// SPDX-License-Identifier: GPL-2.0-only
/*
 * mm/truncate.c - code for taking down pages from address_spaces
 *
 * Copyright (C) 2002, Linus Torvalds
 *
 * 10Sep2002	Andrew Morton
 *		Initial version.
 */

#include <linux/kernel.h>
#include <linux/backing-dev.h>
#include <linux/dax.h>
#include <linux/gfp.h>
#include <linux/mm.h>
#include <linux/swap.h>
#include <linux/export.h>
#include <linux/pagemap.h>
#include <linux/highmem.h>
#include <linux/pagevec.h>
#include <linux/task_io_accounting_ops.h>
#include <linux/buffer_head.h>	/* grr. try_to_release_page,
				   do_invalidatepage */
#include <linux/shmem_fs.h>
#include <linux/cleancache.h>
#include <linux/rmap.h>
#include "internal.h"

/*
 * Regular page slots are stabilized by the page lock even without the tree
 * itself locked.  These unlocked entries need verification under the tree
 * lock.
 */
static inline void __clear_shadow_entry(struct address_space *mapping,
				pgoff_t index, void *entry)
{
	XA_STATE(xas, &mapping->i_pages, index);

	xas_set_update(&xas, workingset_update_node);
	if (xas_load(&xas) != entry)
		return;
	xas_store(&xas, NULL);
}

static void clear_shadow_entry(struct address_space *mapping, pgoff_t index,
			       void *entry)
{
	xa_lock_irq(&mapping->i_pages);
	__clear_shadow_entry(mapping, index, entry);
	xa_unlock_irq(&mapping->i_pages);
}

/*
 * Unconditionally remove exceptional entries. Usually called from truncate
 * path. Note that the pagevec may be altered by this function by removing
 * exceptional entries similar to what pagevec_remove_exceptionals does.
 */
static void truncate_exceptional_pvec_entries(struct address_space *mapping,
				struct pagevec *pvec, pgoff_t *indices)
{
	int i, j;
	bool dax;

	/* Handled by shmem itself */
	if (shmem_mapping(mapping))
		return;

	for (j = 0; j < pagevec_count(pvec); j++)
		if (xa_is_value(pvec->pages[j]))
			break;

	if (j == pagevec_count(pvec))
		return;

	dax = dax_mapping(mapping);
	if (!dax)
		xa_lock_irq(&mapping->i_pages);

	for (i = j; i < pagevec_count(pvec); i++) {
		struct page *page = pvec->pages[i];
		pgoff_t index = indices[i];

		if (!xa_is_value(page)) {
			pvec->pages[j++] = page;
			continue;
		}

		if (unlikely(dax)) {
			dax_delete_mapping_entry(mapping, index);
			continue;
		}

		__clear_shadow_entry(mapping, index, page);
	}

	if (!dax)
		xa_unlock_irq(&mapping->i_pages);
	pvec->nr = j;
}

/*
 * Invalidate exceptional entry if easily possible. This handles exceptional
 * entries for invalidate_inode_pages().
 */
static int invalidate_exceptional_entry(struct address_space *mapping,
					pgoff_t index, void *entry)
{
	/* Handled by shmem itself, or for DAX we do nothing. */
	if (shmem_mapping(mapping) || dax_mapping(mapping))
		return 1;
	clear_shadow_entry(mapping, index, entry);
	return 1;
}

/*
 * Invalidate exceptional entry if clean. This handles exceptional entries for
 * invalidate_inode_pages2() so for DAX it evicts only clean entries.
 */
static int invalidate_exceptional_entry2(struct address_space *mapping,
					 pgoff_t index, void *entry)
{
	/* Handled by shmem itself */
	if (shmem_mapping(mapping))
		return 1;
	if (dax_mapping(mapping))
		return dax_invalidate_mapping_entry_sync(mapping, index);
	clear_shadow_entry(mapping, index, entry);
	return 1;
}

/**
 * do_invalidatepage - invalidate part or all of a page
 * @page: the page which is affected
 * @offset: start of the range to invalidate
 * @length: length of the range to invalidate
 *
 * do_invalidatepage() is called when all or part of the page has become
 * invalidated by a truncate operation.
 *
 * do_invalidatepage() does not have to release all buffers, but it must
 * ensure that no dirty buffer is left outside @offset and that no I/O
 * is underway against any of the blocks which are outside the truncation
 * point.  Because the caller is about to free (and possibly reuse) those
 * blocks on-disk.
 */
void do_invalidatepage(struct page *page, unsigned int offset,
		       unsigned int length)
{
	void (*invalidatepage)(struct page *, unsigned int, unsigned int);

	invalidatepage = page->mapping->a_ops->invalidatepage;
#ifdef CONFIG_BLOCK
	if (!invalidatepage)
		invalidatepage = block_invalidatepage;
#endif
	if (invalidatepage)
		(*invalidatepage)(page, offset, length);
}

/*
 * If truncate cannot remove the fs-private metadata from the page, the page
 * becomes orphaned.  It will be left on the LRU and may even be mapped into
 * user pagetables if we're racing with filemap_fault().
 *
 * We need to bail out if page->mapping is no longer equal to the original
 * mapping.  This happens a) when the VM reclaimed the page while we waited on
 * its lock, b) when a concurrent invalidate_mapping_pages got there first and
 * c) when tmpfs swizzles a page between a tmpfs inode and swapper_space.
 */
static void truncate_cleanup_page(struct page *page)
{
	if (page_mapped(page))
		unmap_mapping_page(page);

	if (page_has_private(page))
		do_invalidatepage(page, 0, thp_size(page));

	/*
	 * Some filesystems seem to re-dirty the page even after
	 * the VM has canceled the dirty bit (eg ext3 journaling).
	 * Hence dirty accounting check is placed after invalidation.
	 */
	cancel_dirty_page(page);
	ClearPageMappedToDisk(page);
}

/*
 * This is for invalidate_mapping_pages().  That function can be called at
 * any time, and is not supposed to throw away dirty pages.  But pages can
 * be marked dirty at any time too, so use remove_mapping which safely
 * discards clean, unused pages.
 *
 * Returns non-zero if the page was successfully invalidated.
 */
static int
invalidate_complete_page(struct address_space *mapping, struct page *page)
{
	int ret;

	if (page->mapping != mapping)
		return 0;

	if (page_has_private(page) && !try_to_release_page(page, 0))
		return 0;

	ret = remove_mapping(mapping, page);

	return ret;
}

int truncate_inode_page(struct address_space *mapping, struct page *page)
{
	VM_BUG_ON_PAGE(PageTail(page), page);

	if (page->mapping != mapping)
		return -EIO;

	truncate_cleanup_page(page);
	delete_from_page_cache(page);
	return 0;
}

/*
 * Used to get rid of pages on hardware memory corruption.
 */
int generic_error_remove_page(struct address_space *mapping, struct page *page)
{
	if (!mapping)
		return -EINVAL;
	/*
	 * Only punch for normal data pages for now.
	 * Handling other types like directories would need more auditing.
	 */
	if (!S_ISREG(mapping->host->i_mode))
		return -EIO;
	return truncate_inode_page(mapping, page);
}
EXPORT_SYMBOL(generic_error_remove_page);

/*
 * Safely invalidate one page from its pagecache mapping.
 * It only drops clean, unused pages. The page must be locked.
 *
 * Returns 1 if the page is successfully invalidated, otherwise 0.
 */
int invalidate_inode_page(struct page *page)
{
	struct address_space *mapping = page_mapping(page);
	if (!mapping)
		return 0;
	if (PageDirty(page) || PageWriteback(page))
		return 0;
	if (page_mapped(page))
		return 0;
	return invalidate_complete_page(mapping, page);
}

/**
 * truncate_inode_pages_range - truncate range of pages specified by start & end byte offsets
 * @mapping: mapping to truncate
 * @lstart: offset from which to truncate
 * @lend: offset to which to truncate (inclusive)
 *
 * Truncate the page cache, removing the pages that are between
 * specified offsets (and zeroing out partial pages
 * if lstart or lend + 1 is not page aligned).
 *
 * Truncate takes two passes - the first pass is nonblocking.  It will not
 * block on page locks and it will not block on writeback.  The second pass
 * will wait.  This is to prevent as much IO as possible in the affected region.
 * The first pass will remove most pages, so the search cost of the second pass
 * is low.
 *
 * We pass down the cache-hot hint to the page freeing code.  Even if the
 * mapping is large, it is probably the case that the final pages are the most
 * recently touched, and freeing happens in ascending file offset order.
 *
 * Note that since ->invalidatepage() accepts range to invalidate
 * truncate_inode_pages_range is able to handle cases where lend + 1 is not
 * page aligned properly.
 */
void truncate_inode_pages_range(struct address_space *mapping,
				loff_t lstart, loff_t lend)
{
	pgoff_t		start;		/* inclusive */
	pgoff_t		end;		/* exclusive */
	unsigned int	partial_start;	/* inclusive */
	unsigned int	partial_end;	/* exclusive */
	struct pagevec	pvec;
	pgoff_t		indices[PAGEVEC_SIZE];
	pgoff_t		index;
	int		i;

	if (mapping_empty(mapping))
		goto out;

	/* Offsets within partial pages */
	partial_start = lstart & (PAGE_SIZE - 1);
	partial_end = (lend + 1) & (PAGE_SIZE - 1);

	/*
	 * 'start' and 'end' always covers the range of pages to be fully
	 * truncated. Partial pages are covered with 'partial_start' at the
	 * start of the range and 'partial_end' at the end of the range.
	 * Note that 'end' is exclusive while 'lend' is inclusive.
	 */
	start = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT;
	if (lend == -1)
		/*
		 * lend == -1 indicates end-of-file so we have to set 'end'
		 * to the highest possible pgoff_t and since the type is
		 * unsigned we're using -1.
		 */
		end = -1;
	else
		end = (lend + 1) >> PAGE_SHIFT;

	pagevec_init(&pvec);
	index = start;
	while (index < end && find_lock_entries(mapping, index, end - 1,
			&pvec, indices)) {
		index = indices[pagevec_count(&pvec) - 1] + 1;
		truncate_exceptional_pvec_entries(mapping, &pvec, indices);
		for (i = 0; i < pagevec_count(&pvec); i++)
			truncate_cleanup_page(pvec.pages[i]);
		delete_from_page_cache_batch(mapping, &pvec);
		for (i = 0; i < pagevec_count(&pvec); i++)
			unlock_page(pvec.pages[i]);
		pagevec_release(&pvec);
		cond_resched();
	}

	if (partial_start) {
		struct page *page = find_lock_page(mapping, start - 1);
		if (page) {
			unsigned int top = PAGE_SIZE;
			if (start > end) {
				/* Truncation within a single page */
				top = partial_end;
				partial_end = 0;
			}
			wait_on_page_writeback(page);
			zero_user_segment(page, partial_start, top);
			cleancache_invalidate_page(mapping, page);
			if (page_has_private(page))
				do_invalidatepage(page, partial_start,
						  top - partial_start);
			unlock_page(page);
			put_page(page);
		}
	}
	if (partial_end) {
		struct page *page = find_lock_page(mapping, end);
		if (page) {
			wait_on_page_writeback(page);
			zero_user_segment(page, 0, partial_end);
			cleancache_invalidate_page(mapping, page);
			if (page_has_private(page))
				do_invalidatepage(page, 0,
						  partial_end);
			unlock_page(page);
			put_page(page);
		}
	}
	/*
	 * If the truncation happened within a single page no pages
	 * will be released, just zeroed, so we can bail out now.
	 */
	if (start >= end)
		goto out;

	index = start;
	for ( ; ; ) {
		cond_resched();
		if (!find_get_entries(mapping, index, end - 1, &pvec,
				indices)) {
			/* If all gone from start onwards, we're done */
			if (index == start)
				break;
			/* Otherwise restart to make sure all gone */
			index = start;
			continue;
		}

		for (i = 0; i < pagevec_count(&pvec); i++) {
			struct page *page = pvec.pages[i];

			/* We rely upon deletion not changing page->index */
			index = indices[i];

			if (xa_is_value(page))
				continue;

			lock_page(page);
			WARN_ON(page_to_index(page) != index);
			wait_on_page_writeback(page);
			truncate_inode_page(mapping, page);
			unlock_page(page);
		}
		truncate_exceptional_pvec_entries(mapping, &pvec, indices);
		pagevec_release(&pvec);
		index++;
	}

out:
	cleancache_invalidate_inode(mapping);
}
EXPORT_SYMBOL(truncate_inode_pages_range);

/**
 * truncate_inode_pages - truncate *all* the pages from an offset
 * @mapping: mapping to truncate
 * @lstart: offset from which to truncate
 *
 * Called under (and serialised by) inode->i_rwsem and
 * mapping->invalidate_lock.
 *
 * Note: When this function returns, there can be a page in the process of
 * deletion (inside __delete_from_page_cache()) in the specified range.  Thus
 * mapping->nrpages can be non-zero when this function returns even after
 * truncation of the whole mapping.
 */
void truncate_inode_pages(struct address_space *mapping, loff_t lstart)
{
	truncate_inode_pages_range(mapping, lstart, (loff_t)-1);
}
EXPORT_SYMBOL(truncate_inode_pages);

/**
 * truncate_inode_pages_final - truncate *all* pages before inode dies
 * @mapping: mapping to truncate
 *
 * Called under (and serialized by) inode->i_rwsem.
 *
 * Filesystems have to use this in the .evict_inode path to inform the
 * VM that this is the final truncate and the inode is going away.
 */
void truncate_inode_pages_final(struct address_space *mapping)
{
	/*
	 * Page reclaim can not participate in regular inode lifetime
	 * management (can't call iput()) and thus can race with the
	 * inode teardown.  Tell it when the address space is exiting,
	 * so that it does not install eviction information after the
	 * final truncate has begun.
	 */
	mapping_set_exiting(mapping);

	if (!mapping_empty(mapping)) {
		/*
		 * As truncation uses a lockless tree lookup, cycle
		 * the tree lock to make sure any ongoing tree
		 * modification that does not see AS_EXITING is
		 * completed before starting the final truncate.
		 */
		xa_lock_irq(&mapping->i_pages);
		xa_unlock_irq(&mapping->i_pages);
	}

	/*
	 * Cleancache needs notification even if there are no pages or shadow
	 * entries.
	 */
	truncate_inode_pages(mapping, 0);
}
EXPORT_SYMBOL(truncate_inode_pages_final);

static unsigned long __invalidate_mapping_pages(struct address_space *mapping,
		pgoff_t start, pgoff_t end, unsigned long *nr_pagevec)
{
	pgoff_t indices[PAGEVEC_SIZE];
	struct pagevec pvec;
	pgoff_t index = start;
	unsigned long ret;
	unsigned long count = 0;
	int i;

	pagevec_init(&pvec);
	while (find_lock_entries(mapping, index, end, &pvec, indices)) {
		for (i = 0; i < pagevec_count(&pvec); i++) {
			struct page *page = pvec.pages[i];

			/* We rely upon deletion not changing page->index */
			index = indices[i];

			if (xa_is_value(page)) {
				count += invalidate_exceptional_entry(mapping,
								      index,
								      page);
				continue;
			}
			index += thp_nr_pages(page) - 1;

			ret = invalidate_inode_page(page);
			unlock_page(page);
			/*
			 * Invalidation is a hint that the page is no longer
			 * of interest and try to speed up its reclaim.
			 */
			if (!ret) {
				deactivate_file_page(page);
				/* It is likely on the pagevec of a remote CPU */
				if (nr_pagevec)
					(*nr_pagevec)++;
			}
			count += ret;
		}
		pagevec_remove_exceptionals(&pvec);
		pagevec_release(&pvec);
		cond_resched();
		index++;
	}
	return count;
}

/**
 * invalidate_mapping_pages - Invalidate all clean, unlocked cache of one inode
 * @mapping: the address_space which holds the cache to invalidate
 * @start: the offset 'from' which to invalidate
 * @end: the offset 'to' which to invalidate (inclusive)
 *
 * This function removes pages that are clean, unmapped and unlocked,
 * as well as shadow entries. It will not block on IO activity.
 *
 * If you want to remove all the pages of one inode, regardless of
 * their use and writeback state, use truncate_inode_pages().
 *
 * Return: the number of the cache entries that were invalidated
 */
unsigned long invalidate_mapping_pages(struct address_space *mapping,
		pgoff_t start, pgoff_t end)
{
	return __invalidate_mapping_pages(mapping, start, end, NULL);
}
EXPORT_SYMBOL(invalidate_mapping_pages);

/**
 * invalidate_mapping_pagevec - Invalidate all the unlocked pages of one inode
 * @mapping: the address_space which holds the pages to invalidate
 * @start: the offset 'from' which to invalidate
 * @end: the offset 'to' which to invalidate (inclusive)
 * @nr_pagevec: invalidate failed page number for caller
 *
 * This helper is similar to invalidate_mapping_pages(), except that it accounts
 * for pages that are likely on a pagevec and counts them in @nr_pagevec, which
 * will be used by the caller.
 */
void invalidate_mapping_pagevec(struct address_space *mapping,
		pgoff_t start, pgoff_t end, unsigned long *nr_pagevec)
{
	__invalidate_mapping_pages(mapping, start, end, nr_pagevec);
}

/*
 * This is like invalidate_complete_page(), except it ignores the page's
 * refcount.  We do this because invalidate_inode_pages2() needs stronger
 * invalidation guarantees, and cannot afford to leave pages behind because
 * shrink_page_list() has a temp ref on them, or because they're transiently
 * sitting in the lru_cache_add() pagevecs.
 */
static int
invalidate_complete_page2(struct address_space *mapping, struct page *page)
{
	if (page->mapping != mapping)
		return 0;

	if (page_has_private(page) && !try_to_release_page(page, GFP_KERNEL))
		return 0;

	xa_lock_irq(&mapping->i_pages);
	if (PageDirty(page))
		goto failed;

	BUG_ON(page_has_private(page));
	__delete_from_page_cache(page, NULL);
	xa_unlock_irq(&mapping->i_pages);

	if (mapping->a_ops->freepage)
		mapping->a_ops->freepage(page);

	put_page(page);	/* pagecache ref */
	return 1;
failed:
	xa_unlock_irq(&mapping->i_pages);
	return 0;
}

static int do_launder_page(struct address_space *mapping, struct page *page)
{
	if (!PageDirty(page))
		return 0;
	if (page->mapping != mapping || mapping->a_ops->launder_page == NULL)
		return 0;
	return mapping->a_ops->launder_page(page);
}

/**
 * invalidate_inode_pages2_range - remove range of pages from an address_space
 * @mapping: the address_space
 * @start: the page offset 'from' which to invalidate
 * @end: the page offset 'to' which to invalidate (inclusive)
 *
 * Any pages which are found to be mapped into pagetables are unmapped prior to
 * invalidation.
 *
 * Return: -EBUSY if any pages could not be invalidated.
 */
int invalidate_inode_pages2_range(struct address_space *mapping,
				  pgoff_t start, pgoff_t end)
{
	pgoff_t indices[PAGEVEC_SIZE];
	struct pagevec pvec;
	pgoff_t index;
	int i;
	int ret = 0;
	int ret2 = 0;
	int did_range_unmap = 0;

	if (mapping_empty(mapping))
		goto out;

	pagevec_init(&pvec);
	index = start;
	while (find_get_entries(mapping, index, end, &pvec, indices)) {
		for (i = 0; i < pagevec_count(&pvec); i++) {
			struct page *page = pvec.pages[i];

			/* We rely upon deletion not changing page->index */
			index = indices[i];

			if (xa_is_value(page)) {
				if (!invalidate_exceptional_entry2(mapping,
								   index, page))
					ret = -EBUSY;
				continue;
			}

			if (!did_range_unmap && page_mapped(page)) {
				/*
				 * If page is mapped, before taking its lock,
				 * zap the rest of the file in one hit.
				 */
				unmap_mapping_pages(mapping, index,
						(1 + end - index), false);
				did_range_unmap = 1;
			}

			lock_page(page);
			WARN_ON(page_to_index(page) != index);
			if (page->mapping != mapping) {
				unlock_page(page);
				continue;
			}
			wait_on_page_writeback(page);

			if (page_mapped(page))
				unmap_mapping_page(page);
			BUG_ON(page_mapped(page));

			ret2 = do_launder_page(mapping, page);
			if (ret2 == 0) {
				if (!invalidate_complete_page2(mapping, page))
					ret2 = -EBUSY;
			}
			if (ret2 < 0)
				ret = ret2;
			unlock_page(page);
		}
		pagevec_remove_exceptionals(&pvec);
		pagevec_release(&pvec);
		cond_resched();
		index++;
	}
	/*
	 * For DAX we invalidate page tables after invalidating page cache.  We
	 * could invalidate page tables while invalidating each entry however
	 * that would be expensive. And doing range unmapping before doesn't
	 * work as we have no cheap way to find whether page cache entry didn't
	 * get remapped later.
	 */
	if (dax_mapping(mapping)) {
		unmap_mapping_pages(mapping, start, end - start + 1, false);
	}
out:
	cleancache_invalidate_inode(mapping);
	return ret;
}
EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range);

/**
 * invalidate_inode_pages2 - remove all pages from an address_space
 * @mapping: the address_space
 *
 * Any pages which are found to be mapped into pagetables are unmapped prior to
 * invalidation.
 *
 * Return: -EBUSY if any pages could not be invalidated.
 */
int invalidate_inode_pages2(struct address_space *mapping)
{
	return invalidate_inode_pages2_range(mapping, 0, -1);
}
EXPORT_SYMBOL_GPL(invalidate_inode_pages2);

/**
 * truncate_pagecache - unmap and remove pagecache that has been truncated
 * @inode: inode
 * @newsize: new file size
 *
 * inode's new i_size must already be written before truncate_pagecache
 * is called.
 *
 * This function should typically be called before the filesystem
 * releases resources associated with the freed range (eg. deallocates
 * blocks). This way, pagecache will always stay logically coherent
 * with on-disk format, and the filesystem would not have to deal with
 * situations such as writepage being called for a page that has already
 * had its underlying blocks deallocated.
 */
void truncate_pagecache(struct inode *inode, loff_t newsize)
{
	struct address_space *mapping = inode->i_mapping;
	loff_t holebegin = round_up(newsize, PAGE_SIZE);

	/*
	 * unmap_mapping_range is called twice, first simply for
	 * efficiency so that truncate_inode_pages does fewer
	 * single-page unmaps.  However after this first call, and
	 * before truncate_inode_pages finishes, it is possible for
	 * private pages to be COWed, which remain after
	 * truncate_inode_pages finishes, hence the second
	 * unmap_mapping_range call must be made for correctness.
	 */
	unmap_mapping_range(mapping, holebegin, 0, 1);
	truncate_inode_pages(mapping, newsize);
	unmap_mapping_range(mapping, holebegin, 0, 1);
}
EXPORT_SYMBOL(truncate_pagecache);

/**
 * truncate_setsize - update inode and pagecache for a new file size
 * @inode: inode
 * @newsize: new file size
 *
 * truncate_setsize updates i_size and performs pagecache truncation (if
 * necessary) to @newsize. It will be typically be called from the filesystem's
 * setattr function when ATTR_SIZE is passed in.
 *
 * Must be called with a lock serializing truncates and writes (generally
 * i_rwsem but e.g. xfs uses a different lock) and before all filesystem
 * specific block truncation has been performed.
 */
void truncate_setsize(struct inode *inode, loff_t newsize)
{
	loff_t oldsize = inode->i_size;

	i_size_write(inode, newsize);
	if (newsize > oldsize)
		pagecache_isize_extended(inode, oldsize, newsize);
	truncate_pagecache(inode, newsize);
}
EXPORT_SYMBOL(truncate_setsize);

/**
 * pagecache_isize_extended - update pagecache after extension of i_size
 * @inode:	inode for which i_size was extended
 * @from:	original inode size
 * @to:		new inode size
 *
 * Handle extension of inode size either caused by extending truncate or by
 * write starting after current i_size. We mark the page straddling current
 * i_size RO so that page_mkwrite() is called on the nearest write access to
 * the page.  This way filesystem can be sure that page_mkwrite() is called on
 * the page before user writes to the page via mmap after the i_size has been
 * changed.
 *
 * The function must be called after i_size is updated so that page fault
 * coming after we unlock the page will already see the new i_size.
 * The function must be called while we still hold i_rwsem - this not only
 * makes sure i_size is stable but also that userspace cannot observe new
 * i_size value before we are prepared to store mmap writes at new inode size.
 */
void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to)
{
	int bsize = i_blocksize(inode);
	loff_t rounded_from;
	struct page *page;
	pgoff_t index;

	WARN_ON(to > inode->i_size);

	if (from >= to || bsize == PAGE_SIZE)
		return;
	/* Page straddling @from will not have any hole block created? */
	rounded_from = round_up(from, bsize);
	if (to <= rounded_from || !(rounded_from & (PAGE_SIZE - 1)))
		return;

	index = from >> PAGE_SHIFT;
	page = find_lock_page(inode->i_mapping, index);
	/* Page not cached? Nothing to do */
	if (!page)
		return;
	/*
	 * See clear_page_dirty_for_io() for details why set_page_dirty()
	 * is needed.
	 */
	if (page_mkclean(page))
		set_page_dirty(page);
	unlock_page(page);
	put_page(page);
}
EXPORT_SYMBOL(pagecache_isize_extended);

/**
 * truncate_pagecache_range - unmap and remove pagecache that is hole-punched
 * @inode: inode
 * @lstart: offset of beginning of hole
 * @lend: offset of last byte of hole
 *
 * This function should typically be called before the filesystem
 * releases resources associated with the freed range (eg. deallocates
 * blocks). This way, pagecache will always stay logically coherent
 * with on-disk format, and the filesystem would not have to deal with
 * situations such as writepage being called for a page that has already
 * had its underlying blocks deallocated.
 */
void truncate_pagecache_range(struct inode *inode, loff_t lstart, loff_t lend)
{
	struct address_space *mapping = inode->i_mapping;
	loff_t unmap_start = round_up(lstart, PAGE_SIZE);
	loff_t unmap_end = round_down(1 + lend, PAGE_SIZE) - 1;
	/*
	 * This rounding is currently just for example: unmap_mapping_range
	 * expands its hole outwards, whereas we want it to contract the hole
	 * inwards.  However, existing callers of truncate_pagecache_range are
	 * doing their own page rounding first.  Note that unmap_mapping_range
	 * allows holelen 0 for all, and we allow lend -1 for end of file.
	 */

	/*
	 * Unlike in truncate_pagecache, unmap_mapping_range is called only
	 * once (before truncating pagecache), and without "even_cows" flag:
	 * hole-punching should not remove private COWed pages from the hole.
	 */
	if ((u64)unmap_end > (u64)unmap_start)
		unmap_mapping_range(mapping, unmap_start,
				    1 + unmap_end - unmap_start, 0);
	truncate_inode_pages_range(mapping, lstart, lend);
}
EXPORT_SYMBOL(truncate_pagecache_range);
.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/configfs/configfs_example.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/filesystems/devfs/ChangeLog?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/ChangeLog</a></td><td class='right'>1977</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.0%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/filesystems/devfs/README?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/README</a></td><td class='right'>1959</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.9%;'/><td class='none' style='width: 84.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/filesystems/devfs/ToDo?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/ToDo</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/filesystems/devfs/boot-options?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/boot-options</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ext3.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/ext3.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/fuse.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/fuse.txt</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/inotify.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/inotify.txt</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/porting?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/porting</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/ramfs-rootfs-initramfs.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/ramfs-rootfs-initramfs.txt</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/filesystems/vfs.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/vfs.txt</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/hwmon/abituguru?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/abituguru</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/hwmon/abituguru-datasheet?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/abituguru-datasheet</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/hwmon/lm70?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/lm70</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/lm83?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/lm83</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/hwmon/smsc47m192?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/smsc47m192</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/sysfs-interface?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/sysfs-interface</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/hwmon/userspace-tools?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/userspace-tools</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/hwmon/w83791d?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/w83791d</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/i2c/busses/i2c-i801?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-i801</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/i2c/busses/i2c-nforce2?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-nforce2</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/i2c/busses/i2c-ocores?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-ocores</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/i2c/busses/i2c-piix4?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-piix4</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/i2c/busses/i2c-sis96x?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-sis96x</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/i2c/busses/scx200_acb?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/scx200_acb</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/ia64/aliasing.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/ia64/aliasing.txt</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/infiniband/ipoib.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/infiniband/ipoib.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/initrd.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/initrd.txt</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ioctl-number.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/ioctl-number.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/irqflags-tracing.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/irqflags-tracing.txt</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/isdn/README.gigaset?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/isdn/README.gigaset</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kbuild/makefiles.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kbuild/makefiles.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kdump/gdbmacros.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kdump/gdbmacros.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kdump/kdump.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kdump/kdump.txt</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/kernel-parameters.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kernel-parameters.txt</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/keys-request-key.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/keys-request-key.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/keys.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/keys.txt</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/lockdep-design.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/lockdep-design.txt</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/md.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/md.txt</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/memory-barriers.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/memory-barriers.txt</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/mips/time.README?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/mips/time.README</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/README.ipw2200?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/README.ipw2200</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/bonding.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/bonding.txt</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/ip-sysctl.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/ip-sysctl.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/networking/ipvs-sysctl.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/ipvs-sysctl.txt</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/netdevices.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/netdevices.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/pktgen.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/pktgen.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/networking/tuntap.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/tuntap.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/nfsroot.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/nfsroot.txt</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/pci.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/pci.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/pcmcia/crc32hash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/pcmcia/crc32hash.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/pcmcia/devicetable.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/pcmcia/devicetable.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/pi-futex.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/pi-futex.txt</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/devices.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/power/devices.txt</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/swsusp.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/power/swsusp.txt</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/power/video.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/power/video.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/powerpc/booting-without-of.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/powerpc/booting-without-of.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/ramdisk.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/ramdisk.txt</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/robust-futexes.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/robust-futexes.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/rt-mutex-design.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/rt-mutex-design.txt</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/rt-mutex.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/rt-mutex.txt</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/rtc.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/rtc.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/00-INDEX?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/00-INDEX</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/ChangeLog.megaraid_sas?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/ChangeLog.megaraid_sas</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/aacraid.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/aacraid.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/Documentation/scsi/cpqfc.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/cpqfc.txt</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/scsi/hptiop.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/hptiop.txt</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/ppa.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/ppa.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/scsi/tmscsim.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/tmscsim.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sound/alsa/ALSA-Configuration.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sound/alsa/ALSA-Configuration.txt</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sparc/sbus_drivers.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sparc/sbus_drivers.txt</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sparse.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sparse.txt</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sysctl/vm.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sysctl/vm.txt</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/sysrq.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sysrq.txt</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/tty.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/tty.txt</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/usb/usb-serial.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/usb/usb-serial.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/usb/usbmon.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/usb/usbmon.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.bttv?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.bttv</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.cx88?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.cx88</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.saa7134?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.saa7134</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CARDLIST.tuner?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.tuner</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/CQcam.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CQcam.txt</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/README.pvrusb2?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/README.pvrusb2</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/Zoran?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/Zoran</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/bttv/CONTRIBUTORS?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/bttv/CONTRIBUTORS</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-calling.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-calling.txt</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-decoder-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-decoder-api.txt</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-dma.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-dma.txt</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-encoder-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-encoder-api.txt</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-memory.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-memory.txt</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-osd-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-osd-api.txt</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx2341x/fw-upload.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx2341x/fw-upload.txt</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/et61x251.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/et61x251.txt</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/ibmcam.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/ibmcam.txt</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/ov511.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/ov511.txt</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/sn9c102.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/sn9c102.txt</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/video4linux/v4lgrab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/v4lgrab.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/w9968cf.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/w9968cf.txt</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/video4linux/zc0301.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/zc0301.txt</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/vm/page_migration?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/vm/page_migration</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/w1/masters/ds2490?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/w1/masters/ds2490</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/w1/w1.generic?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/w1/w1.generic</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/w1/w1.netlink?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/w1/w1.netlink</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/watchdog/pcwd-watchdog.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/pcwd-watchdog.txt</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/watchdog/src/watchdog-simple.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/src/watchdog-simple.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/Documentation/watchdog/src/watchdog-test.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/src/watchdog-test.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/watchdog/watchdog-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/watchdog-api.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/watchdog/watchdog.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/watchdog.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Documentation/x86_64/boot-options.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/x86_64/boot-options.txt</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/MAINTAINERS?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>MAINTAINERS</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>Makefile</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/boot/bootp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/boot/bootp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/boot/bootpz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/boot/bootpz.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/boot/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/boot/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/alpha_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/alpha_ksyms.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/console.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/gct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/gct.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/irq_alpha.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_alpha.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/irq_i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_i8259.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/irq_pyxis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_pyxis.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/irq_srm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_srm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/machvec_impl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/machvec_impl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/osf_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/osf_sys.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/pci.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/process.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/proto.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/smc37c93x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/smc37c93x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/smp.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/srm_env.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/srm_env.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/srmcons.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/srmcons.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_alcor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_alcor.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_cabriolet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_cabriolet.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_dp264.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_dp264.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_eb64p.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_eb64p.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_eiger.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_eiger.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_jensen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_jensen.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_marvel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_marvel.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_mikasa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_mikasa.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_noritake.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_noritake.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_rawhide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_rawhide.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_rx164.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_rx164.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_sable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_sable.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_sio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_takara.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_takara.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_titan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_titan.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/sys_wildfire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_wildfire.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/lib/callback_srm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/lib/callback_srm.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/lib/udelay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/lib/udelay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/mm/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/numa.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/alpha/oprofile/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/oprofile/common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/Kconfig</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/Kconfig.debug</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-at91rm9200.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-at91rm9200.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-clps7500.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-clps7500.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-l7200.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-l7200.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-sa1100.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-sa1100.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-sharpsl.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-sharpsl.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head-xscale.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-xscale.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head.S</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/boot/compressed/ll_char_wr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/ll_char_wr.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/dmabounce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/dmabounce.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/gic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/gic.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/locomo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/locomo.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/sa1111.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/sa1111.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/sharpsl_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/sharpsl_pm.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/time-acorn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/time-acorn.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/uengine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/uengine.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/common/via82c505.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/via82c505.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91rm9200dk_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/at91rm9200dk_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/at91rm9200ek_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/at91rm9200ek_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/ateb9200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ateb9200_defconfig</a></td><td class='right'>1313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/carmeva_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/carmeva_defconfig</a></td><td class='right'>724</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/csb337_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/csb337_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/csb637_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/csb637_defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/ep93xx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ep93xx_defconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/ixp2000_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ixp2000_defconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/ixp23xx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ixp23xx_defconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/kafa_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/kafa_defconfig</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/kb9202_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/kb9202_defconfig</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/lpd270_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/lpd270_defconfig</a></td><td class='right'>981</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/lpd7a400_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/lpd7a400_defconfig</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/lpd7a404_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/lpd7a404_defconfig</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/netx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/netx_defconfig</a></td><td class='right'>926</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/omap_h2_1610_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/omap_h2_1610_defconfig</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/onearm_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/onearm_defconfig</a></td><td class='right'>1076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/pnx4008_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/pnx4008_defconfig</a></td><td class='right'>2072</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/configs/s3c2410_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/s3c2410_defconfig</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/configs/trizeps4_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/trizeps4_defconfig</a></td><td class='right'>1579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/apm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/apm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/armksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/armksyms.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/asm-offsets.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/bios32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/bios32.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/compat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/kernel/crunch-bits.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/crunch-bits.S</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/kernel/crunch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/crunch.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/debug.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/debug.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/ecard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/ecard.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-armv.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/entry-armv.S</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-common.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/entry-common.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/entry-header.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/entry-header.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/fiq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/fiq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/head-nommu.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/head-nommu.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/head.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/irq.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/kernel/iwmmxt-notifier.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/iwmmxt-notifier.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/iwmmxt.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/iwmmxt.S</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/module.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/process.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/ptrace.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/setup.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/signal.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/time.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/vmlinux.lds.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/backtrace.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/backtrace.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/clear_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/clear_user.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/copy_from_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/copy_from_user.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/copy_page.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/copy_page.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/copy_to_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/copy_to_user.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/csumipv6.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/csumipv6.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/delay.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/delay.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/ecard.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/ecard.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/findbit.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/findbit.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/io-readsb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-readsb.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/io-readsw-armv3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-readsw-armv3.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/io-writesb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-writesb.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/io-writesw-armv3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-writesw-armv3.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/memchr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/memchr.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/memset.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/memset.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/memzero.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/memzero.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/strchr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strchr.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/strncpy_from_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strncpy_from_user.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/strnlen_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strnlen_user.S</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/strrchr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strrchr.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/uaccess.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/uaccess.S</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/lib/ucmpdi2.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/ucmpdi2.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-aaec2000/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-aaec2000/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/Kconfig</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/Makefile</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/at91rm9200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/at91rm9200.c</a> (renamed from arch/arm/mach-at91rm9200/common.c)</td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/at91rm9200_time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/at91rm9200_time.c</a> (renamed from arch/arm/mach-at91rm9200/time.c)</td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-1arm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-1arm.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-carmeva.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-carmeva.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-csb337.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-csb337.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-csb637.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-csb637.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-dk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-dk.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-eb9200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-eb9200.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-ek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-ek.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-kafa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-kafa.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/board-kb9202.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-kb9202.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/clock.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/devices.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/generic.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/gpio.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/irq.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/leds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-at91rm9200/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/pm.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/fortunet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps711x/fortunet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/p720t.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps711x/p720t.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps711x/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps711x/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-clps7500/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps7500/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ebsa110/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ebsa110/core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/clock.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/core.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9302.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/edb9302.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9315.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/edb9315.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/edb9315a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/edb9315a.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/gesbc9312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/gesbc9312.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ep93xx/ts72xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/ts72xx.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/dc21285-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/dc21285-timer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/dc21285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/dc21285.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/ebsa285-leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/ebsa285-leds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/isa-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/isa-irq.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/isa-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/isa-timer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/netwinder-hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/netwinder-hw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-footbridge/netwinder-leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/netwinder-leds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/cpu-h7201.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/cpu-h7201.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/cpu-h7202.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/cpu-h7202.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/h7201-eval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/h7201-eval.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-h720x/h7202-eval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/h7202-eval.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-imx/dma.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-imx/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-imx/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-imx/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/integrator_cp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/integrator_cp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/pci_v3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/pci_v3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-integrator/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop3xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop3xx/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop3xx/iop321-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop321-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop3xx/iop321-time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop321-time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop3xx/iop331-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop331-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-iop3xx/iop331-time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop331-time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/enp2611.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/enp2611.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2400.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2400.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2800.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2800.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2x00.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp2000/ixdp2x01.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2x01.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/espresso.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/espresso.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/ixdp2351.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/ixdp2351.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp23xx/roadrunner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/roadrunner.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/coyote-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/coyote-pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixdp425-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/ixdp425-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/ixdpg425-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/ixdpg425-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nas100d-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nas100d-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nas100d-power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nas100d-power.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nas100d-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nas100d-setup.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nslu2-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nslu2-pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nslu2-power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nslu2-power.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-ixp4xx/nslu2-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nslu2-setup.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-l7200/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-l7200/core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/clcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/clcd.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/clocks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/clocks.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/irq-lh7a404.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/irq-lh7a404.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/lcd-panel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/lcd-panel.h</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/ssp-cpld.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/ssp-cpld.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-lh7a40x/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/time.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/Makefile.boot?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/Makefile.boot</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/fb.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/fb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/fb.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/generic.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/generic.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxdb500.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/nxdb500.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxdkn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/nxdkn.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/nxeb500hmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/nxeb500hmi.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/pfifo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/pfifo.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/time.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-netx/xc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-netx/xc.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-ams-delta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-ams-delta.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-fsample.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-fsample.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-h3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-h3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-innovator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-innovator.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/board-osk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-osk.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/clock.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/devices.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/fpga.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/fpga.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/id.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/id.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds-h2p2-debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/leds-h2p2-debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds-innovator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/leds-innovator.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/leds-osk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/leds-osk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/mux.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/pm.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/serial.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/sleep.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap1/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/time.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/board-apollon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/board-apollon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/clock.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/clock.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/devices.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/gpmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/gpmc.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/id.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/id.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/mux.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm-domain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/pm-domain.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/pm.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/prcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/prcm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/sleep.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/sram-fn.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/sram-fn.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-omap2/timer-gp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/timer-gp.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/Makefile.boot?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/Makefile.boot</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/clock.c</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/clock.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/core.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/dma.c</a></td><td class='right'>1108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/gpio.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/irq.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/pm.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/serial.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/sleep.S</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pnx4008/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pnx4008/time.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/corgi.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/corgi_pm.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/corgi_ssp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/corgi_ssp.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/idp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/idp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-idp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-idp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-lubbock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-lubbock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-mainstone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-mainstone.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds-trizeps4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-trizeps4.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/leds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/lpd270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/lpd270.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/lubbock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/lubbock.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/mainstone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/mainstone.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/pm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/poodle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/poodle.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa25x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/pxa25x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/pxa27x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/pxa27x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/sharpsl_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/sharpsl_pm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/sleep.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/spitz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/spitz.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/spitz_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/spitz_pm.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/standby.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/standby.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/tosa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/tosa.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-pxa/trizeps4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/trizeps4.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-realview/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-realview/realview_eb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-realview/realview_eb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-rpc/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-rpc/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/Kconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/bast-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/bast-irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/clock.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/clock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/common-smdk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/common-smdk.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/cpu.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/cpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/cpu.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/devs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/devs.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/devs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/devs.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/dma.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/irq.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-anubis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-anubis.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-bast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-bast.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-h1940.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-h1940.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-nexcoder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-nexcoder.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-osiris.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-osiris.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-otom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-otom.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-smdk2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-smdk2413.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-smdk2413.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-smdk2440.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-smdk2440.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/mach-vr1000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-vr1000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/pm-simtec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/pm-simtec.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/pm.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2410-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410-clock.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2410-gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410-gpio.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2410.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2412-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2412-clock.c</a></td><td class='right'>711</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2412.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2412.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2412.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2412.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2440-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2440-clock.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2440-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2440-irq.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2440.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2440.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2442-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2442-clock.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2442.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2442.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c2442.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2442.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c244x-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c244x-irq.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c244x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c244x.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/s3c244x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c244x.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/sleep.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-s3c2410/usb-simtec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/usb-simtec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/assabet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/assabet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/cerf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/cerf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/collie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/collie.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/collie_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/collie_pm.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/cpu-sa1110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/cpu-sa1110.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/dma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/h3600.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/h3600.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-assabet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-assabet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-badge4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-badge4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-cerf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-cerf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-hackkit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-hackkit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-lart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-lart.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/leds-simpad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-simpad.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/neponset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/neponset.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/pleb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/pleb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/shannon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/shannon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/simpad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/simpad.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/sleep.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-sa1100/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-shark/core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-shark/dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-shark/leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-shark/leds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/core.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_ab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/versatile_ab.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mach-versatile/versatile_pb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/versatile_pb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/Kconfig</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/alignment.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/alignment.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/cache-v4wb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/cache-v4wb.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/copypage-v3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/copypage-v3.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mm/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/iomap.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/ioremap.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/mm-armv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/mm-armv.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/mmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/arm/mm/nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/nommu.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm1020.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1020.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm1020e.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1020e.S</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm1022.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1022.S</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm1026.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1026.S</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm6_7.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm6_7.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm720.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm720.S</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm920.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm920.S</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm922.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm922.S</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm925.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm925.S</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-arm926.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm926.S</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-macros.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-macros.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-sa110.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-sa110.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-sa1100.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-sa1100.S</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-v6.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-v6.S</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-xsc3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-xsc3.S</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/mm/proc-xscale.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-xscale.S</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/entry26.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/entry26.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpa11.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpa11.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpa11_cpdo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11_cpdo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpa11_cpdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11_cpdt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpa11_cprt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11_cprt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpmodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpmodule.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpopcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpopcode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/fpopcode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpopcode.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/nwfpe/softfloat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/softfloat.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/oprofile/op_model_xscale.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/oprofile/op_model_xscale.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/clock.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/cpu-omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/cpu-omap.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/devices.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/dma.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/dmtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/dmtimer.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/gpio.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/mux.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/ocpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/ocpi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/pm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/sram-fn.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/sram-fn.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/sram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/sram.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/timer32k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/timer32k.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/plat-omap/usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/usb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/tools/mach-types?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/tools/mach-types</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/vfp/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/vfp/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/vfp/vfphw.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/vfp/vfphw.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm/vfp/vfpmodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/vfp/vfpmodule.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/boot/compressed/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/armksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/armksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/compat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/ecard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/ecard.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/fiq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/fiq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/irq.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/lib/backtrace.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/backtrace.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/lib/csumpartialcopyuser.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/csumpartialcopyuser.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/lib/kbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/kbd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/lib/lib1funcs.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/lib1funcs.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/machine/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/machine/dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/machine/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/machine/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/nwfpe/fpmodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/nwfpe/fpmodule.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/arm26/nwfpe/fpmodule.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/nwfpe/fpmodule.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/compressed/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/compressed/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/boot/rescue/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/rescue/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/boot/rescue/kimagerescue.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/rescue/kimagerescue.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/drivers/axisflashmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/axisflashmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/drivers/ds1302.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/ds1302.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/drivers/eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/eeprom.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/drivers/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/gpio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/drivers/i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/drivers/pcf8563.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/pcf8563.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/crisksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/crisksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/debugport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/debugport.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/fasttimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/fasttimer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/time.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/lib/dram_init.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/lib/dram_init.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v10/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/boot/compressed/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/boot/compressed/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/boot/rescue/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/boot/rescue/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/axisflashmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/axisflashmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/cryptocop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/cryptocop.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/gpio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/pcf8563.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/pcf8563.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/pci/bios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/pci/bios.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/drivers/sync_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/sync_serial.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/arbiter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/arbiter.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/crisksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/crisksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/debugport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/debugport.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/fasttimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/fasttimer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/kgdb_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/kgdb_asm.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/time.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/lib/dram_init.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/lib/dram_init.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/lib/hw_settings.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/lib/hw_settings.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/lib/nand_init.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/lib/nand_init.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/mm/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/arch-v32/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/kernel/crisksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/kernel/crisksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/kernel/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/cris/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/kernel/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/asm-offsets.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/break.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/break.S</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/cmode.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/cmode.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/debug-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/debug-stub.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/entry-table.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/entry-table.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/entry.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/frv_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/frv_ksyms.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/gdb-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/gdb-stub.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/head-mmu-fr451.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-mmu-fr451.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/head-uc-fr401.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-uc-fr401.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/head-uc-fr451.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-uc-fr451.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/head-uc-fr555.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-uc-fr555.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/irq-mb93091.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-mb93091.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/irq-mb93093.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-mb93093.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/irq-mb93493.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-mb93493.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/irq-routing.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-routing.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/local.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/pm-mb93093.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/pm-mb93093.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/pm.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/process.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/signal.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/sleep.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/switch_to.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/switch_to.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/sys_frv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/sys_frv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/sysctl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/traps.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/kernel/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/uaccess.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-frv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mb93090-mb00/pci-frv.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mb93090-mb00/pci-irq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mb93090-mb00/pci-vdk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mb93090-mb00/pci-vdk.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/dma-alloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/dma-alloc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/kmap.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/tlb-flush.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/tlb-flush.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/tlb-miss.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/tlb-miss.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/frv/mm/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/unaligned.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/gpio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/h8300_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/h8300_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/ints.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/syscalls.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/syscalls.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/lib/romfs.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/lib/romfs.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/mm/kmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/mm/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/aki3068net/crt0_ram.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/aki3068net/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/aki3068net/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/generic/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/generic/crt0_ram.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/generic/crt0_rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/generic/crt0_rom.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/generic/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/generic/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/h8max/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/h8max/crt0_ram.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/h8max/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/h8max/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8300h/ints_h8300h.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/ints_h8300h.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/edosk2674/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/edosk2674/crt0_ram.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/edosk2674/crt0_rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/edosk2674/crt0_rom.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/edosk2674/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/edosk2674/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/generic/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/generic/crt0_ram.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/generic/crt0_rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/generic/crt0_rom.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/generic/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/generic/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/ints.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/h8300/platform/h8s/ints_h8s.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/ints_h8s.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/Kconfig</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/Kconfig.cpu?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/Kconfig.cpu</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/Kconfig.debug</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/boot/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/compressed/misc.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/boot/setup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/setup.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/boot/video.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/video.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/crypto/aes-i586-asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/crypto/aes-i586-asm.S</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/crypto/aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/crypto/aes.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/acpi/boot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/boot.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/acpi/earlyquirk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/earlyquirk.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/acpi/processor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/processor.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/acpi/sleep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/sleep.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/acpi/wakeup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/wakeup.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/alternative.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/alternative.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/apic.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/apm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/apm.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/asm-offsets.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/i386/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/audit.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/bootflag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/bootflag.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/amd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/amd.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/common.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/longhaul.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/longhaul.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/longrun.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/longrun.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/p4-clockmod.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/powernow-k7.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/powernow-k7.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/powernow-k8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/powernow-k8.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/powernow-k8.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/powernow-k8.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/cyrix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cyrix.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/intel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/intel.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/intel_cacheinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/intel_cacheinfo.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/mcheck/k7.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/k7.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/mcheck/mce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/mce.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/mcheck/non-fatal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/non-fatal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/mcheck/p4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/p4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpu/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/proc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/cpuid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpuid.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/crash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/crash.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/doublefault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/doublefault.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/efi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/efi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/efi_stub.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/efi_stub.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/entry.S</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/i386/kernel/hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/hpet.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/i386_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i386_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/i387.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i387.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/i386/kernel/i8253.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i8253.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i8259.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/io_apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/io_apic.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/ioport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/ioport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/irq.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/kprobes.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/machine_kexec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/mca.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/microcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/microcode.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/mpparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/mpparse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/msr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/msr.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/nmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/nmi.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/numaq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/numaq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/process.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/ptrace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/quirks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/reboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/reboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/scx200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/scx200.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/setup.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/signal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/smp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/smpboot.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/srat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/srat.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/i386/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/stacktrace.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/syscall_table.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/syscall_table.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/sysenter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/sysenter.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/time.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/time_hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/time_hpet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/common.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer_cyclone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_cyclone.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer_hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_hpet.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer_none.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_none.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer_pit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_pit.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_pm.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/i386/kernel/timers/timer_tsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_tsc.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/topology.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/traps.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/i386/kernel/tsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/tsc.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/vm86.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vm86.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vmlinux.lds.S</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/vsyscall-sysenter.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vsyscall-sysenter.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/kernel/vsyscall.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vsyscall.lds.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/lib/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/checksum.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/delay.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/lib/memcpy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/memcpy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/lib/mmx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/mmx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/lib/usercopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/usercopy.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-default/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-default/setup.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-generic/bigsmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/bigsmp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-generic/default.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/default.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-generic/es7000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/es7000.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-generic/probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/probe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-generic/summit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/summit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-visws/mpparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/mpparse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-visws/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/setup.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-visws/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-visws/visws_apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/visws_apic.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-voyager/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/setup.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-voyager/voyager_basic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_basic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-voyager/voyager_cat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_cat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-voyager/voyager_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_smp.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mach-voyager/voyager_thread.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_thread.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/boot_ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/boot_ioremap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/discontig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/discontig.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/fault.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/init.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/pageattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/pageattr.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/mm/pgtable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/pgtable.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/oprofile/nmi_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/nmi_int.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/oprofile/op_model_athlon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/op_model_athlon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/oprofile/op_model_p4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/op_model_p4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/oprofile/op_model_ppro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/op_model_ppro.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/i386.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/i386.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/irq.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/mmconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/mmconfig.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/pcbios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/pcbios.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/pci.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/pci/visws.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/visws.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/i386/power/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/power/cpu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/configs/tiger_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/configs/tiger_defconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/dig/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/dig/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/common/sba_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/common/sba_iommu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/boot/bootloader.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/boot/bootloader.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/boot/fw-emu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/boot/fw-emu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/hpsim_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/hpsim_console.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/hpsim_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/hpsim_irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/hpsim_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/hpsim_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/simeth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/simeth.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/hp/sim/simserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/simserial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/ia64/ia32/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/audit.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/binfmt_elf32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/ia32priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/ia32priv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/ia32/sys_ia32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/sys_ia32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/acpi-ext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/acpi-ext.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/acpi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/asm-offsets.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/ia64/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/audit.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/cpufreq/acpi-cpufreq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/cpufreq/acpi-cpufreq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/efi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/efi.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/efi_stub.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/efi_stub.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/entry.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/entry.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/entry.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/gate.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/gate.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/gate.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/gate.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/ia64_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/ia64_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/iosapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/iosapic.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/irq.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/irq_ia64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/irq_ia64.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/irq_lsapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/irq_lsapic.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/ivt.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/ivt.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/kprobes.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/machvec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/machvec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/mca_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca_asm.S</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/mca_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/mca_drv_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca_drv_asm.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/minstate.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/minstate.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/module.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/numa.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/palinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/palinfo.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/perfmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/perfmon.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/perfmon_default_smpl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/perfmon_default_smpl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/process.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/sal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/sal.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/salinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/salinfo.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/smpboot.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/sys_ia64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/sys_ia64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/topology.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/uncached.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/uncached.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/lib/clear_page.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/lib/clear_page.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/lib/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/lib/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/lib/memcpy_mck.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/lib/memcpy_mck.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/contig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/contig.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/discontig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/discontig.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/fault.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/init.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/ioremap.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/numa.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/mm/tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/tlb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/oprofile/perfmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/oprofile/perfmon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/pci/pci.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/bte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/bte.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/huberror.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/huberror.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/io_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/io_init.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/irq.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/setup.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/sn2/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/cache.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/sn2/prominfo_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/prominfo_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/sn2/sn_hwperf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/sn_hwperf.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/sn2/sn_proc_fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/sn_proc_fs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/xpc_channel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/xpc_channel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/kernel/xpnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/xpnet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/pci_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/pci_dma.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/pcibr/pcibr_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/pcibr/pcibr_dma.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/pcibr/pcibr_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/pcibr/pcibr_provider.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/tioca_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/tioca_provider.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ia64/sn/pci/tioce_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/tioce_provider.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/boot/compressed/m32r_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/m32r_sio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/boot/compressed/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/boot/setup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/setup.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/align.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/align.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_m32104ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_m32104ut.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_m32700ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_m32700ut.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_mappi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_mappi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_mappi2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_mappi2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_mappi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_mappi3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_oaks32r.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_oaks32r.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_opsput.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_opsput.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/io_usrv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_usrv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/m32r_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/m32r_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/module.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_m32104ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_m32104ut.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_m32700ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_m32700ut.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_mappi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_mappi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_mappi2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_mappi2.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_mappi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_mappi3.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_oaks32r.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_oaks32r.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_opsput.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_opsput.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/setup_usrv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_usrv.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/smpboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/sys_m32r.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/sys_m32r.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/ashxdi3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/ashxdi3.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/checksum.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/delay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/memcpy.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/memcpy.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/memset.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/memset.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/strlen.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/strlen.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/lib/usercopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/usercopy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/mm/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/cache.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/mm/discontig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/discontig.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/mm/fault-nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/fault-nommu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m32r/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/fault.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/amiga_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/amiga_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/amiints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/amiints.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/amisound.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/amisound.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/chipram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/chipram.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/cia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/cia.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/amiga/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/config.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/apollo/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/apollo/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/apollo/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/apollo/config.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/apollo/dn_ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/apollo/dn_ints.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/ataints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/ataints.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/config.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/hades-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/hades-pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/atari/stram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/stram.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/bvme6000/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/bvme6000/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/bvme6000/bvmeints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/bvme6000/bvmeints.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/bvme6000/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/bvme6000/config.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/hp300/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/hp300/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/config.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/hp300/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/ints.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/hp300/ints.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/ints.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/hp300/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/bios32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/bios32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68k/kernel/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/dma.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/entry.S</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/ints.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/m68k_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/m68k_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/traps.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/lib/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68k/lib/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/lib/uaccess.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/baboon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/baboon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/config.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/iop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/iop.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/macints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/macints.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/oss.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/psc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/psc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mac/via.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/via.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/math-emu/fp_entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/math-emu/fp_entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/math-emu/fp_util.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/math-emu/fp_util.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/kmap.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/memory.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/motorola.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/motorola.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mm/sun3mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/sun3mmu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/mvme147/147ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme147/147ints.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mvme147/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme147/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mvme147/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme147/config.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/m68k/mvme16x/16xints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme16x/16xints.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mvme16x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme16x/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/mvme16x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme16x/config.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/q40/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/q40/config.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/q40/q40ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/q40/q40ints.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/sun3/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/config.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/sun3/prom/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/prom/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/sun3/prom/printf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/prom/printf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/sun3/sun3dvma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/sun3dvma.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/sun3/sun3ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/sun3ints.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68k/sun3x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3x/config.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/Kconfig</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/Makefile</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/defconfig</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/comempci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/comempci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/m68k_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/m68k_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/semaphore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/setup.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/signal.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/syscalltable.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/syscalltable.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/traps.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/vmlinux.lds.S</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/lib/semaphore.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/lib/semaphore.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/mm/init.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/mm/kmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/mm/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5206/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5206/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5206e/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5206e/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/520x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/520x/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/523x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/523x/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5249/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5249/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5272/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5272/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/527x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/527x/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/528x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/528x/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/entry.S</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/head.S</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/ints.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/pit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/pit.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/timers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/timers.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5307/vectors.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/vectors.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/532x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/532x/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/532x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/532x/config.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/5407/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5407/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/head-de2.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-de2.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/head-pilot.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-pilot.S</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/head-ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-ram.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/head-rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-rom.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/ints.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/romvec.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/romvec.S</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68328/timers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/timers.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68360/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/config.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68360/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68360/head-ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/head-ram.S</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68360/head-rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/head-rom.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68360/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/ints.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68EZ328/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68EZ328/config.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/m68knommu/platform/68VZ328/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68VZ328/config.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/Kconfig</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/Kconfig.debug</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/Makefile</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/arc/identify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/arc/identify.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/au1xxx_irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/au1xxx_irqmap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/dbdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/dbdma.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/dbg_io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/gpio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/irq.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/pci.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/power.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/prom.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/reset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/setup.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/sleeper.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/sleeper.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/time.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/common/usbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/usbdev.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/csb250/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/csb250/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/board_setup.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/csb250/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/init.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/csb250/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/irqmap.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/db1x00/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/db1x00/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/db1x00/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/irqmap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/db1x00/mirage_ts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/mirage_ts.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/hydrogen3/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/hydrogen3/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/board_setup.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/hydrogen3/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/init.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/au1000/hydrogen3/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/irqmap.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/mtx-1/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/mtx-1/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/mtx-1/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/mtx-1/irqmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1000/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1000/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1000/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1000/irqmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1100/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1100/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1100/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1100/irqmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1200/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1200/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1200/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1200/irqmap.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1500/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1500/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1500/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1500/irqmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/pb1550/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1550/irqmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/xxs1500/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/xxs1500/board_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/au1000/xxs1500/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/xxs1500/irqmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_dbg_io.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_device.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_flashtest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_flashtest.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_fpga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_fpga.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_iodev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_iodev.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_iodev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_iodev.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_irq.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_procfs.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_prom.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/basler/excite/excite_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/basler/excite/excite_setup.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cobalt/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/cobalt/console.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/cobalt/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/cobalt/setup.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/atlas_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/atlas_defconfig</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/bigsur_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/bigsur_defconfig</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/capcella_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/capcella_defconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/cobalt_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/cobalt_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1000_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1000_defconfig</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1100_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1100_defconfig</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1200_defconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1500_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1500_defconfig</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/db1550_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1550_defconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ddb5477_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ddb5477_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/decstation_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/decstation_defconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/e55_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/e55_defconfig</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/configs/emma2rh_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/emma2rh_defconfig</a></td><td class='right'>1241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ev64120_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ev64120_defconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ev96100_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ev96100_defconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/configs/excite_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/excite_defconfig</a></td><td class='right'>1245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ip22_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ip22_defconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ip27_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ip27_defconfig</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ip32_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ip32_defconfig</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/it8172_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/it8172_defconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ivr_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ivr_defconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/jaguar-atx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/jaguar-atx_defconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/jmr3927_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/jmr3927_defconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/lasat200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/lasat200_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/malta_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/malta_defconfig</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/mipssim_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/mipssim_defconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/mpc30x_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/mpc30x_defconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ocelot_3_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_3_defconfig</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ocelot_c_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_c_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ocelot_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_defconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/ocelot_g_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_g_defconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1100_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pb1100_defconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1500_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pb1500_defconfig</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pb1550_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pb1550_defconfig</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pnx8550-jbs_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pnx8550-jbs_defconfig</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/pnx8550-v2pci_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pnx8550-v2pci_defconfig</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/qemu_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/qemu_defconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/rbhma4500_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/rbhma4500_defconfig</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/rm200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/rm200_defconfig</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/sb1250-swarm_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/sb1250-swarm_defconfig</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/sead_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/sead_defconfig</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/tb0226_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/tb0226_defconfig</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/tb0229_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/tb0229_defconfig</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/tb0287_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/tb0287_defconfig</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/workpad_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/workpad_defconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/mips/configs/wrppmc_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/wrppmc_defconfig</a> (renamed from arch/mips/configs/ddb5476_defconfig)</td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/configs/yosemite_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/yosemite_defconfig</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/common/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/common/prom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5074/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5074/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/irq.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5074/nile4_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/nile4_pic.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5074/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/setup.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5476/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5476/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/dbg_io.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5476/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/irq.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5476/nile4_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/nile4_pic.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5476/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/setup.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5477/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5477/irq_5477.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/irq_5477.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5477/kgdb_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/kgdb_io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ddb5xxx/ddb5477/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/setup.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/int-handler.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/int-handler.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/ioasic-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/ioasic-irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/kn02-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/kn02-irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/prom/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/prom/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/prom/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/prom/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/setup.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/dec/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/time.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/defconfig</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/common/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/common/irq.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/common/irq_emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/common/irq_emma2rh.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/common/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/common/prom.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/markeins/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/markeins/irq.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/irq_markeins.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/markeins/irq_markeins.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/markeins/led.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/markeins/platform.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/emma2rh/markeins/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/emma2rh/markeins/setup.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/galileo-boards/ev96100/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/galileo-boards/ev96100/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/galileo-boards/ev96100/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/galileo-boards/ev96100/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/common/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/gt64120/common/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/common/pci.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/common/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/common/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/ev64120/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/ev64120/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/ev64120/serialGT.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/ev64120/serialGT.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/ev64120/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/ev64120/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/momenco_ocelot/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/momenco_ocelot/dbg_io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/gt64120/momenco_ocelot/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/momenco_ocelot/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/gt64120/wrppmc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/wrppmc/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/gt64120/wrppmc/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/wrppmc/irq.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/gt64120/wrppmc/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/wrppmc/pci.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/gt64120/wrppmc/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/wrppmc/reset.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/gt64120/wrppmc/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/wrppmc/setup.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/gt64120/wrppmc/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/wrppmc/time.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ite-boards/generic/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/dbg_io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ite-boards/generic/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ite-boards/generic/it8172_cir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/it8172_cir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ite-boards/generic/it8172_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/it8172_setup.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ite-boards/generic/pmon_prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/pmon_prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/ite-boards/generic/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jazz/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jazz/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jazz/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jazz/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jmr3927/rbhma3100/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jmr3927/rbhma3100/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jmr3927/rbhma3100/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jmr3927/rbhma3100/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/jmr3927/rbhma3100/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jmr3927/rbhma3100/setup.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/kernel/apm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/apm.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/asm-offsets.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/branch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/branch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cpu-bugs64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/cpu-bugs64.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/cpu-probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/cpu-probe.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/entry.S</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/gdb-low.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/gdb-low.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/gdb-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/gdb-stub.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/genex.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/genex.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/head.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/i8259.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irixelf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irixelf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irixsig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irixsig.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq-msc01.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-msc01.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq-mv6434x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-mv6434x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq-rm7000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-rm7000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq-rm9000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-rm9000.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/irq_cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq_cpu.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/linux32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/linux32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/mips-mt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/mips-mt.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/mips_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/mips_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/module.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/ptrace.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/ptrace32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/ptrace32.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/r2300_switch.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/r2300_switch.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/r4k_fpu.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/r4k_fpu.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/r4k_switch.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/r4k_switch.S</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/rtlx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/rtlx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall32-o32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall32-o32.S</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall64-64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall64-64.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall64-n32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall64-n32.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/scall64-o32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall64-o32.S</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/setup.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/signal-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/signal-common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/smp-mt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smp-mt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smp.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/smtc-asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smtc-asm.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/smtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smtc.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/syscall.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/sysirix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/sysirix.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/time.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/traps.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/unaligned.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/kernel/vpe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/vpe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lasat/interrupt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/interrupt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lasat/lasat_board.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/lasat_board.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lasat/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/reset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lasat/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/setup.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lasat/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib-32/dump_tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib-32/dump_tlb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib-64/dump_tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib-64/dump_tlb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/lib/ashldi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/ashldi3.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/lib/ashrdi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/ashrdi3.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/lib/libgcc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/libgcc.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/lib/lshrdi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/lshrdi3.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/lib/memcpy.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/memcpy.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/cp1emu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/cp1emu.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/dp_fint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/dp_fint.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/dp_flong.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/dp_flong.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/ieee754.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/ieee754.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/kernel_linkage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/kernel_linkage.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/sp_fint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/sp_fint.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/math-emu/sp_flong.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/sp_flong.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/atlas/atlas_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/atlas/atlas_int.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/atlas/atlas_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/atlas/atlas_setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/generic/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/generic/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/memory.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/generic/printf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/printf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/generic/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/reset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/generic/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/time.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/malta/malta_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/malta/malta_setup.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/malta/malta_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/malta/malta_smp.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sead/sead_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sead/sead_setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sim/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sim/sim_IRQ.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_IRQ.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sim/sim_irq.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_irq.S</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sim/sim_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sim/sim_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_smp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mips-boards/sim/sim_time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_time.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-r4k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/c-r4k.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/c-sb1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/c-sb1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/cache.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/cerr-sb1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/cerr-sb1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/dma-coherent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/dma-coherent.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/dma-noncoherent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/dma-noncoherent.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/highmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/highmem.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/init.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/pg-sb1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/pg-sb1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/pgtable-32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/pgtable-32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/pgtable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/pgtable.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/mm/sc-mips.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/sc-mips.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlb-r4k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/tlb-r4k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlb-r8k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/tlb-r8k.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/mm/tlbex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/tlbex.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/jaguar_atx/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/dbg_io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/jaguar_atx/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/jaguar_atx/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/jaguar_atx/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/reset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/jaguar_atx/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_3/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_3/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_3/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_3/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_3/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_3/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/cpci-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/cpci-irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/dbg_io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/ocelot_c_fpga.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/reset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_c/uart-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/uart-irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_g/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/dbg_io.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_g/gt-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/gt-irq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_g/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/momentum/ocelot_g/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/oprofile/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/oprofile/common.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/oprofile/op_model_mipsxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/oprofile/op_model_mipsxx.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/oprofile/op_model_rm9000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/oprofile/op_model_rm9000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-atlas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-atlas.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-ddb5074.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-ddb5074.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-emma2rh.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-excite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-excite.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-mpc30x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-mpc30x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-vr4133.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-vr4133.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/fixup-wrppmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-wrppmc.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-au1000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-au1000.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-bridge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-bridge.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-ddb5074.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-ddb5074.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-ddb5476.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-ddb5476.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-emma2rh.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-it8172.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-it8172.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-sni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-sni.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-titan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-titan.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-tx4927.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-tx4927.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/ops-tx4938.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-tx4938.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-bcm1480.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-bcm1480.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-bcm1480ht.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-bcm1480ht.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ddb5074.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ddb5074.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ddb5476.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ddb5476.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ddb5477.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ddb5477.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-emma2rh.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-excite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-excite.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ip27.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ip27.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ip32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ip32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-jmr3927.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-jmr3927.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-ocelot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ocelot.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-sb1250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-sb1250.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci-yosemite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-yosemite.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/philips/pnx8550/common/int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/int.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/philips/pnx8550/common/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/pci.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/philips/pnx8550/common/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/setup.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/philips/pnx8550/common/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/time.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/ht.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/ht.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/pmc-sierra/yosemite/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/qemu/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/qemu/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/qemu/q-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/qemu/q-reset.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/qemu/q-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/qemu/q-setup.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-eisa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-eisa.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-int.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-reset.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip22/ip22-time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-time.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-console.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-init.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-irq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-klnuma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-klnuma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-reset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip27/ip27-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-timer.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip32/ip32-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip32/ip32-irq.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip32/ip32-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip32/ip32-reset.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sgi-ip32/ip32-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip32/ip32-setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/bcm1480/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/bcm1480/irq.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/bcm1480/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/bcm1480/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/bcm1480/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/bcm1480/time.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/cfe/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/cfe/console.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/cfe/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/cfe/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/sb1250/bus_watcher.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/bus_watcher.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/sb1250/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/irq.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/sb1250/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/sb1250/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/sb1250/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sibyte/swarm/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/swarm/setup.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sni/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sni/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/sni/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/setup.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/mips/sni/sniprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/sniprom.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4927/common/tx4927_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/common/tx4927_irq.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4927/common/tx4927_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/common/tx4927_setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4938/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/common/irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4938/common/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/common/setup.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4938/toshiba_rbtx4938/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4938/toshiba_rbtx4938/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/prom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4938/toshiba_rbtx4938/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/casio-e55/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/casio-e55/setup.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/common/icu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/icu.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/common/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/init.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/common/vrc4173.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/vrc4173.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/ibm-workpad/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/ibm-workpad/setup.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/nec-cmbvr4133/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/nec-cmbvr4133/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/mips/vr41xx/nec-cmbvr4133/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/hpux/sys_hpux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/hpux/sys_hpux.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/cache.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/entry.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/firmware.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/firmware.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/irq.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/module.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/pacache.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pacache.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/parisc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/parisc_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/pdc_chassis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pdc_chassis.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/pdc_cons.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pdc_cons.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/perf_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/perf_asm.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/processor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/processor.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/ptrace.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/real2.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/real2.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/setup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/signal.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/sys_parisc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/sys_parisc32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/syscall.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/syscall.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/time.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/topology.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/traps.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/unaligned.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/unwind.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/unwind.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/lib/bitops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/lib/bitops.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/lib/fixup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/lib/fixup.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/lib/memcpy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/lib/memcpy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/parisc/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/mm/init.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/Kconfig</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/Kconfig.debug</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/boot/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/boot/main.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/boot/prom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/boot/prom.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/cell_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/cell_defconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/chrp32_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/chrp32_defconfig</a></td><td class='right'>1378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc7448_hpc2_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/mpc7448_hpc2_defconfig</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc834x_itx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/mpc834x_itx_defconfig</a></td><td class='right'>1336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc85xx_cds_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/mpc85xx_cds_defconfig</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/configs/mpc8641_hpcn_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/mpc8641_hpcn_defconfig</a></td><td class='right'>921</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/pmac32_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/pmac32_defconfig</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/configs/pseries_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/pseries_defconfig</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/align.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/align.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/asm-offsets.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/binfmt_elf32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/btext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/btext.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/cpu_setup_6xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/cpu_setup_6xx.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/cpu_setup_power4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/cpu_setup_power4.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/cputable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/cputable.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/crash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/crash.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/crash_dump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/crash_dump.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/entry_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/entry_32.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/entry_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/entry_64.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/firmware.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/firmware.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/fpu.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/fpu.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_32.S</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_44x.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_44x.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_4xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_4xx.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_64.S</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_8xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_8xx.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/head_fsl_booke.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_fsl_booke.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ibmebus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ibmebus.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/idle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/idle.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/idle_6xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/idle_6xx.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/idle_power4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/idle_power4.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/iomap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/iommu.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/irq.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/kprobes.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/l2cr_6xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/l2cr_6xx.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/legacy_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/legacy_serial.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/lparcfg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/lparcfg.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/machine_kexec_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/machine_kexec_32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/machine_kexec_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/machine_kexec_64.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/misc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/misc.S</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/misc_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/misc_32.S</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/misc_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/misc_64.S</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/nvram_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/nvram_64.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/of_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/of_device.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/paca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/paca.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_32.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_64.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci_direct_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_direct_iommu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci_dn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_dn.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pci_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_iommu.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/perfmon_fsl_booke.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/perfmon_fsl_booke.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/pmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pmc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ppc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ppc_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/proc_ppc64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/proc_ppc64.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/process.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/prom.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/prom_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/prom_init.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/prom_parse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/prom_parse.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ptrace-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ptrace-common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ptrace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/ptrace32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ptrace32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtas-rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas-rtc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtas_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas_flash.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/rtas_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas_pci.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/setup-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup-common.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/setup_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup_32.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/setup_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup_64.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/signal_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/signal_32.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/signal_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/signal_64.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/smp-tbsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/smp-tbsync.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/smp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/swsusp_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/swsusp_32.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/sys_ppc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/sys_ppc32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/sysfs.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/systbl.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/systbl.S</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/tau_6xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/tau_6xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/time.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/traps.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/udbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/udbg.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/udbg_16550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/udbg_16550.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso32/cacheflush.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/cacheflush.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso32/datapage.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/datapage.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso32/gettimeofday.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/gettimeofday.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso32/sigtramp.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/sigtramp.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso64/cacheflush.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/cacheflush.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso64/datapage.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/datapage.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso64/gettimeofday.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/gettimeofday.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vdso64/sigtramp.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/sigtramp.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vector.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vector.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vio.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vmlinux.lds.S</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/lib/bitops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/bitops.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/copy_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/copy_32.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/locks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/sstep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/sstep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/lib/string.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/string.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/math-emu/math.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/math-emu/math.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/44x_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/44x_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/4xx_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/4xx_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/fault.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/fsl_booke_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/fsl_booke_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hash_low_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_low_32.S</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hash_low_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_low_64.S</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hash_native_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_native_64.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/hash_utils_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_utils_64.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/init_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/init_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/init_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/init_64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/lmb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/lmb.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/mem.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mmu_context_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/mmu_context_32.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/mmu_context_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/mmu_context_64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/numa.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/pgtable_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/pgtable_32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/pgtable_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/pgtable_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/ppc_mmu_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/ppc_mmu_32.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/slb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/slb.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/slb_low.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/slb_low.S</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/stab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/stab.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/tlb_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/tlb_32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/mm/tlb_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/tlb_64.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/oprofile/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/oprofile/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/oprofile/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/common.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/oprofile/op_model_power4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/op_model_power4.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_itx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_itx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/mpc834x_itx.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/mpc834x_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/mpc834x_sys.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/83xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc8540_ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/mpc8540_ads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_ads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_cds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/mpc85xx_cds.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/mpc85xx_cds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/mpc85xx_cds.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/85xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc8641_hpcn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/mpc8641_hpcn.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/mpc86xx.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx_pcie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/mpc86xx_pcie.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/mpc86xx_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/mpc86xx_smp.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/86xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/86xx/pci.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/cbe_regs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/cbe_regs.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/cbe_regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/cbe_regs.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/interrupt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/interrupt.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/interrupt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/interrupt.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/iommu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/pervasive.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/pervasive.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/pervasive.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/pervasive.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/ras.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/ras.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/ras.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/ras.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/setup.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spider-pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spider-pic.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spu_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_base.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spu_callbacks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_callbacks.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spu_priv1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_priv1.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spu_priv1_mmio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_priv1_mmio.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/backing_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/backing_ops.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/context.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/context.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/file.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/hw_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/hw_ops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/inode.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/sched.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped</a></td><td class='right'>1122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/cell/spufs/switch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/switch.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/chrp/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/chrp/pci.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/chrp/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/chrp/setup.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/chrp/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/chrp/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/embedded6xx/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/embedded6xx/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/call_pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/call_pci.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/dt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/dt.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/htab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/htab.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/iommu.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/irq.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/lpardata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/lpardata.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/lpevents.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/lpevents.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/mf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/mf.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/pci.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/setup.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/setup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/iseries/vio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/vio.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/maple/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/maple/pci.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/maple/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/maple/setup.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/maple/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/maple/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/backlight.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/bootx_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/bootx_init.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/cache.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/cache.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/cpufreq_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/cpufreq_32.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/cpufreq_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/cpufreq_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/feature.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/feature.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/low_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/low_i2c.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/nvram.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pci.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/pfunc_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pfunc_base.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/pfunc_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pfunc_core.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pic.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/pmac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pmac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/setup.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/sleep.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/smp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/udbg_adb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/udbg_adb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/powermac/udbg_scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/udbg_scc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/eeh_cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/eeh_cache.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/eeh_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/eeh_driver.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/eeh_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/eeh_event.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/iommu.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/lpar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/lpar.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/ras.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/ras.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/rtasd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/rtasd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/scanlog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/scanlog.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/setup.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/smp.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/vio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/vio.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/xics.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/xics.c</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/platforms/pseries/xics.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/xics.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/dart.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/dart.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/dart_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/dart_iommu.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/fsl_soc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/fsl_soc.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/i8259.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/ipic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/ipic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/mmio_nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/mmio_nvram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/mpic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/mpic.c</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/todc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/todc.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/tsi108_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/tsi108_dev.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/powerpc/sysdev/tsi108_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/tsi108_pci.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/powerpc/xmon/xmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/xmon/xmon.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/4xx_io/serial_sicc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/4xx_io/serial_sicc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8260_io/fcc_enet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8260_io/fcc_enet.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8xx_io/commproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/commproc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8xx_io/cs4218.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/cs4218.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8xx_io/cs4218_tdm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/cs4218_tdm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8xx_io/enet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/enet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8xx_io/fec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/fec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/8xx_io/micropatch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/micropatch.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/amiga/amiints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/amiga/amiints.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/amiga/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/amiga/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/common/crt0.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/common/crt0.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/common/misc-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/common/misc-common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/common/ns16550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/common/ns16550.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/embed_config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/embed_config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/m8xx_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/m8xx_tty.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-chestnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-chestnut.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-embedded.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-embedded.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-ev64260.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-ev64260.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-ev64360.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-ev64360.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-katana.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-katana.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-mv64x60.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-mv64x60.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-prep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-prep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc-spruce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-spruce.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/mpc52xx_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/mpc52xx_tty.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/mv64x60_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/mv64x60_tty.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/openbios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/openbios.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/pibs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/pibs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/boot/simple/relocate.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/relocate.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/cpu_setup_power4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/cpu_setup_power4.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/dma-mapping.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/dma-mapping.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/head_44x.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_44x.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/head_4xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_4xx.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/head_8xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_8xx.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/head_fsl_booke.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_fsl_booke.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/machine_kexec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/misc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/misc.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/pci.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/ppc-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/ppc-stub.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/ppc_htab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/ppc_htab.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/ppc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/ppc_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/smp-tbsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/smp-tbsync.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/lib/locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/lib/locks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/lib/string.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/lib/string.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/44x_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/44x_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/4xx_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/4xx_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/fault.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/fsl_booke_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/fsl_booke_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/hashtable.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/hashtable.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/mem_pieces.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/mem_pieces.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/mmu_context.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/mmu_context.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/pgtable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/pgtable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/ppc_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/ppc_mmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/mm/tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/tlb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/bamboo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bamboo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/bamboo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bamboo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/bubinga.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bubinga.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/bubinga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bubinga.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/cpci405.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/cpci405.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/cpci405.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/cpci405.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ebony.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ebony.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ebony.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ebony.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ep405.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ep405.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm405ep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405ep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm405ep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405ep.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm405gp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm405gp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm405gpr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gpr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm405gpr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gpr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm440ep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440ep.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm440gp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440gp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm440gx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440gx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibm440sp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440sp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibmnp405h.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmnp405h.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibmnp405h.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmnp405h.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibmstb4.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmstb4.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ibmstbx25.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmstbx25.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/luan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/luan.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/luan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/luan.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ocotea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ocotea.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ocotea.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ocotea.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/ppc440spe.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ppc440spe.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/redwood5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/redwood5.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/redwood6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/redwood6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/sycamore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/sycamore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/sycamore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/sycamore.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/walnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/walnut.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/walnut.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/walnut.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/xilinx_ml300.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/xilinx_ml300.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/xilinx_ml403.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/xilinx_ml403.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/xparameters/xparameters.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/xparameters/xparameters.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/yucca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/yucca.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/4xx/yucca.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/yucca.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/83xx/mpc834x_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/83xx/mpc834x_sys.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/83xx/mpc834x_sys.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/83xx/mpc834x_sys.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc8540_ads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8540_ads.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc8540_ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8540_ads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc8555_cds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8555_cds.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc8560_ads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8560_ads.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc8560_ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8560_ads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc85xx_ads_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_ads_common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc85xx_ads_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_ads_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc85xx_cds_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_cds_common.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/mpc85xx_cds_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_cds_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/sbc8560.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc8560.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/sbc8560.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc8560.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/sbc85xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc85xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/sbc85xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc85xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/stx_gp3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/stx_gp3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/stx_gp3.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/stx_gp3.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/tqm85xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/tqm85xx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/85xx/tqm85xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/tqm85xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/apus_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/apus_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/apus_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/apus_setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/ccm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ccm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/chestnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/chestnut.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/cpci690.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/cpci690.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/ev64260.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ev64260.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/ev64360.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ev64360.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/fads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/fads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/gemini_prom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/gemini_prom.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/gemini_serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/gemini_serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/gemini_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/gemini_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/hdpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/hdpu.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/hermes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/hermes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/ip860.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ip860.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/ivms8.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ivms8.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/katana.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/katana.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/lantec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lantec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/lite5200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lite5200.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/lopec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lopec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/lwmon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lwmon.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/mpc866ads_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mpc866ads_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/mpc885ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mpc885ads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/mpc885ads_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mpc885ads_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/mvme5100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mvme5100.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/pal4_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pal4_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/pcu_e.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pcu_e.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/powerpmc250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/powerpmc250.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/pplus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pplus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/pq2ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pq2ads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/prep_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prep_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/prep_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prep_setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/prpmc750.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prpmc750.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/prpmc800.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prpmc800.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/radstone_ppc7d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/radstone_ppc7d.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/rpxclassic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/rpxclassic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/rpxlite.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/rpxlite.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/sandpoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/sandpoint.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/sbc82xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/sbc82xx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/spruce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/spruce.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/tqm8260.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/tqm8260.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/platforms/tqm8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/tqm8xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/btext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/btext.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/cpc700_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/cpc700_pic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/cpm2_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/cpm2_pic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/gen550_dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/gen550_dbg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/gen550_kgdb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/gen550_kgdb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/gt64260_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/gt64260_pic.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/ppc/syslib/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/i8259.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ibm440gp_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gp_common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ibm440gp_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gp_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ibm440gx_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gx_common.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ibm440gx_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gx_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ibm440sp_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440sp_common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ibm44x_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm44x_common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/m8260_pci_erratum9.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m8260_pci_erratum9.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/m8260_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m8260_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/m82xx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m82xx_pci.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/m8xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m8xx_setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/mpc52xx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc52xx_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/mpc52xx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc52xx_pic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/mpc52xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc52xx_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/mpc83xx_devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc83xx_devices.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/mv64360_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mv64360_pic.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/mv64x60_dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mv64x60_dbg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ocp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ocp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/open_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/open_pic.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/open_pic2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/open_pic2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc403_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc403_pic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc440spe_pcie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc440spe_pcie.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc4xx_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc4xx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_pic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc4xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc4xx_sgdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_sgdma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc83xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc83xx_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc83xx_setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc83xx_setup.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc85xx_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc85xx_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc85xx_rio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_rio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc85xx_rio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_rio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc85xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc85xx_setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_setup.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc8xx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc8xx_pic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/ppc8xx_pic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc8xx_pic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/qspan_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/qspan_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/syslib/xilinx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/xilinx_pic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/xmon/privinst.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/xmon/privinst.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/xmon/start.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/xmon/start.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/ppc/xmon/xmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/xmon/xmon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/Kconfig.debug</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/appldata/appldata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/appldata/appldata_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_base.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/appldata/appldata_mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_mem.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/appldata/appldata_net_sum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_net_sum.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/appldata/appldata_os.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_os.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/crypto/aes_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/aes_s390.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/crypto/des_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/des_s390.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/crypto/sha1_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/sha1_s390.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/crypto/sha256_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/sha256_s390.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/s390/hypfs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/hypfs/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/s390/hypfs/hypfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/hypfs/hypfs.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/s390/hypfs/hypfs_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/hypfs/hypfs_diag.c</a></td><td class='right'>696</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/s390/hypfs/hypfs_diag.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/hypfs/hypfs_diag.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/s390/hypfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/hypfs/inode.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/binfmt_elf32.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_linux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/compat_linux.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/compat_linux.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/compat_signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/compat_signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/entry.S</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/entry64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/entry64.S</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/head.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/head31.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/head31.S</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/head64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/head64.S</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/irq.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/machine_kexec.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/module.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/process.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/profile.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/profile.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/s390_ext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/s390_ext.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/s390_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/s390_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/setup.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/smp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/s390/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/stacktrace.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/time.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/traps.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/kernel/vtime.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/vtime.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/lib/delay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/lib/string.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/lib/string.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/math-emu/math.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/math-emu/math.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/cmm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/mm/cmm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/mm/fault.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/s390/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/mm/init.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/adx/irq_maskreg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/adx/irq_maskreg.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/bigsur/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/bigsur/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/bigsur/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/bigsur/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/cat68701/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/cat68701/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/cqreek/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/cqreek/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/cqreek/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/cqreek/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/dreamcast/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/dreamcast/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/ec3104/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/ec3104/setup.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/harp/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/harp/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/harp/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/harp/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/harp/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/harp/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/hp6xx/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/hp6xx/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mpc1211/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/mpc1211/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mpc1211/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/mpc1211/pci.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/mpc1211/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/mpc1211/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/overdrive/fpga.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/fpga.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/overdrive/galileo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/galileo.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/overdrive/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/overdrive/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/overdrive/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/overdrive/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/edosk7705/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/edosk7705/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/hs7751rvoip/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/hs7751rvoip/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/hs7751rvoip/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/hs7751rvoip/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/mach.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/hs7751rvoip/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/hs7751rvoip/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/rts7751r2d/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/rts7751r2d/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/rts7751r2d/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/rts7751r2d/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/rts7751r2d/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/rts7751r2d/mach.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/renesas/systemh/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/systemh/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7300/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7300/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7300/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7300/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/73180/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/73180/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/73180/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/73180/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/770x/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/770x/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/770x/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/mach.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/770x/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7751/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/irq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7751/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7751/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/mach.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7751/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/se/7751/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/sh03/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/sh03/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/sh03/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/sh03/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/sh2000/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/sh2000/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/snapgear/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/snapgear/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/superh/microdev/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/superh/microdev/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/superh/microdev/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/superh/microdev/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boards/unknown/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/unknown/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boot/compressed/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boot/compressed/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/cchips/hd6446x/hd64461/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64461/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/cchips/hd6446x/hd64461/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64461/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/cchips/hd6446x/hd64465/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64465/gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/cchips/hd6446x/hd64465/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64465/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/cchips/hd6446x/hd64465/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64465/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/cchips/voyagergx/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/voyagergx/irq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-g2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/dma/dma-g2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-pvr2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/dma/dma-pvr2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/dma/dma-sh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/dma/dma-sh.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/dma-dreamcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/dma-dreamcast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/fixups-dreamcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/fixups-dreamcast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-bigsur.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-bigsur.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-dreamcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-dreamcast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-rts7751r2d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-rts7751r2d.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-sh03.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-sh03.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/ops-snapgear.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-snapgear.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/pci-sh7751.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/pci-sh7751.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/pci-st40.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/pci-st40.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/drivers/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cf-enabler.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cf-enabler.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/irq/imask.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/imask.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/irq/intc2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/intc2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/irq/ipr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/ipr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/irq/pint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/pint.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh3/ex.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/sh3/ex.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4/ex.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/sh4/ex.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/cpu/sh4/sq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/sh4/sq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/machine_kexec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/relocate_kernel.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/relocate_kernel.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/setup.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/sh_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/sh_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/smp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/time.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/timers/timer-tmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/timers/timer-tmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/lib/memcpy-sh4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/lib/memcpy-sh4.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/cache-sh4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/cache-sh4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/clear_page.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/clear_page.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/mm/pg-sh4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/pg-sh4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh/oprofile/op_model_sh7750.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/oprofile/op_model_sh7750.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/boot/compressed/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/boot/compressed/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/boot/compressed/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/alphanum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/alphanum.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/irq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/irq_intc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/irq_intc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/led.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/pci_sh5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/pci_sh5.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/pcibios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/pcibios.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/setup.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/sh_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/sh_ksyms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/time.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/lib/c-checksum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/c-checksum.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/lib/dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/dbg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/lib/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/io.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/lib/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/iomap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/lib/memcpy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/memcpy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/lib/udelay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/udelay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mach-cayman/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-cayman/iomap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mach-cayman/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-cayman/irq.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mach-cayman/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-cayman/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mach-harp/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-harp/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mach-romram/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-romram/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mach-sim/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-sim/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mm/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mm/cache.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sh64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/asm-offsets.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/auxio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/auxio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/cpu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/devices.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/ebus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/ebus.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/entry.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/idprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/idprom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/ioport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/ioport.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/irq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sparc/kernel/of_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/of_device.c</a></td><td class='right'>796</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/pcic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/pcic.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sparc/kernel/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/prom.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/setup.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/smp.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sparc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sparc_ksyms.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sun4c_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4c_irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sun4d_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4d_irq.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sun4m_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4m_irq.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sun4m_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4m_smp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sys_solaris.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sys_solaris.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/sys_sunos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sys_sunos.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/systbls.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/systbls.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/tick14.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/tick14.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/time.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/traps.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/atomic.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/atomic.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/bitops.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/bitops.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sparc/lib/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/iomap.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/lib/rwsem.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/rwsem.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/btfixup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/btfixup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/hypersparc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/hypersparc.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/io-unit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/io-unit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/iommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/srmmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/srmmu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/sun4c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/sun4c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/swift.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/swift.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/tsunami.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/tsunami.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/mm/viking.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/viking.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/prom/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/prom/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/prom/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/prom/memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc/prom/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/prom/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/defconfig</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/auxio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/auxio.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/binfmt_elf32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/central.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/central.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/chmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/chmc.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/cpu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/devices.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/ebus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/ebus.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/entry.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/etrap.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/etrap.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/head.S</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/irq.c</a></td><td class='right'>1087</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/isa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/isa.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/kprobes.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/ktlb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/ktlb.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/of_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/of_device.c</a></td><td class='right'>988</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_common.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_impl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_impl.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_psycho.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_psycho.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_sabre.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_sabre.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_schizo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_schizo.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/pci_sun4v.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_sun4v.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/power.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/process.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/prom.c</a></td><td class='right'>1570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/rtrap.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/rtrap.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sbus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sbus.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/setup.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/signal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/smp.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sparc64_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sparc64_ksyms.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/starfire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/starfire.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sun4v_ivec.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sun4v_ivec.S</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sys32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys32.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sys_sparc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys_sparc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sys_sparc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys_sparc32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/sys_sunos32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys_sunos32.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/systbls.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/systbls.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/time.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/traps.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/tsb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/tsb.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/ttable.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/ttable.S</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/kernel/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/unaligned.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/lib/atomic.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/atomic.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/lib/bitops.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/bitops.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/lib/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/checksum.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/lib/csum_copy.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/csum_copy.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/lib/mcount.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/mcount.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/fault.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/hugetlbpage.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/init.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/mm/ultra.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/ultra.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/prom/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/prom/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/solaris/fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/solaris/fs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/solaris/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/solaris/misc.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/sparc64/solaris/socksys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/solaris/socksys.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/Kconfig.debug</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/Makefile-i386?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/Makefile-i386</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/Makefile-x86_64?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/Makefile-x86_64</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/defconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/harddog_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/harddog_kern.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/line.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/line.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/mconsole_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/mconsole_kern.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/mconsole_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/mconsole_user.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/net_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/net_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/net_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/net_user.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/port_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/port_kern.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/ssl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/ssl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/stderr_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/stderr_console.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/stdio_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/stdio_console.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/tty.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/ubd_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/ubd_kern.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/drivers/xterm_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/xterm_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/irq_user.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/irq_user.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/kern_util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/kern_util.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/line.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/line.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/longjmp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/longjmp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/os.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/os.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/skas/mode_kern_skas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/skas/mode_kern_skas.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/sysdep-x86_64/kernel-offsets.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/sysdep-x86_64/kernel-offsets.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/sysdep-x86_64/syscalls.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/sysdep-x86_64/syscalls.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/include/tt/mode_kern_tt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/tt/mode_kern_tt.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/um/kernel/exec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/exec.c</a> (renamed from arch/um/kernel/exec_kern.c)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/irq.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/ksyms.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/mem.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/physmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/physmem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/um/kernel/sigio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/sigio.c</a> (renamed from arch/um/kernel/sigio_kern.c)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/um/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/signal.c</a> (renamed from arch/um/kernel/signal_kern.c)</td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/skas/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/mem.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/skas/mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/mmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/skas/process_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/process_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/skas/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/syscall.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/skas/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/uaccess.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/syscall.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/um/kernel/syscall_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/syscall_kern.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/time.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/um/kernel/time_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/time_kern.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/arch/um/kernel/trap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/trap.c</a> (renamed from arch/um/kernel/trap_kern.c)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/tt/exec_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/exec_kern.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/tt/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/mem.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/tt/process_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/process_kern.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/tt/syscall_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/syscall_kern.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/tt/tracer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/tracer.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/um_arch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/um_arch.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/uml.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/uml.lds.S</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/file.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/irq.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/mem.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/process.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/sigio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/sigio.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/signal.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/skas/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/skas/process.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/time.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/uaccess.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/os-Linux/umid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/umid.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/scripts/Makefile.rules?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/scripts/Makefile.rules</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-i386/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/checksum.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-i386/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-i386/sys_call_table.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/sys_call_table.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-i386/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/syscalls.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-ppc/misc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-ppc/misc.S</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-x86_64/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-x86_64/signal.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-x86_64/syscall_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-x86_64/syscall_table.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/um/sys-x86_64/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-x86_64/syscalls.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/anna.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/anna.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/as85ep1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/as85ep1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/fpga85e2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/fpga85e2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/gbus_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/gbus_int.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/irq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/ma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/ma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/me2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/me2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/rte_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_cb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/rte_cb_leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_cb_leds.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/rte_ma1_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_ma1_cb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/rte_mb_a_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_mb_a_pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/rte_me2_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_me2_cb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/rte_nb85e_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_nb85e_cb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/sim.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/sim.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/sim85e2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/sim85e2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/syscalls.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/teg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/teg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/v850_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/v850_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/v850/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/Kconfig</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/Kconfig.debug</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/boot/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/compressed/misc.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/boot/setup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/setup.S</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/boot/tools/build.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/tools/build.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/boot/video.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/video.S</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/crypto/aes-x86_64-asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/crypto/aes-x86_64-asm.S</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/crypto/aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/crypto/aes.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/defconfig</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/audit.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/fpu32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/fpu32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/ia32_binfmt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ia32_binfmt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/ia32_signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ia32_signal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/ia32entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ia32entry.S</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/ptrace32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ptrace32.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/ia32/sys_ia32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/sys_ia32.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/acpi/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/acpi/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/acpi/processor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/acpi/processor.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/acpi/sleep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/acpi/sleep.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/aperture.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/aperture.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/apic.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/asm-offsets.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/audit.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/crash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/crash.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/e820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/e820.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/early_printk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/early_printk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/entry.S</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/functionlist?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/functionlist</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/genapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/genapic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/genapic_cluster.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/genapic_cluster.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/genapic_flat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/genapic_flat.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/head64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/head64.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/i387.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/i387.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/i8259.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/io_apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/io_apic.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/irq.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/k8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/k8.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/kprobes.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/machine_kexec.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/mce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/mce.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/mce_amd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/mce_amd.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/module.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/mpparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/mpparse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/nmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/nmi.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/pci-calgary.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-calgary.c</a></td><td class='right'>1020</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/pci-dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-dma.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/pci-gart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-gart.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/pci-nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-nommu.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/pci-swiotlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-swiotlb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/pmtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pmtimer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/process.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/reboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/reboot.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/setup.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/setup64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/setup64.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/signal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/smp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/smpboot.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/stacktrace.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/suspend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/suspend.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/syscall.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/tce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/tce.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/time.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/traps.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/vmlinux.lds.S</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/vsyscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/vsyscall.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/kernel/x8664_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/x8664_ksyms.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/lib/csum-partial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/csum-partial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/lib/csum-wrappers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/csum-wrappers.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/delay.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/lib/memmove.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/memmove.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/lib/thunk.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/thunk.S</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/lib/usercopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/usercopy.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/fault.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/init.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/ioremap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/mmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/pageattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/pageattr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/mm/srat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/srat.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/pci/k8-bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/pci/k8-bus.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/x86_64/pci/mmconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/pci/mmconfig.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/boot/boot-elf/bootstrap.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/boot/boot-elf/bootstrap.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/boot/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/boot/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/coprocessor.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/coprocessor.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/entry.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/head.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/irq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/pci.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/platform.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/process.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/ptrace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/setup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/signal.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/syscalls.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/time.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/traps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/vmlinux.lds.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/kernel/xtensa_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/xtensa_ksyms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/mm/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/platform-iss/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/platform-iss/console.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/platform-iss/network.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/platform-iss/network.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/arch/xtensa/platform-iss/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/platform-iss/setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/Kconfig.iosched?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/Kconfig.iosched</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/as-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/as-iosched.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/blktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/blktrace.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/cfq-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/cfq-iosched.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/deadline-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/deadline-iosched.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/elevator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/elevator.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/genhd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/genhd.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/ioctl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/ll_rw_blk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/ll_rw_blk.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/block/noop-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/noop-iosched.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/aes.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/anubis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/anubis.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/api.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/api.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/arc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/arc4.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/blowfish.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/blowfish.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/cast5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/cast5.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/cast6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/cast6.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/cipher.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/cipher.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/compress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/compress.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/crc32c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/crc32c.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/crypto_null.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/crypto_null.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/deflate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/deflate.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/des.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/des.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/digest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/digest.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/khazad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/khazad.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/md4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/md4.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/md5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/md5.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/michael_mic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/michael_mic.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/serpent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/serpent.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/sha1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/sha1.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/sha256.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/sha256.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/sha512.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/sha512.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/tcrypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tcrypt.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/tcrypt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tcrypt.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/tea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tea.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/tgr192.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tgr192.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/twofish.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/twofish.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/crypto/wp512.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/wp512.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acorn/block/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acorn/block/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acorn/block/mfmhd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acorn/block/mfmhd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/ac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/ac.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/acpi_memhotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/acpi_memhotplug.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/asus_acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/asus_acpi.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/battery.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/battery.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/bus.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/button.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/button.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/cm_sbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/cm_sbs.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/container.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/container.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/debug.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsfield.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsfield.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsinit.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsmethod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsmethod.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsmthdat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsmthdat.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsobject.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsopcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsopcode.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dsutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsutils.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dswexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswexec.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dswload.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswload.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dswscope.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswscope.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/dispatcher/dswstate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswstate.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/dock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dock.c</a></td><td class='right'>740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/ec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/ec.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/event.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evevent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evevent.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evgpe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evgpe.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evgpeblk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evgpeblk.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evmisc.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evregion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evregion.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evrgnini.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evrgnini.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evsci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evsci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evxface.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evxfevnt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evxfevnt.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/events/evxfregn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evxfregn.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exconfig.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exconvrt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exconvrt.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/excreate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/excreate.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exdump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exdump.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exfield.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exfield.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exfldio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exfldio.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exmisc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exmutex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exmutex.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exnames.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exnames.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exoparg1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg1.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exoparg2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg2.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exoparg3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg3.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exoparg6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg6.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exprep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exprep.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exregion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exregion.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exresnte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exresnte.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exresolv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exresolv.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exresop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exresop.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exstore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exstore.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exstoren.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exstoren.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exstorob.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exstorob.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exsystem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exsystem.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/executer/exutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exutils.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/fan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/fan.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/glue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/glue.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/hardware/hwacpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwacpi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/hardware/hwgpe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwgpe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/hardware/hwregs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwregs.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/hardware/hwsleep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwsleep.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/hardware/hwtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwtimer.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/hotkey.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hotkey.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/i2c_ec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/i2c_ec.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/i2c_ec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/i2c_ec.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/ibm_acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/ibm_acpi.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/motherboard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/motherboard.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsaccess.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsalloc.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsdump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsdump.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsdumpdv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsdumpdv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nseval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nseval.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsinit.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsload.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsload.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsnames.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsnames.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsobject.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsparse.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nssearch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nssearch.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsutils.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nswalk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nswalk.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsxfeval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsxfeval.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsxfname.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsxfname.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/namespace/nsxfobj.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsxfobj.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/numa.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/osl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/osl.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psargs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psargs.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psloop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psloop.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psopcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psopcode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psparse.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psscope.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psscope.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/pstree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/pstree.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psutils.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/pswalk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/pswalk.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/parser/psxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psxface.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_bind.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_bind.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_irq.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_link.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_link.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/pci_root.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_root.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/power.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_core.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_idle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_idle.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_perflib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_perflib.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_thermal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_thermal.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/processor_throttling.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_throttling.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rscalc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rscalc.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rscreate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rscreate.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rsdump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsdump.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rsinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsinfo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rslist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rslist.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rsmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsmisc.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rsutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsutils.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/resources/rsxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsxface.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/acpi/sbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sbs.c</a></td><td class='right'>1766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/scan.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/sleep/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sleep/main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/sleep/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sleep/proc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/sleep/wakeup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sleep/wakeup.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/system.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/system.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbconvrt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbconvrt.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbget.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbgetall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbgetall.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbinstal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbinstal.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbrsdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbrsdt.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbutils.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbxface.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/tables/tbxfroot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbxfroot.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/thermal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/thermal.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utalloc.c</a></td><td class='right'>636</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utcache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utcache.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utcopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utcopy.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utdebug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utdebug.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utdelete.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utdelete.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/uteval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/uteval.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utglobal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utglobal.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utinit.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utmath.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utmath.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utmisc.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utmutex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utmutex.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utobject.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utresrc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utresrc.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utstate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utstate.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utilities/utxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utxface.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/utils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utils.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/acpi/video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/video.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/amba/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/amba/bus.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/adummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/adummy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/ambassador.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/ambassador.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/ambassador.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/ambassador.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/eni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/eni.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/firestream.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/firestream.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/fore200e.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/fore200e.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/fore200e.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/fore200e.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/he.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/he.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/horizon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/horizon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/horizon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/horizon.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/idt77105.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/idt77105.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/idt77105.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/idt77105.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/idt77252.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/idt77252.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/iphase.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/iphase.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/iphase.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/iphase.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/lanai.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/lanai.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/nicstar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/nicstar.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/suni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/suni.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/zatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/zatm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/atm/zatm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/zatm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/attribute_container.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/attribute_container.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/base.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/base.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/bus.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/class.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/core.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/cpu.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/dmapool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/dmapool.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/firmware_class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/firmware_class.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/base/hypervisor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/hypervisor.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/base/isa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/isa.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/memory.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/node.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/node.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/platform.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/resume.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/resume.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/shutdown.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/shutdown.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/power/suspend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/suspend.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/base/power/trace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/trace.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/sys.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/base/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/topology.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/DAC960.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/DAC960.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/acsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/acsi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/acsi_slm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/acsi_slm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/amiflop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/amiflop.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/aoe/aoechr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/aoe/aoechr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/aoe/aoenet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/aoe/aoenet.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cciss.c</a></td><td class='right'>3218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 13.0%;'/><td class='none' style='width: 73.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cciss.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cciss_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cciss_scsi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/cpqarray.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cpqarray.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/floppy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/floppy.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/loop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/loop.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/nbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/nbd.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/paride.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/paride.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/pf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/pg.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/paride/pt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/pt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/pktcdvd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/pktcdvd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/ps2esdi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/ps2esdi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/rd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/rd.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/swim3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/swim3.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/sx8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/sx8.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/ub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/ub.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/umem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/umem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/viodasd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/viodasd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/xd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/xd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/block/z2ram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/z2ram.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bcm203x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bcm203x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bfusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bfusb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bluecard_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bluecard_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bpa10x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bpa10x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/bt3c_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bt3c_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/btuart_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/btuart_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/dtl1_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/dtl1_cs.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_bcsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_bcsp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_h4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_h4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_ldisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_ldisc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_usb.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_usb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/bluetooth/hci_vhci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_vhci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/aztcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/aztcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/cdrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/cdrom.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/cdu31a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/cdu31a.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/cm206.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/cm206.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/gscd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/gscd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/mcdx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/mcdx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/optcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/optcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/sbpcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/sbpcd.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/sjcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/sjcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/sonycd535.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/sonycd535.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cdrom/viocd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/viocd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/Kconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/alpha-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/alpha-agp.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/amd-k7-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/amd-k7-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/amd64-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/amd64-agp.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/ati-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/ati-agp.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/efficeon-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/efficeon-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/frontend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/frontend.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/generic.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/hp-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/hp-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/intel-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/intel-agp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/nvidia-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/nvidia-agp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/sgi-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/sgi-agp.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/agp/uninorth-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/uninorth-agp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/amiserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/amiserial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/applicom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/applicom.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/consolemap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/consolemap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/cs5535_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/cs5535_gpio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/cyclades.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/cyclades.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/decserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/decserial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drmP.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drmP.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_memory.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm_memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm_memory_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_memory_debug.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm_scatter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_scatter.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/drm_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/ffb_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/ffb_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/i810_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i810_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/i830_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i830_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/i915_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_dma.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/i915_drm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_drm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/i915_drv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_drv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/i915_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_irq.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/mga_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/mga_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/r128_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/r128_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/radeon_cp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_cp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/radeon_drm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_drm.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/radeon_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/radeon_drv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_drv.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/radeon_state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_state.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/savage_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/savage_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/sis_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/sis_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/tdfx_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/tdfx_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/via_dmablit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/via_dmablit.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/drm/via_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/via_drv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ds1286.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ds1286.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ds1302.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ds1302.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ds1620.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ds1620.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/dsp56k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/dsp56k.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/dtlk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/dtlk.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ec3104_keyb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ec3104_keyb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/efirtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/efirtc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/epca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/epca.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/esp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/fdc-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/fdc-io.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape-calibr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-calibr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape-ctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-ctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape-init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape-proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-setup.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape-tracing.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-tracing.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/lowlevel/ftape_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape_syms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/zftape/zftape-ctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/zftape/zftape-ctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/zftape/zftape-ctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/zftape/zftape-ctl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ftape/zftape/zftape-init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/zftape/zftape-init.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/genrtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/genrtc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hangcheck-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hangcheck-timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hpet.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvc_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvc_console.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvc_rtas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvc_rtas.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvcs.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/hvsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvsi.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/char/hw_random.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random.c</a></td><td class='right'>698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/Kconfig</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/amd-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/amd-rng.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/core.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/geode-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/geode-rng.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/intel-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/intel-rng.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/ixp4xx-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/ixp4xx-rng.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/omap-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/omap-rng.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/hw_random/via-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random/via-rng.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/i8k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/i8k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ip2/i2ellis.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ip2/i2ellis.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ip2/ip2main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ip2/ip2main.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ip27-rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ip27-rtc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_devintf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_devintf.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_msghandler.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_msghandler.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_poweroff.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_poweroff.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_si_intf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_si_intf.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ipmi/ipmi_watchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_watchdog.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/isicom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/isicom.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/istallion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/istallion.c</a></td><td class='right'>1852</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 9.6%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ite_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ite_gpio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/keyboard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/keyboard.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/lcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/lcd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/lp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/lp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mbcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mbcs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mem.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/misc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mmtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mmtimer.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/moxa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/moxa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mwave/3780i.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mwave/3780i.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mwave/mwavedd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mwave/mwavedd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/mxser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mxser.c</a></td><td class='right'>840</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/n_hdlc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/n_hdlc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/n_r3964.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/n_r3964.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/n_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/n_tty.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/nsc_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nsc_gpio.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nvram.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/nwbutton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nwbutton.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/nwflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nwflash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/char/pc8736x_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pc8736x_gpio.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pcmcia/cm4000_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pcmcia/cm4000_cs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pcmcia/cm4040_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pcmcia/cm4040_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pcmcia/synclink_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pcmcia/synclink_cs.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/ppdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ppdev.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/pty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pty.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/qtronix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/qtronix.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/random.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/random.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/raw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/raw.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/daemon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/daemon.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/func.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/func.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/host.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/host.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/port.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/port.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rio_linux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rio_linux.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rio_linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rio_linux.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rioboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioboot.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/riocmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riocmd.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rioctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioctrl.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rioinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioinit.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/riointr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riointr.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rioparam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioparam.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/rioroute.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioroute.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/riotable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riotable.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/riotty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riotty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rio/unixrup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/unixrup.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/riscom8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/riscom8.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rocket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rocket.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rtc.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/s3c2410-rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/s3c2410-rtc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/scx200_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/scx200_gpio.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/serial167.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/serial167.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/snsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/snsc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/snsc_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/snsc_event.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/sonypi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/sonypi.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/specialix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/specialix.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/stallion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/stallion.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/sx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/sx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/synclink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/synclink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/synclink_gt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/synclink_gt.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/synclinkmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/synclinkmp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/sysrq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/sysrq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tb0219.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tb0219.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tipar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tipar.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tlclk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tlclk.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/toshiba.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/toshiba.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm_atmel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_atmel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm_infineon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_infineon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm_nsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_nsc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tpm/tpm_tis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_tis.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/tty_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tty_io.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vc_screen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vc_screen.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/viocons.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/viocons.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/viotape.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/viotape.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vme_scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vme_scc.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vr41xx_giu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vr41xx_giu.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vt.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/vt_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vt_ioctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/acquirewdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/acquirewdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/advantechwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/advantechwdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/alim1535_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/alim1535_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/alim7101_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/alim7101_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/at91_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/at91_wdt.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/booke_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/booke_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/cpu5wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/cpu5wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/ep93xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ep93xx_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/eurotechwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/eurotechwdt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/i6300esb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/i6300esb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/i8xx_tco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/i8xx_tco.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/ib700wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ib700wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/ibmasr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ibmasr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/indydog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/indydog.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/ixp2000_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ixp2000_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/ixp4xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ixp4xx_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/machzwd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/machzwd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/mixcomwd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mixcomwd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/mpc83xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mpc83xx_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/mpc8xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mpc8xx_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/mpcore_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mpcore_wdt.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/mv64x60_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mv64x60_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/pcwd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/pcwd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/pcwd_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/pcwd_pci.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/pcwd_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/pcwd_usb.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/s3c2410_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/s3c2410_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/sa1100_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sa1100_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/sbc60xxwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sbc60xxwdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/sbc8360.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sbc8360.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/sbc_epx_c3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sbc_epx_c3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/sc1200wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sc1200wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/sc520_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sc520_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/scx200_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/scx200_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/shwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/shwdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/softdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/softdog.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/w83627hf_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/w83627hf_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/w83877f_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/w83877f_wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/w83977f_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/w83977f_wdt.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wafer5823wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wafer5823wdt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wd501p.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wd501p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wdrtas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdrtas.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wdt285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt285.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wdt977.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt977.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/char/watchdog/wdt_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt_pci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/clocksource/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/clocksource/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/clocksource/acpi_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/clocksource/acpi_pm.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/clocksource/cyclone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/clocksource/cyclone.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/clocksource/scx200_hrt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/clocksource/scx200_hrt.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/connector/cn_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/connector/cn_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/connector/cn_queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/connector/cn_queue.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/connector/connector.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/connector/connector.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_conservative.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_conservative.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_ondemand.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_ondemand.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_stats.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/cpufreq_userspace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_userspace.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/cpufreq/freq_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/freq_table.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/crypto/padlock-aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/crypto/padlock-aes.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/Kconfig</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/dmaengine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/dmaengine.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/ioatdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/ioatdma.c</a></td><td class='right'>841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/ioatdma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/ioatdma.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/ioatdma_hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/ioatdma_hw.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/ioatdma_io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/ioatdma_io.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/ioatdma_registers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/ioatdma_registers.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/dma/iovlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/dma/iovlock.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/amd76x_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/amd76x_edac.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/e752x_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/e752x_edac.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/e7xxx_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/e7xxx_edac.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_mc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/edac_mc.c</a></td><td class='right'>1097</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/edac_mc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/edac_mc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/i82860_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/i82860_edac.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/i82875p_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/i82875p_edac.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/edac/r82600_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/r82600_edac.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/eisa/virtual_root.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/eisa/virtual_root.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/fc4/fc_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/fc4/fc_syms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/fc4/soc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/fc4/soc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/fc4/socal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/fc4/socal.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/dell_rbu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/dell_rbu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/dmi_scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/dmi_scan.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/efivars.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/efivars.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/firmware/pcdp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/pcdp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/Kconfig</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hwmon/abituguru.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/abituguru.c</a></td><td class='right'>1432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/asb100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/asb100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/f71805f.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/f71805f.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/hdaps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/hdaps.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/hwmon-vid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/hwmon-vid.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hwmon/lm70.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm70.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm78.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm78.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm80.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm80.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm83.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm83.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/lm87.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm87.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/sis5595.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/sis5595.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/smsc47m1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/smsc47m1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hwmon/smsc47m192.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/smsc47m192.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83627ehf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83627ehf.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83627hf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83627hf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83781d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83781d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/hwmon/w83791d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83791d.c</a></td><td class='right'>1255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/hwmon/w83792d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83792d.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/algos/i2c-algo-bit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-bit.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/algos/i2c-algo-ite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-ite.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/algos/i2c-algo-pca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-pca.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/algos/i2c-algo-pcf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-pcf.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/algos/i2c-algo-sibyte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-sibyte.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-i801.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-i801.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ibm_iic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-ibm_iic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-iop3xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-iop3xx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-iop3xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-iop3xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-mpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-mpc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-nforce2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-nforce2.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-ocores.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-ocores.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-piix4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-piix4.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-powermac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-powermac.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-pxa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-pxa.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/i2c-s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-s3c2410.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/scx200_acb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/scx200_acb.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/busses/scx200_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/scx200_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/isp1301_omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/isp1301_omap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/m41t00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/m41t00.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/pca9539.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/pca9539.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/chips/tps65010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/tps65010.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/i2c-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/i2c-core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/i2c/i2c-dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/i2c-dev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/arm/icside.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/arm/icside.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/cris/ide-cris.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/cris/ide-cris.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/h8300/ide-h8300.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/h8300/ide-h8300.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-cd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-cd.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-disk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-disk.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-dma.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-floppy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-floppy.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-io.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-iops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-iops.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-lib.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-probe.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-tape.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-tape.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-taskfile.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-taskfile.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide-timing.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-timing.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/ali14xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/ali14xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/dtc2278.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/dtc2278.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/gayle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/gayle.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/hd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/hd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/ht6560b.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/ht6560b.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/macide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/macide.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/q40ide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/q40ide.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/qd65xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/qd65xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/legacy/umc8672.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/umc8672.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/aec62xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/aec62xx.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/alim15x3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/alim15x3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/amd74xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/amd74xx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/atiixp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/atiixp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cmd640.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cmd640.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cmd64x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cmd64x.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cs5520.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cs5520.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cs5530.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cs5530.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cs5535.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cs5535.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/cy82c693.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cy82c693.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/generic.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/hpt34x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/hpt34x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/hpt366.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/hpt366.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/it8172.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/it8172.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/it821x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/it821x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/ns87415.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/ns87415.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/pdc202xx_new.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/pdc202xx_new.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/pdc202xx_old.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/pdc202xx_old.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/piix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/piix.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/sc1200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sc1200.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/serverworks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/serverworks.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/sgiioc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sgiioc4.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/siimage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/siimage.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/sis5513.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sis5513.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/sl82c105.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sl82c105.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/slc90e66.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/slc90e66.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/triflex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/triflex.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/trm290.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/trm290.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/pci/via82cxxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/via82cxxx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ppc/mpc8xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ppc/mpc8xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/ppc/pmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ppc/pmac.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ide/setup-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/setup-pci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/config_roms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/config_roms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/csr1212.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/csr1212.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/csr1212.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/csr1212.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/dma.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/dv1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/dv1394.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/eth1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/eth1394.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/eth1394.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/eth1394.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/highlevel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/highlevel.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/hosts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/hosts.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/hosts.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/hosts.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/ieee1394_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ieee1394_core.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/ieee1394_core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ieee1394_core.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/ieee1394_transactions.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ieee1394_transactions.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/nodemgr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/nodemgr.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/ohci1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ohci1394.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/ohci1394.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ohci1394.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/oui2c.sh?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/oui2c.sh</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/pcilynx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/pcilynx.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/pcilynx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/pcilynx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/raw1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/raw1394.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/sbp2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/sbp2.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/sbp2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/sbp2.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/ieee1394/video1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/video1394.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/core/addr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/addr.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/cache.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/cm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/cm.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/core/cma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/cma.c</a></td><td class='right'>1929</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/fmr_pool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/fmr_pool.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/mad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/mad.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/mad_priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/mad_priv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/mad_rmpp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/mad_rmpp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/sa_query.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/sa_query.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/ucm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/ucm.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/uverbs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/uverbs_cmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs_cmd.c</a></td><td class='right'>971</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/uverbs_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs_main.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/core/uverbs_marshall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs_marshall.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/core/verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/verbs.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_common.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_cq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_cq.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_diag.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_driver.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_eeprom.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_file_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_file_ops.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_fs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_ht400.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_ht400.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_init_chip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_init_chip.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_intr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_intr.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_kernel.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_keys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_keys.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_layer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_layer.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_layer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_layer.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_mad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_mad.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_mr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_mr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_pe800.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_pe800.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_qp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_qp.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_rc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_rc.c</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_registers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_registers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_ruc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_ruc.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_srq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_srq.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_stats.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_sysfs.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_uc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_uc.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_ud.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_ud.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_user_pages.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_user_pages.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_verbs.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_verbs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_verbs.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_verbs_mcast.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_wc_x86_64.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/ips_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ips_common.h</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/ipath/verbs_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/verbs_debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_av.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_av.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_cmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_cmd.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_cq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_cq.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_eq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_eq.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_mad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_mad.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_provider.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_provider.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_provider.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_qp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_qp.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_reset.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/hw/mthca/mthca_srq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_srq.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_ib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/ipoib/ipoib_verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_verbs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iscsi_iser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></td><td class='right'>685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iscsi_iser.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/iscsi_iser.h</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iser_initiator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/iser_initiator.c</a></td><td class='right'>738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iser_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/iser_memory.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/iser/iser_verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/iser/iser_verbs.c</a></td><td class='right'>827</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srp/ib_srp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/srp/ib_srp.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/infiniband/ulp/srp/ib_srp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/srp/ib_srp.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/evdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/evdev.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/gameport/emu10k1-gp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/gameport/emu10k1-gp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/gameport/ns558.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/gameport/ns558.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/input.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joydev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joydev.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/a3d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/a3d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/analog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/analog.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/cobra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/cobra.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/db9.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/db9.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/gamecon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/gamecon.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/gf2k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/gf2k.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/grip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/grip.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/guillemot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/guillemot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/iforce/iforce-ff.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/iforce/iforce-ff.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/iforce/iforce-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/iforce/iforce-main.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/iforce/iforce.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/iforce/iforce.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/interact.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/interact.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/magellan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/magellan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/sidewinder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/sidewinder.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/spaceball.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/spaceball.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/spaceorb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/spaceorb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/stinger.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/stinger.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/twidjoy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/twidjoy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/joystick/warrior.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/warrior.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/amikbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/amikbd.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/atkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/atkbd.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/corgikbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/corgikbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/hilkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/hilkbd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/lkkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/lkkbd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/locomokbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/locomokbd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/newtonkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/newtonkbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/spitzkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/spitzkbd.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/sunkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/sunkbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/keyboard/xtkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/xtkbd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/ixp4xx-beeper.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/ixp4xx-beeper.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/sparcspkr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/sparcspkr.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/misc/wistron_btns.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/wistron_btns.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/alps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/alps.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/inport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/inport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/psmouse-base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/psmouse-base.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/rpcmouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/rpcmouse.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/sermouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/sermouse.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mouse/vsxxxaa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/vsxxxaa.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/mousedev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mousedev.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/power.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/ct82c710.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/ct82c710.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/gscps2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/gscps2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/i8042-sparcio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/i8042-sparcio.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/i8042.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/i8042.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/i8042.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/i8042.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/libps2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/libps2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/pcips2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/pcips2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/serio/serio_raw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/serio_raw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/ads7846.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/ads7846.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/corgi_ts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/corgi_ts.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/gunze.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/gunze.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/h3600_ts_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/h3600_ts_input.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/hp680_ts_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/hp680_ts_input.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/touchscreen/mtouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/mtouch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/input/tsdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/tsdev.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/capi/capi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/capi/capi.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/capi/capifs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/capi/capifs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/capi/capiutil.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/capi/capiutil.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/divert/divert_procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/divert/divert_procfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/divert/isdn_divert.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/divert/isdn_divert.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/bas-gigaset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/bas-gigaset.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/common.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/ev-layer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/ev-layer.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/gigaset.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/gigaset.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/interface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/interface.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/proc.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/gigaset/usb-gigaset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/usb-gigaset.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/b1dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/b1dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/b1pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/b1pci.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/b1pcmcia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/b1pcmcia.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/c4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/c4.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/avm/t1pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/t1pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/capimain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/capimain.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/diva_didd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/diva_didd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/divamnt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divamnt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/divasi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divasi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/divasmain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divasmain.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/divasproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divasproc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hardware/eicon/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/asuscom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/asuscom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/avm_a1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/avm_a1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/avm_a1p.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/avm_a1p.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/avm_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/avm_pci.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/bkm_a4t.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/bkm_a4t.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/bkm_a8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/bkm_a8.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/config.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/diva.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/diva.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/elsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/elsa.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/elsa_ser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/elsa_ser.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/enternow_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/enternow_pci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/gazel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/gazel.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hfc4s8s_l1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc4s8s_l1.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hfc_2bds0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_2bds0.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hfc_2bs0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_2bs0.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hfc_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_pci.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hfc_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_usb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hfcscard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfcscard.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hisax.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hisax.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hisax_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hisax_debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/hisax_fcpcipnp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hisax_fcpcipnp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/icc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/icc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/icc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/icc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/ipacx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/ipacx.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/isdnl3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/isdnl3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/isurf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/isurf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/ix1_micro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/ix1_micro.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/jade.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/jade.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/l3dss1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/l3dss1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/mic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/mic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/netjet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/netjet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/niccy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/niccy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/nj_s.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/nj_s.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/nj_u.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/nj_u.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/q931.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/q931.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/s0box.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/s0box.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/saphir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/saphir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/sedlbauer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/sedlbauer.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/sedlbauer_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/sedlbauer_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/sportster.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/sportster.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/st5481.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/st5481.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/st5481_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/st5481_init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/teleint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/teleint.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/teles0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/teles0.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/teles3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/teles3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/telespci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/telespci.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hisax/w6692.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/w6692.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hysdn/boardergo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/boardergo.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hysdn/hysdn_defs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/hysdn_defs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hysdn/hysdn_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/hysdn_init.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/hysdn/hysdn_sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/hysdn_sched.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/isdn_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_common.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/isdn_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_net.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/isdn_ppp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_ppp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/isdn_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_tty.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/isdn_tty.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_tty.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/i4l/isdn_x25iface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_x25iface.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/isdnloop/isdnloop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/isdnloop/isdnloop.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/sc/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/sc/init.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/isdn/sc/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/sc/ioctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/led-class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/led-class.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/led-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/led-core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/led-triggers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/led-triggers.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/leds/leds-ams-delta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-ams-delta.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-corgi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-corgi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-ixp4xx-gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-ixp4xx-gpio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-locomo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-locomo.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/leds/leds-net48xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-net48xx.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-s3c24xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-s3c24xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-spitz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-spitz.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/leds-tosa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-tosa.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/leds/ledtrig-heartbeat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/ledtrig-heartbeat.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/leds/ledtrig-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/ledtrig-timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/adb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/adb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/adbhid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/adbhid.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/apm_emu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/apm_emu.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/mac_hid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/mac_hid.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/macio-adb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/macio-adb.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/macio_asic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/macio_asic.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/macio_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/macio_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/mediabay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/mediabay.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/smu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/smu.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/therm_adt746x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_adt746x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/therm_pm72.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_pm72.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/therm_pm72.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_pm72.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/therm_windtunnel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_windtunnel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/via-cuda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-cuda.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/macintosh/via-pmu-backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-pmu-backlight.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/macintosh/via-pmu-event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-pmu-event.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/macintosh/via-pmu-event.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-pmu-event.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/macintosh/via-pmu-led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-pmu-led.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/via-pmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-pmu.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/macintosh/windfarm_cpufreq_clamp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/windfarm_cpufreq_clamp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/Kconfig</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/bitmap.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-crypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-crypt.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-emc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-emc.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-exception-store.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-exception-store.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-ioctl.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-linear.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-linear.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-log.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-log.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-mpath.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-mpath.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-raid1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-raid1.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-round-robin.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-round-robin.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-snap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-snap.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-stripe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-stripe.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-table.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-target.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-target.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm-zero.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-zero.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/dm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/kcopyd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/kcopyd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/linear.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/linear.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/md.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/md.c</a></td><td class='right'>741</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid1.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid10.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid5.c</a></td><td class='right'>1390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/md/raid6algos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid6algos.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/md/raid6main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid6main.c</a></td><td class='right'>2427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.7%;'/><td class='none' style='width: 80.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/ir-functions.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/ir-functions.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/ir-keymaps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/ir-keymaps.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/saa7146_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/saa7146_fops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_fops.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/saa7146_hlp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_hlp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/common/saa7146_video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_video.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/media/common/saa7146_vv_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_vv_ksyms.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-fe-tuner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-fe-tuner.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-pci.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop-usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-usb.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/b2c2/flexcop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/bt878.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/bt878.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dst.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dst.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dst_ca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dst_ca.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dst_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dst_common.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dvb-bt8xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/bt8xx/dvb-bt8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dvb-bt8xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/cinergyT2/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/cinergyT2/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/cinergyT2/cinergyT2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/cinergyT2/cinergyT2.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dmxdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dmxdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_demux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_demux.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_frontend.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_frontend.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_math.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_math.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_math.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_math.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvb_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_net.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvbdev.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-core/dvbdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvbdev.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/cxusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/cxusb.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dibusb-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dibusb-common.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dibusb-mb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dibusb-mb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/digitv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/digitv.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dtt200u-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dtt200u-fe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb-dvb.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb-i2c.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/dvb-usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/gp8psk-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/gp8psk-fe.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/gp8psk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/gp8psk.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/gp8psk.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/gp8psk.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/umt-010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/umt-010.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/vp702x-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/vp702x-fe.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/dvb-usb/vp7045-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/vp7045-fe.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/bcm3510.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/bcm3510.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/bsbe1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/bsbe1.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/bsru6.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/bsru6.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22700.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22700.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22700.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22702.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22702.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx22702.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22702.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24110.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24110.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24110.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24123.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24123.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/cx24123.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24123.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000-common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000mb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000mb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dib3000mc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000mc.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dvb-pll.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dvb-pll.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dvb-pll.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dvb-pll.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/dvb_dummy_fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/isl6421.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/isl6421.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/isl6421.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/isl6421.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/l64781.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/l64781.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/l64781.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/l64781.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lg_h06xf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lg_h06xf.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lgdt330x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lgdt330x.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lgdt330x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lgdt330x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lnbp21.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lnbp21.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/lnbp21.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lnbp21.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mt312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt312.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mt312.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt312.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mt352.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt352.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/mt352.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt352.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/nxt200x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt200x.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/nxt200x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt200x.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/nxt6000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt6000.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/nxt6000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt6000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/or51132.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/or51132.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/or51132.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/or51132.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/or51211.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/or51211.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1420.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/s5h1420.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/s5h1420.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/s5h1420.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/sp8870.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp8870.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/sp8870.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp8870.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/sp887x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp887x.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/sp887x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp887x.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0297.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0297.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0297.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0297.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0299.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0299.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/stv0299.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0299.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10021.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda10021.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda10021.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda10021.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda1004x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda1004x.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda1004x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda1004x.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda8083.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda8083.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/tda8083.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda8083.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ves1820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1820.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ves1820.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1820.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ves1x93.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1x93.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/ves1x93.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1x93.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/zl10353.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/zl10353.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/frontends/zl10353.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/zl10353.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/pluto2/pluto2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/pluto2/pluto2.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/av7110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/av7110.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/av7110_av.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110_av.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/av7110_v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110_v4l.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-av.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-av.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-ci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-ci.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget-patch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-patch.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttpci/budget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-budget/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-budget/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-dec/ttusb_dec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-radio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/miropcm20-radio.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-rds-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/miropcm20-rds-core.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/miropcm20-rds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/miropcm20-rds.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-aimslab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-aimslab.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-aztech.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-aztech.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-cadet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-cadet.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-gemtek-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-gemtek-pci.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-gemtek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-gemtek.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-maestro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-maestro.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-maxiradio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-maxiradio.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-rtrack2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-rtrack2.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-sf16fmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-sf16fmi.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-sf16fmr2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-sf16fmr2.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-terratec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-terratec.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-trust.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-trust.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-typhoon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-typhoon.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/radio/radio-zoltrix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-zoltrix.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/Kconfig</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/arv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/arv.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/bt866.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt866.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-cards.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-driver.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-gpio.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-input.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bt8xx/bttvp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttvp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/bw-qcam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bw-qcam.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/c-qcam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/c-qcam.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/compat_ioctl32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/compat_ioctl32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia2/cpia2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia2/cpia2.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia2/cpia2_v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia2/cpia2_v4l.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia_pp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia_pp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cpia_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia_usb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/cx2341x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx2341x.c</a></td><td class='right'>932</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-audio.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-core.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-core.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx25840/cx25840-vbi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-vbi.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-alsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-alsa.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-blackbird.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-blackbird.c</a></td><td class='right'>949</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-cards.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-dvb.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-i2c.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-input.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-mpeg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-mpeg.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-tvaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-tvaudio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-vbi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-vbi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88-video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-video.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/cx88/cx88.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/dsbr100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/dsbr100.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-cards.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-i2c.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-input.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx-video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-video.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/em28xx/em28xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/et61x251/et61x251_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/et61x251/et61x251_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ir-kbd-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ir-kbd-i2c.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/ks0127.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ks0127.c</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/ks0127.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ks0127.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/meye.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/meye.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/meye.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/meye.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/msp3400-driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/msp3400-driver.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/msp3400-driver.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/msp3400-driver.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/msp3400-kthreads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/msp3400-kthreads.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ov511.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ov511.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/ov511.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ov511.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/planb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/planb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/Kconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-audio.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-audio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-audio.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-context.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-context.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-context.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-ctrl.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-ctrl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-ctrl.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-debug.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-debugifc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-debugifc.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-debugifc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-debugifc.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-eeprom.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-eeprom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-eeprom.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-encoder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-encoder.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-encoder.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-encoder.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a></td><td class='right'>3094</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-hdw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-hdw.h</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.c</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-io.c</a></td><td class='right'>664</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-io.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-ioread.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-ioread.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-ioread.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-ioread.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-main.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-std.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-std.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-std.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-std.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-sysfs.c</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-sysfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-sysfs.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-tuner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-tuner.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-tuner.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-tuner.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-util.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-v4l2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-v4l2.c</a></td><td class='right'>1124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-v4l2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-v4l2.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-video-v4l.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-video-v4l.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-wm8775.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-wm8775.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2-wm8775.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2-wm8775.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pvrusb2/pvrusb2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pvrusb2/pvrusb2.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-ctrl.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-dec1.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-dec1.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec23.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-dec23.c</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-dec23.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-dec23.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-if.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-if.c</a></td><td class='right'>1341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-kiara.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-kiara.c</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-kiara.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-kiara.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-misc.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-timon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-timon.c</a></td><td class='right'>1132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-timon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-timon.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-uncompress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-uncompress.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-uncompress.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc-v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-v4l.c</a></td><td class='right'>1202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/pwc/pwc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa5246a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa5246a.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa5249.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa5249.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7110.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7115.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7115.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7127.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7127.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa6752hs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa6752hs.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-alsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-alsa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-cards.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-core.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-dvb.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-empress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-empress.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-input.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134-oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-oss.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/saa7134/saa7134.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/se401.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/se401.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/se401.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/se401.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/sn9c102/sn9c102_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/sn9c102/sn9c102_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/stradis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/stradis.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/stv680.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/stv680.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tda9875.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tda9875.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tda9887.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tda9887.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tea5767.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tea5767.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/tlv320aic23b.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tlv320aic23b.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tuner-3036.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-3036.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tuner-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-core.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tuner-simple.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-simple.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tuner-types.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-types.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tvaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tvaudio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tveeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tveeprom.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tvmixer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tvmixer.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/tvp5150.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tvp5150.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/konicawc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/konicawc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/quickcam_messenger.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/quickcam_messenger.c</a></td><td class='right'>1120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/quickcam_messenger.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/quickcam_messenger.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/usbvideo/usbvideo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/usbvideo.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l1-compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/v4l1-compat.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/v4l2-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/v4l2-common.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/video-buf-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/video-buf-dvb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videocodec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/videocodec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videocodec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/videocodec.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/videodev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/videodev.c</a></td><td class='right'>1280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/vino.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/vino.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/vivi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/vivi.c</a></td><td class='right'>664</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/vpx3220.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/vpx3220.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/w9966.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/w9966.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/w9968cf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/w9968cf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/zc0301_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_core.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/zc0301_pas202bcb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_pas202bcb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/zc0301_pb0330.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_pb0330.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zc0301/zc0301_sensor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_sensor.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran_card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_card.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_device.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_driver.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zoran_procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_procfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zr36120.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zr36120.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/media/video/zr36120_mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zr36120_mem.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/fc_log.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/fc_log.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_cnfg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_cnfg.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_history.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_history.txt</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_init.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_ioc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_ioc.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_log_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_log_sas.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_sas.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/lsi/mpi_targ.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_targ.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptbase.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptbase.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptbase.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptbase.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptfc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptfc.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptsas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptsas.c</a></td><td class='right'>999</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptscsih.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptscsih.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/fusion/mptspi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptspi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/core.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/exec-osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/exec-osm.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/i2o_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/i2o_block.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/i2o_config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/i2o_config.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/i2o_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/i2o_scsi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/iop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/iop.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/message/i2o/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mfd/ucb1x00-core.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00-ts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mfd/ucb1x00-ts.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mfd/ucb1x00.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mfd/ucb1x00.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/ibmasm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/misc/ibmasm/ibmasm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/ibmasmfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/misc/ibmasm/ibmasmfs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/misc/ibmasm/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/misc/ibmasm/module.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/at91_mci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/at91_mci.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/au1xmmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/au1xmmc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/imxmmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/imxmmc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/mmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/mmc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/mmc_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/mmc_block.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/mmci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/mmci.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/omap.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/pxamci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/pxamci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/sdhci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/sdhci.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/sdhci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/sdhci.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mmc/wbsd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/wbsd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/amd_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/amd_flash.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/cfi_cmdset_0001.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_cmdset_0001.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/cfi_cmdset_0002.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_cmdset_0002.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/cfi_cmdset_0020.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_cmdset_0020.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/cfi_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_probe.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/chipreg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/chipreg.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/gen_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/gen_probe.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/jedec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/jedec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/jedec_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/jedec_probe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/map_absent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/map_absent.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/map_ram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/map_ram.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/map_rom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/map_rom.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/chips/sharp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/sharp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/block2mtd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/block2mtd.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/doc2000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/doc2000.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/doc2001.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/doc2001.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/doc2001plus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/doc2001plus.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/docprobe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/docprobe.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/lart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/lart.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/m25p80.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/m25p80.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/ms02-nv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/ms02-nv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/mtd_dataflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/mtd_dataflash.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/mtdram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/mtdram.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/phram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/phram.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/pmc551.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/pmc551.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/devices/slram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/slram.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/inftlcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/inftlcore.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/inftlmount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/inftlmount.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/alchemy-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/alchemy-flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/amd76xrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/amd76xrom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ceiva.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ceiva.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/cfi_flagadm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/cfi_flagadm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/cstm_mips_ixx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/cstm_mips_ixx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/dbox2-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dbox2-flash.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/dc21285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dc21285.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/dilnetpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dilnetpc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/dmv182.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dmv182.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ebony.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ebony.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/edb7312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/edb7312.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/h720x-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/h720x-flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ichxrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ichxrom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/impa7.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/impa7.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/integrator-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/integrator-flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ipaq-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ipaq-flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ixp2000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ixp2000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/l440gx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/l440gx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/lasat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/lasat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/mpc1211.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/mpc1211.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/mtx-1_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/mtx-1_flash.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/nettel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/nettel.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ocotea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ocotea.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/omap-toto-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/omap-toto-flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/pcmciamtd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/pcmciamtd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/physmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/physmap.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/redwood.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/redwood.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sa1100-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sa1100-flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sbc8240.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sbc8240.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sc520cdp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sc520cdp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/scb2_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/scb2_flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/scx200_docflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/scx200_docflash.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/solutionengine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/solutionengine.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/sun_uflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sun_uflash.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/tqm834x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/tqm834x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/tqm8xxl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/tqm8xxl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/ts5500_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ts5500_flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/uclinux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/uclinux.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/walnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/walnut.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/maps/wr_sbc82xx_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/wr_sbc82xx_flash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdblock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdblock.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdblock_ro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdblock_ro.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdchar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdchar.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdconcat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdconcat.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdcore.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/mtdpart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdpart.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/Kconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ams-delta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/ams-delta.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/au1550nd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/au1550nd.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/autcpu12.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/autcpu12.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mtd/nand/cs553x_nand.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/cs553x_nand.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/diskonchip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/diskonchip.c</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/edb7312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/edb7312.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/h1910.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/h1910.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_base.c</a></td><td class='right'>3263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 14.1%;'/><td class='none' style='width: 73.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_bbt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_bbt.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_ecc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_ecc.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nand_ids.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_ids.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/nandsim.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nandsim.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ndfc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/ndfc.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ppchameleonevb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/ppchameleonevb.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/rtc_from4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/rtc_from4.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/s3c2410.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/sharpsl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/sharpsl.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/spia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/spia.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nand/toto.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/toto.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/mtd/nand/ts7250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/ts7250.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nftlcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nftlcore.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/nftlmount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nftlmount.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/onenand/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/onenand/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/onenand/onenand_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/onenand/onenand_base.c</a></td><td class='right'>718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/onenand/onenand_bbt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/onenand/onenand_bbt.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/redboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/redboot.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/mtd/rfd_ftl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/rfd_ftl.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c501.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c501.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c503.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c503.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c505.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c505.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c507.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c507.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c509.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c509.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c515.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c515.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c523.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c523.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c527.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c527.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/3c59x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c59x.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/8139cp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8139cp.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/8139too.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8139too.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/82596.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/82596.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/8390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8390.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/8390.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8390.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/Kconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/Space.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/Space.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/a2065.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/a2065.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/acenic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/acenic.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/acenic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/acenic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/acenic_firmware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/acenic_firmware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/amd8111e.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/amd8111e.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/apne.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/apne.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/appletalk/cops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/cops.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/appletalk/cops_ffdrv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/cops_ffdrv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/appletalk/cops_ltdrv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/cops_ltdrv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/appletalk/ipddp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/ipddp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arcnet/arcnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arcnet/arcnet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arcnet/com20020-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arcnet/com20020-pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ariadne.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ariadne.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/at91_ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/at91_ether.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/at91_ether.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/at91_ether.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/ether1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/ether1.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/arm/ether3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/ether3.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/at1700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/at1700.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/atarilance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/atarilance.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/au1000_eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/au1000_eth.c</a></td><td class='right'>1803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 10.9%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/au1000_eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/au1000_eth.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/b44.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/b44.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/b44.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/b44.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bmac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bnx2.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bnx2.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bnx2_fw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bnx2_fw.h</a></td><td class='right'>5256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 27.5%;'/><td class='none' style='width: 57.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bonding/bond_main.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/bonding/bond_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bonding/bond_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cassini.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cassini.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/chelsio/common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/chelsio/common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/chelsio/cxgb2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/chelsio/cxgb2.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/chelsio/sge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/chelsio/sge.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cris/eth_v10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cris/eth_v10.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cs89x0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cs89x0.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/cs89x0.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cs89x0.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/declance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/declance.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/defxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/defxx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/depca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/depca.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dgrs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dgrs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dl2k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dl2k.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dl2k.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dl2k.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dm9000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dm9000.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/dummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dummy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e100.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_ethtool.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_hw.c</a></td><td class='right'>1879</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 84.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_hw.h</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_main.c</a></td><td class='right'>774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_osdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_osdep.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/e1000/e1000_param.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_param.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/eepro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eepro.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/eepro100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eepro100.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/eexpress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eexpress.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/epic100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/epic100.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/eth16i.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eth16i.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fealnx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fealnx.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fec_8xx/fec_8xx-netta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec_8xx/fec_8xx-netta.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fec_8xx/fec_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec_8xx/fec_main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fec_8xx/fec_mii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec_8xx/fec_mii.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/forcedeth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/forcedeth.c</a></td><td class='right'>1858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/fs_enet-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/fs_enet-main.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/fs_enet-mii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/fs_enet-mii.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mac-fcc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mac-fcc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mac-fec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mac-fec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mac-scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mac-scc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mii-bitbang.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mii-bitbang.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/fs_enet/mii-fixed.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mii-fixed.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar_ethtool.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar_mii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar_mii.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gianfar_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gt96100eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gt96100eth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/gt96100eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gt96100eth.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamachi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamachi.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/6pack.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/6pack.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/baycom_ser_fdx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/baycom_ser_fdx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/baycom_ser_hdx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/baycom_ser_hdx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/bpqether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/bpqether.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/dmascc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/dmascc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/mkiss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/mkiss.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/scc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hamradio/yam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/yam.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hp-plus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hp-plus.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hp100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hp100.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/hydra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hydra.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_core.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_debug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_mal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_mal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_mal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_mal.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_phy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_rgmii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_rgmii.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_rgmii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_rgmii.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_tah.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_tah.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_tah.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_tah.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_zmii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_zmii.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibm_emac/ibm_emac_zmii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_zmii.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibmlana.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmlana.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibmlana.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmlana.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibmveth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmveth.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ibmveth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmveth.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ifb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ifb.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ioc3-eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ioc3-eth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/ali-ircc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/ali-ircc.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/au1k_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/au1k_ir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/donauboe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/donauboe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/irda-usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/irda-usb.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/irda-usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/irda-usb.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/irport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/irport.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/irda/mcs7780.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/mcs7780.c</a></td><td class='right'>1009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/irda/mcs7780.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/mcs7780.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/nsc-ircc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/nsc-ircc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/pxaficp_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/pxaficp_ir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/sa1100_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/sa1100_ir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/smsc-ircc2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/smsc-ircc2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/stir4200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/stir4200.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/irda/vlsi_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/vlsi_ir.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/iseries_veth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/iseries_veth.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_ee.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ee.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_ee.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ee.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ethtool.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_hw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_ids.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ids.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_main.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_osdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_osdep.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixgb/ixgb_param.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_param.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/caleb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/caleb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/enp2611.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/enp2611.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/ixp2400-msf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/ixp2400-msf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/ixpdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/ixpdev.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ixp2000/pm3386.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/pm3386.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/jazzsonic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/jazzsonic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/lance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/lance.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/lasi_82596.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/lasi_82596.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/loopback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/loopback.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/lp486e.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/lp486e.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mace.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mipsnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mipsnet.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mv643xx_eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mv643xx_eth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/mv643xx_eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mv643xx_eth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri10ge/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/myri10ge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri10ge/myri10ge.c</a></td><td class='right'>2868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/myri10ge_mcp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri10ge/myri10ge_mcp.h</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/myri10ge/myri10ge_mcp_gen_header.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri10ge/myri10ge_mcp_gen_header.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/myri_sbus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri_sbus.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/myri_sbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri_sbus.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/natsemi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/natsemi.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ne.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ne.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ne2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ne2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ne2k-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ne2k-pci.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/netconsole.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/netconsole.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/netx-eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/netx-eth.c</a></td><td class='right'>516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ni5010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ni5010.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ns83820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ns83820.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pci-skeleton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pci-skeleton.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/axnet_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/axnet_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/com20020_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/com20020_cs.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/fmvj18x_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/fmvj18x_cs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/nmclan_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/nmclan_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/pcnet_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/pcnet_cs.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/smc91c92_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/smc91c92_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcmcia/xirc2ps_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/xirc2ps_cs.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pcnet32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcnet32.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/cicada.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/cicada.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/davicom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/davicom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/lxt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/lxt.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/marvell.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/marvell.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/mdio_bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/mdio_bus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/phy.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/phy_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/phy_device.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/phy/qsemi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/qsemi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/phy/smsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/smsc.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/phy/vitesse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/vitesse.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ppp_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ppp_generic.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/ppp_mppe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ppp_mppe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/pppoe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pppoe.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/r8169.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/r8169.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/rrunner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/rrunner.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/rrunner.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/rrunner.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/s2io-regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/s2io-regs.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/s2io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/s2io.c</a></td><td class='right'>1715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/s2io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/s2io.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sb1250-mac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sb1250-mac.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/seeq8005.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/seeq8005.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/shaper.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/shaper.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sis190.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sis190.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sis900.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sis900.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sis900.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sis900.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sk98lin/h/xmac_ii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk98lin/h/xmac_ii.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sk98lin/skge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk98lin/skge.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sk98lin/skvpd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk98lin/skvpd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sk_mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk_mca.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/skfp/h/sba.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skfp/h/sba.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/skfp/skfddi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skfp/skfddi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/skge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skge.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/skge.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skge.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sky2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sky2.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sky2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sky2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/slhc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/slhc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/slip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/slip.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/slip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/slip.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc-ultra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc-ultra.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc-ultra32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc-ultra32.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/smc911x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc911x.c</a></td><td class='right'>2307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/smc911x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc911x.h</a></td><td class='right'>835</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc9194.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc9194.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc91x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc91x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/smc91x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc91x.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sonic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sonic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sonic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sonic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/spider_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/spider_net.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/starfire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/starfire.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/stnic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/stnic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sun3lance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sun3lance.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sunbmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunbmac.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sunbmac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunbmac.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sundance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sundance.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sungem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sungem.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sungem_phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sungem_phy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sunhme.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunhme.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sunhme.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunhme.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sunlance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunlance.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/sunqe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunqe.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tc35815.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tc35815.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tg3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tg3.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tg3.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tg3.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tlan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tlan.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/3c359.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/3c359.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/abyss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/abyss.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/lanstreamer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/lanstreamer.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/madgemc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/madgemc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/olympic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/olympic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/smctr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/smctr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/smctr_firmware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/smctr_firmware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tokenring/tmspci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/tmspci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/de2104x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/de2104x.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/de4x5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/de4x5.c</a></td><td class='right'>721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/de4x5.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/de4x5.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/dmfe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/dmfe.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/eeprom.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/interrupt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/interrupt.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/media.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/media.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/tulip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/tulip.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/tulip_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/tulip_core.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/uli526x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/uli526x.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/winbond-840.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/winbond-840.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/xircom_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/xircom_cb.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tulip/xircom_tulip_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/xircom_tulip_cb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/tun.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tun.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/typhoon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/typhoon.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/via-rhine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/via-rhine.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/via-velocity.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/via-velocity.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/via-velocity.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/via-velocity.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/c101.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/c101.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/cosa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/cosa.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/dscc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/dscc4.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/farsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/farsync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hd6457x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hd6457x.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_cisco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hdlc_cisco.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_fr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hdlc_fr.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hdlc_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hdlc_generic.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/hostess_sv11.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hostess_sv11.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/lmc/lmc_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/lmc/lmc_media.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/lmc/lmc_media.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/n2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/n2.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/pc300_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/pc300_drv.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/pci200syn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/pci200syn.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/sbni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/sbni.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/sdla.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/sdla.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/sealevel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/sealevel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/syncppp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/syncppp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wan/wanxl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/wanxl.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/Kconfig</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/airo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/airo.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/airo_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/airo_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/airport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/airport.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/arlan-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/arlan-main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/arlan-proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/arlan-proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/arlan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/arlan.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/atmel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/atmel.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/atmel_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/atmel_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/atmel_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/atmel_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_dma.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_leds.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_main.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_main.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_main.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_phy.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_pio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_pio.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_pio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_pio.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_radio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_radio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_wx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_wx.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_xmit.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hermes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hermes.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hermes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hermes.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_80211_tx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_80211_tx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_ap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_ap.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_cs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_hw.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_main.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/hostap/hostap_plx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_plx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ipw2100.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ipw2200.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ipw2200.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ipw2200.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/netwave_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/netwave_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_cs.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco_nortel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_nortel.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_pci.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco_pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_pci.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco_plx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_plx.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/orinoco_tmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_tmd.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/islpci_hotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/prism54/islpci_hotplug.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/islpci_mgt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/prism54/islpci_mgt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/prism54/prismcompat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/prism54/prismcompat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/ray_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ray_cs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/spectrum_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/spectrum_cs.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/strip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/strip.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wavelan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wavelan.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wavelan_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wavelan_cs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wavelan_cs.p.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wavelan_cs.p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/wireless/wl3501_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wl3501_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1201.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1201.c</a> (renamed from drivers/usb/net/zd1201.c)</td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1201.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1201.h</a> (renamed from drivers/usb/net/zd1201.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_chip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_chip.c</a></td><td class='right'>1615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_chip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_chip.h</a></td><td class='right'>825</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_def.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_def.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_ieee80211.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_ieee80211.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_ieee80211.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_ieee80211.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_mac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_mac.c</a></td><td class='right'>1057</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_mac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_mac.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_netdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_netdev.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_netdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_netdev.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_rf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_rf.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_rf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_rf.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_rf_al2230.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_rf_al2230.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_rf_rf2959.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_types.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_usb.c</a></td><td class='right'>1310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_usb.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_util.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_util.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/net/wireless/zd1211rw/zd_util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/zd1211rw/zd_util.h</a> (renamed from drivers/w1/w1_io.h)</td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/yellowfin.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/yellowfin.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/znet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/znet.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/net/zorro8390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/zorro8390.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/nubus/nubus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/nubus/nubus.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/nubus/nubus_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/nubus/nubus_syms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/buffer_sync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/buffer_sync.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/event_buffer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/event_buffer.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/event_buffer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/event_buffer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/oprof.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/oprof.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/oprofile/oprofilefs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/oprofilefs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/ccio-dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/ccio-dma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/dino.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/dino.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/eisa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/eisa.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/gsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/gsc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/iosapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/iosapic.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/led.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/pdc_stable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/pdc_stable.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/power.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/sba_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/sba_iommu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parisc/superio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/superio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/daisy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/daisy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/ieee1284.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/ieee1284.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/ieee1284_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/ieee1284_ops.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/parport/parport_arc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_arc.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/parport/parport_ax88796.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_ax88796.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_gsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_gsc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_gsc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_gsc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_mfc3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_mfc3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_pc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_pc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/parport_sunbpp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_sunbpp.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/procfs.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/parport/share.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/share.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/bus.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpi_pcihp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpi_pcihp.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpiphp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpiphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp_core.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpiphp_dock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp_dock.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/acpiphp_glue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp_glue.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpci_hotplug_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpci_hotplug_core.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpci_hotplug_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpci_hotplug_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpcihp_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpcihp_generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpcihp_zt5550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpcihp_zt5550.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpqphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_core.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpqphp_ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_ctrl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpqphp_nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_nvram.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpqphp_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_pci.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/cpqphp_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/fakephp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/fakephp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/ibmphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/ibmphp_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pci_hotplug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pci_hotplug.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pci_hotplug_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pci_hotplug_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp_core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_hpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp_hpc.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pciehp_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp_pci.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/pcihp_skeleton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pcihp_skeleton.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/rpaphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/rpaphp_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/sgi_hotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/sgi_hotplug.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_ctrl.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_hpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_hpc.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_pci.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/hotplug/shpchp_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_sysfs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/pci/msi-altix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/msi-altix.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/pci/msi-apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/msi-apic.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/msi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/msi.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/msi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/msi.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci-acpi.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci-driver.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci-sysfs.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/probe.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/proc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/quirks.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/remove.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/remove.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/rom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/rom.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/search.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/search.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/setup-bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/setup-bus.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pci/setup-res.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/setup-res.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/at91_cf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/at91_cf.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_db1x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_db1x00.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/au1000_pb1x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_pb1x00.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/cs.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/ds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/ds.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/hd64465_ss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/hd64465_ss.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/i82092.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/i82092.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/i82365.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/i82365.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/m32r_cfc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/m32r_cfc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/m32r_pcc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/m32r_pcc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/m8xx_pcmcia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/m8xx_pcmcia.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/omap_cf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/omap_cf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pcmcia_resource.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/pcmcia_resource.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pd6729.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/pd6729.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/pxa2xx_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/pxa2xx_base.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/rsrc_nonstatic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/rsrc_nonstatic.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_badge4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa1100_badge4.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1100_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa1100_generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa1111_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa1111_generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/sa11xx_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa11xx_base.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/soc_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/soc_common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/tcic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/tcic.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/ti113x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/ti113x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/vrc4171_card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/vrc4171_card.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/vrc4173_cardu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/vrc4173_cardu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pcmcia/yenta_socket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/yenta_socket.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/card.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/interface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/interface.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/isapnp/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/isapnp/compat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/isapnp/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/isapnp/core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/isapnp/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/isapnp/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/manager.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/manager.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/pnpacpi/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/pnpacpi/core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/pnpacpi/rsparser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/pnpacpi/rsparser.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/pnpbios/rsparser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/pnpbios/rsparser.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/quirks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/resource.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/resource.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/pnp/support.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/support.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rapidio/rio-access.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio-access.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rapidio/rio-scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio-scan.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rapidio/rio-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio-sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rapidio/rio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/Kconfig</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/class.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/interface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/interface.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-at91.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-at91.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-dev.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1307.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-ds1307.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1553.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-ds1553.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-ds1742.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-ds1742.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-isl1208.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-isl1208.c</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-lib.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-m48t86.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-m48t86.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-max6902.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-max6902.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pcf8583.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-pcf8583.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-pl031.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-pl031.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-rs5c348.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-rs5c348.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-s3c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-s3c.c</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-sa1100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-sa1100.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-v3020.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-v3020.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/rtc/rtc-vr41xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-vr41xx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_3370_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_3370_erp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_3990_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_3990_erp.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_9336_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_9336_erp.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_9343_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_9343_erp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_devmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_devmap.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_diag.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_diag.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_diag.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eckd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_eckd.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eckd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_eckd.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_eer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_eer.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_erp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_fba.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_fba.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_fba.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_fba.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_genhd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_genhd.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_int.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_int.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_ioctl.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/dasd_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/block/xpram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/xpram.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/con3215.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/con3215.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/con3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/con3270.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/ctrlchar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/ctrlchar.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/defkeymap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/defkeymap.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/fs3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/fs3270.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/keyboard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/keyboard.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/monreader.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/monreader.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/raw3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/raw3270.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/raw3270.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/raw3270.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_con.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_con.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_cpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_cpi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_quiesce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_quiesce.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_rw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_rw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_tty.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/sclp_vt220.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_vt220.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_34xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_34xx.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_3590.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_3590.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_block.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_char.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_char.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tape_std.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_std.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/tty3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tty3270.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/vmlogrdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/vmlogrdr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/char/vmwatchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/vmwatchdog.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/blacklist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/blacklist.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/ccwgroup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/ccwgroup.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/chsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/chsc.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/cio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/cio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/cio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/cio.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/cmf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/cmf.c</a></td><td class='right'>627</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/css.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/css.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/css.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/css.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device_fsm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_fsm.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device_id.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_id.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_ops.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device_pgid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_pgid.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/device_status.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_status.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/cio/qdio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/qdio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/crypto/z90crypt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/crypto/z90crypt.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/crypto/z90main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/crypto/z90main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/claw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/claw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/ctcmain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctcmain.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/ctcmain.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctcmain.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/s390/net/ctctty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctctty.c</a></td><td class='right'>1259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/s390/net/ctctty.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctctty.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/fsm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/fsm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/iucv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/iucv.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/lcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/lcs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/netiucv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/netiucv.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_eddp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_eddp.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_main.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_sys.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/qeth_tso.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_tso.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/net/smsgiucv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/smsgiucv.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/s390mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/s390mach.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_aux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_aux.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_ccw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_ccw.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_dbf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_dbf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_def.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_def.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_erp.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_ext.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_ext.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_fsf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_fsf.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_fsf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_fsf.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_qdio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_qdio.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_scsi.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_sysfs_adapter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_adapter.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_sysfs_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_driver.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_sysfs_port.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_port.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/scsi/zfcp_sysfs_unit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_unit.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/s390/sysinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/sysinfo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/aurora.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/aurora.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/bbc_envctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/bbc_envctrl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/bbc_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/bbc_i2c.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/bpp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/bpp.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/cpwatchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/cpwatchdog.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/display7seg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/display7seg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/envctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/envctrl.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/flash.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/openprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/openprom.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/riowatchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/riowatchdog.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/uctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/uctrl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/vfc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/vfc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/char/vfc_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/vfc_dev.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/dvma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/dvma.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sbus/sbus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/sbus.c</a></td><td class='right'>583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/3w-9xxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/3w-9xxx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/3w-xxxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/3w-xxxx.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/53c700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/53c700.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/53c700.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/53c700.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/53c7xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/53c7xx.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/BusLogic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/BusLogic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/BusLogic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/BusLogic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/FlashPoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/FlashPoint.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR5380.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/NCR53C9x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR53C9x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/NCR53C9x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR53C9x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/NCR53c406a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR53c406a.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/NCR_D700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR_D700.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/NCR_Q720.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR_Q720.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/a100u2w.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/a100u2w.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/a2091.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/a2091.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/a3000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/a3000.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/aachba.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/aachba.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/aacraid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/aacraid.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/commctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/commctrl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/comminit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/comminit.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/commsup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/commsup.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/dpcsup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/dpcsup.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/linit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/linit.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/rkt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/rkt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/rx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/rx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aacraid/sa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/sa.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/advansys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/advansys.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aha152x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aha152x.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aha1542.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aha1542.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aha1740.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aha1740.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ahci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ahci.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7770.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7770.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7770_osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7770_osm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_core.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx_osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_osm.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx_osm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_osm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx_osm_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_osm_pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic79xx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_proc.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_core.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_osm.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_osm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_osm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_osm_pci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_pci.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx/aic7xxx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_proc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx_old.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx_old.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/aic7xxx_old/aic7xxx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx_old/aic7xxx_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/amiga7xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/amiga7xx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/arm/acornscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/acornscsi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/arm/cumana_1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/cumana_1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/arm/cumana_2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/cumana_2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/arm/powertec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/powertec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/arm/queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/queue.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ata_piix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ata_piix.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/atari_NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/atari_NCR5380.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/atari_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/atari_scsi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/atp870u.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/atp870u.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/blz1230.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/blz1230.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/blz2060.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/blz2060.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ch.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/constants.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/constants.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/cyberstorm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/cyberstorm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/cyberstormII.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/cyberstormII.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dc395x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dc395x.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dec_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dec_esp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dmx3191d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dmx3191d.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dpt/dpti_i2o.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dpt/dpti_i2o.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dpt_i2o.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dpt_i2o.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/dtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dtc.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/eata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/eata.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/eata_pio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/eata_pio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/esp.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/esp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/esp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/fastlane.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fastlane.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/fcal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fcal.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/fd_mcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fd_mcs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/fdomain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fdomain.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/g_NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/g_NCR5380.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/g_NCR5380.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/g_NCR5380.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gdth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth.c</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gdth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gdth_kcompat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth_kcompat.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gdth_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth_proc.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gdth_proc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth_proc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/gvp11.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gvp11.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/scsi/hptiop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/hptiop.c</a></td><td class='right'>1493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/scsi/hptiop.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/hptiop.h</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ibmmca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ibmmca.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ibmvscsi/ibmvscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ibmvscsi/rpa_vscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ibmvscsi/rpa_vscsi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ide-scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ide-scsi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/imm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/imm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/imm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/imm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/in2000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/in2000.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/initio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/initio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/initio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/initio.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ipr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ipr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ips.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ips.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/iscsi_tcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/iscsi_tcp.c</a></td><td class='right'>3098</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 74.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/iscsi_tcp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/iscsi_tcp.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/jazz_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/jazz_esp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lasi700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lasi700.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libata-bmdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-bmdma.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libata-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-core.c</a></td><td class='right'>3264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 9.0%;'/><td class='none' style='width: 73.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/scsi/libata-eh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-eh.c</a></td><td class='right'>2227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libata-scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-scsi.c</a></td><td class='right'>878</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/libata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/scsi/libiscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libiscsi.c</a></td><td class='right'>1887</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_els.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc_els.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc_init.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/lpfc/lpfc_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc_scsi.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mac_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/mac_esp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mac_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/mac_scsi.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_mbox.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid/megaraid_mbox.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid/megaraid_sas.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/megaraid/megaraid_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid/megaraid_sas.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/mesh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/mesh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ncr53c8xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ncr53c8xx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ncr53c8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ncr53c8xx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/nsp32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/nsp32.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/oktagon_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/oktagon_esp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/oktagon_io.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/oktagon_io.S</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/osst.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/osst.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/osst.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/osst.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pas16.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pas16.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pcmcia/nsp_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pcmcia/nsp_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pcmcia/sym53c500_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pcmcia/sym53c500_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pdc_adma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pdc_adma.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/pluto.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pluto.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ppa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ppa.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/ppa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ppa.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla1280.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla1280.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2100.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2100_fw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2100_fw.c</a></td><td class='right'>4848</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 39.3%;'/><td class='none' style='width: 60.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2200.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2200_fw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2200_fw.c</a></td><td class='right'>5333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 43.2%;'/><td class='none' style='width: 56.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2300.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2300.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2300_fw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2300_fw.c</a></td><td class='right'>7746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 62.7%;'/><td class='none' style='width: 37.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2322.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2322.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2322_fw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2322_fw.c</a></td><td class='right'>8376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 67.8%;'/><td class='none' style='width: 32.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2400.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2400.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/ql2400_fw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2400_fw.c</a></td><td class='right'>12346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 100.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_attr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_attr.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_dbg.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_dbg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_dbg.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_def.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_def.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_devtbl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_devtbl.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_fw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_fw.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_gbl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_gbl.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_init.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_iocb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_iocb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_isr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_isr.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_mbx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_mbx.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_os.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_os.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_rscn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_rscn.c</a></td><td class='right'>1426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.6%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_settings.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_settings.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_sup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_sup.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qla2xxx/qla_version.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_version.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/qlogicpti.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qlogicpti.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/raid_class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/raid_class.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_mv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_mv.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_nv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_nv.c</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_promise.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_promise.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_qstor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_qstor.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_sil.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sil.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_sil24.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sil24.c</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_sis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sis.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_svw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_svw.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_sx4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sx4.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_uli.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_uli.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_via.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_via.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sata_vsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_vsc.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_debug.c</a></td><td class='right'>1224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_devinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_devinfo.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_error.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_error.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_lib.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_logging.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_logging.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_priv.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_proc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_sas_internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_sas_internal.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_scan.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_sysfs.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_api.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_api.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_fc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_fc.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_iscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_iscsi.c</a></td><td class='right'>1047</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_sas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_sas.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_transport_spi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_spi.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsi_typedefs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_typedefs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/scsicam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsicam.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sd.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/seagate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/seagate.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sg.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sim710.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sim710.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sr_vendor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sr_vendor.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/st.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/st.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/st.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/st.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sun3_NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sun3_NCR5380.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sun3x_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sun3x_esp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sym53c8xx_2/sym53c8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym53c8xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sym53c8xx_2/sym_glue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym_glue.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sym53c8xx_2/sym_glue.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym_glue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/sym53c8xx_2/sym_hipd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym_hipd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/t128.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/t128.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/tmscsim.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/tmscsim.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/tmscsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/tmscsim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/u14-34f.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/u14-34f.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/wd33c93.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/wd33c93.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/wd33c93.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/wd33c93.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/wd7000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/wd7000.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/scsi/zalon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/zalon.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/21285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/21285.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/68328serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/68328serial.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/68328serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/68328serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/68360serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/68360serial.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250_mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250_mca.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250_pci.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/8250_pnp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250_pnp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/amba-pl010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/amba-pl010.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/amba-pl011.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/amba-pl011.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/at91_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/at91_serial.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/clps711x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/clps711x.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/cpm_uart/cpm_uart_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_cpm1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/cpm_uart/cpm_uart_cpm1.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/cpm_uart/cpm_uart_cpm2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/cpm_uart/cpm_uart_cpm2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/crisv10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/crisv10.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/crisv10.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/crisv10.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/dz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/dz.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/icom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/icom.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/imx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/imx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/ioc4_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/ioc4_serial.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/ip22zilog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/ip22zilog.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/jsm/jsm_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/jsm/jsm_driver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/jsm/jsm_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/jsm/jsm_tty.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/m32r_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/m32r_sio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/m32r_sio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/m32r_sio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/m32r_sio_reg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/m32r_sio_reg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/mcfserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mcfserial.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/mcfserial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mcfserial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/mpc52xx_uart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mpc52xx_uart.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/mpsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mpsc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mux.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/serial/netx-serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/netx-serial.c</a></td><td class='right'>749</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/pmac_zilog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/pmac_zilog.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/pxa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/pxa.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/s3c2410.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sa1100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sa1100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/serial_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_core.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/serial_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_cs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/serial_lh7a40x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_lh7a40x.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/serial_txx9.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_txx9.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sh-sci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sh-sci.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sh-sci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sh-sci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sn_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sn_console.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/suncore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/suncore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunhv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunhv.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunsab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunsab.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunsu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunsu.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/sunzilog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunzilog.c</a></td><td class='right'>795</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/v850e_uart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/v850e_uart.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/serial/vr41xx_siu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/vr41xx_siu.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sn/ioc3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sn/ioc3.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/sn/ioc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sn/ioc4.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/spi/spi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi_bitbang.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/spi/spi_bitbang.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/spi/spi_butterfly.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/spi/spi_butterfly.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tc/lk201.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/tc/lk201.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/tc/zs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/tc/zs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/telephony/ixj.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/telephony/ixj.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/telephony/phonedev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/telephony/phonedev.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/usbatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/atm/usbatm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/atm/xusbatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/atm/xusbatm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/cdc-acm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/class/cdc-acm.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/class/cdc-acm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/class/cdc-acm.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/buffer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/buffer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/config.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/devio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/devio.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/driver.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/core/endpoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/endpoint.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/file.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hcd-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/hcd-pci.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/hcd.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/hub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/hub.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/inode.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/message.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/message.c</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/notify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/notify.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/sysfs.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/urb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/urb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/usb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/core/usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/usb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/at91_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/at91_udc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/dummy_hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/dummy_hcd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/epautoconf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/epautoconf.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/ether.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/file_storage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/file_storage.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/goku_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/goku_udc.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/inode.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/lh7a40x_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/lh7a40x_udc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/lh7a40x_udc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/lh7a40x_udc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/net2280.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/net2280.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/omap_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/omap_udc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/pxa2xx_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/pxa2xx_udc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/rndis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/rndis.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/rndis.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/rndis.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/serial.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/gadget/zero.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/zero.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-au1xxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-au1xxx.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-fsl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-fsl.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-hcd.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-pci.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ehci-sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-sched.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/hc_crisv10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/hc_crisv10.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/isp116x-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/isp116x-hcd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-at91.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-at91.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-au1xxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-au1xxx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ep93xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-ep93xx.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-hcd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-hub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-hub.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-lh7a404.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-lh7a404.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-omap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-ppc-soc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-ppc-soc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-pxa27x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-pxa27x.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-s3c2410.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/ohci-sa1111.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-sa1111.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/pci-quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/pci-quirks.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/sl811-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/sl811-hcd.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/sl811_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/sl811_cs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-debug.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-hcd.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-hcd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-hcd.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-hub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-hub.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/host/uhci-q.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-q.c</a></td><td class='right'>947</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/image/microtek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/image/microtek.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/acecad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/acecad.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/aiptek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/aiptek.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/appletouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/appletouch.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/ati_remote.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/ati_remote.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/ati_remote2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/ati_remote2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/fixp-arith.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/fixp-arith.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/hid-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid-core.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/hid-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid-debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/hid-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid-input.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/hid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/hiddev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hiddev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/itmtouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/itmtouch.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/kbtab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/kbtab.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/keyspan_remote.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/keyspan_remote.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/mtouchusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/mtouchusb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/powermate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/powermate.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/touchkitusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/touchkitusb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/usbkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/usbkbd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/usbmouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/usbmouse.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/usbtouchscreen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/usbtouchscreen.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/wacom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/wacom.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/xpad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/xpad.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/input/yealink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/yealink.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/misc/appledisplay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/appledisplay.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/misc/cypress_cy7c63.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/cypress_cy7c63.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/cytherm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/cytherm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/idmouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/idmouse.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/ldusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/ldusb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/legousbtower.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/legousbtower.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/phidgetkit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/phidgetkit.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/phidgetservo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/phidgetservo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb_con.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_con.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_init.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb_init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_init.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/sisusbvga/sisusb_struct.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_struct.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usblcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/usblcd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usbled.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/usbled.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/misc/usbtest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/usbtest.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/mon/mon_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/mon/mon_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_main.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/mon/mon_stat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_stat.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/mon/mon_text.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_text.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/mon/usb_mon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/usb_mon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/asix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/asix.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/cdc_ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/cdc_ether.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/cdc_subset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/cdc_subset.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/gl620a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/gl620a.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/net1080.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/net1080.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/pegasus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/pegasus.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/plusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/plusb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/rndis_host.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/rndis_host.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/rtl8150.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/rtl8150.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/usbnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/usbnet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/net/zaurus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/zaurus.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/airprime.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/airprime.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/anydata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/anydata.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ark3116.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ark3116.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/belkin_sa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/belkin_sa.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/bus.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/console.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/cp2101.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/cp2101.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/cyberjack.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/cyberjack.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/cypress_m8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/cypress_m8.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/digi_acceleport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/digi_acceleport.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/empeg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/empeg.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ezusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ezusb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ftdi_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ftdi_sio.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ftdi_sio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ftdi_sio.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/funsoft.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/funsoft.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/garmin_gps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/garmin_gps.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/generic.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/hp4x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/hp4x.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/io_edgeport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/io_edgeport.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/io_ti.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/io_ti.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ipaq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ipaq.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ipw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ipw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ir-usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ir-usb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/keyspan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/keyspan.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/keyspan_pda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/keyspan_pda.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/kl5kusb105.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/kl5kusb105.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/kobil_sct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/kobil_sct.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/mct_u232.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/mct_u232.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/navman.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/navman.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/omninet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/omninet.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/option.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/option.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/pl2303.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/pl2303.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/pl2303.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/pl2303.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/safe_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/safe_serial.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/usb/serial/sierra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/sierra.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/ti_usb_3410_5052.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ti_usb_3410_5052.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/usb-serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/usb-serial.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/visor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/visor.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/serial/whiteheat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/whiteheat.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/dpcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/dpcm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/freecom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/freecom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/initializers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/initializers.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/onetouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/onetouch.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/scsiglue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/scsiglue.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/shuttle_usbat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/shuttle_usbat.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/shuttle_usbat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/shuttle_usbat.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/transport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/transport.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/unusual_devs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/unusual_devs.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/usb.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/storage/usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/usb.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/usb/usb-skeleton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/usb-skeleton.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/68328fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/68328fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/Kconfig</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/S3triofb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/S3triofb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/acornfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/acornfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/amifb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/amifb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/arcfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/arcfb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/asiliantfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/asiliantfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/atafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/atafb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/aty128fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/aty128fb.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/atyfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/atyfb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/atyfb_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/atyfb_base.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/mach64_accel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/mach64_accel.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/mach64_cursor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/mach64_cursor.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/aty/radeon_backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeon_backlight.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/radeon_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeon_base.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/radeon_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeon_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/aty/radeonfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeonfb.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/au1100fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/au1100fb.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/au1200fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/au1200fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/hp680_bl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/hp680_bl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/backlight/locomolcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/locomolcd.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/bw2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/bw2.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cfbcopyarea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cfbcopyarea.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cfbfillrect.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cfbfillrect.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cfbimgblt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cfbimgblt.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cg14.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cg14.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cg3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cg3.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cg6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cg6.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/chipsfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/chipsfb.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cirrusfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cirrusfb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/bitblit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/bitblit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/dummycon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/dummycon.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon_ccw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_ccw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon_cw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_cw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon_rotate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_rotate.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fbcon_ud.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_ud.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/font_acorn_8x8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/font_acorn_8x8.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/fonts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fonts.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/mdacon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/mdacon.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/newport_con.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/newport_con.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/promcon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/promcon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/softcursor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/softcursor.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/sticon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/sticon.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/sticore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/sticore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/tileblit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/tileblit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/console/vgacon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/vgacon.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/controlfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/controlfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cyber2000fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyber2000fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cyber2000fb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyber2000fb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cyberfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyberfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/cyblafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyblafb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/dnfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/dnfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/epson1355fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/epson1355fb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbcmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbcmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbcvt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbcvt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbmem.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbmon.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/fbsysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbsysfs.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/ffb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/ffb.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/g364fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/g364fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/gbefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/gbefb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/geode/gx1fb_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/geode/gx1fb_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/geode/gxfb_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/geode/gxfb_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/hgafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/hgafb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/hitfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/hitfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/hpfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/hpfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/i810/i810-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/i810/i810-i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/i810/i810_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/i810/i810_main.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/igafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/igafb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/imacfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/imacfb.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/imsttfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/imsttfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/imxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/imxfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/intelfb/intelfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfb.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/intelfb/intelfbdrv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfbdrv.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/intelfb/intelfbhw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfbhw.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/intelfb/intelfbhw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfbhw.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/kyro/fbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/kyro/fbdev.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/leo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/leo.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/logo/logo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/logo/logo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/macfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/macfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/macmodes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/macmodes.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/macmodes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/macmodes.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_DAC1064.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_DAC1064.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_DAC1064.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_DAC1064.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_Ti3026.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_Ti3026.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_Ti3026.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_Ti3026.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_base.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_base.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/matrox/matroxfb_misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/maxinefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/maxinefb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/mbx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/mbx/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/mbx/mbxdebugfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/mbx/mbxdebugfs.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/mbx/mbxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/mbx/mbxfb.c</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/mbx/reg_bits.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/mbx/reg_bits.h</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/mbx/regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/mbx/regs.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/modedb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/modedb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/neofb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/neofb.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nv_backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_backlight.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nv_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_hw.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nv_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nv_of.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_of.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nv_proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_proto.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/nvidia/nvidia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nvidia.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/offb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/offb.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/p9100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/p9100.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/platinumfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/platinumfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pm2fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pm2fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pm3fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pm3fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pmag-aa-fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pmag-aa-fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pnx4008/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/dum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pnx4008/dum.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/fbcommon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pnx4008/fbcommon.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/pnxrgbfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pnx4008/pnxrgbfb.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/sdum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pnx4008/sdum.c</a></td><td class='right'>872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/drivers/video/pnx4008/sdum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pnx4008/sdum.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pvr2fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pvr2fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/pxafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pxafb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/q40fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/q40fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/retz3fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/retz3fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/riva/fbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/riva/fbdev.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/riva/rivafb-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/riva/rivafb-i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/riva/rivafb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/riva/rivafb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s1d13xxxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/s1d13xxxfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/s3c2410fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/s3c2410fb.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sa1100fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sa1100fb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/savage/savagefb-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/savage/savagefb-i2c.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/savage/savagefb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/savage/savagefb.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/savage/savagefb_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/savage/savagefb_driver.c</a></td><td class='right'>1477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sgivwfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sgivwfb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/init.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/init301.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/init301.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/init301.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/init301.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/initextlfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/initextlfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/osdef.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/osdef.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/sis.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/sis.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/sis_accel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/sis_accel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sis/sis_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/sis_main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/skeletonfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/skeletonfb.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sstfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sstfb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/stifb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/stifb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/sun3fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sun3fb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tcx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tcx.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tdfxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tdfxfb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tgafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tgafb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tridentfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tridentfb.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/tx3912fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tx3912fb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/valkyriefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/valkyriefb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vesafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vesafb.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vfb.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vga16fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vga16fb.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/vgastate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vgastate.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/video/virgefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/virgefb.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/masters/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/masters/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/masters/ds2482.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/ds2482.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/drivers/w1/masters/ds2490.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/ds2490.c</a> (renamed from drivers/w1/masters/dscore.c)</td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/w1/masters/ds_w1_bridge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/ds_w1_bridge.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/drivers/w1/masters/dscore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/dscore.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/slaves/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/slaves/w1_ds2433.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/w1_ds2433.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/slaves/w1_smem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/w1_smem.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/slaves/w1_therm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/w1_therm.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1_family.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_family.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1_family.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_family.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_int.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_io.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1_netlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_netlink.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/w1/w1_netlink.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_netlink.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/drivers/zorro/names.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/zorro/names.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/conv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/conv.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/error.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/error.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/fcall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/fcall.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/fcprint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/fcprint.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/fid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/fid.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/mux.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/trans_fd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/trans_fd.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/v9fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/v9fs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/v9fs_vfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/v9fs_vfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_addr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_addr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_inode.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/9p/vfs_super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_super.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/Kconfig</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/adfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/adfs/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/adfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/adfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/adfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/adfs/super.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/affs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/affs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/file.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/super.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/affs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/cell.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/cell.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/dir.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/kafsasyncd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/kafsasyncd.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/mntpt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/mntpt.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/server.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/server.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/super.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/super.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/super.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/vlocation.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/vlocation.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/afs/vnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/vnode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/aio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/aio.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/autofs/init.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/expire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/autofs4/expire.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/autofs4/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/autofs4/init.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/befs/linuxvfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/befs/linuxvfs.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bfs/bfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bfs/bfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bfs/inode.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_elf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_elf.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_elf_fdpic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_elf_fdpic.c</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_flat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_flat.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_misc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/binfmt_som.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_som.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/bio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/block_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/block_dev.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/buffer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/buffer.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/char_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/char_dev.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/CHANGES?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/CHANGES</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/README?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/README</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/asn1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/asn1.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifs_debug.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifs_debug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifs_unicode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifs_unicode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsencrypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsencrypt.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsfs.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsfs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsglob.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsglob.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifspdu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifspdu.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifsproto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsproto.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/cifssmb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifssmb.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/connect.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/connect.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/dir.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/fcntl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/fcntl.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/file.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/inode.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/link.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/link.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/misc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/netmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/netmisc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/cifs/ntlmssp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/ntlmssp.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/readdir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/readdir.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/cifs/sess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/sess.c</a></td><td class='right'>538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/smbencrypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/smbencrypt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cifs/transport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/transport.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/inode.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/psdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/psdev.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/coda/upcall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/upcall.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/compat.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/compat_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/compat_ioctl.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/dir.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/mount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/mount.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/configfs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/cramfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cramfs/inode.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dcache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/dcache.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dcookies.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/dcookies.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/debugfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/debugfs/file.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/debugfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/debugfs/inode.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/devfs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devfs/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/devfs/base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devfs/base.c</a></td><td class='right'>2836</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 23.0%;'/><td class='none' style='width: 77.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/devfs/util.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devfs/util.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/devpts/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devpts/inode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/direct-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/direct-io.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/dquot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/dquot.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/efs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/efs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/efs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/efs/super.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/efs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/efs/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/eventpoll.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/eventpoll.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/exec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/exec.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/balloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/balloc.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/ext2/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/bitmap.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/dir.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/ext2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/ext2.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/fsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/fsync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/ialloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/ialloc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/inode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/super.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext2/xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/xattr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/acl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/acl.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/balloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/balloc.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/dir.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/ialloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/ialloc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/inode.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/ioctl.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/namei.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/resize.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/resize.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/super.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/xattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/xattr.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ext3/xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/xattr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fat/inode.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fat/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fat/misc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/file.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/file_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/file_table.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs_fshead.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_fshead.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs_immed.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_immed.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs_inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_inode.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs_subr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_subr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/freevxfs/vxfs_super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_super.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fs-writeback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fs-writeback.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/fuse/control.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/control.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/dev.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/dir.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/file.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/fuse_i.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/fuse_i.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/fuse/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/inode.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/bnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/bnode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/btree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/hfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/hfs_fs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/inode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/super.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/bitmap.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/bnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/bnode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/btree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/hfsplus_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/hfsplus_fs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/inode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hfsplus/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/super.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hostfs/hostfs_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hostfs/hostfs_kern.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hpfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hpfs/hpfs_fn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/hpfs_fn.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hpfs/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/namei.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hpfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/super.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hppfs/hppfs_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hppfs/hppfs_kern.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/hugetlbfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hugetlbfs/inode.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/inode.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/inotify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/inotify.c</a></td><td class='right'>991</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/inotify_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/inotify_user.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ioctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ioprio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ioprio.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/compress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/compress.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/inode.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/isofs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/isofs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/rock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/rock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/isofs/zisofs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/zisofs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/checkpoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/checkpoint.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/commit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/commit.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/journal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/journal.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/recovery.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/recovery.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jbd/transaction.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/transaction.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs/inode-v23.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs/inode-v23.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs/intrep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs/intrep.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs/jffs_fm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs/jffs_fm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/README.Locking?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/README.Locking</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/acl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/acl.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/acl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/acl.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/build.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/build.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/compr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/compr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/compr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/compr.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/compr_zlib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/compr_zlib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/debug.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/debug.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/dir.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/erase.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/erase.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/file.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/fs.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/gc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/gc.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/jffs2/histo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/histo.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/fs/jffs2/jffs2_fs_i.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/jffs2_fs_i.h</a> (renamed from include/linux/jffs2_fs_i.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/fs/jffs2/jffs2_fs_sb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/jffs2_fs_sb.h</a> (renamed from include/linux/jffs2_fs_sb.h)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/malloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/malloc.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/nodelist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/nodelist.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/nodelist.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/nodelist.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/nodemgmt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/nodemgmt.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/os-linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/os-linux.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/readinode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/readinode.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/scan.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/security.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/security.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/summary.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/summary.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/summary.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/summary.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/super.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/symlink.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/wbuf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/wbuf.c</a></td><td class='right'>971</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jffs2/write.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/write.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/xattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/xattr.c</a></td><td class='right'>1325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/xattr.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/xattr_trusted.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/xattr_trusted.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/jffs2/xattr_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/xattr_user.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_extent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_extent.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_inode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_inode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_metapage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_metapage.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_metapage.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_metapage.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/jfs_txnmgr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_txnmgr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/jfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/super.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/libfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/libfs.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/clntlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/clntlock.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/clntproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/clntproc.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/host.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/host.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svclock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svclock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svcproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svcproc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/svcsubs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svcsubs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/lockd/xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/xdr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/locks.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/minix/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/minix/dir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/minix/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/minix/inode.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/mpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/mpage.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/msdos/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/msdos/namei.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/namei.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/namespace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/namespace.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/inode.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ioctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/mmap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/ncplib_kernel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ncplib_kernel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/ncplib_kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ncplib_kernel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/ncpsign_kernel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ncpsign_kernel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ncpfs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/symlink.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/callback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/callback.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/callback_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/callback_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/callback_xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/callback_xdr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/delegation.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/delegation.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/dir.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/direct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/direct.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/file.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/idmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/idmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/inode.c</a></td><td class='right'>1293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/nfs/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/internal.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/nfs/namespace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/namespace.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs2xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs2xdr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs3acl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs3acl.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs3proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs3proc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs3xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs3xdr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4_fs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/nfs/nfs4namespace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4namespace.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4proc.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4state.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/nfs4xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4xdr.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/pagelist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/pagelist.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/proc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/read.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/read.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/fs/nfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/super.c</a></td><td class='right'>1537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/symlink.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/sysctl.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfs/write.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/write.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/export.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/export.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4callback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4callback.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4idmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4idmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4proc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4state.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfs4xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4xdr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfscache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfscache.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfsctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfsctl.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfsfh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfsfh.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/nfssvc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfssvc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/stats.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nfsd/vfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/vfs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/nls/nls_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nls/nls_base.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/aops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/aops.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/aops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/aops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/attrib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/attrib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/file.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/inode.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/ntfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/ntfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/super.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ntfs/sysctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ntfs/sysctl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/aops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/aops.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/heartbeat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/cluster/heartbeat.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/masklog.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/cluster/masklog.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/ocfs2_heartbeat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/cluster/ocfs2_heartbeat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/cluster/tcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/cluster/tcp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dir.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmast.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmcommon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmcommon.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmconvert.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmconvert.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmdebug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmdebug.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmdebug.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmdomain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmdomain.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmfs.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmlock.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmmaster.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmmaster.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmrecovery.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmrecovery.c</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmthread.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmthread.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/dlmunlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/dlmunlock.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlm/userdlm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlm/userdlm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/dlmglue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/dlmglue.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/extent_map.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/extent_map.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/inode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/inode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/journal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/journal.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/mmap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/ocfs2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/ocfs2.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/slot_map.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/slot_map.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/super.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/symlink.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ocfs2/vote.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ocfs2/vote.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/open.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/open.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/openpromfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/openpromfs/inode.c</a></td><td class='right'>1160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/acorn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/acorn.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/check.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/check.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/partitions/devfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/devfs.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/partitions/devfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/devfs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/efi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/efi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/efi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/efi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/ibm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/ibm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/mac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/mac.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/partitions/msdos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/partitions/msdos.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/pipe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/pipe.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/pnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/pnode.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/array.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/array.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/base.c</a></td><td class='right'>1109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/internal.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/kcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/kcore.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/proc_misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/proc_misc.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/root.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/root.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/task_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/task_mmu.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/task_nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/task_nommu.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/proc/vmcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/proc/vmcore.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/qnx4/bitmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/qnx4/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/fsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/qnx4/fsync.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/qnx4/inode.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/qnx4/namei.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/qnx4/truncate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/qnx4/truncate.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ramfs/file-mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ramfs/file-mmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ramfs/file-nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ramfs/file-nommu.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ramfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ramfs/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ramfs/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ramfs/internal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/read_write.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/read_write.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/bitmap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/dir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/do_balan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/do_balan.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/file.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/fix_node.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/fix_node.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/ibalance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/ibalance.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/inode.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/journal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/journal.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/lbalance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/lbalance.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/namei.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/objectid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/objectid.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/prints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/prints.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/procfs.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/stree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/stree.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/super.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/tail_conversion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/tail_conversion.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/reiserfs/xattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/reiserfs/xattr.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/romfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/romfs/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/select.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/select.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/smbfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/smbfs/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/smbfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/smbfs/inode.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/smbfs/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/smbfs/proc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/smbfs/proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/smbfs/proto.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/smbfs/request.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/smbfs/request.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/smbfs/smbiod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/smbfs/smbiod.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/splice.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/splice.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/stat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/stat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/super.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sync.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysfs/dir.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysfs/inode.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysfs/mount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysfs/mount.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysv/dir.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysv/inode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/itree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysv/itree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysv/super.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/sysv/sysv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/sysv/sysv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/udf/file.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/udf/inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/udf/super.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/udf/symlink.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/udf/udfdecl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/udf/udfdecl.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/balloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/balloc.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/cylinder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/cylinder.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/dir.c</a></td><td class='right'>1000</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/file.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/ialloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/ialloc.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/inode.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/namei.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/super.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/truncate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/truncate.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/util.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/util.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/ufs/util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ufs/util.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/vfat/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/vfat/namei.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xattr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/Makefile-linux-2.6?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/Makefile-linux-2.6</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/kmem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/kmem.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/mrlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/mrlock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/sema.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/sema.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_aops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_aops.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_aops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_aops.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_buf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_buf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_buf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_buf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_export.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_export.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_file.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_fs_subr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_fs_subr.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_globals.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_globals.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_ioctl.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_ioctl32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_ioctl32.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_iops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_iops.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_linux.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_lrw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_lrw.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_lrw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_lrw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_stats.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_super.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_super.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_super.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_sysctl.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_sysctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_sysctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_vfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_vfs.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_vfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_vfs.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_vnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_vnode.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/linux-2.6/xfs_vnode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/linux-2.6/xfs_vnode.h</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_dquot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_dquot.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_dquot.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_dquot.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_dquot_item.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_dquot_item.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_qm.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm_bhv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_qm_bhv.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm_stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_qm_stats.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_qm_syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_qm_syscalls.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/quota/xfs_trans_dquot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/quota/xfs_trans_dquot.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/support/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/support/debug.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/support/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/support/debug.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_acl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_acl.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_acl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_acl.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_alloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_alloc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_alloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_alloc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_alloc_btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_alloc_btree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_attr.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_attr.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_attr_leaf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_attr_leaf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_behavior.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_behavior.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_bmap.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_bmap.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_bmap_btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_bmap_btree.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_btree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_buf_item.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_buf_item.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_cap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_cap.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_da_btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_da_btree.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_da_btree.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_da_btree.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dfrag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dfrag.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dfrag.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dfrag.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dinode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dinode.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir.c</a></td><td class='right'>1217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_block.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_data.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_data.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_data.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_data.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_leaf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_leaf.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_node.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_node.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_sf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_sf.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir2_trace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir2_trace.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir_leaf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir_leaf.c</a></td><td class='right'>2213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.9%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir_leaf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir_leaf.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dir_sf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dir_sf.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dmapi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dmapi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_dmops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_dmops.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_error.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_error.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_extfree_item.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_extfree_item.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_extfree_item.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_extfree_item.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_fs.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_fsops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_fsops.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ialloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_ialloc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_ialloc_btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_ialloc_btree.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_iget.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_inode.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_inode.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode_item.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_inode_item.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_inode_item.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_inode_item.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iocore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_iocore.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_iomap.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_itable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_itable.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_itable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_itable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_log.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_log_recover.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_log_recover.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_mount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_mount.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_mount.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_mount.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_qmops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_qmops.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_quota.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_quota.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rename.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_rename.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rtalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_rtalloc.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_rw.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_rw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_rw.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_ail.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans_ail.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_buf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans_buf.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_extfree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans_extfree.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans_inode.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_item.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans_item.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_trans_space.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_trans_space.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_utils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_utils.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_utils.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_utils.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vfsops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_vfsops.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/fs/xfs/xfs_vnodeops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/xfs/xfs_vnodeops.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acconfig.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acconfig.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acdisasm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acdisasm.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acdispat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acdispat.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acevents.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acevents.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acexcep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acexcep.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acglobal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acglobal.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acinterp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acinterp.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/aclocal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/aclocal.h</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acmacros.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acmacros.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acnamesp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acnamesp.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acobject.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acobject.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acopcode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acopcode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acoutput.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acoutput.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acparser.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acparser.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpi_bus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acpi_bus.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpi_drivers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acpi_drivers.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/acpi/acpi_numa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acpi_numa.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpiosxf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acpiosxf.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acpixf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acpixf.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acresrc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acresrc.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acstruct.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acstruct.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actables.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/actables.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actbl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/actbl.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actbl1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/actbl1.h</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actbl2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/actbl2.h</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/actypes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/actypes.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/acutils.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/acutils.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/amlcode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/amlcode.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/amlresrc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/amlresrc.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/pdc_intel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/pdc_intel.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/platform/acenv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/platform/acenv.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/platform/aclinux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/platform/aclinux.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/acpi/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/acpi/processor.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-alpha/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/Kbuild</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/barrier.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/barrier.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/core_cia.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/core_cia.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/core_t2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/core_t2.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/floppy.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/hw_irq.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/machvec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/machvec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/mmzone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/mmzone.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/rwsem.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/smp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/spinlock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/unistd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-alpha/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-alpha/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/apm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/apm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-aaec2000/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-aaec2000/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-aaec2000/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-aaec2000/memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/at91rm9200_spi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/at91rm9200_spi.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/at91rm9200_ssc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/at91rm9200_ssc.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/at91rm9200_sys.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/at91rm9200_sys.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/at91rm9200_tc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/at91rm9200_tc.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/at91rm9200_udp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/at91rm9200_udp.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/board.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/board.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/gpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/gpio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/hardware.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/irqs.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/memory.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/pio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/pio.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/system.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/timex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-at91rm9200/vmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-at91rm9200/vmalloc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-cl7500/acornfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-cl7500/acornfb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-clps711x/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-clps711x/hardware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-clps711x/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-clps711x/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-clps711x/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-clps711x/memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-clps711x/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-clps711x/uncompress.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ebsa285/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ebsa285/hardware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ebsa285/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ebsa285/io.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ebsa285/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ebsa285/memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ebsa285/vmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ebsa285/vmalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ep93xx/ep93xx-regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ep93xx/ep93xx-regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ep93xx/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ep93xx/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-h720x/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-h720x/memory.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-imx/imx-dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-imx/imx-dma.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-imx/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-imx/memory.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-integrator/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-integrator/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-integrator/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-integrator/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-iop3xx/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-iop3xx/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-iop3xx/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-iop3xx/memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-iop3xx/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-iop3xx/timex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-iop3xx/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-iop3xx/uncompress.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp23xx/entry-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ixp23xx/entry-macro.S</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp23xx/ixp23xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ixp23xx/ixp23xx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp23xx/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ixp23xx/platform.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp23xx/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ixp23xx/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp4xx/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ixp4xx/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-ixp4xx/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-ixp4xx/io.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-l7200/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-l7200/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-l7200/serial_l7200.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-l7200/serial_l7200.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-l7200/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-l7200/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/clocks.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/clocks.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/constants.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/constants.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/dma.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/entry-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/entry-macro.S</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/hardware.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/irqs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/registers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/registers.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/ssp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/ssp.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-lh7a40x/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-lh7a40x/uncompress.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/debug-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/debug-macro.S</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/dma.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/entry-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/entry-macro.S</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/eth.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/hardware.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/io.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/irqs.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/memory.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/netx-regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/netx-regs.h</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/param.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/pfifo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/pfifo.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/system.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/timex.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/uncompress.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/vmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/vmalloc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-netx/xc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-netx/xc.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/board-fsample.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/board-fsample.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/board.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/board.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/dma.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/dmtimer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/dmtimer.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/gpmc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/gpmc.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/hardware.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/irqs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/mux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/mux.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/pm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/pm.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-omap/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-omap/uncompress.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/clock.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/debug-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/debug-macro.S</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/dma.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/entry-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/entry-macro.S</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/gpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/gpio.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/hardware.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/io.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/irq.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/irqs.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/memory.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/param.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/platform.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/pm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/pm.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/system.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/timex.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/uncompress.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pnx4008/vmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pnx4008/vmalloc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/idp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/idp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/irqs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/ohci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/ohci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/poodle.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/poodle.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/pxa-regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/pxa-regs.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/timex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/arch-pxa/trizeps4.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-pxa/trizeps4.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-realview/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-realview/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-realview/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-realview/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/debug-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/debug-macro.S</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/entry-macro.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/entry-macro.S</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/map.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/map.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-clock.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-dsc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-dsc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-gpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-gpio.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-gpioj.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-gpioj.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-irq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-nand.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-nand.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/regs-serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/regs-serial.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-s3c2410/uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-s3c2410/uncompress.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/assabet.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/assabet.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/cerf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/cerf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/collie.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/collie.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/hardware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/irqs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/irqs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/memory.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-sa1100/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-sa1100/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-versatile/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-versatile/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-versatile/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-versatile/platform.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/arch-versatile/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/arch-versatile/system.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/assembler.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/assembler.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/bug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/bugs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/bugs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/byteorder.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/byteorder.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/cpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/cpu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/domain.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/domain.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/dyntick.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/dyntick.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/floppy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/fpstate.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/fpstate.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/glue.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/glue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/hardware/dec21285.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/hardware/dec21285.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/hardware/iomd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/hardware/iomd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/hardware/locomo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/hardware/locomo.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/hardware/sharpsl_pm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/hardware/sharpsl_pm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/hw_irq.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/irq.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/leds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/leds.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mach/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mach/irq.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mach/map.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mach/map.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mach/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mach/pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-arm/mach/serial_at91.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mach/serial_at91.h</a> (renamed from include/asm-arm/mach/serial_at91rm9200.h)</td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mach/serial_sa1100.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mach/serial_sa1100.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mach/time.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mach/time.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/memory.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mmu.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/mmu_context.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/page-nommu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/page-nommu.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/page.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/pgalloc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/pgtable-hwdef.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/pgtable-hwdef.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/pgtable-nommu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/pgtable-nommu.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/pgtable.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/proc-fns.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/proc-fns.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/procinfo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/procinfo.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/ptrace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/signal.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/system.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/thread_info.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm/thread_notify.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/thread_notify.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/uaccess.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/ucontext.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/ucontext.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/unistd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-arm26/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/floppy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/hardware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/hardware.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/leds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/leds.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/mach-types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/mach-types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/sysirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/sysirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-arm26/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-arm26/unistd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-cris/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v10/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v10/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v10/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v10/irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v10/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v10/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v10/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v10/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v32/arbiter.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v32/arbiter.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v32/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v32/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v32/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v32/irq.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v32/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v32/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v32/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v32/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/arch-v32/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/arch-v32/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/eshlibld.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/eshlibld.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/etraxgpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/etraxgpio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/fasttimer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/fasttimer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/hw_irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/rtc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-cris/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-cris/unistd.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-frv/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/atomic.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/checksum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/checksum.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/elf.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/fpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/fpu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/gdb-stub.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/gdb-stub.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/highmem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/highmem.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/io.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/irq-routing.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/irq-routing.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/mb-regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/mb-regs.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/processor.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/ptrace.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/registers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/registers.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/segment.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/segment.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/signal.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/thread_info.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/uaccess.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/unaligned.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/unaligned.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/unistd.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-frv/virtconvert.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-frv/virtconvert.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-generic/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/Kbuild</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-generic/Kbuild.asm?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/Kbuild.asm</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-generic/audit_change_attr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/audit_change_attr.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-generic/audit_dir_write.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/audit_dir_write.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/bug.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/cputime.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/cputime.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/fcntl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/fcntl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/local.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/memory_model.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/memory_model.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/mutex-null.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/mutex-null.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/percpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/percpu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/rtc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/sections.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/sections.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/signal.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/tlb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/tlb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-generic/vmlinux.lds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-generic/vmlinux.lds.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-h8300/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/keyboard.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/keyboard.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/page.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/page_offset.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/page_offset.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/processor.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/semaphore-helper.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/semaphore-helper.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/shm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/shm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/unaligned.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/unaligned.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/unistd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-h8300/virtconvert.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-h8300/virtconvert.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/Kbuild</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/alternative.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/alternative.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/apic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/apic.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/apicdef.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/apicdef.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/atomic.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/bugs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/bugs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/byteorder.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/byteorder.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/cpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/cpu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/cpufeature.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/cpufeature.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/delay.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/dwarf2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/dwarf2.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/elf.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/fixmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/fixmap.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/floppy.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/futex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/futex.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/highmem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/highmem.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/hpet.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/hpet.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/hw_irq.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/intel_arch_perfmon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/intel_arch_perfmon.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/io_apic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/io_apic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/irqflags.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/k8.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/k8.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/kdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/kdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/kprobes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/kprobes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/local.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mach-default/mach_ipi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-default/mach_ipi.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mach-default/mach_timer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-default/mach_timer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-i386/mach-default/setup_arch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-default/setup_arch.h</a> (renamed from include/asm-i386/mach-default/setup_arch_pre.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-i386/mach-default/setup_arch_post.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-default/setup_arch_post.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mach-summit/mach_apic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-summit/mach_apic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mach-summit/mach_mpparse.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-summit/mach_mpparse.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-i386/mach-visws/setup_arch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-visws/setup_arch.h</a> (renamed from include/asm-i386/mach-visws/setup_arch_pre.h)</td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-i386/mach-visws/setup_arch_post.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-visws/setup_arch_post.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-i386/mach-voyager/setup_arch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-voyager/setup_arch.h</a> (renamed from include/asm-i386/mach-voyager/setup_arch_pre.h)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-i386/mach-voyager/setup_arch_post.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mach-voyager/setup_arch_post.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/mce.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mce.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mmu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/msi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/msi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/mtrr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/mtrr.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/nmi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/nmi.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-i386/node.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/node.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/page.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/posix_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/posix_types.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/processor.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/rwlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/rwlock.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/rwsem.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/semaphore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/semaphore.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/setup.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/spinlock.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/string.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/system.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/thread_info.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/timer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/timer.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/timex.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/topology.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/topology.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/tsc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/tsc.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/uaccess.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/unistd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-i386/unwind.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/unwind.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-i386/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-i386/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-ia64/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/Kbuild</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/asmmacro.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/asmmacro.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/delay.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/hw_irq.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/ia32.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/ia32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/intrinsics.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/intrinsics.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/io.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/kdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/kdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/kprobes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/kprobes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/machvec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/machvec.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/machvec_sn2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/machvec_sn2.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/mca.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/mca.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/meminit.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/meminit.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/msi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/msi.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/nodedata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/nodedata.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/numa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/numa.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/percpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/percpu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/pgtable.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/ptrace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/rwsem.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/signal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/intr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/intr.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/pcibr_provider.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/pcibr_provider.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/pcibus_provider_defs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/pcibus_provider_defs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/simulator.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/simulator.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/sn_cpuid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/sn_cpuid.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/sn_sal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/sn_sal.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/tioca_provider.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/tioca_provider.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/tiocp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/tiocp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/sn/xpc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/sn/xpc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/string.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/system.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/thread_info.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/tlb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/tlb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/topology.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/topology.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/unistd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ia64/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ia64/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-m32r/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/assembler.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/assembler.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/hw_irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/m32104ut/m32104ut_pld.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/m32104ut/m32104ut_pld.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/m32700ut/m32700ut_lan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/m32700ut/m32700ut_lan.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/m32700ut/m32700ut_lcd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/m32700ut/m32700ut_lcd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/m32700ut/m32700ut_pld.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/m32700ut/m32700ut_pld.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/m32r.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/m32r.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/mmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/mmu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/mmu_context.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/opsput/opsput_lan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/opsput/opsput_lan.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/opsput/opsput_lcd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/opsput/opsput_lcd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/opsput/opsput_pld.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/opsput/opsput_pld.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/pgtable-2level.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/pgtable-2level.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/ptrace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/rtc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/semaphore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/semaphore.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/sigcontext.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/sigcontext.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/spinlock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/system.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/timex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/uaccess.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/unistd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m32r/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m32r/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-m68k/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/amigaints.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/amigaints.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/apollohw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/apollohw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/atari_stdma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/atari_stdma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/atariints.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/atariints.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/bvme6000hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/bvme6000hw.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/cacheflush.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/dma-mapping.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/dvma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/dvma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/entry.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/entry.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/floppy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/fpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/fpu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/irq.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/mac_oss.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/mac_oss.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/machdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/machdep.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/macintosh.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/macintosh.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/macints.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/macints.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/mc146818rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/mc146818rtc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/motorola_pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/motorola_pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/mvme147hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/mvme147hw.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/mvme16xhw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/mvme16xhw.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/openprom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/openprom.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/page_offset.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/page_offset.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/processor.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/scatterlist.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/scatterlist.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/semaphore-helper.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/semaphore-helper.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/setup.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/shm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/shm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/signal.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/sun3ints.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/sun3ints.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/sun3xflop.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/sun3xflop.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/traps.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/traps.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/uaccess.h</a></td><td class='right'>1100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/unistd.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68k/virtconvert.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68k/virtconvert.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-m68knommu/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/bootstd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/bootstd.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/cacheflush.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/coldfire.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/coldfire.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/commproc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/commproc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/elia.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/elia.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/entry.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/entry.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/fpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/fpu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/irq.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m5206sim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m5206sim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m520xsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m520xsim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m523xsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m523xsim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m5249sim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m5249sim.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m5272sim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m5272sim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m527xsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m527xsim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m528xsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m528xsim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-m68knommu/m532xsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/m532xsim.h</a></td><td class='right'>2238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfcache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfcache.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfdma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfdma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfmbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfmbus.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfne.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfne.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfpci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfpci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfpit.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfpit.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfsim.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfsmc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfsmc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcftimer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcftimer.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfuart.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfuart.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mcfwdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mcfwdebug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/nettel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/nettel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/page_offset.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/page_offset.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/processor.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/ptrace.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/semaphore-helper.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/semaphore-helper.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/uaccess.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/unaligned.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/unaligned.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-m68knommu/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-m68knommu/unistd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/a.out.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/a.out.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/addrspace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/addrspace.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/apm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/apm.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/arc/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/arc/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/asm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/asm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/asmmacro-32.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/asmmacro-32.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/asmmacro-64.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/asmmacro-64.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/asmmacro.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/asmmacro.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/atomic.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/bcache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/bcache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/bitops.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/bootinfo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/bootinfo.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/bugs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/bugs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/byteorder.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/byteorder.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/checksum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/checksum.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/compat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/compat.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/cpu-features.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/cpu-features.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/cpu-info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/cpu-info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/cpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/cpu.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/ddb5074.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ddb5074.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/ddb5xxx/ddb5074.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ddb5xxx/ddb5074.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/ddb5xxx/ddb5476.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ddb5xxx/ddb5476.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/ddb5xxx/ddb5477.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ddb5xxx/ddb5477.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/ddb5xxx/ddb5xxx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ddb5xxx/ddb5xxx.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/dec/prom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/dec/prom.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/delay.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/emma2rh/emma2rh.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/emma2rh/emma2rh.h</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/emma2rh/markeins.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/emma2rh/markeins.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/fcntl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/fcntl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/fixmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/fixmap.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/fpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/fpu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/fpu_emulator.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/fpu_emulator.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/futex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/futex.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/hazards.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/hazards.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/highmem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/highmem.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/hw_irq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/inst.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/inst.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/ip32/machine.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ip32/machine.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-mips/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/irqflags.h</a> (renamed from include/asm-mips/interrupt.h)</td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/isadep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/isadep.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/jmr3927/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/jmr3927/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/local.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-au1x00/au1000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-au1x00/au1000.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-au1x00/au1xxx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-au1x00/au1xxx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-au1x00/au1xxx_dbdma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-au1x00/au1xxx_dbdma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-au1x00/au1xxx_ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-au1x00/au1xxx_ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-au1x00/au1xxx_psc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-au1x00/au1xxx_psc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-au1x00/ioremap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-au1x00/ioremap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-cobalt/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-cobalt/cpu-feature-overrides.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-db1x00/db1x00.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-db1x00/db1x00.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ddb5074/mc146818rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ddb5074/mc146818rtc.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-dec/mc146818rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-dec/mc146818rtc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/mach-dec/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-dec/param.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-mips/mach-emma2rh/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-emma2rh/irq.h</a> (renamed from include/asm-mips/mach-mips/param.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-excite/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-excite/cpu-feature-overrides.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-excite/excite.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-excite/excite.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-excite/excite_nandflash.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-excite/excite_nandflash.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-excite/rm9k_eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-excite/rm9k_eth.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-excite/rm9k_wdt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-excite/rm9k_wdt.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-excite/rm9k_xicap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-excite/rm9k_xicap.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-generic/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-generic/floppy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-generic/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-generic/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-generic/kmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-generic/kmalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/mach-generic/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-generic/param.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-generic/spaces.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-generic/spaces.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ip22/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ip22/cpu-feature-overrides.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ip22/spaces.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ip22/spaces.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ip27/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ip27/cpu-feature-overrides.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ip32/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ip32/cpu-feature-overrides.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ip32/kmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ip32/kmalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ja/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ja/cpu-feature-overrides.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-jazz/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-jazz/floppy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/mach-jazz/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-jazz/param.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-mips/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-mips/cpu-feature-overrides.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-mips/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-mips/irq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-ocelot3/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-ocelot3/cpu-feature-overrides.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-pb1x00/pb1550.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-pb1x00/pb1550.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/mach-qemu/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-qemu/param.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-rm200/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-rm200/cpu-feature-overrides.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-sibyte/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-sibyte/cpu-feature-overrides.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-sim/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-sim/cpu-feature-overrides.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/mach-wrppmc/mach-gt64120.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-wrppmc/mach-gt64120.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mach-yosemite/cpu-feature-overrides.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mach-yosemite/cpu-feature-overrides.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mips-boards/generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mips-boards/generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mipsregs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mipsregs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/mmzone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/mmzone.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/module.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/module.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/msgbuf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/msgbuf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/paccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/paccess.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/page.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/param.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pci/bridge.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pci/bridge.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pgtable-32.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pgtable-32.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pgtable-64.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pgtable-64.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pgtable-bits.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pgtable-bits.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/pgtable.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/prefetch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/prefetch.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/processor.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/ptrace.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/qemu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/qemu.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/reg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/reg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/resource.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/resource.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/rm9k-ocd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/rm9k-ocd.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sgiarcs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sgiarcs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sibyte/board.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sibyte/board.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sibyte/carmel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sibyte/carmel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sibyte/sentosa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sibyte/sentosa.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sibyte/swarm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sibyte/swarm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/siginfo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/siginfo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/signal.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sim.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/smp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/addrs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/addrs.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/agent.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/agent.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/arch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/arch.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-mips/sn/fru.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/fru.h</a> (renamed from include/asm-mips/sn/sn0/sn0_fru.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/ioc3.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/ioc3.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/klconfig.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/klconfig.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/kldir.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/kldir.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/launch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/launch.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/mapped_kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/mapped_kernel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/addrs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/addrs.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/arch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/arch.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/hub.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/hub.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/hubio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/hubio.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/hubmd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/hubmd.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/hubpi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/hubpi.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sn/sn0/ip27.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sn/sn0/ip27.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/sni.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sni.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/sparsemem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/sparsemem.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/stackframe.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/stackframe.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/string.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/system.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/thread_info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/time.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/time.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/tx4927/toshiba_rbtx4927.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/tx4927/toshiba_rbtx4927.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/uaccess.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/unistd.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/capcella.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/capcella.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/cmbvr4133.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/cmbvr4133.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/e55.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/e55.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/irq.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/mpc30x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/mpc30x.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/tb0219.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/tb0219.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/tb0226.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/tb0226.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/tb0287.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/tb0287.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/vr41xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/vr41xx.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/vrc4173.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/vrc4173.h</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-mips/vr41xx/workpad.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/vr41xx/workpad.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/war.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/war.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-mips/wbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-mips/wbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-parisc/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/assembly.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/assembly.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/compat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/compat.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/floppy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/hw_irq.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/irq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/mmzone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/mmzone.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/pci.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/pdc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/pdc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/pgtable.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/processor.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/psw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/psw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/system.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/uaccess.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-parisc/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-parisc/unistd.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/Kbuild</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/abs_addr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/abs_addr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/atomic.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/backlight.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/backlight.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/bitops.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/cputable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/cputable.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/cputime.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/cputime.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/delay.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/eeh.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/eeh.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/eeh_event.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/eeh_event.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/elf.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/floppy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/hvcall.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/hvcall.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/hw_irq.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/i8259.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/i8259.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/immap_86xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/immap_86xx.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/io.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/iommu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/iommu.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/irq.h</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/irqflags.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/asm-powerpc/iseries/iommu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/iseries/iommu.h</a> (renamed from arch/powerpc/platforms/iseries/iommu.h)</td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/iseries/iseries_io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/iseries/iseries_io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/iseries/it_lp_queue.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/iseries/it_lp_queue.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/kdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/kdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/kdump.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/kdump.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/kexec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/kexec.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/kprobes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/kprobes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/machdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/machdep.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/mmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/mmu.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/mmu_context.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/mmzone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/mmzone.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/mpc86xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/mpc86xx.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/mpic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/mpic.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/of_device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/of_device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/paca.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/paca.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/page.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/pci-bridge.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/pci-bridge.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/percpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/percpu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/pgtable-4k.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/pgtable-4k.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/pgtable-64k.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/pgtable-64k.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/pgtable.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/pmac_pfunc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/pmac_pfunc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/ppc_asm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/ppc_asm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/processor.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/prom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/prom.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/ptrace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/reg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/reg.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/rtas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/rtas.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/rwsem.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/smu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/smu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/spu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/spu.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/spu_csa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/spu_csa.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/spu_priv1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/spu_priv1.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/systbl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/systbl.h</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/system.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/tce.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/tce.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/thread_info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/time.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/time.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/timex.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/tlb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/tlb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/todc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/todc.h</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/topology.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/topology.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-powerpc/tsi108.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/tsi108.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/udbg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/udbg.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/unistd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/vga.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-powerpc/vio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-powerpc/vio.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/amigahw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/amigahw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/bootinfo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/bootinfo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/commproc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/commproc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/floppy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/ibm403.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/ibm403.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/ibm44x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/ibm44x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/ibm4xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/ibm4xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/machdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/machdep.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mmu.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mmu_context.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mpc8260.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mpc8260.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mpc83xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mpc83xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mpc85xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mpc85xx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mpc8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mpc8xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/mv64x60.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/mv64x60.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/ocp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/ocp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/open_pic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/open_pic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/page.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/pc_serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/pc_serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/pgtable.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/ppc4xx_dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/ppc4xx_dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/ppc4xx_pic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/ppc4xx_pic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-ppc/time.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-ppc/time.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-s390/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/bitops.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/bug.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/ccwdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/ccwdev.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/cio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/cio.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/cmb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/cmb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/dasd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/dasd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/futex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/futex.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/idals.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/idals.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-s390/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/irqflags.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/local.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/lowcore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/lowcore.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/page.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/percpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/percpu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/pgalloc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/pgtable.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/posix_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/posix_types.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/processor.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/ptrace.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/rwsem.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/semaphore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/semaphore.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/setup.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/sfp-machine.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/sfp-machine.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/system.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/thread_info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/unistd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-s390/vtoc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/vtoc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-s390/z90crypt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-s390/z90crypt.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sh/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/checksum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/checksum.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/fixmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/fixmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/floppy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/hd64461/hd64461.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/hd64461/hd64461.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/hd64465/hd64465.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/hd64465/hd64465.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/hw_irq.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/keyboard.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/keyboard.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/kmap_types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/machvec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/machvec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/machvec_init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/machvec_init.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/mpc1211/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/mpc1211/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/mpc1211/keyboard.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/mpc1211/keyboard.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/overdrive/overdrive.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/overdrive/overdrive.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/rwsem.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/system.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/types.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/unistd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh/watchdog.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh/watchdog.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sh64/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/bug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/bug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/hw_irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/keyboard.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/keyboard.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sh64/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sh64/unistd.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sparc/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/Kbuild</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/asmmacro.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/asmmacro.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/bugs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/bugs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/delay.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/ebus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/ebus.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/elf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/fixmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/fixmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/floppy.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/io.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/irq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/mostek.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/mostek.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sparc/of_device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/of_device.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/pbm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/pbm.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sparc/prom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/prom.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/sbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/sbus.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/sfp-machine.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/sfp-machine.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/signal.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/smp.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/spinlock.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/system.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/timer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/timer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/unistd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/vac-ops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/vac-ops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc/winmacro.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc/winmacro.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sparc64/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/Kbuild</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/bugs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/bugs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/cacheflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/cacheflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/cpudata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/cpudata.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/delay.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/dma-mapping.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/ebus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/ebus.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/fhc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/fhc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/floppy.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/hardirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/hw_irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/irq.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/isa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/isa.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/kdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/kdebug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/kprobes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/kprobes.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/mc146818rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/mc146818rtc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/mmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/mmu.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sparc64/of_device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/of_device.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/oplib.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/oplib.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/parport.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/parport.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/pbm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/pbm.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/percpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/percpu.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/pgtable.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/pil.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/pil.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/processor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-sparc64/prom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/prom.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/sbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/sbus.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/siginfo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/siginfo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/signal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/spinlock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/starfire.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/starfire.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/system.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/timer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/timer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/tlb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/tlb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/topology.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/topology.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/ttable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/ttable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/unistd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-sparc64/vdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/vdev.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-sparc64/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-sparc64/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-um/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/a.out.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/a.out.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/elf-ppc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/elf-ppc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/fixmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/fixmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/hw_irq.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-um/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/irqflags.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/kmap_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/kmap_types.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/linkage.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/linkage.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/processor-generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/processor-generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/ptrace-generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/ptrace-generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/smp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/thread_info.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-um/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-um/uaccess.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-v850/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/bitops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/dma-mapping.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/hw_irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/irq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/machdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/machdep.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/pgtable.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/processor.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/system.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/unistd.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-v850/v850e_uart.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-v850/v850e_uart.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/Kbuild</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/acpi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/acpi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/alternative.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/alternative.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/apic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/apic.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/apicdef.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/apicdef.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/atomic.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/bitops.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/bugs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/bugs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/calgary.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/calgary.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/calling.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/calling.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/cpufeature.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/cpufeature.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/dma-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/dma-mapping.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/dma.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/dwarf2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/dwarf2.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/fixmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/fixmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/floppy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/floppy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/asm-x86_64/gart-mapping.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/gart-mapping.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/hpet.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/hpet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/hw_irq.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/ia32.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/ia32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/ia32_unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/ia32_unistd.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/intel_arch_perfmon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/intel_arch_perfmon.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/io_apic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/io_apic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/irqflags.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/k8.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/k8.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/kdebug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/kdebug.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/kprobes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/kprobes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/local.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/mce.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/mce.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/mmzone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/mmzone.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/msi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/msi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/mtrr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/mtrr.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/mutex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/mutex.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/nmi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/nmi.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/numa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/numa.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/page.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/param.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/param.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/percpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/percpu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/pgtable.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/pgtable.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/processor.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/proto.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/rwlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/rwlock.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/semaphore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/semaphore.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/serial.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/signal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/smp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/spinlock.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/string.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/swiotlb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/swiotlb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/system.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/tce.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/tce.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/thread_info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/thread_info.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/tlbflush.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/tlbflush.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/topology.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/topology.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/uaccess.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/unistd.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-x86_64/unwind.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/unwind.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-x86_64/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-x86_64/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/asm-xtensa/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/atomic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/atomic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/checksum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/checksum.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/delay.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/dma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/hardirq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/hw_irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/hw_irq.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/ide.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/irq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/mmu_context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/mmu_context.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/page.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/pgalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/pgalloc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/platform.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/processor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/processor.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/rwsem.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/signal.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/socket.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/system.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/system.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/uaccess.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/unistd.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/asm-xtensa/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/asm-xtensa/vga.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/keys/user-type.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/keys/user-type.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/Kbuild</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ac97_codec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ac97_codec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/acct.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/acct.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/acpi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/acpi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/affs_hardblocks.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/affs_hardblocks.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/agpgart.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/agpgart.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/amba/clcd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/amba/clcd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ata.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/atmdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/atmdev.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/audit.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/audit.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/bio.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bitmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/bitmap.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/blkdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/blkdev.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/blkpg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/blkpg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/blktrace_api.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/blktrace_api.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/blockgroup_lock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/blockgroup_lock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/bootmem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/bootmem.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/buffer_head.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/buffer_head.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/byteorder/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/byteorder/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cache.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/clocksource.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/clocksource.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cn_proc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cn_proc.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/coda.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/coda.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/coda_linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/coda_linux.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/coda_psdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/coda_psdev.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/compat.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compat_ioctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/compat_ioctl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/compiler.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/compiler.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/completion.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/completion.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/connector.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/connector.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/console.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/console.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/console_struct.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/console_struct.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cpu.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpufreq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cpufreq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cpumask.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cpumask.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cramfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cramfs_fs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/crypto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/crypto.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/cyclomx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/cyclomx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dcache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dcache.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dcookies.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dcookies.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/debug_locks.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/debug_locks.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/delay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/delay.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/delayacct.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/delayacct.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/linux/devfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/devfs_fs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/linux/devfs_fs_kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/devfs_fs_kernel.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/device-mapper.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/device-mapper.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/device.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/divert.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/divert.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dm-ioctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dm-ioctl.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/dmaengine.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dmaengine.h</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dmi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dmi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dnotify.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dnotify.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dqblk_xfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dqblk_xfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/dvb/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dvb/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/dvb/dmx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/dvb/dmx.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/efi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/efi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/efs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/efs_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/elevator.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/elevator.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/elf-em.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/elf-em.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/elf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/elf.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/elfcore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/elfcore.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/err.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/err.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/errqueue.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/errqueue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ethtool.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ethtool.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/eventpoll.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/eventpoll.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ext2_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ext2_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ext3_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ext3_fs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ext3_fs_i.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ext3_fs_i.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/fb.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fcntl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/fcntl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/fs.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fsnotify.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/fsnotify.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ftape.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ftape.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/fuse.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/fuse.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/futex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/futex.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/gameport.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/gameport.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/genalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/genalloc.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/generic_serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/generic_serial.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/genhd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/genhd.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/gfp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/gfp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/hardirq.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/hdlc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/hdlc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/hdlc/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/hdlc/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/highmem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/highmem.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/highuid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/highuid.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/hrtimer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/hrtimer.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/hugetlb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/hugetlb.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/hw_random.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/hw_random.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c-algo-ite.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/i2c-algo-ite.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c-id.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/i2c-id.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/i2c-ocores.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/i2c-ocores.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2c.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/i2c.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2o-dev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/i2o-dev.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/i2o.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/i2o.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ide.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ide.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/idr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/idr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_fddi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/if_fddi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_frad.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/if_frad.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_tr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/if_tr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/if_vlan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/if_vlan.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/igmp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/igmp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/init.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/init_task.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/init_task.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/inotify.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/inotify.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/input.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/input.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/interrupt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/interrupt.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/io.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ioc4.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ioc4.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ioport.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ioport.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ipmi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ipmi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ipv6.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ipv6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/irq.h</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/irq_cpustat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/irq_cpustat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/irqflags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/irqflags.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/irqreturn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/irqreturn.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/isa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isa.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/isapnp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isapnp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/isdn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isdn.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/isdn/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isdn/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/linux/isdn/tpam.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isdn/tpam.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/isdn_ppp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isdn_ppp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/isdnif.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/isdnif.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/jbd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/jbd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/jffs2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/jffs2.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/joystick.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/joystick.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kallsyms.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kallsyms.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kbd_kern.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kbd_kern.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kernel.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kernel_stat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kernel_stat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kexec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kexec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/key.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/key.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kmod.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kmod.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kobject.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kobject.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kprobes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kprobes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/kthread.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/kthread.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ktime.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ktime.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/libata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/libata.h</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/license.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/license.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/linkage.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/linkage.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/list.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/list.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/lockd/lockd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/lockd/lockd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/lockd/nlm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/lockd/nlm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/lockdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/lockdep.h</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/m41t00.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/m41t00.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/m48t86.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/m48t86.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mc146818rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mc146818rtc.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/memory_hotplug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/memory_hotplug.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mempolicy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mempolicy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/migrate.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/migrate.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mii.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/miscdevice.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/miscdevice.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mm.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mman.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mman.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mmzone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mmzone.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/module.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/module.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mount.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mount.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/msg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/msg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/bbm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/bbm.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/cfi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/cfi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/inftl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/inftl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/map.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/map.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/mtd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/mtd.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/nand.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/nand.h</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/mtd/ndfc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/ndfc.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/nftl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/nftl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/onenand.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/onenand.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/onenand_regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/onenand_regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/partitions.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/partitions.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/physmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/physmap.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mtd/xip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mtd/xip.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mutex-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mutex-debug.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/mutex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/mutex.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/namei.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/namei.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nbd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nbd.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ncp_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ncp_fs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/net.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/net.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netdevice.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netdevice.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/Kbuild</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/nf_conntrack_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/nf_conntrack_common.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/nfnetlink_conntrack.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/nfnetlink_conntrack.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_CONNSECMARK.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/xt_CONNSECMARK.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_SECMARK.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/xt_SECMARK.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_conntrack.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/xt_conntrack.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_quota.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/xt_quota.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter/xt_statistic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter/xt_statistic.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_arp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_arp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter_arp/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_arp/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_bridge.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_bridge.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter_bridge/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_bridge/Kbuild</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4/Kbuild</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/ip_conntrack.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4/ip_conntrack.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/ip_conntrack_h323.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4/ip_conntrack_h323.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/ip_conntrack_sip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4/ip_conntrack_sip.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv4/listhelp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv4/listhelp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/netfilter_ipv6/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netfilter_ipv6/Kbuild</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netlink.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netlink.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/netpoll.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/netpoll.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs4.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfs4.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfs_fs.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_fs_sb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfs_fs_sb.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_page.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfs_page.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfs_xdr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfs_xdr.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/nfsd/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfsd/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfsd/nfsd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfsd/nfsd.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfsd/nfsfh.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfsd/nfsfh.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfsd/stats.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfsd/stats.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/nfsd/syscall.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nfsd/syscall.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/node.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/node.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/notifier.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/notifier.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/nsc_gpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/nsc_gpio.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/numa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/numa.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/page-flags.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/page-flags.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pagemap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pagemap.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/parport.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/parport.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci-acpi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pci-acpi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pci.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci_ids.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pci_ids.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pci_regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pci_regs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/percpu_counter.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/percpu_counter.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pfkeyv2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pfkeyv2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/plist.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/plist.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pm_legacy.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pm_legacy.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pmu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pmu.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/pnp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/pnp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/poison.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/poison.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ppp_defs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ppp_defs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/prctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/prctl.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/preempt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/preempt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/proc_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/proc_fs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/profile.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/profile.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ptrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ptrace.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/quota.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/quota.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/quotaops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/quotaops.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/radix-tree.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/radix-tree.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/raid/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/bitmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/bitmap.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/linear.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/linear.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/md.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/md.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/md_k.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/md_k.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/md_p.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/md_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/raid10.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/raid10.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/raid/raid5.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/raid/raid5.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ramfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ramfs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rbtree.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rbtree.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rcupdate.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rcupdate.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/reboot.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/reboot.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/reiserfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/reiserfs_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/reiserfs_xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/reiserfs_xattr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/relay.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/relay.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/resource.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/resource.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/resume-trace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/resume-trace.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rio.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rio_drv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rio_drv.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rmap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rmap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/root_dev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/root_dev.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/rtc-v3020.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rtc-v3020.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rtc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rtc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/rtmutex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rtmutex.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rtnetlink.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rtnetlink.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rwsem-spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rwsem-spinlock.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/rwsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/rwsem.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/scc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/scc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sched.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sched.h</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/scx200.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/scx200.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/scx200_gpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/scx200_gpio.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/seccomp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/seccomp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/security.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/security.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/selinux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/selinux.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/seqlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/seqlock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/serialP.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/serialP.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/serial_core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/serial_core.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/signal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/signal.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/skbuff.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/skbuff.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/slab.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/slab.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/smb_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/smb_fs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/smp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/smp_lock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/smp_lock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/socket.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/socket.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spi/spi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spi/spi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spinlock.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock_api_smp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spinlock_api_smp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock_api_up.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spinlock_api_up.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spinlock_types.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock_types_up.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spinlock_types_up.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/spinlock_up.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/spinlock_up.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/stacktrace.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/stacktrace.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/stop_machine.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/stop_machine.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/string.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/sunrpc/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/auth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/auth.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/debug.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/gss_api.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/gss_api.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/stats.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/stats.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/svc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/svc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sunrpc/xdr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sunrpc/xdr.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/suspend.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/suspend.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/swap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/swap.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/swapops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/swapops.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/synclink.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/synclink.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/syscalls.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/syscalls.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sysctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sysctl.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sysdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sysdev.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/sysrq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/sysrq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/taskstats.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/taskstats.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/taskstats_kern.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/taskstats_kern.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/tc_act/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/tc_act/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/tc_ematch/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/tc_ematch/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tcp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/tcp.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/threads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/threads.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/time.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/time.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/timer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/timer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/timex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/timex.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/topology.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/topology.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tty.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/tty.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tty_driver.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/tty_driver.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/tty_flip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/tty_flip.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/types.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/uaccess.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/uaccess.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/udp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/udp.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ufs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ufs_fs.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/ufs_fs_i.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/ufs_fs_i.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/unistd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/unistd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/unwind.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/unwind.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/usb/cdc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb/cdc.h</a> (renamed from include/linux/usb_cdc.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/usb/input.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb/input.h</a> (renamed from include/linux/usb_input.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/usb/isp116x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb/isp116x.h</a> (renamed from include/linux/usb_isp116x.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/usb/serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb/serial.h</a> (renamed from drivers/usb/serial/usb-serial.h)</td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux.git/diff/include/linux/usb/sl811.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb/sl811.h</a> (renamed from include/linux/usb_sl811.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb_ch9.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb_ch9.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb_gadget.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb_gadget.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usb_usual.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usb_usual.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/usbdevice_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/usbdevice_fs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vermagic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/vermagic.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/videodev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/videodev.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/videodev2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/videodev2.h</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vmalloc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/vmalloc.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/linux/vmstat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/vmstat.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/vt.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vt_buffer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/vt_buffer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/vt_kern.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/vt_kern.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/wait.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/wait.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/wanrouter.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/wanrouter.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/watchdog.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/watchdog.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/workqueue.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/workqueue.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/writeback.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/writeback.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/xfrm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/xfrm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/zconf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/zconf.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/zlib.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/zlib.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/zorro.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/zorro.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/linux/zutil.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/zutil.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/media/cx2341x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/cx2341x.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/ir-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/ir-common.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/ir-kbd-i2c.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/ir-kbd-i2c.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/ovcamchip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/ovcamchip.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/media/pwc-ioctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/pwc-ioctl.h</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/saa7115.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/saa7115.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/saa7146_vv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/saa7146_vv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/tuner-types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/tuner-types.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/tuner.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/tuner.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/media/tvp5150.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/tvp5150.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/v4l2-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/v4l2-common.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/media/v4l2-dev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/v4l2-dev.h</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/video-buf-dvb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/video-buf-dvb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/media/video-buf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/media/video-buf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/mtd/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/mtd/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/mtd/mtd-abi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/mtd/mtd-abi.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/mtd/mtd-user.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/mtd/mtd-user.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/addrconf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/addrconf.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/af_unix.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/af_unix.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ax25.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ax25.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/bluetooth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/bluetooth/bluetooth.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/hci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/bluetooth/hci.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/bluetooth/hci_core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/bluetooth/hci_core.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/compat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/compat.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/dst.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/dst.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/genetlink.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/genetlink.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/icmp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/icmp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ieee80211.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ieee80211.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ieee80211softmac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ieee80211softmac.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ieee80211softmac_wx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ieee80211softmac_wx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet6_hashtables.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/inet6_hashtables.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_hashtables.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/inet_hashtables.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_sock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/inet_sock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/inet_timewait_sock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/inet_timewait_sock.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ip.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip6_route.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ip6_route.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip_fib.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ip_fib.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip_mp_alg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ip_mp_alg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ip_vs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ip_vs.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ipv6.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ipv6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/irda/irda.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/irda/irda.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/irda/irda_device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/irda/irda_device.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/irda/irlap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/irda/irlap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/irda/irlmp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/irda/irlmp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/irda/irlmp_frame.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/irda/irlmp_frame.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/irda/qos.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/irda/qos.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/llc_if.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/llc_if.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/ndisc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/ndisc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/net/netdma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/netdma.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_conntrack.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/netfilter/nf_conntrack.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/netfilter/nf_conntrack_compat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/netfilter/nf_conntrack_compat.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/pkt_act.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/pkt_act.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/pkt_sched.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/pkt_sched.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/protocol.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/protocol.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/raw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/raw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/red.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/red.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/route.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/route.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sch_generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/sch_generic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/scm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/scm.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sctp/sctp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/sctp/sctp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sctp/structs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/sctp/structs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/sock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/sock.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/tcp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/tcp.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/tcp_ecn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/tcp_ecn.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/tipc/tipc_bearer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/tipc/tipc_bearer.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/net/xfrm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/net/xfrm.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/pcmcia/ss.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/pcmcia/ss.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/rdma/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/rdma/ib_addr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_addr.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_cache.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_cache.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_cm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_cm.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_fmr_pool.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_fmr_pool.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/rdma/ib_marshall.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_marshall.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_sa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_sa.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_smi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_smi.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_user_cm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_user_cm.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/rdma/ib_user_sa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_user_sa.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_user_verbs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_user_verbs.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/rdma/ib_verbs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/ib_verbs.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/rdma/rdma_cm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/rdma_cm.h</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/rdma/rdma_cm_ib.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/rdma/rdma_cm_ib.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/scsi/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/iscsi_if.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/iscsi_if.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/iscsi_proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/iscsi_proto.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/scsi/libiscsi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/libiscsi.h</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_cmnd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_cmnd.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_dbg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_dbg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_devinfo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_devinfo.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_eh.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_eh.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_host.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_host.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/scsi/scsi_request.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_request.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_transport_fc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_transport_fc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_transport_iscsi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_transport_iscsi.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_transport_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_transport_sas.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/scsi_transport_spi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/scsi_transport_spi.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/include/scsi/sg_request.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/sg_request.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/scsi/srp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/scsi/srp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/sound/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/Kbuild</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/ac97_codec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/ac97_codec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/ak4xxx-adda.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/ak4xxx-adda.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/asequencer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/asequencer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/asound.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/asound.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/core.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/cs46xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/cs46xx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/driver.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/driver.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/emu10k1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/emu10k1.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/hdsp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/hdsp.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/info.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/info.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/initval.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/initval.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/mpu401.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/mpu401.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/pcm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/pcm.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/pcm_params.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/pcm_params.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/rawmidi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/rawmidi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/tea575x-tuner.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/tea575x-tuner.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/sound/version.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/sound/version.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/video/Kbuild?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/video/Kbuild</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/edid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/video/edid.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/include/video/mbxfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/video/mbxfb.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/include/video/vga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/video/vga.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/Kconfig</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/do_mounts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/do_mounts.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/do_mounts.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/do_mounts.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/init/do_mounts_devfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/do_mounts_devfs.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/do_mounts_initrd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/do_mounts_initrd.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/do_mounts_md.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/do_mounts_md.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/do_mounts_rd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/do_mounts_rd.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/initramfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/initramfs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/main.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/init/version.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>init/version.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>ipc/compat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/mqueue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>ipc/mqueue.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/msg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>ipc/msg.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/sem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>ipc/sem.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/shm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>ipc/shm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/ipc/util.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>ipc/util.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/acct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/acct.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/audit.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/audit.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/audit.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/auditfilter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/auditfilter.c</a></td><td class='right'>1106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/auditsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/auditsc.c</a></td><td class='right'>716</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/capability.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/capability.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/compat.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/configs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/configs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/cpu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/cpuset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/cpuset.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/delayacct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/delayacct.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/exec_domain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/exec_domain.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/exit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/exit.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/fork.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/fork.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/futex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/futex.c</a></td><td class='right'>1091</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/futex_compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/futex_compat.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/hrtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/hrtimer.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/kernel/intermodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/intermodule.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/autoprobe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/autoprobe.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/irq/chip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/chip.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/handle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/handle.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/internals.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/internals.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/manage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/manage.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/migration.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/migration.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/proc.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/irq/resend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/resend.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/irq/spurious.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/irq/spurious.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kallsyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/kallsyms.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/kexec.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kmod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/kmod.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/kprobes.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/ksysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/ksysfs.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/kthread.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/kthread.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/lockdep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/lockdep.c</a></td><td class='right'>2704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/lockdep_internals.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/lockdep_internals.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/lockdep_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/lockdep_proc.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/module.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/mutex-debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/mutex-debug.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/mutex-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/mutex-debug.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/mutex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/mutex.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/mutex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/mutex.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/panic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/panic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/params.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/params.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/pid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/pid.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/posix-cpu-timers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/posix-cpu-timers.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/disk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/disk.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/main.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/pm.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/power.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/power.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/snapshot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/snapshot.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/swap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/swap.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/power/swsusp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/power/swsusp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/printk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/printk.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/profile.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/profile.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/ptrace.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/rcupdate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rcupdate.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/rcutorture.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rcutorture.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/resource.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/resource.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rtmutex-debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rtmutex-debug.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rtmutex-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rtmutex-debug.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rtmutex-tester.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rtmutex-tester.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rtmutex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rtmutex.c</a></td><td class='right'>989</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rtmutex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rtmutex.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rtmutex_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rtmutex_common.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/rwsem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/rwsem.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/sched.c</a></td><td class='right'>1972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/signal.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/softirq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/softirq.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/softlockup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/softlockup.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/spinlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/spinlock.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/stacktrace.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/sys.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sys_ni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/sys_ni.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/sysctl.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/taskstats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/taskstats.c</a></td><td class='right'>568</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/time.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/time/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/time/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/time/clocksource.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/time/clocksource.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/time/jiffies.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/time/jiffies.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/timer.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/kernel/unwind.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/unwind.c</a></td><td class='right'>918</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/user.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/wait.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/wait.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/kernel/workqueue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>kernel/workqueue.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/Kconfig.debug</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/bitmap.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/bust_spinlocks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/bust_spinlocks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/crc-ccitt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/crc-ccitt.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/crc16.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/crc16.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/crc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/crc32.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/debug_locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/debug_locks.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/extable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/genalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/genalloc.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/idr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/idr.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/iomap_copy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/iomap_copy.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/kernel_lock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/kernel_lock.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/kobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/kobject.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/kobject_uevent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/kobject_uevent.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/libcrc32c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/libcrc32c.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-hardirq.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-mutex.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-mutex.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-rlock-hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-rlock-hardirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-rlock-softirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-rlock-softirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-rlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-rlock.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-rsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-rsem.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-softirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-softirq.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-spin-hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-spin-hardirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-spin-softirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-spin-softirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-spin.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-spin.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-wlock-hardirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-wlock-hardirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-wlock-softirq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-wlock-softirq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-wlock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-wlock.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest-wsem.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest-wsem.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/locking-selftest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/locking-selftest.c</a></td><td class='right'>1216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/percpu_counter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/percpu_counter.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/plist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/plist.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/radix-tree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/radix-tree.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/rbtree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/rbtree.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/reed_solomon/reed_solomon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/reed_solomon/reed_solomon.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/rwsem-spinlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/rwsem-spinlock.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/rwsem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/rwsem.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/semaphore-sleepers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/semaphore-sleepers.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/spinlock_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/spinlock_debug.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/string.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/string.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/textsearch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/textsearch.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/ts_bm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/ts_bm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/ts_fsm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/ts_fsm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/ts_kmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/ts_kmp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/vsprintf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/vsprintf.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_deflate/deflate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_deflate/deflate.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_deflate/deflate_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_deflate/deflate_syms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/lib/zlib_inflate/infblock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/infblock.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/lib/zlib_inflate/infblock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/infblock.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/lib/zlib_inflate/infcodes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/infcodes.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/lib/zlib_inflate/infcodes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/infcodes.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inffast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inffast.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inffast.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inffast.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inffixed.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inffixed.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inflate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inflate.c</a></td><td class='right'>1086</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inflate.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inflate.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inflate_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inflate_syms.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inflate_sync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inflate_sync.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inftrees.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inftrees.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/inftrees.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/inftrees.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/lib/zlib_inflate/infutil.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/infutil.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/lib/zlib_inflate/infutil.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>lib/zlib_inflate/infutil.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/bootmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/bootmem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/fadvise.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/fadvise.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/filemap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/filemap.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/filemap.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/filemap.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/filemap_xip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/filemap_xip.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/fremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/fremap.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/highmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/highmem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/hugetlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/hugetlb.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/memory.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/memory_hotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/memory_hotplug.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mempolicy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/mempolicy.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/migrate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/migrate.c</a></td><td class='right'>1076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/mmap.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mmzone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/mmzone.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mprotect.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/mprotect.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/mremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/mremap.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/msync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/msync.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/nommu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/oom_kill.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/oom_kill.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page-writeback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/page-writeback.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page_alloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/page_alloc.c</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/page_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/page_io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/pdflush.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/pdflush.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/readahead.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/readahead.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/rmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/rmap.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/shmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/shmem.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/slab.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/slob.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/slob.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/sparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/sparse.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/swap.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swap_state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/swap_state.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/swapfile.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/swapfile.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/tiny-shmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/tiny-shmem.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/truncate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/truncate.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/vmalloc.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/mm/vmscan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/vmscan.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/mm/vmstat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>mm/vmstat.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/802/fc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/802/fc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/802/fddi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/802/fddi.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/802/sysctl_net_802.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/802/sysctl_net_802.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/802/tr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/802/tr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/8021q/vlan.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/8021q/vlanproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/8021q/vlanproc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/appletalk/aarp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/appletalk/aarp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/appletalk/atalk_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/appletalk/atalk_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/appletalk/ddp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/appletalk/ddp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/appletalk/sysctl_net_atalk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/appletalk/sysctl_net_atalk.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/atm/atm_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/atm_sysfs.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/br2684.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/br2684.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/clip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/clip.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/common.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/ioctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/ipcommon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/ipcommon.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/lec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/lec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/lec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/lec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/mpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/mpc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/mpoa_caches.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/mpoa_caches.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/mpoa_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/mpoa_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/pppoatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/pppoatm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/pvc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/pvc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/resources.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/resources.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/atm/resources.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/atm/resources.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/af_ax25.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/af_ax25.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_dev.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_ds_subr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_ds_subr.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_ds_timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_ds_timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_iface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_iface.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_in.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_in.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_ip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_ip.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_out.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_out.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_route.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/ax25_timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/ax25_timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ax25/sysctl_net_ax25.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ax25/sysctl_net_ax25.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/af_bluetooth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/af_bluetooth.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/bnep/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/bnep/core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/bnep/netdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/bnep/netdev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/bnep/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/bnep/sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/cmtp/capi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/cmtp/capi.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/cmtp/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/cmtp/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/cmtp/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/cmtp/sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_conn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hci_conn.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hci_core.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hci_event.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hci_sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hci_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hci_sysfs.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hidp/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hidp/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hidp/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hidp/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/hidp/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/hidp/sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/l2cap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/l2cap.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/lib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/rfcomm/core.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/rfcomm/sock.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/rfcomm/tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/rfcomm/tty.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bluetooth/sco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bluetooth/sco.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_device.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_forward.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_forward.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_if.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_if.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_netfilter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_netfilter.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/bridge/br_netlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_netlink.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_notify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_notify.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_private.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_private.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/br_stp_if.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/br_stp_if.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/bridge/netfilter/ebt_ulog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/bridge/netfilter/ebt_ulog.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/dev.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/dev_mcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/dev_mcast.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/ethtool.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/link_watch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/link_watch.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/neighbour.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/neighbour.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/net-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/net-sysfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/netpoll.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/netpoll.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/pktgen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/pktgen.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/rtnetlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/rtnetlink.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/skbuff.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/skbuff.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/sock.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/stream.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/stream.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/core/sysctl_net_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/sysctl_net_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/core/user_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/core/user_dma.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ackvec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ackvec.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ackvec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ackvec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/ccid2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/ccid2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/ccid3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/ccid3.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/ccid3.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/ccid3.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/loss_interval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/lib/loss_interval.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/loss_interval.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/lib/loss_interval.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/packet_history.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/lib/packet_history.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/packet_history.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/lib/packet_history.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ccids/lib/tfrc_equation.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ccids/lib/tfrc_equation.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/dccp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/dccp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/diag.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/feat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/feat.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/input.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ipv4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ipv4.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ipv6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ipv6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/ipv6.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/ipv6.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/minisocks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/minisocks.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/options.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/options.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/output.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/proto.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/proto.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/dccp/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/dccp/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/af_decnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/af_decnet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_dev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_fib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_fib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_neigh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_neigh.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_nsp_in.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_nsp_in.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_route.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_rules.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_rules.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/dn_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/dn_table.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/netfilter/dn_rtmsg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/netfilter/dn_rtmsg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/decnet/sysctl_net_decnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/decnet/sysctl_net_decnet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/econet/af_econet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/econet/af_econet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ethernet/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ethernet/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ethernet/eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ethernet/eth.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/net/ethernet/sysctl_net_ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ethernet/sysctl_net_ether.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_crypt_ccmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_crypt_ccmp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_crypt_tkip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_crypt_tkip.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_crypt_wep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_crypt_wep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_geo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_geo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_module.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_rx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_rx.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_tx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_tx.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/ieee80211_wx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/ieee80211_wx.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_assoc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_assoc.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_auth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_auth.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_event.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_io.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_module.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_priv.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ieee80211/softmac/ieee80211softmac_wx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ieee80211/softmac/ieee80211softmac_wx.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/af_inet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/af_inet.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ah4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ah4.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/arp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/arp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/datagram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/datagram.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/devinet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/devinet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/esp4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/esp4.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_frontend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/fib_frontend.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_hash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/fib_hash.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_rules.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/fib_rules.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_semantics.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/fib_semantics.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/fib_trie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/fib_trie.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/icmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/icmp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/igmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/igmp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_connection_sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/inet_connection_sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/inet_diag.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_hashtables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/inet_hashtables.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inet_timewait_sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/inet_timewait_sock.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/inetpeer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/inetpeer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_forward.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ip_forward.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_fragment.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ip_fragment.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_gre.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ip_gre.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ip_input.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ip_output.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ip_sockglue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ip_sockglue.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipcomp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ipcomp.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ipip.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipmr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ipmr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/ipvs/ip_vs_est.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/ipvs/ip_vs_est.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/multipath_drr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/multipath_drr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/multipath_random.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/multipath_random.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/multipath_rr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/multipath_rr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/multipath_wrandom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/multipath_wrandom.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/arp_tables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/arp_tables.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_amanda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_amanda.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_ftp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_ftp.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_helper_h323.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_helper_h323.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_helper_h323_types.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_helper_h323_types.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_helper_pptp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_helper_pptp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_irc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_irc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_netlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_netlink.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_proto_gre.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_proto_gre.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_proto_icmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_proto_icmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_proto_sctp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_proto_sctp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_proto_tcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_proto_tcp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_proto_udp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_proto_udp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_sip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_sip.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_conntrack_standalone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_conntrack_standalone.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_helper.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_helper.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_helper_h323.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_helper_h323.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_helper_pptp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_helper_pptp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_proto_gre.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_proto_gre.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_sip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_sip.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_snmp_basic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_snmp_basic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_nat_standalone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_nat_standalone.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_queue.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ip_tables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ip_tables.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_CLUSTERIP.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_CLUSTERIP.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_MASQUERADE.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_MASQUERADE.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_NETMAP.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_NETMAP.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_REJECT.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_REJECT.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_ULOG.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_ULOG.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_hashlimit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_hashlimit.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/ipt_recent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/ipt_recent.c</a></td><td class='right'>1276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/iptable_mangle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/iptable_mangle.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/netfilter/nf_conntrack_proto_icmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/netfilter/nf_conntrack_proto_icmp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/protocol.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/protocol.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/raw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/raw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/route.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/sysctl_net_ipv4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/sysctl_net_ipv4.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_bic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_bic.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_cong.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_cong.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_cubic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_cubic.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_diag.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_highspeed.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_highspeed.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_htcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_htcp.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_hybla.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_hybla.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_input.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_ipv4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_ipv4.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/tcp_lp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_lp.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_minisocks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_minisocks.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_output.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/tcp_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_probe.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_scalable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_scalable.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_vegas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_vegas.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/tcp_veno.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_veno.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/tcp_westwood.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/tcp_westwood.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/udp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/udp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/xfrm4_input.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_mode_transport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/xfrm4_mode_transport.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_mode_tunnel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/xfrm4_mode_tunnel.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/xfrm4_output.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_policy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/xfrm4_policy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv4/xfrm4_state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv4/xfrm4_state.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/addrconf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/addrconf.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/af_inet6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/af_inet6.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ah6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ah6.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/anycast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/anycast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/esp6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/esp6.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/exthdrs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/exthdrs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/inet6_connection_sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/inet6_connection_sock.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/inet6_hashtables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/inet6_hashtables.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_fib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ip6_fib.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_flowlabel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ip6_flowlabel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ip6_input.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ip6_output.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ip6_tunnel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ip6_tunnel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ipcomp6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ipcomp6.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ipv6_sockglue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ipv6_sockglue.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ipv6_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ipv6_syms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/mcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/mcast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/ndisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/ndisc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6_queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/netfilter/ip6_queue.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6_tables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/netfilter/ip6_tables.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/ip6t_REJECT.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/netfilter/ip6t_REJECT.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/netfilter/nf_conntrack_reasm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/netfilter/nf_conntrack_reasm.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/reassembly.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/reassembly.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/route.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/sit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/sit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/sysctl_net_ipv6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/sysctl_net_ipv6.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/tcp_ipv6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/tcp_ipv6.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/udp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/udp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_input.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_mode_transport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_mode_transport.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_mode_tunnel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_mode_tunnel.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_output.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_policy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_policy.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_state.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipv6/xfrm6_tunnel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipv6/xfrm6_tunnel.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipx/af_ipx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipx/af_ipx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipx/ipx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipx/ipx_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipx/ipx_route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipx/ipx_route.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/ipx/sysctl_net_ipx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/ipx/sysctl_net_ipx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/af_irda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/af_irda.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/ircomm/ircomm_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/ircomm/ircomm_core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/ircomm/ircomm_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/ircomm/ircomm_tty.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irda_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irda_device.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/iriap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/iriap.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlan/irlan_client.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlan/irlan_client.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlan/irlan_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlan/irlan_common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlan/irlan_eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlan/irlan_eth.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlap_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlap_event.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlmp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlmp_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlmp_event.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irlmp_frame.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irlmp_frame.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irmod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irmod.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irnet/irnet.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irnet/irnet.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irsysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irsysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/irttp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/irttp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/qos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/qos.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/irda/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/irda/timer.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/key/af_key.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/key/af_key.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/af_llc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/af_llc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/llc_if.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/llc_if.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/llc_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/llc_input.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/llc_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/llc_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/llc_sap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/llc_sap.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/llc_station.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/llc_station.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/llc/sysctl_net_llc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/llc/sysctl_net_llc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/Kconfig</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/core.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_ftp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_ftp.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_l3proto_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_l3proto_generic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_netlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_netlink.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_sctp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_proto_sctp.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_tcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_proto_tcp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_proto_udp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_proto_udp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_conntrack_standalone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_conntrack_standalone.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_internals.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_internals.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_log.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_log.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_queue.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nf_sockopt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nf_sockopt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nfnetlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nfnetlink.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/nfnetlink_queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/nfnetlink_queue.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/x_tables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/x_tables.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/xt_CONNSECMARK.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_CONNSECMARK.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/xt_SECMARK.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_SECMARK.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_connmark.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_connmark.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_dccp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_dccp.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_mark.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_mark.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_multiport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_multiport.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_policy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_policy.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/xt_quota.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_quota.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_sctp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_sctp.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/net/netfilter/xt_statistic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_statistic.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_string.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_string.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netfilter/xt_tcpudp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netfilter/xt_tcpudp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlink/af_netlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netlink/af_netlink.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlink/attr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netlink/attr.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netlink/genetlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netlink/genetlink.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netrom/af_netrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netrom/af_netrom.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netrom/nr_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netrom/nr_dev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netrom/nr_route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netrom/nr_route.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/netrom/nr_timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/netrom/nr_timer.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/packet/af_packet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/packet/af_packet.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rose/af_rose.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rose/af_rose.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rose/rose_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rose/rose_dev.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/call.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rxrpc/call.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/connection.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rxrpc/connection.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/krxsecd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rxrpc/krxsecd.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/rxrpc_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rxrpc/rxrpc_syms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/rxrpc/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/rxrpc/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_api.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_api.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_gact.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_gact.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_ipt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_ipt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_mirred.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_mirred.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_pedit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_pedit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_police.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_police.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/act_simple.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/act_simple.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_api.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_api.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_basic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_basic.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_fw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_fw.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_route.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_rsvp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_rsvp.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_tcindex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_tcindex.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/cls_u32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/cls_u32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/em_cmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/em_cmp.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/em_meta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/em_meta.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/em_nbyte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/em_nbyte.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/em_text.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/em_text.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/em_u32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/em_u32.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/ematch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/ematch.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_api.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_api.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_atm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_atm.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_blackhole.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_blackhole.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_cbq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_cbq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_dsmark.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_dsmark.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_fifo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_fifo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_generic.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_gred.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_gred.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_hfsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_hfsc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_htb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_htb.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_ingress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_ingress.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_netem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_netem.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_prio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_prio.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_red.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_red.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_sfq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_sfq.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_tbf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_tbf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sched/sch_teql.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sched/sch_teql.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/input.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/ipv6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/ipv6.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/output.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/output.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/outqueue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/outqueue.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/protocol.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/protocol.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/sm_make_chunk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/sm_make_chunk.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/sm_statefuns.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/sm_statefuns.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/socket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/socket.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sctp/ulpevent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sctp/ulpevent.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/socket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/socket.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_gss/gss_krb5_mech.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_gss/gss_krb5_mech.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_gss/gss_krb5_seal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_gss/gss_krb5_seal.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_gss/gss_mech_switch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_gss/gss_mech_switch.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_gss/gss_spkm3_mech.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_gss/gss_spkm3_mech.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_gss/svcauth_gss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_gss/svcauth_gss.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_null.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_null.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/auth_unix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/auth_unix.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/pmap_clnt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/pmap_clnt.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/rpc_pipe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/rpc_pipe.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/sunrpc_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/sunrpc_syms.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/svc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/svc.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/sysctl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/xdr.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xprt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/xprt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sunrpc/xprtsock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sunrpc/xprtsock.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/sysctl_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/sysctl_net.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/bcast.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bcast.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/bcast.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/bearer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/bearer.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/cluster.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/cluster.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/config.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/core.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/core.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/dbg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/discover.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/discover.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/eth_media.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/eth_media.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/handler.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/handler.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/link.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/link.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/name_distr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/name_distr.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/name_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/name_table.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/net.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/node.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/node.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/node_subscr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/node_subscr.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/port.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/port.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/ref.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/ref.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/socket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/socket.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/subscr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/subscr.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/user_reg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/user_reg.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/zone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/zone.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/tipc/zone.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/tipc/zone.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/unix/af_unix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/unix/af_unix.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wanrouter/af_wanpipe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/wanrouter/af_wanpipe.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wanrouter/wanmain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/wanrouter/wanmain.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/wanrouter/wanproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/wanrouter/wanproc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/af_x25.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/x25/af_x25.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/x25_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/x25/x25_dev.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/x25_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/x25/x25_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/x25/x25_route.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/x25/x25_route.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_algo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/xfrm/xfrm_algo.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_policy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/xfrm/xfrm_policy.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/xfrm/xfrm_state.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/net/xfrm/xfrm_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>net/xfrm/xfrm_user.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Kbuild.include?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Kbuild.include</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.build?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Makefile.build</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/Makefile.headersinst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Makefile.headersinst</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.host?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Makefile.host</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.lib?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Makefile.lib</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.modinst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Makefile.modinst</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/Makefile.modpost?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/Makefile.modpost</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/basic/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/basic/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/scripts/basic/split-include.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/basic/split-include.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/bloat-o-meter?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/bloat-o-meter</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/checkstack.pl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/checkstack.pl</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/checkversion.pl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/checkversion.pl</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/export_report.pl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/export_report.pl</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/genksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/genksyms/genksyms.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/genksyms.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/genksyms/genksyms.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/lex.c_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/genksyms/lex.c_shipped</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/genksyms/lex.l?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/genksyms/lex.l</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/cgit/linux.git/diff/scripts/hdrcheck.sh?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/hdrcheck.sh</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/conf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/conf.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/confdata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/confdata.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/expr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/expr.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/expr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/expr.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/gconf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/gconf.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/lex.zconf.c_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/lex.zconf.c_shipped</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/lkc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/lkc.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/lkc_proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/lkc_proto.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/lxdialog/checklist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/lxdialog/checklist.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/menu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/menu.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/qconf.cc?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/qconf.cc</a></td><td class='right'>1048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/qconf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/qconf.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/symbol.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/symbol.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/util.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/util.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/zconf.gperf?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/zconf.gperf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/zconf.hash.c_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/zconf.hash.c_shipped</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/zconf.tab.c_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/zconf.tab.c_shipped</a></td><td class='right'>930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kconfig/zconf.y?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kconfig/zconf.y</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/kernel-doc?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/kernel-doc</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/mod/mk_elfconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/mod/mk_elfconfig.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/mod/modpost.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/mod/modpost.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/mod/modpost.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/mod/modpost.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/package/mkspec?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/package/mkspec</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/check-all.sh?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/check-all.sh</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/rt-tester.py?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/rt-tester.py</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t2-l1-2rt-sameprio.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t2-l1-2rt-sameprio.tst</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t2-l1-pi.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t2-l1-pi.tst</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t2-l1-signal.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t2-l1-signal.tst</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t2-l2-2rt-deadlock.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t2-l2-2rt-deadlock.tst</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t3-l1-pi-1rt.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t3-l1-pi-1rt.tst</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t3-l1-pi-2rt.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t3-l1-pi-2rt.tst</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t3-l1-pi-3rt.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t3-l1-pi-3rt.tst</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t3-l1-pi-signal.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t3-l1-pi-signal.tst</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t3-l1-pi-steal.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t3-l1-pi-steal.tst</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t3-l2-pi.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t3-l2-pi.tst</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t4-l2-pi-deboost.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t4-l2-pi-deboost.tst</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/scripts/rt-tester/t5-l4-pi-boost-deboost.tst?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/rt-tester/t5-l4-pi-boost-deboost.tst</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/scripts/setlocalversion?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>scripts/setlocalversion</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/capability.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/capability.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/commoncap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/commoncap.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/dummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/dummy.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/inode.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/internal.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/key.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/key.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/keyctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/keyctl.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/keyring.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/keyring.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/proc.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/process_keys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/process_keys.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/request_key.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/request_key.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/request_key_auth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/request_key_auth.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/keys/user_defined.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/keys/user_defined.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/root_plug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/root_plug.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/seclvl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/seclvl.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/security.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/security.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/exports.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/exports.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/hooks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/hooks.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/av_inherit.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/av_inherit.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/av_perm_to_string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/av_perm_to_string.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/av_permissions.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/av_permissions.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/class_to_string.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/class_to_string.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/flask.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/flask.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/objsec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/objsec.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/include/xfrm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/include/xfrm.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/selinuxfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/selinuxfs.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/ss/services.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/ss/services.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/security/selinux/xfrm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>security/selinux/xfrm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/aoa-gpio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/aoa-gpio.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/aoa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/aoa.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-onyx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-onyx.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-onyx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-onyx.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-tas-basstreble.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-tas-basstreble.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-tas-gain-table.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-tas-gain-table.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-tas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-tas.c</a></td><td class='right'>935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-tas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-tas.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/codecs/snd-aoa-codec-toonie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/codecs/snd-aoa-codec-toonie.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/core/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/core/snd-aoa-alsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/core/snd-aoa-alsa.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/core/snd-aoa-alsa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/core/snd-aoa-alsa.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/core/snd-aoa-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/core/snd-aoa-core.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/core/snd-aoa-gpio-feature.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/core/snd-aoa-gpio-feature.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/core/snd-aoa-gpio-pmf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/core/snd-aoa-gpio-pmf.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/fabrics/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/fabrics/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/fabrics/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/fabrics/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/fabrics/snd-aoa-fabric-layout.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/fabrics/snd-aoa-fabric-layout.c</a></td><td class='right'>1129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/core.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/i2sbus/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/i2sbus/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/i2sbus/i2sbus-control.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/i2sbus/i2sbus-control.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/i2sbus/i2sbus-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/i2sbus/i2sbus-core.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/i2sbus/i2sbus-interface.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/i2sbus/i2sbus-interface.h</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/i2sbus/i2sbus-pcm.c</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/i2sbus/i2sbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/i2sbus/i2sbus.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/soundbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/soundbus.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/aoa/soundbus/sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/aoa/soundbus/sysfs.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/aaci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/arm/aaci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/arm/sa11xx-uda1341.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/arm/sa11xx-uda1341.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/control.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/control.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/device.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/hwdep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/hwdep.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/info.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/info.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/info_oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/info_oss.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/init.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/isadma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/isadma.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/memalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/memalloc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/memory.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/misc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/oss/mixer_oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/oss/mixer_oss.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/oss/pcm_oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/oss/pcm_oss.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/pcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/pcm.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/pcm_compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/pcm_compat.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/pcm_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/pcm_lib.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/pcm_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/pcm_memory.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/pcm_misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/pcm_misc.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/pcm_native.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/pcm_native.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/rawmidi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/rawmidi.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/oss/seq_oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/oss/seq_oss.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_clientmgr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_clientmgr.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_device.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_dummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_dummy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_info.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_info.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_lock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_lock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_memory.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_memory.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_midi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_midi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_ports.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_ports.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/seq/seq_virmidi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/seq/seq_virmidi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/sgbuf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/sgbuf.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/sound.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/sound.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/sound_oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/sound_oss.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/core/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/core/timer.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/dummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/dummy.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/mpu401/mpu401.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/mpu401/mpu401.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/mpu401/mpu401_uart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/mpu401/mpu401_uart.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/mtpav.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/mtpav.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl3/opl3_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/opl3/opl3_lib.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl3/opl3_oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/opl3/opl3_oss.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl3/opl3_seq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/opl3/opl3_seq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl3/opl3_synth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/opl3/opl3_synth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl4/opl4_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/opl4/opl4_lib.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/opl4/opl4_seq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/opl4/opl4_seq.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/serial-u16550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/serial-u16550.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/virmidi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/virmidi.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/vx/vx_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/vx/vx_core.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/drivers/vx/vx_hwdep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/drivers/vx/vx_hwdep.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/i2c/cs8427.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/i2c/cs8427.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/i2c/i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/i2c/i2c.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/i2c/l3/uda1341.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/i2c/l3/uda1341.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/i2c/other/ak4xxx-adda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/i2c/other/ak4xxx-adda.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/ad1816a/ad1816a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/ad1816a/ad1816a.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/ad1816a/ad1816a_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/ad1816a/ad1816a_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/ad1848/ad1848_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/ad1848/ad1848_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/als100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/als100.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/azt2320.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/azt2320.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cs423x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/cs423x/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cs423x/cs4231.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/cs423x/cs4231.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cs423x/cs4231_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/cs423x/cs4231_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/cs423x/cs4236.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/cs423x/cs4236.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/dt019x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/dt019x.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/es1688/es1688.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/es1688/es1688.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/es1688/es1688_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/es1688/es1688_lib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/es18xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/es18xx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gus_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/gus_irq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gus_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/gus_main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gus_mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/gus_mem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gus_synth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/gus_synth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gusextreme.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/gusextreme.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/gusmax.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/gusmax.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/gus/interwave.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/gus/interwave.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/opl3sa2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/opl3sa2.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/opti9xx/miro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/opti9xx/miro.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/opti9xx/opti92x-ad1848.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/opti9xx/opti92x-ad1848.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/emu8000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sb/emu8000.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/emu8000_patch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sb/emu8000_patch.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/sb16.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sb/sb16.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/sb16_csp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sb/sb16_csp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/sb8_midi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sb/sb8_midi.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sb/sb_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sb/sb_common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sgalaxy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sgalaxy.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/sscape.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/sscape.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/wavefront/wavefront.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/wavefront/wavefront.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/wavefront/wavefront_fx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/wavefront/wavefront_fx.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/wavefront/wavefront_midi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/wavefront/wavefront_midi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/isa/wavefront/wavefront_synth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/isa/wavefront/wavefront_synth.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/mips/au1x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/mips/au1x00.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ad1816.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/ad1816.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ad1848.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/ad1848.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ad1889.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/ad1889.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/aedsp16.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/aedsp16.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ali5455.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/ali5455.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/au1000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/au1000.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/au1550_ac97.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/au1550_ac97.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/btaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/btaudio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/cmpci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/cmpci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/cs4232.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/cs4232.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/cs4281/cs4281m.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/cs4281/cs4281m.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/cs46xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/cs46xx.c</a></td><td class='right'>1274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/dmabuf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/dmabuf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/dmasound/dmasound.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/dmasound/dmasound.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/dmasound/dmasound_awacs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/dmasound/dmasound_awacs.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/dmasound/dmasound_paula.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/dmasound/dmasound_paula.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/emu10k1/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/emu10k1/main.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/emu10k1/midi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/emu10k1/midi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/es1370.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/es1370.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/es1371.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/es1371.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/esssolo1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/esssolo1.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/forte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/forte.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/hal2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/hal2.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/i810_audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/i810_audio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ite8172.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/ite8172.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/kahlua.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/kahlua.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/maestro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/maestro.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/maestro3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/maestro3.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/msnd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/msnd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/msnd_classic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/msnd_classic.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/msnd_pinnacle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/msnd_pinnacle.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/msnd_pinnacle.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/msnd_pinnacle.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/nec_vrc5477.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/nec_vrc5477.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/nm256_audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/nm256_audio.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/opl3sa2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/opl3sa2.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/pas2_card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/pas2_card.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/pss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/pss.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/rme96xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/rme96xx.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/sb_card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/sb_card.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/sb_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/sb_common.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/sb_ess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/sb_ess.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/sh_dac_audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/sh_dac_audio.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/sonicvibes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/sonicvibes.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/sound_config.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/sound_config.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/soundcard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/soundcard.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/trident.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/trident.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/via82cxxx_audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/via82cxxx_audio.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/vidc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/vidc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/waveartist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/waveartist.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/wavfront.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/wavfront.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/wf_midi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/wf_midi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/oss/ymfpci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/oss/ymfpci.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/Kconfig</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ac97/ac97_codec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ac97/ac97_codec.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ac97/ac97_patch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ac97/ac97_patch.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ac97/ac97_pcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ac97/ac97_pcm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ac97/ac97_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ac97/ac97_proc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ac97/ak4531_codec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ac97/ak4531_codec.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ad1889.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ad1889.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ali5451/ali5451.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ali5451/ali5451.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/als300.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/als300.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/als4000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/als4000.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/atiixp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/atiixp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/atiixp_modem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/atiixp_modem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au8810.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au8810.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au8820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au8820.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au8830.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au8830.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au88x0.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au88x0.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_a3d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au88x0_a3d.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au88x0_core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_mpu401.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au88x0_mpu401.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/au88x0/au88x0_xtalk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/au88x0/au88x0_xtalk.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/azt3328.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/azt3328.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/azt3328.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/azt3328.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/bt87x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/bt87x.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ca0106/ca0106.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ca0106/ca0106.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ca0106/ca0106_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ca0106/ca0106_main.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ca0106/ca0106_mixer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ca0106/ca0106_mixer.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ca0106/ca0106_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ca0106/ca0106_proc.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cmipci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cmipci.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs4281.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs4281.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs46xx/cs46xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs46xx/cs46xx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs46xx/cs46xx_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs46xx/cs46xx_lib.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs46xx/dsp_spos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs46xx/dsp_spos.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs46xx/dsp_spos_scb_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs46xx/dsp_spos_scb_lib.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs5535audio/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs5535audio/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs5535audio/cs5535audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs5535audio/cs5535audio.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs5535audio/cs5535audio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs5535audio/cs5535audio.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/cs5535audio/cs5535audio_pcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs5535audio/cs5535audio_pcm.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/cs5535audio/cs5535audio_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/cs5535audio/cs5535audio_pm.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/Makefile</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/darla20.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/darla20.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/darla20_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/darla20_dsp.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/darla24.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/darla24.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/darla24_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/darla24_dsp.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echo3g.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echo3g.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echo3g_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echo3g_dsp.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echoaudio.c</a></td><td class='right'>2196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echoaudio.h</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio_3g.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echoaudio_3g.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echoaudio_dsp.c</a></td><td class='right'>1125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio_dsp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echoaudio_dsp.h</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/echoaudio_gml.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/echoaudio_gml.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/gina20.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/gina20.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/gina20_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/gina20_dsp.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/gina24.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/gina24.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/gina24_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/gina24_dsp.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/indigo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/indigo.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/indigo_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/indigo_dsp.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/indigodj.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/indigodj.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/indigodj_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/indigodj_dsp.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/indigoio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/indigoio.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/indigoio_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/indigoio_dsp.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/layla20.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/layla20.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/layla20_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/layla20_dsp.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/layla24.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/layla24.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/layla24_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/layla24_dsp.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/mia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/mia.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/mia_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/mia_dsp.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/midi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/midi.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/mona.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/mona.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/echoaudio/mona_dsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/echoaudio/mona_dsp.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emu10k1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/emu10k1.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emu10k1_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/emu10k1_main.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emu10k1x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/emu10k1x.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emumixer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/emumixer.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emumpu401.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/emumpu401.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/emuproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/emuproc.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/memory.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/p17v.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/p17v.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/tina2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/tina2.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/emu10k1/voice.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/emu10k1/voice.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ens1370.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ens1370.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/es1938.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/es1938.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/es1968.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/es1968.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/fm801.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/fm801.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_codec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/hda_codec.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_intel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/hda_intel.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_patch.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/hda_patch.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/hda_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/hda_proc.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_analog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/patch_analog.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_atihdmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/patch_atihdmi.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_realtek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>1114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/hda/patch_sigmatel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/hda/patch_sigmatel.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/aureon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/aureon.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/aureon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/aureon.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/ews.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/ews.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/ice1712.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/ice1712.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/ice1712.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/ice1712.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/ice1724.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/ice1724.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/pontis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/pontis.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ice1712/revo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ice1712/revo.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/intel8x0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/intel8x0.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/intel8x0m.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/intel8x0m.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/korg1212/korg1212.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/korg1212/korg1212.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/maestro3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/maestro3.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/mixart/mixart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/mixart/mixart.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/nm256/nm256.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/nm256/nm256.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/pcxhr/pcxhr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/pcxhr/pcxhr.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/riptide/riptide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/riptide/riptide.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/rme32.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme96.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/rme96.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme9652/hdsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/rme9652/hdsp.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme9652/hdspm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/rme9652/hdspm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/rme9652/rme9652.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/rme9652/rme9652.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/sonicvibes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/sonicvibes.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/trident/trident.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/trident/trident.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/trident/trident_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/trident/trident_main.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/trident/trident_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/trident/trident_memory.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/trident/trident_synth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/trident/trident_synth.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/via82xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/via82xx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/via82xx_modem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/via82xx_modem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/vx222/vx222.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/vx222/vx222.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ymfpci/ymfpci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ymfpci/ymfpci.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pci/ymfpci/ymfpci_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pci/ymfpci/ymfpci_main.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pcmcia/pdaudiocf/pdaudiocf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pcmcia/pdaudiocf/pdaudiocf_core.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pcmcia/vx/vxp_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pcmcia/vx/vxp_ops.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/pcmcia/vx/vxpocket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/pcmcia/vx/vxpocket.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/ppc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/ppc/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/ppc/pmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/ppc/pmac.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/ppc/pmac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/ppc/pmac.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/ppc/powermac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/ppc/powermac.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux.git/diff/sound/ppc/toonie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/ppc/toonie.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/ppc/tumbler.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/ppc/tumbler.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sound_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/sound_core.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sparc/amd7930.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/sparc/amd7930.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sparc/cs4231.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/sparc/cs4231.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/sparc/dbri.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/sparc/dbri.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/synth/emux/emux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/synth/emux/emux.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/synth/emux/emux_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/synth/emux/emux_proc.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/synth/emux/emux_seq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/synth/emux/emux_seq.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/synth/emux/emux_synth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/synth/emux/emux_synth.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/synth/emux/soundfont.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/synth/emux/soundfont.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usbaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/usb/usbaudio.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usbaudio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/usb/usbaudio.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usbmidi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/usb/usbmidi.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usbmixer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/usb/usbmixer.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/sound/usb/usx2y/usx2yhwdeppcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>sound/usb/usx2y/usx2yhwdeppcm.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux.git/diff/usr/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f&amp;id2=48ce8b056c88920c8ac187781048f5dae33c81b9'>usr/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>8650 files changed, 347874 insertions, 199429 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/CREDITS b/CREDITS<br/>index 9bf714a1c7d9..29be6d1fdf49 100644<br/>--- a/<a href='/cgit/linux.git/tree/CREDITS?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>CREDITS</a><br/>+++ b/<a href='/cgit/linux.git/tree/CREDITS?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>CREDITS</a></div><div class='hunk'>@@ -24,6 +24,11 @@ S: C. Negri 6, bl. D3</div><div class='ctx'> S: Iasi 6600</div><div class='ctx'> S: Romania</div><div class='ctx'> </div><div class='add'>+N: Mark Adler</div><div class='add'>+E: madler@alumni.caltech.edu</div><div class='add'>+W: http://alumnus.caltech.edu/~madler/</div><div class='add'>+D: zlib decompression</div><div class='add'>+</div><div class='ctx'> N: Monalisa Agrawal</div><div class='ctx'> E: magrawal@nortelnetworks.com</div><div class='ctx'> D: Basic Interphase 5575 driver with UBR and ABR support.</div><div class='hunk'>@@ -523,11 +528,11 @@ S: Oxford</div><div class='ctx'> S: United Kingdom</div><div class='ctx'> </div><div class='ctx'> N: Luiz Fernando N. Capitulino</div><div class='del'>-E: lcapitulino@terra.com.br</div><div class='del'>-E: lcapitulino@prefeitura.sp.gov.br</div><div class='del'>-W: http://www.telecentros.sp.gov.br</div><div class='del'>-D: Little fixes and a lot of janitorial work</div><div class='del'>-S: E-GOV Telecentros SP</div><div class='add'>+E: lcapitulino@mandriva.com.br</div><div class='add'>+E: lcapitulino@gmail.com</div><div class='add'>+W: http://www.cpu.eti.br</div><div class='add'>+D: misc kernel hacking</div><div class='add'>+S: Mandriva</div><div class='ctx'> S: Brazil</div><div class='ctx'> </div><div class='ctx'> N: Remy Card</div><div class='hunk'>@@ -1573,12 +1578,8 @@ S: 160 00 Praha 6</div><div class='ctx'> S: Czech Republic</div><div class='ctx'> </div><div class='ctx'> N: Niels Kristian Bech Jensen</div><div class='del'>-E: nkbj@image.dk</div><div class='del'>-W: http://www.image.dk/~nkbj</div><div class='add'>+E: nkbj1970@hotmail.com</div><div class='ctx'> D: Miscellaneous kernel updates and fixes.</div><div class='del'>-S: Dr. Holsts Vej 34, lejl. 164</div><div class='del'>-S: DK-8230 Åbyhøj</div><div class='del'>-S: Denmark</div><div class='ctx'> </div><div class='ctx'> N: Michael K. Johnson</div><div class='ctx'> E: johnsonm@redhat.com</div><div class='hunk'>@@ -3400,10 +3401,10 @@ S: Czech Republic</div><div class='ctx'> </div><div class='ctx'> N: Thibaut Varene</div><div class='ctx'> E: T-Bone@parisc-linux.org</div><div class='del'>-W: http://www.parisc-linux.org/</div><div class='add'>+W: http://www.parisc-linux.org/~varenet/</div><div class='ctx'> P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C  FA2F 1E32 C3DA B7D2 F063</div><div class='ctx'> D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits</div><div class='del'>-D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there</div><div class='add'>+D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there</div><div class='ctx'> D: AD1889 sound driver</div><div class='ctx'> S: Paris, France</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ABI/README b/Documentation/ABI/README<br/>new file mode 100644<br/>index 000000000000..9feaf16f1617<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/README?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ABI/README</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+This directory attempts to document the ABI between the Linux kernel and</div><div class='add'>+userspace, and the relative stability of these interfaces.  Due to the</div><div class='add'>+everchanging nature of Linux, and the differing maturity levels, these</div><div class='add'>+interfaces should be used by userspace programs in different ways.</div><div class='add'>+</div><div class='add'>+We have four different levels of ABI stability, as shown by the four</div><div class='add'>+different subdirectories in this location.  Interfaces may change levels</div><div class='add'>+of stability according to the rules described below.</div><div class='add'>+</div><div class='add'>+The different levels of stability are:</div><div class='add'>+</div><div class='add'>+  stable/</div><div class='add'>+	This directory documents the interfaces that the developer has</div><div class='add'>+	defined to be stable.  Userspace programs are free to use these</div><div class='add'>+	interfaces with no restrictions, and backward compatibility for</div><div class='add'>+	them will be guaranteed for at least 2 years.  Most interfaces</div><div class='add'>+	(like syscalls) are expected to never change and always be</div><div class='add'>+	available.</div><div class='add'>+</div><div class='add'>+  testing/</div><div class='add'>+	This directory documents interfaces that are felt to be stable,</div><div class='add'>+	as the main development of this interface has been completed.</div><div class='add'>+	The interface can be changed to add new features, but the</div><div class='add'>+	current interface will not break by doing this, unless grave</div><div class='add'>+	errors or security problems are found in them.  Userspace</div><div class='add'>+	programs can start to rely on these interfaces, but they must be</div><div class='add'>+	aware of changes that can occur before these interfaces move to</div><div class='add'>+	be marked stable.  Programs that use these interfaces are</div><div class='add'>+	strongly encouraged to add their name to the description of</div><div class='add'>+	these interfaces, so that the kernel developers can easily</div><div class='add'>+	notify them if any changes occur (see the description of the</div><div class='add'>+	layout of the files below for details on how to do this.)</div><div class='add'>+</div><div class='add'>+  obsolete/</div><div class='add'>+  	This directory documents interfaces that are still remaining in</div><div class='add'>+	the kernel, but are marked to be removed at some later point in</div><div class='add'>+	time.  The description of the interface will document the reason</div><div class='add'>+	why it is obsolete and when it can be expected to be removed.</div><div class='add'>+	The file Documentation/feature-removal-schedule.txt may describe</div><div class='add'>+	some of these interfaces, giving a schedule for when they will</div><div class='add'>+	be removed.</div><div class='add'>+</div><div class='add'>+  removed/</div><div class='add'>+	This directory contains a list of the old interfaces that have</div><div class='add'>+	been removed from the kernel.</div><div class='add'>+</div><div class='add'>+Every file in these directories will contain the following information:</div><div class='add'>+</div><div class='add'>+What:		Short description of the interface</div><div class='add'>+Date:		Date created</div><div class='add'>+KernelVersion:	Kernel version this feature first showed up in.</div><div class='add'>+Contact:	Primary contact for this interface (may be a mailing list)</div><div class='add'>+Description:	Long description of the interface and how to use it.</div><div class='add'>+Users:		All users of this interface who wish to be notified when</div><div class='add'>+		it changes.  This is very important for interfaces in</div><div class='add'>+		the "testing" stage, so that kernel developers can work</div><div class='add'>+		with userspace developers to ensure that things do not</div><div class='add'>+		break in ways that are unacceptable.  It is also</div><div class='add'>+		important to get feedback for these interfaces to make</div><div class='add'>+		sure they are working in a proper way and do not need to</div><div class='add'>+		be changed further.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+How things move between levels:</div><div class='add'>+</div><div class='add'>+Interfaces in stable may move to obsolete, as long as the proper</div><div class='add'>+notification is given.</div><div class='add'>+</div><div class='add'>+Interfaces may be removed from obsolete and the kernel as long as the</div><div class='add'>+documented amount of time has gone by.</div><div class='add'>+</div><div class='add'>+Interfaces in the testing state can move to the stable state when the</div><div class='add'>+developers feel they are finished.  They cannot be removed from the</div><div class='add'>+kernel tree without going through the obsolete state first.</div><div class='add'>+</div><div class='add'>+It's up to the developer to place their interfaces in the category they</div><div class='add'>+wish for it to start out in.</div><div class='head'>diff --git a/Documentation/ABI/obsolete/devfs b/Documentation/ABI/obsolete/devfs<br/>new file mode 100644<br/>index 000000000000..b8b87399bc8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/obsolete/devfs?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ABI/obsolete/devfs</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+What:		devfs</div><div class='add'>+Date:		July 2005</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+	devfs has been unmaintained for a number of years, has unfixable</div><div class='add'>+	races, contains a naming policy within the kernel that is</div><div class='add'>+	against the LSB, and can be replaced by using udev.</div><div class='add'>+	The files fs/devfs/*, include/linux/devfs_fs*.h will be removed,</div><div class='add'>+	along with the the assorted devfs function calls throughout the</div><div class='add'>+	kernel tree.</div><div class='add'>+</div><div class='add'>+Users:</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/ABI/stable/syscalls b/Documentation/ABI/stable/syscalls<br/>new file mode 100644<br/>index 000000000000..c3ae3e7d6a0c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/stable/syscalls?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ABI/stable/syscalls</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+What:		The kernel syscall interface</div><div class='add'>+Description:</div><div class='add'>+	This interface matches much of the POSIX interface and is based</div><div class='add'>+	on it and other Unix based interfaces.  It will only be added to</div><div class='add'>+	over time, and not have things removed from it.</div><div class='add'>+</div><div class='add'>+	Note that this interface is different for every architecture</div><div class='add'>+	that Linux supports.  Please see the architecture-specific</div><div class='add'>+	documentation for details on the syscall numbers that are to be</div><div class='add'>+	mapped to each syscall.</div><div class='head'>diff --git a/Documentation/ABI/stable/sysfs-module b/Documentation/ABI/stable/sysfs-module<br/>new file mode 100644<br/>index 000000000000..75be43118335<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/stable/sysfs-module?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ABI/stable/sysfs-module</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+What:		/sys/module</div><div class='add'>+Description:</div><div class='add'>+	The /sys/module tree consists of the following structure:</div><div class='add'>+</div><div class='add'>+	/sys/module/MODULENAME</div><div class='add'>+		The name of the module that is in the kernel.  This</div><div class='add'>+		module name will show up either if the module is built</div><div class='add'>+		directly into the kernel, or if it is loaded as a</div><div class='add'>+		dyanmic module.</div><div class='add'>+</div><div class='add'>+	/sys/module/MODULENAME/parameters</div><div class='add'>+		This directory contains individual files that are each</div><div class='add'>+		individual parameters of the module that are able to be</div><div class='add'>+		changed at runtime.  See the individual module</div><div class='add'>+		documentation as to the contents of these parameters and</div><div class='add'>+		what they accomplish.</div><div class='add'>+</div><div class='add'>+		Note: The individual parameter names and values are not</div><div class='add'>+		considered stable, only the fact that they will be</div><div class='add'>+		placed in this location within sysfs.  See the</div><div class='add'>+		individual driver documentation for details as to the</div><div class='add'>+		stability of the different parameters.</div><div class='add'>+</div><div class='add'>+	/sys/module/MODULENAME/refcnt</div><div class='add'>+		If the module is able to be unloaded from the kernel, this file</div><div class='add'>+		will contain the current reference count of the module.</div><div class='add'>+</div><div class='add'>+		Note: If the module is built into the kernel, or if the</div><div class='add'>+		CONFIG_MODULE_UNLOAD kernel configuration value is not enabled,</div><div class='add'>+		this file will not be present.</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-class b/Documentation/ABI/testing/sysfs-class<br/>new file mode 100644<br/>index 000000000000..4b0cb891e46e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-class?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ABI/testing/sysfs-class</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+What:		/sys/class/</div><div class='add'>+Date:		Febuary 2006</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/class directory will consist of a group of</div><div class='add'>+		subdirectories describing individual classes of devices</div><div class='add'>+		in the kernel.  The individual directories will consist</div><div class='add'>+		of either subdirectories, or symlinks to other</div><div class='add'>+		directories.</div><div class='add'>+</div><div class='add'>+		All programs that use this directory tree must be able</div><div class='add'>+		to handle both subdirectories or symlinks in order to</div><div class='add'>+		work properly.</div><div class='add'>+</div><div class='add'>+Users:</div><div class='add'>+	udev &lt;linux-hotplug-devel@lists.sourceforge.net&gt;</div><div class='head'>diff --git a/Documentation/ABI/testing/sysfs-devices b/Documentation/ABI/testing/sysfs-devices<br/>new file mode 100644<br/>index 000000000000..6a25671ee5f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ABI/testing/sysfs-devices?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ABI/testing/sysfs-devices</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+What:		/sys/devices</div><div class='add'>+Date:		February 2006</div><div class='add'>+Contact:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+Description:</div><div class='add'>+		The /sys/devices tree contains a snapshot of the</div><div class='add'>+		internal state of the kernel device tree.  Devices will</div><div class='add'>+		be added and removed dynamically as the machine runs,</div><div class='add'>+		and between different kernel versions, the layout of the</div><div class='add'>+		devices within this tree will change.</div><div class='add'>+</div><div class='add'>+		Please do not rely on the format of this tree because of</div><div class='add'>+		this.  If a program wishes to find different things in</div><div class='add'>+		the tree, please use the /sys/class structure and rely</div><div class='add'>+		on the symlinks there to point to the proper location</div><div class='add'>+		within the /sys/devices tree of the individual devices.</div><div class='add'>+		Or rely on the uevent messages to notify programs of</div><div class='add'>+		devices being added and removed from this tree to find</div><div class='add'>+		the location of those devices.</div><div class='add'>+</div><div class='add'>+		Note that sometimes not all devices along the directory</div><div class='add'>+		chain will have emitted uevent messages, so userspace</div><div class='add'>+		programs must be able to handle such occurrences.</div><div class='add'>+</div><div class='add'>+Users:</div><div class='add'>+	udev &lt;linux-hotplug-devel@lists.sourceforge.net&gt;</div><div class='head'>diff --git a/Documentation/Changes b/Documentation/Changes<br/>index b02f476c2973..488272074c36 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/Changes?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/Changes</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/Changes?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/Changes</a></div><div class='hunk'>@@ -181,8 +181,8 @@ Intel IA32 microcode</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='ctx'> A driver has been added to allow updating of Intel IA32 microcode,</div><div class='del'>-accessible as both a devfs regular file and as a normal (misc)</div><div class='del'>-character device.  If you are not using devfs you may need to:</div><div class='add'>+accessible as a normal (misc) character device.  If you are not using</div><div class='add'>+udev you may need to:</div><div class='ctx'> </div><div class='ctx'> mkdir /dev/cpu</div><div class='ctx'> mknod /dev/cpu/microcode c 10 184</div><div class='hunk'>@@ -201,7 +201,9 @@ with programs using shared memory.</div><div class='ctx'> udev</div><div class='ctx'> ----</div><div class='ctx'> udev is a userspace application for populating /dev dynamically with</div><div class='del'>-only entries for devices actually present. udev replaces devfs.</div><div class='add'>+only entries for devices actually present.  udev replaces the basic</div><div class='add'>+functionality of devfs, while allowing persistant device naming for</div><div class='add'>+devices.</div><div class='ctx'> </div><div class='ctx'> FUSE</div><div class='ctx'> ----</div><div class='hunk'>@@ -231,18 +233,13 @@ The PPP driver has been restructured to support multilink and to</div><div class='ctx'> enable it to operate over diverse media layers.  If you use PPP,</div><div class='ctx'> upgrade pppd to at least 2.4.0.</div><div class='ctx'> </div><div class='del'>-If you are not using devfs, you must have the device file /dev/ppp</div><div class='add'>+If you are not using udev, you must have the device file /dev/ppp</div><div class='ctx'> which can be made by:</div><div class='ctx'> </div><div class='ctx'> mknod /dev/ppp c 108 0</div><div class='ctx'> </div><div class='ctx'> as root.</div><div class='ctx'> </div><div class='del'>-If you use devfsd and build ppp support as modules, you will need</div><div class='del'>-the following in your /etc/devfsd.conf file:</div><div class='del'>-</div><div class='del'>-LOOKUP	PPP	MODLOAD</div><div class='del'>-</div><div class='ctx'> Isdn4k-utils</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle<br/>index ce5d2c038cf5..6d2412ec91ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/CodingStyle?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/CodingStyle</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/CodingStyle?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/CodingStyle</a></div><div class='hunk'>@@ -155,7 +155,83 @@ problem, which is called the function-growth-hormone-imbalance syndrome.</div><div class='ctx'> See next chapter.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 5: Functions</div><div class='add'>+		Chapter 5: Typedefs</div><div class='add'>+</div><div class='add'>+Please don't use things like "vps_t".</div><div class='add'>+</div><div class='add'>+It's a _mistake_ to use typedef for structures and pointers. When you see a</div><div class='add'>+</div><div class='add'>+	vps_t a;</div><div class='add'>+</div><div class='add'>+in the source, what does it mean?</div><div class='add'>+</div><div class='add'>+In contrast, if it says</div><div class='add'>+</div><div class='add'>+	struct virtual_container *a;</div><div class='add'>+</div><div class='add'>+you can actually tell what "a" is.</div><div class='add'>+</div><div class='add'>+Lots of people think that typedefs "help readability". Not so. They are</div><div class='add'>+useful only for:</div><div class='add'>+</div><div class='add'>+ (a) totally opaque objects (where the typedef is actively used to _hide_</div><div class='add'>+     what the object is).</div><div class='add'>+</div><div class='add'>+     Example: "pte_t" etc. opaque objects that you can only access using</div><div class='add'>+     the proper accessor functions.</div><div class='add'>+</div><div class='add'>+     NOTE! Opaqueness and "accessor functions" are not good in themselves.</div><div class='add'>+     The reason we have them for things like pte_t etc. is that there</div><div class='add'>+     really is absolutely _zero_ portably accessible information there.</div><div class='add'>+</div><div class='add'>+ (b) Clear integer types, where the abstraction _helps_ avoid confusion</div><div class='add'>+     whether it is "int" or "long".</div><div class='add'>+</div><div class='add'>+     u8/u16/u32 are perfectly fine typedefs, although they fit into</div><div class='add'>+     category (d) better than here.</div><div class='add'>+</div><div class='add'>+     NOTE! Again - there needs to be a _reason_ for this. If something is</div><div class='add'>+     "unsigned long", then there's no reason to do</div><div class='add'>+</div><div class='add'>+	typedef unsigned long myflags_t;</div><div class='add'>+</div><div class='add'>+     but if there is a clear reason for why it under certain circumstances</div><div class='add'>+     might be an "unsigned int" and under other configurations might be</div><div class='add'>+     "unsigned long", then by all means go ahead and use a typedef.</div><div class='add'>+</div><div class='add'>+ (c) when you use sparse to literally create a _new_ type for</div><div class='add'>+     type-checking.</div><div class='add'>+</div><div class='add'>+ (d) New types which are identical to standard C99 types, in certain</div><div class='add'>+     exceptional circumstances.</div><div class='add'>+</div><div class='add'>+     Although it would only take a short amount of time for the eyes and</div><div class='add'>+     brain to become accustomed to the standard types like 'uint32_t',</div><div class='add'>+     some people object to their use anyway.</div><div class='add'>+</div><div class='add'>+     Therefore, the Linux-specific 'u8/u16/u32/u64' types and their</div><div class='add'>+     signed equivalents which are identical to standard types are</div><div class='add'>+     permitted -- although they are not mandatory in new code of your</div><div class='add'>+     own.</div><div class='add'>+</div><div class='add'>+     When editing existing code which already uses one or the other set</div><div class='add'>+     of types, you should conform to the existing choices in that code.</div><div class='add'>+</div><div class='add'>+ (e) Types safe for use in userspace.</div><div class='add'>+</div><div class='add'>+     In certain structures which are visible to userspace, we cannot</div><div class='add'>+     require C99 types and cannot use the 'u32' form above. Thus, we</div><div class='add'>+     use __u32 and similar types in all structures which are shared</div><div class='add'>+     with userspace.</div><div class='add'>+</div><div class='add'>+Maybe there are other cases too, but the rule should basically be to NEVER</div><div class='add'>+EVER use a typedef unless you can clearly match one of those rules.</div><div class='add'>+</div><div class='add'>+In general, a pointer, or a struct that has elements that can reasonably</div><div class='add'>+be directly accessed should _never_ be a typedef.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		Chapter 6: Functions</div><div class='ctx'> </div><div class='ctx'> Functions should be short and sweet, and do just one thing.  They should</div><div class='ctx'> fit on one or two screenfuls of text (the ISO/ANSI screen size is 80x24,</div><div class='hunk'>@@ -183,7 +259,7 @@ and it gets confused.  You know you're brilliant, but maybe you'd like</div><div class='ctx'> to understand what you did 2 weeks from now.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 6: Centralized exiting of functions</div><div class='add'>+		Chapter 7: Centralized exiting of functions</div><div class='ctx'> </div><div class='ctx'> Albeit deprecated by some people, the equivalent of the goto statement is</div><div class='ctx'> used frequently by compilers in form of the unconditional jump instruction.</div><div class='hunk'>@@ -220,7 +296,7 @@ out:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-		Chapter 7: Commenting</div><div class='add'>+		Chapter 8: Commenting</div><div class='ctx'> </div><div class='ctx'> Comments are good, but there is also a danger of over-commenting.  NEVER</div><div class='ctx'> try to explain HOW your code works in a comment: it's much better to</div><div class='hunk'>@@ -240,7 +316,7 @@ When commenting the kernel API functions, please use the kerneldoc format.</div><div class='ctx'> See the files Documentation/kernel-doc-nano-HOWTO.txt and scripts/kernel-doc</div><div class='ctx'> for details.</div><div class='ctx'> </div><div class='del'>-		Chapter 8: You've made a mess of it</div><div class='add'>+		Chapter 9: You've made a mess of it</div><div class='ctx'> </div><div class='ctx'> That's OK, we all do.  You've probably been told by your long-time Unix</div><div class='ctx'> user helper that "GNU emacs" automatically formats the C sources for</div><div class='hunk'>@@ -288,7 +364,7 @@ re-formatting you may want to take a look at the man page.  But</div><div class='ctx'> remember: "indent" is not a fix for bad programming.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 9: Configuration-files</div><div class='add'>+		Chapter 10: Configuration-files</div><div class='ctx'> </div><div class='ctx'> For configuration options (arch/xxx/Kconfig, and all the Kconfig files),</div><div class='ctx'> somewhat different indentation is used.</div><div class='hunk'>@@ -313,7 +389,7 @@ support for file-systems, for instance) should be denoted (DANGEROUS), other</div><div class='ctx'> experimental options should be denoted (EXPERIMENTAL).</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 10: Data structures</div><div class='add'>+		Chapter 11: Data structures</div><div class='ctx'> </div><div class='ctx'> Data structures that have visibility outside the single-threaded</div><div class='ctx'> environment they are created and destroyed in should always have</div><div class='hunk'>@@ -344,7 +420,7 @@ Remember: if another thread can find your data structure, and you don't</div><div class='ctx'> have a reference count on it, you almost certainly have a bug.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 11: Macros, Enums and RTL</div><div class='add'>+		Chapter 12: Macros, Enums and RTL</div><div class='ctx'> </div><div class='ctx'> Names of macros defining constants and labels in enums are capitalized.</div><div class='ctx'> </div><div class='hunk'>@@ -399,7 +475,7 @@ The cpp manual deals with macros exhaustively. The gcc internals manual also</div><div class='ctx'> covers RTL which is used frequently with assembly language in the kernel.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 12: Printing kernel messages</div><div class='add'>+		Chapter 13: Printing kernel messages</div><div class='ctx'> </div><div class='ctx'> Kernel developers like to be seen as literate. Do mind the spelling</div><div class='ctx'> of kernel messages to make a good impression. Do not use crippled</div><div class='hunk'>@@ -410,7 +486,7 @@ Kernel messages do not have to be terminated with a period.</div><div class='ctx'> Printing numbers in parentheses (%d) adds no value and should be avoided.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 13: Allocating memory</div><div class='add'>+		Chapter 14: Allocating memory</div><div class='ctx'> </div><div class='ctx'> The kernel provides the following general purpose memory allocators:</div><div class='ctx'> kmalloc(), kzalloc(), kcalloc(), and vmalloc().  Please refer to the API</div><div class='hunk'>@@ -429,7 +505,7 @@ from void pointer to any other pointer type is guaranteed by the C programming</div><div class='ctx'> language.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 14: The inline disease</div><div class='add'>+		Chapter 15: The inline disease</div><div class='ctx'> </div><div class='ctx'> There appears to be a common misperception that gcc has a magic "make me</div><div class='ctx'> faster" speedup option called "inline". While the use of inlines can be</div><div class='hunk'>@@ -457,7 +533,7 @@ something it would have done anyway.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		Chapter 15: References</div><div class='add'>+		Appendix I: References</div><div class='ctx'> </div><div class='ctx'> The C Programming Language, Second Edition</div><div class='ctx'> by Brian W. Kernighan and Dennis M. Ritchie.</div><div class='hunk'>@@ -481,4 +557,4 @@ Kernel CodingStyle, by greg@kroah.com at OLS 2002:</div><div class='ctx'> http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/</div><div class='ctx'> </div><div class='ctx'> --</div><div class='del'>-Last updated on 30 December 2005 by a community effort on LKML.</div><div class='add'>+Last updated on 30 April 2006.</div><div class='head'>diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt<br/>index 7c717699032c..63392c9132b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DMA-mapping.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DMA-mapping.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DMA-mapping.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DMA-mapping.txt</a></div><div class='hunk'>@@ -698,12 +698,12 @@ these interfaces.  Remember that, as defined, consistent mappings are</div><div class='ctx'> always going to be SAC addressable.</div><div class='ctx'> </div><div class='ctx'> The first thing your driver needs to do is query the PCI platform</div><div class='del'>-layer with your devices DAC addressing capabilities:</div><div class='add'>+layer if it is capable of handling your devices DAC addressing</div><div class='add'>+capabilities:</div><div class='ctx'> </div><div class='del'>-	int pci_dac_set_dma_mask(struct pci_dev *pdev, u64 mask);</div><div class='add'>+	int pci_dac_dma_supported(struct pci_dev *hwdev, u64 mask);</div><div class='ctx'> </div><div class='del'>-This routine behaves identically to pci_set_dma_mask.  You may not</div><div class='del'>-use the following interfaces if this routine fails.</div><div class='add'>+You may not use the following interfaces if this routine fails.</div><div class='ctx'> </div><div class='ctx'> Next, DMA addresses using this API are kept track of using the</div><div class='ctx'> dma64_addr_t type.  It is guaranteed to be big enough to hold any</div><div class='head'>diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile<br/>index 5a2882d275ba..66e1cf733571 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DocBook/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/Makefile</a></div><div class='hunk'>@@ -10,7 +10,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \</div><div class='ctx'> 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \</div><div class='ctx'> 	    procfs-guide.xml writing_usb_driver.xml \</div><div class='ctx'> 	    kernel-api.xml journal-api.xml lsm.xml usb.xml \</div><div class='del'>-	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml</div><div class='add'>+	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \</div><div class='add'>+	    genericirq.xml</div><div class='ctx'> </div><div class='ctx'> ###</div><div class='ctx'> # The build process is as follows (targets):</div><div class='head'>diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl<br/>new file mode 100644<br/>index 000000000000..0f4a4b6321e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/genericirq.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/genericirq.tmpl</a></div><div class='hunk'>@@ -0,0 +1,474 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"</div><div class='add'>+	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []&gt;</div><div class='add'>+</div><div class='add'>+&lt;book id="Generic-IRQ-Guide"&gt;</div><div class='add'>+ &lt;bookinfo&gt;</div><div class='add'>+  &lt;title&gt;Linux generic IRQ handling&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+  &lt;authorgroup&gt;</div><div class='add'>+   &lt;author&gt;</div><div class='add'>+    &lt;firstname&gt;Thomas&lt;/firstname&gt;</div><div class='add'>+    &lt;surname&gt;Gleixner&lt;/surname&gt;</div><div class='add'>+    &lt;affiliation&gt;</div><div class='add'>+     &lt;address&gt;</div><div class='add'>+      &lt;email&gt;tglx@linutronix.de&lt;/email&gt;</div><div class='add'>+     &lt;/address&gt;</div><div class='add'>+    &lt;/affiliation&gt;</div><div class='add'>+   &lt;/author&gt;</div><div class='add'>+   &lt;author&gt;</div><div class='add'>+    &lt;firstname&gt;Ingo&lt;/firstname&gt;</div><div class='add'>+    &lt;surname&gt;Molnar&lt;/surname&gt;</div><div class='add'>+    &lt;affiliation&gt;</div><div class='add'>+     &lt;address&gt;</div><div class='add'>+      &lt;email&gt;mingo@elte.hu&lt;/email&gt;</div><div class='add'>+     &lt;/address&gt;</div><div class='add'>+    &lt;/affiliation&gt;</div><div class='add'>+   &lt;/author&gt;</div><div class='add'>+  &lt;/authorgroup&gt;</div><div class='add'>+</div><div class='add'>+  &lt;copyright&gt;</div><div class='add'>+   &lt;year&gt;2005-2006&lt;/year&gt;</div><div class='add'>+   &lt;holder&gt;Thomas Gleixner&lt;/holder&gt;</div><div class='add'>+  &lt;/copyright&gt;</div><div class='add'>+  &lt;copyright&gt;</div><div class='add'>+   &lt;year&gt;2005-2006&lt;/year&gt;</div><div class='add'>+   &lt;holder&gt;Ingo Molnar&lt;/holder&gt;</div><div class='add'>+  &lt;/copyright&gt;</div><div class='add'>+</div><div class='add'>+  &lt;legalnotice&gt;</div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     This documentation is free software; you can redistribute</div><div class='add'>+     it and/or modify it under the terms of the GNU General Public</div><div class='add'>+     License version 2 as published by the Free Software Foundation.</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     This program is distributed in the hope that it will be</div><div class='add'>+     useful, but WITHOUT ANY WARRANTY; without even the implied</div><div class='add'>+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='add'>+     See the GNU General Public License for more details.</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     You should have received a copy of the GNU General Public</div><div class='add'>+     License along with this program; if not, write to the Free</div><div class='add'>+     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='add'>+     MA 02111-1307 USA</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+   &lt;para&gt;</div><div class='add'>+     For more details see the file COPYING in the source</div><div class='add'>+     distribution of Linux.</div><div class='add'>+   &lt;/para&gt;</div><div class='add'>+  &lt;/legalnotice&gt;</div><div class='add'>+ &lt;/bookinfo&gt;</div><div class='add'>+</div><div class='add'>+&lt;toc&gt;&lt;/toc&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="intro"&gt;</div><div class='add'>+    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='add'>+    &lt;para&gt;</div><div class='add'>+	The generic interrupt handling layer is designed to provide a</div><div class='add'>+	complete abstraction of interrupt handling for device drivers.</div><div class='add'>+	It is able to handle all the different types of interrupt controller</div><div class='add'>+	hardware. Device drivers use generic API functions to request, enable,</div><div class='add'>+	disable and free interrupts. The drivers do not have to know anything</div><div class='add'>+	about interrupt hardware details, so they can be used on different</div><div class='add'>+	platforms without code changes.</div><div class='add'>+    &lt;/para&gt;</div><div class='add'>+    &lt;para&gt;</div><div class='add'>+  	This documentation is provided to developers who want to implement</div><div class='add'>+	an interrupt subsystem based for their architecture, with the help</div><div class='add'>+	of the generic IRQ handling layer.</div><div class='add'>+    &lt;/para&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="rationale"&gt;</div><div class='add'>+    &lt;title&gt;Rationale&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	The original implementation of interrupt handling in Linux is using</div><div class='add'>+	the __do_IRQ() super-handler, which is able to deal with every</div><div class='add'>+	type of interrupt logic.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	Originally, Russell King identified different types of handlers to</div><div class='add'>+	build a quite universal set for the ARM interrupt handler</div><div class='add'>+	implementation in Linux 2.5/2.6. He distinguished between:</div><div class='add'>+	&lt;itemizedlist&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Level type&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Edge type&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Simple type&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	&lt;/itemizedlist&gt;</div><div class='add'>+	In the SMP world of the __do_IRQ() super-handler another type</div><div class='add'>+	was identified:</div><div class='add'>+	&lt;itemizedlist&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Per CPU type&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	&lt;/itemizedlist&gt;</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	This split implementation of highlevel IRQ handlers allows us to</div><div class='add'>+	optimize the flow of the interrupt handling for each specific</div><div class='add'>+	interrupt type. This reduces complexity in that particular codepath</div><div class='add'>+	and allows the optimized handling of a given type.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	The original general IRQ implementation used hw_interrupt_type</div><div class='add'>+	structures and their -&gt;ack(), -&gt;end() [etc.] callbacks to</div><div class='add'>+	differentiate the flow control in the super-handler. This leads to</div><div class='add'>+	a mix of flow logic and lowlevel hardware logic, and it also leads</div><div class='add'>+	to unnecessary code duplication: for example in i386, there is a</div><div class='add'>+	ioapic_level_irq and a ioapic_edge_irq irq-type which share many</div><div class='add'>+	of the lowlevel details but have different flow handling.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	A more natural abstraction is the clean separation of the</div><div class='add'>+	'irq flow' and the 'chip details'.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	Analysing a couple of architecture's IRQ subsystem implementations</div><div class='add'>+	reveals that most of them can use a generic set of 'irq flow'</div><div class='add'>+	methods and only need to add the chip level specific code.</div><div class='add'>+	The separation is also valuable for (sub)architectures</div><div class='add'>+	which need specific quirks in the irq flow itself but not in the</div><div class='add'>+	chip-details - and thus provides a more transparent IRQ subsystem</div><div class='add'>+	design.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	Each interrupt descriptor is assigned its own highlevel flow</div><div class='add'>+	handler, which is normally one of the generic</div><div class='add'>+	implementations. (This highlevel flow handler implementation also</div><div class='add'>+	makes it simple to provide demultiplexing handlers which can be</div><div class='add'>+	found in embedded platforms on various architectures.)</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	The separation makes the generic interrupt handling layer more</div><div class='add'>+	flexible and extensible. For example, an (sub)architecture can</div><div class='add'>+	use a generic irq-flow implementation for 'level type' interrupts</div><div class='add'>+	and add a (sub)architecture specific 'edge type' implementation.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	To make the transition to the new model easier and prevent the</div><div class='add'>+	breakage of existing implementations, the __do_IRQ() super-handler</div><div class='add'>+	is still available. This leads to a kind of duality for the time</div><div class='add'>+	being. Over time the new model should be used in more and more</div><div class='add'>+	architectures, as it enables smaller and cleaner IRQ subsystems.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+  &lt;chapter id="bugs"&gt;</div><div class='add'>+    &lt;title&gt;Known Bugs And Assumptions&lt;/title&gt;</div><div class='add'>+    &lt;para&gt;</div><div class='add'>+	None (knock on wood).</div><div class='add'>+    &lt;/para&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="Abstraction"&gt;</div><div class='add'>+    &lt;title&gt;Abstraction layers&lt;/title&gt;</div><div class='add'>+    &lt;para&gt;</div><div class='add'>+	There are three main levels of abstraction in the interrupt code:</div><div class='add'>+	&lt;orderedlist&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Highlevel driver API&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Highlevel IRQ flow handlers&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;Chiplevel hardware encapsulation&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	&lt;/orderedlist&gt;</div><div class='add'>+    &lt;/para&gt;</div><div class='add'>+    &lt;sect1&gt;</div><div class='add'>+	&lt;title&gt;Interrupt control flow&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	Each interrupt is described by an interrupt descriptor structure</div><div class='add'>+	irq_desc. The interrupt is referenced by an 'unsigned int' numeric</div><div class='add'>+	value which selects the corresponding interrupt decription structure</div><div class='add'>+	in the descriptor structures array.</div><div class='add'>+	The descriptor structure contains status information and pointers</div><div class='add'>+	to the interrupt flow method and the interrupt chip structure</div><div class='add'>+	which are assigned to this interrupt.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	Whenever an interrupt triggers, the lowlevel arch code calls into</div><div class='add'>+	the generic interrupt code by calling desc-&gt;handle_irq().</div><div class='add'>+	This highlevel IRQ handling function only uses desc-&gt;chip primitives</div><div class='add'>+	referenced by the assigned chip descriptor structure.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+    &lt;sect1&gt;</div><div class='add'>+	&lt;title&gt;Highlevel Driver API&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	  The highlevel Driver API consists of following functions:</div><div class='add'>+	  &lt;itemizedlist&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;request_irq()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;free_irq()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;disable_irq()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;enable_irq()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;disable_irq_nosync() (SMP only)&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;synchronize_irq() (SMP only)&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_irq_type()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_irq_wake()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_irq_data()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_irq_chip()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_irq_chip_data()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+          &lt;/itemizedlist&gt;</div><div class='add'>+	  See the autogenerated function documentation for details.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+    &lt;sect1&gt;</div><div class='add'>+	&lt;title&gt;Highlevel IRQ flow handlers&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	  The generic layer provides a set of pre-defined irq-flow methods:</div><div class='add'>+	  &lt;itemizedlist&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;handle_level_irq&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;handle_edge_irq&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;handle_simple_irq&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;handle_percpu_irq&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;/itemizedlist&gt;</div><div class='add'>+	  The interrupt flow handlers (either predefined or architecture</div><div class='add'>+	  specific) are assigned to specific interrupts by the architecture</div><div class='add'>+	  either during bootup or during device initialization.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;sect2&gt;</div><div class='add'>+	&lt;title&gt;Default flow implementations&lt;/title&gt;</div><div class='add'>+	    &lt;sect3&gt;</div><div class='add'>+	 	&lt;title&gt;Helper functions&lt;/title&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		The helper functions call the chip primitives and</div><div class='add'>+		are used by the default flow implementations.</div><div class='add'>+		The following helper functions are implemented (simplified excerpt):</div><div class='add'>+		&lt;programlisting&gt;</div><div class='add'>+default_enable(irq)</div><div class='add'>+{</div><div class='add'>+	desc-&gt;chip-&gt;unmask(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+default_disable(irq)</div><div class='add'>+{</div><div class='add'>+	if (!delay_disable(irq))</div><div class='add'>+		desc-&gt;chip-&gt;mask(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+default_ack(irq)</div><div class='add'>+{</div><div class='add'>+	chip-&gt;ack(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+default_mask_ack(irq)</div><div class='add'>+{</div><div class='add'>+	if (chip-&gt;mask_ack) {</div><div class='add'>+		chip-&gt;mask_ack(irq);</div><div class='add'>+	} else {</div><div class='add'>+		chip-&gt;mask(irq);</div><div class='add'>+		chip-&gt;ack(irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+noop(irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+		&lt;/programlisting&gt;</div><div class='add'>+	        &lt;/para&gt;</div><div class='add'>+	    &lt;/sect3&gt;</div><div class='add'>+	&lt;/sect2&gt;</div><div class='add'>+	&lt;sect2&gt;</div><div class='add'>+	&lt;title&gt;Default flow handler implementations&lt;/title&gt;</div><div class='add'>+	    &lt;sect3&gt;</div><div class='add'>+	 	&lt;title&gt;Default Level IRQ flow handler&lt;/title&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		handle_level_irq provides a generic implementation</div><div class='add'>+		for level-triggered interrupts.</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		The following control flow is implemented (simplified excerpt):</div><div class='add'>+		&lt;programlisting&gt;</div><div class='add'>+desc-&gt;chip-&gt;start();</div><div class='add'>+handle_IRQ_event(desc-&gt;action);</div><div class='add'>+desc-&gt;chip-&gt;end();</div><div class='add'>+		&lt;/programlisting&gt;</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+   	    &lt;/sect3&gt;</div><div class='add'>+	    &lt;sect3&gt;</div><div class='add'>+	 	&lt;title&gt;Default Edge IRQ flow handler&lt;/title&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		handle_edge_irq provides a generic implementation</div><div class='add'>+		for edge-triggered interrupts.</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		The following control flow is implemented (simplified excerpt):</div><div class='add'>+		&lt;programlisting&gt;</div><div class='add'>+if (desc-&gt;status &amp;amp; running) {</div><div class='add'>+	desc-&gt;chip-&gt;hold();</div><div class='add'>+	desc-&gt;status |= pending | masked;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+desc-&gt;chip-&gt;start();</div><div class='add'>+desc-&gt;status |= running;</div><div class='add'>+do {</div><div class='add'>+	if (desc-&gt;status &amp;amp; masked)</div><div class='add'>+		desc-&gt;chip-&gt;enable();</div><div class='add'>+	desc-status &amp;amp;= ~pending;</div><div class='add'>+	handle_IRQ_event(desc-&gt;action);</div><div class='add'>+} while (status &amp;amp; pending);</div><div class='add'>+desc-status &amp;amp;= ~running;</div><div class='add'>+desc-&gt;chip-&gt;end();</div><div class='add'>+		&lt;/programlisting&gt;</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+   	    &lt;/sect3&gt;</div><div class='add'>+	    &lt;sect3&gt;</div><div class='add'>+	 	&lt;title&gt;Default simple IRQ flow handler&lt;/title&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		handle_simple_irq provides a generic implementation</div><div class='add'>+		for simple interrupts.</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		Note: The simple flow handler does not call any</div><div class='add'>+		handler/chip primitives.</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		The following control flow is implemented (simplified excerpt):</div><div class='add'>+		&lt;programlisting&gt;</div><div class='add'>+handle_IRQ_event(desc-&gt;action);</div><div class='add'>+		&lt;/programlisting&gt;</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+   	    &lt;/sect3&gt;</div><div class='add'>+	    &lt;sect3&gt;</div><div class='add'>+	 	&lt;title&gt;Default per CPU flow handler&lt;/title&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		handle_percpu_irq provides a generic implementation</div><div class='add'>+		for per CPU interrupts.</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		Per CPU interrupts are only available on SMP and</div><div class='add'>+		the handler provides a simplified version without</div><div class='add'>+		locking.</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+		&lt;para&gt;</div><div class='add'>+		The following control flow is implemented (simplified excerpt):</div><div class='add'>+		&lt;programlisting&gt;</div><div class='add'>+desc-&gt;chip-&gt;start();</div><div class='add'>+handle_IRQ_event(desc-&gt;action);</div><div class='add'>+desc-&gt;chip-&gt;end();</div><div class='add'>+		&lt;/programlisting&gt;</div><div class='add'>+		&lt;/para&gt;</div><div class='add'>+   	    &lt;/sect3&gt;</div><div class='add'>+	&lt;/sect2&gt;</div><div class='add'>+	&lt;sect2&gt;</div><div class='add'>+	&lt;title&gt;Quirks and optimizations&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	The generic functions are intended for 'clean' architectures and chips,</div><div class='add'>+	which have no platform-specific IRQ handling quirks. If an architecture</div><div class='add'>+	needs to implement quirks on the 'flow' level then it can do so by</div><div class='add'>+	overriding the highlevel irq-flow handler.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;/sect2&gt;</div><div class='add'>+	&lt;sect2&gt;</div><div class='add'>+	&lt;title&gt;Delayed interrupt disable&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	This per interrupt selectable feature, which was introduced by Russell</div><div class='add'>+	King in the ARM interrupt implementation, does not mask an interrupt</div><div class='add'>+	at the hardware level when disable_irq() is called. The interrupt is</div><div class='add'>+	kept enabled and is masked in the flow handler when an interrupt event</div><div class='add'>+	happens. This prevents losing edge interrupts on hardware which does</div><div class='add'>+	not store an edge interrupt event while the interrupt is disabled at</div><div class='add'>+	the hardware level. When an interrupt arrives while the IRQ_DISABLED</div><div class='add'>+	flag is set, then the interrupt is masked at the hardware level and</div><div class='add'>+	the IRQ_PENDING bit is set. When the interrupt is re-enabled by</div><div class='add'>+	enable_irq() the pending bit is checked and if it is set, the</div><div class='add'>+	interrupt is resent either via hardware or by a software resend</div><div class='add'>+	mechanism. (It's necessary to enable CONFIG_HARDIRQS_SW_RESEND when</div><div class='add'>+	you want to use the delayed interrupt disable feature and your</div><div class='add'>+	hardware is not capable of retriggering	an interrupt.)</div><div class='add'>+	The delayed interrupt disable can be runtime enabled, per interrupt,</div><div class='add'>+	by setting the IRQ_DELAYED_DISABLE flag in the irq_desc status field.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;/sect2&gt;</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+    &lt;sect1&gt;</div><div class='add'>+	&lt;title&gt;Chiplevel hardware encapsulation&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	The chip level hardware descriptor structure irq_chip</div><div class='add'>+	contains all the direct chip relevant functions, which</div><div class='add'>+	can be utilized by the irq flow implementations.</div><div class='add'>+	  &lt;itemizedlist&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;ack()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;mask_ack() - Optional, recommended for performance&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;mask()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;unmask()&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;retrigger() - Optional&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_type() - Optional&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;listitem&gt;&lt;para&gt;set_wake() - Optional&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	  &lt;/itemizedlist&gt;</div><div class='add'>+	These primitives are strictly intended to mean what they say: ack means</div><div class='add'>+	ACK, masking means masking of an IRQ line, etc. It is up to the flow</div><div class='add'>+	handler(s) to use these basic units of lowlevel functionality.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+    &lt;/sect1&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="doirq"&gt;</div><div class='add'>+     &lt;title&gt;__do_IRQ entry point&lt;/title&gt;</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+ 	The original implementation __do_IRQ() is an alternative entry</div><div class='add'>+	point for all types of interrupts.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+	This handler turned out to be not suitable for all</div><div class='add'>+	interrupt hardware and was therefore reimplemented with split</div><div class='add'>+	functionality for egde/level/simple/percpu interrupts. This is not</div><div class='add'>+	only a functional optimization. It also shortens code paths for</div><div class='add'>+	interrupts.</div><div class='add'>+      &lt;/para&gt;</div><div class='add'>+      &lt;para&gt;</div><div class='add'>+	To make use of the split implementation, replace the call to</div><div class='add'>+	__do_IRQ by a call to desc-&gt;chip-&gt;handle_irq() and associate</div><div class='add'>+        the appropriate handler function to desc-&gt;chip-&gt;handle_irq().</div><div class='add'>+	In most cases the generic handler implementations should</div><div class='add'>+	be sufficient.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="locking"&gt;</div><div class='add'>+     &lt;title&gt;Locking on SMP&lt;/title&gt;</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+	The locking of chip registers is up to the architecture that</div><div class='add'>+	defines the chip primitives. There is a chip-&gt;lock field that can be used</div><div class='add'>+	for serialization, but the generic layer does not touch it. The per-irq</div><div class='add'>+	structure is protected via desc-&gt;lock, by the generic layer.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+  &lt;chapter id="structs"&gt;</div><div class='add'>+     &lt;title&gt;Structures&lt;/title&gt;</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+     This chapter contains the autogenerated documentation of the structures which are</div><div class='add'>+     used in the generic IRQ layer.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+!Iinclude/linux/irq.h</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="pubfunctions"&gt;</div><div class='add'>+     &lt;title&gt;Public Functions Provided&lt;/title&gt;</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+     This chapter contains the autogenerated documentation of the kernel API functions</div><div class='add'>+      which are exported.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+!Ekernel/irq/manage.c</div><div class='add'>+!Ekernel/irq/chip.c</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="intfunctions"&gt;</div><div class='add'>+     &lt;title&gt;Internal Functions Provided&lt;/title&gt;</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+     This chapter contains the autogenerated documentation of the internal functions.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+!Ikernel/irq/handle.c</div><div class='add'>+!Ikernel/irq/chip.c</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="credits"&gt;</div><div class='add'>+     &lt;title&gt;Credits&lt;/title&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+		The following people have contributed to this document:</div><div class='add'>+		&lt;orderedlist&gt;</div><div class='add'>+			&lt;listitem&gt;&lt;para&gt;Thomas Gleixner&lt;email&gt;tglx@linutronix.de&lt;/email&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+			&lt;listitem&gt;&lt;para&gt;Ingo Molnar&lt;email&gt;mingo@elte.hu&lt;/email&gt;&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+		&lt;/orderedlist&gt;</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+&lt;/book&gt;</div><div class='head'>diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl<br/>index ca02e04a906c..1ae4dc0fd856 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/kernel-api.tmpl?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DocBook/kernel-api.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/kernel-api.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/kernel-api.tmpl</a></div><div class='hunk'>@@ -62,6 +62,8 @@</div><div class='ctx'>      &lt;sect1&gt;&lt;title&gt;Internal Functions&lt;/title&gt;</div><div class='ctx'> !Ikernel/exit.c</div><div class='ctx'> !Ikernel/signal.c</div><div class='add'>+!Iinclude/linux/kthread.h</div><div class='add'>+!Ekernel/kthread.c</div><div class='ctx'>      &lt;/sect1&gt;</div><div class='ctx'> </div><div class='ctx'>      &lt;sect1&gt;&lt;title&gt;Kernel objects manipulation&lt;/title&gt;</div><div class='hunk'>@@ -114,9 +116,33 @@ X!Ilib/string.c</div><div class='ctx'>      &lt;/sect1&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='add'>+  &lt;chapter id="kernel-lib"&gt;</div><div class='add'>+     &lt;title&gt;Basic Kernel Library Functions&lt;/title&gt;</div><div class='add'>+</div><div class='add'>+     &lt;para&gt;</div><div class='add'>+       The Linux kernel provides more basic utility functions.</div><div class='add'>+     &lt;/para&gt;</div><div class='add'>+</div><div class='add'>+     &lt;sect1&gt;&lt;title&gt;Bitmap Operations&lt;/title&gt;</div><div class='add'>+!Elib/bitmap.c</div><div class='add'>+!Ilib/bitmap.c</div><div class='add'>+     &lt;/sect1&gt;</div><div class='add'>+</div><div class='add'>+     &lt;sect1&gt;&lt;title&gt;Command-line Parsing&lt;/title&gt;</div><div class='add'>+!Elib/cmdline.c</div><div class='add'>+     &lt;/sect1&gt;</div><div class='add'>+</div><div class='add'>+     &lt;sect1&gt;&lt;title&gt;CRC Functions&lt;/title&gt;</div><div class='add'>+!Elib/crc16.c</div><div class='add'>+!Elib/crc32.c</div><div class='add'>+!Elib/crc-ccitt.c</div><div class='add'>+     &lt;/sect1&gt;</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='ctx'>   &lt;chapter id="mm"&gt;</div><div class='ctx'>      &lt;title&gt;Memory Management in Linux&lt;/title&gt;</div><div class='ctx'>      &lt;sect1&gt;&lt;title&gt;The Slab Cache&lt;/title&gt;</div><div class='add'>+!Iinclude/linux/slab.h</div><div class='ctx'> !Emm/slab.c</div><div class='ctx'>      &lt;/sect1&gt;</div><div class='ctx'>      &lt;sect1&gt;&lt;title&gt;User Space Memory Access&lt;/title&gt;</div><div class='hunk'>@@ -280,12 +306,13 @@ X!Ekernel/module.c</div><div class='ctx'>      &lt;sect1&gt;&lt;title&gt;MTRR Handling&lt;/title&gt;</div><div class='ctx'> !Earch/i386/kernel/cpu/mtrr/main.c</div><div class='ctx'>      &lt;/sect1&gt;</div><div class='add'>+</div><div class='ctx'>      &lt;sect1&gt;&lt;title&gt;PCI Support Library&lt;/title&gt;</div><div class='ctx'> !Edrivers/pci/pci.c</div><div class='ctx'> !Edrivers/pci/pci-driver.c</div><div class='ctx'> !Edrivers/pci/remove.c</div><div class='ctx'> !Edrivers/pci/pci-acpi.c</div><div class='del'>-&lt;!-- kerneldoc does not understand to __devinit</div><div class='add'>+&lt;!-- kerneldoc does not understand __devinit</div><div class='ctx'> X!Edrivers/pci/search.c</div><div class='ctx'>  --&gt;</div><div class='ctx'> !Edrivers/pci/msi.c</div><div class='hunk'>@@ -314,9 +341,11 @@ X!Earch/i386/kernel/mca.c</div><div class='ctx'>      &lt;/sect1&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='del'>-  &lt;chapter id="devfs"&gt;</div><div class='del'>-     &lt;title&gt;The Device File System&lt;/title&gt;</div><div class='del'>-!Efs/devfs/base.c</div><div class='add'>+  &lt;chapter id="firmware"&gt;</div><div class='add'>+     &lt;title&gt;Firmware Interfaces&lt;/title&gt;</div><div class='add'>+     &lt;sect1&gt;&lt;title&gt;DMI Interfaces&lt;/title&gt;</div><div class='add'>+!Edrivers/firmware/dmi_scan.c</div><div class='add'>+     &lt;/sect1&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;chapter id="sysfs"&gt;</div><div class='hunk'>@@ -331,6 +360,18 @@ X!Earch/i386/kernel/mca.c</div><div class='ctx'> !Esecurity/security.c</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='add'>+  &lt;chapter id="audit"&gt;</div><div class='add'>+     &lt;title&gt;Audit Interfaces&lt;/title&gt;</div><div class='add'>+!Ekernel/audit.c</div><div class='add'>+!Ikernel/auditsc.c</div><div class='add'>+!Ikernel/auditfilter.c</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='add'>+  &lt;chapter id="accounting"&gt;</div><div class='add'>+     &lt;title&gt;Accounting Framework&lt;/title&gt;</div><div class='add'>+!Ikernel/acct.c</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='ctx'>   &lt;chapter id="pmfuncs"&gt;</div><div class='ctx'>      &lt;title&gt;Power Management&lt;/title&gt;</div><div class='ctx'> !Ekernel/power/pm.c</div><div class='hunk'>@@ -390,7 +431,6 @@ X!Edrivers/pnp/system.c</div><div class='ctx'>      &lt;/sect1&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>   &lt;chapter id="blkdev"&gt;</div><div class='ctx'>      &lt;title&gt;Block Devices&lt;/title&gt;</div><div class='ctx'> !Eblock/ll_rw_blk.c</div><div class='hunk'>@@ -401,6 +441,14 @@ X!Edrivers/pnp/system.c</div><div class='ctx'> !Edrivers/char/misc.c</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='add'>+  &lt;chapter id="parportdev"&gt;</div><div class='add'>+     &lt;title&gt;Parallel Port Devices&lt;/title&gt;</div><div class='add'>+!Iinclude/linux/parport.h</div><div class='add'>+!Edrivers/parport/ieee1284.c</div><div class='add'>+!Edrivers/parport/share.c</div><div class='add'>+!Idrivers/parport/daisy.c</div><div class='add'>+  &lt;/chapter&gt;</div><div class='add'>+</div><div class='ctx'>   &lt;chapter id="viddev"&gt;</div><div class='ctx'>      &lt;title&gt;Video4Linux&lt;/title&gt;</div><div class='ctx'> !Edrivers/media/video/videodev.c</div><div class='head'>diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl<br/>index 158ffe9bfade..644c3884fab9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/kernel-locking.tmpl?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DocBook/kernel-locking.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/kernel-locking.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/kernel-locking.tmpl</a></div><div class='hunk'>@@ -1590,7 +1590,7 @@ the amount of locking which needs to be done.</div><div class='ctx'>     &lt;para&gt;</div><div class='ctx'>       Our final dilemma is this: when can we actually destroy the</div><div class='ctx'>       removed element?  Remember, a reader might be stepping through</div><div class='del'>-      this element in the list right now: it we free this element and</div><div class='add'>+      this element in the list right now: if we free this element and</div><div class='ctx'>       the &lt;symbol&gt;next&lt;/symbol&gt; pointer changes, the reader will jump</div><div class='ctx'>       off into garbage and crash.  We need to wait until we know that</div><div class='ctx'>       all the readers who were traversing the list when we deleted the</div><div class='head'>diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl<br/>index f869b03929db..e97c32314541 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/libata.tmpl?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DocBook/libata.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/libata.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/libata.tmpl</a></div><div class='hunk'>@@ -169,6 +169,22 @@ void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);</div><div class='ctx'> </div><div class='ctx'> 	&lt;/sect2&gt;</div><div class='ctx'> </div><div class='add'>+	&lt;sect2&gt;&lt;title&gt;PIO data read/write&lt;/title&gt;</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);</div><div class='add'>+	&lt;/programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+All bmdma-style drivers must implement this hook.  This is the low-level</div><div class='add'>+operation that actually copies the data bytes during a PIO data</div><div class='add'>+transfer.</div><div class='add'>+Typically the driver</div><div class='add'>+will choose one of ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), or</div><div class='add'>+ata_mmio_data_xfer().</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;/sect2&gt;</div><div class='add'>+</div><div class='ctx'> 	&lt;sect2&gt;&lt;title&gt;ATA command execute&lt;/title&gt;</div><div class='ctx'> 	&lt;programlisting&gt;</div><div class='ctx'> void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);</div><div class='hunk'>@@ -204,11 +220,10 @@ command.</div><div class='ctx'> 	&lt;programlisting&gt;</div><div class='ctx'> u8   (*check_status)(struct ata_port *ap);</div><div class='ctx'> u8   (*check_altstatus)(struct ata_port *ap);</div><div class='del'>-u8   (*check_err)(struct ata_port *ap);</div><div class='ctx'> 	&lt;/programlisting&gt;</div><div class='ctx'> </div><div class='ctx'> 	&lt;para&gt;</div><div class='del'>-	Reads the Status/AltStatus/Error ATA shadow register from</div><div class='add'>+	Reads the Status/AltStatus ATA shadow register from</div><div class='ctx'> 	hardware.  On some hardware, reading the Status register has</div><div class='ctx'> 	the side effect of clearing the interrupt condition.</div><div class='ctx'> 	Most drivers for taskfile-based hardware use</div><div class='hunk'>@@ -269,23 +284,6 @@ void (*set_mode) (struct ata_port *ap);</div><div class='ctx'> </div><div class='ctx'> 	&lt;/sect2&gt;</div><div class='ctx'> </div><div class='del'>-	&lt;sect2&gt;&lt;title&gt;Reset ATA bus&lt;/title&gt;</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-void (*phy_reset) (struct ata_port *ap);</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	The very first step in the probe phase.  Actions vary depending</div><div class='del'>-	on the bus type, typically.  After waking up the device and probing</div><div class='del'>-	for device presence (PATA and SATA), typically a soft reset</div><div class='del'>-	(SRST) will be performed.  Drivers typically use the helper</div><div class='del'>-	functions ata_bus_reset() or sata_phy_reset() for this hook.</div><div class='del'>-	Many SATA drivers use sata_phy_reset() or call it from within</div><div class='del'>-	their own phy_reset() functions.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/sect2&gt;</div><div class='del'>-</div><div class='ctx'> 	&lt;sect2&gt;&lt;title&gt;Control PCI IDE BMDMA engine&lt;/title&gt;</div><div class='ctx'> 	&lt;programlisting&gt;</div><div class='ctx'> void (*bmdma_setup) (struct ata_queued_cmd *qc);</div><div class='hunk'>@@ -354,16 +352,74 @@ int (*qc_issue) (struct ata_queued_cmd *qc);</div><div class='ctx'> </div><div class='ctx'> 	&lt;/sect2&gt;</div><div class='ctx'> </div><div class='del'>-	&lt;sect2&gt;&lt;title&gt;Timeout (error) handling&lt;/title&gt;</div><div class='add'>+	&lt;sect2&gt;&lt;title&gt;Exception and probe handling (EH)&lt;/title&gt;</div><div class='ctx'> 	&lt;programlisting&gt;</div><div class='ctx'> void (*eng_timeout) (struct ata_port *ap);</div><div class='add'>+void (*phy_reset) (struct ata_port *ap);</div><div class='add'>+	&lt;/programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+Deprecated.  Use -&gt;error_handler() instead.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+void (*freeze) (struct ata_port *ap);</div><div class='add'>+void (*thaw) (struct ata_port *ap);</div><div class='add'>+	&lt;/programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+ata_port_freeze() is called when HSM violations or some other</div><div class='add'>+condition disrupts normal operation of the port.  A frozen port</div><div class='add'>+is not allowed to perform any operation until the port is</div><div class='add'>+thawed, which usually follows a successful reset.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+The optional -&gt;freeze() callback can be used for freezing the port</div><div class='add'>+hardware-wise (e.g. mask interrupt and stop DMA engine).  If a</div><div class='add'>+port cannot be frozen hardware-wise, the interrupt handler</div><div class='add'>+must ack and clear interrupts unconditionally while the port</div><div class='add'>+is frozen.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+The optional -&gt;thaw() callback is called to perform the opposite of -&gt;freeze():</div><div class='add'>+prepare the port for normal operation once again.  Unmask interrupts,</div><div class='add'>+start DMA engine, etc.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+void (*error_handler) (struct ata_port *ap);</div><div class='add'>+	&lt;/programlisting&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+-&gt;error_handler() is a driver's hook into probe, hotplug, and recovery</div><div class='add'>+and other exceptional conditions.  The primary responsibility of an</div><div class='add'>+implementation is to call ata_do_eh() or ata_bmdma_drive_eh() with a set</div><div class='add'>+of EH hooks as arguments:</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+'prereset' hook (may be NULL) is called during an EH reset, before any other actions</div><div class='add'>+are taken.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+'postreset' hook (may be NULL) is called after the EH reset is performed.  Based on</div><div class='add'>+existing conditions, severity of the problem, and hardware capabilities,</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+Either 'softreset' (may be NULL) or 'hardreset' (may be NULL) will be</div><div class='add'>+called to perform the low-level EH reset.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;programlisting&gt;</div><div class='add'>+void (*post_internal_cmd) (struct ata_queued_cmd *qc);</div><div class='ctx'> 	&lt;/programlisting&gt;</div><div class='ctx'> </div><div class='ctx'> 	&lt;para&gt;</div><div class='del'>-This is a high level error handling function, called from the</div><div class='del'>-error handling thread, when a command times out.  Most newer</div><div class='del'>-hardware will implement its own error handling code here.  IDE BMDMA</div><div class='del'>-drivers may use the helper function ata_eng_timeout().</div><div class='add'>+Perform any hardware-specific actions necessary to finish processing</div><div class='add'>+after executing a probe-time or EH-time command via ata_exec_internal().</div><div class='ctx'> 	&lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'> 	&lt;/sect2&gt;</div><div class='head'>diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl<br/>index 6e463d0db266..a8c8cce50633 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/mtdnand.tmpl?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DocBook/mtdnand.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/mtdnand.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/mtdnand.tmpl</a></div><div class='hunk'>@@ -109,7 +109,7 @@</div><div class='ctx'> 		for most of the implementations. These functions can be replaced by the</div><div class='ctx'> 		board driver if neccecary. Those functions are called via pointers in the</div><div class='ctx'> 		NAND chip description structure. The board driver can set the functions which</div><div class='del'>-		should be replaced by board dependend functions before calling nand_scan().</div><div class='add'>+		should be replaced by board dependent functions before calling nand_scan().</div><div class='ctx'> 		If the function pointer is NULL on entry to nand_scan() then the pointer</div><div class='ctx'> 		is set to the default function which is suitable for the detected chip type.</div><div class='ctx'> 		&lt;/para&gt;&lt;/listitem&gt;</div><div class='hunk'>@@ -133,7 +133,7 @@</div><div class='ctx'> 	  	[REPLACEABLE]&lt;/para&gt;&lt;para&gt;</div><div class='ctx'> 		Replaceable members hold hardware related functions which can be </div><div class='ctx'> 		provided by the board driver. The board driver can set the functions which</div><div class='del'>-		should be replaced by board dependend functions before calling nand_scan().</div><div class='add'>+		should be replaced by board dependent functions before calling nand_scan().</div><div class='ctx'> 		If the function pointer is NULL on entry to nand_scan() then the pointer</div><div class='ctx'> 		is set to the default function which is suitable for the detected chip type.</div><div class='ctx'> 		&lt;/para&gt;&lt;/listitem&gt;</div><div class='hunk'>@@ -156,9 +156,8 @@</div><div class='ctx'>      	&lt;title&gt;Basic board driver&lt;/title&gt;</div><div class='ctx'> 	&lt;para&gt;</div><div class='ctx'> 		For most boards it will be sufficient to provide just the</div><div class='del'>-		basic functions and fill out some really board dependend</div><div class='add'>+		basic functions and fill out some really board dependent</div><div class='ctx'> 		members in the nand chip description structure.</div><div class='del'>-		See drivers/mtd/nand/skeleton for reference.</div><div class='ctx'> 	&lt;/para&gt;</div><div class='ctx'> 	&lt;sect1&gt;</div><div class='ctx'> 		&lt;title&gt;Basic defines&lt;/title&gt;</div><div class='hunk'>@@ -189,9 +188,9 @@ static unsigned long baseaddr;</div><div class='ctx'> 	&lt;sect1&gt;</div><div class='ctx'> 		&lt;title&gt;Partition defines&lt;/title&gt;</div><div class='ctx'> 		&lt;para&gt;</div><div class='del'>-			If you want to divide your device into parititions, then</div><div class='del'>-			enable the configuration switch CONFIG_MTD_PARITIONS and define</div><div class='del'>-			a paritioning scheme suitable to your board.</div><div class='add'>+			If you want to divide your device into partitions, then</div><div class='add'>+			enable the configuration switch CONFIG_MTD_PARTITIONS and define</div><div class='add'>+			a partitioning scheme suitable to your board.</div><div class='ctx'> 		&lt;/para&gt;</div><div class='ctx'> 		&lt;programlisting&gt;</div><div class='ctx'> #define NUM_PARTITIONS 2</div><div class='hunk'>@@ -1295,7 +1294,9 @@ in this page&lt;/entry&gt;</div><div class='ctx'>      &lt;/para&gt;</div><div class='ctx'> !Idrivers/mtd/nand/nand_base.c</div><div class='ctx'> !Idrivers/mtd/nand/nand_bbt.c</div><div class='del'>-!Idrivers/mtd/nand/nand_ecc.c</div><div class='add'>+&lt;!-- No internal functions for kernel-doc:</div><div class='add'>+X!Idrivers/mtd/nand/nand_ecc.c</div><div class='add'>+--&gt;</div><div class='ctx'>   &lt;/chapter&gt;</div><div class='ctx'> </div><div class='ctx'>   &lt;chapter id="credits"&gt;</div><div class='head'>diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl<br/>index fdff984a5161..b629da33951d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/DocBook/videobook.tmpl?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/DocBook/videobook.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/DocBook/videobook.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/DocBook/videobook.tmpl</a></div><div class='hunk'>@@ -976,7 +976,7 @@ static int camera_close(struct video_device *dev)</div><div class='ctx'>   &lt;title&gt;Interrupt Handling&lt;/title&gt;</div><div class='ctx'>   &lt;para&gt;</div><div class='ctx'>         Our example handler is for an ISA bus device. If it was PCI you would be</div><div class='del'>-        able to share the interrupt and would have set SA_SHIRQ to indicate a </div><div class='add'>+        able to share the interrupt and would have set IRQF_SHARED to indicate a</div><div class='ctx'>         shared IRQ. We pass the device pointer as the interrupt routine argument. We</div><div class='ctx'>         don't need to since we only support one card but doing this will make it</div><div class='ctx'>         easier to upgrade the driver for multiple devices in the future.</div><div class='head'>diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt<br/>index bf1cf98d2a27..0256805b548f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/IPMI.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/IPMI.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/IPMI.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/IPMI.txt</a></div><div class='hunk'>@@ -10,7 +10,7 @@ standard for controlling intelligent devices that monitor a system.</div><div class='ctx'> It provides for dynamic discovery of sensors in the system and the</div><div class='ctx'> ability to monitor the sensors and be informed when the sensor's</div><div class='ctx'> values change or go outside certain boundaries.  It also has a</div><div class='del'>-standardized database for field-replacable units (FRUs) and a watchdog</div><div class='add'>+standardized database for field-replaceable units (FRUs) and a watchdog</div><div class='ctx'> timer.</div><div class='ctx'> </div><div class='ctx'> To use this, you need an interface to an IPMI controller in your</div><div class='hunk'>@@ -64,7 +64,7 @@ situation, you need to read the section below named 'The SI Driver' or</div><div class='ctx'> IPMI defines a standard watchdog timer.  You can enable this with the</div><div class='ctx'> 'IPMI Watchdog Timer' config option.  If you compile the driver into</div><div class='ctx'> the kernel, then via a kernel command-line option you can have the</div><div class='del'>-watchdog timer start as soon as it intitializes.  It also have a lot</div><div class='add'>+watchdog timer start as soon as it initializes.  It also have a lot</div><div class='ctx'> of other options, see the 'Watchdog' section below for more details.</div><div class='ctx'> Note that you can also have the watchdog continue to run if it is</div><div class='ctx'> closed (by default it is disabled on close).  Go into the 'Watchdog</div><div class='head'>diff --git a/Documentation/IRQ.txt b/Documentation/IRQ.txt<br/>new file mode 100644<br/>index 000000000000..1011e7175021<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/IRQ.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/IRQ.txt</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+What is an IRQ?</div><div class='add'>+</div><div class='add'>+An IRQ is an interrupt request from a device.</div><div class='add'>+Currently they can come in over a pin, or over a packet.</div><div class='add'>+Several devices may be connected to the same pin thus</div><div class='add'>+sharing an IRQ.</div><div class='add'>+</div><div class='add'>+An IRQ number is a kernel identifier used to talk about a hardware</div><div class='add'>+interrupt source.  Typically this is an index into the global irq_desc</div><div class='add'>+array, but except for what linux/interrupt.h implements the details</div><div class='add'>+are architecture specific.</div><div class='add'>+</div><div class='add'>+An IRQ number is an enumeration of the possible interrupt sources on a</div><div class='add'>+machine.  Typically what is enumerated is the number of input pins on</div><div class='add'>+all of the interrupt controller in the system.  In the case of ISA</div><div class='add'>+what is enumerated are the 16 input pins on the two i8259 interrupt</div><div class='add'>+controllers.</div><div class='add'>+</div><div class='add'>+Architectures can assign additional meaning to the IRQ numbers, and</div><div class='add'>+are encouraged to in the case  where there is any manual configuration</div><div class='add'>+of the hardware involved.  The ISA IRQs are a classic example of</div><div class='add'>+assigning this kind of additional meaning.</div><div class='head'>diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt<br/>index 49e27cc19385..1d50cf0c905e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/RCU/checklist.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/RCU/checklist.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/RCU/checklist.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/RCU/checklist.txt</a></div><div class='hunk'>@@ -144,9 +144,47 @@ over a rather long period of time, but improvements are always welcome!</div><div class='ctx'> 	whether the increased speed is worth it.</div><div class='ctx'> </div><div class='ctx'> 8.	Although synchronize_rcu() is a bit slower than is call_rcu(),</div><div class='del'>-	it usually results in simpler code.  So, unless update performance</div><div class='del'>-	is important or the updaters cannot block, synchronize_rcu()</div><div class='del'>-	should be used in preference to call_rcu().</div><div class='add'>+	it usually results in simpler code.  So, unless update</div><div class='add'>+	performance is critically important or the updaters cannot block,</div><div class='add'>+	synchronize_rcu() should be used in preference to call_rcu().</div><div class='add'>+</div><div class='add'>+	An especially important property of the synchronize_rcu()</div><div class='add'>+	primitive is that it automatically self-limits: if grace periods</div><div class='add'>+	are delayed for whatever reason, then the synchronize_rcu()</div><div class='add'>+	primitive will correspondingly delay updates.  In contrast,</div><div class='add'>+	code using call_rcu() should explicitly limit update rate in</div><div class='add'>+	cases where grace periods are delayed, as failing to do so can</div><div class='add'>+	result in excessive realtime latencies or even OOM conditions.</div><div class='add'>+</div><div class='add'>+	Ways of gaining this self-limiting property when using call_rcu()</div><div class='add'>+	include:</div><div class='add'>+</div><div class='add'>+	a.	Keeping a count of the number of data-structure elements</div><div class='add'>+		used by the RCU-protected data structure, including those</div><div class='add'>+		waiting for a grace period to elapse.  Enforce a limit</div><div class='add'>+		on this number, stalling updates as needed to allow</div><div class='add'>+		previously deferred frees to complete.</div><div class='add'>+</div><div class='add'>+		Alternatively, limit only the number awaiting deferred</div><div class='add'>+		free rather than the total number of elements.</div><div class='add'>+</div><div class='add'>+	b.	Limiting update rate.  For example, if updates occur only</div><div class='add'>+		once per hour, then no explicit rate limiting is required,</div><div class='add'>+		unless your system is already badly broken.  The dcache</div><div class='add'>+		subsystem takes this approach -- updates are guarded</div><div class='add'>+		by a global lock, limiting their rate.</div><div class='add'>+</div><div class='add'>+	c.	Trusted update -- if updates can only be done manually by</div><div class='add'>+		superuser or some other trusted user, then it might not</div><div class='add'>+		be necessary to automatically limit them.  The theory</div><div class='add'>+		here is that superuser already has lots of ways to crash</div><div class='add'>+		the machine.</div><div class='add'>+</div><div class='add'>+	d.	Use call_rcu_bh() rather than call_rcu(), in order to take</div><div class='add'>+		advantage of call_rcu_bh()'s faster grace periods.</div><div class='add'>+</div><div class='add'>+	e.	Periodically invoke synchronize_rcu(), permitting a limited</div><div class='add'>+		number of updates per grace period.</div><div class='ctx'> </div><div class='ctx'> 9.	All RCU list-traversal primitives, which include</div><div class='ctx'> 	list_for_each_rcu(), list_for_each_entry_rcu(),</div><div class='head'>diff --git a/Documentation/RCU/torture.txt b/Documentation/RCU/torture.txt<br/>index e4c38152f7f7..a4948591607d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/RCU/torture.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/RCU/torture.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/RCU/torture.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/RCU/torture.txt</a></div><div class='hunk'>@@ -7,7 +7,7 @@ The CONFIG_RCU_TORTURE_TEST config option is available for all RCU</div><div class='ctx'> implementations.  It creates an rcutorture kernel module that can</div><div class='ctx'> be loaded to run a torture test.  The test periodically outputs</div><div class='ctx'> status messages via printk(), which can be examined via the dmesg</div><div class='del'>-command (perhaps grepping for "rcutorture").  The test is started</div><div class='add'>+command (perhaps grepping for "torture").  The test is started</div><div class='ctx'> when the module is loaded, and stops when the module is unloaded.</div><div class='ctx'> </div><div class='ctx'> However, actually setting this config option to "y" results in the system</div><div class='hunk'>@@ -35,6 +35,19 @@ stat_interval	The number of seconds between output of torture</div><div class='ctx'> 		be printed -only- when the module is unloaded, and this</div><div class='ctx'> 		is the default.</div><div class='ctx'> </div><div class='add'>+shuffle_interval</div><div class='add'>+		The number of seconds to keep the test threads affinitied</div><div class='add'>+		to a particular subset of the CPUs.  Used in conjunction</div><div class='add'>+		with test_no_idle_hz.</div><div class='add'>+</div><div class='add'>+test_no_idle_hz	Whether or not to test the ability of RCU to operate in</div><div class='add'>+		a kernel that disables the scheduling-clock interrupt to</div><div class='add'>+		idle CPUs.  Boolean parameter, "1" to test, "0" otherwise.</div><div class='add'>+</div><div class='add'>+torture_type	The type of RCU to test: "rcu" for the rcu_read_lock()</div><div class='add'>+		API, "rcu_bh" for the rcu_read_lock_bh() API, and "srcu"</div><div class='add'>+		for the "srcu_read_lock()" API.</div><div class='add'>+</div><div class='ctx'> verbose		Enable debug printk()s.  Default is disabled.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -42,14 +55,14 @@ OUTPUT</div><div class='ctx'> </div><div class='ctx'> The statistics output is as follows:</div><div class='ctx'> </div><div class='del'>-	rcutorture: --- Start of test: nreaders=16 stat_interval=0 verbose=0</div><div class='del'>-	rcutorture: rtc: 0000000000000000 ver: 1916 tfle: 0 rta: 1916 rtaf: 0 rtf: 1915</div><div class='del'>-	rcutorture: Reader Pipe:  1466408 9747 0 0 0 0 0 0 0 0 0</div><div class='del'>-	rcutorture: Reader Batch:  1464477 11678 0 0 0 0 0 0 0 0</div><div class='del'>-	rcutorture: Free-Block Circulation:  1915 1915 1915 1915 1915 1915 1915 1915 1915 1915 0</div><div class='del'>-	rcutorture: --- End of test</div><div class='add'>+	rcu-torture: --- Start of test: nreaders=16 stat_interval=0 verbose=0</div><div class='add'>+	rcu-torture: rtc: 0000000000000000 ver: 1916 tfle: 0 rta: 1916 rtaf: 0 rtf: 1915</div><div class='add'>+	rcu-torture: Reader Pipe:  1466408 9747 0 0 0 0 0 0 0 0 0</div><div class='add'>+	rcu-torture: Reader Batch:  1464477 11678 0 0 0 0 0 0 0 0</div><div class='add'>+	rcu-torture: Free-Block Circulation:  1915 1915 1915 1915 1915 1915 1915 1915 1915 1915 0</div><div class='add'>+	rcu-torture: --- End of test</div><div class='ctx'> </div><div class='del'>-The command "dmesg | grep rcutorture:" will extract this information on</div><div class='add'>+The command "dmesg | grep torture:" will extract this information on</div><div class='ctx'> most systems.  On more esoteric configurations, it may be necessary to</div><div class='ctx'> use other commands to access the output of the printk()s used by</div><div class='ctx'> the RCU torture test.  The printk()s use KERN_ALERT, so they should</div><div class='hunk'>@@ -115,8 +128,9 @@ The following script may be used to torture RCU:</div><div class='ctx'> 	modprobe rcutorture</div><div class='ctx'> 	sleep 100</div><div class='ctx'> 	rmmod rcutorture</div><div class='del'>-	dmesg | grep rcutorture:</div><div class='add'>+	dmesg | grep torture:</div><div class='ctx'> </div><div class='ctx'> The output can be manually inspected for the error flag of "!!!".</div><div class='ctx'> One could of course create a more elaborate script that automatically</div><div class='del'>-checked for such errors.</div><div class='add'>+checked for such errors.  The "rmmod" command forces a "SUCCESS" or</div><div class='add'>+"FAILURE" indication to be printk()ed.</div><div class='head'>diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt<br/>index 07cb93b82ba9..318df44259b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/RCU/whatisRCU.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/RCU/whatisRCU.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/RCU/whatisRCU.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/RCU/whatisRCU.txt</a></div><div class='hunk'>@@ -184,7 +184,17 @@ synchronize_rcu()</div><div class='ctx'> 	blocking, it registers a function and argument which are invoked</div><div class='ctx'> 	after all ongoing RCU read-side critical sections have completed.</div><div class='ctx'> 	This callback variant is particularly useful in situations where</div><div class='del'>-	it is illegal to block.</div><div class='add'>+	it is illegal to block or where update-side performance is</div><div class='add'>+	critically important.</div><div class='add'>+</div><div class='add'>+	However, the call_rcu() API should not be used lightly, as use</div><div class='add'>+	of the synchronize_rcu() API generally results in simpler code.</div><div class='add'>+	In addition, the synchronize_rcu() API has the nice property</div><div class='add'>+	of automatically limiting update rate should grace periods</div><div class='add'>+	be delayed.  This property results in system resilience in face</div><div class='add'>+	of denial-of-service attacks.  Code using call_rcu() should limit</div><div class='add'>+	update rate in order to gain this same sort of resilience.  See</div><div class='add'>+	checklist.txt for some approaches to limiting the update rate.</div><div class='ctx'> </div><div class='ctx'> rcu_assign_pointer()</div><div class='ctx'> </div><div class='hunk'>@@ -677,8 +687,9 @@ diff shows how closely related RCU and reader-writer locking can be.</div><div class='ctx'> 	+	spin_lock(&amp;listmutex);</div><div class='ctx'> 		list_for_each_entry(p, head, lp) {</div><div class='ctx'> 			if (p-&gt;key == key) {</div><div class='del'>-				list_del(&amp;p-&gt;list);</div><div class='add'>+	-			list_del(&amp;p-&gt;list);</div><div class='ctx'> 	-			write_unlock(&amp;listmutex);</div><div class='add'>+	+			list_del_rcu(&amp;p-&gt;list);</div><div class='ctx'> 	+			spin_unlock(&amp;listmutex);</div><div class='ctx'> 	+			synchronize_rcu();</div><div class='ctx'> 				kfree(p);</div><div class='hunk'>@@ -726,7 +737,7 @@ Or, for those who prefer a side-by-side listing:</div><div class='ctx'>  5   write_lock(&amp;listmutex);            5   spin_lock(&amp;listmutex);</div><div class='ctx'>  6   list_for_each_entry(p, head, lp) { 6   list_for_each_entry(p, head, lp) {</div><div class='ctx'>  7     if (p-&gt;key == key) {             7     if (p-&gt;key == key) {</div><div class='del'>- 8       list_del(&amp;p-&gt;list);            8       list_del(&amp;p-&gt;list);</div><div class='add'>+ 8       list_del(&amp;p-&gt;list);            8       list_del_rcu(&amp;p-&gt;list);</div><div class='ctx'>  9       write_unlock(&amp;listmutex);      9       spin_unlock(&amp;listmutex);</div><div class='ctx'>                                        10       synchronize_rcu();</div><div class='ctx'> 10       kfree(p);                     11       kfree(p);</div><div class='hunk'>@@ -790,7 +801,6 @@ RCU pointer update:</div><div class='ctx'> </div><div class='ctx'> RCU grace period:</div><div class='ctx'> </div><div class='del'>-	synchronize_kernel (deprecated)</div><div class='ctx'> 	synchronize_net</div><div class='ctx'> 	synchronize_sched</div><div class='ctx'> 	synchronize_rcu</div><div class='head'>diff --git a/Documentation/README.DAC960 b/Documentation/README.DAC960<br/>index 98ea617a0dd6..0e8f618ab534 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/README.DAC960?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/README.DAC960</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/README.DAC960?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/README.DAC960</a></div><div class='hunk'>@@ -78,9 +78,9 @@ also known as "System Drives", and Drive Groups are also called "Packs".  Both</div><div class='ctx'> terms are in use in the Mylex documentation; I have chosen to standardize on</div><div class='ctx'> the more generic "Logical Drive" and "Drive Group".</div><div class='ctx'> </div><div class='del'>-DAC960 RAID disk devices are named in the style of the Device File System</div><div class='del'>-(DEVFS).  The device corresponding to Logical Drive D on Controller C is</div><div class='del'>-referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1</div><div class='add'>+DAC960 RAID disk devices are named in the style of the obsolete Device File</div><div class='add'>+System (DEVFS).  The device corresponding to Logical Drive D on Controller C</div><div class='add'>+is referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1</div><div class='ctx'> through /dev/rd/cCdDp7.  For example, partition 3 of Logical Drive 5 on</div><div class='ctx'> Controller 2 is referred to as /dev/rd/c2d5p3.  Note that unlike with SCSI</div><div class='ctx'> disks the device names will not change in the event of a disk drive failure.</div><div class='head'>diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist<br/>new file mode 100644<br/>index 000000000000..a10bfb6ecd9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/SubmitChecklist?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/SubmitChecklist</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+Linux Kernel patch sumbittal checklist</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Here are some basic things that developers should do if they want to see their</div><div class='add'>+kernel patch submissions accepted more quickly.</div><div class='add'>+</div><div class='add'>+These are all above and beyond the documentation that is provided in</div><div class='add'>+Documentation/SubmittingPatches and elsewhere regarding submitting Linux</div><div class='add'>+kernel patches.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+1: Builds cleanly with applicable or modified CONFIG options =y, =m, and</div><div class='add'>+   =n.  No gcc warnings/errors, no linker warnings/errors.</div><div class='add'>+</div><div class='add'>+2: Passes allnoconfig, allmodconfig</div><div class='add'>+</div><div class='add'>+3: Builds on multiple CPU architectures by using local cross-compile tools</div><div class='add'>+   or something like PLM at OSDL.</div><div class='add'>+</div><div class='add'>+4: ppc64 is a good architecture for cross-compilation checking because it</div><div class='add'>+   tends to use `unsigned long' for 64-bit quantities.</div><div class='add'>+</div><div class='add'>+5: Matches kernel coding style(!)</div><div class='add'>+</div><div class='add'>+6: Any new or modified CONFIG options don't muck up the config menu.</div><div class='add'>+</div><div class='add'>+7: All new Kconfig options have help text.</div><div class='add'>+</div><div class='add'>+8: Has been carefully reviewed with respect to relevant Kconfig</div><div class='add'>+   combinations.  This is very hard to get right with testing -- brainpower</div><div class='add'>+   pays off here.</div><div class='add'>+</div><div class='add'>+9: Check cleanly with sparse.</div><div class='add'>+</div><div class='add'>+10: Use 'make checkstack' and 'make namespacecheck' and fix any problems</div><div class='add'>+    that they find.  Note: checkstack does not point out problems explicitly,</div><div class='add'>+    but any one function that uses more than 512 bytes on the stack is a</div><div class='add'>+    candidate for change.</div><div class='add'>+</div><div class='add'>+11: Include kernel-doc to document global kernel APIs.  (Not required for</div><div class='add'>+    static functions, but OK there also.) Use 'make htmldocs' or 'make</div><div class='add'>+    mandocs' to check the kernel-doc and fix any issues.</div><div class='add'>+</div><div class='add'>+12: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,</div><div class='add'>+    CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,</div><div class='add'>+    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_SPINLOCK_SLEEP all simultaneously</div><div class='add'>+    enabled.</div><div class='add'>+</div><div class='add'>+13: Has been build- and runtime tested with and without CONFIG_SMP and</div><div class='add'>+    CONFIG_PREEMPT.</div><div class='add'>+</div><div class='add'>+14: If the patch affects IO/Disk, etc: has been tested with and without</div><div class='add'>+    CONFIG_LBD.</div><div class='add'>+</div><div class='add'>+15: All codepaths have been exercised with all lockdep features enabled.</div><div class='add'>+</div><div class='add'>+16: All new /proc entries are documented under Documentation/</div><div class='add'>+</div><div class='add'>+17: All new kernel boot parameters are documented in</div><div class='add'>+    Documentation/kernel-parameters.txt.</div><div class='add'>+</div><div class='add'>+18: All new module parameters are documented with MODULE_PARM_DESC()</div><div class='head'>diff --git a/Documentation/accounting/delay-accounting.txt b/Documentation/accounting/delay-accounting.txt<br/>new file mode 100644<br/>index 000000000000..be215e58423b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/accounting/delay-accounting.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/accounting/delay-accounting.txt</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+Delay accounting</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+Tasks encounter delays in execution when they wait</div><div class='add'>+for some kernel resource to become available e.g. a</div><div class='add'>+runnable task may wait for a free CPU to run on.</div><div class='add'>+</div><div class='add'>+The per-task delay accounting functionality measures</div><div class='add'>+the delays experienced by a task while</div><div class='add'>+</div><div class='add'>+a) waiting for a CPU (while being runnable)</div><div class='add'>+b) completion of synchronous block I/O initiated by the task</div><div class='add'>+c) swapping in pages</div><div class='add'>+</div><div class='add'>+and makes these statistics available to userspace through</div><div class='add'>+the taskstats interface.</div><div class='add'>+</div><div class='add'>+Such delays provide feedback for setting a task's cpu priority,</div><div class='add'>+io priority and rss limit values appropriately. Long delays for</div><div class='add'>+important tasks could be a trigger for raising its corresponding priority.</div><div class='add'>+</div><div class='add'>+The functionality, through its use of the taskstats interface, also provides</div><div class='add'>+delay statistics aggregated for all tasks (or threads) belonging to a</div><div class='add'>+thread group (corresponding to a traditional Unix process). This is a commonly</div><div class='add'>+needed aggregation that is more efficiently done by the kernel.</div><div class='add'>+</div><div class='add'>+Userspace utilities, particularly resource management applications, can also</div><div class='add'>+aggregate delay statistics into arbitrary groups. To enable this, delay</div><div class='add'>+statistics of a task are available both during its lifetime as well as on its</div><div class='add'>+exit, ensuring continuous and complete monitoring can be done.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Interface</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+Delay accounting uses the taskstats interface which is described</div><div class='add'>+in detail in a separate document in this directory. Taskstats returns a</div><div class='add'>+generic data structure to userspace corresponding to per-pid and per-tgid</div><div class='add'>+statistics. The delay accounting functionality populates specific fields of</div><div class='add'>+this structure. See</div><div class='add'>+     include/linux/taskstats.h</div><div class='add'>+for a description of the fields pertaining to delay accounting.</div><div class='add'>+It will generally be in the form of counters returning the cumulative</div><div class='add'>+delay seen for cpu, sync block I/O, swapin etc.</div><div class='add'>+</div><div class='add'>+Taking the difference of two successive readings of a given</div><div class='add'>+counter (say cpu_delay_total) for a task will give the delay</div><div class='add'>+experienced by the task waiting for the corresponding resource</div><div class='add'>+in that interval.</div><div class='add'>+</div><div class='add'>+When a task exits, records containing the per-task statistics</div><div class='add'>+are sent to userspace without requiring a command. If it is the last exiting</div><div class='add'>+task of a thread group, the per-tgid statistics are also sent. More details</div><div class='add'>+are given in the taskstats interface description.</div><div class='add'>+</div><div class='add'>+The getdelays.c userspace utility in this directory allows simple commands to</div><div class='add'>+be run and the corresponding delay statistics to be displayed. It also serves</div><div class='add'>+as an example of using the taskstats interface.</div><div class='add'>+</div><div class='add'>+Usage</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+Compile the kernel with</div><div class='add'>+	CONFIG_TASK_DELAY_ACCT=y</div><div class='add'>+	CONFIG_TASKSTATS=y</div><div class='add'>+</div><div class='add'>+Enable the accounting at boot time by adding</div><div class='add'>+the following to the kernel boot options</div><div class='add'>+	delayacct</div><div class='add'>+</div><div class='add'>+and after the system has booted up, use a utility</div><div class='add'>+similar to  getdelays.c to access the delays</div><div class='add'>+seen by a given task or a task group (tgid).</div><div class='add'>+The utility also allows a given command to be</div><div class='add'>+executed and the corresponding delays to be</div><div class='add'>+seen.</div><div class='add'>+</div><div class='add'>+General format of the getdelays command</div><div class='add'>+</div><div class='add'>+getdelays [-t tgid] [-p pid] [-c cmd...]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Get delays, since system boot, for pid 10</div><div class='add'>+# ./getdelays -p 10</div><div class='add'>+(output similar to next case)</div><div class='add'>+</div><div class='add'>+Get sum of delays, since system boot, for all pids with tgid 5</div><div class='add'>+# ./getdelays -t 5</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+CPU	count	real total	virtual total	delay total</div><div class='add'>+	7876	92005750	100000000	24001500</div><div class='add'>+IO	count	delay total</div><div class='add'>+	0	0</div><div class='add'>+MEM	count	delay total</div><div class='add'>+	0	0</div><div class='add'>+</div><div class='add'>+Get delays seen in executing a given simple command</div><div class='add'>+# ./getdelays -c ls /</div><div class='add'>+</div><div class='add'>+bin   data1  data3  data5  dev  home  media  opt   root  srv        sys  usr</div><div class='add'>+boot  data2  data4  data6  etc  lib   mnt    proc  sbin  subdomain  tmp  var</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+CPU	count	real total	virtual total	delay total</div><div class='add'>+	6	4000250		4000000		0</div><div class='add'>+IO	count	delay total</div><div class='add'>+	0	0</div><div class='add'>+MEM	count	delay total</div><div class='add'>+	0	0</div><div class='head'>diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c<br/>new file mode 100644<br/>index 000000000000..795ca3911cc5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/accounting/getdelays.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/accounting/getdelays.c</a></div><div class='hunk'>@@ -0,0 +1,396 @@</div><div class='add'>+/* getdelays.c</div><div class='add'>+ *</div><div class='add'>+ * Utility to get per-pid and per-tgid delay accounting statistics</div><div class='add'>+ * Also illustrates usage of the taskstats interface</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) Shailabh Nagar, IBM Corp. 2005</div><div class='add'>+ * Copyright (C) Balbir Singh, IBM Corp. 2006</div><div class='add'>+ * Copyright (c) Jay Lan, SGI. 2006</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;poll.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/genetlink.h&gt;</div><div class='add'>+#include &lt;linux/taskstats.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic macros for dealing with netlink sockets. Might be duplicated</div><div class='add'>+ * elsewhere. It is recommended that commercial grade applications use</div><div class='add'>+ * libnl or libnetlink and use the interfaces provided by the library</div><div class='add'>+ */</div><div class='add'>+#define GENLMSG_DATA(glh)	((void *)(NLMSG_DATA(glh) + GENL_HDRLEN))</div><div class='add'>+#define GENLMSG_PAYLOAD(glh)	(NLMSG_PAYLOAD(glh, 0) - GENL_HDRLEN)</div><div class='add'>+#define NLA_DATA(na)		((void *)((char*)(na) + NLA_HDRLEN))</div><div class='add'>+#define NLA_PAYLOAD(len)	(len - NLA_HDRLEN)</div><div class='add'>+</div><div class='add'>+#define err(code, fmt, arg...) do { printf(fmt, ##arg); exit(code); } while (0)</div><div class='add'>+int done = 0;</div><div class='add'>+int rcvbufsz=0;</div><div class='add'>+</div><div class='add'>+    char name[100];</div><div class='add'>+int dbg=0, print_delays=0;</div><div class='add'>+__u64 stime, utime;</div><div class='add'>+#define PRINTF(fmt, arg...) {			\</div><div class='add'>+	    if (dbg) {				\</div><div class='add'>+		printf(fmt, ##arg);		\</div><div class='add'>+	    }					\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/* Maximum size of response requested or message sent */</div><div class='add'>+#define MAX_MSG_SIZE	256</div><div class='add'>+/* Maximum number of cpus expected to be specified in a cpumask */</div><div class='add'>+#define MAX_CPUS	32</div><div class='add'>+/* Maximum length of pathname to log file */</div><div class='add'>+#define MAX_FILENAME	256</div><div class='add'>+</div><div class='add'>+struct msgtemplate {</div><div class='add'>+	struct nlmsghdr n;</div><div class='add'>+	struct genlmsghdr g;</div><div class='add'>+	char buf[MAX_MSG_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+char cpumask[100+6*MAX_CPUS];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a raw netlink socket and bind</div><div class='add'>+ */</div><div class='add'>+static int create_nl_socket(int protocol)</div><div class='add'>+{</div><div class='add'>+	int fd;</div><div class='add'>+	struct sockaddr_nl local;</div><div class='add'>+</div><div class='add'>+	fd = socket(AF_NETLINK, SOCK_RAW, protocol);</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (rcvbufsz)</div><div class='add'>+		if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,</div><div class='add'>+				&amp;rcvbufsz, sizeof(rcvbufsz)) &lt; 0) {</div><div class='add'>+			printf("Unable to set socket rcv buf size to %d\n",</div><div class='add'>+			       rcvbufsz);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	memset(&amp;local, 0, sizeof(local));</div><div class='add'>+	local.nl_family = AF_NETLINK;</div><div class='add'>+</div><div class='add'>+	if (bind(fd, (struct sockaddr *) &amp;local, sizeof(local)) &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+error:</div><div class='add'>+	close(fd);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,</div><div class='add'>+	     __u8 genl_cmd, __u16 nla_type,</div><div class='add'>+	     void *nla_data, int nla_len)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *na;</div><div class='add'>+	struct sockaddr_nl nladdr;</div><div class='add'>+	int r, buflen;</div><div class='add'>+	char *buf;</div><div class='add'>+</div><div class='add'>+	struct msgtemplate msg;</div><div class='add'>+</div><div class='add'>+	msg.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN);</div><div class='add'>+	msg.n.nlmsg_type = nlmsg_type;</div><div class='add'>+	msg.n.nlmsg_flags = NLM_F_REQUEST;</div><div class='add'>+	msg.n.nlmsg_seq = 0;</div><div class='add'>+	msg.n.nlmsg_pid = nlmsg_pid;</div><div class='add'>+	msg.g.cmd = genl_cmd;</div><div class='add'>+	msg.g.version = 0x1;</div><div class='add'>+	na = (struct nlattr *) GENLMSG_DATA(&amp;msg);</div><div class='add'>+	na-&gt;nla_type = nla_type;</div><div class='add'>+	na-&gt;nla_len = nla_len + 1 + NLA_HDRLEN;</div><div class='add'>+	memcpy(NLA_DATA(na), nla_data, nla_len);</div><div class='add'>+	msg.n.nlmsg_len += NLMSG_ALIGN(na-&gt;nla_len);</div><div class='add'>+</div><div class='add'>+	buf = (char *) &amp;msg;</div><div class='add'>+	buflen = msg.n.nlmsg_len ;</div><div class='add'>+	memset(&amp;nladdr, 0, sizeof(nladdr));</div><div class='add'>+	nladdr.nl_family = AF_NETLINK;</div><div class='add'>+	while ((r = sendto(sd, buf, buflen, 0, (struct sockaddr *) &amp;nladdr,</div><div class='add'>+			   sizeof(nladdr))) &lt; buflen) {</div><div class='add'>+		if (r &gt; 0) {</div><div class='add'>+			buf += r;</div><div class='add'>+			buflen -= r;</div><div class='add'>+		} else if (errno != EAGAIN)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Probe the controller in genetlink to find the family id</div><div class='add'>+ * for the TASKSTATS family</div><div class='add'>+ */</div><div class='add'>+int get_family_id(int sd)</div><div class='add'>+{</div><div class='add'>+	struct {</div><div class='add'>+		struct nlmsghdr n;</div><div class='add'>+		struct genlmsghdr g;</div><div class='add'>+		char buf[256];</div><div class='add'>+	} ans;</div><div class='add'>+</div><div class='add'>+	int id, rc;</div><div class='add'>+	struct nlattr *na;</div><div class='add'>+	int rep_len;</div><div class='add'>+</div><div class='add'>+	strcpy(name, TASKSTATS_GENL_NAME);</div><div class='add'>+	rc = send_cmd(sd, GENL_ID_CTRL, getpid(), CTRL_CMD_GETFAMILY,</div><div class='add'>+			CTRL_ATTR_FAMILY_NAME, (void *)name,</div><div class='add'>+			strlen(TASKSTATS_GENL_NAME)+1);</div><div class='add'>+</div><div class='add'>+	rep_len = recv(sd, &amp;ans, sizeof(ans), 0);</div><div class='add'>+	if (ans.n.nlmsg_type == NLMSG_ERROR ||</div><div class='add'>+	    (rep_len &lt; 0) || !NLMSG_OK((&amp;ans.n), rep_len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	na = (struct nlattr *) GENLMSG_DATA(&amp;ans);</div><div class='add'>+	na = (struct nlattr *) ((char *) na + NLA_ALIGN(na-&gt;nla_len));</div><div class='add'>+	if (na-&gt;nla_type == CTRL_ATTR_FAMILY_ID) {</div><div class='add'>+		id = *(__u16 *) NLA_DATA(na);</div><div class='add'>+	}</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void print_delayacct(struct taskstats *t)</div><div class='add'>+{</div><div class='add'>+	printf("\n\nCPU   %15s%15s%15s%15s\n"</div><div class='add'>+	       "      %15llu%15llu%15llu%15llu\n"</div><div class='add'>+	       "IO    %15s%15s\n"</div><div class='add'>+	       "      %15llu%15llu\n"</div><div class='add'>+	       "MEM   %15s%15s\n"</div><div class='add'>+	       "      %15llu%15llu\n\n",</div><div class='add'>+	       "count", "real total", "virtual total", "delay total",</div><div class='add'>+	       t-&gt;cpu_count, t-&gt;cpu_run_real_total, t-&gt;cpu_run_virtual_total,</div><div class='add'>+	       t-&gt;cpu_delay_total,</div><div class='add'>+	       "count", "delay total",</div><div class='add'>+	       t-&gt;blkio_count, t-&gt;blkio_delay_total,</div><div class='add'>+	       "count", "delay total", t-&gt;swapin_count, t-&gt;swapin_delay_total);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+	int c, rc, rep_len, aggr_len, len2, cmd_type;</div><div class='add'>+	__u16 id;</div><div class='add'>+	__u32 mypid;</div><div class='add'>+</div><div class='add'>+	struct nlattr *na;</div><div class='add'>+	int nl_sd = -1;</div><div class='add'>+	int len = 0;</div><div class='add'>+	pid_t tid = 0;</div><div class='add'>+	pid_t rtid = 0;</div><div class='add'>+</div><div class='add'>+	int fd = 0;</div><div class='add'>+	int count = 0;</div><div class='add'>+	int write_file = 0;</div><div class='add'>+	int maskset = 0;</div><div class='add'>+	char logfile[128];</div><div class='add'>+	int loop = 0;</div><div class='add'>+</div><div class='add'>+	struct msgtemplate msg;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		c = getopt(argc, argv, "dw:r:m:t:p:v:l");</div><div class='add'>+		if (c &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		switch (c) {</div><div class='add'>+		case 'd':</div><div class='add'>+			printf("print delayacct stats ON\n");</div><div class='add'>+			print_delays = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'w':</div><div class='add'>+			strncpy(logfile, optarg, MAX_FILENAME);</div><div class='add'>+			printf("write to file %s\n", logfile);</div><div class='add'>+			write_file = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'r':</div><div class='add'>+			rcvbufsz = atoi(optarg);</div><div class='add'>+			printf("receive buf size %d\n", rcvbufsz);</div><div class='add'>+			if (rcvbufsz &lt; 0)</div><div class='add'>+				err(1, "Invalid rcv buf size\n");</div><div class='add'>+			break;</div><div class='add'>+		case 'm':</div><div class='add'>+			strncpy(cpumask, optarg, sizeof(cpumask));</div><div class='add'>+			maskset = 1;</div><div class='add'>+			printf("cpumask %s maskset %d\n", cpumask, maskset);</div><div class='add'>+			break;</div><div class='add'>+		case 't':</div><div class='add'>+			tid = atoi(optarg);</div><div class='add'>+			if (!tid)</div><div class='add'>+				err(1, "Invalid tgid\n");</div><div class='add'>+			cmd_type = TASKSTATS_CMD_ATTR_TGID;</div><div class='add'>+			print_delays = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'p':</div><div class='add'>+			tid = atoi(optarg);</div><div class='add'>+			if (!tid)</div><div class='add'>+				err(1, "Invalid pid\n");</div><div class='add'>+			cmd_type = TASKSTATS_CMD_ATTR_PID;</div><div class='add'>+			print_delays = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'v':</div><div class='add'>+			printf("debug on\n");</div><div class='add'>+			dbg = 1;</div><div class='add'>+			break;</div><div class='add'>+		case 'l':</div><div class='add'>+			printf("listen forever\n");</div><div class='add'>+			loop = 1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printf("Unknown option %d\n", c);</div><div class='add'>+			exit(-1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (write_file) {</div><div class='add'>+		fd = open(logfile, O_WRONLY | O_CREAT | O_TRUNC,</div><div class='add'>+			  S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);</div><div class='add'>+		if (fd == -1) {</div><div class='add'>+			perror("Cannot open output file\n");</div><div class='add'>+			exit(1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((nl_sd = create_nl_socket(NETLINK_GENERIC)) &lt; 0)</div><div class='add'>+		err(1, "error creating Netlink socket\n");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	mypid = getpid();</div><div class='add'>+	id = get_family_id(nl_sd);</div><div class='add'>+	if (!id) {</div><div class='add'>+		printf("Error getting family id, errno %d", errno);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	PRINTF("family id %d\n", id);</div><div class='add'>+</div><div class='add'>+	if (maskset) {</div><div class='add'>+		rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,</div><div class='add'>+			      TASKSTATS_CMD_ATTR_REGISTER_CPUMASK,</div><div class='add'>+			      &amp;cpumask, sizeof(cpumask));</div><div class='add'>+		PRINTF("Sent register cpumask, retval %d\n", rc);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			printf("error sending register cpumask\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tid) {</div><div class='add'>+		rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,</div><div class='add'>+			      cmd_type, &amp;tid, sizeof(__u32));</div><div class='add'>+		PRINTF("Sent pid/tgid, retval %d\n", rc);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			printf("error sending tid/tgid cmd\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		rep_len = recv(nl_sd, &amp;msg, sizeof(msg), 0);</div><div class='add'>+		PRINTF("received %d bytes\n", rep_len);</div><div class='add'>+</div><div class='add'>+		if (rep_len &lt; 0) {</div><div class='add'>+			printf("nonfatal reply error: errno %d\n", errno);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (msg.n.nlmsg_type == NLMSG_ERROR ||</div><div class='add'>+		    !NLMSG_OK((&amp;msg.n), rep_len)) {</div><div class='add'>+			printf("fatal reply error,  errno %d\n", errno);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		PRINTF("nlmsghdr size=%d, nlmsg_len=%d, rep_len=%d\n",</div><div class='add'>+		       sizeof(struct nlmsghdr), msg.n.nlmsg_len, rep_len);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		rep_len = GENLMSG_PAYLOAD(&amp;msg.n);</div><div class='add'>+</div><div class='add'>+		na = (struct nlattr *) GENLMSG_DATA(&amp;msg);</div><div class='add'>+		len = 0;</div><div class='add'>+		i = 0;</div><div class='add'>+		while (len &lt; rep_len) {</div><div class='add'>+			len += NLA_ALIGN(na-&gt;nla_len);</div><div class='add'>+			switch (na-&gt;nla_type) {</div><div class='add'>+			case TASKSTATS_TYPE_AGGR_TGID:</div><div class='add'>+				/* Fall through */</div><div class='add'>+			case TASKSTATS_TYPE_AGGR_PID:</div><div class='add'>+				aggr_len = NLA_PAYLOAD(na-&gt;nla_len);</div><div class='add'>+				len2 = 0;</div><div class='add'>+				/* For nested attributes, na follows */</div><div class='add'>+				na = (struct nlattr *) NLA_DATA(na);</div><div class='add'>+				done = 0;</div><div class='add'>+				while (len2 &lt; aggr_len) {</div><div class='add'>+					switch (na-&gt;nla_type) {</div><div class='add'>+					case TASKSTATS_TYPE_PID:</div><div class='add'>+						rtid = *(int *) NLA_DATA(na);</div><div class='add'>+						if (print_delays)</div><div class='add'>+							printf("PID\t%d\n", rtid);</div><div class='add'>+						break;</div><div class='add'>+					case TASKSTATS_TYPE_TGID:</div><div class='add'>+						rtid = *(int *) NLA_DATA(na);</div><div class='add'>+						if (print_delays)</div><div class='add'>+							printf("TGID\t%d\n", rtid);</div><div class='add'>+						break;</div><div class='add'>+					case TASKSTATS_TYPE_STATS:</div><div class='add'>+						count++;</div><div class='add'>+						if (print_delays)</div><div class='add'>+							print_delayacct((struct taskstats *) NLA_DATA(na));</div><div class='add'>+						if (fd) {</div><div class='add'>+							if (write(fd, NLA_DATA(na), na-&gt;nla_len) &lt; 0) {</div><div class='add'>+								err(1,"write error\n");</div><div class='add'>+							}</div><div class='add'>+						}</div><div class='add'>+						if (!loop)</div><div class='add'>+							goto done;</div><div class='add'>+						break;</div><div class='add'>+					default:</div><div class='add'>+						printf("Unknown nested nla_type %d\n", na-&gt;nla_type);</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+					len2 += NLA_ALIGN(na-&gt;nla_len);</div><div class='add'>+					na = (struct nlattr *) ((char *) na + len2);</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			default:</div><div class='add'>+				printf("Unknown nla_type %d\n", na-&gt;nla_type);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			na = (struct nlattr *) (GENLMSG_DATA(&amp;msg) + len);</div><div class='add'>+		}</div><div class='add'>+	} while (loop);</div><div class='add'>+done:</div><div class='add'>+	if (maskset) {</div><div class='add'>+		rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,</div><div class='add'>+			      TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK,</div><div class='add'>+			      &amp;cpumask, sizeof(cpumask));</div><div class='add'>+		printf("Sent deregister mask, retval %d\n", rc);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			err(rc, "error sending deregister cpumask\n");</div><div class='add'>+	}</div><div class='add'>+err:</div><div class='add'>+	close(nl_sd);</div><div class='add'>+	if (fd)</div><div class='add'>+		close(fd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/accounting/taskstats.txt b/Documentation/accounting/taskstats.txt<br/>new file mode 100644<br/>index 000000000000..92ebf29e9041<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/accounting/taskstats.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/accounting/taskstats.txt</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+Per-task statistics interface</div><div class='add'>+-----------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Taskstats is a netlink-based interface for sending per-task and</div><div class='add'>+per-process statistics from the kernel to userspace.</div><div class='add'>+</div><div class='add'>+Taskstats was designed for the following benefits:</div><div class='add'>+</div><div class='add'>+- efficiently provide statistics during lifetime of a task and on its exit</div><div class='add'>+- unified interface for multiple accounting subsystems</div><div class='add'>+- extensibility for use by future accounting patches</div><div class='add'>+</div><div class='add'>+Terminology</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+"pid", "tid" and "task" are used interchangeably and refer to the standard</div><div class='add'>+Linux task defined by struct task_struct.  per-pid stats are the same as</div><div class='add'>+per-task stats.</div><div class='add'>+</div><div class='add'>+"tgid", "process" and "thread group" are used interchangeably and refer to the</div><div class='add'>+tasks that share an mm_struct i.e. the traditional Unix process. Despite the</div><div class='add'>+use of tgid, there is no special treatment for the task that is thread group</div><div class='add'>+leader - a process is deemed alive as long as it has any task belonging to it.</div><div class='add'>+</div><div class='add'>+Usage</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+To get statistics during a task's lifetime, userspace opens a unicast netlink</div><div class='add'>+socket (NETLINK_GENERIC family) and sends commands specifying a pid or a tgid.</div><div class='add'>+The response contains statistics for a task (if pid is specified) or the sum of</div><div class='add'>+statistics for all tasks of the process (if tgid is specified).</div><div class='add'>+</div><div class='add'>+To obtain statistics for tasks which are exiting, the userspace listener</div><div class='add'>+sends a register command and specifies a cpumask. Whenever a task exits on</div><div class='add'>+one of the cpus in the cpumask, its per-pid statistics are sent to the</div><div class='add'>+registered listener. Using cpumasks allows the data received by one listener</div><div class='add'>+to be limited and assists in flow control over the netlink interface and is</div><div class='add'>+explained in more detail below.</div><div class='add'>+</div><div class='add'>+If the exiting task is the last thread exiting its thread group,</div><div class='add'>+an additional record containing the per-tgid stats is also sent to userspace.</div><div class='add'>+The latter contains the sum of per-pid stats for all threads in the thread</div><div class='add'>+group, both past and present.</div><div class='add'>+</div><div class='add'>+getdelays.c is a simple utility demonstrating usage of the taskstats interface</div><div class='add'>+for reporting delay accounting statistics. Users can register cpumasks,</div><div class='add'>+send commands and process responses, listen for per-tid/tgid exit data,</div><div class='add'>+write the data received to a file and do basic flow control by increasing</div><div class='add'>+receive buffer sizes.</div><div class='add'>+</div><div class='add'>+Interface</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+The user-kernel interface is encapsulated in include/linux/taskstats.h</div><div class='add'>+</div><div class='add'>+To avoid this documentation becoming obsolete as the interface evolves, only</div><div class='add'>+an outline of the current version is given. taskstats.h always overrides the</div><div class='add'>+description here.</div><div class='add'>+</div><div class='add'>+struct taskstats is the common accounting structure for both per-pid and</div><div class='add'>+per-tgid data. It is versioned and can be extended by each accounting subsystem</div><div class='add'>+that is added to the kernel. The fields and their semantics are defined in the</div><div class='add'>+taskstats.h file.</div><div class='add'>+</div><div class='add'>+The data exchanged between user and kernel space is a netlink message belonging</div><div class='add'>+to the NETLINK_GENERIC family and using the netlink attributes interface.</div><div class='add'>+The messages are in the format</div><div class='add'>+</div><div class='add'>+    +----------+- - -+-------------+-------------------+</div><div class='add'>+    | nlmsghdr | Pad |  genlmsghdr | taskstats payload |</div><div class='add'>+    +----------+- - -+-------------+-------------------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The taskstats payload is one of the following three kinds:</div><div class='add'>+</div><div class='add'>+1. Commands: Sent from user to kernel. Commands to get data on</div><div class='add'>+a pid/tgid consist of one attribute, of type TASKSTATS_CMD_ATTR_PID/TGID,</div><div class='add'>+containing a u32 pid or tgid in the attribute payload. The pid/tgid denotes</div><div class='add'>+the task/process for which userspace wants statistics.</div><div class='add'>+</div><div class='add'>+Commands to register/deregister interest in exit data from a set of cpus</div><div class='add'>+consist of one attribute, of type</div><div class='add'>+TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK and contain a cpumask in the</div><div class='add'>+attribute payload. The cpumask is specified as an ascii string of</div><div class='add'>+comma-separated cpu ranges e.g. to listen to exit data from cpus 1,2,3,5,7,8</div><div class='add'>+the cpumask would be "1-3,5,7-8". If userspace forgets to deregister interest</div><div class='add'>+in cpus before closing the listening socket, the kernel cleans up its interest</div><div class='add'>+set over time. However, for the sake of efficiency, an explicit deregistration</div><div class='add'>+is advisable.</div><div class='add'>+</div><div class='add'>+2. Response for a command: sent from the kernel in response to a userspace</div><div class='add'>+command. The payload is a series of three attributes of type:</div><div class='add'>+</div><div class='add'>+a) TASKSTATS_TYPE_AGGR_PID/TGID : attribute containing no payload but indicates</div><div class='add'>+a pid/tgid will be followed by some stats.</div><div class='add'>+</div><div class='add'>+b) TASKSTATS_TYPE_PID/TGID: attribute whose payload is the pid/tgid whose stats</div><div class='add'>+is being returned.</div><div class='add'>+</div><div class='add'>+c) TASKSTATS_TYPE_STATS: attribute with a struct taskstsats as payload. The</div><div class='add'>+same structure is used for both per-pid and per-tgid stats.</div><div class='add'>+</div><div class='add'>+3. New message sent by kernel whenever a task exits. The payload consists of a</div><div class='add'>+   series of attributes of the following type:</div><div class='add'>+</div><div class='add'>+a) TASKSTATS_TYPE_AGGR_PID: indicates next two attributes will be pid+stats</div><div class='add'>+b) TASKSTATS_TYPE_PID: contains exiting task's pid</div><div class='add'>+c) TASKSTATS_TYPE_STATS: contains the exiting task's per-pid stats</div><div class='add'>+d) TASKSTATS_TYPE_AGGR_TGID: indicates next two attributes will be tgid+stats</div><div class='add'>+e) TASKSTATS_TYPE_TGID: contains tgid of process to which task belongs</div><div class='add'>+f) TASKSTATS_TYPE_STATS: contains the per-tgid stats for exiting task's process</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+per-tgid stats</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Taskstats provides per-process stats, in addition to per-task stats, since</div><div class='add'>+resource management is often done at a process granularity and aggregating task</div><div class='add'>+stats in userspace alone is inefficient and potentially inaccurate (due to lack</div><div class='add'>+of atomicity).</div><div class='add'>+</div><div class='add'>+However, maintaining per-process, in addition to per-task stats, within the</div><div class='add'>+kernel has space and time overheads. To address this, the taskstats code</div><div class='add'>+accumalates each exiting task's statistics into a process-wide data structure.</div><div class='add'>+When the last task of a process exits, the process level data accumalated also</div><div class='add'>+gets sent to userspace (along with the per-task data).</div><div class='add'>+</div><div class='add'>+When a user queries to get per-tgid data, the sum of all other live threads in</div><div class='add'>+the group is added up and added to the accumalated total for previously exited</div><div class='add'>+threads of the same thread group.</div><div class='add'>+</div><div class='add'>+Extending taskstats</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+There are two ways to extend the taskstats interface to export more</div><div class='add'>+per-task/process stats as patches to collect them get added to the kernel</div><div class='add'>+in future:</div><div class='add'>+</div><div class='add'>+1. Adding more fields to the end of the existing struct taskstats. Backward</div><div class='add'>+   compatibility is ensured by the version number within the</div><div class='add'>+   structure. Userspace will use only the fields of the struct that correspond</div><div class='add'>+   to the version its using.</div><div class='add'>+</div><div class='add'>+2. Defining separate statistic structs and using the netlink attributes</div><div class='add'>+   interface to return them. Since userspace processes each netlink attribute</div><div class='add'>+   independently, it can always ignore attributes whose type it does not</div><div class='add'>+   understand (because it is using an older version of the interface).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Choosing between 1. and 2. is a matter of trading off flexibility and</div><div class='add'>+overhead. If only a few fields need to be added, then 1. is the preferable</div><div class='add'>+path since the kernel and userspace don't need to incur the overhead of</div><div class='add'>+processing new netlink attributes. But if the new fields expand the existing</div><div class='add'>+struct too much, requiring disparate userspace accounting utilities to</div><div class='add'>+unnecessarily receive large structures whose fields are of no interest, then</div><div class='add'>+extending the attributes structure would be worthwhile.</div><div class='add'>+</div><div class='add'>+Flow control for taskstats</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+When the rate of task exits becomes large, a listener may not be able to keep</div><div class='add'>+up with the kernel's rate of sending per-tid/tgid exit data leading to data</div><div class='add'>+loss. This possibility gets compounded when the taskstats structure gets</div><div class='add'>+extended and the number of cpus grows large.</div><div class='add'>+</div><div class='add'>+To avoid losing statistics, userspace should do one or more of the following:</div><div class='add'>+</div><div class='add'>+- increase the receive buffer sizes for the netlink sockets opened by</div><div class='add'>+listeners to receive exit data.</div><div class='add'>+</div><div class='add'>+- create more listeners and reduce the number of cpus being listened to by</div><div class='add'>+each listener. In the extreme case, there could be one listener for each cpu.</div><div class='add'>+Users may also consider setting the cpu affinity of the listener to the subset</div><div class='add'>+of cpus to which it listens, especially if they are listening to just one cpu.</div><div class='add'>+</div><div class='add'>+Despite these measures, if the userspace receives ENOBUFS error messages</div><div class='add'>+indicated overflow of receive buffers, it should take measures to handle the</div><div class='add'>+loss of data.</div><div class='add'>+</div><div class='add'>+----</div><div class='head'>diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx<br/>index d4c6d3aa0c25..43edb4ecf27d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/IXP4xx?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/arm/IXP4xx</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/IXP4xx?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/arm/IXP4xx</a></div><div class='hunk'>@@ -85,7 +85,7 @@ IXP4xx provides two methods of accessing PCI memory space:</div><div class='ctx'> 2) If &gt; 64MB of memory space is required, the IXP4xx can be </div><div class='ctx'>    configured to use indirect registers to access PCI This allows </div><div class='ctx'>    for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. </div><div class='del'>-   The disadvantadge of this is that every PCI access requires </div><div class='add'>+   The disadvantage of this is that every PCI access requires </div><div class='ctx'>    three local register accesses plus a spinlock, but in some </div><div class='ctx'>    cases the performance hit is acceptable. In addition, you cannot </div><div class='ctx'>    mmap() PCI devices in this case due to the indirect nature</div><div class='head'>diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt<br/>index 8c6ee684174c..3e46d2a31158 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/Overview.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/arm/Samsung-S3C24XX/Overview.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/Overview.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/arm/Samsung-S3C24XX/Overview.txt</a></div><div class='hunk'>@@ -7,11 +7,13 @@ Introduction</div><div class='ctx'> ------------</div><div class='ctx'> </div><div class='ctx'>   The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported</div><div class='del'>-  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410 and</div><div class='del'>-  the S3C2440 are supported CPUs.</div><div class='add'>+  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,</div><div class='add'>+  S3C2440 and S3C2442 devices are supported.</div><div class='ctx'> </div><div class='ctx'>   Support for the S3C2400 series is in progress.</div><div class='ctx'> </div><div class='add'>+  Support for the S3C2412 and S3C2413 CPUs is being merged.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Configuration</div><div class='ctx'> -------------</div><div class='hunk'>@@ -43,9 +45,18 @@ Machines</div><div class='ctx'> </div><div class='ctx'>     Samsung's own development board, geared for PDA work.</div><div class='ctx'> </div><div class='add'>+  Samsung/Aiji SMDK2412</div><div class='add'>+</div><div class='add'>+    The S3C2412 version of the SMDK2440.</div><div class='add'>+</div><div class='add'>+  Samsung/Aiji SMDK2413</div><div class='add'>+</div><div class='add'>+    The S3C2412 version of the SMDK2440.</div><div class='add'>+</div><div class='ctx'>   Samsung/Meritech SMDK2440</div><div class='ctx'> </div><div class='del'>-    The S3C2440 compatible version of the SMDK2440</div><div class='add'>+    The S3C2440 compatible version of the SMDK2440, which has the</div><div class='add'>+    option of an S3C2440 or S3C2442 CPU module.</div><div class='ctx'> </div><div class='ctx'>   Thorcom VR1000</div><div class='ctx'> </div><div class='hunk'>@@ -211,24 +222,6 @@ Port Contributors</div><div class='ctx'>   Lucas Correia Villa Real (S3C2400 port)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Document Changes</div><div class='del'>-----------------</div><div class='del'>-</div><div class='del'>-  05 Sep 2004 - BJD - Added Document Changes section</div><div class='del'>-  05 Sep 2004 - BJD - Added Klaus Fetscher to list of contributors</div><div class='del'>-  25 Oct 2004 - BJD - Added Dimitry Andric to list of contributors</div><div class='del'>-  25 Oct 2004 - BJD - Updated the MTD from the 2.6.9 merge</div><div class='del'>-  21 Jan 2005 - BJD - Added rx3715, added Shannon to contributors</div><div class='del'>-  10 Feb 2005 - BJD - Added Guillaume Gourat to contributors</div><div class='del'>-  02 Mar 2005 - BJD - Added SMDK2440 to list of machines</div><div class='del'>-  06 Mar 2005 - BJD - Added Christer Weinigel</div><div class='del'>-  08 Mar 2005 - BJD - Added LCVR to list of people, updated introduction</div><div class='del'>-  08 Mar 2005 - BJD - Added section on adding machines</div><div class='del'>-  09 Sep 2005 - BJD - Added section on platform data</div><div class='del'>-  11 Feb 2006 - BJD - Added I2C, RTC and Watchdog sections</div><div class='del'>-  11 Feb 2006 - BJD - Added Osiris machine, and S3C2400 information</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> Document Author</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt<br/>new file mode 100644<br/>index 000000000000..cb82a7fc7901<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/S3C2412.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/arm/Samsung-S3C24XX/S3C2412.txt</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+		S3C2412 ARM Linux Overview</div><div class='add'>+		==========================</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+  The S3C2412 is part of the S3C24XX range of ARM9 System-on-Chip CPUs</div><div class='add'>+  from Samsung. This part has an ARM926-EJS core, capable of running up</div><div class='add'>+  to 266MHz (see data-sheet for more information)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Clock</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+  The core clock code provides a set of clocks to the drivers, and allows</div><div class='add'>+  for source selection and a number of other features.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Power</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+  No support for suspend/resume to RAM in the current system.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+DMA</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+  No current support for DMA.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+GPIO</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+  There is support for setting the GPIO to input/output/special function</div><div class='add'>+  and reading or writing to them.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+UART</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+  The UART hardware is similar to the S3C2440, and is supported by the</div><div class='add'>+  s3c2410 driver in the drivers/serial directory.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+NAND</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+  The NAND hardware is similar to the S3C2440, and is supported by the</div><div class='add'>+  s3c2410 driver in the drivers/mtd/nand directory.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+USB Host</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+  The USB hardware is similar to the S3C2410, with extended clock source</div><div class='add'>+  control. The OHCI portion is supported by the ohci-s3c2410 driver, and</div><div class='add'>+  the clock control selection is supported by the core clock code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+USB Device</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+  No current support in the kernel</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+IRQs</div><div class='add'>+----</div><div class='add'>+</div><div class='add'>+  All the standard, and external interrupt sources are supported. The</div><div class='add'>+  extra sub-sources are not yet supported.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+RTC</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+  The RTC hardware is similar to the S3C2410, and is supported by the</div><div class='add'>+  s3c2410-rtc driver.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Watchdog</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+  The watchdog harware is the same as the S3C2410, and is supported by</div><div class='add'>+  the s3c2410_wdt driver.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MMC/SD/SDIO</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+  No current support for the MMC/SD/SDIO block.</div><div class='add'>+</div><div class='add'>+IIC</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+  The IIC hardware is the same as the S3C2410, and is supported by the</div><div class='add'>+  i2c-s3c24xx driver.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+IIS</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+  No current support for the IIS interface.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+SPI</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+  No current support for the SPI interfaces.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ATA</div><div class='add'>+---</div><div class='add'>+</div><div class='add'>+  No current support for the on-board ATA block.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Document Author</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Ben Dooks, (c) 2006 Simtec Electronics</div><div class='head'>diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2413.txt b/Documentation/arm/Samsung-S3C24XX/S3C2413.txt<br/>new file mode 100644<br/>index 000000000000..ab2a88858f12<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Samsung-S3C24XX/S3C2413.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/arm/Samsung-S3C24XX/S3C2413.txt</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+		S3C2413 ARM Linux Overview</div><div class='add'>+		==========================</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+  The S3C2413 is an extended version of the S3C2412, with an camera</div><div class='add'>+  interface and mobile DDR memory support. See the S3C2412 support</div><div class='add'>+  documentation for more information.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Camera Interface</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+  This block is currently not supported.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Document Author</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+Ben Dooks, (c) 2006 Simtec Electronics</div><div class='head'>diff --git a/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen b/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen<br/>new file mode 100644<br/>index 000000000000..1e6a23fdf2fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+README on the ADC/Touchscreen Controller</div><div class='add'>+========================================</div><div class='add'>+</div><div class='add'>+The LH79524 and LH7A404 include a built-in Analog to Digital</div><div class='add'>+controller (ADC) that is used to process input from a touchscreen.</div><div class='add'>+The driver only implements a four-wire touch panel protocol.</div><div class='add'>+</div><div class='add'>+The touchscreen driver is maintenance free except for the pen-down or</div><div class='add'>+touch threshold.  Some resistive displays and board combinations may</div><div class='add'>+require tuning of this threshold.  The driver exposes some of it's</div><div class='add'>+internal state in the sys filesystem.  If the kernel is configured</div><div class='add'>+with it, CONFIG_SYSFS, and sysfs is mounted at /sys, there will be a</div><div class='add'>+directory</div><div class='add'>+</div><div class='add'>+  /sys/devices/platform/adc-lh7.0</div><div class='add'>+</div><div class='add'>+containing these files.</div><div class='add'>+</div><div class='add'>+  -r--r--r--    1 root     root         4096 Jan  1 00:00 samples</div><div class='add'>+  -rw-r--r--    1 root     root         4096 Jan  1 00:00 threshold</div><div class='add'>+  -r--r--r--    1 root     root         4096 Jan  1 00:00 threshold_range</div><div class='add'>+</div><div class='add'>+The threshold is the current touch threshold.  It defaults to 750 on</div><div class='add'>+most targets.</div><div class='add'>+</div><div class='add'>+  # cat threshold</div><div class='add'>+ 750</div><div class='add'>+</div><div class='add'>+The threshold_range contains the range of valid values for the</div><div class='add'>+threshold.  Values outside of this range will be silently ignored.</div><div class='add'>+</div><div class='add'>+  # cat threshold_range</div><div class='add'>+  0 1023</div><div class='add'>+</div><div class='add'>+To change the threshold, write a value to the threshold file.</div><div class='add'>+</div><div class='add'>+  # echo 500 &gt; threshold</div><div class='add'>+  # cat threshold</div><div class='add'>+  500</div><div class='add'>+</div><div class='add'>+The samples file contains the most recently sampled values from the</div><div class='add'>+ADC.  There are 12.  Below are typical of the last sampled values when</div><div class='add'>+the pen has been released.  The first two and last two samples are for</div><div class='add'>+detecting whether or not the pen is down.  The third through sixth are</div><div class='add'>+X coordinate samples.  The seventh through tenth are Y coordinate</div><div class='add'>+samples.</div><div class='add'>+</div><div class='add'>+  # cat samples</div><div class='add'>+  1023 1023 0 0 0 0 530 529 530 529 1023 1023</div><div class='add'>+</div><div class='add'>+To determine a reasonable threshold, press on the touch panel with an</div><div class='add'>+appropriate stylus and read the values from samples.</div><div class='add'>+</div><div class='add'>+  # cat samples</div><div class='add'>+  1023 676 92 103 101 102 855 919 922 922 1023 679</div><div class='add'>+</div><div class='add'>+The first and eleventh samples are discarded.  Thus, the important</div><div class='add'>+values are the second and twelfth which are used to determine if the</div><div class='add'>+pen is down.  When both are below the threshold, the driver registers</div><div class='add'>+that the pen is down.  When either is above the threshold, it</div><div class='add'>+registers then pen is up.</div><div class='head'>diff --git a/Documentation/arm/Sharp-LH/LCDPanels b/Documentation/arm/Sharp-LH/LCDPanels<br/>new file mode 100644<br/>index 000000000000..fb1b21c2f2f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/arm/Sharp-LH/LCDPanels?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/arm/Sharp-LH/LCDPanels</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+README on the LCD Panels</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Configuration options for several LCD panels, available from Logic PD,</div><div class='add'>+are included in the kernel source.  This README will help you</div><div class='add'>+understand the configuration data and give you some guidance for</div><div class='add'>+adding support for other panels if you wish.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+lcd-panels.h</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+There is no way, at present, to detect which panel is attached to the</div><div class='add'>+system at runtime.  Thus the kernel configuration is static.  The file</div><div class='add'>+arch/arm/mach-ld7a40x/lcd-panels.h (or similar) defines all of the</div><div class='add'>+panel specific parameters.</div><div class='add'>+</div><div class='add'>+It should be possible for this data to be shared among several device</div><div class='add'>+families.  The current layout may be insufficiently general, but it is</div><div class='add'>+amenable to improvement.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PIXEL_CLOCK</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The panel data sheets will give a range of acceptable pixel clocks.</div><div class='add'>+The fundamental LCDCLK input frequency is divided down by a PCD</div><div class='add'>+constant in field '.tim2'.  It may happen that it is impossible to set</div><div class='add'>+the pixel clock within this range.  A clock which is too slow will</div><div class='add'>+tend to flicker.  For the highest quality image, set the clock as high</div><div class='add'>+as possible.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MARGINS</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+These values may be difficult to glean from the panel data sheet.  In</div><div class='add'>+the case of the Sharp panels, the upper margin is explicitly called</div><div class='add'>+out as a specific number of lines from the top of the frame.  The</div><div class='add'>+other values may not matter as much as the panels tend to</div><div class='add'>+automatically center the image.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sync Sense</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The sense of the hsync and vsync pulses may be called out in the data</div><div class='add'>+sheet.  On one panel, the sense of these pulses determine the height</div><div class='add'>+of the visible region on the panel.  Most of the Sharp panels use</div><div class='add'>+negative sense sync pulses set by the TIM2_IHS and TIM2_IVS bits in</div><div class='add'>+'.tim2'.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Pel Layout</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The Sharp color TFT panels are all configured for 16 bit direct color</div><div class='add'>+modes.  The amba-lcd driver sets the pel mode to 565 for 5 bits of</div><div class='add'>+each red and blue and 6 bits of green.</div><div class='head'>diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt<br/>index 23a1c2402bcc..2a63d5662a93 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/atomic_ops.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/atomic_ops.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/atomic_ops.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/atomic_ops.txt</a></div><div class='hunk'>@@ -157,13 +157,13 @@ For example, smp_mb__before_atomic_dec() can be used like so:</div><div class='ctx'> 	smp_mb__before_atomic_dec();</div><div class='ctx'> 	atomic_dec(&amp;obj-&gt;ref_count);</div><div class='ctx'> </div><div class='del'>-It makes sure that all memory operations preceeding the atomic_dec()</div><div class='add'>+It makes sure that all memory operations preceding the atomic_dec()</div><div class='ctx'> call are strongly ordered with respect to the atomic counter</div><div class='del'>-operation.  In the above example, it guarentees that the assignment of</div><div class='add'>+operation.  In the above example, it guarantees that the assignment of</div><div class='ctx'> "1" to obj-&gt;dead will be globally visible to other cpus before the</div><div class='ctx'> atomic counter decrement.</div><div class='ctx'> </div><div class='del'>-Without the explicitl smp_mb__before_atomic_dec() call, the</div><div class='add'>+Without the explicit smp_mb__before_atomic_dec() call, the</div><div class='ctx'> implementation could legally allow the atomic counter update visible</div><div class='ctx'> to other cpus before the "obj-&gt;dead = 1;" assignment.</div><div class='ctx'> </div><div class='hunk'>@@ -173,11 +173,11 @@ ordering with respect to memory operations after an atomic_dec() call</div><div class='ctx'> (smp_mb__{before,after}_atomic_inc()).</div><div class='ctx'> </div><div class='ctx'> A missing memory barrier in the cases where they are required by the</div><div class='del'>-atomic_t implementation above can have disasterous results.  Here is</div><div class='del'>-an example, which follows a pattern occuring frequently in the Linux</div><div class='add'>+atomic_t implementation above can have disastrous results.  Here is</div><div class='add'>+an example, which follows a pattern occurring frequently in the Linux</div><div class='ctx'> kernel.  It is the use of atomic counters to implement reference</div><div class='ctx'> counting, and it works such that once the counter falls to zero it can</div><div class='del'>-be guarenteed that no other entity can be accessing the object:</div><div class='add'>+be guaranteed that no other entity can be accessing the object:</div><div class='ctx'> </div><div class='ctx'> static void obj_list_add(struct obj *obj)</div><div class='ctx'> {</div><div class='hunk'>@@ -291,9 +291,9 @@ to the size of an "unsigned long" C data type, and are least of that</div><div class='ctx'> size.  The endianness of the bits within each "unsigned long" are the</div><div class='ctx'> native endianness of the cpu.</div><div class='ctx'> </div><div class='del'>-	void set_bit(unsigned long nr, volatils unsigned long *addr);</div><div class='del'>-	void clear_bit(unsigned long nr, volatils unsigned long *addr);</div><div class='del'>-	void change_bit(unsigned long nr, volatils unsigned long *addr);</div><div class='add'>+	void set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	void clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	void change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='ctx'> </div><div class='ctx'> These routines set, clear, and change, respectively, the bit number</div><div class='ctx'> indicated by "nr" on the bit mask pointed to by "ADDR".</div><div class='hunk'>@@ -301,9 +301,9 @@ indicated by "nr" on the bit mask pointed to by "ADDR".</div><div class='ctx'> They must execute atomically, yet there are no implicit memory barrier</div><div class='ctx'> semantics required of these interfaces.</div><div class='ctx'> </div><div class='del'>-	int test_and_set_bit(unsigned long nr, volatils unsigned long *addr);</div><div class='del'>-	int test_and_clear_bit(unsigned long nr, volatils unsigned long *addr);</div><div class='del'>-	int test_and_change_bit(unsigned long nr, volatils unsigned long *addr);</div><div class='add'>+	int test_and_set_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='add'>+	int test_and_change_bit(unsigned long nr, volatile unsigned long *addr);</div><div class='ctx'> </div><div class='ctx'> Like the above, except that these routines return a boolean which</div><div class='ctx'> indicates whether the changed bit was set _BEFORE_ the atomic bit</div><div class='hunk'>@@ -335,7 +335,7 @@ subsequent memory operation is made visible.  For example:</div><div class='ctx'> 		/* ... */;</div><div class='ctx'> 	obj-&gt;killed = 1;</div><div class='ctx'> </div><div class='del'>-The implementation of test_and_set_bit() must guarentee that</div><div class='add'>+The implementation of test_and_set_bit() must guarantee that</div><div class='ctx'> "obj-&gt;dead = 1;" is visible to cpus before the atomic memory operation</div><div class='ctx'> done by test_and_set_bit() becomes visible.  Likewise, the atomic</div><div class='ctx'> memory operation done by test_and_set_bit() must become visible before</div><div class='hunk'>@@ -474,7 +474,7 @@ Now, as far as memory barriers go, as long as spin_lock()</div><div class='ctx'> strictly orders all subsequent memory operations (including</div><div class='ctx'> the cas()) with respect to itself, things will be fine.</div><div class='ctx'> </div><div class='del'>-Said another way, _atomic_dec_and_lock() must guarentee that</div><div class='add'>+Said another way, _atomic_dec_and_lock() must guarantee that</div><div class='ctx'> a counter dropping to zero is never made visible before the</div><div class='ctx'> spinlock being acquired.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/console/console.txt b/Documentation/console/console.txt<br/>new file mode 100644<br/>index 000000000000..d3e17447321c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/console/console.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/console/console.txt</a></div><div class='hunk'>@@ -0,0 +1,144 @@</div><div class='add'>+Console Drivers</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+The linux kernel has 2 general types of console drivers.  The first type is</div><div class='add'>+assigned by the kernel to all the virtual consoles during the boot process.</div><div class='add'>+This type will be called 'system driver', and only one system driver is allowed</div><div class='add'>+to exist. The system driver is persistent and it can never be unloaded, though</div><div class='add'>+it may become inactive.</div><div class='add'>+</div><div class='add'>+The second type has to be explicitly loaded and unloaded. This will be called</div><div class='add'>+'modular driver' by this document. Multiple modular drivers can coexist at</div><div class='add'>+any time with each driver sharing the console with other drivers including</div><div class='add'>+the system driver. However, modular drivers cannot take over the console</div><div class='add'>+that is currently occupied by another modular driver. (Exception: Drivers that</div><div class='add'>+call take_over_console() will succeed in the takeover regardless of the type</div><div class='add'>+of driver occupying the consoles.) They can only take over the console that is</div><div class='add'>+occupied by the system driver. In the same token, if the modular driver is</div><div class='add'>+released by the console, the system driver will take over.</div><div class='add'>+</div><div class='add'>+Modular drivers, from the programmer's point of view, has to call:</div><div class='add'>+</div><div class='add'>+	 take_over_console() - load and bind driver to console layer</div><div class='add'>+	 give_up_console() - unbind and unload driver</div><div class='add'>+</div><div class='add'>+In newer kernels, the following are also available:</div><div class='add'>+</div><div class='add'>+	 register_con_driver()</div><div class='add'>+	 unregister_con_driver()</div><div class='add'>+</div><div class='add'>+If sysfs is enabled, the contents of /sys/class/vtconsole can be</div><div class='add'>+examined. This shows the console backends currently registered by the</div><div class='add'>+system which are named vtcon&lt;n&gt; where &lt;n&gt; is an integer fro 0 to 15. Thus:</div><div class='add'>+</div><div class='add'>+       ls /sys/class/vtconsole</div><div class='add'>+       .  ..  vtcon0  vtcon1</div><div class='add'>+</div><div class='add'>+Each directory in /sys/class/vtconsole has 3 files:</div><div class='add'>+</div><div class='add'>+     ls /sys/class/vtconsole/vtcon0</div><div class='add'>+     .  ..  bind  name  uevent</div><div class='add'>+</div><div class='add'>+What do these files signify?</div><div class='add'>+</div><div class='add'>+     1. bind - this is a read/write file. It shows the status of the driver if</div><div class='add'>+        read, or acts to bind or unbind the driver to the virtual consoles</div><div class='add'>+        when written to. The possible values are:</div><div class='add'>+</div><div class='add'>+	0 - means the driver is not bound and if echo'ed, commands the driver</div><div class='add'>+	    to unbind</div><div class='add'>+</div><div class='add'>+        1 - means the driver is bound and if echo'ed, commands the driver to</div><div class='add'>+	    bind</div><div class='add'>+</div><div class='add'>+     2. name - read-only file. Shows the name of the driver in this format:</div><div class='add'>+</div><div class='add'>+	cat /sys/class/vtconsole/vtcon0/name</div><div class='add'>+	(S) VGA+</div><div class='add'>+</div><div class='add'>+	    '(S)' stands for a (S)ystem driver, ie, it cannot be directly</div><div class='add'>+	    commanded to bind or unbind</div><div class='add'>+</div><div class='add'>+	    'VGA+' is the name of the driver</div><div class='add'>+</div><div class='add'>+	cat /sys/class/vtconsole/vtcon1/name</div><div class='add'>+	(M) frame buffer device</div><div class='add'>+</div><div class='add'>+	    In this case, '(M)' stands for a (M)odular driver, one that can be</div><div class='add'>+	    directly commanded to bind or unbind.</div><div class='add'>+</div><div class='add'>+     3. uevent - ignore this file</div><div class='add'>+</div><div class='add'>+When unbinding, the modular driver is detached first, and then the system</div><div class='add'>+driver takes over the consoles vacated by the driver. Binding, on the other</div><div class='add'>+hand, will bind the driver to the consoles that are currently occupied by a</div><div class='add'>+system driver.</div><div class='add'>+</div><div class='add'>+NOTE1: Binding and binding must be selected in Kconfig. It's under:</div><div class='add'>+</div><div class='add'>+Device Drivers -&gt; Character devices -&gt; Support for binding and unbinding</div><div class='add'>+console drivers</div><div class='add'>+</div><div class='add'>+NOTE2: If any of the virtual consoles are in KD_GRAPHICS mode, then binding or</div><div class='add'>+unbinding will not succeed. An example of an application that sets the console</div><div class='add'>+to KD_GRAPHICS is X.</div><div class='add'>+</div><div class='add'>+How useful is this feature? This is very useful for console driver</div><div class='add'>+developers. By unbinding the driver from the console layer, one can unload the</div><div class='add'>+driver, make changes, recompile, reload and rebind the driver without any need</div><div class='add'>+for rebooting the kernel. For regular users who may want to switch from</div><div class='add'>+framebuffer console to VGA console and vice versa, this feature also makes</div><div class='add'>+this possible. (NOTE NOTE NOTE: Please read fbcon.txt under Documentation/fb</div><div class='add'>+for more details).</div><div class='add'>+</div><div class='add'>+Notes for developers:</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+take_over_console() is now broken up into:</div><div class='add'>+</div><div class='add'>+     register_con_driver()</div><div class='add'>+     bind_con_driver() - private function</div><div class='add'>+</div><div class='add'>+give_up_console() is a wrapper to unregister_con_driver(), and a driver must</div><div class='add'>+be fully unbound for this call to succeed. con_is_bound() will check if the</div><div class='add'>+driver is bound or not.</div><div class='add'>+</div><div class='add'>+Guidelines for console driver writers:</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+In order for binding to and unbinding from the console to properly work,</div><div class='add'>+console drivers must follow these guidelines:</div><div class='add'>+</div><div class='add'>+1. All drivers, except system drivers, must call either register_con_driver()</div><div class='add'>+   or take_over_console(). register_con_driver() will just add the driver to</div><div class='add'>+   the console's internal list. It won't take over the</div><div class='add'>+   console. take_over_console(), as it name implies, will also take over (or</div><div class='add'>+   bind to) the console.</div><div class='add'>+</div><div class='add'>+2. All resources allocated during con-&gt;con_init() must be released in</div><div class='add'>+   con-&gt;con_deinit().</div><div class='add'>+</div><div class='add'>+3. All resources allocated in con-&gt;con_startup() must be released when the</div><div class='add'>+   driver, which was previously bound, becomes unbound.  The console layer</div><div class='add'>+   does not have a complementary call to con-&gt;con_startup() so it's up to the</div><div class='add'>+   driver to check when it's legal to release these resources. Calling</div><div class='add'>+   con_is_bound() in con-&gt;con_deinit() will help.  If the call returned</div><div class='add'>+   false(), then it's safe to release the resources.  This balance has to be</div><div class='add'>+   ensured because con-&gt;con_startup() can be called again when a request to</div><div class='add'>+   rebind the driver to the console arrives.</div><div class='add'>+</div><div class='add'>+4. Upon exit of the driver, ensure that the driver is totally unbound. If the</div><div class='add'>+   condition is satisfied, then the driver must call unregister_con_driver()</div><div class='add'>+   or give_up_console().</div><div class='add'>+</div><div class='add'>+5. unregister_con_driver() can also be called on conditions which make it</div><div class='add'>+   impossible for the driver to service console requests.  This can happen</div><div class='add'>+   with the framebuffer console that suddenly lost all of its drivers.</div><div class='add'>+</div><div class='add'>+The current crop of console drivers should still work correctly, but binding</div><div class='add'>+and unbinding them may cause problems. With minimal fixes, these drivers can</div><div class='add'>+be made to work correctly.</div><div class='add'>+</div><div class='add'>+==========================</div><div class='add'>+Antonino Daplas &lt;adaplas@pol.net&gt;</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/devices.txt b/Documentation/devices.txt<br/>index b369a8c46a73..4aaf68fafebe 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/devices.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/devices.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/devices.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/devices.txt</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> 	     Maintained by Torben Mathiasen &lt;device@lanana.org&gt;</div><div class='ctx'> </div><div class='del'>-		      Last revised: 25 January 2005</div><div class='add'>+		      Last revised: 15 May 2006</div><div class='ctx'> </div><div class='ctx'> This list is the Linux Device List, the official registry of allocated</div><div class='ctx'> device numbers and /dev directory nodes for the Linux operating</div><div class='hunk'>@@ -94,7 +94,6 @@ Your cooperation is appreciated.</div><div class='ctx'> 		  9 = /dev/urandom	Faster, less secure random number gen.</div><div class='ctx'> 		 10 = /dev/aio		Asyncronous I/O notification interface</div><div class='ctx'> 		 11 = /dev/kmsg		Writes to this come out as printk's</div><div class='del'>-		 12 = /dev/oldmem	Access to crash dump from kexec kernel</div><div class='ctx'>   1 block	RAM disk</div><div class='ctx'> 		  0 = /dev/ram0		First RAM disk</div><div class='ctx'> 		  1 = /dev/ram1		Second RAM disk</div><div class='hunk'>@@ -262,13 +261,13 @@ Your cooperation is appreciated.</div><div class='ctx'> 		NOTE: These devices permit both read and write access.</div><div class='ctx'> </div><div class='ctx'>   7 block	Loopback devices</div><div class='del'>-		  0 = /dev/loop0	First loopback device</div><div class='del'>-		  1 = /dev/loop1	Second loopback device</div><div class='add'>+		  0 = /dev/loop0	First loop device</div><div class='add'>+		  1 = /dev/loop1	Second loop device</div><div class='ctx'> 		    ...</div><div class='ctx'> </div><div class='del'>-		The loopback devices are used to mount filesystems not</div><div class='add'>+		The loop devices are used to mount filesystems not</div><div class='ctx'> 		associated with block devices.	The binding to the</div><div class='del'>-		loopback devices is handled by mount(8) or losetup(8).</div><div class='add'>+		loop devices is handled by mount(8) or losetup(8).</div><div class='ctx'> </div><div class='ctx'>   8 block	SCSI disk devices (0-15)</div><div class='ctx'> 		  0 = /dev/sda		First SCSI disk whole disk</div><div class='hunk'>@@ -943,7 +942,7 @@ Your cooperation is appreciated.</div><div class='ctx'> 		240 = /dev/ftlp		FTL on 16th Memory Technology Device </div><div class='ctx'> </div><div class='ctx'> 		Partitions are handled in the same way as for IDE</div><div class='del'>-		disks (see major number 3) expect that the partition</div><div class='add'>+		disks (see major number 3) except that the partition</div><div class='ctx'> 		limit is 15 rather than 63 per disk (same as SCSI.)</div><div class='ctx'> </div><div class='ctx'>  45 char	isdn4linux ISDN BRI driver</div><div class='hunk'>@@ -1168,7 +1167,7 @@ Your cooperation is appreciated.</div><div class='ctx'> 		The filename of the encrypted container and the passwords</div><div class='ctx'> 		are sent via ioctls (using the sdmount tool) to the master</div><div class='ctx'> 		node which then activates them via one of the</div><div class='del'>-		/dev/scramdisk/x nodes for loopback mounting (all handled</div><div class='add'>+		/dev/scramdisk/x nodes for loop mounting (all handled</div><div class='ctx'> 		through the sdmount tool).</div><div class='ctx'> </div><div class='ctx'> 		Requested by: andy@scramdisklinux.org</div><div class='hunk'>@@ -2538,18 +2537,32 @@ Your cooperation is appreciated.</div><div class='ctx'> 		  0 = /dev/usb/lp0	First USB printer</div><div class='ctx'> 		    ...</div><div class='ctx'> 		 15 = /dev/usb/lp15	16th USB printer</div><div class='del'>-		 16 = /dev/usb/mouse0	First USB mouse</div><div class='del'>-		    ...</div><div class='del'>-		 31 = /dev/usb/mouse15	16th USB mouse</div><div class='del'>-		 32 = /dev/usb/ez0	First USB firmware loader</div><div class='del'>-		    ...</div><div class='del'>-		 47 = /dev/usb/ez15	16th USB firmware loader</div><div class='ctx'> 		 48 = /dev/usb/scanner0	First USB scanner</div><div class='ctx'> 		    ...</div><div class='ctx'> 		 63 = /dev/usb/scanner15 16th USB scanner</div><div class='ctx'> 		 64 = /dev/usb/rio500	Diamond Rio 500</div><div class='ctx'> 		 65 = /dev/usb/usblcd	USBLCD Interface (info@usblcd.de)</div><div class='ctx'> 		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)</div><div class='add'>+		 96 = /dev/usb/hiddev0	1st USB HID device</div><div class='add'>+		    ...</div><div class='add'>+		111 = /dev/usb/hiddev15	16th USB HID device</div><div class='add'>+		112 = /dev/usb/auer0	1st auerswald ISDN device</div><div class='add'>+		    ...</div><div class='add'>+		127 = /dev/usb/auer15	16th auerswald ISDN device</div><div class='add'>+		128 = /dev/usb/brlvgr0	First Braille Voyager device</div><div class='add'>+		    ...</div><div class='add'>+		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device</div><div class='add'>+		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device</div><div class='add'>+		133 = /dev/usb/sisusbvga1	First SiSUSB VGA device</div><div class='add'>+		    ...</div><div class='add'>+		140 = /dev/usb/sisusbvga8	Eigth SISUSB VGA device</div><div class='add'>+		144 = /dev/usb/lcd	USB LCD device</div><div class='add'>+		160 = /dev/usb/legousbtower0	1st USB Legotower device</div><div class='add'>+		    ...</div><div class='add'>+		175 = /dev/usb/legousbtower15	16th USB Legotower device</div><div class='add'>+		240 = /dev/usb/dabusb0	First daubusb device</div><div class='add'>+		    ...</div><div class='add'>+		243 = /dev/usb/dabusb3	Fourth dabusb device</div><div class='ctx'> </div><div class='ctx'> 180 block	USB block devices</div><div class='ctx'> 		0 = /dev/uba		First USB block device</div><div class='hunk'>@@ -2710,6 +2723,17 @@ Your cooperation is appreciated.</div><div class='ctx'> 		  1 = /dev/cpu/1/msr		MSRs on CPU 1</div><div class='ctx'> 		    ...</div><div class='ctx'> </div><div class='add'>+202 block	Xen Virtual Block Device</div><div class='add'>+		  0 = /dev/xvda       First Xen VBD whole disk</div><div class='add'>+		  16 = /dev/xvdb      Second Xen VBD whole disk</div><div class='add'>+		  32 = /dev/xvdc      Third Xen VBD whole disk</div><div class='add'>+		    ...</div><div class='add'>+		  240 = /dev/xvdp     Sixteenth Xen VBD whole disk</div><div class='add'>+</div><div class='add'>+                Partitions are handled in the same way as for IDE</div><div class='add'>+                disks (see major number 3) except that the limit on</div><div class='add'>+                partitions is 15.</div><div class='add'>+</div><div class='ctx'> 203 char	CPU CPUID information</div><div class='ctx'> 		  0 = /dev/cpu/0/cpuid		CPUID on CPU 0</div><div class='ctx'> 		  1 = /dev/cpu/1/cpuid		CPUID on CPU 1</div><div class='hunk'>@@ -2747,11 +2771,27 @@ Your cooperation is appreciated.</div><div class='ctx'> 		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0</div><div class='ctx'> 		    ...</div><div class='ctx'> 		 47 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5</div><div class='del'>-		 50 = /dev/ttyIOC40		Altix serial card</div><div class='add'>+		 50 = /dev/ttyIOC0		Altix serial card</div><div class='add'>+		    ...</div><div class='add'>+		 81 = /dev/ttyIOC31		Altix serial card</div><div class='add'>+		 82 = /dev/ttyVR0		NEC VR4100 series SIU</div><div class='add'>+		 83 = /dev/ttyVR1		NEC VR4100 series DSIU</div><div class='add'>+		 84 = /dev/ttyIOC84		Altix ioc4 serial card</div><div class='add'>+		    ...</div><div class='add'>+		 115 = /dev/ttyIOC115		Altix ioc4 serial card</div><div class='add'>+		 116 = /dev/ttySIOC0		Altix ioc3 serial card</div><div class='add'>+		    ...</div><div class='add'>+		 147 = /dev/ttySIOC31		Altix ioc3 serial card</div><div class='add'>+		 148 = /dev/ttyPSC0		PPC PSC - port 0</div><div class='add'>+		    ...</div><div class='add'>+		 153 = /dev/ttyPSC5		PPC PSC - port 5</div><div class='add'>+		 154 = /dev/ttyAT0		ATMEL serial port 0</div><div class='add'>+		    ...</div><div class='add'>+		 169 = /dev/ttyAT15		ATMEL serial port 15</div><div class='add'>+		 170 = /dev/ttyNX0		Hilscher netX serial port 0</div><div class='ctx'> 		    ...</div><div class='del'>-		 81 = /dev/ttyIOC431		Altix serial card</div><div class='del'>-		 82 = /dev/ttyVR0               NEC VR4100 series SIU</div><div class='del'>-		 83 = /dev/ttyVR1               NEC VR4100 series DSIU</div><div class='add'>+		 185 = /dev/ttyNX15		Hilscher netX serial port 15</div><div class='add'>+		 186 = /dev/ttyJ0		JTAG1 DCC protocol based serial port emulation</div><div class='ctx'> </div><div class='ctx'> 205 char	Low-density serial ports (alternate device)</div><div class='ctx'> 		  0 = /dev/culu0		Callout device for ttyLU0</div><div class='hunk'>@@ -2786,8 +2826,8 @@ Your cooperation is appreciated.</div><div class='ctx'> 		 50 = /dev/cuioc40		Callout device for ttyIOC40</div><div class='ctx'> 		    ...</div><div class='ctx'> 		 81 = /dev/cuioc431		Callout device for ttyIOC431</div><div class='del'>-		 82 = /dev/cuvr0                Callout device for ttyVR0</div><div class='del'>-		 83 = /dev/cuvr1                Callout device for ttyVR1</div><div class='add'>+		 82 = /dev/cuvr0		Callout device for ttyVR0</div><div class='add'>+		 83 = /dev/cuvr1		Callout device for ttyVR1</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 206 char	OnStream SC-x0 tape devices</div><div class='hunk'>@@ -2897,7 +2937,6 @@ Your cooperation is appreciated.</div><div class='ctx'> 		    ...</div><div class='ctx'> 		196 = /dev/dvb/adapter3/video0    first video decoder of fourth card</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 216 char	Bluetooth RFCOMM TTY devices</div><div class='ctx'> 		  0 = /dev/rfcomm0		First Bluetooth RFCOMM TTY device</div><div class='ctx'> 		  1 = /dev/rfcomm1		Second Bluetooth RFCOMM TTY device</div><div class='hunk'>@@ -3002,12 +3041,43 @@ Your cooperation is appreciated.</div><div class='ctx'> 		ioctl()'s can be used to rewind the tape regardless of</div><div class='ctx'> 		the device used to access it.</div><div class='ctx'> </div><div class='del'>-231 char	InfiniBand MAD</div><div class='add'>+231 char	InfiniBand</div><div class='ctx'> 		0 = /dev/infiniband/umad0</div><div class='ctx'> 		1 = /dev/infiniband/umad1</div><div class='del'>-		 ...</div><div class='add'>+		  ...</div><div class='add'>+		63 = /dev/infiniband/umad63    63rd InfiniBandMad device</div><div class='add'>+		64 = /dev/infiniband/issm0     First InfiniBand IsSM device</div><div class='add'>+		65 = /dev/infiniband/issm1     Second InfiniBand IsSM device</div><div class='add'>+		  ...</div><div class='add'>+		127 = /dev/infiniband/issm63    63rd InfiniBand IsSM device</div><div class='add'>+		128 = /dev/infiniband/uverbs0   First InfiniBand verbs device</div><div class='add'>+		129 = /dev/infiniband/uverbs1   Second InfiniBand verbs device</div><div class='add'>+		  ...</div><div class='add'>+		159 = /dev/infiniband/uverbs31  31st InfiniBand verbs device</div><div class='add'>+</div><div class='add'>+232 char	Biometric Devices</div><div class='add'>+		0 = /dev/biometric/sensor0/fingerprint	first fingerprint sensor on first device</div><div class='add'>+		1 = /dev/biometric/sensor0/iris		first iris sensor on first device</div><div class='add'>+		2 = /dev/biometric/sensor0/retina	first retina sensor on first device</div><div class='add'>+		3 = /dev/biometric/sensor0/voiceprint	first voiceprint sensor on first device</div><div class='add'>+		4 = /dev/biometric/sensor0/facial	first facial sensor on first device</div><div class='add'>+		5 = /dev/biometric/sensor0/hand		first hand sensor on first device</div><div class='add'>+		  ...</div><div class='add'>+		10 = /dev/biometric/sensor1/fingerprint	first fingerprint sensor on second device</div><div class='add'>+		  ...</div><div class='add'>+		20 = /dev/biometric/sensor2/fingerprint	first fingerprint sensor on third device</div><div class='add'>+		  ...</div><div class='add'>+</div><div class='add'>+233 char	PathScale InfiniPath interconnect</div><div class='add'>+		0 = /dev/ipath        Primary device for programs (any unit)</div><div class='add'>+		1 = /dev/ipath0       Access specifically to unit 0</div><div class='add'>+		2 = /dev/ipath1       Access specifically to unit 1</div><div class='add'>+		  ...</div><div class='add'>+		4 = /dev/ipath3       Access specifically to unit 3</div><div class='add'>+		129 = /dev/ipath_sma    Device used by Subnet Management Agent</div><div class='add'>+		130 = /dev/ipath_diag   Device used by diagnostics programs</div><div class='ctx'> </div><div class='del'>-232-239		UNASSIGNED</div><div class='add'>+234-239		UNASSIGNED</div><div class='ctx'> </div><div class='ctx'> 240-254 char	LOCAL/EXPERIMENTAL USE</div><div class='ctx'> 240-254 block	LOCAL/EXPERIMENTAL USE</div><div class='hunk'>@@ -3021,6 +3091,28 @@ Your cooperation is appreciated.</div><div class='ctx'> 		This major is reserved to assist the expansion to a</div><div class='ctx'> 		larger number space.  No device nodes with this major</div><div class='ctx'> 		should ever be created on the filesystem.</div><div class='add'>+		(This is probaly not true anymore, but I'll leave it</div><div class='add'>+		for now /Torben)</div><div class='add'>+</div><div class='add'>+---LARGE MAJORS!!!!!---</div><div class='add'>+</div><div class='add'>+256 char	Equinox SST multi-port serial boards</div><div class='add'>+		   0 = /dev/ttyEQ0	First serial port on first Equinox SST board</div><div class='add'>+		 127 = /dev/ttyEQ127	Last serial port on first Equinox SST board</div><div class='add'>+		 128 = /dev/ttyEQ128	First serial port on second Equinox SST board</div><div class='add'>+		  ...</div><div class='add'>+		1027 = /dev/ttyEQ1027	Last serial port on eighth Equinox SST board</div><div class='add'>+</div><div class='add'>+256 block	Resident Flash Disk Flash Translation Layer</div><div class='add'>+		  0 = /dev/rfda		First RFD FTL layer</div><div class='add'>+		 16 = /dev/rfdb		Second RFD FTL layer</div><div class='add'>+		  ...</div><div class='add'>+		240 = /dev/rfdp		16th RFD FTL layer</div><div class='add'>+</div><div class='add'>+257 char	Phoenix Technologies Cryptographic Services Driver</div><div class='add'>+		  0 = /dev/ptlsec	Crypto Services Driver</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'>  ****	ADDITIONAL /dev DIRECTORY ENTRIES</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/digiepca.txt b/Documentation/digiepca.txt<br/>index 88820fe38dad..f2560e22f2c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/digiepca.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/digiepca.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/digiepca.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/digiepca.txt</a></div><div class='hunk'>@@ -2,7 +2,7 @@ NOTE:  This driver is obsolete.  Digi provides a 2.6 driver (dgdm) at</div><div class='ctx'> http://www.digi.com for PCI cards.  They no longer maintain this driver,</div><div class='ctx'> and have no 2.6 driver for ISA cards.</div><div class='ctx'> </div><div class='del'>-This driver requires a number of user-space tools.  They can be aquired from</div><div class='add'>+This driver requires a number of user-space tools.  They can be acquired from</div><div class='ctx'> http://www.digi.com, but only works with 2.4 kernels.</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/driver-model/overview.txt b/Documentation/driver-model/overview.txt<br/>index ac4a7a737e43..2050c9ffc629 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/driver-model/overview.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/driver-model/overview.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/driver-model/overview.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/driver-model/overview.txt</a></div><div class='hunk'>@@ -18,7 +18,7 @@ Traditional driver models implemented some sort of tree-like structure</div><div class='ctx'> (sometimes just a list) for the devices they control. There wasn't any</div><div class='ctx'> uniformity across the different bus types.</div><div class='ctx'> </div><div class='del'>-The current driver model provides a comon, uniform data model for describing</div><div class='add'>+The current driver model provides a common, uniform data model for describing</div><div class='ctx'> a bus and the devices that can appear under the bus. The unified bus</div><div class='ctx'> model includes a set of common attributes which all busses carry, and a set</div><div class='ctx'> of common callbacks, such as device discovery during bus probing, bus</div><div class='head'>diff --git a/Documentation/drivers/edac/edac.txt b/Documentation/drivers/edac/edac.txt<br/>index 70d96a62e5e1..7b3d969d2964 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/drivers/edac/edac.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/drivers/edac/edac.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/drivers/edac/edac.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/drivers/edac/edac.txt</a></div><div class='hunk'>@@ -35,15 +35,14 @@ the vendor should tie the parity status bits to 0 if they do not intend</div><div class='ctx'> to generate parity.  Some vendors do not do this, and thus the parity bit</div><div class='ctx'> can "float" giving false positives.</div><div class='ctx'> </div><div class='del'>-The PCI Parity EDAC device has the ability to "skip" known flaky</div><div class='del'>-cards during the parity scan. These are set by the parity "blacklist"</div><div class='del'>-interface in the sysfs for PCI Parity. (See the PCI section in the sysfs</div><div class='del'>-section below.) There is also a parity "whitelist" which is used as</div><div class='del'>-an explicit list of devices to scan, while the blacklist is a list</div><div class='del'>-of devices to skip.</div><div class='add'>+[There are patches in the kernel queue which will allow for storage of</div><div class='add'>+quirks of PCI devices reporting false parity positives. The 2.6.18</div><div class='add'>+kernel should have those patches included. When that becomes available,</div><div class='add'>+then EDAC will be patched to utilize that information to "skip" such</div><div class='add'>+devices.]</div><div class='ctx'> </div><div class='del'>-EDAC will have future error detectors that will be added or integrated</div><div class='del'>-into EDAC in the following list:</div><div class='add'>+EDAC will have future error detectors that will be integrated with</div><div class='add'>+EDAC or added to it, in the following list:</div><div class='ctx'> </div><div class='ctx'> 	MCE	Machine Check Exception</div><div class='ctx'> 	MCA	Machine Check Architecture</div><div class='hunk'>@@ -93,22 +92,24 @@ EDAC lives in the /sys/devices/system/edac directory. Within this directory</div><div class='ctx'> there currently reside 2 'edac' components:</div><div class='ctx'> </div><div class='ctx'> 	mc	memory controller(s) system</div><div class='del'>-	pci	PCI status system</div><div class='add'>+	pci	PCI control and status system</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ============================================================================</div><div class='ctx'> Memory Controller (mc) Model</div><div class='ctx'> </div><div class='ctx'> First a background on the memory controller's model abstracted in EDAC.</div><div class='del'>-Each mc device controls a set of DIMM memory modules. These modules are</div><div class='add'>+Each 'mc' device controls a set of DIMM memory modules. These modules are</div><div class='ctx'> laid out in a Chip-Select Row (csrowX) and Channel table (chX). There can</div><div class='del'>-be multiple csrows and two channels.</div><div class='add'>+be multiple csrows and multiple channels.</div><div class='ctx'> </div><div class='ctx'> Memory controllers allow for several csrows, with 8 csrows being a typical value.</div><div class='ctx'> Yet, the actual number of csrows depends on the electrical "loading"</div><div class='ctx'> of a given motherboard, memory controller and DIMM characteristics.</div><div class='ctx'> </div><div class='ctx'> Dual channels allows for 128 bit data transfers to the CPU from memory.</div><div class='add'>+Some newer chipsets allow for more than 2 channels, like Fully Buffered DIMMs</div><div class='add'>+(FB-DIMMs). The following example will assume 2 channels:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 		Channel 0	Channel 1</div><div class='hunk'>@@ -234,23 +235,15 @@ Polling period control file:</div><div class='ctx'> 	The time period, in milliseconds, for polling for error information.</div><div class='ctx'> 	Too small a value wastes resources.  Too large a value might delay</div><div class='ctx'> 	necessary handling of errors and might loose valuable information for</div><div class='del'>-	locating the error.  1000 milliseconds (once each second) is about</div><div class='del'>-	right for most uses.</div><div class='add'>+	locating the error.  1000 milliseconds (once each second) is the current</div><div class='add'>+	default. Systems which require all the bandwidth they can get, may</div><div class='add'>+	increase this.</div><div class='ctx'> </div><div class='ctx'> 	LOAD TIME: module/kernel parameter: poll_msec=[0|1]</div><div class='ctx'> </div><div class='ctx'> 	RUN TIME: echo "1000" &gt;/sys/devices/system/edac/mc/poll_msec</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Module Version read-only attribute file:</div><div class='del'>-</div><div class='del'>-	'mc_version'</div><div class='del'>-</div><div class='del'>-	The EDAC CORE module's version and compile date are shown here to</div><div class='del'>-	indicate what EDAC is running.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> ============================================================================</div><div class='ctx'> 'mcX' DIRECTORIES</div><div class='ctx'> </div><div class='hunk'>@@ -284,35 +277,6 @@ Seconds since last counter reset control file:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-DIMM capability attribute file:</div><div class='del'>-</div><div class='del'>-	'edac_capability'</div><div class='del'>-</div><div class='del'>-	The EDAC (Error Detection and Correction) capabilities/modes of</div><div class='del'>-	the memory controller hardware.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DIMM Current Capability attribute file:</div><div class='del'>-</div><div class='del'>-	'edac_current_capability'</div><div class='del'>-</div><div class='del'>-	The EDAC capabilities available with the hardware</div><div class='del'>-	configuration.  This may not be the same as "EDAC capability"</div><div class='del'>-	if the correct memory is not used.  If a memory controller is</div><div class='del'>-	capable of EDAC, but DIMMs without check bits are in use, then</div><div class='del'>-	Parity, SECDED, S4ECD4ED capabilities will not be available</div><div class='del'>-	even though the memory controller might be capable of those</div><div class='del'>-	modes with the proper memory loaded.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Memory Type supported on this controller attribute file:</div><div class='del'>-</div><div class='del'>-	'supported_mem_type'</div><div class='del'>-</div><div class='del'>-	This attribute file displays the memory type, usually</div><div class='del'>-	buffered and unbuffered DIMMs.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> Memory Controller name attribute file:</div><div class='ctx'> </div><div class='ctx'> 	'mc_name'</div><div class='hunk'>@@ -321,16 +285,6 @@ Memory Controller name attribute file:</div><div class='ctx'> 	that is being utilized.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Memory Controller Module name attribute file:</div><div class='del'>-</div><div class='del'>-	'module_name'</div><div class='del'>-</div><div class='del'>-	This attribute file displays the memory controller module name,</div><div class='del'>-	version and date built.  The name of the memory controller</div><div class='del'>-	hardware - some drivers work with multiple controllers and</div><div class='del'>-	this field shows which hardware is present.</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> Total memory managed by this memory controller attribute file:</div><div class='ctx'> </div><div class='ctx'> 	'size_mb'</div><div class='hunk'>@@ -432,6 +386,9 @@ Memory Type attribute file:</div><div class='ctx'> </div><div class='ctx'> 	This attribute file will display what type of memory is currently</div><div class='ctx'> 	on this csrow. Normally, either buffered or unbuffered memory.</div><div class='add'>+	Examples:</div><div class='add'>+		Registered-DDR</div><div class='add'>+		Unbuffered-DDR</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> EDAC Mode of operation attribute file:</div><div class='hunk'>@@ -446,8 +403,13 @@ Device type attribute file:</div><div class='ctx'> </div><div class='ctx'> 	'dev_type'</div><div class='ctx'> </div><div class='del'>-	This attribute file will display what type of DIMM device is</div><div class='del'>-	being utilized. Example:  x4</div><div class='add'>+	This attribute file will display what type of DRAM device is</div><div class='add'>+	being utilized on this DIMM.</div><div class='add'>+	Examples:</div><div class='add'>+		x1</div><div class='add'>+		x2</div><div class='add'>+		x4</div><div class='add'>+		x8</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Channel 0 CE Count attribute file:</div><div class='hunk'>@@ -522,10 +484,10 @@ SYSTEM LOGGING</div><div class='ctx'> If logging for UEs and CEs are enabled then system logs will have</div><div class='ctx'> error notices indicating errors that have been detected:</div><div class='ctx'> </div><div class='del'>-MC0: CE page 0x283, offset 0xce0, grain 8, syndrome 0x6ec3, row 0,</div><div class='add'>+EDAC MC0: CE page 0x283, offset 0xce0, grain 8, syndrome 0x6ec3, row 0,</div><div class='ctx'> channel 1 "DIMM_B1": amd76x_edac</div><div class='ctx'> </div><div class='del'>-MC0: CE page 0x1e5, offset 0xfb0, grain 8, syndrome 0xb741, row 0,</div><div class='add'>+EDAC MC0: CE page 0x1e5, offset 0xfb0, grain 8, syndrome 0xb741, row 0,</div><div class='ctx'> channel 1 "DIMM_B1": amd76x_edac</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -610,64 +572,4 @@ Parity Count:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-PCI Device Whitelist:</div><div class='del'>-</div><div class='del'>-	'pci_parity_whitelist'</div><div class='del'>-</div><div class='del'>-	This control file allows for an explicit list of PCI devices to be</div><div class='del'>-	scanned for parity errors. Only devices found on this list will</div><div class='del'>-	be examined.  The list is a line of hexadecimal VENDOR and DEVICE</div><div class='del'>-	ID tuples:</div><div class='del'>-</div><div class='del'>-	1022:7450,1434:16a6</div><div class='del'>-</div><div class='del'>-	One or more can be inserted, separated by a comma.</div><div class='del'>-</div><div class='del'>-	To write the above list doing the following as one command line:</div><div class='del'>-</div><div class='del'>-	echo "1022:7450,1434:16a6"</div><div class='del'>-		&gt; /sys/devices/system/edac/pci/pci_parity_whitelist</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	To display what the whitelist is, simply 'cat' the same file.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PCI Device Blacklist:</div><div class='del'>-</div><div class='del'>-	'pci_parity_blacklist'</div><div class='del'>-</div><div class='del'>-	This control file allows for a list of PCI devices to be</div><div class='del'>-	skipped for scanning.</div><div class='del'>-	The list is a line of hexadecimal VENDOR and DEVICE ID tuples:</div><div class='del'>-</div><div class='del'>-	1022:7450,1434:16a6</div><div class='del'>-</div><div class='del'>-	One or more can be inserted, separated by a comma.</div><div class='del'>-</div><div class='del'>-	To write the above list doing the following as one command line:</div><div class='del'>-</div><div class='del'>-	echo "1022:7450,1434:16a6"</div><div class='del'>-		&gt; /sys/devices/system/edac/pci/pci_parity_blacklist</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	To display what the whitelist currently contains,</div><div class='del'>-	simply 'cat' the same file.</div><div class='del'>-</div><div class='ctx'> =======================================================================</div><div class='del'>-</div><div class='del'>-PCI Vendor and Devices IDs can be obtained with the lspci command. Using</div><div class='del'>-the -n option lspci will display the vendor and device IDs. The system</div><div class='del'>-administrator will have to determine which devices should be scanned or</div><div class='del'>-skipped.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The two lists (white and black) are prioritized. blacklist is the lower</div><div class='del'>-priority and will NOT be utilized when a whitelist has been set.</div><div class='del'>-Turn OFF a whitelist by an empty echo command:</div><div class='del'>-</div><div class='del'>-	echo &gt; /sys/devices/system/edac/pci/pci_parity_whitelist</div><div class='del'>-</div><div class='del'>-and any previous blacklist will be utilized.</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt<br/>index 08dce0f631bf..f373df12ed4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/fb/fbcon.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/fb/fbcon.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/fb/fbcon.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/fb/fbcon.txt</a></div><div class='hunk'>@@ -135,10 +135,10 @@ C. Boot options</div><div class='ctx'> </div><div class='ctx'> 	The angle can be changed anytime afterwards by 'echoing' the same</div><div class='ctx'> 	numbers to any one of the 2 attributes found in</div><div class='del'>-	/sys/class/graphics/fb{x}</div><div class='add'>+	 /sys/class/graphics/fbcon</div><div class='ctx'> </div><div class='del'>-		con_rotate     - rotate the display of the active console</div><div class='del'>-		con_rotate_all - rotate the display of all consoles</div><div class='add'>+		rotate     - rotate the display of the active console</div><div class='add'>+		rotate_all - rotate the display of all consoles</div><div class='ctx'> </div><div class='ctx'> 	Console rotation will only become available if Console Rotation</div><div class='ctx'> 	Support is compiled in your kernel.</div><div class='hunk'>@@ -148,5 +148,177 @@ C. Boot options</div><div class='ctx'> 	Actually, the underlying fb driver is totally ignorant of console</div><div class='ctx'> 	rotation.</div><div class='ctx'> </div><div class='del'>----</div><div class='add'>+C. Attaching, Detaching and Unloading</div><div class='add'>+</div><div class='add'>+Before going on on how to attach, detach and unload the framebuffer console, an</div><div class='add'>+illustration of the dependencies may help.</div><div class='add'>+</div><div class='add'>+The console layer, as with most subsystems, needs a driver that interfaces with</div><div class='add'>+the hardware. Thus, in a VGA console:</div><div class='add'>+</div><div class='add'>+console ---&gt; VGA driver ---&gt; hardware.</div><div class='add'>+</div><div class='add'>+Assuming the VGA driver can be unloaded, one must first unbind the VGA driver</div><div class='add'>+from the console layer before unloading the driver.  The VGA driver cannot be</div><div class='add'>+unloaded if it is still bound to the console layer. (See</div><div class='add'>+Documentation/console/console.txt for more information).</div><div class='add'>+</div><div class='add'>+This is more complicated in the case of the the framebuffer console (fbcon),</div><div class='add'>+because fbcon is an intermediate layer between the console and the drivers:</div><div class='add'>+</div><div class='add'>+console ---&gt; fbcon ---&gt; fbdev drivers ---&gt; hardware</div><div class='add'>+</div><div class='add'>+The fbdev drivers cannot be unloaded if it's bound to fbcon, and fbcon cannot</div><div class='add'>+be unloaded if it's bound to the console layer.</div><div class='add'>+</div><div class='add'>+So to unload the fbdev drivers, one must first unbind fbcon from the console,</div><div class='add'>+then unbind the fbdev drivers from fbcon.  Fortunately, unbinding fbcon from</div><div class='add'>+the console layer will automatically unbind framebuffer drivers from</div><div class='add'>+fbcon. Thus, there is no need to explicitly unbind the fbdev drivers from</div><div class='add'>+fbcon.</div><div class='add'>+</div><div class='add'>+So, how do we unbind fbcon from the console? Part of the answer is in</div><div class='add'>+Documentation/console/console.txt. To summarize:</div><div class='add'>+</div><div class='add'>+Echo a value to the bind file that represents the framebuffer console</div><div class='add'>+driver. So assuming vtcon1 represents fbcon, then:</div><div class='add'>+</div><div class='add'>+echo 1 &gt; sys/class/vtconsole/vtcon1/bind - attach framebuffer console to</div><div class='add'>+                                           console layer</div><div class='add'>+echo 0 &gt; sys/class/vtconsole/vtcon1/bind - detach framebuffer console from</div><div class='add'>+                                           console layer</div><div class='add'>+</div><div class='add'>+If fbcon is detached from the console layer, your boot console driver (which is</div><div class='add'>+usually VGA text mode) will take over.  A few drivers (rivafb and i810fb) will</div><div class='add'>+restore VGA text mode for you.  With the rest, before detaching fbcon, you</div><div class='add'>+must take a few additional steps to make sure that your VGA text mode is</div><div class='add'>+restored properly. The following is one of the several methods that you can do:</div><div class='add'>+</div><div class='add'>+1. Download or install vbetool.  This utility is included with most</div><div class='add'>+   distributions nowadays, and is usually part of the suspend/resume tool.</div><div class='add'>+</div><div class='add'>+2. In your kernel configuration, ensure that CONFIG_FRAMEBUFFER_CONSOLE is set</div><div class='add'>+   to 'y' or 'm'. Enable one or more of your favorite framebuffer drivers.</div><div class='add'>+</div><div class='add'>+3. Boot into text mode and as root run:</div><div class='add'>+</div><div class='add'>+	vbetool vbestate save &gt; &lt;vga state file&gt;</div><div class='add'>+</div><div class='add'>+	The above command saves the register contents of your graphics</div><div class='add'>+	hardware to &lt;vga state file&gt;.  You need to do this step only once as</div><div class='add'>+	the state file can be reused.</div><div class='add'>+</div><div class='add'>+4. If fbcon is compiled as a module, load fbcon by doing:</div><div class='add'>+</div><div class='add'>+       modprobe fbcon</div><div class='add'>+</div><div class='add'>+5. Now to detach fbcon:</div><div class='add'>+</div><div class='add'>+       vbetool vbestate restore &lt; &lt;vga state file&gt; &amp;&amp; \</div><div class='add'>+       echo 0 &gt; /sys/class/vtconsole/vtcon1/bind</div><div class='add'>+</div><div class='add'>+6. That's it, you're back to VGA mode. And if you compiled fbcon as a module,</div><div class='add'>+   you can unload it by 'rmmod fbcon'</div><div class='add'>+</div><div class='add'>+7. To reattach fbcon:</div><div class='add'>+</div><div class='add'>+       echo 1 &gt; /sys/class/vtconsole/vtcon1/bind</div><div class='add'>+</div><div class='add'>+8. Once fbcon is unbound, all drivers registered to the system will also</div><div class='add'>+become unbound.  This means that fbcon and individual framebuffer drivers</div><div class='add'>+can be unloaded or reloaded at will. Reloading the drivers or fbcon will</div><div class='add'>+automatically bind the console, fbcon and the drivers together. Unloading</div><div class='add'>+all the drivers without unloading fbcon will make it impossible for the</div><div class='add'>+console to bind fbcon.</div><div class='add'>+</div><div class='add'>+Notes for vesafb users:</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Unfortunately, if your bootline includes a vga=xxx parameter that sets the</div><div class='add'>+hardware in graphics mode, such as when loading vesafb, vgacon will not load.</div><div class='add'>+Instead, vgacon will replace the default boot console with dummycon, and you</div><div class='add'>+won't get any display after detaching fbcon. Your machine is still alive, so</div><div class='add'>+you can reattach vesafb. However, to reattach vesafb, you need to do one of</div><div class='add'>+the following:</div><div class='add'>+</div><div class='add'>+Variation 1:</div><div class='add'>+</div><div class='add'>+    a. Before detaching fbcon, do</div><div class='add'>+</div><div class='add'>+       vbetool vbemode save &gt; &lt;vesa state file&gt; # do once for each vesafb mode,</div><div class='add'>+						# the file can be reused</div><div class='add'>+</div><div class='add'>+    b. Detach fbcon as in step 5.</div><div class='add'>+</div><div class='add'>+    c. Attach fbcon</div><div class='add'>+</div><div class='add'>+        vbetool vbestate restore &lt; &lt;vesa state file&gt; &amp;&amp; \</div><div class='add'>+	echo 1 &gt; /sys/class/vtconsole/vtcon1/bind</div><div class='add'>+</div><div class='add'>+Variation 2:</div><div class='add'>+</div><div class='add'>+    a. Before detaching fbcon, do:</div><div class='add'>+	echo &lt;ID&gt; &gt; /sys/class/tty/console/bind</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+       vbetool vbemode get</div><div class='add'>+</div><div class='add'>+    b. Take note of the mode number</div><div class='add'>+</div><div class='add'>+    b. Detach fbcon as in step 5.</div><div class='add'>+</div><div class='add'>+    c. Attach fbcon:</div><div class='add'>+</div><div class='add'>+       vbetool vbemode set &lt;mode number&gt; &amp;&amp; \</div><div class='add'>+       echo 1 &gt; /sys/class/vtconsole/vtcon1/bind</div><div class='add'>+</div><div class='add'>+Samples:</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+Here are 2 sample bash scripts that you can use to bind or unbind the</div><div class='add'>+framebuffer console driver if you are in an X86 box:</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+#!/bin/bash</div><div class='add'>+# Unbind fbcon</div><div class='add'>+</div><div class='add'>+# Change this to where your actual vgastate file is located</div><div class='add'>+# Or Use VGASTATE=$1 to indicate the state file at runtime</div><div class='add'>+VGASTATE=/tmp/vgastate</div><div class='add'>+</div><div class='add'>+# path to vbetool</div><div class='add'>+VBETOOL=/usr/local/bin</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+for (( i = 0; i &lt; 16; i++))</div><div class='add'>+do</div><div class='add'>+  if test -x /sys/class/vtconsole/vtcon$i; then</div><div class='add'>+      if [ `cat /sys/class/vtconsole/vtcon$i/name | grep -c "frame buffer"` \</div><div class='add'>+           = 1 ]; then</div><div class='add'>+	    if test -x $VBETOOL/vbetool; then</div><div class='add'>+	       echo Unbinding vtcon$i</div><div class='add'>+	       $VBETOOL/vbetool vbestate restore &lt; $VGASTATE</div><div class='add'>+	       echo 0 &gt; /sys/class/vtconsole/vtcon$i/bind</div><div class='add'>+	    fi</div><div class='add'>+      fi</div><div class='add'>+  fi</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+#!/bin/bash</div><div class='add'>+# Bind fbcon</div><div class='add'>+</div><div class='add'>+for (( i = 0; i &lt; 16; i++))</div><div class='add'>+do</div><div class='add'>+  if test -x /sys/class/vtconsole/vtcon$i; then</div><div class='add'>+      if [ `cat /sys/class/vtconsole/vtcon$i/name | grep -c "frame buffer"` \</div><div class='add'>+           = 1 ]; then</div><div class='add'>+	  echo Unbinding vtcon$i</div><div class='add'>+	  echo 1 &gt; /sys/class/vtconsole/vtcon$i/bind</div><div class='add'>+      fi</div><div class='add'>+  fi</div><div class='add'>+done</div><div class='add'>+---------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+--</div><div class='ctx'> Antonino Daplas &lt;adaplas@pol.net&gt;</div><div class='head'>diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt<br/>index 43ab119963d5..9d3a0775a11d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/feature-removal-schedule.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/feature-removal-schedule.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/feature-removal-schedule.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/feature-removal-schedule.txt</a></div><div class='hunk'>@@ -6,17 +6,6 @@ be removed from this file.</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	devfs</div><div class='del'>-When:	July 2005</div><div class='del'>-Files:	fs/devfs/*, include/linux/devfs_fs*.h and assorted devfs</div><div class='del'>-	function calls throughout the kernel tree</div><div class='del'>-Why:	It has been unmaintained for a number of years, has unfixable</div><div class='del'>-	races, contains a naming policy within the kernel that is</div><div class='del'>-	against the LSB, and can be replaced by using udev.</div><div class='del'>-Who:	Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	RAW driver (CONFIG_RAW_DRIVER)</div><div class='ctx'> When:	December 2005</div><div class='ctx'> Why:	declared obsolete since kernel 2.6.3</div><div class='hunk'>@@ -33,27 +22,12 @@ Who:	Adrian Bunk &lt;bunk@stusta.de&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	RCU API moves to EXPORT_SYMBOL_GPL</div><div class='del'>-When:	April 2006</div><div class='del'>-Files:	include/linux/rcupdate.h, kernel/rcupdate.c</div><div class='del'>-Why:	Outside of Linux, the only implementations of anything even</div><div class='del'>-	vaguely resembling RCU that I am aware of are in DYNIX/ptx,</div><div class='del'>-	VM/XA, Tornado, and K42.  I do not expect anyone to port binary</div><div class='del'>-	drivers or kernel modules from any of these, since the first two</div><div class='del'>-	are owned by IBM and the last two are open-source research OSes.</div><div class='del'>-	So these will move to GPL after a grace period to allow</div><div class='del'>-	people, who might be using implementations that I am not aware</div><div class='del'>-	of, to adjust to this upcoming change.</div><div class='del'>-Who:	Paul E. McKenney &lt;paulmck@us.ibm.com&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN</div><div class='del'>-When:	November 2005</div><div class='add'>+When:	November 2006</div><div class='ctx'> Why:	Deprecated in favour of the new ioctl-based rawiso interface, which is</div><div class='ctx'> 	more efficient.  You should really be using libraw1394 for raw1394</div><div class='ctx'> 	access anyway.</div><div class='del'>-Who:	Jody McIntyre &lt;scjody@steamballoon.com&gt;</div><div class='add'>+Who:	Jody McIntyre &lt;scjody@modernduck.com&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -81,14 +55,6 @@ Who:	Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	remove EXPORT_SYMBOL(insert_resource)</div><div class='del'>-When:	April 2006</div><div class='del'>-Files:	kernel/resource.c</div><div class='del'>-Why:	No modular usage in the kernel.</div><div class='del'>-Who:	Adrian Bunk &lt;bunk@stusta.de&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])</div><div class='ctx'> When:	November 2005</div><div class='ctx'> Files:	drivers/pcmcia/: pcmcia_ioctl.c</div><div class='hunk'>@@ -147,16 +113,6 @@ Who:	NeilBrown &lt;neilb@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	au1x00_uart driver</div><div class='del'>-When:	January 2006</div><div class='del'>-Why:	The 8250 serial driver now has the ability to deal with the differences</div><div class='del'>-	between the standard 8250 family of UARTs and their slightly strange</div><div class='del'>-	brother on Alchemy SOCs.  The loss of features is not considered an</div><div class='del'>-	issue.</div><div class='del'>-Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:   eepro100 network driver</div><div class='ctx'> When:   January 2007</div><div class='ctx'> Why:    replaced by the e100 driver</div><div class='hunk'>@@ -192,14 +148,13 @@ Who:	Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	remove EXPORT_SYMBOL(tasklist_lock)</div><div class='del'>-When:	August 2006</div><div class='del'>-Files:	kernel/fork.c</div><div class='del'>-Why:	tasklist_lock protects the kernel internal task list.  Modules have</div><div class='del'>-	no business looking at it, and all instances in drivers have been due</div><div class='del'>-	to use of too-lowlevel APIs.  Having this symbol exported prevents</div><div class='del'>-	moving to more scalable locking schemes for the task list.</div><div class='del'>-Who:	Christoph Hellwig &lt;hch@lst.de&gt;</div><div class='add'>+What:	Unused EXPORT_SYMBOL/EXPORT_SYMBOL_GPL exports</div><div class='add'>+	(temporary transition config option provided until then)</div><div class='add'>+	The transition config option will also be removed at the same time.</div><div class='add'>+When:	before 2.6.19</div><div class='add'>+Why:	Unused symbols are both increasing the size of the kernel binary</div><div class='add'>+	and are often a sign of "wrong API"</div><div class='add'>+Who:	Arjan van de Ven &lt;arjan@linux.intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -212,15 +167,6 @@ Who:	Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='ctx'> </div><div class='del'>-What:	Support for NEC DDB5074 and DDB5476 evaluation boards.</div><div class='del'>-When:	June 2006</div><div class='del'>-Why:	Board specific code doesn't build anymore since ~2.6.0 and no</div><div class='del'>-	users have complained indicating there is no more need for these</div><div class='del'>-	boards.  This should really be considered a last call.</div><div class='del'>-Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='del'>-</div><div class='del'>----------------------------</div><div class='del'>-</div><div class='ctx'> What:	USB driver API moves to EXPORT_SYMBOL_GPL</div><div class='ctx'> When:	Febuary 2008</div><div class='ctx'> Files:	include/linux/usb.h, drivers/usb/core/driver.c</div><div class='hunk'>@@ -248,3 +194,67 @@ Why:	The interface no longer has any callers left in the kernel. It</div><div class='ctx'> Who:	Nick Piggin &lt;npiggin@suse.de&gt;</div><div class='ctx'> </div><div class='ctx'> ---------------------------</div><div class='add'>+</div><div class='add'>+What:	Support for the MIPS EV96100 evaluation board</div><div class='add'>+When:	September 2006</div><div class='add'>+Why:	Does no longer build since at least November 15, 2003, apparently</div><div class='add'>+	no userbase left.</div><div class='add'>+Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	Support for the Momentum / PMC-Sierra Jaguar ATX evaluation board</div><div class='add'>+When:	September 2006</div><div class='add'>+Why:	Does no longer build since quite some time, and was never popular,</div><div class='add'>+	due to the platform being replaced by successor models.  Apparently</div><div class='add'>+	no user base left.  It also is one of the last users of</div><div class='add'>+	WANT_PAGE_VIRTUAL.</div><div class='add'>+Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	Support for the Momentum Ocelot, Ocelot 3, Ocelot C and Ocelot G</div><div class='add'>+When:	September 2006</div><div class='add'>+Why:	Some do no longer build and apparently there is no user base left</div><div class='add'>+	for these platforms.</div><div class='add'>+Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	Support for MIPS Technologies' Altas and SEAD evaluation board</div><div class='add'>+When:	September 2006</div><div class='add'>+Why:	Some do no longer build and apparently there is no user base left</div><div class='add'>+	for these platforms.  Hardware out of production since several years.</div><div class='add'>+Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	Support for the IT8172-based platforms, ITE 8172G and Globespan IVR</div><div class='add'>+When:	September 2006</div><div class='add'>+Why:	Code does no longer build since at least 2.6.0,  apparently there is</div><div class='add'>+	no user base left for these platforms.  Hardware out of production</div><div class='add'>+	since several years and hardly a trace of the manufacturer left on</div><div class='add'>+	the net.</div><div class='add'>+Who:	Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	Interrupt only SA_* flags</div><div class='add'>+When:	Januar 2007</div><div class='add'>+Why:	The interrupt related SA_* flags are replaced by IRQF_* to move them</div><div class='add'>+	out of the signal namespace.</div><div class='add'>+</div><div class='add'>+Who:	Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+What:	i2c-ite and i2c-algo-ite drivers</div><div class='add'>+When:	September 2006</div><div class='add'>+Why:	These drivers never compiled since they were added to the kernel</div><div class='add'>+	tree 5 years ago. This feature removal can be reevaluated if</div><div class='add'>+	someone shows interest in the drivers, fixes them and takes over</div><div class='add'>+	maintenance.</div><div class='add'>+	http://marc.theaimsgroup.com/?l=linux-mips&amp;m=115040510817448</div><div class='add'>+Who:	Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='add'>+</div><div class='add'>+---------------------------</div><div class='head'>diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking<br/>index 1045da582b9b..247d7f619aa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/Locking?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/Locking</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/Locking?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/Locking</a></div><div class='hunk'>@@ -99,7 +99,7 @@ prototypes:</div><div class='ctx'> 	int (*sync_fs)(struct super_block *sb, int wait);</div><div class='ctx'> 	void (*write_super_lockfs) (struct super_block *);</div><div class='ctx'> 	void (*unlockfs) (struct super_block *);</div><div class='del'>-	int (*statfs) (struct super_block *, struct kstatfs *);</div><div class='add'>+	int (*statfs) (struct dentry *, struct kstatfs *);</div><div class='ctx'> 	int (*remount_fs) (struct super_block *, int *, char *);</div><div class='ctx'> 	void (*clear_inode) (struct inode *);</div><div class='ctx'> 	void (*umount_begin) (struct super_block *);</div><div class='hunk'>@@ -142,15 +142,16 @@ see also dquot_operations section.</div><div class='ctx'> </div><div class='ctx'> --------------------------- file_system_type ---------------------------</div><div class='ctx'> prototypes:</div><div class='del'>-	struct super_block *(*get_sb) (struct file_system_type *, int,</div><div class='del'>-			const char *, void *);</div><div class='add'>+	int (*get_sb) (struct file_system_type *, int,</div><div class='add'>+		       const char *, void *, struct vfsmount *);</div><div class='ctx'> 	void (*kill_sb) (struct super_block *);</div><div class='ctx'> locking rules:</div><div class='ctx'> 		may block	BKL</div><div class='ctx'> get_sb		yes		yes</div><div class='ctx'> kill_sb		yes		yes</div><div class='ctx'> </div><div class='del'>--&gt;get_sb() returns error or a locked superblock (exclusive on -&gt;s_umount).</div><div class='add'>+-&gt;get_sb() returns error or 0 with locked superblock attached to the vfsmount</div><div class='add'>+(exclusive on -&gt;s_umount).</div><div class='ctx'> -&gt;kill_sb() takes a write-locked superblock, does all shutdown work on it,</div><div class='ctx'> unlocks and drops the reference.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/automount-support.txt b/Documentation/filesystems/automount-support.txt<br/>index 58c65a1713e5..7cac200e2a85 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/automount-support.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/automount-support.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/automount-support.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/automount-support.txt</a></div><div class='hunk'>@@ -19,7 +19,7 @@ following procedure:</div><div class='ctx'> </div><div class='ctx'>  (2) Have the follow_link() op do the following steps:</div><div class='ctx'> </div><div class='del'>-     (a) Call do_kern_mount() to call the appropriate filesystem to set up a</div><div class='add'>+     (a) Call vfs_kern_mount() to call the appropriate filesystem to set up a</div><div class='ctx'>          superblock and gain a vfsmount structure representing it.</div><div class='ctx'> </div><div class='ctx'>      (b) Copy the nameidata provided as an argument and substitute the dentry</div><div class='head'>diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example.c<br/>index 3d4713a6c207..2d6a14a463e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs_example.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/configfs/configfs_example.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/configfs/configfs_example.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/configfs/configfs_example.c</a></div><div class='hunk'>@@ -264,6 +264,15 @@ static struct config_item_type simple_child_type = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+struct simple_children {</div><div class='add'>+	struct config_group group;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct simple_children *to_simple_children(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	return item ? container_of(to_config_group(item), struct simple_children, group) : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct config_item *simple_children_make_item(struct config_group *group, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct simple_child *simple_child;</div><div class='hunk'>@@ -304,7 +313,13 @@ static ssize_t simple_children_attr_show(struct config_item *item,</div><div class='ctx'> "items have only one attribute that is readable and writeable.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void simple_children_release(struct config_item *item)</div><div class='add'>+{</div><div class='add'>+	kfree(to_simple_children(item));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct configfs_item_operations simple_children_item_ops = {</div><div class='add'>+	.release 	= simple_children_release,</div><div class='ctx'> 	.show_attribute	= simple_children_attr_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -345,10 +360,6 @@ static struct configfs_subsystem simple_children_subsys = {</div><div class='ctx'>  * children of its own.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct simple_children {</div><div class='del'>-	struct config_group group;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct config_group *group_children_make_group(struct config_group *group, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct simple_children *simple_children;</div><div class='head'>diff --git a/Documentation/filesystems/devfs/ChangeLog b/Documentation/filesystems/devfs/ChangeLog<br/>deleted file mode 100644<br/>index e5aba5246d7c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/devfs/ChangeLog?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1977 +0,0 @@</div><div class='del'>-/* -*- auto-fill -*-                                                         */</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v1</div><div class='del'>-</div><div class='del'>-- creation of devfs</div><div class='del'>-</div><div class='del'>-- modified miscellaneous character devices to support devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v2</div><div class='del'>-</div><div class='del'>-- bug fix with manual inode creation</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v3</div><div class='del'>-</div><div class='del'>-- bugfixes</div><div class='del'>-</div><div class='del'>-- documentation improvements</div><div class='del'>-</div><div class='del'>-- created a couple of scripts (one to save&amp;restore a devfs and the</div><div class='del'>-  other to set up compatibility symlinks)</div><div class='del'>-</div><div class='del'>-- devfs support for SCSI discs. New name format is: sd_hHcCiIlL</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v4</div><div class='del'>-</div><div class='del'>-- bugfix for the directory reading code</div><div class='del'>-</div><div class='del'>-- bugfix for compilation with kerneld</div><div class='del'>-</div><div class='del'>-- devfs support for generic hard discs</div><div class='del'>-</div><div class='del'>-- rationalisation of the various watchdog drivers</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v5</div><div class='del'>-</div><div class='del'>-- support for mounting directly from entries in the devfs (it doesn't</div><div class='del'>-  need to be mounted to do this), including the root filesystem.</div><div class='del'>-  Mounting of swap partitions also works. Hence, now if you set</div><div class='del'>-  CONFIG_DEVFS_ONLY to 'Y' then you won't be able to access your discs</div><div class='del'>-  via ordinary device nodes. Naturally, the default is 'N' so that you</div><div class='del'>-  can still use your old device nodes.  If you want to mount from devfs</div><div class='del'>-  entries, make sure you use: append = "root=/dev/sd_..." in your</div><div class='del'>-  lilo.conf. It seems LILO looks for the device number (major&amp;minor)</div><div class='del'>-  and writes that into the kernel image :-( </div><div class='del'>-</div><div class='del'>-- support for character memory devices (/dev/null, /dev/zero, /dev/full</div><div class='del'>-  and so on). Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v6</div><div class='del'>-</div><div class='del'>-- support for subdirectories</div><div class='del'>-</div><div class='del'>-- support for symbolic links (created by devfs_mk_symlink(), no</div><div class='del'>-  support yet for creation via symlink(2))</div><div class='del'>-</div><div class='del'>-- SCSI disc naming now cast in stone, with the format:</div><div class='del'>-  /dev/sd/c0b1t2u3	controller=0, bus=1, ID=2, LUN=3, whole disc</div><div class='del'>-  /dev/sd/c0b1t2u3p4	controller=0, bus=1, ID=2, LUN=3, 4th partition</div><div class='del'>-</div><div class='del'>-- loop devices now appear in devfs</div><div class='del'>-</div><div class='del'>-- tty devices, console, serial ports, etc. now appear in devfs</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- bugs with mounting devfs-only devices now fixed</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v7</div><div class='del'>-</div><div class='del'>-- SCSI CD-ROMS, tapes and generic devices now appear in devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v8</div><div class='del'>-</div><div class='del'>-- bugfix with no-rewind SCSI tapes</div><div class='del'>-</div><div class='del'>-- RAMDISCs now appear in devfs</div><div class='del'>-</div><div class='del'>-- better cleaning up of devfs entries created by various modules</div><div class='del'>-</div><div class='del'>-- interface change to &lt;devfs_register&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v9</div><div class='del'>-</div><div class='del'>-- the v8 patch was corrupted somehow, which would affect the patch for</div><div class='del'>-  linux/fs/filesystems.c</div><div class='del'>-  I've also fixed the v8 patch file on the WWW</div><div class='del'>-</div><div class='del'>-- MetaDevices (/dev/md*) should now appear in devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v10</div><div class='del'>-</div><div class='del'>-- bugfix in meta device support for devfs</div><div class='del'>-</div><div class='del'>-- created this ChangeLog file</div><div class='del'>-</div><div class='del'>-- added devfs support to the floppy driver</div><div class='del'>-</div><div class='del'>-- added support for creating sockets in a devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v11</div><div class='del'>-</div><div class='del'>-- added DEVFS_FL_HIDE_UNREG flag</div><div class='del'>-</div><div class='del'>-- incorporated better patch for ttyname() in libc 5.4.43 from H.J. Lu.</div><div class='del'>-</div><div class='del'>-- interface change to &lt;devfs_mk_symlink&gt;</div><div class='del'>-</div><div class='del'>-- support for creating symlinks with symlink(2)</div><div class='del'>-</div><div class='del'>-- parallel port printer (/dev/lp*) now appears in devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v12</div><div class='del'>-</div><div class='del'>-- added inode check to &lt;devfs_fill_file&gt; function</div><div class='del'>-</div><div class='del'>-- improved devfs support when mounting from devfs</div><div class='del'>-</div><div class='del'>-- added call to &lt;&lt;release&gt;&gt; operation when removing swap areas on</div><div class='del'>-  devfs devices</div><div class='del'>-</div><div class='del'>-- increased NR_SUPER to 128 to support large numbers of devfs mounts</div><div class='del'>-  (for chroot(2) gaols)</div><div class='del'>-</div><div class='del'>-- fixed bug in SCSI disc support: was generating incorrect minors if</div><div class='del'>-  SCSI ID's did not start at 0 and increase by 1</div><div class='del'>-</div><div class='del'>-- support symlink traversal when mounting root</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v13</div><div class='del'>-</div><div class='del'>-- added devfs support to soundcard driver</div><div class='del'>-  Thanks to Eric Dumas &lt;dumas@linux.eu.org&gt; and</div><div class='del'>-  C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- added devfs support to the joystick driver</div><div class='del'>-</div><div class='del'>-- loop driver now has it's own subdirectory "/dev/loop/"</div><div class='del'>-</div><div class='del'>-- created &lt;devfs_get_flags&gt; and &lt;devfs_set_flags&gt; functions</div><div class='del'>-</div><div class='del'>-- fix problem with SCSI disc compatibility names (sd{a,b,c,d,e,f})</div><div class='del'>-  which assumes ID's start at 0 and increase by 1. Also only create</div><div class='del'>-  devfs entries for SCSI disc partitions which actually exist</div><div class='del'>-  Show new names in partition check</div><div class='del'>-  Thanks to Jakub Jelinek &lt;jj@sunsite.ms.mff.cuni.cz&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v14</div><div class='del'>-</div><div class='del'>-- bug fix in floppy driver: would not compile without</div><div class='del'>-  CONFIG_DEVFS_FS='Y'</div><div class='del'>-  Thanks to Jurgen Botz &lt;jbotz@nova.botz.org&gt;</div><div class='del'>-</div><div class='del'>-- bug fix in loop driver</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- do not create devfs entries for printers not configured</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- do not create devfs entries for serial ports not present</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- ensure &lt;tty_register_devfs&gt; is exported from tty_io.c</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- allow unregistering of devfs symlink entries</div><div class='del'>-</div><div class='del'>-- fixed bug in SCSI disc naming introduced in last patch version</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v15</div><div class='del'>-</div><div class='del'>-- ported to kernel 2.1.81</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v16</div><div class='del'>-</div><div class='del'>-- created &lt;devfs_set_symlink_destination&gt; function</div><div class='del'>-</div><div class='del'>-- moved DEVFS_SUPER_MAGIC into header file</div><div class='del'>-</div><div class='del'>-- added DEVFS_FL_HIDE flag</div><div class='del'>-</div><div class='del'>-- created &lt;devfs_get_maj_min&gt;</div><div class='del'>-</div><div class='del'>-- created &lt;devfs_get_handle_from_inode&gt;</div><div class='del'>-</div><div class='del'>-- fixed bugs in searching by major&amp;minor</div><div class='del'>-</div><div class='del'>-- changed interface to &lt;devfs_unregister&gt;, &lt;devfs_fill_file&gt; and</div><div class='del'>-  &lt;devfs_find_handle&gt;</div><div class='del'>-</div><div class='del'>-- fixed inode times when symlink created with symlink(2)</div><div class='del'>-</div><div class='del'>-- change tty driver to do auto-creation of devfs entries</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- fixed bug in genhd.c: whole disc (non-SCSI) was not registered to</div><div class='del'>-  devfs</div><div class='del'>-</div><div class='del'>-- updated libc 5.4.43 patch for ttyname()</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v17</div><div class='del'>-</div><div class='del'>-- added CONFIG_DEVFS_TTY_COMPAT</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- bugfix in devfs support for drivers/char/lp.c</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- clean up serial driver so that PCMCIA devices unregister correctly</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- fixed bug in genhd.c: whole disc (non-SCSI) was not registered to</div><div class='del'>-  devfs [was missing in patch v16]</div><div class='del'>-</div><div class='del'>-- updated libc 5.4.43 patch for ttyname() [was missing in patch v16]</div><div class='del'>-</div><div class='del'>-- all SCSI devices now registered in /dev/sg</div><div class='del'>-</div><div class='del'>-- support removal of devfs entries via unlink(2)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v18</div><div class='del'>-</div><div class='del'>-- added floppy/?u720 floppy entry</div><div class='del'>-</div><div class='del'>-- fixed kerneld support for entries in devfs subdirectories</div><div class='del'>-</div><div class='del'>-- incorporated latest patch for ttyname() in libc 5.4.43 from H.J. Lu.</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v19</div><div class='del'>-</div><div class='del'>-- bug fix when looking up unregistered entries: kerneld was not called</div><div class='del'>-</div><div class='del'>-- fixes for kernel 2.1.86 (now requires 2.1.86)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v20</div><div class='del'>-</div><div class='del'>-- only create available floppy entries</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-</div><div class='del'>-- new IDE naming scheme following SCSI format (i.e. /dev/id/c0b0t0u0p1</div><div class='del'>-  instead of /dev/hda1)</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-</div><div class='del'>-- new XT disc naming scheme following SCSI format (i.e. /dev/xd/c0t0p1</div><div class='del'>-  instead of /dev/xda1)</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-</div><div class='del'>-- new non-standard CD-ROM names (i.e. /dev/sbp/c#t#)</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-</div><div class='del'>-- allow symlink traversal when mounting the root filesystem</div><div class='del'>-</div><div class='del'>-- Create entries for MD devices at MD init</div><div class='del'>-  Thanks to Christophe Leroy &lt;christophe.leroy5@capway.com&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v21</div><div class='del'>-</div><div class='del'>-- ported to kernel 2.1.91</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v22</div><div class='del'>-</div><div class='del'>-- SCSI host number patch ("scsihosts=" kernel option)</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v23</div><div class='del'>-</div><div class='del'>-- Fixed persistence bug with device numbers for manually created</div><div class='del'>-  device files</div><div class='del'>-</div><div class='del'>-- Fixed problem with recreating symlinks with different content</div><div class='del'>-</div><div class='del'>-- Added CONFIG_DEVFS_MOUNT (mount devfs on /dev at boot time)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v24</div><div class='del'>-</div><div class='del'>-- Switched from CONFIG_KERNELD to CONFIG_KMOD: module autoloading</div><div class='del'>-  should now work again</div><div class='del'>-</div><div class='del'>-- Hide entries which are manually unlinked</div><div class='del'>-</div><div class='del'>-- Always invalidate devfs dentry cache when registering entries</div><div class='del'>-</div><div class='del'>-- Support removal of devfs directories via rmdir(2)</div><div class='del'>-</div><div class='del'>-- Ensure directories created by &lt;devfs_mk_dir&gt; are visible</div><div class='del'>-</div><div class='del'>-- Default no access for "other" for floppy device</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v25</div><div class='del'>-</div><div class='del'>-- Updates to CREDITS file and minor IDE numbering change</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-</div><div class='del'>-- Invalidate devfs dentry cache when making directories</div><div class='del'>-</div><div class='del'>-- Invalidate devfs dentry cache when removing entries</div><div class='del'>-</div><div class='del'>-- More informative message if root FS mount fails when devfs</div><div class='del'>-  configured</div><div class='del'>-</div><div class='del'>-- Fixed persistence bug with fifos</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v26</div><div class='del'>-</div><div class='del'>-- ported to kernel 2.1.97</div><div class='del'>-</div><div class='del'>-- Changed serial directory from "/dev/serial" to "/dev/tts" and</div><div class='del'>-  "/dev/consoles" to "/dev/vc" to be more friendly to new procps</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v27</div><div class='del'>-</div><div class='del'>-- Added support for IDE4 and IDE5</div><div class='del'>-  Thanks to Andrzej Krzysztofowicz &lt;ankry@green.mif.pg.gda.pl&gt;</div><div class='del'>-</div><div class='del'>-- Documented "scsihosts=" boot parameter</div><div class='del'>-</div><div class='del'>-- Print process command when debugging kerneld/kmod</div><div class='del'>-</div><div class='del'>-- Added debugging for register/unregister/change operations</div><div class='del'>-</div><div class='del'>-- Added "devfs=" boot options</div><div class='del'>-</div><div class='del'>-- Hide unregistered entries by default</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v28</div><div class='del'>-</div><div class='del'>-- No longer lock/unlock superblock in &lt;devfs_put_super&gt; (cope with</div><div class='del'>-  recent VFS interface change)</div><div class='del'>-</div><div class='del'>-- Do not automatically change ownership/protection of /dev/tty</div><div class='del'>-</div><div class='del'>-- Drop negative dentries when they are released</div><div class='del'>-</div><div class='del'>-- Manage dcache more efficiently</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v29</div><div class='del'>-</div><div class='del'>-- Added DEVFS_FL_AUTO_DEVNUM flag</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v30</div><div class='del'>-</div><div class='del'>-- No longer set unnecessary methods</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.99-pre3</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v31</div><div class='del'>-</div><div class='del'>-- Added PID display to &lt;call_kerneld&gt; debugging message</div><div class='del'>-</div><div class='del'>-- Added "diread" and "diwrite" options</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.102</div><div class='del'>-</div><div class='del'>-- Fixed persistence problem with permissions</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v32</div><div class='del'>-</div><div class='del'>-- Fixed devfs support in drivers/block/md.c</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v33</div><div class='del'>-</div><div class='del'>-- Support legacy device nodes</div><div class='del'>-</div><div class='del'>-- Fixed bug where recreated inodes were hidden</div><div class='del'>-</div><div class='del'>-- New IDE naming scheme: everything is under /dev/ide</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v34</div><div class='del'>-</div><div class='del'>-- Improved debugging in &lt;get_vfs_inode&gt;</div><div class='del'>-</div><div class='del'>-- Prevent duplicate calls to &lt;devfs_mk_dir&gt; in SCSI layer</div><div class='del'>-</div><div class='del'>-- No longer free old dentries in &lt;devfs_mk_dir&gt;</div><div class='del'>-</div><div class='del'>-- Free all dentries for a given entry when deleting inodes</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v35</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.105 (sound driver changes)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v36</div><div class='del'>-</div><div class='del'>-- Fixed sound driver port</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v37</div><div class='del'>-</div><div class='del'>-- Minor documentation tweaks</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v38</div><div class='del'>-</div><div class='del'>-- More documentation tweaks</div><div class='del'>-</div><div class='del'>-- Fix for sound driver port</div><div class='del'>-</div><div class='del'>-- Removed ttyname-patch (grab libc 5.4.44 instead)</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.107-pre2 (loop driver fix)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v39</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.107 (hd.c hunk broke due to spelling "fixes"). Sigh</div><div class='del'>-</div><div class='del'>-- Removed many #ifdef's, replaced with trickery in include/devfs_fs.h</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v40</div><div class='del'>-</div><div class='del'>-- Fix for sound driver port</div><div class='del'>-</div><div class='del'>-- Limit auto-device numbering to majors 128 to 239</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v41</div><div class='del'>-</div><div class='del'>-- Fixed inode times persistence problem</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v42</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.108 (drivers/scsi/hosts.c hunk broke)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v43</div><div class='del'>-</div><div class='del'>-- Fixed spelling in &lt;devfs_readlink&gt; debug</div><div class='del'>-</div><div class='del'>-- Fixed bug in &lt;devfs_setup&gt; parsing "dilookup"</div><div class='del'>-</div><div class='del'>-- More #ifdef's removed</div><div class='del'>-</div><div class='del'>-- Supported Sparc keyboard (/dev/kbd)</div><div class='del'>-</div><div class='del'>-- Supported DSP56001 digital signal processor (/dev/dsp56k)</div><div class='del'>-</div><div class='del'>-- Supported Apple Desktop Bus (/dev/adb)</div><div class='del'>-</div><div class='del'>-- Supported Coda network file system (/dev/cfs*)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v44</div><div class='del'>-</div><div class='del'>-- Fixed devfs inode leak when manually recreating inodes</div><div class='del'>-</div><div class='del'>-- Fixed permission persistence problem when recreating inodes</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v45</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.110</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v46</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.112-pre1</div><div class='del'>-</div><div class='del'>-- Removed harmless "unused variable" compiler warning</div><div class='del'>-</div><div class='del'>-- Fixed modes for manually recreated device nodes</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v47</div><div class='del'>-</div><div class='del'>-- Added NULL devfs inode warning in &lt;devfs_read_inode&gt;</div><div class='del'>-</div><div class='del'>-- Force all inode nlink values to 1</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v48</div><div class='del'>-</div><div class='del'>-- Added "dimknod" option</div><div class='del'>-</div><div class='del'>-- Set inode nlink to 0 when freeing dentries</div><div class='del'>-</div><div class='del'>-- Added support for virtual console capture devices (/dev/vcs*)</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Fixed modes for manually recreated symlinks</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v49</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.113</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v50</div><div class='del'>-</div><div class='del'>-- Fixed bugs in recreated directories and symlinks</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v51</div><div class='del'>-</div><div class='del'>-- Improved robustness of rc.devfs script</div><div class='del'>-  Thanks to Roderich Schupp &lt;rsch@experteam.de&gt;</div><div class='del'>-</div><div class='del'>-- Fixed bugs in recreated device nodes</div><div class='del'>-</div><div class='del'>-- Fixed bug in currently unused &lt;devfs_get_handle_from_inode&gt;</div><div class='del'>-</div><div class='del'>-- Defined new &lt;devfs_handle_t&gt; type</div><div class='del'>-</div><div class='del'>-- Improved debugging when getting entries</div><div class='del'>-</div><div class='del'>-- Fixed bug where directories could be emptied</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.115</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v52</div><div class='del'>-</div><div class='del'>-- Replaced dummy .epoch inode with .devfsd character device</div><div class='del'>-</div><div class='del'>-- Modified rc.devfs to take account of above change</div><div class='del'>-</div><div class='del'>-- Removed spurious driver warning messages when CONFIG_DEVFS_FS=n</div><div class='del'>-</div><div class='del'>-- Implemented devfsd protocol revision 0</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v53</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.116 (kmod change broke hunk)</div><div class='del'>-</div><div class='del'>-- Updated Documentation/Configure.help</div><div class='del'>-</div><div class='del'>-- Test and tty pattern patch for rc.devfs script</div><div class='del'>-  Thanks to Roderich Schupp &lt;rsch@experteam.de&gt;</div><div class='del'>-</div><div class='del'>-- Added soothing message to warning in &lt;devfs_d_iput&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v54</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.117</div><div class='del'>-</div><div class='del'>-- Fixed default permissions in sound driver</div><div class='del'>-</div><div class='del'>-- Added support for frame buffer devices (/dev/fb*)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v55</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.119</div><div class='del'>-</div><div class='del'>-- Use GCC extensions for structure initialisations</div><div class='del'>-</div><div class='del'>-- Implemented async open notification</div><div class='del'>-</div><div class='del'>-- Incremented devfsd protocol revision to 1</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v56</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.120-pre3</div><div class='del'>-</div><div class='del'>-- Moved async open notification to end of &lt;devfs_open&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v57</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.121</div><div class='del'>-</div><div class='del'>-- Prepended "/dev/" to module load request</div><div class='del'>-</div><div class='del'>-- Renamed &lt;call_kerneld&gt; to &lt;call_kmod&gt;</div><div class='del'>-</div><div class='del'>-- Created sample modules.conf file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v58</div><div class='del'>-</div><div class='del'>-- Fixed typo "AYSNC" -&gt; "ASYNC"</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v59</div><div class='del'>-</div><div class='del'>-- Added open flag for files</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v60</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.123-pre2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v61</div><div class='del'>-</div><div class='del'>-- Set i_blocks=0 and i_blksize=1024 in &lt;devfs_read_inode&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v62</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.123</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v63</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.124-pre2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v64</div><div class='del'>-</div><div class='del'>-- Fixed Unix98 pty support</div><div class='del'>-</div><div class='del'>-- Increased buffer size in &lt;get_partition_list&gt; to avoid crash and</div><div class='del'>-  burn</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v65</div><div class='del'>-</div><div class='del'>-- More Unix98 pty support fixes</div><div class='del'>-</div><div class='del'>-- Added test for empty &lt;&lt;name&gt;&gt; in &lt;devfs_find_handle&gt;</div><div class='del'>-</div><div class='del'>-- Renamed &lt;generate_path&gt; to &lt;devfs_generate_path&gt; and published</div><div class='del'>-</div><div class='del'>-- Created /dev/root symlink</div><div class='del'>-  Thanks to Roderich Schupp &lt;rsch@ExperTeam.de&gt;</div><div class='del'>-  with further modifications by me</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v66</div><div class='del'>-</div><div class='del'>-- Yet more Unix98 pty support fixes (now tested)</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_get_fops&gt;</div><div class='del'>-</div><div class='del'>-- Support media change checks when CONFIG_DEVFS_ONLY=y</div><div class='del'>-</div><div class='del'>-- Abolished Unix98-style PTY names for old PTY devices</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v67</div><div class='del'>-</div><div class='del'>-- Added inline declaration for dummy &lt;devfs_generate_path&gt;</div><div class='del'>-</div><div class='del'>-- Removed spurious "unable to register... in devfs" messages when</div><div class='del'>-  CONFIG_DEVFS_FS=n</div><div class='del'>-</div><div class='del'>-- Fixed misc. devices when CONFIG_DEVFS_FS=n</div><div class='del'>-</div><div class='del'>-- Limit auto-device numbering to majors 144 to 239</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v68</div><div class='del'>-</div><div class='del'>-- Hide unopened virtual consoles from directory listings</div><div class='del'>-</div><div class='del'>-- Added support for video capture devices</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.125</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v69</div><div class='del'>-</div><div class='del'>-- Fix for CONFIG_VT=n</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v70</div><div class='del'>-</div><div class='del'>-- Added support for non-OSS/Free sound cards</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v71</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.126-pre2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v72</div><div class='del'>-</div><div class='del'>-- #ifdef's for CONFIG_DEVFS_DISABLE_OLD_NAMES removed</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v73</div><div class='del'>-</div><div class='del'>-- CONFIG_DEVFS_DISABLE_OLD_NAMES replaced with "nocompat" boot option</div><div class='del'>-</div><div class='del'>-- CONFIG_DEVFS_BOOT_OPTIONS removed: boot options always available</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v74</div><div class='del'>-</div><div class='del'>-- Removed CONFIG_DEVFS_MOUNT and "mount" boot option and replaced with</div><div class='del'>-  "nomount" boot option</div><div class='del'>-</div><div class='del'>-- Documentation updates</div><div class='del'>-</div><div class='del'>-- Updated sample modules.conf</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v75</div><div class='del'>-</div><div class='del'>-- Updated sample modules.conf</div><div class='del'>-</div><div class='del'>-- Remount devfs after initrd finishes</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.127</div><div class='del'>-</div><div class='del'>-- Added support for ISDN</div><div class='del'>-  Thanks to Christophe Leroy &lt;christophe.leroy5@capway.com&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v76</div><div class='del'>-</div><div class='del'>-- Updated an email address in ChangeLog</div><div class='del'>-</div><div class='del'>-- CONFIG_DEVFS_ONLY replaced with "only" boot option</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v77</div><div class='del'>-</div><div class='del'>-- Added DEVFS_FL_REMOVABLE flag</div><div class='del'>-</div><div class='del'>-- Check for disc change when listing directories with removable media</div><div class='del'>-  devices</div><div class='del'>-</div><div class='del'>-- Use DEVFS_FL_REMOVABLE in sd.c</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.128</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v78</div><div class='del'>-</div><div class='del'>-- Only call &lt;scan_dir_for_removable&gt; on first call to &lt;devfs_readdir&gt;</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.129-pre5</div><div class='del'>-</div><div class='del'>-- ISDN support improvements</div><div class='del'>-  Thanks to Christophe Leroy &lt;christophe.leroy5@capway.com&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v79</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.130</div><div class='del'>-</div><div class='del'>-- Renamed miscdevice "apm" to "apm_bios" to be consistent with</div><div class='del'>-  devices.txt</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v80</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.131</div><div class='del'>-</div><div class='del'>-- Updated &lt;devfs_rmdir&gt; for VFS change in 2.1.131</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v81</div><div class='del'>-</div><div class='del'>-- Fixed permissions on /dev/ptmx</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v82</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.1.132-pre4</div><div class='del'>-</div><div class='del'>-- Changed initial permissions on /dev/pts/*</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_mk_compat&gt;</div><div class='del'>-</div><div class='del'>-- Added "symlinks" boot option</div><div class='del'>-</div><div class='del'>-- Changed devfs_register_blkdev() back to register_blkdev() for IDE</div><div class='del'>-</div><div class='del'>-- Check for partitions on removable media in &lt;devfs_lookup&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v83</div><div class='del'>-</div><div class='del'>-- Fixed support for ramdisc when using string-based root FS name</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.0-pre1</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v84</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.0-pre7</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v85</div><div class='del'>-</div><div class='del'>-- Compile fixes for driver/sound/sound_common.c (non-module) and</div><div class='del'>-  drivers/isdn/isdn_common.c</div><div class='del'>-  Thanks to Christophe Leroy &lt;christophe.leroy5@capway.com&gt;</div><div class='del'>-</div><div class='del'>-- Added support for registering regular files</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_set_file_size&gt;</div><div class='del'>-</div><div class='del'>-- Added /dev/cpu/mtrr as an alternative interface to /proc/mtrr</div><div class='del'>-</div><div class='del'>-- Update devfs inodes from entries if not changed through FS</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v86</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.0-pre9</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v87</div><div class='del'>-</div><div class='del'>-- Fixed bug when mounting non-devfs devices in a devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v88</div><div class='del'>-</div><div class='del'>-- Fixed &lt;devfs_fill_file&gt; to only initialise temporary inodes</div><div class='del'>-</div><div class='del'>-- Trap for NULL fops in &lt;devfs_register&gt;</div><div class='del'>-</div><div class='del'>-- Return -ENODEV in &lt;devfs_fill_file&gt; for non-driver inodes</div><div class='del'>-</div><div class='del'>-- Fixed bug when unswapping non-devfs devices in a devfs</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v89</div><div class='del'>-</div><div class='del'>-- Switched to C data types in include/linux/devfs_fs.h</div><div class='del'>-</div><div class='del'>-- Switched from PATH_MAX to DEVFS_PATHLEN</div><div class='del'>-</div><div class='del'>-- Updated Documentation/filesystems/devfs/modules.conf to take account</div><div class='del'>-  of reverse scanning (!) by modprobe</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.0</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v90</div><div class='del'>-</div><div class='del'>-- CONFIG_DEVFS_DISABLE_OLD_TTY_NAMES replaced with "nottycompat" boot</div><div class='del'>-  option</div><div class='del'>-</div><div class='del'>-- CONFIG_DEVFS_TTY_COMPAT removed: existing "symlinks" boot option now</div><div class='del'>-  controls this. This means you must have libc 5.4.44 or later, or a</div><div class='del'>-  recent version of libc 6 if you use the "symlinks" option</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v91</div><div class='del'>-</div><div class='del'>-- Switch from &lt;devfs_mk_symlink&gt; to &lt;devfs_mk_compat&gt; in</div><div class='del'>-  drivers/char/vc_screen.c to fix problems with Midnight Commander</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v92</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.2-pre5</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v93</div><div class='del'>-</div><div class='del'>-- Modified &lt;sd_name&gt; in drivers/scsi/sd.c to cope with devices that</div><div class='del'>-  don't exist (which happens with new RAID autostart code printk()s)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v94</div><div class='del'>-</div><div class='del'>-- Fixed bug in joystick driver: only first joystick was registered</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v95</div><div class='del'>-</div><div class='del'>-- Fixed another bug in joystick driver</div><div class='del'>-</div><div class='del'>-- Fixed &lt;devfsd_read&gt; to not overrun event buffer</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v96</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.5-2</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_auto_unregister&gt;</div><div class='del'>-</div><div class='del'>-- Fixed bugs: compatibility entries were not unregistered for:</div><div class='del'>-    loop driver</div><div class='del'>-    floppy driver</div><div class='del'>-    RAMDISC driver</div><div class='del'>-    IDE tape driver</div><div class='del'>-    SCSI CD-ROM driver</div><div class='del'>-    SCSI HDD driver</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v97</div><div class='del'>-</div><div class='del'>-- Fixed bugs: compatibility entries were not unregistered for:</div><div class='del'>-    ALSA sound driver</div><div class='del'>-    partitions in generic disc driver</div><div class='del'>-</div><div class='del'>-- Don't return unregistred entries in &lt;devfs_find_handle&gt;</div><div class='del'>-</div><div class='del'>-- Panic in &lt;devfs_unregister&gt; if entry unregistered</div><div class='del'>-</div><div class='del'>-- Don't panic in &lt;devfs_auto_unregister&gt; for duplicates</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v98</div><div class='del'>-</div><div class='del'>-- Don't unregister already unregistered entries in &lt;unregister&gt;</div><div class='del'>-</div><div class='del'>-- Register entry in &lt;sd_detect&gt;</div><div class='del'>-</div><div class='del'>-- Unregister entry in &lt;sd_detach&gt;</div><div class='del'>-</div><div class='del'>-- Changed to &lt;devfs_*register_chrdev&gt; in drivers/char/tty_io.c</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.7</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v99</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.2.8</div><div class='del'>-</div><div class='del'>-- Fixed bug in drivers/scsi/sd.c when &gt;16 SCSI discs</div><div class='del'>-</div><div class='del'>-- Disable warning messages when unable to read partition table for</div><div class='del'>-  removable media</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v100</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.1-pre5</div><div class='del'>-</div><div class='del'>-- Added "oops-on-panic" boot option</div><div class='del'>-</div><div class='del'>-- Improved debugging in &lt;devfs_register&gt; and &lt;devfs_unregister&gt;</div><div class='del'>-</div><div class='del'>-- Register entry in &lt;sr_detect&gt;</div><div class='del'>-</div><div class='del'>-- Unregister entry in &lt;sr_detach&gt;</div><div class='del'>-</div><div class='del'>-- Register entry in &lt;sg_detect&gt;</div><div class='del'>-</div><div class='del'>-- Unregister entry in &lt;sg_detach&gt;</div><div class='del'>-</div><div class='del'>-- Added support for ALSA drivers</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v101</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v102</div><div class='del'>-</div><div class='del'>-- Update serial driver to register PCMCIA entries</div><div class='del'>-  Thanks to Roch-Alexandre Nomine-Beguin &lt;roch@samarkand.infini.fr&gt;</div><div class='del'>-</div><div class='del'>-- Updated an email address in ChangeLog</div><div class='del'>-</div><div class='del'>-- Hide virtual console capture entries from directory listings when</div><div class='del'>-  corresponding console device is not open</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v103</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.3</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v104</div><div class='del'>-</div><div class='del'>-- Added documentation for some functions</div><div class='del'>-</div><div class='del'>-- Added "doc" target to fs/devfs/Makefile</div><div class='del'>-</div><div class='del'>-- Added "v4l" directory for video4linux devices</div><div class='del'>-</div><div class='del'>-- Replaced call to &lt;devfs_unregister&gt; in &lt;sd_detach&gt; with call to</div><div class='del'>-  &lt;devfs_register_partitions&gt;</div><div class='del'>-</div><div class='del'>-- Moved registration for sr and sg drivers from detect() to attach()</div><div class='del'>-  methods</div><div class='del'>-</div><div class='del'>-- Register entries in &lt;st_attach&gt; and unregister in &lt;st_detach&gt;</div><div class='del'>-</div><div class='del'>-- Work around IDE driver treating CD-ROM as gendisk</div><div class='del'>-</div><div class='del'>-- Use &lt;sed&gt; instead of &lt;tr&gt; in rc.devfs</div><div class='del'>-</div><div class='del'>-- Updated ToDo list</div><div class='del'>-</div><div class='del'>-- Removed "oops-on-panic" boot option: now always Oops</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v105</div><div class='del'>-</div><div class='del'>-- Unregister SCSI host from &lt;scsi_host_no_list&gt; in &lt;scsi_unregister&gt;</div><div class='del'>-  Thanks to Zoltán Böszörményi &lt;zboszor@mail.externet.hu&gt;</div><div class='del'>-</div><div class='del'>-- Don't save /dev/log in rc.devfs</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.4-pre1</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v106</div><div class='del'>-</div><div class='del'>-- Fixed silly typo in drivers/scsi/st.c</div><div class='del'>-</div><div class='del'>-- Improved debugging in &lt;devfs_register&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v107</div><div class='del'>-</div><div class='del'>-- Added "diunlink" and "nokmod" boot options</div><div class='del'>-</div><div class='del'>-- Removed superfluous warning message in &lt;devfs_d_iput&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v108</div><div class='del'>-</div><div class='del'>-- Remove entries when unloading sound module</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v109</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.6-pre2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v110</div><div class='del'>-</div><div class='del'>-- Took account of change to &lt;d_alloc_root&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v111</div><div class='del'>-</div><div class='del'>-- Created separate event queue for each mounted devfs</div><div class='del'>-</div><div class='del'>-- Removed &lt;devfs_invalidate_dcache&gt;</div><div class='del'>-</div><div class='del'>-- Created new ioctl()s for devfsd</div><div class='del'>-</div><div class='del'>-- Incremented devfsd protocol revision to 3</div><div class='del'>-</div><div class='del'>-- Fixed bug when re-creating directories: contents were lost</div><div class='del'>-</div><div class='del'>-- Block access to inodes until devfsd updates permissions</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v112</div><div class='del'>-</div><div class='del'>-- Modified patch so it applies against 2.3.5 and 2.3.6</div><div class='del'>-</div><div class='del'>-- Updated an email address in ChangeLog</div><div class='del'>-</div><div class='del'>-- Do not automatically change ownership/protection of /dev/tty&lt;n&gt;</div><div class='del'>-</div><div class='del'>-- Updated sample modules.conf</div><div class='del'>-</div><div class='del'>-- Switched to sending process uid/gid to devfsd</div><div class='del'>-</div><div class='del'>-- Renamed &lt;call_kmod&gt; to &lt;try_modload&gt;</div><div class='del'>-</div><div class='del'>-- Added DEVFSD_NOTIFY_LOOKUP event</div><div class='del'>-</div><div class='del'>-- Added DEVFSD_NOTIFY_CHANGE event</div><div class='del'>-</div><div class='del'>-- Added DEVFSD_NOTIFY_CREATE event</div><div class='del'>-</div><div class='del'>-- Incremented devfsd protocol revision to 4</div><div class='del'>-</div><div class='del'>-- Moved kernel-specific stuff to include/linux/devfs_fs_kernel.h</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v113</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.9</div><div class='del'>-</div><div class='del'>-- Restricted permissions on some block devices</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v114</div><div class='del'>-</div><div class='del'>-- Added support for /dev/netlink</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Return EISDIR rather than EINVAL for read(2) on directories</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.10</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v115</div><div class='del'>-</div><div class='del'>-- Added support for all remaining character devices</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Cleaned up netlink support</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v116</div><div class='del'>-</div><div class='del'>-- Added support for /dev/parport%d</div><div class='del'>-  Thanks to Tim Waugh &lt;tim@cyberelk.demon.co.uk&gt;</div><div class='del'>-</div><div class='del'>-- Fixed parallel port ATAPI tape driver</div><div class='del'>-</div><div class='del'>-- Fixed Atari SLM laser printer driver</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v117</div><div class='del'>-</div><div class='del'>-- Added support for COSA card</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/ppdev.c: missing #include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/ftape/zftape/zftape-init.c</div><div class='del'>-  Thanks to Vladimir Popov &lt;mashgrad@usa.net&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v118</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.15-pre3</div><div class='del'>-</div><div class='del'>-- Fixed bug in loop driver</div><div class='del'>-</div><div class='del'>-- Unregister /dev/lp%d entries in drivers/char/lp.c</div><div class='del'>-  Thanks to Maciej W. Rozycki &lt;macro@ds2.pg.gda.pl&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v119</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.16</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v120</div><div class='del'>-</div><div class='del'>-- Fixed bug in drivers/scsi/scsi.c</div><div class='del'>-</div><div class='del'>-- Added /dev/ppp</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.17</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v121</div><div class='del'>-</div><div class='del'>-- Fixed bug in drivers/block/loop.c</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.18</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v122</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.19</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v123</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.20</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v124</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.21</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v125</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_get_info&gt;, &lt;devfs_set_info&gt;,</div><div class='del'>-  &lt;devfs_get_first_child&gt; and &lt;devfs_get_next_sibling&gt;</div><div class='del'>-  Added &lt;&lt;dir&gt;&gt; parameter to &lt;devfs_register&gt;, &lt;devfs_mk_compat&gt;,</div><div class='del'>-  &lt;devfs_mk_dir&gt; and &lt;devfs_find_handle&gt;</div><div class='del'>-  Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Fixed apparent bug in COSA driver</div><div class='del'>-</div><div class='del'>-- Re-instated "scsihosts=" boot option</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v126</div><div class='del'>-</div><div class='del'>-- Always create /dev/pts if CONFIG_UNIX98_PTYS=y</div><div class='del'>-</div><div class='del'>-- Fixed call to &lt;devfs_mk_dir&gt; in drivers/block/ide-disk.c</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Allow multiple unregistrations</div><div class='del'>-</div><div class='del'>-- Created /dev/scsi hierarchy</div><div class='del'>-  Work sponsored by SGI</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v127</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- No longer disable devpts if devfs enabled (caveat emptor)</div><div class='del'>-</div><div class='del'>-- Added flags array to struct gendisk and removed code from</div><div class='del'>-  drivers/scsi/sd.c</div><div class='del'>-</div><div class='del'>-- Created /dev/discs hierarchy</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v128</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Created /dev/cdroms hierarchy</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v129</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for sound devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for printer devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for video4linux devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for parallel port devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for frame buffer devices</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v130</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Added major and minor number to devfsd protocol</div><div class='del'>-</div><div class='del'>-- Incremented devfsd protocol revision to 5</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for SoundBlaster CD-ROMs</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for netlink devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for SCSI generic devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for SCSI tape devices</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v131</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Support info pointer for all devfs entry types</div><div class='del'>-</div><div class='del'>-- Added &lt;&lt;info&gt;&gt; parameter to &lt;devfs_mk_dir&gt; and &lt;devfs_mk_symlink&gt;</div><div class='del'>-</div><div class='del'>-- Removed /dev/st hierarchy</div><div class='del'>-</div><div class='del'>-- Removed /dev/sg hierarchy</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for loop devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for IDE tape devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for SCSI CD-ROMs</div><div class='del'>-</div><div class='del'>-- Removed /dev/sr hierarchy</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v132</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for floppy devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for RAMDISCs</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for meta-devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for SCSI discs</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_make_root&gt;</div><div class='del'>-</div><div class='del'>-- Removed /dev/sd hierarchy</div><div class='del'>-</div><div class='del'>-- Support "../" when searching devfs namespace</div><div class='del'>-</div><div class='del'>-- Created /dev/ide/host* hierarchy</div><div class='del'>-</div><div class='del'>-- Supported IDE hard discs in /dev/ide/host* hierarchy</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for IDE discs</div><div class='del'>-</div><div class='del'>-- Removed /dev/ide/hd hierarchy</div><div class='del'>-</div><div class='del'>-- Supported IDE CD-ROMs in /dev/ide/host* hierarchy</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for IDE CD-ROMs</div><div class='del'>-</div><div class='del'>-- Removed /dev/ide/cd hierarchy</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v133</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_get_unregister_slave&gt;</div><div class='del'>-</div><div class='del'>-- Fixed bug in fs/partitions/check.c when rescanning</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v134</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed /dev/sd, /dev/sr, /dev/st and /dev/sg directories</div><div class='del'>-</div><div class='del'>-- Removed /dev/ide/hd directory</div><div class='del'>-</div><div class='del'>-- Exported &lt;devfs_get_parent&gt;</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_register_tape&gt; and /dev/tapes hierarchy</div><div class='del'>-</div><div class='del'>-- Removed /dev/ide/mt hierarchy</div><div class='del'>-</div><div class='del'>-- Removed /dev/ide/fd hierarchy</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.25</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v135</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for virtual console capture devices</div><div class='del'>-</div><div class='del'>-- Removed unused &lt;devfs_set_symlink_destination&gt;</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for serial devices</div><div class='del'>-</div><div class='del'>-- Removed compatibility entries for console devices</div><div class='del'>-</div><div class='del'>-- Do not hide entries from devfsd or children</div><div class='del'>-</div><div class='del'>-- Removed DEVFS_FL_TTY_COMPAT flag</div><div class='del'>-</div><div class='del'>-- Removed "nottycompat" boot option</div><div class='del'>-</div><div class='del'>-- Removed &lt;devfs_mk_compat&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v136</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Moved BSD pty devices to /dev/pty</div><div class='del'>-</div><div class='del'>-- Added DEVFS_FL_WAIT flag</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v137</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Really fixed bug in fs/partitions/check.c when rescanning</div><div class='del'>-</div><div class='del'>-- Support new "disc" naming scheme in &lt;get_removable_partition&gt;</div><div class='del'>-</div><div class='del'>-- Allow NULL fops in &lt;devfs_register&gt;</div><div class='del'>-</div><div class='del'>-- Removed redundant name functions in SCSI disc and IDE drivers</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v138</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Fixed old bugs in drivers/block/paride/pt.c, drivers/char/tpqic02.c,</div><div class='del'>-  drivers/net/wan/cosa.c and drivers/scsi/scsi.c</div><div class='del'>-  Thanks to Sergey Kubushin &lt;ksi@ksi-linux.com&gt;</div><div class='del'>-</div><div class='del'>-- Fall back to major table if NULL fops given to &lt;devfs_register&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v139</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Corrected and moved &lt;get_blkfops&gt; and &lt;get_chrfops&gt; declarations</div><div class='del'>-  from arch/alpha/kernel/osf_sys.c to include/linux/fs.h</div><div class='del'>-</div><div class='del'>-- Removed name function from struct gendisk</div><div class='del'>-</div><div class='del'>-- Updated devfs FAQ</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v140</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.27</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v141</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Bug fix in arch/m68k/atari/joystick.c</div><div class='del'>-</div><div class='del'>-- Moved ISDN and capi devices to /dev/isdn</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v142</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Bug fix in drivers/block/ide-probe.c (patch confusion)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v143</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Bug fix in drivers/block/blkpg.c:partition_name()</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v144</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.29</div><div class='del'>-</div><div class='del'>-- Removed calls to &lt;devfs_register&gt; from cdu31a, cm206, mcd and mcdx</div><div class='del'>-  CD-ROM drivers: generic driver handles this now</div><div class='del'>-</div><div class='del'>-- Moved joystick devices to /dev/joysticks</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v145</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.30-pre3</div><div class='del'>-</div><div class='del'>-- Register whole-disc entry even for invalid partition tables</div><div class='del'>-</div><div class='del'>-- Fixed bug in mounting root FS when initrd enabled</div><div class='del'>-</div><div class='del'>-- Fixed device entry leak with IDE CD-ROMs</div><div class='del'>-</div><div class='del'>-- Fixed compile problem with drivers/isdn/isdn_common.c</div><div class='del'>-</div><div class='del'>-- Moved COSA devices to /dev/cosa</div><div class='del'>-</div><div class='del'>-- Support fifos when unregistering</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_register_series&gt; and used in many drivers</div><div class='del'>-</div><div class='del'>-- Moved Coda devices to /dev/coda</div><div class='del'>-</div><div class='del'>-- Moved parallel port IDE tapes to /dev/pt</div><div class='del'>-</div><div class='del'>-- Moved parallel port IDE generic devices to /dev/pg</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v146</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed obsolete DEVFS_FL_COMPAT and DEVFS_FL_TOLERANT flags</div><div class='del'>-</div><div class='del'>-- Fixed compile problem with fs/coda/psdev.c</div><div class='del'>-</div><div class='del'>-- Reinstate change to &lt;devfs_register_blkdev&gt; in</div><div class='del'>-  drivers/block/ide-probe.c now that fs/isofs/inode.c is fixed</div><div class='del'>-</div><div class='del'>-- Switched to &lt;devfs_register_blkdev&gt; in drivers/block/floppy.c,</div><div class='del'>-  drivers/scsi/sr.c and drivers/block/md.c</div><div class='del'>-</div><div class='del'>-- Moved DAC960 devices to /dev/dac960</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v147</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.32-pre4</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v148</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed kmod support: use devfsd instead</div><div class='del'>-</div><div class='del'>-- Moved miscellaneous character devices to /dev/misc</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v149</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ensure include/linux/joystick.h is OK for user-space</div><div class='del'>-</div><div class='del'>-- Improved debugging in &lt;get_vfs_inode&gt;</div><div class='del'>-</div><div class='del'>-- Ensure dentries created by devfsd will be cleaned up</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v150</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.34</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v151</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.35-pre1</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_get_name&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v152</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Updated sample modules.conf</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.36-pre1</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v153</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.42</div><div class='del'>-</div><div class='del'>-- Removed &lt;devfs_fill_file&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v154</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Took account of device number changes for /dev/fb*</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v155</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.43-pre8</div><div class='del'>-</div><div class='del'>-- Moved /dev/tty0 to /dev/vc/0</div><div class='del'>-</div><div class='del'>-- Moved sequence number formatting from &lt;_tty_make_name&gt; to drivers</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v156</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Fixed breakage in drivers/scsi/sd.c due to recent SCSI changes</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v157</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.45</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v158</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.46-pre2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v159</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Fixed drivers/block/md.c</div><div class='del'>-  Thanks to Mike Galbraith &lt;mikeg@weiden.de&gt;</div><div class='del'>-</div><div class='del'>-- Documentation fixes</div><div class='del'>-</div><div class='del'>-- Moved device registration from &lt;lp_init&gt; to &lt;lp_register&gt;</div><div class='del'>-  Thanks to Tim Waugh &lt;twaugh@redhat.com&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v160</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/joystick/joystick.c</div><div class='del'>-  Thanks to Vojtech Pavlik &lt;vojtech@suse.cz&gt;</div><div class='del'>-</div><div class='del'>-- Documentation updates</div><div class='del'>-</div><div class='del'>-- Fixed arch/i386/kernel/mtrr.c if procfs and devfs not enabled</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/stallion.c</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v161</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Remove /dev/ide when ide-mod is unloaded</div><div class='del'>-</div><div class='del'>-- Fixed bug in drivers/block/ide-probe.c when secondary but no primary</div><div class='del'>-</div><div class='del'>-- Added DEVFS_FL_NO_PERSISTENCE flag</div><div class='del'>-</div><div class='del'>-- Used new DEVFS_FL_NO_PERSISTENCE flag for Unix98 pty slaves</div><div class='del'>-</div><div class='del'>-- Removed unnecessary call to &lt;update_devfs_inode_from_entry&gt; in</div><div class='del'>-  &lt;devfs_readdir&gt;</div><div class='del'>-</div><div class='del'>-- Only set auto-ownership for /dev/pty/s*</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v162</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Set inode-&gt;i_size to correct size for symlinks</div><div class='del'>-  Thanks to Jeremy Fitzhardinge &lt;jeremy@goop.org&gt;</div><div class='del'>-</div><div class='del'>-- Only give lookup() method to directories to comply with new VFS</div><div class='del'>-  assumptions</div><div class='del'>-</div><div class='del'>-- Remove unnecessary tests in symlink methods</div><div class='del'>-</div><div class='del'>-- Don't kill existing block ops in &lt;devfs_read_inode&gt;</div><div class='del'>-</div><div class='del'>-- Restore auto-ownership for /dev/pty/m*</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v163</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Don't create missing directories in &lt;devfs_find_handle&gt;</div><div class='del'>-</div><div class='del'>-- Removed Documentation/filesystems/devfs/mk-devlinks</div><div class='del'>-</div><div class='del'>-- Updated Documentation/filesystems/devfs/README</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v164</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Fixed CONFIG_DEVFS breakage in drivers/char/serial.c introduced in</div><div class='del'>-  linux-2.3.99-pre6-7</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v165</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.3.99-pre6</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v166</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Added CONFIG_DEVFS_MOUNT</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v167</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Updated Documentation/filesystems/devfs/README</div><div class='del'>-</div><div class='del'>-- Updated sample modules.conf</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v168</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Disabled multi-mount capability (use VFS bindings instead)</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v169</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Removed multi-mount code</div><div class='del'>-</div><div class='del'>-- Removed compatibility macros: VFS has changed too much</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v170</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Merged devfs inode into devfs entry</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v171</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Updated sample modules.conf</div><div class='del'>-</div><div class='del'>-- Removed dead code in &lt;devfs_register&gt; which used to call</div><div class='del'>-  &lt;free_dentries&gt;</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.4.0-test2-pre3</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v172</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Changed interface to &lt;devfs_register&gt;</div><div class='del'>-</div><div class='del'>-- Changed interface to &lt;devfs_register_series&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v173</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Simplified interface to &lt;devfs_mk_symlink&gt;</div><div class='del'>-</div><div class='del'>-- Simplified interface to &lt;devfs_mk_dir&gt;</div><div class='del'>-</div><div class='del'>-- Simplified interface to &lt;devfs_find_handle&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v174</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v175</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- DocBook update for fs/devfs/base.c</div><div class='del'>-  Thanks to Tim Waugh &lt;twaugh@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-- Removed stale fs/tunnel.c (was never used or completed)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v176</div><div class='del'>-</div><div class='del'>-Work sponsored by SGI</div><div class='del'>-</div><div class='del'>-- Updated ToDo list</div><div class='del'>-</div><div class='del'>-- Removed sample modules.conf: now distributed with devfsd</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.4.0-test3-pre4 (which had devfs-patch-v174)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v177</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Documentation cleanups</div><div class='del'>-</div><div class='del'>-- Ensure &lt;devfs_generate_path&gt; terminates string for root entry</div><div class='del'>-  Thanks to Tim Jansen &lt;tim@tjansen.de&gt;</div><div class='del'>-</div><div class='del'>-- Exported &lt;devfs_get_name&gt; to modules</div><div class='del'>-</div><div class='del'>-- Make &lt;devfs_mk_symlink&gt; send events to devfsd</div><div class='del'>-</div><div class='del'>-- Cleaned up option processing in &lt;devfs_setup&gt;</div><div class='del'>-</div><div class='del'>-- Fixed bugs in handling symlinks: could leak or cause Oops</div><div class='del'>-</div><div class='del'>-- Cleaned up directory handling by separating fops</div><div class='del'>-  Thanks to Alexander Viro &lt;viro@parcelfarce.linux.theplanet.co.uk&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v178</div><div class='del'>-</div><div class='del'>-- Fixed handling of inverted options in &lt;devfs_setup&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v179</div><div class='del'>-</div><div class='del'>-- Adjusted &lt;try_modload&gt; to account for &lt;devfs_generate_path&gt; fix</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v180</div><div class='del'>-</div><div class='del'>-- Fixed !CONFIG_DEVFS_FS stub declaration of &lt;devfs_get_info&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v181</div><div class='del'>-</div><div class='del'>-- Answered question posed by Al Viro and removed his comments from &lt;devfs_open&gt;</div><div class='del'>-</div><div class='del'>-- Moved setting of registered flag after other fields are changed</div><div class='del'>-</div><div class='del'>-- Fixed race between &lt;devfsd_close&gt; and &lt;devfsd_notify_one&gt;</div><div class='del'>-</div><div class='del'>-- Global VFS changes added bogus BKL to devfsd_close(): removed</div><div class='del'>-</div><div class='del'>-- Widened locking in &lt;devfs_readlink&gt; and &lt;devfs_follow_link&gt;</div><div class='del'>-</div><div class='del'>-- Replaced &lt;devfsd_read&gt; stack usage with &lt;devfsd_ioctl&gt; kmalloc</div><div class='del'>-</div><div class='del'>-- Simplified locking in &lt;devfsd_ioctl&gt; and fixed memory leak</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v182</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_*alloc_major&gt; and &lt;devfs_*alloc_devnum&gt;</div><div class='del'>-</div><div class='del'>-- Removed broken devnum allocation and use &lt;devfs_alloc_devnum&gt;</div><div class='del'>-</div><div class='del'>-- Fixed old devnum leak by calling new &lt;devfs_dealloc_devnum&gt;</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_*alloc_unique_number&gt;</div><div class='del'>-</div><div class='del'>-- Fixed number leak for /dev/cdroms/cdrom%d</div><div class='del'>-</div><div class='del'>-- Fixed number leak for /dev/discs/disc%d</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v183</div><div class='del'>-</div><div class='del'>-- Fixed bug in &lt;devfs_setup&gt; which could hang boot process</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v184</div><div class='del'>-</div><div class='del'>-- Documentation typo fix for fs/devfs/util.c</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/stallion.c for devfs</div><div class='del'>-</div><div class='del'>-- Added DEVFSD_NOTIFY_DELETE event</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Removed #include &lt;asm/segment.h&gt; from fs/devfs/base.c</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v185</div><div class='del'>-</div><div class='del'>-- Made &lt;block_semaphore&gt; and &lt;char_semaphore&gt; in fs/devfs/util.c</div><div class='del'>-  private</div><div class='del'>-</div><div class='del'>-- Fixed inode table races by removing it and using inode-&gt;u.generic_ip</div><div class='del'>-  instead</div><div class='del'>-</div><div class='del'>-- Moved &lt;devfs_read_inode&gt; into &lt;get_vfs_inode&gt;</div><div class='del'>-</div><div class='del'>-- Moved &lt;devfs_write_inode&gt; into &lt;devfs_notify_change&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v186</div><div class='del'>-</div><div class='del'>-- Fixed race in &lt;devfs_do_symlink&gt; for uni-processor</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v187</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/stallion.c for devfs</div><div class='del'>-</div><div class='del'>-- Fixed drivers/char/rocket.c for devfs</div><div class='del'>-</div><div class='del'>-- Fixed bug in &lt;devfs_alloc_unique_number&gt;: limited to 128 numbers</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v188</div><div class='del'>-</div><div class='del'>-- Updated major masks in fs/devfs/util.c up to Linus' "no new majors"</div><div class='del'>-  proclamation. Block: were 126 now 122 free, char: were 26 now 19 free</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Removed remnant of multi-mount support in &lt;devfs_mknod&gt;</div><div class='del'>-</div><div class='del'>-- Removed unused DEVFS_FL_SHOW_UNREG flag</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v189</div><div class='del'>-</div><div class='del'>-- Removed nlink field from struct devfs_inode</div><div class='del'>-</div><div class='del'>-- Removed auto-ownership for /dev/pty/* (BSD ptys) and used</div><div class='del'>-  DEVFS_FL_CURRENT_OWNER|DEVFS_FL_NO_PERSISTENCE for /dev/pty/s* (just</div><div class='del'>-  like Unix98 pty slaves) and made /dev/pty/m* rw-rw-rw- access</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v190</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Replaced BKL with global rwsem to protect symlink data (quick and</div><div class='del'>-  dirty hack)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v191</div><div class='del'>-</div><div class='del'>-- Replaced global rwsem for symlink with per-link refcount</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v192</div><div class='del'>-</div><div class='del'>-- Removed unnecessary #ifdef CONFIG_DEVFS_FS from arch/i386/kernel/mtrr.c</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.4.10-pre11</div><div class='del'>-</div><div class='del'>-- Set inode-&gt;i_mapping-&gt;a_ops for block nodes in &lt;get_vfs_inode&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v193</div><div class='del'>-</div><div class='del'>-- Went back to global rwsem for symlinks (refcount scheme no good)</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v194</div><div class='del'>-</div><div class='del'>-- Fixed overrun in &lt;devfs_link&gt; by removing function (not needed)</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v195</div><div class='del'>-</div><div class='del'>-- Fixed buffer underrun in &lt;try_modload&gt;</div><div class='del'>-</div><div class='del'>-- Moved down_read() from &lt;search_for_entry_in_dir&gt; to &lt;find_entry&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v196</div><div class='del'>-</div><div class='del'>-- Fixed race in &lt;devfsd_ioctl&gt; when setting event mask</div><div class='del'>-  Thanks to Kari Hurtta &lt;hurtta@leija.mh.fmi.fi&gt;</div><div class='del'>-</div><div class='del'>-- Avoid deadlock in &lt;devfs_follow_link&gt; by using temporary buffer</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v197</div><div class='del'>-</div><div class='del'>-- First release of new locking code for devfs core (v1.0)</div><div class='del'>-</div><div class='del'>-- Fixed bug in drivers/cdrom/cdrom.c</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v198</div><div class='del'>-</div><div class='del'>-- Discard temporary buffer, now use "%s" for dentry names</div><div class='del'>-</div><div class='del'>-- Don't generate path in &lt;try_modload&gt;: use fake entry instead</div><div class='del'>-</div><div class='del'>-- Use "existing" directory in &lt;_devfs_make_parent_for_leaf&gt;</div><div class='del'>-</div><div class='del'>-- Use slab cache rather than fixed buffer for devfsd events</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v199</div><div class='del'>-</div><div class='del'>-- Removed obsolete usage of DEVFS_FL_NO_PERSISTENCE</div><div class='del'>-</div><div class='del'>-- Send DEVFSD_NOTIFY_REGISTERED events in &lt;devfs_mk_dir&gt;</div><div class='del'>-</div><div class='del'>-- Fixed locking bug in &lt;devfs_d_revalidate_wait&gt; due to typo</div><div class='del'>-</div><div class='del'>-- Do not send CREATE, CHANGE, ASYNC_OPEN or DELETE events from devfsd</div><div class='del'>-  or children</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v200</div><div class='del'>-</div><div class='del'>-- Ported to kernel 2.5.1-pre2</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v201</div><div class='del'>-</div><div class='del'>-- Fixed bug in &lt;devfsd_read&gt;: was dereferencing freed pointer</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v202</div><div class='del'>-</div><div class='del'>-- Fixed bug in &lt;devfsd_close&gt;: was dereferencing freed pointer</div><div class='del'>-</div><div class='del'>-- Added process group check for devfsd privileges</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v203</div><div class='del'>-</div><div class='del'>-- Use SLAB_ATOMIC in &lt;devfsd_notify_de&gt; from &lt;devfs_d_delete&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v204</div><div class='del'>-</div><div class='del'>-- Removed long obsolete rc.devfs</div><div class='del'>-</div><div class='del'>-- Return old entry in &lt;devfs_mk_dir&gt; for 2.4.x kernels</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Increment refcount on module in &lt;check_disc_changed&gt;</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_get_handle&gt; and exported &lt;devfs_put&gt;</div><div class='del'>-</div><div class='del'>-- Increment refcount on module in &lt;devfs_get_ops&gt;</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_put_ops&gt; and used where needed to fix races</div><div class='del'>-</div><div class='del'>-- Added clarifying comments in response to preliminary EMC code review</div><div class='del'>-</div><div class='del'>-- Added poisoning to &lt;devfs_put&gt;</div><div class='del'>-</div><div class='del'>-- Improved debugging messages</div><div class='del'>-</div><div class='del'>-- Fixed unregister bugs in drivers/md/lvm-fs.c</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v205</div><div class='del'>-</div><div class='del'>-- Corrected (made useful) debugging message in &lt;unregister&gt;</div><div class='del'>-</div><div class='del'>-- Moved &lt;kmem_cache_create&gt; in &lt;mount_devfs_fs&gt; to &lt;init_devfs_fs&gt;</div><div class='del'>-</div><div class='del'>-- Fixed drivers/md/lvm-fs.c to create "lvm" entry</div><div class='del'>-</div><div class='del'>-- Added magic number to guard against scribbling drivers</div><div class='del'>-</div><div class='del'>-- Only return old entry in &lt;devfs_mk_dir&gt; if a directory</div><div class='del'>-</div><div class='del'>-- Defined macros for error and debug messages</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v206</div><div class='del'>-</div><div class='del'>-- Added support for multiple Compaq cpqarray controllers</div><div class='del'>-</div><div class='del'>-- Fixed (rare, old) race in &lt;devfs_lookup&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v207</div><div class='del'>-</div><div class='del'>-- Fixed deadlock bug in &lt;devfs_d_revalidate_wait&gt;</div><div class='del'>-</div><div class='del'>-- Tag VFS deletable in &lt;devfs_mk_symlink&gt; if handle ignored</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v208</div><div class='del'>-</div><div class='del'>-- Added KERN_* to remaining messages</div><div class='del'>-</div><div class='del'>-- Cleaned up declaration of &lt;stat_read&gt;</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v209</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Removed silently introduced calls to lock_kernel() and</div><div class='del'>-  unlock_kernel() due to recent VFS locking changes. BKL isn't</div><div class='del'>-  required in devfs </div><div class='del'>-</div><div class='del'>-- Changed &lt;devfs_rmdir&gt; to allow later additions if not yet empty</div><div class='del'>-</div><div class='del'>-- Added calls to &lt;devfs_register_partitions&gt; in drivers/block/blkpc.c</div><div class='del'>-  &lt;add_partition&gt; and &lt;del_partition&gt;</div><div class='del'>-</div><div class='del'>-- Fixed bug in &lt;devfs_alloc_unique_number&gt;: was clearing beyond</div><div class='del'>-  bitfield</div><div class='del'>-</div><div class='del'>-- Fixed bitfield data type for &lt;devfs_*alloc_devnum&gt;</div><div class='del'>-</div><div class='del'>-- Made major bitfield type and initialiser 64 bit safe</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v210</div><div class='del'>-</div><div class='del'>-- Updated fs/devfs/util.c to fix shift warning on 64 bit machines</div><div class='del'>-  Thanks to Anton Blanchard &lt;anton@samba.org&gt;</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v211</div><div class='del'>-</div><div class='del'>-- Do not put miscellaneous character devices in /dev/misc if they</div><div class='del'>-  specify their own directory (i.e. contain a '/' character)</div><div class='del'>-</div><div class='del'>-- Copied macro for error messages from fs/devfs/base.c to</div><div class='del'>-  fs/devfs/util.c and made use of this macro</div><div class='del'>-</div><div class='del'>-- Removed 2.4.x compatibility code from fs/devfs/base.c</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v212</div><div class='del'>-</div><div class='del'>-- Added BKL to &lt;devfs_open&gt; because drivers still need it</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v213</div><div class='del'>-</div><div class='del'>-- Protected &lt;scan_dir_for_removable&gt; and &lt;get_removable_partition&gt;</div><div class='del'>-  from changing directory contents</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v214</div><div class='del'>-</div><div class='del'>-- Switched to ISO C structure field initialisers</div><div class='del'>-</div><div class='del'>-- Switch to set_current_state() and move before add_wait_queue()</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Fixed devfs entry leak in &lt;devfs_readdir&gt; when *readdir fails</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v215</div><div class='del'>-</div><div class='del'>-- Created &lt;devfs_find_and_unregister&gt;</div><div class='del'>-</div><div class='del'>-- Switched many functions from &lt;devfs_find_handle&gt; to</div><div class='del'>-  &lt;devfs_find_and_unregister&gt;</div><div class='del'>-</div><div class='del'>-- Switched many functions from &lt;devfs_find_handle&gt; to &lt;devfs_get_handle&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v216</div><div class='del'>-</div><div class='del'>-- Switched arch/ia64/sn/io/hcl.c from &lt;devfs_find_handle&gt; to</div><div class='del'>-  &lt;devfs_get_handle&gt;</div><div class='del'>-</div><div class='del'>-- Removed deprecated &lt;devfs_find_handle&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v217</div><div class='del'>-</div><div class='del'>-- Exported &lt;devfs_find_and_unregister&gt; and &lt;devfs_only&gt; to modules</div><div class='del'>-</div><div class='del'>-- Updated README from master HTML file</div><div class='del'>-</div><div class='del'>-- Fixed module unload race in &lt;devfs_open&gt;</div><div class='del'>-===============================================================================</div><div class='del'>-Changes for patch v218</div><div class='del'>-</div><div class='del'>-- Removed DEVFS_FL_AUTO_OWNER flag</div><div class='del'>-</div><div class='del'>-- Switched lingering structure field initialiser to ISO C</div><div class='del'>-</div><div class='del'>-- Added locking when setting/clearing flags</div><div class='del'>-</div><div class='del'>-- Documentation fix in fs/devfs/util.c</div><div class='head'>diff --git a/Documentation/filesystems/devfs/README b/Documentation/filesystems/devfs/README<br/>deleted file mode 100644<br/>index aabfba24bc2e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/devfs/README?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1959 +0,0 @@</div><div class='del'>-Devfs (Device File System) FAQ</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Linux Devfs (Device File System) FAQ</div><div class='del'>-Richard Gooch</div><div class='del'>-20-AUG-2002</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Document languages:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-NOTE: the master copy of this document is available online at:</div><div class='del'>-</div><div class='del'>-http://www.atnf.csiro.au/~rgooch/linux/docs/devfs.html</div><div class='del'>-and looks much better than the text version distributed with the</div><div class='del'>-kernel sources. A mirror site is available at:</div><div class='del'>-</div><div class='del'>-http://www.ras.ucalgary.ca/~rgooch/linux/docs/devfs.html</div><div class='del'>-</div><div class='del'>-There is also an optional daemon that may be used with devfs. You can</div><div class='del'>-find out more about it at:</div><div class='del'>-</div><div class='del'>-http://www.atnf.csiro.au/~rgooch/linux/</div><div class='del'>-</div><div class='del'>-A mailing list is available which you may subscribe to. Send</div><div class='del'>-email</div><div class='del'>-to majordomo@oss.sgi.com with the following line in the</div><div class='del'>-body of the message:</div><div class='del'>-subscribe devfs</div><div class='del'>-To unsubscribe, send the message body:</div><div class='del'>-unsubscribe devfs</div><div class='del'>-instead. The list is archived at</div><div class='del'>-</div><div class='del'>-http://oss.sgi.com/projects/devfs/archive/.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Contents</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-What is it?</div><div class='del'>-</div><div class='del'>-Why do it?</div><div class='del'>-</div><div class='del'>-Who else does it?</div><div class='del'>-</div><div class='del'>-How it works</div><div class='del'>-</div><div class='del'>-Operational issues (essential reading)</div><div class='del'>-</div><div class='del'>-Instructions for the impatient</div><div class='del'>-Permissions persistence across reboots</div><div class='del'>-Dealing with drivers without devfs support</div><div class='del'>-All the way with Devfs</div><div class='del'>-Other Issues</div><div class='del'>-Kernel Naming Scheme</div><div class='del'>-Devfsd Naming Scheme</div><div class='del'>-Old Compatibility Names</div><div class='del'>-SCSI Host Probing Issues</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device drivers currently ported</div><div class='del'>-</div><div class='del'>-Allocation of Device Numbers</div><div class='del'>-</div><div class='del'>-Questions and Answers</div><div class='del'>-</div><div class='del'>-Making things work</div><div class='del'>-Alternatives to devfs</div><div class='del'>-What I don't like about devfs</div><div class='del'>-How to report bugs</div><div class='del'>-Strange kernel messages</div><div class='del'>-Compilation problems with devfsd</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Other resources</div><div class='del'>-</div><div class='del'>-Translations of this document</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-What is it?</div><div class='del'>-</div><div class='del'>-Devfs is an alternative to "real" character and block special devices</div><div class='del'>-on your root filesystem. Kernel device drivers can register devices by</div><div class='del'>-name rather than major and minor numbers. These devices will appear in</div><div class='del'>-devfs automatically, with whatever default ownership and</div><div class='del'>-protection the driver specified. A daemon (devfsd) can be used to</div><div class='del'>-override these defaults. Devfs has been in the kernel since 2.3.46.</div><div class='del'>-</div><div class='del'>-NOTE that devfs is entirely optional. If you prefer the old</div><div class='del'>-disc-based device nodes, then simply leave CONFIG_DEVFS_FS=n (the</div><div class='del'>-default). In this case, nothing will change.  ALSO NOTE that if you do</div><div class='del'>-enable devfs, the defaults are such that full compatibility is</div><div class='del'>-maintained with the old devices names.</div><div class='del'>-</div><div class='del'>-There are two aspects to devfs: one is the underlying device</div><div class='del'>-namespace, which is a namespace just like any mounted filesystem. The</div><div class='del'>-other aspect is the filesystem code which provides a view of the</div><div class='del'>-device namespace. The reason I make a distinction is because devfs</div><div class='del'>-can be mounted many times, with each mount showing the same device</div><div class='del'>-namespace. Changes made are global to all mounted devfs filesystems.</div><div class='del'>-Also, because the devfs namespace exists without any devfs mounts, you</div><div class='del'>-can easily mount the root filesystem by referring to an entry in the</div><div class='del'>-devfs namespace.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The cost of devfs is a small increase in kernel code size and memory</div><div class='del'>-usage. About 7 pages of code (some of that in __init sections) and 72</div><div class='del'>-bytes for each entry in the namespace. A modest system has only a</div><div class='del'>-couple of hundred device entries, so this costs a few more</div><div class='del'>-pages. Compare this with the suggestion to put /dev on a &lt;a</div><div class='del'>-href="#why-faq-ramdisc"&gt;ramdisc.</div><div class='del'>-</div><div class='del'>-On a typical machine, the cost is under 0.2 percent. On a modest</div><div class='del'>-system with 64 MBytes of RAM, the cost is under 0.1 percent.  The</div><div class='del'>-accusations of "bloatware" levelled at devfs are not justified.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Why do it?</div><div class='del'>-</div><div class='del'>-There are several problems that devfs addresses. Some of these</div><div class='del'>-problems are more serious than others (depending on your point of</div><div class='del'>-view), and some can be solved without devfs. However, the totality of</div><div class='del'>-these problems really calls out for devfs.</div><div class='del'>-</div><div class='del'>-The choice is a patchwork of inefficient user space solutions, which</div><div class='del'>-are complex and likely to be fragile, or to use a simple and efficient</div><div class='del'>-devfs which is robust.</div><div class='del'>-</div><div class='del'>-There have been many counter-proposals to devfs, all seeking to</div><div class='del'>-provide some of the benefits without actually implementing devfs. So</div><div class='del'>-far there has been an absence of code and no proposed alternative has</div><div class='del'>-been able to provide all the features that devfs does. Further,</div><div class='del'>-alternative proposals require far more complexity in user-space (and</div><div class='del'>-still deliver less functionality than devfs). Some people have the</div><div class='del'>-mantra of reducing "kernel bloat", but don't consider the effects on</div><div class='del'>-user-space.</div><div class='del'>-</div><div class='del'>-A good solution limits the total complexity of kernel-space and</div><div class='del'>-user-space.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Major&amp;minor allocation</div><div class='del'>-</div><div class='del'>-The existing scheme requires the allocation of major and minor device</div><div class='del'>-numbers for each and every device. This means that a central</div><div class='del'>-co-ordinating authority is required to issue these device numbers</div><div class='del'>-(unless you're developing a "private" device driver), in order to</div><div class='del'>-preserve uniqueness. Devfs shifts the burden to a namespace. This may</div><div class='del'>-not seem like a huge benefit, but actually it is. Since driver authors</div><div class='del'>-will naturally choose a device name which reflects the functionality</div><div class='del'>-of the device, there is far less potential for namespace conflict.</div><div class='del'>-Solving this requires a kernel change.</div><div class='del'>-</div><div class='del'>-/dev management</div><div class='del'>-</div><div class='del'>-Because you currently access devices through device nodes, these must</div><div class='del'>-be created by the system administrator. For standard devices you can</div><div class='del'>-usually find a MAKEDEV programme which creates all these (hundreds!)</div><div class='del'>-of nodes. This means that changes in the kernel must be reflected by</div><div class='del'>-changes in the MAKEDEV programme, or else the system administrator</div><div class='del'>-creates device nodes by hand.</div><div class='del'>-</div><div class='del'>-The basic problem is that there are two separate databases of</div><div class='del'>-major and minor numbers. One is in the kernel and one is in /dev (or</div><div class='del'>-in a MAKEDEV programme, if you want to look at it that way). This is</div><div class='del'>-duplication of information, which is not good practice.</div><div class='del'>-Solving this requires a kernel change.</div><div class='del'>-</div><div class='del'>-/dev growth</div><div class='del'>-</div><div class='del'>-A typical /dev has over 1200 nodes! Most of these devices simply don't</div><div class='del'>-exist because the hardware is not available. A huge /dev increases the</div><div class='del'>-time to access devices (I'm just referring to the dentry lookup times</div><div class='del'>-and the time taken to read inodes off disc: the next subsection shows</div><div class='del'>-some more horrors).</div><div class='del'>-</div><div class='del'>-An example of how big /dev can grow is if we consider SCSI devices:</div><div class='del'>-</div><div class='del'>-host           6  bits  (say up to 64 hosts on a really big machine)</div><div class='del'>-channel        4  bits  (say up to 16 SCSI buses per host)</div><div class='del'>-id             4  bits</div><div class='del'>-lun            3  bits</div><div class='del'>-partition      6  bits</div><div class='del'>-TOTAL          23 bits</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This requires 8 Mega (1024*1024) inodes if we want to store all</div><div class='del'>-possible device nodes. Even if we scrap everything but id,partition</div><div class='del'>-and assume a single host adapter with a single SCSI bus and only one</div><div class='del'>-logical unit per SCSI target (id), that's still 10 bits or 1024</div><div class='del'>-inodes. Each VFS inode takes around 256 bytes (kernel 2.1.78), so</div><div class='del'>-that's 256 kBytes of inode storage on disc (assuming real inodes take</div><div class='del'>-a similar amount of space as VFS inodes). This is actually not so bad,</div><div class='del'>-because disc is cheap these days. Embedded systems would care about</div><div class='del'>-256 kBytes of /dev inodes, but you could argue that embedded systems</div><div class='del'>-would have hand-tuned /dev directories. I've had to do just that on my</div><div class='del'>-embedded systems, but I would rather just leave it to devfs.</div><div class='del'>-</div><div class='del'>-Another issue is the time taken to lookup an inode when first</div><div class='del'>-referenced. Not only does this take time in scanning through a list in</div><div class='del'>-memory, but also the seek times to read the inodes off disc.</div><div class='del'>-This could be solved in user-space using a clever programme which</div><div class='del'>-scanned the kernel logs and deleted /dev entries which are not</div><div class='del'>-available and created them when they were available. This programme</div><div class='del'>-would need to be run every time a new module was loaded, which would</div><div class='del'>-slow things down a lot.</div><div class='del'>-</div><div class='del'>-There is an existing programme called scsidev which will automatically</div><div class='del'>-create device nodes for SCSI devices. It can do this by scanning files</div><div class='del'>-in /proc/scsi. Unfortunately, to extend this idea to other device</div><div class='del'>-nodes would require significant modifications to existing drivers (so</div><div class='del'>-they too would provide information in /proc). This is a non-trivial</div><div class='del'>-change (I should know: devfs has had to do something similar). Once</div><div class='del'>-you go to this much effort, you may as well use devfs itself (which</div><div class='del'>-also provides this information).  Furthermore, such a system would</div><div class='del'>-likely be implemented in an ad-hoc fashion, as different drivers will</div><div class='del'>-provide their information in different ways.</div><div class='del'>-</div><div class='del'>-Devfs is much cleaner, because it (naturally) has a uniform mechanism</div><div class='del'>-to provide this information: the device nodes themselves!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Node to driver file_operations translation</div><div class='del'>-</div><div class='del'>-There is an important difference between the way disc-based character</div><div class='del'>-and block nodes and devfs entries make the connection between an entry</div><div class='del'>-in /dev and the actual device driver.</div><div class='del'>-</div><div class='del'>-With the current 8 bit major and minor numbers the connection between</div><div class='del'>-disc-based c&amp;b nodes and per-major drivers is done through a</div><div class='del'>-fixed-length table of 128 entries. The various filesystem types set</div><div class='del'>-the inode operations for c&amp;b nodes to {chr,blk}dev_inode_operations,</div><div class='del'>-so when a device is opened a few quick levels of indirection bring us</div><div class='del'>-to the driver file_operations.</div><div class='del'>-</div><div class='del'>-For miscellaneous character devices a second step is required: there</div><div class='del'>-is a scan for the driver entry with the same minor number as the file</div><div class='del'>-that was opened, and the appropriate minor open method is called. This</div><div class='del'>-scanning is done *every time* you open a device node. Potentially, you</div><div class='del'>-may be searching through dozens of misc. entries before you find your</div><div class='del'>-open method. While not an enormous performance overhead, this does</div><div class='del'>-seem pointless.</div><div class='del'>-</div><div class='del'>-Linux *must* move beyond the 8 bit major and minor barrier,</div><div class='del'>-somehow. If we simply increase each to 16 bits, then the indexing</div><div class='del'>-scheme used for major driver lookup becomes untenable, because the</div><div class='del'>-major tables (one each for character and block devices) would need to</div><div class='del'>-be 64 k entries long (512 kBytes on x86, 1 MByte for 64 bit</div><div class='del'>-systems). So we would have to use a scheme like that used for</div><div class='del'>-miscellaneous character devices, which means the search time goes up</div><div class='del'>-linearly with the average number of major device drivers on your</div><div class='del'>-system. Not all "devices" are hardware, some are higher-level drivers</div><div class='del'>-like KGI, so you can get more "devices" without adding hardware</div><div class='del'>-You can improve this by creating an ordered (balanced:-)</div><div class='del'>-binary tree, in which case your search time becomes log(N).</div><div class='del'>-Alternatively, you can use hashing to speed up the search.</div><div class='del'>-But why do that search at all if you don't have to? Once again, it</div><div class='del'>-seems pointless.</div><div class='del'>-</div><div class='del'>-Note that devfs doesn't use the major&amp;minor system. For devfs</div><div class='del'>-entries, the connection is done when you lookup the /dev entry. When</div><div class='del'>-devfs_register() is called, an internal table is appended which has</div><div class='del'>-the entry name and the file_operations. If the dentry cache doesn't</div><div class='del'>-have the /dev entry already, this internal table is scanned to get the</div><div class='del'>-file_operations, and an inode is created. If the dentry cache already</div><div class='del'>-has the entry, there is *no lookup time* (other than the dentry scan</div><div class='del'>-itself, but we can't avoid that anyway, and besides Linux dentries</div><div class='del'>-cream other OS's which don't have them:-). Furthermore, the number of</div><div class='del'>-node entries in a devfs is only the number of available device</div><div class='del'>-entries, not the number of *conceivable* entries. Even if you remove</div><div class='del'>-unnecessary entries in a disc-based /dev, the number of conceivable</div><div class='del'>-entries remains the same: you just limit yourself in order to save</div><div class='del'>-space.</div><div class='del'>-</div><div class='del'>-Devfs provides a fast connection between a VFS node and the device</div><div class='del'>-driver, in a scalable way.</div><div class='del'>-</div><div class='del'>-/dev as a system administration tool</div><div class='del'>-</div><div class='del'>-Right now /dev contains a list of conceivable devices, most of which I</div><div class='del'>-don't have. Devfs only shows those devices available on my</div><div class='del'>-system. This means that listing /dev is a handy way of checking what</div><div class='del'>-devices are available.</div><div class='del'>-</div><div class='del'>-Major&amp;minor size</div><div class='del'>-</div><div class='del'>-Existing major and minor numbers are limited to 8 bits each. This is</div><div class='del'>-now a limiting factor for some drivers, particularly the SCSI disc</div><div class='del'>-driver, which consumes a single major number. Only 16 discs are</div><div class='del'>-supported, and each disc may have only 15 partitions. Maybe this isn't</div><div class='del'>-a problem for you, but some of us are building huge Linux systems with</div><div class='del'>-disc arrays. With devfs an arbitrary pointer can be associated with</div><div class='del'>-each device entry, which can be used to give an effective 32 bit</div><div class='del'>-device identifier (i.e. that's like having a 32 bit minor</div><div class='del'>-number). Since this is private to the kernel, there are no C library</div><div class='del'>-compatibility issues which you would have with increasing major and</div><div class='del'>-minor number sizes. See the section on "Allocation of Device Numbers"</div><div class='del'>-for details on maintaining compatibility with userspace.</div><div class='del'>-</div><div class='del'>-Solving this requires a kernel change.</div><div class='del'>-</div><div class='del'>-Since writing this, the kernel has been modified so that the SCSI disc</div><div class='del'>-driver has more major numbers allocated to it and now supports up to</div><div class='del'>-128 discs. Since these major numbers are non-contiguous (a result of</div><div class='del'>-unplanned expansion), the implementation is a little more cumbersome</div><div class='del'>-than originally.</div><div class='del'>-</div><div class='del'>-Just like the changes to IPv4 to fix impending limitations in the</div><div class='del'>-address space, people find ways around the limitations. In the long</div><div class='del'>-run, however, solutions like IPv6 or devfs can't be put off forever.</div><div class='del'>-</div><div class='del'>-Read-only root filesystem</div><div class='del'>-</div><div class='del'>-Having your device nodes on the root filesystem means that you can't</div><div class='del'>-operate properly with a read-only root filesystem. This is because you</div><div class='del'>-want to change ownerships and protections of tty devices. Existing</div><div class='del'>-practice prevents you using a CD-ROM as your root filesystem for a</div><div class='del'>-*real* system. Sure, you can boot off a CD-ROM, but you can't change</div><div class='del'>-tty ownerships, so it's only good for installing.</div><div class='del'>-</div><div class='del'>-Also, you can't use a shared NFS root filesystem for a cluster of</div><div class='del'>-discless Linux machines (having tty ownerships changed on a common</div><div class='del'>-/dev is not good). Nor can you embed your root filesystem in a</div><div class='del'>-ROM-FS.</div><div class='del'>-</div><div class='del'>-You can get around this by creating a RAMDISC at boot time, making</div><div class='del'>-an ext2 filesystem in it, mounting it somewhere and copying the</div><div class='del'>-contents of /dev into it, then unmounting it and mounting it over</div><div class='del'>-/dev.</div><div class='del'>-</div><div class='del'>-A devfs is a cleaner way of solving this.</div><div class='del'>-</div><div class='del'>-Non-Unix root filesystem</div><div class='del'>-</div><div class='del'>-Non-Unix filesystems (such as NTFS) can't be used for a root</div><div class='del'>-filesystem because they variously don't support character and block</div><div class='del'>-special files or symbolic links. You can't have a separate disc-based</div><div class='del'>-or RAMDISC-based filesystem mounted on /dev because you need device</div><div class='del'>-nodes before you can mount these. Devfs can be mounted without any</div><div class='del'>-device nodes. Devlinks won't work because symlinks aren't supported.</div><div class='del'>-An alternative solution is to use initrd to mount a RAMDISC initial</div><div class='del'>-root filesystem (which is populated with a minimal set of device</div><div class='del'>-nodes), and then construct a new /dev in another RAMDISC, and finally</div><div class='del'>-switch to your non-Unix root filesystem. This requires clever boot</div><div class='del'>-scripts and a fragile and conceptually complex boot procedure.</div><div class='del'>-</div><div class='del'>-Devfs solves this in a robust and conceptually simple way.</div><div class='del'>-</div><div class='del'>-PTY security</div><div class='del'>-</div><div class='del'>-Current pseudo-tty (pty) devices are owned by root and read-writable</div><div class='del'>-by everyone. The user of a pty-pair cannot change</div><div class='del'>-ownership/protections without being suid-root.</div><div class='del'>-</div><div class='del'>-This could be solved with a secure user-space daemon which runs as</div><div class='del'>-root and does the actual creation of pty-pairs. Such a daemon would</div><div class='del'>-require modification to *every* programme that wants to use this new</div><div class='del'>-mechanism. It also slows down creation of pty-pairs.</div><div class='del'>-</div><div class='del'>-An alternative is to create a new open_pty() syscall which does much</div><div class='del'>-the same thing as the user-space daemon. Once again, this requires</div><div class='del'>-modifications to pty-handling programmes.</div><div class='del'>-</div><div class='del'>-The devfs solution allows a device driver to "tag" certain device</div><div class='del'>-files so that when an unopened device is opened, the ownerships are</div><div class='del'>-changed to the current euid and egid of the opening process, and the</div><div class='del'>-protections are changed to the default registered by the driver. When</div><div class='del'>-the device is closed ownership is set back to root and protections are</div><div class='del'>-set back to read-write for everybody. No programme need be changed.</div><div class='del'>-The devpts filesystem provides this auto-ownership feature for Unix98</div><div class='del'>-ptys. It doesn't support old-style pty devices, nor does it have all</div><div class='del'>-the other features of devfs.</div><div class='del'>-</div><div class='del'>-Intelligent device management</div><div class='del'>-</div><div class='del'>-Devfs implements a simple yet powerful protocol for communication with</div><div class='del'>-a device management daemon (devfsd) which runs in user space. It is</div><div class='del'>-possible to send a message (either synchronously or asynchronously) to</div><div class='del'>-devfsd on any event, such as registration/unregistration of device</div><div class='del'>-entries, opening and closing devices, looking up inodes, scanning</div><div class='del'>-directories and more. This has many possibilities. Some of these are</div><div class='del'>-already implemented. See:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-http://www.atnf.csiro.au/~rgooch/linux/</div><div class='del'>-</div><div class='del'>-Device entry registration events can be used by devfsd to change</div><div class='del'>-permissions of newly-created device nodes. This is one mechanism to</div><div class='del'>-control device permissions.</div><div class='del'>-</div><div class='del'>-Device entry registration/unregistration events can be used to run</div><div class='del'>-programmes or scripts. This can be used to provide automatic mounting</div><div class='del'>-of filesystems when a new block device media is inserted into the</div><div class='del'>-drive.</div><div class='del'>-</div><div class='del'>-Asynchronous device open and close events can be used to implement</div><div class='del'>-clever permissions management. For example, the default permissions on</div><div class='del'>-/dev/dsp do not allow everybody to read from the device. This is</div><div class='del'>-sensible, as you don't want some remote user recording what you say at</div><div class='del'>-your console. However, the console user is also prevented from</div><div class='del'>-recording. This behaviour is not desirable. With asynchronous device</div><div class='del'>-open and close events, you can have devfsd run a programme or script</div><div class='del'>-when console devices are opened to change the ownerships for *other*</div><div class='del'>-device nodes (such as /dev/dsp). On closure, you can run a different</div><div class='del'>-script to restore permissions. An advantage of this scheme over</div><div class='del'>-modifying the C library tty handling is that this works even if your</div><div class='del'>-programme crashes (how many times have you seen the utmp database with</div><div class='del'>-lingering entries for non-existent logins?).</div><div class='del'>-</div><div class='del'>-Synchronous device open events can be used to perform intelligent</div><div class='del'>-device access protections. Before the device driver open() method is</div><div class='del'>-called, the daemon must first validate the open attempt, by running an</div><div class='del'>-external programme or script. This is far more flexible than access</div><div class='del'>-control lists, as access can be determined on the basis of other</div><div class='del'>-system conditions instead of just the UID and GID.</div><div class='del'>-</div><div class='del'>-Inode lookup events can be used to authenticate module autoload</div><div class='del'>-requests. Instead of using kmod directly, the event is sent to</div><div class='del'>-devfsd which can implement an arbitrary authentication before loading</div><div class='del'>-the module itself.</div><div class='del'>-</div><div class='del'>-Inode lookup events can also be used to construct arbitrary</div><div class='del'>-namespaces, without having to resort to populating devfs with symlinks</div><div class='del'>-to devices that don't exist.</div><div class='del'>-</div><div class='del'>-Speculative Device Scanning</div><div class='del'>-</div><div class='del'>-Consider an application (like cdparanoia) that wants to find all</div><div class='del'>-CD-ROM devices on the system (SCSI, IDE and other types), whether or</div><div class='del'>-not their respective modules are loaded. The application must</div><div class='del'>-speculatively open certain device nodes (such as /dev/sr0 for the SCSI</div><div class='del'>-CD-ROMs) in order to make sure the module is loaded. This requires</div><div class='del'>-that all Linux distributions follow the standard device naming scheme</div><div class='del'>-(last time I looked RedHat did things differently). Devfs solves the</div><div class='del'>-naming problem.</div><div class='del'>-</div><div class='del'>-The same application also wants to see which devices are actually</div><div class='del'>-available on the system. With the existing system it needs to read the</div><div class='del'>-/dev directory and speculatively open each /dev/sr* device to</div><div class='del'>-determine if the device exists or not. With a large /dev this is an</div><div class='del'>-inefficient operation, especially if there are many /dev/sr* nodes. A</div><div class='del'>-solution like scsidev could reduce the number of /dev/sr* entries (but</div><div class='del'>-of course that also requires all that inefficient directory scanning).</div><div class='del'>-</div><div class='del'>-With devfs, the application can open the /dev/sr directory</div><div class='del'>-(which triggers the module autoloading if required), and proceed to</div><div class='del'>-read /dev/sr. Since only the available devices will have</div><div class='del'>-entries, there are no inefficencies in directory scanning or device</div><div class='del'>-openings.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-Who else does it?</div><div class='del'>-</div><div class='del'>-FreeBSD has a devfs implementation. Solaris and AIX each have a</div><div class='del'>-pseudo-devfs (something akin to scsidev but for all devices, with some</div><div class='del'>-unspecified kernel support). BeOS, Plan9 and QNX also have it. SGI's</div><div class='del'>-IRIX 6.4 and above also have a device filesystem.</div><div class='del'>-</div><div class='del'>-While we shouldn't just automatically do something because others do</div><div class='del'>-it, we should not ignore the work of others either. FreeBSD has a lot</div><div class='del'>-of competent people working on it, so their opinion should not be</div><div class='del'>-blithely ignored.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How it works</div><div class='del'>-</div><div class='del'>-Registering device entries</div><div class='del'>-</div><div class='del'>-For every entry (device node) in a devfs-based /dev a driver must call</div><div class='del'>-devfs_register(). This adds the name of the device entry, the</div><div class='del'>-file_operations structure pointer and a few other things to an</div><div class='del'>-internal table. Device entries may be added and removed at any</div><div class='del'>-time. When a device entry is registered, it automagically appears in</div><div class='del'>-any mounted devfs'.</div><div class='del'>-</div><div class='del'>-Inode lookup</div><div class='del'>-</div><div class='del'>-When a lookup operation on an entry is performed and if there is no</div><div class='del'>-driver information for that entry devfs will attempt to call</div><div class='del'>-devfsd. If still no driver information can be found then a negative</div><div class='del'>-dentry is yielded and the next stage operation will be called by the</div><div class='del'>-VFS (such as create() or mknod() inode methods). If driver information</div><div class='del'>-can be found, an inode is created (if one does not exist already) and</div><div class='del'>-all is well.</div><div class='del'>-</div><div class='del'>-Manually creating device nodes</div><div class='del'>-</div><div class='del'>-The mknod() method allows you to create an ordinary named pipe in the</div><div class='del'>-devfs, or you can create a character or block special inode if one</div><div class='del'>-does not already exist. You may wish to create a character or block</div><div class='del'>-special inode so that you can set permissions and ownership. Later, if</div><div class='del'>-a device driver registers an entry with the same name, the</div><div class='del'>-permissions, ownership and times are retained. This is how you can set</div><div class='del'>-the protections on a device even before the driver is loaded. Once you</div><div class='del'>-create an inode it appears in the directory listing.</div><div class='del'>-</div><div class='del'>-Unregistering device entries</div><div class='del'>-</div><div class='del'>-A device driver calls devfs_unregister() to unregister an entry.</div><div class='del'>-</div><div class='del'>-Chroot() gaols</div><div class='del'>-</div><div class='del'>-2.2.x kernels</div><div class='del'>-</div><div class='del'>-The semantics of inode creation are different when devfs is mounted</div><div class='del'>-with the "explicit" option. Now, when a device entry is registered, it</div><div class='del'>-will not appear until you use mknod() to create the device. It doesn't</div><div class='del'>-matter if you mknod() before or after the device is registered with</div><div class='del'>-devfs_register(). The purpose of this behaviour is to support</div><div class='del'>-chroot(2) gaols, where you want to mount a minimal devfs inside the</div><div class='del'>-gaol. Only the devices you specifically want to be available (through</div><div class='del'>-your mknod() setup) will be accessible.</div><div class='del'>-</div><div class='del'>-2.4.x kernels</div><div class='del'>-</div><div class='del'>-As of kernel 2.3.99, the VFS has had the ability to rebind parts of</div><div class='del'>-the global filesystem namespace into another part of the namespace.</div><div class='del'>-This now works even at the leaf-node level, which means that</div><div class='del'>-individual files and device nodes may be bound into other parts of the</div><div class='del'>-namespace. This is like making links, but better, because it works</div><div class='del'>-across filesystems (unlike hard links) and works through chroot()</div><div class='del'>-gaols (unlike symbolic links).</div><div class='del'>-</div><div class='del'>-Because of these improvements to the VFS, the multi-mount capability</div><div class='del'>-in devfs is no longer needed. The administrator may create a minimal</div><div class='del'>-device tree inside a chroot(2) gaol by using VFS bindings. As this</div><div class='del'>-provides most of the features of the devfs multi-mount capability, I</div><div class='del'>-removed the multi-mount support code (after issuing an RFC). This</div><div class='del'>-yielded code size reductions and simplifications.</div><div class='del'>-</div><div class='del'>-If you want to construct a minimal chroot() gaol, the following</div><div class='del'>-command should suffice:</div><div class='del'>-</div><div class='del'>-mount --bind /dev/null /gaol/dev/null</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Repeat for other device nodes you want to expose. Simple!</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Operational issues</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Instructions for the impatient</div><div class='del'>-</div><div class='del'>-Nobody likes reading documentation. People just want to get in there</div><div class='del'>-and play. So this section tells you quickly the steps you need to take</div><div class='del'>-to run with devfs mounted over /dev. Skip these steps and you will end</div><div class='del'>-up with a nearly unbootable system. Subsequent sections describe the</div><div class='del'>-issues in more detail, and discuss non-essential configuration</div><div class='del'>-options.</div><div class='del'>-</div><div class='del'>-Devfsd</div><div class='del'>-OK, if you're reading this, I assume you want to play with</div><div class='del'>-devfs. First you should ensure that /usr/src/linux contains a</div><div class='del'>-recent kernel source tree. Then you need to compile devfsd, the device</div><div class='del'>-management daemon, available at</div><div class='del'>-</div><div class='del'>-http://www.atnf.csiro.au/~rgooch/linux/.</div><div class='del'>-Because the kernel has a naming scheme</div><div class='del'>-which is quite different from the old naming scheme, you need to</div><div class='del'>-install devfsd so that software and configuration files that use the</div><div class='del'>-old naming scheme will not break.</div><div class='del'>-</div><div class='del'>-Compile and install devfsd. You will be provided with a default</div><div class='del'>-configuration file /etc/devfsd.conf which will provide</div><div class='del'>-compatibility symlinks for the old naming scheme. Don't change this</div><div class='del'>-config file unless you know what you're doing. Even if you think you</div><div class='del'>-do know what you're doing, don't change it until you've followed all</div><div class='del'>-the steps below and booted a devfs-enabled system and verified that it</div><div class='del'>-works.</div><div class='del'>-</div><div class='del'>-Now edit your main system boot script so that devfsd is started at the</div><div class='del'>-very beginning (before any filesystem</div><div class='del'>-checks). /etc/rc.d/rc.sysinit is often the main boot script</div><div class='del'>-on systems with SysV-style boot scripts. On systems with BSD-style</div><div class='del'>-boot scripts it is often /etc/rc. Also check</div><div class='del'>-/sbin/rc.</div><div class='del'>-</div><div class='del'>-NOTE that the line you put into the boot</div><div class='del'>-script should be exactly:</div><div class='del'>-</div><div class='del'>-/sbin/devfsd /dev</div><div class='del'>-</div><div class='del'>-DO NOT use some special daemon-launching</div><div class='del'>-programme, otherwise the boot script may not wait for devfsd to finish</div><div class='del'>-initialising.</div><div class='del'>-</div><div class='del'>-System Libraries</div><div class='del'>-There may still be some problems because of broken software making</div><div class='del'>-assumptions about device names. In particular, some software does not</div><div class='del'>-handle devices which are symbolic links. If you are running a libc 5</div><div class='del'>-based system, install libc 5.4.44 (if you have libc 5.4.46, go back to</div><div class='del'>-libc 5.4.44, which is actually correct). If you are running a glibc</div><div class='del'>-based system, make sure you have glibc 2.1.3 or later.</div><div class='del'>-</div><div class='del'>-/etc/securetty</div><div class='del'>-PAM (Pluggable Authentication Modules) is supposed to be a flexible</div><div class='del'>-mechanism for providing better user authentication and access to</div><div class='del'>-services. Unfortunately, it's also fragile, complex and undocumented</div><div class='del'>-(check out RedHat 6.1, and probably other distributions as well). PAM</div><div class='del'>-has problems with symbolic links. Append the following lines to your</div><div class='del'>-/etc/securetty file:</div><div class='del'>-</div><div class='del'>-vc/1</div><div class='del'>-vc/2</div><div class='del'>-vc/3</div><div class='del'>-vc/4</div><div class='del'>-vc/5</div><div class='del'>-vc/6</div><div class='del'>-vc/7</div><div class='del'>-vc/8</div><div class='del'>-</div><div class='del'>-This will not weaken security. If you have a version of util-linux</div><div class='del'>-earlier than 2.10.h, please upgrade to 2.10.h or later. If you</div><div class='del'>-absolutely cannot upgrade, then also append the following lines to</div><div class='del'>-your /etc/securetty file:</div><div class='del'>-</div><div class='del'>-1</div><div class='del'>-2</div><div class='del'>-3</div><div class='del'>-4</div><div class='del'>-5</div><div class='del'>-6</div><div class='del'>-7</div><div class='del'>-8</div><div class='del'>-</div><div class='del'>-This may potentially weaken security by allowing root logins over the</div><div class='del'>-network (a password is still required, though). However, since there</div><div class='del'>-are problems with dealing with symlinks, I'm suspicious of the level</div><div class='del'>-of security offered in any case.</div><div class='del'>-</div><div class='del'>-XFree86</div><div class='del'>-While not essential, it's probably a good idea to upgrade to XFree86</div><div class='del'>-4.0, as patches went in to make it more devfs-friendly. If you don't,</div><div class='del'>-you'll probably need to apply the following patch to</div><div class='del'>-/etc/security/console.perms so that ordinary users can run</div><div class='del'>-startx. Note that not all distributions have this file (e.g. Debian),</div><div class='del'>-so if it's not present, don't worry about it.</div><div class='del'>-</div><div class='del'>---- /etc/security/console.perms.orig    Sat Apr 17 16:26:47 1999 </div><div class='del'>-+++ /etc/security/console.perms Fri Feb 25 23:53:55 2000 </div><div class='del'>-@@ -14,7 +14,7 @@ </div><div class='del'>- # man 5 console.perms </div><div class='del'>-</div><div class='del'>- # file classes -- these are regular expressions </div><div class='del'>--&lt;console&gt;=tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9] </div><div class='del'>-+&lt;console&gt;=tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9] </div><div class='del'>-</div><div class='del'>- # device classes -- these are shell-style globs </div><div class='del'>- &lt;floppy&gt;=/dev/fd[0-1]* </div><div class='del'>-</div><div class='del'>-If the patch does not apply, then change the line:</div><div class='del'>-</div><div class='del'>-&lt;console&gt;=tty[0-9][0-9]* :[0-9]\.[0-9] :[0-9]</div><div class='del'>-</div><div class='del'>-with:</div><div class='del'>-</div><div class='del'>-&lt;console&gt;=tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9]</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Disable devpts</div><div class='del'>-I've had a report of devpts mounted on /dev/pts not working</div><div class='del'>-correctly. Since devfs will also manage /dev/pts, there is no</div><div class='del'>-need to mount devpts as well. You should either edit your</div><div class='del'>-/etc/fstab so devpts is not mounted, or disable devpts from</div><div class='del'>-your kernel configuration.</div><div class='del'>-</div><div class='del'>-Unsupported drivers</div><div class='del'>-Not all drivers have devfs support. If you depend on one of these</div><div class='del'>-drivers, you will need to create a script or tarfile that you can use</div><div class='del'>-at boot time to create device nodes as appropriate. There is a</div><div class='del'>-section which describes this. Another</div><div class='del'>-section lists the drivers which have</div><div class='del'>-devfs support.</div><div class='del'>-</div><div class='del'>-/dev/mouse</div><div class='del'>-</div><div class='del'>-Many disributions configure /dev/mouse to be the mouse device</div><div class='del'>-for XFree86 and GPM. I actually think this is a bad idea, because it</div><div class='del'>-adds another level of indirection. When looking at a config file, if</div><div class='del'>-you see /dev/mouse you're left wondering which mouse</div><div class='del'>-is being referred to. Hence I recommend putting the actual mouse</div><div class='del'>-device (for example /dev/psaux) into your</div><div class='del'>-/etc/X11/XF86Config file (and similarly for the GPM</div><div class='del'>-configuration file).</div><div class='del'>-</div><div class='del'>-Alternatively, use the same technique used for unsupported drivers</div><div class='del'>-described above.</div><div class='del'>-</div><div class='del'>-The Kernel</div><div class='del'>-Finally, you need to make sure devfs is compiled into your kernel. Set</div><div class='del'>-CONFIG_EXPERIMENTAL=y, CONFIG_DEVFS_FS=y and CONFIG_DEVFS_MOUNT=y by</div><div class='del'>-using favourite configuration tool (i.e. make config or</div><div class='del'>-make xconfig) and then make clean and then recompile your kernel and </div><div class='del'>-modules. At boot, devfs will be mounted onto /dev.</div><div class='del'>-</div><div class='del'>-If you encounter problems booting (for example if you forgot a</div><div class='del'>-configuration step), you can pass devfs=nomount at the kernel</div><div class='del'>-boot command line. This will prevent the kernel from mounting devfs at</div><div class='del'>-boot time onto /dev.</div><div class='del'>-</div><div class='del'>-In general, a kernel built with CONFIG_DEVFS_FS=y but without mounting</div><div class='del'>-devfs onto /dev is completely safe, and requires no</div><div class='del'>-configuration changes. One exception to take note of is when</div><div class='del'>-LABEL= directives are used in /etc/fstab. In this</div><div class='del'>-case you will be unable to boot properly. This is because the</div><div class='del'>-mount(8) programme uses /proc/partitions as part of</div><div class='del'>-the volume label search process, and the device names it finds are not</div><div class='del'>-available, because setting CONFIG_DEVFS_FS=y changes the names in</div><div class='del'>-/proc/partitions, irrespective of whether devfs is mounted.</div><div class='del'>-</div><div class='del'>-Now you've finished all the steps required. You're now ready to boot</div><div class='del'>-your shiny new kernel. Enjoy.</div><div class='del'>-</div><div class='del'>-Changing the configuration</div><div class='del'>-</div><div class='del'>-OK, you've now booted a devfs-enabled system, and everything works.</div><div class='del'>-Now you may feel like changing the configuration (common targets are</div><div class='del'>-/etc/fstab and /etc/devfsd.conf). Since you have a</div><div class='del'>-system that works, if you make any changes and it doesn't work, you</div><div class='del'>-now know that you only have to restore your configuration files to the</div><div class='del'>-default and it will work again.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Permissions persistence across reboots</div><div class='del'>-</div><div class='del'>-If you don't use mknod(2) to create a device file, nor use chmod(2) or</div><div class='del'>-chown(2) to change the ownerships/permissions, the inode ctime will</div><div class='del'>-remain at 0 (the epoch, 12 am, 1-JAN-1970, GMT). Anything with a ctime</div><div class='del'>-later than this has had it's ownership/permissions changed. Hence, a</div><div class='del'>-simple script or programme may be used to tar up all changed inodes,</div><div class='del'>-prior to shutdown. Although effective, many consider this approach a</div><div class='del'>-kludge.</div><div class='del'>-</div><div class='del'>-A much better approach is to use devfsd to save and restore</div><div class='del'>-permissions. It may be configured to record changes in permissions and</div><div class='del'>-will save them in a database (in fact a directory tree), and restore</div><div class='del'>-these upon boot. This is an efficient method and results in immediate</div><div class='del'>-saving of current permissions (unlike the tar approach, which saves</div><div class='del'>-permissions at some unspecified future time).</div><div class='del'>-</div><div class='del'>-The default configuration file supplied with devfsd has config entries</div><div class='del'>-which you may uncomment to enable persistence management.</div><div class='del'>-</div><div class='del'>-If you decide to use the tar approach anyway, be aware that tar will</div><div class='del'>-first unlink(2) an inode before creating a new device node. The</div><div class='del'>-unlink(2) has the effect of breaking the connection between a devfs</div><div class='del'>-entry and the device driver. If you use the "devfs=only" boot option,</div><div class='del'>-you lose access to the device driver, requiring you to reload the</div><div class='del'>-module. I consider this a bug in tar (there is no real need to</div><div class='del'>-unlink(2) the inode first).</div><div class='del'>-</div><div class='del'>-Alternatively, you can use devfsd to provide more sophisticated</div><div class='del'>-management of device permissions. You can use devfsd to store</div><div class='del'>-permissions for whole groups of devices with a single configuration</div><div class='del'>-entry, rather than the conventional single entry per device entry.</div><div class='del'>-</div><div class='del'>-Permissions database stored in mounted-over /dev</div><div class='del'>-</div><div class='del'>-If you wish to save and restore your device permissions into the</div><div class='del'>-disc-based /dev while still mounting devfs onto /dev</div><div class='del'>-you may do so. This requires a 2.4.x kernel (in fact, 2.3.99 or</div><div class='del'>-later), which has the VFS binding facility. You need to do the</div><div class='del'>-following to set this up:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-make sure the kernel does not mount devfs at boot time</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-make sure you have a correct /dev/console entry in your</div><div class='del'>-root file-system (where your disc-based /dev lives)</div><div class='del'>-</div><div class='del'>-create the /dev-state directory</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-add the following lines near the very beginning of your boot</div><div class='del'>-scripts:</div><div class='del'>-</div><div class='del'>-mount --bind /dev /dev-state</div><div class='del'>-mount -t devfs none /dev</div><div class='del'>-devfsd /dev</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-add the following lines to your /etc/devfsd.conf file:</div><div class='del'>-</div><div class='del'>-REGISTER	^pt[sy]		IGNORE</div><div class='del'>-CREATE		^pt[sy]		IGNORE</div><div class='del'>-CHANGE		^pt[sy]		IGNORE</div><div class='del'>-DELETE		^pt[sy]		IGNORE</div><div class='del'>-REGISTER	.*		COPY	/dev-state/$devname $devpath</div><div class='del'>-CREATE		.*		COPY	$devpath /dev-state/$devname</div><div class='del'>-CHANGE		.*		COPY	$devpath /dev-state/$devname</div><div class='del'>-DELETE		.*		CFUNCTION GLOBAL unlink /dev-state/$devname</div><div class='del'>-RESTORE		/dev-state</div><div class='del'>-</div><div class='del'>-Note that the sample devfsd.conf file contains these lines,</div><div class='del'>-as well as other sample configurations you may find useful. See the</div><div class='del'>-devfsd distribution</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-reboot.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Permissions database stored in normal directory</div><div class='del'>-</div><div class='del'>-If you are using an older kernel which doesn't support VFS binding,</div><div class='del'>-then you won't be able to have the permissions database in a</div><div class='del'>-mounted-over /dev. However, you can still use a regular</div><div class='del'>-directory to store the database. The sample /etc/devfsd.conf</div><div class='del'>-file above may still be used. You will need to create the</div><div class='del'>-/dev-state directory prior to installing devfsd. If you have</div><div class='del'>-old permissions in /dev, then just copy (or move) the device</div><div class='del'>-nodes over to the new directory.</div><div class='del'>-</div><div class='del'>-Which method is better?</div><div class='del'>-</div><div class='del'>-The best method is to have the permissions database stored in the</div><div class='del'>-mounted-over /dev. This is because you will not need to copy</div><div class='del'>-device nodes over to /dev-state, and because it allows you to</div><div class='del'>-switch between devfs and non-devfs kernels, without requiring you to</div><div class='del'>-copy permissions between /dev-state (for devfs) and</div><div class='del'>-/dev (for non-devfs).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Dealing with drivers without devfs support</div><div class='del'>-</div><div class='del'>-Currently, not all device drivers in the kernel have been modified to</div><div class='del'>-use devfs. Device drivers which do not yet have devfs support will not</div><div class='del'>-automagically appear in devfs. The simplest way to create device nodes</div><div class='del'>-for these drivers is to unpack a tarfile containing the required</div><div class='del'>-device nodes. You can do this in your boot scripts. All your drivers</div><div class='del'>-will now work as before.</div><div class='del'>-</div><div class='del'>-Hopefully for most people devfs will have enough support so that they</div><div class='del'>-can mount devfs directly over /dev without losing most functionality</div><div class='del'>-(i.e. losing access to various devices). As of 22-JAN-1998 (devfs</div><div class='del'>-patch version 10) I am now running this way. All the devices I have</div><div class='del'>-are available in devfs, so I don't lose anything.</div><div class='del'>-</div><div class='del'>-WARNING: if your configuration requires the old-style device names</div><div class='del'>-(i.e. /dev/hda1 or /dev/sda1), you must install devfsd and configure</div><div class='del'>-it to maintain compatibility entries. It is almost certain that you</div><div class='del'>-will require this. Note that the kernel creates a compatibility entry</div><div class='del'>-for the root device, so you don't need initrd.</div><div class='del'>-</div><div class='del'>-Note that you no longer need to mount devpts if you use Unix98 PTYs,</div><div class='del'>-as devfs can manage /dev/pts itself. This saves you some RAM, as you</div><div class='del'>-don't need to compile and install devpts. Note that some versions of</div><div class='del'>-glibc have a bug with Unix98 pty handling on devfs systems. Contact</div><div class='del'>-the glibc maintainers for a fix. Glibc 2.1.3 has the fix.</div><div class='del'>-</div><div class='del'>-Note also that apart from editing /etc/fstab, other things will need</div><div class='del'>-to be changed if you *don't* install devfsd. Some software (like the X</div><div class='del'>-server) hard-wire device names in their source. It really is much</div><div class='del'>-easier to install devfsd so that compatibility entries are created.</div><div class='del'>-You can then slowly migrate your system to using the new device names</div><div class='del'>-(for example, by starting with /etc/fstab), and then limiting the</div><div class='del'>-compatibility entries that devfsd creates.</div><div class='del'>-</div><div class='del'>-IF YOU CONFIGURE TO MOUNT DEVFS AT BOOT, MAKE SURE YOU INSTALL DEVFSD</div><div class='del'>-BEFORE YOU BOOT A DEVFS-ENABLED KERNEL!</div><div class='del'>-</div><div class='del'>-Now that devfs has gone into the 2.3.46 kernel, I'm getting a lot of</div><div class='del'>-reports back. Many of these are because people are trying to run</div><div class='del'>-without devfsd, and hence some things break. Please just run devfsd if</div><div class='del'>-things break. I want to concentrate on real bugs rather than</div><div class='del'>-misconfiguration problems at the moment. If people are willing to fix</div><div class='del'>-bugs/false assumptions in other code (i.e. glibc, X server) and submit</div><div class='del'>-that to the respective maintainers, that would be great.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-All the way with Devfs</div><div class='del'>-</div><div class='del'>-The devfs kernel patch creates a rationalised device tree. As stated</div><div class='del'>-above, if you want to keep using the old /dev naming scheme,</div><div class='del'>-you just need to configure devfsd appopriately (see the man</div><div class='del'>-page). People who prefer the old names can ignore this section. For</div><div class='del'>-those of us who like the rationalised names and an uncluttered</div><div class='del'>-/dev, read on.</div><div class='del'>-</div><div class='del'>-If you don't run devfsd, or don't enable compatibility entry</div><div class='del'>-management, then you will have to configure your system to use the new</div><div class='del'>-names. For example, you will then need to edit your</div><div class='del'>-/etc/fstab to use the new disc naming scheme. If you want to</div><div class='del'>-be able to boot non-devfs kernels, you will need compatibility</div><div class='del'>-symlinks in the underlying disc-based /dev pointing back to</div><div class='del'>-the old-style names for when you boot a kernel without devfs.</div><div class='del'>-</div><div class='del'>-You can selectively decide which devices you want compatibility</div><div class='del'>-entries for. For example, you may only want compatibility entries for</div><div class='del'>-BSD pseudo-terminal devices (otherwise you'll have to patch you C</div><div class='del'>-library or use Unix98 ptys instead). It's just a matter of putting in</div><div class='del'>-the correct regular expression into /dev/devfsd.conf.</div><div class='del'>-</div><div class='del'>-There are other choices of naming schemes that you may prefer. For</div><div class='del'>-example, I don't use the kernel-supplied</div><div class='del'>-names, because they are too verbose. A common misconception is</div><div class='del'>-that the kernel-supplied names are meant to be used directly in</div><div class='del'>-configuration files. This is not the case. They are designed to</div><div class='del'>-reflect the layout of the devices attached and to provide easy</div><div class='del'>-classification.</div><div class='del'>-</div><div class='del'>-If you like the kernel-supplied names, that's fine. If you don't then</div><div class='del'>-you should be using devfsd to construct a namespace more to your</div><div class='del'>-liking. Devfsd has built-in code to construct a</div><div class='del'>-namespace that is both logical and easy to</div><div class='del'>-manage. In essence, it creates a convenient abbreviation of the</div><div class='del'>-kernel-supplied namespace.</div><div class='del'>-</div><div class='del'>-You are of course free to build your own namespace. Devfsd has all the</div><div class='del'>-infrastructure required to make this easy for you. All you need do is</div><div class='del'>-write a script. You can even write some C code and devfsd can load the</div><div class='del'>-shared object as a callable extension.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Other Issues</div><div class='del'>-</div><div class='del'>-The init programme</div><div class='del'>-Another thing to take note of is whether your init programme</div><div class='del'>-creates a Unix socket /dev/telinit. Some versions of init</div><div class='del'>-create /dev/telinit so that the telinit programme can</div><div class='del'>-communicate with the init process. If you have such a system you need</div><div class='del'>-to make sure that devfs is mounted over /dev *before* init</div><div class='del'>-starts. In other words, you can't leave the mounting of devfs to</div><div class='del'>-/etc/rc, since this is executed after init. Other</div><div class='del'>-versions of init require a named pipe /dev/initctl</div><div class='del'>-which must exist *before* init starts. Once again, you need to</div><div class='del'>-mount devfs and then create the named pipe *before* init</div><div class='del'>-starts.</div><div class='del'>-</div><div class='del'>-The default behaviour now is not to mount devfs onto /dev at</div><div class='del'>-boot time for 2.3.x and later kernels. You can correct this with the</div><div class='del'>-"devfs=mount" boot option. This solves any problems with init,</div><div class='del'>-and also prevents the dreaded:</div><div class='del'>-</div><div class='del'>-Cannot open initial console</div><div class='del'>-</div><div class='del'>-message. For 2.2.x kernels where you need to apply the devfs patch,</div><div class='del'>-the default is to mount.</div><div class='del'>-</div><div class='del'>-If you have automatic mounting of devfs onto /dev then you</div><div class='del'>-may need to create /dev/initctl in your boot scripts. The</div><div class='del'>-following lines should suffice:</div><div class='del'>-</div><div class='del'>-mknod /dev/initctl p</div><div class='del'>-kill -SIGUSR1 1       # tell init that /dev/initctl now exists</div><div class='del'>-</div><div class='del'>-Alternatively, if you don't want the kernel to mount devfs onto</div><div class='del'>-/dev then you could use the following procedure is a</div><div class='del'>-guideline for how to get around /dev/initctl problems:</div><div class='del'>-</div><div class='del'>-# cd /sbin</div><div class='del'>-# mv init init.real</div><div class='del'>-# cat &gt; init</div><div class='del'>-#! /bin/sh</div><div class='del'>-mount -n -t devfs none /dev</div><div class='del'>-mknod /dev/initctl p</div><div class='del'>-exec /sbin/init.real $*</div><div class='del'>-[control-D]</div><div class='del'>-# chmod a+x init</div><div class='del'>-</div><div class='del'>-Note that newer versions of init create /dev/initctl</div><div class='del'>-automatically, so you don't have to worry about this.</div><div class='del'>-</div><div class='del'>-Module autoloading</div><div class='del'>-You will need to configure devfsd to enable module</div><div class='del'>-autoloading. The following lines should be placed in your</div><div class='del'>-/etc/devfsd.conf file:</div><div class='del'>-</div><div class='del'>-LOOKUP	.*		MODLOAD</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-As of devfsd-v1.3.10, a generic /etc/modules.devfs</div><div class='del'>-configuration file is installed, which is used by the MODLOAD</div><div class='del'>-action. This should be sufficient for most configurations. If you</div><div class='del'>-require further configuration, edit your /etc/modules.conf</div><div class='del'>-file. The way module autoloading work with devfs is:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-a process attempts to lookup a device node (e.g. /dev/fred)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if that device node does not exist, the full pathname is passed to</div><div class='del'>-devfsd as a string</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-devfsd will pass the string to the modprobe programme (provided the</div><div class='del'>-configuration line shown above is present), and specifies that</div><div class='del'>-/etc/modules.devfs is the configuration file</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/etc/modules.devfs includes /etc/modules.conf to</div><div class='del'>-access local configurations</div><div class='del'>-</div><div class='del'>-modprobe will search it's configuration files, looking for an alias</div><div class='del'>-that translates the pathname into a module name</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-the translated pathname is then used to load the module.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-If you wanted a lookup of /dev/fred to load the</div><div class='del'>-mymod module, you would require the following configuration</div><div class='del'>-line in /etc/modules.conf:</div><div class='del'>-</div><div class='del'>-alias    /dev/fred    mymod</div><div class='del'>-</div><div class='del'>-The /etc/modules.devfs configuration file provides many such</div><div class='del'>-aliases for standard device names. If you look closely at this file,</div><div class='del'>-you will note that some modules require multiple alias configuration</div><div class='del'>-lines. This is required to support module autoloading for old and new</div><div class='del'>-device names.</div><div class='del'>-</div><div class='del'>-Mounting root off a devfs device</div><div class='del'>-If you wish to mount root off a devfs device when you pass the</div><div class='del'>-"devfs=only" boot option, then you need to pass in the</div><div class='del'>-"root=&lt;device&gt;" option to the kernel when booting. If you use</div><div class='del'>-LILO, then you must have this in lilo.conf:</div><div class='del'>-</div><div class='del'>-append = "root=&lt;device&gt;"</div><div class='del'>-</div><div class='del'>-Surprised? Yep, so was I. It turns out if you have (as most people</div><div class='del'>-do):</div><div class='del'>-</div><div class='del'>-root = &lt;device&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-then LILO will determine the device number of &lt;device&gt; and will</div><div class='del'>-write that device number into a special place in the kernel image</div><div class='del'>-before starting the kernel, and the kernel will use that device number</div><div class='del'>-to mount the root filesystem. So, using the "append" variety ensures</div><div class='del'>-that LILO passes the root filesystem device as a string, which devfs</div><div class='del'>-can then use.</div><div class='del'>-</div><div class='del'>-Note that this isn't an issue if you don't pass "devfs=only".</div><div class='del'>-</div><div class='del'>-TTY issues</div><div class='del'>-The ttyname(3) function in some versions of the C library makes</div><div class='del'>-false assumptions about device entries which are symbolic links.  The</div><div class='del'>-tty(1) programme is one that depends on this function.  I've</div><div class='del'>-written a patch to libc 5.4.43 which fixes this. This has been</div><div class='del'>-included in libc 5.4.44 and a similar fix is in glibc 2.1.3.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Kernel Naming Scheme</div><div class='del'>-</div><div class='del'>-The kernel provides a default naming scheme. This scheme is designed</div><div class='del'>-to make it easy to search for specific devices or device types, and to</div><div class='del'>-view the available devices. Some device types (such as hard discs),</div><div class='del'>-have a directory of entries, making it easy to see what devices of</div><div class='del'>-that class are available. Often, the entries are symbolic links into a</div><div class='del'>-directory tree that reflects the topology of available devices. The</div><div class='del'>-topological tree is useful for finding how your devices are arranged.</div><div class='del'>-</div><div class='del'>-Below is a list of the naming schemes for the most common drivers. A</div><div class='del'>-list of reserved device names is</div><div class='del'>-available for reference. Please send email to</div><div class='del'>-rgooch@atnf.csiro.au to obtain an allocation. Please be</div><div class='del'>-patient (the maintainer is busy). An alternative name may be allocated</div><div class='del'>-instead of the requested name, at the discretion of the maintainer.</div><div class='del'>-</div><div class='del'>-Disc Devices</div><div class='del'>-</div><div class='del'>-All discs, whether SCSI, IDE or whatever, are placed under the</div><div class='del'>-/dev/discs hierarchy:</div><div class='del'>-</div><div class='del'>-	/dev/discs/disc0	first disc</div><div class='del'>-	/dev/discs/disc1	second disc</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Each of these entries is a symbolic link to the directory for that</div><div class='del'>-device. The device directory contains:</div><div class='del'>-</div><div class='del'>-	disc	for the whole disc</div><div class='del'>-	part*	for individual partitions</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CD-ROM Devices</div><div class='del'>-</div><div class='del'>-All CD-ROMs, whether SCSI, IDE or whatever, are placed under the</div><div class='del'>-/dev/cdroms hierarchy:</div><div class='del'>-</div><div class='del'>-	/dev/cdroms/cdrom0	first CD-ROM</div><div class='del'>-	/dev/cdroms/cdrom1	second CD-ROM</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Each of these entries is a symbolic link to the real device entry for</div><div class='del'>-that device.</div><div class='del'>-</div><div class='del'>-Tape Devices</div><div class='del'>-</div><div class='del'>-All tapes, whether SCSI, IDE or whatever, are placed under the</div><div class='del'>-/dev/tapes hierarchy:</div><div class='del'>-</div><div class='del'>-	/dev/tapes/tape0	first tape</div><div class='del'>-	/dev/tapes/tape1	second tape</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Each of these entries is a symbolic link to the directory for that</div><div class='del'>-device. The device directory contains:</div><div class='del'>-</div><div class='del'>-	mt			for mode 0</div><div class='del'>-	mtl			for mode 1</div><div class='del'>-	mtm			for mode 2</div><div class='del'>-	mta			for mode 3</div><div class='del'>-	mtn			for mode 0, no rewind</div><div class='del'>-	mtln			for mode 1, no rewind</div><div class='del'>-	mtmn			for mode 2, no rewind</div><div class='del'>-	mtan			for mode 3, no rewind</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SCSI Devices</div><div class='del'>-</div><div class='del'>-To uniquely identify any SCSI device requires the following</div><div class='del'>-information:</div><div class='del'>-</div><div class='del'>-  controller	(host adapter)</div><div class='del'>-  bus		(SCSI channel)</div><div class='del'>-  target	(SCSI ID)</div><div class='del'>-  unit		(Logical Unit Number)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-All SCSI devices are placed under /dev/scsi (assuming devfs</div><div class='del'>-is mounted on /dev). Hence, a SCSI device with the following</div><div class='del'>-parameters: c=1,b=2,t=3,u=4 would appear as:</div><div class='del'>-</div><div class='del'>-	/dev/scsi/host1/bus2/target3/lun4	device directory</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Inside this directory, a number of device entries may be created,</div><div class='del'>-depending on which SCSI device-type drivers were installed.</div><div class='del'>-</div><div class='del'>-See the section on the disc naming scheme to see what entries the SCSI</div><div class='del'>-disc driver creates.</div><div class='del'>-</div><div class='del'>-See the section on the tape naming scheme to see what entries the SCSI</div><div class='del'>-tape driver creates.</div><div class='del'>-</div><div class='del'>-The SCSI CD-ROM driver creates:</div><div class='del'>-</div><div class='del'>-	cd</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The SCSI generic driver creates:</div><div class='del'>-</div><div class='del'>-	generic</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-IDE Devices</div><div class='del'>-</div><div class='del'>-To uniquely identify any IDE device requires the following</div><div class='del'>-information:</div><div class='del'>-</div><div class='del'>-  controller</div><div class='del'>-  bus		(aka. primary/secondary)</div><div class='del'>-  target	(aka. master/slave)</div><div class='del'>-  unit</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-All IDE devices are placed under /dev/ide, and uses a similar</div><div class='del'>-naming scheme to the SCSI subsystem.</div><div class='del'>-</div><div class='del'>-XT Hard Discs</div><div class='del'>-</div><div class='del'>-All XT discs are placed under /dev/xd. The first XT disc has</div><div class='del'>-the directory /dev/xd/disc0.</div><div class='del'>-</div><div class='del'>-TTY devices</div><div class='del'>-</div><div class='del'>-The tty devices now appear as:</div><div class='del'>-</div><div class='del'>-  New name                   Old-name                   Device Type</div><div class='del'>-  --------                   --------                   -----------</div><div class='del'>-  /dev/tts/{0,1,...}         /dev/ttyS{0,1,...}         Serial ports</div><div class='del'>-  /dev/cua/{0,1,...}         /dev/cua{0,1,...}          Call out devices</div><div class='del'>-  /dev/vc/0                  /dev/tty                   Current virtual console</div><div class='del'>-  /dev/vc/{1,2,...}          /dev/tty{1...63}           Virtual consoles</div><div class='del'>-  /dev/vcc/{0,1,...}         /dev/vcs{1...63}           Virtual consoles</div><div class='del'>-  /dev/pty/m{0,1,...}        /dev/ptyp??                PTY masters</div><div class='del'>-  /dev/pty/s{0,1,...}        /dev/ttyp??                PTY slaves</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-RAMDISCS</div><div class='del'>-</div><div class='del'>-The RAMDISCS are placed in their own directory, and are named thus:</div><div class='del'>-</div><div class='del'>-  /dev/rd/{0,1,2,...}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Meta Devices</div><div class='del'>-</div><div class='del'>-The meta devices are placed in their own directory, and are named</div><div class='del'>-thus:</div><div class='del'>-</div><div class='del'>-  /dev/md/{0,1,2,...}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Floppy discs</div><div class='del'>-</div><div class='del'>-Floppy discs are placed in the /dev/floppy directory.</div><div class='del'>-</div><div class='del'>-Loop devices</div><div class='del'>-</div><div class='del'>-Loop devices are placed in the /dev/loop directory.</div><div class='del'>-</div><div class='del'>-Sound devices</div><div class='del'>-</div><div class='del'>-Sound devices are placed in the /dev/sound directory</div><div class='del'>-(audio, sequencer, ...).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Devfsd Naming Scheme</div><div class='del'>-</div><div class='del'>-Devfsd provides a naming scheme which is a convenient abbreviation of</div><div class='del'>-the kernel-supplied namespace. In some</div><div class='del'>-cases, the kernel-supplied naming scheme is quite convenient, so</div><div class='del'>-devfsd does not provide another naming scheme. The convenience names</div><div class='del'>-that devfsd creates are in fact the same names as the original devfs</div><div class='del'>-kernel patch created (before Linus mandated the Big Name</div><div class='del'>-Change). These are referred to as "new compatibility entries".</div><div class='del'>-</div><div class='del'>-In order to configure devfsd to create these convenience names, the</div><div class='del'>-following lines should be placed in your /etc/devfsd.conf:</div><div class='del'>-</div><div class='del'>-REGISTER	.*		MKNEWCOMPAT</div><div class='del'>-UNREGISTER	.*		RMNEWCOMPAT</div><div class='del'>-</div><div class='del'>-This will cause devfsd to create (and destroy) symbolic links which</div><div class='del'>-point to the kernel-supplied names.</div><div class='del'>-</div><div class='del'>-SCSI Hard Discs</div><div class='del'>-</div><div class='del'>-All SCSI discs are placed under /dev/sd (assuming devfs is</div><div class='del'>-mounted on /dev). Hence, a SCSI disc with the following</div><div class='del'>-parameters: c=1,b=2,t=3,u=4 would appear as:</div><div class='del'>-</div><div class='del'>-	/dev/sd/c1b2t3u4	for the whole disc</div><div class='del'>-	/dev/sd/c1b2t3u4p5	for the 5th partition</div><div class='del'>-	/dev/sd/c1b2t3u4p5s6	for the 6th slice in the 5th partition</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SCSI Tapes</div><div class='del'>-</div><div class='del'>-All SCSI tapes are placed under /dev/st. A similar naming</div><div class='del'>-scheme is used as for SCSI discs. A SCSI tape with the</div><div class='del'>-parameters:c=1,b=2,t=3,u=4 would appear as:</div><div class='del'>-</div><div class='del'>-	/dev/st/c1b2t3u4m0	for mode 0</div><div class='del'>-	/dev/st/c1b2t3u4m1	for mode 1</div><div class='del'>-	/dev/st/c1b2t3u4m2	for mode 2</div><div class='del'>-	/dev/st/c1b2t3u4m3	for mode 3</div><div class='del'>-	/dev/st/c1b2t3u4m0n	for mode 0, no rewind</div><div class='del'>-	/dev/st/c1b2t3u4m1n	for mode 1, no rewind</div><div class='del'>-	/dev/st/c1b2t3u4m2n	for mode 2, no rewind</div><div class='del'>-	/dev/st/c1b2t3u4m3n	for mode 3, no rewind</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SCSI CD-ROMs</div><div class='del'>-</div><div class='del'>-All SCSI CD-ROMs are placed under /dev/sr. A similar naming</div><div class='del'>-scheme is used as for SCSI discs. A SCSI CD-ROM with the</div><div class='del'>-parameters:c=1,b=2,t=3,u=4 would appear as:</div><div class='del'>-</div><div class='del'>-	/dev/sr/c1b2t3u4</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SCSI Generic Devices</div><div class='del'>-</div><div class='del'>-The generic (aka. raw) interface for all SCSI devices are placed under</div><div class='del'>-/dev/sg. A similar naming scheme is used as for SCSI discs. A</div><div class='del'>-SCSI generic device with the parameters:c=1,b=2,t=3,u=4 would appear</div><div class='del'>-as:</div><div class='del'>-</div><div class='del'>-	/dev/sg/c1b2t3u4</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-IDE Hard Discs</div><div class='del'>-</div><div class='del'>-All IDE discs are placed under /dev/ide/hd, using a similar</div><div class='del'>-convention to SCSI discs. The following mappings exist between the new</div><div class='del'>-and the old names:</div><div class='del'>-</div><div class='del'>-	/dev/hda	/dev/ide/hd/c0b0t0u0</div><div class='del'>-	/dev/hdb	/dev/ide/hd/c0b0t1u0</div><div class='del'>-	/dev/hdc	/dev/ide/hd/c0b1t0u0</div><div class='del'>-	/dev/hdd	/dev/ide/hd/c0b1t1u0</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-IDE Tapes</div><div class='del'>-</div><div class='del'>-A similar naming scheme is used as for IDE discs. The entries will</div><div class='del'>-appear in the /dev/ide/mt directory.</div><div class='del'>-</div><div class='del'>-IDE CD-ROM</div><div class='del'>-</div><div class='del'>-A similar naming scheme is used as for IDE discs. The entries will</div><div class='del'>-appear in the /dev/ide/cd directory.</div><div class='del'>-</div><div class='del'>-IDE Floppies</div><div class='del'>-</div><div class='del'>-A similar naming scheme is used as for IDE discs. The entries will</div><div class='del'>-appear in the /dev/ide/fd directory.</div><div class='del'>-</div><div class='del'>-XT Hard Discs</div><div class='del'>-</div><div class='del'>-All XT discs are placed under /dev/xd. The first XT disc</div><div class='del'>-would appear as /dev/xd/c0t0.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Old Compatibility Names</div><div class='del'>-</div><div class='del'>-The old compatibility names are the legacy device names, such as</div><div class='del'>-/dev/hda, /dev/sda, /dev/rtc and so on.</div><div class='del'>-Devfsd can be configured to create compatibility symlinks so that you</div><div class='del'>-may continue to use the old names in your configuration files and so</div><div class='del'>-that old applications will continue to function correctly.</div><div class='del'>-</div><div class='del'>-In order to configure devfsd to create these legacy names, the</div><div class='del'>-following lines should be placed in your /etc/devfsd.conf:</div><div class='del'>-</div><div class='del'>-REGISTER	.*		MKOLDCOMPAT</div><div class='del'>-UNREGISTER	.*		RMOLDCOMPAT</div><div class='del'>-</div><div class='del'>-This will cause devfsd to create (and destroy) symbolic links which</div><div class='del'>-point to the kernel-supplied names.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Device drivers currently ported</div><div class='del'>-</div><div class='del'>-- All miscellaneous character devices support devfs (this is done</div><div class='del'>-  transparently through misc_register())</div><div class='del'>-</div><div class='del'>-- SCSI discs and generic hard discs</div><div class='del'>-</div><div class='del'>-- Character memory devices (null, zero, full and so on)</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- Loop devices (/dev/loop?)</div><div class='del'>- </div><div class='del'>-- TTY devices (console, serial ports, terminals and pseudo-terminals)</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- SCSI tapes (/dev/scsi and /dev/tapes)</div><div class='del'>-</div><div class='del'>-- SCSI CD-ROMs (/dev/scsi and /dev/cdroms)</div><div class='del'>-</div><div class='del'>-- SCSI generic devices (/dev/scsi)</div><div class='del'>-</div><div class='del'>-- RAMDISCS (/dev/ram?)</div><div class='del'>-</div><div class='del'>-- Meta Devices (/dev/md*)</div><div class='del'>-</div><div class='del'>-- Floppy discs (/dev/floppy)</div><div class='del'>-</div><div class='del'>-- Parallel port printers (/dev/printers)</div><div class='del'>-</div><div class='del'>-- Sound devices (/dev/sound)</div><div class='del'>-  Thanks to Eric Dumas &lt;dumas@linux.eu.org&gt; and</div><div class='del'>-  C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- Joysticks (/dev/joysticks)</div><div class='del'>-</div><div class='del'>-- Sparc keyboard (/dev/kbd)</div><div class='del'>-</div><div class='del'>-- DSP56001 digital signal processor (/dev/dsp56k)</div><div class='del'>-</div><div class='del'>-- Apple Desktop Bus (/dev/adb)</div><div class='del'>-</div><div class='del'>-- Coda network file system (/dev/cfs*)</div><div class='del'>-</div><div class='del'>-- Virtual console capture devices (/dev/vcc)</div><div class='del'>-  Thanks to Dennis Hou &lt;smilax@mindmeld.yi.org&gt;</div><div class='del'>-</div><div class='del'>-- Frame buffer devices (/dev/fb)</div><div class='del'>-</div><div class='del'>-- Video capture devices (/dev/v4l)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Allocation of Device Numbers</div><div class='del'>-</div><div class='del'>-Devfs allows you to write a driver which doesn't need to allocate a</div><div class='del'>-device number (major&amp;minor numbers) for the internal operation of the</div><div class='del'>-kernel. However, there are a number of userspace programmes that use</div><div class='del'>-the device number as a unique handle for a device. An example is the</div><div class='del'>-find programme, which uses device numbers to determine whether</div><div class='del'>-an inode is on a different filesystem than another inode. The device</div><div class='del'>-number used is the one for the block device which a filesystem is</div><div class='del'>-using. To preserve compatibility with userspace programmes, block</div><div class='del'>-devices using devfs need to have unique device numbers allocated to</div><div class='del'>-them. Furthermore, POSIX specifies device numbers, so some kind of</div><div class='del'>-device number needs to be presented to userspace.</div><div class='del'>-</div><div class='del'>-The simplest option (especially when porting drivers to devfs) is to</div><div class='del'>-keep using the old major and minor numbers. Devfs will take whatever</div><div class='del'>-values are given for major&amp;minor and pass them onto userspace.</div><div class='del'>-</div><div class='del'>-This device number is a 16 bit number, so this leaves plenty of space</div><div class='del'>-for large numbers of discs and partitions. This scheme can also be</div><div class='del'>-used for character devices, in particular the tty devices, which are</div><div class='del'>-currently limited to 256 pseudo-ttys (this limits the total number of</div><div class='del'>-simultaneous xterms and remote logins).  Note that the device number</div><div class='del'>-is limited to the range 36864-61439 (majors 144-239), in order to</div><div class='del'>-avoid any possible conflicts with existing official allocations.</div><div class='del'>-</div><div class='del'>-Please note that using dynamically allocated block device numbers may</div><div class='del'>-break the NFS daemons (both user and kernel mode), which expect dev_t</div><div class='del'>-for a given device to be constant over the lifetime of remote mounts.</div><div class='del'>-</div><div class='del'>-A final note on this scheme: since it doesn't increase the size of</div><div class='del'>-device numbers, there are no compatibility issues with userspace.</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Questions and Answers</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Making things work</div><div class='del'>-Alternatives to devfs</div><div class='del'>-What I don't like about devfs</div><div class='del'>-How to report bugs</div><div class='del'>-Strange kernel messages</div><div class='del'>-Compilation problems with devfsd</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Making things work</div><div class='del'>-</div><div class='del'>-Here are some common questions and answers.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Devfsd doesn't start</div><div class='del'>-</div><div class='del'>-Make sure you have compiled and installed devfsd</div><div class='del'>-Make sure devfsd is being started from your boot</div><div class='del'>-scripts</div><div class='del'>-Make sure you have configured your kernel to enable devfs (see</div><div class='del'>-below)</div><div class='del'>-Make sure devfs is mounted (see below)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Devfsd is not managing all my permissions</div><div class='del'>-</div><div class='del'>-Make sure you are capturing the appropriate events. For example,</div><div class='del'>-device entries created by the kernel generate REGISTER events,</div><div class='del'>-but those created by devfsd generate CREATE events.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Devfsd is not capturing all REGISTER events</div><div class='del'>-</div><div class='del'>-See the previous entry: you may need to capture CREATE events.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-X will not start</div><div class='del'>-</div><div class='del'>-Make sure you followed the steps </div><div class='del'>-outlined above.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Why don't my network devices appear in devfs?</div><div class='del'>-</div><div class='del'>-This is not a bug. Network devices have their own, completely separate</div><div class='del'>-namespace. They are accessed via socket(2) and</div><div class='del'>-setsockopt(2) calls, and thus require no device nodes. I have</div><div class='del'>-raised the possibilty of moving network devices into the device</div><div class='del'>-namespace, but have had no response.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How can I test if I have devfs compiled into my kernel?</div><div class='del'>-</div><div class='del'>-All filesystems built-in or currently loaded are listed in</div><div class='del'>-/proc/filesystems. If you see a devfs entry, then</div><div class='del'>-you know that devfs was compiled into your kernel. If you have</div><div class='del'>-correctly configured and rebuilt your kernel, then devfs will be</div><div class='del'>-built-in. If you think you've configured it in, but</div><div class='del'>-/proc/filesystems doesn't show it, you've made a mistake.</div><div class='del'>-Common mistakes include:</div><div class='del'>-</div><div class='del'>-Using a 2.2.x kernel without applying the devfs patch (if you</div><div class='del'>-don't know how to patch your kernel, use 2.4.x instead, don't bother</div><div class='del'>-asking me how to patch)</div><div class='del'>-Forgetting to set CONFIG_EXPERIMENTAL=y</div><div class='del'>-Forgetting to set CONFIG_DEVFS_FS=y</div><div class='del'>-Forgetting to set CONFIG_DEVFS_MOUNT=y (if you want devfs</div><div class='del'>-to be automatically mounted at boot)</div><div class='del'>-Editing your .config manually, instead of using make</div><div class='del'>-config or make xconfig</div><div class='del'>-Forgetting to run make dep; make clean after changing the</div><div class='del'>-configuration and before compiling</div><div class='del'>-Forgetting to compile your kernel and modules</div><div class='del'>-Forgetting to install your kernel</div><div class='del'>-Forgetting to install your modules</div><div class='del'>-</div><div class='del'>-Please check twice that you've done all these steps before sending in</div><div class='del'>-a bug report.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How can I test if devfs is mounted on /dev?</div><div class='del'>-</div><div class='del'>-The device filesystem will always create an entry called</div><div class='del'>-".devfsd", which is used to communicate with the daemon. Even</div><div class='del'>-if the daemon is not running, this entry will exist. Testing for the</div><div class='del'>-existence of this entry is the approved method of determining if devfs</div><div class='del'>-is mounted or not. Note that the type of entry (i.e. regular file,</div><div class='del'>-character device, named pipe, etc.) may change without notice. Only</div><div class='del'>-the existence of the entry should be relied upon.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-When I start devfsd, I see the error:</div><div class='del'>-Error opening file: ".devfsd"   No such file or directory?</div><div class='del'>-</div><div class='del'>-This means that devfs is not mounted. Make sure you have devfs mounted.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How do I mount devfs?</div><div class='del'>-</div><div class='del'>-First make sure you have devfs compiled into your kernel (see</div><div class='del'>-above). Then you will either need to:</div><div class='del'>-</div><div class='del'>-set CONFIG_DEVFS_MOUNT=y in your kernel config</div><div class='del'>-pass devfs=mount to your boot loader</div><div class='del'>-mount devfs manually in your boot scripts with:</div><div class='del'>-mount -t none devfs /dev</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Mount by volume LABEL=&lt;label&gt; doesn't work with</div><div class='del'>-devfs</div><div class='del'>-</div><div class='del'>-Most probably you are not mounting devfs onto /dev. What</div><div class='del'>-happens is that if your kernel config has CONFIG_DEVFS_FS=y</div><div class='del'>-then the contents of /proc/partitions will have the devfs</div><div class='del'>-names (such as scsi/host0/bus0/target0/lun0/part1). The</div><div class='del'>-contents of /proc/partitions are used by mount(8) when</div><div class='del'>-mounting by volume label. If devfs is not mounted on /dev,</div><div class='del'>-then mount(8) will fail to find devices. The solution is to</div><div class='del'>-make sure that devfs is mounted on /dev. See above for how to</div><div class='del'>-do that.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-I have extra or incorrect entries in /dev</div><div class='del'>-</div><div class='del'>-You may have stale entries in your dev-state area. Check for a</div><div class='del'>-RESTORE configuration line in your devfsd configuration</div><div class='del'>-(typically /etc/devfsd.conf). If you have this line, check</div><div class='del'>-the contents of the specified directory for stale entries. Remove</div><div class='del'>-any entries which are incorrect, then reboot.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-I get "Unable to open initial console" messages at boot</div><div class='del'>-</div><div class='del'>-This usually happens when you don't have devfs automounted onto</div><div class='del'>-/dev at boot time, and there is no valid</div><div class='del'>-/dev/console entry on your root file-system. Create a valid</div><div class='del'>-/dev/console device node.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Alternatives to devfs</div><div class='del'>-</div><div class='del'>-I've attempted to collate all the anti-devfs proposals and explain</div><div class='del'>-their limitations. Under construction.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Why not just pass device create/remove events to a daemon?</div><div class='del'>-</div><div class='del'>-Here the suggestion is to develop an API in the kernel so that devices</div><div class='del'>-can register create and remove events, and a daemon listens for those</div><div class='del'>-events. The daemon would then populate/depopulate /dev (which</div><div class='del'>-resides on disc).</div><div class='del'>-</div><div class='del'>-This has several limitations:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-it only works for modules loaded and unloaded (or devices inserted</div><div class='del'>-and removed) after the kernel has finished booting. Without a database</div><div class='del'>-of events, there is no way the daemon could fully populate</div><div class='del'>-/dev</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if you add a database to this scheme, the question is then how to</div><div class='del'>-present that database to user-space. If you make it a list of strings</div><div class='del'>-with embedded event codes which are passed through a pipe to the</div><div class='del'>-daemon, then this is only of use to the daemon. I would argue that the</div><div class='del'>-natural way to present this data is via a filesystem (since many of</div><div class='del'>-the events will be of a hierarchical nature), such as devfs.</div><div class='del'>-Presenting the data as a filesystem makes it easy for the user to see</div><div class='del'>-what is available and also makes it easy to write scripts to scan the</div><div class='del'>-"database"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-the tight binding between device nodes and drivers is no longer</div><div class='del'>-possible (requiring the otherwise perfectly avoidable</div><div class='del'>-table lookups)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-you cannot catch inode lookup events on /dev which means</div><div class='del'>-that module autoloading requires device nodes to be created. This is a</div><div class='del'>-problem, particularly for drivers where only a few inodes are created</div><div class='del'>-from a potentially large set</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-this technique can't be used when the root FS is mounted</div><div class='del'>-read-only</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Just implement a better scsidev</div><div class='del'>-</div><div class='del'>-This suggestion involves taking the scsidev programme and</div><div class='del'>-extending it to scan for all devices, not just SCSI devices. The</div><div class='del'>-scsidev programme works by scanning /proc/scsi</div><div class='del'>-</div><div class='del'>-Problems:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-the kernel does not currently provide a list of all devices</div><div class='del'>-available. Not all drivers register entries in /proc or</div><div class='del'>-generate kernel messages</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-there is no uniform mechanism to register devices other than the</div><div class='del'>-devfs API</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-implementing such an API is then the same as the</div><div class='del'>-proposal above</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Put /dev on a ramdisc</div><div class='del'>-</div><div class='del'>-This suggestion involves creating a ramdisc and populating it with</div><div class='del'>-device nodes and then mounting it over /dev.</div><div class='del'>-</div><div class='del'>-Problems:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-this doesn't help when mounting the root filesystem, since you</div><div class='del'>-still need a device node to do that</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if you want to use this technique for the root device node as</div><div class='del'>-well, you need to use initrd. This complicates the booting sequence</div><div class='del'>-and makes it significantly harder to administer and configure. The</div><div class='del'>-initrd is essentially opaque, robbing the system administrator of easy</div><div class='del'>-configuration</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-insufficient information is available to correctly populate the</div><div class='del'>-ramdisc. So we come back to the</div><div class='del'>-proposal above to "solve" this</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-a ramdisc-based solution would take more kernel memory, since the</div><div class='del'>-backing store would be (at best) normal VFS inodes and dentries, which</div><div class='del'>-take 284 bytes and 112 bytes, respectively, for each entry. Compare</div><div class='del'>-that to 72 bytes for devfs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Do nothing: there's no problem</div><div class='del'>-</div><div class='del'>-Sometimes people can be heard to claim that the existing scheme is</div><div class='del'>-fine. This is what they're ignoring:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-device number size (8 bits each for major and minor) is a real</div><div class='del'>-limitation, and must be fixed somehow. Systems with large numbers of</div><div class='del'>-SCSI devices, for example, will continue to consume the remaining</div><div class='del'>-unallocated major numbers. USB will also need to push beyond the 8 bit</div><div class='del'>-minor limitation</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-simply increasing the device number size is insufficient. Apart</div><div class='del'>-from causing a lot of pain, it doesn't solve the management issues</div><div class='del'>-of a /dev with thousands or more device nodes</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ignoring the problem of a huge /dev will not make it go</div><div class='del'>-away, and dismisses the legitimacy of a large number of people who</div><div class='del'>-want a dynamic /dev</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-the standard response then becomes: "write a device management</div><div class='del'>-daemon", which brings us back to the</div><div class='del'>-proposal above</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-What I don't like about devfs</div><div class='del'>-</div><div class='del'>-Here are some common complaints about devfs, and some suggestions and</div><div class='del'>-solutions that may make it more palatable for you. I can't please</div><div class='del'>-everybody, but I do try :-)</div><div class='del'>-</div><div class='del'>-I hate the naming scheme</div><div class='del'>-</div><div class='del'>-First, remember that no naming scheme will please everybody. You hate</div><div class='del'>-the scheme, others love it. Who's to say who's right and who's wrong?</div><div class='del'>-Ultimately, the person who writes the code gets to choose, and what</div><div class='del'>-exists now is a combination of the choices made by the</div><div class='del'>-devfs author and the</div><div class='del'>-kernel maintainer (Linus).</div><div class='del'>-</div><div class='del'>-However, not all is lost. If you want to create your own naming</div><div class='del'>-scheme, it is a simple matter to write a standalone script, hack</div><div class='del'>-devfsd, or write a script called by devfsd. You can create whatever</div><div class='del'>-naming scheme you like.</div><div class='del'>-</div><div class='del'>-Further, if you want to remove all traces of the devfs naming scheme</div><div class='del'>-from /dev, you can mount devfs elsewhere (say</div><div class='del'>-/devfs) and populate /dev with links into</div><div class='del'>-/devfs. This population can be automated using devfsd if you</div><div class='del'>-wish.</div><div class='del'>-</div><div class='del'>-You can even use the VFS binding facility to make the links, rather</div><div class='del'>-than using symbolic links. This way, you don't even have to see the</div><div class='del'>-"destination" of these symbolic links.</div><div class='del'>-</div><div class='del'>-Devfs puts policy into the kernel</div><div class='del'>-</div><div class='del'>-There's already policy in the kernel. Device numbers are in fact</div><div class='del'>-policy (why should the kernel dictate what device numbers I use?).</div><div class='del'>-Face it, some policy has to be in the kernel. The real difference</div><div class='del'>-between device names as policy and device numbers as policy is that</div><div class='del'>-no one will use device numbers directly, because device</div><div class='del'>-numbers are devoid of meaning to humans and are ugly. At least with</div><div class='del'>-the devfs device names, (even though you can add your own naming</div><div class='del'>-scheme) some people will use the devfs-supplied names directly. This</div><div class='del'>-offends some people :-)</div><div class='del'>-</div><div class='del'>-Devfs is bloatware</div><div class='del'>-</div><div class='del'>-This is not even remotely true. As shown above,</div><div class='del'>-both code and data size are quite modest.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-How to report bugs</div><div class='del'>-</div><div class='del'>-If you have (or think you have) a bug with devfs, please follow the</div><div class='del'>-steps below:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-make sure you have enabled debugging output when configuring your</div><div class='del'>-kernel. You will need to set (at least) the following config options:</div><div class='del'>-</div><div class='del'>-CONFIG_DEVFS_DEBUG=y</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='del'>-CONFIG_DEBUG_SLAB=y</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-please make sure you have the latest devfs patches applied. The</div><div class='del'>-latest kernel version might not have the latest devfs patches applied</div><div class='del'>-yet (Linus is very busy)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-save a copy of your complete kernel logs (preferably by</div><div class='del'>-using the dmesg programme) for later inclusion in your bug</div><div class='del'>-report. You may need to use the -s switch to increase the</div><div class='del'>-internal buffer size so you can capture all the boot messages.</div><div class='del'>-Don't edit or trim the dmesg output</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-try booting with devfs=dall passed to the kernel boot</div><div class='del'>-command line (read the documentation on your bootloader on how to do</div><div class='del'>-this), and save the result to a file. This may be quite verbose, and</div><div class='del'>-it may overflow the messages buffer, but try to get as much of it as</div><div class='del'>-you can</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-send a copy of your devfsd configuration file(s)</div><div class='del'>-</div><div class='del'>-send the bug report to me first.</div><div class='del'>-Don't expect that I will see it if you post it to the linux-kernel</div><div class='del'>-mailing list. Include all the information listed above, plus</div><div class='del'>-anything else that you think might be relevant. Put the string</div><div class='del'>-devfs somewhere in the subject line, so my mail filters mark</div><div class='del'>-it as urgent</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Here is a general guide on how to ask questions in a way that greatly</div><div class='del'>-improves your chances of getting a reply:</div><div class='del'>-</div><div class='del'>-http://www.tuxedo.org/~esr/faqs/smart-questions.html. If you have</div><div class='del'>-a bug to report, you should also read</div><div class='del'>-</div><div class='del'>-http://www.chiark.greenend.org.uk/~sgtatham/bugs.html.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Strange kernel messages</div><div class='del'>-</div><div class='del'>-You may see devfs-related messages in your kernel logs. Below are some</div><div class='del'>-messages and what they mean (and what you should do about them, if</div><div class='del'>-anything).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-devfs_register(fred): could not append to parent, err: -17</div><div class='del'>-</div><div class='del'>-You need to check what the error code means, but usually 17 means</div><div class='del'>-EEXIST. This means that a driver attempted to create an entry</div><div class='del'>-fred in a directory, but there already was an entry with that</div><div class='del'>-name. This is often caused by flawed boot scripts which untar a bunch</div><div class='del'>-of inodes into /dev, as a way to restore permissions. This</div><div class='del'>-message is harmless, as the device nodes will still</div><div class='del'>-provide access to the driver (unless you use the devfs=only</div><div class='del'>-boot option, which is only for dedicated souls:-). If you want to get</div><div class='del'>-rid of these annoying messages, upgrade to devfsd-v1.3.20 and use the</div><div class='del'>-recommended RESTORE directive to restore permissions.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-devfs_mk_dir(bill): using old entry in dir: c1808724 ""</div><div class='del'>-</div><div class='del'>-This is similar to the message above, except that a driver attempted</div><div class='del'>-to create a directory named bill, and the parent directory</div><div class='del'>-has an entry with the same name. In this case, to ensure that drivers</div><div class='del'>-continue to work properly, the old entry is re-used and given to the</div><div class='del'>-driver. In 2.5 kernels, the driver is given a NULL entry, and thus,</div><div class='del'>-under rare circumstances, may not create the require device nodes.</div><div class='del'>-The solution is the same as above.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Compilation problems with devfsd</div><div class='del'>-</div><div class='del'>-Usually, you can compile devfsd just by typing in</div><div class='del'>-make in the source directory, followed by a make</div><div class='del'>-install (as root). Sometimes, you may have problems, particularly</div><div class='del'>-on broken configurations.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-error messages relating to DEVFSD_NOTIFY_DELETE</div><div class='del'>-</div><div class='del'>-This happened because you have an ancient set of kernel headers</div><div class='del'>-installed in /usr/include/linux or /usr/src/linux.</div><div class='del'>-Install kernel 2.4.10 or later. You may need to pass the</div><div class='del'>-KERNEL_DIR variable to make (if you did not install</div><div class='del'>-the new kernel sources as /usr/src/linux), or you may copy</div><div class='del'>-the devfs_fs.h file in the kernel source tree into</div><div class='del'>-/usr/include/linux.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Other resources</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Douglas Gilbert has written a useful document at</div><div class='del'>-</div><div class='del'>-http://www.torque.net/sg/devfs_scsi.html which</div><div class='del'>-explores the SCSI subsystem and how it interacts with devfs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Douglas Gilbert has written another useful document at</div><div class='del'>-</div><div class='del'>-http://www.torque.net/scsi/SCSI-2.4-HOWTO/ which</div><div class='del'>-discusses the Linux SCSI subsystem in 2.4.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Johannes Erdfelt has started a discussion paper on Linux and</div><div class='del'>-hot-swap devices, describing what the requirements are for a scalable</div><div class='del'>-solution and how and why he's used devfs+devfsd. Note that this is an</div><div class='del'>-early draft only, available in plain text form at:</div><div class='del'>-</div><div class='del'>-http://johannes.erdfelt.com/hotswap.txt.</div><div class='del'>-Johannes has promised a HTML version will follow.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-I presented an invited </div><div class='del'>-paper</div><div class='del'>-at the</div><div class='del'>-</div><div class='del'>-2nd Annual Storage Management Workshop held in Miamia, Florida,</div><div class='del'>-U.S.A. in October 2000.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Translations of this document</div><div class='del'>-</div><div class='del'>-This document has been translated into other languages.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The document master (in English) by rgooch@atnf.csiro.au is</div><div class='del'>-available at</div><div class='del'>-</div><div class='del'>-http://www.atnf.csiro.au/~rgooch/linux/docs/devfs.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-A Korean translation by viatoris@nownuri.net is available at</div><div class='del'>-</div><div class='del'>-http://your.destiny.pe.kr/devfs/devfs.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>------------------------------------------------------------------------------</div><div class='del'>-Most flags courtesy of ITA's </div><div class='del'>-Flags of All Countries</div><div class='del'>-used with permission. </div><div class='head'>diff --git a/Documentation/filesystems/devfs/ToDo b/Documentation/filesystems/devfs/ToDo<br/>deleted file mode 100644<br/>index afd5a8f2c19b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/devfs/ToDo?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/ToDo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-		Device File System (devfs) ToDo List</div><div class='del'>-</div><div class='del'>-		Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-</div><div class='del'>-			      3-JUL-2000</div><div class='del'>-</div><div class='del'>-This is a list of things to be done for better devfs support in the</div><div class='del'>-Linux kernel. If you'd like to contribute to the devfs, please have a</div><div class='del'>-look at this list for anything that is unallocated. Also, if there are</div><div class='del'>-items missing (surely), please contact me so I can add them to the</div><div class='del'>-list (preferably with your name attached to them:-).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-- &gt;256 ptys</div><div class='del'>-  Thanks to C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-</div><div class='del'>-- Amiga floppy driver (drivers/block/amiflop.c)</div><div class='del'>-</div><div class='del'>-- Atari floppy driver (drivers/block/ataflop.c)</div><div class='del'>-</div><div class='del'>-- SWIM3 (Super Woz Integrated Machine 3) floppy driver (drivers/block/swim3.c)</div><div class='del'>-</div><div class='del'>-- Amiga ZorroII ramdisc driver (drivers/block/z2ram.c)</div><div class='del'>-</div><div class='del'>-- Parallel port ATAPI CD-ROM (drivers/block/paride/pcd.c)</div><div class='del'>-</div><div class='del'>-- Parallel port ATAPI floppy (drivers/block/paride/pf.c)</div><div class='del'>-</div><div class='del'>-- AP1000 block driver (drivers/ap1000/ap.c, drivers/ap1000/ddv.c)</div><div class='del'>-</div><div class='del'>-- Archimedes floppy (drivers/acorn/block/fd1772.c)</div><div class='del'>-</div><div class='del'>-- MFM hard drive (drivers/acorn/block/mfmhd.c)</div><div class='del'>-</div><div class='del'>-- I2O block device (drivers/message/i2o/i2o_block.c)</div><div class='del'>-</div><div class='del'>-- ST-RAM device (arch/m68k/atari/stram.c)</div><div class='del'>-</div><div class='del'>-- Raw devices</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/filesystems/devfs/boot-options b/Documentation/filesystems/devfs/boot-options<br/>deleted file mode 100644<br/>index df3d33b03e0a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/devfs/boot-options?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/devfs/boot-options</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- auto-fill -*-                                                         */</div><div class='del'>-</div><div class='del'>-		Device File System (devfs) Boot Options</div><div class='del'>-</div><div class='del'>-		Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-</div><div class='del'>-			      18-AUG-2001</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-When CONFIG_DEVFS_DEBUG is enabled, you can pass several boot options</div><div class='del'>-to the kernel to debug devfs. The boot options are prefixed by</div><div class='del'>-"devfs=", and are separated by commas. Spaces are not allowed. The</div><div class='del'>-syntax looks like this:</div><div class='del'>-</div><div class='del'>-devfs=&lt;option1&gt;,&lt;option2&gt;,&lt;option3&gt;</div><div class='del'>-</div><div class='del'>-and so on. For example, if you wanted to turn on debugging for module</div><div class='del'>-load requests and device registration, you would do:</div><div class='del'>-</div><div class='del'>-devfs=dmod,dreg</div><div class='del'>-</div><div class='del'>-You may prefix "no" to any option. This will invert the option.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Debugging Options</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-These requires CONFIG_DEVFS_DEBUG to be enabled.</div><div class='del'>-Note that all debugging options have 'd' as the first character. By</div><div class='del'>-default all options are off. All debugging output is sent to the</div><div class='del'>-kernel logs. The debugging options do not take effect until the devfs</div><div class='del'>-version message appears (just prior to the root filesystem being</div><div class='del'>-mounted).</div><div class='del'>-</div><div class='del'>-These are the options:</div><div class='del'>-</div><div class='del'>-dmod		print module load requests to &lt;request_module&gt;</div><div class='del'>-</div><div class='del'>-dreg		print device register requests to &lt;devfs_register&gt;</div><div class='del'>-</div><div class='del'>-dunreg		print device unregister requests to &lt;devfs_unregister&gt;</div><div class='del'>-</div><div class='del'>-dchange		print device change requests to &lt;devfs_set_flags&gt;</div><div class='del'>-</div><div class='del'>-dilookup	print inode lookup requests</div><div class='del'>-</div><div class='del'>-diget		print VFS inode allocations</div><div class='del'>-</div><div class='del'>-diunlink	print inode unlinks</div><div class='del'>-</div><div class='del'>-dichange	print inode changes</div><div class='del'>-</div><div class='del'>-dimknod		print calls to mknod(2)</div><div class='del'>-</div><div class='del'>-dall		some debugging turned on</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Other Options</div><div class='del'>-=============</div><div class='del'>-</div><div class='del'>-These control the default behaviour of devfs. The options are:</div><div class='del'>-</div><div class='del'>-mount		mount devfs onto /dev at boot time</div><div class='del'>-</div><div class='del'>-only		disable non-devfs device nodes for devfs-capable drivers</div><div class='head'>diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt<br/>index afb1335c05d6..4aecc9bdb273 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ext3.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/ext3.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ext3.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/ext3.txt</a></div><div class='hunk'>@@ -113,6 +113,14 @@ noquota</div><div class='ctx'> grpquota</div><div class='ctx'> usrquota</div><div class='ctx'> </div><div class='add'>+bh		(*)	ext3 associates buffer heads to data pages to</div><div class='add'>+nobh			(a) cache disk block mapping information</div><div class='add'>+			(b) link pages into transaction to provide</div><div class='add'>+			    ordering guarantees.</div><div class='add'>+			"bh" option forces use of buffer heads.</div><div class='add'>+			"nobh" option tries to avoid associating buffer</div><div class='add'>+			heads (supported only for "writeback" mode).</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Specification</div><div class='ctx'> =============</div><div class='head'>diff --git a/Documentation/filesystems/fuse.txt b/Documentation/filesystems/fuse.txt<br/>index 33f74310d161..a584f05403a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/fuse.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/fuse.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/fuse.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/fuse.txt</a></div><div class='hunk'>@@ -18,6 +18,14 @@ Non-privileged mount (or user mount):</div><div class='ctx'>   user.  NOTE: this is not the same as mounts allowed with the "user"</div><div class='ctx'>   option in /etc/fstab, which is not discussed here.</div><div class='ctx'> </div><div class='add'>+Filesystem connection:</div><div class='add'>+</div><div class='add'>+  A connection between the filesystem daemon and the kernel.  The</div><div class='add'>+  connection exists until either the daemon dies, or the filesystem is</div><div class='add'>+  umounted.  Note that detaching (or lazy umounting) the filesystem</div><div class='add'>+  does _not_ break the connection, in this case it will exist until</div><div class='add'>+  the last reference to the filesystem is released.</div><div class='add'>+</div><div class='ctx'> Mount owner:</div><div class='ctx'> </div><div class='ctx'>   The user who does the mounting.</div><div class='hunk'>@@ -86,16 +94,20 @@ Mount options</div><div class='ctx'>   The default is infinite.  Note that the size of read requests is</div><div class='ctx'>   limited anyway to 32 pages (which is 128kbyte on i386).</div><div class='ctx'> </div><div class='del'>-Sysfs</div><div class='del'>-~~~~~</div><div class='add'>+Control filesystem</div><div class='add'>+~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+There's a control filesystem for FUSE, which can be mounted by:</div><div class='ctx'> </div><div class='del'>-FUSE sets up the following hierarchy in sysfs:</div><div class='add'>+  mount -t fusectl none /sys/fs/fuse/connections</div><div class='ctx'> </div><div class='del'>-  /sys/fs/fuse/connections/N/</div><div class='add'>+Mounting it under the '/sys/fs/fuse/connections' directory makes it</div><div class='add'>+backwards compatible with earlier versions.</div><div class='ctx'> </div><div class='del'>-where N is an increasing number allocated to each new connection.</div><div class='add'>+Under the fuse control filesystem each connection has a directory</div><div class='add'>+named by a unique number.</div><div class='ctx'> </div><div class='del'>-For each connection the following attributes are defined:</div><div class='add'>+For each connection the following files exist within this directory:</div><div class='ctx'> </div><div class='ctx'>  'waiting'</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +122,47 @@ For each connection the following attributes are defined:</div><div class='ctx'>   connection.  This means that all waiting requests will be aborted an</div><div class='ctx'>   error returned for all aborted and new requests.</div><div class='ctx'> </div><div class='del'>-Only a privileged user may read or write these attributes.</div><div class='add'>+Only the owner of the mount may read or write these files.</div><div class='add'>+</div><div class='add'>+Interrupting filesystem operations</div><div class='add'>+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+If a process issuing a FUSE filesystem request is interrupted, the</div><div class='add'>+following will happen:</div><div class='add'>+</div><div class='add'>+  1) If the request is not yet sent to userspace AND the signal is</div><div class='add'>+     fatal (SIGKILL or unhandled fatal signal), then the request is</div><div class='add'>+     dequeued and returns immediately.</div><div class='add'>+</div><div class='add'>+  2) If the request is not yet sent to userspace AND the signal is not</div><div class='add'>+     fatal, then an 'interrupted' flag is set for the request.  When</div><div class='add'>+     the request has been successfully transfered to userspace and</div><div class='add'>+     this flag is set, an INTERRUPT request is queued.</div><div class='add'>+</div><div class='add'>+  3) If the request is already sent to userspace, then an INTERRUPT</div><div class='add'>+     request is queued.</div><div class='add'>+</div><div class='add'>+INTERRUPT requests take precedence over other requests, so the</div><div class='add'>+userspace filesystem will receive queued INTERRUPTs before any others.</div><div class='add'>+</div><div class='add'>+The userspace filesystem may ignore the INTERRUPT requests entirely,</div><div class='add'>+or may honor them by sending a reply to the _original_ request, with</div><div class='add'>+the error set to EINTR.</div><div class='add'>+</div><div class='add'>+It is also possible that there's a race between processing the</div><div class='add'>+original request and it's INTERRUPT request.  There are two possibilities:</div><div class='add'>+</div><div class='add'>+  1) The INTERRUPT request is processed before the original request is</div><div class='add'>+     processed</div><div class='add'>+</div><div class='add'>+  2) The INTERRUPT request is processed after the original request has</div><div class='add'>+     been answered</div><div class='add'>+</div><div class='add'>+If the filesystem cannot find the original request, it should wait for</div><div class='add'>+some timeout and/or a number of new requests to arrive, after which it</div><div class='add'>+should reply to the INTERRUPT request with an EAGAIN error.  In case</div><div class='add'>+1) the INTERRUPT request will be requeued.  In case 2) the INTERRUPT</div><div class='add'>+reply will be ignored.</div><div class='ctx'> </div><div class='ctx'> Aborting a filesystem connection</div><div class='ctx'> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='hunk'>@@ -139,8 +191,8 @@ the filesystem.  There are several ways to do this:</div><div class='ctx'>   - Use forced umount (umount -f).  Works in all cases but only if</div><div class='ctx'>     filesystem is still attached (it hasn't been lazy unmounted)</div><div class='ctx'> </div><div class='del'>-  - Abort filesystem through the sysfs interface.  Most powerful</div><div class='del'>-    method, always works.</div><div class='add'>+  - Abort filesystem through the FUSE control filesystem.  Most</div><div class='add'>+    powerful method, always works.</div><div class='ctx'> </div><div class='ctx'> How do non-privileged mounts work?</div><div class='ctx'> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='hunk'>@@ -304,25 +356,7 @@ Scenario 1 -  Simple deadlock</div><div class='ctx'>  |                                    |     for "file"]</div><div class='ctx'>  |                                    |    *DEADLOCK*</div><div class='ctx'> </div><div class='del'>-The solution for this is to allow requests to be interrupted while</div><div class='del'>-they are in userspace:</div><div class='del'>-</div><div class='del'>- |      [interrupted by signal]       |</div><div class='del'>- |    &lt;fuse_unlink()                  |</div><div class='del'>- |    [release semaphore]             |    [semaphore acquired]</div><div class='del'>- |  &lt;sys_unlink()                     |</div><div class='del'>- |                                    |    &gt;fuse_unlink()</div><div class='del'>- |                                    |      [queue req on fc-&gt;pending]</div><div class='del'>- |                                    |      [wake up fc-&gt;waitq]</div><div class='del'>- |                                    |      [sleep on req-&gt;waitq]</div><div class='del'>-</div><div class='del'>-If the filesystem daemon was single threaded, this will stop here,</div><div class='del'>-since there's no other thread to dequeue and execute the request.</div><div class='del'>-In this case the solution is to kill the FUSE daemon as well.  If</div><div class='del'>-there are multiple serving threads, you just have to kill them as</div><div class='del'>-long as any remain.</div><div class='del'>-</div><div class='del'>-Moral: a filesystem which deadlocks, can soon find itself dead.</div><div class='add'>+The solution for this is to allow the filesystem to be aborted.</div><div class='ctx'> </div><div class='ctx'> Scenario 2 - Tricky deadlock</div><div class='ctx'> ----------------------------</div><div class='hunk'>@@ -355,24 +389,14 @@ but is caused by a pagefault.</div><div class='ctx'>  |                                    |           [lock page]</div><div class='ctx'>  |                                    |           * DEADLOCK *</div><div class='ctx'> </div><div class='del'>-Solution is again to let the the request be interrupted (not</div><div class='del'>-elaborated further).</div><div class='del'>-</div><div class='del'>-An additional problem is that while the write buffer is being</div><div class='del'>-copied to the request, the request must not be interrupted.  This</div><div class='del'>-is because the destination address of the copy may not be valid</div><div class='del'>-after the request is interrupted.</div><div class='del'>-</div><div class='del'>-This is solved with doing the copy atomically, and allowing</div><div class='del'>-interruption while the page(s) belonging to the write buffer are</div><div class='del'>-faulted with get_user_pages().  The 'req-&gt;locked' flag indicates</div><div class='del'>-when the copy is taking place, and interruption is delayed until</div><div class='del'>-this flag is unset.</div><div class='add'>+Solution is basically the same as above.</div><div class='ctx'> </div><div class='del'>-Scenario 3 - Tricky deadlock with asynchronous read</div><div class='del'>----------------------------------------------------</div><div class='add'>+An additional problem is that while the write buffer is being copied</div><div class='add'>+to the request, the request must not be interrupted/aborted.  This is</div><div class='add'>+because the destination address of the copy may not be valid after the</div><div class='add'>+request has returned.</div><div class='ctx'> </div><div class='del'>-The same situation as above, except thread-1 will wait on page lock</div><div class='del'>-and hence it will be uninterruptible as well.  The solution is to</div><div class='del'>-abort the connection with forced umount (if mount is attached) or</div><div class='del'>-through the abort attribute in sysfs.</div><div class='add'>+This is solved with doing the copy atomically, and allowing abort</div><div class='add'>+while the page(s) belonging to the write buffer are faulted with</div><div class='add'>+get_user_pages().  The 'req-&gt;locked' flag indicates when the copy is</div><div class='add'>+taking place, and abort is delayed until this flag is unset.</div><div class='head'>diff --git a/Documentation/filesystems/inotify.txt b/Documentation/filesystems/inotify.txt<br/>index 6d501903f68e..59a919f16144 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/inotify.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/inotify.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/inotify.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/inotify.txt</a></div><div class='hunk'>@@ -69,17 +69,135 @@ Prototypes:</div><div class='ctx'> 	int inotify_rm_watch (int fd, __u32 mask);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-(iii) Internal Kernel Implementation</div><div class='add'>+(iii) Kernel Interface</div><div class='ctx'> </div><div class='del'>-Each inotify instance is associated with an inotify_device structure.</div><div class='add'>+Inotify's kernel API consists a set of functions for managing watches and an</div><div class='add'>+event callback.</div><div class='add'>+</div><div class='add'>+To use the kernel API, you must first initialize an inotify instance with a set</div><div class='add'>+of inotify_operations.  You are given an opaque inotify_handle, which you use</div><div class='add'>+for any further calls to inotify.</div><div class='add'>+</div><div class='add'>+    struct inotify_handle *ih = inotify_init(my_event_handler);</div><div class='add'>+</div><div class='add'>+You must provide a function for processing events and a function for destroying</div><div class='add'>+the inotify watch.</div><div class='add'>+</div><div class='add'>+    void handle_event(struct inotify_watch *watch, u32 wd, u32 mask,</div><div class='add'>+    	              u32 cookie, const char *name, struct inode *inode)</div><div class='add'>+</div><div class='add'>+	watch - the pointer to the inotify_watch that triggered this call</div><div class='add'>+	wd - the watch descriptor</div><div class='add'>+	mask - describes the event that occurred</div><div class='add'>+	cookie - an identifier for synchronizing events</div><div class='add'>+	name - the dentry name for affected files in a directory-based event</div><div class='add'>+	inode - the affected inode in a directory-based event</div><div class='add'>+</div><div class='add'>+    void destroy_watch(struct inotify_watch *watch)</div><div class='add'>+</div><div class='add'>+You may add watches by providing a pre-allocated and initialized inotify_watch</div><div class='add'>+structure and specifying the inode to watch along with an inotify event mask.</div><div class='add'>+You must pin the inode during the call.  You will likely wish to embed the</div><div class='add'>+inotify_watch structure in a structure of your own which contains other</div><div class='add'>+information about the watch.  Once you add an inotify watch, it is immediately</div><div class='add'>+subject to removal depending on filesystem events.  You must grab a reference if</div><div class='add'>+you depend on the watch hanging around after the call.</div><div class='add'>+</div><div class='add'>+    inotify_init_watch(&amp;my_watch-&gt;iwatch);</div><div class='add'>+    inotify_get_watch(&amp;my_watch-&gt;iwatch);	// optional</div><div class='add'>+    s32 wd = inotify_add_watch(ih, &amp;my_watch-&gt;iwatch, inode, mask);</div><div class='add'>+    inotify_put_watch(&amp;my_watch-&gt;iwatch);	// optional</div><div class='add'>+</div><div class='add'>+You may use the watch descriptor (wd) or the address of the inotify_watch for</div><div class='add'>+other inotify operations.  You must not directly read or manipulate data in the</div><div class='add'>+inotify_watch.  Additionally, you must not call inotify_add_watch() more than</div><div class='add'>+once for a given inotify_watch structure, unless you have first called either</div><div class='add'>+inotify_rm_watch() or inotify_rm_wd().</div><div class='add'>+</div><div class='add'>+To determine if you have already registered a watch for a given inode, you may</div><div class='add'>+call inotify_find_watch(), which gives you both the wd and the watch pointer for</div><div class='add'>+the inotify_watch, or an error if the watch does not exist.</div><div class='add'>+</div><div class='add'>+    wd = inotify_find_watch(ih, inode, &amp;watchp);</div><div class='add'>+</div><div class='add'>+You may use container_of() on the watch pointer to access your own data</div><div class='add'>+associated with a given watch.  When an existing watch is found,</div><div class='add'>+inotify_find_watch() bumps the refcount before releasing its locks.  You must</div><div class='add'>+put that reference with:</div><div class='add'>+</div><div class='add'>+    put_inotify_watch(watchp);</div><div class='add'>+</div><div class='add'>+Call inotify_find_update_watch() to update the event mask for an existing watch.</div><div class='add'>+inotify_find_update_watch() returns the wd of the updated watch, or an error if</div><div class='add'>+the watch does not exist.</div><div class='add'>+</div><div class='add'>+    wd = inotify_find_update_watch(ih, inode, mask);</div><div class='add'>+</div><div class='add'>+An existing watch may be removed by calling either inotify_rm_watch() or</div><div class='add'>+inotify_rm_wd().</div><div class='add'>+</div><div class='add'>+    int ret = inotify_rm_watch(ih, &amp;my_watch-&gt;iwatch);</div><div class='add'>+    int ret = inotify_rm_wd(ih, wd);</div><div class='add'>+</div><div class='add'>+A watch may be removed while executing your event handler with the following:</div><div class='add'>+</div><div class='add'>+    inotify_remove_watch_locked(ih, iwatch);</div><div class='add'>+</div><div class='add'>+Call inotify_destroy() to remove all watches from your inotify instance and</div><div class='add'>+release it.  If there are no outstanding references, inotify_destroy() will call</div><div class='add'>+your destroy_watch op for each watch.</div><div class='add'>+</div><div class='add'>+    inotify_destroy(ih);</div><div class='add'>+</div><div class='add'>+When inotify removes a watch, it sends an IN_IGNORED event to your callback.</div><div class='add'>+You may use this event as an indication to free the watch memory.  Note that</div><div class='add'>+inotify may remove a watch due to filesystem events, as well as by your request.</div><div class='add'>+If you use IN_ONESHOT, inotify will remove the watch after the first event, at</div><div class='add'>+which point you may call the final inotify_put_watch.</div><div class='add'>+</div><div class='add'>+(iv) Kernel Interface Prototypes</div><div class='add'>+</div><div class='add'>+	struct inotify_handle *inotify_init(struct inotify_operations *ops);</div><div class='add'>+</div><div class='add'>+	inotify_init_watch(struct inotify_watch *watch);</div><div class='add'>+</div><div class='add'>+	s32 inotify_add_watch(struct inotify_handle *ih,</div><div class='add'>+		              struct inotify_watch *watch,</div><div class='add'>+			      struct inode *inode, u32 mask);</div><div class='add'>+</div><div class='add'>+	s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode,</div><div class='add'>+			       struct inotify_watch **watchp);</div><div class='add'>+</div><div class='add'>+	s32 inotify_find_update_watch(struct inotify_handle *ih,</div><div class='add'>+				      struct inode *inode, u32 mask);</div><div class='add'>+</div><div class='add'>+	int inotify_rm_wd(struct inotify_handle *ih, u32 wd);</div><div class='add'>+</div><div class='add'>+	int inotify_rm_watch(struct inotify_handle *ih,</div><div class='add'>+			     struct inotify_watch *watch);</div><div class='add'>+</div><div class='add'>+	void inotify_remove_watch_locked(struct inotify_handle *ih,</div><div class='add'>+					 struct inotify_watch *watch);</div><div class='add'>+</div><div class='add'>+	void inotify_destroy(struct inotify_handle *ih);</div><div class='add'>+</div><div class='add'>+	void get_inotify_watch(struct inotify_watch *watch);</div><div class='add'>+	void put_inotify_watch(struct inotify_watch *watch);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+(v) Internal Kernel Implementation</div><div class='add'>+</div><div class='add'>+Each inotify instance is represented by an inotify_handle structure.</div><div class='add'>+Inotify's userspace consumers also have an inotify_device which is</div><div class='add'>+associated with the inotify_handle, and on which events are queued.</div><div class='ctx'> </div><div class='ctx'> Each watch is associated with an inotify_watch structure.  Watches are chained</div><div class='del'>-off of each associated device and each associated inode.</div><div class='add'>+off of each associated inotify_handle and each associated inode.</div><div class='ctx'> </div><div class='del'>-See fs/inotify.c for the locking and lifetime rules.</div><div class='add'>+See fs/inotify.c and fs/inotify_user.c for the locking and lifetime rules.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-(iv) Rationale</div><div class='add'>+(vi) Rationale</div><div class='ctx'> </div><div class='ctx'> Q: What is the design decision behind not tying the watch to the open fd of</div><div class='ctx'>    the watched object?</div><div class='hunk'>@@ -145,7 +263,7 @@ A: The poor user-space interface is the second biggest problem with dnotify.</div><div class='ctx'>    file descriptor-based one that allows basic file I/O and poll/select.</div><div class='ctx'>    Obtaining the fd and managing the watches could have been done either via a</div><div class='ctx'>    device file or a family of new system calls.  We decided to implement a</div><div class='del'>-   family of system calls because that is the preffered approach for new kernel</div><div class='add'>+   family of system calls because that is the preferred approach for new kernel</div><div class='ctx'>    interfaces.  The only real difference was whether we wanted to use open(2)</div><div class='ctx'>    and ioctl(2) or a couple of new system calls.  System calls beat ioctls.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting<br/>index 2f388460cbe7..5531694059ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/porting?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/porting</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/porting?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/porting</a></div><div class='hunk'>@@ -50,10 +50,11 @@ Turn your foo_read_super() into a function that would return 0 in case of</div><div class='ctx'> success and negative number in case of error (-EINVAL unless you have more</div><div class='ctx'> informative error value to report).  Call it foo_fill_super().  Now declare</div><div class='ctx'> </div><div class='del'>-struct super_block foo_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+int foo_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, ext2_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, foo_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> (or similar with s/bdev/nodev/ or s/bdev/single/, depending on the kind of</div><div class='head'>diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt<br/>index 60ab61e54e8a..25981e2e51be 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/ramfs-rootfs-initramfs.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/ramfs-rootfs-initramfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/ramfs-rootfs-initramfs.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/ramfs-rootfs-initramfs.txt</a></div><div class='hunk'>@@ -70,11 +70,13 @@ tmpfs mounts.  See Documentation/filesystems/tmpfs.txt for more information.</div><div class='ctx'> What is rootfs?</div><div class='ctx'> ---------------</div><div class='ctx'> </div><div class='del'>-Rootfs is a special instance of ramfs, which is always present in 2.6 systems.</div><div class='del'>-(It's used internally as the starting and stopping point for searches of the</div><div class='del'>-kernel's doubly-linked list of mount points.)</div><div class='add'>+Rootfs is a special instance of ramfs (or tmpfs, if that's enabled), which is</div><div class='add'>+always present in 2.6 systems.  You can't unmount rootfs for approximately the</div><div class='add'>+same reason you can't kill the init process; rather than having special code</div><div class='add'>+to check for and handle an empty list, it's smaller and simpler for the kernel</div><div class='add'>+to just make sure certain lists can't become empty.</div><div class='ctx'> </div><div class='del'>-Most systems just mount another filesystem over it and ignore it.  The</div><div class='add'>+Most systems just mount another filesystem over rootfs and ignore it.  The</div><div class='ctx'> amount of space an empty instance of ramfs takes up is tiny.</div><div class='ctx'> </div><div class='ctx'> What is initramfs?</div><div class='hunk'>@@ -92,14 +94,16 @@ out of that.</div><div class='ctx'> </div><div class='ctx'> All this differs from the old initrd in several ways:</div><div class='ctx'> </div><div class='del'>-  - The old initrd was a separate file, while the initramfs archive is linked</div><div class='del'>-    into the linux kernel image.  (The directory linux-*/usr is devoted to</div><div class='del'>-    generating this archive during the build.)</div><div class='add'>+  - The old initrd was always a separate file, while the initramfs archive is</div><div class='add'>+    linked into the linux kernel image.  (The directory linux-*/usr is devoted</div><div class='add'>+    to generating this archive during the build.)</div><div class='ctx'> </div><div class='ctx'>   - The old initrd file was a gzipped filesystem image (in some file format,</div><div class='del'>-    such as ext2, that had to be built into the kernel), while the new</div><div class='add'>+    such as ext2, that needed a driver built into the kernel), while the new</div><div class='ctx'>     initramfs archive is a gzipped cpio archive (like tar only simpler,</div><div class='del'>-    see cpio(1) and Documentation/early-userspace/buffer-format.txt).</div><div class='add'>+    see cpio(1) and Documentation/early-userspace/buffer-format.txt).  The</div><div class='add'>+    kernel's cpio extraction code is not only extremely small, it's also</div><div class='add'>+    __init data that can be discarded during the boot process.</div><div class='ctx'> </div><div class='ctx'>   - The program run by the old initrd (which was called /initrd, not /init) did</div><div class='ctx'>     some setup and then returned to the kernel, while the init program from</div><div class='hunk'>@@ -124,13 +128,14 @@ Populating initramfs:</div><div class='ctx'> </div><div class='ctx'> The 2.6 kernel build process always creates a gzipped cpio format initramfs</div><div class='ctx'> archive and links it into the resulting kernel binary.  By default, this</div><div class='del'>-archive is empty (consuming 134 bytes on x86).  The config option</div><div class='del'>-CONFIG_INITRAMFS_SOURCE (for some reason buried under devices-&gt;block devices</div><div class='del'>-in menuconfig, and living in usr/Kconfig) can be used to specify a source for</div><div class='del'>-the initramfs archive, which will automatically be incorporated into the</div><div class='del'>-resulting binary.  This option can point to an existing gzipped cpio archive, a</div><div class='del'>-directory containing files to be archived, or a text file specification such</div><div class='del'>-as the following example:</div><div class='add'>+archive is empty (consuming 134 bytes on x86).</div><div class='add'>+</div><div class='add'>+The config option CONFIG_INITRAMFS_SOURCE (for some reason buried under</div><div class='add'>+devices-&gt;block devices in menuconfig, and living in usr/Kconfig) can be used</div><div class='add'>+to specify a source for the initramfs archive, which will automatically be</div><div class='add'>+incorporated into the resulting binary.  This option can point to an existing</div><div class='add'>+gzipped cpio archive, a directory containing files to be archived, or a text</div><div class='add'>+file specification such as the following example:</div><div class='ctx'> </div><div class='ctx'>   dir /dev 755 0 0</div><div class='ctx'>   nod /dev/console 644 0 0 c 5 1</div><div class='hunk'>@@ -146,23 +151,84 @@ as the following example:</div><div class='ctx'> Run "usr/gen_init_cpio" (after the kernel build) to get a usage message</div><div class='ctx'> documenting the above file format.</div><div class='ctx'> </div><div class='del'>-One advantage of the text file is that root access is not required to</div><div class='add'>+One advantage of the configuration file is that root access is not required to</div><div class='ctx'> set permissions or create device nodes in the new archive.  (Note that those</div><div class='ctx'> two example "file" entries expect to find files named "init.sh" and "busybox" in</div><div class='ctx'> a directory called "initramfs", under the linux-2.6.* directory.  See</div><div class='ctx'> Documentation/early-userspace/README for more details.)</div><div class='ctx'> </div><div class='del'>-The kernel does not depend on external cpio tools, gen_init_cpio is created</div><div class='del'>-from usr/gen_init_cpio.c which is entirely self-contained, and the kernel's</div><div class='del'>-boot-time extractor is also (obviously) self-contained.  However, if you _do_</div><div class='del'>-happen to have cpio installed, the following command line can extract the</div><div class='del'>-generated cpio image back into its component files:</div><div class='add'>+The kernel does not depend on external cpio tools.  If you specify a</div><div class='add'>+directory instead of a configuration file, the kernel's build infrastructure</div><div class='add'>+creates a configuration file from that directory (usr/Makefile calls</div><div class='add'>+scripts/gen_initramfs_list.sh), and proceeds to package up that directory</div><div class='add'>+using the config file (by feeding it to usr/gen_init_cpio, which is created</div><div class='add'>+from usr/gen_init_cpio.c).  The kernel's build-time cpio creation code is</div><div class='add'>+entirely self-contained, and the kernel's boot-time extractor is also</div><div class='add'>+(obviously) self-contained.</div><div class='add'>+</div><div class='add'>+The one thing you might need external cpio utilities installed for is creating</div><div class='add'>+or extracting your own preprepared cpio files to feed to the kernel build</div><div class='add'>+(instead of a config file or directory).</div><div class='add'>+</div><div class='add'>+The following command line can extract a cpio image (either by the above script</div><div class='add'>+or by the kernel build) back into its component files:</div><div class='ctx'> </div><div class='ctx'>   cpio -i -d -H newc -F initramfs_data.cpio --no-absolute-filenames</div><div class='ctx'> </div><div class='add'>+The following shell script can create a prebuilt cpio archive you can</div><div class='add'>+use in place of the above config file:</div><div class='add'>+</div><div class='add'>+  #!/bin/sh</div><div class='add'>+</div><div class='add'>+  # Copyright 2006 Rob Landley &lt;rob@landley.net&gt; and TimeSys Corporation.</div><div class='add'>+  # Licensed under GPL version 2</div><div class='add'>+</div><div class='add'>+  if [ $# -ne 2 ]</div><div class='add'>+  then</div><div class='add'>+    echo "usage: mkinitramfs directory imagename.cpio.gz"</div><div class='add'>+    exit 1</div><div class='add'>+  fi</div><div class='add'>+</div><div class='add'>+  if [ -d "$1" ]</div><div class='add'>+  then</div><div class='add'>+    echo "creating $2 from $1"</div><div class='add'>+    (cd "$1"; find . | cpio -o -H newc | gzip) &gt; "$2"</div><div class='add'>+  else</div><div class='add'>+    echo "First argument must be a directory"</div><div class='add'>+    exit 1</div><div class='add'>+  fi</div><div class='add'>+</div><div class='add'>+Note: The cpio man page contains some bad advice that will break your initramfs</div><div class='add'>+archive if you follow it.  It says "A typical way to generate the list</div><div class='add'>+of filenames is with the find command; you should give find the -depth option</div><div class='add'>+to minimize problems with permissions on directories that are unwritable or not</div><div class='add'>+searchable."  Don't do this when creating initramfs.cpio.gz images, it won't</div><div class='add'>+work.  The Linux kernel cpio extractor won't create files in a directory that</div><div class='add'>+doesn't exist, so the directory entries must go before the files that go in</div><div class='add'>+those directories.  The above script gets them in the right order.</div><div class='add'>+</div><div class='add'>+External initramfs images:</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+If the kernel has initrd support enabled, an external cpio.gz archive can also</div><div class='add'>+be passed into a 2.6 kernel in place of an initrd.  In this case, the kernel</div><div class='add'>+will autodetect the type (initramfs, not initrd) and extract the external cpio</div><div class='add'>+archive into rootfs before trying to run /init.</div><div class='add'>+</div><div class='add'>+This has the memory efficiency advantages of initramfs (no ramdisk block</div><div class='add'>+device) but the separate packaging of initrd (which is nice if you have</div><div class='add'>+non-GPL code you'd like to run from initramfs, without conflating it with</div><div class='add'>+the GPL licensed Linux kernel binary).</div><div class='add'>+</div><div class='add'>+It can also be used to supplement the kernel's built-in initamfs image.  The</div><div class='add'>+files in the external archive will overwrite any conflicting files in</div><div class='add'>+the built-in initramfs archive.  Some distributors also prefer to customize</div><div class='add'>+a single kernel image with task-specific initramfs images, without recompiling.</div><div class='add'>+</div><div class='ctx'> Contents of initramfs:</div><div class='ctx'> ----------------------</div><div class='ctx'> </div><div class='add'>+An initramfs archive is a complete self-contained root filesystem for Linux.</div><div class='ctx'> If you don't already understand what shared libraries, devices, and paths</div><div class='ctx'> you need to get a minimal root filesystem up and running, here are some</div><div class='ctx'> references:</div><div class='hunk'>@@ -176,13 +242,36 @@ code against, along with some related utilities.  It is BSD licensed.</div><div class='ctx'> </div><div class='ctx'> I use uClibc (http://www.uclibc.org) and busybox (http://www.busybox.net)</div><div class='ctx'> myself.  These are LGPL and GPL, respectively.  (A self-contained initramfs</div><div class='del'>-package is planned for the busybox 1.2 release.)</div><div class='add'>+package is planned for the busybox 1.3 release.)</div><div class='ctx'> </div><div class='ctx'> In theory you could use glibc, but that's not well suited for small embedded</div><div class='ctx'> uses like this.  (A "hello world" program statically linked against glibc is</div><div class='ctx'> over 400k.  With uClibc it's 7k.  Also note that glibc dlopens libnss to do</div><div class='ctx'> name lookups, even when otherwise statically linked.)</div><div class='ctx'> </div><div class='add'>+A good first step is to get initramfs to run a statically linked "hello world"</div><div class='add'>+program as init, and test it under an emulator like qemu (www.qemu.org) or</div><div class='add'>+User Mode Linux, like so:</div><div class='add'>+</div><div class='add'>+  cat &gt; hello.c &lt;&lt; EOF</div><div class='add'>+  #include &lt;stdio.h&gt;</div><div class='add'>+  #include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+  int main(int argc, char *argv[])</div><div class='add'>+  {</div><div class='add'>+    printf("Hello world!\n");</div><div class='add'>+    sleep(999999999);</div><div class='add'>+  }</div><div class='add'>+  EOF</div><div class='add'>+  gcc -static hello2.c -o init</div><div class='add'>+  echo init | cpio -o -H newc | gzip &gt; test.cpio.gz</div><div class='add'>+  # Testing external initramfs using the initrd loading mechanism.</div><div class='add'>+  qemu -kernel /boot/vmlinuz -initrd test.cpio.gz /dev/zero</div><div class='add'>+</div><div class='add'>+When debugging a normal root filesystem, it's nice to be able to boot with</div><div class='add'>+"init=/bin/sh".  The initramfs equivalent is "rdinit=/bin/sh", and it's</div><div class='add'>+just as useful.</div><div class='add'>+</div><div class='ctx'> Why cpio rather than tar?</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +330,7 @@ the above threads) is:</div><div class='ctx'> Future directions:</div><div class='ctx'> ------------------</div><div class='ctx'> </div><div class='del'>-Today (2.6.14), initramfs is always compiled in, but not always used.  The</div><div class='add'>+Today (2.6.16), initramfs is always compiled in, but not always used.  The</div><div class='ctx'> kernel falls back to legacy boot code that is reached only if initramfs does</div><div class='ctx'> not contain an /init program.  The fallback is legacy code, there to ensure a</div><div class='ctx'> smooth transition and allowing early boot functionality to gradually move to</div><div class='hunk'>@@ -258,8 +347,9 @@ and so on.</div><div class='ctx'> </div><div class='ctx'> This kind of complexity (which inevitably includes policy) is rightly handled</div><div class='ctx'> in userspace.  Both klibc and busybox/uClibc are working on simple initramfs</div><div class='del'>-packages to drop into a kernel build, and when standard solutions are ready</div><div class='del'>-and widely deployed, the kernel's legacy early boot code will become obsolete</div><div class='del'>-and a candidate for the feature removal schedule.</div><div class='add'>+packages to drop into a kernel build.</div><div class='ctx'> </div><div class='del'>-But that's a while off yet.</div><div class='add'>+The klibc package has now been accepted into Andrew Morton's 2.6.17-mm tree.</div><div class='add'>+The kernel's current early boot code (partition detection, etc) will probably</div><div class='add'>+be migrated into a default initramfs, automatically created and used by the</div><div class='add'>+kernel build.</div><div class='head'>diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt<br/>index 3a2e5520c1e3..1cb7e8be927a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/filesystems/vfs.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/filesystems/vfs.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/filesystems/vfs.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/filesystems/vfs.txt</a></div><div class='hunk'>@@ -113,8 +113,8 @@ members are defined:</div><div class='ctx'> struct file_system_type {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int fs_flags;</div><div class='del'>-        struct super_block *(*get_sb) (struct file_system_type *, int,</div><div class='del'>-                                       const char *, void *);</div><div class='add'>+        int (*get_sb) (struct file_system_type *, int,</div><div class='add'>+                       const char *, void *, struct vfsmount *);</div><div class='ctx'>         void (*kill_sb) (struct super_block *);</div><div class='ctx'>         struct module *owner;</div><div class='ctx'>         struct file_system_type * next;</div><div class='hunk'>@@ -211,7 +211,7 @@ struct super_operations {</div><div class='ctx'>         int (*sync_fs)(struct super_block *sb, int wait);</div><div class='ctx'>         void (*write_super_lockfs) (struct super_block *);</div><div class='ctx'>         void (*unlockfs) (struct super_block *);</div><div class='del'>-        int (*statfs) (struct super_block *, struct kstatfs *);</div><div class='add'>+        int (*statfs) (struct dentry *, struct kstatfs *);</div><div class='ctx'>         int (*remount_fs) (struct super_block *, int *, char *);</div><div class='ctx'>         void (*clear_inode) (struct inode *);</div><div class='ctx'>         void (*umount_begin) (struct super_block *);</div><div class='head'>diff --git a/Documentation/hwmon/abituguru b/Documentation/hwmon/abituguru<br/>new file mode 100644<br/>index 000000000000..b2c0d61b39a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/abituguru?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/abituguru</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+Kernel driver abituguru</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Abit uGuru revision 1-3 (Hardware Monitor part only)</div><div class='add'>+    Prefix: 'abituguru'</div><div class='add'>+    Addresses scanned: ISA 0x0E0</div><div class='add'>+    Datasheet: Not available, this driver is based on reverse engineering.</div><div class='add'>+	A "Datasheet" has been written based on the reverse engineering it</div><div class='add'>+	should be available in the same dir as this file under the name</div><div class='add'>+	abituguru-datasheet.</div><div class='add'>+    Note:</div><div class='add'>+	The uGuru is a microcontroller with onboard firmware which programs</div><div class='add'>+	it to behave as a hwmon IC. There are many different revisions of the</div><div class='add'>+	firmware and thus effectivly many different revisions of the uGuru.</div><div class='add'>+	Below is an incomplete list with which revisions are used for which</div><div class='add'>+	Motherboards:</div><div class='add'>+	uGuru 1.00    ~ 1.24    (AI7, KV8-MAX3, AN7) (1)</div><div class='add'>+	uGuru 2.0.0.0 ~ 2.0.4.2 (KV8-PRO)</div><div class='add'>+	uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8)</div><div class='add'>+	uGuru 2.2.0.0 ~ 2.2.0.6 (AA8 Fatal1ty)</div><div class='add'>+	uGuru 2.3.0.0 ~ 2.3.0.9 (AN8)</div><div class='add'>+	uGuru 3.0.0.0 ~ 3.0.1.2 (AW8, AL8, NI8)</div><div class='add'>+	uGuru 4.xxxxx?          (AT8 32X) (2)</div><div class='add'>+	1) For revisions 2 and 3 uGuru's the driver can autodetect the</div><div class='add'>+	   sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's</div><div class='add'>+	   this doesnot always work. For these uGuru's the autodection can</div><div class='add'>+	   be overriden with the bank1_types module param. For all 3 known</div><div class='add'>+	   revison 1 motherboards the correct use of this param is:</div><div class='add'>+	   bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1</div><div class='add'>+	   You may also need to specify the fan_sensors option for these boards</div><div class='add'>+	   fan_sensors=5</div><div class='add'>+	2) The current version of the abituguru driver is known to NOT work</div><div class='add'>+	   on these Motherboards</div><div class='add'>+</div><div class='add'>+Authors:</div><div class='add'>+	Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;,</div><div class='add'>+	(Initial reverse engineering done by Olle Sandberg</div><div class='add'>+	 &lt;ollebull@gmail.com&gt;)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Module Parameters</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+* force: bool		Force detection. Note this parameter only causes the</div><div class='add'>+			detection to be skipped, if the uGuru can't be read</div><div class='add'>+			the module initialization (insmod) will still fail.</div><div class='add'>+* bank1_types: int[]	Bank1 sensortype autodetection override:</div><div class='add'>+			  -1 autodetect (default)</div><div class='add'>+			   0 volt sensor</div><div class='add'>+			   1 temp sensor</div><div class='add'>+			   2 not connected</div><div class='add'>+* fan_sensors: int	Tell the driver how many fan speed sensors there are</div><div class='add'>+			on your motherboard. Default: 0 (autodetect).</div><div class='add'>+* pwms: int		Tell the driver how many fan speed controls (fan</div><div class='add'>+			pwms) your motherboard has. Default: 0 (autodetect).</div><div class='add'>+* verbose: int		How verbose should the driver be? (0-3):</div><div class='add'>+			   0 normal output</div><div class='add'>+			   1 + verbose error reporting</div><div class='add'>+			   2 + sensors type probing info (default)</div><div class='add'>+			   3 + retryable error reporting</div><div class='add'>+			Default: 2 (the driver is still in the testing phase)</div><div class='add'>+</div><div class='add'>+Notice if you need any of the first three options above please insmod the</div><div class='add'>+driver with verbose set to 3 and mail me &lt;j.w.r.degoede@hhs.nl&gt; the output of:</div><div class='add'>+dmesg | grep abituguru</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver supports the hardware monitoring features of the Abit uGuru chip</div><div class='add'>+found on Abit uGuru featuring motherboards (most modern Abit motherboards).</div><div class='add'>+</div><div class='add'>+The uGuru chip in reality is a Winbond W83L950D in disguise (despite Abit</div><div class='add'>+claiming it is "a new microprocessor designed by the ABIT Engineers").</div><div class='add'>+Unfortunatly this doesn't help since the W83L950D is a generic</div><div class='add'>+microcontroller with a custom Abit application running on it.</div><div class='add'>+</div><div class='add'>+Despite Abit not releasing any information regarding the uGuru, Olle</div><div class='add'>+Sandberg &lt;ollebull@gmail.com&gt; has managed to reverse engineer the sensor part</div><div class='add'>+of the uGuru. Without his work this driver would not have been possible.</div><div class='add'>+</div><div class='add'>+Known Issues</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The voltage and frequency control parts of the Abit uGuru are not supported.</div><div class='head'>diff --git a/Documentation/hwmon/abituguru-datasheet b/Documentation/hwmon/abituguru-datasheet<br/>new file mode 100644<br/>index 000000000000..aef5a9b36846<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/abituguru-datasheet?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/abituguru-datasheet</a></div><div class='hunk'>@@ -0,0 +1,312 @@</div><div class='add'>+uGuru datasheet</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+First of all, what I know about uGuru is no fact based on any help, hints or</div><div class='add'>+datasheet from Abit. The data I have got on uGuru have I assembled through</div><div class='add'>+my weak knowledge in "backwards engineering".</div><div class='add'>+And just for the record, you may have noticed uGuru isn't a chip developed by</div><div class='add'>+Abit, as they claim it to be. It's realy just an microprocessor (uC) created by</div><div class='add'>+Winbond (W83L950D). And no, reading the manual for this specific uC or</div><div class='add'>+mailing  Windbond for help won't give any usefull data about uGuru, as it is</div><div class='add'>+the program inside the uC that is responding to calls.</div><div class='add'>+</div><div class='add'>+Olle Sandberg &lt;ollebull@gmail.com&gt;, 2005-05-25</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Original version by Olle Sandberg who did the heavy lifting of the initial</div><div class='add'>+reverse engineering. This version has been almost fully rewritten for clarity</div><div class='add'>+and extended with write support and info on more databanks, the write support</div><div class='add'>+is once again reverse engineered by Olle the additional databanks have been</div><div class='add'>+reverse engineered by me. I would like to express my thanks to Olle, this</div><div class='add'>+document and the Linux driver could not have been written without his efforts.</div><div class='add'>+</div><div class='add'>+Note: because of the lack of specs only the sensors part of the uGuru is</div><div class='add'>+described here and not the CPU / RAM / etc voltage &amp; frequency control.</div><div class='add'>+</div><div class='add'>+Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;, 28-01-2006</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Detection</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+As far as known the uGuru is always placed at and using the (ISA) I/O-ports</div><div class='add'>+0xE0 and 0xE4, so we don't have to scan any port-range, just check what the two</div><div class='add'>+ports are holding for detection. We will refer to 0xE0 as CMD (command-port)</div><div class='add'>+and 0xE4 as DATA because Abit refers to them with these names.</div><div class='add'>+</div><div class='add'>+If DATA holds 0x00 or 0x08 and CMD holds 0x00 or 0xAC an uGuru could be</div><div class='add'>+present. We have to check for two different values at data-port, because</div><div class='add'>+after a reboot uGuru will hold 0x00 here, but if the driver is removed and</div><div class='add'>+later on attached again data-port will hold 0x08, more about this later.</div><div class='add'>+</div><div class='add'>+After wider testing of the Linux kernel driver some variants of the uGuru have</div><div class='add'>+turned up which will hold 0x00 instead of 0xAC at the CMD port, thus we also</div><div class='add'>+have to test CMD for two different values. On these uGuru's DATA will initally</div><div class='add'>+hold 0x09 and will only hold 0x08 after reading CMD first, so CMD must be read</div><div class='add'>+first!</div><div class='add'>+</div><div class='add'>+To be really sure an uGuru is present a test read of one or more register</div><div class='add'>+sets should be done.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Reading / Writing</div><div class='add'>+=================</div><div class='add'>+</div><div class='add'>+Addressing</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The uGuru has a number of different addressing levels. The first addressing</div><div class='add'>+level we will call banks. A bank holds data for one or more sensors. The data</div><div class='add'>+in a bank for a sensor is one or more bytes large.</div><div class='add'>+</div><div class='add'>+The number of bytes is fixed for a given bank, you should always read or write</div><div class='add'>+that many bytes, reading / writing more will fail, the results when writing</div><div class='add'>+less then the number of bytes for a given bank are undetermined.</div><div class='add'>+</div><div class='add'>+See below for all known bank addresses, numbers of sensors in that bank,</div><div class='add'>+number of bytes data per sensor and contents/meaning of those bytes.</div><div class='add'>+</div><div class='add'>+Although both this document and the kernel driver have kept the sensor</div><div class='add'>+terminoligy for the addressing within a bank this is not 100% correct, in</div><div class='add'>+bank 0x24 for example the addressing within the bank selects a PWM output not</div><div class='add'>+a sensor.</div><div class='add'>+</div><div class='add'>+Notice that some banks have both a read and a write address this is how the</div><div class='add'>+uGuru determines if a read from or a write to the bank is taking place, thus</div><div class='add'>+when reading you should always use the read address and when writing the</div><div class='add'>+write address. The write address is always one (1) more then the read address.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+uGuru ready</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Before you can read from or write to the uGuru you must first put the uGuru</div><div class='add'>+in "ready" mode.</div><div class='add'>+</div><div class='add'>+To put the uGuru in ready mode first write 0x00 to DATA and then wait for DATA</div><div class='add'>+to hold 0x09, DATA should read 0x09 within 250 read cycles.</div><div class='add'>+</div><div class='add'>+Next CMD _must_ be read and should hold 0xAC, usually CMD will hold 0xAC the</div><div class='add'>+first read but sometimes it takes a while before CMD holds 0xAC and thus it</div><div class='add'>+has to be read a number of times (max 50).</div><div class='add'>+</div><div class='add'>+After reading CMD, DATA should hold 0x08 which means that the uGuru is ready</div><div class='add'>+for input. As above DATA will usually hold 0x08 the first read but not always.</div><div class='add'>+This step can be skipped, but it is undetermined what happens if the uGuru has</div><div class='add'>+not yet reported 0x08 at DATA and you proceed with writing a bank address.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Sending bank and sensor addresses to the uGuru</div><div class='add'>+----------------------------------------------</div><div class='add'>+</div><div class='add'>+First the uGuru must be in "ready" mode as described above, DATA should hold</div><div class='add'>+0x08 indicating that the uGuru wants input, in this case the bank address.</div><div class='add'>+</div><div class='add'>+Next write the bank address to DATA. After the bank address has been written</div><div class='add'>+wait for to DATA to hold 0x08 again indicating that it wants / is ready for</div><div class='add'>+more input (max 250 reads).</div><div class='add'>+</div><div class='add'>+Once DATA holds 0x08 again write the sensor address to CMD.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Reading</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+First send the bank and sensor addresses as described above.</div><div class='add'>+Then for each byte of data you want to read wait for DATA to hold 0x01</div><div class='add'>+which indicates that the uGuru is ready to be read (max 250 reads) and once</div><div class='add'>+DATA holds 0x01 read the byte from CMD.</div><div class='add'>+</div><div class='add'>+Once all bytes have been read data will hold 0x09, but there is no reason to</div><div class='add'>+test for this. Notice that the number of bytes is bank address dependent see</div><div class='add'>+above and below.</div><div class='add'>+</div><div class='add'>+After completing a successfull read it is advised to put the uGuru back in</div><div class='add'>+ready mode, so that it is ready for the next read / write cycle. This way</div><div class='add'>+if your program / driver is unloaded and later loaded again the detection</div><div class='add'>+algorithm described above will still work.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Writing</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+First send the bank and sensor addresses as described above.</div><div class='add'>+Then for each byte of data you want to write wait for DATA to hold 0x00</div><div class='add'>+which indicates that the uGuru is ready to be written (max 250 reads) and</div><div class='add'>+once DATA holds 0x00 write the byte to CMD.</div><div class='add'>+</div><div class='add'>+Once all bytes have been written wait for DATA to hold 0x01 (max 250 reads)</div><div class='add'>+don't ask why this is the way it is.</div><div class='add'>+</div><div class='add'>+Once DATA holds 0x01 read CMD it should hold 0xAC now.</div><div class='add'>+</div><div class='add'>+After completing a successfull write it is advised to put the uGuru back in</div><div class='add'>+ready mode, so that it is ready for the next read / write cycle. This way</div><div class='add'>+if your program / driver is unloaded and later loaded again the detection</div><div class='add'>+algorithm described above will still work.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Gotchas</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+After wider testing of the Linux kernel driver some variants of the uGuru have</div><div class='add'>+turned up which do not hold 0x08 at DATA within 250 reads after writing the</div><div class='add'>+bank address. With these versions this happens quite frequent, using larger</div><div class='add'>+timeouts doesn't help, they just go offline for a second or 2, doing some</div><div class='add'>+internal callibration or whatever. Your code should be prepared to handle</div><div class='add'>+this and in case of no response in this specific case just goto sleep for a</div><div class='add'>+while and then retry.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Address Map</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+Bank 0x20 Alarms (R)</div><div class='add'>+--------------------</div><div class='add'>+This bank contains 0 sensors, iow the sensor address is ignored (but must be</div><div class='add'>+written) just use 0. Bank 0x20 contains 3 bytes:</div><div class='add'>+</div><div class='add'>+Byte 0:</div><div class='add'>+This byte holds the alarm flags for sensor 0-7 of Sensor Bank1, with bit 0</div><div class='add'>+corresponding to sensor 0, 1 to 1, etc.</div><div class='add'>+</div><div class='add'>+Byte 1:</div><div class='add'>+This byte holds the alarm flags for sensor 8-15 of Sensor Bank1, with bit 0</div><div class='add'>+corresponding to sensor 8, 1 to 9, etc.</div><div class='add'>+</div><div class='add'>+Byte 2:</div><div class='add'>+This byte holds the alarm flags for sensor 0-5 of Sensor Bank2, with bit 0</div><div class='add'>+corresponding to sensor 0, 1 to 1, etc.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bank 0x21 Sensor Bank1 Values / Readings (R)</div><div class='add'>+--------------------------------------------</div><div class='add'>+This bank contains 16 sensors, for each sensor it contains 1 byte.</div><div class='add'>+So far the following sensors are known to be available on all motherboards:</div><div class='add'>+Sensor  0 CPU temp</div><div class='add'>+Sensor  1 SYS temp</div><div class='add'>+Sensor  3 CPU core volt</div><div class='add'>+Sensor  4 DDR volt</div><div class='add'>+Sensor 10 DDR Vtt volt</div><div class='add'>+Sensor 15 PWM temp</div><div class='add'>+</div><div class='add'>+Byte 0:</div><div class='add'>+This byte holds the reading from the sensor. Sensors in Bank1 can be both</div><div class='add'>+volt and temp sensors, this is motherboard specific. The uGuru however does</div><div class='add'>+seem to know (be programmed with) what kindoff sensor is attached see Sensor</div><div class='add'>+Bank1 Settings description.</div><div class='add'>+</div><div class='add'>+Volt sensors use a linear scale, a reading 0 corresponds with 0 volt and a</div><div class='add'>+reading of 255 with 3494 mV. The sensors for higher voltages however are</div><div class='add'>+connected through a division circuit. The currently known division circuits</div><div class='add'>+in use result in ranges of: 0-4361mV, 0-6248mV or 0-14510mV. 3.3 volt sources</div><div class='add'>+use the 0-4361mV range, 5 volt the 0-6248mV and 12 volt the 0-14510mV .</div><div class='add'>+</div><div class='add'>+Temp sensors also use a linear scale, a reading of 0 corresponds with 0 degree</div><div class='add'>+Celsius and a reading of 255 with a reading of 255 degrees Celsius.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bank 0x22 Sensor Bank1 Settings (R)</div><div class='add'>+Bank 0x23 Sensor Bank1 Settings (W)</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+This bank contains 16 sensors, for each sensor it contains 3 bytes. Each</div><div class='add'>+set of 3 bytes contains the settings for the sensor with the same sensor</div><div class='add'>+address in Bank 0x21 .</div><div class='add'>+</div><div class='add'>+Byte 0:</div><div class='add'>+Alarm behaviour for the selected sensor. A 1 enables the described behaviour.</div><div class='add'>+Bit 0: Give an alarm if measured temp is over the warning threshold	(RW) *</div><div class='add'>+Bit 1: Give an alarm if measured volt is over the max threshold		(RW) **</div><div class='add'>+Bit 2: Give an alarm if measured volt is under the min threshold	(RW) **</div><div class='add'>+Bit 3: Beep if alarm							(RW)</div><div class='add'>+Bit 4: 1 if alarm cause measured temp is over the warning threshold	(R)</div><div class='add'>+Bit 5: 1 if alarm cause measured volt is over the max threshold		(R)</div><div class='add'>+Bit 6: 1 if alarm cause measured volt is under the min threshold	(R)</div><div class='add'>+Bit 7: Volt sensor: Shutdown if alarm persist for more then 4 seconds	(RW)</div><div class='add'>+       Temp sensor: Shutdown if temp is over the shutdown threshold	(RW)</div><div class='add'>+</div><div class='add'>+*  This bit is only honored/used by the uGuru if a temp sensor is connected</div><div class='add'>+** This bit is only honored/used by the uGuru if a volt sensor is connected</div><div class='add'>+Note with some trickery this can be used to find out what kinda sensor is</div><div class='add'>+detected see the Linux kernel driver for an example with many comments on</div><div class='add'>+how todo this.</div><div class='add'>+</div><div class='add'>+Byte 1:</div><div class='add'>+Temp sensor: warning threshold  (scale as bank 0x21)</div><div class='add'>+Volt sensor: min threshold      (scale as bank 0x21)</div><div class='add'>+</div><div class='add'>+Byte 2:</div><div class='add'>+Temp sensor: shutdown threshold (scale as bank 0x21)</div><div class='add'>+Volt sensor: max threshold      (scale as bank 0x21)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bank 0x24 PWM outputs for FAN's (R)</div><div class='add'>+Bank 0x25 PWM outputs for FAN's (W)</div><div class='add'>+-----------------------------------</div><div class='add'>+</div><div class='add'>+This bank contains 3 "sensors", for each sensor it contains 5 bytes.</div><div class='add'>+Sensor 0 usually controls the CPU fan</div><div class='add'>+Sensor 1 usually controls the NB (or chipset for single chip) fan</div><div class='add'>+Sensor 2 usually controls the System fan</div><div class='add'>+</div><div class='add'>+Byte 0:</div><div class='add'>+Flag 0x80 to enable control, Fan runs at 100% when disabled.</div><div class='add'>+low nibble (temp)sensor address at bank 0x21 used for control.</div><div class='add'>+</div><div class='add'>+Byte 1:</div><div class='add'>+0-255 = 0-12v (linear), specify voltage at which fan will rotate when under</div><div class='add'>+low threshold temp (specified in byte 3)</div><div class='add'>+</div><div class='add'>+Byte 2:</div><div class='add'>+0-255 = 0-12v (linear), specify voltage at which fan will rotate when above</div><div class='add'>+high threshold temp (specified in byte 4)</div><div class='add'>+</div><div class='add'>+Byte 3:</div><div class='add'>+Low threshold temp  (scale as bank 0x21)</div><div class='add'>+</div><div class='add'>+byte 4:</div><div class='add'>+High threshold temp (scale as bank 0x21)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bank 0x26 Sensors Bank2 Values / Readings (R)</div><div class='add'>+---------------------------------------------</div><div class='add'>+</div><div class='add'>+This bank contains 6 sensors (AFAIK), for each sensor it contains 1 byte.</div><div class='add'>+So far the following sensors are known to be available on all motherboards:</div><div class='add'>+Sensor 0: CPU fan speed</div><div class='add'>+Sensor 1: NB (or chipset for single chip) fan speed</div><div class='add'>+Sensor 2: SYS fan speed</div><div class='add'>+</div><div class='add'>+Byte 0:</div><div class='add'>+This byte holds the reading from the sensor. 0-255 = 0-15300 (linear)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Bank 0x27 Sensors Bank2 Settings (R)</div><div class='add'>+Bank 0x28 Sensors Bank2 Settings (W)</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+This bank contains 6 sensors (AFAIK), for each sensor it contains 2 bytes.</div><div class='add'>+</div><div class='add'>+Byte 0:</div><div class='add'>+Alarm behaviour for the selected sensor. A 1 enables the described behaviour.</div><div class='add'>+Bit 0: Give an alarm if measured rpm is under the min threshold	(RW)</div><div class='add'>+Bit 3: Beep if alarm						(RW)</div><div class='add'>+Bit 7: Shutdown if alarm persist for more then 4 seconds	(RW)</div><div class='add'>+</div><div class='add'>+Byte 1:</div><div class='add'>+min threshold (scale as bank 0x26)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Warning for the adventerous</div><div class='add'>+===========================</div><div class='add'>+</div><div class='add'>+A word of caution to those who want to experiment and see if they can figure</div><div class='add'>+the voltage / clock programming out, I tried reading and only reading banks</div><div class='add'>+0-0x30 with the reading code used for the sensor banks (0x20-0x28) and this</div><div class='add'>+resulted in a _permanent_ reprogramming of the voltages, luckily I had the</div><div class='add'>+sensors part configured so that it would shutdown my system on any out of spec</div><div class='add'>+voltages which proprably safed my computer (after a reboot I managed to</div><div class='add'>+immediatly enter the bios and reload the defaults). This probably means that</div><div class='add'>+the read/write cycle for the non sensor part is different from the sensor part.</div><div class='head'>diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70<br/>new file mode 100644<br/>index 000000000000..2bdd3feebf53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm70?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/lm70</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+Kernel driver lm70</div><div class='add'>+==================</div><div class='add'>+</div><div class='add'>+Supported chip:</div><div class='add'>+  * National Semiconductor LM70</div><div class='add'>+    Datasheet: http://www.national.com/pf/LM/LM70.html</div><div class='add'>+</div><div class='add'>+Author:</div><div class='add'>+        Kaiwan N Billimoria &lt;kaiwan@designergraphix.com&gt;</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver implements support for the National Semiconductor LM70</div><div class='add'>+temperature sensor.</div><div class='add'>+</div><div class='add'>+The LM70 temperature sensor chip supports a single temperature sensor.</div><div class='add'>+It communicates with a host processor (or microcontroller) via an</div><div class='add'>+SPI/Microwire Bus interface.</div><div class='add'>+</div><div class='add'>+Communication with the LM70 is simple: when the temperature is to be sensed,</div><div class='add'>+the driver accesses the LM70 using SPI communication: 16 SCLK cycles</div><div class='add'>+comprise the MOSI/MISO loop. At the end of the transfer, the 11-bit 2's</div><div class='add'>+complement digital temperature (sent via the SIO line), is available in the</div><div class='add'>+driver for interpretation. This driver makes use of the kernel's in-core</div><div class='add'>+SPI support.</div><div class='add'>+</div><div class='add'>+Thanks to</div><div class='add'>+---------</div><div class='add'>+Jean Delvare &lt;khali@linux-fr.org&gt; for mentoring the hwmon-side driver</div><div class='add'>+development.</div><div class='head'>diff --git a/Documentation/hwmon/lm83 b/Documentation/hwmon/lm83<br/>index 061d9ed8ff43..f7aad1489cb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm83?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/lm83</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/lm83?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/lm83</a></div><div class='hunk'>@@ -7,6 +7,10 @@ Supported chips:</div><div class='ctx'>     Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='ctx'>     Datasheet: Publicly available at the National Semiconductor website</div><div class='ctx'>                http://www.national.com/pf/LM/LM83.html</div><div class='add'>+  * National Semiconductor LM82</div><div class='add'>+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e</div><div class='add'>+    Datasheet: Publicly available at the National Semiconductor website</div><div class='add'>+               http://www.national.com/pf/LM/LM82.html</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Author: Jean Delvare &lt;khali@linux-fr.org&gt;</div><div class='hunk'>@@ -15,10 +19,11 @@ Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='ctx'> The LM83 is a digital temperature sensor. It senses its own temperature as</div><div class='del'>-well as the temperature of up to three external diodes. It is compatible</div><div class='del'>-with many other devices such as the LM84 and all other ADM1021 clones.</div><div class='del'>-The main difference between the LM83 and the LM84 in that the later can</div><div class='del'>-only sense the temperature of one external diode.</div><div class='add'>+well as the temperature of up to three external diodes. The LM82 is</div><div class='add'>+a stripped down version of the LM83 that only supports one external diode.</div><div class='add'>+Both are compatible with many other devices such as the LM84 and all</div><div class='add'>+other ADM1021 clones. The main difference between the LM83 and the LM84</div><div class='add'>+in that the later can only sense the temperature of one external diode.</div><div class='ctx'> </div><div class='ctx'> Using the adm1021 driver for a LM83 should work, but only two temperatures</div><div class='ctx'> will be reported instead of four.</div><div class='hunk'>@@ -30,12 +35,16 @@ contact us. Note that the LM90 can easily be misdetected as a LM83.</div><div class='ctx'> </div><div class='ctx'> Confirmed motherboards:</div><div class='ctx'>     SBS         P014</div><div class='add'>+    SBS         PSL09</div><div class='ctx'> </div><div class='ctx'> Unconfirmed motherboards:</div><div class='ctx'>     Gigabyte    GA-8IK1100</div><div class='ctx'>     Iwill       MPX2</div><div class='ctx'>     Soltek      SL-75DRV5</div><div class='ctx'> </div><div class='add'>+The LM82 is confirmed to have been found on most AMD Geode reference</div><div class='add'>+designs and test platforms.</div><div class='add'>+</div><div class='ctx'> The driver has been successfully tested by Magnus Forsström, who I'd</div><div class='ctx'> like to thank here. More testers will be of course welcome.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/hwmon/smsc47m192 b/Documentation/hwmon/smsc47m192<br/>new file mode 100644<br/>index 000000000000..45d6453cd435<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/smsc47m192?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/smsc47m192</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+Kernel driver smsc47m192</div><div class='add'>+========================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * SMSC LPC47M192 and LPC47M997</div><div class='add'>+    Prefix: 'smsc47m192'</div><div class='add'>+    Addresses scanned: I2C 0x2c - 0x2d</div><div class='add'>+    Datasheet: The datasheet for LPC47M192 is publicly available from</div><div class='add'>+               http://www.smsc.com/</div><div class='add'>+               The LPC47M997 is compatible for hardware monitoring.</div><div class='add'>+</div><div class='add'>+Author: Hartmut Rick &lt;linux@rick.claranet.de&gt;</div><div class='add'>+        Special thanks to Jean Delvare for careful checking</div><div class='add'>+        of the code and many helpful comments and suggestions.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver implements support for the hardware sensor capabilities</div><div class='add'>+of the SMSC LPC47M192 and LPC47M997 Super-I/O chips.</div><div class='add'>+</div><div class='add'>+These chips support 3 temperature channels and 8 voltage inputs</div><div class='add'>+as well as CPU voltage VID input.</div><div class='add'>+</div><div class='add'>+They do also have fan monitoring and control capabilities, but the</div><div class='add'>+these features are accessed via ISA bus and are not supported by this</div><div class='add'>+driver. Use the 'smsc47m1' driver for fan monitoring and control.</div><div class='add'>+</div><div class='add'>+Voltages and temperatures are measured by an 8-bit ADC, the resolution</div><div class='add'>+of the temperatures is 1 bit per degree C.</div><div class='add'>+Voltages are scaled such that the nominal voltage corresponds to</div><div class='add'>+192 counts, i.e. 3/4 of the full range. Thus the available range for</div><div class='add'>+each voltage channel is 0V ... 255/192*(nominal voltage), the resolution</div><div class='add'>+is 1 bit per (nominal voltage)/192.</div><div class='add'>+Both voltage and temperature values are scaled by 1000, the sys files</div><div class='add'>+show voltages in mV and temperatures in units of 0.001 degC.</div><div class='add'>+</div><div class='add'>+The +12V analog voltage input channel (in4_input) is multiplexed with</div><div class='add'>+bit 4 of the encoded CPU voltage. This means that you either get</div><div class='add'>+a +12V voltage measurement or a 5 bit CPU VID, but not both.</div><div class='add'>+The default setting is to use the pin as 12V input, and use only 4 bit VID.</div><div class='add'>+This driver assumes that the information in the configuration register</div><div class='add'>+is correct, i.e. that the BIOS has updated the configuration if</div><div class='add'>+the motherboard has this input wired to VID4.</div><div class='add'>+</div><div class='add'>+The temperature and voltage readings are updated once every 1.5 seconds.</div><div class='add'>+Reading them more often repeats the same values.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+sysfs interface</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+in0_input	- +2.5V voltage input</div><div class='add'>+in1_input	- CPU voltage input (nominal 2.25V)</div><div class='add'>+in2_input	- +3.3V voltage input</div><div class='add'>+in3_input	- +5V voltage input</div><div class='add'>+in4_input	- +12V voltage input (may be missing if used as VID4)</div><div class='add'>+in5_input	- Vcc voltage input (nominal 3.3V)</div><div class='add'>+		  This is the supply voltage of the sensor chip itself.</div><div class='add'>+in6_input	- +1.5V voltage input</div><div class='add'>+in7_input	- +1.8V voltage input</div><div class='add'>+</div><div class='add'>+in[0-7]_min,</div><div class='add'>+in[0-7]_max	- lower and upper alarm thresholds for in[0-7]_input reading</div><div class='add'>+</div><div class='add'>+		  All voltages are read and written in mV.</div><div class='add'>+</div><div class='add'>+in[0-7]_alarm	- alarm flags for voltage inputs</div><div class='add'>+		  These files read '1' in case of alarm, '0' otherwise.</div><div class='add'>+</div><div class='add'>+temp1_input	- chip temperature measured by on-chip diode</div><div class='add'>+temp[2-3]_input	- temperature measured by external diodes (one of these would</div><div class='add'>+		  typically be wired to the diode inside the CPU)</div><div class='add'>+</div><div class='add'>+temp[1-3]_min,</div><div class='add'>+temp[1-3]_max	- lower and upper alarm thresholds for temperatures</div><div class='add'>+</div><div class='add'>+temp[1-3]_offset - temperature offset registers</div><div class='add'>+		  The chip adds the offsets stored in these registers to</div><div class='add'>+		  the corresponding temperature readings.</div><div class='add'>+		  Note that temp1 and temp2 offsets share the same register,</div><div class='add'>+		  they cannot both be different from zero at the same time.</div><div class='add'>+		  Writing a non-zero number to one of them will reset the other</div><div class='add'>+		  offset to zero.</div><div class='add'>+</div><div class='add'>+		  All temperatures and offsets are read and written in</div><div class='add'>+		  units of 0.001 degC.</div><div class='add'>+</div><div class='add'>+temp[1-3]_alarm - alarm flags for temperature inputs, '1' in case of alarm,</div><div class='add'>+		  '0' otherwise.</div><div class='add'>+temp[2-3]_input_fault - diode fault flags for temperature inputs 2 and 3.</div><div class='add'>+		  A fault is detected if the two pins for the corresponding</div><div class='add'>+		  sensor are open or shorted, or any of the two is shorted</div><div class='add'>+		  to ground or Vcc. '1' indicates a diode fault.</div><div class='add'>+</div><div class='add'>+cpu0_vid	- CPU voltage as received from the CPU</div><div class='add'>+</div><div class='add'>+vrm		- CPU VID standard used for decoding CPU voltage</div><div class='add'>+</div><div class='add'>+		  The *_min, *_max, *_offset and vrm files can be read and</div><div class='add'>+		  written, all others are read-only.</div><div class='head'>diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface<br/>index a0d0ab24288e..d1d390aaf620 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/sysfs-interface?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/sysfs-interface</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/sysfs-interface?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/sysfs-interface</a></div><div class='hunk'>@@ -3,15 +3,15 @@ Naming and data format standards for sysfs files</div><div class='ctx'> </div><div class='ctx'> The libsensors library offers an interface to the raw sensors data</div><div class='ctx'> through the sysfs interface. See libsensors documentation and source for</div><div class='del'>-more further information. As of writing this document, libsensors</div><div class='del'>-(from lm_sensors 2.8.3) is heavily chip-dependant. Adding or updating</div><div class='add'>+further information. As of writing this document, libsensors</div><div class='add'>+(from lm_sensors 2.8.3) is heavily chip-dependent. Adding or updating</div><div class='ctx'> support for any given chip requires modifying the library's code.</div><div class='ctx'> This is because libsensors was written for the procfs interface</div><div class='ctx'> older kernel modules were using, which wasn't standardized enough.</div><div class='ctx'> Recent versions of libsensors (from lm_sensors 2.8.2 and later) have</div><div class='ctx'> support for the sysfs interface, though.</div><div class='ctx'> </div><div class='del'>-The new sysfs interface was designed to be as chip-independant as</div><div class='add'>+The new sysfs interface was designed to be as chip-independent as</div><div class='ctx'> possible.</div><div class='ctx'> </div><div class='ctx'> Note that motherboards vary widely in the connections to sensor chips.</div><div class='hunk'>@@ -24,7 +24,7 @@ range using external resistors. Since the values of these resistors</div><div class='ctx'> can change from motherboard to motherboard, the conversions cannot be</div><div class='ctx'> hard coded into the driver and have to be done in user space.</div><div class='ctx'> </div><div class='del'>-For this reason, even if we aim at a chip-independant libsensors, it will</div><div class='add'>+For this reason, even if we aim at a chip-independent libsensors, it will</div><div class='ctx'> still require a configuration file (e.g. /etc/sensors.conf) for proper</div><div class='ctx'> values conversion, labeling of inputs and hiding of unused inputs.</div><div class='ctx'> </div><div class='hunk'>@@ -39,15 +39,16 @@ If you are developing a userspace application please send us feedback on</div><div class='ctx'> this standard.</div><div class='ctx'> </div><div class='ctx'> Note that this standard isn't completely established yet, so it is subject</div><div class='del'>-to changes, even important ones. One more reason to use the library instead</div><div class='del'>-of accessing sysfs files directly.</div><div class='add'>+to changes. If you are writing a new hardware monitoring driver those</div><div class='add'>+features can't seem to fit in this interface, please contact us with your</div><div class='add'>+extension proposal. Keep in mind that backward compatibility must be</div><div class='add'>+preserved.</div><div class='ctx'> </div><div class='ctx'> Each chip gets its own directory in the sysfs /sys/devices tree.  To</div><div class='del'>-find all sensor chips, it is easier to follow the symlinks from</div><div class='del'>-/sys/i2c/devices/</div><div class='add'>+find all sensor chips, it is easier to follow the device symlinks from</div><div class='add'>+/sys/class/hwmon/hwmon*.</div><div class='ctx'> </div><div class='del'>-All sysfs values are fixed point numbers.  To get the true value of some</div><div class='del'>-of the values, you should divide by the specified value.</div><div class='add'>+All sysfs values are fixed point numbers.</div><div class='ctx'> </div><div class='ctx'> There is only one value per file, unlike the older /proc specification.</div><div class='ctx'> The common scheme for files naming is: &lt;type&gt;&lt;number&gt;_&lt;item&gt;. Usual</div><div class='hunk'>@@ -69,28 +70,40 @@ to cause an alarm) is chip-dependent.</div><div class='ctx'> </div><div class='ctx'> -------------------------------------------------------------------------</div><div class='ctx'> </div><div class='add'>+[0-*]	denotes any positive number starting from 0</div><div class='add'>+[1-*]	denotes any positive number starting from 1</div><div class='add'>+RO	read only value</div><div class='add'>+RW	read/write value</div><div class='add'>+</div><div class='add'>+Read/write values may be read-only for some chips, depending on the</div><div class='add'>+hardware implementation.</div><div class='add'>+</div><div class='add'>+All entries are optional, and should only be created in a given driver</div><div class='add'>+if the chip has the feature.</div><div class='add'>+</div><div class='ctx'> ************</div><div class='ctx'> * Voltages *</div><div class='ctx'> ************</div><div class='ctx'> </div><div class='del'>-in[0-8]_min	Voltage min value.</div><div class='add'>+in[0-*]_min	Voltage min value.</div><div class='ctx'> 		Unit: millivolt</div><div class='del'>-		Read/Write</div><div class='add'>+		RW</div><div class='ctx'> 		</div><div class='del'>-in[0-8]_max	Voltage max value.</div><div class='add'>+in[0-*]_max	Voltage max value.</div><div class='ctx'> 		Unit: millivolt</div><div class='del'>-		Read/Write</div><div class='add'>+		RW</div><div class='ctx'> 		</div><div class='del'>-in[0-8]_input	Voltage input value.</div><div class='add'>+in[0-*]_input	Voltage input value.</div><div class='ctx'> 		Unit: millivolt</div><div class='del'>-		Read only</div><div class='add'>+		RO</div><div class='add'>+		Voltage measured on the chip pin.</div><div class='ctx'> 		Actual voltage depends on the scaling resistors on the</div><div class='ctx'> 		motherboard, as recommended in the chip datasheet.</div><div class='ctx'> 		This varies by chip and by motherboard.</div><div class='ctx'> 		Because of this variation, values are generally NOT scaled</div><div class='ctx'> 		by the chip driver, and must be done by the application.</div><div class='ctx'> 		However, some drivers (notably lm87 and via686a)</div><div class='del'>-		do scale, with various degrees of success.</div><div class='add'>+		do scale, because of internal resistors built into a chip.</div><div class='ctx'> 		These drivers will output the actual voltage.</div><div class='ctx'> </div><div class='ctx'> 		Typical usage:</div><div class='hunk'>@@ -104,58 +117,72 @@ in[0-8]_input	Voltage input value.</div><div class='ctx'> 			in7_*	varies</div><div class='ctx'> 			in8_*	varies</div><div class='ctx'> </div><div class='del'>-cpu[0-1]_vid	CPU core reference voltage.</div><div class='add'>+cpu[0-*]_vid	CPU core reference voltage.</div><div class='ctx'> 		Unit: millivolt</div><div class='del'>-		Read only.</div><div class='add'>+		RO</div><div class='ctx'> 		Not always correct.</div><div class='ctx'> </div><div class='ctx'> vrm		Voltage Regulator Module version number. </div><div class='del'>-		Read only.</div><div class='del'>-		Two digit number, first is major version, second is</div><div class='del'>-		minor version.</div><div class='add'>+		RW (but changing it should no more be necessary)</div><div class='add'>+		Originally the VRM standard version multiplied by 10, but now</div><div class='add'>+		an arbitrary number, as not all standards have a version</div><div class='add'>+		number.</div><div class='ctx'> 		Affects the way the driver calculates the CPU core reference</div><div class='ctx'> 		voltage from the vid pins.</div><div class='ctx'> </div><div class='add'>+Also see the Alarms section for status flags associated with voltages.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> ********</div><div class='ctx'> * Fans *</div><div class='ctx'> ********</div><div class='ctx'> </div><div class='del'>-fan[1-3]_min	Fan minimum value</div><div class='add'>+fan[1-*]_min	Fan minimum value</div><div class='ctx'> 		Unit: revolution/min (RPM)</div><div class='del'>-		Read/Write.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-fan[1-3]_input	Fan input value.</div><div class='add'>+fan[1-*]_input	Fan input value.</div><div class='ctx'> 		Unit: revolution/min (RPM)</div><div class='del'>-		Read only.</div><div class='add'>+		RO</div><div class='ctx'> </div><div class='del'>-fan[1-3]_div	Fan divisor.</div><div class='add'>+fan[1-*]_div	Fan divisor.</div><div class='ctx'> 		Integer value in powers of two (1, 2, 4, 8, 16, 32, 64, 128).</div><div class='add'>+		RW</div><div class='ctx'> 		Some chips only support values 1, 2, 4 and 8.</div><div class='ctx'> 		Note that this is actually an internal clock divisor, which</div><div class='ctx'> 		affects the measurable speed range, not the read value.</div><div class='ctx'> </div><div class='add'>+Also see the Alarms section for status flags associated with fans.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> *******</div><div class='ctx'> * PWM *</div><div class='ctx'> *******</div><div class='ctx'> </div><div class='del'>-pwm[1-3]	Pulse width modulation fan control.</div><div class='add'>+pwm[1-*]	Pulse width modulation fan control.</div><div class='ctx'> 		Integer value in the range 0 to 255</div><div class='del'>-		Read/Write</div><div class='add'>+		RW</div><div class='ctx'> 		255 is max or 100%.</div><div class='ctx'> </div><div class='del'>-pwm[1-3]_enable</div><div class='add'>+pwm[1-*]_enable</div><div class='ctx'> 		Switch PWM on and off.</div><div class='ctx'> 		Not always present even if fan*_pwm is.</div><div class='del'>-		0 to turn off</div><div class='del'>-		1 to turn on in manual mode</div><div class='del'>-		2 to turn on in automatic mode</div><div class='del'>-		Read/Write</div><div class='add'>+		0: turn off</div><div class='add'>+		1: turn on in manual mode</div><div class='add'>+		2+: turn on in automatic mode</div><div class='add'>+		Check individual chip documentation files for automatic mode details.</div><div class='add'>+		RW</div><div class='add'>+</div><div class='add'>+pwm[1-*]_mode</div><div class='add'>+		0: DC mode</div><div class='add'>+		1: PWM mode</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='ctx'> pwm[1-*]_auto_channels_temp</div><div class='ctx'> 		Select which temperature channels affect this PWM output in</div><div class='ctx'> 		auto mode. Bitfield, 1 is temp1, 2 is temp2, 4 is temp3 etc...</div><div class='ctx'> 		Which values are possible depend on the chip used.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='ctx'> pwm[1-*]_auto_point[1-*]_pwm</div><div class='ctx'> pwm[1-*]_auto_point[1-*]_temp</div><div class='hunk'>@@ -163,6 +190,7 @@ pwm[1-*]_auto_point[1-*]_temp_hyst</div><div class='ctx'> 		Define the PWM vs temperature curve. Number of trip points is</div><div class='ctx'> 		chip-dependent. Use this for chips which associate trip points</div><div class='ctx'> 		to PWM output channels.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='ctx'> OR</div><div class='ctx'> </div><div class='hunk'>@@ -172,50 +200,57 @@ temp[1-*]_auto_point[1-*]_temp_hyst</div><div class='ctx'> 		Define the PWM vs temperature curve. Number of trip points is</div><div class='ctx'> 		chip-dependent. Use this for chips which associate trip points</div><div class='ctx'> 		to temperature channels.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ****************</div><div class='ctx'> * Temperatures *</div><div class='ctx'> ****************</div><div class='ctx'> </div><div class='del'>-temp[1-3]_type	Sensor type selection.</div><div class='add'>+temp[1-*]_type	Sensor type selection.</div><div class='ctx'> 		Integers 1 to 4 or thermistor Beta value (typically 3435)</div><div class='del'>-		Read/Write.</div><div class='add'>+		RW</div><div class='ctx'> 		1: PII/Celeron Diode</div><div class='ctx'> 		2: 3904 transistor</div><div class='ctx'> 		3: thermal diode</div><div class='ctx'> 		4: thermistor (default/unknown Beta)</div><div class='ctx'> 		Not all types are supported by all chips</div><div class='ctx'> </div><div class='del'>-temp[1-4]_max	Temperature max value.</div><div class='del'>-		Unit: millidegree Celcius</div><div class='del'>-		Read/Write value.</div><div class='add'>+temp[1-*]_max	Temperature max value.</div><div class='add'>+		Unit: millidegree Celsius (or millivolt, see below)</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-temp[1-3]_min	Temperature min value.</div><div class='del'>-		Unit: millidegree Celcius</div><div class='del'>-		Read/Write value.</div><div class='add'>+temp[1-*]_min	Temperature min value.</div><div class='add'>+		Unit: millidegree Celsius</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-temp[1-3]_max_hyst</div><div class='add'>+temp[1-*]_max_hyst</div><div class='ctx'> 		Temperature hysteresis value for max limit.</div><div class='del'>-		Unit: millidegree Celcius</div><div class='add'>+		Unit: millidegree Celsius</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the max value.</div><div class='del'>-		Read/Write value.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-temp[1-4]_input Temperature input value.</div><div class='del'>-		Unit: millidegree Celcius</div><div class='del'>-		Read only value.</div><div class='add'>+temp[1-*]_input Temperature input value.</div><div class='add'>+		Unit: millidegree Celsius</div><div class='add'>+		RO</div><div class='ctx'> </div><div class='del'>-temp[1-4]_crit	Temperature critical value, typically greater than</div><div class='add'>+temp[1-*]_crit	Temperature critical value, typically greater than</div><div class='ctx'> 		corresponding temp_max values.</div><div class='del'>-		Unit: millidegree Celcius</div><div class='del'>-		Read/Write value.</div><div class='add'>+		Unit: millidegree Celsius</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-temp[1-2]_crit_hyst</div><div class='add'>+temp[1-*]_crit_hyst</div><div class='ctx'> 		Temperature hysteresis value for critical limit.</div><div class='del'>-		Unit: millidegree Celcius</div><div class='add'>+		Unit: millidegree Celsius</div><div class='ctx'> 		Must be reported as an absolute temperature, NOT a delta</div><div class='ctx'> 		from the critical value.</div><div class='add'>+		RW</div><div class='add'>+</div><div class='add'>+temp[1-4]_offset</div><div class='add'>+		Temperature offset which is added to the temperature reading</div><div class='add'>+		by the chip.</div><div class='add'>+		Unit: millidegree Celsius</div><div class='ctx'> 		Read/Write value.</div><div class='ctx'> </div><div class='ctx'> 		If there are multiple temperature sensors, temp1_* is</div><div class='hunk'>@@ -225,6 +260,17 @@ temp[1-2]_crit_hyst</div><div class='ctx'> 		itself, for example the thermal diode inside the CPU or</div><div class='ctx'> 		a thermistor nearby.</div><div class='ctx'> </div><div class='add'>+Some chips measure temperature using external thermistors and an ADC, and</div><div class='add'>+report the temperature measurement as a voltage. Converting this voltage</div><div class='add'>+back to a temperature (or the other way around for limits) requires</div><div class='add'>+mathematical functions not available in the kernel, so the conversion</div><div class='add'>+must occur in user space. For these chips, all temp* files described</div><div class='add'>+above should contain values expressed in millivolt instead of millidegree</div><div class='add'>+Celsius. In other words, such temperature channels are handled as voltage</div><div class='add'>+channels by the driver.</div><div class='add'>+</div><div class='add'>+Also see the Alarms section for status flags associated with temperatures.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> ************</div><div class='ctx'> * Currents *</div><div class='hunk'>@@ -233,25 +279,88 @@ temp[1-2]_crit_hyst</div><div class='ctx'> Note that no known chip provides current measurements as of writing,</div><div class='ctx'> so this part is theoretical, so to say.</div><div class='ctx'> </div><div class='del'>-curr[1-n]_max	Current max value</div><div class='add'>+curr[1-*]_max	Current max value</div><div class='ctx'> 		Unit: milliampere</div><div class='del'>-		Read/Write.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-curr[1-n]_min	Current min value.</div><div class='add'>+curr[1-*]_min	Current min value.</div><div class='ctx'> 		Unit: milliampere</div><div class='del'>-		Read/Write.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-curr[1-n]_input	Current input value</div><div class='add'>+curr[1-*]_input	Current input value</div><div class='ctx'> 		Unit: milliampere</div><div class='del'>-		Read only.</div><div class='add'>+		RO</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-*********</div><div class='del'>-* Other *</div><div class='del'>-*********</div><div class='add'>+**********</div><div class='add'>+* Alarms *</div><div class='add'>+**********</div><div class='add'>+</div><div class='add'>+Each channel or limit may have an associated alarm file, containing a</div><div class='add'>+boolean value. 1 means than an alarm condition exists, 0 means no alarm.</div><div class='add'>+</div><div class='add'>+Usually a given chip will either use channel-related alarms, or</div><div class='add'>+limit-related alarms, not both. The driver should just reflect the hardware</div><div class='add'>+implementation.</div><div class='add'>+</div><div class='add'>+in[0-*]_alarm</div><div class='add'>+fan[1-*]_alarm</div><div class='add'>+temp[1-*]_alarm</div><div class='add'>+		Channel alarm</div><div class='add'>+		0: no alarm</div><div class='add'>+		1: alarm</div><div class='add'>+		RO</div><div class='add'>+</div><div class='add'>+OR</div><div class='add'>+</div><div class='add'>+in[0-*]_min_alarm</div><div class='add'>+in[0-*]_max_alarm</div><div class='add'>+fan[1-*]_min_alarm</div><div class='add'>+temp[1-*]_min_alarm</div><div class='add'>+temp[1-*]_max_alarm</div><div class='add'>+temp[1-*]_crit_alarm</div><div class='add'>+		Limit alarm</div><div class='add'>+		0: no alarm</div><div class='add'>+		1: alarm</div><div class='add'>+		RO</div><div class='add'>+</div><div class='add'>+Each input channel may have an associated fault file. This can be used</div><div class='add'>+to notify open diodes, unconnected fans etc. where the hardware</div><div class='add'>+supports it. When this boolean has value 1, the measurement for that</div><div class='add'>+channel should not be trusted.</div><div class='add'>+</div><div class='add'>+in[0-*]_input_fault</div><div class='add'>+fan[1-*]_input_fault</div><div class='add'>+temp[1-*]_input_fault</div><div class='add'>+		Input fault condition</div><div class='add'>+		0: no fault occured</div><div class='add'>+		1: fault condition</div><div class='add'>+		RO</div><div class='add'>+</div><div class='add'>+Some chips also offer the possibility to get beeped when an alarm occurs:</div><div class='add'>+</div><div class='add'>+beep_enable	Master beep enable</div><div class='add'>+		0: no beeps</div><div class='add'>+		1: beeps</div><div class='add'>+		RW</div><div class='add'>+</div><div class='add'>+in[0-*]_beep</div><div class='add'>+fan[1-*]_beep</div><div class='add'>+temp[1-*]_beep</div><div class='add'>+		Channel beep</div><div class='add'>+		0: disable</div><div class='add'>+		1: enable</div><div class='add'>+		RW</div><div class='add'>+</div><div class='add'>+In theory, a chip could provide per-limit beep masking, but no such chip</div><div class='add'>+was seen so far.</div><div class='add'>+</div><div class='add'>+Old drivers provided a different, non-standard interface to alarms and</div><div class='add'>+beeps. These interface files are deprecated, but will be kept around</div><div class='add'>+for compatibility reasons:</div><div class='ctx'> </div><div class='ctx'> alarms		Alarm bitmask.</div><div class='del'>-		Read only.</div><div class='add'>+		RO</div><div class='ctx'> 		Integer representation of one to four bytes.</div><div class='ctx'> 		A '1' bit means an alarm.</div><div class='ctx'> 		Chips should be programmed for 'comparator' mode so that</div><div class='hunk'>@@ -259,35 +368,26 @@ alarms		Alarm bitmask.</div><div class='ctx'> 		if it is still valid.</div><div class='ctx'> 		Generally a direct representation of a chip's internal</div><div class='ctx'> 		alarm registers; there is no standard for the position</div><div class='del'>-		of individual bits.</div><div class='add'>+		of individual bits. For this reason, the use of this</div><div class='add'>+		interface file for new drivers is discouraged. Use</div><div class='add'>+		individual *_alarm and *_fault files instead.</div><div class='ctx'> 		Bits are defined in kernel/include/sensors.h.</div><div class='ctx'> </div><div class='del'>-alarms_in	Alarm bitmask relative to in (voltage) channels</div><div class='del'>-		Read only</div><div class='del'>-		A '1' bit means an alarm, LSB corresponds to in0 and so on</div><div class='del'>-		Prefered to 'alarms' for newer chips</div><div class='del'>-</div><div class='del'>-alarms_fan	Alarm bitmask relative to fan channels</div><div class='del'>-		Read only</div><div class='del'>-		A '1' bit means an alarm, LSB corresponds to fan1 and so on</div><div class='del'>-		Prefered to 'alarms' for newer chips</div><div class='del'>-</div><div class='del'>-alarms_temp	Alarm bitmask relative to temp (temperature) channels</div><div class='del'>-		Read only</div><div class='del'>-		A '1' bit means an alarm, LSB corresponds to temp1 and so on</div><div class='del'>-		Prefered to 'alarms' for newer chips</div><div class='add'>+beep_mask	Bitmask for beep.</div><div class='add'>+		Same format as 'alarms' with the same bit locations,</div><div class='add'>+		use discouraged for the same reason. Use individual</div><div class='add'>+		*_beep files instead.</div><div class='add'>+		RW</div><div class='ctx'> </div><div class='del'>-beep_enable	Beep/interrupt enable</div><div class='del'>-		0 to disable.</div><div class='del'>-		1 to enable.</div><div class='del'>-		Read/Write</div><div class='ctx'> </div><div class='del'>-beep_mask	Bitmask for beep.</div><div class='del'>-		Same format as 'alarms' with the same bit locations.</div><div class='del'>-		Read/Write</div><div class='add'>+*********</div><div class='add'>+* Other *</div><div class='add'>+*********</div><div class='ctx'> </div><div class='ctx'> eeprom		Raw EEPROM data in binary form.</div><div class='del'>-		Read only.</div><div class='add'>+		RO</div><div class='ctx'> </div><div class='ctx'> pec		Enable or disable PEC (SMBus only)</div><div class='del'>-		Read/Write</div><div class='add'>+		0: disable</div><div class='add'>+		1: enable</div><div class='add'>+		RW</div><div class='head'>diff --git a/Documentation/hwmon/userspace-tools b/Documentation/hwmon/userspace-tools<br/>index 2622aac65422..19900a8fe679 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/hwmon/userspace-tools?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/hwmon/userspace-tools</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/userspace-tools?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/userspace-tools</a></div><div class='hunk'>@@ -6,31 +6,32 @@ voltages, fans speed). They are often connected through an I2C bus, but some</div><div class='ctx'> are also connected directly through the ISA bus.</div><div class='ctx'> </div><div class='ctx'> The kernel drivers make the data from the sensor chips available in the /sys</div><div class='del'>-virtual filesystem. Userspace tools are then used to display or set or the</div><div class='del'>-data in a more friendly manner.</div><div class='add'>+virtual filesystem. Userspace tools are then used to display the measured</div><div class='add'>+values or configure the chips in a more friendly manner.</div><div class='ctx'> </div><div class='ctx'> Lm-sensors</div><div class='ctx'> ----------</div><div class='ctx'> </div><div class='del'>-Core set of utilites that will allow you to obtain health information,</div><div class='add'>+Core set of utilities that will allow you to obtain health information,</div><div class='ctx'> setup monitoring limits etc. You can get them on their homepage</div><div class='ctx'> http://www.lm-sensors.nu/ or as a package from your Linux distribution.</div><div class='ctx'> </div><div class='ctx'> If from website:</div><div class='del'>-Get lmsensors from project web site. Please note, you need only userspace</div><div class='del'>-part, so compile with "make user_install" target.</div><div class='add'>+Get lm-sensors from project web site. Please note, you need only userspace</div><div class='add'>+part, so compile with "make user" and install with "make user_install".</div><div class='ctx'> </div><div class='ctx'> General hints to get things working:</div><div class='ctx'> </div><div class='ctx'> 0) get lm-sensors userspace utils</div><div class='del'>-1) compile all drivers in I2C section as modules in your kernel</div><div class='add'>+1) compile all drivers in I2C and Hardware Monitoring sections as modules</div><div class='add'>+   in your kernel</div><div class='ctx'> 2) run sensors-detect script, it will tell you what modules you need to load.</div><div class='ctx'> 3) load them and run "sensors" command, you should see some results.</div><div class='ctx'> 4) fix sensors.conf, labels, limits, fan divisors</div><div class='ctx'> 5) if any more problems consult FAQ, or documentation</div><div class='ctx'> </div><div class='del'>-Other utilites</div><div class='del'>---------------</div><div class='add'>+Other utilities</div><div class='add'>+---------------</div><div class='ctx'> </div><div class='ctx'> If you want some graphical indicators of system health look for applications</div><div class='ctx'> like: gkrellm, ksensors, xsensors, wmtemp, wmsensors, wmgtemp, ksysguardd,</div><div class='head'>diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d<br/>new file mode 100644<br/>index 000000000000..83a3836289c2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/hwmon/w83791d?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/hwmon/w83791d</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+Kernel driver w83791d</div><div class='add'>+=====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Winbond W83791D</div><div class='add'>+    Prefix: 'w83791d'</div><div class='add'>+    Addresses scanned: I2C 0x2c - 0x2f</div><div class='add'>+    Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83791Da.pdf</div><div class='add'>+</div><div class='add'>+Author: Charles Spirakis &lt;bezaur@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+This driver was derived from the w83781d.c and w83792d.c source files.</div><div class='add'>+</div><div class='add'>+Credits:</div><div class='add'>+  w83781d.c:</div><div class='add'>+    Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='add'>+    Philip Edelbrock &lt;phil@netroedge.com&gt;,</div><div class='add'>+    and Mark Studebaker &lt;mdsxyz123@yahoo.com&gt;</div><div class='add'>+  w83792d.c:</div><div class='add'>+    Chunhao Huang &lt;DZShen@Winbond.com.tw&gt;,</div><div class='add'>+    Rudolf Marek &lt;r.marek@sh.cvut.cz&gt;</div><div class='add'>+</div><div class='add'>+Module Parameters</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+* init boolean</div><div class='add'>+  (default 0)</div><div class='add'>+  Use 'init=1' to have the driver do extra software initializations.</div><div class='add'>+  The default behavior is to do the minimum initialization possible</div><div class='add'>+  and depend on the BIOS to properly setup the chip. If you know you</div><div class='add'>+  have a w83791d and you're having problems, try init=1 before trying</div><div class='add'>+  reset=1.</div><div class='add'>+</div><div class='add'>+* reset boolean</div><div class='add'>+  (default 0)</div><div class='add'>+  Use 'reset=1' to reset the chip (via index 0x40, bit 7). The default</div><div class='add'>+  behavior is no chip reset to preserve BIOS settings.</div><div class='add'>+</div><div class='add'>+* force_subclients=bus,caddr,saddr,saddr</div><div class='add'>+  This is used to force the i2c addresses for subclients of</div><div class='add'>+  a certain chip. Example usage is `force_subclients=0,0x2f,0x4a,0x4b'</div><div class='add'>+  to force the subclients of chip 0x2f on bus 0 to i2c addresses</div><div class='add'>+  0x4a and 0x4b.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+This driver implements support for the Winbond W83791D chip.</div><div class='add'>+</div><div class='add'>+Detection of the chip can sometimes be foiled because it can be in an</div><div class='add'>+internal state that allows no clean access (Bank with ID register is not</div><div class='add'>+currently selected). If you know the address of the chip, use a 'force'</div><div class='add'>+parameter; this will put it into a more well-behaved state first.</div><div class='add'>+</div><div class='add'>+The driver implements three temperature sensors, five fan rotation speed</div><div class='add'>+sensors, and ten voltage sensors.</div><div class='add'>+</div><div class='add'>+Temperatures are measured in degrees Celsius and measurement resolution is 1</div><div class='add'>+degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when</div><div class='add'>+the temperature gets higher than the Overtemperature Shutdown value; it stays</div><div class='add'>+on until the temperature falls below the Hysteresis value.</div><div class='add'>+</div><div class='add'>+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is</div><div class='add'>+triggered if the rotation speed has dropped below a programmable limit. Fan</div><div class='add'>+readings can be divided by a programmable divider (1, 2, 4, 8 for fan 1/2/3</div><div class='add'>+and 1, 2, 4, 8, 16, 32, 64 or 128 for fan 4/5) to give the readings more</div><div class='add'>+range or accuracy.</div><div class='add'>+</div><div class='add'>+Voltage sensors (also known as IN sensors) report their values in millivolts.</div><div class='add'>+An alarm is triggered if the voltage has crossed a programmable minimum</div><div class='add'>+or maximum limit.</div><div class='add'>+</div><div class='add'>+Alarms are provided as output from a "realtime status register". The</div><div class='add'>+following bits are defined:</div><div class='add'>+</div><div class='add'>+bit - alarm on:</div><div class='add'>+0  - Vcore</div><div class='add'>+1  - VINR0</div><div class='add'>+2  - +3.3VIN</div><div class='add'>+3  - 5VDD</div><div class='add'>+4  - temp1</div><div class='add'>+5  - temp2</div><div class='add'>+6  - fan1</div><div class='add'>+7  - fan2</div><div class='add'>+8  - +12VIN</div><div class='add'>+9  - -12VIN</div><div class='add'>+10 - -5VIN</div><div class='add'>+11 - fan3</div><div class='add'>+12 - chassis</div><div class='add'>+13 - temp3</div><div class='add'>+14 - VINR1</div><div class='add'>+15 - reserved</div><div class='add'>+16 - tart1</div><div class='add'>+17 - tart2</div><div class='add'>+18 - tart3</div><div class='add'>+19 - VSB</div><div class='add'>+20 - VBAT</div><div class='add'>+21 - fan4</div><div class='add'>+22 - fan5</div><div class='add'>+23 - reserved</div><div class='add'>+</div><div class='add'>+When an alarm goes off, you can be warned by a beeping signal through your</div><div class='add'>+computer speaker. It is possible to enable all beeping globally, or only</div><div class='add'>+the beeping for some alarms.</div><div class='add'>+</div><div class='add'>+The driver only reads the chip values each 3 seconds; reading them more</div><div class='add'>+often will do no harm, but will return 'old' values.</div><div class='add'>+</div><div class='add'>+W83791D TODO:</div><div class='add'>+---------------</div><div class='add'>+Provide a patch for per-file alarms as discussed on the mailing list</div><div class='add'>+Provide a patch for smart-fan control (still need appropriate motherboard/fans)</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801<br/>index fd4b2712d570..e46c23458242 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-i801?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-i801</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-i801?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/i2c/busses/i2c-i801</a></div><div class='hunk'>@@ -21,8 +21,7 @@ Authors:</div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='del'>-* force_addr: int</div><div class='del'>-  Forcibly enable the ICH at the given address. EXTREMELY DANGEROUS!</div><div class='add'>+None.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-nforce2 b/Documentation/i2c/busses/i2c-nforce2<br/>index d751282d9b2a..cd49c428a3ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-nforce2?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-nforce2</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-nforce2?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/i2c/busses/i2c-nforce2</a></div><div class='hunk'>@@ -7,6 +7,8 @@ Supported adapters:</div><div class='ctx'>   * nForce3 250Gb MCP          10de:00E4 </div><div class='ctx'>   * nForce4 MCP                10de:0052</div><div class='ctx'>   * nForce4 MCP-04             10de:0034</div><div class='add'>+  * nForce4 MCP51              10de:0264</div><div class='add'>+  * nForce4 MCP55              10de:0368</div><div class='ctx'> </div><div class='ctx'> Datasheet: not publically available, but seems to be similar to the</div><div class='ctx'>            AMD-8111 SMBus 2.0 adapter.</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-ocores b/Documentation/i2c/busses/i2c-ocores<br/>new file mode 100644<br/>index 000000000000..cfcebb10d14e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-ocores?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/i2c/busses/i2c-ocores</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+Kernel driver i2c-ocores</div><div class='add'>+</div><div class='add'>+Supported adapters:</div><div class='add'>+  * OpenCores.org I2C controller by Richard Herveille (see datasheet link)</div><div class='add'>+    Datasheet: http://www.opencores.org/projects.cgi/web/i2c/overview</div><div class='add'>+</div><div class='add'>+Author: Peter Korsgaard &lt;jacmet@sunsite.dk&gt;</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+i2c-ocores is an i2c bus driver for the OpenCores.org I2C controller</div><div class='add'>+IP core by Richard Herveille.</div><div class='add'>+</div><div class='add'>+Usage</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+i2c-ocores uses the platform bus, so you need to provide a struct</div><div class='add'>+platform_device with the base address and interrupt number. The</div><div class='add'>+dev.platform_data of the device should also point to a struct</div><div class='add'>+ocores_i2c_platform_data (see linux/i2c-ocores.h) describing the</div><div class='add'>+distance between registers and the input clock speed.</div><div class='add'>+</div><div class='add'>+E.G. something like:</div><div class='add'>+</div><div class='add'>+static struct resource ocores_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= MYI2C_BASEADDR,</div><div class='add'>+		.end	= MYI2C_BASEADDR + 8,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= MYI2C_IRQ,</div><div class='add'>+		.end	= MYI2C_IRQ,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ocores_i2c_platform_data myi2c_data = {</div><div class='add'>+	.regstep	= 2,		/* two bytes between registers */</div><div class='add'>+	.clock_khz	= 50000,	/* input clock of 50MHz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device myi2c = {</div><div class='add'>+	.name			= "ocores-i2c",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;myi2c_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources		= ARRAY_SIZE(ocores_resources),</div><div class='add'>+	.resource		= ocores_resources,</div><div class='add'>+};</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4<br/>index a1c8f581afed..921476333235 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-piix4?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-piix4</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-piix4?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/i2c/busses/i2c-piix4</a></div><div class='hunk'>@@ -6,6 +6,8 @@ Supported adapters:</div><div class='ctx'>     Datasheet: Publicly available at the Intel website</div><div class='ctx'>   * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges</div><div class='ctx'>     Datasheet: Only available via NDA from ServerWorks</div><div class='add'>+  * ATI IXP southbridges IXP200, IXP300, IXP400</div><div class='add'>+    Datasheet: Not publicly available</div><div class='ctx'>   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge</div><div class='ctx'>     Datasheet: Publicly available at the SMSC website http://www.smsc.com</div><div class='ctx'> </div><div class='hunk'>@@ -21,8 +23,6 @@ Module Parameters</div><div class='ctx'>   Forcibly enable the PIIX4. DANGEROUS!</div><div class='ctx'> * force_addr: int</div><div class='ctx'>   Forcibly enable the PIIX4 at the given address. EXTREMELY DANGEROUS!</div><div class='del'>-* fix_hstcfg: int</div><div class='del'>-  Fix config register. Needed on some boards (Force CPCI735).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Description</div><div class='hunk'>@@ -63,10 +63,36 @@ The PIIX4E is just an new version of the PIIX4; it is supported as well.</div><div class='ctx'> The PIIX/PIIX3 does not implement an SMBus or I2C bus, so you can't use</div><div class='ctx'> this driver on those mainboards.</div><div class='ctx'> </div><div class='del'>-The ServerWorks Southbridges, the Intel 440MX, and the Victory766 are</div><div class='add'>+The ServerWorks Southbridges, the Intel 440MX, and the Victory66 are</div><div class='ctx'> identical to the PIIX4 in I2C/SMBus support.</div><div class='ctx'> </div><div class='del'>-A few OSB4 southbridges are known to be misconfigured by the BIOS. In this</div><div class='del'>-case, you have you use the fix_hstcfg module parameter. Do not use it</div><div class='del'>-unless you know you have to, because in some cases it also breaks</div><div class='del'>-configuration on southbridges that don't need it.</div><div class='add'>+If you own Force CPCI735 motherboard or other OSB4 based systems you may need</div><div class='add'>+to change the SMBus Interrupt Select register so the SMBus controller uses</div><div class='add'>+the SMI mode.</div><div class='add'>+</div><div class='add'>+1) Use lspci command and locate the PCI device with the SMBus controller:</div><div class='add'>+   00:0f.0 ISA bridge: ServerWorks OSB4 South Bridge (rev 4f)</div><div class='add'>+   The line may vary for different chipsets. Please consult the driver source</div><div class='add'>+   for all possible PCI ids (and lspci -n to match them). Lets assume the</div><div class='add'>+   device is located at 00:0f.0.</div><div class='add'>+2) Now you just need to change the value in 0xD2 register. Get it first with</div><div class='add'>+   command: lspci -xxx -s 00:0f.0</div><div class='add'>+   If the value is 0x3 then you need to change it to 0x1</div><div class='add'>+   setpci  -s 00:0f.0 d2.b=1</div><div class='add'>+</div><div class='add'>+Please note that you don't need to do that in all cases, just when the SMBus is</div><div class='add'>+not working properly.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Hardware-specific issues</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+This driver will refuse to load on IBM systems with an Intel PIIX4 SMBus.</div><div class='add'>+Some of these machines have an RFID EEPROM (24RF08) connected to the SMBus,</div><div class='add'>+which can easily get corrupted due to a state machine bug. These are mostly</div><div class='add'>+Thinkpad laptops, but desktop systems may also be affected. We have no list</div><div class='add'>+of all affected systems, so the only safe solution was to prevent access to</div><div class='add'>+the SMBus on all IBM systems (detected using DMI data.)</div><div class='add'>+</div><div class='add'>+For additional information, read:</div><div class='add'>+http://www2.lm-sensors.nu/~lm78/cvs/lm_sensors2/README.thinkpad</div><div class='head'>diff --git a/Documentation/i2c/busses/i2c-sis96x b/Documentation/i2c/busses/i2c-sis96x<br/>index 00a009b977e9..08d7b2dac69a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-sis96x?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/i2c-sis96x</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/i2c-sis96x?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/i2c/busses/i2c-sis96x</a></div><div class='hunk'>@@ -42,8 +42,8 @@ I suspect that this driver could be made to work for the following SiS</div><div class='ctx'> chipsets as well: 635, and 635T. If anyone owns a board with those chips</div><div class='ctx'> AND is willing to risk crashing &amp; burning an otherwise well-behaved kernel</div><div class='ctx'> in the name of progress... please contact me at &lt;mhoffman@lightlink.com&gt; or</div><div class='del'>-via the project's mailing list: &lt;lm-sensors@lm-sensors.org&gt;.  Please</div><div class='del'>-send bug reports and/or success stories as well.</div><div class='add'>+via the project's mailing list: &lt;i2c@lm-sensors.org&gt;.  Please send bug</div><div class='add'>+reports and/or success stories as well.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> TO DOs</div><div class='head'>diff --git a/Documentation/i2c/busses/scx200_acb b/Documentation/i2c/busses/scx200_acb<br/>index f50e69981ec6..7c07883d4dfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/scx200_acb?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/i2c/busses/scx200_acb</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/i2c/busses/scx200_acb?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/i2c/busses/scx200_acb</a></div><div class='hunk'>@@ -2,14 +2,31 @@ Kernel driver scx200_acb</div><div class='ctx'> </div><div class='ctx'> Author: Christer Weinigel &lt;wingel@nano-system.com&gt;</div><div class='ctx'> </div><div class='add'>+The driver supersedes the older, never merged driver named i2c-nscacb.</div><div class='add'>+</div><div class='ctx'> Module Parameters</div><div class='ctx'> -----------------</div><div class='ctx'> </div><div class='del'>-* base: int</div><div class='add'>+* base: up to 4 ints</div><div class='ctx'>   Base addresses for the ACCESS.bus controllers on SCx200 and SC1100 devices</div><div class='ctx'> </div><div class='add'>+  By default the driver uses two base addresses 0x820 and 0x840.</div><div class='add'>+  If you want only one base address, specify the second as 0 so as to</div><div class='add'>+  override this default.</div><div class='add'>+</div><div class='ctx'> Description</div><div class='ctx'> -----------</div><div class='ctx'> </div><div class='ctx'> Enable the use of the ACCESS.bus controller on the Geode SCx200 and</div><div class='ctx'> SC1100 processors and the CS5535 and CS5536 Geode companion devices.</div><div class='add'>+</div><div class='add'>+Device-specific notes</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The SC1100 WRAP boards are known to use base addresses 0x810 and 0x820.</div><div class='add'>+If the scx200_acb driver is built into the kernel, add the following</div><div class='add'>+parameter to your boot command line:</div><div class='add'>+  scx200_acb.base=0x810,0x820</div><div class='add'>+If the scx200_acb driver is built as a module, add the following line to</div><div class='add'>+the file /etc/modprobe.conf instead:</div><div class='add'>+  options scx200_acb base=0x810,0x820</div><div class='head'>diff --git a/Documentation/ia64/aliasing.txt b/Documentation/ia64/aliasing.txt<br/>new file mode 100644<br/>index 000000000000..38f9a52d1820<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ia64/aliasing.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ia64/aliasing.txt</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+	         MEMORY ATTRIBUTE ALIASING ON IA-64</div><div class='add'>+</div><div class='add'>+			   Bjorn Helgaas</div><div class='add'>+		       &lt;bjorn.helgaas@hp.com&gt;</div><div class='add'>+			    May 4, 2006</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MEMORY ATTRIBUTES</div><div class='add'>+</div><div class='add'>+    Itanium supports several attributes for virtual memory references.</div><div class='add'>+    The attribute is part of the virtual translation, i.e., it is</div><div class='add'>+    contained in the TLB entry.  The ones of most interest to the Linux</div><div class='add'>+    kernel are:</div><div class='add'>+</div><div class='add'>+	WB		Write-back (cacheable)</div><div class='add'>+	UC		Uncacheable</div><div class='add'>+	WC		Write-coalescing</div><div class='add'>+</div><div class='add'>+    System memory typically uses the WB attribute.  The UC attribute is</div><div class='add'>+    used for memory-mapped I/O devices.  The WC attribute is uncacheable</div><div class='add'>+    like UC is, but writes may be delayed and combined to increase</div><div class='add'>+    performance for things like frame buffers.</div><div class='add'>+</div><div class='add'>+    The Itanium architecture requires that we avoid accessing the same</div><div class='add'>+    page with both a cacheable mapping and an uncacheable mapping[1].</div><div class='add'>+</div><div class='add'>+    The design of the chipset determines which attributes are supported</div><div class='add'>+    on which regions of the address space.  For example, some chipsets</div><div class='add'>+    support either WB or UC access to main memory, while others support</div><div class='add'>+    only WB access.</div><div class='add'>+</div><div class='add'>+MEMORY MAP</div><div class='add'>+</div><div class='add'>+    Platform firmware describes the physical memory map and the</div><div class='add'>+    supported attributes for each region.  At boot-time, the kernel uses</div><div class='add'>+    the EFI GetMemoryMap() interface.  ACPI can also describe memory</div><div class='add'>+    devices and the attributes they support, but Linux/ia64 currently</div><div class='add'>+    doesn't use this information.</div><div class='add'>+</div><div class='add'>+    The kernel uses the efi_memmap table returned from GetMemoryMap() to</div><div class='add'>+    learn the attributes supported by each region of physical address</div><div class='add'>+    space.  Unfortunately, this table does not completely describe the</div><div class='add'>+    address space because some machines omit some or all of the MMIO</div><div class='add'>+    regions from the map.</div><div class='add'>+</div><div class='add'>+    The kernel maintains another table, kern_memmap, which describes the</div><div class='add'>+    memory Linux is actually using and the attribute for each region.</div><div class='add'>+    This contains only system memory; it does not contain MMIO space.</div><div class='add'>+</div><div class='add'>+    The kern_memmap table typically contains only a subset of the system</div><div class='add'>+    memory described by the efi_memmap.  Linux/ia64 can't use all memory</div><div class='add'>+    in the system because of constraints imposed by the identity mapping</div><div class='add'>+    scheme.</div><div class='add'>+</div><div class='add'>+    The efi_memmap table is preserved unmodified because the original</div><div class='add'>+    boot-time information is required for kexec.</div><div class='add'>+</div><div class='add'>+KERNEL IDENTITY MAPPINGS</div><div class='add'>+</div><div class='add'>+    Linux/ia64 identity mappings are done with large pages, currently</div><div class='add'>+    either 16MB or 64MB, referred to as "granules."  Cacheable mappings</div><div class='add'>+    are speculative[2], so the processor can read any location in the</div><div class='add'>+    page at any time, independent of the programmer's intentions.  This</div><div class='add'>+    means that to avoid attribute aliasing, Linux can create a cacheable</div><div class='add'>+    identity mapping only when the entire granule supports cacheable</div><div class='add'>+    access.</div><div class='add'>+</div><div class='add'>+    Therefore, kern_memmap contains only full granule-sized regions that</div><div class='add'>+    can referenced safely by an identity mapping.</div><div class='add'>+</div><div class='add'>+    Uncacheable mappings are not speculative, so the processor will</div><div class='add'>+    generate UC accesses only to locations explicitly referenced by</div><div class='add'>+    software.  This allows UC identity mappings to cover granules that</div><div class='add'>+    are only partially populated, or populated with a combination of UC</div><div class='add'>+    and WB regions.</div><div class='add'>+</div><div class='add'>+USER MAPPINGS</div><div class='add'>+</div><div class='add'>+    User mappings are typically done with 16K or 64K pages.  The smaller</div><div class='add'>+    page size allows more flexibility because only 16K or 64K has to be</div><div class='add'>+    homogeneous with respect to memory attributes.</div><div class='add'>+</div><div class='add'>+POTENTIAL ATTRIBUTE ALIASING CASES</div><div class='add'>+</div><div class='add'>+    There are several ways the kernel creates new mappings:</div><div class='add'>+</div><div class='add'>+    mmap of /dev/mem</div><div class='add'>+</div><div class='add'>+	This uses remap_pfn_range(), which creates user mappings.  These</div><div class='add'>+	mappings may be either WB or UC.  If the region being mapped</div><div class='add'>+	happens to be in kern_memmap, meaning that it may also be mapped</div><div class='add'>+	by a kernel identity mapping, the user mapping must use the same</div><div class='add'>+	attribute as the kernel mapping.</div><div class='add'>+</div><div class='add'>+	If the region is not in kern_memmap, the user mapping should use</div><div class='add'>+	an attribute reported as being supported in the EFI memory map.</div><div class='add'>+</div><div class='add'>+	Since the EFI memory map does not describe MMIO on some</div><div class='add'>+	machines, this should use an uncacheable mapping as a fallback.</div><div class='add'>+</div><div class='add'>+    mmap of /sys/class/pci_bus/.../legacy_mem</div><div class='add'>+</div><div class='add'>+	This is very similar to mmap of /dev/mem, except that legacy_mem</div><div class='add'>+	only allows mmap of the one megabyte "legacy MMIO" area for a</div><div class='add'>+	specific PCI bus.  Typically this is the first megabyte of</div><div class='add'>+	physical address space, but it may be different on machines with</div><div class='add'>+	several VGA devices.</div><div class='add'>+</div><div class='add'>+	"X" uses this to access VGA frame buffers.  Using legacy_mem</div><div class='add'>+	rather than /dev/mem allows multiple instances of X to talk to</div><div class='add'>+	different VGA cards.</div><div class='add'>+</div><div class='add'>+	The /dev/mem mmap constraints apply.</div><div class='add'>+</div><div class='add'>+	However, since this is for mapping legacy MMIO space, WB access</div><div class='add'>+	does not make sense.  This matters on machines without legacy</div><div class='add'>+	VGA support: these machines may have WB memory for the entire</div><div class='add'>+	first megabyte (or even the entire first granule).</div><div class='add'>+</div><div class='add'>+	On these machines, we could mmap legacy_mem as WB, which would</div><div class='add'>+	be safe in terms of attribute aliasing, but X has no way of</div><div class='add'>+	knowing that it is accessing regular memory, not a frame buffer,</div><div class='add'>+	so the kernel should fail the mmap rather than doing it with WB.</div><div class='add'>+</div><div class='add'>+    read/write of /dev/mem</div><div class='add'>+</div><div class='add'>+	This uses copy_from_user(), which implicitly uses a kernel</div><div class='add'>+	identity mapping.  This is obviously safe for things in</div><div class='add'>+	kern_memmap.</div><div class='add'>+</div><div class='add'>+	There may be corner cases of things that are not in kern_memmap,</div><div class='add'>+	but could be accessed this way.  For example, registers in MMIO</div><div class='add'>+	space are not in kern_memmap, but could be accessed with a UC</div><div class='add'>+	mapping.  This would not cause attribute aliasing.  But</div><div class='add'>+	registers typically can be accessed only with four-byte or</div><div class='add'>+	eight-byte accesses, and the copy_from_user() path doesn't allow</div><div class='add'>+	any control over the access size, so this would be dangerous.</div><div class='add'>+</div><div class='add'>+    ioremap()</div><div class='add'>+</div><div class='add'>+	This returns a kernel identity mapping for use inside the</div><div class='add'>+	kernel.</div><div class='add'>+</div><div class='add'>+	If the region is in kern_memmap, we should use the attribute</div><div class='add'>+	specified there.  Otherwise, if the EFI memory map reports that</div><div class='add'>+	the entire granule supports WB, we should use that (granules</div><div class='add'>+	that are partially reserved or occupied by firmware do not appear</div><div class='add'>+	in kern_memmap).  Otherwise, we should use a UC mapping.</div><div class='add'>+</div><div class='add'>+PAST PROBLEM CASES</div><div class='add'>+</div><div class='add'>+    mmap of various MMIO regions from /dev/mem by "X" on Intel platforms</div><div class='add'>+</div><div class='add'>+      The EFI memory map may not report these MMIO regions.</div><div class='add'>+</div><div class='add'>+      These must be allowed so that X will work.  This means that</div><div class='add'>+      when the EFI memory map is incomplete, every /dev/mem mmap must</div><div class='add'>+      succeed.  It may create either WB or UC user mappings, depending</div><div class='add'>+      on whether the region is in kern_memmap or the EFI memory map.</div><div class='add'>+</div><div class='add'>+    mmap of 0x0-0xA0000 /dev/mem by "hwinfo" on HP sx1000 with VGA enabled</div><div class='add'>+</div><div class='add'>+      See https://bugzilla.novell.com/show_bug.cgi?id=140858.</div><div class='add'>+</div><div class='add'>+      The EFI memory map reports the following attributes:</div><div class='add'>+        0x00000-0x9FFFF WB only</div><div class='add'>+        0xA0000-0xBFFFF UC only (VGA frame buffer)</div><div class='add'>+        0xC0000-0xFFFFF WB only</div><div class='add'>+</div><div class='add'>+      This mmap is done with user pages, not kernel identity mappings,</div><div class='add'>+      so it is safe to use WB mappings.</div><div class='add'>+</div><div class='add'>+      The kernel VGA driver may ioremap the VGA frame buffer at 0xA0000,</div><div class='add'>+      which will use a granule-sized UC mapping covering 0-0xFFFFF.  This</div><div class='add'>+      granule covers some WB-only memory, but since UC is non-speculative,</div><div class='add'>+      the processor will never generate an uncacheable reference to the</div><div class='add'>+      WB-only areas unless the driver explicitly touches them.</div><div class='add'>+</div><div class='add'>+    mmap of 0x0-0xFFFFF legacy_mem by "X"</div><div class='add'>+</div><div class='add'>+      If the EFI memory map reports this entire range as WB, there</div><div class='add'>+      is no VGA MMIO hole, and the mmap should fail or be done with</div><div class='add'>+      a WB mapping.</div><div class='add'>+</div><div class='add'>+      There's no easy way for X to determine whether the 0xA0000-0xBFFFF</div><div class='add'>+      region is a frame buffer or just memory, so I think it's best to</div><div class='add'>+      just fail this mmap request rather than using a WB mapping.  As</div><div class='add'>+      far as I know, there's no need to map legacy_mem with WB</div><div class='add'>+      mappings.</div><div class='add'>+</div><div class='add'>+      Otherwise, a UC mapping of the entire region is probably safe.</div><div class='add'>+      The VGA hole means the region will not be in kern_memmap.  The</div><div class='add'>+      HP sx1000 chipset doesn't support UC access to the memory surrounding</div><div class='add'>+      the VGA hole, but X doesn't need that area anyway and should not</div><div class='add'>+      reference it.</div><div class='add'>+</div><div class='add'>+    mmap of 0xA0000-0xBFFFF legacy_mem by "X" on HP sx1000 with VGA disabled</div><div class='add'>+</div><div class='add'>+      The EFI memory map reports the following attributes:</div><div class='add'>+        0x00000-0xFFFFF WB only (no VGA MMIO hole)</div><div class='add'>+</div><div class='add'>+      This is a special case of the previous case, and the mmap should</div><div class='add'>+      fail for the same reason as above.</div><div class='add'>+</div><div class='add'>+NOTES</div><div class='add'>+</div><div class='add'>+    [1] SDM rev 2.2, vol 2, sec 4.4.1.</div><div class='add'>+    [2] SDM rev 2.2, vol 2, sec 4.4.6.</div><div class='head'>diff --git a/Documentation/infiniband/ipoib.txt b/Documentation/infiniband/ipoib.txt<br/>index 5c5a4ccce76a..187035560d7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/infiniband/ipoib.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/infiniband/ipoib.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/infiniband/ipoib.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/infiniband/ipoib.txt</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> IP OVER INFINIBAND</div><div class='ctx'> </div><div class='ctx'>   The ib_ipoib driver is an implementation of the IP over InfiniBand</div><div class='del'>-  protocol as specified by the latest Internet-Drafts issued by the</div><div class='del'>-  IETF ipoib working group.  It is a "native" implementation in the</div><div class='del'>-  sense of setting the interface type to ARPHRD_INFINIBAND and the</div><div class='del'>-  hardware address length to 20 (earlier proprietary implementations</div><div class='add'>+  protocol as specified by RFC 4391 and 4392, issued by the IETF ipoib</div><div class='add'>+  working group.  It is a "native" implementation in the sense of</div><div class='add'>+  setting the interface type to ARPHRD_INFINIBAND and the hardware</div><div class='add'>+  address length to 20 (earlier proprietary implementations</div><div class='ctx'>   masqueraded to the kernel as ethernet interfaces).</div><div class='ctx'> </div><div class='ctx'> Partitions and P_Keys</div><div class='hunk'>@@ -53,3 +53,7 @@ References</div><div class='ctx'> </div><div class='ctx'>   IETF IP over InfiniBand (ipoib) Working Group</div><div class='ctx'>     http://ietf.org/html.charters/ipoib-charter.html</div><div class='add'>+  Transmission of IP over InfiniBand (IPoIB) (RFC 4391)</div><div class='add'>+    http://ietf.org/rfc/rfc4391.txt </div><div class='add'>+  IP over InfiniBand (IPoIB) Architecture (RFC 4392)</div><div class='add'>+    http://ietf.org/rfc/rfc4392.txt </div><div class='head'>diff --git a/Documentation/initrd.txt b/Documentation/initrd.txt<br/>index 7de1c80cd719..b1b6440237a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/initrd.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/initrd.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/initrd.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/initrd.txt</a></div><div class='hunk'>@@ -67,8 +67,7 @@ initrd adds the following new options:</div><div class='ctx'>     as the last process has closed it, all data is freed and /dev/initrd</div><div class='ctx'>     can't be opened anymore.</div><div class='ctx'> </div><div class='del'>-  root=/dev/ram0   (without devfs)</div><div class='del'>-  root=/dev/rd/0   (with devfs)</div><div class='add'>+  root=/dev/ram0</div><div class='ctx'> </div><div class='ctx'>     initrd is mounted as root, and the normal boot procedure is followed,</div><div class='ctx'>     with the RAM disk still mounted as root.</div><div class='hunk'>@@ -90,8 +89,7 @@ you're building an install floppy), the root file system creation</div><div class='ctx'> procedure should create the /initrd directory.</div><div class='ctx'> </div><div class='ctx'> If initrd will not be mounted in some cases, its content is still</div><div class='del'>-accessible if the following device has been created (note that this</div><div class='del'>-does not work if using devfs):</div><div class='add'>+accessible if the following device has been created:</div><div class='ctx'> </div><div class='ctx'> # mknod /dev/initrd b 1 250 </div><div class='ctx'> # chmod 400 /dev/initrd</div><div class='hunk'>@@ -119,8 +117,7 @@ We'll describe the loopback device method:</div><div class='ctx'>     (if space is critical, you may want to use the Minix FS instead of Ext2)</div><div class='ctx'>  3) mount the file system, e.g.</div><div class='ctx'>     # mount -t ext2 -o loop initrd /mnt</div><div class='del'>- 4) create the console device (not necessary if using devfs, but it can't</div><div class='del'>-    hurt to do it anyway):</div><div class='add'>+ 4) create the console device:</div><div class='ctx'>     # mkdir /mnt/dev</div><div class='ctx'>     # mknod /mnt/dev/console c 5 1</div><div class='ctx'>  5) copy all the files that are needed to properly use the initrd</div><div class='hunk'>@@ -152,12 +149,7 @@ have to be given:</div><div class='ctx'> </div><div class='ctx'>   root=/dev/ram0 init=/linuxrc rw</div><div class='ctx'> </div><div class='del'>-if not using devfs, or</div><div class='del'>-</div><div class='del'>-  root=/dev/rd/0 init=/linuxrc rw</div><div class='del'>-</div><div class='del'>-if using devfs. (rw is only necessary if writing to the initrd file</div><div class='del'>-system.)</div><div class='add'>+(rw is only necessary if writing to the initrd file system.)</div><div class='ctx'> </div><div class='ctx'> With LOADLIN, you simply execute</div><div class='ctx'> </div><div class='hunk'>@@ -217,9 +209,9 @@ following command:</div><div class='ctx'> # exec chroot . what-follows &lt;dev/console &gt;dev/console 2&gt;&amp;1</div><div class='ctx'> </div><div class='ctx'> Where what-follows is a program under the new root, e.g. /sbin/init</div><div class='del'>-If the new root file system will be used with devfs and has no valid</div><div class='del'>-/dev directory, devfs must be mounted before invoking chroot in order to</div><div class='del'>-provide /dev/console.</div><div class='add'>+If the new root file system will be used with udev and has no valid</div><div class='add'>+/dev directory, udev must be initialized before invoking chroot in order</div><div class='add'>+to provide /dev/console.</div><div class='ctx'> </div><div class='ctx'> Note: implementation details of pivot_root may change with time. In order</div><div class='ctx'> to ensure compatibility, the following points should be observed:</div><div class='hunk'>@@ -236,7 +228,7 @@ Now, the initrd can be unmounted and the memory allocated by the RAM</div><div class='ctx'> disk can be freed:</div><div class='ctx'> </div><div class='ctx'> # umount /initrd</div><div class='del'>-# blockdev --flushbufs /dev/ram0    # /dev/rd/0 if using devfs</div><div class='add'>+# blockdev --flushbufs /dev/ram0</div><div class='ctx'> </div><div class='ctx'> It is also possible to use initrd with an NFS-mounted root, see the</div><div class='ctx'> pivot_root(8) man page for details.</div><div class='head'>diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt<br/>index 171a44ebd939..edc04d74ae23 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ioctl-number.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/ioctl-number.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ioctl-number.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ioctl-number.txt</a></div><div class='hunk'>@@ -85,7 +85,9 @@ Code	Seq#	Include File		Comments</div><div class='ctx'> 					&lt;mailto:maassen@uni-freiburg.de&gt;</div><div class='ctx'> 'C'	all	linux/soundcard.h</div><div class='ctx'> 'D'	all	asm-s390/dasd.h</div><div class='add'>+'E'	all	linux/input.h</div><div class='ctx'> 'F'	all	linux/fb.h</div><div class='add'>+'H'	all	linux/hiddev.h</div><div class='ctx'> 'I'	all	linux/isdn.h</div><div class='ctx'> 'J'	00-1F	drivers/scsi/gdth_ioctl.h</div><div class='ctx'> 'K'	all	linux/kd.h</div><div class='hunk'>@@ -117,7 +119,6 @@ Code	Seq#	Include File		Comments</div><div class='ctx'> 'c'	00-7F	linux/comstats.h	conflict!</div><div class='ctx'> 'c'	00-7F	linux/coda.h		conflict!</div><div class='ctx'> 'd'	00-FF	linux/char/drm/drm/h	conflict!</div><div class='del'>-'d'	00-1F	linux/devfs_fs.h	conflict!</div><div class='ctx'> 'd'	00-DF	linux/video_decoder.h	conflict!</div><div class='ctx'> 'd'	F0-FF	linux/digi1.h</div><div class='ctx'> 'e'	all	linux/digi1.h		conflict!</div><div class='head'>diff --git a/Documentation/irqflags-tracing.txt b/Documentation/irqflags-tracing.txt<br/>new file mode 100644<br/>index 000000000000..6a444877ee0b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/irqflags-tracing.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/irqflags-tracing.txt</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+IRQ-flags state tracing</div><div class='add'>+</div><div class='add'>+started by Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='add'>+</div><div class='add'>+the "irq-flags tracing" feature "traces" hardirq and softirq state, in</div><div class='add'>+that it gives interested subsystems an opportunity to be notified of</div><div class='add'>+every hardirqs-off/hardirqs-on, softirqs-off/softirqs-on event that</div><div class='add'>+happens in the kernel.</div><div class='add'>+</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT is needed for CONFIG_PROVE_SPIN_LOCKING</div><div class='add'>+and CONFIG_PROVE_RW_LOCKING to be offered by the generic lock debugging</div><div class='add'>+code. Otherwise only CONFIG_PROVE_MUTEX_LOCKING and</div><div class='add'>+CONFIG_PROVE_RWSEM_LOCKING will be offered on an architecture - these</div><div class='add'>+are locking APIs that are not used in IRQ context. (the one exception</div><div class='add'>+for rwsems is worked around)</div><div class='add'>+</div><div class='add'>+architecture support for this is certainly not in the "trivial"</div><div class='add'>+category, because lots of lowlevel assembly code deal with irq-flags</div><div class='add'>+state changes. But an architecture can be irq-flags-tracing enabled in a</div><div class='add'>+rather straightforward and risk-free manner.</div><div class='add'>+</div><div class='add'>+Architectures that want to support this need to do a couple of</div><div class='add'>+code-organizational changes first:</div><div class='add'>+</div><div class='add'>+- move their irq-flags manipulation code from their asm/system.h header</div><div class='add'>+  to asm/irqflags.h</div><div class='add'>+</div><div class='add'>+- rename local_irq_disable()/etc to raw_local_irq_disable()/etc. so that</div><div class='add'>+  the linux/irqflags.h code can inject callbacks and can construct the</div><div class='add'>+  real local_irq_disable()/etc APIs.</div><div class='add'>+</div><div class='add'>+- add and enable TRACE_IRQFLAGS_SUPPORT in their arch level Kconfig file</div><div class='add'>+</div><div class='add'>+and then a couple of functional changes are needed as well to implement</div><div class='add'>+irq-flags-tracing support:</div><div class='add'>+</div><div class='add'>+- in lowlevel entry code add (build-conditional) calls to the</div><div class='add'>+  trace_hardirqs_off()/trace_hardirqs_on() functions. The lock validator</div><div class='add'>+  closely guards whether the 'real' irq-flags matches the 'virtual'</div><div class='add'>+  irq-flags state, and complains loudly (and turns itself off) if the</div><div class='add'>+  two do not match. Usually most of the time for arch support for</div><div class='add'>+  irq-flags-tracing is spent in this state: look at the lockdep</div><div class='add'>+  complaint, try to figure out the assembly code we did not cover yet,</div><div class='add'>+  fix and repeat. Once the system has booted up and works without a</div><div class='add'>+  lockdep complaint in the irq-flags-tracing functions arch support is</div><div class='add'>+  complete.</div><div class='add'>+- if the architecture has non-maskable interrupts then those need to be</div><div class='add'>+  excluded from the irq-tracing [and lock validation] mechanism via</div><div class='add'>+  lockdep_off()/lockdep_on().</div><div class='add'>+</div><div class='add'>+in general there is no risk from having an incomplete irq-flags-tracing</div><div class='add'>+implementation in an architecture: lockdep will detect that and will</div><div class='add'>+turn itself off. I.e. the lock validator will still be reliable. There</div><div class='add'>+should be no crashes due to irq-tracing bugs. (except if the assembly</div><div class='add'>+changes break other code by modifying conditions or registers that</div><div class='add'>+shouldnt be)</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset<br/>index 85a64defd385..fa0d4cca964a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/isdn/README.gigaset?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/isdn/README.gigaset</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/isdn/README.gigaset?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/isdn/README.gigaset</a></div><div class='hunk'>@@ -124,7 +124,8 @@ GigaSet 307x Device Driver</div><div class='ctx'> </div><div class='ctx'>      You can use some configuration tool of your distribution to configure this</div><div class='ctx'>      "modem" or configure pppd/wvdial manually. There are some example ppp</div><div class='del'>-     configuration files and chat scripts in the gigaset-VERSION/ppp directory.</div><div class='add'>+     configuration files and chat scripts in the gigaset-VERSION/ppp directory</div><div class='add'>+     in the driver packages from http://sourceforge.net/projects/gigaset307x/.</div><div class='ctx'>      Please note that the USB drivers are not able to change the state of the</div><div class='ctx'>      control lines (the M105 driver can be configured to use some undocumented</div><div class='ctx'>      control requests, if you really need the control lines, though). This means</div><div class='hunk'>@@ -164,8 +165,8 @@ GigaSet 307x Device Driver</div><div class='ctx'> </div><div class='ctx'>      If you want both of these at once, you are out of luck.</div><div class='ctx'> </div><div class='del'>-     You can also use /sys/module/&lt;name&gt;/parameters/cidmode for changing</div><div class='del'>-     the CID mode setting (&lt;name&gt; is usb_gigaset or bas_gigaset).</div><div class='add'>+     You can also use /sys/class/tty/ttyGxy/cidmode for changing the CID mode</div><div class='add'>+     setting (ttyGxy is ttyGU0 or ttyGB0).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 3.   Troubleshooting</div><div class='head'>diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt<br/>index a9c00facdf40..14ef3868a328 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kbuild/makefiles.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kbuild/makefiles.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kbuild/makefiles.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/kbuild/makefiles.txt</a></div><div class='hunk'>@@ -1123,6 +1123,14 @@ The top Makefile exports the following variables:</div><div class='ctx'> 	$(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE).  The user may</div><div class='ctx'> 	override this value on the command line if desired.</div><div class='ctx'> </div><div class='add'>+    INSTALL_MOD_STRIP</div><div class='add'>+</div><div class='add'>+	If this variable is specified, will cause modules to be stripped</div><div class='add'>+	after they are installed.  If INSTALL_MOD_STRIP is '1', then the</div><div class='add'>+	default option --strip-debug will be used.  Otherwise,</div><div class='add'>+	INSTALL_MOD_STRIP will used as the option(s) to the strip command.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> === 8 Makefile language</div><div class='ctx'> </div><div class='ctx'> The kernel Makefiles are designed to run with GNU Make.  The Makefiles</div><div class='head'>diff --git a/Documentation/kdump/gdbmacros.txt b/Documentation/kdump/gdbmacros.txt<br/>index dcf5580380ab..9b9b454b048a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kdump/gdbmacros.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kdump/gdbmacros.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kdump/gdbmacros.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/kdump/gdbmacros.txt</a></div><div class='hunk'>@@ -175,7 +175,7 @@ end</div><div class='ctx'> document trapinfo</div><div class='ctx'> 	Run info threads and lookup pid of thread #1</div><div class='ctx'> 	'trapinfo &lt;pid&gt;' will tell you by which trap &amp; possibly</div><div class='del'>-	addresthe kernel paniced.</div><div class='add'>+	address the kernel panicked.</div><div class='ctx'> end</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt<br/>index 212cf3c21abf..08bafa8c1caa 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kdump/kdump.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kdump/kdump.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kdump/kdump.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/kdump/kdump.txt</a></div><div class='hunk'>@@ -1,155 +1,325 @@</div><div class='del'>-Documentation for kdump - the kexec-based crash dumping solution</div><div class='add'>+================================================================</div><div class='add'>+Documentation for Kdump - The kexec-based Crash Dumping Solution</div><div class='ctx'> ================================================================</div><div class='ctx'> </div><div class='del'>-DESIGN</div><div class='del'>-======</div><div class='add'>+This document includes overview, setup and installation, and analysis</div><div class='add'>+information.</div><div class='ctx'> </div><div class='del'>-Kdump uses kexec to reboot to a second kernel whenever a dump needs to be</div><div class='del'>-taken. This second kernel is booted with very little memory. The first kernel</div><div class='del'>-reserves the section of memory that the second kernel uses. This ensures that</div><div class='del'>-on-going DMA from the first kernel does not corrupt the second kernel.</div><div class='add'>+Overview</div><div class='add'>+========</div><div class='ctx'> </div><div class='del'>-All the necessary information about Core image is encoded in ELF format and</div><div class='del'>-stored in reserved area of memory before crash. Physical address of start of</div><div class='del'>-ELF header is passed to new kernel through command line parameter elfcorehdr=.</div><div class='add'>+Kdump uses kexec to quickly boot to a dump-capture kernel whenever a</div><div class='add'>+dump of the system kernel's memory needs to be taken (for example, when</div><div class='add'>+the system panics). The system kernel's memory image is preserved across</div><div class='add'>+the reboot and is accessible to the dump-capture kernel.</div><div class='ctx'> </div><div class='del'>-On i386, the first 640 KB of physical memory is needed to boot, irrespective</div><div class='del'>-of where the kernel loads. Hence, this region is backed up by kexec just before</div><div class='del'>-rebooting into the new kernel.</div><div class='add'>+You can use common Linux commands, such as cp and scp, to copy the</div><div class='add'>+memory image to a dump file on the local disk, or across the network to</div><div class='add'>+a remote system.</div><div class='ctx'> </div><div class='del'>-In the second kernel, "old memory" can be accessed in two ways.</div><div class='add'>+Kdump and kexec are currently supported on the x86, x86_64, and ppc64</div><div class='add'>+architectures.</div><div class='ctx'> </div><div class='del'>-- The first one is through a /dev/oldmem device interface. A capture utility</div><div class='del'>-  can read the device file and write out the memory in raw format. This is raw</div><div class='del'>-  dump of memory and analysis/capture tool should be intelligent enough to</div><div class='del'>-  determine where to look for the right information. ELF headers (elfcorehdr=)</div><div class='del'>-  can become handy here.</div><div class='add'>+When the system kernel boots, it reserves a small section of memory for</div><div class='add'>+the dump-capture kernel. This ensures that ongoing Direct Memory Access</div><div class='add'>+(DMA) from the system kernel does not corrupt the dump-capture kernel.</div><div class='add'>+The kexec -p command loads the dump-capture kernel into this reserved</div><div class='add'>+memory.</div><div class='ctx'> </div><div class='del'>-- The second interface is through /proc/vmcore. This exports the dump as an ELF</div><div class='del'>-  format file which can be written out using any file copy command</div><div class='del'>-  (cp, scp, etc). Further, gdb can be used to perform limited debugging on</div><div class='del'>-  the dump file. This method ensures methods ensure that there is correct</div><div class='del'>-  ordering of the dump pages (corresponding to the first 640 KB that has been</div><div class='del'>-  relocated).</div><div class='add'>+On x86 machines, the first 640 KB of physical memory is needed to boot,</div><div class='add'>+regardless of where the kernel loads. Therefore, kexec backs up this</div><div class='add'>+region just before rebooting into the dump-capture kernel.</div><div class='ctx'> </div><div class='del'>-SETUP</div><div class='del'>-=====</div><div class='add'>+All of the necessary information about the system kernel's core image is</div><div class='add'>+encoded in the ELF format, and stored in a reserved area of memory</div><div class='add'>+before a crash. The physical address of the start of the ELF header is</div><div class='add'>+passed to the dump-capture kernel through the elfcorehdr= boot</div><div class='add'>+parameter.</div><div class='add'>+</div><div class='add'>+With the dump-capture kernel, you can access the memory image, or "old</div><div class='add'>+memory," in two ways:</div><div class='add'>+</div><div class='add'>+- Through a /dev/oldmem device interface. A capture utility can read the</div><div class='add'>+  device file and write out the memory in raw format. This is a raw dump</div><div class='add'>+  of memory. Analysis and capture tools must be intelligent enough to</div><div class='add'>+  determine where to look for the right information.</div><div class='add'>+</div><div class='add'>+- Through /proc/vmcore. This exports the dump as an ELF-format file that</div><div class='add'>+  you can write out using file copy commands such as cp or scp. Further,</div><div class='add'>+  you can use analysis tools such as the GNU Debugger (GDB) and the Crash</div><div class='add'>+  tool to debug the dump file. This method ensures that the dump pages are</div><div class='add'>+  correctly ordered.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Setup and Installation</div><div class='add'>+======================</div><div class='add'>+</div><div class='add'>+Install kexec-tools and the Kdump patch</div><div class='add'>+---------------------------------------</div><div class='add'>+</div><div class='add'>+1) Login as the root user.</div><div class='add'>+</div><div class='add'>+2) Download the kexec-tools user-space package from the following URL:</div><div class='add'>+</div><div class='add'>+   http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz</div><div class='add'>+</div><div class='add'>+3) Unpack the tarball with the tar command, as follows:</div><div class='add'>+</div><div class='add'>+   tar xvpzf kexec-tools-1.101.tar.gz</div><div class='add'>+</div><div class='add'>+4) Download the latest consolidated Kdump patch from the following URL:</div><div class='add'>+</div><div class='add'>+   http://lse.sourceforge.net/kdump/</div><div class='add'>+</div><div class='add'>+   (This location is being used until all the user-space Kdump patches</div><div class='add'>+   are integrated with the kexec-tools package.)</div><div class='add'>+</div><div class='add'>+5) Change to the kexec-tools-1.101 directory, as follows:</div><div class='add'>+</div><div class='add'>+   cd kexec-tools-1.101</div><div class='add'>+</div><div class='add'>+6) Apply the consolidated patch to the kexec-tools-1.101 source tree</div><div class='add'>+   with the patch command, as follows. (Modify the path to the downloaded</div><div class='add'>+   patch as necessary.)</div><div class='add'>+</div><div class='add'>+   patch -p1 &lt; /path-to-kdump-patch/kexec-tools-1.101-kdump.patch</div><div class='add'>+</div><div class='add'>+7) Configure the package, as follows:</div><div class='add'>+</div><div class='add'>+   ./configure</div><div class='add'>+</div><div class='add'>+8) Compile the package, as follows:</div><div class='add'>+</div><div class='add'>+   make</div><div class='add'>+</div><div class='add'>+9) Install the package, as follows:</div><div class='add'>+</div><div class='add'>+   make install</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Download and build the system and dump-capture kernels</div><div class='add'>+------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Download the mainline (vanilla) kernel source code (2.6.13-rc1 or newer)</div><div class='add'>+from http://www.kernel.org. Two kernels must be built: a system kernel</div><div class='add'>+and a dump-capture kernel. Use the following steps to configure these</div><div class='add'>+kernels with the necessary kexec and Kdump features:</div><div class='add'>+</div><div class='add'>+System kernel</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+1) Enable "kexec system call" in "Processor type and features."</div><div class='add'>+</div><div class='add'>+   CONFIG_KEXEC=y</div><div class='add'>+</div><div class='add'>+2) Enable "sysfs file system support" in "Filesystem" -&gt; "Pseudo</div><div class='add'>+   filesystems." This is usually enabled by default.</div><div class='add'>+</div><div class='add'>+   CONFIG_SYSFS=y</div><div class='add'>+</div><div class='add'>+   Note that "sysfs file system support" might not appear in the "Pseudo</div><div class='add'>+   filesystems" menu if "Configure standard kernel features (for small</div><div class='add'>+   systems)" is not enabled in "General Setup." In this case, check the</div><div class='add'>+   .config file itself to ensure that sysfs is turned on, as follows:</div><div class='add'>+</div><div class='add'>+   grep 'CONFIG_SYSFS' .config</div><div class='add'>+</div><div class='add'>+3) Enable "Compile the kernel with debug info" in "Kernel hacking."</div><div class='add'>+</div><div class='add'>+   CONFIG_DEBUG_INFO=Y</div><div class='add'>+</div><div class='add'>+   This causes the kernel to be built with debug symbols. The dump</div><div class='add'>+   analysis tools require a vmlinux with debug symbols in order to read</div><div class='add'>+   and analyze a dump file.</div><div class='add'>+</div><div class='add'>+4) Make and install the kernel and its modules. Update the boot loader</div><div class='add'>+   (such as grub, yaboot, or lilo) configuration files as necessary.</div><div class='add'>+</div><div class='add'>+5) Boot the system kernel with the boot parameter "crashkernel=Y@X",</div><div class='add'>+   where Y specifies how much memory to reserve for the dump-capture kernel</div><div class='add'>+   and X specifies the beginning of this reserved memory. For example,</div><div class='add'>+   "crashkernel=64M@16M" tells the system kernel to reserve 64 MB of memory</div><div class='add'>+   starting at physical address 0x01000000 for the dump-capture kernel.</div><div class='add'>+</div><div class='add'>+   On x86 and x86_64, use "crashkernel=64M@16M".</div><div class='add'>+</div><div class='add'>+   On ppc64, use "crashkernel=128M@32M".</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The dump-capture kernel</div><div class='add'>+-----------------------</div><div class='ctx'> </div><div class='del'>-1) Download the upstream kexec-tools userspace package from</div><div class='del'>-   http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-1.101.tar.gz.</div><div class='del'>-</div><div class='del'>-   Apply the latest consolidated kdump patch on top of kexec-tools-1.101</div><div class='del'>-   from http://lse.sourceforge.net/kdump/. This arrangment has been made</div><div class='del'>-   till all the userspace patches supporting kdump are integrated with</div><div class='del'>-   upstream kexec-tools userspace.</div><div class='del'>-</div><div class='del'>-2) Download and build the appropriate (2.6.13-rc1 onwards) vanilla kernels.</div><div class='del'>-   Two kernels need to be built in order to get this feature working.</div><div class='del'>-   Following are the steps to properly configure the two kernels specific</div><div class='del'>-   to kexec and kdump features:</div><div class='del'>-</div><div class='del'>-  A) First kernel or regular kernel:</div><div class='del'>-  ----------------------------------</div><div class='del'>-   a) Enable "kexec system call" feature (in Processor type and features).</div><div class='del'>-      CONFIG_KEXEC=y</div><div class='del'>-   b) Enable "sysfs file system support" (in Pseudo filesystems).</div><div class='del'>-      CONFIG_SYSFS=y</div><div class='del'>-   c) make</div><div class='del'>-   d) Boot into first kernel with the command line parameter "crashkernel=Y@X".</div><div class='del'>-      Use appropriate values for X and Y. Y denotes how much memory to reserve</div><div class='del'>-      for the second kernel, and X denotes at what physical address the</div><div class='del'>-      reserved memory section starts. For example: "crashkernel=64M@16M".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  B) Second kernel or dump capture kernel:</div><div class='del'>-  ---------------------------------------</div><div class='del'>-   a) For i386 architecture enable Highmem support</div><div class='del'>-      CONFIG_HIGHMEM=y</div><div class='del'>-   b) Enable "kernel crash dumps" feature (under "Processor type and features")</div><div class='del'>-      CONFIG_CRASH_DUMP=y</div><div class='del'>-   c) Make sure a suitable value for "Physical address where the kernel is</div><div class='del'>-      loaded" (under "Processor type and features"). By default this value</div><div class='del'>-      is 0x1000000 (16MB) and it should be same as X (See option d above),</div><div class='del'>-      e.g., 16 MB or 0x1000000.</div><div class='del'>-      CONFIG_PHYSICAL_START=0x1000000</div><div class='del'>-   d) Enable "/proc/vmcore support" (Optional, under "Pseudo filesystems").</div><div class='del'>-      CONFIG_PROC_VMCORE=y</div><div class='del'>-</div><div class='del'>-3) After booting to regular kernel or first kernel, load the second kernel</div><div class='del'>-   using the following command:</div><div class='del'>-</div><div class='del'>-   kexec -p &lt;second-kernel&gt; --args-linux --elf32-core-headers</div><div class='del'>-   --append="root=&lt;root-dev&gt; init 1 irqpoll maxcpus=1"</div><div class='del'>-</div><div class='del'>-   Notes:</div><div class='del'>-   ======</div><div class='del'>-     i) &lt;second-kernel&gt; has to be a vmlinux image ie uncompressed elf image.</div><div class='del'>-        bzImage will not work, as of now.</div><div class='del'>-    ii) --args-linux has to be speicfied as if kexec it loading an elf image,</div><div class='del'>-        it needs to know that the arguments supplied are of linux type.</div><div class='del'>-   iii) By default ELF headers are stored in ELF64 format to support systems</div><div class='del'>-        with more than 4GB memory. Option --elf32-core-headers forces generation</div><div class='del'>-        of ELF32 headers. The reason for this option being, as of now gdb can</div><div class='del'>-        not open vmcore file with ELF64 headers on a 32 bit systems. So ELF32</div><div class='del'>-        headers can be used if one has non-PAE systems and hence memory less</div><div class='del'>-        than 4GB.</div><div class='del'>-    iv) Specify "irqpoll" as command line parameter. This reduces driver</div><div class='del'>-         initialization failures in second kernel due to shared interrupts.</div><div class='del'>-     v) &lt;root-dev&gt; needs to be specified in a format corresponding to the root</div><div class='del'>-        device name in the output of mount command.</div><div class='del'>-    vi) If you have built the drivers required to mount root file system as</div><div class='del'>-        modules in &lt;second-kernel&gt;, then, specify</div><div class='del'>-        --initrd=&lt;initrd-for-second-kernel&gt;.</div><div class='del'>-   vii) Specify maxcpus=1 as, if during first kernel run, if panic happens on</div><div class='del'>-        non-boot cpus, second kernel doesn't seem to be boot up all the cpus.</div><div class='del'>-        The other option is to always built the second kernel without SMP</div><div class='del'>-        support ie CONFIG_SMP=n</div><div class='del'>-</div><div class='del'>-4) After successfully loading the second kernel as above, if a panic occurs</div><div class='del'>-   system reboots into the second kernel. A module can be written to force</div><div class='del'>-   the panic or "ALT-SysRq-c" can be used initiate a crash dump for testing</div><div class='del'>-   purposes.</div><div class='del'>-</div><div class='del'>-5) Once the second kernel has booted, write out the dump file using</div><div class='add'>+1) Under "General setup," append "-kdump" to the current string in</div><div class='add'>+   "Local version."</div><div class='add'>+</div><div class='add'>+2) On x86, enable high memory support under "Processor type and</div><div class='add'>+   features":</div><div class='add'>+</div><div class='add'>+   CONFIG_HIGHMEM64G=y</div><div class='add'>+   or</div><div class='add'>+   CONFIG_HIGHMEM4G</div><div class='add'>+</div><div class='add'>+3) On x86 and x86_64, disable symmetric multi-processing support</div><div class='add'>+   under "Processor type and features":</div><div class='add'>+</div><div class='add'>+   CONFIG_SMP=n</div><div class='add'>+   (If CONFIG_SMP=y, then specify maxcpus=1 on the kernel command line</div><div class='add'>+   when loading the dump-capture kernel, see section "Load the Dump-capture</div><div class='add'>+   Kernel".)</div><div class='add'>+</div><div class='add'>+4) On ppc64, disable NUMA support and enable EMBEDDED support:</div><div class='add'>+</div><div class='add'>+   CONFIG_NUMA=n</div><div class='add'>+   CONFIG_EMBEDDED=y</div><div class='add'>+   CONFIG_EEH=N for the dump-capture kernel</div><div class='add'>+</div><div class='add'>+5) Enable "kernel crash dumps" support under "Processor type and</div><div class='add'>+   features":</div><div class='add'>+</div><div class='add'>+   CONFIG_CRASH_DUMP=y</div><div class='add'>+</div><div class='add'>+6) Use a suitable value for "Physical address where the kernel is</div><div class='add'>+   loaded" (under "Processor type and features"). This only appears when</div><div class='add'>+   "kernel crash dumps" is enabled. By default this value is 0x1000000</div><div class='add'>+   (16MB). It should be the same as X in the "crashkernel=Y@X" boot</div><div class='add'>+   parameter discussed above.</div><div class='add'>+</div><div class='add'>+   On x86 and x86_64, use "CONFIG_PHYSICAL_START=0x1000000".</div><div class='add'>+</div><div class='add'>+   On ppc64 the value is automatically set at 32MB when</div><div class='add'>+   CONFIG_CRASH_DUMP is set.</div><div class='add'>+</div><div class='add'>+6) Optionally enable "/proc/vmcore support" under "Filesystems" -&gt;</div><div class='add'>+   "Pseudo filesystems".</div><div class='add'>+</div><div class='add'>+   CONFIG_PROC_VMCORE=y</div><div class='add'>+   (CONFIG_PROC_VMCORE is set by default when CONFIG_CRASH_DUMP is selected.)</div><div class='add'>+</div><div class='add'>+7) Make and install the kernel and its modules. DO NOT add this kernel</div><div class='add'>+   to the boot loader configuration files.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Load the Dump-capture Kernel</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+After booting to the system kernel, load the dump-capture kernel using</div><div class='add'>+the following command:</div><div class='add'>+</div><div class='add'>+   kexec -p &lt;dump-capture-kernel&gt; \</div><div class='add'>+   --initrd=&lt;initrd-for-dump-capture-kernel&gt; --args-linux \</div><div class='add'>+   --append="root=&lt;root-dev&gt; init 1 irqpoll"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Notes on loading the dump-capture kernel:</div><div class='add'>+</div><div class='add'>+* &lt;dump-capture-kernel&gt; must be a vmlinux image (that is, an</div><div class='add'>+  uncompressed ELF image). bzImage does not work at this time.</div><div class='add'>+</div><div class='add'>+* By default, the ELF headers are stored in ELF64 format to support</div><div class='add'>+  systems with more than 4GB memory. The --elf32-core-headers option can</div><div class='add'>+  be used to force the generation of ELF32 headers. This is necessary</div><div class='add'>+  because GDB currently cannot open vmcore files with ELF64 headers on</div><div class='add'>+  32-bit systems. ELF32 headers can be used on non-PAE systems (that is,</div><div class='add'>+  less than 4GB of memory).</div><div class='add'>+</div><div class='add'>+* The "irqpoll" boot parameter reduces driver initialization failures</div><div class='add'>+  due to shared interrupts in the dump-capture kernel.</div><div class='add'>+</div><div class='add'>+* You must specify &lt;root-dev&gt; in the format corresponding to the root</div><div class='add'>+  device name in the output of mount command.</div><div class='add'>+</div><div class='add'>+* "init 1" boots the dump-capture kernel into single-user mode without</div><div class='add'>+  networking. If you want networking, use "init 3."</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Kernel Panic</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+After successfully loading the dump-capture kernel as previously</div><div class='add'>+described, the system will reboot into the dump-capture kernel if a</div><div class='add'>+system crash is triggered.  Trigger points are located in panic(),</div><div class='add'>+die(), die_nmi() and in the sysrq handler (ALT-SysRq-c).</div><div class='add'>+</div><div class='add'>+The following conditions will execute a crash trigger point:</div><div class='add'>+</div><div class='add'>+If a hard lockup is detected and "NMI watchdog" is configured, the system</div><div class='add'>+will boot into the dump-capture kernel ( die_nmi() ).</div><div class='add'>+</div><div class='add'>+If die() is called, and it happens to be a thread with pid 0 or 1, or die()</div><div class='add'>+is called inside interrupt context or die() is called and panic_on_oops is set,</div><div class='add'>+the system will boot into the dump-capture kernel.</div><div class='add'>+</div><div class='add'>+On powererpc systems when a soft-reset is generated, die() is called by all cpus and the system system will boot into the dump-capture kernel.</div><div class='add'>+</div><div class='add'>+For testing purposes, you can trigger a crash by using "ALT-SysRq-c",</div><div class='add'>+"echo c &gt; /proc/sysrq-trigger or write a module to force the panic.</div><div class='add'>+</div><div class='add'>+Write Out the Dump File</div><div class='add'>+=======================</div><div class='add'>+</div><div class='add'>+After the dump-capture kernel is booted, write out the dump file with</div><div class='add'>+the following command:</div><div class='ctx'> </div><div class='ctx'>    cp /proc/vmcore &lt;dump-file&gt;</div><div class='ctx'> </div><div class='del'>-   Dump memory can also be accessed as a /dev/oldmem device for a linear/raw</div><div class='del'>-   view.  To create the device, type:</div><div class='add'>+You can also access dumped memory as a /dev/oldmem device for a linear</div><div class='add'>+and raw view. To create the device, use the following command:</div><div class='ctx'> </div><div class='del'>-   mknod /dev/oldmem c 1 12</div><div class='add'>+    mknod /dev/oldmem c 1 12</div><div class='ctx'> </div><div class='del'>-   Use "dd" with suitable options for count, bs and skip to access specific</div><div class='del'>-   portions of the dump.</div><div class='add'>+Use the dd command with suitable options for count, bs, and skip to</div><div class='add'>+access specific portions of the dump.</div><div class='ctx'> </div><div class='del'>-   Entire memory:  dd if=/dev/oldmem of=oldmem.001</div><div class='add'>+To see the entire memory, use the following command:</div><div class='ctx'> </div><div class='add'>+   dd if=/dev/oldmem of=oldmem.001</div><div class='ctx'> </div><div class='del'>-ANALYSIS</div><div class='add'>+</div><div class='add'>+Analysis</div><div class='ctx'> ========</div><div class='del'>-Limited analysis can be done using gdb on the dump file copied out of</div><div class='del'>-/proc/vmcore. Use vmlinux built with -g and run</div><div class='ctx'> </div><div class='del'>-  gdb vmlinux &lt;dump-file&gt;</div><div class='add'>+Before analyzing the dump image, you should reboot into a stable kernel.</div><div class='add'>+</div><div class='add'>+You can do limited analysis using GDB on the dump file copied out of</div><div class='add'>+/proc/vmcore. Use the debug vmlinux built with -g and run the following</div><div class='add'>+command:</div><div class='add'>+</div><div class='add'>+   gdb vmlinux &lt;dump-file&gt;</div><div class='ctx'> </div><div class='del'>-Stack trace for the task on processor 0, register display, memory display</div><div class='del'>-work fine.</div><div class='add'>+Stack trace for the task on processor 0, register display, and memory</div><div class='add'>+display work fine.</div><div class='ctx'> </div><div class='del'>-Note: gdb cannot analyse core files generated in ELF64 format for i386.</div><div class='add'>+Note: GDB cannot analyze core files generated in ELF64 format for x86.</div><div class='add'>+On systems with a maximum of 4GB of memory, you can generate</div><div class='add'>+ELF32-format headers using the --elf32-core-headers kernel option on the</div><div class='add'>+dump kernel.</div><div class='ctx'> </div><div class='del'>-Latest "crash" (crash-4.0-2.18) as available on Dave Anderson's site</div><div class='del'>-http://people.redhat.com/~anderson/ works well with kdump format.</div><div class='add'>+You can also use the Crash utility to analyze dump files in Kdump</div><div class='add'>+format. Crash is available on Dave Anderson's site at the following URL:</div><div class='ctx'> </div><div class='add'>+   http://people.redhat.com/~anderson/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+To Do</div><div class='add'>+=====</div><div class='ctx'> </div><div class='del'>-TODO</div><div class='del'>-====</div><div class='del'>-1) Provide a kernel pages filtering mechanism so that core file size is not</div><div class='del'>-   insane on systems having huge memory banks.</div><div class='del'>-2) Relocatable kernel can help in maintaining multiple kernels for crashdump</div><div class='del'>-   and same kernel as the first kernel can be used to capture the dump.</div><div class='add'>+1) Provide a kernel pages filtering mechanism, so core file size is not</div><div class='add'>+   extreme on systems with huge memory banks.</div><div class='ctx'> </div><div class='add'>+2) Relocatable kernel can help in maintaining multiple kernels for</div><div class='add'>+   crash_dump, and the same kernel as the system kernel can be used to</div><div class='add'>+   capture the dump.</div><div class='ctx'> </div><div class='del'>-CONTACT</div><div class='add'>+</div><div class='add'>+Contact</div><div class='ctx'> =======</div><div class='add'>+</div><div class='ctx'> Vivek Goyal (vgoyal@in.ibm.com)</div><div class='ctx'> Maneesh Soni (maneesh@in.ibm.com)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Trademark</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+Linux is a trademark of Linus Torvalds in the United States, other</div><div class='add'>+countries, or both.</div><div class='head'>diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt<br/>index b3a6187e5305..e11f7728ec6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/kernel-parameters.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/kernel-parameters.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/kernel-parameters.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/kernel-parameters.txt</a></div><div class='hunk'>@@ -35,7 +35,6 @@ parameter is applicable:</div><div class='ctx'> 	APM	Advanced Power Management support is enabled.</div><div class='ctx'> 	AX25	Appropriate AX.25 support is enabled.</div><div class='ctx'> 	CD	Appropriate CD support is enabled.</div><div class='del'>-	DEVFS	devfs support is enabled.</div><div class='ctx'> 	DRM	Direct Rendering Management support is enabled.</div><div class='ctx'> 	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled</div><div class='ctx'> 	EFI	EFI Partitioning (GPT) is enabled</div><div class='hunk'>@@ -61,6 +60,7 @@ parameter is applicable:</div><div class='ctx'> 	MTD	MTD support is enabled.</div><div class='ctx'> 	NET	Appropriate network support is enabled.</div><div class='ctx'> 	NUMA	NUMA support is enabled.</div><div class='add'>+	GENERIC_TIME The generic timeofday code is enabled.</div><div class='ctx'> 	NFS	Appropriate NFS support is enabled.</div><div class='ctx'> 	OSS	OSS sound support is enabled.</div><div class='ctx'> 	PARIDE	The ParIDE subsystem is enabled.</div><div class='hunk'>@@ -147,6 +147,9 @@ running once the system is up.</div><div class='ctx'> 	acpi_irq_isa=	[HW,ACPI] If irq_balance, mark listed IRQs used by ISA</div><div class='ctx'> 			Format: &lt;irq&gt;,&lt;irq&gt;...</div><div class='ctx'> </div><div class='add'>+	acpi_os_name=	[HW,ACPI] Tell ACPI BIOS the name of the OS</div><div class='add'>+			Format: To spoof as Windows 98: ="Microsoft Windows"</div><div class='add'>+</div><div class='ctx'> 	acpi_osi=	[HW,ACPI] empty param disables _OSI</div><div class='ctx'> </div><div class='ctx'> 	acpi_serialize	[HW,ACPI] force serialization of AML methods</div><div class='hunk'>@@ -176,6 +179,11 @@ running once the system is up.</div><div class='ctx'> 			override platform specific driver.</div><div class='ctx'> 			See also Documentation/acpi-hotkey.txt.</div><div class='ctx'> </div><div class='add'>+	acpi_pm_good	[IA-32,X86-64]</div><div class='add'>+			Override the pmtimer bug detection: force the kernel</div><div class='add'>+			to assume that this machine's pmtimer latches its value</div><div class='add'>+			and always returns good values.</div><div class='add'>+</div><div class='ctx'> 	enable_timer_pin_1 [i386,x86-64]</div><div class='ctx'> 			Enable PIN 1 of APIC timer</div><div class='ctx'> 			Can be useful to work around chipset bugs</div><div class='hunk'>@@ -338,10 +346,11 @@ running once the system is up.</div><div class='ctx'> 			Value can be changed at runtime via</div><div class='ctx'> 				/selinux/checkreqprot.</div><div class='ctx'> </div><div class='del'>- 	clock=		[BUGS=IA-32,HW] gettimeofday timesource override.</div><div class='del'>-			Forces specified timesource (if avaliable) to be used</div><div class='del'>-			when calculating gettimeofday(). If specicified</div><div class='del'>-			timesource is not avalible, it defaults to PIT.</div><div class='add'>+	clock=		[BUGS=IA-32, HW] gettimeofday clocksource override.</div><div class='add'>+			[Deprecated]</div><div class='add'>+			Forces specified clocksource (if avaliable) to be used</div><div class='add'>+			when calculating gettimeofday(). If specified</div><div class='add'>+			clocksource is not avalible, it defaults to PIT.</div><div class='ctx'> 			Format: { pit | tsc | cyclone | pmtmr }</div><div class='ctx'> </div><div class='ctx'> 	disable_8254_timer</div><div class='hunk'>@@ -426,12 +435,20 @@ running once the system is up.</div><div class='ctx'> </div><div class='ctx'> 	debug		[KNL] Enable kernel debugging (events log level).</div><div class='ctx'> </div><div class='add'>+	debug_locks_verbose=</div><div class='add'>+			[KNL] verbose self-tests</div><div class='add'>+			Format=&lt;0|1&gt;</div><div class='add'>+			Print debugging info while doing the locking API</div><div class='add'>+			self-tests.</div><div class='add'>+			We default to 0 (no extra messages), setting it to</div><div class='add'>+			1 will print _a lot_ more information - normally</div><div class='add'>+			only useful to kernel developers.</div><div class='add'>+</div><div class='ctx'> 	decnet=		[HW,NET]</div><div class='ctx'> 			Format: &lt;area&gt;[,&lt;node&gt;]</div><div class='ctx'> 			See also Documentation/networking/decnet.txt.</div><div class='ctx'> </div><div class='del'>-	devfs=		[DEVFS]</div><div class='del'>-			See Documentation/filesystems/devfs/boot-options.</div><div class='add'>+	delayacct	[KNL] Enable per-task delay accounting</div><div class='ctx'> </div><div class='ctx'> 	dhash_entries=	[KNL]</div><div class='ctx'> 			Set number of hash buckets for dentry cache.</div><div class='hunk'>@@ -1402,6 +1419,15 @@ running once the system is up.</div><div class='ctx'> 			If enabled at boot time, /selinux/disable can be used</div><div class='ctx'> 			later to disable prior to initial policy load.</div><div class='ctx'> </div><div class='add'>+	selinux_compat_net =</div><div class='add'>+			[SELINUX] Set initial selinux_compat_net flag value.</div><div class='add'>+                        Format: { "0" | "1" }</div><div class='add'>+                        0 -- use new secmark-based packet controls</div><div class='add'>+                        1 -- use legacy packet controls</div><div class='add'>+                        Default value is 0 (preferred).</div><div class='add'>+                        Value can be changed at runtime via</div><div class='add'>+                        /selinux/compat_net.</div><div class='add'>+</div><div class='ctx'> 	serialnumber	[BUGS=IA-32]</div><div class='ctx'> </div><div class='ctx'> 	sg_def_reserved_size=	[SCSI]</div><div class='hunk'>@@ -1605,6 +1631,10 @@ running once the system is up.</div><div class='ctx'> </div><div class='ctx'> 	time		Show timing data prefixed to each printk message line</div><div class='ctx'> </div><div class='add'>+	clocksource=	[GENERIC_TIME] Override the default clocksource</div><div class='add'>+			Override the default clocksource and use the clocksource</div><div class='add'>+			with the name specified.</div><div class='add'>+</div><div class='ctx'> 	tipar.timeout=	[HW,PPT]</div><div class='ctx'> 			Set communications timeout in tenths of a second</div><div class='ctx'> 			(default 15).</div><div class='hunk'>@@ -1646,6 +1676,10 @@ running once the system is up.</div><div class='ctx'> 	usbhid.mousepoll=</div><div class='ctx'> 			[USBHID] The interval which mice are to be polled at.</div><div class='ctx'> </div><div class='add'>+	vdso=		[IA-32]</div><div class='add'>+			vdso=1: enable VDSO (default)</div><div class='add'>+			vdso=0: disable VDSO mapping</div><div class='add'>+</div><div class='ctx'> 	video=		[FB] Frame buffer configuration</div><div class='ctx'> 			See Documentation/fb/modedb.txt.</div><div class='ctx'> </div><div class='hunk'>@@ -1662,9 +1696,14 @@ running once the system is up.</div><div class='ctx'> 			decrease the size and leave more room for directly</div><div class='ctx'> 			mapped kernel RAM.</div><div class='ctx'> </div><div class='del'>-	vmhalt=		[KNL,S390]</div><div class='add'>+	vmhalt=		[KNL,S390] Perform z/VM CP command after system halt.</div><div class='add'>+			Format: &lt;command&gt;</div><div class='add'>+</div><div class='add'>+	vmpanic=	[KNL,S390] Perform z/VM CP command after kernel panic.</div><div class='add'>+			Format: &lt;command&gt;</div><div class='ctx'> </div><div class='del'>-	vmpoff=		[KNL,S390]</div><div class='add'>+	vmpoff=		[KNL,S390] Perform z/VM CP command after power off.</div><div class='add'>+			Format: &lt;command&gt;</div><div class='ctx'> </div><div class='ctx'> 	waveartist=	[HW,OSS]</div><div class='ctx'> 			Format: &lt;io&gt;,&lt;irq&gt;,&lt;dma&gt;,&lt;dma2&gt;</div><div class='head'>diff --git a/Documentation/keys-request-key.txt b/Documentation/keys-request-key.txt<br/>index 22488d791168..c1f64fdf84cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/keys-request-key.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/keys-request-key.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/keys-request-key.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/keys-request-key.txt</a></div><div class='hunk'>@@ -3,16 +3,23 @@</div><div class='ctx'> 			      ===================</div><div class='ctx'> </div><div class='ctx'> The key request service is part of the key retention service (refer to</div><div class='del'>-Documentation/keys.txt). This document explains more fully how that the</div><div class='del'>-requesting algorithm works.</div><div class='add'>+Documentation/keys.txt).  This document explains more fully how the requesting</div><div class='add'>+algorithm works.</div><div class='ctx'> </div><div class='ctx'> The process starts by either the kernel requesting a service by calling</div><div class='del'>-request_key():</div><div class='add'>+request_key*():</div><div class='ctx'> </div><div class='ctx'> 	struct key *request_key(const struct key_type *type,</div><div class='ctx'> 				const char *description,</div><div class='ctx'> 				const char *callout_string);</div><div class='ctx'> </div><div class='add'>+or:</div><div class='add'>+</div><div class='add'>+	struct key *request_key_with_auxdata(const struct key_type *type,</div><div class='add'>+					     const char *description,</div><div class='add'>+					     const char *callout_string,</div><div class='add'>+					     void *aux);</div><div class='add'>+</div><div class='ctx'> Or by userspace invoking the request_key system call:</div><div class='ctx'> </div><div class='ctx'> 	key_serial_t request_key(const char *type,</div><div class='hunk'>@@ -20,16 +27,26 @@ Or by userspace invoking the request_key system call:</div><div class='ctx'> 				 const char *callout_info,</div><div class='ctx'> 				 key_serial_t dest_keyring);</div><div class='ctx'> </div><div class='del'>-The main difference between the two access points is that the in-kernel</div><div class='del'>-interface does not need to link the key to a keyring to prevent it from being</div><div class='del'>-immediately destroyed. The kernel interface returns a pointer directly to the</div><div class='del'>-key, and it's up to the caller to destroy the key.</div><div class='add'>+The main difference between the access points is that the in-kernel interface</div><div class='add'>+does not need to link the key to a keyring to prevent it from being immediately</div><div class='add'>+destroyed.  The kernel interface returns a pointer directly to the key, and</div><div class='add'>+it's up to the caller to destroy the key.</div><div class='add'>+</div><div class='add'>+The request_key_with_auxdata() call is like the in-kernel request_key() call,</div><div class='add'>+except that it permits auxiliary data to be passed to the upcaller (the default</div><div class='add'>+is NULL).  This is only useful for those key types that define their own upcall</div><div class='add'>+mechanism rather than using /sbin/request-key.</div><div class='ctx'> </div><div class='ctx'> The userspace interface links the key to a keyring associated with the process</div><div class='ctx'> to prevent the key from going away, and returns the serial number of the key to</div><div class='ctx'> the caller.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+The following example assumes that the key types involved don't define their</div><div class='add'>+own upcall mechanisms.  If they do, then those should be substituted for the</div><div class='add'>+forking and execution of /sbin/request-key.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> ===========</div><div class='ctx'> THE PROCESS</div><div class='ctx'> ===========</div><div class='hunk'>@@ -40,8 +57,8 @@ A request proceeds in the following manner:</div><div class='ctx'>      interface].</div><div class='ctx'> </div><div class='ctx'>  (2) request_key() searches the process's subscribed keyrings to see if there's</div><div class='del'>-     a suitable key there. If there is, it returns the key. If there isn't, and</div><div class='del'>-     callout_info is not set, an error is returned. Otherwise the process</div><div class='add'>+     a suitable key there.  If there is, it returns the key.  If there isn't,</div><div class='add'>+     and callout_info is not set, an error is returned.  Otherwise the process</div><div class='ctx'>      proceeds to the next step.</div><div class='ctx'> </div><div class='ctx'>  (3) request_key() sees that A doesn't have the desired key yet, so it creates</div><div class='hunk'>@@ -62,7 +79,7 @@ A request proceeds in the following manner:</div><div class='ctx'>      instantiation.</div><div class='ctx'> </div><div class='ctx'>  (7) The program may want to access another key from A's context (say a</div><div class='del'>-     Kerberos TGT key). It just requests the appropriate key, and the keyring</div><div class='add'>+     Kerberos TGT key).  It just requests the appropriate key, and the keyring</div><div class='ctx'>      search notes that the session keyring has auth key V in its bottom level.</div><div class='ctx'> </div><div class='ctx'>      This will permit it to then search the keyrings of process A with the</div><div class='hunk'>@@ -79,10 +96,11 @@ A request proceeds in the following manner:</div><div class='ctx'> (10) The program then exits 0 and request_key() deletes key V and returns key</div><div class='ctx'>      U to the caller.</div><div class='ctx'> </div><div class='del'>-This also extends further. If key W (step 7 above) didn't exist, key W would be</div><div class='del'>-created uninstantiated, another auth key (X) would be created (as per step 3)</div><div class='del'>-and another copy of /sbin/request-key spawned (as per step 4); but the context</div><div class='del'>-specified by auth key X will still be process A, as it was in auth key V.</div><div class='add'>+This also extends further.  If key W (step 7 above) didn't exist, key W would</div><div class='add'>+be created uninstantiated, another auth key (X) would be created (as per step</div><div class='add'>+3) and another copy of /sbin/request-key spawned (as per step 4); but the</div><div class='add'>+context specified by auth key X will still be process A, as it was in auth key</div><div class='add'>+V.</div><div class='ctx'> </div><div class='ctx'> This is because process A's keyrings can't simply be attached to</div><div class='ctx'> /sbin/request-key at the appropriate places because (a) execve will discard two</div><div class='hunk'>@@ -118,17 +136,17 @@ A search of any particular keyring proceeds in the following fashion:</div><div class='ctx'> </div><div class='ctx'>  (2) It considers all the non-keyring keys within that keyring and, if any key</div><div class='ctx'>      matches the criteria specified, calls key_permission(SEARCH) on it to see</div><div class='del'>-     if the key is allowed to be found. If it is, that key is returned; if</div><div class='add'>+     if the key is allowed to be found.  If it is, that key is returned; if</div><div class='ctx'>      not, the search continues, and the error code is retained if of higher</div><div class='ctx'>      priority than the one currently set.</div><div class='ctx'> </div><div class='ctx'>  (3) It then considers all the keyring-type keys in the keyring it's currently</div><div class='del'>-     searching. It calls key_permission(SEARCH) on each keyring, and if this</div><div class='add'>+     searching.  It calls key_permission(SEARCH) on each keyring, and if this</div><div class='ctx'>      grants permission, it recurses, executing steps (2) and (3) on that</div><div class='ctx'>      keyring.</div><div class='ctx'> </div><div class='ctx'> The process stops immediately a valid key is found with permission granted to</div><div class='del'>-use it. Any error from a previous match attempt is discarded and the key is</div><div class='add'>+use it.  Any error from a previous match attempt is discarded and the key is</div><div class='ctx'> returned.</div><div class='ctx'> </div><div class='ctx'> When search_process_keyrings() is invoked, it performs the following searches</div><div class='hunk'>@@ -153,7 +171,7 @@ The moment one succeeds, all pending errors are discarded and the found key is</div><div class='ctx'> returned.</div><div class='ctx'> </div><div class='ctx'> Only if all these fail does the whole thing fail with the highest priority</div><div class='del'>-error. Note that several errors may have come from LSM.</div><div class='add'>+error.  Note that several errors may have come from LSM.</div><div class='ctx'> </div><div class='ctx'> The error priority is:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/keys.txt b/Documentation/keys.txt<br/>index aaa01b0e3ee9..e373f0212843 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/keys.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/keys.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/keys.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/keys.txt</a></div><div class='hunk'>@@ -19,6 +19,7 @@ This document has the following sections:</div><div class='ctx'> 	- Key overview</div><div class='ctx'> 	- Key service overview</div><div class='ctx'> 	- Key access permissions</div><div class='add'>+	- SELinux support</div><div class='ctx'> 	- New procfs files</div><div class='ctx'> 	- Userspace system call interface</div><div class='ctx'> 	- Kernel services</div><div class='hunk'>@@ -232,6 +233,39 @@ For changing the ownership, group ID or permissions mask, being the owner of</div><div class='ctx'> the key or having the sysadmin capability is sufficient.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+===============</div><div class='add'>+SELINUX SUPPORT</div><div class='add'>+===============</div><div class='add'>+</div><div class='add'>+The security class "key" has been added to SELinux so that mandatory access</div><div class='add'>+controls can be applied to keys created within various contexts.  This support</div><div class='add'>+is preliminary, and is likely to change quite significantly in the near future.</div><div class='add'>+Currently, all of the basic permissions explained above are provided in SELinux</div><div class='add'>+as well; SELinux is simply invoked after all basic permission checks have been</div><div class='add'>+performed.</div><div class='add'>+</div><div class='add'>+The value of the file /proc/self/attr/keycreate influences the labeling of</div><div class='add'>+newly-created keys.  If the contents of that file correspond to an SELinux</div><div class='add'>+security context, then the key will be assigned that context.  Otherwise, the</div><div class='add'>+key will be assigned the current context of the task that invoked the key</div><div class='add'>+creation request.  Tasks must be granted explicit permission to assign a</div><div class='add'>+particular context to newly-created keys, using the "create" permission in the</div><div class='add'>+key security class.</div><div class='add'>+</div><div class='add'>+The default keyrings associated with users will be labeled with the default</div><div class='add'>+context of the user if and only if the login programs have been instrumented to</div><div class='add'>+properly initialize keycreate during the login process.  Otherwise, they will</div><div class='add'>+be labeled with the context of the login program itself.</div><div class='add'>+</div><div class='add'>+Note, however, that the default keyrings associated with the root user are</div><div class='add'>+labeled with the default kernel context, since they are created early in the</div><div class='add'>+boot process, before root has a chance to log in.</div><div class='add'>+</div><div class='add'>+The keyrings associated with new threads are each labeled with the context of</div><div class='add'>+their associated thread, and both session and process keyrings are handled</div><div class='add'>+similarly.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> ================</div><div class='ctx'> NEW PROCFS FILES</div><div class='ctx'> ================</div><div class='hunk'>@@ -241,9 +275,17 @@ about the status of the key service:</div><div class='ctx'> </div><div class='ctx'>  (*) /proc/keys</div><div class='ctx'> </div><div class='del'>-     This lists all the keys on the system, giving information about their</div><div class='del'>-     type, description and permissions. The payload of the key is not available</div><div class='del'>-     this way:</div><div class='add'>+     This lists the keys that are currently viewable by the task reading the</div><div class='add'>+     file, giving information about their type, description and permissions.</div><div class='add'>+     It is not possible to view the payload of the key this way, though some</div><div class='add'>+     information about it may be given.</div><div class='add'>+</div><div class='add'>+     The only keys included in the list are those that grant View permission to</div><div class='add'>+     the reading process whether or not it possesses them.  Note that LSM</div><div class='add'>+     security checks are still performed, and may further filter out keys that</div><div class='add'>+     the current process is not authorised to view.</div><div class='add'>+</div><div class='add'>+     The contents of the file look like this:</div><div class='ctx'> </div><div class='ctx'> 	SERIAL   FLAGS  USAGE EXPY PERM     UID   GID   TYPE      DESCRIPTION: SUMMARY</div><div class='ctx'> 	00000001 I-----    39 perm 1f3f0000     0     0 keyring   _uid_ses.0: 1/4</div><div class='hunk'>@@ -271,7 +313,7 @@ about the status of the key service:</div><div class='ctx'>  (*) /proc/key-users</div><div class='ctx'> </div><div class='ctx'>      This file lists the tracking data for each user that has at least one key</div><div class='del'>-     on the system. Such data includes quota information and statistics:</div><div class='add'>+     on the system.  Such data includes quota information and statistics:</div><div class='ctx'> </div><div class='ctx'> 	[root@andromeda root]# cat /proc/key-users</div><div class='ctx'> 	0:     46 45/45 1/100 13/10000</div><div class='hunk'>@@ -738,6 +780,17 @@ payload contents" for more information.</div><div class='ctx'>     See also Documentation/keys-request-key.txt.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+(*) To search for a key, passing auxiliary data to the upcaller, call:</div><div class='add'>+</div><div class='add'>+	struct key *request_key_with_auxdata(const struct key_type *type,</div><div class='add'>+					     const char *description,</div><div class='add'>+					     const char *callout_string,</div><div class='add'>+					     void *aux);</div><div class='add'>+</div><div class='add'>+    This is identical to request_key(), except that the auxiliary data is</div><div class='add'>+    passed to the key_type-&gt;request_key() op if it exists.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> (*) When it is no longer required, the key should be released using:</div><div class='ctx'> </div><div class='ctx'> 	void key_put(struct key *key);</div><div class='hunk'>@@ -935,6 +988,16 @@ The structure has a number of fields, some of which are mandatory:</div><div class='ctx'>      It is not safe to sleep in this method; the caller may hold spinlocks.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+ (*) void (*revoke)(struct key *key);</div><div class='add'>+</div><div class='add'>+     This method is optional.  It is called to discard part of the payload</div><div class='add'>+     data upon a key being revoked.  The caller will have the key semaphore</div><div class='add'>+     write-locked.</div><div class='add'>+</div><div class='add'>+     It is safe to sleep in this method, though care should be taken to avoid</div><div class='add'>+     a deadlock against the key semaphore.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>  (*) void (*destroy)(struct key *key);</div><div class='ctx'> </div><div class='ctx'>      This method is optional. It is called to discard the payload data on a key</div><div class='hunk'>@@ -979,6 +1042,24 @@ The structure has a number of fields, some of which are mandatory:</div><div class='ctx'>      as might happen when the userspace buffer is accessed.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+ (*) int (*request_key)(struct key *key, struct key *authkey, const char *op,</div><div class='add'>+			void *aux);</div><div class='add'>+</div><div class='add'>+     This method is optional.  If provided, request_key() and</div><div class='add'>+     request_key_with_auxdata() will invoke this function rather than</div><div class='add'>+     upcalling to /sbin/request-key to operate upon a key of this type.</div><div class='add'>+</div><div class='add'>+     The aux parameter is as passed to request_key_with_auxdata() or is NULL</div><div class='add'>+     otherwise.  Also passed are the key to be operated upon, the</div><div class='add'>+     authorisation key for this operation and the operation type (currently</div><div class='add'>+     only "create").</div><div class='add'>+</div><div class='add'>+     This function should return only when the upcall is complete.  Upon return</div><div class='add'>+     the authorisation key will be revoked, and the target key will be</div><div class='add'>+     negatively instantiated if it is still uninstantiated.  The error will be</div><div class='add'>+     returned to the caller of request_key*().</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> ============================</div><div class='ctx'> REQUEST-KEY CALLBACK SERVICE</div><div class='ctx'> ============================</div><div class='head'>diff --git a/Documentation/lockdep-design.txt b/Documentation/lockdep-design.txt<br/>new file mode 100644<br/>index 000000000000..00d93605bfd3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/lockdep-design.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/lockdep-design.txt</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+Runtime locking correctness validator</div><div class='add'>+=====================================</div><div class='add'>+</div><div class='add'>+started by Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='add'>+additions by Arjan van de Ven &lt;arjan@linux.intel.com&gt;</div><div class='add'>+</div><div class='add'>+Lock-class</div><div class='add'>+----------</div><div class='add'>+</div><div class='add'>+The basic object the validator operates upon is a 'class' of locks.</div><div class='add'>+</div><div class='add'>+A class of locks is a group of locks that are logically the same with</div><div class='add'>+respect to locking rules, even if the locks may have multiple (possibly</div><div class='add'>+tens of thousands of) instantiations. For example a lock in the inode</div><div class='add'>+struct is one class, while each inode has its own instantiation of that</div><div class='add'>+lock class.</div><div class='add'>+</div><div class='add'>+The validator tracks the 'state' of lock-classes, and it tracks</div><div class='add'>+dependencies between different lock-classes. The validator maintains a</div><div class='add'>+rolling proof that the state and the dependencies are correct.</div><div class='add'>+</div><div class='add'>+Unlike an lock instantiation, the lock-class itself never goes away: when</div><div class='add'>+a lock-class is used for the first time after bootup it gets registered,</div><div class='add'>+and all subsequent uses of that lock-class will be attached to this</div><div class='add'>+lock-class.</div><div class='add'>+</div><div class='add'>+State</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+The validator tracks lock-class usage history into 5 separate state bits:</div><div class='add'>+</div><div class='add'>+- 'ever held in hardirq context'                    [ == hardirq-safe   ]</div><div class='add'>+- 'ever held in softirq context'                    [ == softirq-safe   ]</div><div class='add'>+- 'ever held with hardirqs enabled'                 [ == hardirq-unsafe ]</div><div class='add'>+- 'ever held with softirqs and hardirqs enabled'    [ == softirq-unsafe ]</div><div class='add'>+</div><div class='add'>+- 'ever used'                                       [ == !unused        ]</div><div class='add'>+</div><div class='add'>+Single-lock state rules:</div><div class='add'>+------------------------</div><div class='add'>+</div><div class='add'>+A softirq-unsafe lock-class is automatically hardirq-unsafe as well. The</div><div class='add'>+following states are exclusive, and only one of them is allowed to be</div><div class='add'>+set for any lock-class:</div><div class='add'>+</div><div class='add'>+ &lt;hardirq-safe&gt; and &lt;hardirq-unsafe&gt;</div><div class='add'>+ &lt;softirq-safe&gt; and &lt;softirq-unsafe&gt;</div><div class='add'>+</div><div class='add'>+The validator detects and reports lock usage that violate these</div><div class='add'>+single-lock state rules.</div><div class='add'>+</div><div class='add'>+Multi-lock dependency rules:</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+The same lock-class must not be acquired twice, because this could lead</div><div class='add'>+to lock recursion deadlocks.</div><div class='add'>+</div><div class='add'>+Furthermore, two locks may not be taken in different order:</div><div class='add'>+</div><div class='add'>+ &lt;L1&gt; -&gt; &lt;L2&gt;</div><div class='add'>+ &lt;L2&gt; -&gt; &lt;L1&gt;</div><div class='add'>+</div><div class='add'>+because this could lead to lock inversion deadlocks. (The validator</div><div class='add'>+finds such dependencies in arbitrary complexity, i.e. there can be any</div><div class='add'>+other locking sequence between the acquire-lock operations, the</div><div class='add'>+validator will still track all dependencies between locks.)</div><div class='add'>+</div><div class='add'>+Furthermore, the following usage based lock dependencies are not allowed</div><div class='add'>+between any two lock-classes:</div><div class='add'>+</div><div class='add'>+   &lt;hardirq-safe&gt;   -&gt;  &lt;hardirq-unsafe&gt;</div><div class='add'>+   &lt;softirq-safe&gt;   -&gt;  &lt;softirq-unsafe&gt;</div><div class='add'>+</div><div class='add'>+The first rule comes from the fact the a hardirq-safe lock could be</div><div class='add'>+taken by a hardirq context, interrupting a hardirq-unsafe lock - and</div><div class='add'>+thus could result in a lock inversion deadlock. Likewise, a softirq-safe</div><div class='add'>+lock could be taken by an softirq context, interrupting a softirq-unsafe</div><div class='add'>+lock.</div><div class='add'>+</div><div class='add'>+The above rules are enforced for any locking sequence that occurs in the</div><div class='add'>+kernel: when acquiring a new lock, the validator checks whether there is</div><div class='add'>+any rule violation between the new lock and any of the held locks.</div><div class='add'>+</div><div class='add'>+When a lock-class changes its state, the following aspects of the above</div><div class='add'>+dependency rules are enforced:</div><div class='add'>+</div><div class='add'>+- if a new hardirq-safe lock is discovered, we check whether it</div><div class='add'>+  took any hardirq-unsafe lock in the past.</div><div class='add'>+</div><div class='add'>+- if a new softirq-safe lock is discovered, we check whether it took</div><div class='add'>+  any softirq-unsafe lock in the past.</div><div class='add'>+</div><div class='add'>+- if a new hardirq-unsafe lock is discovered, we check whether any</div><div class='add'>+  hardirq-safe lock took it in the past.</div><div class='add'>+</div><div class='add'>+- if a new softirq-unsafe lock is discovered, we check whether any</div><div class='add'>+  softirq-safe lock took it in the past.</div><div class='add'>+</div><div class='add'>+(Again, we do these checks too on the basis that an interrupt context</div><div class='add'>+could interrupt _any_ of the irq-unsafe or hardirq-unsafe locks, which</div><div class='add'>+could lead to a lock inversion deadlock - even if that lock scenario did</div><div class='add'>+not trigger in practice yet.)</div><div class='add'>+</div><div class='add'>+Exception: Nested data dependencies leading to nested locking</div><div class='add'>+-------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+There are a few cases where the Linux kernel acquires more than one</div><div class='add'>+instance of the same lock-class. Such cases typically happen when there</div><div class='add'>+is some sort of hierarchy within objects of the same type. In these</div><div class='add'>+cases there is an inherent "natural" ordering between the two objects</div><div class='add'>+(defined by the properties of the hierarchy), and the kernel grabs the</div><div class='add'>+locks in this fixed order on each of the objects.</div><div class='add'>+</div><div class='add'>+An example of such an object hieararchy that results in "nested locking"</div><div class='add'>+is that of a "whole disk" block-dev object and a "partition" block-dev</div><div class='add'>+object; the partition is "part of" the whole device and as long as one</div><div class='add'>+always takes the whole disk lock as a higher lock than the partition</div><div class='add'>+lock, the lock ordering is fully correct. The validator does not</div><div class='add'>+automatically detect this natural ordering, as the locking rule behind</div><div class='add'>+the ordering is not static.</div><div class='add'>+</div><div class='add'>+In order to teach the validator about this correct usage model, new</div><div class='add'>+versions of the various locking primitives were added that allow you to</div><div class='add'>+specify a "nesting level". An example call, for the block device mutex,</div><div class='add'>+looks like this:</div><div class='add'>+</div><div class='add'>+enum bdev_bd_mutex_lock_class</div><div class='add'>+{</div><div class='add'>+       BD_MUTEX_NORMAL,</div><div class='add'>+       BD_MUTEX_WHOLE,</div><div class='add'>+       BD_MUTEX_PARTITION</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ mutex_lock_nested(&amp;bdev-&gt;bd_contains-&gt;bd_mutex, BD_MUTEX_PARTITION);</div><div class='add'>+</div><div class='add'>+In this case the locking is done on a bdev object that is known to be a</div><div class='add'>+partition.</div><div class='add'>+</div><div class='add'>+The validator treats a lock that is taken in such a nested fasion as a</div><div class='add'>+separate (sub)class for the purposes of validation.</div><div class='add'>+</div><div class='add'>+Note: When changing code to use the _nested() primitives, be careful and</div><div class='add'>+check really thoroughly that the hiearchy is correctly mapped; otherwise</div><div class='add'>+you can get false positives or false negatives.</div><div class='add'>+</div><div class='add'>+Proof of 100% correctness:</div><div class='add'>+--------------------------</div><div class='add'>+</div><div class='add'>+The validator achieves perfect, mathematical 'closure' (proof of locking</div><div class='add'>+correctness) in the sense that for every simple, standalone single-task</div><div class='add'>+locking sequence that occured at least once during the lifetime of the</div><div class='add'>+kernel, the validator proves it with a 100% certainty that no</div><div class='add'>+combination and timing of these locking sequences can cause any class of</div><div class='add'>+lock related deadlock. [*]</div><div class='add'>+</div><div class='add'>+I.e. complex multi-CPU and multi-task locking scenarios do not have to</div><div class='add'>+occur in practice to prove a deadlock: only the simple 'component'</div><div class='add'>+locking chains have to occur at least once (anytime, in any</div><div class='add'>+task/context) for the validator to be able to prove correctness. (For</div><div class='add'>+example, complex deadlocks that would normally need more than 3 CPUs and</div><div class='add'>+a very unlikely constellation of tasks, irq-contexts and timings to</div><div class='add'>+occur, can be detected on a plain, lightly loaded single-CPU system as</div><div class='add'>+well!)</div><div class='add'>+</div><div class='add'>+This radically decreases the complexity of locking related QA of the</div><div class='add'>+kernel: what has to be done during QA is to trigger as many "simple"</div><div class='add'>+single-task locking dependencies in the kernel as possible, at least</div><div class='add'>+once, to prove locking correctness - instead of having to trigger every</div><div class='add'>+possible combination of locking interaction between CPUs, combined with</div><div class='add'>+every possible hardirq and softirq nesting scenario (which is impossible</div><div class='add'>+to do in practice).</div><div class='add'>+</div><div class='add'>+[*] assuming that the validator itself is 100% correct, and no other</div><div class='add'>+    part of the system corrupts the state of the validator in any way.</div><div class='add'>+    We also assume that all NMI/SMM paths [which could interrupt</div><div class='add'>+    even hardirq-disabled codepaths] are correct and do not interfere</div><div class='add'>+    with the validator. We also assume that the 64-bit 'chain hash'</div><div class='add'>+    value is unique for every lock-chain in the system. Also, lock</div><div class='add'>+    recursion must not be higher than 20.</div><div class='add'>+</div><div class='add'>+Performance:</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+The above rules require _massive_ amounts of runtime checking. If we did</div><div class='add'>+that for every lock taken and for every irqs-enable event, it would</div><div class='add'>+render the system practically unusably slow. The complexity of checking</div><div class='add'>+is O(N^2), so even with just a few hundred lock-classes we'd have to do</div><div class='add'>+tens of thousands of checks for every event.</div><div class='add'>+</div><div class='add'>+This problem is solved by checking any given 'locking scenario' (unique</div><div class='add'>+sequence of locks taken after each other) only once. A simple stack of</div><div class='add'>+held locks is maintained, and a lightweight 64-bit hash value is</div><div class='add'>+calculated, which hash is unique for every lock chain. The hash value,</div><div class='add'>+when the chain is validated for the first time, is then put into a hash</div><div class='add'>+table, which hash-table can be checked in a lockfree manner. If the</div><div class='add'>+locking chain occurs again later on, the hash table tells us that we</div><div class='add'>+dont have to validate the chain again.</div><div class='head'>diff --git a/Documentation/md.txt b/Documentation/md.txt<br/>index 03a13c462cf2..0668f9dc9d29 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/md.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/md.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/md.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/md.txt</a></div><div class='hunk'>@@ -200,6 +200,17 @@ All md devices contain:</div><div class='ctx'>      This can be written only while the array is being assembled, not</div><div class='ctx'>      after it is started.</div><div class='ctx'> </div><div class='add'>+  layout</div><div class='add'>+     The "layout" for the array for the particular level.  This is</div><div class='add'>+     simply a number that is interpretted differently by different</div><div class='add'>+     levels.  It can be written while assembling an array.</div><div class='add'>+</div><div class='add'>+  resync_start</div><div class='add'>+     The point at which resync should start.  If no resync is needed,</div><div class='add'>+     this will be a very large number.  At array creation it will</div><div class='add'>+     default to 0, though starting the array as 'clean' will</div><div class='add'>+     set it much larger.</div><div class='add'>+</div><div class='ctx'>    new_dev</div><div class='ctx'>      This file can be written but not read.  The value written should</div><div class='ctx'>      be a block device number as major:minor.  e.g. 8:0</div><div class='hunk'>@@ -207,6 +218,54 @@ All md devices contain:</div><div class='ctx'>      available.  It will then appear at md/dev-XXX (depending on the</div><div class='ctx'>      name of the device) and further configuration is then possible.</div><div class='ctx'> </div><div class='add'>+   safe_mode_delay</div><div class='add'>+     When an md array has seen no write requests for a certain period</div><div class='add'>+     of time, it will be marked as 'clean'.  When another write</div><div class='add'>+     request arrive, the array is marked as 'dirty' before the write</div><div class='add'>+     commenses.  This is known as 'safe_mode'.</div><div class='add'>+     The 'certain period' is controlled by this file which stores the</div><div class='add'>+     period as a number of seconds.  The default is 200msec (0.200).</div><div class='add'>+     Writing a value of 0 disables safemode.</div><div class='add'>+</div><div class='add'>+   array_state</div><div class='add'>+     This file contains a single word which describes the current</div><div class='add'>+     state of the array.  In many cases, the state can be set by</div><div class='add'>+     writing the word for the desired state, however some states</div><div class='add'>+     cannot be explicitly set, and some transitions are not allowed.</div><div class='add'>+</div><div class='add'>+     clear</div><div class='add'>+         No devices, no size, no level</div><div class='add'>+         Writing is equivalent to STOP_ARRAY ioctl</div><div class='add'>+     inactive</div><div class='add'>+         May have some settings, but array is not active</div><div class='add'>+            all IO results in error</div><div class='add'>+         When written, doesn't tear down array, but just stops it</div><div class='add'>+     suspended (not supported yet)</div><div class='add'>+         All IO requests will block. The array can be reconfigured.</div><div class='add'>+         Writing this, if accepted, will block until array is quiessent</div><div class='add'>+     readonly</div><div class='add'>+         no resync can happen.  no superblocks get written.</div><div class='add'>+         write requests fail</div><div class='add'>+     read-auto</div><div class='add'>+         like readonly, but behaves like 'clean' on a write request.</div><div class='add'>+</div><div class='add'>+     clean - no pending writes, but otherwise active.</div><div class='add'>+         When written to inactive array, starts without resync</div><div class='add'>+         If a write request arrives then</div><div class='add'>+           if metadata is known, mark 'dirty' and switch to 'active'.</div><div class='add'>+           if not known, block and switch to write-pending</div><div class='add'>+         If written to an active array that has pending writes, then fails.</div><div class='add'>+     active</div><div class='add'>+         fully active: IO and resync can be happening.</div><div class='add'>+         When written to inactive array, starts with resync</div><div class='add'>+</div><div class='add'>+     write-pending</div><div class='add'>+         clean, but writes are blocked waiting for 'active' to be written.</div><div class='add'>+</div><div class='add'>+     active-idle</div><div class='add'>+         like active, but no writes have been seen for a while (safe_mode_delay).</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>    sync_speed_min</div><div class='ctx'>    sync_speed_max</div><div class='ctx'>      This are similar to /proc/sys/dev/raid/speed_limit_{min,max}</div><div class='hunk'>@@ -250,10 +309,18 @@ Each directory contains:</div><div class='ctx'> 	      faulty   - device has been kicked from active use due to</div><div class='ctx'>                          a detected fault</div><div class='ctx'> 	      in_sync  - device is a fully in-sync member of the array</div><div class='add'>+	      writemostly - device will only be subject to read</div><div class='add'>+		         requests if there are no other options.</div><div class='add'>+			 This applies only to raid1 arrays.</div><div class='ctx'> 	      spare    - device is working, but not a full member.</div><div class='ctx'> 			 This includes spares that are in the process</div><div class='ctx'> 			 of being recoverred to</div><div class='ctx'> 	This list make grow in future.</div><div class='add'>+	This can be written to.</div><div class='add'>+	Writing "faulty"  simulates a failure on the device.</div><div class='add'>+	Writing "remove" removes the device from the array.</div><div class='add'>+	Writing "writemostly" sets the writemostly flag.</div><div class='add'>+	Writing "-writemostly" clears the writemostly flag.</div><div class='ctx'> </div><div class='ctx'>       errors</div><div class='ctx'> 	An approximate count of read errors that have been detected on</div><div class='head'>diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt<br/>index c61d8b876fdb..46b9b389df35 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/memory-barriers.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/memory-barriers.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/memory-barriers.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/memory-barriers.txt</a></div><div class='hunk'>@@ -19,6 +19,7 @@ Contents:</div><div class='ctx'>      - Control dependencies.</div><div class='ctx'>      - SMP barrier pairing.</div><div class='ctx'>      - Examples of memory barrier sequences.</div><div class='add'>+     - Read memory barriers vs load speculation.</div><div class='ctx'> </div><div class='ctx'>  (*) Explicit kernel barriers.</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +249,7 @@ And there are a number of things that _must_ or _must_not_ be assumed:</div><div class='ctx'>      we may get either of:</div><div class='ctx'> </div><div class='ctx'> 	STORE *A = X; Y = LOAD *A;</div><div class='del'>-	STORE *A = Y;</div><div class='add'>+	STORE *A = Y = X;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> =========================</div><div class='hunk'>@@ -261,9 +262,14 @@ What is required is some way of intervening to instruct the compiler and the</div><div class='ctx'> CPU to restrict the order.</div><div class='ctx'> </div><div class='ctx'> Memory barriers are such interventions.  They impose a perceived partial</div><div class='del'>-ordering between the memory operations specified on either side of the barrier.</div><div class='del'>-They request that the sequence of memory events generated appears to other</div><div class='del'>-parts of the system as if the barrier is effective on that CPU.</div><div class='add'>+ordering over the memory operations on either side of the barrier.</div><div class='add'>+</div><div class='add'>+Such enforcement is important because the CPUs and other devices in a system</div><div class='add'>+can use a variety of tricks to improve performance - including reordering,</div><div class='add'>+deferral and combination of memory operations; speculative loads; speculative</div><div class='add'>+branch prediction and various types of caching.  Memory barriers are used to</div><div class='add'>+override or suppress these tricks, allowing the code to sanely control the</div><div class='add'>+interaction of multiple CPUs and/or devices.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> VARIETIES OF MEMORY BARRIER</div><div class='hunk'>@@ -281,7 +287,7 @@ Memory barriers come in four basic varieties:</div><div class='ctx'>      A write barrier is a partial ordering on stores only; it is not required</div><div class='ctx'>      to have any effect on loads.</div><div class='ctx'> </div><div class='del'>-     A CPU can be viewed as as commiting a sequence of store operations to the</div><div class='add'>+     A CPU can be viewed as committing a sequence of store operations to the</div><div class='ctx'>      memory system as time progresses.  All stores before a write barrier will</div><div class='ctx'>      occur in the sequence _before_ all the stores after the write barrier.</div><div class='ctx'> </div><div class='hunk'>@@ -344,9 +350,12 @@ Memory barriers come in four basic varieties:</div><div class='ctx'> </div><div class='ctx'>  (4) General memory barriers.</div><div class='ctx'> </div><div class='del'>-     A general memory barrier is a combination of both a read memory barrier</div><div class='del'>-     and a write memory barrier.  It is a partial ordering over both loads and</div><div class='del'>-     stores.</div><div class='add'>+     A general memory barrier gives a guarantee that all the LOAD and STORE</div><div class='add'>+     operations specified before the barrier will appear to happen before all</div><div class='add'>+     the LOAD and STORE operations specified after the barrier with respect to</div><div class='add'>+     the other components of the system.</div><div class='add'>+</div><div class='add'>+     A general memory barrier is a partial ordering over both loads and stores.</div><div class='ctx'> </div><div class='ctx'>      General memory barriers imply both read and write memory barriers, and so</div><div class='ctx'>      can substitute for either.</div><div class='hunk'>@@ -409,7 +418,7 @@ There are certain things that the Linux kernel memory barriers do not guarantee:</div><div class='ctx'>      indirect effect will be the order in which the second CPU sees the effects</div><div class='ctx'>      of the first CPU's accesses occur, but see the next point:</div><div class='ctx'> </div><div class='del'>- (*) There is no guarantee that the a CPU will see the correct order of effects</div><div class='add'>+ (*) There is no guarantee that a CPU will see the correct order of effects</div><div class='ctx'>      from a second CPU's accesses, even _if_ the second CPU uses a memory</div><div class='ctx'>      barrier, unless the first CPU _also_ uses a matching memory barrier (see</div><div class='ctx'>      the subsection on "SMP Barrier Pairing").</div><div class='hunk'>@@ -457,8 +466,8 @@ Whilst this may seem like a failure of coherency or causality maintenance, it</div><div class='ctx'> isn't, and this behaviour can be observed on certain real CPUs (such as the DEC</div><div class='ctx'> Alpha).</div><div class='ctx'> </div><div class='del'>-To deal with this, a data dependency barrier must be inserted between the</div><div class='del'>-address load and the data load:</div><div class='add'>+To deal with this, a data dependency barrier or better must be inserted</div><div class='add'>+between the address load and the data load:</div><div class='ctx'> </div><div class='ctx'> 	CPU 1		CPU 2</div><div class='ctx'> 	===============	===============</div><div class='hunk'>@@ -480,7 +489,7 @@ lines.  The pointer P might be stored in an odd-numbered cache line, and the</div><div class='ctx'> variable B might be stored in an even-numbered cache line.  Then, if the</div><div class='ctx'> even-numbered bank of the reading CPU's cache is extremely busy while the</div><div class='ctx'> odd-numbered bank is idle, one can see the new value of the pointer P (&amp;B),</div><div class='del'>-but the old value of the variable B (1).</div><div class='add'>+but the old value of the variable B (2).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Another example of where data dependency barriers might by required is where a</div><div class='hunk'>@@ -546,9 +555,9 @@ write barrier, though, again, a general barrier is viable:</div><div class='ctx'> 	===============	===============</div><div class='ctx'> 	a = 1;</div><div class='ctx'> 	&lt;write barrier&gt;</div><div class='del'>-	b = 2;		x = a;</div><div class='add'>+	b = 2;		x = b;</div><div class='ctx'> 			&lt;read barrier&gt;</div><div class='del'>-			y = b;</div><div class='add'>+			y = a;</div><div class='ctx'> </div><div class='ctx'> Or:</div><div class='ctx'> </div><div class='hunk'>@@ -563,6 +572,18 @@ Or:</div><div class='ctx'> Basically, the read barrier always has to be there, even though it can be of</div><div class='ctx'> the "weaker" type.</div><div class='ctx'> </div><div class='add'>+[!] Note that the stores before the write barrier would normally be expected to</div><div class='add'>+match the loads after the read barrier or data dependency barrier, and vice</div><div class='add'>+versa:</div><div class='add'>+</div><div class='add'>+	CPU 1                           CPU 2</div><div class='add'>+	===============                 ===============</div><div class='add'>+	a = 1;           }----   ---&gt;{  v = c</div><div class='add'>+	b = 2;           }    \ /    {  w = d</div><div class='add'>+	&lt;write barrier&gt;        \        &lt;read barrier&gt;</div><div class='add'>+	c = 3;           }    / \    {  x = a;</div><div class='add'>+	d = 4;           }----   ---&gt;{  y = b;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> EXAMPLES OF MEMORY BARRIER SEQUENCES</div><div class='ctx'> ------------------------------------</div><div class='hunk'>@@ -581,7 +602,7 @@ Consider the following sequence of events:</div><div class='ctx'> </div><div class='ctx'> This sequence of events is committed to the memory coherence system in an order</div><div class='ctx'> that the rest of the system might perceive as the unordered set of { STORE A,</div><div class='del'>-STORE B, STORE C } all occuring before the unordered set of { STORE D, STORE E</div><div class='add'>+STORE B, STORE C } all occurring before the unordered set of { STORE D, STORE E</div><div class='ctx'> }:</div><div class='ctx'> </div><div class='ctx'> 	+-------+       :      :</div><div class='hunk'>@@ -600,8 +621,8 @@ STORE B, STORE C } all occuring before the unordered set of { STORE D, STORE E</div><div class='ctx'> 	|       |       +------+</div><div class='ctx'> 	+-------+       :      :</div><div class='ctx'> 	                   |</div><div class='del'>-	                   | Sequence in which stores committed to memory system</div><div class='del'>-	                   | by CPU 1</div><div class='add'>+	                   | Sequence in which stores are committed to the</div><div class='add'>+	                   | memory system by CPU 1</div><div class='ctx'> 	                   V</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -683,14 +704,12 @@ then the following will occur:</div><div class='ctx'> 	                               |        :       :       |       |</div><div class='ctx'> 	                               |        :       :       | CPU 2 |</div><div class='ctx'> 	                               |        +-------+       |       |</div><div class='del'>-	                                \       | X-&gt;9  |------&gt;|       |</div><div class='del'>-	                                 \      +-------+       |       |</div><div class='del'>-	                                  -----&gt;| B-&gt;2  |       |       |</div><div class='del'>-	                                        +-------+       |       |</div><div class='del'>-	     Makes sure all effects ---&gt;    ddddddddddddddddd   |       |</div><div class='del'>-	     prior to the store of C            +-------+       |       |</div><div class='del'>-	     are perceptible to                 | B-&gt;2  |------&gt;|       |</div><div class='del'>-	     successive loads                   +-------+       |       |</div><div class='add'>+	                               |        | X-&gt;9  |------&gt;|       |</div><div class='add'>+	                               |        +-------+       |       |</div><div class='add'>+	  Makes sure all effects ---&gt;   \   ddddddddddddddddd   |       |</div><div class='add'>+	  prior to the store of C        \      +-------+       |       |</div><div class='add'>+	  are perceptible to              -----&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	  subsequent loads                      +-------+       |       |</div><div class='ctx'> 	                                        :       :       +-------+</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -699,73 +718,239 @@ following sequence of events:</div><div class='ctx'> </div><div class='ctx'> 	CPU 1			CPU 2</div><div class='ctx'> 	=======================	=======================</div><div class='add'>+		{ A = 0, B = 9 }</div><div class='ctx'> 	STORE A=1</div><div class='del'>-	STORE B=2</div><div class='del'>-	STORE C=3</div><div class='ctx'> 	&lt;write barrier&gt;</div><div class='del'>-	STORE D=4</div><div class='del'>-	STORE E=5</div><div class='del'>-				LOAD A</div><div class='add'>+	STORE B=2</div><div class='ctx'> 				LOAD B</div><div class='del'>-				LOAD C</div><div class='del'>-				LOAD D</div><div class='del'>-				LOAD E</div><div class='add'>+				LOAD A</div><div class='ctx'> </div><div class='ctx'> Without intervention, CPU 2 may then choose to perceive the events on CPU 1 in</div><div class='ctx'> some effectively random order, despite the write barrier issued by CPU 1:</div><div class='ctx'> </div><div class='del'>-	+-------+       :      :</div><div class='del'>-	|       |       +------+</div><div class='del'>-	|       |------&gt;| C=3  | }</div><div class='del'>-	|       |  :    +------+ }</div><div class='del'>-	|       |  :    | A=1  | }</div><div class='del'>-	|       |  :    +------+ }</div><div class='del'>-	| CPU 1 |  :    | B=2  | }---</div><div class='del'>-	|       |       +------+ }   \</div><div class='del'>-	|       |   wwwwwwwwwwwww}    \</div><div class='del'>-	|       |       +------+ }     \          :       :       +-------+</div><div class='del'>-	|       |  :    | E=5  | }      \         +-------+       |       |</div><div class='del'>-	|       |  :    +------+ }       \      { | C-&gt;3  |------&gt;|       |</div><div class='del'>-	|       |------&gt;| D=4  | }        \     { +-------+    :  |       |</div><div class='del'>-	|       |       +------+           \    { | E-&gt;5  |    :  |       |</div><div class='del'>-	+-------+       :      :            \   { +-------+    :  |       |</div><div class='del'>-	                           Transfer  --&gt;{ | A-&gt;1  |    :  | CPU 2 |</div><div class='del'>-	                          from CPU 1    { +-------+    :  |       |</div><div class='del'>-	                           to CPU 2     { | D-&gt;4  |    :  |       |</div><div class='del'>-	                                        { +-------+    :  |       |</div><div class='del'>-	                                        { | B-&gt;2  |------&gt;|       |</div><div class='del'>-	                                          +-------+       |       |</div><div class='del'>-	                                          :       :       +-------+</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-If, however, a read barrier were to be placed between the load of C and the</div><div class='del'>-load of D on CPU 2, then the partial ordering imposed by CPU 1 will be</div><div class='del'>-perceived correctly by CPU 2.</div><div class='add'>+	+-------+       :      :                :       :</div><div class='add'>+	|       |       +------+                +-------+</div><div class='add'>+	|       |------&gt;| A=1  |------      ---&gt;| A-&gt;0  |</div><div class='add'>+	|       |       +------+      \         +-------+</div><div class='add'>+	| CPU 1 |   wwwwwwwwwwwwwwww   \    ---&gt;| B-&gt;9  |</div><div class='add'>+	|       |       +------+        |       +-------+</div><div class='add'>+	|       |------&gt;| B=2  |---     |       :       :</div><div class='add'>+	|       |       +------+   \    |       :       :       +-------+</div><div class='add'>+	+-------+       :      :    \   |       +-------+       |       |</div><div class='add'>+	                             ----------&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                |       +-------+       | CPU 2 |</div><div class='add'>+	                                |       | A-&gt;0  |------&gt;|       |</div><div class='add'>+	                                |       +-------+       |       |</div><div class='add'>+	                                |       :       :       +-------+</div><div class='add'>+	                                 \      :       :</div><div class='add'>+	                                  \     +-------+</div><div class='add'>+	                                   ----&gt;| A-&gt;1  |</div><div class='add'>+	                                        +-------+</div><div class='add'>+	                                        :       :</div><div class='ctx'> </div><div class='del'>-	+-------+       :      :</div><div class='del'>-	|       |       +------+</div><div class='del'>-	|       |------&gt;| C=3  | }</div><div class='del'>-	|       |  :    +------+ }</div><div class='del'>-	|       |  :    | A=1  | }---</div><div class='del'>-	|       |  :    +------+ }   \</div><div class='del'>-	| CPU 1 |  :    | B=2  | }    \</div><div class='del'>-	|       |       +------+       \</div><div class='del'>-	|       |   wwwwwwwwwwwwwwww    \</div><div class='del'>-	|       |       +------+         \        :       :       +-------+</div><div class='del'>-	|       |  :    | E=5  | }        \       +-------+       |       |</div><div class='del'>-	|       |  :    +------+ }---      \    { | C-&gt;3  |------&gt;|       |</div><div class='del'>-	|       |------&gt;| D=4  | }   \      \   { +-------+    :  |       |</div><div class='del'>-	|       |       +------+      \      --&gt;{ | B-&gt;2  |    :  |       |</div><div class='del'>-	+-------+       :      :       \        { +-------+    :  |       |</div><div class='del'>-	                                \       { | A-&gt;1  |    :  | CPU 2 |</div><div class='del'>-	                                 \        +-------+       |       |</div><div class='del'>-	   At this point the read ----&gt;   \   rrrrrrrrrrrrrrrrr   |       |</div><div class='del'>-	   barrier causes all effects      \      +-------+       |       |</div><div class='del'>-	   prior to the storage of C        \   { | E-&gt;5  |    :  |       |</div><div class='del'>-	   to be perceptible to CPU 2        --&gt;{ +-------+    :  |       |</div><div class='del'>-	                                        { | D-&gt;4  |------&gt;|       |</div><div class='del'>-	                                          +-------+       |       |</div><div class='del'>-	                                          :       :       +-------+</div><div class='add'>+</div><div class='add'>+If, however, a read barrier were to be placed between the load of B and the</div><div class='add'>+load of A on CPU 2:</div><div class='add'>+</div><div class='add'>+	CPU 1			CPU 2</div><div class='add'>+	=======================	=======================</div><div class='add'>+		{ A = 0, B = 9 }</div><div class='add'>+	STORE A=1</div><div class='add'>+	&lt;write barrier&gt;</div><div class='add'>+	STORE B=2</div><div class='add'>+				LOAD B</div><div class='add'>+				&lt;read barrier&gt;</div><div class='add'>+				LOAD A</div><div class='add'>+</div><div class='add'>+then the partial ordering imposed by CPU 1 will be perceived correctly by CPU</div><div class='add'>+2:</div><div class='add'>+</div><div class='add'>+	+-------+       :      :                :       :</div><div class='add'>+	|       |       +------+                +-------+</div><div class='add'>+	|       |------&gt;| A=1  |------      ---&gt;| A-&gt;0  |</div><div class='add'>+	|       |       +------+      \         +-------+</div><div class='add'>+	| CPU 1 |   wwwwwwwwwwwwwwww   \    ---&gt;| B-&gt;9  |</div><div class='add'>+	|       |       +------+        |       +-------+</div><div class='add'>+	|       |------&gt;| B=2  |---     |       :       :</div><div class='add'>+	|       |       +------+   \    |       :       :       +-------+</div><div class='add'>+	+-------+       :      :    \   |       +-------+       |       |</div><div class='add'>+	                             ----------&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                |       +-------+       | CPU 2 |</div><div class='add'>+	                                |       :       :       |       |</div><div class='add'>+	                                |       :       :       |       |</div><div class='add'>+	  At this point the read ----&gt;   \  rrrrrrrrrrrrrrrrr   |       |</div><div class='add'>+	  barrier causes all effects      \     +-------+       |       |</div><div class='add'>+	  prior to the storage of B        ----&gt;| A-&gt;1  |------&gt;|       |</div><div class='add'>+	  to be perceptible to CPU 2            +-------+       |       |</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+To illustrate this more completely, consider what could happen if the code</div><div class='add'>+contained a load of A either side of the read barrier:</div><div class='add'>+</div><div class='add'>+	CPU 1			CPU 2</div><div class='add'>+	=======================	=======================</div><div class='add'>+		{ A = 0, B = 9 }</div><div class='add'>+	STORE A=1</div><div class='add'>+	&lt;write barrier&gt;</div><div class='add'>+	STORE B=2</div><div class='add'>+				LOAD B</div><div class='add'>+				LOAD A [first load of A]</div><div class='add'>+				&lt;read barrier&gt;</div><div class='add'>+				LOAD A [second load of A]</div><div class='add'>+</div><div class='add'>+Even though the two loads of A both occur after the load of B, they may both</div><div class='add'>+come up with different values:</div><div class='add'>+</div><div class='add'>+	+-------+       :      :                :       :</div><div class='add'>+	|       |       +------+                +-------+</div><div class='add'>+	|       |------&gt;| A=1  |------      ---&gt;| A-&gt;0  |</div><div class='add'>+	|       |       +------+      \         +-------+</div><div class='add'>+	| CPU 1 |   wwwwwwwwwwwwwwww   \    ---&gt;| B-&gt;9  |</div><div class='add'>+	|       |       +------+        |       +-------+</div><div class='add'>+	|       |------&gt;| B=2  |---     |       :       :</div><div class='add'>+	|       |       +------+   \    |       :       :       +-------+</div><div class='add'>+	+-------+       :      :    \   |       +-------+       |       |</div><div class='add'>+	                             ----------&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                |       +-------+       | CPU 2 |</div><div class='add'>+	                                |       :       :       |       |</div><div class='add'>+	                                |       :       :       |       |</div><div class='add'>+	                                |       +-------+       |       |</div><div class='add'>+	                                |       | A-&gt;0  |------&gt;| 1st   |</div><div class='add'>+	                                |       +-------+       |       |</div><div class='add'>+	  At this point the read ----&gt;   \  rrrrrrrrrrrrrrrrr   |       |</div><div class='add'>+	  barrier causes all effects      \     +-------+       |       |</div><div class='add'>+	  prior to the storage of B        ----&gt;| A-&gt;1  |------&gt;| 2nd   |</div><div class='add'>+	  to be perceptible to CPU 2            +-------+       |       |</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+But it may be that the update to A from CPU 1 becomes perceptible to CPU 2</div><div class='add'>+before the read barrier completes anyway:</div><div class='add'>+</div><div class='add'>+	+-------+       :      :                :       :</div><div class='add'>+	|       |       +------+                +-------+</div><div class='add'>+	|       |------&gt;| A=1  |------      ---&gt;| A-&gt;0  |</div><div class='add'>+	|       |       +------+      \         +-------+</div><div class='add'>+	| CPU 1 |   wwwwwwwwwwwwwwww   \    ---&gt;| B-&gt;9  |</div><div class='add'>+	|       |       +------+        |       +-------+</div><div class='add'>+	|       |------&gt;| B=2  |---     |       :       :</div><div class='add'>+	|       |       +------+   \    |       :       :       +-------+</div><div class='add'>+	+-------+       :      :    \   |       +-------+       |       |</div><div class='add'>+	                             ----------&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                |       +-------+       | CPU 2 |</div><div class='add'>+	                                |       :       :       |       |</div><div class='add'>+	                                 \      :       :       |       |</div><div class='add'>+	                                  \     +-------+       |       |</div><div class='add'>+	                                   ----&gt;| A-&gt;1  |------&gt;| 1st   |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	                                    rrrrrrrrrrrrrrrrr   |       |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	                                        | A-&gt;1  |------&gt;| 2nd   |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The guarantee is that the second load will always come up with A == 1 if the</div><div class='add'>+load of B came up with B == 2.  No such guarantee exists for the first load of</div><div class='add'>+A; that may come up with either A == 0 or A == 1.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+READ MEMORY BARRIERS VS LOAD SPECULATION</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+Many CPUs speculate with loads: that is they see that they will need to load an</div><div class='add'>+item from memory, and they find a time where they're not using the bus for any</div><div class='add'>+other loads, and so do the load in advance - even though they haven't actually</div><div class='add'>+got to that point in the instruction execution flow yet.  This permits the</div><div class='add'>+actual load instruction to potentially complete immediately because the CPU</div><div class='add'>+already has the value to hand.</div><div class='add'>+</div><div class='add'>+It may turn out that the CPU didn't actually need the value - perhaps because a</div><div class='add'>+branch circumvented the load - in which case it can discard the value or just</div><div class='add'>+cache it for later use.</div><div class='add'>+</div><div class='add'>+Consider:</div><div class='add'>+</div><div class='add'>+	CPU 1	   		CPU 2</div><div class='add'>+	=======================	=======================</div><div class='add'>+	 	   		LOAD B</div><div class='add'>+	 	   		DIVIDE		} Divide instructions generally</div><div class='add'>+	 	   		DIVIDE		} take a long time to perform</div><div class='add'>+	 	   		LOAD A</div><div class='add'>+</div><div class='add'>+Which might appear as this:</div><div class='add'>+</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	                                    ---&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                        +-------+       | CPU 2 |</div><div class='add'>+	                                        :       :DIVIDE |       |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	The CPU being busy doing a ---&gt;     ---&gt;| A-&gt;0  |~~~~   |       |</div><div class='add'>+	division speculates on the              +-------+   ~   |       |</div><div class='add'>+	LOAD of A                               :       :   ~   |       |</div><div class='add'>+	                                        :       :DIVIDE |       |</div><div class='add'>+	                                        :       :   ~   |       |</div><div class='add'>+	Once the divisions are complete --&gt;     :       :   ~--&gt;|       |</div><div class='add'>+	the CPU can then perform the            :       :       |       |</div><div class='add'>+	LOAD with immediate effect              :       :       +-------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Placing a read barrier or a data dependency barrier just before the second</div><div class='add'>+load:</div><div class='add'>+</div><div class='add'>+	CPU 1	   		CPU 2</div><div class='add'>+	=======================	=======================</div><div class='add'>+	 	   		LOAD B</div><div class='add'>+	 	   		DIVIDE</div><div class='add'>+	 	   		DIVIDE</div><div class='add'>+				&lt;read barrier&gt;</div><div class='add'>+	 	   		LOAD A</div><div class='add'>+</div><div class='add'>+will force any value speculatively obtained to be reconsidered to an extent</div><div class='add'>+dependent on the type of barrier used.  If there was no change made to the</div><div class='add'>+speculated memory location, then the speculated value will just be used:</div><div class='add'>+</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	                                    ---&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                        +-------+       | CPU 2 |</div><div class='add'>+	                                        :       :DIVIDE |       |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	The CPU being busy doing a ---&gt;     ---&gt;| A-&gt;0  |~~~~   |       |</div><div class='add'>+	division speculates on the              +-------+   ~   |       |</div><div class='add'>+	LOAD of A                               :       :   ~   |       |</div><div class='add'>+	                                        :       :DIVIDE |       |</div><div class='add'>+	                                        :       :   ~   |       |</div><div class='add'>+	                                        :       :   ~   |       |</div><div class='add'>+	                                    rrrrrrrrrrrrrrrr~   |       |</div><div class='add'>+	                                        :       :   ~   |       |</div><div class='add'>+	                                        :       :   ~--&gt;|       |</div><div class='add'>+	                                        :       :       |       |</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+but if there was an update or an invalidation from another CPU pending, then</div><div class='add'>+the speculation will be cancelled and the value reloaded:</div><div class='add'>+</div><div class='add'>+	                                        :       :       +-------+</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	                                    ---&gt;| B-&gt;2  |------&gt;|       |</div><div class='add'>+	                                        +-------+       | CPU 2 |</div><div class='add'>+	                                        :       :DIVIDE |       |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	The CPU being busy doing a ---&gt;     ---&gt;| A-&gt;0  |~~~~   |       |</div><div class='add'>+	division speculates on the              +-------+   ~   |       |</div><div class='add'>+	LOAD of A                               :       :   ~   |       |</div><div class='add'>+	                                        :       :DIVIDE |       |</div><div class='add'>+	                                        :       :   ~   |       |</div><div class='add'>+	                                        :       :   ~   |       |</div><div class='add'>+	                                    rrrrrrrrrrrrrrrrr   |       |</div><div class='add'>+	                                        +-------+       |       |</div><div class='add'>+	The speculation is discarded ---&gt;   ---&gt;| A-&gt;1  |------&gt;|       |</div><div class='add'>+	and an updated value is                 +-------+       |       |</div><div class='add'>+	retrieved                               :       :       +-------+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ========================</div><div class='hunk'>@@ -830,10 +1015,9 @@ CPU from reordering them.</div><div class='ctx'> There are some more advanced barrier functions:</div><div class='ctx'> </div><div class='ctx'>  (*) set_mb(var, value)</div><div class='del'>- (*) set_wmb(var, value)</div><div class='ctx'> </div><div class='del'>-     These assign the value to the variable and then insert at least a write</div><div class='del'>-     barrier after it, depending on the function.  They aren't guaranteed to</div><div class='add'>+     This assigns the value to the variable and then inserts at least a write</div><div class='add'>+     barrier after it, depending on the function.  It isn't guaranteed to</div><div class='ctx'>      insert anything more than a compiler barrier in a UP compilation.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -901,7 +1085,7 @@ IMPLICIT KERNEL MEMORY BARRIERS</div><div class='ctx'> ===============================</div><div class='ctx'> </div><div class='ctx'> Some of the other functions in the linux kernel imply memory barriers, amongst</div><div class='del'>-which are locking, scheduling and memory allocation functions.</div><div class='add'>+which are locking and scheduling functions.</div><div class='ctx'> </div><div class='ctx'> This specification is a _minimum_ guarantee; any particular architecture may</div><div class='ctx'> provide more substantial guarantees, but these may not be relied upon outside</div><div class='hunk'>@@ -966,6 +1150,20 @@ equivalent to a full barrier, but a LOCK followed by an UNLOCK is not.</div><div class='ctx'>     barriers is that the effects instructions outside of a critical section may</div><div class='ctx'>     seep into the inside of the critical section.</div><div class='ctx'> </div><div class='add'>+A LOCK followed by an UNLOCK may not be assumed to be full memory barrier</div><div class='add'>+because it is possible for an access preceding the LOCK to happen after the</div><div class='add'>+LOCK, and an access following the UNLOCK to happen before the UNLOCK, and the</div><div class='add'>+two accesses can themselves then cross:</div><div class='add'>+</div><div class='add'>+	*A = a;</div><div class='add'>+	LOCK</div><div class='add'>+	UNLOCK</div><div class='add'>+	*B = b;</div><div class='add'>+</div><div class='add'>+may occur as:</div><div class='add'>+</div><div class='add'>+	LOCK, STORE *B, STORE *A, UNLOCK</div><div class='add'>+</div><div class='ctx'> Locks and semaphores may not provide any guarantee of ordering on UP compiled</div><div class='ctx'> systems, and so cannot be counted on in such a situation to actually achieve</div><div class='ctx'> anything at all - especially with respect to I/O accesses - unless combined</div><div class='hunk'>@@ -1016,8 +1214,6 @@ Other functions that imply barriers:</div><div class='ctx'> </div><div class='ctx'>  (*) schedule() and similar imply full memory barriers.</div><div class='ctx'> </div><div class='del'>- (*) Memory allocation and release functions imply full memory barriers.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> =================================</div><div class='ctx'> INTER-CPU LOCKING BARRIER EFFECTS</div><div class='hunk'>@@ -1269,9 +1465,8 @@ instruction itself is complete.</div><div class='ctx'> </div><div class='ctx'> On a UP system - where this wouldn't be a problem - the smp_mb() is just a</div><div class='ctx'> compiler barrier, thus making sure the compiler emits the instructions in the</div><div class='del'>-right order without actually intervening in the CPU.  Since there there's only</div><div class='del'>-one CPU, that CPU's dependency ordering logic will take care of everything</div><div class='del'>-else.</div><div class='add'>+right order without actually intervening in the CPU.  Since there's only one</div><div class='add'>+CPU, that CPU's dependency ordering logic will take care of everything else.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> ATOMIC OPERATIONS</div><div class='hunk'>@@ -1448,9 +1643,9 @@ functions:</div><div class='ctx'> </div><div class='ctx'>      The PCI bus, amongst others, defines an I/O space concept - which on such</div><div class='ctx'>      CPUs as i386 and x86_64 cpus readily maps to the CPU's concept of I/O</div><div class='del'>-     space.  However, it may also mapped as a virtual I/O space in the CPU's</div><div class='del'>-     memory map, particularly on those CPUs that don't support alternate</div><div class='del'>-     I/O spaces.</div><div class='add'>+     space.  However, it may also be mapped as a virtual I/O space in the CPU's</div><div class='add'>+     memory map, particularly on those CPUs that don't support alternate I/O</div><div class='add'>+     spaces.</div><div class='ctx'> </div><div class='ctx'>      Accesses to this space may be fully synchronous (as on i386), but</div><div class='ctx'>      intermediary bridges (such as the PCI host bridge) may not fully honour</div><div class='head'>diff --git a/Documentation/mips/time.README b/Documentation/mips/time.README<br/>index 70bc0dd43d6d..69ddc5c14b79 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/mips/time.README?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/mips/time.README</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/mips/time.README?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/mips/time.README</a></div><div class='hunk'>@@ -65,7 +65,7 @@ the following functions or values:</div><div class='ctx'> 	1. (optional) set up RTC routines</div><div class='ctx'> 	2. (optional) calibrate and set the mips_counter_frequency</div><div class='ctx'> </div><div class='del'>-  b) board_timer_setup - a function pointer.  Invoked at the end of time_init()</div><div class='add'>+  b) plat_timer_setup - a function pointer.  Invoked at the end of time_init()</div><div class='ctx'> 	1. (optional) over-ride any decisions made in time_init()</div><div class='ctx'> 	2. set up the irqaction for timer interrupt.</div><div class='ctx'> 	3. enable the timer interrupt</div><div class='hunk'>@@ -116,19 +116,17 @@ Step 2:  the machine setup() function</div><div class='ctx'> </div><div class='ctx'>   If you supply board_time_init(), set the function poointer.</div><div class='ctx'> </div><div class='del'>-  Set the function pointer board_timer_setup() (mandatory)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-Step 3: implement rtc routines, board_time_init() and board_timer_setup()</div><div class='add'>+Step 3: implement rtc routines, board_time_init() and plat_timer_setup()</div><div class='ctx'>   if needed.</div><div class='ctx'> </div><div class='del'>-  board_time_init() - </div><div class='add'>+  board_time_init() -</div><div class='ctx'>   	a) (optional) set up RTC routines, </div><div class='ctx'>         b) (optional) calibrate and set the mips_counter_frequency</div><div class='ctx'>  	    (only needed if you intended to use fixed_rate_gettimeoffset</div><div class='ctx'>  	     or use cpu counter as timer interrupt source)</div><div class='ctx'> </div><div class='del'>-  board_timer_setup() - </div><div class='add'>+  plat_timer_setup() -</div><div class='ctx'>  	a) (optional) over-write any choices made above by time_init().</div><div class='ctx'>  	b) machine specific code should setup the timer irqaction.</div><div class='ctx'>  	c) enable the timer interrupt</div><div class='head'>diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200<br/>index acb30c5dcff3..4f2a40f1dbc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/README.ipw2200?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/README.ipw2200</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/README.ipw2200?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/README.ipw2200</a></div><div class='hunk'>@@ -14,8 +14,8 @@ Copyright (C) 2004-2006, Intel Corporation</div><div class='ctx'> </div><div class='ctx'> README.ipw2200</div><div class='ctx'> </div><div class='del'>-Version: 1.0.8</div><div class='del'>-Date   : October 20, 2005</div><div class='add'>+Version: 1.1.2</div><div class='add'>+Date   : March 30, 2006</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Index</div><div class='hunk'>@@ -103,7 +103,7 @@ file.</div><div class='ctx'> </div><div class='ctx'> 1.1. Overview of Features</div><div class='ctx'> -----------------------------------------------</div><div class='del'>-The current release (1.0.8) supports the following features:</div><div class='add'>+The current release (1.1.2) supports the following features:</div><div class='ctx'> </div><div class='ctx'> + BSS mode (Infrastructure, Managed)</div><div class='ctx'> + IBSS mode (Ad-Hoc)</div><div class='hunk'>@@ -247,8 +247,8 @@ and can set the contents via echo.  For example:</div><div class='ctx'> % cat /sys/bus/pci/drivers/ipw2200/debug_level</div><div class='ctx'> </div><div class='ctx'> Will report the current debug level of the driver's logging subsystem </div><div class='del'>-(only available if CONFIG_IPW_DEBUG was configured when the driver was </div><div class='del'>-built).</div><div class='add'>+(only available if CONFIG_IPW2200_DEBUG was configured when the driver</div><div class='add'>+was built).</div><div class='ctx'> </div><div class='ctx'> You can set the debug level via:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt<br/>index 8d8b4e5ea184..afac780445cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/bonding.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/bonding.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/bonding.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/bonding.txt</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> </div><div class='ctx'> 		Linux Ethernet Bonding Driver HOWTO</div><div class='ctx'> </div><div class='del'>-		Latest update: 21 June 2005</div><div class='add'>+		Latest update: 24 April 2006</div><div class='ctx'> </div><div class='ctx'> Initial release : Thomas Davis &lt;tadavis at lbl.gov&gt;</div><div class='ctx'> Corrections, HA extensions : 2000/10/03-15 :</div><div class='hunk'>@@ -12,6 +12,8 @@ Corrections, HA extensions : 2000/10/03-15 :</div><div class='ctx'>   - Jay Vosburgh &lt;fubar at us dot ibm dot com&gt;</div><div class='ctx'> </div><div class='ctx'> Reorganized and updated Feb 2005 by Jay Vosburgh</div><div class='add'>+Added Sysfs information: 2006/04/24</div><div class='add'>+  - Mitch Williams &lt;mitch.a.williams at intel.com&gt;</div><div class='ctx'> </div><div class='ctx'> Introduction</div><div class='ctx'> ============</div><div class='hunk'>@@ -38,61 +40,62 @@ Table of Contents</div><div class='ctx'> 2. Bonding Driver Options</div><div class='ctx'> </div><div class='ctx'> 3. Configuring Bonding Devices</div><div class='del'>-3.1	Configuration with sysconfig support</div><div class='del'>-3.1.1		Using DHCP with sysconfig</div><div class='del'>-3.1.2		Configuring Multiple Bonds with sysconfig</div><div class='del'>-3.2	Configuration with initscripts support</div><div class='del'>-3.2.1		Using DHCP with initscripts</div><div class='del'>-3.2.2		Configuring Multiple Bonds with initscripts</div><div class='del'>-3.3	Configuring Bonding Manually</div><div class='add'>+3.1	Configuration with Sysconfig Support</div><div class='add'>+3.1.1		Using DHCP with Sysconfig</div><div class='add'>+3.1.2		Configuring Multiple Bonds with Sysconfig</div><div class='add'>+3.2	Configuration with Initscripts Support</div><div class='add'>+3.2.1		Using DHCP with Initscripts</div><div class='add'>+3.2.2		Configuring Multiple Bonds with Initscripts</div><div class='add'>+3.3	Configuring Bonding Manually with Ifenslave</div><div class='ctx'> 3.3.1		Configuring Multiple Bonds Manually</div><div class='add'>+3.4	Configuring Bonding Manually via Sysfs</div><div class='ctx'> </div><div class='del'>-5. Querying Bonding Configuration</div><div class='del'>-5.1	Bonding Configuration</div><div class='del'>-5.2	Network Configuration</div><div class='add'>+4. Querying Bonding Configuration</div><div class='add'>+4.1	Bonding Configuration</div><div class='add'>+4.2	Network Configuration</div><div class='ctx'> </div><div class='del'>-6. Switch Configuration</div><div class='add'>+5. Switch Configuration</div><div class='ctx'> </div><div class='del'>-7. 802.1q VLAN Support</div><div class='add'>+6. 802.1q VLAN Support</div><div class='ctx'> </div><div class='del'>-8. Link Monitoring</div><div class='del'>-8.1	ARP Monitor Operation</div><div class='del'>-8.2	Configuring Multiple ARP Targets</div><div class='del'>-8.3	MII Monitor Operation</div><div class='add'>+7. Link Monitoring</div><div class='add'>+7.1	ARP Monitor Operation</div><div class='add'>+7.2	Configuring Multiple ARP Targets</div><div class='add'>+7.3	MII Monitor Operation</div><div class='ctx'> </div><div class='del'>-9. Potential Trouble Sources</div><div class='del'>-9.1	Adventures in Routing</div><div class='del'>-9.2	Ethernet Device Renaming</div><div class='del'>-9.3	Painfully Slow Or No Failed Link Detection By Miimon</div><div class='add'>+8. Potential Trouble Sources</div><div class='add'>+8.1	Adventures in Routing</div><div class='add'>+8.2	Ethernet Device Renaming</div><div class='add'>+8.3	Painfully Slow Or No Failed Link Detection By Miimon</div><div class='ctx'> </div><div class='del'>-10. SNMP agents</div><div class='add'>+9. SNMP agents</div><div class='ctx'> </div><div class='del'>-11. Promiscuous mode</div><div class='add'>+10. Promiscuous mode</div><div class='ctx'> </div><div class='del'>-12. Configuring Bonding for High Availability</div><div class='del'>-12.1	High Availability in a Single Switch Topology</div><div class='del'>-12.2	High Availability in a Multiple Switch Topology</div><div class='del'>-12.2.1		HA Bonding Mode Selection for Multiple Switch Topology</div><div class='del'>-12.2.2		HA Link Monitoring for Multiple Switch Topology</div><div class='add'>+11. Configuring Bonding for High Availability</div><div class='add'>+11.1	High Availability in a Single Switch Topology</div><div class='add'>+11.2	High Availability in a Multiple Switch Topology</div><div class='add'>+11.2.1		HA Bonding Mode Selection for Multiple Switch Topology</div><div class='add'>+11.2.2		HA Link Monitoring for Multiple Switch Topology</div><div class='ctx'> </div><div class='del'>-13. Configuring Bonding for Maximum Throughput</div><div class='del'>-13.1	Maximum Throughput in a Single Switch Topology</div><div class='del'>-13.1.1		MT Bonding Mode Selection for Single Switch Topology</div><div class='del'>-13.1.2		MT Link Monitoring for Single Switch Topology</div><div class='del'>-13.2	Maximum Throughput in a Multiple Switch Topology</div><div class='del'>-13.2.1		MT Bonding Mode Selection for Multiple Switch Topology</div><div class='del'>-13.2.2		MT Link Monitoring for Multiple Switch Topology</div><div class='add'>+12. Configuring Bonding for Maximum Throughput</div><div class='add'>+12.1	Maximum Throughput in a Single Switch Topology</div><div class='add'>+12.1.1		MT Bonding Mode Selection for Single Switch Topology</div><div class='add'>+12.1.2		MT Link Monitoring for Single Switch Topology</div><div class='add'>+12.2	Maximum Throughput in a Multiple Switch Topology</div><div class='add'>+12.2.1		MT Bonding Mode Selection for Multiple Switch Topology</div><div class='add'>+12.2.2		MT Link Monitoring for Multiple Switch Topology</div><div class='ctx'> </div><div class='del'>-14. Switch Behavior Issues</div><div class='del'>-14.1	Link Establishment and Failover Delays</div><div class='del'>-14.2	Duplicated Incoming Packets</div><div class='add'>+13. Switch Behavior Issues</div><div class='add'>+13.1	Link Establishment and Failover Delays</div><div class='add'>+13.2	Duplicated Incoming Packets</div><div class='ctx'> </div><div class='del'>-15. Hardware Specific Considerations</div><div class='del'>-15.1	IBM BladeCenter</div><div class='add'>+14. Hardware Specific Considerations</div><div class='add'>+14.1	IBM BladeCenter</div><div class='ctx'> </div><div class='del'>-16. Frequently Asked Questions</div><div class='add'>+15. Frequently Asked Questions</div><div class='ctx'> </div><div class='del'>-17. Resources and Links</div><div class='add'>+16. Resources and Links</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1. Bonding Driver Installation</div><div class='hunk'>@@ -156,6 +159,9 @@ you're trying to build it for.  Some distros (e.g., Red Hat from 7.1</div><div class='ctx'> onwards) do not have /usr/include/linux symbolically linked to the</div><div class='ctx'> default kernel source include directory.</div><div class='ctx'> </div><div class='add'>+SECOND IMPORTANT NOTE:</div><div class='add'>+	If you plan to configure bonding using sysfs, you do not need</div><div class='add'>+to use ifenslave.</div><div class='ctx'> </div><div class='ctx'> 2. Bonding Driver Options</div><div class='ctx'> =========================</div><div class='hunk'>@@ -270,7 +276,7 @@ mode</div><div class='ctx'> 		In bonding version 2.6.2 or later, when a failover</div><div class='ctx'> 		occurs in active-backup mode, bonding will issue one</div><div class='ctx'> 		or more gratuitous ARPs on the newly active slave.</div><div class='del'>-		One gratutious ARP is issued for the bonding master</div><div class='add'>+		One gratuitous ARP is issued for the bonding master</div><div class='ctx'> 		interface and each VLAN interfaces configured above</div><div class='ctx'> 		it, provided that the interface has at least one IP</div><div class='ctx'> 		address configured.  Gratuitous ARPs issued for VLAN</div><div class='hunk'>@@ -377,7 +383,7 @@ mode</div><div class='ctx'> 		When a link is reconnected or a new slave joins the</div><div class='ctx'> 		bond the receive traffic is redistributed among all</div><div class='ctx'> 		active slaves in the bond by initiating ARP Replies</div><div class='del'>-		with the selected mac address to each of the</div><div class='add'>+		with the selected MAC address to each of the</div><div class='ctx'> 		clients. The updelay parameter (detailed below) must</div><div class='ctx'> 		be set to a value equal or greater than the switch's</div><div class='ctx'> 		forwarding delay so that the ARP Replies sent to the</div><div class='hunk'>@@ -498,11 +504,12 @@ not exist, and the layer2 policy is the only policy.</div><div class='ctx'> 3. Configuring Bonding Devices</div><div class='ctx'> ==============================</div><div class='ctx'> </div><div class='del'>-	There are, essentially, two methods for configuring bonding:</div><div class='del'>-with support from the distro's network initialization scripts, and</div><div class='del'>-without.  Distros generally use one of two packages for the network</div><div class='del'>-initialization scripts: initscripts or sysconfig.  Recent versions of</div><div class='del'>-these packages have support for bonding, while older versions do not.</div><div class='add'>+	You can configure bonding using either your distro's network</div><div class='add'>+initialization scripts, or manually using either ifenslave or the</div><div class='add'>+sysfs interface.  Distros generally use one of two packages for the</div><div class='add'>+network initialization scripts: initscripts or sysconfig.  Recent</div><div class='add'>+versions of these packages have support for bonding, while older</div><div class='add'>+versions do not.</div><div class='ctx'> </div><div class='ctx'> 	We will first describe the options for configuring bonding for</div><div class='ctx'> distros using versions of initscripts and sysconfig with full or</div><div class='hunk'>@@ -530,7 +537,7 @@ $ grep ifenslave /sbin/ifup</div><div class='ctx'> 	If this returns any matches, then your initscripts or</div><div class='ctx'> sysconfig has support for bonding.</div><div class='ctx'> </div><div class='del'>-3.1 Configuration with sysconfig support</div><div class='add'>+3.1 Configuration with Sysconfig Support</div><div class='ctx'> ----------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	This section applies to distros using a version of sysconfig</div><div class='hunk'>@@ -538,7 +545,7 @@ with bonding support, for example, SuSE Linux Enterprise Server 9.</div><div class='ctx'> </div><div class='ctx'> 	SuSE SLES 9's networking configuration system does support</div><div class='ctx'> bonding, however, at this writing, the YaST system configuration</div><div class='del'>-frontend does not provide any means to work with bonding devices.</div><div class='add'>+front end does not provide any means to work with bonding devices.</div><div class='ctx'> Bonding devices can be managed by hand, however, as follows.</div><div class='ctx'> </div><div class='ctx'> 	First, if they have not already been configured, configure the</div><div class='hunk'>@@ -660,7 +667,7 @@ format can be found in an example ifcfg template file:</div><div class='ctx'> 	Note that the template does not document the various BONDING_</div><div class='ctx'> settings described above, but does describe many of the other options.</div><div class='ctx'> </div><div class='del'>-3.1.1 Using DHCP with sysconfig</div><div class='add'>+3.1.1 Using DHCP with Sysconfig</div><div class='ctx'> -------------------------------</div><div class='ctx'> </div><div class='ctx'> 	Under sysconfig, configuring a device with BOOTPROTO='dhcp'</div><div class='hunk'>@@ -670,7 +677,7 @@ attempt to obtain the device address from DHCP prior to adding any of</div><div class='ctx'> the slave devices.  Without active slaves, the DHCP requests are not</div><div class='ctx'> sent to the network.</div><div class='ctx'> </div><div class='del'>-3.1.2 Configuring Multiple Bonds with sysconfig</div><div class='add'>+3.1.2 Configuring Multiple Bonds with Sysconfig</div><div class='ctx'> -----------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	The sysconfig network initialization system is capable of</div><div class='hunk'>@@ -685,7 +692,7 @@ ifcfg-bondX files.</div><div class='ctx'> options in the ifcfg-bondX file, it is not necessary to add them to</div><div class='ctx'> the system /etc/modules.conf or /etc/modprobe.conf configuration file.</div><div class='ctx'> </div><div class='del'>-3.2 Configuration with initscripts support</div><div class='add'>+3.2 Configuration with Initscripts Support</div><div class='ctx'> ------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	This section applies to distros using a version of initscripts</div><div class='hunk'>@@ -756,7 +763,7 @@ options for your configuration.</div><div class='ctx'> will restart the networking subsystem and your bond link should be now</div><div class='ctx'> up and running.</div><div class='ctx'> </div><div class='del'>-3.2.1 Using DHCP with initscripts</div><div class='add'>+3.2.1 Using DHCP with Initscripts</div><div class='ctx'> ---------------------------------</div><div class='ctx'> </div><div class='ctx'> 	Recent versions of initscripts (the version supplied with</div><div class='hunk'>@@ -768,7 +775,7 @@ above, except replace the line "BOOTPROTO=none" with "BOOTPROTO=dhcp"</div><div class='ctx'> and add a line consisting of "TYPE=Bonding".  Note that the TYPE value</div><div class='ctx'> is case sensitive.</div><div class='ctx'> </div><div class='del'>-3.2.2 Configuring Multiple Bonds with initscripts</div><div class='add'>+3.2.2 Configuring Multiple Bonds with Initscripts</div><div class='ctx'> -------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	At this writing, the initscripts package does not directly</div><div class='hunk'>@@ -784,8 +791,8 @@ Fedora Core kernels, and has been seen on RHEL 4 as well.  On kernels</div><div class='ctx'> exhibiting this problem, it will be impossible to configure multiple</div><div class='ctx'> bonds with differing parameters.</div><div class='ctx'> </div><div class='del'>-3.3 Configuring Bonding Manually</div><div class='del'>---------------------------------</div><div class='add'>+3.3 Configuring Bonding Manually with Ifenslave</div><div class='add'>+-----------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	This section applies to distros whose network initialization</div><div class='ctx'> scripts (the sysconfig or initscripts package) do not have specific</div><div class='hunk'>@@ -889,11 +896,139 @@ install bond1 /sbin/modprobe --ignore-install bonding -o bond1 \</div><div class='ctx'> 	This may be repeated any number of times, specifying a new and</div><div class='ctx'> unique name in place of bond1 for each subsequent instance.</div><div class='ctx'> </div><div class='add'>+3.4 Configuring Bonding Manually via Sysfs</div><div class='add'>+------------------------------------------</div><div class='add'>+</div><div class='add'>+	Starting with version 3.0, Channel Bonding may be configured</div><div class='add'>+via the sysfs interface.  This interface allows dynamic configuration</div><div class='add'>+of all bonds in the system without unloading the module.  It also</div><div class='add'>+allows for adding and removing bonds at runtime.  Ifenslave is no</div><div class='add'>+longer required, though it is still supported.</div><div class='add'>+</div><div class='add'>+	Use of the sysfs interface allows you to use multiple bonds</div><div class='add'>+with different configurations without having to reload the module.</div><div class='add'>+It also allows you to use multiple, differently configured bonds when</div><div class='add'>+bonding is compiled into the kernel.</div><div class='add'>+</div><div class='add'>+	You must have the sysfs filesystem mounted to configure</div><div class='add'>+bonding this way.  The examples in this document assume that you</div><div class='add'>+are using the standard mount point for sysfs, e.g. /sys.  If your</div><div class='add'>+sysfs filesystem is mounted elsewhere, you will need to adjust the</div><div class='add'>+example paths accordingly.</div><div class='add'>+</div><div class='add'>+Creating and Destroying Bonds</div><div class='add'>+-----------------------------</div><div class='add'>+To add a new bond foo:</div><div class='add'>+# echo +foo &gt; /sys/class/net/bonding_masters</div><div class='add'>+</div><div class='add'>+To remove an existing bond bar:</div><div class='add'>+# echo -bar &gt; /sys/class/net/bonding_masters</div><div class='add'>+</div><div class='add'>+To show all existing bonds:</div><div class='add'>+# cat /sys/class/net/bonding_masters</div><div class='add'>+</div><div class='add'>+NOTE: due to 4K size limitation of sysfs files, this list may be</div><div class='add'>+truncated if you have more than a few hundred bonds.  This is unlikely</div><div class='add'>+to occur under normal operating conditions.</div><div class='add'>+</div><div class='add'>+Adding and Removing Slaves</div><div class='add'>+--------------------------</div><div class='add'>+	Interfaces may be enslaved to a bond using the file</div><div class='add'>+/sys/class/net/&lt;bond&gt;/bonding/slaves.  The semantics for this file</div><div class='add'>+are the same as for the bonding_masters file.</div><div class='add'>+</div><div class='add'>+To enslave interface eth0 to bond bond0:</div><div class='add'>+# ifconfig bond0 up</div><div class='add'>+# echo +eth0 &gt; /sys/class/net/bond0/bonding/slaves</div><div class='add'>+</div><div class='add'>+To free slave eth0 from bond bond0:</div><div class='add'>+# echo -eth0 &gt; /sys/class/net/bond0/bonding/slaves</div><div class='add'>+</div><div class='add'>+	NOTE: The bond must be up before slaves can be added.  All</div><div class='add'>+slaves are freed when the interface is brought down.</div><div class='add'>+</div><div class='add'>+	When an interface is enslaved to a bond, symlinks between the</div><div class='add'>+two are created in the sysfs filesystem.  In this case, you would get</div><div class='add'>+/sys/class/net/bond0/slave_eth0 pointing to /sys/class/net/eth0, and</div><div class='add'>+/sys/class/net/eth0/master pointing to /sys/class/net/bond0.</div><div class='add'>+</div><div class='add'>+	This means that you can tell quickly whether or not an</div><div class='add'>+interface is enslaved by looking for the master symlink.  Thus:</div><div class='add'>+# echo -eth0 &gt; /sys/class/net/eth0/master/bonding/slaves</div><div class='add'>+will free eth0 from whatever bond it is enslaved to, regardless of</div><div class='add'>+the name of the bond interface.</div><div class='add'>+</div><div class='add'>+Changing a Bond's Configuration</div><div class='add'>+-------------------------------</div><div class='add'>+	Each bond may be configured individually by manipulating the</div><div class='add'>+files located in /sys/class/net/&lt;bond name&gt;/bonding</div><div class='add'>+</div><div class='add'>+	The names of these files correspond directly with the command-</div><div class='add'>+line parameters described elsewhere in in this file, and, with the</div><div class='add'>+exception of arp_ip_target, they accept the same values.  To see the</div><div class='add'>+current setting, simply cat the appropriate file.</div><div class='add'>+</div><div class='add'>+	A few examples will be given here; for specific usage</div><div class='add'>+guidelines for each parameter, see the appropriate section in this</div><div class='add'>+document.</div><div class='add'>+</div><div class='add'>+To configure bond0 for balance-alb mode:</div><div class='add'>+# ifconfig bond0 down</div><div class='add'>+# echo 6 &gt; /sys/class/net/bond0/bonding/mode</div><div class='add'>+ - or -</div><div class='add'>+# echo balance-alb &gt; /sys/class/net/bond0/bonding/mode</div><div class='add'>+	NOTE: The bond interface must be down before the mode can be</div><div class='add'>+changed.</div><div class='add'>+</div><div class='add'>+To enable MII monitoring on bond0 with a 1 second interval:</div><div class='add'>+# echo 1000 &gt; /sys/class/net/bond0/bonding/miimon</div><div class='add'>+	NOTE: If ARP monitoring is enabled, it will disabled when MII</div><div class='add'>+monitoring is enabled, and vice-versa.</div><div class='add'>+</div><div class='add'>+To add ARP targets:</div><div class='add'>+# echo +192.168.0.100 &gt; /sys/class/net/bond0/bonding/arp_ip_target</div><div class='add'>+# echo +192.168.0.101 &gt; /sys/class/net/bond0/bonding/arp_ip_target</div><div class='add'>+	NOTE:  up to 10 target addresses may be specified.</div><div class='add'>+</div><div class='add'>+To remove an ARP target:</div><div class='add'>+# echo -192.168.0.100 &gt; /sys/class/net/bond0/bonding/arp_ip_target</div><div class='add'>+</div><div class='add'>+Example Configuration</div><div class='add'>+---------------------</div><div class='add'>+	We begin with the same example that is shown in section 3.3,</div><div class='add'>+executed with sysfs, and without using ifenslave.</div><div class='add'>+</div><div class='add'>+	To make a simple bond of two e100 devices (presumed to be eth0</div><div class='add'>+and eth1), and have it persist across reboots, edit the appropriate</div><div class='add'>+file (/etc/init.d/boot.local or /etc/rc.d/rc.local), and add the</div><div class='add'>+following:</div><div class='add'>+</div><div class='add'>+modprobe bonding</div><div class='add'>+modprobe e100</div><div class='add'>+echo balance-alb &gt; /sys/class/net/bond0/bonding/mode</div><div class='add'>+ifconfig bond0 192.168.1.1 netmask 255.255.255.0 up</div><div class='add'>+echo 100 &gt; /sys/class/net/bond0/bonding/miimon</div><div class='add'>+echo +eth0 &gt; /sys/class/net/bond0/bonding/slaves</div><div class='add'>+echo +eth1 &gt; /sys/class/net/bond0/bonding/slaves</div><div class='add'>+</div><div class='add'>+	To add a second bond, with two e1000 interfaces in</div><div class='add'>+active-backup mode, using ARP monitoring, add the following lines to</div><div class='add'>+your init script:</div><div class='add'>+</div><div class='add'>+modprobe e1000</div><div class='add'>+echo +bond1 &gt; /sys/class/net/bonding_masters</div><div class='add'>+echo active-backup &gt; /sys/class/net/bond1/bonding/mode</div><div class='add'>+ifconfig bond1 192.168.2.1 netmask 255.255.255.0 up</div><div class='add'>+echo +192.168.2.100 /sys/class/net/bond1/bonding/arp_ip_target</div><div class='add'>+echo 2000 &gt; /sys/class/net/bond1/bonding/arp_interval</div><div class='add'>+echo +eth2 &gt; /sys/class/net/bond1/bonding/slaves</div><div class='add'>+echo +eth3 &gt; /sys/class/net/bond1/bonding/slaves</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-5. Querying Bonding Configuration </div><div class='add'>+4. Querying Bonding Configuration </div><div class='ctx'> =================================</div><div class='ctx'> </div><div class='del'>-5.1 Bonding Configuration</div><div class='add'>+4.1 Bonding Configuration</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> 	Each bonding device has a read-only file residing in the</div><div class='hunk'>@@ -923,7 +1058,7 @@ generally as follows:</div><div class='ctx'> 	The precise format and contents will change depending upon the</div><div class='ctx'> bonding configuration, state, and version of the bonding driver.</div><div class='ctx'> </div><div class='del'>-5.2 Network configuration</div><div class='add'>+4.2 Network configuration</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> 	The network configuration can be inspected using the ifconfig</div><div class='hunk'>@@ -958,7 +1093,7 @@ eth1      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4</div><div class='ctx'>           collisions:0 txqueuelen:100</div><div class='ctx'>           Interrupt:9 Base address:0x1400</div><div class='ctx'> </div><div class='del'>-6. Switch Configuration</div><div class='add'>+5. Switch Configuration</div><div class='ctx'> =======================</div><div class='ctx'> </div><div class='ctx'> 	For this section, "switch" refers to whatever system the</div><div class='hunk'>@@ -991,7 +1126,7 @@ transmit policy for an EtherChannel group; all three will interoperate</div><div class='ctx'> with another EtherChannel group.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-7. 802.1q VLAN Support</div><div class='add'>+6. 802.1q VLAN Support</div><div class='ctx'> ======================</div><div class='ctx'> </div><div class='ctx'> 	It is possible to configure VLAN devices over a bond interface</div><div class='hunk'>@@ -1042,7 +1177,7 @@ underlying device -- i.e. the bonding interface -- to promiscuous</div><div class='ctx'> mode, which might not be what you want.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-8. Link Monitoring</div><div class='add'>+7. Link Monitoring</div><div class='ctx'> ==================</div><div class='ctx'> </div><div class='ctx'> 	The bonding driver at present supports two schemes for</div><div class='hunk'>@@ -1053,7 +1188,7 @@ monitor.</div><div class='ctx'> bonding driver itself, it is not possible to enable both ARP and MII</div><div class='ctx'> monitoring simultaneously.</div><div class='ctx'> </div><div class='del'>-8.1 ARP Monitor Operation</div><div class='add'>+7.1 ARP Monitor Operation</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> 	The ARP monitor operates as its name suggests: it sends ARP</div><div class='hunk'>@@ -1071,7 +1206,7 @@ those slaves will stay down.  If networking monitoring (tcpdump, etc)</div><div class='ctx'> shows the ARP requests and replies on the network, then it may be that</div><div class='ctx'> your device driver is not updating last_rx and trans_start.</div><div class='ctx'> </div><div class='del'>-8.2 Configuring Multiple ARP Targets</div><div class='add'>+7.2 Configuring Multiple ARP Targets</div><div class='ctx'> ------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	While ARP monitoring can be done with just one target, it can</div><div class='hunk'>@@ -1094,7 +1229,7 @@ alias bond0 bonding</div><div class='ctx'> options bond0 arp_interval=60 arp_ip_target=192.168.0.100</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-8.3 MII Monitor Operation</div><div class='add'>+7.3 MII Monitor Operation</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> 	The MII monitor monitors only the carrier state of the local</div><div class='hunk'>@@ -1120,14 +1255,14 @@ does not support or had some error in processing both the MII register</div><div class='ctx'> and ethtool requests), then the MII monitor will assume the link is</div><div class='ctx'> up.</div><div class='ctx'> </div><div class='del'>-9. Potential Sources of Trouble</div><div class='add'>+8. Potential Sources of Trouble</div><div class='ctx'> ===============================</div><div class='ctx'> </div><div class='del'>-9.1 Adventures in Routing</div><div class='add'>+8.1 Adventures in Routing</div><div class='ctx'> -------------------------</div><div class='ctx'> </div><div class='ctx'> 	When bonding is configured, it is important that the slave</div><div class='del'>-devices not have routes that supercede routes of the master (or,</div><div class='add'>+devices not have routes that supersede routes of the master (or,</div><div class='ctx'> generally, not have routes at all).  For example, suppose the bonding</div><div class='ctx'> device bond0 has two slaves, eth0 and eth1, and the routing table is</div><div class='ctx'> as follows:</div><div class='hunk'>@@ -1154,11 +1289,11 @@ by the state of the routing table.</div><div class='ctx'> </div><div class='ctx'> 	The solution here is simply to insure that slaves do not have</div><div class='ctx'> routes of their own, and if for some reason they must, those routes do</div><div class='del'>-not supercede routes of their master.  This should generally be the</div><div class='add'>+not supersede routes of their master.  This should generally be the</div><div class='ctx'> case, but unusual configurations or errant manual or automatic static</div><div class='ctx'> route additions may cause trouble.</div><div class='ctx'> </div><div class='del'>-9.2 Ethernet Device Renaming</div><div class='add'>+8.2 Ethernet Device Renaming</div><div class='ctx'> ----------------------------</div><div class='ctx'> </div><div class='ctx'> 	On systems with network configuration scripts that do not</div><div class='hunk'>@@ -1207,7 +1342,7 @@ modprobe with --ignore-install to cause the normal action to then take</div><div class='ctx'> place.  Full documentation on this can be found in the modprobe.conf</div><div class='ctx'> and modprobe manual pages.</div><div class='ctx'> </div><div class='del'>-9.3. Painfully Slow Or No Failed Link Detection By Miimon</div><div class='add'>+8.3. Painfully Slow Or No Failed Link Detection By Miimon</div><div class='ctx'> ---------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	By default, bonding enables the use_carrier option, which</div><div class='hunk'>@@ -1235,7 +1370,7 @@ carrier state.  It has no way to determine the state of devices on or</div><div class='ctx'> beyond other ports of a switch, or if a switch is refusing to pass</div><div class='ctx'> traffic while still maintaining carrier on.</div><div class='ctx'> </div><div class='del'>-10. SNMP agents</div><div class='add'>+9. SNMP agents</div><div class='ctx'> ===============</div><div class='ctx'> </div><div class='ctx'> 	If running SNMP agents, the bonding driver should be loaded</div><div class='hunk'>@@ -1281,7 +1416,7 @@ ifDescr, the association between the IP address and IfIndex remains</div><div class='ctx'> and SNMP functions such as Interface_Scan_Next will report that</div><div class='ctx'> association.</div><div class='ctx'> </div><div class='del'>-11. Promiscuous mode</div><div class='add'>+10. Promiscuous mode</div><div class='ctx'> ====================</div><div class='ctx'> </div><div class='ctx'> 	When running network monitoring tools, e.g., tcpdump, it is</div><div class='hunk'>@@ -1308,7 +1443,7 @@ sending to peers that are unassigned or if the load is unbalanced.</div><div class='ctx'> the active slave changes (e.g., due to a link failure), the</div><div class='ctx'> promiscuous setting will be propagated to the new active slave.</div><div class='ctx'> </div><div class='del'>-12. Configuring Bonding for High Availability</div><div class='add'>+11. Configuring Bonding for High Availability</div><div class='ctx'> =============================================</div><div class='ctx'> </div><div class='ctx'> 	High Availability refers to configurations that provide</div><div class='hunk'>@@ -1318,7 +1453,7 @@ goal is to provide the maximum availability of network connectivity</div><div class='ctx'> (i.e., the network always works), even though other configurations</div><div class='ctx'> could provide higher throughput.</div><div class='ctx'> </div><div class='del'>-12.1 High Availability in a Single Switch Topology</div><div class='add'>+11.1 High Availability in a Single Switch Topology</div><div class='ctx'> --------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	If two hosts (or a host and a single switch) are directly</div><div class='hunk'>@@ -1332,7 +1467,7 @@ the load will be rebalanced across the remaining devices.</div><div class='ctx'> 	See Section 13, "Configuring Bonding for Maximum Throughput"</div><div class='ctx'> for information on configuring bonding with one peer device.</div><div class='ctx'> </div><div class='del'>-12.2 High Availability in a Multiple Switch Topology</div><div class='add'>+11.2 High Availability in a Multiple Switch Topology</div><div class='ctx'> ----------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	With multiple switches, the configuration of bonding and the</div><div class='hunk'>@@ -1359,7 +1494,7 @@ switches (ISL, or inter switch link), and multiple ports connecting to</div><div class='ctx'> the outside world ("port3" on each switch).  There is no technical</div><div class='ctx'> reason that this could not be extended to a third switch.</div><div class='ctx'> </div><div class='del'>-12.2.1 HA Bonding Mode Selection for Multiple Switch Topology</div><div class='add'>+11.2.1 HA Bonding Mode Selection for Multiple Switch Topology</div><div class='ctx'> -------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	In a topology such as the example above, the active-backup and</div><div class='hunk'>@@ -1381,7 +1516,7 @@ broadcast: This mode is really a special purpose mode, and is suitable</div><div class='ctx'> 	necessary for some specific one-way traffic to reach both</div><div class='ctx'> 	independent networks, then the broadcast mode may be suitable.</div><div class='ctx'> </div><div class='del'>-12.2.2 HA Link Monitoring Selection for Multiple Switch Topology</div><div class='add'>+11.2.2 HA Link Monitoring Selection for Multiple Switch Topology</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	The choice of link monitoring ultimately depends upon your</div><div class='hunk'>@@ -1402,10 +1537,10 @@ regardless of which switch is active, the ARP monitor has a suitable</div><div class='ctx'> target to query.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-13. Configuring Bonding for Maximum Throughput</div><div class='add'>+12. Configuring Bonding for Maximum Throughput</div><div class='ctx'> ==============================================</div><div class='ctx'> </div><div class='del'>-13.1 Maximizing Throughput in a Single Switch Topology</div><div class='add'>+12.1 Maximizing Throughput in a Single Switch Topology</div><div class='ctx'> ------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	In a single switch configuration, the best method to maximize</div><div class='hunk'>@@ -1476,7 +1611,7 @@ destination to make load balancing decisions.  The behavior of each</div><div class='ctx'> mode is described below.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-13.1.1 MT Bonding Mode Selection for Single Switch Topology</div><div class='add'>+12.1.1 MT Bonding Mode Selection for Single Switch Topology</div><div class='ctx'> -----------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	This configuration is the easiest to set up and to understand,</div><div class='hunk'>@@ -1607,7 +1742,7 @@ balance-alb: This mode is everything that balance-tlb is, and more.</div><div class='ctx'> 	device driver must support changing the hardware address while</div><div class='ctx'> 	the device is open.</div><div class='ctx'> </div><div class='del'>-13.1.2 MT Link Monitoring for Single Switch Topology</div><div class='add'>+12.1.2 MT Link Monitoring for Single Switch Topology</div><div class='ctx'> ----------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	The choice of link monitoring may largely depend upon which</div><div class='hunk'>@@ -1616,7 +1751,7 @@ support the use of the ARP monitor, and are thus restricted to using</div><div class='ctx'> the MII monitor (which does not provide as high a level of end to end</div><div class='ctx'> assurance as the ARP monitor).</div><div class='ctx'> </div><div class='del'>-13.2 Maximum Throughput in a Multiple Switch Topology</div><div class='add'>+12.2 Maximum Throughput in a Multiple Switch Topology</div><div class='ctx'> -----------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	Multiple switches may be utilized to optimize for throughput</div><div class='hunk'>@@ -1651,7 +1786,7 @@ a single 72 port switch.</div><div class='ctx'> can be equipped with an additional network device connected to an</div><div class='ctx'> external network; this host then additionally acts as a gateway.</div><div class='ctx'> </div><div class='del'>-13.2.1 MT Bonding Mode Selection for Multiple Switch Topology</div><div class='add'>+12.2.1 MT Bonding Mode Selection for Multiple Switch Topology</div><div class='ctx'> -------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	In actual practice, the bonding mode typically employed in</div><div class='hunk'>@@ -1664,7 +1799,7 @@ packets has arrived).  When employed in this fashion, the balance-rr</div><div class='ctx'> mode allows individual connections between two hosts to effectively</div><div class='ctx'> utilize greater than one interface's bandwidth.</div><div class='ctx'> </div><div class='del'>-13.2.2 MT Link Monitoring for Multiple Switch Topology</div><div class='add'>+12.2.2 MT Link Monitoring for Multiple Switch Topology</div><div class='ctx'> ------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	Again, in actual practice, the MII monitor is most often used</div><div class='hunk'>@@ -1674,10 +1809,10 @@ advantages over the MII monitor are mitigated by the volume of probes</div><div class='ctx'> needed as the number of systems involved grows (remember that each</div><div class='ctx'> host in the network is configured with bonding).</div><div class='ctx'> </div><div class='del'>-14. Switch Behavior Issues</div><div class='add'>+13. Switch Behavior Issues</div><div class='ctx'> ==========================</div><div class='ctx'> </div><div class='del'>-14.1 Link Establishment and Failover Delays</div><div class='add'>+13.1 Link Establishment and Failover Delays</div><div class='ctx'> -------------------------------------------</div><div class='ctx'> </div><div class='ctx'> 	Some switches exhibit undesirable behavior with regard to the</div><div class='hunk'>@@ -1712,7 +1847,7 @@ switches take a long time to go into backup mode, it may be desirable</div><div class='ctx'> to not activate a backup interface immediately after a link goes down.</div><div class='ctx'> Failover may be delayed via the downdelay bonding module option.</div><div class='ctx'> </div><div class='del'>-14.2 Duplicated Incoming Packets</div><div class='add'>+13.2 Duplicated Incoming Packets</div><div class='ctx'> --------------------------------</div><div class='ctx'> </div><div class='ctx'> 	It is not uncommon to observe a short burst of duplicated</div><div class='hunk'>@@ -1751,14 +1886,14 @@ behavior, it can be induced by clearing the MAC forwarding table (on</div><div class='ctx'> most Cisco switches, the privileged command "clear mac address-table</div><div class='ctx'> dynamic" will accomplish this).</div><div class='ctx'> </div><div class='del'>-15. Hardware Specific Considerations</div><div class='add'>+14. Hardware Specific Considerations</div><div class='ctx'> ====================================</div><div class='ctx'> </div><div class='ctx'> 	This section contains additional information for configuring</div><div class='ctx'> bonding on specific hardware platforms, or for interfacing bonding</div><div class='ctx'> with particular switches or other devices.</div><div class='ctx'> </div><div class='del'>-15.1 IBM BladeCenter</div><div class='add'>+14.1 IBM BladeCenter</div><div class='ctx'> --------------------</div><div class='ctx'> </div><div class='ctx'> 	This applies to the JS20 and similar systems.</div><div class='hunk'>@@ -1861,7 +1996,7 @@ bonding driver.</div><div class='ctx'> avoid fail-over delay issues when using bonding.</div><div class='ctx'> </div><div class='ctx'> 	</div><div class='del'>-16. Frequently Asked Questions</div><div class='add'>+15. Frequently Asked Questions</div><div class='ctx'> ==============================</div><div class='ctx'> </div><div class='ctx'> 1.  Is it SMP safe?</div><div class='hunk'>@@ -1925,7 +2060,7 @@ not have special switch requirements, but do need device drivers that</div><div class='ctx'> support specific features (described in the appropriate section under</div><div class='ctx'> module parameters, above).</div><div class='ctx'> </div><div class='del'>-	In 802.3ad mode, it works with with systems that support IEEE</div><div class='add'>+	In 802.3ad mode, it works with systems that support IEEE</div><div class='ctx'> 802.3ad Dynamic Link Aggregation.  Most managed and many unmanaged</div><div class='ctx'> switches currently available support 802.3ad.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt<br/>index f12007b80a46..d46338af6002 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/ip-sysctl.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/ip-sysctl.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/ip-sysctl.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/ip-sysctl.txt</a></div><div class='hunk'>@@ -362,6 +362,13 @@ tcp_workaround_signed_windows - BOOLEAN</div><div class='ctx'> 	not receive a window scaling option from them.</div><div class='ctx'> 	Default: 0</div><div class='ctx'> </div><div class='add'>+tcp_slow_start_after_idle - BOOLEAN</div><div class='add'>+	If set, provide RFC2861 behavior and time out the congestion</div><div class='add'>+	window after an idle period.  An idle period is defined at</div><div class='add'>+	the current RTO.  If unset, the congestion window will not</div><div class='add'>+	be timed out after an idle period.</div><div class='add'>+	Default: 1</div><div class='add'>+</div><div class='ctx'> IP Variables:</div><div class='ctx'> </div><div class='ctx'> ip_local_port_range - 2 INTEGERS</div><div class='head'>diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt<br/>new file mode 100644<br/>index 000000000000..4ccdbca03811<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/ipvs-sysctl.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/ipvs-sysctl.txt</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/proc/sys/net/ipv4/vs/* Variables:</div><div class='add'>+</div><div class='add'>+am_droprate - INTEGER</div><div class='add'>+        default 10</div><div class='add'>+</div><div class='add'>+        It sets the always mode drop rate, which is used in the mode 3</div><div class='add'>+        of the drop_rate defense.</div><div class='add'>+</div><div class='add'>+amemthresh - INTEGER</div><div class='add'>+        default 1024</div><div class='add'>+</div><div class='add'>+        It sets the available memory threshold (in pages), which is</div><div class='add'>+        used in the automatic modes of defense. When there is no</div><div class='add'>+        enough available memory, the respective strategy will be</div><div class='add'>+        enabled and the variable is automatically set to 2, otherwise</div><div class='add'>+        the strategy is disabled and the variable is  set  to 1.</div><div class='add'>+</div><div class='add'>+cache_bypass - BOOLEAN</div><div class='add'>+        0 - disabled (default)</div><div class='add'>+        not 0 - enabled</div><div class='add'>+</div><div class='add'>+        If it is enabled, forward packets to the original destination</div><div class='add'>+        directly when no cache server is available and destination</div><div class='add'>+        address is not local (iph-&gt;daddr is RTN_UNICAST). It is mostly</div><div class='add'>+        used in transparent web cache cluster.</div><div class='add'>+</div><div class='add'>+debug_level - INTEGER</div><div class='add'>+	0          - transmission error messages (default)</div><div class='add'>+	1          - non-fatal error messages</div><div class='add'>+	2          - configuration</div><div class='add'>+	3          - destination trash</div><div class='add'>+	4          - drop entry</div><div class='add'>+	5          - service lookup</div><div class='add'>+	6          - scheduling</div><div class='add'>+	7          - connection new/expire, lookup and synchronization</div><div class='add'>+	8          - state transition</div><div class='add'>+	9          - binding destination, template checks and applications</div><div class='add'>+	10         - IPVS packet transmission</div><div class='add'>+	11         - IPVS packet handling (ip_vs_in/ip_vs_out)</div><div class='add'>+	12 or more - packet traversal</div><div class='add'>+</div><div class='add'>+	Only available when IPVS is compiled with the CONFIG_IPVS_DEBUG</div><div class='add'>+</div><div class='add'>+	Higher debugging levels include the messages for lower debugging</div><div class='add'>+	levels, so setting debug level 2, includes level 0, 1 and 2</div><div class='add'>+	messages. Thus, logging becomes more and more verbose the higher</div><div class='add'>+	the level.</div><div class='add'>+</div><div class='add'>+drop_entry - INTEGER</div><div class='add'>+        0  - disabled (default)</div><div class='add'>+</div><div class='add'>+        The drop_entry defense is to randomly drop entries in the</div><div class='add'>+        connection hash table, just in order to collect back some</div><div class='add'>+        memory for new connections. In the current code, the</div><div class='add'>+        drop_entry procedure can be activated every second, then it</div><div class='add'>+        randomly scans 1/32 of the whole and drops entries that are in</div><div class='add'>+        the SYN-RECV/SYNACK state, which should be effective against</div><div class='add'>+        syn-flooding attack.</div><div class='add'>+</div><div class='add'>+        The valid values of drop_entry are from 0 to 3, where 0 means</div><div class='add'>+        that this strategy is always disabled, 1 and 2 mean automatic</div><div class='add'>+        modes (when there is no enough available memory, the strategy</div><div class='add'>+        is enabled and the variable is automatically set to 2,</div><div class='add'>+        otherwise the strategy is disabled and the variable is set to</div><div class='add'>+        1), and 3 means that that the strategy is always enabled.</div><div class='add'>+</div><div class='add'>+drop_packet - INTEGER</div><div class='add'>+        0  - disabled (default)</div><div class='add'>+</div><div class='add'>+        The drop_packet defense is designed to drop 1/rate packets</div><div class='add'>+        before forwarding them to real servers. If the rate is 1, then</div><div class='add'>+        drop all the incoming packets.</div><div class='add'>+</div><div class='add'>+        The value definition is the same as that of the drop_entry. In</div><div class='add'>+        the automatic mode, the rate is determined by the follow</div><div class='add'>+        formula: rate = amemthresh / (amemthresh - available_memory)</div><div class='add'>+        when available memory is less than the available memory</div><div class='add'>+        threshold. When the mode 3 is set, the always mode drop rate</div><div class='add'>+        is controlled by the /proc/sys/net/ipv4/vs/am_droprate.</div><div class='add'>+</div><div class='add'>+expire_nodest_conn - BOOLEAN</div><div class='add'>+        0 - disabled (default)</div><div class='add'>+        not 0 - enabled</div><div class='add'>+</div><div class='add'>+        The default value is 0, the load balancer will silently drop</div><div class='add'>+        packets when its destination server is not available. It may</div><div class='add'>+        be useful, when user-space monitoring program deletes the</div><div class='add'>+        destination server (because of server overload or wrong</div><div class='add'>+        detection) and add back the server later, and the connections</div><div class='add'>+        to the server can continue.</div><div class='add'>+</div><div class='add'>+        If this feature is enabled, the load balancer will expire the</div><div class='add'>+        connection immediately when a packet arrives and its</div><div class='add'>+        destination server is not available, then the client program</div><div class='add'>+        will be notified that the connection is closed. This is</div><div class='add'>+        equivalent to the feature some people requires to flush</div><div class='add'>+        connections when its destination is not available.</div><div class='add'>+</div><div class='add'>+expire_quiescent_template - BOOLEAN</div><div class='add'>+	0 - disabled (default)</div><div class='add'>+	not 0 - enabled</div><div class='add'>+</div><div class='add'>+	When set to a non-zero value, the load balancer will expire</div><div class='add'>+	persistent templates when the destination server is quiescent.</div><div class='add'>+	This may be useful, when a user makes a destination server</div><div class='add'>+	quiescent by setting its weight to 0 and it is desired that</div><div class='add'>+	subsequent otherwise persistent connections are sent to a</div><div class='add'>+	different destination server.  By default new persistent</div><div class='add'>+	connections are allowed to quiescent destination servers.</div><div class='add'>+</div><div class='add'>+	If this feature is enabled, the load balancer will expire the</div><div class='add'>+	persistence template if it is to be used to schedule a new</div><div class='add'>+	connection and the destination server is quiescent.</div><div class='add'>+</div><div class='add'>+nat_icmp_send - BOOLEAN</div><div class='add'>+        0 - disabled (default)</div><div class='add'>+        not 0 - enabled</div><div class='add'>+</div><div class='add'>+        It controls sending icmp error messages (ICMP_DEST_UNREACH)</div><div class='add'>+        for VS/NAT when the load balancer receives packets from real</div><div class='add'>+        servers but the connection entries don't exist.</div><div class='add'>+</div><div class='add'>+secure_tcp - INTEGER</div><div class='add'>+        0  - disabled (default)</div><div class='add'>+</div><div class='add'>+        The secure_tcp defense is to use a more complicated state</div><div class='add'>+        transition table and some possible short timeouts of each</div><div class='add'>+        state. In the VS/NAT, it delays the entering the ESTABLISHED</div><div class='add'>+        until the real server starts to send data and ACK packet</div><div class='add'>+        (after 3-way handshake).</div><div class='add'>+</div><div class='add'>+        The value definition is the same as that of drop_entry or</div><div class='add'>+        drop_packet.</div><div class='add'>+</div><div class='add'>+sync_threshold - INTEGER</div><div class='add'>+        default 3</div><div class='add'>+</div><div class='add'>+        It sets synchronization threshold, which is the minimum number</div><div class='add'>+        of incoming packets that a connection needs to receive before</div><div class='add'>+        the connection will be synchronized. A connection will be</div><div class='add'>+        synchronized, every time the number of its incoming packets</div><div class='add'>+        modulus 50 equals the threshold. The range of the threshold is</div><div class='add'>+        from 0 to 49.</div><div class='head'>diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt<br/>index 3c0a5ba614d7..847cedb238f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/netdevices.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/netdevices.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/netdevices.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/netdevices.txt</a></div><div class='hunk'>@@ -42,9 +42,9 @@ dev-&gt;get_stats:</div><div class='ctx'> 	Context: nominally process, but don't sleep inside an rwlock</div><div class='ctx'> </div><div class='ctx'> dev-&gt;hard_start_xmit:</div><div class='del'>-	Synchronization: dev-&gt;xmit_lock spinlock.</div><div class='add'>+	Synchronization: netif_tx_lock spinlock.</div><div class='ctx'> 	When the driver sets NETIF_F_LLTX in dev-&gt;features this will be</div><div class='del'>-	called without holding xmit_lock. In this case the driver </div><div class='add'>+	called without holding netif_tx_lock. In this case the driver</div><div class='ctx'> 	has to lock by itself when needed. It is recommended to use a try lock</div><div class='ctx'> 	for this and return -1 when the spin lock fails. </div><div class='ctx'> 	The locking there should also properly protect against </div><div class='hunk'>@@ -62,12 +62,12 @@ dev-&gt;hard_start_xmit:</div><div class='ctx'> 	  Only valid when NETIF_F_LLTX is set.</div><div class='ctx'> </div><div class='ctx'> dev-&gt;tx_timeout:</div><div class='del'>-	Synchronization: dev-&gt;xmit_lock spinlock.</div><div class='add'>+	Synchronization: netif_tx_lock spinlock.</div><div class='ctx'> 	Context: BHs disabled</div><div class='ctx'> 	Notes: netif_queue_stopped() is guaranteed true</div><div class='ctx'> </div><div class='ctx'> dev-&gt;set_multicast_list:</div><div class='del'>-	Synchronization: dev-&gt;xmit_lock spinlock.</div><div class='add'>+	Synchronization: netif_tx_lock spinlock.</div><div class='ctx'> 	Context: BHs disabled</div><div class='ctx'> </div><div class='ctx'> dev-&gt;poll:</div><div class='head'>diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt<br/>index 278771c9ad99..44f2f769e865 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/pktgen.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/pktgen.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/pktgen.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/pktgen.txt</a></div><div class='hunk'>@@ -74,7 +74,7 @@ Examples:</div><div class='ctx'>  pgset "pkt_size 9014"   sets packet size to 9014</div><div class='ctx'>  pgset "frags 5"         packet will consist of 5 fragments</div><div class='ctx'>  pgset "count 200000"    sets number of packets to send, set to zero</div><div class='del'>-                         for continious sends untill explicitl stopped.</div><div class='add'>+                         for continuous sends until explicitly stopped.</div><div class='ctx'> </div><div class='ctx'>  pgset "delay 5000"      adds delay to hard_start_xmit(). nanoseconds</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/networking/tuntap.txt b/Documentation/networking/tuntap.txt<br/>index 76750fb9151a..839cbb71388b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/networking/tuntap.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/networking/tuntap.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/networking/tuntap.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/networking/tuntap.txt</a></div><div class='hunk'>@@ -39,10 +39,13 @@ Copyright (C) 1999-2000 Maxim Krasnyansky &lt;max_mk@yahoo.com&gt;</div><div class='ctx'>      mknod /dev/net/tun c 10 200</div><div class='ctx'>   </div><div class='ctx'>   Set permissions:</div><div class='del'>-     e.g. chmod 0700 /dev/net/tun</div><div class='del'>-     if you want the device only accessible by root. Giving regular users the</div><div class='del'>-     right to assign network devices is NOT a good idea. Users could assign</div><div class='del'>-     bogus network interfaces to trick firewalls or administrators.</div><div class='add'>+     e.g. chmod 0666 /dev/net/tun</div><div class='add'>+     There's no harm in allowing the device to be accessible by non-root users,</div><div class='add'>+     since CAP_NET_ADMIN is required for creating network devices or for </div><div class='add'>+     connecting to network devices which aren't owned by the user in question.</div><div class='add'>+     If you want to create persistent devices and give ownership of them to </div><div class='add'>+     unprivileged users, then you need the /dev/net/tun device to be usable by</div><div class='add'>+     those users.</div><div class='ctx'> </div><div class='ctx'>   Driver module autoloading</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt<br/>index d56dc71d9430..3cc953cb288f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/nfsroot.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/nfsroot.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/nfsroot.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/nfsroot.txt</a></div><div class='hunk'>@@ -4,15 +4,16 @@ Mounting the root filesystem via NFS (nfsroot)</div><div class='ctx'> Written 1996 by Gero Kuhlmann &lt;gero@gkminix.han.de&gt;</div><div class='ctx'> Updated 1997 by Martin Mares &lt;mj@atrey.karlin.mff.cuni.cz&gt;</div><div class='ctx'> Updated 2006 by Nico Schottelius &lt;nico-kernel-nfsroot@schottelius.org&gt;</div><div class='add'>+Updated 2006 by Horms &lt;horms@verge.net.au&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-If you want to use a diskless system, as an X-terminal or printer</div><div class='del'>-server for example, you have to put your root filesystem onto a</div><div class='del'>-non-disk device. This can either be a ramdisk (see initrd.txt in</div><div class='del'>-this directory for further information) or a filesystem mounted</div><div class='del'>-via NFS. The following text describes on how to use NFS for the</div><div class='del'>-root filesystem. For the rest of this text 'client' means the</div><div class='add'>+In order to use a diskless system, such as an X-terminal or printer server</div><div class='add'>+for example, it is necessary for the root filesystem to be present on a</div><div class='add'>+non-disk device. This may be an initramfs (see Documentation/filesystems/</div><div class='add'>+ramfs-rootfs-initramfs.txt), a ramdisk (see Documenation/initrd.txt) or a</div><div class='add'>+filesystem mounted via NFS. The following text describes on how to use NFS</div><div class='add'>+for the root filesystem. For the rest of this text 'client' means the</div><div class='ctx'> diskless system, and 'server' means the NFS server.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -21,11 +22,13 @@ diskless system, and 'server' means the NFS server.</div><div class='ctx'> 1.) Enabling nfsroot capabilities</div><div class='ctx'>     -----------------------------</div><div class='ctx'> </div><div class='del'>-In order to use nfsroot you have to select support for NFS during</div><div class='del'>-kernel configuration. Note that NFS cannot be loaded as a module</div><div class='del'>-in this case. The configuration script will then ask you whether</div><div class='del'>-you want to use nfsroot, and if yes what kind of auto configuration</div><div class='del'>-system you want to use. Selecting both BOOTP and RARP is safe.</div><div class='add'>+In order to use nfsroot, NFS client support needs to be selected as</div><div class='add'>+built-in during configuration. Once this has been selected, the nfsroot</div><div class='add'>+option will become available, which should also be selected.</div><div class='add'>+</div><div class='add'>+In the networking options, kernel level autoconfiguration can be selected,</div><div class='add'>+along with the types of autoconfiguration to support. Selecting all of</div><div class='add'>+DHCP, BOOTP and RARP is safe.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -33,11 +36,10 @@ system you want to use. Selecting both BOOTP and RARP is safe.</div><div class='ctx'> 2.) Kernel command line</div><div class='ctx'>     -------------------</div><div class='ctx'> </div><div class='del'>-When the kernel has been loaded by a boot loader (either by loadlin,</div><div class='del'>-LILO or a network boot program) it has to be told what root fs device</div><div class='del'>-to use, and where to find the server and the name of the directory</div><div class='del'>-on the server to mount as root. This can be established by a couple</div><div class='del'>-of kernel command line parameters:</div><div class='add'>+When the kernel has been loaded by a boot loader (see below) it needs to be</div><div class='add'>+told what root fs device to use. And in the case of nfsroot, where to find</div><div class='add'>+both the server and the name of the directory on the server to mount as root.</div><div class='add'>+This can be established using the following kernel command line parameters:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> root=/dev/nfs</div><div class='hunk'>@@ -49,23 +51,21 @@ root=/dev/nfs</div><div class='ctx'> </div><div class='ctx'> nfsroot=[&lt;server-ip&gt;:]&lt;root-dir&gt;[,&lt;nfs-options&gt;]</div><div class='ctx'> </div><div class='del'>-  If the `nfsroot' parameter is NOT given on the command line, the default</div><div class='del'>-  "/tftpboot/%s" will be used.</div><div class='add'>+  If the `nfsroot' parameter is NOT given on the command line,</div><div class='add'>+  the default "/tftpboot/%s" will be used.</div><div class='ctx'> </div><div class='del'>-  &lt;server-ip&gt;	Specifies the IP address of the NFS server. If this field</div><div class='del'>-		is not given, the default address as determined by the</div><div class='del'>-		`ip' variable (see below) is used. One use of this</div><div class='del'>-		parameter is for example to allow using different servers</div><div class='del'>-		for RARP and NFS. Usually you can leave this blank.</div><div class='add'>+  &lt;server-ip&gt;	Specifies the IP address of the NFS server.</div><div class='add'>+		The default address is determined by the `ip' parameter</div><div class='add'>+		(see below). This parameter allows the use of different</div><div class='add'>+		servers for IP autoconfiguration and NFS.</div><div class='ctx'> </div><div class='del'>-  &lt;root-dir&gt;	Name of the directory on the server to mount as root. If</div><div class='del'>-		there is a "%s" token in the string, the token will be</div><div class='del'>-		replaced by the ASCII-representation of the client's IP</div><div class='del'>-		address.</div><div class='add'>+  &lt;root-dir&gt;	Name of the directory on the server to mount as root.</div><div class='add'>+		If there is a "%s" token in the string, it will be</div><div class='add'>+		replaced by the ASCII-representation of the client's</div><div class='add'>+		IP address.</div><div class='ctx'> </div><div class='ctx'>   &lt;nfs-options&gt;	Standard NFS options. All options are separated by commas.</div><div class='del'>-		If the options field is not given, the following defaults</div><div class='del'>-		will be used:</div><div class='add'>+		The following defaults are used:</div><div class='ctx'> 			port		= as given by server portmap daemon</div><div class='ctx'> 			rsize		= 1024</div><div class='ctx'> 			wsize		= 1024</div><div class='hunk'>@@ -81,129 +81,174 @@ nfsroot=[&lt;server-ip&gt;:]&lt;root-dir&gt;[,&lt;nfs-options&gt;]</div><div class='ctx'> ip=&lt;client-ip&gt;:&lt;server-ip&gt;:&lt;gw-ip&gt;:&lt;netmask&gt;:&lt;hostname&gt;:&lt;device&gt;:&lt;autoconf&gt;</div><div class='ctx'> </div><div class='ctx'>   This parameter tells the kernel how to configure IP addresses of devices</div><div class='del'>-  and also how to set up the IP routing table. It was originally called `nfsaddrs',</div><div class='del'>-  but now the boot-time IP configuration works independently of NFS, so it</div><div class='del'>-  was renamed to `ip' and the old name remained as an alias for compatibility</div><div class='del'>-  reasons.</div><div class='add'>+  and also how to set up the IP routing table. It was originally called</div><div class='add'>+  `nfsaddrs', but now the boot-time IP configuration works independently of</div><div class='add'>+  NFS, so it was renamed to `ip' and the old name remained as an alias for</div><div class='add'>+  compatibility reasons.</div><div class='ctx'> </div><div class='ctx'>   If this parameter is missing from the kernel command line, all fields are</div><div class='ctx'>   assumed to be empty, and the defaults mentioned below apply. In general</div><div class='del'>-  this means that the kernel tries to configure everything using both</div><div class='del'>-  RARP and BOOTP (depending on what has been enabled during kernel confi-</div><div class='del'>-  guration, and if both what protocol answer got in first).</div><div class='add'>+  this means that the kernel tries to configure everything using</div><div class='add'>+  autoconfiguration.</div><div class='add'>+</div><div class='add'>+  The &lt;autoconf&gt; parameter can appear alone as the value to the `ip'</div><div class='add'>+  parameter (without all the ':' characters before) in which case auto-</div><div class='add'>+  configuration is used.</div><div class='add'>+</div><div class='add'>+  &lt;client-ip&gt;	IP address of the client.</div><div class='ctx'> </div><div class='del'>-  &lt;client-ip&gt;	IP address of the client. If empty, the address will either</div><div class='del'>-		be determined by RARP or BOOTP. What protocol is used de-</div><div class='del'>-		pends on what has been enabled during kernel configuration</div><div class='del'>-		and on the &lt;autoconf&gt; parameter. If this parameter is not</div><div class='del'>-		empty, neither RARP nor BOOTP will be used.</div><div class='add'>+  		Default:  Determined using autoconfiguration.</div><div class='ctx'> </div><div class='ctx'>   &lt;server-ip&gt;	IP address of the NFS server. If RARP is used to determine</div><div class='ctx'> 		the client address and this parameter is NOT empty only</div><div class='del'>-		replies from the specified server are accepted. To use</div><div class='del'>-		different RARP and NFS server, specify your RARP server</div><div class='del'>-		here (or leave it blank), and specify your NFS server in</div><div class='del'>-		the `nfsroot' parameter (see above). If this entry is blank</div><div class='del'>-		the address of the server is used which answered the RARP</div><div class='del'>-		or BOOTP request.</div><div class='del'>-</div><div class='del'>-  &lt;gw-ip&gt;	IP address of a gateway if the server is on a different</div><div class='del'>-		subnet. If this entry is empty no gateway is used and the</div><div class='del'>-		server is assumed to be on the local network, unless a</div><div class='del'>-		value has been received by BOOTP.</div><div class='del'>-</div><div class='del'>-  &lt;netmask&gt;	Netmask for local network interface. If this is empty,</div><div class='add'>+		replies from the specified server are accepted.</div><div class='add'>+</div><div class='add'>+		Only required for for NFS root. That is autoconfiguration</div><div class='add'>+		will not be triggered if it is missing and NFS root is not</div><div class='add'>+		in operation.</div><div class='add'>+</div><div class='add'>+		Default: Determined using autoconfiguration.</div><div class='add'>+		         The address of the autoconfiguration server is used.</div><div class='add'>+</div><div class='add'>+  &lt;gw-ip&gt;	IP address of a gateway if the server is on a different subnet.</div><div class='add'>+</div><div class='add'>+		Default: Determined using autoconfiguration.</div><div class='add'>+</div><div class='add'>+  &lt;netmask&gt;	Netmask for local network interface. If unspecified</div><div class='ctx'> 		the netmask is derived from the client IP address assuming</div><div class='del'>-		classful addressing, unless overridden in BOOTP reply.</div><div class='add'>+		classful addressing.</div><div class='ctx'> </div><div class='del'>-  &lt;hostname&gt;	Name of the client. If empty, the client IP address is</div><div class='del'>-		used in ASCII notation, or the value received by BOOTP.</div><div class='add'>+		Default:  Determined using autoconfiguration.</div><div class='ctx'> </div><div class='del'>-  &lt;device&gt;	Name of network device to use. If this is empty, all</div><div class='del'>-		devices are used for RARP and BOOTP requests, and the</div><div class='del'>-		first one we receive a reply on is configured. If you have</div><div class='del'>-		only one device, you can safely leave this blank.</div><div class='add'>+  &lt;hostname&gt;	Name of the client. May be supplied by autoconfiguration,</div><div class='add'>+  		but its absence will not trigger autoconfiguration.</div><div class='ctx'> </div><div class='del'>-  &lt;autoconf&gt;	Method to use for autoconfiguration. If this is either</div><div class='del'>-		'rarp' or 'bootp', the specified protocol is used.</div><div class='del'>-		If the value is 'both' or empty, both protocols are used</div><div class='del'>-		so far as they have been enabled during kernel configura-</div><div class='del'>-		tion. 'off' means no autoconfiguration.</div><div class='add'>+  		Default: Client IP address is used in ASCII notation.</div><div class='ctx'> </div><div class='del'>-  The &lt;autoconf&gt; parameter can appear alone as the value to the `ip'</div><div class='del'>-  parameter (without all the ':' characters before) in which case auto-</div><div class='del'>-  configuration is used.</div><div class='add'>+  &lt;device&gt;	Name of network device to use.</div><div class='add'>+</div><div class='add'>+		Default: If the host only has one device, it is used.</div><div class='add'>+			 Otherwise the device is determined using</div><div class='add'>+			 autoconfiguration. This is done by sending</div><div class='add'>+			 autoconfiguration requests out of all devices,</div><div class='add'>+			 and using the device that received the first reply.</div><div class='ctx'> </div><div class='add'>+  &lt;autoconf&gt;	Method to use for autoconfiguration. In the case of options</div><div class='add'>+                which specify multiple autoconfiguration protocols,</div><div class='add'>+		requests are sent using all protocols, and the first one</div><div class='add'>+		to reply is used.</div><div class='ctx'> </div><div class='add'>+		Only autoconfiguration protocols that have been compiled</div><div class='add'>+		into the kernel will be used, regardless of the value of</div><div class='add'>+		this option.</div><div class='ctx'> </div><div class='add'>+                  off or none: don't use autoconfiguration (default)</div><div class='add'>+		  on or any:   use any protocol available in the kernel</div><div class='add'>+		  dhcp:        use DHCP</div><div class='add'>+		  bootp:       use BOOTP</div><div class='add'>+		  rarp:        use RARP</div><div class='add'>+		  both:        use both BOOTP and RARP but not DHCP</div><div class='add'>+		               (old option kept for backwards compatibility)</div><div class='ctx'> </div><div class='del'>-3.) Kernel loader</div><div class='del'>-    -------------</div><div class='add'>+                Default: any</div><div class='ctx'> </div><div class='del'>-To get the kernel into memory different approaches can be used. They</div><div class='del'>-depend on what facilities are available:</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-3.1)  Writing the kernel onto a floppy using dd:</div><div class='del'>-	As always you can just write the kernel onto a floppy using dd,</div><div class='del'>-	but then it's not possible to use kernel command lines at all.</div><div class='del'>-	To substitute the 'root=' parameter, create a dummy device on any</div><div class='del'>-	linux system with major number 0 and minor number 255 using mknod:</div><div class='ctx'> </div><div class='del'>-		mknod /dev/boot255 c 0 255</div><div class='add'>+3.) Boot Loader</div><div class='add'>+    ----------</div><div class='ctx'> </div><div class='del'>-	Then copy the kernel zImage file onto a floppy using dd:</div><div class='add'>+To get the kernel into memory different approaches can be used.</div><div class='add'>+They depend on various facilities being available:</div><div class='ctx'> </div><div class='del'>-		dd if=/usr/src/linux/arch/i386/boot/zImage of=/dev/fd0</div><div class='ctx'> </div><div class='del'>-	And finally use rdev to set the root device:</div><div class='add'>+3.1)  Booting from a floppy using syslinux</div><div class='ctx'> </div><div class='del'>-		rdev /dev/fd0 /dev/boot255</div><div class='add'>+	When building kernels, an easy way to create a boot floppy that uses</div><div class='add'>+	syslinux is to use the zdisk or bzdisk make targets which use</div><div class='add'>+      	and bzimage images respectively. Both targets accept the</div><div class='add'>+     	FDARGS parameter which can be used to set the kernel command line.</div><div class='ctx'> </div><div class='del'>-	You can then remove the dummy device /dev/boot255 again. There</div><div class='del'>-	is no real device available for it.</div><div class='del'>-	The other two kernel command line parameters cannot be substi-</div><div class='del'>-	tuted with rdev. Therefore, using this method the kernel will</div><div class='del'>-	by default use RARP and/or BOOTP, and if it gets an answer via</div><div class='del'>-	RARP will mount the directory /tftpboot/&lt;client-ip&gt;/ as its</div><div class='del'>-	root. If it got a BOOTP answer the directory name in that answer</div><div class='del'>-	is used.</div><div class='add'>+	e.g.</div><div class='add'>+	   make bzdisk FDARGS="root=/dev/nfs"</div><div class='add'>+</div><div class='add'>+   	Note that the user running this command will need to have</div><div class='add'>+     	access to the floppy drive device, /dev/fd0</div><div class='add'>+</div><div class='add'>+     	For more information on syslinux, including how to create bootdisks</div><div class='add'>+     	for prebuilt kernels, see http://syslinux.zytor.com/</div><div class='add'>+</div><div class='add'>+	N.B: Previously it was possible to write a kernel directly to</div><div class='add'>+	     a floppy using dd, configure the boot device using rdev, and</div><div class='add'>+	     boot using the resulting floppy. Linux no longer supports this</div><div class='add'>+	     method of booting.</div><div class='add'>+</div><div class='add'>+3.2) Booting from a cdrom using isolinux</div><div class='add'>+</div><div class='add'>+     	When building kernels, an easy way to create a bootable cdrom that</div><div class='add'>+     	uses isolinux is to use the isoimage target which uses a bzimage</div><div class='add'>+     	image. Like zdisk and bzdisk, this target accepts the FDARGS</div><div class='add'>+     	parameter which can be used to set the kernel command line.</div><div class='add'>+</div><div class='add'>+	e.g.</div><div class='add'>+	  make isoimage FDARGS="root=/dev/nfs"</div><div class='add'>+</div><div class='add'>+     	The resulting iso image will be arch/&lt;ARCH&gt;/boot/image.iso</div><div class='add'>+     	This can be written to a cdrom using a variety of tools including</div><div class='add'>+     	cdrecord.</div><div class='add'>+</div><div class='add'>+	e.g.</div><div class='add'>+	  cdrecord dev=ATAPI:1,0,0 arch/i386/boot/image.iso</div><div class='add'>+</div><div class='add'>+     	For more information on isolinux, including how to create bootdisks</div><div class='add'>+     	for prebuilt kernels, see http://syslinux.zytor.com/</div><div class='ctx'> </div><div class='ctx'> 3.2) Using LILO</div><div class='del'>-	When using LILO you can specify all necessary command line</div><div class='del'>-	parameters with the 'append=' command in the LILO configuration</div><div class='del'>-	file. However, to use the 'root=' command you also need to</div><div class='del'>-	set up a dummy device as described in 3.1 above. For how to use</div><div class='del'>-	LILO and its 'append=' command please refer to the LILO</div><div class='del'>-	documentation.</div><div class='add'>+	When using LILO all the necessary command line parameters may be</div><div class='add'>+	specified using the 'append=' directive in the LILO configuration</div><div class='add'>+	file.</div><div class='add'>+</div><div class='add'>+	However, to use the 'root=' directive you also need to create</div><div class='add'>+	a dummy root device, which may be removed after LILO is run.</div><div class='add'>+</div><div class='add'>+	mknod /dev/boot255 c 0 255</div><div class='add'>+</div><div class='add'>+	For information on configuring LILO, please refer to its documentation.</div><div class='ctx'> </div><div class='ctx'> 3.3) Using GRUB</div><div class='del'>-	When you use GRUB, you simply append the parameters after the kernel</div><div class='del'>-	specification: "kernel &lt;kernel&gt; &lt;parameters&gt;" (without the quotes).</div><div class='add'>+	When using GRUB, kernel parameter are simply appended after the kernel</div><div class='add'>+	specification: kernel &lt;kernel&gt; &lt;parameters&gt;</div><div class='ctx'> </div><div class='ctx'> 3.4) Using loadlin</div><div class='del'>-	When you want to boot Linux from a DOS command prompt without</div><div class='del'>-	having a local hard disk to mount as root, you can use loadlin.</div><div class='del'>-	I was told that it works, but haven't used it myself yet. In</div><div class='del'>-	general you should be able to create a kernel command line simi-</div><div class='del'>-	lar to how LILO is doing it. Please refer to the loadlin docu-</div><div class='del'>-	mentation for further information.</div><div class='add'>+	loadlin may be used to boot Linux from a DOS command prompt without</div><div class='add'>+	requiring a local hard disk to mount as root. This has not been</div><div class='add'>+	thoroughly tested by the authors of this document, but in general</div><div class='add'>+	it should be possible configure the kernel command line similarly</div><div class='add'>+	to the configuration of LILO.</div><div class='add'>+</div><div class='add'>+	Please refer to the loadlin documentation for further information.</div><div class='ctx'> </div><div class='ctx'> 3.5) Using a boot ROM</div><div class='del'>-	This is probably the most elegant way of booting a diskless</div><div class='del'>-	client. With a boot ROM the kernel gets loaded using the TFTP</div><div class='del'>-	protocol. As far as I know, no commercial boot ROMs yet</div><div class='del'>-	support booting Linux over the network, but there are two</div><div class='del'>-	free implementations of a boot ROM available on sunsite.unc.edu</div><div class='del'>-	and its mirrors. They are called 'netboot-nfs' and 'etherboot'.</div><div class='del'>-	Both contain everything you need to boot a diskless Linux client.</div><div class='add'>+	This is probably the most elegant way of booting a diskless client.</div><div class='add'>+	With a boot ROM the kernel is loaded using the TFTP protocol. The</div><div class='add'>+	authors of this document are not aware of any no commercial boot</div><div class='add'>+	ROMs that support booting Linux over the network. However, there</div><div class='add'>+	are two free implementations of a boot ROM, netboot-nfs and</div><div class='add'>+	etherboot, both of which are available on sunsite.unc.edu, and both</div><div class='add'>+	of which contain everything you need to boot a diskless Linux client.</div><div class='ctx'> </div><div class='ctx'> 3.6) Using pxelinux</div><div class='del'>-	Using pxelinux you specify the kernel you built with</div><div class='add'>+	Pxelinux may be used to boot linux using the PXE boot loader</div><div class='add'>+	which is present on many modern network cards.</div><div class='add'>+</div><div class='add'>+	When using pxelinux, the kernel image is specified using</div><div class='ctx'> 	"kernel &lt;relative-path-below /tftpboot&gt;". The nfsroot parameters</div><div class='ctx'> 	are passed to the kernel by adding them to the "append" line.</div><div class='del'>-	You may perhaps also want to fine tune the console output,</div><div class='del'>-	see Documentation/serial-console.txt for serial console help.</div><div class='add'>+	It is common to use serial console in conjunction with pxeliunx,</div><div class='add'>+	see Documentation/serial-console.txt for more information.</div><div class='add'>+</div><div class='add'>+	For more information on isolinux, including how to create bootdisks</div><div class='add'>+	for prebuilt kernels, see http://syslinux.zytor.com/</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/pci.txt b/Documentation/pci.txt<br/>index 66bbbf1d1ef6..2b395e478961 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/pci.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/pci.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pci.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/pci.txt</a></div><div class='hunk'>@@ -213,11 +213,19 @@ have been remapped by the kernel.</div><div class='ctx'> </div><div class='ctx'>    See Documentation/IO-mapping.txt for how to access device memory.</div><div class='ctx'> </div><div class='del'>-   You still need to call request_region() for I/O regions and</div><div class='del'>-request_mem_region() for memory regions to make sure nobody else is using the</div><div class='del'>-same device.</div><div class='del'>-</div><div class='del'>-   All interrupt handlers should be registered with SA_SHIRQ and use the devid</div><div class='add'>+   The device driver needs to call pci_request_region() to make sure</div><div class='add'>+no other device is already using the same resource. The driver is expected</div><div class='add'>+to determine MMIO and IO Port resource availability _before_ calling</div><div class='add'>+pci_enable_device().  Conversely, drivers should call pci_release_region()</div><div class='add'>+_after_ calling pci_disable_device(). The idea is to prevent two devices</div><div class='add'>+colliding on the same address range.</div><div class='add'>+</div><div class='add'>+Generic flavors of pci_request_region() are request_mem_region()</div><div class='add'>+(for MMIO ranges) and request_region() (for IO Port ranges).</div><div class='add'>+Use these for address resources that are not described by "normal" PCI</div><div class='add'>+interfaces (e.g. BAR).</div><div class='add'>+</div><div class='add'>+   All interrupt handlers should be registered with IRQF_SHARED and use the devid</div><div class='ctx'> to map IRQs to devices (remember that all PCI interrupts are shared).</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/pcmcia/crc32hash.c b/Documentation/pcmcia/crc32hash.c<br/>new file mode 100644<br/>index 000000000000..cbc36d299af8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pcmcia/crc32hash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/pcmcia/crc32hash.c</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+/* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */</div><div class='add'>+/* Usage example:</div><div class='add'>+$ ./crc32hash "Dual Speed"</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;ctype.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned int crc32(unsigned char const *p, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int crc = 0;</div><div class='add'>+	while (len--) {</div><div class='add'>+		crc ^= *p++;</div><div class='add'>+		for (i = 0; i &lt; 8; i++)</div><div class='add'>+			crc = (crc &gt;&gt; 1) ^ ((crc &amp; 1) ? 0xedb88320 : 0);</div><div class='add'>+	}</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv) {</div><div class='add'>+	unsigned int result;</div><div class='add'>+	if (argc != 2) {</div><div class='add'>+		printf("no string passed as argument\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	result = crc32(argv[1], strlen(argv[1]));</div><div class='add'>+	printf("0x%x\n", result);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/pcmcia/devicetable.txt b/Documentation/pcmcia/devicetable.txt<br/>index 3351c0355143..199afd100cf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/pcmcia/devicetable.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/pcmcia/devicetable.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pcmcia/devicetable.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/pcmcia/devicetable.txt</a></div><div class='hunk'>@@ -27,37 +27,7 @@ pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000</div><div class='ctx'> The hex value after "pa" is the hash of product ID string 1, after "pb" for</div><div class='ctx'> string 2 and so on.</div><div class='ctx'> </div><div class='del'>-Alternatively, you can use this small tool to determine the crc32 hash.</div><div class='del'>-simply pass the string you want to evaluate as argument to this program,</div><div class='del'>-e.g.</div><div class='add'>+Alternatively, you can use crc32hash (see Documentation/pcmcia/crc32hash.c)</div><div class='add'>+to determine the crc32 hash.  Simply pass the string you want to evaluate</div><div class='add'>+as argument to this program, e.g.:</div><div class='ctx'> $ ./crc32hash "Dual Speed"</div><div class='del'>-</div><div class='del'>--------------------------------------------------------------------------</div><div class='del'>-/* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-unsigned int crc32(unsigned char const *p, unsigned int len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int crc = 0;</div><div class='del'>-	while (len--) {</div><div class='del'>-		crc ^= *p++;</div><div class='del'>-		for (i = 0; i &lt; 8; i++)</div><div class='del'>-			crc = (crc &gt;&gt; 1) ^ ((crc &amp; 1) ? 0xedb88320 : 0);</div><div class='del'>-	}</div><div class='del'>-	return crc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv) {</div><div class='del'>-	unsigned int result;</div><div class='del'>-	if (argc != 2) {</div><div class='del'>-		printf("no string passed as argument\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	result = crc32(argv[1], strlen(argv[1]));</div><div class='del'>-	printf("0x%x\n", result);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/Documentation/pi-futex.txt b/Documentation/pi-futex.txt<br/>new file mode 100644<br/>index 000000000000..5d61dacd21f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/pi-futex.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/pi-futex.txt</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+Lightweight PI-futexes</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+We are calling them lightweight for 3 reasons:</div><div class='add'>+</div><div class='add'>+ - in the user-space fastpath a PI-enabled futex involves no kernel work</div><div class='add'>+   (or any other PI complexity) at all. No registration, no extra kernel</div><div class='add'>+   calls - just pure fast atomic ops in userspace.</div><div class='add'>+</div><div class='add'>+ - even in the slowpath, the system call and scheduling pattern is very</div><div class='add'>+   similar to normal futexes.</div><div class='add'>+</div><div class='add'>+ - the in-kernel PI implementation is streamlined around the mutex</div><div class='add'>+   abstraction, with strict rules that keep the implementation</div><div class='add'>+   relatively simple: only a single owner may own a lock (i.e. no</div><div class='add'>+   read-write lock support), only the owner may unlock a lock, no</div><div class='add'>+   recursive locking, etc.</div><div class='add'>+</div><div class='add'>+Priority Inheritance - why?</div><div class='add'>+---------------------------</div><div class='add'>+</div><div class='add'>+The short reply: user-space PI helps achieving/improving determinism for</div><div class='add'>+user-space applications. In the best-case, it can help achieve</div><div class='add'>+determinism and well-bound latencies. Even in the worst-case, PI will</div><div class='add'>+improve the statistical distribution of locking related application</div><div class='add'>+delays.</div><div class='add'>+</div><div class='add'>+The longer reply:</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Firstly, sharing locks between multiple tasks is a common programming</div><div class='add'>+technique that often cannot be replaced with lockless algorithms. As we</div><div class='add'>+can see it in the kernel [which is a quite complex program in itself],</div><div class='add'>+lockless structures are rather the exception than the norm - the current</div><div class='add'>+ratio of lockless vs. locky code for shared data structures is somewhere</div><div class='add'>+between 1:10 and 1:100. Lockless is hard, and the complexity of lockless</div><div class='add'>+algorithms often endangers to ability to do robust reviews of said code.</div><div class='add'>+I.e. critical RT apps often choose lock structures to protect critical</div><div class='add'>+data structures, instead of lockless algorithms. Furthermore, there are</div><div class='add'>+cases (like shared hardware, or other resource limits) where lockless</div><div class='add'>+access is mathematically impossible.</div><div class='add'>+</div><div class='add'>+Media players (such as Jack) are an example of reasonable application</div><div class='add'>+design with multiple tasks (with multiple priority levels) sharing</div><div class='add'>+short-held locks: for example, a highprio audio playback thread is</div><div class='add'>+combined with medium-prio construct-audio-data threads and low-prio</div><div class='add'>+display-colory-stuff threads. Add video and decoding to the mix and</div><div class='add'>+we've got even more priority levels.</div><div class='add'>+</div><div class='add'>+So once we accept that synchronization objects (locks) are an</div><div class='add'>+unavoidable fact of life, and once we accept that multi-task userspace</div><div class='add'>+apps have a very fair expectation of being able to use locks, we've got</div><div class='add'>+to think about how to offer the option of a deterministic locking</div><div class='add'>+implementation to user-space.</div><div class='add'>+</div><div class='add'>+Most of the technical counter-arguments against doing priority</div><div class='add'>+inheritance only apply to kernel-space locks. But user-space locks are</div><div class='add'>+different, there we cannot disable interrupts or make the task</div><div class='add'>+non-preemptible in a critical section, so the 'use spinlocks' argument</div><div class='add'>+does not apply (user-space spinlocks have the same priority inversion</div><div class='add'>+problems as other user-space locking constructs). Fact is, pretty much</div><div class='add'>+the only technique that currently enables good determinism for userspace</div><div class='add'>+locks (such as futex-based pthread mutexes) is priority inheritance:</div><div class='add'>+</div><div class='add'>+Currently (without PI), if a high-prio and a low-prio task shares a lock</div><div class='add'>+[this is a quite common scenario for most non-trivial RT applications],</div><div class='add'>+even if all critical sections are coded carefully to be deterministic</div><div class='add'>+(i.e. all critical sections are short in duration and only execute a</div><div class='add'>+limited number of instructions), the kernel cannot guarantee any</div><div class='add'>+deterministic execution of the high-prio task: any medium-priority task</div><div class='add'>+could preempt the low-prio task while it holds the shared lock and</div><div class='add'>+executes the critical section, and could delay it indefinitely.</div><div class='add'>+</div><div class='add'>+Implementation:</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+As mentioned before, the userspace fastpath of PI-enabled pthread</div><div class='add'>+mutexes involves no kernel work at all - they behave quite similarly to</div><div class='add'>+normal futex-based locks: a 0 value means unlocked, and a value==TID</div><div class='add'>+means locked. (This is the same method as used by list-based robust</div><div class='add'>+futexes.) Userspace uses atomic ops to lock/unlock these mutexes without</div><div class='add'>+entering the kernel.</div><div class='add'>+</div><div class='add'>+To handle the slowpath, we have added two new futex ops:</div><div class='add'>+</div><div class='add'>+  FUTEX_LOCK_PI</div><div class='add'>+  FUTEX_UNLOCK_PI</div><div class='add'>+</div><div class='add'>+If the lock-acquire fastpath fails, [i.e. an atomic transition from 0 to</div><div class='add'>+TID fails], then FUTEX_LOCK_PI is called. The kernel does all the</div><div class='add'>+remaining work: if there is no futex-queue attached to the futex address</div><div class='add'>+yet then the code looks up the task that owns the futex [it has put its</div><div class='add'>+own TID into the futex value], and attaches a 'PI state' structure to</div><div class='add'>+the futex-queue. The pi_state includes an rt-mutex, which is a PI-aware,</div><div class='add'>+kernel-based synchronization object. The 'other' task is made the owner</div><div class='add'>+of the rt-mutex, and the FUTEX_WAITERS bit is atomically set in the</div><div class='add'>+futex value. Then this task tries to lock the rt-mutex, on which it</div><div class='add'>+blocks. Once it returns, it has the mutex acquired, and it sets the</div><div class='add'>+futex value to its own TID and returns. Userspace has no other work to</div><div class='add'>+perform - it now owns the lock, and futex value contains</div><div class='add'>+FUTEX_WAITERS|TID.</div><div class='add'>+</div><div class='add'>+If the unlock side fastpath succeeds, [i.e. userspace manages to do a</div><div class='add'>+TID -&gt; 0 atomic transition of the futex value], then no kernel work is</div><div class='add'>+triggered.</div><div class='add'>+</div><div class='add'>+If the unlock fastpath fails (because the FUTEX_WAITERS bit is set),</div><div class='add'>+then FUTEX_UNLOCK_PI is called, and the kernel unlocks the futex on the</div><div class='add'>+behalf of userspace - and it also unlocks the attached</div><div class='add'>+pi_state-&gt;rt_mutex and thus wakes up any potential waiters.</div><div class='add'>+</div><div class='add'>+Note that under this approach, contrary to previous PI-futex approaches,</div><div class='add'>+there is no prior 'registration' of a PI-futex. [which is not quite</div><div class='add'>+possible anyway, due to existing ABI properties of pthread mutexes.]</div><div class='add'>+</div><div class='add'>+Also, under this scheme, 'robustness' and 'PI' are two orthogonal</div><div class='add'>+properties of futexes, and all four combinations are possible: futex,</div><div class='add'>+robust-futex, PI-futex, robust+PI-futex.</div><div class='add'>+</div><div class='add'>+More details about priority inheritance can be found in</div><div class='add'>+Documentation/rtmutex.txt.</div><div class='head'>diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt<br/>index f987afe43e28..fba1e05c47c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/devices.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/power/devices.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/devices.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/power/devices.txt</a></div><div class='hunk'>@@ -135,96 +135,6 @@ HW.</div><div class='ctx'> </div><div class='ctx'> FREEZE -- stop DMA and interrupts, and be prepared to reinit HW from</div><div class='ctx'> scratch. That probably means stop accepting upstream requests, the</div><div class='del'>-actual policy of what to do with them beeing specific to a given</div><div class='del'>-driver. It's acceptable for a network driver to just drop packets</div><div class='del'>-while a block driver is expected to block the queue so no request is</div><div class='del'>-lost. (Use IDE as an example on how to do that). FREEZE requires no</div><div class='del'>-power state change, and it's expected for drivers to be able to</div><div class='del'>-quickly transition back to operating state.</div><div class='del'>-</div><div class='del'>-SUSPEND -- like FREEZE, but also put hardware into low-power state. If</div><div class='del'>-there's need to distinguish several levels of sleep, additional flag</div><div class='del'>-is probably best way to do that.</div><div class='del'>-</div><div class='del'>-Transitions are only from a resumed state to a suspended state, never</div><div class='del'>-between 2 suspended states. (ON -&gt; FREEZE or ON -&gt; SUSPEND can happen,</div><div class='del'>-FREEZE -&gt; SUSPEND or SUSPEND -&gt; FREEZE can not).</div><div class='del'>-</div><div class='del'>-All events are:</div><div class='del'>-</div><div class='del'>-[NOTE NOTE NOTE: If you are driver author, you should not care; you</div><div class='del'>-should only look at event, and ignore flags.]</div><div class='del'>-</div><div class='del'>-#Prepare for suspend -- userland is still running but we are going to</div><div class='del'>-#enter suspend state. This gives drivers chance to load firmware from</div><div class='del'>-#disk and store it in memory, or do other activities taht require</div><div class='del'>-#operating userland, ability to kmalloc GFP_KERNEL, etc... All of these</div><div class='del'>-#are forbiden once the suspend dance is started.. event = ON, flags =</div><div class='del'>-#PREPARE_TO_SUSPEND</div><div class='del'>-</div><div class='del'>-Apm standby -- prepare for APM event. Quiesce devices to make life</div><div class='del'>-easier for APM BIOS. event = FREEZE, flags = APM_STANDBY</div><div class='del'>-</div><div class='del'>-Apm suspend -- same as APM_STANDBY, but it we should probably avoid</div><div class='del'>-spinning down disks. event = FREEZE, flags = APM_SUSPEND</div><div class='del'>-</div><div class='del'>-System halt, reboot -- quiesce devices to make life easier for BIOS. event</div><div class='del'>-= FREEZE, flags = SYSTEM_HALT or SYSTEM_REBOOT</div><div class='del'>-</div><div class='del'>-System shutdown -- at least disks need to be spun down, or data may be</div><div class='del'>-lost. Quiesce devices, just to make life easier for BIOS. event =</div><div class='del'>-FREEZE, flags = SYSTEM_SHUTDOWN</div><div class='del'>-</div><div class='del'>-Kexec    -- turn off DMAs and put hardware into some state where new</div><div class='del'>-kernel can take over. event = FREEZE, flags = KEXEC</div><div class='del'>-</div><div class='del'>-Powerdown at end of swsusp -- very similar to SYSTEM_SHUTDOWN, except wake</div><div class='del'>-may need to be enabled on some devices. This actually has at least 3</div><div class='del'>-subtypes, system can reboot, enter S4 and enter S5 at the end of</div><div class='del'>-swsusp. event = FREEZE, flags = SWSUSP and one of SYSTEM_REBOOT,</div><div class='del'>-SYSTEM_SHUTDOWN, SYSTEM_S4</div><div class='del'>-</div><div class='del'>-Suspend to ram  -- put devices into low power state. event = SUSPEND,</div><div class='del'>-flags = SUSPEND_TO_RAM</div><div class='del'>-</div><div class='del'>-Freeze for swsusp snapshot -- stop DMA and interrupts. No need to put</div><div class='del'>-devices into low power mode, but you must be able to reinitialize</div><div class='del'>-device from scratch in resume method. This has two flavors, its done</div><div class='del'>-once on suspending kernel, once on resuming kernel. event = FREEZE,</div><div class='del'>-flags = DURING_SUSPEND or DURING_RESUME</div><div class='del'>-</div><div class='del'>-Device detach requested from /sys -- deinitialize device; proably same as</div><div class='del'>-SYSTEM_SHUTDOWN, I do not understand this one too much. probably event</div><div class='del'>-= FREEZE, flags = DEV_DETACH.</div><div class='del'>-</div><div class='del'>-#These are not really events sent:</div><div class='del'>-#</div><div class='del'>-#System fully on -- device is working normally; this is probably never</div><div class='del'>-#passed to suspend() method... event = ON, flags = 0</div><div class='del'>-#</div><div class='del'>-#Ready after resume -- userland is now running, again. Time to free any</div><div class='del'>-#memory you ate during prepare to suspend... event = ON, flags =</div><div class='del'>-#READY_AFTER_RESUME</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-pm_message_t meaning</div><div class='del'>-</div><div class='del'>-pm_message_t has two fields. event ("major"), and flags.  If driver</div><div class='del'>-does not know event code, it aborts the request, returning error. Some</div><div class='del'>-drivers may need to deal with special cases based on the actual type</div><div class='del'>-of suspend operation being done at the system level. This is why</div><div class='del'>-there are flags.</div><div class='del'>-</div><div class='del'>-Event codes are:</div><div class='del'>-</div><div class='del'>-ON -- no need to do anything except special cases like broken</div><div class='del'>-HW.</div><div class='del'>-</div><div class='del'>-# NOTIFICATION -- pretty much same as ON?</div><div class='del'>-</div><div class='del'>-FREEZE -- stop DMA and interrupts, and be prepared to reinit HW from</div><div class='del'>-scratch. That probably means stop accepting upstream requests, the</div><div class='ctx'> actual policy of what to do with them being specific to a given</div><div class='ctx'> driver. It's acceptable for a network driver to just drop packets</div><div class='ctx'> while a block driver is expected to block the queue so no request is</div><div class='head'>diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt<br/>index d7814a113ee1..823b2cf6e3dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/swsusp.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/power/swsusp.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/swsusp.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/power/swsusp.txt</a></div><div class='hunk'>@@ -18,10 +18,11 @@ Some warnings, first.</div><div class='ctx'>  *</div><div class='ctx'>  * (*) suspend/resume support is needed to make it safe.</div><div class='ctx'>  *</div><div class='del'>- * If you have any filesystems on USB devices mounted before suspend,</div><div class='add'>+ * If you have any filesystems on USB devices mounted before software suspend,</div><div class='ctx'>  * they won't be accessible after resume and you may lose data, as though</div><div class='del'>- * you have unplugged the USB devices with mounted filesystems on them</div><div class='del'>- * (see the FAQ below for details).</div><div class='add'>+ * you have unplugged the USB devices with mounted filesystems on them;</div><div class='add'>+ * see the FAQ below for details.  (This is not true for more traditional</div><div class='add'>+ * power states like "standby", which normally don't turn USB off.)</div><div class='ctx'> </div><div class='ctx'> You need to append resume=/dev/your_swap_partition to kernel command</div><div class='ctx'> line. Then you suspend by</div><div class='hunk'>@@ -204,7 +205,7 @@ Q: There don't seem to be any generally useful behavioral</div><div class='ctx'> distinctions between SUSPEND and FREEZE.</div><div class='ctx'> </div><div class='ctx'> A: Doing SUSPEND when you are asked to do FREEZE is always correct,</div><div class='del'>-but it may be unneccessarily slow. If you want USB to stay simple,</div><div class='add'>+but it may be unneccessarily slow. If you want your driver to stay simple,</div><div class='ctx'> slowness may not matter to you. It can always be fixed later.</div><div class='ctx'> </div><div class='ctx'> For devices like disk it does matter, you do not want to spindown for</div><div class='hunk'>@@ -349,25 +350,72 @@ Q: How do I make suspend more verbose?</div><div class='ctx'> </div><div class='ctx'> A: If you want to see any non-error kernel messages on the virtual</div><div class='ctx'> terminal the kernel switches to during suspend, you have to set the</div><div class='del'>-kernel console loglevel to at least 5, for example by doing</div><div class='del'>-</div><div class='del'>-	echo 5 &gt; /proc/sys/kernel/printk</div><div class='add'>+kernel console loglevel to at least 4 (KERN_WARNING), for example by</div><div class='add'>+doing</div><div class='add'>+</div><div class='add'>+	# save the old loglevel</div><div class='add'>+	read LOGLEVEL DUMMY &lt; /proc/sys/kernel/printk</div><div class='add'>+	# set the loglevel so we see the progress bar.</div><div class='add'>+	# if the level is higher than needed, we leave it alone.</div><div class='add'>+	if [ $LOGLEVEL -lt 5 ]; then</div><div class='add'>+	        echo 5 &gt; /proc/sys/kernel/printk</div><div class='add'>+		fi</div><div class='add'>+</div><div class='add'>+        IMG_SZ=0</div><div class='add'>+        read IMG_SZ &lt; /sys/power/image_size</div><div class='add'>+        echo -n disk &gt; /sys/power/state</div><div class='add'>+        RET=$?</div><div class='add'>+        #</div><div class='add'>+        # the logic here is:</div><div class='add'>+        # if image_size &gt; 0 (without kernel support, IMG_SZ will be zero),</div><div class='add'>+        # then try again with image_size set to zero.</div><div class='add'>+	if [ $RET -ne 0 -a $IMG_SZ -ne 0 ]; then # try again with minimal image size</div><div class='add'>+                echo 0 &gt; /sys/power/image_size</div><div class='add'>+                echo -n disk &gt; /sys/power/state</div><div class='add'>+                RET=$?</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+	# restore previous loglevel</div><div class='add'>+	echo $LOGLEVEL &gt; /proc/sys/kernel/printk</div><div class='add'>+	exit $RET</div><div class='ctx'> </div><div class='ctx'> Q: Is this true that if I have a mounted filesystem on a USB device and</div><div class='ctx'> I suspend to disk, I can lose data unless the filesystem has been mounted</div><div class='ctx'> with "sync"?</div><div class='ctx'> </div><div class='del'>-A: That's right.  It depends on your hardware, and it could be true even for</div><div class='del'>-suspend-to-RAM.  In fact, even with "-o sync" you can lose data if your</div><div class='del'>-programs have information in buffers they haven't written out to disk.</div><div class='add'>+A: That's right ... if you disconnect that device, you may lose data.</div><div class='add'>+In fact, even with "-o sync" you can lose data if your programs have</div><div class='add'>+information in buffers they haven't written out to a disk you disconnect,</div><div class='add'>+or if you disconnect before the device finished saving data you wrote.</div><div class='ctx'> </div><div class='del'>-If you're lucky, your hardware will support low-power modes for USB</div><div class='del'>-controllers while the system is asleep.  Lots of hardware doesn't,</div><div class='del'>-however.  Shutting off the power to a USB controller is equivalent to</div><div class='del'>-unplugging all the attached devices.</div><div class='add'>+Software suspend normally powers down USB controllers, which is equivalent</div><div class='add'>+to disconnecting all USB devices attached to your system.</div><div class='ctx'> </div><div class='del'>-Remember that it's always a bad idea to unplug a disk drive containing a</div><div class='del'>-mounted filesystem.  With USB that's true even when your system is asleep!</div><div class='del'>-The safest thing is to unmount all USB-based filesystems before suspending</div><div class='del'>-and remount them after resuming.</div><div class='add'>+Your system might well support low-power modes for its USB controllers</div><div class='add'>+while the system is asleep, maintaining the connection, using true sleep</div><div class='add'>+modes like "suspend-to-RAM" or "standby".  (Don't write "disk" to the</div><div class='add'>+/sys/power/state file; write "standby" or "mem".)  We've not seen any</div><div class='add'>+hardware that can use these modes through software suspend, although in</div><div class='add'>+theory some systems might support "platform" or "firmware" modes that</div><div class='add'>+won't break the USB connections.</div><div class='ctx'> </div><div class='add'>+Remember that it's always a bad idea to unplug a disk drive containing a</div><div class='add'>+mounted filesystem.  That's true even when your system is asleep!  The</div><div class='add'>+safest thing is to unmount all filesystems on removable media (such USB,</div><div class='add'>+Firewire, CompactFlash, MMC, external SATA, or even IDE hotplug bays)</div><div class='add'>+before suspending; then remount them after resuming.</div><div class='add'>+</div><div class='add'>+Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were</div><div class='add'>+compiled with the similar configuration files. Anyway I found that</div><div class='add'>+suspend to disk (and resume) is much slower on 2.6.16 compared to</div><div class='add'>+2.6.15. Any idea for why that might happen or how can I speed it up?</div><div class='add'>+</div><div class='add'>+A: This is because the size of the suspend image is now greater than</div><div class='add'>+for 2.6.15 (by saving more data we can get more responsive system</div><div class='add'>+after resume).</div><div class='add'>+</div><div class='add'>+There's the /sys/power/image_size knob that controls the size of the</div><div class='add'>+image.  If you set it to 0 (eg. by echo 0 &gt; /sys/power/image_size as</div><div class='add'>+root), the 2.6.15 behavior should be restored.  If it is still too</div><div class='add'>+slow, take a look at suspend.sf.net -- userland suspend is faster and</div><div class='add'>+supports LZF compression to speed it up further.</div><div class='head'>diff --git a/Documentation/power/video.txt b/Documentation/power/video.txt<br/>index 43a889f8f08d..d859faa3a463 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/power/video.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/power/video.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/power/video.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/power/video.txt</a></div><div class='hunk'>@@ -90,6 +90,7 @@ Table of known working notebooks:</div><div class='ctx'> Model                           hack (or "how to do it")</div><div class='ctx'> ------------------------------------------------------------------------------</div><div class='ctx'> Acer Aspire 1406LC		ole's late BIOS init (7), turn off DRI</div><div class='add'>+Acer TM 230			s3_bios (2)</div><div class='ctx'> Acer TM 242FX			vbetool (6)</div><div class='ctx'> Acer TM C110			video_post (8)</div><div class='ctx'> Acer TM C300                    vga=normal (only suspend on console, not in X), vbetool (6) or video_post (8)</div><div class='hunk'>@@ -115,6 +116,7 @@ Dell D610			vga=normal and X (possibly vbestate (6) too, but not tested)</div><div class='ctx'> Dell Inspiron 4000		??? (*)</div><div class='ctx'> Dell Inspiron 500m		??? (*)</div><div class='ctx'> Dell Inspiron 510m		???</div><div class='add'>+Dell Inspiron 5150		vbetool needed (6)</div><div class='ctx'> Dell Inspiron 600m		??? (*)</div><div class='ctx'> Dell Inspiron 8200		??? (*)</div><div class='ctx'> Dell Inspiron 8500		??? (*)</div><div class='hunk'>@@ -125,6 +127,7 @@ HP NX7000			??? (*)</div><div class='ctx'> HP Pavilion ZD7000		vbetool post needed, need open-source nv driver for X</div><div class='ctx'> HP Omnibook XE3	athlon version	none (1)</div><div class='ctx'> HP Omnibook XE3GC		none (1), video is S3 Savage/IX-MV</div><div class='add'>+HP Omnibook XE3L-GF		vbetool (6)</div><div class='ctx'> HP Omnibook 5150		none (1), (S1 also works OK)</div><div class='ctx'> IBM TP T20, model 2647-44G	none (1), video is S3 Inc. 86C270-294 Savage/IX-MV, vesafb gets "interesting" but X work.</div><div class='ctx'> IBM TP A31 / Type 2652-M5G      s3_mode (3) [works ok with BIOS 1.04 2002-08-23, but not at all with BIOS 1.11 2004-11-05 :-(]</div><div class='hunk'>@@ -157,6 +160,7 @@ Sony Vaio vgn-s260		X or boot-radeon can init it (5)</div><div class='ctx'> Sony Vaio vgn-S580BH		vga=normal, but suspend from X. Console will be blank unless you return to X.</div><div class='ctx'> Sony Vaio vgn-FS115B		s3_bios (2),s3_mode (4)</div><div class='ctx'> Toshiba Libretto L5		none (1)</div><div class='add'>+Toshiba Libretto 100CT/110CT    vbetool (6)</div><div class='ctx'> Toshiba Portege 3020CT		s3_mode (3)</div><div class='ctx'> Toshiba Satellite 4030CDT	s3_mode (3) (S1 also works OK)</div><div class='ctx'> Toshiba Satellite 4080XCDT      s3_mode (3) (S1 also works OK)</div><div class='head'>diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt<br/>index 217e51768b87..3c62e66e1fcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/powerpc/booting-without-of.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/powerpc/booting-without-of.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/powerpc/booting-without-of.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/powerpc/booting-without-of.txt</a></div><div class='hunk'>@@ -1436,9 +1436,9 @@ platforms are moved over to use the flattened-device-tree model.</div><div class='ctx'>                interrupts = &lt;1d 3&gt;;</div><div class='ctx'>                interrupt-parent = &lt;40000&gt;;</div><div class='ctx'>                num-channels = &lt;4&gt;;</div><div class='del'>-               channel-fifo-len = &lt;24&gt;;</div><div class='add'>+               channel-fifo-len = &lt;18&gt;;</div><div class='ctx'>                exec-units-mask = &lt;000000fe&gt;;</div><div class='del'>-               descriptor-types-mask = &lt;073f1127&gt;;</div><div class='add'>+               descriptor-types-mask = &lt;012b0ebf&gt;;</div><div class='ctx'>        };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/ramdisk.txt b/Documentation/ramdisk.txt<br/>index 7c25584e082c..52f75b7d51c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/ramdisk.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/ramdisk.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/ramdisk.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/ramdisk.txt</a></div><div class='hunk'>@@ -6,7 +6,7 @@ Contents:</div><div class='ctx'> 	1) Overview</div><div class='ctx'> 	2) Kernel Command Line Parameters</div><div class='ctx'> 	3) Using "rdev -r"</div><div class='del'>-	4) An Example of Creating a Compressed RAM Disk </div><div class='add'>+	4) An Example of Creating a Compressed RAM Disk</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 1) Overview</div><div class='hunk'>@@ -34,7 +34,7 @@ make it clearer.  The original "ramdisk=&lt;ram_size&gt;" has been kept around for</div><div class='ctx'> compatibility reasons, but it may be removed in the future.</div><div class='ctx'> </div><div class='ctx'> The new RAM disk also has the ability to load compressed RAM disk images,</div><div class='del'>-allowing one to squeeze more programs onto an average installation or </div><div class='add'>+allowing one to squeeze more programs onto an average installation or</div><div class='ctx'> rescue floppy disk.</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +51,7 @@ default is 4096 (4 MB) (8192 (8 MB) on S390).</div><div class='ctx'> 	===================</div><div class='ctx'> </div><div class='ctx'> This parameter tells the RAM disk driver how many bytes to use per block.  The</div><div class='del'>-default is 512.</div><div class='add'>+default is 1024 (BLOCK_SIZE).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 3) Using "rdev -r"</div><div class='hunk'>@@ -70,7 +70,7 @@ These numbers are no magical secrets, as seen below:</div><div class='ctx'> ./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000</div><div class='ctx'> ./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000</div><div class='ctx'> </div><div class='del'>-Consider a typical two floppy disk setup, where you will have the </div><div class='add'>+Consider a typical two floppy disk setup, where you will have the</div><div class='ctx'> kernel on disk one, and have already put a RAM disk image onto disk #2.</div><div class='ctx'> </div><div class='ctx'> Hence you want to set bits 0 to 13 as 0, meaning that your RAM disk</div><div class='hunk'>@@ -97,12 +97,12 @@ Since the default start = 0 and the default prompt = 1, you could use:</div><div class='ctx'> 	append = "load_ramdisk=1"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-4) An Example of Creating a Compressed RAM Disk </div><div class='add'>+4) An Example of Creating a Compressed RAM Disk</div><div class='ctx'> ----------------------------------------------</div><div class='ctx'> </div><div class='ctx'> To create a RAM disk image, you will need a spare block device to</div><div class='ctx'> construct it on. This can be the RAM disk device itself, or an</div><div class='del'>-unused disk partition (such as an unmounted swap partition). For this </div><div class='add'>+unused disk partition (such as an unmounted swap partition). For this</div><div class='ctx'> example, we will use the RAM disk device, "/dev/ram0".</div><div class='ctx'> </div><div class='ctx'> Note: This technique should not be done on a machine with less than 8 MB</div><div class='head'>diff --git a/Documentation/robust-futexes.txt b/Documentation/robust-futexes.txt<br/>index df82d75245a0..76e8064b8c3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/robust-futexes.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/robust-futexes.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/robust-futexes.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/robust-futexes.txt</a></div><div class='hunk'>@@ -95,7 +95,7 @@ comparison. If the thread has registered a list, then normally the list</div><div class='ctx'> is empty. If the thread/process crashed or terminated in some incorrect</div><div class='ctx'> way then the list might be non-empty: in this case the kernel carefully</div><div class='ctx'> walks the list [not trusting it], and marks all locks that are owned by</div><div class='del'>-this thread with the FUTEX_OWNER_DEAD bit, and wakes up one waiter (if</div><div class='add'>+this thread with the FUTEX_OWNER_DIED bit, and wakes up one waiter (if</div><div class='ctx'> any).</div><div class='ctx'> </div><div class='ctx'> The list is guaranteed to be private and per-thread at do_exit() time,</div><div class='head'>diff --git a/Documentation/rt-mutex-design.txt b/Documentation/rt-mutex-design.txt<br/>new file mode 100644<br/>index 000000000000..c472ffacc2f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/rt-mutex-design.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/rt-mutex-design.txt</a></div><div class='hunk'>@@ -0,0 +1,781 @@</div><div class='add'>+#</div><div class='add'>+# Copyright (c) 2006 Steven Rostedt</div><div class='add'>+# Licensed under the GNU Free Documentation License, Version 1.2</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+RT-mutex implementation design</div><div class='add'>+------------------------------</div><div class='add'>+</div><div class='add'>+This document tries to describe the design of the rtmutex.c implementation.</div><div class='add'>+It doesn't describe the reasons why rtmutex.c exists. For that please see</div><div class='add'>+Documentation/rt-mutex.txt.  Although this document does explain problems</div><div class='add'>+that happen without this code, but that is in the concept to understand</div><div class='add'>+what the code actually is doing.</div><div class='add'>+</div><div class='add'>+The goal of this document is to help others understand the priority</div><div class='add'>+inheritance (PI) algorithm that is used, as well as reasons for the</div><div class='add'>+decisions that were made to implement PI in the manner that was done.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Unbounded Priority Inversion</div><div class='add'>+----------------------------</div><div class='add'>+</div><div class='add'>+Priority inversion is when a lower priority process executes while a higher</div><div class='add'>+priority process wants to run.  This happens for several reasons, and</div><div class='add'>+most of the time it can't be helped.  Anytime a high priority process wants</div><div class='add'>+to use a resource that a lower priority process has (a mutex for example),</div><div class='add'>+the high priority process must wait until the lower priority process is done</div><div class='add'>+with the resource.  This is a priority inversion.  What we want to prevent</div><div class='add'>+is something called unbounded priority inversion.  That is when the high</div><div class='add'>+priority process is prevented from running by a lower priority process for</div><div class='add'>+an undetermined amount of time.</div><div class='add'>+</div><div class='add'>+The classic example of unbounded priority inversion is were you have three</div><div class='add'>+processes, let's call them processes A, B, and C, where A is the highest</div><div class='add'>+priority process, C is the lowest, and B is in between. A tries to grab a lock</div><div class='add'>+that C owns and must wait and lets C run to release the lock. But in the</div><div class='add'>+meantime, B executes, and since B is of a higher priority than C, it preempts C,</div><div class='add'>+but by doing so, it is in fact preempting A which is a higher priority process.</div><div class='add'>+Now there's no way of knowing how long A will be sleeping waiting for C</div><div class='add'>+to release the lock, because for all we know, B is a CPU hog and will</div><div class='add'>+never give C a chance to release the lock.  This is called unbounded priority</div><div class='add'>+inversion.</div><div class='add'>+</div><div class='add'>+Here's a little ASCII art to show the problem.</div><div class='add'>+</div><div class='add'>+   grab lock L1 (owned by C)</div><div class='add'>+     |</div><div class='add'>+A ---+</div><div class='add'>+        C preempted by B</div><div class='add'>+          |</div><div class='add'>+C    +----+</div><div class='add'>+</div><div class='add'>+B         +--------&gt;</div><div class='add'>+                B now keeps A from running.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Priority Inheritance (PI)</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+There are several ways to solve this issue, but other ways are out of scope</div><div class='add'>+for this document.  Here we only discuss PI.</div><div class='add'>+</div><div class='add'>+PI is where a process inherits the priority of another process if the other</div><div class='add'>+process blocks on a lock owned by the current process.  To make this easier</div><div class='add'>+to understand, let's use the previous example, with processes A, B, and C again.</div><div class='add'>+</div><div class='add'>+This time, when A blocks on the lock owned by C, C would inherit the priority</div><div class='add'>+of A.  So now if B becomes runnable, it would not preempt C, since C now has</div><div class='add'>+the high priority of A.  As soon as C releases the lock, it loses its</div><div class='add'>+inherited priority, and A then can continue with the resource that C had.</div><div class='add'>+</div><div class='add'>+Terminology</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+Here I explain some terminology that is used in this document to help describe</div><div class='add'>+the design that is used to implement PI.</div><div class='add'>+</div><div class='add'>+PI chain - The PI chain is an ordered series of locks and processes that cause</div><div class='add'>+           processes to inherit priorities from a previous process that is</div><div class='add'>+           blocked on one of its locks.  This is described in more detail</div><div class='add'>+           later in this document.</div><div class='add'>+</div><div class='add'>+mutex    - In this document, to differentiate from locks that implement</div><div class='add'>+           PI and spin locks that are used in the PI code, from now on</div><div class='add'>+           the PI locks will be called a mutex.</div><div class='add'>+</div><div class='add'>+lock     - In this document from now on, I will use the term lock when</div><div class='add'>+           referring to spin locks that are used to protect parts of the PI</div><div class='add'>+           algorithm.  These locks disable preemption for UP (when</div><div class='add'>+           CONFIG_PREEMPT is enabled) and on SMP prevents multiple CPUs from</div><div class='add'>+           entering critical sections simultaneously.</div><div class='add'>+</div><div class='add'>+spin lock - Same as lock above.</div><div class='add'>+</div><div class='add'>+waiter   - A waiter is a struct that is stored on the stack of a blocked</div><div class='add'>+           process.  Since the scope of the waiter is within the code for</div><div class='add'>+           a process being blocked on the mutex, it is fine to allocate</div><div class='add'>+           the waiter on the process's stack (local variable).  This</div><div class='add'>+           structure holds a pointer to the task, as well as the mutex that</div><div class='add'>+           the task is blocked on.  It also has the plist node structures to</div><div class='add'>+           place the task in the waiter_list of a mutex as well as the</div><div class='add'>+           pi_list of a mutex owner task (described below).</div><div class='add'>+</div><div class='add'>+           waiter is sometimes used in reference to the task that is waiting</div><div class='add'>+           on a mutex. This is the same as waiter-&gt;task.</div><div class='add'>+</div><div class='add'>+waiters  - A list of processes that are blocked on a mutex.</div><div class='add'>+</div><div class='add'>+top waiter - The highest priority process waiting on a specific mutex.</div><div class='add'>+</div><div class='add'>+top pi waiter - The highest priority process waiting on one of the mutexes</div><div class='add'>+                that a specific process owns.</div><div class='add'>+</div><div class='add'>+Note:  task and process are used interchangeably in this document, mostly to</div><div class='add'>+       differentiate between two processes that are being described together.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+PI chain</div><div class='add'>+--------</div><div class='add'>+</div><div class='add'>+The PI chain is a list of processes and mutexes that may cause priority</div><div class='add'>+inheritance to take place.  Multiple chains may converge, but a chain</div><div class='add'>+would never diverge, since a process can't be blocked on more than one</div><div class='add'>+mutex at a time.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+</div><div class='add'>+   Process:  A, B, C, D, E</div><div class='add'>+   Mutexes:  L1, L2, L3, L4</div><div class='add'>+</div><div class='add'>+   A owns: L1</div><div class='add'>+           B blocked on L1</div><div class='add'>+           B owns L2</div><div class='add'>+                  C blocked on L2</div><div class='add'>+                  C owns L3</div><div class='add'>+                         D blocked on L3</div><div class='add'>+                         D owns L4</div><div class='add'>+                                E blocked on L4</div><div class='add'>+</div><div class='add'>+The chain would be:</div><div class='add'>+</div><div class='add'>+   E-&gt;L4-&gt;D-&gt;L3-&gt;C-&gt;L2-&gt;B-&gt;L1-&gt;A</div><div class='add'>+</div><div class='add'>+To show where two chains merge, we could add another process F and</div><div class='add'>+another mutex L5 where B owns L5 and F is blocked on mutex L5.</div><div class='add'>+</div><div class='add'>+The chain for F would be:</div><div class='add'>+</div><div class='add'>+   F-&gt;L5-&gt;B-&gt;L1-&gt;A</div><div class='add'>+</div><div class='add'>+Since a process may own more than one mutex, but never be blocked on more than</div><div class='add'>+one, the chains merge.</div><div class='add'>+</div><div class='add'>+Here we show both chains:</div><div class='add'>+</div><div class='add'>+   E-&gt;L4-&gt;D-&gt;L3-&gt;C-&gt;L2-+</div><div class='add'>+                       |</div><div class='add'>+                       +-&gt;B-&gt;L1-&gt;A</div><div class='add'>+                       |</div><div class='add'>+                 F-&gt;L5-+</div><div class='add'>+</div><div class='add'>+For PI to work, the processes at the right end of these chains (or we may</div><div class='add'>+also call it the Top of the chain) must be equal to or higher in priority</div><div class='add'>+than the processes to the left or below in the chain.</div><div class='add'>+</div><div class='add'>+Also since a mutex may have more than one process blocked on it, we can</div><div class='add'>+have multiple chains merge at mutexes.  If we add another process G that is</div><div class='add'>+blocked on mutex L2:</div><div class='add'>+</div><div class='add'>+  G-&gt;L2-&gt;B-&gt;L1-&gt;A</div><div class='add'>+</div><div class='add'>+And once again, to show how this can grow I will show the merging chains</div><div class='add'>+again.</div><div class='add'>+</div><div class='add'>+   E-&gt;L4-&gt;D-&gt;L3-&gt;C-+</div><div class='add'>+                   +-&gt;L2-+</div><div class='add'>+                   |     |</div><div class='add'>+                 G-+     +-&gt;B-&gt;L1-&gt;A</div><div class='add'>+                         |</div><div class='add'>+                   F-&gt;L5-+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Plist</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+Before I go further and talk about how the PI chain is stored through lists</div><div class='add'>+on both mutexes and processes, I'll explain the plist.  This is similar to</div><div class='add'>+the struct list_head functionality that is already in the kernel.</div><div class='add'>+The implementation of plist is out of scope for this document, but it is</div><div class='add'>+very important to understand what it does.</div><div class='add'>+</div><div class='add'>+There are a few differences between plist and list, the most important one</div><div class='add'>+being that plist is a priority sorted linked list.  This means that the</div><div class='add'>+priorities of the plist are sorted, such that it takes O(1) to retrieve the</div><div class='add'>+highest priority item in the list.  Obviously this is useful to store processes</div><div class='add'>+based on their priorities.</div><div class='add'>+</div><div class='add'>+Another difference, which is important for implementation, is that, unlike</div><div class='add'>+list, the head of the list is a different element than the nodes of a list.</div><div class='add'>+So the head of the list is declared as struct plist_head and nodes that will</div><div class='add'>+be added to the list are declared as struct plist_node.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mutex Waiter List</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+Every mutex keeps track of all the waiters that are blocked on itself. The mutex</div><div class='add'>+has a plist to store these waiters by priority.  This list is protected by</div><div class='add'>+a spin lock that is located in the struct of the mutex. This lock is called</div><div class='add'>+wait_lock.  Since the modification of the waiter list is never done in</div><div class='add'>+interrupt context, the wait_lock can be taken without disabling interrupts.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Task PI List</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+To keep track of the PI chains, each process has its own PI list.  This is</div><div class='add'>+a list of all top waiters of the mutexes that are owned by the process.</div><div class='add'>+Note that this list only holds the top waiters and not all waiters that are</div><div class='add'>+blocked on mutexes owned by the process.</div><div class='add'>+</div><div class='add'>+The top of the task's PI list is always the highest priority task that</div><div class='add'>+is waiting on a mutex that is owned by the task.  So if the task has</div><div class='add'>+inherited a priority, it will always be the priority of the task that is</div><div class='add'>+at the top of this list.</div><div class='add'>+</div><div class='add'>+This list is stored in the task structure of a process as a plist called</div><div class='add'>+pi_list.  This list is protected by a spin lock also in the task structure,</div><div class='add'>+called pi_lock.  This lock may also be taken in interrupt context, so when</div><div class='add'>+locking the pi_lock, interrupts must be disabled.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Depth of the PI Chain</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The maximum depth of the PI chain is not dynamic, and could actually be</div><div class='add'>+defined.  But is very complex to figure it out, since it depends on all</div><div class='add'>+the nesting of mutexes.  Let's look at the example where we have 3 mutexes,</div><div class='add'>+L1, L2, and L3, and four separate functions func1, func2, func3 and func4.</div><div class='add'>+The following shows a locking order of L1-&gt;L2-&gt;L3, but may not actually</div><div class='add'>+be directly nested that way.</div><div class='add'>+</div><div class='add'>+void func1(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(L1);</div><div class='add'>+</div><div class='add'>+	/* do anything */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(L1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void func2(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(L1);</div><div class='add'>+	mutex_lock(L2);</div><div class='add'>+</div><div class='add'>+	/* do something */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(L2);</div><div class='add'>+	mutex_unlock(L1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void func3(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(L2);</div><div class='add'>+	mutex_lock(L3);</div><div class='add'>+</div><div class='add'>+	/* do something else */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(L3);</div><div class='add'>+	mutex_unlock(L2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void func4(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(L3);</div><div class='add'>+</div><div class='add'>+	/* do something again */</div><div class='add'>+</div><div class='add'>+	mutex_unlock(L3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+Now we add 4 processes that run each of these functions separately.</div><div class='add'>+Processes A, B, C, and D which run functions func1, func2, func3 and func4</div><div class='add'>+respectively, and such that D runs first and A last.  With D being preempted</div><div class='add'>+in func4 in the "do something again" area, we have a locking that follows:</div><div class='add'>+</div><div class='add'>+D owns L3</div><div class='add'>+       C blocked on L3</div><div class='add'>+       C owns L2</div><div class='add'>+              B blocked on L2</div><div class='add'>+              B owns L1</div><div class='add'>+                     A blocked on L1</div><div class='add'>+</div><div class='add'>+And thus we have the chain A-&gt;L1-&gt;B-&gt;L2-&gt;C-&gt;L3-&gt;D.</div><div class='add'>+</div><div class='add'>+This gives us a PI depth of 4 (four processes), but looking at any of the</div><div class='add'>+functions individually, it seems as though they only have at most a locking</div><div class='add'>+depth of two.  So, although the locking depth is defined at compile time,</div><div class='add'>+it still is very difficult to find the possibilities of that depth.</div><div class='add'>+</div><div class='add'>+Now since mutexes can be defined by user-land applications, we don't want a DOS</div><div class='add'>+type of application that nests large amounts of mutexes to create a large</div><div class='add'>+PI chain, and have the code holding spin locks while looking at a large</div><div class='add'>+amount of data.  So to prevent this, the implementation not only implements</div><div class='add'>+a maximum lock depth, but also only holds at most two different locks at a</div><div class='add'>+time, as it walks the PI chain.  More about this below.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Mutex owner and flags</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The mutex structure contains a pointer to the owner of the mutex.  If the</div><div class='add'>+mutex is not owned, this owner is set to NULL.  Since all architectures</div><div class='add'>+have the task structure on at least a four byte alignment (and if this is</div><div class='add'>+not true, the rtmutex.c code will be broken!), this allows for the two</div><div class='add'>+least significant bits to be used as flags.  This part is also described</div><div class='add'>+in Documentation/rt-mutex.txt, but will also be briefly described here.</div><div class='add'>+</div><div class='add'>+Bit 0 is used as the "Pending Owner" flag.  This is described later.</div><div class='add'>+Bit 1 is used as the "Has Waiters" flags.  This is also described later</div><div class='add'>+  in more detail, but is set whenever there are waiters on a mutex.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+cmpxchg Tricks</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+Some architectures implement an atomic cmpxchg (Compare and Exchange).  This</div><div class='add'>+is used (when applicable) to keep the fast path of grabbing and releasing</div><div class='add'>+mutexes short.</div><div class='add'>+</div><div class='add'>+cmpxchg is basically the following function performed atomically:</div><div class='add'>+</div><div class='add'>+unsigned long _cmpxchg(unsigned long *A, unsigned long *B, unsigned long *C)</div><div class='add'>+{</div><div class='add'>+        unsigned long T = *A;</div><div class='add'>+        if (*A == *B) {</div><div class='add'>+                *A = *C;</div><div class='add'>+        }</div><div class='add'>+        return T;</div><div class='add'>+}</div><div class='add'>+#define cmpxchg(a,b,c) _cmpxchg(&amp;a,&amp;b,&amp;c)</div><div class='add'>+</div><div class='add'>+This is really nice to have, since it allows you to only update a variable</div><div class='add'>+if the variable is what you expect it to be.  You know if it succeeded if</div><div class='add'>+the return value (the old value of A) is equal to B.</div><div class='add'>+</div><div class='add'>+The macro rt_mutex_cmpxchg is used to try to lock and unlock mutexes. If</div><div class='add'>+the architecture does not support CMPXCHG, then this macro is simply set</div><div class='add'>+to fail every time.  But if CMPXCHG is supported, then this will</div><div class='add'>+help out extremely to keep the fast path short.</div><div class='add'>+</div><div class='add'>+The use of rt_mutex_cmpxchg with the flags in the owner field help optimize</div><div class='add'>+the system for architectures that support it.  This will also be explained</div><div class='add'>+later in this document.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Priority adjustments</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The implementation of the PI code in rtmutex.c has several places that a</div><div class='add'>+process must adjust its priority.  With the help of the pi_list of a</div><div class='add'>+process this is rather easy to know what needs to be adjusted.</div><div class='add'>+</div><div class='add'>+The functions implementing the task adjustments are rt_mutex_adjust_prio,</div><div class='add'>+__rt_mutex_adjust_prio (same as the former, but expects the task pi_lock</div><div class='add'>+to already be taken), rt_mutex_get_prio, and rt_mutex_setprio.</div><div class='add'>+</div><div class='add'>+rt_mutex_getprio and rt_mutex_setprio are only used in __rt_mutex_adjust_prio.</div><div class='add'>+</div><div class='add'>+rt_mutex_getprio returns the priority that the task should have.  Either the</div><div class='add'>+task's own normal priority, or if a process of a higher priority is waiting on</div><div class='add'>+a mutex owned by the task, then that higher priority should be returned.</div><div class='add'>+Since the pi_list of a task holds an order by priority list of all the top</div><div class='add'>+waiters of all the mutexes that the task owns, rt_mutex_getprio simply needs</div><div class='add'>+to compare the top pi waiter to its own normal priority, and return the higher</div><div class='add'>+priority back.</div><div class='add'>+</div><div class='add'>+(Note:  if looking at the code, you will notice that the lower number of</div><div class='add'>+        prio is returned.  This is because the prio field in the task structure</div><div class='add'>+        is an inverse order of the actual priority.  So a "prio" of 5 is</div><div class='add'>+        of higher priority than a "prio" of 10.)</div><div class='add'>+</div><div class='add'>+__rt_mutex_adjust_prio examines the result of rt_mutex_getprio, and if the</div><div class='add'>+result does not equal the task's current priority, then rt_mutex_setprio</div><div class='add'>+is called to adjust the priority of the task to the new priority.</div><div class='add'>+Note that rt_mutex_setprio is defined in kernel/sched.c to implement the</div><div class='add'>+actual change in priority.</div><div class='add'>+</div><div class='add'>+It is interesting to note that __rt_mutex_adjust_prio can either increase</div><div class='add'>+or decrease the priority of the task.  In the case that a higher priority</div><div class='add'>+process has just blocked on a mutex owned by the task, __rt_mutex_adjust_prio</div><div class='add'>+would increase/boost the task's priority.  But if a higher priority task</div><div class='add'>+were for some reason to leave the mutex (timeout or signal), this same function</div><div class='add'>+would decrease/unboost the priority of the task.  That is because the pi_list</div><div class='add'>+always contains the highest priority task that is waiting on a mutex owned</div><div class='add'>+by the task, so we only need to compare the priority of that top pi waiter</div><div class='add'>+to the normal priority of the given task.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+High level overview of the PI chain walk</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+The PI chain walk is implemented by the function rt_mutex_adjust_prio_chain.</div><div class='add'>+</div><div class='add'>+The implementation has gone through several iterations, and has ended up</div><div class='add'>+with what we believe is the best.  It walks the PI chain by only grabbing</div><div class='add'>+at most two locks at a time, and is very efficient.</div><div class='add'>+</div><div class='add'>+The rt_mutex_adjust_prio_chain can be used either to boost or lower process</div><div class='add'>+priorities.</div><div class='add'>+</div><div class='add'>+rt_mutex_adjust_prio_chain is called with a task to be checked for PI</div><div class='add'>+(de)boosting (the owner of a mutex that a process is blocking on), a flag to</div><div class='add'>+check for deadlocking, the mutex that the task owns, and a pointer to a waiter</div><div class='add'>+that is the process's waiter struct that is blocked on the mutex (although this</div><div class='add'>+parameter may be NULL for deboosting).</div><div class='add'>+</div><div class='add'>+For this explanation, I will not mention deadlock detection. This explanation</div><div class='add'>+will try to stay at a high level.</div><div class='add'>+</div><div class='add'>+When this function is called, there are no locks held.  That also means</div><div class='add'>+that the state of the owner and lock can change when entered into this function.</div><div class='add'>+</div><div class='add'>+Before this function is called, the task has already had rt_mutex_adjust_prio</div><div class='add'>+performed on it.  This means that the task is set to the priority that it</div><div class='add'>+should be at, but the plist nodes of the task's waiter have not been updated</div><div class='add'>+with the new priorities, and that this task may not be in the proper locations</div><div class='add'>+in the pi_lists and wait_lists that the task is blocked on.  This function</div><div class='add'>+solves all that.</div><div class='add'>+</div><div class='add'>+A loop is entered, where task is the owner to be checked for PI changes that</div><div class='add'>+was passed by parameter (for the first iteration).  The pi_lock of this task is</div><div class='add'>+taken to prevent any more changes to the pi_list of the task.  This also</div><div class='add'>+prevents new tasks from completing the blocking on a mutex that is owned by this</div><div class='add'>+task.</div><div class='add'>+</div><div class='add'>+If the task is not blocked on a mutex then the loop is exited.  We are at</div><div class='add'>+the top of the PI chain.</div><div class='add'>+</div><div class='add'>+A check is now done to see if the original waiter (the process that is blocked</div><div class='add'>+on the current mutex) is the top pi waiter of the task.  That is, is this</div><div class='add'>+waiter on the top of the task's pi_list.  If it is not, it either means that</div><div class='add'>+there is another process higher in priority that is blocked on one of the</div><div class='add'>+mutexes that the task owns, or that the waiter has just woken up via a signal</div><div class='add'>+or timeout and has left the PI chain.  In either case, the loop is exited, since</div><div class='add'>+we don't need to do any more changes to the priority of the current task, or any</div><div class='add'>+task that owns a mutex that this current task is waiting on.  A priority chain</div><div class='add'>+walk is only needed when a new top pi waiter is made to a task.</div><div class='add'>+</div><div class='add'>+The next check sees if the task's waiter plist node has the priority equal to</div><div class='add'>+the priority the task is set at.  If they are equal, then we are done with</div><div class='add'>+the loop.  Remember that the function started with the priority of the</div><div class='add'>+task adjusted, but the plist nodes that hold the task in other processes</div><div class='add'>+pi_lists have not been adjusted.</div><div class='add'>+</div><div class='add'>+Next, we look at the mutex that the task is blocked on. The mutex's wait_lock</div><div class='add'>+is taken.  This is done by a spin_trylock, because the locking order of the</div><div class='add'>+pi_lock and wait_lock goes in the opposite direction. If we fail to grab the</div><div class='add'>+lock, the pi_lock is released, and we restart the loop.</div><div class='add'>+</div><div class='add'>+Now that we have both the pi_lock of the task as well as the wait_lock of</div><div class='add'>+the mutex the task is blocked on, we update the task's waiter's plist node</div><div class='add'>+that is located on the mutex's wait_list.</div><div class='add'>+</div><div class='add'>+Now we release the pi_lock of the task.</div><div class='add'>+</div><div class='add'>+Next the owner of the mutex has its pi_lock taken, so we can update the</div><div class='add'>+task's entry in the owner's pi_list.  If the task is the highest priority</div><div class='add'>+process on the mutex's wait_list, then we remove the previous top waiter</div><div class='add'>+from the owner's pi_list, and replace it with the task.</div><div class='add'>+</div><div class='add'>+Note: It is possible that the task was the current top waiter on the mutex,</div><div class='add'>+      in which case the task is not yet on the pi_list of the waiter.  This</div><div class='add'>+      is OK, since plist_del does nothing if the plist node is not on any</div><div class='add'>+      list.</div><div class='add'>+</div><div class='add'>+If the task was not the top waiter of the mutex, but it was before we</div><div class='add'>+did the priority updates, that means we are deboosting/lowering the</div><div class='add'>+task.  In this case, the task is removed from the pi_list of the owner,</div><div class='add'>+and the new top waiter is added.</div><div class='add'>+</div><div class='add'>+Lastly, we unlock both the pi_lock of the task, as well as the mutex's</div><div class='add'>+wait_lock, and continue the loop again.  On the next iteration of the</div><div class='add'>+loop, the previous owner of the mutex will be the task that will be</div><div class='add'>+processed.</div><div class='add'>+</div><div class='add'>+Note: One might think that the owner of this mutex might have changed</div><div class='add'>+      since we just grab the mutex's wait_lock. And one could be right.</div><div class='add'>+      The important thing to remember is that the owner could not have</div><div class='add'>+      become the task that is being processed in the PI chain, since</div><div class='add'>+      we have taken that task's pi_lock at the beginning of the loop.</div><div class='add'>+      So as long as there is an owner of this mutex that is not the same</div><div class='add'>+      process as the tasked being worked on, we are OK.</div><div class='add'>+</div><div class='add'>+      Looking closely at the code, one might be confused.  The check for the</div><div class='add'>+      end of the PI chain is when the task isn't blocked on anything or the</div><div class='add'>+      task's waiter structure "task" element is NULL.  This check is</div><div class='add'>+      protected only by the task's pi_lock.  But the code to unlock the mutex</div><div class='add'>+      sets the task's waiter structure "task" element to NULL with only</div><div class='add'>+      the protection of the mutex's wait_lock, which was not taken yet.</div><div class='add'>+      Isn't this a race condition if the task becomes the new owner?</div><div class='add'>+</div><div class='add'>+      The answer is No!  The trick is the spin_trylock of the mutex's</div><div class='add'>+      wait_lock.  If we fail that lock, we release the pi_lock of the</div><div class='add'>+      task and continue the loop, doing the end of PI chain check again.</div><div class='add'>+</div><div class='add'>+      In the code to release the lock, the wait_lock of the mutex is held</div><div class='add'>+      the entire time, and it is not let go when we grab the pi_lock of the</div><div class='add'>+      new owner of the mutex.  So if the switch of a new owner were to happen</div><div class='add'>+      after the check for end of the PI chain and the grabbing of the</div><div class='add'>+      wait_lock, the unlocking code would spin on the new owner's pi_lock</div><div class='add'>+      but never give up the wait_lock.  So the PI chain loop is guaranteed to</div><div class='add'>+      fail the spin_trylock on the wait_lock, release the pi_lock, and</div><div class='add'>+      try again.</div><div class='add'>+</div><div class='add'>+      If you don't quite understand the above, that's OK. You don't have to,</div><div class='add'>+      unless you really want to make a proof out of it ;)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Pending Owners and Lock stealing</div><div class='add'>+--------------------------------</div><div class='add'>+</div><div class='add'>+One of the flags in the owner field of the mutex structure is "Pending Owner".</div><div class='add'>+What this means is that an owner was chosen by the process releasing the</div><div class='add'>+mutex, but that owner has yet to wake up and actually take the mutex.</div><div class='add'>+</div><div class='add'>+Why is this important?  Why can't we just give the mutex to another process</div><div class='add'>+and be done with it?</div><div class='add'>+</div><div class='add'>+The PI code is to help with real-time processes, and to let the highest</div><div class='add'>+priority process run as long as possible with little latencies and delays.</div><div class='add'>+If a high priority process owns a mutex that a lower priority process is</div><div class='add'>+blocked on, when the mutex is released it would be given to the lower priority</div><div class='add'>+process.  What if the higher priority process wants to take that mutex again.</div><div class='add'>+The high priority process would fail to take that mutex that it just gave up</div><div class='add'>+and it would need to boost the lower priority process to run with full</div><div class='add'>+latency of that critical section (since the low priority process just entered</div><div class='add'>+it).</div><div class='add'>+</div><div class='add'>+There's no reason a high priority process that gives up a mutex should be</div><div class='add'>+penalized if it tries to take that mutex again.  If the new owner of the</div><div class='add'>+mutex has not woken up yet, there's no reason that the higher priority process</div><div class='add'>+could not take that mutex away.</div><div class='add'>+</div><div class='add'>+To solve this, we introduced Pending Ownership and Lock Stealing.  When a</div><div class='add'>+new process is given a mutex that it was blocked on, it is only given</div><div class='add'>+pending ownership.  This means that it's the new owner, unless a higher</div><div class='add'>+priority process comes in and tries to grab that mutex.  If a higher priority</div><div class='add'>+process does come along and wants that mutex, we let the higher priority</div><div class='add'>+process "steal" the mutex from the pending owner (only if it is still pending)</div><div class='add'>+and continue with the mutex.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Taking of a mutex (The walk through)</div><div class='add'>+------------------------------------</div><div class='add'>+</div><div class='add'>+OK, now let's take a look at the detailed walk through of what happens when</div><div class='add'>+taking a mutex.</div><div class='add'>+</div><div class='add'>+The first thing that is tried is the fast taking of the mutex.  This is</div><div class='add'>+done when we have CMPXCHG enabled (otherwise the fast taking automatically</div><div class='add'>+fails).  Only when the owner field of the mutex is NULL can the lock be</div><div class='add'>+taken with the CMPXCHG and nothing else needs to be done.</div><div class='add'>+</div><div class='add'>+If there is contention on the lock, whether it is owned or pending owner</div><div class='add'>+we go about the slow path (rt_mutex_slowlock).</div><div class='add'>+</div><div class='add'>+The slow path function is where the task's waiter structure is created on</div><div class='add'>+the stack.  This is because the waiter structure is only needed for the</div><div class='add'>+scope of this function.  The waiter structure holds the nodes to store</div><div class='add'>+the task on the wait_list of the mutex, and if need be, the pi_list of</div><div class='add'>+the owner.</div><div class='add'>+</div><div class='add'>+The wait_lock of the mutex is taken since the slow path of unlocking the</div><div class='add'>+mutex also takes this lock.</div><div class='add'>+</div><div class='add'>+We then call try_to_take_rt_mutex.  This is where the architecture that</div><div class='add'>+does not implement CMPXCHG would always grab the lock (if there's no</div><div class='add'>+contention).</div><div class='add'>+</div><div class='add'>+try_to_take_rt_mutex is used every time the task tries to grab a mutex in the</div><div class='add'>+slow path.  The first thing that is done here is an atomic setting of</div><div class='add'>+the "Has Waiters" flag of the mutex's owner field.  Yes, this could really</div><div class='add'>+be false, because if the the mutex has no owner, there are no waiters and</div><div class='add'>+the current task also won't have any waiters.  But we don't have the lock</div><div class='add'>+yet, so we assume we are going to be a waiter.  The reason for this is to</div><div class='add'>+play nice for those architectures that do have CMPXCHG.  By setting this flag</div><div class='add'>+now, the owner of the mutex can't release the mutex without going into the</div><div class='add'>+slow unlock path, and it would then need to grab the wait_lock, which this</div><div class='add'>+code currently holds.  So setting the "Has Waiters" flag forces the owner</div><div class='add'>+to synchronize with this code.</div><div class='add'>+</div><div class='add'>+Now that we know that we can't have any races with the owner releasing the</div><div class='add'>+mutex, we check to see if we can take the ownership.  This is done if the</div><div class='add'>+mutex doesn't have a owner, or if we can steal the mutex from a pending</div><div class='add'>+owner.  Let's look at the situations we have here.</div><div class='add'>+</div><div class='add'>+  1) Has owner that is pending</div><div class='add'>+  ----------------------------</div><div class='add'>+</div><div class='add'>+  The mutex has a owner, but it hasn't woken up and the mutex flag</div><div class='add'>+  "Pending Owner" is set.  The first check is to see if the owner isn't the</div><div class='add'>+  current task.  This is because this function is also used for the pending</div><div class='add'>+  owner to grab the mutex.  When a pending owner wakes up, it checks to see</div><div class='add'>+  if it can take the mutex, and this is done if the owner is already set to</div><div class='add'>+  itself.  If so, we succeed and leave the function, clearing the "Pending</div><div class='add'>+  Owner" bit.</div><div class='add'>+</div><div class='add'>+  If the pending owner is not current, we check to see if the current priority is</div><div class='add'>+  higher than the pending owner.  If not, we fail the function and return.</div><div class='add'>+</div><div class='add'>+  There's also something special about a pending owner.  That is a pending owner</div><div class='add'>+  is never blocked on a mutex.  So there is no PI chain to worry about.  It also</div><div class='add'>+  means that if the mutex doesn't have any waiters, there's no accounting needed</div><div class='add'>+  to update the pending owner's pi_list, since we only worry about processes</div><div class='add'>+  blocked on the current mutex.</div><div class='add'>+</div><div class='add'>+  If there are waiters on this mutex, and we just stole the ownership, we need</div><div class='add'>+  to take the top waiter, remove it from the pi_list of the pending owner, and</div><div class='add'>+  add it to the current pi_list.  Note that at this moment, the pending owner</div><div class='add'>+  is no longer on the list of waiters.  This is fine, since the pending owner</div><div class='add'>+  would add itself back when it realizes that it had the ownership stolen</div><div class='add'>+  from itself.  When the pending owner tries to grab the mutex, it will fail</div><div class='add'>+  in try_to_take_rt_mutex if the owner field points to another process.</div><div class='add'>+</div><div class='add'>+  2) No owner</div><div class='add'>+  -----------</div><div class='add'>+</div><div class='add'>+  If there is no owner (or we successfully stole the lock), we set the owner</div><div class='add'>+  of the mutex to current, and set the flag of "Has Waiters" if the current</div><div class='add'>+  mutex actually has waiters, or we clear the flag if it doesn't.  See, it was</div><div class='add'>+  OK that we set that flag early, since now it is cleared.</div><div class='add'>+</div><div class='add'>+  3) Failed to grab ownership</div><div class='add'>+  ---------------------------</div><div class='add'>+</div><div class='add'>+  The most interesting case is when we fail to take ownership. This means that</div><div class='add'>+  there exists an owner, or there's a pending owner with equal or higher</div><div class='add'>+  priority than the current task.</div><div class='add'>+</div><div class='add'>+We'll continue on the failed case.</div><div class='add'>+</div><div class='add'>+If the mutex has a timeout, we set up a timer to go off to break us out</div><div class='add'>+of this mutex if we failed to get it after a specified amount of time.</div><div class='add'>+</div><div class='add'>+Now we enter a loop that will continue to try to take ownership of the mutex, or</div><div class='add'>+fail from a timeout or signal.</div><div class='add'>+</div><div class='add'>+Once again we try to take the mutex.  This will usually fail the first time</div><div class='add'>+in the loop, since it had just failed to get the mutex.  But the second time</div><div class='add'>+in the loop, this would likely succeed, since the task would likely be</div><div class='add'>+the pending owner.</div><div class='add'>+</div><div class='add'>+If the mutex is TASK_INTERRUPTIBLE a check for signals and timeout is done</div><div class='add'>+here.</div><div class='add'>+</div><div class='add'>+The waiter structure has a "task" field that points to the task that is blocked</div><div class='add'>+on the mutex.  This field can be NULL the first time it goes through the loop</div><div class='add'>+or if the task is a pending owner and had it's mutex stolen.  If the "task"</div><div class='add'>+field is NULL then we need to set up the accounting for it.</div><div class='add'>+</div><div class='add'>+Task blocks on mutex</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+The accounting of a mutex and process is done with the waiter structure of</div><div class='add'>+the process.  The "task" field is set to the process, and the "lock" field</div><div class='add'>+to the mutex.  The plist nodes are initialized to the processes current</div><div class='add'>+priority.</div><div class='add'>+</div><div class='add'>+Since the wait_lock was taken at the entry of the slow lock, we can safely</div><div class='add'>+add the waiter to the wait_list.  If the current process is the highest</div><div class='add'>+priority process currently waiting on this mutex, then we remove the</div><div class='add'>+previous top waiter process (if it exists) from the pi_list of the owner,</div><div class='add'>+and add the current process to that list.  Since the pi_list of the owner</div><div class='add'>+has changed, we call rt_mutex_adjust_prio on the owner to see if the owner</div><div class='add'>+should adjust its priority accordingly.</div><div class='add'>+</div><div class='add'>+If the owner is also blocked on a lock, and had its pi_list changed</div><div class='add'>+(or deadlock checking is on), we unlock the wait_lock of the mutex and go ahead</div><div class='add'>+and run rt_mutex_adjust_prio_chain on the owner, as described earlier.</div><div class='add'>+</div><div class='add'>+Now all locks are released, and if the current process is still blocked on a</div><div class='add'>+mutex (waiter "task" field is not NULL), then we go to sleep (call schedule).</div><div class='add'>+</div><div class='add'>+Waking up in the loop</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The schedule can then wake up for a few reasons.</div><div class='add'>+  1) we were given pending ownership of the mutex.</div><div class='add'>+  2) we received a signal and was TASK_INTERRUPTIBLE</div><div class='add'>+  3) we had a timeout and was TASK_INTERRUPTIBLE</div><div class='add'>+</div><div class='add'>+In any of these cases, we continue the loop and once again try to grab the</div><div class='add'>+ownership of the mutex.  If we succeed, we exit the loop, otherwise we continue</div><div class='add'>+and on signal and timeout, will exit the loop, or if we had the mutex stolen</div><div class='add'>+we just simply add ourselves back on the lists and go back to sleep.</div><div class='add'>+</div><div class='add'>+Note: For various reasons, because of timeout and signals, the steal mutex</div><div class='add'>+      algorithm needs to be careful. This is because the current process is</div><div class='add'>+      still on the wait_list. And because of dynamic changing of priorities,</div><div class='add'>+      especially on SCHED_OTHER tasks, the current process can be the</div><div class='add'>+      highest priority task on the wait_list.</div><div class='add'>+</div><div class='add'>+Failed to get mutex on Timeout or Signal</div><div class='add'>+----------------------------------------</div><div class='add'>+</div><div class='add'>+If a timeout or signal occurred, the waiter's "task" field would not be</div><div class='add'>+NULL and the task needs to be taken off the wait_list of the mutex and perhaps</div><div class='add'>+pi_list of the owner.  If this process was a high priority process, then</div><div class='add'>+the rt_mutex_adjust_prio_chain needs to be executed again on the owner,</div><div class='add'>+but this time it will be lowering the priorities.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Unlocking the Mutex</div><div class='add'>+-------------------</div><div class='add'>+</div><div class='add'>+The unlocking of a mutex also has a fast path for those architectures with</div><div class='add'>+CMPXCHG.  Since the taking of a mutex on contention always sets the</div><div class='add'>+"Has Waiters" flag of the mutex's owner, we use this to know if we need to</div><div class='add'>+take the slow path when unlocking the mutex.  If the mutex doesn't have any</div><div class='add'>+waiters, the owner field of the mutex would equal the current process and</div><div class='add'>+the mutex can be unlocked by just replacing the owner field with NULL.</div><div class='add'>+</div><div class='add'>+If the owner field has the "Has Waiters" bit set (or CMPXCHG is not available),</div><div class='add'>+the slow unlock path is taken.</div><div class='add'>+</div><div class='add'>+The first thing done in the slow unlock path is to take the wait_lock of the</div><div class='add'>+mutex.  This synchronizes the locking and unlocking of the mutex.</div><div class='add'>+</div><div class='add'>+A check is made to see if the mutex has waiters or not.  On architectures that</div><div class='add'>+do not have CMPXCHG, this is the location that the owner of the mutex will</div><div class='add'>+determine if a waiter needs to be awoken or not.  On architectures that</div><div class='add'>+do have CMPXCHG, that check is done in the fast path, but it is still needed</div><div class='add'>+in the slow path too.  If a waiter of a mutex woke up because of a signal</div><div class='add'>+or timeout between the time the owner failed the fast path CMPXCHG check and</div><div class='add'>+the grabbing of the wait_lock, the mutex may not have any waiters, thus the</div><div class='add'>+owner still needs to make this check. If there are no waiters than the mutex</div><div class='add'>+owner field is set to NULL, the wait_lock is released and nothing more is</div><div class='add'>+needed.</div><div class='add'>+</div><div class='add'>+If there are waiters, then we need to wake one up and give that waiter</div><div class='add'>+pending ownership.</div><div class='add'>+</div><div class='add'>+On the wake up code, the pi_lock of the current owner is taken.  The top</div><div class='add'>+waiter of the lock is found and removed from the wait_list of the mutex</div><div class='add'>+as well as the pi_list of the current owner.  The task field of the new</div><div class='add'>+pending owner's waiter structure is set to NULL, and the owner field of the</div><div class='add'>+mutex is set to the new owner with the "Pending Owner" bit set, as well</div><div class='add'>+as the "Has Waiters" bit if there still are other processes blocked on the</div><div class='add'>+mutex.</div><div class='add'>+</div><div class='add'>+The pi_lock of the previous owner is released, and the new pending owner's</div><div class='add'>+pi_lock is taken.  Remember that this is the trick to prevent the race</div><div class='add'>+condition in rt_mutex_adjust_prio_chain from adding itself as a waiter</div><div class='add'>+on the mutex.</div><div class='add'>+</div><div class='add'>+We now clear the "pi_blocked_on" field of the new pending owner, and if</div><div class='add'>+the mutex still has waiters pending, we add the new top waiter to the pi_list</div><div class='add'>+of the pending owner.</div><div class='add'>+</div><div class='add'>+Finally we unlock the pi_lock of the pending owner and wake it up.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Contact</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+For updates on this document, please email Steven Rostedt &lt;rostedt@goodmis.org&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Credits</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+Author:  Steven Rostedt &lt;rostedt@goodmis.org&gt;</div><div class='add'>+</div><div class='add'>+Reviewers:  Ingo Molnar, Thomas Gleixner, Thomas Duetsch, and Randy Dunlap</div><div class='add'>+</div><div class='add'>+Updates</div><div class='add'>+-------</div><div class='add'>+</div><div class='add'>+This document was originally written for 2.6.17-rc3-mm1</div><div class='head'>diff --git a/Documentation/rt-mutex.txt b/Documentation/rt-mutex.txt<br/>new file mode 100644<br/>index 000000000000..243393d882ee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/rt-mutex.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/rt-mutex.txt</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+RT-mutex subsystem with PI support</div><div class='add'>+----------------------------------</div><div class='add'>+</div><div class='add'>+RT-mutexes with priority inheritance are used to support PI-futexes,</div><div class='add'>+which enable pthread_mutex_t priority inheritance attributes</div><div class='add'>+(PTHREAD_PRIO_INHERIT). [See Documentation/pi-futex.txt for more details</div><div class='add'>+about PI-futexes.]</div><div class='add'>+</div><div class='add'>+This technology was developed in the -rt tree and streamlined for</div><div class='add'>+pthread_mutex support.</div><div class='add'>+</div><div class='add'>+Basic principles:</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+RT-mutexes extend the semantics of simple mutexes by the priority</div><div class='add'>+inheritance protocol.</div><div class='add'>+</div><div class='add'>+A low priority owner of a rt-mutex inherits the priority of a higher</div><div class='add'>+priority waiter until the rt-mutex is released. If the temporarily</div><div class='add'>+boosted owner blocks on a rt-mutex itself it propagates the priority</div><div class='add'>+boosting to the owner of the other rt_mutex it gets blocked on. The</div><div class='add'>+priority boosting is immediately removed once the rt_mutex has been</div><div class='add'>+unlocked.</div><div class='add'>+</div><div class='add'>+This approach allows us to shorten the block of high-prio tasks on</div><div class='add'>+mutexes which protect shared resources. Priority inheritance is not a</div><div class='add'>+magic bullet for poorly designed applications, but it allows</div><div class='add'>+well-designed applications to use userspace locks in critical parts of</div><div class='add'>+an high priority thread, without losing determinism.</div><div class='add'>+</div><div class='add'>+The enqueueing of the waiters into the rtmutex waiter list is done in</div><div class='add'>+priority order. For same priorities FIFO order is chosen. For each</div><div class='add'>+rtmutex, only the top priority waiter is enqueued into the owner's</div><div class='add'>+priority waiters list. This list too queues in priority order. Whenever</div><div class='add'>+the top priority waiter of a task changes (for example it timed out or</div><div class='add'>+got a signal), the priority of the owner task is readjusted. [The</div><div class='add'>+priority enqueueing is handled by "plists", see include/linux/plist.h</div><div class='add'>+for more details.]</div><div class='add'>+</div><div class='add'>+RT-mutexes are optimized for fastpath operations and have no internal</div><div class='add'>+locking overhead when locking an uncontended mutex or unlocking a mutex</div><div class='add'>+without waiters. The optimized fastpath operations require cmpxchg</div><div class='add'>+support. [If that is not available then the rt-mutex internal spinlock</div><div class='add'>+is used]</div><div class='add'>+</div><div class='add'>+The state of the rt-mutex is tracked via the owner field of the rt-mutex</div><div class='add'>+structure:</div><div class='add'>+</div><div class='add'>+rt_mutex-&gt;owner holds the task_struct pointer of the owner. Bit 0 and 1</div><div class='add'>+are used to keep track of the "owner is pending" and "rtmutex has</div><div class='add'>+waiters" state.</div><div class='add'>+</div><div class='add'>+ owner		bit1	bit0</div><div class='add'>+ NULL		0	0	mutex is free (fast acquire possible)</div><div class='add'>+ NULL		0	1	invalid state</div><div class='add'>+ NULL		1	0	Transitional state*</div><div class='add'>+ NULL		1	1	invalid state</div><div class='add'>+ taskpointer	0	0	mutex is held (fast release possible)</div><div class='add'>+ taskpointer	0	1	task is pending owner</div><div class='add'>+ taskpointer	1	0	mutex is held and has waiters</div><div class='add'>+ taskpointer	1	1	task is pending owner and mutex has waiters</div><div class='add'>+</div><div class='add'>+Pending-ownership handling is a performance optimization:</div><div class='add'>+pending-ownership is assigned to the first (highest priority) waiter of</div><div class='add'>+the mutex, when the mutex is released. The thread is woken up and once</div><div class='add'>+it starts executing it can acquire the mutex. Until the mutex is taken</div><div class='add'>+by it (bit 0 is cleared) a competing higher priority thread can "steal"</div><div class='add'>+the mutex which puts the woken up thread back on the waiters list.</div><div class='add'>+</div><div class='add'>+The pending-ownership optimization is especially important for the</div><div class='add'>+uninterrupted workflow of high-prio tasks which repeatedly</div><div class='add'>+takes/releases locks that have lower-prio waiters. Without this</div><div class='add'>+optimization the higher-prio thread would ping-pong to the lower-prio</div><div class='add'>+task [because at unlock time we always assign a new owner].</div><div class='add'>+</div><div class='add'>+(*) The "mutex has waiters" bit gets set to take the lock. If the lock</div><div class='add'>+doesn't already have an owner, this bit is quickly cleared if there are</div><div class='add'>+no waiters.  So this is a transitional state to synchronize with looking</div><div class='add'>+at the owner field of the mutex and the mutex owner releasing the lock.</div><div class='head'>diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt<br/>index 95d17b3e2eee..2a58f985795a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/rtc.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/rtc.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/rtc.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/rtc.txt</a></div><div class='hunk'>@@ -44,8 +44,10 @@ normal timer interrupt, which is 100Hz.</div><div class='ctx'> Programming and/or enabling interrupt frequencies greater than 64Hz is</div><div class='ctx'> only allowed by root. This is perhaps a bit conservative, but we don't want</div><div class='ctx'> an evil user generating lots of IRQs on a slow 386sx-16, where it might have</div><div class='del'>-a negative impact on performance.  Note that the interrupt handler is only</div><div class='del'>-a few lines of code to minimize any possibility of this effect.</div><div class='add'>+a negative impact on performance. This 64Hz limit can be changed by writing</div><div class='add'>+a different value to /proc/sys/dev/rtc/max-user-freq. Note that the</div><div class='add'>+interrupt handler is only a few lines of code to minimize any possibility</div><div class='add'>+of this effect.</div><div class='ctx'> </div><div class='ctx'> Also, if the kernel time is synchronized with an external source, the </div><div class='ctx'> kernel will write the time back to the CMOS clock every 11 minutes. In </div><div class='hunk'>@@ -81,6 +83,7 @@ that will be using this driver.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;sys/ioctl.h&gt;</div><div class='ctx'> #include &lt;sys/time.h&gt;</div><div class='head'>diff --git a/Documentation/scsi/00-INDEX b/Documentation/scsi/00-INDEX<br/>index e7da8c3a255b..12354830c6b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/00-INDEX?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/00-INDEX</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/00-INDEX?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/scsi/00-INDEX</a></div><div class='hunk'>@@ -30,8 +30,6 @@ aic7xxx.txt</div><div class='ctx'> 	- info on driver for Adaptec controllers</div><div class='ctx'> aic7xxx_old.txt</div><div class='ctx'> 	- info on driver for Adaptec controllers, old generation</div><div class='del'>-cpqfc.txt</div><div class='del'>-	- info on driver for Compaq Tachyon TS adapters</div><div class='ctx'> dpti.txt</div><div class='ctx'> 	- info on driver for DPT SmartRAID and Adaptec I2O RAID based adapters</div><div class='ctx'> dtc3x80.txt</div><div class='head'>diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas<br/>index 2dafa63bd370..d9e5960dafd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/ChangeLog.megaraid_sas?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/ChangeLog.megaraid_sas</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/ChangeLog.megaraid_sas?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/scsi/ChangeLog.megaraid_sas</a></div><div class='hunk'>@@ -1,3 +1,32 @@</div><div class='add'>+</div><div class='add'>+1 Release Date    : Sun May 14 22:49:52 PDT 2006 - Sumant Patro &lt;Sumant.Patro@lsil.com&gt;</div><div class='add'>+2 Current Version : 00.00.03.01</div><div class='add'>+3 Older Version   : 00.00.02.04</div><div class='add'>+</div><div class='add'>+i.	Added support for ZCR controller.</div><div class='add'>+</div><div class='add'>+		New device id 0x413 added.</div><div class='add'>+</div><div class='add'>+ii.	Bug fix : Disable controller interrupt before firing INIT cmd to FW.</div><div class='add'>+</div><div class='add'>+		Interrupt is enabled after required initialization is over.</div><div class='add'>+		This is done to ensure that driver is ready to handle interrupts when</div><div class='add'>+		it is generated by the controller.</div><div class='add'>+</div><div class='add'>+		-Sumant Patro &lt;Sumant.Patro@lsil.com&gt;</div><div class='add'>+</div><div class='add'>+1 Release Date    : Wed Feb 03 14:31:44 PST 2006 - Sumant Patro &lt;Sumant.Patro@lsil.com&gt;</div><div class='add'>+2 Current Version : 00.00.02.04</div><div class='add'>+3 Older Version   : 00.00.02.04 </div><div class='add'>+</div><div class='add'>+i.	Remove superflous instance_lock</div><div class='add'>+</div><div class='add'>+	gets rid of the otherwise superflous instance_lock and avoids an unsave </div><div class='add'>+	unsynchronized access in the error handler.</div><div class='add'>+</div><div class='add'>+		- Christoph Hellwig &lt;hch@lst.de&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 1 Release Date    : Wed Feb 03 14:31:44 PST 2006 - Sumant Patro &lt;Sumant.Patro@lsil.com&gt;</div><div class='ctx'> 2 Current Version : 00.00.02.04</div><div class='ctx'> 3 Older Version   : 00.00.02.04 </div><div class='head'>diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt<br/>index 820fd0793502..be55670851a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/aacraid.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/aacraid.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/aacraid.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/scsi/aacraid.txt</a></div><div class='hunk'>@@ -24,10 +24,10 @@ Supported Cards/Chipsets</div><div class='ctx'> 	9005:0285:9005:0296	Adaptec	2240S (SabreExpress)</div><div class='ctx'> 	9005:0285:9005:0290	Adaptec	2410SA (Jaguar)</div><div class='ctx'> 	9005:0285:9005:0293	Adaptec 21610SA (Corsair-16)</div><div class='del'>-	9005:0285:103c:3227	Adaptec 2610SA (Bearcat)</div><div class='add'>+	9005:0285:103c:3227	Adaptec 2610SA (Bearcat HP release)</div><div class='ctx'> 	9005:0285:9005:0292	Adaptec	2810SA (Corsair-8)</div><div class='ctx'> 	9005:0285:9005:0294	Adaptec	Prowler</div><div class='del'>-	9005:0286:9005:029d	Adaptec	2420SA (Intruder)</div><div class='add'>+	9005:0286:9005:029d	Adaptec	2420SA (Intruder HP release)</div><div class='ctx'> 	9005:0286:9005:029c	Adaptec	2620SA (Intruder)</div><div class='ctx'> 	9005:0286:9005:029b	Adaptec	2820SA (Intruder)</div><div class='ctx'> 	9005:0286:9005:02a7	Adaptec	2830SA (Skyray)</div><div class='hunk'>@@ -38,7 +38,7 @@ Supported Cards/Chipsets</div><div class='ctx'> 	9005:0285:9005:0297	Adaptec	4005SAS (AvonPark)</div><div class='ctx'> 	9005:0285:9005:0299	Adaptec	4800SAS (Marauder-X)</div><div class='ctx'> 	9005:0285:9005:029a	Adaptec	4805SAS (Marauder-E)</div><div class='del'>-	9005:0286:9005:02a2	Adaptec	4810SAS (Hurricane)</div><div class='add'>+	9005:0286:9005:02a2	Adaptec	3800SAS (Hurricane44)</div><div class='ctx'> 	1011:0046:9005:0364	Adaptec	5400S (Mustang)</div><div class='ctx'> 	1011:0046:9005:0365	Adaptec	5400S (Mustang)</div><div class='ctx'> 	9005:0283:9005:0283	Adaptec	Catapult (3210S with arc firmware)</div><div class='hunk'>@@ -72,7 +72,7 @@ Supported Cards/Chipsets</div><div class='ctx'> 	9005:0286:9005:02a1	ICP	ICP9087MA (Lancer)</div><div class='ctx'> 	9005:0286:9005:02a4	ICP	ICP9085LI (Marauder-X)</div><div class='ctx'> 	9005:0286:9005:02a5	ICP	ICP5085BR (Marauder-E)</div><div class='del'>-	9005:0286:9005:02a3	ICP	ICP5085AU (Hurricane)</div><div class='add'>+	9005:0286:9005:02a3	ICP	ICP5445AU (Hurricane44)</div><div class='ctx'> 	9005:0286:9005:02a6	ICP	ICP9067MA (Intruder-6)</div><div class='ctx'> 	9005:0286:9005:02a9	ICP	ICP5087AU (Skyray)</div><div class='ctx'> 	9005:0286:9005:02aa	ICP	ICP5047AU (Skyray)</div><div class='head'>diff --git a/Documentation/scsi/cpqfc.txt b/Documentation/scsi/cpqfc.txt<br/>deleted file mode 100644<br/>index dd33e61c0645..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/cpqfc.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/cpqfc.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,272 +0,0 @@</div><div class='del'>-Notes for CPQFCTS driver for Compaq Tachyon TS</div><div class='del'>-Fibre Channel Host Bus Adapter, PCI 64-bit, 66MHz</div><div class='del'>-for Linux (RH 6.1, 6.2 kernel 2.2.12-32, 2.2.14-5)</div><div class='del'>-SMP tested</div><div class='del'>-Tested in single and dual HBA configuration, 32 and 64bit busses,</div><div class='del'>-33 and 66MHz.  Only supports FC-AL.</div><div class='del'>-SEST size 512 Exchanges (simultaneous I/Os) limited by module kmalloc() </div><div class='del'>-	max of 128k bytes contiguous.</div><div class='del'>-</div><div class='del'>-Ver 2.5.4  Oct 03, 2002</div><div class='del'>-   * fixed memcpy of sense buffer in ioctl to copy the smaller defined size</div><div class='del'>-Ver 2.5.3  Aug 01, 2002</div><div class='del'>-   * fix the passthru ioctl to handle the Scsi_Cmnd-&gt;request being a pointer</div><div class='del'>-Ver 2.5.1  Jul 30, 2002</div><div class='del'>-   * fix ioctl to pay attention to the specified LUN.</div><div class='del'>-Ver 2.5.0  Nov 29, 2001</div><div class='del'>-   * eliminated io_request_lock.  This change makes the driver specific</div><div class='del'>-     to the 2.5.x kernels.</div><div class='del'>-   * silenced excessively noisy printks.</div><div class='del'>-</div><div class='del'>-Ver 2.1.2  July 23, 2002</div><div class='del'>-   * initialize DumCmnd-&gt;lun in cpqfcTS_ioctl (used in fcFindLoggedInPorts as LUN index)</div><div class='del'>-</div><div class='del'>-Ver 2.1.1  Oct 18, 2001</div><div class='del'>-   * reinitialize Cmnd-&gt;SCp.sent_command (used to identify commands as</div><div class='del'>-     passthrus) on calling scsi_done, since the scsi mid layer does not</div><div class='del'>-     use (or reinitialize) this field to prevent subsequent comands from</div><div class='del'>-     having it set incorrectly. </div><div class='del'>-</div><div class='del'>-Ver 2.1.0  Aug 27, 2001</div><div class='del'>-   * Revise driver to use new kernel 2.4.x PCI DMA API, instead of </div><div class='del'>-     virt_to_bus().  (enables driver to work w/ ia64 systems with &gt;2Gb RAM.)</div><div class='del'>-     Rework main scatter-gather code to handle cases where SG element</div><div class='del'>-     lengths are larger than 0x7FFFF bytes and use as many scatter </div><div class='del'>-     gather pages as necessary. (Steve Cameron)</div><div class='del'>-   * Makefile changes to bring cpqfc into line w/ rest of SCSI drivers</div><div class='del'>-     (thanks to Keith Owens)</div><div class='del'>-</div><div class='del'>-Ver 2.0.5  Aug 06, 2001</div><div class='del'>-   * Reject non-existent luns in the driver rather than letting the </div><div class='del'>-     hardware do it.  (some HW behaves differently than others in this area.)</div><div class='del'>-   * Changed Makefile to rely on "make dep" instead of explicit dependencies</div><div class='del'>-   * ifdef'ed out fibre channel analyzer triggering debug code</div><div class='del'>-   * fixed a jiffies wrapping issue</div><div class='del'>-</div><div class='del'>-Ver 2.0.4  Aug 01, 2001</div><div class='del'>-   * Incorporated fix for target device reset from Steeleye</div><div class='del'>-   * Fixed passthrough ioctl so it doesn't hang.</div><div class='del'>-   * Fixed hang in launch_FCworker_thread() that occurred on some machines.</div><div class='del'>-   * Avoid problem when number of volumes in a single cabinet &gt; 8</div><div class='del'>-</div><div class='del'>-Ver 2.0.2  July 23, 2001</div><div class='del'>-   Changed the semiphore changes so the driver would compile in 2.4.7. </div><div class='del'>-   This version is for 2.4.7 and beyond. </div><div class='del'>- </div><div class='del'>-Ver 2.0.1  May 	7, 2001</div><div class='del'>-   Merged version 1.3.6 fixes into version 2.0.0.   </div><div class='del'>-</div><div class='del'>-Ver 2.0.0  May   7, 2001</div><div class='del'>-  Fixed problem so spinlock is being initialized to UNLOCKED. </div><div class='del'>-  Fixed updated driver so it compiles in the 2.4 tree. </div><div class='del'>- </div><div class='del'>- Ver 1.3.6  Feb  27, 2001</div><div class='del'>-   Added Target_Device_Reset function for SCSI error handling</div><div class='del'>-   Fixed problem with not reseting addressing mode after implicit logout</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-Ver 1.3.4  Sep   7, 2000</div><div class='del'>-  Added Modinfo information</div><div class='del'>-  Fixed problem with statically linking the driver</div><div class='del'>-</div><div class='del'>-Ver 1.3.3, Aug  23, 2000</div><div class='del'>-  Fixed device/function number in ioctl</div><div class='del'>-</div><div class='del'>-Ver 1.3.2, July 27, 2000</div><div class='del'>-  Add include for Alpha compile on 2.2.14 kernel (cpq*i2c.c)</div><div class='del'>-  Change logic for different FCP-RSP sense_buffer location for HSG80 target</div><div class='del'>-  And search for Agilent Tachyon XL2 HBAs (not finished! - in test)</div><div class='del'>-</div><div class='del'>-Tested with </div><div class='del'>-(storage):</div><div class='del'>-           Compaq RA-4x000, RAID firmware ver 2.40 - 2.54</div><div class='del'>-           Seagate FC drives model ST39102FC, rev 0006</div><div class='del'>-           Hitachi DK31CJ-72FC rev J8A8</div><div class='del'>-           IBM DDYF-T18350R rev F60K</div><div class='del'>-           Compaq FC-SCSI bridge w/ DLT 35/70 Gb DLT (tape)</div><div class='del'>-(servers):</div><div class='del'>-           Compaq PL-1850R</div><div class='del'>-           Compaq PL-6500 Xeon (400MHz)</div><div class='del'>-	   Compaq PL-8500 (500MHz, 66MHz, 64bit PCI)</div><div class='del'>-           Compaq Alpha DS20 (RH 6.1)</div><div class='del'>-(hubs):</div><div class='del'>-           Vixel Rapport 1000 (7-port "dumb")</div><div class='del'>-	   Gadzoox Gibralter (12-port "dumb")</div><div class='del'>-	   Gadzoox Capellix 2000, 3000 </div><div class='del'>-(switches):</div><div class='del'>-           Brocade 2010, 2400, 2800, rev 2.0.3a (&amp; later)</div><div class='del'>-           Gadzoox 3210 (Fabric blade beta)</div><div class='del'>-           Vixel 7100 (Fabric beta firmare - known hot plug issues)</div><div class='del'>-using "qa_test" (esp. io_test script) suite modified from Unix tests.</div><div class='del'>-	</div><div class='del'>-Installation:</div><div class='del'>-make menuconfig</div><div class='del'>-  (select SCSI low-level, Compaq FC HBA)</div><div class='del'>-make modules</div><div class='del'>-make modules_install</div><div class='del'>-</div><div class='del'>-e.g. insmod -f cpqfc</div><div class='del'>-</div><div class='del'>-Due to Fabric/switch delays, driver requires 4 seconds </div><div class='del'>-to initialize.  If adapters are found, there will be a entries at</div><div class='del'>-/proc/scsi/cpqfcTS/*</div><div class='del'>-</div><div class='del'>-sample contents of startup messages</div><div class='del'>-</div><div class='del'>-*************************</div><div class='del'>- scsi_register allocating 3596 bytes for CPQFCHBA</div><div class='del'>- ioremap'd Membase: c887e600</div><div class='del'>-  HBA Tachyon RevId 1.2</div><div class='del'>-Allocating 119808 for 576 Exchanges @ c0dc0000</div><div class='del'>-Allocating 112904 for LinkQ @ c0c20000 (576 elements)</div><div class='del'>-Allocating 110600 for TachSEST for 512 Exchanges</div><div class='del'>-  cpqfcTS: writing IMQ BASE 7C0000h    PI 7C4000h</div><div class='del'>-  cpqfcTS: SEST c0e40000(virt): Wrote base E40000h @ c887e740</div><div class='del'>-cpqfcTS: New FC port 0000E8h WWN: 500507650642499D SCSI Chan/Trgt 0/0</div><div class='del'>-cpqfcTS: New FC port 0000EFh WWN: 50000E100000D5A6 SCSI Chan/Trgt 0/1</div><div class='del'>-cpqfcTS: New FC port 0000E4h WWN: 21000020370097BB SCSI Chan/Trgt 0/2</div><div class='del'>-cpqfcTS: New FC port 0000E2h WWN: 2100002037009946 SCSI Chan/Trgt 0/3</div><div class='del'>-cpqfcTS: New FC port 0000E1h WWN: 21000020370098FE SCSI Chan/Trgt 0/4</div><div class='del'>-cpqfcTS: New FC port 0000E0h WWN: 21000020370097B2 SCSI Chan/Trgt 0/5</div><div class='del'>-cpqfcTS: New FC port 0000DCh WWN: 2100002037006CC1 SCSI Chan/Trgt 0/6</div><div class='del'>-cpqfcTS: New FC port 0000DAh WWN: 21000020370059F6 SCSI Chan/Trgt 0/7</div><div class='del'>-cpqfcTS: New FC port 00000Fh WWN: 500805F1FADB0E20 SCSI Chan/Trgt 0/8</div><div class='del'>-cpqfcTS: New FC port 000008h WWN: 500805F1FADB0EBA SCSI Chan/Trgt 0/9</div><div class='del'>-cpqfcTS: New FC port 000004h WWN: 500805F1FADB1EB9 SCSI Chan/Trgt 0/10</div><div class='del'>-cpqfcTS: New FC port 000002h WWN: 500805F1FADB1ADE SCSI Chan/Trgt 0/11</div><div class='del'>-cpqfcTS: New FC port 000001h WWN: 500805F1FADBA2CA SCSI Chan/Trgt 0/12</div><div class='del'>-scsi4 : Compaq FibreChannel HBA Tachyon TS HPFC-5166A/1.2: WWN 500508B200193F50</div><div class='del'>- on PCI bus 0 device 0xa0fc irq 5 IObaseL 0x3400, MEMBASE 0xc6ef8600</div><div class='del'>-PCI bus width 32 bits, bus speed 33 MHz</div><div class='del'>-FCP-SCSI Driver v1.3.0</div><div class='del'>-GBIC detected: Short-wave.  LPSM 0h Monitor</div><div class='del'>-scsi : 5 hosts.</div><div class='del'>-  Vendor: IBM       Model: DDYF-T18350R      Rev: F60K</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 03</div><div class='del'>-Detected scsi disk sdb at scsi4, channel 0, id 0, lun 0</div><div class='del'>-  Vendor: HITACHI   Model: DK31CJ-72FC       Rev: J8A8</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdc at scsi4, channel 0, id 1, lun 0</div><div class='del'>-  Vendor: SEAGATE   Model: ST39102FC         Rev: 0006</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdd at scsi4, channel 0, id 2, lun 0</div><div class='del'>-  Vendor: SEAGATE   Model: ST39102FC         Rev: 0006</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sde at scsi4, channel 0, id 3, lun 0</div><div class='del'>-  Vendor: SEAGATE   Model: ST39102FC         Rev: 0006</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdf at scsi4, channel 0, id 4, lun 0</div><div class='del'>-  Vendor: SEAGATE   Model: ST39102FC         Rev: 0006</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdg at scsi4, channel 0, id 5, lun 0</div><div class='del'>-  Vendor: SEAGATE   Model: ST39102FC         Rev: 0006</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdh at scsi4, channel 0, id 6, lun 0</div><div class='del'>-  Vendor: SEAGATE   Model: ST39102FC         Rev: 0006</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdi at scsi4, channel 0, id 7, lun 0</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.48</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdj at scsi4, channel 0, id 8, lun 0</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.48</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdk at scsi4, channel 0, id 8, lun 1</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.40</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdl at scsi4, channel 0, id 9, lun 0</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.40</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdm at scsi4, channel 0, id 9, lun 1</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.54</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdn at scsi4, channel 0, id 10, lun 0</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.54</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdo at scsi4, channel 0, id 11, lun 0</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.54</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdp at scsi4, channel 0, id 11, lun 1</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.54</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdq at scsi4, channel 0, id 12, lun 0</div><div class='del'>-  Vendor: COMPAQ    Model: LOGICAL VOLUME    Rev: 2.54</div><div class='del'>-  Type:   Direct-Access                      ANSI SCSI revision: 02</div><div class='del'>-Detected scsi disk sdr at scsi4, channel 0, id 12, lun 1</div><div class='del'>-resize_dma_pool: unknown device type 12</div><div class='del'>-resize_dma_pool: unknown device type 12</div><div class='del'>-SCSI device sdb: hdwr sector= 512 bytes. Sectors= 35843670 [17501 MB] [17.5 GB]</div><div class='del'>- sdb: sdb1</div><div class='del'>-SCSI device sdc: hdwr sector= 512 bytes. Sectors= 144410880 [70513 MB] [70.5 GB]</div><div class='del'>- sdc: sdc1</div><div class='del'>-SCSI device sdd: hdwr sector= 512 bytes. Sectors= 17783240 [8683 MB] [8.7 GB]</div><div class='del'>- sdd: sdd1</div><div class='del'>-SCSI device sde: hdwr sector= 512 bytes. Sectors= 17783240 [8683 MB] [8.7 GB]</div><div class='del'>- sde: sde1</div><div class='del'>-SCSI device sdf: hdwr sector= 512 bytes. Sectors= 17783240 [8683 MB] [8.7 GB]</div><div class='del'>- sdf: sdf1</div><div class='del'>-SCSI device sdg: hdwr sector= 512 bytes. Sectors= 17783240 [8683 MB] [8.7 GB]</div><div class='del'>- sdg: sdg1</div><div class='del'>-SCSI device sdh: hdwr sector= 512 bytes. Sectors= 17783240 [8683 MB] [8.7 GB]</div><div class='del'>- sdh: sdh1</div><div class='del'>-SCSI device sdi: hdwr sector= 512 bytes. Sectors= 17783240 [8683 MB] [8.7 GB]</div><div class='del'>- sdi: sdi1</div><div class='del'>-SCSI device sdj: hdwr sector= 512 bytes. Sectors= 2056160 [1003 MB] [1.0 GB]</div><div class='del'>- sdj: sdj1</div><div class='del'>-SCSI device sdk: hdwr sector= 512 bytes. Sectors= 2052736 [1002 MB] [1.0 GB]</div><div class='del'>- sdk: sdk1</div><div class='del'>-SCSI device sdl: hdwr sector= 512 bytes. Sectors= 17764320 [8673 MB] [8.7 GB]</div><div class='del'>- sdl: sdl1</div><div class='del'>-SCSI device sdm: hdwr sector= 512 bytes. Sectors= 8380320 [4091 MB] [4.1 GB]</div><div class='del'>- sdm: sdm1</div><div class='del'>-SCSI device sdn: hdwr sector= 512 bytes. Sectors= 17764320 [8673 MB] [8.7 GB]</div><div class='del'>- sdn: sdn1</div><div class='del'>-SCSI device sdo: hdwr sector= 512 bytes. Sectors= 17764320 [8673 MB] [8.7 GB]</div><div class='del'>- sdo: sdo1</div><div class='del'>-SCSI device sdp: hdwr sector= 512 bytes. Sectors= 17764320 [8673 MB] [8.7 GB]</div><div class='del'>- sdp: sdp1</div><div class='del'>-SCSI device sdq: hdwr sector= 512 bytes. Sectors= 2056160 [1003 MB] [1.0 GB]</div><div class='del'>- sdq: sdq1</div><div class='del'>-SCSI device sdr: hdwr sector= 512 bytes. Sectors= 2052736 [1002 MB] [1.0 GB]</div><div class='del'>- sdr: sdr1</div><div class='del'>-</div><div class='del'>-*************************</div><div class='del'>-</div><div class='del'>-If a GBIC of type Short-wave, Long-wave, or Copper is detected, it will</div><div class='del'>-print out; otherwise, "none" is displayed.  If the cabling is correct</div><div class='del'>-and a loop circuit is completed, you should see "Monitor"; otherwise, </div><div class='del'>-"LoopFail" (on open circuit) or some LPSM number/state with bit 3 set.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ERRATA:</div><div class='del'>-1. Normally, Linux Scsi queries FC devices with INQUIRY strings.  All LUNs</div><div class='del'>-found according to INQUIRY should get READ commands at sector 0 to find</div><div class='del'>-partition table, etc.  Older kernels only query the first 4 devices.  Some</div><div class='del'>-Linux kernels only look for one LUN per target (i.e. FC device).</div><div class='del'>-</div><div class='del'>-2. Physically removing a device, or a malfunctioning system which hides a</div><div class='del'>-device, leads to a 30-second timeout and subsequent _abort call.  </div><div class='del'>-In some process contexts, this will hang the kernel (crashing the system).</div><div class='del'>-Single bit errors in frames and virtually all hot plugging events are </div><div class='del'>-gracefully handled with internal driver timer and Abort processing.</div><div class='del'>-</div><div class='del'>-3. Some SCSI drives with error conditions will not handle the 7 second timeout</div><div class='del'>-in this software driver, leading to infinite retries on timed out SCSI commands.</div><div class='del'>-The 7 secs balances the need to quickly recover from lost frames (esp. on sequence</div><div class='del'>-initiatives) and time needed by older/slower/error-state drives in responding.</div><div class='del'>-This can be easily changed in "Exchanges[].timeOut".</div><div class='del'>-</div><div class='del'>-4. Due to the nature of FC soft addressing, there is no assurance that the </div><div class='del'>-same LUNs (drives) will have the same path (e.g. /dev/sdb1) from one boot to</div><div class='del'>-next.  Dynamic soft address changes (i.e. 24-bit FC port_id) are</div><div class='del'>-supported during run time (e.g. due to hot plug event) by the use of WWN to</div><div class='del'>-SCSI Nexus (channel/target/LUN) mapping.</div><div class='del'>-</div><div class='del'>-5. Compaq RA4x00 firmware version 2.54 and later supports SSP (Selective </div><div class='del'>-Storage Presentation), which maps LUNs to a WWN.  If RA4x00 firmware prior</div><div class='del'>-2.54 (e.g. older controller) is used, or the FC HBA is replaced (another WWN</div><div class='del'>-is used), logical volumes on the RA4x00 will no longer be visible.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Send questions/comments to:</div><div class='del'>-Amy Vanzant-Hodge (fibrechannel@compaq.com)</div><div class='del'>-</div><div class='head'>diff --git a/Documentation/scsi/hptiop.txt b/Documentation/scsi/hptiop.txt<br/>new file mode 100644<br/>index 000000000000..d28a31247d4c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/hptiop.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/scsi/hptiop.txt</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+HIGHPOINT ROCKETRAID 3xxx RAID DRIVER (hptiop)</div><div class='add'>+</div><div class='add'>+Controller Register Map</div><div class='add'>+-------------------------</div><div class='add'>+</div><div class='add'>+The controller IOP is accessed via PCI BAR0.</div><div class='add'>+</div><div class='add'>+     BAR0 offset    Register</div><div class='add'>+            0x10    Inbound Message Register 0</div><div class='add'>+            0x14    Inbound Message Register 1</div><div class='add'>+            0x18    Outbound Message Register 0</div><div class='add'>+            0x1C    Outbound Message Register 1</div><div class='add'>+            0x20    Inbound Doorbell Register</div><div class='add'>+            0x24    Inbound Interrupt Status Register</div><div class='add'>+            0x28    Inbound Interrupt Mask Register</div><div class='add'>+            0x30    Outbound Interrupt Status Register</div><div class='add'>+            0x34    Outbound Interrupt Mask Register</div><div class='add'>+            0x40    Inbound Queue Port</div><div class='add'>+            0x44    Outbound Queue Port</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+I/O Request Workflow</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+All queued requests are handled via inbound/outbound queue port.</div><div class='add'>+A request packet can be allocated in either IOP or host memory.</div><div class='add'>+</div><div class='add'>+To send a request to the controller:</div><div class='add'>+</div><div class='add'>+    - Get a free request packet by reading the inbound queue port or</div><div class='add'>+      allocate a free request in host DMA coherent memory.</div><div class='add'>+</div><div class='add'>+      The value returned from the inbound queue port is an offset</div><div class='add'>+      relative to the IOP BAR0.</div><div class='add'>+</div><div class='add'>+      Requests allocated in host memory must be aligned on 32-bytes boundary.</div><div class='add'>+</div><div class='add'>+    - Fill the packet.</div><div class='add'>+</div><div class='add'>+    - Post the packet to IOP by writing it to inbound queue. For requests</div><div class='add'>+      allocated in IOP memory, write the offset to inbound queue port. For</div><div class='add'>+      requests allocated in host memory, write (0x80000000|(bus_addr&gt;&gt;5))</div><div class='add'>+      to the inbound queue port.</div><div class='add'>+</div><div class='add'>+    - The IOP process the request. When the request is completed, it</div><div class='add'>+      will be put into outbound queue. An outbound interrupt will be</div><div class='add'>+      generated.</div><div class='add'>+</div><div class='add'>+      For requests allocated in IOP memory, the request offset is posted to</div><div class='add'>+      outbound queue.</div><div class='add'>+</div><div class='add'>+      For requests allocated in host memory, (0x80000000|(bus_addr&gt;&gt;5))</div><div class='add'>+      is posted to the outbound queue. If IOP_REQUEST_FLAG_OUTPUT_CONTEXT</div><div class='add'>+      flag is set in the request, the low 32-bit context value will be</div><div class='add'>+      posted instead.</div><div class='add'>+</div><div class='add'>+    - The host read the outbound queue and complete the request.</div><div class='add'>+</div><div class='add'>+      For requests allocated in IOP memory, the host driver free the request</div><div class='add'>+      by writing it to the outbound queue.</div><div class='add'>+</div><div class='add'>+Non-queued requests (reset/flush etc) can be sent via inbound message</div><div class='add'>+register 0. An outbound message with the same value indicates the completion</div><div class='add'>+of an inbound message.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+User-level Interface</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+The driver exposes following sysfs attributes:</div><div class='add'>+</div><div class='add'>+     NAME                 R/W    Description</div><div class='add'>+     driver-version        R     driver version string</div><div class='add'>+     firmware-version      R     firmware version string</div><div class='add'>+</div><div class='add'>+The driver registers char device "hptiop" to communicate with HighPoint RAID</div><div class='add'>+management software. Its ioctl routine acts as a general binary interface </div><div class='add'>+between the IOP firmware and HighPoint RAID management software. New management</div><div class='add'>+functions can be implemented in application/firmware without modification</div><div class='add'>+in driver code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+-----------------------------------------------------------------------------</div><div class='add'>+Copyright (C) 2006 HighPoint Technologies, Inc. All Rights Reserved.</div><div class='add'>+</div><div class='add'>+  This file is distributed in the hope that it will be useful,</div><div class='add'>+  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+  GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+  linux@highpoint-tech.com</div><div class='add'>+  http://www.highpoint-tech.com</div><div class='head'>diff --git a/Documentation/scsi/ppa.txt b/Documentation/scsi/ppa.txt<br/>index 0dac88d86d87..5d9223bc1bd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/ppa.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/ppa.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/ppa.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/scsi/ppa.txt</a></div><div class='hunk'>@@ -12,5 +12,3 @@ http://www.torque.net/parport/</div><div class='ctx'> Email list for Linux Parport</div><div class='ctx'> linux-parport@torque.net</div><div class='ctx'> </div><div class='del'>-Email for problems with ZIP or ZIP Plus drivers</div><div class='del'>-campbell@torque.net</div><div class='head'>diff --git a/Documentation/scsi/tmscsim.txt b/Documentation/scsi/tmscsim.txt<br/>index e165229adf50..df7a02bfb5bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/scsi/tmscsim.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/scsi/tmscsim.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/scsi/tmscsim.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/scsi/tmscsim.txt</a></div><div class='hunk'>@@ -109,7 +109,7 @@ than the 33.33 MHz being in the PCI spec.</div><div class='ctx'> </div><div class='ctx'> If you want to share the IRQ with another device and the driver refuses to</div><div class='ctx'> do so, you might succeed with changing the DC390_IRQ type in tmscsim.c to </div><div class='del'>-SA_SHIRQ | SA_INTERRUPT.</div><div class='add'>+IRQF_SHARED | IRQF_DISABLED.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 3.Features</div><div class='head'>diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt<br/>index 0ee2c7dfc482..f61af23dd85d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/ALSA-Configuration.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sound/alsa/ALSA-Configuration.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/ALSA-Configuration.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/sound/alsa/ALSA-Configuration.txt</a></div><div class='hunk'>@@ -366,7 +366,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     Module for C-Media CMI8338 and 8738 PCI sound cards.</div><div class='ctx'> </div><div class='del'>-    mpu_port	- 0x300,0x310,0x320,0x330, 0 = disable (default)</div><div class='add'>+    mpu_port	- 0x300,0x310,0x320,0x330 = legacy port,</div><div class='add'>+		  1 = integrated PCI port,</div><div class='add'>+		  0 = disable (default)</div><div class='ctx'>     fm_port     - 0x388 (default), 0 = disable (default)</div><div class='ctx'>     soft_ac3    - Software-conversion of raw SPDIF packets (model 033 only)</div><div class='ctx'>                   (default = 1)</div><div class='hunk'>@@ -468,7 +470,23 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     Module for multifunction CS5535 companion PCI device</div><div class='ctx'> </div><div class='add'>+    The power-management is supported.</div><div class='add'>+</div><div class='add'>+  Module snd-darla20</div><div class='add'>+  ------------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Darla20</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+  Module snd-darla24</div><div class='add'>+  ------------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Darla24</div><div class='add'>+</div><div class='ctx'>     This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='ctx'> </div><div class='ctx'>   Module snd-dt019x</div><div class='ctx'>   -----------------</div><div class='hunk'>@@ -497,6 +515,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     The power-management is supported.</div><div class='ctx'> </div><div class='add'>+  Module snd-echo3g</div><div class='add'>+  -----------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio 3G cards (Gina3G/Layla3G)</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='ctx'>   Module snd-emu10k1</div><div class='ctx'>   ------------------</div><div class='ctx'> </div><div class='hunk'>@@ -655,6 +681,22 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'>     </div><div class='ctx'>     The power-management is supported.</div><div class='ctx'> </div><div class='add'>+  Module snd-gina20</div><div class='add'>+  -----------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Gina20</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+  Module snd-gina24</div><div class='add'>+  -----------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Gina24</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='ctx'>   Module snd-gusclassic</div><div class='ctx'>   ---------------------</div><div class='ctx'> </div><div class='hunk'>@@ -707,8 +749,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'>   Module snd-hda-intel</div><div class='ctx'>   --------------------</div><div class='ctx'> </div><div class='del'>-    Module for Intel HD Audio (ICH6, ICH6M, ICH7), ATI SB450,</div><div class='del'>-	       VIA VT8251/VT8237A</div><div class='add'>+    Module for Intel HD Audio (ICH6, ICH6M, ESB2, ICH7, ICH8),</div><div class='add'>+		ATI SB450, SB600, RS600,</div><div class='add'>+		VIA VT8251/VT8237A,</div><div class='add'>+		SIS966, ULI M5461</div><div class='ctx'> </div><div class='ctx'>     model	- force the model name</div><div class='ctx'>     position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)</div><div class='hunk'>@@ -756,12 +800,18 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  basic		fixed pin assignment w/o SPDIF</div><div class='ctx'> 	  auto		auto-config reading BIOS (default)</div><div class='ctx'> </div><div class='del'>-	ALC882/883/885</div><div class='add'>+	ALC882/885</div><div class='ctx'> 	  3stack-dig	3-jack with SPDIF I/O</div><div class='ctx'> 	  6stck-dig	6-jack digital with SPDIF I/O</div><div class='ctx'> 	  auto		auto-config reading BIOS (default)</div><div class='ctx'> </div><div class='del'>-	ALC861</div><div class='add'>+	ALC883/888</div><div class='add'>+	  3stack-dig	3-jack with SPDIF I/O</div><div class='add'>+	  6stack-dig	6-jack digital with SPDIF I/O</div><div class='add'>+	  6stack-dig-demo  6-stack digital for Intel demo board</div><div class='add'>+	  auto		auto-config reading BIOS (default)</div><div class='add'>+</div><div class='add'>+	ALC861/660</div><div class='ctx'> 	  3stack	3-jack</div><div class='ctx'> 	  3stack-dig	3-jack with SPDIF I/O</div><div class='ctx'> 	  6stack-dig	6-jack with SPDIF I/O</div><div class='hunk'>@@ -778,6 +828,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	AD1981</div><div class='ctx'> 	  basic		3-jack (default)</div><div class='ctx'> 	  hp		HP nx6320</div><div class='add'>+	  thinkpad	Lenovo Thinkpad T60/X60/Z60</div><div class='ctx'> </div><div class='ctx'> 	AD1986A</div><div class='ctx'> 	  6stack	6-jack, separate surrounds (default)</div><div class='hunk'>@@ -932,6 +983,30 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> 	  driver isn't configured properly or you want to try another</div><div class='ctx'> 	  type for testing.</div><div class='ctx'> </div><div class='add'>+  Module snd-indigo</div><div class='add'>+  -----------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Indigo</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+  Module snd-indigodj</div><div class='add'>+  -------------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Indigo DJ</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+  Module snd-indigoio</div><div class='add'>+  -------------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Indigo IO</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='ctx'>   Module snd-intel8x0</div><div class='ctx'>   -------------------</div><div class='ctx'> </div><div class='hunk'>@@ -1031,6 +1106,22 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     This module supports multiple cards.</div><div class='ctx'> </div><div class='add'>+  Module snd-layla20</div><div class='add'>+  ------------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Layla20</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='add'>+  Module snd-layla24</div><div class='add'>+  ------------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Layla24</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='ctx'>   Module snd-maestro3</div><div class='ctx'>   -------------------</div><div class='ctx'> </div><div class='hunk'>@@ -1051,6 +1142,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     The power-management is supported.</div><div class='ctx'> </div><div class='add'>+  Module snd-mia</div><div class='add'>+  ---------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Mia</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='ctx'>   Module snd-miro</div><div class='ctx'>   ---------------</div><div class='ctx'> </div><div class='hunk'>@@ -1083,6 +1182,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'>     When no hotplug fw loader is available, you need to load the</div><div class='ctx'>     firmware via mixartloader utility in alsa-tools package.</div><div class='ctx'> </div><div class='add'>+  Module snd-mona</div><div class='add'>+  ---------------</div><div class='add'>+</div><div class='add'>+    Module for Echoaudio Mona</div><div class='add'>+</div><div class='add'>+    This module supports multiple cards.</div><div class='add'>+    The driver requires the firmware loader support on kernel.</div><div class='add'>+</div><div class='ctx'>   Module snd-mpu401</div><div class='ctx'>   -----------------</div><div class='ctx'> </div><div class='hunk'>@@ -1633,9 +1740,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     About capture IBL, see the description of snd-vx222 module.</div><div class='ctx'> </div><div class='del'>-    Note: the driver is build only when CONFIG_ISA is set.</div><div class='del'>-    </div><div class='del'>-    Note2: snd-vxp440 driver is merged to snd-vxpocket driver since</div><div class='add'>+    Note: snd-vxp440 driver is merged to snd-vxpocket driver since</div><div class='ctx'>            ALSA 1.0.10.</div><div class='ctx'> </div><div class='ctx'>     The power-management is supported.</div><div class='hunk'>@@ -1662,8 +1767,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.</div><div class='ctx'> </div><div class='ctx'>     Module for Sound Core PDAudioCF sound card.</div><div class='ctx'> </div><div class='del'>-    Note: the driver is build only when CONFIG_ISA is set.</div><div class='del'>-</div><div class='ctx'>     The power-management is supported.</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl<br/>index 1faf76383bab..b8dc51ca776c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl</a></div><div class='hunk'>@@ -1149,7 +1149,7 @@</div><div class='ctx'>           }</div><div class='ctx'>           chip-&gt;port = pci_resource_start(pci, 0);</div><div class='ctx'>           if (request_irq(pci-&gt;irq, snd_mychip_interrupt,</div><div class='del'>-                          SA_INTERRUPT|SA_SHIRQ, "My Chip", chip)) {</div><div class='add'>+                          IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) {</div><div class='ctx'>                   printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='ctx'>                   snd_mychip_free(chip);</div><div class='ctx'>                   return -EBUSY;</div><div class='hunk'>@@ -1172,7 +1172,7 @@</div><div class='ctx'>   }        </div><div class='ctx'> </div><div class='ctx'>   /* PCI IDs */</div><div class='del'>-  static struct pci_device_id snd_mychip_ids[] __devinitdata = {</div><div class='add'>+  static struct pci_device_id snd_mychip_ids[] = {</div><div class='ctx'>           { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,</div><div class='ctx'>             PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='ctx'>           ....</div><div class='hunk'>@@ -1323,7 +1323,7 @@</div><div class='ctx'>           &lt;programlisting&gt;</div><div class='ctx'> &lt;![CDATA[</div><div class='ctx'>   if (request_irq(pci-&gt;irq, snd_mychip_interrupt,</div><div class='del'>-                  SA_INTERRUPT|SA_SHIRQ, "My Chip", chip)) {</div><div class='add'>+                  IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) {</div><div class='ctx'>           printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='ctx'>           snd_mychip_free(chip);</div><div class='ctx'>           return -EBUSY;</div><div class='hunk'>@@ -1342,7 +1342,7 @@</div><div class='ctx'> </div><div class='ctx'>       &lt;para&gt;</div><div class='ctx'>       On the PCI bus, the interrupts can be shared. Thus,</div><div class='del'>-      &lt;constant&gt;SA_SHIRQ&lt;/constant&gt; is given as the interrupt flag of</div><div class='add'>+      &lt;constant&gt;IRQF_SHARED&lt;/constant&gt; is given as the interrupt flag of</div><div class='ctx'>       &lt;function&gt;request_irq()&lt;/function&gt;. </div><div class='ctx'>       &lt;/para&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -1565,7 +1565,7 @@</div><div class='ctx'>         &lt;informalexample&gt;</div><div class='ctx'>           &lt;programlisting&gt;</div><div class='ctx'> &lt;![CDATA[</div><div class='del'>-  static struct pci_device_id snd_mychip_ids[] __devinitdata = {</div><div class='add'>+  static struct pci_device_id snd_mychip_ids[] = {</div><div class='ctx'>           { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,</div><div class='ctx'>             PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='ctx'>           ....</div><div class='hunk'>@@ -3048,7 +3048,7 @@ struct _snd_pcm_runtime {</div><div class='ctx'>         &lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>         &lt;para&gt;</div><div class='del'>-          If you aquire a spinlock in the interrupt handler, and the</div><div class='add'>+          If you acquire a spinlock in the interrupt handler, and the</div><div class='ctx'>         lock is used in other pcm callbacks, too, then you have to</div><div class='ctx'>         release the lock before calling</div><div class='ctx'>         &lt;function&gt;snd_pcm_period_elapsed()&lt;/function&gt;, because</div><div class='hunk'>@@ -4215,7 +4215,7 @@ struct _snd_pcm_runtime {</div><div class='ctx'>           &lt;programlisting&gt;</div><div class='ctx'> &lt;![CDATA[</div><div class='ctx'>   struct snd_rawmidi *rmidi;</div><div class='del'>-  snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port, integrated,</div><div class='add'>+  snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port, info_flags,</div><div class='ctx'>                       irq, irq_flags, &amp;rmidi);</div><div class='ctx'> ]]&gt;</div><div class='ctx'>           &lt;/programlisting&gt;</div><div class='hunk'>@@ -4242,15 +4242,36 @@ struct _snd_pcm_runtime {</div><div class='ctx'>       &lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>       &lt;para&gt;</div><div class='add'>+	The 5th argument is bitflags for additional information.</div><div class='ctx'>         When the i/o port address above is a part of the PCI i/o</div><div class='ctx'>       region, the MPU401 i/o port might have been already allocated</div><div class='del'>-      (reserved) by the driver itself. In such a case, pass non-zero</div><div class='del'>-      to the 5th argument</div><div class='del'>-      (&lt;parameter&gt;integrated&lt;/parameter&gt;). Otherwise, pass 0 to it,</div><div class='add'>+      (reserved) by the driver itself. In such a case, pass a bit flag</div><div class='add'>+      &lt;constant&gt;MPU401_INFO_INTEGRATED&lt;/constant&gt;,</div><div class='ctx'>       and </div><div class='ctx'>       the mpu401-uart layer will allocate the i/o ports by itself. </div><div class='ctx'>       &lt;/para&gt;</div><div class='ctx'> </div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	When the controller supports only the input or output MIDI stream,</div><div class='add'>+	pass &lt;constant&gt;MPU401_INFO_INPUT&lt;/constant&gt; or</div><div class='add'>+	&lt;constant&gt;MPU401_INFO_OUTPUT&lt;/constant&gt; bitflag, respectively.</div><div class='add'>+	Then the rawmidi instance is created as a single stream.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	&lt;constant&gt;MPU401_INFO_MMIO&lt;/constant&gt; bitflag is used to change</div><div class='add'>+	the access method to MMIO (via readb and writeb) instead of</div><div class='add'>+	iob and outb.  In this case, you have to pass the iomapped address</div><div class='add'>+	to &lt;function&gt;snd_mpu401_uart_new()&lt;/function&gt;.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='add'>+	&lt;para&gt;</div><div class='add'>+	When &lt;constant&gt;MPU401_INFO_TX_IRQ&lt;/constant&gt; is set, the output</div><div class='add'>+	stream isn't checked in the default interrupt handler.  The driver</div><div class='add'>+	needs to call &lt;function&gt;snd_mpu401_uart_interrupt_tx()&lt;/function&gt;</div><div class='add'>+	by itself to start processing the output stream in irq handler.</div><div class='add'>+	&lt;/para&gt;</div><div class='add'>+</div><div class='ctx'>       &lt;para&gt;</div><div class='ctx'>         Usually, the port address corresponds to the command port and</div><div class='ctx'>         port + 1 corresponds to the data port. If not, you may change</div><div class='hunk'>@@ -5333,7 +5354,7 @@ struct _snd_pcm_runtime {</div><div class='ctx'>       &lt;informalexample&gt;</div><div class='ctx'>         &lt;programlisting&gt;</div><div class='ctx'> &lt;![CDATA[</div><div class='del'>-  snd_info_set_text_ops(entry, chip, read_size, my_proc_read);</div><div class='add'>+  snd_info_set_text_ops(entry, chip, my_proc_read);</div><div class='ctx'> ]]&gt;</div><div class='ctx'>         &lt;/programlisting&gt;</div><div class='ctx'>       &lt;/informalexample&gt;</div><div class='hunk'>@@ -5394,7 +5415,6 @@ struct _snd_pcm_runtime {</div><div class='ctx'>       &lt;informalexample&gt;</div><div class='ctx'>         &lt;programlisting&gt;</div><div class='ctx'> &lt;![CDATA[</div><div class='del'>-  entry-&gt;c.text.write_size = 256;</div><div class='ctx'>   entry-&gt;c.text.write = my_proc_write;</div><div class='ctx'> ]]&gt;</div><div class='ctx'>         &lt;/programlisting&gt;</div><div class='hunk'>@@ -5402,22 +5422,6 @@ struct _snd_pcm_runtime {</div><div class='ctx'>     &lt;/para&gt;</div><div class='ctx'> </div><div class='ctx'>     &lt;para&gt;</div><div class='del'>-    The buffer size for read is set to 1024 implicitly by</div><div class='del'>-    &lt;function&gt;snd_info_set_text_ops()&lt;/function&gt;.  It should suffice</div><div class='del'>-    in most cases (the size will be aligned to</div><div class='del'>-    &lt;constant&gt;PAGE_SIZE&lt;/constant&gt; anyway), but if you need to handle</div><div class='del'>-    very large text files, you can set it explicitly, too.</div><div class='del'>-</div><div class='del'>-      &lt;informalexample&gt;</div><div class='del'>-        &lt;programlisting&gt;</div><div class='del'>-&lt;![CDATA[</div><div class='del'>-  entry-&gt;c.text.read_size = 65536;</div><div class='del'>-]]&gt;</div><div class='del'>-        &lt;/programlisting&gt;</div><div class='del'>-      &lt;/informalexample&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='ctx'>       For the write callback, you can use</div><div class='ctx'>     &lt;function&gt;snd_info_get_line()&lt;/function&gt; to get a text line, and</div><div class='ctx'>     &lt;function&gt;snd_info_get_str()&lt;/function&gt; to retrieve a string from</div><div class='hunk'>@@ -5562,7 +5566,7 @@ struct _snd_pcm_runtime {</div><div class='ctx'> 	  power status.&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>         &lt;listitem&gt;&lt;para&gt;Call &lt;function&gt;snd_pcm_suspend_all()&lt;/function&gt; to suspend the running PCM streams.&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'> 	&lt;listitem&gt;&lt;para&gt;If AC97 codecs are used, call</div><div class='del'>-	&lt;function&gt;snd_ac97_resume()&lt;/function&gt; for each codec.&lt;/para&gt;&lt;/listitem&gt;</div><div class='add'>+	&lt;function&gt;snd_ac97_suspend()&lt;/function&gt; for each codec.&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>         &lt;listitem&gt;&lt;para&gt;Save the register values if necessary.&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>         &lt;listitem&gt;&lt;para&gt;Stop the hardware if necessary.&lt;/para&gt;&lt;/listitem&gt;</div><div class='ctx'>         &lt;listitem&gt;&lt;para&gt;Disable the PCI device by calling</div><div class='head'>diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt<br/>index 876195dc2aef..4b9351624f13 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sparc/sbus_drivers.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sparc/sbus_drivers.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sparc/sbus_drivers.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/sparc/sbus_drivers.txt</a></div><div class='hunk'>@@ -25,42 +25,84 @@ the bits necessary to run your device.  The most commonly</div><div class='ctx'> used members of this structure, and their typical usage,</div><div class='ctx'> will be detailed below.</div><div class='ctx'> </div><div class='del'>-	Here is how probing is performed by an SBUS driver</div><div class='del'>-under Linux:</div><div class='add'>+	Here is a piece of skeleton code for perofming a device</div><div class='add'>+probe in an SBUS driverunder Linux:</div><div class='ctx'> </div><div class='del'>-	static void init_one_mydevice(struct sbus_dev *sdev)</div><div class='add'>+	static int __devinit mydevice_probe_one(struct sbus_dev *sdev)</div><div class='ctx'> 	{</div><div class='add'>+		struct mysdevice *mp = kzalloc(sizeof(*mp), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!mp)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		...</div><div class='add'>+		dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, mp);</div><div class='add'>+		return 0;</div><div class='ctx'> 		...</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	static int mydevice_match(struct sbus_dev *sdev)</div><div class='add'>+	static int __devinit mydevice_probe(struct of_device *dev,</div><div class='add'>+				            const struct of_device_id *match)</div><div class='ctx'> 	{</div><div class='del'>-		if (some_criteria(sdev))</div><div class='del'>-			return 1;</div><div class='del'>-		return 0;</div><div class='add'>+		struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+		return mydevice_probe_one(sdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	static void mydevice_probe(void)</div><div class='add'>+	static int __devexit mydevice_remove(struct of_device *dev)</div><div class='ctx'> 	{</div><div class='del'>-		struct sbus_bus *sbus;</div><div class='del'>-		struct sbus_dev *sdev;</div><div class='add'>+		struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+		struct mydevice *mp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-		for_each_sbus(sbus) {</div><div class='del'>-			for_each_sbusdev(sdev, sbus) {</div><div class='del'>-				if (mydevice_match(sdev))</div><div class='del'>-					init_one_mydevice(sdev);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		return mydevice_remove_one(sdev, mp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	All this does is walk through all SBUS devices in the</div><div class='del'>-system, checks each to see if it is of the type which</div><div class='del'>-your driver is written for, and if so it calls the init</div><div class='del'>-routine to attach the device and prepare to drive it.</div><div class='add'>+	static struct of_device_id mydevice_match[] = {</div><div class='add'>+		{</div><div class='add'>+			.name = "mydevice",</div><div class='add'>+		},</div><div class='add'>+		{},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	MODULE_DEVICE_TABLE(of, mydevice_match);</div><div class='ctx'> </div><div class='del'>-	"init_one_mydevice" might do things like allocate software</div><div class='del'>-state structures, map in I/O registers, place the hardware</div><div class='del'>-into an initialized state, etc.</div><div class='add'>+	static struct of_platform_driver mydevice_driver = {</div><div class='add'>+		.name		= "mydevice",</div><div class='add'>+		.match_table	= mydevice_match,</div><div class='add'>+		.probe		= mydevice_probe,</div><div class='add'>+		.remove		= __devexit_p(mydevice_remove),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static int __init mydevice_init(void)</div><div class='add'>+	{</div><div class='add'>+		return of_register_driver(&amp;mydevice_driver, &amp;sbus_bus_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	static void __exit mydevice_exit(void)</div><div class='add'>+	{</div><div class='add'>+		of_unregister_driver(&amp;mydevice_driver);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	module_init(mydevice_init);</div><div class='add'>+	module_exit(mydevice_exit);</div><div class='add'>+</div><div class='add'>+	The mydevice_match table is a series of entries which</div><div class='add'>+describes what SBUS devices your driver is meant for.  In the</div><div class='add'>+simplest case you specify a string for the 'name' field.  Every</div><div class='add'>+SBUS device with a 'name' property matching your string will</div><div class='add'>+be passed one-by-one to your .probe method.</div><div class='add'>+</div><div class='add'>+	You should store away your device private state structure</div><div class='add'>+pointer in the drvdata area so that you can retrieve it later on</div><div class='add'>+in your .remove method.</div><div class='add'>+</div><div class='add'>+	Any memory allocated, registers mapped, IRQs registered,</div><div class='add'>+etc. must be undone by your .remove method so that all resources</div><div class='add'>+of your device are relased by the time it returns.</div><div class='add'>+</div><div class='add'>+	You should _NOT_ use the for_each_sbus(), for_each_sbusdev(),</div><div class='add'>+and for_all_sbusdev() interfaces.  They are deprecated, will be</div><div class='add'>+removed, and no new driver should reference them ever.</div><div class='ctx'> </div><div class='ctx'> 		Mapping and Accessing I/O Registers</div><div class='ctx'> </div><div class='hunk'>@@ -263,10 +305,3 @@ discussed above and plus it handles both PCI and SBUS boards.</div><div class='ctx'> 	Lance driver abuses consistent mappings for data transfer.</div><div class='ctx'> It is a nifty trick which we do not particularly recommend...</div><div class='ctx'> Just check it out and know that it's legal.</div><div class='del'>-</div><div class='del'>-			Bad examples, do NOT use</div><div class='del'>-</div><div class='del'>-	drivers/video/cgsix.c</div><div class='del'>-	This one uses result of sbus_ioremap as if it is an address.</div><div class='del'>-This does NOT work on sparc64 and therefore is broken. We will</div><div class='del'>-convert it at a later date.</div><div class='head'>diff --git a/Documentation/sparse.txt b/Documentation/sparse.txt<br/>index 3f1c5464b1c9..5a311c38dd1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sparse.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sparse.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sparse.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/sparse.txt</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> Copyright 2004 Linus Torvalds</div><div class='ctx'> Copyright 2004 Pavel Machek &lt;pavel@suse.cz&gt;</div><div class='add'>+Copyright 2006 Bob Copeland &lt;me@bobcopeland.com&gt;</div><div class='ctx'> </div><div class='ctx'> Using sparse for typechecking</div><div class='ctx'> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='hunk'>@@ -41,15 +42,8 @@ sure that bitwise types don't get mixed up (little-endian vs big-endian</div><div class='ctx'> vs cpu-endian vs whatever), and there the constant "0" really _is_</div><div class='ctx'> special.</div><div class='ctx'> </div><div class='del'>-Use</div><div class='del'>-</div><div class='del'>-	make C=[12] CF=-Wbitwise</div><div class='del'>-</div><div class='del'>-or you don't get any checking at all.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Where to get sparse</div><div class='del'>-~~~~~~~~~~~~~~~~~~~</div><div class='add'>+Getting sparse</div><div class='add'>+~~~~~~~~~~~~~~</div><div class='ctx'> </div><div class='ctx'> With git, you can just get it from</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +51,7 @@ With git, you can just get it from</div><div class='ctx'> </div><div class='ctx'> and DaveJ has tar-balls at</div><div class='ctx'> </div><div class='del'>-	http://www.codemonkey.org.uk/projects/git-snapshots/sparse/</div><div class='add'>+        http://www.codemonkey.org.uk/projects/git-snapshots/sparse/</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Once you have it, just do</div><div class='hunk'>@@ -65,8 +59,20 @@ Once you have it, just do</div><div class='ctx'>         make</div><div class='ctx'>         make install</div><div class='ctx'> </div><div class='del'>-as your regular user, and it will install sparse in your ~/bin directory.</div><div class='del'>-After that, doing a kernel make with "make C=1" will run sparse on all the</div><div class='del'>-C files that get recompiled, or with "make C=2" will run sparse on the</div><div class='del'>-files whether they need to be recompiled or not (ie the latter is fast way</div><div class='del'>-to check the whole tree if you have already built it).</div><div class='add'>+as a regular user, and it will install sparse in your ~/bin directory.</div><div class='add'>+</div><div class='add'>+Using sparse</div><div class='add'>+~~~~~~~~~~~~</div><div class='add'>+</div><div class='add'>+Do a kernel make with "make C=1" to run sparse on all the C files that get</div><div class='add'>+recompiled, or use "make C=2" to run sparse on the files whether they need to</div><div class='add'>+be recompiled or not.  The latter is a fast way to check the whole tree if you</div><div class='add'>+have already built it.</div><div class='add'>+</div><div class='add'>+The optional make variable CF can be used to pass arguments to sparse.  The</div><div class='add'>+build system passes -Wbitwise to sparse automatically.  To perform endianness</div><div class='add'>+checks, you may define __CHECK_ENDIAN__:</div><div class='add'>+</div><div class='add'>+        make C=2 CF="-D__CHECK_ENDIAN__"</div><div class='add'>+</div><div class='add'>+These checks are disabled by default as they generate a host of warnings.</div><div class='head'>diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt<br/>index a46c10fcddfc..7cee90223d3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sysctl/vm.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sysctl/vm.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sysctl/vm.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/sysctl/vm.txt</a></div><div class='hunk'>@@ -28,7 +28,8 @@ Currently, these files are in /proc/sys/vm:</div><div class='ctx'> - block_dump</div><div class='ctx'> - drop-caches</div><div class='ctx'> - zone_reclaim_mode</div><div class='del'>-- zone_reclaim_interval</div><div class='add'>+- min_unmapped_ratio</div><div class='add'>+- panic_on_oom</div><div class='ctx'> </div><div class='ctx'> ==============================================================</div><div class='ctx'> </div><div class='hunk'>@@ -166,15 +167,28 @@ use of files and builds up large slab caches. However, the slab</div><div class='ctx'> shrink operation is global, may take a long time and free slabs</div><div class='ctx'> in all nodes of the system.</div><div class='ctx'> </div><div class='del'>-================================================================</div><div class='add'>+=============================================================</div><div class='ctx'> </div><div class='del'>-zone_reclaim_interval:</div><div class='add'>+min_unmapped_ratio:</div><div class='ctx'> </div><div class='del'>-The time allowed for off node allocations after zone reclaim</div><div class='del'>-has failed to reclaim enough pages to allow a local allocation.</div><div class='add'>+This is available only on NUMA kernels.</div><div class='ctx'> </div><div class='del'>-Time is set in seconds and set by default to 30 seconds.</div><div class='add'>+A percentage of the file backed pages in each zone.  Zone reclaim will only</div><div class='add'>+occur if more than this percentage of pages are file backed and unmapped.</div><div class='add'>+This is to insure that a minimal amount of local pages is still available for</div><div class='add'>+file I/O even if the node is overallocated.</div><div class='ctx'> </div><div class='del'>-Reduce the interval if undesired off node allocations occur. However, too</div><div class='del'>-frequent scans will have a negative impact onoff node allocation performance.</div><div class='add'>+The default is 1 percent.</div><div class='add'>+</div><div class='add'>+=============================================================</div><div class='add'>+</div><div class='add'>+panic_on_oom</div><div class='add'>+</div><div class='add'>+This enables or disables panic on out-of-memory feature.  If this is set to 1,</div><div class='add'>+the kernel panics when out-of-memory happens.  If this is set to 0, the kernel</div><div class='add'>+will kill some rogue process, called oom_killer.  Usually, oom_killer can kill</div><div class='add'>+rogue processes and system will survive.  If you want to panic the system</div><div class='add'>+rather than killing rogue processes, set this to 1.</div><div class='add'>+</div><div class='add'>+The default value is 0.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt<br/>index ad0bedf678b3..e0188a23fd5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/sysrq.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/sysrq.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/sysrq.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/sysrq.txt</a></div><div class='hunk'>@@ -115,8 +115,9 @@ trojan program is running at console and which could grab your password</div><div class='ctx'> when you would try to login. It will kill all programs on given console</div><div class='ctx'> and thus letting you make sure that the login prompt you see is actually</div><div class='ctx'> the one from init, not some trojan program.</div><div class='del'>-IMPORTANT:In its true form it is not a true SAK like the one in   :IMPORTANT</div><div class='del'>-IMPORTANT:c2 compliant systems, and it should be mistook as such. :IMPORTANT</div><div class='add'>+IMPORTANT: In its true form it is not a true SAK like the one in a :IMPORTANT</div><div class='add'>+IMPORTANT: c2 compliant system, and it should not be mistaken as   :IMPORTANT</div><div class='add'>+IMPORTANT: such.                                                   :IMPORTANT</div><div class='ctx'>        It seems other find it useful as (System Attention Key) which is</div><div class='ctx'> useful when you want to exit a program that will not let you switch consoles.</div><div class='ctx'> (For example, X or a svgalib program.)</div><div class='head'>diff --git a/Documentation/tty.txt b/Documentation/tty.txt<br/>index 8ff7bc2a0811..dab56604745d 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/tty.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/tty.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/tty.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/tty.txt</a></div><div class='hunk'>@@ -80,13 +80,6 @@ receive_buf()	-	Hand buffers of bytes from the driver to the ldisc</div><div class='ctx'> 			for processing. Semantics currently rather</div><div class='ctx'> 			mysterious 8(</div><div class='ctx'> </div><div class='del'>-receive_room()	-	Can be called by the driver layer at any time when</div><div class='del'>-			the ldisc is opened. The ldisc must be able to</div><div class='del'>-			handle the reported amount of data at that instant.</div><div class='del'>-			Synchronization between active receive_buf and</div><div class='del'>-			receive_room calls is down to the driver not the</div><div class='del'>-			ldisc. Must not sleep.</div><div class='del'>-</div><div class='ctx'> write_wakeup()	-	May be called at any point between open and close.</div><div class='ctx'> 			The TTY_DO_WRITE_WAKEUP flag indicates if a call</div><div class='ctx'> 			is needed but always races versus calls. Thus the</div><div class='head'>diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt<br/>index f001cd93b79b..02b0f7beb6d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/usb/usb-serial.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/usb/usb-serial.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/usb/usb-serial.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/usb/usb-serial.txt</a></div><div class='hunk'>@@ -399,10 +399,10 @@ REINER SCT cyberJack pinpad/e-com USB chipcard reader</div><div class='ctx'> </div><div class='ctx'> Prolific PL2303 Driver</div><div class='ctx'> </div><div class='del'>-  This driver support any device that has the PL2303 chip from Prolific</div><div class='add'>+  This driver supports any device that has the PL2303 chip from Prolific</div><div class='ctx'>   in it.  This includes a number of single port USB to serial</div><div class='ctx'>   converters and USB GPS devices.  Devices from Aten (the UC-232) and</div><div class='del'>-  IO-Data work with this driver.</div><div class='add'>+  IO-Data work with this driver, as does the DCU-11 mobile-phone cable.</div><div class='ctx'> </div><div class='ctx'>   For any questions or problems with this driver, please contact Greg</div><div class='ctx'>   Kroah-Hartman at greg@kroah.com</div><div class='head'>diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt<br/>index 63cb7edd177e..e65ec828d7aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/usb/usbmon.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/usb/usbmon.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/usb/usbmon.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/usb/usbmon.txt</a></div><div class='hunk'>@@ -29,14 +29,13 @@ if usbmon is built into the kernel.</div><div class='ctx'> </div><div class='ctx'> # mount -t debugfs none_debugs /sys/kernel/debug</div><div class='ctx'> # modprobe usbmon</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> Verify that bus sockets are present.</div><div class='ctx'> </div><div class='del'>-[root@lembas zaitcev]# ls /sys/kernel/debug/usbmon</div><div class='add'>+# ls /sys/kernel/debug/usbmon</div><div class='ctx'> 1s  1t  2s  2t  3s  3t  4s  4t</div><div class='del'>-[root@lembas zaitcev]#</div><div class='del'>-</div><div class='del'>-# ls /sys/kernel</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> 2. Find which bus connects to the desired device</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +75,7 @@ that the file size is not excessive for your favourite editor.</div><div class='ctx'> </div><div class='ctx'> * Raw text data format</div><div class='ctx'> </div><div class='del'>-The '0t' type data consists of a stream of events, such as URB submission,</div><div class='add'>+The '1t' type data consists of a stream of events, such as URB submission,</div><div class='ctx'> URB callback, submission error. Every event is a text line, which consists</div><div class='ctx'> of whitespace separated words. The number of position of words may depend</div><div class='ctx'> on the event type, but there is a set of words, common for all types.</div><div class='hunk'>@@ -97,20 +96,25 @@ Here is the list of words, from left to right:</div><div class='ctx'>     Zi Zo   Isochronous input and output</div><div class='ctx'>     Ii Io   Interrupt input and output</div><div class='ctx'>     Bi Bo   Bulk input and output</div><div class='del'>-  Device address and Endpoint number are decimal numbers with leading zeroes</div><div class='del'>-  or 3 and 2 positions, correspondingly.</div><div class='del'>-- URB Status. This field makes no sense for submissions, but is present</div><div class='del'>-  to help scripts with parsing. In error case, it contains the error code.</div><div class='del'>-  In case of a setup packet, it contains a Setup Tag. If scripts read a number</div><div class='del'>-  in this field, they proceed to read Data Length. Otherwise, they read</div><div class='del'>-  the setup packet before reading the Data Length.</div><div class='add'>+  Device address and Endpoint number are 3-digit and 2-digit (respectively)</div><div class='add'>+  decimal numbers, with leading zeroes.</div><div class='add'>+- URB Status. In most cases, this field contains a number, sometimes negative,</div><div class='add'>+  which represents a "status" field of the URB. This field makes no sense for</div><div class='add'>+  submissions, but is present anyway to help scripts with parsing. When an</div><div class='add'>+  error occurs, the field contains the error code. In case of a submission of</div><div class='add'>+  a Control packet, this field contains a Setup Tag instead of an error code.</div><div class='add'>+  It is easy to tell whether the Setup Tag is present because it is never a</div><div class='add'>+  number. Thus if scripts find a number in this field, they proceed to read</div><div class='add'>+  Data Length. If they find something else, like a letter, they read the setup</div><div class='add'>+  packet before reading the Data Length.</div><div class='ctx'> - Setup packet, if present, consists of 5 words: one of each for bmRequestType,</div><div class='ctx'>   bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.</div><div class='ctx'>   These words are safe to decode if Setup Tag was 's'. Otherwise, the setup</div><div class='ctx'>   packet was present, but not captured, and the fields contain filler.</div><div class='del'>-- Data Length. This is the actual length in the URB.</div><div class='add'>+- Data Length. For submissions, this is the requested length. For callbacks,</div><div class='add'>+  this is the actual length.</div><div class='ctx'> - Data tag. The usbmon may not always capture data, even if length is nonzero.</div><div class='del'>-  Only if tag is '=', the data words are present.</div><div class='add'>+  The data words are present only if this tag is '='.</div><div class='ctx'> - Data words follow, in big endian hexadecimal format. Notice that they are</div><div class='ctx'>   not machine words, but really just a byte stream split into words to make</div><div class='ctx'>   it easier to read. Thus, the last word may contain from one to four bytes.</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv<br/>index b72706c58a44..4efa4645885f 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.bttv?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.bttv</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.bttv?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/CARDLIST.bttv</a></div><div class='hunk'>@@ -87,7 +87,7 @@</div><div class='ctx'>  86 -&gt; Osprey 101/151 w/ svid</div><div class='ctx'>  87 -&gt; Osprey 200/201/250/251</div><div class='ctx'>  88 -&gt; Osprey 200/250                                      [0070:ff01]</div><div class='del'>- 89 -&gt; Osprey 210/220</div><div class='add'>+ 89 -&gt; Osprey 210/220/230</div><div class='ctx'>  90 -&gt; Osprey 500                                          [0070:ff02]</div><div class='ctx'>  91 -&gt; Osprey 540                                          [0070:ff04]</div><div class='ctx'>  92 -&gt; Osprey 2000                                         [0070:ff03]</div><div class='hunk'>@@ -111,7 +111,7 @@</div><div class='ctx'> 110 -&gt; IVC-100                                             [ff00:a132]</div><div class='ctx'> 111 -&gt; IVC-120G                                            [ff00:a182,ff01:a182,ff02:a182,ff03:a182,ff04:a182,ff05:a182,ff06:a182,ff07:a182,ff08:a182,ff09:a182,ff0a:a182,ff0b:a182,ff0c:a182,ff0d:a182,ff0e:a182,ff0f:a182]</div><div class='ctx'> 112 -&gt; pcHDTV HD-2000 TV                                   [7063:2000]</div><div class='del'>-113 -&gt; Twinhan DST + clones                                [11bd:0026,1822:0001,270f:fc00]</div><div class='add'>+113 -&gt; Twinhan DST + clones                                [11bd:0026,1822:0001,270f:fc00,1822:0026]</div><div class='ctx'> 114 -&gt; Winfast VC100                                       [107d:6607]</div><div class='ctx'> 115 -&gt; Teppro TEV-560/InterVision IV-560</div><div class='ctx'> 116 -&gt; SIMUS GVC1100                                       [aa6a:82b2]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88<br/>index 3b39a91b24bd..00d9a1f2a54c 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.cx88?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.cx88</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.cx88?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/CARDLIST.cx88</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  14 -&gt; KWorld/VStream XPert DVB-T                          [17de:08a6]</div><div class='ctx'>  15 -&gt; DViCO FusionHDTV DVB-T1                             [18ac:db00]</div><div class='ctx'>  16 -&gt; KWorld LTV883RF</div><div class='del'>- 17 -&gt; DViCO FusionHDTV 3 Gold-Q                           [18ac:d810]</div><div class='add'>+ 17 -&gt; DViCO FusionHDTV 3 Gold-Q                           [18ac:d810,18ac:d800]</div><div class='ctx'>  18 -&gt; Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001]</div><div class='ctx'>  19 -&gt; Conexant DVB-T reference design                     [14f1:0187]</div><div class='ctx'>  20 -&gt; Provideo PV259                                      [1540:2580]</div><div class='hunk'>@@ -40,8 +40,14 @@</div><div class='ctx'>  39 -&gt; KWorld DVB-S 100                                    [17de:08b2]</div><div class='ctx'>  40 -&gt; Hauppauge WinTV-HVR1100 DVB-T/Hybrid                [0070:9400,0070:9402]</div><div class='ctx'>  41 -&gt; Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]</div><div class='del'>- 42 -&gt; digitalnow DNTV Live! DVB-T Pro                     [1822:0025]</div><div class='add'>+ 42 -&gt; digitalnow DNTV Live! DVB-T Pro                     [1822:0025,1822:0019]</div><div class='ctx'>  43 -&gt; KWorld/VStream XPert DVB-T with cx22702             [17de:08a1]</div><div class='ctx'>  44 -&gt; DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50,18ac:db54]</div><div class='ctx'>  45 -&gt; KWorld HardwareMpegTV XPert                         [17de:0840]</div><div class='ctx'>  46 -&gt; DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]</div><div class='add'>+ 47 -&gt; pcHDTV HD5500 HDTV                                  [7063:5500]</div><div class='add'>+ 48 -&gt; Kworld MCE 200 Deluxe                               [17de:0841]</div><div class='add'>+ 49 -&gt; PixelView PlayTV P7000                              [1554:4813]</div><div class='add'>+ 50 -&gt; NPG Tech Real TV FM Top 10                          [14f1:0842]</div><div class='add'>+ 51 -&gt; WinFast DTV2000 H                                   [107d:665e]</div><div class='add'>+ 52 -&gt; Geniatech DVB-S                                     [14f1:0084]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134<br/>index bca50903233f..9068b669f5ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.saa7134?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.saa7134</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.saa7134?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/CARDLIST.saa7134</a></div><div class='hunk'>@@ -93,3 +93,4 @@</div><div class='ctx'>  92 -&gt; AVerMedia A169 B1                        [1461:6360]</div><div class='ctx'>  93 -&gt; Medion 7134 Bridge #2                    [16be:0005]</div><div class='ctx'>  94 -&gt; LifeView FlyDVB-T Hybrid Cardbus         [5168:3306,5168:3502]</div><div class='add'>+ 95 -&gt; LifeView FlyVIDEO3000 (NTSC)             [5169:0138]</div><div class='head'>diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner<br/>index 1bcdac67dd8c..44134f04b82a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.tuner?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CARDLIST.tuner</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CARDLIST.tuner?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/CARDLIST.tuner</a></div><div class='hunk'>@@ -62,7 +62,7 @@ tuner=60 - Thomson DTT 761X (ATSC/NTSC)</div><div class='ctx'> tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF</div><div class='ctx'> tuner=62 - Philips TEA5767HN FM Radio</div><div class='ctx'> tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner</div><div class='del'>-tuner=64 - LG TDVS-H062F/TUA6034</div><div class='add'>+tuner=64 - LG TDVS-H06xF</div><div class='ctx'> tuner=65 - Ymec TVF66T5-B/DFF</div><div class='ctx'> tuner=66 - LG TALN series</div><div class='ctx'> tuner=67 - Philips TD1316 Hybrid Tuner</div><div class='hunk'>@@ -71,3 +71,4 @@ tuner=69 - Tena TNF 5335 and similar models</div><div class='ctx'> tuner=70 - Samsung TCPN 2121P30A</div><div class='ctx'> tuner=71 - Xceive xc3028</div><div class='ctx'> tuner=72 - Thomson FE6600</div><div class='add'>+tuner=73 - Samsung TCPG 6121P30A</div><div class='head'>diff --git a/Documentation/video4linux/CQcam.txt b/Documentation/video4linux/CQcam.txt<br/>index 464e4cec94cb..ade8651e2443 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/CQcam.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/CQcam.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/CQcam.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/CQcam.txt</a></div><div class='hunk'>@@ -185,207 +185,10 @@ this work is documented at the video4linux2 site listed below.</div><div class='ctx'> </div><div class='ctx'> 9.0 --- A sample program using v4lgrabber,</div><div class='ctx'> </div><div class='del'>-This program is a simple image grabber that will copy a frame from the</div><div class='add'>+v4lgrab is a simple image grabber that will copy a frame from the</div><div class='ctx'> first video device, /dev/video0 to standard output in portable pixmap</div><div class='del'>-format (.ppm)  Using this like: 'v4lgrab | convert - c-qcam.jpg'</div><div class='del'>-produced this picture of me at</div><div class='del'>-    http://mug.sys.virginia.edu/~drf5n/extras/c-qcam.jpg</div><div class='del'>-</div><div class='del'>--------------------- 8&lt; ---------------- 8&lt; -----------------------------</div><div class='del'>-</div><div class='del'>-/* Simple Video4Linux image grabber. */</div><div class='del'>-/*</div><div class='del'>- *	Video4Linux Driver Test/Example Framegrabbing Program</div><div class='del'>- *</div><div class='del'>- *	Compile with:</div><div class='del'>- *		gcc -s -Wall -Wstrict-prototypes v4lgrab.c -o v4lgrab</div><div class='del'>- *      Use as:</div><div class='del'>- *              v4lgrab &gt;image.ppm</div><div class='del'>- *</div><div class='del'>- *	Copyright (C) 1998-05-03, Phil Blundell &lt;philb@gnu.org&gt;</div><div class='del'>- *      Copied from http://www.tazenda.demon.co.uk/phil/vgrabber.c</div><div class='del'>- *      with minor modifications (Dave Forrest, drf5n@virginia.edu).</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/videodev.h&gt;</div><div class='del'>-</div><div class='del'>-#define FILE "/dev/video0"</div><div class='del'>-</div><div class='del'>-/* Stole this from tvset.c */</div><div class='del'>-</div><div class='del'>-#define READ_VIDEO_PIXEL(buf, format, depth, r, g, b)                   \</div><div class='del'>-{                                                                       \</div><div class='del'>-	switch (format)                                                 \</div><div class='del'>-	{                                                               \</div><div class='del'>-		case VIDEO_PALETTE_GREY:                                \</div><div class='del'>-			switch (depth)                                  \</div><div class='del'>-			{                                               \</div><div class='del'>-				case 4:                                 \</div><div class='del'>-				case 6:                                 \</div><div class='del'>-				case 8:                                 \</div><div class='del'>-					(r) = (g) = (b) = (*buf++ &lt;&lt; 8);\</div><div class='del'>-					break;                          \</div><div class='del'>-									\</div><div class='del'>-				case 16:                                \</div><div class='del'>-					(r) = (g) = (b) =               \</div><div class='del'>-						*((unsigned short *) buf);      \</div><div class='del'>-					buf += 2;                       \</div><div class='del'>-					break;                          \</div><div class='del'>-			}                                               \</div><div class='del'>-			break;                                          \</div><div class='del'>-									\</div><div class='del'>-									\</div><div class='del'>-		case VIDEO_PALETTE_RGB565:                              \</div><div class='del'>-		{                                                       \</div><div class='del'>-			unsigned short tmp = *(unsigned short *)buf;    \</div><div class='del'>-			(r) = tmp&amp;0xF800;                               \</div><div class='del'>-			(g) = (tmp&lt;&lt;5)&amp;0xFC00;                          \</div><div class='del'>-			(b) = (tmp&lt;&lt;11)&amp;0xF800;                         \</div><div class='del'>-			buf += 2;                                       \</div><div class='del'>-		}                                                       \</div><div class='del'>-		break;                                                  \</div><div class='del'>-									\</div><div class='del'>-		case VIDEO_PALETTE_RGB555:                              \</div><div class='del'>-			(r) = (buf[0]&amp;0xF8)&lt;&lt;8;                         \</div><div class='del'>-			(g) = ((buf[0] &lt;&lt; 5 | buf[1] &gt;&gt; 3)&amp;0xF8)&lt;&lt;8;    \</div><div class='del'>-			(b) = ((buf[1] &lt;&lt; 2 ) &amp; 0xF8)&lt;&lt;8;               \</div><div class='del'>-			buf += 2;                                       \</div><div class='del'>-			break;                                          \</div><div class='del'>-									\</div><div class='del'>-		case VIDEO_PALETTE_RGB24:                               \</div><div class='del'>-			(r) = buf[0] &lt;&lt; 8; (g) = buf[1] &lt;&lt; 8;           \</div><div class='del'>-			(b) = buf[2] &lt;&lt; 8;                              \</div><div class='del'>-			buf += 3;                                       \</div><div class='del'>-			break;                                          \</div><div class='del'>-									\</div><div class='del'>-		default:                                                \</div><div class='del'>-			fprintf(stderr,                                 \</div><div class='del'>-				"Format %d not yet supported\n",        \</div><div class='del'>-				format);                                \</div><div class='del'>-	}                                                               \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int get_brightness_adj(unsigned char *image, long size, int *brightness) {</div><div class='del'>-  long i, tot = 0;</div><div class='del'>-  for (i=0;i&lt;size*3;i++)</div><div class='del'>-    tot += image[i];</div><div class='del'>-  *brightness = (128 - tot/(size*3))/3;</div><div class='del'>-  return !((tot/(size*3)) &gt;= 126 &amp;&amp; (tot/(size*3)) &lt;= 130);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char ** argv)</div><div class='del'>-{</div><div class='del'>-  int fd = open(FILE, O_RDONLY), f;</div><div class='del'>-  struct video_capability cap;</div><div class='del'>-  struct video_window win;</div><div class='del'>-  struct video_picture vpic;</div><div class='del'>-</div><div class='del'>-  unsigned char *buffer, *src;</div><div class='del'>-  int bpp = 24, r, g, b;</div><div class='del'>-  unsigned int i, src_depth;</div><div class='del'>-</div><div class='del'>-  if (fd &lt; 0) {</div><div class='del'>-    perror(FILE);</div><div class='del'>-    exit(1);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if (ioctl(fd, VIDIOCGCAP, &amp;cap) &lt; 0) {</div><div class='del'>-    perror("VIDIOGCAP");</div><div class='del'>-    fprintf(stderr, "(" FILE " not a video4linux device?)\n");</div><div class='del'>-    close(fd);</div><div class='del'>-    exit(1);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if (ioctl(fd, VIDIOCGWIN, &amp;win) &lt; 0) {</div><div class='del'>-    perror("VIDIOCGWIN");</div><div class='del'>-    close(fd);</div><div class='del'>-    exit(1);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if (ioctl(fd, VIDIOCGPICT, &amp;vpic) &lt; 0) {</div><div class='del'>-    perror("VIDIOCGPICT");</div><div class='del'>-    close(fd);</div><div class='del'>-    exit(1);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if (cap.type &amp; VID_TYPE_MONOCHROME) {</div><div class='del'>-    vpic.depth=8;</div><div class='del'>-    vpic.palette=VIDEO_PALETTE_GREY;    /* 8bit grey */</div><div class='del'>-    if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='del'>-      vpic.depth=6;</div><div class='del'>-      if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='del'>-	vpic.depth=4;</div><div class='del'>-	if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='del'>-	  fprintf(stderr, "Unable to find a supported capture format.\n");</div><div class='del'>-	  close(fd);</div><div class='del'>-	  exit(1);</div><div class='del'>-	}</div><div class='del'>-      }</div><div class='del'>-    }</div><div class='del'>-  } else {</div><div class='del'>-    vpic.depth=24;</div><div class='del'>-    vpic.palette=VIDEO_PALETTE_RGB24;</div><div class='del'>-</div><div class='del'>-    if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='del'>-      vpic.palette=VIDEO_PALETTE_RGB565;</div><div class='del'>-      vpic.depth=16;</div><div class='del'>-</div><div class='del'>-      if(ioctl(fd, VIDIOCSPICT, &amp;vpic)==-1) {</div><div class='del'>-	vpic.palette=VIDEO_PALETTE_RGB555;</div><div class='del'>-	vpic.depth=15;</div><div class='del'>-</div><div class='del'>-	if(ioctl(fd, VIDIOCSPICT, &amp;vpic)==-1) {</div><div class='del'>-	  fprintf(stderr, "Unable to find a supported capture format.\n");</div><div class='del'>-	  return -1;</div><div class='del'>-	}</div><div class='del'>-      }</div><div class='del'>-    }</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  buffer = malloc(win.width * win.height * bpp);</div><div class='del'>-  if (!buffer) {</div><div class='del'>-    fprintf(stderr, "Out of memory.\n");</div><div class='del'>-    exit(1);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  do {</div><div class='del'>-    int newbright;</div><div class='del'>-    read(fd, buffer, win.width * win.height * bpp);</div><div class='del'>-    f = get_brightness_adj(buffer, win.width * win.height, &amp;newbright);</div><div class='del'>-    if (f) {</div><div class='del'>-      vpic.brightness += (newbright &lt;&lt; 8);</div><div class='del'>-      if(ioctl(fd, VIDIOCSPICT, &amp;vpic)==-1) {</div><div class='del'>-	perror("VIDIOSPICT");</div><div class='del'>-	break;</div><div class='del'>-      }</div><div class='del'>-    }</div><div class='del'>-  } while (f);</div><div class='del'>-</div><div class='del'>-  fprintf(stdout, "P6\n%d %d 255\n", win.width, win.height);</div><div class='del'>-</div><div class='del'>-  src = buffer;</div><div class='del'>-</div><div class='del'>-  for (i = 0; i &lt; win.width * win.height; i++) {</div><div class='del'>-    READ_VIDEO_PIXEL(src, vpic.palette, src_depth, r, g, b);</div><div class='del'>-    fputc(r&gt;&gt;8, stdout);</div><div class='del'>-    fputc(g&gt;&gt;8, stdout);</div><div class='del'>-    fputc(b&gt;&gt;8, stdout);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  close(fd);</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>--------------------- 8&lt; ---------------- 8&lt; -----------------------------</div><div class='add'>+format (.ppm)  To produce .jpg output, you can use it like this:</div><div class='add'>+'v4lgrab | convert - c-qcam.jpg'</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 10.0 --- Other Information</div><div class='head'>diff --git a/Documentation/video4linux/README.pvrusb2 b/Documentation/video4linux/README.pvrusb2<br/>new file mode 100644<br/>index 000000000000..c73a32c34528<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/README.pvrusb2?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/README.pvrusb2</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+</div><div class='add'>+$Id$</div><div class='add'>+Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+</div><div class='add'>+			    pvrusb2 driver</div><div class='add'>+</div><div class='add'>+Background:</div><div class='add'>+</div><div class='add'>+  This driver is intended for the "Hauppauge WinTV PVR USB 2.0", which</div><div class='add'>+  is a USB 2.0 hosted TV Tuner.  This driver is a work in progress.</div><div class='add'>+  Its history started with the reverse-engineering effort by Björn</div><div class='add'>+  Danielsson &lt;pvrusb2@dax.nu&gt; whose web page can be found here:</div><div class='add'>+</div><div class='add'>+    http://pvrusb2.dax.nu/</div><div class='add'>+</div><div class='add'>+  From there Aurelien Alleaume &lt;slts@free.fr&gt; began an effort to</div><div class='add'>+  create a video4linux compatible driver.  I began with Aurelien's</div><div class='add'>+  last known snapshot and evolved the driver to the state it is in</div><div class='add'>+  here.</div><div class='add'>+</div><div class='add'>+  More information on this driver can be found at:</div><div class='add'>+</div><div class='add'>+    http://www.isely.net/pvrusb2.html</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  This driver has a strong separation of layers.  They are very</div><div class='add'>+  roughly:</div><div class='add'>+</div><div class='add'>+  1a. Low level wire-protocol implementation with the device.</div><div class='add'>+</div><div class='add'>+  1b. I2C adaptor implementation and corresponding I2C client drivers</div><div class='add'>+      implemented elsewhere in V4L.</div><div class='add'>+</div><div class='add'>+  1c. High level hardware driver implementation which coordinates all</div><div class='add'>+      activities that ensure correct operation of the device.</div><div class='add'>+</div><div class='add'>+  2.  A "context" layer which manages instancing of driver, setup,</div><div class='add'>+      tear-down, arbitration, and interaction with high level</div><div class='add'>+      interfaces appropriately as devices are hotplugged in the</div><div class='add'>+      system.</div><div class='add'>+</div><div class='add'>+  3.  High level interfaces which glue the driver to various published</div><div class='add'>+      Linux APIs (V4L, sysfs, maybe DVB in the future).</div><div class='add'>+</div><div class='add'>+  The most important shearing layer is between the top 2 layers.  A</div><div class='add'>+  lot of work went into the driver to ensure that any kind of</div><div class='add'>+  conceivable API can be laid on top of the core driver.  (Yes, the</div><div class='add'>+  driver internally leverages V4L to do its work but that really has</div><div class='add'>+  nothing to do with the API published by the driver to the outside</div><div class='add'>+  world.)  The architecture allows for different APIs to</div><div class='add'>+  simultaneously access the driver.  I have a strong sense of fairness</div><div class='add'>+  about APIs and also feel that it is a good design principle to keep</div><div class='add'>+  implementation and interface isolated from each other.  Thus while</div><div class='add'>+  right now the V4L high level interface is the most complete, the</div><div class='add'>+  sysfs high level interface will work equally well for similar</div><div class='add'>+  functions, and there's no reason I see right now why it shouldn't be</div><div class='add'>+  possible to produce a DVB high level interface that can sit right</div><div class='add'>+  alongside V4L.</div><div class='add'>+</div><div class='add'>+  NOTE: Complete documentation on the pvrusb2 driver is contained in</div><div class='add'>+  the html files within the doc directory; these are exactly the same</div><div class='add'>+  as what is on the web site at the time.  Browse those files</div><div class='add'>+  (especially the FAQ) before asking questions.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Building</div><div class='add'>+</div><div class='add'>+  To build these modules essentially amounts to just running "Make",</div><div class='add'>+  but you need the kernel source tree nearby and you will likely also</div><div class='add'>+  want to set a few controlling environment variables first in order</div><div class='add'>+  to link things up with that source tree.  Please see the Makefile</div><div class='add'>+  here for comments that explain how to do that.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Source file list / functional overview:</div><div class='add'>+</div><div class='add'>+  (Note: The term "module" used below generally refers to loosely</div><div class='add'>+  defined functional units within the pvrusb2 driver and bears no</div><div class='add'>+  relation to the Linux kernel's concept of a loadable module.)</div><div class='add'>+</div><div class='add'>+  pvrusb2-audio.[ch] - This is glue logic that resides between this</div><div class='add'>+    driver and the msp3400.ko I2C client driver (which is found</div><div class='add'>+    elsewhere in V4L).</div><div class='add'>+</div><div class='add'>+  pvrusb2-context.[ch] - This module implements the context for an</div><div class='add'>+    instance of the driver.  Everything else eventually ties back to</div><div class='add'>+    or is otherwise instanced within the data structures implemented</div><div class='add'>+    here.  Hotplugging is ultimately coordinated here.  All high level</div><div class='add'>+    interfaces tie into the driver through this module.  This module</div><div class='add'>+    helps arbitrate each interface's access to the actual driver core,</div><div class='add'>+    and is designed to allow concurrent access through multiple</div><div class='add'>+    instances of multiple interfaces (thus you can for example change</div><div class='add'>+    the tuner's frequency through sysfs while simultaneously streaming</div><div class='add'>+    video through V4L out to an instance of mplayer).</div><div class='add'>+</div><div class='add'>+  pvrusb2-debug.h - This header defines a printk() wrapper and a mask</div><div class='add'>+    of debugging bit definitions for the various kinds of debug</div><div class='add'>+    messages that can be enabled within the driver.</div><div class='add'>+</div><div class='add'>+  pvrusb2-debugifc.[ch] - This module implements a crude command line</div><div class='add'>+    oriented debug interface into the driver.  Aside from being part</div><div class='add'>+    of the process for implementing manual firmware extraction (see</div><div class='add'>+    the pvrusb2 web site mentioned earlier), probably I'm the only one</div><div class='add'>+    who has ever used this.  It is mainly a debugging aid.</div><div class='add'>+</div><div class='add'>+  pvrusb2-eeprom.[ch] - This is glue logic that resides between this</div><div class='add'>+    driver the tveeprom.ko module, which is itself implemented</div><div class='add'>+    elsewhere in V4L.</div><div class='add'>+</div><div class='add'>+  pvrusb2-encoder.[ch] - This module implements all protocol needed to</div><div class='add'>+    interact with the Conexant mpeg2 encoder chip within the pvrusb2</div><div class='add'>+    device.  It is a crude echo of corresponding logic in ivtv,</div><div class='add'>+    however the design goals (strict isolation) and physical layer</div><div class='add'>+    (proxy through USB instead of PCI) are enough different that this</div><div class='add'>+    implementation had to be completely different.</div><div class='add'>+</div><div class='add'>+  pvrusb2-hdw-internal.h - This header defines the core data structure</div><div class='add'>+    in the driver used to track ALL internal state related to control</div><div class='add'>+    of the hardware.  Nobody outside of the core hardware-handling</div><div class='add'>+    modules should have any business using this header.  All external</div><div class='add'>+    access to the driver should be through one of the high level</div><div class='add'>+    interfaces (e.g. V4L, sysfs, etc), and in fact even those high</div><div class='add'>+    level interfaces are restricted to the API defined in</div><div class='add'>+    pvrusb2-hdw.h and NOT this header.</div><div class='add'>+</div><div class='add'>+  pvrusb2-hdw.h - This header defines the full internal API for</div><div class='add'>+    controlling the hardware.  High level interfaces (e.g. V4L, sysfs)</div><div class='add'>+    will work through here.</div><div class='add'>+</div><div class='add'>+  pvrusb2-hdw.c - This module implements all the various bits of logic</div><div class='add'>+    that handle overall control of a specific pvrusb2 device.</div><div class='add'>+    (Policy, instantiation, and arbitration of pvrusb2 devices fall</div><div class='add'>+    within the jurisdiction of pvrusb-context not here).</div><div class='add'>+</div><div class='add'>+  pvrusb2-i2c-chips-*.c - These modules implement the glue logic to</div><div class='add'>+    tie together and configure various I2C modules as they attach to</div><div class='add'>+    the I2C bus.  There are two versions of this file.  The "v4l2"</div><div class='add'>+    version is intended to be used in-tree alongside V4L, where we</div><div class='add'>+    implement just the logic that makes sense for a pure V4L</div><div class='add'>+    environment.  The "all" version is intended for use outside of</div><div class='add'>+    V4L, where we might encounter other possibly "challenging" modules</div><div class='add'>+    from ivtv or older kernel snapshots (or even the support modules</div><div class='add'>+    in the standalone snapshot).</div><div class='add'>+</div><div class='add'>+  pvrusb2-i2c-cmd-v4l1.[ch] - This module implements generic V4L1</div><div class='add'>+    compatible commands to the I2C modules.  It is here where state</div><div class='add'>+    changes inside the pvrusb2 driver are translated into V4L1</div><div class='add'>+    commands that are in turn send to the various I2C modules.</div><div class='add'>+</div><div class='add'>+  pvrusb2-i2c-cmd-v4l2.[ch] - This module implements generic V4L2</div><div class='add'>+    compatible commands to the I2C modules.  It is here where state</div><div class='add'>+    changes inside the pvrusb2 driver are translated into V4L2</div><div class='add'>+    commands that are in turn send to the various I2C modules.</div><div class='add'>+</div><div class='add'>+  pvrusb2-i2c-core.[ch] - This module provides an implementation of a</div><div class='add'>+    kernel-friendly I2C adaptor driver, through which other external</div><div class='add'>+    I2C client drivers (e.g. msp3400, tuner, lirc) may connect and</div><div class='add'>+    operate corresponding chips within the the pvrusb2 device.  It is</div><div class='add'>+    through here that other V4L modules can reach into this driver to</div><div class='add'>+    operate specific pieces (and those modules are in turn driven by</div><div class='add'>+    glue logic which is coordinated by pvrusb2-hdw, doled out by</div><div class='add'>+    pvrusb2-context, and then ultimately made available to users</div><div class='add'>+    through one of the high level interfaces).</div><div class='add'>+</div><div class='add'>+  pvrusb2-io.[ch] - This module implements a very low level ring of</div><div class='add'>+    transfer buffers, required in order to stream data from the</div><div class='add'>+    device.  This module is *very* low level.  It only operates the</div><div class='add'>+    buffers and makes no attempt to define any policy or mechanism for</div><div class='add'>+    how such buffers might be used.</div><div class='add'>+</div><div class='add'>+  pvrusb2-ioread.[ch] - This module layers on top of pvrusb2-io.[ch]</div><div class='add'>+    to provide a streaming API usable by a read() system call style of</div><div class='add'>+    I/O.  Right now this is the only layer on top of pvrusb2-io.[ch],</div><div class='add'>+    however the underlying architecture here was intended to allow for</div><div class='add'>+    other styles of I/O to be implemented with additonal modules, like</div><div class='add'>+    mmap()'ed buffers or something even more exotic.</div><div class='add'>+</div><div class='add'>+  pvrusb2-main.c - This is the top level of the driver.  Module level</div><div class='add'>+    and USB core entry points are here.  This is our "main".</div><div class='add'>+</div><div class='add'>+  pvrusb2-sysfs.[ch] - This is the high level interface which ties the</div><div class='add'>+    pvrusb2 driver into sysfs.  Through this interface you can do</div><div class='add'>+    everything with the driver except actually stream data.</div><div class='add'>+</div><div class='add'>+  pvrusb2-tuner.[ch] - This is glue logic that resides between this</div><div class='add'>+    driver and the tuner.ko I2C client driver (which is found</div><div class='add'>+    elsewhere in V4L).</div><div class='add'>+</div><div class='add'>+  pvrusb2-util.h - This header defines some common macros used</div><div class='add'>+    throughout the driver.  These macros are not really specific to</div><div class='add'>+    the driver, but they had to go somewhere.</div><div class='add'>+</div><div class='add'>+  pvrusb2-v4l2.[ch] - This is the high level interface which ties the</div><div class='add'>+    pvrusb2 driver into video4linux.  It is through here that V4L</div><div class='add'>+    applications can open and operate the driver in the usual V4L</div><div class='add'>+    ways.  Note that **ALL** V4L functionality is published only</div><div class='add'>+    through here and nowhere else.</div><div class='add'>+</div><div class='add'>+  pvrusb2-video-*.[ch] - This is glue logic that resides between this</div><div class='add'>+    driver and the saa711x.ko I2C client driver (which is found</div><div class='add'>+    elsewhere in V4L).  Note that saa711x.ko used to be known as</div><div class='add'>+    saa7115.ko in ivtv.  There are two versions of this; one is</div><div class='add'>+    selected depending on the particular saa711[5x].ko that is found.</div><div class='add'>+</div><div class='add'>+  pvrusb2.h - This header contains compile time tunable parameters</div><div class='add'>+    (and at the moment the driver has very little that needs to be</div><div class='add'>+    tuned).</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+  -Mike Isely</div><div class='add'>+  isely@pobox.com</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran<br/>index be9f21b84555..040a2c841ae9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/Zoran?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/Zoran</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/Zoran?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/Zoran</a></div><div class='hunk'>@@ -33,6 +33,21 @@ Inputs/outputs: Composite and S-video</div><div class='ctx'> Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps)</div><div class='ctx'> Card number: 7</div><div class='ctx'> </div><div class='add'>+AverMedia 6 Eyes AVS6EYES:</div><div class='add'>+* Zoran zr36067 PCI controller</div><div class='add'>+* Zoran zr36060 MJPEG codec</div><div class='add'>+* Samsung ks0127 TV decoder</div><div class='add'>+* Conexant bt866  TV encoder</div><div class='add'>+Drivers to use: videodev, i2c-core, i2c-algo-bit,</div><div class='add'>+		videocodec, ks0127, bt866, zr36060, zr36067</div><div class='add'>+Inputs/outputs: Six physical inputs. 1-6 are composite,</div><div class='add'>+		1-2, 3-4, 5-6 doubles as S-video,</div><div class='add'>+		1-3 triples as component.</div><div class='add'>+		One composite output.</div><div class='add'>+Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps)</div><div class='add'>+Card number: 8</div><div class='add'>+Not autodetected, card=8 is necessary.</div><div class='add'>+</div><div class='ctx'> Linux Media Labs LML33:</div><div class='ctx'> * Zoran zr36067 PCI controller</div><div class='ctx'> * Zoran zr36060 MJPEG codec</div><div class='hunk'>@@ -192,6 +207,10 @@ Micronas vpx3220a TV decoder</div><div class='ctx'> was introduced in 1996, is used in the DC30 and DC30+ and</div><div class='ctx'> can handle: PAL B/G/H/I, PAL N, PAL M, NTSC M, NTSC 44, PAL 60, SECAM,NTSC Comb</div><div class='ctx'> </div><div class='add'>+Samsung ks0127 TV decoder</div><div class='add'>+is used in the AVS6EYES card and</div><div class='add'>+can handle: NTSC-M/N/44, PAL-M/N/B/G/H/I/D/K/L and SECAM</div><div class='add'>+</div><div class='ctx'> ===========================</div><div class='ctx'> </div><div class='ctx'> 1.2 What the TV encoder can do an what not</div><div class='hunk'>@@ -221,6 +240,10 @@ ITT mse3000 TV encoder</div><div class='ctx'> was introduced in 1991, is used in the DC10 old</div><div class='ctx'> can generate: PAL , NTSC , SECAM</div><div class='ctx'> </div><div class='add'>+Conexant bt866 TV encoder</div><div class='add'>+is used in AVS6EYES, and</div><div class='add'>+can generate: NTSC/PAL, PAL­M, PAL­N</div><div class='add'>+</div><div class='ctx'> The adv717x, should be able to produce PAL N. But you find nothing PAL N</div><div class='ctx'> specific in the registers. Seem that you have to reuse a other standard</div><div class='ctx'> to generate PAL N, maybe it would work if you use the PAL M settings.</div><div class='head'>diff --git a/Documentation/video4linux/bttv/CONTRIBUTORS b/Documentation/video4linux/bttv/CONTRIBUTORS<br/>index aef49db8847d..8aad6dd93d6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/bttv/CONTRIBUTORS?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/bttv/CONTRIBUTORS</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/bttv/CONTRIBUTORS?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/bttv/CONTRIBUTORS</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-Contributors to bttv: </div><div class='add'>+Contributors to bttv:</div><div class='ctx'> </div><div class='ctx'> Michael Chu &lt;mmchu@pobox.com&gt;</div><div class='ctx'>   AverMedia fix and more flexible card recognition</div><div class='hunk'>@@ -8,8 +8,8 @@ Alan Cox &lt;alan@redhat.com&gt;</div><div class='ctx'> </div><div class='ctx'> Chris Kleitsch</div><div class='ctx'>   Hardware I2C</div><div class='del'>-  </div><div class='del'>-Gerd Knorr &lt;kraxel@cs.tu-berlin.de&gt; </div><div class='add'>+</div><div class='add'>+Gerd Knorr &lt;kraxel@cs.tu-berlin.de&gt;</div><div class='ctx'>   Radio card (ITT sound processor)</div><div class='ctx'> </div><div class='ctx'> bigfoot &lt;bigfoot@net-way.net&gt;</div><div class='hunk'>@@ -18,7 +18,7 @@ Ragnar Hojland Espinosa &lt;ragnar@macula.net&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> + many more (please mail me if you are missing in this list and would</div><div class='del'>-             like to be mentioned)</div><div class='add'>+	     like to be mentioned)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-calling.txt b/Documentation/video4linux/cx2341x/fw-calling.txt<br/>new file mode 100644<br/>index 000000000000..8d21181de537<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-calling.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-calling.txt</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+This page describes how to make calls to the firmware api.</div><div class='add'>+</div><div class='add'>+How to call</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+The preferred calling convention is known as the firmware mailbox. The</div><div class='add'>+mailboxes are basically a fixed length array that serves as the call-stack.</div><div class='add'>+</div><div class='add'>+Firmware mailboxes can be located by searching the encoder and decoder memory</div><div class='add'>+for a 16 byte signature. That signature will be located on a 256-byte boundary.</div><div class='add'>+</div><div class='add'>+Signature:</div><div class='add'>+0x78, 0x56, 0x34, 0x12, 0x12, 0x78, 0x56, 0x34,</div><div class='add'>+0x34, 0x12, 0x78, 0x56, 0x56, 0x34, 0x12, 0x78</div><div class='add'>+</div><div class='add'>+The firmware implements 20 mailboxes of 20 32-bit words. The first 10 are</div><div class='add'>+reserved for API calls. The second 10 are used by the firmware for event</div><div class='add'>+notification.</div><div class='add'>+</div><div class='add'>+  Index  Name</div><div class='add'>+  -----  ----</div><div class='add'>+  0      Flags</div><div class='add'>+  1      Command</div><div class='add'>+  2      Return value</div><div class='add'>+  3      Timeout</div><div class='add'>+  4-19   Parameter/Result</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The flags are defined in the following table. The direction is from the</div><div class='add'>+perspective of the firmware.</div><div class='add'>+</div><div class='add'>+  Bit  Direction  Purpose</div><div class='add'>+  ---  ---------  -------</div><div class='add'>+  2    O          Firmware has processed the command.</div><div class='add'>+  1    I          Driver has finished setting the parameters.</div><div class='add'>+  0    I          Driver is using this mailbox.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The command is a 32-bit enumerator. The API specifics may be found in the</div><div class='add'>+fw-*-api.txt documents.</div><div class='add'>+</div><div class='add'>+The return value is a 32-bit enumerator. Only two values are currently defined:</div><div class='add'>+0=success and -1=command undefined.</div><div class='add'>+</div><div class='add'>+There are 16 parameters/results 32-bit fields. The driver populates these fields</div><div class='add'>+with values for all the parameters required by the call. The driver overwrites</div><div class='add'>+these fields with result values returned by the call. The API specifics may be</div><div class='add'>+found in the fw-*-api.txt documents.</div><div class='add'>+</div><div class='add'>+The timeout value protects the card from a hung driver thread. If the driver</div><div class='add'>+doesn't handle the completed call within the timeout specified, the firmware</div><div class='add'>+will reset that mailbox.</div><div class='add'>+</div><div class='add'>+To make an API call, the driver iterates over each mailbox looking for the</div><div class='add'>+first one available (bit 0 has been cleared). The driver sets that bit, fills</div><div class='add'>+in the command enumerator, the timeout value and any required parameters. The</div><div class='add'>+driver then sets the parameter ready bit (bit 1). The firmware scans the</div><div class='add'>+mailboxes for pending commands, processes them, sets the result code, populates</div><div class='add'>+the result value array with that call's return values and sets the call</div><div class='add'>+complete bit (bit 2). Once bit 2 is set, the driver should retrieve the results</div><div class='add'>+and clear all the flags. If the driver does not perform this task within the</div><div class='add'>+time set in the timeout register, the firmware will reset that mailbox.</div><div class='add'>+</div><div class='add'>+Event notifications are sent from the firmware to the host. The host tells the</div><div class='add'>+firmware which events it is interested in via an API call. That call tells the</div><div class='add'>+firmware which notification mailbox to use. The firmware signals the host via</div><div class='add'>+an interrupt. Only the 16 Results fields are used, the Flags, Command, Return</div><div class='add'>+value and Timeout words are not used.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt<br/>new file mode 100644<br/>index 000000000000..9df4fb3ea0f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-decoder-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-decoder-api.txt</a></div><div class='hunk'>@@ -0,0 +1,319 @@</div><div class='add'>+Decoder firmware API description</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+Note: this API is part of the decoder firmware, so it's cx23415 only.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_PING_FW</div><div class='add'>+Enum 	0/0x00</div><div class='add'>+Description</div><div class='add'>+	This API call does nothing. It may be used to check if the firmware</div><div class='add'>+	is responding.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_START_PLAYBACK</div><div class='add'>+Enum 	1/0x01</div><div class='add'>+Description</div><div class='add'>+	Begin or resume playback.</div><div class='add'>+Param[0]</div><div class='add'>+	0 based frame number in GOP to begin playback from.</div><div class='add'>+Param[1]</div><div class='add'>+	Specifies the number of muted audio frames to play before normal</div><div class='add'>+	audio resumes.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_STOP_PLAYBACK</div><div class='add'>+Enum 	2/0x02</div><div class='add'>+Description</div><div class='add'>+	Ends playback and clears all decoder buffers. If PTS is not zero,</div><div class='add'>+	playback stops at specified PTS.</div><div class='add'>+Param[0]</div><div class='add'>+	Display 0=last frame, 1=black</div><div class='add'>+Param[1]</div><div class='add'>+	PTS low</div><div class='add'>+Param[2]</div><div class='add'>+	PTS high</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_PLAYBACK_SPEED</div><div class='add'>+Enum 	3/0x03</div><div class='add'>+Description</div><div class='add'>+	Playback stream at speed other than normal. There are two modes of</div><div class='add'>+	operation:</div><div class='add'>+	    Smooth: host transfers entire stream and firmware drops unused</div><div class='add'>+		    frames.</div><div class='add'>+	    Coarse: host drops frames based on indexing as required to achieve</div><div class='add'>+		    desired speed.</div><div class='add'>+Param[0]</div><div class='add'>+	Bitmap:</div><div class='add'>+	    0:7  0 normal</div><div class='add'>+		 1 fast only "1.5 times"</div><div class='add'>+		 n nX fast, 1/nX slow</div><div class='add'>+	    30   Framedrop:</div><div class='add'>+		     '0' during 1.5 times play, every other B frame is dropped</div><div class='add'>+		     '1' during 1.5 times play, stream is unchanged (bitrate</div><div class='add'>+			 must not exceed 8mbps)</div><div class='add'>+	    31   Speed:</div><div class='add'>+		     '0' slow</div><div class='add'>+		     '1' fast</div><div class='add'>+Param[1]</div><div class='add'>+	Direction: 0=forward, 1=reverse</div><div class='add'>+Param[2]</div><div class='add'>+	Picture mask:</div><div class='add'>+	    1=I frames</div><div class='add'>+	    3=I, P frames</div><div class='add'>+	    7=I, P, B frames</div><div class='add'>+Param[3]</div><div class='add'>+	B frames per GOP (for reverse play only)</div><div class='add'>+Param[4]</div><div class='add'>+	Mute audio: 0=disable, 1=enable</div><div class='add'>+Param[5]</div><div class='add'>+	Display 0=frame, 1=field</div><div class='add'>+Param[6]</div><div class='add'>+	Specifies the number of muted audio frames to play before normal audio</div><div class='add'>+	resumes.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_STEP_VIDEO</div><div class='add'>+Enum 	5/0x05</div><div class='add'>+Description</div><div class='add'>+	Each call to this API steps the playback to the next unit defined below</div><div class='add'>+	in the current playback direction.</div><div class='add'>+Param[0]</div><div class='add'>+	0=frame, 1=top field, 2=bottom field</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_DMA_BLOCK_SIZE</div><div class='add'>+Enum 	8/0x08</div><div class='add'>+Description</div><div class='add'>+	Set DMA transfer block size. Counterpart to API 0xC9</div><div class='add'>+Param[0]</div><div class='add'>+	DMA transfer block size in bytes. A different size may be specified</div><div class='add'>+	when issuing the DMA transfer command.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_GET_XFER_INFO</div><div class='add'>+Enum 	9/0x09</div><div class='add'>+Description</div><div class='add'>+	This API call may be used to detect an end of stream condtion.</div><div class='add'>+Result[0]</div><div class='add'>+	Stream type</div><div class='add'>+Result[1]</div><div class='add'>+	Address offset</div><div class='add'>+Result[2]</div><div class='add'>+	Maximum bytes to transfer</div><div class='add'>+Result[3]</div><div class='add'>+	Buffer fullness</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_GET_DMA_STATUS</div><div class='add'>+Enum 	10/0x0A</div><div class='add'>+Description</div><div class='add'>+	Status of the last DMA transfer</div><div class='add'>+Result[0]</div><div class='add'>+	Bit 1 set means transfer complete</div><div class='add'>+	Bit 2 set means DMA error</div><div class='add'>+	Bit 3 set means linked list error</div><div class='add'>+Result[1]</div><div class='add'>+	DMA type: 0=MPEG, 1=OSD, 2=YUV</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SCHED_DMA_FROM_HOST</div><div class='add'>+Enum 	11/0x0B</div><div class='add'>+Description</div><div class='add'>+	Setup DMA from host operation. Counterpart to API 0xCC</div><div class='add'>+Param[0]</div><div class='add'>+	Memory address of link list</div><div class='add'>+Param[1]</div><div class='add'>+	Total # of bytes to transfer</div><div class='add'>+Param[2]</div><div class='add'>+	DMA type (0=MPEG, 1=OSD, 2=YUV)</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_PAUSE_PLAYBACK</div><div class='add'>+Enum 	13/0x0D</div><div class='add'>+Description</div><div class='add'>+	Freeze playback immediately. In this mode, when internal buffers are</div><div class='add'>+	full, no more data will be accepted and data request IRQs will be</div><div class='add'>+	masked.</div><div class='add'>+Param[0]</div><div class='add'>+	Display: 0=last frame, 1=black</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_HALT_FW</div><div class='add'>+Enum 	14/0x0E</div><div class='add'>+Description</div><div class='add'>+	The firmware is halted and no further API calls are serviced until</div><div class='add'>+	the firmware is uploaded again.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_STANDARD</div><div class='add'>+Enum 	16/0x10</div><div class='add'>+Description</div><div class='add'>+	Selects display standard</div><div class='add'>+Param[0]</div><div class='add'>+	0=NTSC, 1=PAL</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_GET_VERSION</div><div class='add'>+Enum 	17/0x11</div><div class='add'>+Description</div><div class='add'>+	Returns decoder firmware version information</div><div class='add'>+Result[0]</div><div class='add'>+	Version bitmask:</div><div class='add'>+	    Bits  0:15 build</div><div class='add'>+	    Bits 16:23 minor</div><div class='add'>+	    Bits 24:31 major</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_STREAM_INPUT</div><div class='add'>+Enum 	20/0x14</div><div class='add'>+Description</div><div class='add'>+	Select decoder stream input port</div><div class='add'>+Param[0]</div><div class='add'>+	0=memory (default), 1=streaming</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_GET_TIMING_INFO</div><div class='add'>+Enum 	21/0x15</div><div class='add'>+Description</div><div class='add'>+	Returns timing information from start of playback</div><div class='add'>+Result[0]</div><div class='add'>+	Frame count by decode order</div><div class='add'>+Result[1]</div><div class='add'>+	Video PTS bits 0:31 by display order</div><div class='add'>+Result[2]</div><div class='add'>+	Video PTS bit 32 by display order</div><div class='add'>+Result[3]</div><div class='add'>+	SCR bits 0:31 by display order</div><div class='add'>+Result[4]</div><div class='add'>+	SCR bit 32 by display order</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_AUDIO_MODE</div><div class='add'>+Enum 	22/0x16</div><div class='add'>+Description</div><div class='add'>+	Select audio mode</div><div class='add'>+Param[0]</div><div class='add'>+	Dual mono mode action</div><div class='add'>+Param[1]</div><div class='add'>+	Stereo mode action:</div><div class='add'>+	    0=Stereo, 1=Left, 2=Right, 3=Mono, 4=Swap, -1=Unchanged</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_EVENT_NOTIFICATION</div><div class='add'>+Enum 	23/0x17</div><div class='add'>+Description</div><div class='add'>+	Setup firmware to notify the host about a particular event.</div><div class='add'>+	Counterpart to API 0xD5</div><div class='add'>+Param[0]</div><div class='add'>+	Event: 0=Audio mode change between stereo and dual channel</div><div class='add'>+Param[1]</div><div class='add'>+	Notification 0=disabled, 1=enabled</div><div class='add'>+Param[2]</div><div class='add'>+	Interrupt bit</div><div class='add'>+Param[3]</div><div class='add'>+	Mailbox slot, -1 if no mailbox required.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_DISPLAY_BUFFERS</div><div class='add'>+Enum 	24/0x18</div><div class='add'>+Description</div><div class='add'>+	Number of display buffers. To decode all frames in reverse playback you</div><div class='add'>+	must use nine buffers.</div><div class='add'>+Param[0]</div><div class='add'>+	0=six buffers, 1=nine buffers</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_EXTRACT_VBI</div><div class='add'>+Enum 	25/0x19</div><div class='add'>+Description</div><div class='add'>+	Extracts VBI data</div><div class='add'>+Param[0]</div><div class='add'>+	0=extract from extension &amp; user data, 1=extract from private packets</div><div class='add'>+Result[0]</div><div class='add'>+	VBI table location</div><div class='add'>+Result[1]</div><div class='add'>+	VBI table size</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_DECODER_SOURCE</div><div class='add'>+Enum 	26/0x1A</div><div class='add'>+Description</div><div class='add'>+	Selects decoder source. Ensure that the parameters passed to this</div><div class='add'>+	API match the encoder settings.</div><div class='add'>+Param[0]</div><div class='add'>+	Mode: 0=MPEG from host, 1=YUV from encoder, 2=YUV from host</div><div class='add'>+Param[1]</div><div class='add'>+	YUV picture width</div><div class='add'>+Param[2]</div><div class='add'>+	YUV picture height</div><div class='add'>+Param[3]</div><div class='add'>+	Bitmap: see Param[0] of API 0xBD</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_AUDIO_OUTPUT</div><div class='add'>+Enum 	27/0x1B</div><div class='add'>+Description</div><div class='add'>+	Select audio output format</div><div class='add'>+Param[0]</div><div class='add'>+	Bitmask:</div><div class='add'>+	     0:1  Data size:</div><div class='add'>+		      '00' 16 bit</div><div class='add'>+		      '01' 20 bit</div><div class='add'>+		      '10' 24 bit</div><div class='add'>+	     2:7  Unused</div><div class='add'>+	     8:9  Mode:</div><div class='add'>+		      '00' 2 channels</div><div class='add'>+		      '01' 4 channels</div><div class='add'>+		      '10' 6 channels</div><div class='add'>+		      '11' 6 channels with one line data mode</div><div class='add'>+			   (for left justified MSB first mode, 20 bit only)</div><div class='add'>+	    10:11 Unused</div><div class='add'>+	    12:13 Channel format:</div><div class='add'>+		      '00' right justified MSB first mode</div><div class='add'>+		      '01' left justified MSB first mode</div><div class='add'>+		      '10' I2S mode</div><div class='add'>+	    14:15 Unused</div><div class='add'>+	    16:21 Right justify bit count</div><div class='add'>+	    22:31 Unused</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_AV_DELAY</div><div class='add'>+Enum 	28/0x1C</div><div class='add'>+Description</div><div class='add'>+	Set audio/video delay in 90Khz ticks</div><div class='add'>+Param[0]</div><div class='add'>+	0=A/V in sync, negative=audio lags, positive=video lags</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_DEC_SET_PREBUFFERING</div><div class='add'>+Enum 	30/0x1E</div><div class='add'>+Description</div><div class='add'>+	Decoder prebuffering, when enabled up to 128KB are buffered for</div><div class='add'>+	streams &lt;8mpbs or 640KB for streams &gt;8mbps</div><div class='add'>+Param[0]</div><div class='add'>+	0=off, 1=on</div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-dma.txt b/Documentation/video4linux/cx2341x/fw-dma.txt<br/>new file mode 100644<br/>index 000000000000..8123e262d5b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-dma.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-dma.txt</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+This page describes the structures and procedures used by the cx2341x DMA</div><div class='add'>+engine.</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+============</div><div class='add'>+</div><div class='add'>+The cx2341x PCI interface is busmaster capable. This means it has a DMA</div><div class='add'>+engine to efficiently transfer large volumes of data between the card and main</div><div class='add'>+memory without requiring help from a CPU. Like most hardware, it must operate</div><div class='add'>+on contiguous physical memory. This is difficult to come by in large quantities</div><div class='add'>+on virtual memory machines.</div><div class='add'>+</div><div class='add'>+Therefore, it also supports a technique called "scatter-gather". The card can</div><div class='add'>+transfer multiple buffers in one operation. Instead of allocating one large</div><div class='add'>+contiguous buffer, the driver can allocate several smaller buffers.</div><div class='add'>+</div><div class='add'>+In practice, I've seen the average transfer to be roughly 80K, but transfers</div><div class='add'>+above 128K were not uncommon, particularly at startup. The 128K figure is</div><div class='add'>+important, because that is the largest block that the kernel can normally</div><div class='add'>+allocate. Even still, 128K blocks are hard to come by, so the driver writer is</div><div class='add'>+urged to choose a smaller block size and learn the scatter-gather technique.</div><div class='add'>+</div><div class='add'>+Mailbox #10 is reserved for DMA transfer information.</div><div class='add'>+</div><div class='add'>+Flow</div><div class='add'>+====</div><div class='add'>+</div><div class='add'>+This section describes, in general, the order of events when handling DMA</div><div class='add'>+transfers. Detailed information follows this section.</div><div class='add'>+</div><div class='add'>+- The card raises the Encoder interrupt.</div><div class='add'>+- The driver reads the transfer type, offset and size from Mailbox #10.</div><div class='add'>+- The driver constructs the scatter-gather array from enough free dma buffers</div><div class='add'>+  to cover the size.</div><div class='add'>+- The driver schedules the DMA transfer via the ScheduleDMAtoHost API call.</div><div class='add'>+- The card raises the DMA Complete interrupt.</div><div class='add'>+- The driver checks the DMA status register for any errors.</div><div class='add'>+- The driver post-processes the newly transferred buffers.</div><div class='add'>+</div><div class='add'>+NOTE! It is possible that the Encoder and DMA Complete interrupts get raised</div><div class='add'>+simultaneously. (End of the last, start of the next, etc.)</div><div class='add'>+</div><div class='add'>+Mailbox #10</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+The Flags, Command, Return Value and Timeout fields are ignored.</div><div class='add'>+</div><div class='add'>+Name:       Mailbox #10</div><div class='add'>+Results[0]: Type: 0: MPEG.</div><div class='add'>+Results[1]: Offset: The position relative to the card's memory space.</div><div class='add'>+Results[2]: Size: The exact number of bytes to transfer.</div><div class='add'>+</div><div class='add'>+My speculation is that since the StartCapture API has a capture type of "RAW"</div><div class='add'>+available, that the type field will have other values that correspond to YUV</div><div class='add'>+and PCM data.</div><div class='add'>+</div><div class='add'>+Scatter-Gather Array</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+The scatter-gather array is a contiguously allocated block of memory that</div><div class='add'>+tells the card the source and destination of each data-block to transfer.</div><div class='add'>+Card "addresses" are derived from the offset supplied by Mailbox #10. Host</div><div class='add'>+addresses are the physical memory location of the target DMA buffer.</div><div class='add'>+</div><div class='add'>+Each S-G array element is a struct of three 32-bit words. The first word is</div><div class='add'>+the source address, the second is the destination address. Both take up the</div><div class='add'>+entire 32 bits. The lowest 16 bits of the third word is the transfer byte</div><div class='add'>+count. The high-bit of the third word is the "last" flag. The last-flag tells</div><div class='add'>+the card to raise the DMA_DONE interrupt. From hard personal experience, if</div><div class='add'>+you forget to set this bit, the card will still "work" but the stream will</div><div class='add'>+most likely get corrupted.</div><div class='add'>+</div><div class='add'>+The transfer count must be a multiple of 256. Therefore, the driver will need</div><div class='add'>+to track how much data in the target buffer is valid and deal with it</div><div class='add'>+accordingly.</div><div class='add'>+</div><div class='add'>+Array Element:</div><div class='add'>+</div><div class='add'>+- 32-bit Source Address</div><div class='add'>+- 32-bit Destination Address</div><div class='add'>+- 16-bit reserved (high bit is the last flag)</div><div class='add'>+- 16-bit byte count</div><div class='add'>+</div><div class='add'>+DMA Transfer Status</div><div class='add'>+===================</div><div class='add'>+</div><div class='add'>+Register 0x0004 holds the DMA Transfer Status:</div><div class='add'>+</div><div class='add'>+Bit</div><div class='add'>+4   Scatter-Gather array error</div><div class='add'>+3   DMA write error</div><div class='add'>+2   DMA read error</div><div class='add'>+1   write completed</div><div class='add'>+0   read completed</div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt<br/>new file mode 100644<br/>index 000000000000..001c68644b08<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-encoder-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-encoder-api.txt</a></div><div class='hunk'>@@ -0,0 +1,694 @@</div><div class='add'>+Encoder firmware API description</div><div class='add'>+================================</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_PING_FW</div><div class='add'>+Enum 	128/0x80</div><div class='add'>+Description</div><div class='add'>+	Does nothing. Can be used to check if the firmware is responding.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_START_CAPTURE</div><div class='add'>+Enum 	129/0x81</div><div class='add'>+Description</div><div class='add'>+	Commences the capture of video, audio and/or VBI data. All encoding</div><div class='add'>+	parameters must be initialized prior to this API call. Captures frames</div><div class='add'>+	continuously or until a predefined number of frames have been captured.</div><div class='add'>+Param[0]</div><div class='add'>+	Capture stream type:</div><div class='add'>+	    0=MPEG</div><div class='add'>+	    1=Raw</div><div class='add'>+	    2=Raw passthrough</div><div class='add'>+	    3=VBI</div><div class='add'>+</div><div class='add'>+Param[1]</div><div class='add'>+	Bitmask:</div><div class='add'>+	    Bit 0 when set, captures YUV</div><div class='add'>+	    Bit 1 when set, captures PCM audio</div><div class='add'>+	    Bit 2 when set, captures VBI (same as param[0]=3)</div><div class='add'>+	    Bit 3 when set, the capture destination is the decoder</div><div class='add'>+		(same as param[0]=2)</div><div class='add'>+	    Bit 4 when set, the capture destination is the host</div><div class='add'>+	Note: this parameter is only meaningful for RAW capture type.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_STOP_CAPTURE</div><div class='add'>+Enum 	130/0x82</div><div class='add'>+Description</div><div class='add'>+	Ends a capture in progress</div><div class='add'>+Param[0]</div><div class='add'>+	0=stop at end of GOP (generates IRQ)</div><div class='add'>+	1=stop immediate (no IRQ)</div><div class='add'>+Param[1]</div><div class='add'>+	Stream type to stop, see param[0] of API 0x81</div><div class='add'>+Param[2]</div><div class='add'>+	Subtype, see param[1] of API 0x81</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_AUDIO_ID</div><div class='add'>+Enum 	137/0x89</div><div class='add'>+Description</div><div class='add'>+	Assigns the transport stream ID of the encoded audio stream</div><div class='add'>+Param[0]</div><div class='add'>+	Audio Stream ID</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_VIDEO_ID</div><div class='add'>+Enum 	139/0x8B</div><div class='add'>+Description</div><div class='add'>+	Set video transport stream ID</div><div class='add'>+Param[0]</div><div class='add'>+	Video stream ID</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_PCR_ID</div><div class='add'>+Enum 	141/0x8D</div><div class='add'>+Description</div><div class='add'>+	Assigns the transport stream ID for PCR packets</div><div class='add'>+Param[0]</div><div class='add'>+	PCR Stream ID</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_FRAME_RATE</div><div class='add'>+Enum 	143/0x8F</div><div class='add'>+Description</div><div class='add'>+	Set video frames per second. Change occurs at start of new GOP.</div><div class='add'>+Param[0]</div><div class='add'>+	0=30fps</div><div class='add'>+	1=25fps</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_FRAME_SIZE</div><div class='add'>+Enum 	145/0x91</div><div class='add'>+Description</div><div class='add'>+	Select video stream encoding resolution.</div><div class='add'>+Param[0]</div><div class='add'>+	Height in lines. Default 480</div><div class='add'>+Param[1]</div><div class='add'>+	Width in pixels. Default 720</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_BIT_RATE</div><div class='add'>+Enum 	149/0x95</div><div class='add'>+Description</div><div class='add'>+	Assign average video stream bitrate. Note on the last three params:</div><div class='add'>+	Param[3] and [4] seem to be always 0, param [5] doesn't seem to be used.</div><div class='add'>+Param[0]</div><div class='add'>+	0=variable bitrate, 1=constant bitrate</div><div class='add'>+Param[1]</div><div class='add'>+	bitrate in bits per second</div><div class='add'>+Param[2]</div><div class='add'>+	peak bitrate in bits per second, divided by 400</div><div class='add'>+Param[3]</div><div class='add'>+	Mux bitrate in bits per second, divided by 400. May be 0 (default).</div><div class='add'>+Param[4]</div><div class='add'>+	Rate Control VBR Padding</div><div class='add'>+Param[5]</div><div class='add'>+	VBV Buffer used by encoder</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_GOP_PROPERTIES</div><div class='add'>+Enum 	151/0x97</div><div class='add'>+Description</div><div class='add'>+	Setup the GOP structure</div><div class='add'>+Param[0]</div><div class='add'>+	GOP size (maximum is 34)</div><div class='add'>+Param[1]</div><div class='add'>+	Number of B frames between the I and P frame, plus 1.</div><div class='add'>+	For example: IBBPBBPBBPBB --&gt; GOP size: 12, number of B frames: 2+1 = 3</div><div class='add'>+	Note that GOP size must be a multiple of (B-frames + 1).</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_ASPECT_RATIO</div><div class='add'>+Enum 	153/0x99</div><div class='add'>+Description</div><div class='add'>+	Sets the encoding aspect ratio. Changes in the aspect ratio take effect</div><div class='add'>+	at the start of the next GOP.</div><div class='add'>+Param[0]</div><div class='add'>+	'0000' forbidden</div><div class='add'>+	'0001' 1:1 square</div><div class='add'>+	'0010' 4:3</div><div class='add'>+	'0011' 16:9</div><div class='add'>+	'0100' 2.21:1</div><div class='add'>+	'0101' reserved</div><div class='add'>+	 ....</div><div class='add'>+	'1111' reserved</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_DNR_FILTER_MODE</div><div class='add'>+Enum 	155/0x9B</div><div class='add'>+Description</div><div class='add'>+	Assign Dynamic Noise Reduction operating mode</div><div class='add'>+Param[0]</div><div class='add'>+	Bit0: Spatial filter, set=auto, clear=manual</div><div class='add'>+	Bit1: Temporal filter, set=auto, clear=manual</div><div class='add'>+Param[1]</div><div class='add'>+	Median filter:</div><div class='add'>+	    0=Disabled</div><div class='add'>+	    1=Horizontal</div><div class='add'>+	    2=Vertical</div><div class='add'>+	    3=Horiz/Vert</div><div class='add'>+	    4=Diagonal</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_DNR_FILTER_PROPS</div><div class='add'>+Enum 	157/0x9D</div><div class='add'>+Description</div><div class='add'>+	These Dynamic Noise Reduction filter values are only meaningful when</div><div class='add'>+	the respective filter is set to "manual" (See API 0x9B)</div><div class='add'>+Param[0]</div><div class='add'>+	Spatial filter: default 0, range 0:15</div><div class='add'>+Param[1]</div><div class='add'>+	Temporal filter: default 0, range 0:31</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_CORING_LEVELS</div><div class='add'>+Enum 	159/0x9F</div><div class='add'>+Description</div><div class='add'>+	Assign Dynamic Noise Reduction median filter properties.</div><div class='add'>+Param[0]</div><div class='add'>+	Threshold above which the luminance median filter is enabled.</div><div class='add'>+	Default: 0, range 0:255</div><div class='add'>+Param[1]</div><div class='add'>+	Threshold below which the luminance median filter is enabled.</div><div class='add'>+	Default: 255, range 0:255</div><div class='add'>+Param[2]</div><div class='add'>+	Threshold above which the chrominance median filter is enabled.</div><div class='add'>+	Default: 0, range 0:255</div><div class='add'>+Param[3]</div><div class='add'>+	Threshold below which the chrominance median filter is enabled.</div><div class='add'>+	Default: 255, range 0:255</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_SPATIAL_FILTER_TYPE</div><div class='add'>+Enum 	161/0xA1</div><div class='add'>+Description</div><div class='add'>+	Assign spatial prefilter parameters</div><div class='add'>+Param[0]</div><div class='add'>+	Luminance filter</div><div class='add'>+	    0=Off</div><div class='add'>+	    1=1D Horizontal</div><div class='add'>+	    2=1D Vertical</div><div class='add'>+	    3=2D H/V Separable (default)</div><div class='add'>+	    4=2D Symmetric non-separable</div><div class='add'>+Param[1]</div><div class='add'>+	Chrominance filter</div><div class='add'>+	    0=Off</div><div class='add'>+	    1=1D Horizontal (default)</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_3_2_PULLDOWN</div><div class='add'>+Enum 	177/0xB1</div><div class='add'>+Description</div><div class='add'>+	3:2 pulldown properties</div><div class='add'>+Param[0]</div><div class='add'>+	0=enabled</div><div class='add'>+	1=disabled</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_VBI_LINE</div><div class='add'>+Enum 	183/0xB7</div><div class='add'>+Description</div><div class='add'>+	Selects VBI line number.</div><div class='add'>+Param[0]</div><div class='add'>+	Bits 0:4 	line number</div><div class='add'>+	Bit  31		0=top_field, 1=bottom_field</div><div class='add'>+	Bits 0:31 	all set specifies "all lines"</div><div class='add'>+Param[1]</div><div class='add'>+	VBI line information features: 0=disabled, 1=enabled</div><div class='add'>+Param[2]</div><div class='add'>+	Slicing: 0=None, 1=Closed Caption</div><div class='add'>+	Almost certainly not implemented. Set to 0.</div><div class='add'>+Param[3]</div><div class='add'>+	Luminance samples in this line.</div><div class='add'>+	Almost certainly not implemented. Set to 0.</div><div class='add'>+Param[4]</div><div class='add'>+	Chrominance samples in this line</div><div class='add'>+	Almost certainly not implemented. Set to 0.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_STREAM_TYPE</div><div class='add'>+Enum 	185/0xB9</div><div class='add'>+Description</div><div class='add'>+	Assign stream type</div><div class='add'>+	Note: Transport stream is not working in recent firmwares.</div><div class='add'>+	And in older firmwares the timestamps in the TS seem to be</div><div class='add'>+	unreliable.</div><div class='add'>+Param[0]</div><div class='add'>+	 0=Program stream</div><div class='add'>+	 1=Transport stream</div><div class='add'>+	 2=MPEG1 stream</div><div class='add'>+	 3=PES A/V stream</div><div class='add'>+	 5=PES Video stream</div><div class='add'>+	 7=PES Audio stream</div><div class='add'>+	10=DVD stream</div><div class='add'>+	11=VCD stream</div><div class='add'>+	12=SVCD stream</div><div class='add'>+	13=DVD_S1 stream</div><div class='add'>+	14=DVD_S2 stream</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_OUTPUT_PORT</div><div class='add'>+Enum 	187/0xBB</div><div class='add'>+Description</div><div class='add'>+	Assign stream output port. Normally 0 when the data is copied through</div><div class='add'>+	the PCI bus (DMA), and 1 when the data is streamed to another chip</div><div class='add'>+	(pvrusb and cx88-blackbird).</div><div class='add'>+Param[0]</div><div class='add'>+	0=Memory (default)</div><div class='add'>+	1=Streaming</div><div class='add'>+	2=Serial</div><div class='add'>+Param[1]</div><div class='add'>+	Unknown, but leaving this to 0 seems to work best. Indications are that</div><div class='add'>+	this might have to do with USB support, although passing anything but 0</div><div class='add'>+	onl breaks things.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_AUDIO_PROPERTIES</div><div class='add'>+Enum 	189/0xBD</div><div class='add'>+Description</div><div class='add'>+	Set audio stream properties, may be called while encoding is in progress.</div><div class='add'>+	Note: all bitfields are consistent with ISO11172 documentation except</div><div class='add'>+	bits 2:3 which ISO docs define as:</div><div class='add'>+		'11' Layer I</div><div class='add'>+		'10' Layer II</div><div class='add'>+		'01' Layer III</div><div class='add'>+		'00' Undefined</div><div class='add'>+	This discrepancy may indicate a possible error in the documentation.</div><div class='add'>+	Testing indicated that only Layer II is actually working, and that</div><div class='add'>+	the minimum bitrate should be 192 kbps.</div><div class='add'>+Param[0]</div><div class='add'>+	Bitmask:</div><div class='add'>+	   0:1  '00' 44.1Khz</div><div class='add'>+		'01' 48Khz</div><div class='add'>+		'10' 32Khz</div><div class='add'>+		'11' reserved</div><div class='add'>+</div><div class='add'>+	   2:3  '01'=Layer I</div><div class='add'>+		'10'=Layer II</div><div class='add'>+</div><div class='add'>+	   4:7  Bitrate:</div><div class='add'>+		     Index | Layer I     | Layer II</div><div class='add'>+		     ------+-------------+------------</div><div class='add'>+		    '0000' | free format | free format</div><div class='add'>+		    '0001' |  32 kbit/s  |  32 kbit/s</div><div class='add'>+		    '0010' |  64 kbit/s  |  48 kbit/s</div><div class='add'>+		    '0011' |  96 kbit/s  |  56 kbit/s</div><div class='add'>+		    '0100' | 128 kbit/s  |  64 kbit/s</div><div class='add'>+		    '0101' | 160 kbit/s  |  80 kbit/s</div><div class='add'>+		    '0110' | 192 kbit/s  |  96 kbit/s</div><div class='add'>+		    '0111' | 224 kbit/s  | 112 kbit/s</div><div class='add'>+		    '1000' | 256 kbit/s  | 128 kbit/s</div><div class='add'>+		    '1001' | 288 kbit/s  | 160 kbit/s</div><div class='add'>+		    '1010' | 320 kbit/s  | 192 kbit/s</div><div class='add'>+		    '1011' | 352 kbit/s  | 224 kbit/s</div><div class='add'>+		    '1100' | 384 kbit/s  | 256 kbit/s</div><div class='add'>+		    '1101' | 416 kbit/s  | 320 kbit/s</div><div class='add'>+		    '1110' | 448 kbit/s  | 384 kbit/s</div><div class='add'>+		Note: For Layer II, not all combinations of total bitrate</div><div class='add'>+		and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2</div><div class='add'>+</div><div class='add'>+	   8:9  '00'=Stereo</div><div class='add'>+		'01'=JointStereo</div><div class='add'>+		'10'=Dual</div><div class='add'>+		'11'=Mono</div><div class='add'>+		Note: testing seems to indicate that Mono and possibly</div><div class='add'>+		JointStereo are not working (default to stereo).</div><div class='add'>+		Dual does work, though.</div><div class='add'>+</div><div class='add'>+	  10:11 Mode Extension used in joint_stereo mode.</div><div class='add'>+		In Layer I and II they indicate which subbands are in</div><div class='add'>+		intensity_stereo. All other subbands are coded in stereo.</div><div class='add'>+		    '00' subbands 4-31 in intensity_stereo, bound==4</div><div class='add'>+		    '01' subbands 8-31 in intensity_stereo, bound==8</div><div class='add'>+		    '10' subbands 12-31 in intensity_stereo, bound==12</div><div class='add'>+		    '11' subbands 16-31 in intensity_stereo, bound==16</div><div class='add'>+</div><div class='add'>+	  12:13 Emphasis:</div><div class='add'>+		    '00' None</div><div class='add'>+		    '01' 50/15uS</div><div class='add'>+		    '10' reserved</div><div class='add'>+		    '11' CCITT J.17</div><div class='add'>+</div><div class='add'>+	  14 	CRC:</div><div class='add'>+		    '0' off</div><div class='add'>+		    '1' on</div><div class='add'>+</div><div class='add'>+	  15    Copyright:</div><div class='add'>+		    '0' off</div><div class='add'>+		    '1' on</div><div class='add'>+</div><div class='add'>+	  16    Generation:</div><div class='add'>+		    '0' copy</div><div class='add'>+		    '1' original</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_HALT_FW</div><div class='add'>+Enum 	195/0xC3</div><div class='add'>+Description</div><div class='add'>+	The firmware is halted and no further API calls are serviced until the</div><div class='add'>+	firmware is uploaded again.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_GET_VERSION</div><div class='add'>+Enum 	196/0xC4</div><div class='add'>+Description</div><div class='add'>+	Returns the version of the encoder firmware.</div><div class='add'>+Result[0]</div><div class='add'>+	Version bitmask:</div><div class='add'>+	    Bits  0:15 build</div><div class='add'>+	    Bits 16:23 minor</div><div class='add'>+	    Bits 24:31 major</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_GOP_CLOSURE</div><div class='add'>+Enum 	197/0xC5</div><div class='add'>+Description</div><div class='add'>+	Assigns the GOP open/close property.</div><div class='add'>+Param[0]</div><div class='add'>+	0=Open</div><div class='add'>+	1=Closed</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_GET_SEQ_END</div><div class='add'>+Enum 	198/0xC6</div><div class='add'>+Description</div><div class='add'>+	Obtains the sequence end code of the encoder's buffer. When a capture</div><div class='add'>+	is started a number of interrupts are still generated, the last of</div><div class='add'>+	which will have Result[0] set to 1 and Result[1] will contain the size</div><div class='add'>+	of the buffer.</div><div class='add'>+Result[0]</div><div class='add'>+	State of the transfer (1 if last buffer)</div><div class='add'>+Result[1]</div><div class='add'>+	If Result[0] is 1, this contains the size of the last buffer, undefined</div><div class='add'>+	otherwise.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_PGM_INDEX_INFO</div><div class='add'>+Enum 	199/0xC7</div><div class='add'>+Description</div><div class='add'>+	Sets the Program Index Information.</div><div class='add'>+Param[0]</div><div class='add'>+	Picture Mask:</div><div class='add'>+	    0=No index capture</div><div class='add'>+	    1=I frames</div><div class='add'>+	    3=I,P frames</div><div class='add'>+	    7=I,P,B frames</div><div class='add'>+Param[1]</div><div class='add'>+	Elements requested (up to 400)</div><div class='add'>+Result[0]</div><div class='add'>+	Offset in SDF memory of the table.</div><div class='add'>+Result[1]</div><div class='add'>+	Number of allocated elements up to a maximum of Param[1]</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_VBI_CONFIG</div><div class='add'>+Enum 	200/0xC8</div><div class='add'>+Description</div><div class='add'>+	Configure VBI settings</div><div class='add'>+Param[0]</div><div class='add'>+	Bitmap:</div><div class='add'>+	    0    Mode '0' Sliced, '1' Raw</div><div class='add'>+	    1:3  Insertion:</div><div class='add'>+		     '000' insert in extension &amp; user data</div><div class='add'>+		     '001' insert in private packets</div><div class='add'>+		     '010' separate stream and user data</div><div class='add'>+		     '111' separate stream and private data</div><div class='add'>+	    8:15 Stream ID (normally 0xBD)</div><div class='add'>+Param[1]</div><div class='add'>+	Frames per interrupt (max 8). Only valid in raw mode.</div><div class='add'>+Param[2]</div><div class='add'>+	Total raw VBI frames. Only valid in raw mode.</div><div class='add'>+Param[3]</div><div class='add'>+	Start codes</div><div class='add'>+Param[4]</div><div class='add'>+	Stop codes</div><div class='add'>+Param[5]</div><div class='add'>+	Lines per frame</div><div class='add'>+Param[6]</div><div class='add'>+	Byte per line</div><div class='add'>+Result[0]</div><div class='add'>+	Observed frames per interrupt in raw mode only. Rage 1 to Param[1]</div><div class='add'>+Result[1]</div><div class='add'>+	Observed number of frames in raw mode. Range 1 to Param[2]</div><div class='add'>+Result[2]</div><div class='add'>+	Memory offset to start or raw VBI data</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_DMA_BLOCK_SIZE</div><div class='add'>+Enum 	201/0xC9</div><div class='add'>+Description</div><div class='add'>+	Set DMA transfer block size</div><div class='add'>+Param[0]</div><div class='add'>+	DMA transfer block size in bytes or frames. When unit is bytes,</div><div class='add'>+	supported block sizes are 2^7, 2^8 and 2^9 bytes.</div><div class='add'>+Param[1]</div><div class='add'>+	Unit: 0=bytes, 1=frames</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_GET_PREV_DMA_INFO_MB_10</div><div class='add'>+Enum 	202/0xCA</div><div class='add'>+Description</div><div class='add'>+	Returns information on the previous DMA transfer in conjunction with</div><div class='add'>+	bit 27 of the interrupt mask. Uses mailbox 10.</div><div class='add'>+Result[0]</div><div class='add'>+	Type of stream</div><div class='add'>+Result[1]</div><div class='add'>+	Address Offset</div><div class='add'>+Result[2]</div><div class='add'>+	Maximum size of transfer</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_GET_PREV_DMA_INFO_MB_9</div><div class='add'>+Enum 	203/0xCB</div><div class='add'>+Description</div><div class='add'>+	Returns information on the previous DMA transfer in conjunction with</div><div class='add'>+	bit 27 of the interrupt mask. Uses mailbox 9.</div><div class='add'>+Result[0]</div><div class='add'>+	Status bits:</div><div class='add'>+	    Bit 0 set indicates transfer complete</div><div class='add'>+	    Bit 2 set indicates transfer error</div><div class='add'>+	    Bit 4 set indicates linked list error</div><div class='add'>+Result[1]</div><div class='add'>+	DMA type</div><div class='add'>+Result[2]</div><div class='add'>+	Presentation Time Stamp bits 0..31</div><div class='add'>+Result[3]</div><div class='add'>+	Presentation Time Stamp bit 32</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SCHED_DMA_TO_HOST</div><div class='add'>+Enum 	204/0xCC</div><div class='add'>+Description</div><div class='add'>+	Setup DMA to host operation</div><div class='add'>+Param[0]</div><div class='add'>+	Memory address of link list</div><div class='add'>+Param[1]</div><div class='add'>+	Length of link list (wtf: what units ???)</div><div class='add'>+Param[2]</div><div class='add'>+	DMA type (0=MPEG)</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_INITIALIZE_INPUT</div><div class='add'>+Enum 	205/0xCD</div><div class='add'>+Description</div><div class='add'>+	Initializes the video input</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_FRAME_DROP_RATE</div><div class='add'>+Enum 	208/0xD0</div><div class='add'>+Description</div><div class='add'>+	For each frame captured, skip specified number of frames.</div><div class='add'>+Param[0]</div><div class='add'>+	Number of frames to skip</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_PAUSE_ENCODER</div><div class='add'>+Enum 	210/0xD2</div><div class='add'>+Description</div><div class='add'>+	During a pause condition, all frames are dropped instead of being encoded.</div><div class='add'>+Param[0]</div><div class='add'>+	0=Pause encoding</div><div class='add'>+	1=Continue encoding</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_REFRESH_INPUT</div><div class='add'>+Enum 	211/0xD3</div><div class='add'>+Description</div><div class='add'>+	Refreshes the video input</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_COPYRIGHT</div><div class='add'>+Enum 	212/0xD4</div><div class='add'>+Description</div><div class='add'>+	Sets stream copyright property</div><div class='add'>+Param[0]</div><div class='add'>+	0=Stream is not copyrighted</div><div class='add'>+	1=Stream is copyrighted</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_EVENT_NOTIFICATION</div><div class='add'>+Enum 	213/0xD5</div><div class='add'>+Description</div><div class='add'>+	Setup firmware to notify the host about a particular event. Host must</div><div class='add'>+	unmask the interrupt bit.</div><div class='add'>+Param[0]</div><div class='add'>+	Event (0=refresh encoder input)</div><div class='add'>+Param[1]</div><div class='add'>+	Notification 0=disabled 1=enabled</div><div class='add'>+Param[2]</div><div class='add'>+	Interrupt bit</div><div class='add'>+Param[3]</div><div class='add'>+	Mailbox slot, -1 if no mailbox required.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_NUM_VSYNC_LINES</div><div class='add'>+Enum 	214/0xD6</div><div class='add'>+Description</div><div class='add'>+	Depending on the analog video decoder used, this assigns the number</div><div class='add'>+	of lines for field 1 and 2.</div><div class='add'>+Param[0]</div><div class='add'>+	Field 1 number of lines:</div><div class='add'>+	    0x00EF for SAA7114</div><div class='add'>+	    0x00F0 for SAA7115</div><div class='add'>+	    0x0105 for Micronas</div><div class='add'>+Param[1]</div><div class='add'>+	Field 2 number of lines:</div><div class='add'>+	    0x00EF for SAA7114</div><div class='add'>+	    0x00F0 for SAA7115</div><div class='add'>+	    0x0106 for Micronas</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_SET_PLACEHOLDER</div><div class='add'>+Enum 	215/0xD7</div><div class='add'>+Description</div><div class='add'>+	Provides a mechanism of inserting custom user data in the MPEG stream.</div><div class='add'>+Param[0]</div><div class='add'>+	0=extension &amp; user data</div><div class='add'>+	1=private packet with stream ID 0xBD</div><div class='add'>+Param[1]</div><div class='add'>+	Rate at which to insert data, in units of frames (for private packet)</div><div class='add'>+	or GOPs (for ext. &amp; user data)</div><div class='add'>+Param[2]</div><div class='add'>+	Number of data DWORDs (below) to insert</div><div class='add'>+Param[3]</div><div class='add'>+	Custom data 0</div><div class='add'>+Param[4]</div><div class='add'>+	Custom data 1</div><div class='add'>+Param[5]</div><div class='add'>+	Custom data 2</div><div class='add'>+Param[6]</div><div class='add'>+	Custom data 3</div><div class='add'>+Param[7]</div><div class='add'>+	Custom data 4</div><div class='add'>+Param[8]</div><div class='add'>+	Custom data 5</div><div class='add'>+Param[9]</div><div class='add'>+	Custom data 6</div><div class='add'>+Param[10]</div><div class='add'>+	Custom data 7</div><div class='add'>+Param[11]</div><div class='add'>+	Custom data 8</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_MUTE_VIDEO</div><div class='add'>+Enum 	217/0xD9</div><div class='add'>+Description</div><div class='add'>+	Video muting</div><div class='add'>+Param[0]</div><div class='add'>+	Bit usage:</div><div class='add'>+	 0    	'0'=video not muted</div><div class='add'>+		'1'=video muted, creates frames with the YUV color defined below</div><div class='add'>+	 1:7  	Unused</div><div class='add'>+	 8:15 	V chrominance information</div><div class='add'>+	16:23 	U chrominance information</div><div class='add'>+	24:31 	Y luminance information</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_MUTE_AUDIO</div><div class='add'>+Enum 	218/0xDA</div><div class='add'>+Description</div><div class='add'>+	Audio muting</div><div class='add'>+Param[0]</div><div class='add'>+	0=audio not muted</div><div class='add'>+	1=audio muted (produces silent mpeg audio stream)</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_UNKNOWN</div><div class='add'>+Enum 	219/0xDB</div><div class='add'>+Description</div><div class='add'>+	Unknown API, it's used by Hauppauge though.</div><div class='add'>+Param[0]</div><div class='add'>+	0 This is the value Hauppauge uses, Unknown what it means.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_ENC_MISC</div><div class='add'>+Enum 	220/0xDC</div><div class='add'>+Description</div><div class='add'>+	Miscellaneous actions. Not known for 100% what it does. It's really a</div><div class='add'>+	sort of ioctl call. The first parameter is a command number, the second</div><div class='add'>+	the value.</div><div class='add'>+Param[0]</div><div class='add'>+	Command number:</div><div class='add'>+	 1=set initial SCR value when starting encoding.</div><div class='add'>+	 2=set quality mode (apparently some test setting).</div><div class='add'>+	 3=setup advanced VIM protection handling (supposedly only for the cx23416</div><div class='add'>+	   for raw YUV).</div><div class='add'>+	   Actually it looks like this should be 0 for saa7114/5 based card and 1</div><div class='add'>+	   for cx25840 based cards.</div><div class='add'>+	 4=generate artificial PTS timestamps</div><div class='add'>+	 5=USB flush mode</div><div class='add'>+	 6=something to do with the quantization matrix</div><div class='add'>+	 7=set navigation pack insertion for DVD</div><div class='add'>+	 8=enable scene change detection (seems to be a failure)</div><div class='add'>+	 9=set history parameters of the video input module</div><div class='add'>+	10=set input field order of VIM</div><div class='add'>+	11=set quantization matrix</div><div class='add'>+	12=reset audio interface</div><div class='add'>+	13=set audio volume delay</div><div class='add'>+	14=set audio delay</div><div class='add'>+</div><div class='add'>+Param[1]</div><div class='add'>+	Command value.</div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-memory.txt b/Documentation/video4linux/cx2341x/fw-memory.txt<br/>new file mode 100644<br/>index 000000000000..ef0aad3f88fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-memory.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-memory.txt</a></div><div class='hunk'>@@ -0,0 +1,141 @@</div><div class='add'>+This document describes the cx2341x memory map and documents some of the register</div><div class='add'>+space.</div><div class='add'>+</div><div class='add'>+Warning! This information was figured out from searching through the memory and</div><div class='add'>+registers, this information may not be correct and is certainly not complete, and</div><div class='add'>+was not derived from anything more than searching through the memory space with</div><div class='add'>+commands like:</div><div class='add'>+</div><div class='add'>+	ivtvctl -O min=0x02000000,max=0x020000ff</div><div class='add'>+</div><div class='add'>+So take this as is, I'm always searching for more stuff, it's a large</div><div class='add'>+register space :-).</div><div class='add'>+</div><div class='add'>+Memory Map</div><div class='add'>+==========</div><div class='add'>+</div><div class='add'>+The cx2341x exposes its entire 64M memory space to the PCI host via the PCI BAR0</div><div class='add'>+(Base Address Register 0). The addresses here are offsets relative to the</div><div class='add'>+address held in BAR0.</div><div class='add'>+</div><div class='add'>+0x00000000-0x00ffffff Encoder memory space</div><div class='add'>+0x00000000-0x0003ffff Encode.rom</div><div class='add'>+      ???-???         MPEG buffer(s)</div><div class='add'>+      ???-???         Raw video capture buffer(s)</div><div class='add'>+      ???-???         Raw audio capture buffer(s)</div><div class='add'>+      ???-???         Display buffers (6 or 9)</div><div class='add'>+</div><div class='add'>+0x01000000-0x01ffffff Decoder memory space</div><div class='add'>+0x01000000-0x0103ffff Decode.rom</div><div class='add'>+      ???-???         MPEG buffers(s)</div><div class='add'>+0x0114b000-0x0115afff Audio.rom (deprecated?)</div><div class='add'>+</div><div class='add'>+0x02000000-0x0200ffff Register Space</div><div class='add'>+</div><div class='add'>+Registers</div><div class='add'>+=========</div><div class='add'>+</div><div class='add'>+The registers occupy the 64k space starting at the 0x02000000 offset from BAR0.</div><div class='add'>+All of these registers are 32 bits wide.</div><div class='add'>+</div><div class='add'>+DMA Registers 0x000-0xff:</div><div class='add'>+</div><div class='add'>+ 0x00 - Control:</div><div class='add'>+	0=reset/cancel, 1=read, 2=write, 4=stop</div><div class='add'>+ 0x04 - DMA status:</div><div class='add'>+	1=read busy, 2=write busy, 4=read error, 8=write error, 16=link list error</div><div class='add'>+ 0x08 - pci DMA pointer for read link list</div><div class='add'>+ 0x0c - pci DMA pointer for write link list</div><div class='add'>+ 0x10 - read/write DMA enable:</div><div class='add'>+	1=read enable, 2=write enable</div><div class='add'>+ 0x14 - always 0xffffffff, if set any lower instability occurs, 0x00 crashes</div><div class='add'>+ 0x18 - ??</div><div class='add'>+ 0x1c - always 0x20 or 32, smaller values slow down DMA transactions</div><div class='add'>+ 0x20 - always value of 0x780a010a</div><div class='add'>+ 0x24-0x3c - usually just random values???</div><div class='add'>+ 0x40 - Interrupt status</div><div class='add'>+ 0x44 - Write a bit here and shows up in Interrupt status 0x40</div><div class='add'>+ 0x48 - Interrupt Mask</div><div class='add'>+ 0x4C - always value of 0xfffdffff,</div><div class='add'>+	if changed to 0xffffffff DMA write interrupts break.</div><div class='add'>+ 0x50 - always 0xffffffff</div><div class='add'>+ 0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are</div><div class='add'>+	3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the</div><div class='add'>+	interrupt masks???).</div><div class='add'>+ 0x60-0x7C - random values</div><div class='add'>+ 0x80 - first write linked list reg, for Encoder Memory addr</div><div class='add'>+ 0x84 - first write linked list reg, for pci memory addr</div><div class='add'>+ 0x88 - first write linked list reg, for length of buffer in memory addr</div><div class='add'>+	(|0x80000000 or this for last link)</div><div class='add'>+ 0x8c-0xcc - rest of write linked list reg, 8 sets of 3 total, DMA goes here</div><div class='add'>+	from linked list addr in reg 0x0c, firmware must push through or</div><div class='add'>+	something.</div><div class='add'>+ 0xe0 - first (and only) read linked list reg, for pci memory addr</div><div class='add'>+ 0xe4 - first (and only) read linked list reg, for Decoder memory addr</div><div class='add'>+ 0xe8 - first (and only) read linked list reg, for length of buffer</div><div class='add'>+ 0xec-0xff - Nothing seems to be in these registers, 0xec-f4 are 0x00000000.</div><div class='add'>+</div><div class='add'>+Memory locations for Encoder Buffers 0x700-0x7ff:</div><div class='add'>+</div><div class='add'>+These registers show offsets of memory locations pertaining to each</div><div class='add'>+buffer area used for encoding, have to shift them by &lt;&lt;1 first.</div><div class='add'>+</div><div class='add'>+0x07F8: Encoder SDRAM refresh</div><div class='add'>+0x07FC: Encoder SDRAM pre-charge</div><div class='add'>+</div><div class='add'>+Memory locations for Decoder Buffers 0x800-0x8ff:</div><div class='add'>+</div><div class='add'>+These registers show offsets of memory locations pertaining to each</div><div class='add'>+buffer area used for decoding, have to shift them by &lt;&lt;1 first.</div><div class='add'>+</div><div class='add'>+0x08F8: Decoder SDRAM refresh</div><div class='add'>+0x08FC: Decoder SDRAM pre-charge</div><div class='add'>+</div><div class='add'>+Other memory locations:</div><div class='add'>+</div><div class='add'>+0x2800: Video Display Module control</div><div class='add'>+0x2D00: AO (audio output?) control</div><div class='add'>+0x2D24: Bytes Flushed</div><div class='add'>+0x7000: LSB I2C write clock bit (inverted)</div><div class='add'>+0x7004: LSB I2C write data bit (inverted)</div><div class='add'>+0x7008: LSB I2C read clock bit</div><div class='add'>+0x700c: LSB I2C read data bit</div><div class='add'>+0x9008: GPIO get input state</div><div class='add'>+0x900c: GPIO set output state</div><div class='add'>+0x9020: GPIO direction (Bit7 (GPIO 0..7) - 0:input, 1:output)</div><div class='add'>+0x9050: SPU control</div><div class='add'>+0x9054: Reset HW blocks</div><div class='add'>+0x9058: VPU control</div><div class='add'>+0xA018: Bit6: interrupt pending?</div><div class='add'>+0xA064: APU command</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Interrupt Status Register</div><div class='add'>+=========================</div><div class='add'>+</div><div class='add'>+The definition of the bits in the interrupt status register 0x0040, and the</div><div class='add'>+interrupt mask 0x0048. If a bit is cleared in the mask, then we want our ISR to</div><div class='add'>+execute.</div><div class='add'>+</div><div class='add'>+Bit</div><div class='add'>+31 Encoder Start Capture</div><div class='add'>+30 Encoder EOS</div><div class='add'>+29 Encoder VBI capture</div><div class='add'>+28 Encoder Video Input Module reset event</div><div class='add'>+27 Encoder DMA complete</div><div class='add'>+26</div><div class='add'>+25 Decoder copy protect detection event</div><div class='add'>+24 Decoder audio mode change detection event</div><div class='add'>+23</div><div class='add'>+22 Decoder data request</div><div class='add'>+21 Decoder I-Frame? done</div><div class='add'>+20 Decoder DMA complete</div><div class='add'>+19 Decoder VBI re-insertion</div><div class='add'>+18 Decoder DMA err (linked-list bad)</div><div class='add'>+</div><div class='add'>+Missing</div><div class='add'>+Encoder API call completed</div><div class='add'>+Decoder API call completed</div><div class='add'>+Encoder API post(?)</div><div class='add'>+Decoder API post(?)</div><div class='add'>+Decoder VTRACE event</div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-osd-api.txt b/Documentation/video4linux/cx2341x/fw-osd-api.txt<br/>new file mode 100644<br/>index 000000000000..da98ae30a37a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-osd-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-osd-api.txt</a></div><div class='hunk'>@@ -0,0 +1,342 @@</div><div class='add'>+OSD firmware API description</div><div class='add'>+============================</div><div class='add'>+</div><div class='add'>+Note: this API is part of the decoder firmware, so it's cx23415 only.</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_FRAMEBUFFER</div><div class='add'>+Enum 	65/0x41</div><div class='add'>+Description</div><div class='add'>+	Return base and length of contiguous OSD memory.</div><div class='add'>+Result[0]</div><div class='add'>+	OSD base address</div><div class='add'>+Result[1]</div><div class='add'>+	OSD length</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_PIXEL_FORMAT</div><div class='add'>+Enum 	66/0x42</div><div class='add'>+Description</div><div class='add'>+	Query OSD format</div><div class='add'>+Result[0]</div><div class='add'>+	0=8bit index, 4=AlphaRGB 8:8:8:8</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_PIXEL_FORMAT</div><div class='add'>+Enum 	67/0x43</div><div class='add'>+Description</div><div class='add'>+	Assign pixel format</div><div class='add'>+Param[0]</div><div class='add'>+	0=8bit index, 4=AlphaRGB 8:8:8:8</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_STATE</div><div class='add'>+Enum 	68/0x44</div><div class='add'>+Description</div><div class='add'>+	Query OSD state</div><div class='add'>+Result[0]</div><div class='add'>+	Bit  0   0=off, 1=on</div><div class='add'>+	Bits 1:2 alpha control</div><div class='add'>+	Bits 3:5 pixel format</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_STATE</div><div class='add'>+Enum 	69/0x45</div><div class='add'>+Description</div><div class='add'>+	OSD switch</div><div class='add'>+Param[0]</div><div class='add'>+	0=off, 1=on</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_OSD_COORDS</div><div class='add'>+Enum 	70/0x46</div><div class='add'>+Description</div><div class='add'>+	Retrieve coordinates of OSD area blended with video</div><div class='add'>+Result[0]</div><div class='add'>+	OSD buffer address</div><div class='add'>+Result[1]</div><div class='add'>+	Stride in pixels</div><div class='add'>+Result[2]</div><div class='add'>+	Lines in OSD buffer</div><div class='add'>+Result[3]</div><div class='add'>+	Horizontal offset in buffer</div><div class='add'>+Result[4]</div><div class='add'>+	Vertical offset in buffer</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_OSD_COORDS</div><div class='add'>+Enum 	71/0x47</div><div class='add'>+Description</div><div class='add'>+	Assign the coordinates of the OSD area to blend with video</div><div class='add'>+Param[0]</div><div class='add'>+	buffer address</div><div class='add'>+Param[1]</div><div class='add'>+	buffer stride in pixels</div><div class='add'>+Param[2]</div><div class='add'>+	lines in buffer</div><div class='add'>+Param[3]</div><div class='add'>+	horizontal offset</div><div class='add'>+Param[4]</div><div class='add'>+	vertical offset</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_SCREEN_COORDS</div><div class='add'>+Enum 	72/0x48</div><div class='add'>+Description</div><div class='add'>+	Retrieve OSD screen area coordinates</div><div class='add'>+Result[0]</div><div class='add'>+	top left horizontal offset</div><div class='add'>+Result[1]</div><div class='add'>+	top left vertical offset</div><div class='add'>+Result[2]</div><div class='add'>+	bottom right hotizontal offset</div><div class='add'>+Result[3]</div><div class='add'>+	bottom right vertical offset</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_SCREEN_COORDS</div><div class='add'>+Enum 	73/0x49</div><div class='add'>+Description</div><div class='add'>+	Assign the coordinates of the screen area to blend with video</div><div class='add'>+Param[0]</div><div class='add'>+	top left horizontal offset</div><div class='add'>+Param[1]</div><div class='add'>+	top left vertical offset</div><div class='add'>+Param[2]</div><div class='add'>+	bottom left horizontal offset</div><div class='add'>+Param[3]</div><div class='add'>+	bottom left vertical offset</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_GLOBAL_ALPHA</div><div class='add'>+Enum 	74/0x4A</div><div class='add'>+Description</div><div class='add'>+	Retrieve OSD global alpha</div><div class='add'>+Result[0]</div><div class='add'>+	global alpha: 0=off, 1=on</div><div class='add'>+Result[1]</div><div class='add'>+	bits 0:7 global alpha</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_GLOBAL_ALPHA</div><div class='add'>+Enum 	75/0x4B</div><div class='add'>+Description</div><div class='add'>+	Update global alpha</div><div class='add'>+Param[0]</div><div class='add'>+	global alpha: 0=off, 1=on</div><div class='add'>+Param[1]</div><div class='add'>+	global alpha (8 bits)</div><div class='add'>+Param[2]</div><div class='add'>+	local alpha: 0=on, 1=off</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_BLEND_COORDS</div><div class='add'>+Enum 	78/0x4C</div><div class='add'>+Description</div><div class='add'>+	Move start of blending area within display buffer</div><div class='add'>+Param[0]</div><div class='add'>+	horizontal offset in buffer</div><div class='add'>+Param[1]</div><div class='add'>+	vertical offset in buffer</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_FLICKER_STATE</div><div class='add'>+Enum 	79/0x4F</div><div class='add'>+Description</div><div class='add'>+	Retrieve flicker reduction module state</div><div class='add'>+Result[0]</div><div class='add'>+	flicker state: 0=off, 1=on</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_FLICKER_STATE</div><div class='add'>+Enum 	80/0x50</div><div class='add'>+Description</div><div class='add'>+	Set flicker reduction module state</div><div class='add'>+Param[0]</div><div class='add'>+	State: 0=off, 1=on</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_BLT_COPY</div><div class='add'>+Enum 	82/0x52</div><div class='add'>+Description</div><div class='add'>+	BLT copy</div><div class='add'>+Param[0]</div><div class='add'>+'0000'  zero</div><div class='add'>+'0001' ~destination AND ~source</div><div class='add'>+'0010' ~destination AND  source</div><div class='add'>+'0011' ~destination</div><div class='add'>+'0100'  destination AND ~source</div><div class='add'>+'0101'                  ~source</div><div class='add'>+'0110'  destination XOR  source</div><div class='add'>+'0111' ~destination OR  ~source</div><div class='add'>+'1000' ~destination AND ~source</div><div class='add'>+'1001'  destination XNOR source</div><div class='add'>+'1010'                   source</div><div class='add'>+'1011' ~destination OR   source</div><div class='add'>+'1100'  destination</div><div class='add'>+'1101'  destination OR  ~source</div><div class='add'>+'1110'  destination OR   source</div><div class='add'>+'1111'  one</div><div class='add'>+</div><div class='add'>+Param[1]</div><div class='add'>+	Resulting alpha blending</div><div class='add'>+	    '01' source_alpha</div><div class='add'>+	    '10' destination_alpha</div><div class='add'>+	    '11' source_alpha*destination_alpha+1</div><div class='add'>+		 (zero if both source and destination alpha are zero)</div><div class='add'>+Param[2]</div><div class='add'>+	'00' output_pixel = source_pixel</div><div class='add'>+</div><div class='add'>+	'01' if source_alpha=0:</div><div class='add'>+		 output_pixel = destination_pixel</div><div class='add'>+	     if 256 &gt; source_alpha &gt; 1:</div><div class='add'>+		 output_pixel = ((source_alpha + 1)*source_pixel +</div><div class='add'>+				 (255 - source_alpha)*destination_pixel)/256</div><div class='add'>+</div><div class='add'>+	'10' if destination_alpha=0:</div><div class='add'>+		 output_pixel = source_pixel</div><div class='add'>+	      if 255 &gt; destination_alpha &gt; 0:</div><div class='add'>+		 output_pixel = ((255 - destination_alpha)*source_pixel +</div><div class='add'>+				 (destination_alpha + 1)*destination_pixel)/256</div><div class='add'>+</div><div class='add'>+	'11' if source_alpha=0:</div><div class='add'>+		 source_temp = 0</div><div class='add'>+	     if source_alpha=255:</div><div class='add'>+		 source_temp = source_pixel*256</div><div class='add'>+	     if 255 &gt; source_alpha &gt; 0:</div><div class='add'>+		 source_temp = source_pixel*(source_alpha + 1)</div><div class='add'>+	     if destination_alpha=0:</div><div class='add'>+		 destination_temp = 0</div><div class='add'>+	     if destination_alpha=255:</div><div class='add'>+		 destination_temp = destination_pixel*256</div><div class='add'>+	     if 255 &gt; destination_alpha &gt; 0:</div><div class='add'>+		 destination_temp = destination_pixel*(destination_alpha + 1)</div><div class='add'>+	     output_pixel = (source_temp + destination_temp)/256</div><div class='add'>+Param[3]</div><div class='add'>+	width</div><div class='add'>+Param[4]</div><div class='add'>+	height</div><div class='add'>+Param[5]</div><div class='add'>+	destination pixel mask</div><div class='add'>+Param[6]</div><div class='add'>+	destination rectangle start address</div><div class='add'>+Param[7]</div><div class='add'>+	destination stride in dwords</div><div class='add'>+Param[8]</div><div class='add'>+	source stride in dwords</div><div class='add'>+Param[9]</div><div class='add'>+	source rectangle start address</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_BLT_FILL</div><div class='add'>+Enum 	83/0x53</div><div class='add'>+Description</div><div class='add'>+	BLT fill color</div><div class='add'>+Param[0]</div><div class='add'>+	Same as Param[0] on API 0x52</div><div class='add'>+Param[1]</div><div class='add'>+	Same as Param[1] on API 0x52</div><div class='add'>+Param[2]</div><div class='add'>+	Same as Param[2] on API 0x52</div><div class='add'>+Param[3]</div><div class='add'>+	width</div><div class='add'>+Param[4]</div><div class='add'>+	height</div><div class='add'>+Param[5]</div><div class='add'>+	destination pixel mask</div><div class='add'>+Param[6]</div><div class='add'>+	destination rectangle start address</div><div class='add'>+Param[7]</div><div class='add'>+	destination stride in dwords</div><div class='add'>+Param[8]</div><div class='add'>+	color fill value</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_BLT_TEXT</div><div class='add'>+Enum 	84/0x54</div><div class='add'>+Description</div><div class='add'>+	BLT for 8 bit alpha text source</div><div class='add'>+Param[0]</div><div class='add'>+	Same as Param[0] on API 0x52</div><div class='add'>+Param[1]</div><div class='add'>+	Same as Param[1] on API 0x52</div><div class='add'>+Param[2]</div><div class='add'>+	Same as Param[2] on API 0x52</div><div class='add'>+Param[3]</div><div class='add'>+	width</div><div class='add'>+Param[4]</div><div class='add'>+	height</div><div class='add'>+Param[5]</div><div class='add'>+	destination pixel mask</div><div class='add'>+Param[6]</div><div class='add'>+	destination rectangle start address</div><div class='add'>+Param[7]</div><div class='add'>+	destination stride in dwords</div><div class='add'>+Param[8]</div><div class='add'>+	source stride in dwords</div><div class='add'>+Param[9]</div><div class='add'>+	source rectangle start address</div><div class='add'>+Param[10]</div><div class='add'>+	color fill value</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_FRAMEBUFFER_WINDOW</div><div class='add'>+Enum 	86/0x56</div><div class='add'>+Description</div><div class='add'>+	Positions the main output window on the screen. The coordinates must be</div><div class='add'>+	such that the entire window fits on the screen.</div><div class='add'>+Param[0]</div><div class='add'>+	window width</div><div class='add'>+Param[1]</div><div class='add'>+	window height</div><div class='add'>+Param[2]</div><div class='add'>+	top left window corner horizontal offset</div><div class='add'>+Param[3]</div><div class='add'>+	top left window corner vertical offset</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_CHROMA_KEY</div><div class='add'>+Enum 	96/0x60</div><div class='add'>+Description</div><div class='add'>+	Chroma key switch and color</div><div class='add'>+Param[0]</div><div class='add'>+	state: 0=off, 1=on</div><div class='add'>+Param[1]</div><div class='add'>+	color</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_GET_ALPHA_CONTENT_INDEX</div><div class='add'>+Enum 	97/0x61</div><div class='add'>+Description</div><div class='add'>+	Retrieve alpha content index</div><div class='add'>+Result[0]</div><div class='add'>+	alpha content index, Range 0:15</div><div class='add'>+</div><div class='add'>+-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+Name 	CX2341X_OSD_SET_ALPHA_CONTENT_INDEX</div><div class='add'>+Enum 	98/0x62</div><div class='add'>+Description</div><div class='add'>+	Assign alpha content index</div><div class='add'>+Param[0]</div><div class='add'>+	alpha content index, range 0:15</div><div class='head'>diff --git a/Documentation/video4linux/cx2341x/fw-upload.txt b/Documentation/video4linux/cx2341x/fw-upload.txt<br/>new file mode 100644<br/>index 000000000000..60c502ce3215<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx2341x/fw-upload.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx2341x/fw-upload.txt</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+This document describes how to upload the cx2341x firmware to the card.</div><div class='add'>+</div><div class='add'>+How to find</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+See the web pages of the various projects that uses this chip for information</div><div class='add'>+on how to obtain the firmware.</div><div class='add'>+</div><div class='add'>+The firmware stored in a Windows driver can be detected as follows:</div><div class='add'>+</div><div class='add'>+- Each firmware image is 256k bytes.</div><div class='add'>+- The 1st 32-bit word of the Encoder image is 0x0000da7</div><div class='add'>+- The 1st 32-bit word of the Decoder image is 0x00003a7</div><div class='add'>+- The 2nd 32-bit word of both images is 0xaa55bb66</div><div class='add'>+</div><div class='add'>+How to load</div><div class='add'>+===========</div><div class='add'>+</div><div class='add'>+- Issue the FWapi command to stop the encoder if it is running. Wait for the</div><div class='add'>+  command to complete.</div><div class='add'>+- Issue the FWapi command to stop the decoder if it is running. Wait for the</div><div class='add'>+  command to complete.</div><div class='add'>+- Issue the I2C command to the digitizer to stop emitting VSYNC events.</div><div class='add'>+- Issue the FWapi command to halt the encoder's firmware.</div><div class='add'>+- Sleep for 10ms.</div><div class='add'>+- Issue the FWapi command to halt the decoder's firmware.</div><div class='add'>+- Sleep for 10ms.</div><div class='add'>+- Write 0x00000000 to register 0x2800 to stop the Video Display Module.</div><div class='add'>+- Write 0x00000005 to register 0x2D00 to stop the AO (audio output?).</div><div class='add'>+- Write 0x00000000 to register 0xA064 to ping? the APU.</div><div class='add'>+- Write 0xFFFFFFFE to register 0x9058 to stop the VPU.</div><div class='add'>+- Write 0xFFFFFFFF to register 0x9054 to reset the HW blocks.</div><div class='add'>+- Write 0x00000001 to register 0x9050 to stop the SPU.</div><div class='add'>+- Sleep for 10ms.</div><div class='add'>+- Write 0x0000001A to register 0x07FC to init the Encoder SDRAM's pre-charge.</div><div class='add'>+- Write 0x80000640 to register 0x07F8 to init the Encoder SDRAM's refresh to 1us.</div><div class='add'>+- Write 0x0000001A to register 0x08FC to init the Decoder SDRAM's pre-charge.</div><div class='add'>+- Write 0x80000640 to register 0x08F8 to init the Decoder SDRAM's refresh to 1us.</div><div class='add'>+- Sleep for 512ms. (600ms is recommended)</div><div class='add'>+- Transfer the encoder's firmware image to offset 0 in Encoder memory space.</div><div class='add'>+- Transfer the decoder's firmware image to offset 0 in Decoder memory space.</div><div class='add'>+- Use a read-modify-write operation to Clear bit 0 of register 0x9050 to</div><div class='add'>+  re-enable the SPU.</div><div class='add'>+- Sleep for 1 second.</div><div class='add'>+- Use a read-modify-write operation to Clear bits 3 and 0 of register 0x9058</div><div class='add'>+  to re-enable the VPU.</div><div class='add'>+- Sleep for 1 second.</div><div class='add'>+- Issue status API commands to both firmware images to verify.</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt<br/>new file mode 100644<br/>index 000000000000..93fec32a1188<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+The controls for the mux are GPIO [0,1] for source, and GPIO 2 for muting.</div><div class='add'>+</div><div class='add'>+GPIO0  GPIO1</div><div class='add'>+  0        0    TV Audio</div><div class='add'>+  1        0    FM radio</div><div class='add'>+  0        1    Line-In</div><div class='add'>+  1        1    Mono tuner bypass or CD passthru (tuner specific)</div><div class='add'>+</div><div class='add'>+GPIO 16(i believe) is tied to the IR port (if present).</div><div class='add'>+</div><div class='add'>+------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+&gt;From the data sheet:</div><div class='add'>+ Register 24'h20004  PCI Interrupt Status</div><div class='add'>+  bit [18]  IR_SMP_INT Set when 32 input samples have been collected over</div><div class='add'>+  gpio[16] pin into GP_SAMPLE register.</div><div class='add'>+</div><div class='add'>+What's missing from the data sheet:</div><div class='add'>+</div><div class='add'>+Setup 4KHz sampling rate (roughly 2x oversampled; good enough for our RC5</div><div class='add'>+compat remote)</div><div class='add'>+set register 0x35C050 to  0xa80a80</div><div class='add'>+</div><div class='add'>+enable sampling</div><div class='add'>+set register 0x35C054 to 0x5</div><div class='add'>+</div><div class='add'>+Of course, enable the IRQ bit 18 in the interrupt mask register .(and</div><div class='add'>+provide for a handler)</div><div class='add'>+</div><div class='add'>+GP_SAMPLE register is at 0x35C058</div><div class='add'>+</div><div class='add'>+Bits are then right shifted into the GP_SAMPLE register at the specified</div><div class='add'>+rate; you get an interrupt when a full DWORD is recieved.</div><div class='add'>+You need to recover the actual RC5 bits out of the (oversampled) IR sensor</div><div class='add'>+bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data)  An</div><div class='add'>+actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment.</div><div class='add'>+</div><div class='add'>+I'm pretty sure when no IR signal is present the receiver is always in a</div><div class='add'>+marking state(1); but stray light, etc can cause intermittent noise values</div><div class='add'>+as well.  Remember, this is a free running sample of the IR receiver state</div><div class='add'>+over time, so don't assume any sample starts at any particular place.</div><div class='add'>+</div><div class='add'>+http://www.atmel.com/dyn/resources/prod_documents/doc2817.pdf</div><div class='add'>+This data sheet (google search) seems to have a lovely description of the</div><div class='add'>+RC5 basics</div><div class='add'>+</div><div class='add'>+http://users.pandora.be/nenya/electronics/rc5/  and more data</div><div class='add'>+</div><div class='add'>+http://www.ee.washington.edu/circuit_archive/text/ir_decode.txt</div><div class='add'>+and even a reference to how to decode a bi-phase data stream.</div><div class='add'>+</div><div class='add'>+http://www.xs4all.nl/~sbp/knowledge/ir/rc5.htm</div><div class='add'>+still more info</div><div class='add'>+</div><div class='head'>diff --git a/Documentation/video4linux/et61x251.txt b/Documentation/video4linux/et61x251.txt<br/>index 29340282ab5f..cd584f20a997 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/et61x251.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/et61x251.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/et61x251.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/et61x251.txt</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> </div><div class='del'>-                       ET61X[12]51 PC Camera Controllers</div><div class='del'>-                                Driver for Linux</div><div class='del'>-                       =================================</div><div class='add'>+		       ET61X[12]51 PC Camera Controllers</div><div class='add'>+				Driver for Linux</div><div class='add'>+		       =================================</div><div class='ctx'> </div><div class='del'>-                               - Documentation -</div><div class='add'>+			       - Documentation -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Index</div><div class='hunk'>@@ -156,46 +156,46 @@ Name:           video_nr</div><div class='ctx'> Type:           short array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;-1|n[,...]&gt;</div><div class='ctx'> Description:    Specify V4L2 minor mode number:</div><div class='del'>-                -1 = use next available</div><div class='del'>-                 n = use minor number n</div><div class='del'>-                You can specify up to 64 cameras this way.</div><div class='del'>-                For example:</div><div class='del'>-                video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='del'>-                registered camera and use auto for the first one and for every</div><div class='del'>-                other camera.</div><div class='add'>+		-1 = use next available</div><div class='add'>+		 n = use minor number n</div><div class='add'>+		You can specify up to 64 cameras this way.</div><div class='add'>+		For example:</div><div class='add'>+		video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='add'>+		registered camera and use auto for the first one and for every</div><div class='add'>+		other camera.</div><div class='ctx'> Default:        -1</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           force_munmap</div><div class='ctx'> Type:           bool array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Force the application to unmap previously mapped buffer memory</div><div class='del'>-                before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not</div><div class='del'>-                all the applications support this feature. This parameter is</div><div class='del'>-                specific for each detected camera.</div><div class='del'>-                0 = do not force memory unmapping</div><div class='del'>-                1 = force memory unmapping (save memory)</div><div class='add'>+		before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not</div><div class='add'>+		all the applications support this feature. This parameter is</div><div class='add'>+		specific for each detected camera.</div><div class='add'>+		0 = do not force memory unmapping</div><div class='add'>+		1 = force memory unmapping (save memory)</div><div class='ctx'> Default:        0</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           frame_timeout</div><div class='ctx'> Type:           uint array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;n[,...]&gt;</div><div class='ctx'> Description:    Timeout for a video frame in seconds. This parameter is</div><div class='del'>-                specific for each detected camera. This parameter can be</div><div class='del'>-                changed at runtime thanks to the /sys filesystem interface.</div><div class='add'>+		specific for each detected camera. This parameter can be</div><div class='add'>+		changed at runtime thanks to the /sys filesystem interface.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           debug</div><div class='ctx'> Type:           ushort</div><div class='ctx'> Syntax:         &lt;n&gt;</div><div class='ctx'> Description:    Debugging information level, from 0 to 3:</div><div class='del'>-                0 = none (use carefully)</div><div class='del'>-                1 = critical errors</div><div class='del'>-                2 = significant informations</div><div class='del'>-                3 = more verbose messages</div><div class='del'>-                Level 3 is useful for testing only, when only one device</div><div class='del'>-                is used at the same time. It also shows some more informations</div><div class='del'>-                about the hardware being detected. This module parameter can be</div><div class='del'>-                changed at runtime thanks to the /sys filesystem interface.</div><div class='add'>+		0 = none (use carefully)</div><div class='add'>+		1 = critical errors</div><div class='add'>+		2 = significant informations</div><div class='add'>+		3 = more verbose messages</div><div class='add'>+		Level 3 is useful for testing only, when only one device</div><div class='add'>+		is used at the same time. It also shows some more informations</div><div class='add'>+		about the hardware being detected. This module parameter can be</div><div class='add'>+		changed at runtime thanks to the /sys filesystem interface.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/ibmcam.txt b/Documentation/video4linux/ibmcam.txt<br/>index 4a40a2e99451..397a94eb77b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/ibmcam.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/ibmcam.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/ibmcam.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/ibmcam.txt</a></div><div class='hunk'>@@ -21,7 +21,7 @@ Internal interface: Video For Linux (V4L)</div><div class='ctx'> Supported controls:</div><div class='ctx'> - by V4L: Contrast,  Brightness, Color, Hue</div><div class='ctx'> - by driver options: frame rate, lighting conditions, video format,</div><div class='del'>-                     default picture settings, sharpness.</div><div class='add'>+		     default picture settings, sharpness.</div><div class='ctx'> </div><div class='ctx'> SUPPORTED CAMERAS:</div><div class='ctx'> </div><div class='hunk'>@@ -191,66 +191,66 @@ init_model2_sat Integer         0..255 [0x34]   init_model2_sat=65</div><div class='ctx'> init_model2_yb  Integer         0..255 [0xa0]   init_model2_yb=200</div><div class='ctx'> </div><div class='ctx'> debug           You don't need this option unless you are a developer.</div><div class='del'>-                If you are a developer then you will see in the code</div><div class='del'>-                what values do what. 0=off.</div><div class='add'>+		If you are a developer then you will see in the code</div><div class='add'>+		what values do what. 0=off.</div><div class='ctx'> </div><div class='ctx'> flags           This is a bit mask, and you can combine any number of</div><div class='del'>-                bits to produce what you want. Usually you don't want</div><div class='del'>-                any of extra features this option provides:</div><div class='del'>-</div><div class='del'>-                FLAGS_RETRY_VIDIOCSYNC  1  This bit allows to retry failed</div><div class='del'>-                                           VIDIOCSYNC ioctls without failing.</div><div class='del'>-                                           Will work with xawtv, will not</div><div class='del'>-                                           with xrealproducer. Default is</div><div class='del'>-                                           not set.</div><div class='del'>-                FLAGS_MONOCHROME        2  Activates monochrome (b/w) mode.</div><div class='del'>-                FLAGS_DISPLAY_HINTS     4  Shows colored pixels which have</div><div class='del'>-                                           magic meaning to developers.</div><div class='del'>-                FLAGS_OVERLAY_STATS     8  Shows tiny numbers on screen,</div><div class='del'>-                                           useful only for debugging.</div><div class='del'>-                FLAGS_FORCE_TESTPATTERN 16 Shows blue screen with numbers.</div><div class='del'>-                FLAGS_SEPARATE_FRAMES   32 Shows each frame separately, as</div><div class='del'>-                                           it was received from the camera.</div><div class='del'>-                                           Default (not set) is to mix the</div><div class='del'>-                                           preceding frame in to compensate</div><div class='del'>-                                           for occasional loss of Isoc data</div><div class='del'>-                                           on high frame rates.</div><div class='del'>-                FLAGS_CLEAN_FRAMES      64 Forces "cleanup" of each frame</div><div class='del'>-                                           prior to use; relevant only if</div><div class='del'>-                                           FLAGS_SEPARATE_FRAMES is set.</div><div class='del'>-                                           Default is not to clean frames,</div><div class='del'>-                                           this is a little faster but may</div><div class='del'>-                                           produce flicker if frame rate is</div><div class='del'>-                                           too high and Isoc data gets lost.</div><div class='del'>-                FLAGS_NO_DECODING      128 This flag turns the video stream</div><div class='del'>-                                           decoder off, and dumps the raw</div><div class='del'>-                                           Isoc data from the camera into</div><div class='del'>-                                           the reading process. Useful to</div><div class='del'>-                                           developers, but not to users.</div><div class='add'>+		bits to produce what you want. Usually you don't want</div><div class='add'>+		any of extra features this option provides:</div><div class='add'>+</div><div class='add'>+		FLAGS_RETRY_VIDIOCSYNC  1  This bit allows to retry failed</div><div class='add'>+					   VIDIOCSYNC ioctls without failing.</div><div class='add'>+					   Will work with xawtv, will not</div><div class='add'>+					   with xrealproducer. Default is</div><div class='add'>+					   not set.</div><div class='add'>+		FLAGS_MONOCHROME        2  Activates monochrome (b/w) mode.</div><div class='add'>+		FLAGS_DISPLAY_HINTS     4  Shows colored pixels which have</div><div class='add'>+					   magic meaning to developers.</div><div class='add'>+		FLAGS_OVERLAY_STATS     8  Shows tiny numbers on screen,</div><div class='add'>+					   useful only for debugging.</div><div class='add'>+		FLAGS_FORCE_TESTPATTERN 16 Shows blue screen with numbers.</div><div class='add'>+		FLAGS_SEPARATE_FRAMES   32 Shows each frame separately, as</div><div class='add'>+					   it was received from the camera.</div><div class='add'>+					   Default (not set) is to mix the</div><div class='add'>+					   preceding frame in to compensate</div><div class='add'>+					   for occasional loss of Isoc data</div><div class='add'>+					   on high frame rates.</div><div class='add'>+		FLAGS_CLEAN_FRAMES      64 Forces "cleanup" of each frame</div><div class='add'>+					   prior to use; relevant only if</div><div class='add'>+					   FLAGS_SEPARATE_FRAMES is set.</div><div class='add'>+					   Default is not to clean frames,</div><div class='add'>+					   this is a little faster but may</div><div class='add'>+					   produce flicker if frame rate is</div><div class='add'>+					   too high and Isoc data gets lost.</div><div class='add'>+		FLAGS_NO_DECODING      128 This flag turns the video stream</div><div class='add'>+					   decoder off, and dumps the raw</div><div class='add'>+					   Isoc data from the camera into</div><div class='add'>+					   the reading process. Useful to</div><div class='add'>+					   developers, but not to users.</div><div class='ctx'> </div><div class='ctx'> framerate       This setting controls frame rate of the camera. This is</div><div class='del'>-                an approximate setting (in terms of "worst" ... "best")</div><div class='del'>-                because camera changes frame rate depending on amount</div><div class='del'>-                of light available. Setting 0 is slowest, 6 is fastest.</div><div class='del'>-                Beware - fast settings are very demanding and may not</div><div class='del'>-                work well with all video sizes. Be conservative.</div><div class='add'>+		an approximate setting (in terms of "worst" ... "best")</div><div class='add'>+		because camera changes frame rate depending on amount</div><div class='add'>+		of light available. Setting 0 is slowest, 6 is fastest.</div><div class='add'>+		Beware - fast settings are very demanding and may not</div><div class='add'>+		work well with all video sizes. Be conservative.</div><div class='ctx'> </div><div class='ctx'> hue_correction  This highly optional setting allows to adjust the</div><div class='del'>-                hue of the image in a way slightly different from</div><div class='del'>-                what usual "hue" control does. Both controls affect</div><div class='del'>-                YUV colorspace: regular "hue" control adjusts only</div><div class='del'>-                U component, and this "hue_correction" option similarly</div><div class='del'>-                adjusts only V component. However usually it is enough</div><div class='del'>-                to tweak only U or V to compensate for colored light or</div><div class='del'>-                color temperature; this option simply allows more</div><div class='del'>-                complicated correction when and if it is necessary.</div><div class='add'>+		hue of the image in a way slightly different from</div><div class='add'>+		what usual "hue" control does. Both controls affect</div><div class='add'>+		YUV colorspace: regular "hue" control adjusts only</div><div class='add'>+		U component, and this "hue_correction" option similarly</div><div class='add'>+		adjusts only V component. However usually it is enough</div><div class='add'>+		to tweak only U or V to compensate for colored light or</div><div class='add'>+		color temperature; this option simply allows more</div><div class='add'>+		complicated correction when and if it is necessary.</div><div class='ctx'> </div><div class='ctx'> init_brightness These settings specify _initial_ values which will be</div><div class='ctx'> init_contrast   used to set up the camera. If your V4L application has</div><div class='ctx'> init_color      its own controls to adjust the picture then these</div><div class='ctx'> init_hue        controls will be used too. These options allow you to</div><div class='del'>-                preconfigure the camera when it gets connected, before</div><div class='del'>-                any V4L application connects to it. Good for webcams.</div><div class='add'>+		preconfigure the camera when it gets connected, before</div><div class='add'>+		any V4L application connects to it. Good for webcams.</div><div class='ctx'> </div><div class='ctx'> init_model2_rg  These initial settings alter color balance of the</div><div class='ctx'> init_model2_rg2 camera on hardware level. All four settings may be used</div><div class='hunk'>@@ -258,47 +258,47 @@ init_model2_sat to tune the camera to specific lighting conditions. These</div><div class='ctx'> init_model2_yb  settings only apply to Model 2 cameras.</div><div class='ctx'> </div><div class='ctx'> lighting        This option selects one of three hardware-defined</div><div class='del'>-                photosensitivity settings of the camera. 0=bright light,</div><div class='del'>-                1=Medium (default), 2=Low light. This setting affects</div><div class='del'>-                frame rate: the dimmer the lighting the lower the frame</div><div class='del'>-                rate (because longer exposition time is needed). The</div><div class='del'>-                Model 2 cameras allow values more than 2 for this option,</div><div class='del'>-                thus enabling extremely high sensitivity at cost of frame</div><div class='del'>-                rate, color saturation and imaging sensor noise.</div><div class='add'>+		photosensitivity settings of the camera. 0=bright light,</div><div class='add'>+		1=Medium (default), 2=Low light. This setting affects</div><div class='add'>+		frame rate: the dimmer the lighting the lower the frame</div><div class='add'>+		rate (because longer exposition time is needed). The</div><div class='add'>+		Model 2 cameras allow values more than 2 for this option,</div><div class='add'>+		thus enabling extremely high sensitivity at cost of frame</div><div class='add'>+		rate, color saturation and imaging sensor noise.</div><div class='ctx'> </div><div class='ctx'> sharpness       This option controls smoothing (noise reduction)</div><div class='del'>-                made by camera. Setting 0 is most smooth, setting 6</div><div class='del'>-                is most sharp. Be aware that CMOS sensor used in the</div><div class='del'>-                camera is pretty noisy, so if you choose 6 you will</div><div class='del'>-                be greeted with "snowy" image. Default is 4. Model 2</div><div class='del'>-                cameras do not support this feature.</div><div class='add'>+		made by camera. Setting 0 is most smooth, setting 6</div><div class='add'>+		is most sharp. Be aware that CMOS sensor used in the</div><div class='add'>+		camera is pretty noisy, so if you choose 6 you will</div><div class='add'>+		be greeted with "snowy" image. Default is 4. Model 2</div><div class='add'>+		cameras do not support this feature.</div><div class='ctx'> </div><div class='ctx'> size            This setting chooses one of several image sizes that are</div><div class='del'>-                supported by this driver. Cameras may support more, but</div><div class='del'>-                it's difficult to reverse-engineer all formats.</div><div class='del'>-                Following video sizes are supported:</div><div class='del'>-</div><div class='del'>-                size=0     128x96  (Model 1 only)</div><div class='del'>-                size=1     160x120</div><div class='del'>-                size=2     176x144</div><div class='del'>-                size=3     320x240 (Model 2 only)</div><div class='del'>-                size=4     352x240 (Model 2 only)</div><div class='del'>-                size=5     352x288</div><div class='del'>-                size=6     640x480 (Model 3 only)</div><div class='del'>-</div><div class='del'>-                The 352x288 is the native size of the Model 1 sensor</div><div class='del'>-                array, so it's the best resolution the camera can</div><div class='del'>-                yield. The best resolution of Model 2 is 176x144, and</div><div class='del'>-                larger images are produced by stretching the bitmap.</div><div class='del'>-                Model 3 has sensor with 640x480 grid, and it works too,</div><div class='del'>-                but the frame rate will be exceptionally low (1-2 FPS);</div><div class='del'>-                it may be still OK for some applications, like security.</div><div class='del'>-                Choose the image size you need. The smaller image can</div><div class='del'>-                support faster frame rate. Default is 352x288.</div><div class='add'>+		supported by this driver. Cameras may support more, but</div><div class='add'>+		it's difficult to reverse-engineer all formats.</div><div class='add'>+		Following video sizes are supported:</div><div class='add'>+</div><div class='add'>+		size=0     128x96  (Model 1 only)</div><div class='add'>+		size=1     160x120</div><div class='add'>+		size=2     176x144</div><div class='add'>+		size=3     320x240 (Model 2 only)</div><div class='add'>+		size=4     352x240 (Model 2 only)</div><div class='add'>+		size=5     352x288</div><div class='add'>+		size=6     640x480 (Model 3 only)</div><div class='add'>+</div><div class='add'>+		The 352x288 is the native size of the Model 1 sensor</div><div class='add'>+		array, so it's the best resolution the camera can</div><div class='add'>+		yield. The best resolution of Model 2 is 176x144, and</div><div class='add'>+		larger images are produced by stretching the bitmap.</div><div class='add'>+		Model 3 has sensor with 640x480 grid, and it works too,</div><div class='add'>+		but the frame rate will be exceptionally low (1-2 FPS);</div><div class='add'>+		it may be still OK for some applications, like security.</div><div class='add'>+		Choose the image size you need. The smaller image can</div><div class='add'>+		support faster frame rate. Default is 352x288.</div><div class='ctx'> </div><div class='ctx'> For more information and the Troubleshooting FAQ visit this URL:</div><div class='ctx'> </div><div class='del'>-                http://www.linux-usb.org/ibmcam/</div><div class='add'>+		http://www.linux-usb.org/ibmcam/</div><div class='ctx'> </div><div class='ctx'> WHAT NEEDS TO BE DONE:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/ov511.txt b/Documentation/video4linux/ov511.txt<br/>index 142741e3c578..79af610d4ba5 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/ov511.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/ov511.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/ov511.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/ov511.txt</a></div><div class='hunk'>@@ -81,7 +81,7 @@ MODULE PARAMETERS:</div><div class='ctx'>   TYPE: integer (Boolean)</div><div class='ctx'>   DEFAULT: 1</div><div class='ctx'>   DESC: Brightness is normally under automatic control and can't be set</div><div class='del'>-        manually by the video app. Set to 0 for manual control.</div><div class='add'>+	manually by the video app. Set to 0 for manual control.</div><div class='ctx'> </div><div class='ctx'>   NAME: autogain</div><div class='ctx'>   TYPE: integer (Boolean)</div><div class='hunk'>@@ -97,13 +97,13 @@ MODULE PARAMETERS:</div><div class='ctx'>   TYPE: integer (0-6)</div><div class='ctx'>   DEFAULT: 3</div><div class='ctx'>   DESC: Sets the threshold for printing debug messages. The higher the value,</div><div class='del'>-        the more is printed. The levels are cumulative, and are as follows:</div><div class='del'>-          0=no debug messages</div><div class='del'>-          1=init/detection/unload and other significant messages</div><div class='del'>-          2=some warning messages</div><div class='del'>-          3=config/control function calls</div><div class='del'>-          4=most function calls and data parsing messages</div><div class='del'>-          5=highly repetitive mesgs</div><div class='add'>+	the more is printed. The levels are cumulative, and are as follows:</div><div class='add'>+	  0=no debug messages</div><div class='add'>+	  1=init/detection/unload and other significant messages</div><div class='add'>+	  2=some warning messages</div><div class='add'>+	  3=config/control function calls</div><div class='add'>+	  4=most function calls and data parsing messages</div><div class='add'>+	  5=highly repetitive mesgs</div><div class='ctx'> </div><div class='ctx'>   NAME: snapshot</div><div class='ctx'>   TYPE: integer (Boolean)</div><div class='hunk'>@@ -116,24 +116,24 @@ MODULE PARAMETERS:</div><div class='ctx'>   TYPE: integer (1-4 for OV511, 1-31 for OV511+)</div><div class='ctx'>   DEFAULT: 1</div><div class='ctx'>   DESC: Number of cameras allowed to stream simultaneously on a single bus.</div><div class='del'>-        Values higher than 1 reduce the data rate of each camera, allowing two</div><div class='del'>-        or more to be used at once. If you have a complicated setup involving</div><div class='del'>-        both OV511 and OV511+ cameras, trial-and-error may be necessary for</div><div class='del'>-        finding the optimum setting.</div><div class='add'>+	Values higher than 1 reduce the data rate of each camera, allowing two</div><div class='add'>+	or more to be used at once. If you have a complicated setup involving</div><div class='add'>+	both OV511 and OV511+ cameras, trial-and-error may be necessary for</div><div class='add'>+	finding the optimum setting.</div><div class='ctx'> </div><div class='ctx'>   NAME: compress</div><div class='ctx'>   TYPE: integer (Boolean)</div><div class='ctx'>   DEFAULT: 0</div><div class='ctx'>   DESC: Set this to 1 to turn on the camera's compression engine. This can</div><div class='del'>-        potentially increase the frame rate at the expense of quality, if you</div><div class='del'>-        have a fast CPU. You must load the proper compression module for your</div><div class='del'>-        camera before starting your application (ov511_decomp or ov518_decomp).</div><div class='add'>+	potentially increase the frame rate at the expense of quality, if you</div><div class='add'>+	have a fast CPU. You must load the proper compression module for your</div><div class='add'>+	camera before starting your application (ov511_decomp or ov518_decomp).</div><div class='ctx'> </div><div class='ctx'>   NAME: testpat</div><div class='ctx'>   TYPE: integer (Boolean)</div><div class='ctx'>   DEFAULT: 0</div><div class='ctx'>   DESC: This configures the camera's sensor to transmit a colored test-pattern</div><div class='del'>-        instead of an image. This does not work correctly yet.</div><div class='add'>+	instead of an image. This does not work correctly yet.</div><div class='ctx'> </div><div class='ctx'>   NAME: dumppix</div><div class='ctx'>   TYPE: integer (0-2)</div><div class='head'>diff --git a/Documentation/video4linux/sn9c102.txt b/Documentation/video4linux/sn9c102.txt<br/>index 142920bc011f..1d20895b4354 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/sn9c102.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/sn9c102.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/sn9c102.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/sn9c102.txt</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> </div><div class='del'>-                         SN9C10x PC Camera Controllers</div><div class='del'>-                                Driver for Linux</div><div class='del'>-                         =============================</div><div class='add'>+			 SN9C10x PC Camera Controllers</div><div class='add'>+				Driver for Linux</div><div class='add'>+			 =============================</div><div class='ctx'> </div><div class='del'>-                               - Documentation -</div><div class='add'>+			       - Documentation -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Index</div><div class='hunk'>@@ -176,46 +176,46 @@ Name:           video_nr</div><div class='ctx'> Type:           short array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;-1|n[,...]&gt;</div><div class='ctx'> Description:    Specify V4L2 minor mode number:</div><div class='del'>-                -1 = use next available</div><div class='del'>-                 n = use minor number n</div><div class='del'>-                You can specify up to 64 cameras this way.</div><div class='del'>-                For example:</div><div class='del'>-                video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='del'>-                recognized camera and use auto for the first one and for every</div><div class='del'>-                other camera.</div><div class='add'>+		-1 = use next available</div><div class='add'>+		 n = use minor number n</div><div class='add'>+		You can specify up to 64 cameras this way.</div><div class='add'>+		For example:</div><div class='add'>+		video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='add'>+		recognized camera and use auto for the first one and for every</div><div class='add'>+		other camera.</div><div class='ctx'> Default:        -1</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           force_munmap</div><div class='ctx'> Type:           bool array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Force the application to unmap previously mapped buffer memory</div><div class='del'>-                before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not</div><div class='del'>-                all the applications support this feature. This parameter is</div><div class='del'>-                specific for each detected camera.</div><div class='del'>-                0 = do not force memory unmapping</div><div class='del'>-                1 = force memory unmapping (save memory)</div><div class='add'>+		before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not</div><div class='add'>+		all the applications support this feature. This parameter is</div><div class='add'>+		specific for each detected camera.</div><div class='add'>+		0 = do not force memory unmapping</div><div class='add'>+		1 = force memory unmapping (save memory)</div><div class='ctx'> Default:        0</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           frame_timeout</div><div class='ctx'> Type:           uint array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;n[,...]&gt;</div><div class='ctx'> Description:    Timeout for a video frame in seconds. This parameter is</div><div class='del'>-                specific for each detected camera. This parameter can be</div><div class='del'>-                changed at runtime thanks to the /sys filesystem interface.</div><div class='add'>+		specific for each detected camera. This parameter can be</div><div class='add'>+		changed at runtime thanks to the /sys filesystem interface.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           debug</div><div class='ctx'> Type:           ushort</div><div class='ctx'> Syntax:         &lt;n&gt;</div><div class='ctx'> Description:    Debugging information level, from 0 to 3:</div><div class='del'>-                0 = none (use carefully)</div><div class='del'>-                1 = critical errors</div><div class='del'>-                2 = significant informations</div><div class='del'>-                3 = more verbose messages</div><div class='del'>-                Level 3 is useful for testing only, when only one device</div><div class='del'>-                is used. It also shows some more informations about the</div><div class='del'>-                hardware being detected. This parameter can be changed at</div><div class='del'>-                runtime thanks to the /sys filesystem interface.</div><div class='add'>+		0 = none (use carefully)</div><div class='add'>+		1 = critical errors</div><div class='add'>+		2 = significant informations</div><div class='add'>+		3 = more verbose messages</div><div class='add'>+		Level 3 is useful for testing only, when only one device</div><div class='add'>+		is used. It also shows some more informations about the</div><div class='add'>+		hardware being detected. This parameter can be changed at</div><div class='add'>+		runtime thanks to the /sys filesystem interface.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -280,24 +280,24 @@ Byte #  Value         Description</div><div class='ctx'> 0x04    0xC4          Frame synchronisation pattern.</div><div class='ctx'> 0x05    0x96          Frame synchronisation pattern.</div><div class='ctx'> 0x06    0xXX          Unknown meaning. The exact value depends on the chip;</div><div class='del'>-                      possible values are 0x00, 0x01 and 0x20.</div><div class='add'>+		      possible values are 0x00, 0x01 and 0x20.</div><div class='ctx'> 0x07    0xXX          Variable value, whose bits are ff00uzzc, where ff is a</div><div class='del'>-                      frame counter, u is unknown, zz is a size indicator</div><div class='del'>-                      (00 = VGA, 01 = SIF, 10 = QSIF) and c stands for</div><div class='del'>-                      "compression enabled" (1 = yes, 0 = no).</div><div class='add'>+		      frame counter, u is unknown, zz is a size indicator</div><div class='add'>+		      (00 = VGA, 01 = SIF, 10 = QSIF) and c stands for</div><div class='add'>+		      "compression enabled" (1 = yes, 0 = no).</div><div class='ctx'> 0x08    0xXX          Brightness sum inside Auto-Exposure area (low-byte).</div><div class='ctx'> 0x09    0xXX          Brightness sum inside Auto-Exposure area (high-byte).</div><div class='del'>-                      For a pure white image, this number will be equal to 500</div><div class='del'>-                      times the area of the specified AE area. For images</div><div class='del'>-                      that are not pure white, the value scales down according</div><div class='del'>-                      to relative whiteness.</div><div class='add'>+		      For a pure white image, this number will be equal to 500</div><div class='add'>+		      times the area of the specified AE area. For images</div><div class='add'>+		      that are not pure white, the value scales down according</div><div class='add'>+		      to relative whiteness.</div><div class='ctx'> 0x0A    0xXX          Brightness sum outside Auto-Exposure area (low-byte).</div><div class='ctx'> 0x0B    0xXX          Brightness sum outside Auto-Exposure area (high-byte).</div><div class='del'>-                      For a pure white image, this number will be equal to 125</div><div class='del'>-                      times the area outside of the specified AE area. For</div><div class='del'>-                      images that are not pure white, the value scales down</div><div class='del'>-                      according to relative whiteness.</div><div class='del'>-                      according to relative whiteness.</div><div class='add'>+		      For a pure white image, this number will be equal to 125</div><div class='add'>+		      times the area outside of the specified AE area. For</div><div class='add'>+		      images that are not pure white, the value scales down</div><div class='add'>+		      according to relative whiteness.</div><div class='add'>+		      according to relative whiteness.</div><div class='ctx'> </div><div class='ctx'> The following bytes are used by the SN9C103 bridge only:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/v4lgrab.c b/Documentation/video4linux/v4lgrab.c<br/>new file mode 100644<br/>index 000000000000..079b628481cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/v4lgrab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/v4lgrab.c</a></div><div class='hunk'>@@ -0,0 +1,192 @@</div><div class='add'>+/* Simple Video4Linux image grabber. */</div><div class='add'>+/*</div><div class='add'>+ *	Video4Linux Driver Test/Example Framegrabbing Program</div><div class='add'>+ *</div><div class='add'>+ *	Compile with:</div><div class='add'>+ *		gcc -s -Wall -Wstrict-prototypes v4lgrab.c -o v4lgrab</div><div class='add'>+ *      Use as:</div><div class='add'>+ *              v4lgrab &gt;image.ppm</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (C) 1998-05-03, Phil Blundell &lt;philb@gnu.org&gt;</div><div class='add'>+ *      Copied from http://www.tazenda.demon.co.uk/phil/vgrabber.c</div><div class='add'>+ *      with minor modifications (Dave Forrest, drf5n@virginia.edu).</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='add'>+</div><div class='add'>+#define FILE "/dev/video0"</div><div class='add'>+</div><div class='add'>+/* Stole this from tvset.c */</div><div class='add'>+</div><div class='add'>+#define READ_VIDEO_PIXEL(buf, format, depth, r, g, b)                   \</div><div class='add'>+{                                                                       \</div><div class='add'>+	switch (format)                                                 \</div><div class='add'>+	{                                                               \</div><div class='add'>+		case VIDEO_PALETTE_GREY:                                \</div><div class='add'>+			switch (depth)                                  \</div><div class='add'>+			{                                               \</div><div class='add'>+				case 4:                                 \</div><div class='add'>+				case 6:                                 \</div><div class='add'>+				case 8:                                 \</div><div class='add'>+					(r) = (g) = (b) = (*buf++ &lt;&lt; 8);\</div><div class='add'>+					break;                          \</div><div class='add'>+									\</div><div class='add'>+				case 16:                                \</div><div class='add'>+					(r) = (g) = (b) =               \</div><div class='add'>+						*((unsigned short *) buf);      \</div><div class='add'>+					buf += 2;                       \</div><div class='add'>+					break;                          \</div><div class='add'>+			}                                               \</div><div class='add'>+			break;                                          \</div><div class='add'>+									\</div><div class='add'>+									\</div><div class='add'>+		case VIDEO_PALETTE_RGB565:                              \</div><div class='add'>+		{                                                       \</div><div class='add'>+			unsigned short tmp = *(unsigned short *)buf;    \</div><div class='add'>+			(r) = tmp&amp;0xF800;                               \</div><div class='add'>+			(g) = (tmp&lt;&lt;5)&amp;0xFC00;                          \</div><div class='add'>+			(b) = (tmp&lt;&lt;11)&amp;0xF800;                         \</div><div class='add'>+			buf += 2;                                       \</div><div class='add'>+		}                                                       \</div><div class='add'>+		break;                                                  \</div><div class='add'>+									\</div><div class='add'>+		case VIDEO_PALETTE_RGB555:                              \</div><div class='add'>+			(r) = (buf[0]&amp;0xF8)&lt;&lt;8;                         \</div><div class='add'>+			(g) = ((buf[0] &lt;&lt; 5 | buf[1] &gt;&gt; 3)&amp;0xF8)&lt;&lt;8;    \</div><div class='add'>+			(b) = ((buf[1] &lt;&lt; 2 ) &amp; 0xF8)&lt;&lt;8;               \</div><div class='add'>+			buf += 2;                                       \</div><div class='add'>+			break;                                          \</div><div class='add'>+									\</div><div class='add'>+		case VIDEO_PALETTE_RGB24:                               \</div><div class='add'>+			(r) = buf[0] &lt;&lt; 8; (g) = buf[1] &lt;&lt; 8;           \</div><div class='add'>+			(b) = buf[2] &lt;&lt; 8;                              \</div><div class='add'>+			buf += 3;                                       \</div><div class='add'>+			break;                                          \</div><div class='add'>+									\</div><div class='add'>+		default:                                                \</div><div class='add'>+			fprintf(stderr,                                 \</div><div class='add'>+				"Format %d not yet supported\n",        \</div><div class='add'>+				format);                                \</div><div class='add'>+	}                                                               \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_brightness_adj(unsigned char *image, long size, int *brightness) {</div><div class='add'>+  long i, tot = 0;</div><div class='add'>+  for (i=0;i&lt;size*3;i++)</div><div class='add'>+    tot += image[i];</div><div class='add'>+  *brightness = (128 - tot/(size*3))/3;</div><div class='add'>+  return !((tot/(size*3)) &gt;= 126 &amp;&amp; (tot/(size*3)) &lt;= 130);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char ** argv)</div><div class='add'>+{</div><div class='add'>+  int fd = open(FILE, O_RDONLY), f;</div><div class='add'>+  struct video_capability cap;</div><div class='add'>+  struct video_window win;</div><div class='add'>+  struct video_picture vpic;</div><div class='add'>+</div><div class='add'>+  unsigned char *buffer, *src;</div><div class='add'>+  int bpp = 24, r, g, b;</div><div class='add'>+  unsigned int i, src_depth;</div><div class='add'>+</div><div class='add'>+  if (fd &lt; 0) {</div><div class='add'>+    perror(FILE);</div><div class='add'>+    exit(1);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  if (ioctl(fd, VIDIOCGCAP, &amp;cap) &lt; 0) {</div><div class='add'>+    perror("VIDIOGCAP");</div><div class='add'>+    fprintf(stderr, "(" FILE " not a video4linux device?)\n");</div><div class='add'>+    close(fd);</div><div class='add'>+    exit(1);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  if (ioctl(fd, VIDIOCGWIN, &amp;win) &lt; 0) {</div><div class='add'>+    perror("VIDIOCGWIN");</div><div class='add'>+    close(fd);</div><div class='add'>+    exit(1);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  if (ioctl(fd, VIDIOCGPICT, &amp;vpic) &lt; 0) {</div><div class='add'>+    perror("VIDIOCGPICT");</div><div class='add'>+    close(fd);</div><div class='add'>+    exit(1);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  if (cap.type &amp; VID_TYPE_MONOCHROME) {</div><div class='add'>+    vpic.depth=8;</div><div class='add'>+    vpic.palette=VIDEO_PALETTE_GREY;    /* 8bit grey */</div><div class='add'>+    if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='add'>+      vpic.depth=6;</div><div class='add'>+      if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='add'>+	vpic.depth=4;</div><div class='add'>+	if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='add'>+	  fprintf(stderr, "Unable to find a supported capture format.\n");</div><div class='add'>+	  close(fd);</div><div class='add'>+	  exit(1);</div><div class='add'>+	}</div><div class='add'>+      }</div><div class='add'>+    }</div><div class='add'>+  } else {</div><div class='add'>+    vpic.depth=24;</div><div class='add'>+    vpic.palette=VIDEO_PALETTE_RGB24;</div><div class='add'>+</div><div class='add'>+    if(ioctl(fd, VIDIOCSPICT, &amp;vpic) &lt; 0) {</div><div class='add'>+      vpic.palette=VIDEO_PALETTE_RGB565;</div><div class='add'>+      vpic.depth=16;</div><div class='add'>+</div><div class='add'>+      if(ioctl(fd, VIDIOCSPICT, &amp;vpic)==-1) {</div><div class='add'>+	vpic.palette=VIDEO_PALETTE_RGB555;</div><div class='add'>+	vpic.depth=15;</div><div class='add'>+</div><div class='add'>+	if(ioctl(fd, VIDIOCSPICT, &amp;vpic)==-1) {</div><div class='add'>+	  fprintf(stderr, "Unable to find a supported capture format.\n");</div><div class='add'>+	  return -1;</div><div class='add'>+	}</div><div class='add'>+      }</div><div class='add'>+    }</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  buffer = malloc(win.width * win.height * bpp);</div><div class='add'>+  if (!buffer) {</div><div class='add'>+    fprintf(stderr, "Out of memory.\n");</div><div class='add'>+    exit(1);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  do {</div><div class='add'>+    int newbright;</div><div class='add'>+    read(fd, buffer, win.width * win.height * bpp);</div><div class='add'>+    f = get_brightness_adj(buffer, win.width * win.height, &amp;newbright);</div><div class='add'>+    if (f) {</div><div class='add'>+      vpic.brightness += (newbright &lt;&lt; 8);</div><div class='add'>+      if(ioctl(fd, VIDIOCSPICT, &amp;vpic)==-1) {</div><div class='add'>+	perror("VIDIOSPICT");</div><div class='add'>+	break;</div><div class='add'>+      }</div><div class='add'>+    }</div><div class='add'>+  } while (f);</div><div class='add'>+</div><div class='add'>+  fprintf(stdout, "P6\n%d %d 255\n", win.width, win.height);</div><div class='add'>+</div><div class='add'>+  src = buffer;</div><div class='add'>+</div><div class='add'>+  for (i = 0; i &lt; win.width * win.height; i++) {</div><div class='add'>+    READ_VIDEO_PIXEL(src, vpic.palette, src_depth, r, g, b);</div><div class='add'>+    fputc(r&gt;&gt;8, stdout);</div><div class='add'>+    fputc(g&gt;&gt;8, stdout);</div><div class='add'>+    fputc(b&gt;&gt;8, stdout);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  close(fd);</div><div class='add'>+  return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/video4linux/w9968cf.txt b/Documentation/video4linux/w9968cf.txt<br/>index 3b704f2aae6d..0d53ce774b01 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/w9968cf.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/w9968cf.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/w9968cf.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/w9968cf.txt</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> </div><div class='del'>-                   W996[87]CF JPEG USB Dual Mode Camera Chip</div><div class='del'>-                     Driver for Linux 2.6 (basic version)</div><div class='del'>-                   =========================================</div><div class='add'>+		   W996[87]CF JPEG USB Dual Mode Camera Chip</div><div class='add'>+		     Driver for Linux 2.6 (basic version)</div><div class='add'>+		   =========================================</div><div class='ctx'> </div><div class='del'>-                               - Documentation -</div><div class='add'>+			       - Documentation -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Index</div><div class='hunk'>@@ -188,57 +188,57 @@ Name:            ovmod_load</div><div class='ctx'> Type:            bool</div><div class='ctx'> Syntax:          &lt;0|1&gt;</div><div class='ctx'> Description:     Automatic 'ovcamchip' module loading: 0 disabled, 1 enabled.</div><div class='del'>-                 If enabled, 'insmod' searches for the required 'ovcamchip'</div><div class='del'>-                 module in the system, according to its configuration, and</div><div class='del'>-                 loads that module automatically. This action is performed as</div><div class='del'>-                 once soon as the 'w9968cf' module is loaded into memory.</div><div class='add'>+		 If enabled, 'insmod' searches for the required 'ovcamchip'</div><div class='add'>+		 module in the system, according to its configuration, and</div><div class='add'>+		 loads that module automatically. This action is performed as</div><div class='add'>+		 once soon as the 'w9968cf' module is loaded into memory.</div><div class='ctx'> Default:         1</div><div class='ctx'> Note:            The kernel must be compiled with the CONFIG_KMOD option</div><div class='del'>-                 enabled for the 'ovcamchip' module to be loaded and for</div><div class='del'>-                 this parameter to be present.</div><div class='add'>+		 enabled for the 'ovcamchip' module to be loaded and for</div><div class='add'>+		 this parameter to be present.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           simcams</div><div class='ctx'> Type:           int</div><div class='ctx'> Syntax:         &lt;n&gt;</div><div class='ctx'> Description:    Number of cameras allowed to stream simultaneously.</div><div class='del'>-                n may vary from 0 to 32.</div><div class='add'>+		n may vary from 0 to 32.</div><div class='ctx'> Default:        32</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           video_nr</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;-1|n[,...]&gt;</div><div class='ctx'> Description:    Specify V4L minor mode number.</div><div class='del'>-                -1 = use next available</div><div class='del'>-                 n = use minor number n</div><div class='del'>-                You can specify up to 32 cameras this way.</div><div class='del'>-                For example:</div><div class='del'>-                video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='del'>-                recognized camera and use auto for the first one and for every</div><div class='del'>-                other camera.</div><div class='add'>+		-1 = use next available</div><div class='add'>+		 n = use minor number n</div><div class='add'>+		You can specify up to 32 cameras this way.</div><div class='add'>+		For example:</div><div class='add'>+		video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='add'>+		recognized camera and use auto for the first one and for every</div><div class='add'>+		other camera.</div><div class='ctx'> Default:        -1</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           packet_size</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;n[,...]&gt;</div><div class='ctx'> Description:    Specify the maximum data payload size in bytes for alternate</div><div class='del'>-                settings, for each device. n is scaled between 63 and 1023.</div><div class='add'>+		settings, for each device. n is scaled between 63 and 1023.</div><div class='ctx'> Default:        1023</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           max_buffers</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;n[,...]&gt;</div><div class='ctx'> Description:    For advanced users.</div><div class='del'>-                Specify the maximum number of video frame buffers to allocate</div><div class='del'>-                for each device, from 2 to 32.</div><div class='add'>+		Specify the maximum number of video frame buffers to allocate</div><div class='add'>+		for each device, from 2 to 32.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           double_buffer</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Hardware double buffering: 0 disabled, 1 enabled.</div><div class='del'>-                It should be enabled if you want smooth video output: if you</div><div class='del'>-                obtain out of sync. video, disable it, or try to</div><div class='del'>-                decrease the 'clockdiv' module parameter value.</div><div class='add'>+		It should be enabled if you want smooth video output: if you</div><div class='add'>+		obtain out of sync. video, disable it, or try to</div><div class='add'>+		decrease the 'clockdiv' module parameter value.</div><div class='ctx'> Default:        1 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           clamping</div><div class='hunk'>@@ -251,9 +251,9 @@ Name:           filter_type</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1|2[,...]&gt;</div><div class='ctx'> Description:    Video filter type.</div><div class='del'>-                0 none, 1 (1-2-1) 3-tap filter, 2 (2-3-6-3-2) 5-tap filter.</div><div class='del'>-                The filter is used to reduce noise and aliasing artifacts</div><div class='del'>-                produced by the CCD or CMOS image sensor.</div><div class='add'>+		0 none, 1 (1-2-1) 3-tap filter, 2 (2-3-6-3-2) 5-tap filter.</div><div class='add'>+		The filter is used to reduce noise and aliasing artifacts</div><div class='add'>+		produced by the CCD or CMOS image sensor.</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           largeview</div><div class='hunk'>@@ -266,9 +266,9 @@ Name:           upscaling</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Software scaling (for non-compressed video only):</div><div class='del'>-                0 disabled, 1 enabled.</div><div class='del'>-                Disable it if you have a slow CPU or you don't have enough</div><div class='del'>-                memory.</div><div class='add'>+		0 disabled, 1 enabled.</div><div class='add'>+		Disable it if you have a slow CPU or you don't have enough</div><div class='add'>+		memory.</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> Note:           If 'w9968cf-vpp' is not present, this parameter is set to 0.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='hunk'>@@ -276,36 +276,36 @@ Name:           decompression</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1|2[,...]&gt;</div><div class='ctx'> Description:    Software video decompression:</div><div class='del'>-                0 = disables decompression</div><div class='del'>-                    (doesn't allow formats needing decompression).</div><div class='del'>-                1 = forces decompression</div><div class='del'>-                    (allows formats needing decompression only).</div><div class='del'>-                2 = allows any permitted formats.</div><div class='del'>-                Formats supporting (de)compressed video are YUV422P and</div><div class='del'>-                YUV420P/YUV420 in any resolutions where width and height are</div><div class='del'>-                multiples of 16.</div><div class='add'>+		0 = disables decompression</div><div class='add'>+		    (doesn't allow formats needing decompression).</div><div class='add'>+		1 = forces decompression</div><div class='add'>+		    (allows formats needing decompression only).</div><div class='add'>+		2 = allows any permitted formats.</div><div class='add'>+		Formats supporting (de)compressed video are YUV422P and</div><div class='add'>+		YUV420P/YUV420 in any resolutions where width and height are</div><div class='add'>+		multiples of 16.</div><div class='ctx'> Default:        2 for every device.</div><div class='ctx'> Note:           If 'w9968cf-vpp' is not present, forcing decompression is not</div><div class='del'>-                allowed; in this case this parameter is set to 2.</div><div class='add'>+		allowed; in this case this parameter is set to 2.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           force_palette</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|9|10|13|15|8|7|1|6|3|4|5[,...]&gt;</div><div class='ctx'> Description:    Force picture palette.</div><div class='del'>-                In order:</div><div class='del'>-                 0 = Off - allows any of the following formats:</div><div class='del'>-                 9 = UYVY    16 bpp - Original video, compression disabled</div><div class='del'>-                10 = YUV420  12 bpp - Original video, compression enabled</div><div class='del'>-                13 = YUV422P 16 bpp - Original video, compression enabled</div><div class='del'>-                15 = YUV420P 12 bpp - Original video, compression enabled</div><div class='del'>-                 8 = YUVY    16 bpp - Software conversion from UYVY</div><div class='del'>-                 7 = YUV422  16 bpp - Software conversion from UYVY</div><div class='del'>-                 1 = GREY     8 bpp - Software conversion from UYVY</div><div class='del'>-                 6 = RGB555  16 bpp - Software conversion from UYVY</div><div class='del'>-                 3 = RGB565  16 bpp - Software conversion from UYVY</div><div class='del'>-                 4 = RGB24   24 bpp - Software conversion from UYVY</div><div class='del'>-                 5 = RGB32   32 bpp - Software conversion from UYVY</div><div class='del'>-                When not 0, this parameter will override 'decompression'.</div><div class='add'>+		In order:</div><div class='add'>+		 0 = Off - allows any of the following formats:</div><div class='add'>+		 9 = UYVY    16 bpp - Original video, compression disabled</div><div class='add'>+		10 = YUV420  12 bpp - Original video, compression enabled</div><div class='add'>+		13 = YUV422P 16 bpp - Original video, compression enabled</div><div class='add'>+		15 = YUV420P 12 bpp - Original video, compression enabled</div><div class='add'>+		 8 = YUVY    16 bpp - Software conversion from UYVY</div><div class='add'>+		 7 = YUV422  16 bpp - Software conversion from UYVY</div><div class='add'>+		 1 = GREY     8 bpp - Software conversion from UYVY</div><div class='add'>+		 6 = RGB555  16 bpp - Software conversion from UYVY</div><div class='add'>+		 3 = RGB565  16 bpp - Software conversion from UYVY</div><div class='add'>+		 4 = RGB24   24 bpp - Software conversion from UYVY</div><div class='add'>+		 5 = RGB32   32 bpp - Software conversion from UYVY</div><div class='add'>+		When not 0, this parameter will override 'decompression'.</div><div class='ctx'> Default:        0 for every device. Initial palette is 9 (UYVY).</div><div class='ctx'> Note:           If 'w9968cf-vpp' is not present, this parameter is set to 9.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='hunk'>@@ -313,77 +313,77 @@ Name:           force_rgb</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Read RGB video data instead of BGR:</div><div class='del'>-                1 = use RGB component ordering.</div><div class='del'>-                0 = use BGR component ordering.</div><div class='del'>-                This parameter has effect when using RGBX palettes only.</div><div class='add'>+		1 = use RGB component ordering.</div><div class='add'>+		0 = use BGR component ordering.</div><div class='add'>+		This parameter has effect when using RGBX palettes only.</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           autobright</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Image sensor automatically changes brightness:</div><div class='del'>-                0 = no, 1 = yes</div><div class='add'>+		0 = no, 1 = yes</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           autoexp</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Image sensor automatically changes exposure:</div><div class='del'>-                0 = no, 1 = yes</div><div class='add'>+		0 = no, 1 = yes</div><div class='ctx'> Default:        1 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           lightfreq</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;50|60[,...]&gt;</div><div class='ctx'> Description:    Light frequency in Hz:</div><div class='del'>-                50 for European and Asian lighting, 60 for American lighting.</div><div class='add'>+		50 for European and Asian lighting, 60 for American lighting.</div><div class='ctx'> Default:        50 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           bandingfilter</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Banding filter to reduce effects of fluorescent</div><div class='del'>-                lighting:</div><div class='del'>-                0 disabled, 1 enabled.</div><div class='del'>-                This filter tries to reduce the pattern of horizontal</div><div class='del'>-                light/dark bands caused by some (usually fluorescent) lighting.</div><div class='add'>+		lighting:</div><div class='add'>+		0 disabled, 1 enabled.</div><div class='add'>+		This filter tries to reduce the pattern of horizontal</div><div class='add'>+		light/dark bands caused by some (usually fluorescent) lighting.</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           clockdiv</div><div class='ctx'> Type:           int array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;-1|n[,...]&gt;</div><div class='ctx'> Description:    Force pixel clock divisor to a specific value (for experts):</div><div class='del'>-                n may vary from 0 to 127.</div><div class='del'>-                -1 for automatic value.</div><div class='del'>-                See also the 'double_buffer' module parameter.</div><div class='add'>+		n may vary from 0 to 127.</div><div class='add'>+		-1 for automatic value.</div><div class='add'>+		See also the 'double_buffer' module parameter.</div><div class='ctx'> Default:        -1 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           backlight</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Objects are lit from behind:</div><div class='del'>-                0 = no, 1 = yes</div><div class='add'>+		0 = no, 1 = yes</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           mirror</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Reverse image horizontally:</div><div class='del'>-                0 = no, 1 = yes</div><div class='add'>+		0 = no, 1 = yes</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           monochrome</div><div class='ctx'> Type:           bool array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    The image sensor is monochrome:</div><div class='del'>-                0 = no, 1 = yes</div><div class='add'>+		0 = no, 1 = yes</div><div class='ctx'> Default:        0 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           brightness</div><div class='ctx'> Type:           long array (min = 0, max = 32)</div><div class='ctx'> Syntax:         &lt;n[,...]&gt;</div><div class='ctx'> Description:    Set picture brightness (0-65535).</div><div class='del'>-                This parameter has no effect if 'autobright' is enabled.</div><div class='add'>+		This parameter has no effect if 'autobright' is enabled.</div><div class='ctx'> Default:        31000 for every device.</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           hue</div><div class='hunk'>@@ -414,23 +414,23 @@ Name:           debug</div><div class='ctx'> Type:           int</div><div class='ctx'> Syntax:         &lt;n&gt;</div><div class='ctx'> Description:    Debugging information level, from 0 to 6:</div><div class='del'>-                0 = none (use carefully)</div><div class='del'>-                1 = critical errors</div><div class='del'>-                2 = significant informations</div><div class='del'>-                3 = configuration or general messages</div><div class='del'>-                4 = warnings</div><div class='del'>-                5 = called functions</div><div class='del'>-                6 = function internals</div><div class='del'>-                Level 5 and 6 are useful for testing only, when only one</div><div class='del'>-                device is used.</div><div class='add'>+		0 = none (use carefully)</div><div class='add'>+		1 = critical errors</div><div class='add'>+		2 = significant informations</div><div class='add'>+		3 = configuration or general messages</div><div class='add'>+		4 = warnings</div><div class='add'>+		5 = called functions</div><div class='add'>+		6 = function internals</div><div class='add'>+		Level 5 and 6 are useful for testing only, when only one</div><div class='add'>+		device is used.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           specific_debug</div><div class='ctx'> Type:           bool</div><div class='ctx'> Syntax:         &lt;0|1&gt;</div><div class='ctx'> Description:    Enable or disable specific debugging messages:</div><div class='del'>-                0 = print messages concerning every level &lt;= 'debug' level.</div><div class='del'>-                1 = print messages concerning the level indicated by 'debug'.</div><div class='add'>+		0 = print messages concerning every level &lt;= 'debug' level.</div><div class='add'>+		1 = print messages concerning the level indicated by 'debug'.</div><div class='ctx'> Default:        0</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/video4linux/zc0301.txt b/Documentation/video4linux/zc0301.txt<br/>index f55262c6733b..f406f5e80046 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/video4linux/zc0301.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/video4linux/zc0301.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/video4linux/zc0301.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/video4linux/zc0301.txt</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> </div><div class='del'>-                    ZC0301 Image Processor and Control Chip</div><div class='del'>-                                Driver for Linux</div><div class='del'>-                    =======================================</div><div class='add'>+	      ZC0301 and ZC0301P Image Processor and Control Chip</div><div class='add'>+				Driver for Linux</div><div class='add'>+	      ===================================================</div><div class='ctx'> </div><div class='del'>-                               - Documentation -</div><div class='add'>+			       - Documentation -</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Index</div><div class='hunk'>@@ -51,13 +51,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> </div><div class='ctx'> 4. Overview and features</div><div class='ctx'> ========================</div><div class='del'>-This driver supports the video interface of the devices mounting the ZC0301</div><div class='del'>-Image Processor and Control Chip.</div><div class='add'>+This driver supports the video interface of the devices mounting the ZC0301 or</div><div class='add'>+ZC0301P Image Processors and Control Chips.</div><div class='ctx'> </div><div class='ctx'> The driver relies on the Video4Linux2 and USB core modules. It has been</div><div class='ctx'> designed to run properly on SMP systems as well.</div><div class='ctx'> </div><div class='del'>-The latest version of the ZC0301 driver can be found at the following URL:</div><div class='add'>+The latest version of the ZC0301[P] driver can be found at the following URL:</div><div class='ctx'> http://www.linux-projects.org/</div><div class='ctx'> </div><div class='ctx'> Some of the features of the driver are:</div><div class='hunk'>@@ -117,7 +117,7 @@ supported by the USB Audio driver thanks to the ALSA API:</div><div class='ctx'> </div><div class='ctx'> And finally:</div><div class='ctx'> </div><div class='del'>-	# USB Multimedia devices</div><div class='add'>+	# V4L USB devices</div><div class='ctx'> 	#</div><div class='ctx'> 	CONFIG_USB_ZC0301=m</div><div class='ctx'> </div><div class='hunk'>@@ -146,46 +146,46 @@ Name:           video_nr</div><div class='ctx'> Type:           short array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;-1|n[,...]&gt;</div><div class='ctx'> Description:    Specify V4L2 minor mode number:</div><div class='del'>-                -1 = use next available</div><div class='del'>-                 n = use minor number n</div><div class='del'>-                You can specify up to 64 cameras this way.</div><div class='del'>-                For example:</div><div class='del'>-                video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='del'>-                registered camera and use auto for the first one and for every</div><div class='del'>-                other camera.</div><div class='add'>+		-1 = use next available</div><div class='add'>+		 n = use minor number n</div><div class='add'>+		You can specify up to 64 cameras this way.</div><div class='add'>+		For example:</div><div class='add'>+		video_nr=-1,2,-1 would assign minor number 2 to the second</div><div class='add'>+		registered camera and use auto for the first one and for every</div><div class='add'>+		other camera.</div><div class='ctx'> Default:        -1</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           force_munmap</div><div class='ctx'> Type:           bool array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;0|1[,...]&gt;</div><div class='ctx'> Description:    Force the application to unmap previously mapped buffer memory</div><div class='del'>-                before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not</div><div class='del'>-                all the applications support this feature. This parameter is</div><div class='del'>-                specific for each detected camera.</div><div class='del'>-                0 = do not force memory unmapping</div><div class='del'>-                1 = force memory unmapping (save memory)</div><div class='add'>+		before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not</div><div class='add'>+		all the applications support this feature. This parameter is</div><div class='add'>+		specific for each detected camera.</div><div class='add'>+		0 = do not force memory unmapping</div><div class='add'>+		1 = force memory unmapping (save memory)</div><div class='ctx'> Default:        0</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           frame_timeout</div><div class='ctx'> Type:           uint array (min = 0, max = 64)</div><div class='ctx'> Syntax:         &lt;n[,...]&gt;</div><div class='ctx'> Description:    Timeout for a video frame in seconds. This parameter is</div><div class='del'>-                specific for each detected camera. This parameter can be</div><div class='del'>-                changed at runtime thanks to the /sys filesystem interface.</div><div class='add'>+		specific for each detected camera. This parameter can be</div><div class='add'>+		changed at runtime thanks to the /sys filesystem interface.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> Name:           debug</div><div class='ctx'> Type:           ushort</div><div class='ctx'> Syntax:         &lt;n&gt;</div><div class='ctx'> Description:    Debugging information level, from 0 to 3:</div><div class='del'>-                0 = none (use carefully)</div><div class='del'>-                1 = critical errors</div><div class='del'>-                2 = significant informations</div><div class='del'>-                3 = more verbose messages</div><div class='del'>-                Level 3 is useful for testing only, when only one device</div><div class='del'>-                is used at the same time. It also shows some more informations</div><div class='del'>-                about the hardware being detected. This module parameter can be</div><div class='del'>-                changed at runtime thanks to the /sys filesystem interface.</div><div class='add'>+		0 = none (use carefully)</div><div class='add'>+		1 = critical errors</div><div class='add'>+		2 = significant informations</div><div class='add'>+		3 = more verbose messages</div><div class='add'>+		Level 3 is useful for testing only, when only one device</div><div class='add'>+		is used at the same time. It also shows some more informations</div><div class='add'>+		about the hardware being detected. This module parameter can be</div><div class='add'>+		changed at runtime thanks to the /sys filesystem interface.</div><div class='ctx'> Default:        2</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -204,11 +204,25 @@ Vendor ID  Product ID</div><div class='ctx'> 0x041e     0x4017</div><div class='ctx'> 0x041e     0x401c</div><div class='ctx'> 0x041e     0x401e</div><div class='add'>+0x041e     0x401f</div><div class='add'>+0x041e     0x4022</div><div class='ctx'> 0x041e     0x4034</div><div class='ctx'> 0x041e     0x4035</div><div class='add'>+0x041e     0x4036</div><div class='add'>+0x041e     0x403a</div><div class='add'>+0x0458     0x7007</div><div class='add'>+0x0458     0x700C</div><div class='add'>+0x0458     0x700f</div><div class='add'>+0x046d     0x08ae</div><div class='add'>+0x055f     0xd003</div><div class='add'>+0x055f     0xd004</div><div class='ctx'> 0x046d     0x08ae</div><div class='ctx'> 0x0ac8     0x0301</div><div class='add'>+0x0ac8     0x301b</div><div class='add'>+0x0ac8     0x303b</div><div class='add'>+0x10fd     0x0128</div><div class='ctx'> 0x10fd     0x8050</div><div class='add'>+0x10fd     0x804e</div><div class='ctx'> </div><div class='ctx'> The list above does not imply that all those devices work with this driver: up</div><div class='ctx'> until now only the ones that mount the following image sensors are supported;</div><div class='hunk'>@@ -217,6 +231,7 @@ kernel messages will always tell you whether this is the case:</div><div class='ctx'> Model       Manufacturer</div><div class='ctx'> -----       ------------</div><div class='ctx'> PAS202BCB   PixArt Imaging, Inc.</div><div class='add'>+PB-0330     Photobit Corporation</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 9. Notes for V4L2 application developers</div><div class='hunk'>@@ -250,5 +265,6 @@ the fingerprint is: '88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4'.</div><div class='ctx'>   been taken from the documentation of the ZC030x Video4Linux1 driver written</div><div class='ctx'>   by Andrew Birkett &lt;andy@nobugs.org&gt;;</div><div class='ctx'> - The initialization values of the ZC0301 controller connected to the PAS202BCB</div><div class='del'>-  image sensor have been taken from the SPCA5XX driver maintained by</div><div class='del'>-  Michel Xhaard &lt;mxhaard@magic.fr&gt;.</div><div class='add'>+  and PB-0330 image sensors have been taken from the SPCA5XX driver maintained</div><div class='add'>+  by Michel Xhaard &lt;mxhaard@magic.fr&gt;;</div><div class='add'>+- Stanislav Lechev donated one camera.</div><div class='head'>diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration<br/>index 0dd4ef30c361..99f89aa10169 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/vm/page_migration?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/vm/page_migration</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/vm/page_migration?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/vm/page_migration</a></div><div class='hunk'>@@ -26,8 +26,13 @@ a process are located. See also the numa_maps manpage in the numactl package.</div><div class='ctx'> Manual migration is useful if for example the scheduler has relocated</div><div class='ctx'> a process to a processor on a distant node. A batch scheduler or an</div><div class='ctx'> administrator may detect the situation and move the pages of the process</div><div class='del'>-nearer to the new processor. At some point in the future we may have</div><div class='del'>-some mechanism in the scheduler that will automatically move the pages.</div><div class='add'>+nearer to the new processor. The kernel itself does only provide</div><div class='add'>+manual page migration support. Automatic page migration may be implemented</div><div class='add'>+through user space processes that move pages. A special function call</div><div class='add'>+"move_pages" allows the moving of individual pages within a process.</div><div class='add'>+A NUMA profiler may f.e. obtain a log showing frequent off node</div><div class='add'>+accesses and may use the result to move pages to more advantageous</div><div class='add'>+locations.</div><div class='ctx'> </div><div class='ctx'> Larger installations usually partition the system using cpusets into</div><div class='ctx'> sections of nodes. Paul Jackson has equipped cpusets with the ability to</div><div class='hunk'>@@ -62,22 +67,14 @@ A. In kernel use of migrate_pages()</div><div class='ctx'>    It also prevents the swapper or other scans to encounter</div><div class='ctx'>    the page.</div><div class='ctx'> </div><div class='del'>-2. Generate a list of newly allocates page. These pages will contain the</div><div class='del'>-   contents of the pages from the first list after page migration is</div><div class='del'>-   complete.</div><div class='add'>+2. We need to have a function of type new_page_t that can be</div><div class='add'>+   passed to migrate_pages(). This function should figure out</div><div class='add'>+   how to allocate the correct new page given the old page.</div><div class='ctx'> </div><div class='ctx'> 3. The migrate_pages() function is called which attempts</div><div class='del'>-   to do the migration. It returns the moved pages in the</div><div class='del'>-   list specified as the third parameter and the failed</div><div class='del'>-   migrations in the fourth parameter. The first parameter</div><div class='del'>-   will contain the pages that could still be retried.</div><div class='del'>-</div><div class='del'>-4. The leftover pages of various types are returned</div><div class='del'>-   to the LRU using putback_to_lru_pages() or otherwise</div><div class='del'>-   disposed of. The pages will still have the refcount as</div><div class='del'>-   increased by isolate_lru_pages() if putback_to_lru_pages() is not</div><div class='del'>-   used! The kernel may want to handle the various cases of failures in</div><div class='del'>-   different ways.</div><div class='add'>+   to do the migration. It will call the function to allocate</div><div class='add'>+   the new page for each page that is considered for</div><div class='add'>+   moving.</div><div class='ctx'> </div><div class='ctx'> B. How migrate_pages() works</div><div class='ctx'> ----------------------------</div><div class='hunk'>@@ -93,83 +90,58 @@ Steps:</div><div class='ctx'> </div><div class='ctx'> 2. Insure that writeback is complete.</div><div class='ctx'> </div><div class='del'>-3. Make sure that the page has assigned swap cache entry if</div><div class='del'>-   it is an anonyous page. The swap cache reference is necessary</div><div class='del'>-   to preserve the information contain in the page table maps while</div><div class='del'>-   page migration occurs.</div><div class='del'>-</div><div class='del'>-4. Prep the new page that we want to move to. It is locked</div><div class='add'>+3. Prep the new page that we want to move to. It is locked</div><div class='ctx'>    and set to not being uptodate so that all accesses to the new</div><div class='ctx'>    page immediately lock while the move is in progress.</div><div class='ctx'> </div><div class='del'>-5. All the page table references to the page are either dropped (file</div><div class='del'>-   backed pages) or converted to swap references (anonymous pages).</div><div class='del'>-   This should decrease the reference count.</div><div class='add'>+4. The new page is prepped with some settings from the old page so that</div><div class='add'>+   accesses to the new page will discover a page with the correct settings.</div><div class='add'>+</div><div class='add'>+5. All the page table references to the page are converted</div><div class='add'>+   to migration entries or dropped (nonlinear vmas).</div><div class='add'>+   This decrease the mapcount of a page. If the resulting</div><div class='add'>+   mapcount is not zero then we do not migrate the page.</div><div class='add'>+   All user space processes that attempt to access the page</div><div class='add'>+   will now wait on the page lock.</div><div class='ctx'> </div><div class='ctx'> 6. The radix tree lock is taken. This will cause all processes trying</div><div class='del'>-   to reestablish a pte to block on the radix tree spinlock.</div><div class='add'>+   to access the page via the mapping to block on the radix tree spinlock.</div><div class='ctx'> </div><div class='ctx'> 7. The refcount of the page is examined and we back out if references remain</div><div class='ctx'>    otherwise we know that we are the only one referencing this page.</div><div class='ctx'> </div><div class='ctx'> 8. The radix tree is checked and if it does not contain the pointer to this</div><div class='del'>-   page then we back out because someone else modified the mapping first.</div><div class='del'>-</div><div class='del'>-9. The mapping is checked. If the mapping is gone then a truncate action may</div><div class='del'>-   be in progress and we back out.</div><div class='del'>-</div><div class='del'>-10. The new page is prepped with some settings from the old page so that</div><div class='del'>-   accesses to the new page will be discovered to have the correct settings.</div><div class='add'>+   page then we back out because someone else modified the radix tree.</div><div class='ctx'> </div><div class='del'>-11. The radix tree is changed to point to the new page.</div><div class='add'>+9. The radix tree is changed to point to the new page.</div><div class='ctx'> </div><div class='del'>-12. The reference count of the old page is dropped because the radix tree</div><div class='del'>-    reference is gone.</div><div class='add'>+10. The reference count of the old page is dropped because the radix tree</div><div class='add'>+    reference is gone. A reference to the new page is established because</div><div class='add'>+    the new page is referenced to by the radix tree.</div><div class='ctx'> </div><div class='del'>-13. The radix tree lock is dropped. With that lookups become possible again</div><div class='del'>-    and other processes will move from spinning on the tree lock to sleeping on</div><div class='del'>-    the locked new page.</div><div class='add'>+11. The radix tree lock is dropped. With that lookups in the mapping</div><div class='add'>+    become possible again. Processes will move from spinning on the tree_lock</div><div class='add'>+    to sleeping on the locked new page.</div><div class='ctx'> </div><div class='del'>-14. The page contents are copied to the new page.</div><div class='add'>+12. The page contents are copied to the new page.</div><div class='ctx'> </div><div class='del'>-15. The remaining page flags are copied to the new page.</div><div class='add'>+13. The remaining page flags are copied to the new page.</div><div class='ctx'> </div><div class='del'>-16. The old page flags are cleared to indicate that the page does</div><div class='del'>-    not use any information anymore.</div><div class='add'>+14. The old page flags are cleared to indicate that the page does</div><div class='add'>+    not provide any information anymore.</div><div class='ctx'> </div><div class='del'>-17. Queued up writeback on the new page is triggered.</div><div class='add'>+15. Queued up writeback on the new page is triggered.</div><div class='ctx'> </div><div class='del'>-18. If swap pte's were generated for the page then replace them with real</div><div class='del'>-    ptes. This will reenable access for processes not blocked by the page lock.</div><div class='add'>+16. If migration entries were page then replace them with real ptes. Doing</div><div class='add'>+    so will enable access for user space processes not already waiting for</div><div class='add'>+    the page lock.</div><div class='ctx'> </div><div class='ctx'> 19. The page locks are dropped from the old and new page.</div><div class='del'>-    Processes waiting on the page lock can continue.</div><div class='add'>+    Processes waiting on the page lock will redo their page faults</div><div class='add'>+    and will reach the new page.</div><div class='ctx'> </div><div class='ctx'> 20. The new page is moved to the LRU and can be scanned by the swapper</div><div class='ctx'>     etc again.</div><div class='ctx'> </div><div class='del'>-TODO list</div><div class='del'>----------</div><div class='del'>-</div><div class='del'>-- Page migration requires the use of swap handles to preserve the</div><div class='del'>-  information of the anonymous page table entries. This means that swap</div><div class='del'>-  space is reserved but never used. The maximum number of swap handles used</div><div class='del'>-  is determined by CHUNK_SIZE (see mm/mempolicy.c) per ongoing migration.</div><div class='del'>-  Reservation of pages could be avoided by having a special type of swap</div><div class='del'>-  handle that does not require swap space and that would only track the page</div><div class='del'>-  references. Something like that was proposed by Marcelo Tosatti in the</div><div class='del'>-  past (search for migration cache on lkml or linux-mm@kvack.org).</div><div class='del'>-</div><div class='del'>-- Page migration unmaps ptes for file backed pages and requires page</div><div class='del'>-  faults to reestablish these ptes. This could be optimized by somehow</div><div class='del'>-  recording the references before migration and then reestablish them later.</div><div class='del'>-  However, there are several locking challenges that have to be overcome</div><div class='del'>-  before this is possible.</div><div class='del'>-</div><div class='del'>-- Page migration generates read ptes for anonymous pages. Dirty page</div><div class='del'>-  faults are required to make the pages writable again. It may be possible</div><div class='del'>-  to generate a pte marked dirty if it is known that the page is dirty and</div><div class='del'>-  that this process has the only reference to that page.</div><div class='del'>-</div><div class='del'>-Christoph Lameter, March 8, 2006.</div><div class='add'>+Christoph Lameter, May 8, 2006.</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/w1/masters/ds2490 b/Documentation/w1/masters/ds2490<br/>new file mode 100644<br/>index 000000000000..44a4918bd7f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/w1/masters/ds2490?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/w1/masters/ds2490</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+Kernel driver ds2490</div><div class='add'>+====================</div><div class='add'>+</div><div class='add'>+Supported chips:</div><div class='add'>+  * Maxim DS2490 based</div><div class='add'>+</div><div class='add'>+Author: Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Description</div><div class='add'>+-----------</div><div class='add'>+</div><div class='add'>+The Maixm/Dallas Semiconductor DS2490 is a chip</div><div class='add'>+which allows to build USB &lt;-&gt; W1 bridges.</div><div class='add'>+</div><div class='add'>+DS9490(R) is a USB &lt;-&gt; W1 bus master device</div><div class='add'>+which has 0x81 family ID integrated chip and DS2490</div><div class='add'>+low-level operational chip.</div><div class='head'>diff --git a/Documentation/w1/w1.generic b/Documentation/w1/w1.generic<br/>index f937fbe1cacb..4c6509dd4789 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/w1/w1.generic?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/w1/w1.generic</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/w1/w1.generic?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/w1/w1.generic</a></div><div class='hunk'>@@ -27,8 +27,19 @@ When a w1 master driver registers with the w1 subsystem, the following occurs:</div><div class='ctx'> </div><div class='ctx'> When a device is found on the bus, w1 core checks if driver for it's family is</div><div class='ctx'> loaded. If so, the family driver is attached to the slave.</div><div class='del'>-If there is no driver for the family, a simple sysfs entry is created</div><div class='del'>-for the slave device.</div><div class='add'>+If there is no driver for the family, default one is assigned, which allows to perform</div><div class='add'>+almost any kind of operations. Each logical operation is a transaction</div><div class='add'>+in nature, which can contain several (two or one) low-level operations.</div><div class='add'>+Let's see how one can read EEPROM context:</div><div class='add'>+1. one must write control buffer, i.e. buffer containing command byte</div><div class='add'>+and two byte address. At this step bus is reset and appropriate device</div><div class='add'>+is selected using either W1_SKIP_ROM or W1_MATCH_ROM command.</div><div class='add'>+Then provided control buffer is being written to the wire.</div><div class='add'>+2. reading. This will issue reading eeprom response.</div><div class='add'>+</div><div class='add'>+It is possible that between 1. and 2. w1 master thread will reset bus for searching</div><div class='add'>+and slave device will be even removed, but in this case 0xff will</div><div class='add'>+be read, since no device was selected.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> W1 device families</div><div class='hunk'>@@ -89,4 +100,5 @@ driver             - (standard) symlink to the w1 driver</div><div class='ctx'> name               - the device name, usually the same as the directory name</div><div class='ctx'> w1_slave           - (optional) a binary file whose meaning depends on the</div><div class='ctx'>                      family driver</div><div class='del'>-</div><div class='add'>+rw		   - (optional) created for slave devices which do not have</div><div class='add'>+		     appropriate family driver. Allows to read/write binary data.</div><div class='head'>diff --git a/Documentation/w1/w1.netlink b/Documentation/w1/w1.netlink<br/>new file mode 100644<br/>index 000000000000..3640c7c87d45<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/w1/w1.netlink?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/w1/w1.netlink</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+Userspace communication protocol over connector [1].</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Message types.</div><div class='add'>+=============</div><div class='add'>+</div><div class='add'>+There are three types of messages between w1 core and userspace:</div><div class='add'>+1. Events. They are generated each time new master or slave device found</div><div class='add'>+	either due to automatic or requested search.</div><div class='add'>+2. Userspace commands. Includes read/write and search/alarm search comamnds.</div><div class='add'>+3. Replies to userspace commands.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Protocol.</div><div class='add'>+========</div><div class='add'>+</div><div class='add'>+[struct cn_msg] - connector header. It's length field is equal to size of the attached data.</div><div class='add'>+[struct w1_netlink_msg] - w1 netlink header.</div><div class='add'>+	__u8 type 	- message type.</div><div class='add'>+			W1_SLAVE_ADD/W1_SLAVE_REMOVE - slave add/remove events.</div><div class='add'>+			W1_MASTER_ADD/W1_MASTER_REMOVE - master add/remove events.</div><div class='add'>+			W1_MASTER_CMD - userspace command for bus master device (search/alarm search).</div><div class='add'>+			W1_SLAVE_CMD - userspace command for slave device (read/write/ search/alarm search</div><div class='add'>+					for bus master device where given slave device found).</div><div class='add'>+	__u8 res	- reserved</div><div class='add'>+	__u16 len	- size of attached to this header data.</div><div class='add'>+	union {</div><div class='add'>+		__u8 id;			 - slave unique device id</div><div class='add'>+		struct w1_mst {</div><div class='add'>+			__u32		id;	 - master's id.</div><div class='add'>+			__u32		res;	 - reserved</div><div class='add'>+		} mst;</div><div class='add'>+	} id;</div><div class='add'>+</div><div class='add'>+[strucrt w1_netlink_cmd] - command for gived master or slave device.</div><div class='add'>+	__u8 cmd	- command opcode.</div><div class='add'>+			W1_CMD_READ 	- read command.</div><div class='add'>+			W1_CMD_WRITE	- write command.</div><div class='add'>+			W1_CMD_SEARCH	- search command.</div><div class='add'>+			W1_CMD_ALARM_SEARCH - alarm search command.</div><div class='add'>+	__u8 res	- reserved</div><div class='add'>+	__u16 len	- length of data for this command.</div><div class='add'>+			For read command data must be allocated like for write command.</div><div class='add'>+	__u8 data[0]	- data for this command.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Each connector message can include one or more w1_netlink_msg with zero of more attached w1_netlink_cmd messages.</div><div class='add'>+</div><div class='add'>+For event messages there are no w1_netlink_cmd embedded structures, only connector header</div><div class='add'>+and w1_netlink_msg strucutre with "len" field being zero and filled type (one of event types)</div><div class='add'>+and id - either 8 bytes of slave unique id in host order, or master's id, which is assigned</div><div class='add'>+to bus master device when it is added to w1 core.</div><div class='add'>+</div><div class='add'>+Currently replies to userspace commands are only generated for read command request.</div><div class='add'>+One reply is generated exactly for one w1_netlink_cmd read request.</div><div class='add'>+Replies are not combined when sent - i.e. typical reply messages looks like the following:</div><div class='add'>+[cn_msg][w1_netlink_msg][w1_netlink_cmd]</div><div class='add'>+cn_msg.len = sizeof(struct w1_netlink_msg) + sizeof(struct w1_netlink_cmd) + cmd-&gt;len;</div><div class='add'>+w1_netlink_msg.len = sizeof(struct w1_netlink_cmd) + cmd-&gt;len;</div><div class='add'>+w1_netlink_cmd.len = cmd-&gt;len;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Operation steps in w1 core when new command is received.</div><div class='add'>+=======================================================</div><div class='add'>+</div><div class='add'>+When new message (w1_netlink_msg) is received w1 core detects if it is master of slave request,</div><div class='add'>+according to w1_netlink_msg.type field.</div><div class='add'>+Then master or slave device is searched for.</div><div class='add'>+When found, master device (requested or those one on where slave device is found) is locked.</div><div class='add'>+If slave command is requested, then reset/select procedure is started to select given device.</div><div class='add'>+</div><div class='add'>+Then all requested in w1_netlink_msg operations are performed one by one.</div><div class='add'>+If command requires reply (like read command) it is sent on command completion.</div><div class='add'>+</div><div class='add'>+When all commands (w1_netlink_cmd) are processed muster device is unlocked</div><div class='add'>+and next w1_netlink_msg header processing started.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Connector [1] specific documentation.</div><div class='add'>+====================================</div><div class='add'>+</div><div class='add'>+Each connector message includes two u32 fields as "address".</div><div class='add'>+w1 uses CN_W1_IDX and CN_W1_VAL defined in include/linux/connector.h header.</div><div class='add'>+Each message also includes sequence and acknowledge numbers.</div><div class='add'>+Sequence number for event messages is appropriate bus master sequence number increased with</div><div class='add'>+each event message sent "through" this master.</div><div class='add'>+Sequence number for userspace requests is set by userspace application.</div><div class='add'>+Sequence number for reply is the same as was in request, and</div><div class='add'>+acknowledge number is set to seq+1.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Additional documantion, source code examples.</div><div class='add'>+============================================</div><div class='add'>+</div><div class='add'>+1. Documentation/connector</div><div class='add'>+2. http://tservice.net.ru/~s0mbre/archive/w1</div><div class='add'>+This archive includes userspace application w1d.c which</div><div class='add'>+uses read/write/search commands for all master/slave devices found on the bus.</div><div class='head'>diff --git a/Documentation/watchdog/pcwd-watchdog.txt b/Documentation/watchdog/pcwd-watchdog.txt<br/>index 12187a33e310..d9ee6336c1d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/watchdog/pcwd-watchdog.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/pcwd-watchdog.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/pcwd-watchdog.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/watchdog/pcwd-watchdog.txt</a></div><div class='hunk'>@@ -22,78 +22,9 @@</div><div class='ctx'>  to run the program with an "&amp;" to run it in the background!)</div><div class='ctx'> </div><div class='ctx'>  If you want to write a program to be compatible with the PC Watchdog</div><div class='del'>- driver, simply do the following:</div><div class='del'>-</div><div class='del'>--- Snippet of code --</div><div class='del'>-/*</div><div class='del'>- * Watchdog Driver Test Program</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/watchdog.h&gt;</div><div class='del'>-</div><div class='del'>-int fd;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function simply sends an IOCTL to the driver, which in turn ticks</div><div class='del'>- * the PC Watchdog card to reset its internal timer so it doesn't trigger</div><div class='del'>- * a computer reset.</div><div class='del'>- */</div><div class='del'>-void keep_alive(void)</div><div class='del'>-{</div><div class='del'>-    int dummy;</div><div class='del'>-</div><div class='del'>-    ioctl(fd, WDIOC_KEEPALIVE, &amp;dummy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The main program.  Run the program with "-d" to disable the card,</div><div class='del'>- * or "-e" to enable the card.</div><div class='del'>- */</div><div class='del'>-int main(int argc, char *argv[])</div><div class='del'>-{</div><div class='del'>-    fd = open("/dev/watchdog", O_WRONLY);</div><div class='del'>-</div><div class='del'>-    if (fd == -1) {</div><div class='del'>-	fprintf(stderr, "Watchdog device not enabled.\n");</div><div class='del'>-	fflush(stderr);</div><div class='del'>-	exit(-1);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (argc &gt; 1) {</div><div class='del'>-	if (!strncasecmp(argv[1], "-d", 2)) {</div><div class='del'>-	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_DISABLECARD);</div><div class='del'>-	    fprintf(stderr, "Watchdog card disabled.\n");</div><div class='del'>-	    fflush(stderr);</div><div class='del'>-	    exit(0);</div><div class='del'>-	} else if (!strncasecmp(argv[1], "-e", 2)) {</div><div class='del'>-	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_ENABLECARD);</div><div class='del'>-	    fprintf(stderr, "Watchdog card enabled.\n");</div><div class='del'>-	    fflush(stderr);</div><div class='del'>-	    exit(0);</div><div class='del'>-	} else {</div><div class='del'>-	    fprintf(stderr, "-d to disable, -e to enable.\n");</div><div class='del'>-	    fprintf(stderr, "run by itself to tick the card.\n");</div><div class='del'>-	    fflush(stderr);</div><div class='del'>-	    exit(0);</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	fprintf(stderr, "Watchdog Ticking Away!\n");</div><div class='del'>-	fflush(stderr);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    while(1) {</div><div class='del'>-	keep_alive();</div><div class='del'>-	sleep(1);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>--- End snippet --</div><div class='add'>+ driver, simply use of modify the watchdog test program:</div><div class='add'>+ Documentation/watchdog/src/watchdog-test.c</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'>  Other IOCTL functions include:</div><div class='ctx'> </div><div class='head'>diff --git a/Documentation/watchdog/src/watchdog-simple.c b/Documentation/watchdog/src/watchdog-simple.c<br/>new file mode 100644<br/>index 000000000000..85cf17c48669<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/src/watchdog-simple.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/watchdog/src/watchdog-simple.c</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+</div><div class='add'>+int main(int argc, const char *argv[]) {</div><div class='add'>+	int fd = open("/dev/watchdog", O_WRONLY);</div><div class='add'>+	if (fd == -1) {</div><div class='add'>+		perror("watchdog");</div><div class='add'>+		exit(1);</div><div class='add'>+	}</div><div class='add'>+	while (1) {</div><div class='add'>+		write(fd, "\0", 1);</div><div class='add'>+		fsync(fd);</div><div class='add'>+		sleep(10);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/watchdog/src/watchdog-test.c b/Documentation/watchdog/src/watchdog-test.c<br/>new file mode 100644<br/>index 000000000000..65f6c19cb865<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/src/watchdog-test.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/watchdog/src/watchdog-test.c</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * Watchdog Driver Test Program</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/watchdog.h&gt;</div><div class='add'>+</div><div class='add'>+int fd;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function simply sends an IOCTL to the driver, which in turn ticks</div><div class='add'>+ * the PC Watchdog card to reset its internal timer so it doesn't trigger</div><div class='add'>+ * a computer reset.</div><div class='add'>+ */</div><div class='add'>+void keep_alive(void)</div><div class='add'>+{</div><div class='add'>+    int dummy;</div><div class='add'>+</div><div class='add'>+    ioctl(fd, WDIOC_KEEPALIVE, &amp;dummy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The main program.  Run the program with "-d" to disable the card,</div><div class='add'>+ * or "-e" to enable the card.</div><div class='add'>+ */</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+    fd = open("/dev/watchdog", O_WRONLY);</div><div class='add'>+</div><div class='add'>+    if (fd == -1) {</div><div class='add'>+	fprintf(stderr, "Watchdog device not enabled.\n");</div><div class='add'>+	fflush(stderr);</div><div class='add'>+	exit(-1);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (argc &gt; 1) {</div><div class='add'>+	if (!strncasecmp(argv[1], "-d", 2)) {</div><div class='add'>+	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_DISABLECARD);</div><div class='add'>+	    fprintf(stderr, "Watchdog card disabled.\n");</div><div class='add'>+	    fflush(stderr);</div><div class='add'>+	    exit(0);</div><div class='add'>+	} else if (!strncasecmp(argv[1], "-e", 2)) {</div><div class='add'>+	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_ENABLECARD);</div><div class='add'>+	    fprintf(stderr, "Watchdog card enabled.\n");</div><div class='add'>+	    fflush(stderr);</div><div class='add'>+	    exit(0);</div><div class='add'>+	} else {</div><div class='add'>+	    fprintf(stderr, "-d to disable, -e to enable.\n");</div><div class='add'>+	    fprintf(stderr, "run by itself to tick the card.\n");</div><div class='add'>+	    fflush(stderr);</div><div class='add'>+	    exit(0);</div><div class='add'>+	}</div><div class='add'>+    } else {</div><div class='add'>+	fprintf(stderr, "Watchdog Ticking Away!\n");</div><div class='add'>+	fflush(stderr);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    while(1) {</div><div class='add'>+	keep_alive();</div><div class='add'>+	sleep(1);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='head'>diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt<br/>index 21ed51173662..958ff3d48be3 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/watchdog/watchdog-api.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/watchdog-api.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/watchdog-api.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/watchdog/watchdog-api.txt</a></div><div class='hunk'>@@ -34,22 +34,7 @@ activates as soon as /dev/watchdog is opened and will reboot unless</div><div class='ctx'> the watchdog is pinged within a certain time, this time is called the</div><div class='ctx'> timeout or margin.  The simplest way to ping the watchdog is to write</div><div class='ctx'> some data to the device.  So a very simple watchdog daemon would look</div><div class='del'>-like this:</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-int main(int argc, const char *argv[]) {</div><div class='del'>-	int fd=open("/dev/watchdog",O_WRONLY);</div><div class='del'>-	if (fd==-1) {</div><div class='del'>-		perror("watchdog");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-	while(1) {</div><div class='del'>-		write(fd, "\0", 1);</div><div class='del'>-		sleep(10);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+like this source file:  see Documentation/watchdog/src/watchdog-simple.c</div><div class='ctx'> </div><div class='ctx'> A more advanced driver could for example check that a HTTP server is</div><div class='ctx'> still responding before doing the write call to ping the watchdog.</div><div class='hunk'>@@ -110,7 +95,40 @@ current timeout using the GETTIMEOUT ioctl.</div><div class='ctx'>     ioctl(fd, WDIOC_GETTIMEOUT, &amp;timeout);</div><div class='ctx'>     printf("The timeout was is %d seconds\n", timeout);</div><div class='ctx'> </div><div class='del'>-Envinronmental monitoring:</div><div class='add'>+Pretimeouts:</div><div class='add'>+</div><div class='add'>+Some watchdog timers can be set to have a trigger go off before the</div><div class='add'>+actual time they will reset the system.  This can be done with an NMI,</div><div class='add'>+interrupt, or other mechanism.  This allows Linux to record useful</div><div class='add'>+information (like panic information and kernel coredumps) before it</div><div class='add'>+resets.</div><div class='add'>+</div><div class='add'>+    pretimeout = 10;</div><div class='add'>+    ioctl(fd, WDIOC_SETPRETIMEOUT, &amp;pretimeout);</div><div class='add'>+</div><div class='add'>+Note that the pretimeout is the number of seconds before the time</div><div class='add'>+when the timeout will go off.  It is not the number of seconds until</div><div class='add'>+the pretimeout.  So, for instance, if you set the timeout to 60 seconds</div><div class='add'>+and the pretimeout to 10 seconds, the pretimout will go of in 50</div><div class='add'>+seconds.  Setting a pretimeout to zero disables it.</div><div class='add'>+</div><div class='add'>+There is also a get function for getting the pretimeout:</div><div class='add'>+</div><div class='add'>+    ioctl(fd, WDIOC_GETPRETIMEOUT, &amp;timeout);</div><div class='add'>+    printf("The pretimeout was is %d seconds\n", timeout);</div><div class='add'>+</div><div class='add'>+Not all watchdog drivers will support a pretimeout.</div><div class='add'>+</div><div class='add'>+Get the number of seconds before reboot:</div><div class='add'>+</div><div class='add'>+Some watchdog drivers have the ability to report the remaining time</div><div class='add'>+before the system will reboot. The WDIOC_GETTIMELEFT is the ioctl</div><div class='add'>+that returns the number of seconds before reboot.</div><div class='add'>+</div><div class='add'>+    ioctl(fd, WDIOC_GETTIMELEFT, &amp;timeleft);</div><div class='add'>+    printf("The timeout was is %d seconds\n", timeleft);</div><div class='add'>+</div><div class='add'>+Environmental monitoring:</div><div class='ctx'> </div><div class='ctx'> All watchdog drivers are required return more information about the system,</div><div class='ctx'> some do temperature, fan and power level monitoring, some can tell you</div><div class='hunk'>@@ -169,6 +187,10 @@ The watchdog saw a keepalive ping since it was last queried.</div><div class='ctx'> </div><div class='ctx'> 	WDIOF_SETTIMEOUT	Can set/get the timeout</div><div class='ctx'> </div><div class='add'>+The watchdog can do pretimeouts.</div><div class='add'>+</div><div class='add'>+	WDIOF_PRETIMEOUT	Pretimeout (in seconds), get/set</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> For those drivers that return any bits set in the option field, the</div><div class='ctx'> GETSTATUS and GETBOOTSTATUS ioctls can be used to ask for the current</div><div class='head'>diff --git a/Documentation/watchdog/watchdog.txt b/Documentation/watchdog/watchdog.txt<br/>index dffda29c8799..4b1ff69cc19a 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/watchdog/watchdog.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/watchdog/watchdog.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/watchdog/watchdog.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/watchdog/watchdog.txt</a></div><div class='hunk'>@@ -65,28 +65,7 @@ The external event interfaces on the WDT boards are not currently supported.</div><div class='ctx'> Minor numbers are however allocated for it.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-Example Watchdog Driver</div><div class='del'>------------------------</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-int main(int argc, const char *argv[])</div><div class='del'>-{</div><div class='del'>-	int fd=open("/dev/watchdog",O_WRONLY);</div><div class='del'>-	if(fd==-1)</div><div class='del'>-	{</div><div class='del'>-		perror("watchdog");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-	while(1)</div><div class='del'>-	{</div><div class='del'>-		write(fd,"\0",1);</div><div class='del'>-		fsync(fd);</div><div class='del'>-		sleep(10);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+Example Watchdog Driver:  see Documentation/watchdog/src/watchdog-simple.c</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> Contact Information</div><div class='head'>diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt<br/>index f2cd6ef53ff3..6887d44d2661 100644<br/>--- a/<a href='/cgit/linux.git/tree/Documentation/x86_64/boot-options.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Documentation/x86_64/boot-options.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/Documentation/x86_64/boot-options.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Documentation/x86_64/boot-options.txt</a></div><div class='hunk'>@@ -205,6 +205,27 @@ IOMMU</div><div class='ctx'>   pages  Prereserve that many 128K pages for the software IO bounce buffering.</div><div class='ctx'>   force  Force all IO through the software TLB.</div><div class='ctx'> </div><div class='add'>+  calgary=[64k,128k,256k,512k,1M,2M,4M,8M]</div><div class='add'>+  calgary=[translate_empty_slots]</div><div class='add'>+  calgary=[disable=&lt;PCI bus number&gt;]</div><div class='add'>+</div><div class='add'>+    64k,...,8M - Set the size of each PCI slot's translation table</div><div class='add'>+    when using the Calgary IOMMU. This is the size of the translation</div><div class='add'>+    table itself in main memory. The smallest table, 64k, covers an IO</div><div class='add'>+    space of 32MB; the largest, 8MB table, can cover an IO space of</div><div class='add'>+    4GB. Normally the kernel will make the right choice by itself.</div><div class='add'>+</div><div class='add'>+    translate_empty_slots - Enable translation even on slots that have</div><div class='add'>+    no devices attached to them, in case a device will be hotplugged</div><div class='add'>+    in the future.</div><div class='add'>+</div><div class='add'>+    disable=&lt;PCI bus number&gt; - Disable translation on a given PHB. For</div><div class='add'>+    example, the built-in graphics adapter resides on the first bridge</div><div class='add'>+    (PCI bus number 0); if translation (isolation) is enabled on this</div><div class='add'>+    bridge, X servers that access the hardware directly from user</div><div class='add'>+    space might stop working. Use this option if you have devices that</div><div class='add'>+    are accessed from userspace directly on some PCI host bridge.</div><div class='add'>+</div><div class='ctx'> Debugging</div><div class='ctx'> </div><div class='ctx'>   oops=panic Always panic on oopses. Default is to just kill the process,</div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>index 74d71cafb17c..e99028ca2f7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/MAINTAINERS?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>MAINTAINERS</a><br/>+++ b/<a href='/cgit/linux.git/tree/MAINTAINERS?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>MAINTAINERS</a></div><div class='hunk'>@@ -181,6 +181,12 @@ M:	bcrl@kvack.org</div><div class='ctx'> L:	linux-aio@kvack.org</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+ABIT UGURU HARDWARE MONITOR DRIVER</div><div class='add'>+P:	Hans de Goede</div><div class='add'>+M:	j.w.r.degoede@hhs.nl</div><div class='add'>+L:	lm-sensors@lm-sensors.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ACENIC DRIVER</div><div class='ctx'> P:	Jes Sorensen</div><div class='ctx'> M:	jes@trained-monkey.org</div><div class='hunk'>@@ -268,7 +274,7 @@ S:	Maintained</div><div class='ctx'> ALI1563 I2C DRIVER</div><div class='ctx'> P:	Rudolf Marek</div><div class='ctx'> M:	r.marek@sh.cvut.cz</div><div class='del'>-L:	lm-sensors@lm-sensors.org</div><div class='add'>+L:	i2c@lm-sensors.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> ALPHA PORT</div><div class='hunk'>@@ -568,6 +574,24 @@ L:	linuxppc-dev@ozlabs.org</div><div class='ctx'> W:	http://www.penguinppc.org/ppc64/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='add'>+BROADCOM B44 10/100 ETHERNET DRIVER</div><div class='add'>+P:	Gary Zambrano</div><div class='add'>+M:	zambrano@broadcom.com</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='add'>+BROADCOM BNX2 GIGABIT ETHERNET DRIVER</div><div class='add'>+P:	Michael Chan</div><div class='add'>+M:	mchan@broadcom.com</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='add'>+BROADCOM TG3 GIGABIT ETHERNET DRIVER</div><div class='add'>+P:	Michael Chan</div><div class='add'>+M:	mchan@broadcom.com</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> BTTV VIDEO4LINUX DRIVER</div><div class='ctx'> P:	Mauro Carvalho Chehab</div><div class='ctx'> M:	mchehab@infradead.org</div><div class='hunk'>@@ -577,6 +601,15 @@ W:	http://linuxtv.org</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+CALGARY x86-64 IOMMU</div><div class='add'>+P:	Muli Ben-Yehuda</div><div class='add'>+M:	muli@il.ibm.com</div><div class='add'>+P:	Jon D. Mason</div><div class='add'>+M:	jdmason@us.ibm.com</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+L:	discuss@x86-64.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> COMMON INTERNET FILE SYSTEM (CIFS)</div><div class='ctx'> P:	Steve French</div><div class='ctx'> M:	sfrench@samba.org</div><div class='hunk'>@@ -738,6 +771,7 @@ M:	aliakc@web.de</div><div class='ctx'> P:	Jamie Lenehan</div><div class='ctx'> M:	lenehan@twibble.org</div><div class='ctx'> W:	http://twibble.org/dist/dc395x/</div><div class='add'>+L:	dc395x@twibble.org</div><div class='ctx'> L:	http://lists.twibble.org/mailman/listinfo/dc395x/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -837,6 +871,8 @@ S:	Maintained</div><div class='ctx'> DOCBOOK FOR DOCUMENTATION</div><div class='ctx'> P:	Martin Waitz</div><div class='ctx'> M:	tali@admingilde.org</div><div class='add'>+P:	Randy Dunlap</div><div class='add'>+M:	rdunlap@xenotime.net</div><div class='ctx'> T:	git http://tali.admingilde.org/git/linux-docbook.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -901,23 +937,21 @@ S:	Maintained</div><div class='ctx'> </div><div class='ctx'> EDAC-CORE</div><div class='ctx'> P:	Doug Thompson</div><div class='del'>-M:	norsk5@xmission.com, dthompson@linuxnetworx.com</div><div class='del'>-P:	Dave Peterson</div><div class='del'>-M:	dsp@llnl.gov, dave_peterson@pobox.com</div><div class='add'>+M:	norsk5@xmission.com</div><div class='ctx'> L:	bluesmoke-devel@lists.sourceforge.net</div><div class='ctx'> W:	bluesmoke.sourceforge.net</div><div class='del'>-S:	Maintained</div><div class='add'>+S:	Supported</div><div class='ctx'> </div><div class='ctx'> EDAC-E752X</div><div class='del'>-P:	Dave Peterson</div><div class='del'>-M:	dsp@llnl.gov, dave_peterson@pobox.com</div><div class='add'>+P:	Mark Gross</div><div class='add'>+M:	mark.gross@intel.com</div><div class='ctx'> L:	bluesmoke-devel@lists.sourceforge.net</div><div class='ctx'> W:	bluesmoke.sourceforge.net</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> EDAC-E7XXX</div><div class='del'>-P:	Dave Peterson</div><div class='del'>-M:	dsp@llnl.gov, dave_peterson@pobox.com</div><div class='add'>+P:	Doug Thompson</div><div class='add'>+M:	norsk5@xmission.com</div><div class='ctx'> L:	bluesmoke-devel@lists.sourceforge.net</div><div class='ctx'> W:	bluesmoke.sourceforge.net</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1094,6 +1128,11 @@ L:	lm-sensors@lm-sensors.org</div><div class='ctx'> W:	http://www.lm-sensors.nu/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+HARDWARE RANDOM NUMBER GENERATOR CORE</div><div class='add'>+P:	Michael Buesch</div><div class='add'>+M:	mb@bu3sch.de</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER</div><div class='ctx'> P:	Robert Love</div><div class='ctx'> M:	rlove@rlove.org</div><div class='hunk'>@@ -1135,6 +1174,12 @@ L:	linux-hams@vger.kernel.org</div><div class='ctx'> W:	http://www.nt.tuwien.ac.at/~kkudielk/Linux/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+HIGHPOINT ROCKETRAID 3xxx RAID DRIVER</div><div class='add'>+P:	HighPoint Linux Team</div><div class='add'>+M:	linux@highpoint-tech.com</div><div class='add'>+W:	http://www.highpoint-tech.com</div><div class='add'>+S:	Supported</div><div class='add'>+</div><div class='ctx'> HIPPI</div><div class='ctx'> P:	Jes Sorensen</div><div class='ctx'> M:	jes@trained-monkey.org</div><div class='hunk'>@@ -1205,7 +1250,7 @@ S:	Maintained</div><div class='ctx'> I2C SUBSYSTEM</div><div class='ctx'> P:	Jean Delvare</div><div class='ctx'> M:	khali@linux-fr.org</div><div class='del'>-L:	lm-sensors@lm-sensors.org</div><div class='add'>+L:	i2c@lm-sensors.org</div><div class='ctx'> W:	http://www.lm-sensors.nu/</div><div class='ctx'> T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -1366,7 +1411,8 @@ S:	Supported</div><div class='ctx'> </div><div class='ctx'> INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS</div><div class='ctx'> P:	Dmitry Torokhov</div><div class='del'>-M:	dtor_core@ameritech.net</div><div class='add'>+M:	dmitry.torokhov@gmail.com</div><div class='add'>+M:	dtor@mail.ru</div><div class='ctx'> L:	linux-input@atrey.karlin.mff.cuni.cz</div><div class='ctx'> L:	linux-joystick@atrey.karlin.mff.cuni.cz</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git</div><div class='hunk'>@@ -1406,6 +1452,11 @@ P:	Tigran Aivazian</div><div class='ctx'> M:	tigran@veritas.com</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT</div><div class='add'>+P:	Deepak Saxena</div><div class='add'>+M:	dsaxena@plexity.net</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> INTEL PRO/100 ETHERNET SUPPORT</div><div class='ctx'> P:	John Ronciak</div><div class='ctx'> M:	john.ronciak@intel.com</div><div class='hunk'>@@ -1413,6 +1464,8 @@ P:	Jesse Brandeburg</div><div class='ctx'> M:	jesse.brandeburg@intel.com</div><div class='ctx'> P:	Jeff Kirsher</div><div class='ctx'> M:	jeffrey.t.kirsher@intel.com</div><div class='add'>+P:	Auke Kok</div><div class='add'>+M:	auke-jan.h.kok@intel.com</div><div class='ctx'> W:	http://sourceforge.net/projects/e1000/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='hunk'>@@ -1425,6 +1478,8 @@ P:	Jesse Brandeburg</div><div class='ctx'> M:	jesse.brandeburg@intel.com</div><div class='ctx'> P:	Jeff Kirsher</div><div class='ctx'> M:	jeffrey.t.kirsher@intel.com</div><div class='add'>+P:	Auke Kok</div><div class='add'>+M:	auke-jan.h.kok@intel.com</div><div class='ctx'> W:	http://sourceforge.net/projects/e1000/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='hunk'>@@ -1437,6 +1492,8 @@ P:	John Ronciak</div><div class='ctx'> M:	john.ronciak@intel.com</div><div class='ctx'> P:	Jesse Brandeburg</div><div class='ctx'> M:	jesse.brandeburg@intel.com</div><div class='add'>+P:	Auke Kok</div><div class='add'>+M:	auke-jan.h.kok@intel.com</div><div class='ctx'> W:	http://sourceforge.net/projects/e1000/</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='hunk'>@@ -1445,6 +1502,7 @@ P:	Yi Zhu</div><div class='ctx'> M:	yi.zhu@intel.com</div><div class='ctx'> P:	James Ketrenos</div><div class='ctx'> M:	jketreno@linux.intel.com</div><div class='add'>+L:	ipw2100-devel@lists.sourceforge.net</div><div class='ctx'> L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel</div><div class='ctx'> W:	http://ipw2100.sourceforge.net</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -1454,6 +1512,7 @@ P:	Yi Zhu</div><div class='ctx'> M:	yi.zhu@intel.com</div><div class='ctx'> P:	James Ketrenos</div><div class='ctx'> M:	jketreno@linux.intel.com</div><div class='add'>+L:	ipw2100-devel@lists.sourceforge.net</div><div class='ctx'> L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel</div><div class='ctx'> W:	http://ipw2200.sourceforge.net</div><div class='ctx'> S:	Supported</div><div class='hunk'>@@ -1825,12 +1884,12 @@ S:     linux-scsi@vger.kernel.org</div><div class='ctx'> W:     http://megaraid.lsilogic.com</div><div class='ctx'> S:     Maintained</div><div class='ctx'> </div><div class='del'>-MEMORY TECHNOLOGY DEVICES</div><div class='add'>+MEMORY TECHNOLOGY DEVICES (MTD)</div><div class='ctx'> P:	David Woodhouse</div><div class='ctx'> M:	dwmw2@infradead.org</div><div class='ctx'> W:	http://www.linux-mtd.infradead.org/</div><div class='ctx'> L:	linux-mtd@lists.infradead.org</div><div class='del'>-T:	git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git</div><div class='add'>+T:	git git://git.infradead.org/mtd-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> MICROTEK X6 SCANNER</div><div class='hunk'>@@ -1877,6 +1936,11 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> W:	http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+MULTIMEDIA CARD (MMC) SUBSYSTEM</div><div class='add'>+P:	Russell King</div><div class='add'>+M:	rmk+mmc@arm.linux.org.uk</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> MULTISOUND SOUND DRIVER</div><div class='ctx'> P:	Andrew Veliath</div><div class='ctx'> M:	andrewtv@usa.net</div><div class='hunk'>@@ -1987,9 +2051,10 @@ L:	linux-kernel@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> NI5010 NETWORK DRIVER</div><div class='del'>-P:	Jan-Pascal van Best and Andreas Mohr</div><div class='del'>-M:	Jan-Pascal van Best &lt;jvbest@qv3pluto.leidenuniv.nl&gt;</div><div class='del'>-M:	Andreas Mohr &lt;100.30936@germany.net&gt;</div><div class='add'>+P:	Jan-Pascal van Best</div><div class='add'>+M:	janpascal@vanbest.org</div><div class='add'>+P:	Andreas Mohr</div><div class='add'>+M:	andi@lisas.de</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -2028,6 +2093,12 @@ M:      adaplas@pol.net</div><div class='ctx'> L:      linux-fbdev-devel@lists.sourceforge.net</div><div class='ctx'> S:      Maintained</div><div class='ctx'> </div><div class='add'>+OPENCORES I2C BUS DRIVER</div><div class='add'>+P:	Peter Korsgaard</div><div class='add'>+M:	jacmet@sunsite.dk</div><div class='add'>+L:	i2c@lm-sensors.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> ORACLE CLUSTER FILESYSTEM 2 (OCFS2)</div><div class='ctx'> P:	Mark Fasheh</div><div class='ctx'> M:	mark.fasheh@oracle.com</div><div class='hunk'>@@ -2158,6 +2229,7 @@ S:	Maintained</div><div class='ctx'> </div><div class='ctx'> PCMCIA SUBSYSTEM</div><div class='ctx'> P:	Linux PCMCIA Team</div><div class='add'>+L:	linux-pcmcia@lists.infradead.org</div><div class='ctx'> L:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia</div><div class='ctx'> T:	git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git</div><div class='ctx'> S:	Maintained</div><div class='hunk'>@@ -2168,6 +2240,12 @@ M:	tsbogend@alpha.franken.de</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+PER-TASK DELAY ACCOUNTING</div><div class='add'>+P:	Shailabh Nagar</div><div class='add'>+M:	nagar@watson.ibm.com</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> PERSONALITY HANDLING</div><div class='ctx'> P:	Christoph Hellwig</div><div class='ctx'> M:	hch@infradead.org</div><div class='hunk'>@@ -2242,6 +2320,14 @@ M:	promise@pnd-pc.demon.co.uk</div><div class='ctx'> W:	http://www.pnd-pc.demon.co.uk/promise/</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+PVRUSB2 VIDEO4LINUX DRIVER</div><div class='add'>+P:	Mike Isely</div><div class='add'>+M:	isely@pobox.com</div><div class='add'>+L:	pvrusb2@isely.net</div><div class='add'>+L:	video4linux-list@redhat.com</div><div class='add'>+W:	http://www.isely.net/pvrusb2/</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> PXA2xx SUPPORT</div><div class='ctx'> P:	Nicolas Pitre</div><div class='ctx'> M:	nico@cam.org</div><div class='hunk'>@@ -2499,19 +2585,6 @@ M:	thomas@winischhofer.net</div><div class='ctx'> W:	http://www.winischhofer.at/linuxsisusbvga.shtml</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-SMSC47M1 HARDWARE MONITOR DRIVER</div><div class='del'>-P:	Jean Delvare</div><div class='del'>-M:	khali@linux-fr.org</div><div class='del'>-L:	lm-sensors@lm-sensors.org</div><div class='del'>-S:	Odd Fixes</div><div class='del'>-</div><div class='del'>-SMB FILESYSTEM</div><div class='del'>-P:	Urban Widmark</div><div class='del'>-M:	urban@teststation.com</div><div class='del'>-W:	http://samba.org/</div><div class='del'>-L:	samba@samba.org</div><div class='del'>-S:	Maintained</div><div class='del'>-</div><div class='ctx'> SMC91x ETHERNET DRIVER</div><div class='ctx'> P:	Nicolas Pitre</div><div class='ctx'> M:	nico@cam.org</div><div class='hunk'>@@ -2612,6 +2685,11 @@ M:	shemminger@osdl.org</div><div class='ctx'> L:	netdev@vger.kernel.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+SOEKRIS NET48XX LED SUPPORT</div><div class='add'>+P:	Chris Boot</div><div class='add'>+M:	bootc@bootc.net</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> SPARC (sparc32):</div><div class='ctx'> P:	William L. Irwin</div><div class='ctx'> M:	wli@holomorphy.com</div><div class='hunk'>@@ -2684,6 +2762,23 @@ P:	Christoph Hellwig</div><div class='ctx'> M:	hch@infradead.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='add'>+TC CLASSIFIER</div><div class='add'>+P:	Jamal Hadi Salim</div><div class='add'>+M:	hadi@cyberus.ca</div><div class='add'>+L:	netdev@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+TI OMAP RANDOM NUMBER GENERATOR SUPPORT</div><div class='add'>+P:	Deepak Saxena</div><div class='add'>+M:	dsaxena@plexity.net</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+TASKSTATS STATISTICS INTERFACE</div><div class='add'>+P:	Shailabh Nagar</div><div class='add'>+M:	nagar@watson.ibm.com</div><div class='add'>+L:	linux-kernel@vger.kernel.org</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='ctx'> TI PARALLEL LINK CABLE DRIVER</div><div class='ctx'> P:     Romain Lievin</div><div class='ctx'> M:     roms@lpg.ticalc.org</div><div class='hunk'>@@ -3059,7 +3154,7 @@ S:	Maintained</div><div class='ctx'> VIAPRO SMBUS DRIVER</div><div class='ctx'> P:	Jean Delvare</div><div class='ctx'> M:	khali@linux-fr.org</div><div class='del'>-L:	lm-sensors@lm-sensors.org</div><div class='add'>+L:	i2c@lm-sensors.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='ctx'> UCLINUX (AND M68KNOMMU)</div><div class='hunk'>@@ -3107,6 +3202,11 @@ S:	Maintained</div><div class='ctx'> W1 DALLAS'S 1-WIRE BUS</div><div class='ctx'> P:	Evgeniy Polyakov</div><div class='ctx'> M:	johnpol@2ka.mipt.ru</div><div class='add'>+S:	Maintained</div><div class='add'>+</div><div class='add'>+W83791D HARDWARE MONITORING DRIVER</div><div class='add'>+P:	Charles Spirakis</div><div class='add'>+M:	bezaur@gmail.com</div><div class='ctx'> L:	lm-sensors@lm-sensors.org</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='hunk'>@@ -3117,12 +3217,6 @@ L:	wbsd-devel@list.drzeus.cx</div><div class='ctx'> W:	http://projects.drzeus.cx/wbsd</div><div class='ctx'> S:	Maintained</div><div class='ctx'> </div><div class='del'>-W83L785TS HARDWARE MONITOR DRIVER</div><div class='del'>-P:	Jean Delvare</div><div class='del'>-M:	khali@linux-fr.org</div><div class='del'>-L:	lm-sensors@lm-sensors.org</div><div class='del'>-S:	Odd Fixes</div><div class='del'>-</div><div class='ctx'> WATCHDOG DEVICE DRIVERS</div><div class='ctx'> P:	Wim Van Sebroeck</div><div class='ctx'> M:	wim@iguana.be</div><div class='hunk'>@@ -3162,7 +3256,7 @@ XFS FILESYSTEM</div><div class='ctx'> P:	Silicon Graphics Inc</div><div class='ctx'> M:	xfs-masters@oss.sgi.com</div><div class='ctx'> M:	nathans@sgi.com</div><div class='del'>-L:	linux-xfs@oss.sgi.com</div><div class='add'>+L:	xfs@oss.sgi.com</div><div class='ctx'> W:	http://oss.sgi.com/projects/xfs</div><div class='ctx'> S:	Supported</div><div class='ctx'> </div><div class='head'>diff --git a/Makefile b/Makefile<br/>index 435d209f42d8..7c010f3325a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>Makefile</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> VERSION = 2</div><div class='ctx'> PATCHLEVEL = 6</div><div class='del'>-SUBLEVEL = 17</div><div class='del'>-EXTRAVERSION =-rc5</div><div class='del'>-NAME=Lordi Rules</div><div class='add'>+SUBLEVEL = 18</div><div class='add'>+EXTRAVERSION = -rc1</div><div class='add'>+NAME=Crazed Snow-Weasel</div><div class='ctx'> </div><div class='ctx'> # *DOCUMENTATION*</div><div class='ctx'> # To see a list of typical targets execute "make help"</div><div class='hunk'>@@ -41,8 +41,9 @@ ifndef KBUILD_VERBOSE</div><div class='ctx'>   KBUILD_VERBOSE = 0</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-# Call sparse as part of compilation of C files</div><div class='del'>-# Use 'make C=1' to enable sparse checking</div><div class='add'>+# Call checker as part of compilation of C files</div><div class='add'>+# Use 'make C=1' to enable checking (sparse, by default)</div><div class='add'>+# Override with 'make C=1 CHECK=checker_executable CHECKFLAGS=....'</div><div class='ctx'> </div><div class='ctx'> ifdef C</div><div class='ctx'>   ifeq ("$(origin C)", "command line")</div><div class='hunk'>@@ -71,7 +72,7 @@ endif</div><div class='ctx'> # In both cases the working directory must be the root of the kernel src.</div><div class='ctx'> # 1) O=</div><div class='ctx'> # Use "make O=dir/to/store/output/files/"</div><div class='del'>-# </div><div class='add'>+#</div><div class='ctx'> # 2) Set KBUILD_OUTPUT</div><div class='ctx'> # Set the environment variable KBUILD_OUTPUT to point to the directory</div><div class='ctx'> # where the output files shall be placed.</div><div class='hunk'>@@ -178,18 +179,20 @@ CROSS_COMPILE	?=</div><div class='ctx'> # Architecture as present in compile.h</div><div class='ctx'> UTS_MACHINE := $(ARCH)</div><div class='ctx'> </div><div class='add'>+KCONFIG_CONFIG	?= .config</div><div class='add'>+</div><div class='ctx'> # SHELL used by kbuild</div><div class='ctx'> CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \</div><div class='ctx'> 	  else if [ -x /bin/bash ]; then echo /bin/bash; \</div><div class='ctx'> 	  else echo sh; fi ; fi)</div><div class='ctx'> </div><div class='del'>-HOSTCC  	= gcc</div><div class='del'>-HOSTCXX  	= g++</div><div class='del'>-HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer</div><div class='del'>-HOSTCXXFLAGS	= -O2</div><div class='add'>+HOSTCC       = gcc</div><div class='add'>+HOSTCXX      = g++</div><div class='add'>+HOSTCFLAGS   = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer</div><div class='add'>+HOSTCXXFLAGS = -O2</div><div class='ctx'> </div><div class='del'>-# 	Decide whether to build built-in, modular, or both.</div><div class='del'>-#	Normally, just do built-in.</div><div class='add'>+# Decide whether to build built-in, modular, or both.</div><div class='add'>+# Normally, just do built-in.</div><div class='ctx'> </div><div class='ctx'> KBUILD_MODULES :=</div><div class='ctx'> KBUILD_BUILTIN := 1</div><div class='hunk'>@@ -197,7 +200,7 @@ KBUILD_BUILTIN := 1</div><div class='ctx'> #	If we have only "make modules", don't compile built-in objects.</div><div class='ctx'> #	When we're building modules with modversions, we need to consider</div><div class='ctx'> #	the built-in objects during the descend as well, in order to</div><div class='del'>-#	make sure the checksums are uptodate before we record them.</div><div class='add'>+#	make sure the checksums are up to date before we record them.</div><div class='ctx'> </div><div class='ctx'> ifeq ($(MAKECMDGOALS),modules)</div><div class='ctx'>   KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)</div><div class='hunk'>@@ -230,7 +233,7 @@ export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD</div><div class='ctx'> #</div><div class='ctx'> # If $(quiet) is empty, the whole command will be printed.</div><div class='ctx'> # If it is set to "quiet_", only the short version will be printed. </div><div class='del'>-# If it is set to "silent_", nothing wil be printed at all, since</div><div class='add'>+# If it is set to "silent_", nothing will be printed at all, since</div><div class='ctx'> # the variable $(silent_cmd_cc_o_c) doesn't exist.</div><div class='ctx'> #</div><div class='ctx'> # A simple variant is to prefix commands with $(Q) - that's useful</div><div class='hunk'>@@ -265,10 +268,9 @@ MAKEFLAGS += --include-dir=$(srctree)</div><div class='ctx'> # We need some generic definitions</div><div class='ctx'> include  $(srctree)/scripts/Kbuild.include</div><div class='ctx'> </div><div class='del'>-# For maximum performance (+ possibly random breakage, uncomment</div><div class='del'>-# the following)</div><div class='del'>-</div><div class='del'>-#MAKEFLAGS += -rR</div><div class='add'>+# Do not use make's built-in rules and variables</div><div class='add'>+# This increases performance and avoid hard-to-debug behavour</div><div class='add'>+MAKEFLAGS += -rR</div><div class='ctx'> </div><div class='ctx'> # Make variables (CC, etc...)</div><div class='ctx'> </div><div class='hunk'>@@ -305,21 +307,24 @@ LINUXINCLUDE    := -Iinclude \</div><div class='ctx'> </div><div class='ctx'> CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)</div><div class='ctx'> </div><div class='del'>-CFLAGS 		:= -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \</div><div class='del'>-	  	   -fno-strict-aliasing -fno-common</div><div class='del'>-AFLAGS		:= -D__ASSEMBLY__</div><div class='add'>+CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \</div><div class='add'>+                   -fno-strict-aliasing -fno-common</div><div class='add'>+# Force gcc to behave correct even for buggy distributions</div><div class='add'>+CFLAGS          += $(call cc-option, -fno-stack-protector-all \</div><div class='add'>+                                     -fno-stack-protector)</div><div class='add'>+AFLAGS          := -D__ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-# Read KERNELRELEASE from .kernelrelease (if it exists)</div><div class='del'>-KERNELRELEASE = $(shell cat .kernelrelease 2&gt; /dev/null)</div><div class='add'>+# Read KERNELRELEASE from include/config/kernel.release (if it exists)</div><div class='add'>+KERNELRELEASE = $(shell cat include/config/kernel.release 2&gt; /dev/null)</div><div class='ctx'> KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)</div><div class='ctx'> </div><div class='del'>-export	VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \</div><div class='del'>-	ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \</div><div class='del'>-	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \</div><div class='del'>-	HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS</div><div class='add'>+export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION</div><div class='add'>+export ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC</div><div class='add'>+export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE</div><div class='add'>+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS</div><div class='ctx'> </div><div class='ctx'> export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS</div><div class='del'>-export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE </div><div class='add'>+export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE</div><div class='ctx'> export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE</div><div class='ctx'> </div><div class='ctx'> # When compiling out-of-tree modules, put MODVERDIR in the module</div><div class='hunk'>@@ -357,12 +362,13 @@ endif</div><div class='ctx'> # catch them early, and hand them over to scripts/kconfig/Makefile</div><div class='ctx'> # It is allowed to specify more targets when calling make, including</div><div class='ctx'> # mixing *config targets and build targets.</div><div class='del'>-# For example 'make oldconfig all'. </div><div class='add'>+# For example 'make oldconfig all'.</div><div class='ctx'> # Detect when mixed targets is specified, and make a second invocation</div><div class='ctx'> # of make so .config is not included in this case either (for *config).</div><div class='ctx'> </div><div class='ctx'> no-dot-config-targets := clean mrproper distclean \</div><div class='del'>-			 cscope TAGS tags help %docs check%</div><div class='add'>+			 cscope TAGS tags help %docs check% \</div><div class='add'>+			 kernelrelease kernelversion</div><div class='ctx'> </div><div class='ctx'> config-targets := 0</div><div class='ctx'> mixed-targets  := 0</div><div class='hunk'>@@ -404,9 +410,8 @@ include $(srctree)/arch/$(ARCH)/Makefile</div><div class='ctx'> export KBUILD_DEFCONFIG</div><div class='ctx'> </div><div class='ctx'> config %config: scripts_basic outputmakefile FORCE</div><div class='del'>-	$(Q)mkdir -p include/linux</div><div class='add'>+	$(Q)mkdir -p include/linux include/config</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=scripts/kconfig $@</div><div class='del'>-	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease</div><div class='ctx'> </div><div class='ctx'> else</div><div class='ctx'> # ===========================================================================</div><div class='hunk'>@@ -416,13 +421,11 @@ else</div><div class='ctx'> ifeq ($(KBUILD_EXTMOD),)</div><div class='ctx'> # Additional helpers built in scripts/</div><div class='ctx'> # Carefully list dependencies so we do not try to build scripts twice</div><div class='del'>-# in parrallel</div><div class='add'>+# in parallel</div><div class='ctx'> PHONY += scripts</div><div class='del'>-scripts: scripts_basic include/config/MARKER</div><div class='add'>+scripts: scripts_basic include/config/auto.conf</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(@)</div><div class='ctx'> </div><div class='del'>-scripts_basic: include/linux/autoconf.h</div><div class='del'>-</div><div class='ctx'> # Objects we will link into vmlinux / subdirs we need to visit</div><div class='ctx'> init-y		:= init/</div><div class='ctx'> drivers-y	:= drivers/ sound/</div><div class='hunk'>@@ -436,31 +439,32 @@ ifeq ($(dot-config),1)</div><div class='ctx'> </div><div class='ctx'> # Read in dependencies to all Kconfig* files, make sure to run</div><div class='ctx'> # oldconfig if changes are detected.</div><div class='del'>--include .kconfig.d</div><div class='del'>-</div><div class='del'>-include .config</div><div class='add'>+-include include/config/auto.conf.cmd</div><div class='add'>+-include include/config/auto.conf</div><div class='ctx'> </div><div class='del'>-# If .config needs to be updated, it will be done via the dependency</div><div class='del'>-# that autoconf has on .config.</div><div class='ctx'> # To avoid any implicit rule to kick in, define an empty command</div><div class='del'>-.config .kconfig.d: ;</div><div class='add'>+$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;</div><div class='ctx'> </div><div class='del'>-# If .config is newer than include/linux/autoconf.h, someone tinkered</div><div class='add'>+# If .config is newer than include/config/auto.conf, someone tinkered</div><div class='ctx'> # with it and forgot to run make oldconfig.</div><div class='del'>-# If kconfig.d is missing then we are probarly in a cleaned tree so</div><div class='add'>+# if auto.conf.cmd is missing then we are probably in a cleaned tree so</div><div class='ctx'> # we execute the config step to be sure to catch updated Kconfig files</div><div class='del'>-include/linux/autoconf.h: .kconfig.d .config</div><div class='del'>-	$(Q)mkdir -p include/linux</div><div class='add'>+include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd</div><div class='add'>+ifeq ($(KBUILD_EXTMOD),)</div><div class='ctx'> 	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig</div><div class='ctx'> else</div><div class='add'>+	$(error kernel configuration not valid - run 'make prepare' in $(srctree) to update it)</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+else</div><div class='ctx'> # Dummy target needed, because used as prerequisite</div><div class='del'>-include/linux/autoconf.h: ;</div><div class='add'>+include/config/auto.conf: ;</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> # The all: target is the default when no target is given on the</div><div class='ctx'> # command line.</div><div class='ctx'> # This allow a user to issue only 'make' to build a kernel including modules</div><div class='del'>-# Defaults vmlinux but it is usually overriden in the arch makefile</div><div class='add'>+# Defaults vmlinux but it is usually overridden in the arch makefile</div><div class='ctx'> all: vmlinux</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE</div><div class='hunk'>@@ -492,11 +496,11 @@ CHECKFLAGS     += $(NOSTDINC_FLAGS)</div><div class='ctx'> # warn about C99 declaration after statement</div><div class='ctx'> CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)</div><div class='ctx'> </div><div class='del'>-# disable pointer signedness warnings in gcc 4.0</div><div class='add'>+# disable pointer signed / unsigned warnings in gcc 4.0</div><div class='ctx'> CFLAGS += $(call cc-option,-Wno-pointer-sign,)</div><div class='ctx'> </div><div class='ctx'> # Default kernel image to build when no specific target is given.</div><div class='del'>-# KBUILD_IMAGE may be overruled on the commandline or</div><div class='add'>+# KBUILD_IMAGE may be overruled on the command line or</div><div class='ctx'> # set in the environment</div><div class='ctx'> # Also any assignments in arch/$(ARCH)/Makefile take precedence over</div><div class='ctx'> # this default value</div><div class='hunk'>@@ -510,12 +514,29 @@ export	INSTALL_PATH ?= /boot</div><div class='ctx'> #</div><div class='ctx'> # INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory</div><div class='ctx'> # relocations required by build roots.  This is not defined in the</div><div class='del'>-# makefile but the arguement can be passed to make if needed.</div><div class='add'>+# makefile but the argument can be passed to make if needed.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> MODLIB	= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)</div><div class='ctx'> export MODLIB</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+#  INSTALL_MOD_STRIP, if defined, will cause modules to be</div><div class='add'>+#  stripped after they are installed.  If INSTALL_MOD_STRIP is '1', then</div><div class='add'>+#  the default option --strip-debug will be used.  Otherwise,</div><div class='add'>+#  INSTALL_MOD_STRIP will used as the options to the strip command.</div><div class='add'>+</div><div class='add'>+ifdef INSTALL_MOD_STRIP</div><div class='add'>+ifeq ($(INSTALL_MOD_STRIP),1)</div><div class='add'>+mod_strip_cmd = $(STRIP) --strip-debug</div><div class='add'>+else</div><div class='add'>+mod_strip_cmd = $(STRIP) $(INSTALL_MOD_STRIP)</div><div class='add'>+endif # INSTALL_MOD_STRIP=1</div><div class='add'>+else</div><div class='add'>+mod_strip_cmd = true</div><div class='add'>+endif # INSTALL_MOD_STRIP</div><div class='add'>+export mod_strip_cmd</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> ifeq ($(KBUILD_EXTMOD),)</div><div class='ctx'> core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/</div><div class='hunk'>@@ -539,7 +560,7 @@ libs-y		:= $(libs-y1) $(libs-y2)</div><div class='ctx'> </div><div class='ctx'> # Build vmlinux</div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='del'>-# vmlinux is build from the objects selected by $(vmlinux-init) and</div><div class='add'>+# vmlinux is built from the objects selected by $(vmlinux-init) and</div><div class='ctx'> # $(vmlinux-main). Most are built-in.o files from top-level directories</div><div class='ctx'> # in the kernel tree, others are specified in arch/$(ARCH)Makefile.</div><div class='ctx'> # Ordering when linking is important, and $(vmlinux-init) must be first.</div><div class='hunk'>@@ -590,7 +611,7 @@ quiet_cmd_vmlinux_version = GEN     .version</div><div class='ctx'> 	$(MAKE) $(build)=init</div><div class='ctx'> </div><div class='ctx'> # Generate System.map</div><div class='del'>-quiet_cmd_sysmap = SYSMAP </div><div class='add'>+quiet_cmd_sysmap = SYSMAP</div><div class='ctx'>       cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap</div><div class='ctx'> </div><div class='ctx'> # Link of vmlinux</div><div class='hunk'>@@ -719,7 +740,7 @@ $(vmlinux-dirs): prepare scripts</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$@</div><div class='ctx'> </div><div class='ctx'> # Build the kernel release string</div><div class='del'>-# The KERNELRELEASE is stored in a file named .kernelrelease</div><div class='add'>+# The KERNELRELEASE is stored in a file named include/config/kernel.release</div><div class='ctx'> # to be used when executing for example make install or make modules_install</div><div class='ctx'> #</div><div class='ctx'> # Take the contents of any files called localversion* and the config</div><div class='hunk'>@@ -737,10 +758,10 @@ _localver = $(foreach f, $(__localver), $(if $(findstring ~, $(f)),,$(f)))</div><div class='ctx'> localver = $(subst $(space),, \</div><div class='ctx'> 	   $(shell cat /dev/null $(_localver)) \</div><div class='ctx'> 	   $(patsubst "%",%,$(CONFIG_LOCALVERSION)))</div><div class='del'>-	       </div><div class='add'>+</div><div class='ctx'> # If CONFIG_LOCALVERSION_AUTO is set scripts/setlocalversion is called</div><div class='ctx'> # and if the SCM is know a tag from the SCM is appended.</div><div class='del'>-# The appended tag is determinded by the SCM used.</div><div class='add'>+# The appended tag is determined by the SCM used.</div><div class='ctx'> #</div><div class='ctx'> # Currently, only git is supported.</div><div class='ctx'> # Other SCMs can edit scripts/setlocalversion and add the appropriate</div><div class='hunk'>@@ -753,9 +774,9 @@ endif</div><div class='ctx'> </div><div class='ctx'> localver-full = $(localver)$(localver-auto)</div><div class='ctx'> </div><div class='del'>-# Store (new) KERNELRELASE string in .kernelrelease</div><div class='add'>+# Store (new) KERNELRELASE string in include/config/kernel.release</div><div class='ctx'> kernelrelease = $(KERNELVERSION)$(localver-full)</div><div class='del'>-.kernelrelease: FORCE</div><div class='add'>+include/config/kernel.release: include/config/auto.conf FORCE</div><div class='ctx'> 	$(Q)rm -f $@</div><div class='ctx'> 	$(Q)echo $(kernelrelease) &gt; $@</div><div class='ctx'> </div><div class='hunk'>@@ -776,10 +797,10 @@ PHONY += prepare-all</div><div class='ctx'> # and if so do:</div><div class='ctx'> # 1) Check that make has not been executed in the kernel src $(srctree)</div><div class='ctx'> # 2) Create the include2 directory, used for the second asm symlink</div><div class='del'>-prepare3: .kernelrelease</div><div class='add'>+prepare3: include/config/kernel.release</div><div class='ctx'> ifneq ($(KBUILD_SRC),)</div><div class='ctx'> 	@echo '  Using $(srctree) as source for kernel'</div><div class='del'>-	$(Q)if [ -f $(srctree)/.config ]; then \</div><div class='add'>+	$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \</div><div class='ctx'> 		echo "  $(srctree) is not clean, please run 'make mrproper'";\</div><div class='ctx'> 		echo "  in the '$(srctree)' directory.";\</div><div class='ctx'> 		/bin/false; \</div><div class='hunk'>@@ -791,8 +812,8 @@ endif</div><div class='ctx'> # prepare2 creates a makefile if using a separate output directory</div><div class='ctx'> prepare2: prepare3 outputmakefile</div><div class='ctx'> </div><div class='del'>-prepare1: prepare2 include/linux/version.h include/asm \</div><div class='del'>-                   include/config/MARKER</div><div class='add'>+prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \</div><div class='add'>+                   include/asm include/config/auto.conf</div><div class='ctx'> ifneq ($(KBUILD_MODULES),)</div><div class='ctx'> 	$(Q)mkdir -p $(MODVERDIR)</div><div class='ctx'> 	$(Q)rm -f $(MODVERDIR)/*</div><div class='hunk'>@@ -806,27 +827,20 @@ prepare0: archprepare FORCE</div><div class='ctx'> # All the preparing..</div><div class='ctx'> prepare prepare-all: prepare0</div><div class='ctx'> </div><div class='del'>-#	Leave this as default for preprocessing vmlinux.lds.S, which is now</div><div class='del'>-#	done in arch/$(ARCH)/kernel/Makefile</div><div class='add'>+# Leave this as default for preprocessing vmlinux.lds.S, which is now</div><div class='add'>+# done in arch/$(ARCH)/kernel/Makefile</div><div class='ctx'> </div><div class='ctx'> export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)</div><div class='ctx'> </div><div class='del'>-# 	FIXME: The asm symlink changes when $(ARCH) changes. That's</div><div class='del'>-#	hard to detect, but I suppose "make mrproper" is a good idea</div><div class='del'>-#	before switching between archs anyway.</div><div class='add'>+# FIXME: The asm symlink changes when $(ARCH) changes. That's</div><div class='add'>+# hard to detect, but I suppose "make mrproper" is a good idea</div><div class='add'>+# before switching between archs anyway.</div><div class='ctx'> </div><div class='ctx'> include/asm:</div><div class='ctx'> 	@echo '  SYMLINK $@ -&gt; include/asm-$(ARCH)'</div><div class='ctx'> 	$(Q)if [ ! -d include ]; then mkdir -p include; fi;</div><div class='ctx'> 	@ln -fsn asm-$(ARCH) $@</div><div class='ctx'> </div><div class='del'>-# 	Split autoconf.h into include/linux/config/*</div><div class='del'>-</div><div class='del'>-include/config/MARKER: scripts/basic/split-include include/linux/autoconf.h</div><div class='del'>-	@echo '  SPLIT   include/linux/autoconf.h -&gt; include/config/*'</div><div class='del'>-	@scripts/basic/split-include include/linux/autoconf.h include/config</div><div class='del'>-	@touch $@</div><div class='del'>-</div><div class='ctx'> # Generate some files</div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -834,21 +848,26 @@ include/config/MARKER: scripts/basic/split-include include/linux/autoconf.h</div><div class='ctx'> # needs to be updated, so this check is forced on all builds</div><div class='ctx'> </div><div class='ctx'> uts_len := 64</div><div class='add'>+define filechk_utsrelease.h</div><div class='add'>+	if [ `echo -n "$(KERNELRELEASE)" | wc -c ` -gt $(uts_len) ]; then \</div><div class='add'>+	  echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' &gt;&amp;2;    \</div><div class='add'>+	  exit 1;                                                         \</div><div class='add'>+	fi;                                                               \</div><div class='add'>+	(echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";)</div><div class='add'>+endef</div><div class='ctx'> </div><div class='ctx'> define filechk_version.h</div><div class='del'>-	if [ `echo -n "$(KERNELRELEASE)" | wc -c ` -gt $(uts_len) ]; then \</div><div class='del'>-	  echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' &gt;&amp;2; \</div><div class='del'>-	  exit 1; \</div><div class='del'>-	fi; \</div><div class='del'>-	(echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; \</div><div class='del'>-	  echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)`; \</div><div class='del'>-	 echo '#define KERNEL_VERSION(a,b,c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))'; \</div><div class='del'>-	)</div><div class='add'>+	(echo \#define LINUX_VERSION_CODE $(shell                             \</div><div class='add'>+	expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL));     \</div><div class='add'>+	echo '#define KERNEL_VERSION(a,b,c) (((a) &lt;&lt; 16) + ((b) &lt;&lt; 8) + (c))';)</div><div class='ctx'> endef</div><div class='ctx'> </div><div class='del'>-include/linux/version.h: $(srctree)/Makefile .config .kernelrelease FORCE</div><div class='add'>+include/linux/version.h: $(srctree)/Makefile FORCE</div><div class='ctx'> 	$(call filechk,version.h)</div><div class='ctx'> </div><div class='add'>+include/linux/utsrelease.h: include/config/kernel.release FORCE</div><div class='add'>+	$(call filechk,utsrelease.h)</div><div class='add'>+</div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> PHONY += depend dep</div><div class='hunk'>@@ -856,11 +875,26 @@ depend dep:</div><div class='ctx'> 	@echo '*** Warning: make $@ is unnecessary now.'</div><div class='ctx'> </div><div class='ctx'> # ---------------------------------------------------------------------------</div><div class='add'>+# Kernel headers</div><div class='add'>+INSTALL_HDR_PATH=$(MODLIB)/abi</div><div class='add'>+export INSTALL_HDR_PATH</div><div class='add'>+</div><div class='add'>+PHONY += headers_install</div><div class='add'>+headers_install: include/linux/version.h</div><div class='add'>+	$(Q)unifdef -Ux /dev/null</div><div class='add'>+	$(Q)rm -rf $(INSTALL_HDR_PATH)/include</div><div class='add'>+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include</div><div class='add'>+</div><div class='add'>+PHONY += headers_check</div><div class='add'>+headers_check: headers_install</div><div class='add'>+	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1</div><div class='add'>+</div><div class='add'>+# ---------------------------------------------------------------------------</div><div class='ctx'> # Modules</div><div class='ctx'> </div><div class='ctx'> ifdef CONFIG_MODULES</div><div class='ctx'> </div><div class='del'>-# 	By default, build modules as well</div><div class='add'>+# By default, build modules as well</div><div class='ctx'> </div><div class='ctx'> all: modules</div><div class='ctx'> </div><div class='hunk'>@@ -941,8 +975,9 @@ CLEAN_FILES +=	vmlinux System.map \</div><div class='ctx'> # Directories &amp; files removed with 'make mrproper'</div><div class='ctx'> MRPROPER_DIRS  += include/config include2</div><div class='ctx'> MRPROPER_FILES += .config .config.old include/asm .version .old_version \</div><div class='del'>-                  include/linux/autoconf.h include/linux/version.h \</div><div class='del'>-		  .kernelrelease Module.symvers tags TAGS cscope*</div><div class='add'>+                  include/linux/autoconf.h include/linux/version.h      \</div><div class='add'>+                  include/linux/utsrelease.h                            \</div><div class='add'>+		  Module.symvers tags TAGS cscope*</div><div class='ctx'> </div><div class='ctx'> # clean - Delete most, but leave enough to build external modules</div><div class='ctx'> #</div><div class='hunk'>@@ -958,8 +993,9 @@ clean: archclean $(clean-dirs)</div><div class='ctx'> 	$(call cmd,rmdirs)</div><div class='ctx'> 	$(call cmd,rmfiles)</div><div class='ctx'> 	@find . $(RCS_FIND_IGNORE) \</div><div class='del'>-	 	\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \</div><div class='del'>-		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \</div><div class='add'>+		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \</div><div class='add'>+		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \</div><div class='add'>+		-o -name '*.symtypes' \) \</div><div class='ctx'> 		-type f -print | xargs rm -f</div><div class='ctx'> </div><div class='ctx'> # mrproper - Delete all generated files, including .config</div><div class='hunk'>@@ -982,9 +1018,9 @@ PHONY += distclean</div><div class='ctx'> </div><div class='ctx'> distclean: mrproper</div><div class='ctx'> 	@find $(srctree) $(RCS_FIND_IGNORE) \</div><div class='del'>-	 	\( -name '*.orig' -o -name '*.rej' -o -name '*~' \</div><div class='add'>+		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \</div><div class='ctx'> 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \</div><div class='del'>-	 	-o -name '.*.rej' -o -size 0 \</div><div class='add'>+		-o -name '.*.rej' -o -size 0 \</div><div class='ctx'> 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \</div><div class='ctx'> 		-type f -print | xargs rm -f</div><div class='ctx'> </div><div class='hunk'>@@ -994,9 +1030,9 @@ distclean: mrproper</div><div class='ctx'> # rpm target kept for backward compatibility</div><div class='ctx'> package-dir	:= $(srctree)/scripts/package</div><div class='ctx'> </div><div class='del'>-%pkg: FORCE</div><div class='add'>+%pkg: include/config/kernel.release FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(package-dir) $@</div><div class='del'>-rpm: FORCE</div><div class='add'>+rpm: include/config/kernel.release FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(package-dir) $@</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1027,6 +1063,8 @@ help:</div><div class='ctx'> 	@echo  '  cscope	  - Generate cscope index'</div><div class='ctx'> 	@echo  '  kernelrelease	  - Output the release version string'</div><div class='ctx'> 	@echo  '  kernelversion	  - Output the version stored in Makefile'</div><div class='add'>+	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'</div><div class='add'>+	@echo  '                    (default: /lib/modules/$$VERSION/abi)'</div><div class='ctx'> 	@echo  ''</div><div class='ctx'> 	@echo  'Static analysers'</div><div class='ctx'> 	@echo  '  checkstack      - Generate a list of stack hogs'</div><div class='hunk'>@@ -1049,8 +1087,8 @@ help:</div><div class='ctx'> </div><div class='ctx'> 	@echo  '  make V=0|1 [targets] 0 =&gt; quiet build (default), 1 =&gt; verbose build'</div><div class='ctx'> 	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'</div><div class='del'>-	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse)'</div><div class='del'>-	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK (sparse)'</div><div class='add'>+	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'</div><div class='add'>+	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'</div><div class='ctx'> 	@echo  ''</div><div class='ctx'> 	@echo  'Execute "make" or "make all" to build all targets marked with [*] '</div><div class='ctx'> 	@echo  'For further info see the ./README file'</div><div class='hunk'>@@ -1077,7 +1115,7 @@ else # KBUILD_EXTMOD</div><div class='ctx'> # make M=dir modules   Make all modules in specified dir</div><div class='ctx'> # make M=dir	       Same as 'make M=dir modules'</div><div class='ctx'> # make M=dir modules_install</div><div class='del'>-#                      Install the modules build in the module directory</div><div class='add'>+#                      Install the modules built in the module directory</div><div class='ctx'> #                      Assumes install directory is already created</div><div class='ctx'> </div><div class='ctx'> # We are always building modules</div><div class='hunk'>@@ -1136,7 +1174,7 @@ clean:	rm-dirs := $(MODVERDIR)</div><div class='ctx'> clean: $(clean-dirs)</div><div class='ctx'> 	$(call cmd,rmdirs)</div><div class='ctx'> 	@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \</div><div class='del'>-	 	\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \</div><div class='add'>+		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \</div><div class='ctx'> 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \</div><div class='ctx'> 		-type f -print | xargs rm -f</div><div class='ctx'> </div><div class='hunk'>@@ -1175,31 +1213,41 @@ else</div><div class='ctx'> ALLINCLUDE_ARCHS := $(ARCH)</div><div class='ctx'> endif</div><div class='ctx'> else</div><div class='del'>-#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behaviour.</div><div class='add'>+#Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour.</div><div class='ctx'> ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='ctx'> ALLSOURCE_ARCHS := $(ARCH)</div><div class='ctx'> </div><div class='del'>-define all-sources</div><div class='del'>-	( find $(__srctree) $(RCS_FIND_IGNORE) \</div><div class='add'>+define find-sources</div><div class='add'>+        ( find $(__srctree) $(RCS_FIND_IGNORE) \</div><div class='ctx'> 	       \( -name include -o -name arch \) -prune -o \</div><div class='del'>-	       -name '*.[chS]' -print; \</div><div class='add'>+	       -name $1 -print; \</div><div class='ctx'> 	  for ARCH in $(ALLSOURCE_ARCHS) ; do \</div><div class='ctx'> 	       find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \</div><div class='del'>-	            -name '*.[chS]' -print; \</div><div class='add'>+	            -name $1 -print; \</div><div class='ctx'> 	  done ; \</div><div class='ctx'> 	  find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \</div><div class='del'>-	       -name '*.[chS]' -print; \</div><div class='add'>+	       -name $1 -print; \</div><div class='ctx'> 	  find $(__srctree)include $(RCS_FIND_IGNORE) \</div><div class='ctx'> 	       \( -name config -o -name 'asm-*' \) -prune \</div><div class='del'>-	       -o -name '*.[chS]' -print; \</div><div class='add'>+	       -o -name $1 -print; \</div><div class='ctx'> 	  for ARCH in $(ALLINCLUDE_ARCHS) ; do \</div><div class='ctx'> 	       find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \</div><div class='del'>-	            -name '*.[chS]' -print; \</div><div class='add'>+	            -name $1 -print; \</div><div class='ctx'> 	  done ; \</div><div class='ctx'> 	  find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \</div><div class='del'>-	       -name '*.[chS]' -print )</div><div class='add'>+	       -name $1 -print )</div><div class='add'>+endef</div><div class='add'>+</div><div class='add'>+define all-sources</div><div class='add'>+	$(call find-sources,'*.[chS]')</div><div class='add'>+endef</div><div class='add'>+define all-kconfigs</div><div class='add'>+	$(call find-sources,'Kconfig*')</div><div class='add'>+endef</div><div class='add'>+define all-defconfigs</div><div class='add'>+	$(call find-sources,'defconfig')</div><div class='ctx'> endef</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_cscope-file = FILELST cscope.files</div><div class='hunk'>@@ -1219,7 +1267,13 @@ define cmd_TAGS</div><div class='ctx'>                 echo "-I __initdata,__exitdata,__acquires,__releases  \</div><div class='ctx'>                       -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL              \</div><div class='ctx'>                       --extra=+f --c-kinds=+px"`;                     \</div><div class='del'>-                $(all-sources) | xargs etags $$ETAGSF -a</div><div class='add'>+                $(all-sources) | xargs etags $$ETAGSF -a;             \</div><div class='add'>+	if test "x$$ETAGSF" = x; then                                 \</div><div class='add'>+		$(all-kconfigs) | xargs etags -a                      \</div><div class='add'>+		--regex='/^config[ \t]+\([a-zA-Z0-9_]+\)/\1/';        \</div><div class='add'>+		$(all-defconfigs) | xargs etags -a                    \</div><div class='add'>+		--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/';     \</div><div class='add'>+	fi</div><div class='ctx'> endef</div><div class='ctx'> </div><div class='ctx'> TAGS: FORCE</div><div class='hunk'>@@ -1259,14 +1313,14 @@ namespacecheck:</div><div class='ctx'> endif #ifeq ($(config-targets),1)</div><div class='ctx'> endif #ifeq ($(mixed-targets),1)</div><div class='ctx'> </div><div class='del'>-PHONY += checkstack</div><div class='add'>+PHONY += checkstack kernelrelease kernelversion</div><div class='ctx'> checkstack:</div><div class='ctx'> 	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \</div><div class='ctx'> 	$(PERL) $(src)/scripts/checkstack.pl $(ARCH)</div><div class='ctx'> </div><div class='ctx'> kernelrelease:</div><div class='del'>-	$(if $(wildcard .kernelrelease), $(Q)echo $(KERNELRELEASE), \</div><div class='del'>-	$(error kernelrelease not valid - run 'make *config' to update it))</div><div class='add'>+	$(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \</div><div class='add'>+	$(error kernelrelease not valid - run 'make prepare' to update it))</div><div class='ctx'> kernelversion:</div><div class='ctx'> 	@echo $(KERNELVERSION)</div><div class='ctx'> </div><div class='hunk'>@@ -1301,6 +1355,8 @@ endif</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)</div><div class='ctx'> %.o: %.S prepare scripts FORCE</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)</div><div class='add'>+%.symtypes: %.c prepare scripts FORCE</div><div class='add'>+	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)</div><div class='ctx'> </div><div class='ctx'> # Modules</div><div class='ctx'> / %/: prepare scripts FORCE</div><div class='hunk'>@@ -1323,7 +1379,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files))</div><div class='ctx'> </div><div class='ctx'> a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \</div><div class='ctx'> 	  $(NOSTDINC_FLAGS) $(CPPFLAGS) \</div><div class='del'>-	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)</div><div class='add'>+	  $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)</div><div class='ctx'> </div><div class='ctx'> quiet_cmd_as_o_S = AS      $@</div><div class='ctx'> cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $&lt;</div><div class='head'>diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig<br/>index 8290b69da202..213c7850d5fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/Kconfig</a></div><div class='hunk'>@@ -453,7 +453,7 @@ config ALPHA_IRONGATE</div><div class='ctx'> </div><div class='ctx'> config GENERIC_HWEIGHT</div><div class='ctx'> 	bool</div><div class='del'>-	default y if !ALPHA_EV6 &amp;&amp; !ALPHA_EV67</div><div class='add'>+	default y if !ALPHA_EV67</div><div class='ctx'> </div><div class='ctx'> config ALPHA_AVANTI</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/alpha/boot/bootp.c b/arch/alpha/boot/bootp.c<br/>index ec53c28e33de..3af21c789339 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/boot/bootp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/boot/bootp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/boot/bootp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/boot/bootp.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c<br/>index a6657f2cf9bd..4307bde80a35 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/boot/bootpz.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/boot/bootpz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/boot/bootpz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/boot/bootpz.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c<br/>index 78c9b0b6eea7..90ed55b662a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/boot/main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/boot/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/boot/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/boot/main.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c<br/>index c645c5e14786..f042cc42b00f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/alpha_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/alpha_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/alpha_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/alpha_ksyms.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * modules.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='hunk'>@@ -15,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -53,10 +53,6 @@ extern void __divqu (void);</div><div class='ctx'> extern void __remqu (void);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(alpha_mv);</div><div class='del'>-EXPORT_SYMBOL(enable_irq);</div><div class='del'>-EXPORT_SYMBOL(disable_irq);</div><div class='del'>-EXPORT_SYMBOL(disable_irq_nosync);</div><div class='del'>-EXPORT_SYMBOL(probe_irq_mask);</div><div class='ctx'> EXPORT_SYMBOL(screen_info);</div><div class='ctx'> EXPORT_SYMBOL(perf_irq);</div><div class='ctx'> EXPORT_SYMBOL(callback_getenv);</div><div class='hunk'>@@ -68,19 +64,13 @@ EXPORT_SYMBOL(alpha_using_srm);</div><div class='ctx'> </div><div class='ctx'> /* platform dependent support */</div><div class='ctx'> EXPORT_SYMBOL(strcat);</div><div class='del'>-EXPORT_SYMBOL(strcmp);</div><div class='ctx'> EXPORT_SYMBOL(strcpy);</div><div class='ctx'> EXPORT_SYMBOL(strlen);</div><div class='del'>-EXPORT_SYMBOL(strncmp);</div><div class='ctx'> EXPORT_SYMBOL(strncpy);</div><div class='del'>-EXPORT_SYMBOL(strnlen);</div><div class='ctx'> EXPORT_SYMBOL(strncat);</div><div class='del'>-EXPORT_SYMBOL(strstr);</div><div class='ctx'> EXPORT_SYMBOL(strchr);</div><div class='ctx'> EXPORT_SYMBOL(strrchr);</div><div class='del'>-EXPORT_SYMBOL(memcmp);</div><div class='ctx'> EXPORT_SYMBOL(memmove);</div><div class='del'>-EXPORT_SYMBOL(memscan);</div><div class='ctx'> EXPORT_SYMBOL(__memcpy);</div><div class='ctx'> EXPORT_SYMBOL(__memset);</div><div class='ctx'> EXPORT_SYMBOL(__memsetw);</div><div class='hunk'>@@ -122,11 +112,9 @@ EXPORT_SYMBOL(alpha_write_fp_reg_s);</div><div class='ctx'> </div><div class='ctx'> /* In-kernel system calls.  */</div><div class='ctx'> EXPORT_SYMBOL(kernel_thread);</div><div class='del'>-EXPORT_SYMBOL(sys_open);</div><div class='ctx'> EXPORT_SYMBOL(sys_dup);</div><div class='ctx'> EXPORT_SYMBOL(sys_exit);</div><div class='ctx'> EXPORT_SYMBOL(sys_write);</div><div class='del'>-EXPORT_SYMBOL(sys_read);</div><div class='ctx'> EXPORT_SYMBOL(sys_lseek);</div><div class='ctx'> EXPORT_SYMBOL(execve);</div><div class='ctx'> EXPORT_SYMBOL(sys_setsid);</div><div class='hunk'>@@ -182,7 +170,6 @@ EXPORT_SYMBOL(smp_num_cpus);</div><div class='ctx'> EXPORT_SYMBOL(smp_call_function);</div><div class='ctx'> EXPORT_SYMBOL(smp_call_function_on_cpu);</div><div class='ctx'> EXPORT_SYMBOL(_atomic_dec_and_lock);</div><div class='del'>-EXPORT_SYMBOL(cpu_present_mask);</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c<br/>index cb3e739fbad8..f313b34939bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/console.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * non-0 I/O hose</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S<br/>index 7af15bf7e5ab..01ecd09d4a64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/entry.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Kernel entry-points.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/pal.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/gct.c b/arch/alpha/kernel/gct.c<br/>index 8827687b9f89..c0c7155448e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/gct.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/gct.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/gct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/gct.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *	linux/arch/alpha/kernel/gct.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S<br/>index 0905721fcbca..1e2a62a1f75f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/head.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * the kernel global pointer and jump to the kernel entry-point.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c<br/>index da677f829f76..729c475d2269 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/irq.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * should be easier.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -49,15 +48,15 @@ select_smp_affinity(unsigned int irq)</div><div class='ctx'> 	static int last_cpu;</div><div class='ctx'> 	int cpu = last_cpu + 1;</div><div class='ctx'> </div><div class='del'>-	if (!irq_desc[irq].handler-&gt;set_affinity || irq_user_affinity[irq])</div><div class='add'>+	if (!irq_desc[irq].chip-&gt;set_affinity || irq_user_affinity[irq])</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	while (!cpu_possible(cpu))</div><div class='ctx'> 		cpu = (cpu &lt; (NR_CPUS-1) ? cpu + 1 : 0);</div><div class='ctx'> 	last_cpu = cpu;</div><div class='ctx'> </div><div class='del'>-	irq_affinity[irq] = cpumask_of_cpu(cpu);</div><div class='del'>-	irq_desc[irq].handler-&gt;set_affinity(irq, cpumask_of_cpu(cpu));</div><div class='add'>+	irq_desc[irq].affinity = cpumask_of_cpu(cpu);</div><div class='add'>+	irq_desc[irq].chip-&gt;set_affinity(irq, cpumask_of_cpu(cpu));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='hunk'>@@ -93,14 +92,14 @@ show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[irq].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[irq].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %c%s",</div><div class='del'>-			(action-&gt;flags &amp; SA_INTERRUPT)?'+':' ',</div><div class='add'>+			(action-&gt;flags &amp; IRQF_DISABLED)?'+':' ',</div><div class='ctx'> 			action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next) {</div><div class='ctx'> 			seq_printf(p, ", %c%s",</div><div class='del'>-				  (action-&gt;flags &amp; SA_INTERRUPT)?'+':' ',</div><div class='add'>+				  (action-&gt;flags &amp; IRQF_DISABLED)?'+':' ',</div><div class='ctx'> 				   action-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c<br/>index 9d34ce26e5ef..ddf5cf8dcb0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_alpha.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_alpha.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_alpha.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/irq_alpha.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Alpha specific irq code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -215,7 +214,7 @@ static unsigned int rtc_startup(unsigned int irq) { return 0; }</div><div class='ctx'> </div><div class='ctx'> struct irqaction timer_irqaction = {</div><div class='ctx'> 	.handler	= timer_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -233,7 +232,7 @@ void __init</div><div class='ctx'> init_rtc_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	irq_desc[RTC_IRQ].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[RTC_IRQ].handler = &amp;rtc_irq_type;</div><div class='add'>+	irq_desc[RTC_IRQ].chip = &amp;rtc_irq_type;</div><div class='ctx'> 	setup_irq(RTC_IRQ, &amp;timer_irqaction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/irq_i8259.c b/arch/alpha/kernel/irq_i8259.c<br/>index b188683b83fd..ebbadbc0c36a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_i8259.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_i8259.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/irq_i8259.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Started hacking from linux-2.3.30pre6/arch/i386/kernel/i8259.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -109,7 +108,7 @@ init_i8259a_irqs(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='del'>-		irq_desc[i].handler = &amp;i8259a_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;i8259a_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(2, &amp;cascade);</div><div class='head'>diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c<br/>index 146a20b9e3d5..3b581415bab0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_pyxis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_pyxis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_pyxis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/irq_pyxis.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ init_pyxis_irqs(unsigned long ignore_mask)</div><div class='ctx'> 		if ((ignore_mask &gt;&gt; i) &amp; 1)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;pyxis_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;pyxis_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(16+7, &amp;isa_cascade_irqaction);</div><div class='head'>diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c<br/>index 0a87e466918c..8e4d121f84cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_srm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/irq_srm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/irq_srm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/irq_srm.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ init_srm_irqs(long max, unsigned long ignore_mask)</div><div class='ctx'> 		if (i &lt; 64 &amp;&amp; ((ignore_mask &gt;&gt; i) &amp; 1))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;srm_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;srm_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h<br/>index 11f996f24fde..08b8302e64ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/machvec_impl.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/machvec_impl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/machvec_impl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/machvec_impl.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * This file has goodies to help simplify instantiation of machine vectors.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Whee.  These systems don't have an HAE:</div><div class='head'>diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c<br/>index 31afe3d91ac6..e15dcf4f3dcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/osf_sys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/osf_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/osf_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/osf_sys.c</a></div><div class='hunk'>@@ -244,7 +244,7 @@ do_osf_statfs(struct dentry * dentry, struct osf_statfs __user *buffer,</div><div class='ctx'> 	      unsigned long bufsiz)</div><div class='ctx'> {</div><div class='ctx'> 	struct kstatfs linux_stat;</div><div class='del'>-	int error = vfs_statfs(dentry-&gt;d_inode-&gt;i_sb, &amp;linux_stat);</div><div class='add'>+	int error = vfs_statfs(dentry, &amp;linux_stat);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = linux_to_osf_statfs(&amp;linux_stat, buffer, bufsiz);</div><div class='ctx'> 	return error;	</div><div class='head'>diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c<br/>index 2a8b364c822e..ffb7d5423cc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/pci.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Nov 2000, Ivan Kokshaysky &lt;ink@jurassic.park.msu.ru&gt;</div><div class='ctx'>  *	     PCI-PCI bridges cleanup</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -124,12 +123,12 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-		       unsigned long size, unsigned long align)</div><div class='add'>+		       resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = data;</div><div class='ctx'> 	struct pci_controller *hose = dev-&gt;sysdata;</div><div class='ctx'> 	unsigned long alignto;</div><div class='del'>-	unsigned long start = res-&gt;start;</div><div class='add'>+	resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='ctx'> 		/* Make sure we start at our min on all hoses */</div><div class='head'>diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c<br/>index 9924fd07743a..b3a8a2980365 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/process.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -26,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;linux/vt.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='hunk'>@@ -94,7 +94,7 @@ common_shutdown_1(void *generic_ptr)</div><div class='ctx'> 	if (cpuid != boot_cpuid) {</div><div class='ctx'> 		flags |= 0x00040000UL; /* "remain halted" */</div><div class='ctx'> 		*pflags = flags;</div><div class='del'>-		clear_bit(cpuid, &amp;cpu_present_mask);</div><div class='add'>+		cpu_clear(cpuid, cpu_present_map);</div><div class='ctx'> 		halt();</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -120,8 +120,8 @@ common_shutdown_1(void *generic_ptr)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	/* Wait for the secondaries to halt. */</div><div class='del'>-	cpu_clear(boot_cpuid, cpu_possible_map);</div><div class='del'>-	while (cpus_weight(cpu_possible_map))</div><div class='add'>+	cpu_clear(boot_cpuid, cpu_present_map);</div><div class='add'>+	while (cpus_weight(cpu_present_map))</div><div class='ctx'> 		barrier();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -475,7 +475,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> unsigned long</div><div class='del'>-thread_saved_pc(task_t *t)</div><div class='add'>+thread_saved_pc(struct task_struct *t)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long base = (unsigned long)task_stack_page(t);</div><div class='ctx'> 	unsigned long fp, sp = task_thread_info(t)-&gt;pcb.ksp;</div><div class='head'>diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h<br/>index e1560fb15610..2a6e3da8144f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/proto.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/proto.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/proto.h</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c<br/>index 558b83368559..2cb9c4380113 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/setup.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_ALPHA_LCA etc */</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='hunk'>@@ -481,7 +481,7 @@ register_cpus(void)</div><div class='ctx'> 		struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'> 		if (!p)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		register_cpu(p, i, NULL);</div><div class='add'>+		register_cpu(p, i);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c<br/>index 2e45e8604e32..741da0945dc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/signal.c</a></div><div class='hunk'>@@ -375,7 +375,7 @@ give_sigsegv:</div><div class='ctx'> static inline void __user *</div><div class='ctx'> get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)</div><div class='ctx'> {</div><div class='del'>-	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! on_sig_stack(sp))</div><div class='add'>+	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! sas_ss_flags(sp))</div><div class='ctx'> 		sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> </div><div class='ctx'> 	return (void __user *)((sp - frame_size) &amp; -32ul);</div><div class='head'>diff --git a/arch/alpha/kernel/smc37c93x.c b/arch/alpha/kernel/smc37c93x.c<br/>index 421e51ea6bb7..2636cc028d06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/smc37c93x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/smc37c93x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/smc37c93x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/smc37c93x.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * SMC 37C93X initialization code</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c<br/>index 185255416e85..4dc273e537fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/smp.c</a></div><div class='hunk'>@@ -68,7 +68,6 @@ enum ipi_message_type {</div><div class='ctx'> static int smp_secondary_alive __initdata = 0;</div><div class='ctx'> </div><div class='ctx'> /* Which cpus ids came online.  */</div><div class='del'>-cpumask_t cpu_present_mask;</div><div class='ctx'> cpumask_t cpu_online_map;</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(cpu_online_map);</div><div class='hunk'>@@ -439,7 +438,7 @@ setup_smp(void)</div><div class='ctx'> 			if ((cpu-&gt;flags &amp; 0x1cc) == 0x1cc) {</div><div class='ctx'> 				smp_num_probed++;</div><div class='ctx'> 				/* Assume here that "whami" == index */</div><div class='del'>-				cpu_set(i, cpu_present_mask);</div><div class='add'>+				cpu_set(i, cpu_present_map);</div><div class='ctx'> 				cpu-&gt;pal_revision = boot_cpu_palrev;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -450,11 +449,10 @@ setup_smp(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		smp_num_probed = 1;</div><div class='del'>-		cpu_set(boot_cpuid, cpu_present_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_mask = %lx\n",</div><div class='del'>-	       smp_num_probed, cpu_possible_map.bits[0]);</div><div class='add'>+	printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_map = %lx\n",</div><div class='add'>+	       smp_num_probed, cpu_present_map.bits[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -473,7 +471,7 @@ smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing to do on a UP box, or when told not to.  */</div><div class='ctx'> 	if (smp_num_probed == 1 || max_cpus == 0) {</div><div class='del'>-		cpu_present_mask = cpumask_of_cpu(boot_cpuid);</div><div class='add'>+		cpu_present_map = cpumask_of_cpu(boot_cpuid);</div><div class='ctx'> 		printk(KERN_INFO "SMP mode deactivated.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -486,10 +484,6 @@ smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> void __devinit</div><div class='ctx'> smp_prepare_boot_cpu(void)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Mark the boot cpu (current cpu) as online</div><div class='del'>-	 */ </div><div class='del'>-	cpu_set(smp_processor_id(), cpu_online_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __devinit</div><div class='head'>diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c<br/>index 5c98fc83e238..990ac61028f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/srm_env.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/srm_env.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/srm_env.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/srm_env.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c<br/>index 3b30d4f1fc42..9d7dff27f815 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/srmcons.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/srmcons.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/srmcons.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/srmcons.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * (TTY driver and console driver)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c<br/>index d7f0e97fe56f..d6926b7b1e99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_alcor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_alcor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_alcor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_alcor.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Code supporting the ALCOR and XLT (XL-300/366/433).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -144,7 +143,7 @@ alcor_init_irq(void)</div><div class='ctx'> 		if (i &gt;= 16+20 &amp;&amp; i &lt;= 16+30)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;alcor_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;alcor_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> 	i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c<br/>index 8e3374d34c95..25a215067da8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_cabriolet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_cabriolet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_cabriolet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_cabriolet.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * PC164 and LX164.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -124,7 +123,7 @@ common_init_irq(void (*srm_dev_int)(unsigned long v, struct pt_regs *r))</div><div class='ctx'> </div><div class='ctx'> 		for (i = 16; i &lt; 35; ++i) {</div><div class='ctx'> 			irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-			irq_desc[i].handler = &amp;cabriolet_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;cabriolet_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c<br/>index d5da6b1b28ee..dd6103b867e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_dp264.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_dp264.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_dp264.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_dp264.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Code supporting the DP264 (EV6+TSUNAMI).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -300,7 +299,7 @@ init_tsunami_irqs(struct hw_interrupt_type * ops, int imin, int imax)</div><div class='ctx'> 	long i;</div><div class='ctx'> 	for (i = imin; i &lt;= imax; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = ops;</div><div class='add'>+		irq_desc[i].chip = ops;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c<br/>index 61a79c354f0b..ed108b66ec09 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_eb64p.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_eb64p.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_eb64p.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_eb64p.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Code supporting the EB64+ and EB66.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -137,7 +136,7 @@ eb64p_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &lt; 32; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;eb64p_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;eb64p_irq_type;</div><div class='ctx'> 	}		</div><div class='ctx'> </div><div class='ctx'> 	common_init_isa_dma();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c<br/>index bd6e5f0e43c7..64a785baf53a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_eiger.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_eiger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_eiger.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_eiger.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ eiger_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &lt; 128; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;eiger_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;eiger_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c<br/>index fcabb7c96a16..4ac2b328b8de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_jensen.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_jensen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_jensen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_jensen.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ jensen_local_startup(unsigned int irq)</div><div class='ctx'> 		 * the IPL from being dropped during handler processing.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (irq_desc[irq].action)</div><div class='del'>-			irq_desc[irq].action-&gt;flags |= SA_INTERRUPT;</div><div class='add'>+			irq_desc[irq].action-&gt;flags |= IRQF_DISABLED;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -206,11 +206,11 @@ jensen_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	init_i8259a_irqs();</div><div class='ctx'> </div><div class='del'>-	irq_desc[1].handler = &amp;jensen_local_irq_type;</div><div class='del'>-	irq_desc[4].handler = &amp;jensen_local_irq_type;</div><div class='del'>-	irq_desc[3].handler = &amp;jensen_local_irq_type;</div><div class='del'>-	irq_desc[7].handler = &amp;jensen_local_irq_type;</div><div class='del'>-	irq_desc[9].handler = &amp;jensen_local_irq_type;</div><div class='add'>+	irq_desc[1].chip = &amp;jensen_local_irq_type;</div><div class='add'>+	irq_desc[4].chip = &amp;jensen_local_irq_type;</div><div class='add'>+	irq_desc[3].chip = &amp;jensen_local_irq_type;</div><div class='add'>+	irq_desc[7].chip = &amp;jensen_local_irq_type;</div><div class='add'>+	irq_desc[9].chip = &amp;jensen_local_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	common_init_isa_dma();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c<br/>index e32fee505220..36d215954376 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_marvel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_marvel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_marvel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_marvel.c</a></div><div class='hunk'>@@ -303,7 +303,7 @@ init_io7_irqs(struct io7 *io7,</div><div class='ctx'> 	/* Set up the lsi irqs.  */</div><div class='ctx'> 	for (i = 0; i &lt; 128; ++i) {</div><div class='ctx'> 		irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[base + i].handler = lsi_ops;</div><div class='add'>+		irq_desc[base + i].chip = lsi_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the implemented irqs in hardware.  */</div><div class='hunk'>@@ -317,7 +317,7 @@ init_io7_irqs(struct io7 *io7,</div><div class='ctx'> 	/* Set up the msi irqs.  */</div><div class='ctx'> 	for (i = 128; i &lt; (128 + 512); ++i) {</div><div class='ctx'> 		irq_desc[base + i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[base + i].handler = msi_ops;</div><div class='add'>+		irq_desc[base + i].chip = msi_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; ++i)</div><div class='hunk'>@@ -335,7 +335,7 @@ marvel_init_irq(void)</div><div class='ctx'> 	/* Reserve the legacy irqs.  */</div><div class='ctx'> 	for (i = 0; i &lt; 16; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='del'>-		irq_desc[i].handler = &amp;marvel_legacy_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;marvel_legacy_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init the io7 irqs.  */</div><div class='head'>diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c<br/>index d78a0daa6168..cc4c58111366 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_mikasa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_mikasa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_mikasa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_mikasa.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Code supporting the MIKASA (AlphaServer 1000).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -117,7 +116,7 @@ mikasa_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &lt; 32; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;mikasa_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;mikasa_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_i8259a_irqs();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c<br/>index 65061f5d7410..2d3cff7e8c5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_noritake.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_noritake.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_noritake.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_noritake.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * CORELLE (AlphaServer 800), and ALCOR Primo (AlphaStation 600A).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -139,7 +138,7 @@ noritake_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &lt; 48; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;noritake_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;noritake_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_i8259a_irqs();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c<br/>index 05888a02a604..949607e3d6fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_rawhide.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_rawhide.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_rawhide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_rawhide.c</a></div><div class='hunk'>@@ -180,7 +180,7 @@ rawhide_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &lt; 128; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;rawhide_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;rawhide_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_i8259a_irqs();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c<br/>index 58404243057b..6ae506052635 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_rx164.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_rx164.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_rx164.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_rx164.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ rx164_init_irq(void)</div><div class='ctx'> 	rx164_update_irq_hw(0);</div><div class='ctx'> 	for (i = 16; i &lt; 40; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;rx164_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;rx164_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_i8259a_irqs();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c<br/>index a7ff84474ace..a7a14647b50e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_sable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_sable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_sable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_sable.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Code supporting the Sable, Sable-Gamma, and Lynx systems.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -537,7 +536,7 @@ sable_lynx_init_irq(int nr_irqs)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_irqs; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;sable_lynx_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;sable_lynx_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	common_init_isa_dma();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c<br/>index 131a2d9f79d3..a654014d202a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_sio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_sio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_sio.c</a></div><div class='hunk'>@@ -10,14 +10,13 @@</div><div class='ctx'>  * Kenetics's Platform 2000, Avanti (AlphaStation), XL, and AlphaBook1.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/compiler.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c<br/>index 7955bdfc2db0..2c75cd1fd81a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_takara.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_takara.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_takara.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_takara.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ takara_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &lt; 128; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;takara_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;takara_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	common_init_isa_dma();</div><div class='head'>diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c<br/>index 5f84417eeb7b..302aab38d95f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_titan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_titan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_titan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_titan.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *	Granite</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -66,7 +65,7 @@ titan_update_irq_hw(unsigned long mask)</div><div class='ctx'> 	register int bcpu = boot_cpuid;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	cpumask_t cpm = cpu_present_mask;</div><div class='add'>+	cpumask_t cpm = cpu_present_map;</div><div class='ctx'> 	volatile unsigned long *dim0, *dim1, *dim2, *dim3;</div><div class='ctx'> 	unsigned long mask0, mask1, mask2, mask3, dummy;</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +188,7 @@ init_titan_irqs(struct hw_interrupt_type * ops, int imin, int imax)</div><div class='ctx'> 	long i;</div><div class='ctx'> 	for (i = imin; i &lt;= imax; ++i) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = ops;</div><div class='add'>+		irq_desc[i].chip = ops;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -280,15 +279,15 @@ titan_late_init(void)</div><div class='ctx'> 	 * all reported to the kernel as machine checks, so the handler</div><div class='ctx'> 	 * is a nop so it can be called to count the individual events.</div><div class='ctx'> 	 */</div><div class='del'>-	request_irq(63+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(63+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "CChip Error", NULL);</div><div class='del'>-	request_irq(62+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(62+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "PChip 0 H_Error", NULL);</div><div class='del'>-	request_irq(61+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(61+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "PChip 1 H_Error", NULL);</div><div class='del'>-	request_irq(60+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(60+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "PChip 0 C_Error", NULL);</div><div class='del'>-	request_irq(59+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(59+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "PChip 1 C_Error", NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* </div><div class='hunk'>@@ -349,9 +348,9 @@ privateer_init_pci(void)</div><div class='ctx'> 	 * Hook a couple of extra err interrupts that the</div><div class='ctx'> 	 * common titan code won't.</div><div class='ctx'> 	 */</div><div class='del'>-	request_irq(53+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(53+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "NMI", NULL);</div><div class='del'>-	request_irq(50+16, titan_intr_nop, SA_INTERRUPT, </div><div class='add'>+	request_irq(50+16, titan_intr_nop, IRQF_DISABLED,</div><div class='ctx'> 		    "Temperature Warning", NULL);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c<br/>index 1553f470246e..22c5798fe083 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_wildfire.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/sys_wildfire.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/sys_wildfire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/sys_wildfire.c</a></div><div class='hunk'>@@ -199,14 +199,14 @@ wildfire_init_irq_per_pca(int qbbno, int pcano)</div><div class='ctx'> 		if (i == 2)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i+irq_bias].handler = &amp;wildfire_irq_type;</div><div class='add'>+		irq_desc[i+irq_bias].chip = &amp;wildfire_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq_desc[36+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-	irq_desc[36+irq_bias].handler = &amp;wildfire_irq_type;</div><div class='add'>+	irq_desc[36+irq_bias].chip = &amp;wildfire_irq_type;</div><div class='ctx'> 	for (i = 40; i &lt; 64; ++i) {</div><div class='ctx'> 		irq_desc[i+irq_bias].status = IRQ_DISABLED | IRQ_LEVEL;</div><div class='del'>-		irq_desc[i+irq_bias].handler = &amp;wildfire_irq_type;</div><div class='add'>+		irq_desc[i+irq_bias].chip = &amp;wildfire_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(32+irq_bias, &amp;isa_enable);	</div><div class='head'>diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c<br/>index 3859749810b4..50eccde2dcd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/time.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * 2003-06-03	R. Scott Bailey &lt;scott.bailey@eds.com&gt;</div><div class='ctx'>  *	Tighten sanity in time_init from 1% (10,000 PPM) to 250 PPM</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c<br/>index f9d12319e0fb..d6e665d567bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/traps.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * This file initializes the trap entry points</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S<br/>index 0922e0785ddb..71470e9d93ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='ctx'> OUTPUT_FORMAT("elf64-alpha")</div><div class='head'>diff --git a/arch/alpha/lib/callback_srm.S b/arch/alpha/lib/callback_srm.S<br/>index 0528acd0d9ad..8804bec2c644 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/lib/callback_srm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/lib/callback_srm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/lib/callback_srm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/lib/callback_srm.S</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *	arch/alpha/lib/callback_srm.S</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/console.h&gt;</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='head'>diff --git a/arch/alpha/lib/udelay.c b/arch/alpha/lib/udelay.c<br/>index 1c879bbce419..69d52aa37bae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/lib/udelay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/lib/udelay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/lib/udelay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/lib/udelay.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Delay routines, using a pre-computed "loops_per_jiffy" value.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt; /* for udelay's use of smp_processor_id */</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='head'>diff --git a/arch/alpha/mm/extable.c b/arch/alpha/mm/extable.c<br/>index c3849baebd57..dc7aeda15773 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/alpha/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c<br/>index 64ace5a9cd3d..622dabd84680 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/mm/fault.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *  Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c<br/>index 544ac5dc09eb..917dad1b74c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/mm/init.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> /* 2.3.x zone allocator, 1999 Andrea Arcangeli &lt;andrea@suse.de&gt; */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c<br/>index bf6b65c81bef..b826f58c6e72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/mm/numa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/mm/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/mm/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/mm/numa.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  Copyright (C) 2001 Andrea Arcangeli &lt;andrea@suse.de&gt; SuSE</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c<br/>index ba788cfdc3c6..9fc0eeb4f0ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/alpha/oprofile/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/alpha/oprofile/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/alpha/oprofile/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/alpha/oprofile/common.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ op_axp_create_files(struct super_block * sb, struct dentry * root)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; model-&gt;num_counters; ++i) {</div><div class='ctx'> 		struct dentry *dir;</div><div class='del'>-		char buf[3];</div><div class='add'>+		char buf[4];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(buf, sizeof buf, "%d", i);</div><div class='ctx'> 		dir = oprofilefs_mkdir(sb, root, buf);</div><div class='head'>diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig<br/>index 08b7cc900cae..f81a62380add 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/Kconfig</a></div><div class='hunk'>@@ -47,6 +47,18 @@ config MCA</div><div class='ctx'> 	  &lt;file:Documentation/mca.txt&gt; (and especially the web page given</div><div class='ctx'> 	  there) before attempting to build an MCA bus kernel.</div><div class='ctx'> </div><div class='add'>+config GENERIC_HARDIRQS</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config HARDIRQS_SW_RESEND</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config GENERIC_IRQ_PROBE</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -93,15 +105,49 @@ choice</div><div class='ctx'> 	prompt "ARM system type"</div><div class='ctx'> 	default ARCH_VERSATILE</div><div class='ctx'> </div><div class='add'>+config ARCH_AAEC2000</div><div class='add'>+	bool "Agilent AAEC-2000 based"</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	help</div><div class='add'>+	  This enables support for systems based on the Agilent AAEC-2000</div><div class='add'>+</div><div class='add'>+config ARCH_INTEGRATOR</div><div class='add'>+	bool "ARM Ltd. Integrator family"</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	select ICST525</div><div class='add'>+	help</div><div class='add'>+	  Support for ARM's Integrator platform.</div><div class='add'>+</div><div class='add'>+config ARCH_REALVIEW</div><div class='add'>+	bool "ARM Ltd. RealView family"</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	select ICST307</div><div class='add'>+	help</div><div class='add'>+	  This enables support for ARM Ltd RealView boards.</div><div class='add'>+</div><div class='add'>+config ARCH_VERSATILE</div><div class='add'>+	bool "ARM Ltd. Versatile family"</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	select ARM_VIC</div><div class='add'>+	select ICST307</div><div class='add'>+	help</div><div class='add'>+	  This enables support for ARM Ltd Versatile board.</div><div class='add'>+</div><div class='add'>+config ARCH_AT91</div><div class='add'>+	bool "Atmel AT91"</div><div class='add'>+	help</div><div class='add'>+	  This enables support for systems based on the Atmel AT91RM9200</div><div class='add'>+	  and AT91SAM9xxx processors.</div><div class='add'>+</div><div class='ctx'> config ARCH_CLPS7500</div><div class='del'>-	bool "Cirrus-CL-PS7500FE"</div><div class='add'>+	bool "Cirrus CL-PS7500FE"</div><div class='ctx'> 	select TIMER_ACORN</div><div class='ctx'> 	select ISA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the Cirrus Logic PS7500FE system-on-a-chip.</div><div class='ctx'> </div><div class='ctx'> config ARCH_CLPS711X</div><div class='del'>-	bool "CLPS711x/EP721x-based"</div><div class='add'>+	bool "Cirrus Logic CLPS711x/EP721x-based"</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Cirrus Logic 711x/721x based boards.</div><div class='ctx'> </div><div class='hunk'>@@ -135,32 +181,46 @@ config ARCH_FOOTBRIDGE</div><div class='ctx'> 	  Support for systems based on the DC21285 companion chip</div><div class='ctx'> 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.</div><div class='ctx'> </div><div class='del'>-config ARCH_INTEGRATOR</div><div class='del'>-	bool "Integrator"</div><div class='del'>-	select ARM_AMBA</div><div class='del'>-	select ICST525</div><div class='add'>+config ARCH_NETX</div><div class='add'>+	bool "Hilscher NetX based"</div><div class='add'>+	select ARM_VIC</div><div class='ctx'> 	help</div><div class='del'>-	  Support for ARM's Integrator platform.</div><div class='add'>+	  This enables support for systems based on the Hilscher NetX Soc</div><div class='add'>+</div><div class='add'>+config ARCH_H720X</div><div class='add'>+	bool "Hynix HMS720x-based"</div><div class='add'>+	select ISA_DMA_API</div><div class='add'>+	help</div><div class='add'>+	  This enables support for systems based on the Hynix HMS720x</div><div class='add'>+</div><div class='add'>+config ARCH_IMX</div><div class='add'>+	bool "IMX"</div><div class='add'>+	help</div><div class='add'>+	  Support for Motorola's i.MX family of processors (MX1, MXL).</div><div class='ctx'> </div><div class='ctx'> config ARCH_IOP3XX</div><div class='ctx'> 	bool "IOP3xx-based"</div><div class='add'>+	depends on MMU</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's IOP3XX (XScale) family of processors.</div><div class='ctx'> </div><div class='ctx'> config ARCH_IXP4XX</div><div class='ctx'> 	bool "IXP4xx-based"</div><div class='add'>+	depends on MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's IXP4XX (XScale) family of processors.</div><div class='ctx'> </div><div class='ctx'> config ARCH_IXP2000</div><div class='ctx'> 	bool "IXP2400/2800-based"</div><div class='add'>+	depends on MMU</div><div class='ctx'> 	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's IXP2400/2800 (XScale) family of processors.</div><div class='ctx'> </div><div class='ctx'> config ARCH_IXP23XX</div><div class='ctx'>  	bool "IXP23XX-based"</div><div class='add'>+	depends on MMU</div><div class='ctx'>  	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's IXP23xx (XScale) family of processors.</div><div class='hunk'>@@ -178,8 +238,14 @@ config ARCH_L7200</div><div class='ctx'> 	  If you have any questions or comments about the Linux kernel port</div><div class='ctx'> 	  to this board, send e-mail to &lt;sjhill@cotw.com&gt;.</div><div class='ctx'> </div><div class='add'>+config ARCH_PNX4008</div><div class='add'>+	bool "Philips Nexperia PNX4008 Mobile"</div><div class='add'>+	help</div><div class='add'>+	  This enables support for Philips PNX4008 mobile platform.</div><div class='add'>+</div><div class='ctx'> config ARCH_PXA</div><div class='ctx'> 	bool "PXA2xx-based"</div><div class='add'>+	depends on MMU</div><div class='ctx'> 	select ARCH_MTD_XIP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for Intel's PXA2XX processor line.</div><div class='hunk'>@@ -204,7 +270,7 @@ config ARCH_SA1100</div><div class='ctx'> 	  Support for StrongARM 11x0 based boards.</div><div class='ctx'> </div><div class='ctx'> config ARCH_S3C2410</div><div class='del'>-	bool "Samsung S3C2410"</div><div class='add'>+	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442"</div><div class='ctx'> 	help</div><div class='ctx'> 	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics</div><div class='ctx'> 	  BAST (&lt;http://www.simtec.co.uk/products/EB110ITX/&gt;), the IPAQ 1940 or</div><div class='hunk'>@@ -232,44 +298,6 @@ config ARCH_OMAP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for TI's OMAP platform (OMAP1 and OMAP2).</div><div class='ctx'> </div><div class='del'>-config ARCH_VERSATILE</div><div class='del'>-	bool "Versatile"</div><div class='del'>-	select ARM_AMBA</div><div class='del'>-	select ARM_VIC</div><div class='del'>-	select ICST307</div><div class='del'>-	help</div><div class='del'>-	  This enables support for ARM Ltd Versatile board.</div><div class='del'>-</div><div class='del'>-config ARCH_REALVIEW</div><div class='del'>-	bool "RealView"</div><div class='del'>-	select ARM_AMBA</div><div class='del'>-	select ICST307</div><div class='del'>-	help</div><div class='del'>-	  This enables support for ARM Ltd RealView boards.</div><div class='del'>-</div><div class='del'>-config ARCH_IMX</div><div class='del'>-	bool "IMX"</div><div class='del'>-	help</div><div class='del'>-	  Support for Motorola's i.MX family of processors (MX1, MXL).</div><div class='del'>-</div><div class='del'>-config ARCH_H720X</div><div class='del'>-	bool "Hynix-HMS720x-based"</div><div class='del'>-	select ISA_DMA_API</div><div class='del'>-	help</div><div class='del'>-	  This enables support for systems based on the Hynix HMS720x</div><div class='del'>-</div><div class='del'>-config ARCH_AAEC2000</div><div class='del'>-	bool "Agilent AAEC-2000 based"</div><div class='del'>-	select ARM_AMBA</div><div class='del'>-	help</div><div class='del'>-	  This enables support for systems based on the Agilent AAEC-2000</div><div class='del'>-</div><div class='del'>-config ARCH_AT91RM9200</div><div class='del'>-	bool "AT91RM9200"</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you intend to run this kernel on an Atmel</div><div class='del'>-	  AT91RM9200-based board.</div><div class='del'>-</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> source "arch/arm/mach-clps711x/Kconfig"</div><div class='hunk'>@@ -314,6 +342,8 @@ source "arch/arm/mach-realview/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "arch/arm/mach-at91rm9200/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "arch/arm/mach-netx/Kconfig"</div><div class='add'>+</div><div class='ctx'> # Definitions to make life easier</div><div class='ctx'> config ARCH_ACORN</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -326,6 +356,10 @@ config XSCALE_PMU</div><div class='ctx'> 	depends on CPU_XSCALE &amp;&amp; !XSCALE_PMU_TIMER</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+if !MMU</div><div class='add'>+source "arch/arm/Kconfig-nommu"</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> source "arch/arm/common/Kconfig"</div><div class='hunk'>@@ -359,7 +393,7 @@ config ISA_DMA_API</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config PCI</div><div class='del'>-	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB</div><div class='add'>+	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX</div><div class='ctx'> 	help</div><div class='ctx'> 	  Find out whether you have a PCI motherboard. PCI is the name of a</div><div class='ctx'> 	  bus system, i.e. the way the CPU talks to the other stuff inside</div><div class='hunk'>@@ -525,7 +559,7 @@ config LEDS</div><div class='ctx'> 		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \</div><div class='ctx'> 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \</div><div class='ctx'> 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \</div><div class='del'>-		   ARCH_AT91RM9200</div><div class='add'>+		   ARCH_AT91RM9200 || MACH_TRIZEPS4</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say Y here, the LEDs on your machine will be used</div><div class='ctx'> 	  to provide useful information about your current system status.</div><div class='hunk'>@@ -656,7 +690,7 @@ config XIP_PHYS_ADDR</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='del'>-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1)</div><div class='add'>+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)</div><div class='ctx'> </div><div class='ctx'> menu "CPU Frequency scaling"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug<br/>index 5d3acff8c596..d22f38b957db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/Kconfig.debug</a></div><div class='hunk'>@@ -101,7 +101,7 @@ config DEBUG_S3C2410_UART</div><div class='ctx'> 	help</div><div class='ctx'> 	  Choice for UART for kernel low-level using S3C2410 UARTS,</div><div class='ctx'> 	  should be between zero and two. The port must have been</div><div class='del'>-	  initalised by the boot-loader before use.</div><div class='add'>+	  initialised by the boot-loader before use.</div><div class='ctx'> </div><div class='ctx'> 	  The uncompressor code port configuration is now handled</div><div class='ctx'> 	  by CONFIG_S3C2410_LOWLEVEL_UART_PORT.</div><div class='head'>diff --git a/arch/arm/Makefile b/arch/arm/Makefile<br/>index 6f8e84c1c1f2..3345c6d0fd1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/Makefile</a></div><div class='hunk'>@@ -114,8 +114,10 @@ endif</div><div class='ctx'>  machine-$(CONFIG_ARCH_H720X)	   := h720x</div><div class='ctx'>  machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000</div><div class='ctx'>  machine-$(CONFIG_ARCH_REALVIEW)   := realview</div><div class='del'>- machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200</div><div class='add'>+ machine-$(CONFIG_ARCH_AT91)       := at91rm9200</div><div class='ctx'>  machine-$(CONFIG_ARCH_EP93XX)     := ep93xx</div><div class='add'>+ machine-$(CONFIG_ARCH_PNX4008)    := pnx4008</div><div class='add'>+ machine-$(CONFIG_ARCH_NETX)       := netx</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_ARCH_EBSA110),y)</div><div class='ctx'> # This is what happens if you forget the IOCS16 line.</div><div class='hunk'>@@ -175,7 +177,7 @@ boot := arch/arm/boot</div><div class='ctx'> #	them changed.  We use .arch to indicate when they were updated</div><div class='ctx'> #	last, otherwise make uses the target directory mtime.</div><div class='ctx'> </div><div class='del'>-include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/MARKER</div><div class='add'>+include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf</div><div class='ctx'> 	@echo '  SYMLINK include/asm-arm/arch -&gt; include/asm-arm/$(INCDIR)'</div><div class='ctx'> ifneq ($(KBUILD_SRC),)</div><div class='ctx'> 	$(Q)mkdir -p include/asm-arm</div><div class='head'>diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S<br/>index 2119ea62b547..d68b9acd826e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-at91rm9200.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-at91rm9200.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-at91rm9200.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head-at91rm9200.S</a></div><div class='hunk'>@@ -49,6 +49,24 @@</div><div class='ctx'> 		cmp	r7, r3</div><div class='ctx'> 		beq	99f</div><div class='ctx'> </div><div class='add'>+		@ Embest ATEB9200 : 923</div><div class='add'>+		mov	r3,	#(MACH_TYPE_ATEB9200 &amp; 0xff)</div><div class='add'>+		orr	r3, r3,	#(MACH_TYPE_ATEB9200 &amp; 0xff00)</div><div class='add'>+		cmp	r7, r3</div><div class='add'>+		beq	99f</div><div class='add'>+</div><div class='add'>+		@ Sperry-Sun KAFA : 662</div><div class='add'>+		mov	r3,	#(MACH_TYPE_KAFA &amp; 0xff)</div><div class='add'>+		orr	r3, r3,	#(MACH_TYPE_KAFA &amp; 0xff00)</div><div class='add'>+		cmp	r7, r3</div><div class='add'>+		beq	99f</div><div class='add'>+</div><div class='add'>+		@ Ajeco 1ARM : 1075</div><div class='add'>+		mov	r3,	#(MACH_TYPE_ONEARM &amp; 0xff)</div><div class='add'>+		orr	r3, r3, #(MACH_TYPE_ONEARM &amp; 0xff00)</div><div class='add'>+		cmp	r7, r3</div><div class='add'>+		beq	99f</div><div class='add'>+</div><div class='ctx'> 		@ Unknown board, use the AT91RM9200DK board</div><div class='ctx'> 		@ mov	r7, #MACH_TYPE_AT91RM9200</div><div class='ctx'> 		mov	r7,	#(MACH_TYPE_AT91RM9200DK &amp; 0xff)</div><div class='head'>diff --git a/arch/arm/boot/compressed/head-clps7500.S b/arch/arm/boot/compressed/head-clps7500.S<br/>index 4a8a689d15e6..941c5f5cbacf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-clps7500.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-clps7500.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-clps7500.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head-clps7500.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		/* There are three different ways the kernel can be</div><div class='ctx'> 		   booted on a 7500 system: from Angel (loaded in RAM), from</div><div class='head'>diff --git a/arch/arm/boot/compressed/head-l7200.S b/arch/arm/boot/compressed/head-l7200.S<br/>index b08bd23f8d16..d0e3b20856cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-l7200.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-l7200.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-l7200.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head-l7200.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * is merged with head.S by the linker.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_ARCH_L7200</div><div class='head'>diff --git a/arch/arm/boot/compressed/head-sa1100.S b/arch/arm/boot/compressed/head-sa1100.S<br/>index 5aefffd46048..4c8c0e46027d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-sa1100.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-sa1100.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-sa1100.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head-sa1100.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/compressed/head-sharpsl.S b/arch/arm/boot/compressed/head-sharpsl.S<br/>index 59ad69640d6b..eb0084ea1ec4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-sharpsl.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-sharpsl.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-sharpsl.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head-sharpsl.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S<br/>index d3fe2533907e..73c5d9e0201c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-xscale.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head-xscale.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head-xscale.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head-xscale.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S<br/>index b56f5e691d65..14a9ff9c68df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/head.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -448,8 +447,11 @@ __common_mmu_cache_on:</div><div class='ctx'> 		mov	r1, #-1</div><div class='ctx'> 		mcr	p15, 0, r3, c2, c0, 0	@ load page table pointer</div><div class='ctx'> 		mcr	p15, 0, r1, c3, c0, 0	@ load domain access control</div><div class='del'>-		mcr	p15, 0, r0, c1, c0, 0	@ load control register</div><div class='del'>-		mov	pc, lr</div><div class='add'>+		b	1f</div><div class='add'>+		.align	5			@ cache line aligned</div><div class='add'>+1:		mcr	p15, 0, r0, c1, c0, 0	@ load control register</div><div class='add'>+		mrc	p15, 0, r0, c1, c0, 0	@ and read it back to</div><div class='add'>+		sub	pc, lr, r0, lsr #32	@ properly flush pipeline</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * All code following this line is relocatable.  It is relocated by</div><div class='hunk'>@@ -605,8 +607,8 @@ proc_types:</div><div class='ctx'> 		b	__armv4_mmu_cache_off</div><div class='ctx'> 		b	__armv4_mmu_cache_flush</div><div class='ctx'> </div><div class='del'>-		.word	0x00070000		@ ARMv6</div><div class='del'>-		.word	0x000f0000</div><div class='add'>+		.word	0x0007b000		@ ARMv6</div><div class='add'>+		.word	0x0007f000</div><div class='ctx'> 		b	__armv4_mmu_cache_on</div><div class='ctx'> 		b	__armv4_mmu_cache_off</div><div class='ctx'> 		b	__armv6_mmu_cache_flush</div><div class='head'>diff --git a/arch/arm/boot/compressed/ll_char_wr.S b/arch/arm/boot/compressed/ll_char_wr.S<br/>index d7bbd9da2fca..8517c8606b4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/ll_char_wr.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/boot/compressed/ll_char_wr.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/boot/compressed/ll_char_wr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/boot/compressed/ll_char_wr.S</a></div><div class='hunk'>@@ -77,7 +77,7 @@ Lrow4bpplp:</div><div class='ctx'> 	subne	r1, r1, #1</div><div class='ctx'> 	ldrneb	r7, [r6, r1]</div><div class='ctx'> 	bne	Lrow4bpplp</div><div class='del'>-	LOADREGS(fd, sp!, {r4 - r7, pc})</div><div class='add'>+	ldmfd	sp!, {r4 - r7, pc}</div><div class='ctx'> </div><div class='ctx'> @</div><div class='ctx'> @ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc)</div><div class='hunk'>@@ -105,7 +105,7 @@ Lrow8bpplp:</div><div class='ctx'> 	subne	r1, r1, #1</div><div class='ctx'> 	ldrneb	r7, [r6, r1]</div><div class='ctx'> 	bne	Lrow8bpplp</div><div class='del'>-	LOADREGS(fd, sp!, {r4 - r7, pc})</div><div class='add'>+	ldmfd	sp!, {r4 - r7, pc}</div><div class='ctx'> </div><div class='ctx'> @</div><div class='ctx'> @ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc)</div><div class='hunk'>@@ -127,7 +127,7 @@ Lrow1bpp:</div><div class='ctx'> 	strb	r7, [r0], r5</div><div class='ctx'> 	mov	r7, r7, lsr #8</div><div class='ctx'> 	strb	r7, [r0], r5</div><div class='del'>-	LOADREGS(fd, sp!, {r4 - r7, pc})</div><div class='add'>+	ldmfd	sp!, {r4 - r7, pc}</div><div class='ctx'> </div><div class='ctx'> 	.bss</div><div class='ctx'> ENTRY(con_charconvtable)</div><div class='head'>diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile<br/>index 847e3e6356c6..e1289a256ce5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/Makefile</a></div><div class='hunk'>@@ -16,3 +16,4 @@ obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o</div><div class='ctx'> obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o</div><div class='ctx'> obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o</div><div class='ctx'> obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o</div><div class='add'>+obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o</div><div class='head'>diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c<br/>index 7971d0dc6892..5b7c26395b44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/dmabounce.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/dmabounce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/dmabounce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/dmabounce.c</a></div><div class='hunk'>@@ -77,6 +77,8 @@ struct dmabounce_device_info {</div><div class='ctx'> #endif</div><div class='ctx'> 	struct dmabounce_pool	small;</div><div class='ctx'> 	struct dmabounce_pool	large;</div><div class='add'>+</div><div class='add'>+	rwlock_t lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(dmabounce_devs);</div><div class='hunk'>@@ -116,6 +118,7 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,</div><div class='ctx'> 	struct safe_buffer *buf;</div><div class='ctx'> 	struct dmabounce_pool *pool;</div><div class='ctx'> 	struct device *dev = device_info-&gt;dev;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p, size=%d, dir=%d)\n",</div><div class='ctx'> 		__func__, ptr, size, dir);</div><div class='hunk'>@@ -163,8 +166,12 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,</div><div class='ctx'> 		print_alloc_stats(device_info);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	write_lock_irqsave(&amp;device_info-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	list_add(&amp;buf-&gt;node, &amp;device_info-&gt;safe_buffers);</div><div class='ctx'> </div><div class='add'>+	write_unlock_irqrestore(&amp;device_info-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -172,22 +179,32 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,</div><div class='ctx'> static inline struct safe_buffer *</div><div class='ctx'> find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_addr)</div><div class='ctx'> {</div><div class='del'>-	struct safe_buffer *b;</div><div class='add'>+	struct safe_buffer *b = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	read_lock_irqsave(&amp;device_info-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(b, &amp;device_info-&gt;safe_buffers, node)</div><div class='ctx'> 		if (b-&gt;safe_dma_addr == safe_dma_addr)</div><div class='del'>-			return b;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	read_unlock_irqrestore(&amp;device_info-&gt;lock, flags);</div><div class='add'>+	return b;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> free_safe_buffer(struct dmabounce_device_info *device_info, struct safe_buffer *buf)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(device_info-&gt;dev, "%s(buf=%p)\n", __func__, buf);</div><div class='ctx'> </div><div class='add'>+	write_lock_irqsave(&amp;device_info-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	list_del(&amp;buf-&gt;node);</div><div class='ctx'> </div><div class='add'>+	write_unlock_irqrestore(&amp;device_info-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (buf-&gt;pool)</div><div class='ctx'> 		dma_pool_free(buf-&gt;pool-&gt;pool, buf-&gt;safe, buf-&gt;safe_dma_addr);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -396,7 +413,6 @@ dma_addr_t</div><div class='ctx'> dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> 		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='hunk'>@@ -404,12 +420,8 @@ dma_map_single(struct device *dev, void *ptr, size_t size,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	dma_addr = map_single(dev, ptr, size, dir);</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='ctx'> 	return dma_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -424,25 +436,18 @@ void</div><div class='ctx'> dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 			enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='ctx'> 		__func__, (void *) dma_addr, size, dir);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	unmap_single(dev, dma_addr, size, dir);</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='hunk'>@@ -450,8 +455,6 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='ctx'> 		struct page *page = sg-&gt;page;</div><div class='ctx'> 		unsigned int offset = sg-&gt;offset;</div><div class='hunk'>@@ -462,8 +465,6 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 			map_single(dev, ptr, length, dir);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -471,7 +472,6 @@ void</div><div class='ctx'> dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 		enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='hunk'>@@ -479,55 +479,38 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='ctx'> 		dma_addr_t dma_addr = sg-&gt;dma_address;</div><div class='ctx'> 		unsigned int length = sg-&gt;length;</div><div class='ctx'> </div><div class='ctx'> 		unmap_single(dev, dma_addr, length, dir);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 				enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='ctx'> 		__func__, (void *) dma_addr, size, dir);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	sync_single(dev, dma_addr, size, dir);</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> dma_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size,</div><div class='ctx'> 				enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",</div><div class='ctx'> 		__func__, (void *) dma_addr, size, dir);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	sync_single(dev, dma_addr, size, dir);</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 			enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='hunk'>@@ -535,23 +518,18 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='ctx'> 		dma_addr_t dma_addr = sg-&gt;dma_address;</div><div class='ctx'> 		unsigned int length = sg-&gt;length;</div><div class='ctx'> </div><div class='ctx'> 		sync_single(dev, dma_addr, length, dir);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 			enum dma_data_direction dir)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",</div><div class='hunk'>@@ -559,16 +537,12 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(dir == DMA_NONE);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; nents; i++, sg++) {</div><div class='ctx'> 		dma_addr_t dma_addr = sg-&gt;dma_address;</div><div class='ctx'> 		unsigned int length = sg-&gt;length;</div><div class='ctx'> </div><div class='ctx'> 		sync_single(dev, dma_addr, length, dir);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -622,6 +596,7 @@ dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,</div><div class='ctx'> </div><div class='ctx'> 	device_info-&gt;dev = dev;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;device_info-&gt;safe_buffers);</div><div class='add'>+	rwlock_init(&amp;device_info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> #ifdef STATS</div><div class='ctx'> 	device_info-&gt;total_allocs = 0;</div><div class='head'>diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c<br/>index c02dc8116a18..f3c1ebfdd0aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/gic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/gic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/gic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/gic.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> static void __iomem *gic_dist_base;</div><div class='ctx'> static void __iomem *gic_cpu_base;</div><div class='add'>+static DEFINE_SPINLOCK(irq_controller_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Routines to acknowledge, disable and enable interrupts</div><div class='hunk'>@@ -52,32 +53,45 @@ static void __iomem *gic_cpu_base;</div><div class='ctx'> static void gic_ack_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = 1 &lt;&lt; (irq % 32);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_controller_lock);</div><div class='ctx'> 	writel(mask, gic_dist_base + GIC_DIST_ENABLE_CLEAR + (irq / 32) * 4);</div><div class='ctx'> 	writel(irq, gic_cpu_base + GIC_CPU_EOI);</div><div class='add'>+	spin_unlock(&amp;irq_controller_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gic_mask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = 1 &lt;&lt; (irq % 32);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_controller_lock);</div><div class='ctx'> 	writel(mask, gic_dist_base + GIC_DIST_ENABLE_CLEAR + (irq / 32) * 4);</div><div class='add'>+	spin_unlock(&amp;irq_controller_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gic_unmask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = 1 &lt;&lt; (irq % 32);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;irq_controller_lock);</div><div class='ctx'> 	writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4);</div><div class='add'>+	spin_unlock(&amp;irq_controller_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu)</div><div class='add'>+static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq &amp; ~3);</div><div class='ctx'> 	unsigned int shift = (irq % 4) * 8;</div><div class='add'>+	unsigned int cpu = first_cpu(mask_val);</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;irq_controller_lock);</div><div class='add'>+	irq_desc[irq].cpu = cpu;</div><div class='ctx'> 	val = readl(reg) &amp; ~(0xff &lt;&lt; shift);</div><div class='ctx'> 	val |= 1 &lt;&lt; (cpu + shift);</div><div class='ctx'> 	writel(val, reg);</div><div class='add'>+	spin_unlock(&amp;irq_controller_lock);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +100,7 @@ static struct irqchip gic_chip = {</div><div class='ctx'> 	.mask		= gic_mask_irq,</div><div class='ctx'> 	.unmask		= gic_unmask_irq,</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	.set_cpu	= gic_set_cpu,</div><div class='add'>+	.set_affinity	= gic_set_cpu,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c<br/>index a7dc1370695b..04de83f4f008 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/locomo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/locomo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/locomo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/locomo.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * Based on sa1111.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -507,7 +506,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(dev-&gt;dev.bus_id,info-&gt;name,sizeof(dev-&gt;dev.bus_id));</div><div class='add'>+	strncpy(dev-&gt;dev.bus_id, info-&gt;name, sizeof(dev-&gt;dev.bus_id));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the parent device has a DMA mask associated with it,</div><div class='ctx'> 	 * propagate it down to the children.</div><div class='hunk'>@@ -629,21 +628,6 @@ static int locomo_resume(struct platform_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define LCM_ALC_EN	0x8000</div><div class='del'>-</div><div class='del'>-void frontlight_set(struct locomo *lchip, int duty, int vr, int bpwf)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lchip-&gt;lock, flags);</div><div class='del'>-	locomo_writel(bpwf, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);</div><div class='del'>-	udelay(100);</div><div class='del'>-	locomo_writel(duty, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);</div><div class='del'>-	locomo_writel(bpwf | LCM_ALC_EN, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);</div><div class='del'>-	spin_unlock_irqrestore(&amp;lchip-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	locomo_probe - probe for a single LoCoMo chip.</div><div class='ctx'>  *	@phys_addr: physical address of device.</div><div class='hunk'>@@ -698,14 +682,10 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)</div><div class='ctx'> 			, lchip-&gt;base + LOCOMO_GPD);</div><div class='ctx'> 	locomo_writel(0, lchip-&gt;base + LOCOMO_GIE);</div><div class='ctx'> </div><div class='del'>-	/* FrontLight */</div><div class='add'>+	/* Frontlight */</div><div class='ctx'> 	locomo_writel(0, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);</div><div class='ctx'> 	locomo_writel(0, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);</div><div class='ctx'> </div><div class='del'>-	/* Same constants can be used for collie and poodle</div><div class='del'>-	   (depending on CONFIG options in original sharp code)? */</div><div class='del'>-	frontlight_set(lchip, 163, 0, 148);</div><div class='del'>-</div><div class='ctx'> 	/* Longtime timer */</div><div class='ctx'> 	locomo_writel(0, lchip-&gt;base + LOCOMO_LTINT);</div><div class='ctx'> 	/* SPI */</div><div class='hunk'>@@ -749,7 +729,6 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(locomo_devices); i++)</div><div class='ctx'> 		locomo_init_one_child(lchip, &amp;locomo_devices[i]);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -1063,6 +1042,30 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ *	Frontlight control</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct locomo *locomo_chip_driver(struct locomo_dev *ldev);</div><div class='add'>+</div><div class='add'>+void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct locomo *lchip = locomo_chip_driver(dev);</div><div class='add'>+</div><div class='add'>+	if (vr)</div><div class='add'>+		locomo_gpio_write(dev, LOCOMO_GPIO_FL_VR, 1);</div><div class='add'>+	else</div><div class='add'>+		locomo_gpio_write(dev, LOCOMO_GPIO_FL_VR, 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lchip-&gt;lock, flags);</div><div class='add'>+	locomo_writel(bpwf, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);</div><div class='add'>+	udelay(100);</div><div class='add'>+	locomo_writel(duty, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);</div><div class='add'>+	locomo_writel(bpwf | LOCOMO_ALC_EN, lchip-&gt;base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lchip-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *	LoCoMo "Register Access Bus."</div><div class='ctx'>  *</div><div class='ctx'>  *	We model this as a regular bus type, and hang devices directly</div><div class='head'>diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c<br/>index 3f68db84e5e6..1cdb26a47e1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/sa1111.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/sa1111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/sa1111.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/sa1111.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * All initialization functions provided here are intended to be called</div><div class='ctx'>  * from machine specific code with proper arguments when required.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -151,7 +150,7 @@ static void</div><div class='ctx'> sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int stat0, stat1, i;</div><div class='del'>-	void __iomem *base = desc-&gt;data;</div><div class='add'>+	void __iomem *base = get_irq_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	stat0 = sa1111_readl(base + SA1111_INTSTATCLR0);</div><div class='ctx'> 	stat1 = sa1111_readl(base + SA1111_INTSTATCLR1);</div><div class='hunk'>@@ -169,11 +168,11 @@ sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	for (i = IRQ_SA1111_START; stat0; i++, stat0 &gt;&gt;= 1)</div><div class='ctx'> 		if (stat0 &amp; 1)</div><div class='del'>-			do_edge_IRQ(i, irq_desc + i, regs);</div><div class='add'>+			handle_edge_irq(i, irq_desc + i, regs);</div><div class='ctx'> </div><div class='ctx'> 	for (i = IRQ_SA1111_START + 32; stat1; i++, stat1 &gt;&gt;= 1)</div><div class='ctx'> 		if (stat1 &amp; 1)</div><div class='del'>-			do_edge_IRQ(i, irq_desc + i, regs);</div><div class='add'>+			handle_edge_irq(i, irq_desc + i, regs);</div><div class='ctx'> </div><div class='ctx'> 	/* For level-based interrupts */</div><div class='ctx'> 	desc-&gt;chip-&gt;unmask(irq);</div><div class='head'>diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c<br/>index 3cd8c9ee4510..59b5ddec480f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/sharpsl_pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/sharpsl_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/sharpsl_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/sharpsl_pm.c</a></div><div class='hunk'>@@ -49,13 +49,6 @@</div><div class='ctx'> #define SHARPSL_CHARGE_CO_CHECK_TIME           5   /* 5 msec */</div><div class='ctx'> #define SHARPSL_CHARGE_RETRY_CNT               1   /* eqv. 10 min */</div><div class='ctx'> </div><div class='del'>-#define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */</div><div class='del'>-#define SHARPSL_CHARGE_ON_TEMP         0xe0  /* 2.9V */</div><div class='del'>-#define SHARPSL_CHARGE_ON_ACIN_HIGH    0x9b  /* 6V */</div><div class='del'>-#define SHARPSL_CHARGE_ON_ACIN_LOW     0x34  /* 2V */</div><div class='del'>-#define SHARPSL_FATAL_ACIN_VOLT        182   /* 3.45V */</div><div class='del'>-#define SHARPSL_FATAL_NOACIN_VOLT      170   /* 3.40V */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Prototypes</div><div class='ctx'>  */</div><div class='hunk'>@@ -82,12 +75,13 @@ DEFINE_LED_TRIGGER(sharpsl_charge_led_trigger);</div><div class='ctx'> static int get_percentage(int voltage)</div><div class='ctx'> {</div><div class='ctx'> 	int i = sharpsl_pm.machinfo-&gt;bat_levels - 1;</div><div class='add'>+	int bl_status = sharpsl_pm.machinfo-&gt;backlight_get_status ? sharpsl_pm.machinfo-&gt;backlight_get_status() : 0;</div><div class='ctx'> 	struct battery_thresh *thresh;</div><div class='ctx'> </div><div class='ctx'> 	if (sharpsl_pm.charge_mode == CHRG_ON)</div><div class='del'>-		thresh=sharpsl_pm.machinfo-&gt;bat_levels_acin;</div><div class='add'>+		thresh = bl_status ? sharpsl_pm.machinfo-&gt;bat_levels_acin_bl : sharpsl_pm.machinfo-&gt;bat_levels_acin;</div><div class='ctx'> 	else</div><div class='del'>-		thresh=sharpsl_pm.machinfo-&gt;bat_levels_noac;</div><div class='add'>+		thresh = bl_status ? sharpsl_pm.machinfo-&gt;bat_levels_noac_bl : sharpsl_pm.machinfo-&gt;bat_levels_noac;</div><div class='ctx'> </div><div class='ctx'> 	while (i &gt; 0 &amp;&amp; (voltage &gt; thresh[i].voltage))</div><div class='ctx'> 		i--;</div><div class='hunk'>@@ -131,7 +125,7 @@ static void sharpsl_battery_thread(void *private_)</div><div class='ctx'> 	sharpsl_pm.battstat.ac_status = (sharpsl_pm.machinfo-&gt;read_devdata(SHARPSL_STATUS_ACIN) ? APM_AC_ONLINE : APM_AC_OFFLINE);</div><div class='ctx'> </div><div class='ctx'> 	/* Corgi cannot confirm when battery fully charged so periodically kick! */</div><div class='del'>-	if (machine_is_corgi() &amp;&amp; (sharpsl_pm.charge_mode == CHRG_ON)</div><div class='add'>+	if (!sharpsl_pm.machinfo-&gt;batfull_irq &amp;&amp; (sharpsl_pm.charge_mode == CHRG_ON)</div><div class='ctx'> 			&amp;&amp; time_after(jiffies, sharpsl_pm.charge_start_time +  SHARPSL_CHARGE_ON_TIME_INTERVAL))</div><div class='ctx'> 		schedule_work(&amp;toggle_charger);</div><div class='ctx'> </div><div class='hunk'>@@ -166,11 +160,11 @@ static void sharpsl_battery_thread(void *private_)</div><div class='ctx'> 			&amp;&amp; ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) ||</div><div class='ctx'> 			(sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {</div><div class='ctx'> 		if (!(sharpsl_pm.flags &amp; SHARPSL_BL_LIMIT)) {</div><div class='del'>-			corgibl_limit_intensity(1);</div><div class='add'>+			sharpsl_pm.machinfo-&gt;backlight_limit(1);</div><div class='ctx'> 			sharpsl_pm.flags |= SHARPSL_BL_LIMIT;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (sharpsl_pm.flags &amp; SHARPSL_BL_LIMIT) {</div><div class='del'>-		corgibl_limit_intensity(0);</div><div class='add'>+		sharpsl_pm.machinfo-&gt;backlight_limit(0);</div><div class='ctx'> 		sharpsl_pm.flags &amp;= ~SHARPSL_BL_LIMIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -418,8 +412,10 @@ static int sharpsl_check_battery_temp(void)</div><div class='ctx'> 	val = get_select_val(buff);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);</div><div class='del'>-	if (val &gt; SHARPSL_CHARGE_ON_TEMP)</div><div class='add'>+	if (val &gt; sharpsl_pm.machinfo-&gt;charge_on_temp) {</div><div class='add'>+		printk(KERN_WARNING "Not charging: temperature out of limits.\n");</div><div class='ctx'> 		return -1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -450,7 +446,7 @@ static int sharpsl_check_battery_voltage(void)</div><div class='ctx'> 	val = get_select_val(buff);</div><div class='ctx'> 	dev_dbg(sharpsl_pm.dev, "Battery Voltage: %d\n", val);</div><div class='ctx'> </div><div class='del'>-	if (val &lt; SHARPSL_CHARGE_ON_VOLT)</div><div class='add'>+	if (val &lt; sharpsl_pm.machinfo-&gt;charge_on_volt)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -468,7 +464,7 @@ static int sharpsl_ac_check(void)</div><div class='ctx'> 	temp = get_select_val(buff);</div><div class='ctx'> 	dev_dbg(sharpsl_pm.dev, "AC Voltage: %d\n",temp);</div><div class='ctx'> </div><div class='del'>-	if ((temp &gt; SHARPSL_CHARGE_ON_ACIN_HIGH) || (temp &lt; SHARPSL_CHARGE_ON_ACIN_LOW)) {</div><div class='add'>+	if ((temp &gt; sharpsl_pm.machinfo-&gt;charge_acin_high) || (temp &lt; sharpsl_pm.machinfo-&gt;charge_acin_low)) {</div><div class='ctx'> 		dev_err(sharpsl_pm.dev, "Error: AC check failed.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -627,8 +623,8 @@ static int sharpsl_fatal_check(void)</div><div class='ctx'> 	temp = get_select_val(buff);</div><div class='ctx'> 	dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %d\n", acin, temp, sharpsl_pm.machinfo-&gt;read_devdata(SHARPSL_BATT_VOLT));</div><div class='ctx'> </div><div class='del'>-	if ((acin &amp;&amp; (temp &lt; SHARPSL_FATAL_ACIN_VOLT)) ||</div><div class='del'>-			(!acin &amp;&amp; (temp &lt; SHARPSL_FATAL_NOACIN_VOLT)))</div><div class='add'>+	if ((acin &amp;&amp; (temp &lt; sharpsl_pm.machinfo-&gt;fatal_acin_volt)) ||</div><div class='add'>+			(!acin &amp;&amp; (temp &lt; sharpsl_pm.machinfo-&gt;fatal_noacin_volt)))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c<br/>index 486add853fb8..3f60dd9aca80 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/time-acorn.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/time-acorn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/time-acorn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/time-acorn.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -76,7 +77,7 @@ ioc_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ioc_timer_irq = {</div><div class='ctx'> 	.name		= "timer",</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.handler	= ioc_timer_interrupt</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c<br/>index a1310b71004e..95c8508c29b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/uengine.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/uengine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/uengine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/uengine.c</a></div><div class='hunk'>@@ -11,17 +11,32 @@</div><div class='ctx'>  * License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/ixp2000-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/uengine.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_IXP2000)</div><div class='add'>+#define IXP_UENGINE_CSR_VIRT_BASE	IXP2000_UENGINE_CSR_VIRT_BASE</div><div class='add'>+#define IXP_PRODUCT_ID			IXP2000_PRODUCT_ID</div><div class='add'>+#define IXP_MISC_CONTROL		IXP2000_MISC_CONTROL</div><div class='add'>+#define IXP_RESET1			IXP2000_RESET1</div><div class='add'>+#else</div><div class='add'>+#if defined(CONFIG_ARCH_IXP23XX)</div><div class='add'>+#define IXP_UENGINE_CSR_VIRT_BASE	IXP23XX_UENGINE_CSR_VIRT_BASE</div><div class='add'>+#define IXP_PRODUCT_ID			IXP23XX_PRODUCT_ID</div><div class='add'>+#define IXP_MISC_CONTROL		IXP23XX_MISC_CONTROL</div><div class='add'>+#define IXP_RESET1			IXP23XX_RESET1</div><div class='add'>+#else</div><div class='add'>+#error unknown platform</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define USTORE_ADDRESS			0x000</div><div class='ctx'> #define USTORE_DATA_LOWER		0x004</div><div class='ctx'> #define USTORE_DATA_UPPER		0x008</div><div class='hunk'>@@ -43,7 +58,7 @@ u32 ixp2000_uengine_mask;</div><div class='ctx'> </div><div class='ctx'> static void *ixp2000_uengine_csr_area(int uengine)</div><div class='ctx'> {</div><div class='del'>-	return ((void *)IXP2000_UENGINE_CSR_VIRT_BASE) + (uengine &lt;&lt; 10);</div><div class='add'>+	return ((void *)IXP_UENGINE_CSR_VIRT_BASE) + (uengine &lt;&lt; 10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -91,8 +106,13 @@ EXPORT_SYMBOL(ixp2000_uengine_csr_write);</div><div class='ctx'> </div><div class='ctx'> void ixp2000_uengine_reset(u32 uengine_mask)</div><div class='ctx'> {</div><div class='del'>-	ixp2000_reg_wrb(IXP2000_RESET1, uengine_mask &amp; ixp2000_uengine_mask);</div><div class='del'>-	ixp2000_reg_wrb(IXP2000_RESET1, 0);</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	value = ixp2000_reg_read(IXP_RESET1) &amp; ~ixp2000_uengine_mask;</div><div class='add'>+</div><div class='add'>+	uengine_mask &amp;= ixp2000_uengine_mask;</div><div class='add'>+	ixp2000_reg_wrb(IXP_RESET1, value | uengine_mask);</div><div class='add'>+	ixp2000_reg_wrb(IXP_RESET1, value);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ixp2000_uengine_reset);</div><div class='ctx'> </div><div class='hunk'>@@ -235,11 +255,12 @@ static int check_ixp_type(struct ixp2000_uengine_code *c)</div><div class='ctx'> 	u32 product_id;</div><div class='ctx'> 	u32 rev;</div><div class='ctx'> </div><div class='del'>-	product_id = ixp2000_reg_read(IXP2000_PRODUCT_ID);</div><div class='add'>+	product_id = ixp2000_reg_read(IXP_PRODUCT_ID);</div><div class='ctx'> 	if (((product_id &gt;&gt; 16) &amp; 0x1f) != 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch ((product_id &gt;&gt; 8) &amp; 0xff) {</div><div class='add'>+#ifdef CONFIG_ARCH_IXP2000</div><div class='ctx'> 	case 0:		/* IXP2800 */</div><div class='ctx'> 		if (!(c-&gt;cpu_model_bitmask &amp; 4))</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -254,6 +275,14 @@ static int check_ixp_type(struct ixp2000_uengine_code *c)</div><div class='ctx'> 		if (!(c-&gt;cpu_model_bitmask &amp; 2))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_IXP23XX</div><div class='add'>+	case 4:		/* IXP23xx */</div><div class='add'>+		if (!(c-&gt;cpu_model_bitmask &amp; 0x3f0))</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -432,7 +461,8 @@ static int __init ixp2000_uengine_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine number of microengines present.</div><div class='ctx'> 	 */</div><div class='del'>-	switch ((ixp2000_reg_read(IXP2000_PRODUCT_ID) &gt;&gt; 8) &amp; 0x1fff) {</div><div class='add'>+	switch ((ixp2000_reg_read(IXP_PRODUCT_ID) &gt;&gt; 8) &amp; 0x1fff) {</div><div class='add'>+#ifdef CONFIG_ARCH_IXP2000</div><div class='ctx'> 	case 0:		/* IXP2800 */</div><div class='ctx'> 	case 1:		/* IXP2850 */</div><div class='ctx'> 		ixp2000_uengine_mask = 0x00ff00ff;</div><div class='hunk'>@@ -441,10 +471,17 @@ static int __init ixp2000_uengine_init(void)</div><div class='ctx'> 	case 2:		/* IXP2400 */</div><div class='ctx'> 		ixp2000_uengine_mask = 0x000f000f;</div><div class='ctx'> 		break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_IXP23XX</div><div class='add'>+	case 4:		/* IXP23xx */</div><div class='add'>+		ixp2000_uengine_mask = (*IXP23XX_EXP_CFG_FUSE &gt;&gt; 8) &amp; 0xf;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_INFO "Detected unknown IXP2000 model (%.8x)\n",</div><div class='del'>-			(unsigned int)ixp2000_reg_read(IXP2000_PRODUCT_ID));</div><div class='add'>+			(unsigned int)ixp2000_reg_read(IXP_PRODUCT_ID));</div><div class='ctx'> 		ixp2000_uengine_mask = 0x00000000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -457,15 +494,15 @@ static int __init ixp2000_uengine_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Synchronise timestamp counters across all microengines.</div><div class='ctx'> 	 */</div><div class='del'>-	value = ixp2000_reg_read(IXP2000_MISC_CONTROL);</div><div class='del'>-	ixp2000_reg_wrb(IXP2000_MISC_CONTROL, value &amp; ~0x80);</div><div class='add'>+	value = ixp2000_reg_read(IXP_MISC_CONTROL);</div><div class='add'>+	ixp2000_reg_wrb(IXP_MISC_CONTROL, value &amp; ~0x80);</div><div class='ctx'> 	for (uengine = 0; uengine &lt; 32; uengine++) {</div><div class='ctx'> 		if (ixp2000_uengine_mask &amp; (1 &lt;&lt; uengine)) {</div><div class='ctx'> 			ixp2000_uengine_csr_write(uengine, TIMESTAMP_LOW, 0);</div><div class='ctx'> 			ixp2000_uengine_csr_write(uengine, TIMESTAMP_HIGH, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	ixp2000_reg_wrb(IXP2000_MISC_CONTROL, value | 0x80);</div><div class='add'>+	ixp2000_reg_wrb(IXP_MISC_CONTROL, value | 0x80);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c<br/>index ef716a5b07ac..ba2e62986a57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/common/via82c505.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/common/via82c505.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/common/via82c505.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/common/via82c505.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig<br/>index 9e1c1cceb735..4f3d8d37741e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91rm9200dk_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/at91rm9200dk_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91rm9200dk_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/at91rm9200dk_defconfig</a></div><div class='hunk'>@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> # CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_H720X is not set</div><div class='ctx'> # CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='ctx'> CONFIG_ARCH_AT91RM9200=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig<br/>index 6e0805a971d7..08b5dc38876f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/at91rm9200ek_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/at91rm9200ek_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/at91rm9200ek_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/at91rm9200ek_defconfig</a></div><div class='hunk'>@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> # CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_H720X is not set</div><div class='ctx'> # CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='ctx'> CONFIG_ARCH_AT91RM9200=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig<br/>new file mode 100644<br/>index 000000000000..bee7813d040e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/ateb9200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/ateb9200_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1313 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17-rc3</div><div class='add'>+# Sun May  7 16:53:18 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='add'>+CONFIG_ARCH_AT91RM9200=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Implementations</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AT91RM9200DK is not set</div><div class='add'>+# CONFIG_MACH_AT91RM9200EK is not set</div><div class='add'>+# CONFIG_MACH_CSB337 is not set</div><div class='add'>+# CONFIG_MACH_CSB637 is not set</div><div class='add'>+# CONFIG_MACH_CARMEVA is not set</div><div class='add'>+# CONFIG_MACH_KB9200 is not set</div><div class='add'>+CONFIG_MACH_ATEB9200=y</div><div class='add'>+# CONFIG_MACH_KAFA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91 Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM920T=y</div><div class='add'>+CONFIG_CPU_32v4=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCCARD=m</div><div class='add'>+# CONFIG_PCMCIA_DEBUG is not set</div><div class='add'>+CONFIG_PCMCIA=m</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_IOCTL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC-card bridges</div><div class='add'>+#</div><div class='add'>+CONFIG_AT91_CF=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_NO_IDLE_HZ=y</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+CONFIG_PM_LEGACY=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+CONFIG_BRIDGE=m</div><div class='add'>+CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+CONFIG_LLC=m</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+CONFIG_IEEE80211=m</div><div class='add'>+# CONFIG_IEEE80211_DEBUG is not set</div><div class='add'>+CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_CCMP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='add'>+# CONFIG_IEEE80211_SOFTMAC is not set</div><div class='add'>+CONFIG_WIRELESS_EXT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+# CONFIG_MTD_BLOCK is not set</div><div class='add'>+CONFIG_MTD_BLOCK_RO=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_AT91_DATAFLASH=y</div><div class='add'>+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=m</div><div class='add'>+CONFIG_BLK_DEV_SR_VENDOR=y</div><div class='add'>+CONFIG_CHR_DEV_SG=m</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA SCSI adapter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCMCIA_AHA152X is not set</div><div class='add'>+# CONFIG_PCMCIA_FDOMAIN is not set</div><div class='add'>+# CONFIG_PCMCIA_NINJA_SCSI is not set</div><div class='add'>+# CONFIG_PCMCIA_QLOGIC is not set</div><div class='add'>+# CONFIG_PCMCIA_SYM53C500 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_DUMMY=m</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+CONFIG_TUN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+CONFIG_DAVICOM_PHY=y</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_ARM_AT91_ETHER=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_RADIO=y</div><div class='add'>+# CONFIG_NET_WIRELESS_RTNETLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Obsolete Wireless cards support (pre-802.11)</div><div class='add'>+#</div><div class='add'>+# CONFIG_STRIP is not set</div><div class='add'>+# CONFIG_PCMCIA_WAVELAN is not set</div><div class='add'>+# CONFIG_PCMCIA_NETWAVE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11 Frequency Hopping cards support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCMCIA_RAYCS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11b ISA/PCI cards support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HERMES is not set</div><div class='add'>+# CONFIG_ATMEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11b Pcmcia/Cardbus cards support</div><div class='add'>+#</div><div class='add'>+# CONFIG_AIRO_CS is not set</div><div class='add'>+# CONFIG_PCMCIA_WL3501 is not set</div><div class='add'>+# CONFIG_HOSTAP is not set</div><div class='add'>+CONFIG_NET_WIRELESS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PCMCIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+CONFIG_PPPOE=m</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+CONFIG_INPUT_MOUSE=y</div><div class='add'>+CONFIG_MOUSE_PS2=y</div><div class='add'>+# CONFIG_MOUSE_SERIAL is not set</div><div class='add'>+# CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_AT91=y</div><div class='add'>+CONFIG_SERIAL_AT91_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_AT91_TTYAT is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SYNCLINK_CS is not set</div><div class='add'>+# CONFIG_CARDMAN_4000 is not set</div><div class='add'>+# CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+CONFIG_AT91_SPI=y</div><div class='add'>+CONFIG_AT91_SPIDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=m</div><div class='add'>+CONFIG_I2C_ALGOPCF=m</div><div class='add'>+CONFIG_I2C_ALGOPCA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_AT91=m</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ACM=m</div><div class='add'>+CONFIG_USB_PRINTER=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+CONFIG_USB_STORAGE_DATAFAB=y</div><div class='add'>+CONFIG_USB_STORAGE_FREECOM=y</div><div class='add'>+CONFIG_USB_STORAGE_DPCM=y</div><div class='add'>+CONFIG_USB_STORAGE_USBAT=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR09=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR55=y</div><div class='add'>+CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+CONFIG_USB_HIDINPUT=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+CONFIG_HID_FF=y</div><div class='add'>+CONFIG_HID_PID=y</div><div class='add'>+CONFIG_LOGITECH_FF=y</div><div class='add'>+CONFIG_THRUSTMASTER_FF=y</div><div class='add'>+CONFIG_USB_HIDDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+CONFIG_USB_USBNET=y</div><div class='add'>+CONFIG_USB_NET_AX8817X=y</div><div class='add'>+CONFIG_USB_NET_CDCETHER=y</div><div class='add'>+CONFIG_USB_NET_GL620A=y</div><div class='add'>+CONFIG_USB_NET_NET1080=y</div><div class='add'>+CONFIG_USB_NET_PLUSB=y</div><div class='add'>+CONFIG_USB_NET_RNDIS_HOST=y</div><div class='add'>+CONFIG_USB_NET_CDC_SUBSET=y</div><div class='add'>+CONFIG_USB_ALI_M5632=y</div><div class='add'>+CONFIG_USB_AN2720=y</div><div class='add'>+CONFIG_USB_BELKIN=y</div><div class='add'>+CONFIG_USB_ARMLINUX=y</div><div class='add'>+CONFIG_USB_EPSON2888=y</div><div class='add'>+CONFIG_USB_NET_ZAURUS=y</div><div class='add'>+# CONFIG_USB_ZD1201 is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_SERIAL=m</div><div class='add'>+CONFIG_USB_SERIAL_GENERIC=y</div><div class='add'>+# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ANYDATA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_BELKIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='add'>+CONFIG_USB_SERIAL_CP2101=m</div><div class='add'>+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EMPEG is not set</div><div class='add'>+CONFIG_USB_SERIAL_FTDI_SIO=m</div><div class='add'>+# CONFIG_USB_SERIAL_FUNSOFT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_VISOR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPAQ is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_GARMIN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_IPW is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KLSI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KOBIL_SCT is not set</div><div class='add'>+# CONFIG_USB_SERIAL_MCT_U232 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='add'>+CONFIG_USB_SERIAL_PL2303=m</div><div class='add'>+# CONFIG_USB_SERIAL_HP4X is not set</div><div class='add'>+# CONFIG_USB_SERIAL_SAFE is not set</div><div class='add'>+# CONFIG_USB_SERIAL_TI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_CYBERJACK is not set</div><div class='add'>+# CONFIG_USB_SERIAL_XIRCOM is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OPTION is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OMNINET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=m</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+CONFIG_USB_GADGET_AT91=y</div><div class='add'>+CONFIG_USB_AT91=m</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC=m</div><div class='add'>+CONFIG_MMC_DEBUG=y</div><div class='add'>+CONFIG_MMC_BLOCK=m</div><div class='add'>+CONFIG_MMC_AT91RM9200=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+# CONFIG_RTC_HCTOSYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+CONFIG_RTC_DRV_AT91=y</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=m</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=m</div><div class='add'>+CONFIG_REISERFS_FS=m</div><div class='add'>+# CONFIG_REISERFS_CHECK is not set</div><div class='add'>+# CONFIG_REISERFS_PROC_INFO is not set</div><div class='add'>+# CONFIG_REISERFS_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=m</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+CONFIG_ZISOFS=y</div><div class='add'>+CONFIG_ZISOFS_FS=m</div><div class='add'>+CONFIG_UDF_FS=m</div><div class='add'>+CONFIG_UDF_NLS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+CONFIG_NTFS_FS=m</div><div class='add'>+# CONFIG_NTFS_DEBUG is not set</div><div class='add'>+CONFIG_NTFS_RW=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=m</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_DIRECTIO=y</div><div class='add'>+CONFIG_NFSD=m</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+# CONFIG_NFSD_V3_ACL is not set</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='add'>+CONFIG_LOCKD=m</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=m</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=m</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=m</div><div class='add'>+CONFIG_SUNRPC_GSS=m</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=m</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_BSD_DISKLABEL=y</div><div class='add'>+CONFIG_MINIX_SUBPARTITION=y</div><div class='add'>+CONFIG_SOLARIS_X86_PARTITION=y</div><div class='add'>+CONFIG_UNIXWARE_DISKLABEL=y</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=m</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_932=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=m</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_OPROFILE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=m</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=m</div><div class='head'>diff --git a/arch/arm/configs/carmeva_defconfig b/arch/arm/configs/carmeva_defconfig<br/>new file mode 100644<br/>index 000000000000..8a075c8ecc63<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/carmeva_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/carmeva_defconfig</a></div><div class='hunk'>@@ -0,0 +1,724 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.12-rc4</div><div class='add'>+# Tue Jun 14 12:05:24 2005</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_IOMAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_CLEAN_COMPILE=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+# CONFIG_SYSVIPC is not set</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+# CONFIG_SYSCTL is not set</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_HOTPLUG is not set</div><div class='add'>+CONFIG_KOBJECT_UEVENT=y</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='add'>+CONFIG_CC_ALIGN_LABELS=0</div><div class='add'>+CONFIG_CC_ALIGN_LOOPS=0</div><div class='add'>+CONFIG_CC_ALIGN_JUMPS=0</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_OBSOLETE_MODPARM=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='add'>+CONFIG_ARCH_AT91RM9200=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AT91RM9200DK is not set</div><div class='add'>+# CONFIG_MACH_AT91RM9200EK is not set</div><div class='add'>+# CONFIG_MACH_CSB337 is not set</div><div class='add'>+# CONFIG_MACH_CSB637 is not set</div><div class='add'>+CONFIG_MACH_CARMEVA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM920T=y</div><div class='add'>+CONFIG_CPU_32v4=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+# CONFIG_DISCONTIGMEM is not set</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLKMTD is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_AT91_DATAFLASH=y</div><div class='add'>+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking support</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PACKET is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_IP_TCPDIAG=y</div><div class='add'>+# CONFIG_IP_TCPDIAG_IPV6 is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+# CONFIG_NET_CLS_ROUTE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_ARM_AT91_ETHER=y</div><div class='add'>+CONFIG_ARM_AT91_ETHER_RMII=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=m</div><div class='add'>+CONFIG_SERIO_SERPORT=m</div><div class='add'>+# CONFIG_SERIO_LIBPS2 is not set</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+CONFIG_SOUND_GAMEPORT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_AT91=y</div><div class='add'>+CONFIG_SERIAL_AT91_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_RTC is not set</div><div class='add'>+# CONFIG_AT91_RTC is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+CONFIG_AT91_SPI=y</div><div class='add'>+CONFIG_AT91_SPIDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC=m</div><div class='add'>+CONFIG_MMC_DEBUG=y</div><div class='add'>+CONFIG_MMC_BLOCK=m</div><div class='add'>+CONFIG_MMC_AT91RM9200=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT2_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT2_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_JBD is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# XFS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_DEVFS_FS is not set</div><div class='add'>+CONFIG_DEVPTS_FS_XATTR=y</div><div class='add'>+CONFIG_DEVPTS_FS_SECURITY=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS_FS=y</div><div class='add'>+CONFIG_JFFS_FS_VERBOSE=0</div><div class='add'>+CONFIG_JFFS_PROC_FS=y</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_NAND=y</div><div class='add'>+# CONFIG_JFFS2_FS_NOR_ECC is not set</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_NONE is not set</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_SIZE is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+# CONFIG_NFSD_V3 is not set</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='head'>diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig<br/>index 94bd9932a402..3594155a8137 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/csb337_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/csb337_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/csb337_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/csb337_defconfig</a></div><div class='hunk'>@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> # CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_H720X is not set</div><div class='ctx'> # CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='ctx'> CONFIG_ARCH_AT91RM9200=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig<br/>index 1519124c5501..640d70c1f066 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/csb637_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/csb637_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/csb637_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/csb637_defconfig</a></div><div class='hunk'>@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> # CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_H720X is not set</div><div class='ctx'> # CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='ctx'> CONFIG_ARCH_AT91RM9200=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig<br/>index b69e88bbc909..c0de6fcd488a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/ep93xx_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ep93xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/ep93xx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/ep93xx_defconfig</a></div><div class='hunk'>@@ -1,14 +1,18 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Wed Apr 19 21:21:01 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Sun Jul  9 15:21:30 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -43,14 +47,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -83,18 +88,26 @@ CONFIG_DEFAULT_IOSCHED="deadline"</div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='ctx'> # CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='ctx'> CONFIG_ARCH_EP93XX=y</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='del'>-# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_IOP3XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='ctx'> # CONFIG_ARCH_IXP23XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='hunk'>@@ -102,20 +115,18 @@ CONFIG_ARCH_EP93XX=y</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='del'>-# CONFIG_ARCH_VERSATILE is not set</div><div class='del'>-# CONFIG_ARCH_REALVIEW is not set</div><div class='del'>-# CONFIG_ARCH_IMX is not set</div><div class='del'>-# CONFIG_ARCH_H720X is not set</div><div class='del'>-# CONFIG_ARCH_AAEC2000 is not set</div><div class='del'>-# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Cirrus EP93xx Implementation Options</div><div class='ctx'> #</div><div class='add'>+CONFIG_CRUNCH=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # EP93xx Platforms</div><div class='ctx'> #</div><div class='add'>+CONFIG_MACH_EDB9302=y</div><div class='add'>+CONFIG_MACH_EDB9315=y</div><div class='add'>+CONFIG_MACH_EDB9315A=y</div><div class='ctx'> CONFIG_MACH_GESBC9312=y</div><div class='ctx'> CONFIG_MACH_TS72XX=y</div><div class='ctx'> </div><div class='hunk'>@@ -166,6 +177,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -233,6 +245,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -240,6 +254,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -294,6 +309,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -386,6 +402,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD_NAND=y</div><div class='ctx'> CONFIG_MTD_NAND_VERIFY_WRITE=y</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+CONFIG_MTD_NAND_TS7250=y</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='hunk'>@@ -582,6 +600,7 @@ CONFIG_EP93XX_WATCHDOG=y</div><div class='ctx'> # USB-based Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -613,6 +632,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_STUB is not set</div><div class='ctx'> # CONFIG_I2C_PCA_ISA is not set</div><div class='hunk'>@@ -641,13 +661,13 @@ CONFIG_I2C_DEBUG_CHIP=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -675,8 +695,10 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_MAX1619 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='hunk'>@@ -704,6 +726,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -714,6 +737,7 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -806,6 +830,7 @@ CONFIG_USB_SERIAL_CONSOLE=y</div><div class='ctx'> # CONFIG_USB_SERIAL_GENERIC is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ANYDATA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_BELKIN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='hunk'>@@ -833,6 +858,7 @@ CONFIG_USB_SERIAL_PL2303=y</div><div class='ctx'> # CONFIG_USB_SERIAL_TI is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_CYBERJACK is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_XIRCOM is not set</div><div class='add'>+# CONFIG_USB_SERIAL_OPTION is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_OMNINET is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -845,10 +871,12 @@ CONFIG_USB_SERIAL_PL2303=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='ctx'> </div><div class='hunk'>@@ -880,17 +908,24 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='ctx'> CONFIG_RTC_INTF_SYSFS=y</div><div class='ctx'> CONFIG_RTC_INTF_PROC=y</div><div class='ctx'> CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RTC drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1307 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_RS5C372 is not set</div><div class='ctx'> CONFIG_RTC_DRV_M48T86=y</div><div class='ctx'> CONFIG_RTC_DRV_EP93XX=y</div><div class='add'>+# CONFIG_RTC_DRV_PL031 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -910,6 +945,7 @@ CONFIG_JBD=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -957,6 +993,7 @@ CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_JFFS2_FS_DEBUG=0</div><div class='ctx'> CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='ctx'> # CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='hunk'>@@ -986,6 +1023,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1066,15 +1104,20 @@ CONFIG_NLS_ISO8859_1=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> CONFIG_DEBUG_SLAB=y</div><div class='ctx'> # CONFIG_DEBUG_SLAB_LEAK is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> CONFIG_DEBUG_SPINLOCK=y</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='hunk'>@@ -1114,3 +1157,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig<br/>index e6f3e4873d6c..27b3e31a8ad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/ixp2000_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ixp2000_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/ixp2000_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/ixp2000_defconfig</a></div><div class='hunk'>@@ -1,14 +1,18 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Wed Apr 19 21:12:49 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Sun Jul  9 15:28:50 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -43,14 +47,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -83,18 +88,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='ctx'> # CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='ctx'> # CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='del'>-# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_IOP3XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> CONFIG_ARCH_IXP2000=y</div><div class='ctx'> # CONFIG_ARCH_IXP23XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='hunk'>@@ -102,12 +115,6 @@ CONFIG_ARCH_IXP2000=y</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='del'>-# CONFIG_ARCH_VERSATILE is not set</div><div class='del'>-# CONFIG_ARCH_REALVIEW is not set</div><div class='del'>-# CONFIG_ARCH_IMX is not set</div><div class='del'>-# CONFIG_ARCH_H720X is not set</div><div class='del'>-# CONFIG_ARCH_AAEC2000 is not set</div><div class='del'>-# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -171,6 +178,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -218,6 +226,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PACKET_MMAP=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -236,6 +246,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -243,6 +255,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -297,6 +310,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -525,6 +539,7 @@ CONFIG_ENP2611_MSF_NET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -542,7 +557,6 @@ CONFIG_ENP2611_MSF_NET=y</div><div class='ctx'> CONFIG_WAN=y</div><div class='ctx'> # CONFIG_DSCC4 is not set</div><div class='ctx'> # CONFIG_LANMEDIA is not set</div><div class='del'>-# CONFIG_SYNCLINK_SYNCPPP is not set</div><div class='ctx'> CONFIG_HDLC=y</div><div class='ctx'> CONFIG_HDLC_RAW=y</div><div class='ctx'> # CONFIG_HDLC_RAW_ETH is not set</div><div class='hunk'>@@ -654,6 +668,7 @@ CONFIG_IXP2000_WATCHDOG=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PCIPCWATCHDOG is not set</div><div class='ctx'> # CONFIG_WDTPCI is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -697,6 +712,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> CONFIG_I2C_IXP2000=y</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_PROSAVAGE is not set</div><div class='ctx'> # CONFIG_I2C_SAVAGE4 is not set</div><div class='hunk'>@@ -733,13 +749,13 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -768,10 +784,12 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='hunk'>@@ -799,6 +817,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -808,6 +827,7 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -866,6 +886,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -910,6 +931,7 @@ CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_JFFS2_FS_DEBUG=0</div><div class='ctx'> CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='ctx'> # CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='hunk'>@@ -939,6 +961,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -980,14 +1003,19 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='hunk'>@@ -1027,3 +1055,4 @@ CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig<br/>index 9ce898a6cf87..7b18997083ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/ixp23xx_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/ixp23xx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/ixp23xx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/ixp23xx_defconfig</a></div><div class='hunk'>@@ -1,14 +1,18 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Wed Apr 19 21:13:50 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Sun Jul  9 14:13:35 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -43,14 +47,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -83,18 +88,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='ctx'> # CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='ctx'> # CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='del'>-# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_IOP3XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='ctx'> CONFIG_ARCH_IXP23XX=y</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='hunk'>@@ -102,12 +115,6 @@ CONFIG_ARCH_IXP23XX=y</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='del'>-# CONFIG_ARCH_VERSATILE is not set</div><div class='del'>-# CONFIG_ARCH_REALVIEW is not set</div><div class='del'>-# CONFIG_ARCH_IMX is not set</div><div class='del'>-# CONFIG_ARCH_H720X is not set</div><div class='del'>-# CONFIG_ARCH_AAEC2000 is not set</div><div class='del'>-# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -165,6 +172,7 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -212,6 +220,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PACKET_MMAP=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -230,6 +240,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -237,6 +249,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -291,6 +304,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -520,6 +534,7 @@ CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -641,6 +656,7 @@ CONFIG_E1000_NAPI=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -658,7 +674,6 @@ CONFIG_E1000_NAPI=y</div><div class='ctx'> CONFIG_WAN=y</div><div class='ctx'> # CONFIG_DSCC4 is not set</div><div class='ctx'> # CONFIG_LANMEDIA is not set</div><div class='del'>-# CONFIG_SYNCLINK_SYNCPPP is not set</div><div class='ctx'> CONFIG_HDLC=y</div><div class='ctx'> CONFIG_HDLC_RAW=y</div><div class='ctx'> # CONFIG_HDLC_RAW_ETH is not set</div><div class='hunk'>@@ -775,6 +790,7 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # USB-based Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -817,6 +833,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # CONFIG_I2C_I810 is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_PROSAVAGE is not set</div><div class='ctx'> # CONFIG_I2C_SAVAGE4 is not set</div><div class='hunk'>@@ -853,13 +870,13 @@ CONFIG_SENSORS_EEPROM=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -888,10 +905,12 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='hunk'>@@ -919,6 +938,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -929,6 +949,7 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -959,6 +980,7 @@ CONFIG_USB=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -1050,10 +1072,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1100,6 +1124,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -1146,6 +1171,7 @@ CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_JFFS2_FS_DEBUG=0</div><div class='ctx'> CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='ctx'> # CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='hunk'>@@ -1175,6 +1201,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1255,14 +1282,19 @@ CONFIG_NLS_CODEPAGE_437=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='hunk'>@@ -1302,3 +1334,4 @@ CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig<br/>new file mode 100644<br/>index 000000000000..1db633e2c940<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/kafa_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/kafa_defconfig</a></div><div class='hunk'>@@ -0,0 +1,885 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17-rc3</div><div class='add'>+# Sun May  7 16:54:53 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+CONFIG_DEFAULT_DEADLINE=y</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="deadline"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='add'>+CONFIG_ARCH_AT91RM9200=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Implementations</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Board Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AT91RM9200DK is not set</div><div class='add'>+# CONFIG_MACH_AT91RM9200EK is not set</div><div class='add'>+# CONFIG_MACH_CSB337 is not set</div><div class='add'>+# CONFIG_MACH_CSB637 is not set</div><div class='add'>+# CONFIG_MACH_CARMEVA is not set</div><div class='add'>+# CONFIG_MACH_KB9200 is not set</div><div class='add'>+# CONFIG_MACH_ATEB9200 is not set</div><div class='add'>+CONFIG_MACH_KAFA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91 Feature Selections</div><div class='add'>+#</div><div class='add'>+# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM920T=y</div><div class='add'>+CONFIG_CPU_32v4=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+# CONFIG_LEDS_TIMER is not set</div><div class='add'>+CONFIG_LEDS_CPU=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20800000,10M root=/dev/ram0 rw"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+# CONFIG_MTD_BLOCK is not set</div><div class='add'>+CONFIG_MTD_BLOCK_RO=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+CONFIG_MTD_AT91_DATAFLASH=y</div><div class='add'>+# CONFIG_MTD_AT91_DATAFLASH_CARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+CONFIG_DAVICOM_PHY=y</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_ARM_AT91_ETHER=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_AT91=y</div><div class='add'>+CONFIG_SERIAL_AT91_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_AT91_TTYAT is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_AT91_WATCHDOG=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+CONFIG_AT91_SPI=y</div><div class='add'>+CONFIG_AT91_SPIDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_AT91=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+# CONFIG_RTC_HCTOSYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+CONFIG_RTC_DRV_AT91=y</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_EXT2_FS is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+# CONFIG_EXT3_FS_XATTR is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=m</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_LOCKD=m</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=m</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='head'>diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig<br/>new file mode 100644<br/>index 000000000000..45396e087196<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/kb9202_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/kb9202_defconfig</a></div><div class='hunk'>@@ -0,0 +1,781 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.13-rc2</div><div class='add'>+# Sun Aug 14 19:26:59 2005</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+# CONFIG_EXPERIMENTAL is not set</div><div class='add'>+CONFIG_CLEAN_COMPILE=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+# CONFIG_SYSVIPC is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+# CONFIG_KOBJECT_UEVENT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='add'>+CONFIG_CC_ALIGN_LABELS=0</div><div class='add'>+CONFIG_CC_ALIGN_LOOPS=0</div><div class='add'>+CONFIG_CC_ALIGN_JUMPS=0</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_OBSOLETE_MODPARM=y</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='add'>+CONFIG_ARCH_AT91RM9200=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AT91RM9200DK is not set</div><div class='add'>+# CONFIG_MACH_AT91RM9200EK is not set</div><div class='add'>+# CONFIG_MACH_CSB337 is not set</div><div class='add'>+# CONFIG_MACH_CSB637 is not set</div><div class='add'>+# CONFIG_MACH_CARMEVA is not set</div><div class='add'>+CONFIG_MACH_KB9200=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM920T=y</div><div class='add'>+CONFIG_CPU_32v4=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_LEDS is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x10000000</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x20040000</div><div class='add'>+CONFIG_ZBOOT_ROM=y</div><div class='add'>+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_AOUT=y</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+CONFIG_DEBUG_DRIVER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+CONFIG_BLK_DEV_NBD=y</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking support</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_IP_TCPDIAG is not set</div><div class='add'>+# CONFIG_IP_TCPDIAG_IPV6 is not set</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+# CONFIG_NET_CLS_ROUTE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_ARM_AT91_ETHER=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+# CONFIG_SERIO_SERPORT is not set</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_AT91=y</div><div class='add'>+CONFIG_SERIAL_AT91_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_RTC is not set</div><div class='add'>+# CONFIG_AT91_RTC is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_AT91_SPI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_BLUETOOTH_TTY is not set</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+CONFIG_USB_STORAGE_DEBUG=y</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_HID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+# CONFIG_USB_MTOUCH is not set</div><div class='add'>+# CONFIG_USB_ITMTOUCH is not set</div><div class='add'>+# CONFIG_USB_EGALAX is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Video4Linux support is needed for USB Multimedia device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT2_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT2_FS_SECURITY is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# XFS support</div><div class='add'>+#</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=y</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_DEVPTS_FS_XATTR=y</div><div class='add'>+# CONFIG_DEVPTS_FS_SECURITY is not set</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_TMPFS_XATTR is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="utf8"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+# CONFIG_DEBUG_WAITQ is not set</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='head'>diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig<br/>new file mode 100644<br/>index 000000000000..4b29e099640d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/lpd270_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/lpd270_defconfig</a></div><div class='hunk'>@@ -0,0 +1,981 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Sun Jul  9 14:15:23 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+# CONFIG_MODULE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+CONFIG_ARCH_PXA=y</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Intel PXA2xx Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_LUBBOCK is not set</div><div class='add'>+CONFIG_MACH_LOGICPD_PXA270=y</div><div class='add'>+# CONFIG_MACH_MAINSTONE is not set</div><div class='add'>+# CONFIG_ARCH_PXA_IDP is not set</div><div class='add'>+# CONFIG_PXA_SHARPSL is not set</div><div class='add'>+# CONFIG_MACH_TRIZEPS4 is not set</div><div class='add'>+CONFIG_PXA27x=y</div><div class='add'>+CONFIG_IWMMXT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_XSCALE=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5T=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+CONFIG_XSCALE_PMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200 mem=64M"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+# CONFIG_PACKET is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_PARTS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+CONFIG_MTD_CFI_NOSWAP=y</div><div class='add'>+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='add'>+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I1 is not set</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_OTP is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+# CONFIG_MTD_XIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+# CONFIG_MTD_SHARP_SL is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+CONFIG_BLK_DEV_IDE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDISK=y</div><div class='add'>+# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDECD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='add'>+# CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IDE chipset support/bugfixes</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE_GENERIC is not set</div><div class='add'>+# CONFIG_IDE_ARM is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='add'>+# CONFIG_IDEDMA_AUTO is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+# CONFIG_SMC911X is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+# CONFIG_SERIO_SERPORT is not set</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_PXA=y</div><div class='add'>+CONFIG_SERIAL_PXA_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_PXA=y</div><div class='add'>+# CONFIG_FB_PXA_PARAMETERS is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+# CONFIG_SND_MIXER_OSS is not set</div><div class='add'>+# CONFIG_SND_PCM_OSS is not set</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_SND_SUPPORT_OLD_API is not set</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_AC97_BUS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_PXA2XX_PCM=y</div><div class='add'>+CONFIG_SND_PXA2XX_AC97=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+# CONFIG_TMPFS is not set</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=y</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+# CONFIG_DEBUG_WAITQ is not set</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/arm/configs/lpd7a400_defconfig b/arch/arm/configs/lpd7a400_defconfig<br/>index 67eaa26c2647..bf9cf9c6d2df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/lpd7a400_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/lpd7a400_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/lpd7a400_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/lpd7a400_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.12-rc1-bk2</div><div class='del'>-# Mon Mar 28 00:06:33 2005</div><div class='add'>+# Linux kernel version: 2.6.12</div><div class='add'>+# Thu Nov  3 14:15:32 2005</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='hunk'>@@ -17,6 +17,7 @@ CONFIG_EXPERIMENTAL=y</div><div class='ctx'> CONFIG_CLEAN_COMPILE=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # General setup</div><div class='hunk'>@@ -36,6 +37,8 @@ CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> # CONFIG_EPOLL is not set</div><div class='hunk'>@@ -71,6 +74,7 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='ctx'> # CONFIG_ARCH_S3C2410 is not set</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7952X is not set</div><div class='ctx'> CONFIG_ARCH_LH7A40X=y</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='ctx'> # CONFIG_ARCH_VERSATILE is not set</div><div class='hunk'>@@ -84,6 +88,7 @@ CONFIG_ARCH_LH7A40X=y</div><div class='ctx'> CONFIG_MACH_LPD7A400=y</div><div class='ctx'> # CONFIG_MACH_LPD7A404 is not set</div><div class='ctx'> CONFIG_ARCH_LH7A400=y</div><div class='add'>+CONFIG_LPD7A40X_CPLD_SSP=y</div><div class='ctx'> # CONFIG_LH7A40X_CONTIGMEM is not set</div><div class='ctx'> # CONFIG_LH7A40X_ONE_BANK_PER_NODE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -110,6 +115,8 @@ CONFIG_ARM_THUMB=y</div><div class='ctx'> #</div><div class='ctx'> # Bus support</div><div class='ctx'> #</div><div class='add'>+CONFIG_ARM_AMBA=y</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCCARD (PCMCIA/CardBus) support</div><div class='hunk'>@@ -119,6 +126,7 @@ CONFIG_ARM_THUMB=y</div><div class='ctx'> #</div><div class='ctx'> # Kernel Features</div><div class='ctx'> #</div><div class='add'>+# CONFIG_SMP is not set</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_DISCONTIGMEM=y</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='hunk'>@@ -175,7 +183,7 @@ CONFIG_MTD=y</div><div class='ctx'> # CONFIG_MTD_CONCAT is not set</div><div class='ctx'> CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='del'>-# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> # CONFIG_MTD_AFS_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -217,7 +225,10 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> # Mapping drivers for chip access</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='del'>-# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x00000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x04000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=4</div><div class='ctx'> # CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='ctx'> # CONFIG_MTD_EDB7312 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -254,7 +265,6 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> #</div><div class='ctx'> # Block devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BLK_DEV_FD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='hunk'>@@ -288,13 +298,15 @@ CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDECD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDETAPE is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDESCSI is not set</div><div class='ctx'> # CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+CONFIG_IDE_POLL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IDE_GENERIC=y</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='add'>+CONFIG_IDE_ARM=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='ctx'> # CONFIG_IDEDMA_AUTO is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HD is not set</div><div class='hunk'>@@ -302,7 +314,37 @@ CONFIG_IDE_GENERIC=y</div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SCSI is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_SD is not set</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multi-device support (RAID and LVM)</div><div class='hunk'>@@ -331,7 +373,6 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='del'>-# CONFIG_NETLINK_DEV is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='hunk'>@@ -438,13 +479,10 @@ CONFIG_INPUT=y</div><div class='ctx'> #</div><div class='ctx'> # Userland interfaces</div><div class='ctx'> #</div><div class='del'>-CONFIG_INPUT_MOUSEDEV=y</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='ctx'> # CONFIG_INPUT_TSDEV is not set</div><div class='del'>-# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -453,7 +491,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='del'>-# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_ADS7843_LH7=y</div><div class='add'>+CONFIG_HAS_TOUCHSCREEN_ADS7843_LH7=y</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -461,7 +505,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='del'>-CONFIG_SOUND_GAMEPORT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='hunk'>@@ -479,6 +522,8 @@ CONFIG_HW_CONSOLE=y</div><div class='ctx'> #</div><div class='ctx'> # Non-8250 serial port support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_SERIAL_AMBA_PL010 is not set</div><div class='add'>+# CONFIG_SERIAL_AMBA_PL011 is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_LH7A40X=y</div><div class='hunk'>@@ -510,7 +555,6 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # TPM devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_TCG_TPM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C support</div><div class='hunk'>@@ -534,18 +578,73 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FB is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+CONFIG_FB_SOFT_CURSOR=y</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+CONFIG_FB_ARMCLCD=y</div><div class='add'>+CONFIG_FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT=y</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ057Q3DC02 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ64D343 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ10D368 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ121S1DG41 is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Sound</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS=y</div><div class='add'>+# CONFIG_SND_RTCTIMER is not set</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_LH7A40X_AC97=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB support</div><div class='head'>diff --git a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig<br/>index 208d591ebfce..3a57be32e849 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/lpd7a404_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/lpd7a404_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/lpd7a404_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/lpd7a404_defconfig</a></div><div class='hunk'>@@ -1,52 +1,58 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.12-rc1-bk2</div><div class='del'>-# Mon Mar 28 00:14:08 2005</div><div class='add'>+# Linux kernel version: 2.6.16</div><div class='add'>+# Thu Mar 23 17:50:31 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='del'>-CONFIG_UID16=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='del'>-CONFIG_GENERIC_IOMAP=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_CLEAN_COMPILE=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='ctx'> # CONFIG_SWAP is not set</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='del'>-# CONFIG_HOTPLUG is not set</div><div class='del'>-CONFIG_KOBJECT_UEVENT=y</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> # CONFIG_IKCONFIG_PROC is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_ALL is not set</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+# CONFIG_HOTPLUG is not set</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> # CONFIG_EPOLL is not set</div><div class='del'>-CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='ctx'> CONFIG_CC_ALIGN_LABELS=0</div><div class='ctx'> CONFIG_CC_ALIGN_LOOPS=0</div><div class='ctx'> CONFIG_CC_ALIGN_JUMPS=0</div><div class='add'>+CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -54,6 +60,23 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_MODULES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+CONFIG_DEFAULT_CFQ=y</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="cfq"</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='hunk'>@@ -71,11 +94,15 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='ctx'> # CONFIG_ARCH_S3C2410 is not set</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7952X is not set</div><div class='ctx'> CONFIG_ARCH_LH7A40X=y</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='ctx'> # CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='ctx'> # CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # LH7A40X Implementations</div><div class='hunk'>@@ -110,6 +137,7 @@ CONFIG_ARM_THUMB=y</div><div class='ctx'> #</div><div class='ctx'> # Bus support</div><div class='ctx'> #</div><div class='add'>+CONFIG_ARM_AMBA=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCCARD (PCMCIA/CardBus) support</div><div class='hunk'>@@ -120,7 +148,18 @@ CONFIG_ARM_THUMB=y</div><div class='ctx'> # Kernel Features</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+# CONFIG_FLATMEM_MANUAL is not set</div><div class='add'>+CONFIG_DISCONTIGMEM_MANUAL=y</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='ctx'> CONFIG_DISCONTIGMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+CONFIG_NEED_MULTIPLE_NODES=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='ctx'> CONFIG_ALIGNMENT_TRAP=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -154,6 +193,84 @@ CONFIG_BINFMT_ELF=y</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PM is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -168,6 +285,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Memory Technology Devices (MTD)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -175,7 +297,7 @@ CONFIG_MTD=y</div><div class='ctx'> # CONFIG_MTD_CONCAT is not set</div><div class='ctx'> CONFIG_MTD_PARTITIONS=y</div><div class='ctx'> # CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='del'>-# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='ctx'> # CONFIG_MTD_AFS_PARTS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -186,6 +308,7 @@ CONFIG_MTD_BLOCK=y</div><div class='ctx'> # CONFIG_FTL is not set</div><div class='ctx'> # CONFIG_NFTL is not set</div><div class='ctx'> # CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RAM/ROM/Flash chip drivers</div><div class='hunk'>@@ -211,15 +334,18 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> # CONFIG_MTD_RAM is not set</div><div class='ctx'> # CONFIG_MTD_ROM is not set</div><div class='ctx'> # CONFIG_MTD_ABSENT is not set</div><div class='del'>-# CONFIG_MTD_XIP is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Mapping drivers for chip access</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='del'>-# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x00000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x04000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=4</div><div class='ctx'> # CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='del'>-# CONFIG_MTD_EDB7312 is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Self-contained MTD device drivers</div><div class='hunk'>@@ -243,6 +369,11 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> # CONFIG_MTD_NAND is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Parallel port support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='hunk'>@@ -254,7 +385,6 @@ CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> #</div><div class='ctx'> # Block devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BLK_DEV_FD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='hunk'>@@ -262,16 +392,7 @@ CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> # CONFIG_BLK_DEV_RAM is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='del'>-CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IO Schedulers</div><div class='del'>-#</div><div class='del'>-CONFIG_IOSCHED_NOOP=y</div><div class='del'>-# CONFIG_IOSCHED_AS is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-CONFIG_IOSCHED_CFQ=y</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -291,12 +412,13 @@ CONFIG_BLK_DEV_IDEDISK=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='ctx'> # CONFIG_BLK_DEV_IDESCSI is not set</div><div class='ctx'> # CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+CONFIG_IDE_POLL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IDE_GENERIC=y</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='add'>+CONFIG_IDE_ARM=y</div><div class='ctx'> # CONFIG_BLK_DEV_IDEDMA is not set</div><div class='ctx'> # CONFIG_IDEDMA_AUTO is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HD is not set</div><div class='hunk'>@@ -304,6 +426,7 @@ CONFIG_IDE_GENERIC=y</div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='ctx'> CONFIG_SCSI=y</div><div class='ctx'> # CONFIG_SCSI_PROC_FS is not set</div><div class='ctx'> </div><div class='hunk'>@@ -315,6 +438,7 @@ CONFIG_SCSI=y</div><div class='ctx'> # CONFIG_CHR_DEV_OSST is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SR is not set</div><div class='ctx'> # CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='hunk'>@@ -329,10 +453,12 @@ CONFIG_SCSI=y</div><div class='ctx'> # CONFIG_SCSI_SPI_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_FC_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI low-level drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -344,6 +470,7 @@ CONFIG_SCSI=y</div><div class='ctx'> #</div><div class='ctx'> # Fusion MPT device support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='hunk'>@@ -354,70 +481,8 @@ CONFIG_SCSI=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Networking support</div><div class='add'>+# Network device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_NET=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Networking options</div><div class='del'>-#</div><div class='del'>-CONFIG_PACKET=y</div><div class='del'>-# CONFIG_PACKET_MMAP is not set</div><div class='del'>-# CONFIG_NETLINK_DEV is not set</div><div class='del'>-CONFIG_UNIX=y</div><div class='del'>-# CONFIG_NET_KEY is not set</div><div class='del'>-CONFIG_INET=y</div><div class='del'>-# CONFIG_IP_MULTICAST is not set</div><div class='del'>-# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='del'>-CONFIG_IP_PNP=y</div><div class='del'>-CONFIG_IP_PNP_DHCP=y</div><div class='del'>-CONFIG_IP_PNP_BOOTP=y</div><div class='del'>-CONFIG_IP_PNP_RARP=y</div><div class='del'>-# CONFIG_NET_IPIP is not set</div><div class='del'>-# CONFIG_NET_IPGRE is not set</div><div class='del'>-# CONFIG_ARPD is not set</div><div class='del'>-# CONFIG_SYN_COOKIES is not set</div><div class='del'>-# CONFIG_INET_AH is not set</div><div class='del'>-# CONFIG_INET_ESP is not set</div><div class='del'>-# CONFIG_INET_IPCOMP is not set</div><div class='del'>-# CONFIG_INET_TUNNEL is not set</div><div class='del'>-# CONFIG_IP_TCPDIAG is not set</div><div class='del'>-# CONFIG_IP_TCPDIAG_IPV6 is not set</div><div class='del'>-# CONFIG_IPV6 is not set</div><div class='del'>-# CONFIG_NETFILTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# SCTP Configuration (EXPERIMENTAL)</div><div class='del'>-#</div><div class='del'>-# CONFIG_IP_SCTP is not set</div><div class='del'>-# CONFIG_ATM is not set</div><div class='del'>-# CONFIG_BRIDGE is not set</div><div class='del'>-# CONFIG_VLAN_8021Q is not set</div><div class='del'>-# CONFIG_DECNET is not set</div><div class='del'>-# CONFIG_LLC2 is not set</div><div class='del'>-# CONFIG_IPX is not set</div><div class='del'>-# CONFIG_ATALK is not set</div><div class='del'>-# CONFIG_X25 is not set</div><div class='del'>-# CONFIG_LAPB is not set</div><div class='del'>-# CONFIG_NET_DIVERT is not set</div><div class='del'>-# CONFIG_ECONET is not set</div><div class='del'>-# CONFIG_WAN_ROUTER is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# QoS and/or fair queueing</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_SCHED is not set</div><div class='del'>-# CONFIG_NET_CLS_ROUTE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Network testing</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_PKTGEN is not set</div><div class='del'>-# CONFIG_NETPOLL is not set</div><div class='del'>-# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='del'>-# CONFIG_HAMRADIO is not set</div><div class='del'>-# CONFIG_IRDA is not set</div><div class='del'>-# CONFIG_BT is not set</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='hunk'>@@ -425,11 +490,17 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> CONFIG_SMC91X=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (1000 Mbit)</div><div class='hunk'>@@ -456,6 +527,8 @@ CONFIG_SMC91X=y</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ISDN subsystem</div><div class='hunk'>@@ -470,10 +543,13 @@ CONFIG_INPUT=y</div><div class='ctx'> #</div><div class='ctx'> # Userland interfaces</div><div class='ctx'> #</div><div class='del'>-# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='ctx'> # CONFIG_INPUT_JOYDEV is not set</div><div class='ctx'> # CONFIG_INPUT_TSDEV is not set</div><div class='del'>-# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='ctx'> # CONFIG_INPUT_EVBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -482,7 +558,13 @@ CONFIG_INPUT=y</div><div class='ctx'> # CONFIG_INPUT_KEYBOARD is not set</div><div class='ctx'> # CONFIG_INPUT_MOUSE is not set</div><div class='ctx'> # CONFIG_INPUT_JOYSTICK is not set</div><div class='del'>-# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+CONFIG_TOUCHSCREEN_ADC_LH7=y</div><div class='add'>+CONFIG_HAS_TOUCHSCREEN_ADC_LH7=y</div><div class='ctx'> # CONFIG_INPUT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -490,7 +572,6 @@ CONFIG_INPUT=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='del'>-CONFIG_SOUND_GAMEPORT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='hunk'>@@ -508,6 +589,8 @@ CONFIG_HW_CONSOLE=y</div><div class='ctx'> #</div><div class='ctx'> # Non-8250 serial port support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_SERIAL_AMBA_PL010 is not set</div><div class='add'>+# CONFIG_SERIAL_AMBA_PL011 is not set</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_LH7A40X=y</div><div class='hunk'>@@ -533,13 +616,13 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Ftape, the floppy tape device driver</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # TPM devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C support</div><div class='hunk'>@@ -547,10 +630,33 @@ CONFIG_RTC=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Misc devices</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Multimedia Capabilities Port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='hunk'>@@ -563,18 +669,83 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_FB is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+CONFIG_FB_ARMCLCD=y</div><div class='add'>+CONFIG_FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT=y</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ057Q3DC02 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ64D343 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ10D368 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_SHARP_LQ121S1DG41 is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_AUO_A070VW01_WIDE is not set</div><div class='add'>+# CONFIG_FB_ARMCLCD_HITACHI is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Sound</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SOUND is not set</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+# CONFIG_SND_SEQUENCER is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS=y</div><div class='add'>+# CONFIG_SND_RTCTIMER is not set</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_AC97_BUS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_ARMAACI is not set</div><div class='add'>+CONFIG_SND_LH7A40X_AC97=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_USB_AUDIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB support</div><div class='hunk'>@@ -595,6 +766,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='ctx'> CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='hunk'>@@ -603,16 +775,19 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_USB_BLUETOOTH_TTY is not set</div><div class='add'>+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set</div><div class='ctx'> # CONFIG_USB_ACM is not set</div><div class='ctx'> # CONFIG_USB_PRINTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_STORAGE=y</div><div class='ctx'> CONFIG_USB_STORAGE_DEBUG=y</div><div class='del'>-# CONFIG_USB_STORAGE_RW_DETECT is not set</div><div class='ctx'> CONFIG_USB_STORAGE_DATAFAB=y</div><div class='ctx'> # CONFIG_USB_STORAGE_FREECOM is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_ISD200 is not set</div><div class='hunk'>@@ -621,22 +796,32 @@ CONFIG_USB_STORAGE_DATAFAB=y</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='ctx'> # CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Input Devices</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_HID=y</div><div class='ctx'> CONFIG_USB_HIDINPUT=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='ctx'> # CONFIG_HID_FF is not set</div><div class='ctx'> # CONFIG_USB_HIDDEV is not set</div><div class='ctx'> # CONFIG_USB_AIPTEK is not set</div><div class='ctx'> # CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='ctx'> # CONFIG_USB_KBTAB is not set</div><div class='ctx'> # CONFIG_USB_POWERMATE is not set</div><div class='ctx'> # CONFIG_USB_MTOUCH is not set</div><div class='add'>+# CONFIG_USB_ITMTOUCH is not set</div><div class='ctx'> # CONFIG_USB_EGALAX is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='ctx'> # CONFIG_USB_XPAD is not set</div><div class='ctx'> # CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Imaging devices</div><div class='hunk'>@@ -686,16 +871,33 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB ATM/DSL drivers</div><div class='add'>+# USB DSL modem support</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Gadget Support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_USB_GADGET is not set</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+CONFIG_USB_GADGET_LH7=y</div><div class='add'>+CONFIG_USB_LH7=y</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+CONFIG_USB_ZERO=y</div><div class='add'>+# CONFIG_USB_ETH is not set</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Card support</div><div class='hunk'>@@ -707,6 +909,7 @@ CONFIG_USB_MON=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> CONFIG_EXT3_FS_XATTR=y</div><div class='ctx'> # CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='hunk'>@@ -716,17 +919,17 @@ CONFIG_JBD=y</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# XFS support</div><div class='del'>-#</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CD-ROM/DVD Filesystems</div><div class='hunk'>@@ -749,12 +952,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PROC_FS=y</div><div class='ctx'> CONFIG_SYSFS=y</div><div class='del'>-# CONFIG_DEVFS_FS is not set</div><div class='del'>-# CONFIG_DEVPTS_FS_XATTR is not set</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='del'>-# CONFIG_TMPFS_XATTR is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_RELAYFS_FS is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous filesystems</div><div class='hunk'>@@ -769,8 +971,8 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_JFFS_FS is not set</div><div class='ctx'> CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_JFFS2_FS_DEBUG=0</div><div class='del'>-# CONFIG_JFFS2_FS_NAND is not set</div><div class='del'>-# CONFIG_JFFS2_FS_NOR_ECC is not set</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='hunk'>@@ -787,12 +989,14 @@ CONFIG_CRAMFS=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='ctx'> CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='ctx'> # CONFIG_NFS_DIRECTIO is not set</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='ctx'> CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='hunk'>@@ -801,6 +1005,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Partition Types</div><div class='hunk'>@@ -820,6 +1025,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # CONFIG_SGI_PARTITION is not set</div><div class='ctx'> # CONFIG_ULTRIX_PARTITION is not set</div><div class='ctx'> # CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='ctx'> # CONFIG_EFI_PARTITION is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -875,19 +1081,24 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='del'>-CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='del'>-CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=16</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='ctx'> CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> CONFIG_DEBUG_USER=y</div><div class='ctx'> # CONFIG_DEBUG_WAITQ is not set</div><div class='ctx'> CONFIG_DEBUG_ERRORS=y</div><div class='hunk'>@@ -912,6 +1123,7 @@ CONFIG_DEBUG_ERRORS=y</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='head'>diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig<br/>new file mode 100644<br/>index 000000000000..61115a773382<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/netx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/netx_defconfig</a></div><div class='hunk'>@@ -0,0 +1,926 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17-rc6</div><div class='add'>+# Tue Jun  6 15:26:53 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_OBSOLETE_INTERMODULE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='add'>+CONFIG_ARCH_NETX=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NetX Implementations</div><div class='add'>+#</div><div class='add'>+CONFIG_MACH_NXDKN=y</div><div class='add'>+CONFIG_MACH_NXDB500=y</div><div class='add'>+CONFIG_MACH_NXEB500HMI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+CONFIG_ARM_VIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_AMBA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="console=ttySMX0,115200"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+# CONFIG_FPE_NWFPE is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+CONFIG_NET_IPGRE=m</div><div class='add'>+# CONFIG_NET_IPGRE_BROADCAST is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+CONFIG_INET_AH=y</div><div class='add'>+CONFIG_INET_ESP=y</div><div class='add'>+CONFIG_INET_IPCOMP=y</div><div class='add'>+CONFIG_INET_XFRM_TUNNEL=y</div><div class='add'>+CONFIG_INET_TUNNEL=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Virtual Server Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+CONFIG_INET6_AH=m</div><div class='add'>+CONFIG_INET6_ESP=m</div><div class='add'>+CONFIG_INET6_IPCOMP=m</div><div class='add'>+CONFIG_INET6_XFRM_TUNNEL=m</div><div class='add'>+CONFIG_INET6_TUNNEL=m</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_NF_CONNTRACK=m</div><div class='add'>+# CONFIG_IP_NF_CT_ACCT is not set</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK_MARK is not set</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set</div><div class='add'>+# CONFIG_IP_NF_CT_PROTO_SCTP is not set</div><div class='add'>+CONFIG_IP_NF_FTP=m</div><div class='add'>+CONFIG_IP_NF_IRC=m</div><div class='add'>+# CONFIG_IP_NF_NETBIOS_NS is not set</div><div class='add'>+CONFIG_IP_NF_TFTP=m</div><div class='add'>+CONFIG_IP_NF_AMANDA=m</div><div class='add'>+# CONFIG_IP_NF_PPTP is not set</div><div class='add'>+# CONFIG_IP_NF_H323 is not set</div><div class='add'>+CONFIG_IP_NF_QUEUE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPv6: Netfilter Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP6_NF_QUEUE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_PKTGEN=m</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+# CONFIG_MTD_CFI_AMDSTD is not set</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+CONFIG_MTD_RAM=y</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PHYSMAP is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+CONFIG_MTD_PLATRAM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+CONFIG_NET_NETX=y</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_AMBAKMI is not set</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_AMBA_PL010 is not set</div><div class='add'>+# CONFIG_SERIAL_AMBA_PL011 is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_NETX=y</div><div class='add'>+CONFIG_SERIAL_NETX_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_NVRAM=m</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+CONFIG_FB_ARMCLCD=y</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=m</div><div class='add'>+CONFIG_RTC_INTF_PROC=m</div><div class='add'>+CONFIG_RTC_INTF_DEV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+CONFIG_RTC_DRV_NETX=m</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_EXT2_FS is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_DIRECTIO=y</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=17</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_WAITQ is not set</div><div class='add'>+CONFIG_DEBUG_ERRORS=y</div><div class='add'>+# CONFIG_DEBUG_LL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+CONFIG_CRYPTO_MD4=m</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_SHA1=y</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=y</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_CRC32C=m</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='head'>diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig<br/>index ee3ecbd9002d..05adb0b34e72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_h2_1610_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/omap_h2_1610_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/omap_h2_1610_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/omap_h2_1610_defconfig</a></div><div class='hunk'>@@ -1,19 +1,20 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.14</div><div class='del'>-# Wed Nov  9 18:53:40 2005</div><div class='add'>+# Linux kernel version: 2.6.17</div><div class='add'>+# Thu Jun 29 15:25:18 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='del'>-CONFIG_UID16=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_CLEAN_COMPILE=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_LOCK_KERNEL=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='hunk'>@@ -29,26 +30,26 @@ CONFIG_SYSVIPC=y</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='del'>-# CONFIG_HOTPLUG is not set</div><div class='del'>-CONFIG_KOBJECT_UEVENT=y</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='ctx'> # CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='del'>-CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='del'>-CONFIG_CC_ALIGN_LABELS=0</div><div class='del'>-CONFIG_CC_ALIGN_LOOPS=0</div><div class='del'>-CONFIG_CC_ALIGN_JUMPS=0</div><div class='add'>+CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -56,7 +57,6 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> # CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='del'>-CONFIG_OBSOLETE_MODPARM=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='ctx'> # CONFIG_KMOD is not set</div><div class='hunk'>@@ -64,6 +64,7 @@ CONFIG_OBSOLETE_MODPARM=y</div><div class='ctx'> #</div><div class='ctx'> # Block layer</div><div class='ctx'> #</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -81,16 +82,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='ctx'> # CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='del'>-# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_IOP3XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='hunk'>@@ -98,11 +109,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='ctx'> CONFIG_ARCH_OMAP=y</div><div class='del'>-# CONFIG_ARCH_VERSATILE is not set</div><div class='del'>-# CONFIG_ARCH_REALVIEW is not set</div><div class='del'>-# CONFIG_ARCH_IMX is not set</div><div class='del'>-# CONFIG_ARCH_H720X is not set</div><div class='del'>-# CONFIG_ARCH_AAEC2000 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # TI OMAP Implementations</div><div class='hunk'>@@ -141,6 +147,7 @@ CONFIG_ARCH_OMAP16XX=y</div><div class='ctx'> CONFIG_MACH_OMAP_H2=y</div><div class='ctx'> # CONFIG_MACH_OMAP_H3 is not set</div><div class='ctx'> # CONFIG_MACH_OMAP_OSK is not set</div><div class='add'>+# CONFIG_MACH_NOKIA770 is not set</div><div class='ctx'> # CONFIG_MACH_OMAP_GENERIC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -177,7 +184,6 @@ CONFIG_ARM_THUMB=y</div><div class='ctx'> #</div><div class='ctx'> # Bus support</div><div class='ctx'> #</div><div class='del'>-CONFIG_ISA_DMA_API=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # PCCARD (PCMCIA/CardBus) support</div><div class='hunk'>@@ -189,6 +195,8 @@ CONFIG_ISA_DMA_API=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PREEMPT=y</div><div class='ctx'> CONFIG_NO_IDLE_HZ=y</div><div class='add'>+CONFIG_HZ=128</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='ctx'> # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='hunk'>@@ -249,6 +257,8 @@ CONFIG_BINFMT_AOUT=y</div><div class='ctx'> # Power management options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PM=y</div><div class='add'>+CONFIG_PM_LEGACY=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='ctx'> # CONFIG_APM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -259,9 +269,12 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> # Networking options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -278,12 +291,18 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_AH is not set</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='ctx'> CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -295,6 +314,11 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # SCTP Configuration (EXPERIMENTAL)</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='hunk'>@@ -312,7 +336,6 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # QoS and/or fair queueing</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='del'>-# CONFIG_NET_CLS_ROUTE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network testing</div><div class='hunk'>@@ -333,6 +356,12 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory Technology Devices (MTD)</div><div class='hunk'>@@ -526,6 +555,7 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -534,6 +564,7 @@ CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> # CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -559,8 +590,8 @@ CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='ctx'> # Watchdog Device Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='del'>-# CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -572,6 +603,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='ctx'> #</div><div class='ctx'> # TPM devices</div><div class='ctx'> #</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='ctx'> # CONFIG_TELCLOCK is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -580,10 +612,22 @@ CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -591,13 +635,23 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Multimedia Capabilities Port drivers</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -607,11 +661,13 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> # CONFIG_FB_CFB_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_CFB_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='hunk'>@@ -635,7 +691,6 @@ CONFIG_FONT_8x16=y</div><div class='ctx'> # CONFIG_FONT_SUN8x16 is not set</div><div class='ctx'> # CONFIG_FONT_SUN12x22 is not set</div><div class='ctx'> # CONFIG_FONT_10x18 is not set</div><div class='del'>-# CONFIG_FONT_RL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Logo configuration</div><div class='hunk'>@@ -660,16 +715,15 @@ CONFIG_SOUND=y</div><div class='ctx'> # Open Sound System</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SOUND_PRIME=y</div><div class='del'>-# CONFIG_OBSOLETE_OSS_DRIVER is not set</div><div class='ctx'> # CONFIG_SOUND_MSNDCLAS is not set</div><div class='ctx'> # CONFIG_SOUND_MSNDPIN is not set</div><div class='del'>-# CONFIG_SOUND_OSS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='ctx'> # CONFIG_USB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -680,17 +734,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # USB Gadget Support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='del'>-# CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='del'>-# CONFIG_USB_GADGET_GOKU is not set</div><div class='del'>-# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='del'>-# CONFIG_USB_GADGET_OMAP is not set</div><div class='del'>-# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='del'>-# CONFIG_USB_ZERO is not set</div><div class='del'>-# CONFIG_USB_ETH is not set</div><div class='del'>-# CONFIG_USB_GADGETFS is not set</div><div class='del'>-# CONFIG_USB_FILE_STORAGE is not set</div><div class='del'>-# CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Card support</div><div class='hunk'>@@ -698,20 +741,27 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> # CONFIG_EXT3_FS is not set</div><div class='del'>-# CONFIG_JBD is not set</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -741,7 +791,7 @@ CONFIG_SYSFS=y</div><div class='ctx'> # CONFIG_TMPFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='del'>-# CONFIG_RELAYFS_FS is not set</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous filesystems</div><div class='hunk'>@@ -843,10 +893,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_USER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig<br/>new file mode 100644<br/>index 000000000000..6a93e3aae106<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/onearm_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/onearm_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1076 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Sun Jul  9 14:16:20 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_HARDIRQS_SW_RESEND=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+CONFIG_ARCH_AT91=y</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Atmel AT91 System-on-Chip</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Atmel AT91 Processors</div><div class='add'>+#</div><div class='add'>+CONFIG_ARCH_AT91RM9200=y</div><div class='add'>+# CONFIG_ARCH_AT91SAM9260 is not set</div><div class='add'>+# CONFIG_ARCH_AT91SAM9261 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91RM9200 Board Type</div><div class='add'>+#</div><div class='add'>+CONFIG_MACH_ONEARM=y</div><div class='add'>+# CONFIG_ARCH_AT91RM9200DK is not set</div><div class='add'>+# CONFIG_MACH_AT91RM9200EK is not set</div><div class='add'>+# CONFIG_MACH_CSB337 is not set</div><div class='add'>+# CONFIG_MACH_CSB637 is not set</div><div class='add'>+# CONFIG_MACH_CARMEVA is not set</div><div class='add'>+# CONFIG_MACH_ATEB9200 is not set</div><div class='add'>+# CONFIG_MACH_KB9200 is not set</div><div class='add'>+# CONFIG_MACH_KAFA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AT91 Feature Selections</div><div class='add'>+#</div><div class='add'>+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM920T=y</div><div class='add'>+CONFIG_CPU_32v4=y</div><div class='add'>+CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_CACHE_V4WT=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARM_THUMB is not set</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCCARD=y</div><div class='add'>+# CONFIG_PCMCIA_DEBUG is not set</div><div class='add'>+CONFIG_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_IOCTL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC-card bridges</div><div class='add'>+#</div><div class='add'>+CONFIG_AT91_CF=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+CONFIG_LEDS_TIMER=y</div><div class='add'>+# CONFIG_LEDS_CPU is not set</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0x0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0x0</div><div class='add'>+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+# CONFIG_FPE_NWFPE_XP is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_APM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_JEDECPROBE=y</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x0</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x0</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=0</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+# CONFIG_MTD_IMPA7 is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+# CONFIG_BLK_DEV_LOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+CONFIG_ARM_AT91_ETHER=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PCMCIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_AT91=y</div><div class='add'>+CONFIG_SERIAL_AT91_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_AT91_TTYAT is not set</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+CONFIG_WATCHDOG_NOWAYOUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_AT91_WATCHDOG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SYNCLINK_CS is not set</div><div class='add'>+# CONFIG_CARDMAN_4000 is not set</div><div class='add'>+# CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+CONFIG_USB_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_STORAGE is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_HID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+CONFIG_USB_GADGET_AT91=y</div><div class='add'>+CONFIG_USB_AT91=y</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUALSPEED is not set</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+# CONFIG_USB_ETH is not set</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_AT91RM9200=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_BUGVERBOSE=y</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+# CONFIG_DEBUG_WAITQ is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig<br/>new file mode 100644<br/>index 000000000000..8a078d479d57<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/pnx4008_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/pnx4008_defconfig</a></div><div class='hunk'>@@ -0,0 +1,2072 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17-rc1</div><div class='add'>+# Thu Apr  6 17:05:58 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_OBSOLETE_INTERMODULE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PXA is not set</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='add'>+CONFIG_ARCH_PNX4008=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_COPY_V4WB=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+# CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='add'>+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCCARD=m</div><div class='add'>+# CONFIG_PCMCIA_DEBUG is not set</div><div class='add'>+CONFIG_PCMCIA=m</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_IOCTL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC-card bridges</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0</div><div class='add'>+CONFIG_CMDLINE="mem=64M console=ttyS0,115200"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+# CONFIG_FPE_NWFPE is not set</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_AOUT=m</div><div class='add'>+CONFIG_BINFMT_MISC=m</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+CONFIG_PM_LEGACY=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_APM=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=m</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=m</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+CONFIG_NET_KEY=m</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_ADVANCED_ROUTER=y</div><div class='add'>+CONFIG_ASK_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_FIB_TRIE is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_MULTIPLE_TABLES=y</div><div class='add'>+CONFIG_IP_ROUTE_FWMARK=y</div><div class='add'>+CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='add'>+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set</div><div class='add'>+CONFIG_IP_ROUTE_VERBOSE=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+CONFIG_NET_IPIP=m</div><div class='add'>+CONFIG_NET_IPGRE=m</div><div class='add'>+CONFIG_NET_IPGRE_BROADCAST=y</div><div class='add'>+CONFIG_IP_MROUTE=y</div><div class='add'>+CONFIG_IP_PIMSM_V1=y</div><div class='add'>+CONFIG_IP_PIMSM_V2=y</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+CONFIG_INET_AH=m</div><div class='add'>+CONFIG_INET_ESP=m</div><div class='add'>+CONFIG_INET_IPCOMP=m</div><div class='add'>+CONFIG_INET_XFRM_TUNNEL=m</div><div class='add'>+CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Virtual Server Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_VS=m</div><div class='add'>+# CONFIG_IP_VS_DEBUG is not set</div><div class='add'>+CONFIG_IP_VS_TAB_BITS=12</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPVS transport protocol load balancing support</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_VS_PROTO_TCP=y</div><div class='add'>+CONFIG_IP_VS_PROTO_UDP=y</div><div class='add'>+CONFIG_IP_VS_PROTO_ESP=y</div><div class='add'>+CONFIG_IP_VS_PROTO_AH=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPVS scheduler</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_VS_RR=m</div><div class='add'>+CONFIG_IP_VS_WRR=m</div><div class='add'>+CONFIG_IP_VS_LC=m</div><div class='add'>+CONFIG_IP_VS_WLC=m</div><div class='add'>+CONFIG_IP_VS_LBLC=m</div><div class='add'>+CONFIG_IP_VS_LBLCR=m</div><div class='add'>+CONFIG_IP_VS_DH=m</div><div class='add'>+CONFIG_IP_VS_SH=m</div><div class='add'>+CONFIG_IP_VS_SED=m</div><div class='add'>+CONFIG_IP_VS_NQ=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPVS application helper</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_VS_FTP=m</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+CONFIG_IPV6_PRIVACY=y</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+CONFIG_INET6_AH=m</div><div class='add'>+CONFIG_INET6_ESP=m</div><div class='add'>+CONFIG_INET6_IPCOMP=m</div><div class='add'>+CONFIG_INET6_XFRM_TUNNEL=m</div><div class='add'>+CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+CONFIG_BRIDGE_NETFILTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_NF_CONNTRACK=m</div><div class='add'>+CONFIG_IP_NF_CT_ACCT=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set</div><div class='add'>+CONFIG_IP_NF_CT_PROTO_SCTP=m</div><div class='add'>+CONFIG_IP_NF_FTP=m</div><div class='add'>+CONFIG_IP_NF_IRC=m</div><div class='add'>+# CONFIG_IP_NF_NETBIOS_NS is not set</div><div class='add'>+CONFIG_IP_NF_TFTP=m</div><div class='add'>+CONFIG_IP_NF_AMANDA=m</div><div class='add'>+# CONFIG_IP_NF_PPTP is not set</div><div class='add'>+# CONFIG_IP_NF_H323 is not set</div><div class='add'>+CONFIG_IP_NF_QUEUE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPv6: Netfilter Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+CONFIG_IP6_NF_QUEUE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DECnet: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_DECNET_NF_GRABULATOR=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bridge: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_BRIDGE_NF_EBTABLES=m</div><div class='add'>+CONFIG_BRIDGE_EBT_BROUTE=m</div><div class='add'>+CONFIG_BRIDGE_EBT_T_FILTER=m</div><div class='add'>+CONFIG_BRIDGE_EBT_T_NAT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_802_3=m</div><div class='add'>+CONFIG_BRIDGE_EBT_AMONG=m</div><div class='add'>+CONFIG_BRIDGE_EBT_ARP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_IP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_LIMIT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_MARK=m</div><div class='add'>+CONFIG_BRIDGE_EBT_PKTTYPE=m</div><div class='add'>+CONFIG_BRIDGE_EBT_STP=m</div><div class='add'>+CONFIG_BRIDGE_EBT_VLAN=m</div><div class='add'>+CONFIG_BRIDGE_EBT_ARPREPLY=m</div><div class='add'>+CONFIG_BRIDGE_EBT_DNAT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_MARK_T=m</div><div class='add'>+CONFIG_BRIDGE_EBT_REDIRECT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_SNAT=m</div><div class='add'>+CONFIG_BRIDGE_EBT_LOG=m</div><div class='add'>+# CONFIG_BRIDGE_EBT_ULOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_SCTP=m</div><div class='add'>+# CONFIG_SCTP_DBG_MSG is not set</div><div class='add'>+# CONFIG_SCTP_DBG_OBJCNT is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_NONE is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_SHA1 is not set</div><div class='add'>+CONFIG_SCTP_HMAC_MD5=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+CONFIG_ATM=y</div><div class='add'>+CONFIG_ATM_CLIP=y</div><div class='add'>+# CONFIG_ATM_CLIP_NO_ICMP is not set</div><div class='add'>+CONFIG_ATM_LANE=m</div><div class='add'>+CONFIG_ATM_MPOA=m</div><div class='add'>+CONFIG_ATM_BR2684=m</div><div class='add'>+# CONFIG_ATM_BR2684_IPFILTER is not set</div><div class='add'>+CONFIG_BRIDGE=m</div><div class='add'>+CONFIG_VLAN_8021Q=m</div><div class='add'>+CONFIG_DECNET=m</div><div class='add'>+# CONFIG_DECNET_ROUTER is not set</div><div class='add'>+CONFIG_LLC=m</div><div class='add'>+CONFIG_LLC2=m</div><div class='add'>+CONFIG_IPX=m</div><div class='add'>+# CONFIG_IPX_INTERN is not set</div><div class='add'>+CONFIG_ATALK=m</div><div class='add'>+CONFIG_DEV_APPLETALK=y</div><div class='add'>+CONFIG_IPDDP=m</div><div class='add'>+CONFIG_IPDDP_ENCAP=y</div><div class='add'>+CONFIG_IPDDP_DECAP=y</div><div class='add'>+CONFIG_X25=m</div><div class='add'>+CONFIG_LAPB=m</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+CONFIG_ECONET=m</div><div class='add'>+CONFIG_ECONET_AUNUDP=y</div><div class='add'>+CONFIG_ECONET_NATIVE=y</div><div class='add'>+CONFIG_WAN_ROUTER=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_SCHED=y</div><div class='add'>+CONFIG_NET_SCH_CLK_JIFFIES=y</div><div class='add'>+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set</div><div class='add'>+# CONFIG_NET_SCH_CLK_CPU is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Queueing/Scheduling</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_SCH_CBQ=m</div><div class='add'>+CONFIG_NET_SCH_HTB=m</div><div class='add'>+CONFIG_NET_SCH_HFSC=m</div><div class='add'>+CONFIG_NET_SCH_ATM=m</div><div class='add'>+CONFIG_NET_SCH_PRIO=m</div><div class='add'>+CONFIG_NET_SCH_RED=m</div><div class='add'>+CONFIG_NET_SCH_SFQ=m</div><div class='add'>+CONFIG_NET_SCH_TEQL=m</div><div class='add'>+CONFIG_NET_SCH_TBF=m</div><div class='add'>+CONFIG_NET_SCH_GRED=m</div><div class='add'>+CONFIG_NET_SCH_DSMARK=m</div><div class='add'>+CONFIG_NET_SCH_NETEM=m</div><div class='add'>+CONFIG_NET_SCH_INGRESS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Classification</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_CLS=y</div><div class='add'>+# CONFIG_NET_CLS_BASIC is not set</div><div class='add'>+CONFIG_NET_CLS_TCINDEX=m</div><div class='add'>+CONFIG_NET_CLS_ROUTE4=m</div><div class='add'>+CONFIG_NET_CLS_ROUTE=y</div><div class='add'>+CONFIG_NET_CLS_FW=m</div><div class='add'>+CONFIG_NET_CLS_U32=m</div><div class='add'>+# CONFIG_CLS_U32_PERF is not set</div><div class='add'>+# CONFIG_CLS_U32_MARK is not set</div><div class='add'>+CONFIG_NET_CLS_RSVP=m</div><div class='add'>+CONFIG_NET_CLS_RSVP6=m</div><div class='add'>+# CONFIG_NET_EMATCH is not set</div><div class='add'>+# CONFIG_NET_CLS_ACT is not set</div><div class='add'>+CONFIG_NET_CLS_POLICE=y</div><div class='add'>+# CONFIG_NET_CLS_IND is not set</div><div class='add'>+CONFIG_NET_ESTIMATOR=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_PKTGEN=m</div><div class='add'>+CONFIG_HAMRADIO=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Packet Radio protocols</div><div class='add'>+#</div><div class='add'>+CONFIG_AX25=m</div><div class='add'>+# CONFIG_AX25_DAMA_SLAVE is not set</div><div class='add'>+CONFIG_NETROM=m</div><div class='add'>+CONFIG_ROSE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# AX.25 network device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MKISS=m</div><div class='add'>+CONFIG_6PACK=m</div><div class='add'>+CONFIG_BPQETHER=m</div><div class='add'>+CONFIG_BAYCOM_SER_FDX=m</div><div class='add'>+CONFIG_BAYCOM_SER_HDX=m</div><div class='add'>+CONFIG_BAYCOM_PAR=m</div><div class='add'>+CONFIG_BAYCOM_EPP=m</div><div class='add'>+CONFIG_YAM=m</div><div class='add'>+CONFIG_IRDA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IrDA protocols</div><div class='add'>+#</div><div class='add'>+CONFIG_IRLAN=m</div><div class='add'>+CONFIG_IRNET=m</div><div class='add'>+CONFIG_IRCOMM=m</div><div class='add'>+# CONFIG_IRDA_ULTRA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IrDA options</div><div class='add'>+#</div><div class='add'>+CONFIG_IRDA_CACHE_LAST_LSAP=y</div><div class='add'>+CONFIG_IRDA_FAST_RR=y</div><div class='add'>+CONFIG_IRDA_DEBUG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Infrared-port device drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SIR device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_IRTTY_SIR=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dongle support</div><div class='add'>+#</div><div class='add'>+CONFIG_DONGLE=y</div><div class='add'>+CONFIG_ESI_DONGLE=m</div><div class='add'>+CONFIG_ACTISYS_DONGLE=m</div><div class='add'>+CONFIG_TEKRAM_DONGLE=m</div><div class='add'>+# CONFIG_TOIM3232_DONGLE is not set</div><div class='add'>+CONFIG_LITELINK_DONGLE=m</div><div class='add'>+CONFIG_MA600_DONGLE=m</div><div class='add'>+CONFIG_GIRBIL_DONGLE=m</div><div class='add'>+CONFIG_MCP2120_DONGLE=m</div><div class='add'>+CONFIG_OLD_BELKIN_DONGLE=m</div><div class='add'>+CONFIG_ACT200L_DONGLE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old SIR device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_IRPORT_SIR=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old Serial dongle support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DONGLE_OLD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# FIR device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_IRDA=m</div><div class='add'>+CONFIG_SIGMATEL_FIR=m</div><div class='add'>+CONFIG_BT=m</div><div class='add'>+CONFIG_BT_L2CAP=m</div><div class='add'>+CONFIG_BT_SCO=m</div><div class='add'>+CONFIG_BT_RFCOMM=m</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=m</div><div class='add'>+CONFIG_BT_BNEP_MC_FILTER=y</div><div class='add'>+CONFIG_BT_BNEP_PROTO_FILTER=y</div><div class='add'>+CONFIG_BT_CMTP=m</div><div class='add'>+CONFIG_BT_HIDP=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bluetooth device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_BT_HCIUSB=m</div><div class='add'>+CONFIG_BT_HCIUSB_SCO=y</div><div class='add'>+CONFIG_BT_HCIUART=m</div><div class='add'>+CONFIG_BT_HCIUART_H4=y</div><div class='add'>+CONFIG_BT_HCIUART_BCSP=y</div><div class='add'>+CONFIG_BT_HCIBCM203X=m</div><div class='add'>+# CONFIG_BT_HCIBPA10X is not set</div><div class='add'>+CONFIG_BT_HCIBFUSB=m</div><div class='add'>+CONFIG_BT_HCIDTL1=m</div><div class='add'>+CONFIG_BT_HCIBT3C=m</div><div class='add'>+CONFIG_BT_HCIBLUECARD=m</div><div class='add'>+CONFIG_BT_HCIBTUART=m</div><div class='add'>+CONFIG_BT_HCIVHCI=m</div><div class='add'>+CONFIG_IEEE80211=m</div><div class='add'>+# CONFIG_IEEE80211_DEBUG is not set</div><div class='add'>+# CONFIG_IEEE80211_CRYPT_WEP is not set</div><div class='add'>+CONFIG_IEEE80211_CRYPT_CCMP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='add'>+# CONFIG_IEEE80211_SOFTMAC is not set</div><div class='add'>+CONFIG_WIRELESS_EXT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=m</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=m</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_PARTS=m</div><div class='add'>+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=m</div><div class='add'>+CONFIG_MTD_BLOCK=m</div><div class='add'>+CONFIG_MTD_BLOCK_RO=m</div><div class='add'>+CONFIG_FTL=m</div><div class='add'>+CONFIG_NFTL=m</div><div class='add'>+CONFIG_NFTL_RW=y</div><div class='add'>+CONFIG_INFTL=m</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=m</div><div class='add'>+CONFIG_MTD_JEDECPROBE=m</div><div class='add'>+CONFIG_MTD_GEN_PROBE=m</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=m</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=m</div><div class='add'>+CONFIG_MTD_CFI_STAA=m</div><div class='add'>+CONFIG_MTD_CFI_UTIL=m</div><div class='add'>+CONFIG_MTD_RAM=m</div><div class='add'>+CONFIG_MTD_ROM=m</div><div class='add'>+CONFIG_MTD_ABSENT=m</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='add'>+CONFIG_MTD_PHYSMAP=m</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x8000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x4000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+# CONFIG_MTD_IMPA7 is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_SLRAM=m</div><div class='add'>+CONFIG_MTD_PHRAM=m</div><div class='add'>+CONFIG_MTD_MTDRAM=m</div><div class='add'>+CONFIG_MTDRAM_TOTAL_SIZE=4096</div><div class='add'>+CONFIG_MTDRAM_ERASE_SIZE=128</div><div class='add'>+CONFIG_MTD_BLKMTD=m</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_DOC2000=m</div><div class='add'>+CONFIG_MTD_DOC2001=m</div><div class='add'>+CONFIG_MTD_DOC2001PLUS=m</div><div class='add'>+CONFIG_MTD_DOCPROBE=m</div><div class='add'>+CONFIG_MTD_DOCECC=m</div><div class='add'>+# CONFIG_MTD_DOCPROBE_ADVANCED is not set</div><div class='add'>+CONFIG_MTD_DOCPROBE_ADDRESS=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_NAND=m</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=m</div><div class='add'>+CONFIG_MTD_NAND_DISKONCHIP=m</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set</div><div class='add'>+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+CONFIG_PARPORT=m</div><div class='add'>+CONFIG_PARPORT_PC=m</div><div class='add'>+CONFIG_PARPORT_PC_FIFO=y</div><div class='add'>+# CONFIG_PARPORT_PC_SUPERIO is not set</div><div class='add'>+CONFIG_PARPORT_PC_PCMCIA=m</div><div class='add'>+CONFIG_PARPORT_NOT_PC=y</div><div class='add'>+# CONFIG_PARPORT_ARC is not set</div><div class='add'>+# CONFIG_PARPORT_GSC is not set</div><div class='add'>+CONFIG_PARPORT_1284=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+CONFIG_PARIDE=m</div><div class='add'>+CONFIG_PARIDE_PARPORT=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel IDE high-level drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_PARIDE_PD=m</div><div class='add'>+CONFIG_PARIDE_PCD=m</div><div class='add'>+CONFIG_PARIDE_PF=m</div><div class='add'>+CONFIG_PARIDE_PT=m</div><div class='add'>+CONFIG_PARIDE_PG=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel IDE protocol modules</div><div class='add'>+#</div><div class='add'>+CONFIG_PARIDE_ATEN=m</div><div class='add'>+CONFIG_PARIDE_BPCK=m</div><div class='add'>+CONFIG_PARIDE_BPCK6=m</div><div class='add'>+CONFIG_PARIDE_COMM=m</div><div class='add'>+CONFIG_PARIDE_DSTR=m</div><div class='add'>+CONFIG_PARIDE_FIT2=m</div><div class='add'>+CONFIG_PARIDE_FIT3=m</div><div class='add'>+CONFIG_PARIDE_EPAT=m</div><div class='add'>+# CONFIG_PARIDE_EPATC8 is not set</div><div class='add'>+CONFIG_PARIDE_EPIA=m</div><div class='add'>+CONFIG_PARIDE_FRIQ=m</div><div class='add'>+CONFIG_PARIDE_FRPW=m</div><div class='add'>+CONFIG_PARIDE_KBIC=m</div><div class='add'>+CONFIG_PARIDE_KTTI=m</div><div class='add'>+CONFIG_PARIDE_ON20=m</div><div class='add'>+CONFIG_PARIDE_ON26=m</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+CONFIG_BLK_DEV_NBD=m</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+CONFIG_CDROM_PKTCDVD=m</div><div class='add'>+CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='add'>+# CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE=m</div><div class='add'>+CONFIG_BLK_DEV_IDE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDISK=m</div><div class='add'>+# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='add'>+CONFIG_BLK_DEV_IDECS=m</div><div class='add'>+CONFIG_BLK_DEV_IDECD=m</div><div class='add'>+CONFIG_BLK_DEV_IDETAPE=m</div><div class='add'>+CONFIG_BLK_DEV_IDEFLOPPY=m</div><div class='add'>+CONFIG_BLK_DEV_IDESCSI=m</div><div class='add'>+# CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IDE chipset support/bugfixes</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE_GENERIC=m</div><div class='add'>+# CONFIG_IDE_ARM is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='add'>+# CONFIG_IDEDMA_AUTO is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+CONFIG_CHR_DEV_ST=m</div><div class='add'>+CONFIG_CHR_DEV_OSST=m</div><div class='add'>+CONFIG_BLK_DEV_SR=m</div><div class='add'>+# CONFIG_BLK_DEV_SR_VENDOR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=m</div><div class='add'>+CONFIG_CHR_DEV_SCH=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+CONFIG_SCSI_CONSTANTS=y</div><div class='add'>+CONFIG_SCSI_LOGGING=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_SPI_ATTRS=m</div><div class='add'>+CONFIG_SCSI_FC_ATTRS=m</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+CONFIG_SCSI_SATA=m</div><div class='add'>+CONFIG_SCSI_PPA=m</div><div class='add'>+CONFIG_SCSI_IMM=m</div><div class='add'>+# CONFIG_SCSI_IZIP_EPP16 is not set</div><div class='add'>+# CONFIG_SCSI_IZIP_SLOW_CTR is not set</div><div class='add'>+CONFIG_SCSI_DEBUG=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA SCSI adapter support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCMCIA_AHA152X=m</div><div class='add'>+CONFIG_PCMCIA_FDOMAIN=m</div><div class='add'>+CONFIG_PCMCIA_NINJA_SCSI=m</div><div class='add'>+CONFIG_PCMCIA_QLOGIC=m</div><div class='add'>+CONFIG_PCMCIA_SYM53C500=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+CONFIG_MD=y</div><div class='add'>+CONFIG_BLK_DEV_MD=m</div><div class='add'>+CONFIG_MD_LINEAR=m</div><div class='add'>+CONFIG_MD_RAID0=m</div><div class='add'>+CONFIG_MD_RAID1=m</div><div class='add'>+CONFIG_MD_RAID10=m</div><div class='add'>+CONFIG_MD_RAID5=m</div><div class='add'>+# CONFIG_MD_RAID5_RESHAPE is not set</div><div class='add'>+CONFIG_MD_RAID6=m</div><div class='add'>+CONFIG_MD_MULTIPATH=m</div><div class='add'>+CONFIG_MD_FAULTY=m</div><div class='add'>+CONFIG_BLK_DEV_DM=m</div><div class='add'>+CONFIG_DM_CRYPT=m</div><div class='add'>+CONFIG_DM_SNAPSHOT=m</div><div class='add'>+CONFIG_DM_MIRROR=m</div><div class='add'>+CONFIG_DM_ZERO=m</div><div class='add'>+# CONFIG_DM_MULTIPATH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_DUMMY=m</div><div class='add'>+CONFIG_BONDING=m</div><div class='add'>+CONFIG_EQUALIZER=m</div><div class='add'>+CONFIG_TUN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=m</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+CONFIG_NET_POCKET=y</div><div class='add'>+CONFIG_DE600=m</div><div class='add'>+CONFIG_DE620=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_RADIO=y</div><div class='add'>+# CONFIG_NET_WIRELESS_RTNETLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Obsolete Wireless cards support (pre-802.11)</div><div class='add'>+#</div><div class='add'>+CONFIG_STRIP=m</div><div class='add'>+CONFIG_PCMCIA_WAVELAN=m</div><div class='add'>+CONFIG_PCMCIA_NETWAVE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11 Frequency Hopping cards support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCMCIA_RAYCS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11b ISA/PCI cards support</div><div class='add'>+#</div><div class='add'>+CONFIG_HERMES=m</div><div class='add'>+CONFIG_ATMEL=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11b Pcmcia/Cardbus cards support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCMCIA_HERMES=m</div><div class='add'>+# CONFIG_PCMCIA_SPECTRUM is not set</div><div class='add'>+CONFIG_AIRO_CS=m</div><div class='add'>+CONFIG_PCMCIA_ATMEL=m</div><div class='add'>+CONFIG_PCMCIA_WL3501=m</div><div class='add'>+# CONFIG_HOSTAP is not set</div><div class='add'>+CONFIG_NET_WIRELESS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_PCMCIA=y</div><div class='add'>+CONFIG_PCMCIA_3C589=m</div><div class='add'>+CONFIG_PCMCIA_3C574=m</div><div class='add'>+CONFIG_PCMCIA_FMVJ18X=m</div><div class='add'>+CONFIG_PCMCIA_PCNET=m</div><div class='add'>+CONFIG_PCMCIA_NMCLAN=m</div><div class='add'>+CONFIG_PCMCIA_SMC91C92=m</div><div class='add'>+CONFIG_PCMCIA_XIRC2PS=m</div><div class='add'>+CONFIG_PCMCIA_AXNET=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_WAN=y</div><div class='add'>+CONFIG_SYNCLINK_SYNCPPP=m</div><div class='add'>+CONFIG_HDLC=m</div><div class='add'>+CONFIG_HDLC_RAW=y</div><div class='add'>+CONFIG_HDLC_RAW_ETH=y</div><div class='add'>+CONFIG_HDLC_CISCO=y</div><div class='add'>+CONFIG_HDLC_FR=y</div><div class='add'>+CONFIG_HDLC_PPP=y</div><div class='add'>+CONFIG_HDLC_X25=y</div><div class='add'>+CONFIG_DLCI=m</div><div class='add'>+CONFIG_DLCI_COUNT=24</div><div class='add'>+CONFIG_DLCI_MAX=8</div><div class='add'>+CONFIG_WAN_ROUTER_DRIVERS=y</div><div class='add'>+CONFIG_LAPBETHER=m</div><div class='add'>+CONFIG_X25_ASY=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATM drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ATM_DUMMY is not set</div><div class='add'>+CONFIG_ATM_TCP=m</div><div class='add'>+CONFIG_PLIP=m</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+CONFIG_PPP_FILTER=y</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+CONFIG_PPP_MPPE=m</div><div class='add'>+CONFIG_PPPOE=m</div><div class='add'>+CONFIG_PPPOATM=m</div><div class='add'>+CONFIG_SLIP=m</div><div class='add'>+CONFIG_SLIP_COMPRESSED=y</div><div class='add'>+CONFIG_SLIP_SMART=y</div><div class='add'>+CONFIG_SLIP_MODE_SLIP6=y</div><div class='add'>+CONFIG_SHAPER=m</div><div class='add'>+CONFIG_NETCONSOLE=m</div><div class='add'>+CONFIG_NETPOLL=y</div><div class='add'>+# CONFIG_NETPOLL_RX is not set</div><div class='add'>+# CONFIG_NETPOLL_TRAP is not set</div><div class='add'>+CONFIG_NET_POLL_CONTROLLER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+CONFIG_ISDN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old ISDN4Linux</div><div class='add'>+#</div><div class='add'>+CONFIG_ISDN_I4L=m</div><div class='add'>+CONFIG_ISDN_PPP=y</div><div class='add'>+CONFIG_ISDN_PPP_VJ=y</div><div class='add'>+CONFIG_ISDN_MPP=y</div><div class='add'>+CONFIG_IPPP_FILTER=y</div><div class='add'>+CONFIG_ISDN_PPP_BSDCOMP=m</div><div class='add'>+CONFIG_ISDN_AUDIO=y</div><div class='add'>+CONFIG_ISDN_TTY_FAX=y</div><div class='add'>+CONFIG_ISDN_X25=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN feature submodules</div><div class='add'>+#</div><div class='add'>+CONFIG_ISDN_DRV_LOOP=m</div><div class='add'>+CONFIG_ISDN_DIVERSION=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN4Linux hardware drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Passive cards</div><div class='add'>+#</div><div class='add'>+CONFIG_ISDN_DRV_HISAX=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# D-channel protocol features</div><div class='add'>+#</div><div class='add'>+CONFIG_HISAX_EURO=y</div><div class='add'>+CONFIG_DE_AOC=y</div><div class='add'>+# CONFIG_HISAX_NO_SENDCOMPLETE is not set</div><div class='add'>+# CONFIG_HISAX_NO_LLC is not set</div><div class='add'>+# CONFIG_HISAX_NO_KEYPAD is not set</div><div class='add'>+CONFIG_HISAX_1TR6=y</div><div class='add'>+CONFIG_HISAX_NI1=y</div><div class='add'>+CONFIG_HISAX_MAX_CARDS=8</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HiSax supported cards</div><div class='add'>+#</div><div class='add'>+CONFIG_HISAX_16_3=y</div><div class='add'>+CONFIG_HISAX_S0BOX=y</div><div class='add'>+CONFIG_HISAX_FRITZPCI=y</div><div class='add'>+CONFIG_HISAX_AVM_A1_PCMCIA=y</div><div class='add'>+CONFIG_HISAX_ELSA=y</div><div class='add'>+CONFIG_HISAX_DIEHLDIVA=y</div><div class='add'>+CONFIG_HISAX_SEDLBAUER=y</div><div class='add'>+CONFIG_HISAX_NICCY=y</div><div class='add'>+CONFIG_HISAX_GAZEL=y</div><div class='add'>+CONFIG_HISAX_HFC_SX=y</div><div class='add'>+# CONFIG_HISAX_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HiSax PCMCIA card service modules</div><div class='add'>+#</div><div class='add'>+CONFIG_HISAX_SEDLBAUER_CS=m</div><div class='add'>+CONFIG_HISAX_ELSA_CS=m</div><div class='add'>+CONFIG_HISAX_AVM_A1_CS=m</div><div class='add'>+CONFIG_HISAX_TELES_CS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# HiSax sub driver modules</div><div class='add'>+#</div><div class='add'>+CONFIG_HISAX_ST5481=m</div><div class='add'>+CONFIG_HISAX_HFCUSB=m</div><div class='add'>+# CONFIG_HISAX_HFC4S8S is not set</div><div class='add'>+CONFIG_HISAX_HDLC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Active cards</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Siemens Gigaset</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN_DRV_GIGASET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CAPI subsystem</div><div class='add'>+#</div><div class='add'>+CONFIG_ISDN_CAPI=m</div><div class='add'>+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y</div><div class='add'>+CONFIG_ISDN_CAPI_MIDDLEWARE=y</div><div class='add'>+CONFIG_ISDN_CAPI_CAPI20=m</div><div class='add'>+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y</div><div class='add'>+CONFIG_ISDN_CAPI_CAPIFS=m</div><div class='add'>+CONFIG_ISDN_CAPI_CAPIDRV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CAPI hardware drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Active AVM cards</div><div class='add'>+#</div><div class='add'>+CONFIG_CAPI_AVM=y</div><div class='add'>+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m</div><div class='add'>+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Active Eicon DIVA Server cards</div><div class='add'>+#</div><div class='add'>+CONFIG_CAPI_EICON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=m</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+CONFIG_INPUT_JOYDEV=m</div><div class='add'>+CONFIG_INPUT_TSDEV=m</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_X=240</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_Y=320</div><div class='add'>+CONFIG_INPUT_EVDEV=m</div><div class='add'>+CONFIG_INPUT_EVBUG=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+CONFIG_KEYBOARD_SUNKBD=m</div><div class='add'>+CONFIG_KEYBOARD_LKKBD=m</div><div class='add'>+CONFIG_KEYBOARD_XTKBD=m</div><div class='add'>+CONFIG_KEYBOARD_NEWTON=m</div><div class='add'>+CONFIG_INPUT_MOUSE=y</div><div class='add'>+CONFIG_MOUSE_PS2=m</div><div class='add'>+CONFIG_MOUSE_SERIAL=m</div><div class='add'>+CONFIG_MOUSE_VSXXXAA=m</div><div class='add'>+CONFIG_INPUT_JOYSTICK=y</div><div class='add'>+CONFIG_JOYSTICK_ANALOG=m</div><div class='add'>+CONFIG_JOYSTICK_A3D=m</div><div class='add'>+CONFIG_JOYSTICK_ADI=m</div><div class='add'>+CONFIG_JOYSTICK_COBRA=m</div><div class='add'>+CONFIG_JOYSTICK_GF2K=m</div><div class='add'>+CONFIG_JOYSTICK_GRIP=m</div><div class='add'>+CONFIG_JOYSTICK_GRIP_MP=m</div><div class='add'>+CONFIG_JOYSTICK_GUILLEMOT=m</div><div class='add'>+CONFIG_JOYSTICK_INTERACT=m</div><div class='add'>+CONFIG_JOYSTICK_SIDEWINDER=m</div><div class='add'>+CONFIG_JOYSTICK_TMDC=m</div><div class='add'>+CONFIG_JOYSTICK_IFORCE=m</div><div class='add'>+CONFIG_JOYSTICK_IFORCE_USB=y</div><div class='add'>+CONFIG_JOYSTICK_IFORCE_232=y</div><div class='add'>+CONFIG_JOYSTICK_WARRIOR=m</div><div class='add'>+CONFIG_JOYSTICK_MAGELLAN=m</div><div class='add'>+CONFIG_JOYSTICK_SPACEORB=m</div><div class='add'>+CONFIG_JOYSTICK_SPACEBALL=m</div><div class='add'>+CONFIG_JOYSTICK_STINGER=m</div><div class='add'>+# CONFIG_JOYSTICK_TWIDJOY is not set</div><div class='add'>+CONFIG_JOYSTICK_DB9=m</div><div class='add'>+CONFIG_JOYSTICK_GAMECON=m</div><div class='add'>+CONFIG_JOYSTICK_TURBOGRAFX=m</div><div class='add'>+CONFIG_JOYSTICK_JOYDUMP=m</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+CONFIG_TOUCHSCREEN_GUNZE=m</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+CONFIG_INPUT_UINPUT=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=m</div><div class='add'>+CONFIG_SERIO_PARKBD=m</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+CONFIG_SERIO_RAW=m</div><div class='add'>+CONFIG_GAMEPORT=m</div><div class='add'>+CONFIG_GAMEPORT_NS558=m</div><div class='add'>+CONFIG_GAMEPORT_L4=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_NONSTANDARD=y</div><div class='add'>+CONFIG_COMPUTONE=m</div><div class='add'>+CONFIG_ROCKETPORT=m</div><div class='add'>+CONFIG_CYCLADES=m</div><div class='add'>+# CONFIG_CYZ_INTR is not set</div><div class='add'>+CONFIG_DIGIEPCA=m</div><div class='add'>+CONFIG_MOXA_INTELLIO=m</div><div class='add'>+CONFIG_MOXA_SMARTIO=m</div><div class='add'>+# CONFIG_ISI is not set</div><div class='add'>+CONFIG_SYNCLINKMP=m</div><div class='add'>+CONFIG_N_HDLC=m</div><div class='add'>+# CONFIG_RISCOM8 is not set</div><div class='add'>+# CONFIG_SPECIALIX is not set</div><div class='add'>+CONFIG_SX=m</div><div class='add'>+CONFIG_RIO=m</div><div class='add'>+CONFIG_RIO_OLDPCI=y</div><div class='add'>+CONFIG_STALDRV=y</div><div class='add'>+CONFIG_STALLION=m</div><div class='add'>+CONFIG_ISTALLION=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_CS=m</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+# CONFIG_SERIAL_8250_DETECT_IRQ is not set</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+CONFIG_PRINTER=m</div><div class='add'>+# CONFIG_LP_CONSOLE is not set</div><div class='add'>+CONFIG_PPDEV=m</div><div class='add'>+CONFIG_TIPAR=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+CONFIG_IPMI_HANDLER=m</div><div class='add'>+# CONFIG_IPMI_PANIC_EVENT is not set</div><div class='add'>+CONFIG_IPMI_DEVICE_INTERFACE=m</div><div class='add'>+CONFIG_IPMI_SI=m</div><div class='add'>+CONFIG_IPMI_WATCHDOG=m</div><div class='add'>+CONFIG_IPMI_POWEROFF=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SOFT_WATCHDOG=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_USBPCWATCHDOG=m</div><div class='add'>+CONFIG_NVRAM=m</div><div class='add'>+CONFIG_DTLK=m</div><div class='add'>+CONFIG_R3964=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SYNCLINK_CS=m</div><div class='add'>+# CONFIG_CARDMAN_4000 is not set</div><div class='add'>+# CONFIG_CARDMAN_4040 is not set</div><div class='add'>+CONFIG_RAW_DRIVER=m</div><div class='add'>+CONFIG_MAX_RAW_DEVS=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=m</div><div class='add'>+CONFIG_I2C_ALGOPCF=m</div><div class='add'>+CONFIG_I2C_ALGOPCA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ISA=m</div><div class='add'>+CONFIG_I2C_PARPORT=m</div><div class='add'>+CONFIG_I2C_PARPORT_LIGHT=m</div><div class='add'>+CONFIG_I2C_STUB=m</div><div class='add'>+CONFIG_I2C_PCA_ISA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+CONFIG_SENSORS_EEPROM=m</div><div class='add'>+CONFIG_SENSORS_PCF8574=m</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+CONFIG_SENSORS_PCF8591=m</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+CONFIG_W1=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# 1-wire Bus Masters</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1_MASTER_DS9490 is not set</div><div class='add'>+# CONFIG_W1_MASTER_DS2482 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# 1-wire Slaves</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1_SLAVE_THERM is not set</div><div class='add'>+# CONFIG_W1_SLAVE_SMEM is not set</div><div class='add'>+# CONFIG_W1_SLAVE_DS2433 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+CONFIG_HWMON_VID=m</div><div class='add'>+CONFIG_SENSORS_ADM1021=m</div><div class='add'>+CONFIG_SENSORS_ADM1025=m</div><div class='add'>+CONFIG_SENSORS_ADM1026=m</div><div class='add'>+CONFIG_SENSORS_ADM1031=m</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+CONFIG_SENSORS_ASB100=m</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+CONFIG_SENSORS_DS1621=m</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+CONFIG_SENSORS_FSCHER=m</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+CONFIG_SENSORS_GL518SM=m</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+CONFIG_SENSORS_IT87=m</div><div class='add'>+CONFIG_SENSORS_LM63=m</div><div class='add'>+CONFIG_SENSORS_LM75=m</div><div class='add'>+CONFIG_SENSORS_LM77=m</div><div class='add'>+CONFIG_SENSORS_LM78=m</div><div class='add'>+CONFIG_SENSORS_LM80=m</div><div class='add'>+CONFIG_SENSORS_LM83=m</div><div class='add'>+CONFIG_SENSORS_LM85=m</div><div class='add'>+CONFIG_SENSORS_LM87=m</div><div class='add'>+CONFIG_SENSORS_LM90=m</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+CONFIG_SENSORS_MAX1619=m</div><div class='add'>+CONFIG_SENSORS_PC87360=m</div><div class='add'>+CONFIG_SENSORS_SMSC47M1=m</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+CONFIG_SENSORS_W83781D=m</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+CONFIG_SENSORS_W83L785TS=m</div><div class='add'>+CONFIG_SENSORS_W83627HF=m</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB=y</div><div class='add'>+CONFIG_DVB_CORE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported USB Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_USB is not set</div><div class='add'>+CONFIG_DVB_TTUSB_BUDGET=m</div><div class='add'>+CONFIG_DVB_TTUSB_DEC=m</div><div class='add'>+CONFIG_DVB_CINERGYT2=m</div><div class='add'>+CONFIG_DVB_CINERGYT2_TUNING=y</div><div class='add'>+CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32</div><div class='add'>+CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512</div><div class='add'>+CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250</div><div class='add'>+CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y</div><div class='add'>+CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported FlexCopII (B2C2) Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_B2C2_FLEXCOP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Supported DVB Frontends</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Customise DVB Frontends</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-S (satellite) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_STV0299=m</div><div class='add'>+CONFIG_DVB_CX24110=m</div><div class='add'>+# CONFIG_DVB_CX24123 is not set</div><div class='add'>+CONFIG_DVB_TDA8083=m</div><div class='add'>+CONFIG_DVB_MT312=m</div><div class='add'>+CONFIG_DVB_VES1X93=m</div><div class='add'>+# CONFIG_DVB_S5H1420 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-T (terrestrial) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_SP8870=m</div><div class='add'>+CONFIG_DVB_SP887X=m</div><div class='add'>+CONFIG_DVB_CX22700=m</div><div class='add'>+CONFIG_DVB_CX22702=m</div><div class='add'>+CONFIG_DVB_L64781=m</div><div class='add'>+CONFIG_DVB_TDA1004X=m</div><div class='add'>+CONFIG_DVB_NXT6000=m</div><div class='add'>+CONFIG_DVB_MT352=m</div><div class='add'>+# CONFIG_DVB_ZL10353 is not set</div><div class='add'>+CONFIG_DVB_DIB3000MB=m</div><div class='add'>+CONFIG_DVB_DIB3000MC=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DVB-C (cable) frontends</div><div class='add'>+#</div><div class='add'>+CONFIG_DVB_VES1820=m</div><div class='add'>+CONFIG_DVB_TDA10021=m</div><div class='add'>+CONFIG_DVB_STV0297=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATSC (North American/Korean Terresterial DTV) frontends</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB_NXT200X is not set</div><div class='add'>+# CONFIG_DVB_OR51211 is not set</div><div class='add'>+# CONFIG_DVB_OR51132 is not set</div><div class='add'>+# CONFIG_DVB_BCM3510 is not set</div><div class='add'>+# CONFIG_DVB_LGDT330X is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=m</div><div class='add'>+CONFIG_SND_TIMER=m</div><div class='add'>+CONFIG_SND_PCM=m</div><div class='add'>+CONFIG_SND_HWDEP=m</div><div class='add'>+CONFIG_SND_RAWMIDI=m</div><div class='add'>+CONFIG_SND_SEQUENCER=m</div><div class='add'>+CONFIG_SND_SEQ_DUMMY=m</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+CONFIG_SND_SEQUENCER_OSS=y</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+# CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_MPU401_UART=m</div><div class='add'>+CONFIG_SND_DUMMY=m</div><div class='add'>+CONFIG_SND_VIRMIDI=m</div><div class='add'>+CONFIG_SND_MTPAV=m</div><div class='add'>+CONFIG_SND_SERIAL_U16550=m</div><div class='add'>+CONFIG_SND_MPU401=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_USB_AUDIO=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND_PRIME=m</div><div class='add'>+# CONFIG_OBSOLETE_OSS_DRIVER is not set</div><div class='add'>+# CONFIG_SOUND_MSNDCLAS is not set</div><div class='add'>+# CONFIG_SOUND_MSNDPIN is not set</div><div class='add'>+CONFIG_SOUND_TVMIXER=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=m</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+CONFIG_USB_BANDWIDTH=y</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_SL811_HCD=m</div><div class='add'>+# CONFIG_USB_SL811_CS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ACM=m</div><div class='add'>+CONFIG_USB_PRINTER=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+CONFIG_USB_STORAGE_DATAFAB=y</div><div class='add'>+CONFIG_USB_STORAGE_FREECOM=y</div><div class='add'>+CONFIG_USB_STORAGE_ISD200=y</div><div class='add'>+CONFIG_USB_STORAGE_DPCM=y</div><div class='add'>+CONFIG_USB_STORAGE_USBAT=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR09=y</div><div class='add'>+CONFIG_USB_STORAGE_SDDR55=y</div><div class='add'>+CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+CONFIG_USB_HIDINPUT=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+CONFIG_USB_HIDDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_KBD=m</div><div class='add'>+CONFIG_USB_MOUSE=m</div><div class='add'>+CONFIG_USB_AIPTEK=m</div><div class='add'>+CONFIG_USB_WACOM=m</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+CONFIG_USB_KBTAB=m</div><div class='add'>+CONFIG_USB_POWERMATE=m</div><div class='add'>+CONFIG_USB_MTOUCH=m</div><div class='add'>+# CONFIG_USB_ITMTOUCH is not set</div><div class='add'>+CONFIG_USB_EGALAX=m</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+CONFIG_USB_XPAD=m</div><div class='add'>+CONFIG_USB_ATI_REMOTE=m</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_MDC800=m</div><div class='add'>+CONFIG_USB_MICROTEK=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_CATC=m</div><div class='add'>+CONFIG_USB_KAWETH=m</div><div class='add'>+CONFIG_USB_PEGASUS=m</div><div class='add'>+CONFIG_USB_RTL8150=m</div><div class='add'>+CONFIG_USB_USBNET=m</div><div class='add'>+CONFIG_USB_NET_AX8817X=m</div><div class='add'>+CONFIG_USB_NET_CDCETHER=m</div><div class='add'>+# CONFIG_USB_NET_GL620A is not set</div><div class='add'>+CONFIG_USB_NET_NET1080=m</div><div class='add'>+# CONFIG_USB_NET_PLUSB is not set</div><div class='add'>+# CONFIG_USB_NET_RNDIS_HOST is not set</div><div class='add'>+# CONFIG_USB_NET_CDC_SUBSET is not set</div><div class='add'>+CONFIG_USB_NET_ZAURUS=m</div><div class='add'>+# CONFIG_USB_ZD1201 is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_USS720=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_SERIAL=m</div><div class='add'>+CONFIG_USB_SERIAL_GENERIC=y</div><div class='add'>+# CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ANYDATA is not set</div><div class='add'>+CONFIG_USB_SERIAL_BELKIN=m</div><div class='add'>+CONFIG_USB_SERIAL_WHITEHEAT=m</div><div class='add'>+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m</div><div class='add'>+# CONFIG_USB_SERIAL_CP2101 is not set</div><div class='add'>+CONFIG_USB_SERIAL_CYPRESS_M8=m</div><div class='add'>+CONFIG_USB_SERIAL_EMPEG=m</div><div class='add'>+CONFIG_USB_SERIAL_FTDI_SIO=m</div><div class='add'>+CONFIG_USB_SERIAL_VISOR=m</div><div class='add'>+CONFIG_USB_SERIAL_IPAQ=m</div><div class='add'>+CONFIG_USB_SERIAL_IR=m</div><div class='add'>+CONFIG_USB_SERIAL_EDGEPORT=m</div><div class='add'>+CONFIG_USB_SERIAL_EDGEPORT_TI=m</div><div class='add'>+# CONFIG_USB_SERIAL_GARMIN is not set</div><div class='add'>+CONFIG_USB_SERIAL_IPW=m</div><div class='add'>+CONFIG_USB_SERIAL_KEYSPAN_PDA=m</div><div class='add'>+CONFIG_USB_SERIAL_KEYSPAN=m</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set</div><div class='add'>+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set</div><div class='add'>+CONFIG_USB_SERIAL_KLSI=m</div><div class='add'>+CONFIG_USB_SERIAL_KOBIL_SCT=m</div><div class='add'>+CONFIG_USB_SERIAL_MCT_U232=m</div><div class='add'>+# CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='add'>+CONFIG_USB_SERIAL_PL2303=m</div><div class='add'>+# CONFIG_USB_SERIAL_HP4X is not set</div><div class='add'>+CONFIG_USB_SERIAL_SAFE=m</div><div class='add'>+# CONFIG_USB_SERIAL_SAFE_PADDED is not set</div><div class='add'>+# CONFIG_USB_SERIAL_TI is not set</div><div class='add'>+CONFIG_USB_SERIAL_CYBERJACK=m</div><div class='add'>+CONFIG_USB_SERIAL_XIRCOM=m</div><div class='add'>+CONFIG_USB_SERIAL_OMNINET=m</div><div class='add'>+CONFIG_USB_EZUSB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+CONFIG_USB_AUERSWALD=m</div><div class='add'>+CONFIG_USB_RIO500=m</div><div class='add'>+CONFIG_USB_LEGOTOWER=m</div><div class='add'>+CONFIG_USB_LCD=m</div><div class='add'>+CONFIG_USB_LED=m</div><div class='add'>+CONFIG_USB_CYTHERM=m</div><div class='add'>+CONFIG_USB_PHIDGETKIT=m</div><div class='add'>+CONFIG_USB_PHIDGETSERVO=m</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+CONFIG_USB_TEST=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ATM=m</div><div class='add'>+CONFIG_USB_SPEEDTOUCH=m</div><div class='add'>+# CONFIG_USB_CXACRU is not set</div><div class='add'>+# CONFIG_USB_UEAGLEATM is not set</div><div class='add'>+# CONFIG_USB_XUSBATM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=m</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+CONFIG_USB_GADGET_DUMMY_HCD=y</div><div class='add'>+CONFIG_USB_DUMMY_HCD=m</div><div class='add'>+CONFIG_USB_GADGET_DUALSPEED=y</div><div class='add'>+CONFIG_USB_ZERO=m</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC=m</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+CONFIG_MMC_BLOCK=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT2_FS_SECURITY=y</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT3_FS_SECURITY=y</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+CONFIG_REISERFS_FS=m</div><div class='add'>+# CONFIG_REISERFS_CHECK is not set</div><div class='add'>+# CONFIG_REISERFS_PROC_INFO is not set</div><div class='add'>+CONFIG_REISERFS_FS_XATTR=y</div><div class='add'>+CONFIG_REISERFS_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_REISERFS_FS_SECURITY=y</div><div class='add'>+CONFIG_JFS_FS=m</div><div class='add'>+CONFIG_JFS_POSIX_ACL=y</div><div class='add'>+# CONFIG_JFS_SECURITY is not set</div><div class='add'>+# CONFIG_JFS_DEBUG is not set</div><div class='add'>+CONFIG_JFS_STATISTICS=y</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_XFS_FS=m</div><div class='add'>+CONFIG_XFS_EXPORT=y</div><div class='add'>+CONFIG_XFS_QUOTA=y</div><div class='add'>+CONFIG_XFS_SECURITY=y</div><div class='add'>+CONFIG_XFS_POSIX_ACL=y</div><div class='add'>+CONFIG_XFS_RT=y</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_MINIX_FS=m</div><div class='add'>+CONFIG_ROMFS_FS=m</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_QUOTA=y</div><div class='add'>+CONFIG_QFMT_V1=m</div><div class='add'>+CONFIG_QFMT_V2=m</div><div class='add'>+CONFIG_QUOTACTL=y</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+CONFIG_AUTOFS_FS=m</div><div class='add'>+CONFIG_AUTOFS4_FS=m</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=m</div><div class='add'>+CONFIG_JOLIET=y</div><div class='add'>+CONFIG_ZISOFS=y</div><div class='add'>+CONFIG_ZISOFS_FS=m</div><div class='add'>+CONFIG_UDF_FS=m</div><div class='add'>+CONFIG_UDF_NLS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+CONFIG_NTFS_FS=m</div><div class='add'>+# CONFIG_NTFS_DEBUG is not set</div><div class='add'>+# CONFIG_NTFS_RW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ADFS_FS=m</div><div class='add'>+# CONFIG_ADFS_FS_RW is not set</div><div class='add'>+CONFIG_AFFS_FS=m</div><div class='add'>+CONFIG_HFS_FS=m</div><div class='add'>+CONFIG_HFSPLUS_FS=m</div><div class='add'>+CONFIG_BEFS_FS=m</div><div class='add'>+# CONFIG_BEFS_DEBUG is not set</div><div class='add'>+CONFIG_BFS_FS=m</div><div class='add'>+CONFIG_EFS_FS=m</div><div class='add'>+CONFIG_JFFS_FS=m</div><div class='add'>+CONFIG_JFFS_FS_VERBOSE=0</div><div class='add'>+CONFIG_JFFS_PROC_FS=y</div><div class='add'>+CONFIG_JFFS2_FS=m</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+CONFIG_VXFS_FS=m</div><div class='add'>+CONFIG_HPFS_FS=m</div><div class='add'>+CONFIG_QNX4FS_FS=m</div><div class='add'>+CONFIG_SYSV_FS=m</div><div class='add'>+CONFIG_UFS_FS=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=m</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_DIRECTIO=y</div><div class='add'>+CONFIG_NFSD=m</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+# CONFIG_NFSD_V3_ACL is not set</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='add'>+CONFIG_LOCKD=m</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=m</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=m</div><div class='add'>+CONFIG_SUNRPC_GSS=m</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=m</div><div class='add'>+CONFIG_RPCSEC_GSS_SPKM3=m</div><div class='add'>+CONFIG_SMB_FS=m</div><div class='add'>+# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='add'>+CONFIG_CIFS=m</div><div class='add'>+# CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='add'>+CONFIG_NCP_FS=m</div><div class='add'>+CONFIG_NCPFS_PACKET_SIGNING=y</div><div class='add'>+CONFIG_NCPFS_IOCTL_LOCKING=y</div><div class='add'>+CONFIG_NCPFS_STRONG=y</div><div class='add'>+CONFIG_NCPFS_NFS_NS=y</div><div class='add'>+CONFIG_NCPFS_OS2_NS=y</div><div class='add'>+# CONFIG_NCPFS_SMALLDOS is not set</div><div class='add'>+CONFIG_NCPFS_NLS=y</div><div class='add'>+CONFIG_NCPFS_EXTRAS=y</div><div class='add'>+CONFIG_CODA_FS=m</div><div class='add'>+# CONFIG_CODA_FS_OLD_API is not set</div><div class='add'>+CONFIG_AFS_FS=m</div><div class='add'>+CONFIG_RXRPC=m</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+CONFIG_ACORN_PARTITION=y</div><div class='add'>+# CONFIG_ACORN_PARTITION_CUMANA is not set</div><div class='add'>+# CONFIG_ACORN_PARTITION_EESOX is not set</div><div class='add'>+CONFIG_ACORN_PARTITION_ICS=y</div><div class='add'>+# CONFIG_ACORN_PARTITION_ADFS is not set</div><div class='add'>+# CONFIG_ACORN_PARTITION_POWERTEC is not set</div><div class='add'>+CONFIG_ACORN_PARTITION_RISCIX=y</div><div class='add'>+CONFIG_OSF_PARTITION=y</div><div class='add'>+CONFIG_AMIGA_PARTITION=y</div><div class='add'>+CONFIG_ATARI_PARTITION=y</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_BSD_DISKLABEL=y</div><div class='add'>+CONFIG_MINIX_SUBPARTITION=y</div><div class='add'>+CONFIG_SOLARIS_X86_PARTITION=y</div><div class='add'>+CONFIG_UNIXWARE_DISKLABEL=y</div><div class='add'>+CONFIG_LDM_PARTITION=y</div><div class='add'>+# CONFIG_LDM_DEBUG is not set</div><div class='add'>+CONFIG_SGI_PARTITION=y</div><div class='add'>+CONFIG_ULTRIX_PARTITION=y</div><div class='add'>+CONFIG_SUN_PARTITION=y</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="cp437"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_737=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_775=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_852=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_855=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_857=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_860=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_861=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_862=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_863=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_864=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_865=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_866=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_869=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_936=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_950=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_932=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_949=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_874=m</div><div class='add'>+CONFIG_NLS_ISO8859_8=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1250=m</div><div class='add'>+CONFIG_NLS_CODEPAGE_1251=m</div><div class='add'>+CONFIG_NLS_ASCII=m</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+CONFIG_NLS_ISO8859_2=m</div><div class='add'>+CONFIG_NLS_ISO8859_3=m</div><div class='add'>+CONFIG_NLS_ISO8859_4=m</div><div class='add'>+CONFIG_NLS_ISO8859_5=m</div><div class='add'>+CONFIG_NLS_ISO8859_6=m</div><div class='add'>+CONFIG_NLS_ISO8859_7=m</div><div class='add'>+CONFIG_NLS_ISO8859_9=m</div><div class='add'>+CONFIG_NLS_ISO8859_13=m</div><div class='add'>+CONFIG_NLS_ISO8859_14=m</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+CONFIG_NLS_KOI8_R=m</div><div class='add'>+CONFIG_NLS_KOI8_U=m</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_OPROFILE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_PREEMPT=y</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_DEBUG_USER is not set</div><div class='add'>+# CONFIG_DEBUG_WAITQ is not set</div><div class='add'>+# CONFIG_DEBUG_ERRORS is not set</div><div class='add'>+CONFIG_DEBUG_LL=y</div><div class='add'>+# CONFIG_DEBUG_ICEDCC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+CONFIG_SECURITY_CAPABILITIES=m</div><div class='add'>+CONFIG_SECURITY_ROOTPLUG=m</div><div class='add'>+CONFIG_SECURITY_SECLVL=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+CONFIG_CRYPTO_MD4=m</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_WP512=m</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=m</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+CONFIG_CRYPTO_TEA=m</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+CONFIG_CRYPTO_KHAZAD=m</div><div class='add'>+CONFIG_CRYPTO_ANUBIS=m</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_CRC32C=m</div><div class='add'>+CONFIG_CRYPTO_TEST=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+CONFIG_CRC16=m</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_REED_SOLOMON=m</div><div class='add'>+CONFIG_REED_SOLOMON_DEC16=y</div><div class='head'>diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig<br/>index 3cec29d56c8e..f20814e6f497 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/configs/s3c2410_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/configs/s3c2410_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/s3c2410_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/s3c2410_defconfig</a></div><div class='hunk'>@@ -1,12 +1,14 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.16</div><div class='del'>-# Mon Mar 20 20:36:02 2006</div><div class='add'>+# Linux kernel version: 2.6.17-git9</div><div class='add'>+# Sun Jun 25 23:56:32 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ARM=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -27,6 +29,7 @@ CONFIG_SYSVIPC=y</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_UID16=y</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='hunk'>@@ -42,22 +45,16 @@ CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='del'>-CONFIG_CC_ALIGN_LABELS=0</div><div class='del'>-CONFIG_CC_ALIGN_LOOPS=0</div><div class='del'>-CONFIG_CC_ALIGN_JUMPS=0</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> # CONFIG_MODULE_UNLOAD is not set</div><div class='del'>-CONFIG_OBSOLETE_MODPARM=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='ctx'> CONFIG_KMOD=y</div><div class='hunk'>@@ -65,6 +62,7 @@ CONFIG_KMOD=y</div><div class='ctx'> #</div><div class='ctx'> # Block layer</div><div class='ctx'> #</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -82,17 +80,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> # System Type</div><div class='ctx'> #</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS7500 is not set</div><div class='ctx'> # CONFIG_ARCH_CLPS711X is not set</div><div class='ctx'> # CONFIG_ARCH_CO285 is not set</div><div class='ctx'> # CONFIG_ARCH_EBSA110 is not set</div><div class='ctx'> # CONFIG_ARCH_EP93XX is not set</div><div class='ctx'> # CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='del'>-# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_NETX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='ctx'> # CONFIG_ARCH_IOP3XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP4XX is not set</div><div class='ctx'> # CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='ctx'> # CONFIG_ARCH_L7200 is not set</div><div class='add'>+# CONFIG_ARCH_PNX4008 is not set</div><div class='ctx'> # CONFIG_ARCH_PXA is not set</div><div class='ctx'> # CONFIG_ARCH_RPC is not set</div><div class='ctx'> # CONFIG_ARCH_SA1100 is not set</div><div class='hunk'>@@ -100,12 +107,6 @@ CONFIG_ARCH_S3C2410=y</div><div class='ctx'> # CONFIG_ARCH_SHARK is not set</div><div class='ctx'> # CONFIG_ARCH_LH7A40X is not set</div><div class='ctx'> # CONFIG_ARCH_OMAP is not set</div><div class='del'>-# CONFIG_ARCH_VERSATILE is not set</div><div class='del'>-# CONFIG_ARCH_REALVIEW is not set</div><div class='del'>-# CONFIG_ARCH_IMX is not set</div><div class='del'>-# CONFIG_ARCH_H720X is not set</div><div class='del'>-# CONFIG_ARCH_AAEC2000 is not set</div><div class='del'>-# CONFIG_ARCH_AT91RM9200 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # S3C24XX Implementations</div><div class='hunk'>@@ -116,14 +117,22 @@ CONFIG_ARCH_BAST=y</div><div class='ctx'> CONFIG_BAST_PC104_IRQ=y</div><div class='ctx'> CONFIG_ARCH_H1940=y</div><div class='ctx'> CONFIG_MACH_N30=y</div><div class='add'>+CONFIG_MACH_SMDK=y</div><div class='ctx'> CONFIG_ARCH_SMDK2410=y</div><div class='ctx'> CONFIG_ARCH_S3C2440=y</div><div class='add'>+CONFIG_SMDK2440_CPU2440=y</div><div class='add'>+CONFIG_SMDK2440_CPU2442=y</div><div class='add'>+CONFIG_MACH_SMDK2413=y</div><div class='ctx'> CONFIG_MACH_VR1000=y</div><div class='ctx'> CONFIG_MACH_RX3715=y</div><div class='ctx'> CONFIG_MACH_OTOM=y</div><div class='ctx'> CONFIG_MACH_NEXCODER_2440=y</div><div class='add'>+CONFIG_S3C2410_CLOCK=y</div><div class='ctx'> CONFIG_CPU_S3C2410=y</div><div class='add'>+CONFIG_CPU_S3C2412=y</div><div class='add'>+CONFIG_CPU_S3C244X=y</div><div class='ctx'> CONFIG_CPU_S3C2440=y</div><div class='add'>+CONFIG_CPU_S3C2442=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # S3C2410 Boot</div><div class='hunk'>@@ -146,8 +155,11 @@ CONFIG_S3C2410_LOWLEVEL_UART_PORT=0</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CPU_32=y</div><div class='ctx'> CONFIG_CPU_ARM920T=y</div><div class='add'>+CONFIG_CPU_ARM926T=y</div><div class='ctx'> CONFIG_CPU_32v4=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='ctx'> CONFIG_CPU_ABRT_EV4T=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5TJ=y</div><div class='ctx'> CONFIG_CPU_CACHE_V4WT=y</div><div class='ctx'> CONFIG_CPU_CACHE_VIVT=y</div><div class='ctx'> CONFIG_CPU_COPY_V4WB=y</div><div class='hunk'>@@ -160,6 +172,7 @@ CONFIG_CPU_TLB_V4WBI=y</div><div class='ctx'> # CONFIG_CPU_ICACHE_DISABLE is not set</div><div class='ctx'> # CONFIG_CPU_DCACHE_DISABLE is not set</div><div class='ctx'> # CONFIG_CPU_DCACHE_WRITETHROUGH is not set</div><div class='add'>+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Bus support</div><div class='hunk'>@@ -207,6 +220,7 @@ CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0"</div><div class='ctx'> CONFIG_FPE_NWFPE=y</div><div class='ctx'> # CONFIG_FPE_NWFPE_XP is not set</div><div class='ctx'> # CONFIG_FPE_FASTFPE is not set</div><div class='add'>+# CONFIG_VFP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Userspace binary formats</div><div class='hunk'>@@ -235,6 +249,8 @@ CONFIG_NET=y</div><div class='ctx'> # CONFIG_NETDEBUG is not set</div><div class='ctx'> # CONFIG_PACKET is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -251,12 +267,18 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_AH is not set</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='ctx'> CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -311,6 +333,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -360,7 +383,6 @@ CONFIG_MTD_CFI_I2=y</div><div class='ctx'> # CONFIG_MTD_CFI_I8 is not set</div><div class='ctx'> CONFIG_MTD_CFI_INTELEXT=y</div><div class='ctx'> CONFIG_MTD_CFI_AMDSTD=y</div><div class='del'>-CONFIG_MTD_CFI_AMDSTD_RETRY=0</div><div class='ctx'> # CONFIG_MTD_CFI_STAA is not set</div><div class='ctx'> CONFIG_MTD_CFI_UTIL=y</div><div class='ctx'> # CONFIG_MTD_RAM is not set</div><div class='hunk'>@@ -385,7 +407,6 @@ CONFIG_MTD_BAST_MAXSIZE=4</div><div class='ctx'> # CONFIG_MTD_SLRAM is not set</div><div class='ctx'> # CONFIG_MTD_PHRAM is not set</div><div class='ctx'> # CONFIG_MTD_MTDRAM is not set</div><div class='del'>-# CONFIG_MTD_BLKMTD is not set</div><div class='ctx'> # CONFIG_MTD_BLOCK2MTD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -400,10 +421,12 @@ CONFIG_MTD_BAST_MAXSIZE=4</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> CONFIG_MTD_NAND_S3C2410=y</div><div class='ctx'> # CONFIG_MTD_NAND_S3C2410_DEBUG is not set</div><div class='ctx'> # CONFIG_MTD_NAND_S3C2410_HWECC is not set</div><div class='add'>+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='ctx'> # CONFIG_MTD_NAND_NANDSIM is not set</div><div class='ctx'> </div><div class='hunk'>@@ -417,8 +440,8 @@ CONFIG_MTD_NAND_S3C2410=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PARPORT=y</div><div class='ctx'> # CONFIG_PARPORT_PC is not set</div><div class='del'>-# CONFIG_PARPORT_ARC is not set</div><div class='ctx'> # CONFIG_PARPORT_GSC is not set</div><div class='add'>+# CONFIG_PARPORT_AX88796 is not set</div><div class='ctx'> CONFIG_PARPORT_1284=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -694,7 +717,6 @@ CONFIG_S3C2410_WATCHDOG=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USBPCWATCHDOG is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='del'>-# CONFIG_RTC is not set</div><div class='ctx'> CONFIG_S3C2410_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -728,6 +750,7 @@ CONFIG_I2C_ALGOBIT=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_I2C_ELEKTOR is not set</div><div class='ctx'> CONFIG_I2C_ISA=m</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> CONFIG_I2C_S3C2410=y</div><div class='hunk'>@@ -743,9 +766,7 @@ CONFIG_SENSORS_EEPROM=m</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='del'>-# CONFIG_SENSORS_RTC8564 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='del'>-# CONFIG_RTC_X1205_I2C is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_ALGO is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='hunk'>@@ -760,13 +781,13 @@ CONFIG_SENSORS_EEPROM=m</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> CONFIG_HWMON_VID=m</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -794,8 +815,10 @@ CONFIG_SENSORS_LM85=m</div><div class='ctx'> # CONFIG_SENSORS_MAX1619 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='hunk'>@@ -807,18 +830,29 @@ CONFIG_SENSORS_LM85=m</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Multimedia Capabilities Port drivers</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='hunk'>@@ -828,6 +862,8 @@ CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='add'>+CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='hunk'>@@ -863,6 +899,7 @@ CONFIG_FONT_8x16=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -915,9 +952,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_USB_ACECAD is not set</div><div class='ctx'> # CONFIG_USB_KBTAB is not set</div><div class='ctx'> # CONFIG_USB_POWERMATE is not set</div><div class='del'>-# CONFIG_USB_MTOUCH is not set</div><div class='del'>-# CONFIG_USB_ITMTOUCH is not set</div><div class='del'>-# CONFIG_USB_EGALAX is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='ctx'> # CONFIG_USB_YEALINK is not set</div><div class='ctx'> # CONFIG_USB_XPAD is not set</div><div class='ctx'> # CONFIG_USB_ATI_REMOTE is not set</div><div class='hunk'>@@ -931,15 +966,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> # CONFIG_USB_MDC800 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB Multimedia devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_DABUSB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Video4Linux support is needed for USB Multimedia device support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # USB Network Adapters</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_CATC is not set</div><div class='hunk'>@@ -969,10 +995,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='ctx'> </div><div class='hunk'>@@ -984,17 +1012,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> # USB Gadget Support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='del'>-# CONFIG_USB_GADGET_NET2280 is not set</div><div class='del'>-# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='del'>-# CONFIG_USB_GADGET_GOKU is not set</div><div class='del'>-# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='del'>-# CONFIG_USB_GADGET_OMAP is not set</div><div class='del'>-# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='del'>-# CONFIG_USB_ZERO is not set</div><div class='del'>-# CONFIG_USB_ETH is not set</div><div class='del'>-# CONFIG_USB_GADGETFS is not set</div><div class='del'>-# CONFIG_USB_FILE_STORAGE is not set</div><div class='del'>-# CONFIG_USB_G_SERIAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MMC/SD Card support</div><div class='hunk'>@@ -1002,6 +1019,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1022,6 +1045,7 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -1052,7 +1076,6 @@ CONFIG_SYSFS=y</div><div class='ctx'> # CONFIG_TMPFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='del'>-# CONFIG_RELAYFS_FS is not set</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1193,6 +1216,7 @@ CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='ctx'> CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> CONFIG_DEBUG_USER=y</div><div class='head'>diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig<br/>new file mode 100644<br/>index 000000000000..a6698dc4f6b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/configs/trizeps4_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/configs/trizeps4_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1579 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17</div><div class='add'>+# Sat Jun 24 22:45:14 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_ARCH_MTD_XIP=y</div><div class='add'>+CONFIG_VECTORS_BASE=0xffff0000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT_V3=y</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+CONFIG_AUDIT=y</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+CONFIG_OBSOLETE_INTERMODULE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# System Type</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_CLPS7500 is not set</div><div class='add'>+# CONFIG_ARCH_CLPS711X is not set</div><div class='add'>+# CONFIG_ARCH_CO285 is not set</div><div class='add'>+# CONFIG_ARCH_EBSA110 is not set</div><div class='add'>+# CONFIG_ARCH_EP93XX is not set</div><div class='add'>+# CONFIG_ARCH_FOOTBRIDGE is not set</div><div class='add'>+# CONFIG_ARCH_INTEGRATOR is not set</div><div class='add'>+# CONFIG_ARCH_IOP3XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP4XX is not set</div><div class='add'>+# CONFIG_ARCH_IXP2000 is not set</div><div class='add'>+# CONFIG_ARCH_IXP23XX is not set</div><div class='add'>+# CONFIG_ARCH_L7200 is not set</div><div class='add'>+CONFIG_ARCH_PXA=y</div><div class='add'>+# CONFIG_ARCH_RPC is not set</div><div class='add'>+# CONFIG_ARCH_SA1100 is not set</div><div class='add'>+# CONFIG_ARCH_S3C2410 is not set</div><div class='add'>+# CONFIG_ARCH_SHARK is not set</div><div class='add'>+# CONFIG_ARCH_LH7A40X is not set</div><div class='add'>+# CONFIG_ARCH_OMAP is not set</div><div class='add'>+# CONFIG_ARCH_VERSATILE is not set</div><div class='add'>+# CONFIG_ARCH_REALVIEW is not set</div><div class='add'>+# CONFIG_ARCH_IMX is not set</div><div class='add'>+# CONFIG_ARCH_H720X is not set</div><div class='add'>+# CONFIG_ARCH_AAEC2000 is not set</div><div class='add'>+# CONFIG_ARCH_AT91RM9200 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Intel PXA2xx Implementations</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCH_LUBBOCK is not set</div><div class='add'>+# CONFIG_MACH_LOGICPD_PXA270 is not set</div><div class='add'>+# CONFIG_MACH_MAINSTONE is not set</div><div class='add'>+# CONFIG_ARCH_PXA_IDP is not set</div><div class='add'>+# CONFIG_PXA_SHARPSL is not set</div><div class='add'>+CONFIG_MACH_TRIZEPS4=y</div><div class='add'>+CONFIG_MACH_TRIZEPS4_CONXS=y</div><div class='add'>+# CONFIG_MACH_TRIZEPS4_ANY is not set</div><div class='add'>+CONFIG_PXA27x=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Type</div><div class='add'>+#</div><div class='add'>+CONFIG_CPU_32=y</div><div class='add'>+CONFIG_CPU_XSCALE=y</div><div class='add'>+CONFIG_CPU_32v5=y</div><div class='add'>+CONFIG_CPU_ABRT_EV5T=y</div><div class='add'>+CONFIG_CPU_CACHE_VIVT=y</div><div class='add'>+CONFIG_CPU_TLB_V4WBI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor Features</div><div class='add'>+#</div><div class='add'>+CONFIG_ARM_THUMB=y</div><div class='add'>+CONFIG_XSCALE_PMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCCARD=m</div><div class='add'>+# CONFIG_PCMCIA_DEBUG is not set</div><div class='add'>+CONFIG_PCMCIA=m</div><div class='add'>+CONFIG_PCMCIA_LOAD_CIS=y</div><div class='add'>+CONFIG_PCMCIA_IOCTL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PC-card bridges</div><div class='add'>+#</div><div class='add'>+CONFIG_PCMCIA_PXA2XX=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel Features</div><div class='add'>+#</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+# CONFIG_NO_IDLE_HZ is not set</div><div class='add'>+CONFIG_HZ=100</div><div class='add'>+# CONFIG_AEABI is not set</div><div class='add'>+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4096</div><div class='add'>+CONFIG_LEDS=y</div><div class='add'>+CONFIG_LEDS_TIMER=y</div><div class='add'>+CONFIG_LEDS_CPU=y</div><div class='add'>+CONFIG_ALIGNMENT_TRAP=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Boot options</div><div class='add'>+#</div><div class='add'>+CONFIG_ZBOOT_ROM_TEXT=0</div><div class='add'>+CONFIG_ZBOOT_ROM_BSS=0</div><div class='add'>+CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200n8"</div><div class='add'>+# CONFIG_XIP_KERNEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Floating point emulation</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# At least one emulation must be selected</div><div class='add'>+#</div><div class='add'>+CONFIG_FPE_NWFPE=y</div><div class='add'>+CONFIG_FPE_NWFPE_XP=y</div><div class='add'>+# CONFIG_FPE_FASTFPE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userspace binary formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='add'>+CONFIG_BINFMT_MISC=m</div><div class='add'>+# CONFIG_ARTHUR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Power management options</div><div class='add'>+#</div><div class='add'>+CONFIG_PM=y</div><div class='add'>+CONFIG_PM_LEGACY=y</div><div class='add'>+# CONFIG_PM_DEBUG is not set</div><div class='add'>+CONFIG_APM=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=m</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Virtual Server Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_NF_CONNTRACK=m</div><div class='add'>+CONFIG_IP_NF_CT_ACCT=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set</div><div class='add'>+# CONFIG_IP_NF_CT_PROTO_SCTP is not set</div><div class='add'>+CONFIG_IP_NF_FTP=m</div><div class='add'>+CONFIG_IP_NF_IRC=m</div><div class='add'>+# CONFIG_IP_NF_NETBIOS_NS is not set</div><div class='add'>+CONFIG_IP_NF_TFTP=m</div><div class='add'>+CONFIG_IP_NF_AMANDA=m</div><div class='add'>+# CONFIG_IP_NF_PPTP is not set</div><div class='add'>+# CONFIG_IP_NF_H323 is not set</div><div class='add'>+CONFIG_IP_NF_QUEUE=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPv6: Netfilter Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP6_NF_QUEUE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+CONFIG_VLAN_8021Q=m</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+CONFIG_IRDA=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IrDA protocols</div><div class='add'>+#</div><div class='add'>+CONFIG_IRLAN=m</div><div class='add'>+CONFIG_IRNET=m</div><div class='add'>+CONFIG_IRCOMM=m</div><div class='add'>+CONFIG_IRDA_ULTRA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IrDA options</div><div class='add'>+#</div><div class='add'>+CONFIG_IRDA_CACHE_LAST_LSAP=y</div><div class='add'>+CONFIG_IRDA_FAST_RR=y</div><div class='add'>+# CONFIG_IRDA_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Infrared-port device drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SIR device drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_IRTTY_SIR=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dongle support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DONGLE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old SIR device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_IRPORT_SIR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old Serial dongle support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# FIR device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_IRDA is not set</div><div class='add'>+# CONFIG_SIGMATEL_FIR is not set</div><div class='add'>+# CONFIG_PXA_FICP is not set</div><div class='add'>+CONFIG_BT=m</div><div class='add'>+CONFIG_BT_L2CAP=m</div><div class='add'>+CONFIG_BT_SCO=m</div><div class='add'>+CONFIG_BT_RFCOMM=m</div><div class='add'>+CONFIG_BT_RFCOMM_TTY=y</div><div class='add'>+CONFIG_BT_BNEP=m</div><div class='add'>+CONFIG_BT_BNEP_MC_FILTER=y</div><div class='add'>+CONFIG_BT_BNEP_PROTO_FILTER=y</div><div class='add'>+CONFIG_BT_HIDP=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bluetooth device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_BT_HCIUSB is not set</div><div class='add'>+# CONFIG_BT_HCIUART is not set</div><div class='add'>+# CONFIG_BT_HCIBCM203X is not set</div><div class='add'>+# CONFIG_BT_HCIBPA10X is not set</div><div class='add'>+# CONFIG_BT_HCIBFUSB is not set</div><div class='add'>+# CONFIG_BT_HCIDTL1 is not set</div><div class='add'>+# CONFIG_BT_HCIBT3C is not set</div><div class='add'>+# CONFIG_BT_HCIBLUECARD is not set</div><div class='add'>+# CONFIG_BT_HCIBTUART is not set</div><div class='add'>+# CONFIG_BT_HCIVHCI is not set</div><div class='add'>+CONFIG_IEEE80211=m</div><div class='add'>+# CONFIG_IEEE80211_DEBUG is not set</div><div class='add'>+CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_CCMP=m</div><div class='add'>+CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='add'>+CONFIG_IEEE80211_SOFTMAC=m</div><div class='add'>+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set</div><div class='add'>+CONFIG_WIRELESS_EXT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+CONFIG_CONNECTOR=y</div><div class='add'>+CONFIG_PROC_EVENTS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+CONFIG_MTD_CONCAT=y</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_PARTS=y</div><div class='add'>+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1</div><div class='add'>+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y</div><div class='add'>+CONFIG_MTD_REDBOOT_PARTS_READONLY=y</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+# CONFIG_MTD_AFS_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+CONFIG_NFTL=y</div><div class='add'>+CONFIG_NFTL_RW=y</div><div class='add'>+CONFIG_INFTL=y</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+CONFIG_MTD_JEDECPROBE=y</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+CONFIG_MTD_CFI_ADV_OPTIONS=y</div><div class='add'>+# CONFIG_MTD_CFI_NOSWAP is not set</div><div class='add'>+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set</div><div class='add'>+CONFIG_MTD_CFI_LE_BYTE_SWAP=y</div><div class='add'>+CONFIG_MTD_CFI_GEOMETRY=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_OTP is not set</div><div class='add'>+CONFIG_MTD_CFI_INTELEXT=y</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+# CONFIG_MTD_XIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_COMPLEX_MAPPINGS=y</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x0</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x4000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='add'>+# CONFIG_MTD_TRIZEPS4 is not set</div><div class='add'>+# CONFIG_MTD_ARM_INTEGRATOR is not set</div><div class='add'>+# CONFIG_MTD_IMPA7 is not set</div><div class='add'>+# CONFIG_MTD_SHARP_SL is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+CONFIG_MTD_DOC2001PLUS=y</div><div class='add'>+CONFIG_MTD_DOCPROBE=y</div><div class='add'>+CONFIG_MTD_DOCECC=y</div><div class='add'>+# CONFIG_MTD_DOCPROBE_ADVANCED is not set</div><div class='add'>+CONFIG_MTD_DOCPROBE_ADDRESS=0</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+# CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_H1900 is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+CONFIG_MTD_NAND_DISKONCHIP=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set</div><div class='add'>+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_SHARPSL is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+CONFIG_BLK_DEV_NBD=y</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=4</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+CONFIG_BLK_DEV_IDE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDISK=y</div><div class='add'>+CONFIG_IDEDISK_MULTI_MODE=y</div><div class='add'>+CONFIG_BLK_DEV_IDECS=m</div><div class='add'>+# CONFIG_BLK_DEV_IDECD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDESCSI is not set</div><div class='add'>+# CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IDE chipset support/bugfixes</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE_GENERIC=y</div><div class='add'>+CONFIG_IDE_PXA_CF=y</div><div class='add'>+CONFIG_IDE_ARM=y</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='add'>+# CONFIG_IDEDMA_AUTO is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=m</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_MULTI_LUN=y</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA SCSI adapter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCMCIA_AHA152X is not set</div><div class='add'>+# CONFIG_PCMCIA_FDOMAIN is not set</div><div class='add'>+# CONFIG_PCMCIA_NINJA_SCSI is not set</div><div class='add'>+# CONFIG_PCMCIA_QLOGIC is not set</div><div class='add'>+# CONFIG_PCMCIA_SYM53C500 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+CONFIG_DAVICOM_PHY=y</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_SMC91X is not set</div><div class='add'>+CONFIG_DM9000=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_RADIO=y</div><div class='add'>+# CONFIG_NET_WIRELESS_RTNETLINK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Obsolete Wireless cards support (pre-802.11)</div><div class='add'>+#</div><div class='add'>+# CONFIG_STRIP is not set</div><div class='add'>+# CONFIG_PCMCIA_WAVELAN is not set</div><div class='add'>+# CONFIG_PCMCIA_NETWAVE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11 Frequency Hopping cards support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCMCIA_RAYCS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11b ISA/PCI cards support</div><div class='add'>+#</div><div class='add'>+CONFIG_HERMES=m</div><div class='add'>+# CONFIG_ATMEL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless 802.11b Pcmcia/Cardbus cards support</div><div class='add'>+#</div><div class='add'>+CONFIG_PCMCIA_HERMES=m</div><div class='add'>+# CONFIG_PCMCIA_SPECTRUM is not set</div><div class='add'>+CONFIG_AIRO_CS=m</div><div class='add'>+# CONFIG_PCMCIA_WL3501 is not set</div><div class='add'>+CONFIG_HOSTAP=m</div><div class='add'>+CONFIG_HOSTAP_FIRMWARE=y</div><div class='add'>+CONFIG_HOSTAP_FIRMWARE_NVRAM=y</div><div class='add'>+CONFIG_HOSTAP_CS=m</div><div class='add'>+CONFIG_NET_WIRELESS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PCMCIA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+CONFIG_PPP_FILTER=y</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+CONFIG_PPP_MPPE=m</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+CONFIG_INPUT_TSDEV=y</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_X=640</div><div class='add'>+CONFIG_INPUT_TSDEV_SCREEN_Y=480</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+CONFIG_INPUT_MOUSE=y</div><div class='add'>+# CONFIG_MOUSE_PS2 is not set</div><div class='add'>+CONFIG_MOUSE_SERIAL=y</div><div class='add'>+# CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+CONFIG_INPUT_TOUCHSCREEN=y</div><div class='add'>+# CONFIG_TOUCHSCREEN_ADS7846 is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_GUNZE is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_ELO is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MTOUCH is not set</div><div class='add'>+# CONFIG_TOUCHSCREEN_MK712 is not set</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+CONFIG_INPUT_UINPUT=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIAL_8250 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_PXA=y</div><div class='add'>+CONFIG_SERIAL_PXA_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_SA1100_WATCHDOG=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SYNCLINK_CS is not set</div><div class='add'>+# CONFIG_CARDMAN_4000 is not set</div><div class='add'>+# CONFIG_CARDMAN_4040 is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_PXA=y</div><div class='add'>+CONFIG_I2C_PXA_SLAVE=y</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+CONFIG_SENSORS_EEPROM=m</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI_BITBANG is not set</div><div class='add'>+CONFIG_SPI_PXA2XX=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia Capabilities Port drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_UCB1400=y</div><div class='add'>+CONFIG_UCB1400_TS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+CONFIG_NEW_LEDS=y</div><div class='add'>+CONFIG_LEDS_CLASS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+CONFIG_LEDS_TRIGGERS=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_TIMER=y</div><div class='add'>+CONFIG_LEDS_TRIGGER_IDE_DISK=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+CONFIG_FB_PXA=y</div><div class='add'>+# CONFIG_FB_PXA_PARAMETERS is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y</div><div class='add'>+CONFIG_FONTS=y</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+# CONFIG_FONT_6x11 is not set</div><div class='add'>+# CONFIG_FONT_7x14 is not set</div><div class='add'>+# CONFIG_FONT_PEARL_8x8 is not set</div><div class='add'>+# CONFIG_FONT_ACORN_8x8 is not set</div><div class='add'>+# CONFIG_FONT_MINI_4x6 is not set</div><div class='add'>+# CONFIG_FONT_SUN8x16 is not set</div><div class='add'>+# CONFIG_FONT_SUN12x22 is not set</div><div class='add'>+# CONFIG_FONT_10x18 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+CONFIG_BACKLIGHT_LCD_SUPPORT=y</div><div class='add'>+CONFIG_BACKLIGHT_CLASS_DEVICE=y</div><div class='add'>+CONFIG_BACKLIGHT_DEVICE=y</div><div class='add'>+CONFIG_LCD_CLASS_DEVICE=y</div><div class='add'>+CONFIG_LCD_DEVICE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced Linux Sound Architecture</div><div class='add'>+#</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_TIMER=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_HWDEP=m</div><div class='add'>+CONFIG_SND_RAWMIDI=m</div><div class='add'>+CONFIG_SND_SEQUENCER=m</div><div class='add'>+# CONFIG_SND_SEQ_DUMMY is not set</div><div class='add'>+CONFIG_SND_OSSEMUL=y</div><div class='add'>+CONFIG_SND_MIXER_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS=y</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='add'>+# CONFIG_SND_SEQUENCER_OSS is not set</div><div class='add'>+# CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='add'>+CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='add'>+CONFIG_SND_VERBOSE_PRINTK=y</div><div class='add'>+# CONFIG_SND_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_AC97_CODEC=y</div><div class='add'>+CONFIG_SND_AC97_BUS=y</div><div class='add'>+# CONFIG_SND_DUMMY is not set</div><div class='add'>+# CONFIG_SND_VIRMIDI is not set</div><div class='add'>+# CONFIG_SND_MTPAV is not set</div><div class='add'>+# CONFIG_SND_SERIAL_U16550 is not set</div><div class='add'>+# CONFIG_SND_MPU401 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ALSA ARM devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_PXA2XX_PCM=y</div><div class='add'>+CONFIG_SND_PXA2XX_AC97=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB devices</div><div class='add'>+#</div><div class='add'>+CONFIG_SND_USB_AUDIO=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCMCIA devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_SND_VXPOCKET is not set</div><div class='add'>+# CONFIG_SND_PDAUDIOCF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Open Sound System</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND_PRIME is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_SUSPEND is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+CONFIG_USB_HIDINPUT=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+CONFIG_USB_TOUCHSCREEN=m</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN_EGALAX is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN_PANJIT is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN_3M is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN_ITM is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_USB_ZD1201 is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+# CONFIG_USB_GADGET_NET2280 is not set</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+CONFIG_USB_GADGET_DUMMY_HCD=y</div><div class='add'>+CONFIG_USB_DUMMY_HCD=y</div><div class='add'>+CONFIG_USB_GADGET_DUALSPEED=y</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=m</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+CONFIG_USB_GADGETFS=m</div><div class='add'>+CONFIG_USB_FILE_STORAGE=m</div><div class='add'>+# CONFIG_USB_FILE_STORAGE_TEST is not set</div><div class='add'>+CONFIG_USB_G_SERIAL=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+CONFIG_MMC=y</div><div class='add'>+# CONFIG_MMC_DEBUG is not set</div><div class='add'>+CONFIG_MMC_BLOCK=y</div><div class='add'>+CONFIG_MMC_PXA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+CONFIG_RTC_DRV_SA1100=y</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT2_FS_SECURITY=y</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT3_FS_SECURITY=y</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+CONFIG_AUTOFS4_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+CONFIG_JFFS_FS=y</div><div class='add'>+CONFIG_JFFS_FS_VERBOSE=0</div><div class='add'>+CONFIG_JFFS_PROC_FS=y</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_NONE is not set</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_SIZE is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+CONFIG_NFSD_V2_ACL=y</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+CONFIG_NFSD_V3_ACL=y</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+CONFIG_SMB_FS=m</div><div class='add'>+# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='add'>+CONFIG_CIFS=m</div><div class='add'>+# CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+CONFIG_LDM_PARTITION=y</div><div class='add'>+# CONFIG_LDM_DEBUG is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-15"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=y</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+CONFIG_NLS_ISO8859_15=m</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+CONFIG_PROFILING=y</div><div class='add'>+CONFIG_OPROFILE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_FRAME_POINTER=y</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_DEBUG_USER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+CONFIG_KEYS=y</div><div class='add'>+CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='add'>+CONFIG_SECURITY=y</div><div class='add'>+# CONFIG_SECURITY_NETWORK is not set</div><div class='add'>+CONFIG_SECURITY_CAPABILITIES=y</div><div class='add'>+# CONFIG_SECURITY_ROOTPLUG is not set</div><div class='add'>+# CONFIG_SECURITY_SECLVL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+CONFIG_CRYPTO_MD4=y</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+CONFIG_CRYPTO_AES=m</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='add'>+CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='add'>+CONFIG_CRYPTO_CRC32C=y</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='add'>+CONFIG_CRC16=y</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+CONFIG_LIBCRC32C=y</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_REED_SOLOMON=y</div><div class='add'>+CONFIG_REED_SOLOMON_DEC16=y</div><div class='head'>diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile<br/>index a601b8b55f35..f0c0cdb1c183 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/Makefile</a></div><div class='hunk'>@@ -22,7 +22,10 @@ obj-$(CONFIG_PCI)		+= bios32.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='ctx'> obj-$(CONFIG_OABI_COMPAT)	+= sys_oabi-compat.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_IWMMXT)		+= iwmmxt.o</div><div class='add'>+obj-$(CONFIG_CRUNCH)		+= crunch.o crunch-bits.o</div><div class='add'>+AFLAGS_crunch-bits.o		:= -Wa,-mcpu=ep9312</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_IWMMXT)		+= iwmmxt.o iwmmxt-notifier.o</div><div class='ctx'> AFLAGS_iwmmxt.o			:= -Wa,-mcpu=iwmmxt</div><div class='ctx'> </div><div class='ctx'> ifneq ($(CONFIG_ARCH_EBSA110),y)</div><div class='head'>diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c<br/>index 2bed290fec76..33c55689f999 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/apm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/apm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/apm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/apm.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * [This document is available from Microsoft at:</div><div class='ctx'>  *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c<br/>index c49b5d4d7fca..da69e660574b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/armksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/armksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/armksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/armksyms.c</a></div><div class='hunk'>@@ -109,11 +109,13 @@ EXPORT_SYMBOL(memchr);</div><div class='ctx'> EXPORT_SYMBOL(__memzero);</div><div class='ctx'> </div><div class='ctx'> 	/* user mem (segment) */</div><div class='del'>-EXPORT_SYMBOL(__arch_copy_from_user);</div><div class='del'>-EXPORT_SYMBOL(__arch_copy_to_user);</div><div class='del'>-EXPORT_SYMBOL(__arch_clear_user);</div><div class='del'>-EXPORT_SYMBOL(__arch_strnlen_user);</div><div class='del'>-EXPORT_SYMBOL(__arch_strncpy_from_user);</div><div class='add'>+EXPORT_SYMBOL(__strnlen_user);</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_user);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+EXPORT_SYMBOL(__copy_from_user);</div><div class='add'>+EXPORT_SYMBOL(__copy_to_user);</div><div class='add'>+EXPORT_SYMBOL(__clear_user);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__get_user_1);</div><div class='ctx'> EXPORT_SYMBOL(__get_user_2);</div><div class='hunk'>@@ -123,6 +125,7 @@ EXPORT_SYMBOL(__put_user_1);</div><div class='ctx'> EXPORT_SYMBOL(__put_user_2);</div><div class='ctx'> EXPORT_SYMBOL(__put_user_4);</div><div class='ctx'> EXPORT_SYMBOL(__put_user_8);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* crypto hash */</div><div class='ctx'> EXPORT_SYMBOL(sha_transform);</div><div class='head'>diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c<br/>index 396efba9bacd..cc2d58d028e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -60,6 +60,9 @@ int main(void)</div><div class='ctx'> #ifdef CONFIG_IWMMXT</div><div class='ctx'>   DEFINE(TI_IWMMXT_STATE,	offsetof(struct thread_info, fpstate.iwmmxt));</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+  DEFINE(TI_CRUNCH_STATE,	offsetof(struct thread_info, crunchstate));</div><div class='add'>+#endif</div><div class='ctx'>   BLANK();</div><div class='ctx'>   DEFINE(S_R0,			offsetof(struct pt_regs, ARM_r0));</div><div class='ctx'>   DEFINE(S_R1,			offsetof(struct pt_regs, ARM_r1));</div><div class='hunk'>@@ -102,6 +105,7 @@ int main(void)</div><div class='ctx'>   BLANK();</div><div class='ctx'>   DEFINE(PROC_INFO_SZ,		sizeof(struct proc_info_list));</div><div class='ctx'>   DEFINE(PROCINFO_INITFUNC,	offsetof(struct proc_info_list, __cpu_flush));</div><div class='del'>-  DEFINE(PROCINFO_MMUFLAGS,	offsetof(struct proc_info_list, __cpu_mmu_flags));</div><div class='add'>+  DEFINE(PROCINFO_MM_MMUFLAGS,	offsetof(struct proc_info_list, __cpu_mm_mmu_flags));</div><div class='add'>+  DEFINE(PROCINFO_IO_MMUFLAGS,	offsetof(struct proc_info_list, __cpu_io_mmu_flags));</div><div class='ctx'>   return 0; </div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c<br/>index de606dfa8db9..240c448ec31c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/bios32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/bios32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/bios32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/bios32.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Bits taken from various places.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -304,7 +303,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev)</div><div class='ctx'> static void __devinit</div><div class='ctx'> pdev_fixup_device_resources(struct pci_sys_data *root, struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long offset;</div><div class='add'>+	resource_size_t offset;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PCI_NUM_RESOURCES; i++) {</div><div class='hunk'>@@ -371,17 +370,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 			features &amp;= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY);</div><div class='ctx'> </div><div class='ctx'> 		switch (dev-&gt;class &gt;&gt; 8) {</div><div class='del'>-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)</div><div class='del'>-		case PCI_CLASS_BRIDGE_ISA:</div><div class='del'>-		case PCI_CLASS_BRIDGE_EISA:</div><div class='del'>-			/*</div><div class='del'>-			 * If this device is an ISA bridge, set isa_bridge</div><div class='del'>-			 * to point at this device.  We will then go looking</div><div class='del'>-			 * for things like keyboard, etc.</div><div class='del'>-			 */</div><div class='del'>-			isa_bridge = dev;</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='ctx'> 		case PCI_CLASS_BRIDGE_PCI:</div><div class='ctx'> 			pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &amp;status);</div><div class='ctx'> 			status |= PCI_BRIDGE_CTL_PARITY|PCI_BRIDGE_CTL_MASTER_ABORT;</div><div class='hunk'>@@ -634,9 +622,9 @@ char * __init pcibios_setup(char *str)</div><div class='ctx'>  * which might be mirrored at 0x0100-0x03ff..</div><div class='ctx'>  */</div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start = res-&gt;start;</div><div class='add'>+	resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO &amp;&amp; start &amp; 0x300)</div><div class='ctx'> 		start = (start + 0x3ff) &amp; ~0x3ff;</div><div class='hunk'>@@ -702,7 +690,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mark this as IO</div><div class='ctx'> 	 */</div><div class='del'>-	vma-&gt;vm_flags |= VM_SHM | VM_LOCKED | VM_IO;</div><div class='ctx'> 	vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='ctx'> </div><div class='ctx'> 	if (remap_pfn_range(vma, vma-&gt;vm_start, phys,</div><div class='head'>diff --git a/arch/arm/kernel/compat.c b/arch/arm/kernel/compat.c<br/>index 60cfa7f3226c..0a1385442f43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/compat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/compat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/compat.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  the kernel for 5 years from now (2001). This will allow boot loaders</div><div class='ctx'>  *  to convert to the new struct tag way.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/crunch-bits.S b/arch/arm/kernel/crunch-bits.S<br/>new file mode 100644<br/>index 000000000000..a26886758c67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/crunch-bits.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/crunch-bits.S</a></div><div class='hunk'>@@ -0,0 +1,305 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/kernel/crunch-bits.S</div><div class='add'>+ * Cirrus MaverickCrunch context switching and handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Shamelessly stolen from the iWMMXt code by Nicolas Pitre, which is</div><div class='add'>+ * Copyright (c) 2003-2004, MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We can't use hex constants here due to a bug in gas.</div><div class='add'>+ */</div><div class='add'>+#define CRUNCH_MVDX0		0</div><div class='add'>+#define CRUNCH_MVDX1		8</div><div class='add'>+#define CRUNCH_MVDX2		16</div><div class='add'>+#define CRUNCH_MVDX3		24</div><div class='add'>+#define CRUNCH_MVDX4		32</div><div class='add'>+#define CRUNCH_MVDX5		40</div><div class='add'>+#define CRUNCH_MVDX6		48</div><div class='add'>+#define CRUNCH_MVDX7		56</div><div class='add'>+#define CRUNCH_MVDX8		64</div><div class='add'>+#define CRUNCH_MVDX9		72</div><div class='add'>+#define CRUNCH_MVDX10		80</div><div class='add'>+#define CRUNCH_MVDX11		88</div><div class='add'>+#define CRUNCH_MVDX12		96</div><div class='add'>+#define CRUNCH_MVDX13		104</div><div class='add'>+#define CRUNCH_MVDX14		112</div><div class='add'>+#define CRUNCH_MVDX15		120</div><div class='add'>+#define CRUNCH_MVAX0L		128</div><div class='add'>+#define CRUNCH_MVAX0M		132</div><div class='add'>+#define CRUNCH_MVAX0H		136</div><div class='add'>+#define CRUNCH_MVAX1L		140</div><div class='add'>+#define CRUNCH_MVAX1M		144</div><div class='add'>+#define CRUNCH_MVAX1H		148</div><div class='add'>+#define CRUNCH_MVAX2L		152</div><div class='add'>+#define CRUNCH_MVAX2M		156</div><div class='add'>+#define CRUNCH_MVAX2H		160</div><div class='add'>+#define CRUNCH_MVAX3L		164</div><div class='add'>+#define CRUNCH_MVAX3M		168</div><div class='add'>+#define CRUNCH_MVAX3H		172</div><div class='add'>+#define CRUNCH_DSPSC		176</div><div class='add'>+</div><div class='add'>+#define CRUNCH_SIZE		184</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lazy switching of crunch coprocessor context</div><div class='add'>+ *</div><div class='add'>+ * r10 = struct thread_info pointer</div><div class='add'>+ * r9  = ret_from_exception</div><div class='add'>+ * lr  = undefined instr exit</div><div class='add'>+ *</div><div class='add'>+ * called from prefetch exception handler with interrupts disabled</div><div class='add'>+ */</div><div class='add'>+ENTRY(crunch_task_enable)</div><div class='add'>+	ldr	r8, =(EP93XX_APB_VIRT_BASE + 0x00130000)	@ syscon addr</div><div class='add'>+</div><div class='add'>+	ldr	r1, [r8, #0x80]</div><div class='add'>+	tst	r1, #0x00800000			@ access to crunch enabled?</div><div class='add'>+	movne	pc, lr				@ if so no business here</div><div class='add'>+	mov	r3, #0xaa			@ unlock syscon swlock</div><div class='add'>+	str	r3, [r8, #0xc0]</div><div class='add'>+	orr	r1, r1, #0x00800000		@ enable access to crunch</div><div class='add'>+	str	r1, [r8, #0x80]</div><div class='add'>+</div><div class='add'>+	ldr	r3, =crunch_owner</div><div class='add'>+	add	r0, r10, #TI_CRUNCH_STATE	@ get task crunch save area</div><div class='add'>+	ldr	r2, [sp, #60]			@ current task pc value</div><div class='add'>+	ldr	r1, [r3]			@ get current crunch owner</div><div class='add'>+	str	r0, [r3]			@ this task now owns crunch</div><div class='add'>+	sub	r2, r2, #4			@ adjust pc back</div><div class='add'>+	str	r2, [sp, #60]</div><div class='add'>+</div><div class='add'>+	ldr	r2, [r8, #0x80]</div><div class='add'>+	mov	r2, r2				@ flush out enable (@@@)</div><div class='add'>+</div><div class='add'>+	teq	r1, #0				@ test for last ownership</div><div class='add'>+	mov	lr, r9				@ normal exit from exception</div><div class='add'>+	beq	crunch_load			@ no owner, skip save</div><div class='add'>+</div><div class='add'>+crunch_save:</div><div class='add'>+	cfstr64		mvdx0, [r1, #CRUNCH_MVDX0]	@ save 64b registers</div><div class='add'>+	cfstr64		mvdx1, [r1, #CRUNCH_MVDX1]</div><div class='add'>+	cfstr64		mvdx2, [r1, #CRUNCH_MVDX2]</div><div class='add'>+	cfstr64		mvdx3, [r1, #CRUNCH_MVDX3]</div><div class='add'>+	cfstr64		mvdx4, [r1, #CRUNCH_MVDX4]</div><div class='add'>+	cfstr64		mvdx5, [r1, #CRUNCH_MVDX5]</div><div class='add'>+	cfstr64		mvdx6, [r1, #CRUNCH_MVDX6]</div><div class='add'>+	cfstr64		mvdx7, [r1, #CRUNCH_MVDX7]</div><div class='add'>+	cfstr64		mvdx8, [r1, #CRUNCH_MVDX8]</div><div class='add'>+	cfstr64		mvdx9, [r1, #CRUNCH_MVDX9]</div><div class='add'>+	cfstr64		mvdx10, [r1, #CRUNCH_MVDX10]</div><div class='add'>+	cfstr64		mvdx11, [r1, #CRUNCH_MVDX11]</div><div class='add'>+	cfstr64		mvdx12, [r1, #CRUNCH_MVDX12]</div><div class='add'>+	cfstr64		mvdx13, [r1, #CRUNCH_MVDX13]</div><div class='add'>+	cfstr64		mvdx14, [r1, #CRUNCH_MVDX14]</div><div class='add'>+	cfstr64		mvdx15, [r1, #CRUNCH_MVDX15]</div><div class='add'>+</div><div class='add'>+#ifdef __ARMEB__</div><div class='add'>+#error fix me for ARMEB</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cfmv32al	mvfx0, mvax0			@ save 72b accumulators</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX0L]</div><div class='add'>+	cfmv32am	mvfx0, mvax0</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX0M]</div><div class='add'>+	cfmv32ah	mvfx0, mvax0</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX0H]</div><div class='add'>+	cfmv32al	mvfx0, mvax1</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX1L]</div><div class='add'>+	cfmv32am	mvfx0, mvax1</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX1M]</div><div class='add'>+	cfmv32ah	mvfx0, mvax1</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX1H]</div><div class='add'>+	cfmv32al	mvfx0, mvax2</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX2L]</div><div class='add'>+	cfmv32am	mvfx0, mvax2</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX2M]</div><div class='add'>+	cfmv32ah	mvfx0, mvax2</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX2H]</div><div class='add'>+	cfmv32al	mvfx0, mvax3</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX3L]</div><div class='add'>+	cfmv32am	mvfx0, mvax3</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX3M]</div><div class='add'>+	cfmv32ah	mvfx0, mvax3</div><div class='add'>+	cfstr32		mvfx0, [r1, #CRUNCH_MVAX3H]</div><div class='add'>+</div><div class='add'>+	cfmv32sc	mvdx0, dspsc			@ save status word</div><div class='add'>+	cfstr64		mvdx0, [r1, #CRUNCH_DSPSC]</div><div class='add'>+</div><div class='add'>+	teq		r0, #0				@ anything to load?</div><div class='add'>+	cfldr64eq	mvdx0, [r1, #CRUNCH_MVDX0]	@ mvdx0 was clobbered</div><div class='add'>+	moveq		pc, lr</div><div class='add'>+</div><div class='add'>+crunch_load:</div><div class='add'>+	cfldr64		mvdx0, [r0, #CRUNCH_DSPSC]	@ load status word</div><div class='add'>+	cfmvsc32	dspsc, mvdx0</div><div class='add'>+</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX0L]	@ load 72b accumulators</div><div class='add'>+	cfmval32	mvax0, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX0M]</div><div class='add'>+	cfmvam32	mvax0, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX0H]</div><div class='add'>+	cfmvah32	mvax0, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX1L]</div><div class='add'>+	cfmval32	mvax1, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX1M]</div><div class='add'>+	cfmvam32	mvax1, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX1H]</div><div class='add'>+	cfmvah32	mvax1, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX2L]</div><div class='add'>+	cfmval32	mvax2, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX2M]</div><div class='add'>+	cfmvam32	mvax2, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX2H]</div><div class='add'>+	cfmvah32	mvax2, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX3L]</div><div class='add'>+	cfmval32	mvax3, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX3M]</div><div class='add'>+	cfmvam32	mvax3, mvfx0</div><div class='add'>+	cfldr32		mvfx0, [r0, #CRUNCH_MVAX3H]</div><div class='add'>+	cfmvah32	mvax3, mvfx0</div><div class='add'>+</div><div class='add'>+	cfldr64		mvdx0, [r0, #CRUNCH_MVDX0]	@ load 64b registers</div><div class='add'>+	cfldr64		mvdx1, [r0, #CRUNCH_MVDX1]</div><div class='add'>+	cfldr64		mvdx2, [r0, #CRUNCH_MVDX2]</div><div class='add'>+	cfldr64		mvdx3, [r0, #CRUNCH_MVDX3]</div><div class='add'>+	cfldr64		mvdx4, [r0, #CRUNCH_MVDX4]</div><div class='add'>+	cfldr64		mvdx5, [r0, #CRUNCH_MVDX5]</div><div class='add'>+	cfldr64		mvdx6, [r0, #CRUNCH_MVDX6]</div><div class='add'>+	cfldr64		mvdx7, [r0, #CRUNCH_MVDX7]</div><div class='add'>+	cfldr64		mvdx8, [r0, #CRUNCH_MVDX8]</div><div class='add'>+	cfldr64		mvdx9, [r0, #CRUNCH_MVDX9]</div><div class='add'>+	cfldr64		mvdx10, [r0, #CRUNCH_MVDX10]</div><div class='add'>+	cfldr64		mvdx11, [r0, #CRUNCH_MVDX11]</div><div class='add'>+	cfldr64		mvdx12, [r0, #CRUNCH_MVDX12]</div><div class='add'>+	cfldr64		mvdx13, [r0, #CRUNCH_MVDX13]</div><div class='add'>+	cfldr64		mvdx14, [r0, #CRUNCH_MVDX14]</div><div class='add'>+	cfldr64		mvdx15, [r0, #CRUNCH_MVDX15]</div><div class='add'>+</div><div class='add'>+	mov	pc, lr</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Back up crunch regs to save area and disable access to them</div><div class='add'>+ * (mainly for gdb or sleep mode usage)</div><div class='add'>+ *</div><div class='add'>+ * r0 = struct thread_info pointer of target task or NULL for any</div><div class='add'>+ */</div><div class='add'>+ENTRY(crunch_task_disable)</div><div class='add'>+	stmfd	sp!, {r4, r5, lr}</div><div class='add'>+</div><div class='add'>+	mrs	ip, cpsr</div><div class='add'>+	orr	r2, ip, #PSR_I_BIT		@ disable interrupts</div><div class='add'>+	msr	cpsr_c, r2</div><div class='add'>+</div><div class='add'>+	ldr	r4, =(EP93XX_APB_VIRT_BASE + 0x00130000)	@ syscon addr</div><div class='add'>+</div><div class='add'>+	ldr	r3, =crunch_owner</div><div class='add'>+	add	r2, r0, #TI_CRUNCH_STATE	@ get task crunch save area</div><div class='add'>+	ldr	r1, [r3]			@ get current crunch owner</div><div class='add'>+	teq	r1, #0				@ any current owner?</div><div class='add'>+	beq	1f				@ no: quit</div><div class='add'>+	teq	r0, #0				@ any owner?</div><div class='add'>+	teqne	r1, r2				@ or specified one?</div><div class='add'>+	bne	1f				@ no: quit</div><div class='add'>+</div><div class='add'>+	ldr	r5, [r4, #0x80]			@ enable access to crunch</div><div class='add'>+	mov	r2, #0xaa</div><div class='add'>+	str	r2, [r4, #0xc0]</div><div class='add'>+	orr	r5, r5, #0x00800000</div><div class='add'>+	str	r5, [r4, #0x80]</div><div class='add'>+</div><div class='add'>+	mov	r0, #0				@ nothing to load</div><div class='add'>+	str	r0, [r3]			@ no more current owner</div><div class='add'>+	ldr	r2, [r4, #0x80]			@ flush out enable (@@@)</div><div class='add'>+	mov	r2, r2</div><div class='add'>+	bl	crunch_save</div><div class='add'>+</div><div class='add'>+	mov	r2, #0xaa			@ disable access to crunch</div><div class='add'>+	str	r2, [r4, #0xc0]</div><div class='add'>+	bic	r5, r5, #0x00800000</div><div class='add'>+	str	r5, [r4, #0x80]</div><div class='add'>+	ldr	r5, [r4, #0x80]			@ flush out enable (@@@)</div><div class='add'>+	mov	r5, r5</div><div class='add'>+</div><div class='add'>+1:	msr	cpsr_c, ip			@ restore interrupt mode</div><div class='add'>+	ldmfd	sp!, {r4, r5, pc}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy crunch state to given memory address</div><div class='add'>+ *</div><div class='add'>+ * r0 = struct thread_info pointer of target task</div><div class='add'>+ * r1 = memory address where to store crunch state</div><div class='add'>+ *</div><div class='add'>+ * this is called mainly in the creation of signal stack frames</div><div class='add'>+ */</div><div class='add'>+ENTRY(crunch_task_copy)</div><div class='add'>+	mrs	ip, cpsr</div><div class='add'>+	orr	r2, ip, #PSR_I_BIT		@ disable interrupts</div><div class='add'>+	msr	cpsr_c, r2</div><div class='add'>+</div><div class='add'>+	ldr	r3, =crunch_owner</div><div class='add'>+	add	r2, r0, #TI_CRUNCH_STATE	@ get task crunch save area</div><div class='add'>+	ldr	r3, [r3]			@ get current crunch owner</div><div class='add'>+	teq	r2, r3				@ does this task own it...</div><div class='add'>+	beq	1f</div><div class='add'>+</div><div class='add'>+	@ current crunch values are in the task save area</div><div class='add'>+	msr	cpsr_c, ip			@ restore interrupt mode</div><div class='add'>+	mov	r0, r1</div><div class='add'>+	mov	r1, r2</div><div class='add'>+	mov	r2, #CRUNCH_SIZE</div><div class='add'>+	b	memcpy</div><div class='add'>+</div><div class='add'>+1:	@ this task owns crunch regs -- grab a copy from there</div><div class='add'>+	mov	r0, #0				@ nothing to load</div><div class='add'>+	mov	r3, lr				@ preserve return address</div><div class='add'>+	bl	crunch_save</div><div class='add'>+	msr	cpsr_c, ip			@ restore interrupt mode</div><div class='add'>+	mov	pc, r3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Restore crunch state from given memory address</div><div class='add'>+ *</div><div class='add'>+ * r0 = struct thread_info pointer of target task</div><div class='add'>+ * r1 = memory address where to get crunch state from</div><div class='add'>+ *</div><div class='add'>+ * this is used to restore crunch state when unwinding a signal stack frame</div><div class='add'>+ */</div><div class='add'>+ENTRY(crunch_task_restore)</div><div class='add'>+	mrs	ip, cpsr</div><div class='add'>+	orr	r2, ip, #PSR_I_BIT		@ disable interrupts</div><div class='add'>+	msr	cpsr_c, r2</div><div class='add'>+</div><div class='add'>+	ldr	r3, =crunch_owner</div><div class='add'>+	add	r2, r0, #TI_CRUNCH_STATE	@ get task crunch save area</div><div class='add'>+	ldr	r3, [r3]			@ get current crunch owner</div><div class='add'>+	teq	r2, r3				@ does this task own it...</div><div class='add'>+	beq	1f</div><div class='add'>+</div><div class='add'>+	@ this task doesn't own crunch regs -- use its save area</div><div class='add'>+	msr	cpsr_c, ip			@ restore interrupt mode</div><div class='add'>+	mov	r0, r2</div><div class='add'>+	mov	r2, #CRUNCH_SIZE</div><div class='add'>+	b	memcpy</div><div class='add'>+</div><div class='add'>+1:	@ this task owns crunch regs -- load them directly</div><div class='add'>+	mov	r0, r1</div><div class='add'>+	mov	r1, #0				@ nothing to save</div><div class='add'>+	mov	r3, lr				@ preserve return address</div><div class='add'>+	bl	crunch_load</div><div class='add'>+	msr	cpsr_c, ip			@ restore interrupt mode</div><div class='add'>+	mov	pc, r3</div><div class='head'>diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c<br/>new file mode 100644<br/>index 000000000000..748175921f9b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/crunch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/crunch.c</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/kernel/crunch.c</div><div class='add'>+ * Cirrus MaverickCrunch context switching and handling</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/arch/ep93xx-regs.h&gt;</div><div class='add'>+#include &lt;asm/thread_notify.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+struct crunch_state *crunch_owner;</div><div class='add'>+</div><div class='add'>+void crunch_task_release(struct thread_info *thread)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	if (crunch_owner == &amp;thread-&gt;crunchstate)</div><div class='add'>+		crunch_owner = NULL;</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crunch_enabled(u32 devcfg)</div><div class='add'>+{</div><div class='add'>+	return !!(devcfg &amp; EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int crunch_do(struct notifier_block *self, unsigned long cmd, void *t)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *thread = (struct thread_info *)t;</div><div class='add'>+	struct crunch_state *crunch_state;</div><div class='add'>+	u32 devcfg;</div><div class='add'>+</div><div class='add'>+	crunch_state = &amp;thread-&gt;crunchstate;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case THREAD_NOTIFY_FLUSH:</div><div class='add'>+		memset(crunch_state, 0, sizeof(*crunch_state));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * FALLTHROUGH: Ensure we don't try to overwrite our newly</div><div class='add'>+		 * initialised state information on the first fault.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+	case THREAD_NOTIFY_RELEASE:</div><div class='add'>+		crunch_task_release(thread);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case THREAD_NOTIFY_SWITCH:</div><div class='add'>+		devcfg = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG);</div><div class='add'>+		if (crunch_enabled(devcfg) || crunch_owner == crunch_state) {</div><div class='add'>+			devcfg ^= EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE;</div><div class='add'>+			__raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);</div><div class='add'>+			__raw_writel(devcfg, EP93XX_SYSCON_DEVICE_CONFIG);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block crunch_notifier_block = {</div><div class='add'>+	.notifier_call	= crunch_do,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init crunch_init(void)</div><div class='add'>+{</div><div class='add'>+	thread_register_notifier(&amp;crunch_notifier_block);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(crunch_init);</div><div class='head'>diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S<br/>index da280bae3d07..a5747e58a9dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/debug.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/debug.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/debug.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/debug.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  32-bit debugging code</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> 		.text</div><div class='head'>diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c<br/>index 00aa225e8d95..b9a74a741d00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/ecard.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/ecard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/ecard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/ecard.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define ECARD_C</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -620,7 +619,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg</div><div class='ctx'> 		ecard_t *ec = slot_to_ecard(slot);</div><div class='ctx'> </div><div class='ctx'> 		if (ec-&gt;claimed) {</div><div class='del'>-			struct irqdesc *d = irqdesc + ec-&gt;irq;</div><div class='add'>+			struct irq_desc *d = irq_desc + ec-&gt;irq;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * this ugly code is so that we can operate a</div><div class='ctx'> 			 * prioritorising system:</div><div class='hunk'>@@ -884,7 +883,7 @@ static ssize_t ecard_show_resources(struct device *dev, struct device_attribute</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ECARD_NUM_RESOURCES; i++)</div><div class='del'>-		str += sprintf(str, "%08lx %08lx %08lx\n",</div><div class='add'>+		str += sprintf(str, "%08x %08x %08lx\n",</div><div class='ctx'> 				ec-&gt;resource[i].start,</div><div class='ctx'> 				ec-&gt;resource[i].end,</div><div class='ctx'> 				ec-&gt;resource[i].flags);</div><div class='head'>diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S<br/>index ab8e600c18c8..7ea5f01dfc7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-armv.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/entry-armv.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-armv.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/entry-armv.S</a></div><div class='hunk'>@@ -14,12 +14,12 @@</div><div class='ctx'>  *  Note:  there is a StrongARM bug in the STMIA rn, {regs}^ instruction that causes</div><div class='ctx'>  *  it to save wrong values...  Be aware!</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/glue.h&gt;</div><div class='ctx'> #include &lt;asm/vfpmacros.h&gt;</div><div class='ctx'> #include &lt;asm/arch/entry-macro.S&gt;</div><div class='add'>+#include &lt;asm/thread_notify.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "entry-header.S"</div><div class='ctx'> </div><div class='hunk'>@@ -491,9 +491,15 @@ call_fpe:</div><div class='ctx'> 	b	do_fpe				@ CP#1 (FPE)</div><div class='ctx'> 	b	do_fpe				@ CP#2 (FPE)</div><div class='ctx'> 	mov	pc, lr				@ CP#3</div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+	b	crunch_task_enable		@ CP#4 (MaverickCrunch)</div><div class='add'>+	b	crunch_task_enable		@ CP#5 (MaverickCrunch)</div><div class='add'>+	b	crunch_task_enable		@ CP#6 (MaverickCrunch)</div><div class='add'>+#else</div><div class='ctx'> 	mov	pc, lr				@ CP#4</div><div class='ctx'> 	mov	pc, lr				@ CP#5</div><div class='ctx'> 	mov	pc, lr				@ CP#6</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr				@ CP#7</div><div class='ctx'> 	mov	pc, lr				@ CP#8</div><div class='ctx'> 	mov	pc, lr				@ CP#9</div><div class='hunk'>@@ -560,10 +566,8 @@ ENTRY(__switch_to)</div><div class='ctx'> 	add	ip, r1, #TI_CPU_SAVE</div><div class='ctx'> 	ldr	r3, [r2, #TI_TP_VALUE]</div><div class='ctx'> 	stmia	ip!, {r4 - sl, fp, sp, lr}	@ Store most regs on stack</div><div class='del'>-#ifndef CONFIG_MMU</div><div class='del'>-	add	r2, r2, #TI_CPU_DOMAIN</div><div class='del'>-#else</div><div class='del'>-	ldr	r6, [r2, #TI_CPU_DOMAIN]!</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	ldr	r6, [r2, #TI_CPU_DOMAIN]</div><div class='ctx'> #endif</div><div class='ctx'> #if __LINUX_ARM_ARCH__ &gt;= 6</div><div class='ctx'> #ifdef CONFIG_CPU_32v6K</div><div class='hunk'>@@ -585,21 +589,18 @@ ENTRY(__switch_to)</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r6, c3, c0, 0		@ Set domain register</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_VFP</div><div class='del'>-	@ Always disable VFP so we can lazily save/restore the old</div><div class='del'>-	@ state. This occurs in the context of the previous thread.</div><div class='del'>-	VFPFMRX	r4, FPEXC</div><div class='del'>-	bic	r4, r4, #FPEXC_ENABLE</div><div class='del'>-	VFPFMXR	FPEXC, r4</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_IWMMXT)</div><div class='del'>-	bl	iwmmxt_task_switch</div><div class='del'>-#elif defined(CONFIG_CPU_XSCALE)</div><div class='del'>-	add	r4, r2, #40			@ cpu_context_save-&gt;extra</div><div class='add'>+#if defined(CONFIG_CPU_XSCALE) &amp;&amp; !defined(CONFIG_IWMMXT)</div><div class='add'>+	add	r4, r2, #TI_CPU_DOMAIN + 40	@ cpu_context_save-&gt;extra</div><div class='ctx'> 	ldmib	r4, {r4, r5}</div><div class='ctx'> 	mar	acc0, r4, r5</div><div class='ctx'> #endif</div><div class='del'>-	ldmib	r2, {r4 - sl, fp, sp, pc}	@ Load all regs saved previously</div><div class='add'>+	mov	r5, r0</div><div class='add'>+	add	r4, r2, #TI_CPU_SAVE</div><div class='add'>+	ldr	r0, =thread_notify_head</div><div class='add'>+	mov	r1, #THREAD_NOTIFY_SWITCH</div><div class='add'>+	bl	atomic_notifier_call_chain</div><div class='add'>+	mov	r0, r5</div><div class='add'>+	ldmia	r4, {r4 - sl, fp, sp, pc}	@ Load all regs saved previously</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S<br/>index dbcb11a31f78..6f5e7c50d42f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-common.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/entry-common.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-common.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/entry-common.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -271,7 +270,7 @@ ENTRY(sys_call_table)</div><div class='ctx'> @ r8 = syscall table</div><div class='ctx'> 		.type	sys_syscall, #function</div><div class='ctx'> sys_syscall:</div><div class='del'>-		eor	scno, r0, #__NR_OABI_SYSCALL_BASE</div><div class='add'>+		bic	scno, r0, #__NR_OABI_SYSCALL_BASE</div><div class='ctx'> 		cmp	scno, #__NR_syscall - __NR_SYSCALL_BASE</div><div class='ctx'> 		cmpne	scno, #NR_syscalls	@ check range</div><div class='ctx'> 		stmloia	sp, {r5, r6}		@ shuffle args</div><div class='hunk'>@@ -340,7 +339,7 @@ sys_mmap2:</div><div class='ctx'> 		streq	r5, [sp, #4]</div><div class='ctx'> 		beq	do_mmap2</div><div class='ctx'> 		mov	r0, #-EINVAL</div><div class='del'>-		RETINSTR(mov,pc, lr)</div><div class='add'>+		mov	pc, lr</div><div class='ctx'> #else</div><div class='ctx'> 		str	r5, [sp, #4]</div><div class='ctx'> 		b	do_mmap2</div><div class='head'>diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S<br/>index f1c2fd5b63e4..87ab4e157997 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-header.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/entry-header.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/entry-header.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/entry-header.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c<br/>index 1ec3f7faa259..e8e90346f11c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/fiq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/fiq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/fiq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/fiq.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S<br/>index adf62e5eaad7..ac9eb3d30518 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/head-nommu.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/head-nommu.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/head-nommu.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/head-nommu.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *    for 32-bit CPUs which has a process ID register(CP15).</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -39,7 +38,7 @@</div><div class='ctx'> 	__INIT</div><div class='ctx'> 	.type	stext, %function</div><div class='ctx'> ENTRY(stext)</div><div class='del'>-	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode</div><div class='add'>+	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode</div><div class='ctx'> 						@ and irqs disabled</div><div class='ctx'> 	mrc	p15, 0, r9, c0, c0		@ get processor id</div><div class='ctx'> 	bl	__lookup_processor_type		@ r5=procinfo r9=cpuid</div><div class='head'>diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S<br/>index 04f7344e356a..2242f5f7cb7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/head.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Kernel startup code for all 32-bit CPUs</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +70,7 @@</div><div class='ctx'> 	__INIT</div><div class='ctx'> 	.type	stext, %function</div><div class='ctx'> ENTRY(stext)</div><div class='del'>-	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode</div><div class='add'>+	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode</div><div class='ctx'> 						@ and irqs disabled</div><div class='ctx'> 	mrc	p15, 0, r9, c0, c0		@ get processor id</div><div class='ctx'> 	bl	__lookup_processor_type		@ r5=procinfo r9=cpuid</div><div class='hunk'>@@ -104,7 +103,7 @@ ENTRY(secondary_startup)</div><div class='ctx'> 	 * the processor type - there is no need to check the machine type</div><div class='ctx'> 	 * as it has already been validated by the primary processor.</div><div class='ctx'> 	 */</div><div class='del'>-	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC</div><div class='add'>+	msr	cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE</div><div class='ctx'> 	mrc	p15, 0, r9, c0, c0		@ get processor id</div><div class='ctx'> 	bl	__lookup_processor_type</div><div class='ctx'> 	movs	r10, r5				@ invalid processor?</div><div class='hunk'>@@ -221,7 +220,7 @@ __create_page_tables:</div><div class='ctx'> 	teq	r0, r6</div><div class='ctx'> 	bne	1b</div><div class='ctx'> </div><div class='del'>-	ldr	r7, [r10, #PROCINFO_MMUFLAGS]	@ mmuflags</div><div class='add'>+	ldr	r7, [r10, #PROCINFO_MM_MMUFLAGS] @ mm_mmuflags</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create identity mapping for first MB of kernel to</div><div class='hunk'>@@ -272,8 +271,7 @@ __create_page_tables:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_LL</div><div class='del'>-	bic	r7, r7, #0x0c			@ turn off cacheable</div><div class='del'>-						@ and bufferable bits</div><div class='add'>+	ldr	r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Map in IO space for serial debugging.</div><div class='ctx'> 	 * This allows debug messages to be output</div><div class='head'>diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c<br/>index 2d5896b36181..626feeec0ade 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/irq.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'>  *  IRQ's are in fact implemented a bit like signal handlers for the kernel.</div><div class='ctx'>  *  Naturally it's not a 1:1 relation, but there are similarities.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='hunk'>@@ -38,192 +38,18 @@</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Maximum IRQ count.  Currently, this is arbitary.  However, it should</div><div class='del'>- * not be set too low to prevent false triggering.  Conversely, if it</div><div class='del'>- * is set too high, then you could miss a stuck IRQ.</div><div class='del'>- *</div><div class='del'>- * Maybe we ought to set a timer and re-enable the IRQ at a later time?</div><div class='del'>- */</div><div class='del'>-#define MAX_IRQ_CNT	100000</div><div class='del'>-</div><div class='del'>-static int noirqdebug;</div><div class='del'>-static volatile unsigned long irq_err_count;</div><div class='del'>-static DEFINE_SPINLOCK(irq_controller_lock);</div><div class='del'>-static LIST_HEAD(irq_pending);</div><div class='del'>-</div><div class='del'>-struct irqdesc irq_desc[NR_IRQS];</div><div class='del'>-void (*init_arch_irq)(void) __initdata = NULL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * No architecture-specific irq_finish function defined in arm/arch/irqs.h.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef irq_finish</div><div class='ctx'> #define irq_finish(irq) do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Dummy mask/unmask handler</div><div class='del'>- */</div><div class='del'>-void dummy_mask_unmask_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t no_action(int irq, void *dev_id, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void do_bad_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	irq_err_count += 1;</div><div class='del'>-	printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irqchip bad_chip = {</div><div class='del'>-	.ack	= dummy_mask_unmask_irq,</div><div class='del'>-	.mask	= dummy_mask_unmask_irq,</div><div class='del'>-	.unmask = dummy_mask_unmask_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct irqdesc bad_irq_desc = {</div><div class='del'>-	.chip		= &amp;bad_chip,</div><div class='del'>-	.handle		= do_bad_IRQ,</div><div class='del'>-	.pend		= LIST_HEAD_INIT(bad_irq_desc.pend),</div><div class='del'>-	.disable_depth	= 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void synchronize_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-</div><div class='del'>-	while (desc-&gt;running)</div><div class='del'>-		barrier();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(synchronize_irq);</div><div class='del'>-</div><div class='del'>-#define smp_set_running(desc)	do { desc-&gt;running = 1; } while (0)</div><div class='del'>-#define smp_clear_running(desc)	do { desc-&gt;running = 0; } while (0)</div><div class='del'>-#else</div><div class='del'>-#define smp_set_running(desc)	do { } while (0)</div><div class='del'>-#define smp_clear_running(desc)	do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	disable_irq_nosync - disable an irq without waiting</div><div class='del'>- *	@irq: Interrupt to disable</div><div class='del'>- *</div><div class='del'>- *	Disable the selected interrupt line.  Enables and disables</div><div class='del'>- *	are nested.  We do this lazily.</div><div class='del'>- *</div><div class='del'>- *	This function may be called from IRQ context.</div><div class='del'>- */</div><div class='del'>-void disable_irq_nosync(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	desc-&gt;disable_depth++;</div><div class='del'>-	list_del_init(&amp;desc-&gt;pend);</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(disable_irq_nosync);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	disable_irq - disable an irq and wait for completion</div><div class='del'>- *	@irq: Interrupt to disable</div><div class='del'>- *</div><div class='del'>- *	Disable the selected interrupt line.  Enables and disables</div><div class='del'>- *	are nested.  This functions waits for any pending IRQ</div><div class='del'>- *	handlers for this interrupt to complete before returning.</div><div class='del'>- *	If you use this function while holding a resource the IRQ</div><div class='del'>- *	handler may need you will deadlock.</div><div class='del'>- *</div><div class='del'>- *	This function may be called - with care - from IRQ context.</div><div class='del'>- */</div><div class='del'>-void disable_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-</div><div class='del'>-	disable_irq_nosync(irq);</div><div class='del'>-	if (desc-&gt;action)</div><div class='del'>-		synchronize_irq(irq);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(disable_irq);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	enable_irq - enable interrupt handling on an irq</div><div class='del'>- *	@irq: Interrupt to enable</div><div class='del'>- *</div><div class='del'>- *	Re-enables the processing of interrupts on this IRQ line.</div><div class='del'>- *	Note that this may call the interrupt handler, so you may</div><div class='del'>- *	get unexpected results if you hold IRQs disabled.</div><div class='del'>- *</div><div class='del'>- *	This function may be called from IRQ context.</div><div class='del'>- */</div><div class='del'>-void enable_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	if (unlikely(!desc-&gt;disable_depth)) {</div><div class='del'>-		printk("enable_irq(%u) unbalanced from %p\n", irq,</div><div class='del'>-			__builtin_return_address(0));</div><div class='del'>-	} else if (!--desc-&gt;disable_depth) {</div><div class='del'>-		desc-&gt;probing = 0;</div><div class='del'>-		desc-&gt;chip-&gt;unmask(irq);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If the interrupt is waiting to be processed,</div><div class='del'>-		 * try to re-run it.  We can't directly run it</div><div class='del'>-		 * from here since the caller might be in an</div><div class='del'>-		 * interrupt-protected region.</div><div class='del'>-		 */</div><div class='del'>-		if (desc-&gt;pending &amp;&amp; list_empty(&amp;desc-&gt;pend)) {</div><div class='del'>-			desc-&gt;pending = 0;</div><div class='del'>-			if (!desc-&gt;chip-&gt;retrigger ||</div><div class='del'>-			    desc-&gt;chip-&gt;retrigger(irq))</div><div class='del'>-				list_add(&amp;desc-&gt;pend, &amp;irq_pending);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(enable_irq);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enable wake on selected irq</div><div class='del'>- */</div><div class='del'>-void enable_irq_wake(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	if (desc-&gt;chip-&gt;set_wake)</div><div class='del'>-		desc-&gt;chip-&gt;set_wake(irq, 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(enable_irq_wake);</div><div class='del'>-</div><div class='del'>-void disable_irq_wake(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	if (desc-&gt;chip-&gt;set_wake)</div><div class='del'>-		desc-&gt;chip-&gt;set_wake(irq, 0);</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(disable_irq_wake);</div><div class='add'>+void (*init_arch_irq)(void) __initdata = NULL;</div><div class='add'>+unsigned long irq_err_count;</div><div class='ctx'> </div><div class='ctx'> int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> {</div><div class='hunk'>@@ -243,8 +69,8 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i &lt; NR_IRQS) {</div><div class='del'>-		spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	    	action = irq_desc[i].action;</div><div class='add'>+		spin_lock_irqsave(&amp;irq_desc[i].lock, flags);</div><div class='add'>+		action = irq_desc[i].action;</div><div class='ctx'> 		if (!action)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +83,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> </div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='ctx'> unlock:</div><div class='del'>-		spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_desc[i].lock, flags);</div><div class='ctx'> 	} else if (i == NR_IRQS) {</div><div class='ctx'> #ifdef CONFIG_ARCH_ACORN</div><div class='ctx'> 		show_fiq_list(p, v);</div><div class='hunk'>@@ -271,267 +97,11 @@ unlock:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * IRQ lock detection.</div><div class='del'>- *</div><div class='del'>- * Hopefully, this should get us out of a few locked situations.</div><div class='del'>- * However, it may take a while for this to happen, since we need</div><div class='del'>- * a large number if IRQs to appear in the same jiffie with the</div><div class='del'>- * same instruction pointer (or within 2 instructions).</div><div class='del'>- */</div><div class='del'>-static int check_irq_lock(struct irqdesc *desc, int irq, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned long instr_ptr = instruction_pointer(regs);</div><div class='del'>-</div><div class='del'>-	if (desc-&gt;lck_jif == jiffies &amp;&amp;</div><div class='del'>-	    desc-&gt;lck_pc &gt;= instr_ptr &amp;&amp; desc-&gt;lck_pc &lt; instr_ptr + 8) {</div><div class='del'>-		desc-&gt;lck_cnt += 1;</div><div class='del'>-</div><div class='del'>-		if (desc-&gt;lck_cnt &gt; MAX_IRQ_CNT) {</div><div class='del'>-			printk(KERN_ERR "IRQ LOCK: IRQ%d is locking the system, disabled\n", irq);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		desc-&gt;lck_cnt = 0;</div><div class='del'>-		desc-&gt;lck_pc  = instruction_pointer(regs);</div><div class='del'>-		desc-&gt;lck_jif = jiffies;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-report_bad_irq(unsigned int irq, struct pt_regs *regs, struct irqdesc *desc, int ret)</div><div class='del'>-{</div><div class='del'>-	static int count = 100;</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-</div><div class='del'>-	if (noirqdebug)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (ret != IRQ_HANDLED &amp;&amp; ret != IRQ_NONE) {</div><div class='del'>-		if (!count)</div><div class='del'>-			return;</div><div class='del'>-		count--;</div><div class='del'>-		printk("irq%u: bogus retval mask %x\n", irq, ret);</div><div class='del'>-	} else {</div><div class='del'>-		desc-&gt;irqs_unhandled++;</div><div class='del'>-		if (desc-&gt;irqs_unhandled &lt;= 99900)</div><div class='del'>-			return;</div><div class='del'>-		desc-&gt;irqs_unhandled = 0;</div><div class='del'>-		printk("irq%u: nobody cared\n", irq);</div><div class='del'>-	}</div><div class='del'>-	show_regs(regs);</div><div class='del'>-	dump_stack();</div><div class='del'>-	printk(KERN_ERR "handlers:");</div><div class='del'>-	action = desc-&gt;action;</div><div class='del'>-	do {</div><div class='del'>-		printk("\n" KERN_ERR "[&lt;%p&gt;]", action-&gt;handler);</div><div class='del'>-		print_symbol(" (%s)", (unsigned long)action-&gt;handler);</div><div class='del'>-		action = action-&gt;next;</div><div class='del'>-	} while (action);</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-__do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned int status;</div><div class='del'>-	int ret, retval = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;irq_controller_lock);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NO_IDLE_HZ</div><div class='del'>-	if (!(action-&gt;flags &amp; SA_TIMER) &amp;&amp; system_timer-&gt;dyn_tick != NULL) {</div><div class='del'>-		write_seqlock(&amp;xtime_lock);</div><div class='del'>-		if (system_timer-&gt;dyn_tick-&gt;state &amp; DYN_TICK_ENABLED)</div><div class='del'>-			system_timer-&gt;dyn_tick-&gt;handler(irq, 0, regs);</div><div class='del'>-		write_sequnlock(&amp;xtime_lock);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!(action-&gt;flags &amp; SA_INTERRUPT))</div><div class='del'>-		local_irq_enable();</div><div class='del'>-</div><div class='del'>-	status = 0;</div><div class='del'>-	do {</div><div class='del'>-		ret = action-&gt;handler(irq, action-&gt;dev_id, regs);</div><div class='del'>-		if (ret == IRQ_HANDLED)</div><div class='del'>-			status |= action-&gt;flags;</div><div class='del'>-		retval |= ret;</div><div class='del'>-		action = action-&gt;next;</div><div class='del'>-	} while (action);</div><div class='del'>-</div><div class='del'>-	if (status &amp; SA_SAMPLE_RANDOM)</div><div class='del'>-		add_interrupt_randomness(irq);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;irq_controller_lock);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is for software-decoded IRQs.  The caller is expected to</div><div class='del'>- * handle the ack, clear, mask and unmask issues.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-do_simple_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-	const unsigned int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	desc-&gt;triggered = 1;</div><div class='del'>-</div><div class='del'>-	kstat_cpu(cpu).irqs[irq]++;</div><div class='del'>-</div><div class='del'>-	smp_set_running(desc);</div><div class='del'>-</div><div class='del'>-	action = desc-&gt;action;</div><div class='del'>-	if (action) {</div><div class='del'>-		int ret = __do_irq(irq, action, regs);</div><div class='del'>-		if (ret != IRQ_HANDLED)</div><div class='del'>-			report_bad_irq(irq, regs, desc, ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	smp_clear_running(desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Most edge-triggered IRQ implementations seem to take a broken</div><div class='del'>- * approach to this.  Hence the complexity.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-do_edge_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	const unsigned int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	desc-&gt;triggered = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're currently running this IRQ, or its disabled,</div><div class='del'>-	 * we shouldn't process the IRQ.  Instead, turn on the</div><div class='del'>-	 * hardware masks.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(desc-&gt;running || desc-&gt;disable_depth))</div><div class='del'>-		goto running;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Acknowledge and clear the IRQ, but don't mask it.</div><div class='del'>-	 */</div><div class='del'>-	desc-&gt;chip-&gt;ack(irq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Mark the IRQ currently in progress.</div><div class='del'>-	 */</div><div class='del'>-	desc-&gt;running = 1;</div><div class='del'>-</div><div class='del'>-	kstat_cpu(cpu).irqs[irq]++;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct irqaction *action;</div><div class='del'>-</div><div class='del'>-		action = desc-&gt;action;</div><div class='del'>-		if (!action)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (desc-&gt;pending &amp;&amp; !desc-&gt;disable_depth) {</div><div class='del'>-			desc-&gt;pending = 0;</div><div class='del'>-			desc-&gt;chip-&gt;unmask(irq);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		__do_irq(irq, action, regs);</div><div class='del'>-	} while (desc-&gt;pending &amp;&amp; !desc-&gt;disable_depth);</div><div class='del'>-</div><div class='del'>-	desc-&gt;running = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we were disabled or freed, shut down the handler.</div><div class='del'>-	 */</div><div class='del'>-	if (likely(desc-&gt;action &amp;&amp; !check_irq_lock(desc, irq, regs)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>- running:</div><div class='del'>-	/*</div><div class='del'>-	 * We got another IRQ while this one was masked or</div><div class='del'>-	 * currently running.  Delay it.</div><div class='del'>-	 */</div><div class='del'>-	desc-&gt;pending = 1;</div><div class='del'>-	desc-&gt;chip-&gt;mask(irq);</div><div class='del'>-	desc-&gt;chip-&gt;ack(irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Level-based IRQ handler.  Nice and simple.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-	const unsigned int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	desc-&gt;triggered = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Acknowledge, clear _AND_ disable the interrupt.</div><div class='del'>-	 */</div><div class='del'>-	desc-&gt;chip-&gt;ack(irq);</div><div class='del'>-</div><div class='del'>-	if (likely(!desc-&gt;disable_depth)) {</div><div class='del'>-		kstat_cpu(cpu).irqs[irq]++;</div><div class='del'>-</div><div class='del'>-		smp_set_running(desc);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Return with this interrupt masked if no action</div><div class='del'>-		 */</div><div class='del'>-		action = desc-&gt;action;</div><div class='del'>-		if (action) {</div><div class='del'>-			int ret = __do_irq(irq, desc-&gt;action, regs);</div><div class='del'>-</div><div class='del'>-			if (ret != IRQ_HANDLED)</div><div class='del'>-				report_bad_irq(irq, regs, desc, ret);</div><div class='del'>-</div><div class='del'>-			if (likely(!desc-&gt;disable_depth &amp;&amp;</div><div class='del'>-				   !check_irq_lock(desc, irq, regs)))</div><div class='del'>-				desc-&gt;chip-&gt;unmask(irq);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		smp_clear_running(desc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void do_pending_irqs(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	struct list_head head, *l, *n;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct irqdesc *desc;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * First, take the pending interrupts off the list.</div><div class='del'>-		 * The act of calling the handlers may add some IRQs</div><div class='del'>-		 * back onto the list.</div><div class='del'>-		 */</div><div class='del'>-		head = irq_pending;</div><div class='del'>-		INIT_LIST_HEAD(&amp;irq_pending);</div><div class='del'>-		head.next-&gt;prev = &amp;head;</div><div class='del'>-		head.prev-&gt;next = &amp;head;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Now run each entry.  We must delete it from our</div><div class='del'>-		 * list before calling the handler.</div><div class='del'>-		 */</div><div class='del'>-		list_for_each_safe(l, n, &amp;head) {</div><div class='del'>-			desc = list_entry(l, struct irqdesc, pend);</div><div class='del'>-			list_del_init(&amp;desc-&gt;pend);</div><div class='del'>-			desc_handle_irq(desc - irq_desc, desc, regs);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The list must be empty.</div><div class='del'>-		 */</div><div class='del'>-		BUG_ON(!list_empty(&amp;head));</div><div class='del'>-	} while (!list_empty(&amp;irq_pending));</div><div class='del'>-}</div><div class='add'>+/* Handle bad interrupts */</div><div class='add'>+static struct irq_desc bad_irq_desc = {</div><div class='add'>+	.handle_irq = handle_bad_irq,</div><div class='add'>+	.lock = SPIN_LOCK_UNLOCKED</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * do_IRQ handles all hardware IRQ's.  Decoded IRQs should not</div><div class='hunk'>@@ -550,96 +120,15 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)</div><div class='ctx'> 		desc = &amp;bad_irq_desc;</div><div class='ctx'> </div><div class='ctx'> 	irq_enter();</div><div class='del'>-	spin_lock(&amp;irq_controller_lock);</div><div class='del'>-	desc_handle_irq(irq, desc, regs);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now re-run any pending interrupts.</div><div class='del'>-	 */</div><div class='del'>-	if (!list_empty(&amp;irq_pending))</div><div class='del'>-		do_pending_irqs(regs);</div><div class='add'>+	desc_handle_irq(irq, desc, regs);</div><div class='ctx'> </div><div class='add'>+	/* AT91 specific workaround */</div><div class='ctx'> 	irq_finish(irq);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;irq_controller_lock);</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __set_irq_handler(unsigned int irq, irq_handler_t handle, int is_chained)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NR_IRQS) {</div><div class='del'>-		printk(KERN_ERR "Trying to install handler for IRQ%d\n", irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (handle == NULL)</div><div class='del'>-		handle = do_bad_IRQ;</div><div class='del'>-</div><div class='del'>-	desc = irq_desc + irq;</div><div class='del'>-</div><div class='del'>-	if (is_chained &amp;&amp; desc-&gt;chip == &amp;bad_chip)</div><div class='del'>-		printk(KERN_WARNING "Trying to install chained handler for IRQ%d\n", irq);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	if (handle == do_bad_IRQ) {</div><div class='del'>-		desc-&gt;chip-&gt;mask(irq);</div><div class='del'>-		desc-&gt;chip-&gt;ack(irq);</div><div class='del'>-		desc-&gt;disable_depth = 1;</div><div class='del'>-	}</div><div class='del'>-	desc-&gt;handle = handle;</div><div class='del'>-	if (handle != do_bad_IRQ &amp;&amp; is_chained) {</div><div class='del'>-		desc-&gt;valid = 0;</div><div class='del'>-		desc-&gt;probe_ok = 0;</div><div class='del'>-		desc-&gt;disable_depth = 0;</div><div class='del'>-		desc-&gt;chip-&gt;unmask(irq);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void set_irq_chip(unsigned int irq, struct irqchip *chip)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NR_IRQS) {</div><div class='del'>-		printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chip == NULL)</div><div class='del'>-		chip = &amp;bad_chip;</div><div class='del'>-</div><div class='del'>-	desc = irq_desc + irq;</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	desc-&gt;chip = chip;</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int set_irq_type(unsigned int irq, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = -ENXIO;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NR_IRQS) {</div><div class='del'>-		printk(KERN_ERR "Trying to set irq type for IRQ%d\n", irq);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc = irq_desc + irq;</div><div class='del'>-	if (desc-&gt;chip-&gt;set_type) {</div><div class='del'>-		spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-		ret = desc-&gt;chip-&gt;set_type(irq, type);</div><div class='del'>-		spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(set_irq_type);</div><div class='del'>-</div><div class='ctx'> void set_irq_flags(unsigned int irq, unsigned int iflags)</div><div class='ctx'> {</div><div class='ctx'> 	struct irqdesc *desc;</div><div class='hunk'>@@ -651,422 +140,43 @@ void set_irq_flags(unsigned int irq, unsigned int iflags)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	desc = irq_desc + irq;</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	desc-&gt;valid = (iflags &amp; IRQF_VALID) != 0;</div><div class='del'>-	desc-&gt;probe_ok = (iflags &amp; IRQF_PROBE) != 0;</div><div class='del'>-	desc-&gt;noautoenable = (iflags &amp; IRQF_NOAUTOEN) != 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int setup_irq(unsigned int irq, struct irqaction *new)</div><div class='del'>-{</div><div class='del'>-	int shared = 0;</div><div class='del'>-	struct irqaction *old, **p;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct irqdesc *desc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Some drivers like serial.c use request_irq() heavily,</div><div class='del'>-	 * so we have to be careful not to interfere with a</div><div class='del'>-	 * running system.</div><div class='del'>-	 */</div><div class='del'>-	if (new-&gt;flags &amp; SA_SAMPLE_RANDOM) {</div><div class='del'>-		/*</div><div class='del'>-		 * This function might sleep, we want to call it first,</div><div class='del'>-		 * outside of the atomic block.</div><div class='del'>-		 * Yes, this might clear the entropy pool if the wrong</div><div class='del'>-		 * driver is attempted to be loaded, without actually</div><div class='del'>-		 * installing a new handler, but is this really a problem,</div><div class='del'>-		 * only the sysadmin is able to do this.</div><div class='del'>-		 */</div><div class='del'>-	        rand_initialize_irq(irq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The following block of code has to be executed atomically</div><div class='del'>-	 */</div><div class='del'>-	desc = irq_desc + irq;</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	p = &amp;desc-&gt;action;</div><div class='del'>-	if ((old = *p) != NULL) {</div><div class='del'>-		/*</div><div class='del'>-		 * Can't share interrupts unless both agree to and are</div><div class='del'>-		 * the same type.</div><div class='del'>-		 */</div><div class='del'>-		if (!(old-&gt;flags &amp; new-&gt;flags &amp; SA_SHIRQ) ||</div><div class='del'>-		    (~old-&gt;flags &amp; new-&gt;flags) &amp; SA_TRIGGER_MASK) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* add new interrupt at end of irq queue */</div><div class='del'>-		do {</div><div class='del'>-			p = &amp;old-&gt;next;</div><div class='del'>-			old = *p;</div><div class='del'>-		} while (old);</div><div class='del'>-		shared = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*p = new;</div><div class='del'>-</div><div class='del'>-	if (!shared) {</div><div class='del'>- 		desc-&gt;probing = 0;</div><div class='del'>-		desc-&gt;running = 0;</div><div class='del'>-		desc-&gt;pending = 0;</div><div class='del'>-		desc-&gt;disable_depth = 1;</div><div class='del'>-</div><div class='del'>-		if (new-&gt;flags &amp; SA_TRIGGER_MASK &amp;&amp;</div><div class='del'>-		    desc-&gt;chip-&gt;set_type) {</div><div class='del'>-			unsigned int type = new-&gt;flags &amp; SA_TRIGGER_MASK;</div><div class='del'>-			desc-&gt;chip-&gt;set_type(irq, type);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!desc-&gt;noautoenable) {</div><div class='del'>-			desc-&gt;disable_depth = 0;</div><div class='del'>-			desc-&gt;chip-&gt;unmask(irq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	request_irq - allocate an interrupt line</div><div class='del'>- *	@irq: Interrupt line to allocate</div><div class='del'>- *	@handler: Function to be called when the IRQ occurs</div><div class='del'>- *	@irqflags: Interrupt type flags</div><div class='del'>- *	@devname: An ascii name for the claiming device</div><div class='del'>- *	@dev_id: A cookie passed back to the handler function</div><div class='del'>- *</div><div class='del'>- *	This call allocates interrupt resources and enables the</div><div class='del'>- *	interrupt line and IRQ handling. From the point this</div><div class='del'>- *	call is made your handler function may be invoked. Since</div><div class='del'>- *	your handler function must clear any interrupt the board</div><div class='del'>- *	raises, you must take care both to initialise your hardware</div><div class='del'>- *	and to set up the interrupt handler in the right order.</div><div class='del'>- *</div><div class='del'>- *	Dev_id must be globally unique. Normally the address of the</div><div class='del'>- *	device data structure is used as the cookie. Since the handler</div><div class='del'>- *	receives this value it makes sense to use it.</div><div class='del'>- *</div><div class='del'>- *	If your interrupt is shared you must pass a non NULL dev_id</div><div class='del'>- *	as this is required when freeing the interrupt.</div><div class='del'>- *</div><div class='del'>- *	Flags:</div><div class='del'>- *</div><div class='del'>- *	SA_SHIRQ		Interrupt is shared</div><div class='del'>- *</div><div class='del'>- *	SA_INTERRUPT		Disable local interrupts while processing</div><div class='del'>- *</div><div class='del'>- *	SA_SAMPLE_RANDOM	The interrupt can be used for entropy</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-		 unsigned long irq_flags, const char * devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long retval;</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NR_IRQS || !irq_desc[irq].valid || !handler ||</div><div class='del'>-	    (irq_flags &amp; SA_SHIRQ &amp;&amp; !dev_id))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);</div><div class='del'>-	if (!action)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	action-&gt;handler = handler;</div><div class='del'>-	action-&gt;flags = irq_flags;</div><div class='del'>-	cpus_clear(action-&gt;mask);</div><div class='del'>-	action-&gt;name = devname;</div><div class='del'>-	action-&gt;next = NULL;</div><div class='del'>-	action-&gt;dev_id = dev_id;</div><div class='del'>-</div><div class='del'>-	retval = setup_irq(irq, action);</div><div class='del'>-</div><div class='del'>-	if (retval)</div><div class='del'>-		kfree(action);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(request_irq);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	free_irq - free an interrupt</div><div class='del'>- *	@irq: Interrupt line to free</div><div class='del'>- *	@dev_id: Device identity to free</div><div class='del'>- *</div><div class='del'>- *	Remove an interrupt handler. The handler is removed and if the</div><div class='del'>- *	interrupt line is no longer in use by any driver it is disabled.</div><div class='del'>- *	On a shared IRQ the caller must ensure the interrupt is disabled</div><div class='del'>- *	on the card it drives before calling this function.</div><div class='del'>- *</div><div class='del'>- *	This function must not be called from interrupt context.</div><div class='del'>- */</div><div class='del'>-void free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct irqaction * action, **p;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NR_IRQS || !irq_desc[irq].valid) {</div><div class='del'>-		printk(KERN_ERR "Trying to free IRQ%d\n",irq);</div><div class='del'>-		dump_stack();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_controller_lock, flags);</div><div class='del'>-	for (p = &amp;irq_desc[irq].action; (action = *p) != NULL; p = &amp;action-&gt;next) {</div><div class='del'>-		if (action-&gt;dev_id != dev_id)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-	    	/* Found it - now free it */</div><div class='del'>-		*p = action-&gt;next;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (!action) {</div><div class='del'>-		printk(KERN_ERR "Trying to free free IRQ%d\n",irq);</div><div class='del'>-		dump_stack();</div><div class='del'>-	} else {</div><div class='del'>-		synchronize_irq(irq);</div><div class='del'>-		kfree(action);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(free_irq);</div><div class='del'>-</div><div class='del'>-static DECLARE_MUTEX(probe_sem);</div><div class='del'>-</div><div class='del'>-/* Start the interrupt probing.  Unlike other architectures,</div><div class='del'>- * we don't return a mask of interrupts from probe_irq_on,</div><div class='del'>- * but return the number of interrupts enabled for the probe.</div><div class='del'>- * The interrupts which have been enabled for probing is</div><div class='del'>- * instead recorded in the irq_desc structure.</div><div class='del'>- */</div><div class='del'>-unsigned long probe_irq_on(void)</div><div class='del'>-{</div><div class='del'>-	unsigned int i, irqs = 0;</div><div class='del'>-	unsigned long delay;</div><div class='del'>-</div><div class='del'>-	down(&amp;probe_sem);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * first snaffle up any unassigned but</div><div class='del'>-	 * probe-able interrupts</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irq(&amp;irq_controller_lock);</div><div class='del'>-	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-		if (!irq_desc[i].probe_ok || irq_desc[i].action)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		irq_desc[i].probing = 1;</div><div class='del'>-		irq_desc[i].triggered = 0;</div><div class='del'>-		if (irq_desc[i].chip-&gt;set_type)</div><div class='del'>-			irq_desc[i].chip-&gt;set_type(i, IRQT_PROBE);</div><div class='del'>-		irq_desc[i].chip-&gt;unmask(i);</div><div class='del'>-		irqs += 1;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;irq_controller_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * wait for spurious interrupts to mask themselves out again</div><div class='del'>-	 */</div><div class='del'>-	for (delay = jiffies + HZ/10; time_before(jiffies, delay); )</div><div class='del'>-		/* min 100ms delay */;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * now filter out any obviously spurious interrupts</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irq(&amp;irq_controller_lock);</div><div class='del'>-	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-		if (irq_desc[i].probing &amp;&amp; irq_desc[i].triggered) {</div><div class='del'>-			irq_desc[i].probing = 0;</div><div class='del'>-			irqs -= 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;irq_controller_lock);</div><div class='del'>-</div><div class='del'>-	return irqs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(probe_irq_on);</div><div class='del'>-</div><div class='del'>-unsigned int probe_irq_mask(unsigned long irqs)</div><div class='del'>-{</div><div class='del'>-	unsigned int mask = 0, i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;irq_controller_lock);</div><div class='del'>-	for (i = 0; i &lt; 16 &amp;&amp; i &lt; NR_IRQS; i++)</div><div class='del'>-		if (irq_desc[i].probing &amp;&amp; irq_desc[i].triggered)</div><div class='del'>-			mask |= 1 &lt;&lt; i;</div><div class='del'>-	spin_unlock_irq(&amp;irq_controller_lock);</div><div class='del'>-</div><div class='del'>-	up(&amp;probe_sem);</div><div class='del'>-</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(probe_irq_mask);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Possible return values:</div><div class='del'>- *  &gt;= 0 - interrupt number</div><div class='del'>- *    -1 - no interrupt/many interrupts</div><div class='del'>- */</div><div class='del'>-int probe_irq_off(unsigned long irqs)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int irq_found = NO_IRQ;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * look at the interrupts, and find exactly one</div><div class='del'>-	 * that we were probing has been triggered</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irq(&amp;irq_controller_lock);</div><div class='del'>-	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-		if (irq_desc[i].probing &amp;&amp;</div><div class='del'>-		    irq_desc[i].triggered) {</div><div class='del'>-			if (irq_found != NO_IRQ) {</div><div class='del'>-				irq_found = NO_IRQ;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			irq_found = i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq_found == -1)</div><div class='del'>-		irq_found = NO_IRQ;</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irq(&amp;irq_controller_lock);</div><div class='del'>-</div><div class='del'>-	up(&amp;probe_sem);</div><div class='del'>-</div><div class='del'>-	return irq_found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(probe_irq_off);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static void route_irq(struct irqdesc *desc, unsigned int irq, unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc-&gt;cpu, cpu);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;irq_controller_lock);</div><div class='del'>-	desc-&gt;cpu = cpu;</div><div class='del'>-	desc-&gt;chip-&gt;set_cpu(desc, irq, cpu);</div><div class='del'>-	spin_unlock_irq(&amp;irq_controller_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static int</div><div class='del'>-irq_affinity_read_proc(char *page, char **start, off_t off, int count,</div><div class='del'>-		       int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	struct irqdesc *desc = irq_desc + ((int)data);</div><div class='del'>-	int len = cpumask_scnprintf(page, count, desc-&gt;affinity);</div><div class='del'>-</div><div class='del'>-	if (count - len &lt; 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	page[len++] = '\n';</div><div class='del'>-	page[len] = '\0';</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-irq_affinity_write_proc(struct file *file, const char __user *buffer,</div><div class='del'>-			unsigned long count, void *data)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq = (unsigned int)data;</div><div class='del'>-	struct irqdesc *desc = irq_desc + irq;</div><div class='del'>-	cpumask_t affinity, tmp;</div><div class='del'>-	int ret = -EIO;</div><div class='del'>-</div><div class='del'>-	if (!desc-&gt;chip-&gt;set_cpu)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = cpumask_parse(buffer, count, affinity);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	cpus_and(tmp, affinity, cpu_online_map);</div><div class='del'>-	if (cpus_empty(tmp)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc-&gt;affinity = affinity;</div><div class='del'>-	route_irq(desc, irq, first_cpu(tmp));</div><div class='del'>-	ret = count;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __init init_irq_proc(void)</div><div class='del'>-{</div><div class='del'>-#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='del'>-	struct proc_dir_entry *dir;</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	dir = proc_mkdir("irq", NULL);</div><div class='del'>-	if (!dir)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (irq = 0; irq &lt; NR_IRQS; irq++) {</div><div class='del'>-		struct proc_dir_entry *entry;</div><div class='del'>-		struct irqdesc *desc;</div><div class='del'>-		char name[16];</div><div class='del'>-</div><div class='del'>-		desc = irq_desc + irq;</div><div class='del'>-		memset(name, 0, sizeof(name));</div><div class='del'>-		snprintf(name, sizeof(name) - 1, "%u", irq);</div><div class='del'>-</div><div class='del'>-		desc-&gt;procdir = proc_mkdir(name, dir);</div><div class='del'>-		if (!desc-&gt;procdir)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		entry = create_proc_entry("smp_affinity", 0600, desc-&gt;procdir);</div><div class='del'>-		if (entry) {</div><div class='del'>-			entry-&gt;nlink = 1;</div><div class='del'>-			entry-&gt;data = (void *)irq;</div><div class='del'>-			entry-&gt;read_proc = irq_affinity_read_proc;</div><div class='del'>-			entry-&gt;write_proc = irq_affinity_write_proc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='add'>+	desc-&gt;status |= IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;</div><div class='add'>+	if (iflags &amp; IRQF_VALID)</div><div class='add'>+		desc-&gt;status &amp;= ~IRQ_NOREQUEST;</div><div class='add'>+	if (iflags &amp; IRQF_PROBE)</div><div class='add'>+		desc-&gt;status &amp;= ~IRQ_NOPROBE;</div><div class='add'>+	if (!(iflags &amp; IRQF_NOAUTOEN))</div><div class='add'>+		desc-&gt;status &amp;= ~IRQ_NOAUTOEN;</div><div class='add'>+	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	struct irqdesc *desc;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='add'>+	for (irq = 0; irq &lt; NR_IRQS; irq++)</div><div class='add'>+		irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_DELAYED_DISABLE |</div><div class='add'>+			IRQ_NOPROBE;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	bad_irq_desc.affinity = CPU_MASK_ALL;</div><div class='ctx'> 	bad_irq_desc.cpu = smp_processor_id();</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	for (irq = 0, desc = irq_desc; irq &lt; NR_IRQS; irq++, desc++) {</div><div class='del'>-		*desc = bad_irq_desc;</div><div class='del'>-		INIT_LIST_HEAD(&amp;desc-&gt;pend);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	init_arch_irq();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init noirqdebug_setup(char *str)</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+</div><div class='add'>+static void route_irq(struct irqdesc *desc, unsigned int irq, unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	noirqdebug = 1;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='add'>+	pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc-&gt;cpu, cpu);</div><div class='ctx'> </div><div class='del'>-__setup("noirqdebug", noirqdebug_setup);</div><div class='add'>+	spin_lock_irq(&amp;desc-&gt;lock);</div><div class='add'>+	desc-&gt;chip-&gt;set_affinity(irq, cpumask_of_cpu(cpu));</div><div class='add'>+	spin_unlock_irq(&amp;desc-&gt;lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> /*</div><div class='ctx'>  * The CPU has been marked offline.  Migrate IRQs off this CPU.  If</div><div class='ctx'>  * the affinity settings do not allow other CPUs, force them onto any</div><div class='head'>diff --git a/arch/arm/kernel/iwmmxt-notifier.c b/arch/arm/kernel/iwmmxt-notifier.c<br/>new file mode 100644<br/>index 000000000000..44a86c33796e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/iwmmxt-notifier.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/iwmmxt-notifier.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/kernel/iwmmxt-notifier.c</div><div class='add'>+ *</div><div class='add'>+ *  XScale iWMMXt (Concan) context switching and handling</div><div class='add'>+ *</div><div class='add'>+ *  Initial code:</div><div class='add'>+ *  Copyright (c) 2003, Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ *  Full lazy switching support, optimizations and more, by Nicolas Pitre</div><div class='add'>+ *  Copyright (c) 2003-2004, MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/thread_notify.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *thread = t;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case THREAD_NOTIFY_FLUSH:</div><div class='add'>+		/*</div><div class='add'>+		 * flush_thread() zeroes thread-&gt;fpstate, so no need</div><div class='add'>+		 * to do anything here.</div><div class='add'>+		 *</div><div class='add'>+		 * FALLTHROUGH: Ensure we don't try to overwrite our newly</div><div class='add'>+		 * initialised state information on the first fault.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+	case THREAD_NOTIFY_RELEASE:</div><div class='add'>+		iwmmxt_task_release(thread);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case THREAD_NOTIFY_SWITCH:</div><div class='add'>+		iwmmxt_task_switch(thread);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block iwmmxt_notifier_block = {</div><div class='add'>+	.notifier_call	= iwmmxt_do,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init iwmmxt_init(void)</div><div class='add'>+{</div><div class='add'>+	thread_register_notifier(&amp;iwmmxt_notifier_block);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(iwmmxt_init);</div><div class='head'>diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S<br/>index 24c7b0477a09..b63b528f22a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/iwmmxt.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/iwmmxt.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/iwmmxt.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/iwmmxt.S</a></div><div class='hunk'>@@ -271,30 +271,27 @@ ENTRY(iwmmxt_task_restore)</div><div class='ctx'> /*</div><div class='ctx'>  * Concan handling on task switch</div><div class='ctx'>  *</div><div class='del'>- * r0 = previous task_struct pointer (must be preserved)</div><div class='del'>- * r1 = previous thread_info pointer</div><div class='del'>- * r2 = next thread_info.cpu_domain pointer (must be preserved)</div><div class='add'>+ * r0 = next thread_info pointer</div><div class='ctx'>  *</div><div class='del'>- * Called only from __switch_to with task preemption disabled.</div><div class='del'>- * No need to care about preserving r4 and above.</div><div class='add'>+ * Called only from the iwmmxt notifier with task preemption disabled.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(iwmmxt_task_switch)</div><div class='ctx'> </div><div class='del'>-	mrc	p15, 0, r4, c15, c1, 0</div><div class='del'>-	tst	r4, #0x3			@ CP0 and CP1 accessible?</div><div class='add'>+	mrc	p15, 0, r1, c15, c1, 0</div><div class='add'>+	tst	r1, #0x3			@ CP0 and CP1 accessible?</div><div class='ctx'> 	bne	1f				@ yes: block them for next task</div><div class='ctx'> </div><div class='del'>-	ldr	r5, =concan_owner</div><div class='del'>-	add	r6, r2, #(TI_IWMMXT_STATE - TI_CPU_DOMAIN) @ get next task Concan save area</div><div class='del'>-	ldr	r5, [r5]			@ get current Concan owner</div><div class='del'>-	teq	r5, r6				@ next task owns it?</div><div class='add'>+	ldr	r2, =concan_owner</div><div class='add'>+	add	r3, r0, #TI_IWMMXT_STATE	@ get next task Concan save area</div><div class='add'>+	ldr	r2, [r2]			@ get current Concan owner</div><div class='add'>+	teq	r2, r3				@ next task owns it?</div><div class='ctx'> 	movne	pc, lr				@ no: leave Concan disabled</div><div class='ctx'> </div><div class='del'>-1:	eor	r4, r4, #3			@ flip Concan access</div><div class='del'>-	mcr	p15, 0, r4, c15, c1, 0</div><div class='add'>+1:	eor	r1, r1, #3			@ flip Concan access</div><div class='add'>+	mcr	p15, 0, r1, c15, c1, 0</div><div class='ctx'> </div><div class='del'>-	mrc	p15, 0, r4, c2, c0, 0</div><div class='del'>-	sub	pc, lr, r4, lsr #32		@ cpwait and return</div><div class='add'>+	mrc	p15, 0, r1, c2, c0, 0</div><div class='add'>+	sub	pc, lr, r1, lsr #32		@ cpwait and return</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Remove Concan ownership of given task</div><div class='head'>diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c<br/>index 055bf5d28894..298363d97047 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/module.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Module allocation method suggested by Andi Kleen.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleloader.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c<br/>index 7df6e1aaa323..3079535afccd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/process.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -28,10 +27,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/leds.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/thread_notify.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -71,8 +72,36 @@ static int __init hlt_setup(char *__unused)</div><div class='ctx'> __setup("nohlt", nohlt_setup);</div><div class='ctx'> __setup("hlt", hlt_setup);</div><div class='ctx'> </div><div class='add'>+void arm_machine_restart(char mode)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Clean and disable cache, and turn off interrupts</div><div class='add'>+	 */</div><div class='add'>+	cpu_proc_fin();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tell the mm system that we are going to reboot -</div><div class='add'>+	 * we may need it to insert some 1:1 mappings so that</div><div class='add'>+	 * soft boot works.</div><div class='add'>+	 */</div><div class='add'>+	setup_mm_for_reboot(mode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now call the architecture specific reboot code.</div><div class='add'>+	 */</div><div class='add'>+	arch_reset(mode);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Whoops - the architecture was unable to reboot.</div><div class='add'>+	 * Tell the user!</div><div class='add'>+	 */</div><div class='add'>+	mdelay(1000);</div><div class='add'>+	printk("Reboot failed -- System halted\n");</div><div class='add'>+	while (1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * The following aren't currently used.</div><div class='add'>+ * Function pointers to optional machine specific functions</div><div class='ctx'>  */</div><div class='ctx'> void (*pm_idle)(void);</div><div class='ctx'> EXPORT_SYMBOL(pm_idle);</div><div class='hunk'>@@ -80,6 +109,10 @@ EXPORT_SYMBOL(pm_idle);</div><div class='ctx'> void (*pm_power_off)(void);</div><div class='ctx'> EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='add'>+void (*arm_pm_restart)(char str) = arm_machine_restart;</div><div class='add'>+EXPORT_SYMBOL_GPL(arm_pm_restart);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is our default idle handler.  We need to disable</div><div class='ctx'>  * interrupts here to ensure we don't miss a wakeup call.</div><div class='hunk'>@@ -151,33 +184,9 @@ void machine_power_off(void)</div><div class='ctx'> 		pm_power_off();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void machine_restart(char * __unused)</div><div class='ctx'> {</div><div class='del'>-	/*</div><div class='del'>-	 * Clean and disable cache, and turn off interrupts</div><div class='del'>-	 */</div><div class='del'>-	cpu_proc_fin();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Tell the mm system that we are going to reboot -</div><div class='del'>-	 * we may need it to insert some 1:1 mappings so that</div><div class='del'>-	 * soft boot works.</div><div class='del'>-	 */</div><div class='del'>-	setup_mm_for_reboot(reboot_mode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now call the architecture specific reboot code.</div><div class='del'>-	 */</div><div class='del'>-	arch_reset(reboot_mode);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Whoops - the architecture was unable to reboot.</div><div class='del'>-	 * Tell the user!</div><div class='del'>-	 */</div><div class='del'>-	mdelay(1000);</div><div class='del'>-	printk("Reboot failed -- System halted\n");</div><div class='del'>-	while (1);</div><div class='add'>+	arm_pm_restart(reboot_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __show_regs(struct pt_regs *regs)</div><div class='hunk'>@@ -329,13 +338,9 @@ void exit_thread(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void default_fp_init(union fp_state *fp)</div><div class='del'>-{</div><div class='del'>-	memset(fp, 0, sizeof(union fp_state));</div><div class='del'>-}</div><div class='add'>+ATOMIC_NOTIFIER_HEAD(thread_notify_head);</div><div class='ctx'> </div><div class='del'>-void (*fp_init)(union fp_state *) = default_fp_init;</div><div class='del'>-EXPORT_SYMBOL(fp_init);</div><div class='add'>+EXPORT_SYMBOL_GPL(thread_notify_head);</div><div class='ctx'> </div><div class='ctx'> void flush_thread(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -344,23 +349,16 @@ void flush_thread(void)</div><div class='ctx'> </div><div class='ctx'> 	memset(thread-&gt;used_cp, 0, sizeof(thread-&gt;used_cp));</div><div class='ctx'> 	memset(&amp;tsk-&gt;thread.debug, 0, sizeof(struct debug_info));</div><div class='del'>-#if defined(CONFIG_IWMMXT)</div><div class='del'>-	iwmmxt_task_release(thread);</div><div class='del'>-#endif</div><div class='del'>-	fp_init(&amp;thread-&gt;fpstate);</div><div class='del'>-#if defined(CONFIG_VFP)</div><div class='del'>-	vfp_flush_thread(&amp;thread-&gt;vfpstate);</div><div class='del'>-#endif</div><div class='add'>+	memset(&amp;thread-&gt;fpstate, 0, sizeof(union fp_state));</div><div class='add'>+</div><div class='add'>+	thread_notify(THREAD_NOTIFY_FLUSH, thread);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void release_thread(struct task_struct *dead_task)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_VFP)</div><div class='del'>-	vfp_release_thread(&amp;task_thread_info(dead_task)-&gt;vfpstate);</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_IWMMXT)</div><div class='del'>-	iwmmxt_task_release(task_thread_info(dead_task));</div><div class='del'>-#endif</div><div class='add'>+	struct thread_info *thread = task_thread_info(dead_task);</div><div class='add'>+</div><div class='add'>+	thread_notify(THREAD_NOTIFY_RELEASE, thread);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");</div><div class='head'>diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c<br/>index a1d1b2906e8d..9254ba2f46fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/ptrace.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -634,6 +633,32 @@ static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+/*</div><div class='add'>+ * Get the child Crunch state.</div><div class='add'>+ */</div><div class='add'>+static int ptrace_getcrunchregs(struct task_struct *tsk, void __user *ufp)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *thread = task_thread_info(tsk);</div><div class='add'>+</div><div class='add'>+	crunch_task_disable(thread);  /* force it to ram */</div><div class='add'>+	return copy_to_user(ufp, &amp;thread-&gt;crunchstate, CRUNCH_SIZE)</div><div class='add'>+		? -EFAULT : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the child Crunch state.</div><div class='add'>+ */</div><div class='add'>+static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *thread = task_thread_info(tsk);</div><div class='add'>+</div><div class='add'>+	crunch_task_release(thread);  /* force a reload */</div><div class='add'>+	return copy_from_user(&amp;thread-&gt;crunchstate, ufp, CRUNCH_SIZE)</div><div class='add'>+		? -EFAULT : 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tmp;</div><div class='hunk'>@@ -765,6 +790,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 			child-&gt;ptrace_message = data;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+		case PTRACE_GETCRUNCHREGS:</div><div class='add'>+			ret = ptrace_getcrunchregs(child, (void __user *)data);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case PTRACE_SETCRUNCHREGS:</div><div class='add'>+			ret = ptrace_setcrunchregs(child, (void __user *)data);</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			ret = ptrace_request(child, request, addr, data);</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c<br/>index 9fc9af88c60c..0a722e77c143 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/setup.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='hunk'>@@ -18,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -119,9 +118,24 @@ DEFINE_PER_CPU(struct cpuinfo_arm, cpu_data);</div><div class='ctx'>  * Standard memory resources</div><div class='ctx'>  */</div><div class='ctx'> static struct resource mem_res[] = {</div><div class='del'>-	{ "Video RAM",   0,     0,     IORESOURCE_MEM			},</div><div class='del'>-	{ "Kernel text", 0,     0,     IORESOURCE_MEM			},</div><div class='del'>-	{ "Kernel data", 0,     0,     IORESOURCE_MEM			}</div><div class='add'>+	{</div><div class='add'>+		.name = "Video RAM",</div><div class='add'>+		.start = 0,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.flags = IORESOURCE_MEM</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "Kernel text",</div><div class='add'>+		.start = 0,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.flags = IORESOURCE_MEM</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "Kernel data",</div><div class='add'>+		.start = 0,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.flags = IORESOURCE_MEM</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define video_ram   mem_res[0]</div><div class='hunk'>@@ -129,9 +143,24 @@ static struct resource mem_res[] = {</div><div class='ctx'> #define kernel_data mem_res[2]</div><div class='ctx'> </div><div class='ctx'> static struct resource io_res[] = {</div><div class='del'>-	{ "reserved",    0x3bc, 0x3be, IORESOURCE_IO | IORESOURCE_BUSY },</div><div class='del'>-	{ "reserved",    0x378, 0x37f, IORESOURCE_IO | IORESOURCE_BUSY },</div><div class='del'>-	{ "reserved",    0x278, 0x27f, IORESOURCE_IO | IORESOURCE_BUSY }</div><div class='add'>+	{</div><div class='add'>+		.name = "reserved",</div><div class='add'>+		.start = 0x3bc,</div><div class='add'>+		.end = 0x3be,</div><div class='add'>+		.flags = IORESOURCE_IO | IORESOURCE_BUSY</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "reserved",</div><div class='add'>+		.start = 0x378,</div><div class='add'>+		.end = 0x37f,</div><div class='add'>+		.flags = IORESOURCE_IO | IORESOURCE_BUSY</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "reserved",</div><div class='add'>+		.start = 0x278,</div><div class='add'>+		.end = 0x27f,</div><div class='add'>+		.flags = IORESOURCE_IO | IORESOURCE_BUSY</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define lp0 io_res[0]</div><div class='hunk'>@@ -315,9 +344,9 @@ static void __init setup_processor(void)</div><div class='ctx'> 	cpu_cache = *list-&gt;cache;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	printk("CPU: %s [%08x] revision %d (ARMv%s)\n",</div><div class='add'>+	printk("CPU: %s [%08x] revision %d (ARMv%s), cr=%08lx\n",</div><div class='ctx'> 	       cpu_name, processor_id, (int)processor_id &amp; 15,</div><div class='del'>-	       proc_arch[cpu_architecture()]);</div><div class='add'>+	       proc_arch[cpu_architecture()], cr_alignment);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(system_utsname.machine, "%s%c", list-&gt;arch_name, ENDIANNESS);</div><div class='ctx'> 	sprintf(elf_platform, "%s%c", list-&gt;elf_name, ENDIANNESS);</div><div class='hunk'>@@ -808,7 +837,7 @@ static int __init topology_init(void)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu)</div><div class='del'>-		register_cpu(&amp;per_cpu(cpu_data, cpu).cpu, cpu, NULL);</div><div class='add'>+		register_cpu(&amp;per_cpu(cpu_data, cpu).cpu, cpu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c<br/>index a0cd0a90a10d..48cf7fffddf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/signal.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -132,18 +131,38 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IWMMXT</div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+static int preserve_crunch_context(struct crunch_sigframe *frame)</div><div class='add'>+{</div><div class='add'>+	char kbuf[sizeof(*frame) + 8];</div><div class='add'>+	struct crunch_sigframe *kframe;</div><div class='ctx'> </div><div class='del'>-/* iwmmxt_area is 0x98 bytes long, preceeded by 8 bytes of signature */</div><div class='del'>-#define IWMMXT_STORAGE_SIZE	(0x98 + 8)</div><div class='del'>-#define IWMMXT_MAGIC0		0x12ef842a</div><div class='del'>-#define IWMMXT_MAGIC1		0x1c07ca71</div><div class='add'>+	/* the crunch context must be 64 bit aligned */</div><div class='add'>+	kframe = (struct crunch_sigframe *)((unsigned long)(kbuf + 8) &amp; ~7);</div><div class='add'>+	kframe-&gt;magic = CRUNCH_MAGIC;</div><div class='add'>+	kframe-&gt;size = CRUNCH_STORAGE_SIZE;</div><div class='add'>+	crunch_task_copy(current_thread_info(), &amp;kframe-&gt;storage);</div><div class='add'>+	return __copy_to_user(frame, kframe, sizeof(*frame));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct iwmmxt_sigframe {</div><div class='del'>-	unsigned long	magic0;</div><div class='del'>-	unsigned long	magic1;</div><div class='del'>-	unsigned long	storage[0x98/4];</div><div class='del'>-};</div><div class='add'>+static int restore_crunch_context(struct crunch_sigframe *frame)</div><div class='add'>+{</div><div class='add'>+	char kbuf[sizeof(*frame) + 8];</div><div class='add'>+	struct crunch_sigframe *kframe;</div><div class='add'>+</div><div class='add'>+	/* the crunch context must be 64 bit aligned */</div><div class='add'>+	kframe = (struct crunch_sigframe *)((unsigned long)(kbuf + 8) &amp; ~7);</div><div class='add'>+	if (__copy_from_user(kframe, frame, sizeof(*frame)))</div><div class='add'>+		return -1;</div><div class='add'>+	if (kframe-&gt;magic != CRUNCH_MAGIC ||</div><div class='add'>+	    kframe-&gt;size != CRUNCH_STORAGE_SIZE)</div><div class='add'>+		return -1;</div><div class='add'>+	crunch_task_restore(current_thread_info(), &amp;kframe-&gt;storage);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IWMMXT</div><div class='ctx'> </div><div class='ctx'> static int preserve_iwmmxt_context(struct iwmmxt_sigframe *frame)</div><div class='ctx'> {</div><div class='hunk'>@@ -152,8 +171,8 @@ static int preserve_iwmmxt_context(struct iwmmxt_sigframe *frame)</div><div class='ctx'> </div><div class='ctx'> 	/* the iWMMXt context must be 64 bit aligned */</div><div class='ctx'> 	kframe = (struct iwmmxt_sigframe *)((unsigned long)(kbuf + 8) &amp; ~7);</div><div class='del'>-	kframe-&gt;magic0 = IWMMXT_MAGIC0;</div><div class='del'>-	kframe-&gt;magic1 = IWMMXT_MAGIC1;</div><div class='add'>+	kframe-&gt;magic = IWMMXT_MAGIC;</div><div class='add'>+	kframe-&gt;size = IWMMXT_STORAGE_SIZE;</div><div class='ctx'> 	iwmmxt_task_copy(current_thread_info(), &amp;kframe-&gt;storage);</div><div class='ctx'> 	return __copy_to_user(frame, kframe, sizeof(*frame));</div><div class='ctx'> }</div><div class='hunk'>@@ -167,8 +186,8 @@ static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame)</div><div class='ctx'> 	kframe = (struct iwmmxt_sigframe *)((unsigned long)(kbuf + 8) &amp; ~7);</div><div class='ctx'> 	if (__copy_from_user(kframe, frame, sizeof(*frame)))</div><div class='ctx'> 		return -1;</div><div class='del'>-	if (kframe-&gt;magic0 != IWMMXT_MAGIC0 ||</div><div class='del'>-	    kframe-&gt;magic1 != IWMMXT_MAGIC1)</div><div class='add'>+	if (kframe-&gt;magic != IWMMXT_MAGIC ||</div><div class='add'>+	    kframe-&gt;size != IWMMXT_STORAGE_SIZE)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	iwmmxt_task_restore(current_thread_info(), &amp;kframe-&gt;storage);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -177,70 +196,65 @@ static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Auxiliary signal frame.  This saves stuff like FP state.</div><div class='del'>- * The layout of this structure is not part of the user ABI.</div><div class='del'>- */</div><div class='del'>-struct aux_sigframe {</div><div class='del'>-#ifdef CONFIG_IWMMXT</div><div class='del'>-	struct iwmmxt_sigframe	iwmmxt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_VFP</div><div class='del'>-	union vfp_state		vfp;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Do a signal return; undo the signal stack.  These are aligned to 64-bit.</div><div class='ctx'>  */</div><div class='ctx'> struct sigframe {</div><div class='del'>-	struct sigcontext sc;</div><div class='del'>-	unsigned long extramask[_NSIG_WORDS-1];</div><div class='add'>+	struct ucontext uc;</div><div class='ctx'> 	unsigned long retcode[2];</div><div class='del'>-	struct aux_sigframe aux __attribute__((aligned(8)));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe {</div><div class='del'>-	struct siginfo __user *pinfo;</div><div class='del'>-	void __user *puc;</div><div class='ctx'> 	struct siginfo info;</div><div class='del'>-	struct ucontext uc;</div><div class='del'>-	unsigned long retcode[2];</div><div class='del'>-	struct aux_sigframe aux __attribute__((aligned(8)));</div><div class='add'>+	struct sigframe sig;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,</div><div class='del'>-		   struct aux_sigframe __user *aux)</div><div class='add'>+static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct aux_sigframe __user *aux;</div><div class='add'>+	sigset_t set;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	__get_user_error(regs-&gt;ARM_r0, &amp;sc-&gt;arm_r0, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r1, &amp;sc-&gt;arm_r1, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r2, &amp;sc-&gt;arm_r2, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r3, &amp;sc-&gt;arm_r3, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r4, &amp;sc-&gt;arm_r4, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r5, &amp;sc-&gt;arm_r5, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r6, &amp;sc-&gt;arm_r6, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r7, &amp;sc-&gt;arm_r7, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r8, &amp;sc-&gt;arm_r8, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r9, &amp;sc-&gt;arm_r9, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_r10, &amp;sc-&gt;arm_r10, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_fp, &amp;sc-&gt;arm_fp, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_ip, &amp;sc-&gt;arm_ip, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_sp, &amp;sc-&gt;arm_sp, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_lr, &amp;sc-&gt;arm_lr, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_pc, &amp;sc-&gt;arm_pc, err);</div><div class='del'>-	__get_user_error(regs-&gt;ARM_cpsr, &amp;sc-&gt;arm_cpsr, err);</div><div class='add'>+	err = __copy_from_user(&amp;set, &amp;sf-&gt;uc.uc_sigmask, sizeof(set));</div><div class='add'>+	if (err == 0) {</div><div class='add'>+		sigdelsetmask(&amp;set, ~_BLOCKABLE);</div><div class='add'>+		spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+		current-&gt;blocked = set;</div><div class='add'>+		recalc_sigpending();</div><div class='add'>+		spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r0, &amp;sf-&gt;uc.uc_mcontext.arm_r0, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r1, &amp;sf-&gt;uc.uc_mcontext.arm_r1, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r2, &amp;sf-&gt;uc.uc_mcontext.arm_r2, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r3, &amp;sf-&gt;uc.uc_mcontext.arm_r3, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r4, &amp;sf-&gt;uc.uc_mcontext.arm_r4, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r5, &amp;sf-&gt;uc.uc_mcontext.arm_r5, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r6, &amp;sf-&gt;uc.uc_mcontext.arm_r6, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r7, &amp;sf-&gt;uc.uc_mcontext.arm_r7, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r8, &amp;sf-&gt;uc.uc_mcontext.arm_r8, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r9, &amp;sf-&gt;uc.uc_mcontext.arm_r9, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_r10, &amp;sf-&gt;uc.uc_mcontext.arm_r10, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_fp, &amp;sf-&gt;uc.uc_mcontext.arm_fp, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_ip, &amp;sf-&gt;uc.uc_mcontext.arm_ip, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_sp, &amp;sf-&gt;uc.uc_mcontext.arm_sp, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_lr, &amp;sf-&gt;uc.uc_mcontext.arm_lr, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_pc, &amp;sf-&gt;uc.uc_mcontext.arm_pc, err);</div><div class='add'>+	__get_user_error(regs-&gt;ARM_cpsr, &amp;sf-&gt;uc.uc_mcontext.arm_cpsr, err);</div><div class='ctx'> </div><div class='ctx'> 	err |= !valid_user_regs(regs);</div><div class='ctx'> </div><div class='add'>+	aux = (struct aux_sigframe __user *) sf-&gt;uc.uc_regspace;</div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+	if (err == 0)</div><div class='add'>+		err |= restore_crunch_context(&amp;aux-&gt;crunch);</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_IWMMXT</div><div class='ctx'> 	if (err == 0 &amp;&amp; test_thread_flag(TIF_USING_IWMMXT))</div><div class='ctx'> 		err |= restore_iwmmxt_context(&amp;aux-&gt;iwmmxt);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_VFP</div><div class='ctx'> //	if (err == 0)</div><div class='del'>-//		err |= vfp_restore_state(&amp;aux-&gt;vfp);</div><div class='add'>+//		err |= vfp_restore_state(&amp;sf-&gt;aux.vfp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -249,7 +263,6 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,</div><div class='ctx'> asmlinkage int sys_sigreturn(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sigframe __user *frame;</div><div class='del'>-	sigset_t set;</div><div class='ctx'> </div><div class='ctx'> 	/* Always make any pending restarted system calls return -EINTR */</div><div class='ctx'> 	current_thread_info()-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='hunk'>@@ -266,19 +279,8 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_READ, frame, sizeof (*frame)))</div><div class='ctx'> 		goto badframe;</div><div class='del'>-	if (__get_user(set.sig[0], &amp;frame-&gt;sc.oldmask)</div><div class='del'>-	    || (_NSIG_WORDS &gt; 1</div><div class='del'>-	        &amp;&amp; __copy_from_user(&amp;set.sig[1], &amp;frame-&gt;extramask,</div><div class='del'>-				    sizeof(frame-&gt;extramask))))</div><div class='del'>-		goto badframe;</div><div class='ctx'> </div><div class='del'>-	sigdelsetmask(&amp;set, ~_BLOCKABLE);</div><div class='del'>-	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	current-&gt;blocked = set;</div><div class='del'>-	recalc_sigpending();</div><div class='del'>-	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-</div><div class='del'>-	if (restore_sigcontext(regs, &amp;frame-&gt;sc, &amp;frame-&gt;aux))</div><div class='add'>+	if (restore_sigframe(regs, frame))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='ctx'> 	/* Send SIGTRAP if we're single-stepping */</div><div class='hunk'>@@ -297,7 +299,6 @@ badframe:</div><div class='ctx'> asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct rt_sigframe __user *frame;</div><div class='del'>-	sigset_t set;</div><div class='ctx'> </div><div class='ctx'> 	/* Always make any pending restarted system calls return -EINTR */</div><div class='ctx'> 	current_thread_info()-&gt;restart_block.fn = do_no_restart_syscall;</div><div class='hunk'>@@ -314,19 +315,11 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_READ, frame, sizeof (*frame)))</div><div class='ctx'> 		goto badframe;</div><div class='del'>-	if (__copy_from_user(&amp;set, &amp;frame-&gt;uc.uc_sigmask, sizeof(set)))</div><div class='del'>-		goto badframe;</div><div class='del'>-</div><div class='del'>-	sigdelsetmask(&amp;set, ~_BLOCKABLE);</div><div class='del'>-	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	current-&gt;blocked = set;</div><div class='del'>-	recalc_sigpending();</div><div class='del'>-	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='ctx'> </div><div class='del'>-	if (restore_sigcontext(regs, &amp;frame-&gt;uc.uc_mcontext, &amp;frame-&gt;aux))</div><div class='add'>+	if (restore_sigframe(regs, &amp;frame-&gt;sig))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='del'>-	if (do_sigaltstack(&amp;frame-&gt;uc.uc_stack, NULL, regs-&gt;ARM_sp) == -EFAULT)</div><div class='add'>+	if (do_sigaltstack(&amp;frame-&gt;sig.uc.uc_stack, NULL, regs-&gt;ARM_sp) == -EFAULT)</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='ctx'> 	/* Send SIGTRAP if we're single-stepping */</div><div class='hunk'>@@ -343,42 +336,50 @@ badframe:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-setup_sigcontext(struct sigcontext __user *sc, struct aux_sigframe __user *aux,</div><div class='del'>-		 struct pt_regs *regs, unsigned long mask)</div><div class='add'>+setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set)</div><div class='ctx'> {</div><div class='add'>+	struct aux_sigframe __user *aux;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	__put_user_error(regs-&gt;ARM_r0, &amp;sc-&gt;arm_r0, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r1, &amp;sc-&gt;arm_r1, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r2, &amp;sc-&gt;arm_r2, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r3, &amp;sc-&gt;arm_r3, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r4, &amp;sc-&gt;arm_r4, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r5, &amp;sc-&gt;arm_r5, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r6, &amp;sc-&gt;arm_r6, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r7, &amp;sc-&gt;arm_r7, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r8, &amp;sc-&gt;arm_r8, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r9, &amp;sc-&gt;arm_r9, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_r10, &amp;sc-&gt;arm_r10, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_fp, &amp;sc-&gt;arm_fp, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_ip, &amp;sc-&gt;arm_ip, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_sp, &amp;sc-&gt;arm_sp, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_lr, &amp;sc-&gt;arm_lr, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_pc, &amp;sc-&gt;arm_pc, err);</div><div class='del'>-	__put_user_error(regs-&gt;ARM_cpsr, &amp;sc-&gt;arm_cpsr, err);</div><div class='del'>-</div><div class='del'>-	__put_user_error(current-&gt;thread.trap_no, &amp;sc-&gt;trap_no, err);</div><div class='del'>-	__put_user_error(current-&gt;thread.error_code, &amp;sc-&gt;error_code, err);</div><div class='del'>-	__put_user_error(current-&gt;thread.address, &amp;sc-&gt;fault_address, err);</div><div class='del'>-	__put_user_error(mask, &amp;sc-&gt;oldmask, err);</div><div class='del'>-</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r0, &amp;sf-&gt;uc.uc_mcontext.arm_r0, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r1, &amp;sf-&gt;uc.uc_mcontext.arm_r1, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r2, &amp;sf-&gt;uc.uc_mcontext.arm_r2, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r3, &amp;sf-&gt;uc.uc_mcontext.arm_r3, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r4, &amp;sf-&gt;uc.uc_mcontext.arm_r4, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r5, &amp;sf-&gt;uc.uc_mcontext.arm_r5, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r6, &amp;sf-&gt;uc.uc_mcontext.arm_r6, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r7, &amp;sf-&gt;uc.uc_mcontext.arm_r7, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r8, &amp;sf-&gt;uc.uc_mcontext.arm_r8, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r9, &amp;sf-&gt;uc.uc_mcontext.arm_r9, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_r10, &amp;sf-&gt;uc.uc_mcontext.arm_r10, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_fp, &amp;sf-&gt;uc.uc_mcontext.arm_fp, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_ip, &amp;sf-&gt;uc.uc_mcontext.arm_ip, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_sp, &amp;sf-&gt;uc.uc_mcontext.arm_sp, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_lr, &amp;sf-&gt;uc.uc_mcontext.arm_lr, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_pc, &amp;sf-&gt;uc.uc_mcontext.arm_pc, err);</div><div class='add'>+	__put_user_error(regs-&gt;ARM_cpsr, &amp;sf-&gt;uc.uc_mcontext.arm_cpsr, err);</div><div class='add'>+</div><div class='add'>+	__put_user_error(current-&gt;thread.trap_no, &amp;sf-&gt;uc.uc_mcontext.trap_no, err);</div><div class='add'>+	__put_user_error(current-&gt;thread.error_code, &amp;sf-&gt;uc.uc_mcontext.error_code, err);</div><div class='add'>+	__put_user_error(current-&gt;thread.address, &amp;sf-&gt;uc.uc_mcontext.fault_address, err);</div><div class='add'>+	__put_user_error(set-&gt;sig[0], &amp;sf-&gt;uc.uc_mcontext.oldmask, err);</div><div class='add'>+</div><div class='add'>+	err |= __copy_to_user(&amp;sf-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='add'>+</div><div class='add'>+	aux = (struct aux_sigframe __user *) sf-&gt;uc.uc_regspace;</div><div class='add'>+#ifdef CONFIG_CRUNCH</div><div class='add'>+	if (err == 0)</div><div class='add'>+		err |= preserve_crunch_context(&amp;aux-&gt;crunch);</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_IWMMXT</div><div class='ctx'> 	if (err == 0 &amp;&amp; test_thread_flag(TIF_USING_IWMMXT))</div><div class='ctx'> 		err |= preserve_iwmmxt_context(&amp;aux-&gt;iwmmxt);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_VFP</div><div class='ctx'> //	if (err == 0)</div><div class='del'>-//		err |= vfp_save_state(&amp;aux-&gt;vfp);</div><div class='add'>+//		err |= vfp_save_state(&amp;sf-&gt;aux.vfp);</div><div class='ctx'> #endif</div><div class='add'>+	__put_user_error(0, &amp;aux-&gt;end_magic, err);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -487,13 +488,12 @@ setup_frame(int usig, struct k_sigaction *ka, sigset_t *set, struct pt_regs *reg</div><div class='ctx'> 	if (!frame)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	err |= setup_sigcontext(&amp;frame-&gt;sc, &amp;frame-&gt;aux, regs, set-&gt;sig[0]);</div><div class='del'>-</div><div class='del'>-	if (_NSIG_WORDS &gt; 1) {</div><div class='del'>-		err |= __copy_to_user(frame-&gt;extramask, &amp;set-&gt;sig[1],</div><div class='del'>-				      sizeof(frame-&gt;extramask));</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Set uc.uc_flags to a value which sc.trap_no would never have.</div><div class='add'>+	 */</div><div class='add'>+	__put_user_error(0x5ac3c35a, &amp;frame-&gt;uc.uc_flags, err);</div><div class='ctx'> </div><div class='add'>+	err |= setup_sigframe(frame, regs, set);</div><div class='ctx'> 	if (err == 0)</div><div class='ctx'> 		err = setup_return(regs, ka, frame-&gt;retcode, frame, usig);</div><div class='ctx'> </div><div class='hunk'>@@ -511,25 +511,20 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	if (!frame)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	__put_user_error(&amp;frame-&gt;info, &amp;frame-&gt;pinfo, err);</div><div class='del'>-	__put_user_error(&amp;frame-&gt;uc, &amp;frame-&gt;puc, err);</div><div class='ctx'> 	err |= copy_siginfo_to_user(&amp;frame-&gt;info, info);</div><div class='ctx'> </div><div class='del'>-	__put_user_error(0, &amp;frame-&gt;uc.uc_flags, err);</div><div class='del'>-	__put_user_error(NULL, &amp;frame-&gt;uc.uc_link, err);</div><div class='add'>+	__put_user_error(0, &amp;frame-&gt;sig.uc.uc_flags, err);</div><div class='add'>+	__put_user_error(NULL, &amp;frame-&gt;sig.uc.uc_link, err);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;stack, 0, sizeof(stack));</div><div class='ctx'> 	stack.ss_sp = (void __user *)current-&gt;sas_ss_sp;</div><div class='ctx'> 	stack.ss_flags = sas_ss_flags(regs-&gt;ARM_sp);</div><div class='ctx'> 	stack.ss_size = current-&gt;sas_ss_size;</div><div class='del'>-	err |= __copy_to_user(&amp;frame-&gt;uc.uc_stack, &amp;stack, sizeof(stack));</div><div class='del'>-</div><div class='del'>-	err |= setup_sigcontext(&amp;frame-&gt;uc.uc_mcontext, &amp;frame-&gt;aux,</div><div class='del'>-				regs, set-&gt;sig[0]);</div><div class='del'>-	err |= __copy_to_user(&amp;frame-&gt;uc.uc_sigmask, set, sizeof(*set));</div><div class='add'>+	err |= __copy_to_user(&amp;frame-&gt;sig.uc.uc_stack, &amp;stack, sizeof(stack));</div><div class='ctx'> </div><div class='add'>+	err |= setup_sigframe(&amp;frame-&gt;sig, regs, set);</div><div class='ctx'> 	if (err == 0)</div><div class='del'>-		err = setup_return(regs, ka, frame-&gt;retcode, frame, usig);</div><div class='add'>+		err = setup_return(regs, ka, frame-&gt;sig.retcode, frame, usig);</div><div class='ctx'> </div><div class='ctx'> 	if (err == 0) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -538,7 +533,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 		 *   -- Peter Maydell &lt;pmaydell@chiark.greenend.org.uk&gt; 2000-12-06</div><div class='ctx'> 		 */</div><div class='ctx'> 		regs-&gt;ARM_r1 = (unsigned long)&amp;frame-&gt;info;</div><div class='del'>-		regs-&gt;ARM_r2 = (unsigned long)&amp;frame-&gt;uc;</div><div class='add'>+		regs-&gt;ARM_r2 = (unsigned long)&amp;frame-&gt;sig.uc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -665,17 +660,33 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)</div><div class='ctx'> 	if (syscall) {</div><div class='ctx'> 		if (regs-&gt;ARM_r0 == -ERESTART_RESTARTBLOCK) {</div><div class='ctx'> 			if (thumb_mode(regs)) {</div><div class='del'>-				regs-&gt;ARM_r7 = __NR_restart_syscall;</div><div class='add'>+				regs-&gt;ARM_r7 = __NR_restart_syscall - __NR_SYSCALL_BASE;</div><div class='ctx'> 				regs-&gt;ARM_pc -= 2;</div><div class='ctx'> 			} else {</div><div class='add'>+#if defined(CONFIG_AEABI) &amp;&amp; !defined(CONFIG_OABI_COMPAT)</div><div class='add'>+				regs-&gt;ARM_r7 = __NR_restart_syscall;</div><div class='add'>+				regs-&gt;ARM_pc -= 4;</div><div class='add'>+#else</div><div class='ctx'> 				u32 __user *usp;</div><div class='add'>+				u32 swival = __NR_restart_syscall;</div><div class='ctx'> </div><div class='ctx'> 				regs-&gt;ARM_sp -= 12;</div><div class='ctx'> 				usp = (u32 __user *)regs-&gt;ARM_sp;</div><div class='ctx'> </div><div class='add'>+				/*</div><div class='add'>+				 * Either we supports OABI only, or we have</div><div class='add'>+				 * EABI with the OABI compat layer enabled.</div><div class='add'>+				 * In the later case we don't know if user</div><div class='add'>+				 * space is EABI or not, and if not we must</div><div class='add'>+				 * not clobber r7.  Always using the OABI</div><div class='add'>+				 * syscall solves that issue and works for</div><div class='add'>+				 * all those cases.</div><div class='add'>+				 */</div><div class='add'>+				swival = swival - __NR_SYSCALL_BASE + __NR_OABI_SYSCALL_BASE;</div><div class='add'>+</div><div class='ctx'> 				put_user(regs-&gt;ARM_pc, &amp;usp[0]);</div><div class='ctx'> 				/* swi __NR_restart_syscall */</div><div class='del'>-				put_user(0xef000000 | __NR_restart_syscall, &amp;usp[1]);</div><div class='add'>+				put_user(0xef000000 | swival, &amp;usp[1]);</div><div class='ctx'> 				/* ldr	pc, [sp], #12 */</div><div class='ctx'> 				put_user(0xe49df00c, &amp;usp[2]);</div><div class='ctx'> </div><div class='hunk'>@@ -683,6 +694,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)</div><div class='ctx'> 						   (unsigned long)(usp + 3));</div><div class='ctx'> </div><div class='ctx'> 				regs-&gt;ARM_pc = regs-&gt;ARM_sp + 4;</div><div class='add'>+#endif</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (regs-&gt;ARM_r0 == -ERESTARTNOHAND ||</div><div class='head'>diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c<br/>index 1370d726dc10..68e9634d260a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/smp.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c<br/>index d6bd435a6857..09a67d771857 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/time.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *  1998-12-20  Updated NTP code according to technical memorandum Jan '96</div><div class='ctx'>  *              "A Kernel Model for Precision Timekeeping" by Dave Mills</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -379,7 +378,7 @@ static int timer_dyn_tick_enable(void)</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (dyn_tick) {</div><div class='del'>-		write_seqlock_irqsave(&amp;xtime_lock, flags);</div><div class='add'>+		spin_lock_irqsave(&amp;dyn_tick-&gt;lock, flags);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		if (!(dyn_tick-&gt;state &amp; DYN_TICK_ENABLED)) {</div><div class='ctx'> 			ret = dyn_tick-&gt;enable();</div><div class='hunk'>@@ -387,7 +386,7 @@ static int timer_dyn_tick_enable(void)</div><div class='ctx'> 			if (ret == 0)</div><div class='ctx'> 				dyn_tick-&gt;state |= DYN_TICK_ENABLED;</div><div class='ctx'> 		}</div><div class='del'>-		write_sequnlock_irqrestore(&amp;xtime_lock, flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;dyn_tick-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -400,7 +399,7 @@ static int timer_dyn_tick_disable(void)</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (dyn_tick) {</div><div class='del'>-		write_seqlock_irqsave(&amp;xtime_lock, flags);</div><div class='add'>+		spin_lock_irqsave(&amp;dyn_tick-&gt;lock, flags);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		if (dyn_tick-&gt;state &amp; DYN_TICK_ENABLED) {</div><div class='ctx'> 			ret = dyn_tick-&gt;disable();</div><div class='hunk'>@@ -408,7 +407,7 @@ static int timer_dyn_tick_disable(void)</div><div class='ctx'> 			if (ret == 0)</div><div class='ctx'> 				dyn_tick-&gt;state &amp;= ~DYN_TICK_ENABLED;</div><div class='ctx'> 		}</div><div class='del'>-		write_sequnlock_irqrestore(&amp;xtime_lock, flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;dyn_tick-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -422,15 +421,20 @@ static int timer_dyn_tick_disable(void)</div><div class='ctx'> void timer_dyn_reprogram(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct dyn_tick_timer *dyn_tick = system_timer-&gt;dyn_tick;</div><div class='del'>-	unsigned long next, seq;</div><div class='add'>+	unsigned long next, seq, flags;</div><div class='ctx'> </div><div class='del'>-	if (dyn_tick &amp;&amp; (dyn_tick-&gt;state &amp; DYN_TICK_ENABLED)) {</div><div class='add'>+	if (!dyn_tick)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dyn_tick-&gt;lock, flags);</div><div class='add'>+	if (dyn_tick-&gt;state &amp; DYN_TICK_ENABLED) {</div><div class='ctx'> 		next = next_timer_interrupt();</div><div class='ctx'> 		do {</div><div class='ctx'> 			seq = read_seqbegin(&amp;xtime_lock);</div><div class='del'>-			dyn_tick-&gt;reprogram(next_timer_interrupt() - jiffies);</div><div class='add'>+			dyn_tick-&gt;reprogram(next - jiffies);</div><div class='ctx'> 		} while (read_seqretry(&amp;xtime_lock, seq));</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;dyn_tick-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t timer_show_dyn_tick(struct sys_device *dev, char *buf)</div><div class='hunk'>@@ -499,5 +503,10 @@ void __init time_init(void)</div><div class='ctx'> 	if (system_timer-&gt;offset == NULL)</div><div class='ctx'> 		system_timer-&gt;offset = dummy_gettimeoffset;</div><div class='ctx'> 	system_timer-&gt;init();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NO_IDLE_HZ</div><div class='add'>+	if (system_timer-&gt;dyn_tick)</div><div class='add'>+		system_timer-&gt;dyn_tick-&gt;lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c<br/>index 35230a060108..35a052fc177a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/traps.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *  'linux/arch/arm/lib/traps.S'.  Mostly a debugging aid, but will probably</div><div class='ctx'>  *  kill the offending process.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S<br/>index 2b254e88595c..3ca574ee2772 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> 	</div><div class='hunk'>@@ -80,6 +79,10 @@ SECTIONS</div><div class='ctx'> 		*(.exit.text)</div><div class='ctx'> 		*(.exit.data)</div><div class='ctx'> 		*(.exitcall.exit)</div><div class='add'>+#ifndef CONFIG_MMU</div><div class='add'>+		*(.fixup)</div><div class='add'>+		*(__ex_table)</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	.text : {			/* Real text segment		*/</div><div class='hunk'>@@ -87,7 +90,9 @@ SECTIONS</div><div class='ctx'> 			*(.text)</div><div class='ctx'> 			SCHED_TEXT</div><div class='ctx'> 			LOCK_TEXT</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 			*(.fixup)</div><div class='add'>+#endif</div><div class='ctx'> 			*(.gnu.warning)</div><div class='ctx'> 			*(.rodata)</div><div class='ctx'> 			*(.rodata.*)</div><div class='hunk'>@@ -142,7 +147,9 @@ SECTIONS</div><div class='ctx'> 		 */</div><div class='ctx'> 		. = ALIGN(32);</div><div class='ctx'> 		__start___ex_table = .;</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		*(__ex_table)</div><div class='add'>+#endif</div><div class='ctx'> 		__stop___ex_table = .;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='head'>diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile<br/>index 7b726b627ea5..30351cd4560d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/Makefile</a></div><div class='hunk'>@@ -6,28 +6,31 @@</div><div class='ctx'> </div><div class='ctx'> lib-y		:= backtrace.o changebit.o csumipv6.o csumpartial.o   \</div><div class='ctx'> 		   csumpartialcopy.o csumpartialcopyuser.o clearbit.o \</div><div class='del'>-		   copy_page.o delay.o findbit.o memchr.o memcpy.o    \</div><div class='add'>+		   delay.o findbit.o memchr.o memcpy.o		      \</div><div class='ctx'> 		   memmove.o memset.o memzero.o setbit.o              \</div><div class='ctx'> 		   strncpy_from_user.o strnlen_user.o                 \</div><div class='ctx'> 		   strchr.o strrchr.o                                 \</div><div class='ctx'> 		   testchangebit.o testclearbit.o testsetbit.o        \</div><div class='del'>-		   getuser.o putuser.o clear_user.o                   \</div><div class='ctx'> 		   ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \</div><div class='ctx'> 		   ucmpdi2.o lib1funcs.o div64.o sha1.o               \</div><div class='ctx'> 		   io-readsb.o io-writesb.o io-readsl.o io-writesl.o</div><div class='ctx'> </div><div class='add'>+mmu-y	:= clear_user.o copy_page.o getuser.o putuser.o</div><div class='add'>+</div><div class='ctx'> # the code in uaccess.S is not preemption safe and</div><div class='ctx'> # probably faster on ARMv3 only</div><div class='ctx'> ifeq ($(CONFIG_PREEMPT),y)</div><div class='del'>-  lib-y	+= copy_from_user.o copy_to_user.o</div><div class='add'>+  mmu-y	+= copy_from_user.o copy_to_user.o</div><div class='ctx'> else</div><div class='ctx'> ifneq ($(CONFIG_CPU_32v3),y)</div><div class='del'>-  lib-y	+= copy_from_user.o copy_to_user.o</div><div class='add'>+  mmu-y	+= copy_from_user.o copy_to_user.o</div><div class='ctx'> else</div><div class='del'>-  lib-y	+= uaccess.o</div><div class='add'>+  mmu-y	+= uaccess.o</div><div class='ctx'> endif</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+lib-$(CONFIG_MMU) += $(mmu-y)</div><div class='add'>+</div><div class='ctx'> ifeq ($(CONFIG_CPU_32v3),y)</div><div class='ctx'>   lib-y	+= io-readsw-armv3.o io-writesw-armv3.o</div><div class='ctx'> else</div><div class='head'>diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S<br/>index 16153c86c3f8..74230083cbf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/backtrace.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/backtrace.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/backtrace.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/backtrace.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * 27/03/03 Ian Molton Clean up CONFIG_CPU</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> 		.text</div><div class='hunk'>@@ -41,7 +40,7 @@ ENTRY(c_backtrace)</div><div class='ctx'> 		movne	r0, #0</div><div class='ctx'> 		movs	frame, r0</div><div class='ctx'> 1:		moveq	r0, #-2</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4 - r8, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4 - r8, pc}</div><div class='ctx'> </div><div class='ctx'> 2:		stmfd	sp!, {pc}		@ calculate offset of PC in STMIA instruction</div><div class='ctx'> 		ldr	r0, [sp], #4</div><div class='hunk'>@@ -85,7 +84,7 @@ ENTRY(c_backtrace)</div><div class='ctx'> 		 * A zero next framepointer means we're done.</div><div class='ctx'> 		 */</div><div class='ctx'> 		teq	next, #0</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4 - r8, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4 - r8, pc}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The next framepointer must be above the</div><div class='hunk'>@@ -97,16 +96,13 @@ ENTRY(c_backtrace)</div><div class='ctx'> 		b	1007f</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Fixup for LDMDB</div><div class='add'>+ * Fixup for LDMDB.  Note that this must not be in the fixup section.</div><div class='ctx'>  */</div><div class='del'>-		.section .fixup,"ax"</div><div class='del'>-		.align	0</div><div class='ctx'> 1007:		ldr	r0, =.Lbad</div><div class='ctx'> 		mov	r1, frame</div><div class='ctx'> 		bl	printk</div><div class='del'>-		LOADREGS(fd, sp!, {r4 - r8, pc})</div><div class='add'>+		ldmfd	sp!, {r4 - r8, pc}</div><div class='ctx'> 		.ltorg</div><div class='del'>-		.previous</div><div class='ctx'> 		</div><div class='ctx'> 		.section __ex_table,"a"</div><div class='ctx'> 		.align	3</div><div class='hunk'>@@ -145,7 +141,7 @@ ENTRY(c_backtrace)</div><div class='ctx'> 		adrne	r0, .Lcr</div><div class='ctx'> 		blne	printk</div><div class='ctx'> 		mov	r0, stack</div><div class='del'>-		LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc})</div><div class='add'>+		ldmfd	sp!, {instr, reg, stack, r7, r8, pc}</div><div class='ctx'> </div><div class='ctx'> .Lfp:		.asciz	" r%d = %08X%c"</div><div class='ctx'> .Lcr:		.asciz	"\n"</div><div class='head'>diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h<br/>index b8c14e936697..542251021744 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/bitops.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/bitops.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/bitops.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/bitops.h</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if __LINUX_ARM_ARCH__ &gt;= 6 &amp;&amp; defined(CONFIG_CPU_32v6K)</div><div class='ctx'> 	.macro	bitop, instr</div><div class='head'>diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S<br/>index 7ff9f831b3f9..ecb28dcdaf7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/clear_user.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/clear_user.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/clear_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/clear_user.S</a></div><div class='hunk'>@@ -12,13 +12,13 @@</div><div class='ctx'> </div><div class='ctx'> 		.text</div><div class='ctx'> </div><div class='del'>-/* Prototype: int __arch_clear_user(void *addr, size_t sz)</div><div class='add'>+/* Prototype: int __clear_user(void *addr, size_t sz)</div><div class='ctx'>  * Purpose  : clear some user memory</div><div class='ctx'>  * Params   : addr - user memory address to clear</div><div class='ctx'>  *          : sz   - number of bytes to clear</div><div class='ctx'>  * Returns  : number of bytes NOT cleared</div><div class='ctx'>  */</div><div class='del'>-ENTRY(__arch_clear_user)</div><div class='add'>+ENTRY(__clear_user)</div><div class='ctx'> 		stmfd	sp!, {r1, lr}</div><div class='ctx'> 		mov	r2, #0</div><div class='ctx'> 		cmp	r1, #4</div><div class='hunk'>@@ -43,10 +43,10 @@ USER(		strnebt	r2, [r0], #1)</div><div class='ctx'> 		tst	r1, #1			@ x1 x0 x1 x0 x1 x0 x1</div><div class='ctx'> USER(		strnebt	r2, [r0], #1)</div><div class='ctx'> 		mov	r0, #0</div><div class='del'>-		LOADREGS(fd,sp!, {r1, pc})</div><div class='add'>+		ldmfd	sp!, {r1, pc}</div><div class='ctx'> </div><div class='ctx'> 		.section .fixup,"ax"</div><div class='ctx'> 		.align	0</div><div class='del'>-9001:		LOADREGS(fd,sp!, {r0, pc})</div><div class='add'>+9001:		ldmfd	sp!, {r0, pc}</div><div class='ctx'> 		.previous</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S<br/>index 7497393a0e81..6b7363ce749c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/copy_from_user.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/copy_from_user.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/copy_from_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/copy_from_user.S</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Prototype:</div><div class='ctx'>  *</div><div class='del'>- *	size_t __arch_copy_from_user(void *to, const void *from, size_t n)</div><div class='add'>+ *	size_t __copy_from_user(void *to, const void *from, size_t n)</div><div class='ctx'>  *</div><div class='ctx'>  * Purpose:</div><div class='ctx'>  *</div><div class='hunk'>@@ -83,7 +83,7 @@</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='del'>-ENTRY(__arch_copy_from_user)</div><div class='add'>+ENTRY(__copy_from_user)</div><div class='ctx'> </div><div class='ctx'> #include "copy_template.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S<br/>index 68117968482b..666c99cc0744 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/copy_page.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/copy_page.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/copy_page.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/copy_page.S</a></div><div class='hunk'>@@ -43,4 +43,4 @@ ENTRY(copy_page)</div><div class='ctx'> 		bgt	1b				@	1</div><div class='ctx'> 	PLD(	ldmeqia r1!, {r3, r4, ip, lr}	)</div><div class='ctx'> 	PLD(	beq	2b			)</div><div class='del'>-		LOADREGS(fd, sp!, {r4, pc})		@	3</div><div class='add'>+		ldmfd	sp!, {r4, pc}			@	3</div><div class='head'>diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S<br/>index 4a6d8ea14022..5224d94688d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/copy_to_user.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/copy_to_user.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/copy_to_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/copy_to_user.S</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Prototype:</div><div class='ctx'>  *</div><div class='del'>- *	size_t __arch_copy_to_user(void *to, const void *from, size_t n)</div><div class='add'>+ *	size_t __copy_to_user(void *to, const void *from, size_t n)</div><div class='ctx'>  *</div><div class='ctx'>  * Purpose:</div><div class='ctx'>  *</div><div class='hunk'>@@ -86,7 +86,7 @@</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='del'>-ENTRY(__arch_copy_to_user)</div><div class='add'>+ENTRY(__copy_to_user)</div><div class='ctx'> </div><div class='ctx'> #include "copy_template.S"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/csumipv6.S b/arch/arm/lib/csumipv6.S<br/>index 7065a20ee8ad..9621469beec1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/csumipv6.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/csumipv6.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/csumipv6.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/csumipv6.S</a></div><div class='hunk'>@@ -28,5 +28,5 @@ ENTRY(__csum_ipv6_magic)</div><div class='ctx'> 		adcs	r0, r0, r3</div><div class='ctx'> 		adcs	r0, r0, r2</div><div class='ctx'> 		adcs	r0, r0, #0</div><div class='del'>-		LOADREGS(fd, sp!, {pc})</div><div class='add'>+		ldmfd	sp!, {pc}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S<br/>index 9183b06c0e2f..930a70259220 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/delay.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/delay.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/delay.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/delay.S</a></div><div class='hunk'>@@ -31,7 +31,7 @@ ENTRY(__const_udelay)				@ 0 &lt;= r0 &lt;= 0x7fffff06</div><div class='ctx'> 		mov	r2, r2, lsr #10		@ max = 0x00007fff</div><div class='ctx'> 		mul	r0, r2, r0		@ max = 2^32-1</div><div class='ctx'> 		movs	r0, r0, lsr #6</div><div class='del'>-		RETINSTR(moveq,pc,lr)</div><div class='add'>+		moveq	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * loops = r0 * HZ * loops_per_jiffy / 1000000</div><div class='hunk'>@@ -43,20 +43,20 @@ ENTRY(__const_udelay)				@ 0 &lt;= r0 &lt;= 0x7fffff06</div><div class='ctx'> ENTRY(__delay)</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='ctx'> #if 0</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='del'>-		RETINSTR(movls,pc,lr)</div><div class='add'>+		movls	pc, lr</div><div class='ctx'> 		subs	r0, r0, #1</div><div class='ctx'> #endif</div><div class='ctx'> 		bhi	__delay</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='head'>diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S<br/>index fb7b602a6f76..c55aaa2a2088 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/ecard.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/ecard.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/ecard.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/ecard.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@ ENTRY(ecard_loader_read)</div><div class='ctx'> 		CPSR2SPSR(r0)</div><div class='ctx'> 		mov	lr, pc</div><div class='ctx'> 		mov	pc, r2</div><div class='del'>-		LOADREGS(fd, sp!, {r4 - r12, pc})</div><div class='add'>+		ldmfd	sp!, {r4 - r12, pc}</div><div class='ctx'> </div><div class='ctx'> @ Purpose: call an expansion card loader to reset the card</div><div class='ctx'> @ Proto  : void read_loader(int card_base, char *loader);</div><div class='hunk'>@@ -41,5 +41,5 @@ ENTRY(ecard_loader_reset)</div><div class='ctx'> 		CPSR2SPSR(r0)</div><div class='ctx'> 		mov	lr, pc</div><div class='ctx'> 		add	pc, r1, #8</div><div class='del'>-		LOADREGS(fd, sp!, {r4 - r12, pc})</div><div class='add'>+		ldmfd	sp!, {r4 - r12, pc}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S<br/>index 6f8e27a58c78..a5ca0248aa4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/findbit.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/findbit.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/findbit.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/findbit.S</a></div><div class='hunk'>@@ -32,7 +32,7 @@ ENTRY(_find_first_zero_bit_le)</div><div class='ctx'> 2:		cmp	r2, r1			@ any more?</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Purpose  : Find next 'zero' bit</div><div class='hunk'>@@ -66,7 +66,7 @@ ENTRY(_find_first_bit_le)</div><div class='ctx'> 2:		cmp	r2, r1			@ any more?</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Purpose  : Find next 'one' bit</div><div class='hunk'>@@ -98,7 +98,7 @@ ENTRY(_find_first_zero_bit_be)</div><div class='ctx'> 2:		cmp	r2, r1			@ any more?</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> ENTRY(_find_next_zero_bit_be)</div><div class='ctx'> 		teq	r1, #0</div><div class='hunk'>@@ -126,7 +126,7 @@ ENTRY(_find_first_bit_be)</div><div class='ctx'> 2:		cmp	r2, r1			@ any more?</div><div class='ctx'> 		blo	1b</div><div class='ctx'> 3:		mov	r0, r1			@ no free bits</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> ENTRY(_find_next_bit_be)</div><div class='ctx'> 		teq	r1, #0</div><div class='hunk'>@@ -164,5 +164,5 @@ ENTRY(_find_next_bit_be)</div><div class='ctx'> 		addeq	r2, r2, #1</div><div class='ctx'> 		mov	r0, r2</div><div class='ctx'> #endif</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S<br/>index d3d8de71a2c8..fb966ad0276f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/io-readsb.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-readsb.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/io-readsb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/io-readsb.S</a></div><div class='hunk'>@@ -72,7 +72,7 @@ ENTRY(__raw_readsb)</div><div class='ctx'> 		bpl	.Linsb_16_lp</div><div class='ctx'> </div><div class='ctx'> 		tst	r2, #15</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4 - r6, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4 - r6, pc}</div><div class='ctx'> </div><div class='ctx'> .Linsb_no_16:	tst	r2, #8</div><div class='ctx'> 		beq	.Linsb_no_8</div><div class='hunk'>@@ -109,7 +109,7 @@ ENTRY(__raw_readsb)</div><div class='ctx'> 		str	r3, [r1], #4</div><div class='ctx'> </div><div class='ctx'> .Linsb_no_4:	ands	r2, r2, #3</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4 - r6, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4 - r6, pc}</div><div class='ctx'> </div><div class='ctx'> 		cmp	r2, #2</div><div class='ctx'> 		ldrb	r3, [r0]</div><div class='hunk'>@@ -119,4 +119,4 @@ ENTRY(__raw_readsb)</div><div class='ctx'> 		ldrgtb	r3, [r0]</div><div class='ctx'> 		strgtb	r3, [r1]</div><div class='ctx'> </div><div class='del'>-		LOADREGS(fd, sp!, {r4 - r6, pc})</div><div class='add'>+		ldmfd	sp!, {r4 - r6, pc}</div><div class='head'>diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S<br/>index 146d47c15455..4ef904185142 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/io-readsw-armv3.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-readsw-armv3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/io-readsw-armv3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/io-readsw-armv3.S</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> 		strb	r3, [r1], #1</div><div class='ctx'> </div><div class='ctx'> 		subs	r2, r2, #1</div><div class='del'>-		RETINSTR(moveq, pc, lr)</div><div class='add'>+		moveq	pc, lr</div><div class='ctx'> </div><div class='ctx'> ENTRY(__raw_readsw)</div><div class='ctx'> 		teq	r2, #0		@ do we have to check for the zero len?</div><div class='hunk'>@@ -69,7 +69,7 @@ ENTRY(__raw_readsw)</div><div class='ctx'> 		bpl	.Linsw_8_lp</div><div class='ctx'> </div><div class='ctx'> 		tst	r2, #7</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4, r5, r6, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4, r5, r6, pc}</div><div class='ctx'> </div><div class='ctx'> .Lno_insw_8:	tst	r2, #4</div><div class='ctx'> 		beq	.Lno_insw_4</div><div class='hunk'>@@ -102,6 +102,6 @@ ENTRY(__raw_readsw)</div><div class='ctx'> 		movne	r3, r3, lsr #8</div><div class='ctx'> 		strneb	r3, [r1]</div><div class='ctx'> </div><div class='del'>-		LOADREGS(fd, sp!, {r4, r5, r6, pc})</div><div class='add'>+		ldmfd	sp!, {r4, r5, r6, pc}</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S<br/>index 08209fc640ea..7eba2b6cc69f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/io-writesb.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-writesb.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/io-writesb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/io-writesb.S</a></div><div class='hunk'>@@ -64,7 +64,7 @@ ENTRY(__raw_writesb)</div><div class='ctx'> 		bpl	.Loutsb_16_lp</div><div class='ctx'> </div><div class='ctx'> 		tst	r2, #15</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4, r5, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4, r5, pc}</div><div class='ctx'> </div><div class='ctx'> .Loutsb_no_16:	tst	r2, #8</div><div class='ctx'> 		beq	.Loutsb_no_8</div><div class='hunk'>@@ -80,7 +80,7 @@ ENTRY(__raw_writesb)</div><div class='ctx'> 		outword	r3</div><div class='ctx'> </div><div class='ctx'> .Loutsb_no_4:	ands	r2, r2, #3</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4, r5, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4, r5, pc}</div><div class='ctx'> </div><div class='ctx'> 		cmp	r2, #2</div><div class='ctx'> 		ldrb	r3, [r1], #1</div><div class='hunk'>@@ -90,4 +90,4 @@ ENTRY(__raw_writesb)</div><div class='ctx'> 		ldrgtb	r3, [r1]</div><div class='ctx'> 		strgtb	r3, [r0]</div><div class='ctx'> </div><div class='del'>-		LOADREGS(fd, sp!, {r4, r5, pc})</div><div class='add'>+		ldmfd	sp!, {r4, r5, pc}</div><div class='head'>diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S<br/>index 52d62b481295..1607a29f49b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/io-writesw-armv3.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/io-writesw-armv3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/io-writesw-armv3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/io-writesw-armv3.S</a></div><div class='hunk'>@@ -29,7 +29,7 @@</div><div class='ctx'> 		orr	r3, r3, r3, lsl #16</div><div class='ctx'> 		str	r3, [r0]</div><div class='ctx'> 		subs	r2, r2, #1</div><div class='del'>-		RETINSTR(moveq, pc, lr)</div><div class='add'>+		moveq	pc, lr</div><div class='ctx'> </div><div class='ctx'> ENTRY(__raw_writesw)</div><div class='ctx'> 		teq	r2, #0		@ do we have to check for the zero len?</div><div class='hunk'>@@ -80,7 +80,7 @@ ENTRY(__raw_writesw)</div><div class='ctx'> 		bpl	.Loutsw_8_lp</div><div class='ctx'> </div><div class='ctx'> 		tst	r2, #7</div><div class='del'>-		LOADREGS(eqfd, sp!, {r4, r5, r6, pc})</div><div class='add'>+		ldmeqfd	sp!, {r4, r5, r6, pc}</div><div class='ctx'> </div><div class='ctx'> .Lno_outsw_8:	tst	r2, #4</div><div class='ctx'> 		beq	.Lno_outsw_4</div><div class='hunk'>@@ -124,4 +124,4 @@ ENTRY(__raw_writesw)</div><div class='ctx'> 		orrne	ip, ip, ip, lsr #16</div><div class='ctx'> 		strne	ip, [r0]</div><div class='ctx'> </div><div class='del'>-		LOADREGS(fd, sp!, {r4, r5, r6, pc})</div><div class='add'>+		ldmfd	sp!, {r4, r5, r6, pc}</div><div class='head'>diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S<br/>index ac34fe55d21a..e7ab1ea8ebaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/memchr.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/memchr.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/memchr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/memchr.S</a></div><div class='hunk'>@@ -22,4 +22,4 @@ ENTRY(memchr)</div><div class='ctx'> 	bne	1b</div><div class='ctx'> 	sub	r0, r0, #1</div><div class='ctx'> 2:	movne	r0, #0</div><div class='del'>-	RETINSTR(mov,pc,lr)</div><div class='add'>+	mov	pc, lr</div><div class='head'>diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S<br/>index a1795f599937..95b110b07a89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/memset.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/memset.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/memset.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/memset.S</a></div><div class='hunk'>@@ -53,7 +53,7 @@ ENTRY(memset)</div><div class='ctx'> 	stmgeia	r0!, {r1, r3, ip, lr}</div><div class='ctx'> 	stmgeia	r0!, {r1, r3, ip, lr}</div><div class='ctx'> 	bgt	2b</div><div class='del'>-	LOADREGS(eqfd, sp!, {pc})	@ Now &lt;64 bytes to go.</div><div class='add'>+	ldmeqfd	sp!, {pc}		@ Now &lt;64 bytes to go.</div><div class='ctx'> /*</div><div class='ctx'>  * No need to correct the count; we're only testing bits from now on</div><div class='ctx'>  */</div><div class='hunk'>@@ -77,4 +77,4 @@ ENTRY(memset)</div><div class='ctx'> 	strneb	r1, [r0], #1</div><div class='ctx'> 	tst	r2, #1</div><div class='ctx'> 	strneb	r1, [r0], #1</div><div class='del'>-	RETINSTR(mov,pc,lr)</div><div class='add'>+	mov	pc, lr</div><div class='head'>diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S<br/>index 51ccc60160fd..abf2508e8221 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/memzero.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/memzero.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/memzero.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/memzero.S</a></div><div class='hunk'>@@ -53,7 +53,7 @@ ENTRY(__memzero)</div><div class='ctx'> 	stmgeia	r0!, {r2, r3, ip, lr}	@ 4</div><div class='ctx'> 	stmgeia	r0!, {r2, r3, ip, lr}	@ 4</div><div class='ctx'> 	bgt	3b			@ 1</div><div class='del'>-	LOADREGS(eqfd, sp!, {pc})	@ 1/2 quick exit</div><div class='add'>+	ldmeqfd	sp!, {pc}		@ 1/2 quick exit</div><div class='ctx'> /*</div><div class='ctx'>  * No need to correct the count; we're only testing bits from now on</div><div class='ctx'>  */</div><div class='hunk'>@@ -77,4 +77,4 @@ ENTRY(__memzero)</div><div class='ctx'> 	strneb	r2, [r0], #1		@ 1</div><div class='ctx'> 	tst	r1, #1			@ 1 a byte left over</div><div class='ctx'> 	strneb	r2, [r0], #1		@ 1</div><div class='del'>-	RETINSTR(mov,pc,lr)		@ 1</div><div class='add'>+	mov	pc, lr			@ 1</div><div class='head'>diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S<br/>index 5b9b493733fc..9f18d6fdee6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/strchr.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strchr.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/strchr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/strchr.S</a></div><div class='hunk'>@@ -23,4 +23,4 @@ ENTRY(strchr)</div><div class='ctx'> 		teq	r2, r1</div><div class='ctx'> 		movne	r0, #0</div><div class='ctx'> 		subeq	r0, r0, #1</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='head'>diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S<br/>index 629cc8775276..36e3741a3772 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/strncpy_from_user.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strncpy_from_user.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/strncpy_from_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/strncpy_from_user.S</a></div><div class='hunk'>@@ -20,8 +20,7 @@</div><div class='ctx'>  * returns the number of characters copied (strlen of copied string),</div><div class='ctx'>  *  -EFAULT on exception, or "len" if we fill the whole buffer</div><div class='ctx'>  */</div><div class='del'>-ENTRY(__arch_strncpy_from_user)</div><div class='del'>-	save_lr</div><div class='add'>+ENTRY(__strncpy_from_user)</div><div class='ctx'> 	mov	ip, r1</div><div class='ctx'> 1:	subs	r2, r2, #1</div><div class='ctx'> USER(	ldrplbt	r3, [r1], #1)</div><div class='hunk'>@@ -31,13 +30,13 @@ USER(	ldrplbt	r3, [r1], #1)</div><div class='ctx'> 	bne	1b</div><div class='ctx'> 	sub	r1, r1, #1	@ take NUL character out of count</div><div class='ctx'> 2:	sub	r0, r1, ip</div><div class='del'>-	restore_pc</div><div class='add'>+	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	.section .fixup,"ax"</div><div class='ctx'> 	.align	0</div><div class='ctx'> 9001:	mov	r3, #0</div><div class='ctx'> 	strb	r3, [r0, #0]	@ null terminate</div><div class='ctx'> 	mov	r0, #-EFAULT</div><div class='del'>-	restore_pc</div><div class='add'>+	mov	pc, lr</div><div class='ctx'> 	.previous</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S<br/>index 67bcd8268128..18d8fa4f925a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/strnlen_user.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strnlen_user.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/strnlen_user.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/strnlen_user.S</a></div><div class='hunk'>@@ -14,14 +14,13 @@</div><div class='ctx'> 	.text</div><div class='ctx'> 	.align	5</div><div class='ctx'> </div><div class='del'>-/* Prototype: unsigned long __arch_strnlen_user(const char *str, long n)</div><div class='add'>+/* Prototype: unsigned long __strnlen_user(const char *str, long n)</div><div class='ctx'>  * Purpose  : get length of a string in user memory</div><div class='ctx'>  * Params   : str - address of string in user memory</div><div class='ctx'>  * Returns  : length of string *including terminator*</div><div class='ctx'>  *	      or zero on exception, or n + 1 if too long</div><div class='ctx'>  */</div><div class='del'>-ENTRY(__arch_strnlen_user)</div><div class='del'>-	save_lr</div><div class='add'>+ENTRY(__strnlen_user)</div><div class='ctx'> 	mov	r2, r0</div><div class='ctx'> 1:</div><div class='ctx'> USER(	ldrbt	r3, [r0], #1)</div><div class='hunk'>@@ -31,10 +30,10 @@ USER(	ldrbt	r3, [r0], #1)</div><div class='ctx'> 	bne	1b</div><div class='ctx'> 	add	r0, r0, #1</div><div class='ctx'> 2:	sub	r0, r0, r2</div><div class='del'>-	restore_pc</div><div class='add'>+	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	.section .fixup,"ax"</div><div class='ctx'> 	.align	0</div><div class='ctx'> 9001:	mov	r0, #0</div><div class='del'>-	restore_pc</div><div class='add'>+	mov	pc, lr</div><div class='ctx'> 	.previous</div><div class='head'>diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S<br/>index fa923f026f15..538df220aa48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/strrchr.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/strrchr.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/strrchr.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/strrchr.S</a></div><div class='hunk'>@@ -22,4 +22,4 @@ ENTRY(strrchr)</div><div class='ctx'> 		teq	r2, #0</div><div class='ctx'> 		bne	1b</div><div class='ctx'> 		mov	r0, r3</div><div class='del'>-		RETINSTR(mov,pc,lr)</div><div class='add'>+		mov	pc, lr</div><div class='head'>diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S<br/>index 0cc450f863b6..b48bd6d5fd83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/uaccess.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/uaccess.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/uaccess.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/uaccess.S</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #define PAGE_SHIFT 12</div><div class='ctx'> </div><div class='del'>-/* Prototype: int __arch_copy_to_user(void *to, const char *from, size_t n)</div><div class='add'>+/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)</div><div class='ctx'>  * Purpose  : copy a block to user memory from kernel memory</div><div class='ctx'>  * Params   : to   - user memory</div><div class='ctx'>  *          : from - kernel memory</div><div class='hunk'>@@ -39,7 +39,7 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault</div><div class='ctx'> 		sub	r2, r2, ip</div><div class='ctx'> 		b	.Lc2u_dest_aligned</div><div class='ctx'> </div><div class='del'>-ENTRY(__arch_copy_to_user)</div><div class='add'>+ENTRY(__copy_to_user)</div><div class='ctx'> 		stmfd	sp!, {r2, r4 - r7, lr}</div><div class='ctx'> 		cmp	r2, #4</div><div class='ctx'> 		blt	.Lc2u_not_enough</div><div class='hunk'>@@ -105,7 +105,7 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault</div><div class='ctx'> 		movs	ip, r2</div><div class='ctx'> 		bne	.Lc2u_nowords</div><div class='ctx'> .Lc2u_finished:	mov	r0, #0</div><div class='del'>-		LOADREGS(fd,sp!,{r2, r4 - r7, pc})</div><div class='add'>+		ldmfd	sp!, {r2, r4 - r7, pc}</div><div class='ctx'> </div><div class='ctx'> .Lc2u_src_not_aligned:</div><div class='ctx'> 		bic	r1, r1, #3</div><div class='hunk'>@@ -280,10 +280,10 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault</div><div class='ctx'> </div><div class='ctx'> 		.section .fixup,"ax"</div><div class='ctx'> 		.align	0</div><div class='del'>-9001:		LOADREGS(fd,sp!, {r0, r4 - r7, pc})</div><div class='add'>+9001:		ldmfd	sp!, {r0, r4 - r7, pc}</div><div class='ctx'> 		.previous</div><div class='ctx'> </div><div class='del'>-/* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n);</div><div class='add'>+/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);</div><div class='ctx'>  * Purpose  : copy a block from user memory to kernel memory</div><div class='ctx'>  * Params   : to   - kernel memory</div><div class='ctx'>  *          : from - user memory</div><div class='hunk'>@@ -302,7 +302,7 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault</div><div class='ctx'> 		sub	r2, r2, ip</div><div class='ctx'> 		b	.Lcfu_dest_aligned</div><div class='ctx'> </div><div class='del'>-ENTRY(__arch_copy_from_user)</div><div class='add'>+ENTRY(__copy_from_user)</div><div class='ctx'> 		stmfd	sp!, {r0, r2, r4 - r7, lr}</div><div class='ctx'> 		cmp	r2, #4</div><div class='ctx'> 		blt	.Lcfu_not_enough</div><div class='hunk'>@@ -369,7 +369,7 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault</div><div class='ctx'> 		bne	.Lcfu_nowords</div><div class='ctx'> .Lcfu_finished:	mov	r0, #0</div><div class='ctx'> 		add	sp, sp, #8</div><div class='del'>-		LOADREGS(fd,sp!,{r4 - r7, pc})</div><div class='add'>+		ldmfd	sp!, {r4 - r7, pc}</div><div class='ctx'> </div><div class='ctx'> .Lcfu_src_not_aligned:</div><div class='ctx'> 		bic	r1, r1, #3</div><div class='hunk'>@@ -556,6 +556,6 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault</div><div class='ctx'> 		movne	r1, r4</div><div class='ctx'> 		blne	__memzero</div><div class='ctx'> 		mov	r0, r4</div><div class='del'>-		LOADREGS(fd,sp!, {r4 - r7, pc})</div><div class='add'>+		ldmfd	sp!, {r4 - r7, pc}</div><div class='ctx'> 		.previous</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/lib/ucmpdi2.S b/arch/arm/lib/ucmpdi2.S<br/>index d847a62834cb..f76de07ac182 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/lib/ucmpdi2.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/lib/ucmpdi2.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/lib/ucmpdi2.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/lib/ucmpdi2.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __ARMEB__</div><div class='head'>diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c<br/>index 65be5efd633c..baa997c857dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-aaec2000/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-aaec2000/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-aaec2000/core.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  *  published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -143,7 +142,7 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction aaec2000_timer_irq = {</div><div class='ctx'> 	.name		= "AAEC-2000 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= aaec2000_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91rm9200/Kconfig<br/>index 4b7218fc3eb1..2f85e8693b1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/Kconfig</a></div><div class='hunk'>@@ -1,47 +1,109 @@</div><div class='del'>-if ARCH_AT91RM9200</div><div class='add'>+if ARCH_AT91</div><div class='add'>+</div><div class='add'>+menu "Atmel AT91 System-on-Chip"</div><div class='add'>+</div><div class='add'>+comment "Atmel AT91 Processors"</div><div class='add'>+</div><div class='add'>+config ARCH_AT91RM9200</div><div class='add'>+	bool "AT91RM9200"</div><div class='ctx'> </div><div class='del'>-menu "AT91RM9200 Implementations"</div><div class='add'>+config ARCH_AT91SAM9260</div><div class='add'>+	bool "AT91SAM9260"</div><div class='add'>+</div><div class='add'>+config ARCH_AT91SAM9261</div><div class='add'>+	bool "AT91SAM9261"</div><div class='add'>+</div><div class='add'>+# ----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+if ARCH_AT91RM9200</div><div class='ctx'> </div><div class='ctx'> comment "AT91RM9200 Board Type"</div><div class='ctx'> </div><div class='add'>+config MACH_ONEARM</div><div class='add'>+	bool "Ajeco 1ARM Single Board Computer"</div><div class='add'>+	depends on ARCH_AT91RM9200</div><div class='add'>+	help</div><div class='add'>+	  Select this if you are using Ajeco's 1ARM Single Board Computer.</div><div class='add'>+	  &lt;http://www.ajeco.fi/products.htm&gt;</div><div class='add'>+</div><div class='ctx'> config ARCH_AT91RM9200DK</div><div class='ctx'> 	bool "Atmel AT91RM9200-DK Development board"</div><div class='ctx'> 	depends on ARCH_AT91RM9200</div><div class='ctx'> 	help</div><div class='del'>-	  Select this if you are using Atmel's AT91RM9200-DK Development board</div><div class='add'>+	  Select this if you are using Atmel's AT91RM9200-DK Development board.</div><div class='add'>+	  (Discontinued)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> config MACH_AT91RM9200EK</div><div class='ctx'> 	bool "Atmel AT91RM9200-EK Evaluation Kit"</div><div class='ctx'> 	depends on ARCH_AT91RM9200</div><div class='ctx'> 	help</div><div class='del'>-	  Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit</div><div class='add'>+	  Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.</div><div class='add'>+	  &lt;http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507&gt;</div><div class='ctx'> </div><div class='ctx'> config MACH_CSB337</div><div class='del'>-	bool "Cogent CSB337 board"</div><div class='add'>+	bool "Cogent CSB337"</div><div class='ctx'> 	depends on ARCH_AT91RM9200</div><div class='ctx'> 	help</div><div class='del'>-	  Select this if you are using Cogent's CSB337 board</div><div class='add'>+	  Select this if you are using Cogent's CSB337 board.</div><div class='add'>+	  &lt;http://www.cogcomp.com/csb_csb337.htm&gt;</div><div class='ctx'> </div><div class='ctx'> config MACH_CSB637</div><div class='del'>-	bool "Cogent CSB637 board"</div><div class='add'>+	bool "Cogent CSB637"</div><div class='ctx'> 	depends on ARCH_AT91RM9200</div><div class='ctx'> 	help</div><div class='del'>-	  Select this if you are using Cogent's CSB637 board</div><div class='add'>+	  Select this if you are using Cogent's CSB637 board.</div><div class='add'>+	  &lt;http://www.cogcomp.com/csb_csb637.htm&gt;</div><div class='ctx'> </div><div class='ctx'> config MACH_CARMEVA</div><div class='del'>-	bool "Conitec's ARM&amp;EVA"</div><div class='add'>+	bool "Conitec ARM&amp;EVA"</div><div class='ctx'> 	depends on ARCH_AT91RM9200</div><div class='ctx'> 	help</div><div class='del'>-	  Select this if you are using Conitec's AT91RM9200-MCU-Module</div><div class='add'>+	  Select this if you are using Conitec's AT91RM9200-MCU-Module.</div><div class='add'>+	  &lt;http://www.conitec.net/english/linuxboard.htm&gt;</div><div class='add'>+</div><div class='add'>+config MACH_ATEB9200</div><div class='add'>+	bool "Embest ATEB9200"</div><div class='add'>+	depends on ARCH_AT91RM9200</div><div class='add'>+	help</div><div class='add'>+	  Select this if you are using Embest's ATEB9200 board.</div><div class='add'>+	  &lt;http://www.embedinfo.com/english/product/ATEB9200.asp&gt;</div><div class='ctx'> </div><div class='ctx'> config MACH_KB9200</div><div class='del'>-	bool "KwikByte's KB920x"</div><div class='add'>+	bool "KwikByte KB920x"</div><div class='ctx'> 	depends on ARCH_AT91RM9200</div><div class='ctx'> 	help</div><div class='del'>-	  Select this if you are using KwikByte's KB920x board</div><div class='add'>+	  Select this if you are using KwikByte's KB920x board.</div><div class='add'>+	  &lt;http://kwikbyte.com/KB9202_description_new.htm&gt;</div><div class='add'>+</div><div class='add'>+config MACH_KAFA</div><div class='add'>+	bool "Sperry-Sun KAFA board"</div><div class='add'>+	depends on ARCH_AT91RM9200</div><div class='add'>+	help</div><div class='add'>+	  Select this if you are using Sperry-Sun's KAFA board.</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+# ----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+if ARCH_AT91SAM9260</div><div class='add'>+</div><div class='add'>+comment "AT91SAM9260 Board Type"</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+# ----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+if ARCH_AT91SAM9261</div><div class='add'>+</div><div class='add'>+comment "AT91SAM9261 Board Type"</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> </div><div class='add'>+# ----------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-comment "AT91RM9200 Feature Selections"</div><div class='add'>+comment "AT91 Feature Selections"</div><div class='ctx'> </div><div class='ctx'> config AT91_PROGRAMMABLE_CLOCKS</div><div class='ctx'> 	bool "Programmable Clocks"</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91rm9200/Makefile<br/>index ef88c4128edc..c174805c24e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/Makefile</a></div><div class='hunk'>@@ -2,27 +2,46 @@</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= clock.o irq.o time.o gpio.o common.o devices.o</div><div class='add'>+obj-y		:= clock.o irq.o gpio.o devices.o</div><div class='ctx'> obj-m		:=</div><div class='ctx'> obj-n		:=</div><div class='ctx'> obj-		:=</div><div class='ctx'> </div><div class='del'>-# Board-specific support</div><div class='add'>+obj-$(CONFIG_PM)		+= pm.o</div><div class='add'>+</div><div class='add'>+# CPU-specific support</div><div class='add'>+obj-$(CONFIG_ARCH_AT91RM9200)	+= at91rm9200.o at91rm9200_time.o</div><div class='add'>+obj-$(CONFIG_ARCH_AT91SAM9260)	+=</div><div class='add'>+obj-$(CONFIG_ARCH_AT91SAM9261)	+=</div><div class='add'>+</div><div class='add'>+# AT91RM9200 Board-specific support</div><div class='add'>+obj-$(CONFIG_MACH_ONEARM)	+= board-1arm.o</div><div class='ctx'> obj-$(CONFIG_ARCH_AT91RM9200DK)	+= board-dk.o</div><div class='ctx'> obj-$(CONFIG_MACH_AT91RM9200EK)	+= board-ek.o</div><div class='ctx'> obj-$(CONFIG_MACH_CSB337)	+= board-csb337.o</div><div class='ctx'> obj-$(CONFIG_MACH_CSB637)	+= board-csb637.o</div><div class='del'>-#obj-$(CONFIG_MACH_CARMEVA)	+= board-carmeva.o</div><div class='del'>-#obj-$(CONFIG_MACH_KB9200)	+= board-kb9202.o</div><div class='add'>+obj-$(CONFIG_MACH_CARMEVA)	+= board-carmeva.o</div><div class='add'>+obj-$(CONFIG_MACH_KB9200)	+= board-kb9202.o</div><div class='add'>+obj-$(CONFIG_MACH_ATEB9200)	+= board-eb9200.o</div><div class='add'>+obj-$(CONFIG_MACH_KAFA)		+= board-kafa.o</div><div class='add'>+</div><div class='add'>+# AT91SAM9260 board-specific support</div><div class='add'>+</div><div class='add'>+# AT91SAM9261 board-specific support</div><div class='ctx'> </div><div class='ctx'> # LEDs support</div><div class='ctx'> led-$(CONFIG_ARCH_AT91RM9200DK)	+= leds.o</div><div class='ctx'> led-$(CONFIG_MACH_AT91RM9200EK)	+= leds.o</div><div class='ctx'> led-$(CONFIG_MACH_CSB337)	+= leds.o</div><div class='ctx'> led-$(CONFIG_MACH_CSB637)	+= leds.o</div><div class='del'>-#led-$(CONFIG_MACH_KB9200)	+= leds.o</div><div class='del'>-#led-$(CONFIG_MACH_KAFA)	+= leds.o</div><div class='add'>+led-$(CONFIG_MACH_KB9200)	+= leds.o</div><div class='add'>+led-$(CONFIG_MACH_KAFA)		+= leds.o</div><div class='ctx'> obj-$(CONFIG_LEDS) += $(led-y)</div><div class='ctx'> </div><div class='ctx'> # VGA support</div><div class='ctx'> #obj-$(CONFIG_FB_S1D13XXX)	+= ics1523.o</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_PM_DEBUG),y)</div><div class='add'>+CFLAGS_pm.o += -DDEBUG</div><div class='add'>+endif</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/common.c b/arch/arm/mach-at91rm9200/at91rm9200.c<br/>index 3848fd2d5596..0985b1c42c7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/at91rm9200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/at91rm9200.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * arch/arm/mach-at91rm9200/common.c</div><div class='add'>+ * arch/arm/mach-at91rm9200/at91rm9200.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2005 SAN People</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,13 +10,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include "generic.h"</div><div class='ctx'> </div><div class='ctx'> static struct map_desc at91rm9200_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -94,6 +94,11 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {</div><div class='ctx'> 		.pfn		= __phys_to_pfn(AT91_BASE_TCB0),</div><div class='ctx'> 		.length		= SZ_16K,</div><div class='ctx'> 		.type		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual	= AT91_SRAM_VIRT_BASE,</div><div class='add'>+		.pfn		= __phys_to_pfn(AT91_SRAM_BASE),</div><div class='add'>+		.length		= AT91_SRAM_SIZE,</div><div class='add'>+		.type		= MT_DEVICE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -102,14 +107,48 @@ void __init at91rm9200_map_io(void)</div><div class='ctx'> 	iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The default interrupt priority levels (0 = lowest, 7 = highest).</div><div class='add'>+ */</div><div class='add'>+static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='add'>+	7,	/* Advanced Interrupt Controller (FIQ) */</div><div class='add'>+	7,	/* System Peripherals */</div><div class='add'>+	0,	/* Parallel IO Controller A */</div><div class='add'>+	0,	/* Parallel IO Controller B */</div><div class='add'>+	0,	/* Parallel IO Controller C */</div><div class='add'>+	0,	/* Parallel IO Controller D */</div><div class='add'>+	6,	/* USART 0 */</div><div class='add'>+	6,	/* USART 1 */</div><div class='add'>+	6,	/* USART 2 */</div><div class='add'>+	6,	/* USART 3 */</div><div class='add'>+	0,	/* Multimedia Card Interface */</div><div class='add'>+	4,	/* USB Device Port */</div><div class='add'>+	0,	/* Two-Wire Interface */</div><div class='add'>+	6,	/* Serial Peripheral Interface */</div><div class='add'>+	5,	/* Serial Synchronous Controller 0 */</div><div class='add'>+	5,	/* Serial Synchronous Controller 1 */</div><div class='add'>+	5,	/* Serial Synchronous Controller 2 */</div><div class='add'>+	0,	/* Timer Counter 0 */</div><div class='add'>+	0,	/* Timer Counter 1 */</div><div class='add'>+	0,	/* Timer Counter 2 */</div><div class='add'>+	0,	/* Timer Counter 3 */</div><div class='add'>+	0,	/* Timer Counter 4 */</div><div class='add'>+	0,	/* Timer Counter 5 */</div><div class='add'>+	3,	/* USB Host port */</div><div class='add'>+	3,	/* Ethernet MAC */</div><div class='add'>+	0,	/* Advanced Interrupt Controller (IRQ0) */</div><div class='add'>+	0,	/* Advanced Interrupt Controller (IRQ1) */</div><div class='add'>+	0,	/* Advanced Interrupt Controller (IRQ2) */</div><div class='add'>+	0,	/* Advanced Interrupt Controller (IRQ3) */</div><div class='add'>+	0,	/* Advanced Interrupt Controller (IRQ4) */</div><div class='add'>+	0,	/* Advanced Interrupt Controller (IRQ5) */</div><div class='add'>+	0	/* Advanced Interrupt Controller (IRQ6) */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-unsigned long at91_master_clock;</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(at91_master_clock);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int at91_serial_map[AT91_NR_UART];</div><div class='del'>-int at91_console_port;</div><div class='add'>+void __init at91rm9200_init_irq(unsigned int priority[NR_AIC_IRQS])</div><div class='add'>+{</div><div class='add'>+	if (!priority)</div><div class='add'>+		priority = at91rm9200_default_irq_priority;</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(at91_serial_map);</div><div class='del'>-EXPORT_SYMBOL(at91_console_port);</div><div class='add'>+	at91_aic_init(priority);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c<br/>index 7ffcf443b99f..a92a8622c78a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/at91rm9200_time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/at91rm9200_time.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/arch/arm/mach-at91rm9200/time.c</div><div class='add'>+ * linux/arch/arm/mach-at91rm9200/at91rm9200_time.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 SAN People</div><div class='ctx'>  *  Copyright (C) 2003 ATMEL</div><div class='hunk'>@@ -19,18 +19,19 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='ctx'> </div><div class='add'>+static unsigned long last_crtr;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The ST_CRTR is updated asynchronously to the master clock.  It is therefore</div><div class='ctx'>  *  necessary to read it twice (with the same value) to ensure accuracy.</div><div class='hunk'>@@ -56,7 +57,7 @@ static unsigned long at91rm9200_gettimeoffset(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long elapsed;</div><div class='ctx'> </div><div class='del'>-	elapsed = (read_CRTR() - at91_sys_read(AT91_ST_RTAR)) &amp; AT91_ST_ALMV;</div><div class='add'>+	elapsed = (read_CRTR() - last_crtr) &amp; AT91_ST_ALMV;</div><div class='ctx'> </div><div class='ctx'> 	return (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH;</div><div class='ctx'> }</div><div class='hunk'>@@ -66,15 +67,12 @@ static unsigned long at91rm9200_gettimeoffset(void)</div><div class='ctx'>  */</div><div class='ctx'> static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	unsigned long rtar;</div><div class='del'>-</div><div class='ctx'> 	if (at91_sys_read(AT91_ST_SR) &amp; AT91_ST_PITS) {	/* This is a shared interrupt */</div><div class='ctx'> 		write_seqlock(&amp;xtime_lock);</div><div class='ctx'> </div><div class='del'>-		while (((read_CRTR() - at91_sys_read(AT91_ST_RTAR)) &amp; AT91_ST_ALMV) &gt;= LATCH) {</div><div class='add'>+		while (((read_CRTR() - last_crtr) &amp; AT91_ST_ALMV) &gt;= LATCH) {</div><div class='ctx'> 			timer_tick(regs);</div><div class='del'>-			rtar = (at91_sys_read(AT91_ST_RTAR) + LATCH) &amp; AT91_ST_ALMV;</div><div class='del'>-			at91_sys_write(AT91_ST_RTAR, rtar);</div><div class='add'>+			last_crtr = (last_crtr + LATCH) &amp; AT91_ST_ALMV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		write_sequnlock(&amp;xtime_lock);</div><div class='hunk'>@@ -87,10 +85,24 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id, struct pt_r</div><div class='ctx'> </div><div class='ctx'> static struct irqaction at91rm9200_timer_irq = {</div><div class='ctx'> 	.name		= "at91_tick",</div><div class='del'>-	.flags		= SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= at91rm9200_timer_interrupt</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void at91rm9200_timer_reset(void)</div><div class='add'>+{</div><div class='add'>+	last_crtr = 0;</div><div class='add'>+</div><div class='add'>+	/* Real time counter incremented every 30.51758 microseconds */</div><div class='add'>+	at91_sys_write(AT91_ST_RTMR, 1);</div><div class='add'>+</div><div class='add'>+	/* Set Period Interval timer */</div><div class='add'>+	at91_sys_write(AT91_ST_PIMR, LATCH);</div><div class='add'>+</div><div class='add'>+	/* Enable Period Interval Timer interrupt */</div><div class='add'>+	at91_sys_write(AT91_ST_IER, AT91_ST_PITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Set up timer interrupt.</div><div class='ctx'>  */</div><div class='hunk'>@@ -100,28 +112,30 @@ void __init at91rm9200_timer_init(void)</div><div class='ctx'> 	at91_sys_write(AT91_ST_IDR, AT91_ST_PITS | AT91_ST_WDOVF | AT91_ST_RTTINC | AT91_ST_ALMS);</div><div class='ctx'> 	(void) at91_sys_read(AT91_ST_SR);	/* Clear any pending interrupts */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make IRQs happen for the system timer.</div><div class='del'>-	 */</div><div class='add'>+	/* Make IRQs happen for the system timer */</div><div class='ctx'> 	setup_irq(AT91_ID_SYS, &amp;at91rm9200_timer_irq);</div><div class='ctx'> </div><div class='del'>-	/* Set initial alarm to 0 */</div><div class='del'>-	at91_sys_write(AT91_ST_RTAR, 0);</div><div class='del'>-</div><div class='del'>-	/* Real time counter incremented every 30.51758 microseconds */</div><div class='del'>-	at91_sys_write(AT91_ST_RTMR, 1);</div><div class='del'>-</div><div class='del'>-	/* Set Period Interval timer */</div><div class='del'>-	at91_sys_write(AT91_ST_PIMR, LATCH);</div><div class='del'>-</div><div class='ctx'> 	/* Change the kernel's 'tick' value to 10009 usec. (the default is 10000) */</div><div class='ctx'> 	tick_usec = (LATCH * 1000000) / CLOCK_TICK_RATE;</div><div class='ctx'> </div><div class='del'>-	/* Enable Period Interval Timer interrupt */</div><div class='del'>-	at91_sys_write(AT91_ST_IER, AT91_ST_PITS);</div><div class='add'>+	/* Initialize and enable the timer interrupt */</div><div class='add'>+	at91rm9200_timer_reset();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static void at91rm9200_timer_suspend(void)</div><div class='add'>+{</div><div class='add'>+	/* disable Period Interval Timer interrupt */</div><div class='add'>+	at91_sys_write(AT91_ST_IDR, AT91_ST_PITS);</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+#define at91rm9200_timer_suspend	NULL</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct sys_timer at91rm9200_timer = {</div><div class='ctx'> 	.init		= at91rm9200_timer_init,</div><div class='ctx'> 	.offset		= at91rm9200_gettimeoffset,</div><div class='add'>+	.suspend	= at91rm9200_timer_suspend,</div><div class='add'>+	.resume		= at91rm9200_timer_reset,</div><div class='ctx'> };</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-1arm.c b/arch/arm/mach-at91rm9200/board-1arm.c<br/>new file mode 100644<br/>index 000000000000..dc79e0992af7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-1arm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-1arm.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-at91rm9200/board-1arm.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 SAN People</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static void __init onearm_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize AIC controller */</div><div class='add'>+	at91rm9200_init_irq(NULL);</div><div class='add'>+</div><div class='add'>+	/* Set up the GPIO interrupts */</div><div class='add'>+	at91_gpio_irq_setup(PQFP_GPIO_BANKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serial port configuration.</div><div class='add'>+ *    0 .. 3 = USART0 .. USART3</div><div class='add'>+ *    4      = DBGU</div><div class='add'>+ */</div><div class='add'>+static struct at91_uart_config __initdata onearm_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 3,</div><div class='add'>+	.tty_map	= { 4, 0, 1, -1, -1 },		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init onearm_map_io(void)</div><div class='add'>+{</div><div class='add'>+	at91rm9200_map_io();</div><div class='add'>+</div><div class='add'>+	/* Initialize clocks: 18.432 MHz crystal */</div><div class='add'>+	at91_clock_init(18432000);</div><div class='add'>+</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;onearm_uart_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct at91_eth_data __initdata onearm_eth_data = {</div><div class='add'>+	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='add'>+	.is_rmii	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_usbh_data __initdata onearm_usbh_data = {</div><div class='add'>+	.ports		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_udc_data __initdata onearm_udc_data = {</div><div class='add'>+	.vbus_pin	= AT91_PIN_PC2,</div><div class='add'>+	.pullup_pin	= AT91_PIN_PC3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init onearm_board_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	at91_add_device_eth(&amp;onearm_eth_data);</div><div class='add'>+	/* USB Host */</div><div class='add'>+	at91_add_device_usbh(&amp;onearm_usbh_data);</div><div class='add'>+	/* USB Device */</div><div class='add'>+	at91_add_device_udc(&amp;onearm_udc_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")</div><div class='add'>+	/* Maintainer: Lennert Buytenhek &lt;buytenh@wantstofly.org&gt; */</div><div class='add'>+	.phys_io	= AT91_BASE_SYS,</div><div class='add'>+	.io_pg_offst	= (AT91_VA_BASE_SYS &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= AT91_SDRAM_BASE + 0x100,</div><div class='add'>+	.timer		= &amp;at91rm9200_timer,</div><div class='add'>+	.map_io		= onearm_map_io,</div><div class='add'>+	.init_irq	= onearm_init_irq,</div><div class='add'>+	.init_machine	= onearm_board_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-carmeva.c b/arch/arm/mach-at91rm9200/board-carmeva.c<br/>new file mode 100644<br/>index 000000000000..2c138b542ebe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-carmeva.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-carmeva.c</a></div><div class='hunk'>@@ -0,0 +1,131 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-at91rm9200/board-carmeva.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2005 Peer Georgi</div><div class='add'>+ *  		       Conitec Datasystems</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static void __init carmeva_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize AIC controller */</div><div class='add'>+	at91rm9200_init_irq(NULL);</div><div class='add'>+</div><div class='add'>+	/* Set up the GPIO interrupts */</div><div class='add'>+	at91_gpio_irq_setup(BGA_GPIO_BANKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serial port configuration.</div><div class='add'>+ *    0 .. 3 = USART0 .. USART3</div><div class='add'>+ *    4      = DBGU</div><div class='add'>+ */</div><div class='add'>+static struct at91_uart_config __initdata carmeva_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init carmeva_map_io(void)</div><div class='add'>+{</div><div class='add'>+	at91rm9200_map_io();</div><div class='add'>+</div><div class='add'>+	/* Initialize clocks: 20.000 MHz crystal */</div><div class='add'>+	at91_clock_init(20000000);</div><div class='add'>+</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;carmeva_uart_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct at91_eth_data __initdata carmeva_eth_data = {</div><div class='add'>+	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='add'>+	.is_rmii	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_usbh_data __initdata carmeva_usbh_data = {</div><div class='add'>+	.ports		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_udc_data __initdata carmeva_udc_data = {</div><div class='add'>+	.vbus_pin	= AT91_PIN_PD12,</div><div class='add'>+	.pullup_pin	= AT91_PIN_PD9,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* FIXME: user dependend */</div><div class='add'>+// static struct at91_cf_data __initdata carmeva_cf_data = {</div><div class='add'>+//	.det_pin	= AT91_PIN_PB0,</div><div class='add'>+//	.rst_pin	= AT91_PIN_PC5,</div><div class='add'>+	// .irq_pin	= ... not connected</div><div class='add'>+	// .vcc_pin	= ... always powered</div><div class='add'>+// };</div><div class='add'>+</div><div class='add'>+static struct at91_mmc_data __initdata carmeva_mmc_data = {</div><div class='add'>+	.is_b		= 0,</div><div class='add'>+	.wire4		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init carmeva_board_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	at91_add_device_eth(&amp;carmeva_eth_data);</div><div class='add'>+	/* USB Host */</div><div class='add'>+	at91_add_device_usbh(&amp;carmeva_usbh_data);</div><div class='add'>+	/* USB Device */</div><div class='add'>+	at91_add_device_udc(&amp;carmeva_udc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* Compact Flash */</div><div class='add'>+//	at91_add_device_cf(&amp;carmeva_cf_data);</div><div class='add'>+	/* SPI */</div><div class='add'>+//	at91_add_device_spi(NULL, 0);</div><div class='add'>+	/* MMC */</div><div class='add'>+	at91_add_device_mmc(&amp;carmeva_mmc_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(CARMEVA, "Carmeva")</div><div class='add'>+	/* Maintainer: Conitec Datasystems */</div><div class='add'>+	.phys_io	= AT91_BASE_SYS,</div><div class='add'>+	.io_pg_offst	= (AT91_VA_BASE_SYS &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= AT91_SDRAM_BASE + 0x100,</div><div class='add'>+	.timer		= &amp;at91rm9200_timer,</div><div class='add'>+	.map_io		= carmeva_map_io,</div><div class='add'>+	.init_irq	= carmeva_init_irq,</div><div class='add'>+	.init_machine	= carmeva_board_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-csb337.c b/arch/arm/mach-at91rm9200/board-csb337.c<br/>index f45104ceea8f..794d3fbb449b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-csb337.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-csb337.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-csb337.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-csb337.c</a></div><div class='hunk'>@@ -18,12 +18,12 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -34,9 +34,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach/serial_at91rm9200.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -54,32 +54,24 @@ static void __init csb337_init_irq(void)</div><div class='ctx'>  *    0 .. 3 = USART0 .. USART3</div><div class='ctx'>  *    4      = DBGU</div><div class='ctx'>  */</div><div class='del'>-#define CSB337_UART_MAP		{ 4, 1, -1, -1, -1 }	/* ttyS0, ..., ttyS4 */</div><div class='del'>-#define CSB337_SERIAL_CONSOLE	0			/* ttyS0 */</div><div class='add'>+static struct at91_uart_config __initdata csb337_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __init csb337_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	int serial[AT91_NR_UART] = CSB337_UART_MAP;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	at91rm9200_map_io();</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize clocks: 3.6864 MHz crystal */</div><div class='ctx'> 	at91_clock_init(3686400);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the LEDs */</div><div class='del'>-	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SERIAL_AT91</div><div class='del'>-	at91_console_port = CSB337_SERIAL_CONSOLE;</div><div class='del'>-	memcpy(at91_serial_map, serial, sizeof(serial));</div><div class='del'>-</div><div class='del'>-	/* Register UARTs */</div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>-		if (serial[i] &gt;= 0)</div><div class='del'>-			at91_register_uart(i, serial[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);</div><div class='add'>+</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;csb337_uart_config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct at91_eth_data __initdata csb337_eth_data = {</div><div class='hunk'>@@ -118,17 +110,31 @@ static struct at91_mmc_data __initdata csb337_mmc_data = {</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PD6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct spi_board_info csb337_spi_devices[] = {</div><div class='add'>+	{	/* CAN controller */</div><div class='add'>+		.modalias	= "sak82c900",</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.max_speed_hz	= 6 * 1000 * 1000,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init csb337_board_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='ctx'> 	/* Ethernet */</div><div class='ctx'> 	at91_add_device_eth(&amp;csb337_eth_data);</div><div class='ctx'> 	/* USB Host */</div><div class='ctx'> 	at91_add_device_usbh(&amp;csb337_usbh_data);</div><div class='ctx'> 	/* USB Device */</div><div class='ctx'> 	at91_add_device_udc(&amp;csb337_udc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='ctx'> 	/* Compact Flash */</div><div class='ctx'> 	at91_set_gpio_input(AT91_PIN_PB22, 1);		/* IOIS16 */</div><div class='ctx'> 	at91_add_device_cf(&amp;csb337_cf_data);</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));</div><div class='ctx'> 	/* MMC */</div><div class='ctx'> 	at91_add_device_mmc(&amp;csb337_mmc_data);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-csb637.c b/arch/arm/mach-at91rm9200/board-csb637.c<br/>index f2c2d6e79bc6..c8b6f334246a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-csb637.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-csb637.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-csb637.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-csb637.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -34,9 +33,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach/serial_at91rm9200.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -54,14 +53,14 @@ static void __init csb637_init_irq(void)</div><div class='ctx'>  *    0 .. 3 = USART0 .. USART3</div><div class='ctx'>  *    4      = DBGU</div><div class='ctx'>  */</div><div class='del'>-#define CSB637_UART_MAP		{ 4, 1, -1, -1, -1 }	/* ttyS0, ..., ttyS4 */</div><div class='del'>-#define CSB637_SERIAL_CONSOLE	0			/* ttyS0 */</div><div class='add'>+static struct at91_uart_config __initdata csb637_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __init csb637_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	int serial[AT91_NR_UART] = CSB637_UART_MAP;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	at91rm9200_map_io();</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize clocks: 3.6864 MHz crystal */</div><div class='hunk'>@@ -70,16 +69,8 @@ static void __init csb637_map_io(void)</div><div class='ctx'> 	/* Setup the LEDs */</div><div class='ctx'> 	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SERIAL_AT91</div><div class='del'>-	at91_console_port = CSB637_SERIAL_CONSOLE;</div><div class='del'>-	memcpy(at91_serial_map, serial, sizeof(serial));</div><div class='del'>-</div><div class='del'>-	/* Register UARTs */</div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>-		if (serial[i] &gt;= 0)</div><div class='del'>-			at91_register_uart(i, serial[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;csb637_uart_config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct at91_eth_data __initdata csb637_eth_data = {</div><div class='hunk'>@@ -98,12 +89,18 @@ static struct at91_udc_data __initdata csb637_udc_data = {</div><div class='ctx'> </div><div class='ctx'> static void __init csb637_board_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='ctx'> 	/* Ethernet */</div><div class='ctx'> 	at91_add_device_eth(&amp;csb637_eth_data);</div><div class='ctx'> 	/* USB Host */</div><div class='ctx'> 	at91_add_device_usbh(&amp;csb637_usbh_data);</div><div class='ctx'> 	/* USB Device */</div><div class='ctx'> 	at91_add_device_udc(&amp;csb637_udc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(CSB637, "Cogent CSB637")</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c<br/>index 2d7200ed66ed..65873037e02a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-dk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-dk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-dk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-dk.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -37,9 +37,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach/serial_at91rm9200.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -57,14 +57,14 @@ static void __init dk_init_irq(void)</div><div class='ctx'>  *    0 .. 3 = USART0 .. USART3</div><div class='ctx'>  *    4      = DBGU</div><div class='ctx'>  */</div><div class='del'>-#define DK_UART_MAP		{ 4, 1, -1, -1, -1 }	/* ttyS0, ..., ttyS4 */</div><div class='del'>-#define DK_SERIAL_CONSOLE	0			/* ttyS0 */</div><div class='add'>+static struct at91_uart_config __initdata dk_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __init dk_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	int serial[AT91_NR_UART] = DK_UART_MAP;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	at91rm9200_map_io();</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize clocks: 18.432 MHz crystal */</div><div class='hunk'>@@ -73,16 +73,8 @@ static void __init dk_map_io(void)</div><div class='ctx'> 	/* Setup the LEDs */</div><div class='ctx'> 	at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SERIAL_AT91</div><div class='del'>-	at91_console_port = DK_SERIAL_CONSOLE;</div><div class='del'>-	memcpy(at91_serial_map, serial, sizeof(serial));</div><div class='del'>-</div><div class='del'>-	/* Register UARTs */</div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>-		if (at91_serial_map[i] &gt;= 0)</div><div class='del'>-			at91_register_uart(i, at91_serial_map[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;dk_uart_config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct at91_eth_data __initdata dk_eth_data = {</div><div class='hunk'>@@ -111,16 +103,48 @@ static struct at91_mmc_data __initdata dk_mmc_data = {</div><div class='ctx'> 	.wire4		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct spi_board_info dk_spi_devices[] = {</div><div class='add'>+	{	/* DataFlash chip */</div><div class='add'>+		.modalias	= "mtd_dataflash",</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.max_speed_hz	= 15 * 1000 * 1000,</div><div class='add'>+	},</div><div class='add'>+	{	/* UR6HCPS2-SP40 PS2-to-SPI adapter */</div><div class='add'>+		.modalias	= "ur6hcps2",</div><div class='add'>+		.chip_select	= 1,</div><div class='add'>+		.max_speed_hz	= 250 *  1000,</div><div class='add'>+	},</div><div class='add'>+	{	/* TLV1504 ADC, 4 channels, 10 bits; one is a temp sensor */</div><div class='add'>+		.modalias	= "tlv1504",</div><div class='add'>+		.chip_select	= 2,</div><div class='add'>+		.max_speed_hz	= 20 * 1000 * 1000,</div><div class='add'>+	},</div><div class='add'>+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD</div><div class='add'>+	{	/* DataFlash card */</div><div class='add'>+		.modalias	= "mtd_dataflash",</div><div class='add'>+		.chip_select	= 3,</div><div class='add'>+		.max_speed_hz	= 15 * 1000 * 1000,</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init dk_board_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='ctx'> 	/* Ethernet */</div><div class='ctx'> 	at91_add_device_eth(&amp;dk_eth_data);</div><div class='ctx'> 	/* USB Host */</div><div class='ctx'> 	at91_add_device_usbh(&amp;dk_usbh_data);</div><div class='ctx'> 	/* USB Device */</div><div class='ctx'> 	at91_add_device_udc(&amp;dk_udc_data);</div><div class='add'>+	at91_set_multi_drive(dk_udc_data.pullup_pin, 1);	/* pullup_pin is connected to reset */</div><div class='ctx'> 	/* Compact Flash */</div><div class='ctx'> 	at91_add_device_cf(&amp;dk_cf_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(dk_spi_devices, ARRAY_SIZE(dk_spi_devices));</div><div class='ctx'> #ifdef CONFIG_MTD_AT91_DATAFLASH_CARD</div><div class='ctx'> 	/* DataFlash card */</div><div class='ctx'> 	at91_set_gpio_output(AT91_PIN_PB7, 0);</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-eb9200.c b/arch/arm/mach-at91rm9200/board-eb9200.c<br/>new file mode 100644<br/>index 000000000000..a3e2df968a66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-eb9200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-eb9200.c</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-at91rm9200/board-eb9200.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 SAN People, adapted for ATEB9200 from Embest</div><div class='add'>+ *  by Andrew Patrikalakis</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static void __init eb9200_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize AIC controller */</div><div class='add'>+	at91rm9200_init_irq(NULL);</div><div class='add'>+</div><div class='add'>+	/* Set up the GPIO interrupts */</div><div class='add'>+	at91_gpio_irq_setup(BGA_GPIO_BANKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serial port configuration.</div><div class='add'>+ *    0 .. 3 = USART0 .. USART3</div><div class='add'>+ *    4      = DBGU</div><div class='add'>+ */</div><div class='add'>+static struct at91_uart_config __initdata eb9200_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init eb9200_map_io(void)</div><div class='add'>+{</div><div class='add'>+	at91rm9200_map_io();</div><div class='add'>+</div><div class='add'>+	/* Initialize clocks: 18.432 MHz crystal */</div><div class='add'>+	at91_clock_init(18432000);</div><div class='add'>+</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;eb9200_uart_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct at91_eth_data __initdata eb9200_eth_data = {</div><div class='add'>+	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='add'>+	.is_rmii	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_usbh_data __initdata eb9200_usbh_data = {</div><div class='add'>+	.ports		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_udc_data __initdata eb9200_udc_data = {</div><div class='add'>+	.vbus_pin	= AT91_PIN_PD4,</div><div class='add'>+	.pullup_pin	= AT91_PIN_PD5,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_cf_data __initdata eb9200_cf_data = {</div><div class='add'>+	.det_pin	= AT91_PIN_PB0,</div><div class='add'>+	.rst_pin	= AT91_PIN_PC5,</div><div class='add'>+	// .irq_pin	= ... not connected</div><div class='add'>+	// .vcc_pin	= ... always powered</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_mmc_data __initdata eb9200_mmc_data = {</div><div class='add'>+	.is_b		= 0,</div><div class='add'>+	.wire4		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init eb9200_board_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	at91_add_device_eth(&amp;eb9200_eth_data);</div><div class='add'>+	/* USB Host */</div><div class='add'>+	at91_add_device_usbh(&amp;eb9200_usbh_data);</div><div class='add'>+	/* USB Device */</div><div class='add'>+	at91_add_device_udc(&amp;eb9200_udc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* Compact Flash */</div><div class='add'>+	at91_add_device_cf(&amp;eb9200_cf_data);</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(NULL, 0);</div><div class='add'>+	/* MMC */</div><div class='add'>+	/* only supports 1 or 4 bit interface, not wired through to SPI */</div><div class='add'>+	at91_add_device_mmc(&amp;eb9200_mmc_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(ATEB9200, "Embest ATEB9200")</div><div class='add'>+	.phys_io	= AT91_BASE_SYS,</div><div class='add'>+	.io_pg_offst	= (AT91_VA_BASE_SYS &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= AT91_SDRAM_BASE + 0x100,</div><div class='add'>+	.timer		= &amp;at91rm9200_timer,</div><div class='add'>+	.map_io		= eb9200_map_io,</div><div class='add'>+	.init_irq	= eb9200_init_irq,</div><div class='add'>+	.init_machine	= eb9200_board_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-ek.c b/arch/arm/mach-at91rm9200/board-ek.c<br/>index 80d90f5135a1..868192351dda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-ek.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/board-ek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-ek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-ek.c</a></div><div class='hunk'>@@ -21,12 +21,12 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -37,9 +37,9 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach/serial_at91rm9200.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='hunk'>@@ -57,14 +57,14 @@ static void __init ek_init_irq(void)</div><div class='ctx'>  *    0 .. 3 = USART0 .. USART3</div><div class='ctx'>  *    4      = DBGU</div><div class='ctx'>  */</div><div class='del'>-#define EK_UART_MAP		{ 4, 1, -1, -1, -1 }	/* ttyS0, ..., ttyS4 */</div><div class='del'>-#define EK_SERIAL_CONSOLE	0			/* ttyS0 */</div><div class='add'>+static struct at91_uart_config __initdata ek_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 1, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void __init ek_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	int serial[AT91_NR_UART] = EK_UART_MAP;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='ctx'> 	at91rm9200_map_io();</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize clocks: 18.432 MHz crystal */</div><div class='hunk'>@@ -73,16 +73,8 @@ static void __init ek_map_io(void)</div><div class='ctx'> 	/* Setup the LEDs */</div><div class='ctx'> 	at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SERIAL_AT91</div><div class='del'>-	at91_console_port = EK_SERIAL_CONSOLE;</div><div class='del'>-	memcpy(at91_serial_map, serial, sizeof(serial));</div><div class='del'>-</div><div class='del'>-	/* Register UARTs */</div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>-		if (serial[i] &gt;= 0)</div><div class='del'>-			at91_register_uart(i, serial[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;ek_uart_config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct at91_eth_data __initdata ek_eth_data = {</div><div class='hunk'>@@ -106,14 +98,36 @@ static struct at91_mmc_data __initdata ek_mmc_data = {</div><div class='ctx'> 	.wp_pin		= AT91_PIN_PA17,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct spi_board_info ek_spi_devices[] = {</div><div class='add'>+	{	/* DataFlash chip */</div><div class='add'>+		.modalias	= "mtd_dataflash",</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+		.max_speed_hz	= 15 * 1000 * 1000,</div><div class='add'>+	},</div><div class='add'>+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD</div><div class='add'>+	{	/* DataFlash card */</div><div class='add'>+		.modalias	= "mtd_dataflash",</div><div class='add'>+		.chip_select	= 3,</div><div class='add'>+		.max_speed_hz	= 15 * 1000 * 1000,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init ek_board_init(void)</div><div class='ctx'> {</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='ctx'> 	/* Ethernet */</div><div class='ctx'> 	at91_add_device_eth(&amp;ek_eth_data);</div><div class='ctx'> 	/* USB Host */</div><div class='ctx'> 	at91_add_device_usbh(&amp;ek_usbh_data);</div><div class='ctx'> 	/* USB Device */</div><div class='ctx'> 	at91_add_device_udc(&amp;ek_udc_data);</div><div class='add'>+	at91_set_multi_drive(ek_udc_data.pullup_pin, 1);	/* pullup_pin is connected to reset */</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));</div><div class='ctx'> #ifdef CONFIG_MTD_AT91_DATAFLASH_CARD</div><div class='ctx'> 	/* DataFlash card */</div><div class='ctx'> 	at91_set_gpio_output(AT91_PIN_PB22, 0);</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-kafa.c b/arch/arm/mach-at91rm9200/board-kafa.c<br/>new file mode 100644<br/>index 000000000000..bf760c5e0c46<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-kafa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-kafa.c</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-at91rm9200/board-kafa.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Sperry-Sun</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static void __init kafa_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize AIC controller */</div><div class='add'>+	at91rm9200_init_irq(NULL);</div><div class='add'>+</div><div class='add'>+	/* Set up the GPIO interrupts */</div><div class='add'>+	at91_gpio_irq_setup(PQFP_GPIO_BANKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serial port configuration.</div><div class='add'>+ *    0 .. 3 = USART0 .. USART3</div><div class='add'>+ *    4      = DBGU</div><div class='add'>+ */</div><div class='add'>+static struct at91_uart_config __initdata kafa_uart_config = {</div><div class='add'>+	.console_tty	= 0,				/* ttyS0 */</div><div class='add'>+	.nr_tty		= 2,</div><div class='add'>+	.tty_map	= { 4, 0, -1, -1, -1 }		/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init kafa_map_io(void)</div><div class='add'>+{</div><div class='add'>+	at91rm9200_map_io();</div><div class='add'>+</div><div class='add'>+	/* Initialize clocks: 18.432 MHz crystal */</div><div class='add'>+	at91_clock_init(18432000);</div><div class='add'>+</div><div class='add'>+	/* Set up the LEDs */</div><div class='add'>+	at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);</div><div class='add'>+</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;kafa_uart_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct at91_eth_data __initdata kafa_eth_data = {</div><div class='add'>+	.phy_irq_pin	= AT91_PIN_PC4,</div><div class='add'>+	.is_rmii	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_usbh_data __initdata kafa_usbh_data = {</div><div class='add'>+	.ports		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_udc_data __initdata kafa_udc_data = {</div><div class='add'>+	.vbus_pin	= AT91_PIN_PB6,</div><div class='add'>+	.pullup_pin	= AT91_PIN_PB7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init kafa_board_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	at91_add_device_eth(&amp;kafa_eth_data);</div><div class='add'>+	/* USB Host */</div><div class='add'>+	at91_add_device_usbh(&amp;kafa_usbh_data);</div><div class='add'>+	/* USB Device */</div><div class='add'>+	at91_add_device_udc(&amp;kafa_udc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(KAFA, "Sperry-Sun KAFA")</div><div class='add'>+	/* Maintainer: Sergei Sharonov */</div><div class='add'>+	.phys_io	= AT91_BASE_SYS,</div><div class='add'>+	.io_pg_offst	= (AT91_VA_BASE_SYS &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= AT91_SDRAM_BASE + 0x100,</div><div class='add'>+	.timer		= &amp;at91rm9200_timer,</div><div class='add'>+	.map_io		= kafa_map_io,</div><div class='add'>+	.init_irq	= kafa_init_irq,</div><div class='add'>+	.init_machine	= kafa_board_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/board-kb9202.c b/arch/arm/mach-at91rm9200/board-kb9202.c<br/>new file mode 100644<br/>index 000000000000..f06d2b54cc9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/board-kb9202.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/board-kb9202.c</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-at91rm9200/board-kb9202.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2005 kb_admin</div><div class='add'>+ *  		       KwikByte, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static void __init kb9202_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* Initialize AIC controller */</div><div class='add'>+	at91rm9200_init_irq(NULL);</div><div class='add'>+</div><div class='add'>+	/* Set up the GPIO interrupts */</div><div class='add'>+	at91_gpio_irq_setup(PQFP_GPIO_BANKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Serial port configuration.</div><div class='add'>+ *    0 .. 3 = USART0 .. USART3</div><div class='add'>+ *    4      = DBGU</div><div class='add'>+ */</div><div class='add'>+static struct at91_uart_config __initdata kb9202_uart_config = {</div><div class='add'>+	.console_tty	= 0,					/* ttyS0 */</div><div class='add'>+	.nr_tty		= 3,</div><div class='add'>+	.tty_map	= { 4, 0, 1, -1, -1 }			/* ttyS0, ..., ttyS4 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init kb9202_map_io(void)</div><div class='add'>+{</div><div class='add'>+	at91rm9200_map_io();</div><div class='add'>+</div><div class='add'>+	/* Initialize clocks: 10 MHz crystal */</div><div class='add'>+	at91_clock_init(10000000);</div><div class='add'>+</div><div class='add'>+	/* Set up the LEDs */</div><div class='add'>+	at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18);</div><div class='add'>+</div><div class='add'>+	/* Setup the serial ports and console */</div><div class='add'>+	at91_init_serial(&amp;kb9202_uart_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct at91_eth_data __initdata kb9202_eth_data = {</div><div class='add'>+	.phy_irq_pin	= AT91_PIN_PB29,</div><div class='add'>+	.is_rmii	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_usbh_data __initdata kb9202_usbh_data = {</div><div class='add'>+	.ports		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_udc_data __initdata kb9202_udc_data = {</div><div class='add'>+	.vbus_pin	= AT91_PIN_PB24,</div><div class='add'>+	.pullup_pin	= AT91_PIN_PB22,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_mmc_data __initdata kb9202_mmc_data = {</div><div class='add'>+	.det_pin	= AT91_PIN_PB2,</div><div class='add'>+	.is_b		= 0,</div><div class='add'>+	.wire4		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init kb9202_board_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Serial */</div><div class='add'>+	at91_add_device_serial();</div><div class='add'>+	/* Ethernet */</div><div class='add'>+	at91_add_device_eth(&amp;kb9202_eth_data);</div><div class='add'>+	/* USB Host */</div><div class='add'>+	at91_add_device_usbh(&amp;kb9202_usbh_data);</div><div class='add'>+	/* USB Device */</div><div class='add'>+	at91_add_device_udc(&amp;kb9202_udc_data);</div><div class='add'>+	/* MMC */</div><div class='add'>+	at91_add_device_mmc(&amp;kb9202_mmc_data);</div><div class='add'>+	/* I2C */</div><div class='add'>+	at91_add_device_i2c();</div><div class='add'>+	/* SPI */</div><div class='add'>+	at91_add_device_spi(NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(KB9200, "KB920x")</div><div class='add'>+	/* Maintainer: KwikByte, Inc. */</div><div class='add'>+	.phys_io	= AT91_BASE_SYS,</div><div class='add'>+	.io_pg_offst	= (AT91_VA_BASE_SYS &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= AT91_SDRAM_BASE + 0x100,</div><div class='add'>+	.timer		= &amp;at91rm9200_timer,</div><div class='add'>+	.map_io		= kb9202_map_io,</div><div class='add'>+	.init_irq	= kb9202_init_irq,</div><div class='add'>+	.init_machine	= kb9202_board_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/clock.c b/arch/arm/mach-at91rm9200/clock.c<br/>index 8b95467c6d61..edc2cc837ae6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/clock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/clock.c</a></div><div class='hunk'>@@ -27,12 +27,10 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='del'>-#include &lt;asm/arch/board.h&gt;		/* for master clock global */</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='del'>-#undef	DEBUG</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * There's a lot more which can be done with clocks, including cpufreq</div><div class='hunk'>@@ -41,7 +39,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct clk {</div><div class='del'>-	const char	*name;</div><div class='add'>+	const char	*name;		/* unique clock name */</div><div class='add'>+	const char	*function;	/* function of the clock */</div><div class='add'>+	struct device	*dev;		/* device associated with function */</div><div class='ctx'> 	unsigned long	rate_hz;</div><div class='ctx'> 	struct clk	*parent;</div><div class='ctx'> 	u32		pmc_mask;</div><div class='hunk'>@@ -71,15 +71,14 @@ static struct clk clk32k = {</div><div class='ctx'> };</div><div class='ctx'> static struct clk main_clk = {</div><div class='ctx'> 	.name		= "main",</div><div class='del'>-	.pmc_mask	= 1 &lt;&lt; 0,	/* in PMC_SR */</div><div class='del'>-	.users		= 1,</div><div class='add'>+	.pmc_mask	= AT91_PMC_MOSCS,	/* in PMC_SR */</div><div class='ctx'> 	.id		= 1,</div><div class='ctx'> 	.primary	= 1,</div><div class='ctx'> };</div><div class='ctx'> static struct clk plla = {</div><div class='ctx'> 	.name		= "plla",</div><div class='ctx'> 	.parent		= &amp;main_clk,</div><div class='del'>-	.pmc_mask	= 1 &lt;&lt; 1,	/* in PMC_SR */</div><div class='add'>+	.pmc_mask	= AT91_PMC_LOCKA,	/* in PMC_SR */</div><div class='ctx'> 	.id		= 2,</div><div class='ctx'> 	.primary	= 1,</div><div class='ctx'> 	.pll		= 1,</div><div class='hunk'>@@ -105,7 +104,7 @@ static void pllb_mode(struct clk *clk, int is_on)</div><div class='ctx'> static struct clk pllb = {</div><div class='ctx'> 	.name		= "pllb",</div><div class='ctx'> 	.parent		= &amp;main_clk,</div><div class='del'>-	.pmc_mask	= 1 &lt;&lt; 2,	/* in PMC_SR */</div><div class='add'>+	.pmc_mask	= AT91_PMC_LOCKB,	/* in PMC_SR */</div><div class='ctx'> 	.mode		= pllb_mode,</div><div class='ctx'> 	.id		= 3,</div><div class='ctx'> 	.primary	= 1,</div><div class='hunk'>@@ -177,8 +176,7 @@ static struct clk pck3 = {</div><div class='ctx'>  */</div><div class='ctx'> static struct clk mck = {</div><div class='ctx'> 	.name		= "mck",</div><div class='del'>-	.pmc_mask	= 1 &lt;&lt; 3,	/* in PMC_SR */</div><div class='del'>-	.users		= 1,		/* (must be) always on */</div><div class='add'>+	.pmc_mask	= AT91_PMC_MCKRDY,	/* in PMC_SR */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void pmc_periph_mode(struct clk *clk, int is_on)</div><div class='hunk'>@@ -249,6 +247,30 @@ static struct clk spi_clk = {</div><div class='ctx'> 	.pmc_mask	= 1 &lt;&lt; AT91_ID_SPI,</div><div class='ctx'> 	.mode		= pmc_periph_mode,</div><div class='ctx'> };</div><div class='add'>+static struct clk pioA_clk = {</div><div class='add'>+	.name		= "pioA_clk",</div><div class='add'>+	.parent		= &amp;mck,</div><div class='add'>+	.pmc_mask	= 1 &lt;&lt; AT91_ID_PIOA,</div><div class='add'>+	.mode		= pmc_periph_mode,</div><div class='add'>+};</div><div class='add'>+static struct clk pioB_clk = {</div><div class='add'>+	.name		= "pioB_clk",</div><div class='add'>+	.parent		= &amp;mck,</div><div class='add'>+	.pmc_mask	= 1 &lt;&lt; AT91_ID_PIOB,</div><div class='add'>+	.mode		= pmc_periph_mode,</div><div class='add'>+};</div><div class='add'>+static struct clk pioC_clk = {</div><div class='add'>+	.name		= "pioC_clk",</div><div class='add'>+	.parent		= &amp;mck,</div><div class='add'>+	.pmc_mask	= 1 &lt;&lt; AT91_ID_PIOC,</div><div class='add'>+	.mode		= pmc_periph_mode,</div><div class='add'>+};</div><div class='add'>+static struct clk pioD_clk = {</div><div class='add'>+	.name		= "pioD_clk",</div><div class='add'>+	.parent		= &amp;mck,</div><div class='add'>+	.pmc_mask	= 1 &lt;&lt; AT91_ID_PIOD,</div><div class='add'>+	.mode		= pmc_periph_mode,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct clk *const clock_list[] = {</div><div class='ctx'> 	/* four primary clocks -- MUST BE FIRST! */</div><div class='hunk'>@@ -279,21 +301,46 @@ static struct clk *const clock_list[] = {</div><div class='ctx'> 	&amp;udc_clk,</div><div class='ctx'> 	&amp;twi_clk,</div><div class='ctx'> 	&amp;spi_clk,</div><div class='add'>+	&amp;pioA_clk,</div><div class='add'>+	&amp;pioB_clk,</div><div class='add'>+	&amp;pioC_clk,</div><div class='add'>+	&amp;pioD_clk,</div><div class='ctx'> 	// ssc0..ssc2</div><div class='ctx'> 	// tc0..tc5</div><div class='add'>+	// irq0..irq6</div><div class='ctx'> 	&amp;ohci_clk,</div><div class='ctx'> 	&amp;ether_clk,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Associate a particular clock with a function (eg, "uart") and device.</div><div class='add'>+ * The drivers can then request the same 'function' with several different</div><div class='add'>+ * devices and not care about which clock name to use.</div><div class='add'>+ */</div><div class='add'>+void __init at91_clock_associate(const char *id, struct device *dev, const char *func)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk = clk_get(NULL, id);</div><div class='add'>+</div><div class='add'>+	if (!dev || !clk || !IS_ERR(clk_get(dev, func)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clk-&gt;function = func;</div><div class='add'>+	clk-&gt;dev = dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* clocks are all static for now; no refcounting necessary */</div><div class='ctx'> struct clk *clk_get(struct device *dev, const char *id)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(clock_list); i++) {</div><div class='del'>-		if (strcmp(id, clock_list[i]-&gt;name) == 0)</div><div class='del'>-			return clock_list[i];</div><div class='add'>+		struct clk *clk = clock_list[i];</div><div class='add'>+</div><div class='add'>+		if (strcmp(id, clk-&gt;name) == 0)</div><div class='add'>+			return clk;</div><div class='add'>+		if (clk-&gt;function &amp;&amp; (dev == clk-&gt;dev) &amp;&amp; strcmp(id, clk-&gt;function) == 0)</div><div class='add'>+			return clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(-ENOENT);</div><div class='hunk'>@@ -593,6 +640,30 @@ fail:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Several unused clocks may be active.  Turn them off.</div><div class='add'>+ */</div><div class='add'>+static void at91_periphclk_reset(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	reg = at91_sys_read(AT91_PMC_PCSR);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(clock_list); i++) {</div><div class='add'>+		struct clk	*clk = clock_list[i];</div><div class='add'>+</div><div class='add'>+		if (clk-&gt;mode != pmc_periph_mode)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (clk-&gt;users &gt; 0)</div><div class='add'>+			reg &amp;= ~clk-&gt;pmc_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_PMC_PCDR, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int __init at91_clock_init(unsigned long main_clock)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned tmp, freq, mckr;</div><div class='hunk'>@@ -626,7 +697,6 @@ int __init at91_clock_init(unsigned long main_clock)</div><div class='ctx'> 	 */</div><div class='ctx'> 	at91_pllb_usb_init = at91_pll_calc(main_clock, 48000000 * 2) | AT91_PMC_USB96M;</div><div class='ctx'> 	pllb.rate_hz = at91_pll_rate(&amp;pllb, main_clock, at91_pllb_usb_init);</div><div class='del'>-	at91_sys_write(AT91_PMC_PCDR, (1 &lt;&lt; AT91_ID_UHP) | (1 &lt;&lt; AT91_ID_UDP));</div><div class='ctx'> 	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_UHP | AT91_PMC_UDP);</div><div class='ctx'> 	at91_sys_write(AT91_CKGR_PLLBR, 0);</div><div class='ctx'> 	at91_sys_write(AT91_PMC_SCER, AT91_PMC_MCKUDP);</div><div class='hunk'>@@ -640,19 +710,18 @@ int __init at91_clock_init(unsigned long main_clock)</div><div class='ctx'> 	 */</div><div class='ctx'> 	mckr = at91_sys_read(AT91_PMC_MCKR);</div><div class='ctx'> 	mck.parent = clock_list[mckr &amp; AT91_PMC_CSS];</div><div class='del'>-	mck.parent-&gt;users++;</div><div class='ctx'> 	freq = mck.parent-&gt;rate_hz;</div><div class='ctx'> 	freq /= (1 &lt;&lt; ((mckr &gt;&gt; 2) &amp; 3));		/* prescale */</div><div class='ctx'> 	mck.rate_hz = freq / (1 + ((mckr &gt;&gt; 8) &amp; 3));	/* mdiv */</div><div class='ctx'> </div><div class='add'>+	/* MCK and CPU clock are "always on" */</div><div class='add'>+	clk_enable(&amp;mck);</div><div class='add'>+</div><div class='ctx'> 	printk("Clocks: CPU %u MHz, master %u MHz, main %u.%03u MHz\n",</div><div class='ctx'> 		freq / 1000000, (unsigned) mck.rate_hz / 1000000,</div><div class='ctx'> 		(unsigned) main_clock / 1000000,</div><div class='ctx'> 		((unsigned) main_clock % 1000000) / 1000);</div><div class='ctx'> </div><div class='del'>-	/* FIXME get rid of master_clock global */</div><div class='del'>-	at91_master_clock = mck.rate_hz;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS</div><div class='ctx'> 	/* establish PCK0..PCK3 parentage */</div><div class='ctx'> 	for (tmp = 0; tmp &lt; ARRAY_SIZE(clock_list); tmp++) {</div><div class='hunk'>@@ -663,19 +732,28 @@ int __init at91_clock_init(unsigned long main_clock)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		pckr = at91_sys_read(AT91_PMC_PCKR(clk-&gt;id));</div><div class='del'>-		parent = clock_list[pckr &amp; 3];</div><div class='add'>+		parent = clock_list[pckr &amp; AT91_PMC_CSS];</div><div class='ctx'> 		clk-&gt;parent = parent;</div><div class='ctx'> 		clk-&gt;rate_hz = parent-&gt;rate_hz / (1 &lt;&lt; ((pckr &gt;&gt; 2) &amp; 3));</div><div class='add'>+</div><div class='add'>+		if (clk-&gt;users == 0) {</div><div class='add'>+			/* not being used, so switch it off */</div><div class='add'>+			at91_sys_write(AT91_PMC_SCDR, clk-&gt;pmc_mask);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	/* disable unused clocks */</div><div class='add'>+	/* disable all programmable clocks */</div><div class='ctx'> 	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK0 | AT91_PMC_PCK1 | AT91_PMC_PCK2 | AT91_PMC_PCK3);</div><div class='del'>-#endif	/* CONFIG_AT91_PROGRAMMABLE_CLOCKS */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	/* FIXME several unused clocks may still be active...  provide</div><div class='del'>-	 * a CONFIG option to turn off all unused clocks at some point</div><div class='del'>-	 * before driver init starts.</div><div class='del'>-	 */</div><div class='add'>+	/* enable the PIO clocks */</div><div class='add'>+	clk_enable(&amp;pioA_clk);</div><div class='add'>+	clk_enable(&amp;pioB_clk);</div><div class='add'>+	clk_enable(&amp;pioC_clk);</div><div class='add'>+	clk_enable(&amp;pioD_clk);</div><div class='add'>+</div><div class='add'>+	/* disable all other unused peripheral clocks */</div><div class='add'>+	at91_periphclk_reset();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c<br/>index bfe47bd6e50c..4352acb88178 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/devices.c</a></div><div class='hunk'>@@ -13,12 +13,17 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/pio.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+#define SZ_512	0x00000200</div><div class='add'>+#define SZ_256	0x00000100</div><div class='add'>+#define SZ_16	0x00000010</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  USB Host</div><div class='hunk'>@@ -28,7 +33,7 @@</div><div class='ctx'> static u64 ohci_dmamask = 0xffffffffUL;</div><div class='ctx'> static struct at91_usbh_data usbh_data;</div><div class='ctx'> </div><div class='del'>-static struct resource at91_usbh_resource[] = {</div><div class='add'>+static struct resource at91_usbh_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= AT91_UHP_BASE,</div><div class='ctx'> 		.end	= AT91_UHP_BASE + SZ_1M - 1,</div><div class='hunk'>@@ -42,15 +47,15 @@ static struct resource at91_usbh_resource[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device at91rm9200_usbh_device = {</div><div class='del'>-	.name		= "at91rm9200-ohci",</div><div class='add'>+	.name		= "at91_ohci",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 				.dma_mask		= &amp;ohci_dmamask,</div><div class='ctx'> 				.coherent_dma_mask	= 0xffffffff,</div><div class='ctx'> 				.platform_data		= &amp;usbh_data,</div><div class='ctx'> 	},</div><div class='del'>-	.resource	= at91_usbh_resource,</div><div class='del'>-	.num_resources	= ARRAY_SIZE(at91_usbh_resource),</div><div class='add'>+	.resource	= at91_usbh_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(at91_usbh_resources),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init at91_add_device_usbh(struct at91_usbh_data *data)</div><div class='hunk'>@@ -74,11 +79,16 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}</div><div class='ctx'> static struct at91_udc_data udc_data;</div><div class='ctx'> </div><div class='ctx'> static struct resource at91_udc_resources[] = {</div><div class='del'>-	{</div><div class='add'>+	[0] = {</div><div class='ctx'> 		.start	= AT91_BASE_UDP,</div><div class='ctx'> 		.end	= AT91_BASE_UDP + SZ_16K - 1,</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='del'>-	}</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_UDP,</div><div class='add'>+		.end	= AT91_ID_UDP,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device at91rm9200_udc_device = {</div><div class='hunk'>@@ -100,10 +110,8 @@ void __init at91_add_device_udc(struct at91_udc_data *data)</div><div class='ctx'> 		at91_set_gpio_input(data-&gt;vbus_pin, 0);</div><div class='ctx'> 		at91_set_deglitch(data-&gt;vbus_pin, 1);</div><div class='ctx'> 	}</div><div class='del'>-	if (data-&gt;pullup_pin) {</div><div class='add'>+	if (data-&gt;pullup_pin)</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;pullup_pin, 0);</div><div class='del'>-		at91_set_multi_drive(data-&gt;pullup_pin, 1);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	udc_data = *data;</div><div class='ctx'> 	platform_device_register(&amp;at91rm9200_udc_device);</div><div class='hunk'>@@ -197,7 +205,7 @@ static struct at91_cf_data cf_data;</div><div class='ctx'> static struct resource at91_cf_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= AT91_CF_BASE,</div><div class='del'>-		/* ties up CS4, CS5, and CS6 */</div><div class='add'>+		/* ties up CS4, CS5 and CS6 */</div><div class='ctx'> 		.end	= AT91_CF_BASE + (0x30000000 - 1),</div><div class='ctx'> 		.flags	= IORESOURCE_MEM | IORESOURCE_MEM_8AND16BIT,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -231,6 +239,12 @@ void __init at91_add_device_cf(struct at91_cf_data *data)</div><div class='ctx'> 		at91_set_gpio_output(data-&gt;vcc_pin, 0);</div><div class='ctx'> 	at91_set_gpio_output(data-&gt;rst_pin, 0);</div><div class='ctx'> </div><div class='add'>+	/* force poweron defaults for these pins ... */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PC9, 0);	/* A25/CFRNW */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PC10, 0);	/* NCS4/CFCS */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PC11, 0);	/* NCS5/CFCE1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PC12, 0);	/* NCS6/CFCE2 */</div><div class='add'>+</div><div class='ctx'> 	cf_data = *data;</div><div class='ctx'> 	platform_device_register(&amp;at91rm9200_cf_device);</div><div class='ctx'> }</div><div class='hunk'>@@ -319,6 +333,7 @@ void __init at91_add_device_mmc(struct at91_mmc_data *data)</div><div class='ctx'> void __init at91_add_device_mmc(struct at91_mmc_data *data) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='ctx'>  *  NAND / SmartMedia</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='hunk'>@@ -400,22 +415,110 @@ void __init at91_add_device_i2c(void) {}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------</div><div class='add'>+ *  SPI</div><div class='add'>+ * -------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)</div><div class='add'>+static u64 spi_dmamask = 0xffffffffUL;</div><div class='add'>+</div><div class='add'>+static struct resource at91_spi_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91_BASE_SPI,</div><div class='add'>+		.end	= AT91_BASE_SPI + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_SPI,</div><div class='add'>+		.end	= AT91_ID_SPI,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91rm9200_spi_device = {</div><div class='add'>+	.name		= "at91_spi",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= &amp;spi_dmamask,</div><div class='add'>+		.coherent_dma_mask	= 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.resource	= at91_spi_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(at91_spi_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned at91_spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 };</div><div class='add'>+</div><div class='add'>+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long cs_pin;</div><div class='add'>+</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA0, 0);	/* MISO */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA1, 0);	/* MOSI */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA2, 0);	/* SPCK */</div><div class='add'>+</div><div class='add'>+	/* Enable SPI chip-selects */</div><div class='add'>+	for (i = 0; i &lt; nr_devices; i++) {</div><div class='add'>+		if (devices[i].controller_data)</div><div class='add'>+			cs_pin = (unsigned long) devices[i].controller_data;</div><div class='add'>+		else</div><div class='add'>+			cs_pin = at91_spi_standard_cs[devices[i].chip_select];</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SPI_AT91_MANUAL_CS</div><div class='add'>+		at91_set_gpio_output(cs_pin, 1);</div><div class='add'>+#else</div><div class='add'>+		at91_set_A_periph(cs_pin, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		/* pass chip-select pin to driver */</div><div class='add'>+		devices[i].controller_data = (void *) cs_pin;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spi_register_board_info(devices, nr_devices);</div><div class='add'>+	at91_clock_associate("spi0_clk", &amp;at91rm9200_spi_device.dev, "spi");</div><div class='add'>+	platform_device_register(&amp;at91rm9200_spi_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------</div><div class='ctx'>  *  RTC</div><div class='ctx'>  * -------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_AT91_RTC) || defined(CONFIG_AT91_RTC_MODULE)</div><div class='add'>+#if defined(CONFIG_RTC_DRV_AT91) || defined(CONFIG_RTC_DRV_AT91_MODULE)</div><div class='ctx'> static struct platform_device at91rm9200_rtc_device = {</div><div class='ctx'> 	.name		= "at91_rtc",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.num_resources	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init at91_add_device_rtc(void)</div><div class='add'>+static void __init at91_add_device_rtc(void)</div><div class='ctx'> {</div><div class='ctx'> 	platform_device_register(&amp;at91rm9200_rtc_device);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void __init at91_add_device_rtc(void) {}</div><div class='add'>+static void __init at91_add_device_rtc(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------</div><div class='add'>+ *  Watchdog</div><div class='add'>+ * -------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_AT91_WATCHDOG) || defined(CONFIG_AT91_WATCHDOG_MODULE)</div><div class='add'>+static struct platform_device at91rm9200_wdt_device = {</div><div class='add'>+	.name		= "at91_wdt",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init at91_add_device_watchdog(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;at91rm9200_wdt_device);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void __init at91_add_device_watchdog(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -429,13 +532,281 @@ u8 at91_leds_timer;</div><div class='ctx'> </div><div class='ctx'> void __init at91_init_leds(u8 cpu_led, u8 timer_led)</div><div class='ctx'> {</div><div class='del'>-	at91_leds_cpu   = cpu_led;</div><div class='del'>-	at91_leds_timer = timer_led;</div><div class='add'>+	at91_leds_cpu	= cpu_led;</div><div class='add'>+	at91_leds_timer	= timer_led;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #else</div><div class='ctx'> void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* --------------------------------------------------------------------</div><div class='add'>+ *  UART</div><div class='add'>+ * -------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_AT91)</div><div class='add'>+static struct resource dbgu_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91_VA_BASE_SYS + AT91_DBGU,</div><div class='add'>+		.end	= AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_SYS,</div><div class='add'>+		.end	= AT91_ID_SYS,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_uart_data dbgu_data = {</div><div class='add'>+	.use_dma_tx	= 0,</div><div class='add'>+	.use_dma_rx	= 0,		/* DBGU not capable of receive DMA */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91rm9200_dbgu_device = {</div><div class='add'>+	.name		= "at91_usart",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+				.platform_data	= &amp;dbgu_data,</div><div class='add'>+				.coherent_dma_mask = 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.resource	= dbgu_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(dbgu_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void configure_dbgu_pins(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA30, 0);		/* DRXD */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA31, 1);		/* DTXD */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource uart0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91_BASE_US0,</div><div class='add'>+		.end	= AT91_BASE_US0 + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_US0,</div><div class='add'>+		.end	= AT91_ID_US0,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_uart_data uart0_data = {</div><div class='add'>+	.use_dma_tx	= 1,</div><div class='add'>+	.use_dma_rx	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91rm9200_uart0_device = {</div><div class='add'>+	.name		= "at91_usart",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+				.platform_data	= &amp;uart0_data,</div><div class='add'>+				.coherent_dma_mask = 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.resource	= uart0_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(uart0_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void configure_usart0_pins(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA17, 1);		/* TXD0 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA18, 0);		/* RXD0 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA20, 0);		/* CTS0 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * AT91RM9200 Errata #39 - RTS0 is not internally connected to PA21.</div><div class='add'>+	 *  We need to drive the pin manually.  Default is off (RTS is active low).</div><div class='add'>+	 */</div><div class='add'>+	at91_set_gpio_output(AT91_PIN_PA21, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource uart1_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91_BASE_US1,</div><div class='add'>+		.end	= AT91_BASE_US1 + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_US1,</div><div class='add'>+		.end	= AT91_ID_US1,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_uart_data uart1_data = {</div><div class='add'>+	.use_dma_tx	= 1,</div><div class='add'>+	.use_dma_rx	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91rm9200_uart1_device = {</div><div class='add'>+	.name		= "at91_usart",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.dev		= {</div><div class='add'>+				.platform_data	= &amp;uart1_data,</div><div class='add'>+				.coherent_dma_mask = 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.resource	= uart1_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(uart1_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void configure_usart1_pins(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB18, 0);		/* RI1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB19, 0);		/* DTR1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB20, 1);		/* TXD1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB21, 0);		/* RXD1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB23, 0);		/* DCD1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB24, 0);		/* CTS1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB25, 0);		/* DSR1 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PB26, 0);		/* RTS1 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource uart2_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91_BASE_US2,</div><div class='add'>+		.end	= AT91_BASE_US2 + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_US2,</div><div class='add'>+		.end	= AT91_ID_US2,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_uart_data uart2_data = {</div><div class='add'>+	.use_dma_tx	= 1,</div><div class='add'>+	.use_dma_rx	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91rm9200_uart2_device = {</div><div class='add'>+	.name		= "at91_usart",</div><div class='add'>+	.id		= 3,</div><div class='add'>+	.dev		= {</div><div class='add'>+				.platform_data	= &amp;uart2_data,</div><div class='add'>+				.coherent_dma_mask = 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.resource	= uart2_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(uart2_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void configure_usart2_pins(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA22, 0);		/* RXD2 */</div><div class='add'>+	at91_set_A_periph(AT91_PIN_PA23, 1);		/* TXD2 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource uart3_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= AT91_BASE_US3,</div><div class='add'>+		.end	= AT91_BASE_US3 + SZ_16K - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= AT91_ID_US3,</div><div class='add'>+		.end	= AT91_ID_US3,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_uart_data uart3_data = {</div><div class='add'>+	.use_dma_tx	= 1,</div><div class='add'>+	.use_dma_rx	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device at91rm9200_uart3_device = {</div><div class='add'>+	.name		= "at91_usart",</div><div class='add'>+	.id		= 4,</div><div class='add'>+	.dev		= {</div><div class='add'>+				.platform_data	= &amp;uart3_data,</div><div class='add'>+				.coherent_dma_mask = 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.resource	= uart3_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(uart3_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void configure_usart3_pins(void)</div><div class='add'>+{</div><div class='add'>+	at91_set_B_periph(AT91_PIN_PA5, 1);		/* TXD3 */</div><div class='add'>+	at91_set_B_periph(AT91_PIN_PA6, 0);		/* RXD3 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct platform_device *at91_uarts[AT91_NR_UART];	/* the UARTs to use */</div><div class='add'>+struct platform_device *at91_default_console_device;	/* the serial console device */</div><div class='add'>+</div><div class='add'>+void __init at91_init_serial(struct at91_uart_config *config)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Fill in list of supported UARTs */</div><div class='add'>+	for (i = 0; i &lt; config-&gt;nr_tty; i++) {</div><div class='add'>+		switch (config-&gt;tty_map[i]) {</div><div class='add'>+			case 0:</div><div class='add'>+				configure_usart0_pins();</div><div class='add'>+				at91_uarts[i] = &amp;at91rm9200_uart0_device;</div><div class='add'>+				at91_clock_associate("usart0_clk", &amp;at91rm9200_uart0_device.dev, "usart");</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				configure_usart1_pins();</div><div class='add'>+				at91_uarts[i] = &amp;at91rm9200_uart1_device;</div><div class='add'>+				at91_clock_associate("usart1_clk", &amp;at91rm9200_uart1_device.dev, "usart");</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				configure_usart2_pins();</div><div class='add'>+				at91_uarts[i] = &amp;at91rm9200_uart2_device;</div><div class='add'>+				at91_clock_associate("usart2_clk", &amp;at91rm9200_uart2_device.dev, "usart");</div><div class='add'>+				break;</div><div class='add'>+			case 3:</div><div class='add'>+				configure_usart3_pins();</div><div class='add'>+				at91_uarts[i] = &amp;at91rm9200_uart3_device;</div><div class='add'>+				at91_clock_associate("usart3_clk", &amp;at91rm9200_uart3_device.dev, "usart");</div><div class='add'>+				break;</div><div class='add'>+			case 4:</div><div class='add'>+				configure_dbgu_pins();</div><div class='add'>+				at91_uarts[i] = &amp;at91rm9200_dbgu_device;</div><div class='add'>+				at91_clock_associate("mck", &amp;at91rm9200_dbgu_device.dev, "usart");</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		at91_uarts[i]-&gt;id = i;		/* update ID number to mapped ID */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set serial console device */</div><div class='add'>+	if (config-&gt;console_tty &lt; AT91_NR_UART)</div><div class='add'>+		at91_default_console_device = at91_uarts[config-&gt;console_tty];</div><div class='add'>+	if (!at91_default_console_device)</div><div class='add'>+		printk(KERN_INFO "AT91: No default serial console defined.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init at91_add_device_serial(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='add'>+		if (at91_uarts[i])</div><div class='add'>+			platform_device_register(at91_uarts[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+void __init at91_init_serial(struct at91_uart_config *config) {}</div><div class='add'>+void __init at91_add_device_serial(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* -------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These devices are always present and don't need any board-specific</div><div class='add'>+ * setup.</div><div class='add'>+ */</div><div class='add'>+static int __init at91_add_standard_devices(void)</div><div class='add'>+{</div><div class='add'>+	at91_add_device_rtc();</div><div class='add'>+	at91_add_device_watchdog();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(at91_add_standard_devices);</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/generic.h b/arch/arm/mach-at91rm9200/generic.h<br/>index 9bd541eba0a0..7979d8ab7e07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/generic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/generic.h</a></div><div class='hunk'>@@ -8,11 +8,24 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void at91_gpio_irq_setup(unsigned banks);</div><div class='add'>+ /* Interrupts */</div><div class='add'>+extern void __init at91rm9200_init_irq(unsigned int priority[]);</div><div class='add'>+extern void __init at91_aic_init(unsigned int priority[]);</div><div class='add'>+extern void __init at91_gpio_irq_setup(unsigned banks);</div><div class='ctx'> </div><div class='add'>+ /* Timer */</div><div class='ctx'> struct sys_timer;</div><div class='ctx'> extern struct sys_timer at91rm9200_timer;</div><div class='ctx'> </div><div class='add'>+ /* Memory Map */</div><div class='ctx'> extern void __init at91rm9200_map_io(void);</div><div class='ctx'> </div><div class='add'>+ /* Clocks */</div><div class='ctx'> extern int __init at91_clock_init(unsigned long main_clock);</div><div class='add'>+struct device;</div><div class='add'>+extern void __init at91_clock_associate(const char *id, struct device *dev, const char *func);</div><div class='add'>+</div><div class='add'>+ /* Power Management */</div><div class='add'>+extern void at91_irq_suspend(void);</div><div class='add'>+extern void at91_irq_resume(void);</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c<br/>index 5ab46274e1a3..5783c282ae7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/gpio.c</a></div><div class='hunk'>@@ -10,13 +10,14 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mach/irq.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const u32 pio_controller_offset[4] = {</div><div class='hunk'>@@ -213,6 +214,84 @@ EXPORT_SYMBOL(at91_get_gpio_value);</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static u32 wakeups[BGA_GPIO_BANKS];</div><div class='add'>+static u32 backups[BGA_GPIO_BANKS];</div><div class='add'>+</div><div class='add'>+static int gpio_irq_set_wake(unsigned pin, unsigned state)</div><div class='add'>+{</div><div class='add'>+	unsigned	mask = pin_to_mask(pin);</div><div class='add'>+</div><div class='add'>+	pin -= PIN_BASE;</div><div class='add'>+	pin /= 32;</div><div class='add'>+</div><div class='add'>+	if (unlikely(pin &gt;= BGA_GPIO_BANKS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (state)</div><div class='add'>+		wakeups[pin] |= mask;</div><div class='add'>+	else</div><div class='add'>+		wakeups[pin] &amp;= ~mask;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void at91_gpio_suspend(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BGA_GPIO_BANKS; i++) {</div><div class='add'>+		u32 pio = pio_controller_offset[i];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Note: drivers should have disabled GPIO interrupts that</div><div class='add'>+		 * aren't supposed to be wakeup sources.</div><div class='add'>+		 * But that is not much good on ARM.....  disable_irq() does</div><div class='add'>+		 * not update the hardware immediately, so the hardware mask</div><div class='add'>+		 * (IMR) has the wrong value (not current, too much is</div><div class='add'>+		 * permitted).</div><div class='add'>+		 *</div><div class='add'>+		 * Our workaround is to disable all non-wakeup IRQs ...</div><div class='add'>+		 * which is exactly what correct drivers asked for in the</div><div class='add'>+		 * first place!</div><div class='add'>+		 */</div><div class='add'>+		backups[i] = at91_sys_read(pio + PIO_IMR);</div><div class='add'>+		at91_sys_write(pio_controller_offset[i] + PIO_IDR, backups[i]);</div><div class='add'>+		at91_sys_write(pio_controller_offset[i] + PIO_IER, wakeups[i]);</div><div class='add'>+</div><div class='add'>+		if (!wakeups[i]) {</div><div class='add'>+			disable_irq_wake(AT91_ID_PIOA + i);</div><div class='add'>+			at91_sys_write(AT91_PMC_PCDR, 1 &lt;&lt; (AT91_ID_PIOA + i));</div><div class='add'>+		} else {</div><div class='add'>+			enable_irq_wake(AT91_ID_PIOA + i);</div><div class='add'>+#ifdef CONFIG_PM_DEBUG</div><div class='add'>+			printk(KERN_DEBUG "GPIO-%c may wake for %08x\n", "ABCD"[i], wakeups[i]);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void at91_gpio_resume(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BGA_GPIO_BANKS; i++) {</div><div class='add'>+		at91_sys_write(pio_controller_offset[i] + PIO_IDR, wakeups[i]);</div><div class='add'>+		at91_sys_write(pio_controller_offset[i] + PIO_IER, backups[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_PMC_PCER,</div><div class='add'>+			  (1 &lt;&lt; AT91_ID_PIOA)</div><div class='add'>+			| (1 &lt;&lt; AT91_ID_PIOB)</div><div class='add'>+			| (1 &lt;&lt; AT91_ID_PIOC)</div><div class='add'>+			| (1 &lt;&lt; AT91_ID_PIOD));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define gpio_irq_set_wake	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* Several AIC controller irqs are dispatched through this GPIO handler.</div><div class='ctx'>  * To use any AT91_PIN_* as an externally triggered IRQ, first call</div><div class='hunk'>@@ -252,6 +331,7 @@ static struct irqchip gpio_irqchip = {</div><div class='ctx'> 	.mask		= gpio_irq_mask,</div><div class='ctx'> 	.unmask		= gpio_irq_unmask,</div><div class='ctx'> 	.set_type	= gpio_irq_type,</div><div class='add'>+	.set_wake	= gpio_irq_set_wake,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='hunk'>@@ -261,21 +341,22 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs</div><div class='ctx'> 	void __iomem	*pio;</div><div class='ctx'> 	u32		isr;</div><div class='ctx'> </div><div class='del'>-	pio = desc-&gt;base;</div><div class='add'>+	pio = get_irq_chip_data(irq);</div><div class='ctx'> </div><div class='ctx'> 	/* temporarily mask (level sensitive) parent IRQ */</div><div class='ctx'> 	desc-&gt;chip-&gt;ack(irq);</div><div class='ctx'> 	for (;;) {</div><div class='add'>+		/* reading ISR acks the pending (edge triggered) GPIO interrupt */</div><div class='ctx'> 		isr = __raw_readl(pio + PIO_ISR) &amp; __raw_readl(pio + PIO_IMR);</div><div class='ctx'> 		if (!isr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		pin = (unsigned) desc-&gt;data;</div><div class='add'>+		pin = (unsigned) get_irq_data(irq);</div><div class='ctx'> 		gpio = &amp;irq_desc[pin];</div><div class='ctx'> </div><div class='ctx'> 		while (isr) {</div><div class='ctx'> 			if (isr &amp; 1) {</div><div class='del'>-				if (unlikely(gpio-&gt;disable_depth)) {</div><div class='add'>+				if (unlikely(gpio-&gt;depth)) {</div><div class='ctx'> 					/*</div><div class='ctx'> 					 * The core ARM interrupt handler lazily disables IRQs so</div><div class='ctx'> 					 * another IRQ must be generated before it actually gets</div><div class='hunk'>@@ -284,7 +365,7 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs</div><div class='ctx'> 					gpio_irq_mask(pin);</div><div class='ctx'> 				}</div><div class='ctx'> 				else</div><div class='del'>-					gpio-&gt;handle(pin, gpio, regs);</div><div class='add'>+					desc_handle_irq(pin, gpio, regs);</div><div class='ctx'> 			}</div><div class='ctx'> 			pin++;</div><div class='ctx'> 			gpio++;</div><div class='hunk'>@@ -315,15 +396,16 @@ void __init at91_gpio_irq_setup(unsigned banks)</div><div class='ctx'> 		set_irq_chipdata(id, controller);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 32; i++, pin++) {</div><div class='add'>+			/*</div><div class='add'>+			 * Can use the "simple" and not "edge" handler since it's</div><div class='add'>+			 * shorter, and the AIC handles interupts sanely.</div><div class='add'>+			 */</div><div class='ctx'> 			set_irq_chip(pin, &amp;gpio_irqchip);</div><div class='ctx'> 			set_irq_handler(pin, do_simple_IRQ);</div><div class='ctx'> 			set_irq_flags(pin, IRQF_VALID);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		set_irq_chained_handler(id, gpio_irq_handler);</div><div class='del'>-</div><div class='del'>-		/* enable the PIO peripheral clock */</div><div class='del'>-		at91_sys_write(AT91_PMC_PCER, 1 &lt;&lt; id);</div><div class='ctx'> 	}</div><div class='ctx'> 	pr_info("AT91: %d gpio irqs in %d banks\n", pin - PIN_BASE, banks);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/irq.c b/arch/arm/mach-at91rm9200/irq.c<br/>index cb62bc83a1dd..9b0911320417 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/irq.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -37,65 +36,23 @@</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The default interrupt priority levels (0 = lowest, 7 = highest).</div><div class='del'>- */</div><div class='del'>-static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {</div><div class='del'>-	7,	/* Advanced Interrupt Controller */</div><div class='del'>-	7,	/* System Peripheral */</div><div class='del'>-	0,	/* Parallel IO Controller A */</div><div class='del'>-	0,	/* Parallel IO Controller B */</div><div class='del'>-	0,	/* Parallel IO Controller C */</div><div class='del'>-	0,	/* Parallel IO Controller D */</div><div class='del'>-	6,	/* USART 0 */</div><div class='del'>-	6,	/* USART 1 */</div><div class='del'>-	6,	/* USART 2 */</div><div class='del'>-	6,	/* USART 3 */</div><div class='del'>-	0,	/* Multimedia Card Interface */</div><div class='del'>-	4,	/* USB Device Port */</div><div class='del'>-	0,	/* Two-Wire Interface */</div><div class='del'>-	6,	/* Serial Peripheral Interface */</div><div class='del'>-	5,	/* Serial Synchronous Controller */</div><div class='del'>-	5,	/* Serial Synchronous Controller */</div><div class='del'>-	5,	/* Serial Synchronous Controller */</div><div class='del'>-	0,	/* Timer Counter 0 */</div><div class='del'>-	0,	/* Timer Counter 1 */</div><div class='del'>-	0,	/* Timer Counter 2 */</div><div class='del'>-	0,	/* Timer Counter 3 */</div><div class='del'>-	0,	/* Timer Counter 4 */</div><div class='del'>-	0,	/* Timer Counter 5 */</div><div class='del'>-	3,	/* USB Host port */</div><div class='del'>-	3,	/* Ethernet MAC */</div><div class='del'>-	0,	/* Advanced Interrupt Controller */</div><div class='del'>-	0,	/* Advanced Interrupt Controller */</div><div class='del'>-	0,	/* Advanced Interrupt Controller */</div><div class='del'>-	0,	/* Advanced Interrupt Controller */</div><div class='del'>-	0,	/* Advanced Interrupt Controller */</div><div class='del'>-	0,	/* Advanced Interrupt Controller */</div><div class='del'>-	0	/* Advanced Interrupt Controller */</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void at91rm9200_mask_irq(unsigned int irq)</div><div class='add'>+static void at91_aic_mask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* Disable interrupt on AIC */</div><div class='ctx'> 	at91_sys_write(AT91_AIC_IDCR, 1 &lt;&lt; irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void at91rm9200_unmask_irq(unsigned int irq)</div><div class='add'>+static void at91_aic_unmask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* Enable interrupt on AIC */</div><div class='ctx'> 	at91_sys_write(AT91_AIC_IECR, 1 &lt;&lt; irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int at91rm9200_irq_type(unsigned irq, unsigned type)</div><div class='add'>+static int at91_aic_set_type(unsigned irq, unsigned type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int smr, srctype;</div><div class='ctx'> </div><div class='del'>-	/* change triggering only for FIQ and external IRQ0..IRQ6 */</div><div class='del'>-	if ((irq &lt; AT91_ID_IRQ0) &amp;&amp; (irq != AT91_ID_FIQ))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case IRQT_HIGH:</div><div class='ctx'> 		srctype = AT91_AIC_SRCTYPE_HIGH;</div><div class='hunk'>@@ -104,9 +61,13 @@ static int at91rm9200_irq_type(unsigned irq, unsigned type)</div><div class='ctx'> 		srctype = AT91_AIC_SRCTYPE_RISING;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IRQT_LOW:</div><div class='add'>+		if ((irq &gt; AT91_ID_FIQ) &amp;&amp; (irq &lt; AT91_ID_IRQ0))	/* only supported on external interrupts */</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		srctype = AT91_AIC_SRCTYPE_LOW;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IRQT_FALLING:</div><div class='add'>+		if ((irq &gt; AT91_ID_FIQ) &amp;&amp; (irq &lt; AT91_ID_IRQ0))	/* only supported on external interrupts */</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		srctype = AT91_AIC_SRCTYPE_FALLING;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -118,24 +79,56 @@ static int at91rm9200_irq_type(unsigned irq, unsigned type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqchip at91rm9200_irq_chip = {</div><div class='del'>-	.ack		= at91rm9200_mask_irq,</div><div class='del'>-	.mask		= at91rm9200_mask_irq,</div><div class='del'>-	.unmask		= at91rm9200_unmask_irq,</div><div class='del'>-	.set_type	= at91rm9200_irq_type,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static u32 wakeups;</div><div class='add'>+static u32 backups;</div><div class='add'>+</div><div class='add'>+static int at91_aic_set_wake(unsigned irq, unsigned value)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(irq &gt;= 32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		wakeups |= (1 &lt;&lt; irq);</div><div class='add'>+	else</div><div class='add'>+		wakeups &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void at91_irq_suspend(void)</div><div class='add'>+{</div><div class='add'>+	backups = at91_sys_read(AT91_AIC_IMR);</div><div class='add'>+	at91_sys_write(AT91_AIC_IDCR, backups);</div><div class='add'>+	at91_sys_write(AT91_AIC_IECR, wakeups);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void at91_irq_resume(void)</div><div class='add'>+{</div><div class='add'>+	at91_sys_write(AT91_AIC_IDCR, wakeups);</div><div class='add'>+	at91_sys_write(AT91_AIC_IECR, backups);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define at91_aic_set_wake	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct irqchip at91_aic_chip = {</div><div class='add'>+	.ack		= at91_aic_mask_irq,</div><div class='add'>+	.mask		= at91_aic_mask_irq,</div><div class='add'>+	.unmask		= at91_aic_unmask_irq,</div><div class='add'>+	.set_type	= at91_aic_set_type,</div><div class='add'>+	.set_wake	= at91_aic_set_wake,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the AIC interrupt controller.</div><div class='ctx'>  */</div><div class='del'>-void __init at91rm9200_init_irq(unsigned int priority[NR_AIC_IRQS])</div><div class='add'>+void __init at91_aic_init(unsigned int priority[NR_AIC_IRQS])</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	/* No priority list specified for this board -&gt; use defaults */</div><div class='del'>-	if (priority == NULL)</div><div class='del'>-		priority = at91rm9200_default_irq_priority;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The IVR is used by macro get_irqnr_and_base to read and verify.</div><div class='ctx'> 	 * The irq number is NR_AIC_IRQS when a spurious interrupt has occurred.</div><div class='hunk'>@@ -143,10 +136,10 @@ void __init at91rm9200_init_irq(unsigned int priority[NR_AIC_IRQS])</div><div class='ctx'> 	for (i = 0; i &lt; NR_AIC_IRQS; i++) {</div><div class='ctx'> 		/* Put irq number in Source Vector Register: */</div><div class='ctx'> 		at91_sys_write(AT91_AIC_SVR(i), i);</div><div class='del'>-		/* Store the Source Mode Register as defined in table above */</div><div class='add'>+		/* Active Low interrupt, with the specified priority */</div><div class='ctx'> 		at91_sys_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);</div><div class='ctx'> </div><div class='del'>-		set_irq_chip(i, &amp;at91rm9200_irq_chip);</div><div class='add'>+		set_irq_chip(i, &amp;at91_aic_chip);</div><div class='ctx'> 		set_irq_handler(i, do_level_IRQ);</div><div class='ctx'> 		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/leds.c b/arch/arm/mach-at91rm9200/leds.c<br/>index 28150e8905ba..1a333730466e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-at91rm9200/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/leds.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91rm9200/pm.c<br/>new file mode 100644<br/>index 000000000000..47e5480feb7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-at91rm9200/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-at91rm9200/pm.c</a></div><div class='hunk'>@@ -0,0 +1,225 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-at91rm9200/pm.c</div><div class='add'>+ * AT91 Power Management</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 David Brownell</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int at91_pm_valid_state(suspend_state_t state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+		case PM_SUSPEND_ON:</div><div class='add'>+		case PM_SUSPEND_STANDBY:</div><div class='add'>+		case PM_SUSPEND_MEM:</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static suspend_state_t target_state;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after processes are frozen, but before we shutdown devices.</div><div class='add'>+ */</div><div class='add'>+static int at91_pm_prepare(suspend_state_t state)</div><div class='add'>+{</div><div class='add'>+	target_state = state;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Verify that all the clocks are correct before entering</div><div class='add'>+ * slow-clock mode.</div><div class='add'>+ */</div><div class='add'>+static int at91_pm_verify_clocks(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long scsr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	scsr = at91_sys_read(AT91_PMC_SCSR);</div><div class='add'>+</div><div class='add'>+	/* USB must not be using PLLB */</div><div class='add'>+	if ((scsr &amp; (AT91_PMC_UHP | AT91_PMC_UDP)) != 0) {</div><div class='add'>+		pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS</div><div class='add'>+	/* PCK0..PCK3 must be disabled, or configured to use clk32k */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		u32 css;</div><div class='add'>+</div><div class='add'>+		if ((scsr &amp; (AT91_PMC_PCK0 &lt;&lt; i)) == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		css = at91_sys_read(AT91_PMC_PCKR(i)) &amp; AT91_PMC_CSS;</div><div class='add'>+		if (css != AT91_PMC_CSS_SLOW) {</div><div class='add'>+			pr_debug("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Call this from platform driver suspend() to see how deeply to suspend.</div><div class='add'>+ * For example, some controllers (like OHCI) need one of the PLL clocks</div><div class='add'>+ * in order to act as a wakeup source, and those are not available when</div><div class='add'>+ * going into slow clock mode.</div><div class='add'>+ *</div><div class='add'>+ * REVISIT: generalize as clk_will_be_available(clk)?  Other platforms have</div><div class='add'>+ * the very same problem (but not using at91 main_clk), and it'd be better</div><div class='add'>+ * to add one generic API rather than lots of platform-specific ones.</div><div class='add'>+ */</div><div class='add'>+int at91_suspend_entering_slow_clock(void)</div><div class='add'>+{</div><div class='add'>+	return (target_state == PM_SUSPEND_MEM);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(at91_suspend_entering_slow_clock);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void (*slow_clock)(void);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int at91_pm_enter(suspend_state_t state)</div><div class='add'>+{</div><div class='add'>+	at91_gpio_suspend();</div><div class='add'>+	at91_irq_suspend();</div><div class='add'>+</div><div class='add'>+	pr_debug("AT91: PM - wake mask %08x, pm state %d\n",</div><div class='add'>+			/* remember all the always-wake irqs */</div><div class='add'>+			(at91_sys_read(AT91_PMC_PCSR)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_FIQ)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_SYS)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ0)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ1)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ2)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ3)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ4)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ5)</div><div class='add'>+					| (1 &lt;&lt; AT91_ID_IRQ6))</div><div class='add'>+				&amp; at91_sys_read(AT91_AIC_IMR),</div><div class='add'>+			state);</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+		/*</div><div class='add'>+		 * Suspend-to-RAM is like STANDBY plus slow clock mode, so</div><div class='add'>+		 * drivers must suspend more deeply:  only the master clock</div><div class='add'>+		 * controller may be using the main oscillator.</div><div class='add'>+		 */</div><div class='add'>+		case PM_SUSPEND_MEM:</div><div class='add'>+			/*</div><div class='add'>+			 * Ensure that clocks are in a valid state.</div><div class='add'>+			 */</div><div class='add'>+			if (!at91_pm_verify_clocks())</div><div class='add'>+				goto error;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Enter slow clock mode by switching over to clk32k and</div><div class='add'>+			 * turning off the main oscillator; reverse on wakeup.</div><div class='add'>+			 */</div><div class='add'>+			if (slow_clock) {</div><div class='add'>+				slow_clock();</div><div class='add'>+				break;</div><div class='add'>+			} else {</div><div class='add'>+				/* DEVELOPMENT ONLY */</div><div class='add'>+				pr_info("AT91: PM - no slow clock mode yet ...\n");</div><div class='add'>+				/* FALLTHROUGH leaving master clock alone */</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * STANDBY mode has *all* drivers suspended; ignores irqs not</div><div class='add'>+		 * marked as 'wakeup' event sources; and reduces DRAM power.</div><div class='add'>+		 * But otherwise it's identical to PM_SUSPEND_ON:  cpu idle, and</div><div class='add'>+		 * nothing fancy done with main or cpu clocks.</div><div class='add'>+		 */</div><div class='add'>+		case PM_SUSPEND_STANDBY:</div><div class='add'>+			/*</div><div class='add'>+			 * NOTE: the Wait-for-Interrupt instruction needs to be</div><div class='add'>+			 * in icache so the SDRAM stays in self-refresh mode until</div><div class='add'>+			 * the wakeup IRQ occurs.</div><div class='add'>+			 */</div><div class='add'>+			asm("b 1f; .align 5; 1:");</div><div class='add'>+			asm("mcr p15, 0, r0, c7, c10, 4");	/* drain write buffer */</div><div class='add'>+			at91_sys_write(AT91_SDRAMC_SRR, 1);	/* self-refresh mode */</div><div class='add'>+			/* fall though to next state */</div><div class='add'>+</div><div class='add'>+		case PM_SUSPEND_ON:</div><div class='add'>+			asm("mcr p15, 0, r0, c7, c0, 4");	/* wait for interrupt */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			pr_debug("AT91: PM - bogus suspend state %d\n", state);</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("AT91: PM - wakeup %08x\n",</div><div class='add'>+			at91_sys_read(AT91_AIC_IPR) &amp; at91_sys_read(AT91_AIC_IMR));</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	target_state = PM_SUSPEND_ON;</div><div class='add'>+	at91_irq_resume();</div><div class='add'>+	at91_gpio_resume();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct pm_ops at91_pm_ops ={</div><div class='add'>+	.pm_disk_mode	= 0,</div><div class='add'>+	.valid		= at91_pm_valid_state,</div><div class='add'>+	.prepare	= at91_pm_prepare,</div><div class='add'>+	.enter		= at91_pm_enter,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at91_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	printk("AT91: Power Management\n");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_AT91_PM_SLOW_CLOCK</div><div class='add'>+	/* REVISIT allocations of SRAM should be dynamically managed.</div><div class='add'>+	 * FIQ handlers and other components will want SRAM/TCM too...</div><div class='add'>+	 */</div><div class='add'>+	slow_clock = (void *) (AT91_VA_BASE_SRAM + (3 * SZ_4K));</div><div class='add'>+	memcpy(slow_clock, at91rm9200_slow_clock, at91rm9200_slow_clock_sz);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */</div><div class='add'>+	at91_sys_write(AT91_SDRAMC_LPR, 0);</div><div class='add'>+</div><div class='add'>+	pm_set_ops(&amp;at91_pm_ops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(at91_pm_init);</div><div class='head'>diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c<br/>index ff26a85aa4ba..3792ab4f0996 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/fortunet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps711x/fortunet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/fortunet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-clps711x/fortunet.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c<br/>index 9ba45f4d5a7e..c8ecd2480c27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps711x/p720t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/p720t.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-clps711x/p720t.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c<br/>index 1a23f0dcd4b8..a071eac4a30a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps711x/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps711x/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-clps711x/time.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='hunk'>@@ -57,7 +58,7 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction clps711x_timer_irq = {</div><div class='ctx'> 	.name		= "CLPS711x Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= p720t_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c<br/>index 5b12cab0e691..92eaebdd5606 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-clps7500/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-clps7500/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-clps7500/core.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -315,7 +316,7 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction clps7500_timer_irq = {</div><div class='ctx'> 	.name		= "CLPS7500 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= clps7500_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c<br/>index 6d620d8268cc..70dd12ef3c40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ebsa110/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ebsa110/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ebsa110/core.c</a></div><div class='hunk'>@@ -199,7 +199,7 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ebsa110_timer_irq = {</div><div class='ctx'> 	.name		= "EBSA110 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= ebsa110_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig<br/>index cec5a21ca4e3..f1b740083aee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/Kconfig</a></div><div class='hunk'>@@ -2,8 +2,31 @@ if ARCH_EP93XX</div><div class='ctx'> </div><div class='ctx'> menu "Cirrus EP93xx Implementation Options"</div><div class='ctx'> </div><div class='add'>+config CRUNCH</div><div class='add'>+	bool "Support for MaverickCrunch"</div><div class='add'>+	help</div><div class='add'>+	  Enable kernel support for MaverickCrunch.</div><div class='add'>+</div><div class='ctx'> comment "EP93xx Platforms"</div><div class='ctx'> </div><div class='add'>+config MACH_EDB9302</div><div class='add'>+	bool "Support Cirrus Logic EDB9302"</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the Cirrus</div><div class='add'>+	  Logic EDB9302 Evaluation Board.</div><div class='add'>+</div><div class='add'>+config MACH_EDB9315</div><div class='add'>+	bool "Support Cirrus Logic EDB9315"</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the Cirrus</div><div class='add'>+	  Logic EDB9315 Evaluation Board.</div><div class='add'>+</div><div class='add'>+config MACH_EDB9315A</div><div class='add'>+	bool "Support Cirrus Logic EDB9315A"</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' here if you want your kernel to support the Cirrus</div><div class='add'>+	  Logic EDB9315A Evaluation Board.</div><div class='add'>+</div><div class='ctx'> config MACH_GESBC9312</div><div class='ctx'> 	bool "Support Glomation GESBC-9312-sx"</div><div class='ctx'> 	help</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile<br/>index 5393af989e94..1f5a6b0487ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/Makefile</a></div><div class='hunk'>@@ -1,10 +1,13 @@</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='del'>-obj-y			:= core.o</div><div class='add'>+obj-y			:= core.o clock.o</div><div class='ctx'> obj-m			:=</div><div class='ctx'> obj-n			:=</div><div class='ctx'> obj-			:=</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_MACH_EDB9302)	+= edb9302.o</div><div class='add'>+obj-$(CONFIG_MACH_EDB9315)	+= edb9315.o</div><div class='add'>+obj-$(CONFIG_MACH_EDB9315A)	+= edb9315a.o</div><div class='ctx'> obj-$(CONFIG_MACH_GESBC9312)	+= gesbc9312.o</div><div class='ctx'> obj-$(CONFIG_MACH_TS72XX)	+= ts72xx.o</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c<br/>new file mode 100644<br/>index 000000000000..08ad782c1649<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/clock.c</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/clock.c</div><div class='add'>+ * Clock control for Cirrus EP93xx chips.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ * your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+struct clk {</div><div class='add'>+	char		*name;</div><div class='add'>+	unsigned long	rate;</div><div class='add'>+	int		users;</div><div class='add'>+	u32		enable_reg;</div><div class='add'>+	u32		enable_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_pll1 = {</div><div class='add'>+	.name		= "pll1",</div><div class='add'>+};</div><div class='add'>+static struct clk clk_f = {</div><div class='add'>+	.name		= "fclk",</div><div class='add'>+};</div><div class='add'>+static struct clk clk_h = {</div><div class='add'>+	.name		= "hclk",</div><div class='add'>+};</div><div class='add'>+static struct clk clk_p = {</div><div class='add'>+	.name		= "pclk",</div><div class='add'>+};</div><div class='add'>+static struct clk clk_pll2 = {</div><div class='add'>+	.name		= "pll2",</div><div class='add'>+};</div><div class='add'>+static struct clk clk_usb_host = {</div><div class='add'>+	.name		= "usb_host",</div><div class='add'>+	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,</div><div class='add'>+	.enable_mask	= EP93XX_SYSCON_CLOCK_USH_EN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct clk *clocks[] = {</div><div class='add'>+	&amp;clk_pll1,</div><div class='add'>+	&amp;clk_f,</div><div class='add'>+	&amp;clk_h,</div><div class='add'>+	&amp;clk_p,</div><div class='add'>+	&amp;clk_pll2,</div><div class='add'>+	&amp;clk_usb_host,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk *clk_get(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(clocks); i++) {</div><div class='add'>+		if (!strcmp(clocks[i]-&gt;name, id))</div><div class='add'>+			return clocks[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (!clk-&gt;users++ &amp;&amp; clk-&gt;enable_reg) {</div><div class='add'>+		u32 value;</div><div class='add'>+</div><div class='add'>+		value = __raw_readl(clk-&gt;enable_reg);</div><div class='add'>+		__raw_writel(value | clk-&gt;enable_mask, clk-&gt;enable_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (!--clk-&gt;users &amp;&amp; clk-&gt;enable_reg) {</div><div class='add'>+		u32 value;</div><div class='add'>+</div><div class='add'>+		value = __raw_readl(clk-&gt;enable_reg);</div><div class='add'>+		__raw_writel(value &amp; ~clk-&gt;enable_mask, clk-&gt;enable_reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long clk_get_rate(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return clk-&gt;rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void clk_put(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static char fclk_divisors[] = { 1, 2, 4, 8, 16, 1, 1, 1 };</div><div class='add'>+static char hclk_divisors[] = { 1, 2, 4, 5, 6, 8, 16, 32 };</div><div class='add'>+static char pclk_divisors[] = { 1, 2, 4, 8 };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PLL rate = 14.7456 MHz * (X1FBD + 1) * (X2FBD + 1) / (X2IPD + 1) / 2^PS</div><div class='add'>+ */</div><div class='add'>+static unsigned long calc_pll_rate(u32 config_word)</div><div class='add'>+{</div><div class='add'>+	unsigned long long rate;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rate = 14745600;</div><div class='add'>+	rate *= ((config_word &gt;&gt; 11) &amp; 0x1f) + 1;		/* X1FBD */</div><div class='add'>+	rate *= ((config_word &gt;&gt; 5) &amp; 0x3f) + 1;		/* X2FBD */</div><div class='add'>+	do_div(rate, (config_word &amp; 0x1f) + 1);			/* X2IPD */</div><div class='add'>+	for (i = 0; i &lt; ((config_word &gt;&gt; 16) &amp; 3); i++)		/* PS */</div><div class='add'>+		rate &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	return (unsigned long)rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ep93xx_clock_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1);</div><div class='add'>+	if (!(value &amp; 0x00800000)) {			/* PLL1 bypassed?  */</div><div class='add'>+		clk_pll1.rate = 14745600;</div><div class='add'>+	} else {</div><div class='add'>+		clk_pll1.rate = calc_pll_rate(value);</div><div class='add'>+	}</div><div class='add'>+	clk_f.rate = clk_pll1.rate / fclk_divisors[(value &gt;&gt; 25) &amp; 0x7];</div><div class='add'>+	clk_h.rate = clk_pll1.rate / hclk_divisors[(value &gt;&gt; 20) &amp; 0x7];</div><div class='add'>+	clk_p.rate = clk_h.rate / pclk_divisors[(value &gt;&gt; 18) &amp; 0x3];</div><div class='add'>+</div><div class='add'>+	value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2);</div><div class='add'>+	if (!(value &amp; 0x00080000)) {			/* PLL2 bypassed?  */</div><div class='add'>+		clk_pll2.rate = 14745600;</div><div class='add'>+	} else if (value &amp; 0x00040000) {		/* PLL2 enabled?  */</div><div class='add'>+		clk_pll2.rate = calc_pll_rate(value);</div><div class='add'>+	} else {</div><div class='add'>+		clk_pll2.rate = 0;</div><div class='add'>+	}</div><div class='add'>+	clk_usb_host.rate = clk_pll2.rate / (((value &gt;&gt; 28) &amp; 0xf) + 1);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "ep93xx: PLL1 running at %ld MHz, PLL2 at %ld MHz\n",</div><div class='add'>+		clk_pll1.rate / 1000000, clk_pll2.rate / 1000000);</div><div class='add'>+	printk(KERN_INFO "ep93xx: FCLK %ld MHz, HCLK %ld MHz, PCLK %ld MHz\n",</div><div class='add'>+		clk_f.rate / 1000000, clk_h.rate / 1000000,</div><div class='add'>+		clk_p.rate / 1000000);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c<br/>index dcd417625389..a87a784b9201 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/core.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -103,7 +102,8 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	write_seqlock(&amp;xtime_lock);</div><div class='ctx'> </div><div class='ctx'> 	__raw_writel(1, EP93XX_TIMER1_CLEAR);</div><div class='del'>-	while (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time</div><div class='add'>+	while ((signed long)</div><div class='add'>+		(__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time)</div><div class='ctx'> 						&gt;= TIMER4_TICKS_PER_JIFFY) {</div><div class='ctx'> 		last_jiffy_time += TIMER4_TICKS_PER_JIFFY;</div><div class='ctx'> 		timer_tick(regs);</div><div class='hunk'>@@ -116,7 +116,7 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ep93xx_timer_irq = {</div><div class='ctx'> 	.name		= "ep93xx timer",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= ep93xx_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,7 @@ static void __init ep93xx_timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Enable periodic HZ timer.  */</div><div class='ctx'> 	__raw_writel(0x48, EP93XX_TIMER1_CONTROL);</div><div class='del'>-	__raw_writel((508000 / HZ) - 1, EP93XX_TIMER1_LOAD);</div><div class='add'>+	__raw_writel((508469 / HZ) - 1, EP93XX_TIMER1_LOAD);</div><div class='ctx'> 	__raw_writel(0xc8, EP93XX_TIMER1_CONTROL);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable lost jiffy timer.  */</div><div class='hunk'>@@ -432,10 +432,37 @@ static struct platform_device ep93xx_rtc_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static struct resource ep93xx_ohci_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= EP93XX_USB_PHYS_BASE,</div><div class='add'>+		.end	= EP93XX_USB_PHYS_BASE + 0x0fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= IRQ_EP93XX_USB,</div><div class='add'>+		.end	= IRQ_EP93XX_USB,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ep93xx_ohci_device = {</div><div class='add'>+	.name		= "ep93xx-ohci",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.dma_mask		= (void *)0xffffffff,</div><div class='add'>+		.coherent_dma_mask	= 0xffffffff,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(ep93xx_ohci_resources),</div><div class='add'>+	.resource	= ep93xx_ohci_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void __init ep93xx_init_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int v;</div><div class='ctx'> </div><div class='add'>+	ep93xx_clock_init();</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disallow access to MaverickCrunch initially.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -449,4 +476,5 @@ void __init ep93xx_init_devices(void)</div><div class='ctx'> 	amba_device_register(&amp;uart3_device, &amp;iomem_resource);</div><div class='ctx'> </div><div class='ctx'> 	platform_device_register(&amp;ep93xx_rtc_device);</div><div class='add'>+	platform_device_register(&amp;ep93xx_ohci_device);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c<br/>new file mode 100644<br/>index 000000000000..62a8efd23256<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9302.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/edb9302.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/edb9302.c</div><div class='add'>+ * Cirrus Logic EDB9302 support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 George Kashperko &lt;george@chas.com.ua&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ * your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data edb9302_flash_data = {</div><div class='add'>+	.width		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource edb9302_flash_resource = {</div><div class='add'>+	.start		= 0x60000000,</div><div class='add'>+	.end		= 0x60ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device edb9302_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;edb9302_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;edb9302_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init edb9302_init_machine(void)</div><div class='add'>+{</div><div class='add'>+	ep93xx_init_devices();</div><div class='add'>+	platform_device_register(&amp;edb9302_flash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")</div><div class='add'>+	/* Maintainer: George Kashperko &lt;george@chas.com.ua&gt; */</div><div class='add'>+	.phys_io	= EP93XX_APB_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x00000100,</div><div class='add'>+	.map_io		= ep93xx_map_io,</div><div class='add'>+	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.timer		= &amp;ep93xx_timer,</div><div class='add'>+	.init_machine	= edb9302_init_machine,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c<br/>new file mode 100644<br/>index 000000000000..ef7482faad81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9315.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/edb9315.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/edb9315.c</div><div class='add'>+ * Cirrus Logic EDB9315 support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ * your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data edb9315_flash_data = {</div><div class='add'>+	.width		= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource edb9315_flash_resource = {</div><div class='add'>+	.start		= 0x60000000,</div><div class='add'>+	.end		= 0x61ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device edb9315_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;edb9315_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;edb9315_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init edb9315_init_machine(void)</div><div class='add'>+{</div><div class='add'>+	ep93xx_init_devices();</div><div class='add'>+	platform_device_register(&amp;edb9315_flash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")</div><div class='add'>+	/* Maintainer: Lennert Buytenhek &lt;buytenh@wantstofly.org&gt; */</div><div class='add'>+	.phys_io	= EP93XX_APB_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x00000100,</div><div class='add'>+	.map_io		= ep93xx_map_io,</div><div class='add'>+	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.timer		= &amp;ep93xx_timer,</div><div class='add'>+	.init_machine	= edb9315_init_machine,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c<br/>new file mode 100644<br/>index 000000000000..bfefdaa8f794<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/edb9315a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/edb9315a.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-ep93xx/edb9315a.c</div><div class='add'>+ * Cirrus Logic EDB9315A support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ * your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+</div><div class='add'>+static struct physmap_flash_data edb9315a_flash_data = {</div><div class='add'>+	.width		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource edb9315a_flash_resource = {</div><div class='add'>+	.start		= 0x60000000,</div><div class='add'>+	.end		= 0x60ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device edb9315a_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;edb9315a_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;edb9315a_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init edb9315a_init_machine(void)</div><div class='add'>+{</div><div class='add'>+	ep93xx_init_devices();</div><div class='add'>+	platform_device_register(&amp;edb9315a_flash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")</div><div class='add'>+	/* Maintainer: Lennert Buytenhek &lt;buytenh@wantstofly.org&gt; */</div><div class='add'>+	.phys_io	= EP93XX_APB_PHYS_BASE,</div><div class='add'>+	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0xc0000100,</div><div class='add'>+	.map_io		= ep93xx_map_io,</div><div class='add'>+	.init_irq	= ep93xx_init_irq,</div><div class='add'>+	.timer		= &amp;ep93xx_timer,</div><div class='add'>+	.init_machine	= edb9315a_init_machine,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c<br/>index d18fcb1a2f1b..e760fd4f3655 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/gesbc9312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/gesbc9312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/gesbc9312.c</a></div><div class='hunk'>@@ -10,22 +10,43 @@</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> </div><div class='add'>+static struct physmap_flash_data gesbc9312_flash_data = {</div><div class='add'>+	.width		= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource gesbc9312_flash_resource = {</div><div class='add'>+	.start		= 0x60000000,</div><div class='add'>+	.end		= 0x607fffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device gesbc9312_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;gesbc9312_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;gesbc9312_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init gesbc9312_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='del'>-	physmap_configure(0x60000000, 0x00800000, 4, NULL);</div><div class='add'>+	platform_device_register(&amp;gesbc9312_flash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")</div><div class='head'>diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c<br/>index 9be01b0c3f48..df315f2e9beb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ep93xx/ts72xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ep93xx/ts72xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ep93xx/ts72xx.c</a></div><div class='hunk'>@@ -10,12 +10,12 @@</div><div class='ctx'>  * your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/m48t86.h&gt;</div><div class='hunk'>@@ -111,21 +111,41 @@ static void __init ts72xx_map_io(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char ts72xx_rtc_readb(unsigned long addr)</div><div class='add'>+static struct physmap_flash_data ts72xx_flash_data = {</div><div class='add'>+	.width		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource ts72xx_flash_resource = {</div><div class='add'>+	.start		= TS72XX_NOR_PHYS_BASE,</div><div class='add'>+	.end		= TS72XX_NOR_PHYS_BASE + 0x00ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ts72xx_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;ts72xx_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;ts72xx_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned char ts72xx_rtc_readbyte(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);</div><div class='ctx'> 	return __raw_readb(TS72XX_RTC_DATA_VIRT_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ts72xx_rtc_writeb(unsigned char value, unsigned long addr)</div><div class='add'>+static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	__raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);</div><div class='ctx'> 	__raw_writeb(value, TS72XX_RTC_DATA_VIRT_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct m48t86_ops ts72xx_rtc_ops = {</div><div class='del'>-	.readb			= ts72xx_rtc_readb,</div><div class='del'>-	.writeb			= ts72xx_rtc_writeb,</div><div class='add'>+	.readbyte		= ts72xx_rtc_readbyte,</div><div class='add'>+	.writebyte		= ts72xx_rtc_writebyte,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device ts72xx_rtc_device = {</div><div class='hunk'>@@ -141,7 +161,7 @@ static void __init ts72xx_init_machine(void)</div><div class='ctx'> {</div><div class='ctx'> 	ep93xx_init_devices();</div><div class='ctx'> 	if (board_is_ts7200())</div><div class='del'>-		physmap_configure(TS72XX_NOR_PHYS_BASE, 0x01000000, 1, NULL);</div><div class='add'>+		platform_device_register(&amp;ts72xx_flash);</div><div class='ctx'> 	platform_device_register(&amp;ts72xx_rtc_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c<br/>index bbe6e4a0bf6a..af900f4755a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/common.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c<br/>index 14a62d6008fe..2af610811ca4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dc21285-timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/dc21285-timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dc21285-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/dc21285-timer.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -43,7 +44,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static struct irqaction footbridge_timer_irq = {</div><div class='ctx'> 	.name		= "Timer1 timer tick",</div><div class='ctx'> 	.handler	= timer1_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c<br/>index 5dace2597838..607ed1f5b3f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dc21285.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/dc21285.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dc21285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/dc21285.c</a></div><div class='hunk'>@@ -332,15 +332,15 @@ void __init dc21285_preinit(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We don't care if these fail.</div><div class='ctx'> 	 */</div><div class='del'>-	request_irq(IRQ_PCI_SERR, dc21285_serr_irq, SA_INTERRUPT,</div><div class='add'>+	request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED,</div><div class='ctx'> 		    "PCI system error", &amp;serr_timer);</div><div class='del'>-	request_irq(IRQ_PCI_PERR, dc21285_parity_irq, SA_INTERRUPT,</div><div class='add'>+	request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED,</div><div class='ctx'> 		    "PCI parity error", &amp;perr_timer);</div><div class='del'>-	request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, SA_INTERRUPT,</div><div class='add'>+	request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED,</div><div class='ctx'> 		    "PCI abort", NULL);</div><div class='del'>-	request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, SA_INTERRUPT,</div><div class='add'>+	request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED,</div><div class='ctx'> 		    "Discard timer", NULL);</div><div class='del'>-	request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, SA_INTERRUPT,</div><div class='add'>+	request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED,</div><div class='ctx'> 		    "PCI data parity", NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (cfn_mode) {</div><div class='head'>diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c<br/>index 7a54578b51af..1f9b09b8ed88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/dma.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *   17-Mar-1999 RMK	Allow any EBSA285-like architecture to have</div><div class='ctx'>  *			ISA DMA controllers.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c<br/>index 2c7c3630401b..a64e22226515 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/ebsa285-leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/ebsa285-leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/ebsa285-leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/ebsa285-leds.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Changelog:</div><div class='ctx'>  *   02-05-1999	RMK	Various cleanups</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c<br/>index e1c43b331d64..87448c2d6baa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/isa-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/isa-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/isa-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/isa-irq.c</a></div><div class='hunk'>@@ -98,9 +98,22 @@ isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)</div><div class='ctx'> 	desc_handle_irq(isa_irq, desc, regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", };</div><div class='del'>-static struct resource pic1_resource = { "pic1", 0x20, 0x3f };</div><div class='del'>-static struct resource pic2_resource = { "pic2", 0xa0, 0xbf };</div><div class='add'>+static struct irqaction irq_cascade = {</div><div class='add'>+	.handler = no_action,</div><div class='add'>+	.name = "cascade",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pic1_resource = {</div><div class='add'>+	.name	= "pic1",</div><div class='add'>+	.start	= 0x20,</div><div class='add'>+	.end	= 0x3f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pic2_resource = {</div><div class='add'>+	.name	= "pic2",</div><div class='add'>+	.start	= 0xa0,</div><div class='add'>+	.end	= 0xbf,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> void __init isa_init_irq(unsigned int host_irq)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c<br/>index c1d74f7ab669..c4810a40c8e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/isa-timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/isa-timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/isa-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/isa-timer.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -72,7 +73,7 @@ isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static struct irqaction isa_timer_irq = {</div><div class='ctx'> 	.name		= "ISA timer tick",</div><div class='ctx'> 	.handler	= isa_timer_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init isa_timer_init(void)</div><div class='head'>diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c<br/>index 229bf0585e40..a1f381c64a30 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-hw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/netwinder-hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/netwinder-hw.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998, 1999 Russell King, Phil Blundell</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c<br/>index 7451fc07b85a..8e9cac5a213b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-footbridge/netwinder-leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-footbridge/netwinder-leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-footbridge/netwinder-leds.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Changelog:</div><div class='ctx'>  *   02-05-1999	RMK	Various cleanups</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c<br/>index af9e4a5d5ea7..a9a8255a3a03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7201.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/cpu-h7201.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7201.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-h720x/cpu-h7201.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction h7201_timer_irq = {</div><div class='ctx'> 	.name		= "h7201 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= h7201_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c<br/>index a4a7c0125d03..da678d163fd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7202.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/cpu-h7202.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/cpu-h7202.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-h720x/cpu-h7202.c</a></div><div class='hunk'>@@ -171,7 +171,7 @@ static struct irqchip h7202_timerx_chip = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction h7202_timer_irq = {</div><div class='ctx'> 	.name		= "h7202 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= h7202_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c<br/>index 193f968edac3..407cd4c0aa8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7201-eval.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/h7201-eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7201-eval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-h720x/h7201-eval.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c<br/>index 36266896979c..bf2acdce62e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7202-eval.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-h720x/h7202-eval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-h720x/h7202-eval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-h720x/h7202-eval.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-imx/dma.c b/arch/arm/mach-imx/dma.c<br/>index 4ca51dcf13ac..36578871ecc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-imx/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-imx/dma.c</a></div><div class='hunk'>@@ -15,6 +15,9 @@</div><div class='ctx'>  *             Changed to support scatter gather DMA</div><div class='ctx'>  *             by taking Russell's code from RiscPC</div><div class='ctx'>  *</div><div class='add'>+ *  2006-05-31 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *             Corrected error handling code.</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='hunk'>@@ -277,7 +280,7 @@ imx_dma_setup_sg(imx_dmach_t dma_ch,</div><div class='ctx'> int</div><div class='ctx'> imx_dma_setup_handlers(imx_dmach_t dma_ch,</div><div class='ctx'> 		       void (*irq_handler) (int, void *, struct pt_regs *),</div><div class='del'>-		       void (*err_handler) (int, void *, struct pt_regs *),</div><div class='add'>+		       void (*err_handler) (int, void *, struct pt_regs *, int),</div><div class='ctx'> 		       void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct imx_dma_channel *imxdma = &amp;imx_dma_channels[dma_ch];</div><div class='hunk'>@@ -463,43 +466,53 @@ static irqreturn_t dma_err_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	int i, disr = DISR;</div><div class='ctx'> 	struct imx_dma_channel *channel;</div><div class='ctx'> 	unsigned int err_mask = DBTOSR | DRTOSR | DSESR | DBOSR;</div><div class='add'>+	int errcode;</div><div class='ctx'> </div><div class='del'>-	DISR = disr;</div><div class='add'>+	DISR = disr &amp; err_mask;</div><div class='ctx'> 	for (i = 0; i &lt; IMX_DMA_CHANNELS; i++) {</div><div class='del'>-		channel = &amp;imx_dma_channels[i];</div><div class='del'>-</div><div class='del'>-		if ((err_mask &amp; 1 &lt;&lt; i) &amp;&amp; channel-&gt;name</div><div class='del'>-		    &amp;&amp; channel-&gt;err_handler) {</div><div class='del'>-			channel-&gt;err_handler(i, channel-&gt;data, regs);</div><div class='add'>+		if(!(err_mask &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		imx_dma_channels[i].sg = NULL;</div><div class='add'>+		channel = &amp;imx_dma_channels[i];</div><div class='add'>+		errcode = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (DBTOSR &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "Burst timeout on channel %d (%s)\n",</div><div class='del'>-			       i, channel-&gt;name);</div><div class='del'>-			DBTOSR |= (1 &lt;&lt; i);</div><div class='add'>+			DBTOSR = (1 &lt;&lt; i);</div><div class='add'>+			errcode |= IMX_DMA_ERR_BURST;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (DRTOSR &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "Request timeout on channel %d (%s)\n",</div><div class='del'>-			       i, channel-&gt;name);</div><div class='del'>-			DRTOSR |= (1 &lt;&lt; i);</div><div class='add'>+			DRTOSR = (1 &lt;&lt; i);</div><div class='add'>+			errcode |= IMX_DMA_ERR_REQUEST;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (DSESR &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "Transfer timeout on channel %d (%s)\n",</div><div class='del'>-			       i, channel-&gt;name);</div><div class='del'>-			DSESR |= (1 &lt;&lt; i);</div><div class='add'>+			DSESR = (1 &lt;&lt; i);</div><div class='add'>+			errcode |= IMX_DMA_ERR_TRANSFER;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (DBOSR &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "Buffer overflow timeout on channel %d (%s)\n",</div><div class='del'>-			       i, channel-&gt;name);</div><div class='del'>-			DBOSR |= (1 &lt;&lt; i);</div><div class='add'>+			DBOSR = (1 &lt;&lt; i);</div><div class='add'>+			errcode |= IMX_DMA_ERR_BUFFER;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The cleaning of @sg field would be questionable</div><div class='add'>+		 * there, because its value can help to compute</div><div class='add'>+		 * remaining/transfered bytes count in the handler</div><div class='add'>+		 */</div><div class='add'>+		/*imx_dma_channels[i].sg = NULL;*/</div><div class='add'>+</div><div class='add'>+		if (channel-&gt;name &amp;&amp; channel-&gt;err_handler) {</div><div class='add'>+			channel-&gt;err_handler(i, channel-&gt;data, regs, errcode);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		imx_dma_channels[i].sg = NULL;</div><div class='add'>+</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "DMA timeout on channel %d (%s) -%s%s%s%s\n",</div><div class='add'>+		       i, channel-&gt;name,</div><div class='add'>+		       errcode&amp;IMX_DMA_ERR_BURST?    " burst":"",</div><div class='add'>+		       errcode&amp;IMX_DMA_ERR_REQUEST?  " request":"",</div><div class='add'>+		       errcode&amp;IMX_DMA_ERR_TRANSFER? " transfer":"",</div><div class='add'>+		       errcode&amp;IMX_DMA_ERR_BUFFER?   " buffer":"");</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c<br/>index eeb8a6d4a399..a5de5f1da9f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-imx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-imx/irq.c</a></div><div class='hunk'>@@ -127,7 +127,7 @@ static void</div><div class='ctx'> imx_gpio_ack_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, irq);</div><div class='del'>-	ISR(IRQ_TO_REG(irq)) |= 1 &lt;&lt; ((irq - IRQ_GPIOA(0)) % 32);</div><div class='add'>+	ISR(IRQ_TO_REG(irq)) = 1 &lt;&lt; ((irq - IRQ_GPIOA(0)) % 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c<br/>index ea805bfa5e54..6ed7523c65bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-imx/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-imx/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-imx/time.c</a></div><div class='hunk'>@@ -8,11 +8,11 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='hunk'>@@ -72,7 +72,7 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction imx_timer_irq = {</div><div class='ctx'> 	.name		= "i.MX Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= imx_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c<br/>index 576a5e979c00..42021fdfa0c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-integrator/core.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/termios.h&gt;</div><div class='hunk'>@@ -281,7 +282,7 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction integrator_timer_irq = {</div><div class='ctx'> 	.name		= "Integrator Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= integrator_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c<br/>index a0724f2b24ce..9f55f5ae1044 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/integrator_cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/integrator_cp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-integrator/integrator_cp.c</a></div><div class='hunk'>@@ -232,8 +232,6 @@ static void __init intcp_init_irq(void)</div><div class='ctx'> 	for (i = IRQ_PIC_START; i &lt;= IRQ_PIC_END; i++) {</div><div class='ctx'> 		if (i == 11)</div><div class='ctx'> 			i = 22;</div><div class='del'>-		if (i == IRQ_CP_CPPLDINT)</div><div class='del'>-			i++;</div><div class='ctx'> 		if (i == 29)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_irq_chip(i, &amp;pic_chip);</div><div class='hunk'>@@ -259,8 +257,7 @@ static void __init intcp_init_irq(void)</div><div class='ctx'> 		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_irq_handler(IRQ_CP_CPPLDINT, sic_handle_irq);</div><div class='del'>-	pic_unmask_irq(IRQ_CP_CPPLDINT);</div><div class='add'>+	set_irq_chained_handler(IRQ_CP_CPPLDINT, sic_handle_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c<br/>index 229a63a525cd..f9043592e299 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/pci_v3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/pci_v3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-integrator/pci_v3.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c<br/>index bc07f52a6fd7..ee49cf790dab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-integrator/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-integrator/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-integrator/time.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id)</div><div class='ctx'> </div><div class='ctx'> 	xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq[0], arm_rtc_interrupt, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(dev-&gt;irq[0], arm_rtc_interrupt, IRQF_DISABLED,</div><div class='ctx'> 			  "rtc-pl030", dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto map_out;</div><div class='head'>diff --git a/arch/arm/mach-iop3xx/Kconfig b/arch/arm/mach-iop3xx/Kconfig<br/>index 2bfe8c729f9f..4422f2388607 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-iop3xx/Kconfig</a></div><div class='hunk'>@@ -30,12 +30,15 @@ config MACH_IQ80332</div><div class='ctx'> 	select ARCH_IOP331</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want to run your kernel on the Intel IQ80332</div><div class='del'>-	  evaluation kit for the IOP332 chipset</div><div class='add'>+	  evaluation kit for the IOP332 chipset.</div><div class='ctx'> </div><div class='ctx'> config ARCH_EP80219</div><div class='del'>-    bool "Enable support for EP80219"</div><div class='del'>-    select ARCH_IOP321</div><div class='del'>-    select ARCH_IQ31244</div><div class='add'>+	bool "Enable support for EP80219"</div><div class='add'>+	select ARCH_IOP321</div><div class='add'>+	select ARCH_IQ31244</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to run your kernel on the Intel EP80219</div><div class='add'>+	  evaluation kit for the Intel 80219 chipset (a IOP321 variant).</div><div class='ctx'> </div><div class='ctx'> # Which IOP variant are we running?</div><div class='ctx'> config ARCH_IOP321</div><div class='hunk'>@@ -56,8 +59,8 @@ config IOP331_STEPD</div><div class='ctx'> 	bool "Chip stepping D of the IOP80331 processor or IOP80333"</div><div class='ctx'> 	depends on (ARCH_IOP331)</div><div class='ctx'> 	help</div><div class='del'>-		  Say Y here if you have StepD of the IOP80331 or IOP8033</div><div class='del'>-		  based platforms.</div><div class='add'>+	  Say Y here if you have StepD of the IOP80331 or IOP8033</div><div class='add'>+	  based platforms.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> endif</div><div class='head'>diff --git a/arch/arm/mach-iop3xx/common.c b/arch/arm/mach-iop3xx/common.c<br/>index fdeeef489a73..d7f50e57e753 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-iop3xx/common.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c<br/>index 0ebbcb20c6ae..b6d096903c4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop321-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop321-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop321-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-iop3xx/iop321-setup.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop3xx/iop321-time.c b/arch/arm/mach-iop3xx/iop321-time.c<br/>index d67ac0e5d438..04b1a6f7ebae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop321-time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop321-time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop321-time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-iop3xx/iop321-time.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static struct irqaction iop321_timer_irq = {</div><div class='ctx'> 	.name		= "IOP321 Timer Tick",</div><div class='ctx'> 	.handler	= iop321_timer_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init iop321_timer_init(void)</div><div class='head'>diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c<br/>index 7b7b6eea3846..3cc98d892ad4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop331-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop331-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop331-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-iop3xx/iop331-setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c<br/>index 3c1f0ebbd636..0c09e74c5740 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop331-time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-iop3xx/iop331-time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-iop3xx/iop331-time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-iop3xx/iop331-time.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static struct irqaction iop331_timer_irq = {</div><div class='ctx'> 	.name		= "IOP331 Timer Tick",</div><div class='ctx'> 	.handler	= iop331_timer_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init iop331_timer_init(void)</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c<br/>index 6e8d504aca55..7f91f689a041 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp2000/core.c</a></div><div class='hunk'>@@ -14,12 +14,12 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -211,7 +211,8 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	/* clear timer 1 */</div><div class='ctx'> 	ixp2000_reg_wrb(IXP2000_T1_CLR, 1);</div><div class='ctx'> </div><div class='del'>-	while ((next_jiffy_time - *missing_jiffy_timer_csr) &gt; ticks_per_jiffy) {</div><div class='add'>+	while ((signed long)(next_jiffy_time - *missing_jiffy_timer_csr)</div><div class='add'>+							&gt;= ticks_per_jiffy) {</div><div class='ctx'> 		timer_tick(regs);</div><div class='ctx'> 		next_jiffy_time -= ticks_per_jiffy;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -223,7 +224,7 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ixp2000_timer_irq = {</div><div class='ctx'> 	.name		= "IXP2000 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= ixp2000_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -301,6 +302,7 @@ void gpio_line_config(int line, int direction)</div><div class='ctx'> 	}</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(gpio_line_config);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='hunk'>@@ -407,7 +409,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc,  str</div><div class='ctx'> 	for(i = 31; i &gt;= 0; i--) {</div><div class='ctx'> 		if(status &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i;</div><div class='del'>-			desc-&gt;handle(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);</div><div class='add'>+			desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c<br/>index 52fac89e95b5..ac29298c5d3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/enp2611.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/enp2611.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp2000/enp2611.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c<br/>index 09101271298e..a6f14801872d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2400.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp2000/ixdp2400.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c<br/>index 076e3f8acc96..91d36d91dac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2800.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp2000/ixdp2800.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c<br/>index d628da56b4bc..40eef8b36740 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x00.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2x00.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp2000/ixdp2x00.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -168,7 +167,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hook into PCI interrupt */</div><div class='del'>-	set_irq_chained_handler(IRQ_IXP2000_PCIB, &amp;ixdp2x00_irq_handler);</div><div class='add'>+	set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='head'>diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c<br/>index 66915282a463..7f42366f60d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp2000/ixdp2x01.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp2000/ixdp2x01.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp2000/ixdp2x01.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -128,7 +127,7 @@ void __init ixdp2x01_init_irq(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hook into PCI interrupts */</div><div class='del'>-	set_irq_chained_handler(IRQ_IXP2000_PCIB, &amp;ixdp2x01_irq_handler);</div><div class='add'>+	set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c<br/>index affd1d5d7440..566a07821c77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp23xx/core.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -272,7 +271,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	int_desc = irq_desc + irqno;</div><div class='del'>-	int_desc-&gt;handle(irqno, int_desc, regs);</div><div class='add'>+	desc_handle_irq(irqno, int_desc, regs);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;unmask(irq);</div><div class='ctx'> }</div><div class='hunk'>@@ -334,7 +333,7 @@ void __init ixp23xx_init_irq(void)</div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  * Timer-tick functions for IXP23xx</div><div class='ctx'>  *************************************************************************/</div><div class='del'>-#define CLOCK_TICKS_PER_USEC	CLOCK_TICK_RATE / (USEC_PER_SEC)</div><div class='add'>+#define CLOCK_TICKS_PER_USEC	(CLOCK_TICK_RATE / USEC_PER_SEC)</div><div class='ctx'> </div><div class='ctx'> static unsigned long next_jiffy_time;</div><div class='ctx'> </div><div class='hunk'>@@ -353,7 +352,7 @@ ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Clear Pending Interrupt by writing '1' to it */</div><div class='ctx'> 	*IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND;</div><div class='del'>-	while ((*IXP23XX_TIMER_CONT - next_jiffy_time) &gt; LATCH) {</div><div class='add'>+	while ((signed long)(*IXP23XX_TIMER_CONT - next_jiffy_time) &gt;= LATCH) {</div><div class='ctx'> 		timer_tick(regs);</div><div class='ctx'> 		next_jiffy_time += LATCH;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -364,7 +363,7 @@ ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static struct irqaction ixp23xx_timer_irq = {</div><div class='ctx'> 	.name		= "IXP23xx Timer Tick",</div><div class='ctx'> 	.handler	= ixp23xx_timer_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init ixp23xx_init_timer(void)</div><div class='hunk'>@@ -439,5 +438,6 @@ static struct platform_device *ixp23xx_devices[] __initdata = {</div><div class='ctx'> </div><div class='ctx'> void __init ixp23xx_sys_init(void)</div><div class='ctx'> {</div><div class='add'>+	*IXP23XX_EXP_UNIT_FUSE |= 0xf;</div><div class='ctx'> 	platform_add_devices(ixp23xx_devices, ARRAY_SIZE(ixp23xx_devices));</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c<br/>index bf688c128630..7a85ced56718 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/espresso.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/espresso.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/espresso.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp23xx/espresso.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -53,9 +52,29 @@ static int __init espresso_pci_init(void)</div><div class='ctx'> };</div><div class='ctx'> subsys_initcall(espresso_pci_init);</div><div class='ctx'> </div><div class='add'>+static struct physmap_flash_data espresso_flash_data = {</div><div class='add'>+	.width		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource espresso_flash_resource = {</div><div class='add'>+	.start		= 0x90000000,</div><div class='add'>+	.end		= 0x91ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device espresso_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;espresso_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;espresso_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init espresso_init(void)</div><div class='ctx'> {</div><div class='del'>-	physmap_configure(0x90000000, 0x02000000, 2, NULL);</div><div class='add'>+	platform_device_register(&amp;espresso_flash);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mark flash as writeable.</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c<br/>index 00146c35daac..37a32e6bcca2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/ixdp2351.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/ixdp2351.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp23xx/ixdp2351.c</a></div><div class='hunk'>@@ -14,12 +14,12 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -75,7 +74,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct</div><div class='ctx'> 			int cpld_irq =</div><div class='ctx'> 				IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);</div><div class='ctx'> 			cpld_desc = irq_desc + cpld_irq;</div><div class='del'>-			cpld_desc-&gt;handle(cpld_irq, cpld_desc, regs);</div><div class='add'>+			desc_handle_irq(cpld_irq, cpld_desc, regs);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +111,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct</div><div class='ctx'> 			int cpld_irq =</div><div class='ctx'> 				IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);</div><div class='ctx'> 			cpld_desc = irq_desc + cpld_irq;</div><div class='del'>-			cpld_desc-&gt;handle(cpld_irq, cpld_desc, regs);</div><div class='add'>+			desc_handle_irq(cpld_irq, cpld_desc, regs);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -159,8 +158,8 @@ void ixdp2351_init_irq(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_irq_chained_handler(IRQ_IXP23XX_INTA, &amp;ixdp2351_inta_handler);</div><div class='del'>-	set_irq_chained_handler(IRQ_IXP23XX_INTB, &amp;ixdp2351_intb_handler);</div><div class='add'>+	set_irq_chained_handler(IRQ_IXP23XX_INTA, ixdp2351_inta_handler);</div><div class='add'>+	set_irq_chained_handler(IRQ_IXP23XX_INTB, ixdp2351_intb_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -298,9 +297,29 @@ static void __init ixdp2351_map_io(void)</div><div class='ctx'> 	iotable_init(ixdp2351_io_desc, ARRAY_SIZE(ixdp2351_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct physmap_flash_data ixdp2351_flash_data = {</div><div class='add'>+	.width		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource ixdp2351_flash_resource = {</div><div class='add'>+	.start		= 0x90000000,</div><div class='add'>+	.end		= 0x93ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ixdp2351_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;ixdp2351_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;ixdp2351_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init ixdp2351_init(void)</div><div class='ctx'> {</div><div class='del'>-	physmap_configure(0x90000000, 0x04000000, 1, NULL);</div><div class='add'>+	platform_device_register(&amp;ixdp2351_flash);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mark flash as writeable</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c<br/>index ac72f94c5b4d..3b34fa35e36b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp23xx/pci.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c<br/>index 43c14e740794..d06e21b70de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/roadrunner.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp23xx/roadrunner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp23xx/roadrunner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp23xx/roadrunner.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -137,9 +136,29 @@ static int __init roadrunner_pci_init(void)</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(roadrunner_pci_init);</div><div class='ctx'> </div><div class='add'>+static struct physmap_flash_data roadrunner_flash_data = {</div><div class='add'>+	.width		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource roadrunner_flash_resource = {</div><div class='add'>+	.start		= 0x90000000,</div><div class='add'>+	.end		= 0x93ffffff,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device roadrunner_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;roadrunner_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;roadrunner_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init roadrunner_init(void)</div><div class='ctx'> {</div><div class='del'>-	physmap_configure(0x90000000, 0x04000000, 2, NULL);</div><div class='add'>+	platform_device_register(&amp;roadrunner_flash);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Mark flash as writeable</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig<br/>index 2a39f9e481ad..57f23b465392 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/Kconfig</a></div><div class='hunk'>@@ -35,7 +35,6 @@ config ARCH_ADI_COYOTE</div><div class='ctx'> </div><div class='ctx'> config ARCH_IXDP425</div><div class='ctx'> 	bool "IXDP425"</div><div class='del'>-	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support Intel's </div><div class='ctx'> 	  IXDP425 Development Platform (Also known as Richfield).  </div><div class='hunk'>@@ -43,7 +42,6 @@ config ARCH_IXDP425</div><div class='ctx'> </div><div class='ctx'> config MACH_IXDPG425</div><div class='ctx'> 	bool "IXDPG425"</div><div class='del'>-	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support Intel's</div><div class='ctx'> 	  IXDPG425 Development Platform (Also known as Montajade).</div><div class='hunk'>@@ -51,7 +49,6 @@ config MACH_IXDPG425</div><div class='ctx'> </div><div class='ctx'> config MACH_IXDP465</div><div class='ctx'> 	bool "IXDP465"</div><div class='del'>-	select PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say 'Y' here if you want your kernel to support Intel's</div><div class='ctx'> 	  IXDP465 Development Platform (Also known as BMP).</div><div class='hunk'>@@ -141,7 +138,7 @@ config IXP4XX_INDIRECT_PCI</div><div class='ctx'>           2) If &gt; 64MB of memory space is required, the IXP4xx can be </div><div class='ctx'> 	     configured to use indirect registers to access PCI This allows </div><div class='ctx'> 	     for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. </div><div class='del'>-	     The disadvantadge of this is that every PCI access requires </div><div class='add'>+	     The disadvantage of this is that every PCI access requires </div><div class='ctx'> 	     three local register accesses plus a spinlock, but in some </div><div class='ctx'> 	     cases the performance hit is acceptable. In addition, you cannot </div><div class='ctx'> 	     mmap() PCI devices in this case due to the indirect nature</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile<br/>index 5a4aaa0e0a09..640315d8b96a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/Makefile</a></div><div class='hunk'>@@ -2,13 +2,23 @@</div><div class='ctx'> # Makefile for the linux kernel.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+obj-pci-y	:=</div><div class='add'>+obj-pci-n	:=</div><div class='add'>+</div><div class='add'>+obj-pci-$(CONFIG_ARCH_IXDP4XX)		+= ixdp425-pci.o</div><div class='add'>+obj-pci-$(CONFIG_MACH_IXDPG425)		+= ixdpg425-pci.o</div><div class='add'>+obj-pci-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o</div><div class='add'>+obj-pci-$(CONFIG_MACH_GTWX5715)		+= gtwx5715-pci.o</div><div class='add'>+obj-pci-$(CONFIG_MACH_NSLU2)		+= nslu2-pci.o</div><div class='add'>+obj-pci-$(CONFIG_MACH_NAS100D)		+= nas100d-pci.o</div><div class='add'>+</div><div class='ctx'> obj-y	+= common.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_PCI)		+= common-pci.o</div><div class='del'>-obj-$(CONFIG_ARCH_IXDP4XX)	+= ixdp425-pci.o ixdp425-setup.o</div><div class='del'>-obj-$(CONFIG_MACH_IXDPG425)	+= ixdpg425-pci.o coyote-setup.o</div><div class='del'>-obj-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o coyote-setup.o</div><div class='del'>-obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-pci.o gtwx5715-setup.o</div><div class='del'>-obj-$(CONFIG_MACH_NSLU2)	+= nslu2-pci.o nslu2-setup.o nslu2-power.o</div><div class='del'>-obj-$(CONFIG_MACH_NAS100D)	+= nas100d-pci.o nas100d-setup.o nas100d-power.o</div><div class='add'>+obj-$(CONFIG_ARCH_IXDP4XX)	+= ixdp425-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_IXDPG425)	+= coyote-setup.o</div><div class='add'>+obj-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-setup.o</div><div class='add'>+obj-$(CONFIG_MACH_NSLU2)	+= nslu2-setup.o nslu2-power.o</div><div class='add'>+obj-$(CONFIG_MACH_NAS100D)	+= nas100d-setup.o nas100d-power.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_PCI)		+= $(obj-pci-$(CONFIG_PCI)) common-pci.o</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c<br/>index 00b761ff0f9c..7c25dbd5a181 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/common.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -276,7 +275,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Catch up with the real idea of time</div><div class='ctx'> 	 */</div><div class='del'>-	while ((*IXP4XX_OSTS - last_jiffy_time) &gt; LATCH) {</div><div class='add'>+	while ((signed long)(*IXP4XX_OSTS - last_jiffy_time) &gt;= LATCH) {</div><div class='ctx'> 		timer_tick(regs);</div><div class='ctx'> 		last_jiffy_time += LATCH;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -288,7 +287,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ixp4xx_timer_irq = {</div><div class='ctx'> 	.name		= "IXP4xx Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= ixp4xx_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c<br/>index e6b7fcd923fa..2cebb2878895 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/coyote-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/coyote-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/coyote-pci.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c<br/>index da415d5d7f37..d5156c043f0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/ixdp425-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdp425-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/ixdp425-pci.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c<br/>index 526fb6175bc3..ed5270800217 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdpg425-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/ixdpg425-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/ixdpg425-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/ixdpg425-pci.c</a></div><div class='hunk'>@@ -16,10 +16,10 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c<br/>index 26b7c001ff64..b8ebaf4a9c8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nas100d-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/nas100d-pci.c</a></div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c<br/>index 99d333d7ebdd..81ffcae1f56e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nas100d-power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/nas100d-power.c</a></div><div class='hunk'>@@ -17,14 +17,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void ctrl_alt_del(void);</div><div class='del'>-</div><div class='ctx'> static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Signal init to do the ctrlaltdel action, this will bypass init if</div><div class='hunk'>@@ -43,7 +42,7 @@ static int __init nas100d_power_init(void)</div><div class='ctx'> 	set_irq_type(NAS100D_RB_IRQ, IRQT_LOW);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(NAS100D_RB_IRQ, &amp;nas100d_reset_handler,</div><div class='del'>-		SA_INTERRUPT, "NAS100D reset button", NULL) &lt; 0) {</div><div class='add'>+		IRQF_DISABLED, "NAS100D reset button", NULL) &lt; 0) {</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_DEBUG "Reset Button IRQ %d not available\n",</div><div class='ctx'> 			NAS100D_RB_IRQ);</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c<br/>index a3b4c6ac5708..9a31444d9214 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nas100d-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nas100d-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/nas100d-setup.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -37,6 +38,36 @@ static struct platform_device nas100d_flash = {</div><div class='ctx'> 	.resource		= &amp;nas100d_flash_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_LEDS_IXP4XX</div><div class='add'>+static struct resource nas100d_led_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "wlan",   /* green led */</div><div class='add'>+		.start		= 0,</div><div class='add'>+		.end		= 0,</div><div class='add'>+		.flags		= IXP4XX_GPIO_LOW,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "ready",  /* blue power led (off is flashing!) */</div><div class='add'>+		.start		= 15,</div><div class='add'>+		.end		= 15,</div><div class='add'>+		.flags		= IXP4XX_GPIO_LOW,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "disk",   /* yellow led */</div><div class='add'>+		.start		= 3,</div><div class='add'>+		.end		= 3,</div><div class='add'>+		.flags		= IXP4XX_GPIO_LOW,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device nas100d_leds = {</div><div class='add'>+	.name			= "IXP4XX-GPIO-LED",</div><div class='add'>+	.id			= -1,</div><div class='add'>+	.num_resources		= ARRAY_SIZE(nas100d_led_resources),</div><div class='add'>+	.resource		= nas100d_led_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = {</div><div class='ctx'> 	.sda_pin		= NAS100D_SDA_PIN,</div><div class='ctx'> 	.scl_pin		= NAS100D_SCL_PIN,</div><div class='hunk'>@@ -95,7 +126,9 @@ static struct platform_device nas100d_uart = {</div><div class='ctx'> static struct platform_device *nas100d_devices[] __initdata = {</div><div class='ctx'> 	&amp;nas100d_i2c_controller,</div><div class='ctx'> 	&amp;nas100d_flash,</div><div class='del'>-	&amp;nas100d_uart,</div><div class='add'>+#ifdef CONFIG_LEDS_IXP4XX</div><div class='add'>+	&amp;nas100d_leds,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nas100d_power_off(void)</div><div class='hunk'>@@ -122,6 +155,12 @@ static void __init nas100d_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pm_power_off = nas100d_power_off;</div><div class='ctx'> </div><div class='add'>+	/* This is only useful on a modified machine, but it is valuable</div><div class='add'>+	 * to have it first in order to see debug messages, and so that</div><div class='add'>+	 * it does *not* get removed if platform_add_devices fails!</div><div class='add'>+	 */</div><div class='add'>+	(void)platform_device_register(&amp;nas100d_uart);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c<br/>index ece860444d5b..0de639d6e60a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nslu2-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/nslu2-pci.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c<br/>index d80c362bc539..e2a2230b69f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nslu2-power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/nslu2-power.c</a></div><div class='hunk'>@@ -20,11 +20,10 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void ctrl_alt_del(void);</div><div class='del'>-</div><div class='ctx'> static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Signal init to do the ctrlaltdel action, this will bypass init if</div><div class='hunk'>@@ -55,7 +54,7 @@ static int __init nslu2_power_init(void)</div><div class='ctx'> 	set_irq_type(NSLU2_PB_IRQ, IRQT_HIGH);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(NSLU2_RB_IRQ, &amp;nslu2_reset_handler,</div><div class='del'>-		SA_INTERRUPT, "NSLU2 reset button", NULL) &lt; 0) {</div><div class='add'>+		IRQF_DISABLED, "NSLU2 reset button", NULL) &lt; 0) {</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_DEBUG "Reset Button IRQ %d not available\n",</div><div class='ctx'> 			NSLU2_RB_IRQ);</div><div class='hunk'>@@ -64,7 +63,7 @@ static int __init nslu2_power_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(NSLU2_PB_IRQ, &amp;nslu2_power_handler,</div><div class='del'>-		SA_INTERRUPT, "NSLU2 power button", NULL) &lt; 0) {</div><div class='add'>+		IRQF_DISABLED, "NSLU2 power button", NULL) &lt; 0) {</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_DEBUG "Power Button IRQ %d not available\n",</div><div class='ctx'> 			NSLU2_PB_IRQ);</div><div class='head'>diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c<br/>index 55411f21d838..749a337494d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-ixp4xx/nslu2-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-ixp4xx/nslu2-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-ixp4xx/nslu2-setup.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  *      Copyright (C) 2003-2004 MontaVista Software, Inc.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Mark Rakes &lt;mrakes at mac.com&gt;</div><div class='add'>+ * Author: Rod Whitby &lt;rod@whitby.id.au&gt;</div><div class='ctx'>  * Maintainers: http://www.nslu2-linux.org/</div><div class='ctx'>  *</div><div class='ctx'>  * Fixed missing init_time in MACHINE_START kas11 10/22/04</div><div class='hunk'>@@ -16,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -43,6 +45,42 @@ static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = {</div><div class='ctx'> 	.scl_pin		= NSLU2_SCL_PIN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_LEDS_IXP4XX</div><div class='add'>+static struct resource nslu2_led_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "ready",  /* green led */</div><div class='add'>+		.start		= NSLU2_LED_GRN,</div><div class='add'>+		.end		= NSLU2_LED_GRN,</div><div class='add'>+		.flags		= IXP4XX_GPIO_HIGH,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "status", /* red led */</div><div class='add'>+		.start		= NSLU2_LED_RED,</div><div class='add'>+		.end		= NSLU2_LED_RED,</div><div class='add'>+		.flags		= IXP4XX_GPIO_HIGH,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "disk-1",</div><div class='add'>+		.start		= NSLU2_LED_DISK1,</div><div class='add'>+		.end		= NSLU2_LED_DISK1,</div><div class='add'>+		.flags		= IXP4XX_GPIO_LOW,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "disk-2",</div><div class='add'>+		.start		= NSLU2_LED_DISK2,</div><div class='add'>+		.end		= NSLU2_LED_DISK2,</div><div class='add'>+		.flags		= IXP4XX_GPIO_LOW,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device nslu2_leds = {</div><div class='add'>+	.name			= "IXP4XX-GPIO-LED",</div><div class='add'>+	.id			= -1,</div><div class='add'>+	.num_resources		= ARRAY_SIZE(nslu2_led_resources),</div><div class='add'>+	.resource		= nslu2_led_resources,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_device nslu2_i2c_controller = {</div><div class='ctx'> 	.name			= "IXP4XX-I2C",</div><div class='ctx'> 	.id			= 0,</div><div class='hunk'>@@ -102,8 +140,10 @@ static struct platform_device nslu2_uart = {</div><div class='ctx'> static struct platform_device *nslu2_devices[] __initdata = {</div><div class='ctx'> 	&amp;nslu2_i2c_controller,</div><div class='ctx'> 	&amp;nslu2_flash,</div><div class='del'>-	&amp;nslu2_uart,</div><div class='ctx'> 	&amp;nslu2_beeper,</div><div class='add'>+#ifdef CONFIG_LEDS_IXP4XX</div><div class='add'>+	&amp;nslu2_leds,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void nslu2_power_off(void)</div><div class='hunk'>@@ -127,6 +167,12 @@ static void __init nslu2_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pm_power_off = nslu2_power_off;</div><div class='ctx'> </div><div class='add'>+	/* This is only useful on a modified machine, but it is valuable</div><div class='add'>+	 * to have it first in order to see debug messages, and so that</div><div class='add'>+	 * it does *not* get removed if platform_add_devices fails!</div><div class='add'>+	 */</div><div class='add'>+	(void)platform_device_register(&amp;nslu2_uart);</div><div class='add'>+</div><div class='ctx'> 	platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c<br/>index ac626436e96f..b7af5640ea7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-l7200/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-l7200/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-l7200/core.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig<br/>index 8a17867a6a24..558a34f53b1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/Kconfig</a></div><div class='hunk'>@@ -14,6 +14,7 @@ config MACH_LPD7A400</div><div class='ctx'> 	bool "LPD7A400 Card Engine"</div><div class='ctx'> 	select ARCH_LH7A400</div><div class='ctx'> #	select IDE_POLL</div><div class='add'>+	select HAS_TOUCHSCREEN_ADS7843_LH7</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you are using Logic Product Development's</div><div class='ctx'> 	  LPD7A400 CardEngine.  For the time being, the LPD7A400 and</div><div class='hunk'>@@ -23,6 +24,7 @@ config MACH_LPD7A404</div><div class='ctx'> 	bool "LPD7A404 Card Engine"</div><div class='ctx'> 	select ARCH_LH7A404</div><div class='ctx'> #	select IDE_POLL</div><div class='add'>+	select HAS_TOUCHSCREEN_ADC_LH7</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you are using Logic Product Development's</div><div class='ctx'> 	  LPD7A404 CardEngine. For the time being, the LPD7A400 and</div><div class='hunk'>@@ -34,6 +36,9 @@ config ARCH_LH7A400</div><div class='ctx'> config ARCH_LH7A404</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config LPD7A40X_CPLD_SSP</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config LH7A40X_CONTIGMEM</div><div class='ctx'> 	bool "Disable NUMA Support"</div><div class='ctx'> 	depends on ARCH_LH7A40X</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/Makefile b/arch/arm/mach-lh7a40x/Makefile<br/>index e90512dbc2d6..94b8615fb3c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/Makefile</a></div><div class='hunk'>@@ -4,11 +4,14 @@</div><div class='ctx'> </div><div class='ctx'> # Object file lists.</div><div class='ctx'> </div><div class='del'>-obj-y			:= time.o</div><div class='del'>-obj-$(CONFIG_MACH_KEV7A400) += arch-kev7a400.o irq-lh7a400.o</div><div class='del'>-obj-$(CONFIG_MACH_LPD7A400) += arch-lpd7a40x.o irq-lh7a400.o</div><div class='del'>-obj-$(CONFIG_MACH_LPD7A404) += arch-lpd7a40x.o irq-lh7a404.o</div><div class='del'>-</div><div class='del'>-obj-m			:=</div><div class='del'>-obj-n			:=</div><div class='del'>-obj-			:=</div><div class='add'>+obj-y				:= time.o clocks.o</div><div class='add'>+obj-m				:=</div><div class='add'>+obj-n				:=</div><div class='add'>+obj-				:=</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MACH_KEV7A400)	+= arch-kev7a400.o irq-lh7a400.o</div><div class='add'>+obj-$(CONFIG_MACH_LPD7A400)	+= arch-lpd7a40x.o irq-lh7a400.o</div><div class='add'>+obj-$(CONFIG_MACH_LPD7A404)	+= arch-lpd7a40x.o irq-lh7a404.o</div><div class='add'>+obj-$(CONFIG_LPD7A40X_CPLD_SSP)	+= ssp-cpld.o</div><div class='add'>+obj-$(CONFIG_FB_ARMCLCD)	+= clcd.o</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c<br/>index 12e23277c5ea..35c3606a2079 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/arch-lpd7a40x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/arch-lpd7a40x.c</a></div><div class='hunk'>@@ -12,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -23,6 +24,28 @@</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='add'>+#define CPLD_INT_NETHERNET	(1&lt;&lt;0)</div><div class='add'>+#define CPLD_INTMASK_ETHERNET	(1&lt;&lt;2)</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+# define CPLD_INT_NTOUCH		(1&lt;&lt;1)</div><div class='add'>+# define CPLD_INTMASK_TOUCH	(1&lt;&lt;3)</div><div class='add'>+# define CPLD_INT_PEN		(1&lt;&lt;4)</div><div class='add'>+# define CPLD_INTMASK_PEN	(1&lt;&lt;4)</div><div class='add'>+# define CPLD_INT_PIRQ		(1&lt;&lt;4)</div><div class='add'>+#endif</div><div class='add'>+#define CPLD_INTMASK_CPLD	(1&lt;&lt;7)</div><div class='add'>+#define CPLD_INT_CPLD		(1&lt;&lt;6)</div><div class='add'>+</div><div class='add'>+#define CPLD_CONTROL_SWINT		(1&lt;&lt;7) /* Disable all CPLD IRQs */</div><div class='add'>+#define CPLD_CONTROL_OCMSK		(1&lt;&lt;6) /* Mask USB1 connect IRQ */</div><div class='add'>+#define CPLD_CONTROL_PDRV		(1&lt;&lt;5) /* PCC_nDRV high */</div><div class='add'>+#define CPLD_CONTROL_USB1C		(1&lt;&lt;4) /* USB1 connect IRQ active */</div><div class='add'>+#define CPLD_CONTROL_USB1P		(1&lt;&lt;3) /* USB1 power disable */</div><div class='add'>+#define CPLD_CONTROL_AWKP		(1&lt;&lt;2) /* Auto-wakeup disabled  */</div><div class='add'>+#define CPLD_CONTROL_LCD_ENABLE		(1&lt;&lt;1) /* LCD Vee enable */</div><div class='add'>+#define CPLD_CONTROL_WRLAN_NENABLE	(1&lt;&lt;0) /* SMC91x power disable */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct resource smc91x_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= CPLD00_PHYS,</div><div class='hunk'>@@ -48,12 +71,12 @@ static struct platform_device smc91x_device = {</div><div class='ctx'> static struct resource lh7a40x_usbclient_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= USB_PHYS,</div><div class='del'>-		.end	= (USB_PHYS + 0xFF),</div><div class='add'>+		.end	= (USB_PHYS + PAGE_SIZE),</div><div class='ctx'> 		.flags	= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.start	= IRQ_USBINTR,</div><div class='del'>-		.end	= IRQ_USBINTR,</div><div class='add'>+		.start	= IRQ_USB,</div><div class='add'>+		.end	= IRQ_USB,</div><div class='ctx'> 		.flags	= IORESOURCE_IRQ,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='hunk'>@@ -61,7 +84,8 @@ static struct resource lh7a40x_usbclient_resources[] = {</div><div class='ctx'> static u64 lh7a40x_usbclient_dma_mask = 0xffffffffUL;</div><div class='ctx'> </div><div class='ctx'> static struct platform_device lh7a40x_usbclient_device = {</div><div class='del'>-	.name		= "lh7a40x_udc",</div><div class='add'>+//	.name		= "lh7a40x_udc",</div><div class='add'>+	.name		= "lh7-udc",</div><div class='ctx'> 	.id		= 0,</div><div class='ctx'> 	.dev		= {</div><div class='ctx'> 		.dma_mask = &amp;lh7a40x_usbclient_dma_mask,</div><div class='hunk'>@@ -101,7 +125,7 @@ static struct platform_device lh7a404_usbhost_device = {</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct platform_device *lpd7a40x_devs[] __initdata = {</div><div class='add'>+static struct platform_device* lpd7a40x_devs[] __initdata = {</div><div class='ctx'> 	&amp;smc91x_device,</div><div class='ctx'> 	&amp;lh7a40x_usbclient_device,</div><div class='ctx'> #if defined (CONFIG_ARCH_LH7A404)</div><div class='hunk'>@@ -113,29 +137,52 @@ extern void lpd7a400_map_io (void);</div><div class='ctx'> </div><div class='ctx'> static void __init lpd7a40x_init (void)</div><div class='ctx'> {</div><div class='del'>-	CPLD_CONTROL |=     (1&lt;&lt;6); /* Mask USB1 connection IRQ */</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+	CPLD_CONTROL |= 0</div><div class='add'>+		| CPLD_CONTROL_SWINT /* Disable software interrupt */</div><div class='add'>+		| CPLD_CONTROL_OCMSK; /* Mask USB1 connection IRQ */</div><div class='ctx'> 	CPLD_CONTROL &amp;= ~(0</div><div class='del'>-			  | (1&lt;&lt;1) /* Disable LCD */</div><div class='del'>-			  | (1&lt;&lt;0) /* Enable WLAN */</div><div class='add'>+			  | CPLD_CONTROL_LCD_ENABLE	/* Disable LCD */</div><div class='add'>+			  | CPLD_CONTROL_WRLAN_NENABLE	/* Enable SMC91x */</div><div class='ctx'> 		);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A404)</div><div class='add'>+	CPLD_CONTROL &amp;= ~(0</div><div class='add'>+			  | CPLD_CONTROL_WRLAN_NENABLE	/* Enable SMC91x */</div><div class='add'>+		);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices (lpd7a40x_devs, ARRAY_SIZE (lpd7a40x_devs));</div><div class='add'>+#if defined (CONFIG_FB_ARMCLCD)</div><div class='add'>+        lh7a40x_clcd_init ();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lh7a40x_ack_cpld_irq (u32 irq)</div><div class='ctx'> {</div><div class='del'>-	/* CPLD doesn't have ack capability */</div><div class='add'>+	/* CPLD doesn't have ack capability, but some devices may */</div><div class='add'>+</div><div class='add'>+#if defined (CPLD_INTMASK_TOUCH)</div><div class='add'>+	/* The touch control *must* mask the the interrupt because the</div><div class='add'>+	 * interrupt bit is read by the driver to determine if the pen</div><div class='add'>+	 * is still down. */</div><div class='add'>+	if (irq == IRQ_TOUCH)</div><div class='add'>+		CPLD_INTERRUPTS |= CPLD_INTMASK_TOUCH;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lh7a40x_mask_cpld_irq (u32 irq)</div><div class='ctx'> {</div><div class='ctx'> 	switch (irq) {</div><div class='ctx'> 	case IRQ_LPD7A40X_ETH_INT:</div><div class='del'>-		CPLD_INTERRUPTS = CPLD_INTERRUPTS | 0x4;</div><div class='add'>+		CPLD_INTERRUPTS |= CPLD_INTMASK_ETHERNET;</div><div class='ctx'> 		break;</div><div class='del'>-	case IRQ_LPD7A400_TS:</div><div class='del'>-		CPLD_INTERRUPTS = CPLD_INTERRUPTS | 0x8;</div><div class='add'>+#if defined (IRQ_TOUCH)</div><div class='add'>+	case IRQ_TOUCH:</div><div class='add'>+		CPLD_INTERRUPTS |= CPLD_INTMASK_TOUCH;</div><div class='ctx'> 		break;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -143,11 +190,13 @@ static void lh7a40x_unmask_cpld_irq (u32 irq)</div><div class='ctx'> {</div><div class='ctx'> 	switch (irq) {</div><div class='ctx'> 	case IRQ_LPD7A40X_ETH_INT:</div><div class='del'>-		CPLD_INTERRUPTS = CPLD_INTERRUPTS &amp; ~ 0x4;</div><div class='add'>+		CPLD_INTERRUPTS &amp;= ~CPLD_INTMASK_ETHERNET;</div><div class='ctx'> 		break;</div><div class='del'>-	case IRQ_LPD7A400_TS:</div><div class='del'>-		CPLD_INTERRUPTS = CPLD_INTERRUPTS &amp; ~ 0x8;</div><div class='add'>+#if defined (IRQ_TOUCH)</div><div class='add'>+	case IRQ_TOUCH:</div><div class='add'>+		CPLD_INTERRUPTS &amp;= ~CPLD_INTMASK_TOUCH;</div><div class='ctx'> 		break;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -164,11 +213,13 @@ static void lpd7a40x_cpld_handler (unsigned int irq, struct irqdesc *desc,</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;ack (irq);</div><div class='ctx'> </div><div class='del'>-	if ((mask &amp; 0x1) == 0)	/* WLAN */</div><div class='add'>+	if ((mask &amp; (1&lt;&lt;0)) == 0)	/* WLAN */</div><div class='ctx'> 		IRQ_DISPATCH (IRQ_LPD7A40X_ETH_INT);</div><div class='ctx'> </div><div class='del'>-	if ((mask &amp; 0x2) == 0)	/* Touch */</div><div class='del'>-		IRQ_DISPATCH (IRQ_LPD7A400_TS);</div><div class='add'>+#if defined (IRQ_TOUCH)</div><div class='add'>+	if ((mask &amp; (1&lt;&lt;1)) == 0)	/* Touch */</div><div class='add'>+		IRQ_DISPATCH (IRQ_TOUCH);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;unmask (irq); /* Level-triggered need this */</div><div class='ctx'> }</div><div class='hunk'>@@ -204,9 +255,21 @@ void __init lh7a40x_init_board_irq (void)</div><div class='ctx'> </div><div class='ctx'> 		/* Then, configure CPLD interrupt */</div><div class='ctx'> </div><div class='del'>-	CPLD_INTERRUPTS	=   0x9c; /* Disable all CPLD interrupts */</div><div class='add'>+			/* Disable all CPLD interrupts */</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+	CPLD_INTERRUPTS	= CPLD_INTMASK_TOUCH | CPLD_INTMASK_PEN</div><div class='add'>+		| CPLD_INTMASK_ETHERNET;</div><div class='add'>+	/* *** FIXME: don't know why we need 7 and 4. 7 is way wrong</div><div class='add'>+               and 4 is uncefined. */</div><div class='add'>+	// (1&lt;&lt;7)|(1&lt;&lt;4)|(1&lt;&lt;3)|(1&lt;&lt;2);</div><div class='add'>+#endif</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A404)</div><div class='add'>+	CPLD_INTERRUPTS	= CPLD_INTMASK_ETHERNET;</div><div class='add'>+	/* *** FIXME: don't know why we need 6 and 5, neither is defined. */</div><div class='add'>+	// (1&lt;&lt;6)|(1&lt;&lt;5)|(1&lt;&lt;3);</div><div class='add'>+#endif</div><div class='ctx'> 	GPIO_PFDD	&amp;= ~(1 &lt;&lt; pinCPLD); /* Make input */</div><div class='del'>-	GPIO_INTTYPE1	|=  (1 &lt;&lt; pinCPLD); /* Edge triggered */</div><div class='add'>+	GPIO_INTTYPE1	&amp;= ~(1 &lt;&lt; pinCPLD); /* Level triggered */</div><div class='ctx'> 	GPIO_INTTYPE2	&amp;= ~(1 &lt;&lt; pinCPLD); /* Active low */</div><div class='ctx'> 	barrier ();</div><div class='ctx'> 	GPIO_GPIOFINTEN |=  (1 &lt;&lt; pinCPLD); /* Enable */</div><div class='hunk'>@@ -216,7 +279,7 @@ void __init lh7a40x_init_board_irq (void)</div><div class='ctx'> 	for (irq = IRQ_BOARD_START;</div><div class='ctx'> 	     irq &lt; IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) {</div><div class='ctx'> 		set_irq_chip (irq, &amp;lpd7a40x_cpld_chip);</div><div class='del'>-		set_irq_handler (irq, do_edge_IRQ);</div><div class='add'>+		set_irq_handler (irq, do_level_IRQ);</div><div class='ctx'> 		set_irq_flags (irq, IRQF_VALID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -226,91 +289,109 @@ void __init lh7a40x_init_board_irq (void)</div><div class='ctx'> 				 lpd7a40x_cpld_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct map_desc lpd7a400_io_desc[] __initdata = {</div><div class='add'>+static struct map_desc lpd7a40x_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='del'>-		.virtual	=     IO_VIRT,</div><div class='add'>+		.virtual	= IO_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IO_PHYS),</div><div class='del'>-		.length		= 	    IO_SIZE,</div><div class='add'>+		.length		= IO_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {	/* Mapping added to work around chip select problems */</div><div class='add'>+	},</div><div class='add'>+	{	/* Mapping added to work around chip select problems */</div><div class='ctx'> 		.virtual	= IOBARRIER_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(IOBARRIER_PHYS),</div><div class='ctx'> 		.length		= IOBARRIER_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CF_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CF_PHYS),</div><div class='del'>-		.length		= 	CF_SIZE,</div><div class='add'>+		.length		= CF_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD02_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD02_PHYS),</div><div class='del'>-		.length		= 	CPLD02_SIZE,</div><div class='add'>+		.length		= CPLD02_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD06_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD06_PHYS),</div><div class='del'>-		.length		= 	CPLD06_SIZE,</div><div class='add'>+		.length		= CPLD06_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= CPLD08_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(CPLD08_PHYS),</div><div class='add'>+		.length		= CPLD08_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD08_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD08_PHYS),</div><div class='del'>-		.length		= 	CPLD08_SIZE,</div><div class='add'>+		.length		= CPLD08_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= CPLD0A_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(CPLD0A_PHYS),</div><div class='add'>+		.length		= CPLD0A_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD0C_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD0C_PHYS),</div><div class='del'>-		.length		= 	CPLD0C_SIZE,</div><div class='add'>+		.length		= CPLD0C_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD0E_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD0E_PHYS),</div><div class='del'>-		.length		= 	CPLD0E_SIZE,</div><div class='add'>+		.length		= CPLD0E_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD10_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD10_PHYS),</div><div class='del'>-		.length		= 	CPLD10_SIZE,</div><div class='add'>+		.length		= CPLD10_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD12_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD12_PHYS),</div><div class='del'>-		.length		= 	CPLD12_SIZE,</div><div class='add'>+		.length		= CPLD12_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD14_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD14_PHYS),</div><div class='del'>-		.length		= 	CPLD14_SIZE,</div><div class='add'>+		.length		= CPLD14_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD16_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD16_PHYS),</div><div class='del'>-		.length		= 	CPLD16_SIZE,</div><div class='add'>+		.length		= CPLD16_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD18_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD18_PHYS),</div><div class='del'>-		.length		= 	CPLD18_SIZE,</div><div class='add'>+		.length		= CPLD18_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='del'>-	}, {</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.virtual	= CPLD1A_VIRT,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(CPLD1A_PHYS),</div><div class='del'>-		.length		= 	CPLD1A_SIZE,</div><div class='add'>+		.length		= CPLD1A_SIZE,</div><div class='ctx'> 		.type		= MT_DEVICE</div><div class='ctx'> 	},</div><div class='del'>-	/* This mapping is redundant since the smc driver performs another. */</div><div class='del'>-/*	{ CPLD00_VIRT,  CPLD00_PHYS,	CPLD00_SIZE,	MT_DEVICE }, */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='del'>-lpd7a400_map_io(void)</div><div class='add'>+lpd7a40x_map_io(void)</div><div class='ctx'> {</div><div class='del'>-	iotable_init (lpd7a400_io_desc, ARRAY_SIZE (lpd7a400_io_desc));</div><div class='del'>-</div><div class='del'>-		/* Fixup (improve) Static Memory Controller settings */</div><div class='del'>-	SMC_BCR0 = 0x200039af;	/* Boot Flash */</div><div class='del'>-	SMC_BCR6 = 0x1000fbe0;	/* CPLD */</div><div class='del'>-	SMC_BCR7 = 0x1000b2c2;	/* Compact Flash */</div><div class='add'>+	iotable_init (lpd7a40x_io_desc, ARRAY_SIZE (lpd7a40x_io_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACH_LPD7A400</div><div class='hunk'>@@ -320,7 +401,7 @@ MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")</div><div class='ctx'> 	.phys_io	= 0x80000000,</div><div class='ctx'> 	.io_pg_offst	= ((io_p2v (0x80000000))&gt;&gt;18) &amp; 0xfffc,</div><div class='ctx'> 	.boot_params	= 0xc0000100,</div><div class='del'>-	.map_io		= lpd7a400_map_io,</div><div class='add'>+	.map_io		= lpd7a40x_map_io,</div><div class='ctx'> 	.init_irq	= lh7a400_init_irq,</div><div class='ctx'> 	.timer		= &amp;lh7a40x_timer,</div><div class='ctx'> 	.init_machine	= lpd7a40x_init,</div><div class='hunk'>@@ -335,7 +416,7 @@ MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10")</div><div class='ctx'> 	.phys_io	= 0x80000000,</div><div class='ctx'> 	.io_pg_offst	= ((io_p2v (0x80000000))&gt;&gt;18) &amp; 0xfffc,</div><div class='ctx'> 	.boot_params	= 0xc0000100,</div><div class='del'>-	.map_io		= lpd7a400_map_io,</div><div class='add'>+	.map_io		= lpd7a40x_map_io,</div><div class='ctx'> 	.init_irq	= lh7a404_init_irq,</div><div class='ctx'> 	.timer		= &amp;lh7a40x_timer,</div><div class='ctx'> 	.init_machine	= lpd7a40x_init,</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/clcd.c b/arch/arm/mach-lh7a40x/clcd.c<br/>new file mode 100644<br/>index 000000000000..93751fee793d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/clcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/clcd.c</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/arm/mach-lh7a40x/clcd.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004 Marc Singer</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License</div><div class='add'>+ *  version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+//#include &lt;linux/module.h&gt;</div><div class='add'>+//#include &lt;linux/time.h&gt;</div><div class='add'>+//#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+//#include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+</div><div class='add'>+#define HRTFTC_HRSETUP		__REG(HRTFTC_PHYS + 0x00)</div><div class='add'>+#define HRTFTC_HRCON		__REG(HRTFTC_PHYS + 0x04)</div><div class='add'>+#define HRTFTC_HRTIMING1	__REG(HRTFTC_PHYS + 0x08)</div><div class='add'>+#define HRTFTC_HRTIMING2	__REG(HRTFTC_PHYS + 0x0c)</div><div class='add'>+</div><div class='add'>+#define ALI_SETUP		__REG(ALI_PHYS + 0x00)</div><div class='add'>+#define ALI_CONTROL		__REG(ALI_PHYS + 0x04)</div><div class='add'>+#define ALI_TIMING1		__REG(ALI_PHYS + 0x08)</div><div class='add'>+#define ALI_TIMING2		__REG(ALI_PHYS + 0x0c)</div><div class='add'>+</div><div class='add'>+#include "lcd-panel.h"</div><div class='add'>+</div><div class='add'>+static void lh7a40x_clcd_disable (struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+	CPLD_CONTROL &amp;= ~(1&lt;&lt;1);	/* Disable LCD Vee */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A404)</div><div class='add'>+	GPIO_PCD  &amp;= ~(1&lt;&lt;3);		/* Disable LCD Vee */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_ARCH_LH7A400)</div><div class='add'>+	HRTFTC_HRSETUP &amp;= ~(1&lt;&lt;13);	/* Disable HRTFT controller */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_ARCH_LH7A404)</div><div class='add'>+	ALI_SETUP &amp;= ~(1&lt;&lt;13);		/* Disable ALI */</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lh7a40x_clcd_enable (struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	struct clcd_panel_extra* extra</div><div class='add'>+		= (struct clcd_panel_extra*) fb-&gt;board_data;</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+	CPLD_CONTROL |= (1&lt;&lt;1);		/* Enable LCD Vee */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A404)</div><div class='add'>+	GPIO_PCDD &amp;= ~(1&lt;&lt;3);		/* Enable LCD Vee */</div><div class='add'>+	GPIO_PCD  |=  (1&lt;&lt;3);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_ARCH_LH7A400)</div><div class='add'>+</div><div class='add'>+	if (extra) {</div><div class='add'>+		HRTFTC_HRSETUP</div><div class='add'>+			= (1 &lt;&lt; 13)</div><div class='add'>+			| ((fb-&gt;fb.var.xres - 1) &lt;&lt; 4)</div><div class='add'>+			| 0xc</div><div class='add'>+			| (extra-&gt;hrmode ? 1 : 0);</div><div class='add'>+		HRTFTC_HRCON</div><div class='add'>+			= ((extra-&gt;clsen ? 1 : 0) &lt;&lt; 1)</div><div class='add'>+			| ((extra-&gt;spsen ? 1 : 0) &lt;&lt; 0);</div><div class='add'>+		HRTFTC_HRTIMING1</div><div class='add'>+			= (extra-&gt;pcdel &lt;&lt; 8)</div><div class='add'>+			| (extra-&gt;revdel &lt;&lt; 4)</div><div class='add'>+			| (extra-&gt;lpdel &lt;&lt; 0);</div><div class='add'>+		HRTFTC_HRTIMING2</div><div class='add'>+			= (extra-&gt;spldel &lt;&lt; 9)</div><div class='add'>+			| (extra-&gt;pc2del &lt;&lt; 0);</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		HRTFTC_HRSETUP</div><div class='add'>+			= (1 &lt;&lt; 13)</div><div class='add'>+			| 0xc;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_ARCH_LH7A404)</div><div class='add'>+</div><div class='add'>+	if (extra) {</div><div class='add'>+		ALI_SETUP</div><div class='add'>+			= (1 &lt;&lt; 13)</div><div class='add'>+			| ((fb-&gt;fb.var.xres - 1) &lt;&lt; 4)</div><div class='add'>+			| 0xc</div><div class='add'>+			| (extra-&gt;hrmode ? 1 : 0);</div><div class='add'>+		ALI_CONTROL</div><div class='add'>+			= ((extra-&gt;clsen ? 1 : 0) &lt;&lt; 1)</div><div class='add'>+			| ((extra-&gt;spsen ? 1 : 0) &lt;&lt; 0);</div><div class='add'>+		ALI_TIMING1</div><div class='add'>+			= (extra-&gt;pcdel &lt;&lt; 8)</div><div class='add'>+			| (extra-&gt;revdel &lt;&lt; 4)</div><div class='add'>+			| (extra-&gt;lpdel &lt;&lt; 0);</div><div class='add'>+		ALI_TIMING2</div><div class='add'>+			= (extra-&gt;spldel &lt;&lt; 9)</div><div class='add'>+			| (extra-&gt;pc2del &lt;&lt; 0);</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		ALI_SETUP</div><div class='add'>+			= (1 &lt;&lt; 13)</div><div class='add'>+			| 0xc;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FRAMESIZE(s) (((s) + PAGE_SIZE - 1)&amp;PAGE_MASK)</div><div class='add'>+</div><div class='add'>+static int lh7a40x_clcd_setup (struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	u32 len = FRAMESIZE (lcd_panel.mode.xres*lcd_panel.mode.yres</div><div class='add'>+			     *(lcd_panel.bpp/8));</div><div class='add'>+</div><div class='add'>+	fb-&gt;panel = &amp;lcd_panel;</div><div class='add'>+</div><div class='add'>+		/* Enforce the sync polarity defaults */</div><div class='add'>+	if (!(fb-&gt;panel-&gt;tim2 &amp; TIM2_IHS))</div><div class='add'>+		fb-&gt;fb.var.sync |= FB_SYNC_HOR_HIGH_ACT;</div><div class='add'>+	if (!(fb-&gt;panel-&gt;tim2 &amp; TIM2_IVS))</div><div class='add'>+		fb-&gt;fb.var.sync |= FB_SYNC_VERT_HIGH_ACT;</div><div class='add'>+</div><div class='add'>+#if defined (HAS_LCD_PANEL_EXTRA)</div><div class='add'>+	fb-&gt;board_data = &amp;lcd_panel_extra;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	fb-&gt;fb.screen_base</div><div class='add'>+		= dma_alloc_writecombine (&amp;fb-&gt;dev-&gt;dev, len,</div><div class='add'>+					  &amp;dma, GFP_KERNEL);</div><div class='add'>+	printk ("CLCD: LCD setup fb virt 0x%p phys 0x%p l %x io 0x%p \n",</div><div class='add'>+		fb-&gt;fb.screen_base, (void*) dma, len,</div><div class='add'>+		(void*) io_p2v (CLCDC_PHYS));</div><div class='add'>+	printk ("CLCD: pixclock %d\n", lcd_panel.mode.pixclock);</div><div class='add'>+</div><div class='add'>+	if (!fb-&gt;fb.screen_base) {</div><div class='add'>+		printk(KERN_ERR "CLCD: unable to map framebuffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if defined (USE_RGB555)</div><div class='add'>+	fb-&gt;fb.var.green.length = 5; /* Panel uses RGB 5:5:5 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	fb-&gt;fb.fix.smem_start = dma;</div><div class='add'>+	fb-&gt;fb.fix.smem_len = len;</div><div class='add'>+</div><div class='add'>+		/* Drive PE4 high to prevent CPLD crash */</div><div class='add'>+	GPIO_PEDD |= (1&lt;&lt;4);</div><div class='add'>+	GPIO_PED  |= (1&lt;&lt;4);</div><div class='add'>+</div><div class='add'>+	GPIO_PINMUX |= (1&lt;&lt;1) | (1&lt;&lt;0); /* LCDVD[15:4] */</div><div class='add'>+</div><div class='add'>+//	fb-&gt;fb.fbops-&gt;fb_check_var (&amp;fb-&gt;fb.var, &amp;fb-&gt;fb);</div><div class='add'>+//	fb-&gt;fb.fbops-&gt;fb_set_par (&amp;fb-&gt;fb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lh7a40x_clcd_mmap (struct clcd_fb *fb, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return dma_mmap_writecombine(&amp;fb-&gt;dev-&gt;dev, vma,</div><div class='add'>+				     fb-&gt;fb.screen_base,</div><div class='add'>+				     fb-&gt;fb.fix.smem_start,</div><div class='add'>+				     fb-&gt;fb.fix.smem_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lh7a40x_clcd_remove (struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	dma_free_writecombine (&amp;fb-&gt;dev-&gt;dev, fb-&gt;fb.fix.smem_len,</div><div class='add'>+			       fb-&gt;fb.screen_base, fb-&gt;fb.fix.smem_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clcd_board clcd_platform_data = {</div><div class='add'>+	.name		= "lh7a40x FB",</div><div class='add'>+	.check		= clcdfb_check,</div><div class='add'>+	.decode		= clcdfb_decode,</div><div class='add'>+	.enable		= lh7a40x_clcd_enable,</div><div class='add'>+	.setup		= lh7a40x_clcd_setup,</div><div class='add'>+	.mmap		= lh7a40x_clcd_mmap,</div><div class='add'>+	.remove		= lh7a40x_clcd_remove,</div><div class='add'>+	.disable	= lh7a40x_clcd_disable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IRQ_CLCDC (IRQ_LCDINTR)</div><div class='add'>+</div><div class='add'>+#define AMBA_DEVICE(name,busid,base,plat,pid)			\</div><div class='add'>+static struct amba_device name##_device = {			\</div><div class='add'>+	.dev = {						\</div><div class='add'>+		.coherent_dma_mask = ~0,			\</div><div class='add'>+		.bus_id	= busid,				\</div><div class='add'>+		.platform_data = plat,				\</div><div class='add'>+		},						\</div><div class='add'>+	.res = {						\</div><div class='add'>+		.start	= base##_PHYS,				\</div><div class='add'>+		.end	= (base##_PHYS) + (4*1024) - 1,		\</div><div class='add'>+		.flags	= IORESOURCE_MEM,			\</div><div class='add'>+		},						\</div><div class='add'>+	.dma_mask	= ~0,					\</div><div class='add'>+	.irq		= { IRQ_##base, },			\</div><div class='add'>+	/* .dma		= base##_DMA,*/				\</div><div class='add'>+	.periphid = pid,					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+AMBA_DEVICE(clcd,  "cldc-lh7a40x",  CLCDC,     &amp;clcd_platform_data, 0x41110);</div><div class='add'>+</div><div class='add'>+static struct amba_device *amba_devs[] __initdata = {</div><div class='add'>+	&amp;clcd_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init lh7a40x_clcd_init (void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int result;</div><div class='add'>+	printk ("CLCD: registering amba devices\n");</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(amba_devs); i++) {</div><div class='add'>+		struct amba_device *d = amba_devs[i];</div><div class='add'>+		result = amba_device_register(d, &amp;iomem_resource);</div><div class='add'>+		printk ("  %d -&gt; %d\n", i ,result);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/clocks.c b/arch/arm/mach-lh7a40x/clocks.c<br/>new file mode 100644<br/>index 000000000000..2291afe9f23e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/clocks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/clocks.c</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+/* arch/arm/mach-lh7a40x/clocks.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004 Marc Singer</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License</div><div class='add'>+ *  version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/clocks.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='add'>+struct module;</div><div class='add'>+struct icst525_params;</div><div class='add'>+</div><div class='add'>+struct clk {</div><div class='add'>+	struct list_head node;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	struct module *owner;</div><div class='add'>+	const char *name;</div><div class='add'>+//	void *data;</div><div class='add'>+//	const struct icst525_params *params;</div><div class='add'>+//	void (*setvco)(struct clk *, struct icst525_vco vco);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int clk_register(struct clk *clk);</div><div class='add'>+void clk_unregister(struct clk *clk);</div><div class='add'>+</div><div class='add'>+/* ----- */</div><div class='add'>+</div><div class='add'>+#define MAINDIV1(c)	(((c) &gt;&gt;  7) &amp; 0x0f)</div><div class='add'>+#define MAINDIV2(c)	(((c) &gt;&gt; 11) &amp; 0x1f)</div><div class='add'>+#define PS(c)		(((c) &gt;&gt; 18) &amp; 0x03)</div><div class='add'>+#define PREDIV(c)	(((c) &gt;&gt;  2) &amp; 0x1f)</div><div class='add'>+#define HCLKDIV(c)	(((c) &gt;&gt;  0) &amp; 0x02)</div><div class='add'>+#define PCLKDIV(c)	(((c) &gt;&gt; 16) &amp; 0x03)</div><div class='add'>+</div><div class='add'>+unsigned int cpufreq_get (unsigned int cpu) /* in kHz */</div><div class='add'>+{</div><div class='add'>+	return fclkfreq_get ()/1000;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cpufreq_get);</div><div class='add'>+</div><div class='add'>+unsigned int fclkfreq_get (void)</div><div class='add'>+{</div><div class='add'>+	unsigned int clkset = CSC_CLKSET;</div><div class='add'>+	unsigned int gclk</div><div class='add'>+		= XTAL_IN</div><div class='add'>+		/ (1 &lt;&lt; PS(clkset))</div><div class='add'>+		* (MAINDIV1(clkset) + 2)</div><div class='add'>+		/ (PREDIV(clkset)   + 2)</div><div class='add'>+		* (MAINDIV2(clkset) + 2)</div><div class='add'>+		;</div><div class='add'>+	return gclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int hclkfreq_get (void)</div><div class='add'>+{</div><div class='add'>+	unsigned int clkset = CSC_CLKSET;</div><div class='add'>+	unsigned int hclk = fclkfreq_get () / (HCLKDIV(clkset) + 1);</div><div class='add'>+</div><div class='add'>+	return hclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int pclkfreq_get (void)</div><div class='add'>+{</div><div class='add'>+	unsigned int clkset = CSC_CLKSET;</div><div class='add'>+	int pclkdiv = PCLKDIV(clkset);</div><div class='add'>+	unsigned int pclk;</div><div class='add'>+	if (pclkdiv == 0x3)</div><div class='add'>+		pclkdiv = 0x2;</div><div class='add'>+	pclk = hclkfreq_get () / (1 &lt;&lt; pclkdiv);</div><div class='add'>+</div><div class='add'>+	return pclk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----- */</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(clocks);</div><div class='add'>+static DECLARE_MUTEX(clocks_sem);</div><div class='add'>+</div><div class='add'>+struct clk *clk_get (struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	struct clk *p;</div><div class='add'>+	struct clk *clk = ERR_PTR(-ENOENT);</div><div class='add'>+</div><div class='add'>+	down (&amp;clocks_sem);</div><div class='add'>+	list_for_each_entry (p, &amp;clocks, node) {</div><div class='add'>+		if (strcmp (id, p-&gt;name) == 0</div><div class='add'>+		    &amp;&amp; try_module_get(p-&gt;owner)) {</div><div class='add'>+			clk = p;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	up (&amp;clocks_sem);</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_get);</div><div class='add'>+</div><div class='add'>+void clk_put (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	module_put(clk-&gt;owner);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_put);</div><div class='add'>+</div><div class='add'>+int clk_enable (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_enable);</div><div class='add'>+</div><div class='add'>+void clk_disable (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_disable);</div><div class='add'>+</div><div class='add'>+int clk_use (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_use);</div><div class='add'>+</div><div class='add'>+void clk_unuse (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_unuse);</div><div class='add'>+</div><div class='add'>+unsigned long clk_get_rate (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return clk-&gt;rate;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_get_rate);</div><div class='add'>+</div><div class='add'>+long clk_round_rate (struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_round_rate);</div><div class='add'>+</div><div class='add'>+int clk_set_rate (struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_set_rate);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+/*</div><div class='add'>+ * These are fixed clocks.</div><div class='add'>+ */</div><div class='add'>+static struct clk kmi_clk = {</div><div class='add'>+	.name	= "KMIREFCLK",</div><div class='add'>+	.rate	= 24000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk uart_clk = {</div><div class='add'>+	.name	= "UARTCLK",</div><div class='add'>+	.rate	= 24000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk mmci_clk = {</div><div class='add'>+	.name	= "MCLK",</div><div class='add'>+	.rate	= 33000000,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct clk clcd_clk = {</div><div class='add'>+	.name	= "CLCDCLK",</div><div class='add'>+	.rate	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int clk_register (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	down (&amp;clocks_sem);</div><div class='add'>+	list_add (&amp;clk-&gt;node, &amp;clocks);</div><div class='add'>+	up (&amp;clocks_sem);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_register);</div><div class='add'>+</div><div class='add'>+void clk_unregister (struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	down (&amp;clocks_sem);</div><div class='add'>+	list_del (&amp;clk-&gt;node);</div><div class='add'>+	up (&amp;clocks_sem);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_unregister);</div><div class='add'>+</div><div class='add'>+static int __init clk_init (void)</div><div class='add'>+{</div><div class='add'>+	clk_register(&amp;clcd_clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(clk_init);</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/common.h b/arch/arm/mach-lh7a40x/common.h<br/>index ea8de7e3ab1b..18e8bb4eb202 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/common.h</a></div><div class='hunk'>@@ -12,6 +12,7 @@ extern struct sys_timer lh7a40x_timer;</div><div class='ctx'> </div><div class='ctx'> extern void lh7a400_init_irq (void);</div><div class='ctx'> extern void lh7a404_init_irq (void);</div><div class='add'>+extern void lh7a40x_clcd_init (void);</div><div class='ctx'> extern void lh7a40x_init_board_irq (void);</div><div class='ctx'> </div><div class='ctx'> #define IRQ_DISPATCH(irq) desc_handle_irq((irq),(irq_desc + irq), regs)</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/irq-lh7a404.c b/arch/arm/mach-lh7a40x/irq-lh7a404.c<br/>index e902e3d87da4..2685a81454d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lh7a404.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/irq-lh7a404.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/irq-lh7a404.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/irq-lh7a404.c</a></div><div class='hunk'>@@ -28,13 +28,17 @@</div><div class='ctx'> </div><div class='ctx'> static unsigned char irq_pri_vic1[] = {</div><div class='ctx'> #if defined (USE_PRIORITIES)</div><div class='del'>-IRQ_GPIO3INTR,</div><div class='add'>+	IRQ_GPIO3INTR,			/* CPLD */</div><div class='add'>+	IRQ_DMAM2P4, IRQ_DMAM2P5,	/* AC97 */</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> static unsigned char irq_pri_vic2[] = {</div><div class='ctx'> #if defined (USE_PRIORITIES)</div><div class='del'>-	IRQ_T3UI, IRQ_GPIO7INTR,</div><div class='add'>+	IRQ_T3UI,			/* Timer */</div><div class='add'>+	IRQ_GPIO7INTR,			/* CPLD */</div><div class='ctx'> 	IRQ_UART1INTR, IRQ_UART2INTR, IRQ_UART3INTR,</div><div class='add'>+	IRQ_LCDINTR,			/* LCD */</div><div class='add'>+	IRQ_TSCINTR,			/* ADC/Touchscreen */</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -98,10 +102,19 @@ static struct irqchip lh7a404_gpio_vic2_chip = {</div><div class='ctx'> </div><div class='ctx'>   /* IRQ initialization */</div><div class='ctx'> </div><div class='add'>+#if defined (CONFIG_ARCH_LH7A400) &amp;&amp; defined (CONFIG_ARCH_LH7A404)</div><div class='add'>+extern void* branch_irq_lh7a400;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init lh7a404_init_irq (void)</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='add'>+#if defined (CONFIG_ARCH_LH7A400) &amp;&amp; defined (CONFIG_ARCH_LH7A404)</div><div class='add'>+#define NOP 0xe1a00000			/* mov r0, r0 */</div><div class='add'>+	branch_irq_lh7a400 = NOP;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	VIC1_INTENCLR = 0xffffffff;</div><div class='ctx'> 	VIC2_INTENCLR = 0xffffffff;</div><div class='ctx'> 	VIC1_INTSEL = 0;		/* All IRQs */</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/lcd-panel.h b/arch/arm/mach-lh7a40x/lcd-panel.h<br/>new file mode 100644<br/>index 000000000000..4fb2efc4950f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/lcd-panel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/lcd-panel.h</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+/* lcd-panel.h</div><div class='add'>+     $Id$</div><div class='add'>+</div><div class='add'>+   written by Marc Singer</div><div class='add'>+   18 Jul 2005</div><div class='add'>+</div><div class='add'>+   Copyright (C) 2005 Marc Singer</div><div class='add'>+</div><div class='add'>+   -----------</div><div class='add'>+   DESCRIPTION</div><div class='add'>+   -----------</div><div class='add'>+</div><div class='add'>+   Only one panel may be defined at a time.</div><div class='add'>+</div><div class='add'>+   The pixel clock is calculated to be no greater than the target.</div><div class='add'>+</div><div class='add'>+   Each timing value is accompanied by a specification comment.</div><div class='add'>+</div><div class='add'>+     UNITS/MIN/TYP/MAX</div><div class='add'>+</div><div class='add'>+   Most of the units will be in clocks.</div><div class='add'>+</div><div class='add'>+   USE_RGB555</div><div class='add'>+</div><div class='add'>+     Define this macro to configure the AMBA LCD controller to use an</div><div class='add'>+     RGB555 encoding for the pels instead of the normal RGB565.</div><div class='add'>+</div><div class='add'>+   LPD9520, LPD79524, LPD7A400, LPD7A404-10, LPD7A404-11</div><div class='add'>+</div><div class='add'>+     These boards are best approximated by 555 for all panels.  Some</div><div class='add'>+     can use an extra low-order bit of blue in bit 16 of the color</div><div class='add'>+     value, but we don't have a way to communicate this non-linear</div><div class='add'>+     mapping to the kernel.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if !defined (__LCD_PANEL_H__)</div><div class='add'>+#    define   __LCD_PANEL_H__</div><div class='add'>+</div><div class='add'>+#if defined (MACH_LPD79520)\</div><div class='add'>+ || defined (MACH_LPD79524)\</div><div class='add'>+ || defined (MACH_LPD7A400)\</div><div class='add'>+ || defined (MACH_LPD7A404)</div><div class='add'>+# define USE_RGB555</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct clcd_panel_extra {</div><div class='add'>+	unsigned int hrmode;</div><div class='add'>+	unsigned int clsen;</div><div class='add'>+	unsigned int spsen;</div><div class='add'>+	unsigned int pcdel;</div><div class='add'>+	unsigned int revdel;</div><div class='add'>+	unsigned int lpdel;</div><div class='add'>+	unsigned int spldel;</div><div class='add'>+	unsigned int pc2del;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NS_TO_CLOCK(ns,c)	((((ns)*((c)/1000) + (1000000 - 1))/1000000))</div><div class='add'>+#define CLOCK_TO_DIV(e,c)	(((c) + (e) - 1)/(e))</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT</div><div class='add'>+</div><div class='add'>+	/* Logic Product Development LCD 3.5" QVGA HRTFT -10 */</div><div class='add'>+	/* Sharp PN LQ035Q7DB02 w/HRTFT controller chip */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(6800000)</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "3.5in QVGA (LQ035Q7DB02)",</div><div class='add'>+		.xres		= 240,</div><div class='add'>+		.yres		= 320,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 16,</div><div class='add'>+		.right_margin	= 21,</div><div class='add'>+		.upper_margin	= 8,			// line/8/8/8</div><div class='add'>+		.lower_margin	= 5,</div><div class='add'>+		.hsync_len	= 61,</div><div class='add'>+		.vsync_len	= NS_TO_CLOCK (60, PIX_CLOCK),</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IPC | (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HAS_LCD_PANEL_EXTRA</div><div class='add'>+</div><div class='add'>+static struct clcd_panel_extra lcd_panel_extra = {</div><div class='add'>+	.hrmode = 1,</div><div class='add'>+	.clsen = 1,</div><div class='add'>+	.spsen = 1,</div><div class='add'>+	.pcdel = 8,</div><div class='add'>+	.revdel = 7,</div><div class='add'>+	.lpdel = 13,</div><div class='add'>+	.spldel = 77,</div><div class='add'>+	.pc2del = 208,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_SHARP_LQ057Q3DC02</div><div class='add'>+</div><div class='add'>+	/* Logic Product Development LCD 5.7" QVGA -10 */</div><div class='add'>+	/* Sharp PN LQ057Q3DC02 */</div><div class='add'>+	/* QVGA mode, V/Q=LOW */</div><div class='add'>+</div><div class='add'>+/* From Sharp on 2006.1.3.  I believe some of the values are incorrect</div><div class='add'>+ * based on the datasheet.</div><div class='add'>+</div><div class='add'>+    Timing0	TIMING1		TIMING2		CONTROL</div><div class='add'>+    0x140A0C4C	0x080504EF	0x013F380D	0x00000829</div><div class='add'>+    HBP= 20	VBP=  8		BCD=  0</div><div class='add'>+    HFP= 10	VFP=  5		CPL=319</div><div class='add'>+    HSW= 12	VSW=  1		IOE=  0</div><div class='add'>+    PPL= 19	LPP=239		IPC=  1</div><div class='add'>+				IHS=  1</div><div class='add'>+				IVS=  1</div><div class='add'>+				ACB=  0</div><div class='add'>+				CSEL= 0</div><div class='add'>+				PCD= 13</div><div class='add'>+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* The full horozontal cycle (Th) is clock/360/400/450. */</div><div class='add'>+/* The full vertical   cycle (Tv) is line/251/262/280. */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(6300000) /* -/6.3/7 MHz */</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "5.7in QVGA (LQ057Q3DC02)",</div><div class='add'>+		.xres		= 320,</div><div class='add'>+		.yres		= 240,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 11,</div><div class='add'>+		.right_margin	= 400-11-320-2,</div><div class='add'>+		.upper_margin	= 7,			// line/7/7/7</div><div class='add'>+		.lower_margin	= 262-7-240-2,</div><div class='add'>+		.hsync_len	= 2,			// clk/2/96/200</div><div class='add'>+		.vsync_len	= 2,			// line/2/-/34</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IHS | TIM2_IVS</div><div class='add'>+			| (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_SHARP_LQ64D343</div><div class='add'>+</div><div class='add'>+	/* Logic Product Development LCD 6.4" VGA -10 */</div><div class='add'>+	/* Sharp PN LQ64D343 */</div><div class='add'>+</div><div class='add'>+/* The full horozontal cycle (Th) is clock/750/800/900. */</div><div class='add'>+/* The full vertical   cycle (Tv) is line/515/525/560. */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(28330000)</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "6.4in QVGA (LQ64D343)",</div><div class='add'>+		.xres		= 640,</div><div class='add'>+		.yres		= 480,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 32,</div><div class='add'>+		.right_margin	= 800-32-640-96,</div><div class='add'>+		.upper_margin	= 32,			// line/34/34/34</div><div class='add'>+		.lower_margin	= 540-32-480-2,</div><div class='add'>+		.hsync_len	= 96,			// clk/2/96/200</div><div class='add'>+		.vsync_len	= 2,			// line/2/-/34</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IHS | TIM2_IVS</div><div class='add'>+			| (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_SHARP_LQ10D368</div><div class='add'>+</div><div class='add'>+	/* Logic Product Development LCD 10.4" VGA -10 */</div><div class='add'>+	/* Sharp PN LQ10D368 */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(28330000)</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "10.4in VGA (LQ10D368)",</div><div class='add'>+		.xres		= 640,</div><div class='add'>+		.yres		= 480,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 21,</div><div class='add'>+		.right_margin	= 15,</div><div class='add'>+		.upper_margin	= 34,</div><div class='add'>+		.lower_margin	= 5,</div><div class='add'>+		.hsync_len	= 96,</div><div class='add'>+		.vsync_len	= 16,</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IHS | TIM2_IVS</div><div class='add'>+			| (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_SHARP_LQ121S1DG41</div><div class='add'>+</div><div class='add'>+	/* Logic Product Development LCD 12.1" SVGA -10 */</div><div class='add'>+	/* Sharp PN LQ121S1DG41, was LQ121S1DG31 */</div><div class='add'>+</div><div class='add'>+/* Note that with a 99993900 Hz HCLK, it is not possible to hit the</div><div class='add'>+ * target clock frequency range of 35MHz to 42MHz. */</div><div class='add'>+</div><div class='add'>+/* If the target pixel clock is substantially lower than the panel</div><div class='add'>+ * spec, this is done to prevent the LCD display from glitching when</div><div class='add'>+ * the CPU is under load.  A pixel clock higher than 25MHz</div><div class='add'>+ * (empirically determined) will compete with the CPU for bus cycles</div><div class='add'>+ * for the Ethernet chip.  However, even a pixel clock of 10MHz</div><div class='add'>+ * competes with Compact Flash interface during some operations</div><div class='add'>+ * (fdisk, e2fsck).  And, at that speed the display may have a visible</div><div class='add'>+ * flicker. */</div><div class='add'>+</div><div class='add'>+/* The full horozontal cycle (Th) is clock/832/1056/1395. */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(20000000)</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "12.1in SVGA (LQ121S1DG41)",</div><div class='add'>+		.xres		= 800,</div><div class='add'>+		.yres		= 600,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 89,		// ns/5/-/(1/PIX_CLOCK)-10</div><div class='add'>+		.right_margin	= 1056-800-89-128,</div><div class='add'>+		.upper_margin	= 23,		// line/23/23/23</div><div class='add'>+		.lower_margin	= 44,</div><div class='add'>+		.hsync_len	= 128,		// clk/2/128/200</div><div class='add'>+		.vsync_len	= 4,		// line/2/4/6</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IHS | TIM2_IVS</div><div class='add'>+			| (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_HITACHI</div><div class='add'>+</div><div class='add'>+	/* Hitachi*/</div><div class='add'>+	/* Submitted by Michele Da Rold &lt;michele.darold@ecsproject.com&gt; */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(49000000)</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "Hitachi 800x480",</div><div class='add'>+		.xres		= 800,</div><div class='add'>+		.yres		= 480,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 88,</div><div class='add'>+		.right_margin	= 40,</div><div class='add'>+		.upper_margin	= 32,</div><div class='add'>+		.lower_margin	= 11,</div><div class='add'>+		.hsync_len	= 128,</div><div class='add'>+		.vsync_len	= 2,</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IPC | TIM2_IHS | TIM2_IVS</div><div class='add'>+			| (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined CONFIG_FB_ARMCLCD_AUO_A070VW01_WIDE</div><div class='add'>+</div><div class='add'>+	/* AU Optotronics  A070VW01 7.0 Wide Screen color Display*/</div><div class='add'>+	/* Submitted by Michele Da Rold &lt;michele.darold@ecsproject.com&gt; */</div><div class='add'>+</div><div class='add'>+#define PIX_CLOCK_TARGET	(10000000)</div><div class='add'>+#define PIX_CLOCK_DIVIDER	CLOCK_TO_DIV (PIX_CLOCK_TARGET, HCLK)</div><div class='add'>+#define PIX_CLOCK		(HCLK/PIX_CLOCK_DIVIDER)</div><div class='add'>+</div><div class='add'>+static struct clcd_panel lcd_panel = {</div><div class='add'>+	.mode	= {</div><div class='add'>+		.name		= "7.0in Wide (A070VW01)",</div><div class='add'>+		.xres		= 480,</div><div class='add'>+		.yres		= 234,</div><div class='add'>+		.pixclock	= PIX_CLOCK,</div><div class='add'>+		.left_margin	= 30,</div><div class='add'>+		.right_margin	= 25,</div><div class='add'>+		.upper_margin	= 14,</div><div class='add'>+		.lower_margin	= 12,</div><div class='add'>+		.hsync_len	= 100,</div><div class='add'>+		.vsync_len	= 1,</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		= TIM2_IPC | TIM2_IHS | TIM2_IVS</div><div class='add'>+			| (PIX_CLOCK_DIVIDER - 2),</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_WATERMARK,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#undef NS_TO_CLOCK</div><div class='add'>+#undef CLOCK_TO_DIV</div><div class='add'>+</div><div class='add'>+#endif  /* __LCD_PANEL_H__ */</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/ssp-cpld.c b/arch/arm/mach-lh7a40x/ssp-cpld.c<br/>new file mode 100644<br/>index 000000000000..a10830186dac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/ssp-cpld.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/ssp-cpld.c</a></div><div class='hunk'>@@ -0,0 +1,343 @@</div><div class='add'>+/* arch/arm/mach-lh7a40x/ssp-cpld.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2004,2005 Marc Singer</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License</div><div class='add'>+ *  version 2 as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * SSP/SPI driver for the CardEngine CPLD.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* NOTES</div><div class='add'>+   -----</div><div class='add'>+</div><div class='add'>+   o *** This driver is cribbed from the 7952x implementation.</div><div class='add'>+	 Some comments may not apply.</div><div class='add'>+</div><div class='add'>+   o This driver contains sufficient logic to control either the</div><div class='add'>+     serial EEPROMs or the audio codec.  It is included in the kernel</div><div class='add'>+     to support the codec.  The EEPROMs are really the responsibility</div><div class='add'>+     of the boot loader and should probably be left alone.</div><div class='add'>+</div><div class='add'>+   o The code must be augmented to cope with multiple, simultaneous</div><div class='add'>+     clients.</div><div class='add'>+     o The audio codec writes to the codec chip whenever playback</div><div class='add'>+       starts.</div><div class='add'>+     o The touchscreen driver writes to the ads chip every time it</div><div class='add'>+       samples.</div><div class='add'>+     o The audio codec must write 16 bits, but the touch chip writes</div><div class='add'>+       are 8 bits long.</div><div class='add'>+     o We need to be able to keep these configurations separate while</div><div class='add'>+       simultaneously active.</div><div class='add'>+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+//#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+//#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/ssp.h&gt;</div><div class='add'>+</div><div class='add'>+//#define TALK</div><div class='add'>+</div><div class='add'>+#if defined (TALK)</div><div class='add'>+#define PRINTK(f...)		printk (f)</div><div class='add'>+#else</div><div class='add'>+#define PRINTK(f...)		do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_ARCH_LH7A400)</div><div class='add'>+# define CPLD_SPID		__REGP16(CPLD06_VIRT) /* SPI data */</div><div class='add'>+# define CPLD_SPIC		__REGP16(CPLD08_VIRT) /* SPI control */</div><div class='add'>+# define CPLD_SPIC_CS_CODEC	(1&lt;&lt;0)</div><div class='add'>+# define CPLD_SPIC_CS_TOUCH	(1&lt;&lt;1)</div><div class='add'>+# define CPLD_SPIC_WRITE	(0&lt;&lt;2)</div><div class='add'>+# define CPLD_SPIC_READ		(1&lt;&lt;2)</div><div class='add'>+# define CPLD_SPIC_DONE		(1&lt;&lt;3) /* r/o */</div><div class='add'>+# define CPLD_SPIC_LOAD		(1&lt;&lt;4)</div><div class='add'>+# define CPLD_SPIC_START	(1&lt;&lt;4)</div><div class='add'>+# define CPLD_SPIC_LOADED	(1&lt;&lt;5) /* r/o */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define CPLD_SPI		__REGP16(CPLD0A_VIRT) /* SPI operation */</div><div class='add'>+#define CPLD_SPI_CS_EEPROM	(1&lt;&lt;3)</div><div class='add'>+#define CPLD_SPI_SCLK		(1&lt;&lt;2)</div><div class='add'>+#define CPLD_SPI_TX_SHIFT	(1)</div><div class='add'>+#define CPLD_SPI_TX		(1&lt;&lt;CPLD_SPI_TX_SHIFT)</div><div class='add'>+#define CPLD_SPI_RX_SHIFT	(0)</div><div class='add'>+#define CPLD_SPI_RX		(1&lt;&lt;CPLD_SPI_RX_SHIFT)</div><div class='add'>+</div><div class='add'>+/* *** FIXME: these timing values are substantially larger than the</div><div class='add'>+   *** chip requires. We may implement an nsleep () function. */</div><div class='add'>+#define T_SKH	1		/* Clock time high (us) */</div><div class='add'>+#define T_SKL	1		/* Clock time low (us) */</div><div class='add'>+#define T_CS	1		/* Minimum chip select low time (us)  */</div><div class='add'>+#define T_CSS	1		/* Minimum chip select setup time (us)  */</div><div class='add'>+#define T_DIS	1		/* Data setup time (us) */</div><div class='add'>+</div><div class='add'>+	 /* EEPROM SPI bits */</div><div class='add'>+#define P_START		(1&lt;&lt;9)</div><div class='add'>+#define P_WRITE		(1&lt;&lt;7)</div><div class='add'>+#define P_READ		(2&lt;&lt;7)</div><div class='add'>+#define P_ERASE		(3&lt;&lt;7)</div><div class='add'>+#define P_EWDS		(0&lt;&lt;7)</div><div class='add'>+#define P_WRAL		(0&lt;&lt;7)</div><div class='add'>+#define P_ERAL		(0&lt;&lt;7)</div><div class='add'>+#define P_EWEN		(0&lt;&lt;7)</div><div class='add'>+#define P_A_EWDS	(0&lt;&lt;5)</div><div class='add'>+#define P_A_WRAL	(1&lt;&lt;5)</div><div class='add'>+#define P_A_ERAL	(2&lt;&lt;5)</div><div class='add'>+#define P_A_EWEN	(3&lt;&lt;5)</div><div class='add'>+</div><div class='add'>+struct ssp_configuration {</div><div class='add'>+	int device;</div><div class='add'>+	int mode;</div><div class='add'>+	int speed;</div><div class='add'>+	int frame_size_write;</div><div class='add'>+	int frame_size_read;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ssp_configuration ssp_configuration;</div><div class='add'>+static spinlock_t ssp_lock;</div><div class='add'>+</div><div class='add'>+static void enable_cs (void)</div><div class='add'>+{</div><div class='add'>+	switch (ssp_configuration.device) {</div><div class='add'>+	case DEVICE_EEPROM:</div><div class='add'>+		CPLD_SPI |= CPLD_SPI_CS_EEPROM;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	udelay (T_CSS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_cs (void)</div><div class='add'>+{</div><div class='add'>+	switch (ssp_configuration.device) {</div><div class='add'>+	case DEVICE_EEPROM:</div><div class='add'>+		CPLD_SPI &amp;= ~CPLD_SPI_CS_EEPROM;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	udelay (T_CS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pulse_clock (void)</div><div class='add'>+{</div><div class='add'>+	CPLD_SPI |=  CPLD_SPI_SCLK;</div><div class='add'>+	udelay (T_SKH);</div><div class='add'>+	CPLD_SPI &amp;= ~CPLD_SPI_SCLK;</div><div class='add'>+	udelay (T_SKL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* execute_spi_command</div><div class='add'>+</div><div class='add'>+   sends an spi command to a device.  It first sends cwrite bits from</div><div class='add'>+   v.  If cread is greater than zero it will read cread bits</div><div class='add'>+   (discarding the leading 0 bit) and return them.  If cread is less</div><div class='add'>+   than zero it will check for completetion status and return 0 on</div><div class='add'>+   success or -1 on timeout.  If cread is zero it does nothing other</div><div class='add'>+   than sending the command.</div><div class='add'>+</div><div class='add'>+   On the LPD7A400, we can only read or write multiples of 8 bits on</div><div class='add'>+   the codec and the touch screen device.  Here, we round up.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static int execute_spi_command (int v, int cwrite, int cread)</div><div class='add'>+{</div><div class='add'>+	unsigned long l = 0;</div><div class='add'>+</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+	/* The codec and touch devices cannot be bit-banged.  Instead,</div><div class='add'>+	 * the CPLD provides an eight-bit shift register and a crude</div><div class='add'>+	 * interface.  */</div><div class='add'>+	if (   ssp_configuration.device == DEVICE_CODEC</div><div class='add'>+	    || ssp_configuration.device == DEVICE_TOUCH) {</div><div class='add'>+		int select = 0;</div><div class='add'>+</div><div class='add'>+		PRINTK ("spi(%d %d.%d) 0x%04x",</div><div class='add'>+			ssp_configuration.device, cwrite, cread,</div><div class='add'>+			v);</div><div class='add'>+#if defined (TALK)</div><div class='add'>+		if (ssp_configuration.device == DEVICE_CODEC)</div><div class='add'>+			PRINTK (" 0x%03x -&gt; %2d", v &amp; 0x1ff, (v &gt;&gt; 9) &amp; 0x7f);</div><div class='add'>+#endif</div><div class='add'>+		PRINTK ("\n");</div><div class='add'>+</div><div class='add'>+		if (ssp_configuration.device == DEVICE_CODEC)</div><div class='add'>+			select = CPLD_SPIC_CS_CODEC;</div><div class='add'>+		if (ssp_configuration.device == DEVICE_TOUCH)</div><div class='add'>+			select = CPLD_SPIC_CS_TOUCH;</div><div class='add'>+		if (cwrite) {</div><div class='add'>+			for (cwrite = (cwrite + 7)/8; cwrite-- &gt; 0; ) {</div><div class='add'>+				CPLD_SPID = (v &gt;&gt; (8*cwrite)) &amp; 0xff;</div><div class='add'>+				CPLD_SPIC = select | CPLD_SPIC_LOAD;</div><div class='add'>+				while (!(CPLD_SPIC &amp; CPLD_SPIC_LOADED))</div><div class='add'>+					;</div><div class='add'>+				CPLD_SPIC = select;</div><div class='add'>+				while (!(CPLD_SPIC &amp; CPLD_SPIC_DONE))</div><div class='add'>+					;</div><div class='add'>+			}</div><div class='add'>+			v = 0;</div><div class='add'>+		}</div><div class='add'>+		if (cread) {</div><div class='add'>+			mdelay (2);	/* *** FIXME: required by ads7843? */</div><div class='add'>+			v = 0;</div><div class='add'>+			for (cread = (cread + 7)/8; cread-- &gt; 0;) {</div><div class='add'>+				CPLD_SPID = 0;</div><div class='add'>+				CPLD_SPIC = select | CPLD_SPIC_READ</div><div class='add'>+					| CPLD_SPIC_START;</div><div class='add'>+				while (!(CPLD_SPIC &amp; CPLD_SPIC_LOADED))</div><div class='add'>+					;</div><div class='add'>+				CPLD_SPIC = select | CPLD_SPIC_READ;</div><div class='add'>+				while (!(CPLD_SPIC &amp; CPLD_SPIC_DONE))</div><div class='add'>+					;</div><div class='add'>+				v = (v &lt;&lt; 8) | CPLD_SPID;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return v;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	PRINTK ("spi(%d) 0x%04x -&gt; 0x%x\r\n", ssp_configuration.device,</div><div class='add'>+		v &amp; 0x1ff, (v &gt;&gt; 9) &amp; 0x7f);</div><div class='add'>+</div><div class='add'>+	enable_cs ();</div><div class='add'>+</div><div class='add'>+	v &lt;&lt;= CPLD_SPI_TX_SHIFT; /* Correction for position of SPI_TX bit */</div><div class='add'>+	while (cwrite--) {</div><div class='add'>+		CPLD_SPI</div><div class='add'>+			= (CPLD_SPI &amp; ~CPLD_SPI_TX)</div><div class='add'>+			| ((v &gt;&gt; cwrite) &amp; CPLD_SPI_TX);</div><div class='add'>+		udelay (T_DIS);</div><div class='add'>+		pulse_clock ();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cread &lt; 0) {</div><div class='add'>+		int delay = 10;</div><div class='add'>+		disable_cs ();</div><div class='add'>+		udelay (1);</div><div class='add'>+		enable_cs ();</div><div class='add'>+</div><div class='add'>+		l = -1;</div><div class='add'>+		do {</div><div class='add'>+			if (CPLD_SPI &amp; CPLD_SPI_RX) {</div><div class='add'>+				l = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} while (udelay (1), --delay);</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+	/* We pulse the clock before the data to skip the leading zero. */</div><div class='add'>+		while (cread-- &gt; 0) {</div><div class='add'>+			pulse_clock ();</div><div class='add'>+			l = (l&lt;&lt;1)</div><div class='add'>+				| (((CPLD_SPI &amp; CPLD_SPI_RX)</div><div class='add'>+				    &gt;&gt; CPLD_SPI_RX_SHIFT) &amp; 0x1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	disable_cs ();</div><div class='add'>+	return l;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ssp_init (void)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init (&amp;ssp_lock);</div><div class='add'>+	memset (&amp;ssp_configuration, 0, sizeof (ssp_configuration));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* ssp_chip_select</div><div class='add'>+</div><div class='add'>+   drops the chip select line for the CPLD shift-register controlled</div><div class='add'>+   devices.  It doesn't enable chip</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static void ssp_chip_select (int enable)</div><div class='add'>+{</div><div class='add'>+#if defined (CONFIG_MACH_LPD7A400)</div><div class='add'>+	int select;</div><div class='add'>+</div><div class='add'>+	if (ssp_configuration.device == DEVICE_CODEC)</div><div class='add'>+		select = CPLD_SPIC_CS_CODEC;</div><div class='add'>+	else if (ssp_configuration.device == DEVICE_TOUCH)</div><div class='add'>+		select = CPLD_SPIC_CS_TOUCH;</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		CPLD_SPIC = select;</div><div class='add'>+	else</div><div class='add'>+		CPLD_SPIC = 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ssp_acquire (void)</div><div class='add'>+{</div><div class='add'>+	spin_lock (&amp;ssp_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ssp_release (void)</div><div class='add'>+{</div><div class='add'>+	ssp_chip_select (0);	/* just in case */</div><div class='add'>+	spin_unlock (&amp;ssp_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ssp_configure (int device, int mode, int speed,</div><div class='add'>+			   int frame_size_write, int frame_size_read)</div><div class='add'>+{</div><div class='add'>+	ssp_configuration.device		= device;</div><div class='add'>+	ssp_configuration.mode			= mode;</div><div class='add'>+	ssp_configuration.speed			= speed;</div><div class='add'>+	ssp_configuration.frame_size_write	= frame_size_write;</div><div class='add'>+	ssp_configuration.frame_size_read	= frame_size_read;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ssp_read (void)</div><div class='add'>+{</div><div class='add'>+	return execute_spi_command (0, 0, ssp_configuration.frame_size_read);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ssp_write (u16 data)</div><div class='add'>+{</div><div class='add'>+	execute_spi_command (data, ssp_configuration.frame_size_write, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ssp_write_read (u16 data)</div><div class='add'>+{</div><div class='add'>+	return execute_spi_command (data, ssp_configuration.frame_size_write,</div><div class='add'>+				    ssp_configuration.frame_size_read);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ssp_driver lh7a40x_cpld_ssp_driver = {</div><div class='add'>+	.init		= ssp_init,</div><div class='add'>+	.acquire	= ssp_acquire,</div><div class='add'>+	.release	= ssp_release,</div><div class='add'>+	.configure	= ssp_configure,</div><div class='add'>+	.chip_select	= ssp_chip_select,</div><div class='add'>+	.read		= ssp_read,</div><div class='add'>+	.write		= ssp_write,</div><div class='add'>+	.write_read	= ssp_write_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Marc Singer");</div><div class='add'>+MODULE_DESCRIPTION("LPD7A40X CPLD SPI driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c<br/>index be377e331f25..ad5652e01507 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-lh7a40x/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-lh7a40x/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-lh7a40x/time.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  *  arch/arm/mach-lh7a40x/time.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2004 Logic Product Development</div><div class='hunk'>@@ -8,10 +8,10 @@</div><div class='ctx'>  *  version 2 as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='hunk'>@@ -53,11 +53,11 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction lh7a40x_timer_irq = {</div><div class='ctx'> 	.name		= "LHA740x Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= lh7a40x_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __init lh7a40x_timer_init(void)</div><div class='add'>+static void __init lh7a40x_timer_init (void)</div><div class='ctx'> {</div><div class='ctx'> 				/* Stop/disable all timers */</div><div class='ctx'> 	TIMER_CONTROL1 = 0;</div><div class='head'>diff --git a/arch/arm/mach-netx/Kconfig b/arch/arm/mach-netx/Kconfig<br/>new file mode 100644<br/>index 000000000000..3d90ef19be2b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+menu "NetX Implementations"</div><div class='add'>+	depends on ARCH_NETX</div><div class='add'>+</div><div class='add'>+config MACH_NXDKN</div><div class='add'>+	bool "Enable Hilscher nxdkn Eval Board support"</div><div class='add'>+	depends on ARCH_NETX</div><div class='add'>+	help</div><div class='add'>+	  Board support for the Hilscher NetX Eval Board</div><div class='add'>+</div><div class='add'>+config MACH_NXDB500</div><div class='add'>+	bool "Enable Hilscher nxdb500 Eval Board support"</div><div class='add'>+	depends on ARCH_NETX</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	help</div><div class='add'>+	  Board support for the Hilscher nxdb500 Eval Board</div><div class='add'>+</div><div class='add'>+config MACH_NXEB500HMI</div><div class='add'>+	bool "Enable Hilscher nxeb500hmi Eval Board support"</div><div class='add'>+	depends on ARCH_NETX</div><div class='add'>+	select ARM_AMBA</div><div class='add'>+	help</div><div class='add'>+	  Board support for the Hilscher nxeb500hmi Eval Board</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/arch/arm/mach-netx/Makefile b/arch/arm/mach-netx/Makefile<br/>new file mode 100644<br/>index 000000000000..18785ff37657<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/Makefile</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the linux kernel.</div><div class='add'>+#</div><div class='add'>+# Note! Dependencies are done automagically by 'make dep', which also</div><div class='add'>+# removes any old dependencies. DON'T put your own dependencies here</div><div class='add'>+# unless it's something special (ie not a .c file).</div><div class='add'>+</div><div class='add'>+# Object file lists.</div><div class='add'>+</div><div class='add'>+obj-y			+= time.o generic.o pfifo.o xc.o</div><div class='add'>+</div><div class='add'>+# Specific board support</div><div class='add'>+obj-$(CONFIG_MACH_NXDKN) += nxdkn.o</div><div class='add'>+obj-$(CONFIG_MACH_NXDB500) += nxdb500.o fb.o</div><div class='add'>+obj-$(CONFIG_MACH_NXEB500HMI) += nxeb500hmi.o fb.o</div><div class='head'>diff --git a/arch/arm/mach-netx/Makefile.boot b/arch/arm/mach-netx/Makefile.boot<br/>new file mode 100644<br/>index 000000000000..b81cf6aff0ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/Makefile.boot?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/Makefile.boot</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+    zreladdr-y			:= 0x80008000</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c<br/>new file mode 100644<br/>index 000000000000..ef0ab6115c0b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/fb.c</a></div><div class='hunk'>@@ -0,0 +1,114 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/fb.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+struct clk {};</div><div class='add'>+</div><div class='add'>+static struct clk fb_clk;</div><div class='add'>+</div><div class='add'>+static struct clcd_panel *netx_panel;</div><div class='add'>+</div><div class='add'>+void netx_clcd_enable(struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netx_clcd_setup(struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	fb-&gt;panel = netx_panel;</div><div class='add'>+</div><div class='add'>+	fb-&gt;fb.screen_base = dma_alloc_writecombine(&amp;fb-&gt;dev-&gt;dev, 1024*1024,</div><div class='add'>+						    &amp;dma, GFP_KERNEL);</div><div class='add'>+	if (!fb-&gt;fb.screen_base) {</div><div class='add'>+		printk(KERN_ERR "CLCD: unable to map framebuffer\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fb-&gt;fb.fix.smem_start	= dma;</div><div class='add'>+	fb-&gt;fb.fix.smem_len	= 1024*1024;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int netx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return dma_mmap_writecombine(&amp;fb-&gt;dev-&gt;dev, vma,</div><div class='add'>+				     fb-&gt;fb.screen_base,</div><div class='add'>+				     fb-&gt;fb.fix.smem_start,</div><div class='add'>+				     fb-&gt;fb.fix.smem_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void netx_clcd_remove(struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	dma_free_writecombine(&amp;fb-&gt;dev-&gt;dev, fb-&gt;fb.fix.smem_len,</div><div class='add'>+			      fb-&gt;fb.screen_base, fb-&gt;fb.fix.smem_start);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct clk *clk_get(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	return &amp;fb_clk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void clk_put(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct amba_device fb_device = {</div><div class='add'>+	.dev		= {</div><div class='add'>+		.bus_id	= "fb",</div><div class='add'>+		.coherent_dma_mask = ~0,</div><div class='add'>+	},</div><div class='add'>+	.res		= {</div><div class='add'>+		.start	= 0x00104000,</div><div class='add'>+		.end	= 0x00104fff,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	.irq		= { NETX_IRQ_LCD, NO_IRQ },</div><div class='add'>+	.periphid	= 0x10112400,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel)</div><div class='add'>+{</div><div class='add'>+	netx_panel = panel;</div><div class='add'>+	fb_device.dev.platform_data = board;</div><div class='add'>+	return amba_device_register(&amp;fb_device, &amp;iomem_resource);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-netx/fb.h b/arch/arm/mach-netx/fb.h<br/>new file mode 100644<br/>index 000000000000..4919cf33a5f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/fb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/fb.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/fb.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void netx_clcd_enable(struct clcd_fb *fb);</div><div class='add'>+int netx_clcd_setup(struct clcd_fb *fb);</div><div class='add'>+int netx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma);</div><div class='add'>+void netx_clcd_remove(struct clcd_fb *fb);</div><div class='add'>+int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel);</div><div class='head'>diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c<br/>new file mode 100644<br/>index 000000000000..af0b13534cfd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/generic.c</a></div><div class='hunk'>@@ -0,0 +1,193 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/generic.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/hardware/vic.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+static struct map_desc netx_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual        = NETX_IO_VIRT,</div><div class='add'>+		.pfn            = __phys_to_pfn(NETX_IO_PHYS),</div><div class='add'>+		.length         = NETX_IO_SIZE,</div><div class='add'>+		.type           = MT_DEVICE</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init netx_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(netx_io_desc, ARRAY_SIZE(netx_io_desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct resource netx_rtc_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x00101200,</div><div class='add'>+		.end	= 0x00101220,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_rtc_device = {</div><div class='add'>+	.name		= "netx-rtc",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_rtc_resources),</div><div class='add'>+	.resource	= netx_rtc_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;netx_rtc_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+#define DEBUG_IRQ(fmt...)	printk(fmt)</div><div class='add'>+#else</div><div class='add'>+#define DEBUG_IRQ(fmt...)	while (0) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_hif_demux_handler(unsigned int irq_unused, struct irqdesc *desc,</div><div class='add'>+			struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq = NETX_IRQ_HIF_CHAINED(0);</div><div class='add'>+	unsigned int stat;</div><div class='add'>+</div><div class='add'>+	stat = ((readl(NETX_DPMAS_INT_EN) &amp;</div><div class='add'>+		readl(NETX_DPMAS_INT_STAT)) &gt;&gt; 24) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	desc = irq_desc + NETX_IRQ_HIF_CHAINED(0);</div><div class='add'>+</div><div class='add'>+	while (stat) {</div><div class='add'>+		if (stat &amp; 1) {</div><div class='add'>+			DEBUG_IRQ("handling irq %d\n", irq);</div><div class='add'>+			desc_handle_irq(irq, desc, regs);</div><div class='add'>+		}</div><div class='add'>+		irq++;</div><div class='add'>+		desc++;</div><div class='add'>+		stat &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netx_hif_irq_type(unsigned int _irq, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	unsigned int val, irq;</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_DPMAS_IF_CONF1);</div><div class='add'>+</div><div class='add'>+	irq = _irq - NETX_IRQ_HIF_CHAINED(0);</div><div class='add'>+</div><div class='add'>+	if (type &amp; __IRQT_RISEDGE) {</div><div class='add'>+		DEBUG_IRQ("rising edges\n");</div><div class='add'>+		val |= (1 &lt;&lt; 26) &lt;&lt; irq;</div><div class='add'>+	}</div><div class='add'>+	if (type &amp; __IRQT_FALEDGE) {</div><div class='add'>+		DEBUG_IRQ("falling edges\n");</div><div class='add'>+		val &amp;= ~((1 &lt;&lt; 26) &lt;&lt; irq);</div><div class='add'>+	}</div><div class='add'>+	if (type &amp; __IRQT_LOWLVL) {</div><div class='add'>+		DEBUG_IRQ("low level\n");</div><div class='add'>+		val &amp;= ~((1 &lt;&lt; 26) &lt;&lt; irq);</div><div class='add'>+	}</div><div class='add'>+	if (type &amp; __IRQT_HIGHLVL) {</div><div class='add'>+		DEBUG_IRQ("high level\n");</div><div class='add'>+		val |= (1 &lt;&lt; 26) &lt;&lt; irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(val, NETX_DPMAS_IF_CONF1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_hif_ack_irq(unsigned int _irq)</div><div class='add'>+{</div><div class='add'>+	unsigned int val, irq;</div><div class='add'>+</div><div class='add'>+	irq = _irq - NETX_IRQ_HIF_CHAINED(0);</div><div class='add'>+	writel((1 &lt;&lt; 24) &lt;&lt; irq, NETX_DPMAS_INT_STAT);</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_DPMAS_INT_EN);</div><div class='add'>+	val &amp;= ~((1 &lt;&lt; 24) &lt;&lt; irq);</div><div class='add'>+	writel(val, NETX_DPMAS_INT_EN);</div><div class='add'>+</div><div class='add'>+	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_hif_mask_irq(unsigned int _irq)</div><div class='add'>+{</div><div class='add'>+	unsigned int val, irq;</div><div class='add'>+</div><div class='add'>+	irq = _irq - NETX_IRQ_HIF_CHAINED(0);</div><div class='add'>+	val = readl(NETX_DPMAS_INT_EN);</div><div class='add'>+	val &amp;= ~((1 &lt;&lt; 24) &lt;&lt; irq);</div><div class='add'>+	writel(val, NETX_DPMAS_INT_EN);</div><div class='add'>+	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_hif_unmask_irq(unsigned int _irq)</div><div class='add'>+{</div><div class='add'>+	unsigned int val, irq;</div><div class='add'>+</div><div class='add'>+	irq = _irq - NETX_IRQ_HIF_CHAINED(0);</div><div class='add'>+	val = readl(NETX_DPMAS_INT_EN);</div><div class='add'>+	val |= (1 &lt;&lt; 24) &lt;&lt; irq;</div><div class='add'>+	writel(val, NETX_DPMAS_INT_EN);</div><div class='add'>+	DEBUG_IRQ("%s: irq %d\n", __FUNCTION__, _irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqchip netx_hif_chip = {</div><div class='add'>+	.ack = netx_hif_ack_irq,</div><div class='add'>+	.mask = netx_hif_mask_irq,</div><div class='add'>+	.unmask = netx_hif_unmask_irq,</div><div class='add'>+	.set_type = netx_hif_irq_type,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init netx_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	vic_init(__io(io_p2v(NETX_PA_VIC)), 0, ~0);</div><div class='add'>+</div><div class='add'>+	for (irq = NETX_IRQ_HIF_CHAINED(0); irq &lt;= NETX_IRQ_HIF_LAST; irq++) {</div><div class='add'>+		set_irq_chip(irq, &amp;netx_hif_chip);</div><div class='add'>+		set_irq_handler(irq, do_level_IRQ);</div><div class='add'>+		set_irq_flags(irq, IRQF_VALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(NETX_DPMAS_INT_EN_GLB_EN, NETX_DPMAS_INT_EN);</div><div class='add'>+	set_irq_chained_handler(NETX_IRQ_HIF, netx_hif_demux_handler);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init netx_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(netx_init);</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-netx/generic.h b/arch/arm/mach-netx/generic.h<br/>new file mode 100644<br/>index 000000000000..ede2d35341c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/generic.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/generic.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern void __init netx_map_io(void);</div><div class='add'>+extern void __init netx_init_irq(void);</div><div class='add'>+</div><div class='add'>+struct sys_timer;</div><div class='add'>+extern struct sys_timer netx_timer;</div><div class='head'>diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c<br/>new file mode 100644<br/>index 000000000000..e4a133d62846<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdb500.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/nxdb500.c</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/nxdb500.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mtd/plat-ram.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "fb.h"</div><div class='add'>+</div><div class='add'>+static struct clcd_panel qvga = {</div><div class='add'>+	.mode		= {</div><div class='add'>+		.name		= "QVGA",</div><div class='add'>+		.refresh	= 60,</div><div class='add'>+		.xres		= 240,</div><div class='add'>+		.yres		= 320,</div><div class='add'>+		.pixclock	= 187617,</div><div class='add'>+		.left_margin	= 6,</div><div class='add'>+		.right_margin	= 26,</div><div class='add'>+		.upper_margin	= 0,</div><div class='add'>+		.lower_margin	= 6,</div><div class='add'>+		.hsync_len	= 6,</div><div class='add'>+		.vsync_len	= 1,</div><div class='add'>+		.sync		= 0,</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		=  16,</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_BGR,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+	.grayscale	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int nxdb500_check(struct clcd_fb *fb, struct fb_var_screeninfo *var)</div><div class='add'>+{</div><div class='add'>+	var-&gt;green.length = 5;</div><div class='add'>+	var-&gt;green.msb_right = 0;</div><div class='add'>+</div><div class='add'>+	return clcdfb_check(fb, var);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nxdb500_clcd_setup(struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	fb-&gt;fb.var.green.length = 5;</div><div class='add'>+	fb-&gt;fb.var.green.msb_right = 0;</div><div class='add'>+</div><div class='add'>+	/* enable asic control */</div><div class='add'>+	val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+	writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+</div><div class='add'>+	writel(3, NETX_SYSTEM_IOC_CR);</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_PIO_OUTPIO);</div><div class='add'>+	writel(val | 1, NETX_PIO_OUTPIO);</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_PIO_OEPIO);</div><div class='add'>+	writel(val | 1, NETX_PIO_OEPIO);</div><div class='add'>+	return netx_clcd_setup(fb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clcd_board clcd_data = {</div><div class='add'>+	.name		= "netX",</div><div class='add'>+	.check		= nxdb500_check,</div><div class='add'>+	.decode		= clcdfb_decode,</div><div class='add'>+	.enable		= netx_clcd_enable,</div><div class='add'>+	.setup		= nxdb500_clcd_setup,</div><div class='add'>+	.mmap		= netx_clcd_mmap,</div><div class='add'>+	.remove		= netx_clcd_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netxeth_platform_data eth0_platform_data = {</div><div class='add'>+	.xcno = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_eth0_device = {</div><div class='add'>+	.name		= "netx-eth",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;eth0_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netxeth_platform_data eth1_platform_data = {</div><div class='add'>+	.xcno = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_eth1_device = {</div><div class='add'>+	.name		= "netx-eth",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;eth1_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource netx_uart0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x00100A00,</div><div class='add'>+		.end	= 0x00100A3F,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= (NETX_IRQ_UART0),</div><div class='add'>+		.end	= (NETX_IRQ_UART0),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_uart0_device = {</div><div class='add'>+	.name		= "netx-uart",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_uart0_resources),</div><div class='add'>+	.resource	= netx_uart0_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource netx_uart1_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x00100A40,</div><div class='add'>+		.end	= 0x00100A7F,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= (NETX_IRQ_UART1),</div><div class='add'>+		.end	= (NETX_IRQ_UART1),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_uart1_device = {</div><div class='add'>+	.name		= "netx-uart",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_uart1_resources),</div><div class='add'>+	.resource	= netx_uart1_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource netx_uart2_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x00100A80,</div><div class='add'>+		.end	= 0x00100ABF,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= (NETX_IRQ_UART2),</div><div class='add'>+		.end	= (NETX_IRQ_UART2),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_uart2_device = {</div><div class='add'>+	.name		= "netx-uart",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_uart2_resources),</div><div class='add'>+	.resource	= netx_uart2_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;netx_eth0_device,</div><div class='add'>+	&amp;netx_eth1_device,</div><div class='add'>+	&amp;netx_uart0_device,</div><div class='add'>+	&amp;netx_uart1_device,</div><div class='add'>+	&amp;netx_uart2_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init nxdb500_init(void)</div><div class='add'>+{</div><div class='add'>+	netx_fb_init(&amp;clcd_data, &amp;qvga);</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(NXDB500, "Hilscher nxdb500")</div><div class='add'>+	.phys_io	= 0x00100000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x00100000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x80000100,</div><div class='add'>+	.map_io		= netx_map_io,</div><div class='add'>+	.init_irq	= netx_init_irq,</div><div class='add'>+	.timer		= &amp;netx_timer,</div><div class='add'>+	.init_machine	= nxdb500_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c<br/>new file mode 100644<br/>index 000000000000..7e26c42d1ac7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxdkn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/nxdkn.c</a></div><div class='hunk'>@@ -0,0 +1,103 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/nxdkn.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mtd/plat-ram.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static struct netxeth_platform_data eth0_platform_data = {</div><div class='add'>+	.xcno = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device nxdkn_eth0_device = {</div><div class='add'>+	.name		= "netx-eth",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;eth0_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netxeth_platform_data eth1_platform_data = {</div><div class='add'>+	.xcno = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device nxdkn_eth1_device = {</div><div class='add'>+	.name		= "netx-eth",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;eth1_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource netx_uart0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x00100A00,</div><div class='add'>+		.end	= 0x00100A3F,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= (NETX_IRQ_UART0),</div><div class='add'>+		.end	= (NETX_IRQ_UART0),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_uart0_device = {</div><div class='add'>+	.name		= "netx-uart",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_uart0_resources),</div><div class='add'>+	.resource	= netx_uart0_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;nxdkn_eth0_device,</div><div class='add'>+	&amp;nxdkn_eth1_device,</div><div class='add'>+	&amp;netx_uart0_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init nxdkn_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(NXDKN, "Hilscher nxdkn")</div><div class='add'>+	.phys_io	= 0x00100000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x00100000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x80000100,</div><div class='add'>+	.map_io		= netx_map_io,</div><div class='add'>+	.init_irq	= netx_init_irq,</div><div class='add'>+	.timer		= &amp;netx_timer,</div><div class='add'>+	.init_machine	= nxdkn_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c<br/>new file mode 100644<br/>index 000000000000..53e10a9849f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/nxeb500hmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/nxeb500hmi.c</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/nxeb500hmi.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mtd/plat-ram.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='add'>+#include &lt;linux/amba/clcd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+#include "fb.h"</div><div class='add'>+</div><div class='add'>+static struct clcd_panel qvga = {</div><div class='add'>+	.mode		= {</div><div class='add'>+		.name		= "QVGA",</div><div class='add'>+		.refresh	= 60,</div><div class='add'>+		.xres		= 240,</div><div class='add'>+		.yres		= 320,</div><div class='add'>+		.pixclock	= 187617,</div><div class='add'>+		.left_margin	= 6,</div><div class='add'>+		.right_margin	= 26,</div><div class='add'>+		.upper_margin	= 0,</div><div class='add'>+		.lower_margin	= 6,</div><div class='add'>+		.hsync_len	= 6,</div><div class='add'>+		.vsync_len	= 1,</div><div class='add'>+		.sync		= 0,</div><div class='add'>+		.vmode		= FB_VMODE_NONINTERLACED,</div><div class='add'>+	},</div><div class='add'>+	.width		= -1,</div><div class='add'>+	.height		= -1,</div><div class='add'>+	.tim2		=  16,</div><div class='add'>+	.cntl		= CNTL_LCDTFT | CNTL_BGR,</div><div class='add'>+	.bpp		= 16,</div><div class='add'>+	.grayscale	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int nxeb500hmi_check(struct clcd_fb *fb, struct fb_var_screeninfo *var)</div><div class='add'>+{</div><div class='add'>+	var-&gt;green.length = 5;</div><div class='add'>+	var-&gt;green.msb_right = 0;</div><div class='add'>+</div><div class='add'>+	return clcdfb_check(fb, var);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nxeb500hmi_clcd_setup(struct clcd_fb *fb)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	fb-&gt;fb.var.green.length = 5;</div><div class='add'>+	fb-&gt;fb.var.green.msb_right = 0;</div><div class='add'>+</div><div class='add'>+	/* enable asic control */</div><div class='add'>+	val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+	writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+</div><div class='add'>+	writel(3, NETX_SYSTEM_IOC_CR);</div><div class='add'>+</div><div class='add'>+	/* GPIO 14 is used for display enable on newer boards */</div><div class='add'>+	writel(9, NETX_GPIO_CFG(14));</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_PIO_OUTPIO);</div><div class='add'>+	writel(val | 1, NETX_PIO_OUTPIO);</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_PIO_OEPIO);</div><div class='add'>+	writel(val | 1, NETX_PIO_OEPIO);</div><div class='add'>+	return netx_clcd_setup(fb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clcd_board clcd_data = {</div><div class='add'>+	.name		= "netX",</div><div class='add'>+	.check		= nxeb500hmi_check,</div><div class='add'>+	.decode		= clcdfb_decode,</div><div class='add'>+	.enable		= netx_clcd_enable,</div><div class='add'>+	.setup		= nxeb500hmi_clcd_setup,</div><div class='add'>+	.mmap		= netx_clcd_mmap,</div><div class='add'>+	.remove		= netx_clcd_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netxeth_platform_data eth0_platform_data = {</div><div class='add'>+	.xcno = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_eth0_device = {</div><div class='add'>+	.name		= "netx-eth",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;eth0_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netxeth_platform_data eth1_platform_data = {</div><div class='add'>+	.xcno = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_eth1_device = {</div><div class='add'>+	.name		= "netx-eth",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;eth1_platform_data,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource netx_cf_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x20000000,</div><div class='add'>+		.end	= 0x25ffffff,</div><div class='add'>+		.flags	= IORESOURCE_MEM | IORESOURCE_MEM_8AND16BIT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_cf_device = {</div><div class='add'>+	.name		= "netx-cf",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.resource	= netx_cf_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_cf_resources),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource netx_uart0_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= 0x00100A00,</div><div class='add'>+		.end	= 0x00100A3F,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= (NETX_IRQ_UART0),</div><div class='add'>+		.end	= (NETX_IRQ_UART0),</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device netx_uart0_device = {</div><div class='add'>+	.name		= "netx-uart",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(netx_uart0_resources),</div><div class='add'>+	.resource	= netx_uart0_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;netx_eth0_device,</div><div class='add'>+	&amp;netx_eth1_device,</div><div class='add'>+	&amp;netx_cf_device,</div><div class='add'>+	&amp;netx_uart0_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init nxeb500hmi_init(void)</div><div class='add'>+{</div><div class='add'>+	netx_fb_init(&amp;clcd_data, &amp;qvga);</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi")</div><div class='add'>+	.phys_io	= 0x00100000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x00100000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x80000100,</div><div class='add'>+	.map_io		= netx_map_io,</div><div class='add'>+	.init_irq	= netx_init_irq,</div><div class='add'>+	.timer		= &amp;netx_timer,</div><div class='add'>+	.init_machine	= nxeb500hmi_init,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-netx/pfifo.c b/arch/arm/mach-netx/pfifo.c<br/>new file mode 100644<br/>index 000000000000..44dea61a9de4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/pfifo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/pfifo.c</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/pfifo.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/pfifo.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(pfifo_lock);</div><div class='add'>+</div><div class='add'>+static unsigned int pfifo_used = 0;</div><div class='add'>+</div><div class='add'>+int pfifo_request(unsigned int pfifo_mask)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pfifo_lock);</div><div class='add'>+</div><div class='add'>+	if (pfifo_mask &amp; pfifo_used) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pfifo_used |= pfifo_mask;</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_PFIFO_RESET);</div><div class='add'>+	writel(val | pfifo_mask, NETX_PFIFO_RESET);</div><div class='add'>+	writel(val, NETX_PFIFO_RESET);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;pfifo_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pfifo_free(unsigned int pfifo_mask)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;pfifo_lock);</div><div class='add'>+	pfifo_used &amp;= ~pfifo_mask;</div><div class='add'>+	mutex_unlock(&amp;pfifo_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pfifo_push);</div><div class='add'>+EXPORT_SYMBOL(pfifo_pop);</div><div class='add'>+EXPORT_SYMBOL(pfifo_fill_level);</div><div class='add'>+EXPORT_SYMBOL(pfifo_empty);</div><div class='add'>+EXPORT_SYMBOL(pfifo_request);</div><div class='add'>+EXPORT_SYMBOL(pfifo_free);</div><div class='head'>diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c<br/>new file mode 100644<br/>index 000000000000..6d72c81b7d9f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/time.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/time.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns number of us since last clock interrupt.  Note that interrupts</div><div class='add'>+ * will have been disabled by do_gettimeoffset()</div><div class='add'>+ */</div><div class='add'>+static unsigned long netx_gettimeoffset(void)</div><div class='add'>+{</div><div class='add'>+	return readl(NETX_GPIO_COUNTER_CURRENT(0)) / 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ handler for the timer</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t</div><div class='add'>+netx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	write_seqlock(&amp;xtime_lock);</div><div class='add'>+</div><div class='add'>+	timer_tick(regs);</div><div class='add'>+	write_sequnlock(&amp;xtime_lock);</div><div class='add'>+</div><div class='add'>+	/* acknowledge interrupt */</div><div class='add'>+	writel(COUNTER_BIT(0), NETX_GPIO_IRQ);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct irqaction netx_timer_irq = {</div><div class='add'>+	.name           = "NetX Timer Tick",</div><div class='add'>+	.flags          = IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.handler        = netx_timer_interrupt,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up timer interrupt</div><div class='add'>+ */</div><div class='add'>+static void __init netx_timer_init(void)</div><div class='add'>+{</div><div class='add'>+	/* disable timer initially */</div><div class='add'>+	writel(0, NETX_GPIO_COUNTER_CTRL(0));</div><div class='add'>+</div><div class='add'>+	/* Reset the timer value to zero */</div><div class='add'>+	writel(0, NETX_GPIO_COUNTER_CURRENT(0));</div><div class='add'>+</div><div class='add'>+	writel(LATCH, NETX_GPIO_COUNTER_MAX(0));</div><div class='add'>+</div><div class='add'>+	/* acknowledge interrupt */</div><div class='add'>+	writel(COUNTER_BIT(0), NETX_GPIO_IRQ);</div><div class='add'>+</div><div class='add'>+	/* Enable the interrupt in the specific timer register and start timer */</div><div class='add'>+	writel(COUNTER_BIT(0), NETX_GPIO_IRQ_ENABLE);</div><div class='add'>+	writel(NETX_GPIO_COUNTER_CTRL_IRQ_EN | NETX_GPIO_COUNTER_CTRL_RUN,</div><div class='add'>+		NETX_GPIO_COUNTER_CTRL(0));</div><div class='add'>+</div><div class='add'>+	setup_irq(NETX_IRQ_TIMER0, &amp;netx_timer_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sys_timer netx_timer = {</div><div class='add'>+	.init           = netx_timer_init,</div><div class='add'>+	.offset         = netx_gettimeoffset,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c<br/>new file mode 100644<br/>index 000000000000..172a058ddd66<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-netx/xc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-netx/xc.c</a></div><div class='hunk'>@@ -0,0 +1,255 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-netx/xc.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/xc.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(xc_lock);</div><div class='add'>+</div><div class='add'>+static int xc_in_use = 0;</div><div class='add'>+</div><div class='add'>+struct fw_desc {</div><div class='add'>+	unsigned int ofs;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int patch_ofs;</div><div class='add'>+	unsigned int patch_entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fw_header {</div><div class='add'>+	unsigned int magic;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	unsigned int version;</div><div class='add'>+	unsigned int reserved[5];</div><div class='add'>+	struct fw_desc fw_desc[3];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+int xc_stop(struct xc *x)</div><div class='add'>+{</div><div class='add'>+	writel(RPU_HOLD_PC, x-&gt;xmac_base + NETX_XMAC_RPU_HOLD_PC_OFS);</div><div class='add'>+	writel(TPU_HOLD_PC, x-&gt;xmac_base + NETX_XMAC_TPU_HOLD_PC_OFS);</div><div class='add'>+	writel(XPU_HOLD_PC, x-&gt;xpec_base + NETX_XPEC_XPU_HOLD_PC_OFS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xc_start(struct xc *x)</div><div class='add'>+{</div><div class='add'>+	writel(0, x-&gt;xmac_base + NETX_XMAC_RPU_HOLD_PC_OFS);</div><div class='add'>+	writel(0, x-&gt;xmac_base + NETX_XMAC_TPU_HOLD_PC_OFS);</div><div class='add'>+	writel(0, x-&gt;xpec_base + NETX_XPEC_XPU_HOLD_PC_OFS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xc_running(struct xc *x)</div><div class='add'>+{</div><div class='add'>+	return (readl(x-&gt;xmac_base + NETX_XMAC_RPU_HOLD_PC_OFS) &amp; RPU_HOLD_PC)</div><div class='add'>+	    || (readl(x-&gt;xmac_base + NETX_XMAC_TPU_HOLD_PC_OFS) &amp; TPU_HOLD_PC)</div><div class='add'>+	    || (readl(x-&gt;xpec_base + NETX_XPEC_XPU_HOLD_PC_OFS) &amp; XPU_HOLD_PC) ?</div><div class='add'>+		0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xc_reset(struct xc *x)</div><div class='add'>+{</div><div class='add'>+	writel(0, x-&gt;xpec_base + NETX_XPEC_PC_OFS);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xc_check_ptr(struct xc *x, unsigned long adr, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	if (adr &gt;= NETX_PA_XMAC(x-&gt;no) &amp;&amp;</div><div class='add'>+	    adr + size &lt; NETX_PA_XMAC(x-&gt;no) + XMAC_MEM_SIZE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (adr &gt;= NETX_PA_XPEC(x-&gt;no) &amp;&amp;</div><div class='add'>+	    adr + size &lt; NETX_PA_XPEC(x-&gt;no) + XPEC_MEM_SIZE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_err(x-&gt;dev, "Illegal pointer in firmware found. aborting\n");</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xc_patch(struct xc *x, void *patch, int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int val, adr;</div><div class='add'>+	unsigned int *data = patch;</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		adr = *data++;</div><div class='add'>+		val = *data++;</div><div class='add'>+		if (xc_check_ptr(x, adr, 4) &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		writel(val, (void __iomem *)io_p2v(adr));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xc_request_firmware(struct xc *x)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	char name[16];</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	struct fw_header *head;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	int i;</div><div class='add'>+	void *src;</div><div class='add'>+	unsigned long dst;</div><div class='add'>+</div><div class='add'>+	sprintf(name, "xc%d.bin", x-&gt;no);</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, name, x-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(x-&gt;dev, "request_firmware failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	head = (struct fw_header *)fw-&gt;data;</div><div class='add'>+	if (head-&gt;magic != 0x4e657458) {</div><div class='add'>+		if (head-&gt;magic == 0x5874654e) {</div><div class='add'>+			dev_err(x-&gt;dev,</div><div class='add'>+			    "firmware magic is 'XteN'. Endianess problems?\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto exit_release_firmware;</div><div class='add'>+		}</div><div class='add'>+		dev_err(x-&gt;dev, "unrecognized firmware magic 0x%08x\n",</div><div class='add'>+			head-&gt;magic);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto exit_release_firmware;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	x-&gt;type = head-&gt;type;</div><div class='add'>+	x-&gt;version = head-&gt;version;</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		src = fw-&gt;data + head-&gt;fw_desc[i].ofs;</div><div class='add'>+		dst = *(unsigned int *)src;</div><div class='add'>+		src += sizeof (unsigned int);</div><div class='add'>+		size = head-&gt;fw_desc[i].size - sizeof (unsigned int);</div><div class='add'>+</div><div class='add'>+		if (xc_check_ptr(x, dst, size))</div><div class='add'>+			goto exit_release_firmware;</div><div class='add'>+</div><div class='add'>+		memcpy((void *)io_p2v(dst), src, size);</div><div class='add'>+</div><div class='add'>+		src = fw-&gt;data + head-&gt;fw_desc[i].patch_ofs;</div><div class='add'>+		size = head-&gt;fw_desc[i].patch_entries;</div><div class='add'>+		ret = xc_patch(x, src, size);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto exit_release_firmware;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+      exit_release_firmware:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xc *request_xc(int xcno, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct xc *x = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;xc_lock);</div><div class='add'>+</div><div class='add'>+	if (xcno &gt; 3)</div><div class='add'>+		goto exit;</div><div class='add'>+	if (xc_in_use &amp; (1 &lt;&lt; xcno))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	x = kmalloc(sizeof (struct xc), GFP_KERNEL);</div><div class='add'>+	if (!x)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region</div><div class='add'>+	    (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, dev-&gt;kobj.name))</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region</div><div class='add'>+	    (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, dev-&gt;kobj.name))</div><div class='add'>+		goto exit_release_1;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region</div><div class='add'>+	    (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, dev-&gt;kobj.name))</div><div class='add'>+		goto exit_release_2;</div><div class='add'>+</div><div class='add'>+	x-&gt;xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno));</div><div class='add'>+	x-&gt;xmac_base = (void * __iomem)io_p2v(NETX_PA_XMAC(xcno));</div><div class='add'>+	x-&gt;sram_base = ioremap(SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE);</div><div class='add'>+	if (!x-&gt;sram_base)</div><div class='add'>+		goto exit_release_3;</div><div class='add'>+</div><div class='add'>+	x-&gt;irq = NETX_IRQ_XPEC(xcno);</div><div class='add'>+</div><div class='add'>+	x-&gt;no = xcno;</div><div class='add'>+	x-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	xc_in_use |= (1 &lt;&lt; xcno);</div><div class='add'>+</div><div class='add'>+	goto exit;</div><div class='add'>+</div><div class='add'>+      exit_release_3:</div><div class='add'>+	release_mem_region(SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE);</div><div class='add'>+      exit_release_2:</div><div class='add'>+	release_mem_region(NETX_PA_XMAC(xcno), XMAC_MEM_SIZE);</div><div class='add'>+      exit_release_1:</div><div class='add'>+	release_mem_region(NETX_PA_XPEC(xcno), XPEC_MEM_SIZE);</div><div class='add'>+      exit_free:</div><div class='add'>+	kfree(x);</div><div class='add'>+	x = NULL;</div><div class='add'>+      exit:</div><div class='add'>+	mutex_unlock(&amp;xc_lock);</div><div class='add'>+	return x;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_xc(struct xc *x)</div><div class='add'>+{</div><div class='add'>+	int xcno = x-&gt;no;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;xc_lock);</div><div class='add'>+</div><div class='add'>+	iounmap(x-&gt;sram_base);</div><div class='add'>+	release_mem_region(SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE);</div><div class='add'>+	release_mem_region(NETX_PA_XMAC(xcno), XMAC_MEM_SIZE);</div><div class='add'>+	release_mem_region(NETX_PA_XPEC(xcno), XPEC_MEM_SIZE);</div><div class='add'>+	xc_in_use &amp;= ~(1 &lt;&lt; x-&gt;no);</div><div class='add'>+	kfree(x);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;xc_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(free_xc);</div><div class='add'>+EXPORT_SYMBOL(request_xc);</div><div class='add'>+EXPORT_SYMBOL(xc_request_firmware);</div><div class='add'>+EXPORT_SYMBOL(xc_reset);</div><div class='add'>+EXPORT_SYMBOL(xc_running);</div><div class='add'>+EXPORT_SYMBOL(xc_start);</div><div class='add'>+EXPORT_SYMBOL(xc_stop);</div><div class='head'>diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig<br/>index f8d716ccc1df..d135568dc9e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/Kconfig</a></div><div class='hunk'>@@ -62,6 +62,13 @@ config MACH_OMAP_PERSEUS2</div><div class='ctx'> 	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such</div><div class='ctx'> 	  a board.</div><div class='ctx'> </div><div class='add'>+config MACH_OMAP_FSAMPLE</div><div class='add'>+	bool "TI F-Sample"</div><div class='add'>+	depends on ARCH_OMAP1 &amp;&amp; ARCH_OMAP730</div><div class='add'>+    	help</div><div class='add'>+	  Support for TI OMAP 850 F-Sample board. Say Y here if you have such</div><div class='add'>+	  a board.</div><div class='add'>+</div><div class='ctx'> config MACH_VOICEBLUE</div><div class='ctx'> 	bool "Voiceblue"</div><div class='ctx'> 	depends on ARCH_OMAP1 &amp;&amp; ARCH_OMAP15XX</div><div class='head'>diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile<br/>index 9ea719550ad3..7165f74f78da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/Makefile</a></div><div class='hunk'>@@ -17,6 +17,7 @@ obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= board-innovator.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o</div><div class='add'>+obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o</div><div class='ctx'> obj-$(CONFIG_MACH_VOICEBLUE)		+= board-voiceblue.o</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c<br/>index 6178f046f128..8437d065ada5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-ams-delta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-ams-delta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/board-ams-delta.c</a></div><div class='hunk'>@@ -80,8 +80,24 @@ static struct omap_uart_config ams_delta_uart_config __initdata = {</div><div class='ctx'> 	.enabled_uarts = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct omap_usb_config ams_delta_usb_config __initdata = {</div><div class='add'>+	.register_host	= 1,</div><div class='add'>+	.hmc_mode	= 16,</div><div class='add'>+	.pins[0]	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct omap_board_config_kernel ams_delta_config[] = {</div><div class='ctx'> 	{ OMAP_TAG_UART,	&amp;ams_delta_uart_config },</div><div class='add'>+	{ OMAP_TAG_USB,		&amp;ams_delta_usb_config },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device ams_delta_led_device = {</div><div class='add'>+	.name	= "ams-delta-led",</div><div class='add'>+	.id	= -1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *ams_delta_devices[] __initdata = {</div><div class='add'>+	&amp;ams_delta_led_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init ams_delta_init(void)</div><div class='hunk'>@@ -94,6 +110,8 @@ static void __init ams_delta_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Clear latch2 (NAND, LCD, modem enable) */</div><div class='ctx'> 	ams_delta_latch2_write(~0, 0);</div><div class='add'>+</div><div class='add'>+	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init ams_delta_map_io(void)</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c<br/>new file mode 100644<br/>index 000000000000..c753a3c5aadd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-fsample.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/board-fsample.c</a></div><div class='hunk'>@@ -0,0 +1,319 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-omap1/board-fsample.c</div><div class='add'>+ *</div><div class='add'>+ * Modified from board-perseus2.c</div><div class='add'>+ *</div><div class='add'>+ * Original OMAP730 support by Jean Pihet &lt;j-pihet@ti.com&gt;</div><div class='add'>+ * Updated for 2.6 by Kevin Hilman &lt;kjh@hilman.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/flash.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/tc.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/mux.h&gt;</div><div class='add'>+#include &lt;asm/arch/fpga.h&gt;</div><div class='add'>+#include &lt;asm/arch/keypad.h&gt;</div><div class='add'>+#include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;asm/arch/board.h&gt;</div><div class='add'>+#include &lt;asm/arch/board-fsample.h&gt;</div><div class='add'>+</div><div class='add'>+static int fsample_keymap[] = {</div><div class='add'>+	KEY(0,0,KEY_UP),</div><div class='add'>+	KEY(0,1,KEY_RIGHT),</div><div class='add'>+	KEY(0,2,KEY_LEFT),</div><div class='add'>+	KEY(0,3,KEY_DOWN),</div><div class='add'>+	KEY(0,4,KEY_CENTER),</div><div class='add'>+	KEY(0,5,KEY_0_5),</div><div class='add'>+	KEY(1,0,KEY_SOFT2),</div><div class='add'>+	KEY(1,1,KEY_SEND),</div><div class='add'>+	KEY(1,2,KEY_END),</div><div class='add'>+	KEY(1,3,KEY_VOLUMEDOWN),</div><div class='add'>+	KEY(1,4,KEY_VOLUMEUP),</div><div class='add'>+	KEY(1,5,KEY_RECORD),</div><div class='add'>+	KEY(2,0,KEY_SOFT1),</div><div class='add'>+	KEY(2,1,KEY_3),</div><div class='add'>+	KEY(2,2,KEY_6),</div><div class='add'>+	KEY(2,3,KEY_9),</div><div class='add'>+	KEY(2,4,KEY_SHARP),</div><div class='add'>+	KEY(2,5,KEY_2_5),</div><div class='add'>+	KEY(3,0,KEY_BACK),</div><div class='add'>+	KEY(3,1,KEY_2),</div><div class='add'>+	KEY(3,2,KEY_5),</div><div class='add'>+	KEY(3,3,KEY_8),</div><div class='add'>+	KEY(3,4,KEY_0),</div><div class='add'>+	KEY(3,5,KEY_HEADSETHOOK),</div><div class='add'>+	KEY(4,0,KEY_HOME),</div><div class='add'>+	KEY(4,1,KEY_1),</div><div class='add'>+	KEY(4,2,KEY_4),</div><div class='add'>+	KEY(4,3,KEY_7),</div><div class='add'>+	KEY(4,4,KEY_STAR),</div><div class='add'>+	KEY(4,5,KEY_POWER),</div><div class='add'>+	0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource smc91x_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= H2P2_DBG_FPGA_ETHR_START,	/* Physical */</div><div class='add'>+		.end	= H2P2_DBG_FPGA_ETHR_START + 0xf,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= INT_730_MPU_EXT_NIRQ,</div><div class='add'>+		.end	= 0,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_partition nor_partitions[] = {</div><div class='add'>+	/* bootloader (U-Boot, etc) in first sector */</div><div class='add'>+	{</div><div class='add'>+	      .name		= "bootloader",</div><div class='add'>+	      .offset		= 0,</div><div class='add'>+	      .size		= SZ_128K,</div><div class='add'>+	      .mask_flags	= MTD_WRITEABLE, /* force read-only */</div><div class='add'>+	},</div><div class='add'>+	/* bootloader params in the next sector */</div><div class='add'>+	{</div><div class='add'>+	      .name		= "params",</div><div class='add'>+	      .offset		= MTDPART_OFS_APPEND,</div><div class='add'>+	      .size		= SZ_128K,</div><div class='add'>+	      .mask_flags	= 0,</div><div class='add'>+	},</div><div class='add'>+	/* kernel */</div><div class='add'>+	{</div><div class='add'>+	      .name		= "kernel",</div><div class='add'>+	      .offset		= MTDPART_OFS_APPEND,</div><div class='add'>+	      .size		= SZ_2M,</div><div class='add'>+	      .mask_flags	= 0</div><div class='add'>+	},</div><div class='add'>+	/* rest of flash is a file system */</div><div class='add'>+	{</div><div class='add'>+	      .name		= "rootfs",</div><div class='add'>+	      .offset		= MTDPART_OFS_APPEND,</div><div class='add'>+	      .size		= MTDPART_SIZ_FULL,</div><div class='add'>+	      .mask_flags	= 0</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data nor_data = {</div><div class='add'>+	.map_name	= "cfi_probe",</div><div class='add'>+	.width		= 2,</div><div class='add'>+	.parts		= nor_partitions,</div><div class='add'>+	.nr_parts	= ARRAY_SIZE(nor_partitions),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource nor_resource = {</div><div class='add'>+	.start		= OMAP_CS0_PHYS,</div><div class='add'>+	.end		= OMAP_CS0_PHYS + SZ_32M - 1,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device nor_device = {</div><div class='add'>+	.name		= "omapflash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;nor_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;nor_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct nand_platform_data nand_data = {</div><div class='add'>+	.options	= NAND_SAMSUNG_LP_OPTIONS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource nand_resource = {</div><div class='add'>+	.start		= OMAP_CS3_PHYS,</div><div class='add'>+	.end		= OMAP_CS3_PHYS + SZ_4K - 1,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device nand_device = {</div><div class='add'>+	.name		= "omapnand",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;nand_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;nand_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smc91x_device = {</div><div class='add'>+	.name		= "smc91x",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(smc91x_resources),</div><div class='add'>+	.resource	= smc91x_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource kp_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= INT_730_MPUIO_KEYPAD,</div><div class='add'>+		.end	= INT_730_MPUIO_KEYPAD,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_kp_platform_data kp_data = {</div><div class='add'>+	.rows	= 8,</div><div class='add'>+	.cols	= 8,</div><div class='add'>+	.keymap = fsample_keymap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device kp_device = {</div><div class='add'>+	.name		= "omap-keypad",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;kp_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(kp_resources),</div><div class='add'>+	.resource	= kp_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device lcd_device = {</div><div class='add'>+	.name		= "lcd_p2",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;nor_device,</div><div class='add'>+	&amp;nand_device,</div><div class='add'>+	&amp;smc91x_device,</div><div class='add'>+	&amp;kp_device,</div><div class='add'>+	&amp;lcd_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define P2_NAND_RB_GPIO_PIN	62</div><div class='add'>+</div><div class='add'>+static int nand_dev_ready(struct nand_platform_data *data)</div><div class='add'>+{</div><div class='add'>+	return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct omap_uart_config fsample_uart_config __initdata = {</div><div class='add'>+	.enabled_uarts = ((1 &lt;&lt; 0) | (1 &lt;&lt; 1)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_lcd_config fsample_lcd_config __initdata = {</div><div class='add'>+	.ctrl_name	= "internal",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_board_config_kernel fsample_config[] = {</div><div class='add'>+	{ OMAP_TAG_UART,	&amp;fsample_uart_config },</div><div class='add'>+	{ OMAP_TAG_LCD,		&amp;fsample_lcd_config },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init omap_fsample_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!(omap_request_gpio(P2_NAND_RB_GPIO_PIN)))</div><div class='add'>+		nand_data.dev_ready = nand_dev_ready;</div><div class='add'>+</div><div class='add'>+	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);</div><div class='add'>+	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);</div><div class='add'>+</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+</div><div class='add'>+	omap_board_config = fsample_config;</div><div class='add'>+	omap_board_config_size = ARRAY_SIZE(fsample_config);</div><div class='add'>+	omap_serial_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init fsample_init_smc91x(void)</div><div class='add'>+{</div><div class='add'>+	fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);</div><div class='add'>+	mdelay(50);</div><div class='add'>+	fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) &amp; ~1,</div><div class='add'>+		   H2P2_DBG_FPGA_LAN_RESET);</div><div class='add'>+	mdelay(50);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void omap_fsample_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	omap1_init_common_hw();</div><div class='add'>+	omap_init_irq();</div><div class='add'>+	omap_gpio_init();</div><div class='add'>+	fsample_init_smc91x();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Only FPGA needs to be mapped here. All others are done with ioremap */</div><div class='add'>+static struct map_desc omap_fsample_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual	= H2P2_DBG_FPGA_BASE,</div><div class='add'>+		.pfn		= __phys_to_pfn(H2P2_DBG_FPGA_START),</div><div class='add'>+		.length		= H2P2_DBG_FPGA_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.virtual	= FSAMPLE_CPLD_BASE,</div><div class='add'>+		.pfn		= __phys_to_pfn(FSAMPLE_CPLD_START),</div><div class='add'>+		.length		= FSAMPLE_CPLD_SIZE,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init omap_fsample_map_io(void)</div><div class='add'>+{</div><div class='add'>+	omap1_map_common_io();</div><div class='add'>+	iotable_init(omap_fsample_io_desc,</div><div class='add'>+		     ARRAY_SIZE(omap_fsample_io_desc));</div><div class='add'>+</div><div class='add'>+	/* Early, board-dependent init */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Hold GSM Reset until needed</div><div class='add'>+	 */</div><div class='add'>+	omap_writew(omap_readw(OMAP730_DSP_M_CTL) &amp; ~1, OMAP730_DSP_M_CTL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * UARTs -&gt; done automagically by 8250 driver</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CSx timings, GPIO Mux ... setup</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Flash: CS0 timings setup */</div><div class='add'>+	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);</div><div class='add'>+	omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ethernet support through the debug board</div><div class='add'>+	 * CS1 timings setup</div><div class='add'>+	 */</div><div class='add'>+	omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);</div><div class='add'>+	omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,</div><div class='add'>+	 * It is used as the Ethernet controller interrupt</div><div class='add'>+	 */</div><div class='add'>+	omap_writel(omap_readl(OMAP730_IO_CONF_9) &amp; 0x1FFFFFFF, OMAP730_IO_CONF_9);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")</div><div class='add'>+/* Maintainer: Brian Swetland &lt;swetland@google.com&gt; */</div><div class='add'>+	.phys_io	= 0xfff00000,</div><div class='add'>+	.io_pg_offst	= ((0xfef00000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= 0x10000100,</div><div class='add'>+	.map_io		= omap_fsample_map_io,</div><div class='add'>+	.init_irq	= omap_fsample_init_irq,</div><div class='add'>+	.init_machine	= omap_fsample_init,</div><div class='add'>+	.timer		= &amp;omap_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c<br/>index 4b8d0ec73cb7..7b206116cd03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-h3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-h3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/board-h3.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c<br/>index e90c137a4cf3..4cbc62db5b5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-innovator.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-innovator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-innovator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/board-innovator.c</a></div><div class='hunk'>@@ -37,6 +37,8 @@</div><div class='ctx'> #include &lt;asm/arch/usb.h&gt;</div><div class='ctx'> #include &lt;asm/arch/keypad.h&gt;</div><div class='ctx'> #include &lt;asm/arch/common.h&gt;</div><div class='add'>+#include &lt;asm/arch/mcbsp.h&gt;</div><div class='add'>+#include &lt;asm/arch/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int innovator_keymap[] = {</div><div class='ctx'> 	KEY(0, 0, KEY_F1),</div><div class='hunk'>@@ -112,6 +114,42 @@ static struct platform_device innovator_flash_device = {</div><div class='ctx'> 	.resource	= &amp;innovator_flash_resource,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DEFAULT_BITPERSAMPLE 16</div><div class='add'>+</div><div class='add'>+static struct omap_mcbsp_reg_cfg mcbsp_regs = {</div><div class='add'>+	.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),</div><div class='add'>+	.spcr1 = RINTM(3) | RRST,</div><div class='add'>+	.rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |</div><div class='add'>+	    RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(0),</div><div class='add'>+	.rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),</div><div class='add'>+	.xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |</div><div class='add'>+	    XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(0) | XFIG,</div><div class='add'>+	.xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),</div><div class='add'>+	.srgr1 = FWID(DEFAULT_BITPERSAMPLE - 1),</div><div class='add'>+	.srgr2 = GSYNC | CLKSP | FSGM | FPER(DEFAULT_BITPERSAMPLE * 2 - 1),</div><div class='add'>+	/*.pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP,*/ /* mcbsp: master */</div><div class='add'>+	.pcr0 = CLKXP | CLKRP,  /* mcbsp: slave */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_alsa_codec_config alsa_config = {</div><div class='add'>+	.name			= "OMAP Innovator AIC23",</div><div class='add'>+	.mcbsp_regs_alsa	= &amp;mcbsp_regs,</div><div class='add'>+	.codec_configure_dev	= NULL, // aic23_configure,</div><div class='add'>+	.codec_set_samplerate	= NULL, // aic23_set_samplerate,</div><div class='add'>+	.codec_clock_setup	= NULL, // aic23_clock_setup,</div><div class='add'>+	.codec_clock_on		= NULL, // aic23_clock_on,</div><div class='add'>+	.codec_clock_off	= NULL, // aic23_clock_off,</div><div class='add'>+	.get_default_samplerate	= NULL, // aic23_get_default_samplerate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device innovator_mcbsp1_device = {</div><div class='add'>+	.name	= "omap_alsa_mcbsp",</div><div class='add'>+ 	.id	= 1,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;alsa_config,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct resource innovator_kp_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.start	= INT_KEYBOARD,</div><div class='hunk'>@@ -139,6 +177,10 @@ static struct platform_device innovator_kp_device = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP15XX</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Only FPGA needs to be mapped here. All others are done with ioremap */</div><div class='ctx'> static struct map_desc innovator1510_io_desc[] __initdata = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -174,13 +216,44 @@ static struct platform_device innovator1510_lcd_device = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_device innovator1510_spi_device = {</div><div class='add'>+	.name		= "spi_inn1510",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device *innovator1510_devices[] __initdata = {</div><div class='ctx'> 	&amp;innovator_flash_device,</div><div class='ctx'> 	&amp;innovator1510_smc91x_device,</div><div class='add'>+	&amp;innovator_mcbsp1_device,</div><div class='ctx'> 	&amp;innovator_kp_device,</div><div class='ctx'> 	&amp;innovator1510_lcd_device,</div><div class='add'>+	&amp;innovator1510_spi_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int innovator_get_pendown_state(void)</div><div class='add'>+{</div><div class='add'>+	return !(fpga_read(OMAP1510_FPGA_TOUCHSCREEN) &amp; (1 &lt;&lt; 5));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ads7846_platform_data innovator1510_ts_info = {</div><div class='add'>+	.model			= 7846,</div><div class='add'>+	.vref_delay_usecs	= 100,	/* internal, no capacitor */</div><div class='add'>+	.x_plate_ohms		= 419,</div><div class='add'>+	.y_plate_ohms		= 486,</div><div class='add'>+	.get_pendown_state	= innovator_get_pendown_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info __initdata innovator1510_boardinfo[] = { {</div><div class='add'>+	/* FPGA (bus "10") CS0 has an ads7846e */</div><div class='add'>+	.modalias		= "ads7846",</div><div class='add'>+	.platform_data		= &amp;innovator1510_ts_info,</div><div class='add'>+	.irq			= OMAP1510_INT_FPGA_TS,</div><div class='add'>+	.max_speed_hz		= 120000 /* max sample rate at 3V */</div><div class='add'>+					* 26 /* command + data + overhead */,</div><div class='add'>+	.bus_num		= 10,</div><div class='add'>+	.chip_select		= 0,</div><div class='add'>+} };</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_ARCH_OMAP15XX */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP16XX</div><div class='hunk'>@@ -311,6 +384,8 @@ static void __init innovator_init(void)</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP15XX</div><div class='ctx'> 	if (cpu_is_omap1510()) {</div><div class='ctx'> 		platform_add_devices(innovator1510_devices, ARRAY_SIZE(innovator1510_devices));</div><div class='add'>+		spi_register_board_info(innovator1510_boardinfo,</div><div class='add'>+				ARRAY_SIZE(innovator1510_boardinfo));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP16XX</div><div class='head'>diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c<br/>index 1160093e8ef6..b742261c97ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-osk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/board-osk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/board-osk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/board-osk.c</a></div><div class='hunk'>@@ -29,11 +29,10 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -45,25 +44,10 @@</div><div class='ctx'> #include &lt;asm/arch/usb.h&gt;</div><div class='ctx'> #include &lt;asm/arch/mux.h&gt;</div><div class='ctx'> #include &lt;asm/arch/tc.h&gt;</div><div class='del'>-#include &lt;asm/arch/keypad.h&gt;</div><div class='ctx'> #include &lt;asm/arch/common.h&gt;</div><div class='ctx'> #include &lt;asm/arch/mcbsp.h&gt;</div><div class='ctx'> #include &lt;asm/arch/omap-alsa.h&gt;</div><div class='ctx'> </div><div class='del'>-static int osk_keymap[] = {</div><div class='del'>-	KEY(0, 0, KEY_F1),</div><div class='del'>-	KEY(0, 3, KEY_UP),</div><div class='del'>-	KEY(1, 1, KEY_LEFTCTRL),</div><div class='del'>-	KEY(1, 2, KEY_LEFT),</div><div class='del'>-	KEY(2, 0, KEY_SPACE),</div><div class='del'>-	KEY(2, 1, KEY_ESC),</div><div class='del'>-	KEY(2, 2, KEY_DOWN),</div><div class='del'>-	KEY(3, 2, KEY_ENTER),</div><div class='del'>-	KEY(3, 3, KEY_RIGHT),</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct mtd_partition osk_partitions[] = {</div><div class='ctx'> 	/* bootloader (U-Boot, etc) in first sector */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -181,48 +165,17 @@ static struct omap_alsa_codec_config alsa_config = {</div><div class='ctx'> </div><div class='ctx'> static struct platform_device osk5912_mcbsp1_device = {</div><div class='ctx'> 	.name	= "omap_alsa_mcbsp",</div><div class='del'>- 	.id	= 1,</div><div class='add'>+	.id	= 1,</div><div class='ctx'> 	.dev = {</div><div class='ctx'> 		.platform_data	= &amp;alsa_config,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource osk5912_kp_resources[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start	= INT_KEYBOARD,</div><div class='del'>-		.end	= INT_KEYBOARD,</div><div class='del'>-		.flags	= IORESOURCE_IRQ,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct omap_kp_platform_data osk_kp_data = {</div><div class='del'>-	.rows	= 8,</div><div class='del'>-	.cols	= 8,</div><div class='del'>-	.keymap = osk_keymap,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device osk5912_kp_device = {</div><div class='del'>-	.name		= "omap-keypad",</div><div class='del'>-	.id		= -1,</div><div class='del'>-	.dev		= {</div><div class='del'>-		.platform_data = &amp;osk_kp_data,</div><div class='del'>-	},</div><div class='del'>-	.num_resources	= ARRAY_SIZE(osk5912_kp_resources),</div><div class='del'>-	.resource	= osk5912_kp_resources,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device osk5912_lcd_device = {</div><div class='del'>-	.name		= "lcd_osk",</div><div class='del'>-	.id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct platform_device *osk5912_devices[] __initdata = {</div><div class='ctx'> 	&amp;osk5912_flash_device,</div><div class='ctx'> 	&amp;osk5912_smc91x_device,</div><div class='ctx'> 	&amp;osk5912_cf_device,</div><div class='ctx'> 	&amp;osk5912_mcbsp1_device,</div><div class='del'>-	&amp;osk5912_kp_device,</div><div class='del'>-	&amp;osk5912_lcd_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init osk_init_smc91x(void)</div><div class='hunk'>@@ -276,18 +229,100 @@ static struct omap_uart_config osk_uart_config __initdata = {</div><div class='ctx'> 	.enabled_uarts = (1 &lt;&lt; 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef	CONFIG_OMAP_OSK_MISTRAL</div><div class='ctx'> static struct omap_lcd_config osk_lcd_config __initdata = {</div><div class='ctx'> 	.ctrl_name	= "internal",</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct omap_board_config_kernel osk_config[] = {</div><div class='ctx'> 	{ OMAP_TAG_USB,           &amp;osk_usb_config },</div><div class='ctx'> 	{ OMAP_TAG_UART,		&amp;osk_uart_config },</div><div class='add'>+#ifdef	CONFIG_OMAP_OSK_MISTRAL</div><div class='ctx'> 	{ OMAP_TAG_LCD,			&amp;osk_lcd_config },</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_OMAP_OSK_MISTRAL</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/keypad.h&gt;</div><div class='add'>+</div><div class='add'>+static const int osk_keymap[] = {</div><div class='add'>+	/* KEY(col, row, code) */</div><div class='add'>+	KEY(0, 0, KEY_F1),		/* SW4 */</div><div class='add'>+	KEY(0, 3, KEY_UP),		/* (sw2/up) */</div><div class='add'>+	KEY(1, 1, KEY_LEFTCTRL),	/* SW5 */</div><div class='add'>+	KEY(1, 2, KEY_LEFT),		/* (sw2/left) */</div><div class='add'>+	KEY(2, 0, KEY_SPACE),		/* SW3 */</div><div class='add'>+	KEY(2, 1, KEY_ESC),		/* SW6 */</div><div class='add'>+	KEY(2, 2, KEY_DOWN),		/* (sw2/down) */</div><div class='add'>+	KEY(3, 2, KEY_ENTER),		/* (sw2/select) */</div><div class='add'>+	KEY(3, 3, KEY_RIGHT),		/* (sw2/right) */</div><div class='add'>+	0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap_kp_platform_data osk_kp_data = {</div><div class='add'>+	.rows	= 8,</div><div class='add'>+	.cols	= 8,</div><div class='add'>+	.keymap = (int *) osk_keymap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource osk5912_kp_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= INT_KEYBOARD,</div><div class='add'>+		.end	= INT_KEYBOARD,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device osk5912_kp_device = {</div><div class='add'>+	.name		= "omap-keypad",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;osk_kp_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= ARRAY_SIZE(osk5912_kp_resources),</div><div class='add'>+	.resource	= osk5912_kp_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device osk5912_lcd_device = {</div><div class='add'>+	.name		= "lcd_osk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *mistral_devices[] __initdata = {</div><div class='add'>+	&amp;osk5912_kp_device,</div><div class='add'>+	&amp;osk5912_lcd_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mistral_get_pendown_state(void)</div><div class='add'>+{</div><div class='add'>+	return !omap_get_gpio_datain(4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ads7846_platform_data mistral_ts_info = {</div><div class='add'>+	.model			= 7846,</div><div class='add'>+	.vref_delay_usecs	= 100,	/* internal, no capacitor */</div><div class='add'>+	.x_plate_ohms		= 419,</div><div class='add'>+	.y_plate_ohms		= 486,</div><div class='add'>+	.get_pendown_state	= mistral_get_pendown_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info __initdata mistral_boardinfo[] = { {</div><div class='add'>+	/* MicroWire (bus 2) CS0 has an ads7846e */</div><div class='add'>+	.modalias		= "ads7846",</div><div class='add'>+	.platform_data		= &amp;mistral_ts_info,</div><div class='add'>+	.irq			= OMAP_GPIO_IRQ(4),</div><div class='add'>+	.max_speed_hz		= 120000 /* max sample rate at 3V */</div><div class='add'>+					* 26 /* command + data + overhead */,</div><div class='add'>+	.bus_num		= 2,</div><div class='add'>+	.chip_select		= 0,</div><div class='add'>+} };</div><div class='add'>+</div><div class='ctx'> #ifdef	CONFIG_PM</div><div class='ctx'> static irqreturn_t</div><div class='ctx'> osk_mistral_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)</div><div class='hunk'>@@ -298,14 +333,18 @@ osk_mistral_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static void __init osk_mistral_init(void)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME here's where to feed in framebuffer, touchpad, and</div><div class='del'>-	 * keyboard setup ...  not in the drivers for those devices!</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE:  we could actually tell if there's a Mistral board</div><div class='add'>+	/* NOTE:  we could actually tell if there's a Mistral board</div><div class='ctx'> 	 * attached, e.g. by trying to read something from the ads7846.</div><div class='del'>-	 * But this is too early for that...</div><div class='add'>+	 * But this arch_init() code is too early for that, since we</div><div class='add'>+	 * can't talk to the ads or even the i2c eeprom.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='add'>+	// omap_cfg_reg(P19_1610_GPIO6);	// BUSY</div><div class='add'>+	omap_cfg_reg(P20_1610_GPIO4);	// PENIRQ</div><div class='add'>+	set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);</div><div class='add'>+	spi_register_board_info(mistral_boardinfo,</div><div class='add'>+			ARRAY_SIZE(mistral_boardinfo));</div><div class='add'>+</div><div class='ctx'> 	/* the sideways button (SW1) is for use as a "wakeup" button */</div><div class='ctx'> 	omap_cfg_reg(N15_1610_MPUIO2);</div><div class='ctx'> 	if (omap_request_gpio(OMAP_MPUIO(2)) == 0) {</div><div class='hunk'>@@ -318,7 +357,7 @@ static void __init osk_mistral_init(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)),</div><div class='ctx'> 				&amp;osk_mistral_wake_interrupt,</div><div class='del'>-				SA_SHIRQ, "mistral_wakeup",</div><div class='add'>+				IRQF_SHARED, "mistral_wakeup",</div><div class='ctx'> 				&amp;osk_mistral_wake_interrupt);</div><div class='ctx'> 		if (ret != 0) {</div><div class='ctx'> 			omap_free_gpio(OMAP_MPUIO(2));</div><div class='hunk'>@@ -329,6 +368,8 @@ static void __init osk_mistral_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	} else</div><div class='ctx'> 		printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");</div><div class='add'>+</div><div class='add'>+	platform_add_devices(mistral_devices, ARRAY_SIZE(mistral_devices));</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static void __init osk_mistral_init(void) { }</div><div class='head'>diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c<br/>index 619db18144ea..f1958e882e86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/clock.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+//kernel/linux-omap-fsample/arch/arm/mach-omap1/clock.c#2 - edit change 3808 (text)</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/arch/arm/mach-omap1/clock.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/arch/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/arch/usb.h&gt;</div><div class='ctx'> #include &lt;asm/arch/clock.h&gt;</div><div class='ctx'> #include &lt;asm/arch/sram.h&gt;</div><div class='hunk'>@@ -270,8 +272,12 @@ static int omap1_select_table_rate(struct clk * clk, unsigned long rate)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * In most cases we should not need to reprogram DPLL.</div><div class='ctx'> 	 * Reprogramming the DPLL is tricky, it must be done from SRAM.</div><div class='add'>+	 * (on 730, bit 13 must always be 1)</div><div class='ctx'> 	 */</div><div class='del'>-	omap_sram_reprogram_clock(ptr-&gt;dpllctl_val, ptr-&gt;ckctl_val);</div><div class='add'>+	if (cpu_is_omap730())</div><div class='add'>+		omap_sram_reprogram_clock(ptr-&gt;dpllctl_val, ptr-&gt;ckctl_val | 0x2000);</div><div class='add'>+	else</div><div class='add'>+		omap_sram_reprogram_clock(ptr-&gt;dpllctl_val, ptr-&gt;ckctl_val);</div><div class='ctx'> </div><div class='ctx'> 	ck_dpll1.rate = ptr-&gt;pll_rate;</div><div class='ctx'> 	propagate_rate(&amp;ck_dpll1);</div><div class='hunk'>@@ -748,7 +754,7 @@ int __init omap1_clk_init(void)</div><div class='ctx'> 		printk(KERN_ERR "System frequencies not set. Check your config.\n");</div><div class='ctx'> 		/* Guess sane values (60MHz) */</div><div class='ctx'> 		omap_writew(0x2290, DPLL_CTL);</div><div class='del'>-		omap_writew(0x1005, ARM_CKCTL);</div><div class='add'>+		omap_writew(cpu_is_omap730() ? 0x3005 : 0x1005, ARM_CKCTL);</div><div class='ctx'> 		ck_dpll1.rate = 60000000;</div><div class='ctx'> 		propagate_rate(&amp;ck_dpll1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -761,13 +767,17 @@ int __init omap1_clk_init(void)</div><div class='ctx'> 	       ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10,</div><div class='ctx'> 	       arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MACH_OMAP_PERSEUS2</div><div class='add'>+#if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)</div><div class='ctx'> 	/* Select slicer output as OMAP input clock */</div><div class='ctx'> 	omap_writew(omap_readw(OMAP730_PCC_UPLD_CTRL) &amp; ~0x1, OMAP730_PCC_UPLD_CTRL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off DSP and ARM_TIMXO. Make sure ARM_INTHCK is not divided */</div><div class='del'>-	omap_writew(omap_readw(ARM_CKCTL) &amp; 0x0fff, ARM_CKCTL);</div><div class='add'>+	/* (on 730, bit 13 must not be cleared) */</div><div class='add'>+	if (cpu_is_omap730())</div><div class='add'>+		omap_writew(omap_readw(ARM_CKCTL) &amp; 0x2fff, ARM_CKCTL);</div><div class='add'>+	else</div><div class='add'>+		omap_writew(omap_readw(ARM_CKCTL) &amp; 0x0fff, ARM_CKCTL);</div><div class='ctx'> </div><div class='ctx'> 	/* Put DSP/MPUI into reset until needed */</div><div class='ctx'> 	omap_writew(0, ARM_RSTCT1);</div><div class='head'>diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c<br/>index 847329cafc5c..a611c3b63954 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/devices.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c<br/>index aca2a120813a..34eb79ee6e61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/fpga.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/fpga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/fpga.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/fpga.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -134,7 +133,7 @@ static struct irqchip omap_fpga_irq = {</div><div class='ctx'>  * mask_ack routine for all of the FPGA interrupts has been changed from</div><div class='ctx'>  * fpga_mask_ack_irq() to fpga_ack_irq() so that the specific FPGA interrupt</div><div class='ctx'>  * being serviced is left unmasked.  We can do this because the FPGA cascade</div><div class='del'>- * interrupt is installed with the SA_INTERRUPT flag, which leaves all</div><div class='add'>+ * interrupt is installed with the IRQF_DISABLED flag, which leaves all</div><div class='ctx'>  * interrupts masked at the CPU while an FPGA interrupt handler executes.</div><div class='ctx'>  *</div><div class='ctx'>  * Limited testing indicates that this workaround appears to be effective</div><div class='head'>diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c<br/>index 5c637c048368..da13c3e82850 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/id.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/id.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/id.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/id.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c<br/>index be3a2a4ee2b8..fab8b0b27cfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/io.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c<br/>index a0431c00fa81..9e039845b50e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/irq.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c<br/>index 650650815915..8976fbb21f7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-h2p2-debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/leds-h2p2-debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-h2p2-debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/leds-h2p2-debug.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * The "surfer" expansion board and H2 sample board also have two-color</div><div class='ctx'>  * green+red LEDs (in parallel), used here for timer and idle indicators.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c<br/>index c8ffd1ddcded..a0cd001ac39a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-innovator.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/leds-innovator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-innovator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/leds-innovator.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * linux/arch/arm/mach-omap1/leds-innovator.c</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c<br/>index 2c8bda847c18..3b29e59b0e6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-osk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/leds-osk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/leds-osk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/leds-osk.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * LED driver for OSK, and optionally Mistral QVGA, boards</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c<br/>index 10fe0b3efcac..fa74ef7af15f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/mux.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c<br/>index ddf6b07dc9c7..cd76185bab74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/pm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text)</div><div class='ctx'> /*</div><div class='ctx'>  * linux/arch/arm/mach-omap1/pm.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -50,6 +51,7 @@</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/arch/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/arch/irqs.h&gt;</div><div class='ctx'> #include &lt;asm/arch/clock.h&gt;</div><div class='ctx'> #include &lt;asm/arch/sram.h&gt;</div><div class='hunk'>@@ -326,8 +328,9 @@ void omap_pm_suspend(void)</div><div class='ctx'> 	/* stop DSP */</div><div class='ctx'> 	omap_writew(omap_readw(ARM_RSTCT1) &amp; ~(1 &lt;&lt; DSP_EN), ARM_RSTCT1);</div><div class='ctx'> </div><div class='del'>-	/* shut down dsp_ck */</div><div class='del'>-	omap_writew(omap_readw(ARM_CKCTL) &amp; ~(1 &lt;&lt; EN_DSPCK), ARM_CKCTL);</div><div class='add'>+		/* shut down dsp_ck */</div><div class='add'>+	if (!cpu_is_omap730())</div><div class='add'>+		omap_writew(omap_readw(ARM_CKCTL) &amp; ~(1 &lt;&lt; EN_DSPCK), ARM_CKCTL);</div><div class='ctx'> </div><div class='ctx'> 	/* temporarily enabling api_ck to access DSP registers */</div><div class='ctx'> 	omap_writew(omap_readw(ARM_IDLECT2) | 1 &lt;&lt; EN_APICK, ARM_IDLECT2);</div><div class='hunk'>@@ -687,7 +690,7 @@ static irqreturn_t  omap_wakeup_interrupt(int  irq, void *  dev,</div><div class='ctx'> </div><div class='ctx'> static struct irqaction omap_wakeup_irq = {</div><div class='ctx'> 	.name		= "peripheral wakeup",</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.handler	= omap_wakeup_interrupt</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c<br/>index 9b4cd698bec8..976edfb882e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/serial.c</a></div><div class='hunk'>@@ -8,10 +8,10 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='hunk'>@@ -253,7 +253,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)</div><div class='ctx'> 	}</div><div class='ctx'> 	omap_set_gpio_direction(gpio_nr, 1);</div><div class='ctx'> 	ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &amp;omap_serial_wake_interrupt,</div><div class='del'>-			  SA_TRIGGER_RISING, "serial wakeup", NULL);</div><div class='add'>+			  IRQF_TRIGGER_RISING, "serial wakeup", NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		omap_free_gpio(gpio_nr);</div><div class='ctx'> 		printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",</div><div class='head'>diff --git a/arch/arm/mach-omap1/sleep.S b/arch/arm/mach-omap1/sleep.S<br/>index e58295e2d3b2..abef33d10f01 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/sleep.S</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/arch/io.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c<br/>index a85fe6066bc4..4d91b9f51084 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap1/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap1/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap1/time.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -94,7 +93,7 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc)</div><div class='ctx'>  * will break. On P2, the timer count rate is 6.5 MHz after programming PTV</div><div class='ctx'>  * with 0. This divides the 13MHz input by 2, and is undocumented.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_MACH_OMAP_PERSEUS2</div><div class='add'>+#if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)</div><div class='ctx'> /* REVISIT: This ifdef construct should be replaced by a query to clock</div><div class='ctx'>  * framework to see if timer base frequency is 12.0, 13.0 or 19.2 MHz.</div><div class='ctx'>  */</div><div class='hunk'>@@ -178,7 +177,7 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id,</div><div class='ctx'> </div><div class='ctx'> static struct irqaction omap_mpu_timer_irq = {</div><div class='ctx'> 	.name		= "mpu timer",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= omap_mpu_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +191,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id,</div><div class='ctx'> </div><div class='ctx'> static struct irqaction omap_mpu_timer1_irq = {</div><div class='ctx'> 	.name		= "mpu timer1 overflow",</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.handler	= omap_mpu_timer1_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig<br/>index 537dd2e6d380..aab97ccf1e63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/Kconfig</a></div><div class='hunk'>@@ -8,6 +8,7 @@ config ARCH_OMAP24XX</div><div class='ctx'> config ARCH_OMAP2420</div><div class='ctx'> 	bool "OMAP2420 support"</div><div class='ctx'> 	depends on ARCH_OMAP24XX</div><div class='add'>+	select OMAP_DM_TIMER</div><div class='ctx'> </div><div class='ctx'> comment "OMAP Board Type"</div><div class='ctx'> 	depends on ARCH_OMAP2</div><div class='head'>diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile<br/>index 111eaa64258f..266d88e77bdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/Makefile</a></div><div class='hunk'>@@ -3,12 +3,13 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> # Common support</div><div class='del'>-obj-y := irq.o id.o io.o sram-fn.o memory.o prcm.o clock.o mux.o devices.o serial.o</div><div class='add'>+obj-y := irq.o id.o io.o sram-fn.o memory.o prcm.o clock.o mux.o devices.o \</div><div class='add'>+	 serial.o gpmc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_OMAP_MPU_TIMER)		+= timer-gp.o</div><div class='ctx'> </div><div class='ctx'> # Power Management</div><div class='del'>-obj-$(CONFIG_PM) += pm.o sleep.o</div><div class='add'>+obj-$(CONFIG_PM) += pm.o pm-domain.o sleep.o</div><div class='ctx'> </div><div class='ctx'> # Specific board support</div><div class='ctx'> obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o</div><div class='head'>diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c<br/>index 6c6ba172cdf6..7993b7bae2bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-apollon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/board-apollon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/board-apollon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/board-apollon.c</a></div><div class='hunk'>@@ -234,17 +234,17 @@ static void __init apollon_sw_init(void)</div><div class='ctx'> </div><div class='ctx'> 	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQT_RISING);</div><div class='ctx'> 	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &amp;apollon_sw_interrupt,</div><div class='del'>-				SA_SHIRQ, "enter sw",</div><div class='add'>+				IRQF_SHARED, "enter sw",</div><div class='ctx'> 				&amp;apollon_sw_interrupt))</div><div class='ctx'> 		return;</div><div class='ctx'> 	set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQT_RISING);</div><div class='ctx'> 	if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &amp;apollon_sw_interrupt,</div><div class='del'>-				SA_SHIRQ, "up sw",</div><div class='add'>+				IRQF_SHARED, "up sw",</div><div class='ctx'> 				&amp;apollon_sw_interrupt))</div><div class='ctx'> 		return;</div><div class='ctx'> 	set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQT_RISING);</div><div class='ctx'> 	if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &amp;apollon_sw_interrupt,</div><div class='del'>-				SA_SHIRQ, "down sw",</div><div class='add'>+				IRQF_SHARED, "down sw",</div><div class='ctx'> 				&amp;apollon_sw_interrupt))</div><div class='ctx'> 		return;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c<br/>index 72eb4bf571ac..d1b648a4efbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/clock.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -660,26 +659,35 @@ static int omap2_clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='ctx'> </div><div class='ctx'> 		/* Isolate control register */</div><div class='ctx'> 		div_sel = (SRC_RATE_SEL_MASK &amp; clk-&gt;flags);</div><div class='del'>-		div_off = clk-&gt;src_offset;</div><div class='add'>+		div_off = clk-&gt;rate_offset;</div><div class='ctx'> </div><div class='ctx'> 		validrate = omap2_clksel_round_rate(clk, rate, &amp;new_div);</div><div class='del'>-		if(validrate != rate)</div><div class='add'>+		if (validrate != rate)</div><div class='ctx'> 			return(ret);</div><div class='ctx'> </div><div class='ctx'> 		field_val = omap2_get_clksel(&amp;div_sel, &amp;field_mask, clk);</div><div class='ctx'> 		if (div_sel == 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		if(clk-&gt;flags &amp; CM_SYSCLKOUT_SEL1){</div><div class='del'>-			switch(new_div){</div><div class='del'>-			case 16: field_val = 4; break;</div><div class='del'>-			case 8:  field_val = 3; break;</div><div class='del'>-			case 4:  field_val = 2; break;</div><div class='del'>-			case 2:  field_val = 1; break;</div><div class='del'>-			case 1:  field_val = 0; break;</div><div class='add'>+		if (clk-&gt;flags &amp; CM_SYSCLKOUT_SEL1) {</div><div class='add'>+			switch (new_div) {</div><div class='add'>+			case 16:</div><div class='add'>+				field_val = 4;</div><div class='add'>+				break;</div><div class='add'>+			case 8:</div><div class='add'>+				field_val = 3;</div><div class='add'>+				break;</div><div class='add'>+			case 4:</div><div class='add'>+				field_val = 2;</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				field_val = 1;</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				field_val = 0;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='add'>+		} else</div><div class='ctx'> 			field_val = new_div;</div><div class='ctx'> </div><div class='ctx'> 		reg = (void __iomem *)div_sel;</div><div class='hunk'>@@ -744,7 +752,7 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,</div><div class='ctx'> 			val = 0x2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CM_WKUP_SEL1:</div><div class='del'>-		src_reg_addr = (u32)&amp;CM_CLKSEL2_CORE;</div><div class='add'>+		src_reg_addr = (u32)&amp;CM_CLKSEL_WKUP;</div><div class='ctx'> 		mask = 0x3;</div><div class='ctx'> 		if (src_clk == &amp;func_32k_ck)</div><div class='ctx'> 			val = 0x0;</div><div class='hunk'>@@ -784,9 +792,9 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,</div><div class='ctx'> 			val = 0;</div><div class='ctx'> 		if (src_clk == &amp;sys_ck)</div><div class='ctx'> 			val = 1;</div><div class='del'>-		if (src_clk == &amp;func_54m_ck)</div><div class='del'>-			val = 2;</div><div class='ctx'> 		if (src_clk == &amp;func_96m_ck)</div><div class='add'>+			val = 2;</div><div class='add'>+		if (src_clk == &amp;func_54m_ck)</div><div class='ctx'> 			val = 3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h<br/>index 6c78d471fab7..2781dfbc5164 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/clock.h</a></div><div class='hunk'>@@ -1062,7 +1062,7 @@ static struct clk gpt2_ick = {</div><div class='ctx'> 	.parent		= &amp;l4_ck,</div><div class='ctx'> 	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,</div><div class='ctx'> 	.enable_reg	= (void __iomem *)&amp;CM_ICLKEN1_CORE,	/* Bit4 */</div><div class='del'>-	.enable_bit	= 0,</div><div class='add'>+	.enable_bit	= 4,</div><div class='ctx'> 	.recalc		= &amp;omap2_followparent_recalc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c<br/>index fb7f91da1aad..aa4322451e8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/devices.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -105,6 +104,51 @@ static inline void omap_init_sti(void)</div><div class='ctx'> static inline void omap_init_sti(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SPI_OMAP24XX)</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/mcspi.h&gt;</div><div class='add'>+</div><div class='add'>+#define OMAP2_MCSPI1_BASE		0x48098000</div><div class='add'>+#define OMAP2_MCSPI2_BASE		0x4809a000</div><div class='add'>+</div><div class='add'>+/* FIXME: use resources instead */</div><div class='add'>+</div><div class='add'>+static struct omap2_mcspi_platform_config omap2_mcspi1_config = {</div><div class='add'>+	.base		= io_p2v(OMAP2_MCSPI1_BASE),</div><div class='add'>+	.num_cs		= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device omap2_mcspi1 = {</div><div class='add'>+	.name		= "omap2_mcspi",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;omap2_mcspi1_config,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct omap2_mcspi_platform_config omap2_mcspi2_config = {</div><div class='add'>+	.base		= io_p2v(OMAP2_MCSPI2_BASE),</div><div class='add'>+	.num_cs		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device omap2_mcspi2 = {</div><div class='add'>+	.name		= "omap2_mcspi",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;omap2_mcspi2_config,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void omap_init_mcspi(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_register(&amp;omap2_mcspi1);</div><div class='add'>+	platform_device_register(&amp;omap2_mcspi2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static inline void omap_init_mcspi(void) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static int __init omap2_init_devices(void)</div><div class='hunk'>@@ -113,6 +157,7 @@ static int __init omap2_init_devices(void)</div><div class='ctx'> 	 * in alphabetical order so they're easier to sort through.</div><div class='ctx'> 	 */</div><div class='ctx'> 	omap_init_i2c();</div><div class='add'>+	omap_init_mcspi();</div><div class='ctx'> 	omap_init_sti();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c<br/>new file mode 100644<br/>index 000000000000..c7a48f921fef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/gpmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/gpmc.c</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+/*</div><div class='add'>+ * GPMC support functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005-2006 Nokia Corporation</div><div class='add'>+ *</div><div class='add'>+ * Author: Juha Yrjola</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpmc.h&gt;</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#define GPMC_BASE		0x6800a000</div><div class='add'>+#define GPMC_REVISION		0x00</div><div class='add'>+#define GPMC_SYSCONFIG		0x10</div><div class='add'>+#define GPMC_SYSSTATUS		0x14</div><div class='add'>+#define GPMC_IRQSTATUS		0x18</div><div class='add'>+#define GPMC_IRQENABLE		0x1c</div><div class='add'>+#define GPMC_TIMEOUT_CONTROL	0x40</div><div class='add'>+#define GPMC_ERR_ADDRESS	0x44</div><div class='add'>+#define GPMC_ERR_TYPE		0x48</div><div class='add'>+#define GPMC_CONFIG		0x50</div><div class='add'>+#define GPMC_STATUS		0x54</div><div class='add'>+#define GPMC_PREFETCH_CONFIG1	0x1e0</div><div class='add'>+#define GPMC_PREFETCH_CONFIG2	0x1e4</div><div class='add'>+#define GPMC_PREFETCH_CONTROL	0x1e8</div><div class='add'>+#define GPMC_PREFETCH_STATUS	0x1f0</div><div class='add'>+#define GPMC_ECC_CONFIG		0x1f4</div><div class='add'>+#define GPMC_ECC_CONTROL	0x1f8</div><div class='add'>+#define GPMC_ECC_SIZE_CONFIG	0x1fc</div><div class='add'>+</div><div class='add'>+#define GPMC_CS0		0x60</div><div class='add'>+#define GPMC_CS_SIZE		0x30</div><div class='add'>+</div><div class='add'>+static void __iomem *gpmc_base =</div><div class='add'>+	(void __iomem *) IO_ADDRESS(GPMC_BASE);</div><div class='add'>+static void __iomem *gpmc_cs_base =</div><div class='add'>+	(void __iomem *) IO_ADDRESS(GPMC_BASE) + GPMC_CS0;</div><div class='add'>+</div><div class='add'>+static struct clk *gpmc_l3_clk;</div><div class='add'>+</div><div class='add'>+static void gpmc_write_reg(int idx, u32 val)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, gpmc_base + idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 gpmc_read_reg(int idx)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(gpmc_base + idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gpmc_cs_write_reg(int cs, int idx, u32 val)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg_addr;</div><div class='add'>+</div><div class='add'>+	reg_addr = gpmc_cs_base + (cs * GPMC_CS_SIZE) + idx;</div><div class='add'>+	__raw_writel(val, reg_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 gpmc_cs_read_reg(int cs, int idx)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(gpmc_cs_base + (cs * GPMC_CS_SIZE) + idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO: Add support for gpmc_fck to clock framework and use it */</div><div class='add'>+static unsigned long gpmc_get_fclk_period(void)</div><div class='add'>+{</div><div class='add'>+	/* In picoseconds */</div><div class='add'>+	return 1000000000 / ((clk_get_rate(gpmc_l3_clk)) / 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int gpmc_ns_to_ticks(unsigned int time_ns)</div><div class='add'>+{</div><div class='add'>+	unsigned long tick_ps;</div><div class='add'>+</div><div class='add'>+	/* Calculate in picosecs to yield more exact results */</div><div class='add'>+	tick_ps = gpmc_get_fclk_period();</div><div class='add'>+</div><div class='add'>+	return (time_ns * 1000 + tick_ps - 1) / tick_ps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,</div><div class='add'>+			       int time, const char *name)</div><div class='add'>+#else</div><div class='add'>+static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,</div><div class='add'>+			       int time)</div><div class='add'>+#endif</div><div class='add'>+{</div><div class='add'>+	u32 l;</div><div class='add'>+	int ticks, mask, nr_bits;</div><div class='add'>+</div><div class='add'>+	if (time == 0)</div><div class='add'>+		ticks = 0;</div><div class='add'>+	else</div><div class='add'>+		ticks = gpmc_ns_to_ticks(time);</div><div class='add'>+	nr_bits = end_bit - st_bit + 1;</div><div class='add'>+	if (ticks &gt;= 1 &lt;&lt; nr_bits)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	mask = (1 &lt;&lt; nr_bits) - 1;</div><div class='add'>+	l = gpmc_cs_read_reg(cs, reg);</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	printk(KERN_INFO "GPMC CS%d: %-10s: %d ticks, %3lu ns (was %i ticks)\n",</div><div class='add'>+	       cs, name, ticks, gpmc_get_fclk_period() * ticks / 1000,</div><div class='add'>+	       (l &gt;&gt; st_bit) &amp; mask);</div><div class='add'>+#endif</div><div class='add'>+	l &amp;= ~(mask &lt;&lt; st_bit);</div><div class='add'>+	l |= ticks &lt;&lt; st_bit;</div><div class='add'>+	gpmc_cs_write_reg(cs, reg, l);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define GPMC_SET_ONE(reg, st, end, field) \</div><div class='add'>+	if (set_gpmc_timing_reg(cs, (reg), (st), (end),		\</div><div class='add'>+			t-&gt;field, #field) &lt; 0)			\</div><div class='add'>+		return -1</div><div class='add'>+#else</div><div class='add'>+#define GPMC_SET_ONE(reg, st, end, field) \</div><div class='add'>+	if (set_gpmc_timing_reg(cs, (reg), (st), (end), t-&gt;field) &lt; 0) \</div><div class='add'>+		return -1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int gpmc_cs_calc_divider(int cs, unsigned int sync_clk)</div><div class='add'>+{</div><div class='add'>+	int div;</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	l = sync_clk * 1000 + (gpmc_get_fclk_period() - 1);</div><div class='add'>+	div = l / gpmc_get_fclk_period();</div><div class='add'>+	if (div &gt; 4)</div><div class='add'>+		return -1;</div><div class='add'>+	if (div &lt; 0)</div><div class='add'>+		div = 1;</div><div class='add'>+</div><div class='add'>+	return div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)</div><div class='add'>+{</div><div class='add'>+	int div;</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	div = gpmc_cs_calc_divider(cs, t-&gt;sync_clk);</div><div class='add'>+	if (div &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG2,  0,  3, cs_on);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG2,  8, 12, cs_rd_off);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG2, 16, 20, cs_wr_off);</div><div class='add'>+</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG3,  0,  3, adv_on);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG3,  8, 12, adv_rd_off);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG3, 16, 20, adv_wr_off);</div><div class='add'>+</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG4,  0,  3, oe_on);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG4,  8, 12, oe_off);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG4, 16, 19, we_on);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG4, 24, 28, we_off);</div><div class='add'>+</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG5,  0,  4, rd_cycle);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG5,  8, 12, wr_cycle);</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG5, 16, 20, access);</div><div class='add'>+</div><div class='add'>+	GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	printk(KERN_INFO "GPMC CS%d CLK period is %lu (div %d)\n",</div><div class='add'>+	       cs, gpmc_get_fclk_period(), div);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);</div><div class='add'>+	l &amp;= ~0x03;</div><div class='add'>+	l |= (div - 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long gpmc_cs_get_base_addr(int cs)</div><div class='add'>+{</div><div class='add'>+	return (gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7) &amp; 0x1f) &lt;&lt; 24;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init gpmc_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	gpmc_l3_clk = clk_get(NULL, "core_l3_ck");</div><div class='add'>+	BUG_ON(IS_ERR(gpmc_l3_clk));</div><div class='add'>+</div><div class='add'>+	l = gpmc_read_reg(GPMC_REVISION);</div><div class='add'>+	printk(KERN_INFO "GPMC revision %d.%d\n", (l &gt;&gt; 4) &amp; 0x0f, l &amp; 0x0f);</div><div class='add'>+	/* Set smart idle mode and automatic L3 clock gating */</div><div class='add'>+	l = gpmc_read_reg(GPMC_SYSCONFIG);</div><div class='add'>+	l &amp;= 0x03 &lt;&lt; 3;</div><div class='add'>+	l |= (0x02 &lt;&lt; 3) | (1 &lt;&lt; 0);</div><div class='add'>+	gpmc_write_reg(GPMC_SYSCONFIG, l);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c<br/>index 76187300f2b6..871ace4fccb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/id.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/id.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/id.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/id.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c<br/>index 7d5711611f2f..a0728c33e5d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/io.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -27,6 +26,7 @@</div><div class='ctx'> extern void omap_sram_init(void);</div><div class='ctx'> extern int omap2_clk_init(void);</div><div class='ctx'> extern void omap2_check_revision(void);</div><div class='add'>+extern void gpmc_init(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The machine specific code may provide the extra mapping besides the</div><div class='hunk'>@@ -67,4 +67,5 @@ void __init omap2_init_common_hw(void)</div><div class='ctx'> {</div><div class='ctx'> 	omap2_mux_init();</div><div class='ctx'> 	omap2_clk_init();</div><div class='add'>+	gpmc_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c<br/>index d7baff675cfe..3eed6a737bf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/irq.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c<br/>index 1d925d69fc35..85cbc2a2e663 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/memory.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c<br/>index 1197dc38c20a..60ef084faffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/mux.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -53,6 +52,12 @@ MUX_CFG_24XX("W19_24XX_SYS_NIRQ",	0x12c,	0,	1,	1,	1)</div><div class='ctx'> /* 24xx clocks */</div><div class='ctx'> MUX_CFG_24XX("W14_24XX_SYS_CLKOUT",	0x137,	0,	1,	1,	1)</div><div class='ctx'> </div><div class='add'>+/* 24xx GPMC wait pin monitoring */</div><div class='add'>+MUX_CFG_24XX("L3_GPMC_WAIT0",		0x09a,	0,	1,	1,	1)</div><div class='add'>+MUX_CFG_24XX("N7_GPMC_WAIT1",		0x09b,	0,	1,	1,	1)</div><div class='add'>+MUX_CFG_24XX("M1_GPMC_WAIT2",		0x09c,	0,	1,	1,	1)</div><div class='add'>+MUX_CFG_24XX("P1_GPMC_WAIT3",		0x09d,	0,	1,	1,	1)</div><div class='add'>+</div><div class='ctx'> /* 24xx McBSP */</div><div class='ctx'> MUX_CFG_24XX("Y15_24XX_MCBSP2_CLKX",	0x124,	1,	1,	0,	1)</div><div class='ctx'> MUX_CFG_24XX("R14_24XX_MCBSP2_FSX",	0x125,	1,	1,	0,	1)</div><div class='hunk'>@@ -60,18 +65,38 @@ MUX_CFG_24XX("W15_24XX_MCBSP2_DR",	0x126,	1,	1,	0,	1)</div><div class='ctx'> MUX_CFG_24XX("V15_24XX_MCBSP2_DX",	0x127,	1,	1,	0,	1)</div><div class='ctx'> </div><div class='ctx'> /* 24xx GPIO */</div><div class='del'>-MUX_CFG_24XX("M21_242X_GPIO11",	 0x0c9,  3,      1,      1,      1)</div><div class='add'>+MUX_CFG_24XX("M21_242X_GPIO11",		0x0c9,  3,      1,      1,      1)</div><div class='ctx'> MUX_CFG_24XX("AA10_242X_GPIO13",	0x0e5,  3,      0,      0,      1)</div><div class='del'>-MUX_CFG_24XX("AA6_242X_GPIO14",	 0x0e6,  3,      0,      0,      1)</div><div class='del'>-MUX_CFG_24XX("AA4_242X_GPIO15",	 0x0e7,  3,      0,      0,      1)</div><div class='del'>-MUX_CFG_24XX("Y11_242X_GPIO16",	 0x0e8,  3,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("AA6_242X_GPIO14",		0x0e6,  3,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("AA4_242X_GPIO15",		0x0e7,  3,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("Y11_242X_GPIO16",		0x0e8,  3,      0,      0,      1)</div><div class='ctx'> MUX_CFG_24XX("AA12_242X_GPIO17",	0x0e9,  3,      0,      0,      1)</div><div class='del'>-MUX_CFG_24XX("AA8_242X_GPIO58",	 0x0ea,  3,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("AA8_242X_GPIO58",		0x0ea,  3,      0,      0,      1)</div><div class='ctx'> MUX_CFG_24XX("Y20_24XX_GPIO60",		0x12c,	3,	0,	0,	1)</div><div class='del'>-MUX_CFG_24XX("W4__24XX_GPIO74",	 0x0f2,  3,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("W4__24XX_GPIO74",		0x0f2,  3,      0,      0,      1)</div><div class='ctx'> MUX_CFG_24XX("M15_24XX_GPIO92",		0x10a,	3,	0,	0,	1)</div><div class='ctx'> MUX_CFG_24XX("V14_24XX_GPIO117",	0x128,	3,	1,	0,	1)</div><div class='ctx'> </div><div class='add'>+/* 242x DBG GPIO */</div><div class='add'>+MUX_CFG_24XX("V4_242X_GPIO49",		0xd3,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("W2_242X_GPIO50",		0xd4,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("U4_242X_GPIO51",		0xd5,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("V3_242X_GPIO52",		0xd6,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("V2_242X_GPIO53",		0xd7,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("V6_242X_GPIO53",		0xcf,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("T4_242X_GPIO54",		0xd8,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("Y4_242X_GPIO54",		0xd0,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("T3_242X_GPIO55",		0xd9,	3,	0,	0,	1)</div><div class='add'>+MUX_CFG_24XX("U2_242X_GPIO56",		0xda,	3,	0,	0,	1)</div><div class='add'>+</div><div class='add'>+/* 24xx external DMA requests */</div><div class='add'>+MUX_CFG_24XX("AA10_242X_DMAREQ0",	0x0e5,  2,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("AA6_242X_DMAREQ1",	0x0e6,  2,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("E4_242X_DMAREQ2",		0x074,  2,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("G4_242X_DMAREQ3",		0x073,  2,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("D3_242X_DMAREQ4",		0x072,  2,      0,      0,      1)</div><div class='add'>+MUX_CFG_24XX("E3_242X_DMAREQ5",		0x071,  2,      0,      0,      1)</div><div class='add'>+</div><div class='ctx'> /* TSC IRQ */</div><div class='ctx'> MUX_CFG_24XX("P20_24XX_TSC_IRQ",	0x108,	0,	0,	0,	1)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/pm-domain.c b/arch/arm/mach-omap2/pm-domain.c<br/>new file mode 100644<br/>index 000000000000..5e20e740cde5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm-domain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/pm-domain.c</a></div><div class='hunk'>@@ -0,0 +1,300 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-omap2/pm-domain.c</div><div class='add'>+ *</div><div class='add'>+ * Power domain functions for OMAP2</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Nokia Corporation</div><div class='add'>+ * Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Some code based on earlier OMAP2 sample PM code</div><div class='add'>+ * Copyright (C) 2005 Texas Instruments, Inc.</div><div class='add'>+ * Richard Woodruff &lt;r-woodruff2@ti.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "prcm-regs.h"</div><div class='add'>+</div><div class='add'>+/* Power domain offsets */</div><div class='add'>+#define PM_MPU_OFFSET			0x100</div><div class='add'>+#define PM_CORE_OFFSET			0x200</div><div class='add'>+#define PM_GFX_OFFSET			0x300</div><div class='add'>+#define PM_WKUP_OFFSET			0x400		/* Autoidle only */</div><div class='add'>+#define PM_PLL_OFFSET			0x500		/* Autoidle only */</div><div class='add'>+#define PM_DSP_OFFSET			0x800</div><div class='add'>+#define PM_MDM_OFFSET			0xc00</div><div class='add'>+</div><div class='add'>+/* Power domain wake-up dependency control register */</div><div class='add'>+#define PM_WKDEP_OFFSET			0xc8</div><div class='add'>+#define		EN_MDM			(1 &lt;&lt; 5)</div><div class='add'>+#define		EN_WKUP			(1 &lt;&lt; 4)</div><div class='add'>+#define		EN_GFX			(1 &lt;&lt; 3)</div><div class='add'>+#define		EN_DSP			(1 &lt;&lt; 2)</div><div class='add'>+#define		EN_MPU			(1 &lt;&lt; 1)</div><div class='add'>+#define		EN_CORE			(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Core power domain state transition control register */</div><div class='add'>+#define PM_PWSTCTRL_OFFSET		0xe0</div><div class='add'>+#define		FORCESTATE		(1 &lt;&lt; 18)	/* Only for DSP &amp; GFX */</div><div class='add'>+#define		MEM4RETSTATE		(1 &lt;&lt; 6)</div><div class='add'>+#define		MEM3RETSTATE		(1 &lt;&lt; 5)</div><div class='add'>+#define		MEM2RETSTATE		(1 &lt;&lt; 4)</div><div class='add'>+#define		MEM1RETSTATE		(1 &lt;&lt; 3)</div><div class='add'>+#define		LOGICRETSTATE		(1 &lt;&lt; 2)	/* Logic is retained */</div><div class='add'>+#define		POWERSTATE_OFF		0x3</div><div class='add'>+#define		POWERSTATE_RETENTION	0x1</div><div class='add'>+#define		POWERSTATE_ON		0x0</div><div class='add'>+</div><div class='add'>+/* Power domain state register */</div><div class='add'>+#define PM_PWSTST_OFFSET		0xe4</div><div class='add'>+</div><div class='add'>+/* Hardware supervised state transition control register */</div><div class='add'>+#define CM_CLKSTCTRL_OFFSET		0x48</div><div class='add'>+#define		AUTOSTAT_MPU		(1 &lt;&lt; 0)	/* MPU */</div><div class='add'>+#define		AUTOSTAT_DSS		(1 &lt;&lt; 2)	/* Core */</div><div class='add'>+#define		AUTOSTAT_L4		(1 &lt;&lt; 1)	/* Core */</div><div class='add'>+#define		AUTOSTAT_L3		(1 &lt;&lt; 0)	/* Core */</div><div class='add'>+#define		AUTOSTAT_GFX		(1 &lt;&lt; 0)	/* GFX */</div><div class='add'>+#define		AUTOSTAT_IVA		(1 &lt;&lt; 8)	/* 2420 IVA in DSP domain */</div><div class='add'>+#define		AUTOSTAT_DSP		(1 &lt;&lt; 0)	/* DSP */</div><div class='add'>+#define		AUTOSTAT_MDM		(1 &lt;&lt; 0)	/* MDM */</div><div class='add'>+</div><div class='add'>+/* Automatic control of interface clock idling */</div><div class='add'>+#define CM_AUTOIDLE1_OFFSET		0x30</div><div class='add'>+#define CM_AUTOIDLE2_OFFSET		0x34		/* Core only */</div><div class='add'>+#define CM_AUTOIDLE3_OFFSET		0x38		/* Core only */</div><div class='add'>+#define CM_AUTOIDLE4_OFFSET		0x3c		/* Core only */</div><div class='add'>+#define		AUTO_54M(x)		(((x) &amp; 0x3) &lt;&lt; 6)</div><div class='add'>+#define		AUTO_96M(x)		(((x) &amp; 0x3) &lt;&lt; 2)</div><div class='add'>+#define		AUTO_DPLL(x)		(((x) &amp; 0x3) &lt;&lt; 0)</div><div class='add'>+#define		AUTO_STOPPED		0x3</div><div class='add'>+#define		AUTO_BYPASS_FAST	0x2		/* DPLL only */</div><div class='add'>+#define		AUTO_BYPASS_LOW_POWER	0x1		/* DPLL only */</div><div class='add'>+#define		AUTO_DISABLED		0x0</div><div class='add'>+</div><div class='add'>+/* Voltage control PRCM_VOLTCTRL bits */</div><div class='add'>+#define		AUTO_EXTVOLT		(1 &lt;&lt; 15)</div><div class='add'>+#define		FORCE_EXTVOLT		(1 &lt;&lt; 14)</div><div class='add'>+#define		SETOFF_LEVEL(x)		(((x) &amp; 0x3) &lt;&lt; 12)</div><div class='add'>+#define		MEMRETCTRL		(1 &lt;&lt; 8)</div><div class='add'>+#define		SETRET_LEVEL(x)		(((x) &amp; 0x3) &lt;&lt; 6)</div><div class='add'>+#define		VOLT_LEVEL(x)		(((x) &amp; 0x3) &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+#define OMAP24XX_PRCM_VBASE	IO_ADDRESS(OMAP24XX_PRCM_BASE)</div><div class='add'>+#define prcm_readl(r)		__raw_readl(OMAP24XX_PRCM_VBASE + (r))</div><div class='add'>+#define prcm_writel(v, r)	__raw_writel((v), OMAP24XX_PRCM_VBASE + (r))</div><div class='add'>+</div><div class='add'>+static u32 pmdomain_get_wakeup_dependencies(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + PM_WKDEP_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmdomain_set_wakeup_dependencies(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, domain_offset + PM_WKDEP_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pmdomain_get_powerstate(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + PM_PWSTCTRL_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmdomain_set_powerstate(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, domain_offset + PM_PWSTCTRL_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pmdomain_get_clock_autocontrol(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + CM_CLKSTCTRL_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmdomain_set_clock_autocontrol(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, domain_offset + CM_CLKSTCTRL_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pmdomain_get_clock_autoidle1(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + CM_AUTOIDLE1_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Core domain only */</div><div class='add'>+static u32 pmdomain_get_clock_autoidle2(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + CM_AUTOIDLE2_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Core domain only */</div><div class='add'>+static u32 pmdomain_get_clock_autoidle3(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + CM_AUTOIDLE3_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Core domain only */</div><div class='add'>+static u32 pmdomain_get_clock_autoidle4(int domain_offset)</div><div class='add'>+{</div><div class='add'>+	return prcm_readl(domain_offset + CM_AUTOIDLE4_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmdomain_set_clock_autoidle1(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, CM_AUTOIDLE1_OFFSET + domain_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Core domain only */</div><div class='add'>+static void pmdomain_set_clock_autoidle2(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, CM_AUTOIDLE2_OFFSET + domain_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Core domain only */</div><div class='add'>+static void pmdomain_set_clock_autoidle3(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, CM_AUTOIDLE3_OFFSET + domain_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Core domain only */</div><div class='add'>+static void pmdomain_set_clock_autoidle4(u32 state, int domain_offset)</div><div class='add'>+{</div><div class='add'>+	prcm_writel(state, CM_AUTOIDLE4_OFFSET + domain_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configures power management domains to idle clocks automatically.</div><div class='add'>+ */</div><div class='add'>+void pmdomain_set_autoidle(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Set PLL auto stop for 54M, 96M &amp; DPLL */</div><div class='add'>+	pmdomain_set_clock_autoidle1(AUTO_54M(AUTO_STOPPED) |</div><div class='add'>+				     AUTO_96M(AUTO_STOPPED) |</div><div class='add'>+				     AUTO_DPLL(AUTO_STOPPED), PM_PLL_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* External clock input control</div><div class='add'>+	 * REVISIT: Should this be in clock framework?</div><div class='add'>+	 */</div><div class='add'>+	PRCM_CLKSRC_CTRL |= (0x3 &lt;&lt; 3);</div><div class='add'>+</div><div class='add'>+	/* Configure number of 32KHz clock cycles for sys_clk */</div><div class='add'>+	PRCM_CLKSSETUP = 0x00ff;</div><div class='add'>+</div><div class='add'>+	/* Configure automatic voltage transition */</div><div class='add'>+	PRCM_VOLTSETUP = 0;</div><div class='add'>+	val = PRCM_VOLTCTRL;</div><div class='add'>+	val &amp;= ~(SETOFF_LEVEL(0x3) | VOLT_LEVEL(0x3));</div><div class='add'>+	val |= SETOFF_LEVEL(1) | VOLT_LEVEL(1) | AUTO_EXTVOLT;</div><div class='add'>+	PRCM_VOLTCTRL = val;</div><div class='add'>+</div><div class='add'>+	/* Disable emulation tools functional clock */</div><div class='add'>+	PRCM_CLKEMUL_CTRL = 0x0;</div><div class='add'>+</div><div class='add'>+	/* Set core memory retention state */</div><div class='add'>+	val = pmdomain_get_powerstate(PM_CORE_OFFSET);</div><div class='add'>+	if (cpu_is_omap2420()) {</div><div class='add'>+		val &amp;= ~(0x7 &lt;&lt; 3);</div><div class='add'>+		val |= (MEM3RETSTATE | MEM2RETSTATE | MEM1RETSTATE);</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= ~(0xf &lt;&lt; 3);</div><div class='add'>+		val |= (MEM4RETSTATE | MEM3RETSTATE | MEM2RETSTATE |</div><div class='add'>+			MEM1RETSTATE);</div><div class='add'>+	}</div><div class='add'>+	pmdomain_set_powerstate(val, PM_CORE_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* OCP interface smart idle. REVISIT: Enable autoidle bit0 ? */</div><div class='add'>+	val = SMS_SYSCONFIG;</div><div class='add'>+	val &amp;= ~(0x3 &lt;&lt; 3);</div><div class='add'>+	val |= (0x2 &lt;&lt; 3) | (1 &lt;&lt; 0);</div><div class='add'>+	SMS_SYSCONFIG |= val;</div><div class='add'>+</div><div class='add'>+	val = SDRC_SYSCONFIG;</div><div class='add'>+	val &amp;= ~(0x3 &lt;&lt; 3);</div><div class='add'>+	val |= (0x2 &lt;&lt; 3);</div><div class='add'>+	SDRC_SYSCONFIG = val;</div><div class='add'>+</div><div class='add'>+	/* Configure L3 interface for smart idle.</div><div class='add'>+	 * REVISIT: Enable autoidle bit0 ?</div><div class='add'>+	 */</div><div class='add'>+	val = GPMC_SYSCONFIG;</div><div class='add'>+	val &amp;= ~(0x3 &lt;&lt; 3);</div><div class='add'>+	val |= (0x2 &lt;&lt; 3) | (1 &lt;&lt; 0);</div><div class='add'>+	GPMC_SYSCONFIG = val;</div><div class='add'>+</div><div class='add'>+	pmdomain_set_powerstate(LOGICRETSTATE | POWERSTATE_RETENTION,</div><div class='add'>+				PM_MPU_OFFSET);</div><div class='add'>+	pmdomain_set_powerstate(POWERSTATE_RETENTION, PM_CORE_OFFSET);</div><div class='add'>+	if (!cpu_is_omap2420())</div><div class='add'>+		pmdomain_set_powerstate(POWERSTATE_RETENTION, PM_MDM_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Assume suspend function has saved the state for DSP and GFX */</div><div class='add'>+	pmdomain_set_powerstate(FORCESTATE | POWERSTATE_OFF, PM_DSP_OFFSET);</div><div class='add'>+	pmdomain_set_powerstate(FORCESTATE | POWERSTATE_OFF, PM_GFX_OFFSET);</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* REVISIT: Internal USB needs special handling */</div><div class='add'>+	force_standby_usb();</div><div class='add'>+	if (cpu_is_omap2430())</div><div class='add'>+		force_hsmmc();</div><div class='add'>+	sdram_self_refresh_on_idle_req(1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Enable clock auto control for all domains.</div><div class='add'>+	 * Note that CORE domain includes also DSS, L4 &amp; L3.</div><div class='add'>+	 */</div><div class='add'>+	pmdomain_set_clock_autocontrol(AUTOSTAT_MPU, PM_MPU_OFFSET);</div><div class='add'>+	pmdomain_set_clock_autocontrol(AUTOSTAT_GFX, PM_GFX_OFFSET);</div><div class='add'>+	pmdomain_set_clock_autocontrol(AUTOSTAT_DSS | AUTOSTAT_L4 | AUTOSTAT_L3,</div><div class='add'>+				       PM_CORE_OFFSET);</div><div class='add'>+	if (cpu_is_omap2420())</div><div class='add'>+		pmdomain_set_clock_autocontrol(AUTOSTAT_IVA | AUTOSTAT_DSP,</div><div class='add'>+					       PM_DSP_OFFSET);</div><div class='add'>+	else {</div><div class='add'>+		pmdomain_set_clock_autocontrol(AUTOSTAT_DSP, PM_DSP_OFFSET);</div><div class='add'>+		pmdomain_set_clock_autocontrol(AUTOSTAT_MDM, PM_MDM_OFFSET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable clock autoidle for all domains */</div><div class='add'>+	pmdomain_set_clock_autoidle1(0x2, PM_DSP_OFFSET);</div><div class='add'>+	if (cpu_is_omap2420()) {</div><div class='add'>+		pmdomain_set_clock_autoidle1(0xfffffff9, PM_CORE_OFFSET);</div><div class='add'>+		pmdomain_set_clock_autoidle2(0x7, PM_CORE_OFFSET);</div><div class='add'>+		pmdomain_set_clock_autoidle1(0x3f, PM_WKUP_OFFSET);</div><div class='add'>+	} else {</div><div class='add'>+		pmdomain_set_clock_autoidle1(0xeafffff1, PM_CORE_OFFSET);</div><div class='add'>+		pmdomain_set_clock_autoidle2(0xfff, PM_CORE_OFFSET);</div><div class='add'>+		pmdomain_set_clock_autoidle1(0x7f, PM_WKUP_OFFSET);</div><div class='add'>+		pmdomain_set_clock_autoidle1(0x3, PM_MDM_OFFSET);</div><div class='add'>+	}</div><div class='add'>+	pmdomain_set_clock_autoidle3(0x7, PM_CORE_OFFSET);</div><div class='add'>+	pmdomain_set_clock_autoidle4(0x1f, PM_CORE_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initializes power domains by removing wake-up dependencies and powering</div><div class='add'>+ * down DSP and GFX. Gets called from PM init. Note that DSP and IVA code</div><div class='add'>+ * must re-enable DSP and GFX when used.</div><div class='add'>+ */</div><div class='add'>+void __init pmdomain_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Remove all domain wakeup dependencies */</div><div class='add'>+	pmdomain_set_wakeup_dependencies(EN_WKUP | EN_CORE, PM_MPU_OFFSET);</div><div class='add'>+	pmdomain_set_wakeup_dependencies(0, PM_DSP_OFFSET);</div><div class='add'>+	pmdomain_set_wakeup_dependencies(0, PM_GFX_OFFSET);</div><div class='add'>+	pmdomain_set_wakeup_dependencies(EN_WKUP | EN_MPU, PM_CORE_OFFSET);</div><div class='add'>+	if (cpu_is_omap2430())</div><div class='add'>+		pmdomain_set_wakeup_dependencies(0, PM_MDM_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Power down DSP and GFX */</div><div class='add'>+	pmdomain_set_powerstate(POWERSTATE_OFF | FORCESTATE, PM_DSP_OFFSET);</div><div class='add'>+	pmdomain_set_powerstate(POWERSTATE_OFF | FORCESTATE, PM_GFX_OFFSET);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c<br/>index 562168fa2b16..d7eee99b7e3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/pm.c</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -36,11 +37,18 @@</div><div class='ctx'> #include &lt;asm/arch/sram.h&gt;</div><div class='ctx'> #include &lt;asm/arch/pm.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "prcm-regs.h"</div><div class='add'>+</div><div class='ctx'> static struct clk *vclk;</div><div class='ctx'> static void (*omap2_sram_idle)(void);</div><div class='ctx'> static void (*omap2_sram_suspend)(int dllctrl, int cpu_rev);</div><div class='ctx'> static void (*saved_idle)(void);</div><div class='ctx'> </div><div class='add'>+extern void __init pmdomain_init(void);</div><div class='add'>+extern void pmdomain_set_autoidle(void);</div><div class='add'>+</div><div class='add'>+static unsigned int omap24xx_sleep_save[OMAP24XX_SLEEP_SAVE_SIZE];</div><div class='add'>+</div><div class='ctx'> void omap2_pm_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='hunk'>@@ -87,23 +95,272 @@ static int omap2_pm_prepare(suspend_state_t state)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define INT0_WAKE_MASK	(OMAP_IRQ_BIT(INT_24XX_GPIO_BANK1) |	\</div><div class='add'>+			OMAP_IRQ_BIT(INT_24XX_GPIO_BANK2) |	\</div><div class='add'>+			OMAP_IRQ_BIT(INT_24XX_GPIO_BANK3))</div><div class='add'>+</div><div class='add'>+#define INT1_WAKE_MASK	(OMAP_IRQ_BIT(INT_24XX_GPIO_BANK4))</div><div class='add'>+</div><div class='add'>+#define INT2_WAKE_MASK	(OMAP_IRQ_BIT(INT_24XX_UART1_IRQ) |	\</div><div class='add'>+			OMAP_IRQ_BIT(INT_24XX_UART2_IRQ) |	\</div><div class='add'>+			OMAP_IRQ_BIT(INT_24XX_UART3_IRQ))</div><div class='add'>+</div><div class='add'>+#define preg(reg)	printk("%s\t(0x%p):\t0x%08x\n", #reg, &amp;reg, reg);</div><div class='add'>+</div><div class='add'>+static void omap2_pm_debug(char * desc)</div><div class='add'>+{</div><div class='add'>+	printk("%s:\n", desc);</div><div class='add'>+</div><div class='add'>+	preg(CM_CLKSTCTRL_MPU);</div><div class='add'>+	preg(CM_CLKSTCTRL_CORE);</div><div class='add'>+	preg(CM_CLKSTCTRL_GFX);</div><div class='add'>+	preg(CM_CLKSTCTRL_DSP);</div><div class='add'>+	preg(CM_CLKSTCTRL_MDM);</div><div class='add'>+</div><div class='add'>+	preg(PM_PWSTCTRL_MPU);</div><div class='add'>+	preg(PM_PWSTCTRL_CORE);</div><div class='add'>+	preg(PM_PWSTCTRL_GFX);</div><div class='add'>+	preg(PM_PWSTCTRL_DSP);</div><div class='add'>+	preg(PM_PWSTCTRL_MDM);</div><div class='add'>+</div><div class='add'>+	preg(PM_PWSTST_MPU);</div><div class='add'>+	preg(PM_PWSTST_CORE);</div><div class='add'>+	preg(PM_PWSTST_GFX);</div><div class='add'>+	preg(PM_PWSTST_DSP);</div><div class='add'>+	preg(PM_PWSTST_MDM);</div><div class='add'>+</div><div class='add'>+	preg(CM_AUTOIDLE1_CORE);</div><div class='add'>+	preg(CM_AUTOIDLE2_CORE);</div><div class='add'>+	preg(CM_AUTOIDLE3_CORE);</div><div class='add'>+	preg(CM_AUTOIDLE4_CORE);</div><div class='add'>+	preg(CM_AUTOIDLE_WKUP);</div><div class='add'>+	preg(CM_AUTOIDLE_PLL);</div><div class='add'>+	preg(CM_AUTOIDLE_DSP);</div><div class='add'>+	preg(CM_AUTOIDLE_MDM);</div><div class='add'>+</div><div class='add'>+	preg(CM_ICLKEN1_CORE);</div><div class='add'>+	preg(CM_ICLKEN2_CORE);</div><div class='add'>+	preg(CM_ICLKEN3_CORE);</div><div class='add'>+	preg(CM_ICLKEN4_CORE);</div><div class='add'>+	preg(CM_ICLKEN_GFX);</div><div class='add'>+	preg(CM_ICLKEN_WKUP);</div><div class='add'>+	preg(CM_ICLKEN_DSP);</div><div class='add'>+	preg(CM_ICLKEN_MDM);</div><div class='add'>+</div><div class='add'>+	preg(CM_IDLEST1_CORE);</div><div class='add'>+	preg(CM_IDLEST2_CORE);</div><div class='add'>+	preg(CM_IDLEST3_CORE);</div><div class='add'>+	preg(CM_IDLEST4_CORE);</div><div class='add'>+	preg(CM_IDLEST_GFX);</div><div class='add'>+	preg(CM_IDLEST_WKUP);</div><div class='add'>+	preg(CM_IDLEST_CKGEN);</div><div class='add'>+	preg(CM_IDLEST_DSP);</div><div class='add'>+	preg(CM_IDLEST_MDM);</div><div class='add'>+</div><div class='add'>+	preg(RM_RSTST_MPU);</div><div class='add'>+	preg(RM_RSTST_GFX);</div><div class='add'>+	preg(RM_RSTST_WKUP);</div><div class='add'>+	preg(RM_RSTST_DSP);</div><div class='add'>+	preg(RM_RSTST_MDM);</div><div class='add'>+</div><div class='add'>+	preg(PM_WKDEP_MPU);</div><div class='add'>+	preg(PM_WKDEP_CORE);</div><div class='add'>+	preg(PM_WKDEP_GFX);</div><div class='add'>+	preg(PM_WKDEP_DSP);</div><div class='add'>+	preg(PM_WKDEP_MDM);</div><div class='add'>+</div><div class='add'>+	preg(CM_FCLKEN_WKUP);</div><div class='add'>+	preg(CM_ICLKEN_WKUP);</div><div class='add'>+	preg(CM_IDLEST_WKUP);</div><div class='add'>+	preg(CM_AUTOIDLE_WKUP);</div><div class='add'>+	preg(CM_CLKSEL_WKUP);</div><div class='add'>+</div><div class='add'>+	preg(PM_WKEN_WKUP);</div><div class='add'>+	preg(PM_WKST_WKUP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void omap2_pm_save_registers(void)</div><div class='add'>+{</div><div class='add'>+	/* Save interrupt registers */</div><div class='add'>+	OMAP24XX_SAVE(INTC_MIR0);</div><div class='add'>+	OMAP24XX_SAVE(INTC_MIR1);</div><div class='add'>+	OMAP24XX_SAVE(INTC_MIR2);</div><div class='add'>+</div><div class='add'>+	/* Save power control registers */</div><div class='add'>+	OMAP24XX_SAVE(CM_CLKSTCTRL_MPU);</div><div class='add'>+	OMAP24XX_SAVE(CM_CLKSTCTRL_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_CLKSTCTRL_GFX);</div><div class='add'>+	OMAP24XX_SAVE(CM_CLKSTCTRL_DSP);</div><div class='add'>+	OMAP24XX_SAVE(CM_CLKSTCTRL_MDM);</div><div class='add'>+</div><div class='add'>+	/* Save power state registers */</div><div class='add'>+	OMAP24XX_SAVE(PM_PWSTCTRL_MPU);</div><div class='add'>+	OMAP24XX_SAVE(PM_PWSTCTRL_CORE);</div><div class='add'>+	OMAP24XX_SAVE(PM_PWSTCTRL_GFX);</div><div class='add'>+	OMAP24XX_SAVE(PM_PWSTCTRL_DSP);</div><div class='add'>+	OMAP24XX_SAVE(PM_PWSTCTRL_MDM);</div><div class='add'>+</div><div class='add'>+	/* Save autoidle registers */</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE1_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE2_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE3_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE4_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE_WKUP);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE_PLL);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE_DSP);</div><div class='add'>+	OMAP24XX_SAVE(CM_AUTOIDLE_MDM);</div><div class='add'>+</div><div class='add'>+	/* Save idle state registers */</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST1_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST2_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST3_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST4_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST_GFX);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST_WKUP);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST_CKGEN);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST_DSP);</div><div class='add'>+	OMAP24XX_SAVE(CM_IDLEST_MDM);</div><div class='add'>+</div><div class='add'>+	/* Save clock registers */</div><div class='add'>+	OMAP24XX_SAVE(CM_FCLKEN1_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_FCLKEN2_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_ICLKEN1_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_ICLKEN2_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_ICLKEN3_CORE);</div><div class='add'>+	OMAP24XX_SAVE(CM_ICLKEN4_CORE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void omap2_pm_restore_registers(void)</div><div class='add'>+{</div><div class='add'>+	/* Restore clock state registers */</div><div class='add'>+	OMAP24XX_RESTORE(CM_CLKSTCTRL_MPU);</div><div class='add'>+	OMAP24XX_RESTORE(CM_CLKSTCTRL_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_CLKSTCTRL_GFX);</div><div class='add'>+	OMAP24XX_RESTORE(CM_CLKSTCTRL_DSP);</div><div class='add'>+	OMAP24XX_RESTORE(CM_CLKSTCTRL_MDM);</div><div class='add'>+</div><div class='add'>+	/* Restore power state registers */</div><div class='add'>+	OMAP24XX_RESTORE(PM_PWSTCTRL_MPU);</div><div class='add'>+	OMAP24XX_RESTORE(PM_PWSTCTRL_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(PM_PWSTCTRL_GFX);</div><div class='add'>+	OMAP24XX_RESTORE(PM_PWSTCTRL_DSP);</div><div class='add'>+	OMAP24XX_RESTORE(PM_PWSTCTRL_MDM);</div><div class='add'>+</div><div class='add'>+	/* Restore idle state registers */</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST1_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST2_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST3_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST4_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST_GFX);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST_WKUP);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST_CKGEN);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST_DSP);</div><div class='add'>+	OMAP24XX_RESTORE(CM_IDLEST_MDM);</div><div class='add'>+</div><div class='add'>+	/* Restore autoidle registers */</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE1_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE2_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE3_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE4_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE_WKUP);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE_PLL);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE_DSP);</div><div class='add'>+	OMAP24XX_RESTORE(CM_AUTOIDLE_MDM);</div><div class='add'>+</div><div class='add'>+	/* Restore clock registers */</div><div class='add'>+	OMAP24XX_RESTORE(CM_FCLKEN1_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_FCLKEN2_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_ICLKEN1_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_ICLKEN2_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_ICLKEN3_CORE);</div><div class='add'>+	OMAP24XX_RESTORE(CM_ICLKEN4_CORE);</div><div class='add'>+</div><div class='add'>+	/* REVISIT: Clear interrupts here */</div><div class='add'>+</div><div class='add'>+	/* Restore interrupt registers */</div><div class='add'>+	OMAP24XX_RESTORE(INTC_MIR0);</div><div class='add'>+	OMAP24XX_RESTORE(INTC_MIR1);</div><div class='add'>+	OMAP24XX_RESTORE(INTC_MIR2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int omap2_pm_suspend(void)</div><div class='add'>+{</div><div class='add'>+	int processor_type = 0;</div><div class='add'>+</div><div class='add'>+	/* REVISIT: 0x21 or 0x26? */</div><div class='add'>+	if (cpu_is_omap2420())</div><div class='add'>+		processor_type = 0x21;</div><div class='add'>+</div><div class='add'>+	if (!processor_type)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='add'>+	omap2_pm_save_registers();</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts except for the wake events */</div><div class='add'>+	INTC_MIR_SET0 = 0xffffffff &amp; ~INT0_WAKE_MASK;</div><div class='add'>+	INTC_MIR_SET1 = 0xffffffff &amp; ~INT1_WAKE_MASK;</div><div class='add'>+	INTC_MIR_SET2 = 0xffffffff &amp; ~INT2_WAKE_MASK;</div><div class='add'>+</div><div class='add'>+	pmdomain_set_autoidle();</div><div class='add'>+</div><div class='add'>+	/* Clear old wake-up events */</div><div class='add'>+	PM_WKST1_CORE = 0;</div><div class='add'>+	PM_WKST2_CORE = 0;</div><div class='add'>+	PM_WKST_WKUP = 0;</div><div class='add'>+</div><div class='add'>+	/* Enable wake-up events */</div><div class='add'>+	PM_WKEN1_CORE = (1 &lt;&lt; 22) | (1 &lt;&lt; 21);	/* UART1 &amp; 2 */</div><div class='add'>+	PM_WKEN2_CORE = (1 &lt;&lt; 2);		/* UART3 */</div><div class='add'>+	PM_WKEN_WKUP = (1 &lt;&lt; 2) | (1 &lt;&lt; 0);	/* GPIO &amp; GPT1 */</div><div class='add'>+</div><div class='add'>+	/* Disable clocks except for CM_ICLKEN2_CORE. It gets disabled</div><div class='add'>+	 * in the SRAM suspend code */</div><div class='add'>+	CM_FCLKEN1_CORE = 0;</div><div class='add'>+	CM_FCLKEN2_CORE = 0;</div><div class='add'>+	CM_ICLKEN1_CORE = 0;</div><div class='add'>+	CM_ICLKEN3_CORE = 0;</div><div class='add'>+	CM_ICLKEN4_CORE = 0;</div><div class='add'>+</div><div class='add'>+	omap2_pm_debug("Status before suspend");</div><div class='add'>+</div><div class='add'>+	/* Must wait for serial buffers to clear */</div><div class='add'>+	mdelay(200);</div><div class='add'>+</div><div class='add'>+	/* Jump to SRAM suspend code</div><div class='add'>+	 * REVISIT: When is this SDRC_DLLB_CTRL?</div><div class='add'>+	 */</div><div class='add'>+	omap2_sram_suspend(SDRC_DLLA_CTRL, processor_type);</div><div class='add'>+</div><div class='add'>+	/* Back from sleep */</div><div class='add'>+	omap2_pm_restore_registers();</div><div class='add'>+</div><div class='add'>+	local_fiq_enable();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int omap2_pm_enter(suspend_state_t state)</div><div class='ctx'> {</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='ctx'> 	switch (state)</div><div class='ctx'> 	{</div><div class='ctx'> 	case PM_SUSPEND_STANDBY:</div><div class='ctx'> 	case PM_SUSPEND_MEM:</div><div class='del'>-		/* FIXME: Add suspend */</div><div class='add'>+		ret = omap2_pm_suspend();</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	case PM_SUSPEND_DISK:</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='add'>+		ret = -ENOTSUPP;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int omap2_pm_finish(suspend_state_t state)</div><div class='hunk'>@@ -143,6 +400,8 @@ int __init omap2_pm_init(void)</div><div class='ctx'> 	pm_set_ops(&amp;omap_pm_ops);</div><div class='ctx'> 	pm_idle = omap2_pm_idle;</div><div class='ctx'> </div><div class='add'>+	pmdomain_init();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c<br/>index 8893479dc7e0..c2bf57ef6825 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/prcm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/prcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/prcm.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep.S<br/>index 00299cbeb911..16247d557853 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/sleep.S</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/arch/io.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S<br/>index d261e4ff4d9b..a5ef7f611da9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sram-fn.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/sram-fn.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/sram-fn.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/sram-fn.S</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,</div><div class='ctx'>  * MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/arch/io.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c<br/>index 1d2f5ac2f69b..fe5fd6d42dea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/timer-gp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-omap2/timer-gp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-omap2/timer-gp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-omap2/timer-gp.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'>  * Copyright (C) 2005 Nokia Corporation</div><div class='ctx'>  * Author: Paul Mundt &lt;paul.mundt@nokia.com&gt;</div><div class='ctx'>  *         Juha Yrjölä &lt;juha.yrjola@nokia.com&gt;</div><div class='add'>+ * OMAP Dual-mode timer framework support by Timo Teras</div><div class='ctx'>  *</div><div class='ctx'>  * Some parts based off of TI's 24xx code:</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,54 +23,18 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/arch/dmtimer.h&gt;</div><div class='ctx'> </div><div class='del'>-#define OMAP2_GP_TIMER1_BASE	0x48028000</div><div class='del'>-#define OMAP2_GP_TIMER2_BASE	0x4802a000</div><div class='del'>-#define OMAP2_GP_TIMER3_BASE	0x48078000</div><div class='del'>-#define OMAP2_GP_TIMER4_BASE	0x4807a000</div><div class='add'>+static struct omap_dm_timer *gptimer;</div><div class='ctx'> </div><div class='del'>-#define GP_TIMER_TIDR		0x00</div><div class='del'>-#define GP_TIMER_TISR		0x18</div><div class='del'>-#define GP_TIMER_TIER		0x1c</div><div class='del'>-#define GP_TIMER_TCLR		0x24</div><div class='del'>-#define GP_TIMER_TCRR		0x28</div><div class='del'>-#define GP_TIMER_TLDR		0x2c</div><div class='del'>-#define GP_TIMER_TSICR		0x40</div><div class='del'>-</div><div class='del'>-#define OS_TIMER_NR		1  /* GP timer 2 */</div><div class='del'>-</div><div class='del'>-static unsigned long timer_base[] = {</div><div class='del'>-	IO_ADDRESS(OMAP2_GP_TIMER1_BASE),</div><div class='del'>-	IO_ADDRESS(OMAP2_GP_TIMER2_BASE),</div><div class='del'>-	IO_ADDRESS(OMAP2_GP_TIMER3_BASE),</div><div class='del'>-	IO_ADDRESS(OMAP2_GP_TIMER4_BASE),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline unsigned int timer_read_reg(int nr, unsigned int reg)</div><div class='del'>-{</div><div class='del'>-	return __raw_readl(timer_base[nr] + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void timer_write_reg(int nr, unsigned int reg, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(val, timer_base[nr] + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Note that we always enable the clock prescale divider bit */</div><div class='del'>-static inline void omap2_gp_timer_start(int nr, unsigned long load_val)</div><div class='add'>+static inline void omap2_gp_timer_start(unsigned long load_val)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	tmp = 0xffffffff - load_val;</div><div class='del'>-</div><div class='del'>-	timer_write_reg(nr, GP_TIMER_TLDR, tmp);</div><div class='del'>-	timer_write_reg(nr, GP_TIMER_TCRR, tmp);</div><div class='del'>-	timer_write_reg(nr, GP_TIMER_TIER, 1 &lt;&lt; 1);</div><div class='del'>-	timer_write_reg(nr, GP_TIMER_TCLR, (1 &lt;&lt; 5) | (1 &lt;&lt; 1) | 1);</div><div class='add'>+	omap_dm_timer_set_load(gptimer, 1, 0xffffffff - load_val);</div><div class='add'>+	omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_OVERFLOW);</div><div class='add'>+	omap_dm_timer_start(gptimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id,</div><div class='hunk'>@@ -77,7 +42,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id,</div><div class='ctx'> {</div><div class='ctx'> 	write_seqlock(&amp;xtime_lock);</div><div class='ctx'> </div><div class='del'>-	timer_write_reg(OS_TIMER_NR, GP_TIMER_TISR, 1 &lt;&lt; 1);</div><div class='add'>+	omap_dm_timer_write_status(gptimer, OMAP_TIMER_INT_OVERFLOW);</div><div class='ctx'> 	timer_tick(regs);</div><div class='ctx'> </div><div class='ctx'> 	write_sequnlock(&amp;xtime_lock);</div><div class='hunk'>@@ -87,41 +52,26 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id,</div><div class='ctx'> </div><div class='ctx'> static struct irqaction omap2_gp_timer_irq = {</div><div class='ctx'> 	.name		= "gp timer",</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= omap2_gp_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init omap2_gp_timer_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct clk * sys_ck;</div><div class='del'>-	u32 tick_period = 120000;</div><div class='del'>-	u32 l;</div><div class='add'>+	u32 tick_period;</div><div class='ctx'> </div><div class='del'>-	/* Reset clock and prescale value */</div><div class='del'>-	timer_write_reg(OS_TIMER_NR, GP_TIMER_TCLR, 0);</div><div class='add'>+	omap_dm_timer_init();</div><div class='add'>+	gptimer = omap_dm_timer_request_specific(1);</div><div class='add'>+	BUG_ON(gptimer == NULL);</div><div class='ctx'> </div><div class='del'>-	sys_ck = clk_get(NULL, "sys_ck");</div><div class='del'>-	if (IS_ERR(sys_ck))</div><div class='del'>-		printk(KERN_ERR "Could not get sys_ck\n");</div><div class='del'>-	else {</div><div class='del'>-		clk_enable(sys_ck);</div><div class='del'>-		tick_period = clk_get_rate(sys_ck) / 100;</div><div class='del'>-		clk_put(sys_ck);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tick_period /= 2;	/* Minimum prescale divider is 2 */</div><div class='add'>+	omap_dm_timer_set_source(gptimer, OMAP_TIMER_SRC_SYS_CLK);</div><div class='add'>+	tick_period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / 100;</div><div class='ctx'> 	tick_period -= 1;</div><div class='ctx'> </div><div class='del'>-	l = timer_read_reg(OS_TIMER_NR, GP_TIMER_TIDR);</div><div class='del'>-	printk(KERN_INFO "OMAP2 GP timer (HW version %d.%d)\n",</div><div class='del'>-	       (l &gt;&gt; 4) &amp; 0x0f, l &amp; 0x0f);</div><div class='del'>-</div><div class='del'>-	setup_irq(38, &amp;omap2_gp_timer_irq);</div><div class='del'>-</div><div class='del'>-	omap2_gp_timer_start(OS_TIMER_NR, tick_period);</div><div class='add'>+	setup_irq(omap_dm_timer_get_irq(gptimer), &amp;omap2_gp_timer_irq);</div><div class='add'>+	omap2_gp_timer_start(tick_period);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sys_timer omap_timer = {</div><div class='ctx'> 	.init	= omap2_gp_timer_init,</div><div class='ctx'> };</div><div class='del'>-</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/Makefile b/arch/arm/mach-pnx4008/Makefile<br/>new file mode 100644<br/>index 000000000000..b457ca0a431a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the linux kernel.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-y			:= core.o irq.o time.o clock.o gpio.o serial.o dma.o</div><div class='add'>+obj-m			:=</div><div class='add'>+obj-n			:=</div><div class='add'>+obj-			:=</div><div class='add'>+</div><div class='add'>+# Power Management</div><div class='add'>+obj-$(CONFIG_PM) += pm.o sleep.o</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/Makefile.boot b/arch/arm/mach-pnx4008/Makefile.boot<br/>new file mode 100644<br/>index 000000000000..44c7117e20dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/Makefile.boot?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/Makefile.boot</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+   zreladdr-y		:= 0x80008000</div><div class='add'>+params_phys-y		:= 0x80000100</div><div class='add'>+initrd_phys-y		:= 0x80800000</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c<br/>new file mode 100644<br/>index 000000000000..f582ed2ec43c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/clock.c</a></div><div class='hunk'>@@ -0,0 +1,983 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/clock.c</div><div class='add'>+ *</div><div class='add'>+ * Clock control driver for PNX4008</div><div class='add'>+ *</div><div class='add'>+ * Authors: Vitaly Wool, Dmitry Chigirev &lt;source@mvista.com&gt;</div><div class='add'>+ * Generic clock management functions are partially based on:</div><div class='add'>+ *  linux/arch/arm/mach-omap/clock.c</div><div class='add'>+ *</div><div class='add'>+ * 2005-2006 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include "clock.h"</div><div class='add'>+</div><div class='add'>+/*forward declaration*/</div><div class='add'>+static struct clk per_ck;</div><div class='add'>+static struct clk hclk_ck;</div><div class='add'>+static struct clk ck_1MHz;</div><div class='add'>+static struct clk ck_13MHz;</div><div class='add'>+static struct clk ck_pll1;</div><div class='add'>+static int local_set_rate(struct clk *clk, u32 rate);</div><div class='add'>+</div><div class='add'>+static inline void clock_lock(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clock_unlock(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void propagate_rate(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	struct clk *tmp_clk;</div><div class='add'>+</div><div class='add'>+	tmp_clk = clk;</div><div class='add'>+	while (tmp_clk-&gt;propagate_next) {</div><div class='add'>+		tmp_clk = tmp_clk-&gt;propagate_next;</div><div class='add'>+		local_set_rate(tmp_clk, tmp_clk-&gt;user_rate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clk_reg_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk-&gt;enable_reg)</div><div class='add'>+		__raw_writel(__raw_readl(clk-&gt;enable_reg) &amp;</div><div class='add'>+			     ~(1 &lt;&lt; clk-&gt;enable_shift), clk-&gt;enable_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clk_reg_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk-&gt;enable_reg)</div><div class='add'>+		__raw_writel(__raw_readl(clk-&gt;enable_reg) |</div><div class='add'>+			     (1 &lt;&lt; clk-&gt;enable_shift), clk-&gt;enable_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clk_reg_disable1(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk-&gt;enable_reg1)</div><div class='add'>+		__raw_writel(__raw_readl(clk-&gt;enable_reg1) &amp;</div><div class='add'>+			     ~(1 &lt;&lt; clk-&gt;enable_shift1), clk-&gt;enable_reg1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void clk_reg_enable1(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk-&gt;enable_reg1)</div><div class='add'>+		__raw_writel(__raw_readl(clk-&gt;enable_reg1) |</div><div class='add'>+			     (1 &lt;&lt; clk-&gt;enable_shift1), clk-&gt;enable_reg1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clk_wait_for_pll_lock(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	i = 0;</div><div class='add'>+	while (i++ &lt; 0xFFF &amp;&amp; !(__raw_readl(clk-&gt;scale_reg) &amp; 1)) ;	/*wait for PLL to lock */</div><div class='add'>+</div><div class='add'>+	if (!(__raw_readl(clk-&gt;scale_reg) &amp; 1)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "%s ERROR: failed to lock, scale reg data: %x\n",</div><div class='add'>+		       clk-&gt;name, __raw_readl(clk-&gt;scale_reg));</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int switch_to_dirty_13mhz(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 tmp_reg;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;rate)</div><div class='add'>+		clk_reg_enable1(clk);</div><div class='add'>+</div><div class='add'>+	tmp_reg = __raw_readl(clk-&gt;parent_switch_reg);</div><div class='add'>+	/*if 13Mhz clock selected, select 13'MHz (dirty) source from OSC */</div><div class='add'>+	if (!(tmp_reg &amp; 1)) {</div><div class='add'>+		tmp_reg |= (1 &lt;&lt; 1);	/* Trigger switch to 13'MHz (dirty) clock */</div><div class='add'>+		__raw_writel(tmp_reg, clk-&gt;parent_switch_reg);</div><div class='add'>+		i = 0;</div><div class='add'>+		while (i++ &lt; 0xFFF &amp;&amp; !(__raw_readl(clk-&gt;parent_switch_reg) &amp; 1)) ;	/*wait for 13'MHz selection status */</div><div class='add'>+</div><div class='add'>+		if (!(__raw_readl(clk-&gt;parent_switch_reg) &amp; 1)) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s ERROR: failed to select 13'MHz, parent sw reg data: %x\n",</div><div class='add'>+			       clk-&gt;name, __raw_readl(clk-&gt;parent_switch_reg));</div><div class='add'>+			ret = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;rate)</div><div class='add'>+		clk_reg_disable1(clk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int switch_to_clean_13mhz(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 tmp_reg;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;rate)</div><div class='add'>+		clk_reg_enable1(clk);</div><div class='add'>+</div><div class='add'>+	tmp_reg = __raw_readl(clk-&gt;parent_switch_reg);</div><div class='add'>+	/*if 13'Mhz clock selected, select 13MHz (clean) source from OSC */</div><div class='add'>+	if (tmp_reg &amp; 1) {</div><div class='add'>+		tmp_reg &amp;= ~(1 &lt;&lt; 1);	/* Trigger switch to 13MHz (clean) clock */</div><div class='add'>+		__raw_writel(tmp_reg, clk-&gt;parent_switch_reg);</div><div class='add'>+		i = 0;</div><div class='add'>+		while (i++ &lt; 0xFFF &amp;&amp; (__raw_readl(clk-&gt;parent_switch_reg) &amp; 1)) ;	/*wait for 13MHz selection status */</div><div class='add'>+</div><div class='add'>+		if (__raw_readl(clk-&gt;parent_switch_reg) &amp; 1) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "%s ERROR: failed to select 13MHz, parent sw reg data: %x\n",</div><div class='add'>+			       clk-&gt;name, __raw_readl(clk-&gt;parent_switch_reg));</div><div class='add'>+			ret = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!clk-&gt;rate)</div><div class='add'>+		clk_reg_disable1(clk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_13MHz_parent(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;ck_13MHz)</div><div class='add'>+		ret = switch_to_clean_13mhz(clk);</div><div class='add'>+	else if (parent == &amp;ck_pll1)</div><div class='add'>+		ret = switch_to_dirty_13mhz(clk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PLL160_MIN_FCCO 156000</div><div class='add'>+#define PLL160_MAX_FCCO 320000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate pll160 settings.</div><div class='add'>+ * Possible input: up to 320MHz with step of clk-&gt;parent-&gt;rate.</div><div class='add'>+ * In PNX4008 parent rate for pll160s may be either 1 or 13MHz.</div><div class='add'>+ * Ignored paths: "feedback" (bit 13 set), "div-by-N".</div><div class='add'>+ * Setting ARM PLL4 rate to 0 will put CPU into direct run mode.</div><div class='add'>+ * Setting PLL5 and PLL3 rate to 0 will disable USB and DSP clock input.</div><div class='add'>+ * Please refer to PNX4008 IC manual for details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int pll160_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	u32 tmp_reg, tmp_m, tmp_2p, i;</div><div class='add'>+	u32 parent_rate;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	parent_rate = clk-&gt;parent-&gt;rate;</div><div class='add'>+</div><div class='add'>+	if (!parent_rate)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* set direct run for ARM or disable output for others  */</div><div class='add'>+	clk_reg_disable(clk);</div><div class='add'>+</div><div class='add'>+	/* disable source input as well (ignored for ARM) */</div><div class='add'>+	clk_reg_disable1(clk);</div><div class='add'>+</div><div class='add'>+	tmp_reg = __raw_readl(clk-&gt;scale_reg);</div><div class='add'>+	tmp_reg &amp;= ~0x1ffff;	/*clear all settings, power down */</div><div class='add'>+	__raw_writel(tmp_reg, clk-&gt;scale_reg);</div><div class='add'>+</div><div class='add'>+	rate -= rate % parent_rate;	/*round down the input */</div><div class='add'>+</div><div class='add'>+	if (rate &gt; PLL160_MAX_FCCO)</div><div class='add'>+		rate = PLL160_MAX_FCCO;</div><div class='add'>+</div><div class='add'>+	if (!rate) {</div><div class='add'>+		clk-&gt;rate = 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_reg_enable1(clk);</div><div class='add'>+	tmp_reg = __raw_readl(clk-&gt;scale_reg);</div><div class='add'>+</div><div class='add'>+	if (rate == parent_rate) {</div><div class='add'>+		/*enter direct bypass mode */</div><div class='add'>+		tmp_reg |= ((1 &lt;&lt; 14) | (1 &lt;&lt; 15));</div><div class='add'>+		__raw_writel(tmp_reg, clk-&gt;scale_reg);</div><div class='add'>+		clk-&gt;rate = parent_rate;</div><div class='add'>+		clk_reg_enable(clk);</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	for (tmp_2p = 1; tmp_2p &lt; 16; tmp_2p &lt;&lt;= 1) {</div><div class='add'>+		if (rate * tmp_2p &gt;= PLL160_MIN_FCCO)</div><div class='add'>+			break;</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tmp_2p &gt; 1)</div><div class='add'>+		tmp_reg |= ((i - 1) &lt;&lt; 11);</div><div class='add'>+	else</div><div class='add'>+		tmp_reg |= (1 &lt;&lt; 14);	/*direct mode, no divide */</div><div class='add'>+</div><div class='add'>+	tmp_m = rate * tmp_2p;</div><div class='add'>+	tmp_m /= parent_rate;</div><div class='add'>+</div><div class='add'>+	tmp_reg |= (tmp_m - 1) &lt;&lt; 1;	/*calculate M */</div><div class='add'>+	tmp_reg |= (1 &lt;&lt; 16);	/*power up PLL */</div><div class='add'>+	__raw_writel(tmp_reg, clk-&gt;scale_reg);</div><div class='add'>+</div><div class='add'>+	if (clk_wait_for_pll_lock(clk) &lt; 0) {</div><div class='add'>+		clk_reg_disable(clk);</div><div class='add'>+		clk_reg_disable1(clk);</div><div class='add'>+</div><div class='add'>+		tmp_reg = __raw_readl(clk-&gt;scale_reg);</div><div class='add'>+		tmp_reg &amp;= ~0x1ffff;	/*clear all settings, power down */</div><div class='add'>+		__raw_writel(tmp_reg, clk-&gt;scale_reg);</div><div class='add'>+		clk-&gt;rate = 0;</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk-&gt;rate = (tmp_m * parent_rate) / tmp_2p;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;flags &amp; RATE_PROPAGATES)</div><div class='add'>+		propagate_rate(clk);</div><div class='add'>+</div><div class='add'>+	clk_reg_enable(clk);</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*configure PER_CLK*/</div><div class='add'>+static int per_clk_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = __raw_readl(clk-&gt;scale_reg);</div><div class='add'>+	tmp &amp;= ~(0x1f &lt;&lt; 2);</div><div class='add'>+	tmp |= ((clk-&gt;parent-&gt;rate / clk-&gt;rate) - 1) &lt;&lt; 2;</div><div class='add'>+	__raw_writel(tmp, clk-&gt;scale_reg);</div><div class='add'>+	clk-&gt;rate = rate;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*configure HCLK*/</div><div class='add'>+static int hclk_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	tmp = __raw_readl(clk-&gt;scale_reg);</div><div class='add'>+	tmp = tmp &amp; ~0x3;</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case 1:</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		tmp |= 1;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		tmp |= 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(tmp, clk-&gt;scale_reg);</div><div class='add'>+	clk-&gt;rate = rate;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 hclk_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case 1:</div><div class='add'>+	case 4:</div><div class='add'>+		return rate;</div><div class='add'>+	}</div><div class='add'>+	return 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 per_clk_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	return CLK_RATE_13MHZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int on_off_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	if (rate) {</div><div class='add'>+		clk_reg_enable(clk);</div><div class='add'>+		clk-&gt;rate = 1;</div><div class='add'>+	} else {</div><div class='add'>+		clk_reg_disable(clk);</div><div class='add'>+		clk-&gt;rate = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int on_off_inv_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	if (rate) {</div><div class='add'>+		clk_reg_disable(clk);	/*enable bit is inverted */</div><div class='add'>+		clk-&gt;rate = 1;</div><div class='add'>+	} else {</div><div class='add'>+		clk_reg_enable(clk);</div><div class='add'>+		clk-&gt;rate = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 on_off_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	return (rate ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pll4_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	if (rate &gt; CLK_RATE_208MHZ)</div><div class='add'>+		rate = CLK_RATE_208MHZ;</div><div class='add'>+	if (rate == CLK_RATE_208MHZ &amp;&amp; hclk_ck.user_rate == 1)</div><div class='add'>+		rate = CLK_RATE_208MHZ - CLK_RATE_13MHZ;</div><div class='add'>+	return (rate - (rate % (hclk_ck.user_rate * CLK_RATE_13MHZ)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pll3_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	if (rate &gt; CLK_RATE_208MHZ)</div><div class='add'>+		rate = CLK_RATE_208MHZ;</div><div class='add'>+	return (rate - rate % CLK_RATE_13MHZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pll5_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	return (rate ? CLK_RATE_48MHZ : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ck_13MHz_round_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	return (rate ? CLK_RATE_13MHZ : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ck_13MHz_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	if (rate) {</div><div class='add'>+		clk_reg_disable(clk);	/*enable bit is inverted */</div><div class='add'>+		udelay(500);</div><div class='add'>+		clk-&gt;rate = CLK_RATE_13MHZ;</div><div class='add'>+		ck_1MHz.rate = CLK_RATE_1MHZ;</div><div class='add'>+	} else {</div><div class='add'>+		clk_reg_enable(clk);</div><div class='add'>+		clk-&gt;rate = 0;</div><div class='add'>+		ck_1MHz.rate = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pll1_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+#if 0 /* doesn't work on some boards, probably a HW BUG */</div><div class='add'>+	if (rate) {</div><div class='add'>+		clk_reg_disable(clk);	/*enable bit is inverted */</div><div class='add'>+		if (!clk_wait_for_pll_lock(clk)) {</div><div class='add'>+			clk-&gt;rate = CLK_RATE_13MHZ;</div><div class='add'>+		} else {</div><div class='add'>+			clk_reg_enable(clk);</div><div class='add'>+			clk-&gt;rate = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		clk_reg_enable(clk);</div><div class='add'>+		clk-&gt;rate = 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Clock sources */</div><div class='add'>+</div><div class='add'>+static struct clk osc_13MHz = {</div><div class='add'>+	.name = "osc_13MHz",</div><div class='add'>+	.flags = FIXED_RATE,</div><div class='add'>+	.rate = CLK_RATE_13MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk ck_13MHz = {</div><div class='add'>+	.name = "ck_13MHz",</div><div class='add'>+	.parent = &amp;osc_13MHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;ck_13MHz_round_rate,</div><div class='add'>+	.set_rate = &amp;ck_13MHz_set_rate,</div><div class='add'>+	.enable_reg = OSC13CTRL_REG,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.rate = CLK_RATE_13MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk osc_32KHz = {</div><div class='add'>+	.name = "osc_32KHz",</div><div class='add'>+	.flags = FIXED_RATE,</div><div class='add'>+	.rate = CLK_RATE_32KHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*attached to PLL5*/</div><div class='add'>+static struct clk ck_1MHz = {</div><div class='add'>+	.name = "ck_1MHz",</div><div class='add'>+	.flags = FIXED_RATE | PARENT_SET_RATE,</div><div class='add'>+	.parent = &amp;ck_13MHz,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PLL1 (397) - provides 13' MHz clock */</div><div class='add'>+static struct clk ck_pll1 = {</div><div class='add'>+	.name = "ck_pll1",</div><div class='add'>+	.parent = &amp;osc_32KHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;ck_13MHz_round_rate,</div><div class='add'>+	.set_rate = &amp;pll1_set_rate,</div><div class='add'>+	.enable_reg = PLLCTRL_REG,</div><div class='add'>+	.enable_shift = 1,</div><div class='add'>+	.scale_reg = PLLCTRL_REG,</div><div class='add'>+	.rate = CLK_RATE_13MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CPU/Bus PLL */</div><div class='add'>+static struct clk ck_pll4 = {</div><div class='add'>+	.name = "ck_pll4",</div><div class='add'>+	.parent = &amp;ck_pll1,</div><div class='add'>+	.flags = RATE_PROPAGATES | NEEDS_INITIALIZATION,</div><div class='add'>+	.propagate_next = &amp;per_ck,</div><div class='add'>+	.round_rate = &amp;pll4_round_rate,</div><div class='add'>+	.set_rate = &amp;pll160_set_rate,</div><div class='add'>+	.rate = CLK_RATE_208MHZ,</div><div class='add'>+	.scale_reg = HCLKPLLCTRL_REG,</div><div class='add'>+	.enable_reg = PWRCTRL_REG,</div><div class='add'>+	.enable_shift = 2,</div><div class='add'>+	.parent_switch_reg = SYSCLKCTRL_REG,</div><div class='add'>+	.set_parent = &amp;set_13MHz_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* USB PLL */</div><div class='add'>+static struct clk ck_pll5 = {</div><div class='add'>+	.name = "ck_pll5",</div><div class='add'>+	.parent = &amp;ck_1MHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;pll5_round_rate,</div><div class='add'>+	.set_rate = &amp;pll160_set_rate,</div><div class='add'>+	.scale_reg = USBCTRL_REG,</div><div class='add'>+	.enable_reg = USBCTRL_REG,</div><div class='add'>+	.enable_shift = 18,</div><div class='add'>+	.enable_reg1 = USBCTRL_REG,</div><div class='add'>+	.enable_shift1 = 17,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* XPERTTeak DSP PLL */</div><div class='add'>+static struct clk ck_pll3 = {</div><div class='add'>+	.name = "ck_pll3",</div><div class='add'>+	.parent = &amp;ck_pll1,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;pll3_round_rate,</div><div class='add'>+	.set_rate = &amp;pll160_set_rate,</div><div class='add'>+	.scale_reg = DSPPLLCTRL_REG,</div><div class='add'>+	.enable_reg = DSPCLKCTRL_REG,</div><div class='add'>+	.enable_shift = 3,</div><div class='add'>+	.enable_reg1 = DSPCLKCTRL_REG,</div><div class='add'>+	.enable_shift1 = 2,</div><div class='add'>+	.parent_switch_reg = DSPCLKCTRL_REG,</div><div class='add'>+	.set_parent = &amp;set_13MHz_parent,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk hclk_ck = {</div><div class='add'>+	.name = "hclk_ck",</div><div class='add'>+	.parent = &amp;ck_pll4,</div><div class='add'>+	.flags = PARENT_SET_RATE,</div><div class='add'>+	.set_rate = &amp;hclk_set_rate,</div><div class='add'>+	.round_rate = &amp;hclk_round_rate,</div><div class='add'>+	.scale_reg = HCLKDIVCTRL_REG,</div><div class='add'>+	.rate = 2,</div><div class='add'>+	.user_rate = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk per_ck = {</div><div class='add'>+	.name = "per_ck",</div><div class='add'>+	.parent = &amp;ck_pll4,</div><div class='add'>+	.flags = FIXED_RATE,</div><div class='add'>+	.propagate_next = &amp;hclk_ck,</div><div class='add'>+	.set_rate = &amp;per_clk_set_rate,</div><div class='add'>+	.round_rate = &amp;per_clk_round_rate,</div><div class='add'>+	.scale_reg = HCLKDIVCTRL_REG,</div><div class='add'>+	.rate = CLK_RATE_13MHZ,</div><div class='add'>+	.user_rate = CLK_RATE_13MHZ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk m2hclk_ck = {</div><div class='add'>+	.name = "m2hclk_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_inv_set_rate,</div><div class='add'>+	.rate = 1,</div><div class='add'>+	.enable_shift = 6,</div><div class='add'>+	.enable_reg = PWRCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk vfp9_ck = {</div><div class='add'>+	.name = "vfp9_ck",</div><div class='add'>+	.parent = &amp;ck_pll4,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.rate = 1,</div><div class='add'>+	.enable_shift = 4,</div><div class='add'>+	.enable_reg = VFP9CLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk keyscan_ck = {</div><div class='add'>+	.name = "keyscan_ck",</div><div class='add'>+	.parent = &amp;osc_32KHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = KEYCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk touch_ck = {</div><div class='add'>+	.name = "touch_ck",</div><div class='add'>+	.parent = &amp;osc_32KHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = TSCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk pwm1_ck = {</div><div class='add'>+	.name = "pwm1_ck",</div><div class='add'>+	.parent = &amp;osc_32KHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = PWMCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk pwm2_ck = {</div><div class='add'>+	.name = "pwm2_ck",</div><div class='add'>+	.parent = &amp;osc_32KHz,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 2,</div><div class='add'>+	.enable_reg = PWMCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk jpeg_ck = {</div><div class='add'>+	.name = "jpeg_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = JPEGCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk ms_ck = {</div><div class='add'>+	.name = "ms_ck",</div><div class='add'>+	.parent = &amp;ck_pll4,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 5,</div><div class='add'>+	.enable_reg = MSCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk dum_ck = {</div><div class='add'>+	.name = "dum_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = DUMCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk flash_ck = {</div><div class='add'>+	.name = "flash_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 1,	/* Only MLC clock supported */</div><div class='add'>+	.enable_reg = FLASHCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk i2c0_ck = {</div><div class='add'>+	.name = "i2c0_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = I2CCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk i2c1_ck = {</div><div class='add'>+	.name = "i2c1_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 1,</div><div class='add'>+	.enable_reg = I2CCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk i2c2_ck = {</div><div class='add'>+	.name = "i2c2_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 2,</div><div class='add'>+	.enable_reg = USB_OTG_CLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk spi0_ck = {</div><div class='add'>+	.name = "spi0_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = SPICTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk spi1_ck = {</div><div class='add'>+	.name = "spi1_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 4,</div><div class='add'>+	.enable_reg = SPICTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk dma_ck = {</div><div class='add'>+	.name = "dma_ck",</div><div class='add'>+	.parent = &amp;hclk_ck,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = DMACLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk uart3_ck = {</div><div class='add'>+	.name = "uart3_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.rate = 1,</div><div class='add'>+	.enable_shift = 0,</div><div class='add'>+	.enable_reg = UARTCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk uart4_ck = {</div><div class='add'>+	.name = "uart4_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 1,</div><div class='add'>+	.enable_reg = UARTCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk uart5_ck = {</div><div class='add'>+	.name = "uart5_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.rate = 1,</div><div class='add'>+	.enable_shift = 2,</div><div class='add'>+	.enable_reg = UARTCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk uart6_ck = {</div><div class='add'>+	.name = "uart6_ck",</div><div class='add'>+	.parent = &amp;per_ck,</div><div class='add'>+	.flags = NEEDS_INITIALIZATION,</div><div class='add'>+	.round_rate = &amp;on_off_round_rate,</div><div class='add'>+	.set_rate = &amp;on_off_set_rate,</div><div class='add'>+	.enable_shift = 3,</div><div class='add'>+	.enable_reg = UARTCLKCTRL_REG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* These clocks are visible outside this module</div><div class='add'>+ * and can be initialized</div><div class='add'>+ */</div><div class='add'>+static struct clk *onchip_clks[] = {</div><div class='add'>+	&amp;ck_13MHz,</div><div class='add'>+	&amp;ck_pll1,</div><div class='add'>+	&amp;ck_pll4,</div><div class='add'>+	&amp;ck_pll5,</div><div class='add'>+	&amp;ck_pll3,</div><div class='add'>+	&amp;vfp9_ck,</div><div class='add'>+	&amp;m2hclk_ck,</div><div class='add'>+	&amp;hclk_ck,</div><div class='add'>+	&amp;dma_ck,</div><div class='add'>+	&amp;flash_ck,</div><div class='add'>+	&amp;dum_ck,</div><div class='add'>+	&amp;keyscan_ck,</div><div class='add'>+	&amp;pwm1_ck,</div><div class='add'>+	&amp;pwm2_ck,</div><div class='add'>+	&amp;jpeg_ck,</div><div class='add'>+	&amp;ms_ck,</div><div class='add'>+	&amp;touch_ck,</div><div class='add'>+	&amp;i2c0_ck,</div><div class='add'>+	&amp;i2c1_ck,</div><div class='add'>+	&amp;i2c2_ck,</div><div class='add'>+	&amp;spi0_ck,</div><div class='add'>+	&amp;spi1_ck,</div><div class='add'>+	&amp;uart3_ck,</div><div class='add'>+	&amp;uart4_ck,</div><div class='add'>+	&amp;uart5_ck,</div><div class='add'>+	&amp;uart6_ck,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int local_clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(clk-&gt;flags &amp; FIXED_RATE) &amp;&amp; !clk-&gt;rate &amp;&amp; clk-&gt;set_rate</div><div class='add'>+	    &amp;&amp; clk-&gt;user_rate)</div><div class='add'>+		ret = clk-&gt;set_rate(clk, clk-&gt;user_rate);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void local_clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (!(clk-&gt;flags &amp; FIXED_RATE) &amp;&amp; clk-&gt;rate &amp;&amp; clk-&gt;set_rate)</div><div class='add'>+		clk-&gt;set_rate(clk, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void local_clk_unuse(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	if (clk-&gt;usecount &gt; 0 &amp;&amp; !(--clk-&gt;usecount)) {</div><div class='add'>+		local_clk_disable(clk);</div><div class='add'>+		if (clk-&gt;parent)</div><div class='add'>+			local_clk_unuse(clk-&gt;parent);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int local_clk_use(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (clk-&gt;usecount++ == 0) {</div><div class='add'>+		if (clk-&gt;parent)</div><div class='add'>+			ret = local_clk_use(clk-&gt;parent);</div><div class='add'>+</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			clk-&gt;usecount--;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = local_clk_enable(clk);</div><div class='add'>+</div><div class='add'>+		if (ret != 0 &amp;&amp; clk-&gt;parent) {</div><div class='add'>+			local_clk_unuse(clk-&gt;parent);</div><div class='add'>+			clk-&gt;usecount--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int local_set_rate(struct clk *clk, u32 rate)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	if (clk-&gt;set_rate) {</div><div class='add'>+</div><div class='add'>+		if (clk-&gt;user_rate == clk-&gt;rate &amp;&amp; clk-&gt;parent-&gt;rate) {</div><div class='add'>+			/* if clock enabled or rate not set */</div><div class='add'>+			clk-&gt;user_rate = clk-&gt;round_rate(clk, rate);</div><div class='add'>+			ret = clk-&gt;set_rate(clk, clk-&gt;user_rate);</div><div class='add'>+		} else</div><div class='add'>+			clk-&gt;user_rate = clk-&gt;round_rate(clk, rate);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clk_set_rate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;flags &amp; FIXED_RATE)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	clock_lock();</div><div class='add'>+	if ((clk-&gt;flags &amp; PARENT_SET_RATE) &amp;&amp; clk-&gt;parent) {</div><div class='add'>+</div><div class='add'>+		clk-&gt;user_rate = clk-&gt;round_rate(clk, rate);</div><div class='add'>+		/* parent clock needs to be refreshed</div><div class='add'>+		   for the setting to take effect */</div><div class='add'>+	} else {</div><div class='add'>+		ret = local_set_rate(clk, rate);</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+	clock_unlock();</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(clk_set_rate);</div><div class='add'>+</div><div class='add'>+struct clk *clk_get(struct device *dev, const char *id)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk = ERR_PTR(-ENOENT);</div><div class='add'>+	struct clk **clkp;</div><div class='add'>+</div><div class='add'>+	clock_lock();</div><div class='add'>+	for (clkp = onchip_clks; clkp &lt; onchip_clks + ARRAY_SIZE(onchip_clks);</div><div class='add'>+	     clkp++) {</div><div class='add'>+		if (strcmp(id, (*clkp)-&gt;name) == 0</div><div class='add'>+		    &amp;&amp; try_module_get((*clkp)-&gt;owner)) {</div><div class='add'>+			clk = (*clkp);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	clock_unlock();</div><div class='add'>+</div><div class='add'>+	return clk;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_get);</div><div class='add'>+</div><div class='add'>+void clk_put(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	clock_lock();</div><div class='add'>+	if (clk &amp;&amp; !IS_ERR(clk))</div><div class='add'>+		module_put(clk-&gt;owner);</div><div class='add'>+	clock_unlock();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_put);</div><div class='add'>+</div><div class='add'>+unsigned long clk_get_rate(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long ret;</div><div class='add'>+	clock_lock();</div><div class='add'>+	ret = clk-&gt;rate;</div><div class='add'>+	clock_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clk_get_rate);</div><div class='add'>+</div><div class='add'>+int clk_enable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	clock_lock();</div><div class='add'>+	ret = local_clk_use(clk);</div><div class='add'>+	clock_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(clk_enable);</div><div class='add'>+</div><div class='add'>+void clk_disable(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	clock_lock();</div><div class='add'>+	local_clk_unuse(clk);</div><div class='add'>+	clock_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(clk_disable);</div><div class='add'>+</div><div class='add'>+long clk_round_rate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	long ret;</div><div class='add'>+	clock_lock();</div><div class='add'>+	if (clk-&gt;round_rate)</div><div class='add'>+		ret = clk-&gt;round_rate(clk, rate);</div><div class='add'>+	else</div><div class='add'>+		ret = clk-&gt;rate;</div><div class='add'>+	clock_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(clk_round_rate);</div><div class='add'>+</div><div class='add'>+int clk_set_parent(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	if (!clk-&gt;set_parent)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	clock_lock();</div><div class='add'>+	ret = clk-&gt;set_parent(clk, parent);</div><div class='add'>+	if (!ret)</div><div class='add'>+		clk-&gt;parent = parent;</div><div class='add'>+	clock_unlock();</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(clk_set_parent);</div><div class='add'>+</div><div class='add'>+static int __init clk_init(void)</div><div class='add'>+{</div><div class='add'>+	struct clk **clkp;</div><div class='add'>+</div><div class='add'>+	/* Disable autoclocking, as it doesn't seem to work */</div><div class='add'>+	__raw_writel(0xff, AUTOCLK_CTRL);</div><div class='add'>+</div><div class='add'>+	for (clkp = onchip_clks; clkp &lt; onchip_clks + ARRAY_SIZE(onchip_clks);</div><div class='add'>+	     clkp++) {</div><div class='add'>+		if (((*clkp)-&gt;flags &amp; NEEDS_INITIALIZATION)</div><div class='add'>+		    &amp;&amp; ((*clkp)-&gt;set_rate)) {</div><div class='add'>+			(*clkp)-&gt;user_rate = (*clkp)-&gt;rate;</div><div class='add'>+			local_set_rate((*clkp), (*clkp)-&gt;user_rate);</div><div class='add'>+			if ((*clkp)-&gt;set_parent)</div><div class='add'>+				(*clkp)-&gt;set_parent((*clkp), (*clkp)-&gt;parent);</div><div class='add'>+		}</div><div class='add'>+		pr_debug("%s: clock %s, rate %ld\n",</div><div class='add'>+			__FUNCTION__, (*clkp)-&gt;name, (*clkp)-&gt;rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_clk_use(&amp;ck_pll4);</div><div class='add'>+</div><div class='add'>+	/* if ck_13MHz is not used, disable it. */</div><div class='add'>+	if (ck_13MHz.usecount == 0)</div><div class='add'>+		local_clk_disable(&amp;ck_13MHz);</div><div class='add'>+</div><div class='add'>+	/* Disable autoclocking */</div><div class='add'>+	__raw_writeb(0xff, AUTOCLK_CTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(clk_init);</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/clock.h b/arch/arm/mach-pnx4008/clock.h<br/>new file mode 100644<br/>index 000000000000..cd58f372cfd0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/clock.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/clock.h</div><div class='add'>+ *</div><div class='add'>+ * Clock control driver for PNX4008 - internal header file</div><div class='add'>+ *</div><div class='add'>+ * Author: Vitaly Wool &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2006 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+#ifndef __ARCH_ARM_PNX4008_CLOCK_H__</div><div class='add'>+#define __ARCH_ARM_PNX4008_CLOCK_H__</div><div class='add'>+</div><div class='add'>+struct clk {</div><div class='add'>+	struct list_head node;</div><div class='add'>+	struct module *owner;</div><div class='add'>+	const char *name;</div><div class='add'>+	struct clk *parent;</div><div class='add'>+	struct clk *propagate_next;</div><div class='add'>+	u32 rate;</div><div class='add'>+	u32 user_rate;</div><div class='add'>+	s8 usecount;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 scale_reg;</div><div class='add'>+	u8 enable_shift;</div><div class='add'>+	u32 enable_reg;</div><div class='add'>+	u8 enable_shift1;</div><div class='add'>+	u32 enable_reg1;</div><div class='add'>+	u32 parent_switch_reg;</div><div class='add'>+	 u32(*round_rate) (struct clk *, u32);</div><div class='add'>+	int (*set_rate) (struct clk *, u32);</div><div class='add'>+	int (*set_parent) (struct clk * clk, struct clk * parent);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flags */</div><div class='add'>+#define RATE_PROPAGATES      (1&lt;&lt;0)</div><div class='add'>+#define NEEDS_INITIALIZATION (1&lt;&lt;1)</div><div class='add'>+#define PARENT_SET_RATE      (1&lt;&lt;2)</div><div class='add'>+#define FIXED_RATE           (1&lt;&lt;3)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c<br/>new file mode 100644<br/>index 000000000000..3d73c1e93752<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/core.c</a></div><div class='hunk'>@@ -0,0 +1,205 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/core.c</div><div class='add'>+ *</div><div class='add'>+ * PNX4008 core startup code</div><div class='add'>+ *</div><div class='add'>+ * Authors: Vitaly Wool, Dmitry Chigirev,</div><div class='add'>+ * Grigory Tolstolytkin, Dmitry Pervushin &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on reference code received from Philips:</div><div class='add'>+ * Copyright (C) 2003 Philips Semiconductors</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/irq.h&gt;</div><div class='add'>+#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+#include &lt;asm/arch/dma.h&gt;</div><div class='add'>+</div><div class='add'>+struct resource spipnx_0_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = PNX4008_SPI1_BASE,</div><div class='add'>+		.end = PNX4008_SPI1_BASE + SZ_4K,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = PER_SPI1_REC_XMIT,</div><div class='add'>+		.flags = IORESOURCE_DMA,</div><div class='add'>+	}, {</div><div class='add'>+		.start = SPI1_INT,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}, {</div><div class='add'>+		.flags = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct resource spipnx_1_resources[] = {</div><div class='add'>+	{</div><div class='add'>+		.start = PNX4008_SPI2_BASE,</div><div class='add'>+		.end = PNX4008_SPI2_BASE + SZ_4K,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start = PER_SPI2_REC_XMIT,</div><div class='add'>+		.flags = IORESOURCE_DMA,</div><div class='add'>+	}, {</div><div class='add'>+		.start = SPI2_INT,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}, {</div><div class='add'>+		.flags = 0,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info spi_board_info[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.modalias	= "m25p80",</div><div class='add'>+		.max_speed_hz	= 1000000,</div><div class='add'>+		.bus_num	= 1,</div><div class='add'>+		.chip_select	= 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device spipnx_1 = {</div><div class='add'>+	.name = "spipnx",</div><div class='add'>+	.id = 1,</div><div class='add'>+	.num_resources = ARRAY_SIZE(spipnx_0_resources),</div><div class='add'>+	.resource = spipnx_0_resources,</div><div class='add'>+	.dev = {</div><div class='add'>+		.coherent_dma_mask = 0xFFFFFFFF,</div><div class='add'>+		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device spipnx_2 = {</div><div class='add'>+	.name = "spipnx",</div><div class='add'>+	.id = 2,</div><div class='add'>+	.num_resources = ARRAY_SIZE(spipnx_1_resources),</div><div class='add'>+	.resource = spipnx_1_resources,</div><div class='add'>+	.dev = {</div><div class='add'>+		.coherent_dma_mask = 0xFFFFFFFF,</div><div class='add'>+		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct plat_serial8250_port platform_serial_ports[] = {</div><div class='add'>+	{</div><div class='add'>+		.membase = (void *)__iomem(IO_ADDRESS(PNX4008_UART5_BASE)),</div><div class='add'>+		.mapbase = (unsigned long)PNX4008_UART5_BASE,</div><div class='add'>+		.irq = IIR5_INT,</div><div class='add'>+		.uartclk = PNX4008_UART_CLK,</div><div class='add'>+		.regshift = 2,</div><div class='add'>+		.iotype = UPIO_MEM,</div><div class='add'>+		.flags = UPF_BOOT_AUTOCONF | UPF_BUGGY_UART | UPF_SKIP_TEST,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.membase = (void *)__iomem(IO_ADDRESS(PNX4008_UART3_BASE)),</div><div class='add'>+		.mapbase = (unsigned long)PNX4008_UART3_BASE,</div><div class='add'>+		.irq = IIR3_INT,</div><div class='add'>+		.uartclk = PNX4008_UART_CLK,</div><div class='add'>+		.regshift = 2,</div><div class='add'>+		.iotype = UPIO_MEM,</div><div class='add'>+		.flags = UPF_BOOT_AUTOCONF | UPF_BUGGY_UART | UPF_SKIP_TEST,</div><div class='add'>+	 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device serial_device = {</div><div class='add'>+	.name = "serial8250",</div><div class='add'>+	.id = PLAT8250_DEV_PLATFORM,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;platform_serial_ports,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] __initdata = {</div><div class='add'>+	&amp;spipnx_1,</div><div class='add'>+	&amp;spipnx_2,</div><div class='add'>+	&amp;serial_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern void pnx4008_uart_init(void);</div><div class='add'>+</div><div class='add'>+static void __init pnx4008_init(void)</div><div class='add'>+{</div><div class='add'>+	/*disable all START interrupt sources,</div><div class='add'>+	   and clear all START interrupt flags */</div><div class='add'>+	__raw_writel(0, START_INT_ER_REG(SE_PIN_BASE_INT));</div><div class='add'>+	__raw_writel(0, START_INT_ER_REG(SE_INT_BASE_INT));</div><div class='add'>+	__raw_writel(0xffffffff, START_INT_RSR_REG(SE_PIN_BASE_INT));</div><div class='add'>+	__raw_writel(0xffffffff, START_INT_RSR_REG(SE_INT_BASE_INT));</div><div class='add'>+</div><div class='add'>+	platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+	spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));</div><div class='add'>+	/* Switch on the UART clocks */</div><div class='add'>+	pnx4008_uart_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct map_desc pnx4008_io_desc[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.virtual 	= IO_ADDRESS(PNX4008_IRAM_BASE),</div><div class='add'>+		.pfn 		= __phys_to_pfn(PNX4008_IRAM_BASE),</div><div class='add'>+		.length		= SZ_64K,</div><div class='add'>+		.type 		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual 	= IO_ADDRESS(PNX4008_NDF_FLASH_BASE),</div><div class='add'>+		.pfn 		= __phys_to_pfn(PNX4008_NDF_FLASH_BASE),</div><div class='add'>+		.length		= SZ_1M - SZ_128K,</div><div class='add'>+		.type 		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual 	= IO_ADDRESS(PNX4008_JPEG_CONFIG_BASE),</div><div class='add'>+		.pfn 		= __phys_to_pfn(PNX4008_JPEG_CONFIG_BASE),</div><div class='add'>+		.length		= SZ_128K * 3,</div><div class='add'>+		.type 		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual 	= IO_ADDRESS(PNX4008_DMA_CONFIG_BASE),</div><div class='add'>+		.pfn 		= __phys_to_pfn(PNX4008_DMA_CONFIG_BASE),</div><div class='add'>+		.length		= SZ_1M,</div><div class='add'>+		.type 		= MT_DEVICE,</div><div class='add'>+	}, {</div><div class='add'>+		.virtual 	= IO_ADDRESS(PNX4008_AHB2FAB_BASE),</div><div class='add'>+		.pfn 		= __phys_to_pfn(PNX4008_AHB2FAB_BASE),</div><div class='add'>+		.length		= SZ_1M,</div><div class='add'>+		.type 		= MT_DEVICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init pnx4008_map_io(void)</div><div class='add'>+{</div><div class='add'>+	iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern struct sys_timer pnx4008_timer;</div><div class='add'>+</div><div class='add'>+MACHINE_START(PNX4008, "Philips PNX4008")</div><div class='add'>+	/* Maintainer: MontaVista Software Inc. */</div><div class='add'>+	.phys_io 		= 0x40090000,</div><div class='add'>+	.io_pg_offst 		= (0xf4090000 &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params		= 0x80000100,</div><div class='add'>+	.map_io 		= pnx4008_map_io,</div><div class='add'>+	.init_irq 		= pnx4008_init_irq,</div><div class='add'>+	.init_machine 		= pnx4008_init,</div><div class='add'>+	.timer 			= &amp;pnx4008_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c<br/>new file mode 100644<br/>index 000000000000..ec01574f88ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/dma.c</a></div><div class='hunk'>@@ -0,0 +1,1108 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mach-pnx4008/dma.c</div><div class='add'>+ *</div><div class='add'>+ *  PNX4008 DMA registration and IRQ dispatching</div><div class='add'>+ *</div><div class='add'>+ *  Author:	Vitaly Wool</div><div class='add'>+ *  Copyright:	MontaVista Software Inc. (c) 2005</div><div class='add'>+ *</div><div class='add'>+ *  Based on the code from Nicolas Pitre</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/dma-mapping.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/mach/dma.h&gt;</div><div class='add'>+#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+</div><div class='add'>+static struct dma_channel {</div><div class='add'>+	char *name;</div><div class='add'>+	void (*irq_handler) (int, int, void *, struct pt_regs *);</div><div class='add'>+	void *data;</div><div class='add'>+	struct pnx4008_dma_ll *ll;</div><div class='add'>+	u32 ll_dma;</div><div class='add'>+	void *target_addr;</div><div class='add'>+	int target_id;</div><div class='add'>+} dma_channels[MAX_DMA_CHANNELS];</div><div class='add'>+</div><div class='add'>+static struct ll_pool {</div><div class='add'>+	void *vaddr;</div><div class='add'>+	void *cur;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	int count;</div><div class='add'>+} ll_pool;</div><div class='add'>+</div><div class='add'>+static spinlock_t ll_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+</div><div class='add'>+struct pnx4008_dma_ll *pnx4008_alloc_ll_entry(dma_addr_t * ll_dma)</div><div class='add'>+{</div><div class='add'>+	struct pnx4008_dma_ll *ll = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ll_lock, flags);</div><div class='add'>+	if (ll_pool.count &gt; 4) { /* can give one more */</div><div class='add'>+		ll = *(struct pnx4008_dma_ll **) ll_pool.cur;</div><div class='add'>+		*ll_dma = ll_pool.dma_addr + ((void *)ll - ll_pool.vaddr);</div><div class='add'>+		*(void **)ll_pool.cur = **(void ***)ll_pool.cur;</div><div class='add'>+		memset(ll, 0, sizeof(*ll));</div><div class='add'>+		ll_pool.count--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ll_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ll;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_alloc_ll_entry);</div><div class='add'>+</div><div class='add'>+void pnx4008_free_ll_entry(struct pnx4008_dma_ll * ll, dma_addr_t ll_dma)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (ll) {</div><div class='add'>+		if ((unsigned long)((long)ll - (long)ll_pool.vaddr) &gt; 0x4000) {</div><div class='add'>+			printk(KERN_ERR "Trying to free entry not allocated by DMA\n");</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ll-&gt;flags &amp; DMA_BUFFER_ALLOCATED)</div><div class='add'>+			ll-&gt;free(ll-&gt;alloc_data);</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;ll_lock, flags);</div><div class='add'>+		*(long *)ll = *(long *)ll_pool.cur;</div><div class='add'>+		*(long *)ll_pool.cur = (long)ll;</div><div class='add'>+		ll_pool.count++;</div><div class='add'>+		spin_unlock_irqrestore(&amp;ll_lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_free_ll_entry);</div><div class='add'>+</div><div class='add'>+void pnx4008_free_ll(u32 ll_dma, struct pnx4008_dma_ll * ll)</div><div class='add'>+{</div><div class='add'>+	struct pnx4008_dma_ll *ptr;</div><div class='add'>+	u32 dma;</div><div class='add'>+</div><div class='add'>+	while (ll) {</div><div class='add'>+		dma = ll-&gt;next_dma;</div><div class='add'>+		ptr = ll-&gt;next;</div><div class='add'>+		pnx4008_free_ll_entry(ll, ll_dma);</div><div class='add'>+</div><div class='add'>+		ll_dma = dma;</div><div class='add'>+		ll = ptr;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_free_ll);</div><div class='add'>+</div><div class='add'>+static int dma_channels_requested = 0;</div><div class='add'>+</div><div class='add'>+static inline void dma_increment_usage(void)</div><div class='add'>+{</div><div class='add'>+	if (!dma_channels_requested++) {</div><div class='add'>+		struct clk *clk = clk_get(0, "dma_ck");</div><div class='add'>+		if (!IS_ERR(clk)) {</div><div class='add'>+			clk_set_rate(clk, 1);</div><div class='add'>+			clk_put(clk);</div><div class='add'>+		}</div><div class='add'>+		pnx4008_config_dma(-1, -1, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static inline void dma_decrement_usage(void)</div><div class='add'>+{</div><div class='add'>+	if (!--dma_channels_requested) {</div><div class='add'>+		struct clk *clk = clk_get(0, "dma_ck");</div><div class='add'>+		if (!IS_ERR(clk)) {</div><div class='add'>+			clk_set_rate(clk, 0);</div><div class='add'>+			clk_put(clk);</div><div class='add'>+		}</div><div class='add'>+		pnx4008_config_dma(-1, -1, 0);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static spinlock_t dma_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+</div><div class='add'>+static inline void pnx4008_dma_lock(void)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irq(&amp;dma_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pnx4008_dma_unlock(void)</div><div class='add'>+{</div><div class='add'>+	spin_unlock_irq(&amp;dma_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define VALID_CHANNEL(c)	(((c) &gt;= 0) &amp;&amp; ((c) &lt; MAX_DMA_CHANNELS))</div><div class='add'>+</div><div class='add'>+int pnx4008_request_channel(char *name, int ch,</div><div class='add'>+			    void (*irq_handler) (int, int, void *,</div><div class='add'>+						 struct pt_regs *), void *data)</div><div class='add'>+{</div><div class='add'>+	int i, found = 0;</div><div class='add'>+</div><div class='add'>+	/* basic sanity checks */</div><div class='add'>+	if (!name || (ch != -1 &amp;&amp; !VALID_CHANNEL(ch)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+</div><div class='add'>+	/* try grabbing a DMA channel with the requested priority */</div><div class='add'>+	for (i = MAX_DMA_CHANNELS - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (!dma_channels[i].name &amp;&amp; (ch == -1 || ch == i)) {</div><div class='add'>+			found = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (found) {</div><div class='add'>+		dma_increment_usage();</div><div class='add'>+		dma_channels[i].name = name;</div><div class='add'>+		dma_channels[i].irq_handler = irq_handler;</div><div class='add'>+		dma_channels[i].data = data;</div><div class='add'>+		dma_channels[i].ll = NULL;</div><div class='add'>+		dma_channels[i].ll_dma = 0;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_WARNING "No more available DMA channels for %s\n",</div><div class='add'>+		       name);</div><div class='add'>+		i = -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_request_channel);</div><div class='add'>+</div><div class='add'>+void pnx4008_free_channel(int ch)</div><div class='add'>+{</div><div class='add'>+	if (!dma_channels[ch].name) {</div><div class='add'>+		printk(KERN_CRIT</div><div class='add'>+		       "%s: trying to free channel %d which is already freed\n",</div><div class='add'>+		       __FUNCTION__, ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	pnx4008_free_ll(dma_channels[ch].ll_dma, dma_channels[ch].ll);</div><div class='add'>+	dma_channels[ch].ll = NULL;</div><div class='add'>+	dma_decrement_usage();</div><div class='add'>+</div><div class='add'>+	dma_channels[ch].name = NULL;</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_free_channel);</div><div class='add'>+</div><div class='add'>+int pnx4008_config_dma(int ahb_m1_be, int ahb_m2_be, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long dma_cfg = __raw_readl(DMAC_CONFIG);</div><div class='add'>+</div><div class='add'>+	switch (ahb_m1_be) {</div><div class='add'>+	case 0:</div><div class='add'>+		dma_cfg &amp;= ~(1 &lt;&lt; 1);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		dma_cfg |= (1 &lt;&lt; 1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ahb_m2_be) {</div><div class='add'>+	case 0:</div><div class='add'>+		dma_cfg &amp;= ~(1 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		dma_cfg |= (1 &lt;&lt; 2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (enable) {</div><div class='add'>+	case 0:</div><div class='add'>+		dma_cfg &amp;= ~(1 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		dma_cfg |= (1 &lt;&lt; 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	__raw_writel(dma_cfg, DMAC_CONFIG);</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_config_dma);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_pack_control(const struct pnx4008_dma_ch_ctrl * ch_ctrl,</div><div class='add'>+			     unsigned long *ctrl)</div><div class='add'>+{</div><div class='add'>+	int i = 0, dbsize, sbsize, err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ctrl || !ch_ctrl) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ctrl = 0;</div><div class='add'>+</div><div class='add'>+	switch (ch_ctrl-&gt;tc_mask) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 31);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ch_ctrl-&gt;cacheable) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 30);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;bufferable) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 29);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;priv_mode) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 28);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;di) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 27);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;si) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 26);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;dest_ahb1) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 25);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;src_ahb1) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 24);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;dwidth) {</div><div class='add'>+	case WIDTH_BYTE:</div><div class='add'>+		*ctrl &amp;= ~(7 &lt;&lt; 21);</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_HWORD:</div><div class='add'>+		*ctrl &amp;= ~(7 &lt;&lt; 21);</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 21);</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_WORD:</div><div class='add'>+		*ctrl &amp;= ~(7 &lt;&lt; 21);</div><div class='add'>+		*ctrl |= (2 &lt;&lt; 21);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_ctrl-&gt;swidth) {</div><div class='add'>+	case WIDTH_BYTE:</div><div class='add'>+		*ctrl &amp;= ~(7 &lt;&lt; 18);</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_HWORD:</div><div class='add'>+		*ctrl &amp;= ~(7 &lt;&lt; 18);</div><div class='add'>+		*ctrl |= (1 &lt;&lt; 18);</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_WORD:</div><div class='add'>+		*ctrl &amp;= ~(7 &lt;&lt; 18);</div><div class='add'>+		*ctrl |= (2 &lt;&lt; 18);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	dbsize = ch_ctrl-&gt;dbsize;</div><div class='add'>+	while (!(dbsize &amp; 1)) {</div><div class='add'>+		i++;</div><div class='add'>+		dbsize &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+	if (ch_ctrl-&gt;dbsize != 1 || i &gt; 8 || i == 1) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (i &gt; 1)</div><div class='add'>+		i--;</div><div class='add'>+	*ctrl &amp;= ~(7 &lt;&lt; 15);</div><div class='add'>+	*ctrl |= (i &lt;&lt; 15);</div><div class='add'>+</div><div class='add'>+	sbsize = ch_ctrl-&gt;sbsize;</div><div class='add'>+	while (!(sbsize &amp; 1)) {</div><div class='add'>+		i++;</div><div class='add'>+		sbsize &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+	if (ch_ctrl-&gt;sbsize != 1 || i &gt; 8 || i == 1) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (i &gt; 1)</div><div class='add'>+		i--;</div><div class='add'>+	*ctrl &amp;= ~(7 &lt;&lt; 12);</div><div class='add'>+	*ctrl |= (i &lt;&lt; 12);</div><div class='add'>+</div><div class='add'>+	if (ch_ctrl-&gt;tr_size &gt; 0x7ff) {</div><div class='add'>+		err = -E2BIG;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*ctrl &amp;= ~0x7ff;</div><div class='add'>+	*ctrl |= ch_ctrl-&gt;tr_size &amp; 0x7ff;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_pack_control);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_parse_control(unsigned long ctrl,</div><div class='add'>+			      struct pnx4008_dma_ch_ctrl * ch_ctrl)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ch_ctrl) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;tr_size = ctrl &amp; 0x7ff;</div><div class='add'>+	ctrl &gt;&gt;= 12;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;sbsize = 1 &lt;&lt; (ctrl &amp; 7);</div><div class='add'>+	if (ch_ctrl-&gt;sbsize &gt; 1)</div><div class='add'>+		ch_ctrl-&gt;sbsize &lt;&lt;= 1;</div><div class='add'>+	ctrl &gt;&gt;= 3;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;dbsize = 1 &lt;&lt; (ctrl &amp; 7);</div><div class='add'>+	if (ch_ctrl-&gt;dbsize &gt; 1)</div><div class='add'>+		ch_ctrl-&gt;dbsize &lt;&lt;= 1;</div><div class='add'>+	ctrl &gt;&gt;= 3;</div><div class='add'>+</div><div class='add'>+	switch (ctrl &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		ch_ctrl-&gt;swidth = WIDTH_BYTE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		ch_ctrl-&gt;swidth = WIDTH_HWORD;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ch_ctrl-&gt;swidth = WIDTH_WORD;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ctrl &gt;&gt;= 3;</div><div class='add'>+</div><div class='add'>+	switch (ctrl &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		ch_ctrl-&gt;dwidth = WIDTH_BYTE;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		ch_ctrl-&gt;dwidth = WIDTH_HWORD;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ch_ctrl-&gt;dwidth = WIDTH_WORD;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	ctrl &gt;&gt;= 3;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;src_ahb1 = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;dest_ahb1 = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;si = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;di = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;priv_mode = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;bufferable = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;cacheable = ctrl &amp; 1;</div><div class='add'>+	ctrl &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_ctrl-&gt;tc_mask = ctrl &amp; 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_parse_control);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_pack_config(const struct pnx4008_dma_ch_config * ch_cfg,</div><div class='add'>+			    unsigned long *cfg)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!cfg || !ch_cfg) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*cfg = 0;</div><div class='add'>+</div><div class='add'>+	switch (ch_cfg-&gt;halt) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*cfg |= (1 &lt;&lt; 18);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_cfg-&gt;active) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*cfg |= (1 &lt;&lt; 17);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_cfg-&gt;lock) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*cfg |= (1 &lt;&lt; 16);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_cfg-&gt;itc) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*cfg |= (1 &lt;&lt; 15);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_cfg-&gt;ie) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*cfg |= (1 &lt;&lt; 14);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	switch (ch_cfg-&gt;flow_cntrl) {</div><div class='add'>+	case FC_MEM2MEM_DMA:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_MEM2PER_DMA:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		*cfg |= (1 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_PER2MEM_DMA:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		*cfg |= (2 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_PER2PER_DMA:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		*cfg |= (3 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_PER2PER_DPER:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		*cfg |= (4 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_MEM2PER_PER:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		*cfg |= (5 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_PER2MEM_PER:</div><div class='add'>+		*cfg &amp;= ~(7 &lt;&lt; 11);</div><div class='add'>+		*cfg |= (6 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+	case FC_PER2PER_SPER:</div><div class='add'>+		*cfg |= (7 &lt;&lt; 11);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	*cfg &amp;= ~(0x1f &lt;&lt; 6);</div><div class='add'>+	*cfg |= ((ch_cfg-&gt;dest_per &amp; 0x1f) &lt;&lt; 6);</div><div class='add'>+</div><div class='add'>+	*cfg &amp;= ~(0x1f &lt;&lt; 1);</div><div class='add'>+	*cfg |= ((ch_cfg-&gt;src_per &amp; 0x1f) &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_pack_config);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_parse_config(unsigned long cfg,</div><div class='add'>+			     struct pnx4008_dma_ch_config * ch_cfg)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!ch_cfg) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;src_per = cfg &amp; 0x1f;</div><div class='add'>+	cfg &gt;&gt;= 5;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;dest_per = cfg &amp; 0x1f;</div><div class='add'>+	cfg &gt;&gt;= 5;</div><div class='add'>+</div><div class='add'>+	switch (cfg &amp; 7) {</div><div class='add'>+	case 0:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_MEM2MEM_DMA;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_MEM2PER_DMA;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_PER2MEM_DMA;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_PER2PER_DMA;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_PER2PER_DPER;</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_MEM2PER_PER;</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_PER2MEM_PER;</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		ch_cfg-&gt;flow_cntrl = FC_PER2PER_SPER;</div><div class='add'>+	}</div><div class='add'>+	cfg &gt;&gt;= 3;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;ie = cfg &amp; 1;</div><div class='add'>+	cfg &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;itc = cfg &amp; 1;</div><div class='add'>+	cfg &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;lock = cfg &amp; 1;</div><div class='add'>+	cfg &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;active = cfg &amp; 1;</div><div class='add'>+	cfg &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ch_cfg-&gt;halt = cfg &amp; 1;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_parse_config);</div><div class='add'>+</div><div class='add'>+void pnx4008_dma_split_head_entry(struct pnx4008_dma_config * config,</div><div class='add'>+				  struct pnx4008_dma_ch_ctrl * ctrl)</div><div class='add'>+{</div><div class='add'>+	int new_len = ctrl-&gt;tr_size, num_entries = 0;</div><div class='add'>+	int old_len = new_len;</div><div class='add'>+	int src_width, dest_width, count = 1;</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;swidth) {</div><div class='add'>+	case WIDTH_BYTE:</div><div class='add'>+		src_width = 1;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_HWORD:</div><div class='add'>+		src_width = 2;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_WORD:</div><div class='add'>+		src_width = 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;dwidth) {</div><div class='add'>+	case WIDTH_BYTE:</div><div class='add'>+		dest_width = 1;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_HWORD:</div><div class='add'>+		dest_width = 2;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_WORD:</div><div class='add'>+		dest_width = 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (new_len &gt; 0x7FF) {</div><div class='add'>+		num_entries++;</div><div class='add'>+		new_len = (ctrl-&gt;tr_size + num_entries) / (num_entries + 1);</div><div class='add'>+	}</div><div class='add'>+	if (num_entries != 0) {</div><div class='add'>+		struct pnx4008_dma_ll *ll = NULL;</div><div class='add'>+		config-&gt;ch_ctrl &amp;= ~0x7ff;</div><div class='add'>+		config-&gt;ch_ctrl |= new_len;</div><div class='add'>+		if (!config-&gt;is_ll) {</div><div class='add'>+			config-&gt;is_ll = 1;</div><div class='add'>+			while (num_entries) {</div><div class='add'>+				if (!ll) {</div><div class='add'>+					config-&gt;ll =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;config-&gt;</div><div class='add'>+								   ll_dma);</div><div class='add'>+					ll = config-&gt;ll;</div><div class='add'>+				} else {</div><div class='add'>+					ll-&gt;next =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;ll-&gt;</div><div class='add'>+								   next_dma);</div><div class='add'>+					ll = ll-&gt;next;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (ctrl-&gt;si)</div><div class='add'>+					ll-&gt;src_addr =</div><div class='add'>+					    config-&gt;src_addr +</div><div class='add'>+					    src_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;src_addr = config-&gt;src_addr;</div><div class='add'>+				if (ctrl-&gt;di)</div><div class='add'>+					ll-&gt;dest_addr =</div><div class='add'>+					    config-&gt;dest_addr +</div><div class='add'>+					    dest_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;dest_addr = config-&gt;dest_addr;</div><div class='add'>+				ll-&gt;ch_ctrl = config-&gt;ch_ctrl &amp; 0x7fffffff;</div><div class='add'>+				ll-&gt;next_dma = 0;</div><div class='add'>+				ll-&gt;next = NULL;</div><div class='add'>+				num_entries--;</div><div class='add'>+				count++;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			struct pnx4008_dma_ll *ll_old = config-&gt;ll;</div><div class='add'>+			unsigned long ll_dma_old = config-&gt;ll_dma;</div><div class='add'>+			while (num_entries) {</div><div class='add'>+				if (!ll) {</div><div class='add'>+					config-&gt;ll =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;config-&gt;</div><div class='add'>+								   ll_dma);</div><div class='add'>+					ll = config-&gt;ll;</div><div class='add'>+				} else {</div><div class='add'>+					ll-&gt;next =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;ll-&gt;</div><div class='add'>+								   next_dma);</div><div class='add'>+					ll = ll-&gt;next;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (ctrl-&gt;si)</div><div class='add'>+					ll-&gt;src_addr =</div><div class='add'>+					    config-&gt;src_addr +</div><div class='add'>+					    src_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;src_addr = config-&gt;src_addr;</div><div class='add'>+				if (ctrl-&gt;di)</div><div class='add'>+					ll-&gt;dest_addr =</div><div class='add'>+					    config-&gt;dest_addr +</div><div class='add'>+					    dest_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;dest_addr = config-&gt;dest_addr;</div><div class='add'>+				ll-&gt;ch_ctrl = config-&gt;ch_ctrl &amp; 0x7fffffff;</div><div class='add'>+				ll-&gt;next_dma = 0;</div><div class='add'>+				ll-&gt;next = NULL;</div><div class='add'>+				num_entries--;</div><div class='add'>+				count++;</div><div class='add'>+			}</div><div class='add'>+			ll-&gt;next_dma = ll_dma_old;</div><div class='add'>+			ll-&gt;next = ll_old;</div><div class='add'>+		}</div><div class='add'>+		/* adjust last length/tc */</div><div class='add'>+		ll-&gt;ch_ctrl = config-&gt;ch_ctrl &amp; (~0x7ff);</div><div class='add'>+		ll-&gt;ch_ctrl |= old_len - new_len * (count - 1);</div><div class='add'>+		config-&gt;ch_ctrl &amp;= 0x7fffffff;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_split_head_entry);</div><div class='add'>+</div><div class='add'>+void pnx4008_dma_split_ll_entry(struct pnx4008_dma_ll * cur_ll,</div><div class='add'>+				struct pnx4008_dma_ch_ctrl * ctrl)</div><div class='add'>+{</div><div class='add'>+	int new_len = ctrl-&gt;tr_size, num_entries = 0;</div><div class='add'>+	int old_len = new_len;</div><div class='add'>+	int src_width, dest_width, count = 1;</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;swidth) {</div><div class='add'>+	case WIDTH_BYTE:</div><div class='add'>+		src_width = 1;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_HWORD:</div><div class='add'>+		src_width = 2;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_WORD:</div><div class='add'>+		src_width = 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ctrl-&gt;dwidth) {</div><div class='add'>+	case WIDTH_BYTE:</div><div class='add'>+		dest_width = 1;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_HWORD:</div><div class='add'>+		dest_width = 2;</div><div class='add'>+		break;</div><div class='add'>+	case WIDTH_WORD:</div><div class='add'>+		dest_width = 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (new_len &gt; 0x7FF) {</div><div class='add'>+		num_entries++;</div><div class='add'>+		new_len = (ctrl-&gt;tr_size + num_entries) / (num_entries + 1);</div><div class='add'>+	}</div><div class='add'>+	if (num_entries != 0) {</div><div class='add'>+		struct pnx4008_dma_ll *ll = NULL;</div><div class='add'>+		cur_ll-&gt;ch_ctrl &amp;= ~0x7ff;</div><div class='add'>+		cur_ll-&gt;ch_ctrl |= new_len;</div><div class='add'>+		if (!cur_ll-&gt;next) {</div><div class='add'>+			while (num_entries) {</div><div class='add'>+				if (!ll) {</div><div class='add'>+					cur_ll-&gt;next =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;cur_ll-&gt;</div><div class='add'>+								   next_dma);</div><div class='add'>+					ll = cur_ll-&gt;next;</div><div class='add'>+				} else {</div><div class='add'>+					ll-&gt;next =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;ll-&gt;</div><div class='add'>+								   next_dma);</div><div class='add'>+					ll = ll-&gt;next;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (ctrl-&gt;si)</div><div class='add'>+					ll-&gt;src_addr =</div><div class='add'>+					    cur_ll-&gt;src_addr +</div><div class='add'>+					    src_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;src_addr = cur_ll-&gt;src_addr;</div><div class='add'>+				if (ctrl-&gt;di)</div><div class='add'>+					ll-&gt;dest_addr =</div><div class='add'>+					    cur_ll-&gt;dest_addr +</div><div class='add'>+					    dest_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;dest_addr = cur_ll-&gt;dest_addr;</div><div class='add'>+				ll-&gt;ch_ctrl = cur_ll-&gt;ch_ctrl &amp; 0x7fffffff;</div><div class='add'>+				ll-&gt;next_dma = 0;</div><div class='add'>+				ll-&gt;next = NULL;</div><div class='add'>+				num_entries--;</div><div class='add'>+				count++;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			struct pnx4008_dma_ll *ll_old = cur_ll-&gt;next;</div><div class='add'>+			unsigned long ll_dma_old = cur_ll-&gt;next_dma;</div><div class='add'>+			while (num_entries) {</div><div class='add'>+				if (!ll) {</div><div class='add'>+					cur_ll-&gt;next =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;cur_ll-&gt;</div><div class='add'>+								   next_dma);</div><div class='add'>+					ll = cur_ll-&gt;next;</div><div class='add'>+				} else {</div><div class='add'>+					ll-&gt;next =</div><div class='add'>+					    pnx4008_alloc_ll_entry(&amp;ll-&gt;</div><div class='add'>+								   next_dma);</div><div class='add'>+					ll = ll-&gt;next;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (ctrl-&gt;si)</div><div class='add'>+					ll-&gt;src_addr =</div><div class='add'>+					    cur_ll-&gt;src_addr +</div><div class='add'>+					    src_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;src_addr = cur_ll-&gt;src_addr;</div><div class='add'>+				if (ctrl-&gt;di)</div><div class='add'>+					ll-&gt;dest_addr =</div><div class='add'>+					    cur_ll-&gt;dest_addr +</div><div class='add'>+					    dest_width * new_len * count;</div><div class='add'>+				else</div><div class='add'>+					ll-&gt;dest_addr = cur_ll-&gt;dest_addr;</div><div class='add'>+				ll-&gt;ch_ctrl = cur_ll-&gt;ch_ctrl &amp; 0x7fffffff;</div><div class='add'>+				ll-&gt;next_dma = 0;</div><div class='add'>+				ll-&gt;next = NULL;</div><div class='add'>+				num_entries--;</div><div class='add'>+				count++;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ll-&gt;next_dma = ll_dma_old;</div><div class='add'>+			ll-&gt;next = ll_old;</div><div class='add'>+		}</div><div class='add'>+		/* adjust last length/tc */</div><div class='add'>+		ll-&gt;ch_ctrl = cur_ll-&gt;ch_ctrl &amp; (~0x7ff);</div><div class='add'>+		ll-&gt;ch_ctrl |= old_len - new_len * (count - 1);</div><div class='add'>+		cur_ll-&gt;ch_ctrl &amp;= 0x7fffffff;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_split_ll_entry);</div><div class='add'>+</div><div class='add'>+int pnx4008_config_channel(int ch, struct pnx4008_dma_config * config)</div><div class='add'>+{</div><div class='add'>+	if (!VALID_CHANNEL(ch) || !dma_channels[ch].name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	__raw_writel(config-&gt;src_addr, DMAC_Cx_SRC_ADDR(ch));</div><div class='add'>+	__raw_writel(config-&gt;dest_addr, DMAC_Cx_DEST_ADDR(ch));</div><div class='add'>+</div><div class='add'>+	if (config-&gt;is_ll)</div><div class='add'>+		__raw_writel(config-&gt;ll_dma, DMAC_Cx_LLI(ch));</div><div class='add'>+	else</div><div class='add'>+		__raw_writel(0, DMAC_Cx_LLI(ch));</div><div class='add'>+</div><div class='add'>+	__raw_writel(config-&gt;ch_ctrl, DMAC_Cx_CONTROL(ch));</div><div class='add'>+	__raw_writel(config-&gt;ch_cfg, DMAC_Cx_CONFIG(ch));</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_config_channel);</div><div class='add'>+</div><div class='add'>+int pnx4008_channel_get_config(int ch, struct pnx4008_dma_config * config)</div><div class='add'>+{</div><div class='add'>+	if (!VALID_CHANNEL(ch) || !dma_channels[ch].name || !config)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	config-&gt;ch_cfg = __raw_readl(DMAC_Cx_CONFIG(ch));</div><div class='add'>+	config-&gt;ch_ctrl = __raw_readl(DMAC_Cx_CONTROL(ch));</div><div class='add'>+</div><div class='add'>+	config-&gt;ll_dma = __raw_readl(DMAC_Cx_LLI(ch));</div><div class='add'>+	config-&gt;is_ll = config-&gt;ll_dma ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	config-&gt;src_addr = __raw_readl(DMAC_Cx_SRC_ADDR(ch));</div><div class='add'>+	config-&gt;dest_addr = __raw_readl(DMAC_Cx_DEST_ADDR(ch));</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_channel_get_config);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_ch_enable(int ch)</div><div class='add'>+{</div><div class='add'>+	unsigned long ch_cfg;</div><div class='add'>+</div><div class='add'>+	if (!VALID_CHANNEL(ch) || !dma_channels[ch].name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	ch_cfg = __raw_readl(DMAC_Cx_CONFIG(ch));</div><div class='add'>+	ch_cfg |= 1;</div><div class='add'>+	__raw_writel(ch_cfg, DMAC_Cx_CONFIG(ch));</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_ch_enable);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_ch_disable(int ch)</div><div class='add'>+{</div><div class='add'>+	unsigned long ch_cfg;</div><div class='add'>+</div><div class='add'>+	if (!VALID_CHANNEL(ch) || !dma_channels[ch].name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	ch_cfg = __raw_readl(DMAC_Cx_CONFIG(ch));</div><div class='add'>+	ch_cfg &amp;= ~1;</div><div class='add'>+	__raw_writel(ch_cfg, DMAC_Cx_CONFIG(ch));</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_ch_disable);</div><div class='add'>+</div><div class='add'>+int pnx4008_dma_ch_enabled(int ch)</div><div class='add'>+{</div><div class='add'>+	unsigned long ch_cfg;</div><div class='add'>+</div><div class='add'>+	if (!VALID_CHANNEL(ch) || !dma_channels[ch].name)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pnx4008_dma_lock();</div><div class='add'>+	ch_cfg = __raw_readl(DMAC_Cx_CONFIG(ch));</div><div class='add'>+	pnx4008_dma_unlock();</div><div class='add'>+</div><div class='add'>+	return ch_cfg &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pnx4008_dma_ch_enabled);</div><div class='add'>+</div><div class='add'>+static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long dint = __raw_readl(DMAC_INT_STAT);</div><div class='add'>+	unsigned long tcint = __raw_readl(DMAC_INT_TC_STAT);</div><div class='add'>+	unsigned long eint = __raw_readl(DMAC_INT_ERR_STAT);</div><div class='add'>+	unsigned long i_bit;</div><div class='add'>+</div><div class='add'>+	for (i = MAX_DMA_CHANNELS - 1; i &gt;= 0; i--) {</div><div class='add'>+		i_bit = 1 &lt;&lt; i;</div><div class='add'>+		if (dint &amp; i_bit) {</div><div class='add'>+			struct dma_channel *channel = &amp;dma_channels[i];</div><div class='add'>+</div><div class='add'>+			if (channel-&gt;name &amp;&amp; channel-&gt;irq_handler) {</div><div class='add'>+				int cause = 0;</div><div class='add'>+</div><div class='add'>+				if (eint &amp; i_bit)</div><div class='add'>+					cause |= DMA_ERR_INT;</div><div class='add'>+				if (tcint &amp; i_bit)</div><div class='add'>+					cause |= DMA_TC_INT;</div><div class='add'>+				channel-&gt;irq_handler(i, cause, channel-&gt;data,</div><div class='add'>+						     regs);</div><div class='add'>+			} else {</div><div class='add'>+				/*</div><div class='add'>+				 * IRQ for an unregistered DMA channel</div><div class='add'>+				 */</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "spurious IRQ for DMA channel %d\n", i);</div><div class='add'>+			}</div><div class='add'>+			if (tcint &amp; i_bit)</div><div class='add'>+				__raw_writel(i_bit, DMAC_INT_TC_CLEAR);</div><div class='add'>+			if (eint &amp; i_bit)</div><div class='add'>+				__raw_writel(i_bit, DMAC_INT_ERR_CLEAR);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init pnx4008_dma_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(DMA_INT, dma_irq_handler, 0, "DMA", NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_CRIT "Wow!  Can't register IRQ for DMA\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ll_pool.count = 0x4000 / sizeof(struct pnx4008_dma_ll);</div><div class='add'>+	ll_pool.cur = ll_pool.vaddr =</div><div class='add'>+	    dma_alloc_coherent(NULL, ll_pool.count * sizeof(struct pnx4008_dma_ll),</div><div class='add'>+			       &amp;ll_pool.dma_addr, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!ll_pool.vaddr) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		free_irq(DMA_INT, NULL);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ll_pool.count - 1; i++) {</div><div class='add'>+		void **addr = ll_pool.vaddr + i * sizeof(struct pnx4008_dma_ll);</div><div class='add'>+		*addr = (void *)addr + sizeof(struct pnx4008_dma_ll);</div><div class='add'>+	}</div><div class='add'>+	*(long *)(ll_pool.vaddr +</div><div class='add'>+		  (ll_pool.count - 1) * sizeof(struct pnx4008_dma_ll)) =</div><div class='add'>+	    (long)ll_pool.vaddr;</div><div class='add'>+</div><div class='add'>+	__raw_writel(1, DMAC_CONFIG);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+arch_initcall(pnx4008_dma_init);</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c<br/>new file mode 100644<br/>index 000000000000..e1ce050d8fe0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/gpio.c</a></div><div class='hunk'>@@ -0,0 +1,330 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/gpio.c</div><div class='add'>+ *</div><div class='add'>+ * PNX4008 GPIO driver</div><div class='add'>+ *</div><div class='add'>+ * Author: Dmitry Chigirev &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on reference code by Iwo Mergler and Z.Tabaaloute from Philips:</div><div class='add'>+ * Copyright (c) 2005 Koninklijke Philips Electronics N.V.</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+/* register definitions */</div><div class='add'>+#define PIO_VA_BASE	IO_ADDRESS(PNX4008_PIO_BASE)</div><div class='add'>+</div><div class='add'>+#define PIO_INP_STATE	(0x00U)</div><div class='add'>+#define PIO_OUTP_SET	(0x04U)</div><div class='add'>+#define PIO_OUTP_CLR	(0x08U)</div><div class='add'>+#define PIO_OUTP_STATE	(0x0CU)</div><div class='add'>+#define PIO_DRV_SET	(0x10U)</div><div class='add'>+#define PIO_DRV_CLR	(0x14U)</div><div class='add'>+#define PIO_DRV_STATE	(0x18U)</div><div class='add'>+#define PIO_SDINP_STATE	(0x1CU)</div><div class='add'>+#define PIO_SDOUTP_SET	(0x20U)</div><div class='add'>+#define PIO_SDOUTP_CLR	(0x24U)</div><div class='add'>+#define PIO_MUX_SET	(0x28U)</div><div class='add'>+#define PIO_MUX_CLR	(0x2CU)</div><div class='add'>+#define PIO_MUX_STATE	(0x30U)</div><div class='add'>+</div><div class='add'>+static inline void gpio_lock(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void gpio_unlock(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Inline functions */</div><div class='add'>+static inline int gpio_read_bit(u32 reg, int gpio)</div><div class='add'>+{</div><div class='add'>+	u32 bit, val;</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (gpio &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bit = GPIO_BIT(gpio);</div><div class='add'>+	if (bit) {</div><div class='add'>+		val = __raw_readl(PIO_VA_BASE + reg);</div><div class='add'>+		ret = (val &amp; bit) ? 1 : 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gpio_set_bit(u32 reg, int gpio)</div><div class='add'>+{</div><div class='add'>+	u32 bit, val;</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (gpio &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bit = GPIO_BIT(gpio);</div><div class='add'>+	if (bit) {</div><div class='add'>+		val = __raw_readl(PIO_VA_BASE + reg);</div><div class='add'>+		val |= bit;</div><div class='add'>+		__raw_writel(val, PIO_VA_BASE + reg);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Very simple access control, bitmap for allocated/free */</div><div class='add'>+static unsigned long access_map[4];</div><div class='add'>+#define INP_INDEX	0</div><div class='add'>+#define OUTP_INDEX	1</div><div class='add'>+#define GPIO_INDEX	2</div><div class='add'>+#define MUX_INDEX	3</div><div class='add'>+</div><div class='add'>+/*GPIO to Input Mapping */</div><div class='add'>+static short gpio_to_inp_map[32] = {</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, 10, 11, 12, 13, 14, 24, -1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*GPIO to Mux Mapping */</div><div class='add'>+static short gpio_to_mux_map[32] = {</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, 0, 1, 4, 5, -1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*Output to Mux Mapping */</div><div class='add'>+static short outp_to_mux_map[32] = {</div><div class='add'>+	-1, -1, -1, 6, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, 2, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int pnx4008_gpio_register_pin(unsigned short pin)</div><div class='add'>+{</div><div class='add'>+	unsigned long bit = GPIO_BIT(pin);</div><div class='add'>+	int ret = -EBUSY;	/* Already in use */</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+</div><div class='add'>+	if (GPIO_ISBID(pin)) {</div><div class='add'>+		if (access_map[GPIO_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[GPIO_INDEX] |= bit;</div><div class='add'>+</div><div class='add'>+	} else if (GPIO_ISRAM(pin)) {</div><div class='add'>+		if (access_map[GPIO_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[GPIO_INDEX] |= bit;</div><div class='add'>+</div><div class='add'>+	} else if (GPIO_ISMUX(pin)) {</div><div class='add'>+		if (access_map[MUX_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[MUX_INDEX] |= bit;</div><div class='add'>+</div><div class='add'>+	} else if (GPIO_ISOUT(pin)) {</div><div class='add'>+		if (access_map[OUTP_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[OUTP_INDEX] |= bit;</div><div class='add'>+</div><div class='add'>+	} else if (GPIO_ISIN(pin)) {</div><div class='add'>+		if (access_map[INP_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[INP_INDEX] |= bit;</div><div class='add'>+	} else</div><div class='add'>+		goto out;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_register_pin);</div><div class='add'>+</div><div class='add'>+int pnx4008_gpio_unregister_pin(unsigned short pin)</div><div class='add'>+{</div><div class='add'>+	unsigned long bit = GPIO_BIT(pin);</div><div class='add'>+	int ret = -EFAULT;	/* Not registered */</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+</div><div class='add'>+	if (GPIO_ISBID(pin)) {</div><div class='add'>+		if (~access_map[GPIO_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[GPIO_INDEX] &amp;= ~bit;</div><div class='add'>+	} else if (GPIO_ISRAM(pin)) {</div><div class='add'>+		if (~access_map[GPIO_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[GPIO_INDEX] &amp;= ~bit;</div><div class='add'>+	} else if (GPIO_ISMUX(pin)) {</div><div class='add'>+		if (~access_map[MUX_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[MUX_INDEX] &amp;= ~bit;</div><div class='add'>+	} else if (GPIO_ISOUT(pin)) {</div><div class='add'>+		if (~access_map[OUTP_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[OUTP_INDEX] &amp;= ~bit;</div><div class='add'>+	} else if (GPIO_ISIN(pin)) {</div><div class='add'>+		if (~access_map[INP_INDEX] &amp; bit)</div><div class='add'>+			goto out;</div><div class='add'>+		access_map[INP_INDEX] &amp;= ~bit;</div><div class='add'>+	} else</div><div class='add'>+		goto out;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_unregister_pin);</div><div class='add'>+</div><div class='add'>+unsigned long pnx4008_gpio_read_pin(unsigned short pin)</div><div class='add'>+{</div><div class='add'>+	unsigned long ret = -EFAULT;</div><div class='add'>+	int gpio = GPIO_BIT_MASK(pin);</div><div class='add'>+	gpio_lock();</div><div class='add'>+	if (GPIO_ISOUT(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_OUTP_STATE, gpio);</div><div class='add'>+	} else if (GPIO_ISRAM(pin)) {</div><div class='add'>+		if (gpio_read_bit(PIO_DRV_STATE, gpio) == 0) {</div><div class='add'>+			ret = gpio_read_bit(PIO_SDINP_STATE, gpio);</div><div class='add'>+		}</div><div class='add'>+	} else if (GPIO_ISBID(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_DRV_STATE, gpio);</div><div class='add'>+		if (ret &gt; 0)</div><div class='add'>+			ret = gpio_read_bit(PIO_OUTP_STATE, gpio);</div><div class='add'>+		else if (ret == 0)</div><div class='add'>+			ret =</div><div class='add'>+			    gpio_read_bit(PIO_INP_STATE, gpio_to_inp_map[gpio]);</div><div class='add'>+	} else if (GPIO_ISIN(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_INP_STATE, gpio);</div><div class='add'>+	}</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_read_pin);</div><div class='add'>+</div><div class='add'>+/* Write Value to output */</div><div class='add'>+int pnx4008_gpio_write_pin(unsigned short pin, int output)</div><div class='add'>+{</div><div class='add'>+	int gpio = GPIO_BIT_MASK(pin);</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+	if (GPIO_ISOUT(pin)) {</div><div class='add'>+		printk( "writing '%x' to '%x'\n",</div><div class='add'>+				gpio, output ? PIO_OUTP_SET : PIO_OUTP_CLR );</div><div class='add'>+		ret = gpio_set_bit(output ? PIO_OUTP_SET : PIO_OUTP_CLR, gpio);</div><div class='add'>+	} else if (GPIO_ISRAM(pin)) {</div><div class='add'>+		if (gpio_read_bit(PIO_DRV_STATE, gpio) &gt; 0)</div><div class='add'>+			ret = gpio_set_bit(output ? PIO_SDOUTP_SET :</div><div class='add'>+					   PIO_SDOUTP_CLR, gpio);</div><div class='add'>+	} else if (GPIO_ISBID(pin)) {</div><div class='add'>+		if (gpio_read_bit(PIO_DRV_STATE, gpio) &gt; 0)</div><div class='add'>+			ret = gpio_set_bit(output ? PIO_OUTP_SET :</div><div class='add'>+					   PIO_OUTP_CLR, gpio);</div><div class='add'>+	}</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_write_pin);</div><div class='add'>+</div><div class='add'>+/* Value = 1 : Set GPIO pin as output */</div><div class='add'>+/* Value = 0 : Set GPIO pin as input */</div><div class='add'>+int pnx4008_gpio_set_pin_direction(unsigned short pin, int output)</div><div class='add'>+{</div><div class='add'>+	int gpio = GPIO_BIT_MASK(pin);</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+	if (GPIO_ISBID(pin) || GPIO_ISRAM(pin)) {</div><div class='add'>+		ret = gpio_set_bit(output ? PIO_DRV_SET : PIO_DRV_CLR, gpio);</div><div class='add'>+	}</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_set_pin_direction);</div><div class='add'>+</div><div class='add'>+/* Read GPIO pin direction: 0= pin used as input, 1= pin used as output*/</div><div class='add'>+int pnx4008_gpio_read_pin_direction(unsigned short pin)</div><div class='add'>+{</div><div class='add'>+	int gpio = GPIO_BIT_MASK(pin);</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+	if (GPIO_ISBID(pin) || GPIO_ISRAM(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_DRV_STATE, gpio);</div><div class='add'>+	}</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_read_pin_direction);</div><div class='add'>+</div><div class='add'>+/* Value = 1 : Set pin to muxed function  */</div><div class='add'>+/* Value = 0 : Set pin as GPIO */</div><div class='add'>+int pnx4008_gpio_set_pin_mux(unsigned short pin, int output)</div><div class='add'>+{</div><div class='add'>+	int gpio = GPIO_BIT_MASK(pin);</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+	if (GPIO_ISBID(pin)) {</div><div class='add'>+		ret =</div><div class='add'>+		    gpio_set_bit(output ? PIO_MUX_SET : PIO_MUX_CLR,</div><div class='add'>+				 gpio_to_mux_map[gpio]);</div><div class='add'>+	} else if (GPIO_ISOUT(pin)) {</div><div class='add'>+		ret =</div><div class='add'>+		    gpio_set_bit(output ? PIO_MUX_SET : PIO_MUX_CLR,</div><div class='add'>+				 outp_to_mux_map[gpio]);</div><div class='add'>+	} else if (GPIO_ISMUX(pin)) {</div><div class='add'>+		ret = gpio_set_bit(output ? PIO_MUX_SET : PIO_MUX_CLR, gpio);</div><div class='add'>+	}</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_set_pin_mux);</div><div class='add'>+</div><div class='add'>+/* Read pin mux function: 0= pin used as GPIO, 1= pin used for muxed function*/</div><div class='add'>+int pnx4008_gpio_read_pin_mux(unsigned short pin)</div><div class='add'>+{</div><div class='add'>+	int gpio = GPIO_BIT_MASK(pin);</div><div class='add'>+	int ret = -EFAULT;</div><div class='add'>+</div><div class='add'>+	gpio_lock();</div><div class='add'>+	if (GPIO_ISBID(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_MUX_STATE, gpio_to_mux_map[gpio]);</div><div class='add'>+	} else if (GPIO_ISOUT(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_MUX_STATE, outp_to_mux_map[gpio]);</div><div class='add'>+	} else if (GPIO_ISMUX(pin)) {</div><div class='add'>+		ret = gpio_read_bit(PIO_MUX_STATE, gpio);</div><div class='add'>+	}</div><div class='add'>+	gpio_unlock();</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_gpio_read_pin_mux);</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c<br/>new file mode 100644<br/>index 000000000000..3a4bcf3d91fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/irq.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/irq.c</div><div class='add'>+ *</div><div class='add'>+ * PNX4008 IRQ controller driver</div><div class='add'>+ *</div><div class='add'>+ * Author: Dmitry Chigirev &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on reference code received from Philips:</div><div class='add'>+ * Copyright (C) 2003 Philips Semiconductors</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/arch/irq.h&gt;</div><div class='add'>+</div><div class='add'>+static u8 pnx4008_irq_type[NR_IRQS] = PNX4008_IRQ_TYPES;</div><div class='add'>+</div><div class='add'>+static void pnx4008_mask_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(__raw_readl(INTC_ER(irq)) &amp; ~INTC_BIT(irq), INTC_ER(irq));	/* mask interrupt */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnx4008_unmask_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(__raw_readl(INTC_ER(irq)) | INTC_BIT(irq), INTC_ER(irq));	/* unmask interrupt */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pnx4008_mask_ack_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(__raw_readl(INTC_ER(irq)) &amp; ~INTC_BIT(irq), INTC_ER(irq));	/* mask interrupt */</div><div class='add'>+	__raw_writel(INTC_BIT(irq), INTC_SR(irq));	/* clear interrupt status */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pnx4008_set_irq_type(unsigned int irq, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case IRQT_RISING:</div><div class='add'>+		__raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq));	/*edge sensitive */</div><div class='add'>+		__raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq));	/*rising edge */</div><div class='add'>+		set_irq_handler(irq, do_edge_IRQ);</div><div class='add'>+		break;</div><div class='add'>+	case IRQT_FALLING:</div><div class='add'>+		__raw_writel(__raw_readl(INTC_ATR(irq)) | INTC_BIT(irq), INTC_ATR(irq));	/*edge sensitive */</div><div class='add'>+		__raw_writel(__raw_readl(INTC_APR(irq)) &amp; ~INTC_BIT(irq), INTC_APR(irq));	/*falling edge */</div><div class='add'>+		set_irq_handler(irq, do_edge_IRQ);</div><div class='add'>+		break;</div><div class='add'>+	case IRQT_LOW:</div><div class='add'>+		__raw_writel(__raw_readl(INTC_ATR(irq)) &amp; ~INTC_BIT(irq), INTC_ATR(irq));	/*level sensitive */</div><div class='add'>+		__raw_writel(__raw_readl(INTC_APR(irq)) &amp; ~INTC_BIT(irq), INTC_APR(irq));	/*low level */</div><div class='add'>+		set_irq_handler(irq, do_level_IRQ);</div><div class='add'>+		break;</div><div class='add'>+	case IRQT_HIGH:</div><div class='add'>+		__raw_writel(__raw_readl(INTC_ATR(irq)) &amp; ~INTC_BIT(irq), INTC_ATR(irq));	/*level sensitive */</div><div class='add'>+		__raw_writel(__raw_readl(INTC_APR(irq)) | INTC_BIT(irq), INTC_APR(irq));	/* high level */</div><div class='add'>+		set_irq_handler(irq, do_level_IRQ);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* IRQT_BOTHEDGE is not supported */</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "PNX4008 IRQ: Unsupported irq type %d\n", type);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqchip pnx4008_irq_chip = {</div><div class='add'>+	.ack = pnx4008_mask_ack_irq,</div><div class='add'>+	.mask = pnx4008_mask_irq,</div><div class='add'>+	.unmask = pnx4008_unmask_irq,</div><div class='add'>+	.set_type = pnx4008_set_irq_type,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init pnx4008_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* configure IRQ's */</div><div class='add'>+	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='add'>+		set_irq_flags(i, IRQF_VALID);</div><div class='add'>+		set_irq_chip(i, &amp;pnx4008_irq_chip);</div><div class='add'>+		pnx4008_set_irq_type(i, pnx4008_irq_type[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* configure and enable IRQ 0,1,30,31 (cascade interrupts) */</div><div class='add'>+	pnx4008_set_irq_type(SUB1_IRQ_N, pnx4008_irq_type[SUB1_IRQ_N]);</div><div class='add'>+	pnx4008_set_irq_type(SUB2_IRQ_N, pnx4008_irq_type[SUB2_IRQ_N]);</div><div class='add'>+	pnx4008_set_irq_type(SUB1_FIQ_N, pnx4008_irq_type[SUB1_FIQ_N]);</div><div class='add'>+	pnx4008_set_irq_type(SUB2_FIQ_N, pnx4008_irq_type[SUB2_FIQ_N]);</div><div class='add'>+</div><div class='add'>+	/* mask all others */</div><div class='add'>+	__raw_writel((1 &lt;&lt; SUB2_FIQ_N) | (1 &lt;&lt; SUB1_FIQ_N) |</div><div class='add'>+			(1 &lt;&lt; SUB2_IRQ_N) | (1 &lt;&lt; SUB1_IRQ_N),</div><div class='add'>+		INTC_ER(MAIN_BASE_INT));</div><div class='add'>+	__raw_writel(0, INTC_ER(SIC1_BASE_INT));</div><div class='add'>+	__raw_writel(0, INTC_ER(SIC2_BASE_INT));</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c<br/>new file mode 100644<br/>index 000000000000..3649cd3dfc9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/pm.c</a></div><div class='hunk'>@@ -0,0 +1,184 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/pm.c</div><div class='add'>+ *</div><div class='add'>+ * Power Management driver for PNX4008</div><div class='add'>+ *</div><div class='add'>+ * Authors: Vitaly Wool, Dmitry Chigirev &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/arch/pm.h&gt;</div><div class='add'>+#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+</div><div class='add'>+#define SRAM_VA IO_ADDRESS(PNX4008_IRAM_BASE)</div><div class='add'>+</div><div class='add'>+static void *saved_sram;</div><div class='add'>+</div><div class='add'>+static struct clk *pll4_clk;</div><div class='add'>+</div><div class='add'>+static inline void pnx4008_standby(void)</div><div class='add'>+{</div><div class='add'>+	void (*pnx4008_cpu_standby_ptr) (void);</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='add'>+	clk_disable(pll4_clk);</div><div class='add'>+</div><div class='add'>+	/*saving portion of SRAM to be used by suspend function. */</div><div class='add'>+	memcpy(saved_sram, (void *)SRAM_VA, pnx4008_cpu_standby_sz);</div><div class='add'>+</div><div class='add'>+	/*make sure SRAM copy gets physically written into SDRAM.</div><div class='add'>+	   SDRAM will be placed into self-refresh during power down */</div><div class='add'>+	flush_cache_all();</div><div class='add'>+</div><div class='add'>+	/*copy suspend function into SRAM */</div><div class='add'>+	memcpy((void *)SRAM_VA, pnx4008_cpu_standby, pnx4008_cpu_standby_sz);</div><div class='add'>+</div><div class='add'>+	/*do suspend */</div><div class='add'>+	pnx4008_cpu_standby_ptr = (void *)SRAM_VA;</div><div class='add'>+	pnx4008_cpu_standby_ptr();</div><div class='add'>+</div><div class='add'>+	/*restoring portion of SRAM that was used by suspend function */</div><div class='add'>+	memcpy((void *)SRAM_VA, saved_sram, pnx4008_cpu_standby_sz);</div><div class='add'>+</div><div class='add'>+	clk_enable(pll4_clk);</div><div class='add'>+</div><div class='add'>+	local_fiq_enable();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void pnx4008_suspend(void)</div><div class='add'>+{</div><div class='add'>+	void (*pnx4008_cpu_suspend_ptr) (void);</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	local_fiq_disable();</div><div class='add'>+</div><div class='add'>+	clk_disable(pll4_clk);</div><div class='add'>+</div><div class='add'>+	__raw_writel(0xffffffff, START_INT_RSR_REG(SE_PIN_BASE_INT));</div><div class='add'>+	__raw_writel(0xffffffff, START_INT_RSR_REG(SE_INT_BASE_INT));</div><div class='add'>+</div><div class='add'>+	/*saving portion of SRAM to be used by suspend function. */</div><div class='add'>+	memcpy(saved_sram, (void *)SRAM_VA, pnx4008_cpu_suspend_sz);</div><div class='add'>+</div><div class='add'>+	/*make sure SRAM copy gets physically written into SDRAM.</div><div class='add'>+	   SDRAM will be placed into self-refresh during power down */</div><div class='add'>+	flush_cache_all();</div><div class='add'>+</div><div class='add'>+	/*copy suspend function into SRAM */</div><div class='add'>+	memcpy((void *)SRAM_VA, pnx4008_cpu_suspend, pnx4008_cpu_suspend_sz);</div><div class='add'>+</div><div class='add'>+	/*do suspend */</div><div class='add'>+	pnx4008_cpu_suspend_ptr = (void *)SRAM_VA;</div><div class='add'>+	pnx4008_cpu_suspend_ptr();</div><div class='add'>+</div><div class='add'>+	/*restoring portion of SRAM that was used by suspend function */</div><div class='add'>+	memcpy((void *)SRAM_VA, saved_sram, pnx4008_cpu_suspend_sz);</div><div class='add'>+</div><div class='add'>+	clk_enable(pll4_clk);</div><div class='add'>+</div><div class='add'>+	local_fiq_enable();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pnx4008_pm_enter(suspend_state_t state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case PM_SUSPEND_STANDBY:</div><div class='add'>+		pnx4008_standby();</div><div class='add'>+		break;</div><div class='add'>+	case PM_SUSPEND_MEM:</div><div class='add'>+		pnx4008_suspend();</div><div class='add'>+		break;</div><div class='add'>+	case PM_SUSPEND_DISK:</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after processes are frozen, but before we shut down devices.</div><div class='add'>+ */</div><div class='add'>+static int pnx4008_pm_prepare(suspend_state_t state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case PM_SUSPEND_STANDBY:</div><div class='add'>+	case PM_SUSPEND_MEM:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PM_SUSPEND_DISK:</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after devices are re-setup, but before processes are thawed.</div><div class='add'>+ */</div><div class='add'>+static int pnx4008_pm_finish(suspend_state_t state)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.</div><div class='add'>+ */</div><div class='add'>+static struct pm_ops pnx4008_pm_ops = {</div><div class='add'>+	.prepare = pnx4008_pm_prepare,</div><div class='add'>+	.enter = pnx4008_pm_enter,</div><div class='add'>+	.finish = pnx4008_pm_finish,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pnx4008_pm_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 sram_size_to_allocate;</div><div class='add'>+</div><div class='add'>+	pll4_clk = clk_get(0, "ck_pll4");</div><div class='add'>+	if (IS_ERR(pll4_clk)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "PM Suspend cannot acquire ARM(PLL4) clock control\n");</div><div class='add'>+		return PTR_ERR(pll4_clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pnx4008_cpu_standby_sz &gt; pnx4008_cpu_suspend_sz)</div><div class='add'>+		sram_size_to_allocate = pnx4008_cpu_standby_sz;</div><div class='add'>+	else</div><div class='add'>+		sram_size_to_allocate = pnx4008_cpu_suspend_sz;</div><div class='add'>+</div><div class='add'>+	saved_sram = kmalloc(sram_size_to_allocate, GFP_ATOMIC);</div><div class='add'>+	if (!saved_sram) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "PM Suspend: cannot allocate memory to save portion of SRAM\n");</div><div class='add'>+		clk_put(pll4_clk);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_set_ops(&amp;pnx4008_pm_ops);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(pnx4008_pm_init);</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c<br/>new file mode 100644<br/>index 000000000000..95a1b3f964a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/serial.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mach-pnx4008/serial.c</div><div class='add'>+ *</div><div class='add'>+ *  PNX4008 UART initialization</div><div class='add'>+ *</div><div class='add'>+ *  Copyright:	MontaVista Software Inc. (c) 2005</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/serial_reg.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/clock.h&gt;</div><div class='add'>+</div><div class='add'>+#define UART_3		0</div><div class='add'>+#define UART_4		1</div><div class='add'>+#define UART_5		2</div><div class='add'>+#define UART_6		3</div><div class='add'>+#define UART_UNKNOWN	(-1)</div><div class='add'>+</div><div class='add'>+#define UART3_BASE_VA	IO_ADDRESS(PNX4008_UART3_BASE)</div><div class='add'>+#define UART4_BASE_VA	IO_ADDRESS(PNX4008_UART4_BASE)</div><div class='add'>+#define UART5_BASE_VA	IO_ADDRESS(PNX4008_UART5_BASE)</div><div class='add'>+#define UART6_BASE_VA	IO_ADDRESS(PNX4008_UART6_BASE)</div><div class='add'>+</div><div class='add'>+#define UART_FCR_OFFSET		8</div><div class='add'>+#define UART_FIFO_SIZE		64</div><div class='add'>+</div><div class='add'>+void pnx4008_uart_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int i = UART_FIFO_SIZE;</div><div class='add'>+</div><div class='add'>+	__raw_writel(0xC1, UART5_BASE_VA + UART_FCR_OFFSET);</div><div class='add'>+	__raw_writel(0xC1, UART3_BASE_VA + UART_FCR_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* Send a NULL to fix the UART HW bug */</div><div class='add'>+	__raw_writel(0x00, UART5_BASE_VA);</div><div class='add'>+	__raw_writel(0x00, UART3_BASE_VA);</div><div class='add'>+</div><div class='add'>+	while (i--) {</div><div class='add'>+		tmp = __raw_readl(UART5_BASE_VA);</div><div class='add'>+		tmp = __raw_readl(UART3_BASE_VA);</div><div class='add'>+	}</div><div class='add'>+	__raw_writel(0, UART5_BASE_VA + UART_FCR_OFFSET);</div><div class='add'>+	__raw_writel(0, UART3_BASE_VA + UART_FCR_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* setup wakeup interrupt */</div><div class='add'>+	start_int_set_rising_edge(SE_U3_RX_INT);</div><div class='add'>+	start_int_ack(SE_U3_RX_INT);</div><div class='add'>+	start_int_umask(SE_U3_RX_INT);</div><div class='add'>+</div><div class='add'>+	start_int_set_rising_edge(SE_U5_RX_INT);</div><div class='add'>+	start_int_ack(SE_U5_RX_INT);</div><div class='add'>+	start_int_umask(SE_U5_RX_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/sleep.S b/arch/arm/mach-pnx4008/sleep.S<br/>new file mode 100644<br/>index 000000000000..93c802bac269<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/sleep.S</a></div><div class='hunk'>@@ -0,0 +1,196 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-pnx4008/sleep.S</div><div class='add'>+ *</div><div class='add'>+ * PNX4008 support for STOP mode and SDRAM self-refresh</div><div class='add'>+ *</div><div class='add'>+ * Authors: Dmitry Chigirev, Vitaly Wool &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/assembler.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+#define PWRMAN_VA_BASE IO_ADDRESS(PNX4008_PWRMAN_BASE)</div><div class='add'>+#define PWR_CTRL_REG_OFFS 0x44</div><div class='add'>+</div><div class='add'>+#define SDRAM_CFG_VA_BASE IO_ADDRESS(PNX4008_SDRAM_CFG_BASE)</div><div class='add'>+#define MPMC_STATUS_REG_OFFS 0x4</div><div class='add'>+</div><div class='add'>+		.text</div><div class='add'>+</div><div class='add'>+ENTRY(pnx4008_cpu_suspend)</div><div class='add'>+	@this function should be entered in Direct run mode.</div><div class='add'>+</div><div class='add'>+	@ save registers on stack</div><div class='add'>+	stmfd	sp!, {r0 - r6, lr}</div><div class='add'>+</div><div class='add'>+	@ setup Power Manager base address in r4</div><div class='add'>+	@ and put it's value in r5</div><div class='add'>+	mov	r4, #(PWRMAN_VA_BASE &amp; 0xff000000)</div><div class='add'>+	orr	r4, r4, #(PWRMAN_VA_BASE &amp; 0x00ff0000)</div><div class='add'>+	orr	r4, r4, #(PWRMAN_VA_BASE &amp; 0x0000ff00)</div><div class='add'>+	orr	r4, r4, #(PWRMAN_VA_BASE &amp; 0x000000ff)</div><div class='add'>+	ldr	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ setup SDRAM controller base address in r2</div><div class='add'>+	@ and put it's value in r3</div><div class='add'>+	mov	r2, #(SDRAM_CFG_VA_BASE &amp; 0xff000000)</div><div class='add'>+	orr	r2, r2, #(SDRAM_CFG_VA_BASE &amp; 0x00ff0000)</div><div class='add'>+	orr	r2, r2, #(SDRAM_CFG_VA_BASE &amp; 0x0000ff00)</div><div class='add'>+	orr	r2, r2, #(SDRAM_CFG_VA_BASE &amp; 0x000000ff)</div><div class='add'>+	ldr	r3, [r2, #MPMC_STATUS_REG_OFFS] @extra read - HW bug workaround</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit latch</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 8))</div><div class='add'>+	@ clear SDRAM self-refresh bit</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 9))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ do save current bit settings in r1</div><div class='add'>+	mov	r1, r5</div><div class='add'>+</div><div class='add'>+	@ set SDRAM self-refresh bit</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 9)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ set SDRAM self-refresh bit latch</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 8)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit latch</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 8))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 9))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ wait for SDRAM to get into self-refresh mode</div><div class='add'>+2:	ldr	r3, [r2, #MPMC_STATUS_REG_OFFS]</div><div class='add'>+	tst	r3, #(1 &lt;&lt; 2)</div><div class='add'>+	beq	2b</div><div class='add'>+</div><div class='add'>+	@ to prepare SDRAM to get out of self-refresh mode after wakeup</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 7)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ do enter stop mode</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 0)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+	nop</div><div class='add'>+</div><div class='add'>+	@ sleeping now...</div><div class='add'>+</div><div class='add'>+	@ coming out of STOP mode into Direct Run mode</div><div class='add'>+	@ clear STOP mode and SDRAM self-refresh bits</div><div class='add'>+	str	r1, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ wait for SDRAM to get out self-refresh mode</div><div class='add'>+3:	ldr	r3, [r2, #MPMC_STATUS_REG_OFFS]</div><div class='add'>+	tst	r3, #5</div><div class='add'>+	bne	3b</div><div class='add'>+</div><div class='add'>+	@ restore regs and return</div><div class='add'>+	ldmfd   sp!, {r0 - r6, pc}</div><div class='add'>+</div><div class='add'>+ENTRY(pnx4008_cpu_suspend_sz)</div><div class='add'>+	.word	. - pnx4008_cpu_suspend</div><div class='add'>+</div><div class='add'>+ENTRY(pnx4008_cpu_standby)</div><div class='add'>+	@ save registers on stack</div><div class='add'>+	stmfd	sp!, {r0 - r6, lr}</div><div class='add'>+</div><div class='add'>+	@ setup Power Manager base address in r4</div><div class='add'>+	@ and put it's value in r5</div><div class='add'>+	mov	r4, #(PWRMAN_VA_BASE &amp; 0xff000000)</div><div class='add'>+	orr	r4, r4, #(PWRMAN_VA_BASE &amp; 0x00ff0000)</div><div class='add'>+	orr	r4, r4, #(PWRMAN_VA_BASE &amp; 0x0000ff00)</div><div class='add'>+	orr	r4, r4, #(PWRMAN_VA_BASE &amp; 0x000000ff)</div><div class='add'>+	ldr	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ setup SDRAM controller base address in r2</div><div class='add'>+	@ and put it's value in r3</div><div class='add'>+	mov	r2, #(SDRAM_CFG_VA_BASE &amp; 0xff000000)</div><div class='add'>+	orr	r2, r2, #(SDRAM_CFG_VA_BASE &amp; 0x00ff0000)</div><div class='add'>+	orr	r2, r2, #(SDRAM_CFG_VA_BASE &amp; 0x0000ff00)</div><div class='add'>+	orr	r2, r2, #(SDRAM_CFG_VA_BASE &amp; 0x000000ff)</div><div class='add'>+	ldr	r3, [r2, #MPMC_STATUS_REG_OFFS] @extra read - HW bug workaround</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit latch</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 8))</div><div class='add'>+	@ clear SDRAM self-refresh bit</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 9))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ do save current bit settings in r1</div><div class='add'>+	mov	r1, r5</div><div class='add'>+</div><div class='add'>+	@ set SDRAM self-refresh bit</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 9)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ set SDRAM self-refresh bit latch</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 8)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit latch</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 8))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 9))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ wait for SDRAM to get into self-refresh mode</div><div class='add'>+2:	ldr	r3, [r2, #MPMC_STATUS_REG_OFFS]</div><div class='add'>+	tst	r3, #(1 &lt;&lt; 2)</div><div class='add'>+	beq	2b</div><div class='add'>+</div><div class='add'>+	@ set 'get out of self-refresh mode after wakeup' bit</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 7)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	mcr     p15, 0, r0, c7, c0, 4	@ kinda sleeping now...</div><div class='add'>+</div><div class='add'>+	@ set SDRAM self-refresh bit latch</div><div class='add'>+	orr	r5, r5, #(1 &lt;&lt; 8)</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ clear SDRAM self-refresh bit latch</div><div class='add'>+	and	r5, r5, #(~(1 &lt;&lt; 8))</div><div class='add'>+	str	r5, [r4, #PWR_CTRL_REG_OFFS]</div><div class='add'>+</div><div class='add'>+	@ wait for SDRAM to get out self-refresh mode</div><div class='add'>+3:	ldr	r3, [r2, #MPMC_STATUS_REG_OFFS]</div><div class='add'>+	tst	r3, #5</div><div class='add'>+	bne	3b</div><div class='add'>+</div><div class='add'>+	@ restore regs and return</div><div class='add'>+	ldmfd   sp!, {r0 - r6, pc}</div><div class='add'>+</div><div class='add'>+ENTRY(pnx4008_cpu_standby_sz)</div><div class='add'>+	.word	. - pnx4008_cpu_standby</div><div class='add'>+</div><div class='add'>+ENTRY(pnx4008_cache_clean_invalidate)</div><div class='add'>+	stmfd	sp!, {r0 - r6, lr}</div><div class='add'>+#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='add'>+	mcr	p15, 0, ip, c7, c6, 0		@ invalidate D cache</div><div class='add'>+#else</div><div class='add'>+1:	mrc	p15, 0, r15, c7, c14, 3		@ test,clean,invalidate</div><div class='add'>+	bne     1b</div><div class='add'>+#endif</div><div class='add'>+	ldmfd   sp!, {r0 - r6, pc}</div><div class='head'>diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c<br/>new file mode 100644<br/>index 000000000000..756228ddd035<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pnx4008/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pnx4008/time.c</a></div><div class='hunk'>@@ -0,0 +1,139 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/arm/mach-pnx4008/time.c</div><div class='add'>+ *</div><div class='add'>+ * PNX4008 Timers</div><div class='add'>+ *</div><div class='add'>+ * Authors: Vitaly Wool, Dmitry Chigirev, Grigory Tolstolytkin &lt;source@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/leds.h&gt;</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+</div><div class='add'>+/*! Note: all timers are UPCOUNTING */</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+ * Returns number of us since last clock interrupt.  Note that interrupts</div><div class='add'>+ * will have been disabled by do_gettimeoffset()</div><div class='add'>+ */</div><div class='add'>+static unsigned long pnx4008_gettimeoffset(void)</div><div class='add'>+{</div><div class='add'>+	u32 ticks_to_match =</div><div class='add'>+	    __raw_readl(HSTIM_MATCH0) - __raw_readl(HSTIM_COUNTER);</div><div class='add'>+	u32 elapsed = LATCH - ticks_to_match;</div><div class='add'>+	return (elapsed * (tick_nsec / 1000)) / LATCH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+ * IRQ handler for the timer</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id,</div><div class='add'>+					   struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (__raw_readl(HSTIM_INT) &amp; MATCH0_INT) {</div><div class='add'>+</div><div class='add'>+		write_seqlock(&amp;xtime_lock);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			timer_tick(regs);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * this algorithm takes care of possible delay</div><div class='add'>+			 * for this interrupt handling longer than a normal</div><div class='add'>+			 * timer period</div><div class='add'>+			 */</div><div class='add'>+			__raw_writel(__raw_readl(HSTIM_MATCH0) + LATCH,</div><div class='add'>+				     HSTIM_MATCH0);</div><div class='add'>+			__raw_writel(MATCH0_INT, HSTIM_INT);	/* clear interrupt */</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * The goal is to keep incrementing HSTIM_MATCH0</div><div class='add'>+			 * register until HSTIM_MATCH0 indicates time after</div><div class='add'>+			 * what HSTIM_COUNTER indicates.</div><div class='add'>+			 */</div><div class='add'>+		} while ((signed)</div><div class='add'>+			 (__raw_readl(HSTIM_MATCH0) -</div><div class='add'>+			  __raw_readl(HSTIM_COUNTER)) &lt; 0);</div><div class='add'>+</div><div class='add'>+		write_sequnlock(&amp;xtime_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqaction pnx4008_timer_irq = {</div><div class='add'>+	.name = "PNX4008 Tick Timer",</div><div class='add'>+	.flags = IRQF_DISABLED | IRQF_TIMER,</div><div class='add'>+	.handler = pnx4008_timer_interrupt</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+ * Set up timer and timer interrupt.</div><div class='add'>+ */</div><div class='add'>+static __init void pnx4008_setup_timer(void)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(RESET_COUNT, MSTIM_CTRL);</div><div class='add'>+	while (__raw_readl(MSTIM_COUNTER)) ;	/* wait for reset to complete. 100% guarantee event */</div><div class='add'>+	__raw_writel(0, MSTIM_CTRL);	/* stop the timer */</div><div class='add'>+	__raw_writel(0, MSTIM_MCTRL);</div><div class='add'>+</div><div class='add'>+	__raw_writel(RESET_COUNT, HSTIM_CTRL);</div><div class='add'>+	while (__raw_readl(HSTIM_COUNTER)) ;	/* wait for reset to complete. 100% guarantee event */</div><div class='add'>+	__raw_writel(0, HSTIM_CTRL);</div><div class='add'>+	__raw_writel(0, HSTIM_MCTRL);</div><div class='add'>+	__raw_writel(0, HSTIM_CCR);</div><div class='add'>+	__raw_writel(12, HSTIM_PMATCH);	/* scale down to 1 MHZ */</div><div class='add'>+	__raw_writel(LATCH, HSTIM_MATCH0);</div><div class='add'>+	__raw_writel(MR0_INT, HSTIM_MCTRL);</div><div class='add'>+</div><div class='add'>+	setup_irq(HSTIMER_INT, &amp;pnx4008_timer_irq);</div><div class='add'>+</div><div class='add'>+	__raw_writel(COUNT_ENAB | DEBUG_EN, HSTIM_CTRL);	/*start timer, stop when JTAG active */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Timer Clock Control in PM register */</div><div class='add'>+#define TIMCLK_CTRL_REG  IO_ADDRESS((PNX4008_PWRMAN_BASE + 0xBC))</div><div class='add'>+#define WATCHDOG_CLK_EN                   1</div><div class='add'>+#define TIMER_CLK_EN                      2	/* HS and MS timers? */</div><div class='add'>+</div><div class='add'>+static u32 timclk_ctrl_reg_save;</div><div class='add'>+</div><div class='add'>+void pnx4008_timer_suspend(void)</div><div class='add'>+{</div><div class='add'>+	timclk_ctrl_reg_save = __raw_readl(TIMCLK_CTRL_REG);</div><div class='add'>+	__raw_writel(0, TIMCLK_CTRL_REG);	/* disable timers */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pnx4008_timer_resume(void)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(timclk_ctrl_reg_save, TIMCLK_CTRL_REG);	/* enable timers */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sys_timer pnx4008_timer = {</div><div class='add'>+	.init = pnx4008_setup_timer,</div><div class='add'>+	.offset = pnx4008_gettimeoffset,</div><div class='add'>+	.suspend = pnx4008_timer_suspend,</div><div class='add'>+	.resume = pnx4008_timer_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig<br/>index 0104fd142e70..03d07cae26c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/Kconfig</a></div><div class='hunk'>@@ -35,6 +35,10 @@ config PXA_SHARPSL</div><div class='ctx'> 	  SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)</div><div class='ctx'> 	  handheld computer.</div><div class='ctx'> </div><div class='add'>+config MACH_TRIZEPS4</div><div class='add'>+	bool "Keith und Koep Trizeps4 DIMM-Module"</div><div class='add'>+	select PXA27x</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> if PXA_SHARPSL</div><div class='hunk'>@@ -55,12 +59,28 @@ endchoice</div><div class='ctx'> </div><div class='ctx'> endif</div><div class='ctx'> </div><div class='add'>+if MACH_TRIZEPS4</div><div class='add'>+</div><div class='add'>+choice</div><div class='add'>+	prompt "Select base board for Trizeps 4 module"</div><div class='add'>+</div><div class='add'>+config MACH_TRIZEPS4_CONXS</div><div class='add'>+	bool "ConXS Eval Board"</div><div class='add'>+</div><div class='add'>+config MACH_TRIZEPS4_ANY</div><div class='add'>+	bool "another Board"</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> config MACH_POODLE</div><div class='ctx'> 	bool "Enable Sharp SL-5600 (Poodle) Support"</div><div class='ctx'> 	depends PXA_SHARPSL_25x</div><div class='ctx'> 	select SHARP_LOCOMO</div><div class='add'>+	select PXA_SSP</div><div class='ctx'> </div><div class='ctx'> config MACH_CORGI</div><div class='ctx'> 	bool "Enable Sharp SL-C700 (Corgi) Support"</div><div class='head'>diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile<br/>index 4e8a983e2b83..9093eb1c94eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/Makefile</a></div><div class='hunk'>@@ -12,10 +12,11 @@ obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o</div><div class='ctx'> obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o</div><div class='ctx'> obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o</div><div class='ctx'> obj-$(CONFIG_ARCH_PXA_IDP) += idp.o</div><div class='add'>+obj-$(CONFIG_MACH_TRIZEPS4)	+= trizeps4.o</div><div class='ctx'> obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o</div><div class='ctx'> obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o</div><div class='ctx'> obj-$(CONFIG_MACH_AKITA)	+= akita-ioexp.o</div><div class='del'>-obj-$(CONFIG_MACH_POODLE)	+= poodle.o</div><div class='add'>+obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o</div><div class='ctx'> obj-$(CONFIG_MACH_TOSA)         += tosa.o</div><div class='ctx'> </div><div class='ctx'> # Support for blinky lights</div><div class='hunk'>@@ -23,6 +24,7 @@ led-y := leds.o</div><div class='ctx'> led-$(CONFIG_ARCH_LUBBOCK) += leds-lubbock.o</div><div class='ctx'> led-$(CONFIG_MACH_MAINSTONE) += leds-mainstone.o</div><div class='ctx'> led-$(CONFIG_ARCH_PXA_IDP) += leds-idp.o</div><div class='add'>+led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LEDS) += $(led-y)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c<br/>index d6d726036361..cce26576999e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/corgi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/corgi.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='hunk'>@@ -26,6 +27,7 @@</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -223,7 +225,7 @@ static int corgi_mci_init(struct device *dev, irqreturn_t (*corgi_detect_int)(in</div><div class='ctx'> 	corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int,</div><div class='del'>-			  SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 			  "MMC card detect", data);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "corgi_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='hunk'>@@ -310,8 +312,31 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;corgiled_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void corgi_poweroff(void)</div><div class='add'>+{</div><div class='add'>+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+</div><div class='add'>+	if (!machine_is_corgi())</div><div class='add'>+		/* Green LED off tells the bootloader to halt */</div><div class='add'>+		reset_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_LED_GREEN);</div><div class='add'>+	arm_machine_restart('h');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void corgi_restart(char mode)</div><div class='add'>+{</div><div class='add'>+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+</div><div class='add'>+	if (!machine_is_corgi())</div><div class='add'>+		/* Green LED on tells the bootloader to reboot */</div><div class='add'>+		set_scoop_gpio(&amp;corgiscoop_device.dev, CORGI_SCP_LED_GREEN);</div><div class='add'>+	arm_machine_restart('h');</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init corgi_init(void)</div><div class='ctx'> {</div><div class='add'>+	pm_power_off = corgi_poweroff;</div><div class='add'>+	arm_pm_restart = corgi_restart;</div><div class='add'>+</div><div class='ctx'> 	/* setup sleep mode values */</div><div class='ctx'> 	PWER  = 0x00000002;</div><div class='ctx'> 	PFER  = 0x00000000;</div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c<br/>index 7a1ab73e9e10..4c3de4008a43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/corgi_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/corgi_pm.c</a></div><div class='hunk'>@@ -27,6 +27,13 @@</div><div class='ctx'> #include &lt;asm/arch/pxa-regs.h&gt;</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='add'>+#define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */</div><div class='add'>+#define SHARPSL_CHARGE_ON_TEMP         0xe0  /* 2.9V */</div><div class='add'>+#define SHARPSL_CHARGE_ON_ACIN_HIGH    0x9b  /* 6V */</div><div class='add'>+#define SHARPSL_CHARGE_ON_ACIN_LOW     0x34  /* 2V */</div><div class='add'>+#define SHARPSL_FATAL_ACIN_VOLT        182   /* 3.45V */</div><div class='add'>+#define SHARPSL_FATAL_NOACIN_VOLT      170   /* 3.40V */</div><div class='add'>+</div><div class='ctx'> static void corgi_charger_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	pxa_gpio_mode(CORGI_GPIO_ADC_TEMP_ON | GPIO_OUT);</div><div class='hunk'>@@ -195,9 +202,16 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {</div><div class='ctx'> 	.read_devdata    = corgipm_read_devdata,</div><div class='ctx'> 	.charger_wakeup  = corgi_charger_wakeup,</div><div class='ctx'> 	.should_wakeup   = corgi_should_wakeup,</div><div class='del'>-	.bat_levels      = 40,</div><div class='del'>-	.bat_levels_noac = spitz_battery_levels_noac,</div><div class='del'>-	.bat_levels_acin = spitz_battery_levels_acin,</div><div class='add'>+	.backlight_limit = corgibl_limit_intensity,</div><div class='add'>+	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,</div><div class='add'>+	.charge_on_temp	  = SHARPSL_CHARGE_ON_TEMP,</div><div class='add'>+	.charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH,</div><div class='add'>+	.charge_acin_low  = SHARPSL_CHARGE_ON_ACIN_LOW,</div><div class='add'>+	.fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,</div><div class='add'>+	.fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,</div><div class='add'>+	.bat_levels       = 40,</div><div class='add'>+	.bat_levels_noac  = spitz_battery_levels_noac,</div><div class='add'>+	.bat_levels_acin  = spitz_battery_levels_acin,</div><div class='ctx'> 	.status_high_acin = 188,</div><div class='ctx'> 	.status_low_acin  = 178,</div><div class='ctx'> 	.status_high_noac = 185,</div><div class='hunk'>@@ -214,6 +228,9 @@ static int __devinit corgipm_init(void)</div><div class='ctx'> 	if (!corgipm_device)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (!machine_is_corgi())</div><div class='add'>+	    corgi_pm_machinfo.batfull_irq = 1;</div><div class='add'>+</div><div class='ctx'> 	corgipm_device-&gt;dev.platform_data = &amp;corgi_pm_machinfo;</div><div class='ctx'> 	ret = platform_device_add(corgipm_device);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c<br/>index 8a25a1c8019f..f9421318cb7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_ssp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/corgi_ssp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/corgi_ssp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/corgi_ssp.c</a></div><div class='hunk'>@@ -50,12 +50,14 @@ unsigned long corgi_ssp_ads7846_putget(ulong data)</div><div class='ctx'> 	unsigned long ret,flag;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;corgi_ssp_lock, flag);</div><div class='del'>-	GPCR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='add'>+		GPCR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='ctx'> </div><div class='ctx'> 	ssp_write_word(&amp;corgi_ssp_dev,data);</div><div class='ctx'> 	ret = ssp_read_word(&amp;corgi_ssp_dev);</div><div class='ctx'> </div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;corgi_ssp_lock, flag);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -68,12 +70,14 @@ unsigned long corgi_ssp_ads7846_putget(ulong data)</div><div class='ctx'> void corgi_ssp_ads7846_lock(void)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;corgi_ssp_lock);</div><div class='del'>-	GPCR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='add'>+		GPCR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void corgi_ssp_ads7846_unlock(void)</div><div class='ctx'> {</div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846);</div><div class='ctx'> 	spin_unlock(&amp;corgi_ssp_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -110,11 +114,13 @@ unsigned long corgi_ssp_dac_put(ulong data)</div><div class='ctx'> 	ssp_config(&amp;corgi_ssp_dev, (SSCR0_Motorola | (SSCR0_DSS &amp; 0x07 )), sscr1, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_lcdcon));</div><div class='ctx'> 	ssp_enable(&amp;corgi_ssp_dev);</div><div class='ctx'> </div><div class='del'>-	GPCR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='add'>+		GPCR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);</div><div class='ctx'> 	ssp_write_word(&amp;corgi_ssp_dev,data);</div><div class='ctx'> 	/* Read null data back from device to prevent SSP overflow */</div><div class='ctx'> 	ssp_read_word(&amp;corgi_ssp_dev);</div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);</div><div class='ctx'> </div><div class='ctx'> 	ssp_disable(&amp;corgi_ssp_dev);</div><div class='ctx'> 	ssp_config(&amp;corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS &amp; 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_ads7846));</div><div class='hunk'>@@ -147,7 +153,8 @@ int corgi_ssp_max1111_get(ulong data)</div><div class='ctx'> 	int voltage,voltage1,voltage2;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;corgi_ssp_lock, flag);</div><div class='del'>-	GPCR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='add'>+		GPCR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111);</div><div class='ctx'> 	ssp_disable(&amp;corgi_ssp_dev);</div><div class='ctx'> 	ssp_config(&amp;corgi_ssp_dev, (SSCR0_Motorola | (SSCR0_DSS &amp; 0x07 )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_max1111));</div><div class='ctx'> 	ssp_enable(&amp;corgi_ssp_dev);</div><div class='hunk'>@@ -169,7 +176,8 @@ int corgi_ssp_max1111_get(ulong data)</div><div class='ctx'> 	ssp_disable(&amp;corgi_ssp_dev);</div><div class='ctx'> 	ssp_config(&amp;corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS &amp; 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo-&gt;clk_ads7846));</div><div class='ctx'> 	ssp_enable(&amp;corgi_ssp_dev);</div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;corgi_ssp_lock, flag);</div><div class='ctx'> </div><div class='ctx'> 	if (voltage1 &amp; 0xc0 || voltage2 &amp; 0x3f)</div><div class='hunk'>@@ -196,9 +204,12 @@ static int __init corgi_ssp_probe(struct platform_device *dev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Chip Select - Disable All */</div><div class='del'>-	pxa_gpio_mode(ssp_machinfo-&gt;cs_lcdcon  | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='del'>-        pxa_gpio_mode(ssp_machinfo-&gt;cs_max1111 | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='del'>-        pxa_gpio_mode(ssp_machinfo-&gt;cs_ads7846 | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='add'>+		pxa_gpio_mode(ssp_machinfo-&gt;cs_lcdcon  | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='add'>+	        pxa_gpio_mode(ssp_machinfo-&gt;cs_max1111 | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='add'>+	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='add'>+        	pxa_gpio_mode(ssp_machinfo-&gt;cs_ads7846 | GPIO_OUT | GPIO_DFLT_HIGH);</div><div class='ctx'> </div><div class='ctx'> 	ret = ssp_init(&amp;corgi_ssp_dev, ssp_machinfo-&gt;port, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -229,9 +240,12 @@ static int corgi_ssp_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> static int corgi_ssp_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);  /* High - Disable LCD Control/Timing Gen */</div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111); /* High - Disable MAX1111*/</div><div class='del'>-	GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846); /* High - Disable ADS7846*/</div><div class='add'>+	if (ssp_machinfo-&gt;cs_lcdcon &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_lcdcon) = GPIO_bit(ssp_machinfo-&gt;cs_lcdcon);  /* High - Disable LCD Control/Timing Gen */</div><div class='add'>+	if (ssp_machinfo-&gt;cs_max1111 &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_max1111) = GPIO_bit(ssp_machinfo-&gt;cs_max1111); /* High - Disable MAX1111*/</div><div class='add'>+	if (ssp_machinfo-&gt;cs_ads7846 &gt;= 0)</div><div class='add'>+		GPSR(ssp_machinfo-&gt;cs_ads7846) = GPIO_bit(ssp_machinfo-&gt;cs_ads7846); /* High - Disable ADS7846*/</div><div class='ctx'> 	ssp_restore_state(&amp;corgi_ssp_dev,&amp;corgi_ssp_state);</div><div class='ctx'> 	ssp_enable(&amp;corgi_ssp_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c<br/>index 347b9dea24c6..6914d22bc20f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/idp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/idp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/idp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/idp.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c<br/>index 539b596005fc..d9635ff4b10c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/irq.c</a></div><div class='hunk'>@@ -88,8 +88,8 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type)</div><div class='ctx'> </div><div class='ctx'> 	if (type == IRQT_PROBE) {</div><div class='ctx'> 	    /* Don't mess with enabled GPIOs using preconfigured edges or</div><div class='del'>-	       GPIOs set to alternate function during probe */</div><div class='del'>-		if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx]) &amp;</div><div class='add'>+	       GPIOs set to alternate function or to output during probe */</div><div class='add'>+		if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx] | GPDR(gpio)) &amp;</div><div class='ctx'> 		    GPIO_bit(gpio))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (GAFR(gpio) &amp; (0x3 &lt;&lt; (((gpio) &amp; 0xf)*2)))</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-idp.c b/arch/arm/mach-pxa/leds-idp.c<br/>index 5eba6ea0b0f7..38aa9270540e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-idp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-idp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-idp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/leds-idp.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-lubbock.c b/arch/arm/mach-pxa/leds-lubbock.c<br/>index 05cf56059a0f..afbc6698e27c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-lubbock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-lubbock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-lubbock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/leds-lubbock.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * namespace collision.  Mostly adapted the Mainstone version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c<br/>index c06d3d7a8dd4..065293eb0d82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-mainstone.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds-mainstone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-mainstone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/leds-mainstone.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds-trizeps4.c b/arch/arm/mach-pxa/leds-trizeps4.c<br/>new file mode 100644<br/>index 000000000000..14cfc85e44b5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds-trizeps4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/leds-trizeps4.c</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/arm/mach-pxa/leds-trizeps4.c</div><div class='add'>+ *</div><div class='add'>+ *  Author:	Jürgen Schindele</div><div class='add'>+ *  Created:	20 02, 2006</div><div class='add'>+ *  Copyright:	Jürgen Schindele</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+#include &lt;asm/leds.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/trizeps4.h&gt;</div><div class='add'>+</div><div class='add'>+#include "leds.h"</div><div class='add'>+</div><div class='add'>+#define LED_STATE_ENABLED	1</div><div class='add'>+#define LED_STATE_CLAIMED	2</div><div class='add'>+</div><div class='add'>+#define SYS_BUSY		0x01</div><div class='add'>+#define HEARTBEAT		0x02</div><div class='add'>+#define BLINK			0x04</div><div class='add'>+</div><div class='add'>+static unsigned int led_state;</div><div class='add'>+static unsigned int hw_led_state;</div><div class='add'>+</div><div class='add'>+void trizeps4_leds_event(led_event_t evt)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	switch (evt) {</div><div class='add'>+	case led_start:</div><div class='add'>+		hw_led_state = 0;</div><div class='add'>+		pxa_gpio_mode( GPIO_SYS_BUSY_LED  | GPIO_OUT);		/* LED1 */</div><div class='add'>+		pxa_gpio_mode( GPIO_HEARTBEAT_LED | GPIO_OUT);		/* LED2 */</div><div class='add'>+		led_state = LED_STATE_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_stop:</div><div class='add'>+		led_state &amp;= ~LED_STATE_ENABLED;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_claim:</div><div class='add'>+		led_state |= LED_STATE_CLAIMED;</div><div class='add'>+		hw_led_state = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_release:</div><div class='add'>+		led_state &amp;= ~LED_STATE_CLAIMED;</div><div class='add'>+		hw_led_state = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LEDS_TIMER</div><div class='add'>+	case led_timer:</div><div class='add'>+		hw_led_state ^= HEARTBEAT;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_LEDS_CPU</div><div class='add'>+	case led_idle_start:</div><div class='add'>+		hw_led_state &amp;= ~SYS_BUSY;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_idle_end:</div><div class='add'>+		hw_led_state |= SYS_BUSY;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	case led_halted:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_green_on:</div><div class='add'>+		hw_led_state |= BLINK;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_green_off:</div><div class='add'>+		hw_led_state &amp;= ~BLINK;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_amber_on:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_amber_off:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_red_on:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case led_red_off:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if  (led_state &amp; LED_STATE_ENABLED) {</div><div class='add'>+		switch (hw_led_state) {</div><div class='add'>+			case 0:</div><div class='add'>+				GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='add'>+				GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='add'>+				break;</div><div class='add'>+			case 1:</div><div class='add'>+				GPCR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='add'>+				GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='add'>+				break;</div><div class='add'>+			case 2:</div><div class='add'>+				GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='add'>+				GPCR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='add'>+				break;</div><div class='add'>+			case 3:</div><div class='add'>+				GPCR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='add'>+				GPCR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		/* turn all off */</div><div class='add'>+		GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);</div><div class='add'>+		GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds.c b/arch/arm/mach-pxa/leds.c<br/>index bbe4d5f6afaa..e13eb841e48d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/leds.c</a></div><div class='hunk'>@@ -24,6 +24,8 @@ pxa_leds_init(void)</div><div class='ctx'> 		leds_event = mainstone_leds_event;</div><div class='ctx'> 	if (machine_is_pxa_idp())</div><div class='ctx'> 		leds_event = idp_leds_event;</div><div class='add'>+	if (machine_is_trizeps4())</div><div class='add'>+		leds_event = trizeps4_leds_event;</div><div class='ctx'> </div><div class='ctx'> 	leds_event(led_start);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/arm/mach-pxa/leds.h b/arch/arm/mach-pxa/leds.h<br/>index d98f6e93c12b..4f829b8c39dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/leds.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/leds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/leds.h</a></div><div class='hunk'>@@ -10,3 +10,4 @@</div><div class='ctx'> extern void idp_leds_event(led_event_t evt);</div><div class='ctx'> extern void lubbock_leds_event(led_event_t evt);</div><div class='ctx'> extern void mainstone_leds_event(led_event_t evt);</div><div class='add'>+extern void trizeps4_leds_event(led_event_t evt);</div><div class='head'>diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c<br/>index ec0f43a102c7..1a5f5c21481e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lpd270.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/lpd270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lpd270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/lpd270.c</a></div><div class='hunk'>@@ -248,58 +248,137 @@ static void lpd270_backlight_power(int on)</div><div class='ctx'> </div><div class='ctx'> /* 5.7" TFT QVGA (LoLo display number 1) */</div><div class='ctx'> static struct pxafb_mach_info sharp_lq057q3dc02 __initdata = {</div><div class='del'>-	.pixclock		= 100000,</div><div class='del'>-	.xres			= 240,</div><div class='del'>-	.yres			= 320,</div><div class='add'>+	.pixclock		= 150000,</div><div class='add'>+	.xres			= 320,</div><div class='add'>+	.yres			= 240,</div><div class='ctx'> 	.bpp			= 16,</div><div class='del'>-	.hsync_len		= 64,</div><div class='del'>-	.left_margin		= 0x27,</div><div class='del'>-	.right_margin		= 0x09,</div><div class='del'>-	.vsync_len		= 0x04,</div><div class='add'>+	.hsync_len		= 0x14,</div><div class='add'>+	.left_margin		= 0x28,</div><div class='add'>+	.right_margin		= 0x0a,</div><div class='add'>+	.vsync_len		= 0x02,</div><div class='ctx'> 	.upper_margin		= 0x08,</div><div class='ctx'> 	.lower_margin		= 0x14,</div><div class='del'>-	.sync			= 0,</div><div class='add'>+	.sync			= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='ctx'> 	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x04400007,</div><div class='add'>+	.lccr3			= 0x00400000,</div><div class='add'>+	.pxafb_backlight_power	= lpd270_backlight_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 12.1" TFT SVGA (LoLo display number 2) */</div><div class='add'>+static struct pxafb_mach_info sharp_lq121s1dg31 __initdata = {</div><div class='add'>+	.pixclock		= 50000,</div><div class='add'>+	.xres			= 800,</div><div class='add'>+	.yres			= 600,</div><div class='add'>+	.bpp			= 16,</div><div class='add'>+	.hsync_len		= 0x05,</div><div class='add'>+	.left_margin		= 0x52,</div><div class='add'>+	.right_margin		= 0x05,</div><div class='add'>+	.vsync_len		= 0x04,</div><div class='add'>+	.upper_margin		= 0x14,</div><div class='add'>+	.lower_margin		= 0x0a,</div><div class='add'>+	.sync			= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+	.lccr0			= 0x07800080,</div><div class='add'>+	.lccr3			= 0x00400000,</div><div class='add'>+	.pxafb_backlight_power	= lpd270_backlight_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 3.6" TFT QVGA (LoLo display number 3) */</div><div class='add'>+static struct pxafb_mach_info sharp_lq036q1da01 __initdata = {</div><div class='add'>+	.pixclock		= 150000,</div><div class='add'>+	.xres			= 320,</div><div class='add'>+	.yres			= 240,</div><div class='add'>+	.bpp			= 16,</div><div class='add'>+	.hsync_len		= 0x0e,</div><div class='add'>+	.left_margin		= 0x04,</div><div class='add'>+	.right_margin		= 0x0a,</div><div class='add'>+	.vsync_len		= 0x03,</div><div class='add'>+	.upper_margin		= 0x03,</div><div class='add'>+	.lower_margin		= 0x03,</div><div class='add'>+	.sync			= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+	.lccr0			= 0x07800080,</div><div class='add'>+	.lccr3			= 0x00400000,</div><div class='ctx'> 	.pxafb_backlight_power	= lpd270_backlight_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 6.4" TFT VGA (LoLo display number 5) */</div><div class='ctx'> static struct pxafb_mach_info sharp_lq64d343 __initdata = {</div><div class='del'>-	.pixclock		= 20000,</div><div class='add'>+	.pixclock		= 25000,</div><div class='ctx'> 	.xres			= 640,</div><div class='ctx'> 	.yres			= 480,</div><div class='ctx'> 	.bpp			= 16,</div><div class='del'>-	.hsync_len		= 49,</div><div class='add'>+	.hsync_len		= 0x31,</div><div class='ctx'> 	.left_margin		= 0x89,</div><div class='ctx'> 	.right_margin		= 0x19,</div><div class='del'>-	.vsync_len		= 18,</div><div class='add'>+	.vsync_len		= 0x12,</div><div class='ctx'> 	.upper_margin		= 0x22,</div><div class='del'>-	.lower_margin		= 0,</div><div class='add'>+	.lower_margin		= 0x00,</div><div class='ctx'> 	.sync			= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='ctx'> 	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x04400001,</div><div class='add'>+	.lccr3			= 0x00400000,</div><div class='add'>+	.pxafb_backlight_power	= lpd270_backlight_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 10.4" TFT VGA (LoLo display number 7) */</div><div class='add'>+static struct pxafb_mach_info sharp_lq10d368 __initdata = {</div><div class='add'>+	.pixclock		= 25000,</div><div class='add'>+	.xres			= 640,</div><div class='add'>+	.yres			= 480,</div><div class='add'>+	.bpp			= 16,</div><div class='add'>+	.hsync_len		= 0x31,</div><div class='add'>+	.left_margin		= 0x89,</div><div class='add'>+	.right_margin		= 0x19,</div><div class='add'>+	.vsync_len		= 0x12,</div><div class='add'>+	.upper_margin		= 0x22,</div><div class='add'>+	.lower_margin		= 0x00,</div><div class='add'>+	.sync			= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+	.lccr0			= 0x07800080,</div><div class='add'>+	.lccr3			= 0x00400000,</div><div class='ctx'> 	.pxafb_backlight_power	= lpd270_backlight_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 3.5" TFT QVGA (LoLo display number 8) */</div><div class='ctx'> static struct pxafb_mach_info sharp_lq035q7db02_20 __initdata = {</div><div class='del'>-	.pixclock		= 100000,</div><div class='add'>+	.pixclock		= 150000,</div><div class='ctx'> 	.xres			= 240,</div><div class='ctx'> 	.yres			= 320,</div><div class='ctx'> 	.bpp			= 16,</div><div class='del'>-	.hsync_len		= 0x34,</div><div class='del'>-	.left_margin		= 0x09,</div><div class='del'>-	.right_margin		= 0x09,</div><div class='del'>-	.vsync_len		= 0x08,</div><div class='add'>+	.hsync_len		= 0x0e,</div><div class='add'>+	.left_margin		= 0x0a,</div><div class='add'>+	.right_margin		= 0x0a,</div><div class='add'>+	.vsync_len		= 0x03,</div><div class='ctx'> 	.upper_margin		= 0x05,</div><div class='ctx'> 	.lower_margin		= 0x14,</div><div class='del'>-	.sync			= 0,</div><div class='add'>+	.sync			= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='ctx'> 	.lccr0			= 0x07800080,</div><div class='del'>-	.lccr3			= 0x04400007,</div><div class='add'>+	.lccr3			= 0x00400000,</div><div class='ctx'> 	.pxafb_backlight_power	= lpd270_backlight_power,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct pxafb_mach_info *lpd270_lcd_to_use;</div><div class='add'>+</div><div class='add'>+static int __init lpd270_set_lcd(char *str)</div><div class='add'>+{</div><div class='add'>+	if (!strnicmp(str, "lq057q3dc02", 11)) {</div><div class='add'>+		lpd270_lcd_to_use = &amp;sharp_lq057q3dc02;</div><div class='add'>+	} else if (!strnicmp(str, "lq121s1dg31", 11)) {</div><div class='add'>+		lpd270_lcd_to_use = &amp;sharp_lq121s1dg31;</div><div class='add'>+	} else if (!strnicmp(str, "lq036q1da01", 11)) {</div><div class='add'>+		lpd270_lcd_to_use = &amp;sharp_lq036q1da01;</div><div class='add'>+	} else if (!strnicmp(str, "lq64d343", 8)) {</div><div class='add'>+		lpd270_lcd_to_use = &amp;sharp_lq64d343;</div><div class='add'>+	} else if (!strnicmp(str, "lq10d368", 8)) {</div><div class='add'>+		lpd270_lcd_to_use = &amp;sharp_lq10d368;</div><div class='add'>+	} else if (!strnicmp(str, "lq035q7db02-20", 14)) {</div><div class='add'>+		lpd270_lcd_to_use = &amp;sharp_lq035q7db02_20;</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "lpd270: unknown lcd panel [%s]\n", str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("lcd=", lpd270_set_lcd);</div><div class='add'>+</div><div class='ctx'> static struct platform_device *platform_devices[] __initdata = {</div><div class='ctx'> 	&amp;smc91x_device,</div><div class='ctx'> 	&amp;lpd270_audio_device,</div><div class='hunk'>@@ -345,9 +424,8 @@ static void __init lpd270_init(void)</div><div class='ctx'> </div><div class='ctx'> 	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));</div><div class='ctx'> </div><div class='del'>-	// set_pxa_fb_info(&amp;sharp_lq057q3dc02);</div><div class='del'>-	set_pxa_fb_info(&amp;sharp_lq64d343);</div><div class='del'>-	// set_pxa_fb_info(&amp;sharp_lq035q7db02_20);</div><div class='add'>+	if (lpd270_lcd_to_use != NULL)</div><div class='add'>+		set_pxa_fb_info(lpd270_lcd_to_use);</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_ohci_info(&amp;lpd270_ohci_platform_data);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c<br/>index 3e26d7ce5bb2..6a9a669d60de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lubbock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/lubbock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/lubbock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/lubbock.c</a></div><div class='hunk'>@@ -22,6 +22,10 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/spi/ads7846.h&gt;</div><div class='add'>+#include &lt;asm/arch/pxa2xx_spi.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='hunk'>@@ -196,6 +200,78 @@ static struct resource smc91x_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* ADS7846 is connected through SSP ... and if your board has J5 populated,</div><div class='add'>+ * you can select it to replace the ucb1400 by switching the touchscreen cable</div><div class='add'>+ * (to J5) and poking board registers (as done below).  Else it's only useful</div><div class='add'>+ * for the temperature sensors.</div><div class='add'>+ */</div><div class='add'>+static struct resource pxa_ssp_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= __PREG(SSCR0_P(1)),</div><div class='add'>+		.end	= __PREG(SSCR0_P(1)) + 0x14,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= IRQ_SSP,</div><div class='add'>+		.end	= IRQ_SSP,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_master pxa_ssp_master_info = {</div><div class='add'>+	.ssp_type	= PXA25x_SSP,</div><div class='add'>+	.clock_enable	= CKEN3_SSP,</div><div class='add'>+	.num_chipselect	= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device pxa_ssp = {</div><div class='add'>+	.name		= "pxa2xx-spi",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.resource	= pxa_ssp_resources,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(pxa_ssp_resources),</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data	= &amp;pxa_ssp_master_info,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lubbock_ads7846_pendown_state(void)</div><div class='add'>+{</div><div class='add'>+	/* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ads7846_platform_data ads_info = {</div><div class='add'>+	.model			= 7846,</div><div class='add'>+	.vref_delay_usecs	= 100,		/* internal, no cap */</div><div class='add'>+	.get_pendown_state	= lubbock_ads7846_pendown_state,</div><div class='add'>+	// .x_plate_ohms		= 500,	/* GUESS! */</div><div class='add'>+	// .y_plate_ohms		= 500,	/* GUESS! */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ads7846_cs(u32 command)</div><div class='add'>+{</div><div class='add'>+	static const unsigned	TS_nCS = 1 &lt;&lt; 11;</div><div class='add'>+	lubbock_set_misc_wr(TS_nCS, (command == PXA2XX_CS_ASSERT) ? 0 : TS_nCS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxa2xx_spi_chip ads_hw = {</div><div class='add'>+	.tx_threshold		= 1,</div><div class='add'>+	.rx_threshold		= 2,</div><div class='add'>+	.cs_control		= ads7846_cs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_board_info spi_board_info[] __initdata = { {</div><div class='add'>+	.modalias	= "ads7846",</div><div class='add'>+	.platform_data	= &amp;ads_info,</div><div class='add'>+	.controller_data = &amp;ads_hw,</div><div class='add'>+	.irq		= LUBBOCK_BB_IRQ,</div><div class='add'>+	.max_speed_hz	= 120000 /* max sample rate at 3V */</div><div class='add'>+				* 26 /* command + data + overhead */,</div><div class='add'>+	.bus_num	= 1,</div><div class='add'>+	.chip_select	= 0,</div><div class='add'>+},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct platform_device smc91x_device = {</div><div class='ctx'> 	.name		= "smc91x",</div><div class='ctx'> 	.id		= -1,</div><div class='hunk'>@@ -272,6 +348,7 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;smc91x_device,</div><div class='ctx'> 	&amp;lubbock_flash_device[0],</div><div class='ctx'> 	&amp;lubbock_flash_device[1],</div><div class='add'>+	&amp;pxa_ssp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pxafb_mach_info sharp_lm8v31 __initdata = {</div><div class='hunk'>@@ -342,7 +419,7 @@ static int lubbock_mci_init(struct device *dev,</div><div class='ctx'> 	init_timer(&amp;mmc_timer);</div><div class='ctx'> 	mmc_timer.data = (unsigned long) data;</div><div class='ctx'> 	return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,</div><div class='del'>-			SA_SAMPLE_RANDOM, "lubbock-sd-detect", data);</div><div class='add'>+			IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lubbock_mci_get_ro(struct device *dev)</div><div class='hunk'>@@ -400,6 +477,8 @@ static void __init lubbock_init(void)</div><div class='ctx'> 	lubbock_flash_data[flashboot^1].name = "application-flash";</div><div class='ctx'> 	lubbock_flash_data[flashboot].name = "boot-rom";</div><div class='ctx'> 	(void) platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+</div><div class='add'>+	spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct map_desc lubbock_io_desc[] __initdata = {</div><div class='hunk'>@@ -416,6 +495,11 @@ static void __init lubbock_map_io(void)</div><div class='ctx'> 	pxa_map_io();</div><div class='ctx'> 	iotable_init(lubbock_io_desc, ARRAY_SIZE(lubbock_io_desc));</div><div class='ctx'> </div><div class='add'>+	/* SSP data pins */</div><div class='add'>+	pxa_gpio_mode(GPIO23_SCLK_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO25_STXD_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO26_SRXD_MD);</div><div class='add'>+</div><div class='ctx'> 	/* This enables the BTUART */</div><div class='ctx'> 	pxa_gpio_mode(GPIO42_BTRXD_MD);</div><div class='ctx'> 	pxa_gpio_mode(GPIO43_BTTXD_MD);</div><div class='head'>diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c<br/>index 02e188d98e7d..21ddf3de2f6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mainstone.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/mainstone.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/mainstone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/mainstone.c</a></div><div class='hunk'>@@ -331,7 +331,7 @@ static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_in</div><div class='ctx'> 	 */</div><div class='ctx'> 	MST_MSCWR1 &amp;= ~MST_MSCWR1_MS_SEL;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, SA_INTERRUPT,</div><div class='add'>+	err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int, IRQF_DISABLED,</div><div class='ctx'> 			     "MMC card detect", data);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='hunk'>@@ -493,6 +493,7 @@ static void __init mainstone_map_io(void)</div><div class='ctx'> MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")</div><div class='ctx'> 	/* Maintainer: MontaVista Software Inc. */</div><div class='ctx'> 	.phys_io	= 0x40000000,</div><div class='add'>+	.boot_params	= 0xa0000100,	/* BLOB boot parameter setting */</div><div class='ctx'> 	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='ctx'> 	.map_io		= mainstone_map_io,</div><div class='ctx'> 	.init_irq	= mainstone_init_irq,</div><div class='head'>diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c<br/>index 852ea72d8c80..2112c414f0e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/pm.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c<br/>index a042473deedd..6dbff6d94801 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/poodle.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/poodle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/poodle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/poodle.c</a></div><div class='hunk'>@@ -18,11 +18,14 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -34,12 +37,15 @@</div><div class='ctx'> #include &lt;asm/arch/irda.h&gt;</div><div class='ctx'> #include &lt;asm/arch/poodle.h&gt;</div><div class='ctx'> #include &lt;asm/arch/pxafb.h&gt;</div><div class='add'>+#include &lt;asm/arch/sharpsl.h&gt;</div><div class='add'>+#include &lt;asm/arch/ssp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/scoop.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/locomo.h&gt;</div><div class='ctx'> #include &lt;asm/mach/sharpsl_param.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='add'>+#include "sharpsl.h"</div><div class='ctx'> </div><div class='ctx'> static struct resource poodle_scoop_resources[] = {</div><div class='ctx'> 	[0] = {</div><div class='hunk'>@@ -117,13 +123,71 @@ static struct resource locomo_resources[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device locomo_device = {</div><div class='add'>+struct platform_device poodle_locomo_device = {</div><div class='ctx'> 	.name		= "locomo",</div><div class='ctx'> 	.id		= 0,</div><div class='ctx'> 	.num_resources	= ARRAY_SIZE(locomo_resources),</div><div class='ctx'> 	.resource	= locomo_resources,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+EXPORT_SYMBOL(poodle_locomo_device);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Poodle SSP Device</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct platform_device poodle_ssp_device = {</div><div class='add'>+	.name		= "corgi-ssp",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct corgissp_machinfo poodle_ssp_machinfo = {</div><div class='add'>+	.port		= 1,</div><div class='add'>+	.cs_lcdcon	= -1,</div><div class='add'>+	.cs_ads7846	= -1,</div><div class='add'>+	.cs_max1111	= -1,</div><div class='add'>+	.clk_lcdcon	= 2,</div><div class='add'>+	.clk_ads7846	= 36,</div><div class='add'>+	.clk_max1111	= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Poodle Touch Screen Device</div><div class='add'>+ */</div><div class='add'>+static struct resource poodlets_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start		= POODLE_IRQ_GPIO_TP_INT,</div><div class='add'>+		.end		= POODLE_IRQ_GPIO_TP_INT,</div><div class='add'>+		.flags		= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long poodle_get_hsync_len(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void poodle_null_hsync(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct corgits_machinfo  poodle_ts_machinfo = {</div><div class='add'>+	.get_hsync_len   = poodle_get_hsync_len,</div><div class='add'>+	.put_hsync       = poodle_null_hsync,</div><div class='add'>+	.wait_hsync      = poodle_null_hsync,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device poodle_ts_device = {</div><div class='add'>+	.name		= "corgi-ts",</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;poodle_ts_machinfo,</div><div class='add'>+	},</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(poodlets_resources),</div><div class='add'>+	.resource	= poodlets_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MMC/SD Device</div><div class='hunk'>@@ -141,12 +205,14 @@ static int poodle_mci_init(struct device *dev, irqreturn_t (*poodle_detect_int)(</div><div class='ctx'> 	pxa_gpio_mode(GPIO6_MMCCLK_MD);</div><div class='ctx'> 	pxa_gpio_mode(GPIO8_MMCCS0_MD);</div><div class='ctx'> 	pxa_gpio_mode(POODLE_GPIO_nSD_DETECT | GPIO_IN);</div><div class='add'>+	pxa_gpio_mode(POODLE_GPIO_nSD_WP | GPIO_IN);</div><div class='ctx'> 	pxa_gpio_mode(POODLE_GPIO_SD_PWR | GPIO_OUT);</div><div class='add'>+	pxa_gpio_mode(POODLE_GPIO_SD_PWR1 | GPIO_OUT);</div><div class='ctx'> </div><div class='ctx'> 	poodle_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(POODLE_IRQ_GPIO_nSD_DETECT, poodle_detect_int,</div><div class='del'>-			  SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 			  "MMC card detect", data);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "poodle_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='hunk'>@@ -160,12 +226,22 @@ static void poodle_mci_setpower(struct device *dev, unsigned int vdd)</div><div class='ctx'> {</div><div class='ctx'> 	struct pxamci_platform_data* p_d = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='del'>-	if (( 1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask)</div><div class='del'>-		GPSR1 = GPIO_bit(POODLE_GPIO_SD_PWR);</div><div class='del'>-	else</div><div class='del'>-		GPCR1 = GPIO_bit(POODLE_GPIO_SD_PWR);</div><div class='add'>+	if (( 1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask) {</div><div class='add'>+		GPSR(POODLE_GPIO_SD_PWR) = GPIO_bit(POODLE_GPIO_SD_PWR);</div><div class='add'>+		mdelay(2);</div><div class='add'>+		GPSR(POODLE_GPIO_SD_PWR1) = GPIO_bit(POODLE_GPIO_SD_PWR1);</div><div class='add'>+	} else {</div><div class='add'>+		GPCR(POODLE_GPIO_SD_PWR1) = GPIO_bit(POODLE_GPIO_SD_PWR1);</div><div class='add'>+		GPCR(POODLE_GPIO_SD_PWR) = GPIO_bit(POODLE_GPIO_SD_PWR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int poodle_mci_get_ro(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return GPLR(POODLE_GPIO_nSD_WP) &amp; GPIO_bit(POODLE_GPIO_nSD_WP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static void poodle_mci_exit(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	free_irq(POODLE_IRQ_GPIO_nSD_DETECT, data);</div><div class='hunk'>@@ -174,6 +250,7 @@ static void poodle_mci_exit(struct device *dev, void *data)</div><div class='ctx'> static struct pxamci_platform_data poodle_mci_platform_data = {</div><div class='ctx'> 	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='ctx'> 	.init 		= poodle_mci_init,</div><div class='add'>+	.get_ro		= poodle_mci_get_ro,</div><div class='ctx'> 	.setpower 	= poodle_mci_setpower,</div><div class='ctx'> 	.exit		= poodle_mci_exit,</div><div class='ctx'> };</div><div class='hunk'>@@ -243,14 +320,31 @@ static struct pxafb_mach_info poodle_fb_info __initdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[] __initdata = {</div><div class='del'>-	&amp;locomo_device,</div><div class='add'>+	&amp;poodle_locomo_device,</div><div class='ctx'> 	&amp;poodle_scoop_device,</div><div class='add'>+	&amp;poodle_ssp_device,</div><div class='add'>+	&amp;poodle_ts_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void poodle_poweroff(void)</div><div class='add'>+{</div><div class='add'>+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+	arm_machine_restart('h');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void poodle_restart(char mode)</div><div class='add'>+{</div><div class='add'>+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+	arm_machine_restart('h');</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init poodle_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	pm_power_off = poodle_poweroff;</div><div class='add'>+	arm_pm_restart = poodle_restart;</div><div class='add'>+</div><div class='ctx'> 	/* setup sleep mode values */</div><div class='ctx'> 	PWER  = 0x00000002;</div><div class='ctx'> 	PFER  = 0x00000000;</div><div class='hunk'>@@ -288,6 +382,7 @@ static void __init poodle_init(void)</div><div class='ctx'>   	GPSR1 = 0x00000000;</div><div class='ctx'>         GPSR2 = 0x00000000;</div><div class='ctx'> </div><div class='add'>+	set_pxa_fb_parent(&amp;poodle_locomo_device.dev);</div><div class='ctx'> 	set_pxa_fb_info(&amp;poodle_fb_info);</div><div class='ctx'> 	pxa_gpio_mode(POODLE_GPIO_USB_PULLUP | GPIO_OUT);</div><div class='ctx'> 	pxa_gpio_mode(POODLE_GPIO_IR_ON | GPIO_OUT);</div><div class='hunk'>@@ -301,6 +396,7 @@ static void __init poodle_init(void)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "poodle: Unable to register LoCoMo device\n");</div><div class='ctx'> 	}</div><div class='add'>+	corgi_ssp_set_machinfo(&amp;poodle_ssp_machinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init fixup_poodle(struct machine_desc *desc,</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c<br/>index 573a5758e781..c1f21739bf71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/pxa25x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa25x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/pxa25x.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * initialization stuff for PXA machines which can be overridden later if</div><div class='ctx'>  * need be.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c<br/>index 3baa70819f24..74eeada1e2fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/pxa27x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/pxa27x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/pxa27x.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c<br/>index 6d402b262d8a..db6e8f56a75f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/sharpsl_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sharpsl_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/sharpsl_pm.c</a></div><div class='hunk'>@@ -18,11 +18,11 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/apm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/pm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/pxa-regs.h&gt;</div><div class='hunk'>@@ -128,6 +128,9 @@ struct battery_thresh  spitz_battery_levels_noac[] = {</div><div class='ctx'>  */</div><div class='ctx'> int sharpsl_pm_pxa_read_max1111(int channel)</div><div class='ctx'> {</div><div class='add'>+	if (machine_is_tosa()) // Ugly, better move this function into another module</div><div class='add'>+	    return 0;</div><div class='add'>+</div><div class='ctx'> 	return corgi_ssp_max1111_get((channel &lt;&lt; MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1</div><div class='ctx'> 			| MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);</div><div class='ctx'> }</div><div class='hunk'>@@ -139,27 +142,27 @@ void sharpsl_pm_pxa_init(void)</div><div class='ctx'> 	pxa_gpio_mode(sharpsl_pm.machinfo-&gt;gpio_batlock | GPIO_IN);</div><div class='ctx'> </div><div class='ctx'> 	/* Register interrupt handlers */</div><div class='del'>-	if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin), sharpsl_ac_isr, SA_INTERRUPT, "AC Input Detect", sharpsl_ac_isr)) {</div><div class='add'>+	if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin), sharpsl_ac_isr, IRQF_DISABLED, "AC Input Detect", sharpsl_ac_isr)) {</div><div class='ctx'> 		dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin));</div><div class='ctx'> 	}</div><div class='ctx'> 	else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_acin),IRQT_BOTHEDGE);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock), sharpsl_fatal_isr, SA_INTERRUPT, "Battery Cover", sharpsl_fatal_isr)) {</div><div class='add'>+	if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED, "Battery Cover", sharpsl_fatal_isr)) {</div><div class='ctx'> 		dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock));</div><div class='ctx'> 	}</div><div class='ctx'> 	else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batlock),IRQT_FALLING);</div><div class='ctx'> </div><div class='ctx'> 	if (sharpsl_pm.machinfo-&gt;gpio_fatal) {</div><div class='del'>-		if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr, SA_INTERRUPT, "Fatal Battery", sharpsl_fatal_isr)) {</div><div class='add'>+		if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED, "Fatal Battery", sharpsl_fatal_isr)) {</div><div class='ctx'> 			dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal));</div><div class='ctx'> 		}</div><div class='ctx'> 		else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal),IRQT_FALLING);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!machine_is_corgi())</div><div class='add'>+	if (sharpsl_pm.machinfo-&gt;batfull_irq)</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Register interrupt handler. */</div><div class='del'>-		if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr, SA_INTERRUPT, "CO", sharpsl_chrg_full_isr)) {</div><div class='add'>+		if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED, "CO", sharpsl_chrg_full_isr)) {</div><div class='ctx'> 			dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull));</div><div class='ctx'> 		}</div><div class='ctx'> 		else set_irq_type(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull),IRQT_RISING);</div><div class='hunk'>@@ -174,6 +177,6 @@ void sharpsl_pm_pxa_remove(void)</div><div class='ctx'> 	if (sharpsl_pm.machinfo-&gt;gpio_fatal)</div><div class='ctx'> 		free_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_fatal), sharpsl_fatal_isr);</div><div class='ctx'> </div><div class='del'>-	if (!machine_is_corgi())</div><div class='add'>+	if (sharpsl_pm.machinfo-&gt;batfull_irq)</div><div class='ctx'> 		free_irq(IRQ_GPIO(sharpsl_pm.machinfo-&gt;gpio_batfull), sharpsl_chrg_full_isr);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S<br/>index c9862688ff3d..15874b360e51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/sleep.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * modify it under the terms of the GNU General Public License.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='hunk'>@@ -189,7 +188,7 @@ ENTRY(pxa_cpu_suspend)</div><div class='ctx'> 	.data</div><div class='ctx'> 	.align 5</div><div class='ctx'> ENTRY(pxa_cpu_resume)</div><div class='del'>-	mov	r0, #PSR_I_BIT | PSR_F_BIT | MODE_SVC	@ set SVC, irqs off</div><div class='add'>+	mov	r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE	@ set SVC, irqs off</div><div class='ctx'> 	msr	cpsr_c, r0</div><div class='ctx'> </div><div class='ctx'> 	ldr	r0, sleep_save_sp		@ stack phys addr</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c<br/>index 19b372df544a..1c32a9310dc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/spitz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/spitz.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='hunk'>@@ -27,6 +28,7 @@</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='hunk'>@@ -306,7 +308,7 @@ static int spitz_mci_init(struct device *dev, irqreturn_t (*spitz_detect_int)(in</div><div class='ctx'> 	spitz_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(SPITZ_IRQ_GPIO_nSD_DETECT, spitz_detect_int,</div><div class='del'>-			  SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+			  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 			  "MMC card detect", data);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "spitz_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='hunk'>@@ -371,6 +373,7 @@ static int spitz_ohci_init(struct device *dev)</div><div class='ctx'> static struct pxaohci_platform_data spitz_ohci_platform_data = {</div><div class='ctx'> 	.port_mode	= PMM_NPS_MODE,</div><div class='ctx'> 	.init		= spitz_ohci_init,</div><div class='add'>+	.power_budget	= 150,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -431,8 +434,31 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;spitzled_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void spitz_poweroff(void)</div><div class='add'>+{</div><div class='add'>+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+</div><div class='add'>+	pxa_gpio_mode(SPITZ_GPIO_ON_RESET | GPIO_OUT);</div><div class='add'>+	GPSR(SPITZ_GPIO_ON_RESET) = GPIO_bit(SPITZ_GPIO_ON_RESET);</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+	arm_machine_restart('h');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spitz_restart(char mode)</div><div class='add'>+{</div><div class='add'>+	/* Bootloader magic for a reboot */</div><div class='add'>+	if((MSC0 &amp; 0xffff0000) == 0x7ff00000)</div><div class='add'>+		MSC0 = (MSC0 &amp; 0xffff) | 0x7ee00000;</div><div class='add'>+</div><div class='add'>+	spitz_poweroff();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init common_init(void)</div><div class='ctx'> {</div><div class='add'>+	pm_power_off = spitz_poweroff;</div><div class='add'>+	arm_pm_restart = spitz_restart;</div><div class='add'>+</div><div class='ctx'> 	PMCR = 0x00;</div><div class='ctx'> </div><div class='ctx'> 	/* setup sleep mode values */</div><div class='head'>diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c<br/>index 5e5bdc898482..40be833079c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/spitz_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/spitz_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/spitz_pm.c</a></div><div class='hunk'>@@ -27,6 +27,13 @@</div><div class='ctx'> #include &lt;asm/arch/pxa-regs.h&gt;</div><div class='ctx'> #include "sharpsl.h"</div><div class='ctx'> </div><div class='add'>+#define SHARPSL_CHARGE_ON_VOLT         0x99  /* 2.9V */</div><div class='add'>+#define SHARPSL_CHARGE_ON_TEMP         0xe0  /* 2.9V */</div><div class='add'>+#define SHARPSL_CHARGE_ON_ACIN_HIGH    0x9b  /* 6V */</div><div class='add'>+#define SHARPSL_CHARGE_ON_ACIN_LOW     0x34  /* 2V */</div><div class='add'>+#define SHARPSL_FATAL_ACIN_VOLT        182   /* 3.45V */</div><div class='add'>+#define SHARPSL_FATAL_NOACIN_VOLT      170   /* 3.40V */</div><div class='add'>+</div><div class='ctx'> static int spitz_last_ac_status;</div><div class='ctx'> </div><div class='ctx'> static void spitz_charger_init(void)</div><div class='hunk'>@@ -190,6 +197,7 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {</div><div class='ctx'> 	.gpio_batlock     = SPITZ_GPIO_BAT_COVER,</div><div class='ctx'> 	.gpio_acin        = SPITZ_GPIO_AC_IN,</div><div class='ctx'> 	.gpio_batfull     = SPITZ_GPIO_CHRG_FULL,</div><div class='add'>+	.batfull_irq	  = 1,</div><div class='ctx'> 	.gpio_fatal       = SPITZ_GPIO_FATAL_BAT,</div><div class='ctx'> 	.discharge        = spitz_discharge,</div><div class='ctx'> 	.discharge1       = spitz_discharge1,</div><div class='hunk'>@@ -200,6 +208,13 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {</div><div class='ctx'> 	.read_devdata     = spitzpm_read_devdata,</div><div class='ctx'> 	.charger_wakeup   = spitz_charger_wakeup,</div><div class='ctx'> 	.should_wakeup    = spitz_should_wakeup,</div><div class='add'>+        .backlight_limit  = corgibl_limit_intensity,</div><div class='add'>+	.charge_on_volt	  = SHARPSL_CHARGE_ON_VOLT,</div><div class='add'>+	.charge_on_temp	  = SHARPSL_CHARGE_ON_TEMP,</div><div class='add'>+	.charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH,</div><div class='add'>+	.charge_acin_low  = SHARPSL_CHARGE_ON_ACIN_LOW,</div><div class='add'>+	.fatal_acin_volt  = SHARPSL_FATAL_ACIN_VOLT,</div><div class='add'>+	.fatal_noacin_volt= SHARPSL_FATAL_NOACIN_VOLT,</div><div class='ctx'> 	.bat_levels       = 40,</div><div class='ctx'> 	.bat_levels_noac  = spitz_battery_levels_noac,</div><div class='ctx'> 	.bat_levels_acin  = spitz_battery_levels_acin,</div><div class='head'>diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S<br/>index 6f6dbbd08021..d774430d02c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/standby.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/standby.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/standby.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/standby.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c<br/>index b9b2057349eb..5dbd191c57c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/time.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -118,7 +117,7 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction pxa_timer_irq = {</div><div class='ctx'> 	.name		= "PXA Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= pxa_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c<br/>index 76c0e7f0a219..249353616aba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-pxa/tosa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/tosa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/tosa.c</a></div><div class='hunk'>@@ -19,12 +19,15 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mmc/host.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/arch/irda.h&gt;</div><div class='ctx'> #include &lt;asm/arch/mmc.h&gt;</div><div class='ctx'> #include &lt;asm/arch/udc.h&gt;</div><div class='hunk'>@@ -182,7 +185,7 @@ static int tosa_mci_init(struct device *dev, irqreturn_t (*tosa_detect_int)(int,</div><div class='ctx'> </div><div class='ctx'> 	tosa_mci_platform_data.detect_delay = msecs_to_jiffies(250);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, SA_INTERRUPT,</div><div class='add'>+	err = request_irq(TOSA_IRQ_GPIO_nSD_DETECT, tosa_detect_int, IRQF_DISABLED,</div><div class='ctx'> 				"MMC/SD card detect", data);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "tosa_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='hunk'>@@ -266,8 +269,31 @@ static struct platform_device *devices[] __initdata = {</div><div class='ctx'> 	&amp;tosaled_device,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void tosa_poweroff(void)</div><div class='add'>+{</div><div class='add'>+	RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;</div><div class='add'>+</div><div class='add'>+	pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT);</div><div class='add'>+	GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET);</div><div class='add'>+</div><div class='add'>+	mdelay(1000);</div><div class='add'>+	arm_machine_restart('h');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tosa_restart(char mode)</div><div class='add'>+{</div><div class='add'>+	/* Bootloader magic for a reboot */</div><div class='add'>+	if((MSC0 &amp; 0xffff0000) == 0x7ff00000)</div><div class='add'>+		MSC0 = (MSC0 &amp; 0xffff) | 0x7ee00000;</div><div class='add'>+</div><div class='add'>+	tosa_poweroff();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init tosa_init(void)</div><div class='ctx'> {</div><div class='add'>+	pm_power_off = tosa_poweroff;</div><div class='add'>+	arm_pm_restart = tosa_restart;</div><div class='add'>+</div><div class='ctx'> 	pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_IN);</div><div class='ctx'> 	pxa_gpio_mode(TOSA_GPIO_TC6393_INT | GPIO_IN);</div><div class='ctx'> 	pxa_gpio_mode(TOSA_GPIO_USB_IN | GPIO_IN);</div><div class='head'>diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c<br/>new file mode 100644<br/>index 000000000000..7c3007df1bd6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-pxa/trizeps4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-pxa/trizeps4.c</a></div><div class='hunk'>@@ -0,0 +1,473 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mach-pxa/trizeps4.c</div><div class='add'>+ *</div><div class='add'>+ *  Support for the Keith und Koep Trizeps4 Module Platform.</div><div class='add'>+ *</div><div class='add'>+ *  Author:	Jürgen Schindele</div><div class='add'>+ *  Created:	20 02, 2006</div><div class='add'>+ *  Copyright:	Jürgen Schindele</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ *  published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/memory.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+#include &lt;asm/mach/flash.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/trizeps4.h&gt;</div><div class='add'>+#include &lt;asm/arch/audio.h&gt;</div><div class='add'>+#include &lt;asm/arch/pxafb.h&gt;</div><div class='add'>+#include &lt;asm/arch/mmc.h&gt;</div><div class='add'>+#include &lt;asm/arch/irda.h&gt;</div><div class='add'>+#include &lt;asm/arch/ohci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+/********************************************************************************************</div><div class='add'>+ * ONBOARD FLASH</div><div class='add'>+ ********************************************************************************************/</div><div class='add'>+static struct mtd_partition trizeps4_partitions[] = {</div><div class='add'>+	{</div><div class='add'>+		.name =		"Bootloader",</div><div class='add'>+		.size =		0x00040000,</div><div class='add'>+		.offset =	0,</div><div class='add'>+		.mask_flags =	MTD_WRITEABLE  /* force read-only */</div><div class='add'>+	},{</div><div class='add'>+		.name =		"Kernel",</div><div class='add'>+		.size =		0x00400000,</div><div class='add'>+		.offset =	0x00040000</div><div class='add'>+	},{</div><div class='add'>+		.name =		"Filesystem",</div><div class='add'>+		.size =		MTDPART_SIZ_FULL,</div><div class='add'>+		.offset =	0x00440000</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flash_platform_data trizeps4_flash_data[] = {</div><div class='add'>+	{</div><div class='add'>+		.map_name	= "cfi_probe",</div><div class='add'>+		.parts		= trizeps4_partitions,</div><div class='add'>+		.nr_parts	= ARRAY_SIZE(trizeps4_partitions)</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource flash_resource = {</div><div class='add'>+	.start	= PXA_CS0_PHYS,</div><div class='add'>+	.end	= PXA_CS0_PHYS + SZ_64M - 1,</div><div class='add'>+	.flags	= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device flash_device = {</div><div class='add'>+	.name		= "pxa2xx-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;trizeps4_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.resource = &amp;flash_resource,</div><div class='add'>+	.num_resources = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************************************************************************************</div><div class='add'>+ * DAVICOM DM9000 Ethernet</div><div class='add'>+ ********************************************************************************************/</div><div class='add'>+static struct resource dm9000_resources[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start	= TRIZEPS4_ETH_PHYS+0x300,</div><div class='add'>+		.end	= TRIZEPS4_ETH_PHYS+0x400-1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start	= TRIZEPS4_ETH_PHYS+0x8300,</div><div class='add'>+		.end	= TRIZEPS4_ETH_PHYS+0x8400-1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.start	= TRIZEPS4_ETH_IRQ,</div><div class='add'>+		.end	= TRIZEPS4_ETH_IRQ,</div><div class='add'>+		.flags	= (IORESOURCE_IRQ | IRQT_RISING),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device dm9000_device = {</div><div class='add'>+	.name		= "dm9000",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(dm9000_resources),</div><div class='add'>+	.resource	= dm9000_resources,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************************************************************************************</div><div class='add'>+ * PXA270 serial ports</div><div class='add'>+ ********************************************************************************************/</div><div class='add'>+static struct plat_serial8250_port tri_serial_ports[] = {</div><div class='add'>+#ifdef CONFIG_SERIAL_PXA</div><div class='add'>+	/* this uses the own PXA driver */</div><div class='add'>+	{</div><div class='add'>+		0,</div><div class='add'>+	},</div><div class='add'>+#else</div><div class='add'>+	/* this uses the generic 8520 driver */</div><div class='add'>+	[0] = {</div><div class='add'>+		.membase	= (void *)&amp;FFUART,</div><div class='add'>+		.irq		= IRQ_FFUART,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+		.iotype		= UPIO_MEM32,</div><div class='add'>+		.regshift	= 2,</div><div class='add'>+		.uartclk	= (921600*16),</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.membase	= (void *)&amp;BTUART,</div><div class='add'>+		.irq		= IRQ_BTUART,</div><div class='add'>+		.flags		= UPF_BOOT_AUTOCONF,</div><div class='add'>+		.iotype		= UPIO_MEM32,</div><div class='add'>+		.regshift	= 2,</div><div class='add'>+		.uartclk	= (921600*16),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device uart_devices = {</div><div class='add'>+	.name		= "serial8250",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= tri_serial_ports,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 0,</div><div class='add'>+	.resource	= NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/********************************************************************************************</div><div class='add'>+ * PXA270 ac97 sound codec</div><div class='add'>+ ********************************************************************************************/</div><div class='add'>+static struct platform_device ac97_audio_device = {</div><div class='add'>+	.name		= "pxa2xx-ac97",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device * trizeps4_devices[] __initdata = {</div><div class='add'>+	&amp;flash_device,</div><div class='add'>+	&amp;uart_devices,</div><div class='add'>+	&amp;dm9000_device,</div><div class='add'>+	&amp;ac97_audio_device,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MACH_TRIZEPS4_CONXS</div><div class='add'>+static short trizeps_conxs_bcr;</div><div class='add'>+</div><div class='add'>+/* PCCARD power switching supports only 3,3V */</div><div class='add'>+void board_pcmcia_power(int power)</div><div class='add'>+{</div><div class='add'>+	if (power) {</div><div class='add'>+		/* switch power on, put in reset and enable buffers */</div><div class='add'>+		trizeps_conxs_bcr |= power;</div><div class='add'>+		trizeps_conxs_bcr |= ConXS_BCR_CF_RESET;</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~(ConXS_BCR_CF_BUF_EN);</div><div class='add'>+		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+		/* wait a little */</div><div class='add'>+		udelay(2000);</div><div class='add'>+		/* take reset away */</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~(ConXS_BCR_CF_RESET);</div><div class='add'>+		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+		udelay(2000);</div><div class='add'>+	} else {</div><div class='add'>+		/* put in reset */</div><div class='add'>+		trizeps_conxs_bcr |= ConXS_BCR_CF_RESET;</div><div class='add'>+		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+		udelay(1000);</div><div class='add'>+		/* switch power off */</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~(0xf);</div><div class='add'>+		ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	pr_debug("%s: o%s 0x%x\n", __FUNCTION__, power ? "n": "ff", trizeps_conxs_bcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* backlight power switching for LCD panel */</div><div class='add'>+static void board_backlight_power(int on)</div><div class='add'>+{</div><div class='add'>+	if (on) {</div><div class='add'>+		trizeps_conxs_bcr |= ConXS_BCR_L_DISP;</div><div class='add'>+	} else {</div><div class='add'>+		trizeps_conxs_bcr &amp;= ~ConXS_BCR_L_DISP;</div><div class='add'>+	}</div><div class='add'>+	pr_debug("%s: o%s 0x%x\n", __FUNCTION__, on ? "n" : "ff", trizeps_conxs_bcr);</div><div class='add'>+	ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Powersupply for MMC/SD cardslot */</div><div class='add'>+static void board_mci_power(struct device *dev, unsigned int vdd)</div><div class='add'>+{</div><div class='add'>+	struct pxamci_platform_data* p_d = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (( 1 &lt;&lt; vdd) &amp; p_d-&gt;ocr_mask) {</div><div class='add'>+		pr_debug("%s: on\n", __FUNCTION__);</div><div class='add'>+		/* FIXME fill in values here */</div><div class='add'>+	} else {</div><div class='add'>+		pr_debug("%s: off\n", __FUNCTION__);</div><div class='add'>+		/* FIXME fill in values here */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static short trizeps_conxs_ircr;</div><div class='add'>+</div><div class='add'>+/* Switch modes and Power for IRDA receiver */</div><div class='add'>+static void board_irda_mode(struct device *dev, int mode)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	if (mode &amp; IR_SIRMODE) {</div><div class='add'>+		/* Slow mode */</div><div class='add'>+		trizeps_conxs_ircr &amp;= ~ConXS_IRCR_MODE;</div><div class='add'>+	} else if (mode &amp; IR_FIRMODE) {</div><div class='add'>+		/* Fast mode */</div><div class='add'>+		trizeps_conxs_ircr |= ConXS_IRCR_MODE;</div><div class='add'>+	}</div><div class='add'>+	if (mode &amp; IR_OFF) {</div><div class='add'>+		trizeps_conxs_ircr |= ConXS_IRCR_SD;</div><div class='add'>+	} else {</div><div class='add'>+		trizeps_conxs_ircr &amp;= ~ConXS_IRCR_SD;</div><div class='add'>+	}</div><div class='add'>+	/* FIXME write values to register */</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+/* for other baseboards define dummies */</div><div class='add'>+void board_pcmcia_power(int power)	{;}</div><div class='add'>+#define board_backlight_power		NULL</div><div class='add'>+#define board_mci_power			NULL</div><div class='add'>+#define board_irda_mode			NULL</div><div class='add'>+</div><div class='add'>+#endif		/* CONFIG_MACH_TRIZEPS4_CONXS */</div><div class='add'>+EXPORT_SYMBOL(board_pcmcia_power);</div><div class='add'>+</div><div class='add'>+static int trizeps4_mci_init(struct device *dev, irqreturn_t (*mci_detect_int)(int, void *, struct pt_regs *), void *data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	/* setup GPIO for PXA27x MMC controller */</div><div class='add'>+	pxa_gpio_mode(GPIO32_MMCCLK_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO112_MMCCMD_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO92_MMCDAT0_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO109_MMCDAT1_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO110_MMCDAT2_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO111_MMCDAT3_MD);</div><div class='add'>+</div><div class='add'>+	pxa_gpio_mode(GPIO_MMC_DET | GPIO_IN);</div><div class='add'>+</div><div class='add'>+	err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,</div><div class='add'>+			  IRQF_DISABLED | IRQF_TRIGGER_RISING,</div><div class='add'>+			  "MMC card detect", data);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request MMC card detect IRQ\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trizeps4_mci_exit(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	free_irq(TRIZEPS4_MMC_IRQ, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxamci_platform_data trizeps4_mci_platform_data = {</div><div class='add'>+	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,</div><div class='add'>+	.init 		= trizeps4_mci_init,</div><div class='add'>+	.exit		= trizeps4_mci_exit,</div><div class='add'>+	.setpower 	= board_mci_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxaficp_platform_data trizeps4_ficp_platform_data = {</div><div class='add'>+	.transceiver_cap  = IR_SIRMODE | IR_FIRMODE | IR_OFF,</div><div class='add'>+	.transceiver_mode = board_irda_mode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int trizeps4_ohci_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	/* setup Port1 GPIO pin. */</div><div class='add'>+	pxa_gpio_mode( 88 | GPIO_ALT_FN_1_IN);	/* USBHPWR1 */</div><div class='add'>+	pxa_gpio_mode( 89 | GPIO_ALT_FN_2_OUT);	/* USBHPEN1 */</div><div class='add'>+</div><div class='add'>+	/* Set the Power Control Polarity Low and Power Sense</div><div class='add'>+	   Polarity Low to active low. */</div><div class='add'>+	UHCHR = (UHCHR | UHCHR_PCPL | UHCHR_PSPL) &amp;</div><div class='add'>+		~(UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSEP3 | UHCHR_SSE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void trizeps4_ohci_exit(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pxaohci_platform_data trizeps4_ohci_platform_data = {</div><div class='add'>+	.port_mode	= PMM_PERPORT_MODE,</div><div class='add'>+	.init		= trizeps4_ohci_init,</div><div class='add'>+	.exit		= trizeps4_ohci_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct map_desc trizeps4_io_desc[] __initdata = {</div><div class='add'>+	{ 	/* ConXS CFSR */</div><div class='add'>+		.virtual	= TRIZEPS4_CFSR_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(TRIZEPS4_CFSR_PHYS),</div><div class='add'>+		.length		= 0x00001000,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{	/* ConXS BCR */</div><div class='add'>+		.virtual	= TRIZEPS4_BOCR_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(TRIZEPS4_BOCR_PHYS),</div><div class='add'>+		.length		= 0x00001000,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{ 	/* ConXS IRCR */</div><div class='add'>+		.virtual	= TRIZEPS4_IRCR_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(TRIZEPS4_IRCR_PHYS),</div><div class='add'>+		.length		= 0x00001000,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{	/* ConXS DCR */</div><div class='add'>+		.virtual	= TRIZEPS4_DICR_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(TRIZEPS4_DICR_PHYS),</div><div class='add'>+		.length		= 0x00001000,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	},</div><div class='add'>+	{	/* ConXS UPSR */</div><div class='add'>+		.virtual	= TRIZEPS4_UPSR_VIRT,</div><div class='add'>+		.pfn		= __phys_to_pfn(TRIZEPS4_UPSR_PHYS),</div><div class='add'>+		.length		= 0x00001000,</div><div class='add'>+		.type		= MT_DEVICE</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pxafb_mach_info sharp_lcd __initdata = {</div><div class='add'>+    .pixclock		= 78000,</div><div class='add'>+    .xres		= 640,</div><div class='add'>+    .yres		= 480,</div><div class='add'>+    .bpp		= 8,</div><div class='add'>+    .hsync_len		= 4,</div><div class='add'>+    .left_margin	= 4,</div><div class='add'>+    .right_margin	= 4,</div><div class='add'>+    .vsync_len		= 2,</div><div class='add'>+    .upper_margin	= 0,</div><div class='add'>+    .lower_margin	= 0,</div><div class='add'>+    .sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+    .cmap_greyscale	= 0,</div><div class='add'>+    .cmap_inverse	= 0,</div><div class='add'>+    .cmap_static	= 0,</div><div class='add'>+    .lccr0		= LCCR0_Color | LCCR0_Pas | LCCR0_Dual,</div><div class='add'>+    .lccr3		= 0x0340ff02,</div><div class='add'>+    .pxafb_backlight_power = board_backlight_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init trizeps4_fixup(struct machine_desc *desc, struct tag *tags, char **cmdline, struct meminfo *mi)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init trizeps4_init(void)</div><div class='add'>+{</div><div class='add'>+	platform_add_devices(trizeps4_devices, ARRAY_SIZE(trizeps4_devices));</div><div class='add'>+</div><div class='add'>+	set_pxa_fb_info(&amp;sharp_lcd);</div><div class='add'>+</div><div class='add'>+	pxa_set_mci_info(&amp;trizeps4_mci_platform_data);</div><div class='add'>+	pxa_set_ficp_info(&amp;trizeps4_ficp_platform_data);</div><div class='add'>+	pxa_set_ohci_info(&amp;trizeps4_ohci_platform_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init trizeps4_map_io(void)</div><div class='add'>+{</div><div class='add'>+	pxa_map_io();</div><div class='add'>+	iotable_init(trizeps4_io_desc, ARRAY_SIZE(trizeps4_io_desc));</div><div class='add'>+</div><div class='add'>+	/* for DiskOnChip */</div><div class='add'>+	pxa_gpio_mode(GPIO15_nCS_1_MD);</div><div class='add'>+</div><div class='add'>+	/* for off-module PIC on ConXS board */</div><div class='add'>+	pxa_gpio_mode(GPIO_PIC | GPIO_IN);</div><div class='add'>+</div><div class='add'>+	/* UCB1400 irq */</div><div class='add'>+	pxa_gpio_mode(GPIO_UCB1400 | GPIO_IN);</div><div class='add'>+</div><div class='add'>+	/* for DM9000 LAN */</div><div class='add'>+	pxa_gpio_mode(GPIO78_nCS_2_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);</div><div class='add'>+</div><div class='add'>+	/* for PCMCIA device */</div><div class='add'>+	pxa_gpio_mode(GPIO_PCD | GPIO_IN);</div><div class='add'>+	pxa_gpio_mode(GPIO_PRDY | GPIO_IN);</div><div class='add'>+</div><div class='add'>+	/* for I2C adapter */</div><div class='add'>+	pxa_gpio_mode(GPIO117_I2CSCL_MD);</div><div class='add'>+	pxa_gpio_mode(GPIO118_I2CSDA_MD);</div><div class='add'>+</div><div class='add'>+	/* MMC_DET s.o. */</div><div class='add'>+	pxa_gpio_mode(GPIO_MMC_DET | GPIO_IN);</div><div class='add'>+</div><div class='add'>+	/* whats that for ??? */</div><div class='add'>+	pxa_gpio_mode(GPIO79_nCS_3_MD);</div><div class='add'>+</div><div class='add'>+	pxa_gpio_mode( GPIO_SYS_BUSY_LED  | GPIO_OUT);		/* LED1 */</div><div class='add'>+	pxa_gpio_mode( GPIO_HEARTBEAT_LED | GPIO_OUT);		/* LED2 */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MACH_TRIZEPS4_CONXS</div><div class='add'>+#ifdef CONFIG_IDE_PXA_CF</div><div class='add'>+	/* if boot direct from compact flash dont disable power */</div><div class='add'>+	trizeps_conxs_bcr = 0x0009;</div><div class='add'>+#else</div><div class='add'>+	/* this is the reset value */</div><div class='add'>+	trizeps_conxs_bcr = 0x00A0;</div><div class='add'>+#endif</div><div class='add'>+	ConXS_BCR = trizeps_conxs_bcr;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	PWER  = 0x00000002;</div><div class='add'>+	PFER  = 0x00000000;</div><div class='add'>+	PRER  = 0x00000002;</div><div class='add'>+	PGSR0 = 0x0158C000;</div><div class='add'>+	PGSR1 = 0x00FF0080;</div><div class='add'>+	PGSR2 = 0x0001C004;</div><div class='add'>+	/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */</div><div class='add'>+	PCFR |= PCFR_OPDE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module")</div><div class='add'>+	/* MAINTAINER("Jürgen Schindele") */</div><div class='add'>+	.phys_io	= 0x40000000,</div><div class='add'>+	.io_pg_offst	= (io_p2v(0x40000000) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= TRIZEPS4_SDRAM_BASE + 0x100,</div><div class='add'>+	.fixup		= trizeps4_fixup,</div><div class='add'>+	.init_machine	= trizeps4_init,</div><div class='add'>+	.map_io		= trizeps4_map_io,</div><div class='add'>+	.init_irq	= pxa_init_irq,</div><div class='add'>+	.timer		= &amp;pxa_timer,</div><div class='add'>+MACHINE_END</div><div class='add'>+</div><div class='head'>diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c<br/>index d13270c5d7cd..da0286973823 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-realview/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-realview/core.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -537,7 +536,7 @@ static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_reg</div><div class='ctx'> </div><div class='ctx'> static struct irqaction realview_timer_irq = {</div><div class='ctx'> 	.name		= "RealView Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= realview_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c<br/>index 693fb1e396e0..84a959530fb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_eb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-realview/realview_eb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-realview/realview_eb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-realview/realview_eb.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c<br/>index bd86ffba8810..ac511d41d4d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-rpc/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-rpc/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-rpc/dma.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static int iomd_request_dma(dmach_t channel, dma_t *dma)</div><div class='ctx'> {</div><div class='ctx'> 	return request_irq(dma-&gt;dma_irq, iomd_dma_handle,</div><div class='del'>-			   SA_INTERRUPT, dma-&gt;device_id, dma);</div><div class='add'>+			   IRQF_DISABLED, dma-&gt;device_id, dma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iomd_free_dma(dmach_t channel, dma_t *dma)</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig<br/>index ce7d81000695..b4171dd43df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/Kconfig</a></div><div class='hunk'>@@ -70,6 +70,24 @@ config ARCH_S3C2440</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you are using the SMDK2440.</div><div class='ctx'> </div><div class='add'>+config SMDK2440_CPU2440</div><div class='add'>+	bool "SMDK2440 with S3C2440 CPU module"</div><div class='add'>+	depends on ARCH_S3C2440</div><div class='add'>+	default y if ARCH_S3C2440</div><div class='add'>+	select CPU_S3C2440</div><div class='add'>+</div><div class='add'>+config SMDK2440_CPU2442</div><div class='add'>+	bool "SMDM2440 with S3C2442 CPU module"</div><div class='add'>+	depends on ARCH_S3C2440</div><div class='add'>+	select CPU_S3C2442</div><div class='add'>+</div><div class='add'>+config MACH_SMDK2413</div><div class='add'>+	bool "SMDK2413"</div><div class='add'>+	select CPU_S3C2412</div><div class='add'>+	select MACH_SMDK</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you are using an SMDK2413</div><div class='add'>+</div><div class='ctx'> config MACH_VR1000</div><div class='ctx'> 	bool "Thorcom VR1000"</div><div class='ctx'> 	select CPU_S3C2410</div><div class='hunk'>@@ -102,19 +120,55 @@ config MACH_NEXCODER_2440</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='add'>+config S3C2410_CLOCK</div><div class='add'>+	bool</div><div class='add'>+	help</div><div class='add'>+	  Clock code for the S3C2410, and similar processors</div><div class='add'>+</div><div class='ctx'> config CPU_S3C2410</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on ARCH_S3C2410</div><div class='add'>+	select S3C2410_CLOCK</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for S3C2410 and S3C2410A family from the S3C24XX line</div><div class='ctx'> 	  of Samsung Mobile CPUs.</div><div class='ctx'> </div><div class='add'>+# internal node to signify if we are only dealing with an S3C2412</div><div class='add'>+</div><div class='add'>+config CPU_S3C2412_ONLY</div><div class='add'>+	bool</div><div class='add'>+	depends on ARCH_S3C2410 &amp;&amp; !CPU_S3C2400 &amp;&amp; !CPU_S3C2410 &amp;&amp; \</div><div class='add'>+		   !CPU_S3C2440 &amp;&amp; !CPU_S3C2442 &amp;&amp; CPU_S3C2412</div><div class='add'>+	default y if CPU_S3C2412</div><div class='add'>+</div><div class='add'>+config CPU_S3C2412</div><div class='add'>+	bool</div><div class='add'>+	depends on ARCH_S3C2410</div><div class='add'>+	help</div><div class='add'>+	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line</div><div class='add'>+</div><div class='add'>+config CPU_S3C244X</div><div class='add'>+	bool</div><div class='add'>+	depends on ARCH_S3C2410 &amp;&amp; (CPU_S3C2440 || CPU_S3C2442)</div><div class='add'>+	help</div><div class='add'>+	  Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.</div><div class='add'>+</div><div class='ctx'> config CPU_S3C2440</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on ARCH_S3C2410</div><div class='add'>+	select S3C2410_CLOCK</div><div class='add'>+	select CPU_S3C244X</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for S3C2440 Samsung Mobile CPU based systems.</div><div class='ctx'> </div><div class='add'>+config CPU_S3C2442</div><div class='add'>+	bool</div><div class='add'>+	depends on ARCH_S3C2420</div><div class='add'>+	select S3C2410_CLOCK</div><div class='add'>+	select CPU_S3C244X</div><div class='add'>+	help</div><div class='add'>+	  Support for S3C2442 Samsung Mobile CPU based systems.</div><div class='add'>+</div><div class='ctx'> comment "S3C2410 Boot"</div><div class='ctx'> </div><div class='ctx'> config S3C2410_BOOT_WATCHDOG</div><div class='hunk'>@@ -170,7 +224,7 @@ config S3C2410_PM_DEBUG</div><div class='ctx'> 	depends on ARCH_S3C2410 &amp;&amp; PM</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want verbose debugging from the PM Suspend and</div><div class='del'>-	  Resume code. See `Documentation/arm/Samsing-S3C24XX/Suspend.txt`</div><div class='add'>+	  Resume code. See &lt;file:Documentation/arm/Samsung-S3C24XX/Suspend.txt&gt;</div><div class='ctx'> 	  for more information.</div><div class='ctx'> </div><div class='ctx'> config S3C2410_PM_CHECK</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile<br/>index 3e5712db6b52..0c7938645df6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/Makefile</a></div><div class='hunk'>@@ -24,6 +24,20 @@ obj-$(CONFIG_S3C2410_DMA)  += dma.o</div><div class='ctx'> obj-$(CONFIG_PM)	   += pm.o sleep.o</div><div class='ctx'> obj-$(CONFIG_PM_SIMTEC)	   += pm-simtec.o</div><div class='ctx'> </div><div class='add'>+# S3C2412 support</div><div class='add'>+obj-$(CONFIG_CPU_S3C2412)  += s3c2412.o</div><div class='add'>+obj-$(CONFIG_CPU_S3C2412)  += s3c2412-clock.o</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# S3C244X support</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CPU_S3C244X)  += s3c244x.o</div><div class='add'>+obj-$(CONFIG_CPU_S3C244X)  += s3c244x-irq.o</div><div class='add'>+</div><div class='add'>+# Clock control</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o</div><div class='add'>+</div><div class='ctx'> # S3C2440 support</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CPU_S3C2440)  += s3c2440.o s3c2440-dsc.o</div><div class='hunk'>@@ -31,6 +45,11 @@ obj-$(CONFIG_CPU_S3C2440)  += s3c2440-irq.o</div><div class='ctx'> obj-$(CONFIG_CPU_S3C2440)  += s3c2440-clock.o</div><div class='ctx'> obj-$(CONFIG_CPU_S3C2440)  += s3c2410-gpio.o</div><div class='ctx'> </div><div class='add'>+# S3C2442 support</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CPU_S3C2442)  += s3c2442.o</div><div class='add'>+obj-$(CONFIG_CPU_S3C2442)  += s3c2442-clock.o</div><div class='add'>+</div><div class='ctx'> # bast extras</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BAST_PC104_IRQ)	+= bast-irq.o</div><div class='hunk'>@@ -43,6 +62,7 @@ obj-$(CONFIG_ARCH_BAST)		+= mach-bast.o usb-simtec.o</div><div class='ctx'> obj-$(CONFIG_ARCH_H1940)	+= mach-h1940.o</div><div class='ctx'> obj-$(CONFIG_MACH_N30)		+= mach-n30.o</div><div class='ctx'> obj-$(CONFIG_ARCH_SMDK2410)	+= mach-smdk2410.o</div><div class='add'>+obj-$(CONFIG_MACH_SMDK2413)	+= mach-smdk2413.o</div><div class='ctx'> obj-$(CONFIG_ARCH_S3C2440)	+= mach-smdk2440.o</div><div class='ctx'> obj-$(CONFIG_MACH_VR1000)	+= mach-vr1000.o usb-simtec.o</div><div class='ctx'> obj-$(CONFIG_MACH_RX3715)	+= mach-rx3715.o</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c<br/>index fbbeb0553006..def4441d2442 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/bast-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/bast-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/bast-irq.c</a></div><div class='hunk'>@@ -136,8 +136,8 @@ bast_irq_pc104_demux(unsigned int irq,</div><div class='ctx'> 		for (i = 0; stat != 0; i++, stat &gt;&gt;= 1) {</div><div class='ctx'> 			if (stat &amp; 1) {</div><div class='ctx'> 				irqno = bast_pc104_irqs[i];</div><div class='del'>-</div><div class='del'>-				desc_handle_irq(irqno, irq_desc + irqno, regs);</div><div class='add'>+				desc = irq_desc + irqno;</div><div class='add'>+				desc_handle_irq(irqno, desc, regs);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -156,7 +156,7 @@ static __init int bast_irq_init(void)</div><div class='ctx'> </div><div class='ctx'> 		set_irq_chained_handler(IRQ_ISA, bast_irq_pc104_demux);</div><div class='ctx'> </div><div class='del'>-		/* reigster our IRQs */</div><div class='add'>+		/* register our IRQs */</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 			unsigned int irqno = bast_pc104_irqs[i];</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c<br/>index 6de713ad319a..e13fb6778890 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/clock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/clock.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * Copyright (c) 2004-2005 Simtec Electronics</div><div class='ctx'>  *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  *</div><div class='del'>- * S3C2410 Clock control support</div><div class='add'>+ * S3C24XX Core clock control support</div><div class='ctx'>  *</div><div class='ctx'>  * Based on, and code from linux/arch/arm/mach-versatile/clock.c</div><div class='ctx'>  **</div><div class='hunk'>@@ -56,25 +56,6 @@ static LIST_HEAD(clocks);</div><div class='ctx'> </div><div class='ctx'> DEFINE_MUTEX(clocks_mutex);</div><div class='ctx'> </div><div class='del'>-/* old functions */</div><div class='del'>-</div><div class='del'>-void inline s3c24xx_clk_enable(unsigned int clocks, unsigned int enable)</div><div class='del'>-{</div><div class='del'>-	unsigned long clkcon;</div><div class='del'>-</div><div class='del'>-	clkcon = __raw_readl(S3C2410_CLKCON);</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		clkcon |= clocks;</div><div class='del'>-	else</div><div class='del'>-		clkcon &amp;= ~clocks;</div><div class='del'>-</div><div class='del'>-	/* ensure none of the special function bits set */</div><div class='del'>-	clkcon &amp;= ~(S3C2410_CLKCON_IDLE|S3C2410_CLKCON_POWER);</div><div class='del'>-</div><div class='del'>-	__raw_writel(clkcon, S3C2410_CLKCON);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* enable and disable calls for use with the clk struct */</div><div class='ctx'> </div><div class='ctx'> static int clk_null_enable(struct clk *clk, int enable)</div><div class='hunk'>@@ -82,12 +63,6 @@ static int clk_null_enable(struct clk *clk, int enable)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int s3c24xx_clkcon_enable(struct clk *clk, int enable)</div><div class='del'>-{</div><div class='del'>-	s3c24xx_clk_enable(clk-&gt;ctrlbit, enable);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Clock API calls */</div><div class='ctx'> </div><div class='ctx'> struct clk *clk_get(struct device *dev, const char *id)</div><div class='hunk'>@@ -173,8 +148,11 @@ unsigned long clk_get_rate(struct clk *clk)</div><div class='ctx'> 	if (clk-&gt;rate != 0)</div><div class='ctx'> 		return clk-&gt;rate;</div><div class='ctx'> </div><div class='del'>-	while (clk-&gt;parent != NULL &amp;&amp; clk-&gt;rate == 0)</div><div class='del'>-		clk = clk-&gt;parent;</div><div class='add'>+	if (clk-&gt;get_rate != NULL)</div><div class='add'>+		return (clk-&gt;get_rate)(clk);</div><div class='add'>+</div><div class='add'>+	if (clk-&gt;parent != NULL)</div><div class='add'>+		return clk_get_rate(clk-&gt;parent);</div><div class='ctx'> </div><div class='ctx'> 	return clk-&gt;rate;</div><div class='ctx'> }</div><div class='hunk'>@@ -233,31 +211,9 @@ EXPORT_SYMBOL(clk_set_rate);</div><div class='ctx'> EXPORT_SYMBOL(clk_get_parent);</div><div class='ctx'> EXPORT_SYMBOL(clk_set_parent);</div><div class='ctx'> </div><div class='del'>-/* base clock enable */</div><div class='del'>-</div><div class='del'>-static int s3c24xx_upll_enable(struct clk *clk, int enable)</div><div class='del'>-{</div><div class='del'>-	unsigned long clkslow = __raw_readl(S3C2410_CLKSLOW);</div><div class='del'>-	unsigned long orig = clkslow;</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		clkslow &amp;= ~S3C2410_CLKSLOW_UCLK_OFF;</div><div class='del'>-	else</div><div class='del'>-		clkslow |= S3C2410_CLKSLOW_UCLK_OFF;</div><div class='del'>-</div><div class='del'>-	__raw_writel(clkslow, S3C2410_CLKSLOW);</div><div class='del'>-</div><div class='del'>-	/* if we started the UPLL, then allow to settle */</div><div class='del'>-</div><div class='del'>-	if (enable &amp;&amp; (orig &amp; S3C2410_CLKSLOW_UCLK_OFF))</div><div class='del'>-		udelay(200);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* base clocks */</div><div class='ctx'> </div><div class='del'>-static struct clk clk_xtal = {</div><div class='add'>+struct clk clk_xtal = {</div><div class='ctx'> 	.name		= "xtal",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.rate		= 0,</div><div class='hunk'>@@ -265,23 +221,27 @@ static struct clk clk_xtal = {</div><div class='ctx'> 	.ctrlbit	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk clk_upll = {</div><div class='add'>+struct clk clk_mpll = {</div><div class='add'>+	.name		= "mpll",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk clk_upll = {</div><div class='ctx'> 	.name		= "upll",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.parent		= NULL,</div><div class='del'>-	.enable		= s3c24xx_upll_enable,</div><div class='ctx'> 	.ctrlbit	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk clk_f = {</div><div class='add'>+struct clk clk_f = {</div><div class='ctx'> 	.name		= "fclk",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.rate		= 0,</div><div class='del'>-	.parent		= NULL,</div><div class='add'>+	.parent		= &amp;clk_mpll,</div><div class='ctx'> 	.ctrlbit	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk clk_h = {</div><div class='add'>+struct clk clk_h = {</div><div class='ctx'> 	.name		= "hclk",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.rate		= 0,</div><div class='hunk'>@@ -289,7 +249,7 @@ static struct clk clk_h = {</div><div class='ctx'> 	.ctrlbit	= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk clk_p = {</div><div class='add'>+struct clk clk_p = {</div><div class='ctx'> 	.name		= "pclk",</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> 	.rate		= 0,</div><div class='hunk'>@@ -308,14 +268,14 @@ struct clk clk_usb_bus = {</div><div class='ctx'> </div><div class='ctx'> static int s3c24xx_dclk_enable(struct clk *clk, int enable)</div><div class='ctx'> {</div><div class='del'>-	unsigned long dclkcon = __raw_readl(S3C2410_DCLKCON);</div><div class='add'>+	unsigned long dclkcon = __raw_readl(S3C24XX_DCLKCON);</div><div class='ctx'> </div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		dclkcon |= clk-&gt;ctrlbit;</div><div class='ctx'> 	else</div><div class='ctx'> 		dclkcon &amp;= ~clk-&gt;ctrlbit;</div><div class='ctx'> </div><div class='del'>-	__raw_writel(dclkcon, S3C2410_DCLKCON);</div><div class='add'>+	__raw_writel(dclkcon, S3C24XX_DCLKCON);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -334,7 +294,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent)</div><div class='ctx'> </div><div class='ctx'> 	clk-&gt;parent = parent;</div><div class='ctx'> </div><div class='del'>-	dclkcon = __raw_readl(S3C2410_DCLKCON);</div><div class='add'>+	dclkcon = __raw_readl(S3C24XX_DCLKCON);</div><div class='ctx'> </div><div class='ctx'> 	if (clk-&gt;ctrlbit == S3C2410_DCLKCON_DCLK0EN) {</div><div class='ctx'> 		if (uclk)</div><div class='hunk'>@@ -348,7 +308,7 @@ static int s3c24xx_dclk_setparent(struct clk *clk, struct clk *parent)</div><div class='ctx'> 			dclkcon &amp;= ~S3C2410_DCLKCON_DCLK1_UCLK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__raw_writel(dclkcon, S3C2410_DCLKCON);</div><div class='add'>+	__raw_writel(dclkcon, S3C24XX_DCLKCON);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -426,108 +386,6 @@ struct clk s3c24xx_uclk = {</div><div class='ctx'> 	.id		= -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* standard clock definitions */</div><div class='del'>-</div><div class='del'>-static struct clk init_clocks[] = {</div><div class='del'>-	{</div><div class='del'>-		.name		= "nand",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_NAND,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "lcd",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_LCDC,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "usb-host",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_USBH,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "usb-device",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_h,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_USBD,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "timers",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_PWMT,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "sdi",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_SDI,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "uart",</div><div class='del'>-		.id		= 0,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_UART0,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "uart",</div><div class='del'>-		.id		= 1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_UART1,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "uart",</div><div class='del'>-		.id		= 2,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_UART2,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "gpio",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_GPIO,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "rtc",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_RTC,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "adc",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_ADC,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "i2c",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_IIC,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "iis",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_IIS,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "spi",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.enable		= s3c24xx_clkcon_enable,</div><div class='del'>-		.ctrlbit	= S3C2410_CLKCON_SPI,</div><div class='del'>-	}, {</div><div class='del'>-		.name		= "watchdog",</div><div class='del'>-		.id		= -1,</div><div class='del'>-		.parent		= &amp;clk_p,</div><div class='del'>-		.ctrlbit	= 0,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* initialise the clock system */</div><div class='ctx'> </div><div class='ctx'> int s3c24xx_register_clock(struct clk *clk)</div><div class='hunk'>@@ -537,14 +395,6 @@ int s3c24xx_register_clock(struct clk *clk)</div><div class='ctx'> 	if (clk-&gt;enable == NULL)</div><div class='ctx'> 		clk-&gt;enable = clk_null_enable;</div><div class='ctx'> </div><div class='del'>-	/* if this is a standard clock, set the usage state */</div><div class='del'>-</div><div class='del'>-	if (clk-&gt;ctrlbit &amp;&amp; clk-&gt;enable == s3c24xx_clkcon_enable) {</div><div class='del'>-		unsigned long clkcon = __raw_readl(S3C2410_CLKCON);</div><div class='del'>-</div><div class='del'>-		clk-&gt;usage = (clkcon &amp; clk-&gt;ctrlbit) ? 1 : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* add to the list of available clocks */</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;clocks_mutex);</div><div class='hunk'>@@ -561,44 +411,18 @@ int __init s3c24xx_setup_clocks(unsigned long xtal,</div><div class='ctx'> 				unsigned long hclk,</div><div class='ctx'> 				unsigned long pclk)</div><div class='ctx'> {</div><div class='del'>-	unsigned long upllcon = __raw_readl(S3C2410_UPLLCON);</div><div class='del'>-	unsigned long clkslow = __raw_readl(S3C2410_CLKSLOW);</div><div class='del'>-	struct clk *clkp = init_clocks;</div><div class='del'>-	int ptr;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "S3C2410 Clocks, (c) 2004 Simtec Electronics\n");</div><div class='add'>+	printk(KERN_INFO "S3C24XX Clocks, (c) 2004 Simtec Electronics\n");</div><div class='ctx'> </div><div class='ctx'> 	/* initialise the main system clocks */</div><div class='ctx'> </div><div class='ctx'> 	clk_xtal.rate = xtal;</div><div class='del'>-	clk_upll.rate = s3c2410_get_pll(upllcon, xtal);</div><div class='add'>+	clk_upll.rate = s3c2410_get_pll(__raw_readl(S3C2410_UPLLCON), xtal);</div><div class='ctx'> </div><div class='add'>+	clk_mpll.rate = fclk;</div><div class='ctx'> 	clk_h.rate = hclk;</div><div class='ctx'> 	clk_p.rate = pclk;</div><div class='ctx'> 	clk_f.rate = fclk;</div><div class='ctx'> </div><div class='del'>-	/* We must be careful disabling the clocks we are not intending to</div><div class='del'>-	 * be using at boot time, as subsytems such as the LCD which do</div><div class='del'>-	 * their own DMA requests to the bus can cause the system to lockup</div><div class='del'>-	 * if they where in the middle of requesting bus access.</div><div class='del'>-	 *</div><div class='del'>-	 * Disabling the LCD clock if the LCD is active is very dangerous,</div><div class='del'>-	 * and therefore the bootloader should be  careful to not enable</div><div class='del'>-	 * the LCD clock if it is not needed.</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;clocks_mutex);</div><div class='del'>-</div><div class='del'>-	s3c24xx_clk_enable(S3C2410_CLKCON_NAND, 0);</div><div class='del'>-	s3c24xx_clk_enable(S3C2410_CLKCON_USBH, 0);</div><div class='del'>-	s3c24xx_clk_enable(S3C2410_CLKCON_USBD, 0);</div><div class='del'>-	s3c24xx_clk_enable(S3C2410_CLKCON_ADC, 0);</div><div class='del'>-	s3c24xx_clk_enable(S3C2410_CLKCON_IIC, 0);</div><div class='del'>-	s3c24xx_clk_enable(S3C2410_CLKCON_SPI, 0);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;clocks_mutex);</div><div class='del'>-</div><div class='ctx'> 	/* assume uart clocks are correctly setup */</div><div class='ctx'> </div><div class='ctx'> 	/* register our clocks */</div><div class='hunk'>@@ -606,6 +430,9 @@ int __init s3c24xx_setup_clocks(unsigned long xtal,</div><div class='ctx'> 	if (s3c24xx_register_clock(&amp;clk_xtal) &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR "failed to register master xtal\n");</div><div class='ctx'> </div><div class='add'>+	if (s3c24xx_register_clock(&amp;clk_mpll) &lt; 0)</div><div class='add'>+		printk(KERN_ERR "failed to register mpll clock\n");</div><div class='add'>+</div><div class='ctx'> 	if (s3c24xx_register_clock(&amp;clk_upll) &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR "failed to register upll clock\n");</div><div class='ctx'> </div><div class='hunk'>@@ -618,27 +445,5 @@ int __init s3c24xx_setup_clocks(unsigned long xtal,</div><div class='ctx'> 	if (s3c24xx_register_clock(&amp;clk_p) &lt; 0)</div><div class='ctx'> 		printk(KERN_ERR "failed to register cpu pclk\n");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	if (s3c24xx_register_clock(&amp;clk_usb_bus) &lt; 0)</div><div class='del'>-		printk(KERN_ERR "failed to register usb bus clock\n");</div><div class='del'>-</div><div class='del'>-	/* register clocks from clock array */</div><div class='del'>-</div><div class='del'>-	for (ptr = 0; ptr &lt; ARRAY_SIZE(init_clocks); ptr++, clkp++) {</div><div class='del'>-		ret = s3c24xx_register_clock(clkp);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='del'>-			       clkp-&gt;name, ret);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* show the clock-slow value */</div><div class='del'>-</div><div class='del'>-	printk("CLOCK: Slow mode (%ld.%ld MHz), %s, MPLL %s, UPLL %s\n",</div><div class='del'>-	       print_mhz(xtal / ( 2 * S3C2410_CLKSLOW_GET_SLOWVAL(clkslow))),</div><div class='del'>-	       (clkslow &amp; S3C2410_CLKSLOW_SLOW) ? "slow" : "fast",</div><div class='del'>-	       (clkslow &amp; S3C2410_CLKSLOW_MPLL_OFF) ? "off" : "on",</div><div class='del'>-	       (clkslow &amp; S3C2410_CLKSLOW_UCLK_OFF) ? "off" : "on");</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/clock.h b/arch/arm/mach-s3c2410/clock.h<br/>index 01bb458bf8eb..7f0ea03e1d49 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/clock.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/clock.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/clock.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/clock.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@ struct clk {</div><div class='ctx'> </div><div class='ctx'> 	int		    (*enable)(struct clk *, int enable);</div><div class='ctx'> 	int		    (*set_rate)(struct clk *c, unsigned long rate);</div><div class='add'>+	unsigned long	    (*get_rate)(struct clk *c);</div><div class='ctx'> 	unsigned long	    (*round_rate)(struct clk *c, unsigned long rate);</div><div class='ctx'> 	int		    (*set_parent)(struct clk *c, struct clk *parent);</div><div class='ctx'> };</div><div class='hunk'>@@ -36,6 +37,15 @@ extern struct clk s3c24xx_uclk;</div><div class='ctx'> </div><div class='ctx'> extern struct clk clk_usb_bus;</div><div class='ctx'> </div><div class='add'>+/* core clock support */</div><div class='add'>+</div><div class='add'>+extern struct clk clk_f;</div><div class='add'>+extern struct clk clk_h;</div><div class='add'>+extern struct clk clk_p;</div><div class='add'>+extern struct clk clk_mpll;</div><div class='add'>+extern struct clk clk_upll;</div><div class='add'>+extern struct clk clk_xtal;</div><div class='add'>+</div><div class='ctx'> /* exports for arch/arm/mach-s3c2410</div><div class='ctx'>  *</div><div class='ctx'>  * Please DO NOT use these outside of arch/arm/mach-s3c2410</div><div class='hunk'>@@ -43,7 +53,8 @@ extern struct clk clk_usb_bus;</div><div class='ctx'> </div><div class='ctx'> extern struct mutex clocks_mutex;</div><div class='ctx'> </div><div class='del'>-extern int s3c24xx_clkcon_enable(struct clk *clk, int enable);</div><div class='add'>+extern int s3c2410_clkcon_enable(struct clk *clk, int enable);</div><div class='add'>+</div><div class='ctx'> extern int s3c24xx_register_clock(struct clk *clk);</div><div class='ctx'> </div><div class='ctx'> extern int s3c24xx_setup_clocks(unsigned long xtal,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/common-smdk.c b/arch/arm/mach-s3c2410/common-smdk.c<br/>index c940890f621f..a40eaa656177 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/common-smdk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/common-smdk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/common-smdk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/common-smdk.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/leds-gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/nand.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,6 +42,66 @@</div><div class='ctx'> #include "devs.h"</div><div class='ctx'> #include "pm.h"</div><div class='ctx'> </div><div class='add'>+/* LED devices */</div><div class='add'>+</div><div class='add'>+static struct s3c24xx_led_platdata smdk_pdata_led4 = {</div><div class='add'>+	.gpio		= S3C2410_GPF4,</div><div class='add'>+	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,</div><div class='add'>+	.name		= "led4",</div><div class='add'>+	.def_trigger	= "timer",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c24xx_led_platdata smdk_pdata_led5 = {</div><div class='add'>+	.gpio		= S3C2410_GPF5,</div><div class='add'>+	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,</div><div class='add'>+	.name		= "led5",</div><div class='add'>+	.def_trigger	= "nand-disk",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c24xx_led_platdata smdk_pdata_led6 = {</div><div class='add'>+	.gpio		= S3C2410_GPF6,</div><div class='add'>+	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,</div><div class='add'>+	.name		= "led6",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c24xx_led_platdata smdk_pdata_led7 = {</div><div class='add'>+	.gpio		= S3C2410_GPF7,</div><div class='add'>+	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,</div><div class='add'>+	.name		= "led7",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smdk_led4 = {</div><div class='add'>+	.name		= "s3c24xx_led",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;smdk_pdata_led4,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smdk_led5 = {</div><div class='add'>+	.name		= "s3c24xx_led",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;smdk_pdata_led5,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smdk_led6 = {</div><div class='add'>+	.name		= "s3c24xx_led",</div><div class='add'>+	.id		= 2,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;smdk_pdata_led6,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device smdk_led7 = {</div><div class='add'>+	.name		= "s3c24xx_led",</div><div class='add'>+	.id		= 3,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data = &amp;smdk_pdata_led7,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* NAND parititon from 2.4.18-swl5 */</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition smdk_default_nand_part[] = {</div><div class='hunk'>@@ -111,6 +172,10 @@ static struct s3c2410_platform_nand smdk_nand_info = {</div><div class='ctx'> </div><div class='ctx'> static struct platform_device __initdata *smdk_devs[] = {</div><div class='ctx'> 	&amp;s3c_device_nand,</div><div class='add'>+	&amp;smdk_led4,</div><div class='add'>+	&amp;smdk_led5,</div><div class='add'>+	&amp;smdk_led6,</div><div class='add'>+	&amp;smdk_led7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init smdk_machine_init(void)</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/cpu.c b/arch/arm/mach-s3c2410/cpu.c<br/>index 70c34fcf7858..1c3c6adae6c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/cpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/cpu.c</a></div><div class='hunk'>@@ -37,12 +37,17 @@</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cpu.h"</div><div class='add'>+#include "devs.h"</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> #include "s3c2400.h"</div><div class='ctx'> #include "s3c2410.h"</div><div class='add'>+#include "s3c2412.h"</div><div class='add'>+#include "s3c244x.h"</div><div class='ctx'> #include "s3c2440.h"</div><div class='add'>+#include "s3c2442.h"</div><div class='ctx'> </div><div class='ctx'> struct cpu_table {</div><div class='ctx'> 	unsigned long	idcode;</div><div class='hunk'>@@ -58,7 +63,9 @@ struct cpu_table {</div><div class='ctx'> </div><div class='ctx'> static const char name_s3c2400[]  = "S3C2400";</div><div class='ctx'> static const char name_s3c2410[]  = "S3C2410";</div><div class='add'>+static const char name_s3c2412[]  = "S3C2412";</div><div class='ctx'> static const char name_s3c2440[]  = "S3C2440";</div><div class='add'>+static const char name_s3c2442[]  = "S3C2442";</div><div class='ctx'> static const char name_s3c2410a[] = "S3C2410A";</div><div class='ctx'> static const char name_s3c2440a[] = "S3C2440A";</div><div class='ctx'> </div><div class='hunk'>@@ -84,22 +91,40 @@ static struct cpu_table cpu_ids[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.idcode		= 0x32440000,</div><div class='ctx'> 		.idmask		= 0xffffffff,</div><div class='del'>-		.map_io		= s3c2440_map_io,</div><div class='del'>-		.init_clocks	= s3c2440_init_clocks,</div><div class='del'>-		.init_uarts	= s3c2440_init_uarts,</div><div class='add'>+		.map_io		= s3c244x_map_io,</div><div class='add'>+		.init_clocks	= s3c244x_init_clocks,</div><div class='add'>+		.init_uarts	= s3c244x_init_uarts,</div><div class='ctx'> 		.init		= s3c2440_init,</div><div class='ctx'> 		.name		= name_s3c2440</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.idcode		= 0x32440001,</div><div class='ctx'> 		.idmask		= 0xffffffff,</div><div class='del'>-		.map_io		= s3c2440_map_io,</div><div class='del'>-		.init_clocks	= s3c2440_init_clocks,</div><div class='del'>-		.init_uarts	= s3c2440_init_uarts,</div><div class='add'>+		.map_io		= s3c244x_map_io,</div><div class='add'>+		.init_clocks	= s3c244x_init_clocks,</div><div class='add'>+		.init_uarts	= s3c244x_init_uarts,</div><div class='ctx'> 		.init		= s3c2440_init,</div><div class='ctx'> 		.name		= name_s3c2440a</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+		.idcode		= 0x32440aaa,</div><div class='add'>+		.idmask		= 0xffffffff,</div><div class='add'>+		.map_io		= s3c244x_map_io,</div><div class='add'>+		.init_clocks	= s3c244x_init_clocks,</div><div class='add'>+		.init_uarts	= s3c244x_init_uarts,</div><div class='add'>+		.init		= s3c2442_init,</div><div class='add'>+		.name		= name_s3c2442</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.idcode		= 0x32412001,</div><div class='add'>+		.idmask		= 0xffffffff,</div><div class='add'>+		.map_io		= s3c2412_map_io,</div><div class='add'>+		.init_clocks	= s3c2412_init_clocks,</div><div class='add'>+		.init_uarts	= s3c2412_init_uarts,</div><div class='add'>+		.init		= s3c2412_init,</div><div class='add'>+		.name		= name_s3c2412,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='ctx'> 		.idcode		= 0x0,   /* S3C2400 doesn't have an idcode */</div><div class='ctx'> 		.idmask		= 0xffffffff,</div><div class='ctx'> 		.map_io		= s3c2400_map_io,</div><div class='hunk'>@@ -157,6 +182,24 @@ void s3c24xx_set_board(struct s3c24xx_board *b)</div><div class='ctx'> </div><div class='ctx'> static struct cpu_table *cpu;</div><div class='ctx'> </div><div class='add'>+static unsigned long s3c24xx_read_idcode_v5(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)</div><div class='add'>+	return __raw_readl(S3C2412_GSTATUS1);</div><div class='add'>+#else</div><div class='add'>+	return 1UL;	/* don't look like an 2400 */</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long s3c24xx_read_idcode_v4(void)</div><div class='add'>+{</div><div class='add'>+#ifndef CONFIG_CPU_S3C2400</div><div class='add'>+	return __raw_readl(S3C2410_GSTATUS1);</div><div class='add'>+#else</div><div class='add'>+	return 0UL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long idcode = 0x0;</div><div class='hunk'>@@ -164,9 +207,11 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> 	/* initialise the io descriptors we need for initialisation */</div><div class='ctx'> 	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_CPU_S3C2400</div><div class='del'>-	idcode = __raw_readl(S3C2410_GSTATUS1);</div><div class='del'>-#endif</div><div class='add'>+	if (cpu_architecture() &gt;= CPU_ARCH_ARMv5) {</div><div class='add'>+		idcode = s3c24xx_read_idcode_v5();</div><div class='add'>+	} else {</div><div class='add'>+		idcode = s3c24xx_read_idcode_v4();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cpu = s3c_lookup_cpu(idcode);</div><div class='ctx'> </div><div class='hunk'>@@ -175,13 +220,13 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)</div><div class='ctx'> 		panic("Unknown S3C24XX CPU");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	printk("CPU %s (id 0x%08lx)\n", cpu-&gt;name, idcode);</div><div class='add'>+</div><div class='ctx'> 	if (cpu-&gt;map_io == NULL || cpu-&gt;init == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "CPU %s support not enabled\n", cpu-&gt;name);</div><div class='ctx'> 		panic("Unsupported S3C24XX CPU");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("CPU %s (id 0x%08lx)\n", cpu-&gt;name, idcode);</div><div class='del'>-</div><div class='ctx'> 	(cpu-&gt;map_io)(mach_desc, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -208,6 +253,49 @@ void __init s3c24xx_init_clocks(int xtal)</div><div class='ctx'> 		(cpu-&gt;init_clocks)(xtal);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* uart management */</div><div class='add'>+</div><div class='add'>+static int nr_uarts __initdata = 0;</div><div class='add'>+</div><div class='add'>+static struct s3c2410_uartcfg uart_cfgs[3];</div><div class='add'>+</div><div class='add'>+/* s3c24xx_init_uartdevs</div><div class='add'>+ *</div><div class='add'>+ * copy the specified platform data and configuration into our central</div><div class='add'>+ * set of devices, before the data is thrown away after the init process.</div><div class='add'>+ *</div><div class='add'>+ * This also fills in the array passed to the serial driver for the</div><div class='add'>+ * early initialisation of the console.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void __init s3c24xx_init_uartdevs(char *name,</div><div class='add'>+				  struct s3c24xx_uart_resources *res,</div><div class='add'>+				  struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *platdev;</div><div class='add'>+	struct s3c2410_uartcfg *cfgptr = uart_cfgs;</div><div class='add'>+	struct s3c24xx_uart_resources *resp;</div><div class='add'>+	int uart;</div><div class='add'>+</div><div class='add'>+	memcpy(cfgptr, cfg, sizeof(struct s3c2410_uartcfg) * no);</div><div class='add'>+</div><div class='add'>+	for (uart = 0; uart &lt; no; uart++, cfg++, cfgptr++) {</div><div class='add'>+		platdev = s3c24xx_uart_src[cfgptr-&gt;hwport];</div><div class='add'>+</div><div class='add'>+		resp = res + cfgptr-&gt;hwport;</div><div class='add'>+</div><div class='add'>+		s3c24xx_uart_devs[uart] = platdev;</div><div class='add'>+</div><div class='add'>+		platdev-&gt;name = name;</div><div class='add'>+		platdev-&gt;resource = resp-&gt;resources;</div><div class='add'>+		platdev-&gt;num_resources = resp-&gt;nr_resources;</div><div class='add'>+</div><div class='add'>+		platdev-&gt;dev.platform_data = cfgptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nr_uarts = no;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu == NULL)</div><div class='hunk'>@@ -232,6 +320,10 @@ static int __init s3c_arch_init(void)</div><div class='ctx'> 	if (ret != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	ret = platform_add_devices(s3c24xx_uart_devs, nr_uarts);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	if (board != NULL) {</div><div class='ctx'> 		struct platform_device **ptr = board-&gt;devices;</div><div class='ctx'> 		int i;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/cpu.h b/arch/arm/mach-s3c2410/cpu.h<br/>index fc1067783f6d..b0ed9d2d141b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/cpu.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/cpu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/cpu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/cpu.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'> #define print_mhz(m) ((m) / MHZ), ((m / 1000) % 1000)</div><div class='ctx'> </div><div class='ctx'> /* forward declaration */</div><div class='add'>+struct s3c24xx_uart_resources;</div><div class='add'>+struct platform_device;</div><div class='ctx'> struct s3c2410_uartcfg;</div><div class='ctx'> struct map_desc;</div><div class='ctx'> </div><div class='hunk'>@@ -44,6 +46,10 @@ extern void s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='ctx'> </div><div class='ctx'> extern void s3c24xx_init_clocks(int xtal);</div><div class='ctx'> </div><div class='add'>+extern void s3c24xx_init_uartdevs(char *name,</div><div class='add'>+				  struct s3c24xx_uart_resources *res,</div><div class='add'>+				  struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='ctx'> /* the board structure is used at first initialsation time</div><div class='ctx'>  * to get info such as the devices to register for this</div><div class='ctx'>  * board. This is done because platfrom_add_devices() cannot</div><div class='hunk'>@@ -67,4 +73,7 @@ extern struct sys_timer s3c24xx_timer;</div><div class='ctx'> </div><div class='ctx'> /* system device classes */</div><div class='ctx'> </div><div class='add'>+extern struct sysdev_class s3c2410_sysclass;</div><div class='add'>+extern struct sysdev_class s3c2412_sysclass;</div><div class='ctx'> extern struct sysdev_class s3c2440_sysclass;</div><div class='add'>+extern struct sysdev_class s3c2442_sysclass;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c<br/>index ca09ba516e4c..ad3845e329ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/devs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/devs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/devs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/devs.c</a></div><div class='hunk'>@@ -38,10 +38,86 @@</div><div class='ctx'> #include &lt;asm/arch/regs-serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "devs.h"</div><div class='add'>+#include "cpu.h"</div><div class='ctx'> </div><div class='ctx'> /* Serial port registrations */</div><div class='ctx'> </div><div class='del'>-struct platform_device *s3c24xx_uart_devs[3];</div><div class='add'>+static struct resource s3c2410_uart0_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = S3C2410_PA_UART0,</div><div class='add'>+		.end   = S3C2410_PA_UART0 + 0x3fff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = IRQ_S3CUART_RX0,</div><div class='add'>+		.end   = IRQ_S3CUART_ERR0,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource s3c2410_uart1_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = S3C2410_PA_UART1,</div><div class='add'>+		.end   = S3C2410_PA_UART1 + 0x3fff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = IRQ_S3CUART_RX1,</div><div class='add'>+		.end   = IRQ_S3CUART_ERR1,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource s3c2410_uart2_resource[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.start = S3C2410_PA_UART2,</div><div class='add'>+		.end   = S3C2410_PA_UART2 + 0x3fff,</div><div class='add'>+		.flags = IORESOURCE_MEM,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.start = IRQ_S3CUART_RX2,</div><div class='add'>+		.end   = IRQ_S3CUART_ERR2,</div><div class='add'>+		.flags = IORESOURCE_IRQ,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.resources	= s3c2410_uart0_resource,</div><div class='add'>+		.nr_resources	= ARRAY_SIZE(s3c2410_uart0_resource),</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.resources	= s3c2410_uart1_resource,</div><div class='add'>+		.nr_resources	= ARRAY_SIZE(s3c2410_uart1_resource),</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.resources	= s3c2410_uart2_resource,</div><div class='add'>+		.nr_resources	= ARRAY_SIZE(s3c2410_uart2_resource),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* yart devices */</div><div class='add'>+</div><div class='add'>+static struct platform_device s3c24xx_uart_device0 = {</div><div class='add'>+	.id		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device s3c24xx_uart_device1 = {</div><div class='add'>+	.id		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device s3c24xx_uart_device2 = {</div><div class='add'>+	.id		= 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device *s3c24xx_uart_src[3] = {</div><div class='add'>+	&amp;s3c24xx_uart_device0,</div><div class='add'>+	&amp;s3c24xx_uart_device1,</div><div class='add'>+	&amp;s3c24xx_uart_device2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device *s3c24xx_uart_devs[3] = {</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* USB Host Controller */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/devs.h b/arch/arm/mach-s3c2410/devs.h<br/>index 52c4bab5c761..726e2eaf8797 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/devs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/devs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/devs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/devs.h</a></div><div class='hunk'>@@ -14,10 +14,17 @@</div><div class='ctx'>  *	27-Aug-2004 BJD  Added timers 0 through 3</div><div class='ctx'>  *	10-Feb-2005 BJD	 Added camera from guillaume.gourat@nexvision.tv</div><div class='ctx'> */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='add'>+struct s3c24xx_uart_resources {</div><div class='add'>+	struct resource		*resources;</div><div class='add'>+	unsigned long		 nr_resources;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct s3c24xx_uart_resources s3c2410_uart_resources[];</div><div class='add'>+</div><div class='ctx'> extern struct platform_device *s3c24xx_uart_devs[];</div><div class='add'>+extern struct platform_device *s3c24xx_uart_src[];</div><div class='ctx'> </div><div class='ctx'> extern struct platform_device s3c_device_usb;</div><div class='ctx'> extern struct platform_device s3c_device_lcd;</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c<br/>index 4dbd8e758ea6..094cc52745c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/dma.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * possible DMA function</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_S3C2410_DMA_DEBUG</div><div class='ctx'> #define DEBUG</div><div class='hunk'>@@ -719,7 +718,7 @@ int s3c2410_dma_request(unsigned int channel, s3c2410_dma_client_t *client,</div><div class='ctx'> 		pr_debug("dma%d: %s : requesting irq %d\n",</div><div class='ctx'> 			 channel, __FUNCTION__, chan-&gt;irq);</div><div class='ctx'> </div><div class='del'>-		err = request_irq(chan-&gt;irq, s3c2410_dma_irq, SA_INTERRUPT,</div><div class='add'>+		err = request_irq(chan-&gt;irq, s3c2410_dma_irq, IRQF_DISABLED,</div><div class='ctx'> 				  client-&gt;name, (void *)chan);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c<br/>index 66d8c068e940..6822dc7f7799 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/irq.c</a></div><div class='hunk'>@@ -191,13 +191,9 @@ static struct irqchip s3c_irq_chip = {</div><div class='ctx'> 	.ack	   = s3c_irq_ack,</div><div class='ctx'> 	.mask	   = s3c_irq_mask,</div><div class='ctx'> 	.unmask	   = s3c_irq_unmask,</div><div class='del'>-	.set_wake	   = s3c_irq_wake</div><div class='add'>+	.set_wake  = s3c_irq_wake</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* S3C2410_EINTMASK</div><div class='del'>- * S3C2410_EINTPEND</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> s3c_irqext_mask(unsigned int irqno)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,9 +201,9 @@ s3c_irqext_mask(unsigned int irqno)</div><div class='ctx'> </div><div class='ctx'> 	irqno -= EXTINT_OFF;</div><div class='ctx'> </div><div class='del'>-	mask = __raw_readl(S3C2410_EINTMASK);</div><div class='add'>+	mask = __raw_readl(S3C24XX_EINTMASK);</div><div class='ctx'> 	mask |= ( 1UL &lt;&lt; irqno);</div><div class='del'>-	__raw_writel(mask, S3C2410_EINTMASK);</div><div class='add'>+	__raw_writel(mask, S3C24XX_EINTMASK);</div><div class='ctx'> </div><div class='ctx'> 	if (irqno &lt;= (IRQ_EINT7 - EXTINT_OFF)) {</div><div class='ctx'> 		/* check to see if all need masking */</div><div class='hunk'>@@ -232,11 +228,11 @@ s3c_irqext_ack(unsigned int irqno)</div><div class='ctx'> 	bit = 1UL &lt;&lt; (irqno - EXTINT_OFF);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	mask = __raw_readl(S3C2410_EINTMASK);</div><div class='add'>+	mask = __raw_readl(S3C24XX_EINTMASK);</div><div class='ctx'> </div><div class='del'>-	__raw_writel(bit, S3C2410_EINTPEND);</div><div class='add'>+	__raw_writel(bit, S3C24XX_EINTPEND);</div><div class='ctx'> </div><div class='del'>-	req = __raw_readl(S3C2410_EINTPEND);</div><div class='add'>+	req = __raw_readl(S3C24XX_EINTPEND);</div><div class='ctx'> 	req &amp;= ~mask;</div><div class='ctx'> </div><div class='ctx'> 	/* not sure if we should be acking the parent irq... */</div><div class='hunk'>@@ -257,9 +253,9 @@ s3c_irqext_unmask(unsigned int irqno)</div><div class='ctx'> </div><div class='ctx'> 	irqno -= EXTINT_OFF;</div><div class='ctx'> </div><div class='del'>-	mask = __raw_readl(S3C2410_EINTMASK);</div><div class='add'>+	mask = __raw_readl(S3C24XX_EINTMASK);</div><div class='ctx'> 	mask &amp;= ~( 1UL &lt;&lt; irqno);</div><div class='del'>-	__raw_writel(mask, S3C2410_EINTMASK);</div><div class='add'>+	__raw_writel(mask, S3C24XX_EINTMASK);</div><div class='ctx'> </div><div class='ctx'> 	s3c_irq_unmask((irqno &lt;= (IRQ_EINT7 - EXTINT_OFF)) ? IRQ_EINT4t7 : IRQ_EINT8t23);</div><div class='ctx'> }</div><div class='hunk'>@@ -275,28 +271,28 @@ s3c_irqext_type(unsigned int irq, unsigned int type)</div><div class='ctx'> 	if ((irq &gt;= IRQ_EINT0) &amp;&amp; (irq &lt;= IRQ_EINT3))</div><div class='ctx'> 	{</div><div class='ctx'> 		gpcon_reg = S3C2410_GPFCON;</div><div class='del'>-		extint_reg = S3C2410_EXTINT0;</div><div class='add'>+		extint_reg = S3C24XX_EXTINT0;</div><div class='ctx'> 		gpcon_offset = (irq - IRQ_EINT0) * 2;</div><div class='ctx'> 		extint_offset = (irq - IRQ_EINT0) * 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	else if ((irq &gt;= IRQ_EINT4) &amp;&amp; (irq &lt;= IRQ_EINT7))</div><div class='ctx'> 	{</div><div class='ctx'> 		gpcon_reg = S3C2410_GPFCON;</div><div class='del'>-		extint_reg = S3C2410_EXTINT0;</div><div class='add'>+		extint_reg = S3C24XX_EXTINT0;</div><div class='ctx'> 		gpcon_offset = (irq - (EXTINT_OFF)) * 2;</div><div class='ctx'> 		extint_offset = (irq - (EXTINT_OFF)) * 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	else if ((irq &gt;= IRQ_EINT8) &amp;&amp; (irq &lt;= IRQ_EINT15))</div><div class='ctx'> 	{</div><div class='ctx'> 		gpcon_reg = S3C2410_GPGCON;</div><div class='del'>-		extint_reg = S3C2410_EXTINT1;</div><div class='add'>+		extint_reg = S3C24XX_EXTINT1;</div><div class='ctx'> 		gpcon_offset = (irq - IRQ_EINT8) * 2;</div><div class='ctx'> 		extint_offset = (irq - IRQ_EINT8) * 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	else if ((irq &gt;= IRQ_EINT16) &amp;&amp; (irq &lt;= IRQ_EINT23))</div><div class='ctx'> 	{</div><div class='ctx'> 		gpcon_reg = S3C2410_GPGCON;</div><div class='del'>-		extint_reg = S3C2410_EXTINT2;</div><div class='add'>+		extint_reg = S3C24XX_EXTINT2;</div><div class='ctx'> 		gpcon_offset = (irq - IRQ_EINT8) * 2;</div><div class='ctx'> 		extint_offset = (irq - IRQ_EINT16) * 4;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -572,6 +568,23 @@ s3c_irq_demux_uart2(unsigned int irq,</div><div class='ctx'> 	s3c_irq_demux_uart(IRQ_S3CUART_RX2, regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+s3c_irq_demux_extint(unsigned int irq,</div><div class='add'>+		     struct irqdesc *desc,</div><div class='add'>+		     struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned long eintpnd = __raw_readl(S3C24XX_EINTPEND);</div><div class='add'>+	unsigned long eintmsk = __raw_readl(S3C24XX_EINTMASK);</div><div class='add'>+</div><div class='add'>+	eintpnd &amp;= ~eintmsk;</div><div class='add'>+</div><div class='add'>+	if (eintpnd) {</div><div class='add'>+		irq = fls(eintpnd);</div><div class='add'>+		irq += (IRQ_EINT4 - (4 + 1));</div><div class='add'>+</div><div class='add'>+		desc_handle_irq(irq, irq_desc + irq, regs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* s3c24xx_init_irq</div><div class='ctx'>  *</div><div class='hunk'>@@ -591,12 +604,12 @@ void __init s3c24xx_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	last = 0;</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		pend = __raw_readl(S3C2410_EINTPEND);</div><div class='add'>+		pend = __raw_readl(S3C24XX_EINTPEND);</div><div class='ctx'> </div><div class='ctx'> 		if (pend == 0 || pend == last)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		__raw_writel(pend, S3C2410_EINTPEND);</div><div class='add'>+		__raw_writel(pend, S3C24XX_EINTPEND);</div><div class='ctx'> 		printk("irq: clearing pending ext status %08x\n", (int)pend);</div><div class='ctx'> 		last = pend;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -630,12 +643,14 @@ void __init s3c24xx_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	irqdbf("s3c2410_init_irq: registering s3c2410 interrupt handlers\n");</div><div class='ctx'> </div><div class='del'>-	for (irqno = IRQ_BATT_FLT; irqno &lt;= IRQ_ADCPARENT; irqno++) {</div><div class='add'>+	for (irqno = IRQ_EINT4t7; irqno &lt;= IRQ_ADCPARENT; irqno++) {</div><div class='ctx'> 		/* set all the s3c2410 internal irqs */</div><div class='ctx'> </div><div class='ctx'> 		switch (irqno) {</div><div class='ctx'> 			/* deal with the special IRQs (cascaded) */</div><div class='ctx'> </div><div class='add'>+		case IRQ_EINT4t7:</div><div class='add'>+		case IRQ_EINT8t23:</div><div class='ctx'> 		case IRQ_UART0:</div><div class='ctx'> 		case IRQ_UART1:</div><div class='ctx'> 		case IRQ_UART2:</div><div class='hunk'>@@ -659,12 +674,14 @@ void __init s3c24xx_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	/* setup the cascade irq handlers */</div><div class='ctx'> </div><div class='add'>+	set_irq_chained_handler(IRQ_EINT4t7, s3c_irq_demux_extint);</div><div class='add'>+	set_irq_chained_handler(IRQ_EINT8t23, s3c_irq_demux_extint);</div><div class='add'>+</div><div class='ctx'> 	set_irq_chained_handler(IRQ_UART0, s3c_irq_demux_uart0);</div><div class='ctx'> 	set_irq_chained_handler(IRQ_UART1, s3c_irq_demux_uart1);</div><div class='ctx'> 	set_irq_chained_handler(IRQ_UART2, s3c_irq_demux_uart2);</div><div class='ctx'> 	set_irq_chained_handler(IRQ_ADCPARENT, s3c_irq_demux_adc);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* external interrupts */</div><div class='ctx'> </div><div class='ctx'> 	for (irqno = IRQ_EINT0; irqno &lt;= IRQ_EINT3; irqno++) {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-anubis.c b/arch/arm/mach-s3c2410/mach-anubis.c<br/>index cc97fbf66291..4a92d6f92d6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-anubis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-anubis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-anubis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-anubis.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg anubis_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='hunk'>@@ -239,6 +239,54 @@ static struct s3c2410_platform_nand anubis_nand_info = {</div><div class='ctx'> 	.select_chip	= anubis_nand_select,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* IDE channels */</div><div class='add'>+</div><div class='add'>+static struct resource anubis_ide0_resource[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= S3C2410_CS3,</div><div class='add'>+		.end	= S3C2410_CS3 + (8*32) - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= S3C2410_CS3 + (1&lt;&lt;26),</div><div class='add'>+		.end	= S3C2410_CS3 + (1&lt;&lt;26) + (8*32) - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_IDE0,</div><div class='add'>+		.end	= IRQ_IDE0,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device anubis_device_ide0 = {</div><div class='add'>+	.name		= "simtec-ide",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(anubis_ide0_resource),</div><div class='add'>+	.resource	= anubis_ide0_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource anubis_ide1_resource[] = {</div><div class='add'>+	{</div><div class='add'>+		.start	= S3C2410_CS4,</div><div class='add'>+		.end	= S3C2410_CS4 + (8*32) - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= S3C2410_CS4 + (1&lt;&lt;26),</div><div class='add'>+		.end	= S3C2410_CS4 + (1&lt;&lt;26) + (8*32) - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM,</div><div class='add'>+	}, {</div><div class='add'>+		.start	= IRQ_IDE0,</div><div class='add'>+		.end	= IRQ_IDE0,</div><div class='add'>+		.flags	= IORESOURCE_IRQ,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct platform_device anubis_device_ide1 = {</div><div class='add'>+	.name		= "simtec-ide",</div><div class='add'>+	.id		= 1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(anubis_ide1_resource),</div><div class='add'>+	.resource	= anubis_ide1_resource,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Standard Anubis devices */</div><div class='ctx'> </div><div class='hunk'>@@ -249,6 +297,8 @@ static struct platform_device *anubis_devices[] __initdata = {</div><div class='ctx'> 	&amp;s3c_device_i2c,</div><div class='ctx'>  	&amp;s3c_device_rtc,</div><div class='ctx'> 	&amp;s3c_device_nand,</div><div class='add'>+	&amp;anubis_device_ide0,</div><div class='add'>+	&amp;anubis_device_ide1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct clk *anubis_clocks[] = {</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c<br/>index 995bb8add331..947234df8160 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-bast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-bast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-bast.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ static struct s3c24xx_uart_clksrc bast_serial_clocks[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg bast_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c<br/>index 646a3a5d33a5..aec431b2830a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-h1940.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-h1940.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-h1940.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static struct map_desc h1940_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg h1940_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg h1940_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c b/arch/arm/mach-s3c2410/mach-nexcoder.c<br/>index 07d09509a626..065a1d4e860b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-nexcoder.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-nexcoder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-nexcoder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-nexcoder.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ static struct map_desc nexcoder_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG12 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg nexcoder_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg nexcoder_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-osiris.c b/arch/arm/mach-s3c2410/mach-osiris.c<br/>index ae0787557751..858fd03c6bc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-osiris.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-osiris.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-osiris.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-osiris.c</a></div><div class='hunk'>@@ -95,8 +95,7 @@ static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct s3c2410_uartcfg osiris_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='hunk'>@@ -107,7 +106,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] = {</div><div class='ctx'> 		.clocks_size = ARRAY_SIZE(osiris_serial_clocks)</div><div class='ctx'> 	},</div><div class='ctx'> 	[1] = {</div><div class='del'>-		.hwport	     = 2,</div><div class='add'>+		.hwport	     = 1,</div><div class='ctx'> 		.flags	     = 0,</div><div class='ctx'> 		.ucon	     = UCON,</div><div class='ctx'> 		.ulcon	     = ULCON,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c<br/>index b39daedf93ca..c71673fd9955 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-otom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-otom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-otom.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ static struct map_desc otom11_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG12 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg otom11_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg otom11_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c<br/>index 2db932d72c5a..25f7e9f4dcee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-smdk2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-smdk2410.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ static struct map_desc smdk2410_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg smdk2410_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-smdk2413.c b/arch/arm/mach-s3c2410/mach-smdk2413.c<br/>new file mode 100644<br/>index 000000000000..b7ef7d3c54a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2413.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-smdk2413.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/mach-smdk2413.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Dimity Andric (TomTom) and Steven Ryu (Samsung) for the</div><div class='add'>+ * loans of SMDK2413 to work with.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/hardware/iomd.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+//#include &lt;asm/debug-ll.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-serial.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-lcd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/idle.h&gt;</div><div class='add'>+#include &lt;asm/arch/fb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "s3c2410.h"</div><div class='add'>+#include "s3c2412.h"</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "devs.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+</div><div class='add'>+#include "common-smdk.h"</div><div class='add'>+</div><div class='add'>+static struct map_desc smdk2413_iodesc[] __initdata = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c2410_uartcfg smdk2413_uartcfgs[] __initdata = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.hwport	     = 0,</div><div class='add'>+		.flags	     = 0,</div><div class='add'>+		.ucon	     = 0x3c5,</div><div class='add'>+		.ulcon	     = 0x03,</div><div class='add'>+		.ufcon	     = 0x51,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.hwport	     = 1,</div><div class='add'>+		.flags	     = 0,</div><div class='add'>+		.ucon	     = 0x3c5,</div><div class='add'>+		.ulcon	     = 0x03,</div><div class='add'>+		.ufcon	     = 0x51,</div><div class='add'>+	},</div><div class='add'>+	/* IR port */</div><div class='add'>+	[2] = {</div><div class='add'>+		.hwport	     = 2,</div><div class='add'>+		.flags	     = 0,</div><div class='add'>+		.ucon	     = 0x3c5,</div><div class='add'>+		.ulcon	     = 0x43,</div><div class='add'>+		.ufcon	     = 0x51,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *smdk2413_devices[] __initdata = {</div><div class='add'>+	&amp;s3c_device_usb,</div><div class='add'>+	//&amp;s3c_device_lcd,</div><div class='add'>+	&amp;s3c_device_wdt,</div><div class='add'>+	&amp;s3c_device_i2c,</div><div class='add'>+	&amp;s3c_device_iis,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct s3c24xx_board smdk2413_board __initdata = {</div><div class='add'>+	.devices       = smdk2413_devices,</div><div class='add'>+	.devices_count = ARRAY_SIZE(smdk2413_devices)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init smdk2413_fixup(struct machine_desc *desc,</div><div class='add'>+				  struct tag *tags, char **cmdline,</div><div class='add'>+				  struct meminfo *mi)</div><div class='add'>+{</div><div class='add'>+	if (tags != phys_to_virt(S3C2410_SDRAM_PA + 0x100)) {</div><div class='add'>+		mi-&gt;nr_banks=1;</div><div class='add'>+		mi-&gt;bank[0].start = 0x30000000;</div><div class='add'>+		mi-&gt;bank[0].size = SZ_64M;</div><div class='add'>+		mi-&gt;bank[0].node = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init smdk2413_map_io(void)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc));</div><div class='add'>+	s3c24xx_init_clocks(12000000);</div><div class='add'>+	s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs));</div><div class='add'>+	s3c24xx_set_board(&amp;smdk2413_board);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init smdk2413_machine_init(void)</div><div class='add'>+{</div><div class='add'>+	smdk_machine_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MACHINE_START(S3C2413, "SMDK2413")</div><div class='add'>+	/* Maintainer: Ben Dooks &lt;ben@fluff.org&gt; */</div><div class='add'>+	.phys_io	= S3C2410_PA_UART,</div><div class='add'>+	.io_pg_offst	= (((u32)S3C24XX_VA_UART) &gt;&gt; 18) &amp; 0xfffc,</div><div class='add'>+	.boot_params	= S3C2410_SDRAM_PA + 0x100,</div><div class='add'>+</div><div class='add'>+	.fixup		= smdk2413_fixup,</div><div class='add'>+	.init_irq	= s3c24xx_init_irq,</div><div class='add'>+	.map_io		= smdk2413_map_io,</div><div class='add'>+	.init_machine	= smdk2413_machine_init,</div><div class='add'>+	.timer		= &amp;s3c24xx_timer,</div><div class='add'>+MACHINE_END</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c<br/>index 5fffd1d51047..d661c6b7ff56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2440.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-smdk2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-smdk2440.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-smdk2440.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static struct map_desc smdk2440_iodesc[] __initdata = {</div><div class='ctx'> #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB</div><div class='ctx'> #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE</div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg smdk2440_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c<br/>index 785fc9cdcf7c..d18efb279d3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/mach-vr1000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/mach-vr1000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/mach-vr1000.c</a></div><div class='hunk'>@@ -166,7 +166,7 @@ static struct s3c24xx_uart_clksrc vr1000_serial_clocks[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct s3c2410_uartcfg vr1000_uartcfgs[] = {</div><div class='add'>+static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {</div><div class='ctx'> 	[0] = {</div><div class='ctx'> 		.hwport	     = 0,</div><div class='ctx'> 		.flags	     = 0,</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c<br/>index 4c7ccef6c207..7b244566a436 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm-simtec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/pm-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm-simtec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/pm-simtec.c</a></div><div class='hunk'>@@ -48,7 +48,8 @@ static __init int pm_simtec_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* check which machine we are running on */</div><div class='ctx'> </div><div class='del'>-	if (!machine_is_bast() &amp;&amp; !machine_is_vr1000() &amp;&amp; !machine_is_anubis())</div><div class='add'>+	if (!machine_is_bast() &amp;&amp; !machine_is_vr1000() &amp;&amp;</div><div class='add'>+	    !machine_is_anubis() &amp;&amp; !machine_is_osiris())</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c<br/>index fe57d966a34d..a589fe76d915 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/pm.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *     10-Mar-2005 LCVR  Changed S3C2410_VA_UART to S3C24XX_VA_UART</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -58,7 +57,11 @@ unsigned long s3c_pm_flags;</div><div class='ctx'> </div><div class='ctx'> /* cache functions from arch/arm/mm/proc-arm920.S */</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> extern void arm920_flush_kern_cache_all(void);</div><div class='add'>+#else</div><div class='add'>+static void arm920_flush_kern_cache_all(void) { }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define PFX "s3c24xx-pm: "</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410-clock.c b/arch/arm/mach-s3c2410/s3c2410-clock.c<br/>new file mode 100644<br/>index 000000000000..99718663318e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2410-clock.c</a></div><div class='hunk'>@@ -0,0 +1,271 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/clock.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * S3C2410,S3C2440,S3C2442 Clock control support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+</div><div class='add'>+int s3c2410_clkcon_enable(struct clk *clk, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int clocks = clk-&gt;ctrlbit;</div><div class='add'>+	unsigned long clkcon;</div><div class='add'>+</div><div class='add'>+	clkcon = __raw_readl(S3C2410_CLKCON);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		clkcon |= clocks;</div><div class='add'>+	else</div><div class='add'>+		clkcon &amp;= ~clocks;</div><div class='add'>+</div><div class='add'>+	/* ensure none of the special function bits set */</div><div class='add'>+	clkcon &amp;= ~(S3C2410_CLKCON_IDLE|S3C2410_CLKCON_POWER);</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkcon, S3C2410_CLKCON);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2410_upll_enable(struct clk *clk, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long clkslow = __raw_readl(S3C2410_CLKSLOW);</div><div class='add'>+	unsigned long orig = clkslow;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		clkslow &amp;= ~S3C2410_CLKSLOW_UCLK_OFF;</div><div class='add'>+	else</div><div class='add'>+		clkslow |= S3C2410_CLKSLOW_UCLK_OFF;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkslow, S3C2410_CLKSLOW);</div><div class='add'>+</div><div class='add'>+	/* if we started the UPLL, then allow to settle */</div><div class='add'>+</div><div class='add'>+	if (enable &amp;&amp; (orig &amp; S3C2410_CLKSLOW_UCLK_OFF))</div><div class='add'>+		udelay(200);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* standard clock definitions */</div><div class='add'>+</div><div class='add'>+static struct clk init_clocks_disable[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "nand",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_NAND,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "sdi",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_SDI,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "adc",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_ADC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "i2c",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_IIC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "iis",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_IIS,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "spi",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_SPI,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk init_clocks[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "lcd",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_LCDC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "gpio",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_GPIO,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-host",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_USBH,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-device",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_USBD,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "timers",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_PWMT,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "uart",</div><div class='add'>+		.id		= 0,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_UART0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "uart",</div><div class='add'>+		.id		= 1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_UART1,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "uart",</div><div class='add'>+		.id		= 2,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_UART2,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "rtc",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2410_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2410_CLKCON_RTC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "watchdog",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.ctrlbit	= 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-bus-host",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_usb_bus,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-bus-gadget",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_usb_bus,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* s3c2410_baseclk_add()</div><div class='add'>+ *</div><div class='add'>+ * Add all the clocks used by the s3c2410 or compatible CPUs</div><div class='add'>+ * such as the S3C2440 and S3C2442.</div><div class='add'>+ *</div><div class='add'>+ * We cannot use a system device as we are needed before any</div><div class='add'>+ * of the init-calls that initialise the devices are actually</div><div class='add'>+ * done.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int __init s3c2410_baseclk_add(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long clkslow = __raw_readl(S3C2410_CLKSLOW);</div><div class='add'>+	unsigned long clkcon  = __raw_readl(S3C2410_CLKCON);</div><div class='add'>+	struct clk *clkp;</div><div class='add'>+	struct clk *xtal;</div><div class='add'>+	int ret;</div><div class='add'>+	int ptr;</div><div class='add'>+</div><div class='add'>+	clk_upll.enable = s3c2410_upll_enable;</div><div class='add'>+</div><div class='add'>+	if (s3c24xx_register_clock(&amp;clk_usb_bus) &lt; 0)</div><div class='add'>+		printk(KERN_ERR "failed to register usb bus clock\n");</div><div class='add'>+</div><div class='add'>+	/* register clocks from clock array */</div><div class='add'>+</div><div class='add'>+	clkp = init_clocks;</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(init_clocks); ptr++, clkp++) {</div><div class='add'>+		/* ensure that we note the clock state */</div><div class='add'>+</div><div class='add'>+		clkp-&gt;usage = clkcon &amp; clkp-&gt;ctrlbit ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		ret = s3c24xx_register_clock(clkp);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='add'>+			       clkp-&gt;name, ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We must be careful disabling the clocks we are not intending to</div><div class='add'>+	 * be using at boot time, as subsytems such as the LCD which do</div><div class='add'>+	 * their own DMA requests to the bus can cause the system to lockup</div><div class='add'>+	 * if they where in the middle of requesting bus access.</div><div class='add'>+	 *</div><div class='add'>+	 * Disabling the LCD clock if the LCD is active is very dangerous,</div><div class='add'>+	 * and therefore the bootloader should be careful to not enable</div><div class='add'>+	 * the LCD clock if it is not needed.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* install (and disable) the clocks we do not need immediately */</div><div class='add'>+</div><div class='add'>+	clkp = init_clocks_disable;</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {</div><div class='add'>+</div><div class='add'>+		ret = s3c24xx_register_clock(clkp);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='add'>+			       clkp-&gt;name, ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		s3c2410_clkcon_enable(clkp, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* show the clock-slow value */</div><div class='add'>+</div><div class='add'>+	xtal = clk_get(NULL, "xtal");</div><div class='add'>+</div><div class='add'>+	printk("CLOCK: Slow mode (%ld.%ld MHz), %s, MPLL %s, UPLL %s\n",</div><div class='add'>+	       print_mhz(clk_get_rate(xtal) /</div><div class='add'>+			 ( 2 * S3C2410_CLKSLOW_GET_SLOWVAL(clkslow))),</div><div class='add'>+	       (clkslow &amp; S3C2410_CLKSLOW_SLOW) ? "slow" : "fast",</div><div class='add'>+	       (clkslow &amp; S3C2410_CLKSLOW_MPLL_OFF) ? "off" : "on",</div><div class='add'>+	       (clkslow &amp; S3C2410_CLKSLOW_UCLK_OFF) ? "off" : "on");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c<br/>index d5e1caea1d23..471a71490010 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410-gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410-gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410-gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2410-gpio.c</a></div><div class='hunk'>@@ -18,9 +18,6 @@</div><div class='ctx'>  * You should have received a copy of the GNU General Public License</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- *</div><div class='del'>- * Changelog</div><div class='del'>- *	15-Jan-2006  LCVR  Splitted from gpio.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -38,7 +35,7 @@</div><div class='ctx'> int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,</div><div class='ctx'> 			   unsigned int config)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *reg = S3C2410_EINFLT0;</div><div class='add'>+	void __iomem *reg = S3C24XX_EINFLT0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long val;</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +44,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,</div><div class='ctx'> </div><div class='ctx'> 	config &amp;= 0xff;</div><div class='ctx'> </div><div class='del'>-	pin -= S3C2410_GPG8_EINT16;</div><div class='add'>+	pin -= S3C2410_GPG8;</div><div class='ctx'> 	reg += pin &amp; ~3;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='hunk'>@@ -61,10 +58,10 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,</div><div class='ctx'> </div><div class='ctx'> 	/* update filter enable */</div><div class='ctx'> </div><div class='del'>-	val = __raw_readl(S3C2410_EXTINT2);</div><div class='add'>+	val = __raw_readl(S3C24XX_EXTINT2);</div><div class='ctx'> 	val &amp;= ~(1 &lt;&lt; ((pin * 4) + 3));</div><div class='ctx'> 	val |= on &lt;&lt; ((pin * 4) + 3);</div><div class='del'>-	__raw_writel(val, S3C2410_EXTINT2);</div><div class='add'>+	__raw_writel(val, S3C24XX_EXTINT2);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +72,7 @@ EXPORT_SYMBOL(s3c2410_gpio_irqfilter);</div><div class='ctx'> </div><div class='ctx'> int s3c2410_gpio_getirq(unsigned int pin)</div><div class='ctx'> {</div><div class='del'>-	if (pin &lt; S3C2410_GPF0 || pin &gt; S3C2410_GPG15_EINT23)</div><div class='add'>+	if (pin &lt; S3C2410_GPF0 || pin &gt; S3C2410_GPG15)</div><div class='ctx'> 		return -1;	/* not valid interrupts */</div><div class='ctx'> </div><div class='ctx'> 	if (pin &lt; S3C2410_GPG0 &amp;&amp; pin &gt; S3C2410_GPF7)</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c<br/>index 0a2013a76549..a110cff9cf6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2410.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='hunk'>@@ -42,6 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "s3c2410.h"</div><div class='ctx'> #include "cpu.h"</div><div class='add'>+#include "devs.h"</div><div class='ctx'> #include "clock.h"</div><div class='ctx'> </div><div class='ctx'> /* Initial IO mappings */</div><div class='hunk'>@@ -55,93 +57,13 @@ static struct map_desc s3c2410_iodesc[] __initdata = {</div><div class='ctx'> 	IODESC_ENT(WATCHDOG),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct resource s3c_uart0_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C2410_PA_UART0,</div><div class='del'>-		.end   = S3C2410_PA_UART0 + 0x3fff,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = IRQ_S3CUART_RX0,</div><div class='del'>-		.end   = IRQ_S3CUART_ERR0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s3c_uart1_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C2410_PA_UART1,</div><div class='del'>-		.end   = S3C2410_PA_UART1 + 0x3fff,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = IRQ_S3CUART_RX1,</div><div class='del'>-		.end   = IRQ_S3CUART_ERR1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s3c_uart2_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C2410_PA_UART2,</div><div class='del'>-		.end   = S3C2410_PA_UART2 + 0x3fff,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = IRQ_S3CUART_RX2,</div><div class='del'>-		.end   = IRQ_S3CUART_ERR2,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* our uart devices */</div><div class='ctx'> </div><div class='del'>-static struct platform_device s3c_uart0 = {</div><div class='del'>-	.name		  = "s3c2410-uart",</div><div class='del'>-	.id		  = 0,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c_uart0_resource),</div><div class='del'>-	.resource	  = s3c_uart0_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct platform_device s3c_uart1 = {</div><div class='del'>-	.name		  = "s3c2410-uart",</div><div class='del'>-	.id		  = 1,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c_uart1_resource),</div><div class='del'>-	.resource	  = s3c_uart1_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device s3c_uart2 = {</div><div class='del'>-	.name		  = "s3c2410-uart",</div><div class='del'>-	.id		  = 2,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c_uart2_resource),</div><div class='del'>-	.resource	  = s3c_uart2_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *uart_devices[] __initdata = {</div><div class='del'>-	&amp;s3c_uart0,</div><div class='del'>-	&amp;s3c_uart1,</div><div class='del'>-	&amp;s3c_uart2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int s3c2410_uart_count = 0;</div><div class='del'>-</div><div class='ctx'> /* uart registration process */</div><div class='ctx'> </div><div class='ctx'> void __init s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *platdev;</div><div class='del'>-	int uart;</div><div class='del'>-</div><div class='del'>-	for (uart = 0; uart &lt; no; uart++, cfg++) {</div><div class='del'>-		platdev = uart_devices[cfg-&gt;hwport];</div><div class='del'>-</div><div class='del'>-		s3c24xx_uart_devs[uart] = platdev;</div><div class='del'>-		platdev-&gt;dev.platform_data = cfg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c2410_uart_count = uart;</div><div class='add'>+	s3c24xx_init_uartdevs("s3c2410-uart", s3c2410_uart_resources, cfg, no);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* s3c2410_map_io</div><div class='hunk'>@@ -187,11 +109,33 @@ void __init s3c2410_init_clocks(int xtal)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);</div><div class='add'>+	s3c2410_baseclk_add();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sysdev_class s3c2410_sysclass = {</div><div class='add'>+	set_kset_name("s3c2410-core"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sys_device s3c2410_sysdev = {</div><div class='add'>+	.cls		= &amp;s3c2410_sysclass,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* need to register class before we actually register the device, and</div><div class='add'>+ * we also need to ensure that it has been initialised before any of the</div><div class='add'>+ * drivers even try to use it (even if not on an s3c2440 based system)</div><div class='add'>+ * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static int __init s3c2410_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_class_register(&amp;s3c2410_sysclass);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(s3c2410_core_init);</div><div class='add'>+</div><div class='ctx'> int __init s3c2410_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("S3C2410: Initialising architecture\n");</div><div class='ctx'> </div><div class='del'>-	return platform_add_devices(s3c24xx_uart_devs, s3c2410_uart_count);</div><div class='add'>+	return sysdev_register(&amp;s3c2410_sysdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2410.h b/arch/arm/mach-s3c2410/s3c2410.h<br/>index 4d5312a48209..73f1a2474a61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2410.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2410.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2410.h</a></div><div class='hunk'>@@ -29,6 +29,8 @@ extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='ctx'> </div><div class='ctx'> extern void s3c2410_init_clocks(int xtal);</div><div class='ctx'> </div><div class='add'>+extern  int s3c2410_baseclk_add(void);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> #define s3c2410_init_clocks NULL</div><div class='ctx'> #define s3c2410_init_uarts NULL</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2412-clock.c b/arch/arm/mach-s3c2410/s3c2412-clock.c<br/>new file mode 100644<br/>index 000000000000..c95ed3e18580<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2412-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2412-clock.c</a></div><div class='hunk'>@@ -0,0 +1,711 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/s3c2412-clock.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * S3C2412,S3C2413 Clock control support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+</div><div class='add'>+/* We currently have to assume that the system is running</div><div class='add'>+ * from the XTPll input, and that all ***REFCLKs are being</div><div class='add'>+ * fed from it, as we cannot read the state of OM[4] from</div><div class='add'>+ * software.</div><div class='add'>+ *</div><div class='add'>+ * It would be possible for each board initialisation to</div><div class='add'>+ * set the correct muxing at initialisation</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int s3c2412_clkcon_enable(struct clk *clk, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int clocks = clk-&gt;ctrlbit;</div><div class='add'>+	unsigned long clkcon;</div><div class='add'>+</div><div class='add'>+	clkcon = __raw_readl(S3C2410_CLKCON);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		clkcon |= clocks;</div><div class='add'>+	else</div><div class='add'>+		clkcon &amp;= ~clocks;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkcon, S3C2410_CLKCON);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_upll_enable(struct clk *clk, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long upllcon = __raw_readl(S3C2410_UPLLCON);</div><div class='add'>+	unsigned long orig = upllcon;</div><div class='add'>+</div><div class='add'>+	if (!enable)</div><div class='add'>+		upllcon |= S3C2412_PLLCON_OFF;</div><div class='add'>+	else</div><div class='add'>+		upllcon &amp;= ~S3C2412_PLLCON_OFF;</div><div class='add'>+</div><div class='add'>+	__raw_writel(upllcon, S3C2410_UPLLCON);</div><div class='add'>+</div><div class='add'>+	/* allow ~150uS for the PLL to settle and lock */</div><div class='add'>+</div><div class='add'>+	if (enable &amp;&amp; (orig &amp; S3C2412_PLLCON_OFF))</div><div class='add'>+		udelay(150);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clock selections */</div><div class='add'>+</div><div class='add'>+/* CPU EXTCLK input */</div><div class='add'>+static struct clk clk_ext = {</div><div class='add'>+	.name		= "extclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_erefclk = {</div><div class='add'>+	.name		= "erefclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_urefclk = {</div><div class='add'>+	.name		= "urefclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2412_setparent_usysclk(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;clk_urefclk)</div><div class='add'>+		clksrc &amp;= ~S3C2412_CLKSRC_USYSCLK_UPLL;</div><div class='add'>+	else if (parent == &amp;clk_upll)</div><div class='add'>+		clksrc |= S3C2412_CLKSRC_USYSCLK_UPLL;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clksrc, S3C2412_CLKSRC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_usysclk = {</div><div class='add'>+	.name		= "usysclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.parent		= &amp;clk_xtal,</div><div class='add'>+	.set_parent	= s3c2412_setparent_usysclk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_mrefclk = {</div><div class='add'>+	.name		= "mrefclk",</div><div class='add'>+	.parent		= &amp;clk_xtal,</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk clk_mdivclk = {</div><div class='add'>+	.name		= "mdivclk",</div><div class='add'>+	.parent		= &amp;clk_xtal,</div><div class='add'>+	.id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2412_setparent_usbsrc(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;clk_usysclk)</div><div class='add'>+		clksrc &amp;= ~S3C2412_CLKSRC_USBCLK_HCLK;</div><div class='add'>+	else if (parent == &amp;clk_h)</div><div class='add'>+		clksrc |= S3C2412_CLKSRC_USBCLK_HCLK;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clksrc, S3C2412_CLKSRC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long s3c2412_roundrate_usbsrc(struct clk *clk,</div><div class='add'>+					      unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	int div;</div><div class='add'>+</div><div class='add'>+	if (rate &gt; parent_rate)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='add'>+	div = parent_rate / rate;</div><div class='add'>+	if (div &gt; 2)</div><div class='add'>+		div = 2;</div><div class='add'>+</div><div class='add'>+	return parent_rate / div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long s3c2412_getrate_usbsrc(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long div = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	return parent_rate / ((div &amp; S3C2412_CLKDIVN_USB48DIV) ? 2 : 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_setrate_usbsrc(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long clkdivn = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	rate = s3c2412_roundrate_usbsrc(clk, rate);</div><div class='add'>+</div><div class='add'>+	if ((parent_rate / rate) == 2)</div><div class='add'>+		clkdivn |= S3C2412_CLKDIVN_USB48DIV;</div><div class='add'>+	else</div><div class='add'>+		clkdivn &amp;= ~S3C2412_CLKDIVN_USB48DIV;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkdivn, S3C2410_CLKDIVN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_usbsrc = {</div><div class='add'>+	.name		= "usbsrc",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.get_rate	= s3c2412_getrate_usbsrc,</div><div class='add'>+	.set_rate	= s3c2412_setrate_usbsrc,</div><div class='add'>+	.round_rate	= s3c2412_roundrate_usbsrc,</div><div class='add'>+	.set_parent	= s3c2412_setparent_usbsrc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2412_setparent_msysclk(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;clk_mdivclk)</div><div class='add'>+		clksrc &amp;= ~S3C2412_CLKSRC_MSYSCLK_MPLL;</div><div class='add'>+	else if (parent == &amp;clk_upll)</div><div class='add'>+		clksrc |= S3C2412_CLKSRC_MSYSCLK_MPLL;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clksrc, S3C2412_CLKSRC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_msysclk = {</div><div class='add'>+	.name		= "msysclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.set_parent	= s3c2412_setparent_msysclk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* these next clocks have an divider immediately after them,</div><div class='add'>+ * so we can register them with their divider and leave out the</div><div class='add'>+ * intermediate clock stage</div><div class='add'>+*/</div><div class='add'>+static unsigned long s3c2412_roundrate_clksrc(struct clk *clk,</div><div class='add'>+					      unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	int div;</div><div class='add'>+</div><div class='add'>+	if (rate &gt; parent_rate)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='add'>+	/* note, we remove the +/- 1 calculations as they cancel out */</div><div class='add'>+</div><div class='add'>+	div = (rate / parent_rate);</div><div class='add'>+</div><div class='add'>+	if (div &lt; 1)</div><div class='add'>+		div = 1;</div><div class='add'>+	else if (div &gt; 16)</div><div class='add'>+		div = 16;</div><div class='add'>+</div><div class='add'>+	return parent_rate / div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_setparent_uart(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;clk_erefclk)</div><div class='add'>+		clksrc &amp;= ~S3C2412_CLKSRC_UARTCLK_MPLL;</div><div class='add'>+	else if (parent == &amp;clk_mpll)</div><div class='add'>+		clksrc |= S3C2412_CLKSRC_UARTCLK_MPLL;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clksrc, S3C2412_CLKSRC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long s3c2412_getrate_uart(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long div = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	div &amp;= S3C2412_CLKDIVN_UARTDIV_MASK;</div><div class='add'>+	div &gt;&gt;= S3C2412_CLKDIVN_UARTDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	return parent_rate / (div + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_setrate_uart(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long clkdivn = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	rate = s3c2412_roundrate_clksrc(clk, rate);</div><div class='add'>+</div><div class='add'>+	clkdivn &amp;= ~S3C2412_CLKDIVN_UARTDIV_MASK;</div><div class='add'>+	clkdivn |= ((parent_rate / rate) - 1) &lt;&lt; S3C2412_CLKDIVN_UARTDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkdivn, S3C2410_CLKDIVN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_uart = {</div><div class='add'>+	.name		= "uartclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.get_rate	= s3c2412_getrate_uart,</div><div class='add'>+	.set_rate	= s3c2412_setrate_uart,</div><div class='add'>+	.set_parent	= s3c2412_setparent_uart,</div><div class='add'>+	.round_rate	= s3c2412_roundrate_clksrc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2412_setparent_i2s(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;clk_erefclk)</div><div class='add'>+		clksrc &amp;= ~S3C2412_CLKSRC_I2SCLK_MPLL;</div><div class='add'>+	else if (parent == &amp;clk_mpll)</div><div class='add'>+		clksrc |= S3C2412_CLKSRC_I2SCLK_MPLL;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clksrc, S3C2412_CLKSRC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long s3c2412_getrate_i2s(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long div = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	div &amp;= S3C2412_CLKDIVN_I2SDIV_MASK;</div><div class='add'>+	div &gt;&gt;= S3C2412_CLKDIVN_I2SDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	return parent_rate / (div + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_setrate_i2s(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long clkdivn = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	rate = s3c2412_roundrate_clksrc(clk, rate);</div><div class='add'>+</div><div class='add'>+	clkdivn &amp;= ~S3C2412_CLKDIVN_I2SDIV_MASK;</div><div class='add'>+	clkdivn |= ((parent_rate / rate) - 1) &lt;&lt; S3C2412_CLKDIVN_I2SDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkdivn, S3C2410_CLKDIVN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_i2s = {</div><div class='add'>+	.name		= "i2sclk",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.get_rate	= s3c2412_getrate_i2s,</div><div class='add'>+	.set_rate	= s3c2412_setrate_i2s,</div><div class='add'>+	.set_parent	= s3c2412_setparent_i2s,</div><div class='add'>+	.round_rate	= s3c2412_roundrate_clksrc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2412_setparent_cam(struct clk *clk, struct clk *parent)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+</div><div class='add'>+	if (parent == &amp;clk_usysclk)</div><div class='add'>+		clksrc &amp;= ~S3C2412_CLKSRC_CAMCLK_HCLK;</div><div class='add'>+	else if (parent == &amp;clk_h)</div><div class='add'>+		clksrc |= S3C2412_CLKSRC_CAMCLK_HCLK;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	clk-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clksrc, S3C2412_CLKSRC);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static unsigned long s3c2412_getrate_cam(struct clk *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long div = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	div &amp;= S3C2412_CLKDIVN_CAMDIV_MASK;</div><div class='add'>+	div &gt;&gt;= S3C2412_CLKDIVN_CAMDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	return parent_rate / (div + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_setrate_cam(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long clkdivn = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	rate = s3c2412_roundrate_clksrc(clk, rate);</div><div class='add'>+</div><div class='add'>+	clkdivn &amp;= ~S3C2412_CLKDIVN_CAMDIV_MASK;</div><div class='add'>+	clkdivn |= ((parent_rate / rate) - 1) &lt;&lt; S3C2412_CLKDIVN_CAMDIV_SHIFT;</div><div class='add'>+</div><div class='add'>+	__raw_writel(clkdivn, S3C2410_CLKDIVN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clk clk_cam = {</div><div class='add'>+	.name		= "camif-upll",	/* same as 2440 name */</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.get_rate	= s3c2412_getrate_cam,</div><div class='add'>+	.set_rate	= s3c2412_setrate_cam,</div><div class='add'>+	.set_parent	= s3c2412_setparent_cam,</div><div class='add'>+	.round_rate	= s3c2412_roundrate_clksrc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* standard clock definitions */</div><div class='add'>+</div><div class='add'>+static struct clk init_clocks_disable[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "nand",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_NAND,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "sdi",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_SDI,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "adc",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_ADC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "i2c",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_IIC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "iis",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_IIS,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "spi",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_SPI,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk init_clocks[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "dma",</div><div class='add'>+		.id		= 0,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_DMA0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "dma",</div><div class='add'>+		.id		= 1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_DMA1,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "dma",</div><div class='add'>+		.id		= 2,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_DMA2,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "dma",</div><div class='add'>+		.id		= 3,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_DMA3,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "lcd",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_LCDC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "gpio",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_GPIO,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-host",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_USBH,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-device",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_h,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_USBD,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "timers",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_PWMT,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "uart",</div><div class='add'>+		.id		= 0,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_UART0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "uart",</div><div class='add'>+		.id		= 1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_UART1,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "uart",</div><div class='add'>+		.id		= 2,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_UART2,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "rtc",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_RTC,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "watchdog",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_p,</div><div class='add'>+		.ctrlbit	= 0,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-bus-gadget",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_usb_bus,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_USB_DEV48,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "usb-bus-host",</div><div class='add'>+		.id		= -1,</div><div class='add'>+		.parent		= &amp;clk_usb_bus,</div><div class='add'>+		.enable		= s3c2412_clkcon_enable,</div><div class='add'>+		.ctrlbit	= S3C2412_CLKCON_USB_HOST48,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* clocks to add where we need to check their parentage */</div><div class='add'>+</div><div class='add'>+struct clk_init {</div><div class='add'>+	struct clk	*clk;</div><div class='add'>+	unsigned int	 bit;</div><div class='add'>+	struct clk	*src_0;</div><div class='add'>+	struct clk	*src_1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct clk_init clks_src[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		.clk	= &amp;clk_usysclk,</div><div class='add'>+		.bit	= S3C2412_CLKSRC_USBCLK_HCLK,</div><div class='add'>+		.src_0	= &amp;clk_urefclk,</div><div class='add'>+		.src_1	= &amp;clk_upll,</div><div class='add'>+	}, {</div><div class='add'>+		.clk	= &amp;clk_i2s,</div><div class='add'>+		.bit	= S3C2412_CLKSRC_I2SCLK_MPLL,</div><div class='add'>+		.src_0	= &amp;clk_erefclk,</div><div class='add'>+		.src_1	= &amp;clk_mpll,</div><div class='add'>+	}, {</div><div class='add'>+		.clk	= &amp;clk_cam,</div><div class='add'>+		.bit	= S3C2412_CLKSRC_CAMCLK_HCLK,</div><div class='add'>+		.src_0	= &amp;clk_usysclk,</div><div class='add'>+		.src_1	= &amp;clk_h,</div><div class='add'>+	}, {</div><div class='add'>+		.clk	= &amp;clk_msysclk,</div><div class='add'>+		.bit	= S3C2412_CLKSRC_MSYSCLK_MPLL,</div><div class='add'>+		.src_0	= &amp;clk_mdivclk,</div><div class='add'>+		.src_1	= &amp;clk_mpll,</div><div class='add'>+	}, {</div><div class='add'>+		.clk	= &amp;clk_uart,</div><div class='add'>+		.bit	= S3C2412_CLKSRC_UARTCLK_MPLL,</div><div class='add'>+		.src_0	= &amp;clk_erefclk,</div><div class='add'>+		.src_1	= &amp;clk_mpll,</div><div class='add'>+	}, {</div><div class='add'>+		.clk	= &amp;clk_usbsrc,</div><div class='add'>+		.bit	= S3C2412_CLKSRC_USBCLK_HCLK,</div><div class='add'>+		.src_0	= &amp;clk_usysclk,</div><div class='add'>+		.src_1	= &amp;clk_h,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* s3c2412_clk_initparents</div><div class='add'>+ *</div><div class='add'>+ * Initialise the parents for the clocks that we get at start-time</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static void __init s3c2412_clk_initparents(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long clksrc = __raw_readl(S3C2412_CLKSRC);</div><div class='add'>+	struct clk_init *cip = clks_src;</div><div class='add'>+	struct clk *src;</div><div class='add'>+	int ptr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clks_src); ptr++, cip++) {</div><div class='add'>+		ret = s3c24xx_register_clock(cip-&gt;clk);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='add'>+			       cip-&gt;clk-&gt;name, ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		src = (clksrc &amp; cip-&gt;bit) ? cip-&gt;src_1 : cip-&gt;src_0;</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "%s: parent %s\n", cip-&gt;clk-&gt;name, src-&gt;name);</div><div class='add'>+		clk_set_parent(cip-&gt;clk, src);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clocks to add straight away */</div><div class='add'>+</div><div class='add'>+struct clk *clks[] __initdata = {</div><div class='add'>+	&amp;clk_ext,</div><div class='add'>+	&amp;clk_usb_bus,</div><div class='add'>+	&amp;clk_erefclk,</div><div class='add'>+	&amp;clk_urefclk,</div><div class='add'>+	&amp;clk_mrefclk,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init s3c2412_baseclk_add(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long clkcon  = __raw_readl(S3C2410_CLKCON);</div><div class='add'>+	struct clk *clkp;</div><div class='add'>+	int ret;</div><div class='add'>+	int ptr;</div><div class='add'>+</div><div class='add'>+	clk_upll.enable = s3c2412_upll_enable;</div><div class='add'>+	clk_usb_bus.parent = &amp;clk_usbsrc;</div><div class='add'>+	clk_usb_bus.rate = 0x0;</div><div class='add'>+</div><div class='add'>+	s3c2412_clk_initparents();</div><div class='add'>+</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(clks); ptr++) {</div><div class='add'>+		clkp = clks[ptr];</div><div class='add'>+</div><div class='add'>+		ret = s3c24xx_register_clock(clkp);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='add'>+			       clkp-&gt;name, ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ensure usb bus clock is within correct rate of 48MHz */</div><div class='add'>+</div><div class='add'>+	if (clk_get_rate(&amp;clk_usb_bus) != (48 * 1000 * 1000)) {</div><div class='add'>+		printk(KERN_INFO "Warning: USB bus clock not at 48MHz\n");</div><div class='add'>+</div><div class='add'>+		/* for the moment, let's use the UPLL, and see if we can</div><div class='add'>+		 * get 48MHz */</div><div class='add'>+</div><div class='add'>+		clk_set_parent(&amp;clk_usysclk, &amp;clk_upll);</div><div class='add'>+		clk_set_parent(&amp;clk_usbsrc, &amp;clk_usysclk);</div><div class='add'>+		clk_set_rate(&amp;clk_usbsrc, 48*1000*1000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("S3C2412: upll %s, %ld.%03ld MHz, usb-bus %ld.%03ld MHz\n",</div><div class='add'>+	       (__raw_readl(S3C2410_UPLLCON) &amp; S3C2412_PLLCON_OFF) ? "off":"on",</div><div class='add'>+	       print_mhz(clk_get_rate(&amp;clk_upll)),</div><div class='add'>+	       print_mhz(clk_get_rate(&amp;clk_usb_bus)));</div><div class='add'>+</div><div class='add'>+	/* register clocks from clock array */</div><div class='add'>+</div><div class='add'>+	clkp = init_clocks;</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(init_clocks); ptr++, clkp++) {</div><div class='add'>+		/* ensure that we note the clock state */</div><div class='add'>+</div><div class='add'>+		clkp-&gt;usage = clkcon &amp; clkp-&gt;ctrlbit ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		ret = s3c24xx_register_clock(clkp);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='add'>+			       clkp-&gt;name, ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We must be careful disabling the clocks we are not intending to</div><div class='add'>+	 * be using at boot time, as subsytems such as the LCD which do</div><div class='add'>+	 * their own DMA requests to the bus can cause the system to lockup</div><div class='add'>+	 * if they where in the middle of requesting bus access.</div><div class='add'>+	 *</div><div class='add'>+	 * Disabling the LCD clock if the LCD is active is very dangerous,</div><div class='add'>+	 * and therefore the bootloader should be careful to not enable</div><div class='add'>+	 * the LCD clock if it is not needed.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* install (and disable) the clocks we do not need immediately */</div><div class='add'>+</div><div class='add'>+	clkp = init_clocks_disable;</div><div class='add'>+	for (ptr = 0; ptr &lt; ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {</div><div class='add'>+</div><div class='add'>+		ret = s3c24xx_register_clock(clkp);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			printk(KERN_ERR "Failed to register clock %s (%d)\n",</div><div class='add'>+			       clkp-&gt;name, ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		s3c2412_clkcon_enable(clkp, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2412.c b/arch/arm/mach-s3c2410/s3c2412.c<br/>new file mode 100644<br/>index 000000000000..e24ffd5e478b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2412.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2412.c</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/s3c2412.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * http://armlinux.simtec.co.uk/.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Modifications:</div><div class='add'>+ *     16-May-2003 BJD  Created initial version</div><div class='add'>+ *     16-Aug-2003 BJD  Fixed header files and copyright, added URL</div><div class='add'>+ *     05-Sep-2003 BJD  Moved to kernel v2.6</div><div class='add'>+ *     18-Jan-2004 BJD  Added serial port configuration</div><div class='add'>+ *     21-Aug-2004 BJD  Added new struct s3c2410_board handler</div><div class='add'>+ *     28-Sep-2004 BJD  Updates for new serial port bits</div><div class='add'>+ *     04-Nov-2004 BJD  Updated UART configuration process</div><div class='add'>+ *     10-Jan-2005 BJD  Removed s3c2410_clock_tick_rate</div><div class='add'>+ *     13-Aug-2005 DA   Removed UART from initial I/O mappings</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-serial.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpioj.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "s3c2412.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+#include "devs.h"</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "pm.h"</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_CPU_S3C2412_ONLY</div><div class='add'>+void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Initial IO mappings */</div><div class='add'>+</div><div class='add'>+static struct map_desc s3c2412_iodesc[] __initdata = {</div><div class='add'>+	IODESC_ENT(CLKPWR),</div><div class='add'>+	IODESC_ENT(LCD),</div><div class='add'>+	IODESC_ENT(TIMER),</div><div class='add'>+	IODESC_ENT(ADC),</div><div class='add'>+	IODESC_ENT(WATCHDOG),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* uart registration process */</div><div class='add'>+</div><div class='add'>+void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_uartdevs("s3c2412-uart", s3c2410_uart_resources, cfg, no);</div><div class='add'>+</div><div class='add'>+	/* rename devices that are s3c2412/s3c2413 specific */</div><div class='add'>+	s3c_device_sdi.name  = "s3c2412-sdi";</div><div class='add'>+	s3c_device_nand.name = "s3c2412-nand";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* s3c2412_map_io</div><div class='add'>+ *</div><div class='add'>+ * register the standard cpu IO areas, and any passed in from the</div><div class='add'>+ * machine specific initialisation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void __init s3c2412_map_io(struct map_desc *mach_desc, int mach_size)</div><div class='add'>+{</div><div class='add'>+	/* move base of IO */</div><div class='add'>+</div><div class='add'>+	s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;</div><div class='add'>+</div><div class='add'>+	/* register our io-tables */</div><div class='add'>+</div><div class='add'>+	iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc));</div><div class='add'>+	iotable_init(mach_desc, mach_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s3c2412_init_clocks(int xtal)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	unsigned long fclk;</div><div class='add'>+	unsigned long hclk;</div><div class='add'>+	unsigned long pclk;</div><div class='add'>+</div><div class='add'>+	/* now we've got our machine bits initialised, work out what</div><div class='add'>+	 * clocks we've got */</div><div class='add'>+</div><div class='add'>+	fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON), xtal*2);</div><div class='add'>+</div><div class='add'>+	tmp = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+	/* work out clock scalings */</div><div class='add'>+</div><div class='add'>+	hclk = fclk / ((tmp &amp; S3C2412_CLKDIVN_HDIVN_MASK) + 1);</div><div class='add'>+	hclk /= ((tmp &amp; S3C2421_CLKDIVN_ARMDIVN) ? 2 : 1);</div><div class='add'>+	pclk = hclk / ((tmp &amp; S3C2412_CLKDIVN_PDIVN) ? 2 : 1);</div><div class='add'>+</div><div class='add'>+	/* print brieft summary of clocks, etc */</div><div class='add'>+</div><div class='add'>+	printk("S3C2412: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",</div><div class='add'>+	       print_mhz(fclk), print_mhz(hclk), print_mhz(pclk));</div><div class='add'>+</div><div class='add'>+	/* initialise the clocks here, to allow other things like the</div><div class='add'>+	 * console to use them</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);</div><div class='add'>+	s3c2412_baseclk_add();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* need to register class before we actually register the device, and</div><div class='add'>+ * we also need to ensure that it has been initialised before any of the</div><div class='add'>+ * drivers even try to use it (even if not on an s3c2412 based system)</div><div class='add'>+ * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static struct sleep_save s3c2412_sleep[] = {</div><div class='add'>+	SAVE_ITEM(S3C2412_DSC0),</div><div class='add'>+	SAVE_ITEM(S3C2412_DSC1),</div><div class='add'>+	SAVE_ITEM(S3C2413_GPJDAT),</div><div class='add'>+	SAVE_ITEM(S3C2413_GPJCON),</div><div class='add'>+	SAVE_ITEM(S3C2413_GPJUP),</div><div class='add'>+</div><div class='add'>+	/* save the sleep configuration anyway, just in case these</div><div class='add'>+	 * get damaged during wakeup */</div><div class='add'>+</div><div class='add'>+	SAVE_ITEM(S3C2412_GPBSLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2412_GPCSLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2412_GPDSLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2412_GPESLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2412_GPFSLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2412_GPGSLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2412_GPHSLPCON),</div><div class='add'>+	SAVE_ITEM(S3C2413_GPJSLPCON),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2412_suspend(struct sys_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	s3c2410_pm_do_save(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_resume(struct sys_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c2410_pm_do_restore(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s3c2412_suspend NULL</div><div class='add'>+#define s3c2412_resume  NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct sysdev_class s3c2412_sysclass = {</div><div class='add'>+	set_kset_name("s3c2412-core"),</div><div class='add'>+	.suspend	= s3c2412_suspend,</div><div class='add'>+	.resume		= s3c2412_resume</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init s3c2412_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_class_register(&amp;s3c2412_sysclass);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(s3c2412_core_init);</div><div class='add'>+</div><div class='add'>+static struct sys_device s3c2412_sysdev = {</div><div class='add'>+	.cls		= &amp;s3c2412_sysclass,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init s3c2412_init(void)</div><div class='add'>+{</div><div class='add'>+	printk("S3C2412: Initialising architecture\n");</div><div class='add'>+</div><div class='add'>+	return sysdev_register(&amp;s3c2412_sysdev);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2412.h b/arch/arm/mach-s3c2410/s3c2412.h<br/>new file mode 100644<br/>index 000000000000..c6e56032a6e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2412.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2412.h</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+/* arch/arm/mach-s3c2410/s3c2412.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * Header file for s3c2412 cpu support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S3C2412</div><div class='add'>+</div><div class='add'>+extern  int s3c2412_init(void);</div><div class='add'>+</div><div class='add'>+extern void s3c2412_map_io(struct map_desc *mach_desc, int size);</div><div class='add'>+</div><div class='add'>+extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+extern void s3c2412_init_clocks(int xtal);</div><div class='add'>+</div><div class='add'>+extern  int s3c2412_baseclk_add(void);</div><div class='add'>+#else</div><div class='add'>+#define s3c2412_init_clocks NULL</div><div class='add'>+#define s3c2412_init_uarts NULL</div><div class='add'>+#define s3c2412_map_io NULL</div><div class='add'>+#define s3c2412_init NULL</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2440-clock.c b/arch/arm/mach-s3c2410/s3c2440-clock.c<br/>index d7a30ed6c327..15796864d010 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2440-clock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2440-clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2440-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2440-clock.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ static int s3c2440_camif_upll_setrate(struct clk *clk, unsigned long rate)</div><div class='ctx'> static struct clk s3c2440_clk_cam = {</div><div class='ctx'> 	.name		= "camif",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.enable		= s3c24xx_clkcon_enable,</div><div class='add'>+	.enable		= s3c2410_clkcon_enable,</div><div class='ctx'> 	.ctrlbit	= S3C2440_CLKCON_CAMERA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +105,7 @@ static struct clk s3c2440_clk_cam_upll = {</div><div class='ctx'> static struct clk s3c2440_clk_ac97 = {</div><div class='ctx'> 	.name		= "ac97",</div><div class='ctx'> 	.id		= -1,</div><div class='del'>-	.enable		= s3c24xx_clkcon_enable,</div><div class='add'>+	.enable		= s3c2410_clkcon_enable,</div><div class='ctx'> 	.ctrlbit	= S3C2440_CLKCON_CAMERA,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2440-irq.c b/arch/arm/mach-s3c2410/s3c2440-irq.c<br/>index 278d0044c85d..acfe3870727b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2440-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2440-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2440-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2440-irq.c</a></div><div class='hunk'>@@ -100,73 +100,12 @@ static struct irqchip s3c_irq_wdtac97 = {</div><div class='ctx'> 	.ack	    = s3c_irq_wdtac97_ack,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* camera irq */</div><div class='del'>-</div><div class='del'>-static void s3c_irq_demux_cam(unsigned int irq,</div><div class='del'>-			      struct irqdesc *desc,</div><div class='del'>-			      struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned int subsrc, submsk;</div><div class='del'>-	struct irqdesc *mydesc;</div><div class='del'>-</div><div class='del'>-	/* read the current pending interrupts, and the mask</div><div class='del'>-	 * for what it is available */</div><div class='del'>-</div><div class='del'>-	subsrc = __raw_readl(S3C2410_SUBSRCPND);</div><div class='del'>-	submsk = __raw_readl(S3C2410_INTSUBMSK);</div><div class='del'>-</div><div class='del'>-	subsrc &amp;= ~submsk;</div><div class='del'>-	subsrc &gt;&gt;= 11;</div><div class='del'>-	subsrc &amp;= 3;</div><div class='del'>-</div><div class='del'>-	if (subsrc != 0) {</div><div class='del'>-		if (subsrc &amp; 1) {</div><div class='del'>-			mydesc = irq_desc + IRQ_S3C2440_CAM_C;</div><div class='del'>-			desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs);</div><div class='del'>-		}</div><div class='del'>-		if (subsrc &amp; 2) {</div><div class='del'>-			mydesc = irq_desc + IRQ_S3C2440_CAM_P;</div><div class='del'>-			desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define INTMSK_CAM (1UL &lt;&lt; (IRQ_CAM - IRQ_EINT0))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-s3c_irq_cam_mask(unsigned int irqno)</div><div class='del'>-{</div><div class='del'>-	s3c_irqsub_mask(irqno, INTMSK_CAM, 3&lt;&lt;11);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-s3c_irq_cam_unmask(unsigned int irqno)</div><div class='del'>-{</div><div class='del'>-	s3c_irqsub_unmask(irqno, INTMSK_CAM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-s3c_irq_cam_ack(unsigned int irqno)</div><div class='del'>-{</div><div class='del'>-	s3c_irqsub_maskack(irqno, INTMSK_CAM, 3&lt;&lt;11);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irqchip s3c_irq_cam = {</div><div class='del'>-	.mask	    = s3c_irq_cam_mask,</div><div class='del'>-	.unmask	    = s3c_irq_cam_unmask,</div><div class='del'>-	.ack	    = s3c_irq_cam_ack,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int s3c2440_irq_add(struct sys_device *sysdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irqno;</div><div class='ctx'> </div><div class='ctx'> 	printk("S3C2440: IRQ Support\n");</div><div class='ctx'> </div><div class='del'>-	set_irq_chip(IRQ_NFCON, &amp;s3c_irq_level_chip);</div><div class='del'>-	set_irq_handler(IRQ_NFCON, do_level_IRQ);</div><div class='del'>-	set_irq_flags(IRQ_NFCON, IRQF_VALID);</div><div class='del'>-</div><div class='ctx'> 	/* add new chained handler for wdt, ac7 */</div><div class='ctx'> </div><div class='ctx'> 	set_irq_chip(IRQ_WDT, &amp;s3c_irq_level_chip);</div><div class='hunk'>@@ -179,18 +118,6 @@ static int s3c2440_irq_add(struct sys_device *sysdev)</div><div class='ctx'> 		set_irq_flags(irqno, IRQF_VALID);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* add chained handler for camera */</div><div class='del'>-</div><div class='del'>-	set_irq_chip(IRQ_CAM, &amp;s3c_irq_level_chip);</div><div class='del'>-	set_irq_handler(IRQ_CAM, do_level_IRQ);</div><div class='del'>-	set_irq_chained_handler(IRQ_CAM, s3c_irq_demux_cam);</div><div class='del'>-</div><div class='del'>-	for (irqno = IRQ_S3C2440_CAM_C; irqno &lt;= IRQ_S3C2440_CAM_P; irqno++) {</div><div class='del'>-		set_irq_chip(irqno, &amp;s3c_irq_cam);</div><div class='del'>-		set_irq_handler(irqno, do_level_IRQ);</div><div class='del'>-		set_irq_flags(irqno, IRQF_VALID);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -198,10 +125,10 @@ static struct sysdev_driver s3c2440_irq_driver = {</div><div class='ctx'> 	.add	= s3c2440_irq_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s3c24xx_irq_driver(void)</div><div class='add'>+static int s3c2440_irq_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c2440_irq_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-arch_initcall(s3c24xx_irq_driver);</div><div class='add'>+arch_initcall(s3c2440_irq_init);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c<br/>index b7fe6d9453fb..0ab50f44f318 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2440.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/s3c2440.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2440.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2440.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* linux/arch/arm/mach-s3c2410/s3c2440.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2004-2005 Simtec Electronics</div><div class='add'>+ * Copyright (c) 2004-2006 Simtec Electronics</div><div class='ctx'>  *   Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Samsung S3C2440 Mobile CPU support</div><div class='hunk'>@@ -8,16 +8,6 @@</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Modifications:</div><div class='del'>- *	24-Aug-2004 BJD  Start of s3c2440 support</div><div class='del'>- *	12-Oct-2004 BJD	 Moved clock info out to clock.c</div><div class='del'>- *	01-Nov-2004 BJD  Fixed clock build code</div><div class='del'>- *	09-Nov-2004 BJD  Added sysdev for power management</div><div class='del'>- *	04-Nov-2004 BJD  New serial registration</div><div class='del'>- *	15-Nov-2004 BJD  Rename the i2c device for the s3c2440</div><div class='del'>- *	14-Jan-2005 BJD  Moved clock init code into seperate function</div><div class='del'>- *	14-Jan-2005 BJD  Removed un-used clock bits</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -50,234 +40,20 @@</div><div class='ctx'> #include "cpu.h"</div><div class='ctx'> #include "pm.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct map_desc s3c2440_iodesc[] __initdata = {</div><div class='del'>-	IODESC_ENT(USBHOST),</div><div class='del'>-	IODESC_ENT(CLKPWR),</div><div class='del'>-	IODESC_ENT(LCD),</div><div class='del'>-	IODESC_ENT(TIMER),</div><div class='del'>-	IODESC_ENT(ADC),</div><div class='del'>-	IODESC_ENT(WATCHDOG),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s3c_uart0_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C2410_PA_UART0,</div><div class='del'>-		.end   = S3C2410_PA_UART0 + 0x3fff,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = IRQ_S3CUART_RX0,</div><div class='del'>-		.end   = IRQ_S3CUART_ERR0,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s3c_uart1_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C2410_PA_UART1,</div><div class='del'>-		.end   = S3C2410_PA_UART1 + 0x3fff,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = IRQ_S3CUART_RX1,</div><div class='del'>-		.end   = IRQ_S3CUART_ERR1,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource s3c_uart2_resource[] = {</div><div class='del'>-	[0] = {</div><div class='del'>-		.start = S3C2410_PA_UART2,</div><div class='del'>-		.end   = S3C2410_PA_UART2 + 0x3fff,</div><div class='del'>-		.flags = IORESOURCE_MEM,</div><div class='del'>-	},</div><div class='del'>-	[1] = {</div><div class='del'>-		.start = IRQ_S3CUART_RX2,</div><div class='del'>-		.end   = IRQ_S3CUART_ERR2,</div><div class='del'>-		.flags = IORESOURCE_IRQ,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* our uart devices */</div><div class='del'>-</div><div class='del'>-static struct platform_device s3c_uart0 = {</div><div class='del'>-	.name		  = "s3c2440-uart",</div><div class='del'>-	.id		  = 0,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c_uart0_resource),</div><div class='del'>-	.resource	  = s3c_uart0_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device s3c_uart1 = {</div><div class='del'>-	.name		  = "s3c2440-uart",</div><div class='del'>-	.id		  = 1,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c_uart1_resource),</div><div class='del'>-	.resource	  = s3c_uart1_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device s3c_uart2 = {</div><div class='del'>-	.name		  = "s3c2440-uart",</div><div class='del'>-	.id		  = 2,</div><div class='del'>-	.num_resources	  = ARRAY_SIZE(s3c_uart2_resource),</div><div class='del'>-	.resource	  = s3c_uart2_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct platform_device *uart_devices[] __initdata = {</div><div class='del'>-	&amp;s3c_uart0,</div><div class='del'>-	&amp;s3c_uart1,</div><div class='del'>-	&amp;s3c_uart2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* uart initialisation */</div><div class='del'>-</div><div class='del'>-static int __initdata s3c2440_uart_count;</div><div class='del'>-</div><div class='del'>-void __init s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='del'>-{</div><div class='del'>-	struct platform_device *platdev;</div><div class='del'>-	int uart;</div><div class='del'>-</div><div class='del'>-	for (uart = 0; uart &lt; no; uart++, cfg++) {</div><div class='del'>-		platdev = uart_devices[cfg-&gt;hwport];</div><div class='del'>-</div><div class='del'>-		s3c24xx_uart_devs[uart] = platdev;</div><div class='del'>-		platdev-&gt;dev.platform_data = cfg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s3c2440_uart_count = uart;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static struct sleep_save s3c2440_sleep[] = {</div><div class='del'>-	SAVE_ITEM(S3C2440_DSC0),</div><div class='del'>-	SAVE_ITEM(S3C2440_DSC1),</div><div class='del'>-	SAVE_ITEM(S3C2440_GPJDAT),</div><div class='del'>-	SAVE_ITEM(S3C2440_GPJCON),</div><div class='del'>-	SAVE_ITEM(S3C2440_GPJUP)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int s3c2440_suspend(struct sys_device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	s3c2410_pm_do_save(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int s3c2440_resume(struct sys_device *dev)</div><div class='del'>-{</div><div class='del'>-	s3c2410_pm_do_restore(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define s3c2440_suspend NULL</div><div class='del'>-#define s3c2440_resume  NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct sysdev_class s3c2440_sysclass = {</div><div class='del'>-	set_kset_name("s3c2440-core"),</div><div class='del'>-	.suspend	= s3c2440_suspend,</div><div class='del'>-	.resume		= s3c2440_resume</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct sys_device s3c2440_sysdev = {</div><div class='ctx'> 	.cls		= &amp;s3c2440_sysclass,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init s3c2440_map_io(struct map_desc *mach_desc, int size)</div><div class='add'>+int __init s3c2440_init(void)</div><div class='ctx'> {</div><div class='del'>-	/* register our io-tables */</div><div class='del'>-</div><div class='del'>-	iotable_init(s3c2440_iodesc, ARRAY_SIZE(s3c2440_iodesc));</div><div class='del'>-	iotable_init(mach_desc, size);</div><div class='del'>-</div><div class='del'>-	/* rename any peripherals used differing from the s3c2410 */</div><div class='del'>-</div><div class='del'>-	s3c_device_i2c.name  = "s3c2440-i2c";</div><div class='del'>-	s3c_device_nand.name = "s3c2440-nand";</div><div class='add'>+	printk("S3C2440: Initialising architecture\n");</div><div class='ctx'> </div><div class='ctx'> 	/* change irq for watchdog */</div><div class='ctx'> </div><div class='ctx'> 	s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;</div><div class='ctx'> 	s3c_device_wdt.resource[1].end   = IRQ_S3C2440_WDT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init s3c2440_init_clocks(int xtal)</div><div class='del'>-{</div><div class='del'>-	unsigned long clkdiv;</div><div class='del'>-	unsigned long camdiv;</div><div class='del'>-	unsigned long hclk, fclk, pclk;</div><div class='del'>-	int hdiv = 1;</div><div class='del'>-</div><div class='del'>-	/* now we've got our machine bits initialised, work out what</div><div class='del'>-	 * clocks we've got */</div><div class='del'>-</div><div class='del'>-	fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON), xtal) * 2;</div><div class='del'>-</div><div class='del'>-	clkdiv = __raw_readl(S3C2410_CLKDIVN);</div><div class='del'>-	camdiv = __raw_readl(S3C2440_CAMDIVN);</div><div class='del'>-</div><div class='del'>-	/* work out clock scalings */</div><div class='del'>-</div><div class='del'>-	switch (clkdiv &amp; S3C2440_CLKDIVN_HDIVN_MASK) {</div><div class='del'>-	case S3C2440_CLKDIVN_HDIVN_1:</div><div class='del'>-		hdiv = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case S3C2440_CLKDIVN_HDIVN_2:</div><div class='del'>-		hdiv = 2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case S3C2440_CLKDIVN_HDIVN_4_8:</div><div class='del'>-		hdiv = (camdiv &amp; S3C2440_CAMDIVN_HCLK4_HALF) ? 8 : 4;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case S3C2440_CLKDIVN_HDIVN_3_6:</div><div class='del'>-		hdiv = (camdiv &amp; S3C2440_CAMDIVN_HCLK3_HALF) ? 6 : 3;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hclk = fclk / hdiv;</div><div class='del'>-	pclk = hclk / ((clkdiv &amp; S3C2440_CLKDIVN_PDIVN)? 2:1);</div><div class='del'>-</div><div class='del'>-	/* print brief summary of clocks, etc */</div><div class='del'>-</div><div class='del'>-	printk("S3C2440: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",</div><div class='del'>-	       print_mhz(fclk), print_mhz(hclk), print_mhz(pclk));</div><div class='del'>-</div><div class='del'>-	/* initialise the clocks here, to allow other things like the</div><div class='del'>-	 * console to use them, and to add new ones after the initialisation</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* need to register class before we actually register the device, and</div><div class='del'>- * we also need to ensure that it has been initialised before any of the</div><div class='del'>- * drivers even try to use it (even if not on an s3c2440 based system)</div><div class='del'>- * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static int __init s3c2440_core_init(void)</div><div class='del'>-{</div><div class='del'>-	return sysdev_class_register(&amp;s3c2440_sysclass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-core_initcall(s3c2440_core_init);</div><div class='del'>-</div><div class='del'>-int __init s3c2440_init(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	printk("S3C2440: Initialising architecture\n");</div><div class='ctx'> </div><div class='del'>-	ret = sysdev_register(&amp;s3c2440_sysdev);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		printk(KERN_ERR "failed to register sysdev for s3c2440\n");</div><div class='del'>-	else</div><div class='del'>-		ret = platform_add_devices(s3c24xx_uart_devs, s3c2440_uart_count);</div><div class='add'>+	/* register our system device for everything else */</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return sysdev_register(&amp;s3c2440_sysdev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2442-clock.c b/arch/arm/mach-s3c2410/s3c2442-clock.c<br/>new file mode 100644<br/>index 000000000000..d9f54b5cab7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2442-clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2442-clock.c</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/s3c2442-clock.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004-2005 Simtec Electronics</div><div class='add'>+ *	http://armlinux.simtec.co.uk/</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * S3C2442 Clock support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+</div><div class='add'>+/* S3C2442 extended clock support */</div><div class='add'>+</div><div class='add'>+static unsigned long s3c2442_camif_upll_round(struct clk *clk,</div><div class='add'>+					      unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	int div;</div><div class='add'>+</div><div class='add'>+	if (rate &gt; parent_rate)</div><div class='add'>+		return parent_rate;</div><div class='add'>+</div><div class='add'>+	div = parent_rate / rate;</div><div class='add'>+</div><div class='add'>+	if (div == 3)</div><div class='add'>+		return parent_rate / 3;</div><div class='add'>+</div><div class='add'>+	/* note, we remove the +/- 1 calculations for the divisor */</div><div class='add'>+</div><div class='add'>+	div /= 2;</div><div class='add'>+</div><div class='add'>+	if (div &lt; 1)</div><div class='add'>+		div = 1;</div><div class='add'>+	else if (div &gt; 16)</div><div class='add'>+		div = 16;</div><div class='add'>+</div><div class='add'>+	return parent_rate / (div * 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2442_camif_upll_setrate(struct clk *clk, unsigned long rate)</div><div class='add'>+{</div><div class='add'>+	unsigned long parent_rate = clk_get_rate(clk-&gt;parent);</div><div class='add'>+	unsigned long camdivn =  __raw_readl(S3C2440_CAMDIVN);</div><div class='add'>+</div><div class='add'>+	rate = s3c2442_camif_upll_round(clk, rate);</div><div class='add'>+</div><div class='add'>+	camdivn &amp;= ~S3C2442_CAMDIVN_CAMCLK_DIV3;</div><div class='add'>+</div><div class='add'>+	if (rate == parent_rate) {</div><div class='add'>+		camdivn &amp;= ~S3C2440_CAMDIVN_CAMCLK_SEL;</div><div class='add'>+	} else if ((parent_rate / rate) == 3) {</div><div class='add'>+		camdivn |= S3C2440_CAMDIVN_CAMCLK_SEL;</div><div class='add'>+		camdivn |= S3C2442_CAMDIVN_CAMCLK_DIV3;</div><div class='add'>+	} else {</div><div class='add'>+		camdivn &amp;= ~S3C2440_CAMDIVN_CAMCLK_MASK;</div><div class='add'>+		camdivn |= S3C2440_CAMDIVN_CAMCLK_SEL;</div><div class='add'>+		camdivn |= (((parent_rate / rate) / 2) - 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(camdivn, S3C2440_CAMDIVN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Extra S3C2442 clocks */</div><div class='add'>+</div><div class='add'>+static struct clk s3c2442_clk_cam = {</div><div class='add'>+	.name		= "camif",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.enable		= s3c2410_clkcon_enable,</div><div class='add'>+	.ctrlbit	= S3C2440_CLKCON_CAMERA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct clk s3c2442_clk_cam_upll = {</div><div class='add'>+	.name		= "camif-upll",</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.set_rate	= s3c2442_camif_upll_setrate,</div><div class='add'>+	.round_rate	= s3c2442_camif_upll_round,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2442_clk_add(struct sys_device *sysdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);</div><div class='add'>+	unsigned long clkdivn;</div><div class='add'>+	struct clk *clk_h;</div><div class='add'>+	struct clk *clk_p;</div><div class='add'>+	struct clk *clk_upll;</div><div class='add'>+</div><div class='add'>+	printk("S3C2442: Clock Support, DVS %s\n",</div><div class='add'>+	       (camdivn &amp; S3C2440_CAMDIVN_DVSEN) ? "on" : "off");</div><div class='add'>+</div><div class='add'>+	clk_p = clk_get(NULL, "pclk");</div><div class='add'>+	clk_h = clk_get(NULL, "hclk");</div><div class='add'>+	clk_upll = clk_get(NULL, "upll");</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(clk_p) || IS_ERR(clk_h) || IS_ERR(clk_upll)) {</div><div class='add'>+		printk(KERN_ERR "S3C2442: Failed to get parent clocks\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check rate of UPLL, and if it is near 96MHz, then change</div><div class='add'>+	 * to using half the UPLL rate for the system */</div><div class='add'>+</div><div class='add'>+	if (clk_get_rate(clk_upll) &gt; (94 * MHZ)) {</div><div class='add'>+		clk_usb_bus.rate = clk_get_rate(clk_upll) / 2;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;clocks_mutex);</div><div class='add'>+</div><div class='add'>+		clkdivn = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+		clkdivn |= S3C2440_CLKDIVN_UCLK;</div><div class='add'>+		__raw_writel(clkdivn, S3C2410_CLKDIVN);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;clocks_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s3c2442_clk_cam.parent = clk_h;</div><div class='add'>+	s3c2442_clk_cam_upll.parent = clk_upll;</div><div class='add'>+</div><div class='add'>+	s3c24xx_register_clock(&amp;s3c2442_clk_cam);</div><div class='add'>+	s3c24xx_register_clock(&amp;s3c2442_clk_cam_upll);</div><div class='add'>+</div><div class='add'>+	clk_disable(&amp;s3c2442_clk_cam);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_driver s3c2442_clk_driver = {</div><div class='add'>+	.add	= s3c2442_clk_add,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int s3c2442_clk_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c2442_clk_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(s3c2442_clk_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2442.c b/arch/arm/mach-s3c2410/s3c2442.c<br/>new file mode 100644<br/>index 000000000000..debae2430557<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2442.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2442.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/s3c2440.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *   Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * Samsung S3C2442 Mobile CPU support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-serial.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpioj.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "s3c2442.h"</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "devs.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+#include "pm.h"</div><div class='add'>+</div><div class='add'>+static struct sys_device s3c2442_sysdev = {</div><div class='add'>+	.cls		= &amp;s3c2442_sysclass,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init s3c2442_init(void)</div><div class='add'>+{</div><div class='add'>+	printk("S3C2442: Initialising architecture\n");</div><div class='add'>+</div><div class='add'>+	return sysdev_register(&amp;s3c2442_sysdev);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c2442.h b/arch/arm/mach-s3c2410/s3c2442.h<br/>new file mode 100644<br/>index 000000000000..0ae37d24866c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c2442.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c2442.h</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+/* arch/arm/mach-s3c2410/s3c2442.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * Header file for s3c2442 cpu support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_S3C2442</div><div class='add'>+extern  int s3c2442_init(void);</div><div class='add'>+#else</div><div class='add'>+#define s3c2442_init NULL</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c<br/>new file mode 100644<br/>index 000000000000..2aadca1ce7eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c244x-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c244x-irq.c</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/s3c2440-irq.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003,2004 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ * Changelog:</div><div class='add'>+ *	25-Jul-2005 BJD		Split from irq.c</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-irq.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cpu.h"</div><div class='add'>+#include "pm.h"</div><div class='add'>+#include "irq.h"</div><div class='add'>+</div><div class='add'>+/* camera irq */</div><div class='add'>+</div><div class='add'>+static void s3c_irq_demux_cam(unsigned int irq,</div><div class='add'>+			      struct irqdesc *desc,</div><div class='add'>+			      struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int subsrc, submsk;</div><div class='add'>+	struct irqdesc *mydesc;</div><div class='add'>+</div><div class='add'>+	/* read the current pending interrupts, and the mask</div><div class='add'>+	 * for what it is available */</div><div class='add'>+</div><div class='add'>+	subsrc = __raw_readl(S3C2410_SUBSRCPND);</div><div class='add'>+	submsk = __raw_readl(S3C2410_INTSUBMSK);</div><div class='add'>+</div><div class='add'>+	subsrc &amp;= ~submsk;</div><div class='add'>+	subsrc &gt;&gt;= 11;</div><div class='add'>+	subsrc &amp;= 3;</div><div class='add'>+</div><div class='add'>+	if (subsrc != 0) {</div><div class='add'>+		if (subsrc &amp; 1) {</div><div class='add'>+			mydesc = irq_desc + IRQ_S3C2440_CAM_C;</div><div class='add'>+			desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs);</div><div class='add'>+		}</div><div class='add'>+		if (subsrc &amp; 2) {</div><div class='add'>+			mydesc = irq_desc + IRQ_S3C2440_CAM_P;</div><div class='add'>+			desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INTMSK_CAM (1UL &lt;&lt; (IRQ_CAM - IRQ_EINT0))</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+s3c_irq_cam_mask(unsigned int irqno)</div><div class='add'>+{</div><div class='add'>+	s3c_irqsub_mask(irqno, INTMSK_CAM, 3&lt;&lt;11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+s3c_irq_cam_unmask(unsigned int irqno)</div><div class='add'>+{</div><div class='add'>+	s3c_irqsub_unmask(irqno, INTMSK_CAM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+s3c_irq_cam_ack(unsigned int irqno)</div><div class='add'>+{</div><div class='add'>+	s3c_irqsub_maskack(irqno, INTMSK_CAM, 3&lt;&lt;11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irqchip s3c_irq_cam = {</div><div class='add'>+	.mask	    = s3c_irq_cam_mask,</div><div class='add'>+	.unmask	    = s3c_irq_cam_unmask,</div><div class='add'>+	.ack	    = s3c_irq_cam_ack,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c244x_irq_add(struct sys_device *sysdev)</div><div class='add'>+{</div><div class='add'>+	unsigned int irqno;</div><div class='add'>+</div><div class='add'>+	set_irq_chip(IRQ_NFCON, &amp;s3c_irq_level_chip);</div><div class='add'>+	set_irq_handler(IRQ_NFCON, do_level_IRQ);</div><div class='add'>+	set_irq_flags(IRQ_NFCON, IRQF_VALID);</div><div class='add'>+</div><div class='add'>+	/* add chained handler for camera */</div><div class='add'>+</div><div class='add'>+	set_irq_chip(IRQ_CAM, &amp;s3c_irq_level_chip);</div><div class='add'>+	set_irq_handler(IRQ_CAM, do_level_IRQ);</div><div class='add'>+	set_irq_chained_handler(IRQ_CAM, s3c_irq_demux_cam);</div><div class='add'>+</div><div class='add'>+	for (irqno = IRQ_S3C2440_CAM_C; irqno &lt;= IRQ_S3C2440_CAM_P; irqno++) {</div><div class='add'>+		set_irq_chip(irqno, &amp;s3c_irq_cam);</div><div class='add'>+		set_irq_handler(irqno, do_level_IRQ);</div><div class='add'>+		set_irq_flags(irqno, IRQF_VALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysdev_driver s3c244x_irq_driver = {</div><div class='add'>+	.add	= s3c244x_irq_add,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c2440_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_driver_register(&amp;s3c2440_sysclass, &amp;s3c244x_irq_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(s3c2440_irq_init);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int s3c2442_irq_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_driver_register(&amp;s3c2442_sysclass, &amp;s3c244x_irq_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(s3c2442_irq_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c244x.c b/arch/arm/mach-s3c2410/s3c244x.c<br/>new file mode 100644<br/>index 000000000000..9a2258270de9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c244x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c244x.c</a></div><div class='hunk'>@@ -0,0 +1,185 @@</div><div class='add'>+/* linux/arch/arm/mach-s3c2410/s3c244x.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004-2006 Simtec Electronics</div><div class='add'>+ *   Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * Samsung S3C2440 and S3C2442 Mobile CPU support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/arch.h&gt;</div><div class='add'>+#include &lt;asm/mach/map.h&gt;</div><div class='add'>+#include &lt;asm/mach/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-clock.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-serial.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-gpioj.h&gt;</div><div class='add'>+#include &lt;asm/arch/regs-dsc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "s3c2410.h"</div><div class='add'>+#include "s3c2440.h"</div><div class='add'>+#include "s3c244x.h"</div><div class='add'>+#include "clock.h"</div><div class='add'>+#include "devs.h"</div><div class='add'>+#include "cpu.h"</div><div class='add'>+#include "pm.h"</div><div class='add'>+</div><div class='add'>+static struct map_desc s3c244x_iodesc[] __initdata = {</div><div class='add'>+	IODESC_ENT(CLKPWR),</div><div class='add'>+	IODESC_ENT(TIMER),</div><div class='add'>+	IODESC_ENT(WATCHDOG),</div><div class='add'>+	IODESC_ENT(LCD),</div><div class='add'>+	IODESC_ENT(ADC),</div><div class='add'>+	IODESC_ENT(USBHOST),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* uart initialisation */</div><div class='add'>+</div><div class='add'>+void __init s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no)</div><div class='add'>+{</div><div class='add'>+	s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s3c244x_map_io(struct map_desc *mach_desc, int size)</div><div class='add'>+{</div><div class='add'>+	/* register our io-tables */</div><div class='add'>+</div><div class='add'>+	iotable_init(s3c244x_iodesc, ARRAY_SIZE(s3c244x_iodesc));</div><div class='add'>+	iotable_init(mach_desc, size);</div><div class='add'>+</div><div class='add'>+	/* rename any peripherals used differing from the s3c2410 */</div><div class='add'>+</div><div class='add'>+	s3c_device_i2c.name  = "s3c2440-i2c";</div><div class='add'>+	s3c_device_nand.name = "s3c2440-nand";</div><div class='add'>+	s3c_device_usbgadget.name = "s3c2440-usbgadget";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init s3c244x_init_clocks(int xtal)</div><div class='add'>+{</div><div class='add'>+	unsigned long clkdiv;</div><div class='add'>+	unsigned long camdiv;</div><div class='add'>+	unsigned long hclk, fclk, pclk;</div><div class='add'>+	int hdiv = 1;</div><div class='add'>+</div><div class='add'>+	/* now we've got our machine bits initialised, work out what</div><div class='add'>+	 * clocks we've got */</div><div class='add'>+</div><div class='add'>+	fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON), xtal) * 2;</div><div class='add'>+</div><div class='add'>+	clkdiv = __raw_readl(S3C2410_CLKDIVN);</div><div class='add'>+	camdiv = __raw_readl(S3C2440_CAMDIVN);</div><div class='add'>+</div><div class='add'>+	/* work out clock scalings */</div><div class='add'>+</div><div class='add'>+	switch (clkdiv &amp; S3C2440_CLKDIVN_HDIVN_MASK) {</div><div class='add'>+	case S3C2440_CLKDIVN_HDIVN_1:</div><div class='add'>+		hdiv = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case S3C2440_CLKDIVN_HDIVN_2:</div><div class='add'>+		hdiv = 2;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case S3C2440_CLKDIVN_HDIVN_4_8:</div><div class='add'>+		hdiv = (camdiv &amp; S3C2440_CAMDIVN_HCLK4_HALF) ? 8 : 4;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case S3C2440_CLKDIVN_HDIVN_3_6:</div><div class='add'>+		hdiv = (camdiv &amp; S3C2440_CAMDIVN_HCLK3_HALF) ? 6 : 3;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hclk = fclk / hdiv;</div><div class='add'>+	pclk = hclk / ((clkdiv &amp; S3C2440_CLKDIVN_PDIVN)? 2:1);</div><div class='add'>+</div><div class='add'>+	/* print brief summary of clocks, etc */</div><div class='add'>+</div><div class='add'>+	printk("S3C244X: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",</div><div class='add'>+	       print_mhz(fclk), print_mhz(hclk), print_mhz(pclk));</div><div class='add'>+</div><div class='add'>+	/* initialise the clocks here, to allow other things like the</div><div class='add'>+	 * console to use them, and to add new ones after the initialisation</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);</div><div class='add'>+	s3c2410_baseclk_add();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static struct sleep_save s3c244x_sleep[] = {</div><div class='add'>+	SAVE_ITEM(S3C2440_DSC0),</div><div class='add'>+	SAVE_ITEM(S3C2440_DSC1),</div><div class='add'>+	SAVE_ITEM(S3C2440_GPJDAT),</div><div class='add'>+	SAVE_ITEM(S3C2440_GPJCON),</div><div class='add'>+	SAVE_ITEM(S3C2440_GPJUP)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int s3c244x_suspend(struct sys_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	s3c2410_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c244x_resume(struct sys_device *dev)</div><div class='add'>+{</div><div class='add'>+	s3c2410_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s3c244x_suspend NULL</div><div class='add'>+#define s3c244x_resume  NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Since the S3C2442 and S3C2440 share  items, put both sysclasses here */</div><div class='add'>+</div><div class='add'>+struct sysdev_class s3c2440_sysclass = {</div><div class='add'>+	set_kset_name("s3c2440-core"),</div><div class='add'>+	.suspend	= s3c244x_suspend,</div><div class='add'>+	.resume		= s3c244x_resume</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sysdev_class s3c2442_sysclass = {</div><div class='add'>+	set_kset_name("s3c2442-core"),</div><div class='add'>+	.suspend	= s3c244x_suspend,</div><div class='add'>+	.resume		= s3c244x_resume</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* need to register class before we actually register the device, and</div><div class='add'>+ * we also need to ensure that it has been initialised before any of the</div><div class='add'>+ * drivers even try to use it (even if not on an s3c2440 based system)</div><div class='add'>+ * as a driver which may support both 2410 and 2440 may try and use it.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static int __init s3c2440_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_class_register(&amp;s3c2440_sysclass);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(s3c2440_core_init);</div><div class='add'>+</div><div class='add'>+static int __init s3c2442_core_init(void)</div><div class='add'>+{</div><div class='add'>+	return sysdev_class_register(&amp;s3c2442_sysclass);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(s3c2442_core_init);</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/s3c244x.h b/arch/arm/mach-s3c2410/s3c244x.h<br/>new file mode 100644<br/>index 000000000000..3e7f5f75134d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/s3c244x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/s3c244x.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* arch/arm/mach-s3c2410/s3c2440.h</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004-2005 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * Header file for S3C2440 and S3C2442 cpu support</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)</div><div class='add'>+</div><div class='add'>+extern void s3c244x_map_io(struct map_desc *mach_desc, int size);</div><div class='add'>+</div><div class='add'>+extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);</div><div class='add'>+</div><div class='add'>+extern void s3c244x_init_clocks(int xtal);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s3c244x_init_clocks NULL</div><div class='add'>+#define s3c244x_init_uarts NULL</div><div class='add'>+#define s3c244x_map_io NULL</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S<br/>index 73de2eaca22a..a7561a79fc82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/sleep.S</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='hunk'>@@ -66,7 +65,9 @@ ENTRY(s3c2410_cpu_suspend)</div><div class='ctx'> 	@@ flush the caches to ensure everything is back out to</div><div class='ctx'> 	@@ SDRAM before the core powers down</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	bl	arm920_flush_kern_cache_all</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	@@ prepare cpu to sleep</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +127,7 @@ s3c2410_sleep_save_phys:</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='ctx'> ENTRY(s3c2410_cpu_resume)</div><div class='del'>-	mov	r0, #PSR_I_BIT | PSR_F_BIT | MODE_SVC</div><div class='add'>+	mov	r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE</div><div class='ctx'> 	msr	cpsr_c, r0</div><div class='ctx'> </div><div class='ctx'> 	@@ load UART to allow us to print the two characters for</div><div class='head'>diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c<br/>index 9d7b799ea4a4..00d1cfca9712 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/time.c</a></div><div class='hunk'>@@ -18,11 +18,11 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -138,7 +138,7 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction s3c2410_timer_irq = {</div><div class='ctx'> 	.name		= "S3C2410 Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= s3c2410_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c<br/>index 495f8c6ffcb6..6b22d8f0a00d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/usb-simtec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-s3c2410/usb-simtec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-s3c2410/usb-simtec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-s3c2410/usb-simtec.c</a></div><div class='hunk'>@@ -85,8 +85,8 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		ret = request_irq(IRQ_USBOC, usb_simtec_ocirq,</div><div class='del'>-				  SA_INTERRUPT | SA_TRIGGER_RISING |</div><div class='del'>-				   SA_TRIGGER_FALLING,</div><div class='add'>+				  IRQF_DISABLED | IRQF_TRIGGER_RISING |</div><div class='add'>+				   IRQF_TRIGGER_FALLING,</div><div class='ctx'> 				  "USB Over-current", info);</div><div class='ctx'> 		if (ret != 0) {</div><div class='ctx'> 			printk(KERN_ERR "failed to request usb oc irq\n");</div><div class='head'>diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c<br/>index c58f12ba7a93..be06d668a3c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/assabet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/assabet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/assabet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/assabet.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c<br/>index 8269a9ef9afe..31afe50d7cd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cerf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/cerf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cerf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/cerf.c</a></div><div class='hunk'>@@ -10,11 +10,11 @@</div><div class='ctx'>  * Jan-2004 : Removed io map for flash [FB]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c<br/>index 676b5c5b75bb..a0dfa390e34b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/collie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/collie.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *  04-16-2001 Lineo Japan,Inc. ...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='hunk'>@@ -84,8 +83,8 @@ static struct scoop_pcmcia_config collie_pcmcia_config = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct mcp_plat_data collie_mcp_data = {</div><div class='del'>-	.mccr0          = MCCR0_ADM,</div><div class='del'>-	.sclk_rate      = 11981000,</div><div class='add'>+	.mccr0          = MCCR0_ADM | MCCR0_ExtClk,</div><div class='add'>+	.sclk_rate      = 9216000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SHARP_LOCOMO</div><div class='head'>diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c<br/>index 696d7d29c8a5..1e25b1d19fce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie_pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/collie_pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/collie_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/collie_pm.c</a></div><div class='hunk'>@@ -9,6 +9,9 @@</div><div class='ctx'>  * Li-ion batteries are angry beasts, and they like to explode. This driver is not finished,</div><div class='ctx'>  * and sometimes charges them when it should not. If it makes angry lithium to come your way...</div><div class='ctx'>  * ...well, you have been warned.</div><div class='add'>+ *</div><div class='add'>+ * Actually, this should be quite safe, it seems sharp leaves charger enabled by default,</div><div class='add'>+ * and my collie did not explode (yet).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -40,17 +43,16 @@ static void collie_charger_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (sharpsl_param.adadj != -1) {</div><div class='add'>+	if (sharpsl_param.adadj != -1)</div><div class='ctx'> 		ad_revise = sharpsl_param.adadj;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register interrupt handler. */</div><div class='del'>-	if ((err = request_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr, SA_INTERRUPT,</div><div class='add'>+	if ((err = request_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr, IRQF_DISABLED,</div><div class='ctx'> 			       "ACIN", sharpsl_ac_isr))) {</div><div class='ctx'> 		printk("Could not get irq %d.\n", COLLIE_IRQ_GPIO_AC_IN);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = request_irq(COLLIE_IRQ_GPIO_CO, sharpsl_chrg_full_isr, SA_INTERRUPT,</div><div class='add'>+	if ((err = request_irq(COLLIE_IRQ_GPIO_CO, sharpsl_chrg_full_isr, IRQF_DISABLED,</div><div class='ctx'> 			       "CO", sharpsl_chrg_full_isr))) {</div><div class='ctx'> 		free_irq(COLLIE_IRQ_GPIO_AC_IN, sharpsl_ac_isr);</div><div class='ctx'> 		printk("Could not get irq %d.\n", COLLIE_IRQ_GPIO_CO);</div><div class='hunk'>@@ -72,27 +74,17 @@ static void collie_measure_temp(int on)</div><div class='ctx'> </div><div class='ctx'> static void collie_charge(int on)</div><div class='ctx'> {</div><div class='del'>-	if (on) {</div><div class='del'>-		printk("Should start charger\n");</div><div class='del'>-	} else {</div><div class='del'>-		printk("Should stop charger\n");</div><div class='del'>-	}</div><div class='del'>-#ifdef I_AM_SURE</div><div class='add'>+	extern struct platform_device colliescoop_device;</div><div class='ctx'> </div><div class='del'>-	/* Zaurus seems to contain LTC1731 ; it should know when to</div><div class='add'>+	/* Zaurus seems to contain LTC1731; it should know when to</div><div class='ctx'> 	 * stop charging itself, so setting charge on should be</div><div class='ctx'> 	 * relatively harmless (as long as it is not done too often).</div><div class='ctx'> 	 */</div><div class='del'>-#define CF_BUF_CTRL_BASE 0xF0800000</div><div class='del'>-#define        SCOOP_REG(adr) (*(volatile unsigned short*)(CF_BUF_CTRL_BASE+(adr)))</div><div class='del'>-#define        SCOOP_REG_GPWR    SCOOP_REG(SCOOP_GPWR)</div><div class='del'>-</div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		set_scoop_gpio(&amp;colliescoop_device.dev, COLLIE_SCP_CHARGE_ON);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		reset_scoop_gpio(&amp;colliescoop_device.dev, COLLIE_SCP_CHARGE_ON);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void collie_discharge(int on)</div><div class='hunk'>@@ -127,7 +119,6 @@ int collie_read_backup_battery(void)</div><div class='ctx'> </div><div class='ctx'> 	ucb1x00_adc_enable(ucb);</div><div class='ctx'> </div><div class='del'>-	/* Gives 75..130 */</div><div class='ctx'> 	ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_BBAT_ON, 0);</div><div class='ctx'> 	voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD1, UCB_SYNC);</div><div class='ctx'> </div><div class='hunk'>@@ -146,9 +137,8 @@ int collie_read_main_battery(void)</div><div class='ctx'> 	ucb1x00_adc_enable(ucb);</div><div class='ctx'> 	ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_BBAT_ON);</div><div class='ctx'> 	ucb1x00_io_write(ucb, COLLIE_TC35143_GPIO_MBAT_ON, 0);</div><div class='del'>-	/* gives values 160..255 with battery removed... and</div><div class='del'>-	   145..255 with battery inserted. (on AC), goes as low as</div><div class='del'>-	   80 on DC. */</div><div class='add'>+</div><div class='add'>+	mdelay(1);</div><div class='ctx'> 	voltage = ucb1x00_adc_read(ucb, UCB_ADC_INP_AD1, UCB_SYNC);</div><div class='ctx'> </div><div class='ctx'> 	ucb1x00_io_write(ucb, 0, COLLIE_TC35143_GPIO_MBAT_ON);</div><div class='hunk'>@@ -192,7 +182,7 @@ static unsigned long read_devdata(int which)</div><div class='ctx'> 	case SHARPSL_BATT_TEMP:</div><div class='ctx'> 		return collie_read_temp();</div><div class='ctx'> 	case SHARPSL_ACIN_VOLT:</div><div class='del'>-		return 0x1;</div><div class='add'>+		return 500;</div><div class='ctx'> 	case SHARPSL_STATUS_ACIN: {</div><div class='ctx'> 		int ret = GPLR &amp; COLLIE_GPIO_AC_IN;</div><div class='ctx'> 		printk("AC status = %d\n", ret);</div><div class='hunk'>@@ -208,10 +198,33 @@ static unsigned long read_devdata(int which)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct battery_thresh collie_battery_levels_acin[] = {</div><div class='add'>+	{ 420, 100},</div><div class='add'>+	{ 417,  95},</div><div class='add'>+	{ 415,  90},</div><div class='add'>+	{ 413,  80},</div><div class='add'>+	{ 411,  75},</div><div class='add'>+	{ 408,  70},</div><div class='add'>+	{ 406,  60},</div><div class='add'>+	{ 403,  50},</div><div class='add'>+	{ 398,  40},</div><div class='add'>+	{ 391,  25},</div><div class='add'>+	{  10,   5},</div><div class='add'>+	{   0,   0},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct battery_thresh collie_battery_levels[] = {</div><div class='del'>-	{ 368, 100},</div><div class='del'>-	{ 358,  25},</div><div class='del'>-	{ 356,   5},</div><div class='add'>+	{ 394, 100},</div><div class='add'>+	{ 390,  95},</div><div class='add'>+	{ 380,  90},</div><div class='add'>+	{ 370,  80},</div><div class='add'>+	{ 368,  75},	/* From sharp code: battery high with frontlight */</div><div class='add'>+	{ 366,  70},	/* 60..90 -- fake values invented by me for testing */</div><div class='add'>+	{ 364,  60},</div><div class='add'>+	{ 362,  50},</div><div class='add'>+	{ 360,  40},</div><div class='add'>+	{ 358,  25},	/* From sharp code: battery low with frontlight */</div><div class='add'>+	{ 356,   5},	/* From sharp code: battery verylow with frontlight */</div><div class='ctx'> 	{   0,   0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -226,13 +239,21 @@ struct sharpsl_charger_machinfo collie_pm_machinfo = {</div><div class='ctx'> 	.postsuspend      = collie_postsuspend,</div><div class='ctx'> 	.charger_wakeup   = collie_charger_wakeup,</div><div class='ctx'> 	.should_wakeup    = collie_should_wakeup,</div><div class='del'>-	.bat_levels       = 3,</div><div class='add'>+	.bat_levels       = 12,</div><div class='ctx'> 	.bat_levels_noac  = collie_battery_levels,</div><div class='del'>-	.bat_levels_acin  = collie_battery_levels,</div><div class='add'>+	.bat_levels_acin  = collie_battery_levels_acin,</div><div class='ctx'> 	.status_high_acin = 368,</div><div class='ctx'> 	.status_low_acin  = 358,</div><div class='ctx'> 	.status_high_noac = 368,</div><div class='ctx'> 	.status_low_noac  = 358,</div><div class='add'>+	.charge_on_volt	  = 350,	/* spitz uses 2.90V, but lets play it safe. */</div><div class='add'>+	.charge_on_temp   = 550,</div><div class='add'>+	.charge_acin_high = 550,	/* collie does not seem to have sensor for this, anyway */</div><div class='add'>+	.charge_acin_low  = 450,	/* ignored, too */</div><div class='add'>+	.fatal_acin_volt  = 356,</div><div class='add'>+	.fatal_noacin_volt = 356,</div><div class='add'>+</div><div class='add'>+	.batfull_irq = 1,		/* We do not want periodical charge restarts */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init collie_pm_ucb_add(struct ucb1x00_dev *pdev)</div><div class='head'>diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c<br/>index 04c94ab6c18b..639597729932 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1110.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/cpu-sa1110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/cpu-sa1110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/cpu-sa1110.c</a></div><div class='hunk'>@@ -15,7 +15,10 @@</div><div class='ctx'>  *      SDRAM reads (rev A0, B0, B1)</div><div class='ctx'>  *</div><div class='ctx'>  * We ignore rev. A0 and B0 devices; I don't think they're worth supporting.</div><div class='add'>+ *</div><div class='add'>+ * The SDRAM type can be passed on the command line as cpu_sa1110.sdram=type</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -35,6 +38,7 @@</div><div class='ctx'> static struct cpufreq_driver sa1110_driver;</div><div class='ctx'> </div><div class='ctx'> struct sdram_params {</div><div class='add'>+	const char name[16];</div><div class='ctx'> 	u_char  rows;		/* bits				 */</div><div class='ctx'> 	u_char  cas_latency;	/* cycles			 */</div><div class='ctx'> 	u_char  tck;		/* clock cycle time (ns)	 */</div><div class='hunk'>@@ -50,54 +54,53 @@ struct sdram_info {</div><div class='ctx'> 	u_int	mdcas[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sdram_params tc59sm716_cl2_params __initdata = {</div><div class='del'>-	.rows			= 12,</div><div class='del'>-	.tck			= 10,</div><div class='del'>-	.trcd			= 20,</div><div class='del'>-	.trp			= 20,</div><div class='del'>-	.twr			= 10,</div><div class='del'>-	.refresh		= 64000,</div><div class='del'>-	.cas_latency		= 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sdram_params tc59sm716_cl3_params __initdata = {</div><div class='del'>-	.rows			= 12,</div><div class='del'>-	.tck			= 8,</div><div class='del'>-	.trcd			= 20,</div><div class='del'>-	.trp			= 20,</div><div class='del'>-	.twr			= 8,</div><div class='del'>-	.refresh		= 64000,</div><div class='del'>-	.cas_latency		= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sdram_params samsung_k4s641632d_tc75 __initdata = {</div><div class='del'>-	.rows			= 14,</div><div class='del'>-	.tck			= 9,</div><div class='del'>-	.trcd			= 27,</div><div class='del'>-	.trp			= 20,</div><div class='del'>-	.twr			= 9,</div><div class='del'>-	.refresh		= 64000,</div><div class='del'>-	.cas_latency		= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sdram_params samsung_km416s4030ct __initdata = {</div><div class='del'>-	.rows			= 13,</div><div class='del'>-	.tck			= 8,</div><div class='del'>-	.trcd			= 24,	/* 3 CLKs */</div><div class='del'>-	.trp			= 24,	/* 3 CLKs */</div><div class='del'>-	.twr			= 16,	/* Trdl: 2 CLKs */</div><div class='del'>-	.refresh		= 64000,</div><div class='del'>-	.cas_latency		= 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct sdram_params wbond_w982516ah75l_cl3_params __initdata = {</div><div class='del'>-	.rows			= 16,</div><div class='del'>-	.tck			= 8,</div><div class='del'>-	.trcd			= 20,</div><div class='del'>-	.trp			= 20,</div><div class='del'>-	.twr			= 8,</div><div class='del'>-	.refresh		= 64000,</div><div class='del'>-	.cas_latency		= 3,</div><div class='add'>+static struct sdram_params sdram_tbl[] __initdata = {</div><div class='add'>+	{	/* Toshiba TC59SM716 CL2 */</div><div class='add'>+		.name		= "TC59SM716-CL2",</div><div class='add'>+		.rows		= 12,</div><div class='add'>+		.tck		= 10,</div><div class='add'>+		.trcd		= 20,</div><div class='add'>+		.trp		= 20,</div><div class='add'>+		.twr		= 10,</div><div class='add'>+		.refresh	= 64000,</div><div class='add'>+		.cas_latency	= 2,</div><div class='add'>+	}, {	/* Toshiba TC59SM716 CL3 */</div><div class='add'>+		.name		= "TC59SM716-CL3",</div><div class='add'>+		.rows		= 12,</div><div class='add'>+		.tck		= 8,</div><div class='add'>+		.trcd		= 20,</div><div class='add'>+		.trp		= 20,</div><div class='add'>+		.twr		= 8,</div><div class='add'>+		.refresh	= 64000,</div><div class='add'>+		.cas_latency	= 3,</div><div class='add'>+	}, {	/* Samsung K4S641632D TC75 */</div><div class='add'>+		.name		= "K4S641632D",</div><div class='add'>+		.rows		= 14,</div><div class='add'>+		.tck		= 9,</div><div class='add'>+		.trcd		= 27,</div><div class='add'>+		.trp		= 20,</div><div class='add'>+		.twr		= 9,</div><div class='add'>+		.refresh	= 64000,</div><div class='add'>+		.cas_latency	= 3,</div><div class='add'>+	}, {	/* Samsung KM416S4030CT */</div><div class='add'>+		.name		= "KM416S4030CT",</div><div class='add'>+		.rows		= 13,</div><div class='add'>+		.tck		= 8,</div><div class='add'>+		.trcd		= 24,	/* 3 CLKs */</div><div class='add'>+		.trp		= 24,	/* 3 CLKs */</div><div class='add'>+		.twr		= 16,	/* Trdl: 2 CLKs */</div><div class='add'>+		.refresh	= 64000,</div><div class='add'>+		.cas_latency	= 3,</div><div class='add'>+	}, {	/* Winbond W982516AH75L CL3 */</div><div class='add'>+		.name		= "W982516AH75L",</div><div class='add'>+		.rows		= 16,</div><div class='add'>+		.tck		= 8,</div><div class='add'>+		.trcd		= 20,</div><div class='add'>+		.trp		= 20,</div><div class='add'>+		.twr		= 8,</div><div class='add'>+		.refresh	= 64000,</div><div class='add'>+		.cas_latency	= 3,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct sdram_params sdram_params;</div><div class='hunk'>@@ -336,19 +339,36 @@ static struct cpufreq_driver sa1110_driver = {</div><div class='ctx'> 	.name		= "sa1110",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct sdram_params *sa1110_find_sdram(const char *name)</div><div class='add'>+{</div><div class='add'>+	struct sdram_params *sdram;</div><div class='add'>+</div><div class='add'>+	for (sdram = sdram_tbl; sdram &lt; sdram_tbl + ARRAY_SIZE(sdram_tbl); sdram++)</div><div class='add'>+		if (strcmp(name, sdram-&gt;name) == 0)</div><div class='add'>+			return sdram;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char sdram_name[16];</div><div class='add'>+</div><div class='ctx'> static int __init sa1110_clk_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct sdram_params *sdram = NULL;</div><div class='add'>+	struct sdram_params *sdram;</div><div class='add'>+	const char *name = sdram_name;</div><div class='ctx'> </div><div class='del'>-	if (machine_is_assabet())</div><div class='del'>-		sdram = &amp;tc59sm716_cl3_params;</div><div class='add'>+	if (!name[0]) {</div><div class='add'>+		if (machine_is_assabet())</div><div class='add'>+			name = "TC59SM716-CL3";</div><div class='ctx'> </div><div class='del'>-	if (machine_is_pt_system3())</div><div class='del'>-		sdram = &amp;samsung_k4s641632d_tc75;</div><div class='add'>+		if (machine_is_pt_system3())</div><div class='add'>+			name = "K4S641632D";</div><div class='ctx'> </div><div class='del'>-	if (machine_is_h3100())</div><div class='del'>-		sdram = &amp;samsung_km416s4030ct;</div><div class='add'>+		if (machine_is_h3100())</div><div class='add'>+			name = "KM416S4030CT";</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	sdram = sa1110_find_sdram(name);</div><div class='ctx'> 	if (sdram) {</div><div class='ctx'> 		printk(KERN_DEBUG "SDRAM: tck: %d trcd: %d trp: %d"</div><div class='ctx'> 			" twr: %d refresh: %d cas_latency: %d\n",</div><div class='hunk'>@@ -363,4 +383,5 @@ static int __init sa1110_clk_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+module_param_string(sdram, sdram_name, sizeof(sdram_name), 0);</div><div class='ctx'> arch_initcall(sa1110_clk_init);</div><div class='head'>diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c<br/>index be0e4427bec7..3c6441d4bc59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/dma.c</a></div><div class='hunk'>@@ -124,7 +124,7 @@ int sa1100_request_dma (dma_device_t device, const char *device_id,</div><div class='ctx'> </div><div class='ctx'> 	i = dma - dma_chan;</div><div class='ctx'> 	regs = (dma_regs_t *)&amp;DDAR(i);</div><div class='del'>-	err = request_irq(IRQ_DMA0 + i, dma_irq_handler, SA_INTERRUPT,</div><div class='add'>+	err = request_irq(IRQ_DMA0 + i, dma_irq_handler, IRQF_DISABLED,</div><div class='ctx'> 			  device_id, regs);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='head'>diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c<br/>index 9ea71551fc04..4575f316e141 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/generic.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c<br/>index b04d92271020..7364478cec12 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3600.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/h3600.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/h3600.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/h3600.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *				   and abstracted EGPIO interface.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -741,7 +740,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re</div><div class='ctx'> static struct irqaction h3800_irq = {</div><div class='ctx'> 	.name		= "h3800_asic",</div><div class='ctx'> 	.handler	= h3800_IRQ_demux,</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> u32 kpio_int_shadow = 0;</div><div class='hunk'>@@ -836,7 +835,7 @@ static void __init h3800_init_irq(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING);</div><div class='del'>-	set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, &amp;h3800_IRQ_demux);</div><div class='add'>+	set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c<br/>index b3a56024182e..2891b8ca86dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/irq.c</a></div><div class='hunk'>@@ -11,12 +11,13 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "generic.h"</div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-assabet.c b/arch/arm/mach-sa1100/leds-assabet.c<br/>index e9aa9dff211a..ee9788989875 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-assabet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-assabet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-assabet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/leds-assabet.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *   - Green - toggles state every 50 timer interrupts</div><div class='ctx'>  *   - Red   - on if system is not idle</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-badge4.c b/arch/arm/mach-sa1100/leds-badge4.c<br/>index 0a8f87bb6c4f..280929be972d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-badge4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-badge4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-badge4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/leds-badge4.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-cerf.c b/arch/arm/mach-sa1100/leds-cerf.c<br/>index f6635a2d0e83..f38eeddbef10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-cerf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-cerf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-cerf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/leds-cerf.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Author: ???</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-hackkit.c b/arch/arm/mach-sa1100/leds-hackkit.c<br/>index 2e5fa14aa4eb..7e91cc90b5ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-hackkit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-hackkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-hackkit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/leds-hackkit.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * The HackKit has two leds (GPIO 22/23). The red led (gpio 22) is used</div><div class='ctx'>  * as cpu led, the green one is used as timer led.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-lart.c b/arch/arm/mach-sa1100/leds-lart.c<br/>index 187501490713..2d27d76cfc6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-lart.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-lart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-lart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/leds-lart.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  time, but in that case the timer events will still dictate the</div><div class='ctx'>  *  pace of the LED.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/leds-simpad.c b/arch/arm/mach-sa1100/leds-simpad.c<br/>index 6a27a2d32206..def090a87385 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-simpad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/leds-simpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/leds-simpad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/leds-simpad.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Juergen Messerer &lt;juergen.messerer@siemens.ch&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c<br/>index 9e02bc3712a0..af6d2775cf82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/neponset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/neponset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/neponset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/neponset.c</a></div><div class='hunk'>@@ -59,6 +59,14 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg</div><div class='ctx'> 		if (irr &amp; (IRR_ETHERNET | IRR_USAR)) {</div><div class='ctx'> 			desc-&gt;chip-&gt;mask(irq);</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * Ack the interrupt now to prevent re-entering</div><div class='add'>+			 * this neponset handler.  Again, this is safe</div><div class='add'>+			 * since we'll check the IRR register prior to</div><div class='add'>+			 * leaving.</div><div class='add'>+			 */</div><div class='add'>+			desc-&gt;chip-&gt;ack(irq);</div><div class='add'>+</div><div class='ctx'> 			if (irr &amp; IRR_ETHERNET) {</div><div class='ctx'> 				d = irq_desc + IRQ_NEPONSET_SMC9196;</div><div class='ctx'> 				desc_handle_irq(IRQ_NEPONSET_SMC9196, d, regs);</div><div class='head'>diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c<br/>index 0709ebab531c..c7bf7e0038f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pleb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/pleb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/pleb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/pleb.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c<br/>index 5aafe0b56992..8acab7b1e4c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/shannon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/shannon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/shannon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/shannon.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/arm/mach-sa1100/shannon.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c<br/>index d2c23b2c34d1..a9ae1b581aa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/simpad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/simpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/simpad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/simpad.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/arm/mach-sa1100/simpad.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S<br/>index 2fa1e289d177..5a84062f92af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/sleep.S</a></div><div class='hunk'>@@ -177,7 +177,7 @@ sa1110_sdram_controller_fix:</div><div class='ctx'> 	.data</div><div class='ctx'> 	.align 5</div><div class='ctx'> ENTRY(sa1100_cpu_resume)</div><div class='del'>-	mov	r0, #PSR_F_BIT | PSR_I_BIT | MODE_SVC</div><div class='add'>+	mov	r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE</div><div class='ctx'> 	msr	cpsr_c, r0			@ set SVC, irqs off</div><div class='ctx'> </div><div class='ctx'> 	ldr	r0, sleep_save_sp		@ stack phys addr</div><div class='head'>diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c<br/>index e4b435e634e4..49ae716e16c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-sa1100/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-sa1100/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-sa1100/time.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +111,7 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction sa1100_timer_irq = {</div><div class='ctx'> 	.name		= "SA11xx Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= sa1100_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c<br/>index 877600e212dd..1095df34fec0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-shark/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-shark/core.c</a></div><div class='hunk'>@@ -6,6 +6,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +90,7 @@ shark_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction shark_timer_irq = {</div><div class='ctx'> 	.name		= "Shark Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= shark_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-shark/dma.c b/arch/arm/mach-shark/dma.c<br/>index 835989a02918..6774b8d5d13d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-shark/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-shark/dma.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  Copyright (C) 1998 Phil Blundell</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c<br/>index 7bdeb70a0c10..7cd86d357a3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-shark/leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-shark/leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-shark/leds.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Changelog:</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c<br/>index 799697d32dec..864377176015 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-versatile/core.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -36,6 +35,7 @@</div><div class='ctx'> #include &lt;asm/hardware/arm_timer.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/icst307.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/vic.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/flash.h&gt;</div><div class='hunk'>@@ -112,10 +112,9 @@ void __init versatile_init_irq(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	vic_init(VA_VIC_BASE, IRQ_VIC_START, ~(1 &lt;&lt; 31));</div><div class='add'>+	vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0);</div><div class='ctx'> </div><div class='del'>-	set_irq_handler(IRQ_VICSOURCE31, sic_handle_irq);</div><div class='del'>-	enable_irq(IRQ_VICSOURCE31);</div><div class='add'>+	set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Do second interrupt controller */</div><div class='ctx'> 	writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);</div><div class='hunk'>@@ -354,11 +353,7 @@ static const struct icst307_params versatile_oscvco_params = {</div><div class='ctx'> static void versatile_oscvco_set(struct clk *clk, struct icst307_vco vco)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *sys_lock = __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_LOCK_OFFSET;</div><div class='del'>-#if defined(CONFIG_ARCH_VERSATILE_PB)</div><div class='del'>-	void __iomem *sys_osc = __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSC4_OFFSET;</div><div class='del'>-#elif defined(CONFIG_MACH_VERSATILE_AB)</div><div class='del'>-	void __iomem *sys_osc = __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSC1_OFFSET;</div><div class='del'>-#endif</div><div class='add'>+	void __iomem *sys_osc = __io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSCCLCD_OFFSET;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = readl(sys_osc) &amp; ~0x7ffff;</div><div class='hunk'>@@ -531,7 +526,7 @@ static void versatile_clcd_disable(struct clcd_fb *fb)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light off</div><div class='ctx'> 	 */</div><div class='del'>-	if (fb-&gt;panel == &amp;sanyo_2_5_in) {</div><div class='add'>+	if (machine_is_versatile_ab() &amp;&amp; fb-&gt;panel == &amp;sanyo_2_5_in) {</div><div class='ctx'> 		void __iomem *versatile_ib2_ctrl = __io_address(VERSATILE_IB2_CTRL);</div><div class='ctx'> 		unsigned long ctrl;</div><div class='ctx'> </div><div class='hunk'>@@ -580,7 +575,7 @@ static void versatile_clcd_enable(struct clcd_fb *fb)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light on</div><div class='ctx'> 	 */</div><div class='del'>-	if (fb-&gt;panel == &amp;sanyo_2_5_in) {</div><div class='add'>+	if (machine_is_versatile_ab() &amp;&amp; fb-&gt;panel == &amp;sanyo_2_5_in) {</div><div class='ctx'> 		void __iomem *versatile_ib2_ctrl = __io_address(VERSATILE_IB2_CTRL);</div><div class='ctx'> 		unsigned long ctrl;</div><div class='ctx'> </div><div class='hunk'>@@ -871,7 +866,7 @@ static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_re</div><div class='ctx'> </div><div class='ctx'> static struct irqaction versatile_timer_irq = {</div><div class='ctx'> 	.name		= "Versatile Timer Tick",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= versatile_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c<br/>index 722fbabc9cfb..41b370090b60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-versatile/pci.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * 14/04/2005 Initial version, colin.king@philips.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c<br/>index 1eb596782078..b257ef78ef45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/versatile_ab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_ab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-versatile/versatile_ab.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='head'>diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c<br/>index f17ab4fb548a..503725b166fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mach-versatile/versatile_pb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mach-versatile/versatile_pb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mach-versatile/versatile_pb.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig<br/>index c55b739e10ba..5f80f184cd32 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/Kconfig</a></div><div class='hunk'>@@ -15,8 +15,8 @@ config CPU_ARM610</div><div class='ctx'> 	select CPU_32v3</div><div class='ctx'> 	select CPU_CACHE_V3</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V3</div><div class='del'>-	select CPU_TLB_V3</div><div class='add'>+	select CPU_COPY_V3 if MMU</div><div class='add'>+	select CPU_TLB_V3 if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM610 is the successor to the ARM3 processor</div><div class='ctx'> 	  and was produced by VLSI Technology Inc.</div><div class='hunk'>@@ -31,8 +31,8 @@ config CPU_ARM710</div><div class='ctx'> 	select CPU_32v3</div><div class='ctx'> 	select CPU_CACHE_V3</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V3</div><div class='del'>-	select CPU_TLB_V3</div><div class='add'>+	select CPU_COPY_V3 if MMU</div><div class='add'>+	select CPU_TLB_V3 if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  A 32-bit RISC microprocessor based on the ARM7 processor core</div><div class='ctx'> 	  designed by Advanced RISC Machines Ltd. The ARM710 is the</div><div class='hunk'>@@ -50,8 +50,8 @@ config CPU_ARM720T</div><div class='ctx'> 	select CPU_ABRT_LV4T</div><div class='ctx'> 	select CPU_CACHE_V4</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WT</div><div class='del'>-	select CPU_TLB_V4WT</div><div class='add'>+	select CPU_COPY_V4WT if MMU</div><div class='add'>+	select CPU_TLB_V4WT if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  A 32-bit RISC processor with 8kByte Cache, Write Buffer and</div><div class='ctx'> 	  MMU built around an ARM7TDMI core.</div><div class='hunk'>@@ -61,15 +61,15 @@ config CPU_ARM720T</div><div class='ctx'> </div><div class='ctx'> # ARM920T</div><div class='ctx'> config CPU_ARM920T</div><div class='del'>-	bool "Support ARM920T processor" if !ARCH_S3C2410</div><div class='del'>-	depends on ARCH_EP93XX || ARCH_INTEGRATOR || ARCH_S3C2410 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200</div><div class='del'>-	default y if ARCH_S3C2410 || ARCH_AT91RM9200</div><div class='add'>+	bool "Support ARM920T processor"</div><div class='add'>+	depends on ARCH_EP93XX || ARCH_INTEGRATOR || CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200</div><div class='add'>+	default y if CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_AT91RM9200</div><div class='ctx'> 	select CPU_32v4</div><div class='ctx'> 	select CPU_ABRT_EV4T</div><div class='ctx'> 	select CPU_CACHE_V4WT</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM920T is licensed to be produced by numerous vendors,</div><div class='ctx'> 	  and is used in the Maverick EP9312 and the Samsung S3C2410.</div><div class='hunk'>@@ -89,8 +89,8 @@ config CPU_ARM922T</div><div class='ctx'> 	select CPU_ABRT_EV4T</div><div class='ctx'> 	select CPU_CACHE_V4WT</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM922T is a version of the ARM920T, but with smaller</div><div class='ctx'> 	  instruction and data caches. It is used in Altera's</div><div class='hunk'>@@ -108,8 +108,8 @@ config CPU_ARM925T</div><div class='ctx'> 	select CPU_ABRT_EV4T</div><div class='ctx'> 	select CPU_CACHE_V4WT</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'>  	help</div><div class='ctx'>  	  The ARM925T is a mix between the ARM920T and ARM926T, but with</div><div class='ctx'> 	  different instruction and data caches. It is used in TI's OMAP</div><div class='hunk'>@@ -121,13 +121,13 @@ config CPU_ARM925T</div><div class='ctx'> # ARM926T</div><div class='ctx'> config CPU_ARM926T</div><div class='ctx'> 	bool "Support ARM926T processor"</div><div class='del'>-	depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB</div><div class='del'>-	default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX</div><div class='add'>+	depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261</div><div class='add'>+	default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261</div><div class='ctx'> 	select CPU_32v5</div><div class='ctx'> 	select CPU_ABRT_EV5TJ</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a variant of the ARM920.  It has slightly different</div><div class='ctx'> 	  instruction sequences for cache and TLB operations.  Curiously,</div><div class='hunk'>@@ -144,8 +144,8 @@ config CPU_ARM1020</div><div class='ctx'> 	select CPU_ABRT_EV4T</div><div class='ctx'> 	select CPU_CACHE_V4WT</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM1020 is the 32K cached version of the ARM10 processor,</div><div class='ctx'> 	  with an addition of a floating-point unit.</div><div class='hunk'>@@ -161,8 +161,8 @@ config CPU_ARM1020E</div><div class='ctx'> 	select CPU_ABRT_EV4T</div><div class='ctx'> 	select CPU_CACHE_V4WT</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	depends on n</div><div class='ctx'> </div><div class='ctx'> # ARM1022E</div><div class='hunk'>@@ -172,8 +172,8 @@ config CPU_ARM1022</div><div class='ctx'> 	select CPU_32v5</div><div class='ctx'> 	select CPU_ABRT_EV4T</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB # can probably do better</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU # can probably do better</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM1022E is an implementation of the ARMv5TE architecture</div><div class='ctx'> 	  based upon the ARM10 integer core with a 16KiB L1 Harvard cache,</div><div class='hunk'>@@ -189,8 +189,8 @@ config CPU_ARM1026</div><div class='ctx'> 	select CPU_32v5</div><div class='ctx'> 	select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB # can probably do better</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_COPY_V4WB if MMU # can probably do better</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture</div><div class='ctx'> 	  based upon the ARM10 integer core.</div><div class='hunk'>@@ -207,8 +207,8 @@ config CPU_SA110</div><div class='ctx'> 	select CPU_ABRT_EV4</div><div class='ctx'> 	select CPU_CACHE_V4WB</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_COPY_V4WB</div><div class='del'>-	select CPU_TLB_V4WB</div><div class='add'>+	select CPU_COPY_V4WB if MMU</div><div class='add'>+	select CPU_TLB_V4WB if MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and</div><div class='ctx'> 	  is available at five speeds ranging from 100 MHz to 233 MHz.</div><div class='hunk'>@@ -227,7 +227,7 @@ config CPU_SA1100</div><div class='ctx'> 	select CPU_ABRT_EV4</div><div class='ctx'> 	select CPU_CACHE_V4WB</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_TLB_V4WB</div><div class='add'>+	select CPU_TLB_V4WB if MMU</div><div class='ctx'> </div><div class='ctx'> # XScale</div><div class='ctx'> config CPU_XSCALE</div><div class='hunk'>@@ -237,7 +237,7 @@ config CPU_XSCALE</div><div class='ctx'> 	select CPU_32v5</div><div class='ctx'> 	select CPU_ABRT_EV5T</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> </div><div class='ctx'> # XScale Core Version 3</div><div class='ctx'> config CPU_XSC3</div><div class='hunk'>@@ -247,7 +247,7 @@ config CPU_XSC3</div><div class='ctx'> 	select CPU_32v5</div><div class='ctx'> 	select CPU_ABRT_EV5T</div><div class='ctx'> 	select CPU_CACHE_VIVT</div><div class='del'>-	select CPU_TLB_V4WBI</div><div class='add'>+	select CPU_TLB_V4WBI if MMU</div><div class='ctx'> 	select IO_36</div><div class='ctx'> </div><div class='ctx'> # ARMv6</div><div class='hunk'>@@ -258,8 +258,8 @@ config CPU_V6</div><div class='ctx'> 	select CPU_ABRT_EV6</div><div class='ctx'> 	select CPU_CACHE_V6</div><div class='ctx'> 	select CPU_CACHE_VIPT</div><div class='del'>-	select CPU_COPY_V6</div><div class='del'>-	select CPU_TLB_V6</div><div class='add'>+	select CPU_COPY_V6 if MMU</div><div class='add'>+	select CPU_TLB_V6 if MMU</div><div class='ctx'> </div><div class='ctx'> # ARMv6k</div><div class='ctx'> config CPU_32v6K</div><div class='hunk'>@@ -277,17 +277,17 @@ config CPU_32v6K</div><div class='ctx'> # This defines the compiler instruction set which depends on the machine type.</div><div class='ctx'> config CPU_32v3</div><div class='ctx'> 	bool</div><div class='del'>-	select TLS_REG_EMUL if SMP</div><div class='add'>+	select TLS_REG_EMUL if SMP || !MMU</div><div class='ctx'> 	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP</div><div class='ctx'> </div><div class='ctx'> config CPU_32v4</div><div class='ctx'> 	bool</div><div class='del'>-	select TLS_REG_EMUL if SMP</div><div class='add'>+	select TLS_REG_EMUL if SMP || !MMU</div><div class='ctx'> 	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP</div><div class='ctx'> </div><div class='ctx'> config CPU_32v5</div><div class='ctx'> 	bool</div><div class='del'>-	select TLS_REG_EMUL if SMP</div><div class='add'>+	select TLS_REG_EMUL if SMP || !MMU</div><div class='ctx'> 	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP</div><div class='ctx'> </div><div class='ctx'> config CPU_32v6</div><div class='hunk'>@@ -334,6 +334,7 @@ config CPU_CACHE_VIVT</div><div class='ctx'> config CPU_CACHE_VIPT</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+if MMU</div><div class='ctx'> # The copy-page model</div><div class='ctx'> config CPU_COPY_V3</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -372,6 +373,8 @@ config CPU_TLB_V4WBI</div><div class='ctx'> config CPU_TLB_V6</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # CPU supports 36-bit I/O</div><div class='ctx'> #</div><div class='head'>diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile<br/>index 07a538505784..21a2770226ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/Makefile</a></div><div class='hunk'>@@ -2,10 +2,16 @@</div><div class='ctx'> # Makefile for the linux arm-specific parts of the memory manager.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y				:= consistent.o extable.o fault-armv.o \</div><div class='del'>-				   fault.o flush.o init.o ioremap.o mmap.o \</div><div class='add'>+obj-y				:= consistent.o extable.o fault.o init.o \</div><div class='add'>+				   iomap.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MMU)		+= fault-armv.o flush.o ioremap.o mmap.o \</div><div class='ctx'> 				   mm-armv.o</div><div class='ctx'> </div><div class='add'>+ifneq ($(CONFIG_MMU),y)</div><div class='add'>+obj-y				+= nommu.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_MODULES)		+= proc-syms.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ALIGNMENT_TRAP)	+= alignment.o</div><div class='head'>diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c<br/>index 705c98921c37..e0d21bbbe7d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/alignment.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/alignment.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/alignment.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/alignment.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S<br/>index 54e3c5bb5186..2ebc1b3bf856 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v4wb.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/cache-v4wb.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/cache-v4wb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/cache-v4wb.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/memory.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S<br/>index 3c58ebbf0359..2ee394b11bcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/copypage-v3.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/copypage-v3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/copypage-v3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/copypage-v3.S</a></div><div class='hunk'>@@ -35,7 +35,7 @@ ENTRY(v3_copy_user_page)</div><div class='ctx'> 	stmia	r0!, {r3, r4, ip, lr}		@	4</div><div class='ctx'> 	ldmneia	r1!, {r3, r4, ip, lr}		@	4</div><div class='ctx'> 	bne	1b				@	1</div><div class='del'>-	LOADREGS(fd, sp!, {r4, pc})		@	3</div><div class='add'>+	ldmfd	sp!, {r4, pc}			@	3</div><div class='ctx'> </div><div class='ctx'> 	.align	5</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c<br/>index 4a884baf3b9c..c5e0622c7765 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/fault.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c<br/>index 9ea1f87a7079..fe3f7f625008 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/init.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -26,8 +25,6 @@</div><div class='ctx'> #include &lt;asm/mach/arch.h&gt;</div><div class='ctx'> #include &lt;asm/mach/map.h&gt;</div><div class='ctx'> </div><div class='del'>-#define TABLE_SIZE	(2 * PTRS_PER_PTE * sizeof(pte_t))</div><div class='del'>-</div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='ctx'> extern pgd_t swapper_pg_dir[PTRS_PER_PGD];</div><div class='head'>diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c<br/>new file mode 100644<br/>index 000000000000..62066f3020c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/iomap.c</a></div><div class='hunk'>@@ -0,0 +1,55 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mm/iomap.c</div><div class='add'>+ *</div><div class='add'>+ * Map IO port and PCI memory spaces so that {read,write}[bwl] can</div><div class='add'>+ * be used to access this memory.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef __io</div><div class='add'>+void __iomem *ioport_map(unsigned long port, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	return __io(port);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ioport_map);</div><div class='add'>+</div><div class='add'>+void ioport_unmap(void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ioport_unmap);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='add'>+{</div><div class='add'>+	unsigned long start = pci_resource_start(dev, bar);</div><div class='add'>+	unsigned long len   = pci_resource_len(dev, bar);</div><div class='add'>+	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='add'>+</div><div class='add'>+	if (!len || !start)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='add'>+		len = maxlen;</div><div class='add'>+	if (flags &amp; IORESOURCE_IO)</div><div class='add'>+		return ioport_map(start, len);</div><div class='add'>+	if (flags &amp; IORESOURCE_MEM) {</div><div class='add'>+		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='add'>+			return ioremap(start, len);</div><div class='add'>+		return ioremap_nocache(start, len);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_iomap);</div><div class='add'>+</div><div class='add'>+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if ((unsigned long)addr &gt;= VMALLOC_START &amp;&amp;</div><div class='add'>+	    (unsigned long)addr &lt; VMALLOC_END)</div><div class='add'>+		iounmap(addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_iounmap);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c<br/>index c1f7180c7bed..dba7dddfe57d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/ioremap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/ioremap.c</a></div><div class='hunk'>@@ -27,7 +27,16 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Used by ioremap() and iounmap() code to mark (super)section-mapped</div><div class='add'>+ * I/O regions in vm_struct-&gt;flags field.</div><div class='add'>+ */</div><div class='add'>+#define VM_ARM_SECTION_MAPPING	0x80000000</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,</div><div class='hunk'>@@ -113,10 +122,168 @@ remap_area_pages(unsigned long start, unsigned long pfn,</div><div class='ctx'> 		dir++;</div><div class='ctx'> 	} while (address &amp;&amp; (address &lt; end));</div><div class='ctx'> </div><div class='del'>-	flush_cache_vmap(start, end);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+void __check_kvm_seq(struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	unsigned int seq;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		seq = init_mm.context.kvm_seq;</div><div class='add'>+		memcpy(pgd_offset(mm, VMALLOC_START),</div><div class='add'>+		       pgd_offset_k(VMALLOC_START),</div><div class='add'>+		       sizeof(pgd_t) * (pgd_index(VMALLOC_END) -</div><div class='add'>+					pgd_index(VMALLOC_START)));</div><div class='add'>+		mm-&gt;context.kvm_seq = seq;</div><div class='add'>+	} while (seq != init_mm.context.kvm_seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+/*</div><div class='add'>+ * Section support is unsafe on SMP - If you iounmap and ioremap a region,</div><div class='add'>+ * the other CPUs will not see this change until their next context switch.</div><div class='add'>+ * Meanwhile, (eg) if an interrupt comes in on one of those other CPUs</div><div class='add'>+ * which requires the new ioremap'd region to be referenced, the CPU will</div><div class='add'>+ * reference the _old_ region.</div><div class='add'>+ *</div><div class='add'>+ * Note that get_vm_area() allocates a guard 4K page, so we need to mask</div><div class='add'>+ * the size back to 1MB aligned or we will overflow in the loop below.</div><div class='add'>+ */</div><div class='add'>+static void unmap_area_sections(unsigned long virt, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr = virt, end = virt + (size &amp; ~SZ_1M);</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+</div><div class='add'>+	flush_cache_vunmap(addr, end);</div><div class='add'>+	pgd = pgd_offset_k(addr);</div><div class='add'>+	do {</div><div class='add'>+		pmd_t pmd, *pmdp = pmd_offset(pgd, addr);</div><div class='add'>+</div><div class='add'>+		pmd = *pmdp;</div><div class='add'>+		if (!pmd_none(pmd)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Clear the PMD from the page table, and</div><div class='add'>+			 * increment the kvm sequence so others</div><div class='add'>+			 * notice this change.</div><div class='add'>+			 *</div><div class='add'>+			 * Note: this is still racy on SMP machines.</div><div class='add'>+			 */</div><div class='add'>+			pmd_clear(pmdp);</div><div class='add'>+			init_mm.context.kvm_seq++;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Free the page table, if there was one.</div><div class='add'>+			 */</div><div class='add'>+			if ((pmd_val(pmd) &amp; PMD_TYPE_MASK) == PMD_TYPE_TABLE)</div><div class='add'>+				pte_free_kernel(pmd_page_kernel(pmd));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addr += PGDIR_SIZE;</div><div class='add'>+		pgd++;</div><div class='add'>+	} while (addr &lt; end);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that the active_mm is up to date - we want to</div><div class='add'>+	 * catch any use-after-iounmap cases.</div><div class='add'>+	 */</div><div class='add'>+	if (current-&gt;active_mm-&gt;context.kvm_seq != init_mm.context.kvm_seq)</div><div class='add'>+		__check_kvm_seq(current-&gt;active_mm);</div><div class='add'>+</div><div class='add'>+	flush_tlb_kernel_range(virt, end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+remap_area_sections(unsigned long virt, unsigned long pfn,</div><div class='add'>+		    unsigned long size, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	unsigned long prot, addr = virt, end = virt + size;</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Remove and free any PTE-based mapping, and</div><div class='add'>+	 * sync the current kernel mapping.</div><div class='add'>+	 */</div><div class='add'>+	unmap_area_sections(virt, size);</div><div class='add'>+</div><div class='add'>+	prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO) |</div><div class='add'>+	       (flags &amp; (L_PTE_CACHEABLE | L_PTE_BUFFERABLE));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARMv6 and above need XN set to prevent speculative prefetches</div><div class='add'>+	 * hitting IO.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_architecture() &gt;= CPU_ARCH_ARMv6)</div><div class='add'>+		prot |= PMD_SECT_XN;</div><div class='add'>+</div><div class='add'>+	pgd = pgd_offset_k(addr);</div><div class='add'>+	do {</div><div class='add'>+		pmd_t *pmd = pmd_offset(pgd, addr);</div><div class='add'>+</div><div class='add'>+		pmd[0] = __pmd(__pfn_to_phys(pfn) | prot);</div><div class='add'>+		pfn += SZ_1M &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		pmd[1] = __pmd(__pfn_to_phys(pfn) | prot);</div><div class='add'>+		pfn += SZ_1M &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		flush_pmd_entry(pmd);</div><div class='add'>+</div><div class='add'>+		addr += PGDIR_SIZE;</div><div class='add'>+		pgd++;</div><div class='add'>+	} while (addr &lt; end);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+remap_area_supersections(unsigned long virt, unsigned long pfn,</div><div class='add'>+			 unsigned long size, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	unsigned long prot, addr = virt, end = virt + size;</div><div class='add'>+	pgd_t *pgd;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Remove and free any PTE-based mapping, and</div><div class='add'>+	 * sync the current kernel mapping.</div><div class='add'>+	 */</div><div class='add'>+	unmap_area_sections(virt, size);</div><div class='add'>+</div><div class='add'>+	prot = PMD_TYPE_SECT | PMD_SECT_SUPER | PMD_SECT_AP_WRITE |</div><div class='add'>+			PMD_DOMAIN(DOMAIN_IO) |</div><div class='add'>+			(flags &amp; (L_PTE_CACHEABLE | L_PTE_BUFFERABLE));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARMv6 and above need XN set to prevent speculative prefetches</div><div class='add'>+	 * hitting IO.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_architecture() &gt;= CPU_ARCH_ARMv6)</div><div class='add'>+		prot |= PMD_SECT_XN;</div><div class='add'>+</div><div class='add'>+	pgd = pgd_offset_k(virt);</div><div class='add'>+	do {</div><div class='add'>+		unsigned long super_pmd_val, i;</div><div class='add'>+</div><div class='add'>+		super_pmd_val = __pfn_to_phys(pfn) | prot;</div><div class='add'>+		super_pmd_val |= ((pfn &gt;&gt; (32 - PAGE_SHIFT)) &amp; 0xf) &lt;&lt; 20;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			pmd_t *pmd = pmd_offset(pgd, addr);</div><div class='add'>+</div><div class='add'>+			pmd[0] = __pmd(super_pmd_val);</div><div class='add'>+			pmd[1] = __pmd(super_pmd_val);</div><div class='add'>+			flush_pmd_entry(pmd);</div><div class='add'>+</div><div class='add'>+			addr += PGDIR_SIZE;</div><div class='add'>+			pgd++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pfn += SUPERSECTION_SIZE &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	} while (addr &lt; end);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Remap an arbitrary physical address space into the kernel virtual</div><div class='ctx'>  * address space. Needed when the kernel wants to access high addresses</div><div class='hunk'>@@ -133,18 +300,41 @@ void __iomem *</div><div class='ctx'> __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,</div><div class='ctx'> 	      unsigned long flags)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'>  	struct vm_struct * area;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * High mappings must be supersection aligned</div><div class='add'>+	 */</div><div class='add'>+	if (pfn &gt;= 0x100000 &amp;&amp; (__pfn_to_phys(pfn) &amp; ~SUPERSECTION_MASK))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'>  	area = get_vm_area(size, VM_IOREMAP);</div><div class='ctx'>  	if (!area)</div><div class='ctx'>  		return NULL;</div><div class='ctx'>  	addr = (unsigned long)area-&gt;addr;</div><div class='del'>- 	if (remap_area_pages(addr, pfn, size, flags)) {</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	if ((((cpu_architecture() &gt;= CPU_ARCH_ARMv6) &amp;&amp; (get_cr() &amp; CR_XP)) ||</div><div class='add'>+	       cpu_is_xsc3()) &amp;&amp;</div><div class='add'>+	       !((__pfn_to_phys(pfn) | size | addr) &amp; ~SUPERSECTION_MASK)) {</div><div class='add'>+		area-&gt;flags |= VM_ARM_SECTION_MAPPING;</div><div class='add'>+		err = remap_area_supersections(addr, pfn, size, flags);</div><div class='add'>+	} else if (!((__pfn_to_phys(pfn) | size | addr) &amp; ~PMD_MASK)) {</div><div class='add'>+		area-&gt;flags |= VM_ARM_SECTION_MAPPING;</div><div class='add'>+		err = remap_area_sections(addr, pfn, size, flags);</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+		err = remap_area_pages(addr, pfn, size, flags);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='ctx'>  		vunmap((void *)addr);</div><div class='ctx'>  		return NULL;</div><div class='ctx'>  	}</div><div class='del'>- 	return (void __iomem *) (offset + (char *)addr);</div><div class='add'>+</div><div class='add'>+	flush_cache_vmap(addr, addr + size);</div><div class='add'>+	return (void __iomem *) (offset + addr);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__ioremap_pfn);</div><div class='ctx'> </div><div class='hunk'>@@ -173,53 +363,36 @@ EXPORT_SYMBOL(__ioremap);</div><div class='ctx'> </div><div class='ctx'> void __iounmap(void __iomem *addr)</div><div class='ctx'> {</div><div class='del'>-	vunmap((void *)(PAGE_MASK &amp; (unsigned long)addr));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__iounmap);</div><div class='del'>-</div><div class='del'>-#ifdef __io</div><div class='del'>-void __iomem *ioport_map(unsigned long port, unsigned int nr)</div><div class='del'>-{</div><div class='del'>-	return __io(port);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ioport_map);</div><div class='del'>-</div><div class='del'>-void ioport_unmap(void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ioport_unmap);</div><div class='del'>-#endif</div><div class='add'>+	struct vm_struct **p, *tmp;</div><div class='add'>+	unsigned int section_mapping = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='add'>+	addr = (void __iomem *)(PAGE_MASK &amp; (unsigned long)addr);</div><div class='ctx'> </div><div class='del'>-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='del'>-{</div><div class='del'>-	unsigned long start = pci_resource_start(dev, bar);</div><div class='del'>-	unsigned long len   = pci_resource_len(dev, bar);</div><div class='del'>-	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='del'>-</div><div class='del'>-	if (!len || !start)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='del'>-		len = maxlen;</div><div class='del'>-	if (flags &amp; IORESOURCE_IO)</div><div class='del'>-		return ioport_map(start, len);</div><div class='del'>-	if (flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='del'>-			return ioremap(start, len);</div><div class='del'>-		return ioremap_nocache(start, len);</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	/*</div><div class='add'>+	 * If this is a section based mapping we need to handle it</div><div class='add'>+	 * specially as the VM subysystem does not know how to handle</div><div class='add'>+	 * such a beast. We need the lock here b/c we need to clear</div><div class='add'>+	 * all the mappings before the area can be reclaimed</div><div class='add'>+	 * by someone else.</div><div class='add'>+	 */</div><div class='add'>+	write_lock(&amp;vmlist_lock);</div><div class='add'>+	for (p = &amp;vmlist ; (tmp = *p) ; p = &amp;tmp-&gt;next) {</div><div class='add'>+		if((tmp-&gt;flags &amp; VM_IOREMAP) &amp;&amp; (tmp-&gt;addr == addr)) {</div><div class='add'>+			if (tmp-&gt;flags &amp; VM_ARM_SECTION_MAPPING) {</div><div class='add'>+				*p = tmp-&gt;next;</div><div class='add'>+				unmap_area_sections((unsigned long)tmp-&gt;addr,</div><div class='add'>+						    tmp-&gt;size);</div><div class='add'>+				kfree(tmp);</div><div class='add'>+				section_mapping = 1;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pci_iomap);</div><div class='add'>+	write_unlock(&amp;vmlist_lock);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-void pci_iounmap(struct pci_dev *dev, void __iomem *addr)</div><div class='del'>-{</div><div class='del'>-	if ((unsigned long)addr &gt;= VMALLOC_START &amp;&amp;</div><div class='del'>-	    (unsigned long)addr &lt; VMALLOC_END)</div><div class='del'>-		iounmap(addr);</div><div class='add'>+	if (!section_mapping)</div><div class='add'>+		vunmap(addr);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pci_iounmap);</div><div class='del'>-#endif</div><div class='add'>+EXPORT_SYMBOL(__iounmap);</div><div class='head'>diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c<br/>index 95273de4f772..38769f5862bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/mm-armv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/mm-armv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/mm-armv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/mm-armv.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Page table sludge for ARM v3 and v4 processor architectures.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -227,7 +226,7 @@ void free_pgd_slow(pgd_t *pgd)</div><div class='ctx'> </div><div class='ctx'> 	pte = pmd_page(*pmd);</div><div class='ctx'> 	pmd_clear(pmd);</div><div class='del'>-	dec_page_state(nr_page_table_pages);</div><div class='add'>+	dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);</div><div class='ctx'> 	pte_lock_deinit(pte);</div><div class='ctx'> 	pte_free(pte);</div><div class='ctx'> 	pmd_free(pmd);</div><div class='hunk'>@@ -303,16 +302,16 @@ static struct mem_types mem_types[] __initdata = {</div><div class='ctx'> 		.prot_pte  = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |</div><div class='ctx'> 				L_PTE_WRITE,</div><div class='ctx'> 		.prot_l1   = PMD_TYPE_TABLE,</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT | PMD_SECT_UNCACHED |</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4 | PMD_SECT_UNCACHED |</div><div class='ctx'> 				PMD_SECT_AP_WRITE,</div><div class='ctx'> 		.domain    = DOMAIN_IO,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_CACHECLEAN] = {</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT,</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_MINICLEAN] = {</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE,</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4 | PMD_SECT_MINICACHE,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_LOW_VECTORS] = {</div><div class='hunk'>@@ -328,25 +327,25 @@ static struct mem_types mem_types[] __initdata = {</div><div class='ctx'> 		.domain    = DOMAIN_USER,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_MEMORY] = {</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4 | PMD_SECT_AP_WRITE,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_ROM] = {</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT,</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4,</div><div class='ctx'> 		.domain    = DOMAIN_KERNEL,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_IXP2000_DEVICE] = { /* IXP2400 requires XCB=101 for on-chip I/O */</div><div class='ctx'> 		.prot_pte  = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |</div><div class='ctx'> 				L_PTE_WRITE,</div><div class='ctx'> 		.prot_l1   = PMD_TYPE_TABLE,</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT | PMD_SECT_UNCACHED |</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4 | PMD_SECT_UNCACHED |</div><div class='ctx'> 				PMD_SECT_AP_WRITE | PMD_SECT_BUFFERABLE |</div><div class='ctx'> 				PMD_SECT_TEX(1),</div><div class='ctx'> 		.domain    = DOMAIN_IO,</div><div class='ctx'> 	},</div><div class='ctx'> 	[MT_NONSHARED_DEVICE] = {</div><div class='ctx'> 		.prot_l1   = PMD_TYPE_TABLE,</div><div class='del'>-		.prot_sect = PMD_TYPE_SECT | PMD_SECT_NONSHARED_DEV |</div><div class='add'>+		.prot_sect = PMD_TYPE_SECT | PMD_BIT4 | PMD_SECT_NONSHARED_DEV |</div><div class='ctx'> 				PMD_SECT_AP_WRITE,</div><div class='ctx'> 		.domain    = DOMAIN_IO,</div><div class='ctx'> 	}</div><div class='hunk'>@@ -376,14 +375,21 @@ void __init build_mem_type_table(void)</div><div class='ctx'> 		ecc_mask = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpu_arch &lt;= CPU_ARCH_ARMv5TEJ &amp;&amp; !cpu_is_xscale()) {</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(mem_types); i++) {</div><div class='add'>+	/*</div><div class='add'>+	 * Xscale must not have PMD bit 4 set for section mappings.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_is_xscale())</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(mem_types); i++)</div><div class='add'>+			mem_types[i].prot_sect &amp;= ~PMD_BIT4;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ARMv5 and lower, excluding Xscale, bit 4 must be set for</div><div class='add'>+	 * page tables.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_arch &lt; CPU_ARCH_ARMv6 &amp;&amp; !cpu_is_xscale())</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(mem_types); i++)</div><div class='ctx'> 			if (mem_types[i].prot_l1)</div><div class='ctx'> 				mem_types[i].prot_l1 |= PMD_BIT4;</div><div class='del'>-			if (mem_types[i].prot_sect)</div><div class='del'>-				mem_types[i].prot_sect |= PMD_BIT4;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	cp = &amp;cache_policies[cachepolicy];</div><div class='ctx'> 	kern_pgprot = user_pgprot = cp-&gt;pte;</div><div class='hunk'>@@ -407,8 +413,8 @@ void __init build_mem_type_table(void)</div><div class='ctx'> 		 * bit 4 becomes XN which we must clear for the</div><div class='ctx'> 		 * kernel memory mapping.</div><div class='ctx'> 		 */</div><div class='del'>-		mem_types[MT_MEMORY].prot_sect &amp;= ~PMD_BIT4;</div><div class='del'>-		mem_types[MT_ROM].prot_sect &amp;= ~PMD_BIT4;</div><div class='add'>+		mem_types[MT_MEMORY].prot_sect &amp;= ~PMD_SECT_XN;</div><div class='add'>+		mem_types[MT_ROM].prot_sect &amp;= ~PMD_SECT_XN;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Mark cache clean areas and XIP ROM read only</div><div class='head'>diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c<br/>index 3de7f84b53c2..29e54807c5bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/mmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/mmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/mmap.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/arch/arm/mm/mmap.c</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='head'>diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c<br/>new file mode 100644<br/>index 000000000000..1464ed817b5d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/nommu.c</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/arch/arm/mm/nommu.c</div><div class='add'>+ *</div><div class='add'>+ * ARM uCLinux supporting functions.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+</div><div class='add'>+void flush_dcache_page(struct page *page)</div><div class='add'>+{</div><div class='add'>+	__cpuc_flush_dcache_page(page_address(page));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(flush_dcache_page);</div><div class='add'>+</div><div class='add'>+void __iomem *__ioremap_pfn(unsigned long pfn, unsigned long offset,</div><div class='add'>+			    size_t size, unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (pfn &gt;= (0x100000000ULL &gt;&gt; PAGE_SHIFT))</div><div class='add'>+		return NULL;</div><div class='add'>+	return (void __iomem *) (offset + (pfn &lt;&lt; PAGE_SHIFT));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__ioremap_pfn);</div><div class='add'>+</div><div class='add'>+void __iomem *__ioremap(unsigned long phys_addr, size_t size,</div><div class='add'>+			unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	return (void __iomem *)phys_addr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__ioremap);</div><div class='add'>+</div><div class='add'>+void __iounmap(void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__iounmap);</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S<br/>index 959588884fa5..1d8316f3cecf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1020.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm1020.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -25,7 +26,6 @@</div><div class='ctx'>  *  CONFIG_CPU_ARM1020_CPU_IDLE -&gt; nohlt</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> #include &lt;asm/procinfo.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the maximum size of an area which will be invalidated</div><div class='ctx'>  * using the single invalidate entry instructions.  Anything larger</div><div class='hunk'>@@ -101,7 +103,9 @@ ENTRY(cpu_arm1020_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f 		@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='hunk'>@@ -359,6 +363,7 @@ ENTRY(cpu_arm1020_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1020_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r3, c7, c10, 4</div><div class='ctx'> 	mov	r1, #0xF			@ 16 segments</div><div class='hunk'>@@ -383,6 +388,7 @@ ENTRY(cpu_arm1020_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, r1, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, r1, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'>         </div><div class='ctx'> /*</div><div class='hunk'>@@ -392,6 +398,7 @@ ENTRY(cpu_arm1020_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1020_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -421,6 +428,7 @@ ENTRY(cpu_arm1020_set_pte)</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> #endif</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -430,12 +438,15 @@ __arm1020_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	adr	r5, arm1020_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm1020_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm1020_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='ctx'> 	orr	r0, r0, #0x4000 		@ .R.. .... .... ....</div><div class='ctx'> #endif</div><div class='hunk'>@@ -447,12 +458,9 @@ __arm1020_setup:</div><div class='ctx'> 	 * .RVI ZFRS BLDP WCAM</div><div class='ctx'> 	 * .011 1001 ..11 0101</div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm1020_cr1_clear, #object</div><div class='del'>-	.type	arm1020_cr1_set, #object</div><div class='del'>-arm1020_cr1_clear:</div><div class='del'>-	.word	0x593f</div><div class='del'>-arm1020_cr1_set:</div><div class='del'>-	.word	0x3935</div><div class='add'>+	.type	arm1020_crval, #object</div><div class='add'>+arm1020_crval:</div><div class='add'>+	crval	clear=0x0000593f, mmuset=0x00003935, ucset=0x00001930</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -518,6 +526,9 @@ __arm1020_proc_info:</div><div class='ctx'> 	.long   PMD_TYPE_SECT | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm1020_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S<br/>index be6d081ff2b7..89b1d6d3d7c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020e.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1020e.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1020e.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm1020e.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -25,7 +26,6 @@</div><div class='ctx'>  *  CONFIG_CPU_ARM1020_CPU_IDLE -&gt; nohlt</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -34,6 +34,8 @@</div><div class='ctx'> #include &lt;asm/procinfo.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the maximum size of an area which will be invalidated</div><div class='ctx'>  * using the single invalidate entry instructions.  Anything larger</div><div class='hunk'>@@ -101,7 +103,9 @@ ENTRY(cpu_arm1020e_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f 		@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='hunk'>@@ -344,6 +348,7 @@ ENTRY(cpu_arm1020e_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1020e_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r3, c7, c10, 4</div><div class='ctx'> 	mov	r1, #0xF			@ 16 segments</div><div class='hunk'>@@ -367,6 +372,7 @@ ENTRY(cpu_arm1020e_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, r1, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, r1, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'>         </div><div class='ctx'> /*</div><div class='hunk'>@@ -376,6 +382,7 @@ ENTRY(cpu_arm1020e_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1020e_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -403,6 +410,7 @@ ENTRY(cpu_arm1020e_set_pte)</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> #endif</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -412,12 +420,14 @@ __arm1020e_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+	adr	r5, arm1020e_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm1020e_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm1020e_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='ctx'> 	orr	r0, r0, #0x4000 		@ .R.. .... .... ....</div><div class='ctx'> #endif</div><div class='hunk'>@@ -429,12 +439,9 @@ __arm1020e_setup:</div><div class='ctx'> 	 * .RVI ZFRS BLDP WCAM</div><div class='ctx'> 	 * .011 1001 ..11 0101</div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm1020e_cr1_clear, #object</div><div class='del'>-	.type	arm1020e_cr1_set, #object</div><div class='del'>-arm1020e_cr1_clear:</div><div class='del'>-	.word	0x5f3f</div><div class='del'>-arm1020e_cr1_set:</div><div class='del'>-	.word	0x3935</div><div class='add'>+	.type	arm1020e_crval, #object</div><div class='add'>+arm1020e_crval:</div><div class='add'>+	crval	clear=0x00007f3f, mmuset=0x00003935, ucset=0x00001930</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -468,25 +475,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm1020e_name, #object</div><div class='ctx'> cpu_arm1020e_name:</div><div class='del'>-	.ascii	"ARM1020E"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_BPREDICT_DISABLE</div><div class='del'>-	.ascii	"B"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='del'>-	.ascii	"RR"</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM1020E"</div><div class='ctx'> 	.size	cpu_arm1020e_name, . - cpu_arm1020e_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -501,6 +490,10 @@ __arm1020e_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm1020e_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S<br/>index f778545d57a2..a089528e6bce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1022.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1022.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1022.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm1022.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -14,7 +15,6 @@</div><div class='ctx'>  * functions on the ARM1022E.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #include &lt;asm/procinfo.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the maximum size of an area which will be invalidated</div><div class='ctx'>  * using the single invalidate entry instructions.  Anything larger</div><div class='hunk'>@@ -90,7 +92,9 @@ ENTRY(cpu_arm1022_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f 		@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='hunk'>@@ -333,6 +337,7 @@ ENTRY(cpu_arm1022_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1022_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mov	r1, #(CACHE_DSEGMENTS - 1) &lt;&lt; 5	@ 16 segments</div><div class='ctx'> 1:	orr	r3, r1, #(CACHE_DENTRIES - 1) &lt;&lt; 26 @ 64 entries</div><div class='hunk'>@@ -349,6 +354,7 @@ ENTRY(cpu_arm1022_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, r1, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, r1, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'>         </div><div class='ctx'> /*</div><div class='hunk'>@@ -358,6 +364,7 @@ ENTRY(cpu_arm1022_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1022_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -385,6 +392,7 @@ ENTRY(cpu_arm1022_set_pte)</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> #endif</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -394,12 +402,14 @@ __arm1022_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+	adr	r5, arm1022_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm1022_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm1022_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='ctx'> 	orr	r0, r0, #0x4000 		@ .R..............</div><div class='ctx'> #endif</div><div class='hunk'>@@ -412,12 +422,9 @@ __arm1022_setup:</div><div class='ctx'> 	 * .011 1001 ..11 0101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm1022_cr1_clear, #object</div><div class='del'>-	.type	arm1022_cr1_set, #object</div><div class='del'>-arm1022_cr1_clear:</div><div class='del'>-	.word	0x7f3f</div><div class='del'>-arm1022_cr1_set:</div><div class='del'>-	.word	0x3935</div><div class='add'>+	.type	arm1022_crval, #object</div><div class='add'>+arm1022_crval:</div><div class='add'>+	crval	clear=0x00007f3f, mmuset=0x00003935, ucset=0x00001930</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -451,25 +458,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm1022_name, #object</div><div class='ctx'> cpu_arm1022_name:</div><div class='del'>-	.ascii	"arm1022"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_BPREDICT_DISABLE</div><div class='del'>-	.ascii	"B"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='del'>-	.ascii	"RR"</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM1022"</div><div class='ctx'> 	.size	cpu_arm1022_name, . - cpu_arm1022_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -484,6 +473,10 @@ __arm1022_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm1022_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S<br/>index 148c111fde73..d6d84d92c7c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1026.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm1026.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm1026.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm1026.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -14,7 +15,6 @@</div><div class='ctx'>  * functions on the ARM1026EJ-S.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -23,6 +23,8 @@</div><div class='ctx'> #include &lt;asm/procinfo.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the maximum size of an area which will be invalidated</div><div class='ctx'>  * using the single invalidate entry instructions.  Anything larger</div><div class='hunk'>@@ -90,7 +92,9 @@ ENTRY(cpu_arm1026_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f 		@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100 		@ ...i...s........</div><div class='hunk'>@@ -327,6 +331,7 @@ ENTRY(cpu_arm1026_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1026_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mov	r1, #0</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 1:	mrc	p15, 0, r15, c7, c14, 3		@ test, clean, invalidate</div><div class='hunk'>@@ -338,6 +343,7 @@ ENTRY(cpu_arm1026_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, r1, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, r1, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'>         </div><div class='ctx'> /*</div><div class='hunk'>@@ -347,6 +353,7 @@ ENTRY(cpu_arm1026_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm1026_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -374,6 +381,7 @@ ENTRY(cpu_arm1026_set_pte)</div><div class='ctx'> #ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> #endif</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -384,17 +392,19 @@ __arm1026_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='ctx'> 	mcr	p15, 0, r4, c2, c0		@ load page table pointer</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mov	r0, #4				@ explicitly disable writeback</div><div class='ctx'> 	mcr	p15, 7, r0, c15, c0, 0</div><div class='ctx'> #endif</div><div class='add'>+	adr	r5, arm1026_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm1026_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm1026_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='ctx'> 	orr	r0, r0, #0x4000 		@ .R.. .... .... ....</div><div class='ctx'> #endif</div><div class='hunk'>@@ -407,12 +417,9 @@ __arm1026_setup:</div><div class='ctx'> 	 * .011 1001 ..11 0101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm1026_cr1_clear, #object</div><div class='del'>-	.type	arm1026_cr1_set, #object</div><div class='del'>-arm1026_cr1_clear:</div><div class='del'>-	.word	0x7f3f</div><div class='del'>-arm1026_cr1_set:</div><div class='del'>-	.word	0x3935</div><div class='add'>+	.type	arm1026_crval, #object</div><div class='add'>+arm1026_crval:</div><div class='add'>+	crval	clear=0x00007f3f, mmuset=0x00003935, ucset=0x00001934</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -447,25 +454,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm1026_name, #object</div><div class='ctx'> cpu_arm1026_name:</div><div class='del'>-	.ascii	"ARM1026EJ-S"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_BPREDICT_DISABLE</div><div class='del'>-	.ascii	"B"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='del'>-	.ascii	"RR"</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM1026EJ-S"</div><div class='ctx'> 	.size	cpu_arm1026_name, . - cpu_arm1026_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -480,6 +469,10 @@ __arm1026_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm1026_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S<br/>index 540359b475d0..0432e4806888 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm6_7.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm6_7.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm6_7.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm6_7.S</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  *  linux/arch/arm/mm/proc-arm6,7.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997-2000 Russell King</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -199,10 +200,12 @@ ENTRY(cpu_arm7_do_idle)</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_arm6_switch_mm)</div><div class='ctx'> ENTRY(cpu_arm7_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		mov	r1, #0</div><div class='ctx'> 		mcr	p15, 0, r1, c7, c0, 0		@ flush cache</div><div class='ctx'> 		mcr	p15, 0, r0, c2, c0, 0		@ update page table ptr</div><div class='ctx'> 		mcr	p15, 0, r1, c5, c0, 0		@ flush TLBs</div><div class='add'>+#endif</div><div class='ctx'> 		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -214,6 +217,7 @@ ENTRY(cpu_arm7_switch_mm)</div><div class='ctx'> 		.align	5</div><div class='ctx'> ENTRY(cpu_arm6_set_pte)</div><div class='ctx'> ENTRY(cpu_arm7_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 		eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -232,6 +236,7 @@ ENTRY(cpu_arm7_set_pte)</div><div class='ctx'> 		movne	r2, #0</div><div class='ctx'> </div><div class='ctx'> 		str	r2, [r0]			@ hardware version</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -243,7 +248,9 @@ ENTRY(cpu_arm6_reset)</div><div class='ctx'> ENTRY(cpu_arm7_reset)</div><div class='ctx'> 		mov	r1, #0</div><div class='ctx'> 		mcr	p15, 0, r1, c7, c0, 0		@ flush cache</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		mcr	p15, 0, r1, c5, c0, 0		@ flush TLB</div><div class='add'>+#endif</div><div class='ctx'> 		mov	r1, #0x30</div><div class='ctx'> 		mcr	p15, 0, r1, c1, c0, 0		@ turn off MMU etc</div><div class='ctx'> 		mov	pc, r0</div><div class='hunk'>@@ -253,19 +260,27 @@ ENTRY(cpu_arm7_reset)</div><div class='ctx'> 		.type	__arm6_setup, #function</div><div class='ctx'> __arm6_setup:	mov	r0, #0</div><div class='ctx'> 		mcr	p15, 0, r0, c7, c0		@ flush caches on v3</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		mcr	p15, 0, r0, c5, c0		@ flush TLBs on v3</div><div class='ctx'> 		mov	r0, #0x3d			@ . ..RS BLDP WCAM</div><div class='ctx'> 		orr	r0, r0, #0x100			@ . ..01 0011 1101</div><div class='add'>+#else</div><div class='add'>+		mov	r0, #0x3c			@ . ..RS BLDP WCA.</div><div class='add'>+#endif</div><div class='ctx'> 		mov	pc, lr</div><div class='ctx'> 		.size	__arm6_setup, . - __arm6_setup</div><div class='ctx'> </div><div class='ctx'> 		.type	__arm7_setup, #function</div><div class='ctx'> __arm7_setup:	mov	r0, #0</div><div class='ctx'> 		mcr	p15, 0, r0, c7, c0		@ flush caches on v3</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		mcr	p15, 0, r0, c5, c0		@ flush TLBs on v3</div><div class='ctx'> 		mcr	p15, 0, r0, c3, c0		@ load domain access register</div><div class='ctx'> 		mov	r0, #0x7d			@ . ..RS BLDP WCAM</div><div class='ctx'> 		orr	r0, r0, #0x100			@ . ..01 0111 1101</div><div class='add'>+#else</div><div class='add'>+		mov	r0, #0x7c			@ . ..RS BLDP WCA.</div><div class='add'>+#endif</div><div class='ctx'> 		mov	pc, lr</div><div class='ctx'> 		.size	__arm7_setup, . - __arm7_setup</div><div class='ctx'> </div><div class='hunk'>@@ -340,6 +355,10 @@ __arm6_proc_info:</div><div class='ctx'> 		.long	0x41560600</div><div class='ctx'> 		.long	0xfffffff0</div><div class='ctx'> 		.long	0x00000c1e</div><div class='add'>+		.long   PMD_TYPE_SECT | \</div><div class='add'>+			PMD_BIT4 | \</div><div class='add'>+			PMD_SECT_AP_WRITE | \</div><div class='add'>+			PMD_SECT_AP_READ</div><div class='ctx'> 		b	__arm6_setup</div><div class='ctx'> 		.long	cpu_arch_name</div><div class='ctx'> 		.long	cpu_elf_name</div><div class='hunk'>@@ -356,6 +375,10 @@ __arm610_proc_info:</div><div class='ctx'> 		.long	0x41560610</div><div class='ctx'> 		.long	0xfffffff0</div><div class='ctx'> 		.long	0x00000c1e</div><div class='add'>+		.long   PMD_TYPE_SECT | \</div><div class='add'>+			PMD_BIT4 | \</div><div class='add'>+			PMD_SECT_AP_WRITE | \</div><div class='add'>+			PMD_SECT_AP_READ</div><div class='ctx'> 		b	__arm6_setup</div><div class='ctx'> 		.long	cpu_arch_name</div><div class='ctx'> 		.long	cpu_elf_name</div><div class='hunk'>@@ -372,6 +395,10 @@ __arm7_proc_info:</div><div class='ctx'> 		.long	0x41007000</div><div class='ctx'> 		.long	0xffffff00</div><div class='ctx'> 		.long	0x00000c1e</div><div class='add'>+		.long   PMD_TYPE_SECT | \</div><div class='add'>+			PMD_BIT4 | \</div><div class='add'>+			PMD_SECT_AP_WRITE | \</div><div class='add'>+			PMD_SECT_AP_READ</div><div class='ctx'> 		b	__arm7_setup</div><div class='ctx'> 		.long	cpu_arch_name</div><div class='ctx'> 		.long	cpu_elf_name</div><div class='hunk'>@@ -393,6 +420,10 @@ __arm710_proc_info:</div><div class='ctx'> 			PMD_BIT4 | \</div><div class='ctx'> 			PMD_SECT_AP_WRITE | \</div><div class='ctx'> 			PMD_SECT_AP_READ</div><div class='add'>+		.long   PMD_TYPE_SECT | \</div><div class='add'>+			PMD_BIT4 | \</div><div class='add'>+			PMD_SECT_AP_WRITE | \</div><div class='add'>+			PMD_SECT_AP_READ</div><div class='ctx'> 		b	__arm7_setup</div><div class='ctx'> 		.long	cpu_arch_name</div><div class='ctx'> 		.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S<br/>index 26f00ee2ad9a..c2f0705bfd49 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm720.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm720.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm720.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm720.S</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *  Copyright (C) 2000 Steve Hill (sjhill@cotw.com)</div><div class='ctx'>  *                     Rob Scott (rscott@mtrob.fdns.net)</div><div class='ctx'>  *  Copyright (C) 2000 ARM Limited, Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2004.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -29,6 +30,7 @@</div><div class='ctx'>  *			out of 'proc-arm6,7.S' per RMK discussion</div><div class='ctx'>  *   07-25-2000 SJH	Added idle function.</div><div class='ctx'>  *   08-25-2000	DBS	Updated for integration of ARM Ltd version.</div><div class='add'>+ *   04-20-2004 HSC	modified for non-paged memory management mode.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -39,6 +41,8 @@</div><div class='ctx'> #include &lt;asm/procinfo.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Function: arm720_proc_init (void)</div><div class='ctx'>  *	   : arm720_proc_fin (void)</div><div class='hunk'>@@ -75,10 +79,12 @@ ENTRY(cpu_arm720_do_idle)</div><div class='ctx'>  *	     the new.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_arm720_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		mov	r1, #0</div><div class='ctx'> 		mcr	p15, 0, r1, c7, c7, 0		@ invalidate cache</div><div class='ctx'> 		mcr	p15, 0, r0, c2, c0, 0		@ update page table ptr</div><div class='ctx'> 		mcr	p15, 0, r1, c8, c7, 0		@ flush TLB (v4)</div><div class='add'>+#endif</div><div class='ctx'> 		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -89,6 +95,7 @@ ENTRY(cpu_arm720_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 		.align	5</div><div class='ctx'> ENTRY(cpu_arm720_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 		eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -107,6 +114,7 @@ ENTRY(cpu_arm720_set_pte)</div><div class='ctx'> 		movne	r2, #0</div><div class='ctx'> </div><div class='ctx'> 		str	r2, [r0]			@ hardware version</div><div class='add'>+#endif</div><div class='ctx'> 		mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -117,7 +125,9 @@ ENTRY(cpu_arm720_set_pte)</div><div class='ctx'> ENTRY(cpu_arm720_reset)</div><div class='ctx'> 		mov	ip, #0</div><div class='ctx'> 		mcr	p15, 0, ip, c7, c7, 0		@ invalidate cache</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 		mcr	p15, 0, ip, c8, c7, 0		@ flush TLB (v4)</div><div class='add'>+#endif</div><div class='ctx'> 		mrc	p15, 0, ip, c1, c0, 0		@ get ctrl register</div><div class='ctx'> 		bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 		bic	ip, ip, #0x2100			@ ..v....s........</div><div class='hunk'>@@ -130,7 +140,9 @@ ENTRY(cpu_arm720_reset)</div><div class='ctx'> __arm710_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7, 0		@ invalidate caches</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7, 0		@ flush TLB (v4)</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register</div><div class='ctx'> 	ldr	r5, arm710_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='hunk'>@@ -156,12 +168,14 @@ arm710_cr1_set:</div><div class='ctx'> __arm720_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7, 0		@ invalidate caches</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7, 0		@ flush TLB (v4)</div><div class='add'>+#endif</div><div class='add'>+	adr	r5, arm720_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register</div><div class='del'>-	ldr	r5, arm720_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm720_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> 	mov	pc, lr				@ __ret (head.S)</div><div class='ctx'> 	.size	__arm720_setup, . - __arm720_setup</div><div class='ctx'> </div><div class='hunk'>@@ -171,12 +185,9 @@ __arm720_setup:</div><div class='ctx'> 	 * ..1. 1001 ..11 1101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm720_cr1_clear, #object</div><div class='del'>-	.type	arm720_cr1_set, #object</div><div class='del'>-arm720_cr1_clear:</div><div class='del'>-	.word	0x2f3f</div><div class='del'>-arm720_cr1_set:</div><div class='del'>-	.word	0x213d</div><div class='add'>+	.type	arm720_crval, #object</div><div class='add'>+arm720_crval:</div><div class='add'>+	crval	clear=0x00002f3f, mmuset=0x0000213d, ucset=0x00000130</div><div class='ctx'> </div><div class='ctx'> 		__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -234,6 +245,10 @@ __arm710_proc_info:</div><div class='ctx'> 			PMD_BIT4 | \</div><div class='ctx'> 			PMD_SECT_AP_WRITE | \</div><div class='ctx'> 			PMD_SECT_AP_READ</div><div class='add'>+		.long   PMD_TYPE_SECT | \</div><div class='add'>+			PMD_BIT4 | \</div><div class='add'>+			PMD_SECT_AP_WRITE | \</div><div class='add'>+			PMD_SECT_AP_READ</div><div class='ctx'> 		b	__arm710_setup				@ cpu_flush</div><div class='ctx'> 		.long	cpu_arch_name				@ arch_name</div><div class='ctx'> 		.long	cpu_elf_name				@ elf_name</div><div class='hunk'>@@ -255,6 +270,10 @@ __arm720_proc_info:</div><div class='ctx'> 			PMD_BIT4 | \</div><div class='ctx'> 			PMD_SECT_AP_WRITE | \</div><div class='ctx'> 			PMD_SECT_AP_READ</div><div class='add'>+		.long   PMD_TYPE_SECT | \</div><div class='add'>+			PMD_BIT4 | \</div><div class='add'>+			PMD_SECT_AP_WRITE | \</div><div class='add'>+			PMD_SECT_AP_READ</div><div class='ctx'> 		b	__arm720_setup				@ cpu_flush</div><div class='ctx'> 		.long	cpu_arch_name				@ arch_name</div><div class='ctx'> 		.long	cpu_elf_name				@ elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S<br/>index a17f79e0199c..4adb46b3a4e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm920.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm920.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm920.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm920.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999,2000 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -25,7 +26,6 @@</div><div class='ctx'>  *  CONFIG_CPU_ARM920_CPU_IDLE -&gt; nohlt</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='hunk'>@@ -97,7 +97,9 @@ ENTRY(cpu_arm920_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='hunk'>@@ -317,6 +319,7 @@ ENTRY(cpu_arm920_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm920_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c6, 0		@ invalidate D cache</div><div class='hunk'>@@ -337,6 +340,7 @@ ENTRY(cpu_arm920_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -346,6 +350,7 @@ ENTRY(cpu_arm920_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm920_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -372,6 +377,7 @@ ENTRY(cpu_arm920_set_pte)</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -381,12 +387,14 @@ __arm920_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+	adr	r5, arm920_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm920_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm920_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.size	__arm920_setup, . - __arm920_setup</div><div class='ctx'> </div><div class='hunk'>@@ -396,12 +404,9 @@ __arm920_setup:</div><div class='ctx'> 	 * ..11 0001 ..11 0101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm920_cr1_clear, #object</div><div class='del'>-	.type	arm920_cr1_set, #object</div><div class='del'>-arm920_cr1_clear:</div><div class='del'>-	.word	0x3f3f</div><div class='del'>-arm920_cr1_set:</div><div class='del'>-	.word	0x3135</div><div class='add'>+	.type	arm920_crval, #object</div><div class='add'>+arm920_crval:</div><div class='add'>+	crval	clear=0x00003f3f, mmuset=0x00003135, ucset=0x00001130</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -435,19 +440,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm920_name, #object</div><div class='ctx'> cpu_arm920_name:</div><div class='del'>-	.ascii	"ARM920T"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM920T"</div><div class='ctx'> 	.size	cpu_arm920_name, . - cpu_arm920_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -464,6 +457,10 @@ __arm920_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm920_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S<br/>index bbde4a024a48..571f082f0247 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm922.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm922.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm922.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm922.S</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *  Copyright (C) 1999,2000 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='ctx'>  *  Copyright (C) 2001 Altera Corporation</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -26,7 +27,6 @@</div><div class='ctx'>  *  CONFIG_CPU_ARM922_CPU_IDLE -&gt; nohlt</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='hunk'>@@ -99,7 +99,9 @@ ENTRY(cpu_arm922_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='hunk'>@@ -321,6 +323,7 @@ ENTRY(cpu_arm922_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm922_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c6, 0		@ invalidate D cache</div><div class='hunk'>@@ -341,6 +344,7 @@ ENTRY(cpu_arm922_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -350,6 +354,7 @@ ENTRY(cpu_arm922_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm922_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -376,6 +381,7 @@ ENTRY(cpu_arm922_set_pte)</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -385,12 +391,14 @@ __arm922_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+	adr	r5, arm922_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm922_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm922_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.size	__arm922_setup, . - __arm922_setup</div><div class='ctx'> </div><div class='hunk'>@@ -400,12 +408,9 @@ __arm922_setup:</div><div class='ctx'> 	 * ..11 0001 ..11 0101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm922_cr1_clear, #object</div><div class='del'>-	.type	arm922_cr1_set, #object</div><div class='del'>-arm922_cr1_clear:</div><div class='del'>-	.word	0x3f3f</div><div class='del'>-arm922_cr1_set:</div><div class='del'>-	.word	0x3135</div><div class='add'>+	.type	arm922_crval, #object</div><div class='add'>+arm922_crval:</div><div class='add'>+	crval	clear=0x00003f3f, mmuset=0x00003135, ucset=0x00001130</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -439,19 +444,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm922_name, #object</div><div class='ctx'> cpu_arm922_name:</div><div class='del'>-	.ascii	"ARM922T"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM922T"</div><div class='ctx'> 	.size	cpu_arm922_name, . - cpu_arm922_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -468,6 +461,10 @@ __arm922_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm922_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S<br/>index 224ce226a01b..8d9a9f93b011 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm925.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm925.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm925.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm925.S</a></div><div class='hunk'>@@ -9,6 +9,8 @@</div><div class='ctx'>  *  Update for Linux-2.6 and cache flush improvements</div><div class='ctx'>  *  Copyright (C) 2004 Nokia Corporation by Tony Lindgren &lt;tony@atomide.com&gt;</div><div class='ctx'>  *</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2004.</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or</div><div class='hunk'>@@ -48,7 +50,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='hunk'>@@ -122,7 +123,9 @@ ENTRY(cpu_arm925_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='hunk'>@@ -369,6 +372,7 @@ ENTRY(cpu_arm925_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm925_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c6, 0		@ invalidate D cache</div><div class='hunk'>@@ -383,6 +387,7 @@ ENTRY(cpu_arm925_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -392,6 +397,7 @@ ENTRY(cpu_arm925_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm925_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -420,6 +426,7 @@ ENTRY(cpu_arm925_set_pte)</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> #endif</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -438,18 +445,20 @@ __arm925_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mov	r0, #4				@ disable write-back on caches explicitly</div><div class='ctx'> 	mcr	p15, 7, r0, c15, c0, 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	adr	r5, arm925_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm925_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm925_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='ctx'> 	orr	r0, r0, #0x4000			@ .1.. .... .... ....</div><div class='ctx'> #endif</div><div class='hunk'>@@ -462,12 +471,9 @@ __arm925_setup:</div><div class='ctx'> 	 * .011 0001 ..11 1101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm925_cr1_clear, #object</div><div class='del'>-	.type	arm925_cr1_set, #object</div><div class='del'>-arm925_cr1_clear:</div><div class='del'>-	.word	0x7f3f</div><div class='del'>-arm925_cr1_set:</div><div class='del'>-	.word	0x313d</div><div class='add'>+	.type	arm925_crval, #object</div><div class='add'>+arm925_crval:</div><div class='add'>+	crval	clear=0x00007f3f, mmuset=0x0000313d, ucset=0x00001130</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -501,22 +507,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm925_name, #object</div><div class='ctx'> cpu_arm925_name:</div><div class='del'>-	.ascii	"ARM925T"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='del'>-	.ascii	"RR"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM925T"</div><div class='ctx'> 	.size	cpu_arm925_name, . - cpu_arm925_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -531,6 +522,10 @@ __arm925_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm925_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -550,6 +545,10 @@ __arm915_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm925_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S<br/>index 4e2a087cf388..1e89d4080474 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm926.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-arm926.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-arm926.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-arm926.S</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999-2001 ARM Limited</div><div class='ctx'>  *  Copyright (C) 2000 Deep Blue Solutions Ltd.</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -25,7 +26,6 @@</div><div class='ctx'>  *  CONFIG_CPU_ARM926_CPU_IDLE -&gt; nohlt</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='hunk'>@@ -85,7 +85,9 @@ ENTRY(cpu_arm926_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='hunk'>@@ -329,6 +331,7 @@ ENTRY(cpu_arm926_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm926_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c6, 0		@ invalidate D cache</div><div class='hunk'>@@ -341,6 +344,7 @@ ENTRY(cpu_arm926_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -350,6 +354,7 @@ ENTRY(cpu_arm926_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_arm926_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -378,6 +383,7 @@ ENTRY(cpu_arm926_set_pte)</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> #endif</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -387,7 +393,9 @@ __arm926_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='hunk'>@@ -395,11 +403,11 @@ __arm926_setup:</div><div class='ctx'> 	mcr	p15, 7, r0, c15, c0, 0</div><div class='ctx'> #endif </div><div class='ctx'> </div><div class='add'>+	adr	r5, arm926_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, arm926_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, arm926_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='ctx'> 	orr	r0, r0, #0x4000			@ .1.. .... .... ....</div><div class='ctx'> #endif</div><div class='hunk'>@@ -412,12 +420,9 @@ __arm926_setup:</div><div class='ctx'> 	 * .011 0001 ..11 0101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	arm926_cr1_clear, #object</div><div class='del'>-	.type	arm926_cr1_set, #object</div><div class='del'>-arm926_cr1_clear:</div><div class='del'>-	.word	0x7f3f</div><div class='del'>-arm926_cr1_set:</div><div class='del'>-	.word	0x3135</div><div class='add'>+	.type	arm926_crval, #object</div><div class='add'>+arm926_crval:</div><div class='add'>+	crval	clear=0x00007f3f, mmuset=0x00003135, ucset=0x00001134</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -451,22 +456,7 @@ cpu_elf_name:</div><div class='ctx'> </div><div class='ctx'> 	.type	cpu_arm926_name, #object</div><div class='ctx'> cpu_arm926_name:</div><div class='del'>-	.ascii	"ARM926EJ-S"</div><div class='del'>-#ifndef CONFIG_CPU_ICACHE_DISABLE</div><div class='del'>-	.ascii	"i"</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_CPU_DCACHE_DISABLE</div><div class='del'>-	.ascii	"d"</div><div class='del'>-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH</div><div class='del'>-	.ascii	"(wt)"</div><div class='del'>-#else</div><div class='del'>-	.ascii	"(wb)"</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN</div><div class='del'>-	.ascii	"RR"</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-	.ascii	"\0"</div><div class='add'>+	.asciz	"ARM926EJ-S"</div><div class='ctx'> 	.size	cpu_arm926_name, . - cpu_arm926_name</div><div class='ctx'> </div><div class='ctx'> 	.align</div><div class='hunk'>@@ -483,6 +473,10 @@ __arm926_proc_info:</div><div class='ctx'> 		PMD_BIT4 | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_BIT4 | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__arm926_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S<br/>index 7cfc2604a1ee..9e2c89eb2115 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-macros.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-macros.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-macros.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-macros.S</a></div><div class='hunk'>@@ -49,3 +49,13 @@</div><div class='ctx'> 	.macro	asid, rd, rn</div><div class='ctx'> 	and	\rd, \rn, #255</div><div class='ctx'> 	.endm</div><div class='add'>+</div><div class='add'>+	.macro	crval, clear, mmuset, ucset</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	.word	\clear</div><div class='add'>+	.word	\mmuset</div><div class='add'>+#else</div><div class='add'>+	.word	\clear</div><div class='add'>+	.word	\ucset</div><div class='add'>+#endif</div><div class='add'>+	.endm</div><div class='head'>diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S<br/>index a2dd5ae1077d..c878064e9b88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa110.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-sa110.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa110.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-sa110.S</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  *  linux/arch/arm/mm/proc-sa110.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997-2002 Russell King</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -22,6 +23,8 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * the cache line size of the I and D cache</div><div class='ctx'>  */</div><div class='hunk'>@@ -67,7 +70,9 @@ ENTRY(cpu_sa110_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='hunk'>@@ -130,11 +135,15 @@ ENTRY(cpu_sa110_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_sa110_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	lr, [sp, #-4]!</div><div class='ctx'> 	bl	v4wb_flush_kern_cache_all	@ clears IP</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='ctx'> 	ldr	pc, [sp], #4</div><div class='add'>+#else</div><div class='add'>+	mov	pc, lr</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_sa110_set_pte(ptep, pte)</div><div class='hunk'>@@ -143,6 +152,7 @@ ENTRY(cpu_sa110_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_sa110_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -164,6 +174,7 @@ ENTRY(cpu_sa110_set_pte)</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -173,12 +184,15 @@ __sa110_setup:</div><div class='ctx'> 	mov	r10, #0</div><div class='ctx'> 	mcr	p15, 0, r10, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r10, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r10, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	adr	r5, sa110_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, sa110_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, sa110_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.size	__sa110_setup, . - __sa110_setup</div><div class='ctx'> </div><div class='hunk'>@@ -188,12 +202,9 @@ __sa110_setup:</div><div class='ctx'> 	 * ..01 0001 ..11 1101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	sa110_cr1_clear, #object</div><div class='del'>-	.type	sa110_cr1_set, #object</div><div class='del'>-sa110_cr1_clear:</div><div class='del'>-	.word	0x3f3f</div><div class='del'>-sa110_cr1_set:</div><div class='del'>-	.word	0x113d</div><div class='add'>+	.type	sa110_crval, #object</div><div class='add'>+sa110_crval:</div><div class='add'>+	crval	clear=0x00003f3f, mmuset=0x0000113d, ucset=0x00001130</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -244,6 +255,9 @@ __sa110_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__sa110_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S<br/>index 777ad99c1439..b23b66a6155a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa1100.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-sa1100.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-sa1100.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-sa1100.S</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  *  linux/arch/arm/mm/proc-sa1100.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1997-2002 Russell King</div><div class='add'>+ *  hacked for non-paged-MM by Hyok S. Choi, 2003.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -26,6 +27,8 @@</div><div class='ctx'> #include &lt;asm/pgtable-hwdef.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "proc-macros.S"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * the cache line size of the I and D cache</div><div class='ctx'>  */</div><div class='hunk'>@@ -77,7 +80,9 @@ ENTRY(cpu_sa1100_reset)</div><div class='ctx'> 	mov	ip, #0</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches</div><div class='ctx'> 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='add'>+#endif</div><div class='ctx'> 	mrc	p15, 0, ip, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	ip, ip, #0x000f			@ ............wcam</div><div class='ctx'> 	bic	ip, ip, #0x1100			@ ...i...s........</div><div class='hunk'>@@ -142,12 +147,16 @@ ENTRY(cpu_sa1100_dcache_clean_area)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_sa1100_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	lr, [sp, #-4]!</div><div class='ctx'> 	bl	v4wb_flush_kern_cache_all	@ clears IP</div><div class='ctx'> 	mcr	p15, 0, ip, c9, c0, 0		@ invalidate RB</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ load page table pointer</div><div class='ctx'> 	mcr	p15, 0, ip, c8, c7, 0		@ invalidate I &amp; D TLBs</div><div class='ctx'> 	ldr	pc, [sp], #4</div><div class='add'>+#else</div><div class='add'>+	mov	pc, lr</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * cpu_sa1100_set_pte(ptep, pte)</div><div class='hunk'>@@ -156,6 +165,7 @@ ENTRY(cpu_sa1100_switch_mm)</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_sa1100_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	eor	r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY</div><div class='hunk'>@@ -177,6 +187,7 @@ ENTRY(cpu_sa1100_set_pte)</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain WB</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	__INIT</div><div class='hunk'>@@ -186,12 +197,14 @@ __sa1100_setup:</div><div class='ctx'> 	mov	r0, #0</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c7		@ invalidate I,D caches on v4</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer on v4</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7		@ invalidate I,D TLBs on v4</div><div class='add'>+#endif</div><div class='add'>+	adr	r5, sa1100_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0		@ get control register v4</div><div class='del'>-	ldr	r5, sa1100_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, sa1100_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.size	__sa1100_setup, . - __sa1100_setup</div><div class='ctx'> </div><div class='hunk'>@@ -201,12 +214,9 @@ __sa1100_setup:</div><div class='ctx'> 	 * ..11 0001 ..11 1101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	sa1100_cr1_clear, #object</div><div class='del'>-	.type	sa1100_cr1_set, #object</div><div class='del'>-sa1100_cr1_clear:</div><div class='del'>-	.word	0x3f3f</div><div class='del'>-sa1100_cr1_set:</div><div class='del'>-	.word	0x313d</div><div class='add'>+	.type	sa1100_crval, #object</div><div class='add'>+sa1100_crval:</div><div class='add'>+	crval	clear=0x00003f3f, mmuset=0x0000313d, ucset=0x00001130</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -265,6 +275,9 @@ __sa1100_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__sa1100_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -285,6 +298,9 @@ __sa1110_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__sa1100_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S<br/>index ee6f15298735..6f72549f8843 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v6.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-v6.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-v6.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-v6.S</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  *  linux/arch/arm/mm/proc-v6.S</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2001 Deep Blue Solutions Ltd.</div><div class='add'>+ *  Modified by Catalin Marinas for noMMU support</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='hunk'>@@ -29,38 +30,6 @@</div><div class='ctx'> #define TTB_RGN_WT	(2 &lt;&lt; 3)</div><div class='ctx'> #define TTB_RGN_WB	(3 &lt;&lt; 3)</div><div class='ctx'> </div><div class='del'>-	.macro	cpsie, flags</div><div class='del'>-	.ifc \flags, f</div><div class='del'>-	.long	0xf1080040</div><div class='del'>-	.exitm</div><div class='del'>-	.endif</div><div class='del'>-	.ifc \flags, i</div><div class='del'>-	.long	0xf1080080</div><div class='del'>-	.exitm</div><div class='del'>-	.endif</div><div class='del'>-	.ifc \flags, if</div><div class='del'>-	.long	0xf10800c0</div><div class='del'>-	.exitm</div><div class='del'>-	.endif</div><div class='del'>-	.err</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='del'>-	.macro	cpsid, flags</div><div class='del'>-	.ifc \flags, f</div><div class='del'>-	.long	0xf10c0040</div><div class='del'>-	.exitm</div><div class='del'>-	.endif</div><div class='del'>-	.ifc \flags, i</div><div class='del'>-	.long	0xf10c0080</div><div class='del'>-	.exitm</div><div class='del'>-	.endif</div><div class='del'>-	.ifc \flags, if</div><div class='del'>-	.long	0xf10c00c0</div><div class='del'>-	.exitm</div><div class='del'>-	.endif</div><div class='del'>-	.err</div><div class='del'>-	.endm</div><div class='del'>-</div><div class='ctx'> ENTRY(cpu_v6_proc_init)</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='hunk'>@@ -120,6 +89,7 @@ ENTRY(cpu_v6_dcache_clean_area)</div><div class='ctx'>  *	- we are not using split page tables</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_v6_switch_mm)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mov	r2, #0</div><div class='ctx'> 	ldr	r1, [r1, #MM_CONTEXT_ID]	@ get mm-&gt;context.id</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -129,6 +99,7 @@ ENTRY(cpu_v6_switch_mm)</div><div class='ctx'> 	mcr	p15, 0, r2, c7, c10, 4		@ drain write buffer</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 0		@ set TTB 0</div><div class='ctx'> 	mcr	p15, 0, r1, c13, c0, 1		@ set context ID</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -151,6 +122,7 @@ ENTRY(cpu_v6_switch_mm)</div><div class='ctx'>  *	  1111   0   1   1	r/w	r/w</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(cpu_v6_set_pte)</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	str	r1, [r0], #-2048		@ linux version</div><div class='ctx'> </div><div class='ctx'> 	bic	r2, r1, #0x000003f0</div><div class='hunk'>@@ -177,6 +149,7 @@ ENTRY(cpu_v6_set_pte)</div><div class='ctx'> </div><div class='ctx'> 	str	r2, [r0]</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 1 @ flush_pte</div><div class='add'>+#endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -226,22 +199,24 @@ __v6_setup:</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c5, 0		@ invalidate I cache</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c15, 0		@ clean+invalidate cache</div><div class='ctx'> 	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='ctx'> 	mcr	p15, 0, r0, c8, c7, 0		@ invalidate I + D TLBs</div><div class='ctx'> 	mcr	p15, 0, r0, c2, c0, 2		@ TTB control register</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	orr	r4, r4, #TTB_RGN_WBWA|TTB_S	@ mark PTWs shared, outer cacheable</div><div class='ctx'> #endif</div><div class='ctx'> 	mcr	p15, 0, r4, c2, c0, 1		@ load TTB1</div><div class='add'>+#endif /* CONFIG_MMU */</div><div class='ctx'> #ifdef CONFIG_VFP</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0, 2</div><div class='ctx'> 	orr	r0, r0, #(0xf &lt;&lt; 20)</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 2		@ Enable full access to VFP</div><div class='ctx'> #endif</div><div class='add'>+	adr	r5, v6_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0, 0		@ read control register</div><div class='del'>-	ldr	r5, v6_cr1_clear		@ get mask for bits to clear</div><div class='ctx'> 	bic	r0, r0, r5			@ clear bits them</div><div class='del'>-	ldr	r5, v6_cr1_set			@ get mask for bits to set</div><div class='del'>-	orr	r0, r0, r5			@ set them</div><div class='add'>+	orr	r0, r0, r6			@ set them</div><div class='ctx'> 	mov	pc, lr				@ return to head.S:__ret</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -250,12 +225,9 @@ __v6_setup:</div><div class='ctx'> 	 * rrrr rrrx xxx0 0101 xxxx xxxx x111 xxxx &lt; forced</div><div class='ctx'> 	 *         0 110       0011 1.00 .111 1101 &lt; we want</div><div class='ctx'> 	 */</div><div class='del'>-	.type	v6_cr1_clear, #object</div><div class='del'>-	.type	v6_cr1_set, #object</div><div class='del'>-v6_cr1_clear:</div><div class='del'>-	.word	0x01e0fb7f</div><div class='del'>-v6_cr1_set:</div><div class='del'>-	.word	0x00c0387d</div><div class='add'>+	.type	v6_crval, #object</div><div class='add'>+v6_crval:</div><div class='add'>+	crval	clear=0x01e0fb7f, mmuset=0x00c0387d, ucset=0x00c0187c</div><div class='ctx'> </div><div class='ctx'> 	.type	v6_processor_functions, #object</div><div class='ctx'> ENTRY(v6_processor_functions)</div><div class='hunk'>@@ -294,6 +266,10 @@ __v6_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_XN | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__v6_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S<br/>index 8d32e21fe151..4ace2d8090c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xsc3.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-xsc3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xsc3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-xsc3.S</a></div><div class='hunk'>@@ -426,23 +426,26 @@ __xsc3_setup:</div><div class='ctx'> 	orr	r0, r0, #(1 &lt;&lt; 10)		@ enable L2 for LLR cache</div><div class='ctx'> #endif</div><div class='ctx'> 	mcr	p15, 0, r0, c1, c0, 1		@ set auxiliary control reg</div><div class='add'>+</div><div class='add'>+	adr	r5, xsc3_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0, 0		@ get control register</div><div class='del'>-	bic	r0, r0, #0x0002			@ .... .... .... ..A.</div><div class='del'>-	orr	r0, r0, #0x0005			@ .... .... .... .C.M</div><div class='add'>+	bic	r0, r0, r5			@ .... .... .... ..A.</div><div class='add'>+	orr	r0, r0, r6			@ .... .... .... .C.M</div><div class='ctx'> #if BTB_ENABLE</div><div class='del'>-	bic	r0, r0, #0x0200			@ .... ..R. .... ....</div><div class='del'>-	orr	r0, r0, #0x3900			@ ..VI Z..S .... ....</div><div class='del'>-#else</div><div class='del'>-	bic	r0, r0, #0x0a00			@ .... Z.R. .... ....</div><div class='del'>-	orr	r0, r0, #0x3100			@ ..VI ...S .... ....</div><div class='add'>+	orr	r0, r0, #0x00000800		@ ..VI Z..S .... ....</div><div class='ctx'> #endif</div><div class='ctx'> #if L2_CACHE_ENABLE</div><div class='del'>-	orr 	r0, r0, #0x4000000		@ L2 enable</div><div class='add'>+	orr 	r0, r0, #0x04000000		@ L2 enable</div><div class='ctx'> #endif</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> </div><div class='ctx'> 	.size	__xsc3_setup, . - __xsc3_setup</div><div class='ctx'> </div><div class='add'>+	.type	xsc3_crval, #object</div><div class='add'>+xsc3_crval:</div><div class='add'>+	crval	clear=0x04003b02, mmuset=0x00003105, ucset=0x00001100</div><div class='add'>+</div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -487,7 +490,14 @@ cpu_xsc3_name:</div><div class='ctx'> __xsc3_proc_info:</div><div class='ctx'> 	.long	0x69056000</div><div class='ctx'> 	.long	0xffffe000</div><div class='del'>-	.long	0x00000c0e</div><div class='add'>+	.long	PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_BUFFERABLE | \</div><div class='add'>+		PMD_SECT_CACHEABLE | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xsc3_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S<br/>index 29bcc4dd6517..521538671f4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xscale.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/mm/proc-xscale.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/mm/proc-xscale.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/mm/proc-xscale.S</a></div><div class='hunk'>@@ -138,17 +138,23 @@ ENTRY(cpu_xscale_proc_fin)</div><div class='ctx'>  * to what would be the reset vector.</div><div class='ctx'>  *</div><div class='ctx'>  * loc: location to jump to for soft reset</div><div class='add'>+ *</div><div class='add'>+ * Beware PXA270 erratum E7.</div><div class='ctx'>  */</div><div class='ctx'> 	.align	5</div><div class='ctx'> ENTRY(cpu_xscale_reset)</div><div class='ctx'> 	mov	r1, #PSR_F_BIT|PSR_I_BIT|SVC_MODE</div><div class='ctx'> 	msr	cpsr_c, r1			@ reset CPSR</div><div class='add'>+	mcr	p15, 0, r1, c10, c4, 1		@ unlock I-TLB</div><div class='add'>+	mcr	p15, 0, r1, c8, c5, 0		@ invalidate I-TLB</div><div class='ctx'> 	mrc	p15, 0, r1, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	bic	r1, r1, #0x0086			@ ........B....CA.</div><div class='ctx'> 	bic	r1, r1, #0x3900			@ ..VIZ..S........</div><div class='add'>+	sub	pc, pc, #4			@ flush pipeline</div><div class='add'>+	@ *** cache line aligned ***</div><div class='ctx'> 	mcr	p15, 0, r1, c1, c0, 0		@ ctrl register</div><div class='del'>-	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches &amp; BTB</div><div class='ctx'> 	bic	r1, r1, #0x0001			@ ...............M</div><div class='add'>+	mcr	p15, 0, ip, c7, c7, 0		@ invalidate I,D caches &amp; BTB</div><div class='ctx'> 	mcr	p15, 0, r1, c1, c0, 0		@ ctrl register</div><div class='ctx'> 	@ CAUTION: MMU turned off from this point. We count on the pipeline</div><div class='ctx'> 	@ already containing those two last instructions to survive.</div><div class='hunk'>@@ -475,11 +481,12 @@ __xscale_setup:</div><div class='ctx'> 	orr     r0, r0, #1 &lt;&lt; 6			@ cp6 for IOP3xx and Bulverde</div><div class='ctx'> 	orr	r0, r0, #1 &lt;&lt; 13		@ Its undefined whether this</div><div class='ctx'> 	mcr	p15, 0, r0, c15, c1, 0		@ affects USR or SVC modes</div><div class='add'>+</div><div class='add'>+	adr	r5, xscale_crval</div><div class='add'>+	ldmia	r5, {r5, r6}</div><div class='ctx'> 	mrc	p15, 0, r0, c1, c0, 0		@ get control register</div><div class='del'>-	ldr	r5, xscale_cr1_clear</div><div class='ctx'> 	bic	r0, r0, r5</div><div class='del'>-	ldr	r5, xscale_cr1_set</div><div class='del'>-	orr	r0, r0, r5</div><div class='add'>+	orr	r0, r0, r6</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.size	__xscale_setup, . - __xscale_setup</div><div class='ctx'> </div><div class='hunk'>@@ -489,12 +496,9 @@ __xscale_setup:</div><div class='ctx'> 	 * ..11 1.01 .... .101</div><div class='ctx'> 	 * </div><div class='ctx'> 	 */</div><div class='del'>-	.type	xscale_cr1_clear, #object</div><div class='del'>-	.type	xscale_cr1_set, #object</div><div class='del'>-xscale_cr1_clear:</div><div class='del'>-	.word	0x3b07</div><div class='del'>-xscale_cr1_set:</div><div class='del'>-	.word	0x3905</div><div class='add'>+	.type	xscale_crval, #object</div><div class='add'>+xscale_crval:</div><div class='add'>+	crval	clear=0x00003b07, mmuset=0x00003905, ucset=0x00001900</div><div class='ctx'> </div><div class='ctx'> 	__INITDATA</div><div class='ctx'> </div><div class='hunk'>@@ -595,6 +599,9 @@ __80200_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -615,6 +622,9 @@ __8032x_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -635,6 +645,9 @@ __8033x_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -655,6 +668,9 @@ __pxa250_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -675,6 +691,9 @@ __pxa210_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -695,6 +714,9 @@ __ixp2400_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b       __xscale_setup</div><div class='ctx'> 	.long   cpu_arch_name</div><div class='ctx'> 	.long   cpu_elf_name</div><div class='hunk'>@@ -715,6 +737,9 @@ __ixp2800_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b       __xscale_setup</div><div class='ctx'> 	.long   cpu_arch_name</div><div class='ctx'> 	.long   cpu_elf_name</div><div class='hunk'>@@ -735,6 +760,9 @@ __ixp42x_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b       __xscale_setup</div><div class='ctx'> 	.long   cpu_arch_name</div><div class='ctx'> 	.long   cpu_elf_name</div><div class='hunk'>@@ -750,7 +778,14 @@ __ixp42x_proc_info:</div><div class='ctx'> __ixp46x_proc_info:</div><div class='ctx'> 	.long   0x69054200</div><div class='ctx'> 	.long   0xffffff00</div><div class='del'>-	.long   0x00000c0e</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_BUFFERABLE | \</div><div class='add'>+		PMD_SECT_CACHEABLE | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b       __xscale_setup</div><div class='ctx'> 	.long   cpu_arch_name</div><div class='ctx'> 	.long   cpu_elf_name</div><div class='hunk'>@@ -771,6 +806,9 @@ __pxa255_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='hunk'>@@ -791,6 +829,9 @@ __pxa270_proc_info:</div><div class='ctx'> 		PMD_SECT_CACHEABLE | \</div><div class='ctx'> 		PMD_SECT_AP_WRITE | \</div><div class='ctx'> 		PMD_SECT_AP_READ</div><div class='add'>+	.long   PMD_TYPE_SECT | \</div><div class='add'>+		PMD_SECT_AP_WRITE | \</div><div class='add'>+		PMD_SECT_AP_READ</div><div class='ctx'> 	b	__xscale_setup</div><div class='ctx'> 	.long	cpu_arch_name</div><div class='ctx'> 	.long	cpu_elf_name</div><div class='head'>diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S<br/>index 51940a96d6a6..3e6fb5d21d64 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/entry26.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/entry26.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/entry26.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/entry26.S</a></div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> It is called from the kernel with code similar to this:</div><div class='ctx'> </div><div class='ctx'> 	mov	fp, #0</div><div class='del'>-	teqp	pc, #PSR_I_BIT | MODE_SVC</div><div class='add'>+	teqp	pc, #PSR_I_BIT | SVC_MODE</div><div class='ctx'> 	ldr	r4, .LC2</div><div class='ctx'> 	ldr	pc, [r4]		@ Call FP module USR entry point</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11.c b/arch/arm/nwfpe/fpa11.c<br/>index 7b3d74d73c80..cc60acde84d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpa11.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include "fpmodule.h"</div><div class='ctx'> #include "fpmodule.inl"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11.h b/arch/arm/nwfpe/fpa11.h<br/>index 28cd79a451d3..4a4d02c09112 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpa11.h</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define GET_USERREG() ((struct pt_regs *)(THREAD_START_SP + (unsigned long)current_thread_info()) - 1)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* includes */</div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11_cpdo.c b/arch/arm/nwfpe/fpa11_cpdo.c<br/>index 4a31dfd94068..2cebb1529607 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11_cpdo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11_cpdo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11_cpdo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpa11_cpdo.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "fpa11.h"</div><div class='ctx'> #include "fpopcode.h"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11_cpdt.c b/arch/arm/nwfpe/fpa11_cpdt.c<br/>index 32859fa8dcfc..79f8e67cc6c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11_cpdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11_cpdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11_cpdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpa11_cpdt.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "fpa11.h"</div><div class='ctx'> #include "softfloat.h"</div><div class='ctx'> #include "fpopcode.h"</div><div class='head'>diff --git a/arch/arm/nwfpe/fpa11_cprt.c b/arch/arm/nwfpe/fpa11_cprt.c<br/>index 7c67023655e4..9843dc533047 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11_cprt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpa11_cprt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpa11_cprt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpa11_cprt.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "fpa11.h"</div><div class='ctx'> #include "fpopcode.h"</div><div class='ctx'> #include "fpa11.inl"</div><div class='head'>diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c<br/>index 2dfe1ac42ee8..4c0ab50f399a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpmodule.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpmodule.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpmodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpmodule.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #include "fpa11.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* XXX */</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -33,7 +32,8 @@</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-/* XXX */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/thread_notify.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "softfloat.h"</div><div class='ctx'> #include "fpopcode.h"</div><div class='hunk'>@@ -56,16 +56,28 @@ void fp_send_sig(unsigned long sig, struct task_struct *p, int priv);</div><div class='ctx'> extern char fpe_type[];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int nwfpe_notify(struct notifier_block *self, unsigned long cmd, void *v)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *thread = v;</div><div class='add'>+</div><div class='add'>+	if (cmd == THREAD_NOTIFY_FLUSH)</div><div class='add'>+		nwfpe_init_fpa(&amp;thread-&gt;fpstate);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block nwfpe_notifier_block = {</div><div class='add'>+	.notifier_call = nwfpe_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* kernel function prototypes required */</div><div class='ctx'> void fp_setup(void);</div><div class='ctx'> </div><div class='ctx'> /* external declarations for saved kernel symbols */</div><div class='ctx'> extern void (*kern_fp_enter)(void);</div><div class='del'>-extern void (*fp_init)(union fp_state *);</div><div class='ctx'> </div><div class='ctx'> /* Original value of fp_enter from kernel before patched by fpe_init. */</div><div class='ctx'> static void (*orig_fp_enter)(void);</div><div class='del'>-static void (*orig_fp_init)(union fp_state *);</div><div class='ctx'> </div><div class='ctx'> /* forward declarations */</div><div class='ctx'> extern void nwfpe_enter(void);</div><div class='hunk'>@@ -88,20 +100,20 @@ static int __init fpe_init(void)</div><div class='ctx'> 	printk(KERN_WARNING "NetWinder Floating Point Emulator V0.97 ("</div><div class='ctx'> 	       NWFPE_BITS " precision)\n");</div><div class='ctx'> </div><div class='add'>+	thread_register_notifier(&amp;nwfpe_notifier_block);</div><div class='add'>+</div><div class='ctx'> 	/* Save pointer to the old FP handler and then patch ourselves in */</div><div class='ctx'> 	orig_fp_enter = kern_fp_enter;</div><div class='del'>-	orig_fp_init = fp_init;</div><div class='ctx'> 	kern_fp_enter = nwfpe_enter;</div><div class='del'>-	fp_init = nwfpe_init_fpa;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit fpe_exit(void)</div><div class='ctx'> {</div><div class='add'>+	thread_unregister_notifier(&amp;nwfpe_notifier_block);</div><div class='ctx'> 	/* Restore the values we saved earlier. */</div><div class='ctx'> 	kern_fp_enter = orig_fp_enter;</div><div class='del'>-	fp_init = orig_fp_init;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm/nwfpe/fpopcode.c b/arch/arm/nwfpe/fpopcode.c<br/>index 67ff2ab08ea0..922b81107585 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpopcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpopcode.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "fpa11.h"</div><div class='ctx'> #include "softfloat.h"</div><div class='ctx'> #include "fpopcode.h"</div><div class='head'>diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h<br/>index 6528e081c83f..ec78e3517fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/fpopcode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/fpopcode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/fpopcode.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #ifndef __FPOPCODE_H__</div><div class='ctx'> #define __FPOPCODE_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> ARM Floating Point Instruction Classes</div><div class='head'>diff --git a/arch/arm/nwfpe/softfloat.h b/arch/arm/nwfpe/softfloat.h<br/>index 978c699673c6..0a3067452cd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/softfloat.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/nwfpe/softfloat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/nwfpe/softfloat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/nwfpe/softfloat.h</a></div><div class='hunk'>@@ -32,7 +32,6 @@ this code that are retained.</div><div class='ctx'> #ifndef __SOFTFLOAT_H__</div><div class='ctx'> #define __SOFTFLOAT_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='hunk'>@@ -62,7 +61,7 @@ typedef struct {</div><div class='ctx'>     u16 __padding;</div><div class='ctx'> #endif</div><div class='ctx'>     u64 low;</div><div class='del'>-} floatx80;</div><div class='add'>+}  __attribute__ ((packed,aligned(4))) floatx80;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> -------------------------------------------------------------------------------</div><div class='head'>diff --git a/arch/arm/oprofile/op_model_xscale.c b/arch/arm/oprofile/op_model_xscale.c<br/>index e0f0b320d76c..34fdc733743b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/oprofile/op_model_xscale.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/oprofile/op_model_xscale.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/oprofile/op_model_xscale.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/oprofile/op_model_xscale.c</a></div><div class='hunk'>@@ -384,7 +384,7 @@ static int xscale_pmu_start(void)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 pmnc = read_pmnc();</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(XSCALE_PMU_IRQ, xscale_pmu_interrupt, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(XSCALE_PMU_IRQ, xscale_pmu_interrupt, IRQF_DISABLED,</div><div class='ctx'> 			"XScale PMU", (void *)results);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='head'>diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig<br/>index ec49495e651e..ec752e16d618 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/Kconfig</a></div><div class='hunk'>@@ -91,7 +91,7 @@ config OMAP_32K_TIMER_HZ</div><div class='ctx'> </div><div class='ctx'> config OMAP_DM_TIMER</div><div class='ctx'> 	bool "Use dual-mode timer"</div><div class='del'>-	depends on ARCH_OMAP16XX</div><div class='add'>+	depends on ARCH_OMAP16XX || ARCH_OMAP24XX</div><div class='ctx'> 	help</div><div class='ctx'> 	 Select this option if you want to use OMAP Dual-Mode timers.</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c<br/>index 32ec04c58bcd..7f45c7c3e673 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/clock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/clock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/clock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/clock.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -28,9 +27,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/clock.h&gt;</div><div class='ctx'> </div><div class='del'>-LIST_HEAD(clocks);</div><div class='add'>+static LIST_HEAD(clocks);</div><div class='ctx'> static DEFINE_MUTEX(clocks_mutex);</div><div class='del'>-DEFINE_SPINLOCK(clockfw_lock);</div><div class='add'>+static DEFINE_SPINLOCK(clockfw_lock);</div><div class='ctx'> </div><div class='ctx'> static struct clk_functions *arch_clock;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c<br/>index adffc5a859ee..57b7b93674a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/common.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c<br/>index 98edc9fdd6d1..a0c71dca2373 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/cpu-omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/cpu-omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/cpu-omap.c</a></div><div class='hunk'>@@ -25,6 +25,14 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='add'>+#define VERY_HI_RATE	900000000</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP1</div><div class='add'>+#define MPU_CLK		"mpu"</div><div class='add'>+#else</div><div class='add'>+#define MPU_CLK		"virt_prcm_set"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* TODO: Add support for SDRAM timing changes */</div><div class='ctx'> </div><div class='ctx'> int omap_verify_speed(struct cpufreq_policy *policy)</div><div class='hunk'>@@ -36,7 +44,7 @@ int omap_verify_speed(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_verify_within_limits(policy, policy-&gt;cpuinfo.min_freq,</div><div class='ctx'> 				     policy-&gt;cpuinfo.max_freq);</div><div class='del'>-	mpu_clk = clk_get(NULL, "mpu");</div><div class='add'>+	mpu_clk = clk_get(NULL, MPU_CLK);</div><div class='ctx'> 	if (IS_ERR(mpu_clk))</div><div class='ctx'> 		return PTR_ERR(mpu_clk);</div><div class='ctx'> 	policy-&gt;min = clk_round_rate(mpu_clk, policy-&gt;min * 1000) / 1000;</div><div class='hunk'>@@ -56,7 +64,7 @@ unsigned int omap_getspeed(unsigned int cpu)</div><div class='ctx'> 	if (cpu)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mpu_clk = clk_get(NULL, "mpu");</div><div class='add'>+	mpu_clk = clk_get(NULL, MPU_CLK);</div><div class='ctx'> 	if (IS_ERR(mpu_clk))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	rate = clk_get_rate(mpu_clk) / 1000;</div><div class='hunk'>@@ -73,7 +81,7 @@ static int omap_target(struct cpufreq_policy *policy,</div><div class='ctx'> 	struct cpufreq_freqs freqs;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	mpu_clk = clk_get(NULL, "mpu");</div><div class='add'>+	mpu_clk = clk_get(NULL, MPU_CLK);</div><div class='ctx'> 	if (IS_ERR(mpu_clk))</div><div class='ctx'> 		return PTR_ERR(mpu_clk);</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +101,7 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> {</div><div class='ctx'> 	struct clk * mpu_clk;</div><div class='ctx'> </div><div class='del'>-	mpu_clk = clk_get(NULL, "mpu");</div><div class='add'>+	mpu_clk = clk_get(NULL, MPU_CLK);</div><div class='ctx'> 	if (IS_ERR(mpu_clk))</div><div class='ctx'> 		return PTR_ERR(mpu_clk);</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +110,7 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 	policy-&gt;cur = policy-&gt;min = policy-&gt;max = omap_getspeed(0);</div><div class='ctx'> 	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> 	policy-&gt;cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;</div><div class='del'>-	policy-&gt;cpuinfo.max_freq = clk_round_rate(mpu_clk, 216000000) / 1000;</div><div class='add'>+	policy-&gt;cpuinfo.max_freq = clk_round_rate(mpu_clk, VERY_HI_RATE) / 1000;</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = CPUFREQ_ETERNAL;</div><div class='ctx'> 	clk_put(mpu_clk);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c<br/>index 5d5d6eb222dd..1812f237d12f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/devices.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -105,7 +104,7 @@ static void omap_init_kp(void)</div><div class='ctx'> 		omap_cfg_reg(E20_1610_KBR3);</div><div class='ctx'> 		omap_cfg_reg(E19_1610_KBR4);</div><div class='ctx'> 		omap_cfg_reg(N19_1610_KBR5);</div><div class='del'>-	} else if (machine_is_omap_perseus2()) {</div><div class='add'>+	} else if (machine_is_omap_perseus2() || machine_is_omap_fsample()) {</div><div class='ctx'> 		omap_cfg_reg(E2_730_KBR0);</div><div class='ctx'> 		omap_cfg_reg(J7_730_KBR1);</div><div class='ctx'> 		omap_cfg_reg(E1_730_KBR2);</div><div class='hunk'>@@ -162,8 +161,8 @@ static u64 mmc1_dmamask = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> static struct resource mmc1_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start		= IO_ADDRESS(OMAP_MMC1_BASE),</div><div class='del'>-		.end		= IO_ADDRESS(OMAP_MMC1_BASE) + 0x7f,</div><div class='add'>+		.start		= OMAP_MMC1_BASE,</div><div class='add'>+		.end		= OMAP_MMC1_BASE + 0x7f,</div><div class='ctx'> 		.flags		= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -191,8 +190,8 @@ static u64 mmc2_dmamask = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> static struct resource mmc2_resources[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.start		= IO_ADDRESS(OMAP_MMC2_BASE),</div><div class='del'>-		.end		= IO_ADDRESS(OMAP_MMC2_BASE) + 0x7f,</div><div class='add'>+		.start		= OMAP_MMC2_BASE,</div><div class='add'>+		.end		= OMAP_MMC2_BASE + 0x7f,</div><div class='ctx'> 		.flags		= IORESOURCE_MEM,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c<br/>index 5dac4230360d..9eddc9507147 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/dma.c</a></div><div class='hunk'>@@ -24,9 +24,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #define OMAP_DMA_ACTIVE		0x01</div><div class='ctx'> #define OMAP_DMA_CCR_EN		(1 &lt;&lt; 7)</div><div class='add'>+#define OMAP2_DMA_CSR_CLEAR_MASK	0xffe</div><div class='ctx'> </div><div class='ctx'> #define OMAP_FUNC_MUX_ARM_BASE	(0xfffe1000 + 0xec)</div><div class='ctx'> </div><div class='hunk'>@@ -166,18 +167,24 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,</div><div class='ctx'> 	if (cpu_is_omap24xx() &amp;&amp; dma_trigger) {</div><div class='ctx'> 		u32 val = OMAP_DMA_CCR_REG(lch);</div><div class='ctx'> </div><div class='add'>+		val &amp;= ~(3 &lt;&lt; 19);</div><div class='ctx'> 		if (dma_trigger &gt; 63)</div><div class='ctx'> 			val |= 1 &lt;&lt; 20;</div><div class='ctx'> 		if (dma_trigger &gt; 31)</div><div class='ctx'> 			val |= 1 &lt;&lt; 19;</div><div class='ctx'> </div><div class='add'>+		val &amp;= ~(0x1f);</div><div class='ctx'> 		val |= (dma_trigger &amp; 0x1f);</div><div class='ctx'> </div><div class='ctx'> 		if (sync_mode &amp; OMAP_DMA_SYNC_FRAME)</div><div class='ctx'> 			val |= 1 &lt;&lt; 5;</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~(1 &lt;&lt; 5);</div><div class='ctx'> </div><div class='ctx'> 		if (sync_mode &amp; OMAP_DMA_SYNC_BLOCK)</div><div class='ctx'> 			val |= 1 &lt;&lt; 18;</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~(1 &lt;&lt; 18);</div><div class='ctx'> </div><div class='ctx'> 		if (src_or_dst_synch)</div><div class='ctx'> 			val |= 1 &lt;&lt; 24;		/* source synch */</div><div class='hunk'>@@ -286,22 +293,39 @@ void omap_set_dma_src_data_pack(int lch, int enable)</div><div class='ctx'> </div><div class='ctx'> void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)</div><div class='ctx'> {</div><div class='add'>+	unsigned int burst = 0;</div><div class='ctx'> 	OMAP_DMA_CSDP_REG(lch) &amp;= ~(0x03 &lt;&lt; 7);</div><div class='ctx'> </div><div class='ctx'> 	switch (burst_mode) {</div><div class='ctx'> 	case OMAP_DMA_DATA_BURST_DIS:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OMAP_DMA_DATA_BURST_4:</div><div class='del'>-		OMAP_DMA_CSDP_REG(lch) |= (0x02 &lt;&lt; 7);</div><div class='add'>+		if (cpu_is_omap24xx())</div><div class='add'>+			burst = 0x1;</div><div class='add'>+		else</div><div class='add'>+			burst = 0x2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OMAP_DMA_DATA_BURST_8:</div><div class='del'>-		/* not supported by current hardware</div><div class='add'>+		if (cpu_is_omap24xx()) {</div><div class='add'>+			burst = 0x2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* not supported by current hardware on OMAP1</div><div class='ctx'> 		 * w |= (0x03 &lt;&lt; 7);</div><div class='ctx'> 		 * fall through</div><div class='ctx'> 		 */</div><div class='add'>+	case OMAP_DMA_DATA_BURST_16:</div><div class='add'>+		if (cpu_is_omap24xx()) {</div><div class='add'>+			burst = 0x3;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* OMAP1 don't support burst 16</div><div class='add'>+		 * fall through</div><div class='add'>+		 */</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='add'>+	OMAP_DMA_CSDP_REG(lch) |= (burst &lt;&lt; 7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Note that dest_port is only for OMAP1 */</div><div class='hunk'>@@ -348,30 +372,49 @@ void omap_set_dma_dest_data_pack(int lch, int enable)</div><div class='ctx'> </div><div class='ctx'> void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)</div><div class='ctx'> {</div><div class='add'>+	unsigned int burst = 0;</div><div class='ctx'> 	OMAP_DMA_CSDP_REG(lch) &amp;= ~(0x03 &lt;&lt; 14);</div><div class='ctx'> </div><div class='ctx'> 	switch (burst_mode) {</div><div class='ctx'> 	case OMAP_DMA_DATA_BURST_DIS:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OMAP_DMA_DATA_BURST_4:</div><div class='del'>-		OMAP_DMA_CSDP_REG(lch) |= (0x02 &lt;&lt; 14);</div><div class='add'>+		if (cpu_is_omap24xx())</div><div class='add'>+			burst = 0x1;</div><div class='add'>+		else</div><div class='add'>+			burst = 0x2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OMAP_DMA_DATA_BURST_8:</div><div class='del'>-		OMAP_DMA_CSDP_REG(lch) |= (0x03 &lt;&lt; 14);</div><div class='add'>+		if (cpu_is_omap24xx())</div><div class='add'>+			burst = 0x2;</div><div class='add'>+		else</div><div class='add'>+			burst = 0x3;</div><div class='ctx'> 		break;</div><div class='add'>+	case OMAP_DMA_DATA_BURST_16:</div><div class='add'>+		if (cpu_is_omap24xx()) {</div><div class='add'>+			burst = 0x3;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* OMAP1 don't support burst 16</div><div class='add'>+		 * fall through</div><div class='add'>+		 */</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "Invalid DMA burst mode\n");</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	OMAP_DMA_CSDP_REG(lch) |= (burst &lt;&lt; 14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void omap_enable_channel_irq(int lch)</div><div class='ctx'> {</div><div class='ctx'> 	u32 status;</div><div class='ctx'> </div><div class='del'>-	/* Read CSR to make sure it's cleared. */</div><div class='del'>-	status = OMAP_DMA_CSR_REG(lch);</div><div class='add'>+	/* Clear CSR */</div><div class='add'>+	if (cpu_class_is_omap1())</div><div class='add'>+		status = OMAP_DMA_CSR_REG(lch);</div><div class='add'>+	else if (cpu_is_omap24xx())</div><div class='add'>+		OMAP_DMA_CSR_REG(lch) = OMAP2_DMA_CSR_CLEAR_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable some nice interrupts. */</div><div class='ctx'> 	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;</div><div class='hunk'>@@ -470,11 +513,13 @@ int omap_request_dma(int dev_id, const char *dev_name,</div><div class='ctx'> 	chan-&gt;dev_name = dev_name;</div><div class='ctx'> 	chan-&gt;callback = callback;</div><div class='ctx'> 	chan-&gt;data = data;</div><div class='del'>-	chan-&gt;enabled_irqs = OMAP_DMA_TOUT_IRQ | OMAP_DMA_DROP_IRQ |</div><div class='del'>-				OMAP_DMA_BLOCK_IRQ;</div><div class='add'>+	chan-&gt;enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		chan-&gt;enabled_irqs |= OMAP2_DMA_TRANS_ERR_IRQ;</div><div class='add'>+	if (cpu_class_is_omap1())</div><div class='add'>+		chan-&gt;enabled_irqs |= OMAP1_DMA_TOUT_IRQ;</div><div class='add'>+	else if (cpu_is_omap24xx())</div><div class='add'>+		chan-&gt;enabled_irqs |= OMAP2_DMA_MISALIGNED_ERR_IRQ |</div><div class='add'>+			OMAP2_DMA_TRANS_ERR_IRQ;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap16xx()) {</div><div class='ctx'> 		/* If the sync device is set, configure it dynamically. */</div><div class='hunk'>@@ -494,7 +539,7 @@ int omap_request_dma(int dev_id, const char *dev_name,</div><div class='ctx'> </div><div class='ctx'> 		omap_enable_channel_irq(free_ch);</div><div class='ctx'> 		/* Clear the CSR register and IRQ status register */</div><div class='del'>-		OMAP_DMA_CSR_REG(free_ch) = 0x0;</div><div class='add'>+		OMAP_DMA_CSR_REG(free_ch) = OMAP2_DMA_CSR_CLEAR_MASK;</div><div class='ctx'> 		omap_writel(~0x0, OMAP_DMA4_IRQSTATUS_L0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -534,7 +579,7 @@ void omap_free_dma(int lch)</div><div class='ctx'> 		omap_writel(val, OMAP_DMA4_IRQENABLE_L0);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the CSR register and IRQ status register */</div><div class='del'>-		OMAP_DMA_CSR_REG(lch) = 0x0;</div><div class='add'>+		OMAP_DMA_CSR_REG(lch) = OMAP2_DMA_CSR_CLEAR_MASK;</div><div class='ctx'> </div><div class='ctx'> 		val = omap_readl(OMAP_DMA4_IRQSTATUS_L0);</div><div class='ctx'> 		val |= 1 &lt;&lt; lch;</div><div class='hunk'>@@ -798,7 +843,7 @@ static int omap1_dma_handle_ch(int ch)</div><div class='ctx'> 		       "%d (CSR %04x)\n", ch, csr);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (unlikely(csr &amp; OMAP_DMA_TOUT_IRQ))</div><div class='add'>+	if (unlikely(csr &amp; OMAP1_DMA_TOUT_IRQ))</div><div class='ctx'> 		printk(KERN_WARNING "DMA timeout with device %d\n",</div><div class='ctx'> 		       dma_chan[ch].dev_id);</div><div class='ctx'> 	if (unlikely(csr &amp; OMAP_DMA_DROP_IRQ))</div><div class='hunk'>@@ -846,20 +891,21 @@ static int omap2_dma_handle_ch(int ch)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (unlikely(dma_chan[ch].dev_id == -1))</div><div class='ctx'> 		return 0;</div><div class='del'>-	/* REVISIT: According to 24xx TRM, there's no TOUT_IE */</div><div class='del'>-	if (unlikely(status &amp; OMAP_DMA_TOUT_IRQ))</div><div class='del'>-		printk(KERN_INFO "DMA timeout with device %d\n",</div><div class='del'>-		       dma_chan[ch].dev_id);</div><div class='ctx'> 	if (unlikely(status &amp; OMAP_DMA_DROP_IRQ))</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "DMA synchronization event drop occurred with device "</div><div class='ctx'> 		       "%d\n", dma_chan[ch].dev_id);</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(status &amp; OMAP2_DMA_TRANS_ERR_IRQ))</div><div class='ctx'> 		printk(KERN_INFO "DMA transaction error with device %d\n",</div><div class='ctx'> 		       dma_chan[ch].dev_id);</div><div class='add'>+	if (unlikely(status &amp; OMAP2_DMA_SECURE_ERR_IRQ))</div><div class='add'>+		printk(KERN_INFO "DMA secure error with device %d\n",</div><div class='add'>+		       dma_chan[ch].dev_id);</div><div class='add'>+	if (unlikely(status &amp; OMAP2_DMA_MISALIGNED_ERR_IRQ))</div><div class='add'>+		printk(KERN_INFO "DMA misaligned error with device %d\n",</div><div class='add'>+		       dma_chan[ch].dev_id);</div><div class='ctx'> </div><div class='del'>-	OMAP_DMA_CSR_REG(ch) = 0x20;</div><div class='add'>+	OMAP_DMA_CSR_REG(ch) = OMAP2_DMA_CSR_CLEAR_MASK;</div><div class='ctx'> </div><div class='ctx'> 	val = omap_readl(OMAP_DMA4_IRQSTATUS_L0);</div><div class='ctx'> 	/* ch in this function is from 0-31 while in register it is 1-32 */</div><div class='hunk'>@@ -893,7 +939,7 @@ static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id,</div><div class='ctx'> static struct irqaction omap24xx_dma_irq = {</div><div class='ctx'> 	.name = "DMA",</div><div class='ctx'> 	.handler = omap2_dma_irq_handler,</div><div class='del'>-	.flags = SA_INTERRUPT</div><div class='add'>+	.flags = IRQF_DISABLED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c<br/>index eba3cb52ad87..50524436de63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dmtimer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/dmtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/dmtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/dmtimer.c</a></div><div class='hunk'>@@ -4,7 +4,8 @@</div><div class='ctx'>  * OMAP Dual-Mode Timers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005 Nokia Corporation</div><div class='del'>- * Author: Lauri Leukkunen &lt;lauri.leukkunen@nokia.com&gt;</div><div class='add'>+ * OMAP2 support by Juha Yrjola</div><div class='add'>+ * API improvements and OMAP2 clock framework support by Timo Teras</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of the GNU General Public License as published by the</div><div class='hunk'>@@ -26,15 +27,17 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/dmtimer.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-</div><div class='del'>-#define OMAP_TIMER_COUNT		8</div><div class='ctx'> </div><div class='add'>+/* register offsets */</div><div class='ctx'> #define OMAP_TIMER_ID_REG		0x00</div><div class='ctx'> #define OMAP_TIMER_OCP_CFG_REG		0x10</div><div class='ctx'> #define OMAP_TIMER_SYS_STAT_REG		0x14</div><div class='hunk'>@@ -50,52 +53,196 @@</div><div class='ctx'> #define OMAP_TIMER_CAPTURE_REG		0x3c</div><div class='ctx'> #define OMAP_TIMER_IF_CTRL_REG		0x40</div><div class='ctx'> </div><div class='add'>+/* timer control reg bits */</div><div class='add'>+#define OMAP_TIMER_CTRL_GPOCFG		(1 &lt;&lt; 14)</div><div class='add'>+#define OMAP_TIMER_CTRL_CAPTMODE	(1 &lt;&lt; 13)</div><div class='add'>+#define OMAP_TIMER_CTRL_PT		(1 &lt;&lt; 12)</div><div class='add'>+#define OMAP_TIMER_CTRL_TCM_LOWTOHIGH	(0x1 &lt;&lt; 8)</div><div class='add'>+#define OMAP_TIMER_CTRL_TCM_HIGHTOLOW	(0x2 &lt;&lt; 8)</div><div class='add'>+#define OMAP_TIMER_CTRL_TCM_BOTHEDGES	(0x3 &lt;&lt; 8)</div><div class='add'>+#define OMAP_TIMER_CTRL_SCPWM		(1 &lt;&lt; 7)</div><div class='add'>+#define OMAP_TIMER_CTRL_CE		(1 &lt;&lt; 6)	/* compare enable */</div><div class='add'>+#define OMAP_TIMER_CTRL_PRE		(1 &lt;&lt; 5)	/* prescaler enable */</div><div class='add'>+#define OMAP_TIMER_CTRL_PTV_SHIFT	2		/* how much to shift the prescaler value */</div><div class='add'>+#define OMAP_TIMER_CTRL_AR		(1 &lt;&lt; 1)	/* auto-reload enable */</div><div class='add'>+#define OMAP_TIMER_CTRL_ST		(1 &lt;&lt; 0)	/* start timer */</div><div class='add'>+</div><div class='add'>+struct omap_dm_timer {</div><div class='add'>+	unsigned long phys_base;</div><div class='add'>+	int irq;</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+	struct clk *iclk, *fclk;</div><div class='add'>+#endif</div><div class='add'>+	void __iomem *io_base;</div><div class='add'>+	unsigned reserved:1;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct dmtimer_info_struct {</div><div class='del'>-	struct list_head	unused_timers;</div><div class='del'>-	struct list_head	reserved_timers;</div><div class='del'>-} dm_timer_info;</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP1</div><div class='ctx'> </div><div class='ctx'> static struct omap_dm_timer dm_timers[] = {</div><div class='del'>-	{ .base=0xfffb1400, .irq=INT_1610_GPTIMER1 },</div><div class='del'>-	{ .base=0xfffb1c00, .irq=INT_1610_GPTIMER2 },</div><div class='del'>-	{ .base=0xfffb2400, .irq=INT_1610_GPTIMER3 },</div><div class='del'>-	{ .base=0xfffb2c00, .irq=INT_1610_GPTIMER4 },</div><div class='del'>-	{ .base=0xfffb3400, .irq=INT_1610_GPTIMER5 },</div><div class='del'>-	{ .base=0xfffb3c00, .irq=INT_1610_GPTIMER6 },</div><div class='del'>-	{ .base=0xfffb4400, .irq=INT_1610_GPTIMER7 },</div><div class='del'>-	{ .base=0xfffb4c00, .irq=INT_1610_GPTIMER8 },</div><div class='del'>-	{ .base=0x0 },</div><div class='add'>+	{ .phys_base = 0xfffb1400, .irq = INT_1610_GPTIMER1 },</div><div class='add'>+	{ .phys_base = 0xfffb1c00, .irq = INT_1610_GPTIMER2 },</div><div class='add'>+	{ .phys_base = 0xfffb2400, .irq = INT_1610_GPTIMER3 },</div><div class='add'>+	{ .phys_base = 0xfffb2c00, .irq = INT_1610_GPTIMER4 },</div><div class='add'>+	{ .phys_base = 0xfffb3400, .irq = INT_1610_GPTIMER5 },</div><div class='add'>+	{ .phys_base = 0xfffb3c00, .irq = INT_1610_GPTIMER6 },</div><div class='add'>+	{ .phys_base = 0xfffb4400, .irq = INT_1610_GPTIMER7 },</div><div class='add'>+	{ .phys_base = 0xfffb4c00, .irq = INT_1610_GPTIMER8 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP2)</div><div class='add'>+</div><div class='add'>+static struct omap_dm_timer dm_timers[] = {</div><div class='add'>+	{ .phys_base = 0x48028000, .irq = INT_24XX_GPTIMER1 },</div><div class='add'>+	{ .phys_base = 0x4802a000, .irq = INT_24XX_GPTIMER2 },</div><div class='add'>+	{ .phys_base = 0x48078000, .irq = INT_24XX_GPTIMER3 },</div><div class='add'>+	{ .phys_base = 0x4807a000, .irq = INT_24XX_GPTIMER4 },</div><div class='add'>+	{ .phys_base = 0x4807c000, .irq = INT_24XX_GPTIMER5 },</div><div class='add'>+	{ .phys_base = 0x4807e000, .irq = INT_24XX_GPTIMER6 },</div><div class='add'>+	{ .phys_base = 0x48080000, .irq = INT_24XX_GPTIMER7 },</div><div class='add'>+	{ .phys_base = 0x48082000, .irq = INT_24XX_GPTIMER8 },</div><div class='add'>+	{ .phys_base = 0x48084000, .irq = INT_24XX_GPTIMER9 },</div><div class='add'>+	{ .phys_base = 0x48086000, .irq = INT_24XX_GPTIMER10 },</div><div class='add'>+	{ .phys_base = 0x48088000, .irq = INT_24XX_GPTIMER11 },</div><div class='add'>+	{ .phys_base = 0x4808a000, .irq = INT_24XX_GPTIMER12 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *dm_source_names[] = {</div><div class='add'>+	"sys_ck",</div><div class='add'>+	"func_32k_ck",</div><div class='add'>+	"alt_ck"</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static struct clk *dm_source_clocks[3];</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#error OMAP architecture not supported!</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const int dm_timer_count = ARRAY_SIZE(dm_timers);</div><div class='ctx'> static spinlock_t dm_timer_lock;</div><div class='ctx'> </div><div class='add'>+static inline u32 omap_dm_timer_read_reg(struct omap_dm_timer *timer, int reg)</div><div class='add'>+{</div><div class='add'>+	return readl(timer-&gt;io_base + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-inline void omap_dm_timer_write_reg(struct omap_dm_timer *timer, int reg, u32 value)</div><div class='add'>+static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, int reg, u32 value)</div><div class='ctx'> {</div><div class='del'>-	omap_writel(value, timer-&gt;base + reg);</div><div class='add'>+	writel(value, timer-&gt;io_base + reg);</div><div class='ctx'> 	while (omap_dm_timer_read_reg(timer, OMAP_TIMER_WRITE_PEND_REG))</div><div class='ctx'> 		;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 omap_dm_timer_read_reg(struct omap_dm_timer *timer, int reg)</div><div class='add'>+static void omap_dm_timer_wait_for_reset(struct omap_dm_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	return omap_readl(timer-&gt;base + reg);</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	c = 0;</div><div class='add'>+	while (!(omap_dm_timer_read_reg(timer, OMAP_TIMER_SYS_STAT_REG) &amp; 1)) {</div><div class='add'>+		c++;</div><div class='add'>+		if (c &gt; 100000) {</div><div class='add'>+			printk(KERN_ERR "Timer failed to reset\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int omap_dm_timers_active(void)</div><div class='add'>+static void omap_dm_timer_reset(struct omap_dm_timer *timer)</div><div class='add'>+{</div><div class='add'>+	u32 l;</div><div class='add'>+</div><div class='add'>+	if (timer != &amp;dm_timers[0]) {</div><div class='add'>+		omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0x06);</div><div class='add'>+		omap_dm_timer_wait_for_reset(timer);</div><div class='add'>+	}</div><div class='add'>+	omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_SYS_CLK);</div><div class='add'>+</div><div class='add'>+	/* Set to smart-idle mode */</div><div class='add'>+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_OCP_CFG_REG);</div><div class='add'>+	l |= 0x02 &lt;&lt; 3;</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_REG, l);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void omap_dm_timer_prepare(struct omap_dm_timer *timer)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+	clk_enable(timer-&gt;iclk);</div><div class='add'>+	clk_enable(timer-&gt;fclk);</div><div class='add'>+#endif</div><div class='add'>+	omap_dm_timer_reset(timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct omap_dm_timer *omap_dm_timer_request(void)</div><div class='add'>+{</div><div class='add'>+	struct omap_dm_timer *timer = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;dm_timer_lock, flags);</div><div class='add'>+	for (i = 0; i &lt; dm_timer_count; i++) {</div><div class='add'>+		if (dm_timers[i].reserved)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		timer = &amp;dm_timers[i];</div><div class='add'>+		timer-&gt;reserved = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;dm_timer_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (timer != NULL)</div><div class='add'>+		omap_dm_timer_prepare(timer);</div><div class='add'>+</div><div class='add'>+	return timer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct omap_dm_timer *omap_dm_timer_request_specific(int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_dm_timer *timer;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	for (timer = &amp;dm_timers[0]; timer-&gt;base; ++timer)</div><div class='del'>-		if (omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG) &amp;</div><div class='del'>-		    OMAP_TIMER_CTRL_ST)</div><div class='del'>-			return 1;</div><div class='add'>+	spin_lock_irqsave(&amp;dm_timer_lock, flags);</div><div class='add'>+	if (id &lt;= 0 || id &gt; dm_timer_count || dm_timers[id-1].reserved) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;dm_timer_lock, flags);</div><div class='add'>+		printk("BUG: warning at %s:%d/%s(): unable to get timer %d\n",</div><div class='add'>+		       __FILE__, __LINE__, __FUNCTION__, id);</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	timer = &amp;dm_timers[id-1];</div><div class='add'>+	timer-&gt;reserved = 1;</div><div class='add'>+	spin_unlock_irqrestore(&amp;dm_timer_lock, flags);</div><div class='add'>+</div><div class='add'>+	omap_dm_timer_prepare(timer);</div><div class='add'>+</div><div class='add'>+	return timer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void omap_dm_timer_free(struct omap_dm_timer *timer)</div><div class='add'>+{</div><div class='add'>+	omap_dm_timer_reset(timer);</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+	clk_disable(timer-&gt;iclk);</div><div class='add'>+	clk_disable(timer-&gt;fclk);</div><div class='add'>+#endif</div><div class='add'>+	WARN_ON(!timer-&gt;reserved);</div><div class='add'>+	timer-&gt;reserved = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int omap_dm_timer_get_irq(struct omap_dm_timer *timer)</div><div class='add'>+{</div><div class='add'>+	return timer-&gt;irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_ARCH_OMAP1)</div><div class='add'>+</div><div class='add'>+struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR</div><div class='hunk'>@@ -103,184 +250,229 @@ int omap_dm_timers_active(void)</div><div class='ctx'>  */</div><div class='ctx'> __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)</div><div class='ctx'> {</div><div class='del'>-	int n;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* If ARMXOR cannot be idled this function call is unnecessary */</div><div class='ctx'> 	if (!(inputmask &amp; (1 &lt;&lt; 1)))</div><div class='ctx'> 		return inputmask;</div><div class='ctx'> </div><div class='ctx'> 	/* If any active timer is using ARMXOR return modified mask */</div><div class='del'>-	for (n = 0; dm_timers[n].base; ++n)</div><div class='del'>-		if (omap_dm_timer_read_reg(&amp;dm_timers[n], OMAP_TIMER_CTRL_REG)&amp;</div><div class='del'>-		    OMAP_TIMER_CTRL_ST) {</div><div class='del'>-			if (((omap_readl(MOD_CONF_CTRL_1)&gt;&gt;(n*2)) &amp; 0x03) == 0)</div><div class='add'>+	for (i = 0; i &lt; dm_timer_count; i++) {</div><div class='add'>+		u32 l;</div><div class='add'>+</div><div class='add'>+		l = omap_dm_timer_read_reg(&amp;dm_timers[i], OMAP_TIMER_CTRL_REG);</div><div class='add'>+		if (l &amp; OMAP_TIMER_CTRL_ST) {</div><div class='add'>+			if (((omap_readl(MOD_CONF_CTRL_1) &gt;&gt; (i * 2)) &amp; 0x03) == 0)</div><div class='ctx'> 				inputmask &amp;= ~(1 &lt;&lt; 1);</div><div class='ctx'> 			else</div><div class='ctx'> 				inputmask &amp;= ~(1 &lt;&lt; 2);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return inputmask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP2)</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)</div><div class='add'>+struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	int n = (timer - dm_timers) &lt;&lt; 1;</div><div class='del'>-	u32 l;</div><div class='add'>+        return timer-&gt;fclk;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	l = omap_readl(MOD_CONF_CTRL_1) &amp; ~(0x03 &lt;&lt; n);</div><div class='del'>-	l |= source &lt;&lt; n;</div><div class='del'>-	omap_writel(l, MOD_CONF_CTRL_1);</div><div class='add'>+__u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)</div><div class='add'>+{</div><div class='add'>+	BUG();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void omap_dm_timer_reset(struct omap_dm_timer *timer)</div><div class='add'>+void omap_dm_timer_trigger(struct omap_dm_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	/* Reset and set posted mode */</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0x06);</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_REG, 0x02);</div><div class='del'>-</div><div class='del'>-	omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_ARMXOR);</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void omap_dm_timer_start(struct omap_dm_timer *timer)</div><div class='add'>+{</div><div class='add'>+	u32 l;</div><div class='ctx'> </div><div class='add'>+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='add'>+	if (!(l &amp; OMAP_TIMER_CTRL_ST)) {</div><div class='add'>+		l |= OMAP_TIMER_CTRL_ST;</div><div class='add'>+		omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct omap_dm_timer * omap_dm_timer_request(void)</div><div class='add'>+void omap_dm_timer_stop(struct omap_dm_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	struct omap_dm_timer *timer = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	u32 l;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;dm_timer_lock, flags);</div><div class='del'>-	if (!list_empty(&amp;dm_timer_info.unused_timers)) {</div><div class='del'>-		timer = (struct omap_dm_timer *)</div><div class='del'>-				dm_timer_info.unused_timers.next;</div><div class='del'>-		list_move_tail((struct list_head *)timer,</div><div class='del'>-				&amp;dm_timer_info.reserved_timers);</div><div class='add'>+	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='add'>+	if (l &amp; OMAP_TIMER_CTRL_ST) {</div><div class='add'>+		l &amp;= ~0x1;</div><div class='add'>+		omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dm_timer_lock, flags);</div><div class='del'>-</div><div class='del'>-	return timer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARCH_OMAP1</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_free(struct omap_dm_timer *timer)</div><div class='add'>+void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	omap_dm_timer_reset(timer);</div><div class='add'>+	int n = (timer - dm_timers) &lt;&lt; 1;</div><div class='add'>+	u32 l;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;dm_timer_lock, flags);</div><div class='del'>-	list_move_tail((struct list_head *)timer, &amp;dm_timer_info.unused_timers);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dm_timer_lock, flags);</div><div class='add'>+	l = omap_readl(MOD_CONF_CTRL_1) &amp; ~(0x03 &lt;&lt; n);</div><div class='add'>+	l |= source &lt;&lt; n;</div><div class='add'>+	omap_writel(l, MOD_CONF_CTRL_1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,</div><div class='del'>-				unsigned int value)</div><div class='del'>-{</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_INT_EN_REG, value);</div><div class='del'>-}</div><div class='add'>+#else</div><div class='ctx'> </div><div class='del'>-unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)</div><div class='add'>+void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)</div><div class='ctx'> {</div><div class='del'>-	return omap_dm_timer_read_reg(timer, OMAP_TIMER_STAT_REG);</div><div class='del'>-}</div><div class='add'>+	if (source &lt; 0 || source &gt;= 3)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)</div><div class='del'>-{</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_STAT_REG, value);</div><div class='add'>+	clk_disable(timer-&gt;fclk);</div><div class='add'>+	clk_set_parent(timer-&gt;fclk, dm_source_clocks[source]);</div><div class='add'>+	clk_enable(timer-&gt;fclk);</div><div class='add'>+</div><div class='add'>+	/* When the functional clock disappears, too quick writes seem to</div><div class='add'>+	 * cause an abort. */</div><div class='add'>+	__delay(15000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_enable_autoreload(struct omap_dm_timer *timer)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,</div><div class='add'>+			    unsigned int load)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l;</div><div class='add'>+</div><div class='ctx'> 	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='del'>-	l |= OMAP_TIMER_CTRL_AR;</div><div class='add'>+	if (autoreload)</div><div class='add'>+		l |= OMAP_TIMER_CTRL_AR;</div><div class='add'>+	else</div><div class='add'>+		l &amp;= ~OMAP_TIMER_CTRL_AR;</div><div class='ctx'> 	omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_trigger(struct omap_dm_timer *timer)</div><div class='del'>-{</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void omap_dm_timer_set_trigger(struct omap_dm_timer *timer, unsigned int value)</div><div class='add'>+void omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable,</div><div class='add'>+			     unsigned int match)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l;</div><div class='ctx'> </div><div class='ctx'> 	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='del'>-	l |= value &amp; 0x3;</div><div class='add'>+	if (enable)</div><div class='add'>+		l |= OMAP_TIMER_CTRL_CE;</div><div class='add'>+	else</div><div class='add'>+		l &amp;= ~OMAP_TIMER_CTRL_CE;</div><div class='ctx'> 	omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_MATCH_REG, match);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_start(struct omap_dm_timer *timer)</div><div class='add'>+</div><div class='add'>+void omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on,</div><div class='add'>+			   int toggle, int trigger)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l;</div><div class='ctx'> </div><div class='ctx'> 	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='del'>-	l |= OMAP_TIMER_CTRL_ST;</div><div class='add'>+	l &amp;= ~(OMAP_TIMER_CTRL_GPOCFG | OMAP_TIMER_CTRL_SCPWM |</div><div class='add'>+	       OMAP_TIMER_CTRL_PT | (0x03 &lt;&lt; 10));</div><div class='add'>+	if (def_on)</div><div class='add'>+		l |= OMAP_TIMER_CTRL_SCPWM;</div><div class='add'>+	if (toggle)</div><div class='add'>+		l |= OMAP_TIMER_CTRL_PT;</div><div class='add'>+	l |= trigger &lt;&lt; 10;</div><div class='ctx'> 	omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_stop(struct omap_dm_timer *timer)</div><div class='add'>+void omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler)</div><div class='ctx'> {</div><div class='ctx'> 	u32 l;</div><div class='ctx'> </div><div class='ctx'> 	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='del'>-	l &amp;= ~0x1;</div><div class='add'>+	l &amp;= ~(OMAP_TIMER_CTRL_PRE | (0x07 &lt;&lt; 2));</div><div class='add'>+	if (prescaler &gt;= 0x00 &amp;&amp; prescaler &lt;= 0x07) {</div><div class='add'>+		l |= OMAP_TIMER_CTRL_PRE;</div><div class='add'>+		l |= prescaler &lt;&lt; 2;</div><div class='add'>+	}</div><div class='ctx'> 	omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)</div><div class='add'>+void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,</div><div class='add'>+				  unsigned int value)</div><div class='ctx'> {</div><div class='del'>-	return omap_dm_timer_read_reg(timer, OMAP_TIMER_COUNTER_REG);</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_INT_EN_REG, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_reset_counter(struct omap_dm_timer *timer)</div><div class='add'>+unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, 0);</div><div class='add'>+	return omap_dm_timer_read_reg(timer, OMAP_TIMER_STAT_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_set_load(struct omap_dm_timer *timer, unsigned int load)</div><div class='add'>+void omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)</div><div class='ctx'> {</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);</div><div class='add'>+	omap_dm_timer_write_reg(timer, OMAP_TIMER_STAT_REG, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_set_match(struct omap_dm_timer *timer, unsigned int match)</div><div class='add'>+unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_MATCH_REG, match);</div><div class='add'>+	return omap_dm_timer_read_reg(timer, OMAP_TIMER_COUNTER_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void omap_dm_timer_enable_compare(struct omap_dm_timer *timer)</div><div class='add'>+void omap_dm_timer_write_counter(struct omap_dm_timer *timer, unsigned int value)</div><div class='ctx'> {</div><div class='del'>-	u32 l;</div><div class='del'>-</div><div class='del'>-	l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);</div><div class='del'>-	l |= OMAP_TIMER_CTRL_CE;</div><div class='del'>-	omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);</div><div class='add'>+	return omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int omap_dm_timers_active(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dm_timer_count; i++) {</div><div class='add'>+		struct omap_dm_timer *timer;</div><div class='add'>+</div><div class='add'>+		timer = &amp;dm_timers[i];</div><div class='add'>+		if (omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG) &amp;</div><div class='add'>+		    OMAP_TIMER_CTRL_ST)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static inline void __dm_timer_init(void)</div><div class='add'>+int omap_dm_timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct omap_dm_timer *timer;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(cpu_is_omap16xx() || cpu_is_omap24xx()))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;dm_timer_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dm_timer_info.unused_timers);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dm_timer_info.reserved_timers);</div><div class='del'>-</div><div class='del'>-	timer = &amp;dm_timers[0];</div><div class='del'>-	while (timer-&gt;base) {</div><div class='del'>-		list_add_tail((struct list_head *)timer, &amp;dm_timer_info.unused_timers);</div><div class='del'>-		omap_dm_timer_reset(timer);</div><div class='del'>-		timer++;</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dm_source_names); i++) {</div><div class='add'>+		dm_source_clocks[i] = clk_get(NULL, dm_source_names[i]);</div><div class='add'>+		BUG_ON(dm_source_clocks[i] == NULL);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dm_timer_count; i++) {</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+		char clk_name[16];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		timer = &amp;dm_timers[i];</div><div class='add'>+		timer-&gt;io_base = (void __iomem *) io_p2v(timer-&gt;phys_base);</div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='add'>+		sprintf(clk_name, "gpt%d_ick", i + 1);</div><div class='add'>+		timer-&gt;iclk = clk_get(NULL, clk_name);</div><div class='add'>+		sprintf(clk_name, "gpt%d_fck", i + 1);</div><div class='add'>+		timer-&gt;fclk = clk_get(NULL, clk_name);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int __init omap_dm_timer_init(void)</div><div class='del'>-{</div><div class='del'>-	if (cpu_is_omap16xx())</div><div class='del'>-		__dm_timer_init();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-arch_initcall(omap_dm_timer_init);</div><div class='head'>diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c<br/>index 305e9b990b71..56acb8720f78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/fb.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c<br/>index d3c8ea7eecfd..fec7970e564d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/gpio.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -537,6 +536,49 @@ static inline void _clear_gpio_irqstatus(struct gpio_bank *bank, int gpio)</div><div class='ctx'> 	_clear_gpio_irqbank(bank, 1 &lt;&lt; get_gpio_index(gpio));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)</div><div class='add'>+{</div><div class='add'>+	void __iomem *reg = bank-&gt;base;</div><div class='add'>+	int inv = 0;</div><div class='add'>+	u32 l;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	switch (bank-&gt;method) {</div><div class='add'>+	case METHOD_MPUIO:</div><div class='add'>+		reg += OMAP_MPUIO_GPIO_MASKIT;</div><div class='add'>+		mask = 0xffff;</div><div class='add'>+		inv = 1;</div><div class='add'>+		break;</div><div class='add'>+	case METHOD_GPIO_1510:</div><div class='add'>+		reg += OMAP1510_GPIO_INT_MASK;</div><div class='add'>+		mask = 0xffff;</div><div class='add'>+		inv = 1;</div><div class='add'>+		break;</div><div class='add'>+	case METHOD_GPIO_1610:</div><div class='add'>+		reg += OMAP1610_GPIO_IRQENABLE1;</div><div class='add'>+		mask = 0xffff;</div><div class='add'>+		break;</div><div class='add'>+	case METHOD_GPIO_730:</div><div class='add'>+		reg += OMAP730_GPIO_INT_MASK;</div><div class='add'>+		mask = 0xffffffff;</div><div class='add'>+		inv = 1;</div><div class='add'>+		break;</div><div class='add'>+	case METHOD_GPIO_24XX:</div><div class='add'>+		reg += OMAP24XX_GPIO_IRQENABLE1;</div><div class='add'>+		mask = 0xffffffff;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	l = __raw_readl(reg);</div><div class='add'>+	if (inv)</div><div class='add'>+		l = ~l;</div><div class='add'>+	l &amp;= mask;</div><div class='add'>+	return l;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *reg = bank-&gt;base;</div><div class='hunk'>@@ -736,10 +778,12 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,</div><div class='ctx'> 	u32 isr;</div><div class='ctx'> 	unsigned int gpio_irq;</div><div class='ctx'> 	struct gpio_bank *bank;</div><div class='add'>+	u32 retrigger = 0;</div><div class='add'>+	int unmasked = 0;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;chip-&gt;ack(irq);</div><div class='ctx'> </div><div class='del'>-	bank = (struct gpio_bank *) desc-&gt;data;</div><div class='add'>+	bank = get_irq_data(irq);</div><div class='ctx'> 	if (bank-&gt;method == METHOD_MPUIO)</div><div class='ctx'> 		isr_reg = bank-&gt;base + OMAP_MPUIO_GPIO_INT;</div><div class='ctx'> #ifdef CONFIG_ARCH_OMAP15XX</div><div class='hunk'>@@ -760,18 +804,22 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,</div><div class='ctx'> #endif</div><div class='ctx'> 	while(1) {</div><div class='ctx'> 		u32 isr_saved, level_mask = 0;</div><div class='add'>+		u32 enabled;</div><div class='ctx'> </div><div class='del'>-		isr_saved = isr = __raw_readl(isr_reg);</div><div class='add'>+		enabled = _get_gpio_irqbank_mask(bank);</div><div class='add'>+		isr_saved = isr = __raw_readl(isr_reg) &amp; enabled;</div><div class='ctx'> </div><div class='ctx'> 		if (cpu_is_omap15xx() &amp;&amp; (bank-&gt;method == METHOD_MPUIO))</div><div class='ctx'> 			isr &amp;= 0x0000ffff;</div><div class='ctx'> </div><div class='del'>-		if (cpu_is_omap24xx())</div><div class='add'>+		if (cpu_is_omap24xx()) {</div><div class='ctx'> 			level_mask =</div><div class='ctx'> 				__raw_readl(bank-&gt;base +</div><div class='ctx'> 					OMAP24XX_GPIO_LEVELDETECT0) |</div><div class='ctx'> 				__raw_readl(bank-&gt;base +</div><div class='ctx'> 					OMAP24XX_GPIO_LEVELDETECT1);</div><div class='add'>+			level_mask &amp;= enabled;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* clear edge sensitive interrupts before handler(s) are</div><div class='ctx'> 		called so that we don't miss any interrupt occurred while</div><div class='hunk'>@@ -782,19 +830,55 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,</div><div class='ctx'> </div><div class='ctx'> 		/* if there is only edge sensitive GPIO pin interrupts</div><div class='ctx'> 		configured, we could unmask GPIO bank interrupt immediately */</div><div class='del'>-		if (!level_mask)</div><div class='add'>+		if (!level_mask &amp;&amp; !unmasked) {</div><div class='add'>+			unmasked = 1;</div><div class='ctx'> 			desc-&gt;chip-&gt;unmask(irq);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		isr |= retrigger;</div><div class='add'>+		retrigger = 0;</div><div class='ctx'> 		if (!isr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		gpio_irq = bank-&gt;virtual_irq_start;</div><div class='ctx'> 		for (; isr != 0; isr &gt;&gt;= 1, gpio_irq++) {</div><div class='ctx'> 			struct irqdesc *d;</div><div class='add'>+			int irq_mask;</div><div class='ctx'> 			if (!(isr &amp; 1))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			d = irq_desc + gpio_irq;</div><div class='add'>+			/* Don't run the handler if it's already running</div><div class='add'>+			 * or was disabled lazely.</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely((d-&gt;depth ||</div><div class='add'>+				      (d-&gt;status &amp; IRQ_INPROGRESS)))) {</div><div class='add'>+				irq_mask = 1 &lt;&lt;</div><div class='add'>+					(gpio_irq - bank-&gt;virtual_irq_start);</div><div class='add'>+				/* The unmasking will be done by</div><div class='add'>+				 * enable_irq in case it is disabled or</div><div class='add'>+				 * after returning from the handler if</div><div class='add'>+				 * it's already running.</div><div class='add'>+				 */</div><div class='add'>+				_enable_gpio_irqbank(bank, irq_mask, 0);</div><div class='add'>+				if (!d-&gt;depth) {</div><div class='add'>+					/* Level triggered interrupts</div><div class='add'>+					 * won't ever be reentered</div><div class='add'>+					 */</div><div class='add'>+					BUG_ON(level_mask &amp; irq_mask);</div><div class='add'>+					d-&gt;status |= IRQ_PENDING;</div><div class='add'>+				}</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			desc_handle_irq(gpio_irq, d, regs);</div><div class='add'>+</div><div class='add'>+			if (unlikely((d-&gt;status &amp; IRQ_PENDING) &amp;&amp; !d-&gt;depth)) {</div><div class='add'>+				irq_mask = 1 &lt;&lt;</div><div class='add'>+					(gpio_irq - bank-&gt;virtual_irq_start);</div><div class='add'>+				d-&gt;status &amp;= ~IRQ_PENDING;</div><div class='add'>+				_enable_gpio_irqbank(bank, irq_mask, 1);</div><div class='add'>+				retrigger |= irq_mask;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cpu_is_omap24xx()) {</div><div class='hunk'>@@ -804,13 +888,14 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,</div><div class='ctx'> 			_enable_gpio_irqbank(bank, isr_saved &amp; level_mask, 1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* if bank has any level sensitive GPIO pin interrupt</div><div class='del'>-		configured, we must unmask the bank interrupt only after</div><div class='del'>-		handler(s) are executed in order to avoid spurious bank</div><div class='del'>-		interrupt */</div><div class='del'>-		if (level_mask)</div><div class='del'>-			desc-&gt;chip-&gt;unmask(irq);</div><div class='ctx'> 	}</div><div class='add'>+	/* if bank has any level sensitive GPIO pin interrupt</div><div class='add'>+	configured, we must unmask the bank interrupt only after</div><div class='add'>+	handler(s) are executed in order to avoid spurious bank</div><div class='add'>+	interrupt */</div><div class='add'>+	if (!unmasked)</div><div class='add'>+		desc-&gt;chip-&gt;unmask(irq);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gpio_ack_irq(unsigned int irq)</div><div class='head'>diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c<br/>index 8c1c016aa689..042105ac30b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/mux.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c<br/>index 37792d43738b..b5d307026c82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/ocpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/ocpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/ocpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/ocpi.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c<br/>index 1a24e2c10714..04b4102727a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/pm.c</a></div><div class='hunk'>@@ -580,7 +580,7 @@ static irqreturn_t  omap_wakeup_interrupt(int  irq, void *  dev,</div><div class='ctx'> </div><div class='ctx'> static struct irqaction omap_wakeup_irq = {</div><div class='ctx'> 	.name		= "peripheral wakeup",</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.handler	= omap_wakeup_interrupt</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S<br/>index 66414cc8e6e3..85cffe2c6266 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram-fn.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/sram-fn.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram-fn.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/sram-fn.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/arch/io.h&gt;</div><div class='head'>diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c<br/>index b7bf09b1b412..e75718301b0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/sram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/sram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/sram.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -158,14 +157,12 @@ static struct map_desc omap_sram_io_desc[] __initdata = {</div><div class='ctx'> 	{	/* .length gets filled in at runtime */</div><div class='ctx'> 		.virtual	= OMAP1_SRAM_VA,</div><div class='ctx'> 		.pfn		= __phys_to_pfn(OMAP1_SRAM_PA),</div><div class='del'>-		.type		= MT_DEVICE</div><div class='add'>+		.type		= MT_MEMORY</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * In order to use last 2kB of SRAM on 1611b, we must round the size</div><div class='del'>- * up to multiple of PAGE_SIZE. We cannot use ioremap for SRAM, as</div><div class='del'>- * clock init needs SRAM early.</div><div class='add'>+ * Note that we cannot use ioremap for SRAM, as clock init needs SRAM early.</div><div class='ctx'>  */</div><div class='ctx'> void __init omap_map_sram(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -185,8 +182,7 @@ void __init omap_map_sram(void)</div><div class='ctx'> 		omap_sram_io_desc[0].pfn = __phys_to_pfn(base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	omap_sram_io_desc[0].length = (omap_sram_size + PAGE_SIZE-1)/PAGE_SIZE;</div><div class='del'>-	omap_sram_io_desc[0].length *= PAGE_SIZE;</div><div class='add'>+	omap_sram_io_desc[0].length = 1024 * 1024;	/* Use section desc */</div><div class='ctx'> 	iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\n",</div><div class='head'>diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c<br/>index b2a943bf11ef..281ecc7fcdfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/timer32k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/timer32k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/timer32k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/timer32k.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  * Partial timer rewrite and additional dynamic tick timer support by</div><div class='ctx'>  * Tony Lindgen &lt;tony@atomide.com&gt; and</div><div class='ctx'>  * Tuukka Tikkanen &lt;tuukka.tikkanen@elektrobit.com&gt;</div><div class='add'>+ * OMAP Dual-mode timer framework support by Timo Teras</div><div class='ctx'>  *</div><div class='ctx'>  * MPU timer code based on the older MPU timer code for OMAP</div><div class='ctx'>  * Copyright (C) 2000 RidgeRun, Inc.</div><div class='hunk'>@@ -33,7 +34,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/irq.h&gt;</div><div class='ctx'> #include &lt;asm/mach/time.h&gt;</div><div class='add'>+#include &lt;asm/arch/dmtimer.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct sys_timer omap_timer;</div><div class='ctx'> </div><div class='hunk'>@@ -79,18 +80,6 @@ struct sys_timer omap_timer;</div><div class='ctx'> #define OMAP1_32K_TIMER_TVR		0x00</div><div class='ctx'> #define OMAP1_32K_TIMER_TCR		0x04</div><div class='ctx'> </div><div class='del'>-/* 24xx specific defines */</div><div class='del'>-#define OMAP2_GP_TIMER_BASE		0x48028000</div><div class='del'>-#define CM_CLKSEL_WKUP			0x48008440</div><div class='del'>-#define GP_TIMER_TIDR			0x00</div><div class='del'>-#define GP_TIMER_TISR			0x18</div><div class='del'>-#define GP_TIMER_TIER			0x1c</div><div class='del'>-#define GP_TIMER_TCLR			0x24</div><div class='del'>-#define GP_TIMER_TCRR			0x28</div><div class='del'>-#define GP_TIMER_TLDR			0x2c</div><div class='del'>-#define GP_TIMER_TTGR			0x30</div><div class='del'>-#define GP_TIMER_TSICR			0x40</div><div class='del'>-</div><div class='ctx'> #define OMAP_32K_TICKS_PER_HZ		(32768 / HZ)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -102,54 +91,62 @@ struct sys_timer omap_timer;</div><div class='ctx'> #define JIFFIES_TO_HW_TICKS(nr_jiffies, clock_rate)			\</div><div class='ctx'> 				(((nr_jiffies) * (clock_rate)) / HZ)</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_ARCH_OMAP1)</div><div class='add'>+</div><div class='ctx'> static inline void omap_32k_timer_write(int val, int reg)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_class_is_omap1())</div><div class='del'>-		omap_writew(val, OMAP1_32K_TIMER_BASE + reg);</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		omap_writel(val, OMAP2_GP_TIMER_BASE + reg);</div><div class='add'>+	omap_writew(val, OMAP1_32K_TIMER_BASE + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long omap_32k_timer_read(int reg)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_class_is_omap1())</div><div class='del'>-		return omap_readl(OMAP1_32K_TIMER_BASE + reg) &amp; 0xffffff;</div><div class='add'>+	return omap_readl(OMAP1_32K_TIMER_BASE + reg) &amp; 0xffffff;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		return omap_readl(OMAP2_GP_TIMER_BASE + reg);</div><div class='add'>+static inline void omap_32k_timer_start(unsigned long load_val)</div><div class='add'>+{</div><div class='add'>+	omap_32k_timer_write(load_val, OMAP1_32K_TIMER_TVR);</div><div class='add'>+	omap_32k_timer_write(0x0f, OMAP1_32K_TIMER_CR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The 32KHz synchronized timer is an additional timer on 16xx.</div><div class='del'>- * It is always running.</div><div class='del'>- */</div><div class='del'>-static inline unsigned long omap_32k_sync_timer_read(void)</div><div class='add'>+static inline void omap_32k_timer_stop(void)</div><div class='ctx'> {</div><div class='del'>-	return omap_readl(TIMER_32K_SYNCHRONIZED);</div><div class='add'>+	omap_32k_timer_write(0x0, OMAP1_32K_TIMER_CR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define omap_32k_timer_ack_irq()</div><div class='add'>+</div><div class='add'>+#elif defined(CONFIG_ARCH_OMAP2)</div><div class='add'>+</div><div class='add'>+static struct omap_dm_timer *gptimer;</div><div class='add'>+</div><div class='ctx'> static inline void omap_32k_timer_start(unsigned long load_val)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_class_is_omap1()) {</div><div class='del'>-		omap_32k_timer_write(load_val, OMAP1_32K_TIMER_TVR);</div><div class='del'>-		omap_32k_timer_write(0x0f, OMAP1_32K_TIMER_CR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpu_is_omap24xx()) {</div><div class='del'>-		omap_32k_timer_write(0xffffffff - load_val, GP_TIMER_TCRR);</div><div class='del'>-		omap_32k_timer_write((1 &lt;&lt; 1), GP_TIMER_TIER);</div><div class='del'>-		omap_32k_timer_write((1 &lt;&lt; 1) | 1, GP_TIMER_TCLR);</div><div class='del'>-	}</div><div class='add'>+	omap_dm_timer_set_load(gptimer, 1, 0xffffffff - load_val);</div><div class='add'>+	omap_dm_timer_set_int_enable(gptimer, OMAP_TIMER_INT_OVERFLOW);</div><div class='add'>+	omap_dm_timer_start(gptimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void omap_32k_timer_stop(void)</div><div class='ctx'> {</div><div class='del'>-	if (cpu_class_is_omap1())</div><div class='del'>-		omap_32k_timer_write(0x0, OMAP1_32K_TIMER_CR);</div><div class='add'>+	omap_dm_timer_stop(gptimer);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		omap_32k_timer_write(0x0, GP_TIMER_TCLR);</div><div class='add'>+static inline void omap_32k_timer_ack_irq(void)</div><div class='add'>+{</div><div class='add'>+	u32 status = omap_dm_timer_read_status(gptimer);</div><div class='add'>+	omap_dm_timer_write_status(gptimer, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The 32KHz synchronized timer is an additional timer on 16xx.</div><div class='add'>+ * It is always running.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long omap_32k_sync_timer_read(void)</div><div class='add'>+{</div><div class='add'>+	return omap_readl(TIMER_32K_SYNCHRONIZED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -203,14 +200,11 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,</div><div class='ctx'> </div><div class='ctx'> 	write_seqlock_irqsave(&amp;xtime_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_omap24xx()) {</div><div class='del'>-		u32 status = omap_32k_timer_read(GP_TIMER_TISR);</div><div class='del'>-		omap_32k_timer_write(status, GP_TIMER_TISR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	omap_32k_timer_ack_irq();</div><div class='ctx'> 	now = omap_32k_sync_timer_read();</div><div class='ctx'> </div><div class='del'>-	while (now - omap_32k_last_tick &gt;= OMAP_32K_TICKS_PER_HZ) {</div><div class='add'>+	while ((signed long)(now - omap_32k_last_tick)</div><div class='add'>+						&gt;= OMAP_32K_TICKS_PER_HZ) {</div><div class='ctx'> 		omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ;</div><div class='ctx'> 		timer_tick(regs);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -264,13 +258,10 @@ static struct dyn_tick_timer omap_dyn_tick_timer = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction omap_32k_timer_irq = {</div><div class='ctx'> 	.name		= "32KHz timer",</div><div class='del'>-	.flags		= SA_INTERRUPT | SA_TIMER,</div><div class='add'>+	.flags		= IRQF_DISABLED | IRQF_TIMER,</div><div class='ctx'> 	.handler	= omap_32k_timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct clk * gpt1_ick;</div><div class='del'>-static struct clk * gpt1_fck;</div><div class='del'>-</div><div class='ctx'> static __init void omap_init_32k_timer(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_NO_IDLE_HZ</div><div class='hunk'>@@ -279,32 +270,22 @@ static __init void omap_init_32k_timer(void)</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_class_is_omap1())</div><div class='ctx'> 		setup_irq(INT_OS_TIMER, &amp;omap_32k_timer_irq);</div><div class='del'>-	if (cpu_is_omap24xx())</div><div class='del'>-		setup_irq(37, &amp;omap_32k_timer_irq);</div><div class='ctx'> 	omap_timer.offset  = omap_32k_timer_gettimeoffset;</div><div class='ctx'> 	omap_32k_last_tick = omap_32k_sync_timer_read();</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARCH_OMAP2</div><div class='ctx'> 	/* REVISIT: Check 24xx TIOCP_CFG settings after idle works */</div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='del'>-		omap_32k_timer_write(0, GP_TIMER_TCLR);</div><div class='del'>-		omap_writel(0, CM_CLKSEL_WKUP);		/* 32KHz clock source */</div><div class='del'>-</div><div class='del'>-		gpt1_ick = clk_get(NULL, "gpt1_ick");</div><div class='del'>-		if (IS_ERR(gpt1_ick))</div><div class='del'>-			printk(KERN_ERR "Could not get gpt1_ick\n");</div><div class='del'>-		else</div><div class='del'>-			clk_enable(gpt1_ick);</div><div class='del'>-</div><div class='del'>-		gpt1_fck = clk_get(NULL, "gpt1_fck");</div><div class='del'>-		if (IS_ERR(gpt1_fck))</div><div class='del'>-			printk(KERN_ERR "Could not get gpt1_fck\n");</div><div class='del'>-		else</div><div class='del'>-			clk_enable(gpt1_fck);</div><div class='del'>-</div><div class='del'>-		mdelay(100);		/* Wait for clocks to stabilize */</div><div class='del'>-</div><div class='del'>-		omap_32k_timer_write(0x7, GP_TIMER_TISR);</div><div class='add'>+		gptimer = omap_dm_timer_request_specific(1);</div><div class='add'>+		BUG_ON(gptimer == NULL);</div><div class='add'>+</div><div class='add'>+		omap_dm_timer_set_source(gptimer, OMAP_TIMER_SRC_32_KHZ);</div><div class='add'>+		setup_irq(omap_dm_timer_get_irq(gptimer), &amp;omap_32k_timer_irq);</div><div class='add'>+		omap_dm_timer_set_int_enable(gptimer,</div><div class='add'>+			OMAP_TIMER_INT_CAPTURE | OMAP_TIMER_INT_OVERFLOW |</div><div class='add'>+			OMAP_TIMER_INT_MATCH);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);</div><div class='ctx'> }</div><div class='hunk'>@@ -316,6 +297,9 @@ static __init void omap_init_32k_timer(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init omap_timer_init(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_OMAP_DM_TIMER</div><div class='add'>+	omap_dm_timer_init();</div><div class='add'>+#endif</div><div class='ctx'> 	omap_init_32k_timer();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c<br/>index 00afc7a8c2ab..9b815327b6a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/plat-omap/usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/plat-omap/usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/plat-omap/usb.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef	DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types<br/>index 6d7de9c0412f..e1372a25311d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/tools/mach-types?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/tools/mach-types</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/tools/mach-types?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/tools/mach-types</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #</div><div class='ctx'> #   http://www.arm.linux.org.uk/developer/machines/?action=new</div><div class='ctx'> #</div><div class='del'>-# Last update: Mon May 8 20:11:05 2006</div><div class='add'>+# Last update: Mon Jun 26 22:26:08 2006</div><div class='ctx'> #</div><div class='ctx'> # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number</div><div class='ctx'> #</div><div class='hunk'>@@ -566,8 +566,8 @@ switchgrass		MACH_SWITCHGRASS	SWITCHGRASS		549</div><div class='ctx'> ens_cmu			MACH_ENS_CMU		ENS_CMU			550</div><div class='ctx'> mm6_sdb			MACH_MM6_SDB		MM6_SDB			551</div><div class='ctx'> saturn			MACH_SATURN		SATURN			552</div><div class='del'>-i30030evb		MACH_ARGONPLUSEVB	ARGONPLUSEVB		553</div><div class='del'>-mxc27530evb		MACH_SCMA11EVB		SCMA11EVB		554</div><div class='add'>+i30030evb		MACH_I30030EVB		I30030EVB		553</div><div class='add'>+mxc27530evb		MACH_MXC27530EVB	MXC27530EVB		554</div><div class='ctx'> smdk2800		MACH_SMDK2800		SMDK2800		555</div><div class='ctx'> mtwilson		MACH_MTWILSON		MTWILSON		556</div><div class='ctx'> ziti			MACH_ZITI		ZITI			557</div><div class='hunk'>@@ -647,7 +647,7 @@ sendt			MACH_SENDT		SENDT			630</div><div class='ctx'> mx2jazz			MACH_MX2JAZZ		MX2JAZZ			631</div><div class='ctx'> multiio			MACH_MULTIIO		MULTIIO			632</div><div class='ctx'> hrdisplay		MACH_HRDISPLAY		HRDISPLAY		633</div><div class='del'>-mxc27530ads		MACH_SCMA11BB		SCMA11BB		634</div><div class='add'>+mxc27530ads		MACH_MXC27530ADS	MXC27530ADS		634</div><div class='ctx'> trizeps3		MACH_TRIZEPS3		TRIZEPS3		635</div><div class='ctx'> zefeerdza		MACH_ZEFEERDZA		ZEFEERDZA		636</div><div class='ctx'> zefeerdzb		MACH_ZEFEERDZB		ZEFEERDZB		637</div><div class='hunk'>@@ -721,7 +721,7 @@ gp32			MACH_GP32		GP32			706</div><div class='ctx'> gem			MACH_GEM		GEM			707</div><div class='ctx'> i858			MACH_I858		I858			708</div><div class='ctx'> hx2750			MACH_HX2750		HX2750			709</div><div class='del'>-mxc91131evb		MACH_ZEUSEVB		ZEUSEVB			710</div><div class='add'>+mxc91131evb		MACH_MXC91131EVB	MXC91131EVB		710</div><div class='ctx'> p700			MACH_P700		P700			711</div><div class='ctx'> cpe			MACH_CPE		CPE			712</div><div class='ctx'> spitz			MACH_SPITZ		SPITZ			713</div><div class='hunk'>@@ -802,7 +802,7 @@ cpuat91			MACH_CPUAT91		CPUAT91			787</div><div class='ctx'> rea9200			MACH_REA9200		REA9200			788</div><div class='ctx'> acts_pune_sa1110	MACH_ACTS_PUNE_SA1110	ACTS_PUNE_SA1110	789</div><div class='ctx'> ixp425			MACH_IXP425		IXP425			790</div><div class='del'>-i30030ads		MACH_ARGONPLUSODYSSEY	ARGONPLUSODYSSEY	791</div><div class='add'>+i30030ads		MACH_I30030ADS		I30030ADS		791</div><div class='ctx'> perch			MACH_PERCH		PERCH			792</div><div class='ctx'> eis05r1			MACH_EIS05R1		EIS05R1			793</div><div class='ctx'> pepperpad		MACH_PEPPERPAD		PEPPERPAD		794</div><div class='hunk'>@@ -930,7 +930,7 @@ netclient		MACH_NETCLIENT		NETCLIENT		916</div><div class='ctx'> xscale_palmtt5		MACH_XSCALE_PALMTT5	XSCALE_PALMTT5		917</div><div class='ctx'> xscale_palmtc		MACH_OMAP_PALMTC	OMAP_PALMTC		918</div><div class='ctx'> omap_apollon		MACH_OMAP_APOLLON	OMAP_APOLLON		919</div><div class='del'>-mxc30030evb		MACH_ARGONLVEVB		ARGONLVEVB		920</div><div class='add'>+mxc30030evb		MACH_MXC30030EVB	MXC30030EVB		920</div><div class='ctx'> rea_2d			MACH_REA_2D		REA_2D			921</div><div class='ctx'> eti3e524		MACH_TI3E524		TI3E524			922</div><div class='ctx'> ateb9200		MACH_ATEB9200		ATEB9200		923</div><div class='hunk'>@@ -986,7 +986,7 @@ redfox			MACH_REDFOX		REDFOX			972</div><div class='ctx'> mysh_ep9315_1		MACH_MYSH_EP9315_1	MYSH_EP9315_1		973</div><div class='ctx'> tpf106			MACH_TPF106		TPF106			974</div><div class='ctx'> at91rm9200kg		MACH_AT91RM9200KG	AT91RM9200KG		975</div><div class='del'>-racemt2			MACH_SLEDB		SLEDB			976</div><div class='add'>+rcmt2			MACH_SLEDB		SLEDB			976</div><div class='ctx'> ontrack			MACH_ONTRACK		ONTRACK			977</div><div class='ctx'> pm1200			MACH_PM1200		PM1200			978</div><div class='ctx'> ess24562		MACH_ESS24XXX		ESS24XXX		979</div><div class='hunk'>@@ -1022,7 +1022,7 @@ smdk2440		MACH_SMDK2440		SMDK2440		1008</div><div class='ctx'> smdk2412		MACH_SMDK2412		SMDK2412		1009</div><div class='ctx'> webbox			MACH_WEBBOX		WEBBOX			1010</div><div class='ctx'> cwwndp			MACH_CWWNDP		CWWNDP			1011</div><div class='del'>-dragon			MACH_DRAGON		DRAGON			1012</div><div class='add'>+i839			MACH_DRAGON		DRAGON			1012</div><div class='ctx'> opendo_cpu_board	MACH_OPENDO_CPU_BOARD	OPENDO_CPU_BOARD	1013</div><div class='ctx'> ccm2200			MACH_CCM2200		CCM2200			1014</div><div class='ctx'> etwarm			MACH_ETWARM		ETWARM			1015</div><div class='hunk'>@@ -1040,3 +1040,56 @@ edg79524		MACH_EDG79524		EDG79524		1026</div><div class='ctx'> ai2410			MACH_AI2410		AI2410			1027</div><div class='ctx'> ixp465			MACH_IXP465		IXP465			1028</div><div class='ctx'> balloon3		MACH_BALLOON3		BALLOON3		1029</div><div class='add'>+heins			MACH_HEINS		HEINS			1030</div><div class='add'>+mpluseva		MACH_MPLUSEVA		MPLUSEVA		1031</div><div class='add'>+rt042			MACH_RT042		RT042			1032</div><div class='add'>+cwiem			MACH_CWIEM		CWIEM			1033</div><div class='add'>+cm_x270			MACH_CM_X270		CM_X270			1034</div><div class='add'>+cm_x255			MACH_CM_X255		CM_X255			1035</div><div class='add'>+esh_at91		MACH_ESH_AT91		ESH_AT91		1036</div><div class='add'>+sandgate3		MACH_SANDGATE3		SANDGATE3		1037</div><div class='add'>+primo			MACH_PRIMO		PRIMO			1038</div><div class='add'>+gemstone		MACH_GEMSTONE		GEMSTONE		1039</div><div class='add'>+pronghorn_metro		MACH_PRONGHORNMETRO	PRONGHORNMETRO		1040</div><div class='add'>+sidewinder		MACH_SIDEWINDER		SIDEWINDER		1041</div><div class='add'>+picomod1		MACH_PICOMOD1		PICOMOD1		1042</div><div class='add'>+sg590			MACH_SG590		SG590			1043</div><div class='add'>+akai9307		MACH_AKAI9307		AKAI9307		1044</div><div class='add'>+fontaine		MACH_FONTAINE		FONTAINE		1045</div><div class='add'>+wombat			MACH_WOMBAT		WOMBAT			1046</div><div class='add'>+acq300			MACH_ACQ300		ACQ300			1047</div><div class='add'>+mod_270			MACH_MOD_270		MOD_270			1048</div><div class='add'>+vmc_vc0820		MACH_VC0820		VC0820			1049</div><div class='add'>+ani_aim			MACH_ANI_AIM		ANI_AIM			1050</div><div class='add'>+jellyfish		MACH_JELLYFISH		JELLYFISH		1051</div><div class='add'>+amanita			MACH_AMANITA		AMANITA			1052</div><div class='add'>+vlink			MACH_VLINK		VLINK			1053</div><div class='add'>+dexflex			MACH_DEXFLEX		DEXFLEX			1054</div><div class='add'>+eigen_ttq		MACH_EIGEN_TTQ		EIGEN_TTQ		1055</div><div class='add'>+arcom_titan		MACH_ARCOM_TITAN	ARCOM_TITAN		1056</div><div class='add'>+tabla			MACH_TABLA		TABLA			1057</div><div class='add'>+mdirac3			MACH_MDIRAC3		MDIRAC3			1058</div><div class='add'>+mrhfbp2			MACH_MRHFBP2		MRHFBP2			1059</div><div class='add'>+at91rm9200rb		MACH_AT91RM9200RB	AT91RM9200RB		1060</div><div class='add'>+ani_apm			MACH_ANI_APM		ANI_APM			1061</div><div class='add'>+ella1			MACH_ELLA1		ELLA1			1062</div><div class='add'>+inhand_pxa27x		MACH_INHAND_PXA27X	INHAND_PXA27X		1063</div><div class='add'>+inhand_pxa25x		MACH_INHAND_PXA25X	INHAND_PXA25X		1064</div><div class='add'>+empos_xm		MACH_EMPOS_XM		EMPOS_XM		1065</div><div class='add'>+empos			MACH_EMPOS		EMPOS			1066</div><div class='add'>+empos_tiny		MACH_EMPOS_TINY		EMPOS_TINY		1067</div><div class='add'>+empos_sm		MACH_EMPOS_SM		EMPOS_SM		1068</div><div class='add'>+egret			MACH_EGRET		EGRET			1069</div><div class='add'>+ostrich			MACH_OSTRICH		OSTRICH			1070</div><div class='add'>+n50			MACH_N50		N50			1071</div><div class='add'>+ecbat91			MACH_ECBAT91		ECBAT91			1072</div><div class='add'>+stareast		MACH_STAREAST		STAREAST		1073</div><div class='add'>+dspg_dw			MACH_DSPG_DW		DSPG_DW			1074</div><div class='add'>+onearm			MACH_ONEARM		ONEARM			1075</div><div class='add'>+mrg110_6		MACH_MRG110_6		MRG110_6		1076</div><div class='add'>+wrt300nv2		MACH_WRT300NV2		WRT300NV2		1077</div><div class='add'>+xm_bulverde		MACH_XM_BULVERDE	XM_BULVERDE		1078</div><div class='add'>+msm6100			MACH_MSM6100		MSM6100			1079</div><div class='add'>+eti_b1			MACH_ETI_B1		ETI_B1			1080</div><div class='add'>+za9l_series		MACH_ZILOG_ZA9L		ZILOG_ZA9L		1081</div><div class='add'>+bit2440			MACH_BIT2440		BIT2440			1082</div><div class='head'>diff --git a/arch/arm/vfp/Makefile b/arch/arm/vfp/Makefile<br/>index afabac31dd1d..7e136e77971a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/vfp/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/vfp/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/vfp/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/vfp/Makefile</a></div><div class='hunk'>@@ -7,6 +7,9 @@</div><div class='ctx'> # EXTRA_CFLAGS := -DDEBUG</div><div class='ctx'> # EXTRA_AFLAGS := -DDEBUG</div><div class='ctx'> </div><div class='add'>+AFLAGS		:=$(AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)</div><div class='add'>+LDFLAGS		+=--no-warn-mismatch</div><div class='add'>+</div><div class='ctx'> obj-y			+= vfp.o</div><div class='ctx'> </div><div class='del'>-vfp-$(CONFIG_VFP)	+= entry.o vfpmodule.o vfphw.o vfpsingle.o vfpdouble.o</div><div class='add'>+vfp-$(CONFIG_VFP)	+= vfpmodule.o entry.o vfphw.o vfpsingle.o vfpdouble.o</div><div class='head'>diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S<br/>index a3f65b47aea9..eb683cd77163 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/vfp/vfphw.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/vfp/vfphw.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/vfp/vfphw.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/vfp/vfphw.S</a></div><div class='hunk'>@@ -192,7 +192,7 @@ vfp_get_double:</div><div class='ctx'> 	add	pc, pc, r0, lsl #3</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</div><div class='del'>-	mrrc	p11, 1, r0, r1, c\dr	@ fmrrd	r0, r1, d\dr</div><div class='add'>+	fmrrd	r0, r1, d\dr</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.endr</div><div class='ctx'> </div><div class='hunk'>@@ -206,6 +206,6 @@ vfp_put_double:</div><div class='ctx'> 	add	pc, pc, r0, lsl #3</div><div class='ctx'> 	mov	r0, r0</div><div class='ctx'> 	.irp	dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</div><div class='del'>-	mcrr	p11, 1, r1, r2, c\dr	@ fmdrr	r1, r2, d\dr</div><div class='add'>+	fmdrr	d\dr, r1, r2</div><div class='ctx'> 	mov	pc, lr</div><div class='ctx'> 	.endr</div><div class='head'>diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c<br/>index 03486be04193..9d265d5e748c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm/vfp/vfpmodule.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm/vfp/vfpmodule.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm/vfp/vfpmodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm/vfp/vfpmodule.c</a></div><div class='hunk'>@@ -9,12 +9,13 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/thread_notify.h&gt;</div><div class='ctx'> #include &lt;asm/vfp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vfpinstr.h"</div><div class='hunk'>@@ -36,38 +37,55 @@ union vfp_state *last_VFP_context;</div><div class='ctx'>  */</div><div class='ctx'> unsigned int VFP_arch;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Per-thread VFP initialisation.</div><div class='del'>- */</div><div class='del'>-void vfp_flush_thread(union vfp_state *vfp)</div><div class='add'>+static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v)</div><div class='ctx'> {</div><div class='del'>-	memset(vfp, 0, sizeof(union vfp_state));</div><div class='add'>+	struct thread_info *thread = v;</div><div class='add'>+	union vfp_state *vfp = &amp;thread-&gt;vfpstate;</div><div class='ctx'> </div><div class='del'>-	vfp-&gt;hard.fpexc = FPEXC_ENABLE;</div><div class='del'>-	vfp-&gt;hard.fpscr = FPSCR_ROUND_NEAREST;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case THREAD_NOTIFY_FLUSH:</div><div class='add'>+		/*</div><div class='add'>+		 * Per-thread VFP initialisation.</div><div class='add'>+		 */</div><div class='add'>+		memset(vfp, 0, sizeof(union vfp_state));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Disable VFP to ensure we initialise it first.</div><div class='del'>-	 */</div><div class='del'>-	fmxr(FPEXC, fmrx(FPEXC) &amp; ~FPEXC_ENABLE);</div><div class='add'>+		vfp-&gt;hard.fpexc = FPEXC_ENABLE;</div><div class='add'>+		vfp-&gt;hard.fpscr = FPSCR_ROUND_NEAREST;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Ensure we don't try to overwrite our newly initialised</div><div class='del'>-	 * state information on the first fault.</div><div class='del'>-	 */</div><div class='del'>-	if (last_VFP_context == vfp)</div><div class='del'>-		last_VFP_context = NULL;</div><div class='del'>-}</div><div class='add'>+		/*</div><div class='add'>+		 * Disable VFP to ensure we initialise it first.</div><div class='add'>+		 */</div><div class='add'>+		fmxr(FPEXC, fmrx(FPEXC) &amp; ~FPEXC_ENABLE);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Per-thread VFP cleanup.</div><div class='del'>- */</div><div class='del'>-void vfp_release_thread(union vfp_state *vfp)</div><div class='del'>-{</div><div class='del'>-	if (last_VFP_context == vfp)</div><div class='del'>-		last_VFP_context = NULL;</div><div class='add'>+		/*</div><div class='add'>+		 * FALLTHROUGH: Ensure we don't try to overwrite our newly</div><div class='add'>+		 * initialised state information on the first fault.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+	case THREAD_NOTIFY_RELEASE:</div><div class='add'>+		/*</div><div class='add'>+		 * Per-thread VFP cleanup.</div><div class='add'>+		 */</div><div class='add'>+		if (last_VFP_context == vfp)</div><div class='add'>+			last_VFP_context = NULL;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case THREAD_NOTIFY_SWITCH:</div><div class='add'>+		/*</div><div class='add'>+		 * Always disable VFP so we can lazily save/restore the</div><div class='add'>+		 * old state.</div><div class='add'>+		 */</div><div class='add'>+		fmxr(FPEXC, fmrx(FPEXC) &amp; ~FPEXC_ENABLE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct notifier_block vfp_notifier_block = {</div><div class='add'>+	.notifier_call	= vfp_notifier,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Raise a SIGFPE for the current process.</div><div class='ctx'>  * sicode describes the signal being raised.</div><div class='hunk'>@@ -281,6 +299,8 @@ static int __init vfp_init(void)</div><div class='ctx'> 			(vfpsid &amp; FPSID_VARIANT_MASK) &gt;&gt; FPSID_VARIANT_BIT,</div><div class='ctx'> 			(vfpsid &amp; FPSID_REV_MASK) &gt;&gt; FPSID_REV_BIT);</div><div class='ctx'> 		vfp_vector = vfp_support_entry;</div><div class='add'>+</div><div class='add'>+		thread_register_notifier(&amp;vfp_notifier_block);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig<br/>index cf4ebf4c274d..c14fe918bc4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/Kconfig</a></div><div class='hunk'>@@ -79,7 +79,7 @@ config ARCH_A5K</div><div class='ctx'>         bool "A5000"</div><div class='ctx'> 	select ARCH_MAY_HAVE_PC_FDC</div><div class='ctx'>         help</div><div class='del'>-          Say Y here to to support the Acorn A5000.</div><div class='add'>+          Say Y here to support the Acorn A5000.</div><div class='ctx'> </div><div class='ctx'> 	  Linux can support the</div><div class='ctx'>           internal IDE disk and CD-ROM interface, serial and parallel port,</div><div class='hunk'>@@ -129,7 +129,7 @@ config ZBOOT_ROM_BSS</div><div class='ctx'> config XIP_KERNEL</div><div class='ctx'> 	bool "Execute In Place (XIP) kernel image"</div><div class='ctx'> 	help</div><div class='del'>-	  Select this option to create a kernel that can be programed into</div><div class='add'>+	  Select this option to create a kernel that can be programmed into</div><div class='ctx'> 	  the OS ROMs.</div><div class='ctx'> </div><div class='ctx'> comment "At least one math emulation must be selected"</div><div class='hunk'>@@ -140,7 +140,7 @@ config FPE_NWFPE</div><div class='ctx'> 	  Say Y to include the NWFPE floating point emulator in the kernel.</div><div class='ctx'> 	  This is necessary to run most binaries. Linux does not currently</div><div class='ctx'> 	  support floating point hardware so you need to say Y here even if</div><div class='del'>-	  your machine has an FPA or floating point co-processor podule.</div><div class='add'>+	  your machine has an FPA or floating point co-processor module.</div><div class='ctx'> </div><div class='ctx'> 	  It is also possible to say M to build the emulator as a module</div><div class='ctx'> 	  (nwfpe) or indeed to leave it out altogether. However, unless you</div><div class='head'>diff --git a/arch/arm26/boot/compressed/head.S b/arch/arm26/boot/compressed/head.S<br/>index 0307804a6070..2a2cda36d83b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/boot/compressed/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/boot/compressed/head.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c<br/>index 9d66c27f2724..07907b6ecb63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/armksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/armksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/armksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/armksyms.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/asm-offsets.c b/arch/arm26/kernel/asm-offsets.c<br/>index ac682d5fd039..76d9d7d489a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/kernel/compat.c b/arch/arm26/kernel/compat.c<br/>index db0310db8998..21e966ff0aa7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/compat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/compat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/compat.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *  the kernel for 5 years from now (2001). This will allow boot loaders</div><div class='ctx'>  *  to convert to the new struct tag way.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/ecard.c b/arch/arm26/kernel/ecard.c<br/>index f2278aadac8a..047d0a408b9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/ecard.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/ecard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/ecard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/ecard.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define ECARD_C</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/fiq.c b/arch/arm26/kernel/fiq.c<br/>index a24272b61f30..c4776c96be6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/fiq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/fiq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/fiq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/fiq.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  *	 - enables FIQ.</div><div class='ctx'>  *  6. Goto 3</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/head.S b/arch/arm26/kernel/head.S<br/>index 8bfc62539ba6..93575e0e58fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/head.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  26-bit kernel startup code</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c<br/>index 0934e6fba606..d87d68b77d66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/irq.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *  IRQ's are in fact implemented a bit like signal handlers for the kernel.</div><div class='ctx'>  *  Naturally it's not a 1:1 relation, but there are similarities.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -191,7 +190,7 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;irq_controller_lock);</div><div class='del'>-	if (!(action-&gt;flags &amp; SA_INTERRUPT))</div><div class='add'>+	if (!(action-&gt;flags &amp; IRQF_DISABLED))</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	status = 0;</div><div class='hunk'>@@ -202,7 +201,7 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)</div><div class='ctx'> 		action = action-&gt;next;</div><div class='ctx'> 	} while (action);</div><div class='ctx'> </div><div class='del'>-	if (status &amp; SA_SAMPLE_RANDOM)</div><div class='add'>+	if (status &amp; IRQF_SAMPLE_RANDOM)</div><div class='ctx'> 		add_interrupt_randomness(irq);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;irq_controller_lock);</div><div class='hunk'>@@ -452,7 +451,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)</div><div class='ctx'> 	 * so we have to be careful not to interfere with a</div><div class='ctx'> 	 * running system.</div><div class='ctx'> 	 */</div><div class='del'>-	if (new-&gt;flags &amp; SA_SAMPLE_RANDOM) {</div><div class='add'>+	if (new-&gt;flags &amp; IRQF_SAMPLE_RANDOM) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This function might sleep, we want to call it first,</div><div class='ctx'> 		 * outside of the atomic block.</div><div class='hunk'>@@ -472,7 +471,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)</div><div class='ctx'> 	p = &amp;desc-&gt;action;</div><div class='ctx'> 	if ((old = *p) != NULL) {</div><div class='ctx'> 		/* Can't share interrupts unless both agree to */</div><div class='del'>-		if (!(old-&gt;flags &amp; new-&gt;flags &amp; SA_SHIRQ)) {</div><div class='add'>+		if (!(old-&gt;flags &amp; new-&gt;flags &amp; IRQF_SHARED)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;irq_controller_lock, flags);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -527,11 +526,11 @@ int setup_irq(unsigned int irq, struct irqaction *new)</div><div class='ctx'>  *</div><div class='ctx'>  *	Flags:</div><div class='ctx'>  *</div><div class='del'>- *	SA_SHIRQ		Interrupt is shared</div><div class='add'>+ *	IRQF_SHARED		Interrupt is shared</div><div class='ctx'>  *</div><div class='del'>- *	SA_INTERRUPT		Disable local interrupts while processing</div><div class='add'>+ *	IRQF_DISABLED	Disable local interrupts while processing</div><div class='ctx'>  *</div><div class='del'>- *	SA_SAMPLE_RANDOM	The interrupt can be used for entropy</div><div class='add'>+ *	IRQF_SAMPLE_RANDOM	The interrupt can be used for entropy</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -543,7 +542,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_</div><div class='ctx'> 	struct irqaction *action;</div><div class='ctx'> </div><div class='ctx'> 	if (irq &gt;= NR_IRQS || !irq_desc[irq].valid || !handler ||</div><div class='del'>-	    (irq_flags &amp; SA_SHIRQ &amp;&amp; !dev_id))</div><div class='add'>+	    (irq_flags &amp; IRQF_SHARED &amp;&amp; !dev_id))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);</div><div class='head'>diff --git a/arch/arm26/kernel/process.c b/arch/arm26/kernel/process.c<br/>index 386305659171..dcd81e62ff4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/process.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/ptrace.c b/arch/arm26/kernel/ptrace.c<br/>index 282e24d79328..9343889b27fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/ptrace.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/semaphore.c b/arch/arm26/kernel/semaphore.c<br/>index 3023a53431ff..5447a06db3fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/semaphore.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c<br/>index 4eb329e3828a..e7eb070f794f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -18,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/kernel/signal.c b/arch/arm26/kernel/signal.c<br/>index 2a48c12100c0..6a8ef8da6dab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/signal.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c<br/>index 335525339ad6..db63d75d0715 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/time.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *              "A Kernel Model for Precision Timekeeping" by Dave Mills</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -206,7 +205,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_irq = {</div><div class='ctx'> 	.name	= "timer",</div><div class='del'>-	.flags	= SA_INTERRUPT,</div><div class='add'>+	.flags	= IRQF_DISABLED,</div><div class='ctx'> 	.handler = timer_interrupt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/kernel/traps.c b/arch/arm26/kernel/traps.c<br/>index a79de041b50e..d594fb59e945 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/traps.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/arm26/kernel/vmlinux.lds.S b/arch/arm26/kernel/vmlinux.lds.S<br/>index 811a69048010..1fa39f02e07c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XIP_KERNEL</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/lib/backtrace.S b/arch/arm26/lib/backtrace.S<br/>index d793fe4339fc..e27feb1e891d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/lib/backtrace.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/backtrace.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/lib/backtrace.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/lib/backtrace.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> 		.text</div><div class='head'>diff --git a/arch/arm26/lib/csumpartialcopyuser.S b/arch/arm26/lib/csumpartialcopyuser.S<br/>index 261dd154c1a4..a98eea74305a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/lib/csumpartialcopyuser.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/csumpartialcopyuser.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/lib/csumpartialcopyuser.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/lib/csumpartialcopyuser.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/arm26/lib/kbd.c b/arch/arm26/lib/kbd.c<br/>index 22d2c93aaf1a..cb56e943e006 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/lib/kbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/kbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/lib/kbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/lib/kbd.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='ctx'> //#include &lt;linux/kbd_ll.h&gt;</div><div class='ctx'> #include &lt;linux/kbd_kern.h&gt;</div><div class='head'>diff --git a/arch/arm26/lib/lib1funcs.S b/arch/arm26/lib/lib1funcs.S<br/>index b8f9518db871..0e29970b0e8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/lib/lib1funcs.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/lib/lib1funcs.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/lib/lib1funcs.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/lib/lib1funcs.S</a></div><div class='hunk'>@@ -39,7 +39,6 @@ Boston, MA 02111-1307, USA.  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define RET	movs</div><div class='ctx'> #define RETc(x)	mov##x##s</div><div class='head'>diff --git a/arch/arm26/machine/dma.c b/arch/arm26/machine/dma.c<br/>index cbc7c61d5b32..4402a5a1b78f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/machine/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/machine/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/machine/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/machine/dma.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  DMA functions specific to Archimedes and A5000 architecture</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/machine/irq.c b/arch/arm26/machine/irq.c<br/>index 4361863f7ed2..a60d543edecc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/machine/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/machine/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/machine/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/machine/irq.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *   08-09-2002 IM	Brought up to date for 2.5</div><div class='ctx'>  *   01-06-2003 JMA     Removed arc_fiq_chip</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/arm26/mm/extable.c b/arch/arm26/mm/extable.c<br/>index 2d9f5b5a78d6..38e1958d9538 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  linux/arch/arm26/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/arm26/mm/fault.c b/arch/arm26/mm/fault.c<br/>index bd6f2db608b7..761938b56679 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/mm/fault.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c<br/>index 7da8a5205678..562fac12eb95 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/mm/init.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/arm26/nwfpe/fpmodule.c b/arch/arm26/nwfpe/fpmodule.c<br/>index 5258c6096fb9..a8fad92eb44f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/nwfpe/fpmodule.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/nwfpe/fpmodule.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/nwfpe/fpmodule.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/nwfpe/fpmodule.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* XXX */</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/arm26/nwfpe/fpmodule.h b/arch/arm26/nwfpe/fpmodule.h<br/>index ef71aab46a32..f971ddd60cc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/arm26/nwfpe/fpmodule.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/arm26/nwfpe/fpmodule.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/arm26/nwfpe/fpmodule.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/arm26/nwfpe/fpmodule.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifndef __FPMODULE_H__</div><div class='ctx'> #define __FPMODULE_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define REG_ORIG_R0	16</div><div class='ctx'> #define REG_CPSR	15</div><div class='head'>diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig<br/>index 856b665020e7..6a1238a29d6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/Kconfig</a></div><div class='hunk'>@@ -28,6 +28,10 @@ config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config IRQ_PER_CPU</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config CRIS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='head'>diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/arch-v10/boot/compressed/head.S<br/>index e73f44c998d9..610bdb237553 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/compressed/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/boot/compressed/head.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define ASSEMBLER_MACROS_ONLY</div><div class='ctx'> #include &lt;asm/arch/sv_addr_ag.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c<br/>index 1b5e83f1f846..ffb8d21b2f83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/boot/compressed/misc.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> #define KERNEL_LOAD_ADR 0x40004000</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/arch/svinto.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/boot/rescue/head.S b/arch/cris/arch-v10/boot/rescue/head.S<br/>index addb2194de0f..f223cc0c00bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/rescue/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/rescue/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/rescue/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/boot/rescue/head.S</a></div><div class='hunk'>@@ -63,7 +63,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000, 2001, 2002, 2003 Axis Communications AB</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define ASSEMBLER_MACROS_ONLY</div><div class='ctx'> #include &lt;asm/arch/sv_addr_ag.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/boot/rescue/kimagerescue.S b/arch/cris/arch-v10/boot/rescue/kimagerescue.S<br/>index 264bf7afc9ad..cbccd6316d39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/rescue/kimagerescue.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/boot/rescue/kimagerescue.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/boot/rescue/kimagerescue.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/boot/rescue/kimagerescue.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * 4004000 and after a timeout jump to it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define ASSEMBLER_MACROS_ONLY</div><div class='ctx'> #include &lt;asm/sv_addr_ag.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c<br/>index 56b038c8d482..4fa81abab0c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/axisflashmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/axisflashmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/axisflashmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/drivers/axisflashmap.c</a></div><div class='hunk'>@@ -138,7 +138,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/ds1302.c b/arch/cris/arch-v10/drivers/ds1302.c<br/>index b100f26497c4..3cf4f23de1d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/ds1302.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/ds1302.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/ds1302.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/drivers/ds1302.c</a></div><div class='hunk'>@@ -139,7 +139,6 @@</div><div class='ctx'> *!</div><div class='ctx'> *!***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/eeprom.c b/arch/cris/arch-v10/drivers/eeprom.c<br/>index 512f16dec060..6e1f191a71e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/eeprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/drivers/eeprom.c</a></div><div class='hunk'>@@ -93,7 +93,6 @@</div><div class='ctx'> *!        (c) 1999 Axis Communications AB, Lund, Sweden</div><div class='ctx'> *!*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -451,9 +450,9 @@ int __init eeprom_init(void)</div><div class='ctx'> static int eeprom_open(struct inode * inode, struct file * file)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-  if(MINOR(inode-&gt;i_rdev) != EEPROM_MINOR_NR)</div><div class='add'>+  if(iminor(inode) != EEPROM_MINOR_NR)</div><div class='ctx'>      return -ENXIO;</div><div class='del'>-  if(MAJOR(inode-&gt;i_rdev) != EEPROM_MAJOR_NR)</div><div class='add'>+  if(imajor(inode) != EEPROM_MAJOR_NR)</div><div class='ctx'>      return -ENXIO;</div><div class='ctx'> </div><div class='ctx'>   if( eeprom.size &gt; 0 )</div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c<br/>index 09963fe299a7..fcba6632ed7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/drivers/gpio.c</a></div><div class='hunk'>@@ -135,7 +135,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -436,7 +435,7 @@ static int</div><div class='ctx'> gpio_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpio_private *priv;</div><div class='del'>-	int p = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	int p = iminor(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (p &gt; GPIO_MINOR_LAST)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -938,11 +937,11 @@ gpio_init(void)</div><div class='ctx'> 	 * in some tests.</div><div class='ctx'> 	 */  </div><div class='ctx'> 	if (request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,</div><div class='del'>-			SA_SHIRQ | SA_INTERRUPT,"gpio poll", NULL)) {</div><div class='add'>+			IRQF_SHARED | IRQF_DISABLED,"gpio poll", NULL)) {</div><div class='ctx'> 		printk(KERN_CRIT "err: timer0 irq for gpio\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (request_irq(PA_IRQ_NBR, gpio_pa_interrupt,</div><div class='del'>-			SA_SHIRQ | SA_INTERRUPT,"gpio PA", NULL)) {</div><div class='add'>+			IRQF_SHARED | IRQF_DISABLED,"gpio PA", NULL)) {</div><div class='ctx'> 		printk(KERN_CRIT "err: PA irq for gpio\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/i2c.c b/arch/cris/arch-v10/drivers/i2c.c<br/>index b38267d60d30..6114596c3b33 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/drivers/i2c.c</a></div><div class='hunk'>@@ -96,7 +96,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/etraxi2c.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c<br/>index af517c210383..8c830eefc89c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/pcf8563.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/drivers/pcf8563.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/drivers/pcf8563.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/drivers/pcf8563.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * $Id: pcf8563.c,v 1.11 2005/03/07 13:13:07 starvik Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/crisksyms.c b/arch/cris/arch-v10/kernel/crisksyms.c<br/>index b332bf9b312b..e6b80135502f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/crisksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/crisksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/crisksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/crisksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/arch/svinto.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c<br/>index f3a85b77c17e..2b536ca6f444 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/debugport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/debugport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/debugport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/debugport.c</a></div><div class='hunk'>@@ -103,7 +103,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -541,7 +540,7 @@ init_dummy_console(void)</div><div class='ctx'> 	dummy_driver.init_termios = tty_std_termios;</div><div class='ctx'> 	dummy_driver.init_termios.c_cflag =</div><div class='ctx'> 		B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */</div><div class='del'>-	dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> </div><div class='ctx'> 	dummy_driver.open = dummy_open;</div><div class='ctx'> 	dummy_driver.close = dummy_close;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S<br/>index c808005e8457..ae45d4522e65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/entry.S</a></div><div class='hunk'>@@ -263,7 +263,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c<br/>index cac05a5e514c..8cbdf594b369 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/fasttimer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/fasttimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/fasttimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/fasttimer.c</a></div><div class='hunk'>@@ -111,7 +111,6 @@</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/svinto.h&gt;</div><div class='ctx'> #include &lt;asm/fasttimer.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/head.S b/arch/cris/arch-v10/kernel/head.S<br/>index f00c145b43f1..d946d8b8d277 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/head.S</a></div><div class='hunk'>@@ -183,7 +183,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> 	</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define ASSEMBLER_MACROS_ONLY</div><div class='ctx'> /* The IO_* macros use the ## token concatenation operator, so</div><div class='ctx'>    -traditional must not be used when assembling this file.  */</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c<br/>index 4b368a122015..96094cbf1255 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/irq.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 &lt;&lt; (irq_nr));</div><div class='ctx'> #define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 &lt;&lt; (irq_nr));</div><div class='hunk'>@@ -172,7 +171,7 @@ init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize IRQ handler descriptiors. */</div><div class='ctx'> 	for(i = 2; i &lt; NR_IRQS; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;crisv10_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;crisv10_irq_type;</div><div class='ctx'> 		set_int_vector(i, interrupt[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c<br/>index 0a675ce9e099..b6831ceb6a62 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/process.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/setup.c b/arch/cris/arch-v10/kernel/setup.c<br/>index b668d7fb68ee..682ef955aec4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/setup.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of initialization</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c<br/>index dc3dfe9b4a1a..9c22b76e129a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/time.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -252,11 +251,11 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>         return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* timer is SA_SHIRQ so drivers can add stuff to the timer irq chain</div><div class='del'>- * it needs to be SA_INTERRUPT to make the jiffies update work properly</div><div class='add'>+/* timer is IRQF_SHARED so drivers can add stuff to the timer irq chain</div><div class='add'>+ * it needs to be IRQF_DISABLED to make the jiffies update work properly</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq2  = { timer_interrupt, SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+static struct irqaction irq2  = { timer_interrupt, IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 				  CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='head'>diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c<br/>index 34a27ea2052d..4becc1bcced9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/kernel/traps.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/arch/sv_addr_ag.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/lib/dram_init.S b/arch/cris/arch-v10/lib/dram_init.S<br/>index 2ef4ad5706ef..9cf83932cd5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/lib/dram_init.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/lib/dram_init.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/lib/dram_init.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/lib/dram_init.S</a></div><div class='hunk'>@@ -70,7 +70,6 @@</div><div class='ctx'>  * uses this code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	;; WARNING! The registers r8 and r9 are used as parameters carrying</div><div class='ctx'> 	;; information from the decompressor (if the kernel was compressed). </div><div class='head'>diff --git a/arch/cris/arch-v10/mm/init.c b/arch/cris/arch-v10/mm/init.c<br/>index ff3481e76dd4..e0fcd1a9bfd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/mm/init.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  linux/arch/cris/arch-v10/mm/init.c</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S<br/>index 71ba736be8f0..689729a7e66e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v10/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v10/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v10/vmlinux.lds.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * the kernel has booted. </div><div class='ctx'>  */	</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> 		</div><div class='ctx'> jiffies = jiffies_64;</div><div class='head'>diff --git a/arch/cris/arch-v32/boot/compressed/head.S b/arch/cris/arch-v32/boot/compressed/head.S<br/>index 0c55b83b8287..34cea10a8998 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/boot/compressed/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/boot/compressed/head.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *  Copyright (C) 1999 - 2003, Axis Communications AB</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define ASSEMBLER_MACROS_ONLY</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/reg_map_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/gio_defs_asm.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/boot/compressed/misc.c b/arch/cris/arch-v32/boot/compressed/misc.c<br/>index 54644238ed59..11902697196d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/boot/compressed/misc.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> #define KERNEL_LOAD_ADR 0x40004000</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/reg_rdwr.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/boot/rescue/head.S b/arch/cris/arch-v32/boot/rescue/head.S<br/>index 61ede5f30f99..8cdb4011bc16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/boot/rescue/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/boot/rescue/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/boot/rescue/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/boot/rescue/head.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * RedBoot based RFL instead. Nothing to see here, move along.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/reg_map_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/config_defs_asm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c<br/>index b679f983b90a..41952320e00a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/axisflashmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/axisflashmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/axisflashmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/axisflashmap.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c<br/>index c59ee28a35f4..ba096ebb0b15 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/cryptocop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/cryptocop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/cryptocop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/cryptocop.c</a></div><div class='hunk'>@@ -2302,7 +2302,7 @@ static int cryptocop_job_setup(struct cryptocop_prio_job **pj, struct cryptocop_</div><div class='ctx'> </div><div class='ctx'> static int cryptocop_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	int p = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	int p = iminor(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (p != CRYPTOCOP_MINOR) return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c<br/>index a551237dcb5e..c3f876b4da6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/gpio.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -419,7 +418,7 @@ static int</div><div class='ctx'> gpio_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpio_private *priv;</div><div class='del'>-	int p = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	int p = iminor(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (p &gt; GPIO_MINOR_LAST)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -745,11 +744,11 @@ gpio_init(void)</div><div class='ctx'> 	 * in some tests.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (request_irq(TIMER_INTR_VECT, gpio_poll_timer_interrupt,</div><div class='del'>-			SA_SHIRQ | SA_INTERRUPT,"gpio poll", &amp;alarmlist)) {</div><div class='add'>+			IRQF_SHARED | IRQF_DISABLED,"gpio poll", &amp;alarmlist)) {</div><div class='ctx'> 		printk("err: timer0 irq for gpio\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (request_irq(GEN_IO_INTR_VECT, gpio_pa_interrupt,</div><div class='del'>-			SA_SHIRQ | SA_INTERRUPT,"gpio PA", &amp;alarmlist)) {</div><div class='add'>+			IRQF_SHARED | IRQF_DISABLED,"gpio PA", &amp;alarmlist)) {</div><div class='ctx'> 		printk("err: PA irq for gpio\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	/* enable the gio and timer irq in global config */</div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c<br/>index 440c20a94963..95f00188c628 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/i2c.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/etraxi2c.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c<br/>index d788bda3578c..2fc7d75a35de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/pcf8563.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/pcf8563.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/pcf8563.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/pcf8563.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -325,14 +324,12 @@ pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned</div><div class='ctx'> int</div><div class='ctx'> pcf8563_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	MOD_INC_USE_COUNT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> pcf8563_release(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	MOD_DEC_USE_COUNT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c<br/>index 24bc149889b6..a2b9c60c2777 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/pci/bios.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/pci/bios.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/pci/bios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/pci/bios.c</a></div><div class='hunk'>@@ -27,8 +27,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 	/* Leave vm_pgoff as-is, the PCI space address is the physical</div><div class='ctx'> 	 * address on this platform.</div><div class='ctx'> 	 */</div><div class='del'>-	vma-&gt;vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);</div><div class='del'>-</div><div class='ctx'> 	prot = pgprot_val(vma-&gt;vm_page_prot);</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pgprot(prot);</div><div class='ctx'> </div><div class='hunk'>@@ -45,10 +43,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-		       unsigned long size, unsigned long align)</div><div class='add'>+		       resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='ctx'> 			start = (start + 0x3ff) &amp; ~0x3ff;</div><div class='head'>diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c<br/>index c85a6df8558f..e067806b2208 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/sync_serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/drivers/sync_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/drivers/sync_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/drivers/sync_serial.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -341,7 +340,7 @@ static inline int sync_data_avail_to_end(struct sync_port *port)</div><div class='ctx'> </div><div class='ctx'> static int sync_serial_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int dev = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	int dev = iminor(inode);</div><div class='ctx'> 	sync_port* port;</div><div class='ctx'> 	reg_dma_rw_cfg cfg = {.en = regk_dma_yes};</div><div class='ctx'> 	reg_dma_rw_intr_mask intr_mask = {.data = regk_dma_yes};</div><div class='hunk'>@@ -487,7 +486,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static int sync_serial_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int dev = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	int dev = iminor(inode);</div><div class='ctx'> 	sync_port* port;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &lt; 0 || dev &gt;= NUMBER_OF_PORTS || !ports[dev].enabled)</div><div class='hunk'>@@ -505,7 +504,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static unsigned int sync_serial_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='del'>-	int dev = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	int dev = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='ctx'> 	sync_port* port;</div><div class='ctx'> 	DEBUGPOLL( static unsigned int prev_mask = 0; );</div><div class='hunk'>@@ -532,7 +531,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		  unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	int return_val = 0;</div><div class='del'>-	int dev = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	int dev = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	sync_port* port;</div><div class='ctx'> 	reg_sser_rw_tr_cfg tr_cfg;</div><div class='ctx'> 	reg_sser_rw_rec_cfg rec_cfg;</div><div class='hunk'>@@ -790,7 +789,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> static ssize_t sync_serial_write(struct file * file, const char * buf,</div><div class='ctx'>                                  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int dev = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	int dev = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 	sync_port *port;</div><div class='ctx'> 	unsigned long c, c1;</div><div class='hunk'>@@ -920,7 +919,7 @@ static ssize_t sync_serial_write(struct file * file, const char * buf,</div><div class='ctx'> static ssize_t sync_serial_read(struct file * file, char * buf,</div><div class='ctx'> 				size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	int dev = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	int dev = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	int avail;</div><div class='ctx'> 	sync_port *port;</div><div class='ctx'> 	unsigned char* start;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/arbiter.c b/arch/cris/arch-v32/kernel/arbiter.c<br/>index 3870d2fd5160..420a5312ed03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/arbiter.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/arbiter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/arbiter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/arbiter.c</a></div><div class='hunk'>@@ -1,15 +1,14 @@</div><div class='ctx'> /*</div><div class='del'>- * Memory arbiter functions. Allocates bandwith through the</div><div class='add'>+ * Memory arbiter functions. Allocates bandwidth through the</div><div class='ctx'>  * arbiter and sets up arbiter breakpoints.</div><div class='ctx'>  *</div><div class='ctx'>  * The algorithm first assigns slots to the clients that has specified</div><div class='del'>- * bandwith (e.g. ethernet) and then the remaining slots are divided</div><div class='add'>+ * bandwidth (e.g. ethernet) and then the remaining slots are divided</div><div class='ctx'>  * on all the active clients.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004, 2005 Axis Communications AB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/reg_map.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/reg_rdwr.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/marb_defs.h&gt;</div><div class='hunk'>@@ -120,7 +119,7 @@ static void crisv32_arbiter_init(void)</div><div class='ctx'>         crisv32_arbiter_config(EXT_REGION);</div><div class='ctx'>         crisv32_arbiter_config(INT_REGION);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, IRQF_DISABLED,</div><div class='ctx'>                         "arbiter", NULL))</div><div class='ctx'> 		printk(KERN_ERR "Couldn't allocate arbiter IRQ\n");</div><div class='ctx'> </div><div class='hunk'>@@ -133,8 +132,8 @@ static void crisv32_arbiter_init(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int crisv32_arbiter_allocate_bandwith(int client, int region,</div><div class='del'>-	                              unsigned long bandwidth)</div><div class='add'>+int crisv32_arbiter_allocate_bandwidth(int client, int region,</div><div class='add'>+				       unsigned long bandwidth)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int total_assigned = 0;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/crisksyms.c b/arch/cris/arch-v32/kernel/crisksyms.c<br/>index 2c3bb9a0afe2..e513da711245 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/crisksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/crisksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/crisksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/crisksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/arch/dma.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/debugport.c b/arch/cris/arch-v32/kernel/debugport.c<br/>index ffc1ebf2dfee..d1272ad92153 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/debugport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/debugport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/debugport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/debugport.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Copyright (C) 2003, Axis Communications AB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -353,7 +352,7 @@ init_dummy_console(void)</div><div class='ctx'> 	dummy_driver.init_termios = tty_std_termios;</div><div class='ctx'> 	dummy_driver.init_termios.c_cflag =</div><div class='ctx'> 		B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */</div><div class='del'>-	dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> </div><div class='ctx'> 	dummy_driver.open = dummy_open;</div><div class='ctx'> 	dummy_driver.close = dummy_close;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/dma.c b/arch/cris/arch-v32/kernel/dma.c<br/>index b92e85799b44..570e19128ffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/dma.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@ int crisv32_request_dma(unsigned int dmanr, const char * device_id,</div><div class='ctx'> 	reg_config_rw_clk_ctrl clk_ctrl;</div><div class='ctx'> 	reg_strmux_rw_cfg strmux_cfg;</div><div class='ctx'> </div><div class='del'>-        if (crisv32_arbiter_allocate_bandwith(dmanr,</div><div class='del'>-                                              options &amp; DMA_INT_MEM ? INT_REGION : EXT_REGION,</div><div class='add'>+        if (crisv32_arbiter_allocate_bandwidth(dmanr,</div><div class='add'>+					       options &amp; DMA_INT_MEM ? INT_REGION : EXT_REGION,</div><div class='ctx'>                                               bandwidth))</div><div class='ctx'>           return -ENOMEM;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S<br/>index 3bd8503fec68..f9d27807b914 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/entry.S</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c<br/>index ea2b4a97c8c7..5daeb6f7f3b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/fasttimer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/fasttimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/fasttimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/fasttimer.c</a></div><div class='hunk'>@@ -120,7 +120,6 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/hwregs/reg_map.h&gt;</div><div class='hunk'>@@ -982,7 +981,7 @@ void fast_timer_init(void)</div><div class='ctx'>     proc_register_dynamic(&amp;proc_root, &amp;fasttimer_proc_entry);</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* PROC_FS */</div><div class='del'>-    if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, SA_INTERRUPT,</div><div class='add'>+    if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, IRQF_DISABLED,</div><div class='ctx'>                    "fast timer int", NULL))</div><div class='ctx'>     {</div><div class='ctx'>       printk("err: timer1 irq\n");</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S<br/>index 3cfe57dc391d..20bd80a84e48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/head.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 2003, Axis Communications AB</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLER_MACROS_ONLY</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/io.c b/arch/cris/arch-v32/kernel/io.c<br/>index 6bc9f263c3d6..dfbfcb8d2585 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/io.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (c) 2004 Axis Communications AB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c<br/>index c78cc2685133..cc361bf578ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/irq.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -269,7 +268,7 @@ void</div><div class='ctx'> crisv32_do_IRQ(int irq, int block, struct pt_regs* regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Interrupts that may not be moved to another CPU and</div><div class='del'>-         * are SA_INTERRUPT may skip blocking. This is currently</div><div class='add'>+         * are IRQF_DISABLED may skip blocking. This is currently</div><div class='ctx'>          * only valid for the timer IRQ and the IPI and is used</div><div class='ctx'>          * for the timer interrupt to avoid watchdog starvation.</div><div class='ctx'>          */</div><div class='hunk'>@@ -369,7 +368,7 @@ init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Point all IRQ's to bad handlers. */</div><div class='ctx'> 	for (i = FIRST_IRQ, j = 0; j &lt; NR_IRQS; i++, j++) {</div><div class='del'>-		irq_desc[j].handler = &amp;crisv32_irq_type;</div><div class='add'>+		irq_desc[j].chip = &amp;crisv32_irq_type;</div><div class='ctx'> 		set_exception_vector(i, interrupt[j]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/kgdb_asm.S b/arch/cris/arch-v32/kernel/kgdb_asm.S<br/>index b350dd279ed2..3e7fa9ef8510 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/kgdb_asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/kgdb_asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/kgdb_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/kgdb_asm.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * port exceptions for kernel debugging purposes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/intr_vect.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	;; Exported functions.</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c<br/>index 843513102d3c..6326351af252 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/process.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/setup.c b/arch/cris/arch-v32/kernel/setup.c<br/>index b17a39a2e164..4662f363df63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/setup.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 2003, Axis Communications AB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c<br/>index da40d19a151e..464ecaec3bc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/smp.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static unsigned long irq_regs[NR_CPUS] =</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs);</div><div class='ctx'> static int send_ipi(int vector, int wait, cpumask_t cpu_mask);</div><div class='del'>-static struct irqaction irq_ipi  = { crisv32_ipi_interrupt, SA_INTERRUPT,</div><div class='add'>+static struct irqaction irq_ipi  = { crisv32_ipi_interrupt, IRQF_DISABLED,</div><div class='ctx'>                                      CPU_MASK_NONE, "ipi", NULL, NULL};</div><div class='ctx'> </div><div class='ctx'> extern void cris_mmu_init(void);</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c<br/>index d48e397f5fa4..50f3f93293d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/time.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -242,12 +241,16 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>         return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* timer is SA_SHIRQ so drivers can add stuff to the timer irq chain</div><div class='del'>- * it needs to be SA_INTERRUPT to make the jiffies update work properly</div><div class='add'>+/* timer is IRQF_SHARED so drivers can add stuff to the timer irq chain</div><div class='add'>+ * it needs to be IRQF_DISABLED to make the jiffies update work properly</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq_timer  = { timer_interrupt, SA_SHIRQ | SA_INTERRUPT,</div><div class='del'>-				  CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='add'>+static struct irqaction irq_timer  = {</div><div class='add'>+	.mask = timer_interrupt,</div><div class='add'>+	.flags = IRQF_SHARED | IRQF_DISABLED,</div><div class='add'>+	.mask = CPU_MASK_NONE,</div><div class='add'>+	.name = "timer"</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='ctx'> cris_timer_init(void)</div><div class='head'>diff --git a/arch/cris/arch-v32/kernel/traps.c b/arch/cris/arch-v32/kernel/traps.c<br/>index 6e3787045560..2462b1ef1fbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/kernel/traps.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Copyright (C) 2003, Axis Communications AB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/lib/dram_init.S b/arch/cris/arch-v32/lib/dram_init.S<br/>index 47b6cf5f4afd..158b3dbb4d9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/lib/dram_init.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/lib/dram_init.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/lib/dram_init.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/lib/dram_init.S</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * uses this code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/reg_map_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/bif_core_defs_asm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/arch-v32/lib/hw_settings.S b/arch/cris/arch-v32/lib/hw_settings.S<br/>index 5182e8c2cff2..fff9443513d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/lib/hw_settings.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/lib/hw_settings.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/lib/hw_settings.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/lib/hw_settings.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Authors:  Mikael Starvik (starvik@axis.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/reg_map_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/bif_core_defs_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/gio_defs_asm.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/lib/nand_init.S b/arch/cris/arch-v32/lib/nand_init.S<br/>index aba5c751c282..e019816facd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/lib/nand_init.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/lib/nand_init.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/lib/nand_init.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/lib/nand_init.S</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/pinmux_defs_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/bif_core_defs_asm.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hwregs/asm/config_defs_asm.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> ;; There are 8-bit NAND flashes and 16-bit NAND flashes.</div><div class='ctx'> ;; We need to treat them slightly different.</div><div class='head'>diff --git a/arch/cris/arch-v32/mm/init.c b/arch/cris/arch-v32/mm/init.c<br/>index f2fba27d822c..a84ba7ff22d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/mm/init.c</a></div><div class='hunk'>@@ -6,12 +6,10 @@</div><div class='ctx'>  * Authors:   Bjorn Wesen &lt;bjornw@axis.com&gt;</div><div class='ctx'>  *            Tobias Anderberg &lt;tobiasa@axis.com&gt;, CRISv32 port.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='head'>diff --git a/arch/cris/arch-v32/vmlinux.lds.S b/arch/cris/arch-v32/vmlinux.lds.S<br/>index adb94605d92a..472d4b3c4cf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/arch-v32/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/arch-v32/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/arch-v32/vmlinux.lds.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * the kernel has booted.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='ctx'> jiffies = jiffies_64;</div><div class='head'>diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c<br/>index d57859053ce7..1f20c16ac2a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/kernel/crisksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/kernel/crisksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/kernel/crisksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/kernel/crisksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='head'>diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c<br/>index b504def3e346..903ea62c6e21 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/kernel/irq.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Naturally it's not a 1:1 relation, but there are similarities.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -69,7 +68,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -86,7 +85,7 @@ skip:</div><div class='ctx'> /* called by the assembler IRQ entry functions defined in irq.h</div><div class='ctx'>  * to dispatch the interrupts to registred handlers</div><div class='ctx'>  * interrupts are disabled upon entry - depending on if the</div><div class='del'>- * interrupt was registred with SA_INTERRUPT or not, interrupts</div><div class='add'>+ * interrupt was registred with IRQF_DISABLED or not, interrupts</div><div class='ctx'>  * are re-enabled or not.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c<br/>index 619a6eefd893..7af3d5d43e43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/cris/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/cris/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/cris/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/cris/kernel/setup.c</a></div><div class='hunk'>@@ -10,13 +10,12 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of initialization</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/asm-offsets.c b/arch/frv/kernel/asm-offsets.c<br/>index 9e263112a6e2..fbb19fc1af40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -1 +1,115 @@</div><div class='del'>-/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */</div><div class='add'>+/*</div><div class='add'>+ * Generate definitions needed by assembly language modules.</div><div class='add'>+ * This code generates raw asm output which is post-processed</div><div class='add'>+ * to extract and format the required data.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/personality.h&gt;</div><div class='add'>+#include &lt;asm/registers.h&gt;</div><div class='add'>+#include &lt;asm/ucontext.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/gdb-stub.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEFINE(sym, val) \</div><div class='add'>+        asm volatile("\n-&gt;" #sym " %0 " #val : : "i" (val))</div><div class='add'>+</div><div class='add'>+#define DEF_PTREG(sym, reg) \</div><div class='add'>+        asm volatile("\n-&gt;" #sym " %0 offsetof(struct pt_regs, " #reg ")" \</div><div class='add'>+		     : : "i" (offsetof(struct pt_regs, reg)))</div><div class='add'>+</div><div class='add'>+#define DEF_IREG(sym, reg) \</div><div class='add'>+        asm volatile("\n-&gt;" #sym " %0 offsetof(struct user_context, " #reg ")" \</div><div class='add'>+		     : : "i" (offsetof(struct user_context, reg)))</div><div class='add'>+</div><div class='add'>+#define DEF_FREG(sym, reg) \</div><div class='add'>+        asm volatile("\n-&gt;" #sym " %0 offsetof(struct user_context, " #reg ")" \</div><div class='add'>+		     : : "i" (offsetof(struct user_context, reg)))</div><div class='add'>+</div><div class='add'>+#define DEF_0REG(sym, reg) \</div><div class='add'>+        asm volatile("\n-&gt;" #sym " %0 offsetof(struct frv_frame0, " #reg ")" \</div><div class='add'>+		     : : "i" (offsetof(struct frv_frame0, reg)))</div><div class='add'>+</div><div class='add'>+#define BLANK() asm volatile("\n-&gt;" : : )</div><div class='add'>+</div><div class='add'>+#define OFFSET(sym, str, mem) \</div><div class='add'>+	DEFINE(sym, offsetof(struct str, mem));</div><div class='add'>+</div><div class='add'>+void foo(void)</div><div class='add'>+{</div><div class='add'>+	/* offsets into the thread_info structure */</div><div class='add'>+	OFFSET(TI_TASK,			thread_info, task);</div><div class='add'>+	OFFSET(TI_EXEC_DOMAIN,		thread_info, exec_domain);</div><div class='add'>+	OFFSET(TI_FLAGS,		thread_info, flags);</div><div class='add'>+	OFFSET(TI_STATUS,		thread_info, status);</div><div class='add'>+	OFFSET(TI_CPU,			thread_info, cpu);</div><div class='add'>+	OFFSET(TI_PREEMPT_COUNT,	thread_info, preempt_count);</div><div class='add'>+	OFFSET(TI_ADDR_LIMIT,		thread_info, addr_limit);</div><div class='add'>+	OFFSET(TI_RESTART_BLOCK,	thread_info, restart_block);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	/* offsets into register file storage */</div><div class='add'>+	DEF_PTREG(REG_PSR,		psr);</div><div class='add'>+	DEF_PTREG(REG_ISR,		isr);</div><div class='add'>+	DEF_PTREG(REG_CCR,		ccr);</div><div class='add'>+	DEF_PTREG(REG_CCCR,		cccr);</div><div class='add'>+	DEF_PTREG(REG_LR,		lr);</div><div class='add'>+	DEF_PTREG(REG_LCR,		lcr);</div><div class='add'>+	DEF_PTREG(REG_PC,		pc);</div><div class='add'>+	DEF_PTREG(REG__STATUS,		__status);</div><div class='add'>+	DEF_PTREG(REG_SYSCALLNO,	syscallno);</div><div class='add'>+	DEF_PTREG(REG_ORIG_GR8,		orig_gr8);</div><div class='add'>+	DEF_PTREG(REG_GNER0,		gner0);</div><div class='add'>+	DEF_PTREG(REG_GNER1,		gner1);</div><div class='add'>+	DEF_PTREG(REG_IACC0,		iacc0);</div><div class='add'>+	DEF_PTREG(REG_TBR,		tbr);</div><div class='add'>+	DEF_PTREG(REG_GR0,		tbr);</div><div class='add'>+	DEFINE(REG__END,		sizeof(struct pt_regs));</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	DEF_0REG(REG_DCR,		debug.dcr);</div><div class='add'>+	DEF_0REG(REG_IBAR0,		debug.ibar[0]);</div><div class='add'>+	DEF_0REG(REG_DBAR0,		debug.dbar[0]);</div><div class='add'>+	DEF_0REG(REG_DBDR00,		debug.dbdr[0][0]);</div><div class='add'>+	DEF_0REG(REG_DBMR00,		debug.dbmr[0][0]);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	DEF_IREG(__INT_GR0,		i.gr[0]);</div><div class='add'>+	DEF_FREG(__USER_FPMEDIA,	f);</div><div class='add'>+	DEF_FREG(__FPMEDIA_FR0,		f.fr[0]);</div><div class='add'>+	DEF_FREG(__FPMEDIA_FNER0,	f.fner[0]);</div><div class='add'>+	DEF_FREG(__FPMEDIA_MSR0,	f.msr[0]);</div><div class='add'>+	DEF_FREG(__FPMEDIA_ACC0,	f.acc[0]);</div><div class='add'>+	DEF_FREG(__FPMEDIA_ACCG0,	f.accg[0]);</div><div class='add'>+	DEF_FREG(__FPMEDIA_FSR0,	f.fsr[0]);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	DEFINE(NR_PT_REGS,		sizeof(struct pt_regs) / 4);</div><div class='add'>+	DEFINE(NR_USER_INT_REGS,	sizeof(struct user_int_regs) / 4);</div><div class='add'>+	DEFINE(NR_USER_FPMEDIA_REGS,	sizeof(struct user_fpmedia_regs) / 4);</div><div class='add'>+	DEFINE(NR_USER_CONTEXT,		sizeof(struct user_context) / 4);</div><div class='add'>+	DEFINE(FRV_FRAME0_SIZE,		sizeof(struct frv_frame0));</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	/* offsets into thread_struct */</div><div class='add'>+	OFFSET(__THREAD_FRAME,		thread_struct, frame);</div><div class='add'>+	OFFSET(__THREAD_CURR,		thread_struct, curr);</div><div class='add'>+	OFFSET(__THREAD_SP,		thread_struct, sp);</div><div class='add'>+	OFFSET(__THREAD_FP,		thread_struct, fp);</div><div class='add'>+	OFFSET(__THREAD_LR,		thread_struct, lr);</div><div class='add'>+	OFFSET(__THREAD_PC,		thread_struct, pc);</div><div class='add'>+	OFFSET(__THREAD_GR16,		thread_struct, gr[0]);</div><div class='add'>+	OFFSET(__THREAD_SCHED_LR,	thread_struct, sched_lr);</div><div class='add'>+	OFFSET(__THREAD_FRAME0,		thread_struct, frame0);</div><div class='add'>+	OFFSET(__THREAD_USER,		thread_struct, user);</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='add'>+	/* offsets into frv_debug_status */</div><div class='add'>+	OFFSET(DEBUG_BPSR,		frv_debug_status, bpsr);</div><div class='add'>+	OFFSET(DEBUG_DCR,		frv_debug_status, dcr);</div><div class='add'>+	OFFSET(DEBUG_BRR,		frv_debug_status, brr);</div><div class='add'>+	OFFSET(DEBUG_NMAR,		frv_debug_status, nmar);</div><div class='add'>+	BLANK();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/frv/kernel/break.S b/arch/frv/kernel/break.S<br/>index 687c48d62dde..dac4a5f68c2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/break.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/break.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/break.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/break.S</a></div><div class='hunk'>@@ -9,12 +9,11 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/spr-regs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -24,13 +23,11 @@</div><div class='ctx'> #</div><div class='ctx'> 	.section	.bss.stack</div><div class='ctx'> 	.globl		__break_user_context</div><div class='del'>-	.balign		8192</div><div class='add'>+	.balign		THREAD_SIZE</div><div class='ctx'> __break_stack:</div><div class='del'>-	.space		(8192 - (USER_CONTEXT_SIZE + REG__DEBUG_XTRA)) &amp; ~7</div><div class='del'>-__break_stack_tos:</div><div class='del'>-	.space		REG__DEBUG_XTRA</div><div class='del'>-__break_user_context:</div><div class='del'>-	.space		USER_CONTEXT_SIZE</div><div class='add'>+	.space		THREAD_SIZE - FRV_FRAME0_SIZE</div><div class='add'>+__break_frame_0:</div><div class='add'>+	.space		FRV_FRAME0_SIZE</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # miscellaneous variables</div><div class='hunk'>@@ -75,8 +72,8 @@ __entry_break:</div><div class='ctx'> #endif</div><div class='ctx'> 	LEDS		0x1001,gr31</div><div class='ctx'> </div><div class='del'>-	sethi.p		%hi(__break_user_context),gr31</div><div class='del'>-	setlo		%lo(__break_user_context),gr31</div><div class='add'>+	sethi.p		%hi(__break_frame_0),gr31</div><div class='add'>+	setlo		%lo(__break_frame_0),gr31</div><div class='ctx'> </div><div class='ctx'> 	stdi		gr2,@(gr31,#REG_GR(2))</div><div class='ctx'> 	movsg		ccr,gr3</div><div class='hunk'>@@ -586,8 +583,8 @@ __break_continue:</div><div class='ctx'> 	# set up the kernel stack pointer</div><div class='ctx'> 	sti		sp,@(gr31,#REG_SP)</div><div class='ctx'> </div><div class='del'>-	sethi.p		%hi(__break_stack_tos),sp</div><div class='del'>-	setlo		%lo(__break_stack_tos),sp</div><div class='add'>+	sethi.p		%hi(__break_frame_0),sp</div><div class='add'>+	setlo		%lo(__break_frame_0),sp</div><div class='ctx'> </div><div class='ctx'> 	# finish building the exception frame</div><div class='ctx'> 	stdi		gr4 ,@(gr31,#REG_GR(4))</div><div class='hunk'>@@ -652,9 +649,12 @@ __break_continue:</div><div class='ctx'> 	movsg		nmar,gr5</div><div class='ctx'> 	movsg		dcr,gr6</div><div class='ctx'> </div><div class='del'>-	stdi		gr4 ,@(gr31,#REG_BRR)</div><div class='del'>-	sti		gr19,@(gr31,#REG_BPSR)</div><div class='del'>-	sti.p		gr6 ,@(gr31,#REG_DCR)</div><div class='add'>+	sethi.p		%hi(__debug_status),gr7</div><div class='add'>+	setlo		%lo(__debug_status),gr7</div><div class='add'>+</div><div class='add'>+	stdi		gr4 ,@(gr7,#DEBUG_BRR)</div><div class='add'>+	sti		gr19,@(gr7,#DEBUG_BPSR)</div><div class='add'>+	sti.p		gr6 ,@(gr7,#DEBUG_DCR)</div><div class='ctx'> </div><div class='ctx'> 	# trap exceptions during break handling and disable h/w breakpoints/watchpoints</div><div class='ctx'> 	sethi		%hi(DCR_EBE),gr5</div><div class='hunk'>@@ -699,7 +699,10 @@ __break_continue:</div><div class='ctx'> 	lddi		@(gr31,#REG_PSR) ,gr22</div><div class='ctx'> 	ldi		@(gr31,#REG_PC)  ,gr21</div><div class='ctx'> 	ldi		@(gr31,#REG_TBR) ,gr20</div><div class='del'>-	ldi.p		@(gr31,#REG_DCR) ,gr6</div><div class='add'>+</div><div class='add'>+	sethi.p		%hi(__debug_status),gr6</div><div class='add'>+	setlo		%lo(__debug_status),gr6</div><div class='add'>+	ldi.p		@(gr6,#DEBUG_DCR) ,gr6</div><div class='ctx'> </div><div class='ctx'> 	andi		gr22,#PSR_S,gr19		/* rebuild BPSR */</div><div class='ctx'> 	andi.p		gr22,#PSR_ET,gr5</div><div class='head'>diff --git a/arch/frv/kernel/cmode.S b/arch/frv/kernel/cmode.S<br/>index 6591e6a37ae9..81ba28ad2207 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/cmode.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/cmode.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/cmode.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/cmode.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/debug-stub.c b/arch/frv/kernel/debug-stub.c<br/>index 4761cc4b4a90..2f6c60c921e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/debug-stub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/debug-stub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/debug-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/debug-stub.c</a></div><div class='hunk'>@@ -39,10 +39,9 @@ do {						\</div><div class='ctx'> 	gdbstub_do_rx();			\</div><div class='ctx'> } while(!FLOWCTL_QUERY(LINE))</div><div class='ctx'> </div><div class='del'>-static void __init debug_stub_init(void);</div><div class='add'>+struct frv_debug_status __debug_status;</div><div class='ctx'> </div><div class='del'>-extern asmlinkage void __break_hijack_kernel_event(void);</div><div class='del'>-extern asmlinkage void __break_hijack_kernel_event_breaks_here(void);</div><div class='add'>+static void __init debug_stub_init(void);</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='hunk'>@@ -67,7 +66,7 @@ asmlinkage void debug_stub(void)</div><div class='ctx'> 		__set_HSR(0, hsr0 &amp; ~HSR0_ETMD);</div><div class='ctx'> </div><div class='ctx'> 	/* disable single stepping */</div><div class='del'>-	__debug_regs-&gt;dcr &amp;= ~DCR_SE;</div><div class='add'>+	__debug_status.dcr &amp;= ~DCR_SE;</div><div class='ctx'> </div><div class='ctx'> 	/* kernel mode can propose an exception be handled in debug mode by jumping to a special</div><div class='ctx'> 	 * location */</div><div class='hunk'>@@ -76,8 +75,8 @@ asmlinkage void debug_stub(void)</div><div class='ctx'> 		 * the top kernel context */</div><div class='ctx'> 		*__debug_frame = *__frame;</div><div class='ctx'> 		__frame = __debug_frame-&gt;next_frame;</div><div class='del'>-		__debug_regs-&gt;brr = (__debug_frame-&gt;tbr &amp; TBR_TT) &lt;&lt; 12;</div><div class='del'>-		__debug_regs-&gt;brr |= BRR_EB;</div><div class='add'>+		__debug_status.brr = (__debug_frame-&gt;tbr &amp; TBR_TT) &lt;&lt; 12;</div><div class='add'>+		__debug_status.brr |= BRR_EB;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (__debug_frame-&gt;pc == (unsigned long) __debug_bug_trap + 4) {</div><div class='hunk'>@@ -124,7 +123,7 @@ static void __init debug_stub_init(void)</div><div class='ctx'> 		__debug_frame-&gt;pc = (unsigned long) start_kernel;</div><div class='ctx'> </div><div class='ctx'> 	/* enable the debug events we want to trap */</div><div class='del'>-	__debug_regs-&gt;dcr = DCR_EBE;</div><div class='add'>+	__debug_status.dcr = DCR_EBE;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_GDBSTUB</div><div class='ctx'> 	gdbstub_init();</div><div class='head'>diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S<br/>index 81568acea9cd..d3b9253d862a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/entry-table.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/entry-table.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/entry-table.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/entry-table.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/spr-regs.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S<br/>index a9b59527a741..940ac306e9a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/entry.S</a></div><div class='hunk'>@@ -27,8 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -1474,7 +1472,7 @@ sys_call_table:</div><div class='ctx'> 	.long sys_mknodat</div><div class='ctx'> 	.long sys_fchownat</div><div class='ctx'> 	.long sys_futimesat</div><div class='del'>-	.long sys_newfstatat		/* 300 */</div><div class='add'>+	.long sys_fstatat64		/* 300 */</div><div class='ctx'> 	.long sys_unlinkat</div><div class='ctx'> 	.long sys_renameat</div><div class='ctx'> 	.long sys_linkat</div><div class='head'>diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c<br/>index 0f273a7aca5a..f772704b3d28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/frv_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/frv_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/frv_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/frv_ksyms.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='hunk'>@@ -26,16 +25,6 @@ extern long __memset_user(void *dst, const void *src, size_t count);</div><div class='ctx'> EXPORT_SYMBOL(__ioremap);</div><div class='ctx'> EXPORT_SYMBOL(iounmap);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(strnlen);</div><div class='del'>-EXPORT_SYMBOL(strrchr);</div><div class='del'>-EXPORT_SYMBOL(strstr);</div><div class='del'>-EXPORT_SYMBOL(strchr);</div><div class='del'>-EXPORT_SYMBOL(strcat);</div><div class='del'>-EXPORT_SYMBOL(strlen);</div><div class='del'>-EXPORT_SYMBOL(strcmp);</div><div class='del'>-EXPORT_SYMBOL(strncmp);</div><div class='del'>-EXPORT_SYMBOL(strncpy);</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(ip_fast_csum);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -44,8 +33,6 @@ EXPORT_SYMBOL(local_bh_count);</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(kernel_thread);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(enable_irq);</div><div class='del'>-EXPORT_SYMBOL(disable_irq);</div><div class='ctx'> EXPORT_SYMBOL(__res_bus_clock_speed_HZ);</div><div class='ctx'> EXPORT_SYMBOL(__page_offset);</div><div class='ctx'> EXPORT_SYMBOL(__memcpy_user);</div><div class='hunk'>@@ -62,18 +49,12 @@ EXPORT_SYMBOL(memory_end);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__debug_bug_trap);</div><div class='ctx'> </div><div class='del'>-/* Networking helper routines. */</div><div class='del'>-EXPORT_SYMBOL(csum_partial_copy);</div><div class='del'>-</div><div class='ctx'> /* The following are special because they're not called</div><div class='ctx'>    explicitly (the C compiler generates them).  Fortunately,</div><div class='ctx'>    their interface isn't gonna change any time soon now, so</div><div class='ctx'>    it's OK to leave it out of version control.  */</div><div class='ctx'> EXPORT_SYMBOL(memcpy);</div><div class='ctx'> EXPORT_SYMBOL(memset);</div><div class='del'>-EXPORT_SYMBOL(memcmp);</div><div class='del'>-EXPORT_SYMBOL(memscan);</div><div class='del'>-EXPORT_SYMBOL(memmove);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__outsl_ns);</div><div class='ctx'> EXPORT_SYMBOL(__insl_ns);</div><div class='head'>diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c<br/>index 508601fad079..9550f37fb62c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/gdb-stub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/gdb-stub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/gdb-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/gdb-stub.c</a></div><div class='hunk'>@@ -124,6 +124,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/gdb-stub.h&gt;</div><div class='hunk'>@@ -136,7 +137,6 @@ extern void debug_to_serial(const char *p, int n);</div><div class='ctx'> extern void gdbstub_console_write(struct console *co, const char *p, unsigned n);</div><div class='ctx'> </div><div class='ctx'> extern volatile uint32_t __break_error_detect[3]; /* ESFR1, ESR15, EAR15 */</div><div class='del'>-extern struct user_context __break_user_context;</div><div class='ctx'> </div><div class='ctx'> struct __debug_amr {</div><div class='ctx'> 	unsigned long L, P;</div><div class='hunk'>@@ -926,6 +926,7 @@ static int gdbstub_set_breakpoint(unsigned long type, unsigned long addr, unsign</div><div class='ctx'> 		if (!(__debug_regs-&gt;dcr &amp; DCR_IBE0)) {</div><div class='ctx'> 			//gdbstub_printk("set h/w break 0: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr |= DCR_IBE0;</div><div class='add'>+			__debug_regs-&gt;ibar[0] = addr;</div><div class='ctx'> 			asm volatile("movgs %0,ibar0" : : "r"(addr));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -933,6 +934,7 @@ static int gdbstub_set_breakpoint(unsigned long type, unsigned long addr, unsign</div><div class='ctx'> 		if (!(__debug_regs-&gt;dcr &amp; DCR_IBE1)) {</div><div class='ctx'> 			//gdbstub_printk("set h/w break 1: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr |= DCR_IBE1;</div><div class='add'>+			__debug_regs-&gt;ibar[1] = addr;</div><div class='ctx'> 			asm volatile("movgs %0,ibar1" : : "r"(addr));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -940,6 +942,7 @@ static int gdbstub_set_breakpoint(unsigned long type, unsigned long addr, unsign</div><div class='ctx'> 		if (!(__debug_regs-&gt;dcr &amp; DCR_IBE2)) {</div><div class='ctx'> 			//gdbstub_printk("set h/w break 2: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr |= DCR_IBE2;</div><div class='add'>+			__debug_regs-&gt;ibar[2] = addr;</div><div class='ctx'> 			asm volatile("movgs %0,ibar2" : : "r"(addr));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -947,6 +950,7 @@ static int gdbstub_set_breakpoint(unsigned long type, unsigned long addr, unsign</div><div class='ctx'> 		if (!(__debug_regs-&gt;dcr &amp; DCR_IBE3)) {</div><div class='ctx'> 			//gdbstub_printk("set h/w break 3: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr |= DCR_IBE3;</div><div class='add'>+			__debug_regs-&gt;ibar[3] = addr;</div><div class='ctx'> 			asm volatile("movgs %0,ibar3" : : "r"(addr));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -971,7 +975,14 @@ static int gdbstub_set_breakpoint(unsigned long type, unsigned long addr, unsign</div><div class='ctx'> 		if (!(__debug_regs-&gt;dcr &amp; (DCR_DRBE0|DCR_DWBE0))) {</div><div class='ctx'> 			//gdbstub_printk("set h/w watchpoint 0 type %ld: %08lx\n", type, addr);</div><div class='ctx'> 			tmp = type==2 ? DCR_DWBE0 : type==3 ? DCR_DRBE0 : DCR_DRBE0|DCR_DWBE0;</div><div class='add'>+</div><div class='ctx'> 			__debug_regs-&gt;dcr |= tmp;</div><div class='add'>+			__debug_regs-&gt;dbar[0] = addr;</div><div class='add'>+			__debug_regs-&gt;dbmr[0][0] = dbmr.mask0;</div><div class='add'>+			__debug_regs-&gt;dbmr[0][1] = dbmr.mask1;</div><div class='add'>+			__debug_regs-&gt;dbdr[0][0] = 0;</div><div class='add'>+			__debug_regs-&gt;dbdr[0][1] = 0;</div><div class='add'>+</div><div class='ctx'> 			asm volatile("	movgs	%0,dbar0	\n"</div><div class='ctx'> 				     "	movgs	%1,dbmr00	\n"</div><div class='ctx'> 				     "	movgs	%2,dbmr01	\n"</div><div class='hunk'>@@ -984,7 +995,14 @@ static int gdbstub_set_breakpoint(unsigned long type, unsigned long addr, unsign</div><div class='ctx'> 		if (!(__debug_regs-&gt;dcr &amp; (DCR_DRBE1|DCR_DWBE1))) {</div><div class='ctx'> 			//gdbstub_printk("set h/w watchpoint 1 type %ld: %08lx\n", type, addr);</div><div class='ctx'> 			tmp = type==2 ? DCR_DWBE1 : type==3 ? DCR_DRBE1 : DCR_DRBE1|DCR_DWBE1;</div><div class='add'>+</div><div class='ctx'> 			__debug_regs-&gt;dcr |= tmp;</div><div class='add'>+			__debug_regs-&gt;dbar[1] = addr;</div><div class='add'>+			__debug_regs-&gt;dbmr[1][0] = dbmr.mask0;</div><div class='add'>+			__debug_regs-&gt;dbmr[1][1] = dbmr.mask1;</div><div class='add'>+			__debug_regs-&gt;dbdr[1][0] = 0;</div><div class='add'>+			__debug_regs-&gt;dbdr[1][1] = 0;</div><div class='add'>+</div><div class='ctx'> 			asm volatile("	movgs	%0,dbar1	\n"</div><div class='ctx'> 				     "	movgs	%1,dbmr10	\n"</div><div class='ctx'> 				     "	movgs	%2,dbmr11	\n"</div><div class='hunk'>@@ -1047,6 +1065,7 @@ int gdbstub_clear_breakpoint(unsigned long type, unsigned long addr, unsigned lo</div><div class='ctx'> 		if (__debug_regs-&gt;dcr &amp; DCR_IBE0 &amp;&amp; __get_ibar(0) == addr) {</div><div class='ctx'> 			//gdbstub_printk("clear h/w break 0: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr &amp;= ~DCR_IBE0;</div><div class='add'>+			__debug_regs-&gt;ibar[0] = 0;</div><div class='ctx'> 			asm volatile("movgs gr0,ibar0");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1054,6 +1073,7 @@ int gdbstub_clear_breakpoint(unsigned long type, unsigned long addr, unsigned lo</div><div class='ctx'> 		if (__debug_regs-&gt;dcr &amp; DCR_IBE1 &amp;&amp; __get_ibar(1) == addr) {</div><div class='ctx'> 			//gdbstub_printk("clear h/w break 1: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr &amp;= ~DCR_IBE1;</div><div class='add'>+			__debug_regs-&gt;ibar[1] = 0;</div><div class='ctx'> 			asm volatile("movgs gr0,ibar1");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1061,6 +1081,7 @@ int gdbstub_clear_breakpoint(unsigned long type, unsigned long addr, unsigned lo</div><div class='ctx'> 		if (__debug_regs-&gt;dcr &amp; DCR_IBE2 &amp;&amp; __get_ibar(2) == addr) {</div><div class='ctx'> 			//gdbstub_printk("clear h/w break 2: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr &amp;= ~DCR_IBE2;</div><div class='add'>+			__debug_regs-&gt;ibar[2] = 0;</div><div class='ctx'> 			asm volatile("movgs gr0,ibar2");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1068,6 +1089,7 @@ int gdbstub_clear_breakpoint(unsigned long type, unsigned long addr, unsigned lo</div><div class='ctx'> 		if (__debug_regs-&gt;dcr &amp; DCR_IBE3 &amp;&amp; __get_ibar(3) == addr) {</div><div class='ctx'> 			//gdbstub_printk("clear h/w break 3: %08lx\n", addr);</div><div class='ctx'> 			__debug_regs-&gt;dcr &amp;= ~DCR_IBE3;</div><div class='add'>+			__debug_regs-&gt;ibar[3] = 0;</div><div class='ctx'> 			asm volatile("movgs gr0,ibar3");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1104,6 +1126,12 @@ int gdbstub_clear_breakpoint(unsigned long type, unsigned long addr, unsigned lo</div><div class='ctx'> </div><div class='ctx'> 		//gdbstub_printk("clear h/w watchpoint 0 type %ld: %08lx\n", type, addr);</div><div class='ctx'> 		__debug_regs-&gt;dcr &amp;= ~(DCR_DRBE0|DCR_DWBE0);</div><div class='add'>+		__debug_regs-&gt;dbar[0] = 0;</div><div class='add'>+		__debug_regs-&gt;dbmr[0][0] = 0;</div><div class='add'>+		__debug_regs-&gt;dbmr[0][1] = 0;</div><div class='add'>+		__debug_regs-&gt;dbdr[0][0] = 0;</div><div class='add'>+		__debug_regs-&gt;dbdr[0][1] = 0;</div><div class='add'>+</div><div class='ctx'> 		asm volatile("	movgs	gr0,dbar0	\n"</div><div class='ctx'> 			     "	movgs	gr0,dbmr00	\n"</div><div class='ctx'> 			     "	movgs	gr0,dbmr01	\n"</div><div class='hunk'>@@ -1123,6 +1151,12 @@ int gdbstub_clear_breakpoint(unsigned long type, unsigned long addr, unsigned lo</div><div class='ctx'> </div><div class='ctx'> 		//gdbstub_printk("clear h/w watchpoint 1 type %ld: %08lx\n", type, addr);</div><div class='ctx'> 		__debug_regs-&gt;dcr &amp;= ~(DCR_DRBE1|DCR_DWBE1);</div><div class='add'>+		__debug_regs-&gt;dbar[1] = 0;</div><div class='add'>+		__debug_regs-&gt;dbmr[1][0] = 0;</div><div class='add'>+		__debug_regs-&gt;dbmr[1][1] = 0;</div><div class='add'>+		__debug_regs-&gt;dbdr[1][0] = 0;</div><div class='add'>+		__debug_regs-&gt;dbdr[1][1] = 0;</div><div class='add'>+</div><div class='ctx'> 		asm volatile("	movgs	gr0,dbar1	\n"</div><div class='ctx'> 			     "	movgs	gr0,dbmr10	\n"</div><div class='ctx'> 			     "	movgs	gr0,dbmr11	\n"</div><div class='hunk'>@@ -1163,7 +1197,7 @@ static void gdbstub_check_breakpoint(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __attribute__((unused)) gdbstub_show_regs(void)</div><div class='ctx'> {</div><div class='del'>-	uint32_t *reg;</div><div class='add'>+	unsigned long *reg;</div><div class='ctx'> 	int loop;</div><div class='ctx'> </div><div class='ctx'> 	gdbstub_printk("\n");</div><div class='hunk'>@@ -1172,11 +1206,11 @@ static void __attribute__((unused)) gdbstub_show_regs(void)</div><div class='ctx'> 		       __debug_frame,</div><div class='ctx'> 		       __debug_frame-&gt;psr &amp; PSR_S ? "kernel" : "user");</div><div class='ctx'> </div><div class='del'>-	reg = (uint32_t *) __debug_frame;</div><div class='del'>-	for (loop = 0; loop &lt; REG__END; loop++) {</div><div class='del'>-		printk("%s %08x", regnames[loop + 0], reg[loop + 0]);</div><div class='add'>+	reg = (unsigned long *) __debug_frame;</div><div class='add'>+	for (loop = 0; loop &lt; NR_PT_REGS; loop++) {</div><div class='add'>+		printk("%s %08lx", regnames[loop + 0], reg[loop + 0]);</div><div class='ctx'> </div><div class='del'>-		if (loop == REG__END - 1 || loop % 5 == 4)</div><div class='add'>+		if (loop == NR_PT_REGS - 1 || loop % 5 == 4)</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			printk(" | ");</div><div class='hunk'>@@ -1191,13 +1225,8 @@ static void __attribute__((unused)) gdbstub_show_regs(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __attribute__((unused)) gdbstub_dump_debugregs(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long x;</div><div class='del'>-</div><div class='del'>-	x = __debug_regs-&gt;dcr;</div><div class='del'>-	gdbstub_printk("DCR    %08lx  ", x);</div><div class='del'>-</div><div class='del'>-	x = __debug_regs-&gt;brr;</div><div class='del'>-	gdbstub_printk("BRR %08lx\n", x);</div><div class='add'>+	gdbstub_printk("DCR    %08lx  ", __debug_status.dcr);</div><div class='add'>+	gdbstub_printk("BRR    %08lx\n", __debug_status.brr);</div><div class='ctx'> </div><div class='ctx'> 	gdbstub_printk("IBAR0  %08lx  ", __get_ibar(0));</div><div class='ctx'> 	gdbstub_printk("IBAR1  %08lx  ", __get_ibar(1));</div><div class='hunk'>@@ -1360,7 +1389,7 @@ void gdbstub(int sigval)</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	save_user_regs(&amp;__break_user_context);</div><div class='add'>+	save_user_regs(&amp;__debug_frame0-&gt;uc);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	gdbstub_printk("--&gt; gdbstub() %08x %p %08x %08x\n",</div><div class='hunk'>@@ -1389,8 +1418,8 @@ void gdbstub(int sigval)</div><div class='ctx'> 		__debug_frame-&gt;psr &amp;= ~PSR_S;</div><div class='ctx'> 		if (__debug_frame-&gt;psr &amp; PSR_PS)</div><div class='ctx'> 			__debug_frame-&gt;psr |= PSR_S;</div><div class='del'>-		__debug_regs-&gt;brr = (__debug_frame-&gt;tbr &amp; TBR_TT) &lt;&lt; 12;</div><div class='del'>-		__debug_regs-&gt;brr |= BRR_EB;</div><div class='add'>+		__debug_status.brr = (__debug_frame-&gt;tbr &amp; TBR_TT) &lt;&lt; 12;</div><div class='add'>+		__debug_status.brr |= BRR_EB;</div><div class='ctx'> 		sigval = SIGINT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1404,15 +1433,15 @@ void gdbstub(int sigval)</div><div class='ctx'> 		__debug_frame-&gt;psr &amp;= ~PSR_S;</div><div class='ctx'> 		if (__debug_frame-&gt;psr &amp; PSR_PS)</div><div class='ctx'> 			__debug_frame-&gt;psr |= PSR_S;</div><div class='del'>-		__debug_regs-&gt;brr = (__debug_frame-&gt;tbr &amp; TBR_TT) &lt;&lt; 12;</div><div class='del'>-		__debug_regs-&gt;brr |= BRR_EB;</div><div class='add'>+		__debug_status.brr = (__debug_frame-&gt;tbr &amp; TBR_TT) &lt;&lt; 12;</div><div class='add'>+		__debug_status.brr |= BRR_EB;</div><div class='ctx'> 		sigval = SIGXCPU;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	LEDS(0x5002);</div><div class='ctx'> </div><div class='ctx'> 	/* after a BREAK insn, the PC lands on the far side of it */</div><div class='del'>-	if (__debug_regs-&gt;brr &amp; BRR_SB)</div><div class='add'>+	if (__debug_status.brr &amp; BRR_SB)</div><div class='ctx'> 		gdbstub_check_breakpoint();</div><div class='ctx'> </div><div class='ctx'> 	LEDS(0x5003);</div><div class='hunk'>@@ -1431,7 +1460,7 @@ void gdbstub(int sigval)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sigval)</div><div class='del'>-		sigval = gdbstub_compute_signal(__debug_regs-&gt;brr);</div><div class='add'>+		sigval = gdbstub_compute_signal(__debug_status.brr);</div><div class='ctx'> </div><div class='ctx'> 	LEDS(0x5004);</div><div class='ctx'> </div><div class='hunk'>@@ -1441,7 +1470,7 @@ void gdbstub(int sigval)</div><div class='ctx'> 	if (sigval != SIGINT &amp;&amp; sigval != SIGTRAP &amp;&amp; sigval != SIGILL) {</div><div class='ctx'> 		static const char title[] = "Break ";</div><div class='ctx'> 		static const char crlf[] = "\r\n";</div><div class='del'>-		unsigned long brr = __debug_regs-&gt;brr;</div><div class='add'>+		unsigned long brr = __debug_status.brr;</div><div class='ctx'> 		char hx;</div><div class='ctx'> </div><div class='ctx'> 		ptr = output_buffer;</div><div class='hunk'>@@ -1565,28 +1594,24 @@ void gdbstub(int sigval)</div><div class='ctx'> 			ptr = mem2hex(&amp;zero, ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 1; loop &lt;= 27; loop++)</div><div class='del'>-				ptr = mem2hex((unsigned long *)__debug_frame + REG_GR(loop),</div><div class='del'>-					      ptr, 4, 0);</div><div class='add'>+				ptr = mem2hex(&amp;__debug_user_context-&gt;i.gr[loop], ptr, 4, 0);</div><div class='ctx'> 			temp = (unsigned long) __frame;</div><div class='ctx'> 			ptr = mem2hex(&amp;temp, ptr, 4, 0);</div><div class='del'>-			ptr = mem2hex((unsigned long *)__debug_frame + REG_GR(29), ptr, 4, 0);</div><div class='del'>-			ptr = mem2hex((unsigned long *)__debug_frame + REG_GR(30), ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;i.gr[29], ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;i.gr[30], ptr, 4, 0);</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-			ptr = mem2hex((unsigned long *)__debug_frame + REG_GR(31), ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;i.gr[31], ptr, 4, 0);</div><div class='ctx'> #else</div><div class='ctx'> 			temp = (unsigned long) __debug_frame;</div><div class='ctx'> 			ptr = mem2hex(&amp;temp, ptr, 4, 0);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 32; loop &lt;= 63; loop++)</div><div class='del'>-				ptr = mem2hex((unsigned long *)__debug_frame + REG_GR(loop),</div><div class='del'>-					      ptr, 4, 0);</div><div class='add'>+				ptr = mem2hex(&amp;__debug_user_context-&gt;i.gr[loop], ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			/* deal with FR0-FR63 */</div><div class='ctx'> 			for (loop = 0; loop &lt;= 63; loop++)</div><div class='del'>-				ptr = mem2hex((unsigned long *)&amp;__break_user_context +</div><div class='del'>-					      __FPMEDIA_FR(loop),</div><div class='del'>-					      ptr, 4, 0);</div><div class='add'>+				ptr = mem2hex(&amp;__debug_user_context-&gt;f.fr[loop], ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			/* deal with special registers */</div><div class='ctx'> 			ptr = mem2hex(&amp;__debug_frame-&gt;pc,    ptr, 4, 0);</div><div class='hunk'>@@ -1597,7 +1622,7 @@ void gdbstub(int sigval)</div><div class='ctx'> 			ptr = mem2hex(&amp;zero, ptr, 4, 0);</div><div class='ctx'> 			ptr = mem2hex(&amp;zero, ptr, 4, 0);</div><div class='ctx'> 			ptr = mem2hex(&amp;__debug_frame-&gt;tbr,   ptr, 4, 0);</div><div class='del'>-			ptr = mem2hex(&amp;__debug_regs-&gt;brr ,   ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_status.brr ,   ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			asm volatile("movsg dbar0,%0" : "=r"(dbar));</div><div class='ctx'> 			ptr = mem2hex(&amp;dbar, ptr, 4, 0);</div><div class='hunk'>@@ -1622,21 +1647,21 @@ void gdbstub(int sigval)</div><div class='ctx'> </div><div class='ctx'> 			ptr = mem2hex(&amp;__debug_frame-&gt;iacc0, ptr, 8, 0);</div><div class='ctx'> </div><div class='del'>-			ptr = mem2hex(&amp;__break_user_context.f.fsr[0], ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;f.fsr[0], ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 0; loop &lt;= 7; loop++)</div><div class='del'>-				ptr = mem2hex(&amp;__break_user_context.f.acc[loop], ptr, 4, 0);</div><div class='add'>+				ptr = mem2hex(&amp;__debug_user_context-&gt;f.acc[loop], ptr, 4, 0);</div><div class='ctx'> </div><div class='del'>-			ptr = mem2hex(&amp;__break_user_context.f.accg, ptr, 8, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;f.accg, ptr, 8, 0);</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 0; loop &lt;= 1; loop++)</div><div class='del'>-				ptr = mem2hex(&amp;__break_user_context.f.msr[loop], ptr, 4, 0);</div><div class='add'>+				ptr = mem2hex(&amp;__debug_user_context-&gt;f.msr[loop], ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			ptr = mem2hex(&amp;__debug_frame-&gt;gner0, ptr, 4, 0);</div><div class='ctx'> 			ptr = mem2hex(&amp;__debug_frame-&gt;gner1, ptr, 4, 0);</div><div class='ctx'> </div><div class='del'>-			ptr = mem2hex(&amp;__break_user_context.f.fner[0], ptr, 4, 0);</div><div class='del'>-			ptr = mem2hex(&amp;__break_user_context.f.fner[1], ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;f.fner[0], ptr, 4, 0);</div><div class='add'>+			ptr = mem2hex(&amp;__debug_user_context-&gt;f.fner[1], ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1648,8 +1673,7 @@ void gdbstub(int sigval)</div><div class='ctx'> 			ptr = hex2mem(ptr, &amp;temp, 4);</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 1; loop &lt;= 27; loop++)</div><div class='del'>-				ptr = hex2mem(ptr, (unsigned long *)__debug_frame + REG_GR(loop),</div><div class='del'>-					      4);</div><div class='add'>+				ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;i.gr[loop], 4);</div><div class='ctx'> </div><div class='ctx'> 			ptr = hex2mem(ptr, &amp;temp, 4);</div><div class='ctx'> 			__frame = (struct pt_regs *) temp;</div><div class='hunk'>@@ -1662,14 +1686,11 @@ void gdbstub(int sigval)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 32; loop &lt;= 63; loop++)</div><div class='del'>-				ptr = hex2mem(ptr, (unsigned long *)__debug_frame + REG_GR(loop),</div><div class='del'>-					      4);</div><div class='add'>+				ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;i.gr[loop], 4);</div><div class='ctx'> </div><div class='ctx'> 			/* deal with FR0-FR63 */</div><div class='ctx'> 			for (loop = 0; loop &lt;= 63; loop++)</div><div class='del'>-				ptr = mem2hex((unsigned long *)&amp;__break_user_context +</div><div class='del'>-					      __FPMEDIA_FR(loop),</div><div class='del'>-					      ptr, 4, 0);</div><div class='add'>+				ptr = mem2hex(&amp;__debug_user_context-&gt;f.fr[loop], ptr, 4, 0);</div><div class='ctx'> </div><div class='ctx'> 			/* deal with special registers */</div><div class='ctx'> 			ptr = hex2mem(ptr, &amp;__debug_frame-&gt;pc,  4);</div><div class='hunk'>@@ -1694,21 +1715,21 @@ void gdbstub(int sigval)</div><div class='ctx'> </div><div class='ctx'> 			ptr = hex2mem(ptr, &amp;__debug_frame-&gt;iacc0, 8);</div><div class='ctx'> </div><div class='del'>-			ptr = hex2mem(ptr, &amp;__break_user_context.f.fsr[0], 4);</div><div class='add'>+			ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;f.fsr[0], 4);</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 0; loop &lt;= 7; loop++)</div><div class='del'>-				ptr = hex2mem(ptr, &amp;__break_user_context.f.acc[loop], 4);</div><div class='add'>+				ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;f.acc[loop], 4);</div><div class='ctx'> </div><div class='del'>-			ptr = hex2mem(ptr, &amp;__break_user_context.f.accg, 8);</div><div class='add'>+			ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;f.accg, 8);</div><div class='ctx'> </div><div class='ctx'> 			for (loop = 0; loop &lt;= 1; loop++)</div><div class='del'>-				ptr = hex2mem(ptr, &amp;__break_user_context.f.msr[loop], 4);</div><div class='add'>+				ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;f.msr[loop], 4);</div><div class='ctx'> </div><div class='ctx'> 			ptr = hex2mem(ptr, &amp;__debug_frame-&gt;gner0, 4);</div><div class='ctx'> 			ptr = hex2mem(ptr, &amp;__debug_frame-&gt;gner1, 4);</div><div class='ctx'> </div><div class='del'>-			ptr = hex2mem(ptr, &amp;__break_user_context.f.fner[0], 4);</div><div class='del'>-			ptr = hex2mem(ptr, &amp;__break_user_context.f.fner[1], 4);</div><div class='add'>+			ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;f.fner[0], 4);</div><div class='add'>+			ptr = hex2mem(ptr, &amp;__debug_user_context-&gt;f.fner[1], 4);</div><div class='ctx'> </div><div class='ctx'> 			gdbstub_strcpy(output_buffer,"OK");</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1769,52 +1790,52 @@ void gdbstub(int sigval)</div><div class='ctx'> 			case GDB_REG_GR(0):</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_GR(1) ... GDB_REG_GR(63):</div><div class='del'>-				__break_user_context.i.gr[addr - GDB_REG_GR(0)] = temp;</div><div class='add'>+				__debug_user_context-&gt;i.gr[addr - GDB_REG_GR(0)] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_FR(0) ... GDB_REG_FR(63):</div><div class='del'>-				__break_user_context.f.fr[addr - GDB_REG_FR(0)] = temp;</div><div class='add'>+				__debug_user_context-&gt;f.fr[addr - GDB_REG_FR(0)] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_PC:</div><div class='del'>-				__break_user_context.i.pc = temp;</div><div class='add'>+				__debug_user_context-&gt;i.pc = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_PSR:</div><div class='del'>-				__break_user_context.i.psr = temp;</div><div class='add'>+				__debug_user_context-&gt;i.psr = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_CCR:</div><div class='del'>-				__break_user_context.i.ccr = temp;</div><div class='add'>+				__debug_user_context-&gt;i.ccr = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_CCCR:</div><div class='del'>-				__break_user_context.i.cccr = temp;</div><div class='add'>+				__debug_user_context-&gt;i.cccr = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_BRR:</div><div class='del'>-				__debug_regs-&gt;brr = temp;</div><div class='add'>+				__debug_status.brr = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_LR:</div><div class='del'>-				__break_user_context.i.lr = temp;</div><div class='add'>+				__debug_user_context-&gt;i.lr = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_LCR:</div><div class='del'>-				__break_user_context.i.lcr = temp;</div><div class='add'>+				__debug_user_context-&gt;i.lcr = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_FSR0:</div><div class='del'>-				__break_user_context.f.fsr[0] = temp;</div><div class='add'>+				__debug_user_context-&gt;f.fsr[0] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_ACC(0) ... GDB_REG_ACC(7):</div><div class='del'>-				__break_user_context.f.acc[addr - GDB_REG_ACC(0)] = temp;</div><div class='add'>+				__debug_user_context-&gt;f.acc[addr - GDB_REG_ACC(0)] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_ACCG(0):</div><div class='del'>-				*(uint32_t *) &amp;__break_user_context.f.accg[0] = temp;</div><div class='add'>+				*(uint32_t *) &amp;__debug_user_context-&gt;f.accg[0] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_ACCG(4):</div><div class='del'>-				*(uint32_t *) &amp;__break_user_context.f.accg[4] = temp;</div><div class='add'>+				*(uint32_t *) &amp;__debug_user_context-&gt;f.accg[4] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_MSR(0) ... GDB_REG_MSR(1):</div><div class='del'>-				__break_user_context.f.msr[addr - GDB_REG_MSR(0)] = temp;</div><div class='add'>+				__debug_user_context-&gt;f.msr[addr - GDB_REG_MSR(0)] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_GNER(0) ... GDB_REG_GNER(1):</div><div class='del'>-				__break_user_context.i.gner[addr - GDB_REG_GNER(0)] = temp;</div><div class='add'>+				__debug_user_context-&gt;i.gner[addr - GDB_REG_GNER(0)] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case GDB_REG_FNER(0) ... GDB_REG_FNER(1):</div><div class='del'>-				__break_user_context.f.fner[addr - GDB_REG_FNER(0)] = temp;</div><div class='add'>+				__debug_user_context-&gt;f.fner[addr - GDB_REG_FNER(0)] = temp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='ctx'> 				temp2 = 0;</div><div class='hunk'>@@ -1850,6 +1871,7 @@ void gdbstub(int sigval)</div><div class='ctx'> 			/* step to next instruction */</div><div class='ctx'> 		case 's':</div><div class='ctx'> 			__debug_regs-&gt;dcr |= DCR_SE;</div><div class='add'>+			__debug_status.dcr |= DCR_SE;</div><div class='ctx'> 			goto done;</div><div class='ctx'> </div><div class='ctx'> 			/* set baud rate (bBB) */</div><div class='hunk'>@@ -1934,7 +1956,7 @@ void gdbstub(int sigval)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  done:</div><div class='del'>-	restore_user_regs(&amp;__break_user_context);</div><div class='add'>+	restore_user_regs(&amp;__debug_frame0-&gt;uc);</div><div class='ctx'> </div><div class='ctx'> 	//gdbstub_dump_debugregs();</div><div class='ctx'> 	//gdbstub_printk("&lt;-- gdbstub() %08x\n", __debug_frame-&gt;pc);</div><div class='hunk'>@@ -1966,7 +1988,6 @@ void __init gdbstub_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	gdbstub_printk("%s", gdbstub_banner);</div><div class='del'>-	gdbstub_printk("DCR: %x\n", __debug_regs-&gt;dcr);</div><div class='ctx'> </div><div class='ctx'> 	gdbstub_io_init();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/head-mmu-fr451.S b/arch/frv/kernel/head-mmu-fr451.S<br/>index a143c2f66ee5..c8f210d84ff5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-mmu-fr451.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-mmu-fr451.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-mmu-fr451.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/head-mmu-fr451.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/head-uc-fr401.S b/arch/frv/kernel/head-uc-fr401.S<br/>index 4ccf8414ae44..ee282be20fff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-uc-fr401.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-uc-fr401.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-uc-fr401.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/head-uc-fr401.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/head-uc-fr451.S b/arch/frv/kernel/head-uc-fr451.S<br/>index 31cb54a6f080..b10d9c8295d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-uc-fr451.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-uc-fr451.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-uc-fr451.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/head-uc-fr451.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/head-uc-fr555.S b/arch/frv/kernel/head-uc-fr555.S<br/>index d088db2699bf..39937c19b460 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-uc-fr555.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head-uc-fr555.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/head-uc-fr555.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/head-uc-fr555.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S<br/>index 29a5265489b7..fecf751c5cae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/head.S</a></div><div class='hunk'>@@ -9,9 +9,9 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/spr-regs.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/irq-mb93091.c b/arch/frv/kernel/irq-mb93091.c<br/>index 9778e0ff7c1c..1381abcd5cc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-mb93091.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-mb93091.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-mb93091.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/irq-mb93091.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c<br/>index 21ca2b298247..48b2a6420888 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-mb93093.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-mb93093.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-mb93093.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/irq-mb93093.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c<br/>index c003ae5e2b30..988d035640e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-mb93493.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-mb93493.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-mb93493.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/irq-mb93493.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/irq-routing.c b/arch/frv/kernel/irq-routing.c<br/>index d4776d1f4e82..53886adf47de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-routing.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq-routing.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq-routing.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/irq-routing.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask)</div><div class='ctx'> 		if (action) {</div><div class='ctx'> 			int status = 0;</div><div class='ctx'> </div><div class='del'>-//			if (!(action-&gt;flags &amp; SA_INTERRUPT))</div><div class='add'>+//			if (!(action-&gt;flags &amp; IRQF_DISABLED))</div><div class='ctx'> //				local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 			do {</div><div class='hunk'>@@ -90,7 +90,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask)</div><div class='ctx'> 				action = action-&gt;next;</div><div class='ctx'> 			} while (action);</div><div class='ctx'> </div><div class='del'>-			if (status &amp; SA_SAMPLE_RANDOM)</div><div class='add'>+			if (status &amp; IRQF_SAMPLE_RANDOM)</div><div class='ctx'> 				add_interrupt_randomness(irq);</div><div class='ctx'> 			local_irq_disable();</div><div class='ctx'> 		}</div><div class='hunk'>@@ -112,7 +112,7 @@ struct irq_source frv_cpuuart[2] = {</div><div class='ctx'> #define __CPUUART(X, A)						\</div><div class='ctx'> 	[X] = {							\</div><div class='ctx'> 		.muxname	= "uart",			\</div><div class='del'>-		.muxdata	= (volatile void __iomem *) A,	\</div><div class='add'>+		.muxdata	= (volatile void __iomem *)(unsigned long)A,\</div><div class='ctx'> 		.irqmask	= 1 &lt;&lt; IRQ_CPU_UART##X,		\</div><div class='ctx'> 		.doirq		= frv_cpuuart_doirq,		\</div><div class='ctx'> 	}</div><div class='hunk'>@@ -136,7 +136,7 @@ struct irq_source frv_cpudma[8] = {</div><div class='ctx'> #define __CPUDMA(X, A)						\</div><div class='ctx'> 	[X] = {							\</div><div class='ctx'> 		.muxname	= "dma",			\</div><div class='del'>-		.muxdata	= (volatile void __iomem *) A,	\</div><div class='add'>+		.muxdata	= (volatile void __iomem *)(unsigned long)A,\</div><div class='ctx'> 		.irqmask	= 1 &lt;&lt; IRQ_CPU_DMA##X,		\</div><div class='ctx'> 		.doirq		= frv_cpudma_doirq,		\</div><div class='ctx'> 	}</div><div class='hunk'>@@ -164,7 +164,7 @@ struct irq_source frv_cputimer[3] = {</div><div class='ctx'> #define __CPUTIMER(X)						\</div><div class='ctx'> 	[X] = {							\</div><div class='ctx'> 		.muxname	= "timer",			\</div><div class='del'>-		.muxdata	= 0,				\</div><div class='add'>+		.muxdata	= NULL,				\</div><div class='ctx'> 		.irqmask	= 1 &lt;&lt; IRQ_CPU_TIMER##X,	\</div><div class='ctx'> 		.doirq		= frv_cputimer_doirq,		\</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +187,7 @@ struct irq_source frv_cpuexternal[8] = {</div><div class='ctx'> #define __CPUEXTERNAL(X)					\</div><div class='ctx'> 	[X] = {							\</div><div class='ctx'> 		.muxname	= "ext",			\</div><div class='del'>-		.muxdata	= 0,				\</div><div class='add'>+		.muxdata	= NULL,				\</div><div class='ctx'> 		.irqmask	= 1 &lt;&lt; IRQ_CPU_EXTERNAL##X,	\</div><div class='ctx'> 		.doirq		= frv_cpuexternal_doirq,	\</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c<br/>index 11fa326a8f62..08967010be04 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/irq.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Naturally it's not a 1:1 relation, but there are similarities.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -342,11 +341,11 @@ asmlinkage void do_NMI(void)</div><div class='ctx'>  *</div><div class='ctx'>  *	Flags:</div><div class='ctx'>  *</div><div class='del'>- *	SA_SHIRQ		Interrupt is shared</div><div class='add'>+ *	IRQF_SHARED		Interrupt is shared</div><div class='ctx'>  *</div><div class='del'>- *	SA_INTERRUPT		Disable local interrupts while processing</div><div class='add'>+ *	IRQF_DISABLED	Disable local interrupts while processing</div><div class='ctx'>  *</div><div class='del'>- *	SA_SAMPLE_RANDOM	The interrupt can be used for entropy</div><div class='add'>+ *	IRQF_SAMPLE_RANDOM	The interrupt can be used for entropy</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +365,7 @@ int request_irq(unsigned int irq,</div><div class='ctx'> 	 * to figure out which interrupt is which (messes up the</div><div class='ctx'> 	 * interrupt freeing logic etc).</div><div class='ctx'> 	 */</div><div class='del'>-	if (irqflags &amp; SA_SHIRQ) {</div><div class='add'>+	if (irqflags &amp; IRQF_SHARED) {</div><div class='ctx'> 		if (!dev_id)</div><div class='ctx'> 			printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n",</div><div class='ctx'> 			       devname, (&amp;irq)[-1]);</div><div class='hunk'>@@ -577,7 +576,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)</div><div class='ctx'> 	 * so we have to be careful not to interfere with a</div><div class='ctx'> 	 * running system.</div><div class='ctx'> 	 */</div><div class='del'>-	if (new-&gt;flags &amp; SA_SAMPLE_RANDOM) {</div><div class='add'>+	if (new-&gt;flags &amp; IRQF_SAMPLE_RANDOM) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This function might sleep, we want to call it first,</div><div class='ctx'> 		 * outside of the atomic block.</div><div class='hunk'>@@ -593,7 +592,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)</div><div class='ctx'> 	spin_lock_irqsave(&amp;level-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* can't share interrupts unless all parties agree to */</div><div class='del'>-	if (level-&gt;usage != 0 &amp;&amp; !(level-&gt;flags &amp; new-&gt;flags &amp; SA_SHIRQ)) {</div><div class='add'>+	if (level-&gt;usage != 0 &amp;&amp; !(level-&gt;flags &amp; new-&gt;flags &amp; IRQF_SHARED)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;level-&gt;lock,flags);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -625,7 +624,7 @@ static struct proc_dir_entry * irq_dir [NR_IRQS];</div><div class='ctx'> </div><div class='ctx'> #define HEX_DIGITS 8</div><div class='ctx'> </div><div class='del'>-static unsigned int parse_hex_value (const char *buffer,</div><div class='add'>+static unsigned int parse_hex_value (const char __user *buffer,</div><div class='ctx'> 				     unsigned long count, unsigned long *ret)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char hexnum [HEX_DIGITS];</div><div class='hunk'>@@ -672,7 +671,7 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,</div><div class='ctx'> 	return sprintf (page, "%08lx\n", *mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prof_cpu_mask_write_proc (struct file *file, const char *buffer,</div><div class='add'>+static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,</div><div class='ctx'> 					unsigned long count, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *mask = (unsigned long *) data, full_count = count, err;</div><div class='hunk'>@@ -711,7 +710,7 @@ void init_irq_proc (void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* create /proc/irq */</div><div class='del'>-	root_irq_dir = proc_mkdir("irq", 0);</div><div class='add'>+	root_irq_dir = proc_mkdir("irq", NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* create /proc/irq/prof_cpu_mask */</div><div class='ctx'> 	entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);</div><div class='head'>diff --git a/arch/frv/kernel/local.h b/arch/frv/kernel/local.h<br/>index e9471761d78b..76606d13b1aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/local.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/local.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/local.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/local.h</a></div><div class='hunk'>@@ -51,6 +51,9 @@ extern void (*__power_switch_wake_cleanup)(void);</div><div class='ctx'> /* time.c */</div><div class='ctx'> extern void time_divisor_init(void);</div><div class='ctx'> </div><div class='add'>+/* cmode.S */</div><div class='add'>+extern asmlinkage void frv_change_cmode(int);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #endif /* __ASSEMBLY__ */</div><div class='ctx'> #endif /* _FRV_LOCAL_H */</div><div class='head'>diff --git a/arch/frv/kernel/pm-mb93093.c b/arch/frv/kernel/pm-mb93093.c<br/>index 34d01d7dcc3b..eaa7b582ef52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/pm-mb93093.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/pm-mb93093.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/pm-mb93093.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/pm-mb93093.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c<br/>index f0b8fff3e733..c1d9fc8f1a85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/pm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/pm.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='hunk'>@@ -27,11 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "local.h"</div><div class='ctx'> </div><div class='del'>-void (*pm_power_off)(void);</div><div class='del'>-EXPORT_SYMBOL(pm_power_off);</div><div class='del'>-</div><div class='del'>-extern void frv_change_cmode(int);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Debug macros</div><div class='ctx'>  */</div><div class='hunk'>@@ -137,7 +131,7 @@ unsigned long sleep_phys_sp(void *sp)</div><div class='ctx'> #define CTL_PM_P0 4</div><div class='ctx'> #define CTL_PM_CM 5</div><div class='ctx'> </div><div class='del'>-static int user_atoi(char *ubuf, size_t len)</div><div class='add'>+static int user_atoi(char __user *ubuf, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[16];</div><div class='ctx'> 	unsigned long ret;</div><div class='hunk'>@@ -159,7 +153,7 @@ static int user_atoi(char *ubuf, size_t len)</div><div class='ctx'>  * Send us to sleep.</div><div class='ctx'>  */</div><div class='ctx'> static int sysctl_pm_do_suspend(ctl_table *ctl, int write, struct file *filp,</div><div class='del'>-				void *buffer, size_t *lenp, loff_t *fpos)</div><div class='add'>+				void __user *buffer, size_t *lenp, loff_t *fpos)</div><div class='ctx'> {</div><div class='ctx'> 	int retval, mode;</div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +209,7 @@ static int try_set_cmode(int new_cmode)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int cmode_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='del'>-			 void *buffer, size_t *lenp, loff_t *fpos)</div><div class='add'>+			 void __user *buffer, size_t *lenp, loff_t *fpos)</div><div class='ctx'> {</div><div class='ctx'> 	int new_cmode;</div><div class='ctx'> </div><div class='hunk'>@@ -227,9 +221,9 @@ static int cmode_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 	return try_set_cmode(new_cmode)?:*lenp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cmode_sysctl(ctl_table *table, int *name, int nlen,</div><div class='del'>-			void *oldval, size_t *oldlenp,</div><div class='del'>-			void *newval, size_t newlen, void **context)</div><div class='add'>+static int cmode_sysctl(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+			void __user *oldval, size_t __user *oldlenp,</div><div class='add'>+			void __user *newval, size_t newlen, void **context)</div><div class='ctx'> {</div><div class='ctx'> 	if (oldval &amp;&amp; oldlenp) {</div><div class='ctx'> 		size_t oldlen;</div><div class='hunk'>@@ -240,7 +234,7 @@ static int cmode_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 		if (oldlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (put_user(clock_cmode_current, (unsigned int *)oldval) ||</div><div class='add'>+		if (put_user(clock_cmode_current, (unsigned __user *)oldval) ||</div><div class='ctx'> 		    put_user(sizeof(int), oldlenp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -250,7 +244,7 @@ static int cmode_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 		if (newlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (get_user(new_cmode, (int *)newval))</div><div class='add'>+		if (get_user(new_cmode, (int __user *)newval))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return try_set_cmode(new_cmode)?:1;</div><div class='hunk'>@@ -318,7 +312,7 @@ static int try_set_cm(int new_cm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p0_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='del'>-		      void *buffer, size_t *lenp, loff_t *fpos)</div><div class='add'>+		      void __user *buffer, size_t *lenp, loff_t *fpos)</div><div class='ctx'> {</div><div class='ctx'> 	int new_p0;</div><div class='ctx'> </div><div class='hunk'>@@ -330,9 +324,9 @@ static int p0_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 	return try_set_p0(new_p0)?:*lenp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int p0_sysctl(ctl_table *table, int *name, int nlen,</div><div class='del'>-		     void *oldval, size_t *oldlenp,</div><div class='del'>-		     void *newval, size_t newlen, void **context)</div><div class='add'>+static int p0_sysctl(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+		     void __user *oldval, size_t __user *oldlenp,</div><div class='add'>+		     void __user *newval, size_t newlen, void **context)</div><div class='ctx'> {</div><div class='ctx'> 	if (oldval &amp;&amp; oldlenp) {</div><div class='ctx'> 		size_t oldlen;</div><div class='hunk'>@@ -343,7 +337,7 @@ static int p0_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 		if (oldlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (put_user(clock_p0_current, (unsigned int *)oldval) ||</div><div class='add'>+		if (put_user(clock_p0_current, (unsigned __user *)oldval) ||</div><div class='ctx'> 		    put_user(sizeof(int), oldlenp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -353,7 +347,7 @@ static int p0_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 		if (newlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (get_user(new_p0, (int *)newval))</div><div class='add'>+		if (get_user(new_p0, (int __user *)newval))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return try_set_p0(new_p0)?:1;</div><div class='hunk'>@@ -362,7 +356,7 @@ static int p0_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cm_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='del'>-		      void *buffer, size_t *lenp, loff_t *fpos)</div><div class='add'>+		      void __user *buffer, size_t *lenp, loff_t *fpos)</div><div class='ctx'> {</div><div class='ctx'> 	int new_cm;</div><div class='ctx'> </div><div class='hunk'>@@ -374,9 +368,9 @@ static int cm_procctl(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 	return try_set_cm(new_cm)?:*lenp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cm_sysctl(ctl_table *table, int *name, int nlen,</div><div class='del'>-		     void *oldval, size_t *oldlenp,</div><div class='del'>-		     void *newval, size_t newlen, void **context)</div><div class='add'>+static int cm_sysctl(ctl_table *table, int __user *name, int nlen,</div><div class='add'>+		     void __user *oldval, size_t __user *oldlenp,</div><div class='add'>+		     void __user *newval, size_t newlen, void **context)</div><div class='ctx'> {</div><div class='ctx'> 	if (oldval &amp;&amp; oldlenp) {</div><div class='ctx'> 		size_t oldlen;</div><div class='hunk'>@@ -387,7 +381,7 @@ static int cm_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 		if (oldlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (put_user(clock_cm_current, (unsigned int *)oldval) ||</div><div class='add'>+		if (put_user(clock_cm_current, (unsigned __user *)oldval) ||</div><div class='ctx'> 		    put_user(sizeof(int), oldlenp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -397,7 +391,7 @@ static int cm_sysctl(ctl_table *table, int *name, int nlen,</div><div class='ctx'> 		if (newlen != sizeof(int))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (get_user(new_cm, (int *)newval))</div><div class='add'>+		if (get_user(new_cm, (int __user *)newval))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return try_set_cm(new_cm)?:1;</div><div class='head'>diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c<br/>index 0fff8a61ef2a..515a5cea5469 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/process.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -39,6 +40,9 @@ asmlinkage void ret_from_fork(void);</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> </div><div class='add'>+void (*pm_power_off)(void);</div><div class='add'>+EXPORT_SYMBOL(pm_power_off);</div><div class='add'>+</div><div class='ctx'> struct task_struct *alloc_task_struct(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *p = kmalloc(THREAD_SIZE, GFP_KERNEL);</div><div class='hunk'>@@ -204,7 +208,7 @@ int copy_thread(int nr, unsigned long clone_flags,</div><div class='ctx'> </div><div class='ctx'> 	regs0 = __kernel_frame0_ptr;</div><div class='ctx'> 	childregs0 = (struct pt_regs *)</div><div class='del'>-		(task_stack_page(p) + THREAD_SIZE - USER_CONTEXT_SIZE);</div><div class='add'>+		(task_stack_page(p) + THREAD_SIZE - FRV_FRAME0_SIZE);</div><div class='ctx'> 	childregs = childregs0;</div><div class='ctx'> </div><div class='ctx'> 	/* set up the userspace frame (the only place that the USP is stored) */</div><div class='hunk'>@@ -246,7 +250,7 @@ int copy_thread(int nr, unsigned long clone_flags,</div><div class='ctx'> /*</div><div class='ctx'>  * sys_execve() executes a new program.</div><div class='ctx'>  */</div><div class='del'>-asmlinkage int sys_execve(char *name, char **argv, char **envp)</div><div class='add'>+asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	char * filename;</div><div class='hunk'>@@ -368,3 +372,11 @@ int elf_check_arch(const struct elf32_hdr *hdr)</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpregs)</div><div class='add'>+{</div><div class='add'>+	memcpy(fpregs,</div><div class='add'>+	       &amp;current-&gt;thread.user-&gt;f,</div><div class='add'>+	       sizeof(current-&gt;thread.user-&gt;f));</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/frv/kernel/ptrace.c b/arch/frv/kernel/ptrace.c<br/>index f953484e7d59..fcff819b4340 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c<br/>index 7971d680ae29..f278cdf3a72f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/semaphore.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c<br/>index 5908deae9607..af08ccd4ed6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/setup.c</a></div><div class='hunk'>@@ -10,8 +10,7 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -814,7 +813,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	 * - by now the stack is part of the init task */</div><div class='ctx'> 	printk("Memory %08lx-%08lx\n", memory_start, memory_end);</div><div class='ctx'> </div><div class='del'>-	if (memory_start == memory_end) BUG();</div><div class='add'>+	BUG_ON(memory_start == memory_end);</div><div class='ctx'> </div><div class='ctx'> 	init_mm.start_code = (unsigned long) &amp;_stext;</div><div class='ctx'> 	init_mm.end_code = (unsigned long) &amp;_etext;</div><div class='head'>diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c<br/>index 679c1d5cc958..b8a5882b8625 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/signal.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)</div><div class='ctx'> </div><div class='ctx'> struct sigframe</div><div class='ctx'> {</div><div class='del'>-	void (*pretcode)(void);</div><div class='add'>+	__sigrestore_t pretcode;</div><div class='ctx'> 	int sig;</div><div class='ctx'> 	struct sigcontext sc;</div><div class='ctx'> 	unsigned long extramask[_NSIG_WORDS-1];</div><div class='hunk'>@@ -107,10 +107,10 @@ struct sigframe</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe</div><div class='ctx'> {</div><div class='del'>-	void (*pretcode)(void);</div><div class='add'>+	__sigrestore_t pretcode;</div><div class='ctx'> 	int sig;</div><div class='del'>-	struct siginfo *pinfo;</div><div class='del'>-	void *puc;</div><div class='add'>+	struct siginfo __user *pinfo;</div><div class='add'>+	void __user *puc;</div><div class='ctx'> 	struct siginfo info;</div><div class='ctx'> 	struct ucontext uc;</div><div class='ctx'> 	uint32_t retcode[2];</div><div class='hunk'>@@ -233,7 +233,7 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,</div><div class='ctx'> </div><div class='ctx'> 	/* This is the X/Open sanctioned signal stack switching.  */</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_ONSTACK) {</div><div class='del'>-		if (! on_sig_stack(sp))</div><div class='add'>+		if (! sas_ss_flags(sp))</div><div class='ctx'> 			sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +284,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)</div><div class='ctx'> 		 *	setlos	#__NR_sigreturn,gr7</div><div class='ctx'> 		 *	tira	gr0,0</div><div class='ctx'> 		 */</div><div class='del'>-		if (__put_user((void (*)(void))frame-&gt;retcode, &amp;frame-&gt;pretcode) ||</div><div class='add'>+		if (__put_user((__sigrestore_t)frame-&gt;retcode, &amp;frame-&gt;pretcode) ||</div><div class='ctx'> 		    __put_user(0x8efc0000|__NR_sigreturn, &amp;frame-&gt;retcode[0]) ||</div><div class='ctx'> 		    __put_user(0xc0700000, &amp;frame-&gt;retcode[1]))</div><div class='ctx'> 			goto give_sigsegv;</div><div class='hunk'>@@ -300,7 +300,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)</div><div class='ctx'> </div><div class='ctx'> 	if (get_personality &amp; FDPIC_FUNCPTRS) {</div><div class='ctx'> 		struct fdpic_func_descriptor __user *funcptr =</div><div class='del'>-			(struct fdpic_func_descriptor *) ka-&gt;sa.sa_handler;</div><div class='add'>+			(struct fdpic_func_descriptor __user *) ka-&gt;sa.sa_handler;</div><div class='ctx'> 		__get_user(__frame-&gt;pc, &amp;funcptr-&gt;text);</div><div class='ctx'> 		__get_user(__frame-&gt;gr15, &amp;funcptr-&gt;GOT);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -359,8 +359,8 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> </div><div class='ctx'> 	/* Create the ucontext.  */</div><div class='ctx'> 	if (__put_user(0, &amp;frame-&gt;uc.uc_flags) ||</div><div class='del'>-	    __put_user(0, &amp;frame-&gt;uc.uc_link) ||</div><div class='del'>-	    __put_user((void*)current-&gt;sas_ss_sp, &amp;frame-&gt;uc.uc_stack.ss_sp) ||</div><div class='add'>+	    __put_user(NULL, &amp;frame-&gt;uc.uc_link) ||</div><div class='add'>+	    __put_user((void __user *)current-&gt;sas_ss_sp, &amp;frame-&gt;uc.uc_stack.ss_sp) ||</div><div class='ctx'> 	    __put_user(sas_ss_flags(__frame-&gt;sp), &amp;frame-&gt;uc.uc_stack.ss_flags) ||</div><div class='ctx'> 	    __put_user(current-&gt;sas_ss_size, &amp;frame-&gt;uc.uc_stack.ss_size))</div><div class='ctx'> 		goto give_sigsegv;</div><div class='hunk'>@@ -382,7 +382,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 		 *	setlos	#__NR_sigreturn,gr7</div><div class='ctx'> 		 *	tira	gr0,0</div><div class='ctx'> 		 */</div><div class='del'>-		if (__put_user((void (*)(void))frame-&gt;retcode, &amp;frame-&gt;pretcode) ||</div><div class='add'>+		if (__put_user((__sigrestore_t)frame-&gt;retcode, &amp;frame-&gt;pretcode) ||</div><div class='ctx'> 		    __put_user(0x8efc0000|__NR_rt_sigreturn, &amp;frame-&gt;retcode[0]) ||</div><div class='ctx'> 		    __put_user(0xc0700000, &amp;frame-&gt;retcode[1]))</div><div class='ctx'> 			goto give_sigsegv;</div><div class='hunk'>@@ -398,7 +398,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	__frame-&gt;gr9 = (unsigned long) &amp;frame-&gt;info;</div><div class='ctx'> </div><div class='ctx'> 	if (get_personality &amp; FDPIC_FUNCPTRS) {</div><div class='del'>-		struct fdpic_func_descriptor *funcptr =</div><div class='add'>+		struct fdpic_func_descriptor __user *funcptr =</div><div class='ctx'> 			(struct fdpic_func_descriptor __user *) ka-&gt;sa.sa_handler;</div><div class='ctx'> 		__get_user(__frame-&gt;pc, &amp;funcptr-&gt;text);</div><div class='ctx'> 		__get_user(__frame-&gt;gr15, &amp;funcptr-&gt;GOT);</div><div class='head'>diff --git a/arch/frv/kernel/sleep.S b/arch/frv/kernel/sleep.S<br/>index e6079b8cac60..c9b2d51ab9ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/sleep.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='head'>diff --git a/arch/frv/kernel/switch_to.S b/arch/frv/kernel/switch_to.S<br/>index 1703dc20174e..b5275fa9cd0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/switch_to.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/switch_to.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/switch_to.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/switch_to.S</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> # 2 of the License, or (at your option) any later version.</div><div class='ctx'> #</div><div class='ctx'> ###############################################################################</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> 	# address of frame 0 (userspace) on current kernel stack</div><div class='ctx'> 	.globl		__kernel_frame0_ptr</div><div class='ctx'> __kernel_frame0_ptr:</div><div class='del'>-	.long		init_thread_union + THREAD_SIZE - USER_CONTEXT_SIZE</div><div class='add'>+	.long		init_thread_union + THREAD_SIZE - FRV_FRAME0_SIZE</div><div class='ctx'> </div><div class='ctx'> 	# address of current task</div><div class='ctx'> 	.globl		__kernel_current_task</div><div class='head'>diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c<br/>index 931aa6d895e3..c4d4348c9e8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/sys_frv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/sys_frv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/sys_frv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/sys_frv.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * sys_pipe() is the normal C calling standard for creating</div><div class='ctx'>  * a pipe. It's not the way unix traditionally does this, though.</div><div class='ctx'>  */</div><div class='del'>-asmlinkage long sys_pipe(unsigned long * fildes)</div><div class='add'>+asmlinkage long sys_pipe(unsigned long __user * fildes)</div><div class='ctx'> {</div><div class='ctx'> 	int fd[2];</div><div class='ctx'> 	int error;</div><div class='head'>diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c<br/>index 408b0f382b42..ce676803eb6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/sysctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/sysctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/sysctl.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -49,7 +48,7 @@ static void frv_change_dcache_mode(unsigned long newmode)</div><div class='ctx'>  * handle requests to dynamically switch the write caching mode delivered by /proc</div><div class='ctx'>  */</div><div class='ctx'> static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,</div><div class='del'>-				 void *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+				 void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long hsr0;</div><div class='ctx'> 	char buff[8];</div><div class='hunk'>@@ -123,7 +122,7 @@ static int procctl_frv_cachemode(ctl_table *table, int write, struct file *filp,</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,</div><div class='del'>-				void *buffer, size_t *lenp, loff_t *ppos)</div><div class='add'>+				void __user *buffer, size_t *lenp, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	pid_t pid;</div><div class='ctx'> 	char buff[16], *p;</div><div class='head'>diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c<br/>index 24cf85f89e40..d5b64e193d92 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/time.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ unsigned long __delay_loops_MHz;</div><div class='ctx'> static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_irq  = {</div><div class='del'>-	timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL</div><div class='add'>+	timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int set_rtc_mmss(unsigned long nowtime)</div><div class='head'>diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c<br/>index 9eb84b2e6abc..2e6098c85578 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/traps.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -21,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -280,20 +280,20 @@ static const char *regnames[] = {</div><div class='ctx'> </div><div class='ctx'> void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	uint32_t *reg;</div><div class='add'>+	unsigned long *reg;</div><div class='ctx'> 	int loop;</div><div class='ctx'> </div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='del'>-	printk("Frame: @%08x [%s]\n",</div><div class='del'>-	       (uint32_t) regs,</div><div class='add'>+	printk("Frame: @%08lx [%s]\n",</div><div class='add'>+	       (unsigned long) regs,</div><div class='ctx'> 	       regs-&gt;psr &amp; PSR_S ? "kernel" : "user");</div><div class='ctx'> </div><div class='del'>-	reg = (uint32_t *) regs;</div><div class='del'>-	for (loop = 0; loop &lt; REG__END; loop++) {</div><div class='del'>-		printk("%s %08x", regnames[loop + 0], reg[loop + 0]);</div><div class='add'>+	reg = (unsigned long *) regs;</div><div class='add'>+	for (loop = 0; loop &lt; NR_PT_REGS; loop++) {</div><div class='add'>+		printk("%s %08lx", regnames[loop + 0], reg[loop + 0]);</div><div class='ctx'> </div><div class='del'>-		if (loop == REG__END - 1 || loop % 5 == 4)</div><div class='add'>+		if (loop == NR_PT_REGS - 1 || loop % 5 == 4)</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			printk(" | ");</div><div class='hunk'>@@ -329,7 +329,7 @@ void die_if_kernel(const char *str, ...)</div><div class='ctx'>  */</div><div class='ctx'> static void show_backtrace_regs(struct pt_regs *frame)</div><div class='ctx'> {</div><div class='del'>-	uint32_t *reg;</div><div class='add'>+	unsigned long *reg;</div><div class='ctx'> 	int loop;</div><div class='ctx'> </div><div class='ctx'> 	/* print the registers for this frame */</div><div class='hunk'>@@ -337,11 +337,11 @@ static void show_backtrace_regs(struct pt_regs *frame)</div><div class='ctx'> 	       frame-&gt;psr &amp; PSR_S ? "Kernel Mode" : "User Mode",</div><div class='ctx'> 	       frame);</div><div class='ctx'> </div><div class='del'>-	reg = (uint32_t *) frame;</div><div class='del'>-	for (loop = 0; loop &lt; REG__END; loop++) {</div><div class='del'>-		printk("%s %08x", regnames[loop + 0], reg[loop + 0]);</div><div class='add'>+	reg = (unsigned long *) frame;</div><div class='add'>+	for (loop = 0; loop &lt; NR_PT_REGS; loop++) {</div><div class='add'>+		printk("%s %08lx", regnames[loop + 0], reg[loop + 0]);</div><div class='ctx'> </div><div class='del'>-		if (loop == REG__END - 1 || loop % 5 == 4)</div><div class='add'>+		if (loop == NR_PT_REGS - 1 || loop % 5 == 4)</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			printk(" | ");</div><div class='head'>diff --git a/arch/frv/kernel/uaccess.c b/arch/frv/kernel/uaccess.c<br/>index 9b751c0f0e84..9fb771a20df3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/kernel/uaccess.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/kernel/uaccess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/kernel/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/kernel/uaccess.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * copy a null terminated string from userspace</div><div class='ctx'>  */</div><div class='del'>-long strncpy_from_user(char *dst, const char *src, long count)</div><div class='add'>+long strncpy_from_user(char *dst, const char __user *src, long count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long max;</div><div class='ctx'> 	char *p, ch;</div><div class='hunk'>@@ -70,9 +70,9 @@ EXPORT_SYMBOL(strncpy_from_user);</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on exception, a value greater than N if too long</div><div class='ctx'>  */</div><div class='del'>-long strnlen_user(const char *src, long count)</div><div class='add'>+long strnlen_user(const char __user *src, long count)</div><div class='ctx'> {</div><div class='del'>-	const char *p;</div><div class='add'>+	const char __user *p;</div><div class='ctx'> 	long err = 0;</div><div class='ctx'> 	char ch;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c<br/>index 0a26bf6f1cd4..4f165c93be42 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mb93090-mb00/pci-frv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-frv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mb93090-mb00/pci-frv.c</a></div><div class='hunk'>@@ -64,10 +64,10 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-		       unsigned long size, unsigned long align)</div><div class='add'>+		       resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='ctx'> 			start = (start + 0x3ff) &amp; ~0x3ff;</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c<br/>index c4a1144c98b0..2278c80bd88c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mb93090-mb00/pci-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mb93090-mb00/pci-irq.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * derived from: arch/i386/kernel/pci-irq.c: (c) 1999--2000 Martin Mares &lt;mj@suse.cz&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -32,11 +31,11 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {</div><div class='del'>-	[0 ] {	IRQ_FPGA_MB86943_PCI_INTA },</div><div class='del'>-	[16] {	IRQ_FPGA_RTL8029_INTA },</div><div class='del'>-	[17] {	IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },</div><div class='del'>-	[18] {	IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },</div><div class='del'>-	[19] {	IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },</div><div class='add'>+	[0 ] = { IRQ_FPGA_MB86943_PCI_INTA },</div><div class='add'>+	[16] = { IRQ_FPGA_RTL8029_INTA },</div><div class='add'>+	[17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },</div><div class='add'>+	[18] = { IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },</div><div class='add'>+	[19] = { IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init pcibios_irq_init(void)</div><div class='head'>diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c<br/>index c8817f7b8605..f7279d78995a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-vdk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mb93090-mb00/pci-vdk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mb93090-mb00/pci-vdk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mb93090-mb00/pci-vdk.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -407,7 +406,9 @@ int __init pcibios_init(void)</div><div class='ctx'> 	ioport_resource.end	= (__reg_MB86943_sl_pci_io_range &lt;&lt; 9) | 0x3ff;</div><div class='ctx'> 	ioport_resource.end	+= ioport_resource.start;</div><div class='ctx'> </div><div class='del'>-	printk("PCI IO window:  %08lx-%08lx\n", ioport_resource.start, ioport_resource.end);</div><div class='add'>+	printk("PCI IO window:  %08llx-%08llx\n",</div><div class='add'>+	       (unsigned long long) ioport_resource.start,</div><div class='add'>+	       (unsigned long long) ioport_resource.end);</div><div class='ctx'> </div><div class='ctx'> 	iomem_resource.start	= (__reg_MB86943_sl_pci_mem_base &lt;&lt; 9) &amp; 0xfffffc00;</div><div class='ctx'> </div><div class='hunk'>@@ -417,8 +418,11 @@ int __init pcibios_init(void)</div><div class='ctx'> 	iomem_resource.end	= (__reg_MB86943_sl_pci_mem_range &lt;&lt; 9) | 0x3ff;</div><div class='ctx'> 	iomem_resource.end	+= iomem_resource.start;</div><div class='ctx'> </div><div class='del'>-	printk("PCI MEM window: %08lx-%08lx\n", iomem_resource.start, iomem_resource.end);</div><div class='del'>-	printk("PCI DMA memory: %08lx-%08lx\n", dma_coherent_mem_start, dma_coherent_mem_end);</div><div class='add'>+	printk("PCI MEM window: %08llx-%08llx\n",</div><div class='add'>+	       (unsigned long long) iomem_resource.start,</div><div class='add'>+	       (unsigned long long) iomem_resource.end);</div><div class='add'>+	printk("PCI DMA memory: %08lx-%08lx\n",</div><div class='add'>+	       dma_coherent_mem_start, dma_coherent_mem_end);</div><div class='ctx'> </div><div class='ctx'> 	if (!pci_probe)</div><div class='ctx'> 		return -ENXIO;</div><div class='head'>diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c<br/>index 636b2f8b5d98..dc6522c464d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/dma-alloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/dma-alloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/dma-alloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/dma-alloc.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/extable.c b/arch/frv/mm/extable.c<br/>index caacf030ac75..6aea124f574d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/frv/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c<br/>index 8899aa1a4f06..b5b4286f9dd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/init.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *    - Copyright (C) 1995  Hamish Macdonald</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/kmap.c b/arch/frv/mm/kmap.c<br/>index c54f18e65ea6..fb78be38ea02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/kmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/kmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/kmap.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -31,15 +30,15 @@</div><div class='ctx'>  * Map some physical address range into the kernel address space.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)</div><div class='add'>+void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)</div><div class='ctx'> {</div><div class='del'>-	return (void *)physaddr;</div><div class='add'>+	return (void __iomem *)physaddr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Unmap a ioremap()ed region again</div><div class='ctx'>  */</div><div class='del'>-void iounmap(void *addr)</div><div class='add'>+void iounmap(void volatile __iomem *addr)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/frv/mm/tlb-flush.S b/arch/frv/mm/tlb-flush.S<br/>index 6f43c74c5d95..79b3c70910ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/tlb-flush.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/tlb-flush.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/tlb-flush.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/tlb-flush.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/tlb-miss.S b/arch/frv/mm/tlb-miss.S<br/>index 8729f7d7c6e0..04da67468378 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/tlb-miss.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/tlb-miss.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/tlb-miss.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/tlb-miss.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/frv/mm/unaligned.c b/arch/frv/mm/unaligned.c<br/>index 09b361443fc2..8f0375fc15a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/frv/mm/unaligned.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/frv/mm/unaligned.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/frv/mm/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/frv/mm/unaligned.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/gpio.c b/arch/h8300/kernel/gpio.c<br/>index d195568ca8a2..6a25dd5530e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/gpio.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Internal I/O Port Management</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c<br/>index f8d6dee84781..9b4be053de3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/h8300_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/h8300_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/h8300_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/h8300_ksyms.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c<br/>index edb3c4170013..1488b6ace18c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/ints.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ int request_irq(unsigned int irq,</div><div class='ctx'> 	irq_handle-&gt;devname = devname;</div><div class='ctx'> 	irq_list[irq] = irq_handle;</div><div class='ctx'> </div><div class='del'>-	if (irq_handle-&gt;flags &amp; SA_SAMPLE_RANDOM)</div><div class='add'>+	if (irq_handle-&gt;flags &amp; IRQF_SAMPLE_RANDOM)</div><div class='ctx'> 		rand_initialize_irq(irq);</div><div class='ctx'> </div><div class='ctx'> 	enable_irq(irq);</div><div class='hunk'>@@ -222,7 +222,7 @@ asmlinkage void process_int(int irq, struct pt_regs *fp)</div><div class='ctx'> 		if (irq_list[irq]) {</div><div class='ctx'> 			irq_list[irq]-&gt;handler(irq, irq_list[irq]-&gt;dev_id, fp);</div><div class='ctx'> 			irq_list[irq]-&gt;count++;</div><div class='del'>-			if (irq_list[irq]-&gt;flags &amp; SA_SAMPLE_RANDOM)</div><div class='add'>+			if (irq_list[irq]-&gt;flags &amp; IRQF_SAMPLE_RANDOM)</div><div class='ctx'> 				add_interrupt_randomness(irq);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c<br/>index 16ccddc69c2b..e061b63a0038 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/process.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c<br/>index 0ff6f79b0fed..f6031373dc21 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/ptrace.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/semaphore.c b/arch/h8300/kernel/semaphore.c<br/>index 1ebb79baaa8c..d12cbbfe6ebd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/semaphore.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * specific changes in &lt;asm/semaphore-helper.h&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore-helper.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c<br/>index f469d9160730..1077b71d5226 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/setup.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of system setup</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c<br/>index f13d5e82d4b9..7787f70a05bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/signal.c</a></div><div class='hunk'>@@ -307,7 +307,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='ctx'> </div><div class='ctx'> 	/* This is the X/Open sanctioned signal stack switching.  */</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_ONSTACK) {</div><div class='del'>-		if (!on_sig_stack(usp))</div><div class='add'>+		if (!sas_ss_flags(usp))</div><div class='ctx'> 			usp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return (void *)((usp - frame_size) &amp; -8UL);</div><div class='head'>diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S<br/>index 79b3bda5c6e3..dab98fd99e63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/syscalls.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/syscalls.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/syscalls.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/syscalls.S</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> /* Systemcall Entry Table */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S<br/>index 17fa11da1e4a..6406c388f88a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> #define VMLINUX_SYMBOL(_sym_) _##_sym_</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* target memory map */</div><div class='ctx'> #ifdef CONFIG_H8300H_GENERIC</div><div class='head'>diff --git a/arch/h8300/lib/romfs.S b/arch/h8300/lib/romfs.S<br/>index b72f93a47e31..68910d8e1ff4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/lib/romfs.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/lib/romfs.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/lib/romfs.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/lib/romfs.S</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /* romfs move to __ebss */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(__H8300H__) </div><div class='ctx'> 	.h8300h</div><div class='head'>diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c<br/>index 09efc4b1f038..d3d40bdc2d6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/mm/init.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *  DEC/2000 -- linux 2.4 support &lt;davidm@snapgear.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/mm/kmap.c b/arch/h8300/mm/kmap.c<br/>index 4101ab54fc17..26ab17286a53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/mm/kmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/mm/kmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/mm/kmap.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  Copyright (C) 2000-2002 David McCullough &lt;davidm@snapgear.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/h8300/mm/memory.c b/arch/h8300/mm/memory.c<br/>index 81eace93f867..ccd6ade816dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/mm/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/mm/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/mm/memory.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *  Copyright (C) 1995  Hamish Macdonald</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S b/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S<br/>index 31c3703d8d60..ecaeb31ae9a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/aki3068net/crt0_ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/aki3068net/crt0_ram.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> 	</div><div class='ctx'> #if !defined(CONFIG_BLKDEV_RESERVE)</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/aki3068net/timer.c b/arch/h8300/platform/h8300h/aki3068net/timer.c<br/>index 086efb1fd283..27cd85d56128 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/aki3068net/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/aki3068net/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/aki3068net/timer.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/entry.S b/arch/h8300/platform/h8300h/entry.S<br/>index 2052dbb9483f..d2dea2432fb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/entry.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/generic/crt0_ram.S b/arch/h8300/platform/h8300h/generic/crt0_ram.S<br/>index b735042a7c3f..80d0e16a4499 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/generic/crt0_ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/generic/crt0_ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/generic/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/generic/crt0_ram.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> 	</div><div class='ctx'> #if !defined(CONFIG_BLKDEV_RESERVE)</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/generic/crt0_rom.S b/arch/h8300/platform/h8300h/generic/crt0_rom.S<br/>index 2e32d8179db3..120add7ca832 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/generic/crt0_rom.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/generic/crt0_rom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/generic/crt0_rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/generic/crt0_rom.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> 	</div><div class='ctx'> 	.global SYMBOL_NAME(_start)</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/generic/timer.c b/arch/h8300/platform/h8300h/generic/timer.c<br/>index 6590f89e521a..6f5cefe0cceb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/generic/timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/generic/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/generic/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/generic/timer.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/h8max/crt0_ram.S b/arch/h8300/platform/h8300h/h8max/crt0_ram.S<br/>index a5c5a9156e04..efcbefb91b67 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/h8max/crt0_ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/h8max/crt0_ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/h8max/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/h8max/crt0_ram.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> 	</div><div class='ctx'> #if !defined(CONFIG_BLKDEV_RESERVE)</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/h8max/timer.c b/arch/h8300/platform/h8300h/h8max/timer.c<br/>index 9ac9fa6691c0..85a574afe9d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/h8max/timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/h8max/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/h8max/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/h8max/timer.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8300h/ints_h8300h.c b/arch/h8300/platform/h8300h/ints_h8300h.c<br/>index 86a155479167..f1777119b871 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/ints_h8300h.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8300h/ints_h8300h.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8300h/ints_h8300h.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8300h/ints_h8300h.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/h8300/platform/h8s/edosk2674/crt0_ram.S b/arch/h8300/platform/h8s/edosk2674/crt0_ram.S<br/>index 8105dc17d735..d12b0debe478 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/edosk2674/crt0_ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/edosk2674/crt0_ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/edosk2674/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/edosk2674/crt0_ram.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/regs267x.h&gt;</div><div class='ctx'> 			</div><div class='head'>diff --git a/arch/h8300/platform/h8s/edosk2674/crt0_rom.S b/arch/h8300/platform/h8s/edosk2674/crt0_rom.S<br/>index 65748bf18556..c03d23c6fe12 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/edosk2674/crt0_rom.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/edosk2674/crt0_rom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/edosk2674/crt0_rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/edosk2674/crt0_rom.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/regs267x.h&gt;</div><div class='ctx'> 		</div><div class='head'>diff --git a/arch/h8300/platform/h8s/edosk2674/timer.c b/arch/h8300/platform/h8s/edosk2674/timer.c<br/>index 9441a4f1631f..bfb1424482f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/edosk2674/timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/edosk2674/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/edosk2674/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/edosk2674/timer.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8s/entry.S b/arch/h8300/platform/h8s/entry.S<br/>index a7a53c84c801..aeb2e9faa9b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/entry.S</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8s/generic/crt0_ram.S b/arch/h8300/platform/h8s/generic/crt0_ram.S<br/>index 86f450178466..b04541069976 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/generic/crt0_ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/generic/crt0_ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/generic/crt0_ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/generic/crt0_ram.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/regs267x.h&gt;</div><div class='ctx'> 			</div><div class='head'>diff --git a/arch/h8300/platform/h8s/generic/crt0_rom.S b/arch/h8300/platform/h8s/generic/crt0_rom.S<br/>index e18e41202282..95b6f2898f52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/generic/crt0_rom.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/generic/crt0_rom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/generic/crt0_rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/generic/crt0_rom.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/regs267x.h&gt;</div><div class='ctx'> 	</div><div class='head'>diff --git a/arch/h8300/platform/h8s/generic/timer.c b/arch/h8300/platform/h8s/generic/timer.c<br/>index 633cd8e1c21d..c2211c6e79da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/generic/timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/generic/timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/generic/timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/generic/timer.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c<br/>index f6ed663bdde0..270440de4610 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/ints.c</a></div><div class='hunk'>@@ -192,7 +192,7 @@ int request_irq(unsigned int irq,</div><div class='ctx'> 	irq_handle-&gt;dev_id  = dev_id;</div><div class='ctx'> 	irq_handle-&gt;devname = devname;</div><div class='ctx'> 	irq_list[irq] = irq_handle;</div><div class='del'>-	if (irq_handle-&gt;flags &amp; SA_SAMPLE_RANDOM)</div><div class='add'>+	if (irq_handle-&gt;flags &amp; IRQF_SAMPLE_RANDOM)</div><div class='ctx'> 		rand_initialize_irq(irq);</div><div class='ctx'> 	</div><div class='ctx'> 	/* enable interrupt */</div><div class='hunk'>@@ -270,7 +270,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)</div><div class='ctx'> 		if (irq_list[vec]) {</div><div class='ctx'> 			irq_list[vec]-&gt;handler(vec, irq_list[vec]-&gt;dev_id, fp);</div><div class='ctx'> 			irq_list[vec]-&gt;count++;</div><div class='del'>-			if (irq_list[vec]-&gt;flags &amp; SA_SAMPLE_RANDOM)</div><div class='add'>+			if (irq_list[vec]-&gt;flags &amp; IRQF_SAMPLE_RANDOM)</div><div class='ctx'> 				add_interrupt_randomness(vec);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/arch/h8300/platform/h8s/ints_h8s.c b/arch/h8300/platform/h8s/ints_h8s.c<br/>index 8268dfd12f1f..93395d2a8a07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/ints_h8s.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/h8300/platform/h8s/ints_h8s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/h8300/platform/h8s/ints_h8s.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/h8300/platform/h8s/ints_h8s.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig<br/>index 8dfa3054f10f..daa75ce4b777 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/Kconfig</a></div><div class='hunk'>@@ -14,6 +14,18 @@ config X86_32</div><div class='ctx'> 	  486, 586, Pentiums, and various instruction-set-compatible chips by</div><div class='ctx'> 	  AMD, Cyrix, and others.</div><div class='ctx'> </div><div class='add'>+config GENERIC_TIME</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config LOCKDEP_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config STACKTRACE_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config SEMAPHORE_SLEEPERS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -172,7 +184,13 @@ endchoice</div><div class='ctx'> config ACPI_SRAT</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='del'>-	depends on NUMA &amp;&amp; (X86_SUMMIT || X86_GENERICARCH)</div><div class='add'>+	depends on ACPI &amp;&amp; NUMA &amp;&amp; (X86_SUMMIT || X86_GENERICARCH)</div><div class='add'>+	select ACPI_NUMA</div><div class='add'>+</div><div class='add'>+config HAVE_ARCH_PARSE_SRAT</div><div class='add'>+       bool</div><div class='add'>+       default y</div><div class='add'>+       depends on ACPI_SRAT</div><div class='ctx'> </div><div class='ctx'> config X86_SUMMIT_NUMA</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -223,8 +241,7 @@ config NR_CPUS</div><div class='ctx'> </div><div class='ctx'> config SCHED_SMT</div><div class='ctx'> 	bool "SMT (Hyperthreading) scheduler support"</div><div class='del'>-	depends on SMP</div><div class='del'>-	default off</div><div class='add'>+	depends on X86_HT</div><div class='ctx'> 	help</div><div class='ctx'> 	  SMT scheduler support improves the CPU scheduler's decision making</div><div class='ctx'> 	  when dealing with Intel Pentium 4 chips with HyperThreading at a</div><div class='hunk'>@@ -233,7 +250,7 @@ config SCHED_SMT</div><div class='ctx'> </div><div class='ctx'> config SCHED_MC</div><div class='ctx'> 	bool "Multi-core scheduler support"</div><div class='del'>-	depends on SMP</div><div class='add'>+	depends on X86_HT</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Multi-core scheduler support improves the CPU scheduler's decision</div><div class='hunk'>@@ -319,6 +336,15 @@ config X86_MCE_P4THERMAL</div><div class='ctx'> 	  Enabling this feature will cause a message to be printed when the P4</div><div class='ctx'> 	  enters thermal throttling.</div><div class='ctx'> </div><div class='add'>+config VM86</div><div class='add'>+	default y</div><div class='add'>+	bool "Enable VM86 support" if EMBEDDED</div><div class='add'>+	help</div><div class='add'>+          This option is required by programs like DOSEMU to run 16-bit legacy</div><div class='add'>+	  code on X86 processors. It also may be needed by software like</div><div class='add'>+          XFree86 to initialize some video cards via BIOS. Disabling this</div><div class='add'>+          option saves about 6k.</div><div class='add'>+</div><div class='ctx'> config TOSHIBA</div><div class='ctx'> 	tristate "Toshiba Laptop support"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -511,6 +537,7 @@ config X86_PAE</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on HIGHMEM64G</div><div class='ctx'> 	default y</div><div class='add'>+	select RESOURCES_64BIT</div><div class='ctx'> </div><div class='ctx'> # Common NUMA Features</div><div class='ctx'> config NUMA</div><div class='hunk'>@@ -716,10 +743,10 @@ config KEXEC</div><div class='ctx'> 	help</div><div class='ctx'> 	  kexec is a system call that implements the ability to shutdown your</div><div class='ctx'> 	  current kernel, and to start another kernel.  It is like a reboot</div><div class='del'>-	  but it is indepedent of the system firmware.   And like a reboot</div><div class='add'>+	  but it is independent of the system firmware.   And like a reboot</div><div class='ctx'> 	  you can start any kernel with it, not just Linux.</div><div class='ctx'> </div><div class='del'>-	  The name comes from the similiarity to the exec system call.</div><div class='add'>+	  The name comes from the similarity to the exec system call.</div><div class='ctx'> </div><div class='ctx'> 	  It is an ongoing process to be certain the hardware in a machine</div><div class='ctx'> 	  is properly shutdown, so do not be surprised if this code does not</div><div class='hunk'>@@ -762,9 +789,23 @@ config HOTPLUG_CPU</div><div class='ctx'> 	  enable suspend on SMP systems. CPUs can be controlled through</div><div class='ctx'> 	  /sys/devices/system/cpu.</div><div class='ctx'> </div><div class='add'>+config COMPAT_VDSO</div><div class='add'>+	bool "Compat VDSO support"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Map the VDSO to the predictable old-style address too.</div><div class='add'>+	---help---</div><div class='add'>+	  Say N here if you are running a sufficiently recent glibc</div><div class='add'>+	  version (2.3.3 or later), to remove the high-mapped</div><div class='add'>+	  VDSO mapping and to exclusively use the randomized VDSO.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='add'>+config ARCH_ENABLE_MEMORY_HOTPLUG</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on HIGHMEM</div><div class='ctx'> </div><div class='ctx'> menu "Power management options (ACPI, APM)"</div><div class='ctx'> 	depends on !X86_VOYAGER</div><div class='hunk'>@@ -1041,13 +1082,27 @@ config SCx200</div><div class='ctx'> 	tristate "NatSemi SCx200 support"</div><div class='ctx'> 	depends on !X86_VOYAGER</div><div class='ctx'> 	help</div><div class='del'>-	  This provides basic support for the National Semiconductor SCx200</div><div class='del'>-	  processor.  Right now this is just a driver for the GPIO pins.</div><div class='add'>+	  This provides basic support for National Semiconductor's</div><div class='add'>+	  (now AMD's) Geode processors.  The driver probes for the</div><div class='add'>+	  PCI-IDs of several on-chip devices, so its a good dependency</div><div class='add'>+	  for other scx200_* drivers.</div><div class='ctx'> </div><div class='del'>-	  If you don't know what to do here, say N.</div><div class='add'>+	  If compiled as a module, the driver is named scx200.</div><div class='add'>+</div><div class='add'>+config SCx200HR_TIMER</div><div class='add'>+	tristate "NatSemi SCx200 27MHz High-Resolution Timer Support"</div><div class='add'>+	depends on SCx200 &amp;&amp; GENERIC_TIME</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This driver provides a clocksource built upon the on-chip</div><div class='add'>+	  27MHz high-resolution timer.  Its also a workaround for</div><div class='add'>+	  NSC Geode SC-1100's buggy TSC, which loses time when the</div><div class='add'>+	  processor goes idle (as is done by the scheduler).  The</div><div class='add'>+	  other workaround is idle=poll boot option.</div><div class='ctx'> </div><div class='del'>-	  This support is also available as a module.  If compiled as a</div><div class='del'>-	  module, it will be called scx200.</div><div class='add'>+config K8_NB</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on AGP_AMD64</div><div class='ctx'> </div><div class='ctx'> source "drivers/pcmcia/Kconfig"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu<br/>index eb130482ba18..21c9a4e71104 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/Kconfig.cpu?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/Kconfig.cpu</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/Kconfig.cpu?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/Kconfig.cpu</a></div><div class='hunk'>@@ -41,7 +41,7 @@ config M386</div><div class='ctx'> 	  - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).</div><div class='ctx'> 	  - "Geode GX/LX" For AMD Geode GX and LX processors.</div><div class='ctx'> 	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.</div><div class='del'>-	  - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).</div><div class='add'>+	  - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above).</div><div class='ctx'> </div><div class='ctx'> 	  If you don't know what to do, choose "386".</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug<br/>index c92191b1fb67..b31c0802e1cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/Kconfig.debug</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='ctx'> menu "Kernel hacking"</div><div class='ctx'> </div><div class='add'>+config TRACE_IRQFLAGS_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='ctx'> config EARLY_PRINTK</div><div class='hunk'>@@ -31,15 +35,6 @@ config DEBUG_STACK_USAGE</div><div class='ctx'> </div><div class='ctx'> 	  This option will slow down process creation somewhat.</div><div class='ctx'> </div><div class='del'>-config STACK_BACKTRACE_COLS</div><div class='del'>-	int "Stack backtraces per line" if DEBUG_KERNEL</div><div class='del'>-	range 1 3</div><div class='del'>-	default 2</div><div class='del'>-	help</div><div class='del'>-	  Selects how many stack backtrace entries per line to display.</div><div class='del'>-</div><div class='del'>-	  This can save screen space when displaying traces.</div><div class='del'>-</div><div class='ctx'> comment "Page alloc debug is incompatible with Software Suspend on i386"</div><div class='ctx'> 	depends on DEBUG_KERNEL &amp;&amp; SOFTWARE_SUSPEND</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile<br/>index 33e55476381b..e97946626064 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/boot/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/boot/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/boot/Makefile</a></div><div class='hunk'>@@ -109,8 +109,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf</div><div class='ctx'> isoimage: $(BOOTIMAGE)</div><div class='ctx'> 	-rm -rf $(obj)/isoimage</div><div class='ctx'> 	mkdir $(obj)/isoimage</div><div class='del'>-	cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \</div><div class='del'>-		$(obj)/isoimage</div><div class='add'>+	for i in lib lib64 share end ; do \</div><div class='add'>+		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \</div><div class='add'>+			cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \</div><div class='add'>+			break ; \</div><div class='add'>+		fi ; \</div><div class='add'>+		if [ $$i = end ] ; then exit 1 ; fi ; \</div><div class='add'>+	done</div><div class='ctx'> 	cp $(BOOTIMAGE) $(obj)/isoimage/linux</div><div class='ctx'> 	echo '$(image_cmdline)' &gt; $(obj)/isoimage/isolinux.cfg</div><div class='ctx'> 	if [ -f '$(FDINITRD)' ] ; then \</div><div class='head'>diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c<br/>index f19f3a7492a5..b2ccd543410d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/boot/compressed/misc.c</a></div><div class='hunk'>@@ -24,14 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef memset</div><div class='ctx'> #undef memcpy</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Why do we do this? Don't ask me..</div><div class='del'>- *</div><div class='del'>- * Incomprehensible are the ways of bootloaders.</div><div class='del'>- */</div><div class='del'>-static void* memset(void *, int, size_t);</div><div class='del'>-static void* memcpy(void *, __const void *, size_t);</div><div class='ctx'> #define memzero(s, n)     memset ((s), 0, (n))</div><div class='ctx'> </div><div class='ctx'> typedef unsigned char  uch;</div><div class='hunk'>@@ -93,7 +85,7 @@ static unsigned char *real_mode; /* Pointer to real-mode data */</div><div class='ctx'> #endif</div><div class='ctx'> #define RM_SCREEN_INFO (*(struct screen_info *)(real_mode+0))</div><div class='ctx'> </div><div class='del'>-extern char input_data[];</div><div class='add'>+extern unsigned char input_data[];</div><div class='ctx'> extern int input_len;</div><div class='ctx'> </div><div class='ctx'> static long bytes_out = 0;</div><div class='hunk'>@@ -103,6 +95,9 @@ static unsigned long output_ptr = 0;</div><div class='ctx'> static void *malloc(int size);</div><div class='ctx'> static void free(void *where);</div><div class='ctx'> </div><div class='add'>+static void *memset(void *s, int c, unsigned n);</div><div class='add'>+static void *memcpy(void *dest, const void *src, unsigned n);</div><div class='add'>+</div><div class='ctx'> static void putstr(const char *);</div><div class='ctx'> </div><div class='ctx'> extern int end;</div><div class='hunk'>@@ -205,7 +200,7 @@ static void putstr(const char *s)</div><div class='ctx'> 	outb_p(0xff &amp; (pos &gt;&gt; 1), vidport+1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void* memset(void* s, int c, size_t n)</div><div class='add'>+static void* memset(void* s, int c, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *ss = (char*)s;</div><div class='hunk'>@@ -214,14 +209,13 @@ static void* memset(void* s, int c, size_t n)</div><div class='ctx'> 	return s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void* memcpy(void* __dest, __const void* __src,</div><div class='del'>-			    size_t __n)</div><div class='add'>+static void* memcpy(void* dest, const void* src, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	char *d = (char *)__dest, *s = (char *)__src;</div><div class='add'>+	char *d = (char *)dest, *s = (char *)src;</div><div class='ctx'> </div><div class='del'>-	for (i=0;i&lt;__n;i++) d[i] = s[i];</div><div class='del'>-	return __dest;</div><div class='add'>+	for (i=0;i&lt;n;i++) d[i] = s[i];</div><div class='add'>+	return dest;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='hunk'>@@ -309,7 +303,7 @@ static void setup_normal_output_buffer(void)</div><div class='ctx'> #else</div><div class='ctx'> 	if ((RM_ALT_MEM_K &gt; RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) &lt; 1024) error("Less than 2MB of memory");</div><div class='ctx'> #endif</div><div class='del'>-	output_data = (char *)__PHYSICAL_START; /* Normally Points to 1M */</div><div class='add'>+	output_data = (unsigned char *)__PHYSICAL_START; /* Normally Points to 1M */</div><div class='ctx'> 	free_mem_end_ptr = (long)real_mode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,11 +318,9 @@ static void setup_output_buffer_if_we_run_high(struct moveparams *mv)</div><div class='ctx'> #ifdef STANDARD_MEMORY_BIOS_CALL</div><div class='ctx'> 	if (RM_EXT_MEM_K &lt; (3*1024)) error("Less than 4MB of memory");</div><div class='ctx'> #else</div><div class='del'>-	if ((RM_ALT_MEM_K &gt; RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) &lt;</div><div class='del'>-			(3*1024))</div><div class='del'>-		error("Less than 4MB of memory");</div><div class='add'>+	if ((RM_ALT_MEM_K &gt; RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) &lt; (3*1024)) error("Less than 4MB of memory");</div><div class='ctx'> #endif	</div><div class='del'>-	mv-&gt;low_buffer_start = output_data = (char *)LOW_BUFFER_START;</div><div class='add'>+	mv-&gt;low_buffer_start = output_data = (unsigned char *)LOW_BUFFER_START;</div><div class='ctx'> 	low_buffer_end = ((unsigned int)real_mode &gt; LOW_BUFFER_MAX</div><div class='ctx'> 	  ? LOW_BUFFER_MAX : (unsigned int)real_mode) &amp; ~0xfff;</div><div class='ctx'> 	low_buffer_size = low_buffer_end - LOW_BUFFER_START;</div><div class='head'>diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S<br/>index ca668d9df164..d2b684cd620a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/boot/setup.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/setup.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/boot/setup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/boot/setup.S</a></div><div class='hunk'>@@ -46,9 +46,8 @@</div><div class='ctx'>  * by Robert Schwebel, December 2001 &lt;robert@schwebel.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/compile.h&gt;</div><div class='ctx'> #include &lt;asm/boot.h&gt;</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='head'>diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S<br/>index c9343c3a8082..8c2a6faeeae5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/boot/video.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/boot/video.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/boot/video.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/boot/video.S</a></div><div class='hunk'>@@ -1929,7 +1929,7 @@ skip10:	movb	%ah, %al</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> store_edid:</div><div class='del'>-#ifdef CONFIG_FB_FIRMWARE_EDID</div><div class='add'>+#ifdef CONFIG_FIRMWARE_EDID</div><div class='ctx'> 	pushw	%es				# just save all registers</div><div class='ctx'> 	pushw	%ax</div><div class='ctx'> 	pushw	%bx</div><div class='hunk'>@@ -1947,6 +1947,22 @@ store_edid:</div><div class='ctx'> 	rep</div><div class='ctx'> 	stosl</div><div class='ctx'> </div><div class='add'>+	pushw   %es				# save ES</div><div class='add'>+	xorw    %di, %di                        # Report Capability</div><div class='add'>+	pushw   %di</div><div class='add'>+	popw    %es                             # ES:DI must be 0:0</div><div class='add'>+	movw	$0x4f15, %ax</div><div class='add'>+	xorw	%bx, %bx</div><div class='add'>+	xorw	%cx, %cx</div><div class='add'>+	int	$0x10</div><div class='add'>+	popw    %es                             # restore ES</div><div class='add'>+</div><div class='add'>+	cmpb    $0x00, %ah                      # call successful</div><div class='add'>+	jne     no_edid</div><div class='add'>+</div><div class='add'>+	cmpb    $0x4f, %al                      # function supported</div><div class='add'>+	jne     no_edid</div><div class='add'>+</div><div class='ctx'> 	movw	$0x4f15, %ax                    # do VBE/DDC</div><div class='ctx'> 	movw	$0x01, %bx</div><div class='ctx'> 	movw	$0x00, %cx</div><div class='hunk'>@@ -1954,6 +1970,7 @@ store_edid:</div><div class='ctx'> 	movw	$0x140, %di</div><div class='ctx'> 	int	$0x10</div><div class='ctx'> </div><div class='add'>+no_edid:</div><div class='ctx'> 	popw	%di				# restore all registers</div><div class='ctx'> 	popw	%dx</div><div class='ctx'> 	popw	%cx</div><div class='head'>diff --git a/arch/i386/crypto/aes-i586-asm.S b/arch/i386/crypto/aes-i586-asm.S<br/>index 911b15377f2e..f942f0c8f630 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/crypto/aes-i586-asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/crypto/aes-i586-asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/crypto/aes-i586-asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/crypto/aes-i586-asm.S</a></div><div class='hunk'>@@ -36,22 +36,19 @@</div><div class='ctx'> .file "aes-i586-asm.S"</div><div class='ctx'> .text</div><div class='ctx'> </div><div class='del'>-// aes_rval aes_enc_blk(const unsigned char in_blk[], unsigned char out_blk[], const aes_ctx cx[1])//</div><div class='del'>-// aes_rval aes_dec_blk(const unsigned char in_blk[], unsigned char out_blk[], const aes_ctx cx[1])//</div><div class='del'>-	</div><div class='del'>-#define tlen 1024   // length of each of 4 'xor' arrays (256 32-bit words)</div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='del'>-// offsets to parameters with one register pushed onto stack</div><div class='del'>-</div><div class='del'>-#define in_blk    8  // input byte array address parameter</div><div class='del'>-#define out_blk  12  // output byte array address parameter</div><div class='del'>-#define ctx      16  // AES context structure</div><div class='add'>+#define tlen 1024   // length of each of 4 'xor' arrays (256 32-bit words)</div><div class='ctx'> </div><div class='del'>-// offsets in context structure</div><div class='add'>+/* offsets to parameters with one register pushed onto stack */</div><div class='add'>+#define tfm 8</div><div class='add'>+#define out_blk 12</div><div class='add'>+#define in_blk 16</div><div class='ctx'> </div><div class='del'>-#define ekey     0   // encryption key schedule base address</div><div class='del'>-#define nrnd   256   // number of rounds</div><div class='del'>-#define dkey   260   // decryption key schedule base address</div><div class='add'>+/* offsets in crypto_tfm structure */</div><div class='add'>+#define ekey (crypto_tfm_ctx_offset + 0)</div><div class='add'>+#define nrnd (crypto_tfm_ctx_offset + 256)</div><div class='add'>+#define dkey (crypto_tfm_ctx_offset + 260)</div><div class='ctx'> </div><div class='ctx'> // register mapping for encrypt and decrypt subroutines</div><div class='ctx'> </div><div class='hunk'>@@ -220,6 +217,7 @@</div><div class='ctx'> 	do_col (table, r5,r0,r1,r4, r2,r3);		/* idx=r5 */</div><div class='ctx'> </div><div class='ctx'> // AES (Rijndael) Encryption Subroutine</div><div class='add'>+/* void aes_enc_blk(struct crypto_tfm *tfm, u8 *out_blk, const u8 *in_blk) */</div><div class='ctx'> </div><div class='ctx'> .global  aes_enc_blk</div><div class='ctx'> </div><div class='hunk'>@@ -230,7 +228,7 @@</div><div class='ctx'> </div><div class='ctx'> aes_enc_blk:</div><div class='ctx'> 	push    %ebp</div><div class='del'>-	mov     ctx(%esp),%ebp      // pointer to context</div><div class='add'>+	mov     tfm(%esp),%ebp</div><div class='ctx'> </div><div class='ctx'> // CAUTION: the order and the values used in these assigns </div><div class='ctx'> // rely on the register mappings</div><div class='hunk'>@@ -295,6 +293,7 @@ aes_enc_blk:</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> // AES (Rijndael) Decryption Subroutine</div><div class='add'>+/* void aes_dec_blk(struct crypto_tfm *tfm, u8 *out_blk, const u8 *in_blk) */</div><div class='ctx'> </div><div class='ctx'> .global  aes_dec_blk</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +304,7 @@ aes_enc_blk:</div><div class='ctx'> </div><div class='ctx'> aes_dec_blk:</div><div class='ctx'> 	push    %ebp</div><div class='del'>-	mov     ctx(%esp),%ebp       // pointer to context</div><div class='add'>+	mov     tfm(%esp),%ebp</div><div class='ctx'> </div><div class='ctx'> // CAUTION: the order and the values used in these assigns </div><div class='ctx'> // rely on the register mappings</div><div class='head'>diff --git a/arch/i386/crypto/aes.c b/arch/i386/crypto/aes.c<br/>index a50397b1d5c7..d3806daa3de3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/crypto/aes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/crypto/aes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/crypto/aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/crypto/aes.c</a></div><div class='hunk'>@@ -45,8 +45,8 @@</div><div class='ctx'> #include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='del'>-asmlinkage void aes_enc_blk(const u8 *src, u8 *dst, void *ctx);</div><div class='del'>-asmlinkage void aes_dec_blk(const u8 *src, u8 *dst, void *ctx);</div><div class='add'>+asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src);</div><div class='add'>+asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src);</div><div class='ctx'> </div><div class='ctx'> #define AES_MIN_KEY_SIZE	16</div><div class='ctx'> #define AES_MAX_KEY_SIZE	32</div><div class='hunk'>@@ -378,12 +378,12 @@ static void gen_tabs(void)</div><div class='ctx'> 	k[8*(i)+11] = ss[3];						\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)</div><div class='add'>+static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 ss[8];</div><div class='del'>-	struct aes_ctx *ctx = ctx_arg;</div><div class='add'>+	struct aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> </div><div class='ctx'> 	/* encryption schedule */</div><div class='hunk'>@@ -464,16 +464,16 @@ aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void aes_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	aes_enc_blk(src, dst, ctx);</div><div class='add'>+	aes_enc_blk(tfm, dst, src);</div><div class='ctx'> }</div><div class='del'>-static inline void aes_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	aes_dec_blk(src, dst, ctx);</div><div class='add'>+	aes_dec_blk(tfm, dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct crypto_alg aes_alg = {</div><div class='ctx'> 	.cra_name		=	"aes",</div><div class='ctx'> 	.cra_driver_name	=	"aes-i586",</div><div class='head'>diff --git a/arch/i386/defconfig b/arch/i386/defconfig<br/>index 1629c3ac9bee..89ebb7a316ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/defconfig</a></div><div class='hunk'>@@ -197,7 +197,7 @@ CONFIG_PM=y</div><div class='ctx'> # CONFIG_PM_LEGACY is not set</div><div class='ctx'> # CONFIG_PM_DEBUG is not set</div><div class='ctx'> CONFIG_SOFTWARE_SUSPEND=y</div><div class='del'>-CONFIG_PM_STD_PARTITION="/dev/hda2"</div><div class='add'>+CONFIG_PM_STD_PARTITION=""</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ACPI (Advanced Configuration and Power Interface) Support</div><div class='head'>diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile<br/>index 96fb8a020af2..1b452a1665c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/Makefile</a></div><div class='hunk'>@@ -7,10 +7,10 @@ extra-y := head.o init_task.o vmlinux.lds</div><div class='ctx'> obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \</div><div class='ctx'> 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \</div><div class='ctx'> 		pci-dma.o i386_ksyms.o i387.o bootflag.o \</div><div class='del'>-		quirks.o i8237.o topology.o alternative.o</div><div class='add'>+		quirks.o i8237.o topology.o alternative.o i8253.o tsc.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_STACKTRACE)	+= stacktrace.o</div><div class='ctx'> obj-y				+= cpu/</div><div class='del'>-obj-y				+= timers/</div><div class='ctx'> obj-y				+= acpi/</div><div class='ctx'> obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o</div><div class='ctx'> obj-$(CONFIG_MCA)		+= mca.o</div><div class='hunk'>@@ -37,6 +37,9 @@ obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o</div><div class='ctx'> obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o</div><div class='ctx'> obj-$(CONFIG_VM86)		+= vm86.o</div><div class='ctx'> obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o</div><div class='add'>+obj-$(CONFIG_HPET_TIMER) 	+= hpet.o</div><div class='add'>+obj-$(CONFIG_K8_NB)		+= k8.o</div><div class='add'>+obj-$(CONFIG_AUDIT)		+= audit.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_AFLAGS   := -traditional</div><div class='ctx'> </div><div class='hunk'>@@ -76,3 +79,6 @@ SYSCFLAGS_vsyscall-syms.o = -r</div><div class='ctx'> $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \</div><div class='ctx'> 			$(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE</div><div class='ctx'> 	$(call if_changed,syscall)</div><div class='add'>+</div><div class='add'>+k8-y                      += ../../x86_64/kernel/k8.o</div><div class='add'>+</div><div class='head'>diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c<br/>index 40e5aba3ad3d..0db6387025ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/boot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/boot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/boot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/acpi/boot.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -202,6 +201,8 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> 		if (mcfg-&gt;config[i].base_reserved) {</div><div class='ctx'> 			printk(KERN_ERR PREFIX</div><div class='ctx'> 			       "MMCONFIG not in low 4GB of memory\n");</div><div class='add'>+			kfree(pci_mmcfg_config);</div><div class='add'>+			pci_mmcfg_config_num = 0;</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -215,7 +216,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_madt *madt = NULL;</div><div class='ctx'> </div><div class='del'>-	if (!phys_addr || !size)</div><div class='add'>+	if (!phys_addr || !size || !cpu_has_apic)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);</div><div class='hunk'>@@ -621,9 +622,9 @@ extern u32 pmtmr_ioport;</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	struct fadt_descriptor_rev2 *fadt = NULL;</div><div class='add'>+	struct fadt_descriptor *fadt = NULL;</div><div class='ctx'> </div><div class='del'>-	fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size);</div><div class='add'>+	fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);</div><div class='ctx'> 	if (!fadt) {</div><div class='ctx'> 		printk(KERN_WARNING PREFIX "Unable to map FADT\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -754,7 +755,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cpu_has_apic)</div><div class='add'>+	if (!cpu_has_apic) </div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c<br/>index 2e3b643a4dc4..1649a175a206 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/earlyquirk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/earlyquirk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/earlyquirk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/acpi/earlyquirk.c</a></div><div class='hunk'>@@ -5,17 +5,34 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/pci-direct.h&gt;</div><div class='ctx'> #include &lt;asm/acpi.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+</div><div class='add'>+static int nvidia_hpet_detected __initdata;</div><div class='add'>+</div><div class='add'>+static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	nvidia_hpet_detected = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int __init check_bridge(int vendor, int device)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-	/* According to Nvidia all timer overrides are bogus. Just ignore</div><div class='del'>-	   them all. */</div><div class='add'>+	/* According to Nvidia all timer overrides are bogus unless HPET</div><div class='add'>+	   is enabled. */</div><div class='ctx'> 	if (vendor == PCI_VENDOR_ID_NVIDIA) {</div><div class='del'>-		acpi_skip_timer_override = 1;</div><div class='add'>+		nvidia_hpet_detected = 0;</div><div class='add'>+		acpi_table_parse(ACPI_HPET, nvidia_hpet_check);</div><div class='add'>+		if (nvidia_hpet_detected == 0) {</div><div class='add'>+			acpi_skip_timer_override = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (vendor == PCI_VENDOR_ID_ATI &amp;&amp; timer_over_8254 == 1) {</div><div class='head'>diff --git a/arch/i386/kernel/acpi/processor.c b/arch/i386/kernel/acpi/processor.c<br/>index 9f4cc02717ec..b54fded49834 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/processor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/processor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/processor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/acpi/processor.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)</div><div class='ctx'> 	buf[2] = ACPI_PDC_C_CAPABILITY_SMP;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_has(c, X86_FEATURE_EST))</div><div class='del'>-		buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;</div><div class='add'>+		buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;</div><div class='ctx'> </div><div class='ctx'> 	obj-&gt;type = ACPI_TYPE_BUFFER;</div><div class='ctx'> 	obj-&gt;buffer.length = 12;</div><div class='head'>diff --git a/arch/i386/kernel/acpi/sleep.c b/arch/i386/kernel/acpi/sleep.c<br/>index 1cb2b186a3af..4ee83577bf61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/sleep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/sleep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/sleep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/acpi/sleep.c</a></div><div class='hunk'>@@ -8,30 +8,17 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* address in low memory of the wakeup routine. */</div><div class='ctx'> unsigned long acpi_wakeup_address = 0;</div><div class='ctx'> unsigned long acpi_video_flags;</div><div class='ctx'> extern char wakeup_start, wakeup_end;</div><div class='ctx'> </div><div class='del'>-extern void zap_low_mappings(void);</div><div class='del'>-</div><div class='ctx'> extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));</div><div class='ctx'> </div><div class='del'>-static void init_low_mapping(pgd_t * pgd, int pgd_limit)</div><div class='del'>-{</div><div class='del'>-	int pgd_ofs = 0;</div><div class='del'>-</div><div class='del'>-	while ((pgd_ofs &lt; pgd_limit)</div><div class='del'>-	       &amp;&amp; (pgd_ofs + USER_PTRS_PER_PGD &lt; PTRS_PER_PGD)) {</div><div class='del'>-		set_pgd(pgd, *(pgd + USER_PTRS_PER_PGD));</div><div class='del'>-		pgd_ofs++, pgd++;</div><div class='del'>-	}</div><div class='del'>-	flush_tlb_all();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * acpi_save_state_mem - save kernel state</div><div class='ctx'>  *</div><div class='hunk'>@@ -42,7 +29,6 @@ int acpi_save_state_mem(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!acpi_wakeup_address)</div><div class='ctx'> 		return 1;</div><div class='del'>-	init_low_mapping(swapper_pg_dir, USER_PTRS_PER_PGD);</div><div class='ctx'> 	memcpy((void *)acpi_wakeup_address, &amp;wakeup_start,</div><div class='ctx'> 	       &amp;wakeup_end - &amp;wakeup_start);</div><div class='ctx'> 	acpi_copy_wakeup_routine(acpi_wakeup_address);</div><div class='hunk'>@@ -55,7 +41,6 @@ int acpi_save_state_mem(void)</div><div class='ctx'>  */</div><div class='ctx'> void acpi_restore_state_mem(void)</div><div class='ctx'> {</div><div class='del'>-	zap_low_mappings();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S<br/>index 7c74fe0dc93c..9f408eee4e6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/wakeup.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/acpi/wakeup.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/acpi/wakeup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/acpi/wakeup.S</a></div><div class='hunk'>@@ -56,7 +56,7 @@ wakeup_code:</div><div class='ctx'> 1:</div><div class='ctx'> </div><div class='ctx'> 	# set up page table</div><div class='del'>-	movl	$swapper_pg_dir-__PAGE_OFFSET, %eax</div><div class='add'>+	movl	$swsusp_pg_dir-__PAGE_OFFSET, %eax</div><div class='ctx'> 	movl	%eax, %cr3</div><div class='ctx'> </div><div class='ctx'> 	testl	$1, real_efer_save_restore - wakeup_code</div><div class='hunk'>@@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)</div><div class='ctx'> 	movl	$0x12345678, saved_magic</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='del'>-.data</div><div class='del'>-ALIGN</div><div class='del'>-ENTRY(saved_magic)	.long	0</div><div class='del'>-ENTRY(saved_eip)	.long	0</div><div class='del'>-</div><div class='ctx'> save_registers:</div><div class='ctx'> 	leal	4(%esp), %eax</div><div class='ctx'> 	movl	%eax, saved_context_esp</div><div class='hunk'>@@ -304,7 +299,11 @@ ret_point:</div><div class='ctx'> 	call	restore_processor_state</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='add'>+.data</div><div class='ctx'> ALIGN</div><div class='add'>+ENTRY(saved_magic)	.long	0</div><div class='add'>+ENTRY(saved_eip)	.long	0</div><div class='add'>+</div><div class='ctx'> # saved registers</div><div class='ctx'> saved_gdt:	.long	0,0</div><div class='ctx'> saved_idt:	.long	0,0</div><div class='head'>diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c<br/>index 5cbd6f99fb2a..28ab80649764 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/alternative.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/alternative.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/alternative.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/alternative.c</a></div><div class='hunk'>@@ -4,27 +4,41 @@</div><div class='ctx'> #include &lt;asm/alternative.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DEBUG 0</div><div class='del'>-#if DEBUG</div><div class='del'>-# define DPRINTK(fmt, args...) printk(fmt, args)</div><div class='del'>-#else</div><div class='del'>-# define DPRINTK(fmt, args...)</div><div class='del'>-#endif</div><div class='add'>+static int no_replacement    = 0;</div><div class='add'>+static int smp_alt_once      = 0;</div><div class='add'>+static int debug_alternative = 0;</div><div class='add'>+</div><div class='add'>+static int __init noreplacement_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	no_replacement = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+static int __init bootonly(char *str)</div><div class='add'>+{</div><div class='add'>+	smp_alt_once = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+static int __init debug_alt(char *str)</div><div class='add'>+{</div><div class='add'>+	debug_alternative = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("noreplacement", noreplacement_setup);</div><div class='add'>+__setup("smp-alt-boot", bootonly);</div><div class='add'>+__setup("debug-alternative", debug_alt);</div><div class='add'>+</div><div class='add'>+#define DPRINTK(fmt, args...) if (debug_alternative) \</div><div class='add'>+	printk(KERN_DEBUG fmt, args)</div><div class='ctx'> </div><div class='add'>+#ifdef GENERIC_NOP1</div><div class='ctx'> /* Use inline assembly to define this because the nops are defined</div><div class='ctx'>    as inline assembly strings in the include files and we cannot</div><div class='ctx'>    get them easily into strings. */</div><div class='ctx'> asm("\t.data\nintelnops: "</div><div class='ctx'> 	GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6</div><div class='ctx'> 	GENERIC_NOP7 GENERIC_NOP8);</div><div class='del'>-asm("\t.data\nk8nops: "</div><div class='del'>-	K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6</div><div class='del'>-	K8_NOP7 K8_NOP8);</div><div class='del'>-asm("\t.data\nk7nops: "</div><div class='del'>-	K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6</div><div class='del'>-	K7_NOP7 K7_NOP8);</div><div class='del'>-</div><div class='del'>-extern unsigned char intelnops[], k8nops[], k7nops[];</div><div class='add'>+extern unsigned char intelnops[];</div><div class='ctx'> static unsigned char *intel_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> 	intelnops,</div><div class='hunk'>@@ -36,6 +50,13 @@ static unsigned char *intel_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> 	intelnops + 1 + 2 + 3 + 4 + 5 + 6,</div><div class='ctx'> 	intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef K8_NOP1</div><div class='add'>+asm("\t.data\nk8nops: "</div><div class='add'>+	K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6</div><div class='add'>+	K8_NOP7 K8_NOP8);</div><div class='add'>+extern unsigned char k8nops[];</div><div class='ctx'> static unsigned char *k8_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> 	k8nops,</div><div class='hunk'>@@ -47,6 +68,13 @@ static unsigned char *k8_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> 	k8nops + 1 + 2 + 3 + 4 + 5 + 6,</div><div class='ctx'> 	k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef K7_NOP1</div><div class='add'>+asm("\t.data\nk7nops: "</div><div class='add'>+	K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6</div><div class='add'>+	K7_NOP7 K7_NOP8);</div><div class='add'>+extern unsigned char k7nops[];</div><div class='ctx'> static unsigned char *k7_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> 	NULL,</div><div class='ctx'> 	k7nops,</div><div class='hunk'>@@ -58,6 +86,18 @@ static unsigned char *k7_nops[ASM_NOP_MAX+1] = {</div><div class='ctx'> 	k7nops + 1 + 2 + 3 + 4 + 5 + 6,</div><div class='ctx'> 	k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+</div><div class='add'>+extern char __vsyscall_0;</div><div class='add'>+static inline unsigned char** find_nop_table(void)</div><div class='add'>+{</div><div class='add'>+	return k8_nops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_X86_64 */</div><div class='add'>+</div><div class='ctx'> static struct nop {</div><div class='ctx'> 	int cpuid;</div><div class='ctx'> 	unsigned char **noptable;</div><div class='hunk'>@@ -67,14 +107,6 @@ static struct nop {</div><div class='ctx'> 	{ -1, NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-extern struct alt_instr __alt_instructions[], __alt_instructions_end[];</div><div class='del'>-extern struct alt_instr __smp_alt_instructions[], __smp_alt_instructions_end[];</div><div class='del'>-extern u8 *__smp_locks[], *__smp_locks_end[];</div><div class='del'>-</div><div class='del'>-extern u8 __smp_alt_begin[], __smp_alt_end[];</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static unsigned char** find_nop_table(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char **noptable = intel_nops;</div><div class='hunk'>@@ -89,6 +121,14 @@ static unsigned char** find_nop_table(void)</div><div class='ctx'> 	return noptable;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_X86_64 */</div><div class='add'>+</div><div class='add'>+extern struct alt_instr __alt_instructions[], __alt_instructions_end[];</div><div class='add'>+extern struct alt_instr __smp_alt_instructions[], __smp_alt_instructions_end[];</div><div class='add'>+extern u8 *__smp_locks[], *__smp_locks_end[];</div><div class='add'>+</div><div class='add'>+extern u8 __smp_alt_begin[], __smp_alt_end[];</div><div class='add'>+</div><div class='ctx'> /* Replace instructions with better alternatives for this CPU type.</div><div class='ctx'>    This runs before SMP is initialized to avoid SMP problems with</div><div class='ctx'>    self modifying code. This implies that assymetric systems where</div><div class='hunk'>@@ -99,6 +139,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char **noptable = find_nop_table();</div><div class='ctx'> 	struct alt_instr *a;</div><div class='add'>+	u8 *instr;</div><div class='ctx'> 	int diff, i, k;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("%s: alt table %p -&gt; %p\n", __FUNCTION__, start, end);</div><div class='hunk'>@@ -106,7 +147,16 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)</div><div class='ctx'> 		BUG_ON(a-&gt;replacementlen &gt; a-&gt;instrlen);</div><div class='ctx'> 		if (!boot_cpu_has(a-&gt;cpuid))</div><div class='ctx'> 			continue;</div><div class='del'>-		memcpy(a-&gt;instr, a-&gt;replacement, a-&gt;replacementlen);</div><div class='add'>+		instr = a-&gt;instr;</div><div class='add'>+#ifdef CONFIG_X86_64</div><div class='add'>+		/* vsyscall code is not mapped yet. resolve it manually. */</div><div class='add'>+		if (instr &gt;= (u8 *)VSYSCALL_START &amp;&amp; instr &lt; (u8*)VSYSCALL_END) {</div><div class='add'>+			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&amp;__vsyscall_0));</div><div class='add'>+			DPRINTK("%s: vsyscall fixup: %p =&gt; %p\n",</div><div class='add'>+				__FUNCTION__, a-&gt;instr, instr);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		memcpy(instr, a-&gt;replacement, a-&gt;replacementlen);</div><div class='ctx'> 		diff = a-&gt;instrlen - a-&gt;replacementlen;</div><div class='ctx'> 		/* Pad the rest with nops */</div><div class='ctx'> 		for (i = a-&gt;replacementlen; diff &gt; 0; diff -= k, i += k) {</div><div class='hunk'>@@ -118,6 +168,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+</div><div class='ctx'> static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end)</div><div class='ctx'> {</div><div class='ctx'> 	struct alt_instr *a;</div><div class='hunk'>@@ -186,14 +238,6 @@ struct smp_alt_module {</div><div class='ctx'> static LIST_HEAD(smp_alt_modules);</div><div class='ctx'> static DEFINE_SPINLOCK(smp_alt);</div><div class='ctx'> </div><div class='del'>-static int smp_alt_once = 0;</div><div class='del'>-static int __init bootonly(char *str)</div><div class='del'>-{</div><div class='del'>-	smp_alt_once = 1;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("smp-alt-boot", bootonly);</div><div class='del'>-</div><div class='ctx'> void alternatives_smp_module_add(struct module *mod, char *name,</div><div class='ctx'> 				 void *locks, void *locks_end,</div><div class='ctx'> 				 void *text,  void *text_end)</div><div class='hunk'>@@ -201,6 +245,9 @@ void alternatives_smp_module_add(struct module *mod, char *name,</div><div class='ctx'> 	struct smp_alt_module *smp;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (no_replacement)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (smp_alt_once) {</div><div class='ctx'> 		if (boot_cpu_has(X86_FEATURE_UP))</div><div class='ctx'> 			alternatives_smp_unlock(locks, locks_end,</div><div class='hunk'>@@ -235,7 +282,7 @@ void alternatives_smp_module_del(struct module *mod)</div><div class='ctx'> 	struct smp_alt_module *item;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (smp_alt_once)</div><div class='add'>+	if (no_replacement || smp_alt_once)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;smp_alt, flags);</div><div class='hunk'>@@ -256,7 +303,17 @@ void alternatives_smp_switch(int smp)</div><div class='ctx'> 	struct smp_alt_module *mod;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (smp_alt_once)</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	/*</div><div class='add'>+	 * A not yet fixed binutils section handling bug prevents</div><div class='add'>+	 * alternatives-replacement from working reliably, so turn</div><div class='add'>+	 * it off:</div><div class='add'>+	 */</div><div class='add'>+	printk("lockdep: not fixing up alternatives.\n");</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (no_replacement || smp_alt_once)</div><div class='ctx'> 		return;</div><div class='ctx'> 	BUG_ON(!smp &amp;&amp; (num_online_cpus() &gt; 1));</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +340,17 @@ void alternatives_smp_switch(int smp)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;smp_alt, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void __init alternative_instructions(void)</div><div class='ctx'> {</div><div class='add'>+	if (no_replacement) {</div><div class='add'>+		printk(KERN_INFO "(SMP-)alternatives turned off\n");</div><div class='add'>+		free_init_pages("SMP alternatives",</div><div class='add'>+				(unsigned long)__smp_alt_begin,</div><div class='add'>+				(unsigned long)__smp_alt_end);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	apply_alternatives(__alt_instructions, __alt_instructions_end);</div><div class='ctx'> </div><div class='ctx'> 	/* switch to patch-once-at-boottime-only mode and free the</div><div class='hunk'>@@ -297,6 +363,7 @@ void __init alternative_instructions(void)</div><div class='ctx'> 	smp_alt_once = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='ctx'> 	if (smp_alt_once) {</div><div class='ctx'> 		if (1 == num_possible_cpus()) {</div><div class='ctx'> 			printk(KERN_INFO "SMP alternatives: switching to UP code\n");</div><div class='hunk'>@@ -318,4 +385,5 @@ void __init alternative_instructions(void)</div><div class='ctx'> 					    _text, _etext);</div><div class='ctx'> 		alternatives_smp_switch(0);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c<br/>index 3d4b2f3d116a..8c844d07862f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/apic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/apic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/apic.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *	Mikael Pettersson	:	PM converted to driver model.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -36,6 +35,7 @@</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/hpet.h&gt;</div><div class='ctx'> #include &lt;asm/i8253.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> #include &lt;mach_apicdef.h&gt;</div><div class='hunk'>@@ -62,7 +62,7 @@ int apic_verbosity;</div><div class='ctx'> </div><div class='ctx'> static void apic_pm_activate(void);</div><div class='ctx'> </div><div class='del'>-int modern_apic(void)</div><div class='add'>+static int modern_apic(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int lvr, version;</div><div class='ctx'> 	/* AMD systems use old APIC versions, so check the CPU */</div><div class='hunk'>@@ -113,7 +113,7 @@ void __init apic_intr_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Using APIC to generate smp_local_timer_interrupt? */</div><div class='del'>-int using_apic_timer = 0;</div><div class='add'>+int using_apic_timer __read_mostly = 0;</div><div class='ctx'> </div><div class='ctx'> static int enabled_via_apicbase;</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +156,7 @@ void clear_local_APIC(void)</div><div class='ctx'> 	maxlvt = get_maxlvt();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Masking an LVT entry on a P6 can trigger a local APIC error</div><div class='add'>+	 * Masking an LVT entry can trigger a local APIC error</div><div class='ctx'> 	 * if the vector is zero. Mask LVTERR first to prevent this.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (maxlvt &gt;= 3) {</div><div class='hunk'>@@ -1117,7 +1117,18 @@ void disable_APIC_timer(void)</div><div class='ctx'> 		unsigned long v;</div><div class='ctx'> </div><div class='ctx'> 		v = apic_read(APIC_LVTT);</div><div class='del'>-		apic_write_around(APIC_LVTT, v | APIC_LVT_MASKED);</div><div class='add'>+		/*</div><div class='add'>+		 * When an illegal vector value (0-15) is written to an LVT</div><div class='add'>+		 * entry and delivery mode is Fixed, the APIC may signal an</div><div class='add'>+		 * illegal vector error, with out regard to whether the mask</div><div class='add'>+		 * bit is set or whether an interrupt is actually seen on input.</div><div class='add'>+		 *</div><div class='add'>+		 * Boot sequence might call this function when the LVTT has</div><div class='add'>+		 * '0' vector value. So make sure vector field is set to</div><div class='add'>+		 * valid value.</div><div class='add'>+		 */</div><div class='add'>+		v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);</div><div class='add'>+		apic_write_around(APIC_LVTT, v);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c<br/>index df0e1745f189..8591f2fa920c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/apm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/apm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/apm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/apm.c</a></div><div class='hunk'>@@ -201,7 +201,6 @@</div><div class='ctx'>  *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='hunk'>@@ -374,14 +373,14 @@ static struct {</div><div class='ctx'> 	unsigned short	segment;</div><div class='ctx'> }				apm_bios_entry;</div><div class='ctx'> static int			clock_slowed;</div><div class='del'>-static int			idle_threshold = DEFAULT_IDLE_THRESHOLD;</div><div class='del'>-static int			idle_period = DEFAULT_IDLE_PERIOD;</div><div class='add'>+static int			idle_threshold __read_mostly = DEFAULT_IDLE_THRESHOLD;</div><div class='add'>+static int			idle_period __read_mostly = DEFAULT_IDLE_PERIOD;</div><div class='ctx'> static int			set_pm_idle;</div><div class='ctx'> static int			suspends_pending;</div><div class='ctx'> static int			standbys_pending;</div><div class='ctx'> static int			ignore_sys_suspend;</div><div class='ctx'> static int			ignore_normal_resume;</div><div class='del'>-static int			bounce_interval = DEFAULT_BOUNCE_INTERVAL;</div><div class='add'>+static int			bounce_interval __read_mostly = DEFAULT_BOUNCE_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_APM_RTC_IS_GMT</div><div class='ctx'> #	define	clock_cmos_diff	0</div><div class='hunk'>@@ -390,8 +389,8 @@ static int			bounce_interval = DEFAULT_BOUNCE_INTERVAL;</div><div class='ctx'> static long			clock_cmos_diff;</div><div class='ctx'> static int			got_clock_diff;</div><div class='ctx'> #endif</div><div class='del'>-static int			debug;</div><div class='del'>-static int			smp;</div><div class='add'>+static int			debug __read_mostly;</div><div class='add'>+static int			smp __read_mostly;</div><div class='ctx'> static int			apm_disabled = -1;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static int			power_off;</div><div class='hunk'>@@ -403,8 +402,8 @@ static int			realmode_power_off = 1;</div><div class='ctx'> #else</div><div class='ctx'> static int			realmode_power_off;</div><div class='ctx'> #endif</div><div class='del'>-static int			exit_kapmd;</div><div class='del'>-static int			kapmd_running;</div><div class='add'>+static int			exit_kapmd __read_mostly;</div><div class='add'>+static int			kapmd_running __read_mostly;</div><div class='ctx'> #ifdef CONFIG_APM_ALLOW_INTS</div><div class='ctx'> static int			allow_ints = 1;</div><div class='ctx'> #else</div><div class='hunk'>@@ -416,15 +415,15 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);</div><div class='ctx'> static struct apm_user *	user_list;</div><div class='ctx'> static DEFINE_SPINLOCK(user_list_lock);</div><div class='del'>-static struct desc_struct	bad_bios_desc = { 0, 0x00409200 };</div><div class='add'>+static const struct desc_struct	bad_bios_desc = { 0, 0x00409200 };</div><div class='ctx'> </div><div class='del'>-static char			driver_version[] = "1.16ac";	/* no spaces */</div><div class='add'>+static const char		driver_version[] = "1.16ac";	/* no spaces */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	APM event names taken from the APM 1.2 specification. These are</div><div class='ctx'>  *	the message codes that the BIOS uses to tell us about events</div><div class='ctx'>  */</div><div class='del'>-static char *	apm_event_name[] = {</div><div class='add'>+static const char *	const apm_event_name[] = {</div><div class='ctx'> 	"system standby",</div><div class='ctx'> 	"system suspend",</div><div class='ctx'> 	"normal resume",</div><div class='hunk'>@@ -616,7 +615,7 @@ static u8 apm_bios_call(u32 func, u32 ebx_in, u32 ecx_in,</div><div class='ctx'>  *	@ecx_in: ECX register value for BIOS call</div><div class='ctx'>  *	@eax: EAX register on return from the BIOS call</div><div class='ctx'>  *</div><div class='del'>- *	Make a BIOS call that does only returns one value, or just status.</div><div class='add'>+ *	Make a BIOS call that returns one value only, or just status.</div><div class='ctx'>  *	If there is an error, then the error code is returned in AH</div><div class='ctx'>  *	(bits 8-15 of eax) and this function returns non-zero. This is</div><div class='ctx'>  *	used for simpler BIOS operations. This call may hold interrupts</div><div class='hunk'>@@ -764,9 +763,9 @@ static int apm_do_idle(void)</div><div class='ctx'> 	int	idled = 0;</div><div class='ctx'> 	int	polling;</div><div class='ctx'> </div><div class='del'>-	polling = test_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+	polling = !!(current_thread_info()-&gt;status &amp; TS_POLLING);</div><div class='ctx'> 	if (polling) {</div><div class='del'>-		clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status &amp;= ~TS_POLLING;</div><div class='ctx'> 		smp_mb__after_clear_bit();</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!need_resched()) {</div><div class='hunk'>@@ -774,7 +773,7 @@ static int apm_do_idle(void)</div><div class='ctx'> 		ret = apm_bios_call_simple(APM_FUNC_IDLE, 0, 0, &amp;eax);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (polling)</div><div class='del'>-		set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> </div><div class='ctx'> 	if (!idled)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -822,7 +821,7 @@ static void apm_do_busy(void)</div><div class='ctx'> #define IDLE_CALC_LIMIT   (HZ * 100)</div><div class='ctx'> #define IDLE_LEAKY_MAX    16</div><div class='ctx'> </div><div class='del'>-static void (*original_pm_idle)(void);</div><div class='add'>+static void (*original_pm_idle)(void) __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * apm_cpu_idle		-	cpu idling for APM capable Linux</div><div class='hunk'>@@ -1063,7 +1062,8 @@ static int apm_engage_power_management(u_short device, int enable)</div><div class='ctx'>  </div><div class='ctx'> static int apm_console_blank(int blank)</div><div class='ctx'> {</div><div class='del'>-	int error, i;</div><div class='add'>+	int error = APM_NOT_ENGAGED; /* silence gcc */</div><div class='add'>+	int i;</div><div class='ctx'> 	u_short state;</div><div class='ctx'> 	static const u_short dev[3] = { 0x100, 0x1FF, 0x101 };</div><div class='ctx'> </div><div class='hunk'>@@ -1104,7 +1104,8 @@ static int queue_empty(struct apm_user *as)</div><div class='ctx'> </div><div class='ctx'> static apm_event_t get_queued_event(struct apm_user *as)</div><div class='ctx'> {</div><div class='del'>-	as-&gt;event_tail = (as-&gt;event_tail + 1) % APM_MAX_EVENTS;</div><div class='add'>+	if (++as-&gt;event_tail &gt;= APM_MAX_EVENTS)</div><div class='add'>+		as-&gt;event_tail = 0;</div><div class='ctx'> 	return as-&gt;events[as-&gt;event_tail];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1118,13 +1119,16 @@ static void queue_event(apm_event_t event, struct apm_user *sender)</div><div class='ctx'> 	for (as = user_list; as != NULL; as = as-&gt;next) {</div><div class='ctx'> 		if ((as == sender) || (!as-&gt;reader))</div><div class='ctx'> 			continue;</div><div class='del'>-		as-&gt;event_head = (as-&gt;event_head + 1) % APM_MAX_EVENTS;</div><div class='add'>+		if (++as-&gt;event_head &gt;= APM_MAX_EVENTS)</div><div class='add'>+			as-&gt;event_head = 0;</div><div class='add'>+</div><div class='ctx'> 		if (as-&gt;event_head == as-&gt;event_tail) {</div><div class='ctx'> 			static int notified;</div><div class='ctx'> </div><div class='ctx'> 			if (notified++ == 0)</div><div class='ctx'> 			    printk(KERN_ERR "apm: an event queue overflowed\n");</div><div class='del'>-			as-&gt;event_tail = (as-&gt;event_tail + 1) % APM_MAX_EVENTS;</div><div class='add'>+			if (++as-&gt;event_tail &gt;= APM_MAX_EVENTS)</div><div class='add'>+				as-&gt;event_tail = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		as-&gt;events[as-&gt;event_head] = event;</div><div class='ctx'> 		if ((!as-&gt;suser) || (!as-&gt;writer))</div><div class='hunk'>@@ -1282,7 +1286,7 @@ static void standby(void)</div><div class='ctx'> static apm_event_t get_event(void)</div><div class='ctx'> {</div><div class='ctx'> 	int		error;</div><div class='del'>-	apm_event_t	event;</div><div class='add'>+	apm_event_t	event = APM_NO_EVENTS; /* silence gcc */</div><div class='ctx'> 	apm_eventinfo_t	info;</div><div class='ctx'> </div><div class='ctx'> 	static int notified;</div><div class='head'>diff --git a/arch/i386/kernel/asm-offsets.c b/arch/i386/kernel/asm-offsets.c<br/>index 36d66e2077d0..c80271f8f084 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  * to extract and format the required data.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='hunk'>@@ -13,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/elf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DEFINE(sym, val) \</div><div class='ctx'>         asm volatile("\n-&gt;" #sym " %0 " #val : : "i" (val))</div><div class='hunk'>@@ -53,6 +55,7 @@ void foo(void)</div><div class='ctx'> 	OFFSET(TI_preempt_count, thread_info, preempt_count);</div><div class='ctx'> 	OFFSET(TI_addr_limit, thread_info, addr_limit);</div><div class='ctx'> 	OFFSET(TI_restart_block, thread_info, restart_block);</div><div class='add'>+	OFFSET(TI_sysenter_return, thread_info, sysenter_return);</div><div class='ctx'> 	BLANK();</div><div class='ctx'> </div><div class='ctx'> 	OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);</div><div class='hunk'>@@ -68,5 +71,7 @@ void foo(void)</div><div class='ctx'> 		 sizeof(struct tss_struct));</div><div class='ctx'> </div><div class='ctx'> 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);</div><div class='del'>-	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));</div><div class='add'>+	DEFINE(VDSO_PRELINK, VDSO_PRELINK);</div><div class='add'>+</div><div class='add'>+	OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/i386/kernel/audit.c b/arch/i386/kernel/audit.c<br/>new file mode 100644<br/>index 000000000000..5a53c6f371ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/audit.c</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/audit.h&gt;</div><div class='add'>+#include &lt;asm/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+static unsigned dir_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_dir_write.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned chattr_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_change_attr.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init audit_classes_init(void)</div><div class='add'>+{</div><div class='add'>+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);</div><div class='add'>+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__initcall(audit_classes_init);</div><div class='head'>diff --git a/arch/i386/kernel/bootflag.c b/arch/i386/kernel/bootflag.c<br/>index 4c30ed01f4e1..0b9860530a6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/bootflag.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/bootflag.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/bootflag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/bootflag.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c<br/>index 786d1a57048b..e6a2d6b80cda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/amd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/amd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/amd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/amd.c</a></div><div class='hunk'>@@ -224,22 +224,26 @@ static void __init init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_HT</div><div class='ctx'> 	/*</div><div class='del'>-	 * On a AMD dual core setup the lower bits of the APIC id</div><div class='del'>-	 * distingush the cores.  Assumes number of cores is a power</div><div class='del'>-	 * of two.</div><div class='add'>+	 * On a AMD multi core setup the lower bits of the APIC id</div><div class='add'>+	 * distingush the cores.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (c-&gt;x86_max_cores &gt; 1) {</div><div class='ctx'> 		int cpu = smp_processor_id();</div><div class='del'>-		unsigned bits = 0;</div><div class='del'>-		while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='del'>-			bits++;</div><div class='del'>-		cpu_core_id[cpu] = phys_proc_id[cpu] &amp; ((1&lt;&lt;bits)-1);</div><div class='del'>-		phys_proc_id[cpu] &gt;&gt;= bits;</div><div class='add'>+		unsigned bits = (cpuid_ecx(0x80000008) &gt;&gt; 12) &amp; 0xf;</div><div class='add'>+</div><div class='add'>+		if (bits == 0) {</div><div class='add'>+			while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='add'>+				bits++;</div><div class='add'>+		}</div><div class='add'>+		c-&gt;cpu_core_id = c-&gt;phys_proc_id &amp; ((1&lt;&lt;bits)-1);</div><div class='add'>+		c-&gt;phys_proc_id &gt;&gt;= bits;</div><div class='ctx'> 		printk(KERN_INFO "CPU %d(%d) -&gt; Core %d\n",</div><div class='del'>-		       cpu, c-&gt;x86_max_cores, cpu_core_id[cpu]);</div><div class='add'>+		       cpu, c-&gt;x86_max_cores, c-&gt;cpu_core_id);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (cpuid_eax(0x80000000) &gt;= 0x80000006)</div><div class='add'>+		num_cache_leaves = 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)</div><div class='head'>diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c<br/>index a06a49075f10..70c87de582c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/common.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/mtrr.h&gt;</div><div class='add'>+#include &lt;asm/mce.h&gt;</div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='hunk'>@@ -292,7 +294,7 @@ void __cpuinit generic_identify(struct cpuinfo_x86 * c)</div><div class='ctx'> 			if (c-&gt;x86 &gt;= 0x6)</div><div class='ctx'> 				c-&gt;x86_model += ((tfms &gt;&gt; 16) &amp; 0xF) &lt;&lt; 4;</div><div class='ctx'> 			c-&gt;x86_mask = tfms &amp; 15;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='ctx'> 			c-&gt;apicid = phys_pkg_id((ebx &gt;&gt; 24) &amp; 0xFF, 0);</div><div class='ctx'> #else</div><div class='ctx'> 			c-&gt;apicid = (ebx &gt;&gt; 24) &amp; 0xFF;</div><div class='hunk'>@@ -317,7 +319,7 @@ void __cpuinit generic_identify(struct cpuinfo_x86 * c)</div><div class='ctx'> 	early_intel_workaround(c);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_HT</div><div class='del'>-	phys_proc_id[smp_processor_id()] = (cpuid_ebx(1) &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	c-&gt;phys_proc_id = (cpuid_ebx(1) &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,11 +477,9 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> 	u32 	eax, ebx, ecx, edx;</div><div class='ctx'> 	int 	index_msb, core_bits;</div><div class='del'>-	int 	cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	cpuid(1, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (!cpu_has(c, X86_FEATURE_HT) || cpu_has(c, X86_FEATURE_CMP_LEGACY))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -490,16 +490,17 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> 	} else if (smp_num_siblings &gt; 1 ) {</div><div class='ctx'> </div><div class='ctx'> 		if (smp_num_siblings &gt; NR_CPUS) {</div><div class='del'>-			printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", smp_num_siblings);</div><div class='add'>+			printk(KERN_WARNING "CPU: Unsupported number of the "</div><div class='add'>+					"siblings %d", smp_num_siblings);</div><div class='ctx'> 			smp_num_siblings = 1;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		index_msb = get_count_order(smp_num_siblings);</div><div class='del'>-		phys_proc_id[cpu] = phys_pkg_id((ebx &gt;&gt; 24) &amp; 0xFF, index_msb);</div><div class='add'>+		c-&gt;phys_proc_id = phys_pkg_id((ebx &gt;&gt; 24) &amp; 0xFF, index_msb);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",</div><div class='del'>-		       phys_proc_id[cpu]);</div><div class='add'>+		       c-&gt;phys_proc_id);</div><div class='ctx'> </div><div class='ctx'> 		smp_num_siblings = smp_num_siblings / c-&gt;x86_max_cores;</div><div class='ctx'> </div><div class='hunk'>@@ -507,12 +508,12 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 		core_bits = get_count_order(c-&gt;x86_max_cores);</div><div class='ctx'> </div><div class='del'>-		cpu_core_id[cpu] = phys_pkg_id((ebx &gt;&gt; 24) &amp; 0xFF, index_msb) &amp;</div><div class='add'>+		c-&gt;cpu_core_id = phys_pkg_id((ebx &gt;&gt; 24) &amp; 0xFF, index_msb) &amp;</div><div class='ctx'> 					       ((1 &lt;&lt; core_bits) - 1);</div><div class='ctx'> </div><div class='ctx'> 		if (c-&gt;x86_max_cores &gt; 1)</div><div class='ctx'> 			printk(KERN_INFO  "CPU: Processor Core ID: %d\n",</div><div class='del'>-			       cpu_core_id[cpu]);</div><div class='add'>+			       c-&gt;cpu_core_id);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -611,6 +612,12 @@ void __cpuinit cpu_init(void)</div><div class='ctx'> 		set_in_cr4(X86_CR4_TSD);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* The CPU hotplug case */</div><div class='add'>+	if (cpu_gdt_descr-&gt;address) {</div><div class='add'>+		gdt = (struct desc_struct *)cpu_gdt_descr-&gt;address;</div><div class='add'>+		memset(gdt, 0, PAGE_SIZE);</div><div class='add'>+		goto old_gdt;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a horrible hack to allocate the GDT.  The problem</div><div class='ctx'> 	 * is that cpu_init() is called really early for the boot CPU</div><div class='hunk'>@@ -629,7 +636,7 @@ void __cpuinit cpu_init(void)</div><div class='ctx'> 				local_irq_enable();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+old_gdt:</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize the per-CPU GDT with the boot GDT,</div><div class='ctx'> 	 * and set up the GDT descriptor:</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c<br/>index 3852d0a4c1b5..567b39bea07e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -48,12 +47,13 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct cpufreq_acpi_io {</div><div class='del'>-	struct acpi_processor_performance	acpi_data;</div><div class='add'>+	struct acpi_processor_performance	*acpi_data;</div><div class='ctx'> 	struct cpufreq_frequency_table		*freq_table;</div><div class='ctx'> 	unsigned int				resume;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cpufreq_acpi_io	*acpi_io_data[NR_CPUS];</div><div class='add'>+static struct acpi_processor_performance	*acpi_perf_data[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> static struct cpufreq_driver acpi_cpufreq_driver;</div><div class='ctx'> </div><div class='hunk'>@@ -104,64 +104,43 @@ acpi_processor_set_performance (</div><div class='ctx'> {</div><div class='ctx'> 	u16			port = 0;</div><div class='ctx'> 	u8			bit_width = 0;</div><div class='add'>+	int			i = 0;</div><div class='ctx'> 	int			ret = 0;</div><div class='ctx'> 	u32			value = 0;</div><div class='del'>-	int			i = 0;</div><div class='del'>-	struct cpufreq_freqs    cpufreq_freqs;</div><div class='del'>-	cpumask_t		saved_mask;</div><div class='ctx'> 	int			retval;</div><div class='add'>+	struct acpi_processor_performance	*perf;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("acpi_processor_set_performance\n");</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * TBD: Use something other than set_cpus_allowed.</div><div class='del'>-	 * As set_cpus_allowed is a bit racy, </div><div class='del'>-	 * with any other set_cpus_allowed for this process.</div><div class='del'>-	 */</div><div class='del'>-	saved_mask = current-&gt;cpus_allowed;</div><div class='del'>-	set_cpus_allowed(current, cpumask_of_cpu(cpu));</div><div class='del'>-	if (smp_processor_id() != cpu) {</div><div class='del'>-		return (-EAGAIN);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (state == data-&gt;acpi_data.state) {</div><div class='add'>+	retval = 0;</div><div class='add'>+	perf = data-&gt;acpi_data;	</div><div class='add'>+	if (state == perf-&gt;state) {</div><div class='ctx'> 		if (unlikely(data-&gt;resume)) {</div><div class='ctx'> 			dprintk("Called after resume, resetting to P%d\n", state);</div><div class='ctx'> 			data-&gt;resume = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dprintk("Already at target state (P%d)\n", state);</div><div class='del'>-			retval = 0;</div><div class='del'>-			goto migrate_end;</div><div class='add'>+			return (retval);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dprintk("Transitioning from P%d to P%d\n",</div><div class='del'>-		data-&gt;acpi_data.state, state);</div><div class='del'>-</div><div class='del'>-	/* cpufreq frequency struct */</div><div class='del'>-	cpufreq_freqs.cpu = cpu;</div><div class='del'>-	cpufreq_freqs.old = data-&gt;freq_table[data-&gt;acpi_data.state].frequency;</div><div class='del'>-	cpufreq_freqs.new = data-&gt;freq_table[state].frequency;</div><div class='del'>-</div><div class='del'>-	/* notify cpufreq */</div><div class='del'>-	cpufreq_notify_transition(&amp;cpufreq_freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+	dprintk("Transitioning from P%d to P%d\n", perf-&gt;state, state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First we write the target state's 'control' value to the</div><div class='ctx'> 	 * control_register.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	port = data-&gt;acpi_data.control_register.address;</div><div class='del'>-	bit_width = data-&gt;acpi_data.control_register.bit_width;</div><div class='del'>-	value = (u32) data-&gt;acpi_data.states[state].control;</div><div class='add'>+	port = perf-&gt;control_register.address;</div><div class='add'>+	bit_width = perf-&gt;control_register.bit_width;</div><div class='add'>+	value = (u32) perf-&gt;states[state].control;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("Writing 0x%08x to port 0x%04x\n", value, port);</div><div class='ctx'> </div><div class='ctx'> 	ret = acpi_processor_write_port(port, bit_width, value);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dprintk("Invalid port width 0x%04x\n", bit_width);</div><div class='del'>-		retval = ret;</div><div class='del'>-		goto migrate_end;</div><div class='add'>+		return (ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -177,49 +156,35 @@ acpi_processor_set_performance (</div><div class='ctx'> 		 * before giving up.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		port = data-&gt;acpi_data.status_register.address;</div><div class='del'>-		bit_width = data-&gt;acpi_data.status_register.bit_width;</div><div class='add'>+		port = perf-&gt;status_register.address;</div><div class='add'>+		bit_width = perf-&gt;status_register.bit_width;</div><div class='ctx'> </div><div class='ctx'> 		dprintk("Looking for 0x%08x from port 0x%04x\n",</div><div class='del'>-			(u32) data-&gt;acpi_data.states[state].status, port);</div><div class='add'>+			(u32) perf-&gt;states[state].status, port);</div><div class='ctx'> </div><div class='del'>-		for (i=0; i&lt;100; i++) {</div><div class='add'>+		for (i = 0; i &lt; 100; i++) {</div><div class='ctx'> 			ret = acpi_processor_read_port(port, bit_width, &amp;value);</div><div class='ctx'> 			if (ret) {	</div><div class='ctx'> 				dprintk("Invalid port width 0x%04x\n", bit_width);</div><div class='del'>-				retval = ret;</div><div class='del'>-				goto migrate_end;</div><div class='add'>+				return (ret);</div><div class='ctx'> 			}</div><div class='del'>-			if (value == (u32) data-&gt;acpi_data.states[state].status)</div><div class='add'>+			if (value == (u32) perf-&gt;states[state].status)</div><div class='ctx'> 				break;</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		i = 0;</div><div class='del'>-		value = (u32) data-&gt;acpi_data.states[state].status;</div><div class='add'>+		value = (u32) perf-&gt;states[state].status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* notify cpufreq */</div><div class='del'>-	cpufreq_notify_transition(&amp;cpufreq_freqs, CPUFREQ_POSTCHANGE);</div><div class='del'>-</div><div class='del'>-	if (unlikely(value != (u32) data-&gt;acpi_data.states[state].status)) {</div><div class='del'>-		unsigned int tmp = cpufreq_freqs.new;</div><div class='del'>-		cpufreq_freqs.new = cpufreq_freqs.old;</div><div class='del'>-		cpufreq_freqs.old = tmp;</div><div class='del'>-		cpufreq_notify_transition(&amp;cpufreq_freqs, CPUFREQ_PRECHANGE);</div><div class='del'>-		cpufreq_notify_transition(&amp;cpufreq_freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+	if (unlikely(value != (u32) perf-&gt;states[state].status)) {</div><div class='ctx'> 		printk(KERN_WARNING "acpi-cpufreq: Transition failed\n");</div><div class='ctx'> 		retval = -ENODEV;</div><div class='del'>-		goto migrate_end;</div><div class='add'>+		return (retval);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk("Transition successful after %d microseconds\n", i * 10);</div><div class='ctx'> </div><div class='del'>-	data-&gt;acpi_data.state = state;</div><div class='del'>-</div><div class='del'>-	retval = 0;</div><div class='del'>-migrate_end:</div><div class='del'>-	set_cpus_allowed(current, saved_mask);</div><div class='add'>+	perf-&gt;state = state;</div><div class='ctx'> 	return (retval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -231,8 +196,17 @@ acpi_cpufreq_target (</div><div class='ctx'> 	unsigned int relation)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_acpi_io *data = acpi_io_data[policy-&gt;cpu];</div><div class='add'>+	struct acpi_processor_performance *perf;</div><div class='add'>+	struct cpufreq_freqs freqs;</div><div class='add'>+	cpumask_t online_policy_cpus;</div><div class='add'>+	cpumask_t saved_mask;</div><div class='add'>+	cpumask_t set_mask;</div><div class='add'>+	cpumask_t covered_cpus;</div><div class='add'>+	unsigned int cur_state = 0;</div><div class='ctx'> 	unsigned int next_state = 0;</div><div class='ctx'> 	unsigned int result = 0;</div><div class='add'>+	unsigned int j;</div><div class='add'>+	unsigned int tmp;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("acpi_cpufreq_setpolicy\n");</div><div class='ctx'> </div><div class='hunk'>@@ -241,11 +215,95 @@ acpi_cpufreq_target (</div><div class='ctx'> 			target_freq,</div><div class='ctx'> 			relation,</div><div class='ctx'> 			&amp;next_state);</div><div class='del'>-	if (result)</div><div class='add'>+	if (unlikely(result))</div><div class='ctx'> 		return (result);</div><div class='ctx'> </div><div class='del'>-	result = acpi_processor_set_performance (data, policy-&gt;cpu, next_state);</div><div class='add'>+	perf = data-&gt;acpi_data;</div><div class='add'>+	cur_state = perf-&gt;state;</div><div class='add'>+	freqs.old = data-&gt;freq_table[cur_state].frequency;</div><div class='add'>+	freqs.new = data-&gt;freq_table[next_state].frequency;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+	/* cpufreq holds the hotplug lock, so we are safe from here on */</div><div class='add'>+	cpus_and(online_policy_cpus, cpu_online_map, policy-&gt;cpus);</div><div class='add'>+#else</div><div class='add'>+	online_policy_cpus = policy-&gt;cpus;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(j, online_policy_cpus) {</div><div class='add'>+		freqs.cpu = j;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We need to call driver-&gt;target() on all or any CPU in</div><div class='add'>+	 * policy-&gt;cpus, depending on policy-&gt;shared_type.</div><div class='add'>+	 */</div><div class='add'>+	saved_mask = current-&gt;cpus_allowed;</div><div class='add'>+	cpus_clear(covered_cpus);</div><div class='add'>+	for_each_cpu_mask(j, online_policy_cpus) {</div><div class='add'>+		/*</div><div class='add'>+		 * Support for SMP systems.</div><div class='add'>+		 * Make sure we are running on CPU that wants to change freq</div><div class='add'>+		 */</div><div class='add'>+		cpus_clear(set_mask);</div><div class='add'>+		if (policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ANY)</div><div class='add'>+			cpus_or(set_mask, set_mask, online_policy_cpus);</div><div class='add'>+		else</div><div class='add'>+			cpu_set(j, set_mask);</div><div class='add'>+</div><div class='add'>+		set_cpus_allowed(current, set_mask);</div><div class='add'>+		if (unlikely(!cpu_isset(smp_processor_id(), set_mask))) {</div><div class='add'>+			dprintk("couldn't limit to CPUs in this domain\n");</div><div class='add'>+			result = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = acpi_processor_set_performance (data, j, next_state);</div><div class='add'>+		if (result) {</div><div class='add'>+			result = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ANY)</div><div class='add'>+			break;</div><div class='add'>+ </div><div class='add'>+		cpu_set(j, covered_cpus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(j, online_policy_cpus) {</div><div class='add'>+		freqs.cpu = j;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(result)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We have failed halfway through the frequency change.</div><div class='add'>+		 * We have sent callbacks to online_policy_cpus and</div><div class='add'>+		 * acpi_processor_set_performance() has been called on </div><div class='add'>+		 * coverd_cpus. Best effort undo..</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (!cpus_empty(covered_cpus)) {</div><div class='add'>+			for_each_cpu_mask(j, covered_cpus) {</div><div class='add'>+				policy-&gt;cpu = j;</div><div class='add'>+				acpi_processor_set_performance (data, </div><div class='add'>+						j, </div><div class='add'>+						cur_state);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmp = freqs.new;</div><div class='add'>+		freqs.new = freqs.old;</div><div class='add'>+		freqs.old = tmp;</div><div class='add'>+		for_each_cpu_mask(j, online_policy_cpus) {</div><div class='add'>+			freqs.cpu = j;</div><div class='add'>+			cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+			cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_cpus_allowed(current, saved_mask);</div><div class='ctx'> 	return (result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -271,30 +329,65 @@ acpi_cpufreq_guess_freq (</div><div class='ctx'> 	struct cpufreq_acpi_io	*data,</div><div class='ctx'> 	unsigned int		cpu)</div><div class='ctx'> {</div><div class='add'>+	struct acpi_processor_performance	*perf = data-&gt;acpi_data;</div><div class='add'>+</div><div class='ctx'> 	if (cpu_khz) {</div><div class='ctx'> 		/* search the closest match to cpu_khz */</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> 		unsigned long freq;</div><div class='del'>-		unsigned long freqn = data-&gt;acpi_data.states[0].core_frequency * 1000;</div><div class='add'>+		unsigned long freqn = perf-&gt;states[0].core_frequency * 1000;</div><div class='ctx'> </div><div class='del'>-		for (i=0; i &lt; (data-&gt;acpi_data.state_count - 1); i++) {</div><div class='add'>+		for (i = 0; i &lt; (perf-&gt;state_count - 1); i++) {</div><div class='ctx'> 			freq = freqn;</div><div class='del'>-			freqn = data-&gt;acpi_data.states[i+1].core_frequency * 1000;</div><div class='add'>+			freqn = perf-&gt;states[i+1].core_frequency * 1000;</div><div class='ctx'> 			if ((2 * cpu_khz) &gt; (freqn + freq)) {</div><div class='del'>-				data-&gt;acpi_data.state = i;</div><div class='add'>+				perf-&gt;state = i;</div><div class='ctx'> 				return (freq);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		data-&gt;acpi_data.state = data-&gt;acpi_data.state_count - 1;</div><div class='add'>+		perf-&gt;state = perf-&gt;state_count - 1;</div><div class='ctx'> 		return (freqn);</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		/* assume CPU is at P0... */</div><div class='del'>-		data-&gt;acpi_data.state = 0;</div><div class='del'>-		return data-&gt;acpi_data.states[0].core_frequency * 1000;</div><div class='del'>-	</div><div class='add'>+		perf-&gt;state = 0;</div><div class='add'>+		return perf-&gt;states[0].core_frequency * 1000;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * acpi_cpufreq_early_init - initialize ACPI P-States library</div><div class='add'>+ *</div><div class='add'>+ * Initialize the ACPI P-States library (drivers/acpi/processor_perflib.c)</div><div class='add'>+ * in order to determine correct frequency and voltage pairings. We can</div><div class='add'>+ * do _PDC and _PSD and find out the processor dependency for the</div><div class='add'>+ * actual init that will happen later...</div><div class='add'>+ */</div><div class='add'>+static int acpi_cpufreq_early_init_acpi(void)</div><div class='add'>+{</div><div class='add'>+	struct acpi_processor_performance	*data;</div><div class='add'>+	unsigned int				i, j;</div><div class='add'>+</div><div class='add'>+	dprintk("acpi_cpufreq_early_init\n");</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		data = kzalloc(sizeof(struct acpi_processor_performance), </div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+		if (!data) {</div><div class='add'>+			for_each_possible_cpu(j) {</div><div class='add'>+				kfree(acpi_perf_data[j]);</div><div class='add'>+				acpi_perf_data[j] = NULL;</div><div class='add'>+			}</div><div class='add'>+			return (-ENOMEM);</div><div class='add'>+		}</div><div class='add'>+		acpi_perf_data[i] = data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Do initialization in ACPI core */</div><div class='add'>+	acpi_processor_preregister_performance(acpi_perf_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> acpi_cpufreq_cpu_init (</div><div class='ctx'> 	struct cpufreq_policy   *policy)</div><div class='hunk'>@@ -304,41 +397,57 @@ acpi_cpufreq_cpu_init (</div><div class='ctx'> 	struct cpufreq_acpi_io	*data;</div><div class='ctx'> 	unsigned int		result = 0;</div><div class='ctx'> 	struct cpuinfo_x86 *c = &amp;cpu_data[policy-&gt;cpu];</div><div class='add'>+	struct acpi_processor_performance	*perf;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("acpi_cpufreq_cpu_init\n");</div><div class='ctx'> </div><div class='add'>+	if (!acpi_perf_data[cpu])</div><div class='add'>+		return (-ENODEV);</div><div class='add'>+</div><div class='ctx'> 	data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return (-ENOMEM);</div><div class='ctx'> </div><div class='add'>+	data-&gt;acpi_data = acpi_perf_data[cpu];</div><div class='ctx'> 	acpi_io_data[cpu] = data;</div><div class='ctx'> </div><div class='del'>-	result = acpi_processor_register_performance(&amp;data-&gt;acpi_data, cpu);</div><div class='add'>+	result = acpi_processor_register_performance(data-&gt;acpi_data, cpu);</div><div class='ctx'> </div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> </div><div class='add'>+	perf = data-&gt;acpi_data;</div><div class='add'>+	policy-&gt;shared_type = perf-&gt;shared_type;</div><div class='add'>+	/*</div><div class='add'>+	 * Will let policy-&gt;cpus know about dependency only when software </div><div class='add'>+	 * coordination is required.</div><div class='add'>+	 */</div><div class='add'>+	if (policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ALL ||</div><div class='add'>+	    policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ANY)</div><div class='add'>+		policy-&gt;cpus = perf-&gt;shared_cpu_map;</div><div class='add'>+</div><div class='ctx'> 	if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {</div><div class='ctx'> 		acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* capability check */</div><div class='del'>-	if (data-&gt;acpi_data.state_count &lt;= 1) {</div><div class='add'>+	if (perf-&gt;state_count &lt;= 1) {</div><div class='ctx'> 		dprintk("No P-States\n");</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto err_unreg;</div><div class='ctx'> 	}</div><div class='del'>-	if ((data-&gt;acpi_data.control_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO) ||</div><div class='del'>-	    (data-&gt;acpi_data.status_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {</div><div class='add'>+</div><div class='add'>+	if ((perf-&gt;control_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO) ||</div><div class='add'>+	    (perf-&gt;status_register.space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {</div><div class='ctx'> 		dprintk("Unsupported address space [%d, %d]\n",</div><div class='del'>-			(u32) (data-&gt;acpi_data.control_register.space_id),</div><div class='del'>-			(u32) (data-&gt;acpi_data.status_register.space_id));</div><div class='add'>+			(u32) (perf-&gt;control_register.space_id),</div><div class='add'>+			(u32) (perf-&gt;status_register.space_id));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto err_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* alloc freq_table */</div><div class='del'>-	data-&gt;freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * (data-&gt;acpi_data.state_count + 1), GFP_KERNEL);</div><div class='add'>+	data-&gt;freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * (perf-&gt;state_count + 1), GFP_KERNEL);</div><div class='ctx'> 	if (!data-&gt;freq_table) {</div><div class='ctx'> 		result = -ENOMEM;</div><div class='ctx'> 		goto err_unreg;</div><div class='hunk'>@@ -346,9 +455,9 @@ acpi_cpufreq_cpu_init (</div><div class='ctx'> </div><div class='ctx'> 	/* detect transition latency */</div><div class='ctx'> 	policy-&gt;cpuinfo.transition_latency = 0;</div><div class='del'>-	for (i=0; i&lt;data-&gt;acpi_data.state_count; i++) {</div><div class='del'>-		if ((data-&gt;acpi_data.states[i].transition_latency * 1000) &gt; policy-&gt;cpuinfo.transition_latency)</div><div class='del'>-			policy-&gt;cpuinfo.transition_latency = data-&gt;acpi_data.states[i].transition_latency * 1000;</div><div class='add'>+	for (i=0; i&lt;perf-&gt;state_count; i++) {</div><div class='add'>+		if ((perf-&gt;states[i].transition_latency * 1000) &gt; policy-&gt;cpuinfo.transition_latency)</div><div class='add'>+			policy-&gt;cpuinfo.transition_latency = perf-&gt;states[i].transition_latency * 1000;</div><div class='ctx'> 	}</div><div class='ctx'> 	policy-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='ctx'> </div><div class='hunk'>@@ -356,11 +465,11 @@ acpi_cpufreq_cpu_init (</div><div class='ctx'> 	policy-&gt;cur = acpi_cpufreq_guess_freq(data, policy-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 	/* table init */</div><div class='del'>-	for (i=0; i&lt;=data-&gt;acpi_data.state_count; i++)</div><div class='add'>+	for (i=0; i&lt;=perf-&gt;state_count; i++)</div><div class='ctx'> 	{</div><div class='ctx'> 		data-&gt;freq_table[i].index = i;</div><div class='del'>-		if (i&lt;data-&gt;acpi_data.state_count)</div><div class='del'>-			data-&gt;freq_table[i].frequency = data-&gt;acpi_data.states[i].core_frequency * 1000;</div><div class='add'>+		if (i&lt;perf-&gt;state_count)</div><div class='add'>+			data-&gt;freq_table[i].frequency = perf-&gt;states[i].core_frequency * 1000;</div><div class='ctx'> 		else</div><div class='ctx'> 			data-&gt;freq_table[i].frequency = CPUFREQ_TABLE_END;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -375,12 +484,12 @@ acpi_cpufreq_cpu_init (</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "acpi-cpufreq: CPU%u - ACPI performance management activated.\n",</div><div class='ctx'> 	       cpu);</div><div class='del'>-	for (i = 0; i &lt; data-&gt;acpi_data.state_count; i++)</div><div class='add'>+	for (i = 0; i &lt; perf-&gt;state_count; i++)</div><div class='ctx'> 		dprintk("     %cP%d: %d MHz, %d mW, %d uS\n",</div><div class='del'>-			(i == data-&gt;acpi_data.state?'*':' '), i,</div><div class='del'>-			(u32) data-&gt;acpi_data.states[i].core_frequency,</div><div class='del'>-			(u32) data-&gt;acpi_data.states[i].power,</div><div class='del'>-			(u32) data-&gt;acpi_data.states[i].transition_latency);</div><div class='add'>+			(i == perf-&gt;state?'*':' '), i,</div><div class='add'>+			(u32) perf-&gt;states[i].core_frequency,</div><div class='add'>+			(u32) perf-&gt;states[i].power,</div><div class='add'>+			(u32) perf-&gt;states[i].transition_latency);</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_frequency_table_get_attr(data-&gt;freq_table, policy-&gt;cpu);</div><div class='ctx'> 	</div><div class='hunk'>@@ -395,7 +504,7 @@ acpi_cpufreq_cpu_init (</div><div class='ctx'>  err_freqfree:</div><div class='ctx'> 	kfree(data-&gt;freq_table);</div><div class='ctx'>  err_unreg:</div><div class='del'>-	acpi_processor_unregister_performance(&amp;data-&gt;acpi_data, cpu);</div><div class='add'>+	acpi_processor_unregister_performance(perf, cpu);</div><div class='ctx'>  err_free:</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	acpi_io_data[cpu] = NULL;</div><div class='hunk'>@@ -416,7 +525,7 @@ acpi_cpufreq_cpu_exit (</div><div class='ctx'> 	if (data) {</div><div class='ctx'> 		cpufreq_frequency_table_put_attr(policy-&gt;cpu);</div><div class='ctx'> 		acpi_io_data[policy-&gt;cpu] = NULL;</div><div class='del'>-		acpi_processor_unregister_performance(&amp;data-&gt;acpi_data, policy-&gt;cpu);</div><div class='add'>+		acpi_processor_unregister_performance(data-&gt;acpi_data, policy-&gt;cpu);</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -444,14 +553,15 @@ static struct freq_attr* acpi_cpufreq_attr[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cpufreq_driver acpi_cpufreq_driver = {</div><div class='del'>-	.verify 	= acpi_cpufreq_verify,</div><div class='del'>-	.target 	= acpi_cpufreq_target,</div><div class='del'>-	.init		= acpi_cpufreq_cpu_init,</div><div class='del'>-	.exit		= acpi_cpufreq_cpu_exit,</div><div class='del'>-	.resume		= acpi_cpufreq_resume,</div><div class='del'>-	.name		= "acpi-cpufreq",</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.attr           = acpi_cpufreq_attr,</div><div class='add'>+	.verify	= acpi_cpufreq_verify,</div><div class='add'>+	.target	= acpi_cpufreq_target,</div><div class='add'>+	.init	= acpi_cpufreq_cpu_init,</div><div class='add'>+	.exit	= acpi_cpufreq_cpu_exit,</div><div class='add'>+	.resume	= acpi_cpufreq_resume,</div><div class='add'>+	.name	= "acpi-cpufreq",</div><div class='add'>+	.owner	= THIS_MODULE,</div><div class='add'>+	.attr	= acpi_cpufreq_attr,</div><div class='add'>+	.flags	= CPUFREQ_STICKY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -462,7 +572,10 @@ acpi_cpufreq_init (void)</div><div class='ctx'> </div><div class='ctx'> 	dprintk("acpi_cpufreq_init\n");</div><div class='ctx'> </div><div class='del'>- 	result = cpufreq_register_driver(&amp;acpi_cpufreq_driver);</div><div class='add'>+	result = acpi_cpufreq_early_init_acpi();</div><div class='add'>+</div><div class='add'>+	if (!result)</div><div class='add'>+ 		result = cpufreq_register_driver(&amp;acpi_cpufreq_driver);</div><div class='ctx'> 	</div><div class='ctx'> 	return (result);</div><div class='ctx'> }</div><div class='hunk'>@@ -471,10 +584,15 @@ acpi_cpufreq_init (void)</div><div class='ctx'> static void __exit</div><div class='ctx'> acpi_cpufreq_exit (void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int	i;</div><div class='ctx'> 	dprintk("acpi_cpufreq_exit\n");</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_unregister_driver(&amp;acpi_cpufreq_driver);</div><div class='ctx'> </div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		kfree(acpi_perf_data[i]);</div><div class='add'>+		acpi_perf_data[i] = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c<br/>index f275e0d4aee5..0d49d73d1b71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * (C) 2004  Sebastian Witt &lt;se.witt@gmx.net&gt;</div><div class='add'>+ * (C) 2004-2006  Sebastian Witt &lt;se.witt@gmx.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Licensed under the terms of the GNU GPL License version 2.</div><div class='ctx'>  *  Based upon reverse engineered information</div><div class='hunk'>@@ -90,7 +90,7 @@ static int nforce2_calc_pll(unsigned int fsb)</div><div class='ctx'> </div><div class='ctx'> 	/* Try to calculate multiplier and divider up to 4 times */</div><div class='ctx'> 	while (((mul == 0) || (div == 0)) &amp;&amp; (tried &lt;= 3)) {</div><div class='del'>-		for (xdiv = 1; xdiv &lt;= 0x80; xdiv++)</div><div class='add'>+		for (xdiv = 2; xdiv &lt;= 0x80; xdiv++)</div><div class='ctx'> 			for (xmul = 1; xmul &lt;= 0xfe; xmul++)</div><div class='ctx'> 				if (nforce2_calc_fsb(NFORCE2_PLL(xmul, xdiv)) ==</div><div class='ctx'> 				    fsb + tried) {</div><div class='hunk'>@@ -117,8 +117,7 @@ static void nforce2_write_pll(int pll)</div><div class='ctx'> 	int temp;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the pll addr. to 0x00 */</div><div class='del'>-	temp = 0x00;</div><div class='del'>-	pci_write_config_dword(nforce2_chipset_dev, NFORCE2_PLLADR, temp);</div><div class='add'>+	pci_write_config_dword(nforce2_chipset_dev, NFORCE2_PLLADR, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Now write the value in all 64 registers */</div><div class='ctx'> 	for (temp = 0; temp &lt;= 0x3f; temp++)</div><div class='hunk'>@@ -266,7 +265,7 @@ static int nforce2_target(struct cpufreq_policy *policy,</div><div class='ctx'> 	if (freqs.old == freqs.new)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	dprintk(KERN_INFO "cpufreq: Old CPU frequency %d kHz, new %d kHz\n",</div><div class='add'>+	dprintk("Old CPU frequency %d kHz, new %d kHz\n",</div><div class='ctx'> 	       freqs.old, freqs.new);</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='hunk'>@@ -278,7 +277,7 @@ static int nforce2_target(struct cpufreq_policy *policy,</div><div class='ctx'> 		printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n",</div><div class='ctx'>                        target_fsb);</div><div class='ctx'> 	else</div><div class='del'>-		dprintk(KERN_INFO "cpufreq: Changed FSB successfully to %d\n",</div><div class='add'>+		dprintk("Changed FSB successfully to %d\n",</div><div class='ctx'>                        target_fsb);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable IRQs */</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c<br/>index 8ef38544453c..146f607e9c44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/longhaul.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/longhaul.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/longhaul.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/longhaul.c</a></div><div class='hunk'>@@ -77,13 +77,17 @@ static char speedbuffer[8];</div><div class='ctx'> </div><div class='ctx'> static char *print_speed(int speed)</div><div class='ctx'> {</div><div class='del'>-	if (speed &gt; 1000) {</div><div class='del'>-		if (speed%1000 == 0)</div><div class='del'>-			sprintf (speedbuffer, "%dGHz", speed/1000);</div><div class='del'>-		else</div><div class='del'>-			sprintf (speedbuffer, "%d.%dGHz", speed/1000, (speed%1000)/100);</div><div class='del'>-	} else</div><div class='del'>-		sprintf (speedbuffer, "%dMHz", speed);</div><div class='add'>+	if (speed &lt; 1000) {</div><div class='add'>+		snprintf(speedbuffer, sizeof(speedbuffer),"%dMHz", speed);</div><div class='add'>+		return speedbuffer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (speed%1000 == 0)</div><div class='add'>+		snprintf(speedbuffer, sizeof(speedbuffer),</div><div class='add'>+			"%dGHz", speed/1000);</div><div class='add'>+	else</div><div class='add'>+		snprintf(speedbuffer, sizeof(speedbuffer),</div><div class='add'>+			"%d.%dGHz", speed/1000, (speed%1000)/100);</div><div class='ctx'> </div><div class='ctx'> 	return speedbuffer;</div><div class='ctx'> }</div><div class='hunk'>@@ -675,7 +679,7 @@ static int __init longhaul_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit longhaul_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int i=0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; numscales; i++) {</div><div class='ctx'> 		if (clock_ratio[i] == maxmult) {</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/i386/kernel/cpu/cpufreq/longrun.c<br/>index e3868de4dc2e..b2689514295a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/longrun.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/longrun.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/longrun.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/longrun.c</a></div><div class='hunk'>@@ -223,7 +223,6 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,</div><div class='ctx'> 		/* set to 0 to try_hi perf_pctg */</div><div class='ctx'> 		msr_lo &amp;= 0xFFFFFF80;</div><div class='ctx'> 		msr_hi &amp;= 0xFFFFFF80;</div><div class='del'>-		msr_lo |= 0;</div><div class='ctx'> 		msr_hi |= try_hi;</div><div class='ctx'> 		wrmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c<br/>index ab6504efd801..304d2eaa4a1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/p4-clockmod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/p4-clockmod.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c<br/>index 2bf4237cb94e..54382760983a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/powernow-k7.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/powernow-k7.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/powernow-k7.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/powernow-k7.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * - We disable half multipliers if ACPI is used on A0 stepping CPUs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -452,23 +451,23 @@ static int powernow_decode_bios (int maxfid, int startvid)</div><div class='ctx'> </div><div class='ctx'> 			pst = (struct pst_s *) p;</div><div class='ctx'> </div><div class='del'>-			for (i = 0 ; i &lt;psb-&gt;numpst; i++) {</div><div class='add'>+			for (j=0; j&lt;psb-&gt;numpst; j++) {</div><div class='ctx'> 				pst = (struct pst_s *) p;</div><div class='ctx'> 				number_scales = pst-&gt;numpstates;</div><div class='ctx'> </div><div class='ctx'> 				if ((etuple == pst-&gt;cpuid) &amp;&amp; check_fsb(pst-&gt;fsbspeed) &amp;&amp;</div><div class='ctx'> 				    (maxfid==pst-&gt;maxfid) &amp;&amp; (startvid==pst-&gt;startvid))</div><div class='ctx'> 				{</div><div class='del'>-					dprintk ("PST:%d (@%p)\n", i, pst);</div><div class='add'>+					dprintk ("PST:%d (@%p)\n", j, pst);</div><div class='ctx'> 					dprintk (" cpuid: 0x%x  fsb: %d  maxFID: 0x%x  startvid: 0x%x\n",</div><div class='ctx'> 						 pst-&gt;cpuid, pst-&gt;fsbspeed, pst-&gt;maxfid, pst-&gt;startvid);</div><div class='ctx'> </div><div class='ctx'> 					ret = get_ranges ((char *) pst + sizeof (struct pst_s));</div><div class='ctx'> 					return ret;</div><div class='del'>-</div><div class='ctx'> 				} else {</div><div class='add'>+					unsigned int k;</div><div class='ctx'> 					p = (char *) pst + sizeof (struct pst_s);</div><div class='del'>-					for (j=0 ; j &lt; number_scales; j++)</div><div class='add'>+					for (k=0; k&lt;number_scales; k++)</div><div class='ctx'> 						p+=2;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -581,10 +580,7 @@ static int __init powernow_cpu_init (struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	rdmsrl (MSR_K7_FID_VID_STATUS, fidvidstatus.val);</div><div class='ctx'> </div><div class='del'>-	/* recalibrate cpu_khz */</div><div class='del'>-	result = recalibrate_cpu_khz();</div><div class='del'>-	if (result)</div><div class='del'>-		return result;</div><div class='add'>+	recalibrate_cpu_khz();</div><div class='ctx'> </div><div class='ctx'> 	fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];</div><div class='ctx'> 	if (!fsb) {</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c<br/>index 71fffa174425..2d6491672559 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/powernow-k8.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/powernow-k8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/powernow-k8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/powernow-k8.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *   (c) 2003, 2004, 2005 Advanced Micro Devices, Inc.</div><div class='add'>+ *   (c) 2003-2006 Advanced Micro Devices, Inc.</div><div class='ctx'>  *  Your use of this code is subject to the terms and conditions of the</div><div class='ctx'>  *  GNU general public license version 2. See "COPYING" or</div><div class='ctx'>  *  http://www.gnu.org/licenses/gpl.html</div><div class='hunk'>@@ -14,13 +14,13 @@</div><div class='ctx'>  *  Based upon datasheets &amp; sample CPUs kindly provided by AMD.</div><div class='ctx'>  *</div><div class='ctx'>  *  Valuable input gratefully received from Dave Jones, Pavel Machek,</div><div class='del'>- *  Dominik Brodowski, and others.</div><div class='add'>+ *  Dominik Brodowski, Jacob Shin, and others.</div><div class='ctx'>  *  Originally developed by Paul Devriendt.</div><div class='ctx'>  *  Processor information obtained from Chapter 9 (Power and Thermal Management)</div><div class='ctx'>  *  of the "BIOS and Kernel Developer's Guide for the AMD Athlon 64 and AMD</div><div class='ctx'>  *  Opteron Processors" available for download from www.amd.com</div><div class='ctx'>  *</div><div class='del'>- *  Tables for specific CPUs can be infrerred from</div><div class='add'>+ *  Tables for specific CPUs can be inferred from</div><div class='ctx'>  *     http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/30430.pdf</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> #define PFX "powernow-k8: "</div><div class='ctx'> #define BFX PFX "BIOS error: "</div><div class='del'>-#define VERSION "version 1.60.2"</div><div class='add'>+#define VERSION "version 2.00.00"</div><div class='ctx'> #include "powernow-k8.h"</div><div class='ctx'> </div><div class='ctx'> /* serialize freq changes  */</div><div class='hunk'>@@ -54,6 +54,8 @@ static DEFINE_MUTEX(fidvid_mutex);</div><div class='ctx'> </div><div class='ctx'> static struct powernow_k8_data *powernow_data[NR_CPUS];</div><div class='ctx'> </div><div class='add'>+static int cpu_family = CPU_OPTERON;</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> static cpumask_t cpu_core_map[1];</div><div class='ctx'> #endif</div><div class='hunk'>@@ -64,16 +66,36 @@ static u32 find_freq_from_fid(u32 fid)</div><div class='ctx'> 	return 800 + (fid * 100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /* Return a frequency in KHz, given an input fid */</div><div class='ctx'> static u32 find_khz_freq_from_fid(u32 fid)</div><div class='ctx'> {</div><div class='ctx'> 	return 1000 * find_freq_from_fid(fid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return a voltage in miliVolts, given an input vid */</div><div class='del'>-static u32 find_millivolts_from_vid(struct powernow_k8_data *data, u32 vid)</div><div class='add'>+/* Return a frequency in MHz, given an input fid and did */</div><div class='add'>+static u32 find_freq_from_fiddid(u32 fid, u32 did)</div><div class='add'>+{</div><div class='add'>+	return 100 * (fid + 0x10) &gt;&gt; did;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 find_khz_freq_from_fiddid(u32 fid, u32 did)</div><div class='ctx'> {</div><div class='del'>-	return 1550-vid*25;</div><div class='add'>+	return 1000 * find_freq_from_fiddid(fid, did);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 find_fid_from_pstate(u32 pstate)</div><div class='add'>+{</div><div class='add'>+	u32 hi, lo;</div><div class='add'>+	rdmsr(MSR_PSTATE_DEF_BASE + pstate, lo, hi);</div><div class='add'>+	return lo &amp; HW_PSTATE_FID_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 find_did_from_pstate(u32 pstate)</div><div class='add'>+{</div><div class='add'>+	u32 hi, lo;</div><div class='add'>+	rdmsr(MSR_PSTATE_DEF_BASE + pstate, lo, hi);</div><div class='add'>+	return (lo &amp; HW_PSTATE_DID_MASK) &gt;&gt; HW_PSTATE_DID_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return the vco fid for an input fid</div><div class='hunk'>@@ -98,6 +120,9 @@ static int pending_bit_stuck(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 lo, hi;</div><div class='ctx'> </div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	rdmsr(MSR_FIDVID_STATUS, lo, hi);</div><div class='ctx'> 	return lo &amp; MSR_S_LO_CHANGE_PENDING ? 1 : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -111,6 +136,14 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data)</div><div class='ctx'> 	u32 lo, hi;</div><div class='ctx'> 	u32 i = 0;</div><div class='ctx'> </div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE) {</div><div class='add'>+		rdmsr(MSR_PSTATE_STATUS, lo, hi);</div><div class='add'>+		i = lo &amp; HW_PSTATE_MASK;</div><div class='add'>+		rdmsr(MSR_PSTATE_DEF_BASE + i, lo, hi);</div><div class='add'>+		data-&gt;currfid = lo &amp; HW_PSTATE_FID_MASK;</div><div class='add'>+		data-&gt;currdid = (lo &amp; HW_PSTATE_DID_MASK) &gt;&gt; HW_PSTATE_DID_SHIFT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (i++ &gt; 10000) {</div><div class='ctx'> 			dprintk("detected change pending stuck\n");</div><div class='hunk'>@@ -175,7 +208,7 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid)</div><div class='ctx'> 	do {</div><div class='ctx'> 		wrmsr(MSR_FIDVID_CTL, lo, data-&gt;plllock * PLL_LOCK_CONVERSION);</div><div class='ctx'> 		if (i++ &gt; 100) {</div><div class='del'>-			printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n");</div><div class='add'>+			printk(KERN_ERR PFX "Hardware error - pending bit very stuck - no further pstate changes possible\n");</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (query_current_values_with_pending_wait(data));</div><div class='hunk'>@@ -255,7 +288,15 @@ static int decrease_vid_code_by_step(struct powernow_k8_data *data, u32 reqvid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Change the fid and vid, by the 3 phases. */</div><div class='add'>+/* Change hardware pstate by single MSR write */</div><div class='add'>+static int transition_pstate(struct powernow_k8_data *data, u32 pstate)</div><div class='add'>+{</div><div class='add'>+	wrmsr(MSR_PSTATE_CTRL, pstate, 0);</div><div class='add'>+	data-&gt;currfid = find_fid_from_pstate(pstate);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Change Opteron/Athlon64 fid and vid, by the 3 phases. */</div><div class='ctx'> static int transition_fid_vid(struct powernow_k8_data *data, u32 reqfid, u32 reqvid)</div><div class='ctx'> {</div><div class='ctx'> 	if (core_voltage_pre_transition(data, reqvid))</div><div class='hunk'>@@ -474,26 +515,35 @@ static int check_supported_cpu(unsigned int cpu)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);</div><div class='del'>-	if ((eax &amp; CPUID_XFAM) != CPUID_XFAM_K8)</div><div class='add'>+	if (((eax &amp; CPUID_XFAM) != CPUID_XFAM_K8) &amp;&amp;</div><div class='add'>+	    ((eax &amp; CPUID_XFAM) &lt; CPUID_XFAM_10H))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (((eax &amp; CPUID_USE_XFAM_XMOD) != CPUID_USE_XFAM_XMOD) ||</div><div class='del'>-	    ((eax &amp; CPUID_XMOD) &gt; CPUID_XMOD_REV_G)) {</div><div class='del'>-		printk(KERN_INFO PFX "Processor cpuid %x not supported\n", eax);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if ((eax &amp; CPUID_XFAM) == CPUID_XFAM_K8) {</div><div class='add'>+		if (((eax &amp; CPUID_USE_XFAM_XMOD) != CPUID_USE_XFAM_XMOD) ||</div><div class='add'>+		    ((eax &amp; CPUID_XMOD) &gt; CPUID_XMOD_REV_G)) {</div><div class='add'>+			printk(KERN_INFO PFX "Processor cpuid %x not supported\n", eax);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	eax = cpuid_eax(CPUID_GET_MAX_CAPABILITIES);</div><div class='del'>-	if (eax &lt; CPUID_FREQ_VOLT_CAPABILITIES) {</div><div class='del'>-		printk(KERN_INFO PFX</div><div class='del'>-		       "No frequency change capabilities detected\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		eax = cpuid_eax(CPUID_GET_MAX_CAPABILITIES);</div><div class='add'>+		if (eax &lt; CPUID_FREQ_VOLT_CAPABILITIES) {</div><div class='add'>+			printk(KERN_INFO PFX</div><div class='add'>+			       "No frequency change capabilities detected\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-	if ((edx &amp; P_STATE_TRANSITION_CAPABLE) != P_STATE_TRANSITION_CAPABLE) {</div><div class='del'>-		printk(KERN_INFO PFX "Power state transitions not supported\n");</div><div class='del'>-		goto out;</div><div class='add'>+		cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+		if ((edx &amp; P_STATE_TRANSITION_CAPABLE) != P_STATE_TRANSITION_CAPABLE) {</div><div class='add'>+			printk(KERN_INFO PFX "Power state transitions not supported\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else { /* must be a HW Pstate capable processor */</div><div class='add'>+		cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='add'>+		if ((edx &amp; USE_HW_PSTATE) == USE_HW_PSTATE)</div><div class='add'>+			cpu_family = CPU_HW_PSTATE;</div><div class='add'>+		else</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = 1;</div><div class='hunk'>@@ -547,12 +597,18 @@ static void print_basics(struct powernow_k8_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	int j;</div><div class='ctx'> 	for (j = 0; j &lt; data-&gt;numps; j++) {</div><div class='del'>-		if (data-&gt;powernow_table[j].frequency != CPUFREQ_ENTRY_INVALID)</div><div class='del'>-			printk(KERN_INFO PFX "   %d : fid 0x%x (%d MHz), vid 0x%x (%d mV)\n", j,</div><div class='add'>+		if (data-&gt;powernow_table[j].frequency != CPUFREQ_ENTRY_INVALID) {</div><div class='add'>+			if (cpu_family == CPU_HW_PSTATE) {</div><div class='add'>+			printk(KERN_INFO PFX "   %d : fid 0x%x gid 0x%x (%d MHz)\n", j, (data-&gt;powernow_table[j].index &amp; 0xff00) &gt;&gt; 8,</div><div class='add'>+				(data-&gt;powernow_table[j].index &amp; 0xff0000) &gt;&gt; 16,</div><div class='add'>+				data-&gt;powernow_table[j].frequency/1000);</div><div class='add'>+			} else {</div><div class='add'>+			printk(KERN_INFO PFX "   %d : fid 0x%x (%d MHz), vid 0x%x\n", j,</div><div class='ctx'> 				data-&gt;powernow_table[j].index &amp; 0xff,</div><div class='ctx'> 				data-&gt;powernow_table[j].frequency/1000,</div><div class='del'>-				data-&gt;powernow_table[j].index &gt;&gt; 8,</div><div class='del'>-				find_millivolts_from_vid(data, data-&gt;powernow_table[j].index &gt;&gt; 8));</div><div class='add'>+				data-&gt;powernow_table[j].index &gt;&gt; 8);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (data-&gt;batps)</div><div class='ctx'> 		printk(KERN_INFO PFX "Only %d pstates on battery\n", data-&gt;batps);</div><div class='hunk'>@@ -702,7 +758,7 @@ static int find_psb_table(struct powernow_k8_data *data)</div><div class='ctx'> #ifdef CONFIG_X86_POWERNOW_K8_ACPI</div><div class='ctx'> static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index)</div><div class='ctx'> {</div><div class='del'>-	if (!data-&gt;acpi_data.state_count)</div><div class='add'>+	if (!data-&gt;acpi_data.state_count || (cpu_family == CPU_HW_PSTATE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;irt = (data-&gt;acpi_data.states[index].control &gt;&gt; IRT_SHIFT) &amp; IRT_MASK;</div><div class='hunk'>@@ -715,9 +771,8 @@ static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned</div><div class='ctx'> </div><div class='ctx'> static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	int cntlofreq = 0;</div><div class='ctx'> 	struct cpufreq_frequency_table *powernow_table;</div><div class='add'>+	int ret_val;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_processor_register_performance(&amp;data-&gt;acpi_data, data-&gt;cpu)) {</div><div class='ctx'> 		dprintk("register performance failed: bad ACPI data\n");</div><div class='hunk'>@@ -746,13 +801,92 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		ret_val = fill_powernow_table_pstate(data, powernow_table);</div><div class='add'>+	else</div><div class='add'>+		ret_val = fill_powernow_table_fidvid(data, powernow_table);</div><div class='add'>+	if (ret_val)</div><div class='add'>+		goto err_out_mem;</div><div class='add'>+</div><div class='add'>+	powernow_table[data-&gt;acpi_data.state_count].frequency = CPUFREQ_TABLE_END;</div><div class='add'>+	powernow_table[data-&gt;acpi_data.state_count].index = 0;</div><div class='add'>+	data-&gt;powernow_table = powernow_table;</div><div class='add'>+</div><div class='add'>+	/* fill in data */</div><div class='add'>+	data-&gt;numps = data-&gt;acpi_data.state_count;</div><div class='add'>+	print_basics(data);</div><div class='add'>+	powernow_k8_acpi_pst_values(data, 0);</div><div class='add'>+</div><div class='add'>+	/* notify BIOS that we exist */</div><div class='add'>+	acpi_processor_notify_smm(THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_mem:</div><div class='add'>+	kfree(powernow_table);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	acpi_processor_unregister_performance(&amp;data-&gt;acpi_data, data-&gt;cpu);</div><div class='add'>+</div><div class='add'>+	/* data-&gt;acpi_data.state_count informs us at -&gt;exit() whether ACPI was used */</div><div class='add'>+	data-&gt;acpi_data.state_count = 0;</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpufreq_frequency_table *powernow_table)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;acpi_data.state_count; i++) {</div><div class='add'>+		u32 index;</div><div class='add'>+		u32 hi = 0, lo = 0;</div><div class='add'>+		u32 fid;</div><div class='add'>+		u32 did;</div><div class='add'>+</div><div class='add'>+		index = data-&gt;acpi_data.states[i].control &amp; HW_PSTATE_MASK;</div><div class='add'>+		if (index &gt; MAX_HW_PSTATE) {</div><div class='add'>+			printk(KERN_ERR PFX "invalid pstate %d - bad value %d.\n", i, index);</div><div class='add'>+			printk(KERN_ERR PFX "Please report to BIOS manufacturer\n");</div><div class='add'>+		}</div><div class='add'>+		rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi);</div><div class='add'>+		if (!(hi &amp; HW_PSTATE_VALID_MASK)) {</div><div class='add'>+			dprintk("invalid pstate %d, ignoring\n", index);</div><div class='add'>+			powernow_table[i].frequency = CPUFREQ_ENTRY_INVALID;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fid = lo &amp; HW_PSTATE_FID_MASK;</div><div class='add'>+		did = (lo &amp; HW_PSTATE_DID_MASK) &gt;&gt; HW_PSTATE_DID_SHIFT;</div><div class='add'>+</div><div class='add'>+		dprintk("   %d : fid 0x%x, did 0x%x\n", index, fid, did);</div><div class='add'>+</div><div class='add'>+		powernow_table[i].index = index | (fid &lt;&lt; HW_FID_INDEX_SHIFT) | (did &lt;&lt; HW_DID_INDEX_SHIFT);</div><div class='add'>+</div><div class='add'>+		powernow_table[i].frequency = find_khz_freq_from_fiddid(fid, did);</div><div class='add'>+</div><div class='add'>+		if (powernow_table[i].frequency != (data-&gt;acpi_data.states[i].core_frequency * 1000)) {</div><div class='add'>+			printk(KERN_INFO PFX "invalid freq entries %u kHz vs. %u kHz\n",</div><div class='add'>+				powernow_table[i].frequency,</div><div class='add'>+				(unsigned int) (data-&gt;acpi_data.states[i].core_frequency * 1000));</div><div class='add'>+			powernow_table[i].frequency = CPUFREQ_ENTRY_INVALID;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpufreq_frequency_table *powernow_table)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int cntlofreq = 0;</div><div class='ctx'> 	for (i = 0; i &lt; data-&gt;acpi_data.state_count; i++) {</div><div class='ctx'> 		u32 fid;</div><div class='ctx'> 		u32 vid;</div><div class='ctx'> </div><div class='ctx'> 		if (data-&gt;exttype) {</div><div class='del'>-			fid = data-&gt;acpi_data.states[i].status &amp; FID_MASK;</div><div class='del'>-			vid = (data-&gt;acpi_data.states[i].status &gt;&gt; VID_SHIFT) &amp; VID_MASK;</div><div class='add'>+			fid = data-&gt;acpi_data.states[i].status &amp; EXT_FID_MASK;</div><div class='add'>+			vid = (data-&gt;acpi_data.states[i].status &gt;&gt; VID_SHIFT) &amp; EXT_VID_MASK;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fid = data-&gt;acpi_data.states[i].control &amp; FID_MASK;</div><div class='ctx'> 			vid = (data-&gt;acpi_data.states[i].control &gt;&gt; VID_SHIFT) &amp; VID_MASK;</div><div class='hunk'>@@ -786,7 +920,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)</div><div class='ctx'> 				if ((powernow_table[i].frequency != powernow_table[cntlofreq].frequency) ||</div><div class='ctx'> 				    (powernow_table[i].index != powernow_table[cntlofreq].index)) {</div><div class='ctx'> 					printk(KERN_ERR PFX "Too many lo freq table entries\n");</div><div class='del'>-					goto err_out_mem;</div><div class='add'>+					return 1;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				dprintk("double low frequency table entry, ignoring it.\n");</div><div class='hunk'>@@ -804,31 +938,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	powernow_table[data-&gt;acpi_data.state_count].frequency = CPUFREQ_TABLE_END;</div><div class='del'>-	powernow_table[data-&gt;acpi_data.state_count].index = 0;</div><div class='del'>-	data-&gt;powernow_table = powernow_table;</div><div class='del'>-</div><div class='del'>-	/* fill in data */</div><div class='del'>-	data-&gt;numps = data-&gt;acpi_data.state_count;</div><div class='del'>-	print_basics(data);</div><div class='del'>-	powernow_k8_acpi_pst_values(data, 0);</div><div class='del'>-</div><div class='del'>-	/* notify BIOS that we exist */</div><div class='del'>-	acpi_processor_notify_smm(THIS_MODULE);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_out_mem:</div><div class='del'>-	kfree(powernow_table);</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	acpi_processor_unregister_performance(&amp;data-&gt;acpi_data, data-&gt;cpu);</div><div class='del'>-</div><div class='del'>-	/* data-&gt;acpi_data.state_count informs us at -&gt;exit() whether ACPI was used */</div><div class='del'>-	data-&gt;acpi_data.state_count = 0;</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data)</div><div class='hunk'>@@ -844,20 +954,20 @@ static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned</div><div class='ctx'> #endif /* CONFIG_X86_POWERNOW_K8_ACPI */</div><div class='ctx'> </div><div class='ctx'> /* Take a frequency, and issue the fid/vid transition command */</div><div class='del'>-static int transition_frequency(struct powernow_k8_data *data, unsigned int index)</div><div class='add'>+static int transition_frequency_fidvid(struct powernow_k8_data *data, unsigned int index)</div><div class='ctx'> {</div><div class='del'>-	u32 fid;</div><div class='del'>-	u32 vid;</div><div class='add'>+	u32 fid = 0;</div><div class='add'>+	u32 vid = 0;</div><div class='ctx'> 	int res, i;</div><div class='ctx'> 	struct cpufreq_freqs freqs;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("cpu %d transition to index %u\n", smp_processor_id(), index);</div><div class='ctx'> </div><div class='add'>+	/* fid/vid correctness check for k8 */</div><div class='ctx'> 	/* fid are the lower 8 bits of the index we stored into</div><div class='del'>-	 * the cpufreq frequency table in find_psb_table, vid are</div><div class='del'>-	 * the upper 8 bits.</div><div class='add'>+	 * the cpufreq frequency table in find_psb_table, vid</div><div class='add'>+	 * are the upper 8 bits.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	fid = data-&gt;powernow_table[index].index &amp; 0xFF;</div><div class='ctx'> 	vid = (data-&gt;powernow_table[index].index &amp; 0xFF00) &gt;&gt; 8;</div><div class='ctx'> </div><div class='hunk'>@@ -881,22 +991,58 @@ static int transition_frequency(struct powernow_k8_data *data, unsigned int inde</div><div class='ctx'> </div><div class='ctx'> 	dprintk("cpu %d, changing to fid 0x%x, vid 0x%x\n",</div><div class='ctx'> 		smp_processor_id(), fid, vid);</div><div class='del'>-</div><div class='del'>-	freqs.cpu = data-&gt;cpu;</div><div class='ctx'> 	freqs.old = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='ctx'> 	freqs.new = find_khz_freq_from_fid(fid);</div><div class='del'>-	for_each_cpu_mask(i, cpu_core_map[data-&gt;cpu]) {</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(i, *(data-&gt;available_cores)) {</div><div class='ctx'> 		freqs.cpu = i;</div><div class='ctx'> 		cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	res = transition_fid_vid(data, fid, vid);</div><div class='del'>-</div><div class='ctx'> 	freqs.new = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='del'>-	for_each_cpu_mask(i, cpu_core_map[data-&gt;cpu]) {</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(i, *(data-&gt;available_cores)) {</div><div class='ctx'> 		freqs.cpu = i;</div><div class='ctx'> 		cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='del'>-        }</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Take a frequency, and issue the hardware pstate transition command */</div><div class='add'>+static int transition_frequency_pstate(struct powernow_k8_data *data, unsigned int index)</div><div class='add'>+{</div><div class='add'>+	u32 fid = 0;</div><div class='add'>+	u32 did = 0;</div><div class='add'>+	u32 pstate = 0;</div><div class='add'>+	int res, i;</div><div class='add'>+	struct cpufreq_freqs freqs;</div><div class='add'>+</div><div class='add'>+	dprintk("cpu %d transition to index %u\n", smp_processor_id(), index);</div><div class='add'>+</div><div class='add'>+	/* get fid did for hardware pstate transition */</div><div class='add'>+	pstate = index &amp; HW_PSTATE_MASK;</div><div class='add'>+	if (pstate &gt; MAX_HW_PSTATE)</div><div class='add'>+		return 0;</div><div class='add'>+	fid = (index &amp; HW_FID_INDEX_MASK) &gt;&gt; HW_FID_INDEX_SHIFT;</div><div class='add'>+	did = (index &amp; HW_DID_INDEX_MASK) &gt;&gt; HW_DID_INDEX_SHIFT;</div><div class='add'>+	freqs.old = find_khz_freq_from_fiddid(data-&gt;currfid, data-&gt;currdid);</div><div class='add'>+	freqs.new = find_khz_freq_from_fiddid(fid, did);</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(i, *(data-&gt;available_cores)) {</div><div class='add'>+		freqs.cpu = i;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = transition_pstate(data, pstate);</div><div class='add'>+	data-&gt;currfid = find_fid_from_pstate(pstate);</div><div class='add'>+	data-&gt;currdid = find_did_from_pstate(pstate);</div><div class='add'>+	freqs.new = find_khz_freq_from_fiddid(data-&gt;currfid, data-&gt;currdid);</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(i, *(data-&gt;available_cores)) {</div><div class='add'>+		freqs.cpu = i;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -933,18 +1079,21 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi</div><div class='ctx'> 	dprintk("targ: cpu %d, %d kHz, min %d, max %d, relation %d\n",</div><div class='ctx'> 		pol-&gt;cpu, targfreq, pol-&gt;min, pol-&gt;max, relation);</div><div class='ctx'> </div><div class='del'>-	if (query_current_values_with_pending_wait(data)) {</div><div class='del'>-		ret = -EIO;</div><div class='add'>+	if (query_current_values_with_pending_wait(data))</div><div class='ctx'> 		goto err_out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	dprintk("targ: curr fid 0x%x, vid 0x%x\n",</div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		dprintk("targ: curr fid 0x%x, did 0x%x\n",</div><div class='add'>+			data-&gt;currfid, data-&gt;currvid);</div><div class='add'>+	else {</div><div class='add'>+		dprintk("targ: curr fid 0x%x, vid 0x%x\n",</div><div class='ctx'> 		data-&gt;currfid, data-&gt;currvid);</div><div class='ctx'> </div><div class='del'>-	if ((checkvid != data-&gt;currvid) || (checkfid != data-&gt;currfid)) {</div><div class='del'>-		printk(KERN_INFO PFX</div><div class='del'>-			"error - out of sync, fix 0x%x 0x%x, vid 0x%x 0x%x\n",</div><div class='del'>-			checkfid, data-&gt;currfid, checkvid, data-&gt;currvid);</div><div class='add'>+		if ((checkvid != data-&gt;currvid) || (checkfid != data-&gt;currfid)) {</div><div class='add'>+			printk(KERN_INFO PFX</div><div class='add'>+				"error - out of sync, fix 0x%x 0x%x, vid 0x%x 0x%x\n",</div><div class='add'>+				checkfid, data-&gt;currfid, checkvid, data-&gt;currvid);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpufreq_frequency_table_target(pol, data-&gt;powernow_table, targfreq, relation, &amp;newstate))</div><div class='hunk'>@@ -954,7 +1103,11 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi</div><div class='ctx'> </div><div class='ctx'> 	powernow_k8_acpi_pst_values(data, newstate);</div><div class='ctx'> </div><div class='del'>-	if (transition_frequency(data, newstate)) {</div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		ret = transition_frequency_pstate(data, newstate);</div><div class='add'>+	else</div><div class='add'>+		ret = transition_frequency_fidvid(data, newstate);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR PFX "transition frequency failed\n");</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 		mutex_unlock(&amp;fidvid_mutex);</div><div class='hunk'>@@ -962,7 +1115,10 @@ static int powernowk8_target(struct cpufreq_policy *pol, unsigned targfreq, unsi</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;fidvid_mutex);</div><div class='ctx'> </div><div class='del'>-	pol-&gt;cur = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		pol-&gt;cur = find_khz_freq_from_fiddid(data-&gt;currfid, data-&gt;currdid);</div><div class='add'>+	else</div><div class='add'>+		pol-&gt;cur = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='hunk'>@@ -1007,14 +1163,13 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)</div><div class='ctx'> 		 * Use the PSB BIOS structure. This is only availabe on</div><div class='ctx'> 		 * an UP version, and is deprecated by AMD.</div><div class='ctx'> 		 */</div><div class='del'>-</div><div class='del'>-		if ((num_online_cpus() != 1) || (num_possible_cpus() != 1)) {</div><div class='add'>+		if (num_online_cpus() != 1) {</div><div class='ctx'> 			printk(KERN_ERR PFX "MP systems not supported by PSB BIOS structure\n");</div><div class='ctx'> 			kfree(data);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (pol-&gt;cpu != 0) {</div><div class='del'>-			printk(KERN_ERR PFX "init not cpu 0\n");</div><div class='add'>+			printk(KERN_ERR PFX "No _PSS objects for CPU other than CPU0\n");</div><div class='ctx'> 			kfree(data);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1042,20 +1197,28 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)</div><div class='ctx'> 	if (query_current_values_with_pending_wait(data))</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='del'>-	fidvid_msr_init();</div><div class='add'>+	if (cpu_family == CPU_OPTERON)</div><div class='add'>+		fidvid_msr_init();</div><div class='ctx'> </div><div class='ctx'> 	/* run on any CPU again */</div><div class='ctx'> 	set_cpus_allowed(current, oldmask);</div><div class='ctx'> </div><div class='ctx'> 	pol-&gt;governor = CPUFREQ_DEFAULT_GOVERNOR;</div><div class='del'>-	pol-&gt;cpus = cpu_core_map[pol-&gt;cpu];</div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		pol-&gt;cpus = cpumask_of_cpu(pol-&gt;cpu);</div><div class='add'>+	else</div><div class='add'>+		pol-&gt;cpus = cpu_core_map[pol-&gt;cpu];</div><div class='add'>+	data-&gt;available_cores = &amp;(pol-&gt;cpus);</div><div class='ctx'> </div><div class='ctx'> 	/* Take a crude guess here.</div><div class='ctx'> 	 * That guess was in microseconds, so multiply with 1000 */</div><div class='ctx'> 	pol-&gt;cpuinfo.transition_latency = (((data-&gt;rvo + 8) * data-&gt;vstable * VST_UNITS_20US)</div><div class='ctx'> 	    + (3 * (1 &lt;&lt; data-&gt;irt) * 10)) * 1000;</div><div class='ctx'> </div><div class='del'>-	pol-&gt;cur = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		pol-&gt;cur = find_khz_freq_from_fiddid(data-&gt;currfid, data-&gt;currdid);</div><div class='add'>+	else</div><div class='add'>+		pol-&gt;cur = find_khz_freq_from_fid(data-&gt;currfid);</div><div class='ctx'> 	dprintk("policy current frequency %d kHz\n", pol-&gt;cur);</div><div class='ctx'> </div><div class='ctx'> 	/* min/max the cpu is capable of */</div><div class='hunk'>@@ -1069,8 +1232,12 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_frequency_table_get_attr(data-&gt;powernow_table, pol-&gt;cpu);</div><div class='ctx'> </div><div class='del'>-	printk("cpu_init done, current fid 0x%x, vid 0x%x\n",</div><div class='del'>-	       data-&gt;currfid, data-&gt;currvid);</div><div class='add'>+	if (cpu_family == CPU_HW_PSTATE)</div><div class='add'>+		dprintk("cpu_init done, current fid 0x%x, did 0x%x\n",</div><div class='add'>+			data-&gt;currfid, data-&gt;currdid);</div><div class='add'>+	else</div><div class='add'>+		dprintk("cpu_init done, current fid 0x%x, vid 0x%x\n",</div><div class='add'>+			data-&gt;currfid, data-&gt;currvid);</div><div class='ctx'> </div><div class='ctx'> 	powernow_data[pol-&gt;cpu] = data;</div><div class='ctx'> </div><div class='hunk'>@@ -1156,8 +1323,9 @@ static int __cpuinit powernowk8_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (supported_cpus == num_online_cpus()) {</div><div class='del'>-		printk(KERN_INFO PFX "Found %d AMD Athlon 64 / Opteron "</div><div class='del'>-			"processors (" VERSION ")\n", supported_cpus);</div><div class='add'>+		printk(KERN_INFO PFX "Found %d %s "</div><div class='add'>+			"processors (" VERSION ")\n", supported_cpus,</div><div class='add'>+			boot_cpu_data.x86_model_id);</div><div class='ctx'> 		return cpufreq_register_driver(&amp;cpufreq_amd64_driver);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h b/arch/i386/kernel/cpu/cpufreq/powernow-k8.h<br/>index 79a7c5c87edc..0fb2a3001ba5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/powernow-k8.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/powernow-k8.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/powernow-k8.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/powernow-k8.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  (c) 2003, 2004, 2005 Advanced Micro Devices, Inc.</div><div class='add'>+ *  (c) 2003-2006 Advanced Micro Devices, Inc.</div><div class='ctx'>  *  Your use of this code is subject to the terms and conditions of the</div><div class='ctx'>  *  GNU general public license version 2. See "COPYING" or</div><div class='ctx'>  *  http://www.gnu.org/licenses/gpl.html</div><div class='hunk'>@@ -21,8 +21,8 @@ struct powernow_k8_data {</div><div class='ctx'> 	u32 plllock; /* pll lock time, units 1 us */</div><div class='ctx'>         u32 exttype; /* extended interface = 1 */</div><div class='ctx'> </div><div class='del'>-	/* keep track of the current fid / vid */</div><div class='del'>-	u32 currvid, currfid;</div><div class='add'>+	/* keep track of the current fid / vid or did */</div><div class='add'>+	u32 currvid, currfid, currdid;</div><div class='ctx'> </div><div class='ctx'> 	/* the powernow_table includes all frequency and vid/fid pairings:</div><div class='ctx'> 	 * fid are the lower 8 bits of the index, vid are the upper 8 bits.</div><div class='hunk'>@@ -34,6 +34,10 @@ struct powernow_k8_data {</div><div class='ctx'> 	 * used to determine valid frequency/vid/fid states */</div><div class='ctx'> 	struct acpi_processor_performance acpi_data;</div><div class='ctx'> #endif</div><div class='add'>+	/* we need to keep track of associated cores, but let cpufreq</div><div class='add'>+	 * handle hotplug events - so just point at cpufreq pol-&gt;cpus</div><div class='add'>+	 * structure */</div><div class='add'>+	cpumask_t *available_cores;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -43,6 +47,7 @@ struct powernow_k8_data {</div><div class='ctx'> #define CPUID_XFAM_K8			0</div><div class='ctx'> #define CPUID_XMOD			0x000f0000	/* extended model */</div><div class='ctx'> #define CPUID_XMOD_REV_G		0x00060000</div><div class='add'>+#define CPUID_XFAM_10H 			0x00100000	/* family 0x10 */</div><div class='ctx'> #define CPUID_USE_XFAM_XMOD		0x00000f00</div><div class='ctx'> #define CPUID_GET_MAX_CAPABILITIES	0x80000000</div><div class='ctx'> #define CPUID_FREQ_VOLT_CAPABILITIES	0x80000007</div><div class='hunk'>@@ -79,6 +84,32 @@ struct powernow_k8_data {</div><div class='ctx'> #define MSR_S_HI_CURRENT_VID      0x0000003f</div><div class='ctx'> #define MSR_C_HI_STP_GNT_BENIGN	  0x00000001</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Hardware Pstate _PSS and MSR definitions */</div><div class='add'>+#define USE_HW_PSTATE		0x00000080</div><div class='add'>+#define HW_PSTATE_FID_MASK 	0x0000003f</div><div class='add'>+#define HW_PSTATE_DID_MASK 	0x000001c0</div><div class='add'>+#define HW_PSTATE_DID_SHIFT 	6</div><div class='add'>+#define HW_PSTATE_MASK 		0x00000007</div><div class='add'>+#define HW_PSTATE_VALID_MASK 	0x80000000</div><div class='add'>+#define HW_FID_INDEX_SHIFT	8</div><div class='add'>+#define HW_FID_INDEX_MASK	0x0000ff00</div><div class='add'>+#define HW_DID_INDEX_SHIFT	16</div><div class='add'>+#define HW_DID_INDEX_MASK	0x00ff0000</div><div class='add'>+#define HW_WATTS_MASK		0xff</div><div class='add'>+#define HW_PWR_DVR_MASK		0x300</div><div class='add'>+#define HW_PWR_DVR_SHIFT	8</div><div class='add'>+#define HW_PWR_MAX_MULT		3</div><div class='add'>+#define MAX_HW_PSTATE		8	/* hw pstate supports up to 8 */</div><div class='add'>+#define MSR_PSTATE_DEF_BASE 	0xc0010064 /* base of Pstate MSRs */</div><div class='add'>+#define MSR_PSTATE_STATUS 	0xc0010063 /* Pstate Status MSR */</div><div class='add'>+#define MSR_PSTATE_CTRL 	0xc0010062 /* Pstate control MSR */</div><div class='add'>+</div><div class='add'>+/* define the two driver architectures */</div><div class='add'>+#define CPU_OPTERON 0</div><div class='add'>+#define CPU_HW_PSTATE 1</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * There are restrictions frequencies have to follow:</div><div class='ctx'>  * - only 1 entry in the low fid table ( &lt;=1.4GHz )</div><div class='hunk'>@@ -138,7 +169,9 @@ struct powernow_k8_data {</div><div class='ctx'> #define MVS_MASK        3</div><div class='ctx'> #define VST_MASK     0x7f</div><div class='ctx'> #define VID_MASK     0x1f</div><div class='del'>-#define FID_MASK     0x3f</div><div class='add'>+#define FID_MASK     0x1f</div><div class='add'>+#define EXT_VID_MASK 0x3f</div><div class='add'>+#define EXT_FID_MASK 0x3f</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -182,6 +215,9 @@ static int core_frequency_transition(struct powernow_k8_data *data, u32 reqfid);</div><div class='ctx'> </div><div class='ctx'> static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index);</div><div class='ctx'> </div><div class='add'>+static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpufreq_frequency_table *powernow_table);</div><div class='add'>+static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpufreq_frequency_table *powernow_table);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static inline void define_siblings(int cpu, cpumask_t cpu_sharedcore_mask[])</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c<br/>index b0ff9075708c..b77f1358bd79 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c</a></div><div class='hunk'>@@ -2,26 +2,21 @@</div><div class='ctx'>  * cpufreq driver for Enhanced SpeedStep, as found in Intel's Pentium</div><div class='ctx'>  * M (part of the Centrino chipset).</div><div class='ctx'>  *</div><div class='add'>+ * Since the original Pentium M, most new Intel CPUs support Enhanced</div><div class='add'>+ * SpeedStep.</div><div class='add'>+ *</div><div class='ctx'>  * Despite the "SpeedStep" in the name, this is almost entirely unlike</div><div class='ctx'>  * traditional SpeedStep.</div><div class='ctx'>  *</div><div class='ctx'>  * Modelled on speedstep.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 Jeremy Fitzhardinge &lt;jeremy@goop.org&gt;</div><div class='del'>- *</div><div class='del'>- * WARNING WARNING WARNING</div><div class='del'>- *</div><div class='del'>- * This driver manipulates the PERF_CTL MSR, which is only somewhat</div><div class='del'>- * documented.  While it seems to work on my laptop, it has not been</div><div class='del'>- * tested anywhere else, and it may not work for you, do strange</div><div class='del'>- * things or simply crash.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;	/* current */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='hunk'>@@ -36,7 +31,7 @@</div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PFX		"speedstep-centrino: "</div><div class='del'>-#define MAINTAINER	"Jeremy Fitzhardinge &lt;jeremy@goop.org&gt;"</div><div class='add'>+#define MAINTAINER	"cpufreq@lists.linux.org.uk"</div><div class='ctx'> </div><div class='ctx'> #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)</div><div class='ctx'> </div><div class='hunk'>@@ -250,7 +245,7 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	if (model-&gt;cpu_id == NULL) {</div><div class='ctx'> 		/* No match at all */</div><div class='del'>-		dprintk(KERN_INFO PFX "no support for CPU model \"%s\": "</div><div class='add'>+		dprintk("no support for CPU model \"%s\": "</div><div class='ctx'> 		       "send /proc/cpuinfo to " MAINTAINER "\n",</div><div class='ctx'> 		       cpu-&gt;x86_model_id);</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -258,10 +253,10 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> 	if (model-&gt;op_points == NULL) {</div><div class='ctx'> 		/* Matched a non-match */</div><div class='del'>-		dprintk(KERN_INFO PFX "no table support for CPU model \"%s\"\n",</div><div class='add'>+		dprintk("no table support for CPU model \"%s\"\n",</div><div class='ctx'> 		       cpu-&gt;x86_model_id);</div><div class='ctx'> #ifndef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI</div><div class='del'>-		dprintk(KERN_INFO PFX "try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled\n");</div><div class='add'>+		dprintk("try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -351,7 +346,36 @@ static unsigned int get_cur_freq(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI</div><div class='ctx'> </div><div class='del'>-static struct acpi_processor_performance p;</div><div class='add'>+static struct acpi_processor_performance *acpi_perf_data[NR_CPUS];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * centrino_cpu_early_init_acpi - Do the preregistering with ACPI P-States</div><div class='add'>+ * library</div><div class='add'>+ *</div><div class='add'>+ * Before doing the actual init, we need to do _PSD related setup whenever</div><div class='add'>+ * supported by the BIOS. These are handled by this early_init routine.</div><div class='add'>+ */</div><div class='add'>+static int centrino_cpu_early_init_acpi(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int	i, j;</div><div class='add'>+	struct acpi_processor_performance	*data;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		data = kzalloc(sizeof(struct acpi_processor_performance), </div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+		if (!data) {</div><div class='add'>+			for_each_possible_cpu(j) {</div><div class='add'>+				kfree(acpi_perf_data[j]);</div><div class='add'>+				acpi_perf_data[j] = NULL;</div><div class='add'>+			}</div><div class='add'>+			return (-ENOMEM);</div><div class='add'>+		}</div><div class='add'>+		acpi_perf_data[i] = data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_processor_preregister_performance(acpi_perf_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * centrino_cpu_init_acpi - register with ACPI P-States library</div><div class='hunk'>@@ -365,46 +389,57 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)</div><div class='ctx'> 	unsigned long			cur_freq;</div><div class='ctx'> 	int				result = 0, i;</div><div class='ctx'> 	unsigned int			cpu = policy-&gt;cpu;</div><div class='add'>+	struct acpi_processor_performance	*p;</div><div class='add'>+</div><div class='add'>+	p = acpi_perf_data[cpu];</div><div class='ctx'> </div><div class='ctx'> 	/* register with ACPI core */</div><div class='del'>-	if (acpi_processor_register_performance(&amp;p, cpu)) {</div><div class='del'>-		dprintk(KERN_INFO PFX "obtaining ACPI data failed\n");</div><div class='add'>+	if (acpi_processor_register_performance(p, cpu)) {</div><div class='add'>+		dprintk(PFX "obtaining ACPI data failed\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='add'>+	policy-&gt;shared_type = p-&gt;shared_type;</div><div class='add'>+	/*</div><div class='add'>+	 * Will let policy-&gt;cpus know about dependency only when software </div><div class='add'>+	 * coordination is required.</div><div class='add'>+	 */</div><div class='add'>+	if (policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ALL ||</div><div class='add'>+	    policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ANY)</div><div class='add'>+		policy-&gt;cpus = p-&gt;shared_cpu_map;</div><div class='ctx'> </div><div class='ctx'> 	/* verify the acpi_data */</div><div class='del'>-	if (p.state_count &lt;= 1) {</div><div class='add'>+	if (p-&gt;state_count &lt;= 1) {</div><div class='ctx'> 		dprintk("No P-States\n");</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto err_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((p.control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) ||</div><div class='del'>-	    (p.status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {</div><div class='add'>+	if ((p-&gt;control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) ||</div><div class='add'>+	    (p-&gt;status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {</div><div class='ctx'> 		dprintk("Invalid control/status registers (%x - %x)\n",</div><div class='del'>-			p.control_register.space_id, p.status_register.space_id);</div><div class='add'>+			p-&gt;control_register.space_id, p-&gt;status_register.space_id);</div><div class='ctx'> 		result = -EIO;</div><div class='ctx'> 		goto err_unreg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;p.state_count; i++) {</div><div class='del'>-		if (p.states[i].control != p.states[i].status) {</div><div class='add'>+	for (i=0; i&lt;p-&gt;state_count; i++) {</div><div class='add'>+		if (p-&gt;states[i].control != p-&gt;states[i].status) {</div><div class='ctx'> 			dprintk("Different control (%llu) and status values (%llu)\n",</div><div class='del'>-				p.states[i].control, p.states[i].status);</div><div class='add'>+				p-&gt;states[i].control, p-&gt;states[i].status);</div><div class='ctx'> 			result = -EINVAL;</div><div class='ctx'> 			goto err_unreg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!p.states[i].core_frequency) {</div><div class='add'>+		if (!p-&gt;states[i].core_frequency) {</div><div class='ctx'> 			dprintk("Zero core frequency for state %u\n", i);</div><div class='ctx'> 			result = -EINVAL;</div><div class='ctx'> 			goto err_unreg;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (p.states[i].core_frequency &gt; p.states[0].core_frequency) {</div><div class='add'>+		if (p-&gt;states[i].core_frequency &gt; p-&gt;states[0].core_frequency) {</div><div class='ctx'> 			dprintk("P%u has larger frequency (%llu) than P0 (%llu), skipping\n", i,</div><div class='del'>-				p.states[i].core_frequency, p.states[0].core_frequency);</div><div class='del'>-			p.states[i].core_frequency = 0;</div><div class='add'>+				p-&gt;states[i].core_frequency, p-&gt;states[0].core_frequency);</div><div class='add'>+			p-&gt;states[i].core_frequency = 0;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -416,26 +451,26 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	centrino_model[cpu]-&gt;model_name=NULL;</div><div class='del'>-	centrino_model[cpu]-&gt;max_freq = p.states[0].core_frequency * 1000;</div><div class='add'>+	centrino_model[cpu]-&gt;max_freq = p-&gt;states[0].core_frequency * 1000;</div><div class='ctx'> 	centrino_model[cpu]-&gt;op_points =  kmalloc(sizeof(struct cpufreq_frequency_table) *</div><div class='del'>-					     (p.state_count + 1), GFP_KERNEL);</div><div class='add'>+					     (p-&gt;state_count + 1), GFP_KERNEL);</div><div class='ctx'>         if (!centrino_model[cpu]-&gt;op_points) {</div><div class='ctx'>                 result = -ENOMEM;</div><div class='ctx'>                 goto err_kfree;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        for (i=0; i&lt;p.state_count; i++) {</div><div class='del'>-		centrino_model[cpu]-&gt;op_points[i].index = p.states[i].control;</div><div class='del'>-		centrino_model[cpu]-&gt;op_points[i].frequency = p.states[i].core_frequency * 1000;</div><div class='add'>+        for (i=0; i&lt;p-&gt;state_count; i++) {</div><div class='add'>+		centrino_model[cpu]-&gt;op_points[i].index = p-&gt;states[i].control;</div><div class='add'>+		centrino_model[cpu]-&gt;op_points[i].frequency = p-&gt;states[i].core_frequency * 1000;</div><div class='ctx'> 		dprintk("adding state %i with frequency %u and control value %04x\n", </div><div class='ctx'> 			i, centrino_model[cpu]-&gt;op_points[i].frequency, centrino_model[cpu]-&gt;op_points[i].index);</div><div class='ctx'> 	}</div><div class='del'>-	centrino_model[cpu]-&gt;op_points[p.state_count].frequency = CPUFREQ_TABLE_END;</div><div class='add'>+	centrino_model[cpu]-&gt;op_points[p-&gt;state_count].frequency = CPUFREQ_TABLE_END;</div><div class='ctx'> </div><div class='ctx'> 	cur_freq = get_cur_freq(cpu);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;p.state_count; i++) {</div><div class='del'>-		if (!p.states[i].core_frequency) {</div><div class='add'>+	for (i=0; i&lt;p-&gt;state_count; i++) {</div><div class='add'>+		if (!p-&gt;states[i].core_frequency) {</div><div class='ctx'> 			dprintk("skipping state %u\n", i);</div><div class='ctx'> 			centrino_model[cpu]-&gt;op_points[i].frequency = CPUFREQ_ENTRY_INVALID;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -451,7 +486,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (cur_freq == centrino_model[cpu]-&gt;op_points[i].frequency)</div><div class='del'>-			p.state = i;</div><div class='add'>+			p-&gt;state = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* notify BIOS that we exist */</div><div class='hunk'>@@ -464,12 +499,13 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)</div><div class='ctx'>  err_kfree:</div><div class='ctx'> 	kfree(centrino_model[cpu]);</div><div class='ctx'>  err_unreg:</div><div class='del'>-	acpi_processor_unregister_performance(&amp;p, cpu);</div><div class='del'>-	dprintk(KERN_INFO PFX "invalid ACPI data\n");</div><div class='add'>+	acpi_processor_unregister_performance(p, cpu);</div><div class='add'>+	dprintk(PFX "invalid ACPI data\n");</div><div class='ctx'> 	return (result);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline int centrino_cpu_init_acpi(struct cpufreq_policy *policy) { return -ENODEV; }</div><div class='add'>+static inline int centrino_cpu_early_init_acpi(void) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int centrino_cpu_init(struct cpufreq_policy *policy)</div><div class='hunk'>@@ -499,7 +535,7 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)</div><div class='ctx'> 			centrino_cpu[policy-&gt;cpu] = &amp;cpu_ids[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!centrino_cpu[policy-&gt;cpu]) {</div><div class='del'>-			dprintk(KERN_INFO PFX "found unsupported CPU with "</div><div class='add'>+			dprintk("found unsupported CPU with "</div><div class='ctx'> 			"Enhanced SpeedStep: send /proc/cpuinfo to "</div><div class='ctx'> 			MAINTAINER "\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='hunk'>@@ -555,10 +591,15 @@ static int centrino_cpu_exit(struct cpufreq_policy *policy)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI</div><div class='ctx'> 	if (!centrino_model[cpu]-&gt;model_name) {</div><div class='del'>-		dprintk("unregistering and freeing ACPI data\n");</div><div class='del'>-		acpi_processor_unregister_performance(&amp;p, cpu);</div><div class='del'>-		kfree(centrino_model[cpu]-&gt;op_points);</div><div class='del'>-		kfree(centrino_model[cpu]);</div><div class='add'>+		static struct acpi_processor_performance *p;</div><div class='add'>+</div><div class='add'>+		if (acpi_perf_data[cpu]) {</div><div class='add'>+			p = acpi_perf_data[cpu];</div><div class='add'>+			dprintk("unregistering and freeing ACPI data\n");</div><div class='add'>+			acpi_processor_unregister_performance(p, cpu);</div><div class='add'>+			kfree(centrino_model[cpu]-&gt;op_points);</div><div class='add'>+			kfree(centrino_model[cpu]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -592,63 +633,128 @@ static int centrino_target (struct cpufreq_policy *policy,</div><div class='ctx'> 			    unsigned int relation)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int    newstate = 0;</div><div class='del'>-	unsigned int	msr, oldmsr, h, cpu = policy-&gt;cpu;</div><div class='add'>+	unsigned int	msr, oldmsr = 0, h = 0, cpu = policy-&gt;cpu;</div><div class='ctx'> 	struct cpufreq_freqs	freqs;</div><div class='add'>+	cpumask_t		online_policy_cpus;</div><div class='ctx'> 	cpumask_t		saved_mask;</div><div class='del'>-	int			retval;</div><div class='add'>+	cpumask_t		set_mask;</div><div class='add'>+	cpumask_t		covered_cpus;</div><div class='add'>+	int			retval = 0;</div><div class='add'>+	unsigned int		j, k, first_cpu, tmp;</div><div class='ctx'> </div><div class='del'>-	if (centrino_model[cpu] == NULL)</div><div class='add'>+	if (unlikely(centrino_model[cpu] == NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Support for SMP systems.</div><div class='del'>-	 * Make sure we are running on the CPU that wants to change frequency</div><div class='del'>-	 */</div><div class='del'>-	saved_mask = current-&gt;cpus_allowed;</div><div class='del'>-	set_cpus_allowed(current, policy-&gt;cpus);</div><div class='del'>-	if (!cpu_isset(smp_processor_id(), policy-&gt;cpus)) {</div><div class='del'>-		dprintk("couldn't limit to CPUs in this domain\n");</div><div class='del'>-		return(-EAGAIN);</div><div class='add'>+	if (unlikely(cpufreq_frequency_table_target(policy,</div><div class='add'>+			centrino_model[cpu]-&gt;op_points,</div><div class='add'>+			target_freq,</div><div class='add'>+			relation,</div><div class='add'>+			&amp;newstate))) {</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpufreq_frequency_table_target(policy, centrino_model[cpu]-&gt;op_points, target_freq,</div><div class='del'>-					   relation, &amp;newstate)) {</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto migrate_end;</div><div class='del'>-	}</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+	/* cpufreq holds the hotplug lock, so we are safe from here on */</div><div class='add'>+	cpus_and(online_policy_cpus, cpu_online_map, policy-&gt;cpus);</div><div class='add'>+#else</div><div class='add'>+	online_policy_cpus = policy-&gt;cpus;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	msr = centrino_model[cpu]-&gt;op_points[newstate].index;</div><div class='del'>-	rdmsr(MSR_IA32_PERF_CTL, oldmsr, h);</div><div class='add'>+	saved_mask = current-&gt;cpus_allowed;</div><div class='add'>+	first_cpu = 1;</div><div class='add'>+	cpus_clear(covered_cpus);</div><div class='add'>+	for_each_cpu_mask(j, online_policy_cpus) {</div><div class='add'>+		/*</div><div class='add'>+		 * Support for SMP systems.</div><div class='add'>+		 * Make sure we are running on CPU that wants to change freq</div><div class='add'>+		 */</div><div class='add'>+		cpus_clear(set_mask);</div><div class='add'>+		if (policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ANY)</div><div class='add'>+			cpus_or(set_mask, set_mask, online_policy_cpus);</div><div class='add'>+		else</div><div class='add'>+			cpu_set(j, set_mask);</div><div class='add'>+</div><div class='add'>+		set_cpus_allowed(current, set_mask);</div><div class='add'>+		if (unlikely(!cpu_isset(smp_processor_id(), set_mask))) {</div><div class='add'>+			dprintk("couldn't limit to CPUs in this domain\n");</div><div class='add'>+			retval = -EAGAIN;</div><div class='add'>+			if (first_cpu) {</div><div class='add'>+				/* We haven't started the transition yet. */</div><div class='add'>+				goto migrate_end;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (msr == (oldmsr &amp; 0xffff)) {</div><div class='del'>-		retval = 0;</div><div class='del'>-		dprintk("no change needed - msr was and needs to be %x\n", oldmsr);</div><div class='del'>-		goto migrate_end;</div><div class='del'>-	}</div><div class='add'>+		msr = centrino_model[cpu]-&gt;op_points[newstate].index;</div><div class='add'>+</div><div class='add'>+		if (first_cpu) {</div><div class='add'>+			rdmsr(MSR_IA32_PERF_CTL, oldmsr, h);</div><div class='add'>+			if (msr == (oldmsr &amp; 0xffff)) {</div><div class='add'>+				dprintk("no change needed - msr was and needs "</div><div class='add'>+					"to be %x\n", oldmsr);</div><div class='add'>+				retval = 0;</div><div class='add'>+				goto migrate_end;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			freqs.old = extract_clock(oldmsr, cpu, 0);</div><div class='add'>+			freqs.new = extract_clock(msr, cpu, 0);</div><div class='add'>+</div><div class='add'>+			dprintk("target=%dkHz old=%d new=%d msr=%04x\n",</div><div class='add'>+				target_freq, freqs.old, freqs.new, msr);</div><div class='add'>+</div><div class='add'>+			for_each_cpu_mask(k, online_policy_cpus) {</div><div class='add'>+				freqs.cpu = k;</div><div class='add'>+				cpufreq_notify_transition(&amp;freqs,</div><div class='add'>+					CPUFREQ_PRECHANGE);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			first_cpu = 0;</div><div class='add'>+			/* all but 16 LSB are reserved, treat them with care */</div><div class='add'>+			oldmsr &amp;= ~0xffff;</div><div class='add'>+			msr &amp;= 0xffff;</div><div class='add'>+			oldmsr |= msr;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	freqs.cpu = cpu;</div><div class='del'>-	freqs.old = extract_clock(oldmsr, cpu, 0);</div><div class='del'>-	freqs.new = extract_clock(msr, cpu, 0);</div><div class='add'>+		wrmsr(MSR_IA32_PERF_CTL, oldmsr, h);</div><div class='add'>+		if (policy-&gt;shared_type == CPUFREQ_SHARED_TYPE_ANY)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	dprintk("target=%dkHz old=%d new=%d msr=%04x\n",</div><div class='del'>-		target_freq, freqs.old, freqs.new, msr);</div><div class='add'>+		cpu_set(j, covered_cpus);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+	for_each_cpu_mask(k, online_policy_cpus) {</div><div class='add'>+		freqs.cpu = k;</div><div class='add'>+		cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* all but 16 LSB are "reserved", so treat them with</div><div class='del'>-	   care */</div><div class='del'>-	oldmsr &amp;= ~0xffff;</div><div class='del'>-	msr &amp;= 0xffff;</div><div class='del'>-	oldmsr |= msr;</div><div class='add'>+	if (unlikely(retval)) {</div><div class='add'>+		/*</div><div class='add'>+		 * We have failed halfway through the frequency change.</div><div class='add'>+		 * We have sent callbacks to policy-&gt;cpus and</div><div class='add'>+		 * MSRs have already been written on coverd_cpus.</div><div class='add'>+		 * Best effort undo..</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='del'>-	wrmsr(MSR_IA32_PERF_CTL, oldmsr, h);</div><div class='add'>+		if (!cpus_empty(covered_cpus)) {</div><div class='add'>+			for_each_cpu_mask(j, covered_cpus) {</div><div class='add'>+				set_cpus_allowed(current, cpumask_of_cpu(j));</div><div class='add'>+				wrmsr(MSR_IA32_PERF_CTL, oldmsr, h);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+		tmp = freqs.new;</div><div class='add'>+		freqs.new = freqs.old;</div><div class='add'>+		freqs.old = tmp;</div><div class='add'>+		for_each_cpu_mask(j, online_policy_cpus) {</div><div class='add'>+			freqs.cpu = j;</div><div class='add'>+			cpufreq_notify_transition(&amp;freqs, CPUFREQ_PRECHANGE);</div><div class='add'>+			cpufreq_notify_transition(&amp;freqs, CPUFREQ_POSTCHANGE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	retval = 0;</div><div class='ctx'> migrate_end:</div><div class='ctx'> 	set_cpus_allowed(current, saved_mask);</div><div class='del'>-	return (retval);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct freq_attr* centrino_attr[] = {</div><div class='hunk'>@@ -690,12 +796,25 @@ static int __init centrino_init(void)</div><div class='ctx'> 	if (!cpu_has(cpu, X86_FEATURE_EST))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	centrino_cpu_early_init_acpi();</div><div class='add'>+</div><div class='ctx'> 	return cpufreq_register_driver(&amp;centrino_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit centrino_exit(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI</div><div class='add'>+	unsigned int j;</div><div class='add'>+#endif</div><div class='add'>+	</div><div class='ctx'> 	cpufreq_unregister_driver(&amp;centrino_driver);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI</div><div class='add'>+	for_each_possible_cpu(j) {</div><div class='add'>+		kfree(acpi_perf_data[j]);</div><div class='add'>+		acpi_perf_data[j] = NULL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR ("Jeremy Fitzhardinge &lt;jeremy@goop.org&gt;");</div><div class='head'>diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c<br/>index 00f2e058797c..f03b7f94c304 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cyrix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/cyrix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/cyrix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/cyrix.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ static void __init geode_configure(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-static struct pci_device_id cyrix_55x0[] = {</div><div class='add'>+static struct pci_device_id __initdata cyrix_55x0[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520) },</div><div class='ctx'> 	{ },</div><div class='hunk'>@@ -272,14 +272,15 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_INFO "Working around Cyrix MediaGX virtual DMA bugs.\n");</div><div class='ctx'> 		isa_dma_bridge_buggy = 2;</div><div class='del'>-#endif		</div><div class='del'>-		c-&gt;x86_cache_size=16;	/* Yep 16K integrated cache thats it */</div><div class='del'>- </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *  The 5510/5520 companion chips have a funky PIT.</div><div class='ctx'> 		 */  </div><div class='ctx'> 		if (pci_dev_present(cyrix_55x0))</div><div class='ctx'> 			pit_latch_buggy = 1;</div><div class='add'>+#endif</div><div class='add'>+		c-&gt;x86_cache_size=16;	/* Yep 16K integrated cache thats it */</div><div class='ctx'> </div><div class='ctx'> 		/* GXm supports extended cpuid levels 'ala' AMD */</div><div class='ctx'> 		if (c-&gt;cpuid_level == 2) {</div><div class='hunk'>@@ -353,7 +354,7 @@ static void __init init_nsc(struct cpuinfo_x86 *c)</div><div class='ctx'> 	 * This function only handles the GX processor, and kicks every</div><div class='ctx'> 	 * thing else to the Cyrix init function above - that should</div><div class='ctx'> 	 * cover any processors that might have been branded differently</div><div class='del'>-	 * after NSC aquired Cyrix.</div><div class='add'>+	 * after NSC acquired Cyrix.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * If this breaks your GX1 horribly, please e-mail</div><div class='ctx'> 	 * info-linux@ldcmail.amd.com to tell us.</div><div class='head'>diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c<br/>index 5386b29bb5a5..5a2e270924b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/intel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/intel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/intel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/intel.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +121,12 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 	select_idle_routine(c);</div><div class='ctx'> 	l2 = init_intel_cacheinfo(c);</div><div class='add'>+	if (c-&gt;cpuid_level &gt; 9 ) {</div><div class='add'>+		unsigned eax = cpuid_eax(10);</div><div class='add'>+		/* Check for version and the number of counters */</div><div class='add'>+		if ((eax &amp; 0xff) &amp;&amp; (((eax&gt;&gt;8) &amp; 0xff) &gt; 1))</div><div class='add'>+			set_bit(X86_FEATURE_ARCH_PERFMON, c-&gt;x86_capability);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */</div><div class='ctx'> 	if ((c-&gt;x86&lt;&lt;8 | c-&gt;x86_model&lt;&lt;4 | c-&gt;x86_mask) &lt; 0x633)</div><div class='head'>diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c<br/>index c8547a6fa7e6..e9f0b928b0a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/intel_cacheinfo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/intel_cacheinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/intel_cacheinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/intel_cacheinfo.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *      Changes:</div><div class='ctx'>  *      Venkatesh Pallipadi	: Adding cache identification through cpuid(4)</div><div class='ctx'>  *		Ashok Raj &lt;ashok.raj@intel.com&gt;: Work with CPU hotplug infrastructure.</div><div class='add'>+ *	Andi Kleen		: CPUID4 emulation on AMD.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -130,25 +131,111 @@ struct _cpuid4_info {</div><div class='ctx'> 	cpumask_t shared_cpu_map;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short			num_cache_leaves;</div><div class='add'>+unsigned short			num_cache_leaves;</div><div class='add'>+</div><div class='add'>+/* AMD doesn't have CPUID4. Emulate it here to report the same</div><div class='add'>+   information to the user.  This makes some assumptions about the machine:</div><div class='add'>+   No L3, L2 not shared, no SMT etc. that is currently true on AMD CPUs.</div><div class='add'>+</div><div class='add'>+   In theory the TLBs could be reported as fake type (they are in "dummy").</div><div class='add'>+   Maybe later */</div><div class='add'>+union l1_cache {</div><div class='add'>+	struct {</div><div class='add'>+		unsigned line_size : 8;</div><div class='add'>+		unsigned lines_per_tag : 8;</div><div class='add'>+		unsigned assoc : 8;</div><div class='add'>+		unsigned size_in_kb : 8;</div><div class='add'>+	};</div><div class='add'>+	unsigned val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union l2_cache {</div><div class='add'>+	struct {</div><div class='add'>+		unsigned line_size : 8;</div><div class='add'>+		unsigned lines_per_tag : 4;</div><div class='add'>+		unsigned assoc : 4;</div><div class='add'>+		unsigned size_in_kb : 16;</div><div class='add'>+	};</div><div class='add'>+	unsigned val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned short assocs[] = {</div><div class='add'>+	[1] = 1, [2] = 2, [4] = 4, [6] = 8,</div><div class='add'>+	[8] = 16,</div><div class='add'>+	[0xf] = 0xffff // ??</div><div class='add'>+	};</div><div class='add'>+static const unsigned char levels[] = { 1, 1, 2 };</div><div class='add'>+static const unsigned char types[] = { 1, 2, 3 };</div><div class='add'>+</div><div class='add'>+static void __cpuinit amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,</div><div class='add'>+		       union _cpuid4_leaf_ebx *ebx,</div><div class='add'>+		       union _cpuid4_leaf_ecx *ecx)</div><div class='add'>+{</div><div class='add'>+	unsigned dummy;</div><div class='add'>+	unsigned line_size, lines_per_tag, assoc, size_in_kb;</div><div class='add'>+	union l1_cache l1i, l1d;</div><div class='add'>+	union l2_cache l2;</div><div class='add'>+</div><div class='add'>+	eax-&gt;full = 0;</div><div class='add'>+	ebx-&gt;full = 0;</div><div class='add'>+	ecx-&gt;full = 0;</div><div class='add'>+</div><div class='add'>+	cpuid(0x80000005, &amp;dummy, &amp;dummy, &amp;l1d.val, &amp;l1i.val);</div><div class='add'>+	cpuid(0x80000006, &amp;dummy, &amp;dummy, &amp;l2.val, &amp;dummy);</div><div class='add'>+</div><div class='add'>+	if (leaf &gt; 2 || !l1d.val || !l1i.val || !l2.val)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eax-&gt;split.is_self_initializing = 1;</div><div class='add'>+	eax-&gt;split.type = types[leaf];</div><div class='add'>+	eax-&gt;split.level = levels[leaf];</div><div class='add'>+	eax-&gt;split.num_threads_sharing = 0;</div><div class='add'>+	eax-&gt;split.num_cores_on_die = current_cpu_data.x86_max_cores - 1;</div><div class='add'>+</div><div class='add'>+	if (leaf &lt;= 1) {</div><div class='add'>+		union l1_cache *l1 = leaf == 0 ? &amp;l1d : &amp;l1i;</div><div class='add'>+		assoc = l1-&gt;assoc;</div><div class='add'>+		line_size = l1-&gt;line_size;</div><div class='add'>+		lines_per_tag = l1-&gt;lines_per_tag;</div><div class='add'>+		size_in_kb = l1-&gt;size_in_kb;</div><div class='add'>+	} else {</div><div class='add'>+		assoc = l2.assoc;</div><div class='add'>+		line_size = l2.line_size;</div><div class='add'>+		lines_per_tag = l2.lines_per_tag;</div><div class='add'>+		/* cpu_data has errata corrections for K7 applied */</div><div class='add'>+		size_in_kb = current_cpu_data.x86_cache_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (assoc == 0xf)</div><div class='add'>+		eax-&gt;split.is_fully_associative = 1;</div><div class='add'>+	ebx-&gt;split.coherency_line_size = line_size - 1;</div><div class='add'>+	ebx-&gt;split.ways_of_associativity = assocs[assoc] - 1;</div><div class='add'>+	ebx-&gt;split.physical_line_partition = lines_per_tag - 1;</div><div class='add'>+	ecx-&gt;split.number_of_sets = (size_in_kb * 1024) / line_size /</div><div class='add'>+		(ebx-&gt;split.ways_of_associativity + 1) - 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int __cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)</div><div class='ctx'> {</div><div class='del'>-	unsigned int		eax, ebx, ecx, edx;</div><div class='del'>-	union _cpuid4_leaf_eax	cache_eax;</div><div class='add'>+	union _cpuid4_leaf_eax 	eax;</div><div class='add'>+	union _cpuid4_leaf_ebx 	ebx;</div><div class='add'>+	union _cpuid4_leaf_ecx 	ecx;</div><div class='add'>+	unsigned		edx;</div><div class='ctx'> </div><div class='del'>-	cpuid_count(4, index, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='del'>-	cache_eax.full = eax;</div><div class='del'>-	if (cache_eax.split.type == CACHE_TYPE_NULL)</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)</div><div class='add'>+		amd_cpuid4(index, &amp;eax, &amp;ebx, &amp;ecx);</div><div class='add'>+	else</div><div class='add'>+		cpuid_count(4, index, &amp;eax.full, &amp;ebx.full, &amp;ecx.full,  &amp;edx);</div><div class='add'>+	if (eax.split.type == CACHE_TYPE_NULL)</div><div class='ctx'> 		return -EIO; /* better error ? */</div><div class='ctx'> </div><div class='del'>-	this_leaf-&gt;eax.full = eax;</div><div class='del'>-	this_leaf-&gt;ebx.full = ebx;</div><div class='del'>-	this_leaf-&gt;ecx.full = ecx;</div><div class='del'>-	this_leaf-&gt;size = (this_leaf-&gt;ecx.split.number_of_sets + 1) *</div><div class='del'>-		(this_leaf-&gt;ebx.split.coherency_line_size + 1) *</div><div class='del'>-		(this_leaf-&gt;ebx.split.physical_line_partition + 1) *</div><div class='del'>-		(this_leaf-&gt;ebx.split.ways_of_associativity + 1);</div><div class='add'>+	this_leaf-&gt;eax = eax;</div><div class='add'>+	this_leaf-&gt;ebx = ebx;</div><div class='add'>+	this_leaf-&gt;ecx = ecx;</div><div class='add'>+	this_leaf-&gt;size = (ecx.split.number_of_sets + 1) *</div><div class='add'>+		(ebx.split.coherency_line_size + 1) *</div><div class='add'>+		(ebx.split.physical_line_partition + 1) *</div><div class='add'>+		(ebx.split.ways_of_associativity + 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +261,7 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)</div><div class='ctx'> 	unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */</div><div class='ctx'> 	unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */</div><div class='ctx'> 	unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='ctx'> 	unsigned int cpu = (c == &amp;boot_cpu_data) ? 0 : (c - cpu_data);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -296,14 +383,14 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 	if (new_l2) {</div><div class='ctx'> 		l2 = new_l2;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='ctx'> 		cpu_llc_id[cpu] = l2_id;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_l3) {</div><div class='ctx'> 		l3 = new_l3;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#ifdef CONFIG_X86_HT</div><div class='ctx'> 		cpu_llc_id[cpu] = l3_id;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -642,7 +729,7 @@ static void __cpuexit cache_remove_dev(struct sys_device * sys_dev)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cacheinfo_cpu_callback(struct notifier_block *nfb,</div><div class='add'>+static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 					unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='hunk'>@@ -660,7 +747,7 @@ static int cacheinfo_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block cacheinfo_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'>     .notifier_call = cacheinfo_cpu_callback,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/i386/kernel/cpu/mcheck/k7.c b/arch/i386/kernel/cpu/mcheck/k7.c<br/>index fc5d5215e23d..b0862af595aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/k7.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/k7.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/k7.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/mcheck/k7.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/cpu/mcheck/mce.c b/arch/i386/kernel/cpu/mcheck/mce.c<br/>index afa0888f9a1e..d555bec0db99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/mce.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/mce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/mce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/mcheck/mce.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c<br/>index 82dffe0d4954..1f9153ae5b03 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/non-fatal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/non-fatal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/non-fatal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/mcheck/non-fatal.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/i386/kernel/cpu/mcheck/p4.c<br/>index fd2c459a31ef..b95f1b3d53aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/p4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/mcheck/p4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/mcheck/p4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/mcheck/p4.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c<br/>index f94cdb7aca50..f54a15268ed7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpu/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpu/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpu/proc.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 	 * applications want to get the raw CPUID data, they should access</div><div class='ctx'> 	 * /dev/cpu/&lt;cpu_nr&gt;/cpuid instead.</div><div class='ctx'> 	 */</div><div class='del'>-	static char *x86_cap_flags[] = {</div><div class='add'>+	static const char * const x86_cap_flags[] = {</div><div class='ctx'> 		/* Intel-defined */</div><div class='ctx'> 	        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",</div><div class='ctx'> 	        "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",</div><div class='hunk'>@@ -52,7 +52,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 		/* VIA/Cyrix/Centaur-defined */</div><div class='ctx'> 		NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",</div><div class='del'>-		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='add'>+		"ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +62,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> 	};</div><div class='del'>-	static char *x86_power_flags[] = {</div><div class='add'>+	static const char * const x86_power_flags[] = {</div><div class='ctx'> 		"ts",	/* temperature sensor */</div><div class='ctx'> 		"fid",  /* frequency id control */</div><div class='ctx'> 		"vid",  /* voltage id control */</div><div class='hunk'>@@ -109,9 +109,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		seq_printf(m, "cache size\t: %d KB\n", c-&gt;x86_cache_size);</div><div class='ctx'> #ifdef CONFIG_X86_HT</div><div class='ctx'> 	if (c-&gt;x86_max_cores * smp_num_siblings &gt; 1) {</div><div class='del'>-		seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]);</div><div class='add'>+		seq_printf(m, "physical id\t: %d\n", c-&gt;phys_proc_id);</div><div class='ctx'> 		seq_printf(m, "siblings\t: %d\n", cpus_weight(cpu_core_map[n]));</div><div class='del'>-		seq_printf(m, "core id\t\t: %d\n", cpu_core_id[n]);</div><div class='add'>+		seq_printf(m, "core id\t\t: %d\n", c-&gt;cpu_core_id);</div><div class='ctx'> 		seq_printf(m, "cpu cores\t: %d\n", c-&gt;booted_cores);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c<br/>index 1d9a4abcdfc7..fde8bea85cee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpuid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/cpuid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/cpuid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/cpuid.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -168,6 +167,7 @@ static int cpuid_class_device_create(int i)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='hunk'>@@ -183,10 +183,11 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long ac</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block cpuid_class_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'> 	.notifier_call = cpuid_class_cpu_callback,</div><div class='ctx'> };</div><div class='add'>+#endif /* !CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='ctx'> static int __init cpuid_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -209,7 +210,7 @@ static int __init cpuid_init(void)</div><div class='ctx'> 		if (err != 0) </div><div class='ctx'> 			goto out_class;</div><div class='ctx'> 	}</div><div class='del'>-	register_cpu_notifier(&amp;cpuid_class_cpu_notifier);</div><div class='add'>+	register_hotcpu_notifier(&amp;cpuid_class_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -234,7 +235,7 @@ static void __exit cpuid_exit(void)</div><div class='ctx'> 		class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));</div><div class='ctx'> 	class_destroy(cpuid_class);</div><div class='ctx'> 	unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");</div><div class='del'>-	unregister_cpu_notifier(&amp;cpuid_class_cpu_notifier);</div><div class='add'>+	unregister_hotcpu_notifier(&amp;cpuid_class_cpu_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cpuid_init);</div><div class='head'>diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c<br/>index 2b0cfce24a61..5b96f038367f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/crash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/crash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/crash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/crash.c</a></div><div class='hunk'>@@ -90,7 +90,7 @@ static void crash_save_self(struct pt_regs *regs)</div><div class='ctx'> 	crash_save_this_cpu(regs, cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+#if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_X86_LOCAL_APIC)</div><div class='ctx'> static atomic_t waiting_for_crash_ipi;</div><div class='ctx'> </div><div class='ctx'> static int crash_nmi_callback(struct pt_regs *regs, int cpu)</div><div class='hunk'>@@ -114,19 +114,15 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)</div><div class='ctx'> 	atomic_dec(&amp;waiting_for_crash_ipi);</div><div class='ctx'> 	/* Assume hlt works */</div><div class='ctx'> 	halt();</div><div class='del'>-	for(;;);</div><div class='add'>+	for (;;)</div><div class='add'>+		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * By using the NMI code instead of a vector we just sneak thru the</div><div class='del'>- * word generator coming out with just what we want.  AND it does</div><div class='del'>- * not matter if clustered_apic_mode is set or not.</div><div class='del'>- */</div><div class='ctx'> static void smp_send_nmi_allbutself(void)</div><div class='ctx'> {</div><div class='del'>-	send_IPI_allbutself(APIC_DM_NMI);</div><div class='add'>+	send_IPI_allbutself(NMI_VECTOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nmi_shootdown_cpus(void)</div><div class='hunk'>@@ -162,7 +158,7 @@ static void nmi_shootdown_cpus(void)</div><div class='ctx'> void machine_crash_shutdown(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* This function is only called after the system</div><div class='del'>-	 * has paniced or is otherwise in a critical state.</div><div class='add'>+	 * has panicked or is otherwise in a critical state.</div><div class='ctx'> 	 * The minimum amount of code to allow a kexec'd kernel</div><div class='ctx'> 	 * to run successfully needs to happen here.</div><div class='ctx'> 	 *</div><div class='head'>diff --git a/arch/i386/kernel/doublefault.c b/arch/i386/kernel/doublefault.c<br/>index 5edb1d379add..b4d14c2eb345 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/doublefault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/doublefault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/doublefault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/doublefault.c</a></div><div class='hunk'>@@ -44,7 +44,8 @@ static void doublefault_fn(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (;;) /* nothing */;</div><div class='add'>+	for (;;)</div><div class='add'>+		cpu_relax();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct tss_struct doublefault_tss __cacheline_aligned = {</div><div class='head'>diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c<br/>index 9202b67c4b2e..fe158042110b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/efi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/efi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/efi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/efi.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *	Skip non-WB memory and ignore empty memory ranges.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -601,8 +600,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,</div><div class='ctx'> 		res-&gt;end = res-&gt;start + ((md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT) - 1);</div><div class='ctx'> 		res-&gt;flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='ctx'> 		if (request_resource(&amp;iomem_resource, res) &lt; 0)</div><div class='del'>-			printk(KERN_ERR PFX "Failed to allocate res %s : 0x%lx-0x%lx\n",</div><div class='del'>-				res-&gt;name, res-&gt;start, res-&gt;end);</div><div class='add'>+			printk(KERN_ERR PFX "Failed to allocate res %s : "</div><div class='add'>+				"0x%llx-0x%llx\n", res-&gt;name,</div><div class='add'>+				(unsigned long long)res-&gt;start,</div><div class='add'>+				(unsigned long long)res-&gt;end);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We don't know which region contains kernel data so we try</div><div class='ctx'> 		 * it repeatedly and let the resource manager test it.</div><div class='head'>diff --git a/arch/i386/kernel/efi_stub.S b/arch/i386/kernel/efi_stub.S<br/>index 08c0312d9b6c..d3ee73a3eee3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/efi_stub.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/efi_stub.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/efi_stub.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/efi_stub.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * turned off.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S<br/>index cfc683f153b9..d9a260f2efb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/entry.S</a></div><div class='hunk'>@@ -40,14 +40,15 @@</div><div class='ctx'>  * "current" is in register %ebx during any slow entries.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='add'>+#include &lt;asm/dwarf2.h&gt;</div><div class='ctx'> #include "irq_vectors.h"</div><div class='ctx'> </div><div class='ctx'> #define nr_syscalls ((syscall_table_size)/4)</div><div class='hunk'>@@ -76,40 +77,91 @@ NT_MASK		= 0x00004000</div><div class='ctx'> VM_MASK		= 0x00020000</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='del'>-#define preempt_stop		cli</div><div class='add'>+#define preempt_stop		cli; TRACE_IRQS_OFF</div><div class='ctx'> #else</div><div class='ctx'> #define preempt_stop</div><div class='ctx'> #define resume_kernel		restore_nocheck</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+.macro TRACE_IRQS_IRET</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	testl $IF_MASK,EFLAGS(%esp)     # interrupts off?</div><div class='add'>+	jz 1f</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+1:</div><div class='add'>+#endif</div><div class='add'>+.endm</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VM86</div><div class='add'>+#define resume_userspace_sig	check_userspace</div><div class='add'>+#else</div><div class='add'>+#define resume_userspace_sig	resume_userspace</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define SAVE_ALL \</div><div class='ctx'> 	cld; \</div><div class='ctx'> 	pushl %es; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	/*CFI_REL_OFFSET es, 0;*/\</div><div class='ctx'> 	pushl %ds; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	/*CFI_REL_OFFSET ds, 0;*/\</div><div class='ctx'> 	pushl %eax; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET eax, 0;\</div><div class='ctx'> 	pushl %ebp; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET ebp, 0;\</div><div class='ctx'> 	pushl %edi; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET edi, 0;\</div><div class='ctx'> 	pushl %esi; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET esi, 0;\</div><div class='ctx'> 	pushl %edx; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET edx, 0;\</div><div class='ctx'> 	pushl %ecx; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET ecx, 0;\</div><div class='ctx'> 	pushl %ebx; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;\</div><div class='add'>+	CFI_REL_OFFSET ebx, 0;\</div><div class='ctx'> 	movl $(__USER_DS), %edx; \</div><div class='ctx'> 	movl %edx, %ds; \</div><div class='ctx'> 	movl %edx, %es;</div><div class='ctx'> </div><div class='ctx'> #define RESTORE_INT_REGS \</div><div class='ctx'> 	popl %ebx;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE ebx;\</div><div class='ctx'> 	popl %ecx;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE ecx;\</div><div class='ctx'> 	popl %edx;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE edx;\</div><div class='ctx'> 	popl %esi;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE esi;\</div><div class='ctx'> 	popl %edi;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE edi;\</div><div class='ctx'> 	popl %ebp;	\</div><div class='del'>-	popl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE ebp;\</div><div class='add'>+	popl %eax;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	CFI_RESTORE eax</div><div class='ctx'> </div><div class='ctx'> #define RESTORE_REGS	\</div><div class='ctx'> 	RESTORE_INT_REGS; \</div><div class='ctx'> 1:	popl %ds;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	/*CFI_RESTORE ds;*/\</div><div class='ctx'> 2:	popl %es;	\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4;\</div><div class='add'>+	/*CFI_RESTORE es;*/\</div><div class='ctx'> .section .fixup,"ax";	\</div><div class='ctx'> 3:	movl $0,(%esp);	\</div><div class='ctx'> 	jmp 1b;		\</div><div class='hunk'>@@ -122,13 +174,43 @@ VM_MASK		= 0x00020000</div><div class='ctx'> 	.long 2b,4b;	\</div><div class='ctx'> .previous</div><div class='ctx'> </div><div class='add'>+#define RING0_INT_FRAME \</div><div class='add'>+	CFI_STARTPROC simple;\</div><div class='add'>+	CFI_DEF_CFA esp, 3*4;\</div><div class='add'>+	/*CFI_OFFSET cs, -2*4;*/\</div><div class='add'>+	CFI_OFFSET eip, -3*4</div><div class='add'>+</div><div class='add'>+#define RING0_EC_FRAME \</div><div class='add'>+	CFI_STARTPROC simple;\</div><div class='add'>+	CFI_DEF_CFA esp, 4*4;\</div><div class='add'>+	/*CFI_OFFSET cs, -2*4;*/\</div><div class='add'>+	CFI_OFFSET eip, -3*4</div><div class='add'>+</div><div class='add'>+#define RING0_PTREGS_FRAME \</div><div class='add'>+	CFI_STARTPROC simple;\</div><div class='add'>+	CFI_DEF_CFA esp, OLDESP-EBX;\</div><div class='add'>+	/*CFI_OFFSET cs, CS-OLDESP;*/\</div><div class='add'>+	CFI_OFFSET eip, EIP-OLDESP;\</div><div class='add'>+	/*CFI_OFFSET es, ES-OLDESP;*/\</div><div class='add'>+	/*CFI_OFFSET ds, DS-OLDESP;*/\</div><div class='add'>+	CFI_OFFSET eax, EAX-OLDESP;\</div><div class='add'>+	CFI_OFFSET ebp, EBP-OLDESP;\</div><div class='add'>+	CFI_OFFSET edi, EDI-OLDESP;\</div><div class='add'>+	CFI_OFFSET esi, ESI-OLDESP;\</div><div class='add'>+	CFI_OFFSET edx, EDX-OLDESP;\</div><div class='add'>+	CFI_OFFSET ecx, ECX-OLDESP;\</div><div class='add'>+	CFI_OFFSET ebx, EBX-OLDESP</div><div class='ctx'> </div><div class='ctx'> ENTRY(ret_from_fork)</div><div class='add'>+	CFI_STARTPROC</div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 	call schedule_tail</div><div class='ctx'> 	GET_THREAD_INFO(%ebp)</div><div class='ctx'> 	popl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 	jmp syscall_exit</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return to user mode is not as complex as all this looks,</div><div class='hunk'>@@ -139,10 +221,12 @@ ENTRY(ret_from_fork)</div><div class='ctx'> </div><div class='ctx'> 	# userspace resumption stub bypassing syscall exit tracing</div><div class='ctx'> 	ALIGN</div><div class='add'>+	RING0_PTREGS_FRAME</div><div class='ctx'> ret_from_exception:</div><div class='ctx'> 	preempt_stop</div><div class='ctx'> ret_from_intr:</div><div class='ctx'> 	GET_THREAD_INFO(%ebp)</div><div class='add'>+check_userspace:</div><div class='ctx'> 	movl EFLAGS(%esp), %eax		# mix EFLAGS and CS</div><div class='ctx'> 	movb CS(%esp), %al</div><div class='ctx'> 	testl $(VM_MASK | 3), %eax</div><div class='hunk'>@@ -171,20 +255,42 @@ need_resched:</div><div class='ctx'> 	call preempt_schedule_irq</div><div class='ctx'> 	jmp need_resched</div><div class='ctx'> #endif</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> /* SYSENTER_RETURN points to after the "sysenter" instruction in</div><div class='ctx'>    the vsyscall page.  See vsyscall-sysentry.S, which defines the symbol.  */</div><div class='ctx'> </div><div class='ctx'> 	# sysenter call handler stub</div><div class='ctx'> ENTRY(sysenter_entry)</div><div class='add'>+	CFI_STARTPROC simple</div><div class='add'>+	CFI_DEF_CFA esp, 0</div><div class='add'>+	CFI_REGISTER esp, ebp</div><div class='ctx'> 	movl TSS_sysenter_esp0(%esp),%esp</div><div class='ctx'> sysenter_past_esp:</div><div class='add'>+	/*</div><div class='add'>+	 * No need to follow this irqs on/off section: the syscall</div><div class='add'>+	 * disabled irqs and here we enable it straight after entry:</div><div class='add'>+	 */</div><div class='ctx'> 	sti</div><div class='ctx'> 	pushl $(__USER_DS)</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	/*CFI_REL_OFFSET ss, 0*/</div><div class='ctx'> 	pushl %ebp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET esp, 0</div><div class='ctx'> 	pushfl</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $(__USER_CS)</div><div class='del'>-	pushl $SYSENTER_RETURN</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	/*CFI_REL_OFFSET cs, 0*/</div><div class='add'>+	/*</div><div class='add'>+	 * Push current_thread_info()-&gt;sysenter_return to the stack.</div><div class='add'>+	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words</div><div class='add'>+	 * pushed above; +8 corresponds to copy_thread's esp0 setting.</div><div class='add'>+	 */</div><div class='add'>+	pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET eip, 0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Load the potential sixth argument from user stack.</div><div class='hunk'>@@ -199,6 +305,7 @@ sysenter_past_esp:</div><div class='ctx'> .previous</div><div class='ctx'> </div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	GET_THREAD_INFO(%ebp)</div><div class='ctx'> </div><div class='hunk'>@@ -210,6 +317,7 @@ sysenter_past_esp:</div><div class='ctx'> 	call *sys_call_table(,%eax,4)</div><div class='ctx'> 	movl %eax,EAX(%esp)</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl TI_flags(%ebp), %ecx</div><div class='ctx'> 	testw $_TIF_ALLWORK_MASK, %cx</div><div class='ctx'> 	jne syscall_exit_work</div><div class='hunk'>@@ -217,13 +325,17 @@ sysenter_past_esp:</div><div class='ctx'> 	movl EIP(%esp), %edx</div><div class='ctx'> 	movl OLDESP(%esp), %ecx</div><div class='ctx'> 	xorl %ebp,%ebp</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	sysexit</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	# system call handler stub</div><div class='ctx'> ENTRY(system_call)</div><div class='add'>+	RING0_INT_FRAME			# can't unwind into user space anyway</div><div class='ctx'> 	pushl %eax			# save orig_eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	GET_THREAD_INFO(%ebp)</div><div class='ctx'> 	testl $TF_MASK,EFLAGS(%esp)</div><div class='hunk'>@@ -243,6 +355,7 @@ syscall_exit:</div><div class='ctx'> 	cli				# make sure we don't miss an interrupt</div><div class='ctx'> 					# setting need_resched or sigpending</div><div class='ctx'> 					# between sampling and the iret</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl TI_flags(%ebp), %ecx</div><div class='ctx'> 	testw $_TIF_ALLWORK_MASK, %cx	# current-&gt;work</div><div class='ctx'> 	jne syscall_exit_work</div><div class='hunk'>@@ -256,13 +369,18 @@ restore_all:</div><div class='ctx'> 	movb CS(%esp), %al</div><div class='ctx'> 	andl $(VM_MASK | (4 &lt;&lt; 8) | 3), %eax</div><div class='ctx'> 	cmpl $((4 &lt;&lt; 8) | 3), %eax</div><div class='add'>+	CFI_REMEMBER_STATE</div><div class='ctx'> 	je ldt_ss			# returning to user-space with LDT SS</div><div class='ctx'> restore_nocheck:</div><div class='add'>+	TRACE_IRQS_IRET</div><div class='add'>+restore_nocheck_notrace:</div><div class='ctx'> 	RESTORE_REGS</div><div class='ctx'> 	addl $4, %esp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 1:	iret</div><div class='ctx'> .section .fixup,"ax"</div><div class='ctx'> iret_exc:</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	pushl $0			# no error code</div><div class='ctx'> 	pushl $do_iret_error</div><div class='hunk'>@@ -273,6 +391,7 @@ iret_exc:</div><div class='ctx'> 	.long 1b,iret_exc</div><div class='ctx'> .previous</div><div class='ctx'> </div><div class='add'>+	CFI_RESTORE_STATE</div><div class='ctx'> ldt_ss:</div><div class='ctx'> 	larl OLDSS(%esp), %eax</div><div class='ctx'> 	jnz restore_nocheck</div><div class='hunk'>@@ -285,11 +404,15 @@ ldt_ss:</div><div class='ctx'> 	 * CPUs, which we can try to work around to make</div><div class='ctx'> 	 * dosemu and wine happy. */</div><div class='ctx'> 	subl $8, %esp		# reserve space for switch16 pointer</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 8</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl %esp, %eax</div><div class='ctx'> 	/* Set up the 16bit stack frame with switch32 pointer on top,</div><div class='ctx'> 	 * and a switch16 pointer on top of the current frame. */</div><div class='ctx'> 	call setup_x86_bogus_stack</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -8	# frame has moved</div><div class='add'>+	TRACE_IRQS_IRET</div><div class='ctx'> 	RESTORE_REGS</div><div class='ctx'> 	lss 20+4(%esp), %esp	# switch to 16bit stack</div><div class='ctx'> 1:	iret</div><div class='hunk'>@@ -297,9 +420,11 @@ ldt_ss:</div><div class='ctx'> 	.align 4</div><div class='ctx'> 	.long 1b,iret_exc</div><div class='ctx'> .previous</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> 	# perform work that needs to be done immediately before resumption</div><div class='ctx'> 	ALIGN</div><div class='add'>+	RING0_PTREGS_FRAME		# can't unwind into user space anyway</div><div class='ctx'> work_pending:</div><div class='ctx'> 	testb $_TIF_NEED_RESCHED, %cl</div><div class='ctx'> 	jz work_notifysig</div><div class='hunk'>@@ -308,6 +433,7 @@ work_resched:</div><div class='ctx'> 	cli				# make sure we don't miss an interrupt</div><div class='ctx'> 					# setting need_resched or sigpending</div><div class='ctx'> 					# between sampling and the iret</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl TI_flags(%ebp), %ecx</div><div class='ctx'> 	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other</div><div class='ctx'> 					# than syscall tracing?</div><div class='hunk'>@@ -323,18 +449,20 @@ work_notifysig:				# deal with pending signals and</div><div class='ctx'> 					# vm86-space</div><div class='ctx'> 	xorl %edx, %edx</div><div class='ctx'> 	call do_notify_resume</div><div class='del'>-	jmp resume_userspace</div><div class='add'>+	jmp resume_userspace_sig</div><div class='ctx'> </div><div class='ctx'> 	ALIGN</div><div class='ctx'> work_notifysig_v86:</div><div class='ctx'> #ifdef CONFIG_VM86</div><div class='ctx'> 	pushl %ecx			# save ti_flags for do_notify_resume</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	call save_v86_state		# %eax contains pt_regs pointer</div><div class='ctx'> 	popl %ecx</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 	movl %eax, %esp</div><div class='ctx'> 	xorl %edx, %edx</div><div class='ctx'> 	call do_notify_resume</div><div class='del'>-	jmp resume_userspace</div><div class='add'>+	jmp resume_userspace_sig</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	# perform syscall exit tracing</div><div class='hunk'>@@ -357,25 +485,28 @@ syscall_trace_entry:</div><div class='ctx'> syscall_exit_work:</div><div class='ctx'> 	testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl</div><div class='ctx'> 	jz work_pending</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti				# could let do_syscall_trace() call</div><div class='ctx'> 					# schedule() instead</div><div class='ctx'> 	movl %esp, %eax</div><div class='ctx'> 	movl $1, %edx</div><div class='ctx'> 	call do_syscall_trace</div><div class='ctx'> 	jmp resume_userspace</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='del'>-	ALIGN</div><div class='add'>+	RING0_INT_FRAME			# can't unwind into user space anyway</div><div class='ctx'> syscall_fault:</div><div class='ctx'> 	pushl %eax			# save orig_eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	GET_THREAD_INFO(%ebp)</div><div class='ctx'> 	movl $-EFAULT,EAX(%esp)</div><div class='ctx'> 	jmp resume_userspace</div><div class='ctx'> </div><div class='del'>-	ALIGN</div><div class='ctx'> syscall_badsys:</div><div class='ctx'> 	movl $-ENOSYS,EAX(%esp)</div><div class='ctx'> 	jmp resume_userspace</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> #define FIXUP_ESPFIX_STACK \</div><div class='ctx'> 	movl %esp, %eax; \</div><div class='hunk'>@@ -387,16 +518,21 @@ syscall_badsys:</div><div class='ctx'> 	movl %eax, %esp;</div><div class='ctx'> #define UNWIND_ESPFIX_STACK \</div><div class='ctx'> 	pushl %eax; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4; \</div><div class='ctx'> 	movl %ss, %eax; \</div><div class='ctx'> 	/* see if on 16bit stack */ \</div><div class='ctx'> 	cmpw $__ESPFIX_SS, %ax; \</div><div class='del'>-	jne 28f; \</div><div class='del'>-	movl $__KERNEL_DS, %edx; \</div><div class='del'>-	movl %edx, %ds; \</div><div class='del'>-	movl %edx, %es; \</div><div class='add'>+	je 28f; \</div><div class='add'>+27:	popl %eax; \</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4; \</div><div class='add'>+.section .fixup,"ax"; \</div><div class='add'>+28:	movl $__KERNEL_DS, %eax; \</div><div class='add'>+	movl %eax, %ds; \</div><div class='add'>+	movl %eax, %es; \</div><div class='ctx'> 	/* switch to 32bit stack */ \</div><div class='del'>-	FIXUP_ESPFIX_STACK \</div><div class='del'>-28:	popl %eax;</div><div class='add'>+	FIXUP_ESPFIX_STACK; \</div><div class='add'>+	jmp 27b; \</div><div class='add'>+.previous</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Build the entry stubs and pointer table with</div><div class='hunk'>@@ -408,9 +544,14 @@ ENTRY(interrupt)</div><div class='ctx'> </div><div class='ctx'> vector=0</div><div class='ctx'> ENTRY(irq_entries_start)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> .rept NR_IRQS</div><div class='ctx'> 	ALIGN</div><div class='del'>-1:	pushl $vector-256</div><div class='add'>+ .if vector</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='add'>+ .endif</div><div class='add'>+1:	pushl $~(vector)</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp common_interrupt</div><div class='ctx'> .data</div><div class='ctx'> 	.long 1b</div><div class='hunk'>@@ -418,66 +559,111 @@ ENTRY(irq_entries_start)</div><div class='ctx'> vector=vector+1</div><div class='ctx'> .endr</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * the CPU automatically disables interrupts when executing an IRQ vector,</div><div class='add'>+ * so IRQ-flags tracing has to follow that:</div><div class='add'>+ */</div><div class='ctx'> 	ALIGN</div><div class='ctx'> common_interrupt:</div><div class='ctx'> 	SAVE_ALL</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl %esp,%eax</div><div class='ctx'> 	call do_IRQ</div><div class='ctx'> 	jmp ret_from_intr</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> #define BUILD_INTERRUPT(name, nr)	\</div><div class='ctx'> ENTRY(name)				\</div><div class='del'>-	pushl $nr-256;			\</div><div class='del'>-	SAVE_ALL			\</div><div class='add'>+	RING0_INT_FRAME;		\</div><div class='add'>+	pushl $~(nr);			\</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4;	\</div><div class='add'>+	SAVE_ALL;			\</div><div class='add'>+	TRACE_IRQS_OFF			\</div><div class='ctx'> 	movl %esp,%eax;			\</div><div class='ctx'> 	call smp_/**/name;		\</div><div class='del'>-	jmp ret_from_intr;</div><div class='add'>+	jmp ret_from_intr;		\</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> /* The include is where all of the SMP etc. interrupts come from */</div><div class='ctx'> #include "entry_arch.h"</div><div class='ctx'> </div><div class='ctx'> ENTRY(divide_error)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0			# no error code</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_divide_error</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	ALIGN</div><div class='ctx'> error_code:</div><div class='ctx'> 	pushl %ds</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	/*CFI_REL_OFFSET ds, 0*/</div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET eax, 0</div><div class='ctx'> 	xorl %eax, %eax</div><div class='ctx'> 	pushl %ebp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET ebp, 0</div><div class='ctx'> 	pushl %edi</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET edi, 0</div><div class='ctx'> 	pushl %esi</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET esi, 0</div><div class='ctx'> 	pushl %edx</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET edx, 0</div><div class='ctx'> 	decl %eax			# eax = -1</div><div class='ctx'> 	pushl %ecx</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET ecx, 0</div><div class='ctx'> 	pushl %ebx</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	CFI_REL_OFFSET ebx, 0</div><div class='ctx'> 	cld</div><div class='ctx'> 	pushl %es</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='add'>+	/*CFI_REL_OFFSET es, 0*/</div><div class='ctx'> 	UNWIND_ESPFIX_STACK</div><div class='ctx'> 	popl %ecx</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='add'>+	/*CFI_REGISTER es, ecx*/</div><div class='ctx'> 	movl ES(%esp), %edi		# get the function address</div><div class='ctx'> 	movl ORIG_EAX(%esp), %edx	# get the error code</div><div class='ctx'> 	movl %eax, ORIG_EAX(%esp)</div><div class='ctx'> 	movl %ecx, ES(%esp)</div><div class='add'>+	/*CFI_REL_OFFSET es, ES*/</div><div class='ctx'> 	movl $(__USER_DS), %ecx</div><div class='ctx'> 	movl %ecx, %ds</div><div class='ctx'> 	movl %ecx, %es</div><div class='ctx'> 	movl %esp,%eax			# pt_regs pointer</div><div class='ctx'> 	call *%edi</div><div class='ctx'> 	jmp ret_from_exception</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(coprocessor_error)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_coprocessor_error</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(simd_coprocessor_error)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_simd_coprocessor_error</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(device_not_available)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $-1			# mark this as an int</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	movl %cr0, %eax</div><div class='ctx'> 	testl $0x4, %eax		# EM (math emulation bit)</div><div class='hunk'>@@ -487,9 +673,12 @@ ENTRY(device_not_available)</div><div class='ctx'> 	jmp ret_from_exception</div><div class='ctx'> device_not_available_emulate:</div><div class='ctx'> 	pushl $0			# temporary storage for ORIG_EIP</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	call math_emulate</div><div class='ctx'> 	addl $4, %esp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 	jmp ret_from_exception</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Debug traps and NMI can happen at the one SYSENTER instruction</div><div class='hunk'>@@ -514,16 +703,19 @@ label:						\</div><div class='ctx'> 	pushl $sysenter_past_esp</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(debug)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	cmpl $sysenter_entry,(%esp)</div><div class='ctx'> 	jne debug_stack_correct</div><div class='ctx'> 	FIX_STACK(12, debug_stack_correct, debug_esp_fix_insn)</div><div class='ctx'> debug_stack_correct:</div><div class='ctx'> 	pushl $-1			# mark this as an int</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	xorl %edx,%edx			# error code 0</div><div class='ctx'> 	movl %esp,%eax			# pt_regs pointer</div><div class='ctx'> 	call do_debug</div><div class='ctx'> 	jmp ret_from_exception</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> 	.previous .text</div><div class='ctx'> /*</div><div class='ctx'>  * NMI is doubly nasty. It can happen _while_ we're handling</div><div class='hunk'>@@ -534,14 +726,18 @@ debug_stack_correct:</div><div class='ctx'>  * fault happened on the sysenter path.</div><div class='ctx'>  */</div><div class='ctx'> ENTRY(nmi)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	movl %ss, %eax</div><div class='ctx'> 	cmpw $__ESPFIX_SS, %ax</div><div class='ctx'> 	popl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 	je nmi_16bit_stack</div><div class='ctx'> 	cmpl $sysenter_entry,(%esp)</div><div class='ctx'> 	je nmi_stack_fixup</div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	movl %esp,%eax</div><div class='ctx'> 	/* Do not access memory above the end of our stack page,</div><div class='ctx'> 	 * it might not exist.</div><div class='hunk'>@@ -549,16 +745,19 @@ ENTRY(nmi)</div><div class='ctx'> 	andl $(THREAD_SIZE-1),%eax</div><div class='ctx'> 	cmpl $(THREAD_SIZE-20),%eax</div><div class='ctx'> 	popl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -4</div><div class='ctx'> 	jae nmi_stack_correct</div><div class='ctx'> 	cmpl $sysenter_entry,12(%esp)</div><div class='ctx'> 	je nmi_debug_stack_check</div><div class='ctx'> nmi_stack_correct:</div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	xorl %edx,%edx		# zero error code</div><div class='ctx'> 	movl %esp,%eax		# pt_regs pointer</div><div class='ctx'> 	call do_nmi</div><div class='del'>-	jmp restore_all</div><div class='add'>+	jmp restore_nocheck_notrace</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> nmi_stack_fixup:</div><div class='ctx'> 	FIX_STACK(12,nmi_stack_correct, 1)</div><div class='hunk'>@@ -574,94 +773,177 @@ nmi_debug_stack_check:</div><div class='ctx'> 	jmp nmi_stack_correct</div><div class='ctx'> </div><div class='ctx'> nmi_16bit_stack:</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	/* create the pointer to lss back */</div><div class='ctx'> 	pushl %ss</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl %esp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	movzwl %sp, %esp</div><div class='ctx'> 	addw $4, (%esp)</div><div class='ctx'> 	/* copy the iret frame of 12 bytes */</div><div class='ctx'> 	.rept 3</div><div class='ctx'> 	pushl 16(%esp)</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	.endr</div><div class='ctx'> 	pushl %eax</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	FIXUP_ESPFIX_STACK		# %eax == %esp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET -20	# the frame has now moved</div><div class='ctx'> 	xorl %edx,%edx			# zero error code</div><div class='ctx'> 	call do_nmi</div><div class='ctx'> 	RESTORE_REGS</div><div class='ctx'> 	lss 12+4(%esp), %esp		# back to 16bit stack</div><div class='ctx'> 1:	iret</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> .section __ex_table,"a"</div><div class='ctx'> 	.align 4</div><div class='ctx'> 	.long 1b,iret_exc</div><div class='ctx'> .previous</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(int3)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $-1			# mark this as an int</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	xorl %edx,%edx		# zero error code</div><div class='ctx'> 	movl %esp,%eax		# pt_regs pointer</div><div class='ctx'> 	call do_int3</div><div class='ctx'> 	jmp ret_from_exception</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> ENTRY(overflow)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_overflow</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(bounds)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_bounds</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(invalid_op)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_invalid_op</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(coprocessor_segment_overrun)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_coprocessor_segment_overrun</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(invalid_TSS)</div><div class='add'>+	RING0_EC_FRAME</div><div class='ctx'> 	pushl $do_invalid_TSS</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(segment_not_present)</div><div class='add'>+	RING0_EC_FRAME</div><div class='ctx'> 	pushl $do_segment_not_present</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> ENTRY(stack_segment)</div><div class='add'>+	RING0_EC_FRAME</div><div class='ctx'> 	pushl $do_stack_segment</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(general_protection)</div><div class='add'>+	RING0_EC_FRAME</div><div class='ctx'> 	pushl $do_general_protection</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> ENTRY(alignment_check)</div><div class='add'>+	RING0_EC_FRAME</div><div class='ctx'> 	pushl $do_alignment_check</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(page_fault)</div><div class='add'>+	RING0_EC_FRAME</div><div class='ctx'> 	pushl $do_page_fault</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_MCE</div><div class='ctx'> ENTRY(machine_check)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl machine_check_vector</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> ENTRY(spurious_interrupt_bug)</div><div class='add'>+	RING0_INT_FRAME</div><div class='ctx'> 	pushl $0</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	pushl $do_spurious_interrupt_bug</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET 4</div><div class='ctx'> 	jmp error_code</div><div class='add'>+	CFI_ENDPROC</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_STACK_UNWIND</div><div class='add'>+ENTRY(arch_unwind_init_running)</div><div class='add'>+	CFI_STARTPROC</div><div class='add'>+	movl	4(%esp), %edx</div><div class='add'>+	movl	(%esp), %ecx</div><div class='add'>+	leal	4(%esp), %eax</div><div class='add'>+	movl	%ebx, EBX(%edx)</div><div class='add'>+	xorl	%ebx, %ebx</div><div class='add'>+	movl	%ebx, ECX(%edx)</div><div class='add'>+	movl	%ebx, EDX(%edx)</div><div class='add'>+	movl	%esi, ESI(%edx)</div><div class='add'>+	movl	%edi, EDI(%edx)</div><div class='add'>+	movl	%ebp, EBP(%edx)</div><div class='add'>+	movl	%ebx, EAX(%edx)</div><div class='add'>+	movl	$__USER_DS, DS(%edx)</div><div class='add'>+	movl	$__USER_DS, ES(%edx)</div><div class='add'>+	movl	%ebx, ORIG_EAX(%edx)</div><div class='add'>+	movl	%ecx, EIP(%edx)</div><div class='add'>+	movl	12(%esp), %ecx</div><div class='add'>+	movl	$__KERNEL_CS, CS(%edx)</div><div class='add'>+	movl	%ebx, EFLAGS(%edx)</div><div class='add'>+	movl	%eax, OLDESP(%edx)</div><div class='add'>+	movl	8(%esp), %eax</div><div class='add'>+	movl	%ecx, 8(%esp)</div><div class='add'>+	movl	EBX(%edx), %ebx</div><div class='add'>+	movl	$__KERNEL_DS, OLDSS(%edx)</div><div class='add'>+	jmpl	*%eax</div><div class='add'>+	CFI_ENDPROC</div><div class='add'>+ENDPROC(arch_unwind_init_running)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> .section .rodata,"a"</div><div class='ctx'> #include "syscall_table.S"</div><div class='head'>diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S<br/>index 3debc2e26542..eb79aa2fa8bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/head.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c<br/>new file mode 100644<br/>index 000000000000..c6737c35815d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/hpet.c</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hpet.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hpet.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define HPET_MASK	CLOCKSOURCE_MASK(32)</div><div class='add'>+#define HPET_SHIFT	22</div><div class='add'>+</div><div class='add'>+/* FSEC = 10^-15 NSEC = 10^-9 */</div><div class='add'>+#define FSEC_PER_NSEC	1000000</div><div class='add'>+</div><div class='add'>+static void *hpet_ptr;</div><div class='add'>+</div><div class='add'>+static cycle_t read_hpet(void)</div><div class='add'>+{</div><div class='add'>+	return (cycle_t)readl(hpet_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource clocksource_hpet = {</div><div class='add'>+	.name		= "hpet",</div><div class='add'>+	.rating		= 250,</div><div class='add'>+	.read		= read_hpet,</div><div class='add'>+	.mask		= HPET_MASK,</div><div class='add'>+	.mult		= 0, /* set below */</div><div class='add'>+	.shift		= HPET_SHIFT,</div><div class='add'>+	.is_continuous	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_hpet_clocksource(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long hpet_period;</div><div class='add'>+	void __iomem* hpet_base;</div><div class='add'>+	u64 tmp;</div><div class='add'>+</div><div class='add'>+	if (!hpet_address)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* calculate the hpet address: */</div><div class='add'>+	hpet_base =</div><div class='add'>+		(void __iomem*)ioremap_nocache(hpet_address, HPET_MMAP_SIZE);</div><div class='add'>+	hpet_ptr = hpet_base + HPET_COUNTER;</div><div class='add'>+</div><div class='add'>+	/* calculate the frequency: */</div><div class='add'>+	hpet_period = readl(hpet_base + HPET_PERIOD);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * hpet period is in femto seconds per cycle</div><div class='add'>+	 * so we need to convert this to ns/cyc units</div><div class='add'>+	 * aproximated by mult/2^shift</div><div class='add'>+	 *</div><div class='add'>+	 *  fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift</div><div class='add'>+	 *  fsec/cyc * 1ns/1000000fsec * 2^shift = mult</div><div class='add'>+	 *  fsec/cyc * 2^shift * 1nsec/1000000fsec = mult</div><div class='add'>+	 *  (fsec/cyc &lt;&lt; shift)/1000000 = mult</div><div class='add'>+	 *  (hpet_period &lt;&lt; shift)/FSEC_PER_NSEC = mult</div><div class='add'>+	 */</div><div class='add'>+	tmp = (u64)hpet_period &lt;&lt; HPET_SHIFT;</div><div class='add'>+	do_div(tmp, FSEC_PER_NSEC);</div><div class='add'>+	clocksource_hpet.mult = (u32)tmp;</div><div class='add'>+</div><div class='add'>+	return clocksource_register(&amp;clocksource_hpet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_hpet_clocksource);</div><div class='head'>diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c<br/>index 036a9857936f..e3d4b73bfdb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/i386_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i386_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/i386_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/i386_ksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/i387.c b/arch/i386/kernel/i387.c<br/>index d75524758daf..665847281ed2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/i387.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i387.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/i387.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/i387.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *	Gareth Hughes &lt;gareth@valinux.com&gt;, May 2000</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -25,7 +24,7 @@</div><div class='ctx'> #define HAVE_HWFP 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned long mxcsr_feature_mask = 0xffffffff;</div><div class='add'>+static unsigned long mxcsr_feature_mask __read_mostly = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> void mxcsr_feature_mask_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c<br/>new file mode 100644<br/>index 000000000000..477b24daff53<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/i8253.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/i8253.c</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+/*</div><div class='add'>+ * i8253.c  8253/PIT functions</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/sysdev.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='add'>+#include &lt;asm/delay.h&gt;</div><div class='add'>+#include &lt;asm/i8253.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "io_ports.h"</div><div class='add'>+</div><div class='add'>+DEFINE_SPINLOCK(i8253_lock);</div><div class='add'>+EXPORT_SYMBOL(i8253_lock);</div><div class='add'>+</div><div class='add'>+void setup_pit_timer(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8253_lock, flags);</div><div class='add'>+	outb_p(0x34,PIT_MODE);		/* binary, mode 2, LSB/MSB, ch 0 */</div><div class='add'>+	udelay(10);</div><div class='add'>+	outb_p(LATCH &amp; 0xff , PIT_CH0);	/* LSB */</div><div class='add'>+	udelay(10);</div><div class='add'>+	outb(LATCH &gt;&gt; 8 , PIT_CH0);	/* MSB */</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8253_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Since the PIT overflows every tick, its not very useful</div><div class='add'>+ * to just read by itself. So use jiffies to emulate a free</div><div class='add'>+ * running counter:</div><div class='add'>+ */</div><div class='add'>+static cycle_t pit_read(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int count;</div><div class='add'>+	u32 jifs;</div><div class='add'>+	static int old_count;</div><div class='add'>+	static u32 old_jifs;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8253_lock, flags);</div><div class='add'>+        /*</div><div class='add'>+	 * Although our caller may have the read side of xtime_lock,</div><div class='add'>+	 * this is now a seqlock, and we are cheating in this routine</div><div class='add'>+	 * by having side effects on state that we cannot undo if</div><div class='add'>+	 * there is a collision on the seqlock and our caller has to</div><div class='add'>+	 * retry.  (Namely, old_jifs and old_count.)  So we must treat</div><div class='add'>+	 * jiffies as volatile despite the lock.  We read jiffies</div><div class='add'>+	 * before latching the timer count to guarantee that although</div><div class='add'>+	 * the jiffies value might be older than the count (that is,</div><div class='add'>+	 * the counter may underflow between the last point where</div><div class='add'>+	 * jiffies was incremented and the point where we latch the</div><div class='add'>+	 * count), it cannot be newer.</div><div class='add'>+	 */</div><div class='add'>+	jifs = jiffies;</div><div class='add'>+	outb_p(0x00, PIT_MODE);	/* latch the count ASAP */</div><div class='add'>+	count = inb_p(PIT_CH0);	/* read the latched count */</div><div class='add'>+	count |= inb_p(PIT_CH0) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	/* VIA686a test code... reset the latch if count &gt; max + 1 */</div><div class='add'>+	if (count &gt; LATCH) {</div><div class='add'>+		outb_p(0x34, PIT_MODE);</div><div class='add'>+		outb_p(LATCH &amp; 0xff, PIT_CH0);</div><div class='add'>+		outb(LATCH &gt;&gt; 8, PIT_CH0);</div><div class='add'>+		count = LATCH - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It's possible for count to appear to go the wrong way for a</div><div class='add'>+	 * couple of reasons:</div><div class='add'>+	 *</div><div class='add'>+	 *  1. The timer counter underflows, but we haven't handled the</div><div class='add'>+	 *     resulting interrupt and incremented jiffies yet.</div><div class='add'>+	 *  2. Hardware problem with the timer, not giving us continuous time,</div><div class='add'>+	 *     the counter does small "jumps" upwards on some Pentium systems,</div><div class='add'>+	 *     (see c't 95/10 page 335 for Neptun bug.)</div><div class='add'>+	 *</div><div class='add'>+	 * Previous attempts to handle these cases intelligently were</div><div class='add'>+	 * buggy, so we just do the simple thing now.</div><div class='add'>+	 */</div><div class='add'>+	if (count &gt; old_count &amp;&amp; jifs == old_jifs) {</div><div class='add'>+		count = old_count;</div><div class='add'>+	}</div><div class='add'>+	old_count = count;</div><div class='add'>+	old_jifs = jifs;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8253_lock, flags);</div><div class='add'>+</div><div class='add'>+	count = (LATCH - 1) - count;</div><div class='add'>+</div><div class='add'>+	return (cycle_t)(jifs * LATCH) + count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource clocksource_pit = {</div><div class='add'>+	.name	= "pit",</div><div class='add'>+	.rating = 110,</div><div class='add'>+	.read	= pit_read,</div><div class='add'>+	.mask	= CLOCKSOURCE_MASK(32),</div><div class='add'>+	.mult	= 0,</div><div class='add'>+	.shift	= 20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_pit_clocksource(void)</div><div class='add'>+{</div><div class='add'>+	if (num_possible_cpus() &gt; 4) /* PIT does not scale! */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20);</div><div class='add'>+	return clocksource_register(&amp;clocksource_pit);</div><div class='add'>+}</div><div class='add'>+module_init(init_pit_clocksource);</div><div class='head'>diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c<br/>index 323ef8ab3244..d4756d154f47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/i8259.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/i8259.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/i8259.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -132,7 +131,7 @@ void make_8259A_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='ctx'> 	io_apic_irqs &amp;= ~(1&lt;&lt;irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;i8259A_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;i8259A_irq_type;</div><div class='ctx'> 	enable_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +174,7 @@ static void mask_and_ack_8259A(unsigned int irq)</div><div class='ctx'> 	 * Lightweight spurious IRQ detection. We do not want</div><div class='ctx'> 	 * to overdo spurious IRQ handling - it's usually a sign</div><div class='ctx'> 	 * of hardware problems, so we only do the checks we can</div><div class='del'>-	 * do without slowing down good hardware unnecesserily.</div><div class='add'>+	 * do without slowing down good hardware unnecessarily.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Note that IRQ7 and IRQ15 (the two spurious IRQs</div><div class='ctx'> 	 * usually resulting from the 8259A-1|2 PICs) occur</div><div class='hunk'>@@ -271,8 +270,8 @@ static int i8259A_shutdown(struct sys_device *dev)</div><div class='ctx'> 	 * the kernel initialization code can get it</div><div class='ctx'> 	 * out of.</div><div class='ctx'> 	 */</div><div class='del'>-	outb(0xff, 0x21);	/* mask all of 8259A-1 */</div><div class='del'>-	outb(0xff, 0xA1);	/* mask all of 8259A-1 */</div><div class='add'>+	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */</div><div class='add'>+	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-1 */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -386,12 +385,12 @@ void __init init_ISA_irqs (void)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * 16 old-style INTA-cycle interrupts:</div><div class='ctx'> 			 */</div><div class='del'>-			irq_desc[i].handler = &amp;i8259A_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;i8259A_irq_type;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * 'high' PCI IRQs filled in on demand</div><div class='ctx'> 			 */</div><div class='del'>-			irq_desc[i].handler = &amp;no_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;no_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c<br/>index d70f2ade5cde..4fb32c551fe0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/io_apic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/io_apic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/io_apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/io_apic.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='hunk'>@@ -38,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -50,6 +50,7 @@ atomic_t irq_mis_count;</div><div class='ctx'> static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ioapic_lock);</div><div class='add'>+static DEFINE_SPINLOCK(vector_lock);</div><div class='ctx'> </div><div class='ctx'> int timer_over_8254 __initdata = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +268,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)</div><div class='ctx'> # include &lt;linux/slab.h&gt;		/* kmalloc() */</div><div class='ctx'> # include &lt;linux/timer.h&gt;	/* time_after() */</div><div class='ctx'>  </div><div class='del'>-# ifdef CONFIG_BALANCED_IRQ_DEBUG</div><div class='add'>+#ifdef CONFIG_BALANCED_IRQ_DEBUG</div><div class='ctx'> #  define TDprintk(x...) do { printk("&lt;%ld:%s:%d&gt;: ", jiffies, __FILE__, __LINE__); printk(x); } while (0)</div><div class='ctx'> #  define Dprintk(x...) do { TDprintk(x); } while (0)</div><div class='ctx'> # else</div><div class='hunk'>@@ -275,10 +276,15 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)</div><div class='ctx'> #  define Dprintk(x...) </div><div class='ctx'> # endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #define IRQBALANCE_CHECK_ARCH -999</div><div class='del'>-static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH;</div><div class='del'>-static int physical_balance = 0;</div><div class='add'>+#define MAX_BALANCED_IRQ_INTERVAL	(5*HZ)</div><div class='add'>+#define MIN_BALANCED_IRQ_INTERVAL	(HZ/2)</div><div class='add'>+#define BALANCED_IRQ_MORE_DELTA		(HZ/10)</div><div class='add'>+#define BALANCED_IRQ_LESS_DELTA		(HZ)</div><div class='add'>+</div><div class='add'>+static int irqbalance_disabled __read_mostly = IRQBALANCE_CHECK_ARCH;</div><div class='add'>+static int physical_balance __read_mostly;</div><div class='add'>+static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL;</div><div class='ctx'> </div><div class='ctx'> static struct irq_cpu_info {</div><div class='ctx'> 	unsigned long * last_irq;</div><div class='hunk'>@@ -297,12 +303,14 @@ static struct irq_cpu_info {</div><div class='ctx'> </div><div class='ctx'> #define CPU_TO_PACKAGEINDEX(i) (first_cpu(cpu_sibling_map[i]))</div><div class='ctx'> </div><div class='del'>-#define MAX_BALANCED_IRQ_INTERVAL	(5*HZ)</div><div class='del'>-#define MIN_BALANCED_IRQ_INTERVAL	(HZ/2)</div><div class='del'>-#define BALANCED_IRQ_MORE_DELTA		(HZ/10)</div><div class='del'>-#define BALANCED_IRQ_LESS_DELTA		(HZ)</div><div class='add'>+static cpumask_t balance_irq_affinity[NR_IRQS] = {</div><div class='add'>+	[0 ... NR_IRQS-1] = CPU_MASK_ALL</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static long balanced_irq_interval = MAX_BALANCED_IRQ_INTERVAL;</div><div class='add'>+void set_balance_irq_affinity(unsigned int irq, cpumask_t mask)</div><div class='add'>+{</div><div class='add'>+	balance_irq_affinity[irq] = mask;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static unsigned long move(int curr_cpu, cpumask_t allowed_mask,</div><div class='ctx'> 			unsigned long now, int direction)</div><div class='hunk'>@@ -340,7 +348,7 @@ static inline void balance_irq(int cpu, int irq)</div><div class='ctx'> 	if (irqbalance_disabled)</div><div class='ctx'> 		return; </div><div class='ctx'> </div><div class='del'>-	cpus_and(allowed_mask, cpu_online_map, irq_affinity[irq]);</div><div class='add'>+	cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]);</div><div class='ctx'> 	new_cpu = move(cpu, allowed_mask, now, 1);</div><div class='ctx'> 	if (cpu != new_cpu) {</div><div class='ctx'> 		set_pending_irq(irq, cpumask_of_cpu(new_cpu));</div><div class='hunk'>@@ -529,7 +537,9 @@ tryanotherirq:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cpus_and(allowed_mask, cpu_online_map, irq_affinity[selected_irq]);</div><div class='add'>+	cpus_and(allowed_mask,</div><div class='add'>+		cpu_online_map,</div><div class='add'>+		balance_irq_affinity[selected_irq]);</div><div class='ctx'> 	target_cpu_mask = cpumask_of_cpu(min_loaded);</div><div class='ctx'> 	cpus_and(tmp, target_cpu_mask, allowed_mask);</div><div class='ctx'> </div><div class='hunk'>@@ -570,7 +580,7 @@ static int balanced_irq(void *unused)</div><div class='ctx'> 	</div><div class='ctx'> 	/* push everything to CPU 0 to give us a starting point.  */</div><div class='ctx'> 	for (i = 0 ; i &lt; NR_IRQS ; i++) {</div><div class='del'>-		pending_irq_cpumask[i] = cpumask_of_cpu(0);</div><div class='add'>+		irq_desc[i].pending_mask = cpumask_of_cpu(0);</div><div class='ctx'> 		set_pending_irq(i, cpumask_of_cpu(0));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1152,10 +1162,17 @@ u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };</div><div class='ctx'> int assign_irq_vector(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int vector;</div><div class='add'>+</div><div class='add'>+	BUG_ON(irq != AUTO_ASSIGN &amp;&amp; (unsigned)irq &gt;= NR_IRQ_VECTORS);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(irq &gt;= NR_IRQ_VECTORS);</div><div class='del'>-	if (irq != AUTO_ASSIGN &amp;&amp; IO_APIC_VECTOR(irq) &gt; 0)</div><div class='add'>+	spin_lock_irqsave(&amp;vector_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (irq != AUTO_ASSIGN &amp;&amp; IO_APIC_VECTOR(irq) &gt; 0) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;vector_lock, flags);</div><div class='ctx'> 		return IO_APIC_VECTOR(irq);</div><div class='add'>+	}</div><div class='ctx'> next:</div><div class='ctx'> 	current_vector += 8;</div><div class='ctx'> 	if (current_vector == SYSCALL_VECTOR)</div><div class='hunk'>@@ -1163,16 +1180,21 @@ next:</div><div class='ctx'> </div><div class='ctx'> 	if (current_vector &gt;= FIRST_SYSTEM_VECTOR) {</div><div class='ctx'> 		offset++;</div><div class='del'>-		if (!(offset%8))</div><div class='add'>+		if (!(offset%8)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;vector_lock, flags);</div><div class='ctx'> 			return -ENOSPC;</div><div class='add'>+		}</div><div class='ctx'> 		current_vector = FIRST_DEVICE_VECTOR + offset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vector_irq[current_vector] = irq;</div><div class='add'>+	vector = current_vector;</div><div class='add'>+	vector_irq[vector] = irq;</div><div class='ctx'> 	if (irq != AUTO_ASSIGN)</div><div class='del'>-		IO_APIC_VECTOR(irq) = current_vector;</div><div class='add'>+		IO_APIC_VECTOR(irq) = vector;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;vector_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return current_vector;</div><div class='add'>+	return vector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct hw_interrupt_type ioapic_level_type;</div><div class='hunk'>@@ -1182,23 +1204,18 @@ static struct hw_interrupt_type ioapic_edge_type;</div><div class='ctx'> #define IOAPIC_EDGE	0</div><div class='ctx'> #define IOAPIC_LEVEL	1</div><div class='ctx'> </div><div class='del'>-static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)</div><div class='add'>+static void ioapic_register_intr(int irq, int vector, unsigned long trigger)</div><div class='ctx'> {</div><div class='del'>-	if (use_pci_vector() &amp;&amp; !platform_legacy_irq(irq)) {</div><div class='del'>-		if ((trigger == IOAPIC_AUTO &amp;&amp; IO_APIC_irq_trigger(irq)) ||</div><div class='del'>-				trigger == IOAPIC_LEVEL)</div><div class='del'>-			irq_desc[vector].handler = &amp;ioapic_level_type;</div><div class='del'>-		else</div><div class='del'>-			irq_desc[vector].handler = &amp;ioapic_edge_type;</div><div class='del'>-		set_intr_gate(vector, interrupt[vector]);</div><div class='del'>-	} else	{</div><div class='del'>-		if ((trigger == IOAPIC_AUTO &amp;&amp; IO_APIC_irq_trigger(irq)) ||</div><div class='del'>-				trigger == IOAPIC_LEVEL)</div><div class='del'>-			irq_desc[irq].handler = &amp;ioapic_level_type;</div><div class='del'>-		else</div><div class='del'>-			irq_desc[irq].handler = &amp;ioapic_edge_type;</div><div class='del'>-		set_intr_gate(vector, interrupt[irq]);</div><div class='del'>-	}</div><div class='add'>+	unsigned idx;</div><div class='add'>+</div><div class='add'>+	idx = use_pci_vector() &amp;&amp; !platform_legacy_irq(irq) ? vector : irq;</div><div class='add'>+</div><div class='add'>+	if ((trigger == IOAPIC_AUTO &amp;&amp; IO_APIC_irq_trigger(irq)) ||</div><div class='add'>+			trigger == IOAPIC_LEVEL)</div><div class='add'>+		irq_desc[idx].chip = &amp;ioapic_level_type;</div><div class='add'>+	else</div><div class='add'>+		irq_desc[idx].chip = &amp;ioapic_edge_type;</div><div class='add'>+	set_intr_gate(vector, interrupt[idx]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init setup_IO_APIC_irqs(void)</div><div class='hunk'>@@ -1309,7 +1326,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in</div><div class='ctx'> 	 * The timer IRQ doesn't have to know that behind the</div><div class='ctx'> 	 * scene we have a 8259A-master in AEOI mode ...</div><div class='ctx'> 	 */</div><div class='del'>-	irq_desc[0].handler = &amp;ioapic_edge_type;</div><div class='add'>+	irq_desc[0].chip = &amp;ioapic_edge_type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add it to the IO-APIC irq-routing table:</div><div class='hunk'>@@ -2053,6 +2070,13 @@ static void set_ioapic_affinity_vector (unsigned int vector,</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static int ioapic_retrigger(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	send_IPI_self(IO_APIC_VECTOR(irq));</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Level and edge triggered IO-APIC interrupts need different handling,</div><div class='ctx'>  * so we use two separate IRQ descriptors. Edge triggered IRQs can be</div><div class='hunk'>@@ -2072,6 +2096,7 @@ static struct hw_interrupt_type ioapic_edge_type __read_mostly = {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.set_affinity 	= set_ioapic_affinity,</div><div class='ctx'> #endif</div><div class='add'>+	.retrigger	= ioapic_retrigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct hw_interrupt_type ioapic_level_type __read_mostly = {</div><div class='hunk'>@@ -2085,6 +2110,7 @@ static struct hw_interrupt_type ioapic_level_type __read_mostly = {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.set_affinity 	= set_ioapic_affinity,</div><div class='ctx'> #endif</div><div class='add'>+	.retrigger	= ioapic_retrigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void init_IO_APIC_traps(void)</div><div class='hunk'>@@ -2119,7 +2145,7 @@ static inline void init_IO_APIC_traps(void)</div><div class='ctx'> 				make_8259A_irq(irq);</div><div class='ctx'> 			else</div><div class='ctx'> 				/* Strange. Oh, well.. */</div><div class='del'>-				irq_desc[irq].handler = &amp;no_irq_type;</div><div class='add'>+				irq_desc[irq].chip = &amp;no_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2335,7 +2361,7 @@ static inline void check_timer(void)</div><div class='ctx'> 	printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");</div><div class='ctx'> </div><div class='ctx'> 	disable_8259A_irq(0);</div><div class='del'>-	irq_desc[0].handler = &amp;lapic_irq_type;</div><div class='add'>+	irq_desc[0].chip = &amp;lapic_irq_type;</div><div class='ctx'> 	apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector);	/* Fixed mode */</div><div class='ctx'> 	enable_8259A_irq(0);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/ioport.c b/arch/i386/kernel/ioport.c<br/>index 79026f026b85..498e8bc197d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/ioport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/ioport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/ioport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/ioport.c</a></div><div class='hunk'>@@ -79,6 +79,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)</div><div class='ctx'> </div><div class='ctx'> 		memset(bitmap, 0xff, IO_BITMAP_BYTES);</div><div class='ctx'> 		t-&gt;io_bitmap_ptr = bitmap;</div><div class='add'>+		set_thread_flag(TIF_IO_BITMAP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c<br/>index f3a9c78c4a24..6cb529f60dcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/irq.c</a></div><div class='hunk'>@@ -42,8 +42,8 @@ union irq_ctx {</div><div class='ctx'> 	u32                     stack[THREAD_SIZE/sizeof(u32)];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static union irq_ctx *hardirq_ctx[NR_CPUS];</div><div class='del'>-static union irq_ctx *softirq_ctx[NR_CPUS];</div><div class='add'>+static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly;</div><div class='add'>+static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -53,13 +53,19 @@ static union irq_ctx *softirq_ctx[NR_CPUS];</div><div class='ctx'>  */</div><div class='ctx'> fastcall unsigned int do_IRQ(struct pt_regs *regs)</div><div class='ctx'> {	</div><div class='del'>-	/* high bits used in ret_from_ code */</div><div class='del'>-	int irq = regs-&gt;orig_eax &amp; 0xff;</div><div class='add'>+	/* high bit used in ret_from_ code */</div><div class='add'>+	int irq = ~regs-&gt;orig_eax;</div><div class='ctx'> #ifdef CONFIG_4KSTACKS</div><div class='ctx'> 	union irq_ctx *curctx, *irqctx;</div><div class='ctx'> 	u32 *isp;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (unlikely((unsigned)irq &gt;= NR_IRQS)) {</div><div class='add'>+		printk(KERN_EMERG "%s: cannot handle IRQ %d\n",</div><div class='add'>+					__FUNCTION__, irq);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	irq_enter();</div><div class='ctx'> #ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='ctx'> 	/* Debugging check for stack overflow: is there less than 1KB free? */</div><div class='hunk'>@@ -76,6 +82,10 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (!irq_desc[irq].handle_irq) {</div><div class='add'>+		__do_IRQ(irq, regs);</div><div class='add'>+		goto out_exit;</div><div class='add'>+	}</div><div class='ctx'> #ifdef CONFIG_4KSTACKS</div><div class='ctx'> </div><div class='ctx'> 	curctx = (union irq_ctx *) current_thread_info();</div><div class='hunk'>@@ -95,6 +105,14 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)</div><div class='ctx'> 		irqctx-&gt;tinfo.task = curctx-&gt;tinfo.task;</div><div class='ctx'> 		irqctx-&gt;tinfo.previous_esp = current_stack_pointer;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Copy the softirq bits in preempt_count so that the</div><div class='add'>+		 * softirq checks work in the hardirq context.</div><div class='add'>+		 */</div><div class='add'>+		irqctx-&gt;tinfo.preempt_count =</div><div class='add'>+			(irqctx-&gt;tinfo.preempt_count &amp; ~SOFTIRQ_MASK) |</div><div class='add'>+			(curctx-&gt;tinfo.preempt_count &amp; SOFTIRQ_MASK);</div><div class='add'>+</div><div class='ctx'> 		asm volatile(</div><div class='ctx'> 			"       xchgl   %%ebx,%%esp      \n"</div><div class='ctx'> 			"       call    __do_IRQ         \n"</div><div class='hunk'>@@ -107,6 +125,7 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)</div><div class='ctx'> #endif</div><div class='ctx'> 		__do_IRQ(irq, regs);</div><div class='ctx'> </div><div class='add'>+out_exit:</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -147,7 +166,7 @@ void irq_ctx_init(int cpu)</div><div class='ctx'> 	irqctx-&gt;tinfo.task              = NULL;</div><div class='ctx'> 	irqctx-&gt;tinfo.exec_domain       = NULL;</div><div class='ctx'> 	irqctx-&gt;tinfo.cpu               = cpu;</div><div class='del'>-	irqctx-&gt;tinfo.preempt_count     = SOFTIRQ_OFFSET;</div><div class='add'>+	irqctx-&gt;tinfo.preempt_count     = 0;</div><div class='ctx'> 	irqctx-&gt;tinfo.addr_limit        = MAKE_MM_SEG(0);</div><div class='ctx'> </div><div class='ctx'> 	softirq_ctx[cpu] = irqctx;</div><div class='hunk'>@@ -192,6 +211,10 @@ asmlinkage void do_softirq(void)</div><div class='ctx'> 			: "0"(isp)</div><div class='ctx'> 			: "memory", "cc", "edx", "ecx", "eax"</div><div class='ctx'> 		);</div><div class='add'>+		/*</div><div class='add'>+		 * Shouldnt happen, we returned above if in_interrupt():</div><div class='add'>+	 	 */</div><div class='add'>+		WARN_ON_ONCE(softirq_count());</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -219,7 +242,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 	if (i == 0) {</div><div class='ctx'> 		seq_printf(p, "           ");</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='del'>-			seq_printf(p, "CPU%d       ",j);</div><div class='add'>+			seq_printf(p, "CPU%-8d",j);</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -235,7 +258,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -277,13 +300,13 @@ void fixup_irqs(cpumask_t map)</div><div class='ctx'> 		if (irq == 2)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		cpus_and(mask, irq_affinity[irq], map);</div><div class='add'>+		cpus_and(mask, irq_desc[irq].affinity, map);</div><div class='ctx'> 		if (any_online_cpu(mask) == NR_CPUS) {</div><div class='ctx'> 			printk("Breaking affinity for irq %i\n", irq);</div><div class='ctx'> 			mask = map;</div><div class='ctx'> 		}</div><div class='del'>-		if (irq_desc[irq].handler-&gt;set_affinity)</div><div class='del'>-			irq_desc[irq].handler-&gt;set_affinity(irq, mask);</div><div class='add'>+		if (irq_desc[irq].chip-&gt;set_affinity)</div><div class='add'>+			irq_desc[irq].chip-&gt;set_affinity(irq, mask);</div><div class='ctx'> 		else if (irq_desc[irq].action &amp;&amp; !(warned++))</div><div class='ctx'> 			printk("Cannot set affinity for irq %i\n", irq);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c<br/>index 38806f427849..de2e16e561c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/kprobes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/kprobes.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *		&lt;prasanna@in.ibm.com&gt; added function-return probes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='hunk'>@@ -57,34 +56,85 @@ static __always_inline void set_jmp_op(void *from, void *to)</div><div class='ctx'> /*</div><div class='ctx'>  * returns non-zero if opcodes can be boosted.</div><div class='ctx'>  */</div><div class='del'>-static __always_inline int can_boost(kprobe_opcode_t opcode)</div><div class='add'>+static __always_inline int can_boost(kprobe_opcode_t *opcodes)</div><div class='ctx'> {</div><div class='del'>-	switch (opcode &amp; 0xf0 ) {</div><div class='add'>+#define W(row,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,ba,bb,bc,bd,be,bf)		      \</div><div class='add'>+	(((b0##UL &lt;&lt; 0x0)|(b1##UL &lt;&lt; 0x1)|(b2##UL &lt;&lt; 0x2)|(b3##UL &lt;&lt; 0x3) |   \</div><div class='add'>+	  (b4##UL &lt;&lt; 0x4)|(b5##UL &lt;&lt; 0x5)|(b6##UL &lt;&lt; 0x6)|(b7##UL &lt;&lt; 0x7) |   \</div><div class='add'>+	  (b8##UL &lt;&lt; 0x8)|(b9##UL &lt;&lt; 0x9)|(ba##UL &lt;&lt; 0xa)|(bb##UL &lt;&lt; 0xb) |   \</div><div class='add'>+	  (bc##UL &lt;&lt; 0xc)|(bd##UL &lt;&lt; 0xd)|(be##UL &lt;&lt; 0xe)|(bf##UL &lt;&lt; 0xf))    \</div><div class='add'>+	 &lt;&lt; (row % 32))</div><div class='add'>+	/*</div><div class='add'>+	 * Undefined/reserved opcodes, conditional jump, Opcode Extension</div><div class='add'>+	 * Groups, and some special opcodes can not be boost.</div><div class='add'>+	 */</div><div class='add'>+	static const unsigned long twobyte_is_boostable[256 / 32] = {</div><div class='add'>+		/*      0 1 2 3 4 5 6 7 8 9 a b c d e f         */</div><div class='add'>+		/*      -------------------------------         */</div><div class='add'>+		W(0x00, 0,0,1,1,0,0,1,0,1,1,0,0,0,0,0,0)| /* 00 */</div><div class='add'>+		W(0x10, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), /* 10 */</div><div class='add'>+		W(0x20, 1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0)| /* 20 */</div><div class='add'>+		W(0x30, 0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0), /* 30 */</div><div class='add'>+		W(0x40, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1)| /* 40 */</div><div class='add'>+		W(0x50, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), /* 50 */</div><div class='add'>+		W(0x60, 1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,1)| /* 60 */</div><div class='add'>+		W(0x70, 0,0,0,0,1,1,1,1,0,0,0,0,0,0,1,1), /* 70 */</div><div class='add'>+		W(0x80, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)| /* 80 */</div><div class='add'>+		W(0x90, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1), /* 90 */</div><div class='add'>+		W(0xa0, 1,1,0,1,1,1,0,0,1,1,0,1,1,1,0,1)| /* a0 */</div><div class='add'>+		W(0xb0, 1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1), /* b0 */</div><div class='add'>+		W(0xc0, 1,1,0,0,0,0,0,0,1,1,1,1,1,1,1,1)| /* c0 */</div><div class='add'>+		W(0xd0, 0,1,1,1,0,1,0,0,1,1,0,1,1,1,0,1), /* d0 */</div><div class='add'>+		W(0xe0, 0,1,1,0,0,1,0,0,1,1,0,1,1,1,0,1)| /* e0 */</div><div class='add'>+		W(0xf0, 0,1,1,1,0,1,0,0,1,1,1,0,1,1,1,0)  /* f0 */</div><div class='add'>+		/*      -------------------------------         */</div><div class='add'>+		/*      0 1 2 3 4 5 6 7 8 9 a b c d e f         */</div><div class='add'>+	};</div><div class='add'>+#undef W</div><div class='add'>+	kprobe_opcode_t opcode;</div><div class='add'>+	kprobe_opcode_t *orig_opcodes = opcodes;</div><div class='add'>+retry:</div><div class='add'>+	if (opcodes - orig_opcodes &gt; MAX_INSN_SIZE - 1)</div><div class='add'>+		return 0;</div><div class='add'>+	opcode = *(opcodes++);</div><div class='add'>+</div><div class='add'>+	/* 2nd-byte opcode */</div><div class='add'>+	if (opcode == 0x0f) {</div><div class='add'>+		if (opcodes - orig_opcodes &gt; MAX_INSN_SIZE - 1)</div><div class='add'>+			return 0;</div><div class='add'>+		return test_bit(*opcodes, twobyte_is_boostable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (opcode &amp; 0xf0) {</div><div class='add'>+	case 0x60:</div><div class='add'>+		if (0x63 &lt; opcode &amp;&amp; opcode &lt; 0x67)</div><div class='add'>+			goto retry; /* prefixes */</div><div class='add'>+		/* can't boost Address-size override and bound */</div><div class='add'>+		return (opcode != 0x62 &amp;&amp; opcode != 0x67);</div><div class='ctx'> 	case 0x70:</div><div class='ctx'> 		return 0; /* can't boost conditional jump */</div><div class='del'>-	case 0x90:</div><div class='del'>-		/* can't boost call and pushf */</div><div class='del'>-		return opcode != 0x9a &amp;&amp; opcode != 0x9c;</div><div class='ctx'> 	case 0xc0:</div><div class='del'>-		/* can't boost undefined opcodes and soft-interruptions */</div><div class='del'>-		return (0xc1 &lt; opcode &amp;&amp; opcode &lt; 0xc6) ||</div><div class='del'>-			(0xc7 &lt; opcode &amp;&amp; opcode &lt; 0xcc) || opcode == 0xcf;</div><div class='add'>+		/* can't boost software-interruptions */</div><div class='add'>+		return (0xc1 &lt; opcode &amp;&amp; opcode &lt; 0xcc) || opcode == 0xcf;</div><div class='ctx'> 	case 0xd0:</div><div class='ctx'> 		/* can boost AA* and XLAT */</div><div class='ctx'> 		return (opcode == 0xd4 || opcode == 0xd5 || opcode == 0xd7);</div><div class='ctx'> 	case 0xe0:</div><div class='del'>-		/* can boost in/out and (may be) jmps */</div><div class='del'>-		return (0xe3 &lt; opcode &amp;&amp; opcode != 0xe8);</div><div class='add'>+		/* can boost in/out and absolute jmps */</div><div class='add'>+		return ((opcode &amp; 0x04) || opcode == 0xea);</div><div class='ctx'> 	case 0xf0:</div><div class='add'>+		if ((opcode &amp; 0x0c) == 0 &amp;&amp; opcode != 0xf1)</div><div class='add'>+			goto retry; /* lock/rep(ne) prefix */</div><div class='ctx'> 		/* clear and set flags can be boost */</div><div class='ctx'> 		return (opcode == 0xf5 || (0xf7 &lt; opcode &amp;&amp; opcode &lt; 0xfe));</div><div class='ctx'> 	default:</div><div class='del'>-		/* currently, can't boost 2 bytes opcodes */</div><div class='del'>-		return opcode != 0x0f;</div><div class='add'>+		if (opcode == 0x26 || opcode == 0x36 || opcode == 0x3e)</div><div class='add'>+			goto retry; /* prefixes */</div><div class='add'>+		/* can't boost CS override and call */</div><div class='add'>+		return (opcode != 0x2e &amp;&amp; opcode != 0x9a);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * returns non-zero if opcode modifies the interrupt flag.</div><div class='ctx'>  */</div><div class='hunk'>@@ -109,7 +159,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(p-&gt;ainsn.insn, p-&gt;addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));</div><div class='ctx'> 	p-&gt;opcode = *p-&gt;addr;</div><div class='del'>-	if (can_boost(p-&gt;opcode)) {</div><div class='add'>+	if (can_boost(p-&gt;addr)) {</div><div class='ctx'> 		p-&gt;ainsn.boostable = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		p-&gt;ainsn.boostable = -1;</div><div class='hunk'>@@ -208,7 +258,9 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> 	struct kprobe_ctlblk *kcb;</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='ctx'> 	unsigned pre_preempt_count = preempt_count();</div><div class='del'>-#endif /* CONFIG_PREEMPT */</div><div class='add'>+#else</div><div class='add'>+	unsigned pre_preempt_count = 1;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	addr = (kprobe_opcode_t *)(regs-&gt;eip - sizeof(kprobe_opcode_t));</div><div class='ctx'> </div><div class='hunk'>@@ -285,22 +337,14 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)</div><div class='ctx'> 		/* handler has already set things up, so skip ss setup */</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;ainsn.boostable == 1 &amp;&amp;</div><div class='del'>-#ifdef CONFIG_PREEMPT</div><div class='del'>-	    !(pre_preempt_count) &amp;&amp; /*</div><div class='del'>-				       * This enables booster when the direct</div><div class='del'>-				       * execution path aren't preempted.</div><div class='del'>-				       */</div><div class='del'>-#endif /* CONFIG_PREEMPT */</div><div class='del'>-	    !p-&gt;post_handler &amp;&amp; !p-&gt;break_handler ) {</div><div class='add'>+ss_probe:</div><div class='add'>+	if (pre_preempt_count &amp;&amp; p-&gt;ainsn.boostable == 1 &amp;&amp; !p-&gt;post_handler){</div><div class='ctx'> 		/* Boost up -- we can execute copied instructions directly */</div><div class='ctx'> 		reset_current_kprobe();</div><div class='ctx'> 		regs-&gt;eip = (unsigned long)p-&gt;ainsn.insn;</div><div class='ctx'> 		preempt_enable_no_resched();</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-ss_probe:</div><div class='ctx'> 	prepare_singlestep(p, regs);</div><div class='ctx'> 	kcb-&gt;kprobe_status = KPROBE_HIT_SS;</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -607,7 +651,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,</div><div class='ctx'> 	struct die_args *args = (struct die_args *)data;</div><div class='ctx'> 	int ret = NOTIFY_DONE;</div><div class='ctx'> </div><div class='del'>-	if (args-&gt;regs &amp;&amp; user_mode(args-&gt;regs))</div><div class='add'>+	if (args-&gt;regs &amp;&amp; user_mode_vm(args-&gt;regs))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (val) {</div><div class='head'>diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c<br/>index f73d7374a2ba..511abe52a94e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -133,9 +133,9 @@ typedef asmlinkage NORET_TYPE void (*relocate_new_kernel_t)(</div><div class='ctx'> 					unsigned long start_address,</div><div class='ctx'> 					unsigned int has_pae) ATTRIB_NORET;</div><div class='ctx'> </div><div class='del'>-const extern unsigned char relocate_new_kernel[];</div><div class='add'>+extern const unsigned char relocate_new_kernel[];</div><div class='ctx'> extern void relocate_new_kernel_end(void);</div><div class='del'>-const extern unsigned int relocate_new_kernel_size;</div><div class='add'>+extern const unsigned int relocate_new_kernel_size;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * A architecture hook called to validate the</div><div class='head'>diff --git a/arch/i386/kernel/mca.c b/arch/i386/kernel/mca.c<br/>index 558bb207720f..cd5456f14af4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/mca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/mca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/mca.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c<br/>index e7c138f66c5a..40b44cc0d14b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/microcode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/microcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/microcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/microcode.c</a></div><div class='hunk'>@@ -91,7 +91,10 @@ MODULE_DESCRIPTION("Intel CPU (IA-32) Microcode Update Driver");</div><div class='ctx'> MODULE_AUTHOR("Tigran Aivazian &lt;tigran@veritas.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#define MICROCODE_VERSION 	"1.14"</div><div class='add'>+static int verbose;</div><div class='add'>+module_param(verbose, int, 0644);</div><div class='add'>+</div><div class='add'>+#define MICROCODE_VERSION 	"1.14a"</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_UCODE_DATASIZE 	(2000) 	  /* 2000 bytes */</div><div class='ctx'> #define MC_HEADER_SIZE		(sizeof (microcode_header_t))  	  /* 48 bytes */</div><div class='hunk'>@@ -122,14 +125,15 @@ static unsigned int user_buffer_size;	/* it's size */</div><div class='ctx'> </div><div class='ctx'> typedef enum mc_error_code {</div><div class='ctx'> 	MC_SUCCESS 	= 0,</div><div class='del'>-	MC_NOTFOUND 	= 1,</div><div class='del'>-	MC_MARKED 	= 2,</div><div class='del'>-	MC_ALLOCATED 	= 3,</div><div class='add'>+	MC_IGNORED 	= 1,</div><div class='add'>+	MC_NOTFOUND 	= 2,</div><div class='add'>+	MC_MARKED 	= 3,</div><div class='add'>+	MC_ALLOCATED 	= 4,</div><div class='ctx'> } mc_error_code_t;</div><div class='ctx'> </div><div class='ctx'> static struct ucode_cpu_info {</div><div class='ctx'> 	unsigned int sig;</div><div class='del'>-	unsigned int pf;</div><div class='add'>+	unsigned int pf, orig_pf;</div><div class='ctx'> 	unsigned int rev;</div><div class='ctx'> 	unsigned int cksum;</div><div class='ctx'> 	mc_error_code_t err;</div><div class='hunk'>@@ -164,6 +168,7 @@ static void collect_cpu_info (void *unused)</div><div class='ctx'> 			rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);</div><div class='ctx'> 			uci-&gt;pf = 1 &lt;&lt; ((val[1] &gt;&gt; 18) &amp; 7);</div><div class='ctx'> 		}</div><div class='add'>+		uci-&gt;orig_pf = uci-&gt;pf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wrmsr(MSR_IA32_UCODE_REV, 0, 0);</div><div class='hunk'>@@ -197,21 +202,34 @@ static inline void mark_microcode_update (int cpu_num, microcode_header_t *mc_he</div><div class='ctx'> 	pr_debug("   Checksum 0x%x\n", cksum);</div><div class='ctx'> </div><div class='ctx'> 	if (mc_header-&gt;rev &lt; uci-&gt;rev) {</div><div class='del'>-		printk(KERN_ERR "microcode: CPU%d not 'upgrading' to earlier revision"</div><div class='del'>-		       " 0x%x (current=0x%x)\n", cpu_num, mc_header-&gt;rev, uci-&gt;rev);</div><div class='del'>-		goto out;</div><div class='add'>+		if (uci-&gt;err == MC_NOTFOUND) {</div><div class='add'>+			uci-&gt;err = MC_IGNORED;</div><div class='add'>+			uci-&gt;cksum = mc_header-&gt;rev;</div><div class='add'>+		} else if (uci-&gt;err == MC_IGNORED &amp;&amp; uci-&gt;cksum &lt; mc_header-&gt;rev)</div><div class='add'>+			uci-&gt;cksum = mc_header-&gt;rev;</div><div class='ctx'> 	} else if (mc_header-&gt;rev == uci-&gt;rev) {</div><div class='del'>-		/* notify the caller of success on this cpu */</div><div class='del'>-		uci-&gt;err = MC_SUCCESS;</div><div class='del'>-		goto out;</div><div class='add'>+		if (uci-&gt;err &lt; MC_MARKED) {</div><div class='add'>+			/* notify the caller of success on this cpu */</div><div class='add'>+			uci-&gt;err = MC_SUCCESS;</div><div class='add'>+		}</div><div class='add'>+	} else if (uci-&gt;err != MC_ALLOCATED || mc_header-&gt;rev &gt; uci-&gt;mc-&gt;hdr.rev) {</div><div class='add'>+		pr_debug("microcode: CPU%d found a matching microcode update with "</div><div class='add'>+			" revision 0x%x (current=0x%x)\n", cpu_num, mc_header-&gt;rev, uci-&gt;rev);</div><div class='add'>+		uci-&gt;cksum = cksum;</div><div class='add'>+		uci-&gt;pf = pf; /* keep the original mc pf for cksum calculation */</div><div class='add'>+		uci-&gt;err = MC_MARKED; /* found the match */</div><div class='add'>+		for_each_online_cpu(cpu_num) {</div><div class='add'>+			if (ucode_cpu_info + cpu_num != uci</div><div class='add'>+			    &amp;&amp; ucode_cpu_info[cpu_num].mc == uci-&gt;mc) {</div><div class='add'>+				uci-&gt;mc = NULL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (uci-&gt;mc != NULL) {</div><div class='add'>+			vfree(uci-&gt;mc);</div><div class='add'>+			uci-&gt;mc = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	pr_debug("microcode: CPU%d found a matching microcode update with "</div><div class='del'>-		" revision 0x%x (current=0x%x)\n", cpu_num, mc_header-&gt;rev, uci-&gt;rev);</div><div class='del'>-	uci-&gt;cksum = cksum;</div><div class='del'>-	uci-&gt;pf = pf; /* keep the original mc pf for cksum calculation */</div><div class='del'>-	uci-&gt;err = MC_MARKED; /* found the match */</div><div class='del'>-out:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -253,10 +271,8 @@ static int find_matching_ucodes (void)</div><div class='ctx'> </div><div class='ctx'> 		for_each_online_cpu(cpu_num) {</div><div class='ctx'> 			struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='del'>-			if (uci-&gt;err != MC_NOTFOUND) /* already found a match or not an online cpu*/</div><div class='del'>-				continue;</div><div class='ctx'> </div><div class='del'>-			if (sigmatch(mc_header.sig, uci-&gt;sig, mc_header.pf, uci-&gt;pf))</div><div class='add'>+			if (sigmatch(mc_header.sig, uci-&gt;sig, mc_header.pf, uci-&gt;orig_pf))</div><div class='ctx'> 				mark_microcode_update(cpu_num, &amp;mc_header, mc_header.sig, mc_header.pf, mc_header.cksum);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -295,9 +311,8 @@ static int find_matching_ucodes (void)</div><div class='ctx'> 				}</div><div class='ctx'> 				for_each_online_cpu(cpu_num) {</div><div class='ctx'> 					struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='del'>-					if (uci-&gt;err != MC_NOTFOUND) /* already found a match or not an online cpu*/</div><div class='del'>-						continue;</div><div class='del'>-					if (sigmatch(ext_sig.sig, uci-&gt;sig, ext_sig.pf, uci-&gt;pf)) {</div><div class='add'>+</div><div class='add'>+					if (sigmatch(ext_sig.sig, uci-&gt;sig, ext_sig.pf, uci-&gt;orig_pf)) {</div><div class='ctx'> 						mark_microcode_update(cpu_num, &amp;mc_header, ext_sig.sig, ext_sig.pf, ext_sig.cksum);</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='hunk'>@@ -368,6 +383,13 @@ static void do_update_one (void * unused)</div><div class='ctx'> 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;</div><div class='ctx'> </div><div class='ctx'> 	if (uci-&gt;mc == NULL) {</div><div class='add'>+		if (verbose) {</div><div class='add'>+			if (uci-&gt;err == MC_SUCCESS)</div><div class='add'>+				printk(KERN_INFO "microcode: CPU%d already at revision 0x%x\n",</div><div class='add'>+					cpu_num, uci-&gt;rev);</div><div class='add'>+			else</div><div class='add'>+				printk(KERN_INFO "microcode: No new microcode data for CPU%d\n", cpu_num);</div><div class='add'>+		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -426,6 +448,9 @@ out_free:</div><div class='ctx'> 					ucode_cpu_info[j].mc = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		if (ucode_cpu_info[i].err == MC_IGNORED &amp;&amp; verbose)</div><div class='add'>+			printk(KERN_WARNING "microcode: CPU%d not 'upgrading' to earlier revision"</div><div class='add'>+			       " 0x%x (current=0x%x)\n", i, ucode_cpu_info[i].cksum, ucode_cpu_info[i].rev);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -468,7 +493,6 @@ static struct file_operations microcode_fops = {</div><div class='ctx'> static struct miscdevice microcode_dev = {</div><div class='ctx'> 	.minor		= MICROCODE_MINOR,</div><div class='ctx'> 	.name		= "microcode",</div><div class='del'>-	.devfs_name	= "cpu/microcode",</div><div class='ctx'> 	.fops		= &amp;microcode_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c<br/>index 6b1392d33ed5..a70b5fa0ef06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/mpparse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/mpparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/mpparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/mpparse.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c<br/>index 7a328230e540..d535cdbbfd25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/msr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/msr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/msr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/msr.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -251,7 +250,9 @@ static int msr_class_device_create(int i)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='add'>+static int msr_class_cpu_callback(struct notifier_block *nfb,</div><div class='add'>+				unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='ctx'> </div><div class='hunk'>@@ -266,10 +267,11 @@ static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long acti</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block msr_class_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata msr_class_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'> 	.notifier_call = msr_class_cpu_callback,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int __init msr_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -292,7 +294,7 @@ static int __init msr_init(void)</div><div class='ctx'> 		if (err != 0)</div><div class='ctx'> 			goto out_class;</div><div class='ctx'> 	}</div><div class='del'>-	register_cpu_notifier(&amp;msr_class_cpu_notifier);</div><div class='add'>+	register_hotcpu_notifier(&amp;msr_class_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -315,7 +317,7 @@ static void __exit msr_exit(void)</div><div class='ctx'> 		class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));</div><div class='ctx'> 	class_destroy(msr_class);</div><div class='ctx'> 	unregister_chrdev(MSR_MAJOR, "cpu/msr");</div><div class='del'>-	unregister_cpu_notifier(&amp;msr_class_cpu_notifier);</div><div class='add'>+	unregister_hotcpu_notifier(&amp;msr_class_cpu_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(msr_init);</div><div class='head'>diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c<br/>index d43b498ec745..2dd928a84645 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/nmi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/nmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/nmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/nmi.c</a></div><div class='hunk'>@@ -14,21 +14,17 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='add'>+#include &lt;asm/intel_arch_perfmon.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mach_traps.h"</div><div class='ctx'> </div><div class='hunk'>@@ -100,6 +96,9 @@ int nmi_active;</div><div class='ctx'> 	(P4_CCCR_OVF_PMI0|P4_CCCR_THRESHOLD(15)|P4_CCCR_COMPLEMENT|	\</div><div class='ctx'> 	 P4_CCCR_COMPARE|P4_CCCR_REQUIRED|P4_CCCR_ESCR_SELECT(4)|P4_CCCR_ENABLE)</div><div class='ctx'> </div><div class='add'>+#define ARCH_PERFMON_NMI_EVENT_SEL	ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL</div><div class='add'>+#define ARCH_PERFMON_NMI_EVENT_UMASK	ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> /* The performance counters used by NMI_LOCAL_APIC don't trigger when</div><div class='ctx'>  * the CPU is idle. To make sure the NMI watchdog really ticks on all</div><div class='hunk'>@@ -108,7 +107,7 @@ int nmi_active;</div><div class='ctx'> static __init void nmi_cpu_busy(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	volatile int *endflag = data;</div><div class='del'>-	local_irq_enable();</div><div class='add'>+	local_irq_enable_in_hardirq();</div><div class='ctx'> 	/* Intentionally don't use cpu_relax here. This is</div><div class='ctx'> 	   to make sure that the performance counter really ticks,</div><div class='ctx'> 	   even if there is a simulator or similar that catches the</div><div class='hunk'>@@ -212,6 +211,8 @@ static int __init setup_nmi_watchdog(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("nmi_watchdog=", setup_nmi_watchdog);</div><div class='ctx'> </div><div class='add'>+static void disable_intel_arch_watchdog(void);</div><div class='add'>+</div><div class='ctx'> static void disable_lapic_nmi_watchdog(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (nmi_active &lt;= 0)</div><div class='hunk'>@@ -221,6 +222,10 @@ static void disable_lapic_nmi_watchdog(void)</div><div class='ctx'> 		wrmsr(MSR_K7_EVNTSEL0, 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='add'>+		if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {</div><div class='add'>+			disable_intel_arch_watchdog();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		switch (boot_cpu_data.x86) {</div><div class='ctx'> 		case 6:</div><div class='ctx'> 			if (boot_cpu_data.x86_model &gt; 0xd)</div><div class='hunk'>@@ -449,6 +454,53 @@ static int setup_p4_watchdog(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void disable_intel_arch_watchdog(void)</div><div class='add'>+{</div><div class='add'>+	unsigned ebx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the Architectural PerfMon supports</div><div class='add'>+	 * Unhalted Core Cycles Event or not.</div><div class='add'>+	 * NOTE: Corresponding bit = 0 in ebp indicates event present.</div><div class='add'>+	 */</div><div class='add'>+	ebx = cpuid_ebx(10);</div><div class='add'>+	if (!(ebx &amp; ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))</div><div class='add'>+		wrmsr(MSR_ARCH_PERFMON_EVENTSEL0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_intel_arch_watchdog(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int evntsel;</div><div class='add'>+	unsigned ebx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the Architectural PerfMon supports</div><div class='add'>+	 * Unhalted Core Cycles Event or not.</div><div class='add'>+	 * NOTE: Corresponding bit = 0 in ebp indicates event present.</div><div class='add'>+	 */</div><div class='add'>+	ebx = cpuid_ebx(10);</div><div class='add'>+	if ((ebx &amp; ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nmi_perfctr_msr = MSR_ARCH_PERFMON_PERFCTR0;</div><div class='add'>+</div><div class='add'>+	clear_msr_range(MSR_ARCH_PERFMON_EVENTSEL0, 2);</div><div class='add'>+	clear_msr_range(MSR_ARCH_PERFMON_PERFCTR0, 2);</div><div class='add'>+</div><div class='add'>+	evntsel = ARCH_PERFMON_EVENTSEL_INT</div><div class='add'>+		| ARCH_PERFMON_EVENTSEL_OS</div><div class='add'>+		| ARCH_PERFMON_EVENTSEL_USR</div><div class='add'>+		| ARCH_PERFMON_NMI_EVENT_SEL</div><div class='add'>+		| ARCH_PERFMON_NMI_EVENT_UMASK;</div><div class='add'>+</div><div class='add'>+	wrmsr(MSR_ARCH_PERFMON_EVENTSEL0, evntsel, 0);</div><div class='add'>+	write_watchdog_counter("INTEL_ARCH_PERFCTR0");</div><div class='add'>+	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+	evntsel |= ARCH_PERFMON_EVENTSEL0_ENABLE;</div><div class='add'>+	wrmsr(MSR_ARCH_PERFMON_EVENTSEL0, evntsel, 0);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void setup_apic_nmi_watchdog (void)</div><div class='ctx'> {</div><div class='ctx'> 	switch (boot_cpu_data.x86_vendor) {</div><div class='hunk'>@@ -458,6 +510,11 @@ void setup_apic_nmi_watchdog (void)</div><div class='ctx'> 		setup_k7_watchdog();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='add'>+		if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {</div><div class='add'>+			if (!setup_intel_arch_watchdog())</div><div class='add'>+				return;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		switch (boot_cpu_data.x86) {</div><div class='ctx'> 		case 6:</div><div class='ctx'> 			if (boot_cpu_data.x86_model &gt; 0xd)</div><div class='hunk'>@@ -561,7 +618,8 @@ void nmi_watchdog_tick (struct pt_regs * regs)</div><div class='ctx'> 			wrmsr(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val, 0);</div><div class='ctx'> 			apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='ctx'> 		}</div><div class='del'>-		else if (nmi_perfctr_msr == MSR_P6_PERFCTR0) {</div><div class='add'>+		else if (nmi_perfctr_msr == MSR_P6_PERFCTR0 ||</div><div class='add'>+		         nmi_perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0) {</div><div class='ctx'> 			/* Only P6 based Pentium M need to re-unmask</div><div class='ctx'> 			 * the apic vector but it doesn't hurt</div><div class='ctx'> 			 * other P6 variant */</div><div class='head'>diff --git a/arch/i386/kernel/numaq.c b/arch/i386/kernel/numaq.c<br/>index 5f5b075f860a..9000d82c6dc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/numaq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/numaq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/numaq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/numaq.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * Send feedback to &lt;gone@us.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='hunk'>@@ -79,10 +78,12 @@ int __init get_memcfg_numaq(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init numaq_dsc_disable(void)</div><div class='add'>+static int __init numaq_tsc_disable(void)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_DEBUG "NUMAQ: disabling TSC\n");</div><div class='del'>-	tsc_disable = 1;</div><div class='add'>+	if (num_online_nodes() &gt; 1) {</div><div class='add'>+		printk(KERN_DEBUG "NUMAQ: disabling TSC\n");</div><div class='add'>+		tsc_disable = 1;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-core_initcall(numaq_dsc_disable);</div><div class='add'>+arch_initcall(numaq_tsc_disable);</div><div class='head'>diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c<br/>index 6259afea46d1..923bb292f47f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/process.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='hunk'>@@ -102,7 +101,7 @@ void default_idle(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	if (!hlt_counter &amp;&amp; boot_cpu_data.hlt_works_ok) {</div><div class='del'>-		clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status &amp;= ~TS_POLLING;</div><div class='ctx'> 		smp_mb__after_clear_bit();</div><div class='ctx'> 		while (!need_resched()) {</div><div class='ctx'> 			local_irq_disable();</div><div class='hunk'>@@ -111,7 +110,7 @@ void default_idle(void)</div><div class='ctx'> 			else</div><div class='ctx'> 				local_irq_enable();</div><div class='ctx'> 		}</div><div class='del'>-		set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		while (!need_resched())</div><div class='ctx'> 			cpu_relax();</div><div class='hunk'>@@ -174,7 +173,7 @@ void cpu_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+	current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> </div><div class='ctx'> 	/* endless idle loop with no priority at all */</div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -312,7 +311,7 @@ void show_regs(struct pt_regs * regs)</div><div class='ctx'> 	cr3 = read_cr3();</div><div class='ctx'> 	cr4 = read_cr4_safe();</div><div class='ctx'> 	printk("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", cr0, cr2, cr3, cr4);</div><div class='del'>-	show_trace(NULL, &amp;regs-&gt;esp);</div><div class='add'>+	show_trace(NULL, regs, &amp;regs-&gt;esp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -360,16 +359,16 @@ EXPORT_SYMBOL(kernel_thread);</div><div class='ctx'>  */</div><div class='ctx'> void exit_thread(void)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	struct thread_struct *t = &amp;tsk-&gt;thread;</div><div class='del'>-</div><div class='ctx'> 	/* The process may have allocated an io port bitmap... nuke it. */</div><div class='del'>-	if (unlikely(NULL != t-&gt;io_bitmap_ptr)) {</div><div class='add'>+	if (unlikely(test_thread_flag(TIF_IO_BITMAP))) {</div><div class='add'>+		struct task_struct *tsk = current;</div><div class='add'>+		struct thread_struct *t = &amp;tsk-&gt;thread;</div><div class='ctx'> 		int cpu = get_cpu();</div><div class='ctx'> 		struct tss_struct *tss = &amp;per_cpu(init_tss, cpu);</div><div class='ctx'> </div><div class='ctx'> 		kfree(t-&gt;io_bitmap_ptr);</div><div class='ctx'> 		t-&gt;io_bitmap_ptr = NULL;</div><div class='add'>+		clear_thread_flag(TIF_IO_BITMAP);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Careful, clear this in the TSS too:</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -388,6 +387,7 @@ void flush_thread(void)</div><div class='ctx'> </div><div class='ctx'> 	memset(tsk-&gt;thread.debugreg, 0, sizeof(unsigned long)*8);</div><div class='ctx'> 	memset(tsk-&gt;thread.tls_array, 0, sizeof(tsk-&gt;thread.tls_array));	</div><div class='add'>+	clear_tsk_thread_flag(tsk, TIF_DEBUG);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Forget coprocessor state..</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -432,7 +432,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,</div><div class='ctx'> 	savesegment(gs,p-&gt;thread.gs);</div><div class='ctx'> </div><div class='ctx'> 	tsk = current;</div><div class='del'>-	if (unlikely(NULL != tsk-&gt;thread.io_bitmap_ptr)) {</div><div class='add'>+	if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {</div><div class='ctx'> 		p-&gt;thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);</div><div class='ctx'> 		if (!p-&gt;thread.io_bitmap_ptr) {</div><div class='ctx'> 			p-&gt;thread.io_bitmap_max = 0;</div><div class='hunk'>@@ -440,6 +440,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(p-&gt;thread.io_bitmap_ptr, tsk-&gt;thread.io_bitmap_ptr,</div><div class='ctx'> 			IO_BITMAP_BYTES);</div><div class='add'>+		set_tsk_thread_flag(p, TIF_IO_BITMAP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -534,10 +535,24 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-handle_io_bitmap(struct thread_struct *next, struct tss_struct *tss)</div><div class='add'>+static noinline void __switch_to_xtra(struct task_struct *next_p,</div><div class='add'>+				    struct tss_struct *tss)</div><div class='ctx'> {</div><div class='del'>-	if (!next-&gt;io_bitmap_ptr) {</div><div class='add'>+	struct thread_struct *next;</div><div class='add'>+</div><div class='add'>+	next = &amp;next_p-&gt;thread;</div><div class='add'>+</div><div class='add'>+	if (test_tsk_thread_flag(next_p, TIF_DEBUG)) {</div><div class='add'>+		set_debugreg(next-&gt;debugreg[0], 0);</div><div class='add'>+		set_debugreg(next-&gt;debugreg[1], 1);</div><div class='add'>+		set_debugreg(next-&gt;debugreg[2], 2);</div><div class='add'>+		set_debugreg(next-&gt;debugreg[3], 3);</div><div class='add'>+		/* no 4 and 5 */</div><div class='add'>+		set_debugreg(next-&gt;debugreg[6], 6);</div><div class='add'>+		set_debugreg(next-&gt;debugreg[7], 7);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_tsk_thread_flag(next_p, TIF_IO_BITMAP)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Disable the bitmap via an invalid offset. We still cache</div><div class='ctx'> 		 * the previous bitmap owner and the IO bitmap contents:</div><div class='hunk'>@@ -545,6 +560,7 @@ handle_io_bitmap(struct thread_struct *next, struct tss_struct *tss)</div><div class='ctx'> 		tss-&gt;io_bitmap_base = INVALID_IO_BITMAP_OFFSET;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (likely(next == tss-&gt;io_bitmap_owner)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Previous owner of the bitmap (hence the bitmap content)</div><div class='hunk'>@@ -672,20 +688,11 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas</div><div class='ctx'> 		set_iopl_mask(next-&gt;iopl);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Now maybe reload the debug registers</div><div class='add'>+	 * Now maybe handle debug registers and/or IO bitmaps</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(next-&gt;debugreg[7])) {</div><div class='del'>-		set_debugreg(next-&gt;debugreg[0], 0);</div><div class='del'>-		set_debugreg(next-&gt;debugreg[1], 1);</div><div class='del'>-		set_debugreg(next-&gt;debugreg[2], 2);</div><div class='del'>-		set_debugreg(next-&gt;debugreg[3], 3);</div><div class='del'>-		/* no 4 and 5 */</div><div class='del'>-		set_debugreg(next-&gt;debugreg[6], 6);</div><div class='del'>-		set_debugreg(next-&gt;debugreg[7], 7);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlikely(prev-&gt;io_bitmap_ptr || next-&gt;io_bitmap_ptr))</div><div class='del'>-		handle_io_bitmap(next, tss);</div><div class='add'>+	if (unlikely((task_thread_info(next_p)-&gt;flags &amp; _TIF_WORK_CTXSW))</div><div class='add'>+	    || test_tsk_thread_flag(prev_p, TIF_IO_BITMAP))</div><div class='add'>+		__switch_to_xtra(next_p, tss);</div><div class='ctx'> </div><div class='ctx'> 	disable_tsc(prev_p, next_p);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c<br/>index fd7eaf7866e0..d3db03f4085d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/ptrace.c</a></div><div class='hunk'>@@ -468,8 +468,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 				  for(i=0; i&lt;4; i++)</div><div class='ctx'> 					  if ((0x5f54 &gt;&gt; ((data &gt;&gt; (16 + 4*i)) &amp; 0xf)) &amp; 1)</div><div class='ctx'> 						  goto out_tsk;</div><div class='add'>+				  if (data)</div><div class='add'>+					  set_tsk_thread_flag(child, TIF_DEBUG);</div><div class='add'>+				  else</div><div class='add'>+					  clear_tsk_thread_flag(child, TIF_DEBUG);</div><div class='ctx'> 			  }</div><div class='del'>-</div><div class='ctx'> 			  addr -= (long) &amp;dummy-&gt;u_debugreg;</div><div class='ctx'> 			  addr = addr &gt;&gt; 2;</div><div class='ctx'> 			  child-&gt;thread.debugreg[addr] = data;</div><div class='head'>diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c<br/>index 87ccdac84928..9f6ab1789bb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/quirks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/quirks.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * This file contains work-arounds for x86 and x86_64 platform bugs.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c<br/>index d207242976d3..54cfeabbc5e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/reboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/reboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/reboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/reboot.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  linux/arch/i386/kernel/reboot.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c<br/>index 321f5fd26e75..c7d3df23f589 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/scx200.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/scx200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/scx200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/scx200.c</a></div><div class='hunk'>@@ -4,11 +4,11 @@</div><div class='ctx'> </div><div class='ctx'>    National Semiconductor SCx200 support. */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/scx200.h&gt;</div><div class='hunk'>@@ -45,11 +45,19 @@ static struct pci_driver scx200_pci_driver = {</div><div class='ctx'> 	.probe = scx200_probe,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(scx200_gpio_config_lock);</div><div class='add'>+static DEFINE_MUTEX(scx200_gpio_config_lock);</div><div class='ctx'> </div><div class='del'>-static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+static void __devinit scx200_init_shadow(void)</div><div class='ctx'> {</div><div class='ctx'> 	int bank;</div><div class='add'>+</div><div class='add'>+	/* read the current values driven on the GPIO signals */</div><div class='add'>+	for (bank = 0; bank &lt; 2; ++bank)</div><div class='add'>+		scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='ctx'> 	unsigned base;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;device == PCI_DEVICE_ID_NS_SCx200_BRIDGE ||</div><div class='hunk'>@@ -63,10 +71,7 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		scx200_gpio_base = base;</div><div class='del'>-</div><div class='del'>-		/* read the current values driven on the GPIO signals */</div><div class='del'>-		for (bank = 0; bank &lt; 2; ++bank)</div><div class='del'>-			scx200_gpio_shadow[bank] = inl(scx200_gpio_base + 0x10 * bank);</div><div class='add'>+		scx200_init_shadow();</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* find the base of the Configuration Block */</div><div class='hunk'>@@ -87,12 +92,11 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 scx200_gpio_configure(int index, u32 mask, u32 bits)</div><div class='add'>+u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits)</div><div class='ctx'> {</div><div class='ctx'> 	u32 config, new_config;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;scx200_gpio_config_lock, flags);</div><div class='add'>+	mutex_lock(&amp;scx200_gpio_config_lock);</div><div class='ctx'> </div><div class='ctx'> 	outl(index, scx200_gpio_base + 0x20);</div><div class='ctx'> 	config = inl(scx200_gpio_base + 0x24);</div><div class='hunk'>@@ -100,45 +104,11 @@ u32 scx200_gpio_configure(int index, u32 mask, u32 bits)</div><div class='ctx'> 	new_config = (config &amp; mask) | bits;</div><div class='ctx'> 	outl(new_config, scx200_gpio_base + 0x24);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;scx200_gpio_config_lock, flags);</div><div class='add'>+	mutex_unlock(&amp;scx200_gpio_config_lock);</div><div class='ctx'> </div><div class='ctx'> 	return config;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-void scx200_gpio_dump(unsigned index)</div><div class='del'>-{</div><div class='del'>-	u32 config = scx200_gpio_configure(index, ~0, 0);</div><div class='del'>-	printk(KERN_DEBUG "GPIO%02u: 0x%08lx", index, (unsigned long)config);</div><div class='del'>-	</div><div class='del'>-	if (config &amp; 1) </div><div class='del'>-		printk(" OE"); /* output enabled */</div><div class='del'>-	else</div><div class='del'>-		printk(" TS"); /* tristate */</div><div class='del'>-	if (config &amp; 2) </div><div class='del'>-		printk(" PP"); /* push pull */</div><div class='del'>-	else</div><div class='del'>-		printk(" OD"); /* open drain */</div><div class='del'>-	if (config &amp; 4) </div><div class='del'>-		printk(" PUE"); /* pull up enabled */</div><div class='del'>-	else</div><div class='del'>-		printk(" PUD"); /* pull up disabled */</div><div class='del'>-	if (config &amp; 8) </div><div class='del'>-		printk(" LOCKED"); /* locked */</div><div class='del'>-	if (config &amp; 16) </div><div class='del'>-		printk(" LEVEL"); /* level input */</div><div class='del'>-	else</div><div class='del'>-		printk(" EDGE"); /* edge input */</div><div class='del'>-	if (config &amp; 32) </div><div class='del'>-		printk(" HI"); /* trigger on rising edge */</div><div class='del'>-	else</div><div class='del'>-		printk(" LO"); /* trigger on falling edge */</div><div class='del'>-	if (config &amp; 64) </div><div class='del'>-		printk(" DEBOUNCE"); /* debounce */</div><div class='del'>-	printk("\n");</div><div class='del'>-}</div><div class='del'>-#endif  /*  0  */</div><div class='del'>-</div><div class='ctx'> static int __init scx200_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");</div><div class='hunk'>@@ -159,10 +129,3 @@ EXPORT_SYMBOL(scx200_gpio_base);</div><div class='ctx'> EXPORT_SYMBOL(scx200_gpio_shadow);</div><div class='ctx'> EXPORT_SYMBOL(scx200_gpio_configure);</div><div class='ctx'> EXPORT_SYMBOL(scx200_cb_base);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    Local variables:</div><div class='del'>-        compile-command: "make -k -C ../../.. SUBDIRS=arch/i386/kernel modules"</div><div class='del'>-        c-basic-offset: 8</div><div class='del'>-    End:</div><div class='del'>-*/</div><div class='head'>diff --git a/arch/i386/kernel/semaphore.c b/arch/i386/kernel/semaphore.c<br/>index 967dc74df9ee..98352c374c76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/semaphore.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * rw semaphores implemented November 1999 by Benjamin LaHaise &lt;bcrl@kvack.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c<br/>index 846e1639ef7c..f1682206d304 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/setup.c</a></div><div class='hunk'>@@ -23,11 +23,10 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of initialization</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/apm_bios.h&gt;</div><div class='hunk'>@@ -60,7 +59,7 @@</div><div class='ctx'> #include &lt;asm/io_apic.h&gt;</div><div class='ctx'> #include &lt;asm/ist.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include "setup_arch_pre.h"</div><div class='add'>+#include &lt;setup_arch.h&gt;</div><div class='ctx'> #include &lt;bios_ebda.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Forward Declaration. */</div><div class='hunk'>@@ -410,8 +409,8 @@ static void __init limit_regions(unsigned long long size)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init add_memory_region(unsigned long long start,</div><div class='del'>-                                  unsigned long long size, int type)</div><div class='add'>+void __init add_memory_region(unsigned long long start,</div><div class='add'>+			      unsigned long long size, int type)</div><div class='ctx'> {</div><div class='ctx'> 	int x;</div><div class='ctx'> </div><div class='hunk'>@@ -474,7 +473,7 @@ static struct change_member *change_point[2*E820MAX] __initdata;</div><div class='ctx'> static struct e820entry *overlap_list[E820MAX] __initdata;</div><div class='ctx'> static struct e820entry new_bios[E820MAX] __initdata;</div><div class='ctx'> </div><div class='del'>-static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)</div><div class='add'>+int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)</div><div class='ctx'> {</div><div class='ctx'> 	struct change_member *change_tmp;</div><div class='ctx'> 	unsigned long current_type, last_type;</div><div class='hunk'>@@ -643,7 +642,7 @@ static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)</div><div class='ctx'>  * thinkpad 560x, for example, does not cooperate with the memory</div><div class='ctx'>  * detection code.)</div><div class='ctx'>  */</div><div class='del'>-static int __init copy_e820_map(struct e820entry * biosmap, int nr_map)</div><div class='add'>+int __init copy_e820_map(struct e820entry * biosmap, int nr_map)</div><div class='ctx'> {</div><div class='ctx'> 	/* Only one memory region (or negative)? Ignore it */</div><div class='ctx'> 	if (nr_map &lt; 2)</div><div class='hunk'>@@ -701,12 +700,6 @@ static inline void copy_edd(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Do NOT EVER look at the BIOS memory size location.</div><div class='del'>- * It does not work on many machines.</div><div class='del'>- */</div><div class='del'>-#define LOWMEMSIZE()	(0x9f000)</div><div class='del'>-</div><div class='ctx'> static void __init parse_cmdline_early (char ** cmdline_p)</div><div class='ctx'> {</div><div class='ctx'> 	char c = ' ', *to = command_line, *from = saved_command_line;</div><div class='hunk'>@@ -1320,8 +1313,10 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat</div><div class='ctx'> 	probe_roms();</div><div class='ctx'> 	for (i = 0; i &lt; e820.nr_map; i++) {</div><div class='ctx'> 		struct resource *res;</div><div class='add'>+#ifndef CONFIG_RESOURCES_64BIT</div><div class='ctx'> 		if (e820.map[i].addr + e820.map[i].size &gt; 0x100000000ULL)</div><div class='ctx'> 			continue;</div><div class='add'>+#endif</div><div class='ctx'> 		res = kzalloc(sizeof(struct resource), GFP_ATOMIC);</div><div class='ctx'> 		switch (e820.map[i].type) {</div><div class='ctx'> 		case E820_RAM:	res-&gt;name = "System RAM"; break;</div><div class='hunk'>@@ -1332,7 +1327,10 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat</div><div class='ctx'> 		res-&gt;start = e820.map[i].addr;</div><div class='ctx'> 		res-&gt;end = res-&gt;start + e820.map[i].size - 1;</div><div class='ctx'> 		res-&gt;flags = IORESOURCE_MEM | IORESOURCE_BUSY;</div><div class='del'>-		request_resource(&amp;iomem_resource, res);</div><div class='add'>+		if (request_resource(&amp;iomem_resource, res)) {</div><div class='add'>+			kfree(res);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		if (e820.map[i].type == E820_RAM) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 *  We don't know which RAM region contains kernel data,</div><div class='hunk'>@@ -1423,8 +1421,6 @@ static void __init register_memory(void)</div><div class='ctx'> 		pci_mem_start, gapstart, gapsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char * __init machine_specific_memory_setup(void);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MCA</div><div class='ctx'> static void set_mca_bus(int x)</div><div class='ctx'> {</div><div class='hunk'>@@ -1547,15 +1543,18 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	if (efi_enabled)</div><div class='ctx'> 		efi_map_memmap();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_IO_APIC</div><div class='del'>-	check_acpi_pci();	/* Checks more than just ACPI actually */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Parse the ACPI tables for possible boot-time SMP configuration.</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_boot_table_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_IO_APIC</div><div class='add'>+	check_acpi_pci();	/* Checks more than just ACPI actually */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='ctx'> 	acpi_boot_init();</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_X86_PC)</div><div class='hunk'>@@ -1580,6 +1579,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	conswitchp = &amp;dummy_con;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='add'>+	tsc_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init int add_pcspkr(void)</div><div class='hunk'>@@ -1599,7 +1599,6 @@ static __init int add_pcspkr(void)</div><div class='ctx'> }</div><div class='ctx'> device_initcall(add_pcspkr);</div><div class='ctx'> </div><div class='del'>-#include "setup_arch_post.h"</div><div class='ctx'> /*</div><div class='ctx'>  * Local Variables:</div><div class='ctx'>  * mode:c</div><div class='head'>diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c<br/>index 5c352c3a9e7f..43002cfb40c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/signal.c</a></div><div class='hunk'>@@ -351,7 +351,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,</div><div class='ctx'> 			goto give_sigsegv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	restorer = &amp;__kernel_sigreturn;</div><div class='add'>+	restorer = (void *)VDSO_SYM(&amp;__kernel_sigreturn);</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_RESTORER)</div><div class='ctx'> 		restorer = ka-&gt;sa.sa_restorer;</div><div class='ctx'> </div><div class='hunk'>@@ -447,7 +447,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 		goto give_sigsegv;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up to return from userspace.  */</div><div class='del'>-	restorer = &amp;__kernel_rt_sigreturn;</div><div class='add'>+	restorer = (void *)VDSO_SYM(&amp;__kernel_rt_sigreturn);</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_RESTORER)</div><div class='ctx'> 		restorer = ka-&gt;sa.sa_restorer;</div><div class='ctx'> 	err |= __put_user(restorer, &amp;frame-&gt;pretcode);</div><div class='head'>diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c<br/>index d134e9643a58..c10789d7a9d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/smp.c</a></div><div class='hunk'>@@ -114,7 +114,17 @@ DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) ____cacheline_aligned = { &amp;init_m</div><div class='ctx'> </div><div class='ctx'> static inline int __prepare_ICR (unsigned int shortcut, int vector)</div><div class='ctx'> {</div><div class='del'>-	return APIC_DM_FIXED | shortcut | vector | APIC_DEST_LOGICAL;</div><div class='add'>+	unsigned int icr = shortcut | APIC_DEST_LOGICAL;</div><div class='add'>+</div><div class='add'>+	switch (vector) {</div><div class='add'>+	default:</div><div class='add'>+		icr |= APIC_DM_FIXED | vector;</div><div class='add'>+		break;</div><div class='add'>+	case NMI_VECTOR:</div><div class='add'>+		icr |= APIC_DM_NMI;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return icr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int __prepare_ICR2 (unsigned int mask)</div><div class='head'>diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c<br/>index 825b2b4ca721..6f5fea05f1d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/smpboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/smpboot.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> *		Rusty Russell	:	Hacked into shape for new "hotplug" boot process. */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +51,7 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;mach_apic.h&gt;</div><div class='ctx'> #include &lt;mach_wakecpu.h&gt;</div><div class='hunk'>@@ -66,12 +66,6 @@ int smp_num_siblings = 1;</div><div class='ctx'> EXPORT_SYMBOL(smp_num_siblings);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Package ID of each logical CPU */</div><div class='del'>-int phys_proc_id[NR_CPUS] __read_mostly = {[0 ... NR_CPUS-1] = BAD_APICID};</div><div class='del'>-</div><div class='del'>-/* Core ID of each logical CPU */</div><div class='del'>-int cpu_core_id[NR_CPUS] __read_mostly = {[0 ... NR_CPUS-1] = BAD_APICID};</div><div class='del'>-</div><div class='ctx'> /* Last level cache ID of each logical CPU */</div><div class='ctx'> int cpu_llc_id[NR_CPUS] __cpuinitdata = {[0 ... NR_CPUS-1] = BAD_APICID};</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +251,7 @@ static void __init synchronize_tsc_bp (void)</div><div class='ctx'> 		 * all APs synchronize but they loop on '== num_cpus'</div><div class='ctx'> 		 */</div><div class='ctx'> 		while (atomic_read(&amp;tsc_count_start) != num_booting_cpus()-1)</div><div class='del'>-			mb();</div><div class='add'>+			cpu_relax();</div><div class='ctx'> 		atomic_set(&amp;tsc_count_stop, 0);</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -276,7 +270,7 @@ static void __init synchronize_tsc_bp (void)</div><div class='ctx'> 		 * Wait for all APs to leave the synchronization point:</div><div class='ctx'> 		 */</div><div class='ctx'> 		while (atomic_read(&amp;tsc_count_stop) != num_booting_cpus()-1)</div><div class='del'>-			mb();</div><div class='add'>+			cpu_relax();</div><div class='ctx'> 		atomic_set(&amp;tsc_count_start, 0);</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		atomic_inc(&amp;tsc_count_stop);</div><div class='hunk'>@@ -333,19 +327,21 @@ static void __init synchronize_tsc_ap (void)</div><div class='ctx'> 	 * this gets called, so we first wait for the BP to</div><div class='ctx'> 	 * finish SMP initialization:</div><div class='ctx'> 	 */</div><div class='del'>-	while (!atomic_read(&amp;tsc_start_flag)) mb();</div><div class='add'>+	while (!atomic_read(&amp;tsc_start_flag))</div><div class='add'>+		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_LOOPS; i++) {</div><div class='ctx'> 		atomic_inc(&amp;tsc_count_start);</div><div class='ctx'> 		while (atomic_read(&amp;tsc_count_start) != num_booting_cpus())</div><div class='del'>-			mb();</div><div class='add'>+			cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 		rdtscll(tsc_values[smp_processor_id()]);</div><div class='ctx'> 		if (i == NR_LOOPS-1)</div><div class='ctx'> 			write_tsc(0, 0);</div><div class='ctx'> </div><div class='ctx'> 		atomic_inc(&amp;tsc_count_stop);</div><div class='del'>-		while (atomic_read(&amp;tsc_count_stop) != num_booting_cpus()) mb();</div><div class='add'>+		while (atomic_read(&amp;tsc_count_stop) != num_booting_cpus())</div><div class='add'>+			cpu_relax();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #undef NR_LOOPS</div><div class='hunk'>@@ -451,10 +447,12 @@ cpumask_t cpu_coregroup_map(int cpu)</div><div class='ctx'> 	struct cpuinfo_x86 *c = cpu_data + cpu;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For perf, we return last level cache shared map.</div><div class='del'>-	 * TBD: when power saving sched policy is added, we will return</div><div class='del'>-	 *      cpu_core_map when power saving policy is enabled</div><div class='add'>+	 * And for power savings, we return cpu_core_map</div><div class='ctx'> 	 */</div><div class='del'>-	return c-&gt;llc_shared_map;</div><div class='add'>+	if (sched_mc_power_savings || sched_smt_power_savings)</div><div class='add'>+		return cpu_core_map[cpu];</div><div class='add'>+	else</div><div class='add'>+		return c-&gt;llc_shared_map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* representing cpus for which sibling maps can be computed */</div><div class='hunk'>@@ -470,8 +468,8 @@ set_cpu_sibling_map(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (smp_num_siblings &gt; 1) {</div><div class='ctx'> 		for_each_cpu_mask(i, cpu_sibling_setup_map) {</div><div class='del'>-			if (phys_proc_id[cpu] == phys_proc_id[i] &amp;&amp;</div><div class='del'>-			    cpu_core_id[cpu] == cpu_core_id[i]) {</div><div class='add'>+			if (c[cpu].phys_proc_id == c[i].phys_proc_id &amp;&amp;</div><div class='add'>+			    c[cpu].cpu_core_id == c[i].cpu_core_id) {</div><div class='ctx'> 				cpu_set(i, cpu_sibling_map[cpu]);</div><div class='ctx'> 				cpu_set(cpu, cpu_sibling_map[i]);</div><div class='ctx'> 				cpu_set(i, cpu_core_map[cpu]);</div><div class='hunk'>@@ -498,7 +496,7 @@ set_cpu_sibling_map(int cpu)</div><div class='ctx'> 			cpu_set(i, c[cpu].llc_shared_map);</div><div class='ctx'> 			cpu_set(cpu, c[i].llc_shared_map);</div><div class='ctx'> 		}</div><div class='del'>-		if (phys_proc_id[cpu] == phys_proc_id[i]) {</div><div class='add'>+		if (c[cpu].phys_proc_id == c[i].phys_proc_id) {</div><div class='ctx'> 			cpu_set(i, cpu_core_map[cpu]);</div><div class='ctx'> 			cpu_set(cpu, cpu_core_map[i]);</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1053,6 +1051,7 @@ static int __cpuinit __smp_prepare_cpu(int cpu)</div><div class='ctx'> 	struct warm_boot_cpu_info info;</div><div class='ctx'> 	struct work_struct task;</div><div class='ctx'> 	int	apicid, ret;</div><div class='add'>+	struct Xgt_desc_struct *cpu_gdt_descr = &amp;per_cpu(cpu_gdt_descr, cpu);</div><div class='ctx'> </div><div class='ctx'> 	apicid = x86_cpu_to_apicid[cpu];</div><div class='ctx'> 	if (apicid == BAD_APICID) {</div><div class='hunk'>@@ -1060,6 +1059,18 @@ static int __cpuinit __smp_prepare_cpu(int cpu)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * the CPU isn't initialized at boot time, allocate gdt table here.</div><div class='add'>+	 * cpu_init will initialize it</div><div class='add'>+	 */</div><div class='add'>+	if (!cpu_gdt_descr-&gt;address) {</div><div class='add'>+		cpu_gdt_descr-&gt;address = get_zeroed_page(GFP_KERNEL);</div><div class='add'>+		if (!cpu_gdt_descr-&gt;address)</div><div class='add'>+			printk(KERN_CRIT "CPU%d failed to allocate GDT\n", cpu);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	info.complete = &amp;done;</div><div class='ctx'> 	info.apicid = apicid;</div><div class='ctx'> 	info.cpu = cpu;</div><div class='hunk'>@@ -1337,8 +1348,8 @@ remove_siblinginfo(int cpu)</div><div class='ctx'> 		cpu_clear(cpu, cpu_sibling_map[sibling]);</div><div class='ctx'> 	cpus_clear(cpu_sibling_map[cpu]);</div><div class='ctx'> 	cpus_clear(cpu_core_map[cpu]);</div><div class='del'>-	phys_proc_id[cpu] = BAD_APICID;</div><div class='del'>-	cpu_core_id[cpu] = BAD_APICID;</div><div class='add'>+	c[cpu].phys_proc_id = 0;</div><div class='add'>+	c[cpu].cpu_core_id = 0;</div><div class='ctx'> 	cpu_clear(cpu, cpu_sibling_setup_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1433,7 +1444,7 @@ int __devinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 	/* Unleash the CPU! */</div><div class='ctx'> 	cpu_set(cpu, smp_commenced_mask);</div><div class='ctx'> 	while (!cpu_isset(cpu, cpu_online_map))</div><div class='del'>-		mb();</div><div class='add'>+		cpu_relax();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/kernel/srat.c b/arch/i386/kernel/srat.c<br/>index 52b3ed5d2cb5..b1809c9a0899 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/srat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/srat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/srat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/srat.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Send feedback to Pat Gaughen &lt;gone@us.ibm.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='hunk'>@@ -39,7 +38,6 @@</div><div class='ctx'> #define NODE_ARRAY_OFFSET(x)	((x) % 8)	/* 8 bits/char */</div><div class='ctx'> #define BMAP_SET(bmap, bit)	((bmap)[NODE_ARRAY_INDEX(bit)] |= 1 &lt;&lt; NODE_ARRAY_OFFSET(bit))</div><div class='ctx'> #define BMAP_TEST(bmap, bit)	((bmap)[NODE_ARRAY_INDEX(bit)] &amp; (1 &lt;&lt; NODE_ARRAY_OFFSET(bit)))</div><div class='del'>-#define MAX_PXM_DOMAINS		256	/* 1 byte and no promises about values */</div><div class='ctx'> /* bitmap length; _PXM is at most 255 */</div><div class='ctx'> #define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8) </div><div class='ctx'> static u8 pxm_bitmap[PXM_BITMAP_LEN];	/* bitmap of proximity domains */</div><div class='hunk'>@@ -213,19 +211,11 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c</div><div class='ctx'> 		node_end_pfn[nid] = memory_chunk-&gt;end_pfn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 pxm_to_nid_map[MAX_PXM_DOMAINS];/* _PXM to logical node ID map */</div><div class='del'>-</div><div class='del'>-int pxm_to_node(int pxm)</div><div class='del'>-{</div><div class='del'>-	return pxm_to_nid_map[pxm];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Parse the ACPI Static Resource Affinity Table */</div><div class='ctx'> static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *start, *end, *p;</div><div class='ctx'> 	int i, j, nid;</div><div class='del'>-	u8 nid_to_pxm_map[MAX_NUMNODES];/* logical node ID to _PXM map */</div><div class='ctx'> </div><div class='ctx'> 	start = (u8 *)(&amp;(sratp-&gt;reserved) + 1);	/* skip header */</div><div class='ctx'> 	p = start;</div><div class='hunk'>@@ -235,10 +225,6 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)</div><div class='ctx'> 	memset(node_memory_chunk, 0, sizeof(node_memory_chunk));</div><div class='ctx'> 	memset(zholes_size, 0, sizeof(zholes_size));</div><div class='ctx'> </div><div class='del'>-	/* -1 in these maps means not available */</div><div class='del'>-	memset(pxm_to_nid_map, -1, sizeof(pxm_to_nid_map));</div><div class='del'>-	memset(nid_to_pxm_map, -1, sizeof(nid_to_pxm_map));</div><div class='del'>-</div><div class='ctx'> 	num_memory_chunks = 0;</div><div class='ctx'> 	while (p &lt; end) {</div><div class='ctx'> 		switch (*p) {</div><div class='hunk'>@@ -278,9 +264,7 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)</div><div class='ctx'> 	nodes_clear(node_online_map);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_PXM_DOMAINS; i++) {</div><div class='ctx'> 		if (BMAP_TEST(pxm_bitmap, i)) {</div><div class='del'>-			nid = num_online_nodes();</div><div class='del'>-			pxm_to_nid_map[i] = nid;</div><div class='del'>-			nid_to_pxm_map[nid] = i;</div><div class='add'>+			int nid = acpi_map_pxm_to_node(i);</div><div class='ctx'> 			node_set_online(nid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -288,7 +272,7 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)</div><div class='ctx'> </div><div class='ctx'> 	/* set cnode id in memory chunk structure */</div><div class='ctx'> 	for (i = 0; i &lt; num_memory_chunks; i++)</div><div class='del'>-		node_memory_chunk[i].nid = pxm_to_nid_map[node_memory_chunk[i].pxm];</div><div class='add'>+		node_memory_chunk[i].nid = pxm_to_node(node_memory_chunk[i].pxm);</div><div class='ctx'> </div><div class='ctx'> 	printk("pxm bitmap: ");</div><div class='ctx'> 	for (i = 0; i &lt; sizeof(pxm_bitmap); i++) {</div><div class='head'>diff --git a/arch/i386/kernel/stacktrace.c b/arch/i386/kernel/stacktrace.c<br/>new file mode 100644<br/>index 000000000000..e62a037ab399<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/stacktrace.c</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/i386/kernel/stacktrace.c</div><div class='add'>+ *</div><div class='add'>+ * Stack trace management functions</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/stacktrace.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)</div><div class='add'>+{</div><div class='add'>+	return	p &gt; (void *)tinfo &amp;&amp;</div><div class='add'>+		p &lt; (void *)tinfo + THREAD_SIZE - 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save stack-backtrace addresses into a stack_trace buffer:</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+save_context_stack(struct stack_trace *trace, unsigned int skip,</div><div class='add'>+		   struct thread_info *tinfo, unsigned long *stack,</div><div class='add'>+		   unsigned long ebp)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	while (valid_stack_ptr(tinfo, (void *)ebp)) {</div><div class='add'>+		addr = *(unsigned long *)(ebp + 4);</div><div class='add'>+		if (!skip)</div><div class='add'>+			trace-&gt;entries[trace-&gt;nr_entries++] = addr;</div><div class='add'>+		else</div><div class='add'>+			skip--;</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+		/*</div><div class='add'>+		 * break out of recursive entries (such as</div><div class='add'>+		 * end_of_stack_stop_unwind_function):</div><div class='add'>+	 	 */</div><div class='add'>+		if (ebp == *(unsigned long *)ebp)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ebp = *(unsigned long *)ebp;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	while (valid_stack_ptr(tinfo, stack)) {</div><div class='add'>+		addr = *stack++;</div><div class='add'>+		if (__kernel_text_address(addr)) {</div><div class='add'>+			if (!skip)</div><div class='add'>+				trace-&gt;entries[trace-&gt;nr_entries++] = addr;</div><div class='add'>+			else</div><div class='add'>+				skip--;</div><div class='add'>+			if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ebp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save stack-backtrace addresses into a stack_trace buffer.</div><div class='add'>+ * If all_contexts is set, all contexts (hardirq, softirq and process)</div><div class='add'>+ * are saved. If not set then only the current context is saved.</div><div class='add'>+ */</div><div class='add'>+void save_stack_trace(struct stack_trace *trace,</div><div class='add'>+		      struct task_struct *task, int all_contexts,</div><div class='add'>+		      unsigned int skip)</div><div class='add'>+{</div><div class='add'>+	unsigned long ebp;</div><div class='add'>+	unsigned long *stack = &amp;ebp;</div><div class='add'>+</div><div class='add'>+	WARN_ON(trace-&gt;nr_entries || !trace-&gt;max_entries);</div><div class='add'>+</div><div class='add'>+	if (!task || task == current) {</div><div class='add'>+		/* Grab ebp right from our regs: */</div><div class='add'>+		asm ("movl %%ebp, %0" : "=r" (ebp));</div><div class='add'>+	} else {</div><div class='add'>+		/* ebp is the last reg pushed by switch_to(): */</div><div class='add'>+		ebp = *(unsigned long *) task-&gt;thread.esp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		struct thread_info *context = (struct thread_info *)</div><div class='add'>+				((unsigned long)stack &amp; (~(THREAD_SIZE - 1)));</div><div class='add'>+</div><div class='add'>+		ebp = save_context_stack(trace, skip, context, stack, ebp);</div><div class='add'>+		stack = (unsigned long *)context-&gt;previous_esp;</div><div class='add'>+		if (!all_contexts || !stack ||</div><div class='add'>+				trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S<br/>index af56987f69b0..dd63d4775398 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/syscall_table.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/syscall_table.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/syscall_table.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/syscall_table.S</a></div><div class='hunk'>@@ -316,3 +316,4 @@ ENTRY(sys_call_table)</div><div class='ctx'> 	.long sys_sync_file_range</div><div class='ctx'> 	.long sys_tee			/* 315 */</div><div class='ctx'> 	.long sys_vmsplice</div><div class='add'>+	.long sys_move_pages</div><div class='head'>diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c<br/>index 0bada1870bdf..713ba39d32c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/sysenter.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/sysenter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/sysenter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/sysenter.c</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'>  * linux/arch/i386/kernel/sysenter.c</div><div class='ctx'>  *</div><div class='ctx'>  * (C) Copyright 2002 Linus Torvalds</div><div class='add'>+ * Portions based on the vdso-randomization code from exec-shield:</div><div class='add'>+ * Copyright(C) 2005-2006, Red Hat, Inc., Ingo Molnar</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains the needed initializations to support sysenter.</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,12 +15,31 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpufeature.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Should the kernel map a VDSO page into processes and pass its</div><div class='add'>+ * address down to glibc upon exec()?</div><div class='add'>+ */</div><div class='add'>+unsigned int __read_mostly vdso_enabled = 1;</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(vdso_enabled);</div><div class='add'>+</div><div class='add'>+static int __init vdso_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	vdso_enabled = simple_strtoul(s, NULL, 0);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("vdso=", vdso_setup);</div><div class='add'>+</div><div class='ctx'> extern asmlinkage void sysenter_entry(void);</div><div class='ctx'> </div><div class='ctx'> void enable_sep_cpu(void)</div><div class='hunk'>@@ -45,23 +66,120 @@ void enable_sep_cpu(void)</div><div class='ctx'>  */</div><div class='ctx'> extern const char vsyscall_int80_start, vsyscall_int80_end;</div><div class='ctx'> extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;</div><div class='add'>+static void *syscall_page;</div><div class='ctx'> </div><div class='ctx'> int __init sysenter_setup(void)</div><div class='ctx'> {</div><div class='del'>-	void *page = (void *)get_zeroed_page(GFP_ATOMIC);</div><div class='add'>+	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);</div><div class='ctx'> </div><div class='del'>-	__set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC);</div><div class='add'>+#ifdef CONFIG_COMPAT_VDSO</div><div class='add'>+	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_READONLY);</div><div class='add'>+	printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));</div><div class='add'>+#else</div><div class='add'>+	/*</div><div class='add'>+	 * In the non-compat case the ELF coredumping code needs the fixmap:</div><div class='add'>+	 */</div><div class='add'>+	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_KERNEL_RO);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!boot_cpu_has(X86_FEATURE_SEP)) {</div><div class='del'>-		memcpy(page,</div><div class='add'>+		memcpy(syscall_page,</div><div class='ctx'> 		       &amp;vsyscall_int80_start,</div><div class='ctx'> 		       &amp;vsyscall_int80_end - &amp;vsyscall_int80_start);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(page,</div><div class='add'>+	memcpy(syscall_page,</div><div class='ctx'> 	       &amp;vsyscall_sysenter_start,</div><div class='ctx'> 	       &amp;vsyscall_sysenter_end - &amp;vsyscall_sysenter_start);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static struct page *syscall_nopage(struct vm_area_struct *vma,</div><div class='add'>+				unsigned long adr, int *type)</div><div class='add'>+{</div><div class='add'>+	struct page *p = virt_to_page(adr - vma-&gt;vm_start + syscall_page);</div><div class='add'>+	get_page(p);</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Prevent VMA merging */</div><div class='add'>+static void syscall_vma_close(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct syscall_vm_ops = {</div><div class='add'>+	.close = syscall_vma_close,</div><div class='add'>+	.nopage = syscall_nopage,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Defined in vsyscall-sysenter.S */</div><div class='add'>+extern void SYSENTER_RETURN;</div><div class='add'>+</div><div class='add'>+/* Setup a VMA at program startup for the vsyscall page */</div><div class='add'>+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);</div><div class='add'>+	if (IS_ERR_VALUE(addr)) {</div><div class='add'>+		ret = addr;</div><div class='add'>+		goto up_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);</div><div class='add'>+	if (!vma) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto up_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_start = addr;</div><div class='add'>+	vma-&gt;vm_end = addr + PAGE_SIZE;</div><div class='add'>+	/* MAYWRITE to allow gdb to COW and set breakpoints */</div><div class='add'>+	vma-&gt;vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;</div><div class='add'>+	vma-&gt;vm_flags |= mm-&gt;def_flags;</div><div class='add'>+	vma-&gt;vm_page_prot = protection_map[vma-&gt;vm_flags &amp; 7];</div><div class='add'>+	vma-&gt;vm_ops = &amp;syscall_vm_ops;</div><div class='add'>+	vma-&gt;vm_mm = mm;</div><div class='add'>+</div><div class='add'>+	ret = insert_vm_struct(mm, vma);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		kmem_cache_free(vm_area_cachep, vma);</div><div class='add'>+		goto up_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	current-&gt;mm-&gt;context.vdso = (void *)addr;</div><div class='add'>+	current_thread_info()-&gt;sysenter_return =</div><div class='add'>+				    (void *)VDSO_SYM(&amp;SYSENTER_RETURN);</div><div class='add'>+	mm-&gt;total_vm++;</div><div class='add'>+up_fail:</div><div class='add'>+	up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *arch_vma_name(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	if (vma-&gt;vm_mm &amp;&amp; vma-&gt;vm_start == (long)vma-&gt;vm_mm-&gt;context.vdso)</div><div class='add'>+		return "[vdso]";</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int in_gate_area(struct task_struct *task, unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int in_gate_area_no_task(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c<br/>index 9d3074759856..8705c0f05788 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/time.c</a></div><div class='hunk'>@@ -60,7 +60,6 @@</div><div class='ctx'> #include "mach_time.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hpet.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -82,13 +81,6 @@ extern unsigned long wall_jiffies;</div><div class='ctx'> DEFINE_SPINLOCK(rtc_lock);</div><div class='ctx'> EXPORT_SYMBOL(rtc_lock);</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/i8253.h&gt;</div><div class='del'>-</div><div class='del'>-DEFINE_SPINLOCK(i8253_lock);</div><div class='del'>-EXPORT_SYMBOL(i8253_lock);</div><div class='del'>-</div><div class='del'>-struct timer_opts *cur_timer __read_mostly = &amp;timer_none;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This is a special lock that is owned by the CPU and holds the index</div><div class='ctx'>  * register we are working with.  It is required for NMI access to the</div><div class='hunk'>@@ -118,99 +110,19 @@ void rtc_cmos_write(unsigned char val, unsigned char addr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(rtc_cmos_write);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This version of gettimeofday has microsecond resolution</div><div class='del'>- * and better than microsecond precision on fast x86 machines with TSC.</div><div class='del'>- */</div><div class='del'>-void do_gettimeofday(struct timeval *tv)</div><div class='del'>-{</div><div class='del'>-	unsigned long seq;</div><div class='del'>-	unsigned long usec, sec;</div><div class='del'>-	unsigned long max_ntp_tick;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		unsigned long lost;</div><div class='del'>-</div><div class='del'>-		seq = read_seqbegin(&amp;xtime_lock);</div><div class='del'>-</div><div class='del'>-		usec = cur_timer-&gt;get_offset();</div><div class='del'>-		lost = jiffies - wall_jiffies;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If time_adjust is negative then NTP is slowing the clock</div><div class='del'>-		 * so make sure not to go into next possible interval.</div><div class='del'>-		 * Better to lose some accuracy than have time go backwards..</div><div class='del'>-		 */</div><div class='del'>-		if (unlikely(time_adjust &lt; 0)) {</div><div class='del'>-			max_ntp_tick = (USEC_PER_SEC / HZ) - tickadj;</div><div class='del'>-			usec = min(usec, max_ntp_tick);</div><div class='del'>-</div><div class='del'>-			if (lost)</div><div class='del'>-				usec += lost * max_ntp_tick;</div><div class='del'>-		}</div><div class='del'>-		else if (unlikely(lost))</div><div class='del'>-			usec += lost * (USEC_PER_SEC / HZ);</div><div class='del'>-</div><div class='del'>-		sec = xtime.tv_sec;</div><div class='del'>-		usec += (xtime.tv_nsec / 1000);</div><div class='del'>-	} while (read_seqretry(&amp;xtime_lock, seq));</div><div class='del'>-</div><div class='del'>-	while (usec &gt;= 1000000) {</div><div class='del'>-		usec -= 1000000;</div><div class='del'>-		sec++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tv-&gt;tv_sec = sec;</div><div class='del'>-	tv-&gt;tv_usec = usec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(do_gettimeofday);</div><div class='del'>-</div><div class='del'>-int do_settimeofday(struct timespec *tv)</div><div class='del'>-{</div><div class='del'>-	time_t wtm_sec, sec = tv-&gt;tv_sec;</div><div class='del'>-	long wtm_nsec, nsec = tv-&gt;tv_nsec;</div><div class='del'>-</div><div class='del'>-	if ((unsigned long)tv-&gt;tv_nsec &gt;= NSEC_PER_SEC)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	write_seqlock_irq(&amp;xtime_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * This is revolting. We need to set "xtime" correctly. However, the</div><div class='del'>-	 * value in this location is the value at the most recent update of</div><div class='del'>-	 * wall time.  Discover what correction gettimeofday() would have</div><div class='del'>-	 * made, and then undo it!</div><div class='del'>-	 */</div><div class='del'>-	nsec -= cur_timer-&gt;get_offset() * NSEC_PER_USEC;</div><div class='del'>-	nsec -= (jiffies - wall_jiffies) * TICK_NSEC;</div><div class='del'>-</div><div class='del'>-	wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);</div><div class='del'>-	wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);</div><div class='del'>-</div><div class='del'>-	set_normalized_timespec(&amp;xtime, sec, nsec);</div><div class='del'>-	set_normalized_timespec(&amp;wall_to_monotonic, wtm_sec, wtm_nsec);</div><div class='del'>-</div><div class='del'>-	ntp_clear();</div><div class='del'>-	write_sequnlock_irq(&amp;xtime_lock);</div><div class='del'>-	clock_was_set();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(do_settimeofday);</div><div class='del'>-</div><div class='ctx'> static int set_rtc_mmss(unsigned long nowtime)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='del'>-</div><div class='del'>-	WARN_ON(irqs_disabled());</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* gets recalled with irq locally disabled */</div><div class='del'>-	spin_lock_irq(&amp;rtc_lock);</div><div class='add'>+	/* XXX - does irqsave resolve this? -johnstul */</div><div class='add'>+	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='ctx'> 	if (efi_enabled)</div><div class='ctx'> 		retval = efi_set_rtc_mmss(nowtime);</div><div class='ctx'> 	else</div><div class='ctx'> 		retval = mach_set_rtc_mmss(nowtime);</div><div class='del'>-	spin_unlock_irq(&amp;rtc_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,16 +130,6 @@ static int set_rtc_mmss(unsigned long nowtime)</div><div class='ctx'> </div><div class='ctx'> int timer_ack;</div><div class='ctx'> </div><div class='del'>-/* monotonic_clock(): returns # of nanoseconds passed since time_init()</div><div class='del'>- *		Note: This function is required to return accurate</div><div class='del'>- *		time even in the absence of multiple timer ticks.</div><div class='del'>- */</div><div class='del'>-unsigned long long monotonic_clock(void)</div><div class='del'>-{</div><div class='del'>-	return cur_timer-&gt;monotonic_clock();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(monotonic_clock);</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_SMP) &amp;&amp; defined(CONFIG_FRAME_POINTER)</div><div class='ctx'> unsigned long profile_pc(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -242,11 +144,21 @@ EXPORT_SYMBOL(profile_pc);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * timer_interrupt() needs to keep up the real-time clock,</div><div class='del'>- * as well as call the "do_timer()" routine every clocktick</div><div class='add'>+ * This is the same as the above, except we _also_ save the current</div><div class='add'>+ * Time Stamp Counter value at the time of the timer interrupt, so that</div><div class='add'>+ * we later on can estimate the time of day more exactly.</div><div class='ctx'>  */</div><div class='del'>-static inline void do_timer_interrupt(int irq, struct pt_regs *regs)</div><div class='add'>+irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	/*</div><div class='add'>+	 * Here we are in the timer irq handler. We just have irqs locally</div><div class='add'>+	 * disabled but we don't know if the timer_bh is running on the other</div><div class='add'>+	 * CPU. We need to avoid to SMP race with it. NOTE: we don' t need</div><div class='add'>+	 * the irq version of write_lock because as just said we have irq</div><div class='add'>+	 * locally disabled. -arca</div><div class='add'>+	 */</div><div class='add'>+	write_seqlock(&amp;xtime_lock);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> 	if (timer_ack) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -279,27 +191,6 @@ static inline void do_timer_interrupt(int irq, struct pt_regs *regs)</div><div class='ctx'> 		irq = inb_p( 0x61 );	/* read the current state */</div><div class='ctx'> 		outb_p( irq|0x80, 0x61 );	/* reset the IRQ */</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the same as the above, except we _also_ save the current</div><div class='del'>- * Time Stamp Counter value at the time of the timer interrupt, so that</div><div class='del'>- * we later on can estimate the time of day more exactly.</div><div class='del'>- */</div><div class='del'>-irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Here we are in the timer irq handler. We just have irqs locally</div><div class='del'>-	 * disabled but we don't know if the timer_bh is running on the other</div><div class='del'>-	 * CPU. We need to avoid to SMP race with it. NOTE: we don' t need</div><div class='del'>-	 * the irq version of write_lock because as just said we have irq</div><div class='del'>-	 * locally disabled. -arca</div><div class='del'>-	 */</div><div class='del'>-	write_seqlock(&amp;xtime_lock);</div><div class='del'>-</div><div class='del'>-	cur_timer-&gt;mark_offset();</div><div class='del'>- </div><div class='del'>-	do_timer_interrupt(irq, regs);</div><div class='ctx'> </div><div class='ctx'> 	write_sequnlock(&amp;xtime_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -315,15 +206,16 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> unsigned long get_cmos_time(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long retval;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;rtc_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (efi_enabled)</div><div class='ctx'> 		retval = efi_get_time();</div><div class='ctx'> 	else</div><div class='ctx'> 		retval = mach_get_cmos_time();</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;rtc_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -380,7 +272,6 @@ void notify_arch_cmos_timer(void)</div><div class='ctx'> </div><div class='ctx'> static long clock_cmos_diff, sleep_start;</div><div class='ctx'> </div><div class='del'>-static struct timer_opts *last_timer;</div><div class='ctx'> static int timer_suspend(struct sys_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -389,10 +280,6 @@ static int timer_suspend(struct sys_device *dev, pm_message_t state)</div><div class='ctx'> 	clock_cmos_diff = -get_cmos_time();</div><div class='ctx'> 	clock_cmos_diff += get_seconds();</div><div class='ctx'> 	sleep_start = get_cmos_time();</div><div class='del'>-	last_timer = cur_timer;</div><div class='del'>-	cur_timer = &amp;timer_none;</div><div class='del'>-	if (last_timer-&gt;suspend)</div><div class='del'>-		last_timer-&gt;suspend(state);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -415,10 +302,6 @@ static int timer_resume(struct sys_device *dev)</div><div class='ctx'> 	jiffies_64 += sleep_length;</div><div class='ctx'> 	wall_jiffies += sleep_length;</div><div class='ctx'> 	write_sequnlock_irqrestore(&amp;xtime_lock, flags);</div><div class='del'>-	if (last_timer-&gt;resume)</div><div class='del'>-		last_timer-&gt;resume();</div><div class='del'>-	cur_timer = last_timer;</div><div class='del'>-	last_timer = NULL;</div><div class='ctx'> 	touch_softlockup_watchdog();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -460,9 +343,6 @@ static void __init hpet_time_init(void)</div><div class='ctx'> 		printk("Using HPET for base-timer\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cur_timer = select_timer();</div><div class='del'>-	printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	time_init_hook();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -484,8 +364,5 @@ void __init time_init(void)</div><div class='ctx'> 	set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='ctx'> 		-xtime.tv_sec, -xtime.tv_nsec);</div><div class='ctx'> </div><div class='del'>-	cur_timer = select_timer();</div><div class='del'>-	printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	time_init_hook();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c<br/>index a529f0cdce17..14a1376fedd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/time_hpet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/time_hpet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/time_hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/time_hpet.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hpet.h&gt;</div><div class='ctx'> #include &lt;linux/hpet.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/timers/Makefile b/arch/i386/kernel/timers/Makefile<br/>deleted file mode 100644<br/>index 8fa12be658dd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for x86 timers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := timer.o timer_none.o timer_tsc.o timer_pit.o common.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_X86_CYCLONE_TIMER)	+= timer_cyclone.o</div><div class='del'>-obj-$(CONFIG_HPET_TIMER)	+= timer_hpet.o</div><div class='del'>-obj-$(CONFIG_X86_PM_TIMER)	+= timer_pm.o</div><div class='head'>diff --git a/arch/i386/kernel/timers/common.c b/arch/i386/kernel/timers/common.c<br/>deleted file mode 100644<br/>index 8163fe0cf1f0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/common.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,172 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	Common functions used across the timers go here</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/hpet.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mach_timer.h"</div><div class='del'>-</div><div class='del'>-/* ------ Calibrate the TSC -------</div><div class='del'>- * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset().</div><div class='del'>- * Too much 64-bit arithmetic here to do this cleanly in C, and for</div><div class='del'>- * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2)</div><div class='del'>- * output busy loop as low as possible. We avoid reading the CTC registers</div><div class='del'>- * directly because of the awkward 8-bit access mechanism of the 82C54</div><div class='del'>- * device.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define CALIBRATE_TIME	(5 * 1000020/HZ)</div><div class='del'>-</div><div class='del'>-unsigned long calibrate_tsc(void)</div><div class='del'>-{</div><div class='del'>-	mach_prepare_counter();</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		unsigned long startlow, starthigh;</div><div class='del'>-		unsigned long endlow, endhigh;</div><div class='del'>-		unsigned long count;</div><div class='del'>-</div><div class='del'>-		rdtsc(startlow,starthigh);</div><div class='del'>-		mach_countup(&amp;count);</div><div class='del'>-		rdtsc(endlow,endhigh);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Error: ECTCNEVERSET */</div><div class='del'>-		if (count &lt;= 1)</div><div class='del'>-			goto bad_ctc;</div><div class='del'>-</div><div class='del'>-		/* 64-bit subtract - gcc just messes up with long longs */</div><div class='del'>-		__asm__("subl %2,%0\n\t"</div><div class='del'>-			"sbbl %3,%1"</div><div class='del'>-			:"=a" (endlow), "=d" (endhigh)</div><div class='del'>-			:"g" (startlow), "g" (starthigh),</div><div class='del'>-			 "0" (endlow), "1" (endhigh));</div><div class='del'>-</div><div class='del'>-		/* Error: ECPUTOOFAST */</div><div class='del'>-		if (endhigh)</div><div class='del'>-			goto bad_ctc;</div><div class='del'>-</div><div class='del'>-		/* Error: ECPUTOOSLOW */</div><div class='del'>-		if (endlow &lt;= CALIBRATE_TIME)</div><div class='del'>-			goto bad_ctc;</div><div class='del'>-</div><div class='del'>-		__asm__("divl %2"</div><div class='del'>-			:"=a" (endlow), "=d" (endhigh)</div><div class='del'>-			:"r" (endlow), "0" (0), "1" (CALIBRATE_TIME));</div><div class='del'>-</div><div class='del'>-		return endlow;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The CTC wasn't reliable: we got a hit on the very first read,</div><div class='del'>-	 * or the CPU was so fast/slow that the quotient wouldn't fit in</div><div class='del'>-	 * 32 bits..</div><div class='del'>-	 */</div><div class='del'>-bad_ctc:</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-/* ------ Calibrate the TSC using HPET -------</div><div class='del'>- * Return 2^32 * (1 / (TSC clocks per usec)) for getting the CPU freq.</div><div class='del'>- * Second output is parameter 1 (when non NULL)</div><div class='del'>- * Set 2^32 * (1 / (tsc per HPET clk)) for delay_hpet().</div><div class='del'>- * calibrate_tsc() calibrates the processor TSC by comparing</div><div class='del'>- * it to the HPET timer of known frequency.</div><div class='del'>- * Too much 64-bit arithmetic here to do this cleanly in C</div><div class='del'>- */</div><div class='del'>-#define CALIBRATE_CNT_HPET 	(5 * hpet_tick)</div><div class='del'>-#define CALIBRATE_TIME_HPET 	(5 * KERNEL_TICK_USEC)</div><div class='del'>-</div><div class='del'>-unsigned long __devinit calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr)</div><div class='del'>-{</div><div class='del'>-	unsigned long tsc_startlow, tsc_starthigh;</div><div class='del'>-	unsigned long tsc_endlow, tsc_endhigh;</div><div class='del'>-	unsigned long hpet_start, hpet_end;</div><div class='del'>-	unsigned long result, remain;</div><div class='del'>-</div><div class='del'>-	hpet_start = hpet_readl(HPET_COUNTER);</div><div class='del'>-	rdtsc(tsc_startlow, tsc_starthigh);</div><div class='del'>-	do {</div><div class='del'>-		hpet_end = hpet_readl(HPET_COUNTER);</div><div class='del'>-	} while ((hpet_end - hpet_start) &lt; CALIBRATE_CNT_HPET);</div><div class='del'>-	rdtsc(tsc_endlow, tsc_endhigh);</div><div class='del'>-</div><div class='del'>-	/* 64-bit subtract - gcc just messes up with long longs */</div><div class='del'>-	__asm__("subl %2,%0\n\t"</div><div class='del'>-		"sbbl %3,%1"</div><div class='del'>-		:"=a" (tsc_endlow), "=d" (tsc_endhigh)</div><div class='del'>-		:"g" (tsc_startlow), "g" (tsc_starthigh),</div><div class='del'>-		 "0" (tsc_endlow), "1" (tsc_endhigh));</div><div class='del'>-</div><div class='del'>-	/* Error: ECPUTOOFAST */</div><div class='del'>-	if (tsc_endhigh)</div><div class='del'>-		goto bad_calibration;</div><div class='del'>-</div><div class='del'>-	/* Error: ECPUTOOSLOW */</div><div class='del'>-	if (tsc_endlow &lt;= CALIBRATE_TIME_HPET)</div><div class='del'>-		goto bad_calibration;</div><div class='del'>-</div><div class='del'>-	ASM_DIV64_REG(result, remain, tsc_endlow, 0, CALIBRATE_TIME_HPET);</div><div class='del'>-	if (remain &gt; (tsc_endlow &gt;&gt; 1))</div><div class='del'>-		result++; /* rounding the result */</div><div class='del'>-</div><div class='del'>-	if (tsc_hpet_quotient_ptr) {</div><div class='del'>-		unsigned long tsc_hpet_quotient;</div><div class='del'>-</div><div class='del'>-		ASM_DIV64_REG(tsc_hpet_quotient, remain, tsc_endlow, 0,</div><div class='del'>-			CALIBRATE_CNT_HPET);</div><div class='del'>-		if (remain &gt; (tsc_endlow &gt;&gt; 1))</div><div class='del'>-			tsc_hpet_quotient++; /* rounding the result */</div><div class='del'>-		*tsc_hpet_quotient_ptr = tsc_hpet_quotient;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-bad_calibration:</div><div class='del'>-	/*</div><div class='del'>-	 * the CPU was so fast/slow that the quotient wouldn't fit in</div><div class='del'>-	 * 32 bits..</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-unsigned long read_timer_tsc(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long retval;</div><div class='del'>-	rdtscl(retval);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* calculate cpu_khz */</div><div class='del'>-void init_cpu_khz(void)</div><div class='del'>-{</div><div class='del'>-	if (cpu_has_tsc) {</div><div class='del'>-		unsigned long tsc_quotient = calibrate_tsc();</div><div class='del'>-		if (tsc_quotient) {</div><div class='del'>-			/* report CPU clock rate in Hz.</div><div class='del'>-			 * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) =</div><div class='del'>-			 * clock/second. Our precision is about 100 ppm.</div><div class='del'>-			 */</div><div class='del'>-			{	unsigned long eax=0, edx=1000;</div><div class='del'>-				__asm__("divl %2"</div><div class='del'>-		       		:"=a" (cpu_khz), "=d" (edx)</div><div class='del'>-        	       		:"r" (tsc_quotient),</div><div class='del'>-	                	"0" (eax), "1" (edx));</div><div class='del'>-				printk("Detected %u.%03u MHz processor.\n",</div><div class='del'>-					cpu_khz / 1000, cpu_khz % 1000);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer.c b/arch/i386/kernel/timers/timer.c<br/>deleted file mode 100644<br/>index 7e39ed8e33f8..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-/*</div><div class='del'>- * HPET memory read is slower than tsc reads, but is more dependable as it</div><div class='del'>- * always runs at constant frequency and reduces complexity due to</div><div class='del'>- * cpufreq. So, we prefer HPET timer to tsc based one. Also, we cannot use</div><div class='del'>- * timer_pit when HPET is active. So, we default to timer_tsc.</div><div class='del'>- */</div><div class='del'>-#endif</div><div class='del'>-/* list of timers, ordered by preference, NULL terminated */</div><div class='del'>-static struct init_timer_opts* __initdata timers[] = {</div><div class='del'>-#ifdef CONFIG_X86_CYCLONE_TIMER</div><div class='del'>-	&amp;timer_cyclone_init,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-	&amp;timer_hpet_init,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_X86_PM_TIMER</div><div class='del'>-	&amp;timer_pmtmr_init,</div><div class='del'>-#endif</div><div class='del'>-	&amp;timer_tsc_init,</div><div class='del'>-	&amp;timer_pit_init,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char clock_override[10] __initdata;</div><div class='del'>-</div><div class='del'>-static int __init clock_setup(char* str)</div><div class='del'>-{</div><div class='del'>-	if (str)</div><div class='del'>-		strlcpy(clock_override, str, sizeof(clock_override));</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("clock=", clock_setup);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The chosen timesource has been found to be bad.</div><div class='del'>- * Fall back to a known good timesource (the PIT)</div><div class='del'>- */</div><div class='del'>-void clock_fallback(void)</div><div class='del'>-{</div><div class='del'>-	cur_timer = &amp;timer_pit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* iterates through the list of timers, returning the first </div><div class='del'>- * one that initializes successfully.</div><div class='del'>- */</div><div class='del'>-struct timer_opts* __init select_timer(void)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-	</div><div class='del'>-	/* find most preferred working timer */</div><div class='del'>-	while (timers[i]) {</div><div class='del'>-		if (timers[i]-&gt;init)</div><div class='del'>-			if (timers[i]-&gt;init(clock_override) == 0)</div><div class='del'>-				return timers[i]-&gt;opts;</div><div class='del'>-		++i;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	panic("select_timer: Cannot find a suitable timer\n");</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int read_current_timer(unsigned long *timer_val)</div><div class='del'>-{</div><div class='del'>-	if (cur_timer-&gt;read_timer) {</div><div class='del'>-		*timer_val = cur_timer-&gt;read_timer();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c<br/>deleted file mode 100644<br/>index 13892a65c941..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer_cyclone.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_cyclone.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,259 +0,0 @@</div><div class='del'>-/*	Cyclone-timer: </div><div class='del'>- *		This code implements timer_ops for the cyclone counter found</div><div class='del'>- *		on IBM x440, x360, and other Summit based systems.</div><div class='del'>- *</div><div class='del'>- *	Copyright (C) 2002 IBM, John Stultz (johnstul@us.ibm.com)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/fixmap.h&gt;</div><div class='del'>-#include &lt;asm/i8253.h&gt;</div><div class='del'>-</div><div class='del'>-#include "io_ports.h"</div><div class='del'>-</div><div class='del'>-/* Number of usecs that the last interrupt was delayed */</div><div class='del'>-static int delay_at_last_interrupt;</div><div class='del'>-</div><div class='del'>-#define CYCLONE_CBAR_ADDR 0xFEB00CD0</div><div class='del'>-#define CYCLONE_PMCC_OFFSET 0x51A0</div><div class='del'>-#define CYCLONE_MPMC_OFFSET 0x51D0</div><div class='del'>-#define CYCLONE_MPCS_OFFSET 0x51A8</div><div class='del'>-#define CYCLONE_TIMER_FREQ 100000000</div><div class='del'>-#define CYCLONE_TIMER_MASK (((u64)1&lt;&lt;40)-1) /* 40 bit mask */</div><div class='del'>-int use_cyclone = 0;</div><div class='del'>-</div><div class='del'>-static u32* volatile cyclone_timer;	/* Cyclone MPMC0 register */</div><div class='del'>-static u32 last_cyclone_low;</div><div class='del'>-static u32 last_cyclone_high;</div><div class='del'>-static unsigned long long monotonic_base;</div><div class='del'>-static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED;</div><div class='del'>-</div><div class='del'>-/* helper macro to atomically read both cyclone counter registers */</div><div class='del'>-#define read_cyclone_counter(low,high) \</div><div class='del'>-	do{ \</div><div class='del'>-		high = cyclone_timer[1]; low = cyclone_timer[0]; \</div><div class='del'>-	} while (high != cyclone_timer[1]);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void mark_offset_cyclone(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long lost, delay;</div><div class='del'>-	unsigned long delta = last_cyclone_low;</div><div class='del'>-	int count;</div><div class='del'>-	unsigned long long this_offset, last_offset;</div><div class='del'>-</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	last_offset = ((unsigned long long)last_cyclone_high&lt;&lt;32)|last_cyclone_low;</div><div class='del'>-	</div><div class='del'>-	spin_lock(&amp;i8253_lock);</div><div class='del'>-	read_cyclone_counter(last_cyclone_low,last_cyclone_high);</div><div class='del'>-</div><div class='del'>-	/* read values for delay_at_last_interrupt */</div><div class='del'>-	outb_p(0x00, 0x43);     /* latch the count ASAP */</div><div class='del'>-</div><div class='del'>-	count = inb_p(0x40);    /* read the latched count */</div><div class='del'>-	count |= inb(0x40) &lt;&lt; 8;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * VIA686a test code... reset the latch if count &gt; max + 1</div><div class='del'>-	 * from timer_pit.c - cjb</div><div class='del'>-	 */</div><div class='del'>-	if (count &gt; LATCH) {</div><div class='del'>-		outb_p(0x34, PIT_MODE);</div><div class='del'>-		outb_p(LATCH &amp; 0xff, PIT_CH0);</div><div class='del'>-		outb(LATCH &gt;&gt; 8, PIT_CH0);</div><div class='del'>-		count = LATCH - 1;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;i8253_lock);</div><div class='del'>-</div><div class='del'>-	/* lost tick compensation */</div><div class='del'>-	delta = last_cyclone_low - delta;	</div><div class='del'>-	delta /= (CYCLONE_TIMER_FREQ/1000000);</div><div class='del'>-	delta += delay_at_last_interrupt;</div><div class='del'>-	lost = delta/(1000000/HZ);</div><div class='del'>-	delay = delta%(1000000/HZ);</div><div class='del'>-	if (lost &gt;= 2)</div><div class='del'>-		jiffies_64 += lost-1;</div><div class='del'>-	</div><div class='del'>-	/* update the monotonic base value */</div><div class='del'>-	this_offset = ((unsigned long long)last_cyclone_high&lt;&lt;32)|last_cyclone_low;</div><div class='del'>-	monotonic_base += (this_offset - last_offset) &amp; CYCLONE_TIMER_MASK;</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-</div><div class='del'>-	/* calculate delay_at_last_interrupt */</div><div class='del'>-	count = ((LATCH-1) - count) * TICK_SIZE;</div><div class='del'>-	delay_at_last_interrupt = (count + LATCH/2) / LATCH;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* catch corner case where tick rollover occured </div><div class='del'>-	 * between cyclone and pit reads (as noted when </div><div class='del'>-	 * usec delta is &gt; 90% # of usecs/tick)</div><div class='del'>-	 */</div><div class='del'>-	if (lost &amp;&amp; abs(delay - delay_at_last_interrupt) &gt; (900000/HZ))</div><div class='del'>-		jiffies_64++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_offset_cyclone(void)</div><div class='del'>-{</div><div class='del'>-	u32 offset;</div><div class='del'>-</div><div class='del'>-	if(!cyclone_timer)</div><div class='del'>-		return delay_at_last_interrupt;</div><div class='del'>-</div><div class='del'>-	/* Read the cyclone timer */</div><div class='del'>-	offset = cyclone_timer[0];</div><div class='del'>-</div><div class='del'>-	/* .. relative to previous jiffy */</div><div class='del'>-	offset = offset - last_cyclone_low;</div><div class='del'>-</div><div class='del'>-	/* convert cyclone ticks to microseconds */	</div><div class='del'>-	/* XXX slow, can we speed this up? */</div><div class='del'>-	offset = offset/(CYCLONE_TIMER_FREQ/1000000);</div><div class='del'>-</div><div class='del'>-	/* our adjusted time offset in microseconds */</div><div class='del'>-	return delay_at_last_interrupt + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_clock_cyclone(void)</div><div class='del'>-{</div><div class='del'>-	u32 now_low, now_high;</div><div class='del'>-	unsigned long long last_offset, this_offset, base;</div><div class='del'>-	unsigned long long ret;</div><div class='del'>-	unsigned seq;</div><div class='del'>-</div><div class='del'>-	/* atomically read monotonic base &amp; last_offset */</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqbegin(&amp;monotonic_lock);</div><div class='del'>-		last_offset = ((unsigned long long)last_cyclone_high&lt;&lt;32)|last_cyclone_low;</div><div class='del'>-		base = monotonic_base;</div><div class='del'>-	} while (read_seqretry(&amp;monotonic_lock, seq));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Read the cyclone counter */</div><div class='del'>-	read_cyclone_counter(now_low,now_high);</div><div class='del'>-	this_offset = ((unsigned long long)now_high&lt;&lt;32)|now_low;</div><div class='del'>-</div><div class='del'>-	/* convert to nanoseconds */</div><div class='del'>-	ret = base + ((this_offset - last_offset)&amp;CYCLONE_TIMER_MASK);</div><div class='del'>-	return ret * (1000000000 / CYCLONE_TIMER_FREQ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_cyclone(char* override)</div><div class='del'>-{</div><div class='del'>-	u32* reg;	</div><div class='del'>-	u32 base;		/* saved cyclone base address */</div><div class='del'>-	u32 pageaddr;	/* page that contains cyclone_timer register */</div><div class='del'>-	u32 offset;		/* offset from pageaddr to cyclone_timer register */</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	/* check clock override */</div><div class='del'>-	if (override[0] &amp;&amp; strncmp(override,"cyclone",7))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/*make sure we're on a summit box*/</div><div class='del'>-	if(!use_cyclone) return -ENODEV; </div><div class='del'>-	</div><div class='del'>-	printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n");</div><div class='del'>-</div><div class='del'>-	/* find base address */</div><div class='del'>-	pageaddr = (CYCLONE_CBAR_ADDR)&amp;PAGE_MASK;</div><div class='del'>-	offset = (CYCLONE_CBAR_ADDR)&amp;(~PAGE_MASK);</div><div class='del'>-	set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr);</div><div class='del'>-	reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);</div><div class='del'>-	if(!reg){</div><div class='del'>-		printk(KERN_ERR "Summit chipset: Could not find valid CBAR register.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	base = *reg;	</div><div class='del'>-	if(!base){</div><div class='del'>-		printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* setup PMCC */</div><div class='del'>-	pageaddr = (base + CYCLONE_PMCC_OFFSET)&amp;PAGE_MASK;</div><div class='del'>-	offset = (base + CYCLONE_PMCC_OFFSET)&amp;(~PAGE_MASK);</div><div class='del'>-	set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr);</div><div class='del'>-	reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);</div><div class='del'>-	if(!reg){</div><div class='del'>-		printk(KERN_ERR "Summit chipset: Could not find valid PMCC register.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	reg[0] = 0x00000001;</div><div class='del'>-</div><div class='del'>-	/* setup MPCS */</div><div class='del'>-	pageaddr = (base + CYCLONE_MPCS_OFFSET)&amp;PAGE_MASK;</div><div class='del'>-	offset = (base + CYCLONE_MPCS_OFFSET)&amp;(~PAGE_MASK);</div><div class='del'>-	set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr);</div><div class='del'>-	reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);</div><div class='del'>-	if(!reg){</div><div class='del'>-		printk(KERN_ERR "Summit chipset: Could not find valid MPCS register.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	reg[0] = 0x00000001;</div><div class='del'>-</div><div class='del'>-	/* map in cyclone_timer */</div><div class='del'>-	pageaddr = (base + CYCLONE_MPMC_OFFSET)&amp;PAGE_MASK;</div><div class='del'>-	offset = (base + CYCLONE_MPMC_OFFSET)&amp;(~PAGE_MASK);</div><div class='del'>-	set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr);</div><div class='del'>-	cyclone_timer = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);</div><div class='del'>-	if(!cyclone_timer){</div><div class='del'>-		printk(KERN_ERR "Summit chipset: Could not find valid MPMC register.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*quick test to make sure its ticking*/</div><div class='del'>-	for(i=0; i&lt;3; i++){</div><div class='del'>-		u32 old = cyclone_timer[0];</div><div class='del'>-		int stall = 100;</div><div class='del'>-		while(stall--) barrier();</div><div class='del'>-		if(cyclone_timer[0] == old){</div><div class='del'>-			printk(KERN_ERR "Summit chipset: Counter not counting! DISABLED\n");</div><div class='del'>-			cyclone_timer = 0;</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_cpu_khz();</div><div class='del'>-</div><div class='del'>-	/* Everything looks good! */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void delay_cyclone(unsigned long loops)</div><div class='del'>-{</div><div class='del'>-	unsigned long bclock, now;</div><div class='del'>-	if(!cyclone_timer)</div><div class='del'>-		return;</div><div class='del'>-	bclock = cyclone_timer[0];</div><div class='del'>-	do {</div><div class='del'>-		rep_nop();</div><div class='del'>-		now = cyclone_timer[0];</div><div class='del'>-	} while ((now-bclock) &lt; loops);</div><div class='del'>-}</div><div class='del'>-/************************************************************/</div><div class='del'>-</div><div class='del'>-/* cyclone timer_opts struct */</div><div class='del'>-static struct timer_opts timer_cyclone = {</div><div class='del'>-	.name = "cyclone",</div><div class='del'>-	.mark_offset = mark_offset_cyclone, </div><div class='del'>-	.get_offset = get_offset_cyclone,</div><div class='del'>-	.monotonic_clock =	monotonic_clock_cyclone,</div><div class='del'>-	.delay = delay_cyclone,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct init_timer_opts __initdata timer_cyclone_init = {</div><div class='del'>-	.init = init_cyclone,</div><div class='del'>-	.opts = &amp;timer_cyclone,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer_hpet.c b/arch/i386/kernel/timers/timer_hpet.c<br/>deleted file mode 100644<br/>index 17a6fe7166e7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer_hpet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_hpet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,217 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * This code largely moved from arch/i386/kernel/time.c.</div><div class='del'>- * See comments there for proper credits.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-</div><div class='del'>-#include "io_ports.h"</div><div class='del'>-#include "mach_timer.h"</div><div class='del'>-#include &lt;asm/hpet.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned long hpet_usec_quotient __read_mostly;	/* convert hpet clks to usec */</div><div class='del'>-static unsigned long tsc_hpet_quotient __read_mostly;	/* convert tsc to hpet clks */</div><div class='del'>-static unsigned long hpet_last; 	/* hpet counter value at last tick*/</div><div class='del'>-static unsigned long last_tsc_low;	/* lsb 32 bits of Time Stamp Counter */</div><div class='del'>-static unsigned long last_tsc_high; 	/* msb 32 bits of Time Stamp Counter */</div><div class='del'>-static unsigned long long monotonic_base;</div><div class='del'>-static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED;</div><div class='del'>-</div><div class='del'>-/* convert from cycles(64bits) =&gt; nanoseconds (64bits)</div><div class='del'>- *  basic equation:</div><div class='del'>- *		ns = cycles / (freq / ns_per_sec)</div><div class='del'>- *		ns = cycles * (ns_per_sec / freq)</div><div class='del'>- *		ns = cycles * (10^9 / (cpu_khz * 10^3))</div><div class='del'>- *		ns = cycles * (10^6 / cpu_khz)</div><div class='del'>- *</div><div class='del'>- *	Then we use scaling math (suggested by george@mvista.com) to get:</div><div class='del'>- *		ns = cycles * (10^6 * SC / cpu_khz) / SC</div><div class='del'>- *		ns = cycles * cyc2ns_scale / SC</div><div class='del'>- *</div><div class='del'>- *	And since SC is a constant power of two, we can convert the div</div><div class='del'>- *  into a shift.</div><div class='del'>- *</div><div class='del'>- *  We can use khz divisor instead of mhz to keep a better percision, since</div><div class='del'>- *  cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits.</div><div class='del'>- *  (mathieu.desnoyers@polymtl.ca)</div><div class='del'>- *</div><div class='del'>- *			-johnstul@us.ibm.com "math is hard, lets go shopping!"</div><div class='del'>- */</div><div class='del'>-static unsigned long cyc2ns_scale __read_mostly;</div><div class='del'>-#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */</div><div class='del'>-</div><div class='del'>-static inline void set_cyc2ns_scale(unsigned long cpu_khz)</div><div class='del'>-{</div><div class='del'>-	cyc2ns_scale = (1000000 &lt;&lt; CYC2NS_SCALE_FACTOR)/cpu_khz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long long cycles_2_ns(unsigned long long cyc)</div><div class='del'>-{</div><div class='del'>-	return (cyc * cyc2ns_scale) &gt;&gt; CYC2NS_SCALE_FACTOR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_clock_hpet(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long last_offset, this_offset, base;</div><div class='del'>-	unsigned seq;</div><div class='del'>-</div><div class='del'>-	/* atomically read monotonic base &amp; last_offset */</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqbegin(&amp;monotonic_lock);</div><div class='del'>-		last_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-		base = monotonic_base;</div><div class='del'>-	} while (read_seqretry(&amp;monotonic_lock, seq));</div><div class='del'>-</div><div class='del'>-	/* Read the Time Stamp Counter */</div><div class='del'>-	rdtscll(this_offset);</div><div class='del'>-</div><div class='del'>-	/* return the value in ns */</div><div class='del'>-	return base + cycles_2_ns(this_offset - last_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_offset_hpet(void)</div><div class='del'>-{</div><div class='del'>-	register unsigned long eax, edx;</div><div class='del'>-</div><div class='del'>-	eax = hpet_readl(HPET_COUNTER);</div><div class='del'>-	eax -= hpet_last;	/* hpet delta */</div><div class='del'>-	eax = min(hpet_tick, eax);</div><div class='del'>-	/*</div><div class='del'>-         * Time offset = (hpet delta) * ( usecs per HPET clock )</div><div class='del'>-	 *             = (hpet delta) * ( usecs per tick / HPET clocks per tick)</div><div class='del'>-	 *             = (hpet delta) * ( hpet_usec_quotient ) / (2^32)</div><div class='del'>-	 *</div><div class='del'>-	 * Where,</div><div class='del'>-	 * hpet_usec_quotient = (2^32 * usecs per tick)/HPET clocks per tick</div><div class='del'>-	 *</div><div class='del'>-	 * Using a mull instead of a divl saves some cycles in critical path.</div><div class='del'>-         */</div><div class='del'>-	ASM_MUL64_REG(eax, edx, hpet_usec_quotient, eax);</div><div class='del'>-</div><div class='del'>-	/* our adjusted time offset in microseconds */</div><div class='del'>-	return edx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mark_offset_hpet(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long this_offset, last_offset;</div><div class='del'>-	unsigned long offset;</div><div class='del'>-</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	last_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-	rdtsc(last_tsc_low, last_tsc_high);</div><div class='del'>-</div><div class='del'>-	if (hpet_use_timer)</div><div class='del'>-		offset = hpet_readl(HPET_T0_CMP) - hpet_tick;</div><div class='del'>-	else</div><div class='del'>-		offset = hpet_readl(HPET_COUNTER);</div><div class='del'>-	if (unlikely(((offset - hpet_last) &gt;= (2*hpet_tick)) &amp;&amp; (hpet_last != 0))) {</div><div class='del'>-		int lost_ticks = ((offset - hpet_last) / hpet_tick) - 1;</div><div class='del'>-		jiffies_64 += lost_ticks;</div><div class='del'>-	}</div><div class='del'>-	hpet_last = offset;</div><div class='del'>-</div><div class='del'>-	/* update the monotonic base value */</div><div class='del'>-	this_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-	monotonic_base += cycles_2_ns(this_offset - last_offset);</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delay_hpet(unsigned long loops)</div><div class='del'>-{</div><div class='del'>-	unsigned long hpet_start, hpet_end;</div><div class='del'>-	unsigned long eax;</div><div class='del'>-</div><div class='del'>-	/* loops is the number of cpu cycles. Convert it to hpet clocks */</div><div class='del'>-	ASM_MUL64_REG(eax, loops, tsc_hpet_quotient, loops);</div><div class='del'>-</div><div class='del'>-	hpet_start = hpet_readl(HPET_COUNTER);</div><div class='del'>-	do {</div><div class='del'>-		rep_nop();</div><div class='del'>-		hpet_end = hpet_readl(HPET_COUNTER);</div><div class='del'>-	} while ((hpet_end - hpet_start) &lt; (loops));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct timer_opts timer_hpet;</div><div class='del'>-</div><div class='del'>-static int __init init_hpet(char* override)</div><div class='del'>-{</div><div class='del'>-	unsigned long result, remain;</div><div class='del'>-</div><div class='del'>-	/* check clock override */</div><div class='del'>-	if (override[0] &amp;&amp; strncmp(override,"hpet",4))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!is_hpet_enabled())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	printk("Using HPET for gettimeofday\n");</div><div class='del'>-	if (cpu_has_tsc) {</div><div class='del'>-		unsigned long tsc_quotient = calibrate_tsc_hpet(&amp;tsc_hpet_quotient);</div><div class='del'>-		if (tsc_quotient) {</div><div class='del'>-			/* report CPU clock rate in Hz.</div><div class='del'>-			 * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) =</div><div class='del'>-			 * clock/second. Our precision is about 100 ppm.</div><div class='del'>-			 */</div><div class='del'>-			{	unsigned long eax=0, edx=1000;</div><div class='del'>-				ASM_DIV64_REG(cpu_khz, edx, tsc_quotient,</div><div class='del'>-						eax, edx);</div><div class='del'>-				printk("Detected %u.%03u MHz processor.\n",</div><div class='del'>-					cpu_khz / 1000, cpu_khz % 1000);</div><div class='del'>-			}</div><div class='del'>-			set_cyc2ns_scale(cpu_khz);</div><div class='del'>-		}</div><div class='del'>-		/* set this only when cpu_has_tsc */</div><div class='del'>-		timer_hpet.read_timer = read_timer_tsc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Math to calculate hpet to usec multiplier</div><div class='del'>-	 * Look for the comments at get_offset_hpet()</div><div class='del'>-	 */</div><div class='del'>-	ASM_DIV64_REG(result, remain, hpet_tick, 0, KERNEL_TICK_USEC);</div><div class='del'>-	if (remain &gt; (hpet_tick &gt;&gt; 1))</div><div class='del'>-		result++; /* rounding the result */</div><div class='del'>-	hpet_usec_quotient = result;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hpet_resume(void)</div><div class='del'>-{</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	/* Assume this is the last mark offset time */</div><div class='del'>-	rdtsc(last_tsc_low, last_tsc_high);</div><div class='del'>-</div><div class='del'>-	if (hpet_use_timer)</div><div class='del'>-		hpet_last = hpet_readl(HPET_T0_CMP) - hpet_tick;</div><div class='del'>-	else</div><div class='del'>-		hpet_last = hpet_readl(HPET_COUNTER);</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/************************************************************/</div><div class='del'>-</div><div class='del'>-/* tsc timer_opts struct */</div><div class='del'>-static struct timer_opts timer_hpet __read_mostly = {</div><div class='del'>-	.name = 		"hpet",</div><div class='del'>-	.mark_offset =		mark_offset_hpet,</div><div class='del'>-	.get_offset =		get_offset_hpet,</div><div class='del'>-	.monotonic_clock =	monotonic_clock_hpet,</div><div class='del'>-	.delay = 		delay_hpet,</div><div class='del'>-	.resume	=		hpet_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct init_timer_opts __initdata timer_hpet_init = {</div><div class='del'>-	.init =	init_hpet,</div><div class='del'>-	.opts = &amp;timer_hpet,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer_none.c b/arch/i386/kernel/timers/timer_none.c<br/>deleted file mode 100644<br/>index 4ea2f414dbbd..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer_none.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_none.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-</div><div class='del'>-static void mark_offset_none(void)</div><div class='del'>-{</div><div class='del'>-	/* nothing needed */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long get_offset_none(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_clock_none(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delay_none(unsigned long loops)</div><div class='del'>-{</div><div class='del'>-	int d0;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-		"\tjmp 1f\n"</div><div class='del'>-		".align 16\n"</div><div class='del'>-		"1:\tjmp 2f\n"</div><div class='del'>-		".align 16\n"</div><div class='del'>-		"2:\tdecl %0\n\tjns 2b"</div><div class='del'>-		:"=&amp;a" (d0)</div><div class='del'>-		:"0" (loops));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* none timer_opts struct */</div><div class='del'>-struct timer_opts timer_none = {</div><div class='del'>-	.name = 	"none",</div><div class='del'>-	.mark_offset =	mark_offset_none, </div><div class='del'>-	.get_offset =	get_offset_none,</div><div class='del'>-	.monotonic_clock =	monotonic_clock_none,</div><div class='del'>-	.delay = delay_none,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c<br/>deleted file mode 100644<br/>index b9b6bd56b9ba..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer_pit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_pit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,177 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * This code largely moved from arch/i386/kernel/time.c.</div><div class='del'>- * See comments there for proper credits.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/sysdev.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/mpspec.h&gt;</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch_hooks.h&gt;</div><div class='del'>-#include &lt;asm/i8253.h&gt;</div><div class='del'>-</div><div class='del'>-#include "do_timer.h"</div><div class='del'>-#include "io_ports.h"</div><div class='del'>-</div><div class='del'>-static int count_p; /* counter in get_offset_pit() */</div><div class='del'>-</div><div class='del'>-static int __init init_pit(char* override)</div><div class='del'>-{</div><div class='del'>- 	/* check clock override */</div><div class='del'>- 	if (override[0] &amp;&amp; strncmp(override,"pit",3))</div><div class='del'>- 		printk(KERN_ERR "Warning: clock= override failed. Defaulting "</div><div class='del'>-				"to PIT\n");</div><div class='del'>- 	init_cpu_khz();</div><div class='del'>-	count_p = LATCH;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mark_offset_pit(void)</div><div class='del'>-{</div><div class='del'>-	/* nothing needed */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_clock_pit(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delay_pit(unsigned long loops)</div><div class='del'>-{</div><div class='del'>-	int d0;</div><div class='del'>-	__asm__ __volatile__(</div><div class='del'>-		"\tjmp 1f\n"</div><div class='del'>-		".align 16\n"</div><div class='del'>-		"1:\tjmp 2f\n"</div><div class='del'>-		".align 16\n"</div><div class='del'>-		"2:\tdecl %0\n\tjns 2b"</div><div class='del'>-		:"=&amp;a" (d0)</div><div class='del'>-		:"0" (loops));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This function must be called with xtime_lock held.</div><div class='del'>- * It was inspired by Steve McCanne's microtime-i386 for BSD.  -- jrs</div><div class='del'>- * </div><div class='del'>- * However, the pc-audio speaker driver changes the divisor so that</div><div class='del'>- * it gets interrupted rather more often - it loads 64 into the</div><div class='del'>- * counter rather than 11932! This has an adverse impact on</div><div class='del'>- * do_gettimeoffset() -- it stops working! What is also not</div><div class='del'>- * good is that the interval that our timer function gets called</div><div class='del'>- * is no longer 10.0002 ms, but 9.9767 ms. To get around this</div><div class='del'>- * would require using a different timing source. Maybe someone</div><div class='del'>- * could use the RTC - I know that this can interrupt at frequencies</div><div class='del'>- * ranging from 8192Hz to 2Hz. If I had the energy, I'd somehow fix</div><div class='del'>- * it so that at startup, the timer code in sched.c would select</div><div class='del'>- * using either the RTC or the 8253 timer. The decision would be</div><div class='del'>- * based on whether there was any other device around that needed</div><div class='del'>- * to trample on the 8253. I'd set up the RTC to interrupt at 1024 Hz,</div><div class='del'>- * and then do some jiggery to have a version of do_timer that </div><div class='del'>- * advanced the clock by 1/1024 s. Every time that reached over 1/100</div><div class='del'>- * of a second, then do all the old code. If the time was kept correct</div><div class='del'>- * then do_gettimeoffset could just return 0 - there is no low order</div><div class='del'>- * divider that can be accessed.</div><div class='del'>- *</div><div class='del'>- * Ideally, you would be able to use the RTC for the speaker driver,</div><div class='del'>- * but it appears that the speaker driver really needs interrupt more</div><div class='del'>- * often than every 120 us or so.</div><div class='del'>- *</div><div class='del'>- * Anyway, this needs more thought....		pjsg (1993-08-28)</div><div class='del'>- * </div><div class='del'>- * If you are really that interested, you should be reading</div><div class='del'>- * comp.protocols.time.ntp!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned long get_offset_pit(void)</div><div class='del'>-{</div><div class='del'>-	int count;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	static unsigned long jiffies_p = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * cache volatile jiffies temporarily; we have xtime_lock. </div><div class='del'>-	 */</div><div class='del'>-	unsigned long jiffies_t;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;i8253_lock, flags);</div><div class='del'>-	/* timer count may underflow right here */</div><div class='del'>-	outb_p(0x00, PIT_MODE);	/* latch the count ASAP */</div><div class='del'>-</div><div class='del'>-	count = inb_p(PIT_CH0);	/* read the latched count */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We do this guaranteed double memory access instead of a _p </div><div class='del'>-	 * postfix in the previous port access. Wheee, hackady hack</div><div class='del'>-	 */</div><div class='del'>- 	jiffies_t = jiffies;</div><div class='del'>-</div><div class='del'>-	count |= inb_p(PIT_CH0) &lt;&lt; 8;</div><div class='del'>-	</div><div class='del'>-        /* VIA686a test code... reset the latch if count &gt; max + 1 */</div><div class='del'>-        if (count &gt; LATCH) {</div><div class='del'>-                outb_p(0x34, PIT_MODE);</div><div class='del'>-                outb_p(LATCH &amp; 0xff, PIT_CH0);</div><div class='del'>-                outb(LATCH &gt;&gt; 8, PIT_CH0);</div><div class='del'>-                count = LATCH - 1;</div><div class='del'>-        }</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * avoiding timer inconsistencies (they are rare, but they happen)...</div><div class='del'>-	 * there are two kinds of problems that must be avoided here:</div><div class='del'>-	 *  1. the timer counter underflows</div><div class='del'>-	 *  2. hardware problem with the timer, not giving us continuous time,</div><div class='del'>-	 *     the counter does small "jumps" upwards on some Pentium systems,</div><div class='del'>-	 *     (see c't 95/10 page 335 for Neptun bug.)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if( jiffies_t == jiffies_p ) {</div><div class='del'>-		if( count &gt; count_p ) {</div><div class='del'>-			/* the nutcase */</div><div class='del'>-			count = do_timer_overflow(count);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		jiffies_p = jiffies_t;</div><div class='del'>-</div><div class='del'>-	count_p = count;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;i8253_lock, flags);</div><div class='del'>-</div><div class='del'>-	count = ((LATCH-1) - count) * TICK_SIZE;</div><div class='del'>-	count = (count + LATCH/2) / LATCH;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* tsc timer_opts struct */</div><div class='del'>-struct timer_opts timer_pit = {</div><div class='del'>-	.name = "pit",</div><div class='del'>-	.mark_offset = mark_offset_pit, </div><div class='del'>-	.get_offset = get_offset_pit,</div><div class='del'>-	.monotonic_clock = monotonic_clock_pit,</div><div class='del'>-	.delay = delay_pit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct init_timer_opts __initdata timer_pit_init = {</div><div class='del'>-	.init = init_pit, </div><div class='del'>-	.opts = &amp;timer_pit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void setup_pit_timer(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;i8253_lock, flags);</div><div class='del'>-	outb_p(0x34,PIT_MODE);		/* binary, mode 2, LSB/MSB, ch 0 */</div><div class='del'>-	udelay(10);</div><div class='del'>-	outb_p(LATCH &amp; 0xff , PIT_CH0);	/* LSB */</div><div class='del'>-	udelay(10);</div><div class='del'>-	outb(LATCH &gt;&gt; 8 , PIT_CH0);	/* MSB */</div><div class='del'>-	spin_unlock_irqrestore(&amp;i8253_lock, flags);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer_pm.c b/arch/i386/kernel/timers/timer_pm.c<br/>deleted file mode 100644<br/>index 144e94a04933..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer_pm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_pm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,342 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * (C) Dominik Brodowski &lt;linux@brodo.de&gt; 2003</div><div class='del'>- *</div><div class='del'>- * Driver to use the Power Management Timer (PMTMR) available in some</div><div class='del'>- * southbridges as primary timing source for the Linux kernel.</div><div class='del'>- *</div><div class='del'>- * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c,</div><div class='del'>- * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4.</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the GPL v2.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;asm/types.h&gt;</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch_hooks.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include "mach_timer.h"</div><div class='del'>-</div><div class='del'>-/* Number of PMTMR ticks expected during calibration run */</div><div class='del'>-#define PMTMR_TICKS_PER_SEC 3579545</div><div class='del'>-#define PMTMR_EXPECTED_RATE \</div><div class='del'>-  ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC &gt;&gt; 10)) / (CLOCK_TICK_RATE&gt;&gt;10))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The I/O port the PMTMR resides at.</div><div class='del'>- * The location is detected during setup_arch(),</div><div class='del'>- * in arch/i386/acpi/boot.c */</div><div class='del'>-u32 pmtmr_ioport = 0;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* value of the Power timer at last timer interrupt */</div><div class='del'>-static u32 offset_tick;</div><div class='del'>-static u32 offset_delay;</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_base;</div><div class='del'>-static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED;</div><div class='del'>-</div><div class='del'>-#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */</div><div class='del'>-</div><div class='del'>-static int pmtmr_need_workaround __read_mostly = 1;</div><div class='del'>-</div><div class='del'>-/*helper function to safely read acpi pm timesource*/</div><div class='del'>-static inline u32 read_pmtmr(void)</div><div class='del'>-{</div><div class='del'>-	if (pmtmr_need_workaround) {</div><div class='del'>-		u32 v1, v2, v3;</div><div class='del'>-</div><div class='del'>-		/* It has been reported that because of various broken</div><div class='del'>-		 * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM time</div><div class='del'>-		 * source is not latched, so you must read it multiple</div><div class='del'>-		 * times to insure a safe value is read.</div><div class='del'>-		 */</div><div class='del'>-		do {</div><div class='del'>-			v1 = inl(pmtmr_ioport);</div><div class='del'>-			v2 = inl(pmtmr_ioport);</div><div class='del'>-			v3 = inl(pmtmr_ioport);</div><div class='del'>-		} while ((v1 &gt; v2 &amp;&amp; v1 &lt; v3) || (v2 &gt; v3 &amp;&amp; v2 &lt; v1)</div><div class='del'>-			 || (v3 &gt; v1 &amp;&amp; v3 &lt; v2));</div><div class='del'>-</div><div class='del'>-		/* mask the output to 24 bits */</div><div class='del'>-		return v2 &amp; ACPI_PM_MASK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return inl(pmtmr_ioport) &amp; ACPI_PM_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some boards have the PMTMR running way too fast. We check</div><div class='del'>- * the PMTMR rate against PIT channel 2 to catch these cases.</div><div class='del'>- */</div><div class='del'>-static int verify_pmtmr_rate(void)</div><div class='del'>-{</div><div class='del'>-	u32 value1, value2;</div><div class='del'>-	unsigned long count, delta;</div><div class='del'>-</div><div class='del'>-	mach_prepare_counter();</div><div class='del'>-	value1 = read_pmtmr();</div><div class='del'>-	mach_countup(&amp;count);</div><div class='del'>-	value2 = read_pmtmr();</div><div class='del'>-	delta = (value2 - value1) &amp; ACPI_PM_MASK;</div><div class='del'>-</div><div class='del'>-	/* Check that the PMTMR delta is within 5% of what we expect */</div><div class='del'>-	if (delta &lt; (PMTMR_EXPECTED_RATE * 19) / 20 ||</div><div class='del'>-	    delta &gt; (PMTMR_EXPECTED_RATE * 21) / 20) {</div><div class='del'>-		printk(KERN_INFO "PM-Timer running at invalid rate: %lu%% of normal - aborting.\n", 100UL * delta / PMTMR_EXPECTED_RATE);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int init_pmtmr(char* override)</div><div class='del'>-{</div><div class='del'>-	u32 value1, value2;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>- 	if (override[0] &amp;&amp; strncmp(override,"pmtmr",5))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!pmtmr_ioport)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* we use the TSC for delay_pmtmr, so make sure it exists */</div><div class='del'>-	if (!cpu_has_tsc)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* "verify" this timing source */</div><div class='del'>-	value1 = read_pmtmr();</div><div class='del'>-	for (i = 0; i &lt; 10000; i++) {</div><div class='del'>-		value2 = read_pmtmr();</div><div class='del'>-		if (value2 == value1)</div><div class='del'>-			continue;</div><div class='del'>-		if (value2 &gt; value1)</div><div class='del'>-			goto pm_good;</div><div class='del'>-		if ((value2 &lt; value1) &amp;&amp; ((value2) &lt; 0xFFF))</div><div class='del'>-			goto pm_good;</div><div class='del'>-		printk(KERN_INFO "PM-Timer had inconsistent results: 0x%#x, 0x%#x - aborting.\n", value1, value2);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_INFO "PM-Timer had no reasonable result: 0x%#x - aborting.\n", value1);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-</div><div class='del'>-pm_good:</div><div class='del'>-	if (verify_pmtmr_rate() != 0)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	init_cpu_khz();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 cyc2us(u32 cycles)</div><div class='del'>-{</div><div class='del'>-	/* The Power Management Timer ticks at 3.579545 ticks per microsecond.</div><div class='del'>-	 * 1 / PM_TIMER_FREQUENCY == 0.27936511 =~ 286/1024 [error: 0.024%]</div><div class='del'>-	 *</div><div class='del'>-	 * Even with HZ = 100, delta is at maximum 35796 ticks, so it can</div><div class='del'>-	 * easily be multiplied with 286 (=0x11E) without having to fear</div><div class='del'>-	 * u32 overflows.</div><div class='del'>-	 */</div><div class='del'>-	cycles *= 286;</div><div class='del'>-	return (cycles &gt;&gt; 10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this gets called during each timer interrupt</div><div class='del'>- *   - Called while holding the writer xtime_lock</div><div class='del'>- */</div><div class='del'>-static void mark_offset_pmtmr(void)</div><div class='del'>-{</div><div class='del'>-	u32 lost, delta, last_offset;</div><div class='del'>-	static int first_run = 1;</div><div class='del'>-	last_offset = offset_tick;</div><div class='del'>-</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-</div><div class='del'>-	offset_tick = read_pmtmr();</div><div class='del'>-</div><div class='del'>-	/* calculate tick interval */</div><div class='del'>-	delta = (offset_tick - last_offset) &amp; ACPI_PM_MASK;</div><div class='del'>-</div><div class='del'>-	/* convert to usecs */</div><div class='del'>-	delta = cyc2us(delta);</div><div class='del'>-</div><div class='del'>-	/* update the monotonic base value */</div><div class='del'>-	monotonic_base += delta * NSEC_PER_USEC;</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-</div><div class='del'>-	/* convert to ticks */</div><div class='del'>-	delta += offset_delay;</div><div class='del'>-	lost = delta / (USEC_PER_SEC / HZ);</div><div class='del'>-	offset_delay = delta % (USEC_PER_SEC / HZ);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* compensate for lost ticks */</div><div class='del'>-	if (lost &gt;= 2)</div><div class='del'>-		jiffies_64 += lost - 1;</div><div class='del'>-</div><div class='del'>-	/* don't calculate delay for first run,</div><div class='del'>-	   or if we've got less then a tick */</div><div class='del'>-	if (first_run || (lost &lt; 1)) {</div><div class='del'>-		first_run = 0;</div><div class='del'>-		offset_delay = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pmtmr_resume(void)</div><div class='del'>-{</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	/* Assume this is the last mark offset time */</div><div class='del'>-	offset_tick = read_pmtmr();</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_clock_pmtmr(void)</div><div class='del'>-{</div><div class='del'>-	u32 last_offset, this_offset;</div><div class='del'>-	unsigned long long base, ret;</div><div class='del'>-	unsigned seq;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* atomically read monotonic base &amp; last_offset */</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqbegin(&amp;monotonic_lock);</div><div class='del'>-		last_offset = offset_tick;</div><div class='del'>-		base = monotonic_base;</div><div class='del'>-	} while (read_seqretry(&amp;monotonic_lock, seq));</div><div class='del'>-</div><div class='del'>-	/* Read the pmtmr */</div><div class='del'>-	this_offset =  read_pmtmr();</div><div class='del'>-</div><div class='del'>-	/* convert to nanoseconds */</div><div class='del'>-	ret = (this_offset - last_offset) &amp; ACPI_PM_MASK;</div><div class='del'>-	ret = base + (cyc2us(ret) * NSEC_PER_USEC);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delay_pmtmr(unsigned long loops)</div><div class='del'>-{</div><div class='del'>-	unsigned long bclock, now;</div><div class='del'>-</div><div class='del'>-	rdtscl(bclock);</div><div class='del'>-	do</div><div class='del'>-	{</div><div class='del'>-		rep_nop();</div><div class='del'>-		rdtscl(now);</div><div class='del'>-	} while ((now-bclock) &lt; loops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get the offset (in microseconds) from the last call to mark_offset()</div><div class='del'>- *	- Called holding a reader xtime_lock</div><div class='del'>- */</div><div class='del'>-static unsigned long get_offset_pmtmr(void)</div><div class='del'>-{</div><div class='del'>-	u32 now, offset, delta = 0;</div><div class='del'>-</div><div class='del'>-	offset = offset_tick;</div><div class='del'>-	now = read_pmtmr();</div><div class='del'>-	delta = (now - offset)&amp;ACPI_PM_MASK;</div><div class='del'>-</div><div class='del'>-	return (unsigned long) offset_delay + cyc2us(delta);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* acpi timer_opts struct */</div><div class='del'>-static struct timer_opts timer_pmtmr = {</div><div class='del'>-	.name			= "pmtmr",</div><div class='del'>-	.mark_offset		= mark_offset_pmtmr,</div><div class='del'>-	.get_offset		= get_offset_pmtmr,</div><div class='del'>-	.monotonic_clock 	= monotonic_clock_pmtmr,</div><div class='del'>-	.delay 			= delay_pmtmr,</div><div class='del'>-	.read_timer 		= read_timer_tsc,</div><div class='del'>-	.resume			= pmtmr_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct init_timer_opts __initdata timer_pmtmr_init = {</div><div class='del'>-	.init = init_pmtmr,</div><div class='del'>-	.opts = &amp;timer_pmtmr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-/*</div><div class='del'>- * PIIX4 Errata:</div><div class='del'>- *</div><div class='del'>- * The power management timer may return improper results when read.</div><div class='del'>- * Although the timer value settles properly after incrementing,</div><div class='del'>- * while incrementing there is a 3 ns window every 69.8 ns where the</div><div class='del'>- * timer value is indeterminate (a 4.2% chance that the data will be</div><div class='del'>- * incorrect when read). As a result, the ACPI free running count up</div><div class='del'>- * timer specification is violated due to erroneous reads.</div><div class='del'>- */</div><div class='del'>-static int __init pmtmr_bug_check(void)</div><div class='del'>-{</div><div class='del'>-	static struct pci_device_id gray_list[] __initdata = {</div><div class='del'>-		/* these chipsets may have bug. */</div><div class='del'>-		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,</div><div class='del'>-				PCI_DEVICE_ID_INTEL_82801DB_0) },</div><div class='del'>-		{ },</div><div class='del'>-	};</div><div class='del'>-	struct pci_dev *dev;</div><div class='del'>-	int pmtmr_has_bug = 0;</div><div class='del'>-	u8 rev;</div><div class='del'>-</div><div class='del'>-	if (cur_timer != &amp;timer_pmtmr || !pmtmr_need_workaround)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dev = pci_get_device(PCI_VENDOR_ID_INTEL,</div><div class='del'>-			     PCI_DEVICE_ID_INTEL_82371AB_3, NULL);</div><div class='del'>-	if (dev) {</div><div class='del'>-		pci_read_config_byte(dev, PCI_REVISION_ID, &amp;rev);</div><div class='del'>-		/* the bug has been fixed in PIIX4M */</div><div class='del'>-		if (rev &lt; 3) {</div><div class='del'>-			printk(KERN_WARNING "* Found PM-Timer Bug on this "</div><div class='del'>-				"chipset. Due to workarounds for a bug,\n"</div><div class='del'>-				"* this time source is slow.  Consider trying "</div><div class='del'>-				"other time sources (clock=)\n");</div><div class='del'>-			pmtmr_has_bug = 1;</div><div class='del'>-		}</div><div class='del'>-		pci_dev_put(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pci_dev_present(gray_list)) {</div><div class='del'>-		printk(KERN_WARNING "* This chipset may have PM-Timer Bug.  Due"</div><div class='del'>-			" to workarounds for a bug,\n"</div><div class='del'>-			"* this time source is slow. If you are sure your timer"</div><div class='del'>-			" does not have\n"</div><div class='del'>-			"* this bug, please use \"pmtmr_good\" to disable the "</div><div class='del'>-			"workaround\n");</div><div class='del'>-		pmtmr_has_bug = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pmtmr_has_bug)</div><div class='del'>-		pmtmr_need_workaround = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-device_initcall(pmtmr_bug_check);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init pmtr_good_setup(char *__str)</div><div class='del'>-{</div><div class='del'>-	pmtmr_need_workaround = 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("pmtmr_good", pmtr_good_setup);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Dominik Brodowski &lt;linux@brodo.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Power Management Timer (PMTMR) as primary timing source for x86");</div><div class='head'>diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c<br/>deleted file mode 100644<br/>index f1187ddb0d0f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/timers/timer_tsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/timers/timer_tsc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,617 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * This code largely moved from arch/i386/kernel/time.c.</div><div class='del'>- * See comments there for proper credits.</div><div class='del'>- *</div><div class='del'>- * 2004-06-25    Jesper Juhl</div><div class='del'>- *      moved mark_offset_tsc below cpufreq_delayed_get to avoid gcc 3.4</div><div class='del'>- *      failing to inline.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/timer.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-/* processor.h for distable_tsc flag */</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-</div><div class='del'>-#include "io_ports.h"</div><div class='del'>-#include "mach_timer.h"</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hpet.h&gt;</div><div class='del'>-#include &lt;asm/i8253.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-static unsigned long hpet_usec_quotient;</div><div class='del'>-static unsigned long hpet_last;</div><div class='del'>-static struct timer_opts timer_tsc;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void cpufreq_delayed_get(void);</div><div class='del'>-</div><div class='del'>-int tsc_disable __devinitdata = 0;</div><div class='del'>-</div><div class='del'>-static int use_tsc;</div><div class='del'>-/* Number of usecs that the last interrupt was delayed */</div><div class='del'>-static int delay_at_last_interrupt;</div><div class='del'>-</div><div class='del'>-static unsigned long last_tsc_low; /* lsb 32 bits of Time Stamp Counter */</div><div class='del'>-static unsigned long last_tsc_high; /* msb 32 bits of Time Stamp Counter */</div><div class='del'>-static unsigned long long monotonic_base;</div><div class='del'>-static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED;</div><div class='del'>-</div><div class='del'>-/* Avoid compensating for lost ticks before TSCs are synched */</div><div class='del'>-static int detect_lost_ticks;</div><div class='del'>-static int __init start_lost_tick_compensation(void)</div><div class='del'>-{</div><div class='del'>-	detect_lost_ticks = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-late_initcall(start_lost_tick_compensation);</div><div class='del'>-</div><div class='del'>-/* convert from cycles(64bits) =&gt; nanoseconds (64bits)</div><div class='del'>- *  basic equation:</div><div class='del'>- *		ns = cycles / (freq / ns_per_sec)</div><div class='del'>- *		ns = cycles * (ns_per_sec / freq)</div><div class='del'>- *		ns = cycles * (10^9 / (cpu_khz * 10^3))</div><div class='del'>- *		ns = cycles * (10^6 / cpu_khz)</div><div class='del'>- *</div><div class='del'>- *	Then we use scaling math (suggested by george@mvista.com) to get:</div><div class='del'>- *		ns = cycles * (10^6 * SC / cpu_khz) / SC</div><div class='del'>- *		ns = cycles * cyc2ns_scale / SC</div><div class='del'>- *</div><div class='del'>- *	And since SC is a constant power of two, we can convert the div</div><div class='del'>- *  into a shift.</div><div class='del'>- *</div><div class='del'>- *  We can use khz divisor instead of mhz to keep a better percision, since</div><div class='del'>- *  cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits.</div><div class='del'>- *  (mathieu.desnoyers@polymtl.ca)</div><div class='del'>- *</div><div class='del'>- *			-johnstul@us.ibm.com "math is hard, lets go shopping!"</div><div class='del'>- */</div><div class='del'>-static unsigned long cyc2ns_scale __read_mostly;</div><div class='del'>-#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */</div><div class='del'>-</div><div class='del'>-static inline void set_cyc2ns_scale(unsigned long cpu_khz)</div><div class='del'>-{</div><div class='del'>-	cyc2ns_scale = (1000000 &lt;&lt; CYC2NS_SCALE_FACTOR)/cpu_khz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned long long cycles_2_ns(unsigned long long cyc)</div><div class='del'>-{</div><div class='del'>-	return (cyc * cyc2ns_scale) &gt;&gt; CYC2NS_SCALE_FACTOR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int count2; /* counter for mark_offset_tsc() */</div><div class='del'>-</div><div class='del'>-/* Cached *multiplier* to convert TSC counts to microseconds.</div><div class='del'>- * (see the equation below).</div><div class='del'>- * Equal to 2^32 * (1 / (clocks per usec) ).</div><div class='del'>- * Initialized in time_init.</div><div class='del'>- */</div><div class='del'>-static unsigned long fast_gettimeoffset_quotient;</div><div class='del'>-</div><div class='del'>-static unsigned long get_offset_tsc(void)</div><div class='del'>-{</div><div class='del'>-	register unsigned long eax, edx;</div><div class='del'>-</div><div class='del'>-	/* Read the Time Stamp Counter */</div><div class='del'>-</div><div class='del'>-	rdtsc(eax,edx);</div><div class='del'>-</div><div class='del'>-	/* .. relative to previous jiffy (32 bits is enough) */</div><div class='del'>-	eax -= last_tsc_low;	/* tsc_low delta */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-         * Time offset = (tsc_low delta) * fast_gettimeoffset_quotient</div><div class='del'>-         *             = (tsc_low delta) * (usecs_per_clock)</div><div class='del'>-         *             = (tsc_low delta) * (usecs_per_jiffy / clocks_per_jiffy)</div><div class='del'>-	 *</div><div class='del'>-	 * Using a mull instead of a divl saves up to 31 clock cycles</div><div class='del'>-	 * in the critical path.</div><div class='del'>-         */</div><div class='del'>-</div><div class='del'>-	__asm__("mull %2"</div><div class='del'>-		:"=a" (eax), "=d" (edx)</div><div class='del'>-		:"rm" (fast_gettimeoffset_quotient),</div><div class='del'>-		 "0" (eax));</div><div class='del'>-</div><div class='del'>-	/* our adjusted time offset in microseconds */</div><div class='del'>-	return delay_at_last_interrupt + edx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long long monotonic_clock_tsc(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long last_offset, this_offset, base;</div><div class='del'>-	unsigned seq;</div><div class='del'>-	</div><div class='del'>-	/* atomically read monotonic base &amp; last_offset */</div><div class='del'>-	do {</div><div class='del'>-		seq = read_seqbegin(&amp;monotonic_lock);</div><div class='del'>-		last_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-		base = monotonic_base;</div><div class='del'>-	} while (read_seqretry(&amp;monotonic_lock, seq));</div><div class='del'>-</div><div class='del'>-	/* Read the Time Stamp Counter */</div><div class='del'>-	rdtscll(this_offset);</div><div class='del'>-</div><div class='del'>-	/* return the value in ns */</div><div class='del'>-	return base + cycles_2_ns(this_offset - last_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Scheduler clock - returns current time in nanosec units.</div><div class='del'>- */</div><div class='del'>-unsigned long long sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long this_offset;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In the NUMA case we dont use the TSC as they are not</div><div class='del'>-	 * synchronized across all CPUs.</div><div class='del'>-	 */</div><div class='del'>-#ifndef CONFIG_NUMA</div><div class='del'>-	if (!use_tsc)</div><div class='del'>-#endif</div><div class='del'>-		/* no locking but a rare wrong value is not a big deal */</div><div class='del'>-		return jiffies_64 * (1000000000 / HZ);</div><div class='del'>-</div><div class='del'>-	/* Read the Time Stamp Counter */</div><div class='del'>-	rdtscll(this_offset);</div><div class='del'>-</div><div class='del'>-	/* return the value in ns */</div><div class='del'>-	return cycles_2_ns(this_offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delay_tsc(unsigned long loops)</div><div class='del'>-{</div><div class='del'>-	unsigned long bclock, now;</div><div class='del'>-	</div><div class='del'>-	rdtscl(bclock);</div><div class='del'>-	do</div><div class='del'>-	{</div><div class='del'>-		rep_nop();</div><div class='del'>-		rdtscl(now);</div><div class='del'>-	} while ((now-bclock) &lt; loops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-static void mark_offset_tsc_hpet(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long this_offset, last_offset;</div><div class='del'>- 	unsigned long offset, temp, hpet_current;</div><div class='del'>-</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	last_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-	/*</div><div class='del'>-	 * It is important that these two operations happen almost at</div><div class='del'>-	 * the same time. We do the RDTSC stuff first, since it's</div><div class='del'>-	 * faster. To avoid any inconsistencies, we need interrupts</div><div class='del'>-	 * disabled locally.</div><div class='del'>-	 */</div><div class='del'>-	/*</div><div class='del'>-	 * Interrupts are just disabled locally since the timer irq</div><div class='del'>-	 * has the SA_INTERRUPT flag set. -arca</div><div class='del'>-	 */</div><div class='del'>-	/* read Pentium cycle counter */</div><div class='del'>-</div><div class='del'>-	hpet_current = hpet_readl(HPET_COUNTER);</div><div class='del'>-	rdtsc(last_tsc_low, last_tsc_high);</div><div class='del'>-</div><div class='del'>-	/* lost tick compensation */</div><div class='del'>-	offset = hpet_readl(HPET_T0_CMP) - hpet_tick;</div><div class='del'>-	if (unlikely(((offset - hpet_last) &gt; hpet_tick) &amp;&amp; (hpet_last != 0))</div><div class='del'>-					&amp;&amp; detect_lost_ticks) {</div><div class='del'>-		int lost_ticks = (offset - hpet_last) / hpet_tick;</div><div class='del'>-		jiffies_64 += lost_ticks;</div><div class='del'>-	}</div><div class='del'>-	hpet_last = hpet_current;</div><div class='del'>-</div><div class='del'>-	/* update the monotonic base value */</div><div class='del'>-	this_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-	monotonic_base += cycles_2_ns(this_offset - last_offset);</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-</div><div class='del'>-	/* calculate delay_at_last_interrupt */</div><div class='del'>-	/*</div><div class='del'>-	 * Time offset = (hpet delta) * ( usecs per HPET clock )</div><div class='del'>-	 *             = (hpet delta) * ( usecs per tick / HPET clocks per tick)</div><div class='del'>-	 *             = (hpet delta) * ( hpet_usec_quotient ) / (2^32)</div><div class='del'>-	 * Where,</div><div class='del'>-	 * hpet_usec_quotient = (2^32 * usecs per tick)/HPET clocks per tick</div><div class='del'>-	 */</div><div class='del'>-	delay_at_last_interrupt = hpet_current - offset;</div><div class='del'>-	ASM_MUL64_REG(temp, delay_at_last_interrupt,</div><div class='del'>-			hpet_usec_quotient, delay_at_last_interrupt);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CPU_FREQ</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned int cpufreq_delayed_issched = 0;</div><div class='del'>-static unsigned int cpufreq_init = 0;</div><div class='del'>-static struct work_struct cpufreq_delayed_get_work;</div><div class='del'>-</div><div class='del'>-static void handle_cpufreq_delayed_get(void *v)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu;</div><div class='del'>-	for_each_online_cpu(cpu) {</div><div class='del'>-		cpufreq_get(cpu);</div><div class='del'>-	}</div><div class='del'>-	cpufreq_delayed_issched = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* if we notice lost ticks, schedule a call to cpufreq_get() as it tries</div><div class='del'>- * to verify the CPU frequency the timing core thinks the CPU is running</div><div class='del'>- * at is still correct.</div><div class='del'>- */</div><div class='del'>-static inline void cpufreq_delayed_get(void) </div><div class='del'>-{</div><div class='del'>-	if (cpufreq_init &amp;&amp; !cpufreq_delayed_issched) {</div><div class='del'>-		cpufreq_delayed_issched = 1;</div><div class='del'>-		printk(KERN_DEBUG "Losing some ticks... checking if CPU frequency changed.\n");</div><div class='del'>-		schedule_work(&amp;cpufreq_delayed_get_work);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* If the CPU frequency is scaled, TSC-based delays will need a different</div><div class='del'>- * loops_per_jiffy value to function properly.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned int  ref_freq = 0;</div><div class='del'>-static unsigned long loops_per_jiffy_ref = 0;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-static unsigned long fast_gettimeoffset_ref = 0;</div><div class='del'>-static unsigned int cpu_khz_ref = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,</div><div class='del'>-		       void *data)</div><div class='del'>-{</div><div class='del'>-	struct cpufreq_freqs *freq = data;</div><div class='del'>-</div><div class='del'>-	if (val != CPUFREQ_RESUMECHANGE &amp;&amp; val != CPUFREQ_SUSPENDCHANGE)</div><div class='del'>-		write_seqlock_irq(&amp;xtime_lock);</div><div class='del'>-	if (!ref_freq) {</div><div class='del'>-		if (!freq-&gt;old){</div><div class='del'>-			ref_freq = freq-&gt;new;</div><div class='del'>-			goto end;</div><div class='del'>-		}</div><div class='del'>-		ref_freq = freq-&gt;old;</div><div class='del'>-		loops_per_jiffy_ref = cpu_data[freq-&gt;cpu].loops_per_jiffy;</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-		fast_gettimeoffset_ref = fast_gettimeoffset_quotient;</div><div class='del'>-		cpu_khz_ref = cpu_khz;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((val == CPUFREQ_PRECHANGE  &amp;&amp; freq-&gt;old &lt; freq-&gt;new) ||</div><div class='del'>-	    (val == CPUFREQ_POSTCHANGE &amp;&amp; freq-&gt;old &gt; freq-&gt;new) ||</div><div class='del'>-	    (val == CPUFREQ_RESUMECHANGE)) {</div><div class='del'>-		if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS))</div><div class='del'>-			cpu_data[freq-&gt;cpu].loops_per_jiffy = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq-&gt;new);</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-		if (cpu_khz)</div><div class='del'>-			cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq-&gt;new);</div><div class='del'>-		if (use_tsc) {</div><div class='del'>-			if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS)) {</div><div class='del'>-				fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_ref, freq-&gt;new, ref_freq);</div><div class='del'>-				set_cyc2ns_scale(cpu_khz);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-	if (val != CPUFREQ_RESUMECHANGE &amp;&amp; val != CPUFREQ_SUSPENDCHANGE)</div><div class='del'>-		write_sequnlock_irq(&amp;xtime_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct notifier_block time_cpufreq_notifier_block = {</div><div class='del'>-	.notifier_call	= time_cpufreq_notifier</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init cpufreq_tsc(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	INIT_WORK(&amp;cpufreq_delayed_get_work, handle_cpufreq_delayed_get, NULL);</div><div class='del'>-	ret = cpufreq_register_notifier(&amp;time_cpufreq_notifier_block,</div><div class='del'>-					CPUFREQ_TRANSITION_NOTIFIER);</div><div class='del'>-	if (!ret)</div><div class='del'>-		cpufreq_init = 1;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-core_initcall(cpufreq_tsc);</div><div class='del'>-</div><div class='del'>-#else /* CONFIG_CPU_FREQ */</div><div class='del'>-static inline void cpufreq_delayed_get(void) { return; }</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-int recalibrate_cpu_khz(void)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-	unsigned int cpu_khz_old = cpu_khz;</div><div class='del'>-</div><div class='del'>-	if (cpu_has_tsc) {</div><div class='del'>-		local_irq_disable();</div><div class='del'>-		init_cpu_khz();</div><div class='del'>-		local_irq_enable();</div><div class='del'>-		cpu_data[0].loops_per_jiffy =</div><div class='del'>-		    cpufreq_scale(cpu_data[0].loops_per_jiffy,</div><div class='del'>-			          cpu_khz_old,</div><div class='del'>-				  cpu_khz);</div><div class='del'>-		return 0;</div><div class='del'>-	} else</div><div class='del'>-		return -ENODEV;</div><div class='del'>-#else</div><div class='del'>-	return -ENODEV;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(recalibrate_cpu_khz);</div><div class='del'>-</div><div class='del'>-static void mark_offset_tsc(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long lost,delay;</div><div class='del'>-	unsigned long delta = last_tsc_low;</div><div class='del'>-	int count;</div><div class='del'>-	int countmp;</div><div class='del'>-	static int count1 = 0;</div><div class='del'>-	unsigned long long this_offset, last_offset;</div><div class='del'>-	static int lost_count = 0;</div><div class='del'>-</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	last_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-	/*</div><div class='del'>-	 * It is important that these two operations happen almost at</div><div class='del'>-	 * the same time. We do the RDTSC stuff first, since it's</div><div class='del'>-	 * faster. To avoid any inconsistencies, we need interrupts</div><div class='del'>-	 * disabled locally.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Interrupts are just disabled locally since the timer irq</div><div class='del'>-	 * has the SA_INTERRUPT flag set. -arca</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* read Pentium cycle counter */</div><div class='del'>-</div><div class='del'>-	rdtsc(last_tsc_low, last_tsc_high);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;i8253_lock);</div><div class='del'>-	outb_p(0x00, PIT_MODE);     /* latch the count ASAP */</div><div class='del'>-</div><div class='del'>-	count = inb_p(PIT_CH0);    /* read the latched count */</div><div class='del'>-	count |= inb(PIT_CH0) &lt;&lt; 8;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * VIA686a test code... reset the latch if count &gt; max + 1</div><div class='del'>-	 * from timer_pit.c - cjb</div><div class='del'>-	 */</div><div class='del'>-	if (count &gt; LATCH) {</div><div class='del'>-		outb_p(0x34, PIT_MODE);</div><div class='del'>-		outb_p(LATCH &amp; 0xff, PIT_CH0);</div><div class='del'>-		outb(LATCH &gt;&gt; 8, PIT_CH0);</div><div class='del'>-		count = LATCH - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;i8253_lock);</div><div class='del'>-</div><div class='del'>-	if (pit_latch_buggy) {</div><div class='del'>-		/* get center value of last 3 time lutch */</div><div class='del'>-		if ((count2 &gt;= count &amp;&amp; count &gt;= count1)</div><div class='del'>-		    || (count1 &gt;= count &amp;&amp; count &gt;= count2)) {</div><div class='del'>-			count2 = count1; count1 = count;</div><div class='del'>-		} else if ((count1 &gt;= count2 &amp;&amp; count2 &gt;= count)</div><div class='del'>-			   || (count &gt;= count2 &amp;&amp; count2 &gt;= count1)) {</div><div class='del'>-			countmp = count;count = count2;</div><div class='del'>-			count2 = count1;count1 = countmp;</div><div class='del'>-		} else {</div><div class='del'>-			count2 = count1; count1 = count; count = count1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* lost tick compensation */</div><div class='del'>-	delta = last_tsc_low - delta;</div><div class='del'>-	{</div><div class='del'>-		register unsigned long eax, edx;</div><div class='del'>-		eax = delta;</div><div class='del'>-		__asm__("mull %2"</div><div class='del'>-		:"=a" (eax), "=d" (edx)</div><div class='del'>-		:"rm" (fast_gettimeoffset_quotient),</div><div class='del'>-		 "0" (eax));</div><div class='del'>-		delta = edx;</div><div class='del'>-	}</div><div class='del'>-	delta += delay_at_last_interrupt;</div><div class='del'>-	lost = delta/(1000000/HZ);</div><div class='del'>-	delay = delta%(1000000/HZ);</div><div class='del'>-	if (lost &gt;= 2 &amp;&amp; detect_lost_ticks) {</div><div class='del'>-		jiffies_64 += lost-1;</div><div class='del'>-</div><div class='del'>-		/* sanity check to ensure we're not always losing ticks */</div><div class='del'>-		if (lost_count++ &gt; 100) {</div><div class='del'>-			printk(KERN_WARNING "Losing too many ticks!\n");</div><div class='del'>-			printk(KERN_WARNING "TSC cannot be used as a timesource.  \n");</div><div class='del'>-			printk(KERN_WARNING "Possible reasons for this are:\n");</div><div class='del'>-			printk(KERN_WARNING "  You're running with Speedstep,\n");</div><div class='del'>-			printk(KERN_WARNING "  You don't have DMA enabled for your hard disk (see hdparm),\n");</div><div class='del'>-			printk(KERN_WARNING "  Incorrect TSC synchronization on an SMP system (see dmesg).\n");</div><div class='del'>-			printk(KERN_WARNING "Falling back to a sane timesource now.\n");</div><div class='del'>-</div><div class='del'>-			clock_fallback();</div><div class='del'>-		}</div><div class='del'>-		/* ... but give the TSC a fair chance */</div><div class='del'>-		if (lost_count &gt; 25)</div><div class='del'>-			cpufreq_delayed_get();</div><div class='del'>-	} else</div><div class='del'>-		lost_count = 0;</div><div class='del'>-	/* update the monotonic base value */</div><div class='del'>-	this_offset = ((unsigned long long)last_tsc_high&lt;&lt;32)|last_tsc_low;</div><div class='del'>-	monotonic_base += cycles_2_ns(this_offset - last_offset);</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-</div><div class='del'>-	/* calculate delay_at_last_interrupt */</div><div class='del'>-	count = ((LATCH-1) - count) * TICK_SIZE;</div><div class='del'>-	delay_at_last_interrupt = (count + LATCH/2) / LATCH;</div><div class='del'>-</div><div class='del'>-	/* catch corner case where tick rollover occured</div><div class='del'>-	 * between tsc and pit reads (as noted when</div><div class='del'>-	 * usec delta is &gt; 90% # of usecs/tick)</div><div class='del'>-	 */</div><div class='del'>-	if (lost &amp;&amp; abs(delay - delay_at_last_interrupt) &gt; (900000/HZ))</div><div class='del'>-		jiffies_64++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_tsc(char* override)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* check clock override */</div><div class='del'>-	if (override[0] &amp;&amp; strncmp(override,"tsc",3)) {</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-		if (is_hpet_enabled()) {</div><div class='del'>-			printk(KERN_ERR "Warning: clock= override failed. Defaulting to tsc\n");</div><div class='del'>-		} else</div><div class='del'>-#endif</div><div class='del'>-		{</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we have APM enabled or the CPU clock speed is variable</div><div class='del'>-	 * (CPU stops clock on HLT or slows clock to save power)</div><div class='del'>-	 * then the TSC timestamps may diverge by up to 1 jiffy from</div><div class='del'>-	 * 'real time' but nothing will break.</div><div class='del'>-	 * The most frequent case is that the CPU is "woken" from a halt</div><div class='del'>-	 * state by the timer interrupt itself, so we get 0 error. In the</div><div class='del'>-	 * rare cases where a driver would "wake" the CPU and request a</div><div class='del'>-	 * timestamp, the maximum error is &lt; 1 jiffy. But timestamps are</div><div class='del'>-	 * still perfectly ordered.</div><div class='del'>-	 * Note that the TSC counter will be reset if APM suspends</div><div class='del'>-	 * to disk; this won't break the kernel, though, 'cuz we're</div><div class='del'>-	 * smart.  See arch/i386/kernel/apm.c.</div><div class='del'>-	 */</div><div class='del'>- 	/*</div><div class='del'>- 	 *	Firstly we have to do a CPU check for chips with</div><div class='del'>- 	 * 	a potentially buggy TSC. At this point we haven't run</div><div class='del'>- 	 *	the ident/bugs checks so we must run this hook as it</div><div class='del'>- 	 *	may turn off the TSC flag.</div><div class='del'>- 	 *</div><div class='del'>- 	 *	NOTE: this doesn't yet handle SMP 486 machines where only</div><div class='del'>- 	 *	some CPU's have a TSC. Thats never worked and nobody has</div><div class='del'>- 	 *	moaned if you have the only one in the world - you fix it!</div><div class='del'>- 	 */</div><div class='del'>-</div><div class='del'>-	count2 = LATCH; /* initialize counter for mark_offset_tsc() */</div><div class='del'>-</div><div class='del'>-	if (cpu_has_tsc) {</div><div class='del'>-		unsigned long tsc_quotient;</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-		if (is_hpet_enabled() &amp;&amp; hpet_use_timer) {</div><div class='del'>-			unsigned long result, remain;</div><div class='del'>-			printk("Using TSC for gettimeofday\n");</div><div class='del'>-			tsc_quotient = calibrate_tsc_hpet(NULL);</div><div class='del'>-			timer_tsc.mark_offset = &amp;mark_offset_tsc_hpet;</div><div class='del'>-			/*</div><div class='del'>-			 * Math to calculate hpet to usec multiplier</div><div class='del'>-			 * Look for the comments at get_offset_tsc_hpet()</div><div class='del'>-			 */</div><div class='del'>-			ASM_DIV64_REG(result, remain, hpet_tick,</div><div class='del'>-					0, KERNEL_TICK_USEC);</div><div class='del'>-			if (remain &gt; (hpet_tick &gt;&gt; 1))</div><div class='del'>-				result++; /* rounding the result */</div><div class='del'>-</div><div class='del'>-			hpet_usec_quotient = result;</div><div class='del'>-		} else</div><div class='del'>-#endif</div><div class='del'>-		{</div><div class='del'>-			tsc_quotient = calibrate_tsc();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (tsc_quotient) {</div><div class='del'>-			fast_gettimeoffset_quotient = tsc_quotient;</div><div class='del'>-			use_tsc = 1;</div><div class='del'>-			/*</div><div class='del'>-			 *	We could be more selective here I suspect</div><div class='del'>-			 *	and just enable this for the next intel chips ?</div><div class='del'>-			 */</div><div class='del'>-			/* report CPU clock rate in Hz.</div><div class='del'>-			 * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) =</div><div class='del'>-			 * clock/second. Our precision is about 100 ppm.</div><div class='del'>-			 */</div><div class='del'>-			{	unsigned long eax=0, edx=1000;</div><div class='del'>-				__asm__("divl %2"</div><div class='del'>-		       		:"=a" (cpu_khz), "=d" (edx)</div><div class='del'>-        	       		:"r" (tsc_quotient),</div><div class='del'>-	                	"0" (eax), "1" (edx));</div><div class='del'>-				printk("Detected %u.%03u MHz processor.\n",</div><div class='del'>-					cpu_khz / 1000, cpu_khz % 1000);</div><div class='del'>-			}</div><div class='del'>-			set_cyc2ns_scale(cpu_khz);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tsc_resume(void)</div><div class='del'>-{</div><div class='del'>-	write_seqlock(&amp;monotonic_lock);</div><div class='del'>-	/* Assume this is the last mark offset time */</div><div class='del'>-	rdtsc(last_tsc_low, last_tsc_high);</div><div class='del'>-#ifdef CONFIG_HPET_TIMER</div><div class='del'>-	if (is_hpet_enabled() &amp;&amp; hpet_use_timer)</div><div class='del'>-		hpet_last = hpet_readl(HPET_COUNTER);</div><div class='del'>-#endif</div><div class='del'>-	write_sequnlock(&amp;monotonic_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_X86_TSC</div><div class='del'>-/* disable flag for tsc.  Takes effect by clearing the TSC cpu flag</div><div class='del'>- * in cpu/common.c */</div><div class='del'>-static int __init tsc_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	tsc_disable = 1;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static int __init tsc_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, "</div><div class='del'>-				"cannot disable TSC.\n");</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-__setup("notsc", tsc_setup);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/************************************************************/</div><div class='del'>-</div><div class='del'>-/* tsc timer_opts struct */</div><div class='del'>-static struct timer_opts timer_tsc = {</div><div class='del'>-	.name = "tsc",</div><div class='del'>-	.mark_offset = mark_offset_tsc, </div><div class='del'>-	.get_offset = get_offset_tsc,</div><div class='del'>-	.monotonic_clock = monotonic_clock_tsc,</div><div class='del'>-	.delay = delay_tsc,</div><div class='del'>-	.read_timer = read_timer_tsc,</div><div class='del'>-	.resume	= tsc_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct init_timer_opts __initdata timer_tsc_init = {</div><div class='del'>-	.init = init_tsc,</div><div class='del'>-	.opts = &amp;timer_tsc,</div><div class='del'>-};</div><div class='head'>diff --git a/arch/i386/kernel/topology.c b/arch/i386/kernel/topology.c<br/>index 296355292c7c..e2e281d4bcc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/topology.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/topology.c</a></div><div class='hunk'>@@ -32,15 +32,8 @@</div><div class='ctx'> </div><div class='ctx'> static struct i386_cpu cpu_devices[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-int arch_register_cpu(int num){</div><div class='del'>-	struct node *parent = NULL;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	int node = cpu_to_node(num);</div><div class='del'>-	if (node_online(node))</div><div class='del'>-		parent = &amp;node_devices[node].node;</div><div class='del'>-#endif /* CONFIG_NUMA */</div><div class='del'>-</div><div class='add'>+int arch_register_cpu(int num)</div><div class='add'>+{</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CPU0 cannot be offlined due to several</div><div class='ctx'> 	 * restrictions and assumptions in kernel. This basically</div><div class='hunk'>@@ -50,21 +43,13 @@ int arch_register_cpu(int num){</div><div class='ctx'> 	if (!num)</div><div class='ctx'> 		cpu_devices[num].cpu.no_control = 1;</div><div class='ctx'> </div><div class='del'>-	return register_cpu(&amp;cpu_devices[num].cpu, num, parent);</div><div class='add'>+	return register_cpu(&amp;cpu_devices[num].cpu, num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> </div><div class='ctx'> void arch_unregister_cpu(int num) {</div><div class='del'>-	struct node *parent = NULL;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	int node = cpu_to_node(num);</div><div class='del'>-	if (node_online(node))</div><div class='del'>-		parent = &amp;node_devices[node].node;</div><div class='del'>-#endif /* CONFIG_NUMA */</div><div class='del'>-</div><div class='del'>-	return unregister_cpu(&amp;cpu_devices[num].cpu, parent);</div><div class='add'>+	return unregister_cpu(&amp;cpu_devices[num].cpu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(arch_register_cpu);</div><div class='ctx'> EXPORT_SYMBOL(arch_unregister_cpu);</div><div class='hunk'>@@ -74,16 +59,13 @@ EXPORT_SYMBOL(arch_unregister_cpu);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='del'>-#include &lt;asm/node.h&gt;</div><div class='del'>-</div><div class='del'>-struct i386_node node_devices[MAX_NUMNODES];</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_node(i)</div><div class='del'>-		arch_register_node(i);</div><div class='add'>+		register_one_node(i);</div><div class='ctx'> </div><div class='ctx'> 	for_each_present_cpu(i)</div><div class='ctx'> 		arch_register_cpu(i);</div><div class='head'>diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c<br/>index 0e498369f35e..313ac1f7dc5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/traps.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * 'Traps.c' handles hardware traps and faults after we have saved some</div><div class='ctx'>  * state in 'asm.s'.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -28,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/unwind.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EISA</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> #include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='hunk'>@@ -92,6 +92,7 @@ asmlinkage void spurious_interrupt_bug(void);</div><div class='ctx'> asmlinkage void machine_check(void);</div><div class='ctx'> </div><div class='ctx'> static int kstack_depth_to_print = 24;</div><div class='add'>+static int call_trace = 1;</div><div class='ctx'> ATOMIC_NOTIFIER_HEAD(i386die_chain);</div><div class='ctx'> </div><div class='ctx'> int register_die_notifier(struct notifier_block *nb)</div><div class='hunk'>@@ -99,13 +100,13 @@ int register_die_notifier(struct notifier_block *nb)</div><div class='ctx'> 	vmalloc_sync_all();</div><div class='ctx'> 	return atomic_notifier_chain_register(&amp;i386die_chain, nb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(register_die_notifier);</div><div class='add'>+EXPORT_SYMBOL(register_die_notifier); /* used modular by kdb */</div><div class='ctx'> </div><div class='ctx'> int unregister_die_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_notifier_chain_unregister(&amp;i386die_chain, nb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(unregister_die_notifier);</div><div class='add'>+EXPORT_SYMBOL(unregister_die_notifier); /* used modular by kdb */</div><div class='ctx'> </div><div class='ctx'> static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -114,28 +115,13 @@ static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Print CONFIG_STACK_BACKTRACE_COLS address/symbol entries per line.</div><div class='add'>+ * Print one address/symbol entries per line.</div><div class='ctx'>  */</div><div class='del'>-static inline int print_addr_and_symbol(unsigned long addr, char *log_lvl,</div><div class='del'>-					int printed)</div><div class='add'>+static inline void print_addr_and_symbol(unsigned long addr, char *log_lvl)</div><div class='ctx'> {</div><div class='del'>-	if (!printed)</div><div class='del'>-		printk(log_lvl);</div><div class='del'>-</div><div class='del'>-#if CONFIG_STACK_BACKTRACE_COLS == 1</div><div class='ctx'> 	printk(" [&lt;%08lx&gt;] ", addr);</div><div class='del'>-#else</div><div class='del'>-	printk(" &lt;%08lx&gt; ", addr);</div><div class='del'>-#endif</div><div class='del'>-	print_symbol("%s", addr);</div><div class='ctx'> </div><div class='del'>-	printed = (printed + 1) % CONFIG_STACK_BACKTRACE_COLS;</div><div class='del'>-	if (printed)</div><div class='del'>-		printk(" ");</div><div class='del'>-	else</div><div class='del'>-		printk("\n");</div><div class='del'>-</div><div class='del'>-	return printed;</div><div class='add'>+	print_symbol("%s\n", addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long print_context_stack(struct thread_info *tinfo,</div><div class='hunk'>@@ -143,28 +129,44 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo,</div><div class='ctx'> 				char *log_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='del'>-	int printed = 0; /* nr of entries already printed on current line */</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_FRAME_POINTER</div><div class='ctx'> 	while (valid_stack_ptr(tinfo, (void *)ebp)) {</div><div class='ctx'> 		addr = *(unsigned long *)(ebp + 4);</div><div class='del'>-		printed = print_addr_and_symbol(addr, log_lvl, printed);</div><div class='add'>+		print_addr_and_symbol(addr, log_lvl);</div><div class='add'>+		/*</div><div class='add'>+		 * break out of recursive entries (such as</div><div class='add'>+		 * end_of_stack_stop_unwind_function):</div><div class='add'>+	 	 */</div><div class='add'>+		if (ebp == *(unsigned long *)ebp)</div><div class='add'>+			break;</div><div class='ctx'> 		ebp = *(unsigned long *)ebp;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	while (valid_stack_ptr(tinfo, stack)) {</div><div class='ctx'> 		addr = *stack++;</div><div class='ctx'> 		if (__kernel_text_address(addr))</div><div class='del'>-			printed = print_addr_and_symbol(addr, log_lvl, printed);</div><div class='add'>+			print_addr_and_symbol(addr, log_lvl);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if (printed)</div><div class='del'>-		printk("\n");</div><div class='del'>-</div><div class='ctx'> 	return ebp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void show_trace_log_lvl(struct task_struct *task,</div><div class='add'>+static asmlinkage int</div><div class='add'>+show_trace_unwind(struct unwind_frame_info *info, void *log_lvl)</div><div class='add'>+{</div><div class='add'>+	int n = 0;</div><div class='add'>+</div><div class='add'>+	while (unwind(info) == 0 &amp;&amp; UNW_PC(info)) {</div><div class='add'>+		n++;</div><div class='add'>+		print_addr_and_symbol(UNW_PC(info), log_lvl);</div><div class='add'>+		if (arch_unw_user_mode(info))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='ctx'> 			       unsigned long *stack, char *log_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ebp;</div><div class='hunk'>@@ -172,6 +174,26 @@ static void show_trace_log_lvl(struct task_struct *task,</div><div class='ctx'> 	if (!task)</div><div class='ctx'> 		task = current;</div><div class='ctx'> </div><div class='add'>+	if (call_trace &gt;= 0) {</div><div class='add'>+		int unw_ret = 0;</div><div class='add'>+		struct unwind_frame_info info;</div><div class='add'>+</div><div class='add'>+		if (regs) {</div><div class='add'>+			if (unwind_init_frame_info(&amp;info, task, regs) == 0)</div><div class='add'>+				unw_ret = show_trace_unwind(&amp;info, log_lvl);</div><div class='add'>+		} else if (task == current)</div><div class='add'>+			unw_ret = unwind_init_running(&amp;info, show_trace_unwind, log_lvl);</div><div class='add'>+		else {</div><div class='add'>+			if (unwind_init_blocked(&amp;info, task) == 0)</div><div class='add'>+				unw_ret = show_trace_unwind(&amp;info, log_lvl);</div><div class='add'>+		}</div><div class='add'>+		if (unw_ret &gt; 0) {</div><div class='add'>+			if (call_trace &gt; 0)</div><div class='add'>+				return;</div><div class='add'>+			printk("%sLegacy call trace:\n", log_lvl);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (task == current) {</div><div class='ctx'> 		/* Grab ebp right from our regs */</div><div class='ctx'> 		asm ("movl %%ebp, %0" : "=r" (ebp) : );</div><div class='hunk'>@@ -192,13 +214,13 @@ static void show_trace_log_lvl(struct task_struct *task,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_trace(struct task_struct *task, unsigned long * stack)</div><div class='add'>+void show_trace(struct task_struct *task, struct pt_regs *regs, unsigned long * stack)</div><div class='ctx'> {</div><div class='del'>-	show_trace_log_lvl(task, stack, "");</div><div class='add'>+	show_trace_log_lvl(task, regs, stack, "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp,</div><div class='del'>-			       char *log_lvl)</div><div class='add'>+static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,</div><div class='add'>+			       unsigned long *esp, char *log_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *stack;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -219,13 +241,13 @@ static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp,</div><div class='ctx'> 		printk("%08lx ", *stack++);</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("\n%sCall Trace:\n", log_lvl);</div><div class='del'>-	show_trace_log_lvl(task, esp, log_lvl);</div><div class='add'>+	show_trace_log_lvl(task, regs, esp, log_lvl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_stack(struct task_struct *task, unsigned long *esp)</div><div class='ctx'> {</div><div class='ctx'> 	printk("       ");</div><div class='del'>-	show_stack_log_lvl(task, esp, "");</div><div class='add'>+	show_stack_log_lvl(task, NULL, esp, "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -235,7 +257,7 @@ void dump_stack(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long stack;</div><div class='ctx'> </div><div class='del'>-	show_trace(current, &amp;stack);</div><div class='add'>+	show_trace(current, NULL, &amp;stack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dump_stack);</div><div class='hunk'>@@ -268,8 +290,9 @@ void show_registers(struct pt_regs *regs)</div><div class='ctx'> 		regs-&gt;esi, regs-&gt;edi, regs-&gt;ebp, esp);</div><div class='ctx'> 	printk(KERN_EMERG "ds: %04x   es: %04x   ss: %04x\n",</div><div class='ctx'> 		regs-&gt;xds &amp; 0xffff, regs-&gt;xes &amp; 0xffff, ss);</div><div class='del'>-	printk(KERN_EMERG "Process %s (pid: %d, threadinfo=%p task=%p)",</div><div class='del'>-		current-&gt;comm, current-&gt;pid, current_thread_info(), current);</div><div class='add'>+	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",</div><div class='add'>+		TASK_COMM_LEN, current-&gt;comm, current-&gt;pid,</div><div class='add'>+		current_thread_info(), current, current-&gt;thread_info);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When in-kernel, we also print out the stack and code at the</div><div class='ctx'> 	 * time of the fault..</div><div class='hunk'>@@ -278,7 +301,7 @@ void show_registers(struct pt_regs *regs)</div><div class='ctx'> 		u8 __user *eip;</div><div class='ctx'> </div><div class='ctx'> 		printk("\n" KERN_EMERG "Stack: ");</div><div class='del'>-		show_stack_log_lvl(NULL, (unsigned long *)esp, KERN_EMERG);</div><div class='add'>+		show_stack_log_lvl(NULL, regs, (unsigned long *)esp, KERN_EMERG);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_EMERG "Code: ");</div><div class='ctx'> </div><div class='hunk'>@@ -301,35 +324,35 @@ void show_registers(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static void handle_BUG(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	unsigned long eip = regs-&gt;eip;</div><div class='ctx'> 	unsigned short ud2;</div><div class='del'>-	unsigned short line;</div><div class='del'>-	char *file;</div><div class='del'>-	char c;</div><div class='del'>-	unsigned long eip;</div><div class='del'>-</div><div class='del'>-	eip = regs-&gt;eip;</div><div class='ctx'> </div><div class='ctx'> 	if (eip &lt; PAGE_OFFSET)</div><div class='del'>-		goto no_bug;</div><div class='add'>+		return;</div><div class='ctx'> 	if (__get_user(ud2, (unsigned short __user *)eip))</div><div class='del'>-		goto no_bug;</div><div class='add'>+		return;</div><div class='ctx'> 	if (ud2 != 0x0b0f)</div><div class='del'>-		goto no_bug;</div><div class='del'>-	if (__get_user(line, (unsigned short __user *)(eip + 2)))</div><div class='del'>-		goto bug;</div><div class='del'>-	if (__get_user(file, (char * __user *)(eip + 4)) ||</div><div class='del'>-		(unsigned long)file &lt; PAGE_OFFSET || __get_user(c, file))</div><div class='del'>-		file = "&lt;bad filename&gt;";</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_EMERG "------------[ cut here ]------------\n");</div><div class='del'>-	printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);</div><div class='ctx'> </div><div class='del'>-no_bug:</div><div class='del'>-	return;</div><div class='add'>+#ifdef CONFIG_DEBUG_BUGVERBOSE</div><div class='add'>+	do {</div><div class='add'>+		unsigned short line;</div><div class='add'>+		char *file;</div><div class='add'>+		char c;</div><div class='ctx'> </div><div class='del'>-	/* Here we know it was a BUG but file-n-line is unavailable */</div><div class='del'>-bug:</div><div class='del'>-	printk(KERN_EMERG "Kernel BUG\n");</div><div class='add'>+		if (__get_user(line, (unsigned short __user *)(eip + 2)))</div><div class='add'>+			break;</div><div class='add'>+		if (__get_user(file, (char * __user *)(eip + 4)) ||</div><div class='add'>+		    (unsigned long)file &lt; PAGE_OFFSET || __get_user(c, file))</div><div class='add'>+			file = "&lt;bad filename&gt;";</div><div class='add'>+</div><div class='add'>+		printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);</div><div class='add'>+		return;</div><div class='add'>+	} while (0);</div><div class='add'>+#endif</div><div class='add'>+	printk(KERN_EMERG "Kernel BUG at [verbose debug info unavailable]\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This is gone through when something in the kernel</div><div class='hunk'>@@ -1208,3 +1231,15 @@ static int __init kstack_setup(char *s)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> __setup("kstack=", kstack_setup);</div><div class='add'>+</div><div class='add'>+static int __init call_trace_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(s, "old") == 0)</div><div class='add'>+		call_trace = -1;</div><div class='add'>+	else if (strcmp(s, "both") == 0)</div><div class='add'>+		call_trace = 0;</div><div class='add'>+	else if (strcmp(s, "new") == 0)</div><div class='add'>+		call_trace = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("call_trace=", call_trace_setup);</div><div class='head'>diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c<br/>new file mode 100644<br/>index 000000000000..7e0d8dab2075<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/tsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/tsc.c</a></div><div class='hunk'>@@ -0,0 +1,478 @@</div><div class='add'>+/*</div><div class='add'>+ * This code largely moved from arch/i386/kernel/timer/timer_tsc.c</div><div class='add'>+ * which was originally moved from arch/i386/kernel/time.c.</div><div class='add'>+ * See comments there for proper credits.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/cpufreq.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/delay.h&gt;</div><div class='add'>+#include &lt;asm/tsc.h&gt;</div><div class='add'>+#include &lt;asm/delay.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mach_timer.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * On some systems the TSC frequency does not</div><div class='add'>+ * change with the cpu frequency. So we need</div><div class='add'>+ * an extra value to store the TSC freq</div><div class='add'>+ */</div><div class='add'>+unsigned int tsc_khz;</div><div class='add'>+</div><div class='add'>+int tsc_disable __cpuinitdata = 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_TSC</div><div class='add'>+static int __init tsc_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, "</div><div class='add'>+				"cannot disable TSC.\n");</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+/*</div><div class='add'>+ * disable flag for tsc. Takes effect by clearing the TSC cpu flag</div><div class='add'>+ * in cpu/common.c</div><div class='add'>+ */</div><div class='add'>+static int __init tsc_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	tsc_disable = 1;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+__setup("notsc", tsc_setup);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * code to mark and check if the TSC is unstable</div><div class='add'>+ * due to cpufreq or due to unsynced TSCs</div><div class='add'>+ */</div><div class='add'>+static int tsc_unstable;</div><div class='add'>+</div><div class='add'>+static inline int check_tsc_unstable(void)</div><div class='add'>+{</div><div class='add'>+	return tsc_unstable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mark_tsc_unstable(void)</div><div class='add'>+{</div><div class='add'>+	tsc_unstable = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(mark_tsc_unstable);</div><div class='add'>+</div><div class='add'>+/* Accellerators for sched_clock()</div><div class='add'>+ * convert from cycles(64bits) =&gt; nanoseconds (64bits)</div><div class='add'>+ *  basic equation:</div><div class='add'>+ *		ns = cycles / (freq / ns_per_sec)</div><div class='add'>+ *		ns = cycles * (ns_per_sec / freq)</div><div class='add'>+ *		ns = cycles * (10^9 / (cpu_khz * 10^3))</div><div class='add'>+ *		ns = cycles * (10^6 / cpu_khz)</div><div class='add'>+ *</div><div class='add'>+ *	Then we use scaling math (suggested by george@mvista.com) to get:</div><div class='add'>+ *		ns = cycles * (10^6 * SC / cpu_khz) / SC</div><div class='add'>+ *		ns = cycles * cyc2ns_scale / SC</div><div class='add'>+ *</div><div class='add'>+ *	And since SC is a constant power of two, we can convert the div</div><div class='add'>+ *  into a shift.</div><div class='add'>+ *</div><div class='add'>+ *  We can use khz divisor instead of mhz to keep a better percision, since</div><div class='add'>+ *  cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits.</div><div class='add'>+ *  (mathieu.desnoyers@polymtl.ca)</div><div class='add'>+ *</div><div class='add'>+ *			-johnstul@us.ibm.com "math is hard, lets go shopping!"</div><div class='add'>+ */</div><div class='add'>+static unsigned long cyc2ns_scale __read_mostly;</div><div class='add'>+</div><div class='add'>+#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */</div><div class='add'>+</div><div class='add'>+static inline void set_cyc2ns_scale(unsigned long cpu_khz)</div><div class='add'>+{</div><div class='add'>+	cyc2ns_scale = (1000000 &lt;&lt; CYC2NS_SCALE_FACTOR)/cpu_khz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long long cycles_2_ns(unsigned long long cyc)</div><div class='add'>+{</div><div class='add'>+	return (cyc * cyc2ns_scale) &gt;&gt; CYC2NS_SCALE_FACTOR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scheduler clock - returns current time in nanosec units.</div><div class='add'>+ */</div><div class='add'>+unsigned long long sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long long this_offset;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * in the NUMA case we dont use the TSC as they are not</div><div class='add'>+	 * synchronized across all CPUs.</div><div class='add'>+	 */</div><div class='add'>+#ifndef CONFIG_NUMA</div><div class='add'>+	if (!cpu_khz || check_tsc_unstable())</div><div class='add'>+#endif</div><div class='add'>+		/* no locking but a rare wrong value is not a big deal */</div><div class='add'>+		return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);</div><div class='add'>+</div><div class='add'>+	/* read the Time Stamp Counter: */</div><div class='add'>+	rdtscll(this_offset);</div><div class='add'>+</div><div class='add'>+	/* return the value in ns */</div><div class='add'>+	return cycles_2_ns(this_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long calculate_cpu_khz(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long long start, end;</div><div class='add'>+	unsigned long count;</div><div class='add'>+	u64 delta64;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+</div><div class='add'>+	/* run 3 times to ensure the cache is warm */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		mach_prepare_counter();</div><div class='add'>+		rdtscll(start);</div><div class='add'>+		mach_countup(&amp;count);</div><div class='add'>+		rdtscll(end);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Error: ECTCNEVERSET</div><div class='add'>+	 * The CTC wasn't reliable: we got a hit on the very first read,</div><div class='add'>+	 * or the CPU was so fast/slow that the quotient wouldn't fit in</div><div class='add'>+	 * 32 bits..</div><div class='add'>+	 */</div><div class='add'>+	if (count &lt;= 1)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	delta64 = end - start;</div><div class='add'>+</div><div class='add'>+	/* cpu freq too fast: */</div><div class='add'>+	if (delta64 &gt; (1ULL&lt;&lt;32))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* cpu freq too slow: */</div><div class='add'>+	if (delta64 &lt;= CALIBRATE_TIME_MSEC)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	delta64 += CALIBRATE_TIME_MSEC/2; /* round for do_div */</div><div class='add'>+	do_div(delta64,CALIBRATE_TIME_MSEC);</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return (unsigned long)delta64;</div><div class='add'>+err:</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int recalibrate_cpu_khz(void)</div><div class='add'>+{</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	unsigned long cpu_khz_old = cpu_khz;</div><div class='add'>+</div><div class='add'>+	if (cpu_has_tsc) {</div><div class='add'>+		cpu_khz = calculate_cpu_khz();</div><div class='add'>+		tsc_khz = cpu_khz;</div><div class='add'>+		cpu_data[0].loops_per_jiffy =</div><div class='add'>+			cpufreq_scale(cpu_data[0].loops_per_jiffy,</div><div class='add'>+					cpu_khz_old, cpu_khz);</div><div class='add'>+		return 0;</div><div class='add'>+	} else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+#else</div><div class='add'>+	return -ENODEV;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(recalibrate_cpu_khz);</div><div class='add'>+</div><div class='add'>+void tsc_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!cpu_has_tsc || tsc_disable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpu_khz = calculate_cpu_khz();</div><div class='add'>+	tsc_khz = cpu_khz;</div><div class='add'>+</div><div class='add'>+	if (!cpu_khz)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk("Detected %lu.%03lu MHz processor.\n",</div><div class='add'>+				(unsigned long)cpu_khz / 1000,</div><div class='add'>+				(unsigned long)cpu_khz % 1000);</div><div class='add'>+</div><div class='add'>+	set_cyc2ns_scale(cpu_khz);</div><div class='add'>+	use_tsc_delay();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_FREQ</div><div class='add'>+</div><div class='add'>+static unsigned int cpufreq_delayed_issched = 0;</div><div class='add'>+static unsigned int cpufreq_init = 0;</div><div class='add'>+static struct work_struct cpufreq_delayed_get_work;</div><div class='add'>+</div><div class='add'>+static void handle_cpufreq_delayed_get(void *v)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_online_cpu(cpu)</div><div class='add'>+		cpufreq_get(cpu);</div><div class='add'>+</div><div class='add'>+	cpufreq_delayed_issched = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * if we notice cpufreq oddness, schedule a call to cpufreq_get() as it tries</div><div class='add'>+ * to verify the CPU frequency the timing core thinks the CPU is running</div><div class='add'>+ * at is still correct.</div><div class='add'>+ */</div><div class='add'>+static inline void cpufreq_delayed_get(void)</div><div class='add'>+{</div><div class='add'>+	if (cpufreq_init &amp;&amp; !cpufreq_delayed_issched) {</div><div class='add'>+		cpufreq_delayed_issched = 1;</div><div class='add'>+		printk(KERN_DEBUG "Checking if CPU frequency changed.\n");</div><div class='add'>+		schedule_work(&amp;cpufreq_delayed_get_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * if the CPU frequency is scaled, TSC-based delays will need a different</div><div class='add'>+ * loops_per_jiffy value to function properly.</div><div class='add'>+ */</div><div class='add'>+static unsigned int ref_freq = 0;</div><div class='add'>+static unsigned long loops_per_jiffy_ref = 0;</div><div class='add'>+static unsigned long cpu_khz_ref = 0;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cpufreq_freqs *freq = data;</div><div class='add'>+</div><div class='add'>+	if (val != CPUFREQ_RESUMECHANGE &amp;&amp; val != CPUFREQ_SUSPENDCHANGE)</div><div class='add'>+		write_seqlock_irq(&amp;xtime_lock);</div><div class='add'>+</div><div class='add'>+	if (!ref_freq) {</div><div class='add'>+		if (!freq-&gt;old){</div><div class='add'>+			ref_freq = freq-&gt;new;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		ref_freq = freq-&gt;old;</div><div class='add'>+		loops_per_jiffy_ref = cpu_data[freq-&gt;cpu].loops_per_jiffy;</div><div class='add'>+		cpu_khz_ref = cpu_khz;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((val == CPUFREQ_PRECHANGE  &amp;&amp; freq-&gt;old &lt; freq-&gt;new) ||</div><div class='add'>+	    (val == CPUFREQ_POSTCHANGE &amp;&amp; freq-&gt;old &gt; freq-&gt;new) ||</div><div class='add'>+	    (val == CPUFREQ_RESUMECHANGE)) {</div><div class='add'>+		if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS))</div><div class='add'>+			cpu_data[freq-&gt;cpu].loops_per_jiffy =</div><div class='add'>+				cpufreq_scale(loops_per_jiffy_ref,</div><div class='add'>+						ref_freq, freq-&gt;new);</div><div class='add'>+</div><div class='add'>+		if (cpu_khz) {</div><div class='add'>+</div><div class='add'>+			if (num_online_cpus() == 1)</div><div class='add'>+				cpu_khz = cpufreq_scale(cpu_khz_ref,</div><div class='add'>+						ref_freq, freq-&gt;new);</div><div class='add'>+			if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS)) {</div><div class='add'>+				tsc_khz = cpu_khz;</div><div class='add'>+				set_cyc2ns_scale(cpu_khz);</div><div class='add'>+				/*</div><div class='add'>+				 * TSC based sched_clock turns</div><div class='add'>+				 * to junk w/ cpufreq</div><div class='add'>+				 */</div><div class='add'>+				mark_tsc_unstable();</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	if (val != CPUFREQ_RESUMECHANGE &amp;&amp; val != CPUFREQ_SUSPENDCHANGE)</div><div class='add'>+		write_sequnlock_irq(&amp;xtime_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block time_cpufreq_notifier_block = {</div><div class='add'>+	.notifier_call	= time_cpufreq_notifier</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cpufreq_tsc(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;cpufreq_delayed_get_work, handle_cpufreq_delayed_get, NULL);</div><div class='add'>+	ret = cpufreq_register_notifier(&amp;time_cpufreq_notifier_block,</div><div class='add'>+					CPUFREQ_TRANSITION_NOTIFIER);</div><div class='add'>+	if (!ret)</div><div class='add'>+		cpufreq_init = 1;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(cpufreq_tsc);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* clock source code */</div><div class='add'>+</div><div class='add'>+static unsigned long current_tsc_khz = 0;</div><div class='add'>+static int tsc_update_callback(void);</div><div class='add'>+</div><div class='add'>+static cycle_t read_tsc(void)</div><div class='add'>+{</div><div class='add'>+	cycle_t ret;</div><div class='add'>+</div><div class='add'>+	rdtscll(ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource clocksource_tsc = {</div><div class='add'>+	.name			= "tsc",</div><div class='add'>+	.rating			= 300,</div><div class='add'>+	.read			= read_tsc,</div><div class='add'>+	.mask			= CLOCKSOURCE_MASK(64),</div><div class='add'>+	.mult			= 0, /* to be set */</div><div class='add'>+	.shift			= 22,</div><div class='add'>+	.update_callback	= tsc_update_callback,</div><div class='add'>+	.is_continuous		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tsc_update_callback(void)</div><div class='add'>+{</div><div class='add'>+	int change = 0;</div><div class='add'>+</div><div class='add'>+	/* check to see if we should switch to the safe clocksource: */</div><div class='add'>+	if (clocksource_tsc.rating != 50 &amp;&amp; check_tsc_unstable()) {</div><div class='add'>+		clocksource_tsc.rating = 50;</div><div class='add'>+		clocksource_reselect();</div><div class='add'>+		change = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* only update if tsc_khz has changed: */</div><div class='add'>+	if (current_tsc_khz != tsc_khz) {</div><div class='add'>+		current_tsc_khz = tsc_khz;</div><div class='add'>+		clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,</div><div class='add'>+							clocksource_tsc.shift);</div><div class='add'>+		change = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init dmi_mark_tsc_unstable(struct dmi_system_id *d)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_NOTICE "%s detected: marking TSC unstable.\n",</div><div class='add'>+		       d-&gt;ident);</div><div class='add'>+	mark_tsc_unstable();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* List of systems that have known TSC problems */</div><div class='add'>+static struct dmi_system_id __initdata bad_tsc_dmi_table[] = {</div><div class='add'>+	{</div><div class='add'>+	 .callback = dmi_mark_tsc_unstable,</div><div class='add'>+	 .ident = "IBM Thinkpad 380XD",</div><div class='add'>+	 .matches = {</div><div class='add'>+		     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),</div><div class='add'>+		     DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),</div><div class='add'>+		     },</div><div class='add'>+	 },</div><div class='add'>+	 {}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSC_FREQ_CHECK_INTERVAL (10*MSEC_PER_SEC) /* 10sec in MS */</div><div class='add'>+static struct timer_list verify_tsc_freq_timer;</div><div class='add'>+</div><div class='add'>+/* XXX - Probably should add locking */</div><div class='add'>+static void verify_tsc_freq(unsigned long unused)</div><div class='add'>+{</div><div class='add'>+	static u64 last_tsc;</div><div class='add'>+	static unsigned long last_jiffies;</div><div class='add'>+</div><div class='add'>+	u64 now_tsc, interval_tsc;</div><div class='add'>+	unsigned long now_jiffies, interval_jiffies;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (check_tsc_unstable())</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rdtscll(now_tsc);</div><div class='add'>+	now_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	if (!last_jiffies) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	interval_jiffies = now_jiffies - last_jiffies;</div><div class='add'>+	interval_tsc = now_tsc - last_tsc;</div><div class='add'>+	interval_tsc *= HZ;</div><div class='add'>+	do_div(interval_tsc, cpu_khz*1000);</div><div class='add'>+</div><div class='add'>+	if (interval_tsc &lt; (interval_jiffies * 3 / 4)) {</div><div class='add'>+		printk("TSC appears to be running slowly. "</div><div class='add'>+			"Marking it as unstable\n");</div><div class='add'>+		mark_tsc_unstable();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	last_tsc = now_tsc;</div><div class='add'>+	last_jiffies = now_jiffies;</div><div class='add'>+	/* set us up to go off on the next interval: */</div><div class='add'>+	mod_timer(&amp;verify_tsc_freq_timer,</div><div class='add'>+		jiffies + msecs_to_jiffies(TSC_FREQ_CHECK_INTERVAL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Make an educated guess if the TSC is trustworthy and synchronized</div><div class='add'>+ * over all CPUs.</div><div class='add'>+ */</div><div class='add'>+static __init int unsynchronized_tsc(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Intel systems are normally all synchronized.</div><div class='add'>+	 * Exceptions must mark TSC as unstable:</div><div class='add'>+	 */</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)</div><div class='add'>+ 		return 0;</div><div class='add'>+</div><div class='add'>+	/* assume multi socket systems are not synchronized: */</div><div class='add'>+ 	return num_possible_cpus() &gt; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init init_tsc_clocksource(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (cpu_has_tsc &amp;&amp; tsc_khz &amp;&amp; !tsc_disable) {</div><div class='add'>+		/* check blacklist */</div><div class='add'>+		dmi_check_system(bad_tsc_dmi_table);</div><div class='add'>+</div><div class='add'>+		if (unsynchronized_tsc()) /* mark unstable if unsynced */</div><div class='add'>+			mark_tsc_unstable();</div><div class='add'>+		current_tsc_khz = tsc_khz;</div><div class='add'>+		clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,</div><div class='add'>+							clocksource_tsc.shift);</div><div class='add'>+		/* lower the rating if we already know its unstable: */</div><div class='add'>+		if (check_tsc_unstable())</div><div class='add'>+			clocksource_tsc.rating = 50;</div><div class='add'>+</div><div class='add'>+		init_timer(&amp;verify_tsc_freq_timer);</div><div class='add'>+		verify_tsc_freq_timer.function = verify_tsc_freq;</div><div class='add'>+		verify_tsc_freq_timer.expires =</div><div class='add'>+			jiffies + msecs_to_jiffies(TSC_FREQ_CHECK_INTERVAL);</div><div class='add'>+		add_timer(&amp;verify_tsc_freq_timer);</div><div class='add'>+</div><div class='add'>+		return clocksource_register(&amp;clocksource_tsc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_tsc_clocksource);</div><div class='head'>diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c<br/>index 00e0118e717c..8355d8d87d18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/vm86.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vm86.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/vm86.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/vm86.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S<br/>index 8831303a473f..2d4f1386e2b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -37,6 +37,13 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'>   RODATA</div><div class='ctx'> </div><div class='add'>+  . = ALIGN(4);</div><div class='add'>+  __tracedata_start = .;</div><div class='add'>+  .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {</div><div class='add'>+	*(.tracedata)</div><div class='add'>+  }</div><div class='add'>+  __tracedata_end = .;</div><div class='add'>+</div><div class='ctx'>   /* writeable */</div><div class='ctx'>   .data : AT(ADDR(.data) - LOAD_OFFSET) {	/* Data */</div><div class='ctx'> 	*(.data)</div><div class='hunk'>@@ -64,6 +71,15 @@ SECTIONS</div><div class='ctx'>   .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) }</div><div class='ctx'>   _edata = .;			/* End of data section */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_STACK_UNWIND</div><div class='add'>+  . = ALIGN(4);</div><div class='add'>+  .eh_frame : AT(ADDR(.eh_frame) - LOAD_OFFSET) {</div><div class='add'>+	__start_unwind = .;</div><div class='add'>+  	*(.eh_frame)</div><div class='add'>+	__end_unwind = .;</div><div class='add'>+  }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>   . = ALIGN(THREAD_SIZE);	/* init_task */</div><div class='ctx'>   .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {</div><div class='ctx'> 	*(.data.init_task)</div><div class='head'>diff --git a/arch/i386/kernel/vsyscall-sysenter.S b/arch/i386/kernel/vsyscall-sysenter.S<br/>index 3b62baa6a371..1a36d26e15eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/vsyscall-sysenter.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vsyscall-sysenter.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/vsyscall-sysenter.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/vsyscall-sysenter.S</a></div><div class='hunk'>@@ -42,10 +42,10 @@ __kernel_vsyscall:</div><div class='ctx'> 	/* 7: align return point with nop's to make disassembly easier */</div><div class='ctx'> 	.space 7,0x90</div><div class='ctx'> </div><div class='del'>-	/* 14: System call restart point is here! (SYSENTER_RETURN - 2) */</div><div class='add'>+	/* 14: System call restart point is here! (SYSENTER_RETURN-2) */</div><div class='ctx'> 	jmp .Lenter_kernel</div><div class='ctx'> 	/* 16: System call normal return point is here! */</div><div class='del'>-	.globl SYSENTER_RETURN	/* Symbol used by entry.S.  */</div><div class='add'>+	.globl SYSENTER_RETURN	/* Symbol used by sysenter.c  */</div><div class='ctx'> SYSENTER_RETURN:</div><div class='ctx'> 	pop %ebp</div><div class='ctx'> .Lpop_ebp:</div><div class='head'>diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S<br/>index 98699ca6e52d..e26975fc68b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/kernel/vsyscall.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/kernel/vsyscall.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/kernel/vsyscall.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/kernel/vsyscall.lds.S</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> </div><div class='ctx'> SECTIONS</div><div class='ctx'> {</div><div class='del'>-  . = VSYSCALL_BASE + SIZEOF_HEADERS;</div><div class='add'>+  . = VDSO_PRELINK + SIZEOF_HEADERS;</div><div class='ctx'> </div><div class='ctx'>   .hash           : { *(.hash) }		:text</div><div class='ctx'>   .dynsym         : { *(.dynsym) }</div><div class='hunk'>@@ -20,7 +20,7 @@ SECTIONS</div><div class='ctx'>      For the layouts to match, we need to skip more than enough</div><div class='ctx'>      space for the dynamic symbol table et al.  If this amount</div><div class='ctx'>      is insufficient, ld -shared will barf.  Just increase it here.  */</div><div class='del'>-  . = VSYSCALL_BASE + 0x400;</div><div class='add'>+  . = VDSO_PRELINK + 0x400;</div><div class='ctx'> </div><div class='ctx'>   .text           : { *(.text) }		:text =0x90909090</div><div class='ctx'>   .note		  : { *(.note.*) }		:text :note</div><div class='head'>diff --git a/arch/i386/lib/checksum.S b/arch/i386/lib/checksum.S<br/>index 94c7867ddc33..75ffd02654fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/lib/checksum.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/checksum.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/lib/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/lib/checksum.S</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> 				</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/i386/lib/delay.c b/arch/i386/lib/delay.c<br/>index c49a6acbee56..3c0714c4b669 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/lib/delay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/delay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/lib/delay.c</a></div><div class='hunk'>@@ -10,43 +10,92 @@</div><div class='ctx'>  *	we have to worry about.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-#include &lt;asm/smp.h&gt;</div><div class='add'>+# include &lt;asm/smp.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct timer_opts* timer;</div><div class='add'>+/* simple loop based delay: */</div><div class='add'>+static void delay_loop(unsigned long loops)</div><div class='add'>+{</div><div class='add'>+	int d0;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+		"\tjmp 1f\n"</div><div class='add'>+		".align 16\n"</div><div class='add'>+		"1:\tjmp 2f\n"</div><div class='add'>+		".align 16\n"</div><div class='add'>+		"2:\tdecl %0\n\tjns 2b"</div><div class='add'>+		:"=&amp;a" (d0)</div><div class='add'>+		:"0" (loops));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TSC based delay: */</div><div class='add'>+static void delay_tsc(unsigned long loops)</div><div class='add'>+{</div><div class='add'>+	unsigned long bclock, now;</div><div class='add'>+</div><div class='add'>+	rdtscl(bclock);</div><div class='add'>+	do {</div><div class='add'>+		rep_nop();</div><div class='add'>+		rdtscl(now);</div><div class='add'>+	} while ((now-bclock) &lt; loops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Since we calibrate only once at boot, this</div><div class='add'>+ * function should be set once at boot and not changed</div><div class='add'>+ */</div><div class='add'>+static void (*delay_fn)(unsigned long) = delay_loop;</div><div class='add'>+</div><div class='add'>+void use_tsc_delay(void)</div><div class='add'>+{</div><div class='add'>+	delay_fn = delay_tsc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int read_current_timer(unsigned long *timer_val)</div><div class='add'>+{</div><div class='add'>+	if (delay_fn == delay_tsc) {</div><div class='add'>+		rdtscl(*timer_val);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void __delay(unsigned long loops)</div><div class='ctx'> {</div><div class='del'>-	cur_timer-&gt;delay(loops);</div><div class='add'>+	delay_fn(loops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline void __const_udelay(unsigned long xloops)</div><div class='ctx'> {</div><div class='ctx'> 	int d0;</div><div class='add'>+</div><div class='ctx'> 	xloops *= 4;</div><div class='ctx'> 	__asm__("mull %0"</div><div class='ctx'> 		:"=d" (xloops), "=&amp;a" (d0)</div><div class='del'>-		:"1" (xloops),"0" (cpu_data[raw_smp_processor_id()].loops_per_jiffy * (HZ/4)));</div><div class='del'>-        __delay(++xloops);</div><div class='add'>+		:"1" (xloops), "0"</div><div class='add'>+		(cpu_data[raw_smp_processor_id()].loops_per_jiffy * (HZ/4)));</div><div class='add'>+</div><div class='add'>+	__delay(++xloops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __udelay(unsigned long usecs)</div><div class='ctx'> {</div><div class='del'>-	__const_udelay(usecs * 0x000010c7);  /* 2**32 / 1000000 (rounded up) */</div><div class='add'>+	__const_udelay(usecs * 0x000010c7); /* 2**32 / 1000000 (rounded up) */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __ndelay(unsigned long nsecs)</div><div class='ctx'> {</div><div class='del'>-	__const_udelay(nsecs * 0x00005);  /* 2**32 / 1000000000 (rounded up) */</div><div class='add'>+	__const_udelay(nsecs * 0x00005); /* 2**32 / 1000000000 (rounded up) */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__delay);</div><div class='head'>diff --git a/arch/i386/lib/memcpy.c b/arch/i386/lib/memcpy.c<br/>index 891b2359d18a..8ac51b82a632 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/lib/memcpy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/memcpy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/lib/memcpy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/lib/memcpy.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/lib/mmx.c b/arch/i386/lib/mmx.c<br/>index 2afda94dffd3..28084d2e8dd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/lib/mmx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/mmx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/lib/mmx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/lib/mmx.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c<br/>index 4cf981d70f45..efc7e7d5f4d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/lib/usercopy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/lib/usercopy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/lib/usercopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/lib/usercopy.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright 1997 Andi Kleen &lt;ak@muc.de&gt;</div><div class='ctx'>  * Copyright 1997 Linus Torvalds</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -425,15 +424,212 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)</div><div class='ctx'> 		       : "eax", "edx", "memory");</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Non Temporal Hint version of __copy_user_zeroing_intel.  It is cache aware.</div><div class='add'>+ * hyoshiok@miraclelinux.com</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static unsigned long __copy_user_zeroing_intel_nocache(void *to,</div><div class='add'>+				const void __user *from, unsigned long size)</div><div class='add'>+{</div><div class='add'>+        int d0, d1;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+	       "        .align 2,0x90\n"</div><div class='add'>+	       "0:      movl 32(%4), %%eax\n"</div><div class='add'>+	       "        cmpl $67, %0\n"</div><div class='add'>+	       "        jbe 2f\n"</div><div class='add'>+	       "1:      movl 64(%4), %%eax\n"</div><div class='add'>+	       "        .align 2,0x90\n"</div><div class='add'>+	       "2:      movl 0(%4), %%eax\n"</div><div class='add'>+	       "21:     movl 4(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 0(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 4(%3)\n"</div><div class='add'>+	       "3:      movl 8(%4), %%eax\n"</div><div class='add'>+	       "31:     movl 12(%4),%%edx\n"</div><div class='add'>+	       "        movnti %%eax, 8(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 12(%3)\n"</div><div class='add'>+	       "4:      movl 16(%4), %%eax\n"</div><div class='add'>+	       "41:     movl 20(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 16(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 20(%3)\n"</div><div class='add'>+	       "10:     movl 24(%4), %%eax\n"</div><div class='add'>+	       "51:     movl 28(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 24(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 28(%3)\n"</div><div class='add'>+	       "11:     movl 32(%4), %%eax\n"</div><div class='add'>+	       "61:     movl 36(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 32(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 36(%3)\n"</div><div class='add'>+	       "12:     movl 40(%4), %%eax\n"</div><div class='add'>+	       "71:     movl 44(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 40(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 44(%3)\n"</div><div class='add'>+	       "13:     movl 48(%4), %%eax\n"</div><div class='add'>+	       "81:     movl 52(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 48(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 52(%3)\n"</div><div class='add'>+	       "14:     movl 56(%4), %%eax\n"</div><div class='add'>+	       "91:     movl 60(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 56(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 60(%3)\n"</div><div class='add'>+	       "        addl $-64, %0\n"</div><div class='add'>+	       "        addl $64, %4\n"</div><div class='add'>+	       "        addl $64, %3\n"</div><div class='add'>+	       "        cmpl $63, %0\n"</div><div class='add'>+	       "        ja  0b\n"</div><div class='add'>+	       "        sfence \n"</div><div class='add'>+	       "5:      movl  %0, %%eax\n"</div><div class='add'>+	       "        shrl  $2, %0\n"</div><div class='add'>+	       "        andl $3, %%eax\n"</div><div class='add'>+	       "        cld\n"</div><div class='add'>+	       "6:      rep; movsl\n"</div><div class='add'>+	       "        movl %%eax,%0\n"</div><div class='add'>+	       "7:      rep; movsb\n"</div><div class='add'>+	       "8:\n"</div><div class='add'>+	       ".section .fixup,\"ax\"\n"</div><div class='add'>+	       "9:      lea 0(%%eax,%0,4),%0\n"</div><div class='add'>+	       "16:     pushl %0\n"</div><div class='add'>+	       "        pushl %%eax\n"</div><div class='add'>+	       "        xorl %%eax,%%eax\n"</div><div class='add'>+	       "        rep; stosb\n"</div><div class='add'>+	       "        popl %%eax\n"</div><div class='add'>+	       "        popl %0\n"</div><div class='add'>+	       "        jmp 8b\n"</div><div class='add'>+	       ".previous\n"</div><div class='add'>+	       ".section __ex_table,\"a\"\n"</div><div class='add'>+	       "	.align 4\n"</div><div class='add'>+	       "	.long 0b,16b\n"</div><div class='add'>+	       "	.long 1b,16b\n"</div><div class='add'>+	       "	.long 2b,16b\n"</div><div class='add'>+	       "	.long 21b,16b\n"</div><div class='add'>+	       "	.long 3b,16b\n"</div><div class='add'>+	       "	.long 31b,16b\n"</div><div class='add'>+	       "	.long 4b,16b\n"</div><div class='add'>+	       "	.long 41b,16b\n"</div><div class='add'>+	       "	.long 10b,16b\n"</div><div class='add'>+	       "	.long 51b,16b\n"</div><div class='add'>+	       "	.long 11b,16b\n"</div><div class='add'>+	       "	.long 61b,16b\n"</div><div class='add'>+	       "	.long 12b,16b\n"</div><div class='add'>+	       "	.long 71b,16b\n"</div><div class='add'>+	       "	.long 13b,16b\n"</div><div class='add'>+	       "	.long 81b,16b\n"</div><div class='add'>+	       "	.long 14b,16b\n"</div><div class='add'>+	       "	.long 91b,16b\n"</div><div class='add'>+	       "	.long 6b,9b\n"</div><div class='add'>+	       "        .long 7b,16b\n"</div><div class='add'>+	       ".previous"</div><div class='add'>+	       : "=&amp;c"(size), "=&amp;D" (d0), "=&amp;S" (d1)</div><div class='add'>+	       :  "1"(to), "2"(from), "0"(size)</div><div class='add'>+	       : "eax", "edx", "memory");</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __copy_user_intel_nocache(void *to,</div><div class='add'>+				const void __user *from, unsigned long size)</div><div class='add'>+{</div><div class='add'>+        int d0, d1;</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__(</div><div class='add'>+	       "        .align 2,0x90\n"</div><div class='add'>+	       "0:      movl 32(%4), %%eax\n"</div><div class='add'>+	       "        cmpl $67, %0\n"</div><div class='add'>+	       "        jbe 2f\n"</div><div class='add'>+	       "1:      movl 64(%4), %%eax\n"</div><div class='add'>+	       "        .align 2,0x90\n"</div><div class='add'>+	       "2:      movl 0(%4), %%eax\n"</div><div class='add'>+	       "21:     movl 4(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 0(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 4(%3)\n"</div><div class='add'>+	       "3:      movl 8(%4), %%eax\n"</div><div class='add'>+	       "31:     movl 12(%4),%%edx\n"</div><div class='add'>+	       "        movnti %%eax, 8(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 12(%3)\n"</div><div class='add'>+	       "4:      movl 16(%4), %%eax\n"</div><div class='add'>+	       "41:     movl 20(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 16(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 20(%3)\n"</div><div class='add'>+	       "10:     movl 24(%4), %%eax\n"</div><div class='add'>+	       "51:     movl 28(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 24(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 28(%3)\n"</div><div class='add'>+	       "11:     movl 32(%4), %%eax\n"</div><div class='add'>+	       "61:     movl 36(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 32(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 36(%3)\n"</div><div class='add'>+	       "12:     movl 40(%4), %%eax\n"</div><div class='add'>+	       "71:     movl 44(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 40(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 44(%3)\n"</div><div class='add'>+	       "13:     movl 48(%4), %%eax\n"</div><div class='add'>+	       "81:     movl 52(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 48(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 52(%3)\n"</div><div class='add'>+	       "14:     movl 56(%4), %%eax\n"</div><div class='add'>+	       "91:     movl 60(%4), %%edx\n"</div><div class='add'>+	       "        movnti %%eax, 56(%3)\n"</div><div class='add'>+	       "        movnti %%edx, 60(%3)\n"</div><div class='add'>+	       "        addl $-64, %0\n"</div><div class='add'>+	       "        addl $64, %4\n"</div><div class='add'>+	       "        addl $64, %3\n"</div><div class='add'>+	       "        cmpl $63, %0\n"</div><div class='add'>+	       "        ja  0b\n"</div><div class='add'>+	       "        sfence \n"</div><div class='add'>+	       "5:      movl  %0, %%eax\n"</div><div class='add'>+	       "        shrl  $2, %0\n"</div><div class='add'>+	       "        andl $3, %%eax\n"</div><div class='add'>+	       "        cld\n"</div><div class='add'>+	       "6:      rep; movsl\n"</div><div class='add'>+	       "        movl %%eax,%0\n"</div><div class='add'>+	       "7:      rep; movsb\n"</div><div class='add'>+	       "8:\n"</div><div class='add'>+	       ".section .fixup,\"ax\"\n"</div><div class='add'>+	       "9:      lea 0(%%eax,%0,4),%0\n"</div><div class='add'>+	       "16:     jmp 8b\n"</div><div class='add'>+	       ".previous\n"</div><div class='add'>+	       ".section __ex_table,\"a\"\n"</div><div class='add'>+	       "	.align 4\n"</div><div class='add'>+	       "	.long 0b,16b\n"</div><div class='add'>+	       "	.long 1b,16b\n"</div><div class='add'>+	       "	.long 2b,16b\n"</div><div class='add'>+	       "	.long 21b,16b\n"</div><div class='add'>+	       "	.long 3b,16b\n"</div><div class='add'>+	       "	.long 31b,16b\n"</div><div class='add'>+	       "	.long 4b,16b\n"</div><div class='add'>+	       "	.long 41b,16b\n"</div><div class='add'>+	       "	.long 10b,16b\n"</div><div class='add'>+	       "	.long 51b,16b\n"</div><div class='add'>+	       "	.long 11b,16b\n"</div><div class='add'>+	       "	.long 61b,16b\n"</div><div class='add'>+	       "	.long 12b,16b\n"</div><div class='add'>+	       "	.long 71b,16b\n"</div><div class='add'>+	       "	.long 13b,16b\n"</div><div class='add'>+	       "	.long 81b,16b\n"</div><div class='add'>+	       "	.long 14b,16b\n"</div><div class='add'>+	       "	.long 91b,16b\n"</div><div class='add'>+	       "	.long 6b,9b\n"</div><div class='add'>+	       "        .long 7b,16b\n"</div><div class='add'>+	       ".previous"</div><div class='add'>+	       : "=&amp;c"(size), "=&amp;D" (d0), "=&amp;S" (d1)</div><div class='add'>+	       :  "1"(to), "2"(from), "0"(size)</div><div class='add'>+	       : "eax", "edx", "memory");</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Leave these declared but undefined.  They should not be any references to</div><div class='ctx'>  * them</div><div class='ctx'>  */</div><div class='del'>-unsigned long</div><div class='del'>-__copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size);</div><div class='del'>-unsigned long</div><div class='del'>-__copy_user_intel(void __user *to, const void *from, unsigned long size);</div><div class='add'>+unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,</div><div class='add'>+					unsigned long size);</div><div class='add'>+unsigned long __copy_user_intel(void __user *to, const void *from,</div><div class='add'>+					unsigned long size);</div><div class='add'>+unsigned long __copy_user_zeroing_intel_nocache(void *to,</div><div class='add'>+				const void __user *from, unsigned long size);</div><div class='ctx'> #endif /* CONFIG_X86_INTEL_USERCOPY */</div><div class='ctx'> </div><div class='ctx'> /* Generic arbitrary sized copy.  */</div><div class='hunk'>@@ -515,8 +711,8 @@ do {									\</div><div class='ctx'> 		: "memory");						\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-unsigned long __copy_to_user_ll(void __user *to, const void *from, unsigned long n)</div><div class='add'>+unsigned long __copy_to_user_ll(void __user *to, const void *from,</div><div class='add'>+				unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON((long) n &lt; 0);</div><div class='ctx'> #ifndef CONFIG_X86_WP_WORKS_OK</div><div class='hunk'>@@ -576,8 +772,8 @@ survive:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__copy_to_user_ll);</div><div class='ctx'> </div><div class='del'>-unsigned long</div><div class='del'>-__copy_from_user_ll(void *to, const void __user *from, unsigned long n)</div><div class='add'>+unsigned long __copy_from_user_ll(void *to, const void __user *from,</div><div class='add'>+					unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	BUG_ON((long)n &lt; 0);</div><div class='ctx'> 	if (movsl_is_ok(to, from, n))</div><div class='hunk'>@@ -588,6 +784,49 @@ __copy_from_user_ll(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__copy_from_user_ll);</div><div class='ctx'> </div><div class='add'>+unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,</div><div class='add'>+					 unsigned long n)</div><div class='add'>+{</div><div class='add'>+	BUG_ON((long)n &lt; 0);</div><div class='add'>+	if (movsl_is_ok(to, from, n))</div><div class='add'>+		__copy_user(to, from, n);</div><div class='add'>+	else</div><div class='add'>+		n = __copy_user_intel((void __user *)to,</div><div class='add'>+				      (const void *)from, n);</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__copy_from_user_ll_nozero);</div><div class='add'>+</div><div class='add'>+unsigned long __copy_from_user_ll_nocache(void *to, const void __user *from,</div><div class='add'>+					unsigned long n)</div><div class='add'>+{</div><div class='add'>+	BUG_ON((long)n &lt; 0);</div><div class='add'>+#ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='add'>+	if ( n &gt; 64 &amp;&amp; cpu_has_xmm2)</div><div class='add'>+                n = __copy_user_zeroing_intel_nocache(to, from, n);</div><div class='add'>+	else</div><div class='add'>+		__copy_user_zeroing(to, from, n);</div><div class='add'>+#else</div><div class='add'>+        __copy_user_zeroing(to, from, n);</div><div class='add'>+#endif</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *from,</div><div class='add'>+					unsigned long n)</div><div class='add'>+{</div><div class='add'>+	BUG_ON((long)n &lt; 0);</div><div class='add'>+#ifdef CONFIG_X86_INTEL_USERCOPY</div><div class='add'>+	if ( n &gt; 64 &amp;&amp; cpu_has_xmm2)</div><div class='add'>+                n = __copy_user_intel_nocache(to, from, n);</div><div class='add'>+	else</div><div class='add'>+		__copy_user(to, from, n);</div><div class='add'>+#else</div><div class='add'>+        __copy_user(to, from, n);</div><div class='add'>+#endif</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * copy_to_user: - Copy a block of data into user space.</div><div class='ctx'>  * @to:   Destination address, in user space.</div><div class='hunk'>@@ -604,7 +843,6 @@ EXPORT_SYMBOL(__copy_from_user_ll);</div><div class='ctx'> unsigned long</div><div class='ctx'> copy_to_user(void __user *to, const void *from, unsigned long n)</div><div class='ctx'> {</div><div class='del'>-	might_sleep();</div><div class='ctx'> 	BUG_ON((long) n &lt; 0);</div><div class='ctx'> 	if (access_ok(VERIFY_WRITE, to, n))</div><div class='ctx'> 		n = __copy_to_user(to, from, n);</div><div class='hunk'>@@ -631,7 +869,6 @@ EXPORT_SYMBOL(copy_to_user);</div><div class='ctx'> unsigned long</div><div class='ctx'> copy_from_user(void *to, const void __user *from, unsigned long n)</div><div class='ctx'> {</div><div class='del'>-	might_sleep();</div><div class='ctx'> 	BUG_ON((long) n &lt; 0);</div><div class='ctx'> 	if (access_ok(VERIFY_READ, from, n))</div><div class='ctx'> 		n = __copy_from_user(to, from, n);</div><div class='head'>diff --git a/arch/i386/mach-default/setup.c b/arch/i386/mach-default/setup.c<br/>index b4a7455c6993..c511705c386c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-default/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-default/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-default/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-default/setup.c</a></div><div class='hunk'>@@ -2,12 +2,13 @@</div><div class='ctx'>  *	Machine specific setup for generic</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/acpi.h&gt;</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='add'>+#include &lt;asm/e820.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> #define DEFAULT_SEND_IPI	(1)</div><div class='hunk'>@@ -78,7 +79,7 @@ void __init trap_init_hook(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='add'>+static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * time_init_hook - do any specific initialisations for the system timer.</div><div class='hunk'>@@ -130,3 +131,44 @@ static int __init print_ipi_mode(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> late_initcall(print_ipi_mode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * machine_specific_memory_setup - Hook for machine specific memory setup.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ *	This is included late in kernel/setup.c so that it can make</div><div class='add'>+ *	use of all of the static functions.</div><div class='add'>+ **/</div><div class='add'>+</div><div class='add'>+char * __init machine_specific_memory_setup(void)</div><div class='add'>+{</div><div class='add'>+	char *who;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	who = "BIOS-e820";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to copy the BIOS-supplied E820-map.</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise fake a memory map; one section from 0k-&gt;640k,</div><div class='add'>+	 * the next section from 1mb-&gt;appropriate_mem_k</div><div class='add'>+	 */</div><div class='add'>+	sanitize_e820_map(E820_MAP, &amp;E820_MAP_NR);</div><div class='add'>+	if (copy_e820_map(E820_MAP, E820_MAP_NR) &lt; 0) {</div><div class='add'>+		unsigned long mem_size;</div><div class='add'>+</div><div class='add'>+		/* compare results from other methods and take the greater */</div><div class='add'>+		if (ALT_MEM_K &lt; EXT_MEM_K) {</div><div class='add'>+			mem_size = EXT_MEM_K;</div><div class='add'>+			who = "BIOS-88";</div><div class='add'>+		} else {</div><div class='add'>+			mem_size = ALT_MEM_K;</div><div class='add'>+			who = "BIOS-e801";</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		e820.nr_map = 0;</div><div class='add'>+		add_memory_region(0, LOWMEMSIZE(), E820_RAM);</div><div class='add'>+		add_memory_region(HIGH_MEMORY, mem_size &lt;&lt; 10, E820_RAM);</div><div class='add'>+  	}</div><div class='add'>+	return who;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/i386/mach-generic/bigsmp.c b/arch/i386/mach-generic/bigsmp.c<br/>index 037b2af1a1f4..ef7a6e6fcb9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/bigsmp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/bigsmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/bigsmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-generic/bigsmp.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Drives the local APIC in "clustered mode".</div><div class='ctx'>  */</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-generic/default.c b/arch/i386/mach-generic/default.c<br/>index 7da14e9a79c3..96c19821e47d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/default.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/default.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/default.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-generic/default.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Default generic APIC driver. This handles upto 8 CPUs.</div><div class='ctx'>  */</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-generic/es7000.c b/arch/i386/mach-generic/es7000.c<br/>index 48d3ec37241b..845cdd0b3593 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/es7000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/es7000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/es7000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-generic/es7000.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * APIC driver for the Unisys ES7000 chipset.</div><div class='ctx'>  */</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c<br/>index d55fa7b187ab..bcd1bcfaa723 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-generic/probe.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  * Generic x86 APIC driver probe layer.</div><div class='ctx'>  */  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-generic/summit.c b/arch/i386/mach-generic/summit.c<br/>index 65ddf74d7f25..b73501ddd653 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/summit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-generic/summit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-generic/summit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-generic/summit.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * APIC driver for the IBM "Summit" chipset.</div><div class='ctx'>  */</div><div class='ctx'> #define APIC_DEFINITION 1</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-visws/mpparse.c b/arch/i386/mach-visws/mpparse.c<br/>index 5f3d7e6de37b..f3c74fab8b95 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/mpparse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/mpparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/mpparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-visws/mpparse.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/mach-visws/setup.c b/arch/i386/mach-visws/setup.c<br/>index 07fac7e749c7..885c7cbfd478 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-visws/setup.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/e820.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> #include "cobalt.h"</div><div class='ctx'> #include "piix4.h"</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +115,7 @@ void __init pre_setup_arch_hook()</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq0 = {</div><div class='ctx'> 	.handler =	timer_interrupt,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -133,3 +135,46 @@ void __init time_init_hook(void)</div><div class='ctx'> 	/* Wire cpu IDT entry to s/w handler (and Cobalt APIC to IDT) */</div><div class='ctx'> 	setup_irq(0, &amp;irq0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Hook for machine specific memory setup. */</div><div class='add'>+</div><div class='add'>+#define MB (1024 * 1024)</div><div class='add'>+</div><div class='add'>+unsigned long sgivwfb_mem_phys;</div><div class='add'>+unsigned long sgivwfb_mem_size;</div><div class='add'>+</div><div class='add'>+long long mem_size __initdata = 0;</div><div class='add'>+</div><div class='add'>+char * __init machine_specific_memory_setup(void)</div><div class='add'>+{</div><div class='add'>+	long long gfx_mem_size = 8 * MB;</div><div class='add'>+</div><div class='add'>+	mem_size = ALT_MEM_K;</div><div class='add'>+</div><div class='add'>+	if (!mem_size) {</div><div class='add'>+		printk(KERN_WARNING "Bootloader didn't set memory size, upgrade it !\n");</div><div class='add'>+		mem_size = 128 * MB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this hardcodes the graphics memory to 8 MB</div><div class='add'>+	 * it really should be sized dynamically (or at least</div><div class='add'>+	 * set as a boot param)</div><div class='add'>+	 */</div><div class='add'>+	if (!sgivwfb_mem_size) {</div><div class='add'>+		printk(KERN_WARNING "Defaulting to 8 MB framebuffer size\n");</div><div class='add'>+		sgivwfb_mem_size = 8 * MB;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Trim to nearest MB</div><div class='add'>+	 */</div><div class='add'>+	sgivwfb_mem_size &amp;= ~((1 &lt;&lt; 20) - 1);</div><div class='add'>+	sgivwfb_mem_phys = mem_size - gfx_mem_size;</div><div class='add'>+</div><div class='add'>+	add_memory_region(0, LOWMEMSIZE(), E820_RAM);</div><div class='add'>+	add_memory_region(HIGH_MEMORY, mem_size - sgivwfb_mem_size - HIGH_MEMORY, E820_RAM);</div><div class='add'>+	add_memory_region(sgivwfb_mem_phys, sgivwfb_mem_size, E820_RESERVED);</div><div class='add'>+</div><div class='add'>+	return "PROM";</div><div class='add'>+}</div><div class='head'>diff --git a/arch/i386/mach-visws/traps.c b/arch/i386/mach-visws/traps.c<br/>index 964353992031..5199bd03254a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-visws/traps.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /* VISWS traps */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c<br/>index 3e64fb721291..828522541a88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/visws_apic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-visws/visws_apic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-visws/visws_apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-visws/visws_apic.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *  25/11/2002 - Updated for 2.5 by Andrey Panin &lt;pazke@orbita1.ru&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='hunk'>@@ -278,22 +277,22 @@ void init_VISWS_APIC_irqs(void)</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (i == 0) {</div><div class='del'>-			irq_desc[i].handler = &amp;cobalt_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;cobalt_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 		else if (i == CO_IRQ_IDE0) {</div><div class='del'>-			irq_desc[i].handler = &amp;cobalt_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;cobalt_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 		else if (i == CO_IRQ_IDE1) {</div><div class='del'>-			irq_desc[i].handler = &amp;cobalt_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;cobalt_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 		else if (i == CO_IRQ_8259) {</div><div class='del'>-			irq_desc[i].handler = &amp;piix4_master_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;piix4_master_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 		else if (i &lt; CO_IRQ_APIC0) {</div><div class='del'>-			irq_desc[i].handler = &amp;piix4_virtual_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;piix4_virtual_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 		else if (IS_CO_APIC(i)) {</div><div class='del'>-			irq_desc[i].handler = &amp;cobalt_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;cobalt_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/i386/mach-voyager/setup.c b/arch/i386/mach-voyager/setup.c<br/>index 7d8a3acb9441..cfa16c151c8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-voyager/setup.c</a></div><div class='hunk'>@@ -2,11 +2,13 @@</div><div class='ctx'>  *	Machine specific setup for generic</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;asm/acpi.h&gt;</div><div class='ctx'> #include &lt;asm/arch_hooks.h&gt;</div><div class='add'>+#include &lt;asm/voyager.h&gt;</div><div class='add'>+#include &lt;asm/e820.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/setup.h&gt;</div><div class='ctx'> </div><div class='ctx'> void __init pre_intr_init_hook(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -24,8 +26,7 @@ void __init intr_init_hook(void)</div><div class='ctx'> 	smp_intr_init();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (!acpi_ioapic)</div><div class='del'>-		setup_irq(2, &amp;irq2);</div><div class='add'>+	setup_irq(2, &amp;irq2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init pre_setup_arch_hook(void)</div><div class='hunk'>@@ -39,9 +40,80 @@ void __init trap_init_hook(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='add'>+static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='ctx'> </div><div class='ctx'> void __init time_init_hook(void)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(0, &amp;irq0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Hook for machine specific memory setup. */</div><div class='add'>+</div><div class='add'>+char * __init machine_specific_memory_setup(void)</div><div class='add'>+{</div><div class='add'>+	char *who;</div><div class='add'>+</div><div class='add'>+	who = "NOT VOYAGER";</div><div class='add'>+</div><div class='add'>+	if(voyager_level == 5) {</div><div class='add'>+		__u32 addr, length;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		who = "Voyager-SUS";</div><div class='add'>+</div><div class='add'>+		e820.nr_map = 0;</div><div class='add'>+		for(i=0; voyager_memory_detect(i, &amp;addr, &amp;length); i++) {</div><div class='add'>+			add_memory_region(addr, length, E820_RAM);</div><div class='add'>+		}</div><div class='add'>+		return who;</div><div class='add'>+	} else if(voyager_level == 4) {</div><div class='add'>+		__u32 tom;</div><div class='add'>+		__u16 catbase = inb(VOYAGER_SSPB_RELOCATION_PORT)&lt;&lt;8;</div><div class='add'>+		/* select the DINO config space */</div><div class='add'>+		outb(VOYAGER_DINO, VOYAGER_CAT_CONFIG_PORT);</div><div class='add'>+		/* Read DINO top of memory register */</div><div class='add'>+		tom = ((inb(catbase + 0x4) &amp; 0xf0) &lt;&lt; 16)</div><div class='add'>+			+ ((inb(catbase + 0x5) &amp; 0x7f) &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+		if(inb(catbase) != VOYAGER_DINO) {</div><div class='add'>+			printk(KERN_ERR "Voyager: Failed to get DINO for L4, setting tom to EXT_MEM_K\n");</div><div class='add'>+			tom = (EXT_MEM_K)&lt;&lt;10;</div><div class='add'>+		}</div><div class='add'>+		who = "Voyager-TOM";</div><div class='add'>+		add_memory_region(0, 0x9f000, E820_RAM);</div><div class='add'>+		/* map from 1M to top of memory */</div><div class='add'>+		add_memory_region(1*1024*1024, tom - 1*1024*1024, E820_RAM);</div><div class='add'>+		/* FIXME: Should check the ASICs to see if I need to</div><div class='add'>+		 * take out the 8M window.  Just do it at the moment</div><div class='add'>+		 * */</div><div class='add'>+		add_memory_region(8*1024*1024, 8*1024*1024, E820_RESERVED);</div><div class='add'>+		return who;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	who = "BIOS-e820";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Try to copy the BIOS-supplied E820-map.</div><div class='add'>+	 *</div><div class='add'>+	 * Otherwise fake a memory map; one section from 0k-&gt;640k,</div><div class='add'>+	 * the next section from 1mb-&gt;appropriate_mem_k</div><div class='add'>+	 */</div><div class='add'>+	sanitize_e820_map(E820_MAP, &amp;E820_MAP_NR);</div><div class='add'>+	if (copy_e820_map(E820_MAP, E820_MAP_NR) &lt; 0) {</div><div class='add'>+		unsigned long mem_size;</div><div class='add'>+</div><div class='add'>+		/* compare results from other methods and take the greater */</div><div class='add'>+		if (ALT_MEM_K &lt; EXT_MEM_K) {</div><div class='add'>+			mem_size = EXT_MEM_K;</div><div class='add'>+			who = "BIOS-88";</div><div class='add'>+		} else {</div><div class='add'>+			mem_size = ALT_MEM_K;</div><div class='add'>+			who = "BIOS-e801";</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		e820.nr_map = 0;</div><div class='add'>+		add_memory_region(0, LOWMEMSIZE(), E820_RAM);</div><div class='add'>+		add_memory_region(HIGH_MEMORY, mem_size &lt;&lt; 10, E820_RAM);</div><div class='add'>+  	}</div><div class='add'>+	return who;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c<br/>index b584060ec004..80b7f2fc4f46 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_basic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_basic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_basic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-voyager/voyager_basic.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *	voyager_smp.c - Voyager SMP hal (emulates linux smp.c)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c<br/>index 10d21df14531..f50c6c6ad680 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_cat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_cat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_cat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-voyager/voyager_cat.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * of bit shift manipulations to send and receive packets on the</div><div class='ctx'>  * serial bus */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c<br/>index 70e560a1b79a..6c86575ffdcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-voyager/voyager_smp.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * This file provides all the same external entries as smp.c but uses</div><div class='ctx'>  * the voyager hal to provide the functionality</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -661,6 +660,7 @@ do_boot_cpu(__u8 cpu)</div><div class='ctx'> 		print_cpu_info(&amp;cpu_data[cpu]);</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		cpu_set(cpu, cpu_callout_map);</div><div class='add'>+		cpu_set(cpu, cpu_present_map);</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		printk("CPU%d FAILED TO BOOT: ", cpu);</div><div class='hunk'>@@ -1418,7 +1418,7 @@ smp_intr_init(void)</div><div class='ctx'> 	 * This is for later: first 16 correspond to PC IRQs; next 16</div><div class='ctx'> 	 * are Primary MC IRQs and final 16 are Secondary MC IRQs */</div><div class='ctx'> 	for(i = 0; i &lt; 48; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;vic_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;vic_irq_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* send a CPI at level cpi to a set of cpus in cpuset (set 1 bit per</div><div class='hunk'>@@ -1912,6 +1912,7 @@ void __devinit smp_prepare_boot_cpu(void)</div><div class='ctx'> 	cpu_set(smp_processor_id(), cpu_online_map);</div><div class='ctx'> 	cpu_set(smp_processor_id(), cpu_callout_map);</div><div class='ctx'> 	cpu_set(smp_processor_id(), cpu_possible_map);</div><div class='add'>+	cpu_set(smp_processor_id(), cpu_present_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __devinit</div><div class='hunk'>@@ -1936,3 +1937,9 @@ smp_cpus_done(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	zap_low_mappings();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+smp_setup_processor_id(void)</div><div class='add'>+{</div><div class='add'>+	current_thread_info()-&gt;cpu = hard_smp_processor_id();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/i386/mach-voyager/voyager_thread.c<br/>index 2b03884fdb2a..50f6de6ff64d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_thread.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mach-voyager/voyager_thread.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mach-voyager/voyager_thread.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mach-voyager/voyager_thread.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/i386/mm/boot_ioremap.c b/arch/i386/mm/boot_ioremap.c<br/>index 523b30634e0a..5d44f4f5ff59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/boot_ioremap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/boot_ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/boot_ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/boot_ioremap.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * boot_pte_t is defined only if this all works correctly</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #undef CONFIG_X86_PAE</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c<br/>index fe6eb901326e..7c392dc553b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/discontig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/discontig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/discontig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/discontig.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='hunk'>@@ -43,7 +42,7 @@ EXPORT_SYMBOL(node_data);</div><div class='ctx'> bootmem_data_t node0_bdata;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * numa interface - we expect the numa architecture specfic code to have</div><div class='add'>+ * numa interface - we expect the numa architecture specific code to have</div><div class='ctx'>  *                  populated the following initialisation.</div><div class='ctx'>  *</div><div class='ctx'>  * 1) node_online_map  - the map of all nodes configured (online) in the system</div><div class='head'>diff --git a/arch/i386/mm/extable.c b/arch/i386/mm/extable.c<br/>index f706449319c4..de03c5430abc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/i386/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c<br/>index 7f0fcf219a26..f7279468323a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/fault.c</a></div><div class='hunk'>@@ -30,6 +30,40 @@</div><div class='ctx'> </div><div class='ctx'> extern void die(const char *,struct pt_regs *,long);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);</div><div class='add'>+int register_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	vmalloc_sync_all();</div><div class='add'>+	return atomic_notifier_chain_register(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int unregister_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	struct die_args args = {</div><div class='add'>+		.regs = regs,</div><div class='add'>+		.str = str,</div><div class='add'>+		.err = err,</div><div class='add'>+		.trapnr = trap,</div><div class='add'>+		.signr = sig</div><div class='add'>+	};</div><div class='add'>+	return atomic_notifier_call_chain(&amp;notify_page_fault_chain, val, &amp;args);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Unlock any spinlocks which will prevent us from getting the</div><div class='ctx'>  * message out </div><div class='hunk'>@@ -77,12 +111,15 @@ static inline unsigned long get_segment_eip(struct pt_regs *regs,</div><div class='ctx'> 	unsigned seg = regs-&gt;xcs &amp; 0xffff;</div><div class='ctx'> 	u32 seg_ar, seg_limit, base, *desc;</div><div class='ctx'> </div><div class='add'>+	/* Unlikely, but must come before segment checks. */</div><div class='add'>+	if (unlikely(regs-&gt;eflags &amp; VM_MASK)) {</div><div class='add'>+		base = seg &lt;&lt; 4;</div><div class='add'>+		*eip_limit = base + 0xffff;</div><div class='add'>+		return base + (eip &amp; 0xffff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* The standard kernel/user address space limit. */</div><div class='ctx'> 	*eip_limit = (seg &amp; 3) ? USER_DS.seg : KERNEL_DS.seg;</div><div class='del'>-</div><div class='del'>-	/* Unlikely, but must come before segment checks. */</div><div class='del'>-	if (unlikely((regs-&gt;eflags &amp; VM_MASK) != 0))</div><div class='del'>-		return eip + (seg &lt;&lt; 4);</div><div class='ctx'> 	</div><div class='ctx'> 	/* By far the most common cases. */</div><div class='ctx'> 	if (likely(seg == __USER_CS || seg == __KERNEL_CS))</div><div class='hunk'>@@ -321,7 +358,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 	if (unlikely(address &gt;= TASK_SIZE)) {</div><div class='ctx'> 		if (!(error_code &amp; 0x0000000d) &amp;&amp; vmalloc_fault(address) &gt;= 0)</div><div class='ctx'> 			return;</div><div class='del'>-		if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='add'>+		if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='ctx'> 						SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 			return;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -331,7 +368,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 		goto bad_area_nosemaphore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='add'>+	if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='ctx'> 					SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +389,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 	/* When running in the kernel we expect faults to occur only to</div><div class='ctx'> 	 * addresses in user space.  All other faults represent errors in the</div><div class='ctx'> 	 * kernel and should generate an OOPS.  Unfortunatly, in the case of an</div><div class='del'>-	 * erroneous fault occuring in a code path which already holds mmap_sem</div><div class='add'>+	 * erroneous fault occurring in a code path which already holds mmap_sem</div><div class='ctx'> 	 * we will deadlock attempting to validate the fault against the</div><div class='ctx'> 	 * address space.  Luckily the kernel only validly references user</div><div class='ctx'> 	 * space from well defined areas of code, which are listed in the</div><div class='hunk'>@@ -380,12 +417,12 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 		goto bad_area;</div><div class='ctx'> 	if (error_code &amp; 4) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * accessing the stack below %esp is always a bug.</div><div class='del'>-		 * The "+ 32" is there due to some instructions (like</div><div class='del'>-		 * pusha) doing post-decrement on the stack and that</div><div class='del'>-		 * doesn't show up until later..</div><div class='add'>+		 * Accessing the stack below %esp is always a bug.</div><div class='add'>+		 * The large cushion allows instructions like enter</div><div class='add'>+		 * and pusha to work.  ("enter $65535,$31" pushes</div><div class='add'>+		 * 32 pointers and then decrements %esp by 65535.)</div><div class='ctx'> 		 */</div><div class='del'>-		if (address + 32 &lt; regs-&gt;esp)</div><div class='add'>+		if (address + 65536 + 32 * sizeof(unsigned long) &lt; regs-&gt;esp)</div><div class='ctx'> 			goto bad_area;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (expand_stack(vma, address))</div><div class='head'>diff --git a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c<br/>index a7d891585411..1719a8141f81 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 2002, Rohit Seth &lt;rohit.seth@intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c<br/>index 3df1371d4520..89e8486aac34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/init.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -23,12 +22,14 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/memory_hotplug.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -384,7 +385,7 @@ static void __init pagetable_init (void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SOFTWARE_SUSPEND</div><div class='add'>+#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI_SLEEP)</div><div class='ctx'> /*</div><div class='ctx'>  * Swap suspend &amp; friends need this for resume because things like the intel-agp</div><div class='ctx'>  * driver might have split up a kernel 4MB mapping.</div><div class='hunk'>@@ -653,7 +654,7 @@ void __init mem_init(void)</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> #ifndef CONFIG_NEED_MULTIPLE_NODES</div><div class='del'>-int add_memory(u64 start, u64 size)</div><div class='add'>+int arch_add_memory(int nid, u64 start, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	struct pglist_data *pgdata = &amp;contig_page_data;</div><div class='ctx'> 	struct zone *zone = pgdata-&gt;node_zones + MAX_NR_ZONES-1;</div><div class='hunk'>@@ -724,16 +725,15 @@ static int noinline do_test_wp_bit(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_RODATA</div><div class='ctx'> </div><div class='del'>-extern char __start_rodata, __end_rodata;</div><div class='ctx'> void mark_rodata_ro(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long addr = (unsigned long)&amp;__start_rodata;</div><div class='add'>+	unsigned long addr = (unsigned long)__start_rodata;</div><div class='ctx'> </div><div class='del'>-	for (; addr &lt; (unsigned long)&amp;__end_rodata; addr += PAGE_SIZE)</div><div class='add'>+	for (; addr &lt; (unsigned long)__end_rodata; addr += PAGE_SIZE)</div><div class='ctx'> 		change_page_attr(virt_to_page(addr), 1, PAGE_KERNEL_RO);</div><div class='ctx'> </div><div class='del'>-	printk ("Write protecting the kernel read-only data: %luk\n",</div><div class='del'>-			(unsigned long)(&amp;__end_rodata - &amp;__start_rodata) &gt;&gt; 10);</div><div class='add'>+	printk("Write protecting the kernel read-only data: %uk\n",</div><div class='add'>+			(__end_rodata - __start_rodata) &gt;&gt; 10);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * change_page_attr() requires a global_flush_tlb() call after it.</div><div class='hunk'>@@ -752,7 +752,7 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)</div><div class='ctx'> 	for (addr = begin; addr &lt; end; addr += PAGE_SIZE) {</div><div class='ctx'> 		ClearPageReserved(virt_to_page(addr));</div><div class='ctx'> 		init_page_count(virt_to_page(addr));</div><div class='del'>-		memset((void *)addr, 0xcc, PAGE_SIZE);</div><div class='add'>+		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='ctx'> 		free_page(addr);</div><div class='ctx'> 		totalram_pages++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c<br/>index 92c3d9f0e731..8564b6ae17e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/pageattr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/pageattr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/pageattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/pageattr.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Thanks to Ben LaHaise for precious feedback.</div><div class='ctx'>  */ </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='hunk'>@@ -209,19 +208,19 @@ int change_page_attr(struct page *page, int numpages, pgprot_t prot)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void global_flush_tlb(void)</div><div class='del'>-{ </div><div class='del'>-	LIST_HEAD(l);</div><div class='add'>+{</div><div class='add'>+	struct list_head l;</div><div class='ctx'> 	struct page *pg, *next;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(irqs_disabled());</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;cpa_lock);</div><div class='del'>-	list_splice_init(&amp;df_list, &amp;l);</div><div class='add'>+	list_replace_init(&amp;df_list, &amp;l);</div><div class='ctx'> 	spin_unlock_irq(&amp;cpa_lock);</div><div class='ctx'> 	flush_map();</div><div class='ctx'> 	list_for_each_entry_safe(pg, next, &amp;l, lru)</div><div class='ctx'> 		__free_page(pg);</div><div class='del'>-} </div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> void kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='hunk'>@@ -229,8 +228,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)</div><div class='ctx'> 	if (PageHighMem(page))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!enable)</div><div class='del'>-		mutex_debug_check_no_locks_freed(page_address(page),</div><div class='del'>-						 numpages * PAGE_SIZE);</div><div class='add'>+		debug_check_no_locks_freed(page_address(page),</div><div class='add'>+					   numpages * PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* the return value is ignored - the calls cannot fail,</div><div class='ctx'> 	 * large pages are disabled at boot time.</div><div class='head'>diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c<br/>index 2889567e21a1..bd98768d8764 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/mm/pgtable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/mm/pgtable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/mm/pgtable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/mm/pgtable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  linux/arch/i386/mm/pgtable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -30,7 +29,6 @@ void show_mem(void)</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	pg_data_t *pgdat;</div><div class='ctx'> 	unsigned long i;</div><div class='del'>-	struct page_state ps;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Mem-info:\n");</div><div class='hunk'>@@ -58,12 +56,13 @@ void show_mem(void)</div><div class='ctx'> 	printk(KERN_INFO "%d pages shared\n", shared);</div><div class='ctx'> 	printk(KERN_INFO "%d pages swap cached\n", cached);</div><div class='ctx'> </div><div class='del'>-	get_page_state(&amp;ps);</div><div class='del'>-	printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);</div><div class='del'>-	printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);</div><div class='del'>-	printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);</div><div class='del'>-	printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);</div><div class='del'>-	printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);</div><div class='add'>+	printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_FILE_DIRTY));</div><div class='add'>+	printk(KERN_INFO "%lu pages writeback\n",</div><div class='add'>+					global_page_state(NR_WRITEBACK));</div><div class='add'>+	printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));</div><div class='add'>+	printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB));</div><div class='add'>+	printk(KERN_INFO "%lu pages pagetables\n",</div><div class='add'>+					global_page_state(NR_PAGETABLE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c<br/>index ec0fd3cfa774..c8c1df8ff2b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/oprofile/nmi_int.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/nmi_int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/oprofile/nmi_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/oprofile/nmi_int.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='hunk'>@@ -281,9 +282,9 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; model-&gt;num_counters; ++i) {</div><div class='ctx'> 		struct dentry * dir;</div><div class='del'>-		char buf[2];</div><div class='add'>+		char buf[4];</div><div class='ctx'>  </div><div class='del'>-		snprintf(buf, 2, "%d", i);</div><div class='add'>+		snprintf(buf,  sizeof(buf), "%d", i);</div><div class='ctx'> 		dir = oprofilefs_mkdir(sb, root, buf);</div><div class='ctx'> 		oprofilefs_create_ulong(sb, dir, "enabled", &amp;counter_config[i].enabled); </div><div class='ctx'> 		oprofilefs_create_ulong(sb, dir, "event", &amp;counter_config[i].event); </div><div class='hunk'>@@ -296,12 +297,14 @@ static int nmi_create_files(struct super_block * sb, struct dentry * root)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='add'>+static int p4force;</div><div class='add'>+module_param(p4force, int, 0);</div><div class='ctx'>  </div><div class='ctx'> static int __init p4_init(char ** cpu_type)</div><div class='ctx'> {</div><div class='ctx'> 	__u8 cpu_model = boot_cpu_data.x86_model;</div><div class='ctx'> </div><div class='del'>-	if (cpu_model &gt; 4)</div><div class='add'>+	if (!p4force &amp;&amp; (cpu_model &gt; 6 || cpu_model == 5))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='head'>diff --git a/arch/i386/oprofile/op_model_athlon.c b/arch/i386/oprofile/op_model_athlon.c<br/>index 3ad9a72a5036..693bdea4a52b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/oprofile/op_model_athlon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/op_model_athlon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/oprofile/op_model_athlon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/oprofile/op_model_athlon.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'>  </div><div class='ctx'> #include "op_x86_model.h"</div><div class='ctx'> #include "op_counter.h"</div><div class='head'>diff --git a/arch/i386/oprofile/op_model_p4.c b/arch/i386/oprofile/op_model_p4.c<br/>index ac8a066035c2..7c61d357b82b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/oprofile/op_model_p4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/op_model_p4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/oprofile/op_model_p4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/oprofile/op_model_p4.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "op_x86_model.h"</div><div class='ctx'> #include "op_counter.h"</div><div class='head'>diff --git a/arch/i386/oprofile/op_model_ppro.c b/arch/i386/oprofile/op_model_ppro.c<br/>index d719015fc044..5c3ab4b027ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/oprofile/op_model_ppro.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/oprofile/op_model_ppro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/oprofile/op_model_ppro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/oprofile/op_model_ppro.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'>  </div><div class='ctx'> #include "op_x86_model.h"</div><div class='ctx'> #include "op_counter.h"</div><div class='head'>diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c<br/>index dbece776c5b2..0a362e3aeac5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/common.c</a></div><div class='hunk'>@@ -17,10 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI_BIOS</div><div class='del'>-extern  void pcibios_sort(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |</div><div class='ctx'> 				PCI_PROBE_MMCONF;</div><div class='ctx'> </div><div class='hunk'>@@ -288,6 +284,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> </div><div class='ctx'> void pcibios_disable_device (struct pci_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	pcibios_disable_resources(dev);</div><div class='ctx'> 	if (pcibios_disable_irq)</div><div class='ctx'> 		pcibios_disable_irq(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c<br/>index ed2c8c899bd3..10154a2cac68 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/i386.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/i386.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/i386.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/i386.c</a></div><div class='hunk'>@@ -48,10 +48,10 @@</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-		       unsigned long size, unsigned long align)</div><div class='add'>+			resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='ctx'> 			start = (start + 0x3ff) &amp; ~0x3ff;</div><div class='hunk'>@@ -242,6 +242,15 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void pcibios_disable_resources(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u16 cmd;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(dev, PCI_COMMAND, &amp;cmd);</div><div class='add'>+	cmd &amp;= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY);</div><div class='add'>+	pci_write_config_word(dev, PCI_COMMAND, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  If we set up a device for bus mastering, we need to check the latency</div><div class='ctx'>  *  timer as certain crappy BIOSes forget to set it properly.</div><div class='hunk'>@@ -276,8 +285,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 	/* Leave vm_pgoff as-is, the PCI space address is the physical</div><div class='ctx'> 	 * address on this platform.</div><div class='ctx'> 	 */</div><div class='del'>-	vma-&gt;vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);</div><div class='del'>-</div><div class='ctx'> 	prot = pgprot_val(vma-&gt;vm_page_prot);</div><div class='ctx'> 	if (boot_cpu_data.x86 &gt; 3)</div><div class='ctx'> 		prot |= _PAGE_PCD | _PAGE_PWT;</div><div class='head'>diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c<br/>index f9156d3ac723..c7650a7e0b07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/init.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "pci.h"</div><div class='head'>diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c<br/>index 06dab00aaadc..4a8995c9c762 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/irq.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *	(c) 1999--2000 Martin Mares &lt;mj@ucw.cz&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -198,14 +197,14 @@ static void write_config_nybble(struct pci_dev *router, unsigned offset, unsigne</div><div class='ctx'>  */</div><div class='ctx'> static int pirq_ali_get(struct pci_dev *router, struct pci_dev *dev, int pirq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char irqmap[16] = { 0, 9, 3, 10, 4, 5, 7, 6, 1, 11, 0, 12, 0, 14, 0, 15 };</div><div class='add'>+	static const unsigned char irqmap[16] = { 0, 9, 3, 10, 4, 5, 7, 6, 1, 11, 0, 12, 0, 14, 0, 15 };</div><div class='ctx'> </div><div class='ctx'> 	return irqmap[read_config_nybble(router, 0x48, pirq-1)];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pirq_ali_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char irqmap[16] = { 0, 8, 0, 2, 4, 5, 7, 6, 0, 1, 3, 9, 11, 0, 13, 15 };</div><div class='add'>+	static const unsigned char irqmap[16] = { 0, 8, 0, 2, 4, 5, 7, 6, 0, 1, 3, 9, 11, 0, 13, 15 };</div><div class='ctx'> 	unsigned int val = irqmap[irq];</div><div class='ctx'> 		</div><div class='ctx'> 	if (val) {</div><div class='hunk'>@@ -256,13 +255,13 @@ static int pirq_via_set(struct pci_dev *router, struct pci_dev *dev, int pirq, i</div><div class='ctx'>  */</div><div class='ctx'> static int pirq_via586_get(struct pci_dev *router, struct pci_dev *dev, int pirq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int pirqmap[4] = { 3, 2, 5, 1 };</div><div class='add'>+	static const unsigned int pirqmap[4] = { 3, 2, 5, 1 };</div><div class='ctx'> 	return read_config_nybble(router, 0x55, pirqmap[pirq-1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int pirqmap[4] = { 3, 2, 5, 1 };</div><div class='add'>+	static const unsigned int pirqmap[4] = { 3, 2, 5, 1 };</div><div class='ctx'> 	write_config_nybble(router, 0x55, pirqmap[pirq-1], irq);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -274,13 +273,13 @@ static int pirq_via586_set(struct pci_dev *router, struct pci_dev *dev, int pirq</div><div class='ctx'>  */</div><div class='ctx'> static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char pirqmap[4] = { 1, 0, 2, 3 };</div><div class='add'>+	static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };</div><div class='ctx'> 	return read_config_nybble(router,0x43, pirqmap[pirq-1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char pirqmap[4] = { 1, 0, 2, 3 };</div><div class='add'>+	static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };</div><div class='ctx'> 	write_config_nybble(router, 0x43, pirqmap[pirq-1], irq);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -505,7 +504,7 @@ static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq,</div><div class='ctx'> </div><div class='ctx'> static __init int intel_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)</div><div class='ctx'> {</div><div class='del'>-	static struct pci_device_id pirq_440gx[] = {</div><div class='add'>+	static struct pci_device_id __initdata pirq_440gx[] = {</div><div class='ctx'> 		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },</div><div class='ctx'> 		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) },</div><div class='ctx'> 		{ },</div><div class='hunk'>@@ -865,7 +864,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)</div><div class='ctx'> 		for (i = 0; i &lt; 16; i++) {</div><div class='ctx'> 			if (!(mask &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 				continue;</div><div class='del'>-			if (pirq_penalty[i] &lt; pirq_penalty[newirq] &amp;&amp; can_request_irq(i, SA_SHIRQ))</div><div class='add'>+			if (pirq_penalty[i] &lt; pirq_penalty[newirq] &amp;&amp; can_request_irq(i, IRQF_SHARED))</div><div class='ctx'> 				newirq = i;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -880,6 +879,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)</div><div class='ctx'> 	((!(pci_probe &amp; PCI_USE_PIRQ_MASK)) || ((1 &lt;&lt; irq) &amp; mask)) ) {</div><div class='ctx'> 		DBG(" -&gt; got IRQ %d\n", irq);</div><div class='ctx'> 		msg = "Found";</div><div class='add'>+		eisa_set_level_irq(irq);</div><div class='ctx'> 	} else if (newirq &amp;&amp; r-&gt;set &amp;&amp; (dev-&gt;class &gt;&gt; 8) != PCI_CLASS_DISPLAY_VGA) {</div><div class='ctx'> 		DBG(" -&gt; assigning IRQ %d", newirq);</div><div class='ctx'> 		if (r-&gt;set(pirq_router_dev, dev, pirq, newirq)) {</div><div class='head'>diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c<br/>index 6b1ea0c9a570..e545b0992c48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/mmconfig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/mmconfig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/mmconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/mmconfig.c</a></div><div class='hunk'>@@ -15,7 +15,9 @@</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='del'>-#define MMCONFIG_APER_SIZE (256*1024*1024)</div><div class='add'>+/* aperture is up to 256MB but BIOS may reserve less */</div><div class='add'>+#define MMCONFIG_APER_MIN	(2 * 1024*1024)</div><div class='add'>+#define MMCONFIG_APER_MAX	(256 * 1024*1024)</div><div class='ctx'> </div><div class='ctx'> /* Assume systems with more busses have correct MCFG */</div><div class='ctx'> #define MAX_CHECK_BUS 16</div><div class='hunk'>@@ -197,9 +199,10 @@ void __init pci_mmcfg_init(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!e820_all_mapped(pci_mmcfg_config[0].base_address,</div><div class='del'>-			pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,</div><div class='add'>+			pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,</div><div class='ctx'> 			E820_RESERVED)) {</div><div class='del'>-		printk(KERN_ERR "PCI: BIOS Bug: MCFG area is not E820-reserved\n");</div><div class='add'>+		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",</div><div class='add'>+				pci_mmcfg_config[0].base_address);</div><div class='ctx'> 		printk(KERN_ERR "PCI: Not using MMCONFIG.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c<br/>index 1eec0868f4b3..ed1512a175ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/pcbios.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/pcbios.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/pcbios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/pcbios.c</a></div><div class='hunk'>@@ -371,8 +371,7 @@ void __devinit pcibios_sort(void)</div><div class='ctx'> 			list_for_each(ln, &amp;pci_devices) {</div><div class='ctx'> 				d = pci_dev_g(ln);</div><div class='ctx'> 				if (d-&gt;bus-&gt;number == bus &amp;&amp; d-&gt;devfn == devfn) {</div><div class='del'>-					list_del(&amp;d-&gt;global_list);</div><div class='del'>-					list_add_tail(&amp;d-&gt;global_list, &amp;sorted_devices);</div><div class='add'>+					list_move_tail(&amp;d-&gt;global_list, &amp;sorted_devices);</div><div class='ctx'> 					if (d == dev)</div><div class='ctx'> 						found = 1;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -390,8 +389,7 @@ void __devinit pcibios_sort(void)</div><div class='ctx'> 		if (!found) {</div><div class='ctx'> 			printk(KERN_WARNING "PCI: Device %s not found by BIOS\n",</div><div class='ctx'> 				pci_name(dev));</div><div class='del'>-			list_del(&amp;dev-&gt;global_list);</div><div class='del'>-			list_add_tail(&amp;dev-&gt;global_list, &amp;sorted_devices);</div><div class='add'>+			list_move_tail(&amp;dev-&gt;global_list, &amp;sorted_devices);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	list_splice(&amp;sorted_devices, &amp;pci_devices);</div><div class='head'>diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h<br/>index 12035e29108b..bf4e79335388 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/pci.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/pci.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@ extern unsigned int pcibios_max_latency;</div><div class='ctx'> </div><div class='ctx'> void pcibios_resource_survey(void);</div><div class='ctx'> int pcibios_enable_resources(struct pci_dev *, int);</div><div class='add'>+void pcibios_disable_resources(struct pci_dev *);</div><div class='ctx'> </div><div class='ctx'> /* pci-pc.c */</div><div class='ctx'> </div><div class='hunk'>@@ -83,4 +84,4 @@ extern int pci_conf1_read(unsigned int seg, unsigned int bus,</div><div class='ctx'> extern void pci_direct_init(void);</div><div class='ctx'> extern void pci_pcbios_init(void);</div><div class='ctx'> extern void pci_mmcfg_init(void);</div><div class='del'>-</div><div class='add'>+extern void pcibios_sort(void);</div><div class='head'>diff --git a/arch/i386/pci/visws.c b/arch/i386/pci/visws.c<br/>index 6c17433fdf7d..f1b486d4190b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/pci/visws.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/pci/visws.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/pci/visws.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/pci/visws.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *	(c) 1999--2000 Martin Mares &lt;mj@ucw.cz&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c<br/>index 79b2370c7fac..5a1abeff033b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/i386/power/cpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/i386/power/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/i386/power/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/i386/power/cpu.c</a></div><div class='hunk'>@@ -7,9 +7,10 @@</div><div class='ctx'>  * Copyright (c) 2001 Patrick Mochel &lt;mochel@osdl.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;asm/mtrr.h&gt;</div><div class='add'>+#include &lt;asm/mce.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct saved_context saved_context;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig<br/>index 0f3076a820c3..47de9ee6bcd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/Kconfig</a></div><div class='hunk'>@@ -70,6 +70,11 @@ config DMA_IS_DMA32</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config DMA_IS_NORMAL</div><div class='add'>+	bool</div><div class='add'>+	depends on IA64_SGI_SN2</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "System type"</div><div class='ctx'> 	default IA64_GENERIC</div><div class='hunk'>@@ -77,6 +82,7 @@ choice</div><div class='ctx'> config IA64_GENERIC</div><div class='ctx'> 	bool "generic"</div><div class='ctx'> 	select ACPI</div><div class='add'>+	select PCI</div><div class='ctx'> 	select NUMA</div><div class='ctx'> 	select ACPI_NUMA</div><div class='ctx'> 	help</div><div class='hunk'>@@ -270,10 +276,12 @@ config HOTPLUG_CPU</div><div class='ctx'> 	  can be controlled through /sys/devices/system/cpu/cpu#.</div><div class='ctx'> 	  Say N if you want to disable CPU hotplug.</div><div class='ctx'> </div><div class='add'>+config ARCH_ENABLE_MEMORY_HOTPLUG</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='ctx'> config SCHED_SMT</div><div class='ctx'> 	bool "SMT scheduler support"</div><div class='ctx'> 	depends on SMP</div><div class='del'>-	default off</div><div class='ctx'> 	help</div><div class='ctx'> 	  Improves the CPU scheduler's decision making when dealing with</div><div class='ctx'> 	  Intel IA64 chips with MultiThreading at a cost of slightly increased</div><div class='hunk'>@@ -374,6 +382,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on NEED_MULTIPLE_NODES</div><div class='ctx'> </div><div class='add'>+config HAVE_ARCH_NODEDATA_EXTENSION</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on NUMA</div><div class='add'>+</div><div class='ctx'> config IA32_SUPPORT</div><div class='ctx'> 	bool "Support for Linux/x86 binaries"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -449,6 +461,8 @@ config PCI_DOMAINS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default PCI</div><div class='ctx'> </div><div class='add'>+source "drivers/pci/pcie/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/pci/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/pci/hotplug/Kconfig"</div><div class='hunk'>@@ -483,6 +497,10 @@ config GENERIC_PENDING_IRQ</div><div class='ctx'> 	depends on GENERIC_HARDIRQS &amp;&amp; SMP</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config IRQ_PER_CPU</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source "arch/ia64/hp/sim/Kconfig"</div><div class='ctx'> </div><div class='ctx'> menu "Instrumentation Support"</div><div class='head'>diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile<br/>index 80ea7506fa1a..21033ed83307 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/Makefile</a></div><div class='hunk'>@@ -71,6 +71,8 @@ all: compressed unwcheck</div><div class='ctx'> </div><div class='ctx'> compressed: vmlinux.gz</div><div class='ctx'> </div><div class='add'>+vmlinuz: vmlinux.gz</div><div class='add'>+</div><div class='ctx'> vmlinux.gz: vmlinux</div><div class='ctx'> 	$(Q)$(MAKE) $(build)=$(boot) $@</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig<br/>index 766bf4955432..9d1cffb57cde 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/configs/tiger_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/configs/tiger_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/configs/tiger_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/configs/tiger_defconfig</a></div><div class='hunk'>@@ -114,7 +114,7 @@ CONFIG_IA64_CYCLONE=y</div><div class='ctx'> CONFIG_IOSAPIC=y</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=17</div><div class='ctx'> CONFIG_SMP=y</div><div class='del'>-CONFIG_NR_CPUS=4</div><div class='add'>+CONFIG_NR_CPUS=16</div><div class='ctx'> CONFIG_HOTPLUG_CPU=y</div><div class='ctx'> CONFIG_PERMIT_BSP_REMOVE=y</div><div class='ctx'> CONFIG_FORCE_CPEI_RETARGET=y</div><div class='head'>diff --git a/arch/ia64/dig/setup.c b/arch/ia64/dig/setup.c<br/>index 38aa9c108857..9196b330ff7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/dig/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/dig/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/dig/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/dig/setup.c</a></div><div class='hunk'>@@ -8,14 +8,13 @@</div><div class='ctx'>  * Copyright (C) 1999 Walt Drummond &lt;drummond@valinux.com&gt;</div><div class='ctx'>  * Copyright (C) 1999 Vijay Chander &lt;vijay@engr.sgi.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c<br/>index bdccd0b1eb60..db8e1fcfa047 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/common/sba_iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/common/sba_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/common/sba_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/common/sba_iommu.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> **</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -1958,7 +1957,7 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)</div><div class='ctx'> 	if (pxm &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	node = pxm_to_nid_map[pxm];</div><div class='add'>+	node = pxm_to_node(pxm);</div><div class='ctx'> </div><div class='ctx'> 	if (node &gt;= MAX_NUMNODES || !node_online(node))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1999,7 +1998,7 @@ acpi_sba_ioc_add(struct acpi_device *device)</div><div class='ctx'> 		if (!iovp_shift)</div><div class='ctx'> 			iovp_shift = min(PAGE_SHIFT, 16);</div><div class='ctx'> 	}</div><div class='del'>-	ACPI_MEM_FREE(dev_info);</div><div class='add'>+	kfree(dev_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * default anything not caught above or specified on cmdline to 4k</div><div class='head'>diff --git a/arch/ia64/hp/sim/boot/bootloader.c b/arch/ia64/hp/sim/boot/bootloader.c<br/>index 51a7b7b4dd0e..c5e9baafafe0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/boot/bootloader.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/boot/bootloader.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/boot/bootloader.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/boot/bootloader.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> struct task_struct;	/* forward declaration for elf.h */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c<br/>index 30fdfb1d0a53..5a0a7afcfc3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/boot/fw-emu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/boot/fw-emu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/boot/fw-emu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/boot/fw-emu.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1998-2001 Hewlett-Packard Co</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> # include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c<br/>index 5deff21e5877..6e149c8ab835 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/hpsim_console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/hpsim_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/hpsim_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/hpsim_console.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  * Copyright (C) 1999 Vijay Chander &lt;vijay@engr.sgi.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c<br/>index c0d25a2a3e9c..8145547bb52d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/hpsim_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/hpsim_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/hpsim_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/hpsim_irq.c</a></div><div class='hunk'>@@ -44,8 +44,8 @@ hpsim_irq_init (void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; ++i) {</div><div class='del'>-		idesc = irq_descp(i);</div><div class='del'>-		if (idesc-&gt;handler == &amp;no_irq_type)</div><div class='del'>-			idesc-&gt;handler = &amp;irq_type_hp_sim;</div><div class='add'>+		idesc = irq_desc + i;</div><div class='add'>+		if (idesc-&gt;chip == &amp;no_irq_type)</div><div class='add'>+			idesc-&gt;chip = &amp;irq_type_hp_sim;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c<br/>index 694fc86bfbd5..f2297192a582 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/hpsim_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/hpsim_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/hpsim_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/hpsim_setup.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  * Copyright (C) 1999 Vijay Chander &lt;vijay@engr.sgi.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='head'>diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c<br/>index 0639ec0ed015..b5195be62818 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/simeth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/simeth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/simeth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/simeth.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1999-2001, 2003 Hewlett-Packard Co</div><div class='ctx'>  *	Stephane Eranian &lt;eranian@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c<br/>index 0e5c6ae50228..0daacc20ed36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/simserial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/hp/sim/simserial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/hp/sim/simserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/hp/sim/simserial.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * 07/30/02 D. Mosberger	Replace sti()/cli() with explicit spinlocks &amp; local irq masking</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -47,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> #define NR_PORTS	1	/* only one port for now */</div><div class='ctx'> </div><div class='del'>-#define IRQ_T(info) ((info-&gt;flags &amp; ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)</div><div class='add'>+#define IRQ_T(info) ((info-&gt;flags &amp; ASYNC_SHARE_IRQ) ? IRQF_SHARED : IRQF_DISABLED)</div><div class='ctx'> </div><div class='ctx'> #define SSC_GETCHAR	21</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/ia32/Makefile b/arch/ia64/ia32/Makefile<br/>index 61cb60affd95..baad8c7699c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/ia32/Makefile</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \</div><div class='ctx'> 	 ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o</div><div class='add'>+obj-$(CONFIG_AUDIT) += audit.o</div><div class='ctx'> </div><div class='ctx'> # Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and</div><div class='ctx'> # restore_ia32_fpstate_live() can be sure the live register contain user-level state.</div><div class='head'>diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c<br/>new file mode 100644<br/>index 000000000000..ab94f2e58cdd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/ia32/audit.c</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#include &lt;asm-i386/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned ia32_dir_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_dir_write.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+unsigned ia32_chattr_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_change_attr.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='head'>diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c<br/>index da03c06744f1..daa6b91bc921 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/binfmt_elf32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/binfmt_elf32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/ia32/binfmt_elf32.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 04/13/01	D. Mosberger	dropped saving tssd in ar.k1---it's not needed</div><div class='ctx'>  * 09/14/01	D. Mosberger	fixed memory management for gdt/tss page</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h<br/>index ccb98ed48e58..703a67c934f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/ia32priv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/ia32priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/ia32priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/ia32/ia32priv.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _ASM_IA64_IA32_PRIV_H</div><div class='ctx'> #define _ASM_IA64_IA32_PRIV_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ia32.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c<br/>index 5366b3b23d09..6aa3c51619ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/ia32/sys_ia32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/ia32/sys_ia32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/ia32/sys_ia32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/ia32/sys_ia32.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * environment.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile<br/>index 09a0dbc17fb6..0e4553f320bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/Makefile</a></div><div class='hunk'>@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/</div><div class='ctx'> obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o</div><div class='ctx'> obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o</div><div class='ctx'> obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o</div><div class='add'>+obj-$(CONFIG_AUDIT)		+= audit.o</div><div class='ctx'> mca_recovery-y			+= mca_drv.o mca_drv_asm.o</div><div class='ctx'> </div><div class='ctx'> # The gate DSO image is built using a special linker script.</div><div class='head'>diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c<br/>index fff82929d225..b7515bc808a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/acpi-ext.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/acpi-ext.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/acpi-ext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/acpi-ext.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='hunk'>@@ -51,7 +50,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length)</div><div class='ctx'> 	memcpy(length, vendor-&gt;byte_data + 8, sizeof(*length));</div><div class='ctx'> </div><div class='ctx'>   exit:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c<br/>index 58c93a30348c..99761b81db44 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/acpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/acpi.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -68,8 +67,6 @@ EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> unsigned char acpi_kbd_controller_present = 1;</div><div class='ctx'> unsigned char acpi_legacy_devices;</div><div class='ctx'> </div><div class='del'>-static unsigned int __initdata acpi_madt_rev;</div><div class='del'>-</div><div class='ctx'> unsigned int acpi_cpei_override;</div><div class='ctx'> unsigned int acpi_cpei_phys_cpuid;</div><div class='ctx'> </div><div class='hunk'>@@ -243,6 +240,8 @@ acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end)</div><div class='ctx'> 	return iosapic_init(iosapic-&gt;address, iosapic-&gt;global_irq_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int __initdata acpi_madt_rev;</div><div class='add'>+</div><div class='ctx'> static int __init</div><div class='ctx'> acpi_parse_plat_int_src(acpi_table_entry_header * header,</div><div class='ctx'> 			const unsigned long end)</div><div class='hunk'>@@ -415,9 +414,6 @@ static int __initdata srat_num_cpus;	/* number of cpus */</div><div class='ctx'> static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];</div><div class='ctx'> #define pxm_bit_set(bit)	(set_bit(bit,(void *)pxm_flag))</div><div class='ctx'> #define pxm_bit_test(bit)	(test_bit(bit,(void *)pxm_flag))</div><div class='del'>-/* maps to convert between proximity domain and logical node ID */</div><div class='del'>-int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];</div><div class='del'>-int __initdata nid_to_pxm_map[MAX_NUMNODES];</div><div class='ctx'> static struct acpi_table_slit __initdata *slit_table;</div><div class='ctx'> </div><div class='ctx'> static int get_processor_proximity_domain(struct acpi_table_processor_affinity *pa)</div><div class='hunk'>@@ -533,22 +529,17 @@ void __init acpi_numa_arch_fixup(void)</div><div class='ctx'> 	 * MCD - This can probably be dropped now.  No need for pxm ID to node ID</div><div class='ctx'> 	 * mapping with sparse node numbering iff MAX_PXM_DOMAINS &lt;= MAX_NUMNODES.</div><div class='ctx'> 	 */</div><div class='del'>-	/* calculate total number of nodes in system from PXM bitmap */</div><div class='del'>-	memset(pxm_to_nid_map, -1, sizeof(pxm_to_nid_map));</div><div class='del'>-	memset(nid_to_pxm_map, -1, sizeof(nid_to_pxm_map));</div><div class='ctx'> 	nodes_clear(node_online_map);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_PXM_DOMAINS; i++) {</div><div class='ctx'> 		if (pxm_bit_test(i)) {</div><div class='del'>-			int nid = num_online_nodes();</div><div class='del'>-			pxm_to_nid_map[i] = nid;</div><div class='del'>-			nid_to_pxm_map[nid] = i;</div><div class='add'>+			int nid = acpi_map_pxm_to_node(i);</div><div class='ctx'> 			node_set_online(nid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set logical node id in memory chunk structure */</div><div class='ctx'> 	for (i = 0; i &lt; num_node_memblks; i++)</div><div class='del'>-		node_memblk[i].nid = pxm_to_nid_map[node_memblk[i].nid];</div><div class='add'>+		node_memblk[i].nid = pxm_to_node(node_memblk[i].nid);</div><div class='ctx'> </div><div class='ctx'> 	/* assign memory bank numbers for each chunk on each node */</div><div class='ctx'> 	for_each_online_node(i) {</div><div class='hunk'>@@ -562,7 +553,7 @@ void __init acpi_numa_arch_fixup(void)</div><div class='ctx'> </div><div class='ctx'> 	/* set logical node id in cpu structure */</div><div class='ctx'> 	for (i = 0; i &lt; srat_num_cpus; i++)</div><div class='del'>-		node_cpuid[i].nid = pxm_to_nid_map[node_cpuid[i].nid];</div><div class='add'>+		node_cpuid[i].nid = pxm_to_node(node_cpuid[i].nid);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Number of logical nodes in system = %d\n",</div><div class='ctx'> 	       num_online_nodes());</div><div class='hunk'>@@ -575,11 +566,11 @@ void __init acpi_numa_arch_fixup(void)</div><div class='ctx'> 	for (i = 0; i &lt; slit_table-&gt;localities; i++) {</div><div class='ctx'> 		if (!pxm_bit_test(i))</div><div class='ctx'> 			continue;</div><div class='del'>-		node_from = pxm_to_nid_map[i];</div><div class='add'>+		node_from = pxm_to_node(i);</div><div class='ctx'> 		for (j = 0; j &lt; slit_table-&gt;localities; j++) {</div><div class='ctx'> 			if (!pxm_bit_test(j))</div><div class='ctx'> 				continue;</div><div class='del'>-			node_to = pxm_to_nid_map[j];</div><div class='add'>+			node_to = pxm_to_node(j);</div><div class='ctx'> 			node_distance(node_from, node_to) =</div><div class='ctx'> 			    slit_table-&gt;entry[i * slit_table-&gt;localities + j];</div><div class='ctx'> 		}</div><div class='hunk'>@@ -626,7 +617,7 @@ EXPORT_SYMBOL(acpi_unregister_gsi);</div><div class='ctx'> static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_header *fadt_header;</div><div class='del'>-	struct fadt_descriptor_rev2 *fadt;</div><div class='add'>+	struct fadt_descriptor *fadt;</div><div class='ctx'> </div><div class='ctx'> 	if (!phys_addr || !size)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -635,7 +626,7 @@ static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)</div><div class='ctx'> 	if (fadt_header-&gt;revision != 3)</div><div class='ctx'> 		return -ENODEV;	/* Only deal with ACPI 2.0 FADT */</div><div class='ctx'> </div><div class='del'>-	fadt = (struct fadt_descriptor_rev2 *)fadt_header;</div><div class='add'>+	fadt = (struct fadt_descriptor *)fadt_header;</div><div class='ctx'> </div><div class='ctx'> 	if (!(fadt-&gt;iapc_boot_arch &amp; BAF_8042_KEYBOARD_CONTROLLER))</div><div class='ctx'> 		acpi_kbd_controller_present = 0;</div><div class='hunk'>@@ -785,9 +776,9 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, long physid)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Assuming that the container driver would have set the proximity</div><div class='del'>-	 * domain and would have initialized pxm_to_nid_map[pxm_id] &amp;&amp; pxm_flag</div><div class='add'>+	 * domain and would have initialized pxm_to_node(pxm_id) &amp;&amp; pxm_flag</div><div class='ctx'> 	 */</div><div class='del'>-	node_cpuid[cpu].nid = (pxm_id &lt; 0) ? 0 : pxm_to_nid_map[pxm_id];</div><div class='add'>+	node_cpuid[cpu].nid = (pxm_id &lt; 0) ? 0 : pxm_to_node(pxm_id);</div><div class='ctx'> </div><div class='ctx'> 	node_cpuid[cpu].phys_id = physid;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -865,7 +856,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)</div><div class='ctx'> 	obj = buffer.pointer;</div><div class='ctx'> 	if (obj-&gt;type != ACPI_TYPE_BUFFER ||</div><div class='ctx'> 	    obj-&gt;buffer.length &lt; sizeof(*lsapic)) {</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -873,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)</div><div class='ctx'> </div><div class='ctx'> 	if ((lsapic-&gt;header.type != ACPI_MADT_LSAPIC) ||</div><div class='ctx'> 	    (!lsapic-&gt;flags.enabled)) {</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	physid = ((lsapic-&gt;id &lt;&lt; 8) | (lsapic-&gt;eid));</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> 	buffer.length = ACPI_ALLOCATE_BUFFER;</div><div class='ctx'> 	buffer.pointer = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -943,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)</div><div class='ctx'> 	obj = buffer.pointer;</div><div class='ctx'> 	if (obj-&gt;type != ACPI_TYPE_BUFFER ||</div><div class='ctx'> 	    obj-&gt;buffer.length &lt; sizeof(*iosapic)) {</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iosapic = (struct acpi_table_iosapic *)obj-&gt;buffer.pointer;</div><div class='ctx'> </div><div class='ctx'> 	if (iosapic-&gt;header.type != ACPI_MADT_IOSAPIC) {</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gsi_base = iosapic-&gt;global_irq_base;</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell</div><div class='hunk'>@@ -966,7 +957,7 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)</div><div class='ctx'> 	if (pxm &lt; 0)</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> </div><div class='del'>-	node = pxm_to_nid_map[pxm];</div><div class='add'>+	node = pxm_to_node(pxm);</div><div class='ctx'> </div><div class='ctx'> 	if (node &gt;= MAX_NUMNODES || !node_online(node) ||</div><div class='ctx'> 	    cpus_empty(node_to_cpumask(node)))</div><div class='head'>diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c<br/>index 77225659e968..75a2a2c12258 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ASM_OFFSETS_C 1</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -217,16 +216,24 @@ void foo(void)</div><div class='ctx'> 	DEFINE(IA64_MCA_CPU_INIT_STACK_OFFSET,</div><div class='ctx'> 	       offsetof (struct ia64_mca_cpu, init_stack));</div><div class='ctx'> 	BLANK();</div><div class='del'>-	DEFINE(IA64_SAL_OS_STATE_COMMON_OFFSET,</div><div class='del'>-	       offsetof (struct ia64_sal_os_state, sal_ra));</div><div class='ctx'> 	DEFINE(IA64_SAL_OS_STATE_OS_GP_OFFSET,</div><div class='ctx'> 	       offsetof (struct ia64_sal_os_state, os_gp));</div><div class='del'>-	DEFINE(IA64_SAL_OS_STATE_PAL_MIN_STATE_OFFSET,</div><div class='del'>-	       offsetof (struct ia64_sal_os_state, pal_min_state));</div><div class='ctx'> 	DEFINE(IA64_SAL_OS_STATE_PROC_STATE_PARAM_OFFSET,</div><div class='ctx'> 	       offsetof (struct ia64_sal_os_state, proc_state_param));</div><div class='add'>+	DEFINE(IA64_SAL_OS_STATE_SAL_RA_OFFSET,</div><div class='add'>+	       offsetof (struct ia64_sal_os_state, sal_ra));</div><div class='add'>+	DEFINE(IA64_SAL_OS_STATE_SAL_GP_OFFSET,</div><div class='add'>+	       offsetof (struct ia64_sal_os_state, sal_gp));</div><div class='add'>+	DEFINE(IA64_SAL_OS_STATE_PAL_MIN_STATE_OFFSET,</div><div class='add'>+	       offsetof (struct ia64_sal_os_state, pal_min_state));</div><div class='add'>+	DEFINE(IA64_SAL_OS_STATE_OS_STATUS_OFFSET,</div><div class='add'>+	       offsetof (struct ia64_sal_os_state, os_status));</div><div class='add'>+	DEFINE(IA64_SAL_OS_STATE_CONTEXT_OFFSET,</div><div class='add'>+	       offsetof (struct ia64_sal_os_state, context));</div><div class='ctx'> 	DEFINE(IA64_SAL_OS_STATE_SIZE,</div><div class='ctx'> 	       sizeof (struct ia64_sal_os_state));</div><div class='add'>+	BLANK();</div><div class='add'>+</div><div class='ctx'> 	DEFINE(IA64_PMSA_GR_OFFSET,</div><div class='ctx'> 	       offsetof (struct pal_min_state_area_s, pmsa_gr));</div><div class='ctx'> 	DEFINE(IA64_PMSA_BANK1_GR_OFFSET,</div><div class='head'>diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c<br/>new file mode 100644<br/>index 000000000000..f2512931ccaf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/audit.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/audit.h&gt;</div><div class='add'>+#include &lt;asm/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+static unsigned dir_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_dir_write.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned chattr_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_change_attr.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init audit_classes_init(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IA32_SUPPORT</div><div class='add'>+	extern __u32 ia32_dir_class[];</div><div class='add'>+	extern __u32 ia32_chattr_class[];</div><div class='add'>+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);</div><div class='add'>+	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);</div><div class='add'>+#endif</div><div class='add'>+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);</div><div class='add'>+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__initcall(audit_classes_init);</div><div class='head'>diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c<br/>index 5a1bf815282d..86faf221a070 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/cpufreq/acpi-cpufreq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/cpufreq/acpi-cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/cpufreq/acpi-cpufreq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/cpufreq/acpi-cpufreq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *      Venkatesh Pallipadi &lt;venkatesh.pallipadi@intel.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c<br/>index 12cfedce73b1..e4bfa9dafbce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/efi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/efi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/efi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/efi.c</a></div><div class='hunk'>@@ -8,6 +8,8 @@</div><div class='ctx'>  * Copyright (C) 1999-2003 Hewlett-Packard Co.</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  *	Stephane Eranian &lt;eranian@hpl.hp.com&gt;</div><div class='add'>+ * (c) Copyright 2006 Hewlett-Packard Development Company, L.P.</div><div class='add'>+ *	Bjorn Helgaas &lt;bjorn.helgaas@hp.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * All EFI Runtime Services are not implemented yet as EFI only</div><div class='ctx'>  * supports physical mode addressing on SoftSDV. This is to be fixed</div><div class='hunk'>@@ -18,7 +20,6 @@</div><div class='ctx'>  * Goutham Rao: &lt;goutham.rao@intel.com&gt;</div><div class='ctx'>  *	Skip non-WB memory and ignore empty memory ranges.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -622,28 +623,20 @@ efi_get_iobase (void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static efi_memory_desc_t *</div><div class='del'>-efi_memory_descriptor (unsigned long phys_addr)</div><div class='add'>+static struct kern_memdesc *</div><div class='add'>+kern_memory_descriptor (unsigned long phys_addr)</div><div class='ctx'> {</div><div class='del'>-	void *efi_map_start, *efi_map_end, *p;</div><div class='del'>-	efi_memory_desc_t *md;</div><div class='del'>-	u64 efi_desc_size;</div><div class='del'>-</div><div class='del'>-	efi_map_start = __va(ia64_boot_param-&gt;efi_memmap);</div><div class='del'>-	efi_map_end   = efi_map_start + ia64_boot_param-&gt;efi_memmap_size;</div><div class='del'>-	efi_desc_size = ia64_boot_param-&gt;efi_memdesc_size;</div><div class='add'>+	struct kern_memdesc *md;</div><div class='ctx'> </div><div class='del'>-	for (p = efi_map_start; p &lt; efi_map_end; p += efi_desc_size) {</div><div class='del'>-		md = p;</div><div class='del'>-</div><div class='del'>-		if (phys_addr - md-&gt;phys_addr &lt; (md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT))</div><div class='add'>+	for (md = kern_memmap; md-&gt;start != ~0UL; md++) {</div><div class='add'>+		if (phys_addr - md-&gt;start &lt; (md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT))</div><div class='ctx'> 			 return md;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-efi_memmap_has_mmio (void)</div><div class='add'>+static efi_memory_desc_t *</div><div class='add'>+efi_memory_descriptor (unsigned long phys_addr)</div><div class='ctx'> {</div><div class='ctx'> 	void *efi_map_start, *efi_map_end, *p;</div><div class='ctx'> 	efi_memory_desc_t *md;</div><div class='hunk'>@@ -656,8 +649,8 @@ efi_memmap_has_mmio (void)</div><div class='ctx'> 	for (p = efi_map_start; p &lt; efi_map_end; p += efi_desc_size) {</div><div class='ctx'> 		md = p;</div><div class='ctx'> </div><div class='del'>-		if (md-&gt;type == EFI_MEMORY_MAPPED_IO)</div><div class='del'>-			return 1;</div><div class='add'>+		if (phys_addr - md-&gt;phys_addr &lt; (md-&gt;num_pages &lt;&lt; EFI_PAGE_SHIFT))</div><div class='add'>+			 return md;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -683,71 +676,125 @@ efi_mem_attributes (unsigned long phys_addr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(efi_mem_attributes);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Determines whether the memory at phys_addr supports the desired</div><div class='del'>- * attribute (WB, UC, etc).  If this returns 1, the caller can safely</div><div class='del'>- * access size bytes at phys_addr with the specified attribute.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-efi_mem_attribute_range (unsigned long phys_addr, unsigned long size, u64 attr)</div><div class='add'>+u64</div><div class='add'>+efi_mem_attribute (unsigned long phys_addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long end = phys_addr + size;</div><div class='ctx'> 	efi_memory_desc_t *md = efi_memory_descriptor(phys_addr);</div><div class='add'>+	u64 attr;</div><div class='add'>+</div><div class='add'>+	if (!md)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * EFI_MEMORY_RUNTIME is not a memory attribute; it just tells</div><div class='add'>+	 * the kernel that firmware needs this region mapped.</div><div class='add'>+	 */</div><div class='add'>+	attr = md-&gt;attribute &amp; ~EFI_MEMORY_RUNTIME;</div><div class='add'>+	do {</div><div class='add'>+		unsigned long md_end = efi_md_end(md);</div><div class='add'>+</div><div class='add'>+		if (end &lt;= md_end)</div><div class='add'>+			return attr;</div><div class='add'>+</div><div class='add'>+		md = efi_memory_descriptor(md_end);</div><div class='add'>+		if (!md || (md-&gt;attribute &amp; ~EFI_MEMORY_RUNTIME) != attr)</div><div class='add'>+			return 0;</div><div class='add'>+	} while (md);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64</div><div class='add'>+kern_mem_attribute (unsigned long phys_addr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	unsigned long end = phys_addr + size;</div><div class='add'>+	struct kern_memdesc *md;</div><div class='add'>+	u64 attr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Some firmware doesn't report MMIO regions in the EFI memory</div><div class='del'>-	 * map.  The Intel BigSur (a.k.a. HP i2000) has this problem.</div><div class='del'>-	 * On those platforms, we have to assume UC is valid everywhere.</div><div class='add'>+	 * This is a hack for ioremap calls before we set up kern_memmap.</div><div class='add'>+	 * Maybe we should do efi_memmap_init() earlier instead.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!md || (md-&gt;attribute &amp; attr) != attr) {</div><div class='del'>-		if (attr == EFI_MEMORY_UC &amp;&amp; !efi_memmap_has_mmio())</div><div class='del'>-			return 1;</div><div class='add'>+	if (!kern_memmap) {</div><div class='add'>+		attr = efi_mem_attribute(phys_addr, size);</div><div class='add'>+		if (attr &amp; EFI_MEMORY_WB)</div><div class='add'>+			return EFI_MEMORY_WB;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	md = kern_memory_descriptor(phys_addr);</div><div class='add'>+	if (!md)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	attr = md-&gt;attribute;</div><div class='ctx'> 	do {</div><div class='del'>-		unsigned long md_end = efi_md_end(md);</div><div class='add'>+		unsigned long md_end = kmd_end(md);</div><div class='ctx'> </div><div class='ctx'> 		if (end &lt;= md_end)</div><div class='del'>-			return 1;</div><div class='add'>+			return attr;</div><div class='ctx'> </div><div class='del'>-		md = efi_memory_descriptor(md_end);</div><div class='del'>-		if (!md || (md-&gt;attribute &amp; attr) != attr)</div><div class='add'>+		md = kern_memory_descriptor(md_end);</div><div class='add'>+		if (!md || md-&gt;attribute != attr)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	} while (md);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(kern_mem_attribute);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * For /dev/mem, we only allow read &amp; write system calls to access</div><div class='del'>- * write-back memory, because read &amp; write don't allow the user to</div><div class='del'>- * control access size.</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> valid_phys_addr_range (unsigned long phys_addr, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	return efi_mem_attribute_range(phys_addr, size, EFI_MEMORY_WB);</div><div class='add'>+	u64 attr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * /dev/mem reads and writes use copy_to_user(), which implicitly</div><div class='add'>+	 * uses a granule-sized kernel identity mapping.  It's really</div><div class='add'>+	 * only safe to do this for regions in kern_memmap.  For more</div><div class='add'>+	 * details, see Documentation/ia64/aliasing.txt.</div><div class='add'>+	 */</div><div class='add'>+	attr = kern_mem_attribute(phys_addr, size);</div><div class='add'>+	if (attr &amp; EFI_MEMORY_WB || attr &amp; EFI_MEMORY_UC)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We allow mmap of anything in the EFI memory map that supports</div><div class='del'>- * either write-back or uncacheable access.  For uncacheable regions,</div><div class='del'>- * the supported access sizes are system-dependent, and the user is</div><div class='del'>- * responsible for using the correct size.</div><div class='del'>- *</div><div class='del'>- * Note that this doesn't currently allow access to hot-added memory,</div><div class='del'>- * because that doesn't appear in the boot-time EFI memory map.</div><div class='del'>- */</div><div class='ctx'> int</div><div class='del'>-valid_mmap_phys_addr_range (unsigned long phys_addr, unsigned long size)</div><div class='add'>+valid_mmap_phys_addr_range (unsigned long pfn, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	if (efi_mem_attribute_range(phys_addr, size, EFI_MEMORY_WB))</div><div class='del'>-		return 1;</div><div class='add'>+	/*</div><div class='add'>+	 * MMIO regions are often missing from the EFI memory map.</div><div class='add'>+	 * We must allow mmap of them for programs like X, so we</div><div class='add'>+	 * currently can't do any useful validation.</div><div class='add'>+	 */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (efi_mem_attribute_range(phys_addr, size, EFI_MEMORY_UC))</div><div class='del'>-		return 1;</div><div class='add'>+pgprot_t</div><div class='add'>+phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size,</div><div class='add'>+		     pgprot_t vma_prot)</div><div class='add'>+{</div><div class='add'>+	unsigned long phys_addr = pfn &lt;&lt; PAGE_SHIFT;</div><div class='add'>+	u64 attr;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/*</div><div class='add'>+	 * For /dev/mem mmap, we use user mappings, but if the region is</div><div class='add'>+	 * in kern_memmap (and hence may be covered by a kernel mapping),</div><div class='add'>+	 * we must use the same attribute as the kernel mapping.</div><div class='add'>+	 */</div><div class='add'>+	attr = kern_mem_attribute(phys_addr, size);</div><div class='add'>+	if (attr &amp; EFI_MEMORY_WB)</div><div class='add'>+		return pgprot_cacheable(vma_prot);</div><div class='add'>+	else if (attr &amp; EFI_MEMORY_UC)</div><div class='add'>+		return pgprot_noncached(vma_prot);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some chipsets don't support UC access to memory.  If</div><div class='add'>+	 * WB is supported, we prefer that.</div><div class='add'>+	 */</div><div class='add'>+	if (efi_mem_attribute(phys_addr, size) &amp; EFI_MEMORY_WB)</div><div class='add'>+		return pgprot_cacheable(vma_prot);</div><div class='add'>+</div><div class='add'>+	return pgprot_noncached(vma_prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init</div><div class='head'>diff --git a/arch/ia64/kernel/efi_stub.S b/arch/ia64/kernel/efi_stub.S<br/>index 5a7fe70212a9..a56e161d7515 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/efi_stub.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/efi_stub.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/efi_stub.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/efi_stub.S</a></div><div class='hunk'>@@ -61,7 +61,7 @@ GLOBAL_ENTRY(efi_call_phys)</div><div class='ctx'> 	or loc3=loc3,r17</div><div class='ctx'> 	mov b6=r2</div><div class='ctx'> 	;;</div><div class='del'>-	andcm r16=loc3,r16		// get psr with IT, DT, and RT bits cleared</div><div class='add'>+	andcm r16=loc3,r16	// get psr with IT, DT, and RT bits cleared</div><div class='ctx'> 	br.call.sptk.many rp=ia64_switch_mode_phys</div><div class='ctx'> .ret0:	mov out4=in5</div><div class='ctx'> 	mov out0=in1</div><div class='head'>diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S<br/>index bcb80ca5cf40..12701cf32d99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/entry.S</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *	pNonSys:	!pSys</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='hunk'>@@ -1584,7 +1583,7 @@ sys_call_table:</div><div class='ctx'> 	data8 sys_keyctl</div><div class='ctx'> 	data8 sys_ioprio_set</div><div class='ctx'> 	data8 sys_ioprio_get			// 1275</div><div class='del'>-	data8 sys_ni_syscall</div><div class='add'>+	data8 sys_move_pages</div><div class='ctx'> 	data8 sys_inotify_init</div><div class='ctx'> 	data8 sys_inotify_add_watch</div><div class='ctx'> 	data8 sys_inotify_rm_watch</div><div class='head'>diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h<br/>index 78eeb0793419..b83edac02965 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/entry.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/entry.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/entry.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/entry.h</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Preserved registers that are shared between code in ivt.S and</div><div class='hunk'>@@ -23,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #define PT(f)		(IA64_PT_REGS_##f##_OFFSET)</div><div class='ctx'> #define SW(f)		(IA64_SWITCH_STACK_##f##_OFFSET)</div><div class='add'>+#define SOS(f)		(IA64_SAL_OS_STATE_##f##_OFFSET)</div><div class='ctx'> </div><div class='ctx'> #define PT_REGS_SAVES(off)			\</div><div class='ctx'> 	.unwabi 3, 'i';				\</div><div class='head'>diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S<br/>index 86064ca98952..3274850cf272 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/gate.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/gate.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/gate.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/gate.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * 	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S<br/>index 7c99e6ec3daf..cc35cddfd4cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/gate.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/gate.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/gate.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/gate.lds.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * in one page).  This script controls its layout.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S<br/>index f1778a84ea61..561b8f1d3bc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/head.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *   Support for CPU Hotplug</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/fpu.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c<br/>index bbcfd08378a6..b7cf651ceb14 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ia64_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/ia64_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ia64_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/ia64_ksyms.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * All other exports should be put directly after the definition.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c<br/>index d58c1c5c903a..9bf15fefa7e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/iosapic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/iosapic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/iosapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/iosapic.c</a></div><div class='hunk'>@@ -79,7 +79,6 @@</div><div class='ctx'>  * describeinterrupts.  Now we use "IRQ" only for Linux IRQ's.  ISA IRQ</div><div class='ctx'>  * (isa_irq) is the only exception in this source code.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -456,7 +455,7 @@ iosapic_startup_edge_irq (unsigned int irq)</div><div class='ctx'> static void</div><div class='ctx'> iosapic_ack_edge_irq (unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *idesc = irq_descp(irq);</div><div class='add'>+	irq_desc_t *idesc = irq_desc + irq;</div><div class='ctx'> </div><div class='ctx'> 	move_native_irq(irq);</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -659,14 +658,14 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,</div><div class='ctx'> 	else</div><div class='ctx'> 		irq_type = &amp;irq_type_iosapic_level;</div><div class='ctx'> </div><div class='del'>-	idesc = irq_descp(vector);</div><div class='del'>-	if (idesc-&gt;handler != irq_type) {</div><div class='del'>-		if (idesc-&gt;handler != &amp;no_irq_type)</div><div class='add'>+	idesc = irq_desc + vector;</div><div class='add'>+	if (idesc-&gt;chip != irq_type) {</div><div class='add'>+		if (idesc-&gt;chip != &amp;no_irq_type)</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='ctx'> 			       "%s: changing vector %d from %s to %s\n",</div><div class='ctx'> 			       __FUNCTION__, vector,</div><div class='del'>-			       idesc-&gt;handler-&gt;typename, irq_type-&gt;typename);</div><div class='del'>-		idesc-&gt;handler = irq_type;</div><div class='add'>+			       idesc-&gt;chip-&gt;typename, irq_type-&gt;typename);</div><div class='add'>+		idesc-&gt;chip = irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -793,14 +792,14 @@ again:</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;irq_descp(vector)-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;irq_desc[vector].lock, flags);</div><div class='ctx'> 	spin_lock(&amp;iosapic_lock);</div><div class='ctx'> 	{</div><div class='ctx'> 		if (gsi_to_vector(gsi) &gt; 0) {</div><div class='ctx'> 			if (list_empty(&amp;iosapic_intr_info[vector].rtes))</div><div class='ctx'> 				free_irq_vector(vector);</div><div class='ctx'> 			spin_unlock(&amp;iosapic_lock);</div><div class='del'>-			spin_unlock_irqrestore(&amp;irq_descp(vector)-&gt;lock,</div><div class='add'>+			spin_unlock_irqrestore(&amp;irq_desc[vector].lock,</div><div class='ctx'> 					       flags);</div><div class='ctx'> 			goto again;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -810,7 +809,7 @@ again:</div><div class='ctx'> 			      polarity, trigger);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			spin_unlock(&amp;iosapic_lock);</div><div class='del'>-			spin_unlock_irqrestore(&amp;irq_descp(vector)-&gt;lock,</div><div class='add'>+			spin_unlock_irqrestore(&amp;irq_desc[vector].lock,</div><div class='ctx'> 					       flags);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -825,7 +824,7 @@ again:</div><div class='ctx'> 		set_rte(gsi, vector, dest, mask);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;iosapic_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_descp(vector)-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_desc[vector].lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "GSI %u (%s, %s) -&gt; CPU %d (0x%04x) vector %d\n",</div><div class='ctx'> 	       gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"),</div><div class='hunk'>@@ -860,7 +859,7 @@ iosapic_unregister_intr (unsigned int gsi)</div><div class='ctx'> 	}</div><div class='ctx'> 	vector = irq_to_vector(irq);</div><div class='ctx'> </div><div class='del'>-	idesc = irq_descp(irq);</div><div class='add'>+	idesc = irq_desc + irq;</div><div class='ctx'> 	spin_lock_irqsave(&amp;idesc-&gt;lock, flags);</div><div class='ctx'> 	spin_lock(&amp;iosapic_lock);</div><div class='ctx'> 	{</div><div class='hunk'>@@ -903,7 +902,7 @@ iosapic_unregister_intr (unsigned int gsi)</div><div class='ctx'> 			BUG_ON(iosapic_intr_info[vector].count);</div><div class='ctx'> </div><div class='ctx'> 			/* Clear the interrupt controller descriptor */</div><div class='del'>-			idesc-&gt;handler = &amp;no_irq_type;</div><div class='add'>+			idesc-&gt;chip = &amp;no_irq_type;</div><div class='ctx'> </div><div class='ctx'> 			/* Clear the interrupt information */</div><div class='ctx'> 			memset(&amp;iosapic_intr_info[vector], 0,</div><div class='head'>diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c<br/>index 9c72ea3f6432..7852382de2fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/irq.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -100,7 +100,7 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)</div><div class='ctx'> 	cpu_set(cpu_logical_id(hwid), mask);</div><div class='ctx'> </div><div class='ctx'> 	if (irq &lt; NR_IRQS) {</div><div class='del'>-		irq_affinity[irq] = mask;</div><div class='add'>+		irq_desc[irq].affinity = mask;</div><div class='ctx'> 		irq_redir[irq] = (char) (redir &amp; 0xff);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -120,7 +120,7 @@ static void migrate_irqs(void)</div><div class='ctx'> 	int 		irq, new_cpu;</div><div class='ctx'> </div><div class='ctx'> 	for (irq=0; irq &lt; NR_IRQS; irq++) {</div><div class='del'>-		desc = irq_descp(irq);</div><div class='add'>+		desc = irq_desc + irq;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No handling for now.</div><div class='hunk'>@@ -131,7 +131,7 @@ static void migrate_irqs(void)</div><div class='ctx'> 		if (desc-&gt;status == IRQ_PER_CPU)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		cpus_and(mask, irq_affinity[irq], cpu_online_map);</div><div class='add'>+		cpus_and(mask, irq_desc[irq].affinity, cpu_online_map);</div><div class='ctx'> 		if (any_online_cpu(mask) == NR_CPUS) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Save it for phase 2 processing</div><div class='hunk'>@@ -144,15 +144,15 @@ static void migrate_irqs(void)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Al three are essential, currently WARN_ON.. maybe panic?</div><div class='ctx'> 			 */</div><div class='del'>-			if (desc-&gt;handler &amp;&amp; desc-&gt;handler-&gt;disable &amp;&amp;</div><div class='del'>-				desc-&gt;handler-&gt;enable &amp;&amp; desc-&gt;handler-&gt;set_affinity) {</div><div class='del'>-				desc-&gt;handler-&gt;disable(irq);</div><div class='del'>-				desc-&gt;handler-&gt;set_affinity(irq, mask);</div><div class='del'>-				desc-&gt;handler-&gt;enable(irq);</div><div class='add'>+			if (desc-&gt;chip &amp;&amp; desc-&gt;chip-&gt;disable &amp;&amp;</div><div class='add'>+				desc-&gt;chip-&gt;enable &amp;&amp; desc-&gt;chip-&gt;set_affinity) {</div><div class='add'>+				desc-&gt;chip-&gt;disable(irq);</div><div class='add'>+				desc-&gt;chip-&gt;set_affinity(irq, mask);</div><div class='add'>+				desc-&gt;chip-&gt;enable(irq);</div><div class='ctx'> 			} else {</div><div class='del'>-				WARN_ON((!(desc-&gt;handler) || !(desc-&gt;handler-&gt;disable) ||</div><div class='del'>-						!(desc-&gt;handler-&gt;enable) ||</div><div class='del'>-						!(desc-&gt;handler-&gt;set_affinity)));</div><div class='add'>+				WARN_ON((!(desc-&gt;chip) || !(desc-&gt;chip-&gt;disable) ||</div><div class='add'>+						!(desc-&gt;chip-&gt;enable) ||</div><div class='add'>+						!(desc-&gt;chip-&gt;set_affinity)));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c<br/>index 6c4d59fd0364..a041367f043b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/irq_ia64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/irq_ia64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/irq_ia64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/irq_ia64.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *						Added CPU Hotplug handling for IPF.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -46,6 +45,10 @@</div><div class='ctx'> </div><div class='ctx'> #define IRQ_DEBUG	0</div><div class='ctx'> </div><div class='add'>+/* These can be overridden in platform_irq_init */</div><div class='add'>+int ia64_first_device_vector = IA64_DEF_FIRST_DEVICE_VECTOR;</div><div class='add'>+int ia64_last_device_vector = IA64_DEF_LAST_DEVICE_VECTOR;</div><div class='add'>+</div><div class='ctx'> /* default base addr of IPI table */</div><div class='ctx'> void __iomem *ipi_base_addr = ((void __iomem *)</div><div class='ctx'> 			       (__IA64_UNCACHED_OFFSET | IA64_IPI_DEFAULT_BASE_ADDR));</div><div class='hunk'>@@ -60,7 +63,7 @@ __u8 isa_irq_to_vector_map[16] = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(isa_irq_to_vector_map);</div><div class='ctx'> </div><div class='del'>-static unsigned long ia64_vector_mask[BITS_TO_LONGS(IA64_NUM_DEVICE_VECTORS)];</div><div class='add'>+static unsigned long ia64_vector_mask[BITS_TO_LONGS(IA64_MAX_DEVICE_VECTORS)];</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> assign_irq_vector (int irq)</div><div class='hunk'>@@ -89,6 +92,19 @@ free_irq_vector (int vector)</div><div class='ctx'> 		printk(KERN_WARNING "%s: double free!\n", __FUNCTION__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int</div><div class='add'>+reserve_irq_vector (int vector)</div><div class='add'>+{</div><div class='add'>+	int pos;</div><div class='add'>+</div><div class='add'>+	if (vector &lt; IA64_FIRST_DEVICE_VECTOR ||</div><div class='add'>+	    vector &gt; IA64_LAST_DEVICE_VECTOR)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pos = vector - IA64_FIRST_DEVICE_VECTOR;</div><div class='add'>+	return test_and_set_bit(pos, ia64_vector_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> #	define IS_RESCHEDULE(vec)	(vec == IA64_IPI_RESCHEDULE)</div><div class='ctx'> #else</div><div class='hunk'>@@ -219,7 +235,7 @@ extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> static struct irqaction ipi_irqaction = {</div><div class='ctx'> 	.handler =	handle_IPI,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"IPI"</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -232,9 +248,9 @@ register_percpu_irq (ia64_vector vec, struct irqaction *action)</div><div class='ctx'> </div><div class='ctx'> 	for (irq = 0; irq &lt; NR_IRQS; ++irq)</div><div class='ctx'> 		if (irq_to_vector(irq) == vec) {</div><div class='del'>-			desc = irq_descp(irq);</div><div class='add'>+			desc = irq_desc + irq;</div><div class='ctx'> 			desc-&gt;status |= IRQ_PER_CPU;</div><div class='del'>-			desc-&gt;handler = &amp;irq_type_ia64_lsapic;</div><div class='add'>+			desc-&gt;chip = &amp;irq_type_ia64_lsapic;</div><div class='ctx'> 			if (action)</div><div class='ctx'> 				setup_irq(irq, action);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c<br/>index ea14e6a04409..1ab58b09f3d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/irq_lsapic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/irq_lsapic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/irq_lsapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/irq_lsapic.c</a></div><div class='hunk'>@@ -26,6 +26,13 @@ lsapic_noop (unsigned int irq)</div><div class='ctx'> 	/* nuthing to do... */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int lsapic_retrigger(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ia64_resend_irq(irq);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct hw_interrupt_type irq_type_ia64_lsapic = {</div><div class='ctx'> 	.typename =	"LSAPIC",</div><div class='ctx'> 	.startup =	lsapic_noop_startup,</div><div class='hunk'>@@ -33,5 +40,6 @@ struct hw_interrupt_type irq_type_ia64_lsapic = {</div><div class='ctx'> 	.enable =	lsapic_noop,</div><div class='ctx'> 	.disable =	lsapic_noop,</div><div class='ctx'> 	.ack =		lsapic_noop,</div><div class='del'>-	.end =		lsapic_noop</div><div class='add'>+	.end =		lsapic_noop,</div><div class='add'>+	.retrigger =	lsapic_retrigger,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S<br/>index 829a43cab797..6b7fcbd3f6f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ivt.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/ivt.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ivt.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/ivt.S</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  * Table is based upon EAS2.6 (Oct 1999)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/break.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c<br/>index f9039f88d01d..00d9c83b8020 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/kprobes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/kprobes.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *              &lt;anil.s.keshavamurthy@intel.com&gt; adapted from i386</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c<br/>index 4b0b71d5aef4..d4a546aa5048 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/machvec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/machvec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/machvec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/machvec.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c<br/>index 6a0880639bc9..2fbe4536fe18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/mca.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'>  * 2005-10-07 Keith Owens &lt;kaos@sgi.com&gt;</div><div class='ctx'>  *	      Add notify_die() hooks.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -679,7 +678,7 @@ copy_reg(const u64 *fr, u64 fnat, u64 *tr, u64 *tnat)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ia64_mca_modify_comm(const task_t *previous_current)</div><div class='add'>+ia64_mca_modify_comm(const struct task_struct *previous_current)</div><div class='ctx'> {</div><div class='ctx'> 	char *p, comm[sizeof(current-&gt;comm)];</div><div class='ctx'> 	if (previous_current-&gt;pid)</div><div class='hunk'>@@ -710,7 +709,7 @@ ia64_mca_modify_comm(const task_t *previous_current)</div><div class='ctx'>  * that we can do backtrace on the MCA/INIT handler code itself.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static task_t *</div><div class='add'>+static struct task_struct *</div><div class='ctx'> ia64_mca_modify_original_stack(struct pt_regs *regs,</div><div class='ctx'> 		const struct switch_stack *sw,</div><div class='ctx'> 		struct ia64_sal_os_state *sos,</div><div class='hunk'>@@ -720,7 +719,7 @@ ia64_mca_modify_original_stack(struct pt_regs *regs,</div><div class='ctx'> 	ia64_va va;</div><div class='ctx'> 	extern char ia64_leave_kernel[];	/* Need asm address, not function descriptor */</div><div class='ctx'> 	const pal_min_state_area_t *ms = sos-&gt;pal_min_state;</div><div class='del'>-	task_t *previous_current;</div><div class='add'>+	struct task_struct *previous_current;</div><div class='ctx'> 	struct pt_regs *old_regs;</div><div class='ctx'> 	struct switch_stack *old_sw;</div><div class='ctx'> 	unsigned size = sizeof(struct pt_regs) +</div><div class='hunk'>@@ -1024,7 +1023,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,</div><div class='ctx'> 	pal_processor_state_info_t *psp = (pal_processor_state_info_t *)</div><div class='ctx'> 		&amp;sos-&gt;proc_state_param;</div><div class='ctx'> 	int recover, cpu = smp_processor_id();</div><div class='del'>-	task_t *previous_current;</div><div class='add'>+	struct task_struct *previous_current;</div><div class='ctx'> 	struct ia64_mca_notify_die nd =</div><div class='ctx'> 		{ .sos = sos, .monarch_cpu = &amp;monarch_cpu };</div><div class='ctx'> </div><div class='hunk'>@@ -1353,7 +1352,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,</div><div class='ctx'> {</div><div class='ctx'> 	static atomic_t slaves;</div><div class='ctx'> 	static atomic_t monarchs;</div><div class='del'>-	task_t *previous_current;</div><div class='add'>+	struct task_struct *previous_current;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	struct ia64_mca_notify_die nd =</div><div class='ctx'> 		{ .sos = sos, .monarch_cpu = &amp;monarch_cpu };</div><div class='hunk'>@@ -1458,38 +1457,38 @@ __setup("disable_cpe_poll", ia64_mca_disable_cpe_polling);</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cmci_irqaction = {</div><div class='ctx'> 	.handler =	ia64_mca_cmc_int_handler,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"cmc_hndlr"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cmcp_irqaction = {</div><div class='ctx'> 	.handler =	ia64_mca_cmc_int_caller,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"cmc_poll"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction mca_rdzv_irqaction = {</div><div class='ctx'> 	.handler =	ia64_mca_rendez_int_handler,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"mca_rdzv"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction mca_wkup_irqaction = {</div><div class='ctx'> 	.handler =	ia64_mca_wakeup_int_handler,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"mca_wkup"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> static struct irqaction mca_cpe_irqaction = {</div><div class='ctx'> 	.handler =	ia64_mca_cpe_int_handler,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"cpe_hndlr"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction mca_cpep_irqaction = {</div><div class='ctx'> 	.handler =	ia64_mca_cpe_int_caller,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"cpe_poll"</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_ACPI */</div><div class='hunk'>@@ -1788,7 +1787,7 @@ ia64_mca_late_init(void)</div><div class='ctx'> 			cpe_poll_enabled = 0;</div><div class='ctx'> 			for (irq = 0; irq &lt; NR_IRQS; ++irq)</div><div class='ctx'> 				if (irq_to_vector(irq) == cpe_vector) {</div><div class='del'>-					desc = irq_descp(irq);</div><div class='add'>+					desc = irq_desc + irq;</div><div class='ctx'> 					desc-&gt;status |= IRQ_PER_CPU;</div><div class='ctx'> 					setup_irq(irq, &amp;mca_cpe_irqaction);</div><div class='ctx'> 					ia64_cpe_irq = irq;</div><div class='head'>diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S<br/>index 6dff024cd62b..96047491d1b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca_asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca_asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/mca_asm.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> // 12/08/05 Keith Owens &lt;kaos@sgi.com&gt;</div><div class='ctx'> //		   Use per cpu MCA/INIT stacks for all data.</div><div class='ctx'> //</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='hunk'>@@ -159,7 +158,7 @@ ia64_os_mca_spin:</div><div class='ctx'> 	GET_IA64_MCA_DATA(r2)</div><div class='ctx'> 	// Using MCA stack, struct ia64_sal_os_state, variable proc_state_param</div><div class='ctx'> 	;;</div><div class='del'>-	add r3=IA64_MCA_CPU_MCA_STACK_OFFSET+MCA_SOS_OFFSET+IA64_SAL_OS_STATE_PROC_STATE_PARAM_OFFSET, r2</div><div class='add'>+	add r3=IA64_MCA_CPU_MCA_STACK_OFFSET+MCA_SOS_OFFSET+SOS(PROC_STATE_PARAM), r2</div><div class='ctx'> 	;;</div><div class='ctx'> 	ld8 r18=[r3]				// Get processor state parameter on existing PALE_CHECK.</div><div class='ctx'> 	;;</div><div class='hunk'>@@ -479,9 +478,11 @@ ia64_state_save:</div><div class='ctx'> 	st8 [temp2]=r11,16	// rv_rc</div><div class='ctx'> 	mov r11=cr.iipa</div><div class='ctx'> 	;;</div><div class='del'>-	st8 [temp1]=r18,16	// proc_state_param</div><div class='del'>-	st8 [temp2]=r19,16	// monarch</div><div class='add'>+	st8 [temp1]=r18		// proc_state_param</div><div class='add'>+	st8 [temp2]=r19		// monarch</div><div class='ctx'> 	mov r6=IA64_KR(CURRENT)</div><div class='add'>+	add temp1=SOS(SAL_RA), regs</div><div class='add'>+	add temp2=SOS(SAL_GP), regs</div><div class='ctx'> 	;;</div><div class='ctx'> 	st8 [temp1]=r12,16	// sal_ra</div><div class='ctx'> 	st8 [temp2]=r10,16	// sal_gp</div><div class='hunk'>@@ -503,12 +504,14 @@ ia64_state_save:</div><div class='ctx'> 	st8 [temp2]=r11,16	// cr.iipa</div><div class='ctx'> 	mov r12=cr.iim</div><div class='ctx'> 	;;</div><div class='del'>-	st8 [temp1]=r12,16	// cr.iim</div><div class='add'>+	st8 [temp1]=r12		// cr.iim</div><div class='ctx'> (p1)	mov r12=IA64_MCA_COLD_BOOT</div><div class='ctx'> (p2)	mov r12=IA64_INIT_WARM_BOOT</div><div class='ctx'> 	mov r6=cr.iha</div><div class='add'>+	add temp1=SOS(OS_STATUS), regs</div><div class='ctx'> 	;;</div><div class='del'>-	st8 [temp2]=r6,16	// cr.iha</div><div class='add'>+	st8 [temp2]=r6		// cr.iha</div><div class='add'>+	add temp2=SOS(CONTEXT), regs</div><div class='ctx'> 	st8 [temp1]=r12		// os_status, default is cold boot</div><div class='ctx'> 	mov r6=IA64_MCA_SAME_CONTEXT</div><div class='ctx'> 	;;</div><div class='hunk'>@@ -820,8 +823,8 @@ ia64_state_restore:</div><div class='ctx'> 	// Restore the SAL to OS state. The previous code left regs at pt_regs.</div><div class='ctx'> 	add regs=MCA_SOS_OFFSET-MCA_PT_REGS_OFFSET, regs</div><div class='ctx'> 	;;</div><div class='del'>-	add temp1=IA64_SAL_OS_STATE_COMMON_OFFSET, regs</div><div class='del'>-	add temp2=IA64_SAL_OS_STATE_COMMON_OFFSET+8, regs</div><div class='add'>+	add temp1=SOS(SAL_RA), regs</div><div class='add'>+	add temp2=SOS(SAL_GP), regs</div><div class='ctx'> 	;;</div><div class='ctx'> 	ld8 r12=[temp1],16	// sal_ra</div><div class='ctx'> 	ld8 r9=[temp2],16	// sal_gp</div><div class='hunk'>@@ -842,8 +845,10 @@ ia64_state_restore:</div><div class='ctx'> 	;;</div><div class='ctx'> 	mov cr.itir=temp3</div><div class='ctx'> 	mov cr.iipa=temp4</div><div class='del'>-	ld8 temp3=[temp1],16	// cr.iim</div><div class='del'>-	ld8 temp4=[temp2],16	// cr.iha</div><div class='add'>+	ld8 temp3=[temp1]	// cr.iim</div><div class='add'>+	ld8 temp4=[temp2]		// cr.iha</div><div class='add'>+	add temp1=SOS(OS_STATUS), regs</div><div class='add'>+	add temp2=SOS(CONTEXT), regs</div><div class='ctx'> 	;;</div><div class='ctx'> 	mov cr.iim=temp3</div><div class='ctx'> 	mov cr.iha=temp4</div><div class='hunk'>@@ -916,7 +921,7 @@ ia64_state_restore:</div><div class='ctx'> </div><div class='ctx'> ia64_new_stack:</div><div class='ctx'> 	add regs=MCA_PT_REGS_OFFSET, r3</div><div class='del'>-	add temp2=MCA_SOS_OFFSET+IA64_SAL_OS_STATE_PAL_MIN_STATE_OFFSET, r3</div><div class='add'>+	add temp2=MCA_SOS_OFFSET+SOS(PAL_MIN_STATE), r3</div><div class='ctx'> 	mov b0=r2			// save return address</div><div class='ctx'> 	GET_IA64_MCA_DATA(temp1)</div><div class='ctx'> 	invala</div><div class='hunk'>@@ -1020,7 +1025,7 @@ ia64_old_stack:</div><div class='ctx'> </div><div class='ctx'> ia64_set_kernel_registers:</div><div class='ctx'> 	add temp3=MCA_SP_OFFSET, r3</div><div class='del'>-	add temp4=MCA_SOS_OFFSET+IA64_SAL_OS_STATE_OS_GP_OFFSET, r3</div><div class='add'>+	add temp4=MCA_SOS_OFFSET+SOS(OS_GP), r3</div><div class='ctx'> 	mov b0=r2		// save return address</div><div class='ctx'> 	GET_IA64_MCA_DATA(temp1)</div><div class='ctx'> 	;;</div><div class='head'>diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c<br/>index ca6666b51ccb..8db6e0cedadc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/mca_drv.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 2005 Keith Owens &lt;kaos@sgi.com&gt;</div><div class='ctx'>  * Copyright (C) 2006 Russ Anderson &lt;rja@sgi.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/mca_drv_asm.S b/arch/ia64/kernel/mca_drv_asm.S<br/>index e6a580d354b9..f2d4900751ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca_drv_asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/mca_drv_asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/mca_drv_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/mca_drv_asm.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 2004 FUJITSU LIMITED</div><div class='ctx'>  * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h<br/>index 85ed54179afa..c9ac8bada786 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/minstate.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/minstate.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/minstate.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/minstate.h</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c<br/>index 3a30cfc9574f..158e3c51bb77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/module.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>    SEGREL64LSB</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c<br/>index 0766493d4d00..1cc360c83e7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/numa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/numa.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Copyright (C) 2004 Silicon Graphics, Inc.</div><div class='ctx'>  *   Jesse Barnes &lt;jbarnes@sgi.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c<br/>index 859fb37ff49b..3f5bac59209a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/palinfo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/palinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/palinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/palinfo.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * 10/23/2001	S.Eranian	updated pal_perf_mon_info bug fixes</div><div class='ctx'>  * 03/24/2004	Ashok Raj	updated to work with CPU Hotplug</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -959,7 +958,7 @@ remove_palinfo_proc_entries(unsigned int hcpu)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int palinfo_cpu_callback(struct notifier_block *nfb,</div><div class='add'>+static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 								unsigned long action,</div><div class='ctx'> 								void *hcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -978,7 +977,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block palinfo_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata palinfo_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'> 	.notifier_call = palinfo_cpu_callback,</div><div class='ctx'> 	.priority = 0,</div><div class='hunk'>@@ -998,7 +997,7 @@ palinfo_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register for future delivery via notify registration */</div><div class='del'>-	register_cpu_notifier(&amp;palinfo_cpu_notifier);</div><div class='add'>+	register_hotcpu_notifier(&amp;palinfo_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c<br/>index 077f21216b65..c7ccd6ee1ddf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/perfmon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/perfmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/perfmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/perfmon.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * 	http://www.hpl.hp.com/research/linux/perfmon</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -532,7 +531,6 @@ static ctl_table pfm_sysctl_root[] = {</div><div class='ctx'> static struct ctl_table_header *pfm_sysctl_header;</div><div class='ctx'> </div><div class='ctx'> static int pfm_context_unload(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs);</div><div class='del'>-static int pfm_flush(struct file *filp);</div><div class='ctx'> </div><div class='ctx'> #define pfm_get_cpu_var(v)		__ia64_per_cpu_var(v)</div><div class='ctx'> #define pfm_get_cpu_data(a,b)		per_cpu(a, b)</div><div class='hunk'>@@ -595,10 +593,11 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct super_block *</div><div class='del'>-pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data)</div><div class='add'>+static int</div><div class='add'>+pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data,</div><div class='add'>+	     struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC);</div><div class='add'>+	return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type pfm_fs_type = {</div><div class='hunk'>@@ -1773,7 +1772,7 @@ pfm_syswide_cleanup_other_cpu(pfm_context_t *ctx)</div><div class='ctx'>  * When caller is self-monitoring, the context is unloaded.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-pfm_flush(struct file *filp)</div><div class='add'>+pfm_flush(struct file *filp, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	pfm_context_t *ctx;</div><div class='ctx'> 	struct task_struct *task;</div><div class='hunk'>@@ -6165,7 +6164,7 @@ pfm_load_regs (struct task_struct *task)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * will replay the PMU interrupt</div><div class='ctx'> 		 */</div><div class='del'>-		if (need_irq_resend) hw_resend_irq(NULL, IA64_PERFMON_VECTOR);</div><div class='add'>+		if (need_irq_resend) ia64_resend_irq(IA64_PERFMON_VECTOR);</div><div class='ctx'> </div><div class='ctx'> 		pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6305,7 +6304,7 @@ pfm_load_regs (struct task_struct *task)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * will replay the PMU interrupt</div><div class='ctx'> 		 */</div><div class='del'>-		if (need_irq_resend) hw_resend_irq(NULL, IA64_PERFMON_VECTOR);</div><div class='add'>+		if (need_irq_resend) ia64_resend_irq(IA64_PERFMON_VECTOR);</div><div class='ctx'> </div><div class='ctx'> 		pfm_stats[smp_processor_id()].pfm_replay_ovfl_intr_count++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6440,7 +6439,7 @@ pfm_flush_pmds(struct task_struct *task, pfm_context_t *ctx)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction perfmon_irqaction = {</div><div class='ctx'> 	.handler = pfm_interrupt_handler,</div><div class='del'>-	.flags   = SA_INTERRUPT,</div><div class='add'>+	.flags   = IRQF_DISABLED,</div><div class='ctx'> 	.name    = "perfmon"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/perfmon_default_smpl.c b/arch/ia64/kernel/perfmon_default_smpl.c<br/>index 344941db0a9e..ff80eab83b38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/perfmon_default_smpl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/perfmon_default_smpl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/perfmon_default_smpl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/perfmon_default_smpl.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c<br/>index 355d57970ba3..ea914cc6812a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/process.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *	      Add notify_die() hooks.</div><div class='ctx'>  */</div><div class='ctx'> #define __KERNEL_SYSCALLS__	/* see &lt;asm/unistd.h&gt; */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='hunk'>@@ -272,9 +271,9 @@ cpu_idle (void)</div><div class='ctx'> 	/* endless idle loop with no priority at all */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (can_do_pal_halt)</div><div class='del'>-			clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+			current_thread_info()-&gt;status &amp;= ~TS_POLLING;</div><div class='ctx'> 		else</div><div class='del'>-			set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+			current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> </div><div class='ctx'> 		if (!need_resched()) {</div><div class='ctx'> 			void (*idle)(void);</div><div class='head'>diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c<br/>index e61e15e28d8b..aa705e46b974 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/ptrace.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Derived from the x86 and Alpha versions.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c<br/>index 056f7a6eedc7..642fdc7b969d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/sal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/sal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/sal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/sal.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1999 VA Linux Systems</div><div class='ctx'>  * Copyright (C) 1999 Walt Drummond &lt;drummond@valinux.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -227,7 +226,7 @@ static int sal_cache_flush_drops_interrupts;</div><div class='ctx'> static void __init</div><div class='ctx'> check_sal_cache_flush (void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags, itv;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	u64 vector;</div><div class='ctx'> </div><div class='hunk'>@@ -238,9 +237,6 @@ check_sal_cache_flush (void)</div><div class='ctx'> 	 * Schedule a timer interrupt, wait until it's reported, and see if</div><div class='ctx'> 	 * SAL_CACHE_FLUSH drops it.</div><div class='ctx'> 	 */</div><div class='del'>-	itv = ia64_get_itv();</div><div class='del'>-	BUG_ON((itv &amp; (1 &lt;&lt; 16)) == 0);</div><div class='del'>-</div><div class='ctx'> 	ia64_set_itv(IA64_TIMER_VECTOR);</div><div class='ctx'> 	ia64_set_itm(ia64_get_itc() + 1000);</div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +256,6 @@ check_sal_cache_flush (void)</div><div class='ctx'> 		ia64_eoi();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ia64_set_itv(itv);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c<br/>index 663a186ad194..9065f0f01ba3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/salinfo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/salinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/salinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/salinfo.c</a></div><div class='hunk'>@@ -572,7 +572,7 @@ static struct file_operations salinfo_data_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_HOTPLUG_CPU</div><div class='del'>-static int</div><div class='add'>+static int __devinit</div><div class='ctx'> salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, cpu = (unsigned long)hcpu;</div><div class='hunk'>@@ -673,9 +673,7 @@ salinfo_init(void)</div><div class='ctx'> 	salinfo_timer.function = &amp;salinfo_timeout;</div><div class='ctx'> 	add_timer(&amp;salinfo_timer);</div><div class='ctx'> </div><div class='del'>-#ifdef	CONFIG_HOTPLUG_CPU</div><div class='del'>-	register_cpu_notifier(&amp;salinfo_cpu_notifier);</div><div class='del'>-#endif</div><div class='add'>+	register_hotcpu_notifier(&amp;salinfo_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c<br/>index e4dfda1eb7dd..7ad0d9cc6db6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/setup.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * 06/24/99 W.Drummond	added boot_cpu_data.</div><div class='ctx'>  * 05/28/05 Z. Menyhart	Dynamic stride size for "flush_icache_range()"</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,7 +35,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/dmi.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='hunk'>@@ -260,6 +259,7 @@ reserve_memory (void)</div><div class='ctx'> 	n++;</div><div class='ctx'> </div><div class='ctx'> 	num_rsvd_regions = n;</div><div class='add'>+	BUG_ON(IA64_MAX_RSVD_REGIONS + 1 &lt; n);</div><div class='ctx'> </div><div class='ctx'> 	sort_regions(rsvd_region, num_rsvd_regions);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c<br/>index 1d7903ee2126..77f8b49c7882 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/signal.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Derived from i386 and Alpha versions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c<br/>index 44e9547878ac..6203ed4ec8cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/smpboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/smpboot.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * 05/01/30 Suresh Siddha &lt;suresh.b.siddha@intel.com&gt;</div><div class='ctx'>  *						Setup cpu_sibling_map and cpu_core_map</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='hunk'>@@ -125,7 +124,7 @@ extern void __devinit calibrate_delay (void);</div><div class='ctx'> extern void start_ap (void);</div><div class='ctx'> extern unsigned long ia64_iobase;</div><div class='ctx'> </div><div class='del'>-task_t *task_for_booting_cpu;</div><div class='add'>+struct task_struct *task_for_booting_cpu;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * State for each CPU</div><div class='hunk'>@@ -677,16 +676,16 @@ int migrate_platform_irqs(unsigned int cpu)</div><div class='ctx'> 			new_cpei_cpu = any_online_cpu(cpu_online_map);</div><div class='ctx'> 			mask = cpumask_of_cpu(new_cpei_cpu);</div><div class='ctx'> 			set_cpei_target_cpu(new_cpei_cpu);</div><div class='del'>-			desc = irq_descp(ia64_cpe_irq);</div><div class='add'>+			desc = irq_desc + ia64_cpe_irq;</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Switch for now, immediatly, we need to do fake intr</div><div class='ctx'> 			 * as other interrupts, but need to study CPEI behaviour with</div><div class='ctx'> 			 * polling before making changes.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (desc) {</div><div class='del'>-				desc-&gt;handler-&gt;disable(ia64_cpe_irq);</div><div class='del'>-				desc-&gt;handler-&gt;set_affinity(ia64_cpe_irq, mask);</div><div class='del'>-				desc-&gt;handler-&gt;enable(ia64_cpe_irq);</div><div class='add'>+				desc-&gt;chip-&gt;disable(ia64_cpe_irq);</div><div class='add'>+				desc-&gt;chip-&gt;set_affinity(ia64_cpe_irq, mask);</div><div class='add'>+				desc-&gt;chip-&gt;enable(ia64_cpe_irq);</div><div class='ctx'> 				printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c<br/>index c7b943f10199..40722d88607a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/sys_ia64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/sys_ia64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/sys_ia64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/sys_ia64.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1999-2000, 2002-2003, 2005 Hewlett-Packard Co</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c<br/>index 49958904045b..6928ef0d64d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/time.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1999-2000 VA Linux Systems</div><div class='ctx'>  * Copyright (C) 1999-2000 Walt Drummond &lt;drummond@valinux.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -232,7 +231,7 @@ ia64_init_itm (void)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_irqaction = {</div><div class='ctx'> 	.handler =	timer_interrupt,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"timer"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c<br/>index 4f3a16b37f8f..b146f1cfad31 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/topology.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/topology.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *	Populate cpu cache entries in sysfs for cpu cache info</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -26,19 +25,10 @@</div><div class='ctx'> #include &lt;asm/numa.h&gt;</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-static struct node *sysfs_nodes;</div><div class='del'>-#endif</div><div class='ctx'> static struct ia64_cpu *sysfs_cpus;</div><div class='ctx'> </div><div class='ctx'> int arch_register_cpu(int num)</div><div class='ctx'> {</div><div class='del'>-	struct node *parent = NULL;</div><div class='del'>-	</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	parent = &amp;sysfs_nodes[cpu_to_node(num)];</div><div class='del'>-#endif /* CONFIG_NUMA */</div><div class='del'>-</div><div class='ctx'> #if defined (CONFIG_ACPI) &amp;&amp; defined (CONFIG_HOTPLUG_CPU)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If CPEI cannot be re-targetted, and this is</div><div class='hunk'>@@ -48,21 +38,14 @@ int arch_register_cpu(int num)</div><div class='ctx'> 		sysfs_cpus[num].cpu.no_control = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	return register_cpu(&amp;sysfs_cpus[num].cpu, num, parent);</div><div class='add'>+	return register_cpu(&amp;sysfs_cpus[num].cpu, num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> </div><div class='ctx'> void arch_unregister_cpu(int num)</div><div class='ctx'> {</div><div class='del'>-	struct node *parent = NULL;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-	int node = cpu_to_node(num);</div><div class='del'>-	parent = &amp;sysfs_nodes[node];</div><div class='del'>-#endif /* CONFIG_NUMA */</div><div class='del'>-</div><div class='del'>-	return unregister_cpu(&amp;sysfs_cpus[num].cpu, parent);</div><div class='add'>+	return unregister_cpu(&amp;sysfs_cpus[num].cpu);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(arch_register_cpu);</div><div class='ctx'> EXPORT_SYMBOL(arch_unregister_cpu);</div><div class='hunk'>@@ -74,17 +57,11 @@ static int __init topology_init(void)</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-	sysfs_nodes = kzalloc(sizeof(struct node) * MAX_NUMNODES, GFP_KERNEL);</div><div class='del'>-	if (!sysfs_nodes) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * MCD - Do we want to register all ONLINE nodes, or all POSSIBLE nodes?</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_online_node(i) {</div><div class='del'>-		if ((err = register_node(&amp;sysfs_nodes[i], i, 0)))</div><div class='add'>+		if ((err = register_one_node(i)))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -166,7 +143,7 @@ static void cache_shared_cpu_map_setup( unsigned int cpu,</div><div class='ctx'> </div><div class='ctx'> 	num_shared = (int) csi.num_shared;</div><div class='ctx'> 	do {</div><div class='del'>-		for_each_cpu(j)</div><div class='add'>+		for_each_possible_cpu(j)</div><div class='ctx'> 			if (cpu_data(cpu)-&gt;socket_id == cpu_data(j)-&gt;socket_id</div><div class='ctx'> 				&amp;&amp; cpu_data(j)-&gt;core_id == csi.log1_cid</div><div class='ctx'> 				&amp;&amp; cpu_data(j)-&gt;thread_id == csi.log1_tid)</div><div class='hunk'>@@ -426,7 +403,7 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)</div><div class='ctx'>  * When a cpu is hot-plugged, do a check and initiate</div><div class='ctx'>  * cache kobject if necessary</div><div class='ctx'>  */</div><div class='del'>-static int cache_cpu_callback(struct notifier_block *nfb,</div><div class='add'>+static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 		unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='hunk'>@@ -444,7 +421,7 @@ static int cache_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block cache_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata cache_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'> 	.notifier_call = cache_cpu_callback</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c<br/>index 7c1ddc8ac443..e7bbb0f40aa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/traps.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * 05/12/00 grao &lt;goutham.rao@intel.com&gt; : added isr in siginfo for SIGFPE</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c<br/>index fcd2bad0286f..5f03b9e524dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/uncached.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/uncached.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/uncached.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/uncached.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2001-2005 Silicon Graphics, Inc.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2001-2006 Silicon Graphics, Inc.  All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of version 2 of the GNU General Public License</div><div class='hunk'>@@ -29,15 +29,8 @@</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> #include &lt;asm/sn/arch.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DEBUG	0</div><div class='ctx'> </div><div class='del'>-#if DEBUG</div><div class='del'>-#define dprintk			printk</div><div class='del'>-#else</div><div class='del'>-#define dprintk(x...)		do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void __init efi_memmap_walk_uc (efi_freemem_callback_t callback);</div><div class='add'>+extern void __init efi_memmap_walk_uc(efi_freemem_callback_t, void *);</div><div class='ctx'> </div><div class='ctx'> #define MAX_UNCACHED_GRANULES	5</div><div class='ctx'> static int allocated_granules;</div><div class='hunk'>@@ -60,6 +53,7 @@ static void uncached_ipi_visibility(void *data)</div><div class='ctx'> static void uncached_ipi_mc_drain(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='add'>+</div><div class='ctx'> 	status = ia64_pal_mc_drain();</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on "</div><div class='hunk'>@@ -67,30 +61,35 @@ static void uncached_ipi_mc_drain(void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static unsigned long</div><div class='del'>-uncached_get_new_chunk(struct gen_pool *poolp)</div><div class='add'>+/*</div><div class='add'>+ * Add a new chunk of uncached memory pages to the specified pool.</div><div class='add'>+ *</div><div class='add'>+ * @pool: pool to add new chunk of uncached memory to</div><div class='add'>+ * @nid: node id of node to allocate memory from, or -1</div><div class='add'>+ *</div><div class='add'>+ * This is accomplished by first allocating a granule of cached memory pages</div><div class='add'>+ * and then converting them to uncached memory pages.</div><div class='add'>+ */</div><div class='add'>+static int uncached_add_chunk(struct gen_pool *pool, int nid)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	void *tmp;</div><div class='ctx'> 	int status, i;</div><div class='del'>-	unsigned long addr, node;</div><div class='add'>+	unsigned long c_addr, uc_addr;</div><div class='ctx'> </div><div class='ctx'> 	if (allocated_granules &gt;= MAX_UNCACHED_GRANULES)</div><div class='del'>-		return 0;</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* attempt to allocate a granule's worth of cached memory pages */</div><div class='ctx'> </div><div class='del'>-	node = poolp-&gt;private;</div><div class='del'>-	page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+	page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO,</div><div class='ctx'> 				IA64_GRANULE_SHIFT-PAGE_SHIFT);</div><div class='add'>+	if (!page)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-	dprintk(KERN_INFO "get_new_chunk page %p, addr %lx\n",</div><div class='del'>-		page, (unsigned long)(page-vmem_map) &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	/* convert the memory pages from cached to uncached */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Do magic if no mem on local node! XXX</div><div class='del'>-	 */</div><div class='del'>-	if (!page)</div><div class='del'>-		return 0;</div><div class='del'>-	tmp = page_address(page);</div><div class='add'>+	c_addr = (unsigned long)page_address(page);</div><div class='add'>+	uc_addr = c_addr - PAGE_OFFSET + __IA64_UNCACHED_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * There's a small race here where it's possible for someone to</div><div class='hunk'>@@ -100,76 +99,90 @@ uncached_get_new_chunk(struct gen_pool *poolp)</div><div class='ctx'> 	for (i = 0; i &lt; (IA64_GRANULE_SIZE / PAGE_SIZE); i++)</div><div class='ctx'> 		SetPageUncached(&amp;page[i]);</div><div class='ctx'> </div><div class='del'>-	flush_tlb_kernel_range(tmp, tmp + IA64_GRANULE_SIZE);</div><div class='add'>+	flush_tlb_kernel_range(uc_addr, uc_adddr + IA64_GRANULE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);</div><div class='del'>-</div><div class='del'>-	dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n",</div><div class='del'>-		status, raw_smp_processor_id());</div><div class='del'>-</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1);</div><div class='ctx'> 		if (status)</div><div class='del'>-			printk(KERN_WARNING "smp_call_function failed for "</div><div class='del'>-			       "uncached_ipi_visibility! (%i)\n", status);</div><div class='add'>+			goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='ctx'> 	if (ia64_platform_is("sn2"))</div><div class='del'>-		sn_flush_all_caches((unsigned long)tmp, IA64_GRANULE_SIZE);</div><div class='add'>+		sn_flush_all_caches(uc_addr, IA64_GRANULE_SIZE);</div><div class='ctx'> 	else</div><div class='del'>-		flush_icache_range((unsigned long)tmp,</div><div class='del'>-				   (unsigned long)tmp+IA64_GRANULE_SIZE);</div><div class='add'>+		flush_icache_range(uc_addr, uc_addr + IA64_GRANULE_SIZE);</div><div class='add'>+</div><div class='add'>+	/* flush the just introduced uncached translation from the TLB */</div><div class='add'>+	local_flush_tlb_all();</div><div class='add'>+</div><div class='add'>+	preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 	ia64_pal_mc_drain();</div><div class='ctx'> 	status = smp_call_function(uncached_ipi_mc_drain, NULL, 0, 1);</div><div class='ctx'> 	if (status)</div><div class='del'>-		printk(KERN_WARNING "smp_call_function failed for "</div><div class='del'>-		       "uncached_ipi_mc_drain! (%i)\n", status);</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='del'>-	addr = (unsigned long)tmp - PAGE_OFFSET + __IA64_UNCACHED_OFFSET;</div><div class='add'>+	/*</div><div class='add'>+	 * The chunk of memory pages has been converted to uncached so now we</div><div class='add'>+	 * can add it to the pool.</div><div class='add'>+	 */</div><div class='add'>+	status = gen_pool_add(pool, uc_addr, IA64_GRANULE_SIZE, nid);</div><div class='add'>+	if (status)</div><div class='add'>+		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	allocated_granules++;</div><div class='del'>-	return addr;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+	/* failed to convert or add the chunk so give it back to the kernel */</div><div class='add'>+failed:</div><div class='add'>+	for (i = 0; i &lt; (IA64_GRANULE_SIZE / PAGE_SIZE); i++)</div><div class='add'>+		ClearPageUncached(&amp;page[i]);</div><div class='add'>+</div><div class='add'>+	free_pages(c_addr, IA64_GRANULE_SHIFT-PAGE_SHIFT);</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * uncached_alloc_page</div><div class='ctx'>  *</div><div class='add'>+ * @starting_nid: node id of node to start with, or -1</div><div class='add'>+ *</div><div class='ctx'>  * Allocate 1 uncached page. Allocates on the requested node. If no</div><div class='ctx'>  * uncached pages are available on the requested node, roundrobin starting</div><div class='del'>- * with higher nodes.</div><div class='add'>+ * with the next higher node.</div><div class='ctx'>  */</div><div class='del'>-unsigned long</div><div class='del'>-uncached_alloc_page(int nid)</div><div class='add'>+unsigned long uncached_alloc_page(int starting_nid)</div><div class='ctx'> {</div><div class='del'>-	unsigned long maddr;</div><div class='add'>+	unsigned long uc_addr;</div><div class='add'>+	struct gen_pool *pool;</div><div class='add'>+	int nid;</div><div class='ctx'> </div><div class='del'>-	maddr = gen_pool_alloc(uncached_pool[nid], PAGE_SIZE);</div><div class='add'>+	if (unlikely(starting_nid &gt;= MAX_NUMNODES))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	dprintk(KERN_DEBUG "uncached_alloc_page returns %lx on node %i\n",</div><div class='del'>-		maddr, nid);</div><div class='add'>+	if (starting_nid &lt; 0)</div><div class='add'>+		starting_nid = numa_node_id();</div><div class='add'>+	nid = starting_nid;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If no memory is availble on our local node, try the</div><div class='del'>-	 * remaining nodes in the system.</div><div class='del'>-	 */</div><div class='del'>-	if (!maddr) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = MAX_NUMNODES - 1; i &gt;= 0; i--) {</div><div class='del'>-			if (i == nid || !node_online(i))</div><div class='del'>-				continue;</div><div class='del'>-			maddr = gen_pool_alloc(uncached_pool[i], PAGE_SIZE);</div><div class='del'>-			dprintk(KERN_DEBUG "uncached_alloc_page alternate search "</div><div class='del'>-				"returns %lx on node %i\n", maddr, i);</div><div class='del'>-			if (maddr) {</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	do {</div><div class='add'>+		if (!node_online(nid))</div><div class='add'>+			continue;</div><div class='add'>+		pool = uncached_pool[nid];</div><div class='add'>+		if (pool == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		do {</div><div class='add'>+			uc_addr = gen_pool_alloc(pool, PAGE_SIZE);</div><div class='add'>+			if (uc_addr != 0)</div><div class='add'>+				return uc_addr;</div><div class='add'>+		} while (uncached_add_chunk(pool, nid) == 0);</div><div class='add'>+</div><div class='add'>+	} while ((nid = (nid + 1) % MAX_NUMNODES) != starting_nid);</div><div class='ctx'> </div><div class='del'>-	return maddr;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(uncached_alloc_page);</div><div class='ctx'> </div><div class='hunk'>@@ -177,21 +190,22 @@ EXPORT_SYMBOL(uncached_alloc_page);</div><div class='ctx'> /*</div><div class='ctx'>  * uncached_free_page</div><div class='ctx'>  *</div><div class='add'>+ * @uc_addr: uncached address of page to free</div><div class='add'>+ *</div><div class='ctx'>  * Free a single uncached page.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='del'>-uncached_free_page(unsigned long maddr)</div><div class='add'>+void uncached_free_page(unsigned long uc_addr)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='del'>-</div><div class='del'>-	node = paddr_to_nid(maddr - __IA64_UNCACHED_OFFSET);</div><div class='add'>+	int nid = paddr_to_nid(uc_addr - __IA64_UNCACHED_OFFSET);</div><div class='add'>+	struct gen_pool *pool = uncached_pool[nid];</div><div class='ctx'> </div><div class='del'>-	dprintk(KERN_DEBUG "uncached_free_page(%lx) on node %i\n", maddr, node);</div><div class='add'>+	if (unlikely(pool == NULL))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if ((maddr &amp; (0XFUL &lt;&lt; 60)) != __IA64_UNCACHED_OFFSET)</div><div class='del'>-		panic("uncached_free_page invalid address %lx\n", maddr);</div><div class='add'>+	if ((uc_addr &amp; (0XFUL &lt;&lt; 60)) != __IA64_UNCACHED_OFFSET)</div><div class='add'>+		panic("uncached_free_page invalid address %lx\n", uc_addr);</div><div class='ctx'> </div><div class='del'>-	gen_pool_free(uncached_pool[node], maddr, PAGE_SIZE);</div><div class='add'>+	gen_pool_free(pool, uc_addr, PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(uncached_free_page);</div><div class='ctx'> </div><div class='hunk'>@@ -199,43 +213,39 @@ EXPORT_SYMBOL(uncached_free_page);</div><div class='ctx'> /*</div><div class='ctx'>  * uncached_build_memmap,</div><div class='ctx'>  *</div><div class='add'>+ * @uc_start: uncached starting address of a chunk of uncached memory</div><div class='add'>+ * @uc_end: uncached ending address of a chunk of uncached memory</div><div class='add'>+ * @arg: ignored, (NULL argument passed in on call to efi_memmap_walk_uc())</div><div class='add'>+ *</div><div class='ctx'>  * Called at boot time to build a map of pages that can be used for</div><div class='ctx'>  * memory special operations.</div><div class='ctx'>  */</div><div class='del'>-static int __init</div><div class='del'>-uncached_build_memmap(unsigned long start, unsigned long end, void *arg)</div><div class='add'>+static int __init uncached_build_memmap(unsigned long uc_start,</div><div class='add'>+					unsigned long uc_end, void *arg)</div><div class='ctx'> {</div><div class='del'>-	long length = end - start;</div><div class='del'>-	int node;</div><div class='del'>-</div><div class='del'>-	dprintk(KERN_ERR "uncached_build_memmap(%lx %lx)\n", start, end);</div><div class='add'>+	int nid = paddr_to_nid(uc_start - __IA64_UNCACHED_OFFSET);</div><div class='add'>+	struct gen_pool *pool = uncached_pool[nid];</div><div class='add'>+	size_t size = uc_end - uc_start;</div><div class='ctx'> </div><div class='ctx'> 	touch_softlockup_watchdog();</div><div class='del'>-	memset((char *)start, 0, length);</div><div class='ctx'> </div><div class='del'>-	node = paddr_to_nid(start - __IA64_UNCACHED_OFFSET);</div><div class='del'>-</div><div class='del'>-	for (; start &lt; end ; start += PAGE_SIZE) {</div><div class='del'>-		dprintk(KERN_INFO "sticking %lx into the pool!\n", start);</div><div class='del'>-		gen_pool_free(uncached_pool[node], start, PAGE_SIZE);</div><div class='add'>+	if (pool != NULL) {</div><div class='add'>+		memset((char *)uc_start, 0, size);</div><div class='add'>+		(void) gen_pool_add(pool, uc_start, size, nid);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __init uncached_init(void) {</div><div class='del'>-	int i;</div><div class='add'>+static int __init uncached_init(void)</div><div class='add'>+{</div><div class='add'>+	int nid;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NUMNODES; i++) {</div><div class='del'>-		if (!node_online(i))</div><div class='del'>-			continue;</div><div class='del'>-		uncached_pool[i] = gen_pool_create(0, IA64_GRANULE_SHIFT,</div><div class='del'>-						   &amp;uncached_get_new_chunk, i);</div><div class='add'>+	for_each_online_node(nid) {</div><div class='add'>+		uncached_pool[nid] = gen_pool_create(PAGE_SHIFT, nid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	efi_memmap_walk_uc(uncached_build_memmap);</div><div class='del'>-</div><div class='add'>+	efi_memmap_walk_uc(uncached_build_memmap, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S<br/>index 783600fe52b2..5b0d5f64a9b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/ia64/lib/clear_page.S b/arch/ia64/lib/clear_page.S<br/>index d4987061dda7..2d814e7ed191 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/lib/clear_page.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/lib/clear_page.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/lib/clear_page.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/lib/clear_page.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * 2/12/02 kchen	Tuned for both Itanium and McKinley</div><div class='ctx'>  * 3/08/02 davidm	Some more tweaking</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/ia64/lib/io.c b/arch/ia64/lib/io.c<br/>index 8949e44091ac..bcd16f8ad9d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/lib/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/lib/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/lib/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/lib/io.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S<br/>index 9e534d52b1d5..ab0f87639729 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/lib/memcpy_mck.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/lib/memcpy_mck.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/lib/memcpy_mck.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/lib/memcpy_mck.S</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Copyright (C) 2002 Intel Corp.</div><div class='ctx'>  * Copyright (C) 2002 Ken Chen &lt;kenneth.w.chen@intel.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c<br/>index 84fd1c14c8a9..2a88cdd6d924 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/contig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/contig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/contig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/contig.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Routines used by ia64 machines with contiguous (or virtually contiguous)</div><div class='ctx'>  * memory.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c<br/>index b6bcc9fa3603..99bd9e30db96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/discontig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/discontig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/discontig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/discontig.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  */</div><div class='ctx'> struct early_node_data {</div><div class='ctx'> 	struct ia64_node_data *node_data;</div><div class='del'>-	pg_data_t *pgdat;</div><div class='ctx'> 	unsigned long pernode_addr;</div><div class='ctx'> 	unsigned long pernode_size;</div><div class='ctx'> 	struct bootmem_data bootmem_data;</div><div class='hunk'>@@ -46,6 +45,8 @@ struct early_node_data {</div><div class='ctx'> static struct early_node_data mem_data[MAX_NUMNODES] __initdata;</div><div class='ctx'> static nodemask_t memory_less_mask __initdata;</div><div class='ctx'> </div><div class='add'>+static pg_data_t *pgdat_list[MAX_NUMNODES];</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * To prevent cache aliasing effects, align per-node structures so that they</div><div class='ctx'>  * start at addresses that are strided by node number.</div><div class='hunk'>@@ -99,7 +100,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len,</div><div class='ctx'>  * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been</div><div class='ctx'>  * called yet.  Note that node 0 will also count all non-existent cpus.</div><div class='ctx'>  */</div><div class='del'>-static int __init early_nr_cpus_node(int node)</div><div class='add'>+static int __meminit early_nr_cpus_node(int node)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu, n = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +115,7 @@ static int __init early_nr_cpus_node(int node)</div><div class='ctx'>  * compute_pernodesize - compute size of pernode data</div><div class='ctx'>  * @node: the node id.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long __init compute_pernodesize(int node)</div><div class='add'>+static unsigned long __meminit compute_pernodesize(int node)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pernodesize = 0, cpus;</div><div class='ctx'> </div><div class='hunk'>@@ -175,13 +176,13 @@ static void __init fill_pernode(int node, unsigned long pernode,</div><div class='ctx'> 	pernode += PERCPU_PAGE_SIZE * cpus;</div><div class='ctx'> 	pernode += node * L1_CACHE_BYTES;</div><div class='ctx'> </div><div class='del'>-	mem_data[node].pgdat = __va(pernode);</div><div class='add'>+	pgdat_list[node] = __va(pernode);</div><div class='ctx'> 	pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));</div><div class='ctx'> </div><div class='ctx'> 	mem_data[node].node_data = __va(pernode);</div><div class='ctx'> 	pernode += L1_CACHE_ALIGN(sizeof(struct ia64_node_data));</div><div class='ctx'> </div><div class='del'>-	mem_data[node].pgdat-&gt;bdata = bdp;</div><div class='add'>+	pgdat_list[node]-&gt;bdata = bdp;</div><div class='ctx'> 	pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));</div><div class='ctx'> </div><div class='ctx'> 	cpu_data = per_cpu_node_setup(cpu_data, node);</div><div class='hunk'>@@ -268,7 +269,7 @@ static int __init find_pernode_space(unsigned long start, unsigned long len,</div><div class='ctx'> static int __init free_node_bootmem(unsigned long start, unsigned long len,</div><div class='ctx'> 				    int node)</div><div class='ctx'> {</div><div class='del'>-	free_bootmem_node(mem_data[node].pgdat, start, len);</div><div class='add'>+	free_bootmem_node(pgdat_list[node], start, len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -287,7 +288,7 @@ static void __init reserve_pernode_space(void)</div><div class='ctx'> 	int node;</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_node(node) {</div><div class='del'>-		pg_data_t *pdp = mem_data[node].pgdat;</div><div class='add'>+		pg_data_t *pdp = pgdat_list[node];</div><div class='ctx'> </div><div class='ctx'> 		if (node_isset(node, memory_less_mask))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -307,6 +308,27 @@ static void __init reserve_pernode_space(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __meminit scatter_node_data(void)</div><div class='add'>+{</div><div class='add'>+	pg_data_t **dst;</div><div class='add'>+	int node;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * for_each_online_node() can't be used at here.</div><div class='add'>+	 * node_online_map is not set for hot-added nodes at this time,</div><div class='add'>+	 * because we are halfway through initialization of the new node's</div><div class='add'>+	 * structures.  If for_each_online_node() is used, a new node's</div><div class='add'>+	 * pg_data_ptrs will be not initialized. Insted of using it,</div><div class='add'>+	 * pgdat_list[] is checked.</div><div class='add'>+	 */</div><div class='add'>+	for_each_node(node) {</div><div class='add'>+		if (pgdat_list[node]) {</div><div class='add'>+			dst = LOCAL_DATA_ADDR(pgdat_list[node])-&gt;pg_data_ptrs;</div><div class='add'>+			memcpy(dst, pgdat_list, sizeof(pgdat_list));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * initialize_pernode_data - fixup per-cpu &amp; per-node pointers</div><div class='ctx'>  *</div><div class='hunk'>@@ -317,17 +339,10 @@ static void __init reserve_pernode_space(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init initialize_pernode_data(void)</div><div class='ctx'> {</div><div class='del'>-	pg_data_t *pgdat_list[MAX_NUMNODES];</div><div class='ctx'> 	int cpu, node;</div><div class='ctx'> </div><div class='del'>-	for_each_online_node(node)</div><div class='del'>-		pgdat_list[node] = mem_data[node].pgdat;</div><div class='add'>+	scatter_node_data();</div><div class='ctx'> </div><div class='del'>-	/* Copy the pg_data_t list to each node and init the node field */</div><div class='del'>-	for_each_online_node(node) {</div><div class='del'>-		memcpy(mem_data[node].node_data-&gt;pg_data_ptrs, pgdat_list,</div><div class='del'>-		       sizeof(pgdat_list));</div><div class='del'>-	}</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	/* Set the node_data pointer for each per-cpu struct */</div><div class='ctx'> 	for (cpu = 0; cpu &lt; NR_CPUS; cpu++) {</div><div class='hunk'>@@ -372,7 +387,7 @@ static void __init *memory_less_node_alloc(int nid, unsigned long pernodesize)</div><div class='ctx'> 	if (bestnode == -1)</div><div class='ctx'> 		bestnode = anynode;</div><div class='ctx'> </div><div class='del'>-	ptr = __alloc_bootmem_node(mem_data[bestnode].pgdat, pernodesize,</div><div class='add'>+	ptr = __alloc_bootmem_node(pgdat_list[bestnode], pernodesize,</div><div class='ctx'> 		PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS));</div><div class='ctx'> </div><div class='ctx'> 	return ptr;</div><div class='hunk'>@@ -476,7 +491,7 @@ void __init find_memory(void)</div><div class='ctx'> 		pernodesize = mem_data[node].pernode_size;</div><div class='ctx'> 		map = pernode + pernodesize;</div><div class='ctx'> </div><div class='del'>-		init_bootmem_node(mem_data[node].pgdat,</div><div class='add'>+		init_bootmem_node(pgdat_list[node],</div><div class='ctx'> 				  map&gt;&gt;PAGE_SHIFT,</div><div class='ctx'> 				  bdp-&gt;node_boot_start&gt;&gt;PAGE_SHIFT,</div><div class='ctx'> 				  bdp-&gt;node_low_pfn);</div><div class='hunk'>@@ -786,3 +801,21 @@ void __init paging_init(void)</div><div class='ctx'> </div><div class='ctx'> 	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+pg_data_t *arch_alloc_nodedata(int nid)</div><div class='add'>+{</div><div class='add'>+	unsigned long size = compute_pernodesize(nid);</div><div class='add'>+</div><div class='add'>+	return kzalloc(size, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_free_nodedata(pg_data_t *pgdat)</div><div class='add'>+{</div><div class='add'>+	kfree(pgdat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)</div><div class='add'>+{</div><div class='add'>+	pgdat_list[update_node] = update_pgdat;</div><div class='add'>+	scatter_node_data();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c<br/>index 6d259e34f359..71c50dd8f870 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/extable.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c<br/>index d98ec49570b8..14ef7cceb208 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/fault.c</a></div><div class='hunk'>@@ -19,6 +19,40 @@</div><div class='ctx'> </div><div class='ctx'> extern void die (char *, struct pt_regs *, long);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);</div><div class='add'>+</div><div class='add'>+/* Hook to register for page fault notifications */</div><div class='add'>+int register_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_register(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int unregister_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	struct die_args args = {</div><div class='add'>+		.regs = regs,</div><div class='add'>+		.str = str,</div><div class='add'>+		.err = err,</div><div class='add'>+		.trapnr = trap,</div><div class='add'>+		.signr = sig</div><div class='add'>+	};</div><div class='add'>+	return atomic_notifier_call_chain(&amp;notify_page_fault_chain, val, &amp;args);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Return TRUE if ADDRESS points at a page in the kernel's mapped segment</div><div class='ctx'>  * (inside region 5, on ia64) and that page is present.</div><div class='hunk'>@@ -84,7 +118,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is to handle the kprobes on user space access instructions</div><div class='ctx'> 	 */</div><div class='del'>-	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, code, TRAP_BRKPT,</div><div class='add'>+	if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, code, TRAP_BRKPT,</div><div class='ctx'> 					SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c<br/>index 8d506710fdbd..eee5c1cfbe32 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Feb, 2004: dynamic hugetlb page size via boot parameter</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c<br/>index cafa8776a53d..2f50c064513c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/init.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1998-2003 Hewlett-Packard Co</div><div class='ctx'>  *	David Mosberger-Tang &lt;davidm@hpl.hp.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -652,7 +651,7 @@ void online_page(struct page *page)</div><div class='ctx'> 	num_physpages++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int add_memory(u64 start, u64 size)</div><div class='add'>+int arch_add_memory(int nid, u64 start, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	pg_data_t *pgdat;</div><div class='ctx'> 	struct zone *zone;</div><div class='hunk'>@@ -660,7 +659,7 @@ int add_memory(u64 start, u64 size)</div><div class='ctx'> 	unsigned long nr_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	pgdat = NODE_DATA(0);</div><div class='add'>+	pgdat = NODE_DATA(nid);</div><div class='ctx'> </div><div class='ctx'> 	zone = pgdat-&gt;node_zones + ZONE_NORMAL;</div><div class='ctx'> 	ret = __add_pages(zone, start_pfn, nr_pages);</div><div class='hunk'>@@ -676,4 +675,5 @@ int remove_memory(u64 start, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(remove_memory);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c<br/>index 643ccc6960ce..07bd02b6c372 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/ioremap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/ioremap.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/meminit.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline void __iomem *</div><div class='ctx'> __ioremap (unsigned long offset, unsigned long size)</div><div class='hunk'>@@ -21,16 +22,29 @@ __ioremap (unsigned long offset, unsigned long size)</div><div class='ctx'> void __iomem *</div><div class='ctx'> ioremap (unsigned long offset, unsigned long size)</div><div class='ctx'> {</div><div class='del'>-	if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB))</div><div class='del'>-		return phys_to_virt(offset);</div><div class='add'>+	u64 attr;</div><div class='add'>+	unsigned long gran_base, gran_size;</div><div class='ctx'> </div><div class='del'>-	if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC))</div><div class='add'>+	/*</div><div class='add'>+	 * For things in kern_memmap, we must use the same attribute</div><div class='add'>+	 * as the rest of the kernel.  For more details, see</div><div class='add'>+	 * Documentation/ia64/aliasing.txt.</div><div class='add'>+	 */</div><div class='add'>+	attr = kern_mem_attribute(offset, size);</div><div class='add'>+	if (attr &amp; EFI_MEMORY_WB)</div><div class='add'>+		return phys_to_virt(offset);</div><div class='add'>+	else if (attr &amp; EFI_MEMORY_UC)</div><div class='ctx'> 		return __ioremap(offset, size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Someday this should check ACPI resources so we</div><div class='del'>-	 * can do the right thing for hot-plugged regions.</div><div class='add'>+	 * Some chipsets don't support UC access to memory.  If</div><div class='add'>+	 * WB is supported for the whole granule, we prefer that.</div><div class='ctx'> 	 */</div><div class='add'>+	gran_base = GRANULEROUNDDOWN(offset);</div><div class='add'>+	gran_size = GRANULEROUNDUP(offset + size) - gran_base;</div><div class='add'>+	if (efi_mem_attribute(gran_base, gran_size) &amp; EFI_MEMORY_WB)</div><div class='add'>+		return phys_to_virt(offset);</div><div class='add'>+</div><div class='ctx'> 	return __ioremap(offset, size);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ioremap);</div><div class='hunk'>@@ -38,6 +52,9 @@ EXPORT_SYMBOL(ioremap);</div><div class='ctx'> void __iomem *</div><div class='ctx'> ioremap_nocache (unsigned long offset, unsigned long size)</div><div class='ctx'> {</div><div class='add'>+	if (kern_mem_attribute(offset, size) &amp; EFI_MEMORY_WB)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return __ioremap(offset, size);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ioremap_nocache);</div><div class='head'>diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c<br/>index 4e5c8b36ad93..64e4c21f311c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/numa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/numa.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *                         2002/08/07 Erich Focht &lt;efocht@ess.nec.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c<br/>index 4dbbca0b5e9c..ffad7624436c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/mm/tlb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/mm/tlb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/mm/tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/mm/tlb.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Rohit Seth &lt;rohit.seth@intel.com&gt;</div><div class='ctx'>  * Ken Chen &lt;kenneth.w.chen@intel.com&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ia64/oprofile/perfmon.c b/arch/ia64/oprofile/perfmon.c<br/>index b7975a469fb8..bc41dd32fec6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/oprofile/perfmon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/oprofile/perfmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/oprofile/perfmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/oprofile/perfmon.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/perfmon.h&gt;</div><div class='head'>diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c<br/>index ab829a22f8a4..60b45e79f080 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/pci/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/pci/pci.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Note: Above list of copyright holders is incomplete...</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -352,7 +351,7 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)</div><div class='ctx'> 	pxm = acpi_get_pxm(controller-&gt;acpi_handle);</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> 	if (pxm &gt;= 0)</div><div class='del'>-		controller-&gt;node = pxm_to_nid_map[pxm];</div><div class='add'>+		controller-&gt;node = pxm_to_node(pxm);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	acpi_walk_resources(device-&gt;handle, METHOD_NAME__CRS, count_window,</div><div class='hunk'>@@ -568,7 +567,7 @@ pcibios_disable_device (struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource (void *data, struct resource *res,</div><div class='del'>-		        unsigned long size, unsigned long align)</div><div class='add'>+		        resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -602,8 +601,6 @@ pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 	 * Leave vm_pgoff as-is, the PCI space address is the physical</div><div class='ctx'> 	 * address on this platform.</div><div class='ctx'> 	 */</div><div class='del'>-	vma-&gt;vm_flags |= (VM_SHM | VM_RESERVED | VM_IO);</div><div class='del'>-</div><div class='ctx'> 	if (write_combine &amp;&amp; efi_range_is_wc(vma-&gt;vm_start,</div><div class='ctx'> 					     vma-&gt;vm_end - vma-&gt;vm_start))</div><div class='ctx'> 		vma-&gt;vm_page_prot = pgprot_writecombine(vma-&gt;vm_page_prot);</div><div class='hunk'>@@ -645,18 +642,30 @@ char *ia64_pci_get_legacy_mem(struct pci_bus *bus)</div><div class='ctx'> int</div><div class='ctx'> pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='add'>+	unsigned long size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+	pgprot_t prot;</div><div class='ctx'> 	char *addr;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Avoid attribute aliasing.  See Documentation/ia64/aliasing.txt</div><div class='add'>+	 * for more details.</div><div class='add'>+	 */</div><div class='add'>+	if (!valid_mmap_phys_addr_range(vma-&gt;vm_pgoff, size))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	prot = phys_mem_access_prot(NULL, vma-&gt;vm_pgoff, size,</div><div class='add'>+				    vma-&gt;vm_page_prot);</div><div class='add'>+	if (pgprot_val(prot) != pgprot_val(pgprot_noncached(vma-&gt;vm_page_prot)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	addr = pci_get_legacy_mem(bus);</div><div class='ctx'> 	if (IS_ERR(addr))</div><div class='ctx'> 		return PTR_ERR(addr);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_pgoff += (unsigned long)addr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='del'>-	vma-&gt;vm_flags |= (VM_SHM | VM_RESERVED | VM_IO);</div><div class='add'>+	vma-&gt;vm_page_prot = prot;</div><div class='ctx'> </div><div class='ctx'> 	if (remap_pfn_range(vma, vma-&gt;vm_start, vma-&gt;vm_pgoff,</div><div class='del'>-			    vma-&gt;vm_end - vma-&gt;vm_start, vma-&gt;vm_page_prot))</div><div class='add'>+			    size, vma-&gt;vm_page_prot))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c<br/>index e952ef4f6d91..27dee4584061 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/bte.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/bte.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/bte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/bte.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (c) 2000-2006 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/sn/nodepda.h&gt;</div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='head'>diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c<br/>index 56ab6bae00ee..96fb81e6321f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/huberror.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/huberror.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/huberror.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/huberror.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info)</div><div class='ctx'>  */</div><div class='ctx'> void hub_error_init(struct hubdev_info *hubdev_info)</div><div class='ctx'> {</div><div class='del'>-	if (request_irq(SGI_II_ERROR, (void *)hub_eint_handler, SA_SHIRQ,</div><div class='add'>+	if (request_irq(SGI_II_ERROR, (void *)hub_eint_handler, IRQF_SHARED,</div><div class='ctx'> 			"SN_hub_error", (void *)hubdev_info))</div><div class='ctx'> 		printk("hub_error_init: Failed to request_irq for 0x%p\n",</div><div class='ctx'> 		    hubdev_info);</div><div class='hunk'>@@ -196,7 +196,7 @@ void hub_error_init(struct hubdev_info *hubdev_info)</div><div class='ctx'> void ice_error_init(struct hubdev_info *hubdev_info)</div><div class='ctx'> {</div><div class='ctx'>         if (request_irq</div><div class='del'>-            (SGI_TIO_ERROR, (void *)hub_eint_handler, SA_SHIRQ, "SN_TIO_error",</div><div class='add'>+            (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error",</div><div class='ctx'>              (void *)hubdev_info))</div><div class='ctx'>                 printk("ice_error_init: request_irq() error hubdev_info 0x%p\n",</div><div class='ctx'>                        hubdev_info);</div><div class='head'>diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c<br/>index 5101ac462643..dc09a6a28a37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/io_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/io_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/io_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/io_init.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static int max_pcibus_number = 255;	/* Default highest pci bus number */</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t</div><div class='del'>-sn_default_pci_map(struct pci_dev *pdev, unsigned long paddr, size_t size)</div><div class='add'>+sn_default_pci_map(struct pci_dev *pdev, unsigned long paddr, size_t size, int type)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -457,13 +457,6 @@ void sn_pci_fixup_slot(struct pci_dev *dev)</div><div class='ctx'> 		pcidev_info-&gt;pdi_sn_irq_info = NULL;</div><div class='ctx'> 		kfree(sn_irq_info);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * MSI currently not supported on altix.  Remove this when</div><div class='del'>-	 * the MSI abstraction patches are integrated into the kernel</div><div class='del'>-	 * (sometime after 2.6.16 releases)</div><div class='del'>-	 */</div><div class='del'>-	dev-&gt;no_msi = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c<br/>index c265e02f5036..7bb6ad188ba3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/irq.c</a></div><div class='hunk'>@@ -26,11 +26,11 @@ static void unregister_intr_pda(struct sn_irq_info *sn_irq_info);</div><div class='ctx'> </div><div class='ctx'> int sn_force_interrupt_flag = 1;</div><div class='ctx'> extern int sn_ioif_inited;</div><div class='del'>-static struct list_head **sn_irq_lh;</div><div class='del'>-static spinlock_t sn_irq_info_lock = SPIN_LOCK_UNLOCKED; /* non-IRQ lock */</div><div class='add'>+struct list_head **sn_irq_lh;</div><div class='add'>+static DEFINE_SPINLOCK(sn_irq_info_lock); /* non-IRQ lock */</div><div class='ctx'> </div><div class='del'>-static inline u64 sn_intr_alloc(nasid_t local_nasid, int local_widget,</div><div class='del'>-				     u64 sn_irq_info,</div><div class='add'>+u64 sn_intr_alloc(nasid_t local_nasid, int local_widget,</div><div class='add'>+				     struct sn_irq_info *sn_irq_info,</div><div class='ctx'> 				     int req_irq, nasid_t req_nasid,</div><div class='ctx'> 				     int req_slice)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,12 +40,13 @@ static inline u64 sn_intr_alloc(nasid_t local_nasid, int local_widget,</div><div class='ctx'> </div><div class='ctx'> 	SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_INTERRUPT,</div><div class='ctx'> 			(u64) SAL_INTR_ALLOC, (u64) local_nasid,</div><div class='del'>-			(u64) local_widget, (u64) sn_irq_info, (u64) req_irq,</div><div class='add'>+			(u64) local_widget, __pa(sn_irq_info), (u64) req_irq,</div><div class='ctx'> 			(u64) req_nasid, (u64) req_slice);</div><div class='add'>+</div><div class='ctx'> 	return ret_stuff.status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void sn_intr_free(nasid_t local_nasid, int local_widget,</div><div class='add'>+void sn_intr_free(nasid_t local_nasid, int local_widget,</div><div class='ctx'> 				struct sn_irq_info *sn_irq_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ia64_sal_retval ret_stuff;</div><div class='hunk'>@@ -112,73 +113,91 @@ static void sn_end_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> static void sn_irq_info_free(struct rcu_head *head);</div><div class='ctx'> </div><div class='del'>-static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)</div><div class='add'>+struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,</div><div class='add'>+				       nasid_t nasid, int slice)</div><div class='ctx'> {</div><div class='del'>-	struct sn_irq_info *sn_irq_info, *sn_irq_info_safe;</div><div class='del'>-	int cpuid, cpuphys;</div><div class='add'>+	int vector;</div><div class='add'>+	int cpuphys;</div><div class='add'>+	int64_t bridge;</div><div class='add'>+	int local_widget, status;</div><div class='add'>+	nasid_t local_nasid;</div><div class='add'>+	struct sn_irq_info *new_irq_info;</div><div class='add'>+	struct sn_pcibus_provider *pci_provider;</div><div class='ctx'> </div><div class='del'>-	cpuid = first_cpu(mask);</div><div class='del'>-	cpuphys = cpu_physical_id(cpuid);</div><div class='add'>+	new_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_ATOMIC);</div><div class='add'>+	if (new_irq_info == NULL)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe,</div><div class='del'>-				 sn_irq_lh[irq], list) {</div><div class='del'>-		u64 bridge;</div><div class='del'>-		int local_widget, status;</div><div class='del'>-		nasid_t local_nasid;</div><div class='del'>-		struct sn_irq_info *new_irq_info;</div><div class='del'>-		struct sn_pcibus_provider *pci_provider;</div><div class='del'>-</div><div class='del'>-		new_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_ATOMIC);</div><div class='del'>-		if (new_irq_info == NULL)</div><div class='del'>-			break;</div><div class='del'>-		memcpy(new_irq_info, sn_irq_info, sizeof(struct sn_irq_info));</div><div class='del'>-</div><div class='del'>-		bridge = (u64) new_irq_info-&gt;irq_bridge;</div><div class='del'>-		if (!bridge) {</div><div class='del'>-			kfree(new_irq_info);</div><div class='del'>-			break; /* irq is not a device interrupt */</div><div class='del'>-		}</div><div class='add'>+	memcpy(new_irq_info, sn_irq_info, sizeof(struct sn_irq_info));</div><div class='add'>+</div><div class='add'>+	bridge = (u64) new_irq_info-&gt;irq_bridge;</div><div class='add'>+	if (!bridge) {</div><div class='add'>+		kfree(new_irq_info);</div><div class='add'>+		return NULL; /* irq is not a device interrupt */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		local_nasid = NASID_GET(bridge);</div><div class='add'>+	local_nasid = NASID_GET(bridge);</div><div class='ctx'> </div><div class='del'>-		if (local_nasid &amp; 1)</div><div class='del'>-			local_widget = TIO_SWIN_WIDGETNUM(bridge);</div><div class='del'>-		else</div><div class='del'>-			local_widget = SWIN_WIDGETNUM(bridge);</div><div class='add'>+	if (local_nasid &amp; 1)</div><div class='add'>+		local_widget = TIO_SWIN_WIDGETNUM(bridge);</div><div class='add'>+	else</div><div class='add'>+		local_widget = SWIN_WIDGETNUM(bridge);</div><div class='ctx'> </div><div class='del'>-		/* Free the old PROM new_irq_info structure */</div><div class='del'>-		sn_intr_free(local_nasid, local_widget, new_irq_info);</div><div class='del'>-		/* Update kernels new_irq_info with new target info */</div><div class='del'>-		unregister_intr_pda(new_irq_info);</div><div class='add'>+	vector = sn_irq_info-&gt;irq_irq;</div><div class='add'>+	/* Free the old PROM new_irq_info structure */</div><div class='add'>+	sn_intr_free(local_nasid, local_widget, new_irq_info);</div><div class='add'>+	/* Update kernels new_irq_info with new target info */</div><div class='add'>+	unregister_intr_pda(new_irq_info);</div><div class='ctx'> </div><div class='del'>-		/* allocate a new PROM new_irq_info struct */</div><div class='del'>-		status = sn_intr_alloc(local_nasid, local_widget,</div><div class='del'>-				       __pa(new_irq_info), irq,</div><div class='del'>-				       cpuid_to_nasid(cpuid),</div><div class='del'>-				       cpuid_to_slice(cpuid));</div><div class='add'>+	/* allocate a new PROM new_irq_info struct */</div><div class='add'>+	status = sn_intr_alloc(local_nasid, local_widget,</div><div class='add'>+			       new_irq_info, vector,</div><div class='add'>+			       nasid, slice);</div><div class='ctx'> </div><div class='del'>-		/* SAL call failed */</div><div class='del'>-		if (status) {</div><div class='del'>-			kfree(new_irq_info);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	/* SAL call failed */</div><div class='add'>+	if (status) {</div><div class='add'>+		kfree(new_irq_info);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		new_irq_info-&gt;irq_cpuid = cpuid;</div><div class='del'>-		register_intr_pda(new_irq_info);</div><div class='add'>+	cpuphys = nasid_slice_to_cpuid(nasid, slice);</div><div class='add'>+	new_irq_info-&gt;irq_cpuid = cpuphys;</div><div class='add'>+	register_intr_pda(new_irq_info);</div><div class='ctx'> </div><div class='del'>-		pci_provider = sn_pci_provider[new_irq_info-&gt;irq_bridge_type];</div><div class='del'>-		if (pci_provider &amp;&amp; pci_provider-&gt;target_interrupt)</div><div class='del'>-			(pci_provider-&gt;target_interrupt)(new_irq_info);</div><div class='add'>+	pci_provider = sn_pci_provider[new_irq_info-&gt;irq_bridge_type];</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;sn_irq_info_lock);</div><div class='del'>-		list_replace_rcu(&amp;sn_irq_info-&gt;list, &amp;new_irq_info-&gt;list);</div><div class='del'>-		spin_unlock(&amp;sn_irq_info_lock);</div><div class='del'>-		call_rcu(&amp;sn_irq_info-&gt;rcu, sn_irq_info_free);</div><div class='add'>+	/*</div><div class='add'>+	 * If this represents a line interrupt, target it.  If it's</div><div class='add'>+	 * an msi (irq_int_bit &lt; 0), it's already targeted.</div><div class='add'>+	 */</div><div class='add'>+	if (new_irq_info-&gt;irq_int_bit &gt;= 0 &amp;&amp;</div><div class='add'>+	    pci_provider &amp;&amp; pci_provider-&gt;target_interrupt)</div><div class='add'>+		(pci_provider-&gt;target_interrupt)(new_irq_info);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sn_irq_info_lock);</div><div class='add'>+	list_replace_rcu(&amp;sn_irq_info-&gt;list, &amp;new_irq_info-&gt;list);</div><div class='add'>+	spin_unlock(&amp;sn_irq_info_lock);</div><div class='add'>+	call_rcu(&amp;sn_irq_info-&gt;rcu, sn_irq_info_free);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-		set_irq_affinity_info((irq &amp; 0xff), cpuphys, 0);</div><div class='add'>+	set_irq_affinity_info((vector &amp; 0xff), cpuphys, 0);</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	return new_irq_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)</div><div class='add'>+{</div><div class='add'>+	struct sn_irq_info *sn_irq_info, *sn_irq_info_safe;</div><div class='add'>+	nasid_t nasid;</div><div class='add'>+	int slice;</div><div class='add'>+</div><div class='add'>+	nasid = cpuid_to_nasid(first_cpu(mask));</div><div class='add'>+	slice = cpuid_to_slice(first_cpu(mask));</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(sn_irq_info, sn_irq_info_safe,</div><div class='add'>+				 sn_irq_lh[irq], list)</div><div class='add'>+		(void)sn_retarget_vector(sn_irq_info, nasid, slice);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct hw_interrupt_type irq_type_sn = {</div><div class='hunk'>@@ -202,9 +221,12 @@ void sn_irq_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	irq_desc_t *base_desc = irq_desc;</div><div class='ctx'> </div><div class='add'>+	ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;</div><div class='add'>+	ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-		if (base_desc[i].handler == &amp;no_irq_type) {</div><div class='del'>-			base_desc[i].handler = &amp;irq_type_sn;</div><div class='add'>+		if (base_desc[i].chip == &amp;no_irq_type) {</div><div class='add'>+			base_desc[i].chip = &amp;irq_type_sn;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -285,6 +307,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)</div><div class='ctx'> 	/* link it into the sn_irq[irq] list */</div><div class='ctx'> 	spin_lock(&amp;sn_irq_info_lock);</div><div class='ctx'> 	list_add_rcu(&amp;sn_irq_info-&gt;list, sn_irq_lh[sn_irq_info-&gt;irq_irq]);</div><div class='add'>+	reserve_irq_vector(sn_irq_info-&gt;irq_irq);</div><div class='ctx'> 	spin_unlock(&amp;sn_irq_info_lock);</div><div class='ctx'> </div><div class='ctx'> 	register_intr_pda(sn_irq_info);</div><div class='hunk'>@@ -310,8 +333,11 @@ void sn_irq_unfixup(struct pci_dev *pci_dev)</div><div class='ctx'> 	spin_lock(&amp;sn_irq_info_lock);</div><div class='ctx'> 	list_del_rcu(&amp;sn_irq_info-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;sn_irq_info_lock);</div><div class='add'>+	if (list_empty(sn_irq_lh[sn_irq_info-&gt;irq_irq]))</div><div class='add'>+		free_irq_vector(sn_irq_info-&gt;irq_irq);</div><div class='ctx'> 	call_rcu(&amp;sn_irq_info-&gt;rcu, sn_irq_info_free);</div><div class='ctx'> 	pci_dev_put(pci_dev);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='head'>diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c<br/>index 30988dfbddff..c119e8b620de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/setup.c</a></div><div class='hunk'>@@ -6,14 +6,13 @@</div><div class='ctx'>  * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -139,7 +138,7 @@ static int __init pxm_to_nasid(int pxm)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int nid;</div><div class='ctx'> </div><div class='del'>-	nid = pxm_to_nid_map[pxm];</div><div class='add'>+	nid = pxm_to_node(pxm);</div><div class='ctx'> 	for (i = 0; i &lt; num_node_memblks; i++) {</div><div class='ctx'> 		if (node_memblk[i].nid == nid) {</div><div class='ctx'> 			return NASID_GET(node_memblk[i].start_paddr);</div><div class='hunk'>@@ -458,7 +457,7 @@ void __init sn_setup(char **cmdline_p)</div><div class='ctx'> 	 * support here so we don't have to listen to failed keyboard probe</div><div class='ctx'> 	 * messages.</div><div class='ctx'> 	 */</div><div class='del'>-	if (version &lt;= 0x0209 &amp;&amp; acpi_kbd_controller_present) {</div><div class='add'>+	if (is_shub1() &amp;&amp; version &lt;= 0x0209 &amp;&amp; acpi_kbd_controller_present) {</div><div class='ctx'> 		printk(KERN_INFO "Disabling legacy keyboard support as prom "</div><div class='ctx'> 		       "is too old and doesn't provide FADT\n");</div><div class='ctx'> 		acpi_kbd_controller_present = 0;</div><div class='hunk'>@@ -577,7 +576,8 @@ void __init sn_cpu_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	static int wars_have_been_checked;</div><div class='ctx'> </div><div class='del'>-	if (smp_processor_id() == 0 &amp;&amp; IS_MEDUSA()) {</div><div class='add'>+	cpuid = smp_processor_id();</div><div class='add'>+	if (cpuid == 0 &amp;&amp; IS_MEDUSA()) {</div><div class='ctx'> 		if (ia64_sn_is_fake_prom())</div><div class='ctx'> 			sn_prom_type = 2;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -597,6 +597,12 @@ void __init sn_cpu_init(void)</div><div class='ctx'> 	sn_hub_info-&gt;as_shift = sn_hub_info-&gt;nasid_shift - 2;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Don't check status. The SAL call is not supported on all PROMs</div><div class='add'>+	 * but a failure is harmless.</div><div class='add'>+	 */</div><div class='add'>+	(void) ia64_sn_set_cpu_number(cpuid);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * The boot cpu makes this call again after platform initialization is</div><div class='ctx'> 	 * complete.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -607,7 +613,6 @@ void __init sn_cpu_init(void)</div><div class='ctx'> 		if (ia64_sn_get_prom_feature_set(i, &amp;sn_prom_features[i]) != 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-	cpuid = smp_processor_id();</div><div class='ctx'> 	cpuphyid = get_sapicid();</div><div class='ctx'> </div><div class='ctx'> 	if (ia64_sn_get_sapic_info(cpuphyid, &amp;nasid, &amp;subnode, &amp;slice))</div><div class='hunk'>@@ -704,7 +709,7 @@ void __init build_cnode_tables(void)</div><div class='ctx'> 	 * cnode == node for all C &amp; M bricks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_online_node(node) {</div><div class='del'>-		nasid = pxm_to_nasid(nid_to_pxm_map[node]);</div><div class='add'>+		nasid = pxm_to_nasid(node_to_pxm(node));</div><div class='ctx'> 		sn_cnodeid_to_nasid[node] = nasid;</div><div class='ctx'> 		physical_node_map[nasid] = node;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/cache.c b/arch/ia64/sn/kernel/sn2/cache.c<br/>index bc3cfa17cd0f..2862cb33026d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/sn2/cache.c</a></div><div class='hunk'>@@ -3,11 +3,12 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  * </div><div class='del'>- * Copyright (C) 2001-2003 Silicon Graphics, Inc. All rights reserved.</div><div class='add'>+ * Copyright (C) 2001-2003, 2006 Silicon Graphics, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/sn/arch.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * sn_flush_all_caches - flush a range of address from all caches (incl. L4)</div><div class='hunk'>@@ -17,18 +18,24 @@</div><div class='ctx'>  * Flush a range of addresses from all caches including L4. </div><div class='ctx'>  * All addresses fully or partially contained within </div><div class='ctx'>  * @flush_addr to @flush_addr + @bytes are flushed</div><div class='del'>- * from the all caches.</div><div class='add'>+ * from all caches.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> sn_flush_all_caches(long flush_addr, long bytes)</div><div class='ctx'> {</div><div class='del'>-	flush_icache_range(flush_addr, flush_addr+bytes);</div><div class='add'>+	unsigned long addr = flush_addr;</div><div class='add'>+</div><div class='add'>+	/* SHub1 requires a cached address */</div><div class='add'>+	if (is_shub1() &amp;&amp; (addr &amp; RGN_BITS) == RGN_BASE(RGN_UNCACHED))</div><div class='add'>+		addr = (addr - RGN_BASE(RGN_UNCACHED)) + RGN_BASE(RGN_KERNEL);</div><div class='add'>+</div><div class='add'>+	flush_icache_range(addr, addr + bytes);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The last call may have returned before the caches</div><div class='ctx'> 	 * were actually flushed, so we call it again to make</div><div class='ctx'> 	 * sure.</div><div class='ctx'> 	 */</div><div class='del'>-	flush_icache_range(flush_addr, flush_addr+bytes);</div><div class='add'>+	flush_icache_range(addr, addr + bytes);</div><div class='ctx'> 	mb();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sn_flush_all_caches);</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/prominfo_proc.c b/arch/ia64/sn/kernel/sn2/prominfo_proc.c<br/>index 6ae276d5d50c..4dcce3d0e04c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/prominfo_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/prominfo_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/prominfo_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/sn2/prominfo_proc.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Module to export the system's Firmware Interface Tables, including</div><div class='ctx'>  * PROM revision numbers and banners, in /proc</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c<br/>index 739c948dc504..9a8a29339d2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/sn_hwperf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/sn_hwperf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/sn_hwperf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/sn2/sn_hwperf.c</a></div><div class='hunk'>@@ -51,6 +51,8 @@ static nasid_t sn_hwperf_master_nasid = INVALID_NASID;</div><div class='ctx'> static int sn_hwperf_init(void);</div><div class='ctx'> static DECLARE_MUTEX(sn_hwperf_init_mutex);</div><div class='ctx'> </div><div class='add'>+#define cnode_possible(n)	((n) &lt; num_cnodes)</div><div class='add'>+</div><div class='ctx'> static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret)</div><div class='ctx'> {</div><div class='ctx'> 	int e;</div><div class='hunk'>@@ -127,14 +129,14 @@ static int sn_hwperf_geoid_to_cnode(char *location)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return node_possible(cnode) ? cnode : -1;</div><div class='add'>+	return cnode_possible(cnode) ? cnode : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sn_hwperf_obj_to_cnode(struct sn_hwperf_object_info * obj)</div><div class='ctx'> {</div><div class='ctx'> 	if (!SN_HWPERF_IS_NODE(obj) &amp;&amp; !SN_HWPERF_IS_IONODE(obj))</div><div class='ctx'> 		BUG();</div><div class='del'>-	if (!obj-&gt;sn_hwp_this_part)</div><div class='add'>+	if (SN_HWPERF_FOREIGN(obj))</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	return sn_hwperf_geoid_to_cnode(obj-&gt;location);</div><div class='ctx'> }</div><div class='hunk'>@@ -199,12 +201,12 @@ static void print_pci_topology(struct seq_file *s)</div><div class='ctx'> </div><div class='ctx'> static inline int sn_hwperf_has_cpus(cnodeid_t node)</div><div class='ctx'> {</div><div class='del'>-	return node_online(node) &amp;&amp; nr_cpus_node(node);</div><div class='add'>+	return node &lt; MAX_NUMNODES &amp;&amp; node_online(node) &amp;&amp; nr_cpus_node(node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int sn_hwperf_has_mem(cnodeid_t node)</div><div class='ctx'> {</div><div class='del'>-	return node_online(node) &amp;&amp; NODE_DATA(node)-&gt;node_present_pages;</div><div class='add'>+	return node &lt; MAX_NUMNODES &amp;&amp; node_online(node) &amp;&amp; NODE_DATA(node)-&gt;node_present_pages;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sn_hwperf_object_info *</div><div class='hunk'>@@ -237,7 +239,7 @@ static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objb</div><div class='ctx'> 	int found_mem = 0;</div><div class='ctx'> 	int found_cpu = 0;</div><div class='ctx'> </div><div class='del'>-	if (!node_possible(node))</div><div class='add'>+	if (!cnode_possible(node))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (sn_hwperf_has_cpus(node)) {</div><div class='hunk'>@@ -442,7 +444,7 @@ static int sn_topology_show(struct seq_file *s, void *d)</div><div class='ctx'> 	seq_printf(s, "%s %d %s %s asic %s", slabname, ordinal, obj-&gt;location,</div><div class='ctx'> 		obj-&gt;sn_hwp_this_part ? "local" : "shared", obj-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (!SN_HWPERF_IS_NODE(obj) &amp;&amp; !SN_HWPERF_IS_IONODE(obj))</div><div class='add'>+	if (ordinal &lt; 0 || (!SN_HWPERF_IS_NODE(obj) &amp;&amp; !SN_HWPERF_IS_IONODE(obj)))</div><div class='ctx'> 		seq_putc(s, '\n');</div><div class='ctx'> 	else {</div><div class='ctx'> 		cnodeid_t near_mem = -1;</div><div class='hunk'>@@ -468,22 +470,24 @@ static int sn_topology_show(struct seq_file *s, void *d)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * CPUs on this node, if any</div><div class='ctx'> 		 */</div><div class='del'>-		cpumask = node_to_cpumask(ordinal);</div><div class='del'>-		for_each_online_cpu(i) {</div><div class='del'>-			if (cpu_isset(i, cpumask)) {</div><div class='del'>-				slice = 'a' + cpuid_to_slice(i);</div><div class='del'>-				c = cpu_data(i);</div><div class='del'>-				seq_printf(s, "cpu %d %s%c local"</div><div class='del'>-					" freq %luMHz, arch ia64",</div><div class='del'>-					i, obj-&gt;location, slice,</div><div class='del'>-					c-&gt;proc_freq / 1000000);</div><div class='del'>-				for_each_online_cpu(j) {</div><div class='del'>-					seq_printf(s, j ? ":%d" : ", dist %d",</div><div class='del'>-						node_distance(</div><div class='del'>-						    cpu_to_node(i),</div><div class='del'>-						    cpu_to_node(j)));</div><div class='add'>+		if (!SN_HWPERF_IS_IONODE(obj)) {</div><div class='add'>+			cpumask = node_to_cpumask(ordinal);</div><div class='add'>+			for_each_online_cpu(i) {</div><div class='add'>+				if (cpu_isset(i, cpumask)) {</div><div class='add'>+					slice = 'a' + cpuid_to_slice(i);</div><div class='add'>+					c = cpu_data(i);</div><div class='add'>+					seq_printf(s, "cpu %d %s%c local"</div><div class='add'>+						" freq %luMHz, arch ia64",</div><div class='add'>+						i, obj-&gt;location, slice,</div><div class='add'>+						c-&gt;proc_freq / 1000000);</div><div class='add'>+					for_each_online_cpu(j) {</div><div class='add'>+						seq_printf(s, j ? ":%d" : ", dist %d",</div><div class='add'>+							node_distance(</div><div class='add'>+						    	cpu_to_node(i),</div><div class='add'>+						    	cpu_to_node(j)));</div><div class='add'>+					}</div><div class='add'>+					seq_putc(s, '\n');</div><div class='ctx'> 				}</div><div class='del'>-				seq_putc(s, '\n');</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -523,7 +527,7 @@ static int sn_topology_show(struct seq_file *s, void *d)</div><div class='ctx'> 			if (obj-&gt;sn_hwp_this_part &amp;&amp; p-&gt;sn_hwp_this_part)</div><div class='ctx'> 				/* both ends local to this partition */</div><div class='ctx'> 				seq_puts(s, " local");</div><div class='del'>-			else if (!obj-&gt;sn_hwp_this_part &amp;&amp; !p-&gt;sn_hwp_this_part)</div><div class='add'>+			else if (SN_HWPERF_FOREIGN(p))</div><div class='ctx'> 				/* both ends of the link in foreign partiton */</div><div class='ctx'> 				seq_puts(s, " foreign");</div><div class='ctx'> 			else</div><div class='hunk'>@@ -776,7 +780,7 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)</div><div class='ctx'> </div><div class='ctx'> 	case SN_HWPERF_GET_NODE_NASID:</div><div class='ctx'> 		if (a.sz != sizeof(u64) ||</div><div class='del'>-		   (node = a.arg) &lt; 0 || !node_possible(node)) {</div><div class='add'>+		   (node = a.arg) &lt; 0 || !cnode_possible(node)) {</div><div class='ctx'> 			r = -EINVAL;</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c<br/>index 5100261310f7..43ddc2eccb96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/sn_proc_fs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/sn2/sn_proc_fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/sn2/sn_proc_fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/sn2/sn_proc_fs.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000-2005 Silicon Graphics, Inc. All rights reserved.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c<br/>index 8255a9be4632..c2f69f7942af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/xpc_channel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/xpc_channel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/xpc_channel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/xpc_channel.c</a></div><div class='hunk'>@@ -202,7 +202,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)</div><div class='ctx'> 	init_waitqueue_head(&amp;part-&gt;channel_mgr_wq);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(part-&gt;IPI_owner, "xpc%02d", partid);</div><div class='del'>-	ret = request_irq(SGI_XPC_NOTIFY, xpc_notify_IRQ_handler, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(SGI_XPC_NOTIFY, xpc_notify_IRQ_handler, IRQF_SHARED,</div><div class='ctx'> 				part-&gt;IPI_owner, (void *) (u64) partid);</div><div class='ctx'> 	if (ret != 0) {</div><div class='ctx'> 		dev_err(xpc_chan, "can't register NOTIFY IRQ handler, "</div><div class='head'>diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c<br/>index e5c6d3c0a8e9..007703c494a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/xpnet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/kernel/xpnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/kernel/xpnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/kernel/xpnet.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c<br/>index b4b84c269210..7a291a271511 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pci_dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/pci_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pci_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/pci/pci_dma.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/sn/pcibr_provider.h&gt;</div><div class='add'>+#include &lt;asm/sn/intr.h&gt;</div><div class='ctx'> #include &lt;asm/sn/pcibus_provider_defs.h&gt;</div><div class='ctx'> #include &lt;asm/sn/pcidev.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn_sal.h&gt;</div><div class='hunk'>@@ -113,7 +113,8 @@ void *sn_dma_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 	 * resources.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	*dma_handle = provider-&gt;dma_map_consistent(pdev, phys_addr, size);</div><div class='add'>+	*dma_handle = provider-&gt;dma_map_consistent(pdev, phys_addr, size,</div><div class='add'>+						   SN_DMA_ADDR_PHYS);</div><div class='ctx'> 	if (!*dma_handle) {</div><div class='ctx'> 		printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);</div><div class='ctx'> 		free_pages((unsigned long)cpuaddr, get_order(size));</div><div class='hunk'>@@ -176,7 +177,7 @@ dma_addr_t sn_dma_map_single(struct device *dev, void *cpu_addr, size_t size,</div><div class='ctx'> 	BUG_ON(dev-&gt;bus != &amp;pci_bus_type);</div><div class='ctx'> </div><div class='ctx'> 	phys_addr = __pa(cpu_addr);</div><div class='del'>-	dma_addr = provider-&gt;dma_map(pdev, phys_addr, size);</div><div class='add'>+	dma_addr = provider-&gt;dma_map(pdev, phys_addr, size, SN_DMA_ADDR_PHYS);</div><div class='ctx'> 	if (!dma_addr) {</div><div class='ctx'> 		printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -260,7 +261,8 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sg, int nhwentries,</div><div class='ctx'> 	for (i = 0; i &lt; nhwentries; i++, sg++) {</div><div class='ctx'> 		phys_addr = SG_ENT_PHYS_ADDRESS(sg);</div><div class='ctx'> 		sg-&gt;dma_address = provider-&gt;dma_map(pdev,</div><div class='del'>-						    phys_addr, sg-&gt;length);</div><div class='add'>+						    phys_addr, sg-&gt;length,</div><div class='add'>+						    SN_DMA_ADDR_PHYS);</div><div class='ctx'> </div><div class='ctx'> 		if (!sg-&gt;dma_address) {</div><div class='ctx'> 			printk(KERN_ERR "%s: out of ATEs\n", __FUNCTION__);</div><div class='head'>diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c<br/>index 9f86bb6519aa..a86c7b945962 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pcibr/pcibr_dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/pcibr/pcibr_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pcibr/pcibr_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/pci/pcibr/pcibr_dma.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ extern int sn_ioif_inited;</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t</div><div class='ctx'> pcibr_dmamap_ate32(struct pcidev_info *info,</div><div class='del'>-		   u64 paddr, size_t req_size, u64 flags)</div><div class='add'>+		   u64 paddr, size_t req_size, u64 flags, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct pcidev_info *pcidev_info = info-&gt;pdi_host_pcidev_info;</div><div class='hunk'>@@ -81,9 +81,12 @@ pcibr_dmamap_ate32(struct pcidev_info *info,</div><div class='ctx'> 	if (IS_PCIX(pcibus_info))</div><div class='ctx'> 		ate_flags &amp;= ~(PCI32_ATE_PREF);</div><div class='ctx'> </div><div class='del'>-	xio_addr =</div><div class='del'>-	    IS_PIC_SOFT(pcibus_info) ? PHYS_TO_DMA(paddr) :</div><div class='del'>-	    PHYS_TO_TIODMA(paddr);</div><div class='add'>+	if (SN_DMA_ADDRTYPE(dma_flags == SN_DMA_ADDR_PHYS))</div><div class='add'>+		xio_addr = IS_PIC_SOFT(pcibus_info) ? PHYS_TO_DMA(paddr) :</div><div class='add'>+	    					      PHYS_TO_TIODMA(paddr);</div><div class='add'>+	else</div><div class='add'>+		xio_addr = paddr;</div><div class='add'>+</div><div class='ctx'> 	offset = IOPGOFF(xio_addr);</div><div class='ctx'> 	ate = ate_flags | (xio_addr - offset);</div><div class='ctx'> </div><div class='hunk'>@@ -91,6 +94,13 @@ pcibr_dmamap_ate32(struct pcidev_info *info,</div><div class='ctx'> 	if (IS_PIC_SOFT(pcibus_info)) {</div><div class='ctx'> 		ate |= (pcibus_info-&gt;pbi_hub_xid &lt;&lt; PIC_ATE_TARGETID_SHFT);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we're mapping for MSI, set the MSI bit in the ATE</div><div class='add'>+	 */</div><div class='add'>+	if (dma_flags &amp; SN_DMA_MSI)</div><div class='add'>+		ate |= PCI32_ATE_MSI;</div><div class='add'>+</div><div class='ctx'> 	ate_write(pcibus_info, ate_index, ate_count, ate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -105,20 +115,27 @@ pcibr_dmamap_ate32(struct pcidev_info *info,</div><div class='ctx'> 	if (pcibus_info-&gt;pbi_devreg[internal_device] &amp; PCIBR_DEV_SWAP_DIR)</div><div class='ctx'> 		ATE_SWAP_ON(pci_addr);</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	return pci_addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t</div><div class='ctx'> pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr,</div><div class='del'>-			u64 dma_attributes)</div><div class='add'>+			u64 dma_attributes, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcibus_info *pcibus_info = (struct pcibus_info *)</div><div class='ctx'> 	    ((info-&gt;pdi_host_pcidev_info)-&gt;pdi_pcibus_info);</div><div class='ctx'> 	u64 pci_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* Translate to Crosstalk View of Physical Address */</div><div class='del'>-	pci_addr = (IS_PIC_SOFT(pcibus_info) ? PHYS_TO_DMA(paddr) :</div><div class='del'>-		    PHYS_TO_TIODMA(paddr)) | dma_attributes;</div><div class='add'>+	if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)</div><div class='add'>+		pci_addr = IS_PIC_SOFT(pcibus_info) ?</div><div class='add'>+				PHYS_TO_DMA(paddr) :</div><div class='add'>+		    		PHYS_TO_TIODMA(paddr) | dma_attributes;</div><div class='add'>+	else</div><div class='add'>+		pci_addr = IS_PIC_SOFT(pcibus_info) ?</div><div class='add'>+				paddr :</div><div class='add'>+				paddr | dma_attributes;</div><div class='ctx'> </div><div class='ctx'> 	/* Handle Bus mode */</div><div class='ctx'> 	if (IS_PCIX(pcibus_info))</div><div class='hunk'>@@ -130,7 +147,9 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr,</div><div class='ctx'> 		    ((u64) pcibus_info-&gt;</div><div class='ctx'> 		     pbi_hub_xid &lt;&lt; PIC_PCI64_ATTR_TARG_SHFT);</div><div class='ctx'> 	} else</div><div class='del'>-		pci_addr |= TIOCP_PCI64_CMDTYPE_MEM;</div><div class='add'>+		pci_addr |= (dma_flags &amp; SN_DMA_MSI) ?</div><div class='add'>+				TIOCP_PCI64_CMDTYPE_MSI :</div><div class='add'>+				TIOCP_PCI64_CMDTYPE_MEM;</div><div class='ctx'> </div><div class='ctx'> 	/* If PCI mode, func zero uses VCHAN0, every other func uses VCHAN1 */</div><div class='ctx'> 	if (!IS_PCIX(pcibus_info) &amp;&amp; PCI_FUNC(info-&gt;pdi_linux_pcidev-&gt;devfn))</div><div class='hunk'>@@ -141,7 +160,7 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr,</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t</div><div class='ctx'> pcibr_dmatrans_direct32(struct pcidev_info * info,</div><div class='del'>-			u64 paddr, size_t req_size, u64 flags)</div><div class='add'>+			u64 paddr, size_t req_size, u64 flags, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcidev_info *pcidev_info = info-&gt;pdi_host_pcidev_info;</div><div class='ctx'> 	struct pcibus_info *pcibus_info = (struct pcibus_info *)pcidev_info-&gt;</div><div class='hunk'>@@ -156,8 +175,14 @@ pcibr_dmatrans_direct32(struct pcidev_info * info,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	xio_addr = IS_PIC_SOFT(pcibus_info) ? PHYS_TO_DMA(paddr) :</div><div class='del'>-	    PHYS_TO_TIODMA(paddr);</div><div class='add'>+	if (dma_flags &amp; SN_DMA_MSI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)</div><div class='add'>+		xio_addr = IS_PIC_SOFT(pcibus_info) ? PHYS_TO_DMA(paddr) :</div><div class='add'>+	    					      PHYS_TO_TIODMA(paddr);</div><div class='add'>+	else</div><div class='add'>+		xio_addr = paddr;</div><div class='ctx'> </div><div class='ctx'> 	xio_base = pcibus_info-&gt;pbi_dir_xbase;</div><div class='ctx'> 	offset = xio_addr - xio_base;</div><div class='hunk'>@@ -327,7 +352,7 @@ void sn_dma_flush(u64 addr)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> dma_addr_t</div><div class='del'>-pcibr_dma_map(struct pci_dev * hwdev, unsigned long phys_addr, size_t size)</div><div class='add'>+pcibr_dma_map(struct pci_dev * hwdev, unsigned long phys_addr, size_t size, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='ctx'> 	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev);</div><div class='hunk'>@@ -344,11 +369,11 @@ pcibr_dma_map(struct pci_dev * hwdev, unsigned long phys_addr, size_t size)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		dma_handle = pcibr_dmatrans_direct64(pcidev_info, phys_addr,</div><div class='del'>-						     PCI64_ATTR_PREF);</div><div class='add'>+						     PCI64_ATTR_PREF, dma_flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Handle 32-63 bit cards via direct mapping */</div><div class='ctx'> 		dma_handle = pcibr_dmatrans_direct32(pcidev_info, phys_addr,</div><div class='del'>-						     size, 0);</div><div class='add'>+						     size, 0, dma_flags);</div><div class='ctx'> 		if (!dma_handle) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * It is a 32 bit card and we cannot do direct mapping,</div><div class='hunk'>@@ -356,7 +381,8 @@ pcibr_dma_map(struct pci_dev * hwdev, unsigned long phys_addr, size_t size)</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='ctx'> 			dma_handle = pcibr_dmamap_ate32(pcidev_info, phys_addr,</div><div class='del'>-							size, PCI32_ATE_PREF);</div><div class='add'>+							size, PCI32_ATE_PREF,</div><div class='add'>+							dma_flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -365,18 +391,18 @@ pcibr_dma_map(struct pci_dev * hwdev, unsigned long phys_addr, size_t size)</div><div class='ctx'> </div><div class='ctx'> dma_addr_t</div><div class='ctx'> pcibr_dma_map_consistent(struct pci_dev * hwdev, unsigned long phys_addr,</div><div class='del'>-			 size_t size)</div><div class='add'>+			 size_t size, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='ctx'> 	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev);</div><div class='ctx'> </div><div class='ctx'> 	if (hwdev-&gt;dev.coherent_dma_mask == ~0UL) {</div><div class='ctx'> 		dma_handle = pcibr_dmatrans_direct64(pcidev_info, phys_addr,</div><div class='del'>-					    PCI64_ATTR_BAR);</div><div class='add'>+					    PCI64_ATTR_BAR, dma_flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dma_handle = (dma_addr_t) pcibr_dmamap_ate32(pcidev_info,</div><div class='ctx'> 						    phys_addr, size,</div><div class='del'>-						    PCI32_ATE_BAR);</div><div class='add'>+						    PCI32_ATE_BAR, dma_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return dma_handle;</div><div class='head'>diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c<br/>index ab1211ef0176..838c93c9a16a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pcibr/pcibr_provider.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/pcibr/pcibr_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/pcibr/pcibr_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/pci/pcibr/pcibr_provider.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont</div><div class='ctx'> 	 * register the bridge's error interrupt handler</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler,</div><div class='del'>-			SA_SHIRQ, "PCIBR error", (void *)(soft))) {</div><div class='add'>+			IRQF_SHARED, "PCIBR error", (void *)(soft))) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "pcibr cannot allocate interrupt for error handler\n");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c<br/>index be0176912968..c36b0f5affb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioca_provider.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/tioca_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioca_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/pci/tioca_provider.c</a></div><div class='hunk'>@@ -515,11 +515,17 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)</div><div class='ctx'>  * use the GART mapped mode.</div><div class='ctx'>  */</div><div class='ctx'> static u64</div><div class='del'>-tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count)</div><div class='add'>+tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	u64 mapaddr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Not supported for now ...</div><div class='add'>+	 */</div><div class='add'>+	if (dma_flags &amp; SN_DMA_MSI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * If card is 64 or 48 bit addresable, use a direct mapping.  32</div><div class='ctx'> 	 * bit direct is so restrictive w.r.t. where the memory resides that</div><div class='ctx'> 	 * we don't use it even though CA has some support.</div><div class='hunk'>@@ -589,7 +595,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont</div><div class='ctx'> </div><div class='ctx'> 	/* sanity check prom rev */</div><div class='ctx'> </div><div class='del'>-	if (sn_sal_rev() &lt; 0x0406) {</div><div class='add'>+	if (is_shub1() &amp;&amp; sn_sal_rev() &lt; 0x0406) {</div><div class='ctx'> 		printk</div><div class='ctx'> 		    (KERN_ERR "%s:  SGI prom rev 4.06 or greater required "</div><div class='ctx'> 		     "for tioca support\n", __FUNCTION__);</div><div class='hunk'>@@ -640,7 +646,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(SGI_TIOCA_ERROR,</div><div class='ctx'> 			tioca_error_intr_handler,</div><div class='del'>-			SA_SHIRQ, "TIOCA error", (void *)tioca_common))</div><div class='add'>+			IRQF_SHARED, "TIOCA error", (void *)tioca_common))</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "%s:  Unable to get irq %d.  "</div><div class='ctx'> 		       "Error interrupts won't be routed for TIOCA bus %d\n",</div><div class='head'>diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c<br/>index 833295624e5d..17cd34284886 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioce_provider.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ia64/sn/pci/tioce_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ia64/sn/pci/tioce_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ia64/sn/pci/tioce_provider.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ * Copyright (C) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -170,7 +170,8 @@ tioce_mmr_war_post(struct tioce_kernel *kern, void *mmr_addr)</div><div class='ctx'> 	(ATE_PAGE((start)+(len)-1, pagesize) - ATE_PAGE(start, pagesize) + 1)</div><div class='ctx'> </div><div class='ctx'> #define ATE_VALID(ate)	((ate) &amp; (1UL &lt;&lt; 63))</div><div class='del'>-#define ATE_MAKE(addr, ps) (((addr) &amp; ~ATE_PAGEMASK(ps)) | (1UL &lt;&lt; 63))</div><div class='add'>+#define ATE_MAKE(addr, ps, msi) \</div><div class='add'>+	(((addr) &amp; ~ATE_PAGEMASK(ps)) | (1UL &lt;&lt; 63) | ((msi)?(1UL &lt;&lt; 62):0))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Flavors of ate-based mapping supported by tioce_alloc_map()</div><div class='hunk'>@@ -196,15 +197,17 @@ tioce_mmr_war_post(struct tioce_kernel *kern, void *mmr_addr)</div><div class='ctx'>  *</div><div class='ctx'>  * 63    - must be 1 to indicate d64 mode to CE hardware</div><div class='ctx'>  * 62    - barrier bit ... controlled with tioce_dma_barrier()</div><div class='del'>- * 61    - 0 since this is not an MSI transaction</div><div class='add'>+ * 61    - msi bit ... specified through dma_flags</div><div class='ctx'>  * 60:54 - reserved, MBZ</div><div class='ctx'>  */</div><div class='ctx'> static u64</div><div class='del'>-tioce_dma_d64(unsigned long ct_addr)</div><div class='add'>+tioce_dma_d64(unsigned long ct_addr, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	u64 bus_addr;</div><div class='ctx'> </div><div class='ctx'> 	bus_addr = ct_addr | (1UL &lt;&lt; 63);</div><div class='add'>+	if (dma_flags &amp; SN_DMA_MSI)</div><div class='add'>+		bus_addr |= (1UL &lt;&lt; 61);</div><div class='ctx'> </div><div class='ctx'> 	return bus_addr;</div><div class='ctx'> }</div><div class='hunk'>@@ -261,7 +264,7 @@ pcidev_to_tioce(struct pci_dev *pdev, struct tioce **base,</div><div class='ctx'>  */</div><div class='ctx'> static u64</div><div class='ctx'> tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='del'>-		u64 ct_addr, int len)</div><div class='add'>+		u64 ct_addr, int len, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j;</div><div class='hunk'>@@ -270,6 +273,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='ctx'> 	int entries;</div><div class='ctx'> 	int nates;</div><div class='ctx'> 	u64 pagesize;</div><div class='add'>+	int msi_capable, msi_wanted;</div><div class='ctx'> 	u64 *ate_shadow;</div><div class='ctx'> 	u64 *ate_reg;</div><div class='ctx'> 	u64 addr;</div><div class='hunk'>@@ -291,6 +295,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='ctx'> 		ate_reg = ce_mmr-&gt;ce_ure_ate3240;</div><div class='ctx'> 		pagesize = ce_kern-&gt;ce_ate3240_pagesize;</div><div class='ctx'> 		bus_base = TIOCE_M32_MIN;</div><div class='add'>+		msi_capable = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TIOCE_ATE_M40:</div><div class='ctx'> 		first = 0;</div><div class='hunk'>@@ -299,6 +304,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='ctx'> 		ate_reg = ce_mmr-&gt;ce_ure_ate40;</div><div class='ctx'> 		pagesize = MB(64);</div><div class='ctx'> 		bus_base = TIOCE_M40_MIN;</div><div class='add'>+		msi_capable = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TIOCE_ATE_M40S:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -311,11 +317,16 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='ctx'> 		ate_reg = ce_mmr-&gt;ce_ure_ate3240;</div><div class='ctx'> 		pagesize = GB(16);</div><div class='ctx'> 		bus_base = TIOCE_M40S_MIN;</div><div class='add'>+		msi_capable = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	msi_wanted = dma_flags &amp; SN_DMA_MSI;</div><div class='add'>+	if (msi_wanted &amp;&amp; !msi_capable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	nates = ATE_NPAGES(ct_addr, len, pagesize);</div><div class='ctx'> 	if (nates &gt; entries)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -344,7 +355,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='ctx'> 	for (j = 0; j &lt; nates; j++) {</div><div class='ctx'> 		u64 ate;</div><div class='ctx'> </div><div class='del'>-		ate = ATE_MAKE(addr, pagesize);</div><div class='add'>+		ate = ATE_MAKE(addr, pagesize, msi_wanted);</div><div class='ctx'> 		ate_shadow[i + j] = ate;</div><div class='ctx'> 		tioce_mmr_storei(ce_kern, &amp;ate_reg[i + j], ate);</div><div class='ctx'> 		addr += pagesize;</div><div class='hunk'>@@ -371,7 +382,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,</div><div class='ctx'>  * Map @paddr into 32-bit bus space of the CE associated with @pcidev_info.</div><div class='ctx'>  */</div><div class='ctx'> static u64</div><div class='del'>-tioce_dma_d32(struct pci_dev *pdev, u64 ct_addr)</div><div class='add'>+tioce_dma_d32(struct pci_dev *pdev, u64 ct_addr, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	int dma_ok;</div><div class='ctx'> 	int port;</div><div class='hunk'>@@ -381,6 +392,9 @@ tioce_dma_d32(struct pci_dev *pdev, u64 ct_addr)</div><div class='ctx'> 	u64 ct_lower;</div><div class='ctx'> 	dma_addr_t bus_addr;</div><div class='ctx'> </div><div class='add'>+	if (dma_flags &amp; SN_DMA_MSI)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	ct_upper = ct_addr &amp; ~0x3fffffffUL;</div><div class='ctx'> 	ct_lower = ct_addr &amp; 0x3fffffffUL;</div><div class='ctx'> </div><div class='hunk'>@@ -507,7 +521,7 @@ tioce_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)</div><div class='ctx'>  */</div><div class='ctx'> static u64</div><div class='ctx'> tioce_do_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count,</div><div class='del'>-		 int barrier)</div><div class='add'>+		 int barrier, int dma_flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u64 ct_addr;</div><div class='hunk'>@@ -523,15 +537,18 @@ tioce_do_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count,</div><div class='ctx'> 	if (dma_mask &lt; 0x7fffffffUL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	ct_addr = PHYS_TO_TIODMA(paddr);</div><div class='add'>+	if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)</div><div class='add'>+		ct_addr = PHYS_TO_TIODMA(paddr);</div><div class='add'>+	else</div><div class='add'>+		ct_addr = paddr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the device can generate 64 bit addresses, create a D64 map.</div><div class='del'>-	 * Since this should never fail, bypass the rest of the checks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (dma_mask == ~0UL) {</div><div class='del'>-		mapaddr = tioce_dma_d64(ct_addr);</div><div class='del'>-		goto dma_map_done;</div><div class='add'>+		mapaddr = tioce_dma_d64(ct_addr, dma_flags);</div><div class='add'>+		if (mapaddr)</div><div class='add'>+			goto dma_map_done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pcidev_to_tioce(pdev, NULL, &amp;ce_kern, &amp;port);</div><div class='hunk'>@@ -574,18 +591,22 @@ tioce_do_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count,</div><div class='ctx'> </div><div class='ctx'> 		if (byte_count &gt; MB(64)) {</div><div class='ctx'> 			mapaddr = tioce_alloc_map(ce_kern, TIOCE_ATE_M40S,</div><div class='del'>-						  port, ct_addr, byte_count);</div><div class='add'>+						  port, ct_addr, byte_count,</div><div class='add'>+						  dma_flags);</div><div class='ctx'> 			if (!mapaddr)</div><div class='ctx'> 				mapaddr =</div><div class='ctx'> 				    tioce_alloc_map(ce_kern, TIOCE_ATE_M40, -1,</div><div class='del'>-						    ct_addr, byte_count);</div><div class='add'>+						    ct_addr, byte_count,</div><div class='add'>+						    dma_flags);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mapaddr = tioce_alloc_map(ce_kern, TIOCE_ATE_M40, -1,</div><div class='del'>-						  ct_addr, byte_count);</div><div class='add'>+						  ct_addr, byte_count,</div><div class='add'>+						  dma_flags);</div><div class='ctx'> 			if (!mapaddr)</div><div class='ctx'> 				mapaddr =</div><div class='ctx'> 				    tioce_alloc_map(ce_kern, TIOCE_ATE_M40S,</div><div class='del'>-						    port, ct_addr, byte_count);</div><div class='add'>+						    port, ct_addr, byte_count,</div><div class='add'>+						    dma_flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -593,7 +614,7 @@ tioce_do_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count,</div><div class='ctx'> 	 * 32-bit direct is the next mode to try</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!mapaddr &amp;&amp; dma_mask &gt;= 0xffffffffUL)</div><div class='del'>-		mapaddr = tioce_dma_d32(pdev, ct_addr);</div><div class='add'>+		mapaddr = tioce_dma_d32(pdev, ct_addr, dma_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Last resort, try 32-bit ATE-based map.</div><div class='hunk'>@@ -601,7 +622,7 @@ tioce_do_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count,</div><div class='ctx'> 	if (!mapaddr)</div><div class='ctx'> 		mapaddr =</div><div class='ctx'> 		    tioce_alloc_map(ce_kern, TIOCE_ATE_M32, -1, ct_addr,</div><div class='del'>-				    byte_count);</div><div class='add'>+				    byte_count, dma_flags);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ce_kern-&gt;ce_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -622,9 +643,9 @@ dma_map_done:</div><div class='ctx'>  * in the address.</div><div class='ctx'>  */</div><div class='ctx'> static u64</div><div class='del'>-tioce_dma(struct pci_dev *pdev, u64 paddr, size_t byte_count)</div><div class='add'>+tioce_dma(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)</div><div class='ctx'> {</div><div class='del'>-	return tioce_do_dma_map(pdev, paddr, byte_count, 0);</div><div class='add'>+	return tioce_do_dma_map(pdev, paddr, byte_count, 0, dma_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -636,9 +657,9 @@ tioce_dma(struct pci_dev *pdev, u64 paddr, size_t byte_count)</div><div class='ctx'>  * Simply call tioce_do_dma_map() to create a map with the barrier bit set</div><div class='ctx'>  * in the address.</div><div class='ctx'>  */ static u64</div><div class='del'>-tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count)</div><div class='add'>+tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)</div><div class='ctx'> {</div><div class='del'>-	return tioce_do_dma_map(pdev, paddr, byte_count, 1);</div><div class='add'>+	return tioce_do_dma_map(pdev, paddr, byte_count, 1, dma_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -696,7 +717,7 @@ tioce_reserve_m32(struct tioce_kernel *ce_kern, u64 base, u64 limit)</div><div class='ctx'> 	while (ate_index &lt;= last_ate) {</div><div class='ctx'> 		u64 ate;</div><div class='ctx'> </div><div class='del'>-		ate = ATE_MAKE(0xdeadbeef, ps);</div><div class='add'>+		ate = ATE_MAKE(0xdeadbeef, ps, 0);</div><div class='ctx'> 		ce_kern-&gt;ce_ate3240_shadow[ate_index] = ate;</div><div class='ctx'> 		tioce_mmr_storei(ce_kern, &amp;ce_mmr-&gt;ce_ure_ate3240[ate_index],</div><div class='ctx'> 				 ate);</div><div class='hunk'>@@ -1002,11 +1023,11 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont</div><div class='ctx'> 	tioce_mmr_seti(tioce_kern, &amp;tioce_mmr-&gt;ce_adm_int_status_alias, ~0ULL);</div><div class='ctx'> 	tioce_mmr_seti(tioce_kern, &amp;tioce_mmr-&gt;ce_adm_error_summary_alias,</div><div class='ctx'> 		       ~0ULL);</div><div class='del'>-	tioce_mmr_seti(tioce_kern, &amp;tioce_mmr-&gt;ce_dre_comp_err_addr, ~0ULL);</div><div class='add'>+	tioce_mmr_seti(tioce_kern, &amp;tioce_mmr-&gt;ce_dre_comp_err_addr, 0ULL);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(SGI_PCIASIC_ERROR,</div><div class='ctx'> 			tioce_error_intr_handler,</div><div class='del'>-			SA_SHIRQ, "TIOCE error", (void *)tioce_common))</div><div class='add'>+			IRQF_SHARED, "TIOCE error", (void *)tioce_common))</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "%s:  Unable to get irq %d.  "</div><div class='ctx'> 		       "Error interrupts won't be routed for "</div><div class='head'>diff --git a/arch/m32r/boot/compressed/head.S b/arch/m32r/boot/compressed/head.S<br/>index 234d8b1e0ac1..95a0563ff076 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/boot/compressed/head.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c<br/>index 8f9a57271f83..bce8af5e3bb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/m32r_sio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/m32r_sio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/m32r_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/boot/compressed/m32r_sio.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void putc(char c);</div><div class='head'>diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c<br/>index 70fa799005c3..600d40e33495 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/boot/compressed/misc.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * 		This is based on arch/sh/boot/compressed/misc.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/m32r/boot/compressed/vmlinux.lds.S b/arch/m32r/boot/compressed/vmlinux.lds.S<br/>index a18431759633..dd11963f6939 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/compressed/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/boot/compressed/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/boot/compressed/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> OUTPUT_ARCH(m32r)</div><div class='ctx'> ENTRY(startup)</div><div class='head'>diff --git a/arch/m32r/boot/setup.S b/arch/m32r/boot/setup.S<br/>index 398542507d84..ef843d63083d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/boot/setup.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/boot/setup.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/boot/setup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/boot/setup.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/align.c b/arch/m32r/kernel/align.c<br/>index 48ec29714238..ab871ccd33f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/align.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/align.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/align.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/align.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (c) 2003 Hitoshi Yamamoto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S<br/>index 920bb742b7a2..ac6d840b382b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/entry.S</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'>  *       @(0x6c,sp) - orig_r0		ditto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S<br/>index 3e83173995cd..0d3c8ee0e03d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/head.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@ __INIT</div><div class='ctx'> __INITDATA</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_m32104ut.c b/arch/m32r/kernel/io_m32104ut.c<br/>index d26adab9586c..2189eca30b56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_m32104ut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_m32104ut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_m32104ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_m32104ut.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *                           Naoto Sugai, Hayato Fujiwara</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/kernel/io_m32700ut.c<br/>index 939932d6cc00..5898f4031a0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_m32700ut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_m32700ut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_m32700ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_m32700ut.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  archive for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/kernel/io_mappi.c<br/>index a662b537c5ba..31396789ab1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_mappi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_mappi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_mappi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_mappi.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/kernel/io_mappi2.c<br/>index e72d725606af..ecc6aa88f9ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_mappi2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_mappi2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_mappi2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_mappi2.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto, Mamoru Sakugawa</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/kernel/io_mappi3.c<br/>index ed6da930bc64..a13b5f6b07e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_mappi3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_mappi3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_mappi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_mappi3.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto, Mamoru Sakugawa</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/kernel/io_oaks32r.c<br/>index 910dd131c227..068bf47060f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_oaks32r.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_oaks32r.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_oaks32r.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_oaks32r.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto, Mamoru Sakugawa</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/kernel/io_opsput.c<br/>index bec69297db3c..da6c5f5c1f82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_opsput.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_opsput.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_opsput.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_opsput.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  archive for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/kernel/io_usrv.c<br/>index 39a379af40bc..a8c0e2eceb4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_usrv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/io_usrv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/io_usrv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/io_usrv.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/m32r.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c<br/>index a4634b06f675..3841861df6a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/irq.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='head'>diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c<br/>index c50330fa83b9..8cbbb0b11e0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/m32r_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/m32r_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/m32r_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/m32r_ksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/module.c b/arch/m32r/kernel/module.c<br/>index f6a79a016ce0..8d4205794380 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/module.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/moduleloader.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c<br/>index 065f5e719058..44cbe0ce0f8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/process.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c<br/>index 340a3bf59b88..5f02b3144875 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/ptrace.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *   Copyright (C) 2000 Russell King</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/semaphore.c b/arch/m32r/kernel/semaphore.c<br/>index 9a6e6d754ddc..940c2d37cfd1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/semaphore.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * rw semaphores implemented November 1999 by Benjamin LaHaise &lt;bcrl@kvack.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c<br/>index 3cd3c2988a48..3f35ab3d2dc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                            Hitoshi Yamamoto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='hunk'>@@ -22,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/pfn.h&gt;</div><div class='hunk'>@@ -275,7 +274,7 @@ static int __init topology_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_present_cpu(i)</div><div class='del'>-		register_cpu(&amp;cpu_devices[i], i, NULL);</div><div class='add'>+		register_cpu(&amp;cpu_devices[i], i);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/kernel/setup_m32104ut.c<br/>index 6328e1357a80..1692b321f476 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_m32104ut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_m32104ut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_m32104ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_m32104ut.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *                           Naoto Sugai, Hayato Fujiwara</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -87,7 +86,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SMC91X)</div><div class='ctx'> 	/* INT#0: LAN controller on M32104UT-LAN (SMC91C111)*/</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT0].handler = &amp;m32104ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT0].chip = &amp;m32104ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD11; /* "H" level sense */</div><div class='hunk'>@@ -96,7 +95,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;m32104ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;m32104ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -105,7 +104,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_SIO</div><div class='ctx'> 	/* SIO0_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;m32104ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;m32104ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -113,7 +112,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;m32104ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;m32104ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = M32R_ICUCR_IEN;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c<br/>index fad1fc99bb27..7efc145c74c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_m32700ut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_m32700ut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_m32700ut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_m32700ut.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  archive for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -301,7 +300,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SMC91X)</div><div class='ctx'> 	/* INT#0: LAN controller on M32700UT-LAN (SMC91C111)*/</div><div class='ctx'> 	irq_desc[M32700UT_LAN_IRQ_LAN].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32700UT_LAN_IRQ_LAN].handler = &amp;m32700ut_lanpld_irq_type;</div><div class='add'>+	irq_desc[M32700UT_LAN_IRQ_LAN].chip = &amp;m32700ut_lanpld_irq_type;</div><div class='ctx'> 	irq_desc[M32700UT_LAN_IRQ_LAN].action = 0;</div><div class='ctx'> 	irq_desc[M32700UT_LAN_IRQ_LAN].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	lanpld_icu_data[irq2lanpldirq(M32700UT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;	/* "H" edge sense */</div><div class='hunk'>@@ -310,7 +309,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -318,7 +317,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0 : receive */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -326,7 +325,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0 : send */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='hunk'>@@ -334,7 +333,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1 : receive */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -342,7 +341,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1 : send */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='hunk'>@@ -350,7 +349,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* DMA1 : */</div><div class='ctx'> 	irq_desc[M32R_IRQ_DMA1].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_DMA1].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_DMA1].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_DMA1].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_DMA1].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_DMA1].icucr = 0;</div><div class='hunk'>@@ -359,7 +358,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_PLDSIO</div><div class='ctx'> 	/* INT#1: SIO0 Receive on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_RCV].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_SIO0_RCV].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_SIO0_RCV].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_RCV].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_RCV].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;</div><div class='hunk'>@@ -367,7 +366,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: SIO0 Send on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_SND].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_SIO0_SND].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_SIO0_SND].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_SND].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_SND].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;</div><div class='hunk'>@@ -376,7 +375,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: CFC IREQ on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFIREQ].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFIREQ].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;	/* 'L' level sense */</div><div class='hunk'>@@ -384,7 +383,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: CFC Insert on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_INSERT].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_INSERT].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00;	/* 'L' edge sense */</div><div class='hunk'>@@ -392,7 +391,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: CFC Eject on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_EJECT].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_EJECT].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_CFC_EJECT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;	/* 'H' edge sense */</div><div class='hunk'>@@ -416,7 +415,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	outw(USBCR_OTGS, USBCR); 	/* USBCR: non-OTG */</div><div class='ctx'> </div><div class='ctx'>     irq_desc[M32700UT_LCD_IRQ_USB_INT1].status = IRQ_DISABLED;</div><div class='del'>-    irq_desc[M32700UT_LCD_IRQ_USB_INT1].handler = &amp;m32700ut_lcdpld_irq_type;</div><div class='add'>+    irq_desc[M32700UT_LCD_IRQ_USB_INT1].chip = &amp;m32700ut_lcdpld_irq_type;</div><div class='ctx'>     irq_desc[M32700UT_LCD_IRQ_USB_INT1].action = 0;</div><div class='ctx'>     irq_desc[M32700UT_LCD_IRQ_USB_INT1].depth = 1;</div><div class='ctx'>     lcdpld_icu_data[irq2lcdpldirq(M32700UT_LCD_IRQ_USB_INT1)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;	/* "L" level sense */</div><div class='hunk'>@@ -434,7 +433,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	 * INT3# is used for AR</div><div class='ctx'> 	 */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT3].handler = &amp;m32700ut_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT3].chip = &amp;m32700ut_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/kernel/setup_mappi.c<br/>index 00f253209cb3..67dbbdc9d111 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_mappi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_mappi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_mappi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_mappi.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -86,7 +85,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_NE2000</div><div class='ctx'> 	/* INT0 : LAN controller (RTL8019AS) */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT0].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT0].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='hunk'>@@ -95,7 +94,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -104,7 +103,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_SIO</div><div class='ctx'> 	/* SIO0_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -112,7 +111,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='hunk'>@@ -120,7 +119,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -128,7 +127,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='hunk'>@@ -138,7 +137,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_M32R_PCC)</div><div class='ctx'> 	/* INT1 : pccard0 interrupt */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT1].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT1].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;</div><div class='hunk'>@@ -146,7 +145,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT2 : pccard1 interrupt */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT2].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT2].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/kernel/setup_mappi2.c<br/>index eebc9d8b4e72..55abb2102750 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_mappi2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_mappi2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_mappi2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_mappi2.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto, Mamoru Sakugawa</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -87,7 +86,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SMC91X)</div><div class='ctx'> 	/* INT0 : LAN controller (SMC91111) */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT0].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT0].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='hunk'>@@ -96,7 +95,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -105,7 +104,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_SIO</div><div class='ctx'> 	/* SIO0_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -113,14 +112,14 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='ctx'> 	disable_mappi2_irq(M32R_IRQ_SIO0_S);</div><div class='ctx'> 	/* SIO1_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -128,7 +127,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='hunk'>@@ -138,7 +137,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_USB)</div><div class='ctx'> 	/* INT1 : USB Host controller interrupt */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT1].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT1].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01;</div><div class='hunk'>@@ -147,7 +146,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* ICUCR40: CFC IREQ */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFIREQ].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFIREQ].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;</div><div class='hunk'>@@ -156,7 +155,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_M32R_CFC)</div><div class='ctx'> 	/* ICUCR41: CFC Insert */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_INSERT].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_INSERT].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00;</div><div class='hunk'>@@ -164,7 +163,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* ICUCR42: CFC Eject */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_EJECT].handler = &amp;mappi2_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_EJECT].chip = &amp;mappi2_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c<br/>index d2ff021e2d3d..93dc010c7fc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_mappi3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_mappi3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_mappi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_mappi3.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto, Mamoru Sakugawa</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -87,7 +86,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SMC91X)</div><div class='ctx'> 	/* INT0 : LAN controller (SMC91111) */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT0].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT0].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT0].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='hunk'>@@ -96,7 +95,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -105,7 +104,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_SIO</div><div class='ctx'> 	/* SIO0_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -113,14 +112,14 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='ctx'> 	disable_mappi3_irq(M32R_IRQ_SIO0_S);</div><div class='ctx'> 	/* SIO1_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -128,7 +127,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='hunk'>@@ -138,7 +137,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_USB)</div><div class='ctx'> 	/* INT1 : USB Host controller interrupt */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT1].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT1].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT1].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01;</div><div class='hunk'>@@ -147,7 +146,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* CFC IREQ */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFIREQ].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFIREQ].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01;</div><div class='hunk'>@@ -156,7 +155,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_M32R_CFC)</div><div class='ctx'> 	/* ICUCR41: CFC Insert &amp; eject */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_INSERT].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_INSERT].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00;</div><div class='hunk'>@@ -166,7 +165,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* IDE IREQ */</div><div class='ctx'> 	irq_desc[PLD_IRQ_IDEIREQ].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_IDEIREQ].handler = &amp;mappi3_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_IDEIREQ].chip = &amp;mappi3_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_IDEIREQ].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_IDEIREQ].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	icu_data[PLD_IRQ_IDEIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/kernel/setup_oaks32r.c<br/>index 0e9e63538c0f..cd62598e3cea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_oaks32r.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_oaks32r.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_oaks32r.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_oaks32r.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                           Hitoshi Yamamoto, Mamoru Sakugawa</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -85,7 +84,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_NE2000</div><div class='ctx'> 	/* INT3 : LAN controller (RTL8019AS) */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT3].handler = &amp;oaks32r_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT3].chip = &amp;oaks32r_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='hunk'>@@ -94,7 +93,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;oaks32r_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;oaks32r_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -103,7 +102,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_SIO</div><div class='ctx'> 	/* SIO0_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;oaks32r_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;oaks32r_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -111,7 +110,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;oaks32r_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;oaks32r_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='hunk'>@@ -119,7 +118,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;oaks32r_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;oaks32r_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -127,7 +126,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;oaks32r_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;oaks32r_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c<br/>index 548e8fc7949b..61d3b01cbe07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_opsput.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_opsput.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_opsput.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_opsput.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *  archive for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -302,7 +301,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SMC91X)</div><div class='ctx'> 	/* INT#0: LAN controller on OPSPUT-LAN (SMC91C111)*/</div><div class='ctx'> 	irq_desc[OPSPUT_LAN_IRQ_LAN].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[OPSPUT_LAN_IRQ_LAN].handler = &amp;opsput_lanpld_irq_type;</div><div class='add'>+	irq_desc[OPSPUT_LAN_IRQ_LAN].chip = &amp;opsput_lanpld_irq_type;</div><div class='ctx'> 	irq_desc[OPSPUT_LAN_IRQ_LAN].action = 0;</div><div class='ctx'> 	irq_desc[OPSPUT_LAN_IRQ_LAN].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	lanpld_icu_data[irq2lanpldirq(OPSPUT_LAN_IRQ_LAN)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;	/* "H" edge sense */</div><div class='hunk'>@@ -311,7 +310,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -319,7 +318,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0 : receive */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -327,7 +326,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0 : send */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='hunk'>@@ -335,7 +334,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1 : receive */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -343,7 +342,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1 : send */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='hunk'>@@ -351,7 +350,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* DMA1 : */</div><div class='ctx'> 	irq_desc[M32R_IRQ_DMA1].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_DMA1].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_DMA1].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_DMA1].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_DMA1].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_DMA1].icucr = 0;</div><div class='hunk'>@@ -360,7 +359,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_PLDSIO</div><div class='ctx'> 	/* INT#1: SIO0 Receive on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_RCV].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_SIO0_RCV].handler = &amp;opsput_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_SIO0_RCV].chip = &amp;opsput_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_RCV].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_RCV].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_RCV)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;</div><div class='hunk'>@@ -368,7 +367,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: SIO0 Send on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_SND].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_SIO0_SND].handler = &amp;opsput_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_SIO0_SND].chip = &amp;opsput_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_SND].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SIO0_SND].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_SIO0_SND)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD03;</div><div class='hunk'>@@ -378,7 +377,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_M32R_CFC)</div><div class='ctx'> 	/* INT#1: CFC IREQ on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFIREQ].handler = &amp;opsput_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFIREQ].chip = &amp;opsput_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFIREQ].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_CFIREQ)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;	/* 'L' level sense */</div><div class='hunk'>@@ -386,7 +385,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: CFC Insert on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_INSERT].handler = &amp;opsput_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_INSERT].chip = &amp;opsput_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_INSERT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_CFC_INSERT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD00;	/* 'L' edge sense */</div><div class='hunk'>@@ -394,7 +393,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#1: CFC Eject on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_CFC_EJECT].handler = &amp;opsput_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_CFC_EJECT].chip = &amp;opsput_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_CFC_EJECT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_CFC_EJECT)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD02;	/* 'H' edge sense */</div><div class='hunk'>@@ -420,7 +419,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	outw(USBCR_OTGS, USBCR); 	/* USBCR: non-OTG */</div><div class='ctx'> </div><div class='ctx'>     irq_desc[OPSPUT_LCD_IRQ_USB_INT1].status = IRQ_DISABLED;</div><div class='del'>-    irq_desc[OPSPUT_LCD_IRQ_USB_INT1].handler = &amp;opsput_lcdpld_irq_type;</div><div class='add'>+    irq_desc[OPSPUT_LCD_IRQ_USB_INT1].chip = &amp;opsput_lcdpld_irq_type;</div><div class='ctx'>     irq_desc[OPSPUT_LCD_IRQ_USB_INT1].action = 0;</div><div class='ctx'>     irq_desc[OPSPUT_LCD_IRQ_USB_INT1].depth = 1;</div><div class='ctx'>     lcdpld_icu_data[irq2lcdpldirq(OPSPUT_LCD_IRQ_USB_INT1)].icucr = PLD_ICUCR_IEN|PLD_ICUCR_ISMOD01;	/* "L" level sense */</div><div class='hunk'>@@ -438,7 +437,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	 * INT3# is used for AR</div><div class='ctx'> 	 */</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_INT3].handler = &amp;opsput_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_INT3].chip = &amp;opsput_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_INT3].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_INT3].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;</div><div class='head'>diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/kernel/setup_usrv.c<br/>index 64be659a23e7..f5b4b5ac31e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_usrv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/setup_usrv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/setup_usrv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/setup_usrv.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *                                  Hitoshi Yamamoto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -158,7 +157,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* MFT2 : system timer */</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_MFT2].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_MFT2].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_MFT2].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;</div><div class='hunk'>@@ -167,7 +166,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SERIAL_M32R_SIO)</div><div class='ctx'> 	/* SIO0_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_R].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_R].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_R].icucr = 0;</div><div class='hunk'>@@ -175,7 +174,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO0_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO0_S].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO0_S].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO0_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO0_S].icucr = 0;</div><div class='hunk'>@@ -183,7 +182,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_R : uart receive data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_R].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_R].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_R].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_R].icucr = 0;</div><div class='hunk'>@@ -191,7 +190,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* SIO1_S : uart send data */</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[M32R_IRQ_SIO1_S].handler = &amp;mappi_irq_type;</div><div class='add'>+	irq_desc[M32R_IRQ_SIO1_S].chip = &amp;mappi_irq_type;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].action = 0;</div><div class='ctx'> 	irq_desc[M32R_IRQ_SIO1_S].depth = 1;</div><div class='ctx'> 	icu_data[M32R_IRQ_SIO1_S].icucr = 0;</div><div class='hunk'>@@ -201,7 +200,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	/* INT#67-#71: CFC#0 IREQ on PLD */</div><div class='ctx'> 	for (i = 0 ; i &lt; CONFIG_CFC_NUM ; i++ ) {</div><div class='ctx'> 		irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED;</div><div class='del'>-		irq_desc[PLD_IRQ_CF0 + i].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+		irq_desc[PLD_IRQ_CF0 + i].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 		irq_desc[PLD_IRQ_CF0 + i].action = 0;</div><div class='ctx'> 		irq_desc[PLD_IRQ_CF0 + i].depth = 1;	/* disable nested irq */</div><div class='ctx'> 		pld_icu_data[irq2pldirq(PLD_IRQ_CF0 + i)].icucr</div><div class='hunk'>@@ -212,7 +211,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE)</div><div class='ctx'> 	/* INT#76: 16552D#0 IREQ on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_UART0].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_UART0].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_UART0].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_UART0].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_UART0].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_UART0)].icucr</div><div class='hunk'>@@ -221,7 +220,7 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> 	/* INT#77: 16552D#1 IREQ on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_UART1].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_UART1].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_UART1].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_UART1].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_UART1].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_UART1)].icucr</div><div class='hunk'>@@ -232,7 +231,7 @@ void __init init_IRQ(void)</div><div class='ctx'> #if defined(CONFIG_IDC_AK4524) || defined(CONFIG_IDC_AK4524_MODULE)</div><div class='ctx'> 	/* INT#80: AK4524 IREQ on PLD */</div><div class='ctx'> 	irq_desc[PLD_IRQ_SNDINT].status = IRQ_DISABLED;</div><div class='del'>-	irq_desc[PLD_IRQ_SNDINT].handler = &amp;m32700ut_pld_irq_type;</div><div class='add'>+	irq_desc[PLD_IRQ_SNDINT].chip = &amp;m32700ut_pld_irq_type;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SNDINT].action = 0;</div><div class='ctx'> 	irq_desc[PLD_IRQ_SNDINT].depth = 1;	/* disable nested irq */</div><div class='ctx'> 	pld_icu_data[irq2pldirq(PLD_IRQ_SNDINT)].icucr</div><div class='head'>diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c<br/>index 6498ee70bb73..a9174efe80cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/signal.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  2000-06-20  Pentium III FXSR, SSE support by Gareth Hughes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c<br/>index 840b4348bf0c..fa7865609495 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/smpboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/smpboot.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c<br/>index 670cb49210af..a9cea32eb824 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/sys_m32r.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/sys_m32r.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/sys_m32r.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/sys_m32r.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Taken from i386 version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c<br/>index b8e68b542302..ded0be07a476 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/time.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef  DEBUG_TIMER</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -238,7 +237,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE,</div><div class='add'>+struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE,</div><div class='ctx'> 			  "MFT2", NULL, NULL };</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void)</div><div class='head'>diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c<br/>index 5fe8ed6d62dc..c1daf2c40c7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/traps.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 'traps.c' handles hardware traps and faults after we have saved some</div><div class='ctx'>  * state in 'entry.S'.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='head'>diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S<br/>index 729a2645a03f..13c7bb698e37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /* ld script to make M32R Linux kernel</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/m32r/lib/ashxdi3.S b/arch/m32r/lib/ashxdi3.S<br/>index 78effca9d97a..107594b65d58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/ashxdi3.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/ashxdi3.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/ashxdi3.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/ashxdi3.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  */</div><div class='ctx'> /* $Id$ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> ;</div><div class='ctx'> ;      input   (r0,r1)  src</div><div class='head'>diff --git a/arch/m32r/lib/checksum.S b/arch/m32r/lib/checksum.S<br/>index f6fc1bdb87e4..cfbe00e5184a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/checksum.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/checksum.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/checksum.S</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> /* $Id$ */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/m32r/lib/delay.c b/arch/m32r/lib/delay.c<br/>index fb29632c7eaa..06382a38c318 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/delay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/delay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/delay.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> /* $Id$ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/m32r/lib/memcpy.S b/arch/m32r/lib/memcpy.S<br/>index 800898a2d2e3..2089a215314e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/memcpy.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/memcpy.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/memcpy.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/memcpy.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/lib/memset.S b/arch/m32r/lib/memset.S<br/>index 6e26df120acb..b47fa3537aa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/memset.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/memset.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/memset.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/memset.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> /* $Id$ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.global	memset</div><div class='head'>diff --git a/arch/m32r/lib/strlen.S b/arch/m32r/lib/strlen.S<br/>index 8d23cfbd600c..5f41aacd7b3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/strlen.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/strlen.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/strlen.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/strlen.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> /* $Id$ */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/assembler.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c<br/>index 2d1dd2106c4d..896cef1aca5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/lib/usercopy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/lib/usercopy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/lib/usercopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/lib/usercopy.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright 1997 Linus Torvalds</div><div class='ctx'>  * Copyright 2001, 2002, 2004 Hirokazu Takata</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/thread_info.h&gt;</div><div class='head'>diff --git a/arch/m32r/mm/cache.c b/arch/m32r/mm/cache.c<br/>index 9f54dd937013..fac759584875 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/mm/cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/mm/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/mm/cache.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *  Copyright (C) 2002-2005  Hirokazu Takata, Hayato Fujiwara</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef MCCR</div><div class='head'>diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c<br/>index cf610a7c5ff0..abb34ccd5986 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/mm/discontig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/discontig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/mm/discontig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/mm/discontig.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  Copyright (c) 2003  Hitoshi Yamamoto</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='head'>diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c<br/>index d9d488d782e8..03fc4c858e0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/mm/fault-nommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/fault-nommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/mm/fault-nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/mm/fault-nommu.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> /* $Id: fault-nommu.c,v 1.1 2004/03/30 06:40:59 sakugawa Exp $ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c<br/>index bf7fb58ef02c..dc18a33eefef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m32r/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m32r/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m32r/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m32r/mm/fault.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *    Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -148,7 +147,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,</div><div class='ctx'> 	/* When running in the kernel we expect faults to occur only to</div><div class='ctx'> 	 * addresses in user space.  All other faults represent errors in the</div><div class='ctx'> 	 * kernel and should generate an OOPS.  Unfortunatly, in the case of an</div><div class='del'>-	 * erroneous fault occuring in a code path which already holds mmap_sem</div><div class='add'>+	 * erroneous fault occurring in a code path which already holds mmap_sem</div><div class='ctx'> 	 * we will deadlock attempting to validate the fault against the</div><div class='ctx'> 	 * address space.  Luckily the kernel only validly references user</div><div class='ctx'> 	 * space from well defined areas of code, which are listed in the</div><div class='head'>diff --git a/arch/m68k/amiga/amiga_ksyms.c b/arch/m68k/amiga/amiga_ksyms.c<br/>index b7bd84c73ea7..7fdcf6bf3ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/amiga_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/amiga_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/amiga_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/amiga/amiga_ksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -23,8 +22,6 @@ EXPORT_SYMBOL(amiga_chip_avail);</div><div class='ctx'> EXPORT_SYMBOL(amiga_chip_size);</div><div class='ctx'> EXPORT_SYMBOL(amiga_audio_period);</div><div class='ctx'> EXPORT_SYMBOL(amiga_audio_min_period);</div><div class='del'>-EXPORT_SYMBOL(amiga_do_irq);</div><div class='del'>-EXPORT_SYMBOL(amiga_do_irq_list);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AMIGA_PCMCIA</div><div class='ctx'>   EXPORT_SYMBOL(pcmcia_reset);</div><div class='head'>diff --git a/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c<br/>index b0aa61bf8700..96c79d840cff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/amiints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/amiints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/amiints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/amiga/amiints.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * 07/08/99: rewamp of the interrupt handling - we now have two types of</div><div class='ctx'>  *           interrupts, normal and fast handlers, fast handlers being</div><div class='del'>- *           marked with SA_INTERRUPT and runs with all other interrupts</div><div class='add'>+ *           marked with IRQF_DISABLED and runs with all other interrupts</div><div class='ctx'>  *           disabled. Normal interrupts disable their own source but</div><div class='ctx'>  *           run with all other interrupt sources enabled.</div><div class='ctx'>  *           PORTS and EXTER interrupts are always shared even if the</div><div class='hunk'>@@ -35,61 +35,30 @@</div><div class='ctx'>  *           /Jes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/amigahw.h&gt;</div><div class='ctx'> #include &lt;asm/amigaints.h&gt;</div><div class='ctx'> #include &lt;asm/amipcmcia.h&gt;</div><div class='ctx'> </div><div class='del'>-extern int cia_request_irq(struct ciabase *base,int irq,</div><div class='del'>-                           irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                           unsigned long flags, const char *devname, void *dev_id);</div><div class='del'>-extern void cia_free_irq(struct ciabase *base, unsigned int irq, void *dev_id);</div><div class='del'>-extern void cia_init_IRQ(struct ciabase *base);</div><div class='del'>-extern int cia_get_irq_list(struct ciabase *base, struct seq_file *p);</div><div class='del'>-</div><div class='del'>-/* irq node variables for amiga interrupt sources */</div><div class='del'>-static irq_node_t *ami_irq_list[AMI_STD_IRQS];</div><div class='del'>-</div><div class='del'>-static unsigned short amiga_intena_vals[AMI_STD_IRQS] = {</div><div class='del'>-	[IRQ_AMIGA_VERTB]	= IF_VERTB,</div><div class='del'>-	[IRQ_AMIGA_COPPER]	= IF_COPER,</div><div class='del'>-	[IRQ_AMIGA_AUD0]	= IF_AUD0,</div><div class='del'>-	[IRQ_AMIGA_AUD1]	= IF_AUD1,</div><div class='del'>-	[IRQ_AMIGA_AUD2]	= IF_AUD2,</div><div class='del'>-	[IRQ_AMIGA_AUD3]	= IF_AUD3,</div><div class='del'>-	[IRQ_AMIGA_BLIT]	= IF_BLIT,</div><div class='del'>-	[IRQ_AMIGA_DSKSYN]	= IF_DSKSYN,</div><div class='del'>-	[IRQ_AMIGA_DSKBLK]	= IF_DSKBLK,</div><div class='del'>-	[IRQ_AMIGA_RBF]		= IF_RBF,</div><div class='del'>-	[IRQ_AMIGA_TBE]		= IF_TBE,</div><div class='del'>-	[IRQ_AMIGA_SOFT]	= IF_SOFT,</div><div class='del'>-	[IRQ_AMIGA_PORTS]	= IF_PORTS,</div><div class='del'>-	[IRQ_AMIGA_EXTER]	= IF_EXTER</div><div class='del'>-};</div><div class='del'>-static const unsigned char ami_servers[AMI_STD_IRQS] = {</div><div class='del'>-	[IRQ_AMIGA_VERTB]	= 1,</div><div class='del'>-	[IRQ_AMIGA_PORTS]	= 1,</div><div class='del'>-	[IRQ_AMIGA_EXTER]	= 1</div><div class='add'>+static void amiga_enable_irq(unsigned int irq);</div><div class='add'>+static void amiga_disable_irq(unsigned int irq);</div><div class='add'>+static irqreturn_t ami_int1(int irq, void *dev_id, struct pt_regs *fp);</div><div class='add'>+static irqreturn_t ami_int3(int irq, void *dev_id, struct pt_regs *fp);</div><div class='add'>+static irqreturn_t ami_int4(int irq, void *dev_id, struct pt_regs *fp);</div><div class='add'>+static irqreturn_t ami_int5(int irq, void *dev_id, struct pt_regs *fp);</div><div class='add'>+</div><div class='add'>+static struct irq_controller amiga_irq_controller = {</div><div class='add'>+	.name		= "amiga",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.enable		= amiga_enable_irq,</div><div class='add'>+	.disable	= amiga_disable_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static short ami_ablecount[AMI_IRQS];</div><div class='del'>-</div><div class='del'>-static irqreturn_t ami_badint(int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	num_spurious += 1;</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * void amiga_init_IRQ(void)</div><div class='ctx'>  *</div><div class='hunk'>@@ -103,23 +72,12 @@ static irqreturn_t ami_badint(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> </div><div class='ctx'> void __init amiga_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	request_irq(IRQ_AUTO_1, ami_int1, 0, "int1", NULL);</div><div class='add'>+	request_irq(IRQ_AUTO_3, ami_int3, 0, "int3", NULL);</div><div class='add'>+	request_irq(IRQ_AUTO_4, ami_int4, 0, "int4", NULL);</div><div class='add'>+	request_irq(IRQ_AUTO_5, ami_int5, 0, "int5", NULL);</div><div class='ctx'> </div><div class='del'>-	/* initialize handlers */</div><div class='del'>-	for (i = 0; i &lt; AMI_STD_IRQS; i++) {</div><div class='del'>-		if (ami_servers[i]) {</div><div class='del'>-			ami_irq_list[i] = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			ami_irq_list[i] = new_irq_node();</div><div class='del'>-			ami_irq_list[i]-&gt;handler = ami_badint;</div><div class='del'>-			ami_irq_list[i]-&gt;flags   = 0;</div><div class='del'>-			ami_irq_list[i]-&gt;dev_id  = NULL;</div><div class='del'>-			ami_irq_list[i]-&gt;devname = NULL;</div><div class='del'>-			ami_irq_list[i]-&gt;next    = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; AMI_IRQS; i++)</div><div class='del'>-		ami_ablecount[i] = 0;</div><div class='add'>+	m68k_setup_irq_controller(&amp;amiga_irq_controller, IRQ_USER, AMI_STD_IRQS);</div><div class='ctx'> </div><div class='ctx'> 	/* turn off PCMCIA interrupts */</div><div class='ctx'> 	if (AMIGAHW_PRESENT(PCMCIA))</div><div class='hunk'>@@ -134,249 +92,21 @@ void __init amiga_init_IRQ(void)</div><div class='ctx'> 	cia_init_IRQ(&amp;ciab_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int amiga_insert_irq(irq_node_t **list, irq_node_t *node)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	irq_node_t *cur;</div><div class='del'>-</div><div class='del'>-	if (!node-&gt;dev_id)</div><div class='del'>-		printk("%s: Warning: dev_id of %s is zero\n",</div><div class='del'>-		       __FUNCTION__, node-&gt;devname);</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	cur = *list;</div><div class='del'>-</div><div class='del'>-	if (node-&gt;flags &amp; SA_INTERRUPT) {</div><div class='del'>-		if (node-&gt;flags &amp; SA_SHIRQ)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		/*</div><div class='del'>-		 * There should never be more than one</div><div class='del'>-		 */</div><div class='del'>-		while (cur &amp;&amp; cur-&gt;flags &amp; SA_INTERRUPT) {</div><div class='del'>-			list = &amp;cur-&gt;next;</div><div class='del'>-			cur = cur-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		while (cur) {</div><div class='del'>-			list = &amp;cur-&gt;next;</div><div class='del'>-			cur = cur-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	node-&gt;next = cur;</div><div class='del'>-	*list = node;</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void amiga_delete_irq(irq_node_t **list, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	for (node = *list; node; list = &amp;node-&gt;next, node = *list) {</div><div class='del'>-		if (node-&gt;dev_id == dev_id) {</div><div class='del'>-			*list = node-&gt;next;</div><div class='del'>-			/* Mark it as free. */</div><div class='del'>-			node-&gt;handler = NULL;</div><div class='del'>-			local_irq_restore(flags);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	printk ("%s: tried to remove invalid irq\n", __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * amiga_request_irq : add an interrupt service routine for a particular</div><div class='del'>- *                     machine specific interrupt source.</div><div class='del'>- *                     If the addition was successful, it returns 0.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int amiga_request_irq(unsigned int irq,</div><div class='del'>-		      irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                      unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-	int error = 0;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= AMI_IRQS) {</div><div class='del'>-		printk ("%s: Unknown IRQ %d from %s\n", __FUNCTION__,</div><div class='del'>-			irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_AUTO)</div><div class='del'>-		return cpu_request_irq(irq - IRQ_AMIGA_AUTO, handler,</div><div class='del'>-		                       flags, devname, dev_id);</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAB)</div><div class='del'>-		return cia_request_irq(&amp;ciab_base, irq - IRQ_AMIGA_CIAB,</div><div class='del'>-		                       handler, flags, devname, dev_id);</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAA)</div><div class='del'>-		return cia_request_irq(&amp;ciaa_base, irq - IRQ_AMIGA_CIAA,</div><div class='del'>-		                       handler, flags, devname, dev_id);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IRQ_AMIGA_PORTS &amp; IRQ_AMIGA_EXTER defaults to shared,</div><div class='del'>-	 * we could add a check here for the SA_SHIRQ flag but all drivers</div><div class='del'>-	 * should be aware of sharing anyway.</div><div class='del'>-	 */</div><div class='del'>-	if (ami_servers[irq]) {</div><div class='del'>-		if (!(node = new_irq_node()))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		node-&gt;handler = handler;</div><div class='del'>-		node-&gt;flags   = flags;</div><div class='del'>-		node-&gt;dev_id  = dev_id;</div><div class='del'>-		node-&gt;devname = devname;</div><div class='del'>-		node-&gt;next    = NULL;</div><div class='del'>-		error = amiga_insert_irq(&amp;ami_irq_list[irq], node);</div><div class='del'>-	} else {</div><div class='del'>-		ami_irq_list[irq]-&gt;handler = handler;</div><div class='del'>-		ami_irq_list[irq]-&gt;flags   = flags;</div><div class='del'>-		ami_irq_list[irq]-&gt;dev_id  = dev_id;</div><div class='del'>-		ami_irq_list[irq]-&gt;devname = devname;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable the interrupt */</div><div class='del'>-	if (irq &lt; IRQ_AMIGA_PORTS &amp;&amp; !ami_ablecount[irq])</div><div class='del'>-		amiga_custom.intena = IF_SETCLR | amiga_intena_vals[irq];</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amiga_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt;= AMI_IRQS) {</div><div class='del'>-		printk ("%s: Unknown IRQ %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_AUTO)</div><div class='del'>-		cpu_free_irq(irq - IRQ_AMIGA_AUTO, dev_id);</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAB) {</div><div class='del'>-		cia_free_irq(&amp;ciab_base, irq - IRQ_AMIGA_CIAB, dev_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAA) {</div><div class='del'>-		cia_free_irq(&amp;ciaa_base, irq - IRQ_AMIGA_CIAA, dev_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ami_servers[irq]) {</div><div class='del'>-		amiga_delete_irq(&amp;ami_irq_list[irq], dev_id);</div><div class='del'>-		/* if server list empty, disable the interrupt */</div><div class='del'>-		if (!ami_irq_list[irq] &amp;&amp; irq &lt; IRQ_AMIGA_PORTS)</div><div class='del'>-			amiga_custom.intena = amiga_intena_vals[irq];</div><div class='del'>-	} else {</div><div class='del'>-		if (ami_irq_list[irq]-&gt;dev_id != dev_id)</div><div class='del'>-			printk("%s: removing probably wrong IRQ %d from %s\n",</div><div class='del'>-			       __FUNCTION__, irq, ami_irq_list[irq]-&gt;devname);</div><div class='del'>-		ami_irq_list[irq]-&gt;handler = ami_badint;</div><div class='del'>-		ami_irq_list[irq]-&gt;flags   = 0;</div><div class='del'>-		ami_irq_list[irq]-&gt;dev_id  = NULL;</div><div class='del'>-		ami_irq_list[irq]-&gt;devname = NULL;</div><div class='del'>-		amiga_custom.intena = amiga_intena_vals[irq];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Enable/disable a particular machine specific interrupt source.</div><div class='ctx'>  * Note that this may affect other interrupts in case of a shared interrupt.</div><div class='ctx'>  * This function should only be called for a _very_ short time to change some</div><div class='ctx'>  * internal data, that may not be changed by the interrupt at the same time.</div><div class='del'>- * ami_(enable|disable)_irq calls may also be nested.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void amiga_enable_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt;= AMI_IRQS) {</div><div class='del'>-		printk("%s: Unknown IRQ %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (--ami_ablecount[irq])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* No action for auto-vector interrupts */</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_AUTO){</div><div class='del'>-		printk("%s: Trying to enable auto-vector IRQ %i\n",</div><div class='del'>-		       __FUNCTION__, irq - IRQ_AMIGA_AUTO);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAB) {</div><div class='del'>-		cia_set_irq(&amp;ciab_base, (1 &lt;&lt; (irq - IRQ_AMIGA_CIAB)));</div><div class='del'>-		cia_able_irq(&amp;ciab_base, CIA_ICR_SETCLR |</div><div class='del'>-		             (1 &lt;&lt; (irq - IRQ_AMIGA_CIAB)));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAA) {</div><div class='del'>-		cia_set_irq(&amp;ciaa_base, (1 &lt;&lt; (irq - IRQ_AMIGA_CIAA)));</div><div class='del'>-		cia_able_irq(&amp;ciaa_base, CIA_ICR_SETCLR |</div><div class='del'>-		             (1 &lt;&lt; (irq - IRQ_AMIGA_CIAA)));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable the interrupt */</div><div class='del'>-	amiga_custom.intena = IF_SETCLR | amiga_intena_vals[irq];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void amiga_disable_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt;= AMI_IRQS) {</div><div class='del'>-		printk("%s: Unknown IRQ %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ami_ablecount[irq]++)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* No action for auto-vector interrupts */</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_AUTO) {</div><div class='del'>-		printk("%s: Trying to disable auto-vector IRQ %i\n",</div><div class='del'>-		       __FUNCTION__, irq - IRQ_AMIGA_AUTO);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAB) {</div><div class='del'>-		cia_able_irq(&amp;ciab_base, 1 &lt;&lt; (irq - IRQ_AMIGA_CIAB));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IRQ_AMIGA_CIAA) {</div><div class='del'>-		cia_able_irq(&amp;ciaa_base, 1 &lt;&lt; (irq - IRQ_AMIGA_CIAA));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable the interrupt */</div><div class='del'>-	amiga_custom.intena = amiga_intena_vals[irq];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void amiga_do_irq(int irq, struct pt_regs *fp)</div><div class='add'>+static void amiga_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	kstat_cpu(0).irqs[SYS_IRQS + irq]++;</div><div class='del'>-	ami_irq_list[irq]-&gt;handler(irq, ami_irq_list[irq]-&gt;dev_id, fp);</div><div class='add'>+	amiga_custom.intena = IF_SETCLR | (1 &lt;&lt; (irq - IRQ_USER));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void amiga_do_irq_list(int irq, struct pt_regs *fp)</div><div class='add'>+static void amiga_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-</div><div class='del'>-	kstat_cpu(0).irqs[SYS_IRQS + irq]++;</div><div class='del'>-</div><div class='del'>-	amiga_custom.intreq = amiga_intena_vals[irq];</div><div class='del'>-</div><div class='del'>-	for (node = ami_irq_list[irq]; node; node = node-&gt;next)</div><div class='del'>-		node-&gt;handler(irq, node-&gt;dev_id, fp);</div><div class='add'>+	amiga_custom.intena = 1 &lt;&lt; (irq - IRQ_USER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -390,19 +120,19 @@ static irqreturn_t ami_int1(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> 	/* if serial transmit buffer empty, interrupt */</div><div class='ctx'> 	if (ints &amp; IF_TBE) {</div><div class='ctx'> 		amiga_custom.intreq = IF_TBE;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_TBE, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_TBE, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if floppy disk transfer complete, interrupt */</div><div class='ctx'> 	if (ints &amp; IF_DSKBLK) {</div><div class='ctx'> 		amiga_custom.intreq = IF_DSKBLK;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_DSKBLK, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_DSKBLK, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if software interrupt set, interrupt */</div><div class='ctx'> 	if (ints &amp; IF_SOFT) {</div><div class='ctx'> 		amiga_custom.intreq = IF_SOFT;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_SOFT, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_SOFT, fp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -414,18 +144,20 @@ static irqreturn_t ami_int3(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> 	/* if a blitter interrupt */</div><div class='ctx'> 	if (ints &amp; IF_BLIT) {</div><div class='ctx'> 		amiga_custom.intreq = IF_BLIT;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_BLIT, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_BLIT, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if a copper interrupt */</div><div class='ctx'> 	if (ints &amp; IF_COPER) {</div><div class='ctx'> 		amiga_custom.intreq = IF_COPER;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_COPPER, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_COPPER, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if a vertical blank interrupt */</div><div class='del'>-	if (ints &amp; IF_VERTB)</div><div class='del'>-		amiga_do_irq_list(IRQ_AMIGA_VERTB, fp);</div><div class='add'>+	if (ints &amp; IF_VERTB) {</div><div class='add'>+		amiga_custom.intreq = IF_VERTB;</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_VERTB, fp);</div><div class='add'>+	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -436,25 +168,25 @@ static irqreturn_t ami_int4(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> 	/* if audio 0 interrupt */</div><div class='ctx'> 	if (ints &amp; IF_AUD0) {</div><div class='ctx'> 		amiga_custom.intreq = IF_AUD0;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_AUD0, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_AUD0, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if audio 1 interrupt */</div><div class='ctx'> 	if (ints &amp; IF_AUD1) {</div><div class='ctx'> 		amiga_custom.intreq = IF_AUD1;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_AUD1, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_AUD1, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if audio 2 interrupt */</div><div class='ctx'> 	if (ints &amp; IF_AUD2) {</div><div class='ctx'> 		amiga_custom.intreq = IF_AUD2;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_AUD2, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_AUD2, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if audio 3 interrupt */</div><div class='ctx'> 	if (ints &amp; IF_AUD3) {</div><div class='ctx'> 		amiga_custom.intreq = IF_AUD3;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_AUD3, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_AUD3, fp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -466,55 +198,13 @@ static irqreturn_t ami_int5(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> 	/* if serial receive buffer full interrupt */</div><div class='ctx'> 	if (ints &amp; IF_RBF) {</div><div class='ctx'> 		/* acknowledge of IF_RBF must be done by the serial interrupt */</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_RBF, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_RBF, fp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if a disk sync interrupt */</div><div class='ctx'> 	if (ints &amp; IF_DSKSYN) {</div><div class='ctx'> 		amiga_custom.intreq = IF_DSKSYN;</div><div class='del'>-		amiga_do_irq(IRQ_AMIGA_DSKSYN, fp);</div><div class='add'>+		m68k_handle_int(IRQ_AMIGA_DSKSYN, fp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static irqreturn_t ami_int7(int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	panic ("level 7 interrupt received\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t (*amiga_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {</div><div class='del'>-	[0] = ami_badint,</div><div class='del'>-	[1] = ami_int1,</div><div class='del'>-	[2] = ami_badint,</div><div class='del'>-	[3] = ami_int3,</div><div class='del'>-	[4] = ami_int4,</div><div class='del'>-	[5] = ami_int5,</div><div class='del'>-	[6] = ami_badint,</div><div class='del'>-	[7] = ami_int7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int show_amiga_interrupts(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; AMI_STD_IRQS; i++) {</div><div class='del'>-		if (!(node = ami_irq_list[i]))</div><div class='del'>-			continue;</div><div class='del'>-		seq_printf(p, "ami  %2d: %10u ", i,</div><div class='del'>-		               kstat_cpu(0).irqs[SYS_IRQS + i]);</div><div class='del'>-		do {</div><div class='del'>-			if (node-&gt;flags &amp; SA_INTERRUPT)</div><div class='del'>-				seq_puts(p, "F ");</div><div class='del'>-			else</div><div class='del'>-				seq_puts(p, "  ");</div><div class='del'>-			seq_printf(p, "%s\n", node-&gt;devname);</div><div class='del'>-			if ((node = node-&gt;next))</div><div class='del'>-				seq_puts(p, "                    ");</div><div class='del'>-		} while (node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cia_get_irq_list(&amp;ciaa_base, p);</div><div class='del'>-	cia_get_irq_list(&amp;ciab_base, p);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c<br/>index ae94db5d93b2..1f5bfb584297 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/amisound.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/amisound.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/amisound.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/amiga/amisound.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c<br/>index 558d5fd2d2ba..de1304c91112 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/chipram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/chipram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/chipram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/amiga/chipram.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> **	Rewritten 15/9/2000 by Geert to use resource management</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c<br/>index 9476eb9440f5..dbad30054721 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/cia.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/cia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/cia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/amiga/cia.c</a></div><div class='hunk'>@@ -29,21 +29,18 @@ struct ciabase {</div><div class='ctx'> 	unsigned short int_mask;</div><div class='ctx'> 	int handler_irq, cia_irq, server_irq;</div><div class='ctx'> 	char *name;</div><div class='del'>-	irq_handler_t irq_list[CIA_IRQS];</div><div class='ctx'> } ciaa_base = {</div><div class='ctx'> 	.cia		= &amp;ciaa,</div><div class='ctx'> 	.int_mask	= IF_PORTS,</div><div class='del'>-	.handler_irq	= IRQ_AMIGA_AUTO_2,</div><div class='add'>+	.handler_irq	= IRQ_AMIGA_PORTS,</div><div class='ctx'> 	.cia_irq	= IRQ_AMIGA_CIAA,</div><div class='del'>-	.server_irq	= IRQ_AMIGA_PORTS,</div><div class='del'>-	.name		= "CIAA handler"</div><div class='add'>+	.name		= "CIAA"</div><div class='ctx'> }, ciab_base = {</div><div class='ctx'> 	.cia		= &amp;ciab,</div><div class='ctx'> 	.int_mask	= IF_EXTER,</div><div class='del'>-	.handler_irq	= IRQ_AMIGA_AUTO_6,</div><div class='add'>+	.handler_irq	= IRQ_AMIGA_EXTER,</div><div class='ctx'> 	.cia_irq	= IRQ_AMIGA_CIAB,</div><div class='del'>-	.server_irq	= IRQ_AMIGA_EXTER,</div><div class='del'>-	.name		= "CIAB handler"</div><div class='add'>+	.name		= "CIAB"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -66,13 +63,11 @@ unsigned char cia_set_irq(struct ciabase *base, unsigned char mask)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Enable or disable CIA interrupts, return old interrupt mask,</div><div class='del'>- *  interrupts will only be enabled if a handler exists</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned char old, tmp;</div><div class='del'>-	int i;</div><div class='add'>+	unsigned char old;</div><div class='ctx'> </div><div class='ctx'> 	old = base-&gt;icr_mask;</div><div class='ctx'> 	base-&gt;icr_data |= base-&gt;cia-&gt;icr;</div><div class='hunk'>@@ -82,99 +77,104 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)</div><div class='ctx'> 	else</div><div class='ctx'> 		base-&gt;icr_mask &amp;= ~mask;</div><div class='ctx'> 	base-&gt;icr_mask &amp;= CIA_ICR_ALL;</div><div class='del'>-	for (i = 0, tmp = 1; i &lt; CIA_IRQS; i++, tmp &lt;&lt;= 1) {</div><div class='del'>-		if ((tmp &amp; base-&gt;icr_mask) &amp;&amp; !base-&gt;irq_list[i].handler) {</div><div class='del'>-			base-&gt;icr_mask &amp;= ~tmp;</div><div class='del'>-			base-&gt;cia-&gt;icr = tmp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	if (base-&gt;icr_data &amp; base-&gt;icr_mask)</div><div class='ctx'> 		amiga_custom.intreq = IF_SETCLR | base-&gt;int_mask;</div><div class='ctx'> 	return old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cia_request_irq(struct ciabase *base, unsigned int irq,</div><div class='del'>-                    irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                    unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned char mask;</div><div class='del'>-</div><div class='del'>-	base-&gt;irq_list[irq].handler = handler;</div><div class='del'>-	base-&gt;irq_list[irq].flags   = flags;</div><div class='del'>-	base-&gt;irq_list[irq].dev_id  = dev_id;</div><div class='del'>-	base-&gt;irq_list[irq].devname = devname;</div><div class='del'>-</div><div class='del'>-	/* enable the interrupt */</div><div class='del'>-	mask = 1 &lt;&lt; irq;</div><div class='del'>-	cia_set_irq(base, mask);</div><div class='del'>-	cia_able_irq(base, CIA_ICR_SETCLR | mask);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void cia_free_irq(struct ciabase *base, unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (base-&gt;irq_list[irq].dev_id != dev_id)</div><div class='del'>-		printk("%s: removing probably wrong IRQ %i from %s\n",</div><div class='del'>-		       __FUNCTION__, base-&gt;cia_irq + irq,</div><div class='del'>-		       base-&gt;irq_list[irq].devname);</div><div class='del'>-</div><div class='del'>-	base-&gt;irq_list[irq].handler = NULL;</div><div class='del'>-	base-&gt;irq_list[irq].flags   = 0;</div><div class='del'>-</div><div class='del'>-	cia_able_irq(base, 1 &lt;&lt; irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ciabase *base = (struct ciabase *)dev_id;</div><div class='del'>-	int mach_irq, i;</div><div class='add'>+	int mach_irq;</div><div class='ctx'> 	unsigned char ints;</div><div class='ctx'> </div><div class='ctx'> 	mach_irq = base-&gt;cia_irq;</div><div class='del'>-	irq = SYS_IRQS + mach_irq;</div><div class='ctx'> 	ints = cia_set_irq(base, CIA_ICR_ALL);</div><div class='ctx'> 	amiga_custom.intreq = base-&gt;int_mask;</div><div class='del'>-	for (i = 0; i &lt; CIA_IRQS; i++, irq++, mach_irq++) {</div><div class='del'>-		if (ints &amp; 1) {</div><div class='del'>-			kstat_cpu(0).irqs[irq]++;</div><div class='del'>-			base-&gt;irq_list[i].handler(mach_irq, base-&gt;irq_list[i].dev_id, fp);</div><div class='del'>-		}</div><div class='del'>-		ints &gt;&gt;= 1;</div><div class='add'>+	for (; ints; mach_irq++, ints &gt;&gt;= 1) {</div><div class='add'>+		if (ints &amp; 1)</div><div class='add'>+			m68k_handle_int(mach_irq, fp);</div><div class='ctx'> 	}</div><div class='del'>-	amiga_do_irq_list(base-&gt;server_irq, fp);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init cia_init_IRQ(struct ciabase *base)</div><div class='add'>+static void cia_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	unsigned char mask;</div><div class='ctx'> </div><div class='del'>-	/* init isr handlers */</div><div class='del'>-	for (i = 0; i &lt; CIA_IRQS; i++) {</div><div class='del'>-		base-&gt;irq_list[i].handler = NULL;</div><div class='del'>-		base-&gt;irq_list[i].flags   = 0;</div><div class='add'>+	if (irq &gt;= IRQ_AMIGA_CIAB) {</div><div class='add'>+		mask = 1 &lt;&lt; (irq - IRQ_AMIGA_CIAB);</div><div class='add'>+		cia_set_irq(&amp;ciab_base, mask);</div><div class='add'>+		cia_able_irq(&amp;ciab_base, CIA_ICR_SETCLR | mask);</div><div class='add'>+	} else {</div><div class='add'>+		mask = 1 &lt;&lt; (irq - IRQ_AMIGA_CIAA);</div><div class='add'>+		cia_set_irq(&amp;ciaa_base, mask);</div><div class='add'>+		cia_able_irq(&amp;ciaa_base, CIA_ICR_SETCLR | mask);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* clear any pending interrupt and turn off all interrupts */</div><div class='del'>-	cia_set_irq(base, CIA_ICR_ALL);</div><div class='del'>-	cia_able_irq(base, CIA_ICR_ALL);</div><div class='add'>+static void cia_disable_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &gt;= IRQ_AMIGA_CIAB)</div><div class='add'>+		cia_able_irq(&amp;ciab_base, 1 &lt;&lt; (irq - IRQ_AMIGA_CIAB));</div><div class='add'>+	else</div><div class='add'>+		cia_able_irq(&amp;ciaa_base, 1 &lt;&lt; (irq - IRQ_AMIGA_CIAA));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* install CIA handler */</div><div class='del'>-	request_irq(base-&gt;handler_irq, cia_handler, 0, base-&gt;name, base);</div><div class='add'>+static struct irq_controller cia_irq_controller = {</div><div class='add'>+	.name		= "cia",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.enable		= cia_enable_irq,</div><div class='add'>+	.disable	= cia_disable_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Override auto irq 2 &amp; 6 and use them as general chain</div><div class='add'>+ * for external interrupts, we link the CIA interrupt sources</div><div class='add'>+ * into this chain.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-	amiga_custom.intena = IF_SETCLR | base-&gt;int_mask;</div><div class='add'>+static void auto_enable_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case IRQ_AUTO_2:</div><div class='add'>+		amiga_custom.intena = IF_SETCLR | IF_PORTS;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_AUTO_6:</div><div class='add'>+		amiga_custom.intena = IF_SETCLR | IF_EXTER;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cia_get_irq_list(struct ciabase *base, struct seq_file *p)</div><div class='add'>+static void auto_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	j = base-&gt;cia_irq;</div><div class='del'>-	for (i = 0; i &lt; CIA_IRQS; i++) {</div><div class='del'>-		seq_printf(p, "cia  %2d: %10d ", j + i,</div><div class='del'>-			       kstat_cpu(0).irqs[SYS_IRQS + j + i]);</div><div class='del'>-		seq_puts(p, "  ");</div><div class='del'>-		seq_printf(p, "%s\n", base-&gt;irq_list[i].devname);</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case IRQ_AUTO_2:</div><div class='add'>+		amiga_custom.intena = IF_PORTS;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_AUTO_6:</div><div class='add'>+		amiga_custom.intena = IF_EXTER;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_controller auto_irq_controller = {</div><div class='add'>+	.name		= "auto",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.enable		= auto_enable_irq,</div><div class='add'>+	.disable	= auto_disable_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init cia_init_IRQ(struct ciabase *base)</div><div class='add'>+{</div><div class='add'>+	m68k_setup_irq_controller(&amp;cia_irq_controller, base-&gt;cia_irq, CIA_IRQS);</div><div class='add'>+</div><div class='add'>+	/* clear any pending interrupt and turn off all interrupts */</div><div class='add'>+	cia_set_irq(base, CIA_ICR_ALL);</div><div class='add'>+	cia_able_irq(base, CIA_ICR_ALL);</div><div class='add'>+</div><div class='add'>+	/* override auto int and install CIA handler */</div><div class='add'>+	m68k_setup_irq_controller(&amp;auto_irq_controller, base-&gt;handler_irq, 1);</div><div class='add'>+	m68k_irq_startup(base-&gt;handler_irq);</div><div class='add'>+	request_irq(base-&gt;handler_irq, cia_handler, IRQF_SHARED, base-&gt;name, base);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c<br/>index 12e3706fe02c..092e50d2cb13 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/amiga/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/amiga/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/amiga/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/amiga/config.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Miscellaneous Amiga stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -87,17 +86,8 @@ extern char m68k_debug_device[];</div><div class='ctx'> static void amiga_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='ctx'> /* amiga specific irq functions */</div><div class='ctx'> extern void amiga_init_IRQ (void);</div><div class='del'>-extern irqreturn_t (*amiga_default_handler[]) (int, void *, struct pt_regs *);</div><div class='del'>-extern int amiga_request_irq (unsigned int irq,</div><div class='del'>-			      irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                              unsigned long flags, const char *devname,</div><div class='del'>-			      void *dev_id);</div><div class='del'>-extern void amiga_free_irq (unsigned int irq, void *dev_id);</div><div class='del'>-extern void amiga_enable_irq (unsigned int);</div><div class='del'>-extern void amiga_disable_irq (unsigned int);</div><div class='ctx'> static void amiga_get_model(char *model);</div><div class='ctx'> static int amiga_get_hardware_list(char *buffer);</div><div class='del'>-extern int show_amiga_interrupts (struct seq_file *, void *);</div><div class='ctx'> /* amiga specific timer functions */</div><div class='ctx'> static unsigned long amiga_gettimeoffset (void);</div><div class='ctx'> static int a3000_hwclk (int, struct rtc_time *);</div><div class='hunk'>@@ -392,14 +382,8 @@ void __init config_amiga(void)</div><div class='ctx'> </div><div class='ctx'>   mach_sched_init      = amiga_sched_init;</div><div class='ctx'>   mach_init_IRQ        = amiga_init_IRQ;</div><div class='del'>-  mach_default_handler = &amp;amiga_default_handler;</div><div class='del'>-  mach_request_irq     = amiga_request_irq;</div><div class='del'>-  mach_free_irq        = amiga_free_irq;</div><div class='del'>-  enable_irq           = amiga_enable_irq;</div><div class='del'>-  disable_irq          = amiga_disable_irq;</div><div class='ctx'>   mach_get_model       = amiga_get_model;</div><div class='ctx'>   mach_get_hardware_list = amiga_get_hardware_list;</div><div class='del'>-  mach_get_irq_list    = show_amiga_interrupts;</div><div class='ctx'>   mach_gettimeoffset   = amiga_gettimeoffset;</div><div class='ctx'>   if (AMIGAHW_PRESENT(A3000_CLK)){</div><div class='ctx'>     mach_hwclk         = a3000_hwclk;</div><div class='head'>diff --git a/arch/m68k/apollo/Makefile b/arch/m68k/apollo/Makefile<br/>index 39264f3b6ad6..76a057962c38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/apollo/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/apollo/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/apollo/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/apollo/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for Linux arch/m68k/amiga source directory</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= config.o dn_ints.o dma.o</div><div class='add'>+obj-y		:= config.o dn_ints.o</div><div class='head'>diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c<br/>index d401962d9b25..6f4581575fb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/apollo/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/apollo/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/apollo/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/apollo/config.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -28,11 +27,6 @@ u_long apollo_model;</div><div class='ctx'> </div><div class='ctx'> extern void dn_sched_init(irqreturn_t (*handler)(int,void *,struct pt_regs *));</div><div class='ctx'> extern void dn_init_IRQ(void);</div><div class='del'>-extern int dn_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);</div><div class='del'>-extern void dn_free_irq(unsigned int irq, void *dev_id);</div><div class='del'>-extern void dn_enable_irq(unsigned int);</div><div class='del'>-extern void dn_disable_irq(unsigned int);</div><div class='del'>-extern int show_dn_interrupts(struct seq_file *, void *);</div><div class='ctx'> extern unsigned long dn_gettimeoffset(void);</div><div class='ctx'> extern int dn_dummy_hwclk(int, struct rtc_time *);</div><div class='ctx'> extern int dn_dummy_set_clock_mmss(unsigned long);</div><div class='hunk'>@@ -40,13 +34,11 @@ extern void dn_dummy_reset(void);</div><div class='ctx'> extern void dn_dummy_waitbut(void);</div><div class='ctx'> extern struct fb_info *dn_fb_init(long *);</div><div class='ctx'> extern void dn_dummy_debug_init(void);</div><div class='del'>-extern void dn_dummy_video_setup(char *,int *);</div><div class='ctx'> extern irqreturn_t dn_process_int(int irq, struct pt_regs *fp);</div><div class='ctx'> #ifdef CONFIG_HEARTBEAT</div><div class='ctx'> static void dn_heartbeat(int on);</div><div class='ctx'> #endif</div><div class='ctx'> static irqreturn_t dn_timer_int(int irq,void *, struct pt_regs *);</div><div class='del'>-static irqreturn_t (*sched_timer_handler)(int, void *, struct pt_regs *)=NULL;</div><div class='ctx'> static void dn_get_model(char *model);</div><div class='ctx'> static const char *apollo_models[] = {</div><div class='ctx'> 	[APOLLO_DN3000-APOLLO_DN3000] = "DN3000 (Otter)",</div><div class='hunk'>@@ -164,17 +156,10 @@ void config_apollo(void) {</div><div class='ctx'> </div><div class='ctx'> 	mach_sched_init=dn_sched_init; /* */</div><div class='ctx'> 	mach_init_IRQ=dn_init_IRQ;</div><div class='del'>-	mach_default_handler=NULL;</div><div class='del'>-	mach_request_irq     = dn_request_irq;</div><div class='del'>-	mach_free_irq        = dn_free_irq;</div><div class='del'>-	enable_irq      = dn_enable_irq;</div><div class='del'>-	disable_irq     = dn_disable_irq;</div><div class='del'>-	mach_get_irq_list    = show_dn_interrupts;</div><div class='ctx'> 	mach_gettimeoffset   = dn_gettimeoffset;</div><div class='ctx'> 	mach_max_dma_address = 0xffffffff;</div><div class='ctx'> 	mach_hwclk           = dn_dummy_hwclk; /* */</div><div class='ctx'> 	mach_set_clock_mmss  = dn_dummy_set_clock_mmss; /* */</div><div class='del'>-	mach_process_int     = dn_process_int;</div><div class='ctx'> 	mach_reset	     = dn_dummy_reset;  /* */</div><div class='ctx'> #ifdef CONFIG_HEARTBEAT</div><div class='ctx'> 	mach_heartbeat = dn_heartbeat;</div><div class='hunk'>@@ -189,11 +174,13 @@ void config_apollo(void) {</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-irqreturn_t dn_timer_int(int irq, void *dev_id, struct pt_regs *fp) {</div><div class='add'>+irqreturn_t dn_timer_int(int irq, void *dev_id, struct pt_regs *fp)</div><div class='add'>+{</div><div class='add'>+	irqreturn_t (*timer_handler)(int, void *, struct pt_regs *) = dev_id;</div><div class='ctx'> </div><div class='ctx'> 	volatile unsigned char x;</div><div class='ctx'> </div><div class='del'>-	sched_timer_handler(irq,dev_id,fp);</div><div class='add'>+	timer_handler(irq, dev_id, fp);</div><div class='ctx'> </div><div class='ctx'> 	x=*(volatile unsigned char *)(timer+3);</div><div class='ctx'> 	x=*(volatile unsigned char *)(timer+5);</div><div class='hunk'>@@ -217,9 +204,7 @@ void dn_sched_init(irqreturn_t (*timer_routine)(int, void *, struct pt_regs *))</div><div class='ctx'> 	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	sched_timer_handler=timer_routine;</div><div class='del'>-	request_irq(0,dn_timer_int,0,NULL,NULL);</div><div class='del'>-</div><div class='add'>+	request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long dn_gettimeoffset(void) {</div><div class='head'>diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c<br/>index a31259359a12..9fe07803797b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/apollo/dn_ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/apollo/dn_ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/apollo/dn_ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/apollo/dn_ints.c</a></div><div class='hunk'>@@ -1,125 +1,44 @@</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/apollohw.h&gt;</div><div class='del'>-#include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='del'>-static irq_handler_t dn_irqs[16];</div><div class='del'>-</div><div class='del'>-irqreturn_t dn_process_int(int irq, struct pt_regs *fp)</div><div class='add'>+void dn_process_int(unsigned int irq, struct pt_regs *fp)</div><div class='ctx'> {</div><div class='del'>-  irqreturn_t res = IRQ_NONE;</div><div class='del'>-</div><div class='del'>-  if(dn_irqs[irq-160].handler) {</div><div class='del'>-    res = dn_irqs[irq-160].handler(irq,dn_irqs[irq-160].dev_id,fp);</div><div class='del'>-  } else {</div><div class='del'>-    printk("spurious irq %d occurred\n",irq);</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  *(volatile unsigned char *)(pica)=0x20;</div><div class='del'>-  *(volatile unsigned char *)(picb)=0x20;</div><div class='del'>-</div><div class='del'>-  return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_init_IRQ(void) {</div><div class='del'>-</div><div class='del'>-  int i;</div><div class='del'>-</div><div class='del'>-  for(i=0;i&lt;16;i++) {</div><div class='del'>-    dn_irqs[i].handler=NULL;</div><div class='del'>-    dn_irqs[i].flags=IRQ_FLG_STD;</div><div class='del'>-    dn_irqs[i].dev_id=NULL;</div><div class='del'>-    dn_irqs[i].devname=NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dn_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id) {</div><div class='del'>-</div><div class='del'>-  if((irq&lt;0) || (irq&gt;15)) {</div><div class='del'>-    printk("Trying to request invalid IRQ\n");</div><div class='del'>-    return -ENXIO;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if(!dn_irqs[irq].handler) {</div><div class='del'>-    dn_irqs[irq].handler=handler;</div><div class='del'>-    dn_irqs[irq].flags=IRQ_FLG_STD;</div><div class='del'>-    dn_irqs[irq].dev_id=dev_id;</div><div class='del'>-    dn_irqs[irq].devname=devname;</div><div class='del'>-    if(irq&lt;8)</div><div class='del'>-      *(volatile unsigned char *)(pica+1)&amp;=~(1&lt;&lt;irq);</div><div class='del'>-    else</div><div class='del'>-      *(volatile unsigned char *)(picb+1)&amp;=~(1&lt;&lt;(irq-8));</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-  }</div><div class='del'>-  else {</div><div class='del'>-    printk("Trying to request already assigned irq %d\n",irq);</div><div class='del'>-    return -ENXIO;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_free_irq(unsigned int irq, void *dev_id) {</div><div class='del'>-</div><div class='del'>-  if((irq&lt;0) || (irq&gt;15)) {</div><div class='del'>-    printk("Trying to free invalid IRQ\n");</div><div class='del'>-    return ;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if(irq&lt;8)</div><div class='del'>-    *(volatile unsigned char *)(pica+1)|=(1&lt;&lt;irq);</div><div class='del'>-  else</div><div class='del'>-    *(volatile unsigned char *)(picb+1)|=(1&lt;&lt;(irq-8));</div><div class='del'>-</div><div class='del'>-  dn_irqs[irq].handler=NULL;</div><div class='del'>-  dn_irqs[irq].flags=IRQ_FLG_STD;</div><div class='del'>-  dn_irqs[irq].dev_id=NULL;</div><div class='del'>-  dn_irqs[irq].devname=NULL;</div><div class='del'>-</div><div class='del'>-  return ;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_enable_irq(unsigned int irq) {</div><div class='del'>-</div><div class='del'>-  printk("dn enable irq\n");</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dn_disable_irq(unsigned int irq) {</div><div class='del'>-</div><div class='del'>-  printk("dn disable irq\n");</div><div class='add'>+	m68k_handle_int(irq, fp);</div><div class='ctx'> </div><div class='add'>+	*(volatile unsigned char *)(pica)=0x20;</div><div class='add'>+	*(volatile unsigned char *)(picb)=0x20;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int show_dn_interrupts(struct seq_file *p, void *v) {</div><div class='del'>-</div><div class='del'>-  printk("dn get irq list\n");</div><div class='del'>-</div><div class='del'>-  return 0;</div><div class='del'>-</div><div class='add'>+int apollo_irq_startup(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt; 8)</div><div class='add'>+		*(volatile unsigned char *)(pica+1) &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+	else</div><div class='add'>+		*(volatile unsigned char *)(picb+1) &amp;= ~(1 &lt;&lt; (irq - 8));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct fb_info *dn_dummy_fb_init(long *mem_start) {</div><div class='del'>-</div><div class='del'>-  printk("fb init\n");</div><div class='del'>-</div><div class='del'>-  return NULL;</div><div class='del'>-</div><div class='add'>+void apollo_irq_shutdown(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt; 8)</div><div class='add'>+		*(volatile unsigned char *)(pica+1) |= (1 &lt;&lt; irq);</div><div class='add'>+	else</div><div class='add'>+		*(volatile unsigned char *)(picb+1) |= (1 &lt;&lt; (irq - 8));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dn_dummy_video_setup(char *options,int *ints) {</div><div class='add'>+static struct irq_controller apollo_irq_controller = {</div><div class='add'>+	.name           = "apollo",</div><div class='add'>+	.lock           = SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.startup        = apollo_irq_startup,</div><div class='add'>+	.shutdown       = apollo_irq_shutdown,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-  printk("no video yet\n");</div><div class='ctx'> </div><div class='add'>+void dn_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);</div><div class='add'>+	m68k_setup_irq_controller(&amp;apollo_irq_controller, IRQ_APOLLO, 16);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c<br/>index 076f47917842..ece13cbf9950 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/ataints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/ataints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/ataints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/atari/ataints.c</a></div><div class='hunk'>@@ -104,6 +104,7 @@</div><div class='ctx'>  * the sr copy in the frame.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> </div><div class='ctx'> #define	NUM_INT_SOURCES	(8 + NUM_ATARI_SOURCES)</div><div class='ctx'> </div><div class='hunk'>@@ -133,13 +134,6 @@ static struct irqhandler irq_handler[NUM_INT_SOURCES];</div><div class='ctx'>  */</div><div class='ctx'> static struct irqparam irq_param[NUM_INT_SOURCES];</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Bitmap for free interrupt vector numbers</div><div class='del'>- * (new vectors starting from 0x70 can be allocated by</div><div class='del'>- * atari_register_vme_int())</div><div class='del'>- */</div><div class='del'>-static int free_vme_vec_bitmap;</div><div class='del'>-</div><div class='ctx'> /* check for valid int number (complex, sigh...) */</div><div class='ctx'> #define	IS_VALID_INTNO(n)											\</div><div class='ctx'> 	((n) &gt; 0 &amp;&amp;														\</div><div class='hunk'>@@ -301,6 +295,14 @@ __asm__ (__ALIGN_STR "\n"</div><div class='ctx'> );</div><div class='ctx'> 	for (;;);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bitmap for free interrupt vector numbers</div><div class='add'>+ * (new vectors starting from 0x70 can be allocated by</div><div class='add'>+ * atari_register_vme_int())</div><div class='add'>+ */</div><div class='add'>+static int free_vme_vec_bitmap;</div><div class='ctx'> </div><div class='ctx'> /* GK:</div><div class='ctx'>  * HBL IRQ handler for Falcon. Nobody needs it :-)</div><div class='hunk'>@@ -313,13 +315,34 @@ __ALIGN_STR "\n\t"</div><div class='ctx'> 	"orw	#0x200,%sp@\n\t"	/* set saved ipl to 2 */</div><div class='ctx'> 	"rte");</div><div class='ctx'> </div><div class='del'>-/* Defined in entry.S; only increments 'num_spurious' */</div><div class='del'>-asmlinkage void bad_interrupt(void);</div><div class='del'>-</div><div class='del'>-extern void atari_microwire_cmd( int cmd );</div><div class='add'>+extern void atari_microwire_cmd(int cmd);</div><div class='ctx'> </div><div class='ctx'> extern int atari_SCC_reset_done;</div><div class='ctx'> </div><div class='add'>+static int atari_startup_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	m68k_irq_startup(irq);</div><div class='add'>+	atari_turnon_irq(irq);</div><div class='add'>+	atari_enable_irq(irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atari_shutdown_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	atari_disable_irq(irq);</div><div class='add'>+	atari_turnoff_irq(irq);</div><div class='add'>+	m68k_irq_shutdown(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_controller atari_irq_controller = {</div><div class='add'>+	.name		= "atari",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.startup	= atari_startup_irq,</div><div class='add'>+	.shutdown	= atari_shutdown_irq,</div><div class='add'>+	.enable		= atari_enable_irq,</div><div class='add'>+	.disable	= atari_disable_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * void atari_init_IRQ (void)</div><div class='ctx'>  *</div><div class='hunk'>@@ -333,12 +356,8 @@ extern int atari_SCC_reset_done;</div><div class='ctx'> </div><div class='ctx'> void __init atari_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* initialize the vector table */</div><div class='del'>-	for (i = 0; i &lt; NUM_INT_SOURCES; ++i) {</div><div class='del'>-		vectors[IRQ_SOURCE_TO_VECTOR(i)] = bad_interrupt;</div><div class='del'>-	}</div><div class='add'>+	m68k_setup_user_interrupt(VEC_USER, 192, NULL);</div><div class='add'>+	m68k_setup_irq_controller(&amp;atari_irq_controller, 1, NUM_ATARI_SOURCES - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the MFP(s) */</div><div class='ctx'> </div><div class='hunk'>@@ -378,8 +397,7 @@ void __init atari_init_IRQ(void)</div><div class='ctx'> 									 * enabled in VME mask</div><div class='ctx'> 									 */</div><div class='ctx'> 		tt_scu.vme_mask = 0x60;		/* enable MFP and SCC ints */</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		/* If no SCU and no Hades, the HSYNC interrupt needs to be</div><div class='ctx'> 		 * disabled this way. (Else _inthandler in kernel/sys_call.S</div><div class='ctx'> 		 * gets overruns)</div><div class='hunk'>@@ -404,184 +422,6 @@ void __init atari_init_IRQ(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static irqreturn_t atari_call_irq_list( int irq, void *dev_id, struct pt_regs *fp )</div><div class='del'>-{</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-</div><div class='del'>-	for (node = (irq_node_t *)dev_id; node; node = node-&gt;next)</div><div class='del'>-		node-&gt;handler(irq, node-&gt;dev_id, fp);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * atari_request_irq : add an interrupt service routine for a particular</div><div class='del'>- *                     machine specific interrupt source.</div><div class='del'>- *                     If the addition was successful, it returns 0.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int atari_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                      unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	int vector;</div><div class='del'>-	unsigned long oflags = flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The following is a hack to make some PCI card drivers work,</div><div class='del'>-	 * which set the SA_SHIRQ flag.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	flags &amp;= ~SA_SHIRQ;</div><div class='del'>-</div><div class='del'>-	if (flags == SA_INTERRUPT) {</div><div class='del'>-		printk ("%s: SA_INTERRUPT changed to IRQ_TYPE_SLOW for %s\n",</div><div class='del'>-			__FUNCTION__, devname);</div><div class='del'>-		flags = IRQ_TYPE_SLOW;</div><div class='del'>-	}</div><div class='del'>-	if (flags &lt; IRQ_TYPE_SLOW || flags &gt; IRQ_TYPE_PRIO) {</div><div class='del'>-		printk ("%s: Bad irq type 0x%lx &lt;0x%lx&gt; requested from %s\n",</div><div class='del'>-		        __FUNCTION__, flags, oflags, devname);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (!IS_VALID_INTNO(irq)) {</div><div class='del'>-		printk ("%s: Unknown irq %d requested from %s\n",</div><div class='del'>-		        __FUNCTION__, irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	vector = IRQ_SOURCE_TO_VECTOR(irq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check type/source combination: slow ints are (currently)</div><div class='del'>-	 * only possible for MFP-interrupts.</div><div class='del'>-	 */</div><div class='del'>-	if (flags == IRQ_TYPE_SLOW &amp;&amp;</div><div class='del'>-		(irq &lt; STMFP_SOURCE_BASE || irq &gt;= SCC_SOURCE_BASE)) {</div><div class='del'>-		printk ("%s: Slow irq requested for non-MFP source %d from %s\n",</div><div class='del'>-		        __FUNCTION__, irq, devname);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vectors[vector] == bad_interrupt) {</div><div class='del'>-		/* int has no handler yet */</div><div class='del'>-		irq_handler[irq].handler = handler;</div><div class='del'>-		irq_handler[irq].dev_id  = dev_id;</div><div class='del'>-		irq_param[irq].flags   = flags;</div><div class='del'>-		irq_param[irq].devname = devname;</div><div class='del'>-		vectors[vector] =</div><div class='del'>-			(flags == IRQ_TYPE_SLOW) ? slow_handlers[irq-STMFP_SOURCE_BASE] :</div><div class='del'>-			(flags == IRQ_TYPE_FAST) ? atari_fast_irq_handler :</div><div class='del'>-			                          atari_prio_irq_handler;</div><div class='del'>-		/* If MFP int, also enable and umask it */</div><div class='del'>-		atari_turnon_irq(irq);</div><div class='del'>-		atari_enable_irq(irq);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	else if (irq_param[irq].flags == flags) {</div><div class='del'>-		/* old handler is of same type -&gt; handlers can be chained */</div><div class='del'>-		irq_node_t *node;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-		if (irq_handler[irq].handler != atari_call_irq_list) {</div><div class='del'>-			/* Only one handler yet, make a node for this first one */</div><div class='del'>-			if (!(node = new_irq_node()))</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			node-&gt;handler = irq_handler[irq].handler;</div><div class='del'>-			node-&gt;dev_id  = irq_handler[irq].dev_id;</div><div class='del'>-			node-&gt;devname = irq_param[irq].devname;</div><div class='del'>-			node-&gt;next = NULL;</div><div class='del'>-</div><div class='del'>-			irq_handler[irq].handler = atari_call_irq_list;</div><div class='del'>-			irq_handler[irq].dev_id  = node;</div><div class='del'>-			irq_param[irq].devname   = "chained";</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!(node = new_irq_node()))</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		node-&gt;handler = handler;</div><div class='del'>-		node-&gt;dev_id  = dev_id;</div><div class='del'>-		node-&gt;devname = devname;</div><div class='del'>-		/* new handlers are put in front of the queue */</div><div class='del'>-		node-&gt;next = irq_handler[irq].dev_id;</div><div class='del'>-		irq_handler[irq].dev_id = node;</div><div class='del'>-</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		printk ("%s: Irq %d allocated by other type int (call from %s)\n",</div><div class='del'>-		        __FUNCTION__, irq, devname);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void atari_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int vector;</div><div class='del'>-	irq_node_t **list, *node;</div><div class='del'>-</div><div class='del'>-	if (!IS_VALID_INTNO(irq)) {</div><div class='del'>-		printk("%s: Unknown irq %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vector = IRQ_SOURCE_TO_VECTOR(irq);</div><div class='del'>-	if (vectors[vector] == bad_interrupt)</div><div class='del'>-		goto not_found;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	if (irq_handler[irq].handler != atari_call_irq_list) {</div><div class='del'>-		/* It's the only handler for the interrupt */</div><div class='del'>-		if (irq_handler[irq].dev_id != dev_id) {</div><div class='del'>-			local_irq_restore(flags);</div><div class='del'>-			goto not_found;</div><div class='del'>-		}</div><div class='del'>-		irq_handler[irq].handler = NULL;</div><div class='del'>-		irq_handler[irq].dev_id  = NULL;</div><div class='del'>-		irq_param[irq].devname   = NULL;</div><div class='del'>-		vectors[vector] = bad_interrupt;</div><div class='del'>-		/* If MFP int, also disable it */</div><div class='del'>-		atari_disable_irq(irq);</div><div class='del'>-		atari_turnoff_irq(irq);</div><div class='del'>-</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The interrupt is chained, find the irq on the list */</div><div class='del'>-	for(list = (irq_node_t **)&amp;irq_handler[irq].dev_id; *list; list = &amp;(*list)-&gt;next) {</div><div class='del'>-		if ((*list)-&gt;dev_id == dev_id) break;</div><div class='del'>-	}</div><div class='del'>-	if (!*list) {</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-		goto not_found;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	(*list)-&gt;handler = NULL; /* Mark it as free for reallocation */</div><div class='del'>-	*list = (*list)-&gt;next;</div><div class='del'>-</div><div class='del'>-	/* If there's now only one handler, unchain the interrupt, i.e. plug in</div><div class='del'>-	 * the handler directly again and omit atari_call_irq_list */</div><div class='del'>-	node = (irq_node_t *)irq_handler[irq].dev_id;</div><div class='del'>-	if (node &amp;&amp; !node-&gt;next) {</div><div class='del'>-		irq_handler[irq].handler = node-&gt;handler;</div><div class='del'>-		irq_handler[irq].dev_id  = node-&gt;dev_id;</div><div class='del'>-		irq_param[irq].devname   = node-&gt;devname;</div><div class='del'>-		node-&gt;handler = NULL; /* Mark it as free for reallocation */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-not_found:</div><div class='del'>-	printk("%s: tried to remove invalid irq\n", __FUNCTION__);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * atari_register_vme_int() returns the number of a free interrupt vector for</div><div class='ctx'>  * hardware with a programmable int vector (probably a VME board).</div><div class='hunk'>@@ -591,58 +431,24 @@ unsigned long atari_register_vme_int(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; 32; i++)</div><div class='del'>-		if((free_vme_vec_bitmap &amp; (1 &lt;&lt; i)) == 0)</div><div class='add'>+	for (i = 0; i &lt; 32; i++)</div><div class='add'>+		if ((free_vme_vec_bitmap &amp; (1 &lt;&lt; i)) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-	if(i == 16)</div><div class='add'>+	if (i == 16)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	free_vme_vec_bitmap |= 1 &lt;&lt; i;</div><div class='del'>-	return (VME_SOURCE_BASE + i);</div><div class='add'>+	return VME_SOURCE_BASE + i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void atari_unregister_vme_int(unsigned long irq)</div><div class='ctx'> {</div><div class='del'>-	if(irq &gt;= VME_SOURCE_BASE &amp;&amp; irq &lt; VME_SOURCE_BASE + VME_MAX_SOURCES) {</div><div class='add'>+	if (irq &gt;= VME_SOURCE_BASE &amp;&amp; irq &lt; VME_SOURCE_BASE + VME_MAX_SOURCES) {</div><div class='ctx'> 		irq -= VME_SOURCE_BASE;</div><div class='ctx'> 		free_vme_vec_bitmap &amp;= ~(1 &lt;&lt; irq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int show_atari_interrupts(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_INT_SOURCES; ++i) {</div><div class='del'>-		if (vectors[IRQ_SOURCE_TO_VECTOR(i)] == bad_interrupt)</div><div class='del'>-			continue;</div><div class='del'>-		if (i &lt; STMFP_SOURCE_BASE)</div><div class='del'>-			seq_printf(p, "auto %2d: %10u ",</div><div class='del'>-				       i, kstat_cpu(0).irqs[i]);</div><div class='del'>-		else</div><div class='del'>-			seq_printf(p, "vec $%02x: %10u ",</div><div class='del'>-				       IRQ_SOURCE_TO_VECTOR(i),</div><div class='del'>-				       kstat_cpu(0).irqs[i]);</div><div class='del'>-</div><div class='del'>-		if (irq_handler[i].handler != atari_call_irq_list) {</div><div class='del'>-			seq_printf(p, "%s\n", irq_param[i].devname);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			irq_node_t *n;</div><div class='del'>-			for( n = (irq_node_t *)irq_handler[i].dev_id; n; n = n-&gt;next ) {</div><div class='del'>-				seq_printf(p, "%s\n", n-&gt;devname);</div><div class='del'>-				if (n-&gt;next)</div><div class='del'>-					seq_puts(p, "                    " );</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (num_spurious)</div><div class='del'>-		seq_printf(p, "spurio.: %10u\n", num_spurious);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c<br/>index 1012b08e5522..b2079252a954 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/atari/config.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * Miscellaneous atari stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='hunk'>@@ -57,12 +56,6 @@ static int atari_get_hardware_list(char *buffer);</div><div class='ctx'> </div><div class='ctx'> /* atari specific irq functions */</div><div class='ctx'> extern void atari_init_IRQ (void);</div><div class='del'>-extern int atari_request_irq (unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                              unsigned long flags, const char *devname, void *dev_id);</div><div class='del'>-extern void atari_free_irq (unsigned int irq, void *dev_id);</div><div class='del'>-extern void atari_enable_irq (unsigned int);</div><div class='del'>-extern void atari_disable_irq (unsigned int);</div><div class='del'>-extern int show_atari_interrupts (struct seq_file *, void *);</div><div class='ctx'> extern void atari_mksound( unsigned int count, unsigned int ticks );</div><div class='ctx'> #ifdef CONFIG_HEARTBEAT</div><div class='ctx'> static void atari_heartbeat( int on );</div><div class='hunk'>@@ -232,13 +225,8 @@ void __init config_atari(void)</div><div class='ctx'> </div><div class='ctx'>     mach_sched_init      = atari_sched_init;</div><div class='ctx'>     mach_init_IRQ        = atari_init_IRQ;</div><div class='del'>-    mach_request_irq     = atari_request_irq;</div><div class='del'>-    mach_free_irq        = atari_free_irq;</div><div class='del'>-    enable_irq           = atari_enable_irq;</div><div class='del'>-    disable_irq          = atari_disable_irq;</div><div class='ctx'>     mach_get_model	 = atari_get_model;</div><div class='ctx'>     mach_get_hardware_list = atari_get_hardware_list;</div><div class='del'>-    mach_get_irq_list	 = show_atari_interrupts;</div><div class='ctx'>     mach_gettimeoffset   = atari_gettimeoffset;</div><div class='ctx'>     mach_reset           = atari_reset;</div><div class='ctx'>     mach_max_dma_address = 0xffffff;</div><div class='head'>diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c<br/>index ace05f79d968..4ae01004d8dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/atari/debug.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/m68k/atari/hades-pci.c b/arch/m68k/atari/hades-pci.c<br/>index 8888debf71ec..6ca57b6564da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/hades-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/hades-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/hades-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/atari/hades-pci.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Written by Wout Klaren.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c<br/>index 22e0481a5f7b..bf4588cbe371 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/atari/stram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/atari/stram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/atari/stram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/atari/stram.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m68k/bvme6000/Makefile b/arch/m68k/bvme6000/Makefile<br/>index 2348e6ceed1e..d8174004fe2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/bvme6000/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/bvme6000/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/bvme6000/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/bvme6000/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for Linux arch/m68k/bvme6000 source directory</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= config.o bvmeints.o rtc.o</div><div class='add'>+obj-y		:= config.o rtc.o</div><div class='head'>diff --git a/arch/m68k/bvme6000/bvmeints.c b/arch/m68k/bvme6000/bvmeints.c<br/>deleted file mode 100644<br/>index 298a8df02664..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/bvme6000/bvmeints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/bvme6000/bvmeints.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,160 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/m68k/bvme6000/bvmeints.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997 Richard Hirst [richard@sleepie.demon.co.uk]</div><div class='del'>- *</div><div class='del'>- * based on amiints.c -- Amiga Linux interrupt handling code</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file README.legal in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-</div><div class='del'>-static irqreturn_t bvme6000_defhand (int irq, void *dev_id, struct pt_regs *fp);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This should ideally be 4 elements only, for speed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	irqreturn_t	(*handler)(int, void *, struct pt_regs *);</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	void		*dev_id;</div><div class='del'>-	const char	*devname;</div><div class='del'>-	unsigned	count;</div><div class='del'>-} irq_tab[256];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * void bvme6000_init_IRQ (void)</div><div class='del'>- *</div><div class='del'>- * Parameters:	None</div><div class='del'>- *</div><div class='del'>- * Returns:	Nothing</div><div class='del'>- *</div><div class='del'>- * This function is called during kernel startup to initialize</div><div class='del'>- * the bvme6000 IRQ handling routines.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void bvme6000_init_IRQ (void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 256; i++) {</div><div class='del'>-		irq_tab[i].handler = bvme6000_defhand;</div><div class='del'>-		irq_tab[i].flags = IRQ_FLG_STD;</div><div class='del'>-		irq_tab[i].dev_id = NULL;</div><div class='del'>-		irq_tab[i].devname = NULL;</div><div class='del'>-		irq_tab[i].count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bvme6000_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt; 255) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	/* Nothing special about auto-vectored devices for the BVME6000,</div><div class='del'>-	 * but treat it specially to avoid changes elsewhere.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= VEC_INT1 &amp;&amp; irq &lt;= VEC_INT7)</div><div class='del'>-		return cpu_request_irq(irq - VEC_SPUR, handler, flags,</div><div class='del'>-						devname, dev_id);</div><div class='del'>-#endif</div><div class='del'>-	if (!(irq_tab[irq].flags &amp; IRQ_FLG_STD)) {</div><div class='del'>-		if (irq_tab[irq].flags &amp; IRQ_FLG_LOCK) {</div><div class='del'>-			printk("%s: IRQ %d from %s is not replaceable\n",</div><div class='del'>-			       __FUNCTION__, irq, irq_tab[irq].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		if (flags &amp; IRQ_FLG_REPLACE) {</div><div class='del'>-			printk("%s: %s can't replace IRQ %d from %s\n",</div><div class='del'>-			       __FUNCTION__, devname, irq, irq_tab[irq].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	irq_tab[irq].handler = handler;</div><div class='del'>-	irq_tab[irq].flags   = flags;</div><div class='del'>-	irq_tab[irq].dev_id  = dev_id;</div><div class='del'>-	irq_tab[irq].devname = devname;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bvme6000_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt; 255) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	if (irq &gt;= VEC_INT1 &amp;&amp; irq &lt;= VEC_INT7) {</div><div class='del'>-		cpu_free_irq(irq - VEC_SPUR, dev_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if (irq_tab[irq].dev_id != dev_id)</div><div class='del'>-		printk("%s: Removing probably wrong IRQ %d from %s\n",</div><div class='del'>-		       __FUNCTION__, irq, irq_tab[irq].devname);</div><div class='del'>-</div><div class='del'>-	irq_tab[irq].handler = bvme6000_defhand;</div><div class='del'>-	irq_tab[irq].flags   = IRQ_FLG_STD;</div><div class='del'>-	irq_tab[irq].dev_id  = NULL;</div><div class='del'>-	irq_tab[irq].devname = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t bvme6000_process_int (unsigned long vec, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	if (vec &gt; 255) {</div><div class='del'>-		printk ("bvme6000_process_int: Illegal vector %ld", vec);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	} else {</div><div class='del'>-		irq_tab[vec].count++;</div><div class='del'>-		irq_tab[vec].handler(vec, irq_tab[vec].dev_id, fp);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int show_bvme6000_interrupts(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 256; i++) {</div><div class='del'>-		if (irq_tab[i].count)</div><div class='del'>-			seq_printf(p, "Vec 0x%02x: %8d  %s\n",</div><div class='del'>-			    i, irq_tab[i].count,</div><div class='del'>-			    irq_tab[i].devname ? irq_tab[i].devname : "free");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static irqreturn_t bvme6000_defhand (int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	printk ("Unknown interrupt 0x%02x\n", irq);</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bvme6000_enable_irq (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void bvme6000_disable_irq (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c<br/>index c90cb5fcc8ef..d1e916ae55a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/bvme6000/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/bvme6000/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/bvme6000/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/bvme6000/config.c</a></div><div class='hunk'>@@ -36,15 +36,8 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/bvme6000hw.h&gt;</div><div class='ctx'> </div><div class='del'>-extern irqreturn_t bvme6000_process_int (int level, struct pt_regs *regs);</div><div class='del'>-extern void bvme6000_init_IRQ (void);</div><div class='del'>-extern void bvme6000_free_irq (unsigned int, void *);</div><div class='del'>-extern int  show_bvme6000_interrupts(struct seq_file *, void *);</div><div class='del'>-extern void bvme6000_enable_irq (unsigned int);</div><div class='del'>-extern void bvme6000_disable_irq (unsigned int);</div><div class='ctx'> static void bvme6000_get_model(char *model);</div><div class='ctx'> static int  bvme6000_get_hardware_list(char *buffer);</div><div class='del'>-extern int  bvme6000_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);</div><div class='ctx'> extern void bvme6000_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='ctx'> extern unsigned long bvme6000_gettimeoffset (void);</div><div class='ctx'> extern int bvme6000_hwclk (int, struct rtc_time *);</div><div class='hunk'>@@ -100,6 +93,14 @@ static int bvme6000_get_hardware_list(char *buffer)</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function is called during kernel startup to initialize</div><div class='add'>+ * the bvme6000 IRQ handling routines.</div><div class='add'>+ */</div><div class='add'>+static void bvme6000_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	m68k_setup_user_interrupt(VEC_USER, 192, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void __init config_bvme6000(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -127,12 +128,6 @@ void __init config_bvme6000(void)</div><div class='ctx'>     mach_hwclk           = bvme6000_hwclk;</div><div class='ctx'>     mach_set_clock_mmss	 = bvme6000_set_clock_mmss;</div><div class='ctx'>     mach_reset		 = bvme6000_reset;</div><div class='del'>-    mach_free_irq	 = bvme6000_free_irq;</div><div class='del'>-    mach_process_int	 = bvme6000_process_int;</div><div class='del'>-    mach_get_irq_list	 = show_bvme6000_interrupts;</div><div class='del'>-    mach_request_irq	 = bvme6000_request_irq;</div><div class='del'>-    enable_irq		 = bvme6000_enable_irq;</div><div class='del'>-    disable_irq          = bvme6000_disable_irq;</div><div class='ctx'>     mach_get_model       = bvme6000_get_model;</div><div class='ctx'>     mach_get_hardware_list = bvme6000_get_hardware_list;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/hp300/Makefile b/arch/m68k/hp300/Makefile<br/>index 89b6317899e3..288b9c67c9bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/hp300/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/hp300/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/hp300/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for Linux arch/m68k/hp300 source directory</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= ksyms.o config.o ints.o time.o reboot.o</div><div class='add'>+obj-y		:= ksyms.o config.o time.o reboot.o</div><div class='head'>diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c<br/>index 6d129eef370f..1c05a6260546 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/hp300/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/hp300/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/hp300/config.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *  called by setup.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -21,7 +20,6 @@</div><div class='ctx'> #include &lt;asm/hp300hw.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "ints.h"</div><div class='ctx'> #include "time.h"</div><div class='ctx'> </div><div class='ctx'> unsigned long hp300_model;</div><div class='hunk'>@@ -64,8 +62,6 @@ static char *hp300_models[] __initdata = {</div><div class='ctx'> static char hp300_model_name[13] = "HP9000/";</div><div class='ctx'> </div><div class='ctx'> extern void hp300_reset(void);</div><div class='del'>-extern irqreturn_t (*hp300_default_handler[])(int, void *, struct pt_regs *);</div><div class='del'>-extern int show_hp300_interrupts(struct seq_file *, void *);</div><div class='ctx'> #ifdef CONFIG_SERIAL_8250_CONSOLE</div><div class='ctx'> extern int hp300_setup_serial_console(void) __init;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -245,16 +241,16 @@ static unsigned int hp300_get_ss(void)</div><div class='ctx'> 		hp300_rtc_read(RTC_REG_SEC2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init hp300_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init config_hp300(void)</div><div class='ctx'> {</div><div class='ctx'> 	mach_sched_init      = hp300_sched_init;</div><div class='ctx'> 	mach_init_IRQ        = hp300_init_IRQ;</div><div class='del'>-	mach_request_irq     = hp300_request_irq;</div><div class='del'>-	mach_free_irq        = hp300_free_irq;</div><div class='ctx'> 	mach_get_model       = hp300_get_model;</div><div class='del'>-	mach_get_irq_list    = show_hp300_interrupts;</div><div class='ctx'> 	mach_gettimeoffset   = hp300_gettimeoffset;</div><div class='del'>-	mach_default_handler = &amp;hp300_default_handler;</div><div class='ctx'> 	mach_hwclk	     = hp300_hwclk;</div><div class='ctx'> 	mach_get_ss	     = hp300_get_ss;</div><div class='ctx'> 	mach_reset           = hp300_reset;</div><div class='head'>diff --git a/arch/m68k/hp300/ints.c b/arch/m68k/hp300/ints.c<br/>deleted file mode 100644<br/>index 0c5bb403e893..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/hp300/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/ints.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,175 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/arch/m68k/hp300/ints.c</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1998 Philip Blundell &lt;philb@gnu.org&gt;</div><div class='del'>- *</div><div class='del'>- *  This file contains the HP300-specific interrupt handling.</div><div class='del'>- *  We only use the autovector interrupts, and therefore we need to</div><div class='del'>- *  maintain lists of devices sharing each ipl.</div><div class='del'>- *  [ipl list code added by Peter Maydell &lt;pmaydell@chiark.greenend.org.uk&gt; 06/1998]</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/errno.h&gt;</div><div class='del'>-#include "ints.h"</div><div class='del'>-</div><div class='del'>-/* Each ipl has a linked list of interrupt service routines.</div><div class='del'>- * Service routines are added via hp300_request_irq() and removed</div><div class='del'>- * via hp300_free_irq(). The device driver should set IRQ_FLG_FAST</div><div class='del'>- * if it needs to be serviced early (eg FIFOless UARTs); this will</div><div class='del'>- * cause it to be added at the front of the queue rather than</div><div class='del'>- * the back.</div><div class='del'>- * Currently IRQ_FLG_SLOW and flags=0 are treated identically; if</div><div class='del'>- * we needed three levels of priority we could distinguish them</div><div class='del'>- * but this strikes me as mildly ugly...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* we start with no entries in any list */</div><div class='del'>-static irq_node_t *hp300_irq_list[HP300_NUM_IRQS];</div><div class='del'>-</div><div class='del'>-static spinlock_t irqlist_lock;</div><div class='del'>-</div><div class='del'>-/* This handler receives all interrupts, dispatching them to the registered handlers */</div><div class='del'>-static irqreturn_t hp300_int_handler(int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-        irq_node_t *t;</div><div class='del'>-        /* We just give every handler on the chain an opportunity to handle</div><div class='del'>-         * the interrupt, in priority order.</div><div class='del'>-         */</div><div class='del'>-        for(t = hp300_irq_list[irq]; t; t=t-&gt;next)</div><div class='del'>-                t-&gt;handler(irq, t-&gt;dev_id, fp);</div><div class='del'>-        /* We could put in some accounting routines, checks for stray interrupts,</div><div class='del'>-         * etc, in here. Note that currently we can't tell whether or not</div><div class='del'>-         * a handler handles the interrupt, though.</div><div class='del'>-         */</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t hp300_badint(int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	num_spurious += 1;</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t (*hp300_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {</div><div class='del'>-	[0] = hp300_badint,</div><div class='del'>-	[1] = hp300_int_handler,</div><div class='del'>-	[2] = hp300_int_handler,</div><div class='del'>-	[3] = hp300_int_handler,</div><div class='del'>-	[4] = hp300_int_handler,</div><div class='del'>-	[5] = hp300_int_handler,</div><div class='del'>-	[6] = hp300_int_handler,</div><div class='del'>-	[7] = hp300_int_handler</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* dev_id had better be unique to each handler because it's the only way we have</div><div class='del'>- * to distinguish handlers when removing them...</div><div class='del'>- *</div><div class='del'>- * It would be pretty easy to support IRQ_FLG_LOCK (handler is not replacable)</div><div class='del'>- * and IRQ_FLG_REPLACE (handler replaces existing one with this dev_id)</div><div class='del'>- * if we wanted to. IRQ_FLG_FAST is needed for devices where interrupt latency</div><div class='del'>- * matters (eg the dreaded FIFOless UART...)</div><div class='del'>- */</div><div class='del'>-int hp300_request_irq(unsigned int irq,</div><div class='del'>-                      irqreturn_t (*handler) (int, void *, struct pt_regs *),</div><div class='del'>-                      unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-        irq_node_t *t, *n = new_irq_node();</div><div class='del'>-</div><div class='del'>-        if (!n)                                   /* oops, no free nodes */</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irqlist_lock, flags);</div><div class='del'>-</div><div class='del'>-        if (!hp300_irq_list[irq]) {</div><div class='del'>-                /* no list yet */</div><div class='del'>-                hp300_irq_list[irq] = n;</div><div class='del'>-                n-&gt;next = NULL;</div><div class='del'>-        } else if (flags &amp; IRQ_FLG_FAST) {</div><div class='del'>-                /* insert at head of list */</div><div class='del'>-                n-&gt;next = hp300_irq_list[irq];</div><div class='del'>-                hp300_irq_list[irq] = n;</div><div class='del'>-        } else {</div><div class='del'>-                /* insert at end of list */</div><div class='del'>-                for(t = hp300_irq_list[irq]; t-&gt;next; t = t-&gt;next)</div><div class='del'>-                        /* do nothing */;</div><div class='del'>-                n-&gt;next = NULL;</div><div class='del'>-                t-&gt;next = n;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* Fill in n appropriately */</div><div class='del'>-        n-&gt;handler = handler;</div><div class='del'>-        n-&gt;flags = flags;</div><div class='del'>-        n-&gt;dev_id = dev_id;</div><div class='del'>-        n-&gt;devname = devname;</div><div class='del'>-	spin_unlock_irqrestore(&amp;irqlist_lock, flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hp300_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-        irq_node_t *t;</div><div class='del'>-        unsigned long flags;</div><div class='del'>-</div><div class='del'>-        spin_lock_irqsave(&amp;irqlist_lock, flags);</div><div class='del'>-</div><div class='del'>-        t = hp300_irq_list[irq];</div><div class='del'>-        if (!t)                                   /* no handlers at all for that IRQ */</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR "hp300_free_irq: attempt to remove nonexistent handler for IRQ %d\n", irq);</div><div class='del'>-                spin_unlock_irqrestore(&amp;irqlist_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (t-&gt;dev_id == dev_id)</div><div class='del'>-        {                                         /* removing first handler on chain */</div><div class='del'>-                t-&gt;flags = IRQ_FLG_STD;           /* we probably don't really need these */</div><div class='del'>-                t-&gt;dev_id = NULL;</div><div class='del'>-                t-&gt;devname = NULL;</div><div class='del'>-                t-&gt;handler = NULL;                /* frees this irq_node_t */</div><div class='del'>-                hp300_irq_list[irq] = t-&gt;next;</div><div class='del'>-		spin_unlock_irqrestore(&amp;irqlist_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* OK, must be removing from middle of the chain */</div><div class='del'>-</div><div class='del'>-        for (t = hp300_irq_list[irq]; t-&gt;next &amp;&amp; t-&gt;next-&gt;dev_id != dev_id; t = t-&gt;next)</div><div class='del'>-                /* do nothing */;</div><div class='del'>-        if (!t-&gt;next)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR "hp300_free_irq: attempt to remove nonexistent handler for IRQ %d\n", irq);</div><div class='del'>-		spin_unlock_irqrestore(&amp;irqlist_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-        }</div><div class='del'>-        /* remove the entry after t: */</div><div class='del'>-        t-&gt;next-&gt;flags = IRQ_FLG_STD;</div><div class='del'>-        t-&gt;next-&gt;dev_id = NULL;</div><div class='del'>-	t-&gt;next-&gt;devname = NULL;</div><div class='del'>-	t-&gt;next-&gt;handler = NULL;</div><div class='del'>-        t-&gt;next = t-&gt;next-&gt;next;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;irqlist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int show_hp300_interrupts(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init hp300_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	spin_lock_init(&amp;irqlist_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/m68k/hp300/ints.h b/arch/m68k/hp300/ints.h<br/>deleted file mode 100644<br/>index 8cfabe2f3840..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/hp300/ints.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/ints.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-extern void hp300_init_IRQ(void);</div><div class='del'>-extern void (*hp300_handlers[8])(int, void *, struct pt_regs *);</div><div class='del'>-extern void hp300_free_irq(unsigned int irq, void *dev_id);</div><div class='del'>-extern int hp300_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler) (int, void *, struct pt_regs *),</div><div class='del'>-		unsigned long flags, const char *devname, void *dev_id);</div><div class='del'>-</div><div class='del'>-/* number of interrupts, includes 0 (what's that?) */</div><div class='del'>-#define HP300_NUM_IRQS 8</div><div class='head'>diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c<br/>index 8da5b1b31e61..7df05662b277 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/hp300/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/hp300/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/hp300/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/hp300/time.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/blinken.h&gt;</div><div class='del'>-#include "ints.h"</div><div class='ctx'> </div><div class='ctx'> /* Clock hardware definitions */</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +70,7 @@ void __init hp300_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *</div><div class='ctx'> </div><div class='ctx'>   asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));</div><div class='ctx'> </div><div class='del'>-  cpu_request_irq(6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);</div><div class='add'>+  request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector);</div><div class='ctx'> </div><div class='ctx'>   out_8(CLOCKBASE + CLKCR2, 0x1);		/* select CR1 */</div><div class='ctx'>   out_8(CLOCKBASE + CLKCR1, 0x40);		/* enable irq */</div><div class='head'>diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile<br/>index 458925c471a1..dae609797dc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/Makefile</a></div><div class='hunk'>@@ -9,8 +9,8 @@ else</div><div class='ctx'> endif</div><div class='ctx'> extra-y	+= vmlinux.lds</div><div class='ctx'> </div><div class='del'>-obj-y		:= entry.o process.o traps.o ints.o signal.o ptrace.o \</div><div class='del'>-			sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o</div><div class='add'>+obj-y	:= entry.o process.o traps.o ints.o dma.o signal.o ptrace.o \</div><div class='add'>+	   sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCI)	+= bios32.o</div><div class='ctx'> obj-$(CONFIG_MODULES)	+= module.o</div><div class='head'>diff --git a/arch/m68k/kernel/bios32.c b/arch/m68k/kernel/bios32.c<br/>index a901685eb6a9..af170c2be735 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/bios32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/bios32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/bios32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/bios32.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Based on the DEC Alpha bios32.c by Dave Rusling and David Mosberger.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c<br/>new file mode 100644<br/>index 000000000000..fc449f8b2045<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/dma.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/pgalloc.h&gt;</div><div class='add'>+#include &lt;asm/scatterlist.h&gt;</div><div class='add'>+</div><div class='add'>+void *dma_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+			 dma_addr_t *handle, int flag)</div><div class='add'>+{</div><div class='add'>+	struct page *page, **map;</div><div class='add'>+	pgprot_t pgprot;</div><div class='add'>+	void *addr;</div><div class='add'>+	int i, order;</div><div class='add'>+</div><div class='add'>+	pr_debug("dma_alloc_coherent: %d,%x\n", size, flag);</div><div class='add'>+</div><div class='add'>+	size = PAGE_ALIGN(size);</div><div class='add'>+	order = get_order(size);</div><div class='add'>+</div><div class='add'>+	page = alloc_pages(flag, order);</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*handle = page_to_phys(page);</div><div class='add'>+	map = kmalloc(sizeof(struct page *) &lt;&lt; order, flag &amp; ~__GFP_DMA);</div><div class='add'>+	if (!map) {</div><div class='add'>+		__free_pages(page, order);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	split_page(page, order);</div><div class='add'>+</div><div class='add'>+	order = 1 &lt;&lt; order;</div><div class='add'>+	size &gt;&gt;= PAGE_SHIFT;</div><div class='add'>+	map[0] = page;</div><div class='add'>+	for (i = 1; i &lt; size; i++)</div><div class='add'>+		map[i] = page + i;</div><div class='add'>+	for (; i &lt; order; i++)</div><div class='add'>+		__free_page(page + i);</div><div class='add'>+	pgprot = __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);</div><div class='add'>+	if (CPU_IS_040_OR_060)</div><div class='add'>+		pgprot_val(pgprot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S;</div><div class='add'>+	else</div><div class='add'>+		pgprot_val(pgprot) |= _PAGE_NOCACHE030;</div><div class='add'>+	addr = vmap(map, size, flag, pgprot);</div><div class='add'>+	kfree(map);</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_alloc_coherent);</div><div class='add'>+</div><div class='add'>+void dma_free_coherent(struct device *dev, size_t size,</div><div class='add'>+		       void *addr, dma_addr_t handle)</div><div class='add'>+{</div><div class='add'>+	pr_debug("dma_free_coherent: %p, %x\n", addr, handle);</div><div class='add'>+	vfree(addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_free_coherent);</div><div class='add'>+</div><div class='add'>+inline void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size,</div><div class='add'>+				       enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	switch (dir) {</div><div class='add'>+	case DMA_TO_DEVICE:</div><div class='add'>+		cache_push(handle, size);</div><div class='add'>+		break;</div><div class='add'>+	case DMA_FROM_DEVICE:</div><div class='add'>+		cache_clear(handle, size);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (printk_ratelimit())</div><div class='add'>+			printk("dma_sync_single_for_device: unsupported dir %u\n", dir);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_single_for_device);</div><div class='add'>+</div><div class='add'>+void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,</div><div class='add'>+			    enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nents; sg++, i++)</div><div class='add'>+		dma_sync_single_for_device(dev, sg-&gt;dma_address, sg-&gt;length, dir);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_sync_sg_for_device);</div><div class='add'>+</div><div class='add'>+dma_addr_t dma_map_single(struct device *dev, void *addr, size_t size,</div><div class='add'>+			  enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t handle = virt_to_bus(addr);</div><div class='add'>+</div><div class='add'>+	dma_sync_single_for_device(dev, handle, size, dir);</div><div class='add'>+	return handle;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_single);</div><div class='add'>+</div><div class='add'>+dma_addr_t dma_map_page(struct device *dev, struct page *page,</div><div class='add'>+			unsigned long offset, size_t size,</div><div class='add'>+			enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t handle = page_to_phys(page) + offset;</div><div class='add'>+</div><div class='add'>+	dma_sync_single_for_device(dev, handle, size, dir);</div><div class='add'>+	return handle;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_page);</div><div class='add'>+</div><div class='add'>+int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,</div><div class='add'>+	       enum dma_data_direction dir)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nents; sg++, i++) {</div><div class='add'>+		sg-&gt;dma_address = page_to_phys(sg-&gt;page) + sg-&gt;offset;</div><div class='add'>+		dma_sync_single_for_device(dev, sg-&gt;dma_address, sg-&gt;length, dir);</div><div class='add'>+	}</div><div class='add'>+	return nents;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dma_map_sg);</div><div class='head'>diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S<br/>index 320fde05dc63..9083c8b7659f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/entry.S</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *		 for 68040</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/entry.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -45,9 +44,11 @@</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='ctx'> .globl system_call, buserr, trap, resume</div><div class='del'>-.globl inthandler, sys_call_table</div><div class='add'>+.globl sys_call_table</div><div class='ctx'> .globl sys_fork, sys_clone, sys_vfork</div><div class='ctx'> .globl ret_from_interrupt, bad_interrupt</div><div class='add'>+.globl auto_irqhandler_fixup</div><div class='add'>+.globl user_irqvec_fixup, user_irqhandler_fixup</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='ctx'> ENTRY(buserr)</div><div class='hunk'>@@ -191,65 +192,29 @@ do_delayed_trace:</div><div class='ctx'> 	jbra	resume_userspace</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-#ifdef CONFIG_AMIGA</div><div class='del'>-ami_inthandler:</div><div class='del'>-	addql	#1,irq_stat+CPUSTAT_LOCAL_IRQ_COUNT</div><div class='del'>-	SAVE_ALL_INT</div><div class='del'>-	GET_CURRENT(%d0)</div><div class='add'>+/* This is the main interrupt handler for autovector interrupts */</div><div class='ctx'> </div><div class='del'>-	bfextu	%sp@(PT_VECTOR){#4,#12},%d0</div><div class='del'>-	movel	%d0,%a0</div><div class='del'>-	addql	#1,%a0@(kstat+STAT_IRQ-VECOFF(VEC_SPUR))</div><div class='del'>-	movel	%a0@(autoirq_list-VECOFF(VEC_SPUR)),%a0</div><div class='del'>-</div><div class='del'>-| amiga vector int handler get the req mask instead of irq vector</div><div class='del'>-	lea	CUSTOMBASE,%a1</div><div class='del'>-	movew	%a1@(C_INTREQR),%d0</div><div class='del'>-	andw	%a1@(C_INTENAR),%d0</div><div class='del'>-</div><div class='del'>-| prepare stack (push frame pointer, dev_id &amp; req mask)</div><div class='del'>-	pea	%sp@</div><div class='del'>-	movel	%a0@(IRQ_DEVID),%sp@-</div><div class='del'>-	movel	%d0,%sp@-</div><div class='del'>-	pea	%pc@(ret_from_interrupt:w)</div><div class='del'>-	jbra	@(IRQ_HANDLER,%a0)@(0)</div><div class='del'>-</div><div class='del'>-ENTRY(nmi_handler)</div><div class='del'>-	rte</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This is the main interrupt handler, responsible for calling process_int()</div><div class='del'>-*/</div><div class='del'>-inthandler:</div><div class='add'>+ENTRY(auto_inthandler)</div><div class='ctx'> 	SAVE_ALL_INT</div><div class='ctx'> 	GET_CURRENT(%d0)</div><div class='del'>-	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+2)</div><div class='add'>+	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='ctx'> 					|  put exception # in d0</div><div class='del'>-	bfextu %sp@(PT_VECTOR){#4,#10},%d0</div><div class='add'>+	bfextu	%sp@(PT_VECTOR){#4,#10},%d0</div><div class='add'>+	subw	#VEC_SPUR,%d0</div><div class='ctx'> </div><div class='ctx'> 	movel	%sp,%sp@-</div><div class='ctx'> 	movel	%d0,%sp@-		|  put vector # on stack</div><div class='del'>-#if defined(MACH_Q40_ONLY) &amp;&amp; defined(CONFIG_BLK_DEV_FD)</div><div class='del'>-	btstb	#4,0xff000000		| Q40 floppy needs very special treatment ...</div><div class='del'>-	jbeq	1f</div><div class='del'>-	btstb	#3,0xff000004</div><div class='del'>-	jbeq	1f</div><div class='del'>-	jbsr	floppy_hardint</div><div class='del'>-	jbra	3f</div><div class='del'>-1:</div><div class='del'>-#endif</div><div class='del'>-	jbsr	process_int		|  process the IRQ</div><div class='del'>-3:	addql	#8,%sp			|  pop parameters off stack</div><div class='add'>+auto_irqhandler_fixup = . + 2</div><div class='add'>+	jsr	m68k_handle_int		|  process the IRQ</div><div class='add'>+	addql	#8,%sp			|  pop parameters off stack</div><div class='ctx'> </div><div class='ctx'> ret_from_interrupt:</div><div class='del'>-	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+2)</div><div class='del'>-	jeq	1f</div><div class='del'>-2:</div><div class='del'>-	RESTORE_ALL</div><div class='del'>-1:</div><div class='add'>+	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	jeq	ret_from_last_interrupt</div><div class='add'>+2:	RESTORE_ALL</div><div class='add'>+</div><div class='add'>+	ALIGN</div><div class='add'>+ret_from_last_interrupt:</div><div class='ctx'> 	moveq	#(~ALLOWINT&gt;&gt;8)&amp;0xff,%d0</div><div class='ctx'> 	andb	%sp@(PT_SR),%d0</div><div class='ctx'> 	jne	2b</div><div class='hunk'>@@ -260,12 +225,42 @@ ret_from_interrupt:</div><div class='ctx'> 	pea	ret_from_exception</div><div class='ctx'> 	jra	do_softirq</div><div class='ctx'> </div><div class='add'>+/* Handler for user defined interrupt vectors */</div><div class='add'>+</div><div class='add'>+ENTRY(user_inthandler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	GET_CURRENT(%d0)</div><div class='add'>+	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+					|  put exception # in d0</div><div class='add'>+	bfextu	%sp@(PT_VECTOR){#4,#10},%d0</div><div class='add'>+user_irqvec_fixup = . + 2</div><div class='add'>+	subw	#VEC_USER,%d0</div><div class='add'>+</div><div class='add'>+	movel	%sp,%sp@-</div><div class='add'>+	movel	%d0,%sp@-		|  put vector # on stack</div><div class='add'>+user_irqhandler_fixup = . + 2</div><div class='add'>+	jsr	m68k_handle_int		|  process the IRQ</div><div class='add'>+	addql	#8,%sp			|  pop parameters off stack</div><div class='add'>+</div><div class='add'>+	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	jeq	ret_from_last_interrupt</div><div class='add'>+	RESTORE_ALL</div><div class='ctx'> </div><div class='ctx'> /* Handler for uninitialized and spurious interrupts */</div><div class='ctx'> </div><div class='del'>-bad_interrupt:</div><div class='del'>-	addql	#1,num_spurious</div><div class='del'>-	rte</div><div class='add'>+ENTRY(bad_inthandler)</div><div class='add'>+	SAVE_ALL_INT</div><div class='add'>+	GET_CURRENT(%d0)</div><div class='add'>+	addqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+</div><div class='add'>+	movel	%sp,%sp@-</div><div class='add'>+	jsr	handle_badint</div><div class='add'>+	addql	#4,%sp</div><div class='add'>+</div><div class='add'>+	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)</div><div class='add'>+	jeq	ret_from_last_interrupt</div><div class='add'>+	RESTORE_ALL</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> ENTRY(sys_fork)</div><div class='ctx'> 	SAVE_SWITCH_STACK</div><div class='head'>diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S<br/>index 70002c146eed..6739e87fe825 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/head.S</a></div><div class='hunk'>@@ -255,7 +255,6 @@</div><div class='ctx'>  * MAC_USE_SCC_B:	Use the SCC port B (printer) for serial debug (default).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c<br/>index 514d323ad536..b33e37fb7b0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/ints.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *           which must be served                               /Roman Zippel</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -39,47 +38,40 @@</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_Q40</div><div class='ctx'> #include &lt;asm/q40ints.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern u32 auto_irqhandler_fixup[];</div><div class='add'>+extern u32 user_irqhandler_fixup[];</div><div class='add'>+extern u16 user_irqvec_fixup[];</div><div class='add'>+</div><div class='ctx'> /* table for system interrupt handlers */</div><div class='del'>-static irq_handler_t irq_list[SYS_IRQS];</div><div class='del'>-</div><div class='del'>-static const char *default_names[SYS_IRQS] = {</div><div class='del'>-	[0] = "spurious int",</div><div class='del'>-	[1] = "int1 handler",</div><div class='del'>-	[2] = "int2 handler",</div><div class='del'>-	[3] = "int3 handler",</div><div class='del'>-	[4] = "int4 handler",</div><div class='del'>-	[5] = "int5 handler",</div><div class='del'>-	[6] = "int6 handler",</div><div class='del'>-	[7] = "int7 handler"</div><div class='add'>+static struct irq_node *irq_list[NR_IRQS];</div><div class='add'>+static struct irq_controller *irq_controller[NR_IRQS];</div><div class='add'>+static int irq_depth[NR_IRQS];</div><div class='add'>+</div><div class='add'>+static int m68k_first_user_vec;</div><div class='add'>+</div><div class='add'>+static struct irq_controller auto_irq_controller = {</div><div class='add'>+	.name		= "auto",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.startup	= m68k_irq_startup,</div><div class='add'>+	.shutdown	= m68k_irq_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The number of spurious interrupts */</div><div class='del'>-volatile unsigned int num_spurious;</div><div class='add'>+static struct irq_controller user_irq_controller = {</div><div class='add'>+	.name		= "user",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.startup	= m68k_irq_startup,</div><div class='add'>+	.shutdown	= m68k_irq_shutdown,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define NUM_IRQ_NODES 100</div><div class='ctx'> static irq_node_t nodes[NUM_IRQ_NODES];</div><div class='ctx'> </div><div class='del'>-static void dummy_enable_irq(unsigned int irq);</div><div class='del'>-static void dummy_disable_irq(unsigned int irq);</div><div class='del'>-static int dummy_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler) (int, void *, struct pt_regs *),</div><div class='del'>-		unsigned long flags, const char *devname, void *dev_id);</div><div class='del'>-static void dummy_free_irq(unsigned int irq, void *dev_id);</div><div class='del'>-</div><div class='del'>-void (*enable_irq) (unsigned int) = dummy_enable_irq;</div><div class='del'>-void (*disable_irq) (unsigned int) = dummy_disable_irq;</div><div class='del'>-</div><div class='del'>-int (*mach_request_irq) (unsigned int, irqreturn_t (*)(int, void *, struct pt_regs *),</div><div class='del'>-                      unsigned long, const char *, void *) = dummy_request_irq;</div><div class='del'>-void (*mach_free_irq) (unsigned int, void *) = dummy_free_irq;</div><div class='del'>-</div><div class='del'>-void init_irq_proc(void);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * void init_IRQ(void)</div><div class='ctx'>  *</div><div class='hunk'>@@ -95,18 +87,76 @@ void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SYS_IRQS; i++) {</div><div class='del'>-		if (mach_default_handler)</div><div class='del'>-			irq_list[i].handler = (*mach_default_handler)[i];</div><div class='del'>-		irq_list[i].flags   = 0;</div><div class='del'>-		irq_list[i].dev_id  = NULL;</div><div class='del'>-		irq_list[i].devname = default_names[i];</div><div class='add'>+	/* assembly irq entry code relies on this... */</div><div class='add'>+	if (HARDIRQ_MASK != 0x00ff0000) {</div><div class='add'>+		extern void hardirq_mask_is_broken(void);</div><div class='add'>+		hardirq_mask_is_broken();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_IRQ_NODES; i++)</div><div class='del'>-		nodes[i].handler = NULL;</div><div class='add'>+	for (i = IRQ_AUTO_1; i &lt;= IRQ_AUTO_7; i++)</div><div class='add'>+		irq_controller[i] = &amp;auto_irq_controller;</div><div class='add'>+</div><div class='add'>+	mach_init_IRQ();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * m68k_setup_auto_interrupt</div><div class='add'>+ * @handler: called from auto vector interrupts</div><div class='add'>+ *</div><div class='add'>+ * setup the handler to be called from auto vector interrupts instead of the</div><div class='add'>+ * standard m68k_handle_int(), it will be called with irq numbers in the range</div><div class='add'>+ * from IRQ_AUTO_1 - IRQ_AUTO_7.</div><div class='add'>+ */</div><div class='add'>+void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *))</div><div class='add'>+{</div><div class='add'>+	if (handler)</div><div class='add'>+		*auto_irqhandler_fixup = (u32)handler;</div><div class='add'>+	flush_icache();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * m68k_setup_user_interrupt</div><div class='add'>+ * @vec: first user vector interrupt to handle</div><div class='add'>+ * @cnt: number of active user vector interrupts</div><div class='add'>+ * @handler: called from user vector interrupts</div><div class='add'>+ *</div><div class='add'>+ * setup user vector interrupts, this includes activating the specified range</div><div class='add'>+ * of interrupts, only then these interrupts can be requested (note: this is</div><div class='add'>+ * different from auto vector interrupts). An optional handler can be installed</div><div class='add'>+ * to be called instead of the default m68k_handle_int(), it will be called</div><div class='add'>+ * with irq numbers starting from IRQ_USER.</div><div class='add'>+ */</div><div class='add'>+void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,</div><div class='add'>+				      void (*handler)(unsigned int, struct pt_regs *))</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	m68k_first_user_vec = vec;</div><div class='add'>+	for (i = 0; i &lt; cnt; i++)</div><div class='add'>+		irq_controller[IRQ_USER + i] = &amp;user_irq_controller;</div><div class='add'>+	*user_irqvec_fixup = vec - IRQ_USER;</div><div class='add'>+	if (handler)</div><div class='add'>+		*user_irqhandler_fixup = (u32)handler;</div><div class='add'>+	flush_icache();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * m68k_setup_irq_controller</div><div class='add'>+ * @contr: irq controller which controls specified irq</div><div class='add'>+ * @irq: first irq to be managed by the controller</div><div class='add'>+ *</div><div class='add'>+ * Change the controller for the specified range of irq, which will be used to</div><div class='add'>+ * manage these irq. auto/user irq already have a default controller, which can</div><div class='add'>+ * be changed as well, but the controller probably should use m68k_irq_startup/</div><div class='add'>+ * m68k_irq_shutdown.</div><div class='add'>+ */</div><div class='add'>+void m68k_setup_irq_controller(struct irq_controller *contr, unsigned int irq,</div><div class='add'>+			       unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	mach_init_IRQ ();</div><div class='add'>+	for (i = 0; i &lt; cnt; i++)</div><div class='add'>+		irq_controller[irq + i] = contr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irq_node_t *new_irq_node(void)</div><div class='hunk'>@@ -114,84 +164,183 @@ irq_node_t *new_irq_node(void)</div><div class='ctx'> 	irq_node_t *node;</div><div class='ctx'> 	short i;</div><div class='ctx'> </div><div class='del'>-	for (node = nodes, i = NUM_IRQ_NODES-1; i &gt;= 0; node++, i--)</div><div class='del'>-		if (!node-&gt;handler)</div><div class='add'>+	for (node = nodes, i = NUM_IRQ_NODES-1; i &gt;= 0; node++, i--) {</div><div class='add'>+		if (!node-&gt;handler) {</div><div class='add'>+			memset(node, 0, sizeof(*node));</div><div class='ctx'> 			return node;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	printk ("new_irq_node: out of nodes\n");</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We will keep these functions until I have convinced Linus to move</div><div class='del'>- * the declaration of them from include/linux/sched.h to</div><div class='del'>- * include/asm/irq.h.</div><div class='del'>- */</div><div class='add'>+int setup_irq(unsigned int irq, struct irq_node *node)</div><div class='add'>+{</div><div class='add'>+	struct irq_controller *contr;</div><div class='add'>+	struct irq_node **prev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= NR_IRQS || !(contr = irq_controller[irq])) {</div><div class='add'>+		printk("%s: Incorrect IRQ %d from %s\n",</div><div class='add'>+		       __FUNCTION__, irq, node-&gt;devname);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;contr-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	prev = irq_list + irq;</div><div class='add'>+	if (*prev) {</div><div class='add'>+		/* Can't share interrupts unless both agree to */</div><div class='add'>+		if (!((*prev)-&gt;flags &amp; node-&gt;flags &amp; IRQF_SHARED)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;contr-&gt;lock, flags);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		while (*prev)</div><div class='add'>+			prev = &amp;(*prev)-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!irq_list[irq]) {</div><div class='add'>+		if (contr-&gt;startup)</div><div class='add'>+			contr-&gt;startup(irq);</div><div class='add'>+		else</div><div class='add'>+			contr-&gt;enable(irq);</div><div class='add'>+	}</div><div class='add'>+	node-&gt;next = NULL;</div><div class='add'>+	*prev = node;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;contr-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int request_irq(unsigned int irq,</div><div class='ctx'> 		irqreturn_t (*handler) (int, void *, struct pt_regs *),</div><div class='ctx'> 		unsigned long flags, const char *devname, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	return mach_request_irq(irq, handler, flags, devname, dev_id);</div><div class='add'>+	struct irq_node *node;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	node = new_irq_node();</div><div class='add'>+	if (!node)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	node-&gt;handler = handler;</div><div class='add'>+	node-&gt;flags   = flags;</div><div class='add'>+	node-&gt;dev_id  = dev_id;</div><div class='add'>+	node-&gt;devname = devname;</div><div class='add'>+</div><div class='add'>+	res = setup_irq(irq, node);</div><div class='add'>+	if (res)</div><div class='add'>+		node-&gt;handler = NULL;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(request_irq);</div><div class='ctx'> </div><div class='ctx'> void free_irq(unsigned int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	mach_free_irq(irq, dev_id);</div><div class='add'>+	struct irq_controller *contr;</div><div class='add'>+	struct irq_node **p, *node;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= NR_IRQS || !(contr = irq_controller[irq])) {</div><div class='add'>+		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;contr-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	p = irq_list + irq;</div><div class='add'>+	while ((node = *p)) {</div><div class='add'>+		if (node-&gt;dev_id == dev_id)</div><div class='add'>+			break;</div><div class='add'>+		p = &amp;node-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node) {</div><div class='add'>+		*p = node-&gt;next;</div><div class='add'>+		node-&gt;handler = NULL;</div><div class='add'>+	} else</div><div class='add'>+		printk("%s: Removing probably wrong IRQ %d\n",</div><div class='add'>+		       __FUNCTION__, irq);</div><div class='add'>+</div><div class='add'>+	if (!irq_list[irq]) {</div><div class='add'>+		if (contr-&gt;shutdown)</div><div class='add'>+			contr-&gt;shutdown(irq);</div><div class='add'>+		else</div><div class='add'>+			contr-&gt;disable(irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;contr-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(free_irq);</div><div class='ctx'> </div><div class='del'>-int cpu_request_irq(unsigned int irq,</div><div class='del'>-                    irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                    unsigned long flags, const char *devname, void *dev_id)</div><div class='add'>+void enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	if (irq &lt; IRQ1 || irq &gt; IRQ7) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d from %s\n",</div><div class='del'>-		       __FUNCTION__, irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='add'>+	struct irq_controller *contr;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	if (!(irq_list[irq].flags &amp; IRQ_FLG_STD)) {</div><div class='del'>-		if (irq_list[irq].flags &amp; IRQ_FLG_LOCK) {</div><div class='del'>-			printk("%s: IRQ %d from %s is not replaceable\n",</div><div class='del'>-			       __FUNCTION__, irq, irq_list[irq].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		if (!(flags &amp; IRQ_FLG_REPLACE)) {</div><div class='del'>-			printk("%s: %s can't replace IRQ %d from %s\n",</div><div class='del'>-			       __FUNCTION__, devname, irq, irq_list[irq].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='add'>+	if (irq &gt;= NR_IRQS || !(contr = irq_controller[irq])) {</div><div class='add'>+		printk("%s: Incorrect IRQ %d\n",</div><div class='add'>+		       __FUNCTION__, irq);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	irq_list[irq].handler = handler;</div><div class='del'>-	irq_list[irq].flags   = flags;</div><div class='del'>-	irq_list[irq].dev_id  = dev_id;</div><div class='del'>-	irq_list[irq].devname = devname;</div><div class='del'>-	return 0;</div><div class='add'>+	spin_lock_irqsave(&amp;contr-&gt;lock, flags);</div><div class='add'>+	if (irq_depth[irq]) {</div><div class='add'>+		if (!--irq_depth[irq]) {</div><div class='add'>+			if (contr-&gt;enable)</div><div class='add'>+				contr-&gt;enable(irq);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+	spin_unlock_irqrestore(&amp;contr-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void cpu_free_irq(unsigned int irq, void *dev_id)</div><div class='add'>+EXPORT_SYMBOL(enable_irq);</div><div class='add'>+</div><div class='add'>+void disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	if (irq &lt; IRQ1 || irq &gt; IRQ7) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);</div><div class='add'>+	struct irq_controller *contr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= NR_IRQS || !(contr = irq_controller[irq])) {</div><div class='add'>+		printk("%s: Incorrect IRQ %d\n",</div><div class='add'>+		       __FUNCTION__, irq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (irq_list[irq].dev_id != dev_id)</div><div class='del'>-		printk("%s: Removing probably wrong IRQ %d from %s\n",</div><div class='del'>-		       __FUNCTION__, irq, irq_list[irq].devname);</div><div class='add'>+	spin_lock_irqsave(&amp;contr-&gt;lock, flags);</div><div class='add'>+	if (!irq_depth[irq]++) {</div><div class='add'>+		if (contr-&gt;disable)</div><div class='add'>+			contr-&gt;disable(irq);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;contr-&gt;lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	irq_list[irq].handler = (*mach_default_handler)[irq];</div><div class='del'>-	irq_list[irq].flags   = 0;</div><div class='del'>-	irq_list[irq].dev_id  = NULL;</div><div class='del'>-	irq_list[irq].devname = default_names[irq];</div><div class='add'>+EXPORT_SYMBOL(disable_irq);</div><div class='add'>+</div><div class='add'>+int m68k_irq_startup(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt;= IRQ_AUTO_7)</div><div class='add'>+		vectors[VEC_SPUR + irq] = auto_inthandler;</div><div class='add'>+	else</div><div class='add'>+		vectors[m68k_first_user_vec + irq - IRQ_USER] = user_inthandler;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void m68k_irq_shutdown(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (irq &lt;= IRQ_AUTO_7)</div><div class='add'>+		vectors[VEC_SPUR + irq] = bad_inthandler;</div><div class='add'>+	else</div><div class='add'>+		vectors[m68k_first_user_vec + irq - IRQ_USER] = bad_inthandler;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Do we need these probe functions on the m68k?</div><div class='ctx'>  *</div><div class='hunk'>@@ -219,58 +368,50 @@ int probe_irq_off (unsigned long irqs)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(probe_irq_off);</div><div class='ctx'> </div><div class='del'>-static void dummy_enable_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	printk("calling uninitialized enable_irq()\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dummy_disable_irq(unsigned int irq)</div><div class='add'>+unsigned int irq_canonicalize(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	printk("calling uninitialized disable_irq()\n");</div><div class='add'>+#ifdef CONFIG_Q40</div><div class='add'>+	if (MACH_IS_Q40 &amp;&amp; irq == 11)</div><div class='add'>+		irq = 10;</div><div class='add'>+#endif</div><div class='add'>+	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dummy_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler) (int, void *, struct pt_regs *),</div><div class='del'>-		unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	printk("calling uninitialized request_irq()\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+EXPORT_SYMBOL(irq_canonicalize);</div><div class='ctx'> </div><div class='del'>-static void dummy_free_irq(unsigned int irq, void *dev_id)</div><div class='add'>+asmlinkage void m68k_handle_int(unsigned int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	printk("calling uninitialized disable_irq()\n");</div><div class='add'>+	struct irq_node *node;</div><div class='add'>+</div><div class='add'>+	kstat_cpu(0).irqs[irq]++;</div><div class='add'>+	node = irq_list[irq];</div><div class='add'>+	do {</div><div class='add'>+		node-&gt;handler(irq, node-&gt;dev_id, regs);</div><div class='add'>+		node = node-&gt;next;</div><div class='add'>+	} while (node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)</div><div class='add'>+asmlinkage void handle_badint(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	if (vec &gt;= VEC_INT1 &amp;&amp; vec &lt;= VEC_INT7 &amp;&amp; !MACH_IS_BVME6000) {</div><div class='del'>-		vec -= VEC_SPUR;</div><div class='del'>-		kstat_cpu(0).irqs[vec]++;</div><div class='del'>-		irq_list[vec].handler(vec, irq_list[vec].dev_id, fp);</div><div class='del'>-	} else {</div><div class='del'>-		if (mach_process_int)</div><div class='del'>-			mach_process_int(vec, fp);</div><div class='del'>-		else</div><div class='del'>-			panic("Can't process interrupt vector %ld\n", vec);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	kstat_cpu(0).irqs[0]++;</div><div class='add'>+	printk("unexpected interrupt from %u\n", regs-&gt;vector);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> {</div><div class='add'>+	struct irq_controller *contr;</div><div class='add'>+	struct irq_node *node;</div><div class='ctx'> 	int i = *(loff_t *) v;</div><div class='ctx'> </div><div class='ctx'> 	/* autovector interrupts */</div><div class='del'>-	if (i &lt; SYS_IRQS) {</div><div class='del'>-		if (mach_default_handler) {</div><div class='del'>-			seq_printf(p, "auto %2d: %10u ", i,</div><div class='del'>-			               i ? kstat_cpu(0).irqs[i] : num_spurious);</div><div class='del'>-			seq_puts(p, "  ");</div><div class='del'>-			seq_printf(p, "%s\n", irq_list[i].devname);</div><div class='del'>-		}</div><div class='del'>-	} else if (i == SYS_IRQS)</div><div class='del'>-		mach_get_irq_list(p, v);</div><div class='add'>+	if (irq_list[i]) {</div><div class='add'>+		contr = irq_controller[i];</div><div class='add'>+		node = irq_list[i];</div><div class='add'>+		seq_printf(p, "%-8s %3u: %10u %s", contr-&gt;name, i, kstat_cpu(0).irqs[i], node-&gt;devname);</div><div class='add'>+		while ((node = node-&gt;next))</div><div class='add'>+			seq_printf(p, ", %s", node-&gt;devname);</div><div class='add'>+		seq_puts(p, "\n");</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c<br/>index 5b7952ea2bae..aff26a52167c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/m68k_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/m68k_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/m68k_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/m68k_ksyms.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='hunk'>@@ -57,8 +56,6 @@ EXPORT_SYMBOL(dump_thread);</div><div class='ctx'> EXPORT_SYMBOL(strnlen);</div><div class='ctx'> EXPORT_SYMBOL(strrchr);</div><div class='ctx'> EXPORT_SYMBOL(strstr);</div><div class='del'>-EXPORT_SYMBOL(enable_irq);</div><div class='del'>-EXPORT_SYMBOL(disable_irq);</div><div class='ctx'> EXPORT_SYMBOL(kernel_thread);</div><div class='ctx'> #ifdef CONFIG_VME</div><div class='ctx'> EXPORT_SYMBOL(vme_brdtype);</div><div class='head'>diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c<br/>index 33648efb772e..45a46646c1b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/process.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c<br/>index 540638ca81f9..ef89060ea328 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/semaphore.c b/arch/m68k/kernel/semaphore.c<br/>index 1ebb79baaa8c..d12cbbfe6ebd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/semaphore.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * specific changes in &lt;asm/semaphore-helper.h&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore-helper.h&gt;</div><div class='head'>diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c<br/>index 750d5b3c971f..f2d7ee0ee18c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of system setup</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -68,11 +67,8 @@ char m68k_debug_device[6] = "";</div><div class='ctx'> void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *)) __initdata = NULL;</div><div class='ctx'> /* machine dependent irq functions */</div><div class='ctx'> void (*mach_init_IRQ) (void) __initdata = NULL;</div><div class='del'>-irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *);</div><div class='ctx'> void (*mach_get_model) (char *model);</div><div class='ctx'> int (*mach_get_hardware_list) (char *buffer);</div><div class='del'>-int (*mach_get_irq_list) (struct seq_file *, void *);</div><div class='del'>-irqreturn_t (*mach_process_int) (int, struct pt_regs *);</div><div class='ctx'> /* machine dependent timer functions */</div><div class='ctx'> unsigned long (*mach_gettimeoffset) (void);</div><div class='ctx'> int (*mach_hwclk) (int, struct rtc_time*);</div><div class='head'>diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c<br/>index 866917bfa028..f9af893cd289 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/signal.c</a></div><div class='hunk'>@@ -763,7 +763,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='ctx'> </div><div class='ctx'> 	/* This is the X/Open sanctioned signal stack switching.  */</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_ONSTACK) {</div><div class='del'>-		if (!on_sig_stack(usp))</div><div class='add'>+		if (!sas_ss_flags(usp))</div><div class='ctx'> 			usp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return (void __user *)((usp - frame_size) &amp; -8UL);</div><div class='head'>diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c<br/>index cdf58fbb3e73..4569406a2e1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/traps.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * Sets up all exception vectors</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -45,7 +44,6 @@</div><div class='ctx'> asmlinkage void system_call(void);</div><div class='ctx'> asmlinkage void buserr(void);</div><div class='ctx'> asmlinkage void trap(void);</div><div class='del'>-asmlinkage void inthandler(void);</div><div class='ctx'> asmlinkage void nmihandler(void);</div><div class='ctx'> #ifdef CONFIG_M68KFPU_EMU</div><div class='ctx'> asmlinkage void fpu_emu(void);</div><div class='hunk'>@@ -53,51 +51,7 @@ asmlinkage void fpu_emu(void);</div><div class='ctx'> </div><div class='ctx'> e_vector vectors[256] = {</div><div class='ctx'> 	[VEC_BUSERR]	= buserr,</div><div class='del'>-	[VEC_ADDRERR]	= trap,</div><div class='del'>-	[VEC_ILLEGAL]	= trap,</div><div class='del'>-	[VEC_ZERODIV]	= trap,</div><div class='del'>-	[VEC_CHK]	= trap,</div><div class='del'>-	[VEC_TRAP]	= trap,</div><div class='del'>-	[VEC_PRIV]	= trap,</div><div class='del'>-	[VEC_TRACE]	= trap,</div><div class='del'>-	[VEC_LINE10]	= trap,</div><div class='del'>-	[VEC_LINE11]	= trap,</div><div class='del'>-	[VEC_RESV12]	= trap,</div><div class='del'>-	[VEC_COPROC]	= trap,</div><div class='del'>-	[VEC_FORMAT]	= trap,</div><div class='del'>-	[VEC_UNINT]	= trap,</div><div class='del'>-	[VEC_RESV16]	= trap,</div><div class='del'>-	[VEC_RESV17]	= trap,</div><div class='del'>-	[VEC_RESV18]	= trap,</div><div class='del'>-	[VEC_RESV19]	= trap,</div><div class='del'>-	[VEC_RESV20]	= trap,</div><div class='del'>-	[VEC_RESV21]	= trap,</div><div class='del'>-	[VEC_RESV22]	= trap,</div><div class='del'>-	[VEC_RESV23]	= trap,</div><div class='del'>-	[VEC_SPUR]	= inthandler,</div><div class='del'>-	[VEC_INT1]	= inthandler,</div><div class='del'>-	[VEC_INT2]	= inthandler,</div><div class='del'>-	[VEC_INT3]	= inthandler,</div><div class='del'>-	[VEC_INT4]	= inthandler,</div><div class='del'>-	[VEC_INT5]	= inthandler,</div><div class='del'>-	[VEC_INT6]	= inthandler,</div><div class='del'>-	[VEC_INT7]	= inthandler,</div><div class='ctx'> 	[VEC_SYS]	= system_call,</div><div class='del'>-	[VEC_TRAP1]	= trap,</div><div class='del'>-	[VEC_TRAP2]	= trap,</div><div class='del'>-	[VEC_TRAP3]	= trap,</div><div class='del'>-	[VEC_TRAP4]	= trap,</div><div class='del'>-	[VEC_TRAP5]	= trap,</div><div class='del'>-	[VEC_TRAP6]	= trap,</div><div class='del'>-	[VEC_TRAP7]	= trap,</div><div class='del'>-	[VEC_TRAP8]	= trap,</div><div class='del'>-	[VEC_TRAP9]	= trap,</div><div class='del'>-	[VEC_TRAP10]	= trap,</div><div class='del'>-	[VEC_TRAP11]	= trap,</div><div class='del'>-	[VEC_TRAP12]	= trap,</div><div class='del'>-	[VEC_TRAP13]	= trap,</div><div class='del'>-	[VEC_TRAP14]	= trap,</div><div class='del'>-	[VEC_TRAP15]	= trap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* nmi handler for the Amiga */</div><div class='hunk'>@@ -114,7 +68,7 @@ void __init base_trap_init(void)</div><div class='ctx'> 	if(MACH_IS_SUN3X) {</div><div class='ctx'> 		extern e_vector *sun3x_prom_vbr;</div><div class='ctx'> </div><div class='del'>-		__asm__ volatile ("movec %%vbr, %0" : "=r" ((void*)sun3x_prom_vbr));</div><div class='add'>+		__asm__ volatile ("movec %%vbr, %0" : "=r" (sun3x_prom_vbr));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup the exception vector table */</div><div class='hunk'>@@ -132,12 +86,15 @@ void __init trap_init (void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 48; i &lt; 64; i++)</div><div class='add'>+	for (i = VEC_SPUR; i &lt;= VEC_INT7; i++)</div><div class='add'>+		vectors[i] = bad_inthandler;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VEC_USER; i++)</div><div class='ctx'> 		if (!vectors[i])</div><div class='ctx'> 			vectors[i] = trap;</div><div class='ctx'> </div><div class='del'>-	for (i = 64; i &lt; 256; i++)</div><div class='del'>-		vectors[i] = inthandler;</div><div class='add'>+	for (i = VEC_USER; i &lt; 256; i++)</div><div class='add'>+		vectors[i] = bad_inthandler;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_M68KFPU_EMU</div><div class='ctx'> 	if (FPU_IS_EMU)</div><div class='hunk'>@@ -927,71 +884,94 @@ void show_trace(unsigned long *stack)</div><div class='ctx'> void show_registers(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct frame *fp = (struct frame *)regs;</div><div class='add'>+	mm_segment_t old_fs = get_fs();</div><div class='add'>+	u16 c, *cp;</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	print_modules();</div><div class='add'>+	printk("PC: [&lt;%08lx&gt;]",regs-&gt;pc);</div><div class='add'>+	print_symbol(" %s", regs-&gt;pc);</div><div class='add'>+	printk("\nSR: %04x  SP: %p  a2: %08lx\n",</div><div class='add'>+	       regs-&gt;sr, regs, regs-&gt;a2);</div><div class='add'>+	printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",</div><div class='add'>+	       regs-&gt;d0, regs-&gt;d1, regs-&gt;d2, regs-&gt;d3);</div><div class='add'>+	printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",</div><div class='add'>+	       regs-&gt;d4, regs-&gt;d5, regs-&gt;a0, regs-&gt;a1);</div><div class='add'>+</div><div class='add'>+	printk("Process %s (pid: %d, task=%p)\n",</div><div class='add'>+		current-&gt;comm, current-&gt;pid, current);</div><div class='ctx'> 	addr = (unsigned long)&amp;fp-&gt;un;</div><div class='del'>-	printk("Frame format=%X ", fp-&gt;ptregs.format);</div><div class='del'>-	switch (fp-&gt;ptregs.format) {</div><div class='add'>+	printk("Frame format=%X ", regs-&gt;format);</div><div class='add'>+	switch (regs-&gt;format) {</div><div class='ctx'> 	case 0x2:</div><div class='del'>-	    printk("instr addr=%08lx\n", fp-&gt;un.fmt2.iaddr);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmt2);</div><div class='del'>-	    break;</div><div class='add'>+		printk("instr addr=%08lx\n", fp-&gt;un.fmt2.iaddr);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmt2);</div><div class='add'>+		break;</div><div class='ctx'> 	case 0x3:</div><div class='del'>-	    printk("eff addr=%08lx\n", fp-&gt;un.fmt3.effaddr);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmt3);</div><div class='del'>-	    break;</div><div class='add'>+		printk("eff addr=%08lx\n", fp-&gt;un.fmt3.effaddr);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmt3);</div><div class='add'>+		break;</div><div class='ctx'> 	case 0x4:</div><div class='del'>-	    printk((CPU_IS_060 ? "fault addr=%08lx fslw=%08lx\n"</div><div class='del'>-		    : "eff addr=%08lx pc=%08lx\n"),</div><div class='del'>-		   fp-&gt;un.fmt4.effaddr, fp-&gt;un.fmt4.pc);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmt4);</div><div class='del'>-	    break;</div><div class='add'>+		printk((CPU_IS_060 ? "fault addr=%08lx fslw=%08lx\n"</div><div class='add'>+			: "eff addr=%08lx pc=%08lx\n"),</div><div class='add'>+			fp-&gt;un.fmt4.effaddr, fp-&gt;un.fmt4.pc);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmt4);</div><div class='add'>+		break;</div><div class='ctx'> 	case 0x7:</div><div class='del'>-	    printk("eff addr=%08lx ssw=%04x faddr=%08lx\n",</div><div class='del'>-		   fp-&gt;un.fmt7.effaddr, fp-&gt;un.fmt7.ssw, fp-&gt;un.fmt7.faddr);</div><div class='del'>-	    printk("wb 1 stat/addr/data: %04x %08lx %08lx\n",</div><div class='del'>-		   fp-&gt;un.fmt7.wb1s, fp-&gt;un.fmt7.wb1a, fp-&gt;un.fmt7.wb1dpd0);</div><div class='del'>-	    printk("wb 2 stat/addr/data: %04x %08lx %08lx\n",</div><div class='del'>-		   fp-&gt;un.fmt7.wb2s, fp-&gt;un.fmt7.wb2a, fp-&gt;un.fmt7.wb2d);</div><div class='del'>-	    printk("wb 3 stat/addr/data: %04x %08lx %08lx\n",</div><div class='del'>-		   fp-&gt;un.fmt7.wb3s, fp-&gt;un.fmt7.wb3a, fp-&gt;un.fmt7.wb3d);</div><div class='del'>-	    printk("push data: %08lx %08lx %08lx %08lx\n",</div><div class='del'>-		   fp-&gt;un.fmt7.wb1dpd0, fp-&gt;un.fmt7.pd1, fp-&gt;un.fmt7.pd2,</div><div class='del'>-		   fp-&gt;un.fmt7.pd3);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmt7);</div><div class='del'>-	    break;</div><div class='add'>+		printk("eff addr=%08lx ssw=%04x faddr=%08lx\n",</div><div class='add'>+			fp-&gt;un.fmt7.effaddr, fp-&gt;un.fmt7.ssw, fp-&gt;un.fmt7.faddr);</div><div class='add'>+		printk("wb 1 stat/addr/data: %04x %08lx %08lx\n",</div><div class='add'>+			fp-&gt;un.fmt7.wb1s, fp-&gt;un.fmt7.wb1a, fp-&gt;un.fmt7.wb1dpd0);</div><div class='add'>+		printk("wb 2 stat/addr/data: %04x %08lx %08lx\n",</div><div class='add'>+			fp-&gt;un.fmt7.wb2s, fp-&gt;un.fmt7.wb2a, fp-&gt;un.fmt7.wb2d);</div><div class='add'>+		printk("wb 3 stat/addr/data: %04x %08lx %08lx\n",</div><div class='add'>+			fp-&gt;un.fmt7.wb3s, fp-&gt;un.fmt7.wb3a, fp-&gt;un.fmt7.wb3d);</div><div class='add'>+		printk("push data: %08lx %08lx %08lx %08lx\n",</div><div class='add'>+			fp-&gt;un.fmt7.wb1dpd0, fp-&gt;un.fmt7.pd1, fp-&gt;un.fmt7.pd2,</div><div class='add'>+			fp-&gt;un.fmt7.pd3);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmt7);</div><div class='add'>+		break;</div><div class='ctx'> 	case 0x9:</div><div class='del'>-	    printk("instr addr=%08lx\n", fp-&gt;un.fmt9.iaddr);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmt9);</div><div class='del'>-	    break;</div><div class='add'>+		printk("instr addr=%08lx\n", fp-&gt;un.fmt9.iaddr);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmt9);</div><div class='add'>+		break;</div><div class='ctx'> 	case 0xa:</div><div class='del'>-	    printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",</div><div class='del'>-		   fp-&gt;un.fmta.ssw, fp-&gt;un.fmta.isc, fp-&gt;un.fmta.isb,</div><div class='del'>-		   fp-&gt;un.fmta.daddr, fp-&gt;un.fmta.dobuf);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmta);</div><div class='del'>-	    break;</div><div class='add'>+		printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",</div><div class='add'>+			fp-&gt;un.fmta.ssw, fp-&gt;un.fmta.isc, fp-&gt;un.fmta.isb,</div><div class='add'>+			fp-&gt;un.fmta.daddr, fp-&gt;un.fmta.dobuf);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmta);</div><div class='add'>+		break;</div><div class='ctx'> 	case 0xb:</div><div class='del'>-	    printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",</div><div class='del'>-		   fp-&gt;un.fmtb.ssw, fp-&gt;un.fmtb.isc, fp-&gt;un.fmtb.isb,</div><div class='del'>-		   fp-&gt;un.fmtb.daddr, fp-&gt;un.fmtb.dobuf);</div><div class='del'>-	    printk("baddr=%08lx dibuf=%08lx ver=%x\n",</div><div class='del'>-		   fp-&gt;un.fmtb.baddr, fp-&gt;un.fmtb.dibuf, fp-&gt;un.fmtb.ver);</div><div class='del'>-	    addr += sizeof(fp-&gt;un.fmtb);</div><div class='del'>-	    break;</div><div class='add'>+		printk("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n",</div><div class='add'>+			fp-&gt;un.fmtb.ssw, fp-&gt;un.fmtb.isc, fp-&gt;un.fmtb.isb,</div><div class='add'>+			fp-&gt;un.fmtb.daddr, fp-&gt;un.fmtb.dobuf);</div><div class='add'>+		printk("baddr=%08lx dibuf=%08lx ver=%x\n",</div><div class='add'>+			fp-&gt;un.fmtb.baddr, fp-&gt;un.fmtb.dibuf, fp-&gt;un.fmtb.ver);</div><div class='add'>+		addr += sizeof(fp-&gt;un.fmtb);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-	    printk("\n");</div><div class='add'>+		printk("\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	show_stack(NULL, (unsigned long *)addr);</div><div class='ctx'> </div><div class='del'>-	printk("Code: ");</div><div class='del'>-	for (i = 0; i &lt; 10; i++)</div><div class='del'>-		printk("%04x ", 0xffff &amp; ((short *) fp-&gt;ptregs.pc)[i]);</div><div class='add'>+	printk("Code:");</div><div class='add'>+	set_fs(KERNEL_DS);</div><div class='add'>+	cp = (u16 *)regs-&gt;pc;</div><div class='add'>+	for (i = -8; i &lt; 16; i++) {</div><div class='add'>+		if (get_user(c, cp + i) &amp;&amp; i &gt;= 0) {</div><div class='add'>+			printk(" Bad PC value.");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		printk(i ? " %04x" : " &lt;%04x&gt;", c);</div><div class='add'>+	}</div><div class='add'>+	set_fs(old_fs);</div><div class='ctx'> 	printk ("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='ctx'> {</div><div class='add'>+	unsigned long *p;</div><div class='ctx'> 	unsigned long *endstack;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1004,12 +984,13 @@ void show_stack(struct task_struct *task, unsigned long *stack)</div><div class='ctx'> 	endstack = (unsigned long *)(((unsigned long)stack + THREAD_SIZE - 1) &amp; -THREAD_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	printk("Stack from %08lx:", (unsigned long)stack);</div><div class='add'>+	p = stack;</div><div class='ctx'> 	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='del'>-		if (stack + 1 &gt; endstack)</div><div class='add'>+		if (p + 1 &gt; endstack)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (i % 8 == 0)</div><div class='ctx'> 			printk("\n       ");</div><div class='del'>-		printk(" %08lx", *stack++);</div><div class='add'>+		printk(" %08lx", *p++);</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> 	show_trace(stack);</div><div class='hunk'>@@ -1188,19 +1169,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)</div><div class='ctx'> </div><div class='ctx'> 	console_verbose();</div><div class='ctx'> 	printk("%s: %08x\n",str,nr);</div><div class='del'>-	print_modules();</div><div class='del'>-	printk("PC: [&lt;%08lx&gt;]",fp-&gt;pc);</div><div class='del'>-	print_symbol(" %s\n", fp-&gt;pc);</div><div class='del'>-	printk("\nSR: %04x  SP: %p  a2: %08lx\n",</div><div class='del'>-	       fp-&gt;sr, fp, fp-&gt;a2);</div><div class='del'>-	printk("d0: %08lx    d1: %08lx    d2: %08lx    d3: %08lx\n",</div><div class='del'>-	       fp-&gt;d0, fp-&gt;d1, fp-&gt;d2, fp-&gt;d3);</div><div class='del'>-	printk("d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",</div><div class='del'>-	       fp-&gt;d4, fp-&gt;d5, fp-&gt;a0, fp-&gt;a1);</div><div class='del'>-</div><div class='del'>-	printk("Process %s (pid: %d, stackpage=%08lx)\n",</div><div class='del'>-		current-&gt;comm, current-&gt;pid, PAGE_SIZE+(unsigned long)current);</div><div class='del'>-	show_stack(NULL, (unsigned long *)fp);</div><div class='add'>+	show_registers(fp);</div><div class='ctx'> 	do_exit(SIGSEGV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S<br/>index 497b924f3c86..99ba315bd0a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> PHDRS</div><div class='ctx'> {</div><div class='ctx'>   text PT_LOAD FILEHDR PHDRS FLAGS (7);</div><div class='head'>diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile<br/>index ebe51a513817..6bbf19f96007 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/lib/Makefile</a></div><div class='hunk'>@@ -4,5 +4,5 @@</div><div class='ctx'> </div><div class='ctx'> EXTRA_AFLAGS := -traditional</div><div class='ctx'> </div><div class='del'>-lib-y		:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \</div><div class='del'>-			checksum.o string.o semaphore.o</div><div class='add'>+lib-y	:= ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \</div><div class='add'>+	   checksum.o string.o semaphore.o uaccess.o</div><div class='head'>diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c<br/>new file mode 100644<br/>index 000000000000..1bc188c0d983<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/lib/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/lib/uaccess.c</a></div><div class='hunk'>@@ -0,0 +1,222 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned long __generic_copy_from_user(void *to, const void __user *from,</div><div class='add'>+				       unsigned long n)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp, res;</div><div class='add'>+</div><div class='add'>+	asm volatile ("\n"</div><div class='add'>+		"	tst.l	%0\n"</div><div class='add'>+		"	jeq	2f\n"</div><div class='add'>+		"1:	moves.l	(%1)+,%3\n"</div><div class='add'>+		"	move.l	%3,(%2)+\n"</div><div class='add'>+		"	subq.l	#1,%0\n"</div><div class='add'>+		"	jne	1b\n"</div><div class='add'>+		"2:	btst	#1,%5\n"</div><div class='add'>+		"	jeq	4f\n"</div><div class='add'>+		"3:	moves.w	(%1)+,%3\n"</div><div class='add'>+		"	move.w	%3,(%2)+\n"</div><div class='add'>+		"4:	btst	#0,%5\n"</div><div class='add'>+		"	jeq	6f\n"</div><div class='add'>+		"5:	moves.b	(%1)+,%3\n"</div><div class='add'>+		"	move.b  %3,(%2)+\n"</div><div class='add'>+		"6:\n"</div><div class='add'>+		"	.section .fixup,\"ax\"\n"</div><div class='add'>+		"	.even\n"</div><div class='add'>+		"10:	move.l	%0,%3\n"</div><div class='add'>+		"7:	clr.l	(%2)+\n"</div><div class='add'>+		"	subq.l	#1,%3\n"</div><div class='add'>+		"	jne	7b\n"</div><div class='add'>+		"	lsl.l	#2,%0\n"</div><div class='add'>+		"	btst	#1,%5\n"</div><div class='add'>+		"	jeq	8f\n"</div><div class='add'>+		"30:	clr.w	(%2)+\n"</div><div class='add'>+		"	addq.l	#2,%0\n"</div><div class='add'>+		"8:	btst	#0,%5\n"</div><div class='add'>+		"	jeq	6b\n"</div><div class='add'>+		"50:	clr.b	(%2)+\n"</div><div class='add'>+		"	addq.l	#1,%0\n"</div><div class='add'>+		"	jra	6b\n"</div><div class='add'>+		"	.previous\n"</div><div class='add'>+		"\n"</div><div class='add'>+		"	.section __ex_table,\"a\"\n"</div><div class='add'>+		"	.align	4\n"</div><div class='add'>+		"	.long	1b,10b\n"</div><div class='add'>+		"	.long	3b,30b\n"</div><div class='add'>+		"	.long	5b,50b\n"</div><div class='add'>+		"	.previous"</div><div class='add'>+		: "=d" (res), "+a" (from), "+a" (to), "=&amp;r" (tmp)</div><div class='add'>+		: "0" (n / 4), "d" (n &amp; 3));</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__generic_copy_from_user);</div><div class='add'>+</div><div class='add'>+unsigned long __generic_copy_to_user(void __user *to, const void *from,</div><div class='add'>+				     unsigned long n)</div><div class='add'>+{</div><div class='add'>+	unsigned long tmp, res;</div><div class='add'>+</div><div class='add'>+	asm volatile ("\n"</div><div class='add'>+		"	tst.l	%0\n"</div><div class='add'>+		"	jeq	4f\n"</div><div class='add'>+		"1:	move.l	(%1)+,%3\n"</div><div class='add'>+		"2:	moves.l	%3,(%2)+\n"</div><div class='add'>+		"3:	subq.l	#1,%0\n"</div><div class='add'>+		"	jne	1b\n"</div><div class='add'>+		"4:	btst	#1,%5\n"</div><div class='add'>+		"	jeq	6f\n"</div><div class='add'>+		"	move.w	(%1)+,%3\n"</div><div class='add'>+		"5:	moves.w	%3,(%2)+\n"</div><div class='add'>+		"6:	btst	#0,%5\n"</div><div class='add'>+		"	jeq	8f\n"</div><div class='add'>+		"	move.b	(%1)+,%3\n"</div><div class='add'>+		"7:	moves.b  %3,(%2)+\n"</div><div class='add'>+		"8:\n"</div><div class='add'>+		"	.section .fixup,\"ax\"\n"</div><div class='add'>+		"	.even\n"</div><div class='add'>+		"20:	lsl.l	#2,%0\n"</div><div class='add'>+		"50:	add.l	%5,%0\n"</div><div class='add'>+		"	jra	7b\n"</div><div class='add'>+		"	.previous\n"</div><div class='add'>+		"\n"</div><div class='add'>+		"	.section __ex_table,\"a\"\n"</div><div class='add'>+		"	.align	4\n"</div><div class='add'>+		"	.long	2b,20b\n"</div><div class='add'>+		"	.long	3b,20b\n"</div><div class='add'>+		"	.long	5b,50b\n"</div><div class='add'>+		"	.long	6b,50b\n"</div><div class='add'>+		"	.long	7b,50b\n"</div><div class='add'>+		"	.long	8b,50b\n"</div><div class='add'>+		"	.previous"</div><div class='add'>+		: "=d" (res), "+a" (from), "+a" (to), "=&amp;r" (tmp)</div><div class='add'>+		: "0" (n / 4), "d" (n &amp; 3));</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(__generic_copy_to_user);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy a null terminated string from userspace.</div><div class='add'>+ */</div><div class='add'>+long strncpy_from_user(char *dst, const char __user *src, long count)</div><div class='add'>+{</div><div class='add'>+	long res;</div><div class='add'>+	char c;</div><div class='add'>+</div><div class='add'>+	if (count &lt;= 0)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	asm volatile ("\n"</div><div class='add'>+		"1:	moves.b	(%2)+,%4\n"</div><div class='add'>+		"	move.b	%4,(%1)+\n"</div><div class='add'>+		"	jeq	2f\n"</div><div class='add'>+		"	subq.l	#1,%3\n"</div><div class='add'>+		"	jne	1b\n"</div><div class='add'>+		"2:	sub.l	%3,%0\n"</div><div class='add'>+		"3:\n"</div><div class='add'>+		"	.section .fixup,\"ax\"\n"</div><div class='add'>+		"	.even\n"</div><div class='add'>+		"10:	move.l	%5,%0\n"</div><div class='add'>+		"	jra	3b\n"</div><div class='add'>+		"	.previous\n"</div><div class='add'>+		"\n"</div><div class='add'>+		"	.section __ex_table,\"a\"\n"</div><div class='add'>+		"	.align	4\n"</div><div class='add'>+		"	.long	1b,10b\n"</div><div class='add'>+		"	.previous"</div><div class='add'>+		: "=d" (res), "+a" (dst), "+a" (src), "+r" (count), "=&amp;d" (c)</div><div class='add'>+		: "i" (-EFAULT), "0" (count));</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(strncpy_from_user);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return the size of a string (including the ending 0)</div><div class='add'>+ *</div><div class='add'>+ * Return 0 on exception, a value greater than N if too long</div><div class='add'>+ */</div><div class='add'>+long strnlen_user(const char __user *src, long n)</div><div class='add'>+{</div><div class='add'>+	char c;</div><div class='add'>+	long res;</div><div class='add'>+</div><div class='add'>+	asm volatile ("\n"</div><div class='add'>+		"1:	subq.l	#1,%1\n"</div><div class='add'>+		"	jmi	3f\n"</div><div class='add'>+		"2:	moves.b	(%0)+,%2\n"</div><div class='add'>+		"	tst.b	%2\n"</div><div class='add'>+		"	jne	1b\n"</div><div class='add'>+		"	jra	4f\n"</div><div class='add'>+		"\n"</div><div class='add'>+		"3:	addq.l	#1,%0\n"</div><div class='add'>+		"4:	sub.l	%4,%0\n"</div><div class='add'>+		"5:\n"</div><div class='add'>+		"	.section .fixup,\"ax\"\n"</div><div class='add'>+		"	.even\n"</div><div class='add'>+		"20:	sub.l	%0,%0\n"</div><div class='add'>+		"	jra	5b\n"</div><div class='add'>+		"	.previous\n"</div><div class='add'>+		"\n"</div><div class='add'>+		"	.section __ex_table,\"a\"\n"</div><div class='add'>+		"	.align	4\n"</div><div class='add'>+		"	.long	2b,20b\n"</div><div class='add'>+		"	.previous\n"</div><div class='add'>+		: "=&amp;a" (res), "+d" (n), "=&amp;d" (c)</div><div class='add'>+		: "0" (src), "r" (src));</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(strnlen_user);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Zero Userspace</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+unsigned long clear_user(void __user *to, unsigned long n)</div><div class='add'>+{</div><div class='add'>+	unsigned long res;</div><div class='add'>+</div><div class='add'>+	asm volatile ("\n"</div><div class='add'>+		"	tst.l	%0\n"</div><div class='add'>+		"	jeq	3f\n"</div><div class='add'>+		"1:	moves.l	%2,(%1)+\n"</div><div class='add'>+		"2:	subq.l	#1,%0\n"</div><div class='add'>+		"	jne	1b\n"</div><div class='add'>+		"3:	btst	#1,%4\n"</div><div class='add'>+		"	jeq	5f\n"</div><div class='add'>+		"4:	moves.w	%2,(%1)+\n"</div><div class='add'>+		"5:	btst	#0,%4\n"</div><div class='add'>+		"	jeq	7f\n"</div><div class='add'>+		"6:	moves.b	%2,(%1)\n"</div><div class='add'>+		"7:\n"</div><div class='add'>+		"	.section .fixup,\"ax\"\n"</div><div class='add'>+		"	.even\n"</div><div class='add'>+		"10:	lsl.l	#2,%0\n"</div><div class='add'>+		"40:	add.l	%4,%0\n"</div><div class='add'>+		"	jra	7b\n"</div><div class='add'>+		"	.previous\n"</div><div class='add'>+		"\n"</div><div class='add'>+		"	.section __ex_table,\"a\"\n"</div><div class='add'>+		"	.align	4\n"</div><div class='add'>+		"	.long	1b,10b\n"</div><div class='add'>+		"	.long	2b,10b\n"</div><div class='add'>+		"	.long	4b,40b\n"</div><div class='add'>+		"	.long	5b,40b\n"</div><div class='add'>+		"	.long	6b,40b\n"</div><div class='add'>+		"	.long	7b,40b\n"</div><div class='add'>+		"	.previous"</div><div class='add'>+		: "=d" (res), "+a" (to)</div><div class='add'>+		: "r" (0), "0" (n / 4), "d" (n &amp; 3));</div><div class='add'>+</div><div class='add'>+    return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(clear_user);</div><div class='head'>diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c<br/>index b19b7dd9bd21..6eaa881793d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/baboon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/baboon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/baboon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/baboon.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ irqreturn_t baboon_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	for (i = 0, irq_bit = 1 ; i &lt; 3 ; i++, irq_bit &lt;&lt;= 1) {</div><div class='ctx'> 	        if (events &amp; irq_bit/* &amp; baboon_active*/) {</div><div class='ctx'> 			baboon_active &amp;= ~irq_bit;</div><div class='del'>-			mac_do_irq_list(IRQ_BABOON_0 + i, regs);</div><div class='add'>+			m68k_handle_int(IRQ_BABOON_0 + i, regs);</div><div class='ctx'> 			baboon_active |= irq_bit;</div><div class='ctx'> 			baboon-&gt;mb_ifr &amp;= ~irq_bit;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c<br/>index 14f8d3f4e195..85dda1095b1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/config.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Miscellaneous linux stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -89,38 +88,11 @@ extern void mac_debugging_long(int, long);</div><div class='ctx'> </div><div class='ctx'> static void mac_get_model(char *str);</div><div class='ctx'> </div><div class='del'>-void mac_bang(int irq, void *vector, struct pt_regs *p)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "Resetting ...\n");</div><div class='del'>-	mac_reset();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void mac_sched_init(irqreturn_t (*vector)(int, void *, struct pt_regs *))</div><div class='ctx'> {</div><div class='ctx'> 	via_init_clock(vector);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-void mac_waitbut (void)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern irqreturn_t mac_default_handler(int, void *, struct pt_regs *);</div><div class='del'>-</div><div class='del'>-irqreturn_t (*mac_handlers[8])(int, void *, struct pt_regs *)=</div><div class='del'>-{</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler,</div><div class='del'>-	mac_default_handler</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Parse a Macintosh-specific record in the bootinfo</div><div class='ctx'>  */</div><div class='hunk'>@@ -196,13 +168,7 @@ void __init config_mac(void)</div><div class='ctx'> </div><div class='ctx'> 	mach_sched_init      = mac_sched_init;</div><div class='ctx'> 	mach_init_IRQ        = mac_init_IRQ;</div><div class='del'>-	mach_request_irq     = mac_request_irq;</div><div class='del'>-	mach_free_irq        = mac_free_irq;</div><div class='del'>-	enable_irq           = mac_enable_irq;</div><div class='del'>-	disable_irq          = mac_disable_irq;</div><div class='ctx'> 	mach_get_model	 = mac_get_model;</div><div class='del'>-	mach_default_handler = &amp;mac_handlers;</div><div class='del'>-	mach_get_irq_list    = show_mac_interrupts;</div><div class='ctx'> 	mach_gettimeoffset   = mac_gettimeoffset;</div><div class='ctx'> #warning move to adb/via init</div><div class='ctx'> #if 0</div><div class='head'>diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c<br/>index cc62ed61cda2..4eeb09dc0e8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/debug.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c<br/>index 9179a3798407..bc657b1057a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/iop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/iop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/iop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/iop.c</a></div><div class='hunk'>@@ -104,7 +104,6 @@</div><div class='ctx'>  * should execute quickly.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -317,7 +316,7 @@ void __init iop_register_interrupts(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (iop_ism_present) {</div><div class='ctx'> 		if (oss_present) {</div><div class='del'>-			cpu_request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,</div><div class='add'>+			request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,</div><div class='ctx'> 					IRQ_FLG_LOCK, "ISM IOP",</div><div class='ctx'> 					(void *) IOP_NUM_ISM);</div><div class='ctx'> 			oss_irq_enable(IRQ_MAC_ADB);</div><div class='head'>diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c<br/>index 1809601ad903..694b14bb0de1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/macints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/macints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/macints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/macints.c</a></div><div class='hunk'>@@ -137,14 +137,6 @@</div><div class='ctx'> #define DEBUG_SPURIOUS</div><div class='ctx'> #define SHUTUP_SONIC</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The mac_irq_list array is an array of linked lists of irq_node_t nodes.</div><div class='del'>- * Each node contains one handler to be called whenever the interrupt</div><div class='del'>- * occurs, with fast handlers listed before slow handlers.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-irq_node_t *mac_irq_list[NUM_MAC_SOURCES];</div><div class='del'>-</div><div class='ctx'> /* SCC interrupt mask */</div><div class='ctx'> </div><div class='ctx'> static int scc_mask;</div><div class='hunk'>@@ -209,34 +201,37 @@ extern int  baboon_irq_pending(int);</div><div class='ctx'>  * SCC interrupt routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void scc_irq_enable(int);</div><div class='del'>-static void scc_irq_disable(int);</div><div class='add'>+static void scc_irq_enable(unsigned int);</div><div class='add'>+static void scc_irq_disable(unsigned int);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * console_loglevel determines NMI handler function</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-extern irqreturn_t mac_bang(int, void *, struct pt_regs *);</div><div class='ctx'> irqreturn_t mac_nmi_handler(int, void *, struct pt_regs *);</div><div class='ctx'> irqreturn_t mac_debug_handler(int, void *, struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> /* #define DEBUG_MACINTS */</div><div class='ctx'> </div><div class='add'>+static void mac_enable_irq(unsigned int irq);</div><div class='add'>+static void mac_disable_irq(unsigned int irq);</div><div class='add'>+</div><div class='add'>+static struct irq_controller mac_irq_controller = {</div><div class='add'>+	.name		= "mac",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.enable		= mac_enable_irq,</div><div class='add'>+	.disable	= mac_disable_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void mac_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-        int i;</div><div class='del'>-</div><div class='ctx'> #ifdef DEBUG_MACINTS</div><div class='ctx'> 	printk("mac_init_IRQ(): Setting things up...\n");</div><div class='ctx'> #endif</div><div class='del'>-	/* Initialize the IRQ handler lists. Initially each list is empty, */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_MAC_SOURCES; i++) {</div><div class='del'>-		mac_irq_list[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	scc_mask = 0;</div><div class='ctx'> </div><div class='add'>+	m68k_setup_irq_controller(&amp;mac_irq_controller, IRQ_USER,</div><div class='add'>+				  NUM_MAC_SOURCES - IRQ_USER);</div><div class='ctx'> 	/* Make sure the SONIC interrupt is cleared or things get ugly */</div><div class='ctx'> #ifdef SHUTUP_SONIC</div><div class='ctx'> 	printk("Killing onboard sonic... ");</div><div class='hunk'>@@ -253,15 +248,16 @@ void mac_init_IRQ(void)</div><div class='ctx'> 	 * at levels 1-7. Most of the work is done elsewhere.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (oss_present) {</div><div class='add'>+	if (oss_present)</div><div class='ctx'> 		oss_register_interrupts();</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		via_register_interrupts();</div><div class='del'>-	}</div><div class='del'>-	if (psc_present) psc_register_interrupts();</div><div class='del'>-	if (baboon_present) baboon_register_interrupts();</div><div class='add'>+	if (psc_present)</div><div class='add'>+		psc_register_interrupts();</div><div class='add'>+	if (baboon_present)</div><div class='add'>+		baboon_register_interrupts();</div><div class='ctx'> 	iop_register_interrupts();</div><div class='del'>-	cpu_request_irq(7, mac_nmi_handler, IRQ_FLG_LOCK, "NMI",</div><div class='add'>+	request_irq(IRQ_AUTO_7, mac_nmi_handler, 0, "NMI",</div><div class='ctx'> 			mac_nmi_handler);</div><div class='ctx'> #ifdef DEBUG_MACINTS</div><div class='ctx'> 	printk("mac_init_IRQ(): Done!\n");</div><div class='hunk'>@@ -269,104 +265,6 @@ void mac_init_IRQ(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Routines to work with irq_node_t's on linked lists lifted from</div><div class='del'>- * the Amiga code written by Roman Zippel.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline void mac_insert_irq(irq_node_t **list, irq_node_t *node)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	irq_node_t *cur;</div><div class='del'>-</div><div class='del'>-	if (!node-&gt;dev_id)</div><div class='del'>-		printk("%s: Warning: dev_id of %s is zero\n",</div><div class='del'>-		       __FUNCTION__, node-&gt;devname);</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	cur = *list;</div><div class='del'>-</div><div class='del'>-	if (node-&gt;flags &amp; IRQ_FLG_FAST) {</div><div class='del'>-		node-&gt;flags &amp;= ~IRQ_FLG_SLOW;</div><div class='del'>-		while (cur &amp;&amp; cur-&gt;flags &amp; IRQ_FLG_FAST) {</div><div class='del'>-			list = &amp;cur-&gt;next;</div><div class='del'>-			cur = cur-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	} else if (node-&gt;flags &amp; IRQ_FLG_SLOW) {</div><div class='del'>-		while (cur) {</div><div class='del'>-			list = &amp;cur-&gt;next;</div><div class='del'>-			cur = cur-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		while (cur &amp;&amp; !(cur-&gt;flags &amp; IRQ_FLG_SLOW)) {</div><div class='del'>-			list = &amp;cur-&gt;next;</div><div class='del'>-			cur = cur-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	node-&gt;next = cur;</div><div class='del'>-	*list = node;</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mac_delete_irq(irq_node_t **list, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-	for (node = *list; node; list = &amp;node-&gt;next, node = *list) {</div><div class='del'>-		if (node-&gt;dev_id == dev_id) {</div><div class='del'>-			*list = node-&gt;next;</div><div class='del'>-			/* Mark it as free. */</div><div class='del'>-			node-&gt;handler = NULL;</div><div class='del'>-			local_irq_restore(flags);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	printk ("%s: tried to remove invalid irq\n", __FUNCTION__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Call all the handlers for a given interrupt. Fast handlers are called</div><div class='del'>- * first followed by slow handlers.</div><div class='del'>- *</div><div class='del'>- * This code taken from the original Amiga code written by Roman Zippel.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void mac_do_irq_list(int irq, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	irq_node_t *node, *slow_nodes;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	kstat_cpu(0).irqs[irq]++;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_SPURIOUS</div><div class='del'>-	if (!mac_irq_list[irq] &amp;&amp; (console_loglevel &gt; 7)) {</div><div class='del'>-		printk("mac_do_irq_list: spurious interrupt %d!\n", irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* serve first fast and normal handlers */</div><div class='del'>-	for (node = mac_irq_list[irq];</div><div class='del'>-	     node &amp;&amp; (!(node-&gt;flags &amp; IRQ_FLG_SLOW));</div><div class='del'>-	     node = node-&gt;next)</div><div class='del'>-		node-&gt;handler(irq, node-&gt;dev_id, fp);</div><div class='del'>-	if (!node) return;</div><div class='del'>-	local_save_flags(flags);</div><div class='del'>-	local_irq_restore((flags &amp; ~0x0700) | (fp-&gt;sr &amp; 0x0700));</div><div class='del'>-	/* if slow handlers exists, serve them now */</div><div class='del'>-	slow_nodes = node;</div><div class='del'>-	for (; node; node = node-&gt;next) {</div><div class='del'>-		node-&gt;handler(irq, node-&gt;dev_id, fp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *  mac_enable_irq - enable an interrupt source</div><div class='ctx'>  * mac_disable_irq - disable an interrupt source</div><div class='ctx'>  *   mac_clear_irq - clears a pending interrupt</div><div class='hunk'>@@ -375,276 +273,124 @@ void mac_do_irq_list(int irq, struct pt_regs *fp)</div><div class='ctx'>  * These routines are just dispatchers to the VIA/OSS/PSC routines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void mac_enable_irq (unsigned int irq)</div><div class='add'>+static void mac_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	int irq_src	= IRQ_SRC(irq);</div><div class='add'>+	int irq_src = IRQ_SRC(irq);</div><div class='ctx'> </div><div class='ctx'> 	switch(irq_src) {</div><div class='del'>-		case 1: via_irq_enable(irq);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-		case 7: if (oss_present) {</div><div class='del'>-				oss_irq_enable(irq);</div><div class='del'>-			} else {</div><div class='del'>-				via_irq_enable(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-		case 4:</div><div class='del'>-		case 5:</div><div class='del'>-		case 6: if (psc_present) {</div><div class='del'>-				psc_irq_enable(irq);</div><div class='del'>-			} else if (oss_present) {</div><div class='del'>-				oss_irq_enable(irq);</div><div class='del'>-			} else if (irq_src == 4) {</div><div class='del'>-				scc_irq_enable(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 8: if (baboon_present) {</div><div class='del'>-				baboon_irq_enable(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+	case 1:</div><div class='add'>+		via_irq_enable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+	case 7:</div><div class='add'>+		if (oss_present)</div><div class='add'>+			oss_irq_enable(irq);</div><div class='add'>+		else</div><div class='add'>+			via_irq_enable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		if (psc_present)</div><div class='add'>+			psc_irq_enable(irq);</div><div class='add'>+		else if (oss_present)</div><div class='add'>+			oss_irq_enable(irq);</div><div class='add'>+		else if (irq_src == 4)</div><div class='add'>+			scc_irq_enable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		if (baboon_present)</div><div class='add'>+			baboon_irq_enable(irq);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mac_disable_irq (unsigned int irq)</div><div class='add'>+static void mac_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	int irq_src	= IRQ_SRC(irq);</div><div class='add'>+	int irq_src = IRQ_SRC(irq);</div><div class='ctx'> </div><div class='ctx'> 	switch(irq_src) {</div><div class='del'>-		case 1: via_irq_disable(irq);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-		case 7: if (oss_present) {</div><div class='del'>-				oss_irq_disable(irq);</div><div class='del'>-			} else {</div><div class='del'>-				via_irq_disable(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-		case 4:</div><div class='del'>-		case 5:</div><div class='del'>-		case 6: if (psc_present) {</div><div class='del'>-				psc_irq_disable(irq);</div><div class='del'>-			} else if (oss_present) {</div><div class='del'>-				oss_irq_disable(irq);</div><div class='del'>-			} else if (irq_src == 4) {</div><div class='del'>-				scc_irq_disable(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 8: if (baboon_present) {</div><div class='del'>-				baboon_irq_disable(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+	case 1:</div><div class='add'>+		via_irq_disable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+	case 7:</div><div class='add'>+		if (oss_present)</div><div class='add'>+			oss_irq_disable(irq);</div><div class='add'>+		else</div><div class='add'>+			via_irq_disable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		if (psc_present)</div><div class='add'>+			psc_irq_disable(irq);</div><div class='add'>+		else if (oss_present)</div><div class='add'>+			oss_irq_disable(irq);</div><div class='add'>+		else if (irq_src == 4)</div><div class='add'>+			scc_irq_disable(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		if (baboon_present)</div><div class='add'>+			baboon_irq_disable(irq);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mac_clear_irq( unsigned int irq )</div><div class='add'>+void mac_clear_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	switch(IRQ_SRC(irq)) {</div><div class='del'>-		case 1: via_irq_clear(irq);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-		case 7: if (oss_present) {</div><div class='del'>-				oss_irq_clear(irq);</div><div class='del'>-			} else {</div><div class='del'>-				via_irq_clear(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-		case 4:</div><div class='del'>-		case 5:</div><div class='del'>-		case 6: if (psc_present) {</div><div class='del'>-				psc_irq_clear(irq);</div><div class='del'>-			} else if (oss_present) {</div><div class='del'>-				oss_irq_clear(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 8: if (baboon_present) {</div><div class='del'>-				baboon_irq_clear(irq);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='add'>+	case 1:</div><div class='add'>+		via_irq_clear(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+	case 7:</div><div class='add'>+		if (oss_present)</div><div class='add'>+			oss_irq_clear(irq);</div><div class='add'>+		else</div><div class='add'>+			via_irq_clear(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		if (psc_present)</div><div class='add'>+			psc_irq_clear(irq);</div><div class='add'>+		else if (oss_present)</div><div class='add'>+			oss_irq_clear(irq);</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		if (baboon_present)</div><div class='add'>+			baboon_irq_clear(irq);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mac_irq_pending( unsigned int irq )</div><div class='add'>+int mac_irq_pending(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	switch(IRQ_SRC(irq)) {</div><div class='del'>-		case 1: return via_irq_pending(irq);</div><div class='del'>-		case 2:</div><div class='del'>-		case 7: if (oss_present) {</div><div class='del'>-				return oss_irq_pending(irq);</div><div class='del'>-			} else {</div><div class='del'>-				return via_irq_pending(irq);</div><div class='del'>-			}</div><div class='del'>-		case 3:</div><div class='del'>-		case 4:</div><div class='del'>-		case 5:</div><div class='del'>-		case 6: if (psc_present) {</div><div class='del'>-				return psc_irq_pending(irq);</div><div class='del'>-			} else if (oss_present) {</div><div class='del'>-				return oss_irq_pending(irq);</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Add an interrupt service routine to an interrupt source.</div><div class='del'>- * Returns 0 on success.</div><div class='del'>- *</div><div class='del'>- * FIXME: You can register interrupts on nonexistent source (ie PSC4 on a</div><div class='del'>- *        non-PSC machine). We should return -EINVAL in those cases.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int mac_request_irq(unsigned int irq,</div><div class='del'>-		    irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-		    unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_MACINTS</div><div class='del'>-	printk ("%s: irq %d requested for %s\n", __FUNCTION__, irq, devname);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (irq &lt; VIA1_SOURCE_BASE) {</div><div class='del'>-		return cpu_request_irq(irq, handler, flags, devname, dev_id);</div><div class='add'>+	case 1:</div><div class='add'>+		return via_irq_pending(irq);</div><div class='add'>+	case 2:</div><div class='add'>+	case 7:</div><div class='add'>+		if (oss_present)</div><div class='add'>+			return oss_irq_pending(irq);</div><div class='add'>+		else</div><div class='add'>+			return via_irq_pending(irq);</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		if (psc_present)</div><div class='add'>+			return psc_irq_pending(irq);</div><div class='add'>+		else if (oss_present)</div><div class='add'>+			return oss_irq_pending(irq);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NUM_MAC_SOURCES) {</div><div class='del'>-		printk ("%s: unknown irq %d requested by %s\n",</div><div class='del'>-		        __FUNCTION__, irq, devname);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get a node and stick it onto the right list */</div><div class='del'>-</div><div class='del'>-	if (!(node = new_irq_node())) return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	node-&gt;handler	= handler;</div><div class='del'>-	node-&gt;flags	= flags;</div><div class='del'>-	node-&gt;dev_id	= dev_id;</div><div class='del'>-	node-&gt;devname	= devname;</div><div class='del'>-	node-&gt;next	= NULL;</div><div class='del'>-	mac_insert_irq(&amp;mac_irq_list[irq], node);</div><div class='del'>-</div><div class='del'>-	/* Now enable the IRQ source */</div><div class='del'>-</div><div class='del'>-	mac_enable_irq(irq);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Removes an interrupt service routine from an interrupt source.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void mac_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-#ifdef DEBUG_MACINTS</div><div class='del'>-	printk ("%s: irq %d freed by %p\n", __FUNCTION__, irq, dev_id);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (irq &lt; VIA1_SOURCE_BASE) {</div><div class='del'>-		cpu_free_irq(irq, dev_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= NUM_MAC_SOURCES) {</div><div class='del'>-		printk ("%s: unknown irq %d freed\n",</div><div class='del'>-		        __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mac_delete_irq(&amp;mac_irq_list[irq], dev_id);</div><div class='del'>-</div><div class='del'>-	/* If the list for this interrupt is */</div><div class='del'>-	/* empty then disable the source.    */</div><div class='del'>-</div><div class='del'>-	if (!mac_irq_list[irq]) {</div><div class='del'>-		mac_disable_irq(irq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Generate a pretty listing for /proc/interrupts</div><div class='del'>- *</div><div class='del'>- * By the time we're called the autovector interrupt list has already been</div><div class='del'>- * generated, so we just need to do the machspec interrupts.</div><div class='del'>- *</div><div class='del'>- * 990506 (jmt) - rewritten to handle chained machspec interrupt handlers.</div><div class='del'>- *                Also removed display of num_spurious it is already</div><div class='del'>- *		  displayed for us as autovector irq 0.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int show_mac_interrupts(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	irq_node_t *node;</div><div class='del'>-	char *base;</div><div class='del'>-</div><div class='del'>-	/* Don't do Nubus interrupts in this loop; we do them separately  */</div><div class='del'>-	/* below so that we can print slot numbers instead of IRQ numbers */</div><div class='del'>-</div><div class='del'>-	for (i = VIA1_SOURCE_BASE ; i &lt; NUM_MAC_SOURCES ; ++i) {</div><div class='del'>-</div><div class='del'>-		/* Nonexistant interrupt or nothing registered; skip it. */</div><div class='del'>-</div><div class='del'>-		if ((node = mac_irq_list[i]) == NULL) continue;</div><div class='del'>-		if (node-&gt;flags &amp; IRQ_FLG_STD) continue;</div><div class='del'>-</div><div class='del'>-		base = "";</div><div class='del'>-		switch(IRQ_SRC(i)) {</div><div class='del'>-			case 1: base = "via1";</div><div class='del'>-				break;</div><div class='del'>-			case 2: if (oss_present) {</div><div class='del'>-					base = "oss";</div><div class='del'>-				} else {</div><div class='del'>-					base = "via2";</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-			case 4:</div><div class='del'>-			case 5:</div><div class='del'>-			case 6: if (psc_present) {</div><div class='del'>-					base = "psc";</div><div class='del'>-				} else if (oss_present) {</div><div class='del'>-					base = "oss";</div><div class='del'>-				} else {</div><div class='del'>-					if (IRQ_SRC(i) == 4) base = "scc";</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 7: base = "nbus";</div><div class='del'>-				break;</div><div class='del'>-			case 8: base = "bbn";</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		seq_printf(p, "%4s %2d: %10u ", base, i, kstat_cpu(0).irqs[i]);</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			if (node-&gt;flags &amp; IRQ_FLG_FAST) {</div><div class='del'>-				seq_puts(p, "F ");</div><div class='del'>-			} else if (node-&gt;flags &amp; IRQ_FLG_SLOW) {</div><div class='del'>-				seq_puts(p, "S ");</div><div class='del'>-			} else {</div><div class='del'>-				seq_puts(p, "  ");</div><div class='del'>-			}</div><div class='del'>-			seq_printf(p, "%s\n", node-&gt;devname);</div><div class='del'>-			if ((node = node-&gt;next)) {</div><div class='del'>-				seq_puts(p, "                    ");</div><div class='del'>-			}</div><div class='del'>-		} while(node);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mac_default_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-#ifdef DEBUG_SPURIOUS</div><div class='del'>-	printk("Unexpected IRQ %d on device %p\n", irq, dev_id);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int num_debug[8];</div><div class='ctx'> </div><div class='ctx'> irqreturn_t mac_debug_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='hunk'>@@ -684,7 +430,7 @@ irqreturn_t mac_nmi_handler(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> 	while (nmi_hold == 1)</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> </div><div class='del'>-	if ( console_loglevel &gt;= 8 ) {</div><div class='add'>+	if (console_loglevel &gt;= 8) {</div><div class='ctx'> #if 0</div><div class='ctx'> 		show_state();</div><div class='ctx'> 		printk("PC: %08lx\nSR: %04x  SP: %p\n", fp-&gt;pc, fp-&gt;sr, fp);</div><div class='hunk'>@@ -713,14 +459,16 @@ irqreturn_t mac_nmi_handler(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'>  * done in hardware (only the PSC can do that.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void scc_irq_enable(int irq) {</div><div class='del'>-	int irq_idx     = IRQ_IDX(irq);</div><div class='add'>+static void scc_irq_enable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	int irq_idx = IRQ_IDX(irq);</div><div class='ctx'> </div><div class='ctx'> 	scc_mask |= (1 &lt;&lt; irq_idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void scc_irq_disable(int irq) {</div><div class='del'>-	int irq_idx     = IRQ_IDX(irq);</div><div class='add'>+static void scc_irq_disable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	int irq_idx = IRQ_IDX(irq);</div><div class='ctx'> </div><div class='ctx'> 	scc_mask &amp;= ~(1 &lt;&lt; irq_idx);</div><div class='ctx'> }</div><div class='hunk'>@@ -755,6 +503,8 @@ void mac_scc_dispatch(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	/* and since they're autovector interrupts they */</div><div class='ctx'> 	/* pretty much kill the system.                 */</div><div class='ctx'> </div><div class='del'>-	if (reg &amp; 0x38) mac_do_irq_list(IRQ_SCCA, regs);</div><div class='del'>-	if (reg &amp; 0x07) mac_do_irq_list(IRQ_SCCB, regs);</div><div class='add'>+	if (reg &amp; 0x38)</div><div class='add'>+		m68k_handle_int(IRQ_SCCA, regs);</div><div class='add'>+	if (reg &amp; 0x07)</div><div class='add'>+		m68k_handle_int(IRQ_SCCB, regs);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c<br/>index bbb0c3b95e9c..56d1f5676ade 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/misc.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Miscellaneous Mac68K-specific stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='head'>diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c<br/>index 333547692724..63e04365191f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/oss.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/oss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/oss.c</a></div><div class='hunk'>@@ -67,15 +67,15 @@ void __init oss_init(void)</div><div class='ctx'> </div><div class='ctx'> void __init oss_register_interrupts(void)</div><div class='ctx'> {</div><div class='del'>-	cpu_request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,</div><div class='add'>+	request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,</div><div class='ctx'> 			"scsi", (void *) oss);</div><div class='del'>-	cpu_request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,</div><div class='add'>+	request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,</div><div class='ctx'> 			"scc", mac_scc_dispatch);</div><div class='del'>-	cpu_request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,</div><div class='add'>+	request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,</div><div class='ctx'> 			"nubus", (void *) oss);</div><div class='del'>-	cpu_request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,</div><div class='add'>+	request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,</div><div class='ctx'> 			"sound", (void *) oss);</div><div class='del'>-	cpu_request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,</div><div class='add'>+	request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,</div><div class='ctx'> 			"via1", (void *) via1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +113,7 @@ irqreturn_t oss_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		oss-&gt;irq_pending &amp;= ~OSS_IP_SOUND;</div><div class='ctx'> 	} else if (events &amp; OSS_IP_SCSI) {</div><div class='ctx'> 		oss-&gt;irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;</div><div class='del'>-		mac_do_irq_list(IRQ_MAC_SCSI, regs);</div><div class='add'>+		m68k_handle_int(IRQ_MAC_SCSI, regs);</div><div class='ctx'> 		oss-&gt;irq_pending &amp;= ~OSS_IP_SCSI;</div><div class='ctx'> 		oss-&gt;irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -146,7 +146,7 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	for (i = 0, irq_bit = 1 ; i &lt; 6 ; i++, irq_bit &lt;&lt;= 1) {</div><div class='ctx'> 		if (events &amp; irq_bit) {</div><div class='ctx'> 			oss-&gt;irq_level[i] = OSS_IRQLEV_DISABLED;</div><div class='del'>-			mac_do_irq_list(NUBUS_SOURCE_BASE + i, regs);</div><div class='add'>+			m68k_handle_int(NUBUS_SOURCE_BASE + i, regs);</div><div class='ctx'> 			oss-&gt;irq_pending &amp;= ~irq_bit;</div><div class='ctx'> 			oss-&gt;irq_level[i] = OSS_IRQLEV_NUBUS;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c<br/>index e72384e43a1e..e26218091755 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/psc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/psc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/psc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/psc.c</a></div><div class='hunk'>@@ -117,10 +117,10 @@ void __init psc_init(void)</div><div class='ctx'> </div><div class='ctx'> void __init psc_register_interrupts(void)</div><div class='ctx'> {</div><div class='del'>-	cpu_request_irq(3, psc_irq, IRQ_FLG_LOCK, "psc3", (void *) 0x30);</div><div class='del'>-	cpu_request_irq(4, psc_irq, IRQ_FLG_LOCK, "psc4", (void *) 0x40);</div><div class='del'>-	cpu_request_irq(5, psc_irq, IRQ_FLG_LOCK, "psc5", (void *) 0x50);</div><div class='del'>-	cpu_request_irq(6, psc_irq, IRQ_FLG_LOCK, "psc6", (void *) 0x60);</div><div class='add'>+	request_irq(IRQ_AUTO_3, psc_irq, 0, "psc3", (void *) 0x30);</div><div class='add'>+	request_irq(IRQ_AUTO_4, psc_irq, 0, "psc4", (void *) 0x40);</div><div class='add'>+	request_irq(IRQ_AUTO_5, psc_irq, 0, "psc5", (void *) 0x50);</div><div class='add'>+	request_irq(IRQ_AUTO_6, psc_irq, 0, "psc6", (void *) 0x60);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -149,7 +149,7 @@ irqreturn_t psc_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	for (i = 0, irq_bit = 1 ; i &lt; 4 ; i++, irq_bit &lt;&lt;= 1) {</div><div class='ctx'> 	        if (events &amp; irq_bit) {</div><div class='ctx'> 			psc_write_byte(pIER, irq_bit);</div><div class='del'>-			mac_do_irq_list(base_irq + i, regs);</div><div class='add'>+			m68k_handle_int(base_irq + i, regs);</div><div class='ctx'> 			psc_write_byte(pIFR, irq_bit);</div><div class='ctx'> 			psc_write_byte(pIER, irq_bit | 0x80);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c<br/>index cd528bf7b43f..c4aa345d544e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mac/via.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mac/via.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mac/via.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mac/via.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/macintosh.h&gt;</div><div class='ctx'> #include &lt;asm/macints.h&gt;</div><div class='hunk'>@@ -71,7 +70,6 @@ void via_irq_enable(int irq);</div><div class='ctx'> void via_irq_disable(int irq);</div><div class='ctx'> void via_irq_clear(int irq);</div><div class='ctx'> </div><div class='del'>-extern irqreturn_t mac_bang(int, void *, struct pt_regs *);</div><div class='ctx'> extern irqreturn_t mac_scc_dispatch(int, void *, struct pt_regs *);</div><div class='ctx'> extern int oss_present;</div><div class='ctx'> </div><div class='hunk'>@@ -212,11 +210,6 @@ void __init via_init(void)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	/* The alernate IRQ mapping seems to just not work. Anyone with a   */</div><div class='del'>-	/* supported machine is welcome to take a stab at fixing it. It     */</div><div class='del'>-	/* _should_ work on the following Quadras: 610,650,700,800,900,950  */</div><div class='del'>-	/*                                               - 1999-06-12 (jmt) */</div><div class='del'>-</div><div class='ctx'> 	via_alt_mapping = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -260,27 +253,21 @@ void __init via_init_clock(irqreturn_t (*func)(int, void *, struct pt_regs *))</div><div class='ctx'> void __init via_register_interrupts(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (via_alt_mapping) {</div><div class='del'>-		cpu_request_irq(IRQ_AUTO_1, via1_irq,</div><div class='add'>+		request_irq(IRQ_AUTO_1, via1_irq,</div><div class='ctx'> 				IRQ_FLG_LOCK|IRQ_FLG_FAST, "software",</div><div class='ctx'> 				(void *) via1);</div><div class='del'>-		cpu_request_irq(IRQ_AUTO_6, via1_irq,</div><div class='add'>+		request_irq(IRQ_AUTO_6, via1_irq,</div><div class='ctx'> 				IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",</div><div class='ctx'> 				(void *) via1);</div><div class='ctx'> 	} else {</div><div class='del'>-		cpu_request_irq(IRQ_AUTO_1, via1_irq,</div><div class='add'>+		request_irq(IRQ_AUTO_1, via1_irq,</div><div class='ctx'> 				IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",</div><div class='ctx'> 				(void *) via1);</div><div class='del'>-#if 0 /* interferes with serial on some machines */</div><div class='del'>-		if (!psc_present) {</div><div class='del'>-			cpu_request_irq(IRQ_AUTO_6, mac_bang, IRQ_FLG_LOCK,</div><div class='del'>-					"Off Switch", mac_bang);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-	cpu_request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,</div><div class='add'>+	request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,</div><div class='ctx'> 			"via2", (void *) via2);</div><div class='ctx'> 	if (!psc_present) {</div><div class='del'>-		cpu_request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK,</div><div class='add'>+		request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK,</div><div class='ctx'> 				"scc", mac_scc_dispatch);</div><div class='ctx'> 	}</div><div class='ctx'> 	request_irq(IRQ_MAC_NUBUS, via_nubus_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,</div><div class='hunk'>@@ -437,7 +424,7 @@ irqreturn_t via1_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	for (i = 0, irq_bit = 1 ; i &lt; 7 ; i++, irq_bit &lt;&lt;= 1)</div><div class='ctx'> 		if (events &amp; irq_bit) {</div><div class='ctx'> 			via1[vIER] = irq_bit;</div><div class='del'>-			mac_do_irq_list(VIA1_SOURCE_BASE + i, regs);</div><div class='add'>+			m68k_handle_int(VIA1_SOURCE_BASE + i, regs);</div><div class='ctx'> 			via1[vIFR] = irq_bit;</div><div class='ctx'> 			via1[vIER] = irq_bit | 0x80;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -452,7 +439,7 @@ irqreturn_t via1_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		/* No, it won't be set. that's why we're doing this. */</div><div class='ctx'> 		via_irq_disable(IRQ_MAC_NUBUS);</div><div class='ctx'> 		via_irq_clear(IRQ_MAC_NUBUS);</div><div class='del'>-		mac_do_irq_list(IRQ_MAC_NUBUS, regs);</div><div class='add'>+		m68k_handle_int(IRQ_MAC_NUBUS, regs);</div><div class='ctx'> 		via_irq_enable(IRQ_MAC_NUBUS);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -471,8 +458,8 @@ irqreturn_t via2_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	for (i = 0, irq_bit = 1 ; i &lt; 7 ; i++, irq_bit &lt;&lt;= 1)</div><div class='ctx'> 		if (events &amp; irq_bit) {</div><div class='ctx'> 			via2[gIER] = irq_bit;</div><div class='del'>-			mac_do_irq_list(VIA2_SOURCE_BASE + i, regs);</div><div class='ctx'> 			via2[gIFR] = irq_bit | rbv_clear;</div><div class='add'>+			m68k_handle_int(VIA2_SOURCE_BASE + i, regs);</div><div class='ctx'> 			via2[gIER] = irq_bit | 0x80;</div><div class='ctx'> 		}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -494,7 +481,7 @@ irqreturn_t via_nubus_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	for (i = 0, irq_bit = 1 ; i &lt; 7 ; i++, irq_bit &lt;&lt;= 1) {</div><div class='ctx'> 		if (events &amp; irq_bit) {</div><div class='ctx'> 			via_irq_disable(NUBUS_SOURCE_BASE + i);</div><div class='del'>-			mac_do_irq_list(NUBUS_SOURCE_BASE + i, regs);</div><div class='add'>+			m68k_handle_int(NUBUS_SOURCE_BASE + i, regs);</div><div class='ctx'> 			via_irq_enable(NUBUS_SOURCE_BASE + i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -529,6 +516,7 @@ void via_irq_enable(int irq) {</div><div class='ctx'> 		}</div><div class='ctx'> 		via2[gIER] = irq_bit | 0x80;</div><div class='ctx'> 	} else if (irq_src == 7) {</div><div class='add'>+		nubus_active |= irq_bit;</div><div class='ctx'> 		if (rbv_present) {</div><div class='ctx'> 			/* enable the slot interrupt. SIER works like IER. */</div><div class='ctx'> 			via2[rSIER] = IER_SET_BIT(irq_idx);</div><div class='hunk'>@@ -550,7 +538,6 @@ void via_irq_enable(int irq) {</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		nubus_active |= irq_bit;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/math-emu/fp_entry.S b/arch/m68k/math-emu/fp_entry.S<br/>index 5ec2d9101ea3..954b4f304a7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/math-emu/fp_entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/math-emu/fp_entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/math-emu/fp_entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/math-emu/fp_entry.S</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  * OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/entry.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S<br/>index a9f7f0129067..b093b85fcdd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/math-emu/fp_util.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/math-emu/fp_util.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/math-emu/fp_util.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/math-emu/fp_util.S</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  * OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "fp_emu.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c<br/>index a190e39c907a..ab90213e5c54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mm/init.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *  to motorola.c and sun3mmu.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c<br/>index 85ad19a0ac79..f46f049d29ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/kmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/kmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mm/kmap.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *	     used by other architectures		/Roman Zippel</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -259,13 +258,15 @@ void __iounmap(void *addr, unsigned long size)</div><div class='ctx'> </div><div class='ctx'> 		if (CPU_IS_020_OR_030) {</div><div class='ctx'> 			int pmd_off = (virtaddr/PTRTREESIZE) &amp; 15;</div><div class='add'>+			int pmd_type = pmd_dir-&gt;pmd[pmd_off] &amp; _DESCTYPE_MASK;</div><div class='ctx'> </div><div class='del'>-			if ((pmd_dir-&gt;pmd[pmd_off] &amp; _DESCTYPE_MASK) == _PAGE_PRESENT) {</div><div class='add'>+			if (pmd_type == _PAGE_PRESENT) {</div><div class='ctx'> 				pmd_dir-&gt;pmd[pmd_off] = 0;</div><div class='ctx'> 				virtaddr += PTRTREESIZE;</div><div class='ctx'> 				size -= PTRTREESIZE;</div><div class='ctx'> 				continue;</div><div class='del'>-			}</div><div class='add'>+			} else if (pmd_type == 0)</div><div class='add'>+				continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (pmd_bad(*pmd_dir)) {</div><div class='head'>diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c<br/>index d6d582a5abb0..a0c095e17222 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mm/memory.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *  Copyright (C) 1995  Hamish Macdonald</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -94,8 +93,7 @@ pmd_t *get_pointer_table (void)</div><div class='ctx'> 	PD_MARKBITS(dp) = mask &amp; ~tmp;</div><div class='ctx'> 	if (!PD_MARKBITS(dp)) {</div><div class='ctx'> 		/* move to end of list */</div><div class='del'>-		list_del(dp);</div><div class='del'>-		list_add_tail(dp, &amp;ptable_list);</div><div class='add'>+		list_move_tail(dp, &amp;ptable_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	return (pmd_t *) (page_address(PD_PAGE(dp)) + off);</div><div class='ctx'> }</div><div class='hunk'>@@ -123,8 +121,7 @@ int free_pointer_table (pmd_t *ptable)</div><div class='ctx'> 		 * move this descriptor to the front of the list, since</div><div class='ctx'> 		 * it has one or more free tables.</div><div class='ctx'> 		 */</div><div class='del'>-		list_del(dp);</div><div class='del'>-		list_add(dp, &amp;ptable_list);</div><div class='add'>+		list_move(dp, &amp;ptable_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c<br/>index afb57eeafdcb..49015e32d8fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/motorola.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/motorola.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/motorola.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mm/motorola.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Moved 8/20/1999 Sam Creasey</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -203,7 +202,7 @@ void __init paging_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int chunk;</div><div class='ctx'> 	unsigned long mem_avail = 0;</div><div class='del'>-	unsigned long zones_size[3] = { 0, };</div><div class='add'>+	unsigned long zones_size[MAX_NR_ZONES] = { 0, };</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	{</div><div class='hunk'>@@ -257,12 +256,12 @@ void __init paging_init(void)</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk ("before free_area_init\n");</div><div class='ctx'> #endif</div><div class='del'>-	zones_size[0] = (mach_max_dma_address &lt; (unsigned long)high_memory ?</div><div class='del'>-			 (mach_max_dma_address+1) : (unsigned long)high_memory);</div><div class='del'>-	zones_size[1] = (unsigned long)high_memory - zones_size[0];</div><div class='add'>+	zones_size[ZONE_DMA] = (mach_max_dma_address &lt; (unsigned long)high_memory ?</div><div class='add'>+				(mach_max_dma_address+1) : (unsigned long)high_memory);</div><div class='add'>+	zones_size[ZONE_NORMAL] = (unsigned long)high_memory - zones_size[0];</div><div class='ctx'> </div><div class='del'>-	zones_size[0] = (zones_size[0] - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	zones_size[1] &gt;&gt;= PAGE_SHIFT;</div><div class='add'>+	zones_size[ZONE_DMA] = (zones_size[ZONE_DMA] - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	zones_size[ZONE_NORMAL] &gt;&gt;= PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	free_area_init(zones_size);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c<br/>index a47be196a47c..ac6640ade0b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mm/sun3mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mm/sun3mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mm/sun3mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mm/sun3mmu.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ void __init paging_init(void)</div><div class='ctx'> 	unsigned long address;</div><div class='ctx'> 	unsigned long next_pgtable;</div><div class='ctx'> 	unsigned long bootmem_end;</div><div class='del'>-	unsigned long zones_size[3] = {0, 0, 0};</div><div class='add'>+	unsigned long zones_size[MAX_NR_ZONES] = { 0, };</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -92,8 +92,7 @@ void __init paging_init(void)</div><div class='ctx'> 	current-&gt;mm = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* memory sizing is a hack stolen from motorola.c..  hope it works for us */</div><div class='del'>-	zones_size[0] = ((unsigned long)high_memory - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	zones_size[1] = 0;</div><div class='add'>+	zones_size[ZONE_DMA] = ((unsigned long)high_memory - PAGE_OFFSET) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	free_area_init(zones_size);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/mvme147/147ints.c b/arch/m68k/mvme147/147ints.c<br/>deleted file mode 100644<br/>index 69a744ee35a3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme147/147ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme147/147ints.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,145 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/m68k/mvme147/147ints.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1997 Richard Hirst [richard@sleepie.demon.co.uk]</div><div class='del'>- *</div><div class='del'>- * based on amiints.c -- Amiga Linux interrupt handling code</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file README.legal in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-</div><div class='del'>-static irqreturn_t mvme147_defhand (int irq, void *dev_id, struct pt_regs *fp);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This should ideally be 4 elements only, for speed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	irqreturn_t	(*handler)(int, void *, struct pt_regs *);</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	void		*dev_id;</div><div class='del'>-	const char	*devname;</div><div class='del'>-	unsigned	count;</div><div class='del'>-} irq_tab[256];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * void mvme147_init_IRQ (void)</div><div class='del'>- *</div><div class='del'>- * Parameters:	None</div><div class='del'>- *</div><div class='del'>- * Returns:	Nothing</div><div class='del'>- *</div><div class='del'>- * This function is called during kernel startup to initialize</div><div class='del'>- * the mvme147 IRQ handling routines.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void mvme147_init_IRQ (void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 256; i++) {</div><div class='del'>-		irq_tab[i].handler = mvme147_defhand;</div><div class='del'>-		irq_tab[i].flags = IRQ_FLG_STD;</div><div class='del'>-		irq_tab[i].dev_id = NULL;</div><div class='del'>-		irq_tab[i].devname = NULL;</div><div class='del'>-		irq_tab[i].count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mvme147_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt; 255) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	if (!(irq_tab[irq].flags &amp; IRQ_FLG_STD)) {</div><div class='del'>-		if (irq_tab[irq].flags &amp; IRQ_FLG_LOCK) {</div><div class='del'>-			printk("%s: IRQ %d from %s is not replaceable\n",</div><div class='del'>-			       __FUNCTION__, irq, irq_tab[irq].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		if (flags &amp; IRQ_FLG_REPLACE) {</div><div class='del'>-			printk("%s: %s can't replace IRQ %d from %s\n",</div><div class='del'>-			       __FUNCTION__, devname, irq, irq_tab[irq].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	irq_tab[irq].handler = handler;</div><div class='del'>-	irq_tab[irq].flags   = flags;</div><div class='del'>-	irq_tab[irq].dev_id  = dev_id;</div><div class='del'>-	irq_tab[irq].devname = devname;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mvme147_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt; 255) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (irq_tab[irq].dev_id != dev_id)</div><div class='del'>-		printk("%s: Removing probably wrong IRQ %d from %s\n",</div><div class='del'>-		       __FUNCTION__, irq, irq_tab[irq].devname);</div><div class='del'>-</div><div class='del'>-	irq_tab[irq].handler = mvme147_defhand;</div><div class='del'>-	irq_tab[irq].flags   = IRQ_FLG_STD;</div><div class='del'>-	irq_tab[irq].dev_id  = NULL;</div><div class='del'>-	irq_tab[irq].devname = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t mvme147_process_int (unsigned long vec, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	if (vec &gt; 255) {</div><div class='del'>-		printk ("mvme147_process_int: Illegal vector %ld\n", vec);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	} else {</div><div class='del'>-		irq_tab[vec].count++;</div><div class='del'>-		irq_tab[vec].handler(vec, irq_tab[vec].dev_id, fp);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int show_mvme147_interrupts (struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 256; i++) {</div><div class='del'>-		if (irq_tab[i].count)</div><div class='del'>-			seq_printf(p, "Vec 0x%02x: %8d  %s\n",</div><div class='del'>-			    i, irq_tab[i].count,</div><div class='del'>-			    irq_tab[i].devname ? irq_tab[i].devname : "free");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static irqreturn_t mvme147_defhand (int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	printk ("Unknown interrupt 0x%02x\n", irq);</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mvme147_enable_irq (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void mvme147_disable_irq (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/m68k/mvme147/Makefile b/arch/m68k/mvme147/Makefile<br/>index f0153ed3efa5..a36d38dbfbbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme147/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme147/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mvme147/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mvme147/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for Linux arch/m68k/mvme147 source directory</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= config.o 147ints.o</div><div class='add'>+obj-y		:= config.o</div><div class='head'>diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c<br/>index 0fcf9720c2fe..0cd0e5bddcee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme147/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme147/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mvme147/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mvme147/config.c</a></div><div class='hunk'>@@ -36,15 +36,8 @@</div><div class='ctx'> #include &lt;asm/mvme147hw.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern irqreturn_t mvme147_process_int (int level, struct pt_regs *regs);</div><div class='del'>-extern void mvme147_init_IRQ (void);</div><div class='del'>-extern void mvme147_free_irq (unsigned int, void *);</div><div class='del'>-extern int  show_mvme147_interrupts (struct seq_file *, void *);</div><div class='del'>-extern void mvme147_enable_irq (unsigned int);</div><div class='del'>-extern void mvme147_disable_irq (unsigned int);</div><div class='ctx'> static void mvme147_get_model(char *model);</div><div class='ctx'> static int  mvme147_get_hardware_list(char *buffer);</div><div class='del'>-extern int mvme147_request_irq (unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);</div><div class='ctx'> extern void mvme147_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='ctx'> extern unsigned long mvme147_gettimeoffset (void);</div><div class='ctx'> extern int mvme147_hwclk (int, struct rtc_time *);</div><div class='hunk'>@@ -91,6 +84,15 @@ static int mvme147_get_hardware_list(char *buffer)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function is called during kernel startup to initialize</div><div class='add'>+ * the mvme147 IRQ handling routines.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void mvme147_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	m68k_setup_user_interrupt(VEC_USER, 192, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void __init config_mvme147(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -101,12 +103,6 @@ void __init config_mvme147(void)</div><div class='ctx'> 	mach_hwclk		= mvme147_hwclk;</div><div class='ctx'> 	mach_set_clock_mmss	= mvme147_set_clock_mmss;</div><div class='ctx'> 	mach_reset		= mvme147_reset;</div><div class='del'>-	mach_free_irq		= mvme147_free_irq;</div><div class='del'>-	mach_process_int	= mvme147_process_int;</div><div class='del'>-	mach_get_irq_list	= show_mvme147_interrupts;</div><div class='del'>-	mach_request_irq	= mvme147_request_irq;</div><div class='del'>-	enable_irq		= mvme147_enable_irq;</div><div class='del'>-	disable_irq		= mvme147_disable_irq;</div><div class='ctx'> 	mach_get_model		= mvme147_get_model;</div><div class='ctx'> 	mach_get_hardware_list	= mvme147_get_hardware_list;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/mvme16x/16xints.c b/arch/m68k/mvme16x/16xints.c<br/>deleted file mode 100644<br/>index 793ef735b59c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/16xints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme16x/16xints.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/m68k/mvme16x/16xints.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1995 Richard Hirst [richard@sleepie.demon.co.uk]</div><div class='del'>- *</div><div class='del'>- * based on amiints.c -- Amiga Linux interrupt handling code</div><div class='del'>- *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file README.legal in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-</div><div class='del'>-static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This should ideally be 4 elements only, for speed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	irqreturn_t	(*handler)(int, void *, struct pt_regs *);</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	void		*dev_id;</div><div class='del'>-	const char	*devname;</div><div class='del'>-	unsigned	count;</div><div class='del'>-} irq_tab[192];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * void mvme16x_init_IRQ (void)</div><div class='del'>- *</div><div class='del'>- * Parameters:	None</div><div class='del'>- *</div><div class='del'>- * Returns:	Nothing</div><div class='del'>- *</div><div class='del'>- * This function is called during kernel startup to initialize</div><div class='del'>- * the mvme16x IRQ handling routines.  Should probably ensure</div><div class='del'>- * that the base vectors for the VMEChip2 and PCCChip2 are valid.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void mvme16x_init_IRQ (void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 192; i++) {</div><div class='del'>-		irq_tab[i].handler = mvme16x_defhand;</div><div class='del'>-		irq_tab[i].flags = IRQ_FLG_STD;</div><div class='del'>-		irq_tab[i].dev_id = NULL;</div><div class='del'>-		irq_tab[i].devname = NULL;</div><div class='del'>-		irq_tab[i].count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mvme16x_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &lt; 64 || irq &gt; 255) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(irq_tab[irq-64].flags &amp; IRQ_FLG_STD)) {</div><div class='del'>-		if (irq_tab[irq-64].flags &amp; IRQ_FLG_LOCK) {</div><div class='del'>-			printk("%s: IRQ %d from %s is not replaceable\n",</div><div class='del'>-			       __FUNCTION__, irq, irq_tab[irq-64].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		if (flags &amp; IRQ_FLG_REPLACE) {</div><div class='del'>-			printk("%s: %s can't replace IRQ %d from %s\n",</div><div class='del'>-			       __FUNCTION__, devname, irq, irq_tab[irq-64].devname);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	irq_tab[irq-64].handler = handler;</div><div class='del'>-	irq_tab[irq-64].flags   = flags;</div><div class='del'>-	irq_tab[irq-64].dev_id  = dev_id;</div><div class='del'>-	irq_tab[irq-64].devname = devname;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mvme16x_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &lt; 64 || irq &gt; 255) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (irq_tab[irq-64].dev_id != dev_id)</div><div class='del'>-		printk("%s: Removing probably wrong IRQ %d from %s\n",</div><div class='del'>-		       __FUNCTION__, irq, irq_tab[irq-64].devname);</div><div class='del'>-</div><div class='del'>-	irq_tab[irq-64].handler = mvme16x_defhand;</div><div class='del'>-	irq_tab[irq-64].flags   = IRQ_FLG_STD;</div><div class='del'>-	irq_tab[irq-64].dev_id  = NULL;</div><div class='del'>-	irq_tab[irq-64].devname = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t mvme16x_process_int (unsigned long vec, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	if (vec &lt; 64 || vec &gt; 255) {</div><div class='del'>-		printk ("mvme16x_process_int: Illegal vector %ld", vec);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	} else {</div><div class='del'>-		irq_tab[vec-64].count++;</div><div class='del'>-		irq_tab[vec-64].handler(vec, irq_tab[vec-64].dev_id, fp);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int show_mvme16x_interrupts (struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 192; i++) {</div><div class='del'>-		if (irq_tab[i].count)</div><div class='del'>-			seq_printf(p, "Vec 0x%02x: %8d  %s\n",</div><div class='del'>-			    i+64, irq_tab[i].count,</div><div class='del'>-			    irq_tab[i].devname ? irq_tab[i].devname : "free");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static irqreturn_t mvme16x_defhand (int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	printk ("Unknown interrupt 0x%02x\n", irq);</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void mvme16x_enable_irq (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void mvme16x_disable_irq (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/arch/m68k/mvme16x/Makefile b/arch/m68k/mvme16x/Makefile<br/>index 5129f56b64a3..950e82f21640 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme16x/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mvme16x/Makefile</a></div><div class='hunk'>@@ -2,4 +2,4 @@</div><div class='ctx'> # Makefile for Linux arch/m68k/mvme16x source directory</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		:= config.o 16xints.o rtc.o mvme16x_ksyms.o</div><div class='add'>+obj-y		:= config.o rtc.o mvme16x_ksyms.o</div><div class='head'>diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c<br/>index 26ce81c1337d..ce2727ed1bc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/mvme16x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/mvme16x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/mvme16x/config.c</a></div><div class='hunk'>@@ -40,15 +40,8 @@ extern t_bdid mvme_bdid;</div><div class='ctx'> </div><div class='ctx'> static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;</div><div class='ctx'> </div><div class='del'>-extern irqreturn_t mvme16x_process_int (int level, struct pt_regs *regs);</div><div class='del'>-extern void mvme16x_init_IRQ (void);</div><div class='del'>-extern void mvme16x_free_irq (unsigned int, void *);</div><div class='del'>-extern int show_mvme16x_interrupts (struct seq_file *, void *);</div><div class='del'>-extern void mvme16x_enable_irq (unsigned int);</div><div class='del'>-extern void mvme16x_disable_irq (unsigned int);</div><div class='ctx'> static void mvme16x_get_model(char *model);</div><div class='ctx'> static int  mvme16x_get_hardware_list(char *buffer);</div><div class='del'>-extern int  mvme16x_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);</div><div class='ctx'> extern void mvme16x_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='ctx'> extern unsigned long mvme16x_gettimeoffset (void);</div><div class='ctx'> extern int mvme16x_hwclk (int, struct rtc_time *);</div><div class='hunk'>@@ -120,6 +113,16 @@ static int mvme16x_get_hardware_list(char *buffer)</div><div class='ctx'>     return (len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This function is called during kernel startup to initialize</div><div class='add'>+ * the mvme16x IRQ handling routines.  Should probably ensure</div><div class='add'>+ * that the base vectors for the VMEChip2 and PCCChip2 are valid.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void mvme16x_init_IRQ (void)</div><div class='add'>+{</div><div class='add'>+	m68k_setup_user_interrupt(VEC_USER, 192, NULL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define pcc2chip	((volatile u_char *)0xfff42000)</div><div class='ctx'> #define PccSCCMICR	0x1d</div><div class='hunk'>@@ -138,12 +141,6 @@ void __init config_mvme16x(void)</div><div class='ctx'>     mach_hwclk           = mvme16x_hwclk;</div><div class='ctx'>     mach_set_clock_mmss	 = mvme16x_set_clock_mmss;</div><div class='ctx'>     mach_reset		 = mvme16x_reset;</div><div class='del'>-    mach_free_irq	 = mvme16x_free_irq;</div><div class='del'>-    mach_process_int	 = mvme16x_process_int;</div><div class='del'>-    mach_get_irq_list	 = show_mvme16x_interrupts;</div><div class='del'>-    mach_request_irq	 = mvme16x_request_irq;</div><div class='del'>-    enable_irq           = mvme16x_enable_irq;</div><div class='del'>-    disable_irq          = mvme16x_disable_irq;</div><div class='ctx'>     mach_get_model       = mvme16x_get_model;</div><div class='ctx'>     mach_get_hardware_list = mvme16x_get_hardware_list;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c<br/>index 5e0f9b04d45e..9a1827876408 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/q40/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/q40/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/q40/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/q40/config.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -37,15 +36,9 @@</div><div class='ctx'> #include &lt;asm/q40_master.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern irqreturn_t q40_process_int (int level, struct pt_regs *regs);</div><div class='del'>-extern irqreturn_t (*q40_default_handler[]) (int, void *, struct pt_regs *);  /* added just for debugging */</div><div class='ctx'> extern void q40_init_IRQ (void);</div><div class='del'>-extern void q40_free_irq (unsigned int, void *);</div><div class='del'>-extern int  show_q40_interrupts (struct seq_file *, void *);</div><div class='del'>-extern void q40_enable_irq (unsigned int);</div><div class='del'>-extern void q40_disable_irq (unsigned int);</div><div class='ctx'> static void q40_get_model(char *model);</div><div class='ctx'> static int  q40_get_hardware_list(char *buffer);</div><div class='del'>-extern int  q40_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id);</div><div class='ctx'> extern void q40_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='ctx'> </div><div class='ctx'> extern unsigned long q40_gettimeoffset (void);</div><div class='hunk'>@@ -175,13 +168,6 @@ void __init config_q40(void)</div><div class='ctx'>     mach_set_clock_mmss	 = q40_set_clock_mmss;</div><div class='ctx'> </div><div class='ctx'>     mach_reset		 = q40_reset;</div><div class='del'>-    mach_free_irq	 = q40_free_irq;</div><div class='del'>-    mach_process_int	 = q40_process_int;</div><div class='del'>-    mach_get_irq_list	 = show_q40_interrupts;</div><div class='del'>-    mach_request_irq	 = q40_request_irq;</div><div class='del'>-    enable_irq		 = q40_enable_irq;</div><div class='del'>-    disable_irq          = q40_disable_irq;</div><div class='del'>-    mach_default_handler = &amp;q40_default_handler;</div><div class='ctx'>     mach_get_model       = q40_get_model;</div><div class='ctx'>     mach_get_hardware_list = q40_get_hardware_list;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c<br/>index f8ecc2664fe6..472f41c4158b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/q40/q40ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/q40/q40ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/q40/q40ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/q40/q40ints.c</a></div><div class='hunk'>@@ -14,13 +14,8 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/hardirq.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/rtc.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -39,29 +34,37 @@</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-extern int ints_inited;</div><div class='add'>+static void q40_irq_handler(unsigned int, struct pt_regs *fp);</div><div class='add'>+static void q40_enable_irq(unsigned int);</div><div class='add'>+static void q40_disable_irq(unsigned int);</div><div class='ctx'> </div><div class='add'>+unsigned short q40_ablecount[35];</div><div class='add'>+unsigned short q40_state[35];</div><div class='ctx'> </div><div class='del'>-irqreturn_t q40_irq2_handler (int, void *, struct pt_regs *fp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static irqreturn_t q40_defhand (int irq, void *dev_id, struct pt_regs *fp);</div><div class='del'>-static irqreturn_t default_handler(int lev, void *dev_id, struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DEVNAME_SIZE 24</div><div class='add'>+static int q40_irq_startup(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	/* test for ISA ints not implemented by HW */</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case 1: case 2: case 8: case 9:</div><div class='add'>+	case 11: case 12: case 13:</div><div class='add'>+		printk("%s: ISA IRQ %d not implemented by HW\n", __FUNCTION__, irq);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct q40_irq_node {</div><div class='del'>-	irqreturn_t	(*handler)(int, void *, struct pt_regs *);</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	void		*dev_id;</div><div class='del'>-  /*        struct q40_irq_node *next;*/</div><div class='del'>-        char	        devname[DEVNAME_SIZE];</div><div class='del'>-	unsigned	count;</div><div class='del'>-        unsigned short  state;</div><div class='del'>-} irq_tab[Q40_IRQ_MAX+1];</div><div class='add'>+static void q40_irq_shutdown(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-short unsigned q40_ablecount[Q40_IRQ_MAX+1];</div><div class='add'>+static struct irq_controller q40_irq_controller = {</div><div class='add'>+	.name		= "q40",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.startup	= q40_irq_startup,</div><div class='add'>+	.shutdown	= q40_irq_shutdown,</div><div class='add'>+	.enable		= q40_enable_irq,</div><div class='add'>+	.disable	= q40_disable_irq,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * void q40_init_IRQ (void)</div><div class='hunk'>@@ -74,139 +77,29 @@ short unsigned q40_ablecount[Q40_IRQ_MAX+1];</div><div class='ctx'>  * the q40 IRQ handling routines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int disabled=0;</div><div class='add'>+static int disabled;</div><div class='ctx'> </div><div class='del'>-void q40_init_IRQ (void)</div><div class='add'>+void q40_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	disabled=0;</div><div class='del'>-	for (i = 0; i &lt;= Q40_IRQ_MAX; i++) {</div><div class='del'>-		irq_tab[i].handler = q40_defhand;</div><div class='del'>-		irq_tab[i].flags = 0;</div><div class='del'>-		irq_tab[i].dev_id = NULL;</div><div class='del'>-		/*		irq_tab[i].next = NULL;*/</div><div class='del'>-		irq_tab[i].devname[0] = 0;</div><div class='del'>-		irq_tab[i].count = 0;</div><div class='del'>-		irq_tab[i].state =0;</div><div class='del'>-		q40_ablecount[i]=0;   /* all enabled */</div><div class='del'>-	}</div><div class='add'>+	m68k_setup_irq_controller(&amp;q40_irq_controller, 1, Q40_IRQ_MAX);</div><div class='ctx'> </div><div class='ctx'> 	/* setup handler for ISA ints */</div><div class='del'>-	cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip",</div><div class='del'>-			NULL);</div><div class='add'>+	m68k_setup_auto_interrupt(q40_irq_handler);</div><div class='add'>+</div><div class='add'>+	m68k_irq_startup(IRQ_AUTO_2);</div><div class='add'>+	m68k_irq_startup(IRQ_AUTO_4);</div><div class='ctx'> </div><div class='ctx'> 	/* now enable some ints.. */</div><div class='del'>-	master_outb(1,EXT_ENABLE_REG);  /* ISA IRQ 5-15 */</div><div class='add'>+	master_outb(1, EXT_ENABLE_REG);  /* ISA IRQ 5-15 */</div><div class='ctx'> </div><div class='ctx'> 	/* make sure keyboard IRQ is disabled */</div><div class='del'>-	master_outb(0,KEY_IRQ_ENABLE_REG);</div><div class='add'>+	master_outb(0, KEY_IRQ_ENABLE_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int q40_request_irq(unsigned int irq,</div><div class='del'>-		irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-  /*printk("q40_request_irq %d, %s\n",irq,devname);*/</div><div class='del'>-</div><div class='del'>-	if (irq &gt; Q40_IRQ_MAX || (irq&gt;15 &amp;&amp; irq&lt;32)) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* test for ISA ints not implemented by HW */</div><div class='del'>-	switch (irq)</div><div class='del'>-	  {</div><div class='del'>-	  case 1: case 2: case 8: case 9:</div><div class='del'>-	  case 12: case 13:</div><div class='del'>-	    printk("%s: ISA IRQ %d from %s not implemented by HW\n", __FUNCTION__, irq, devname);</div><div class='del'>-	    return -ENXIO;</div><div class='del'>-	  case 11:</div><div class='del'>-	    printk("warning IRQ 10 and 11 not distinguishable\n");</div><div class='del'>-	    irq=10;</div><div class='del'>-	  default:</div><div class='del'>-	    ;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	if (irq&lt;Q40_IRQ_SAMPLE)</div><div class='del'>-	  {</div><div class='del'>-	    if (irq_tab[irq].dev_id != NULL)</div><div class='del'>-		  {</div><div class='del'>-		    printk("%s: IRQ %d from %s is not replaceable\n",</div><div class='del'>-			   __FUNCTION__, irq, irq_tab[irq].devname);</div><div class='del'>-		    return -EBUSY;</div><div class='del'>-		  }</div><div class='del'>-	    /*printk("IRQ %d set to handler %p\n",irq,handler);*/</div><div class='del'>-	    if (dev_id==NULL)</div><div class='del'>-		  {</div><div class='del'>-		printk("WARNING: dev_id == NULL in request_irq\n");</div><div class='del'>-		dev_id=(void*)1;</div><div class='del'>-	      }</div><div class='del'>-	    irq_tab[irq].handler = handler;</div><div class='del'>-	    irq_tab[irq].flags   = flags;</div><div class='del'>-	    irq_tab[irq].dev_id  = dev_id;</div><div class='del'>-	    strlcpy(irq_tab[irq].devname,devname,sizeof(irq_tab[irq].devname));</div><div class='del'>-	    irq_tab[irq].state = 0;</div><div class='del'>-	    return 0;</div><div class='del'>-	  }</div><div class='del'>-	else {</div><div class='del'>-	  /* Q40_IRQ_SAMPLE :somewhat special actions required here ..*/</div><div class='del'>-	  cpu_request_irq(4, handler, flags, devname, dev_id);</div><div class='del'>-	  cpu_request_irq(6, handler, flags, devname, dev_id);</div><div class='del'>-	  return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void q40_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (irq &gt; Q40_IRQ_MAX || (irq&gt;15 &amp;&amp; irq&lt;32)) {</div><div class='del'>-		printk("%s: Incorrect IRQ %d, dev_id %x \n", __FUNCTION__, irq, (unsigned)dev_id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* test for ISA ints not implemented by HW */</div><div class='del'>-	switch (irq)</div><div class='del'>-	  {</div><div class='del'>-	  case 1: case 2: case 8: case 9:</div><div class='del'>-	  case 12: case 13:</div><div class='del'>-	    printk("%s: ISA IRQ %d from %x invalid\n", __FUNCTION__, irq, (unsigned)dev_id);</div><div class='del'>-	    return;</div><div class='del'>-	  case 11: irq=10;</div><div class='del'>-	  default:</div><div class='del'>-	    ;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	if (irq&lt;Q40_IRQ_SAMPLE)</div><div class='del'>-	  {</div><div class='del'>-	    if (irq_tab[irq].dev_id != dev_id)</div><div class='del'>-	      printk("%s: Removing probably wrong IRQ %d from %s\n",</div><div class='del'>-		     __FUNCTION__, irq, irq_tab[irq].devname);</div><div class='del'>-</div><div class='del'>-	    irq_tab[irq].handler = q40_defhand;</div><div class='del'>-	    irq_tab[irq].flags   = 0;</div><div class='del'>-	    irq_tab[irq].dev_id  = NULL;</div><div class='del'>-	    /* irq_tab[irq].devname = NULL; */</div><div class='del'>-	    /* do not reset state !! */</div><div class='del'>-	  }</div><div class='del'>-	else</div><div class='del'>-	  { /* == Q40_IRQ_SAMPLE */</div><div class='del'>-	    cpu_free_irq(4, dev_id);</div><div class='del'>-	    cpu_free_irq(6, dev_id);</div><div class='del'>-	  }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-irqreturn_t q40_process_int (int level, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-  printk("unexpected interrupt vec=%x, pc=%lx, d0=%lx, d0_orig=%lx, d1=%lx, d2=%lx\n",</div><div class='del'>-          level, fp-&gt;pc, fp-&gt;d0, fp-&gt;orig_d0, fp-&gt;d1, fp-&gt;d2);</div><div class='del'>-  printk("\tIIRQ_REG = %x, EIRQ_REG = %x\n",master_inb(IIRQ_REG),master_inb(EIRQ_REG));</div><div class='del'>-  return IRQ_HANDLED;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * this stuff doesn't really belong here..</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> int ql_ticks;              /* 200Hz ticks since last jiffie */</div><div class='ctx'> static int sound_ticks;</div><div class='hunk'>@@ -215,54 +108,53 @@ static int sound_ticks;</div><div class='ctx'> </div><div class='ctx'> void q40_mksound(unsigned int hz, unsigned int ticks)</div><div class='ctx'> {</div><div class='del'>-  /* for now ignore hz, except that hz==0 switches off sound */</div><div class='del'>-  /* simply alternate the ampl (128-SVOL)-(128+SVOL)-..-.. at 200Hz */</div><div class='del'>-  if (hz==0)</div><div class='del'>-    {</div><div class='del'>-      if (sound_ticks)</div><div class='del'>-	sound_ticks=1;</div><div class='del'>-</div><div class='del'>-      *DAC_LEFT=128;</div><div class='del'>-      *DAC_RIGHT=128;</div><div class='del'>-</div><div class='del'>-      return;</div><div class='del'>-    }</div><div class='del'>-  /* sound itself is done in q40_timer_int */</div><div class='del'>-  if (sound_ticks == 0) sound_ticks=1000; /* pretty long beep */</div><div class='del'>-  sound_ticks=ticks&lt;&lt;1;</div><div class='add'>+	/* for now ignore hz, except that hz==0 switches off sound */</div><div class='add'>+	/* simply alternate the ampl (128-SVOL)-(128+SVOL)-..-.. at 200Hz */</div><div class='add'>+	if (hz == 0) {</div><div class='add'>+		if (sound_ticks)</div><div class='add'>+			sound_ticks = 1;</div><div class='add'>+</div><div class='add'>+		*DAC_LEFT = 128;</div><div class='add'>+		*DAC_RIGHT = 128;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* sound itself is done in q40_timer_int */</div><div class='add'>+	if (sound_ticks == 0)</div><div class='add'>+		sound_ticks = 1000; /* pretty long beep */</div><div class='add'>+	sound_ticks = ticks &lt;&lt; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t (*q40_timer_routine)(int, void *, struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t q40_timer_int (int irq, void * dev, struct pt_regs * regs)</div><div class='ctx'> {</div><div class='del'>-    ql_ticks = ql_ticks ? 0 : 1;</div><div class='del'>-    if (sound_ticks)</div><div class='del'>-      {</div><div class='del'>-	unsigned char sval=(sound_ticks &amp; 1) ? 128-SVOL : 128+SVOL;</div><div class='del'>-	sound_ticks--;</div><div class='del'>-	*DAC_LEFT=sval;</div><div class='del'>-	*DAC_RIGHT=sval;</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-    if (!ql_ticks)</div><div class='del'>-	q40_timer_routine(irq, dev, regs);</div><div class='del'>-    return IRQ_HANDLED;</div><div class='add'>+	ql_ticks = ql_ticks ? 0 : 1;</div><div class='add'>+	if (sound_ticks) {</div><div class='add'>+		unsigned char sval=(sound_ticks &amp; 1) ? 128-SVOL : 128+SVOL;</div><div class='add'>+		sound_ticks--;</div><div class='add'>+		*DAC_LEFT=sval;</div><div class='add'>+		*DAC_RIGHT=sval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ql_ticks)</div><div class='add'>+		q40_timer_routine(irq, dev, regs);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void q40_sched_init (irqreturn_t (*timer_routine)(int, void *, struct pt_regs *))</div><div class='ctx'> {</div><div class='del'>-    int timer_irq;</div><div class='add'>+	int timer_irq;</div><div class='ctx'> </div><div class='del'>-    q40_timer_routine = timer_routine;</div><div class='del'>-    timer_irq=Q40_IRQ_FRAME;</div><div class='add'>+	q40_timer_routine = timer_routine;</div><div class='add'>+	timer_irq = Q40_IRQ_FRAME;</div><div class='ctx'> </div><div class='del'>-    if (request_irq(timer_irq, q40_timer_int, 0,</div><div class='add'>+	if (request_irq(timer_irq, q40_timer_int, 0,</div><div class='ctx'> 				"timer", q40_timer_int))</div><div class='del'>-	panic ("Couldn't register timer int");</div><div class='add'>+		panic("Couldn't register timer int");</div><div class='ctx'> </div><div class='del'>-    master_outb(-1,FRAME_CLEAR_REG);</div><div class='del'>-    master_outb( 1,FRAME_RATE_REG);</div><div class='add'>+	master_outb(-1, FRAME_CLEAR_REG);</div><div class='add'>+	master_outb( 1, FRAME_RATE_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -308,169 +200,132 @@ static int mext_disabled=0;  /* ext irq disabled by master chip? */</div><div class='ctx'> static int aliased_irq=0;  /* how many times inside handler ?*/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* got level 2 interrupt, dispatch to ISA or keyboard/timer IRQs */</div><div class='del'>-irqreturn_t q40_irq2_handler (int vec, void *devname, struct pt_regs *fp)</div><div class='add'>+/* got interrupt, dispatch to ISA or keyboard/timer IRQs */</div><div class='add'>+static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)</div><div class='ctx'> {</div><div class='del'>-  unsigned mir, mer;</div><div class='del'>-  int irq,i;</div><div class='add'>+	unsigned mir, mer;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> //repeat:</div><div class='del'>-  mir=master_inb(IIRQ_REG);</div><div class='del'>-  if (mir&amp;Q40_IRQ_FRAME_MASK) {</div><div class='del'>-	  irq_tab[Q40_IRQ_FRAME].count++;</div><div class='del'>-	  irq_tab[Q40_IRQ_FRAME].handler(Q40_IRQ_FRAME,irq_tab[Q40_IRQ_FRAME].dev_id,fp);</div><div class='del'>-	  master_outb(-1,FRAME_CLEAR_REG);</div><div class='del'>-  }</div><div class='del'>-  if ((mir&amp;Q40_IRQ_SER_MASK) || (mir&amp;Q40_IRQ_EXT_MASK)) {</div><div class='del'>-	  mer=master_inb(EIRQ_REG);</div><div class='del'>-	  for (i=0; eirqs[i].mask; i++) {</div><div class='del'>-		  if (mer&amp;(eirqs[i].mask)) {</div><div class='del'>-			  irq=eirqs[i].irq;</div><div class='add'>+	mir = master_inb(IIRQ_REG);</div><div class='add'>+#ifdef CONFIG_BLK_DEV_FD</div><div class='add'>+	if ((mir &amp; Q40_IRQ_EXT_MASK) &amp;&amp;</div><div class='add'>+	    (master_inb(EIRQ_REG) &amp; Q40_IRQ6_MASK)) {</div><div class='add'>+		floppy_hardint();</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	switch (irq) {</div><div class='add'>+	case 4:</div><div class='add'>+	case 6:</div><div class='add'>+		m68k_handle_int(Q40_IRQ_SAMPLE, fp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (mir &amp; Q40_IRQ_FRAME_MASK) {</div><div class='add'>+		m68k_handle_int(Q40_IRQ_FRAME, fp);</div><div class='add'>+		master_outb(-1, FRAME_CLEAR_REG);</div><div class='add'>+	}</div><div class='add'>+	if ((mir &amp; Q40_IRQ_SER_MASK) || (mir &amp; Q40_IRQ_EXT_MASK)) {</div><div class='add'>+		mer = master_inb(EIRQ_REG);</div><div class='add'>+		for (i = 0; eirqs[i].mask; i++) {</div><div class='add'>+			if (mer &amp; eirqs[i].mask) {</div><div class='add'>+				irq = eirqs[i].irq;</div><div class='ctx'> /*</div><div class='ctx'>  * There is a little mess wrt which IRQ really caused this irq request. The</div><div class='ctx'>  * main problem is that IIRQ_REG and EIRQ_REG reflect the state when they</div><div class='ctx'>  * are read - which is long after the request came in. In theory IRQs should</div><div class='ctx'>  * not just go away but they occassionally do</div><div class='ctx'>  */</div><div class='del'>-			  if (irq&gt;4 &amp;&amp; irq&lt;=15 &amp;&amp; mext_disabled) {</div><div class='del'>-				  /*aliased_irq++;*/</div><div class='del'>-				  goto iirq;</div><div class='del'>-			  }</div><div class='del'>-			  if (irq_tab[irq].handler == q40_defhand ) {</div><div class='del'>-				  printk("handler for IRQ %d not defined\n",irq);</div><div class='del'>-				  continue; /* ignore uninited INTs :-( */</div><div class='del'>-			  }</div><div class='del'>-			  if ( irq_tab[irq].state &amp; IRQ_INPROGRESS ) {</div><div class='del'>-				  /* some handlers do local_irq_enable() for irq latency reasons, */</div><div class='del'>-				  /* however reentering an active irq handler is not permitted */</div><div class='add'>+				if (irq &gt; 4 &amp;&amp; irq &lt;= 15 &amp;&amp; mext_disabled) {</div><div class='add'>+					/*aliased_irq++;*/</div><div class='add'>+					goto iirq;</div><div class='add'>+				}</div><div class='add'>+				if (q40_state[irq] &amp; IRQ_INPROGRESS) {</div><div class='add'>+					/* some handlers do local_irq_enable() for irq latency reasons, */</div><div class='add'>+					/* however reentering an active irq handler is not permitted */</div><div class='ctx'> #ifdef IP_USE_DISABLE</div><div class='del'>-				  /* in theory this is the better way to do it because it still */</div><div class='del'>-				  /* lets through eg the serial irqs, unfortunately it crashes */</div><div class='del'>-				  disable_irq(irq);</div><div class='del'>-				  disabled=1;</div><div class='add'>+					/* in theory this is the better way to do it because it still */</div><div class='add'>+					/* lets through eg the serial irqs, unfortunately it crashes */</div><div class='add'>+					disable_irq(irq);</div><div class='add'>+					disabled = 1;</div><div class='ctx'> #else</div><div class='del'>-				  /*printk("IRQ_INPROGRESS detected for irq %d, disabling - %s disabled\n",irq,disabled ? "already" : "not yet"); */</div><div class='del'>-				  fp-&gt;sr = (((fp-&gt;sr) &amp; (~0x700))+0x200);</div><div class='del'>-				  disabled=1;</div><div class='add'>+					/*printk("IRQ_INPROGRESS detected for irq %d, disabling - %s disabled\n",</div><div class='add'>+						irq, disabled ? "already" : "not yet"); */</div><div class='add'>+					fp-&gt;sr = (((fp-&gt;sr) &amp; (~0x700))+0x200);</div><div class='add'>+					disabled = 1;</div><div class='ctx'> #endif</div><div class='del'>-				  goto iirq;</div><div class='del'>-			  }</div><div class='del'>-			  irq_tab[irq].count++;</div><div class='del'>-			  irq_tab[irq].state |= IRQ_INPROGRESS;</div><div class='del'>-			  irq_tab[irq].handler(irq,irq_tab[irq].dev_id,fp);</div><div class='del'>-			  irq_tab[irq].state &amp;= ~IRQ_INPROGRESS;</div><div class='del'>-</div><div class='del'>-			  /* naively enable everything, if that fails than    */</div><div class='del'>-			  /* this function will be reentered immediately thus */</div><div class='del'>-			  /* getting another chance to disable the IRQ        */</div><div class='del'>-</div><div class='del'>-			  if ( disabled ) {</div><div class='add'>+					goto iirq;</div><div class='add'>+				}</div><div class='add'>+				q40_state[irq] |= IRQ_INPROGRESS;</div><div class='add'>+				m68k_handle_int(irq, fp);</div><div class='add'>+				q40_state[irq] &amp;= ~IRQ_INPROGRESS;</div><div class='add'>+</div><div class='add'>+				/* naively enable everything, if that fails than    */</div><div class='add'>+				/* this function will be reentered immediately thus */</div><div class='add'>+				/* getting another chance to disable the IRQ        */</div><div class='add'>+</div><div class='add'>+				if (disabled) {</div><div class='ctx'> #ifdef IP_USE_DISABLE</div><div class='del'>-				  if (irq&gt;4){</div><div class='del'>-					  disabled=0;</div><div class='del'>-					  enable_irq(irq);}</div><div class='add'>+					if (irq &gt; 4) {</div><div class='add'>+						disabled = 0;</div><div class='add'>+						enable_irq(irq);</div><div class='add'>+					}</div><div class='ctx'> #else</div><div class='del'>-				  disabled=0;</div><div class='del'>-				  /*printk("reenabling irq %d\n",irq); */</div><div class='add'>+					disabled = 0;</div><div class='add'>+					/*printk("reenabling irq %d\n", irq); */</div><div class='ctx'> #endif</div><div class='del'>-			  }</div><div class='add'>+				}</div><div class='ctx'> // used to do 'goto repeat;' here, this delayed bh processing too long</div><div class='del'>-			  return IRQ_HANDLED;</div><div class='del'>-		  }</div><div class='del'>-	  }</div><div class='del'>-	  if (mer &amp;&amp; ccleirq&gt;0 &amp;&amp; !aliased_irq)</div><div class='del'>-		  printk("ISA interrupt from unknown source? EIRQ_REG = %x\n",mer),ccleirq--;</div><div class='del'>-  }</div><div class='del'>- iirq:</div><div class='del'>-  mir=master_inb(IIRQ_REG);</div><div class='del'>-  /* should test whether keyboard irq is really enabled, doing it in defhand */</div><div class='del'>-  if (mir&amp;Q40_IRQ_KEYB_MASK) {</div><div class='del'>-	  irq_tab[Q40_IRQ_KEYBOARD].count++;</div><div class='del'>-	  irq_tab[Q40_IRQ_KEYBOARD].handler(Q40_IRQ_KEYBOARD,irq_tab[Q40_IRQ_KEYBOARD].dev_id,fp);</div><div class='del'>-  }</div><div class='del'>-  return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int show_q40_interrupts (struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= Q40_IRQ_MAX; i++) {</div><div class='del'>-		if (irq_tab[i].count)</div><div class='del'>-		      seq_printf(p, "%sIRQ %02d: %8d  %s%s\n",</div><div class='del'>-			      (i&lt;=15) ? "ISA-" : "    " ,</div><div class='del'>-			    i, irq_tab[i].count,</div><div class='del'>-			    irq_tab[i].devname[0] ? irq_tab[i].devname : "?",</div><div class='del'>-			    irq_tab[i].handler == q40_defhand ?</div><div class='del'>-					" (now unassigned)" : "");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (mer &amp;&amp; ccleirq &gt; 0 &amp;&amp; !aliased_irq) {</div><div class='add'>+			printk("ISA interrupt from unknown source? EIRQ_REG = %x\n",mer);</div><div class='add'>+			ccleirq--;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+ iirq:</div><div class='add'>+	mir = master_inb(IIRQ_REG);</div><div class='add'>+	/* should test whether keyboard irq is really enabled, doing it in defhand */</div><div class='add'>+	if (mir &amp; Q40_IRQ_KEYB_MASK)</div><div class='add'>+		m68k_handle_int(Q40_IRQ_KEYBOARD, fp);</div><div class='ctx'> </div><div class='del'>-static irqreturn_t q40_defhand (int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-        if (irq!=Q40_IRQ_KEYBOARD)</div><div class='del'>-	     printk ("Unknown q40 interrupt %d\n", irq);</div><div class='del'>-	else master_outb(-1,KEYBOARD_UNLOCK_REG);</div><div class='del'>-	return IRQ_NONE;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='del'>-static irqreturn_t default_handler(int lev, void *dev_id, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	printk ("Uninitialised interrupt level %d\n", lev);</div><div class='del'>-	return IRQ_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t (*q40_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {</div><div class='del'>-	 [0] = default_handler,</div><div class='del'>-	 [1] = default_handler,</div><div class='del'>-	 [2] = default_handler,</div><div class='del'>-	 [3] = default_handler,</div><div class='del'>-	 [4] = default_handler,</div><div class='del'>-	 [5] = default_handler,</div><div class='del'>-	 [6] = default_handler,</div><div class='del'>-	 [7] = default_handler</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> </div><div class='del'>-void q40_enable_irq (unsigned int irq)</div><div class='add'>+void q40_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-  if ( irq&gt;=5 &amp;&amp; irq&lt;=15 )</div><div class='del'>-  {</div><div class='del'>-    mext_disabled--;</div><div class='del'>-    if (mext_disabled&gt;0)</div><div class='del'>-	  printk("q40_enable_irq : nested disable/enable\n");</div><div class='del'>-    if (mext_disabled==0)</div><div class='del'>-    master_outb(1,EXT_ENABLE_REG);</div><div class='del'>-    }</div><div class='add'>+	if (irq &gt;= 5 &amp;&amp; irq &lt;= 15) {</div><div class='add'>+		mext_disabled--;</div><div class='add'>+		if (mext_disabled &gt; 0)</div><div class='add'>+			printk("q40_enable_irq : nested disable/enable\n");</div><div class='add'>+		if (mext_disabled == 0)</div><div class='add'>+			master_outb(1, EXT_ENABLE_REG);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void q40_disable_irq (unsigned int irq)</div><div class='add'>+void q40_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-  /* disable ISA iqs : only do something if the driver has been</div><div class='del'>-   * verified to be Q40 "compatible" - right now IDE, NE2K</div><div class='del'>-   * Any driver should not attempt to sleep across disable_irq !!</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-  if ( irq&gt;=5 &amp;&amp; irq&lt;=15 ) {</div><div class='del'>-    master_outb(0,EXT_ENABLE_REG);</div><div class='del'>-    mext_disabled++;</div><div class='del'>-    if (mext_disabled&gt;1) printk("disable_irq nesting count %d\n",mext_disabled);</div><div class='del'>-  }</div><div class='add'>+	/* disable ISA iqs : only do something if the driver has been</div><div class='add'>+	 * verified to be Q40 "compatible" - right now IDE, NE2K</div><div class='add'>+	 * Any driver should not attempt to sleep across disable_irq !!</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= 5 &amp;&amp; irq &lt;= 15) {</div><div class='add'>+		master_outb(0, EXT_ENABLE_REG);</div><div class='add'>+		mext_disabled++;</div><div class='add'>+		if (mext_disabled &gt; 1)</div><div class='add'>+			printk("disable_irq nesting count %d\n",mext_disabled);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long q40_probe_irq_on (void)</div><div class='add'>+unsigned long q40_probe_irq_on(void)</div><div class='ctx'> {</div><div class='del'>-  printk("irq probing not working - reconfigure the driver to avoid this\n");</div><div class='del'>-  return -1;</div><div class='add'>+	printk("irq probing not working - reconfigure the driver to avoid this\n");</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='del'>-int q40_probe_irq_off (unsigned long irqs)</div><div class='add'>+int q40_probe_irq_off(unsigned long irqs)</div><div class='ctx'> {</div><div class='del'>-  return -1;</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * compile-command: "m68k-linux-gcc -D__KERNEL__ -I/home/rz/lx/linux-2.2.6/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -ffixed-a2 -m68040   -c -o q40ints.o q40ints.c"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c<br/>index f1ca0dfbaa67..d09d03b3d956 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/sun3/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/sun3/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/sun3/config.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -36,7 +35,6 @@ extern char _text, _end;</div><div class='ctx'> char sun3_reserved_pmeg[SUN3_PMEGS_NUM];</div><div class='ctx'> </div><div class='ctx'> extern unsigned long sun3_gettimeoffset(void);</div><div class='del'>-extern int show_sun3_interrupts (struct seq_file *, void *);</div><div class='ctx'> extern void sun3_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='ctx'> extern void sun3_get_model (char* model);</div><div class='ctx'> extern void idprom_init (void);</div><div class='hunk'>@@ -147,13 +145,6 @@ void __init config_sun3(void)</div><div class='ctx'> </div><div class='ctx'>         mach_sched_init      =  sun3_sched_init;</div><div class='ctx'>         mach_init_IRQ        =  sun3_init_IRQ;</div><div class='del'>-        mach_default_handler = &amp;sun3_default_handler;</div><div class='del'>-        mach_request_irq     =  sun3_request_irq;</div><div class='del'>-        mach_free_irq        =  sun3_free_irq;</div><div class='del'>-	enable_irq	     =  sun3_enable_irq;</div><div class='del'>-        disable_irq	     =  sun3_disable_irq;</div><div class='del'>-	mach_process_int     =  sun3_process_int;</div><div class='del'>-        mach_get_irq_list    =  show_sun3_interrupts;</div><div class='ctx'>         mach_reset           =  sun3_reboot;</div><div class='ctx'> 	mach_gettimeoffset   =  sun3_gettimeoffset;</div><div class='ctx'> 	mach_get_model	     =  sun3_get_model;</div><div class='head'>diff --git a/arch/m68k/sun3/prom/init.c b/arch/m68k/sun3/prom/init.c<br/>index 2e6ae56aec12..202adfcc316e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/sun3/prom/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/prom/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/sun3/prom/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/sun3/prom/init.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68k/sun3/prom/printf.c b/arch/m68k/sun3/prom/printf.c<br/>index e6ee1006344e..e7bfde377b5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/sun3/prom/printf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/prom/printf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/sun3/prom/printf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/sun3/prom/printf.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * about or use it!  It's simple and smelly anyway....</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='head'>diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c<br/>index f04a1d25f1a2..6c265222cbcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/sun3/sun3dvma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/sun3dvma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/sun3/sun3dvma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/sun3/sun3dvma.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Contains common routines for sun3/sun3x DVMA management.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -119,8 +118,7 @@ static inline int refill(void)</div><div class='ctx'> 		if(hole-&gt;end == prev-&gt;start) {</div><div class='ctx'> 			hole-&gt;size += prev-&gt;size;</div><div class='ctx'> 			hole-&gt;end = prev-&gt;end;</div><div class='del'>-			list_del(&amp;(prev-&gt;list));</div><div class='del'>-			list_add(&amp;(prev-&gt;list), &amp;hole_cache);</div><div class='add'>+			list_move(&amp;(prev-&gt;list), &amp;hole_cache);</div><div class='ctx'> 			ret++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -182,8 +180,7 @@ static inline unsigned long get_baddr(int len, unsigned long align)</div><div class='ctx'> #endif</div><div class='ctx'> 			return hole-&gt;end;</div><div class='ctx'> 		} else if(hole-&gt;size == newlen) {</div><div class='del'>-			list_del(&amp;(hole-&gt;list));</div><div class='del'>-			list_add(&amp;(hole-&gt;list), &amp;hole_cache);</div><div class='add'>+			list_move(&amp;(hole-&gt;list), &amp;hole_cache);</div><div class='ctx'> 			dvma_entry_use(hole-&gt;start) = newlen;</div><div class='ctx'> #ifdef DVMA_DEBUG</div><div class='ctx'> 			dvma_allocs++;</div><div class='head'>diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c<br/>index e62a033cd493..f18b9d3ef16d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/sun3/sun3ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3/sun3ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/sun3/sun3ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/sun3/sun3ints.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -19,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void sun3_leds (unsigned char);</div><div class='del'>-static irqreturn_t sun3_inthandle(int irq, void *dev_id, struct pt_regs *fp);</div><div class='ctx'> </div><div class='ctx'> void sun3_disable_interrupts(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,48 +38,30 @@ int led_pattern[8] = {</div><div class='ctx'> </div><div class='ctx'> volatile unsigned char* sun3_intreg;</div><div class='ctx'> </div><div class='del'>-void sun3_insert_irq(irq_node_t **list, irq_node_t *node)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sun3_delete_irq(irq_node_t **list, void *dev_id)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void sun3_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	*sun3_intreg |=  (1&lt;&lt;irq);</div><div class='add'>+	*sun3_intreg |=  (1 &lt;&lt; irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void sun3_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	*sun3_intreg &amp;= ~(1&lt;&lt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void sun3_do_irq(int irq, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	kstat_cpu(0).irqs[SYS_IRQS + irq]++;</div><div class='del'>-	*sun3_intreg &amp;= ~(1&lt;&lt;irq);</div><div class='del'>-	*sun3_intreg |=  (1&lt;&lt;irq);</div><div class='add'>+	*sun3_intreg &amp;= ~(1 &lt;&lt; irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t sun3_int7(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> {</div><div class='del'>-	sun3_do_irq(irq,fp);</div><div class='del'>-	if(!(kstat_cpu(0).irqs[SYS_IRQS + irq] % 2000))</div><div class='del'>-		sun3_leds(led_pattern[(kstat_cpu(0).irqs[SYS_IRQS+irq]%16000)</div><div class='del'>-			  /2000]);</div><div class='add'>+	*sun3_intreg |=  (1 &lt;&lt; irq);</div><div class='add'>+	if (!(kstat_cpu(0).irqs[irq] % 2000))</div><div class='add'>+		sun3_leds(led_pattern[(kstat_cpu(0).irqs[irq] % 16000) / 2000]);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t sun3_int5(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> {</div><div class='del'>-        kstat_cpu(0).irqs[SYS_IRQS + irq]++;</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> 	intersil_clear();</div><div class='ctx'> #endif</div><div class='del'>-        *sun3_intreg &amp;= ~(1&lt;&lt;irq);</div><div class='del'>-        *sun3_intreg |=  (1&lt;&lt;irq);</div><div class='add'>+        *sun3_intreg |=  (1 &lt;&lt; irq);</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> 	intersil_clear();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -89,65 +69,8 @@ static irqreturn_t sun3_int5(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 	update_process_times(user_mode(fp));</div><div class='ctx'> #endif</div><div class='del'>-        if(!(kstat_cpu(0).irqs[SYS_IRQS + irq] % 20))</div><div class='del'>-                sun3_leds(led_pattern[(kstat_cpu(0).irqs[SYS_IRQS+irq]%160)</div><div class='del'>-                /20]);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* handle requested ints, excepting 5 and 7, which always do the same</div><div class='del'>-   thing */</div><div class='del'>-irqreturn_t (*sun3_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {</div><div class='del'>-	[0] = sun3_inthandle,</div><div class='del'>-	[1] = sun3_inthandle,</div><div class='del'>-	[2] = sun3_inthandle,</div><div class='del'>-	[3] = sun3_inthandle,</div><div class='del'>-	[4] = sun3_inthandle,</div><div class='del'>-	[5] = sun3_int5,</div><div class='del'>-	[6] = sun3_inthandle,</div><div class='del'>-	[7] = sun3_int7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *dev_names[SYS_IRQS] = {</div><div class='del'>-	[5] = "timer",</div><div class='del'>-	[7] = "int7 handler"</div><div class='del'>-};</div><div class='del'>-static void *dev_ids[SYS_IRQS];</div><div class='del'>-static irqreturn_t (*sun3_inthandler[SYS_IRQS])(int, void *, struct pt_regs *) = {</div><div class='del'>-	[5] = sun3_int5,</div><div class='del'>-	[7] = sun3_int7</div><div class='del'>-};</div><div class='del'>-static irqreturn_t (*sun3_vechandler[SUN3_INT_VECS])(int, void *, struct pt_regs *);</div><div class='del'>-static void *vec_ids[SUN3_INT_VECS];</div><div class='del'>-static const char *vec_names[SUN3_INT_VECS];</div><div class='del'>-static int vec_ints[SUN3_INT_VECS];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int show_sun3_interrupts(struct seq_file *p, void *v)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; (SUN3_INT_VECS-1); i++) {</div><div class='del'>-		if(sun3_vechandler[i] != NULL) {</div><div class='del'>-			seq_printf(p, "vec %3d: %10u %s\n", i+64,</div><div class='del'>-				   vec_ints[i],</div><div class='del'>-				   (vec_names[i]) ? vec_names[i] :</div><div class='del'>-				   "sun3_vechandler");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t sun3_inthandle(int irq, void *dev_id, struct pt_regs *fp)</div><div class='del'>-{</div><div class='del'>-	if(sun3_inthandler[irq] == NULL)</div><div class='del'>-		panic ("bad interrupt %d received (id %p)\n",irq, dev_id);</div><div class='del'>-</div><div class='del'>-        kstat_cpu(0).irqs[SYS_IRQS + irq]++;</div><div class='del'>-        *sun3_intreg &amp;= ~(1&lt;&lt;irq);</div><div class='del'>-</div><div class='del'>-	sun3_inthandler[irq](irq, dev_ids[irq], fp);</div><div class='add'>+        if (!(kstat_cpu(0).irqs[irq] % 20))</div><div class='add'>+                sun3_leds(led_pattern[(kstat_cpu(0).irqs[irq] % 160) / 20]);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,109 +80,31 @@ static irqreturn_t sun3_vec255(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sun3_init_IRQ(void)</div><div class='add'>+static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	*sun3_intreg = 1;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; SYS_IRQS; i++)</div><div class='del'>-	{</div><div class='del'>-		if(dev_names[i])</div><div class='del'>-			cpu_request_irq(i, sun3_default_handler[i], 0,</div><div class='del'>-					dev_names[i], NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; 192; i++)</div><div class='del'>-		sun3_vechandler[i] = NULL;</div><div class='del'>-</div><div class='del'>-	sun3_vechandler[191] = sun3_vec255;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sun3_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-                      unsigned long flags, const char *devname, void *dev_id)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if(irq &lt; SYS_IRQS) {</div><div class='del'>-		if(sun3_inthandler[irq] != NULL) {</div><div class='del'>-			printk("sun3_request_irq: request for irq %d -- already taken!\n", irq);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sun3_inthandler[irq] = handler;</div><div class='del'>-		dev_ids[irq] = dev_id;</div><div class='del'>-		dev_names[irq] = devname;</div><div class='del'>-</div><div class='del'>-		/* setting devname would be nice */</div><div class='del'>-		cpu_request_irq(irq, sun3_default_handler[irq], 0, devname,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		if((irq &gt;= 64) &amp;&amp; (irq &lt;= 255)) {</div><div class='del'>-		        int vec;</div><div class='del'>-</div><div class='del'>-			vec = irq - 64;</div><div class='del'>-			if(sun3_vechandler[vec] != NULL) {</div><div class='del'>-				printk("sun3_request_irq: request for vec %d -- already taken!\n", irq);</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			sun3_vechandler[vec] = handler;</div><div class='del'>-			vec_ids[vec] = dev_id;</div><div class='del'>-			vec_names[vec] = devname;</div><div class='del'>-			vec_ints[vec] = 0;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("sun3_request_irq: invalid irq %d\n", irq);</div><div class='del'>-	return 1;</div><div class='add'>+        *sun3_intreg &amp;= ~(1 &lt;&lt; irq);</div><div class='ctx'> </div><div class='add'>+	m68k_handle_int(irq, fp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sun3_free_irq(unsigned int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if(irq &lt; SYS_IRQS) {</div><div class='del'>-		if(sun3_inthandler[irq] == NULL)</div><div class='del'>-			panic("sun3_free_int: attempt to free unused irq %d\n", irq);</div><div class='del'>-		if(dev_ids[irq] != dev_id)</div><div class='del'>-			panic("sun3_free_int: incorrect dev_id for irq %d\n", irq);</div><div class='del'>-</div><div class='del'>-		sun3_inthandler[irq] = NULL;</div><div class='del'>-		return;</div><div class='del'>-	} else if((irq &gt;= 64) &amp;&amp; (irq &lt;= 255)) {</div><div class='del'>-		int vec;</div><div class='del'>-</div><div class='del'>-		vec = irq - 64;</div><div class='del'>-		if(sun3_vechandler[vec] == NULL)</div><div class='del'>-			panic("sun3_free_int: attempt to free unused vector %d\n", irq);</div><div class='del'>-		if(vec_ids[irq] != dev_id)</div><div class='del'>-			panic("sun3_free_int: incorrect dev_id for vec %d\n", irq);</div><div class='del'>-</div><div class='del'>-		sun3_vechandler[vec] = NULL;</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		panic("sun3_free_irq: invalid irq %d\n", irq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+static struct irq_controller sun3_irq_controller = {</div><div class='add'>+	.name		= "sun3",</div><div class='add'>+	.lock		= SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.startup	= m68k_irq_startup,</div><div class='add'>+	.shutdown	= m68k_irq_shutdown,</div><div class='add'>+	.enable		= sun3_enable_irq,</div><div class='add'>+	.disable	= sun3_disable_irq,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-irqreturn_t sun3_process_int(int irq, struct pt_regs *regs)</div><div class='add'>+void sun3_init_IRQ(void)</div><div class='ctx'> {</div><div class='add'>+	*sun3_intreg = 1;</div><div class='ctx'> </div><div class='del'>-	if((irq &gt;= 64) &amp;&amp; (irq &lt;= 255)) {</div><div class='del'>-		int vec;</div><div class='del'>-</div><div class='del'>-		vec = irq - 64;</div><div class='del'>-		if(sun3_vechandler[vec] == NULL)</div><div class='del'>-			panic ("bad interrupt vector %d received\n",irq);</div><div class='add'>+	m68k_setup_auto_interrupt(sun3_inthandle);</div><div class='add'>+	m68k_setup_irq_controller(&amp;sun3_irq_controller, IRQ_AUTO_1, 7);</div><div class='add'>+	m68k_setup_user_interrupt(VEC_USER, 192, NULL);</div><div class='ctx'> </div><div class='del'>-		vec_ints[vec]++;</div><div class='del'>-		return sun3_vechandler[vec](irq, vec_ids[vec], regs);</div><div class='del'>-	} else {</div><div class='del'>-		panic("sun3_process_int: unable to handle interrupt vector %d\n",</div><div class='del'>-		      irq);</div><div class='del'>-	}</div><div class='add'>+	request_irq(IRQ_AUTO_5, sun3_int5, 0, "int5", NULL);</div><div class='add'>+	request_irq(IRQ_AUTO_7, sun3_int7, 0, "int7", NULL);</div><div class='add'>+	request_irq(IRQ_USER+127, sun3_vec255, 0, "vec255", NULL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c<br/>index 0920f5d33606..987891783a47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68k/sun3x/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68k/sun3x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68k/sun3x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68k/sun3x/config.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * based on code from Oliver Jowett &lt;oliver@jowett.manawatu.gen.nz&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='hunk'>@@ -52,17 +51,10 @@ void __init config_sun3x(void)</div><div class='ctx'> </div><div class='ctx'> 	sun3x_prom_init();</div><div class='ctx'> </div><div class='del'>-	mach_get_irq_list	 = show_sun3_interrupts;</div><div class='ctx'> 	mach_max_dma_address = 0xffffffff; /* we can DMA anywhere, whee */</div><div class='ctx'> </div><div class='del'>-	mach_default_handler = &amp;sun3_default_handler;</div><div class='ctx'> 	mach_sched_init      = sun3x_sched_init;</div><div class='ctx'> 	mach_init_IRQ        = sun3_init_IRQ;</div><div class='del'>-	enable_irq           = sun3_enable_irq;</div><div class='del'>-	disable_irq          = sun3_disable_irq;</div><div class='del'>-	mach_request_irq     = sun3_request_irq;</div><div class='del'>-	mach_free_irq        = sun3_free_irq;</div><div class='del'>-	mach_process_int     = sun3_process_int;</div><div class='ctx'> </div><div class='ctx'> 	mach_gettimeoffset   = sun3x_gettimeoffset;</div><div class='ctx'> 	mach_reset           = sun3x_reboot;</div><div class='head'>diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig<br/>index 3cde6822ead1..e767f2ddae72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/Kconfig</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"</div><div class='ctx'> </div><div class='del'>-config M68KNOMMU</div><div class='add'>+config M68K</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='hunk'>@@ -119,6 +119,11 @@ config M5307</div><div class='ctx'> 	help</div><div class='ctx'> 	  Motorola ColdFire 5307 processor support.</div><div class='ctx'> </div><div class='add'>+config M532x</div><div class='add'>+	bool "MCF532x"</div><div class='add'>+	help</div><div class='add'>+	  Freescale (Motorola) ColdFire 532x processor support.</div><div class='add'>+</div><div class='ctx'> config M5407</div><div class='ctx'> 	bool "MCF5407"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -133,125 +138,43 @@ config M527x</div><div class='ctx'> </div><div class='ctx'> config COLDFIRE</div><div class='ctx'> 	bool</div><div class='del'>-	depends on (M5206 || M5206e || M520x || M523x || M5249 || M527x || M5272 || M528x || M5307 || M5407)</div><div class='add'>+	depends on (M5206 || M5206e || M520x || M523x || M5249 || M527x || M5272 || M528x || M5307 || M532x || M5407)</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-choice</div><div class='del'>-	prompt "CPU CLOCK Frequency"</div><div class='del'>-	default AUTO</div><div class='del'>-</div><div class='del'>-config CLOCK_AUTO</div><div class='del'>-	bool "AUTO"</div><div class='del'>-	---help---</div><div class='del'>-	  Define the CPU clock frequency in use. On many boards you don't</div><div class='del'>-	  really need to know, so you can select the AUTO option. On some</div><div class='del'>-	  boards you need to know the real clock frequency to determine other</div><div class='del'>-	  system timing (for example baud rate dividors, etc). Some processors</div><div class='del'>-	  have an internal PLL and you can select a frequency to run at.</div><div class='del'>-	  You need to know a little about the internals of your processor to</div><div class='del'>-	  set this. If in doubt choose the AUTO option.</div><div class='del'>-</div><div class='del'>-config CLOCK_11MHz</div><div class='del'>-	bool "11MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 11MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_16MHz</div><div class='del'>-	bool "16MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 16MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_20MHz</div><div class='del'>-	bool "20MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 20MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_24MHz</div><div class='del'>-	bool "24MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 24MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_25MHz</div><div class='del'>-	bool "25MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 25MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_33MHz</div><div class='del'>-	bool "33MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 33MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_40MHz</div><div class='del'>-	bool "40MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 40MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_45MHz</div><div class='del'>-	bool "45MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 45MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_48MHz</div><div class='del'>-	bool "48MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 48MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_50MHz</div><div class='del'>-	bool "50MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 50MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_54MHz</div><div class='del'>-	bool "54MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 54MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_60MHz</div><div class='del'>-	bool "60MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 60MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_62_5MHz</div><div class='del'>-	bool "62.5MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 62.5MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_64MHz</div><div class='del'>-	bool "64MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 64MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_66MHz</div><div class='del'>-	bool "66MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 66MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_70MHz</div><div class='del'>-	bool "70MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 70MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_100MHz</div><div class='del'>-	bool "100MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 100MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_140MHz</div><div class='del'>-	bool "140MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 140MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_150MHz</div><div class='del'>-	bool "150MHz"</div><div class='del'>-	help</div><div class='del'>-	  Select a 150MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-config CLOCK_166MHz</div><div class='del'>-	bool "166MHz"</div><div class='add'>+config CLOCK_SET</div><div class='add'>+	bool "Enable setting the CPU clock frequency"</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='del'>-	  Select a 166MHz CPU clock frequency.</div><div class='del'>-</div><div class='del'>-endchoice</div><div class='add'>+	  On some CPU's you do not need to know what the core CPU clock</div><div class='add'>+	  frequency is. On these you can disable clock setting. On some</div><div class='add'>+	  traditional 68K parts, and on all ColdFire parts you need to set</div><div class='add'>+	  the appropriate CPU clock frequency. On these devices many of the</div><div class='add'>+	  onboard peripherals derive their timing from the master CPU clock</div><div class='add'>+	  frequency.</div><div class='add'>+</div><div class='add'>+config CLOCK_FREQ</div><div class='add'>+	int "Set the core clock frequency"</div><div class='add'>+	default "66666666"</div><div class='add'>+	depends on CLOCK_SET</div><div class='add'>+	help</div><div class='add'>+	  Define the CPU clock frequency in use. This is the core clock</div><div class='add'>+	  frequency, it may or may not be the same as the external clock</div><div class='add'>+	  crystal fitted to your board. Some processors have an internal</div><div class='add'>+	  PLL and can have their frequency programmed at run time, others</div><div class='add'>+	  use internal dividers. In gernal the kernel won't setup a PLL</div><div class='add'>+	  if it is fitted (there are some expections). This value will be</div><div class='add'>+	  specific to the exact CPU that you are using.</div><div class='add'>+</div><div class='add'>+config CLOCK_DIV</div><div class='add'>+	int "Set the core/bus clock divide ratio"</div><div class='add'>+	default "1"</div><div class='add'>+	depends on CLOCK_SET</div><div class='add'>+	help</div><div class='add'>+	  On many SoC style CPUs the master CPU clock is also used to drive </div><div class='add'>+	  on-chip peripherals. The clock that is distributed to these</div><div class='add'>+	  peripherals is sometimes a fixed ratio of the master clock</div><div class='add'>+	  frequency. If so then set this to the divider ration of the</div><div class='add'>+	  master clock to the peripheral clock. If not sure then select 1.</div><div class='ctx'> </div><div class='ctx'> config OLDMASK</div><div class='ctx'> 	bool "Old mask 5307 (1H55J) silicon"</div><div class='hunk'>@@ -377,6 +300,12 @@ config COBRA5272</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the senTec COBRA5272 board.</div><div class='ctx'> </div><div class='add'>+config AVNET5282</div><div class='add'>+	bool "Avnet 5282 board support"</div><div class='add'>+	depends on M528x</div><div class='add'>+	help</div><div class='add'>+	  Support for the Avnet 5282 board.  </div><div class='add'>+	  </div><div class='ctx'> config M5282EVB</div><div class='ctx'> 	bool "Motorola M5282EVB board support"</div><div class='ctx'> 	depends on M528x</div><div class='hunk'>@@ -419,6 +348,18 @@ config SECUREEDGEMP3</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the SnapGear SecureEdge/MP3 platform.</div><div class='ctx'> </div><div class='add'>+config M5329EVB</div><div class='add'>+	bool "Freescale (Motorola) M5329EVB board support"</div><div class='add'>+	depends on M532x</div><div class='add'>+	help</div><div class='add'>+	  Support for the Freescale (Motorola) M5329EVB board.</div><div class='add'>+</div><div class='add'>+config COBRA5329</div><div class='add'>+	bool "senTec COBRA5329 board support"</div><div class='add'>+	depends on M532x</div><div class='add'>+	help</div><div class='add'>+	  Support for the senTec COBRA5329 board.</div><div class='add'>+</div><div class='ctx'> config M5407C3</div><div class='ctx'> 	bool "Motorola M5407C3 board support"</div><div class='ctx'> 	depends on M5407</div><div class='hunk'>@@ -487,7 +428,7 @@ config ARNEWSH</div><div class='ctx'> config FREESCALE</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='del'>-	depends on (M5206eC3 || M5208EVB || M5235EVB || M5249C3 || M5271EVB || M5272C3 || M5275EVB || M5282EVB || M5307C3 || M5407C3)</div><div class='add'>+	depends on (M5206eC3 || M5208EVB || M5235EVB || M5249C3 || M5271EVB || M5272C3 || M5275EVB || M5282EVB || M5307C3 || M5329EVB || M5407C3)</div><div class='ctx'> </div><div class='ctx'> config HW_FEITH</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -508,6 +449,11 @@ config SNEHA</div><div class='ctx'>         bool</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on CPU16B</div><div class='add'>+	</div><div class='add'>+config AVNET</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+	depends on (AVNET5282)</div><div class='ctx'> </div><div class='ctx'> config LARGE_ALLOCS</div><div class='ctx'> 	bool "Allow allocating large blocks (&gt; 1MB) of memory"</div><div class='hunk'>@@ -526,38 +472,46 @@ config 4KSTACKS</div><div class='ctx'> 	  running more threads on a system and also reduces the pressure</div><div class='ctx'> 	  on the VM subsystem for higher order allocations.</div><div class='ctx'> </div><div class='del'>-choice</div><div class='del'>-	prompt "RAM size"</div><div class='del'>-	default AUTO</div><div class='del'>-</div><div class='del'>-config RAMAUTO</div><div class='del'>-	bool "AUTO"</div><div class='del'>-	---help---</div><div class='del'>-	  Configure the RAM size on your platform. Many platforms can auto</div><div class='del'>-	  detect this, on those choose the AUTO option. Otherwise set the</div><div class='del'>-	  RAM size you intend using.</div><div class='add'>+comment "RAM configuration"</div><div class='ctx'> </div><div class='del'>-config RAM4MB</div><div class='del'>-	bool "4MiB"</div><div class='add'>+config RAMBASE</div><div class='add'>+	hex "Address of the base of RAM"</div><div class='add'>+	default "0"</div><div class='ctx'> 	help</div><div class='del'>-	  Set RAM size to be 4MiB.</div><div class='add'>+	  Define the address that RAM starts at. On many platforms this is</div><div class='add'>+	  0, the base of the address space. And this is the default. Some</div><div class='add'>+	  platforms choose to setup their RAM at other addresses within the</div><div class='add'>+	  processor address space.</div><div class='ctx'> </div><div class='del'>-config RAM8MB</div><div class='del'>-	bool "8MiB"</div><div class='add'>+config RAMSIZE</div><div class='add'>+	hex "Size of RAM (in bytes)"</div><div class='add'>+	default "0x400000"</div><div class='ctx'> 	help</div><div class='del'>-	  Set RAM size to be 8MiB.</div><div class='add'>+	  Define the size of the system RAM. If you select 0 then the</div><div class='add'>+	  kernel will try to probe the RAM size at runtime. This is not</div><div class='add'>+	  supported on all CPU types.</div><div class='ctx'> </div><div class='del'>-config RAM16MB</div><div class='del'>-	bool "16MiB"</div><div class='add'>+config VECTORBASE</div><div class='add'>+	hex "Address of the base of system vectors"</div><div class='add'>+	default "0"</div><div class='ctx'> 	help</div><div class='del'>-	  Set RAM size to be 16MiB.</div><div class='add'>+	  Define the address of the the system vectors. Commonly this is</div><div class='add'>+	  put at the start of RAM, but it doesn't have to be. On ColdFire</div><div class='add'>+	  platforms this address is programmed into the VBR register, thus</div><div class='add'>+	  actually setting the address to use.</div><div class='ctx'> </div><div class='del'>-config RAM32MB</div><div class='del'>-	bool "32MiB"</div><div class='add'>+config KERNELBASE</div><div class='add'>+	hex "Address of the base of kernel code"</div><div class='add'>+	default "0x400"</div><div class='ctx'> 	help</div><div class='del'>-	  Set RAM size to be 32MiB.</div><div class='del'>-</div><div class='del'>-endchoice</div><div class='add'>+	  Typically on m68k systems the kernel will not start at the base</div><div class='add'>+	  of RAM, but usually some small offset from it. Define the start</div><div class='add'>+	  address of the kernel here. The most common setup will have the</div><div class='add'>+	  processor vectors at the base of RAM and then the start of the</div><div class='add'>+	  kernel. On some platforms some RAM is reserved for boot loaders</div><div class='add'>+	  and the kernel starts after that. The 0x400 default was based on</div><div class='add'>+	  a system with the RAM based at address 0, and leaving enough room</div><div class='add'>+	  for the theoretical maximum number of 256 vectors.</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='ctx'> 	prompt "RAM bus width"</div><div class='hunk'>@@ -565,7 +519,7 @@ choice</div><div class='ctx'> </div><div class='ctx'> config RAMAUTOBIT</div><div class='ctx'> 	bool "AUTO"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Select the physical RAM data bus size. Not needed on most platforms,</div><div class='ctx'> 	  so you can generally choose AUTO.</div><div class='ctx'> </div><div class='hunk'>@@ -586,6 +540,59 @@ config RAM32BIT</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+comment "ROM configuration"</div><div class='add'>+</div><div class='add'>+config ROM</div><div class='add'>+	bool "Specify ROM linker regions"</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Define a ROM region for the linker script. This creates a kernel</div><div class='add'>+	  that can be stored in flash, with possibly the text, and data</div><div class='add'>+	  regions being copied out to RAM at startup.</div><div class='add'>+</div><div class='add'>+config ROMBASE</div><div class='add'>+	hex "Address of the base of ROM device"</div><div class='add'>+	default "0"</div><div class='add'>+	depends on ROM</div><div class='add'>+	help</div><div class='add'>+	  Define the address that the ROM region starts at. Some platforms</div><div class='add'>+	  use this to set their chip select region accordingly for the boot</div><div class='add'>+	  device.</div><div class='add'>+</div><div class='add'>+config ROMVEC</div><div class='add'>+	hex "Address of the base of the ROM vectors"</div><div class='add'>+	default "0"</div><div class='add'>+	depends on ROM</div><div class='add'>+	help</div><div class='add'>+	  This is almost always the same as the base of the ROM. Since on all</div><div class='add'>+	  68000 type varients the vectors are at the base of the boot device</div><div class='add'>+	  on system startup.</div><div class='add'>+</div><div class='add'>+config ROMVECSIZE</div><div class='add'>+	hex "Size of ROM vector region (in bytes)"</div><div class='add'>+	default "0x400"</div><div class='add'>+	depends on ROM</div><div class='add'>+	help</div><div class='add'>+	  Define the size of the vector region in ROM. For most 68000</div><div class='add'>+	  varients this would be 0x400 bytes in size. Set to 0 if you do</div><div class='add'>+	  not want a vector region at the start of the ROM.</div><div class='add'>+</div><div class='add'>+config ROMSTART</div><div class='add'>+	hex "Address of the base of system image in ROM"</div><div class='add'>+	default "0x400"</div><div class='add'>+	depends on ROM</div><div class='add'>+	help</div><div class='add'>+	  Define the start address of the system image in ROM. Commonly this</div><div class='add'>+	  is strait after the ROM vectors.</div><div class='add'>+</div><div class='add'>+config ROMSIZE</div><div class='add'>+	hex "Size of the ROM device"</div><div class='add'>+	default "0x100000"</div><div class='add'>+	depends on ROM</div><div class='add'>+	help</div><div class='add'>+	  Size of the ROM device. On some platforms this is used to setup</div><div class='add'>+	  the chip select that controls the boot ROM device.</div><div class='add'>+</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Kernel executes from"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -599,7 +606,9 @@ config RAMKERNEL</div><div class='ctx'> config ROMKERNEL</div><div class='ctx'> 	bool "ROM"</div><div class='ctx'> 	help</div><div class='del'>-	  The kernel will be resident in FLASH/ROM when running.</div><div class='add'>+	  The kernel will be resident in FLASH/ROM when running. This is</div><div class='add'>+	  often referred to as Execute-in-Place (XIP), since the kernel</div><div class='add'>+	  code executes from the position it is stored in the FLASH/ROM.</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile<br/>index 6f880cbff1c8..8951793fd8d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/Makefile</a></div><div class='hunk'>@@ -21,6 +21,7 @@ platform-$(CONFIG_M527x)	:= 527x</div><div class='ctx'> platform-$(CONFIG_M5272)	:= 5272</div><div class='ctx'> platform-$(CONFIG_M528x)	:= 528x</div><div class='ctx'> platform-$(CONFIG_M5307)	:= 5307</div><div class='add'>+platform-$(CONFIG_M532x)	:= 532x</div><div class='ctx'> platform-$(CONFIG_M5407)	:= 5407</div><div class='ctx'> PLATFORM := $(platform-y)</div><div class='ctx'> </div><div class='hunk'>@@ -44,6 +45,7 @@ board-$(CONFIG_senTec)		:= senTec</div><div class='ctx'> board-$(CONFIG_SNEHA) 	        := SNEHA</div><div class='ctx'> board-$(CONFIG_M5208EVB)	:= M5208EVB</div><div class='ctx'> board-$(CONFIG_MOD5272)		:= MOD5272</div><div class='add'>+board-$(CONFIG_AVNET)           := AVNET</div><div class='ctx'> BOARD := $(board-y)</div><div class='ctx'> </div><div class='ctx'> model-$(CONFIG_RAMKERNEL)	:= ram</div><div class='hunk'>@@ -65,6 +67,7 @@ cpuclass-$(CONFIG_M527x)	:= 5307</div><div class='ctx'> cpuclass-$(CONFIG_M5272)	:= 5307</div><div class='ctx'> cpuclass-$(CONFIG_M528x)	:= 5307</div><div class='ctx'> cpuclass-$(CONFIG_M5307)	:= 5307</div><div class='add'>+cpuclass-$(CONFIG_M532x)	:= 5307</div><div class='ctx'> cpuclass-$(CONFIG_M5407)	:= 5307</div><div class='ctx'> cpuclass-$(CONFIG_M68328)	:= 68328</div><div class='ctx'> cpuclass-$(CONFIG_M68EZ328)	:= 68328</div><div class='hunk'>@@ -81,16 +84,17 @@ export PLATFORM BOARD MODEL CPUCLASS</div><div class='ctx'> #</div><div class='ctx'> # Some CFLAG additions based on specific CPU type.</div><div class='ctx'> #</div><div class='del'>-cflags-$(CONFIG_M5206)		:= -m5200 -Wa,-S -Wa,-m5200</div><div class='del'>-cflags-$(CONFIG_M5206e)		:= -m5200 -Wa,-S -Wa,-m5200</div><div class='del'>-cflags-$(CONFIG_M520x)		:= -m5307 -Wa,-S -Wa,-m5307</div><div class='del'>-cflags-$(CONFIG_M523x)		:= -m5307 -Wa,-S -Wa,-m5307</div><div class='del'>-cflags-$(CONFIG_M5249)		:= -m5200 -Wa,-S -Wa,-m5200</div><div class='del'>-cflags-$(CONFIG_M527x)		:= -m5307 -Wa,-S -Wa,-m5307</div><div class='del'>-cflags-$(CONFIG_M5272)		:= -m5307 -Wa,-S -Wa,-m5307</div><div class='del'>-cflags-$(CONFIG_M528x)		:= -m5307 -Wa,-S -Wa,-m5307</div><div class='del'>-cflags-$(CONFIG_M5307)		:= -m5307 -Wa,-S -Wa,-m5307</div><div class='del'>-cflags-$(CONFIG_M5407)		:= -m5200 -Wa,-S -Wa,-m5200</div><div class='add'>+cflags-$(CONFIG_M5206)		:= -m5200</div><div class='add'>+cflags-$(CONFIG_M5206e)		:= -m5200</div><div class='add'>+cflags-$(CONFIG_M520x)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M523x)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M5249)		:= -m5200</div><div class='add'>+cflags-$(CONFIG_M527x)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M5272)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M528x)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M5307)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M532x)		:= -m5307</div><div class='add'>+cflags-$(CONFIG_M5407)		:= -m5200</div><div class='ctx'> cflags-$(CONFIG_M68328)		:= -m68000</div><div class='ctx'> cflags-$(CONFIG_M68EZ328)	:= -m68000</div><div class='ctx'> cflags-$(CONFIG_M68VZ328)	:= -m68000</div><div class='head'>diff --git a/arch/m68knommu/defconfig b/arch/m68knommu/defconfig<br/>index 2d59ba1a79ba..3891de09ac23 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/defconfig</a></div><div class='hunk'>@@ -1,21 +1,22 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.13-uc0</div><div class='del'>-# Wed Aug 31 15:03:26 2005</div><div class='add'>+# Linux kernel version: 2.6.17</div><div class='add'>+# Tue Jun 27 12:57:06 2006</div><div class='ctx'> #</div><div class='del'>-CONFIG_M68KNOMMU=y</div><div class='add'>+CONFIG_M68K=y</div><div class='ctx'> # CONFIG_MMU is not set</div><div class='ctx'> # CONFIG_FPU is not set</div><div class='del'>-CONFIG_UID16=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_TIME_LOW_RES=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXPERIMENTAL=y</div><div class='del'>-CONFIG_CLEAN_COMPILE=y</div><div class='ctx'> CONFIG_BROKEN_ON_SMP=y</div><div class='ctx'> CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> </div><div class='hunk'>@@ -23,26 +24,30 @@ CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> # General setup</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+# CONFIG_SYSVIPC is not set</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='ctx'> # CONFIG_BSD_PROCESS_ACCT is not set</div><div class='ctx'> # CONFIG_SYSCTL is not set</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='del'>-# CONFIG_HOTPLUG is not set</div><div class='del'>-# CONFIG_KOBJECT_UEVENT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_UID16=y</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> # CONFIG_KALLSYMS is not set</div><div class='add'>+# CONFIG_HOTPLUG is not set</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='ctx'> # CONFIG_FUTEX is not set</div><div class='ctx'> # CONFIG_EPOLL is not set</div><div class='del'>-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='del'>-CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='del'>-CONFIG_CC_ALIGN_LABELS=0</div><div class='del'>-CONFIG_CC_ALIGN_LOOPS=0</div><div class='del'>-CONFIG_CC_ALIGN_JUMPS=0</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_TINY_SHMEM=y</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -50,6 +55,24 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_MODULES is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+# CONFIG_IOSCHED_DEADLINE is not set</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+CONFIG_DEFAULT_NOOP=y</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="noop"</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Processor type and features</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_M68328 is not set</div><div class='hunk'>@@ -58,6 +81,7 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_M68360 is not set</div><div class='ctx'> # CONFIG_M5206 is not set</div><div class='ctx'> # CONFIG_M5206e is not set</div><div class='add'>+# CONFIG_M520x is not set</div><div class='ctx'> # CONFIG_M523x is not set</div><div class='ctx'> # CONFIG_M5249 is not set</div><div class='ctx'> # CONFIG_M5271 is not set</div><div class='hunk'>@@ -65,29 +89,12 @@ CONFIG_M5272=y</div><div class='ctx'> # CONFIG_M5275 is not set</div><div class='ctx'> # CONFIG_M528x is not set</div><div class='ctx'> # CONFIG_M5307 is not set</div><div class='add'>+# CONFIG_M532x is not set</div><div class='ctx'> # CONFIG_M5407 is not set</div><div class='ctx'> CONFIG_COLDFIRE=y</div><div class='del'>-# CONFIG_CLOCK_AUTO is not set</div><div class='del'>-# CONFIG_CLOCK_11MHz is not set</div><div class='del'>-# CONFIG_CLOCK_16MHz is not set</div><div class='del'>-# CONFIG_CLOCK_20MHz is not set</div><div class='del'>-# CONFIG_CLOCK_24MHz is not set</div><div class='del'>-# CONFIG_CLOCK_25MHz is not set</div><div class='del'>-# CONFIG_CLOCK_33MHz is not set</div><div class='del'>-# CONFIG_CLOCK_40MHz is not set</div><div class='del'>-# CONFIG_CLOCK_45MHz is not set</div><div class='del'>-# CONFIG_CLOCK_48MHz is not set</div><div class='del'>-# CONFIG_CLOCK_50MHz is not set</div><div class='del'>-# CONFIG_CLOCK_54MHz is not set</div><div class='del'>-# CONFIG_CLOCK_60MHz is not set</div><div class='del'>-# CONFIG_CLOCK_62_5MHz is not set</div><div class='del'>-# CONFIG_CLOCK_64MHz is not set</div><div class='del'>-CONFIG_CLOCK_66MHz=y</div><div class='del'>-# CONFIG_CLOCK_70MHz is not set</div><div class='del'>-# CONFIG_CLOCK_100MHz is not set</div><div class='del'>-# CONFIG_CLOCK_140MHz is not set</div><div class='del'>-# CONFIG_CLOCK_150MHz is not set</div><div class='del'>-# CONFIG_CLOCK_166MHz is not set</div><div class='add'>+CONFIG_CLOCK_SET=y</div><div class='add'>+CONFIG_CLOCK_FREQ=66666666</div><div class='add'>+CONFIG_CLOCK_DIV=1</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Platform</div><div class='hunk'>@@ -102,11 +109,14 @@ CONFIG_M5272C3=y</div><div class='ctx'> CONFIG_FREESCALE=y</div><div class='ctx'> # CONFIG_LARGE_ALLOCS is not set</div><div class='ctx'> CONFIG_4KSTACKS=y</div><div class='del'>-CONFIG_RAMAUTO=y</div><div class='del'>-# CONFIG_RAM4MB is not set</div><div class='del'>-# CONFIG_RAM8MB is not set</div><div class='del'>-# CONFIG_RAM16MB is not set</div><div class='del'>-# CONFIG_RAM32MB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_RAMBASE=0x0</div><div class='add'>+CONFIG_RAMSIZE=0x800000</div><div class='add'>+CONFIG_VECTORBASE=0x0</div><div class='add'>+CONFIG_KERNELBASE=0x20000</div><div class='ctx'> CONFIG_RAMAUTOBIT=y</div><div class='ctx'> # CONFIG_RAM8BIT is not set</div><div class='ctx'> # CONFIG_RAM16BIT is not set</div><div class='hunk'>@@ -119,6 +129,8 @@ CONFIG_FLATMEM_MANUAL=y</div><div class='ctx'> # CONFIG_SPARSEMEM_MANUAL is not set</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Bus options (PCI, PCMCIA, EISA, MCA, ISA)</div><div class='hunk'>@@ -140,6 +152,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> CONFIG_BINFMT_FLAT=y</div><div class='ctx'> # CONFIG_BINFMT_ZFLAT is not set</div><div class='ctx'> # CONFIG_BINFMT_SHARED_FLAT is not set</div><div class='add'>+# CONFIG_BINFMT_AOUT is not set</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -155,6 +168,7 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> # Networking options</div><div class='ctx'> #</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='hunk'>@@ -171,18 +185,30 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_INET_AH is not set</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='del'>-# CONFIG_IP_TCPDIAG is not set</div><div class='del'>-# CONFIG_IP_TCPDIAG_IPV6 is not set</div><div class='add'>+# CONFIG_INET_DIAG is not set</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='ctx'> CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # SCTP Configuration (EXPERIMENTAL)</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='ctx'> # CONFIG_ATM is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='hunk'>@@ -195,8 +221,11 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_NET_DIVERT is not set</div><div class='ctx'> # CONFIG_ECONET is not set</div><div class='ctx'> # CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='ctx'> # CONFIG_NET_SCHED is not set</div><div class='del'>-# CONFIG_NET_CLS_ROUTE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network testing</div><div class='hunk'>@@ -205,6 +234,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -218,6 +248,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Memory Technology Devices (MTD)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD=y</div><div class='hunk'>@@ -235,6 +270,7 @@ CONFIG_MTD_BLOCK=y</div><div class='ctx'> # CONFIG_FTL is not set</div><div class='ctx'> # CONFIG_NFTL is not set</div><div class='ctx'> # CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RAM/ROM/Flash chip drivers</div><div class='hunk'>@@ -254,13 +290,13 @@ CONFIG_MTD_CFI_I2=y</div><div class='ctx'> CONFIG_MTD_RAM=y</div><div class='ctx'> # CONFIG_MTD_ROM is not set</div><div class='ctx'> # CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Mapping drivers for chip access</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='ctx'> CONFIG_MTD_UCLINUX=y</div><div class='del'>-# CONFIG_MTD_SNAPGEARuC is not set</div><div class='ctx'> # CONFIG_MTD_PLATRAM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -269,7 +305,6 @@ CONFIG_MTD_UCLINUX=y</div><div class='ctx'> # CONFIG_MTD_SLRAM is not set</div><div class='ctx'> # CONFIG_MTD_PHRAM is not set</div><div class='ctx'> # CONFIG_MTD_MTDRAM is not set</div><div class='del'>-# CONFIG_MTD_BLKMTD is not set</div><div class='ctx'> # CONFIG_MTD_BLOCK2MTD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -285,6 +320,11 @@ CONFIG_MTD_UCLINUX=y</div><div class='ctx'> # CONFIG_MTD_NAND is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Parallel port support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARPORT is not set</div><div class='hunk'>@@ -296,7 +336,6 @@ CONFIG_MTD_UCLINUX=y</div><div class='ctx'> #</div><div class='ctx'> # Block devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BLK_DEV_FD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='hunk'>@@ -304,16 +343,7 @@ CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='ctx'> # CONFIG_BLK_DEV_INITRD is not set</div><div class='del'>-CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CDROM_PKTCDVD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IO Schedulers</div><div class='del'>-#</div><div class='del'>-CONFIG_IOSCHED_NOOP=y</div><div class='del'>-# CONFIG_IOSCHED_AS is not set</div><div class='del'>-# CONFIG_IOSCHED_DEADLINE is not set</div><div class='del'>-# CONFIG_IOSCHED_CFQ is not set</div><div class='ctx'> # CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -324,6 +354,7 @@ CONFIG_IOSCHED_NOOP=y</div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -354,13 +385,15 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_MII is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SMC is not set</div><div class='del'>-# CONFIG_NE2000 is not set</div><div class='del'>-# CONFIG_NET_PCI is not set</div><div class='ctx'> CONFIG_FEC=y</div><div class='ctx'> # CONFIG_FEC2 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -392,6 +425,7 @@ CONFIG_PPP=y</div><div class='ctx'> # CONFIG_PPP_SYNC_TTY is not set</div><div class='ctx'> # CONFIG_PPP_DEFLATE is not set</div><div class='ctx'> # CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='ctx'> # CONFIG_PPPOE is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='ctx'> # CONFIG_SHAPER is not set</div><div class='hunk'>@@ -425,8 +459,6 @@ CONFIG_PPP=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VT is not set</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='del'>-# CONFIG_LEDMAN is not set</div><div class='del'>-# CONFIG_RESETSWITCH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Serial drivers</div><div class='hunk'>@@ -450,8 +482,6 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='del'>-# CONFIG_MCFWATCHDOG is not set</div><div class='del'>-# CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -464,14 +494,19 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # TPM devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MCF_QSPI is not set</div><div class='del'>-# CONFIG_M41T11M6 is not set</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_I2C is not set</div><div class='del'>-# CONFIG_I2C_SENSOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='hunk'>@@ -482,6 +517,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Misc devices</div><div class='hunk'>@@ -491,6 +527,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -503,11 +540,6 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# SPI support</div><div class='del'>-#</div><div class='del'>-# CONFIG_SPI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Sound</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOUND is not set</div><div class='hunk'>@@ -517,6 +549,11 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='ctx'> # CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB Gadget Support</div><div class='hunk'>@@ -529,29 +566,43 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # InfiniBand support</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# SN Devices</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> # CONFIG_EXT3_FS is not set</div><div class='del'>-# CONFIG_JBD is not set</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# XFS support</div><div class='del'>-#</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_INOTIFY is not set</div><div class='hunk'>@@ -559,6 +610,7 @@ CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CD-ROM/DVD Filesystems</div><div class='hunk'>@@ -581,6 +633,7 @@ CONFIG_SYSFS=y</div><div class='ctx'> # CONFIG_TMPFS is not set</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous filesystems</div><div class='hunk'>@@ -611,6 +664,7 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Partition Types</div><div class='hunk'>@@ -627,8 +681,12 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_BUGVERBOSE is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='ctx'> # CONFIG_FULLDEBUG is not set</div><div class='ctx'> # CONFIG_HIGHPROFILE is not set</div><div class='ctx'> # CONFIG_BOOTPARAM is not set</div><div class='hunk'>@@ -655,5 +713,6 @@ CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='head'>diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c<br/>index 8670938f1107..6ee00effbad2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/comempci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/comempci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/comempci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/comempci.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -357,7 +356,8 @@ void pcibios_fixup_bus(struct pci_bus *b)</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-void pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align)</div><div class='add'>+void pcibios_align_resource(void *data, struct resource *res,</div><div class='add'>+				resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68knommu/kernel/entry.S b/arch/m68knommu/kernel/entry.S<br/>index 8b1f47239b9a..1e7ea6a3e1a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/entry.S</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * linux 2.4 support David McCullough &lt;davidm@snapgear.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c<br/>index 4320d5dcc9cb..1e62150f3588 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/m68k_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/m68k_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/m68k_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/m68k_ksyms.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c<br/>index f861755ec88b..c18a83306953 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/process.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c<br/>index 382ca5797b97..9130119537b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/ptrace.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/semaphore.c b/arch/m68knommu/kernel/semaphore.c<br/>index c083f4772add..bce2bc7d87c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/semaphore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/semaphore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/semaphore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/semaphore.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * specific changes in &lt;asm/semaphore-helper.h&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c<br/>index 93120b9bfff1..bde9811cf98c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/setup.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of system setup</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -42,7 +41,6 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-unsigned long rom_length;</div><div class='ctx'> unsigned long memory_start;</div><div class='ctx'> unsigned long memory_end;</div><div class='ctx'> </div><div class='hunk'>@@ -56,29 +54,29 @@ static void dummy_waitbut(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *)) = NULL;</div><div class='del'>-void (*mach_tick)( void ) = NULL;</div><div class='add'>+void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='add'>+void (*mach_tick)( void );</div><div class='ctx'> /* machine dependent keyboard functions */</div><div class='del'>-int (*mach_keyb_init) (void) = NULL;</div><div class='del'>-int (*mach_kbdrate) (struct kbd_repeat *) = NULL;</div><div class='del'>-void (*mach_kbd_leds) (unsigned int) = NULL;</div><div class='add'>+int (*mach_keyb_init) (void);</div><div class='add'>+int (*mach_kbdrate) (struct kbd_repeat *);</div><div class='add'>+void (*mach_kbd_leds) (unsigned int);</div><div class='ctx'> /* machine dependent irq functions */</div><div class='del'>-void (*mach_init_IRQ) (void) = NULL;</div><div class='del'>-irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;</div><div class='del'>-int (*mach_get_irq_list) (struct seq_file *, void *) = NULL;</div><div class='del'>-void (*mach_process_int) (int irq, struct pt_regs *fp) = NULL;</div><div class='add'>+void (*mach_init_IRQ) (void);</div><div class='add'>+irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *);</div><div class='add'>+int (*mach_get_irq_list) (struct seq_file *, void *);</div><div class='add'>+void (*mach_process_int) (int irq, struct pt_regs *fp);</div><div class='ctx'> void (*mach_trap_init) (void);</div><div class='ctx'> /* machine dependent timer functions */</div><div class='del'>-unsigned long (*mach_gettimeoffset) (void) = NULL;</div><div class='del'>-void (*mach_gettod) (int*, int*, int*, int*, int*, int*) = NULL;</div><div class='del'>-int (*mach_hwclk) (int, struct hwclk_time*) = NULL;</div><div class='del'>-int (*mach_set_clock_mmss) (unsigned long) = NULL;</div><div class='del'>-void (*mach_mksound)( unsigned int count, unsigned int ticks ) = NULL;</div><div class='del'>-void (*mach_reset)( void ) = NULL;</div><div class='add'>+unsigned long (*mach_gettimeoffset) (void);</div><div class='add'>+void (*mach_gettod) (int*, int*, int*, int*, int*, int*);</div><div class='add'>+int (*mach_hwclk) (int, struct hwclk_time*);</div><div class='add'>+int (*mach_set_clock_mmss) (unsigned long);</div><div class='add'>+void (*mach_mksound)( unsigned int count, unsigned int ticks );</div><div class='add'>+void (*mach_reset)( void );</div><div class='ctx'> void (*waitbut)(void) = dummy_waitbut;</div><div class='del'>-void (*mach_debug_init)(void) = NULL;</div><div class='del'>-void (*mach_halt)( void ) = NULL;</div><div class='del'>-void (*mach_power_off)( void ) = NULL;</div><div class='add'>+void (*mach_debug_init)(void);</div><div class='add'>+void (*mach_halt)( void );</div><div class='add'>+void (*mach_power_off)( void );</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_M68000</div><div class='hunk'>@@ -129,6 +127,9 @@ void (*mach_power_off)( void ) = NULL;</div><div class='ctx'> #if defined(CONFIG_M5307)</div><div class='ctx'> 	#define	CPU "COLDFIRE(m5307)"</div><div class='ctx'> #endif</div><div class='add'>+#if defined(CONFIG_M532x)</div><div class='add'>+	#define	CPU "COLDFIRE(m532x)"</div><div class='add'>+#endif</div><div class='ctx'> #if defined(CONFIG_M5407)</div><div class='ctx'> 	#define	CPU "COLDFIRE(m5407)"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -267,34 +268,6 @@ void setup_arch(char **cmdline_p)</div><div class='ctx'> 	paging_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int get_cpuinfo(char * buffer)</div><div class='del'>-{</div><div class='del'>-    char *cpu, *mmu, *fpu;</div><div class='del'>-    u_long clockfreq;</div><div class='del'>-</div><div class='del'>-    cpu = CPU;</div><div class='del'>-    mmu = "none";</div><div class='del'>-    fpu = "none";</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COLDFIRE</div><div class='del'>-    clockfreq = (loops_per_jiffy*HZ)*3;</div><div class='del'>-#else</div><div class='del'>-    clockfreq = (loops_per_jiffy*HZ)*16;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    return(sprintf(buffer, "CPU:\t\t%s\n"</div><div class='del'>-		   "MMU:\t\t%s\n"</div><div class='del'>-		   "FPU:\t\t%s\n"</div><div class='del'>-		   "Clocking:\t%lu.%1luMHz\n"</div><div class='del'>-		   "BogoMips:\t%lu.%02lu\n"</div><div class='del'>-		   "Calibration:\t%lu loops\n",</div><div class='del'>-		   cpu, mmu, fpu,</div><div class='del'>-		   clockfreq/1000000,(clockfreq/100000)%10,</div><div class='del'>-		   (loops_per_jiffy*HZ)/500000,((loops_per_jiffy*HZ)/5000)%100,</div><div class='del'>-		   (loops_per_jiffy*HZ)));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Get CPU information for use by the procfs.</div><div class='ctx'>  */</div><div class='head'>diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c<br/>index e1b3aa39e270..437f8c6c14a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/signal.c</a></div><div class='hunk'>@@ -553,7 +553,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='ctx'> </div><div class='ctx'> 	/* This is the X/Open sanctioned signal stack switching.  */</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_ONSTACK) {</div><div class='del'>-		if (!on_sig_stack(usp))</div><div class='add'>+		if (!sas_ss_flags(usp))</div><div class='ctx'> 			usp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return (void *)((usp - frame_size) &amp; -8UL);</div><div class='hunk'>@@ -608,7 +608,7 @@ adjust_stack:</div><div class='ctx'> 	if (regs-&gt;stkadj) {</div><div class='ctx'> 		struct pt_regs *tregs =</div><div class='ctx'> 			(struct pt_regs *)((ulong)regs + regs-&gt;stkadj);</div><div class='del'>-#if DEBUG</div><div class='add'>+#if defined(DEBUG)</div><div class='ctx'> 		printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs-&gt;stkadj);</div><div class='ctx'> #endif</div><div class='ctx'> 		/* This must be copied with decreasing addresses to</div><div class='hunk'>@@ -678,7 +678,7 @@ adjust_stack:</div><div class='ctx'> 	if (regs-&gt;stkadj) {</div><div class='ctx'> 		struct pt_regs *tregs =</div><div class='ctx'> 			(struct pt_regs *)((ulong)regs + regs-&gt;stkadj);</div><div class='del'>-#if DEBUG</div><div class='add'>+#if defined(DEBUG)</div><div class='ctx'> 		printk(KERN_DEBUG "Performing stackadjust=%04x\n", regs-&gt;stkadj);</div><div class='ctx'> #endif</div><div class='ctx'> 		/* This must be copied with decreasing addresses to</div><div class='head'>diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S<br/>index 897deaa06b01..617e43ec95ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/syscalltable.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/syscalltable.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/syscalltable.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/syscalltable.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c<br/>index b9d8abb45430..1db987272220 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/time.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *		"A Kernel Model for Precision Timekeeping" by Dave Mills</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c<br/>index 5bc068462864..17649d2543ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/traps.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Sets up all exception vectors</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -93,12 +92,12 @@ asmlinkage void buserr_c(struct frame *fp)</div><div class='ctx'> 	if (user_mode(&amp;fp-&gt;ptregs))</div><div class='ctx'> 		current-&gt;thread.esp0 = (unsigned long) fp;</div><div class='ctx'> </div><div class='del'>-#if DEBUG</div><div class='add'>+#if defined(DEBUG)</div><div class='ctx'> 	printk (KERN_DEBUG "*** Bus Error *** Format is %x\n", fp-&gt;ptregs.format);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	die_if_kernel("bad frame format",&amp;fp-&gt;ptregs,0);</div><div class='del'>-#if DEBUG</div><div class='add'>+#if defined(DEBUG)</div><div class='ctx'> 	printk(KERN_DEBUG "Unknown SIGSEGV - 4\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	force_sig(SIGSEGV, current);</div><div class='head'>diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S<br/>index a331cc90797c..ccd2ceb05cfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,205 +1,29 @@</div><div class='ctx'> /*</div><div class='ctx'>  *	vmlinux.lds.S -- master linker script for m68knommu arch</div><div class='ctx'>  *</div><div class='del'>- *	(C) Copyright 2002-2004, Greg Ungerer &lt;gerg@snapgear.com&gt;</div><div class='add'>+ *	(C) Copyright 2002-2006, Greg Ungerer &lt;gerg@snapgear.com&gt;</div><div class='ctx'>  *</div><div class='del'>- *	This ends up looking compilcated, because of the number of</div><div class='del'>- *	address variations for ram and rom/flash layouts. The real</div><div class='del'>- *	work of the linker script is all at the end, and reasonably</div><div class='del'>- *	strait forward.</div><div class='add'>+ *	This linker script is equiped to build either ROM loaded or RAM</div><div class='add'>+ *	run kernels.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Original Palm pilot (same for Xcopilot).</div><div class='del'>- *	There is really only a rom target for this.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_PILOT3</div><div class='del'>-#define	ROMVEC_START	0x10c00000</div><div class='del'>-#define	ROMVEC_LENGTH	0x10400</div><div class='del'>-#define	ROM_START	0x10c10400</div><div class='del'>-#define	ROM_LENGTH	0xfec00</div><div class='del'>-#define	ROM_END		0x10d00000</div><div class='del'>-#define	RAMVEC_START	0x00000000</div><div class='del'>-#define	RAMVEC_LENGTH	0x400</div><div class='del'>-#define	RAM_START	0x10000400</div><div class='del'>-#define	RAM_LENGTH	0xffc00</div><div class='del'>-#define	RAM_END		0x10100000</div><div class='del'>-#define _ramend	_ram_end_notused</div><div class='del'>-#define	DATA_ADDR	RAM_START</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Same setup on both the uCsimm and uCdimm.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_UCSIMM) || defined(CONFIG_UCDIMM)</div><div class='del'>-#ifdef CONFIG_RAMKERNEL</div><div class='del'>-#define	ROMVEC_START	0x10c10000</div><div class='del'>-#define	ROMVEC_LENGTH	0x400</div><div class='del'>-#define	ROM_START	0x10c10400</div><div class='del'>-#define	ROM_LENGTH	0x1efc00</div><div class='del'>-#define	ROM_END		0x10e00000</div><div class='del'>-#define	RAMVEC_START	0x00000000</div><div class='del'>-#define	RAMVEC_LENGTH	0x400</div><div class='del'>-#define	RAM_START	0x00020400</div><div class='del'>-#define	RAM_LENGTH	0x7dfc00</div><div class='del'>-#define	RAM_END		0x00800000</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_ROMKERNEL</div><div class='del'>-#define	ROMVEC_START	0x10c10000</div><div class='del'>-#define	ROMVEC_LENGTH	0x400</div><div class='del'>-#define	ROM_START	0x10c10400</div><div class='del'>-#define	ROM_LENGTH	0x1efc00</div><div class='del'>-#define	ROM_END		0x10e00000</div><div class='del'>-#define	RAMVEC_START	0x00000000</div><div class='del'>-#define	RAMVEC_LENGTH	0x400</div><div class='del'>-#define	RAM_START	0x00020000</div><div class='del'>-#define	RAM_LENGTH	0x600000</div><div class='del'>-#define	RAM_END		0x00800000</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_HIMEMKERNEL</div><div class='del'>-#define	ROMVEC_START	0x00600000</div><div class='del'>-#define	ROMVEC_LENGTH	0x400</div><div class='del'>-#define	ROM_START	0x00600400</div><div class='del'>-#define	ROM_LENGTH	0x1efc00</div><div class='del'>-#define	ROM_END		0x007f0000</div><div class='del'>-#define	RAMVEC_START	0x00000000</div><div class='del'>-#define	RAMVEC_LENGTH	0x400</div><div class='del'>-#define	RAM_START	0x00020000</div><div class='del'>-#define	RAM_LENGTH	0x5e0000</div><div class='del'>-#define	RAM_END		0x00600000</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DRAGEN2</div><div class='del'>-#define	RAM_START	0x10000</div><div class='del'>-#define	RAM_LENGTH	0x7f0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_UCQUICC</div><div class='del'>-#define	ROMVEC_START	0x00000000</div><div class='del'>-#define	ROMVEC_LENGTH	0x404</div><div class='del'>-#define	ROM_START	0x00000404</div><div class='del'>-#define	ROM_LENGTH	0x1ff6fc</div><div class='del'>-#define	ROM_END		0x00200000</div><div class='del'>-#define	RAMVEC_START	0x00200000</div><div class='del'>-#define	RAMVEC_LENGTH	0x404</div><div class='del'>-#define	RAM_START	0x00200404</div><div class='del'>-#define	RAM_LENGTH	0x1ff6fc</div><div class='del'>-#define	RAM_END		0x00400000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The standard Arnewsh 5206 board only has 1MiB of ram. Not normally</div><div class='del'>- *	enough to be useful. Assume the user has fitted something larger,</div><div class='del'>- *	at least 4MiB in size. No point in not letting the kernel completely</div><div class='del'>- *	link, it will be obvious if it is too big when they go to load it.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_ARN5206)</div><div class='del'>-#define	RAM_START	0x10000</div><div class='del'>-#define	RAM_LENGTH	0x3f0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The Motorola 5206eLITE board only has 1MiB of static RAM.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_ELITE)</div><div class='del'>-#define	RAM_START	0x30020000</div><div class='del'>-#define	RAM_LENGTH	0xe0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	All the Motorola eval boards have the same basic arrangement.</div><div class='del'>- *	The end of RAM will vary depending on how much ram is fitted,</div><div class='del'>- *	but this isn't important here, we assume at least 4MiB.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_M5206eC3) || defined(CONFIG_M5249C3) || \</div><div class='del'>-    defined(CONFIG_M5272C3) || defined(CONFIG_M5307C3) || \</div><div class='del'>-    defined(CONFIG_ARN5307) || defined(CONFIG_M5407C3) || \</div><div class='del'>-    defined(CONFIG_M5271EVB) || defined(CONFIG_M5275EVB) || \</div><div class='del'>-    defined(CONFIG_M5235EVB)</div><div class='del'>-#define	RAM_START	0x20000</div><div class='del'>-#define	RAM_LENGTH	0x3e0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The Freescale 5208EVB board has 32MB of RAM.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_M5208EVB)</div><div class='del'>-#define	RAM_START	0x40020000</div><div class='del'>-#define	RAM_LENGTH	0x01fe0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The senTec COBRA5272 board has nearly the same memory layout as </div><div class='del'>- *	the M5272C3. We assume 16MiB ram.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_COBRA5272)</div><div class='del'>-#define RAM_START   0x20000</div><div class='del'>-#define RAM_LENGTH  0xfe0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_M5282EVB)</div><div class='del'>-#define	RAM_START	0x10000</div><div class='del'>-#define	RAM_LENGTH	0x3f0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The senTec COBRA5282 board has the same memory layout as the M5282EVB.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_COBRA5282)</div><div class='del'>-#define  RAM_START   0x10000</div><div class='del'>-#define  RAM_LENGTH  0x3f0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The EMAC SoM-5282EM module.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_SOM5282EM)</div><div class='del'>-#define  RAM_START   0x10000</div><div class='del'>-#define  RAM_LENGTH  0xff0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	These flash boot boards use all of ram for operation. Again the</div><div class='del'>- *	actual memory size is not important here, assume at least 4MiB.</div><div class='del'>- *	They currently have no support for running in flash.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \</div><div class='del'>-    defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \</div><div class='del'>-    defined(CONFIG_HW_FEITH)</div><div class='del'>-#define	RAM_START	0x400</div><div class='del'>-#define	RAM_LENGTH	0x3ffc00</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Sneha Boards mimimun memory</div><div class='del'>- *	The end of RAM will vary depending on how much ram is fitted,</div><div class='del'>- *	but this isn't important here, we assume at least 4MiB.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_CPU16B)   </div><div class='del'>-#define	RAM_START	0x20000</div><div class='del'>-#define	RAM_LENGTH	0x3e0000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MOD5272)</div><div class='del'>-#define RAM_START	0x02000000</div><div class='del'>-#define RAM_LENGTH	0x00800000</div><div class='del'>-#define RAMVEC_START	0x20000000</div><div class='del'>-#define RAMVEC_LENGTH	0x00000400</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_RAMKERNEL)</div><div class='add'>+#define	RAM_START	CONFIG_KERNELBASE</div><div class='add'>+#define	RAM_LENGTH	(CONFIG_RAMBASE + CONFIG_RAMSIZE - CONFIG_KERNELBASE)</div><div class='ctx'> #define	TEXT		ram</div><div class='ctx'> #define	DATA		ram</div><div class='ctx'> #define	INIT		ram</div><div class='ctx'> #define	BSS		ram</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL)</div><div class='add'>+#define	RAM_START	CONFIG_RAMBASE</div><div class='add'>+#define	RAM_LENGTH	CONFIG_RAMSIZE</div><div class='add'>+#define	ROMVEC_START	CONFIG_ROMVEC</div><div class='add'>+#define	ROMVEC_LENGTH	CONFIG_ROMVECSIZE</div><div class='add'>+#define	ROM_START	CONFIG_ROMSTART</div><div class='add'>+#define	ROM_LENGTH	CONFIG_ROMSIZE</div><div class='ctx'> #define	TEXT		rom</div><div class='ctx'> #define	DATA		ram</div><div class='ctx'> #define	INIT		ram</div><div class='hunk'>@@ -215,17 +39,10 @@ OUTPUT_ARCH(m68k)</div><div class='ctx'> ENTRY(_start)</div><div class='ctx'> </div><div class='ctx'> MEMORY {</div><div class='del'>-#ifdef RAMVEC_START</div><div class='del'>-	ramvec	: ORIGIN = RAMVEC_START, LENGTH = RAMVEC_LENGTH</div><div class='del'>-#endif</div><div class='ctx'> 	ram	: ORIGIN = RAM_START, LENGTH = RAM_LENGTH</div><div class='del'>-#ifdef RAM_END</div><div class='del'>-	eram	: ORIGIN = RAM_END, LENGTH = 0</div><div class='del'>-#endif</div><div class='ctx'> #ifdef ROM_START</div><div class='ctx'> 	romvec	: ORIGIN = ROMVEC_START, LENGTH = ROMVEC_LENGTH</div><div class='ctx'> 	rom	: ORIGIN = ROM_START, LENGTH = ROM_LENGTH</div><div class='del'>-	erom	: ORIGIN = ROM_END, LENGTH = 0</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -302,19 +119,6 @@ SECTIONS {</div><div class='ctx'> 		_etext = . ;</div><div class='ctx'> 	} &gt; TEXT</div><div class='ctx'> </div><div class='del'>-#ifdef ROM_END</div><div class='del'>-	. = ROM_END ;</div><div class='del'>-	.erom : {</div><div class='del'>-		__rom_end = . ;</div><div class='del'>-	} &gt; erom</div><div class='del'>-#endif</div><div class='del'>-#ifdef RAMVEC_START</div><div class='del'>-	. = RAMVEC_START ;</div><div class='del'>-	.ramvec : {</div><div class='del'>-		__ramvec = .;</div><div class='del'>-	} &gt; ramvec</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	.data DATA_ADDR : {</div><div class='ctx'> 		. = ALIGN(4);</div><div class='ctx'> 		_sdata = . ;</div><div class='hunk'>@@ -373,12 +177,5 @@ SECTIONS {</div><div class='ctx'> 		_ebss = . ;</div><div class='ctx'> 	} &gt; BSS</div><div class='ctx'> </div><div class='del'>-#ifdef RAM_END</div><div class='del'>-	. = RAM_END ;</div><div class='del'>-	.eram : {</div><div class='del'>-		__ramend = . ;</div><div class='del'>-		_ramend = . ;</div><div class='del'>-	} &gt; eram</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68knommu/lib/semaphore.S b/arch/m68knommu/lib/semaphore.S<br/>index 76765362fea6..87c746034376 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/lib/semaphore.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/lib/semaphore.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/lib/semaphore.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/lib/semaphore.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c<br/>index d79503fe6e42..e4c233eef195 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/mm/init.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  DEC/2000 -- linux 2.4 support &lt;davidm@snapgear.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -63,8 +62,6 @@ static unsigned long empty_bad_page;</div><div class='ctx'> </div><div class='ctx'> unsigned long empty_zero_page;</div><div class='ctx'> </div><div class='del'>-extern unsigned long rom_length;</div><div class='del'>-</div><div class='ctx'> void show_mem(void)</div><div class='ctx'> {</div><div class='ctx'>     unsigned long i;</div><div class='hunk'>@@ -178,11 +175,9 @@ void mem_init(void)</div><div class='ctx'> 	initk = (&amp;__init_begin - &amp;__init_end) &gt;&gt; 10;</div><div class='ctx'> </div><div class='ctx'> 	tmp = nr_free_pages() &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	printk(KERN_INFO "Memory available: %luk/%luk RAM, %luk/%luk ROM (%dk kernel code, %dk data)\n",</div><div class='add'>+	printk(KERN_INFO "Memory available: %luk/%luk RAM, (%dk kernel code, %dk data)\n",</div><div class='ctx'> 	       tmp &gt;&gt; 10,</div><div class='ctx'> 	       len &gt;&gt; 10,</div><div class='del'>-	       (rom_length &gt; 0) ? ((rom_length &gt;&gt; 10) - codek) : 0,</div><div class='del'>-	       rom_length &gt;&gt; 10,</div><div class='ctx'> 	       codek,</div><div class='ctx'> 	       datak</div><div class='ctx'> 	       );</div><div class='head'>diff --git a/arch/m68knommu/mm/kmap.c b/arch/m68knommu/mm/kmap.c<br/>index 04213e1c1e57..bc32f38843f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/mm/kmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/mm/kmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/mm/kmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/mm/kmap.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *  Copyright (C) 2000-2002 David McCullough &lt;davidm@snapgear.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/mm/memory.c b/arch/m68knommu/mm/memory.c<br/>index 0eef72915e61..411e45248e5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/mm/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/mm/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/mm/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/mm/memory.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  Copyright (C) 1995  Hamish Macdonald</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5206/config.c b/arch/m68knommu/platform/5206/config.c<br/>index 987c91a9a206..34657f85e702 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5206/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5206/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5206/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5206/config.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5206e/config.c b/arch/m68knommu/platform/5206e/config.c<br/>index f35b8606c1ee..48e4d6266507 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5206e/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5206e/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5206e/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5206e/config.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/520x/config.c b/arch/m68knommu/platform/520x/config.c<br/>index 71dea2e0f452..823f561f35b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/520x/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/520x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/520x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/520x/config.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/523x/config.c b/arch/m68knommu/platform/523x/config.c<br/>index 22767ce506e0..85de817e9ec5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/523x/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/523x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/523x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/523x/config.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c<br/>index 289c1821b841..9d19d5bdb8af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5249/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5249/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5249/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5249/config.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c<br/>index cf36e7d007b9..d500e27eda57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5272/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5272/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5272/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5272/config.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/527x/config.c b/arch/m68knommu/platform/527x/config.c<br/>index 804de33cd6b7..bbae51597457 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/527x/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/527x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/527x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/527x/config.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/528x/config.c b/arch/m68knommu/platform/528x/config.c<br/>index a5d2aa38a27a..18dad9046144 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/528x/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/528x/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/528x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/528x/config.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5307/Makefile b/arch/m68knommu/platform/5307/Makefile<br/>index 8d1619dc1ea6..2fd37dcc309b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/Makefile</a></div><div class='hunk'>@@ -25,6 +25,7 @@ obj-$(CONFIG_M5249)	+= timers.o</div><div class='ctx'> obj-$(CONFIG_M527x)     += pit.o</div><div class='ctx'> obj-$(CONFIG_M5272)	+= timers.o</div><div class='ctx'> obj-$(CONFIG_M5307)	+= config.o timers.o</div><div class='add'>+obj-$(CONFIG_M532x)	+= timers.o</div><div class='ctx'> obj-$(CONFIG_M528x)     += pit.o</div><div class='ctx'> obj-$(CONFIG_M5407)	+= timers.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c<br/>index 7ed5782e9236..8074ac56f479 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/config.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5307/entry.S b/arch/m68knommu/platform/5307/entry.S<br/>index 89b180d4ed6a..f0dba84d9101 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/entry.S</a></div><div class='hunk'>@@ -4,8 +4,8 @@</div><div class='ctx'>  *  Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)</div><div class='ctx'>  *  Copyright (C) 1998  D. Jeff Dionne &lt;jeff@lineo.ca&gt;,</div><div class='ctx'>  *                      Kenneth Albanowski &lt;kjahds@kjahds.com&gt;,</div><div class='del'>- *  Copyright (C) 2000  Lineo Inc. (www.lineo.com) </div><div class='del'>- *  Copyright (C) 2004  Macq Electronique SA. (www.macqel.com)</div><div class='add'>+ *  Copyright (C) 2000  Lineo Inc. (www.lineo.com)</div><div class='add'>+ *  Copyright (C) 2004-2006  Macq Electronique SA. (www.macqel.com)</div><div class='ctx'>  *</div><div class='ctx'>  * Based on:</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  * Bug, speed and maintainability fixes by Philippe De Muyter &lt;phdm@macqel.be&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='hunk'>@@ -56,32 +55,27 @@ sw_usp:</div><div class='ctx'> .globl inthandler</div><div class='ctx'> .globl fasthandler</div><div class='ctx'> </div><div class='add'>+enosys:</div><div class='add'>+	mov.l	#sys_ni_syscall,%d3</div><div class='add'>+	bra	1f</div><div class='add'>+</div><div class='ctx'> ENTRY(system_call)</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	move	#0x2000,%sr		/* enable intrs again */</div><div class='ctx'> </div><div class='del'>-	movel	#-LENOSYS,%d2</div><div class='del'>-	movel	%d2,PT_D0(%sp)		/* default return value in d0 */</div><div class='del'>-					/* original D0 is in orig_d0 */</div><div class='del'>-	movel	%d0,%d2</div><div class='del'>-</div><div class='del'>-	/* save top of frame */</div><div class='del'>-	pea	%sp@</div><div class='del'>-	jbsr	set_esp0</div><div class='del'>-	addql	#4,%sp</div><div class='del'>-</div><div class='del'>-	cmpl	#NR_syscalls,%d2</div><div class='del'>-	jcc	ret_from_exception</div><div class='add'>+	cmpl	#NR_syscalls,%d0</div><div class='add'>+	jcc	enosys</div><div class='ctx'> 	lea	sys_call_table,%a0</div><div class='del'>-	lsll	#2,%d2			/* movel %a0@(%d2:l:4),%d3 */</div><div class='del'>-	movel	%a0@(%d2),%d3</div><div class='del'>-	jeq	ret_from_exception</div><div class='del'>-	lsrl	#2,%d2</div><div class='add'>+	lsll	#2,%d0			/* movel %a0@(%d0:l:4),%d3 */</div><div class='add'>+	movel	%a0@(%d0),%d3</div><div class='add'>+	jeq	enosys</div><div class='ctx'> </div><div class='add'>+1:</div><div class='ctx'> 	movel	%sp,%d2			/* get thread_info pointer */</div><div class='ctx'> 	andl	#-THREAD_SIZE,%d2	/* at start of kernel stack */</div><div class='ctx'> 	movel	%d2,%a0</div><div class='del'>-	btst	#TIF_SYSCALL_TRACE,%a0@(TI_FLAGS)</div><div class='add'>+	movel	%sp,%a0@(THREAD_ESP0)	/* save top of frame */</div><div class='add'>+	btst	#(TIF_SYSCALL_TRACE%8),%a0@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)</div><div class='ctx'> 	bnes	1f</div><div class='ctx'> </div><div class='ctx'> 	movel	%d3,%a0</div><div class='hunk'>@@ -126,8 +120,8 @@ Luser_return:</div><div class='ctx'> 	jne	Lwork_to_do		/* still work to do */</div><div class='ctx'> </div><div class='ctx'> Lreturn:</div><div class='del'>-	move    #0x2700,%sr		/* disable intrs */</div><div class='del'>-	movel   sw_usp,%a0		/* get usp */</div><div class='add'>+	move	#0x2700,%sr		/* disable intrs */</div><div class='add'>+	movel	sw_usp,%a0		/* get usp */</div><div class='ctx'> 	movel	%sp@(PT_PC),%a0@-	/* copy exception program counter */</div><div class='ctx'> 	movel	%sp@(PT_FORMATVEC),%a0@-/* copy exception format/vector/sr */</div><div class='ctx'> 	moveml	%sp@,%d1-%d5/%a0-%a2</div><div class='hunk'>@@ -170,7 +164,7 @@ ENTRY(inthandler)</div><div class='ctx'> 	movel	%d0,%sp@(PT_ORIG_D0)</div><div class='ctx'> 	addql	#1,local_irq_count</div><div class='ctx'> </div><div class='del'>-	movew   %sp@(PT_FORMATVEC),%d0	/* put exception # in d0 */</div><div class='add'>+	movew	%sp@(PT_FORMATVEC),%d0	/* put exception # in d0 */</div><div class='ctx'> 	andl	#0x03fc,%d0		/* mask out vector only */</div><div class='ctx'> </div><div class='ctx'> 	leal	per_cpu__kstat+STAT_IRQ,%a0</div><div class='hunk'>@@ -184,7 +178,7 @@ ENTRY(inthandler)</div><div class='ctx'> </div><div class='ctx'> 	movel	%sp,%sp@-		/* push regs arg onto stack */</div><div class='ctx'> 	movel	%a0@(8),%sp@-		/* push devid arg */</div><div class='del'>-	movel	%d0,%sp@- 		/* push vector # on stack */</div><div class='add'>+	movel	%d0,%sp@-		/* push vector # on stack */</div><div class='ctx'> </div><div class='ctx'> 	movel	%a0@,%a0		/* get function to call */</div><div class='ctx'> 	jbsr	%a0@			/* call vector handler */</div><div class='hunk'>@@ -201,7 +195,7 @@ ENTRY(inthandler)</div><div class='ctx'> ENTRY(fasthandler)</div><div class='ctx'> 	SAVE_LOCAL</div><div class='ctx'> </div><div class='del'>-	movew   %sp@(PT_FORMATVEC),%d0</div><div class='add'>+	movew	%sp@(PT_FORMATVEC),%d0</div><div class='ctx'> 	andl	#0x03fc,%d0		/* mask out vector only */</div><div class='ctx'> </div><div class='ctx'> 	leal	per_cpu__kstat+STAT_IRQ,%a0</div><div class='hunk'>@@ -210,7 +204,7 @@ ENTRY(fasthandler)</div><div class='ctx'> 	movel	%sp,%sp@-		/* push regs arg onto stack */</div><div class='ctx'> 	clrl	%sp@-			/* push devid arg */</div><div class='ctx'> 	lsrl	#2,%d0			/* calculate real vector # */</div><div class='del'>-	movel	%d0,%sp@- 		/* push vector # on stack */</div><div class='add'>+	movel	%d0,%sp@-		/* push vector # on stack */</div><div class='ctx'> </div><div class='ctx'> 	lsll	#4,%d0			/* adjust for array offset */</div><div class='ctx'> 	lea	irq_list,%a0</div><div class='hunk'>@@ -265,4 +259,3 @@ ENTRY(resume)</div><div class='ctx'> 	movew	%a1@(TASK_THREAD+THREAD_SR),%d0	/* restore thread status reg */</div><div class='ctx'> 	movew	%d0, %sr</div><div class='ctx'> 	rts</div><div class='del'>-</div><div class='head'>diff --git a/arch/m68knommu/platform/5307/head.S b/arch/m68knommu/platform/5307/head.S<br/>index c30c462b99b1..f2edb6498cd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/head.S</a></div><div class='hunk'>@@ -3,12 +3,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  *	head.S -- common startup code for ColdFire CPUs.</div><div class='ctx'>  *</div><div class='del'>- *	(C) Copyright 1999-2004, Greg Ungerer (gerg@snapgear.com).</div><div class='add'>+ *	(C) Copyright 1999-2006, Greg Ungerer &lt;gerg@snapgear.com&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -19,47 +18,15 @@</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Define fixed memory sizes. Configuration of a fixed memory size</div><div class='del'>- *	overrides everything else. If the user defined a size we just</div><div class='del'>- *	blindly use it (they know what they are doing right :-)</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_RAM32MB)</div><div class='del'>-#define MEM_SIZE	0x02000000	/* memory size 32Mb */</div><div class='del'>-#elif defined(CONFIG_RAM16MB)</div><div class='del'>-#define MEM_SIZE	0x01000000	/* memory size 16Mb */</div><div class='del'>-#elif defined(CONFIG_RAM8MB)</div><div class='del'>-#define MEM_SIZE	0x00800000	/* memory size 8Mb */</div><div class='del'>-#elif defined(CONFIG_RAM4MB)</div><div class='del'>-#define MEM_SIZE	0x00400000	/* memory size 4Mb */</div><div class='del'>-#elif defined(CONFIG_RAM1MB)</div><div class='del'>-#define MEM_SIZE	0x00100000	/* memory size 1Mb */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Memory size exceptions for special cases. Some boards may be set</div><div class='del'>- *	for auto memory sizing, but we can't do it that way for some reason.</div><div class='del'>- *	For example the 5206eLITE board has static RAM, and auto-detecting</div><div class='del'>- *	the SDRAM will do you no good at all. Same goes for the MOD5272.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_RAMAUTO</div><div class='del'>-#if defined(CONFIG_M5206eLITE)</div><div class='del'>-#define	MEM_SIZE	0x00100000	/* 1MiB default memory */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_MOD5272)</div><div class='del'>-#define MEM_SIZE	0x00800000	/* 8MiB default memory */</div><div class='del'>-#endif</div><div class='del'>-#endif /* CONFIG_RAMAUTO */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	If we don't have a fixed memory size now, then lets build in code</div><div class='add'>+ *	If we don't have a fixed memory size, then lets build in code</div><div class='ctx'>  *	to auto detect the DRAM size. Obviously this is the prefered</div><div class='del'>- *	method, and should work for most boards (it won't work for those</div><div class='del'>- *	that do not have their RAM starting at address 0).</div><div class='add'>+ *	method, and should work for most boards. It won't work for those</div><div class='add'>+ *	that do not have their RAM starting at address 0, and it only</div><div class='add'>+ *	works on SDRAM (not boards fitted with SRAM).</div><div class='ctx'>  */</div><div class='del'>-#if defined(MEM_SIZE)</div><div class='add'>+#if CONFIG_RAMSIZE != 0</div><div class='ctx'> .macro GET_MEM_SIZE</div><div class='del'>-	movel	#MEM_SIZE,%d0		/* hard coded memory size */</div><div class='add'>+	movel	#CONFIG_RAMSIZE,%d0	/* hard coded memory size */</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> #elif defined(CONFIG_M5206) || defined(CONFIG_M5206e) || \</div><div class='hunk'>@@ -98,37 +65,7 @@</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-#error "ERROR: I don't know how to determine your boards memory size?"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Most ColdFire boards have their DRAM starting at address 0.</div><div class='del'>- *	Notable exception is the 5206eLITE board, another is the MOD5272.</div><div class='del'>- */</div><div class='del'>-#if defined(CONFIG_M5206eLITE)</div><div class='del'>-#define	MEM_BASE	0x30000000</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_MOD5272)</div><div class='del'>-#define MEM_BASE	0x02000000</div><div class='del'>-#define VBR_BASE	0x20000000	/* vectors in SRAM */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_M5208EVB)</div><div class='del'>-#define MEM_BASE	0x40000000</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef MEM_BASE</div><div class='del'>-#define	MEM_BASE	0x00000000	/* memory base at address 0 */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The default location for the vectors is at the base of RAM.</div><div class='del'>- *	Some boards might like to use internal SRAM or something like</div><div class='del'>- *	that. If no board specific header defines an alternative then</div><div class='del'>- *	use the base of RAM.</div><div class='del'>- */</div><div class='del'>-#ifndef	VBR_BASE</div><div class='del'>-#define	VBR_BASE	MEM_BASE	/* vector address */</div><div class='add'>+#error "ERROR: I don't know how to probe your boards memory size?"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -191,11 +128,11 @@ _start:</div><div class='ctx'> 	 *	Create basic memory configuration. Set VBR accordingly,</div><div class='ctx'> 	 *	and size memory.</div><div class='ctx'> 	 */</div><div class='del'>-	movel	#VBR_BASE,%a7</div><div class='add'>+	movel	#CONFIG_VECTORBASE,%a7</div><div class='ctx'> 	movec   %a7,%VBR			/* set vectors addr */</div><div class='ctx'> 	movel	%a7,_ramvec</div><div class='ctx'> </div><div class='del'>-	movel	#MEM_BASE,%a7			/* mark the base of RAM */</div><div class='add'>+	movel	#CONFIG_RAMBASE,%a7		/* mark the base of RAM */</div><div class='ctx'> 	movel	%a7,_rambase</div><div class='ctx'> </div><div class='ctx'> 	GET_MEM_SIZE				/* macro code determines size */</div><div class='head'>diff --git a/arch/m68knommu/platform/5307/ints.c b/arch/m68knommu/platform/5307/ints.c<br/>index a134fb2f0566..b4b55093ae7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/ints.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/5307/pit.c b/arch/m68knommu/platform/5307/pit.c<br/>index 323f2677e49d..9dc5688f71b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/pit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/pit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/pit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/pit.c</a></div><div class='hunk'>@@ -1,23 +1,23 @@</div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	pit.c -- Motorola ColdFire PIT timer. Currently this type of</div><div class='del'>- *	         hardware timer only exists in the Motorola ColdFire</div><div class='add'>+ *	pit.c -- Freescale ColdFire PIT timer. Currently this type of</div><div class='add'>+ *	         hardware timer only exists in the Freescale ColdFire</div><div class='ctx'>  *		 5270/5271, 5282 and other CPUs.</div><div class='ctx'>  *</div><div class='del'>- *	Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com)</div><div class='add'>+ *	Copyright (C) 1999-2006, Greg Ungerer (gerg@snapgear.com)</div><div class='ctx'>  *	Copyright (C) 2001-2004, SnapGear Inc. (www.snapgear.com)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/coldfire.h&gt;</div><div class='ctx'> #include &lt;asm/mcfpit.h&gt;</div><div class='hunk'>@@ -25,13 +25,20 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ *	By default use timer1 as the system clock timer.</div><div class='add'>+ */</div><div class='add'>+#define	TA(a)	(MCF_IPSBAR + MCFPIT_BASE1 + (a))</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='ctx'> void coldfire_pit_tick(void)</div><div class='ctx'> {</div><div class='del'>-	volatile struct mcfpit *tp;</div><div class='add'>+	unsigned short pcsr;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the ColdFire timer */</div><div class='del'>-	tp = (volatile struct mcfpit *) (MCF_IPSBAR + MCFPIT_BASE1);</div><div class='del'>-	tp-&gt;pcsr |= MCFPIT_PCSR_PIF;</div><div class='add'>+	pcsr = __raw_readw(TA(MCFPIT_PCSR));</div><div class='add'>+	__raw_writew(pcsr | MCFPIT_PCSR_PIF, TA(MCFPIT_PCSR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='hunk'>@@ -40,9 +47,8 @@ void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))</div><div class='ctx'> {</div><div class='ctx'> 	volatile unsigned char *icrp;</div><div class='ctx'> 	volatile unsigned long *imrp;</div><div class='del'>-	volatile struct mcfpit *tp;</div><div class='ctx'> </div><div class='del'>-	request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, SA_INTERRUPT,</div><div class='add'>+	request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, IRQF_DISABLED,</div><div class='ctx'> 		"ColdFire Timer", NULL);</div><div class='ctx'> </div><div class='ctx'> 	icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 +</div><div class='hunk'>@@ -53,27 +59,23 @@ void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))</div><div class='ctx'> 	*imrp &amp;= ~MCFPIT_IMR_IBIT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up PIT timer 1 as poll clock */</div><div class='del'>-	tp = (volatile struct mcfpit *) (MCF_IPSBAR + MCFPIT_BASE1);</div><div class='del'>-	tp-&gt;pcsr = MCFPIT_PCSR_DISABLE;</div><div class='del'>-</div><div class='del'>-	tp-&gt;pmr = ((MCF_CLK / 2) / 64) / HZ;</div><div class='del'>-	tp-&gt;pcsr = MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | MCFPIT_PCSR_OVW |</div><div class='del'>-		MCFPIT_PCSR_RLD | MCFPIT_PCSR_CLK64;</div><div class='add'>+	__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));</div><div class='add'>+	__raw_writew(((MCF_CLK / 2) / 64) / HZ, TA(MCFPIT_PMR));</div><div class='add'>+	__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | MCFPIT_PCSR_OVW |</div><div class='add'>+		MCFPIT_PCSR_RLD | MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> unsigned long coldfire_pit_offset(void)</div><div class='ctx'> {</div><div class='del'>-	volatile struct mcfpit *tp;</div><div class='ctx'> 	volatile unsigned long *ipr;</div><div class='ctx'> 	unsigned long pmr, pcntr, offset;</div><div class='ctx'> </div><div class='del'>-	tp = (volatile struct mcfpit *) (MCF_IPSBAR + MCFPIT_BASE1);</div><div class='ctx'> 	ipr = (volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 + MCFPIT_IMR);</div><div class='ctx'> </div><div class='del'>-	pmr = *(&amp;tp-&gt;pmr);</div><div class='del'>-	pcntr = *(&amp;tp-&gt;pcntr);</div><div class='add'>+	pmr = __raw_readw(TA(MCFPIT_PMR));</div><div class='add'>+	pcntr = __raw_readw(TA(MCFPIT_PCNTR));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are still in the first half of the upcount and a</div><div class='head'>diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c<br/>index ef49596aa09c..24781f009337 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/timers.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/timers.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/timers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/timers.c</a></div><div class='hunk'>@@ -8,12 +8,12 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='hunk'>@@ -24,6 +24,11 @@</div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ *	By default use timer1 as the system clock timer.</div><div class='add'>+ */</div><div class='add'>+#define	TA(a)	(MCF_MBAR + MCFTIMER_BASE1 + (a))</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *	Default the timer and vector to use for ColdFire. Some ColdFire</div><div class='ctx'>  *	CPU's and some boards may want different. Their sub-architecture</div><div class='ctx'>  *	startup code (in config.c) can change these if they want.</div><div class='hunk'>@@ -32,8 +37,6 @@ unsigned int	mcf_timervector = 29;</div><div class='ctx'> unsigned int	mcf_profilevector = 31;</div><div class='ctx'> unsigned int	mcf_timerlevel = 5;</div><div class='ctx'> </div><div class='del'>-static volatile struct mcftimer *mcf_timerp;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	These provide the underlying interrupt vector support.</div><div class='ctx'>  *	Unfortunately it is a little different on each ColdFire.</div><div class='hunk'>@@ -46,22 +49,19 @@ extern int mcf_timerirqpending(int timer);</div><div class='ctx'> void coldfire_tick(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reset the ColdFire timer */</div><div class='del'>-	mcf_timerp-&gt;ter = MCFTIMER_TER_CAP | MCFTIMER_TER_REF;</div><div class='add'>+	__raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, TA(MCFTIMER_TER));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *))</div><div class='ctx'> {</div><div class='del'>-	/* Set up an internal TIMER as poll clock */</div><div class='del'>-	mcf_timerp = (volatile struct mcftimer *) (MCF_MBAR + MCFTIMER_BASE1);</div><div class='del'>-	mcf_timerp-&gt;tmr = MCFTIMER_TMR_DISABLE;</div><div class='del'>-</div><div class='del'>-	mcf_timerp-&gt;trr = (unsigned short) ((MCF_BUSCLK / 16) / HZ);</div><div class='del'>-	mcf_timerp-&gt;tmr = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |</div><div class='del'>-		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE;</div><div class='add'>+	__raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));</div><div class='add'>+	__raw_writew(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));</div><div class='add'>+	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |</div><div class='add'>+		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));</div><div class='ctx'> </div><div class='del'>-	request_irq(mcf_timervector, handler, SA_INTERRUPT, "timer", NULL);</div><div class='add'>+	request_irq(mcf_timervector, handler, IRQF_DISABLED, "timer", NULL);</div><div class='ctx'> 	mcf_settimericr(1, mcf_timerlevel);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIGHPROFILE</div><div class='hunk'>@@ -75,13 +75,8 @@ unsigned long coldfire_timer_offset(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long trr, tcn, offset;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The change to pointer and de-reference is to force the compiler</div><div class='del'>-	 * to read the registers with a single 16bit access. Otherwise it</div><div class='del'>-	 * does some crazy 8bit read combining.</div><div class='del'>-	 */</div><div class='del'>-	tcn = *(&amp;mcf_timerp-&gt;tcn);</div><div class='del'>-	trr = *(&amp;mcf_timerp-&gt;trr);</div><div class='add'>+	tcn = __raw_readw(TA(MCFTIMER_TCN));</div><div class='add'>+	trr = __raw_readw(TA(MCFTIMER_TRR));</div><div class='ctx'> 	offset = (tcn * (1000000 / HZ)) / trr;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if we just wrapped the counters and maybe missed a tick */</div><div class='hunk'>@@ -95,21 +90,23 @@ unsigned long coldfire_timer_offset(void)</div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ *	By default use timer2 as the profiler clock timer.</div><div class='add'>+ */</div><div class='add'>+#define	PA(a)	(MCF_MBAR + MCFTIMER_BASE2 + (a))</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *	Choose a reasonably fast profile timer. Make it an odd value to</div><div class='ctx'>  *	try and get good coverage of kernal operations.</div><div class='ctx'>  */</div><div class='ctx'> #define	PROFILEHZ	1013</div><div class='ctx'> </div><div class='del'>-static volatile struct mcftimer *mcf_proftp;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Use the other timer to provide high accuracy profiling info.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> void coldfire_profile_tick(int irq, void *dummy, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Reset ColdFire timer2 */</div><div class='del'>-	mcf_proftp-&gt;ter = MCFTIMER_TER_CAP | MCFTIMER_TER_REF;</div><div class='add'>+	__raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER));</div><div class='ctx'> 	if (current-&gt;pid)</div><div class='ctx'> 		profile_tick(CPU_PROFILING, regs);</div><div class='ctx'> }</div><div class='hunk'>@@ -121,15 +118,14 @@ void coldfire_profile_init(void)</div><div class='ctx'> 	printk(KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n", PROFILEHZ);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up TIMER 2 as high speed profile clock */</div><div class='del'>-	mcf_proftp = (volatile struct mcftimer *) (MCF_MBAR + MCFTIMER_BASE2);</div><div class='del'>-	mcf_proftp-&gt;tmr = MCFTIMER_TMR_DISABLE;</div><div class='add'>+	__raw_writew(MCFTIMER_TMR_DISABLE, PA(MCFTIMER_TMR));</div><div class='ctx'> </div><div class='del'>-	mcf_proftp-&gt;trr = (unsigned short) ((MCF_CLK / 16) / PROFILEHZ);</div><div class='del'>-	mcf_proftp-&gt;tmr = MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |</div><div class='del'>-		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE;</div><div class='add'>+	__raw_writew(((MCF_CLK / 16) / PROFILEHZ), PA(MCFTIMER_TRR));</div><div class='add'>+	__raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |</div><div class='add'>+		MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR));</div><div class='ctx'> </div><div class='ctx'> 	request_irq(mcf_profilevector, coldfire_profile_tick,</div><div class='del'>-		(SA_INTERRUPT | IRQ_FLG_FAST), "profile timer", NULL);</div><div class='add'>+		(IRQF_DISABLED | IRQ_FLG_FAST), "profile timer", NULL);</div><div class='ctx'> 	mcf_settimericr(2, 7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/m68knommu/platform/5307/vectors.c b/arch/m68knommu/platform/5307/vectors.c<br/>index ac313a160d8d..2a8b0d044ce5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/vectors.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5307/vectors.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5307/vectors.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5307/vectors.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/532x/Makefile b/arch/m68knommu/platform/532x/Makefile<br/>new file mode 100644<br/>index 000000000000..12301803b9eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/532x/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/532x/Makefile</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the m68knommu linux kernel.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# If you want to play with the HW breakpoints then you will</div><div class='add'>+# need to add define this,  which will give you a stack backtrace</div><div class='add'>+# on the console port whenever a DBG interrupt occurs. You have to</div><div class='add'>+# set up you HW breakpoints to trigger a DBG interrupt:</div><div class='add'>+#</div><div class='add'>+# EXTRA_CFLAGS += -DTRAP_DBG_INTERRUPT</div><div class='add'>+# EXTRA_AFLAGS += -DTRAP_DBG_INTERRUPT</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_FULLDEBUG</div><div class='add'>+AFLAGS += -DDEBUGGER_COMPATIBLE_CACHE=1</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+#obj-y := config.o usb-mcf532x.o spi-mcf532x.o</div><div class='add'>+obj-y := config.o</div><div class='head'>diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c<br/>new file mode 100644<br/>index 000000000000..ceef9bc181ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/532x/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/532x/config.c</a></div><div class='hunk'>@@ -0,0 +1,486 @@</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	linux/arch/m68knommu/platform/532x/config.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)</div><div class='add'>+ *	Copyright (C) 2000, Lineo (www.lineo.com)</div><div class='add'>+ *	Yaroslav Vinogradov yaroslav.vinogradov@freescale.com</div><div class='add'>+ *	Copyright Freescale Semiconductor, Inc 2006</div><div class='add'>+ *	Copyright (c) 2006, emlix, Sebastian Hess &lt;sh@emlix.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/coldfire.h&gt;</div><div class='add'>+#include &lt;asm/mcftimer.h&gt;</div><div class='add'>+#include &lt;asm/mcfsim.h&gt;</div><div class='add'>+#include &lt;asm/mcfdma.h&gt;</div><div class='add'>+#include &lt;asm/mcfwdebug.h&gt;</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+void coldfire_tick(void);</div><div class='add'>+void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));</div><div class='add'>+unsigned long coldfire_timer_offset(void);</div><div class='add'>+void coldfire_trap_init(void);</div><div class='add'>+void coldfire_reset(void);</div><div class='add'>+</div><div class='add'>+extern unsigned int mcf_timervector;</div><div class='add'>+extern unsigned int mcf_profilevector;</div><div class='add'>+extern unsigned int mcf_timerlevel;</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	DMA channel base address table.</div><div class='add'>+ */</div><div class='add'>+unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = { };</div><div class='add'>+unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+void mcf_settimericr(unsigned int timer, unsigned int level)</div><div class='add'>+{</div><div class='add'>+	volatile unsigned char *icrp;</div><div class='add'>+	unsigned int icr;</div><div class='add'>+	unsigned char irq;</div><div class='add'>+</div><div class='add'>+	if (timer &lt;= 2) {</div><div class='add'>+		switch (timer) {</div><div class='add'>+		case 2:  irq = 33; icr = MCFSIM_ICR_TIMER2; break;</div><div class='add'>+		default: irq = 32; icr = MCFSIM_ICR_TIMER1; break;</div><div class='add'>+		}</div><div class='add'>+		</div><div class='add'>+		icrp = (volatile unsigned char *) (MCF_MBAR + icr);</div><div class='add'>+		*icrp = level;</div><div class='add'>+		mcf_enable_irq0(irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+int mcf_timerirqpending(int timer)</div><div class='add'>+{</div><div class='add'>+	unsigned int imr = 0;</div><div class='add'>+</div><div class='add'>+	switch (timer) {</div><div class='add'>+	case 1:  imr = 0x1; break;</div><div class='add'>+	case 2:  imr = 0x2; break;</div><div class='add'>+	default: break;</div><div class='add'>+	}</div><div class='add'>+	return (mcf_getiprh() &amp; imr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+</div><div class='add'>+void config_BSP(char *commandp, int size)</div><div class='add'>+{</div><div class='add'>+	mcf_setimr(MCFSIM_IMR_MASKALL);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_BOOTPARAM)</div><div class='add'>+	strncpy(commandp, CONFIG_BOOTPARAM_STRING, size);</div><div class='add'>+	commandp[size-1] = 0;</div><div class='add'>+#else</div><div class='add'>+	/* Copy command line from FLASH to local buffer... */</div><div class='add'>+	memcpy(commandp, (char *) 0x4000, 4);</div><div class='add'>+	if(strncmp(commandp, "kcl ", 4) == 0){</div><div class='add'>+		memcpy(commandp, (char *) 0x4004, size);</div><div class='add'>+		commandp[size-1] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		memset(commandp, 0, size);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mcf_timervector = 64+32;</div><div class='add'>+	mcf_profilevector = 64+33;</div><div class='add'>+	mach_sched_init = coldfire_timer_init;</div><div class='add'>+	mach_tick = coldfire_tick;</div><div class='add'>+	mach_gettimeoffset = coldfire_timer_offset;</div><div class='add'>+	mach_trap_init = coldfire_trap_init;</div><div class='add'>+	mach_reset = coldfire_reset;</div><div class='add'>+</div><div class='add'>+#ifdef MCF_BDM_DISABLE</div><div class='add'>+	/*</div><div class='add'>+	 * Disable the BDM clocking.  This also turns off most of the rest of</div><div class='add'>+	 * the BDM device.  This is good for EMC reasons. This option is not</div><div class='add'>+	 * incompatible with the memory protection option.</div><div class='add'>+	 */</div><div class='add'>+	wdebug(MCFDEBUG_CSR, MCFDEBUG_CSR_PSTCLK);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************/</div><div class='add'>+/* Board initialization */</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/* </div><div class='add'>+ * PLL min/max specifications</div><div class='add'>+ */</div><div class='add'>+#define MAX_FVCO	500000	/* KHz */</div><div class='add'>+#define MAX_FSYS	80000 	/* KHz */</div><div class='add'>+#define MIN_FSYS	58333 	/* KHz */</div><div class='add'>+#define FREF		16000   /* KHz */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define MAX_MFD		135     /* Multiplier */</div><div class='add'>+#define MIN_MFD		88      /* Multiplier */</div><div class='add'>+#define BUSDIV		6       /* Divider */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Low Power Divider specifications</div><div class='add'>+ */</div><div class='add'>+#define MIN_LPD		(1 &lt;&lt; 0)    /* Divider (not encoded) */</div><div class='add'>+#define MAX_LPD		(1 &lt;&lt; 15)   /* Divider (not encoded) */</div><div class='add'>+#define DEFAULT_LPD	(1 &lt;&lt; 1)	/* Divider (not encoded) */</div><div class='add'>+</div><div class='add'>+#define SYS_CLK_KHZ	80000</div><div class='add'>+#define SYSTEM_PERIOD	12.5</div><div class='add'>+/*</div><div class='add'>+ *  SDRAM Timing Parameters</div><div class='add'>+ */  </div><div class='add'>+#define SDRAM_BL	8	/* # of beats in a burst */</div><div class='add'>+#define SDRAM_TWR	2	/* in clocks */</div><div class='add'>+#define SDRAM_CASL	2.5	/* CASL in clocks */</div><div class='add'>+#define SDRAM_TRCD	2	/* in clocks */</div><div class='add'>+#define SDRAM_TRP	2	/* in clocks */</div><div class='add'>+#define SDRAM_TRFC	7	/* in clocks */</div><div class='add'>+#define SDRAM_TREFI	7800	/* in ns */</div><div class='add'>+</div><div class='add'>+#define EXT_SRAM_ADDRESS	(0xC0000000)</div><div class='add'>+#define FLASH_ADDRESS		(0x00000000)</div><div class='add'>+#define SDRAM_ADDRESS		(0x40000000)</div><div class='add'>+</div><div class='add'>+#define NAND_FLASH_ADDRESS	(0xD0000000)</div><div class='add'>+</div><div class='add'>+int sys_clk_khz = 0;</div><div class='add'>+int sys_clk_mhz = 0;</div><div class='add'>+</div><div class='add'>+void wtm_init(void);</div><div class='add'>+void scm_init(void);</div><div class='add'>+void gpio_init(void);</div><div class='add'>+void fbcs_init(void);</div><div class='add'>+void sdramc_init(void);</div><div class='add'>+int  clock_pll (int fsys, int flags);</div><div class='add'>+int  clock_limp (int);</div><div class='add'>+int  clock_exit_limp (void);</div><div class='add'>+int  get_sys_clock (void);</div><div class='add'>+</div><div class='add'>+asmlinkage void __init sysinit(void)</div><div class='add'>+{</div><div class='add'>+	sys_clk_khz = clock_pll(0, 0);</div><div class='add'>+	sys_clk_mhz = sys_clk_khz/1000;</div><div class='add'>+	</div><div class='add'>+	wtm_init();</div><div class='add'>+	scm_init();</div><div class='add'>+	gpio_init();</div><div class='add'>+	fbcs_init();</div><div class='add'>+	sdramc_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wtm_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Disable watchdog timer */</div><div class='add'>+	MCF_WTM_WCR = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MCF_SCM_BCR_GBW		(0x00000100)</div><div class='add'>+#define MCF_SCM_BCR_GBR		(0x00000200)</div><div class='add'>+</div><div class='add'>+void scm_init(void)</div><div class='add'>+{</div><div class='add'>+	/* All masters are trusted */</div><div class='add'>+	MCF_SCM_MPR = 0x77777777;</div><div class='add'>+    </div><div class='add'>+	/* Allow supervisor/user, read/write, and trusted/untrusted</div><div class='add'>+	   access to all slaves */</div><div class='add'>+	MCF_SCM_PACRA = 0;</div><div class='add'>+	MCF_SCM_PACRB = 0;</div><div class='add'>+	MCF_SCM_PACRC = 0;</div><div class='add'>+	MCF_SCM_PACRD = 0;</div><div class='add'>+	MCF_SCM_PACRE = 0;</div><div class='add'>+	MCF_SCM_PACRF = 0;</div><div class='add'>+</div><div class='add'>+	/* Enable bursts */</div><div class='add'>+	MCF_SCM_BCR = (MCF_SCM_BCR_GBR | MCF_SCM_BCR_GBW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void fbcs_init(void)</div><div class='add'>+{</div><div class='add'>+	MCF_GPIO_PAR_CS = 0x0000003E;</div><div class='add'>+</div><div class='add'>+	/* Latch chip select */</div><div class='add'>+	MCF_FBCS1_CSAR = 0x10080000;</div><div class='add'>+</div><div class='add'>+	MCF_FBCS1_CSCR = 0x002A3780;</div><div class='add'>+	MCF_FBCS1_CSMR = (MCF_FBCS_CSMR_BAM_2M | MCF_FBCS_CSMR_V);</div><div class='add'>+</div><div class='add'>+	/* Initialize latch to drive signals to inactive states */</div><div class='add'>+	*((u16 *)(0x10080000)) = 0xFFFF;</div><div class='add'>+</div><div class='add'>+	/* External SRAM */</div><div class='add'>+	MCF_FBCS1_CSAR = EXT_SRAM_ADDRESS;</div><div class='add'>+	MCF_FBCS1_CSCR = (MCF_FBCS_CSCR_PS_16</div><div class='add'>+			| MCF_FBCS_CSCR_AA</div><div class='add'>+			| MCF_FBCS_CSCR_SBM</div><div class='add'>+			| MCF_FBCS_CSCR_WS(1));</div><div class='add'>+	MCF_FBCS1_CSMR = (MCF_FBCS_CSMR_BAM_512K</div><div class='add'>+			| MCF_FBCS_CSMR_V);</div><div class='add'>+</div><div class='add'>+	/* Boot Flash connected to FBCS0 */</div><div class='add'>+	MCF_FBCS0_CSAR = FLASH_ADDRESS;</div><div class='add'>+	MCF_FBCS0_CSCR = (MCF_FBCS_CSCR_PS_16</div><div class='add'>+			| MCF_FBCS_CSCR_BEM</div><div class='add'>+			| MCF_FBCS_CSCR_AA</div><div class='add'>+			| MCF_FBCS_CSCR_SBM</div><div class='add'>+			| MCF_FBCS_CSCR_WS(7));</div><div class='add'>+	MCF_FBCS0_CSMR = (MCF_FBCS_CSMR_BAM_32M</div><div class='add'>+			| MCF_FBCS_CSMR_V);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sdramc_init(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Check to see if the SDRAM has already been initialized</div><div class='add'>+	 * by a run control tool</div><div class='add'>+	 */</div><div class='add'>+	if (!(MCF_SDRAMC_SDCR &amp; MCF_SDRAMC_SDCR_REF)) {</div><div class='add'>+		/* SDRAM chip select initialization */</div><div class='add'>+		</div><div class='add'>+		/* Initialize SDRAM chip select */</div><div class='add'>+		MCF_SDRAMC_SDCS0 = (0</div><div class='add'>+			| MCF_SDRAMC_SDCS_BA(SDRAM_ADDRESS)</div><div class='add'>+			| MCF_SDRAMC_SDCS_CSSZ(MCF_SDRAMC_SDCS_CSSZ_32MBYTE));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Basic configuration and initialization</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDCFG1 = (0</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_SRD2RW((int)((SDRAM_CASL + 2) + 0.5 ))</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_SWT2RD(SDRAM_TWR + 1)</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_RDLAT((int)((SDRAM_CASL*2) + 2))</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_ACT2RW((int)((SDRAM_TRCD ) + 0.5))</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_PRE2ACT((int)((SDRAM_TRP ) + 0.5))</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_REF2ACT((int)(((SDRAM_TRFC) ) + 0.5))</div><div class='add'>+		| MCF_SDRAMC_SDCFG1_WTLAT(3));</div><div class='add'>+	MCF_SDRAMC_SDCFG2 = (0</div><div class='add'>+		| MCF_SDRAMC_SDCFG2_BRD2PRE(SDRAM_BL/2 + 1)</div><div class='add'>+		| MCF_SDRAMC_SDCFG2_BWT2RW(SDRAM_BL/2 + SDRAM_TWR)</div><div class='add'>+		| MCF_SDRAMC_SDCFG2_BRD2WT((int)((SDRAM_CASL+SDRAM_BL/2-1.0)+0.5))</div><div class='add'>+		| MCF_SDRAMC_SDCFG2_BL(SDRAM_BL-1));</div><div class='add'>+</div><div class='add'>+            </div><div class='add'>+	/*</div><div class='add'>+	 * Precharge and enable write to SDMR</div><div class='add'>+	 */</div><div class='add'>+        MCF_SDRAMC_SDCR = (0</div><div class='add'>+		| MCF_SDRAMC_SDCR_MODE_EN</div><div class='add'>+		| MCF_SDRAMC_SDCR_CKE</div><div class='add'>+		| MCF_SDRAMC_SDCR_DDR</div><div class='add'>+		| MCF_SDRAMC_SDCR_MUX(1)</div><div class='add'>+		| MCF_SDRAMC_SDCR_RCNT((int)(((SDRAM_TREFI/(SYSTEM_PERIOD*64)) - 1) + 0.5))</div><div class='add'>+		| MCF_SDRAMC_SDCR_PS_16</div><div class='add'>+		| MCF_SDRAMC_SDCR_IPALL);            </div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write extended mode register</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDMR = (0</div><div class='add'>+		| MCF_SDRAMC_SDMR_BNKAD_LEMR</div><div class='add'>+		| MCF_SDRAMC_SDMR_AD(0x0)</div><div class='add'>+		| MCF_SDRAMC_SDMR_CMD);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write mode register and reset DLL</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDMR = (0</div><div class='add'>+		| MCF_SDRAMC_SDMR_BNKAD_LMR</div><div class='add'>+		| MCF_SDRAMC_SDMR_AD(0x163)</div><div class='add'>+		| MCF_SDRAMC_SDMR_CMD);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Execute a PALL command</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDCR |= MCF_SDRAMC_SDCR_IPALL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Perform two REF cycles</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDCR |= MCF_SDRAMC_SDCR_IREF;</div><div class='add'>+	MCF_SDRAMC_SDCR |= MCF_SDRAMC_SDCR_IREF;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write mode register and clear reset DLL</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDMR = (0</div><div class='add'>+		| MCF_SDRAMC_SDMR_BNKAD_LMR</div><div class='add'>+		| MCF_SDRAMC_SDMR_AD(0x063)</div><div class='add'>+		| MCF_SDRAMC_SDMR_CMD);</div><div class='add'>+				</div><div class='add'>+	/*</div><div class='add'>+	 * Enable auto refresh and lock SDMR</div><div class='add'>+	 */</div><div class='add'>+	MCF_SDRAMC_SDCR &amp;= ~MCF_SDRAMC_SDCR_MODE_EN;</div><div class='add'>+	MCF_SDRAMC_SDCR |= (0</div><div class='add'>+		| MCF_SDRAMC_SDCR_REF</div><div class='add'>+		| MCF_SDRAMC_SDCR_DQS_OE(0xC));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void gpio_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Enable UART0 pins */</div><div class='add'>+	MCF_GPIO_PAR_UART = ( 0</div><div class='add'>+		| MCF_GPIO_PAR_UART_PAR_URXD0</div><div class='add'>+		| MCF_GPIO_PAR_UART_PAR_UTXD0);</div><div class='add'>+</div><div class='add'>+	/* Initialize TIN3 as a GPIO output to enable the write</div><div class='add'>+	   half of the latch */</div><div class='add'>+	MCF_GPIO_PAR_TIMER = 0x00;</div><div class='add'>+	MCF_GPIO_PDDR_TIMER = 0x08;</div><div class='add'>+	MCF_GPIO_PCLRR_TIMER = 0x0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clock_pll(int fsys, int flags)</div><div class='add'>+{</div><div class='add'>+	int fref, temp, fout, mfd;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	fref = FREF;</div><div class='add'>+        </div><div class='add'>+	if (fsys == 0) {</div><div class='add'>+		/* Return current PLL output */</div><div class='add'>+		mfd = MCF_PLL_PFDR;</div><div class='add'>+</div><div class='add'>+		return (fref * mfd / (BUSDIV * 4));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check bounds of requested system clock */</div><div class='add'>+	if (fsys &gt; MAX_FSYS)</div><div class='add'>+		fsys = MAX_FSYS;</div><div class='add'>+	if (fsys &lt; MIN_FSYS)</div><div class='add'>+		fsys = MIN_FSYS;</div><div class='add'>+</div><div class='add'>+	/* Multiplying by 100 when calculating the temp value,</div><div class='add'>+	   and then dividing by 100 to calculate the mfd allows</div><div class='add'>+	   for exact values without needing to include floating</div><div class='add'>+	   point libraries. */</div><div class='add'>+	temp = 100 * fsys / fref;</div><div class='add'>+	mfd = 4 * BUSDIV * temp / 100;</div><div class='add'>+    	    	    	</div><div class='add'>+	/* Determine the output frequency for selected values */</div><div class='add'>+	fout = (fref * mfd / (BUSDIV * 4));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check to see if the SDRAM has already been initialized.</div><div class='add'>+	 * If it has then the SDRAM needs to be put into self refresh</div><div class='add'>+	 * mode before reprogramming the PLL.</div><div class='add'>+	 */</div><div class='add'>+	if (MCF_SDRAMC_SDCR &amp; MCF_SDRAMC_SDCR_REF)</div><div class='add'>+		/* Put SDRAM into self refresh mode */</div><div class='add'>+		MCF_SDRAMC_SDCR &amp;= ~MCF_SDRAMC_SDCR_CKE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the PLL to generate the new system clock frequency.</div><div class='add'>+	 * The device must be put into LIMP mode to reprogram the PLL.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Enter LIMP mode */</div><div class='add'>+	clock_limp(DEFAULT_LPD);</div><div class='add'>+     					</div><div class='add'>+	/* Reprogram PLL for desired fsys */</div><div class='add'>+	MCF_PLL_PODR = (0</div><div class='add'>+		| MCF_PLL_PODR_CPUDIV(BUSDIV/3)</div><div class='add'>+		| MCF_PLL_PODR_BUSDIV(BUSDIV));</div><div class='add'>+						</div><div class='add'>+	MCF_PLL_PFDR = mfd;</div><div class='add'>+		</div><div class='add'>+	/* Exit LIMP mode */</div><div class='add'>+	clock_exit_limp();</div><div class='add'>+	</div><div class='add'>+	/*</div><div class='add'>+	 * Return the SDRAM to normal operation if it is in use.</div><div class='add'>+	 */</div><div class='add'>+	if (MCF_SDRAMC_SDCR &amp; MCF_SDRAMC_SDCR_REF)</div><div class='add'>+		/* Exit self refresh mode */</div><div class='add'>+		MCF_SDRAMC_SDCR |= MCF_SDRAMC_SDCR_CKE;</div><div class='add'>+</div><div class='add'>+	/* Errata - workaround for SDRAM opeartion after exiting LIMP mode */</div><div class='add'>+	MCF_SDRAMC_LIMP_FIX = MCF_SDRAMC_REFRESH;</div><div class='add'>+</div><div class='add'>+	/* wait for DQS logic to relock */</div><div class='add'>+	for (i = 0; i &lt; 0x200; i++)</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	return fout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clock_limp(int div)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	/* Check bounds of divider */</div><div class='add'>+	if (div &lt; MIN_LPD)</div><div class='add'>+		div = MIN_LPD;</div><div class='add'>+	if (div &gt; MAX_LPD)</div><div class='add'>+		div = MAX_LPD;</div><div class='add'>+    </div><div class='add'>+	/* Save of the current value of the SSIDIV so we don't</div><div class='add'>+	   overwrite the value*/</div><div class='add'>+	temp = (MCF_CCM_CDR &amp; MCF_CCM_CDR_SSIDIV(0xF));</div><div class='add'>+      </div><div class='add'>+	/* Apply the divider to the system clock */</div><div class='add'>+	MCF_CCM_CDR = ( 0</div><div class='add'>+		| MCF_CCM_CDR_LPDIV(div)</div><div class='add'>+		| MCF_CCM_CDR_SSIDIV(temp));</div><div class='add'>+    </div><div class='add'>+	MCF_CCM_MISCCR |= MCF_CCM_MISCCR_LIMP;</div><div class='add'>+    </div><div class='add'>+	return (FREF/(3*(1 &lt;&lt; div)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int clock_exit_limp(void)</div><div class='add'>+{</div><div class='add'>+	int fout;</div><div class='add'>+	</div><div class='add'>+	/* Exit LIMP mode */</div><div class='add'>+	MCF_CCM_MISCCR = (MCF_CCM_MISCCR &amp; ~ MCF_CCM_MISCCR_LIMP);</div><div class='add'>+</div><div class='add'>+	/* Wait for PLL to lock */</div><div class='add'>+	while (!(MCF_CCM_MISCCR &amp; MCF_CCM_MISCCR_PLL_LOCK))</div><div class='add'>+		;</div><div class='add'>+	</div><div class='add'>+	fout = get_sys_clock();</div><div class='add'>+</div><div class='add'>+	return fout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_sys_clock(void)</div><div class='add'>+{</div><div class='add'>+	int divider;</div><div class='add'>+	</div><div class='add'>+	/* Test to see if device is in LIMP mode */</div><div class='add'>+	if (MCF_CCM_MISCCR &amp; MCF_CCM_MISCCR_LIMP) {</div><div class='add'>+		divider = MCF_CCM_CDR &amp; MCF_CCM_CDR_LPDIV(0xF);</div><div class='add'>+		return (FREF/(2 &lt;&lt; divider));</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		return ((FREF * MCF_PLL_PFDR) / (BUSDIV * 4));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/m68knommu/platform/5407/config.c b/arch/m68knommu/platform/5407/config.c<br/>index f7c9018b85a7..5aad2645f0f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5407/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/5407/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/5407/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/5407/config.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/Makefile b/arch/m68knommu/platform/68328/Makefile<br/>index 1b3b719e4479..5e5435552d56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/Makefile</a></div><div class='hunk'>@@ -8,6 +8,7 @@ head-$(CONFIG_DRAGEN2)	= head-de2.o</div><div class='ctx'> </div><div class='ctx'> obj-y			+= entry.o ints.o timers.o</div><div class='ctx'> obj-$(CONFIG_M68328)	+= config.o</div><div class='add'>+obj-$(CONFIG_ROM)	+= romvec.o</div><div class='ctx'> </div><div class='ctx'> extra-y			:= head.o</div><div class='ctx'> extra-$(CONFIG_M68328)	+= bootlogo.rh head.o</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/config.c b/arch/m68knommu/platform/68328/config.c<br/>index bcfa5d7fe1e2..26ffeba28642 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/config.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dbg.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/entry.S b/arch/m68knommu/platform/68328/entry.S<br/>index 7d8990d784a2..f97862715450 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/entry.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Linux/m68k support by Hamish Macdonald</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/head-de2.S b/arch/m68knommu/platform/68328/head-de2.S<br/>index 94c5a1609a75..92d96456d363 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-de2.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-de2.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-de2.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/head-de2.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_RAM32MB)</div><div class='ctx'> #define	MEM_END	0x02000000	/* Memory size 32Mb */</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/head-pilot.S b/arch/m68knommu/platform/68328/head-pilot.S<br/>index c46775fe04be..9e07faa3e81d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-pilot.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-pilot.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-pilot.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/head-pilot.S</a></div><div class='hunk'>@@ -15,13 +15,11 @@</div><div class='ctx'> #define IMMED #</div><div class='ctx'> #define	DBG_PUTC(x)	moveb IMMED x, 0xfffff907</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> .global _stext</div><div class='ctx'> .global _start</div><div class='ctx'> </div><div class='ctx'> .global _rambase</div><div class='del'>-.global __ramvec</div><div class='ctx'> .global _ramvec</div><div class='ctx'> .global _ramstart</div><div class='ctx'> .global _ramend</div><div class='hunk'>@@ -121,7 +119,7 @@ L0:</div><div class='ctx'> 	DBG_PUTC('B')</div><div class='ctx'> </div><div class='ctx'> 	/* Copy command line from beginning of RAM (+16) to end of bss */</div><div class='del'>-	movel	#__ramvec, %d7</div><div class='add'>+	movel	#CONFIG_VECTORBASE, %d7</div><div class='ctx'> 	addl	#16, %d7</div><div class='ctx'> 	moveal	%d7, %a0</div><div class='ctx'> 	moveal	#_ebss, %a1</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/head-ram.S b/arch/m68knommu/platform/68328/head-ram.S<br/>index 6bdc9bce43f2..252b80b02038 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/head-ram.S</a></div><div class='hunk'>@@ -1,10 +1,6 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.global __main</div><div class='del'>-	.global __ram_start</div><div class='del'>-	.global __ram_end</div><div class='ctx'> 	.global __rom_start</div><div class='del'>-	.global __rom_end</div><div class='ctx'> </div><div class='ctx'>         .global _rambase</div><div class='ctx'>         .global _ramstart</div><div class='hunk'>@@ -12,6 +8,7 @@</div><div class='ctx'> 	.global splash_bits</div><div class='ctx'> 	.global _start</div><div class='ctx'> 	.global _stext</div><div class='add'>+	.global _edata</div><div class='ctx'> </div><div class='ctx'> #define DEBUG</div><div class='ctx'> #define ROM_OFFSET 0x10C00000</div><div class='hunk'>@@ -73,7 +70,7 @@ pclp1:</div><div class='ctx'> #ifdef CONFIG_RELOCATE</div><div class='ctx'> 	/* Copy me to RAM */</div><div class='ctx'> 	moveal	#__rom_start, %a0</div><div class='del'>-	moveal	#__ram_start, %a1</div><div class='add'>+	moveal	#_stext, %a1</div><div class='ctx'> 	moveal	#_edata, %a2</div><div class='ctx'> </div><div class='ctx'> 	/* Copy %a0 to %a1 until %a1 == %a2 */</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/head-rom.S b/arch/m68knommu/platform/68328/head-rom.S<br/>index 2b448a297011..6ec77d3ea0b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-rom.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/head-rom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/head-rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/head-rom.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> 	</div><div class='ctx'> 	.global _start</div><div class='ctx'> 	.global _stext</div><div class='hunk'>@@ -28,6 +27,8 @@ _ramstart:</div><div class='ctx'> _ramend:</div><div class='ctx'> .long   0</div><div class='ctx'> </div><div class='add'>+#define	RAMEND	(CONFIG_RAMBASE + CONFIG_RAMSIZE)</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_INIT_LCD</div><div class='ctx'> splash_bits:</div><div class='ctx'> #include "bootlogo.rh"</div><div class='hunk'>@@ -48,7 +49,7 @@ _stext:	movew	#0x2700,%sr</div><div class='ctx'> 	moveb	#0x81,   0xfffffA27	/* LCKCON */</div><div class='ctx'> 	movew	#0xff00, 0xfffff412	/* LCD pins */</div><div class='ctx'> #endif</div><div class='del'>-	moveal  #__ramend-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp</div><div class='add'>+	moveal  #RAMEND-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp</div><div class='ctx'> 	movew	#32767, %d0  /* PLL settle wait loop */</div><div class='ctx'> 1:	subq	#1, %d0</div><div class='ctx'> 	bne	1b</div><div class='hunk'>@@ -73,13 +74,13 @@ _stext:	movew	#0x2700,%sr</div><div class='ctx'> 	bhi	1b</div><div class='ctx'> </div><div class='ctx'>         movel   #_sdata, %d0    </div><div class='del'>-        movel   %d0,    _rambase        </div><div class='del'>-        movel   #_ebss,  %d0</div><div class='del'>-        movel   %d0,    _ramstart</div><div class='del'>-	movel	#__ramend-CONFIG_MEMORY_RESERVE*0x100000, %d0</div><div class='del'>-	movel	%d0,	_ramend</div><div class='del'>-	movel	#__ramvec,	%d0</div><div class='del'>-	movel	%d0,	_ramvec</div><div class='add'>+        movel   %d0, _rambase        </div><div class='add'>+        movel   #_ebss, %d0</div><div class='add'>+        movel   %d0, _ramstart</div><div class='add'>+	movel	#RAMEND-CONFIG_MEMORY_RESERVE*0x100000, %d0</div><div class='add'>+	movel	%d0, _ramend</div><div class='add'>+	movel	#CONFIG_VECTORBASE,	%d0</div><div class='add'>+	movel	%d0, _ramvec</div><div class='ctx'> 	</div><div class='ctx'> /*</div><div class='ctx'>  * load the current task pointer and stack</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/ints.c b/arch/m68knommu/platform/68328/ints.c<br/>index 7437217813d2..2dda7339aae5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/ints.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/irqnode.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='hunk'>@@ -82,25 +83,6 @@ unsigned int local_irq_count[NR_CPUS];</div><div class='ctx'> /* irq node variables for the 32 (potential) on chip sources */</div><div class='ctx'> static irq_node_t int_irq_list[NR_IRQS];</div><div class='ctx'> </div><div class='del'>-#if !defined(CONFIG_DRAGEN2)</div><div class='del'>-asm (".global _start, __ramend/n/t"</div><div class='del'>-     ".section .romvec/n"</div><div class='del'>-     "e_vectors:\n\t"</div><div class='del'>-     ".long __ramend-4, _start, buserr, trap, trap, trap, trap, trap\n\t"</div><div class='del'>-     ".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"</div><div class='del'>-     ".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"</div><div class='del'>-     ".long trap, trap, trap, trap\n\t"</div><div class='del'>-     ".long trap, trap, trap, trap\n\t"</div><div class='del'>-	/*.long inthandler, inthandler, inthandler, inthandler</div><div class='del'>-	.long inthandler4, inthandler, inthandler, inthandler   */</div><div class='del'>-	/* TRAP #0-15 */</div><div class='del'>-     ".long system_call, trap, trap, trap, trap, trap, trap, trap\n\t"</div><div class='del'>-     ".long trap, trap, trap, trap, trap, trap, trap, trap\n\t"</div><div class='del'>-     ".long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0\n\t"</div><div class='del'>-     ".text\n"</div><div class='del'>-     "ignore: rte");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This function should be called during kernel startup to initialize</div><div class='ctx'>  * the IRQ handling routines.</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/romvec.S b/arch/m68knommu/platform/68328/romvec.S<br/>new file mode 100644<br/>index 000000000000..3e7fe1e14913<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/romvec.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/romvec.S</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/arch/m68knommu/platform/68328/romvec.S</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright 1996 Roman Zippel</div><div class='add'>+ * Copyright 1999 D. Jeff Dionne &lt;jeff@rt-control.com&gt;</div><div class='add'>+ * Copyright 2006 Greg Ungerer &lt;gerg@snapgear.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+</div><div class='add'>+.global _start</div><div class='add'>+.global _buserr</div><div class='add'>+.global trap</div><div class='add'>+.global system_call</div><div class='add'>+</div><div class='add'>+.section .romvec</div><div class='add'>+</div><div class='add'>+e_vectors:</div><div class='add'>+.long CONFIG_RAMBASE+CONFIG_RAMSIZE-4, _start, buserr, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+/* TRAP #0-15 */</div><div class='add'>+.long system_call, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long trap, trap, trap, trap</div><div class='add'>+.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</div><div class='add'>+</div><div class='head'>diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c<br/>index 68c2cd6b0030..438ef6ee9720 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/timers.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68328/timers.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68328/timers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68328/timers.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/68360/config.c b/arch/m68knommu/platform/68360/config.c<br/>index 3db244625f0f..c5482e3622eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68360/config.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -141,13 +140,13 @@ int BSP_set_clock_mmss (unsigned long nowtime)</div><div class='ctx'> void BSP_reset (void)</div><div class='ctx'> {</div><div class='ctx'>   local_irq_disable();</div><div class='del'>-  asm volatile ("</div><div class='del'>-    moveal #_start, %a0;</div><div class='del'>-    moveb #0, 0xFFFFF300;</div><div class='del'>-    moveal 0(%a0), %sp;</div><div class='del'>-    moveal 4(%a0), %a0;</div><div class='del'>-    jmp (%a0);</div><div class='del'>-    ");</div><div class='add'>+  asm volatile (</div><div class='add'>+    "moveal #_start, %a0;\n"</div><div class='add'>+    "moveb #0, 0xFFFFF300;\n"</div><div class='add'>+    "moveal 0(%a0), %sp;\n"</div><div class='add'>+    "moveal 4(%a0), %a0;\n"</div><div class='add'>+    "jmp (%a0);\n"</div><div class='add'>+    );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned char *scc1_hwaddr;</div><div class='head'>diff --git a/arch/m68knommu/platform/68360/entry.S b/arch/m68knommu/platform/68360/entry.S<br/>index 8ff48adf24ab..f1af8977f294 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68360/entry.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * M68360 Port by SED Systems, and Lineo.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S<br/>index a5c639a51eef..2ea51479f13a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/head-ram.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/head-ram.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/head-ram.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68360/head-ram.S</a></div><div class='hunk'>@@ -12,13 +12,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #define ASSEMBLY</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> .global _stext</div><div class='ctx'> .global _start</div><div class='ctx'> </div><div class='ctx'> .global _rambase</div><div class='del'>-.global __ramvec</div><div class='ctx'> .global _ramvec</div><div class='ctx'> .global _ramstart</div><div class='ctx'> .global _ramend</div><div class='hunk'>@@ -26,6 +24,8 @@</div><div class='ctx'> .global _quicc_base</div><div class='ctx'> .global _periph_base</div><div class='ctx'> </div><div class='add'>+#define	RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)</div><div class='add'>+</div><div class='ctx'> #define REGB                        0x1000</div><div class='ctx'> #define PEPAR                       (_dprbase + REGB + 0x0016)</div><div class='ctx'> #define GMR                         (_dprbase + REGB + 0x0040)</div><div class='hunk'>@@ -103,7 +103,7 @@ _stext:</div><div class='ctx'> 	nop</div><div class='ctx'> 	ori.w	#MCU_DISABLE_INTRPTS, %sr	/* disable interrupts: */</div><div class='ctx'> 	/* We should not need to setup the boot stack the reset should do it. */</div><div class='del'>-	movea.l	#__ramend, %sp			/*set up stack at the end of DRAM:*/</div><div class='add'>+	movea.l	#RAMEND, %sp			/*set up stack at the end of DRAM:*/</div><div class='ctx'> </div><div class='ctx'> set_mbar_register:</div><div class='ctx'> 	moveq.l	#0x07, %d1			/* Setup MBAR */</div><div class='hunk'>@@ -163,7 +163,7 @@ configure_memory_controller:</div><div class='ctx'> 	move.l	%d0, GMR</div><div class='ctx'> </div><div class='ctx'> configure_chip_select_0:</div><div class='del'>-	move.l	#__ramend, %d0</div><div class='add'>+	move.l	#RAMEND, %d0</div><div class='ctx'> 	subi.l	#__ramstart, %d0</div><div class='ctx'> 	subq.l	#0x01, %d0</div><div class='ctx'> 	eori.l	#SIM_OR_MASK, %d0</div><div class='hunk'>@@ -234,16 +234,10 @@ store_ram_size:</div><div class='ctx'> 	/* Set ram size information */</div><div class='ctx'> 	move.l	#_sdata, _rambase</div><div class='ctx'> 	move.l	#_ebss, _ramstart</div><div class='del'>-	move.l	#__ramend, %d0</div><div class='add'>+	move.l	#RAMEND, %d0</div><div class='ctx'> 	sub.l	#0x1000, %d0			/* Reserve 4K for stack space.*/</div><div class='del'>-	move.l	%d0, _ramend			/* Different from __ramend.*/</div><div class='add'>+	move.l	%d0, _ramend			/* Different from RAMEND.*/</div><div class='ctx'> </div><div class='del'>-store_flash_size:</div><div class='del'>-	/* Set rom size information */</div><div class='del'>-	move.l	#__rom_end, %d0</div><div class='del'>-	sub.l	#__rom_start, %d0</div><div class='del'>-	move.l	%d0, rom_length</div><div class='del'>-    </div><div class='ctx'> 	pea	0</div><div class='ctx'> 	pea	env</div><div class='ctx'> 	pea	%sp@(4)</div><div class='hunk'>@@ -286,7 +280,7 @@ _dprbase:</div><div class='ctx'>      */</div><div class='ctx'>  </div><div class='ctx'> .section ".data.initvect","awx"</div><div class='del'>-    .long   __ramend	/* Reset: Initial Stack Pointer                 - 0.  */</div><div class='add'>+    .long   RAMEND	/* Reset: Initial Stack Pointer                 - 0.  */</div><div class='ctx'>     .long   _start      /* Reset: Initial Program Counter               - 1.  */</div><div class='ctx'>     .long   buserr      /* Bus Error                                    - 2.  */</div><div class='ctx'>     .long   trap        /* Address Error                                - 3.  */</div><div class='head'>diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S<br/>index 0da357a4cfee..62ecf4144b3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/head-rom.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/head-rom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/head-rom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68360/head-rom.S</a></div><div class='hunk'>@@ -11,14 +11,12 @@</div><div class='ctx'>  * Copyright (C) 1998  D. Jeff Dionne &lt;jeff@uclinux.org&gt;,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> .global _stext</div><div class='ctx'> .global _sbss</div><div class='ctx'> .global _start</div><div class='ctx'> </div><div class='ctx'> .global _rambase</div><div class='del'>-.global __ramvec</div><div class='ctx'> .global _ramvec</div><div class='ctx'> .global _ramstart</div><div class='ctx'> .global _ramend</div><div class='hunk'>@@ -26,6 +24,8 @@</div><div class='ctx'> .global _quicc_base</div><div class='ctx'> .global _periph_base</div><div class='ctx'> </div><div class='add'>+#define	RAMEND                      (CONFIG_RAMBASE + CONFIG_RAMSIZE)</div><div class='add'>+</div><div class='ctx'> #define REGB                        0x1000</div><div class='ctx'> #define PEPAR                       (_dprbase + REGB + 0x0016)</div><div class='ctx'> #define GMR                         (_dprbase + REGB + 0x0040)</div><div class='hunk'>@@ -115,7 +115,7 @@ _stext:</div><div class='ctx'> 	nop</div><div class='ctx'> 	ori.w	#MCU_DISABLE_INTRPTS, %sr	/* disable interrupts: */</div><div class='ctx'> 	/* We should not need to setup the boot stack the reset should do it. */</div><div class='del'>-	movea.l	#__ramend, %sp		/* set up stack at the end of DRAM:*/</div><div class='add'>+	movea.l	#RAMEND, %sp		/* set up stack at the end of DRAM:*/</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> set_mbar_register:</div><div class='hunk'>@@ -245,16 +245,10 @@ store_ram_size:</div><div class='ctx'> 	/* Set ram size information */</div><div class='ctx'> 	move.l	#_sdata, _rambase</div><div class='ctx'> 	move.l	#_ebss, _ramstart</div><div class='del'>-	move.l	#__ramend, %d0</div><div class='add'>+	move.l	#RAMEND, %d0</div><div class='ctx'> 	sub.l	#0x1000, %d0			/* Reserve 4K for stack space.*/</div><div class='del'>-	move.l	%d0, _ramend			/* Different from __ramend.*/</div><div class='add'>+	move.l	%d0, _ramend			/* Different from RAMEND.*/</div><div class='ctx'> </div><div class='del'>-store_flash_size:</div><div class='del'>-	/* Set rom size information */</div><div class='del'>-	move.l	#__rom_end, %d0</div><div class='del'>-	sub.l	#__rom_start, %d0</div><div class='del'>-	move.l	%d0, rom_length</div><div class='del'>-    </div><div class='ctx'> 	pea	0</div><div class='ctx'> 	pea	env</div><div class='ctx'> 	pea	%sp@(4)</div><div class='hunk'>@@ -298,7 +292,7 @@ _dprbase:</div><div class='ctx'>      */</div><div class='ctx'>  </div><div class='ctx'> .section ".data.initvect","awx"</div><div class='del'>-    .long   __ramend	/* Reset: Initial Stack Pointer                 - 0.  */</div><div class='add'>+    .long   RAMEND	/* Reset: Initial Stack Pointer                 - 0.  */</div><div class='ctx'>     .long   _start      /* Reset: Initial Program Counter               - 1.  */</div><div class='ctx'>     .long   buserr      /* Bus Error                                    - 2.  */</div><div class='ctx'>     .long   trap        /* Address Error                                - 3.  */</div><div class='head'>diff --git a/arch/m68knommu/platform/68360/ints.c b/arch/m68knommu/platform/68360/ints.c<br/>index ba184db1651b..4df3c146eb74 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/ints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68360/ints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68360/ints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68360/ints.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright (c) 1999 D. Jeff Dionne &lt;jeff@uclinux.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -20,6 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/irqnode.h&gt;</div><div class='ctx'> #include &lt;asm/traps.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='head'>diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c<br/>index d8d56e5de310..659b80aca118 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68EZ328/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68EZ328/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68EZ328/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68EZ328/config.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -42,13 +41,13 @@ void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int</div><div class='ctx'> void m68ez328_reset(void)</div><div class='ctx'> {</div><div class='ctx'>   local_irq_disable();</div><div class='del'>-  asm volatile ("</div><div class='del'>-    moveal #0x10c00000, %a0;</div><div class='del'>-    moveb #0, 0xFFFFF300;</div><div class='del'>-    moveal 0(%a0), %sp;</div><div class='del'>-    moveal 4(%a0), %a0;</div><div class='del'>-    jmp (%a0);</div><div class='del'>-    ");</div><div class='add'>+  asm volatile (</div><div class='add'>+    "moveal #0x10c00000, %a0;\n"</div><div class='add'>+    "moveb #0, 0xFFFFF300;\n"</div><div class='add'>+    "moveal 0(%a0), %sp;\n"</div><div class='add'>+    "moveal 4(%a0), %a0;\n"</div><div class='add'>+    "jmp (%a0);\n"</div><div class='add'>+    );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='head'>diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c<br/>index d926524cdf82..fcd100b7594d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68VZ328/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/m68knommu/platform/68VZ328/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/m68knommu/platform/68VZ328/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/m68knommu/platform/68VZ328/config.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -141,13 +140,13 @@ static void init_hardware(char *command, int size)</div><div class='ctx'> static void m68vz328_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='del'>-	asm volatile ("</div><div class='del'>-		moveal #0x10c00000, %a0;</div><div class='del'>-		moveb #0, 0xFFFFF300;</div><div class='del'>-		moveal 0(%a0), %sp;</div><div class='del'>-		moveal 4(%a0), %a0;</div><div class='del'>-		jmp (%a0);</div><div class='del'>-	");</div><div class='add'>+	asm volatile (</div><div class='add'>+		"moveal #0x10c00000, %a0;\n\t"</div><div class='add'>+		"moveb #0, 0xFFFFF300;\n\t"</div><div class='add'>+		"moveal 0(%a0), %sp;\n\t"</div><div class='add'>+		"moveal 4(%a0), %a0;\n\t"</div><div class='add'>+		"jmp (%a0);\n"</div><div class='add'>+	);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned char *cs8900a_hwaddr;</div><div class='head'>diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig<br/>index e8ff09fe73d9..330f6abc7703 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/Kconfig</a></div><div class='hunk'>@@ -119,6 +119,32 @@ config MIPS_MIRAGE</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R1</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='add'>+config BASLER_EXCITE</div><div class='add'>+	bool "Basler eXcite smart camera support"</div><div class='add'>+	select DMA_COHERENT</div><div class='add'>+	select HW_HAS_PCI</div><div class='add'>+	select IRQ_CPU</div><div class='add'>+	select IRQ_CPU_RM7K</div><div class='add'>+	select IRQ_CPU_RM9K</div><div class='add'>+	select SERIAL_RM9000</div><div class='add'>+	select SYS_HAS_CPU_RM9000</div><div class='add'>+	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	help</div><div class='add'>+	  The eXcite is a smart camera platform manufactured by</div><div class='add'>+	  Basler Vision Technologies AG</div><div class='add'>+</div><div class='add'>+config BASLER_EXCITE_PROTOTYPE</div><div class='add'>+	bool "Support for pre-release units"</div><div class='add'>+	depends on BASLER_EXCITE</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Pre-series (prototype) units are different from later ones in</div><div class='add'>+	  some ways. Select this option if you have one of these. Please</div><div class='add'>+	  note that a kernel built with this option selected will not be</div><div class='add'>+	  able to run on normal units.</div><div class='add'>+</div><div class='ctx'> config MIPS_COBALT</div><div class='ctx'> 	bool "Cobalt Server"</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='hunk'>@@ -142,6 +168,9 @@ config MACH_DECSTATION</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_128HZ</div><div class='add'>+	select SYS_SUPPORTS_256HZ</div><div class='add'>+	select SYS_SUPPORTS_1024HZ</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for DEC's MIPS based workstations.  For details</div><div class='ctx'> 	  see the Linux/MIPS FAQ on &lt;http://www.linux-mips.org/&gt; and the</div><div class='hunk'>@@ -239,6 +268,7 @@ config MACH_JAZZ</div><div class='ctx'> 	select SYS_HAS_CPU_R4X00</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL</div><div class='add'>+	select SYS_SUPPORTS_100HZ</div><div class='ctx'> 	help</div><div class='ctx'> 	 This a family of machines based on the MIPS R4030 chipset which was</div><div class='ctx'> 	 used by several vendors to build RISC/os and Windows NT workstations.</div><div class='hunk'>@@ -278,6 +308,7 @@ config MIPS_ATLAS</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for the MIPS Technologies Atlas evaluation</div><div class='ctx'> 	  board.</div><div class='hunk'>@@ -294,6 +325,7 @@ config MIPS_MALTA</div><div class='ctx'> 	select I8259</div><div class='ctx'> 	select MIPS_BOARDS_GEN</div><div class='ctx'> 	select MIPS_BONITO64</div><div class='add'>+	select MIPS_CPU_SCACHE</div><div class='ctx'> 	select MIPS_GT64120</div><div class='ctx'> 	select MIPS_MSC</div><div class='ctx'> 	select SWAP_IO_SPACE</div><div class='hunk'>@@ -306,6 +338,7 @@ config MIPS_MALTA</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_MULTITHREADING</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables support for the MIPS Technologies Malta evaluation</div><div class='ctx'> 	  board.</div><div class='hunk'>@@ -327,6 +360,27 @@ config MIPS_SEAD</div><div class='ctx'> 	  This enables support for the MIPS Technologies SEAD evaluation</div><div class='ctx'> 	  board.</div><div class='ctx'> </div><div class='add'>+config WR_PPMC</div><div class='add'>+	bool "Wind River PPMC board"</div><div class='add'>+	select IRQ_CPU</div><div class='add'>+	select BOOT_ELF32</div><div class='add'>+	select DMA_NONCOHERENT</div><div class='add'>+	select HW_HAS_PCI</div><div class='add'>+	select MIPS_GT64120</div><div class='add'>+	select SWAP_IO_SPACE</div><div class='add'>+	select SYS_HAS_CPU_MIPS32_R1</div><div class='add'>+	select SYS_HAS_CPU_MIPS32_R2</div><div class='add'>+	select SYS_HAS_CPU_MIPS64_R1</div><div class='add'>+	select SYS_HAS_CPU_NEVADA</div><div class='add'>+	select SYS_HAS_CPU_RM7000</div><div class='add'>+	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Wind River MIPS32 4KC PPMC evaluation</div><div class='add'>+	  board, which is based on GT64120 bridge chip.</div><div class='add'>+</div><div class='ctx'> config MIPS_SIM</div><div class='ctx'> 	bool 'MIPS simulator (MIPSsim)'</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='hunk'>@@ -426,6 +480,7 @@ config MOMENCO_OCELOT_G</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by</div><div class='ctx'> 	  Momentum Computer &lt;http://www.momenco.com/&gt;.</div><div class='hunk'>@@ -438,53 +493,16 @@ config MIPS_XXS1500</div><div class='ctx'> </div><div class='ctx'> config PNX8550_V2PCI</div><div class='ctx'> 	bool "Philips PNX8550 based Viper2-PCI board"</div><div class='add'>+	depends on BROKEN</div><div class='ctx'> 	select PNX8550</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='ctx'> config PNX8550_JBS</div><div class='ctx'> 	bool "Philips PNX8550 based JBS board"</div><div class='add'>+	depends on BROKEN</div><div class='ctx'> 	select PNX8550</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='del'>-config DDB5074</div><div class='del'>-	bool "NEC DDB Vrc-5074 (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='del'>-	select DDB5XXX_COMMON</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select HAVE_STD_PC_SERIAL_PORT</div><div class='del'>-	select HW_HAS_PCI</div><div class='del'>-	select IRQ_CPU</div><div class='del'>-	select I8259</div><div class='del'>-	select ISA</div><div class='del'>-	select SYS_HAS_CPU_R5000</div><div class='del'>-	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	help</div><div class='del'>-	  This enables support for the VR5000-based NEC DDB Vrc-5074</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-config DDB5476</div><div class='del'>-	bool "NEC DDB Vrc-5476"</div><div class='del'>-	select DDB5XXX_COMMON</div><div class='del'>-	select DMA_NONCOHERENT</div><div class='del'>-	select HAVE_STD_PC_SERIAL_PORT</div><div class='del'>-	select HW_HAS_PCI</div><div class='del'>-	select IRQ_CPU</div><div class='del'>-	select I8259</div><div class='del'>-	select ISA</div><div class='del'>-	select SYS_HAS_CPU_R5432</div><div class='del'>-	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='del'>-	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL</div><div class='del'>-	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='del'>-	help</div><div class='del'>-	  This enables support for the R5432-based NEC DDB Vrc-5476</div><div class='del'>-	  evaluation board.</div><div class='del'>-</div><div class='del'>-	  Features : kernel debugging, serial terminal, NFS root fs, on-board</div><div class='del'>-	  ether port USB, AC97, PCI, PCI VGA card &amp; framebuffer console,</div><div class='del'>-	  IDE controller, PS2 keyboard, PS2 mouse, etc.</div><div class='del'>-</div><div class='ctx'> config DDB5477</div><div class='ctx'> 	bool "NEC DDB Vrc-5477"</div><div class='ctx'> 	select DDB5XXX_COMMON</div><div class='hunk'>@@ -522,6 +540,7 @@ config PMC_YOSEMITE</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_HIGHMEM</div><div class='add'>+	select SYS_SUPPORTS_SMP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Yosemite is an evaluation board for the RM9000x2 processor</div><div class='ctx'> 	  manufactured by PMC-Sierra.</div><div class='hunk'>@@ -538,6 +557,7 @@ config QEMU</div><div class='ctx'> 	select SYS_HAS_CPU_MIPS32_R1</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select ARCH_SPARSEMEM_ENABLE</div><div class='ctx'> 	help</div><div class='ctx'> 	  Qemu is a software emulator which among other architectures also</div><div class='ctx'> 	  can simulate a MIPS32 4Kc system.  This patch adds support for the</div><div class='hunk'>@@ -546,6 +566,20 @@ config QEMU</div><div class='ctx'> 	  simulate actual MIPS hardware platforms.  More information on Qemu</div><div class='ctx'> 	  can be found at http://www.linux-mips.org/wiki/Qemu.</div><div class='ctx'> </div><div class='add'>+config MARKEINS</div><div class='add'>+	bool "Support for NEC EMMA2RH Mark-eins"</div><div class='add'>+	select DMA_NONCOHERENT</div><div class='add'>+	select HW_HAS_PCI</div><div class='add'>+	select IRQ_CPU</div><div class='add'>+	select SWAP_IO_SPACE</div><div class='add'>+	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='add'>+	select SYS_HAS_CPU_R5000</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the R5432-based NEC Mark-eins</div><div class='add'>+	  boards with R5500 CPU.</div><div class='add'>+</div><div class='ctx'> config SGI_IP22</div><div class='ctx'> 	bool "SGI IP22 (Indy/Indigo2)"</div><div class='ctx'> 	select ARC</div><div class='hunk'>@@ -555,6 +589,7 @@ config SGI_IP22</div><div class='ctx'> 	select HW_HAS_EISA</div><div class='ctx'> 	select IP22_CPU_SCACHE</div><div class='ctx'> 	select IRQ_CPU</div><div class='add'>+	select NO_ISA if ISA</div><div class='ctx'> 	select SWAP_IO_SPACE</div><div class='ctx'> 	select SYS_HAS_CPU_R4X00</div><div class='ctx'> 	select SYS_HAS_CPU_R5000</div><div class='hunk'>@@ -572,11 +607,13 @@ config SGI_IP27</div><div class='ctx'> 	select ARC64</div><div class='ctx'> 	select BOOT_ELF64</div><div class='ctx'> 	select DMA_IP27</div><div class='add'>+	select EARLY_PRINTK</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select PCI_DOMAINS</div><div class='ctx'> 	select SYS_HAS_CPU_R10000</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='add'>+	select SYS_SUPPORTS_NUMA</div><div class='ctx'> 	help</div><div class='ctx'> 	  This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics</div><div class='ctx'> 	  workstations.  To compile a Linux kernel that runs on these, say Y</div><div class='hunk'>@@ -707,8 +744,8 @@ config SIBYTE_CRHONE</div><div class='ctx'> </div><div class='ctx'> config SNI_RM200_PCI</div><div class='ctx'> 	bool "SNI RM200 PCI"</div><div class='del'>-	select ARC</div><div class='del'>-	select ARC32</div><div class='add'>+	select ARC if CPU_LITTLE_ENDIAN</div><div class='add'>+	select ARC32 if CPU_LITTLE_ENDIAN</div><div class='ctx'> 	select ARCH_MAY_HAVE_PC_FDC</div><div class='ctx'> 	select BOOT_ELF32</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='hunk'>@@ -719,10 +756,13 @@ config SNI_RM200_PCI</div><div class='ctx'> 	select I8253</div><div class='ctx'> 	select I8259</div><div class='ctx'> 	select ISA</div><div class='add'>+	select SWAP_IO_SPACE if CPU_BIG_ENDIAN</div><div class='ctx'> 	select SYS_HAS_CPU_R4X00</div><div class='add'>+	select SYS_HAS_CPU_R5000</div><div class='add'>+	select R5000_CPU_SCACHE</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL</div><div class='del'>-	select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL</div><div class='add'>+	select SYS_SUPPORTS_BIG_ENDIAN</div><div class='ctx'> 	select SYS_SUPPORTS_HIGHMEM</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	help</div><div class='hunk'>@@ -979,6 +1019,11 @@ config SOC_PNX8550</div><div class='ctx'> config SWAP_IO_SPACE</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config EMMA2RH</div><div class='add'>+	bool</div><div class='add'>+	depends on MARKEINS</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # Unfortunately not all GT64120 systems run the chip at the same clock.</div><div class='ctx'> # As the user for the clock rate and try to minimize the available options.</div><div class='hunk'>@@ -1211,7 +1256,7 @@ config CPU_R6000</div><div class='ctx'> 	select CPU_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	help</div><div class='ctx'> 	  MIPS Technologies R6000 and R6000A series processors.  Note these</div><div class='del'>-	  processors are extremly rare and the support for them is incomplete.</div><div class='add'>+	  processors are extremely rare and the support for them is incomplete.</div><div class='ctx'> </div><div class='ctx'> config CPU_NEVADA</div><div class='ctx'> 	bool "RM52xx"</div><div class='hunk'>@@ -1332,7 +1377,7 @@ config SYS_HAS_CPU_SB1</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# These two indicate any levelof the MIPS32 and MIPS64 architecture</div><div class='add'>+# These two indicate any level of the MIPS32 and MIPS64 architecture</div><div class='ctx'> #</div><div class='ctx'> config CPU_MIPS32</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -1343,7 +1388,7 @@ config CPU_MIPS64</div><div class='ctx'> 	default y if CPU_MIPS64_R1 || CPU_MIPS64_R2</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# These two indicate the revision of the architecture, either 32 bot 64 bit.</div><div class='add'>+# These two indicate the revision of the architecture, either Release 1 or Release 2</div><div class='ctx'> #</div><div class='ctx'> config CPU_MIPSR1</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -1436,6 +1481,13 @@ config IP22_CPU_SCACHE</div><div class='ctx'> 	bool</div><div class='ctx'> 	select BOARD_SCACHE</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Support for a MIPS32 / MIPS64 style S-caches</div><div class='add'>+#</div><div class='add'>+config MIPS_CPU_SCACHE</div><div class='add'>+	bool</div><div class='add'>+	select BOARD_SCACHE</div><div class='add'>+</div><div class='ctx'> config R5000_CPU_SCACHE</div><div class='ctx'> 	bool</div><div class='ctx'> 	select BOARD_SCACHE</div><div class='hunk'>@@ -1455,32 +1507,57 @@ config SIBYTE_DMA_PAGEOPS</div><div class='ctx'> config CPU_HAS_PREFETCH</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config MIPS_MT</div><div class='del'>-	bool "Enable MIPS MT"</div><div class='del'>-</div><div class='ctx'> choice</div><div class='ctx'> 	prompt "MIPS MT options"</div><div class='del'>-	depends on MIPS_MT</div><div class='add'>+</div><div class='add'>+config MIPS_MT_DISABLED</div><div class='add'>+	bool "Disable multithreading support."</div><div class='add'>+	help</div><div class='add'>+	  Use this option if your workload can't take advantage of</div><div class='add'>+	  MIPS hardware multithreading support.  On systems that don't have</div><div class='add'>+	  the option of an MT-enabled processor this option will be the only</div><div class='add'>+	  option in this menu.</div><div class='ctx'> </div><div class='ctx'> config MIPS_MT_SMTC</div><div class='ctx'> 	bool "SMTC: Use all TCs on all VPEs for SMP"</div><div class='add'>+	depends on CPU_MIPS32_R2</div><div class='add'>+	#depends on CPU_MIPS64_R2		# once there is hardware ...</div><div class='add'>+	depends on SYS_SUPPORTS_MULTITHREADING</div><div class='ctx'> 	select CPU_MIPSR2_IRQ_VI</div><div class='ctx'> 	select CPU_MIPSR2_SRS</div><div class='add'>+	select MIPS_MT</div><div class='ctx'> 	select SMP</div><div class='add'>+	help</div><div class='add'>+	  This is a kernel model which is known a SMTC or lately has been</div><div class='add'>+	  marketesed into SMVP.</div><div class='ctx'> </div><div class='ctx'> config MIPS_MT_SMP</div><div class='ctx'> 	bool "Use 1 TC on each available VPE for SMP"</div><div class='add'>+	depends on SYS_SUPPORTS_MULTITHREADING</div><div class='add'>+	select CPU_MIPSR2_IRQ_VI</div><div class='add'>+	select CPU_MIPSR2_SRS</div><div class='add'>+	select MIPS_MT</div><div class='ctx'> 	select SMP</div><div class='add'>+	help</div><div class='add'>+	  This is a kernel model which is also known a VSMP or lately</div><div class='add'>+	  has been marketesed into SMVP.</div><div class='ctx'> </div><div class='ctx'> config MIPS_VPE_LOADER</div><div class='ctx'> 	bool "VPE loader support."</div><div class='del'>-	depends on MIPS_MT</div><div class='add'>+	depends on SYS_SUPPORTS_MULTITHREADING</div><div class='add'>+	select MIPS_MT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Includes a loader for loading an elf relocatable object</div><div class='ctx'> 	  onto another VPE and running it.</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+config MIPS_MT</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_MULTITHREADING</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config MIPS_MT_FPAFF</div><div class='ctx'> 	bool "Dynamic FPU affinity for FP-intensive threads"</div><div class='ctx'> 	depends on MIPS_MT</div><div class='hunk'>@@ -1537,32 +1614,23 @@ config CPU_HAS_LLSC</div><div class='ctx'> config CPU_HAS_WB</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Vectored interrupt mode is an R2 feature</div><div class='add'>+#</div><div class='ctx'> config CPU_MIPSR2_IRQ_VI</div><div class='del'>-	bool "Vectored interrupt mode"</div><div class='del'>-	depends on CPU_MIPSR2</div><div class='del'>-	help</div><div class='del'>-	   Vectored interrupt mode allowing faster dispatching of interrupts.</div><div class='del'>-	   The board support code needs to be written to take advantage of this</div><div class='del'>-	   mode.  Compatibility code is included to allow the kernel to run on</div><div class='del'>-	   a CPU that does not support vectored interrupts.  It's safe to</div><div class='del'>-	   say Y here.</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Extended interrupt mode is an R2 feature</div><div class='add'>+#</div><div class='ctx'> config CPU_MIPSR2_IRQ_EI</div><div class='del'>-	bool "External interrupt controller mode"</div><div class='del'>-	depends on CPU_MIPSR2</div><div class='del'>-	help</div><div class='del'>-	   Extended interrupt mode takes advantage of an external interrupt</div><div class='del'>-	   controller to allow fast dispatching from many possible interrupt</div><div class='del'>-	   sources. Say N unless you know that external interrupt support is</div><div class='del'>-	   required.</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Shadow registers are an R2 feature</div><div class='add'>+#</div><div class='ctx'> config CPU_MIPSR2_SRS</div><div class='del'>-	bool "Make shadow set registers available for interrupt handlers"</div><div class='del'>-	depends on CPU_MIPSR2_IRQ_VI || CPU_MIPSR2_IRQ_EI</div><div class='del'>-	help</div><div class='del'>-	   Allow the kernel to use shadow register sets for fast interrupts.</div><div class='del'>-	   Interrupt handlers must be specially written to use shadow sets.</div><div class='del'>-	   Say N unless you know that shadow register set upport is needed.</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config CPU_HAS_SYNC</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -1580,6 +1648,11 @@ config GENERIC_IRQ_PROBE</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config IRQ_PER_CPU</div><div class='add'>+	depends on SMP</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # - Highmem only makes sense for the 32-bit kernel.</div><div class='ctx'> # - The current highmem code will only work properly on physically indexed</div><div class='hunk'>@@ -1607,6 +1680,35 @@ config ARCH_FLATMEM_ENABLE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on !NUMA</div><div class='ctx'> </div><div class='add'>+config ARCH_DISCONTIGMEM_ENABLE</div><div class='add'>+	bool</div><div class='add'>+	default y if SGI_IP27</div><div class='add'>+	help</div><div class='add'>+	  Say Y to upport efficient handling of discontiguous physical memory,</div><div class='add'>+	  for architectures which are either NUMA (Non-Uniform Memory Access)</div><div class='add'>+	  or have huge holes in the physical address space for other reasons.</div><div class='add'>+	  See &lt;file:Documentation/vm/numa&gt; for more.</div><div class='add'>+</div><div class='add'>+config ARCH_SPARSEMEM_ENABLE</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config ARCH_SPARSEMEM_ENABLE</div><div class='add'>+	bool</div><div class='add'>+	select SPARSEMEM_STATIC</div><div class='add'>+</div><div class='add'>+config NUMA</div><div class='add'>+	bool "NUMA Support"</div><div class='add'>+	depends on SYS_SUPPORTS_NUMA</div><div class='add'>+	help</div><div class='add'>+	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory</div><div class='add'>+	  Access).  This option improves performance on systems with more</div><div class='add'>+	  than two nodes; on two node systems it is generally better to</div><div class='add'>+	  leave it disabled; on single node systems disable this option</div><div class='add'>+	  disabled.</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_NUMA</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config NODES_SHIFT</div><div class='ctx'> 	int</div><div class='ctx'> 	default "6"</div><div class='hunk'>@@ -1616,8 +1718,8 @@ source "mm/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config SMP</div><div class='ctx'> 	bool "Multi-Processing support"</div><div class='del'>-	depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) &amp;&amp; !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC</div><div class='del'>-	---help---</div><div class='add'>+	depends on SYS_SUPPORTS_SMP</div><div class='add'>+	help</div><div class='ctx'> 	  This enables support for systems with more than one CPU. If you have</div><div class='ctx'> 	  a system with only one CPU, like most personal computers, say N. If</div><div class='ctx'> 	  you have a system with more than one CPU, say Y.</div><div class='hunk'>@@ -1636,6 +1738,9 @@ config SMP</div><div class='ctx'> </div><div class='ctx'> 	  If you don't know what to do here, say N.</div><div class='ctx'> </div><div class='add'>+config SYS_SUPPORTS_SMP</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config NR_CPUS</div><div class='ctx'> 	int "Maximum number of CPUs (2-64)"</div><div class='ctx'> 	range 2 64</div><div class='hunk'>@@ -1651,6 +1756,77 @@ config NR_CPUS</div><div class='ctx'> 	  This is purely to save memory - each supported CPU adds</div><div class='ctx'> 	  approximately eight kilobytes to the kernel image.</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Timer Interrupt Frequency Configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+choice</div><div class='add'>+	prompt "Timer frequency"</div><div class='add'>+	default HZ_250</div><div class='add'>+	help</div><div class='add'>+	 Allows the configuration of the timer frequency.</div><div class='add'>+</div><div class='add'>+	config HZ_48</div><div class='add'>+		bool "48 HZ" if SYS_SUPPORTS_48HZ</div><div class='add'>+</div><div class='add'>+	config HZ_100</div><div class='add'>+		bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+</div><div class='add'>+	config HZ_128</div><div class='add'>+		bool "128 HZ" if SYS_SUPPORTS_128HZ || SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+</div><div class='add'>+	config HZ_250</div><div class='add'>+		bool "250 HZ" if SYS_SUPPORTS_250HZ || SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+</div><div class='add'>+	config HZ_256</div><div class='add'>+		bool "256 HZ" if SYS_SUPPORTS_256HZ || SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+</div><div class='add'>+	config HZ_1000</div><div class='add'>+		bool "1000 HZ" if SYS_SUPPORTS_1000HZ || SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+</div><div class='add'>+	config HZ_1024</div><div class='add'>+		bool "1024 HZ" if SYS_SUPPORTS_1024HZ || SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_48HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_100HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_128HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_250HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_256HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_1000HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_1024HZ</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SYS_SUPPORTS_ARBIT_HZ</div><div class='add'>+	bool</div><div class='add'>+	default y if !SYS_SUPPORTS_48HZ &amp;&amp; !SYS_SUPPORTS_100HZ &amp;&amp; \</div><div class='add'>+		     !SYS_SUPPORTS_128HZ &amp;&amp; !SYS_SUPPORTS_250HZ &amp;&amp; \</div><div class='add'>+		     !SYS_SUPPORTS_256HZ &amp;&amp; !SYS_SUPPORTS_1000HZ &amp;&amp; \</div><div class='add'>+		     !SYS_SUPPORTS_1024HZ</div><div class='add'>+</div><div class='add'>+config HZ</div><div class='add'>+	int</div><div class='add'>+	default 48 if HZ_48</div><div class='add'>+	default 100 if HZ_100</div><div class='add'>+	default 128 if HZ_128</div><div class='add'>+	default 250 if HZ_250</div><div class='add'>+	default 256 if HZ_256</div><div class='add'>+	default 1000 if HZ_1000</div><div class='add'>+	default 1024 if HZ_1024</div><div class='add'>+</div><div class='ctx'> source "kernel/Kconfig.preempt"</div><div class='ctx'> </div><div class='ctx'> config RTC_DS1742</div><div class='hunk'>@@ -1710,6 +1886,9 @@ source "drivers/pci/Kconfig"</div><div class='ctx'> config ISA</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='add'>+config NO_ISA</div><div class='add'>+	bool</div><div class='add'>+</div><div class='ctx'> config EISA</div><div class='ctx'> 	bool "EISA support"</div><div class='ctx'> 	depends on HW_HAS_EISA</div><div class='hunk'>@@ -1840,6 +2019,32 @@ config PM</div><div class='ctx'> 	bool "Power Management support (EXPERIMENTAL)"</div><div class='ctx'> 	depends on EXPERIMENTAL &amp;&amp; SOC_AU1X00</div><div class='ctx'> </div><div class='add'>+config APM</div><div class='add'>+        tristate "Advanced Power Management Emulation"</div><div class='add'>+	depends on PM</div><div class='add'>+        ---help---</div><div class='add'>+	  APM is a BIOS specification for saving power using several different</div><div class='add'>+	  techniques. This is mostly useful for battery powered systems with</div><div class='add'>+	  APM compliant BIOSes. If you say Y here, the system time will be</div><div class='add'>+	  reset after a RESUME operation, the /proc/apm device will provide</div><div class='add'>+	  battery status information, and user-space programs will receive</div><div class='add'>+	  notification of APM "events" (e.g. battery status change).</div><div class='add'>+</div><div class='add'>+	  In order to use APM, you will need supporting software. For location</div><div class='add'>+	  and more information, read &lt;file:Documentation/pm.txt&gt; and the</div><div class='add'>+	  Battery Powered Linux mini-HOWTO, available from</div><div class='add'>+	  &lt;http://www.tldp.org/docs.html#howto&gt;.</div><div class='add'>+</div><div class='add'>+	  This driver does not spin down disk drives (see the hdparm(8)</div><div class='add'>+	  manpage ("man 8 hdparm") for that), and it doesn't turn off</div><div class='add'>+	  VESA-compliant "green" monitors.</div><div class='add'>+</div><div class='add'>+	  Generally, if you don't have a battery in your machine, there isn't</div><div class='add'>+	  much point in using this driver and you should say N. If you get</div><div class='add'>+	  random kernel OOPSes or reboots that don't seem to be related to</div><div class='add'>+	  anything, try disabling/enabling this option (or disabling/enabling</div><div class='add'>+	  APM in your BIOS).</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> source "net/Kconfig"</div><div class='head'>diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug<br/>index 515f9e611307..5d6afb52d904 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/Kconfig.debug</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='ctx'> menu "Kernel hacking"</div><div class='ctx'> </div><div class='add'>+config TRACE_IRQFLAGS_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='ctx'> config CROSSCOMPILE</div><div class='head'>diff --git a/arch/mips/Makefile b/arch/mips/Makefile<br/>index 133900aca992..d333ce4ba26b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/Makefile</a></div><div class='hunk'>@@ -83,6 +83,8 @@ cflags-y			+= -msoft-float</div><div class='ctx'> LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib</div><div class='ctx'> MODFLAGS			+= -mlong-calls</div><div class='ctx'> </div><div class='add'>+cflags-y += -ffreestanding</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # We explicitly add the endianness specifier if needed, this allows</div><div class='ctx'> # to compile kernels with a toolchain for the other endianness. We</div><div class='hunk'>@@ -285,6 +287,13 @@ cflags-$(CONFIG_MIPS_EV96100)	+= -Iinclude/asm-mips/mach-ev96100</div><div class='ctx'> load-$(CONFIG_MIPS_EV96100)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Wind River PPMC Board (4KC + GT64120)</div><div class='add'>+#</div><div class='add'>+core-$(CONFIG_WR_PPMC)		+= arch/mips/gt64120/wrppmc/</div><div class='add'>+cflags-$(CONFIG_WR_PPMC)		+= -Iinclude/asm-mips/mach-wrppmc</div><div class='add'>+load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Globespan IVR eval board with QED 5231 CPU</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_ITE_BOARD_GEN)	+= arch/mips/ite-boards/generic/</div><div class='hunk'>@@ -365,6 +374,7 @@ core-$(CONFIG_PMC_YOSEMITE)	+= arch/mips/pmc-sierra/yosemite/</div><div class='ctx'> cflags-$(CONFIG_PMC_YOSEMITE)	+= -Iinclude/asm-mips/mach-yosemite</div><div class='ctx'> load-$(CONFIG_PMC_YOSEMITE)	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='add'>+#</div><div class='ctx'> # Qemu simulating MIPS32 4Kc</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_QEMU)		+= arch/mips/qemu/</div><div class='hunk'>@@ -379,6 +389,13 @@ cflags-$(CONFIG_MOMENCO_OCELOT_3)	+= -Iinclude/asm-mips/mach-ocelot3</div><div class='ctx'> load-$(CONFIG_MOMENCO_OCELOT_3) 	+= 0xffffffff80100000</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Basler eXcite</div><div class='add'>+#</div><div class='add'>+core-$(CONFIG_BASLER_EXCITE)	+= arch/mips/basler/excite/</div><div class='add'>+cflags-$(CONFIG_BASLER_EXCITE)	+= -Iinclude/asm-mips/mach-excite</div><div class='add'>+load-$(CONFIG_BASLER_EXCITE)	+= 0x80100000</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Momentum Jaguar ATX</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_MOMENCO_JAGUAR_ATX)	+= arch/mips/momentum/jaguar_atx/</div><div class='hunk'>@@ -395,18 +412,6 @@ load-$(CONFIG_MOMENCO_JAGUAR_ATX)	+= 0xffffffff80100000</div><div class='ctx'> core-$(CONFIG_DDB5XXX_COMMON)	+= arch/mips/ddb5xxx/common/</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# NEC DDB Vrc-5074</div><div class='del'>-#</div><div class='del'>-core-$(CONFIG_DDB5074)		+= arch/mips/ddb5xxx/ddb5074/</div><div class='del'>-load-$(CONFIG_DDB5074)		+= 0xffffffff80080000</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# NEC DDB Vrc-5476</div><div class='del'>-#</div><div class='del'>-core-$(CONFIG_DDB5476)		+= arch/mips/ddb5xxx/ddb5476/</div><div class='del'>-load-$(CONFIG_DDB5476)		+= 0xffffffff80080000</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # NEC DDB Vrc-5477</div><div class='ctx'> #</div><div class='ctx'> core-$(CONFIG_DDB5477)		+= arch/mips/ddb5xxx/ddb5477/</div><div class='hunk'>@@ -468,6 +473,15 @@ libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/philips/pnx8550/jbs/</div><div class='ctx'> #cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550</div><div class='ctx'> load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000</div><div class='ctx'> </div><div class='add'>+# NEC EMMA2RH boards</div><div class='add'>+#</div><div class='add'>+core-$(CONFIG_EMMA2RH)          += arch/mips/emma2rh/common/</div><div class='add'>+cflags-$(CONFIG_EMMA2RH)        += -Iinclude/asm-mips/mach-emma2rh</div><div class='add'>+</div><div class='add'>+# NEC EMMA2RH Mark-eins</div><div class='add'>+core-$(CONFIG_MARKEINS)         += arch/mips/emma2rh/markeins/</div><div class='add'>+load-$(CONFIG_MARKEINS)         += 0xffffffff88100000</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # SGI IP22 (Indy/Indigo2)</div><div class='ctx'> #</div><div class='hunk'>@@ -698,16 +712,14 @@ endif</div><div class='ctx'> vmlinux.bin: $(vmlinux-32)</div><div class='ctx'> 	+@$(call makeboot,$@)</div><div class='ctx'> </div><div class='del'>-vmlinux.ecoff vmlinux.rm200: $(vmlinux-32)</div><div class='add'>+vmlinux.ecoff: $(vmlinux-32)</div><div class='ctx'> 	+@$(call makeboot,$@)</div><div class='ctx'> </div><div class='ctx'> vmlinux.srec: $(vmlinux-32)</div><div class='ctx'> 	+@$(call makeboot,$@)</div><div class='ctx'> </div><div class='ctx'> CLEAN_FILES += vmlinux.ecoff \</div><div class='del'>-	       vmlinux.srec \</div><div class='del'>-	       vmlinux.rm200.tmp \</div><div class='del'>-	       vmlinux.rm200</div><div class='add'>+	       vmlinux.srec</div><div class='ctx'> </div><div class='ctx'> archclean:</div><div class='ctx'> 	@$(MAKE) $(clean)=arch/mips/boot</div><div class='head'>diff --git a/arch/mips/arc/identify.c b/arch/mips/arc/identify.c<br/>index 1bd6199e174a..3ba7c47f9f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/arc/identify.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/arc/identify.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/arc/identify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/arc/identify.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/au1000/common/au1xxx_irqmap.c<br/>index 0b2c03c52319..7acfe9bf5fc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/au1xxx_irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/au1xxx_irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/au1xxx_irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/au1xxx_irqmap.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -55,7 +54,7 @@</div><div class='ctx'>  * Careful if you change match 2 request!</div><div class='ctx'>  * The interrupt handler is called directly from the low level dispatch code.</div><div class='ctx'>  */</div><div class='del'>-au1xxx_irq_map_t au1xxx_ic0_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_ic0_map[] = {</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SOC_AU1000)</div><div class='ctx'> 	{ AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0},</div><div class='hunk'>@@ -220,5 +219,5 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_ic0_nr_irqs = sizeof(au1xxx_ic0_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_ic0_nr_irqs = ARRAY_SIZE(au1xxx_ic0_map);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c<br/>index 6ee090bd86c9..98244d51c154 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dbdma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/dbdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dbdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/dbdma.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -290,7 +289,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,</div><div class='ctx'> 				/* If kmalloc fails, it is caught below same</div><div class='ctx'> 				 * as a channel not available.</div><div class='ctx'> 				 */</div><div class='del'>-				ctp = kmalloc(sizeof(chan_tab_t), GFP_KERNEL);</div><div class='add'>+				ctp = kmalloc(sizeof(chan_tab_t), GFP_ATOMIC);</div><div class='ctx'> 				chan_tab_ptr[i] = ctp;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -730,6 +729,8 @@ au1xxx_dbdma_get_dest(u32 chanid, void **buf, int *nbytes)</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+EXPORT_SYMBOL_GPL(au1xxx_dbdma_get_dest);</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> au1xxx_dbdma_stop(u32 chanid)</div><div class='ctx'> {</div><div class='hunk'>@@ -821,6 +822,8 @@ au1xxx_get_dma_residue(u32 chanid)</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+EXPORT_SYMBOL_GPL(au1xxx_get_dma_residue);</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> au1xxx_dbdma_chan_free(u32 chanid)</div><div class='ctx'> {</div><div class='hunk'>@@ -889,7 +892,7 @@ static void au1xxx_dbdma_init(void)</div><div class='ctx'> 	#error Unknown Au1x00 SOC</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(irq_nr, dbdma_interrupt, IRQF_DISABLED,</div><div class='ctx'> 			"Au1xxx dbdma", (void *)dbdma_gptr))</div><div class='ctx'> 		printk("Can't get 1550 dbdma irq");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c<br/>index 7bc768e558db..0a50af7f34b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/dbg_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/dbg_io.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c<br/>index 1d82f2277517..fb7c47c1585d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/dma.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c<br/>index 5f5915b83142..ce55297dcb8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/gpio.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;au1000.h&gt;</div><div class='ctx'> #include &lt;au1xxx_gpio.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c<br/>index afe05ec12c27..316722ee8cf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/irq.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -252,7 +251,7 @@ void restore_local_and_enable(int controller, unsigned long mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type rise_edge_irq_type = {</div><div class='add'>+static struct irq_chip rise_edge_irq_type = {</div><div class='ctx'> 	.typename = "Au1000 Rise Edge",</div><div class='ctx'> 	.startup = startup_irq,</div><div class='ctx'> 	.shutdown = shutdown_irq,</div><div class='hunk'>@@ -262,7 +261,7 @@ static struct hw_interrupt_type rise_edge_irq_type = {</div><div class='ctx'> 	.end = end_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type fall_edge_irq_type = {</div><div class='add'>+static struct irq_chip fall_edge_irq_type = {</div><div class='ctx'> 	.typename = "Au1000 Fall Edge",</div><div class='ctx'> 	.startup = startup_irq,</div><div class='ctx'> 	.shutdown = shutdown_irq,</div><div class='hunk'>@@ -272,7 +271,7 @@ static struct hw_interrupt_type fall_edge_irq_type = {</div><div class='ctx'> 	.end = end_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type either_edge_irq_type = {</div><div class='add'>+static struct irq_chip either_edge_irq_type = {</div><div class='ctx'> 	.typename = "Au1000 Rise or Fall Edge",</div><div class='ctx'> 	.startup = startup_irq,</div><div class='ctx'> 	.shutdown = shutdown_irq,</div><div class='hunk'>@@ -282,7 +281,7 @@ static struct hw_interrupt_type either_edge_irq_type = {</div><div class='ctx'> 	.end = end_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type level_irq_type = {</div><div class='add'>+static struct irq_chip level_irq_type = {</div><div class='ctx'> 	.typename = "Au1000 Level",</div><div class='ctx'> 	.startup = startup_irq,</div><div class='ctx'> 	.shutdown = shutdown_irq,</div><div class='hunk'>@@ -310,7 +309,7 @@ void startup_match20_interrupt(irqreturn_t (*handler)(int, void *, struct pt_reg</div><div class='ctx'> 	 * can avoid it.  --cgray</div><div class='ctx'> 	*/</div><div class='ctx'> 	action.dev_id = handler;</div><div class='del'>-	action.flags = SA_INTERRUPT;</div><div class='add'>+	action.flags = IRQF_DISABLED;</div><div class='ctx'> 	cpus_clear(action.mask);</div><div class='ctx'> 	action.name = "Au1xxx TOY";</div><div class='ctx'> 	action.handler = handler;</div><div class='hunk'>@@ -333,31 +332,31 @@ static void setup_local_irq(unsigned int irq_nr, int type, int int_req)</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG2CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG1CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG0SET);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;rise_edge_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;rise_edge_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_FALL_EDGE: /* 0:1:0 */</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG2CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG1SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG0CLR);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;fall_edge_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;fall_edge_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_RISE_AND_FALL_EDGE: /* 0:1:1 */</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG2CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG1SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG0SET);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;either_edge_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;either_edge_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_HIGH_LEVEL: /* 1:0:1 */</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG2SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG1CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG0SET);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;level_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;level_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_LOW_LEVEL: /* 1:1:0 */</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG2SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG1SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG0CLR);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;level_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;level_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_DISABLED: /* 0:0:0 */</div><div class='ctx'> 				au_writel(1&lt;&lt;(irq_nr-32), IC1_CFG0CLR);</div><div class='hunk'>@@ -385,31 +384,31 @@ static void setup_local_irq(unsigned int irq_nr, int type, int int_req)</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG2CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG1CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG0SET);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;rise_edge_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;rise_edge_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_FALL_EDGE: /* 0:1:0 */</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG2CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG1SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG0CLR);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;fall_edge_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;fall_edge_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_RISE_AND_FALL_EDGE: /* 0:1:1 */</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG2CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG1SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG0SET);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;either_edge_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;either_edge_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_HIGH_LEVEL: /* 1:0:1 */</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG2SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG1CLR);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG0SET);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;level_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;level_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_LOW_LEVEL: /* 1:1:0 */</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG2SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG1SET);</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG0CLR);</div><div class='del'>-				irq_desc[irq_nr].handler = &amp;level_irq_type;</div><div class='add'>+				irq_desc[irq_nr].chip = &amp;level_irq_type;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case INTC_INT_DISABLED: /* 0:0:0 */</div><div class='ctx'> 				au_writel(1&lt;&lt;irq_nr, IC0_CFG0CLR);</div><div class='hunk'>@@ -585,13 +584,13 @@ void intc1_req1_irqdispatch(struct pt_regs *regs)</div><div class='ctx'>  * au_sleep function in power.c.....maybe I should just pm_register()</div><div class='ctx'>  * them instead?</div><div class='ctx'>  */</div><div class='del'>-static uint	sleep_intctl_config0[2];</div><div class='del'>-static uint	sleep_intctl_config1[2];</div><div class='del'>-static uint	sleep_intctl_config2[2];</div><div class='del'>-static uint	sleep_intctl_src[2];</div><div class='del'>-static uint	sleep_intctl_assign[2];</div><div class='del'>-static uint	sleep_intctl_wake[2];</div><div class='del'>-static uint	sleep_intctl_mask[2];</div><div class='add'>+static unsigned int	sleep_intctl_config0[2];</div><div class='add'>+static unsigned int	sleep_intctl_config1[2];</div><div class='add'>+static unsigned int	sleep_intctl_config2[2];</div><div class='add'>+static unsigned int	sleep_intctl_src[2];</div><div class='add'>+static unsigned int	sleep_intctl_assign[2];</div><div class='add'>+static unsigned int	sleep_intctl_wake[2];</div><div class='add'>+static unsigned int	sleep_intctl_mask[2];</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> save_au1xxx_intctl(void)</div><div class='head'>diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c<br/>index 4e5a6e1a9a6e..da591f674893 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/pci.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -40,17 +39,17 @@</div><div class='ctx'> </div><div class='ctx'> /* TBD */</div><div class='ctx'> static struct resource pci_io_resource = {</div><div class='del'>-	"pci IO space",</div><div class='del'>-	(u32)PCI_IO_START,</div><div class='del'>-	(u32)PCI_IO_END,</div><div class='del'>-	IORESOURCE_IO</div><div class='add'>+	.start	= PCI_IO_START,</div><div class='add'>+	.end	= PCI_IO_END,</div><div class='add'>+	.name	= "PCI IO space",</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_mem_resource = {</div><div class='del'>-	"pci memory space",</div><div class='del'>-	(u32)PCI_MEM_START,</div><div class='del'>-	(u32)PCI_MEM_END,</div><div class='del'>-	IORESOURCE_MEM</div><div class='add'>+	.start	= PCI_MEM_START,</div><div class='add'>+	.end	= PCI_MEM_END,</div><div class='add'>+	.name	= "PCI memory space",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pci_ops au1x_pci_ops;</div><div class='head'>diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c<br/>index 32702e5fbf67..8fd203d4a339 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/platform.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/platform.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * License version 2.  This program is licensed "as is" without any</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c<br/>index f4926315fb68..7504a6364616 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/power.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/pm_legacy.h&gt;</div><div class='hunk'>@@ -80,17 +79,17 @@ static DEFINE_SPINLOCK(pm_lock);</div><div class='ctx'>  * We only have to save/restore registers that aren't otherwise</div><div class='ctx'>  * done as part of a driver pm_* function.</div><div class='ctx'>  */</div><div class='del'>-static uint	sleep_aux_pll_cntrl;</div><div class='del'>-static uint	sleep_cpu_pll_cntrl;</div><div class='del'>-static uint	sleep_pin_function;</div><div class='del'>-static uint	sleep_uart0_inten;</div><div class='del'>-static uint	sleep_uart0_fifoctl;</div><div class='del'>-static uint	sleep_uart0_linectl;</div><div class='del'>-static uint	sleep_uart0_clkdiv;</div><div class='del'>-static uint	sleep_uart0_enable;</div><div class='del'>-static uint	sleep_usbhost_enable;</div><div class='del'>-static uint	sleep_usbdev_enable;</div><div class='del'>-static uint	sleep_static_memctlr[4][3];</div><div class='add'>+static unsigned int	sleep_aux_pll_cntrl;</div><div class='add'>+static unsigned int	sleep_cpu_pll_cntrl;</div><div class='add'>+static unsigned int	sleep_pin_function;</div><div class='add'>+static unsigned int	sleep_uart0_inten;</div><div class='add'>+static unsigned int	sleep_uart0_fifoctl;</div><div class='add'>+static unsigned int	sleep_uart0_linectl;</div><div class='add'>+static unsigned int	sleep_uart0_clkdiv;</div><div class='add'>+static unsigned int	sleep_uart0_enable;</div><div class='add'>+static unsigned int	sleep_usbhost_enable;</div><div class='add'>+static unsigned int	sleep_usbdev_enable;</div><div class='add'>+static unsigned int	sleep_static_memctlr[4][3];</div><div class='ctx'> </div><div class='ctx'> /* Define this to cause the value you write to /proc/sys/pm/sleep to</div><div class='ctx'>  * set the TOY timer for the amount of time you want to sleep.</div><div class='head'>diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c<br/>index 9c171afd9a53..b4b010a2fe36 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/prom.c</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='ctx'>  * BRIEF MODULE DESCRIPTION</div><div class='del'>- *    PROM library initialisation code, assuming a version of</div><div class='del'>- *    pmon is the boot code.</div><div class='add'>+ *    PROM library initialisation code, supports YAMON and U-Boot.</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2000,2001 MontaVista Software Inc.</div><div class='add'>+ * Copyright 2000, 2001, 2006 MontaVista Software Inc.</div><div class='ctx'>  * Author: MontaVista Software, Inc.</div><div class='ctx'>  *         	ppopov@mvista.com or source@mvista.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -47,12 +46,6 @@</div><div class='ctx'> extern int prom_argc;</div><div class='ctx'> extern char **prom_argv, **prom_envp;</div><div class='ctx'> </div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-    char *name;</div><div class='del'>-/*    char *val; */</div><div class='del'>-}t_env_var;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> char * prom_getcmdline(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -85,21 +78,24 @@ char *prom_getenv(char *envname)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Return a pointer to the given environment variable.</div><div class='del'>-	 * Environment variables are stored in the form of "memsize=64".</div><div class='add'>+	 * YAMON uses "name", "value" pairs, while U-Boot uses "name=value".</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	t_env_var *env = (t_env_var *)prom_envp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	i = strlen(envname);</div><div class='del'>-</div><div class='del'>-	while(env-&gt;name) {</div><div class='del'>-		if(strncmp(envname, env-&gt;name, i) == 0) {</div><div class='del'>-			return(env-&gt;name + strlen(envname) + 1);</div><div class='add'>+	char **env = prom_envp;</div><div class='add'>+	int i = strlen(envname);</div><div class='add'>+	int yamon = (*env &amp;&amp; strchr(*env, '=') == NULL);</div><div class='add'>+</div><div class='add'>+	while (*env) {</div><div class='add'>+		if (yamon) {</div><div class='add'>+			if (strcmp(envname, *env++) == 0)</div><div class='add'>+				return *env;</div><div class='add'>+		} else {</div><div class='add'>+			if (strncmp(envname, *env, i) == 0 &amp;&amp; (*env)[i] == '=')</div><div class='add'>+				return *env + i + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		env++;</div><div class='ctx'> 	}</div><div class='del'>-	return(NULL);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline unsigned char str2hexnum(unsigned char c)</div><div class='head'>diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c<br/>index c93af224c1b3..de5447e83849 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/reset.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c<br/>index 307e98c29ddc..377ae0d8ff00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/setup.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -49,17 +48,12 @@ extern void __init board_setup(void);</div><div class='ctx'> extern void au1000_restart(char *);</div><div class='ctx'> extern void au1000_halt(void);</div><div class='ctx'> extern void au1000_power_off(void);</div><div class='del'>-extern struct resource ioport_resource;</div><div class='del'>-extern struct resource iomem_resource;</div><div class='del'>-extern void (*board_time_init)(void);</div><div class='ctx'> extern void au1x_time_init(void);</div><div class='del'>-extern void (*board_timer_setup)(struct irqaction *irq);</div><div class='ctx'> extern void au1x_timer_setup(struct irqaction *irq);</div><div class='ctx'> extern void au1xxx_time_init(void);</div><div class='del'>-extern void au1xxx_timer_setup(struct irqaction *irq);</div><div class='ctx'> extern void set_cpuspec(void);</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct	cpu_spec *sp;</div><div class='ctx'> 	char *argptr;</div><div class='hunk'>@@ -128,7 +122,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	_machine_halt = au1000_halt;</div><div class='ctx'> 	pm_power_off = au1000_power_off;</div><div class='ctx'> 	board_time_init = au1xxx_time_init;</div><div class='del'>-	board_timer_setup = au1xxx_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	/* IO/MEM resources. */</div><div class='ctx'> 	set_io_port_base(0);</div><div class='head'>diff --git a/arch/mips/au1000/common/sleeper.S b/arch/mips/au1000/common/sleeper.S<br/>index 44dac3b0df3b..683d9da84b66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/sleeper.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/sleeper.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/sleeper.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/sleeper.S</a></div><div class='hunk'>@@ -112,6 +112,11 @@ sdsleep:</div><div class='ctx'> 	mtc0	k0, CP0_PAGEMASK</div><div class='ctx'> 	lw	k0, 0x14(sp)</div><div class='ctx'> 	mtc0	k0, CP0_CONFIG</div><div class='add'>+</div><div class='add'>+	/* We need to catch the ealry Alchemy SOCs with</div><div class='add'>+	 * the write-only Config[OD] bit and set it back to one...</div><div class='add'>+	 */</div><div class='add'>+	jal	au1x00_fixup_config_od</div><div class='ctx'> 	lw	$1, PT_R1(sp)</div><div class='ctx'> 	lw	$2, PT_R2(sp)</div><div class='ctx'> 	lw	$3, PT_R3(sp)</div><div class='head'>diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c<br/>index f74d66a58a21..7fbea1bf7b48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/time.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -50,10 +49,6 @@</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void do_softirq(void);</div><div class='del'>-extern volatile unsigned long wall_jiffies;</div><div class='del'>-unsigned long missed_heart_beats = 0;</div><div class='del'>-</div><div class='ctx'> static unsigned long r4k_offset; /* Amount to increment compare reg each time */</div><div class='ctx'> static unsigned long r4k_cur;    /* What counter should be at next timer irq */</div><div class='ctx'> int	no_au1xxx_32khz;</div><div class='hunk'>@@ -388,10 +383,9 @@ static unsigned long do_fast_pm_gettimeoffset(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void au1xxx_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='del'>-        unsigned int est_freq;</div><div class='del'>-	extern unsigned long (*do_gettimeoffset)(void);</div><div class='add'>+	unsigned int est_freq;</div><div class='ctx'> </div><div class='ctx'> 	printk("calculating r4koff... ");</div><div class='ctx'> 	r4k_offset = cal_r4koff();</div><div class='head'>diff --git a/arch/mips/au1000/common/usbdev.c b/arch/mips/au1000/common/usbdev.c<br/>index 2cab7629702c..63bcb3a95dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/usbdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/common/usbdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/common/usbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/common/usbdev.c</a></div><div class='hunk'>@@ -1465,14 +1465,14 @@ usbdev_init(struct usb_device_descriptor* dev_desc,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* request the USB device transfer complete interrupt */</div><div class='del'>-	if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, IRQF_DISABLED,</div><div class='ctx'> 			"USBdev req", &amp;usbdev)) {</div><div class='ctx'> 		err("Can't get device request intr");</div><div class='ctx'> 		ret = -ENXIO;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* request the USB device suspend interrupt */</div><div class='del'>-	if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, IRQF_DISABLED,</div><div class='ctx'> 			"USBdev sus", &amp;usbdev)) {</div><div class='ctx'> 		err("Can't get device suspend intr");</div><div class='ctx'> 		ret = -ENXIO;</div><div class='hunk'>@@ -1483,7 +1483,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc,</div><div class='ctx'> 	if ((ep0-&gt;indma = request_au1000_dma(ep_dma_id[0].id,</div><div class='ctx'> 					     ep_dma_id[0].str,</div><div class='ctx'> 					     dma_done_ep0_intr,</div><div class='del'>-					     SA_INTERRUPT,</div><div class='add'>+					     IRQF_DISABLED,</div><div class='ctx'> 					     &amp;usbdev)) &lt; 0) {</div><div class='ctx'> 		err("Can't get %s DMA", ep_dma_id[0].str);</div><div class='ctx'> 		ret = -ENXIO;</div><div class='hunk'>@@ -1516,7 +1516,7 @@ usbdev_init(struct usb_device_descriptor* dev_desc,</div><div class='ctx'> 				request_au1000_dma(ep_dma_id[ep-&gt;address].id,</div><div class='ctx'> 						   ep_dma_id[ep-&gt;address].str,</div><div class='ctx'> 						   dma_done_ep_intr,</div><div class='del'>-						   SA_INTERRUPT,</div><div class='add'>+						   IRQF_DISABLED,</div><div class='ctx'> 						   &amp;usbdev);</div><div class='ctx'> 			if (ep-&gt;indma &lt; 0) {</div><div class='ctx'> 				err("Can't get %s DMA",</div><div class='head'>diff --git a/arch/mips/au1000/csb250/Makefile b/arch/mips/au1000/csb250/Makefile<br/>deleted file mode 100644<br/>index c0c4dcdccae8..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/csb250/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2002 Cogent Computer Systems</div><div class='del'>-#     	dan@embeddededge.com</div><div class='del'>-#</div><div class='del'>-# Makefile for the Cogent CSB250 Au1500 board.  Copied from Pb1500.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := init.o board_setup.o irqmap.o</div><div class='head'>diff --git a/arch/mips/au1000/csb250/board_setup.c b/arch/mips/au1000/csb250/board_setup.c<br/>deleted file mode 100644<br/>index 1c55c5f59d75..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/csb250/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,239 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Cogent CSB250 board setup.</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Cogent Computer Systems, Inc.</div><div class='del'>- *	dan@embeddededge.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/cpu.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/keyboard.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/au1000.h&gt;</div><div class='del'>-#include &lt;asm/csb250.h&gt;</div><div class='del'>-</div><div class='del'>-extern int (*board_pci_idsel)(unsigned int devsel, int assert);</div><div class='del'>-int	csb250_pci_idsel(unsigned int devsel, int assert);</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	u32 pin_func, pin_val;</div><div class='del'>-	u32 sys_freqctrl, sys_clksrc;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	// set AUX clock to 12MHz * 8 = 96 MHz</div><div class='del'>-	au_writel(8, SYS_AUXPLL);</div><div class='del'>-	au_writel(0, SYS_PINSTATERD);</div><div class='del'>-	udelay(100);</div><div class='del'>-</div><div class='del'>-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)</div><div class='del'>-</div><div class='del'>-	/* GPIO201 is input for PCMCIA card detect */</div><div class='del'>-	/* GPIO203 is input for PCMCIA interrupt request */</div><div class='del'>-	au_writel(au_readl(GPIO2_DIR) &amp; (u32)(~((1&lt;&lt;1)|(1&lt;&lt;3))), GPIO2_DIR);</div><div class='del'>-</div><div class='del'>-	/* zero and disable FREQ2 */</div><div class='del'>-	sys_freqctrl = au_readl(SYS_FREQCTRL0);</div><div class='del'>-	sys_freqctrl &amp;= ~0xFFF00000;</div><div class='del'>-	au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-</div><div class='del'>-	/* zero and disable USBH/USBD clocks */</div><div class='del'>-	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-	sys_clksrc &amp;= ~0x00007FE0;</div><div class='del'>-	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='del'>-</div><div class='del'>-	sys_freqctrl = au_readl(SYS_FREQCTRL0);</div><div class='del'>-	sys_freqctrl &amp;= ~0xFFF00000;</div><div class='del'>-</div><div class='del'>-	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-	sys_clksrc &amp;= ~0x00007FE0;</div><div class='del'>-</div><div class='del'>-	// FREQ2 = aux/2 = 48 MHz</div><div class='del'>-	sys_freqctrl |= ((0&lt;&lt;22) | (1&lt;&lt;21) | (1&lt;&lt;20));</div><div class='del'>-	au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Route 48MHz FREQ2 into USB Host and/or Device</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_USB_OHCI</div><div class='del'>-	sys_clksrc |= ((4&lt;&lt;12) | (0&lt;&lt;11) | (0&lt;&lt;10));</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_AU1X00_USB_DEVICE</div><div class='del'>-	sys_clksrc |= ((4&lt;&lt;7) | (0&lt;&lt;6) | (0&lt;&lt;5));</div><div class='del'>-#endif</div><div class='del'>-	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	pin_func = au_readl(SYS_PINFUNC) &amp; (u32)(~0x8000);</div><div class='del'>-#ifndef CONFIG_AU1X00_USB_DEVICE</div><div class='del'>-	// 2nd USB port is USB host</div><div class='del'>-	pin_func |= 0x8000;</div><div class='del'>-#endif</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)</div><div class='del'>-</div><div class='del'>-	/* Configure GPIO2....it's used by PCI among other things.</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/* Make everything but GP200 (PCI RST) an input until we get</div><div class='del'>-	 * the pins set correctly.</div><div class='del'>-	 */</div><div class='del'>-	au_writel(0x00000001, GPIO2_DIR);</div><div class='del'>-</div><div class='del'>-	/* Set the pins used for output.</div><div class='del'>-	 * A zero bit will leave PCI reset, LEDs off, power up USB,</div><div class='del'>-	 * IDSEL disabled.</div><div class='del'>-	 */</div><div class='del'>-	pin_val = ((3 &lt;&lt; 30) | (7 &lt;&lt; 19) | (1 &lt;&lt; 17) | (1 &lt;&lt; 16));</div><div class='del'>-	au_writel(pin_val, GPIO2_OUTPUT);</div><div class='del'>-</div><div class='del'>-	/* Set the output direction.</div><div class='del'>-	*/</div><div class='del'>-	pin_val = ((3 &lt;&lt; 14) | (7 &lt;&lt; 3) | (1 &lt;&lt; 1) | (1 &lt;&lt; 0));</div><div class='del'>-	au_writel(pin_val, GPIO2_DIR);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	/* Use FREQ1 for the PCI output clock.  We use the</div><div class='del'>-	 * CPU clock of 384 MHz divided by 12 to get 32 MHz PCI.</div><div class='del'>-	 * If Michael changes the CPU speed, we need to adjust</div><div class='del'>-	 * that here as well :-).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* zero and disable FREQ1</div><div class='del'>-	*/</div><div class='del'>-	sys_freqctrl = au_readl(SYS_FREQCTRL0);</div><div class='del'>-	sys_freqctrl &amp;= ~0x000ffc00;</div><div class='del'>-	au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-</div><div class='del'>-	/* zero and disable PCI clock</div><div class='del'>-	*/</div><div class='del'>-	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-	sys_clksrc &amp;= ~0x000f8000;</div><div class='del'>-	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='del'>-</div><div class='del'>-	/* Get current values (which really should match above).</div><div class='del'>-	*/</div><div class='del'>-	sys_freqctrl = au_readl(SYS_FREQCTRL0);</div><div class='del'>-	sys_freqctrl &amp;= ~0x000ffc00;</div><div class='del'>-</div><div class='del'>-	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='del'>-	sys_clksrc &amp;= ~0x000f8000;</div><div class='del'>-</div><div class='del'>-	/* FREQ1 = cpu/12 = 32 MHz</div><div class='del'>-	*/</div><div class='del'>-	sys_freqctrl |= ((5&lt;&lt;12) | (1&lt;&lt;11) | (0&lt;&lt;10));</div><div class='del'>-	au_writel(sys_freqctrl, SYS_FREQCTRL0);</div><div class='del'>-</div><div class='del'>-	/* Just connect the clock without further dividing.</div><div class='del'>-	*/</div><div class='del'>-	sys_clksrc |= ((3&lt;&lt;17) | (0&lt;&lt;16) | (0&lt;&lt;15));</div><div class='del'>-	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='del'>-</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	/* Now that clocks should be running, take PCI out of reset.</div><div class='del'>-	*/</div><div class='del'>-	pin_val = au_readl(GPIO2_OUTPUT);</div><div class='del'>-	pin_val |= ((1 &lt;&lt; 16) | 1);</div><div class='del'>-	au_writel(pin_val, GPIO2_OUTPUT);</div><div class='del'>-</div><div class='del'>-	// Setup PCI bus controller</div><div class='del'>-	au_writel(0, Au1500_PCI_CMEM);</div><div class='del'>-	au_writel(0x00003fff, Au1500_CFG_BASE);</div><div class='del'>-</div><div class='del'>-	/* We run big endian without any of the software byte swapping,</div><div class='del'>-	 * so configure the PCI bridge to help us out.</div><div class='del'>-	 */</div><div class='del'>-	au_writel(0xf | (2&lt;&lt;6) | (1&lt;&lt;5) | (1&lt;&lt;4), Au1500_PCI_CFG);</div><div class='del'>-</div><div class='del'>-	au_writel(0xf0000000, Au1500_PCI_MWMASK_DEV);</div><div class='del'>-	au_writel(0, Au1500_PCI_MWBASE_REV_CCL);</div><div class='del'>-	au_writel(0x02a00356, Au1500_PCI_STATCMD);</div><div class='del'>-	au_writel(0x00003c04, Au1500_PCI_HDRTYPE);</div><div class='del'>-	au_writel(0x00000008, Au1500_PCI_MBAR);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	board_pci_idsel = csb250_pci_idsel;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Enable sys bus clock divider when IDLE state or no bus activity. */</div><div class='del'>-	au_writel(au_readl(SYS_POWERCTRL) | (0x3 &lt;&lt; 5), SYS_POWERCTRL);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_RTC</div><div class='del'>-	// Enable the RTC if not already enabled</div><div class='del'>-	if (!(au_readl(0xac000028) &amp; 0x20)) {</div><div class='del'>-		printk("enabling clock ...\n");</div><div class='del'>-		au_writel((au_readl(0xac000028) | 0x20), 0xac000028);</div><div class='del'>-	}</div><div class='del'>-	// Put the clock in BCD mode</div><div class='del'>-	if (readl(0xac00002C) &amp; 0x4) { /* reg B */</div><div class='del'>-		au_writel(au_readl(0xac00002c) &amp; ~0x4, 0xac00002c);</div><div class='del'>-		au_sync();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The IDSEL is selected in the GPIO2 register.  We will make device</div><div class='del'>- * 12 appear in slot 0 and device 13 appear in slot 1.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-csb250_pci_idsel(unsigned int devsel, int assert)</div><div class='del'>-{</div><div class='del'>-	int		retval;</div><div class='del'>-	unsigned int	gpio2_pins;</div><div class='del'>-</div><div class='del'>-	retval = 1;</div><div class='del'>-</div><div class='del'>-	/* First, disable both selects, then assert the one requested.</div><div class='del'>-	*/</div><div class='del'>-	au_writel(0xc000c000, GPIO2_OUTPUT);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	if (assert) {</div><div class='del'>-		if (devsel == 12)</div><div class='del'>-			gpio2_pins = 0x40000000;</div><div class='del'>-		else if (devsel == 13)</div><div class='del'>-			gpio2_pins = 0x80000000;</div><div class='del'>-		else {</div><div class='del'>-			gpio2_pins = 0xc000c000;</div><div class='del'>-			retval = 0;</div><div class='del'>-		}</div><div class='del'>-		au_writel(gpio2_pins, GPIO2_OUTPUT);</div><div class='del'>-	}</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/au1000/csb250/init.c b/arch/mips/au1000/csb250/init.c<br/>deleted file mode 100644<br/>index a4898b1bc66a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/csb250/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Cogent CSB250 board setup</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Cogent Computer Systems, Inc.</div><div class='del'>- * 	dan@embeddededge.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-int prom_argc;</div><div class='del'>-char **prom_argv, **prom_envp;</div><div class='del'>-extern void  __init prom_init_cmdline(void);</div><div class='del'>-extern char *prom_getenv(char *envname);</div><div class='del'>-</div><div class='del'>-/* When we get initrd working someday.........</div><div class='del'>-*/</div><div class='del'>-int	my_initrd_start, my_initrd_size;</div><div class='del'>-</div><div class='del'>-/* Start arguments and environment.</div><div class='del'>-*/</div><div class='del'>-static char	*csb_env[2];</div><div class='del'>-static char	*csb_arg[4];</div><div class='del'>-static char	*arg1 = "console=ttyS3,38400";</div><div class='del'>-static char	*arg2 = "root=/dev/nfs rw ip=any";</div><div class='del'>-static char	*env1 = "ethaddr=00:30:23:50:00:00";</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-	return "Cogent CSB250";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)</div><div class='del'>-{</div><div class='del'>-	unsigned char *memsize_str;</div><div class='del'>-	unsigned long memsize;</div><div class='del'>-</div><div class='del'>-	/* We use a0 and a1 to pass initrd start and size.</div><div class='del'>-	*/</div><div class='del'>-	if (((uint) argc &gt; 0) &amp;&amp; ((uint)argv &gt; 0)) {</div><div class='del'>-		my_initrd_start = (uint)argc;</div><div class='del'>-		my_initrd_size = (uint)argv;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* First argv is ignored.</div><div class='del'>-	*/</div><div class='del'>-	prom_argc = 3;</div><div class='del'>-	prom_argv = csb_arg;</div><div class='del'>-	prom_envp = csb_env;</div><div class='del'>-	csb_arg[1] = arg1;</div><div class='del'>-	csb_arg[2] = arg2;</div><div class='del'>-	csb_env[0] = env1;</div><div class='del'>-</div><div class='del'>-	mips_machgroup = MACH_GROUP_ALCHEMY;</div><div class='del'>-	mips_machtype = MACH_CSB250;</div><div class='del'>-</div><div class='del'>-	prom_init_cmdline();</div><div class='del'>-	memsize_str = prom_getenv("memsize");</div><div class='del'>-	if (!memsize_str) {</div><div class='del'>-		memsize = 0x02000000;</div><div class='del'>-	} else {</div><div class='del'>-		memsize = simple_strtol(memsize_str, NULL, 0);</div><div class='del'>-	}</div><div class='del'>-	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/au1000/csb250/irqmap.c b/arch/mips/au1000/csb250/irqmap.c<br/>deleted file mode 100644<br/>index 5cb1166be35c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/csb250/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/csb250/irqmap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Au1xxx irq map table</div><div class='del'>- *</div><div class='del'>- * Copyright 2003 Embedded Edge, LLC</div><div class='del'>- *		dan@embeddededge.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute	 it and/or modify it</div><div class='del'>- *  under  the terms of	 the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the	License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED	  ``AS	IS'' AND   ANY	EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,	  INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO	EVENT  SHALL   THE AUTHOR  BE	 LIABLE FOR ANY	  DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED	  TO, PROCUREMENT OF  SUBSTITUTE GOODS	OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,	OR PROFITS; OR	BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN	 CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='del'>-</div><div class='del'>-	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},</div><div class='del'>-	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },</div><div class='del'>-	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },</div><div class='del'>-	{ AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },</div><div class='del'>-	{ AU1500_GPIO_205, INTC_INT_LOW_LEVEL, 0 },</div><div class='del'>-	{ AU1500_GPIO_207, INTC_INT_LOW_LEVEL, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='head'>diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c<br/>index f00ec3b175d8..7a79293f8527 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/db1x00/board_setup.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c<br/>index 41e0522f3cf1..0a3f025eb023 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/db1x00/init.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/au1000/db1x00/irqmap.c<br/>index f63024a9893a..3e5729145c2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/db1x00/irqmap.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -80,7 +79,7 @@ char irq_tab_alchemy[][5] __initdata = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MIPS_MIRAGE</div><div class='ctx'> #ifdef CONFIG_MIPS_DB1550</div><div class='hunk'>@@ -101,4 +100,4 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/au1000/db1x00/mirage_ts.c b/arch/mips/au1000/db1x00/mirage_ts.c<br/>index c29852c24b4f..0942dcf69518 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/mirage_ts.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/db1x00/mirage_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/db1x00/mirage_ts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/db1x00/mirage_ts.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/hydrogen3/Makefile b/arch/mips/au1000/hydrogen3/Makefile<br/>deleted file mode 100644<br/>index 974f79256bb3..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/hydrogen3/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#</div><div class='del'>-#  Copyright 2000 MontaVista Software Inc.</div><div class='del'>-#  Author: MontaVista Software, Inc.</div><div class='del'>-#     	ppopov@mvista.com or source@mvista.com</div><div class='del'>-#</div><div class='del'>-# Makefile for the Alchemy Semiconductor PB1000 board.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y := init.o board_setup.o irqmap.o</div><div class='head'>diff --git a/arch/mips/au1000/hydrogen3/board_setup.c b/arch/mips/au1000/hydrogen3/board_setup.c<br/>deleted file mode 100644<br/>index 2efae1064647..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/hydrogen3/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/board_setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Alchemy Db1x00 board setup.</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ppopov@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/cpu.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/keyboard.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-void board_reset (void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init board_setup(void)</div><div class='del'>-{</div><div class='del'>-	u32 pin_func;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_AU1X00_USB_DEVICE</div><div class='del'>-	// 2nd USB port is USB device</div><div class='del'>-	pin_func = au_readl(SYS_PINFUNC) &amp; (u32)(~0x8000);</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_IRDA) &amp;&amp; (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))</div><div class='del'>-	/* set IRFIRSEL instead of GPIO15 */</div><div class='del'>-	pin_func = au_readl(SYS_PINFUNC) | (u32)((1&lt;&lt;8));</div><div class='del'>-	au_writel(pin_func, SYS_PINFUNC);</div><div class='del'>-	au_sync();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    printk("AMD Alchemy Hydrogen3 Board\n");</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/au1000/hydrogen3/init.c b/arch/mips/au1000/hydrogen3/init.c<br/>deleted file mode 100644<br/>index 01ab28483959..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/hydrogen3/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/init.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	PB1000 board setup</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- * Author: MontaVista Software, Inc.</div><div class='del'>- *         	ppopov@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-int prom_argc;</div><div class='del'>-char **prom_argv, **prom_envp;</div><div class='del'>-extern void  __init prom_init_cmdline(void);</div><div class='del'>-extern char *prom_getenv(char *envname);</div><div class='del'>-</div><div class='del'>-const char *get_system_type(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-	return "Alchemy Bosporus Gateway Reference";</div><div class='del'>-#else</div><div class='del'>-	return "Alchemy Db1x00";</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)</div><div class='del'>-{</div><div class='del'>-	unsigned char *memsize_str;</div><div class='del'>-	unsigned long memsize;</div><div class='del'>-</div><div class='del'>-	prom_argc = argc;</div><div class='del'>-	prom_argv = argv;</div><div class='del'>-	prom_envp = envp;</div><div class='del'>-</div><div class='del'>-	mips_machgroup = MACH_GROUP_ALCHEMY;</div><div class='del'>-	mips_machtype = MACH_DB1000;	/* set the platform # */</div><div class='del'>-	prom_init_cmdline();</div><div class='del'>-</div><div class='del'>-	memsize_str = prom_getenv("memsize");</div><div class='del'>-	if (!memsize_str) {</div><div class='del'>-		memsize = 0x04000000;</div><div class='del'>-	} else {</div><div class='del'>-		memsize = simple_strtol(memsize_str, NULL, 0);</div><div class='del'>-	}</div><div class='del'>-	add_memory_region(0, memsize, BOOT_MEM_RAM);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/au1000/hydrogen3/irqmap.c b/arch/mips/au1000/hydrogen3/irqmap.c<br/>deleted file mode 100644<br/>index 6eacaa0daa49..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/hydrogen3/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/hydrogen3/irqmap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *	Au1xxx irq map table</div><div class='del'>- *</div><div class='del'>- * Copyright 2003 Embedded Edge, LLC</div><div class='del'>- *		dan@embeddededge.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute	 it and/or modify it</div><div class='del'>- *  under  the terms of	 the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the	License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED	  ``AS	IS'' AND   ANY	EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,	  INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO	EVENT  SHALL   THE AUTHOR  BE	 LIABLE FOR ANY	  DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED	  TO, PROCUREMENT OF  SUBSTITUTE GOODS	OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,	OR PROFITS; OR	BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN	 CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/bootinfo.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/au1000.h&gt;</div><div class='del'>-</div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='del'>-</div><div class='del'>-	/* { AU1500_GPIO_205, INTC_INT_LOW_LEVEL, 0 }, */</div><div class='del'>-	{ AU1000_GPIO_21, INTC_INT_LOW_LEVEL, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c<br/>index 638de7bb43f0..e917e54fc683 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/mtx-1/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/mtx-1/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/mtx-1/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/mtx-1/board_setup.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/au1000/mtx-1/irqmap.c<br/>index f9a0a8b9def2..4693a4eb2b82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/mtx-1/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/mtx-1/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/mtx-1/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/mtx-1/irqmap.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ char irq_tab_alchemy[][5] __initdata = {</div><div class='ctx'>  [7] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 07 - AdapterD-Slot1 (bottom) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'>        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},</div><div class='ctx'>        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'>        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },</div><div class='hunk'>@@ -66,4 +66,4 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='ctx'>        { AU1500_GPIO_205, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c<br/>index 0b4807dc9f44..1cf18e16ab54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1000/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1000/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1000/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1000/board_setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/pb1000/irqmap.c b/arch/mips/au1000/pb1000/irqmap.c<br/>index a3c460e3c23e..156500ba467f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1000/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1000/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1000/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1000/irqmap.c</a></div><div class='hunk'>@@ -47,8 +47,8 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c<br/>index 13c2f6ca7e33..db27b9331ff3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1100/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1100/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1100/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1100/board_setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/pb1100/irqmap.c b/arch/mips/au1000/pb1100/irqmap.c<br/>index 43be7158b9ab..d986916221b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1100/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1100/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1100/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1100/irqmap.c</a></div><div class='hunk'>@@ -47,11 +47,11 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted#</div><div class='ctx'> 	{ AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG#</div><div class='ctx'> 	{ AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ#</div><div class='ctx'> 	{ AU1000_GPIO_13, INTC_INT_LOW_LEVEL, 0 }, // DC_IRQ#</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c<br/>index a45b17538ac9..8b953b9fc25c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1200/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1200/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1200/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1200/board_setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c<br/>index 59e70e5cf325..f66779f0d4cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1200/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1200/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1200/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1200/irqmap.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -55,11 +54,11 @@</div><div class='ctx'> #define PB1200_INT_END DB1200_INT_END</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Support for External interrupts on the PbAu1200 Development platform.</div><div class='hunk'>@@ -149,7 +148,7 @@ static void pb1200_end_irq(unsigned int irq_nr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type external_irq_type =</div><div class='add'>+static struct irq_chip external_irq_type =</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_MIPS_PB1200</div><div class='ctx'> 	"Pb1200 Ext",</div><div class='hunk'>@@ -172,7 +171,7 @@ void _board_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	for (irq_nr = PB1200_INT_BEGIN; irq_nr &lt;= PB1200_INT_END; irq_nr++)</div><div class='ctx'> 	{</div><div class='del'>-		irq_desc[irq_nr].handler = &amp;external_irq_type;</div><div class='add'>+		irq_desc[irq_nr].chip = &amp;external_irq_type;</div><div class='ctx'> 		pb1200_disable_irq(irq_nr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c<br/>index 30bb87282b1f..1a9a293de6ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1500/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1500/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1500/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1500/board_setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/pb1500/irqmap.c b/arch/mips/au1000/pb1500/irqmap.c<br/>index 8cb76c2edb5e..409d1612bb63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1500/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1500/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1500/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1500/irqmap.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ char irq_tab_alchemy[][5] __initdata = {</div><div class='ctx'>  [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},</div><div class='ctx'> 	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> 	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },</div><div class='hunk'>@@ -60,4 +60,4 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1500_GPIO_205, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/au1000/pb1550/irqmap.c b/arch/mips/au1000/pb1550/irqmap.c<br/>index 47c7a1c19f4b..24a9d186cf5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1550/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/pb1550/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/pb1550/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/pb1550/irqmap.c</a></div><div class='hunk'>@@ -52,9 +52,9 @@ char irq_tab_alchemy[][5] __initdata = {</div><div class='ctx'>  [13] =	{ -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> 	{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c<br/>index 1e59433dfd66..ae3d6b19e94d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/xxs1500/board_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/xxs1500/board_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/xxs1500/board_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/xxs1500/board_setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c<br/>index 52f2f7daeb05..3844c6429e27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/au1000/xxs1500/irqmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/au1000/xxs1500/irqmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/au1000/xxs1500/irqmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/au1000/xxs1500/irqmap.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/au1000.h&gt;</div><div class='ctx'> </div><div class='del'>-au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='add'>+au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},</div><div class='ctx'> 	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> 	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },</div><div class='hunk'>@@ -63,4 +63,4 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {</div><div class='ctx'> 	{ AU1000_GPIO_5, INTC_INT_LOW_LEVEL, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);</div><div class='add'>+int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);</div><div class='head'>diff --git a/arch/mips/basler/excite/Makefile b/arch/mips/basler/excite/Makefile<br/>new file mode 100644<br/>index 000000000000..519142c2e4ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for Basler eXcite</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_BASLER_EXCITE)	+= excite_irq.o excite_prom.o excite_setup.o \</div><div class='add'>+				   excite_device.o excite_procfs.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_KGDB)		+= excite_dbg_io.o</div><div class='add'>+obj-m				+= excite_iodev.o</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_dbg_io.c b/arch/mips/basler/excite/excite_dbg_io.c<br/>new file mode 100644<br/>index 000000000000..c04505afa47f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_dbg_io.c</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/linkage.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;asm/gdb-stub.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_8250) &amp;&amp; CONFIG_SERIAL_8250_NR_UARTS &gt; 1</div><div class='add'>+#error Debug port used by serial driver</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define UART_CLK		25000000</div><div class='add'>+#define BASE_BAUD		(UART_CLK / 16)</div><div class='add'>+#define REGISTER_BASE_0		0x0208UL</div><div class='add'>+#define REGISTER_BASE_1		0x0238UL</div><div class='add'>+</div><div class='add'>+#define REGISTER_BASE_DBG	REGISTER_BASE_1</div><div class='add'>+</div><div class='add'>+#define CPRR	0x0004</div><div class='add'>+#define UACFG	0x0200</div><div class='add'>+#define UAINTS	0x0204</div><div class='add'>+#define UARBR	(REGISTER_BASE_DBG + 0x0000)</div><div class='add'>+#define UATHR	(REGISTER_BASE_DBG + 0x0004)</div><div class='add'>+#define UADLL	(REGISTER_BASE_DBG + 0x0008)</div><div class='add'>+#define UAIER	(REGISTER_BASE_DBG + 0x000c)</div><div class='add'>+#define UADLH	(REGISTER_BASE_DBG + 0x0010)</div><div class='add'>+#define UAIIR	(REGISTER_BASE_DBG + 0x0014)</div><div class='add'>+#define UAFCR	(REGISTER_BASE_DBG + 0x0018)</div><div class='add'>+#define UALCR	(REGISTER_BASE_DBG + 0x001c)</div><div class='add'>+#define UAMCR	(REGISTER_BASE_DBG + 0x0020)</div><div class='add'>+#define UALSR	(REGISTER_BASE_DBG + 0x0024)</div><div class='add'>+#define UAMSR	(REGISTER_BASE_DBG + 0x0028)</div><div class='add'>+#define UASCR	(REGISTER_BASE_DBG + 0x002c)</div><div class='add'>+</div><div class='add'>+#define	PARITY_NONE	0</div><div class='add'>+#define	PARITY_ODD	0x08</div><div class='add'>+#define	PARITY_EVEN	0x18</div><div class='add'>+#define	PARITY_MARK	0x28</div><div class='add'>+#define	PARITY_SPACE	0x38</div><div class='add'>+</div><div class='add'>+#define	DATA_5BIT	0x0</div><div class='add'>+#define	DATA_6BIT	0x1</div><div class='add'>+#define	DATA_7BIT	0x2</div><div class='add'>+#define	DATA_8BIT	0x3</div><div class='add'>+</div><div class='add'>+#define	STOP_1BIT	0x0</div><div class='add'>+#define	STOP_2BIT	0x4</div><div class='add'>+</div><div class='add'>+#define BAUD_DBG	57600</div><div class='add'>+#define	PARITY_DBG	PARITY_NONE</div><div class='add'>+#define	DATA_DBG	DATA_8BIT</div><div class='add'>+#define	STOP_DBG	STOP_1BIT</div><div class='add'>+</div><div class='add'>+/* Initialize the serial port for KGDB debugging */</div><div class='add'>+void __init excite_kgdb_init(void)</div><div class='add'>+{</div><div class='add'>+	const u32 divisor = BASE_BAUD / BAUD_DBG;</div><div class='add'>+</div><div class='add'>+	/* Take the UART out of reset */</div><div class='add'>+	titan_writel(0x00ff1cff, CPRR);</div><div class='add'>+	titan_writel(0x00000000, UACFG);</div><div class='add'>+	titan_writel(0x00000002, UACFG);</div><div class='add'>+</div><div class='add'>+	titan_writel(0x0, UALCR);</div><div class='add'>+	titan_writel(0x0, UAIER);</div><div class='add'>+</div><div class='add'>+	/* Disable FIFOs */</div><div class='add'>+	titan_writel(0x00, UAFCR);</div><div class='add'>+</div><div class='add'>+	titan_writel(0x80, UALCR);</div><div class='add'>+	titan_writel(divisor &amp; 0xff, UADLL);</div><div class='add'>+	titan_writel((divisor &amp; 0xff00) &gt;&gt; 8, UADLH);</div><div class='add'>+	titan_writel(0x0, UALCR);</div><div class='add'>+</div><div class='add'>+	titan_writel(DATA_DBG | PARITY_DBG | STOP_DBG, UALCR);</div><div class='add'>+</div><div class='add'>+	/* Enable receiver interrupt */</div><div class='add'>+	titan_readl(UARBR);</div><div class='add'>+	titan_writel(0x1, UAIER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int getDebugChar(void)</div><div class='add'>+{</div><div class='add'>+	while (!(titan_readl(UALSR) &amp; 0x1));</div><div class='add'>+	return titan_readl(UARBR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int putDebugChar(int data)</div><div class='add'>+{</div><div class='add'>+	while (!(titan_readl(UALSR) &amp; 0x20));</div><div class='add'>+	titan_writel(data, UATHR);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* KGDB interrupt handler */</div><div class='add'>+asmlinkage void excite_kgdb_inthdl(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(</div><div class='add'>+		((titan_readl(UAIIR) &amp; 0x7) == 4)</div><div class='add'>+		&amp;&amp; ((titan_readl(UARBR) &amp; 0xff) == 0x3)))</div><div class='add'>+			set_async_breakpoint(&amp;regs-&gt;cp0_epc);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_device.c b/arch/mips/basler/excite/excite_device.c<br/>new file mode 100644<br/>index 000000000000..bbb4ea43da88<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_device.c</a></div><div class='hunk'>@@ -0,0 +1,403 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;asm/types.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+#include &lt;rm9k_eth.h&gt;</div><div class='add'>+#include &lt;rm9k_wdt.h&gt;</div><div class='add'>+#include &lt;rm9k_xicap.h&gt;</div><div class='add'>+#include &lt;excite_nandflash.h&gt;</div><div class='add'>+</div><div class='add'>+#include "excite_iodev.h"</div><div class='add'>+</div><div class='add'>+#define RM9K_GE_UNIT	0</div><div class='add'>+#define XICAP_UNIT	0</div><div class='add'>+#define NAND_UNIT	0</div><div class='add'>+</div><div class='add'>+#define DLL_TIMEOUT	3		/* seconds */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define RINIT(__start__, __end__, __name__, __parent__) {	\</div><div class='add'>+	.name	= __name__ "_0",				\</div><div class='add'>+	.start	= (__start__),					\</div><div class='add'>+	.end	= (__end__),					\</div><div class='add'>+	.flags	= 0,						\</div><div class='add'>+	.parent	= (__parent__)					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RINIT_IRQ(__irq__, __name__) {	\</div><div class='add'>+	.name	= __name__ "_0",	\</div><div class='add'>+	.start	= (__irq__),		\</div><div class='add'>+	.end	= (__irq__),		\</div><div class='add'>+	.flags	= IORESOURCE_IRQ,	\</div><div class='add'>+	.parent	= NULL			\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	slice_xicap,</div><div class='add'>+	slice_eth</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct resource</div><div class='add'>+	excite_ctr_resource = {</div><div class='add'>+		.name		= "GPI counters",</div><div class='add'>+		.start		= 0,</div><div class='add'>+		.end		= 5,</div><div class='add'>+		.flags		= 0,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_gpislice_resource = {</div><div class='add'>+		.name		= "GPI slices",</div><div class='add'>+		.start		= 0,</div><div class='add'>+		.end		= 1,</div><div class='add'>+		.flags		= 0,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_mdio_channel_resource = {</div><div class='add'>+		.name		= "MDIO channels",</div><div class='add'>+		.start		= 0,</div><div class='add'>+		.end		= 1,</div><div class='add'>+		.flags		= 0,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_fifomem_resource = {</div><div class='add'>+		.name		= "FIFO memory",</div><div class='add'>+		.start		= 0,</div><div class='add'>+		.end		= 767,</div><div class='add'>+		.flags		= 0,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_scram_resource = {</div><div class='add'>+		.name		= "Scratch RAM",</div><div class='add'>+		.start		= EXCITE_PHYS_SCRAM,</div><div class='add'>+		.end		= EXCITE_PHYS_SCRAM + EXCITE_SIZE_SCRAM - 1,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_fpga_resource = {</div><div class='add'>+		.name		= "System FPGA",</div><div class='add'>+		.start		= EXCITE_PHYS_FPGA,</div><div class='add'>+		.end		= EXCITE_PHYS_FPGA + EXCITE_SIZE_FPGA - 1,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_nand_resource = {</div><div class='add'>+		.name		= "NAND flash control",</div><div class='add'>+		.start		= EXCITE_PHYS_NAND,</div><div class='add'>+		.end		= EXCITE_PHYS_NAND + EXCITE_SIZE_NAND - 1,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	},</div><div class='add'>+	excite_titan_resource = {</div><div class='add'>+		.name		= "TITAN registers",</div><div class='add'>+		.start		= EXCITE_PHYS_TITAN,</div><div class='add'>+		.end		= EXCITE_PHYS_TITAN + EXCITE_SIZE_TITAN - 1,</div><div class='add'>+		.flags		= IORESOURCE_MEM,</div><div class='add'>+		.parent		= NULL,</div><div class='add'>+		.sibling	= NULL,</div><div class='add'>+		.child		= NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void adjust_resources(struct resource *res, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	struct resource *p;</div><div class='add'>+	const unsigned long mask = IORESOURCE_IO | IORESOURCE_MEM</div><div class='add'>+				   | IORESOURCE_IRQ | IORESOURCE_DMA;</div><div class='add'>+</div><div class='add'>+	for (p = res; p &lt; res + n; p++) {</div><div class='add'>+		const struct resource * const parent = p-&gt;parent;</div><div class='add'>+		if (parent) {</div><div class='add'>+			p-&gt;start += parent-&gt;start;</div><div class='add'>+			p-&gt;end   += parent-&gt;start;</div><div class='add'>+			p-&gt;flags =  parent-&gt;flags &amp; mask;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_EXCITE_FCAP_GPI) || defined(CONFIG_EXCITE_FCAP_GPI_MODULE)</div><div class='add'>+static struct resource xicap_rsrc[] = {</div><div class='add'>+	RINIT(0x4840, 0x486f, XICAP_RESOURCE_FIFO_RX, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x4940, 0x494b, XICAP_RESOURCE_FIFO_TX, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x5040, 0x5127, XICAP_RESOURCE_XDMA, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x1000, 0x112f, XICAP_RESOURCE_PKTPROC, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x1100, 0x110f, XICAP_RESOURCE_PKT_STREAM, &amp;excite_fpga_resource),</div><div class='add'>+	RINIT(0x0800, 0x0bff, XICAP_RESOURCE_DMADESC, &amp;excite_scram_resource),</div><div class='add'>+	RINIT(slice_xicap, slice_xicap, XICAP_RESOURCE_GPI_SLICE, &amp;excite_gpislice_resource),</div><div class='add'>+	RINIT(0x0100, 0x02ff, XICAP_RESOURCE_FIFO_BLK, &amp;excite_fifomem_resource),</div><div class='add'>+	RINIT_IRQ(TITAN_IRQ,  XICAP_RESOURCE_IRQ)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device xicap_pdev = {</div><div class='add'>+	.name		= XICAP_NAME,</div><div class='add'>+	.id		= XICAP_UNIT,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(xicap_rsrc),</div><div class='add'>+	.resource	= xicap_rsrc</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a platform device for the GPI port that receives the</div><div class='add'>+ * image data from the embedded camera.</div><div class='add'>+ */</div><div class='add'>+static int __init xicap_devinit(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long tend;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	adjust_resources(xicap_rsrc, ARRAY_SIZE(xicap_rsrc));</div><div class='add'>+</div><div class='add'>+	/* Power up the slice and configure it. */</div><div class='add'>+	reg = titan_readl(CPTC1R);</div><div class='add'>+	reg &amp;= ~(0x11100 &lt;&lt; slice_xicap);</div><div class='add'>+	titan_writel(reg, CPTC1R);</div><div class='add'>+</div><div class='add'>+	/* Enable slice &amp; DLL. */</div><div class='add'>+	reg= titan_readl(CPRR);</div><div class='add'>+	reg &amp;= ~(0x00030003 &lt;&lt; (slice_xicap * 2));</div><div class='add'>+	titan_writel(reg, CPRR);</div><div class='add'>+</div><div class='add'>+	/* Wait for DLLs to lock */</div><div class='add'>+	tend = jiffies + DLL_TIMEOUT * HZ;</div><div class='add'>+	while (time_before(jiffies, tend)) {</div><div class='add'>+		if (!(~titan_readl(CPDSR) &amp; (0x1 &lt;&lt; (slice_xicap * 4))))</div><div class='add'>+			break;</div><div class='add'>+		yield();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (~titan_readl(CPDSR) &amp; (0x1 &lt;&lt; (slice_xicap * 4))) {</div><div class='add'>+		printk(KERN_ERR "%s: DLL not locked after %u seconds\n",</div><div class='add'>+		       xicap_pdev.name, DLL_TIMEOUT);</div><div class='add'>+		retval = -ETIME;</div><div class='add'>+	} else {</div><div class='add'>+		/* Register platform device */</div><div class='add'>+		retval = platform_device_register(&amp;xicap_pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(xicap_devinit);</div><div class='add'>+#endif /* defined(CONFIG_EXCITE_FCAP_GPI) || defined(CONFIG_EXCITE_FCAP_GPI_MODULE) */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_WDT_RM9K_GPI) || defined(CONFIG_WDT_RM9K_GPI_MODULE)</div><div class='add'>+static struct resource wdt_rsrc[] = {</div><div class='add'>+	RINIT(0, 0, WDT_RESOURCE_COUNTER, &amp;excite_ctr_resource),</div><div class='add'>+	RINIT(0x0084, 0x008f, WDT_RESOURCE_REGS, &amp;excite_titan_resource),</div><div class='add'>+	RINIT_IRQ(TITAN_IRQ,  WDT_RESOURCE_IRQ)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device wdt_pdev = {</div><div class='add'>+	.name		= WDT_NAME,</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(wdt_rsrc),</div><div class='add'>+	.resource	= wdt_rsrc</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a platform device for the GPI port that receives the</div><div class='add'>+ * image data from the embedded camera.</div><div class='add'>+ */</div><div class='add'>+static int __init wdt_devinit(void)</div><div class='add'>+{</div><div class='add'>+	adjust_resources(wdt_rsrc, ARRAY_SIZE(wdt_rsrc));</div><div class='add'>+	return platform_device_register(&amp;wdt_pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(wdt_devinit);</div><div class='add'>+#endif /* defined(CONFIG_WDT_RM9K_GPI) || defined(CONFIG_WDT_RM9K_GPI_MODULE) */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct resource excite_nandflash_rsrc[] = {</div><div class='add'>+ 	RINIT(0x2000, 0x201f, EXCITE_NANDFLASH_RESOURCE_REGS,  &amp;excite_nand_resource)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device excite_nandflash_pdev = {</div><div class='add'>+	.name		= "excite_nand",</div><div class='add'>+	.id		= NAND_UNIT,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(excite_nandflash_rsrc),</div><div class='add'>+	.resource	= excite_nandflash_rsrc</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a platform device for the access to the nand-flash</div><div class='add'>+ * port</div><div class='add'>+ */</div><div class='add'>+static int __init excite_nandflash_devinit(void)</div><div class='add'>+{</div><div class='add'>+	adjust_resources(excite_nandflash_rsrc, ARRAY_SIZE(excite_nandflash_rsrc));</div><div class='add'>+</div><div class='add'>+        /* nothing to be done here */</div><div class='add'>+</div><div class='add'>+        /* Register platform device */</div><div class='add'>+	return platform_device_register(&amp;excite_nandflash_pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(excite_nandflash_devinit);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct resource iodev_rsrc[] = {</div><div class='add'>+	RINIT_IRQ(FPGA1_IRQ,  IODEV_RESOURCE_IRQ)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device io_pdev = {</div><div class='add'>+	.name		= IODEV_NAME,</div><div class='add'>+	.id		= -1,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(iodev_rsrc),</div><div class='add'>+	.resource	= iodev_rsrc</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a platform device for the external I/O ports.</div><div class='add'>+ */</div><div class='add'>+static int __init io_devinit(void)</div><div class='add'>+{</div><div class='add'>+	adjust_resources(iodev_rsrc, ARRAY_SIZE(iodev_rsrc));</div><div class='add'>+	return platform_device_register(&amp;io_pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(io_devinit);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_RM9K_GE) || defined(CONFIG_RM9K_GE_MODULE)</div><div class='add'>+static struct resource rm9k_ge_rsrc[] = {</div><div class='add'>+	RINIT(0x2200, 0x27ff, RM9K_GE_RESOURCE_MAC, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x1800, 0x1fff, RM9K_GE_RESOURCE_MSTAT, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x2000, 0x212f, RM9K_GE_RESOURCE_PKTPROC, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x5140, 0x5227, RM9K_GE_RESOURCE_XDMA, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x4870, 0x489f, RM9K_GE_RESOURCE_FIFO_RX, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x494c, 0x4957, RM9K_GE_RESOURCE_FIFO_TX, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x0000, 0x007f, RM9K_GE_RESOURCE_FIFOMEM_RX, &amp;excite_fifomem_resource),</div><div class='add'>+	RINIT(0x0080, 0x00ff, RM9K_GE_RESOURCE_FIFOMEM_TX, &amp;excite_fifomem_resource),</div><div class='add'>+	RINIT(0x0180, 0x019f, RM9K_GE_RESOURCE_PHY, &amp;excite_titan_resource),</div><div class='add'>+	RINIT(0x0000, 0x03ff, RM9K_GE_RESOURCE_DMADESC_RX, &amp;excite_scram_resource),</div><div class='add'>+	RINIT(0x0400, 0x07ff, RM9K_GE_RESOURCE_DMADESC_TX, &amp;excite_scram_resource),</div><div class='add'>+	RINIT(slice_eth, slice_eth, RM9K_GE_RESOURCE_GPI_SLICE, &amp;excite_gpislice_resource),</div><div class='add'>+	RINIT(0, 0, RM9K_GE_RESOURCE_MDIO_CHANNEL, &amp;excite_mdio_channel_resource),</div><div class='add'>+	RINIT_IRQ(TITAN_IRQ,  RM9K_GE_RESOURCE_IRQ_MAIN),</div><div class='add'>+	RINIT_IRQ(PHY_IRQ, RM9K_GE_RESOURCE_IRQ_PHY)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device rm9k_ge_pdev = {</div><div class='add'>+	.name		= RM9K_GE_NAME,</div><div class='add'>+	.id		= RM9K_GE_UNIT,</div><div class='add'>+	.num_resources	= ARRAY_SIZE(rm9k_ge_rsrc),</div><div class='add'>+	.resource	= rm9k_ge_rsrc</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create a platform device for the Ethernet port.</div><div class='add'>+ */</div><div class='add'>+static int __init rm9k_ge_devinit(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	adjust_resources(rm9k_ge_rsrc, ARRAY_SIZE(rm9k_ge_rsrc));</div><div class='add'>+</div><div class='add'>+	/* Power up the slice and configure it. */</div><div class='add'>+	reg = titan_readl(CPTC1R);</div><div class='add'>+	reg &amp;= ~(0x11000 &lt;&lt; slice_eth);</div><div class='add'>+	reg |= 0x100 &lt;&lt; slice_eth;</div><div class='add'>+	titan_writel(reg, CPTC1R);</div><div class='add'>+</div><div class='add'>+	/* Take the MAC out of reset, reset the DLLs. */</div><div class='add'>+	reg = titan_readl(CPRR);</div><div class='add'>+	reg &amp;= ~(0x00030000 &lt;&lt; (slice_eth * 2));</div><div class='add'>+	reg |= 0x3 &lt;&lt; (slice_eth * 2);</div><div class='add'>+	titan_writel(reg, CPRR);</div><div class='add'>+</div><div class='add'>+	return platform_device_register(&amp;rm9k_ge_pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(rm9k_ge_devinit);</div><div class='add'>+#endif /* defined(CONFIG_RM9K_GE) || defined(CONFIG_RM9K_GE_MODULE) */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init excite_setup_devs(void)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* Enable xdma and fifo interrupts */</div><div class='add'>+	reg = titan_readl(0x0050);</div><div class='add'>+	titan_writel(reg | 0x18000000, 0x0050);</div><div class='add'>+</div><div class='add'>+	res = request_resource(&amp;iomem_resource, &amp;excite_titan_resource);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = request_resource(&amp;iomem_resource, &amp;excite_scram_resource);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = request_resource(&amp;iomem_resource, &amp;excite_fpga_resource);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = request_resource(&amp;iomem_resource, &amp;excite_nand_resource);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	excite_fpga_resource.flags = excite_fpga_resource.parent-&gt;flags &amp;</div><div class='add'>+				   ( IORESOURCE_IO | IORESOURCE_MEM</div><div class='add'>+				   | IORESOURCE_IRQ | IORESOURCE_DMA);</div><div class='add'>+	excite_nand_resource.flags = excite_nand_resource.parent-&gt;flags &amp;</div><div class='add'>+				   ( IORESOURCE_IO | IORESOURCE_MEM</div><div class='add'>+				   | IORESOURCE_IRQ | IORESOURCE_DMA);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(excite_setup_devs);</div><div class='add'>+</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_flashtest.c b/arch/mips/basler/excite/excite_flashtest.c<br/>new file mode 100644<br/>index 000000000000..f0024a8e3294<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_flashtest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_flashtest.c</a></div><div class='hunk'>@@ -0,0 +1,294 @@</div><div class='add'>+/*</div><div class='add'>+*  Copyright (C) 2005 by Basler Vision Technologies AG</div><div class='add'>+*  Author: Thies Moeller &lt;thies.moeller@baslerweb.com&gt;</div><div class='add'>+*</div><div class='add'>+*  This program is free software; you can redistribute it and/or modify</div><div class='add'>+*  it under the terms of the GNU General Public License as published by</div><div class='add'>+*  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+*  (at your option) any later version.</div><div class='add'>+*</div><div class='add'>+*  This program is distributed in the hope that it will be useful,</div><div class='add'>+*  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+*  GNU General Public License for more details.</div><div class='add'>+*</div><div class='add'>+*  You should have received a copy of the GNU General Public License</div><div class='add'>+*  along with this program; if not, write to the Free Software</div><div class='add'>+*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt; // for ocd_write</div><div class='add'>+#include &lt;linux/workqueue.h&gt; // for queue</div><div class='add'>+</div><div class='add'>+#include "excite_nandflash.h"</div><div class='add'>+#include "nandflash.h"</div><div class='add'>+</div><div class='add'>+#define PFX "excite flashtest: "</div><div class='add'>+typedef void __iomem *io_reg_t;</div><div class='add'>+</div><div class='add'>+#define io_readb(__a__)		__raw_readb((__a__))</div><div class='add'>+#define io_writeb(__v__, __a__)	__raw_writeb((__v__), (__a__))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline const struct resource *excite_nandflash_get_resource(</div><div class='add'>+	struct platform_device *d, unsigned long flags, const char *basename)</div><div class='add'>+{</div><div class='add'>+	const char fmt[] = "%s_%u";</div><div class='add'>+	char buf[80];</div><div class='add'>+</div><div class='add'>+	if (unlikely(snprintf(buf, sizeof buf, fmt, basename, d-&gt;id) &gt;= sizeof buf))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return platform_get_resource_byname(d, flags, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline io_reg_t</div><div class='add'>+excite_nandflash_map_regs(struct platform_device *d, const char *basename)</div><div class='add'>+{</div><div class='add'>+	void *result = NULL;</div><div class='add'>+	const struct resource *const r =</div><div class='add'>+	    excite_nandflash_get_resource(d, IORESOURCE_MEM, basename);</div><div class='add'>+	if (r)</div><div class='add'>+	   result = ioremap_nocache(r-&gt;start, r-&gt;end + 1 - r-&gt;start);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* controller and mtd information */</div><div class='add'>+</div><div class='add'>+struct excite_nandflash_drvdata {</div><div class='add'>+	struct mtd_info board_mtd;</div><div class='add'>+	struct nand_chip board_chip;</div><div class='add'>+	io_reg_t regs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* command and control functions */</div><div class='add'>+static void excite_nandflash_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	io_reg_t regs = container_of(mtd,struct excite_nandflash_drvdata,board_mtd)-&gt;regs;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	/* Select the command latch */</div><div class='add'>+	case NAND_CTL_SETCLE: this-&gt;IO_ADDR_W = regs + EXCITE_NANDFLASH_CMD;</div><div class='add'>+		break;</div><div class='add'>+	/* Deselect the command latch */</div><div class='add'>+	case NAND_CTL_CLRCLE: this-&gt;IO_ADDR_W = regs + EXCITE_NANDFLASH_DATA;</div><div class='add'>+		break;</div><div class='add'>+	/* Select the address latch */</div><div class='add'>+	case NAND_CTL_SETALE: this-&gt;IO_ADDR_W = regs + EXCITE_NANDFLASH_ADDR;</div><div class='add'>+		break;</div><div class='add'>+	/* Deselect the address latch */</div><div class='add'>+	case NAND_CTL_CLRALE: this-&gt;IO_ADDR_W = regs  + EXCITE_NANDFLASH_DATA;</div><div class='add'>+		break;</div><div class='add'>+	/* Select the chip  -- not used */</div><div class='add'>+	case NAND_CTL_SETNCE:</div><div class='add'>+		break;</div><div class='add'>+	/* Deselect the chip -- not used */</div><div class='add'>+	case NAND_CTL_CLRNCE:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	this-&gt;IO_ADDR_R = this-&gt;IO_ADDR_W;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* excite_nandflash_devready()</div><div class='add'>+ *</div><div class='add'>+ * returns 0 if the nand is busy, 1 if it is ready</div><div class='add'>+ */</div><div class='add'>+static int excite_nandflash_devready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct excite_nandflash_drvdata *drvdata =</div><div class='add'>+	    container_of(mtd, struct excite_nandflash_drvdata, board_mtd);</div><div class='add'>+</div><div class='add'>+	return io_readb(drvdata-&gt;regs + EXCITE_NANDFLASH_STATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* device management functions */</div><div class='add'>+</div><div class='add'>+/* excite_nandflash_remove</div><div class='add'>+ *</div><div class='add'>+ * called by device layer to remove the driver</div><div class='add'>+ * the binding to the mtd and all allocated</div><div class='add'>+ * resources are released</div><div class='add'>+ */</div><div class='add'>+static int excite_nandflash_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct excite_nandflash_drvdata *this = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	pr_info(PFX "remove");</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, NULL);</div><div class='add'>+</div><div class='add'>+	if (this == NULL) {</div><div class='add'>+		pr_debug(PFX "call remove without private data!!");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* free the common resources */</div><div class='add'>+	if (this-&gt;regs != NULL) {</div><div class='add'>+		iounmap(this-&gt;regs);</div><div class='add'>+		this-&gt;regs = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(this);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int elapsed;</div><div class='add'>+</div><div class='add'>+void my_workqueue_handler(void *arg)</div><div class='add'>+{</div><div class='add'>+	elapsed = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_WORK(sigElapsed, my_workqueue_handler, 0);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* excite_nandflash_probe</div><div class='add'>+ *</div><div class='add'>+ * called by device layer when it finds a device matching</div><div class='add'>+ * one our driver can handled. This code checks to see if</div><div class='add'>+ * it can allocate all necessary resources then calls the</div><div class='add'>+ * nand layer to look for devices</div><div class='add'>+*/</div><div class='add'>+static int excite_nandflash_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+</div><div class='add'>+	struct excite_nandflash_drvdata *drvdata;	    /* private driver data     */</div><div class='add'>+	struct nand_chip              *board_chip;  /* private flash chip data */</div><div class='add'>+	struct mtd_info               *board_mtd;   /* mtd info for this board */</div><div class='add'>+</div><div class='add'>+	int err      = 0;</div><div class='add'>+	int count    = 0;</div><div class='add'>+	struct timeval tv,endtv;</div><div class='add'>+	unsigned int dt;</div><div class='add'>+</div><div class='add'>+	pr_info(PFX "probe dev: (%p)\n", dev);</div><div class='add'>+</div><div class='add'>+	pr_info(PFX "adjust LB timing\n");</div><div class='add'>+	ocd_writel(0x00000330, LDP2);</div><div class='add'>+</div><div class='add'>+	drvdata = kmalloc(sizeof(*drvdata), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!drvdata)) {</div><div class='add'>+		printk(KERN_ERR PFX "no memory for drvdata\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto mem_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize structures */</div><div class='add'>+	memset(drvdata, 0, sizeof(*drvdata));</div><div class='add'>+</div><div class='add'>+	/* bind private data into driver */</div><div class='add'>+	dev_set_drvdata(dev, drvdata);</div><div class='add'>+</div><div class='add'>+	/* allocate and map the resource */</div><div class='add'>+	drvdata-&gt;regs =</div><div class='add'>+	    excite_nandflash_map_regs(pdev, EXCITE_NANDFLASH_RESOURCE_REGS);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!drvdata-&gt;regs)) {</div><div class='add'>+		printk(KERN_ERR PFX "cannot reserve register region\n");</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto io_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialise our chip */</div><div class='add'>+	board_chip = &amp;drvdata-&gt;board_chip;</div><div class='add'>+</div><div class='add'>+	board_chip-&gt;IO_ADDR_R = drvdata-&gt;regs + EXCITE_NANDFLASH_DATA;</div><div class='add'>+	board_chip-&gt;IO_ADDR_W = drvdata-&gt;regs + EXCITE_NANDFLASH_DATA;</div><div class='add'>+</div><div class='add'>+	board_chip-&gt;hwcontrol = excite_nandflash_hwcontrol;</div><div class='add'>+	board_chip-&gt;dev_ready = excite_nandflash_devready;</div><div class='add'>+</div><div class='add'>+	board_chip-&gt;chip_delay = 25;</div><div class='add'>+	#if 0</div><div class='add'>+	/* TODO: speedup the initial scan */</div><div class='add'>+	board_chip-&gt;options = NAND_USE_FLASH_BBT;</div><div class='add'>+	#endif</div><div class='add'>+	board_chip-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+</div><div class='add'>+	/* link chip to mtd */</div><div class='add'>+	board_mtd = &amp;drvdata-&gt;board_mtd;</div><div class='add'>+	board_mtd-&gt;priv = board_chip;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	pr_info(PFX "FlashTest\n");</div><div class='add'>+	elapsed = 0;</div><div class='add'>+/*	schedule_delayed_work(&amp;sigElapsed, 1*HZ);</div><div class='add'>+	while (!elapsed) {</div><div class='add'>+		io_readb(drvdata-&gt;regs + EXCITE_NANDFLASH_STATUS);</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+	pr_info(PFX "reads in 1 sec --&gt; %d\n",count);</div><div class='add'>+*/</div><div class='add'>+	do_gettimeofday(&amp;tv);</div><div class='add'>+	for (count = 0 ; count &lt; 1000000; count ++) {</div><div class='add'>+		io_readb(drvdata-&gt;regs + EXCITE_NANDFLASH_STATUS);</div><div class='add'>+	}</div><div class='add'>+	do_gettimeofday(&amp;endtv);</div><div class='add'>+	dt = (endtv.tv_sec - tv.tv_sec) * 1000000 + endtv.tv_usec  - tv.tv_usec;</div><div class='add'>+	pr_info(PFX "%8d us timeval\n",dt);</div><div class='add'>+	pr_info(PFX "EndFlashTest\n");</div><div class='add'>+</div><div class='add'>+/*      return with error to unload everything</div><div class='add'>+*/</div><div class='add'>+io_error:</div><div class='add'>+	iounmap(drvdata-&gt;regs);</div><div class='add'>+</div><div class='add'>+mem_error:</div><div class='add'>+	kfree(drvdata);</div><div class='add'>+</div><div class='add'>+	if (err == 0)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_driver excite_nandflash_driver = {</div><div class='add'>+	.name = "excite_nand",</div><div class='add'>+	.bus = &amp;platform_bus_type,</div><div class='add'>+	.probe = excite_nandflash_probe,</div><div class='add'>+	.remove = excite_nandflash_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init excite_nandflash_init(void)</div><div class='add'>+{</div><div class='add'>+	pr_info(PFX "register Driver (Rev: $Revision:$)\n");</div><div class='add'>+	return driver_register(&amp;excite_nandflash_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit excite_nandflash_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;excite_nandflash_driver);</div><div class='add'>+	pr_info(PFX "Driver unregistered");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(excite_nandflash_init);</div><div class='add'>+module_exit(excite_nandflash_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Thies Moeller &lt;thies.moeller@baslerweb.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Basler eXcite NAND-Flash driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_fpga.h b/arch/mips/basler/excite/excite_fpga.h<br/>new file mode 100644<br/>index 000000000000..38fcda703a0b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_fpga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_fpga.h</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+#ifndef EXCITE_FPGA_H_INCLUDED</div><div class='add'>+#define EXCITE_FPGA_H_INCLUDED</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Adress alignment of the individual FPGA bytes.</div><div class='add'>+ * The address arrangement of the individual bytes of the FPGA is two</div><div class='add'>+ * byte aligned at the embedded MK2 platform.</div><div class='add'>+ */</div><div class='add'>+#ifdef EXCITE_CCI_FPGA_MK2</div><div class='add'>+typedef unsigned char excite_cci_fpga_align_t __attribute__ ((aligned(2)));</div><div class='add'>+#else</div><div class='add'>+typedef unsigned char excite_cci_fpga_align_t;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Size of Dual Ported RAM.</div><div class='add'>+ */</div><div class='add'>+#define EXCITE_DPR_SIZE 263</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Size of Reserved Status Fields in Dual Ported RAM.</div><div class='add'>+ */</div><div class='add'>+#define EXCITE_DPR_STATUS_SIZE 7</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * FPGA.</div><div class='add'>+ * Hardware register layout of the FPGA interface. The FPGA must accessed</div><div class='add'>+ * byte wise solely.</div><div class='add'>+ * @see EXCITE_CCI_DPR_MK2</div><div class='add'>+ */</div><div class='add'>+typedef struct excite_fpga {</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Dual Ported RAM.</div><div class='add'>+	 */</div><div class='add'>+	excite_cci_fpga_align_t dpr[EXCITE_DPR_SIZE];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Status.</div><div class='add'>+	 */</div><div class='add'>+	excite_cci_fpga_align_t status[EXCITE_DPR_STATUS_SIZE];</div><div class='add'>+</div><div class='add'>+#ifdef EXCITE_CCI_FPGA_MK2</div><div class='add'>+	/**</div><div class='add'>+	 * RM9000 Interrupt.</div><div class='add'>+	 * Write access initiates interrupt at the RM9000 (MIPS) processor of the eXcite.</div><div class='add'>+	 */</div><div class='add'>+	excite_cci_fpga_align_t rm9k_int;</div><div class='add'>+#else</div><div class='add'>+	/**</div><div class='add'>+	 * MK2 Interrupt.</div><div class='add'>+	 * Write access initiates interrupt at the ARM processor of the MK2.</div><div class='add'>+	 */</div><div class='add'>+	excite_cci_fpga_align_t mk2_int;</div><div class='add'>+</div><div class='add'>+	excite_cci_fpga_align_t gap[0x1000-0x10f];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * IRQ Source/Acknowledge.</div><div class='add'>+	 */</div><div class='add'>+	excite_cci_fpga_align_t rm9k_irq_src;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * IRQ Mask.</div><div class='add'>+	 * Set bits enable the related interrupt.</div><div class='add'>+	 */</div><div class='add'>+	excite_cci_fpga_align_t rm9k_irq_mask;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+} excite_fpga;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif	/* ndef EXCITE_FPGA_H_INCLUDED */</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_iodev.c b/arch/mips/basler/excite/excite_iodev.c<br/>new file mode 100644<br/>index 000000000000..10bbb8cfb964<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_iodev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_iodev.c</a></div><div class='hunk'>@@ -0,0 +1,182 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2005 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "excite_iodev.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct resource *iodev_get_resource(struct platform_device *, const char *, unsigned int);</div><div class='add'>+static int __init iodev_probe(struct device *);</div><div class='add'>+static int __exit iodev_remove(struct device *);</div><div class='add'>+static int iodev_open(struct inode *, struct file *);</div><div class='add'>+static int iodev_release(struct inode *, struct file *);</div><div class='add'>+static ssize_t iodev_read(struct file *, char __user *, size_t s, loff_t *);</div><div class='add'>+static unsigned int iodev_poll(struct file *, struct poll_table_struct *);</div><div class='add'>+static irqreturn_t iodev_irqhdl(int, void *, struct pt_regs *);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char iodev_name[] = "iodev";</div><div class='add'>+static unsigned int iodev_irq;</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(wq);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct file_operations fops =</div><div class='add'>+{</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= iodev_open,</div><div class='add'>+	.release	= iodev_release,</div><div class='add'>+	.read		= iodev_read,</div><div class='add'>+	.poll		= iodev_poll</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice miscdev =</div><div class='add'>+{</div><div class='add'>+	.minor		= MISC_DYNAMIC_MINOR,</div><div class='add'>+	.name		= iodev_name,</div><div class='add'>+	.fops		= &amp;fops</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device_driver iodev_driver =</div><div class='add'>+{</div><div class='add'>+	.name		= (char *) iodev_name,</div><div class='add'>+	.bus		= &amp;platform_bus_type,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.probe		= iodev_probe,</div><div class='add'>+	.remove		= __exit_p(iodev_remove)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct resource *</div><div class='add'>+iodev_get_resource(struct platform_device *pdv, const char *name,</div><div class='add'>+		     unsigned int type)</div><div class='add'>+{</div><div class='add'>+	char buf[80];</div><div class='add'>+	if (snprintf(buf, sizeof buf, "%s_0", name) &gt;= sizeof buf)</div><div class='add'>+		return NULL;</div><div class='add'>+	return platform_get_resource_byname(pdv, type, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* No hotplugging on the platform bus - use __init */</div><div class='add'>+static int __init iodev_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device * const pdv = to_platform_device(dev);</div><div class='add'>+	const struct resource * const ri =</div><div class='add'>+		iodev_get_resource(pdv, IODEV_RESOURCE_IRQ, IORESOURCE_IRQ);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!ri))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	iodev_irq = ri-&gt;start;</div><div class='add'>+	return misc_register(&amp;miscdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __exit iodev_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return misc_deregister(&amp;miscdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int iodev_open(struct inode *i, struct file *f)</div><div class='add'>+{</div><div class='add'>+	return request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,</div><div class='add'>+			   iodev_name, &amp;miscdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int iodev_release(struct inode *i, struct file *f)</div><div class='add'>+{</div><div class='add'>+	free_irq(iodev_irq, &amp;miscdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+iodev_read(struct file *f, char __user *d, size_t s, loff_t *o)</div><div class='add'>+{</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	DEFINE_WAIT(w);</div><div class='add'>+</div><div class='add'>+	prepare_to_wait(&amp;wq, &amp;w, TASK_INTERRUPTIBLE);</div><div class='add'>+	if (!signal_pending(current))</div><div class='add'>+		schedule();</div><div class='add'>+	ret = signal_pending(current) ? -ERESTARTSYS : 0;</div><div class='add'>+	finish_wait(&amp;wq, &amp;w);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int iodev_poll(struct file *f, struct poll_table_struct *p)</div><div class='add'>+{</div><div class='add'>+	poll_wait(f, &amp;wq, p);</div><div class='add'>+	return POLLOUT | POLLWRNORM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static irqreturn_t iodev_irqhdl(int irq, void *ctxt, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	wake_up(&amp;wq);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init iodev_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;iodev_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __exit iodev_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;iodev_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(iodev_init_module);</div><div class='add'>+module_exit(iodev_cleanup_module);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Basler eXcite i/o interrupt handler");</div><div class='add'>+MODULE_VERSION("0.0");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_iodev.h b/arch/mips/basler/excite/excite_iodev.h<br/>new file mode 100644<br/>index 000000000000..cbfbb5d2ee62<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_iodev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_iodev.h</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+#ifndef __EXCITE_IODEV_H__</div><div class='add'>+#define __EXCITE_IODEV_H__</div><div class='add'>+</div><div class='add'>+/* Device name */</div><div class='add'>+#define IODEV_NAME		"iodev"</div><div class='add'>+</div><div class='add'>+/* Resource names */</div><div class='add'>+#define IODEV_RESOURCE_IRQ	"excite_iodev_irq"</div><div class='add'>+</div><div class='add'>+#endif /* __EXCITE_IODEV_H__ */</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_irq.c b/arch/mips/basler/excite/excite_irq.c<br/>new file mode 100644<br/>index 000000000000..511ad8730f54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_irq.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslereb.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/irq_cpu.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+extern asmlinkage void excite_handle_int(void);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize the interrupt handler</div><div class='add'>+ */</div><div class='add'>+void __init arch_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	mips_cpu_irq_init(0);</div><div class='add'>+	rm7k_cpu_irq_init(8);</div><div class='add'>+	rm9k_cpu_irq_init(12);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_KGDB</div><div class='add'>+	excite_kgdb_init();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	const u32</div><div class='add'>+		interrupts = read_c0_cause() &gt;&gt; 8,</div><div class='add'>+		mask = ((read_c0_status() &gt;&gt; 8) &amp; 0x000000ff) |</div><div class='add'>+		       (read_c0_intcontrol() &amp; 0x0000ff00),</div><div class='add'>+		pending = interrupts &amp; mask;</div><div class='add'>+	u32 msgintflags, msgintmask, msgint;</div><div class='add'>+</div><div class='add'>+	/* process timer interrupt */</div><div class='add'>+	if (pending &amp; (1 &lt;&lt; TIMER_IRQ)) {</div><div class='add'>+		do_IRQ(TIMER_IRQ, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process PCI interrupts */</div><div class='add'>+#if USB_IRQ &lt; 10</div><div class='add'>+	msgintflags = ocd_readl(INTP0Status0 + (USB_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgintmask  = ocd_readl(INTP0Mask0 + (USB_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgint	    = msgintflags &amp; msgintmask &amp; (0x1 &lt;&lt; (USB_MSGINT % 0x20));</div><div class='add'>+	if ((pending &amp; (1 &lt;&lt; USB_IRQ)) &amp;&amp; msgint) {</div><div class='add'>+#else</div><div class='add'>+	if (pending &amp; (1 &lt;&lt; USB_IRQ)) {</div><div class='add'>+#endif</div><div class='add'>+		do_IRQ(USB_IRQ, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process TITAN interrupts */</div><div class='add'>+	msgintflags = ocd_readl(INTP0Status0 + (TITAN_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgintmask  = ocd_readl(INTP0Mask0 + (TITAN_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgint	    = msgintflags &amp; msgintmask &amp; (0x1 &lt;&lt; (TITAN_MSGINT % 0x20));</div><div class='add'>+	if ((pending &amp; (1 &lt;&lt; TITAN_IRQ)) &amp;&amp; msgint) {</div><div class='add'>+		ocd_writel(msgint, INTP0Clear0 + (TITAN_MSGINT / 0x20 * 0x10));</div><div class='add'>+#if defined(CONFIG_KGDB)</div><div class='add'>+		excite_kgdb_inthdl(regs);</div><div class='add'>+#endif</div><div class='add'>+		do_IRQ(TITAN_IRQ, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process FPGA line #0 interrupts */</div><div class='add'>+	msgintflags = ocd_readl(INTP0Status0 + (FPGA0_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgintmask  = ocd_readl(INTP0Mask0 + (FPGA0_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgint	    = msgintflags &amp; msgintmask &amp; (0x1 &lt;&lt; (FPGA0_MSGINT % 0x20));</div><div class='add'>+	if ((pending &amp; (1 &lt;&lt; FPGA0_IRQ)) &amp;&amp; msgint) {</div><div class='add'>+		do_IRQ(FPGA0_IRQ, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process FPGA line #1 interrupts */</div><div class='add'>+	msgintflags = ocd_readl(INTP0Status0 + (FPGA1_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgintmask  = ocd_readl(INTP0Mask0 + (FPGA1_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgint	    = msgintflags &amp; msgintmask &amp; (0x1 &lt;&lt; (FPGA1_MSGINT % 0x20));</div><div class='add'>+	if ((pending &amp; (1 &lt;&lt; FPGA1_IRQ)) &amp;&amp; msgint) {</div><div class='add'>+		do_IRQ(FPGA1_IRQ, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process PHY interrupts */</div><div class='add'>+	msgintflags = ocd_readl(INTP0Status0 + (PHY_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgintmask  = ocd_readl(INTP0Mask0 + (PHY_MSGINT / 0x20 * 0x10));</div><div class='add'>+	msgint	    = msgintflags &amp; msgintmask &amp; (0x1 &lt;&lt; (PHY_MSGINT % 0x20));</div><div class='add'>+	if ((pending &amp; (1 &lt;&lt; PHY_IRQ)) &amp;&amp; msgint) {</div><div class='add'>+		do_IRQ(PHY_IRQ, regs);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Process spurious interrupts */</div><div class='add'>+	spurious_interrupt(regs);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_procfs.c b/arch/mips/basler/excite/excite_procfs.c<br/>new file mode 100644<br/>index 000000000000..9ee67a95f6b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_procfs.c</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004, 2005 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Procfs support for Basler eXcite</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+static int excite_get_unit_id(char *buf, char **addr, off_t offs, int size)</div><div class='add'>+{</div><div class='add'>+	const int len = snprintf(buf, PAGE_SIZE, "%06x", unit_id);</div><div class='add'>+	const int w = len - offs;</div><div class='add'>+	*addr = buf + offs;</div><div class='add'>+	return w &lt; size ? w : size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+excite_bootrom_read(char *page, char **start, off_t off, int count,</div><div class='add'>+		  int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	void __iomem * src;</div><div class='add'>+</div><div class='add'>+	if (off &gt;= EXCITE_SIZE_BOOTROM) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((off + count) &gt; EXCITE_SIZE_BOOTROM)</div><div class='add'>+		count = EXCITE_SIZE_BOOTROM - off;</div><div class='add'>+</div><div class='add'>+	src = ioremap(EXCITE_PHYS_BOOTROM + off, count);</div><div class='add'>+	if (src) {</div><div class='add'>+		memcpy_fromio(page, src, count);</div><div class='add'>+		iounmap(src);</div><div class='add'>+		*start = page;</div><div class='add'>+	} else {</div><div class='add'>+		count = -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void excite_procfs_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Create &amp; populate /proc/excite */</div><div class='add'>+	struct proc_dir_entry * const pdir = proc_mkdir("excite", &amp;proc_root);</div><div class='add'>+	if (pdir) {</div><div class='add'>+		struct proc_dir_entry * e;</div><div class='add'>+</div><div class='add'>+		e = create_proc_info_entry("unit_id", S_IRUGO, pdir,</div><div class='add'>+					   excite_get_unit_id);</div><div class='add'>+		if (e) e-&gt;size = 6;</div><div class='add'>+</div><div class='add'>+		e = create_proc_read_entry("bootrom", S_IRUGO, pdir,</div><div class='add'>+					   excite_bootrom_read, NULL);</div><div class='add'>+		if (e) e-&gt;size = EXCITE_SIZE_BOOTROM;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c<br/>new file mode 100644<br/>index 000000000000..6ecd512b999d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_prom.c</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004, 2005 by Thomas Koeller (thomas.koeller@baslerweb.com)</div><div class='add'>+ *  Based on the PMC-Sierra Yosemite board support by Ralf Baechle and</div><div class='add'>+ *  Manish Lachwani.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+/* This struct is used by Redboot to pass arguments to the kernel */</div><div class='add'>+typedef struct</div><div class='add'>+{</div><div class='add'>+	char *name;</div><div class='add'>+	char *val;</div><div class='add'>+} t_env_var;</div><div class='add'>+</div><div class='add'>+struct parmblock {</div><div class='add'>+	t_env_var memsize;</div><div class='add'>+	t_env_var modetty0;</div><div class='add'>+	t_env_var ethaddr;</div><div class='add'>+	t_env_var env_end;</div><div class='add'>+	char *argv[2];</div><div class='add'>+	char text[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int prom_argc;</div><div class='add'>+static const char ** prom_argv;</div><div class='add'>+static const t_env_var * prom_env;</div><div class='add'>+</div><div class='add'>+static void prom_halt(void) __attribute__((noreturn));</div><div class='add'>+static void prom_exit(void) __attribute__((noreturn));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "Basler eXcite";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Halt the system</div><div class='add'>+ */</div><div class='add'>+static void prom_halt(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_NOTICE "\n** System halted.\n");</div><div class='add'>+	while (1)</div><div class='add'>+		asm volatile (</div><div class='add'>+			"\t.set\tmips3\n"</div><div class='add'>+			"\twait\n"</div><div class='add'>+			"\t.set\tmips0\n"</div><div class='add'>+		);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the CPU and re-enter Redboot</div><div class='add'>+ */</div><div class='add'>+static void prom_exit(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	volatile unsigned char * const flg =</div><div class='add'>+		(volatile unsigned char *) (EXCITE_ADDR_FPGA + EXCITE_FPGA_DPR);</div><div class='add'>+</div><div class='add'>+	/* Clear the watchdog reset flag, set the reboot flag */</div><div class='add'>+	*flg &amp;= ~0x01;</div><div class='add'>+	*flg |= 0x80;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		*(volatile unsigned char *)  (EXCITE_ADDR_FPGA + EXCITE_FPGA_SYSCTL) = 0x02;</div><div class='add'>+		iob();</div><div class='add'>+		mdelay(1000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_NOTICE "Reset failed\n");</div><div class='add'>+	prom_halt();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char __init *prom_getenv(char *name)</div><div class='add'>+{</div><div class='add'>+	const t_env_var * p;</div><div class='add'>+	for (p = prom_env; p-&gt;name != NULL; p++)</div><div class='add'>+		if(strcmp(name, p-&gt;name) == 0)</div><div class='add'>+			break;</div><div class='add'>+	return p-&gt;val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Init routine which accepts the variables from Redboot</div><div class='add'>+ */</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	const struct parmblock * const pb = (struct parmblock *) fw_arg2;</div><div class='add'>+</div><div class='add'>+	prom_argc = fw_arg0;</div><div class='add'>+	prom_argv = (const char **) fw_arg1;</div><div class='add'>+	prom_env = &amp;pb-&gt;memsize;</div><div class='add'>+</div><div class='add'>+	/* Callbacks for halt, restart */</div><div class='add'>+	_machine_restart = (void (*)(char *)) prom_exit;</div><div class='add'>+	_machine_halt = prom_halt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_32BIT</div><div class='add'>+	/* copy command line */</div><div class='add'>+	strcpy(arcs_cmdline, prom_argv[1]);</div><div class='add'>+	memsize = simple_strtol(prom_getenv("memsize"), NULL, 16);</div><div class='add'>+	strcpy(modetty, prom_getenv("modetty0"));</div><div class='add'>+#endif /* CONFIG_32BIT */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+#	error 64 bit support not implemented</div><div class='add'>+#endif /* CONFIG_64BIT */</div><div class='add'>+</div><div class='add'>+	mips_machgroup = MACH_GROUP_TITAN;</div><div class='add'>+	mips_machtype = MACH_TITAN_EXCITE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is called from free_initmem(), so we need to provide it */</div><div class='add'>+void __init prom_free_prom_memory(void)</div><div class='add'>+{</div><div class='add'>+	/* Nothing to do */</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c<br/>new file mode 100644<br/>index 000000000000..a1ce4580058d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/basler/excite/excite_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/basler/excite/excite_setup.c</a></div><div class='hunk'>@@ -0,0 +1,305 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004, 2005 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *  Based on the PMC-Sierra Yosemite board support by Ralf Baechle and</div><div class='add'>+ *  Manish Lachwani.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/pgtable-32.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+#define TITAN_UART_CLK	25000000</div><div class='add'>+</div><div class='add'>+#if 1</div><div class='add'>+/* normal serial port assignment */</div><div class='add'>+#define REGBASE_SER0	0x0208</div><div class='add'>+#define REGBASE_SER1	0x0238</div><div class='add'>+#define MASK_SER0	0x1</div><div class='add'>+#define MASK_SER1	0x2</div><div class='add'>+#else</div><div class='add'>+/* serial ports swapped */</div><div class='add'>+#define REGBASE_SER0	0x0238</div><div class='add'>+#define REGBASE_SER1	0x0208</div><div class='add'>+#define MASK_SER0	0x2</div><div class='add'>+#define MASK_SER1	0x1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+unsigned long memsize;</div><div class='add'>+char modetty[30];</div><div class='add'>+unsigned int titan_irq = TITAN_IRQ;</div><div class='add'>+static void __iomem * ctl_regs;</div><div class='add'>+u32 unit_id;</div><div class='add'>+</div><div class='add'>+volatile void __iomem * const ocd_base = (void *) (EXCITE_ADDR_OCD);</div><div class='add'>+volatile void __iomem * const titan_base = (void *) (EXCITE_ADDR_TITAN);</div><div class='add'>+</div><div class='add'>+/* Protect access to shared GPI registers */</div><div class='add'>+spinlock_t titan_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+int titan_irqflags;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void excite_timer_init(void)</div><div class='add'>+{</div><div class='add'>+	const u32 modebit5 = ocd_readl(0x00e4);</div><div class='add'>+	unsigned int</div><div class='add'>+		mult = ((modebit5 &gt;&gt; 11) &amp; 0x1f) + 2,</div><div class='add'>+		div = ((modebit5 &gt;&gt; 16) &amp; 0x1f) + 2;</div><div class='add'>+</div><div class='add'>+	if (div == 33) div = 1;</div><div class='add'>+	mips_hpt_frequency = EXCITE_CPU_EXT_CLOCK * mult / div / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='add'>+{</div><div class='add'>+	/* The eXcite platform uses the alternate timer interrupt */</div><div class='add'>+	set_c0_intcontrol(0x80);</div><div class='add'>+	setup_irq(TIMER_IRQ, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init excite_init_console(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_SERIAL_8250)</div><div class='add'>+	static __initdata char serr[] =</div><div class='add'>+		KERN_ERR "Serial port #%u setup failed\n";</div><div class='add'>+	struct uart_port up;</div><div class='add'>+</div><div class='add'>+	/* Take the DUART out of reset */</div><div class='add'>+	titan_writel(0x00ff1cff, CPRR);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_KGDB) || (CONFIG_SERIAL_8250_NR_UARTS &gt; 1)</div><div class='add'>+	/* Enable both ports */</div><div class='add'>+	titan_writel(MASK_SER0 | MASK_SER1, UACFG);</div><div class='add'>+#else</div><div class='add'>+	/* Enable port #0 only */</div><div class='add'>+	titan_writel(MASK_SER0, UACFG);</div><div class='add'>+#endif	/* defined(CONFIG_KGDB) */</div><div class='add'>+</div><div class='add'>+ 	/*</div><div class='add'>+	 * Set up serial port #0. Do not use autodetection; the result is</div><div class='add'>+	 * not what we want.</div><div class='add'>+ 	 */</div><div class='add'>+	memset(&amp;up, 0, sizeof(up));</div><div class='add'>+	up.membase	= (char *) titan_addr(REGBASE_SER0);</div><div class='add'>+	up.irq		= TITAN_IRQ;</div><div class='add'>+	up.uartclk	= TITAN_UART_CLK;</div><div class='add'>+	up.regshift	= 0;</div><div class='add'>+	up.iotype	= UPIO_MEM32;</div><div class='add'>+	up.type		= PORT_RM9000;</div><div class='add'>+	up.flags	= UPF_SHARE_IRQ;</div><div class='add'>+	up.line		= 0;</div><div class='add'>+	if (early_serial_setup(&amp;up))</div><div class='add'>+		printk(serr, up.line);</div><div class='add'>+</div><div class='add'>+#if CONFIG_SERIAL_8250_NR_UARTS &gt; 1</div><div class='add'>+	/* And now for port #1. */</div><div class='add'>+	up.membase	= (char *) titan_addr(REGBASE_SER1);</div><div class='add'>+	up.line		= 1;</div><div class='add'>+ 	if (early_serial_setup(&amp;up))</div><div class='add'>+		printk(serr, up.line);</div><div class='add'>+#endif /* CONFIG_SERIAL_8250_NR_UARTS &gt; 1 */</div><div class='add'>+#else</div><div class='add'>+	/* Leave the DUART in reset */</div><div class='add'>+	titan_writel(0x00ff3cff, CPRR);</div><div class='add'>+#endif  /* defined(CONFIG_SERIAL_8250) */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init excite_platform_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned char buf[3];</div><div class='add'>+	u8 reg;</div><div class='add'>+	void __iomem * dpr;</div><div class='add'>+</div><div class='add'>+	/* BIU buffer allocations */</div><div class='add'>+	ocd_writel(8, CPURSLMT);	/* CPU */</div><div class='add'>+	titan_writel(4, CPGRWL);	/* GPI / Ethernet */</div><div class='add'>+</div><div class='add'>+	/* Map control registers located in FPGA */</div><div class='add'>+	ctl_regs = ioremap_nocache(EXCITE_PHYS_FPGA + EXCITE_FPGA_SYSCTL, 16);</div><div class='add'>+	if (!ctl_regs)</div><div class='add'>+		panic("eXcite: failed to map platform control registers\n");</div><div class='add'>+	memcpy_fromio(buf, ctl_regs + 2, ARRAY_SIZE(buf));</div><div class='add'>+	unit_id = buf[0] | (buf[1] &lt;&lt; 8) | (buf[2] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	/* Clear the reboot flag */</div><div class='add'>+	dpr = ioremap_nocache(EXCITE_PHYS_FPGA + EXCITE_FPGA_DPR, 1);</div><div class='add'>+	reg = __raw_readb(dpr);</div><div class='add'>+	__raw_writeb(reg &amp; 0x7f, dpr);</div><div class='add'>+	iounmap(dpr);</div><div class='add'>+</div><div class='add'>+	/* Interrupt controller setup */</div><div class='add'>+	for (i = INTP0Status0; i &lt; INTP0Status0 + 0x80; i += 0x10) {</div><div class='add'>+		ocd_writel(0x00000000, i + 0x04);</div><div class='add'>+		ocd_writel(0xffffffff, i + 0x0c);</div><div class='add'>+	}</div><div class='add'>+	ocd_writel(0x2, NMICONFIG);</div><div class='add'>+</div><div class='add'>+	ocd_writel(0x1 &lt;&lt; (TITAN_MSGINT % 0x20),</div><div class='add'>+		   INTP0Mask0 + (0x10 * (TITAN_MSGINT / 0x20)));</div><div class='add'>+	ocd_writel((0x1 &lt;&lt; (FPGA0_MSGINT % 0x20))</div><div class='add'>+		   | ocd_readl(INTP0Mask0 + (0x10 * (FPGA0_MSGINT / 0x20))),</div><div class='add'>+		   INTP0Mask0 + (0x10 * (FPGA0_MSGINT / 0x20)));</div><div class='add'>+	ocd_writel((0x1 &lt;&lt; (FPGA1_MSGINT % 0x20))</div><div class='add'>+		   | ocd_readl(INTP0Mask0 + (0x10 * (FPGA1_MSGINT / 0x20))),</div><div class='add'>+		   INTP0Mask0 + (0x10 * (FPGA1_MSGINT / 0x20)));</div><div class='add'>+	ocd_writel((0x1 &lt;&lt; (PHY_MSGINT % 0x20))</div><div class='add'>+		   | ocd_readl(INTP0Mask0 + (0x10 * (PHY_MSGINT / 0x20))),</div><div class='add'>+		   INTP0Mask0 + (0x10 * (PHY_MSGINT / 0x20)));</div><div class='add'>+#if USB_IRQ &lt; 10</div><div class='add'>+	ocd_writel((0x1 &lt;&lt; (USB_MSGINT % 0x20))</div><div class='add'>+		   | ocd_readl(INTP0Mask0 + (0x10 * (USB_MSGINT / 0x20))),</div><div class='add'>+		   INTP0Mask0 + (0x10 * (USB_MSGINT / 0x20)));</div><div class='add'>+#endif</div><div class='add'>+	/* Enable the packet FIFO, XDMA and XDMA arbiter */</div><div class='add'>+	titan_writel(0x00ff18ff, CPRR);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the PADMUX. Power down all ethernet slices,</div><div class='add'>+	 * they will be powered up and configured at device startup.</div><div class='add'>+	 */</div><div class='add'>+	titan_writel(0x00878206, CPTC1R);</div><div class='add'>+	titan_writel(0x00001100, CPTC0R); /* latch PADMUX, enable WCIMODE */</div><div class='add'>+</div><div class='add'>+	/* Reset and enable the FIFO block */</div><div class='add'>+	titan_writel(0x00000001, SDRXFCIE);</div><div class='add'>+	titan_writel(0x00000001, SDTXFCIE);</div><div class='add'>+	titan_writel(0x00000100, SDRXFCIE);</div><div class='add'>+	titan_writel(0x00000000, SDTXFCIE);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Initialize the common interrupt shared by all components of</div><div class='add'>+	 * the GPI/Ethernet subsystem.</div><div class='add'>+	 */</div><div class='add'>+	titan_writel((EXCITE_PHYS_OCD &gt;&gt; 12), CPCFG0);</div><div class='add'>+	titan_writel(TITAN_MSGINT, CPCFG1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * XDMA configuration.</div><div class='add'>+	 * In order for the XDMA to be sharable among multiple drivers,</div><div class='add'>+	 * the setup must be done here in the platform. The reason is that</div><div class='add'>+	 * this setup can only be done while the XDMA is in reset. If this</div><div class='add'>+	 * were done in a driver, it would interrupt all other drivers</div><div class='add'>+	 * using the XDMA.</div><div class='add'>+	 */</div><div class='add'>+	titan_writel(0x80021dff, GXCFG);	/* XDMA reset */</div><div class='add'>+	titan_writel(0x00000000, CPXCISRA);</div><div class='add'>+	titan_writel(0x00000000, CPXCISRB);	/* clear pending interrupts */</div><div class='add'>+#if defined (CONFIG_HIGHMEM)</div><div class='add'>+#	error change for HIGHMEM support!</div><div class='add'>+#else</div><div class='add'>+	titan_writel(0x00000000, GXDMADRPFX);	/* buffer address prefix */</div><div class='add'>+#endif</div><div class='add'>+	titan_writel(0, GXDMA_DESCADR);</div><div class='add'>+</div><div class='add'>+	for (i = 0x5040; i &lt;= 0x5300; i += 0x0040)</div><div class='add'>+		titan_writel(0x80080000, i);	/* reset channel */</div><div class='add'>+</div><div class='add'>+	titan_writel((0x1 &lt;&lt; 29)			/* no sparse tx descr. */</div><div class='add'>+		     | (0x1 &lt;&lt; 28)			/* no sparse rx descr. */</div><div class='add'>+		     | (0x1 &lt;&lt; 23) | (0x1 &lt;&lt; 24)	/* descriptor coherency */</div><div class='add'>+		     | (0x1 &lt;&lt; 21) | (0x1 &lt;&lt; 22)	/* data coherency */</div><div class='add'>+		     | (0x1 &lt;&lt; 17)</div><div class='add'>+		     | 0x1dff,</div><div class='add'>+		     GXCFG);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SMP)</div><div class='add'>+#	error No SMP support</div><div class='add'>+#else</div><div class='add'>+	/* All interrupts go to core #0 only. */</div><div class='add'>+	titan_writel(0x1f007fff, CPDST0A);</div><div class='add'>+	titan_writel(0x00000000, CPDST0B);</div><div class='add'>+	titan_writel(0x0000ff3f, CPDST1A);</div><div class='add'>+	titan_writel(0x00000000, CPDST1B);</div><div class='add'>+	titan_writel(0x00ffffff, CPXDSTA);</div><div class='add'>+	titan_writel(0x00000000, CPXDSTB);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Enable DUART interrupts, disable everything else. */</div><div class='add'>+	titan_writel(0x04000000, CPGIG0ER);</div><div class='add'>+	titan_writel(0x000000c0, CPGIG1ER);</div><div class='add'>+</div><div class='add'>+	excite_procfs_init();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='add'>+{</div><div class='add'>+	volatile u32 * const boot_ocd_base = (u32 *) 0xbf7fc000;</div><div class='add'>+</div><div class='add'>+	/* Announce RAM to system */</div><div class='add'>+	add_memory_region(0x00000000, memsize, BOOT_MEM_RAM);</div><div class='add'>+</div><div class='add'>+	/* Set up timer initialization hooks */</div><div class='add'>+	board_time_init = excite_timer_init;</div><div class='add'>+</div><div class='add'>+	/* Set up the peripheral address map */</div><div class='add'>+	*(boot_ocd_base + (LKB9 / sizeof (u32))) = 0;</div><div class='add'>+	*(boot_ocd_base + (LKB10 / sizeof (u32))) = 0;</div><div class='add'>+	*(boot_ocd_base + (LKB11 / sizeof (u32))) = 0;</div><div class='add'>+	*(boot_ocd_base + (LKB12 / sizeof (u32))) = 0;</div><div class='add'>+	wmb();</div><div class='add'>+	*(boot_ocd_base + (LKB0 / sizeof (u32))) = EXCITE_PHYS_OCD &gt;&gt; 4;</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	ocd_writel((EXCITE_PHYS_TITAN &gt;&gt; 4) | 0x1UL, LKB5);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_TITAN &gt;&gt; 4) &amp; 0x7fffff00) - 0x100, LKM5);</div><div class='add'>+	ocd_writel((EXCITE_PHYS_SCRAM &gt;&gt; 4) | 0x1UL, LKB13);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_SCRAM &gt;&gt; 4) &amp; 0xffffff00) - 0x100, LKM13);</div><div class='add'>+</div><div class='add'>+	/* Local bus slot #0 */</div><div class='add'>+	ocd_writel(0x00040510, LDP0);</div><div class='add'>+	ocd_writel((EXCITE_PHYS_BOOTROM &gt;&gt; 4) | 0x1UL, LKB9);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_BOOTROM &gt;&gt; 4) &amp; 0x03ffff00) - 0x100, LKM9);</div><div class='add'>+</div><div class='add'>+	/* Local bus slot #2 */</div><div class='add'>+	ocd_writel(0x00000330, LDP2);</div><div class='add'>+	ocd_writel((EXCITE_PHYS_FPGA &gt;&gt; 4) | 0x1, LKB11);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_FPGA &gt;&gt; 4) - 0x100) &amp; 0x03ffff00, LKM11);</div><div class='add'>+</div><div class='add'>+	/* Local bus slot #3 */</div><div class='add'>+	ocd_writel(0x00123413, LDP3);</div><div class='add'>+	ocd_writel((EXCITE_PHYS_NAND &gt;&gt; 4) | 0x1, LKB12);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_NAND &gt;&gt; 4) - 0x100) &amp; 0x03ffff00, LKM12);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+console_initcall(excite_init_console);</div><div class='add'>+arch_initcall(excite_platform_init);</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(titan_lock);</div><div class='add'>+EXPORT_SYMBOL(titan_irqflags);</div><div class='add'>+EXPORT_SYMBOL(titan_irq);</div><div class='add'>+EXPORT_SYMBOL(ocd_base);</div><div class='add'>+EXPORT_SYMBOL(titan_base);</div><div class='head'>diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c<br/>index 45c2d27c7564..46c23b66bc17 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cobalt/console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/cobalt/console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cobalt/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/cobalt/console.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * (C) P. Horton 2006</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='hunk'>@@ -41,3 +40,8 @@ void __init cobalt_early_console(void)</div><div class='ctx'> </div><div class='ctx'> 	printk("Cobalt: early console registered\n");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void __init disable_early_printk(void)</div><div class='add'>+{</div><div class='add'>+	unregister_console(&amp;cons_info);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c<br/>index 4f9ea1210023..c01a0170e590 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/cobalt/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/cobalt/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/cobalt/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/cobalt/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -50,7 +49,7 @@ const char *get_system_type(void)</div><div class='ctx'> 	return "MIPS Cobalt";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init cobalt_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* Load timer value for 1KHz (TCLK is 50MHz) */</div><div class='ctx'> 	GALILEO_OUTL(50*1000*1000 / 1000, GT_TC0_OFS);</div><div class='hunk'>@@ -68,19 +67,46 @@ static void __init cobalt_timer_setup(struct irqaction *irq)</div><div class='ctx'> extern struct pci_ops gt64111_pci_ops;</div><div class='ctx'> </div><div class='ctx'> static struct resource cobalt_mem_resource = {</div><div class='del'>-	"PCI memory", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM</div><div class='add'>+	.start	= GT64111_MEM_BASE,</div><div class='add'>+	.end	= GT64111_MEM_END,</div><div class='add'>+	.name	= "PCI memory",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource cobalt_io_resource = {</div><div class='del'>-	"PCI I/O", 0x1000, 0xffff, IORESOURCE_IO</div><div class='add'>+	.start	= 0x1000,</div><div class='add'>+	.end	= 0xffff,</div><div class='add'>+	.name	= "PCI I/O",</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource cobalt_io_resources[] = {</div><div class='del'>-	{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY },</div><div class='del'>-	{ "timer", 0x40, 0x5f, IORESOURCE_BUSY },</div><div class='del'>-	{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },</div><div class='del'>-	{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },</div><div class='del'>-	{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x00,</div><div class='add'>+		.end	= 0x1f,</div><div class='add'>+		.name	= "dma1",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x40,</div><div class='add'>+		.end	= 0x5f,</div><div class='add'>+		.name	= "timer",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x60,</div><div class='add'>+		.end	= 0x6f,</div><div class='add'>+		.name	= "keyboard",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x80,</div><div class='add'>+		.end	= 0x8f,</div><div class='add'>+		.name	= "dma page reg",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0xc0,</div><div class='add'>+		.end	= 0xdf,</div><div class='add'>+		.name	= "dma2",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))</div><div class='hunk'>@@ -93,7 +119,7 @@ static struct pci_controller cobalt_pci_controller = {</div><div class='ctx'> 	.io_offset	= 0 - GT64111_IO_BASE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	static struct uart_port uart;</div><div class='ctx'> 	unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);</div><div class='hunk'>@@ -103,8 +129,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	_machine_halt = cobalt_machine_halt;</div><div class='ctx'> 	pm_power_off = cobalt_machine_power_off;</div><div class='ctx'> </div><div class='del'>-	board_timer_setup = cobalt_timer_setup;</div><div class='del'>-</div><div class='ctx'>         set_io_port_base(CKSEG1ADDR(GT64111_IO_BASE));</div><div class='ctx'> </div><div class='ctx'> 	/* I/O port resource must include UART and LCD/buttons */</div><div class='head'>diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig<br/>index 4b080bcb258f..54274065e9a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/atlas_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/atlas_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/atlas_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/atlas_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:55 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 09:59:39 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> CONFIG_MIPS_ATLAS=y</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_ATLAS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_MIPS_BONITO64=y</div><div class='hunk'>@@ -127,7 +129,11 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_MULTITHREADING=y</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -143,9 +149,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+CONFIG_HZ_100=y</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=100</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -177,10 +194,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -282,6 +301,8 @@ CONFIG_INET_ESP=m</div><div class='ctx'> CONFIG_INET_IPCOMP=m</div><div class='ctx'> CONFIG_INET_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -329,7 +350,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> CONFIG_BRIDGE_NETFILTER=y</div><div class='hunk'>@@ -346,6 +370,8 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='hunk'>@@ -361,9 +387,11 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -373,6 +401,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_IP_NF_CT_ACCT=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_NETLINK=m</div><div class='ctx'> CONFIG_IP_NF_CT_PROTO_SCTP=m</div><div class='hunk'>@@ -383,6 +412,7 @@ CONFIG_IP_NF_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_H323=m</div><div class='add'>+CONFIG_IP_NF_SIP=m</div><div class='ctx'> CONFIG_IP_NF_QUEUE=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_IPRANGE=m</div><div class='hunk'>@@ -413,6 +443,7 @@ CONFIG_IP_NF_NAT_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_NAT_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_H323=m</div><div class='add'>+CONFIG_IP_NF_NAT_SIP=m</div><div class='ctx'> CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TOS=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='hunk'>@@ -574,6 +605,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -692,6 +724,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -720,9 +753,8 @@ CONFIG_MD_LINEAR=m</div><div class='ctx'> CONFIG_MD_RAID0=m</div><div class='ctx'> CONFIG_MD_RAID1=m</div><div class='ctx'> CONFIG_MD_RAID10=m</div><div class='del'>-CONFIG_MD_RAID5=m</div><div class='add'>+CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_RAID6=m</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> CONFIG_MD_FAULTY=m</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='hunk'>@@ -778,6 +810,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -840,6 +874,7 @@ CONFIG_LAN_SAA9730=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -921,6 +956,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -952,6 +988,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -1000,6 +1037,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -1009,6 +1047,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1072,6 +1111,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1097,7 +1149,6 @@ CONFIG_JFS_SECURITY=y</div><div class='ctx'> # CONFIG_JFS_STATISTICS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> CONFIG_XFS_QUOTA=y</div><div class='ctx'> CONFIG_XFS_SECURITY=y</div><div class='ctx'> CONFIG_XFS_POSIX_ACL=y</div><div class='hunk'>@@ -1106,6 +1157,7 @@ CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> CONFIG_QUOTA=y</div><div class='ctx'> # CONFIG_QFMT_V1 is not set</div><div class='ctx'> CONFIG_QFMT_V2=y</div><div class='hunk'>@@ -1163,6 +1215,8 @@ CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> CONFIG_SYSV_FS=m</div><div class='ctx'> CONFIG_UFS_FS=m</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network File Systems</div><div class='hunk'>@@ -1187,6 +1241,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1252,6 +1307,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1310,3 +1366,10 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+CONFIG_RIO=n</div><div class='add'>+CONFIG_I2C_OCORES=n</div><div class='add'>+CONFIG_DEBUG_RT_MUTEXES=n</div><div class='add'>+CONFIG_RT_MUTEX_TESTER=n</div><div class='add'>+CONFIG_DEBUG_RWSEMS=n</div><div class='add'>+CONFIG_DEBUG_LOCKING_API_SELFTESTS=n</div><div class='head'>diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig<br/>index d85cda58d650..887fd959482a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/bigsur_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/bigsur_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/bigsur_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/bigsur_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:55 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:02:58 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -83,6 +84,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_COHERENT=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='ctx'> # CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='hunk'>@@ -130,11 +132,15 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> # CONFIG_SIBYTE_DMA_PAGEOPS is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='hunk'>@@ -145,12 +151,24 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=4</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> # CONFIG_PREEMPT_BKL is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -185,10 +203,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -246,7 +266,7 @@ CONFIG_MMU=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='ctx'> # CONFIG_BINFMT_MISC is not set</div><div class='del'>-CONFIG_BUILD_ELF64=y</div><div class='add'>+# CONFIG_BUILD_ELF64 is not set</div><div class='ctx'> CONFIG_MIPS32_COMPAT=y</div><div class='ctx'> CONFIG_COMPAT=y</div><div class='ctx'> CONFIG_MIPS32_O32=y</div><div class='hunk'>@@ -285,6 +305,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -292,6 +314,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -346,6 +369,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -498,6 +522,7 @@ CONFIG_NET_SB1250_MAC=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -565,6 +590,7 @@ CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_N_HDLC is not set</div><div class='ctx'> # CONFIG_SPECIALIX is not set</div><div class='ctx'> # CONFIG_SX is not set</div><div class='add'>+# CONFIG_RIO is not set</div><div class='ctx'> # CONFIG_STALDRV is not set</div><div class='ctx'> CONFIG_SIBYTE_SB1250_DUART=y</div><div class='ctx'> CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y</div><div class='hunk'>@@ -591,6 +617,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> CONFIG_GEN_RTC=y</div><div class='ctx'> # CONFIG_GEN_RTC_X is not set</div><div class='hunk'>@@ -636,6 +663,7 @@ CONFIG_I2C_ALGO_SIBYTE=y</div><div class='ctx'> # CONFIG_I2C_I810 is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_PROSAVAGE is not set</div><div class='ctx'> # CONFIG_I2C_SAVAGE4 is not set</div><div class='hunk'>@@ -673,7 +701,6 @@ CONFIG_I2C_DEBUG_CHIP=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -689,6 +716,7 @@ CONFIG_I2C_DEBUG_CHIP=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -698,6 +726,7 @@ CONFIG_I2C_DEBUG_CHIP=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -755,6 +784,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -772,6 +814,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -837,6 +880,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -863,14 +907,19 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PRINTK_TIME=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=16</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -933,3 +982,4 @@ CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig<br/>index ca0af1683a00..a01344f3a4c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/capcella_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/capcella_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/capcella_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/capcella_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Tue Apr 25 00:08:06 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:24 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -75,6 +76,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -119,7 +121,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -132,9 +137,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -166,10 +182,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -261,6 +279,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -268,6 +288,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -321,6 +342,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -439,6 +461,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -505,6 +529,7 @@ CONFIG_8139TOO_PIO=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -574,6 +599,7 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -602,6 +628,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -651,6 +678,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -660,6 +688,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -731,13 +760,30 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='ctx'> CONFIG_RTC_INTF_SYSFS=y</div><div class='ctx'> CONFIG_RTC_INTF_PROC=y</div><div class='ctx'> CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> CONFIG_RTC_DRV_VR41XX=y</div><div class='ctx'> # CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -754,6 +800,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -820,6 +867,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -846,6 +894,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -874,3 +923,4 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig<br/>index 7d269e609282..c95682445a28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/cobalt_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/cobalt_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/cobalt_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/cobalt_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:57 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:25 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> CONFIG_MIPS_COBALT=y</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_COBALT=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_COBALT=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_I8259=y</div><div class='hunk'>@@ -115,7 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -129,9 +134,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -163,10 +179,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -249,6 +267,8 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -256,6 +276,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -315,6 +336,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -464,6 +486,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -515,6 +539,7 @@ CONFIG_TULIP=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -592,6 +617,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -623,6 +649,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> CONFIG_COBALT_LCD=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -671,6 +698,7 @@ CONFIG_COBALT_LCD=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -680,6 +708,7 @@ CONFIG_COBALT_LCD=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -743,6 +772,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -760,6 +802,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -822,6 +865,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -848,6 +892,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -889,7 +934,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -904,3 +948,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig<br/>index 579b665e3339..c2f33d3af62c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1000_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1000_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1000_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/db1000_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:57 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:33 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS_DB1000=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_DB1000=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_DB1000=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -114,7 +116,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -130,9 +135,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -164,14 +180,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -269,6 +286,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -281,6 +300,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -295,6 +315,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -305,8 +326,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -376,6 +399,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -525,7 +549,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -535,6 +559,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -646,6 +672,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_AU1X00_GPIO is not set</div><div class='ctx'> # CONFIG_TS_AU1X00_ADS7846 is not set</div><div class='hunk'>@@ -679,6 +706,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -732,6 +760,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -741,6 +770,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -803,6 +833,19 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -830,6 +873,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -899,6 +943,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -964,6 +1009,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1023,3 +1069,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig<br/>index e5eb53867422..8c44d16ae9a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1100_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1100_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1100_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/db1100_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:58 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:34 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS_DB1100=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_DB1100=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_DB1100=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -114,7 +116,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -130,9 +135,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -164,14 +180,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -258,6 +275,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -270,6 +289,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -284,6 +304,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -294,8 +315,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -365,6 +388,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -514,7 +538,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -524,6 +548,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -622,6 +648,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_AU1X00_GPIO is not set</div><div class='ctx'> # CONFIG_TS_AU1X00_ADS7846 is not set</div><div class='hunk'>@@ -654,6 +681,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -700,6 +728,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -709,12 +738,13 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='hunk'>@@ -803,6 +833,19 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -830,6 +873,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -899,6 +943,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -964,6 +1009,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1023,3 +1069,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig<br/>index a43fb2329fd5..c13768e75ac5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1200_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1200_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/db1200_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:58 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:43 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> CONFIG_MIPS_DB1200=y</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_DB1200=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_DB1200=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_COHERENT=y</div><div class='ctx'> CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -114,7 +116,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -130,9 +135,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,14 +181,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -265,6 +282,8 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -277,6 +296,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -289,6 +309,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -299,8 +320,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -364,6 +387,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -444,6 +468,7 @@ CONFIG_MTD_ALCHEMY=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD_NAND=y</div><div class='ctx'> # CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=y</div><div class='ctx'> # CONFIG_MTD_NAND_AU1550 is not set</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='hunk'>@@ -684,6 +709,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_AU1X00_GPIO is not set</div><div class='ctx'> # CONFIG_TS_AU1X00_ADS7846 is not set</div><div class='hunk'>@@ -717,6 +743,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -754,7 +781,6 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -770,6 +796,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -779,12 +806,13 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='hunk'>@@ -874,6 +902,19 @@ CONFIG_MMC_AU1X=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -900,6 +941,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -952,6 +994,7 @@ CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_JFFS2_FS_DEBUG=0</div><div class='ctx'> CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='ctx'> # CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='hunk'>@@ -981,6 +1024,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=y</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1046,6 +1090,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1081,3 +1126,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig<br/>index ad632d87c4ef..8aea73fae7fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1500_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1500_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1500_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/db1500_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:59 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:56 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS_DB1500=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_DB1500=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_DB1500=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y</div><div class='hunk'>@@ -116,7 +118,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -132,9 +137,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -166,14 +182,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -276,6 +293,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -288,6 +307,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -302,6 +322,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -312,8 +333,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -383,6 +406,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -569,7 +593,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -579,6 +603,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -623,6 +649,7 @@ CONFIG_MIPS_AU1X00_ENET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -746,6 +773,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -801,6 +829,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -811,6 +840,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -866,6 +896,18 @@ CONFIG_SND_MTPAV=m</div><div class='ctx'> # CONFIG_SND_CMIPCI is not set</div><div class='ctx'> # CONFIG_SND_CS4281 is not set</div><div class='ctx'> # CONFIG_SND_CS46XX is not set</div><div class='add'>+# CONFIG_SND_DARLA20 is not set</div><div class='add'>+# CONFIG_SND_GINA20 is not set</div><div class='add'>+# CONFIG_SND_LAYLA20 is not set</div><div class='add'>+# CONFIG_SND_DARLA24 is not set</div><div class='add'>+# CONFIG_SND_GINA24 is not set</div><div class='add'>+# CONFIG_SND_LAYLA24 is not set</div><div class='add'>+# CONFIG_SND_MONA is not set</div><div class='add'>+# CONFIG_SND_MIA is not set</div><div class='add'>+# CONFIG_SND_ECHO3G is not set</div><div class='add'>+# CONFIG_SND_INDIGO is not set</div><div class='add'>+# CONFIG_SND_INDIGOIO is not set</div><div class='add'>+# CONFIG_SND_INDIGODJ is not set</div><div class='ctx'> # CONFIG_SND_EMU10K1 is not set</div><div class='ctx'> # CONFIG_SND_EMU10K1X is not set</div><div class='ctx'> # CONFIG_SND_ENS1370 is not set</div><div class='hunk'>@@ -909,6 +951,8 @@ CONFIG_SND_AU1X00=m</div><div class='ctx'> #</div><div class='ctx'> # PCMCIA devices</div><div class='ctx'> #</div><div class='add'>+# CONFIG_SND_VXPOCKET is not set</div><div class='add'>+# CONFIG_SND_PDAUDIOCF is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Open Sound System</div><div class='hunk'>@@ -1023,10 +1067,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> CONFIG_USB_LD=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1071,6 +1117,19 @@ CONFIG_USB_LD=m</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1098,6 +1157,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -1167,6 +1227,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1232,6 +1293,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1291,3 +1353,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig<br/>index 8130e23dc255..90ccb7359630 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/db1550_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/db1550_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/db1550_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/db1550_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:00 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:03:59 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> CONFIG_MIPS_DB1550=y</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_DB1550=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_DB1550=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y</div><div class='hunk'>@@ -115,7 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -131,9 +136,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,14 +181,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -275,6 +292,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -287,6 +306,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -301,6 +321,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -311,8 +332,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -382,6 +405,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -463,6 +487,7 @@ CONFIG_MTD_ALCHEMY=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MTD_NAND=m</div><div class='ctx'> # CONFIG_MTD_NAND_VERIFY_WRITE is not set</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='ctx'> CONFIG_MTD_NAND_IDS=m</div><div class='ctx'> CONFIG_MTD_NAND_AU1550=m</div><div class='ctx'> # CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='hunk'>@@ -601,7 +626,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -611,6 +636,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -655,6 +682,7 @@ CONFIG_MIPS_AU1X00_ENET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -786,6 +814,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -841,6 +870,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -850,6 +880,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -907,6 +938,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -934,6 +978,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -1003,6 +1048,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1068,6 +1114,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1127,3 +1174,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig<br/>index 8c911b671415..b598cf08f156 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ddb5477_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ddb5477_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ddb5477_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ddb5477_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:01 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:00 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> CONFIG_DDB5477=y</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_I8259=y</div><div class='hunk'>@@ -115,7 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -129,9 +134,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -163,10 +179,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -252,6 +270,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -259,6 +279,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -318,6 +339,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -415,6 +437,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -477,6 +501,7 @@ CONFIG_PCNET32=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -554,6 +579,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -585,6 +611,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -633,6 +660,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -642,6 +670,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -705,6 +734,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -719,6 +761,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='hunk'>@@ -785,6 +828,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -811,6 +855,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -852,7 +897,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -867,3 +911,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig<br/>index d838496e114f..597150b14077 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/decstation_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/decstation_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/decstation_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/decstation_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:01 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:01 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> CONFIG_MACH_DECSTATION=y</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MACH_DECSTATION=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MACH_DECSTATION=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -114,7 +116,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_WB=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -128,9 +133,22 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_128=y</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_128HZ=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_256HZ=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_1024HZ=y</div><div class='add'>+CONFIG_HZ=128</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -163,10 +181,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -235,6 +255,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PACKET_MMAP=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -253,6 +275,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -260,6 +284,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -320,6 +345,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -439,6 +465,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -528,6 +556,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -573,6 +602,7 @@ CONFIG_RTC=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -582,12 +612,13 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='hunk'>@@ -660,6 +691,19 @@ CONFIG_LOGO_DEC_CLUT224=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -677,6 +721,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -723,6 +768,8 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> CONFIG_UFS_FS=y</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network File Systems</div><div class='hunk'>@@ -742,6 +789,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -783,14 +831,19 @@ CONFIG_ULTRIX_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -853,3 +906,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig<br/>index 0760f4318910..fa2996bb4b7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/e55_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/e55_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/e55_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/e55_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Tue Apr 25 00:08:20 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:02 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -73,6 +74,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -117,7 +119,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -130,9 +135,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -162,10 +178,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -237,6 +255,7 @@ CONFIG_TRAD_SIGNALS=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -371,6 +390,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -411,6 +431,7 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> # CONFIG_PCWATCHDOG is not set</div><div class='ctx'> # CONFIG_MIXCOMWD is not set</div><div class='ctx'> # CONFIG_WDT is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -442,7 +463,6 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -458,6 +478,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -466,6 +487,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -528,6 +550,19 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -541,6 +576,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -609,6 +645,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -637,3 +674,4 @@ CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M"</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig<br/>new file mode 100644<br/>index 000000000000..375b2ac24a49<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/emma2rh_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/emma2rh_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1241 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:05 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_MIPS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Machine selection</div><div class='add'>+#</div><div class='add'>+# CONFIG_MIPS_MTX1 is not set</div><div class='add'>+# CONFIG_MIPS_BOSPORUS is not set</div><div class='add'>+# CONFIG_MIPS_PB1000 is not set</div><div class='add'>+# CONFIG_MIPS_PB1100 is not set</div><div class='add'>+# CONFIG_MIPS_PB1500 is not set</div><div class='add'>+# CONFIG_MIPS_PB1550 is not set</div><div class='add'>+# CONFIG_MIPS_PB1200 is not set</div><div class='add'>+# CONFIG_MIPS_DB1000 is not set</div><div class='add'>+# CONFIG_MIPS_DB1100 is not set</div><div class='add'>+# CONFIG_MIPS_DB1500 is not set</div><div class='add'>+# CONFIG_MIPS_DB1550 is not set</div><div class='add'>+# CONFIG_MIPS_DB1200 is not set</div><div class='add'>+# CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='add'>+# CONFIG_MIPS_COBALT is not set</div><div class='add'>+# CONFIG_MACH_DECSTATION is not set</div><div class='add'>+# CONFIG_MIPS_EV64120 is not set</div><div class='add'>+# CONFIG_MIPS_EV96100 is not set</div><div class='add'>+# CONFIG_MIPS_IVR is not set</div><div class='add'>+# CONFIG_MIPS_ITE8172 is not set</div><div class='add'>+# CONFIG_MACH_JAZZ is not set</div><div class='add'>+# CONFIG_LASAT is not set</div><div class='add'>+# CONFIG_MIPS_ATLAS is not set</div><div class='add'>+# CONFIG_MIPS_MALTA is not set</div><div class='add'>+# CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='add'>+# CONFIG_MIPS_SIM is not set</div><div class='add'>+# CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT_3 is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT_C is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT_G is not set</div><div class='add'>+# CONFIG_MIPS_XXS1500 is not set</div><div class='add'>+# CONFIG_PNX8550_V2PCI is not set</div><div class='add'>+# CONFIG_PNX8550_JBS is not set</div><div class='add'>+# CONFIG_DDB5477 is not set</div><div class='add'>+# CONFIG_MACH_VR41XX is not set</div><div class='add'>+# CONFIG_PMC_YOSEMITE is not set</div><div class='add'>+# CONFIG_QEMU is not set</div><div class='add'>+CONFIG_MARKEINS=y</div><div class='add'>+# CONFIG_SGI_IP22 is not set</div><div class='add'>+# CONFIG_SGI_IP27 is not set</div><div class='add'>+# CONFIG_SGI_IP32 is not set</div><div class='add'>+# CONFIG_SIBYTE_BIGSUR is not set</div><div class='add'>+# CONFIG_SIBYTE_SWARM is not set</div><div class='add'>+# CONFIG_SIBYTE_SENTOSA is not set</div><div class='add'>+# CONFIG_SIBYTE_RHONE is not set</div><div class='add'>+# CONFIG_SIBYTE_CARMEL is not set</div><div class='add'>+# CONFIG_SIBYTE_PTSWARM is not set</div><div class='add'>+# CONFIG_SIBYTE_LITTLESUR is not set</div><div class='add'>+# CONFIG_SIBYTE_CRHINE is not set</div><div class='add'>+# CONFIG_SIBYTE_CRHONE is not set</div><div class='add'>+# CONFIG_SNI_RM200_PCI is not set</div><div class='add'>+# CONFIG_TOSHIBA_JMR3927 is not set</div><div class='add'>+# CONFIG_TOSHIBA_RBTX4927 is not set</div><div class='add'>+# CONFIG_TOSHIBA_RBTX4938 is not set</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_DMA_NONCOHERENT=y</div><div class='add'>+CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+# CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_IRQ_CPU=y</div><div class='add'>+CONFIG_SWAP_IO_SPACE=y</div><div class='add'>+CONFIG_EMMA2RH=y</div><div class='add'>+CONFIG_MIPS_L1_CACHE_SHIFT=5</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU selection</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_MIPS32_R1 is not set</div><div class='add'>+# CONFIG_CPU_MIPS32_R2 is not set</div><div class='add'>+# CONFIG_CPU_MIPS64_R1 is not set</div><div class='add'>+# CONFIG_CPU_MIPS64_R2 is not set</div><div class='add'>+# CONFIG_CPU_R3000 is not set</div><div class='add'>+# CONFIG_CPU_TX39XX is not set</div><div class='add'>+# CONFIG_CPU_VR41XX is not set</div><div class='add'>+# CONFIG_CPU_R4300 is not set</div><div class='add'>+# CONFIG_CPU_R4X00 is not set</div><div class='add'>+# CONFIG_CPU_TX49XX is not set</div><div class='add'>+CONFIG_CPU_R5000=y</div><div class='add'>+# CONFIG_CPU_R5432 is not set</div><div class='add'>+# CONFIG_CPU_R6000 is not set</div><div class='add'>+# CONFIG_CPU_NEVADA is not set</div><div class='add'>+# CONFIG_CPU_R8000 is not set</div><div class='add'>+# CONFIG_CPU_R10000 is not set</div><div class='add'>+# CONFIG_CPU_RM7000 is not set</div><div class='add'>+# CONFIG_CPU_RM9000 is not set</div><div class='add'>+# CONFIG_CPU_SB1 is not set</div><div class='add'>+CONFIG_SYS_HAS_CPU_R5000=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel type</div><div class='add'>+#</div><div class='add'>+CONFIG_32BIT=y</div><div class='add'>+# CONFIG_64BIT is not set</div><div class='add'>+CONFIG_PAGE_SIZE_4KB=y</div><div class='add'>+# CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='add'>+# CONFIG_64BIT_PHYS_ADDR is not set</div><div class='add'>+CONFIG_CPU_HAS_LLSC=y</div><div class='add'>+CONFIG_CPU_HAS_SYNC=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='add'>+# CONFIG_PREEMPT_NONE is not set</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_PREEMPT_BKL=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options (PCI, PCMCIA, EISA, ISA, TC)</div><div class='add'>+#</div><div class='add'>+CONFIG_HW_HAS_PCI=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Executable file formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_TRAD_SIGNALS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+CONFIG_IP_ADVANCED_ROUTER=y</div><div class='add'>+CONFIG_ASK_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_FIB_TRIE is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_MULTIPLE_TABLES=y</div><div class='add'>+# CONFIG_IP_ROUTE_FWMARK is not set</div><div class='add'>+CONFIG_IP_ROUTE_MULTIPATH=y</div><div class='add'>+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set</div><div class='add'>+CONFIG_IP_ROUTE_VERBOSE=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Virtual Server Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+CONFIG_IPV6=m</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK is not set</div><div class='add'>+# CONFIG_NF_CONNTRACK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK is not set</div><div class='add'>+# CONFIG_IP_NF_QUEUE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPv6: Netfilter Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP6_NF_QUEUE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_SCTP=m</div><div class='add'>+# CONFIG_SCTP_DBG_MSG is not set</div><div class='add'>+# CONFIG_SCTP_DBG_OBJCNT is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_NONE is not set</div><div class='add'>+# CONFIG_SCTP_HMAC_SHA1 is not set</div><div class='add'>+CONFIG_SCTP_HMAC_MD5=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+CONFIG_MTD_CMDLINE_PARTS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0x1e000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x02000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+CONFIG_BLK_DEV_CRYPTOLOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=m</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=m</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=m</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+# CONFIG_FUSION_SPI is not set</div><div class='add'>+# CONFIG_FUSION_FC is not set</div><div class='add'>+# CONFIG_FUSION_SAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+CONFIG_TUN=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_DM9000 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Tulip family network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+CONFIG_NET_PCI=y</div><div class='add'>+# CONFIG_PCNET32 is not set</div><div class='add'>+# CONFIG_AMD8111_ETH is not set</div><div class='add'>+# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_FORCEDETH is not set</div><div class='add'>+# CONFIG_DGRS is not set</div><div class='add'>+# CONFIG_EEPRO100 is not set</div><div class='add'>+# CONFIG_E100 is not set</div><div class='add'>+# CONFIG_FEALNX is not set</div><div class='add'>+CONFIG_NATSEMI=y</div><div class='add'>+# CONFIG_NE2K_PCI is not set</div><div class='add'>+# CONFIG_8139CP is not set</div><div class='add'>+# CONFIG_8139TOO is not set</div><div class='add'>+# CONFIG_SIS900 is not set</div><div class='add'>+# CONFIG_EPIC100 is not set</div><div class='add'>+# CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='add'>+# CONFIG_VIA_RHINE is not set</div><div class='add'>+# CONFIG_LAN_SAA9730 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+# CONFIG_PPP_MULTILINK is not set</div><div class='add'>+# CONFIG_PPP_FILTER is not set</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+# CONFIG_PPP_BSDCOMP is not set</div><div class='add'>+# CONFIG_PPP_MPPE is not set</div><div class='add'>+# CONFIG_PPPOE is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=m</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_RTC=m</div><div class='add'>+CONFIG_GEN_RTC=m</div><div class='add'>+CONFIG_GEN_RTC_X=y</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_PROSAVAGE is not set</div><div class='add'>+# CONFIG_I2C_SAVAGE4 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+CONFIG_I2C_DEBUG_CORE=y</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+CONFIG_I2C_DEBUG_BUS=y</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+CONFIG_EXT2_FS_XATTR=y</div><div class='add'>+CONFIG_EXT2_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_EXT2_FS_SECURITY=y</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=m</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=m</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='add'>+CONFIG_XFS_FS=m</div><div class='add'>+# CONFIG_XFS_QUOTA is not set</div><div class='add'>+# CONFIG_XFS_SECURITY is not set</div><div class='add'>+# CONFIG_XFS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_RT is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+CONFIG_AUTOFS4_FS=m</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=y</div><div class='add'>+CONFIG_MSDOS_FS=y</div><div class='add'>+CONFIG_VFAT_FS=y</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+CONFIG_NTFS_FS=m</div><div class='add'>+# CONFIG_NTFS_DEBUG is not set</div><div class='add'>+# CONFIG_NTFS_RW is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+CONFIG_JFFS2_COMPRESSION_OPTIONS=y</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_JFFS2_CMODE_NONE is not set</div><div class='add'>+CONFIG_JFFS2_CMODE_PRIORITY=y</div><div class='add'>+# CONFIG_JFFS2_CMODE_SIZE is not set</div><div class='add'>+CONFIG_CRAMFS=y</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+CONFIG_NFS_DIRECTIO=y</div><div class='add'>+CONFIG_NFSD=m</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+# CONFIG_NFSD_V3_ACL is not set</div><div class='add'>+# CONFIG_NFSD_V4 is not set</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=m</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+CONFIG_SMB_FS=m</div><div class='add'>+# CONFIG_SMB_NLS_DEFAULT is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARTITION_ADVANCED is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT=""</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=m</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+CONFIG_NLS_UTF8=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_CROSSCOMPILE=y</div><div class='add'>+CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig<br/>index 7067f608b22c..b0afc118bd5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ev64120_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ev64120_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ev64120_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ev64120_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:02 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:05 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> CONFIG_MIPS_EV64120=y</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_EV64120=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_EV64120=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -116,7 +118,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -131,9 +136,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,10 +181,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -258,6 +276,8 @@ CONFIG_IP_PNP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -265,6 +285,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -324,6 +345,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -420,6 +442,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -462,6 +486,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -547,6 +572,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -578,6 +604,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -626,6 +653,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -635,6 +663,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -698,6 +727,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -712,6 +754,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -775,6 +818,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -801,6 +845,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -856,3 +901,4 @@ CONFIG_CRC32=m</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig<br/>index 00b56ed0e638..0bdc10f11610 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ev96100_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ev96100_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ev96100_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ev96100_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:03 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:05 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_EV96100=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_EV96100=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -119,7 +121,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -135,9 +140,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -169,10 +185,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -261,6 +279,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -268,6 +288,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -327,6 +348,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -411,6 +433,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -500,6 +524,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -529,6 +554,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -575,6 +601,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -584,6 +611,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -645,6 +673,19 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -659,6 +700,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -722,6 +764,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -748,6 +791,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -803,3 +847,4 @@ CONFIG_CRC32=m</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig<br/>new file mode 100644<br/>index 000000000000..045ebd089893<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/excite_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/excite_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1245 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:09 2006</div><div class='add'>+#</div><div class='add'>+CONFIG_MIPS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Machine selection</div><div class='add'>+#</div><div class='add'>+# CONFIG_MIPS_MTX1 is not set</div><div class='add'>+# CONFIG_MIPS_BOSPORUS is not set</div><div class='add'>+# CONFIG_MIPS_PB1000 is not set</div><div class='add'>+# CONFIG_MIPS_PB1100 is not set</div><div class='add'>+# CONFIG_MIPS_PB1500 is not set</div><div class='add'>+# CONFIG_MIPS_PB1550 is not set</div><div class='add'>+# CONFIG_MIPS_PB1200 is not set</div><div class='add'>+# CONFIG_MIPS_DB1000 is not set</div><div class='add'>+# CONFIG_MIPS_DB1100 is not set</div><div class='add'>+# CONFIG_MIPS_DB1500 is not set</div><div class='add'>+# CONFIG_MIPS_DB1550 is not set</div><div class='add'>+# CONFIG_MIPS_DB1200 is not set</div><div class='add'>+# CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+CONFIG_BASLER_EXCITE=y</div><div class='add'>+# CONFIG_BASLER_EXCITE_PROTOTYPE is not set</div><div class='add'>+# CONFIG_MIPS_COBALT is not set</div><div class='add'>+# CONFIG_MACH_DECSTATION is not set</div><div class='add'>+# CONFIG_MIPS_EV64120 is not set</div><div class='add'>+# CONFIG_MIPS_EV96100 is not set</div><div class='add'>+# CONFIG_MIPS_IVR is not set</div><div class='add'>+# CONFIG_MIPS_ITE8172 is not set</div><div class='add'>+# CONFIG_MACH_JAZZ is not set</div><div class='add'>+# CONFIG_LASAT is not set</div><div class='add'>+# CONFIG_MIPS_ATLAS is not set</div><div class='add'>+# CONFIG_MIPS_MALTA is not set</div><div class='add'>+# CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='add'>+# CONFIG_MIPS_SIM is not set</div><div class='add'>+# CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT_3 is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT_C is not set</div><div class='add'>+# CONFIG_MOMENCO_OCELOT_G is not set</div><div class='add'>+# CONFIG_MIPS_XXS1500 is not set</div><div class='add'>+# CONFIG_PNX8550_V2PCI is not set</div><div class='add'>+# CONFIG_PNX8550_JBS is not set</div><div class='add'>+# CONFIG_DDB5477 is not set</div><div class='add'>+# CONFIG_MACH_VR41XX is not set</div><div class='add'>+# CONFIG_PMC_YOSEMITE is not set</div><div class='add'>+# CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='add'>+# CONFIG_SGI_IP22 is not set</div><div class='add'>+# CONFIG_SGI_IP27 is not set</div><div class='add'>+# CONFIG_SGI_IP32 is not set</div><div class='add'>+# CONFIG_SIBYTE_BIGSUR is not set</div><div class='add'>+# CONFIG_SIBYTE_SWARM is not set</div><div class='add'>+# CONFIG_SIBYTE_SENTOSA is not set</div><div class='add'>+# CONFIG_SIBYTE_RHONE is not set</div><div class='add'>+# CONFIG_SIBYTE_CARMEL is not set</div><div class='add'>+# CONFIG_SIBYTE_PTSWARM is not set</div><div class='add'>+# CONFIG_SIBYTE_LITTLESUR is not set</div><div class='add'>+# CONFIG_SIBYTE_CRHINE is not set</div><div class='add'>+# CONFIG_SIBYTE_CRHONE is not set</div><div class='add'>+# CONFIG_SNI_RM200_PCI is not set</div><div class='add'>+# CONFIG_TOSHIBA_JMR3927 is not set</div><div class='add'>+# CONFIG_TOSHIBA_RBTX4927 is not set</div><div class='add'>+# CONFIG_TOSHIBA_RBTX4938 is not set</div><div class='add'>+CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_DMA_COHERENT=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+# CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y</div><div class='add'>+CONFIG_IRQ_CPU=y</div><div class='add'>+CONFIG_IRQ_CPU_RM7K=y</div><div class='add'>+CONFIG_IRQ_CPU_RM9K=y</div><div class='add'>+CONFIG_MIPS_L1_CACHE_SHIFT=5</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CPU selection</div><div class='add'>+#</div><div class='add'>+# CONFIG_CPU_MIPS32_R1 is not set</div><div class='add'>+# CONFIG_CPU_MIPS32_R2 is not set</div><div class='add'>+# CONFIG_CPU_MIPS64_R1 is not set</div><div class='add'>+# CONFIG_CPU_MIPS64_R2 is not set</div><div class='add'>+# CONFIG_CPU_R3000 is not set</div><div class='add'>+# CONFIG_CPU_TX39XX is not set</div><div class='add'>+# CONFIG_CPU_VR41XX is not set</div><div class='add'>+# CONFIG_CPU_R4300 is not set</div><div class='add'>+# CONFIG_CPU_R4X00 is not set</div><div class='add'>+# CONFIG_CPU_TX49XX is not set</div><div class='add'>+# CONFIG_CPU_R5000 is not set</div><div class='add'>+# CONFIG_CPU_R5432 is not set</div><div class='add'>+# CONFIG_CPU_R6000 is not set</div><div class='add'>+# CONFIG_CPU_NEVADA is not set</div><div class='add'>+# CONFIG_CPU_R8000 is not set</div><div class='add'>+# CONFIG_CPU_R10000 is not set</div><div class='add'>+# CONFIG_CPU_RM7000 is not set</div><div class='add'>+CONFIG_CPU_RM9000=y</div><div class='add'>+# CONFIG_CPU_SB1 is not set</div><div class='add'>+CONFIG_SYS_HAS_CPU_RM9000=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel type</div><div class='add'>+#</div><div class='add'>+CONFIG_32BIT=y</div><div class='add'>+# CONFIG_64BIT is not set</div><div class='add'>+CONFIG_PAGE_SIZE_4KB=y</div><div class='add'>+# CONFIG_PAGE_SIZE_8KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_16KB is not set</div><div class='add'>+# CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_CPU_HAS_PREFETCH=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='add'>+# CONFIG_64BIT_PHYS_ADDR is not set</div><div class='add'>+CONFIG_CPU_HAS_LLSC=y</div><div class='add'>+CONFIG_CPU_HAS_SYNC=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='add'>+# CONFIG_PREEMPT_NONE is not set</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+CONFIG_PREEMPT=y</div><div class='add'>+CONFIG_PREEMPT_BKL=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options (PCI, PCMCIA, EISA, ISA, TC)</div><div class='add'>+#</div><div class='add'>+CONFIG_HW_HAS_PCI=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Executable file formats</div><div class='add'>+#</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_TRAD_SIGNALS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+# CONFIG_IP_PNP_BOOTP is not set</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+CONFIG_MTD_PARTITIONS=y</div><div class='add'>+# CONFIG_MTD_REDBOOT_PARTS is not set</div><div class='add'>+# CONFIG_MTD_CMDLINE_PARTS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+CONFIG_MTD_BLOCK=y</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_CFI is not set</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_NAND=y</div><div class='add'>+CONFIG_MTD_NAND_VERIFY_WRITE=y</div><div class='add'>+# CONFIG_MTD_NAND_ECC_SMC is not set</div><div class='add'>+CONFIG_MTD_NAND_IDS=y</div><div class='add'>+# CONFIG_MTD_NAND_DISKONCHIP is not set</div><div class='add'>+# CONFIG_MTD_NAND_NANDSIM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=m</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+# CONFIG_BLK_DEV_RAM is not set</div><div class='add'>+# CONFIG_BLK_DEV_INITRD is not set</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+# CONFIG_SCSI_PROC_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+# CONFIG_FUSION_SPI is not set</div><div class='add'>+# CONFIG_FUSION_FC is not set</div><div class='add'>+# CONFIG_FUSION_SAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_ETHERNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=m</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=m</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+# CONFIG_SERIAL_8250_MANY_PORTS is not set</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+# CONFIG_SERIAL_8250_DETECT_IRQ is not set</div><div class='add'>+# CONFIG_SERIAL_8250_RSA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+# CONFIG_RTC is not set</div><div class='add'>+# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+# CONFIG_FB_CFB_FILLRECT is not set</div><div class='add'>+# CONFIG_FB_CFB_COPYAREA is not set</div><div class='add'>+# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='add'>+# CONFIG_FB_MACMODES is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+# CONFIG_FB_MODE_HELPERS is not set</div><div class='add'>+# CONFIG_FB_TILEBLITTING is not set</div><div class='add'>+# CONFIG_FB_CIRRUS is not set</div><div class='add'>+# CONFIG_FB_PM2 is not set</div><div class='add'>+# CONFIG_FB_CYBER2000 is not set</div><div class='add'>+# CONFIG_FB_ASILIANT is not set</div><div class='add'>+# CONFIG_FB_IMSTT is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_NVIDIA is not set</div><div class='add'>+# CONFIG_FB_RIVA is not set</div><div class='add'>+# CONFIG_FB_MATROX is not set</div><div class='add'>+# CONFIG_FB_RADEON is not set</div><div class='add'>+# CONFIG_FB_ATY128 is not set</div><div class='add'>+# CONFIG_FB_ATY is not set</div><div class='add'>+# CONFIG_FB_SAVAGE is not set</div><div class='add'>+# CONFIG_FB_SIS is not set</div><div class='add'>+# CONFIG_FB_NEOMAGIC is not set</div><div class='add'>+# CONFIG_FB_KYRO is not set</div><div class='add'>+# CONFIG_FB_3DFX is not set</div><div class='add'>+# CONFIG_FB_VOODOO1 is not set</div><div class='add'>+# CONFIG_FB_SMIVGX is not set</div><div class='add'>+# CONFIG_FB_TRIDENT is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+# CONFIG_VGA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=m</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_LOGO is not set</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='add'>+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+# CONFIG_USB_UHCI_HCD is not set</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=m</div><div class='add'>+CONFIG_USB_HIDINPUT=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+# CONFIG_USB_MON is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT3_FS is not set</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+CONFIG_JFFS2_FS=y</div><div class='add'>+CONFIG_JFFS2_FS_DEBUG=0</div><div class='add'>+CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='add'>+# CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='add'>+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='add'>+CONFIG_JFFS2_ZLIB=y</div><div class='add'>+CONFIG_JFFS2_RTIME=y</div><div class='add'>+# CONFIG_JFFS2_RUBIN is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+CONFIG_NLS_CODEPAGE_437=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+CONFIG_NLS_CODEPAGE_850=m</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Profiling support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+CONFIG_CROSSCOMPILE=y</div><div class='add'>+CONFIG_CMDLINE=""</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=y</div><div class='add'>+CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig<br/>index 607e2985ffe3..ef16d1fb5071 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ip22_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ip22_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ip22_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ip22_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:54 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:10 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> CONFIG_SGI_IP22=y</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARC=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='hunk'>@@ -121,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_IP22_CPU_SCACHE=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -136,9 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -171,10 +187,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -265,6 +283,8 @@ CONFIG_INET_ESP=m</div><div class='ctx'> CONFIG_INET_IPCOMP=m</div><div class='ctx'> CONFIG_INET_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -312,7 +332,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -328,6 +351,8 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='hunk'>@@ -342,9 +367,11 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -354,6 +381,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_IP_NF_CT_ACCT=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_NETLINK=m</div><div class='ctx'> # CONFIG_IP_NF_CT_PROTO_SCTP is not set</div><div class='hunk'>@@ -364,6 +392,7 @@ CONFIG_IP_NF_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_H323=m</div><div class='add'>+CONFIG_IP_NF_SIP=m</div><div class='ctx'> CONFIG_IP_NF_QUEUE=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_IPRANGE=m</div><div class='hunk'>@@ -394,6 +423,7 @@ CONFIG_IP_NF_NAT_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_NAT_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_H323=m</div><div class='add'>+CONFIG_IP_NF_NAT_SIP=m</div><div class='ctx'> CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TOS=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='hunk'>@@ -526,6 +556,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -645,6 +676,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -742,6 +775,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -774,6 +808,7 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='ctx'> CONFIG_INDYDOG=m</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> CONFIG_SGI_DS1286=m</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='hunk'>@@ -822,6 +857,7 @@ CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -831,6 +867,7 @@ CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -903,6 +940,19 @@ CONFIG_LOGO_SGI_CLUT224=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=m</div><div class='hunk'>@@ -919,7 +969,6 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> CONFIG_XFS_QUOTA=y</div><div class='ctx'> CONFIG_XFS_SECURITY=y</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='hunk'>@@ -928,6 +977,7 @@ CONFIG_XFS_SECURITY=y</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> CONFIG_QUOTA=y</div><div class='ctx'> # CONFIG_QFMT_V1 is not set</div><div class='ctx'> CONFIG_QFMT_V2=m</div><div class='hunk'>@@ -984,6 +1034,8 @@ CONFIG_EFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> CONFIG_UFS_FS=m</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network File Systems</div><div class='hunk'>@@ -1013,7 +1065,9 @@ CONFIG_SMB_NLS_DEFAULT=y</div><div class='ctx'> CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> CONFIG_CIFS=m</div><div class='ctx'> # CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_WEAK_PW_HASH is not set</div><div class='ctx'> # CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='hunk'>@@ -1096,6 +1150,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1155,3 +1210,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig<br/>index f724b4b2ecf2..4bf1ee7f5f00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ip27_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ip27_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ip27_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ip27_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:04 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:10 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> CONFIG_SGI_IP27=y</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -63,16 +64,17 @@ CONFIG_SGI_IP27=y</div><div class='ctx'> # CONFIG_TOSHIBA_JMR3927 is not set</div><div class='ctx'> # CONFIG_TOSHIBA_RBTX4927 is not set</div><div class='ctx'> # CONFIG_TOSHIBA_RBTX4938 is not set</div><div class='del'>-# CONFIG_SGI_SN0_N_MODE is not set</div><div class='del'>-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y</div><div class='del'>-CONFIG_NUMA=y</div><div class='add'>+CONFIG_SGI_SN_M_MODE=y</div><div class='add'>+# CONFIG_SGI_SN_N_MODE is not set</div><div class='ctx'> # CONFIG_MAPPED_KERNEL is not set</div><div class='ctx'> # CONFIG_REPLICATE_KTEXT is not set</div><div class='ctx'> # CONFIG_REPLICATE_EXHANDLERS is not set</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARC=y</div><div class='ctx'> CONFIG_DMA_IP27=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -119,12 +121,19 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='add'>+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y</div><div class='add'>+CONFIG_NUMA=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_NUMA=y</div><div class='ctx'> CONFIG_NODES_SHIFT=6</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> # CONFIG_FLATMEM_MANUAL is not set</div><div class='hunk'>@@ -136,13 +145,25 @@ CONFIG_NEED_MULTIPLE_NODES=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> CONFIG_MIGRATION=y</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=64</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_PREEMPT_BKL=y</div><div class='ctx'> # CONFIG_MIPS_INSANE_LARGE is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -176,10 +197,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -276,6 +299,8 @@ CONFIG_IP_PNP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -283,6 +308,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -380,6 +406,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -472,6 +499,7 @@ CONFIG_SCSI_SAS_ATTRS=m</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -495,9 +523,8 @@ CONFIG_MD_LINEAR=m</div><div class='ctx'> CONFIG_MD_RAID0=y</div><div class='ctx'> CONFIG_MD_RAID1=y</div><div class='ctx'> CONFIG_MD_RAID10=m</div><div class='del'>-CONFIG_MD_RAID5=y</div><div class='add'>+CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_RAID6=m</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> CONFIG_MD_FAULTY=m</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='hunk'>@@ -553,6 +580,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -560,8 +589,6 @@ CONFIG_CICADA_PHY=m</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='ctx'> CONFIG_SGI_IOC3_ETH=y</div><div class='del'>-CONFIG_SGI_IOC3_ETH_HW_RX_CSUM=y</div><div class='del'>-CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='hunk'>@@ -598,6 +625,7 @@ CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -688,6 +716,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> CONFIG_SGI_IP27_RTC=y</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='hunk'>@@ -737,6 +766,7 @@ CONFIG_SGI_IP27_RTC=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -746,6 +776,7 @@ CONFIG_SGI_IP27_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -803,6 +834,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -829,6 +873,7 @@ CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_QUOTACTL=y</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -896,6 +941,7 @@ CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -937,6 +983,7 @@ CONFIG_SGI_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=15</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -992,3 +1039,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig<br/>index 8f11d3565b2d..f83dc09c3ca9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ip32_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ip32_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ip32_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ip32_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:05 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:11 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> CONFIG_SGI_IP32=y</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARC=y</div><div class='ctx'> CONFIG_DMA_IP32=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='hunk'>@@ -122,7 +124,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_R5000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -136,9 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -171,10 +187,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -263,6 +281,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -270,6 +290,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -329,6 +350,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -427,6 +449,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -491,6 +514,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -534,6 +559,7 @@ CONFIG_SGI_O2MACE_ETH=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -613,6 +639,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -644,6 +671,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -692,6 +720,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -701,6 +730,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -764,6 +794,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -778,6 +821,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -843,6 +887,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -880,6 +925,7 @@ CONFIG_SGI_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -921,7 +967,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -936,3 +981,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig<br/>index 757adf23853d..a91d72a9ca86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/it8172_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/it8172_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/it8172_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/it8172_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:05 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:11 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_ITE8172=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_ITE8172=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -116,7 +118,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -130,9 +135,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,14 +181,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -259,6 +276,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -266,6 +285,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -325,6 +345,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -506,6 +527,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -594,6 +617,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_QTRONIX_KEYBOARD is not set</div><div class='ctx'> # CONFIG_IT8172_SCR0 is not set</div><div class='hunk'>@@ -627,6 +651,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -673,6 +698,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -682,6 +708,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -756,6 +783,19 @@ CONFIG_SOUND_IT8172=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -770,6 +810,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -835,6 +876,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -861,6 +903,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -916,3 +959,4 @@ CONFIG_CRC32=m</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig<br/>index 021761a8a237..cebc67212d06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ivr_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ivr_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ivr_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ivr_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:06 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:12 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_IVR=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_IVR=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -113,7 +115,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -127,9 +132,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -162,10 +178,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -256,6 +274,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -263,6 +283,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -322,6 +343,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -440,6 +462,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -482,6 +506,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -559,6 +584,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> CONFIG_QTRONIX_KEYBOARD=y</div><div class='ctx'> CONFIG_IT8172_SCR0=y</div><div class='hunk'>@@ -593,6 +619,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -640,6 +667,7 @@ CONFIG_RTC=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -649,6 +677,7 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -712,6 +741,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -726,6 +768,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -789,6 +832,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -815,6 +859,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -870,3 +915,4 @@ CONFIG_CRC32=m</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig<br/>index 08f6c30b0abc..5d9eb11aba3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/jaguar-atx_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/jaguar-atx_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/jaguar-atx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/jaguar-atx_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:06 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:12 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> CONFIG_MOMENCO_JAGUAR_ATX=y</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MOMENCO_JAGUAR_ATX=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_LIMITED_DMA=y</div><div class='hunk'>@@ -122,7 +124,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -136,10 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='del'>-# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -170,10 +185,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -260,6 +277,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -272,7 +291,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='hunk'>@@ -308,6 +330,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -402,6 +425,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -423,6 +448,7 @@ CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='ctx'> # CONFIG_AMD8111_ETH is not set</div><div class='ctx'> # CONFIG_ADAPTEC_STARFIRE is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='ctx'> # CONFIG_FORCEDETH is not set</div><div class='ctx'> # CONFIG_DGRS is not set</div><div class='ctx'> CONFIG_EEPRO100=y</div><div class='hunk'>@@ -463,6 +489,7 @@ CONFIG_MV643XX_ETH_2=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -540,6 +567,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -586,6 +614,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -595,6 +624,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -651,6 +681,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EXT2_FS is not set</div><div class='hunk'>@@ -662,6 +705,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -714,6 +758,7 @@ CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> </div><div class='hunk'>@@ -733,6 +778,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -788,3 +834,4 @@ CONFIG_CRC32=m</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig<br/>index 38b1e026e10d..be45a9044d06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/jmr3927_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/jmr3927_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/jmr3927_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/jmr3927_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:07 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:12 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -112,7 +114,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -125,10 +130,21 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_RTC_DS1742=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -160,10 +176,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -249,6 +267,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -256,6 +276,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -315,6 +336,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -412,6 +434,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -454,6 +478,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -531,6 +556,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_COMPUTONE is not set</div><div class='ctx'> # CONFIG_ROCKETPORT is not set</div><div class='hunk'>@@ -575,6 +601,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -623,6 +650,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -632,12 +660,13 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> # CONFIG_FB_CFB_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_CFB_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_CIRRUS is not set</div><div class='hunk'>@@ -730,6 +759,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EXT2_FS is not set</div><div class='hunk'>@@ -742,6 +784,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -805,6 +848,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -831,6 +875,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -872,7 +917,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -887,3 +931,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig<br/>index 4d25990a0a05..64dc9f45a19c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/lasat200_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/lasat200_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/lasat200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/lasat200_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:07 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:12 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_LASAT=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_LASAT=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -71,6 +72,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_MIPS_NILE4=y</div><div class='hunk'>@@ -119,7 +121,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_R5000_CPU_SCACHE=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -134,9 +139,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -168,14 +184,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -259,6 +276,8 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -266,6 +285,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -325,6 +345,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -548,6 +569,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -590,6 +613,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -667,6 +691,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -698,6 +723,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -746,6 +772,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -755,6 +782,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -818,6 +846,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -838,6 +879,7 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -904,6 +946,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -930,6 +973,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -985,3 +1029,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig<br/>index 977f52be51dc..2690baf15a85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/malta_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/malta_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/malta_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/malta_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:08 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:13 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> CONFIG_MIPS_MALTA=y</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_MALTA=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='hunk'>@@ -128,19 +130,21 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='add'>+CONFIG_BOARD_SCACHE=y</div><div class='add'>+CONFIG_MIPS_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-CONFIG_MIPS_MT=y</div><div class='add'>+# CONFIG_MIPS_MT_DISABLED is not set</div><div class='ctx'> # CONFIG_MIPS_MT_SMTC is not set</div><div class='ctx'> # CONFIG_MIPS_MT_SMP is not set</div><div class='ctx'> CONFIG_MIPS_VPE_LOADER=y</div><div class='add'>+CONFIG_MIPS_MT=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_MULTITHREADING=y</div><div class='ctx'> CONFIG_MIPS_MT_FPAFF=y</div><div class='ctx'> CONFIG_MIPS_VPE_LOADER_TOM=y</div><div class='ctx'> CONFIG_MIPS_VPE_APSP_API=y</div><div class='ctx'> CONFIG_MIPS_APSP_KSPD=y</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='del'>-# CONFIG_CPU_MIPSR2_IRQ_VI is not set</div><div class='del'>-# CONFIG_CPU_MIPSR2_IRQ_EI is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -154,9 +158,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+CONFIG_HZ_100=y</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=100</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -188,10 +203,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -293,6 +310,8 @@ CONFIG_INET_ESP=m</div><div class='ctx'> CONFIG_INET_IPCOMP=m</div><div class='ctx'> CONFIG_INET_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -340,7 +359,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> CONFIG_BRIDGE_NETFILTER=y</div><div class='hunk'>@@ -357,6 +379,8 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='hunk'>@@ -372,9 +396,11 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -384,6 +410,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_IP_NF_CT_ACCT=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_NETLINK=m</div><div class='ctx'> CONFIG_IP_NF_CT_PROTO_SCTP=m</div><div class='hunk'>@@ -394,6 +421,7 @@ CONFIG_IP_NF_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_H323=m</div><div class='add'>+CONFIG_IP_NF_SIP=m</div><div class='ctx'> CONFIG_IP_NF_QUEUE=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_IPRANGE=m</div><div class='hunk'>@@ -424,6 +452,7 @@ CONFIG_IP_NF_NAT_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_NAT_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_H323=m</div><div class='add'>+CONFIG_IP_NF_NAT_SIP=m</div><div class='ctx'> CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TOS=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='hunk'>@@ -585,6 +614,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -739,6 +769,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -763,9 +794,8 @@ CONFIG_MD_LINEAR=m</div><div class='ctx'> CONFIG_MD_RAID0=m</div><div class='ctx'> CONFIG_MD_RAID1=m</div><div class='ctx'> CONFIG_MD_RAID10=m</div><div class='del'>-CONFIG_MD_RAID5=m</div><div class='add'>+CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-CONFIG_MD_RAID6=m</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> CONFIG_MD_FAULTY=m</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='hunk'>@@ -821,6 +851,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -883,6 +915,7 @@ CONFIG_PCNET32=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -961,6 +994,7 @@ CONFIG_SERIO_SERPORT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -992,6 +1026,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -1039,6 +1074,7 @@ CONFIG_RTC=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -1048,6 +1084,7 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1111,6 +1148,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1136,7 +1186,6 @@ CONFIG_JFS_SECURITY=y</div><div class='ctx'> # CONFIG_JFS_STATISTICS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> CONFIG_XFS_QUOTA=y</div><div class='ctx'> CONFIG_XFS_SECURITY=y</div><div class='ctx'> CONFIG_XFS_POSIX_ACL=y</div><div class='hunk'>@@ -1145,6 +1194,7 @@ CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> CONFIG_QUOTA=y</div><div class='ctx'> # CONFIG_QFMT_V1 is not set</div><div class='ctx'> CONFIG_QFMT_V2=y</div><div class='hunk'>@@ -1202,6 +1252,8 @@ CONFIG_VXFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> CONFIG_SYSV_FS=m</div><div class='ctx'> CONFIG_UFS_FS=m</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network File Systems</div><div class='hunk'>@@ -1226,6 +1278,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1291,6 +1344,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1349,3 +1403,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig<br/>index 00560e0143f1..c298979c18ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/mipssim_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/mipssim_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/mipssim_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/mipssim_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:09 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:13 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> CONFIG_MIPS_SIM=y</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_SIM=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -115,14 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-CONFIG_MIPS_MT=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='ctx'> # CONFIG_MIPS_MT_SMTC is not set</div><div class='ctx'> # CONFIG_MIPS_MT_SMP is not set</div><div class='del'>-CONFIG_MIPS_VPE_LOADER=y</div><div class='del'>-CONFIG_MIPS_MT_FPAFF=y</div><div class='del'>-CONFIG_MIPS_VPE_LOADER_TOM=y</div><div class='del'>-CONFIG_MIPS_VPE_APSP_API=y</div><div class='del'>-CONFIG_MIPS_APSP_KSPD=y</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -138,9 +136,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -173,10 +182,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -272,6 +283,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -279,6 +292,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -374,6 +388,7 @@ CONFIG_NET_ESTIMATOR=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -558,6 +573,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -588,7 +604,6 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -604,6 +619,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -613,6 +629,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -668,6 +685,19 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -678,7 +708,6 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='del'>-# CONFIG_OCFS2_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=y</div><div class='ctx'> # CONFIG_INOTIFY is not set</div><div class='hunk'>@@ -746,6 +775,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -772,14 +802,19 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DETECT_SOFTLOCKUP is not set</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_INFO=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='hunk'>@@ -837,3 +872,4 @@ CONFIG_CRYPTO_MD5=y</div><div class='ctx'> CONFIG_CRC16=y</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig<br/>index 286a018375b2..938b38ab5239 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/mpc30x_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/mpc30x_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/mpc30x_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/mpc30x_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:09 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:15 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -75,6 +76,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -119,7 +121,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -132,9 +137,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -166,10 +182,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -271,6 +289,8 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -278,6 +298,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -338,6 +359,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -476,6 +498,7 @@ CONFIG_MII=m</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -524,8 +547,10 @@ CONFIG_PCMCIA_HERMES=m</div><div class='ctx'> # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRISM54 is not set</div><div class='add'>+# CONFIG_USB_ZD1201 is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='ctx'> # CONFIG_BCM43XX is not set</div><div class='add'>+# CONFIG_ZD1211RW is not set</div><div class='ctx'> CONFIG_NET_WIRELESS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -607,6 +632,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -632,6 +658,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -688,6 +715,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -698,6 +726,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -791,7 +820,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> CONFIG_USB_PEGASUS=m</div><div class='ctx'> # CONFIG_USB_RTL8150 is not set</div><div class='ctx'> # CONFIG_USB_USBNET is not set</div><div class='del'>-# CONFIG_USB_ZD1201 is not set</div><div class='ctx'> # CONFIG_USB_MON is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -813,10 +841,12 @@ CONFIG_USB_PEGASUS=m</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='ctx'> </div><div class='hunk'>@@ -862,6 +892,19 @@ CONFIG_USB_PEGASUS=m</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -876,6 +919,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='hunk'>@@ -938,6 +982,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -964,6 +1009,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1019,3 +1065,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig<br/>index 1ce4310fd92a..ec5758f22676 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_3_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_3_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_3_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ocelot_3_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:10 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:15 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MOMENCO_OCELOT_3=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -120,7 +122,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -136,10 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='del'>-# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -172,10 +187,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -266,6 +283,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -284,7 +303,10 @@ CONFIG_IPV6_ROUTE_INFO=y</div><div class='ctx'> # CONFIG_INET6_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> # CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -299,6 +321,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -309,8 +332,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -386,6 +411,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -476,6 +502,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -541,6 +568,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -607,6 +636,7 @@ CONFIG_MV643XX_ETH_2=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -690,6 +720,7 @@ CONFIG_SERIO=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -721,6 +752,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -768,6 +800,7 @@ CONFIG_RTC=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -777,12 +810,13 @@ CONFIG_RTC=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> # CONFIG_FB_CFB_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_CFB_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_CIRRUS is not set</div><div class='hunk'>@@ -882,6 +916,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -901,7 +948,6 @@ CONFIG_REISERFS_FS=m</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> # CONFIG_XFS_QUOTA is not set</div><div class='ctx'> # CONFIG_XFS_SECURITY is not set</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='hunk'>@@ -910,6 +956,7 @@ CONFIG_XFS_EXPORT=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='hunk'>@@ -981,6 +1028,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1046,6 +1094,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1104,3 +1153,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig<br/>index 8a6aa5012f89..0d33d87de1a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_c_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_c_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_c_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ocelot_c_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:10 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:16 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MOMENCO_OCELOT_C=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -118,7 +120,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -133,9 +138,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -167,10 +183,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -258,6 +276,8 @@ CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -265,6 +285,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -324,6 +345,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -421,6 +443,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -464,6 +488,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -541,6 +566,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -572,6 +598,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -620,6 +647,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -629,6 +657,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -692,6 +721,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -706,6 +748,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -772,6 +815,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -798,6 +842,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -839,7 +884,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -854,3 +898,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig<br/>index f9ee35eeb762..4b999102715e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ocelot_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:11 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:16 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> CONFIG_MOMENCO_OCELOT=y</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MOMENCO_OCELOT=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -121,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -137,9 +142,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -171,10 +187,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -258,6 +276,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -265,6 +285,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -324,6 +345,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -409,6 +431,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -497,6 +521,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -526,6 +551,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -572,6 +598,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -581,6 +608,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -642,6 +670,19 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -656,6 +697,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -722,6 +764,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -748,6 +791,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -789,7 +833,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -804,3 +847,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig<br/>index b48bdee2411f..827b344f6010 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_g_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ocelot_g_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/ocelot_g_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/ocelot_g_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:11 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:16 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MOMENCO_OCELOT_G=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='hunk'>@@ -121,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_RM7000_CPU_SCACHE=y</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -136,9 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -170,10 +186,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -261,6 +279,8 @@ CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -268,6 +288,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -327,6 +348,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -424,6 +446,8 @@ CONFIG_DAVICOM_PHY=y</div><div class='ctx'> CONFIG_QSEMI_PHY=y</div><div class='ctx'> CONFIG_LXT_PHY=y</div><div class='ctx'> CONFIG_CICADA_PHY=y</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+CONFIG_SMSC_PHY=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -467,6 +491,7 @@ CONFIG_GALILEO_64240_ETH=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -544,6 +569,7 @@ CONFIG_SERIO_RAW=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -575,6 +601,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -623,6 +650,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -632,6 +660,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -695,6 +724,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -709,6 +751,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -775,6 +818,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -801,6 +845,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -842,7 +887,6 @@ CONFIG_CRYPTO_ANUBIS=y</div><div class='ctx'> CONFIG_CRYPTO_DEFLATE=y</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='ctx'> CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -857,3 +901,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig<br/>index 01aac40634b4..9ed60fef69e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1100_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pb1100_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1100_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/pb1100_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:12 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:17 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS_PB1100=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_PB1100=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_PB1100=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -116,7 +118,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -132,9 +137,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -166,14 +182,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -271,6 +288,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -283,6 +302,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -297,6 +317,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -307,8 +328,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -378,6 +401,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -537,6 +561,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -640,6 +666,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> # CONFIG_AU1X00_GPIO is not set</div><div class='ctx'> # CONFIG_TS_AU1X00_ADS7846 is not set</div><div class='hunk'>@@ -673,6 +700,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -726,6 +754,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -735,6 +764,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -797,6 +827,19 @@ CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -824,6 +867,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -893,6 +937,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -958,6 +1003,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1017,3 +1063,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig<br/>index 398c3c265b9f..6774254b1be6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1500_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pb1500_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1500_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/pb1500_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:13 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:17 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS_PB1500=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_PB1500=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_PB1500=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -115,7 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -131,9 +136,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,14 +181,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -276,6 +293,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -288,6 +307,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -302,6 +322,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -312,8 +333,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -383,6 +406,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -597,7 +621,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -607,6 +631,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -651,6 +677,7 @@ CONFIG_MIPS_AU1X00_ENET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -782,6 +809,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -837,6 +865,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -846,6 +875,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -903,6 +933,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -930,6 +973,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -999,6 +1043,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1064,6 +1109,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1123,3 +1169,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig<br/>index ea282a53bb66..1afe5bf6e765 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1550_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pb1550_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pb1550_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/pb1550_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:13 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:17 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS_PB1550=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS_PB1550=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_PB1550=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y</div><div class='hunk'>@@ -115,7 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_64BIT_PHYS_ADDR=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -131,9 +136,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,14 +181,15 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -276,6 +293,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -288,6 +307,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -302,6 +322,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -312,8 +333,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -383,6 +406,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -597,7 +621,7 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_PHYLIB=m</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='hunk'>@@ -607,6 +631,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -651,6 +677,7 @@ CONFIG_MIPS_AU1X00_ENET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -774,6 +801,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -829,6 +857,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -838,6 +867,7 @@ CONFIG_SYNCLINK_CS=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -895,6 +925,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -922,6 +965,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=m</div><div class='hunk'>@@ -991,6 +1035,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1056,6 +1101,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1115,3 +1161,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig<br/>index 4c57e564db0b..ac616c82d348 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-jbs_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pnx8550-jbs_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-jbs_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/pnx8550-jbs_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:14 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:18 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -40,14 +42,13 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT_G is not set</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='del'>-CONFIG_PNX8550_JBS=y</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='add'>+# CONFIG_PNX8550_JBS is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='del'>-# CONFIG_SGI_IP22 is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='add'>+CONFIG_SGI_IP22=y</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='ctx'> # CONFIG_SIBYTE_BIGSUR is not set</div><div class='hunk'>@@ -67,19 +68,25 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARC=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='del'>-# CONFIG_CPU_BIG_ENDIAN is not set</div><div class='del'>-CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='del'>-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y</div><div class='del'>-CONFIG_PNX8550=y</div><div class='del'>-CONFIG_SOC_PNX8550=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+# CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y</div><div class='add'>+CONFIG_IRQ_CPU=y</div><div class='add'>+CONFIG_SWAP_IO_SPACE=y</div><div class='add'>+CONFIG_ARC32=y</div><div class='add'>+CONFIG_BOOT_ELF32=y</div><div class='ctx'> CONFIG_MIPS_L1_CACHE_SHIFT=5</div><div class='add'>+# CONFIG_ARC_CONSOLE is not set</div><div class='add'>+CONFIG_ARC_PROMLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU selection</div><div class='ctx'> #</div><div class='del'>-CONFIG_CPU_MIPS32_R1=y</div><div class='add'>+# CONFIG_CPU_MIPS32_R1 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS32_R2 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS64_R1 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS64_R2 is not set</div><div class='hunk'>@@ -87,7 +94,7 @@ CONFIG_CPU_MIPS32_R1=y</div><div class='ctx'> # CONFIG_CPU_TX39XX is not set</div><div class='ctx'> # CONFIG_CPU_VR41XX is not set</div><div class='ctx'> # CONFIG_CPU_R4300 is not set</div><div class='del'>-# CONFIG_CPU_R4X00 is not set</div><div class='add'>+CONFIG_CPU_R4X00=y</div><div class='ctx'> # CONFIG_CPU_TX49XX is not set</div><div class='ctx'> # CONFIG_CPU_R5000 is not set</div><div class='ctx'> # CONFIG_CPU_R5432 is not set</div><div class='hunk'>@@ -98,11 +105,12 @@ CONFIG_CPU_MIPS32_R1=y</div><div class='ctx'> # CONFIG_CPU_RM7000 is not set</div><div class='ctx'> # CONFIG_CPU_RM9000 is not set</div><div class='ctx'> # CONFIG_CPU_SB1 is not set</div><div class='del'>-CONFIG_SYS_HAS_CPU_MIPS32_R1=y</div><div class='del'>-CONFIG_CPU_MIPS32=y</div><div class='del'>-CONFIG_CPU_MIPSR1=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_R4X00=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_R5000=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel type</div><div class='hunk'>@@ -113,14 +121,17 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_BOARD_SCACHE=y</div><div class='add'>+CONFIG_IP22_CPU_SCACHE=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='del'>-CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='hunk'>@@ -130,9 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -166,10 +188,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -206,9 +230,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> # Bus options (PCI, PCMCIA, EISA, ISA, TC)</div><div class='ctx'> #</div><div class='del'>-CONFIG_HW_HAS_PCI=y</div><div class='del'>-CONFIG_PCI=y</div><div class='del'>-# CONFIG_PCI_DEBUG is not set</div><div class='add'>+CONFIG_HW_HAS_EISA=y</div><div class='add'>+# CONFIG_EISA is not set</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -219,7 +242,6 @@ CONFIG_MMU=y</div><div class='ctx'> #</div><div class='ctx'> # PCI Hotplug Support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='hunk'>@@ -240,6 +262,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -258,6 +282,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -265,6 +291,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -319,6 +346,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -342,16 +370,10 @@ CONFIG_FW_LOADER=y</div><div class='ctx'> #</div><div class='ctx'> # Block devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BLK_CPQ_DA is not set</div><div class='del'>-# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='del'>-# CONFIG_BLK_DEV_DAC960 is not set</div><div class='del'>-# CONFIG_BLK_DEV_UMEM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='del'>-# CONFIG_BLK_DEV_SX8 is not set</div><div class='del'>-# CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='hunk'>@@ -381,38 +403,8 @@ CONFIG_BLK_DEV_IDESCSI=y</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IDE_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='del'>-CONFIG_BLK_DEV_OFFBOARD=y</div><div class='del'>-CONFIG_BLK_DEV_GENERIC=y</div><div class='del'>-# CONFIG_BLK_DEV_OPTI621 is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='del'>-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set</div><div class='del'>-# CONFIG_IDEDMA_PCI_AUTO is not set</div><div class='del'>-# CONFIG_BLK_DEV_AEC62XX is not set</div><div class='del'>-# CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='del'>-# CONFIG_BLK_DEV_AMD74XX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CMD64X is not set</div><div class='del'>-# CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='del'>-# CONFIG_BLK_DEV_CS5520 is not set</div><div class='del'>-# CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='del'>-CONFIG_BLK_DEV_HPT366=y</div><div class='del'>-# CONFIG_BLK_DEV_SC1200 is not set</div><div class='del'>-# CONFIG_BLK_DEV_PIIX is not set</div><div class='del'>-# CONFIG_BLK_DEV_IT821X is not set</div><div class='del'>-# CONFIG_BLK_DEV_NS87415 is not set</div><div class='del'>-# CONFIG_BLK_DEV_PDC202XX_OLD is not set</div><div class='del'>-# CONFIG_BLK_DEV_PDC202XX_NEW is not set</div><div class='del'>-# CONFIG_BLK_DEV_SVWKS is not set</div><div class='del'>-# CONFIG_BLK_DEV_SIIMAGE is not set</div><div class='del'>-# CONFIG_BLK_DEV_SLC90E66 is not set</div><div class='del'>-# CONFIG_BLK_DEV_TRM290 is not set</div><div class='del'>-# CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_IDE_ARM is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_IDEDMA_IVB is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='ctx'> # CONFIG_IDEDMA_AUTO is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='hunk'>@@ -452,31 +444,8 @@ CONFIG_SCSI_ISCSI_ATTRS=m</div><div class='ctx'> # SCSI low-level drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='del'>-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='del'>-# CONFIG_SCSI_3W_9XXX is not set</div><div class='del'>-# CONFIG_SCSI_ACARD is not set</div><div class='del'>-# CONFIG_SCSI_AACRAID is not set</div><div class='del'>-# CONFIG_SCSI_AIC7XXX is not set</div><div class='del'>-# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='del'>-# CONFIG_SCSI_AIC79XX is not set</div><div class='del'>-# CONFIG_SCSI_DPT_I2O is not set</div><div class='del'>-# CONFIG_MEGARAID_NEWGEN is not set</div><div class='del'>-# CONFIG_MEGARAID_LEGACY is not set</div><div class='del'>-# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SGIWD93_SCSI is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='del'>-# CONFIG_SCSI_DMX3191D is not set</div><div class='del'>-# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='del'>-# CONFIG_SCSI_IPS is not set</div><div class='del'>-# CONFIG_SCSI_INITIO is not set</div><div class='del'>-# CONFIG_SCSI_INIA100 is not set</div><div class='del'>-# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='del'>-# CONFIG_SCSI_IPR is not set</div><div class='del'>-# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='del'>-# CONFIG_SCSI_QLA_FC is not set</div><div class='del'>-# CONFIG_SCSI_LPFC is not set</div><div class='del'>-# CONFIG_SCSI_DC395x is not set</div><div class='del'>-# CONFIG_SCSI_DC390T is not set</div><div class='del'>-# CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -488,19 +457,14 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> # Fusion MPT device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='del'>-# CONFIG_FUSION_SPI is not set</div><div class='del'>-# CONFIG_FUSION_FC is not set</div><div class='del'>-# CONFIG_FUSION_SAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2O device support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2O is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network device support</div><div class='hunk'>@@ -512,11 +476,6 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# ARCnet devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_ARCNET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='hunk'>@@ -526,71 +485,20 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='del'>-# CONFIG_HAPPYMEAL is not set</div><div class='del'>-# CONFIG_SUNGEM is not set</div><div class='del'>-# CONFIG_CASSINI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> # CONFIG_DM9000 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Tulip family network device support</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_TULIP is not set</div><div class='del'>-# CONFIG_HP100 is not set</div><div class='del'>-CONFIG_NET_PCI=y</div><div class='del'>-# CONFIG_PCNET32 is not set</div><div class='del'>-# CONFIG_AMD8111_ETH is not set</div><div class='del'>-# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='del'>-# CONFIG_B44 is not set</div><div class='del'>-# CONFIG_FORCEDETH is not set</div><div class='del'>-# CONFIG_DGRS is not set</div><div class='del'>-# CONFIG_EEPRO100 is not set</div><div class='del'>-# CONFIG_E100 is not set</div><div class='del'>-# CONFIG_FEALNX is not set</div><div class='del'>-# CONFIG_NATSEMI is not set</div><div class='del'>-# CONFIG_NE2K_PCI is not set</div><div class='del'>-# CONFIG_8139CP is not set</div><div class='del'>-CONFIG_8139TOO=y</div><div class='del'>-# CONFIG_8139TOO_PIO is not set</div><div class='del'>-CONFIG_8139TOO_TUNE_TWISTER=y</div><div class='del'>-CONFIG_8139TOO_8129=y</div><div class='del'>-# CONFIG_8139_OLD_RX_RESET is not set</div><div class='del'>-# CONFIG_SIS900 is not set</div><div class='del'>-# CONFIG_EPIC100 is not set</div><div class='del'>-# CONFIG_SUNDANCE is not set</div><div class='del'>-# CONFIG_TLAN is not set</div><div class='del'>-# CONFIG_VIA_RHINE is not set</div><div class='del'>-# CONFIG_LAN_SAA9730 is not set</div><div class='add'>+# CONFIG_SGISEEQ is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (1000 Mbit)</div><div class='ctx'> #</div><div class='del'>-# CONFIG_ACENIC is not set</div><div class='del'>-# CONFIG_DL2K is not set</div><div class='del'>-# CONFIG_E1000 is not set</div><div class='del'>-# CONFIG_NS83820 is not set</div><div class='del'>-# CONFIG_HAMACHI is not set</div><div class='del'>-# CONFIG_YELLOWFIN is not set</div><div class='del'>-# CONFIG_R8169 is not set</div><div class='del'>-# CONFIG_SIS190 is not set</div><div class='del'>-# CONFIG_SKGE is not set</div><div class='del'>-# CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='del'>-# CONFIG_VIA_VELOCITY is not set</div><div class='del'>-# CONFIG_TIGON3 is not set</div><div class='del'>-# CONFIG_BNX2 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10000 Mbit)</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CHELSIO_T1 is not set</div><div class='del'>-# CONFIG_IXGB is not set</div><div class='del'>-# CONFIG_S2IO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN (non-hamradio)</div><div class='hunk'>@@ -601,11 +509,8 @@ CONFIG_8139TOO_8129=y</div><div class='ctx'> # Wan interfaces</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='del'>-# CONFIG_FDDI is not set</div><div class='del'>-# CONFIG_HIPPI is not set</div><div class='ctx'> # CONFIG_PPP is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_NET_FC is not set</div><div class='ctx'> # CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='hunk'>@@ -650,7 +555,6 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_SERIO=y</div><div class='ctx'> # CONFIG_SERIO_I8042 is not set</div><div class='ctx'> # CONFIG_SERIO_SERPORT is not set</div><div class='del'>-# CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='hunk'>@@ -661,6 +565,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -671,8 +576,7 @@ CONFIG_HW_CONSOLE=y</div><div class='ctx'> #</div><div class='ctx'> # Non-8250 serial port support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SERIAL_IP3106 is not set</div><div class='del'>-# CONFIG_SERIAL_JSM is not set</div><div class='add'>+# CONFIG_SERIAL_IP22_ZILOG is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='hunk'>@@ -686,16 +590,16 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='add'>+# CONFIG_SGI_DS1286 is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='del'>-# CONFIG_APPLICOM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ftape, the floppy tape device driver</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -718,13 +622,13 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> </div><div class='hunk'>@@ -736,22 +640,24 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DVB is not set</div><div class='del'>-# CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='add'>+# CONFIG_SGI_NEWPORT_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -762,126 +668,15 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> #</div><div class='ctx'> # USB support</div><div class='ctx'> #</div><div class='del'>-CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='del'>-CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Miscellaneous USB options</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_DEVICEFS is not set</div><div class='del'>-# CONFIG_USB_BANDWIDTH is not set</div><div class='del'>-# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='del'>-# CONFIG_USB_OTG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Host Controller Drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_EHCI_HCD is not set</div><div class='del'>-# CONFIG_USB_ISP116X_HCD is not set</div><div class='del'>-CONFIG_USB_OHCI_HCD=y</div><div class='del'>-# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='del'>-CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='del'>-# CONFIG_USB_UHCI_HCD is not set</div><div class='del'>-# CONFIG_USB_SL811_HCD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Device Class drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_ACM is not set</div><div class='del'>-# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# may also be needed; see USB_STORAGE Help for more information</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_STORAGE=y</div><div class='del'>-# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='del'>-CONFIG_USB_STORAGE_DATAFAB=y</div><div class='del'>-CONFIG_USB_STORAGE_FREECOM=y</div><div class='del'>-CONFIG_USB_STORAGE_ISD200=y</div><div class='del'>-CONFIG_USB_STORAGE_DPCM=y</div><div class='del'>-CONFIG_USB_STORAGE_USBAT=y</div><div class='del'>-CONFIG_USB_STORAGE_SDDR09=y</div><div class='del'>-CONFIG_USB_STORAGE_SDDR55=y</div><div class='del'>-CONFIG_USB_STORAGE_JUMPSHOT=y</div><div class='del'>-# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='del'>-# CONFIG_USB_LIBUSUAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Input Devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_HID is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB HID Boot Protocol drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_KBD is not set</div><div class='del'>-# CONFIG_USB_MOUSE is not set</div><div class='del'>-# CONFIG_USB_AIPTEK is not set</div><div class='del'>-# CONFIG_USB_WACOM is not set</div><div class='del'>-# CONFIG_USB_ACECAD is not set</div><div class='del'>-# CONFIG_USB_KBTAB is not set</div><div class='del'>-# CONFIG_USB_POWERMATE is not set</div><div class='del'>-# CONFIG_USB_TOUCHSCREEN is not set</div><div class='del'>-# CONFIG_USB_YEALINK is not set</div><div class='del'>-# CONFIG_USB_XPAD is not set</div><div class='del'>-# CONFIG_USB_ATI_REMOTE is not set</div><div class='del'>-# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='del'>-# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='del'>-# CONFIG_USB_APPLETOUCH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Imaging devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_MDC800 is not set</div><div class='del'>-# CONFIG_USB_MICROTEK is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Network Adapters</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_CATC is not set</div><div class='del'>-# CONFIG_USB_KAWETH is not set</div><div class='del'>-# CONFIG_USB_PEGASUS is not set</div><div class='del'>-# CONFIG_USB_RTL8150 is not set</div><div class='del'>-# CONFIG_USB_USBNET is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB port drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_SERIAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Miscellaneous drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_EMI62 is not set</div><div class='del'>-# CONFIG_USB_EMI26 is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='del'>-# CONFIG_USB_RIO500 is not set</div><div class='del'>-# CONFIG_USB_LEGOTOWER is not set</div><div class='del'>-# CONFIG_USB_LCD is not set</div><div class='del'>-# CONFIG_USB_LED is not set</div><div class='del'>-# CONFIG_USB_CYTHERM is not set</div><div class='del'>-# CONFIG_USB_PHIDGETKIT is not set</div><div class='del'>-# CONFIG_USB_PHIDGETSERVO is not set</div><div class='del'>-# CONFIG_USB_IDMOUSE is not set</div><div class='del'>-# CONFIG_USB_LD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # USB Gadget Support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -907,7 +702,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> #</div><div class='ctx'> # InfiniBand support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_INFINIBAND is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='hunk'>@@ -919,6 +713,19 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -933,6 +740,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -1004,6 +812,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1014,6 +823,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_SGI_PARTITION=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Native Language Support</div><div class='hunk'>@@ -1069,15 +879,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> CONFIG_DEBUG_SLAB=y</div><div class='ctx'> # CONFIG_DEBUG_SLAB_LEAK is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1137,3 +952,4 @@ CONFIG_CRC_CCITT=m</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig<br/>index 3c8f35162fec..a8eb51bae3f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-v2pci_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/pnx8550-v2pci_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/pnx8550-v2pci_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/pnx8550-v2pci_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:14 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:18 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -39,15 +41,14 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT_C is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT_G is not set</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='del'>-CONFIG_PNX8550_V2PCI=y</div><div class='add'>+# CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='del'>-# CONFIG_SGI_IP22 is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='add'>+CONFIG_SGI_IP22=y</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='ctx'> # CONFIG_SIBYTE_BIGSUR is not set</div><div class='hunk'>@@ -67,19 +68,25 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARC=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='del'>-# CONFIG_CPU_BIG_ENDIAN is not set</div><div class='del'>-CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='del'>-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y</div><div class='del'>-CONFIG_PNX8550=y</div><div class='del'>-CONFIG_SOC_PNX8550=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+# CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y</div><div class='add'>+CONFIG_IRQ_CPU=y</div><div class='add'>+CONFIG_SWAP_IO_SPACE=y</div><div class='add'>+CONFIG_ARC32=y</div><div class='add'>+CONFIG_BOOT_ELF32=y</div><div class='ctx'> CONFIG_MIPS_L1_CACHE_SHIFT=5</div><div class='add'>+# CONFIG_ARC_CONSOLE is not set</div><div class='add'>+CONFIG_ARC_PROMLIB=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU selection</div><div class='ctx'> #</div><div class='del'>-CONFIG_CPU_MIPS32_R1=y</div><div class='add'>+# CONFIG_CPU_MIPS32_R1 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS32_R2 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS64_R1 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS64_R2 is not set</div><div class='hunk'>@@ -87,7 +94,7 @@ CONFIG_CPU_MIPS32_R1=y</div><div class='ctx'> # CONFIG_CPU_TX39XX is not set</div><div class='ctx'> # CONFIG_CPU_VR41XX is not set</div><div class='ctx'> # CONFIG_CPU_R4300 is not set</div><div class='del'>-# CONFIG_CPU_R4X00 is not set</div><div class='add'>+CONFIG_CPU_R4X00=y</div><div class='ctx'> # CONFIG_CPU_TX49XX is not set</div><div class='ctx'> # CONFIG_CPU_R5000 is not set</div><div class='ctx'> # CONFIG_CPU_R5432 is not set</div><div class='hunk'>@@ -98,11 +105,12 @@ CONFIG_CPU_MIPS32_R1=y</div><div class='ctx'> # CONFIG_CPU_RM7000 is not set</div><div class='ctx'> # CONFIG_CPU_RM9000 is not set</div><div class='ctx'> # CONFIG_CPU_SB1 is not set</div><div class='del'>-CONFIG_SYS_HAS_CPU_MIPS32_R1=y</div><div class='del'>-CONFIG_CPU_MIPS32=y</div><div class='del'>-CONFIG_CPU_MIPSR1=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_R4X00=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_R5000=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel type</div><div class='hunk'>@@ -113,14 +121,17 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_BOARD_SCACHE=y</div><div class='add'>+CONFIG_IP22_CPU_SCACHE=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='del'>-CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='hunk'>@@ -130,9 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -165,10 +187,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -205,8 +229,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> # Bus options (PCI, PCMCIA, EISA, ISA, TC)</div><div class='ctx'> #</div><div class='del'>-CONFIG_HW_HAS_PCI=y</div><div class='del'>-CONFIG_PCI=y</div><div class='add'>+CONFIG_HW_HAS_EISA=y</div><div class='add'>+# CONFIG_EISA is not set</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -217,7 +241,6 @@ CONFIG_MMU=y</div><div class='ctx'> #</div><div class='ctx'> # PCI Hotplug Support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HOTPLUG_PCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='hunk'>@@ -238,6 +261,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> # CONFIG_IP_MULTICAST is not set</div><div class='hunk'>@@ -256,6 +281,8 @@ CONFIG_IP_PNP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -274,7 +301,10 @@ CONFIG_IPV6_ROUTE_INFO=y</div><div class='ctx'> # CONFIG_INET6_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> # CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -287,6 +317,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -294,10 +325,13 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_LIMIT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MAC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -367,6 +401,7 @@ CONFIG_NET_CLS_ROUTE=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -390,16 +425,10 @@ CONFIG_FW_LOADER=y</div><div class='ctx'> #</div><div class='ctx'> # Block devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_BLK_CPQ_DA is not set</div><div class='del'>-# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='del'>-# CONFIG_BLK_DEV_DAC960 is not set</div><div class='del'>-# CONFIG_BLK_DEV_UMEM is not set</div><div class='ctx'> # CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='ctx'> CONFIG_BLK_DEV_LOOP=y</div><div class='ctx'> # CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='del'>-# CONFIG_BLK_DEV_SX8 is not set</div><div class='del'>-# CONFIG_BLK_DEV_UB is not set</div><div class='ctx'> CONFIG_BLK_DEV_RAM=y</div><div class='ctx'> CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='ctx'> CONFIG_BLK_DEV_RAM_SIZE=8192</div><div class='hunk'>@@ -429,40 +458,9 @@ CONFIG_IDEDISK_MULTI_MODE=y</div><div class='ctx'> # IDE chipset support/bugfixes</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IDE_GENERIC=y</div><div class='del'>-CONFIG_BLK_DEV_IDEPCI=y</div><div class='del'>-CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='del'>-# CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='del'>-# CONFIG_BLK_DEV_GENERIC is not set</div><div class='del'>-# CONFIG_BLK_DEV_OPTI621 is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='del'>-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set</div><div class='del'>-CONFIG_IDEDMA_PCI_AUTO=y</div><div class='del'>-# CONFIG_IDEDMA_ONLYDISK is not set</div><div class='del'>-# CONFIG_BLK_DEV_AEC62XX is not set</div><div class='del'>-# CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='del'>-# CONFIG_BLK_DEV_AMD74XX is not set</div><div class='del'>-CONFIG_BLK_DEV_CMD64X=y</div><div class='del'>-# CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='del'>-# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='del'>-# CONFIG_BLK_DEV_CS5520 is not set</div><div class='del'>-# CONFIG_BLK_DEV_CS5530 is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT34X is not set</div><div class='del'>-# CONFIG_BLK_DEV_HPT366 is not set</div><div class='del'>-# CONFIG_BLK_DEV_SC1200 is not set</div><div class='del'>-# CONFIG_BLK_DEV_PIIX is not set</div><div class='del'>-# CONFIG_BLK_DEV_IT821X is not set</div><div class='del'>-# CONFIG_BLK_DEV_NS87415 is not set</div><div class='del'>-# CONFIG_BLK_DEV_PDC202XX_OLD is not set</div><div class='del'>-# CONFIG_BLK_DEV_PDC202XX_NEW is not set</div><div class='del'>-# CONFIG_BLK_DEV_SVWKS is not set</div><div class='del'>-# CONFIG_BLK_DEV_SIIMAGE is not set</div><div class='del'>-# CONFIG_BLK_DEV_SLC90E66 is not set</div><div class='del'>-# CONFIG_BLK_DEV_TRM290 is not set</div><div class='del'>-# CONFIG_BLK_DEV_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_IDE_ARM is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDMA=y</div><div class='del'>-# CONFIG_IDEDMA_IVB is not set</div><div class='del'>-CONFIG_IDEDMA_AUTO=y</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='add'>+# CONFIG_IDEDMA_AUTO is not set</div><div class='ctx'> # CONFIG_BLK_DEV_HD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -501,36 +499,8 @@ CONFIG_SCSI_ISCSI_ATTRS=m</div><div class='ctx'> # SCSI low-level drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_ISCSI_TCP=m</div><div class='del'>-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='del'>-# CONFIG_SCSI_3W_9XXX is not set</div><div class='del'>-# CONFIG_SCSI_ACARD is not set</div><div class='del'>-# CONFIG_SCSI_AACRAID is not set</div><div class='del'>-CONFIG_SCSI_AIC7XXX=m</div><div class='del'>-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32</div><div class='del'>-CONFIG_AIC7XXX_RESET_DELAY_MS=15000</div><div class='del'>-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set</div><div class='del'>-CONFIG_AIC7XXX_DEBUG_MASK=0</div><div class='del'>-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set</div><div class='del'>-# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='del'>-# CONFIG_SCSI_AIC79XX is not set</div><div class='del'>-# CONFIG_SCSI_DPT_I2O is not set</div><div class='del'>-# CONFIG_MEGARAID_NEWGEN is not set</div><div class='del'>-# CONFIG_MEGARAID_LEGACY is not set</div><div class='del'>-# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SGIWD93_SCSI is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='del'>-# CONFIG_SCSI_DMX3191D is not set</div><div class='del'>-# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='del'>-# CONFIG_SCSI_IPS is not set</div><div class='del'>-# CONFIG_SCSI_INITIO is not set</div><div class='del'>-# CONFIG_SCSI_INIA100 is not set</div><div class='del'>-# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='del'>-# CONFIG_SCSI_IPR is not set</div><div class='del'>-# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='del'>-# CONFIG_SCSI_QLA_FC is not set</div><div class='del'>-# CONFIG_SCSI_LPFC is not set</div><div class='del'>-# CONFIG_SCSI_DC395x is not set</div><div class='del'>-# CONFIG_SCSI_DC390T is not set</div><div class='del'>-# CONFIG_SCSI_NSP32 is not set</div><div class='ctx'> # CONFIG_SCSI_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -542,19 +512,14 @@ CONFIG_AIC7XXX_DEBUG_MASK=0</div><div class='ctx'> # Fusion MPT device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_FUSION is not set</div><div class='del'>-# CONFIG_FUSION_SPI is not set</div><div class='del'>-# CONFIG_FUSION_FC is not set</div><div class='del'>-# CONFIG_FUSION_SAS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IEEE 1394 (FireWire) support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_IEEE1394 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2O device support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2O is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network device support</div><div class='hunk'>@@ -566,11 +531,6 @@ CONFIG_NETDEVICES=y</div><div class='ctx'> CONFIG_TUN=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# ARCnet devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_ARCNET is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # PHY device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PHYLIB is not set</div><div class='hunk'>@@ -580,71 +540,20 @@ CONFIG_TUN=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='ctx'> CONFIG_MII=y</div><div class='del'>-# CONFIG_HAPPYMEAL is not set</div><div class='del'>-# CONFIG_SUNGEM is not set</div><div class='del'>-# CONFIG_CASSINI is not set</div><div class='del'>-# CONFIG_NET_VENDOR_3COM is not set</div><div class='ctx'> # CONFIG_DM9000 is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Tulip family network device support</div><div class='del'>-#</div><div class='del'>-# CONFIG_NET_TULIP is not set</div><div class='del'>-# CONFIG_HP100 is not set</div><div class='del'>-CONFIG_NET_PCI=y</div><div class='del'>-# CONFIG_PCNET32 is not set</div><div class='del'>-# CONFIG_AMD8111_ETH is not set</div><div class='del'>-# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='del'>-# CONFIG_B44 is not set</div><div class='del'>-# CONFIG_FORCEDETH is not set</div><div class='del'>-# CONFIG_DGRS is not set</div><div class='del'>-# CONFIG_EEPRO100 is not set</div><div class='del'>-# CONFIG_E100 is not set</div><div class='del'>-# CONFIG_FEALNX is not set</div><div class='del'>-CONFIG_NATSEMI=y</div><div class='del'>-# CONFIG_NE2K_PCI is not set</div><div class='del'>-# CONFIG_8139CP is not set</div><div class='del'>-CONFIG_8139TOO=y</div><div class='del'>-# CONFIG_8139TOO_PIO is not set</div><div class='del'>-# CONFIG_8139TOO_TUNE_TWISTER is not set</div><div class='del'>-# CONFIG_8139TOO_8129 is not set</div><div class='del'>-# CONFIG_8139_OLD_RX_RESET is not set</div><div class='del'>-# CONFIG_SIS900 is not set</div><div class='del'>-# CONFIG_EPIC100 is not set</div><div class='del'>-# CONFIG_SUNDANCE is not set</div><div class='del'>-# CONFIG_TLAN is not set</div><div class='del'>-# CONFIG_VIA_RHINE is not set</div><div class='del'>-# CONFIG_LAN_SAA9730 is not set</div><div class='add'>+# CONFIG_SGISEEQ is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (1000 Mbit)</div><div class='ctx'> #</div><div class='del'>-# CONFIG_ACENIC is not set</div><div class='del'>-# CONFIG_DL2K is not set</div><div class='del'>-# CONFIG_E1000 is not set</div><div class='del'>-# CONFIG_NS83820 is not set</div><div class='del'>-# CONFIG_HAMACHI is not set</div><div class='del'>-# CONFIG_YELLOWFIN is not set</div><div class='del'>-# CONFIG_R8169 is not set</div><div class='del'>-# CONFIG_SIS190 is not set</div><div class='del'>-# CONFIG_SKGE is not set</div><div class='del'>-# CONFIG_SKY2 is not set</div><div class='del'>-# CONFIG_SK98LIN is not set</div><div class='del'>-# CONFIG_VIA_VELOCITY is not set</div><div class='del'>-# CONFIG_TIGON3 is not set</div><div class='del'>-# CONFIG_BNX2 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10000 Mbit)</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CHELSIO_T1 is not set</div><div class='del'>-# CONFIG_IXGB is not set</div><div class='del'>-# CONFIG_S2IO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='ctx'> #</div><div class='del'>-# CONFIG_TR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Wireless LAN (non-hamradio)</div><div class='hunk'>@@ -655,8 +564,6 @@ CONFIG_8139TOO=y</div><div class='ctx'> # Wan interfaces</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WAN is not set</div><div class='del'>-# CONFIG_FDDI is not set</div><div class='del'>-# CONFIG_HIPPI is not set</div><div class='ctx'> CONFIG_PPP=m</div><div class='ctx'> # CONFIG_PPP_MULTILINK is not set</div><div class='ctx'> # CONFIG_PPP_FILTER is not set</div><div class='hunk'>@@ -667,7 +574,6 @@ CONFIG_PPP_DEFLATE=m</div><div class='ctx'> CONFIG_PPP_MPPE=m</div><div class='ctx'> # CONFIG_PPPOE is not set</div><div class='ctx'> # CONFIG_SLIP is not set</div><div class='del'>-# CONFIG_NET_FC is not set</div><div class='ctx'> # CONFIG_SHAPER is not set</div><div class='ctx'> # CONFIG_NETCONSOLE is not set</div><div class='ctx'> # CONFIG_NETPOLL is not set</div><div class='hunk'>@@ -723,7 +629,6 @@ CONFIG_MOUSE_PS2=y</div><div class='ctx'> CONFIG_SERIO=y</div><div class='ctx'> CONFIG_SERIO_I8042=y</div><div class='ctx'> CONFIG_SERIO_SERPORT=y</div><div class='del'>-# CONFIG_SERIO_PCIPS2 is not set</div><div class='ctx'> CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> # CONFIG_SERIO_RAW is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='hunk'>@@ -734,6 +639,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> # CONFIG_VT_CONSOLE is not set</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_COMPUTONE is not set</div><div class='ctx'> # CONFIG_ROCKETPORT is not set</div><div class='hunk'>@@ -743,7 +649,6 @@ CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_MOXA_SMARTIO is not set</div><div class='ctx'> # CONFIG_ISI is not set</div><div class='ctx'> # CONFIG_SYNCLINKMP is not set</div><div class='del'>-# CONFIG_SYNCLINK_GT is not set</div><div class='ctx'> # CONFIG_N_HDLC is not set</div><div class='ctx'> # CONFIG_RISCOM8 is not set</div><div class='ctx'> # CONFIG_SPECIALIX is not set</div><div class='hunk'>@@ -759,8 +664,7 @@ CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> #</div><div class='ctx'> # Non-8250 serial port support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_SERIAL_IP3106 is not set</div><div class='del'>-# CONFIG_SERIAL_JSM is not set</div><div class='add'>+# CONFIG_SERIAL_IP22_ZILOG is not set</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='hunk'>@@ -774,16 +678,16 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='add'>+# CONFIG_SGI_DS1286 is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='del'>-# CONFIG_APPLICOM is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ftape, the floppy tape device driver</div><div class='ctx'> #</div><div class='del'>-# CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_RAW_DRIVER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -804,29 +708,14 @@ CONFIG_I2C_CHARDEV=m</div><div class='ctx'> CONFIG_I2C_ALGOBIT=m</div><div class='ctx'> # CONFIG_I2C_ALGOPCF is not set</div><div class='ctx'> # CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+# CONFIG_I2C_ALGO_SGI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # I2C Hardware Bus support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2C_ALI1535 is not set</div><div class='del'>-# CONFIG_I2C_ALI1563 is not set</div><div class='del'>-# CONFIG_I2C_ALI15X3 is not set</div><div class='del'>-# CONFIG_I2C_AMD756 is not set</div><div class='del'>-# CONFIG_I2C_AMD8111 is not set</div><div class='del'>-# CONFIG_I2C_I801 is not set</div><div class='del'>-# CONFIG_I2C_I810 is not set</div><div class='del'>-# CONFIG_I2C_PIIX4 is not set</div><div class='del'>-# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='del'>-# CONFIG_I2C_PROSAVAGE is not set</div><div class='del'>-# CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_I2C_SIS5595 is not set</div><div class='del'>-# CONFIG_I2C_SIS630 is not set</div><div class='del'>-# CONFIG_I2C_SIS96X is not set</div><div class='ctx'> # CONFIG_I2C_STUB is not set</div><div class='del'>-# CONFIG_I2C_VIA is not set</div><div class='del'>-# CONFIG_I2C_VIAPRO is not set</div><div class='del'>-# CONFIG_I2C_VOODOO3 is not set</div><div class='ctx'> # CONFIG_I2C_PCA_ISA is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -853,13 +742,13 @@ CONFIG_I2C_ALGOBIT=m</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -886,12 +775,11 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_LM92 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX1619 is not set</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='del'>-# CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='del'>-# CONFIG_SENSORS_VIA686A is not set</div><div class='del'>-# CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='hunk'>@@ -906,50 +794,33 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DVB is not set</div><div class='del'>-# CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> # CONFIG_FB_CFB_FILLRECT is not set</div><div class='ctx'> # CONFIG_FB_CFB_COPYAREA is not set</div><div class='ctx'> # CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='del'>-# CONFIG_FB_CIRRUS is not set</div><div class='del'>-# CONFIG_FB_PM2 is not set</div><div class='del'>-# CONFIG_FB_CYBER2000 is not set</div><div class='del'>-# CONFIG_FB_ASILIANT is not set</div><div class='del'>-# CONFIG_FB_IMSTT is not set</div><div class='ctx'> # CONFIG_FB_S1D13XXX is not set</div><div class='del'>-# CONFIG_FB_NVIDIA is not set</div><div class='del'>-# CONFIG_FB_RIVA is not set</div><div class='del'>-# CONFIG_FB_MATROX is not set</div><div class='del'>-# CONFIG_FB_RADEON is not set</div><div class='del'>-# CONFIG_FB_ATY128 is not set</div><div class='del'>-# CONFIG_FB_ATY is not set</div><div class='del'>-# CONFIG_FB_SAVAGE is not set</div><div class='del'>-# CONFIG_FB_SIS is not set</div><div class='del'>-# CONFIG_FB_NEOMAGIC is not set</div><div class='del'>-# CONFIG_FB_KYRO is not set</div><div class='del'>-# CONFIG_FB_3DFX is not set</div><div class='del'>-# CONFIG_FB_VOODOO1 is not set</div><div class='del'>-# CONFIG_FB_SMIVGX is not set</div><div class='del'>-# CONFIG_FB_TRIDENT is not set</div><div class='ctx'> # CONFIG_FB_VIRTUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VGA_CONSOLE is not set</div><div class='add'>+# CONFIG_SGI_NEWPORT_CONSOLE is not set</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='ctx'> </div><div class='hunk'>@@ -967,124 +838,15 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> #</div><div class='ctx'> # USB support</div><div class='ctx'> #</div><div class='del'>-CONFIG_USB_ARCH_HAS_HCD=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='del'>-CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='del'>-CONFIG_USB=y</div><div class='del'>-# CONFIG_USB_DEBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Miscellaneous USB options</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_DEVICEFS=y</div><div class='del'>-# CONFIG_USB_BANDWIDTH is not set</div><div class='del'>-# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='del'>-# CONFIG_USB_OTG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Host Controller Drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_EHCI_HCD is not set</div><div class='del'>-# CONFIG_USB_ISP116X_HCD is not set</div><div class='del'>-# CONFIG_USB_OHCI_HCD is not set</div><div class='del'>-# CONFIG_USB_UHCI_HCD is not set</div><div class='del'>-# CONFIG_USB_SL811_HCD is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Device Class drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_ACM is not set</div><div class='del'>-# CONFIG_USB_PRINTER is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_HCD is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_OHCI is not set</div><div class='add'>+# CONFIG_USB_ARCH_HAS_EHCI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# may also be needed; see USB_STORAGE Help for more information</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_STORAGE=y</div><div class='del'>-# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='del'>-# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='del'>-# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='del'>-# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='del'>-# CONFIG_USB_STORAGE_DPCM is not set</div><div class='del'>-# CONFIG_USB_STORAGE_USBAT is not set</div><div class='del'>-# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='del'>-# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='del'>-# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='del'>-# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='del'>-# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='del'>-# CONFIG_USB_LIBUSUAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Input Devices</div><div class='del'>-#</div><div class='del'>-CONFIG_USB_HID=y</div><div class='del'>-CONFIG_USB_HIDINPUT=y</div><div class='del'>-# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='del'>-# CONFIG_HID_FF is not set</div><div class='del'>-CONFIG_USB_HIDDEV=y</div><div class='del'>-# CONFIG_USB_AIPTEK is not set</div><div class='del'>-# CONFIG_USB_WACOM is not set</div><div class='del'>-# CONFIG_USB_ACECAD is not set</div><div class='del'>-# CONFIG_USB_KBTAB is not set</div><div class='del'>-# CONFIG_USB_POWERMATE is not set</div><div class='del'>-# CONFIG_USB_TOUCHSCREEN is not set</div><div class='del'>-# CONFIG_USB_YEALINK is not set</div><div class='del'>-# CONFIG_USB_XPAD is not set</div><div class='del'>-# CONFIG_USB_ATI_REMOTE is not set</div><div class='del'>-# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='del'>-# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='del'>-# CONFIG_USB_APPLETOUCH is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Imaging devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_MDC800 is not set</div><div class='del'>-# CONFIG_USB_MICROTEK is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Network Adapters</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_CATC is not set</div><div class='del'>-# CONFIG_USB_KAWETH is not set</div><div class='del'>-# CONFIG_USB_PEGASUS is not set</div><div class='del'>-# CONFIG_USB_RTL8150 is not set</div><div class='del'>-# CONFIG_USB_USBNET is not set</div><div class='del'>-CONFIG_USB_MON=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB port drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Serial Converter support</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_SERIAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB Miscellaneous drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_EMI62 is not set</div><div class='del'>-# CONFIG_USB_EMI26 is not set</div><div class='del'>-# CONFIG_USB_AUERSWALD is not set</div><div class='del'>-# CONFIG_USB_RIO500 is not set</div><div class='del'>-# CONFIG_USB_LEGOTOWER is not set</div><div class='del'>-# CONFIG_USB_LCD is not set</div><div class='del'>-# CONFIG_USB_LED is not set</div><div class='del'>-# CONFIG_USB_CYTHERM is not set</div><div class='del'>-# CONFIG_USB_PHIDGETKIT is not set</div><div class='del'>-# CONFIG_USB_PHIDGETSERVO is not set</div><div class='del'>-# CONFIG_USB_IDMOUSE is not set</div><div class='del'>-# CONFIG_USB_LD is not set</div><div class='del'>-# CONFIG_USB_TEST is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# USB DSL modem support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # USB Gadget Support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_GADGET is not set</div><div class='hunk'>@@ -1110,7 +872,6 @@ CONFIG_USB_MON=y</div><div class='ctx'> #</div><div class='ctx'> # InfiniBand support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_INFINIBAND is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='hunk'>@@ -1122,6 +883,19 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1138,7 +912,6 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> # CONFIG_XFS_QUOTA is not set</div><div class='ctx'> # CONFIG_XFS_SECURITY is not set</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='hunk'>@@ -1147,6 +920,7 @@ CONFIG_XFS_EXPORT=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='hunk'>@@ -1219,6 +993,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1229,6 +1004,7 @@ CONFIG_SMB_FS=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PARTITION_ADVANCED is not set</div><div class='ctx'> CONFIG_MSDOS_PARTITION=y</div><div class='add'>+CONFIG_SGI_PARTITION=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Native Language Support</div><div class='hunk'>@@ -1284,6 +1060,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1342,3 +1119,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig<br/>index 4bcc01dea041..6a63a113b7ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/qemu_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/qemu_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/qemu_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/qemu_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:15 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:18 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> CONFIG_QEMU=y</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_COHERENT=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_I8259=y</div><div class='hunk'>@@ -115,7 +117,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -123,14 +128,25 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='ctx'> CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='del'>-# CONFIG_SMP is not set</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+CONFIG_HZ_100=y</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=100</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -164,6 +180,7 @@ CONFIG_ELF_CORE=y</div><div class='ctx'> # CONFIG_EPOLL is not set</div><div class='ctx'> # CONFIG_SHMEM is not set</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> CONFIG_TINY_SHMEM=y</div><div class='ctx'> CONFIG_BASE_SMALL=1</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -228,6 +245,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> CONFIG_PACKET_MMAP=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -246,6 +265,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -253,6 +274,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='hunk'>@@ -285,6 +307,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -466,6 +489,7 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -495,6 +519,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -539,6 +564,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -548,6 +574,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -610,6 +637,19 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EXT2_FS is not set</div><div class='hunk'>@@ -621,6 +661,7 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -675,6 +716,7 @@ CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> </div><div class='hunk'>@@ -694,6 +736,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='head'>diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig<br/>index 3d441932e43a..6779f449bd2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/rbhma4500_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/rbhma4500_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/rbhma4500_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/rbhma4500_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:16 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:19 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -74,6 +75,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='hunk'>@@ -124,7 +126,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='hunk'>@@ -138,9 +143,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -177,10 +193,10 @@ CONFIG_BASE_FULL=y</div><div class='ctx'> # CONFIG_EPOLL is not set</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='del'>-CONFIG_OBSOLETE_INTERMODULE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='hunk'>@@ -248,6 +264,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -267,6 +285,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -285,7 +305,10 @@ CONFIG_IPV6_ROUTE_INFO=y</div><div class='ctx'> # CONFIG_INET6_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> # CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -300,6 +323,7 @@ CONFIG_NETFILTER_XTABLES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='hunk'>@@ -307,10 +331,13 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_LIMIT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MAC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='add'>+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -387,6 +414,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -617,6 +645,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -697,6 +727,7 @@ CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -722,7 +753,7 @@ CONFIG_NET_RADIO=y</div><div class='ctx'> # CONFIG_IPW2100 is not set</div><div class='ctx'> CONFIG_IPW2200=m</div><div class='ctx'> # CONFIG_IPW2200_MONITOR is not set</div><div class='del'>-# CONFIG_IPW_QOS is not set</div><div class='add'>+# CONFIG_IPW2200_QOS is not set</div><div class='ctx'> # CONFIG_IPW2200_DEBUG is not set</div><div class='ctx'> # CONFIG_HERMES is not set</div><div class='ctx'> # CONFIG_ATMEL is not set</div><div class='hunk'>@@ -731,8 +762,10 @@ CONFIG_IPW2200=m</div><div class='ctx'> # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRISM54 is not set</div><div class='add'>+# CONFIG_USB_ZD1201 is not set</div><div class='ctx'> # CONFIG_HOSTAP is not set</div><div class='ctx'> # CONFIG_BCM43XX is not set</div><div class='add'>+# CONFIG_ZD1211RW is not set</div><div class='ctx'> CONFIG_NET_WIRELESS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -820,6 +853,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -849,6 +883,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -888,6 +923,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> </div><div class='hunk'>@@ -899,6 +935,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -909,12 +946,13 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_CIRRUS is not set</div><div class='hunk'>@@ -1038,7 +1076,6 @@ CONFIG_USB_YEALINK=m</div><div class='ctx'> # CONFIG_USB_PEGASUS is not set</div><div class='ctx'> # CONFIG_USB_RTL8150 is not set</div><div class='ctx'> # CONFIG_USB_USBNET is not set</div><div class='del'>-# CONFIG_USB_ZD1201 is not set</div><div class='ctx'> CONFIG_USB_MON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1060,10 +1097,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1108,6 +1147,19 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1127,7 +1179,6 @@ CONFIG_REISERFS_FS=m</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> # CONFIG_FS_POSIX_ACL is not set</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> # CONFIG_XFS_QUOTA is not set</div><div class='ctx'> # CONFIG_XFS_SECURITY is not set</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='hunk'>@@ -1136,6 +1187,7 @@ CONFIG_XFS_EXPORT=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -1186,6 +1238,7 @@ CONFIG_JFFS2_FS=y</div><div class='ctx'> CONFIG_JFFS2_FS_DEBUG=0</div><div class='ctx'> CONFIG_JFFS2_FS_WRITEBUFFER=y</div><div class='ctx'> # CONFIG_JFFS2_SUMMARY is not set</div><div class='add'>+# CONFIG_JFFS2_FS_XATTR is not set</div><div class='ctx'> # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set</div><div class='ctx'> CONFIG_JFFS2_ZLIB=y</div><div class='ctx'> CONFIG_JFFS2_RTIME=y</div><div class='hunk'>@@ -1219,6 +1272,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1284,6 +1338,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='head'>diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig<br/>index edfb9679a25a..b7826d3a2b77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/rm200_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/rm200_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/rm200_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/rm200_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:16 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:19 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARC=y</div><div class='ctx'> CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='hunk'>@@ -108,6 +110,7 @@ CONFIG_CPU_R4X00=y</div><div class='ctx'> # CONFIG_CPU_RM9000 is not set</div><div class='ctx'> # CONFIG_CPU_SB1 is not set</div><div class='ctx'> CONFIG_SYS_HAS_CPU_R4X00=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_R5000=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='hunk'>@@ -122,7 +125,12 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_BOARD_SCACHE=y</div><div class='add'>+CONFIG_R5000_CPU_SCACHE=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -138,9 +146,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -174,10 +193,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -273,6 +294,8 @@ CONFIG_IP_PIMSM_V2=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -291,7 +314,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> CONFIG_BRIDGE_NETFILTER=y</div><div class='hunk'>@@ -308,6 +334,8 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='add'>+# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m</div><div class='hunk'>@@ -322,9 +350,11 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -334,6 +364,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK=m</div><div class='ctx'> # CONFIG_IP_NF_CT_ACCT is not set</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_NETLINK=m</div><div class='ctx'> CONFIG_IP_NF_CT_PROTO_SCTP=m</div><div class='hunk'>@@ -344,6 +375,7 @@ CONFIG_IP_NF_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_H323=m</div><div class='add'>+CONFIG_IP_NF_SIP=m</div><div class='ctx'> CONFIG_IP_NF_QUEUE=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_IPRANGE=m</div><div class='hunk'>@@ -374,6 +406,7 @@ CONFIG_IP_NF_NAT_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_NAT_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_H323=m</div><div class='add'>+CONFIG_IP_NF_NAT_SIP=m</div><div class='ctx'> CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TOS=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='hunk'>@@ -552,6 +585,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -573,6 +607,7 @@ CONFIG_PARPORT_SERIAL=m</div><div class='ctx'> # CONFIG_PARPORT_PC_SUPERIO is not set</div><div class='ctx'> CONFIG_PARPORT_NOT_PC=y</div><div class='ctx'> # CONFIG_PARPORT_GSC is not set</div><div class='add'>+# CONFIG_PARPORT_AX88796 is not set</div><div class='ctx'> CONFIG_PARPORT_1284=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -692,6 +727,7 @@ CONFIG_MEGARAID_MAILBOX=m</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_DTC3280 is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='hunk'>@@ -738,9 +774,8 @@ CONFIG_MD_LINEAR=m</div><div class='ctx'> CONFIG_MD_RAID0=m</div><div class='ctx'> CONFIG_MD_RAID1=m</div><div class='ctx'> CONFIG_MD_RAID10=m</div><div class='del'>-CONFIG_MD_RAID5=m</div><div class='add'>+CONFIG_MD_RAID456=m</div><div class='ctx'> CONFIG_MD_RAID5_RESHAPE=y</div><div class='del'>-# CONFIG_MD_RAID6 is not set</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> CONFIG_MD_FAULTY=m</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='hunk'>@@ -796,6 +831,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -877,6 +914,7 @@ CONFIG_VIA_VELOCITY=m</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -968,6 +1006,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1005,6 +1044,7 @@ CONFIG_TIPAR=m</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=m</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -1038,12 +1078,13 @@ CONFIG_RTC=m</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='ctx'> CONFIG_W1=m</div><div class='add'>+CONFIG_W1_CON=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # 1-wire Bus Masters</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_W1_MASTER_MATROX is not set</div><div class='del'>-# CONFIG_W1_MASTER_DS9490 is not set</div><div class='add'>+# CONFIG_W1_MASTER_DS2490 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # 1-wire Slaves</div><div class='hunk'>@@ -1066,6 +1107,7 @@ CONFIG_W1=m</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -1076,6 +1118,7 @@ CONFIG_USB_DABUSB=m</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1114,6 +1157,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -1212,6 +1256,7 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> CONFIG_USB_SERIAL_GENERIC=y</div><div class='ctx'> CONFIG_USB_SERIAL_AIRPRIME=m</div><div class='ctx'> CONFIG_USB_SERIAL_ANYDATA=m</div><div class='add'>+# CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> CONFIG_USB_SERIAL_BELKIN=m</div><div class='ctx'> CONFIG_USB_SERIAL_WHITEHEAT=m</div><div class='ctx'> CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m</div><div class='hunk'>@@ -1252,6 +1297,7 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y</div><div class='ctx'> # CONFIG_USB_SERIAL_TI is not set</div><div class='ctx'> CONFIG_USB_SERIAL_CYBERJACK=m</div><div class='ctx'> CONFIG_USB_SERIAL_XIRCOM=m</div><div class='add'>+# CONFIG_USB_SERIAL_OPTION is not set</div><div class='ctx'> CONFIG_USB_SERIAL_OMNINET=m</div><div class='ctx'> CONFIG_USB_EZUSB=y</div><div class='ctx'> </div><div class='hunk'>@@ -1265,10 +1311,12 @@ CONFIG_USB_RIO500=m</div><div class='ctx'> CONFIG_USB_LEGOTOWER=m</div><div class='ctx'> CONFIG_USB_LCD=m</div><div class='ctx'> CONFIG_USB_LED=m</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> CONFIG_USB_CYTHERM=m</div><div class='ctx'> CONFIG_USB_PHIDGETKIT=m</div><div class='ctx'> CONFIG_USB_PHIDGETSERVO=m</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> CONFIG_USB_SISUSBVGA=m</div><div class='ctx'> # CONFIG_USB_SISUSBVGA_CON is not set</div><div class='ctx'> CONFIG_USB_LD=m</div><div class='hunk'>@@ -1316,6 +1364,19 @@ CONFIG_USB_TEST=m</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=m</div><div class='hunk'>@@ -1337,7 +1398,6 @@ CONFIG_REISERFS_FS_SECURITY=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> CONFIG_XFS_QUOTA=y</div><div class='ctx'> CONFIG_XFS_SECURITY=y</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='hunk'>@@ -1346,6 +1406,7 @@ CONFIG_XFS_SECURITY=y</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_QUOTACTL=y</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='hunk'>@@ -1404,6 +1465,8 @@ CONFIG_HPFS_FS=m</div><div class='ctx'> CONFIG_QNX4FS_FS=m</div><div class='ctx'> CONFIG_SYSV_FS=m</div><div class='ctx'> CONFIG_UFS_FS=m</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network File Systems</div><div class='hunk'>@@ -1430,7 +1493,9 @@ CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='ctx'> CONFIG_CIFS=m</div><div class='ctx'> # CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_WEAK_PW_HASH is not set</div><div class='ctx'> # CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='ctx'> CONFIG_NCP_FS=m</div><div class='ctx'> CONFIG_NCPFS_PACKET_SIGNING=y</div><div class='hunk'>@@ -1522,6 +1587,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1581,3 +1647,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig<br/>index e388a3dae0a9..625c1c619b6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/sb1250-swarm_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/sb1250-swarm_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/sb1250-swarm_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/sb1250-swarm_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:17 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:19 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -84,6 +85,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_COHERENT=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='ctx'> # CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='hunk'>@@ -132,12 +134,16 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> # CONFIG_SIBYTE_DMA_PAGEOPS is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_SB1_PASS_1_WORKAROUNDS=y</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='hunk'>@@ -149,12 +155,24 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_SMP=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=2</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_PREEMPT_BKL=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -187,10 +205,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -285,6 +305,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -292,6 +314,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -351,6 +374,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -472,6 +496,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -515,6 +541,7 @@ CONFIG_NET_SB1250_MAC=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -582,6 +609,7 @@ CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_N_HDLC is not set</div><div class='ctx'> # CONFIG_SPECIALIX is not set</div><div class='ctx'> # CONFIG_SX is not set</div><div class='add'>+# CONFIG_RIO is not set</div><div class='ctx'> # CONFIG_STALDRV is not set</div><div class='ctx'> CONFIG_SIBYTE_SB1250_DUART=y</div><div class='ctx'> CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y</div><div class='hunk'>@@ -608,6 +636,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -656,6 +685,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -665,6 +695,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -722,6 +753,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -739,6 +783,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -804,6 +849,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -830,6 +876,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=15</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -886,3 +933,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig<br/>index 6b8a6a416a25..4401b602118f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/sead_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/sead_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/sead_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/sead_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:17 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:20 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> CONFIG_MIPS_SEAD=y</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS_SEAD=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -118,7 +120,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -134,9 +139,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -166,10 +182,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -235,6 +253,7 @@ CONFIG_TRAD_SIGNALS=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -348,6 +367,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -378,7 +398,6 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -394,6 +413,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -402,6 +422,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -457,6 +478,19 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -470,6 +504,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -549,6 +584,7 @@ CONFIG_PARTITION_ADVANCED=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -578,3 +614,4 @@ CONFIG_CMDLINE=""</div><div class='ctx'> CONFIG_CRC16=y</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig<br/>index dba0bdcdcf29..2ba4e25e8c34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/tb0226_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/tb0226_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/tb0226_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/tb0226_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Tue Apr 25 00:08:41 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:20 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -77,6 +78,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -121,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -134,9 +139,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -168,10 +184,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -242,6 +260,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -267,6 +287,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -274,6 +296,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -327,6 +350,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -420,6 +444,7 @@ CONFIG_SCSI_MULTI_LUN=y</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -485,6 +510,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -547,6 +574,7 @@ CONFIG_E100=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -617,6 +645,7 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -645,6 +674,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -695,6 +725,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -705,6 +736,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -741,6 +773,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -831,10 +864,12 @@ CONFIG_USB_STORAGE=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='hunk'>@@ -889,13 +924,30 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='ctx'> CONFIG_RTC_INTF_SYSFS=y</div><div class='ctx'> CONFIG_RTC_INTF_PROC=y</div><div class='ctx'> CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> CONFIG_RTC_DRV_VR41XX=y</div><div class='ctx'> # CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -912,6 +964,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -982,6 +1035,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1008,6 +1062,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1037,3 +1092,4 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"</div><div class='ctx'> # CONFIG_CRC32 is not set</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig<br/>index 5a924c1a5803..fc8a407c1add 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/tb0229_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/tb0229_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/tb0229_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/tb0229_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Tue Apr 25 00:08:59 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:20 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -77,6 +78,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -121,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -134,9 +139,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -168,10 +184,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -242,6 +260,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -268,6 +288,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -275,6 +297,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -328,6 +351,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -426,6 +450,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -469,6 +495,7 @@ CONFIG_R8169=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -538,6 +565,7 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -566,6 +594,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -600,7 +629,6 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -616,6 +644,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -626,6 +655,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -662,6 +692,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -742,10 +773,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='hunk'>@@ -800,13 +833,30 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='ctx'> CONFIG_RTC_INTF_SYSFS=y</div><div class='ctx'> CONFIG_RTC_INTF_PROC=y</div><div class='ctx'> CONFIG_RTC_INTF_DEV=y</div><div class='add'>+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # RTC drivers</div><div class='ctx'> #</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='ctx'> # CONFIG_RTC_DRV_M48T86 is not set</div><div class='ctx'> CONFIG_RTC_DRV_VR41XX=y</div><div class='ctx'> # CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # File systems</div><div class='hunk'>@@ -823,6 +873,7 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -893,6 +944,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -919,6 +971,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -948,3 +1001,4 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig<br/>index 9f215ea350dc..effcb63b81a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/tb0287_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/tb0287_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/tb0287_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/tb0287_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Tue Apr 25 00:09:17 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:21 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -122,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -135,9 +139,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -169,10 +184,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -243,6 +260,8 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='ctx'> # CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='hunk'>@@ -269,6 +288,8 @@ CONFIG_SYN_COOKIES=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> CONFIG_TCP_CONG_ADVANCED=y</div><div class='hunk'>@@ -284,9 +305,13 @@ CONFIG_TCP_CONG_HTCP=m</div><div class='ctx'> # CONFIG_TCP_CONG_HYBLA is not set</div><div class='ctx'> # CONFIG_TCP_CONG_VEGAS is not set</div><div class='ctx'> # CONFIG_TCP_CONG_SCALABLE is not set</div><div class='add'>+# CONFIG_TCP_CONG_LP is not set</div><div class='add'>+# CONFIG_TCP_CONG_VENO is not set</div><div class='add'>+# CONFIG_TCP_CONG_COMPOUND is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -340,6 +365,7 @@ CONFIG_TCP_CONG_HTCP=m</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -485,6 +511,7 @@ CONFIG_BLK_DEV_SD=y</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -541,7 +568,6 @@ CONFIG_IEEE1394_OHCI1394=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IEEE1394_VIDEO1394=m</div><div class='ctx'> CONFIG_IEEE1394_SBP2=m</div><div class='del'>-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set</div><div class='ctx'> CONFIG_IEEE1394_ETH1394=m</div><div class='ctx'> CONFIG_IEEE1394_DV1394=m</div><div class='ctx'> CONFIG_IEEE1394_RAWIO=m</div><div class='hunk'>@@ -612,6 +638,7 @@ CONFIG_R8169=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -682,6 +709,7 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -710,6 +738,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -744,7 +773,6 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='hunk'>@@ -760,6 +788,7 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -770,12 +799,13 @@ CONFIG_GPIO_VR41XX=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> # CONFIG_FB_MODE_HELPERS is not set</div><div class='ctx'> # CONFIG_FB_TILEBLITTING is not set</div><div class='ctx'> # CONFIG_FB_CIRRUS is not set</div><div class='hunk'>@@ -841,6 +871,7 @@ CONFIG_USB=m</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -936,10 +967,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> </div><div class='hunk'>@@ -985,6 +1018,19 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1009,6 +1055,7 @@ CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> CONFIG_ROMFS_FS=m</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_QUOTACTL=y</div><div class='ctx'> # CONFIG_DNOTIFY is not set</div><div class='hunk'>@@ -1075,6 +1122,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1101,6 +1149,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1130,3 +1179,4 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig<br/>index ac7765eb8da7..4891d02ef8ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/workpad_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/workpad_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/workpad_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/workpad_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Tue Apr 25 00:09:33 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:21 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> CONFIG_MACH_VR41XX=y</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -73,6 +74,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='ctx'> # CONFIG_CPU_BIG_ENDIAN is not set</div><div class='hunk'>@@ -117,7 +119,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='hunk'>@@ -130,9 +135,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -164,10 +180,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -266,6 +284,8 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -273,6 +293,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -327,6 +348,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -445,6 +467,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -579,6 +603,7 @@ CONFIG_INPUT=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -606,6 +631,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -660,6 +686,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -669,6 +696,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -731,6 +759,19 @@ CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -748,6 +789,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -813,6 +855,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -839,6 +882,7 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -867,3 +911,4 @@ CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M"</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/wrppmc_defconfig<br/>index 8d88ac1bbfeb..3e4b16b39827 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/ddb5476_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/ddb5476_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/wrppmc_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/wrppmc_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:00 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:21 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+CONFIG_WR_PPMC=y</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-CONFIG_DDB5476=y</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,21 +68,23 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='del'>-CONFIG_I8259=y</div><div class='del'>-# CONFIG_CPU_BIG_ENDIAN is not set</div><div class='del'>-CONFIG_CPU_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_CPU_BIG_ENDIAN=y</div><div class='add'>+# CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y</div><div class='ctx'> CONFIG_IRQ_CPU=y</div><div class='del'>-CONFIG_DDB5XXX_COMMON=y</div><div class='add'>+CONFIG_MIPS_GT64120=y</div><div class='add'>+CONFIG_SWAP_IO_SPACE=y</div><div class='add'>+CONFIG_BOOT_ELF32=y</div><div class='ctx'> CONFIG_MIPS_L1_CACHE_SHIFT=5</div><div class='del'>-CONFIG_HAVE_STD_PC_SERIAL_PORT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU selection</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CPU_MIPS32_R1 is not set</div><div class='add'>+CONFIG_CPU_MIPS32_R1=y</div><div class='ctx'> # CONFIG_CPU_MIPS32_R2 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS64_R1 is not set</div><div class='ctx'> # CONFIG_CPU_MIPS64_R2 is not set</div><div class='hunk'>@@ -92,7 +95,7 @@ CONFIG_HAVE_STD_PC_SERIAL_PORT=y</div><div class='ctx'> # CONFIG_CPU_R4X00 is not set</div><div class='ctx'> # CONFIG_CPU_TX49XX is not set</div><div class='ctx'> # CONFIG_CPU_R5000 is not set</div><div class='del'>-CONFIG_CPU_R5432=y</div><div class='add'>+# CONFIG_CPU_R5432 is not set</div><div class='ctx'> # CONFIG_CPU_R6000 is not set</div><div class='ctx'> # CONFIG_CPU_NEVADA is not set</div><div class='ctx'> # CONFIG_CPU_R8000 is not set</div><div class='hunk'>@@ -100,11 +103,16 @@ CONFIG_CPU_R5432=y</div><div class='ctx'> # CONFIG_CPU_RM7000 is not set</div><div class='ctx'> # CONFIG_CPU_RM9000 is not set</div><div class='ctx'> # CONFIG_CPU_SB1 is not set</div><div class='del'>-CONFIG_SYS_HAS_CPU_R5432=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_MIPS32_R1=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_MIPS32_R2=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_MIPS64_R1=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_NEVADA=y</div><div class='add'>+CONFIG_SYS_HAS_CPU_RM7000=y</div><div class='add'>+CONFIG_CPU_MIPS32=y</div><div class='add'>+CONFIG_CPU_MIPSR1=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y</div><div class='del'>-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel type</div><div class='hunk'>@@ -115,11 +123,17 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_8KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_CPU_HAS_PREFETCH=y</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='add'>+# CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_FLATMEM_MANUAL=y</div><div class='hunk'>@@ -129,9 +143,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -145,28 +170,31 @@ CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LOCALVERSION=""</div><div class='ctx'> CONFIG_LOCALVERSION_AUTO=y</div><div class='del'>-CONFIG_SWAP=y</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='ctx'> CONFIG_SYSVIPC=y</div><div class='ctx'> # CONFIG_POSIX_MQUEUE is not set</div><div class='del'>-# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_BSD_PROCESS_ACCT=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT_V3 is not set</div><div class='ctx'> CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> # CONFIG_IKCONFIG is not set</div><div class='del'>-CONFIG_RELAY=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> CONFIG_EMBEDDED=y</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='del'>-# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='ctx'> CONFIG_HOTPLUG=y</div><div class='ctx'> CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='del'>-CONFIG_EPOLL=y</div><div class='add'>+# CONFIG_EPOLL is not set</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -174,7 +202,12 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> #</div><div class='ctx'> # Loadable module support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_MODULES is not set</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+CONFIG_MODVERSIONS=y</div><div class='add'>+CONFIG_MODULE_SRCVERSION_ALL=y</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Block layer</div><div class='hunk'>@@ -201,7 +234,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HW_HAS_PCI=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='del'>-CONFIG_ISA=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -212,13 +244,16 @@ CONFIG_MMU=y</div><div class='ctx'> #</div><div class='ctx'> # PCI Hotplug Support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+CONFIG_HOTPLUG_PCI=y</div><div class='add'>+# CONFIG_HOTPLUG_PCI_FAKE is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI_CPCI is not set</div><div class='add'>+# CONFIG_HOTPLUG_PCI_SHPC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Executable file formats</div><div class='ctx'> #</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='ctx'> CONFIG_TRAD_SIGNALS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -231,28 +266,33 @@ CONFIG_NET=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NETDEBUG is not set</div><div class='ctx'> CONFIG_PACKET=y</div><div class='del'>-# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_PACKET_MMAP=y</div><div class='ctx'> CONFIG_UNIX=y</div><div class='ctx'> CONFIG_XFRM=y</div><div class='del'>-CONFIG_XFRM_USER=y</div><div class='del'>-CONFIG_NET_KEY=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='ctx'> CONFIG_INET=y</div><div class='del'>-# CONFIG_IP_MULTICAST is not set</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='ctx'> # CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='ctx'> CONFIG_IP_FIB_HASH=y</div><div class='ctx'> CONFIG_IP_PNP=y</div><div class='del'>-# CONFIG_IP_PNP_DHCP is not set</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> CONFIG_IP_PNP_BOOTP=y</div><div class='del'>-# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='ctx'> # CONFIG_NET_IPIP is not set</div><div class='ctx'> # CONFIG_NET_IPGRE is not set</div><div class='del'>-# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_IP_MROUTE=y</div><div class='add'>+# CONFIG_IP_PIMSM_V1 is not set</div><div class='add'>+# CONFIG_IP_PIMSM_V2 is not set</div><div class='add'>+CONFIG_ARPD=y</div><div class='ctx'> # CONFIG_SYN_COOKIES is not set</div><div class='ctx'> # CONFIG_INET_AH is not set</div><div class='ctx'> # CONFIG_INET_ESP is not set</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -260,6 +300,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -301,13 +342,7 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='del'>-CONFIG_IEEE80211=y</div><div class='del'>-# CONFIG_IEEE80211_DEBUG is not set</div><div class='del'>-CONFIG_IEEE80211_CRYPT_WEP=y</div><div class='del'>-CONFIG_IEEE80211_CRYPT_CCMP=y</div><div class='del'>-CONFIG_IEEE80211_SOFTMAC=y</div><div class='del'>-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set</div><div class='del'>-CONFIG_WIRELESS_EXT=y</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -318,13 +353,13 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='del'>-CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='ctx'> #</div><div class='del'>-CONFIG_CONNECTOR=y</div><div class='del'>-CONFIG_PROC_EVENTS=y</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Memory Technology Devices (MTD)</div><div class='hunk'>@@ -339,7 +374,6 @@ CONFIG_PROC_EVENTS=y</div><div class='ctx'> #</div><div class='ctx'> # Plug and Play support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_PNP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Block devices</div><div class='hunk'>@@ -352,53 +386,25 @@ CONFIG_PROC_EVENTS=y</div><div class='ctx'> # CONFIG_BLK_DEV_LOOP is not set</div><div class='ctx'> # CONFIG_BLK_DEV_NBD is not set</div><div class='ctx'> # CONFIG_BLK_DEV_SX8 is not set</div><div class='del'>-# CONFIG_BLK_DEV_RAM is not set</div><div class='del'>-# CONFIG_BLK_DEV_INITRD is not set</div><div class='del'>-CONFIG_CDROM_PKTCDVD=y</div><div class='del'>-CONFIG_CDROM_PKTCDVD_BUFFERS=8</div><div class='del'>-# CONFIG_CDROM_PKTCDVD_WCACHE is not set</div><div class='del'>-CONFIG_ATA_OVER_ETH=y</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ATA/ATAPI/MFM/RLL support</div><div class='ctx'> #</div><div class='del'>-CONFIG_IDE=y</div><div class='del'>-CONFIG_BLK_DEV_IDE=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='del'>-#</div><div class='del'>-# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='del'>-CONFIG_BLK_DEV_IDEDISK=y</div><div class='del'>-# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDECD is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='del'>-# CONFIG_IDE_TASK_IOCTL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# IDE chipset support/bugfixes</div><div class='del'>-#</div><div class='del'>-CONFIG_IDE_GENERIC=y</div><div class='del'>-# CONFIG_BLK_DEV_IDEPCI is not set</div><div class='del'>-# CONFIG_IDE_ARM is not set</div><div class='del'>-# CONFIG_IDE_CHIPSETS is not set</div><div class='del'>-# CONFIG_BLK_DEV_IDEDMA is not set</div><div class='del'>-# CONFIG_IDEDMA_AUTO is not set</div><div class='del'>-# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+# CONFIG_IDE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_RAID_ATTRS=y</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='ctx'> # CONFIG_SCSI is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Old CD-ROM drivers (not SCSI, not IDE)</div><div class='del'>-#</div><div class='del'>-# CONFIG_CD_NO_IDESCSI is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Multi-device support (RAID and LVM)</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_MD is not set</div><div class='hunk'>@@ -440,34 +446,50 @@ CONFIG_PHYLIB=y</div><div class='ctx'> #</div><div class='ctx'> # MII PHY device drivers</div><div class='ctx'> #</div><div class='del'>-CONFIG_MARVELL_PHY=y</div><div class='del'>-CONFIG_DAVICOM_PHY=y</div><div class='del'>-CONFIG_QSEMI_PHY=y</div><div class='del'>-CONFIG_LXT_PHY=y</div><div class='del'>-CONFIG_CICADA_PHY=y</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_ETHERNET=y</div><div class='del'>-# CONFIG_MII is not set</div><div class='add'>+CONFIG_MII=y</div><div class='ctx'> # CONFIG_HAPPYMEAL is not set</div><div class='ctx'> # CONFIG_SUNGEM is not set</div><div class='ctx'> # CONFIG_CASSINI is not set</div><div class='ctx'> # CONFIG_NET_VENDOR_3COM is not set</div><div class='del'>-# CONFIG_NET_VENDOR_SMC is not set</div><div class='ctx'> # CONFIG_DM9000 is not set</div><div class='del'>-# CONFIG_NET_VENDOR_RACAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Tulip family network device support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_TULIP is not set</div><div class='del'>-# CONFIG_AT1700 is not set</div><div class='del'>-# CONFIG_DEPCA is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='del'>-# CONFIG_NET_ISA is not set</div><div class='del'>-# CONFIG_NET_PCI is not set</div><div class='add'>+CONFIG_NET_PCI=y</div><div class='add'>+# CONFIG_PCNET32 is not set</div><div class='add'>+# CONFIG_AMD8111_ETH is not set</div><div class='add'>+# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_FORCEDETH is not set</div><div class='add'>+# CONFIG_DGRS is not set</div><div class='add'>+# CONFIG_EEPRO100 is not set</div><div class='add'>+CONFIG_E100=y</div><div class='add'>+# CONFIG_FEALNX is not set</div><div class='add'>+# CONFIG_NATSEMI is not set</div><div class='add'>+# CONFIG_NE2K_PCI is not set</div><div class='add'>+# CONFIG_8139CP is not set</div><div class='add'>+# CONFIG_8139TOO is not set</div><div class='add'>+# CONFIG_SIS900 is not set</div><div class='add'>+# CONFIG_EPIC100 is not set</div><div class='add'>+# CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='add'>+# CONFIG_VIA_RHINE is not set</div><div class='add'>+# CONFIG_LAN_SAA9730 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (1000 Mbit)</div><div class='hunk'>@@ -483,6 +505,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_SKGE is not set</div><div class='ctx'> # CONFIG_SKY2 is not set</div><div class='ctx'> # CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='ctx'> # CONFIG_TIGON3 is not set</div><div class='ctx'> # CONFIG_BNX2 is not set</div><div class='ctx'> </div><div class='hunk'>@@ -492,6 +515,7 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -529,46 +553,18 @@ CONFIG_NET_ETHERNET=y</div><div class='ctx'> #</div><div class='ctx'> # Input device support</div><div class='ctx'> #</div><div class='del'>-CONFIG_INPUT=y</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Userland interfaces</div><div class='del'>-#</div><div class='del'>-CONFIG_INPUT_MOUSEDEV=y</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='del'>-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='del'>-# CONFIG_INPUT_JOYDEV is not set</div><div class='del'>-# CONFIG_INPUT_TSDEV is not set</div><div class='del'>-# CONFIG_INPUT_EVDEV is not set</div><div class='del'>-# CONFIG_INPUT_EVBUG is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Input Device Drivers</div><div class='del'>-#</div><div class='del'>-# CONFIG_INPUT_KEYBOARD is not set</div><div class='del'>-# CONFIG_INPUT_MOUSE is not set</div><div class='del'>-# CONFIG_INPUT_JOYSTICK is not set</div><div class='del'>-# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='del'>-# CONFIG_INPUT_MISC is not set</div><div class='add'>+# CONFIG_INPUT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware I/O ports</div><div class='ctx'> #</div><div class='del'>-CONFIG_SERIO=y</div><div class='del'>-# CONFIG_SERIO_I8042 is not set</div><div class='del'>-CONFIG_SERIO_SERPORT=y</div><div class='del'>-# CONFIG_SERIO_PCIPS2 is not set</div><div class='del'>-# CONFIG_SERIO_LIBPS2 is not set</div><div class='del'>-CONFIG_SERIO_RAW=y</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='ctx'> # CONFIG_GAMEPORT is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Character devices</div><div class='ctx'> #</div><div class='del'>-CONFIG_VT=y</div><div class='del'>-CONFIG_VT_CONSOLE=y</div><div class='del'>-CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT is not set</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -577,8 +573,8 @@ CONFIG_HW_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250=y</div><div class='ctx'> CONFIG_SERIAL_8250_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_8250_PCI=y</div><div class='del'>-CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='del'>-CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=1</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=1</div><div class='ctx'> # CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -600,8 +596,8 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='del'>-# CONFIG_RTC is not set</div><div class='del'>-# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='add'>+CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='ctx'> # CONFIG_APPLICOM is not set</div><div class='hunk'>@@ -632,13 +628,15 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_HWMON is not set</div><div class='add'>+CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Misc devices</div><div class='hunk'>@@ -648,6 +646,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -657,49 +656,8 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='del'>-CONFIG_FB=y</div><div class='del'>-# CONFIG_FB_CFB_FILLRECT is not set</div><div class='del'>-# CONFIG_FB_CFB_COPYAREA is not set</div><div class='del'>-# CONFIG_FB_CFB_IMAGEBLIT is not set</div><div class='del'>-# CONFIG_FB_MACMODES is not set</div><div class='del'>-CONFIG_FB_FIRMWARE_EDID=y</div><div class='del'>-# CONFIG_FB_MODE_HELPERS is not set</div><div class='del'>-# CONFIG_FB_TILEBLITTING is not set</div><div class='del'>-# CONFIG_FB_CIRRUS is not set</div><div class='del'>-# CONFIG_FB_PM2 is not set</div><div class='del'>-# CONFIG_FB_CYBER2000 is not set</div><div class='del'>-# CONFIG_FB_ASILIANT is not set</div><div class='del'>-# CONFIG_FB_IMSTT is not set</div><div class='del'>-# CONFIG_FB_S1D13XXX is not set</div><div class='del'>-# CONFIG_FB_NVIDIA is not set</div><div class='del'>-# CONFIG_FB_RIVA is not set</div><div class='del'>-# CONFIG_FB_MATROX is not set</div><div class='del'>-# CONFIG_FB_RADEON is not set</div><div class='del'>-# CONFIG_FB_ATY128 is not set</div><div class='del'>-# CONFIG_FB_ATY is not set</div><div class='del'>-# CONFIG_FB_SAVAGE is not set</div><div class='del'>-# CONFIG_FB_SIS is not set</div><div class='del'>-# CONFIG_FB_NEOMAGIC is not set</div><div class='del'>-# CONFIG_FB_KYRO is not set</div><div class='del'>-# CONFIG_FB_3DFX is not set</div><div class='del'>-# CONFIG_FB_VOODOO1 is not set</div><div class='del'>-# CONFIG_FB_SMIVGX is not set</div><div class='del'>-# CONFIG_FB_TRIDENT is not set</div><div class='del'>-# CONFIG_FB_VIRTUAL is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Console display driver support</div><div class='del'>-#</div><div class='del'>-# CONFIG_VGA_CONSOLE is not set</div><div class='del'>-# CONFIG_MDA_CONSOLE is not set</div><div class='del'>-CONFIG_DUMMY_CONSOLE=y</div><div class='del'>-# CONFIG_FRAMEBUFFER_CONSOLE is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Logo configuration</div><div class='del'>-#</div><div class='del'>-# CONFIG_LOGO is not set</div><div class='del'>-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Sound</div><div class='hunk'>@@ -756,11 +714,22 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='del'>-CONFIG_EXT2_FS=y</div><div class='del'>-# CONFIG_EXT2_FS_XATTR is not set</div><div class='del'>-# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+# CONFIG_EXT2_FS is not set</div><div class='ctx'> # CONFIG_EXT3_FS is not set</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='hunk'>@@ -770,11 +739,12 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='ctx'> # CONFIG_AUTOFS4_FS is not set</div><div class='del'>-CONFIG_FUSE_FS=y</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CD-ROM/DVD Filesystems</div><div class='hunk'>@@ -795,7 +765,7 @@ CONFIG_FUSE_FS=y</div><div class='ctx'> CONFIG_PROC_FS=y</div><div class='ctx'> CONFIG_PROC_KCORE=y</div><div class='ctx'> CONFIG_SYSFS=y</div><div class='del'>-# CONFIG_TMPFS is not set</div><div class='add'>+CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='hunk'>@@ -821,18 +791,21 @@ CONFIG_RAMFS=y</div><div class='ctx'> # Network File Systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='del'>-# CONFIG_NFS_V3 is not set</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='ctx'> # CONFIG_NFS_V4 is not set</div><div class='ctx'> # CONFIG_NFS_DIRECTIO is not set</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='ctx'> CONFIG_ROOT_NFS=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -859,48 +832,23 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='del'>-# CONFIG_UNWIND_INFO is not set</div><div class='ctx'> CONFIG_CROSSCOMPILE=y</div><div class='del'>-CONFIG_CMDLINE="ip=any"</div><div class='add'>+CONFIG_CMDLINE="console=ttyS0,115200n8"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='ctx'> #</div><div class='del'>-CONFIG_KEYS=y</div><div class='del'>-CONFIG_KEYS_DEBUG_PROC_KEYS=y</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='ctx'> # CONFIG_SECURITY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Cryptographic options</div><div class='ctx'> #</div><div class='del'>-CONFIG_CRYPTO=y</div><div class='del'>-CONFIG_CRYPTO_HMAC=y</div><div class='del'>-CONFIG_CRYPTO_NULL=y</div><div class='del'>-CONFIG_CRYPTO_MD4=y</div><div class='del'>-CONFIG_CRYPTO_MD5=y</div><div class='del'>-CONFIG_CRYPTO_SHA1=y</div><div class='del'>-CONFIG_CRYPTO_SHA256=y</div><div class='del'>-CONFIG_CRYPTO_SHA512=y</div><div class='del'>-CONFIG_CRYPTO_WP512=y</div><div class='del'>-CONFIG_CRYPTO_TGR192=y</div><div class='del'>-CONFIG_CRYPTO_DES=y</div><div class='del'>-CONFIG_CRYPTO_BLOWFISH=y</div><div class='del'>-CONFIG_CRYPTO_TWOFISH=y</div><div class='del'>-CONFIG_CRYPTO_SERPENT=y</div><div class='del'>-CONFIG_CRYPTO_AES=y</div><div class='del'>-CONFIG_CRYPTO_CAST5=y</div><div class='del'>-CONFIG_CRYPTO_CAST6=y</div><div class='del'>-CONFIG_CRYPTO_TEA=y</div><div class='del'>-CONFIG_CRYPTO_ARC4=y</div><div class='del'>-CONFIG_CRYPTO_KHAZAD=y</div><div class='del'>-CONFIG_CRYPTO_ANUBIS=y</div><div class='del'>-CONFIG_CRYPTO_DEFLATE=y</div><div class='del'>-CONFIG_CRYPTO_MICHAEL_MIC=y</div><div class='del'>-CONFIG_CRYPTO_CRC32C=y</div><div class='del'>-# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware crypto devices</div><div class='hunk'>@@ -909,9 +857,8 @@ CONFIG_CRYPTO_CRC32C=y</div><div class='ctx'> #</div><div class='ctx'> # Library routines</div><div class='ctx'> #</div><div class='del'>-# CONFIG_CRC_CCITT is not set</div><div class='add'>+CONFIG_CRC_CCITT=y</div><div class='ctx'> CONFIG_CRC16=y</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=y</div><div class='del'>-CONFIG_ZLIB_INFLATE=y</div><div class='del'>-CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig<br/>index b52d709de962..3a68d8a25b66 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/configs/yosemite_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/configs/yosemite_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/configs/yosemite_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/configs/yosemite_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:51:20 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 10:04:21 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> CONFIG_PMC_YOSEMITE=y</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> # CONFIG_SGI_IP22 is not set</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -68,6 +69,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_DMA_COHERENT=y</div><div class='ctx'> CONFIG_CPU_BIG_ENDIAN=y</div><div class='ctx'> # CONFIG_CPU_LITTLE_ENDIAN is not set</div><div class='hunk'>@@ -116,12 +118,16 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_16KB is not set</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_CPU_HAS_PREFETCH=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='ctx'> CONFIG_HIGHMEM=y</div><div class='ctx'> CONFIG_CPU_SUPPORTS_HIGHMEM=y</div><div class='ctx'> CONFIG_SYS_SUPPORTS_HIGHMEM=y</div><div class='hunk'>@@ -130,12 +136,24 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='ctx'> CONFIG_SMP=y</div><div class='add'>+CONFIG_SYS_SUPPORTS_SMP=y</div><div class='ctx'> CONFIG_NR_CPUS=2</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> CONFIG_PREEMPT_BKL=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -168,10 +186,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -261,6 +281,8 @@ CONFIG_IP_PNP_BOOTP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -273,7 +295,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> # CONFIG_BRIDGE is not set</div><div class='ctx'> # CONFIG_VLAN_8021Q is not set</div><div class='hunk'>@@ -310,6 +335,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=m</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -404,6 +430,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+CONFIG_VITESSE_PHY=m</div><div class='add'>+CONFIG_SMSC_PHY=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -445,6 +473,7 @@ CONFIG_TITAN_GE=y</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -522,6 +551,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> CONFIG_GEN_RTC=y</div><div class='ctx'> CONFIG_GEN_RTC_X=y</div><div class='hunk'>@@ -569,6 +599,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -578,6 +609,7 @@ CONFIG_GEN_RTC_X=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -634,6 +666,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EXT2_FS is not set</div><div class='hunk'>@@ -645,6 +690,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -697,6 +743,7 @@ CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> </div><div class='hunk'>@@ -716,14 +763,19 @@ CONFIG_MSDOS_PARTITION=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_HIGHMEM is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='hunk'>@@ -786,3 +838,4 @@ CONFIG_CRC32=m</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=m</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/ddb5xxx/common/prom.c b/arch/mips/ddb5xxx/common/prom.c<br/>index b8d1f7489f3b..efef0f57ce1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/common/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/common/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/common/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ddb5xxx/common/prom.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -21,8 +20,6 @@</div><div class='ctx'> const char *get_system_type(void)</div><div class='ctx'> {</div><div class='ctx'> 	switch (mips_machtype) {</div><div class='del'>-	case MACH_NEC_DDB5074:		return "NEC DDB Vrc-5074";</div><div class='del'>-	case MACH_NEC_DDB5476:		return "NEC DDB Vrc-5476";</div><div class='ctx'> 	case MACH_NEC_DDB5477:		return "NEC DDB Vrc-5477";</div><div class='ctx'> 	case MACH_NEC_ROCKHOPPER:	return "NEC Rockhopper";</div><div class='ctx'> 	case MACH_NEC_ROCKHOPPERII:     return "NEC RockhopperII";</div><div class='hunk'>@@ -56,13 +53,7 @@ void __init prom_init(void)</div><div class='ctx'> </div><div class='ctx'> 	mips_machgroup = MACH_GROUP_NEC_DDB;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_DDB5074)</div><div class='del'>-	mips_machtype = MACH_NEC_DDB5074;</div><div class='del'>-	add_memory_region(0, DDB_SDRAM_SIZE, BOOT_MEM_RAM);</div><div class='del'>-#elif defined(CONFIG_DDB5476)</div><div class='del'>-	mips_machtype = MACH_NEC_DDB5476;</div><div class='del'>-	add_memory_region(0, DDB_SDRAM_SIZE, BOOT_MEM_RAM);</div><div class='del'>-#elif defined(CONFIG_DDB5477)</div><div class='add'>+#if defined(CONFIG_DDB5477)</div><div class='ctx'> 	ddb5477_runtime_detection();</div><div class='ctx'> 	add_memory_region(0, board_ram_size, BOOT_MEM_RAM);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5074/Makefile b/arch/mips/ddb5xxx/ddb5074/Makefile<br/>deleted file mode 100644<br/>index 304c02107b46..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5074/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the NEC DDB Vrc-5074 specific kernel interface routines</div><div class='del'>-# under Linux.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y			+= setup.o irq.o nile4_pic.o</div><div class='del'>-</div><div class='del'>-EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5074/irq.c b/arch/mips/ddb5xxx/ddb5074/irq.c<br/>deleted file mode 100644<br/>index 60c087b7738c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5074/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/irq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,169 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/ddb5074/irq.c -- NEC DDB Vrc-5074 interrupt routines</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *                     Sony Software Development Center Europe (SDCE), Brussels</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/i8259.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq_cpu.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/nile4.h&gt;</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5074.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };</div><div class='del'>-</div><div class='del'>-#define M1543_PNP_CONFIG	0x03f0	/* PnP Config Port */</div><div class='del'>-#define M1543_PNP_INDEX		0x03f0	/* PnP Index Port */</div><div class='del'>-#define M1543_PNP_DATA		0x03f1	/* PnP Data Port */</div><div class='del'>-</div><div class='del'>-#define M1543_PNP_ALT_CONFIG	0x0370	/* Alternative PnP Config Port */</div><div class='del'>-#define M1543_PNP_ALT_INDEX	0x0370	/* Alternative PnP Index Port */</div><div class='del'>-#define M1543_PNP_ALT_DATA	0x0371	/* Alternative PnP Data Port */</div><div class='del'>-</div><div class='del'>-#define M1543_INT1_MASTER_CTRL	0x0020	/* INT_1 (master) Control Register */</div><div class='del'>-#define M1543_INT1_MASTER_MASK	0x0021	/* INT_1 (master) Mask Register */</div><div class='del'>-</div><div class='del'>-#define M1543_INT1_SLAVE_CTRL	0x00a0	/* INT_1 (slave) Control Register */</div><div class='del'>-#define M1543_INT1_SLAVE_MASK	0x00a1	/* INT_1 (slave) Mask Register */</div><div class='del'>-</div><div class='del'>-#define M1543_INT1_MASTER_ELCR	0x04d0	/* INT_1 (master) Edge/Level Control */</div><div class='del'>-#define M1543_INT1_SLAVE_ELCR	0x04d1	/* INT_1 (slave) Edge/Level Control */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void m1543_irq_setup(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *  The ALI M1543 has 13 interrupt inputs, IRQ1..IRQ13.  Not all</div><div class='del'>-	 *  the possible IO sources in the M1543 are in use by us.  We will</div><div class='del'>-	 *  use the following mapping:</div><div class='del'>-	 *</div><div class='del'>-	 *      IRQ1  - keyboard (default set by M1543)</div><div class='del'>-	 *      IRQ3  - reserved for UART B (default set by M1543) (note that</div><div class='del'>-	 *              the schematics for the DDB Vrc-5074 board seem to</div><div class='del'>-	 *              indicate that IRQ3 is connected to the DS1386</div><div class='del'>-	 *              watchdog timer interrupt output so we might have</div><div class='del'>-	 *              a conflict)</div><div class='del'>-	 *      IRQ4  - reserved for UART A (default set by M1543)</div><div class='del'>-	 *      IRQ5  - parallel (default set by M1543)</div><div class='del'>-	 *      IRQ8  - DS1386 time of day (RTC) interrupt</div><div class='del'>-	 *      IRQ12 - mouse</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Assing mouse interrupt to IRQ12</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Enter configuration mode */</div><div class='del'>-	outb(0x51, M1543_PNP_CONFIG);</div><div class='del'>-	outb(0x23, M1543_PNP_CONFIG);</div><div class='del'>-</div><div class='del'>-	/* Select logical device 7 (Keyboard) */</div><div class='del'>-	outb(0x07, M1543_PNP_INDEX);</div><div class='del'>-	outb(0x07, M1543_PNP_DATA);</div><div class='del'>-</div><div class='del'>-	/* Select IRQ12 */</div><div class='del'>-	outb(0x72, M1543_PNP_INDEX);</div><div class='del'>-	outb(0x0c, M1543_PNP_DATA);</div><div class='del'>-</div><div class='del'>-	outb(0x30, M1543_PNP_INDEX);</div><div class='del'>-	printk("device 7, 0x30: %02x\n",inb(M1543_PNP_DATA));</div><div class='del'>-</div><div class='del'>-	outb(0x70, M1543_PNP_INDEX);</div><div class='del'>-	printk("device 7, 0x70: %02x\n",inb(M1543_PNP_DATA));</div><div class='del'>-</div><div class='del'>-	/* Leave configration mode */</div><div class='del'>-	outb(0xbb, M1543_PNP_CONFIG);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_local0_irqdispatch(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	u32 mask;</div><div class='del'>-	int nile4_irq;</div><div class='del'>-</div><div class='del'>-	mask = nile4_get_irq_stat(0);</div><div class='del'>-</div><div class='del'>-	/* Handle the timer interrupt first */</div><div class='del'>-#if 0</div><div class='del'>-	if (mask &amp; (1 &lt;&lt; NILE4_INT_GPT)) {</div><div class='del'>-		do_IRQ(nile4_to_irq(NILE4_INT_GPT), regs);</div><div class='del'>-		mask &amp;= ~(1 &lt;&lt; NILE4_INT_GPT);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	for (nile4_irq = 0; mask; nile4_irq++, mask &gt;&gt;= 1)</div><div class='del'>-		if (mask &amp; 1) {</div><div class='del'>-			if (nile4_irq == NILE4_INT_INTE) {</div><div class='del'>-				int i8259_irq;</div><div class='del'>-</div><div class='del'>-				nile4_clear_irq(NILE4_INT_INTE);</div><div class='del'>-				i8259_irq = nile4_i8259_iack();</div><div class='del'>-				do_IRQ(i8259_irq, regs);</div><div class='del'>-			} else</div><div class='del'>-				do_IRQ(nile4_to_irq(nile4_irq), regs);</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_local1_irqdispatch(void)</div><div class='del'>-{</div><div class='del'>-	printk("ddb_local1_irqdispatch called\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_buserror_irq(void)</div><div class='del'>-{</div><div class='del'>-	printk("ddb_buserror_irq called\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_8254timer_irq(void)</div><div class='del'>-{</div><div class='del'>-	printk("ddb_8254timer_irq called\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned int pending = read_c0_cause() &amp; read_c0_status();</div><div class='del'>-</div><div class='del'>-	if (pending &amp; CAUSEF_IP2)</div><div class='del'>-		ddb_local0_irqdispatch(regs);</div><div class='del'>-	else if (pending &amp; CAUSEF_IP3)</div><div class='del'>-		ddb_local1_irqdispatch();</div><div class='del'>-	else if (pending &amp; CAUSEF_IP6)</div><div class='del'>-		ddb_buserror_irq();</div><div class='del'>-	else if (pending &amp; (CAUSEF_IP4 | CAUSEF_IP5))</div><div class='del'>-		ddb_8254timer_irq();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init arch_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	/* setup cascade interrupts */</div><div class='del'>-	setup_irq(NILE4_IRQ_BASE  + NILE4_INT_INTE, &amp;irq_cascade);</div><div class='del'>-	setup_irq(CPU_IRQ_BASE + CPU_NILE4_CASCADE, &amp;irq_cascade);</div><div class='del'>-</div><div class='del'>-	nile4_irq_setup(NILE4_IRQ_BASE);</div><div class='del'>-	m1543_irq_setup();</div><div class='del'>-	init_i8259_irqs();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	printk("CPU_IRQ_BASE: %d\n",CPU_IRQ_BASE);</div><div class='del'>-</div><div class='del'>-	mips_cpu_irq_init(CPU_IRQ_BASE);</div><div class='del'>-</div><div class='del'>-	printk("enabling 8259 cascade\n");</div><div class='del'>-</div><div class='del'>-	ddb5074_led_hex(0);</div><div class='del'>-</div><div class='del'>-	/* Enable the interrupt cascade */</div><div class='del'>-	nile4_enable_irq(NILE4_IRQ_BASE+IRQ_I8259_CASCADE);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5074/nile4_pic.c b/arch/mips/ddb5xxx/ddb5074/nile4_pic.c<br/>deleted file mode 100644<br/>index 8743ffce8653..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5074/nile4_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/nile4_pic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,286 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/ddb5476/nile4.c --</div><div class='del'>- *  	low-level PIC code for NEC Vrc-5476 (Nile 4)</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *                     Sony Software Development Center Europe (SDCE), Brussels</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 MontaVista Software Inc.</div><div class='del'>- *  Author: jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-static int irq_base;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Interrupt Programming</div><div class='del'>- */</div><div class='del'>-void nile4_map_irq(int nile4_irq, int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 offset, t;</div><div class='del'>-</div><div class='del'>-	offset = DDB_INTCTRL;</div><div class='del'>-	if (nile4_irq &gt;= 8) {</div><div class='del'>-		offset += 4;</div><div class='del'>-		nile4_irq -= 8;</div><div class='del'>-	}</div><div class='del'>-	t = ddb_in32(offset);</div><div class='del'>-	t &amp;= ~(7 &lt;&lt; (nile4_irq * 4));</div><div class='del'>-	t |= cpu_irq &lt;&lt; (nile4_irq * 4);</div><div class='del'>-	ddb_out32(offset, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_map_irq_all(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 all, t;</div><div class='del'>-</div><div class='del'>-	all = cpu_irq;</div><div class='del'>-	all |= all &lt;&lt; 4;</div><div class='del'>-	all |= all &lt;&lt; 8;</div><div class='del'>-	all |= all &lt;&lt; 16;</div><div class='del'>-	t = ddb_in32(DDB_INTCTRL);</div><div class='del'>-	t &amp;= 0x88888888;</div><div class='del'>-	t |= all;</div><div class='del'>-	ddb_out32(DDB_INTCTRL, t);</div><div class='del'>-	t = ddb_in32(DDB_INTCTRL + 4);</div><div class='del'>-	t &amp;= 0x88888888;</div><div class='del'>-	t |= all;</div><div class='del'>-	ddb_out32(DDB_INTCTRL + 4, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_enable_irq(unsigned int nile4_irq)</div><div class='del'>-{</div><div class='del'>-	u32 offset, t;</div><div class='del'>-</div><div class='del'>-	nile4_irq-=irq_base;</div><div class='del'>-</div><div class='del'>-	ddb5074_led_hex(8);</div><div class='del'>-</div><div class='del'>-	offset = DDB_INTCTRL;</div><div class='del'>-	if (nile4_irq &gt;= 8) {</div><div class='del'>-		offset += 4;</div><div class='del'>-		nile4_irq -= 8;</div><div class='del'>-	}</div><div class='del'>-	ddb5074_led_hex(9);</div><div class='del'>-	t = ddb_in32(offset);</div><div class='del'>-	ddb5074_led_hex(0xa);</div><div class='del'>-	t |= 8 &lt;&lt; (nile4_irq * 4);</div><div class='del'>-	ddb_out32(offset, t);</div><div class='del'>-	ddb5074_led_hex(0xb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_disable_irq(unsigned int nile4_irq)</div><div class='del'>-{</div><div class='del'>-	u32 offset, t;</div><div class='del'>-</div><div class='del'>-	nile4_irq-=irq_base;</div><div class='del'>-</div><div class='del'>-	offset = DDB_INTCTRL;</div><div class='del'>-	if (nile4_irq &gt;= 8) {</div><div class='del'>-		offset += 4;</div><div class='del'>-		nile4_irq -= 8;</div><div class='del'>-	}</div><div class='del'>-	t = ddb_in32(offset);</div><div class='del'>-	t &amp;= ~(8 &lt;&lt; (nile4_irq * 4));</div><div class='del'>-	ddb_out32(offset, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_disable_irq_all(void)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(DDB_INTCTRL, 0);</div><div class='del'>-	ddb_out32(DDB_INTCTRL + 4, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 nile4_get_irq_stat(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	return ddb_in16(DDB_INTSTAT0 + cpu_irq * 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_enable_irq_output(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTSTAT1 + 4);</div><div class='del'>-	t |= 1 &lt;&lt; (16 + cpu_irq);</div><div class='del'>-	ddb_out32(DDB_INTSTAT1, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_disable_irq_output(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTSTAT1 + 4);</div><div class='del'>-	t &amp;= ~(1 &lt;&lt; (16 + cpu_irq));</div><div class='del'>-	ddb_out32(DDB_INTSTAT1, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_set_pci_irq_polarity(int pci_irq, int high)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTPPES);</div><div class='del'>-	if (high)</div><div class='del'>-		t &amp;= ~(1 &lt;&lt; (pci_irq * 2));</div><div class='del'>-	else</div><div class='del'>-		t |= 1 &lt;&lt; (pci_irq * 2);</div><div class='del'>-	ddb_out32(DDB_INTPPES, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_set_pci_irq_level_or_edge(int pci_irq, int level)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTPPES);</div><div class='del'>-	if (level)</div><div class='del'>-		t |= 2 &lt;&lt; (pci_irq * 2);</div><div class='del'>-	else</div><div class='del'>-		t &amp;= ~(2 &lt;&lt; (pci_irq * 2));</div><div class='del'>-	ddb_out32(DDB_INTPPES, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_clear_irq(int nile4_irq)</div><div class='del'>-{</div><div class='del'>-	nile4_irq-=irq_base;</div><div class='del'>-	ddb_out32(DDB_INTCLR, 1 &lt;&lt; nile4_irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_clear_irq_mask(u32 mask)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(DDB_INTCLR, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 nile4_i8259_iack(void)</div><div class='del'>-{</div><div class='del'>-	u8 irq;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	/* Set window 0 for interrupt acknowledge */</div><div class='del'>-	reg = ddb_in32(DDB_PCIINIT0);</div><div class='del'>-</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT0, DDB_PCICMD_IACK, 0, DDB_PCI_ACCESS_32);</div><div class='del'>-	irq = *(volatile u8 *) KSEG1ADDR(DDB_PCI_IACK_BASE);</div><div class='del'>-	/* restore window 0 for PCI I/O space */</div><div class='del'>-	// ddb_set_pmr(DDB_PCIINIT0, DDB_PCICMD_IO, 0, DDB_PCI_ACCESS_32);</div><div class='del'>-	ddb_out32(DDB_PCIINIT0, reg);</div><div class='del'>-</div><div class='del'>-	/* i8269.c set the base vector to be 0x0 */</div><div class='del'>-	return irq ;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int nile4_irq_startup(unsigned int irq) {</div><div class='del'>-</div><div class='del'>-	nile4_enable_irq(irq);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nile4_ack_irq(unsigned int irq) {</div><div class='del'>-</div><div class='del'>-    ddb5074_led_hex(4);</div><div class='del'>-</div><div class='del'>-	nile4_clear_irq(irq);</div><div class='del'>-    ddb5074_led_hex(2);</div><div class='del'>-	nile4_disable_irq(irq);</div><div class='del'>-</div><div class='del'>-    ddb5074_led_hex(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nile4_irq_end(unsigned int irq) {</div><div class='del'>-</div><div class='del'>-	ddb5074_led_hex(3);</div><div class='del'>-	if(!(irq_desc[irq].status &amp; (IRQ_DISABLED | IRQ_INPROGRESS))) {</div><div class='del'>-	ddb5074_led_hex(5);</div><div class='del'>-		nile4_enable_irq(irq);</div><div class='del'>-	ddb5074_led_hex(7);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ddb5074_led_hex(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define nile4_irq_shutdown nile4_disable_irq</div><div class='del'>-</div><div class='del'>-static hw_irq_controller nile4_irq_controller = {</div><div class='del'>-	.typename = "nile4",</div><div class='del'>-	.startup = nile4_irq_startup,</div><div class='del'>-	.shutdown = nile4_irq_shutdown,</div><div class='del'>-	.enable = nile4_enable_irq,</div><div class='del'>-	.disable = nile4_disable_irq,</div><div class='del'>-	.ack = nile4_ack_irq,</div><div class='del'>-	.end = nile4_irq_end,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void nile4_irq_setup(u32 base) {</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	irq_base=base;</div><div class='del'>-</div><div class='del'>-	/* Map all interrupts to CPU int #0 */</div><div class='del'>-	nile4_map_irq_all(0);</div><div class='del'>-</div><div class='del'>-	/* PCI INTA#-E# must be level triggered */</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(0, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(1, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(2, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(3, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(4, 1);</div><div class='del'>-</div><div class='del'>-	/* PCI INTA#-D# must be active low, INTE# must be active high */</div><div class='del'>-	nile4_set_pci_irq_polarity(0, 0);</div><div class='del'>-	nile4_set_pci_irq_polarity(1, 0);</div><div class='del'>-	nile4_set_pci_irq_polarity(2, 0);</div><div class='del'>-	nile4_set_pci_irq_polarity(3, 0);</div><div class='del'>-	nile4_set_pci_irq_polarity(4, 1);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		nile4_clear_irq(i);</div><div class='del'>-		nile4_disable_irq(i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable CPU int #0 */</div><div class='del'>-	nile4_enable_irq_output(0);</div><div class='del'>-</div><div class='del'>-	for (i= base; i&lt; base + NUM_NILE4_INTERRUPTS; i++) {</div><div class='del'>-		irq_desc[i].status = IRQ_DISABLED;</div><div class='del'>-		irq_desc[i].action = NULL;</div><div class='del'>-		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;nile4_irq_controller;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_RUNTIME_DEBUG)</div><div class='del'>-void nile4_dump_irq_status(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "</div><div class='del'>-	       CPUSTAT = %p:%p\n", (void *) ddb_in32(DDB_CPUSTAT + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_CPUSTAT));</div><div class='del'>-	printk(KERN_DEBUG "</div><div class='del'>-	       INTCTRL = %p:%p\n", (void *) ddb_in32(DDB_INTCTRL + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTCTRL));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTSTAT0 = %p:%p\n",</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT0 + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT0));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTSTAT1 = %p:%p\n",</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT1 + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT1));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTCLR = %p:%p\n", (void *) ddb_in32(DDB_INTCLR + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTCLR));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTPPES = %p:%p\n", (void *) ddb_in32(DDB_INTPPES + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTPPES));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5074/setup.c b/arch/mips/ddb5xxx/ddb5074/setup.c<br/>deleted file mode 100644<br/>index 91456b068c2e..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5074/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5074/setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,234 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/ddb5074/setup.c -- NEC DDB Vrc-5074 setup routines</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *                     Sony Software Development Center Europe (SDCE), Brussels</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kbd_ll.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/kdev_t.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-#include &lt;asm/bcache.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/nile4.h&gt;</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5074.h&gt;</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-static void (*back_to_prom) (void) = (void (*)(void)) 0xbfc00000;</div><div class='del'>-</div><div class='del'>-static void ddb_machine_restart(char *command)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* PCI cold reset */</div><div class='del'>-	t = nile4_in32(NILE4_PCICTRL + 4);</div><div class='del'>-	t |= 0x40000000;</div><div class='del'>-	nile4_out32(NILE4_PCICTRL + 4, t);</div><div class='del'>-	/* CPU cold reset */</div><div class='del'>-	t = nile4_in32(NILE4_CPUSTAT);</div><div class='del'>-	t |= 1;</div><div class='del'>-	nile4_out32(NILE4_CPUSTAT, t);</div><div class='del'>-	/* Call the PROM */</div><div class='del'>-	back_to_prom();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_machine_halt(void)</div><div class='del'>-{</div><div class='del'>-	printk("DDB Vrc-5074 halted.\n");</div><div class='del'>-	do {</div><div class='del'>-	} while (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_machine_power_off(void)</div><div class='del'>-{</div><div class='del'>-	printk("DDB Vrc-5074 halted. Please turn off the power.\n");</div><div class='del'>-	do {</div><div class='del'>-	} while (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void rtc_ds1386_init(unsigned long base);</div><div class='del'>-</div><div class='del'>-extern void (*board_timer_setup) (struct irqaction * irq);</div><div class='del'>-</div><div class='del'>-static void __init ddb_timer_init(struct irqaction *irq)</div><div class='del'>-{</div><div class='del'>-	/* set the clock to 1 Hz */</div><div class='del'>-	nile4_out32(NILE4_T2CTRL, 1000000);</div><div class='del'>-	/* enable the General-Purpose Timer */</div><div class='del'>-	nile4_out32(NILE4_T2CTRL + 4, 0x00000001);</div><div class='del'>-	/* reset timer */</div><div class='del'>-	nile4_out32(NILE4_T2CNTR, 0);</div><div class='del'>-	/* enable interrupt */</div><div class='del'>-	setup_irq(nile4_to_irq(NILE4_INT_GPT), irq);</div><div class='del'>-	nile4_enable_irq(nile4_to_irq(NILE4_INT_GPT));</div><div class='del'>-	change_c0_status(ST0_IM,</div><div class='del'>-		          IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init ddb_time_init(void)</div><div class='del'>-{</div><div class='del'>-	/* we have ds1396 RTC chip */</div><div class='del'>-	rtc_ds1386_init(KSEG1ADDR(DDB_PCI_MEM_BASE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void __init plat_setup(void)</div><div class='del'>-{</div><div class='del'>-	set_io_port_base(NILE4_PCI_IO_BASE);</div><div class='del'>-	isa_slot_offset = NILE4_PCI_MEM_BASE;</div><div class='del'>-	board_timer_setup = ddb_timer_init;</div><div class='del'>-	board_time_init = ddb_time_init;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	_machine_restart = ddb_machine_restart;</div><div class='del'>-	_machine_halt = ddb_machine_halt;</div><div class='del'>-	pm_power_off = ddb_machine_power_off;</div><div class='del'>-</div><div class='del'>-	ddb_out32(DDB_BAR0, 0);</div><div class='del'>-</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT0, DDB_PCICMD_IO, 0, 0x10);</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT1, DDB_PCICMD_MEM, DDB_PCI_MEM_BASE , 0x10);</div><div class='del'>-</div><div class='del'>-	/* Reboot on panic */</div><div class='del'>-	panic_timeout = 180;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define USE_NILE4_SERIAL	0</div><div class='del'>-</div><div class='del'>-#if USE_NILE4_SERIAL</div><div class='del'>-#define ns16550_in(reg)		nile4_in8((reg)*8)</div><div class='del'>-#define ns16550_out(reg, val)	nile4_out8((reg)*8, (val))</div><div class='del'>-#else</div><div class='del'>-#define NS16550_BASE		(NILE4_PCI_IO_BASE+0x03f8)</div><div class='del'>-static inline u8 ns16550_in(u32 reg)</div><div class='del'>-{</div><div class='del'>-	return *(volatile u8 *) (NS16550_BASE + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ns16550_out(u32 reg, u8 val)</div><div class='del'>-{</div><div class='del'>-	*(volatile u8 *) (NS16550_BASE + reg) = val;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define NS16550_RBR		0</div><div class='del'>-#define NS16550_THR		0</div><div class='del'>-#define NS16550_DLL		0</div><div class='del'>-#define NS16550_IER		1</div><div class='del'>-#define NS16550_DLM		1</div><div class='del'>-#define NS16550_FCR		2</div><div class='del'>-#define NS16550_IIR		2</div><div class='del'>-#define NS16550_LCR		3</div><div class='del'>-#define NS16550_MCR		4</div><div class='del'>-#define NS16550_LSR		5</div><div class='del'>-#define NS16550_MSR		6</div><div class='del'>-#define NS16550_SCR		7</div><div class='del'>-</div><div class='del'>-#define NS16550_LSR_DR		0x01	/* Data ready */</div><div class='del'>-#define NS16550_LSR_OE		0x02	/* Overrun */</div><div class='del'>-#define NS16550_LSR_PE		0x04	/* Parity error */</div><div class='del'>-#define NS16550_LSR_FE		0x08	/* Framing error */</div><div class='del'>-#define NS16550_LSR_BI		0x10	/* Break */</div><div class='del'>-#define NS16550_LSR_THRE	0x20	/* Xmit holding register empty */</div><div class='del'>-#define NS16550_LSR_TEMT	0x40	/* Xmitter empty */</div><div class='del'>-#define NS16550_LSR_ERR		0x80	/* Error */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void _serinit(void)</div><div class='del'>-{</div><div class='del'>-#if USE_NILE4_SERIAL</div><div class='del'>-	ns16550_out(NS16550_LCR, 0x80);</div><div class='del'>-	ns16550_out(NS16550_DLM, 0x00);</div><div class='del'>-	ns16550_out(NS16550_DLL, 0x36);	/* 9600 baud */</div><div class='del'>-	ns16550_out(NS16550_LCR, 0x00);</div><div class='del'>-	ns16550_out(NS16550_LCR, 0x03);</div><div class='del'>-	ns16550_out(NS16550_FCR, 0x47);</div><div class='del'>-#else</div><div class='del'>-	/* done by PMON */</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void _putc(char c)</div><div class='del'>-{</div><div class='del'>-	while (!(ns16550_in(NS16550_LSR) &amp; NS16550_LSR_THRE));</div><div class='del'>-	ns16550_out(NS16550_THR, c);</div><div class='del'>-	if (c == '\n') {</div><div class='del'>-		while (!(ns16550_in(NS16550_LSR) &amp; NS16550_LSR_THRE));</div><div class='del'>-		ns16550_out(NS16550_THR, '\r');</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void _puts(const char *s)</div><div class='del'>-{</div><div class='del'>-	char c;</div><div class='del'>-	while ((c = *s++))</div><div class='del'>-		_putc(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char _getc(void)</div><div class='del'>-{</div><div class='del'>-	while (!(ns16550_in(NS16550_LSR) &amp; NS16550_LSR_DR));</div><div class='del'>-	return ns16550_in(NS16550_RBR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int _testc(void)</div><div class='del'>-{</div><div class='del'>-	return (ns16550_in(NS16550_LSR) &amp; NS16550_LSR_DR) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Hexadecimal 7-segment LED</div><div class='del'>- */</div><div class='del'>-void ddb5074_led_hex(int hex)</div><div class='del'>-{</div><div class='del'>-	outb(hex, 0x80);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  LEDs D2 and D3, connected to the GPIO pins of the PMU in the ALi M1543</div><div class='del'>- */</div><div class='del'>-struct pci_dev *pci_pmu = NULL;</div><div class='del'>-</div><div class='del'>-void ddb5074_led_d2(int on)</div><div class='del'>-{</div><div class='del'>-	u8 t;</div><div class='del'>-</div><div class='del'>-	if (pci_pmu) {</div><div class='del'>-		pci_read_config_byte(pci_pmu, 0x7e, &amp;t);</div><div class='del'>-		if (on)</div><div class='del'>-			t &amp;= 0x7f;</div><div class='del'>-		else</div><div class='del'>-			t |= 0x80;</div><div class='del'>-		pci_write_config_byte(pci_pmu, 0x7e, t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ddb5074_led_d3(int on)</div><div class='del'>-{</div><div class='del'>-	u8 t;</div><div class='del'>-</div><div class='del'>-	if (pci_pmu) {</div><div class='del'>-		pci_read_config_byte(pci_pmu, 0x7e, &amp;t);</div><div class='del'>-		if (on)</div><div class='del'>-			t &amp;= 0xbf;</div><div class='del'>-		else</div><div class='del'>-			t |= 0x40;</div><div class='del'>-		pci_write_config_byte(pci_pmu, 0x7e, t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5476/Makefile b/arch/mips/ddb5xxx/ddb5476/Makefile<br/>deleted file mode 100644<br/>index ab0312cb47b4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5476/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the NEC DDB Vrc-5476 specific kernel interface routines</div><div class='del'>-# under Linux.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-y			+= setup.o irq.o nile4_pic.o vrc5476_irq.o</div><div class='del'>-obj-$(CONFIG_KGDB)	+= dbg_io.o</div><div class='del'>-</div><div class='del'>-EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5476/dbg_io.c b/arch/mips/ddb5xxx/ddb5476/dbg_io.c<br/>deleted file mode 100644<br/>index 85e9e5013679..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5476/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/dbg_io.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,136 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * kgdb io functions for DDB5476.  We use the second serial port.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 MontaVista Software Inc.</div><div class='del'>- * Author: jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* ======================= CONFIG ======================== */</div><div class='del'>-</div><div class='del'>-/* [jsun] we use the second serial port for kdb */</div><div class='del'>-#define         BASE                    0xa60002f8</div><div class='del'>-#define         MAX_BAUD                115200</div><div class='del'>-</div><div class='del'>-/* distance in bytes between two serial registers */</div><div class='del'>-#define         REG_OFFSET              1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 0 - kgdb does serial init</div><div class='del'>- * 1 - kgdb skip serial init</div><div class='del'>- */</div><div class='del'>-static int remoteDebugInitialized = 0;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the default baud rate *if* kgdb does serial init</div><div class='del'>- */</div><div class='del'>-#define		BAUD_DEFAULT		UART16550_BAUD_38400</div><div class='del'>-</div><div class='del'>-/* ======================= END OF CONFIG ======================== */</div><div class='del'>-</div><div class='del'>-typedef unsigned char uint8;</div><div class='del'>-typedef unsigned int uint32;</div><div class='del'>-</div><div class='del'>-#define         UART16550_BAUD_2400             2400</div><div class='del'>-#define         UART16550_BAUD_4800             4800</div><div class='del'>-#define         UART16550_BAUD_9600             9600</div><div class='del'>-#define         UART16550_BAUD_19200            19200</div><div class='del'>-#define         UART16550_BAUD_38400            38400</div><div class='del'>-#define         UART16550_BAUD_57600            57600</div><div class='del'>-#define         UART16550_BAUD_115200           115200</div><div class='del'>-</div><div class='del'>-#define         UART16550_PARITY_NONE           0</div><div class='del'>-#define         UART16550_PARITY_ODD            0x08</div><div class='del'>-#define         UART16550_PARITY_EVEN           0x18</div><div class='del'>-#define         UART16550_PARITY_MARK           0x28</div><div class='del'>-#define         UART16550_PARITY_SPACE          0x38</div><div class='del'>-</div><div class='del'>-#define         UART16550_DATA_5BIT             0x0</div><div class='del'>-#define         UART16550_DATA_6BIT             0x1</div><div class='del'>-#define         UART16550_DATA_7BIT             0x2</div><div class='del'>-#define         UART16550_DATA_8BIT             0x3</div><div class='del'>-</div><div class='del'>-#define         UART16550_STOP_1BIT             0x0</div><div class='del'>-#define         UART16550_STOP_2BIT             0x4</div><div class='del'>-</div><div class='del'>-/* register offset */</div><div class='del'>-#define         OFS_RCV_BUFFER          0</div><div class='del'>-#define         OFS_TRANS_HOLD          0</div><div class='del'>-#define         OFS_SEND_BUFFER         0</div><div class='del'>-#define         OFS_INTR_ENABLE         (1*REG_OFFSET)</div><div class='del'>-#define         OFS_INTR_ID             (2*REG_OFFSET)</div><div class='del'>-#define         OFS_DATA_FORMAT         (3*REG_OFFSET)</div><div class='del'>-#define         OFS_LINE_CONTROL        (3*REG_OFFSET)</div><div class='del'>-#define         OFS_MODEM_CONTROL       (4*REG_OFFSET)</div><div class='del'>-#define         OFS_RS232_OUTPUT        (4*REG_OFFSET)</div><div class='del'>-#define         OFS_LINE_STATUS         (5*REG_OFFSET)</div><div class='del'>-#define         OFS_MODEM_STATUS        (6*REG_OFFSET)</div><div class='del'>-#define         OFS_RS232_INPUT         (6*REG_OFFSET)</div><div class='del'>-#define         OFS_SCRATCH_PAD         (7*REG_OFFSET)</div><div class='del'>-</div><div class='del'>-#define         OFS_DIVISOR_LSB         (0*REG_OFFSET)</div><div class='del'>-#define         OFS_DIVISOR_MSB         (1*REG_OFFSET)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* memory-mapped read/write of the port */</div><div class='del'>-#define         UART16550_READ(y)    (*((volatile uint8*)(BASE + y)))</div><div class='del'>-#define         UART16550_WRITE(y, z)  ((*((volatile uint8*)(BASE + y))) = z)</div><div class='del'>-</div><div class='del'>-void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='del'>-{</div><div class='del'>-        /* disable interrupts */</div><div class='del'>-        UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='del'>-</div><div class='del'>-        /* set up buad rate */</div><div class='del'>-        {</div><div class='del'>-                uint32 divisor;</div><div class='del'>-</div><div class='del'>-                /* set DIAB bit */</div><div class='del'>-                UART16550_WRITE(OFS_LINE_CONTROL, 0x80);</div><div class='del'>-</div><div class='del'>-                /* set divisor */</div><div class='del'>-                divisor = MAX_BAUD / baud;</div><div class='del'>-                UART16550_WRITE(OFS_DIVISOR_LSB, divisor &amp; 0xff);</div><div class='del'>-                UART16550_WRITE(OFS_DIVISOR_MSB, (divisor &amp; 0xff00) &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-                /* clear DIAB bit */</div><div class='del'>-                UART16550_WRITE(OFS_LINE_CONTROL, 0x0);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* set data format */</div><div class='del'>-        UART16550_WRITE(OFS_DATA_FORMAT, data | parity | stop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-uint8 getDebugChar(void)</div><div class='del'>-{</div><div class='del'>-        if (!remoteDebugInitialized) {</div><div class='del'>-                remoteDebugInitialized = 1;</div><div class='del'>-                debugInit(BAUD_DEFAULT,</div><div class='del'>-                          UART16550_DATA_8BIT,</div><div class='del'>-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        while ((UART16550_READ(OFS_LINE_STATUS) &amp; 0x1) == 0);</div><div class='del'>-        return UART16550_READ(OFS_RCV_BUFFER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int putDebugChar(uint8 byte)</div><div class='del'>-{</div><div class='del'>-        if (!remoteDebugInitialized) {</div><div class='del'>-                remoteDebugInitialized = 1;</div><div class='del'>-                debugInit(BAUD_DEFAULT,</div><div class='del'>-                          UART16550_DATA_8BIT,</div><div class='del'>-                          UART16550_PARITY_NONE, UART16550_STOP_1BIT);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        while ((UART16550_READ(OFS_LINE_STATUS) &amp; 0x20) == 0);</div><div class='del'>-        UART16550_WRITE(OFS_SEND_BUFFER, byte);</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5476/irq.c b/arch/mips/ddb5xxx/ddb5476/irq.c<br/>deleted file mode 100644<br/>index 7583a1f30711..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5476/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/irq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,165 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/ddb5476/irq.c -- NEC DDB Vrc-5476 interrupt routines</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *                     Sony Software Development Center Europe (SDCE), Brussels</div><div class='del'>- *</div><div class='del'>- * Re-write the whole thing to use new irq.c file.</div><div class='del'>- * Copyright (C) 2001 MontaVista Software Inc.</div><div class='del'>- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/i8259.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-#define M1543_PNP_CONFIG	0x03f0	/* PnP Config Port */</div><div class='del'>-#define M1543_PNP_INDEX		0x03f0	/* PnP Index Port */</div><div class='del'>-#define M1543_PNP_DATA		0x03f1	/* PnP Data Port */</div><div class='del'>-</div><div class='del'>-#define M1543_PNP_ALT_CONFIG	0x0370	/* Alternative PnP Config Port */</div><div class='del'>-#define M1543_PNP_ALT_INDEX	0x0370	/* Alternative PnP Index Port */</div><div class='del'>-#define M1543_PNP_ALT_DATA	0x0371	/* Alternative PnP Data Port */</div><div class='del'>-</div><div class='del'>-#define M1543_INT1_MASTER_CTRL	0x0020	/* INT_1 (master) Control Register */</div><div class='del'>-#define M1543_INT1_MASTER_MASK	0x0021	/* INT_1 (master) Mask Register */</div><div class='del'>-</div><div class='del'>-#define M1543_INT1_SLAVE_CTRL	0x00a0	/* INT_1 (slave) Control Register */</div><div class='del'>-#define M1543_INT1_SLAVE_MASK	0x00a1	/* INT_1 (slave) Mask Register */</div><div class='del'>-</div><div class='del'>-#define M1543_INT1_MASTER_ELCR	0x04d0	/* INT_1 (master) Edge/Level Control */</div><div class='del'>-#define M1543_INT1_SLAVE_ELCR	0x04d1	/* INT_1 (slave) Edge/Level Control */</div><div class='del'>-</div><div class='del'>-static void m1543_irq_setup(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *  The ALI M1543 has 13 interrupt inputs, IRQ1..IRQ13.  Not all</div><div class='del'>-	 *  the possible IO sources in the M1543 are in use by us.  We will</div><div class='del'>-	 *  use the following mapping:</div><div class='del'>-	 *</div><div class='del'>-	 *      IRQ1  - keyboard (default set by M1543)</div><div class='del'>-	 *      IRQ3  - reserved for UART B (default set by M1543) (note that</div><div class='del'>-	 *              the schematics for the DDB Vrc-5476 board seem to</div><div class='del'>-	 *              indicate that IRQ3 is connected to the DS1386</div><div class='del'>-	 *              watchdog timer interrupt output so we might have</div><div class='del'>-	 *              a conflict)</div><div class='del'>-	 *      IRQ4  - reserved for UART A (default set by M1543)</div><div class='del'>-	 *      IRQ5  - parallel (default set by M1543)</div><div class='del'>-	 *      IRQ8  - DS1386 time of day (RTC) interrupt</div><div class='del'>-	 *      IRQ9  - USB (hardwired in ddb_setup)</div><div class='del'>-	 *      IRQ10 - PMU (hardwired in ddb_setup)</div><div class='del'>-	 *      IRQ12 - mouse</div><div class='del'>-	 *      IRQ14,15 - IDE controller (need to be confirmed, jsun)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Assing mouse interrupt to IRQ12</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Enter configuration mode */</div><div class='del'>-	outb(0x51, M1543_PNP_CONFIG);</div><div class='del'>-	outb(0x23, M1543_PNP_CONFIG);</div><div class='del'>-</div><div class='del'>-	/* Select logical device 7 (Keyboard) */</div><div class='del'>-	outb(0x07, M1543_PNP_INDEX);</div><div class='del'>-	outb(0x07, M1543_PNP_DATA);</div><div class='del'>-</div><div class='del'>-	/* Select IRQ12 */</div><div class='del'>-	outb(0x72, M1543_PNP_INDEX);</div><div class='del'>-	outb(0x0c, M1543_PNP_DATA);</div><div class='del'>-</div><div class='del'>-	/* Leave configration mode */</div><div class='del'>-	outb(0xbb, M1543_PNP_CONFIG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nile4_irq_setup(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Map all interrupts to CPU int #0 (IP2) */</div><div class='del'>-	nile4_map_irq_all(0);</div><div class='del'>-</div><div class='del'>-	/* PCI INTA#-E# must be level triggered */</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(0, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(1, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(2, 1);</div><div class='del'>-	nile4_set_pci_irq_level_or_edge(3, 1);</div><div class='del'>-</div><div class='del'>-	/* PCI INTA#, B#, D# must be active low, INTC# must be active high */</div><div class='del'>-	nile4_set_pci_irq_polarity(0, 0);</div><div class='del'>-	nile4_set_pci_irq_polarity(1, 0);</div><div class='del'>-	nile4_set_pci_irq_polarity(2, 1);</div><div class='del'>-	nile4_set_pci_irq_polarity(3, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		nile4_clear_irq(i);</div><div class='del'>-</div><div class='del'>-	/* Enable CPU int #0 */</div><div class='del'>-	nile4_enable_irq_output(0);</div><div class='del'>-</div><div class='del'>-	/* memory resource acquire in ddb_setup */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };</div><div class='del'>-static struct irqaction irq_error = { no_action, 0, CPU_MASK_NONE, "error", NULL, NULL };</div><div class='del'>-</div><div class='del'>-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);</div><div class='del'>-extern void mips_cpu_irq_init(u32 irq_base);</div><div class='del'>-extern void vrc5476_irq_init(u32 irq_base);</div><div class='del'>-</div><div class='del'>-extern void vrc5476_irq_dispatch(struct pt_regs *regs);</div><div class='del'>-</div><div class='del'>-asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned int pending = read_c0_cause() &amp; read_c0_status();</div><div class='del'>-</div><div class='del'>-	if (pending &amp; STATUSF_IP7)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE + 7, regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP2)</div><div class='del'>-		vrc5476_irq_dispatch(regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP3)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE + 3, regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP4)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE + 4, regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP5)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE + 5, regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP6)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE + 6, regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP0)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE, regs);</div><div class='del'>-	else if (pending &amp; STATUSF_IP1)</div><div class='del'>-		do_IRQ(CPU_IRQ_BASE + 1, regs);</div><div class='del'>-</div><div class='del'>-	vrc5476_irq_dispatch(regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init arch_init_irq(void)</div><div class='del'>-{</div><div class='del'>-	/* hardware initialization */</div><div class='del'>-	nile4_irq_setup();</div><div class='del'>-	m1543_irq_setup();</div><div class='del'>-</div><div class='del'>-	/* controller setup */</div><div class='del'>-	init_i8259_irqs();</div><div class='del'>-	vrc5476_irq_init(VRC5476_IRQ_BASE);</div><div class='del'>-	mips_cpu_irq_init(CPU_IRQ_BASE);</div><div class='del'>-</div><div class='del'>-	/* setup cascade interrupts */</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_I8259_CASCADE, &amp;irq_cascade);</div><div class='del'>-	setup_irq(CPU_IRQ_BASE + CPU_VRC5476_CASCADE, &amp;irq_cascade);</div><div class='del'>-</div><div class='del'>-	/* setup error interrupts for debugging */</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_IRQ_CPCE, &amp;irq_error);</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_IRQ_CNTD, &amp;irq_error);</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_IRQ_MCE, &amp;irq_error);</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_IRQ_LBRT, &amp;irq_error);</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_IRQ_PCIS, &amp;irq_error);</div><div class='del'>-	setup_irq(VRC5476_IRQ_BASE + VRC5476_IRQ_PCI, &amp;irq_error);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5476/nile4_pic.c b/arch/mips/ddb5xxx/ddb5476/nile4_pic.c<br/>deleted file mode 100644<br/>index e930cee7944f..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5476/nile4_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/nile4_pic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,190 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/ddb5476/nile4.c --</div><div class='del'>- *  	low-level PIC code for NEC Vrc-5476 (Nile 4)</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *                     Sony Software Development Center Europe (SDCE), Brussels</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 MontaVista Software Inc.</div><div class='del'>- *  Author: jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Interrupt Programming</div><div class='del'>- */</div><div class='del'>-void nile4_map_irq(int nile4_irq, int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 offset, t;</div><div class='del'>-</div><div class='del'>-	offset = DDB_INTCTRL;</div><div class='del'>-	if (nile4_irq &gt;= 8) {</div><div class='del'>-		offset += 4;</div><div class='del'>-		nile4_irq -= 8;</div><div class='del'>-	}</div><div class='del'>-	t = ddb_in32(offset);</div><div class='del'>-	t &amp;= ~(7 &lt;&lt; (nile4_irq * 4));</div><div class='del'>-	t |= cpu_irq &lt;&lt; (nile4_irq * 4);</div><div class='del'>-	ddb_out32(offset, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_map_irq_all(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 all, t;</div><div class='del'>-</div><div class='del'>-	all = cpu_irq;</div><div class='del'>-	all |= all &lt;&lt; 4;</div><div class='del'>-	all |= all &lt;&lt; 8;</div><div class='del'>-	all |= all &lt;&lt; 16;</div><div class='del'>-	t = ddb_in32(DDB_INTCTRL);</div><div class='del'>-	t &amp;= 0x88888888;</div><div class='del'>-	t |= all;</div><div class='del'>-	ddb_out32(DDB_INTCTRL, t);</div><div class='del'>-	t = ddb_in32(DDB_INTCTRL + 4);</div><div class='del'>-	t &amp;= 0x88888888;</div><div class='del'>-	t |= all;</div><div class='del'>-	ddb_out32(DDB_INTCTRL + 4, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_enable_irq(int nile4_irq)</div><div class='del'>-{</div><div class='del'>-	u32 offset, t;</div><div class='del'>-</div><div class='del'>-	offset = DDB_INTCTRL;</div><div class='del'>-	if (nile4_irq &gt;= 8) {</div><div class='del'>-		offset += 4;</div><div class='del'>-		nile4_irq -= 8;</div><div class='del'>-	}</div><div class='del'>-	t = ddb_in32(offset);</div><div class='del'>-	t |= 8 &lt;&lt; (nile4_irq * 4);</div><div class='del'>-	ddb_out32(offset, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_disable_irq(int nile4_irq)</div><div class='del'>-{</div><div class='del'>-	u32 offset, t;</div><div class='del'>-</div><div class='del'>-	offset = DDB_INTCTRL;</div><div class='del'>-	if (nile4_irq &gt;= 8) {</div><div class='del'>-		offset += 4;</div><div class='del'>-		nile4_irq -= 8;</div><div class='del'>-	}</div><div class='del'>-	t = ddb_in32(offset);</div><div class='del'>-	t &amp;= ~(8 &lt;&lt; (nile4_irq * 4));</div><div class='del'>-	ddb_out32(offset, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_disable_irq_all(void)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(DDB_INTCTRL, 0);</div><div class='del'>-	ddb_out32(DDB_INTCTRL + 4, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 nile4_get_irq_stat(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	return ddb_in16(DDB_INTSTAT0 + cpu_irq * 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_enable_irq_output(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTSTAT1 + 4);</div><div class='del'>-	t |= 1 &lt;&lt; (16 + cpu_irq);</div><div class='del'>-	ddb_out32(DDB_INTSTAT1, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_disable_irq_output(int cpu_irq)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTSTAT1 + 4);</div><div class='del'>-	t &amp;= ~(1 &lt;&lt; (16 + cpu_irq));</div><div class='del'>-	ddb_out32(DDB_INTSTAT1, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_set_pci_irq_polarity(int pci_irq, int high)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTPPES);</div><div class='del'>-	if (high)</div><div class='del'>-		t &amp;= ~(1 &lt;&lt; (pci_irq * 2));</div><div class='del'>-	else</div><div class='del'>-		t |= 1 &lt;&lt; (pci_irq * 2);</div><div class='del'>-	ddb_out32(DDB_INTPPES, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_set_pci_irq_level_or_edge(int pci_irq, int level)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	t = ddb_in32(DDB_INTPPES);</div><div class='del'>-	if (level)</div><div class='del'>-		t |= 2 &lt;&lt; (pci_irq * 2);</div><div class='del'>-	else</div><div class='del'>-		t &amp;= ~(2 &lt;&lt; (pci_irq * 2));</div><div class='del'>-	ddb_out32(DDB_INTPPES, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_clear_irq(int nile4_irq)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(DDB_INTCLR, 1 &lt;&lt; nile4_irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void nile4_clear_irq_mask(u32 mask)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(DDB_INTCLR, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u8 nile4_i8259_iack(void)</div><div class='del'>-{</div><div class='del'>-	u8 irq;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	/* Set window 0 for interrupt acknowledge */</div><div class='del'>-	reg = ddb_in32(DDB_PCIINIT0);</div><div class='del'>-</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT0, DDB_PCICMD_IACK, 0, DDB_PCI_ACCESS_32);</div><div class='del'>-	irq = *(volatile u8 *) KSEG1ADDR(DDB_PCI_IACK_BASE);</div><div class='del'>-	/* restore window 0 for PCI I/O space */</div><div class='del'>-	// ddb_set_pmr(DDB_PCIINIT0, DDB_PCICMD_IO, 0, DDB_PCI_ACCESS_32);</div><div class='del'>-	ddb_out32(DDB_PCIINIT0, reg);</div><div class='del'>-</div><div class='del'>-	/* i8269.c set the base vector to be 0x0 */</div><div class='del'>-	return irq + I8259_IRQ_BASE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_RUNTIME_DEBUG)</div><div class='del'>-void nile4_dump_irq_status(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "</div><div class='del'>-	       CPUSTAT = %p:%p\n", (void *) ddb_in32(DDB_CPUSTAT + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_CPUSTAT));</div><div class='del'>-	printk(KERN_DEBUG "</div><div class='del'>-	       INTCTRL = %p:%p\n", (void *) ddb_in32(DDB_INTCTRL + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTCTRL));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTSTAT0 = %p:%p\n",</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT0 + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT0));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTSTAT1 = %p:%p\n",</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT1 + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTSTAT1));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTCLR = %p:%p\n", (void *) ddb_in32(DDB_INTCLR + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTCLR));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "INTPPES = %p:%p\n", (void *) ddb_in32(DDB_INTPPES + 4),</div><div class='del'>-	       (void *) ddb_in32(DDB_INTPPES));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5476/setup.c b/arch/mips/ddb5xxx/ddb5476/setup.c<br/>deleted file mode 100644<br/>index c902adef5942..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5476/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/setup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,296 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  arch/mips/ddb5476/setup.c -- NEC DDB Vrc-5476 setup routines</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *                     Sony Software Development Center Europe (SDCE), Brussels</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kbd_ll.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/kdev_t.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-#include &lt;asm/bcache.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/reboot.h&gt;</div><div class='del'>-#include &lt;asm/gdb-stub.h&gt;</div><div class='del'>-#include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='del'>-#include &lt;asm/traps.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-// #define USE_CPU_COUNTER_TIMER	/* whether we use cpu counter */</div><div class='del'>-</div><div class='del'>-#ifdef USE_CPU_COUNTER_TIMER</div><div class='del'>-</div><div class='del'>-#define CPU_COUNTER_FREQUENCY           83000000</div><div class='del'>-#else</div><div class='del'>-/* otherwise we use general purpose timer */</div><div class='del'>-#define TIMER_FREQUENCY			83000000</div><div class='del'>-#define TIMER_BASE			DDB_T2CTRL</div><div class='del'>-#define TIMER_IRQ			(VRC5476_IRQ_BASE + VRC5476_IRQ_GPT)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void (*back_to_prom) (void) = (void (*)(void)) 0xbfc00000;</div><div class='del'>-</div><div class='del'>-static void ddb_machine_restart(char *command)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* PCI cold reset */</div><div class='del'>-	t = ddb_in32(DDB_PCICTRL + 4);</div><div class='del'>-	t |= 0x40000000;</div><div class='del'>-	ddb_out32(DDB_PCICTRL + 4, t);</div><div class='del'>-	/* CPU cold reset */</div><div class='del'>-	t = ddb_in32(DDB_CPUSTAT);</div><div class='del'>-	t |= 1;</div><div class='del'>-	ddb_out32(DDB_CPUSTAT, t);</div><div class='del'>-	/* Call the PROM */</div><div class='del'>-	back_to_prom();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_machine_halt(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_NOTICE "DDB Vrc-5476 halted.\n");</div><div class='del'>-	while (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ddb_machine_power_off(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_NOTICE "DDB Vrc-5476 halted. Please turn off the power.\n");</div><div class='del'>-	while (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void rtc_ds1386_init(unsigned long base);</div><div class='del'>-</div><div class='del'>-static void __init ddb_time_init(void)</div><div class='del'>-{</div><div class='del'>-#if defined(USE_CPU_COUNTER_TIMER)</div><div class='del'>-	mips_hpt_frequency = CPU_COUNTER_FREQUENCY;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* we have ds1396 RTC chip */</div><div class='del'>-	rtc_ds1386_init(KSEG1ADDR(DDB_PCI_MEM_BASE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);</div><div class='del'>-static void __init ddb_timer_setup(struct irqaction *irq)</div><div class='del'>-{</div><div class='del'>-#if defined(USE_CPU_COUNTER_TIMER)</div><div class='del'>-</div><div class='del'>-	unsigned int count;</div><div class='del'>-</div><div class='del'>-	/* we are using the cpu counter for timer interrupts */</div><div class='del'>-	setup_irq(CPU_IRQ_BASE + 7, irq);</div><div class='del'>-</div><div class='del'>-	/* to generate the first timer interrupt */</div><div class='del'>-	count = read_c0_count();</div><div class='del'>-	write_c0_compare(count + 1000);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-	ddb_out32(TIMER_BASE, TIMER_FREQUENCY/HZ);</div><div class='del'>-	ddb_out32(TIMER_BASE+4, 0x1);	/* enable timer */</div><div class='del'>-	setup_irq(TIMER_IRQ, irq);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	struct resource dma1;</div><div class='del'>-	struct resource timer;</div><div class='del'>-	struct resource rtc;</div><div class='del'>-	struct resource dma_page_reg;</div><div class='del'>-	struct resource dma2;</div><div class='del'>-} ddb5476_ioport = {</div><div class='del'>-	{</div><div class='del'>-	"dma1", 0x00, 0x1f, IORESOURCE_BUSY}, {</div><div class='del'>-	"timer", 0x40, 0x5f, IORESOURCE_BUSY}, {</div><div class='del'>-	"rtc", 0x70, 0x7f, IORESOURCE_BUSY}, {</div><div class='del'>-	"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, {</div><div class='del'>-	"dma2", 0xc0, 0xdf, IORESOURCE_BUSY}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	struct resource nile4;</div><div class='del'>-} ddb5476_iomem = {</div><div class='del'>-	{ "Nile 4", DDB_BASE, DDB_BASE + DDB_SIZE - 1, IORESOURCE_BUSY}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void ddb5476_board_init(void);</div><div class='del'>-</div><div class='del'>-void __init plat_setup(void)</div><div class='del'>-{</div><div class='del'>-	set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE));</div><div class='del'>-</div><div class='del'>-	board_time_init = ddb_time_init;</div><div class='del'>-	board_timer_setup = ddb_timer_setup;</div><div class='del'>-</div><div class='del'>-	_machine_restart = ddb_machine_restart;</div><div class='del'>-	_machine_halt = ddb_machine_halt;</div><div class='del'>-	pm_power_off = ddb_machine_power_off;</div><div class='del'>-</div><div class='del'>-	/* request io port/mem resources  */</div><div class='del'>-	if (request_resource(&amp;ioport_resource, &amp;ddb5476_ioport.dma1) ||</div><div class='del'>-	    request_resource(&amp;ioport_resource, &amp;ddb5476_ioport.timer) ||</div><div class='del'>-	    request_resource(&amp;ioport_resource, &amp;ddb5476_ioport.rtc) ||</div><div class='del'>-	    request_resource(&amp;ioport_resource,</div><div class='del'>-			     &amp;ddb5476_ioport.dma_page_reg)</div><div class='del'>-	    || request_resource(&amp;ioport_resource, &amp;ddb5476_ioport.dma2)</div><div class='del'>-	    || request_resource(&amp;iomem_resource, &amp;ddb5476_iomem.nile4)) {</div><div class='del'>-		printk</div><div class='del'>-		    ("ddb_setup - requesting oo port resources failed.\n");</div><div class='del'>-		for (;;);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reboot on panic */</div><div class='del'>-	panic_timeout = 180;</div><div class='del'>-</div><div class='del'>-	/* [jsun] we need to set BAR0 so that SDRAM 0 appears at 0x0 in PCI */</div><div class='del'>-	/* *(long*)0xbfa00218 = 0x8; */</div><div class='del'>-</div><div class='del'>-	/* board initialization stuff */</div><div class='del'>-	ddb5476_board_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We don't trust bios.  We essentially does hardware re-initialization</div><div class='del'>- * as complete as possible, as far as we know we can safely do.</div><div class='del'>- */</div><div class='del'>-static void ddb5476_board_init(void)</div><div class='del'>-{</div><div class='del'>-	/* ----------- setup PDARs ------------ */</div><div class='del'>-	/* check SDRAM0, whether we are on MEM bus does not matter */</div><div class='del'>-	db_assert((ddb_in32(DDB_SDRAM0) &amp; 0xffffffef) ==</div><div class='del'>-		  ddb_calc_pdar(DDB_SDRAM_BASE, DDB_SDRAM_SIZE, 32, 0, 1));</div><div class='del'>-</div><div class='del'>-	/* SDRAM1 should be turned off.  What is this for anyway ? */</div><div class='del'>-	db_assert( (ddb_in32(DDB_SDRAM1) &amp; 0xf) == 0);</div><div class='del'>-</div><div class='del'>-	/* flash 1&amp;2, DDB status, DDB control */</div><div class='del'>-	ddb_set_pdar(DDB_DCS2, DDB_DCS2_BASE, DDB_DCS2_SIZE, 16, 0, 0);</div><div class='del'>-	ddb_set_pdar(DDB_DCS3, DDB_DCS3_BASE, DDB_DCS3_SIZE, 16, 0, 0);</div><div class='del'>-	ddb_set_pdar(DDB_DCS4, DDB_DCS4_BASE, DDB_DCS4_SIZE, 8, 0, 0);</div><div class='del'>-	ddb_set_pdar(DDB_DCS5, DDB_DCS5_BASE, DDB_DCS5_SIZE, 8, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* shut off other pdar so they don't accidentally get into the way */</div><div class='del'>-	ddb_set_pdar(DDB_DCS6, 0xffffffff, 0, 32, 0, 0);</div><div class='del'>-	ddb_set_pdar(DDB_DCS7, 0xffffffff, 0, 32, 0, 0);</div><div class='del'>-	ddb_set_pdar(DDB_DCS8, 0xffffffff, 0, 32, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* verify VRC5477 base addr */</div><div class='del'>-	/* don't care about some details */</div><div class='del'>-	db_assert((ddb_in32(DDB_INTCS) &amp; 0xffffff0f) ==</div><div class='del'>-		  ddb_calc_pdar(DDB_INTCS_BASE, DDB_INTCS_SIZE, 8, 0, 0));</div><div class='del'>-</div><div class='del'>-	/* verify BOOT ROM addr */</div><div class='del'>-	/* don't care about some details */</div><div class='del'>-	db_assert((ddb_in32(DDB_BOOTCS) &amp; 0xffffff0f) ==</div><div class='del'>-		  ddb_calc_pdar(DDB_BOOTCS_BASE, DDB_BOOTCS_SIZE, 8, 0, 0));</div><div class='del'>-</div><div class='del'>-	/* setup PCI windows - window1 for MEM/config, window0 for IO */</div><div class='del'>-	ddb_set_pdar(DDB_PCIW0, DDB_PCI_IO_BASE, DDB_PCI_IO_SIZE, 32, 0, 1);</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT0, DDB_PCICMD_IO, 0, DDB_PCI_ACCESS_32);</div><div class='del'>-</div><div class='del'>-	ddb_set_pdar(DDB_PCIW1, DDB_PCI_MEM_BASE, DDB_PCI_MEM_SIZE, 32, 0, 1);</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT1, DDB_PCICMD_MEM, DDB_PCI_MEM_BASE, DDB_PCI_ACCESS_32);</div><div class='del'>-</div><div class='del'>-	/* ----------- setup PDARs ------------ */</div><div class='del'>-	/* this is problematic - it will reset Aladin which cause we loose</div><div class='del'>-	 * serial port, and we don't know how to set up Aladin chip again.</div><div class='del'>-	 */</div><div class='del'>-	// ddb_pci_reset_bus();</div><div class='del'>-</div><div class='del'>-	ddb_out32(DDB_BAR0, 0x00000008);</div><div class='del'>-</div><div class='del'>-	ddb_out32(DDB_BARC, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BARB, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR1, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR2, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR3, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR4, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR5, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR6, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR7, 0xffffffff);</div><div class='del'>-	ddb_out32(DDB_BAR8, 0xffffffff);</div><div class='del'>-</div><div class='del'>-	/* ----------- switch PCI1 to PCI CONFIG space  ------------ */</div><div class='del'>-	ddb_set_pdar(DDB_PCIW1, DDB_PCI_CONFIG_BASE, DDB_PCI_CONFIG_SIZE, 32, 0, 1);</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT1, DDB_PCICMD_CFG, 0x0, DDB_PCI_ACCESS_32);</div><div class='del'>-</div><div class='del'>-	/* ----- M1543 PCI setup ------ */</div><div class='del'>-</div><div class='del'>-	/* we know M1543 PCI-ISA controller is at addr:18 */</div><div class='del'>-	/* xxxx1010 makes USB at addr:13 and PMU at addr:14 */</div><div class='del'>-	*(volatile unsigned char *) 0xa8040072 &amp;= 0xf0;</div><div class='del'>-	*(volatile unsigned char *) 0xa8040072 |= 0xa;</div><div class='del'>-</div><div class='del'>-	/* setup USB interrupt to IRQ 9, (bit 0:3 - 0001)</div><div class='del'>-	 * no IOCHRDY signal, (bit 7 - 1)</div><div class='del'>-	 * M1543C &amp; M7101 VID and Subsys Device ID are read-only (bit 6 - 1)</div><div class='del'>-	 * Make USB Master INTAJ level to edge conversion (bit 4 - 1)</div><div class='del'>-	 */</div><div class='del'>-	*(unsigned char *) 0xa8040074 = 0xd1;</div><div class='del'>-</div><div class='del'>-	/* setup PMU(SCI to IRQ 10 (bit 0:3 - 0011)</div><div class='del'>-	 * SCI routing to IRQ 13 disabled (bit 7 - 1)</div><div class='del'>-	 * SCI interrupt level to edge conversion bypassed (bit 4 - 0)</div><div class='del'>-	 */</div><div class='del'>-	*(unsigned char *) 0xa8040076 = 0x83;</div><div class='del'>-</div><div class='del'>-	/* setup IDE controller</div><div class='del'>-	 * enable IDE controller (bit 6 - 1)</div><div class='del'>-	 * IDE IDSEL to be addr:24 (bit 4:5 - 11)</div><div class='del'>-	 * no IDE ATA Secondary Bus Signal Pad Control (bit 3 - 0)</div><div class='del'>-	 * no IDE ATA Primary Bus Signal Pad Control (bit 2 - 0)</div><div class='del'>-	 * primary IRQ is 14, secondary is 15 (bit 1:0 - 01</div><div class='del'>-	 */</div><div class='del'>-	// *(unsigned char*)0xa8040058 = 0x71;</div><div class='del'>-	// *(unsigned char*)0xa8040058 = 0x79;</div><div class='del'>-	// *(unsigned char*)0xa8040058 = 0x74;              // use SIRQ, primary tri-state</div><div class='del'>-	*(unsigned char *) 0xa8040058 = 0x75;	// primary tri-state</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* this is not necessary if M5229 does not use SIRQ */</div><div class='del'>-	*(unsigned char *) 0xa8040044 = 0x0d;	// primary to IRQ 14</div><div class='del'>-	*(unsigned char *) 0xa8040075 = 0x0d;	// secondary to IRQ 14</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* enable IDE in the M5229 config register 0x50 (bit 0 - 1) */</div><div class='del'>-	/* M5229 IDSEL is addr:24; see above setting */</div><div class='del'>-	*(unsigned char *) 0xa9000050 |= 0x1;</div><div class='del'>-</div><div class='del'>-	/* enable bus master (bit 2)  and IO decoding  (bit 0) */</div><div class='del'>-	*(unsigned char *) 0xa9000004 |= 0x5;</div><div class='del'>-</div><div class='del'>-	/* enable native, copied from arch/ppc/k2boot/head.S */</div><div class='del'>-	/* TODO - need volatile, need to be portable */</div><div class='del'>-	*(unsigned char *) 0xa9000009 = 0xff;</div><div class='del'>-</div><div class='del'>-	/* ----- end of M1543 PCI setup ------ */</div><div class='del'>-</div><div class='del'>-	/* ----- reset on-board ether chip  ------ */</div><div class='del'>-	*((volatile u32 *) 0xa8020004) |= 1;	/* decode I/O */</div><div class='del'>-	*((volatile u32 *) 0xa8020010) = 0;	/* set BAR address */</div><div class='del'>-</div><div class='del'>-	/* send reset command */</div><div class='del'>-	*((volatile u32 *) 0xa6000000) = 1;	/* do a soft reset */</div><div class='del'>-</div><div class='del'>-	/* disable ether chip */</div><div class='del'>-	*((volatile u32 *) 0xa8020004) = 0;	/* disable any decoding */</div><div class='del'>-</div><div class='del'>-	/* put it into sleep */</div><div class='del'>-	*((volatile u32 *) 0xa8020040) = 0x80000000;</div><div class='del'>-</div><div class='del'>-	/* ----- end of reset on-board ether chip  ------ */</div><div class='del'>-</div><div class='del'>-	/* ----------- switch PCI1 back to PCI MEM space  ------------ */</div><div class='del'>-	ddb_set_pdar(DDB_PCIW1, DDB_PCI_MEM_BASE, DDB_PCI_MEM_SIZE, 32, 0, 1);</div><div class='del'>-	ddb_set_pmr(DDB_PCIINIT1, DDB_PCICMD_MEM, DDB_PCI_MEM_BASE, DDB_PCI_ACCESS_32);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c b/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c<br/>deleted file mode 100644<br/>index a3c5e7b18018..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * The irq controller for vrc5476.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 MontaVista Software Inc.</div><div class='del'>- * Author: jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-static int irq_base;</div><div class='del'>-</div><div class='del'>-static void vrc5476_irq_enable(uint irq)</div><div class='del'>-{</div><div class='del'>-	nile4_enable_irq(irq - irq_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vrc5476_irq_disable(uint irq)</div><div class='del'>-{</div><div class='del'>-	nile4_disable_irq(irq - irq_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int vrc5476_irq_startup(uint irq)</div><div class='del'>-{</div><div class='del'>-	nile4_enable_irq(irq - irq_base);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define vrc5476_irq_shutdown	vrc5476_irq_disable</div><div class='del'>-</div><div class='del'>-static void vrc5476_irq_ack(uint irq)</div><div class='del'>-{</div><div class='del'>-	nile4_clear_irq(irq - irq_base);</div><div class='del'>-	nile4_disable_irq(irq - irq_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vrc5476_irq_end(uint irq)</div><div class='del'>-{</div><div class='del'>-	if(!(irq_desc[irq].status &amp; (IRQ_DISABLED | IRQ_INPROGRESS)))</div><div class='del'>-		vrc5476_irq_enable(irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static hw_irq_controller vrc5476_irq_controller = {</div><div class='del'>-	.typename = "vrc5476",</div><div class='del'>-	.startup = vrc5476_irq_startup,</div><div class='del'>-	.shutdown = vrc5476_irq_shutdown,</div><div class='del'>-	.enable = vrc5476_irq_enable,</div><div class='del'>-	.disable = vrc5476_irq_disable,</div><div class='del'>-	.ack = vrc5476_irq_ack,</div><div class='del'>-	.end = vrc5476_irq_end</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init</div><div class='del'>-vrc5476_irq_init(u32 base)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	irq_base = base;</div><div class='del'>-	for (i= base; i&lt; base + NUM_VRC5476_IRQ; i++) {</div><div class='del'>-		irq_desc[i].status = IRQ_DISABLED;</div><div class='del'>-		irq_desc[i].action = NULL;</div><div class='del'>-		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;vrc5476_irq_controller;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-vrc5476_irq_dispatch(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	u32 mask;</div><div class='del'>-	int nile4_irq;</div><div class='del'>-</div><div class='del'>-	mask = nile4_get_irq_stat(0);</div><div class='del'>-</div><div class='del'>-	/* quick check for possible time interrupt */</div><div class='del'>-	if (mask &amp; (1 &lt;&lt; VRC5476_IRQ_GPT)) {</div><div class='del'>-		do_IRQ(VRC5476_IRQ_BASE + VRC5476_IRQ_GPT, regs);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check for i8259 interrupts */</div><div class='del'>-	if (mask &amp; (1 &lt;&lt; VRC5476_I8259_CASCADE)) {</div><div class='del'>-		int i8259_irq = nile4_i8259_iack();</div><div class='del'>-		do_IRQ(I8259_IRQ_BASE + i8259_irq, regs);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* regular nile4 interrupts (we should not really have any */</div><div class='del'>-	for (nile4_irq = 0; mask; nile4_irq++, mask &gt;&gt;= 1) {</div><div class='del'>-		if (mask &amp; 1) {</div><div class='del'>-			do_IRQ(VRC5476_IRQ_BASE + nile4_irq, regs);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spurious_interrupt(regs);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5477/irq.c b/arch/mips/ddb5xxx/ddb5477/irq.c<br/>index de433cf9fb50..513fc6722d84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ddb5xxx/ddb5477/irq.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -75,7 +74,6 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger)</div><div class='ctx'> </div><div class='ctx'> extern void vrc5477_irq_init(u32 base);</div><div class='ctx'> extern void mips_cpu_irq_init(u32 base);</div><div class='del'>-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);</div><div class='ctx'> static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };</div><div class='ctx'> </div><div class='ctx'> void __init arch_init_irq(void)</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c<br/>index 5fcd5f070cdc..ba52705a2738 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/irq_5477.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/irq_5477.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/irq_5477.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ddb5xxx/ddb5477/irq_5477.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ vrc5477_irq_end(unsigned int irq)</div><div class='ctx'> 		ll_vrc5477_irq_enable( irq - vrc5477_irq_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-hw_irq_controller vrc5477_irq_controller = {</div><div class='add'>+struct irq_chip vrc5477_irq_controller = {</div><div class='ctx'> 	.typename = "vrc5477_irq",</div><div class='ctx'> 	.startup = vrc5477_irq_startup,</div><div class='ctx'> 	.shutdown = vrc5477_irq_shutdown,</div><div class='hunk'>@@ -107,7 +107,7 @@ void __init vrc5477_irq_init(u32 irq_base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;vrc5477_irq_controller;</div><div class='add'>+		irq_desc[i].chip = &amp;vrc5477_irq_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	vrc5477_irq_base = irq_base;</div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5477/kgdb_io.c b/arch/mips/ddb5xxx/ddb5477/kgdb_io.c<br/>index 1d18d590495b..385bbdb10170 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/kgdb_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/kgdb_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/kgdb_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ddb5xxx/ddb5477/kgdb_io.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='ctx'>         /* disable interrupts */</div><div class='ctx'>         UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='ctx'> </div><div class='del'>-        /* set up buad rate */</div><div class='add'>+        /* set up baud rate */</div><div class='ctx'>         {</div><div class='ctx'>                 uint32 divisor;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c<br/>index 2f566034cc44..f0cc0e8a8afa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ddb5xxx/ddb5477/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ddb5xxx/ddb5477/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ddb5xxx/ddb5477/setup.c</a></div><div class='hunk'>@@ -13,13 +13,13 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;	/* for HZ */</div><div class='hunk'>@@ -147,9 +147,7 @@ static void __init ddb_time_init(void)</div><div class='ctx'> 	mips_hpt_frequency = bus_frequency*(i+4)/4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);</div><div class='del'>-</div><div class='del'>-static void __init ddb_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> #if defined(USE_CPU_COUNTER_TIMER)</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +169,7 @@ static void ddb5477_board_init(void);</div><div class='ctx'> extern struct pci_controller ddb5477_ext_controller;</div><div class='ctx'> extern struct pci_controller ddb5477_io_controller;</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* initialize board - we don't trust the loader */</div><div class='ctx'>         ddb5477_board_init();</div><div class='hunk'>@@ -179,7 +177,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE));</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = ddb_time_init;</div><div class='del'>-	board_timer_setup = ddb_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = ddb_machine_restart;</div><div class='ctx'> 	_machine_halt = ddb_machine_halt;</div><div class='head'>diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S<br/>index e8ec93e33fe6..455a65b91cb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/int-handler.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/int-handler.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/int-handler.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/int-handler.S</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Rewritten extensively for controller-driven IRQ support</div><div class='ctx'>  * by Maciej W. Rozycki.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/addrspace.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='head'>diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c<br/>index d5bca5d233b6..41cd2a96148b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/ioasic-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/ioasic-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/ioasic-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/ioasic-irq.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static inline void end_ioasic_irq(unsigned int irq)</div><div class='ctx'> 		enable_ioasic_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ioasic_irq_type = {</div><div class='add'>+static struct irq_chip ioasic_irq_type = {</div><div class='ctx'> 	.typename = "IO-ASIC",</div><div class='ctx'> 	.startup = startup_ioasic_irq,</div><div class='ctx'> 	.shutdown = shutdown_ioasic_irq,</div><div class='hunk'>@@ -121,7 +121,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq)</div><div class='ctx'> 	end_ioasic_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ioasic_dma_irq_type = {</div><div class='add'>+static struct irq_chip ioasic_dma_irq_type = {</div><div class='ctx'> 	.typename = "IO-ASIC-DMA",</div><div class='ctx'> 	.startup = startup_ioasic_dma_irq,</div><div class='ctx'> 	.shutdown = shutdown_ioasic_dma_irq,</div><div class='hunk'>@@ -144,13 +144,13 @@ void __init init_ioasic_irqs(int base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;ioasic_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;ioasic_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (; i &lt; base + IO_IRQ_LINES; i++) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;ioasic_dma_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;ioasic_dma_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ioasic_irq_base = base;</div><div class='head'>diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c<br/>index 898bed502a34..04a367a60a57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/kn02-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/kn02-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/kn02-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/kn02-irq.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ static void end_kn02_irq(unsigned int irq)</div><div class='ctx'> 		enable_kn02_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type kn02_irq_type = {</div><div class='add'>+static struct irq_chip kn02_irq_type = {</div><div class='ctx'> 	.typename = "KN02-CSR",</div><div class='ctx'> 	.startup = startup_kn02_irq,</div><div class='ctx'> 	.shutdown = shutdown_kn02_irq,</div><div class='hunk'>@@ -123,7 +123,7 @@ void __init init_kn02_irqs(int base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;kn02_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;kn02_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kn02_irq_base = base;</div><div class='head'>diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c<br/>index 32a7cc7e4c65..bf2858071f1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/prom/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/prom/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/prom/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/prom/init.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Harald Koerfgen</div><div class='ctx'>  * Copyright (C) 2002, 2004  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='head'>diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c<br/>index 1edaf3074ee9..3027ce782797 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/prom/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/prom/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/prom/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/prom/memory.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Harald Koerfgen, Frieder Streffer and Paul M. Antoine</div><div class='ctx'>  * Copyright (C) 2000, 2002  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c<br/>index ad5d436d80c1..d43241c2f541 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/setup.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static struct irqaction fpuirq = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction busirq = {</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.name = "bus error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,7 @@ static void __init dec_be_init(void)</div><div class='ctx'> 	case MACH_DS23100:	/* DS2100/DS3100 Pmin/Pmax */</div><div class='ctx'> 		board_be_handler = dec_kn01_be_handler;</div><div class='ctx'> 		busirq.handler = dec_kn01_be_interrupt;</div><div class='del'>-		busirq.flags |= SA_SHIRQ;</div><div class='add'>+		busirq.flags |= IRQF_SHARED;</div><div class='ctx'> 		dec_kn01_be_init();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MACH_DS5000_1XX:	/* DS5000/1xx 3min */</div><div class='hunk'>@@ -145,13 +145,11 @@ static void __init dec_be_init(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern void dec_time_init(void);</div><div class='del'>-extern void dec_timer_setup(struct irqaction *);</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	board_be_init = dec_be_init;</div><div class='ctx'> 	board_time_init = dec_time_init;</div><div class='del'>-	board_timer_setup = dec_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	wbflush_setup();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c<br/>index 74cb055d4bf6..57294740c2dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/dec/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/dec/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/dec/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/dec/time.c</a></div><div class='hunk'>@@ -181,12 +181,12 @@ void __init dec_time_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the rate of periodic DS1287 interrupts.  */</div><div class='del'>-	CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - LOG_2_HZ), RTC_REG_A);</div><div class='add'>+	CMOS_WRITE(RTC_REF_CLCK_32KHZ | (16 - __ffs(HZ)), RTC_REG_A);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(do_settimeofday);</div><div class='ctx'> </div><div class='del'>-void __init dec_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(dec_interrupt[DEC_IRQ_RTC], irq);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/defconfig b/arch/mips/defconfig<br/>index 607e2985ffe3..fff6fcc96212 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc2</div><div class='del'>-# Mon Apr 24 14:50:54 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Thu Jul  6 09:49:33 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_MIPS=y</div><div class='ctx'> </div><div class='hunk'>@@ -21,6 +21,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_DB1550 is not set</div><div class='ctx'> # CONFIG_MIPS_DB1200 is not set</div><div class='ctx'> # CONFIG_MIPS_MIRAGE is not set</div><div class='add'>+# CONFIG_BASLER_EXCITE is not set</div><div class='ctx'> # CONFIG_MIPS_COBALT is not set</div><div class='ctx'> # CONFIG_MACH_DECSTATION is not set</div><div class='ctx'> # CONFIG_MIPS_EV64120 is not set</div><div class='hunk'>@@ -32,6 +33,7 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_ATLAS is not set</div><div class='ctx'> # CONFIG_MIPS_MALTA is not set</div><div class='ctx'> # CONFIG_MIPS_SEAD is not set</div><div class='add'>+# CONFIG_WR_PPMC is not set</div><div class='ctx'> # CONFIG_MIPS_SIM is not set</div><div class='ctx'> # CONFIG_MOMENCO_JAGUAR_ATX is not set</div><div class='ctx'> # CONFIG_MOMENCO_OCELOT is not set</div><div class='hunk'>@@ -41,12 +43,11 @@ CONFIG_MIPS=y</div><div class='ctx'> # CONFIG_MIPS_XXS1500 is not set</div><div class='ctx'> # CONFIG_PNX8550_V2PCI is not set</div><div class='ctx'> # CONFIG_PNX8550_JBS is not set</div><div class='del'>-# CONFIG_DDB5074 is not set</div><div class='del'>-# CONFIG_DDB5476 is not set</div><div class='ctx'> # CONFIG_DDB5477 is not set</div><div class='ctx'> # CONFIG_MACH_VR41XX is not set</div><div class='ctx'> # CONFIG_PMC_YOSEMITE is not set</div><div class='ctx'> # CONFIG_QEMU is not set</div><div class='add'>+# CONFIG_MARKEINS is not set</div><div class='ctx'> CONFIG_SGI_IP22=y</div><div class='ctx'> # CONFIG_SGI_IP27 is not set</div><div class='ctx'> # CONFIG_SGI_IP32 is not set</div><div class='hunk'>@@ -67,6 +68,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='ctx'> CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='ctx'> CONFIG_ARC=y</div><div class='ctx'> CONFIG_DMA_NONCOHERENT=y</div><div class='ctx'> CONFIG_DMA_NEED_PCI_MAP_STATE=y</div><div class='hunk'>@@ -121,7 +123,10 @@ CONFIG_PAGE_SIZE_4KB=y</div><div class='ctx'> # CONFIG_PAGE_SIZE_64KB is not set</div><div class='ctx'> CONFIG_BOARD_SCACHE=y</div><div class='ctx'> CONFIG_IP22_CPU_SCACHE=y</div><div class='del'>-# CONFIG_MIPS_MT is not set</div><div class='add'>+CONFIG_MIPS_MT_DISABLED=y</div><div class='add'>+# CONFIG_MIPS_MT_SMTC is not set</div><div class='add'>+# CONFIG_MIPS_MT_SMP is not set</div><div class='add'>+# CONFIG_MIPS_VPE_LOADER is not set</div><div class='ctx'> # CONFIG_64BIT_PHYS_ADDR is not set</div><div class='ctx'> CONFIG_CPU_HAS_LLSC=y</div><div class='ctx'> CONFIG_CPU_HAS_SYNC=y</div><div class='hunk'>@@ -136,9 +141,20 @@ CONFIG_FLATMEM=y</div><div class='ctx'> CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+# CONFIG_HZ_48 is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_128 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+# CONFIG_HZ_256 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+# CONFIG_HZ_1024 is not set</div><div class='add'>+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='ctx'> # CONFIG_PREEMPT_NONE is not set</div><div class='ctx'> CONFIG_PREEMPT_VOLUNTARY=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -171,10 +187,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -265,6 +283,8 @@ CONFIG_INET_ESP=m</div><div class='ctx'> CONFIG_INET_IPCOMP=m</div><div class='ctx'> CONFIG_INET_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET_TUNNEL=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -312,7 +332,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+CONFIG_NETWORK_SECMARK=y</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -328,6 +351,8 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_SECMARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNMARK=m</div><div class='hunk'>@@ -342,9 +367,11 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_QUOTA=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STATE=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_STRING=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> </div><div class='hunk'>@@ -354,6 +381,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK=m</div><div class='ctx'> CONFIG_IP_NF_CT_ACCT=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_MARK=y</div><div class='add'>+CONFIG_IP_NF_CONNTRACK_SECMARK=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_EVENTS=y</div><div class='ctx'> CONFIG_IP_NF_CONNTRACK_NETLINK=m</div><div class='ctx'> # CONFIG_IP_NF_CT_PROTO_SCTP is not set</div><div class='hunk'>@@ -364,6 +392,7 @@ CONFIG_IP_NF_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_H323=m</div><div class='add'>+CONFIG_IP_NF_SIP=m</div><div class='ctx'> CONFIG_IP_NF_QUEUE=m</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_IPRANGE=m</div><div class='hunk'>@@ -394,6 +423,7 @@ CONFIG_IP_NF_NAT_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_NAT_PPTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_H323=m</div><div class='add'>+CONFIG_IP_NF_NAT_SIP=m</div><div class='ctx'> CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TOS=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='hunk'>@@ -526,6 +556,7 @@ CONFIG_WIRELESS_EXT=y</div><div class='ctx'> CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> # CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -645,6 +676,8 @@ CONFIG_DAVICOM_PHY=m</div><div class='ctx'> CONFIG_QSEMI_PHY=m</div><div class='ctx'> CONFIG_LXT_PHY=m</div><div class='ctx'> CONFIG_CICADA_PHY=m</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Ethernet (10 or 100Mbit)</div><div class='hunk'>@@ -742,6 +775,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+CONFIG_VT_HW_CONSOLE_BINDING=y</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -774,6 +808,7 @@ CONFIG_WATCHDOG=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SOFT_WATCHDOG is not set</div><div class='ctx'> CONFIG_INDYDOG=m</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> # CONFIG_RTC is not set</div><div class='ctx'> CONFIG_SGI_DS1286=m</div><div class='ctx'> # CONFIG_GEN_RTC is not set</div><div class='hunk'>@@ -822,6 +857,7 @@ CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -831,6 +867,7 @@ CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='ctx'> # CONFIG_FB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -903,6 +940,19 @@ CONFIG_LOGO_SGI_CLUT224=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=m</div><div class='hunk'>@@ -919,7 +969,6 @@ CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='ctx'> CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> CONFIG_XFS_FS=m</div><div class='del'>-CONFIG_XFS_EXPORT=y</div><div class='ctx'> CONFIG_XFS_QUOTA=y</div><div class='ctx'> CONFIG_XFS_SECURITY=y</div><div class='ctx'> # CONFIG_XFS_POSIX_ACL is not set</div><div class='hunk'>@@ -928,6 +977,7 @@ CONFIG_XFS_SECURITY=y</div><div class='ctx'> CONFIG_MINIX_FS=m</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> CONFIG_QUOTA=y</div><div class='ctx'> # CONFIG_QFMT_V1 is not set</div><div class='ctx'> CONFIG_QFMT_V2=m</div><div class='hunk'>@@ -984,6 +1034,8 @@ CONFIG_EFS_FS=m</div><div class='ctx'> # CONFIG_QNX4FS_FS is not set</div><div class='ctx'> # CONFIG_SYSV_FS is not set</div><div class='ctx'> CONFIG_UFS_FS=m</div><div class='add'>+# CONFIG_UFS_FS_WRITE is not set</div><div class='add'>+# CONFIG_UFS_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Network File Systems</div><div class='hunk'>@@ -1013,7 +1065,9 @@ CONFIG_SMB_NLS_DEFAULT=y</div><div class='ctx'> CONFIG_SMB_NLS_REMOTE="cp437"</div><div class='ctx'> CONFIG_CIFS=m</div><div class='ctx'> # CONFIG_CIFS_STATS is not set</div><div class='add'>+# CONFIG_CIFS_WEAK_PW_HASH is not set</div><div class='ctx'> # CONFIG_CIFS_XATTR is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_CIFS_EXPERIMENTAL is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> CONFIG_CODA_FS=m</div><div class='hunk'>@@ -1096,6 +1150,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> # CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> # CONFIG_DEBUG_KERNEL is not set</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=14</div><div class='ctx'> # CONFIG_DEBUG_FS is not set</div><div class='hunk'>@@ -1155,3 +1210,4 @@ CONFIG_TEXTSEARCH=y</div><div class='ctx'> CONFIG_TEXTSEARCH_KMP=m</div><div class='ctx'> CONFIG_TEXTSEARCH_BM=m</div><div class='ctx'> CONFIG_TEXTSEARCH_FSM=m</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/mips/emma2rh/common/Makefile b/arch/mips/emma2rh/common/Makefile<br/>new file mode 100644<br/>index 000000000000..859121b3867d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/common/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+#</div><div class='add'>+#  arch/mips/emma2rh/common/Makefile</div><div class='add'>+#       Makefile for the common code of NEC EMMA2RH based board.</div><div class='add'>+#</div><div class='add'>+#  Copyright (C) NEC Electronics Corporation 2005-2006</div><div class='add'>+#</div><div class='add'>+#  This program is free software; you can redistribute it and/or modify</div><div class='add'>+#  it under the terms of the GNU General Public License as published by</div><div class='add'>+#  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+#  (at your option) any later version.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MARKEINS)	+= irq.o irq_emma2rh.o prom.o</div><div class='head'>diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma2rh/common/irq.c<br/>new file mode 100644<br/>index 000000000000..3af57693c84c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/common/irq.c</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/common/irq.c</div><div class='add'>+ *      This file is common irq dispatcher.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2005-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/irq.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/i8259.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the first level int-handler will jump here if it is a emma2rh irq</div><div class='add'>+ */</div><div class='add'>+asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u32 intStatus;</div><div class='add'>+	u32 bitmask;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	intStatus = emma2rh_in32(EMMA2RH_BHIF_INT_ST_0)</div><div class='add'>+	    &amp; emma2rh_in32(EMMA2RH_BHIF_INT_EN_0);</div><div class='add'>+</div><div class='add'>+#ifdef EMMA2RH_SW_CASCADE</div><div class='add'>+	if (intStatus &amp;</div><div class='add'>+	    (1 &lt;&lt; ((EMMA2RH_SW_CASCADE - EMMA2RH_IRQ_INT0) &amp; (32 - 1)))) {</div><div class='add'>+		u32 swIntStatus;</div><div class='add'>+		swIntStatus = emma2rh_in32(EMMA2RH_BHIF_SW_INT)</div><div class='add'>+		    &amp; emma2rh_in32(EMMA2RH_BHIF_SW_INT_EN);</div><div class='add'>+		for (i = 0, bitmask = 1; i &lt; 32; i++, bitmask &lt;&lt;= 1) {</div><div class='add'>+			if (swIntStatus &amp; bitmask) {</div><div class='add'>+				do_IRQ(EMMA2RH_SW_IRQ_BASE + i, regs);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 0, bitmask = 1; i &lt; 32; i++, bitmask &lt;&lt;= 1) {</div><div class='add'>+		if (intStatus &amp; bitmask) {</div><div class='add'>+			do_IRQ(EMMA2RH_IRQ_BASE + i, regs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intStatus = emma2rh_in32(EMMA2RH_BHIF_INT_ST_1)</div><div class='add'>+	    &amp; emma2rh_in32(EMMA2RH_BHIF_INT_EN_1);</div><div class='add'>+</div><div class='add'>+#ifdef EMMA2RH_GPIO_CASCADE</div><div class='add'>+	if (intStatus &amp;</div><div class='add'>+	    (1 &lt;&lt; ((EMMA2RH_GPIO_CASCADE - EMMA2RH_IRQ_INT0) &amp; (32 - 1)))) {</div><div class='add'>+		u32 gpioIntStatus;</div><div class='add'>+		gpioIntStatus = emma2rh_in32(EMMA2RH_GPIO_INT_ST)</div><div class='add'>+		    &amp; emma2rh_in32(EMMA2RH_GPIO_INT_MASK);</div><div class='add'>+		for (i = 0, bitmask = 1; i &lt; 32; i++, bitmask &lt;&lt;= 1) {</div><div class='add'>+			if (gpioIntStatus &amp; bitmask) {</div><div class='add'>+				do_IRQ(EMMA2RH_GPIO_IRQ_BASE + i, regs);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	for (i = 32, bitmask = 1; i &lt; 64; i++, bitmask &lt;&lt;= 1) {</div><div class='add'>+		if (intStatus &amp; bitmask) {</div><div class='add'>+			do_IRQ(EMMA2RH_IRQ_BASE + i, regs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intStatus = emma2rh_in32(EMMA2RH_BHIF_INT_ST_2)</div><div class='add'>+	    &amp; emma2rh_in32(EMMA2RH_BHIF_INT_EN_2);</div><div class='add'>+</div><div class='add'>+	for (i = 64, bitmask = 1; i &lt; 96; i++, bitmask &lt;&lt;= 1) {</div><div class='add'>+		if (intStatus &amp; bitmask) {</div><div class='add'>+			do_IRQ(EMMA2RH_IRQ_BASE + i, regs);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c<br/>new file mode 100644<br/>index 000000000000..7c930860c921<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/common/irq_emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/common/irq_emma2rh.c</a></div><div class='hunk'>@@ -0,0 +1,134 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/common/irq_emma2rh.c</div><div class='add'>+ *      This file defines the irq handler for EMMA2RH.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2005-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/irq_5477.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * EMMA2RH defines 64 IRQs.</div><div class='add'>+ *</div><div class='add'>+ * This file exports one function:</div><div class='add'>+ *	emma2rh_irq_init(u32 irq_base);</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+/* number of total irqs supported by EMMA2RH */</div><div class='add'>+#define	NUM_EMMA2RH_IRQ		96</div><div class='add'>+</div><div class='add'>+static int emma2rh_irq_base = -1;</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_irq_enable(int);</div><div class='add'>+void ll_emma2rh_irq_disable(int);</div><div class='add'>+</div><div class='add'>+static void emma2rh_irq_enable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_irq_enable(irq - emma2rh_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_irq_disable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_irq_disable(irq - emma2rh_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int emma2rh_irq_startup(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	emma2rh_irq_enable(irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define	emma2rh_irq_shutdown	emma2rh_irq_disable</div><div class='add'>+</div><div class='add'>+static void emma2rh_irq_ack(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	/* disable interrupt - some handler will re-enable the irq</div><div class='add'>+	 * and if the interrupt is leveled, we will have infinite loop</div><div class='add'>+	 */</div><div class='add'>+	ll_emma2rh_irq_disable(irq - emma2rh_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_irq_end(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (!(irq_desc[irq].status &amp; (IRQ_DISABLED | IRQ_INPROGRESS)))</div><div class='add'>+		ll_emma2rh_irq_enable(irq - emma2rh_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct irq_chip emma2rh_irq_controller = {</div><div class='add'>+	.typename = "emma2rh_irq",</div><div class='add'>+	.startup = emma2rh_irq_startup,</div><div class='add'>+	.shutdown = emma2rh_irq_shutdown,</div><div class='add'>+	.enable = emma2rh_irq_enable,</div><div class='add'>+	.disable = emma2rh_irq_disable,</div><div class='add'>+	.ack = emma2rh_irq_ack,</div><div class='add'>+	.end = emma2rh_irq_end,</div><div class='add'>+	.set_affinity = NULL	/* no affinity stuff for UP */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void emma2rh_irq_init(u32 irq_base)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = irq_base; i &lt; irq_base + NUM_EMMA2RH_IRQ; i++) {</div><div class='add'>+		irq_desc[i].status = IRQ_DISABLED;</div><div class='add'>+		irq_desc[i].action = NULL;</div><div class='add'>+		irq_desc[i].depth = 1;</div><div class='add'>+		irq_desc[i].handler = &amp;emma2rh_irq_controller;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	emma2rh_irq_base = irq_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_irq_enable(int emma2rh_irq)</div><div class='add'>+{</div><div class='add'>+	u32 reg_value;</div><div class='add'>+	u32 reg_bitmask;</div><div class='add'>+	u32 reg_index;</div><div class='add'>+</div><div class='add'>+	reg_index = EMMA2RH_BHIF_INT_EN_0</div><div class='add'>+	    + (EMMA2RH_BHIF_INT_EN_1 - EMMA2RH_BHIF_INT_EN_0)</div><div class='add'>+	    * (emma2rh_irq / 32);</div><div class='add'>+	reg_value = emma2rh_in32(reg_index);</div><div class='add'>+	reg_bitmask = 0x1 &lt;&lt; (emma2rh_irq % 32);</div><div class='add'>+	db_assert((reg_value &amp; reg_bitmask) == 0);</div><div class='add'>+	emma2rh_out32(reg_index, reg_value | reg_bitmask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_irq_disable(int emma2rh_irq)</div><div class='add'>+{</div><div class='add'>+	u32 reg_value;</div><div class='add'>+	u32 reg_bitmask;</div><div class='add'>+	u32 reg_index;</div><div class='add'>+</div><div class='add'>+	reg_index = EMMA2RH_BHIF_INT_EN_0</div><div class='add'>+	    + (EMMA2RH_BHIF_INT_EN_1 - EMMA2RH_BHIF_INT_EN_0)</div><div class='add'>+	    * (emma2rh_irq / 32);</div><div class='add'>+	reg_value = emma2rh_in32(reg_index);</div><div class='add'>+	reg_bitmask = 0x1 &lt;&lt; (emma2rh_irq % 32);</div><div class='add'>+	db_assert((reg_value &amp; reg_bitmask) != 0);</div><div class='add'>+	emma2rh_out32(reg_index, reg_value &amp; ~reg_bitmask);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c<br/>new file mode 100644<br/>index 000000000000..7433bd8e5562<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/common/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/common/prom.c</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/common/prom.c</div><div class='add'>+ *      This file is prom file.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/common/prom.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	switch (mips_machtype) {</div><div class='add'>+	case MACH_NEC_MARKEINS:</div><div class='add'>+		return "NEC EMMA2RH Mark-eins";</div><div class='add'>+	default:</div><div class='add'>+		return "Unknown NEC board";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* [jsun@junsun.net] PMON passes arguments in C main() style */</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	int argc = fw_arg0;</div><div class='add'>+	char **arg = (char **)fw_arg1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* if user passes kernel args, ignore the default one */</div><div class='add'>+	if (argc &gt; 1)</div><div class='add'>+		arcs_cmdline[0] = '\0';</div><div class='add'>+</div><div class='add'>+	/* arg[0] is "g", the rest is boot parameters */</div><div class='add'>+	for (i = 1; i &lt; argc; i++) {</div><div class='add'>+		if (strlen(arcs_cmdline) + strlen(arg[i] + 1)</div><div class='add'>+		    &gt;= sizeof(arcs_cmdline))</div><div class='add'>+			break;</div><div class='add'>+		strcat(arcs_cmdline, arg[i]);</div><div class='add'>+		strcat(arcs_cmdline, " ");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mips_machgroup = MACH_GROUP_NEC_EMMA2RH;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_MARKEINS)</div><div class='add'>+	mips_machtype = MACH_NEC_MARKEINS;</div><div class='add'>+	add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_free_prom_memory(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/Makefile b/arch/mips/emma2rh/markeins/Makefile<br/>new file mode 100644<br/>index 000000000000..14fc268b175c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/markeins/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+#</div><div class='add'>+#  arch/mips/emma2rh/markeins/Makefile</div><div class='add'>+#       Makefile for the common code of NEC EMMA2RH based board.</div><div class='add'>+#</div><div class='add'>+#  Copyright (C) NEC Electronics Corporation 2005-2006</div><div class='add'>+#</div><div class='add'>+#  This program is free software; you can redistribute it and/or modify</div><div class='add'>+#  it under the terms of the GNU General Public License as published by</div><div class='add'>+#  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+#  (at your option) any later version.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MARKEINS) += irq.o irq_markeins.o setup.o led.o platform.o</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/irq.c b/arch/mips/emma2rh/markeins/irq.c<br/>new file mode 100644<br/>index 000000000000..2a736be42c8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/markeins/irq.c</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/markeins/irq.c</div><div class='add'>+ *      This file defines the irq handler for EMMA2RH.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/irq.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/i8259.h&gt;</div><div class='add'>+#include &lt;asm/irq_cpu.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ mapping</div><div class='add'>+ *</div><div class='add'>+ *  0-7: 8 CPU interrupts</div><div class='add'>+ *	0 -	software interrupt 0</div><div class='add'>+ *	1 - 	software interrupt 1</div><div class='add'>+ *	2 - 	most Vrc5477 interrupts are routed to this pin</div><div class='add'>+ *	3 - 	(optional) some other interrupts routed to this pin for debugg</div><div class='add'>+ *	4 - 	not used</div><div class='add'>+ *	5 - 	not used</div><div class='add'>+ *	6 - 	not used</div><div class='add'>+ *	7 - 	cpu timer (used by default)</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern void emma2rh_sw_irq_init(u32 base);</div><div class='add'>+extern void emma2rh_gpio_irq_init(u32 base);</div><div class='add'>+extern void emma2rh_irq_init(u32 base);</div><div class='add'>+extern asmlinkage void emma2rh_irq_dispatch(struct pt_regs *regs);</div><div class='add'>+</div><div class='add'>+static struct irqaction irq_cascade = {</div><div class='add'>+	   .handler = no_action,</div><div class='add'>+	   .flags = 0,</div><div class='add'>+	   .mask = CPU_MASK_NONE,</div><div class='add'>+	   .name = "cascade",</div><div class='add'>+	   .dev_id = NULL,</div><div class='add'>+	   .next = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init arch_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	db_run(printk("markeins_irq_setup invoked.\n"));</div><div class='add'>+</div><div class='add'>+	/* by default, interrupts are disabled. */</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_INT_EN_0, 0);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_INT_EN_1, 0);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_INT_EN_2, 0);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_INT1_EN_0, 0);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_INT1_EN_1, 0);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_INT1_EN_2, 0);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_SW_INT_EN, 0);</div><div class='add'>+</div><div class='add'>+	clear_c0_status(0xff00);</div><div class='add'>+	set_c0_status(0x0400);</div><div class='add'>+</div><div class='add'>+#define GPIO_PCI (0xf&lt;&lt;15)</div><div class='add'>+	/* setup GPIO interrupt for PCI interface */</div><div class='add'>+	/* direction input */</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_GPIO_DIR);</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_DIR, reg &amp; ~GPIO_PCI);</div><div class='add'>+	/* disable interrupt */</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_GPIO_INT_MASK);</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_MASK, reg &amp; ~GPIO_PCI);</div><div class='add'>+	/* level triggerd */</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_GPIO_INT_MODE);</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_MODE, reg | GPIO_PCI);</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_GPIO_INT_CND_A);</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_CND_A, reg &amp; (~GPIO_PCI));</div><div class='add'>+	/* interrupt clear */</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_ST, ~GPIO_PCI);</div><div class='add'>+</div><div class='add'>+	/* init all controllers */</div><div class='add'>+	emma2rh_irq_init(EMMA2RH_IRQ_BASE);</div><div class='add'>+	emma2rh_sw_irq_init(EMMA2RH_SW_IRQ_BASE);</div><div class='add'>+	emma2rh_gpio_irq_init(EMMA2RH_GPIO_IRQ_BASE);</div><div class='add'>+	mips_cpu_irq_init(CPU_IRQ_BASE);</div><div class='add'>+</div><div class='add'>+	/* setup cascade interrupts */</div><div class='add'>+	setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_SW_CASCADE, &amp;irq_cascade);</div><div class='add'>+	setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_GPIO_CASCADE, &amp;irq_cascade);</div><div class='add'>+	setup_irq(CPU_IRQ_BASE + CPU_EMMA2RH_CASCADE, &amp;irq_cascade);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+        unsigned int pending = read_c0_status() &amp; read_c0_cause();</div><div class='add'>+</div><div class='add'>+	if (pending &amp; STATUSF_IP7)</div><div class='add'>+		do_IRQ(CPU_IRQ_BASE + 7, regs);</div><div class='add'>+	else if (pending &amp; STATUSF_IP2)</div><div class='add'>+		emma2rh_irq_dispatch(regs);</div><div class='add'>+	else if (pending &amp; STATUSF_IP1)</div><div class='add'>+		do_IRQ(CPU_IRQ_BASE + 1, regs);</div><div class='add'>+	else if (pending &amp; STATUSF_IP0)</div><div class='add'>+		do_IRQ(CPU_IRQ_BASE + 0, regs);</div><div class='add'>+	else</div><div class='add'>+		spurious_interrupt(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma2rh/markeins/irq_markeins.c<br/>new file mode 100644<br/>index 000000000000..f23ae9fcffa0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/irq_markeins.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/markeins/irq_markeins.c</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/markeins/irq_markeins.c</div><div class='add'>+ *      This file defines the irq handler for Mark-eins.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/irq_5477.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+static int emma2rh_sw_irq_base = -1;</div><div class='add'>+static int emma2rh_gpio_irq_base = -1;</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_sw_irq_enable(int reg);</div><div class='add'>+void ll_emma2rh_sw_irq_disable(int reg);</div><div class='add'>+void ll_emma2rh_gpio_irq_enable(int reg);</div><div class='add'>+void ll_emma2rh_gpio_irq_disable(int reg);</div><div class='add'>+</div><div class='add'>+static void emma2rh_sw_irq_enable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_sw_irq_disable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int emma2rh_sw_irq_startup(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	emma2rh_sw_irq_enable(irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define emma2rh_sw_irq_shutdown emma2rh_sw_irq_disable</div><div class='add'>+</div><div class='add'>+static void emma2rh_sw_irq_ack(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_sw_irq_disable(irq - emma2rh_sw_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_sw_irq_end(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (!(irq_desc[irq].status &amp; (IRQ_DISABLED | IRQ_INPROGRESS)))</div><div class='add'>+		ll_emma2rh_sw_irq_enable(irq - emma2rh_sw_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct irq_chip emma2rh_sw_irq_controller = {</div><div class='add'>+	.typename = "emma2rh_sw_irq",</div><div class='add'>+	.startup = emma2rh_sw_irq_startup,</div><div class='add'>+	.shutdown = emma2rh_sw_irq_shutdown,</div><div class='add'>+	.enable = emma2rh_sw_irq_enable,</div><div class='add'>+	.disable = emma2rh_sw_irq_disable,</div><div class='add'>+	.ack = emma2rh_sw_irq_ack,</div><div class='add'>+	.end = emma2rh_sw_irq_end,</div><div class='add'>+	.set_affinity = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void emma2rh_sw_irq_init(u32 irq_base)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = irq_base; i &lt; irq_base + NUM_EMMA2RH_IRQ_SW; i++) {</div><div class='add'>+		irq_desc[i].status = IRQ_DISABLED;</div><div class='add'>+		irq_desc[i].action = NULL;</div><div class='add'>+		irq_desc[i].depth = 2;</div><div class='add'>+		irq_desc[i].handler = &amp;emma2rh_sw_irq_controller;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	emma2rh_sw_irq_base = irq_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_sw_irq_enable(int irq)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	db_assert(irq &gt;= 0);</div><div class='add'>+	db_assert(irq &lt; NUM_EMMA2RH_IRQ_SW);</div><div class='add'>+</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_BHIF_SW_INT_EN);</div><div class='add'>+	reg |= 1 &lt;&lt; irq;</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_SW_INT_EN, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_sw_irq_disable(int irq)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	db_assert(irq &gt;= 0);</div><div class='add'>+	db_assert(irq &lt; 32);</div><div class='add'>+</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_BHIF_SW_INT_EN);</div><div class='add'>+	reg &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+	emma2rh_out32(EMMA2RH_BHIF_SW_INT_EN, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_gpio_irq_enable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_gpio_irq_enable(irq - emma2rh_gpio_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_gpio_irq_disable(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	ll_emma2rh_gpio_irq_disable(irq - emma2rh_gpio_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int emma2rh_gpio_irq_startup(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	emma2rh_gpio_irq_enable(irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define emma2rh_gpio_irq_shutdown emma2rh_gpio_irq_disable</div><div class='add'>+</div><div class='add'>+static void emma2rh_gpio_irq_ack(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	irq -= emma2rh_gpio_irq_base;</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_ST, ~(1 &lt;&lt; irq));</div><div class='add'>+	ll_emma2rh_gpio_irq_disable(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emma2rh_gpio_irq_end(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	if (!(irq_desc[irq].status &amp; (IRQ_DISABLED | IRQ_INPROGRESS)))</div><div class='add'>+		ll_emma2rh_gpio_irq_enable(irq - emma2rh_gpio_irq_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct irq_chip emma2rh_gpio_irq_controller = {</div><div class='add'>+	.typename = "emma2rh_gpio_irq",</div><div class='add'>+	.startup = emma2rh_gpio_irq_startup,</div><div class='add'>+	.shutdown = emma2rh_gpio_irq_shutdown,</div><div class='add'>+	.enable = emma2rh_gpio_irq_enable,</div><div class='add'>+	.disable = emma2rh_gpio_irq_disable,</div><div class='add'>+	.ack = emma2rh_gpio_irq_ack,</div><div class='add'>+	.end = emma2rh_gpio_irq_end,</div><div class='add'>+	.set_affinity = NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void emma2rh_gpio_irq_init(u32 irq_base)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = irq_base; i &lt; irq_base + NUM_EMMA2RH_IRQ_GPIO; i++) {</div><div class='add'>+		irq_desc[i].status = IRQ_DISABLED;</div><div class='add'>+		irq_desc[i].action = NULL;</div><div class='add'>+		irq_desc[i].depth = 2;</div><div class='add'>+		irq_desc[i].handler = &amp;emma2rh_gpio_irq_controller;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	emma2rh_gpio_irq_base = irq_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_gpio_irq_enable(int irq)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	db_assert(irq &gt;= 0);</div><div class='add'>+	db_assert(irq &lt; NUM_EMMA2RH_IRQ_GPIO);</div><div class='add'>+</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_GPIO_INT_MASK);</div><div class='add'>+	reg |= 1 &lt;&lt; irq;</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_MASK, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ll_emma2rh_gpio_irq_disable(int irq)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	db_assert(irq &gt;= 0);</div><div class='add'>+	db_assert(irq &lt; NUM_EMMA2RH_IRQ_GPIO);</div><div class='add'>+</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_GPIO_INT_MASK);</div><div class='add'>+	reg &amp;= ~(1 &lt;&lt; irq);</div><div class='add'>+	emma2rh_out32(EMMA2RH_GPIO_INT_MASK, reg);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/led.c b/arch/mips/emma2rh/markeins/led.c<br/>new file mode 100644<br/>index 000000000000..b65254c1bfe9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/markeins/led.c</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/markeins/led.c</div><div class='add'>+ *      This file defines the led display for Mark-eins.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+const unsigned long clear = 0x20202020;</div><div class='add'>+</div><div class='add'>+#define LED_BASE 0xb1400038</div><div class='add'>+</div><div class='add'>+void markeins_led_clear(void)</div><div class='add'>+{</div><div class='add'>+	emma2rh_out32(LED_BASE, clear);</div><div class='add'>+	emma2rh_out32(LED_BASE + 4, clear);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void markeins_led(const char *str)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int len = strlen(str);</div><div class='add'>+</div><div class='add'>+	markeins_led_clear();</div><div class='add'>+	if (len &gt; 8)</div><div class='add'>+		len = 8;</div><div class='add'>+</div><div class='add'>+	if (emma2rh_in32(0xb0000800) &amp; (0x1 &lt;&lt; 18))</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			emma2rh_out8(LED_BASE + i, str[i]);</div><div class='add'>+	else</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			emma2rh_out8(LED_BASE + (i &amp; 4) + (3 - (i &amp; 3)),</div><div class='add'>+				     str[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void markeins_led_hex(u32 val)</div><div class='add'>+{</div><div class='add'>+	char str[10];</div><div class='add'>+</div><div class='add'>+	sprintf(str, "%08x", val);</div><div class='add'>+	markeins_led(str);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/platform.c b/arch/mips/emma2rh/markeins/platform.c<br/>new file mode 100644<br/>index 000000000000..15cc61df3622<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/markeins/platform.c</a></div><div class='hunk'>@@ -0,0 +1,169 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/markeins/platofrm.c</div><div class='add'>+ *      This file sets up platform devices for EMMA2RH Mark-eins.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright(C) MontaVista Software Inc, 2006</div><div class='add'>+ *</div><div class='add'>+ *  Author: dmitry pervushin &lt;dpervushin@ru.mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/serial_8250.h&gt;</div><div class='add'>+#include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpu.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/bcache.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/gdb-stub.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */</div><div class='add'>+</div><div class='add'>+static struct resource i2c_emma_resources_0[] = {</div><div class='add'>+	{ NULL, EMMA2RH_IRQ_PIIC0, EMMA2RH_IRQ_PIIC0, IORESOURCE_IRQ },</div><div class='add'>+	{ NULL, KSEG1ADDR(EMMA2RH_PIIC0_BASE), KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000), 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct resource i2c_emma_resources_1[] = {</div><div class='add'>+	{ NULL, EMMA2RH_IRQ_PIIC1, EMMA2RH_IRQ_PIIC1, IORESOURCE_IRQ },</div><div class='add'>+	{ NULL, KSEG1ADDR(EMMA2RH_PIIC1_BASE), KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000), 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct resource i2c_emma_resources_2[] = {</div><div class='add'>+	{ NULL, EMMA2RH_IRQ_PIIC2, EMMA2RH_IRQ_PIIC2, IORESOURCE_IRQ },</div><div class='add'>+	{ NULL, KSEG1ADDR(EMMA2RH_PIIC2_BASE), KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000), 0 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct platform_device i2c_emma_devices[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name = I2C_EMMA2RH,</div><div class='add'>+		.id = 0,</div><div class='add'>+		.resource = i2c_emma_resources_0,</div><div class='add'>+		.num_resources = ARRAY_SIZE(i2c_emma_resources_0),</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.name = I2C_EMMA2RH,</div><div class='add'>+		.id = 1,</div><div class='add'>+		.resource = i2c_emma_resources_1,</div><div class='add'>+		.num_resources = ARRAY_SIZE(i2c_emma_resources_1),</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.name = I2C_EMMA2RH,</div><div class='add'>+		.id = 2,</div><div class='add'>+		.resource = i2c_emma_resources_2,</div><div class='add'>+		.num_resources = ARRAY_SIZE(i2c_emma_resources_2),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EMMA2RH_SERIAL_CLOCK 18544000</div><div class='add'>+#define EMMA2RH_SERIAL_FLAGS UPF_BOOT_AUTOCONF | UPF_SKIP_TEST</div><div class='add'>+</div><div class='add'>+static struct  plat_serial8250_port platform_serial_ports[] = {</div><div class='add'>+       [0] = {</div><div class='add'>+         .membase = (void __iomem*)KSEG1ADDR(EMMA2RH_PFUR0_BASE + 3),</div><div class='add'>+         .irq = EMMA2RH_IRQ_PFUR0,</div><div class='add'>+         .uartclk = EMMA2RH_SERIAL_CLOCK,</div><div class='add'>+         .regshift = 4,</div><div class='add'>+         .iotype = UPIO_MEM,</div><div class='add'>+         .flags = EMMA2RH_SERIAL_FLAGS,</div><div class='add'>+       },</div><div class='add'>+       [1] = {</div><div class='add'>+         .membase = (void __iomem*)KSEG1ADDR(EMMA2RH_PFUR1_BASE + 3),</div><div class='add'>+         .irq = EMMA2RH_IRQ_PFUR1,</div><div class='add'>+         .uartclk = EMMA2RH_SERIAL_CLOCK,</div><div class='add'>+         .regshift = 4,</div><div class='add'>+         .iotype = UPIO_MEM,</div><div class='add'>+         .flags = EMMA2RH_SERIAL_FLAGS,</div><div class='add'>+       },</div><div class='add'>+       [2] = {</div><div class='add'>+         .membase = (void __iomem*)KSEG1ADDR(EMMA2RH_PFUR2_BASE + 3),</div><div class='add'>+         .irq = EMMA2RH_IRQ_PFUR2,</div><div class='add'>+         .uartclk = EMMA2RH_SERIAL_CLOCK,</div><div class='add'>+         .regshift = 4,</div><div class='add'>+         .iotype = UPIO_MEM,</div><div class='add'>+         .flags = EMMA2RH_SERIAL_FLAGS,</div><div class='add'>+       },</div><div class='add'>+       [3] = {</div><div class='add'>+	 .flags = 0,</div><div class='add'>+       },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct  platform_device serial_emma = {</div><div class='add'>+	.name = "serial8250",</div><div class='add'>+	.dev = {</div><div class='add'>+		.platform_data = &amp;platform_serial_ports,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *devices[] = {</div><div class='add'>+	&amp;i2c_emma_devices[0],</div><div class='add'>+	&amp;i2c_emma_devices[1],</div><div class='add'>+	&amp;i2c_emma_devices[2],</div><div class='add'>+	&amp;serial_emma,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mtd_partition markeins_parts[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		.name = "RootFS",</div><div class='add'>+		.offset = 0x00000000,</div><div class='add'>+		.size = 0x00c00000,</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		.name = "boot code area",</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+		.size = 0x00100000,</div><div class='add'>+	},</div><div class='add'>+	[2] = {</div><div class='add'>+		.name = "kernel image",</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+		.size = 0x00300000,</div><div class='add'>+	},</div><div class='add'>+	[3] = {</div><div class='add'>+		.name = "RootFS2",</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+		.size = 0x00c00000,</div><div class='add'>+	},</div><div class='add'>+	[4] = {</div><div class='add'>+		.name = "boot code area2",</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+		.size = 0x00100000,</div><div class='add'>+	},</div><div class='add'>+	[5] = {</div><div class='add'>+		.name = "kernel image2",</div><div class='add'>+		.offset = MTDPART_OFS_APPEND,</div><div class='add'>+		.size = MTDPART_SIZ_FULL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init platform_devices_setup(void)</div><div class='add'>+{</div><div class='add'>+	physmap_set_partitions(markeins_parts, ARRAY_SIZE(markeins_parts));</div><div class='add'>+	return platform_add_devices(devices, ARRAY_SIZE(devices));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(platform_devices_setup);</div><div class='add'>+</div><div class='head'>diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c<br/>new file mode 100644<br/>index 000000000000..b29a44739230<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/emma2rh/markeins/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/emma2rh/markeins/setup.c</a></div><div class='hunk'>@@ -0,0 +1,180 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/emma2rh/markeins/setup.c</div><div class='add'>+ *      This file is setup for EMMA2RH Mark-eins.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/setup.c.</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/initrd.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;	/* for HZ */</div><div class='add'>+#include &lt;linux/root_dev.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/cpu.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/bcache.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/gdb-stub.h&gt;</div><div class='add'>+#include &lt;asm/traps.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+#define	USE_CPU_COUNTER_TIMER	/* whether we use cpu counter */</div><div class='add'>+</div><div class='add'>+extern void markeins_led(const char *);</div><div class='add'>+</div><div class='add'>+static int bus_frequency = 0;</div><div class='add'>+</div><div class='add'>+static void markeins_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	static void (*back_to_prom) (void) = (void (*)(void))0xbfc00000;</div><div class='add'>+</div><div class='add'>+	printk("cannot EMMA2RH Mark-eins restart.\n");</div><div class='add'>+	markeins_led("restart.");</div><div class='add'>+	back_to_prom();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void markeins_machine_halt(void)</div><div class='add'>+{</div><div class='add'>+	printk("EMMA2RH Mark-eins halted.\n");</div><div class='add'>+	markeins_led("halted.");</div><div class='add'>+	while (1) ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void markeins_machine_power_off(void)</div><div class='add'>+{</div><div class='add'>+	printk("EMMA2RH Mark-eins halted. Please turn off the power.\n");</div><div class='add'>+	markeins_led("poweroff.");</div><div class='add'>+	while (1) ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long clock[4] = { 166500000, 187312500, 199800000, 210600000 };</div><div class='add'>+</div><div class='add'>+static unsigned int __init detect_bus_frequency(unsigned long rtc_base)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* detect from boot strap */</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0);</div><div class='add'>+	reg = (reg &gt;&gt; 4) &amp; 0x3;</div><div class='add'>+	return clock[reg];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init emma2rh_time_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	if (bus_frequency == 0)</div><div class='add'>+		bus_frequency = detect_bus_frequency(0);</div><div class='add'>+</div><div class='add'>+	reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0);</div><div class='add'>+	if ((reg &amp; 0x3) == 0)</div><div class='add'>+		reg = (reg &gt;&gt; 6) &amp; 0x3;</div><div class='add'>+	else {</div><div class='add'>+		reg = emma2rh_in32(EMMA2RH_BHIF_MAIN_CTRL);</div><div class='add'>+		reg = (reg &gt;&gt; 4) &amp; 0x3;</div><div class='add'>+	}</div><div class='add'>+	mips_hpt_frequency = (bus_frequency * (4 + reg)) / 4 / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='add'>+{</div><div class='add'>+	/* we are using the cpu counter for timer interrupts */</div><div class='add'>+	setup_irq(CPU_IRQ_BASE + 7, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void markeins_board_init(void);</div><div class='add'>+extern void markeins_irq_setup(void);</div><div class='add'>+</div><div class='add'>+static void inline __init markeins_sio_setup(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_KGDB_8250</div><div class='add'>+	struct uart_port emma_port;</div><div class='add'>+</div><div class='add'>+	memset(&amp;emma_port, 0, sizeof(emma_port));</div><div class='add'>+</div><div class='add'>+	emma_port.flags =</div><div class='add'>+	    UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;</div><div class='add'>+	emma_port.iotype = UPIO_MEM;</div><div class='add'>+	emma_port.regshift = 4;	/* I/O addresses are every 8 bytes */</div><div class='add'>+	emma_port.uartclk = 18544000;	/* Clock rate of the chip */</div><div class='add'>+</div><div class='add'>+	emma_port.line = 0;</div><div class='add'>+	emma_port.mapbase = KSEG1ADDR(EMMA2RH_PFUR0_BASE + 3);</div><div class='add'>+	emma_port.membase = (u8*)emma_port.mapbase;</div><div class='add'>+	early_serial_setup(&amp;emma_port);</div><div class='add'>+</div><div class='add'>+	emma_port.line = 1;</div><div class='add'>+	emma_port.mapbase = KSEG1ADDR(EMMA2RH_PFUR1_BASE + 3);</div><div class='add'>+	emma_port.membase = (u8*)emma_port.mapbase;</div><div class='add'>+	early_serial_setup(&amp;emma_port);</div><div class='add'>+</div><div class='add'>+	emma_port.irq = EMMA2RH_IRQ_PFUR1;</div><div class='add'>+	kgdb8250_add_port(1, &amp;emma_port);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='add'>+{</div><div class='add'>+	/* initialize board - we don't trust the loader */</div><div class='add'>+	markeins_board_init();</div><div class='add'>+</div><div class='add'>+	set_io_port_base(KSEG1ADDR(EMMA2RH_PCI_IO_BASE));</div><div class='add'>+</div><div class='add'>+	board_time_init = emma2rh_time_init;</div><div class='add'>+</div><div class='add'>+	_machine_restart = markeins_machine_restart;</div><div class='add'>+	_machine_halt = markeins_machine_halt;</div><div class='add'>+	pm_power_off = markeins_machine_power_off;</div><div class='add'>+</div><div class='add'>+	/* setup resource limits */</div><div class='add'>+	ioport_resource.start = EMMA2RH_PCI_IO_BASE;</div><div class='add'>+	ioport_resource.end = EMMA2RH_PCI_IO_BASE + EMMA2RH_PCI_IO_SIZE - 1;</div><div class='add'>+	iomem_resource.start = EMMA2RH_IO_BASE;</div><div class='add'>+	iomem_resource.end = EMMA2RH_ROM_BASE - 1;</div><div class='add'>+</div><div class='add'>+	/* Reboot on panic */</div><div class='add'>+	panic_timeout = 180;</div><div class='add'>+</div><div class='add'>+	markeins_sio_setup();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init markeins_board_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = emma2rh_in32(EMMA2RH_PBRD_INT_EN);	/* open serial interrupts. */</div><div class='add'>+	emma2rh_out32(EMMA2RH_PBRD_INT_EN, val | 0xaa);</div><div class='add'>+	val = emma2rh_in32(EMMA2RH_PBRD_CLKSEL);	/* set serial clocks. */</div><div class='add'>+	emma2rh_out32(EMMA2RH_PBRD_CLKSEL, val | 0x5);	/* 18MHz */</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	markeins_led("MVL E2RH");</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/galileo-boards/ev96100/setup.c b/arch/mips/galileo-boards/ev96100/setup.c<br/>index 78dbb18edeb8..639ad5562c63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/galileo-boards/ev96100/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/galileo-boards/ev96100/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/galileo-boards/ev96100/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/galileo-boards/ev96100/setup.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -55,7 +54,7 @@ extern void mips_reboot_setup(void);</div><div class='ctx'> </div><div class='ctx'> unsigned char mac_0_1[12];</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int config = read_c0_config();</div><div class='ctx'> 	unsigned int status = read_c0_status();</div><div class='head'>diff --git a/arch/mips/galileo-boards/ev96100/time.c b/arch/mips/galileo-boards/ev96100/time.c<br/>index bff5b1c174e4..8cbe8426491a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/galileo-boards/ev96100/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/galileo-boards/ev96100/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/galileo-boards/ev96100/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/galileo-boards/ev96100/time.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/mips/gt64120/common/Makefile b/arch/mips/gt64120/common/Makefile<br/>index eba5051015a5..1ef676e22ab4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/common/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/common/Makefile</a></div><div class='hunk'>@@ -3,4 +3,3 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y	 		+= time.o</div><div class='del'>-obj-$(CONFIG_PCI)	+= pci.o</div><div class='head'>diff --git a/arch/mips/gt64120/common/pci.c b/arch/mips/gt64120/common/pci.c<br/>deleted file mode 100644<br/>index e9e5419a0d53..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/common/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/common/pci.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,147 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- * Galileo Evaluation Boards PCI support.</div><div class='del'>- *</div><div class='del'>- * The general-purpose functions to read/write and configure the GT64120A's</div><div class='del'>- * PCI registers (function names start with pci0 or pci1) are either direct</div><div class='del'>- * copies of functions written by Galileo Technology, or are modifications</div><div class='del'>- * of their functions to work with Linux 2.4 vs Linux 2.2.  These functions</div><div class='del'>- * are Copyright - Galileo Technology.</div><div class='del'>- *</div><div class='del'>- * Other functions are derived from other MIPS PCI implementations, or were</div><div class='del'>- * written by RidgeRun, Inc,  Copyright (C) 2000 RidgeRun, Inc.</div><div class='del'>- *   glonnon@ridgerun.com, skranz@ridgerun.com, stevej@ridgerun.com</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/gt64120.h&gt;</div><div class='del'>-</div><div class='del'>-#define SELF 0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pciXReadConfigReg  - Read from a PCI configuration register</div><div class='del'>- *                    - Make sure the GT is configured as a master before</div><div class='del'>- *                      reading from another device on the PCI.</div><div class='del'>- *                   - The function takes care of Big/Little endian conversion.</div><div class='del'>- * INPUTS:   regOffset: The register offset as it apears in the GT spec (or PCI</div><div class='del'>- *                        spec)</div><div class='del'>- *           pciDevNum: The device number needs to be addressed.</div><div class='del'>- * RETURNS: data , if the data == 0xffffffff check the master abort bit in the</div><div class='del'>- *                 cause register to make sure the data is valid</div><div class='del'>- *</div><div class='del'>- *  Configuration Address 0xCF8:</div><div class='del'>- *</div><div class='del'>- *       31 30    24 23  16 15  11 10     8 7      2  0     &lt;=bit Number</div><div class='del'>- *  |congif|Reserved|  Bus |Device|Function|Register|00|</div><div class='del'>- *  |Enable|        |Number|Number| Number | Number |  |    &lt;=field Name</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static unsigned int pci0ReadConfigReg(int offset, struct pci_dev *device)</div><div class='del'>-{</div><div class='del'>-	unsigned int DataForRegCf8;</div><div class='del'>-	unsigned int data;</div><div class='del'>-</div><div class='del'>-	DataForRegCf8 = ((PCI_SLOT(device-&gt;devfn) &lt;&lt; 11) |</div><div class='del'>-			 (PCI_FUNC(device-&gt;devfn) &lt;&lt; 8) |</div><div class='del'>-			 (offset &amp; ~0x3)) | 0x80000000;</div><div class='del'>-	GT_WRITE(GT_PCI0_CFGADDR_OFS, DataForRegCf8);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The casual observer might wonder why the READ is duplicated here,</div><div class='del'>-	 * rather than immediately following the WRITE, and just have the swap</div><div class='del'>-	 * in the "if".  That's because there is a latency problem with trying</div><div class='del'>-	 * to read immediately after setting up the address register.  The "if"</div><div class='del'>-	 * check gives enough time for the address to stabilize, so the READ</div><div class='del'>-	 * can work.</div><div class='del'>-	 */</div><div class='del'>-	if (PCI_SLOT(device-&gt;devfn) == SELF)	/* This board */</div><div class='del'>-		return GT_READ(GT_PCI0_CFGDATA_OFS);</div><div class='del'>-	else		/* PCI is little endian so swap the Data. */</div><div class='del'>-		return __GT_READ(GT_PCI0_CFGDATA_OFS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pciXWriteConfigReg - Write to a PCI configuration register</div><div class='del'>- *                    - Make sure the GT is configured as a master before</div><div class='del'>- *                      writingto another device on the PCI.</div><div class='del'>- *                    - The function takes care of Big/Little endian conversion.</div><div class='del'>- * Inputs:   unsigned int regOffset: The register offset as it apears in the</div><div class='del'>- *           GT spec</div><div class='del'>- *                   (or any other PCI device spec)</div><div class='del'>- *           pciDevNum: The device number needs to be addressed.</div><div class='del'>- *</div><div class='del'>- *  Configuration Address 0xCF8:</div><div class='del'>- *</div><div class='del'>- *       31 30    24 23  16 15  11 10     8 7      2  0     &lt;=bit Number</div><div class='del'>- *  |congif|Reserved|  Bus |Device|Function|Register|00|</div><div class='del'>- *  |Enable|        |Number|Number| Number | Number |  |    &lt;=field Name</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void pci0WriteConfigReg(unsigned int offset,</div><div class='del'>-			       struct pci_dev *device, unsigned int data)</div><div class='del'>-{</div><div class='del'>-	unsigned int DataForRegCf8;</div><div class='del'>-</div><div class='del'>-	DataForRegCf8 = ((PCI_SLOT(device-&gt;devfn) &lt;&lt; 11) |</div><div class='del'>-			 (PCI_FUNC(device-&gt;devfn) &lt;&lt; 8) |</div><div class='del'>-			 (offset &amp; ~0x3)) | 0x80000000;</div><div class='del'>-	GT_WRITE(GT_PCI0_CFGADDR_OFS, DataForRegCf8);</div><div class='del'>-</div><div class='del'>-	if (PCI_SLOT(device-&gt;devfn) == SELF) 	/* This board */</div><div class='del'>-		GT_WRITE(GT_PCI0_CFGDATA_OFS, data);</div><div class='del'>-	else 			/* configuration Transaction over the pci. */</div><div class='del'>-		__GT_WRITE(GT_PCI0_CFGDATA_OFS, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern struct pci_ops gt64120_pci_ops;</div><div class='del'>-</div><div class='del'>-void __init pcibios_init(void)</div><div class='del'>-{</div><div class='del'>-	u32 tmp;</div><div class='del'>-	struct pci_dev controller;</div><div class='del'>-</div><div class='del'>-	controller.devfn = SELF;</div><div class='del'>-</div><div class='del'>-	tmp = GT_READ(GT_PCI0_CMD_OFS);		/* Huh??? -- Ralf  */</div><div class='del'>-	tmp = GT_READ(GT_PCI0_BARE_OFS);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * You have to enable bus mastering to configure any other</div><div class='del'>-	 * card on the bus.</div><div class='del'>-	 */</div><div class='del'>-	tmp = pci0ReadConfigReg(PCI_COMMAND, &amp;controller);</div><div class='del'>-	tmp |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_SERR;</div><div class='del'>-	pci0WriteConfigReg(PCI_COMMAND, &amp;controller, tmp);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Reset PCI I/O and PCI MEM values to ones supported by EVM.</div><div class='del'>-	 */</div><div class='del'>-	ioport_resource.start	= GT_PCI_IO_BASE;</div><div class='del'>-	ioport_resource.end	= GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;</div><div class='del'>-	iomem_resource.start	= GT_PCI_MEM_BASE;</div><div class='del'>-	iomem_resource.end	= GT_PCI_MEM_BASE + GT_PCI_MEM_SIZE - 1;</div><div class='del'>-</div><div class='del'>-	pci_scan_bus(0, &amp;gt64120_pci_ops, NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c<br/>index 2287b59536e5..d837b26fbe51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/common/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/common/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/common/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/common/time.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='hunk'>@@ -78,7 +77,7 @@ void gt64120_time_init(void)</div><div class='ctx'> 	 * the values to the correct interrupt line.</div><div class='ctx'> 	 */</div><div class='ctx'> 	timer.handler = gt64120_irq;</div><div class='del'>-	timer.flags = SA_SHIRQ | SA_INTERRUPT;</div><div class='add'>+	timer.flags = IRQF_SHARED | IRQF_DISABLED;</div><div class='ctx'> 	timer.name = "timer";</div><div class='ctx'> 	timer.dev_id = NULL;</div><div class='ctx'> 	timer.next = NULL;</div><div class='head'>diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c<br/>index 46c468b26b30..5d939ac58f3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/ev64120/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/ev64120/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/ev64120/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/ev64120/irq.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ static void end_ev64120_irq(unsigned int irq)</div><div class='ctx'> 		enable_ev64120_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ev64120_irq_type = {</div><div class='add'>+static struct irq_chip ev64120_irq_type = {</div><div class='ctx'> 	.typename	= "EV64120",</div><div class='ctx'> 	.startup	= startup_ev64120_irq,</div><div class='ctx'> 	.shutdown	= shutdown_ev64120_irq,</div><div class='hunk'>@@ -138,7 +138,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	/*  Let's initialize our IRQ descriptors  */</div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='ctx'> 		irq_desc[i].status = 0;</div><div class='del'>-		irq_desc[i].handler = &amp;no_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;no_irq_chip;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 0;</div><div class='ctx'> 		spin_lock_init(&amp;irq_desc[i].lock);</div><div class='head'>diff --git a/arch/mips/gt64120/ev64120/serialGT.c b/arch/mips/gt64120/ev64120/serialGT.c<br/>index 16e34a546e54..8f0d835491ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/ev64120/serialGT.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/ev64120/serialGT.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/ev64120/serialGT.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/ev64120/serialGT.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ void serial_set(int channel, unsigned long baud)</div><div class='ctx'> #else</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: Set baud rate, hardcoded here for rate of 115200</div><div class='del'>-	 * since became unsure of above "buad rate" algorithm (??).</div><div class='add'>+	 * since became unsure of above "baud rate" algorithm (??).</div><div class='ctx'> 	 */</div><div class='ctx'> 	outreg(channel, LCR, 0x83);</div><div class='ctx'> 	outreg(channel, DLM, 0x00);	// See note above</div><div class='head'>diff --git a/arch/mips/gt64120/ev64120/setup.c b/arch/mips/gt64120/ev64120/setup.c<br/>index 6d859d1e7a2d..4236da31ecc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/ev64120/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/ev64120/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/ev64120/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/ev64120/setup.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ unsigned long __init prom_free_prom_memory(void)</div><div class='ctx'>  */</div><div class='ctx'> extern void gt64120_time_init(void);</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	_machine_restart = galileo_machine_restart;</div><div class='ctx'> 	_machine_halt = galileo_machine_halt;</div><div class='head'>diff --git a/arch/mips/gt64120/momenco_ocelot/dbg_io.c b/arch/mips/gt64120/momenco_ocelot/dbg_io.c<br/>index 8720bccfdea2..2128684584f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/momenco_ocelot/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/momenco_ocelot/dbg_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/momenco_ocelot/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/momenco_ocelot/dbg_io.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='ctx'> </div><div class='del'>-	/* set up buad rate */</div><div class='add'>+	/* set up baud rate */</div><div class='ctx'> 	{</div><div class='ctx'> 		uint32 divisor;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/gt64120/momenco_ocelot/setup.c b/arch/mips/gt64120/momenco_ocelot/setup.c<br/>index 20b65d3d2151..9804642ecf89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/gt64120/momenco_ocelot/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/gt64120/momenco_ocelot/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/momenco_ocelot/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/momenco_ocelot/setup.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ void PMON_v2_setup()</div><div class='ctx'> 	gt64120_base = 0xe0000000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	void (*l3func)(unsigned long)=KSEG1ADDR(&amp;setup_l3cache);</div><div class='ctx'> 	unsigned int tmpword;</div><div class='hunk'>@@ -164,8 +164,8 @@ void __init plat_setup(void)</div><div class='ctx'> 	pm_power_off = momenco_ocelot_power_off;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * initrd_start = (ulong)ocelot_initrd_start;</div><div class='del'>-	 * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;</div><div class='add'>+	 * initrd_start = (unsigned long)ocelot_initrd_start;</div><div class='add'>+	 * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;</div><div class='ctx'> 	 * initrd_below_start_ok = 1;</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/gt64120/wrppmc/Makefile b/arch/mips/gt64120/wrppmc/Makefile<br/>new file mode 100644<br/>index 000000000000..7cf52205511c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/wrppmc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/wrppmc/Makefile</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+#</div><div class='add'>+# This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+# License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+# for more details.</div><div class='add'>+#</div><div class='add'>+# Copyright 2006 Wind River System, Inc.</div><div class='add'>+# Author: Rongkai.Zhan &lt;rongkai.zhan@windriver.com&gt;</div><div class='add'>+#</div><div class='add'>+# Makefile for the Wind River MIPS 4KC PPMC Eval Board</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-y += irq.o reset.o setup.o time.o pci.o</div><div class='add'>+</div><div class='add'>+EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/gt64120/wrppmc/irq.c b/arch/mips/gt64120/wrppmc/irq.c<br/>new file mode 100644<br/>index 000000000000..8d75a43ce877<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/wrppmc/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/wrppmc/irq.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/*</div><div class='add'>+ * irq.c: GT64120 Interrupt Controller</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006, Wind River System Inc.</div><div class='add'>+ * Author: Rongkai.Zhan, &lt;rongkai.zhan@windriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel_stat.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/irq_cpu.h&gt;</div><div class='add'>+#include &lt;asm/gt64120.h&gt;</div><div class='add'>+</div><div class='add'>+asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int pending = read_c0_status() &amp; read_c0_cause();</div><div class='add'>+</div><div class='add'>+	if (pending &amp; STATUSF_IP7)</div><div class='add'>+		do_IRQ(WRPPMC_MIPS_TIMER_IRQ, regs);	/* CPU Compare/Count internal timer */</div><div class='add'>+	else if (pending &amp; STATUSF_IP6)</div><div class='add'>+		do_IRQ(WRPPMC_UART16550_IRQ, regs);	/* UART 16550 port */</div><div class='add'>+	else if (pending &amp; STATUSF_IP3)</div><div class='add'>+		do_IRQ(WRPPMC_PCI_INTA_IRQ, regs);	/* PCI INT_A */</div><div class='add'>+	else</div><div class='add'>+		spurious_interrupt(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Initialize GT64120 Interrupt Controller</div><div class='add'>+ */</div><div class='add'>+void gt64120_init_pic(void)</div><div class='add'>+{</div><div class='add'>+	/* clear CPU Interrupt Cause Registers */</div><div class='add'>+	GT_WRITE(GT_INTRCAUSE_OFS, (0x1F &lt;&lt; 21));</div><div class='add'>+	GT_WRITE(GT_HINTRCAUSE_OFS, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts from GT64120 bridge chip */</div><div class='add'>+	GT_WRITE(GT_INTRMASK_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_HINTRMASK_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_PCI0_ICMASK_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_PCI0_HICMASK_OFS, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init arch_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	/* IRQ 0 - 7 are for MIPS common irq_cpu controller */</div><div class='add'>+	mips_cpu_irq_init(0);</div><div class='add'>+</div><div class='add'>+	gt64120_init_pic();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/gt64120/wrppmc/pci.c b/arch/mips/gt64120/wrppmc/pci.c<br/>new file mode 100644<br/>index 000000000000..2fbe93467f78<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/wrppmc/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/wrppmc/pci.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * pci.c: GT64120 PCI support.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006, Wind River System Inc. Rongkai.Zhan &lt;rongkai.zhan@windriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;asm/gt64120.h&gt;</div><div class='add'>+</div><div class='add'>+extern struct pci_ops gt64120_pci_ops;</div><div class='add'>+</div><div class='add'>+static struct resource pci0_io_resource = {</div><div class='add'>+	.name  = "pci_0 io",</div><div class='add'>+	.start = GT_PCI_IO_BASE,</div><div class='add'>+	.end   = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1,</div><div class='add'>+	.flags = IORESOURCE_IO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pci0_mem_resource = {</div><div class='add'>+	.name  = "pci_0 memory",</div><div class='add'>+	.start = GT_PCI_MEM_BASE,</div><div class='add'>+	.end   = GT_PCI_MEM_BASE + GT_PCI_MEM_SIZE - 1,</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_controller hose_0 = {</div><div class='add'>+	.pci_ops	= &amp;gt64120_pci_ops,</div><div class='add'>+	.io_resource	= &amp;pci0_io_resource,</div><div class='add'>+	.mem_resource	= &amp;pci0_mem_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init gt64120_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = GT_READ(GT_PCI0_CMD_OFS);		/* Huh??? -- Ralf  */</div><div class='add'>+	tmp = GT_READ(GT_PCI0_BARE_OFS);</div><div class='add'>+</div><div class='add'>+	/* reset the whole PCI I/O space range */</div><div class='add'>+	ioport_resource.start = GT_PCI_IO_BASE;</div><div class='add'>+	ioport_resource.end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;</div><div class='add'>+</div><div class='add'>+	register_pci_controller(&amp;hose_0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(gt64120_pci_init);</div><div class='head'>diff --git a/arch/mips/gt64120/wrppmc/reset.c b/arch/mips/gt64120/wrppmc/reset.c<br/>new file mode 100644<br/>index 000000000000..b97039c6d3db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/wrppmc/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/wrppmc/reset.c</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1997 Ralf Baechle</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+void wrppmc_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Ouch, we're still alive ... This time we take the silver bullet ...</div><div class='add'>+	 * ... and find that we leave the hardware in a state in which the</div><div class='add'>+	 * kernel in the flush locks up somewhen during of after the PCI</div><div class='add'>+	 * detection stuff.</div><div class='add'>+	 */</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	set_c0_status(ST0_BEV | ST0_ERL);</div><div class='add'>+	change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);</div><div class='add'>+	flush_cache_all();</div><div class='add'>+	write_c0_wired(0);</div><div class='add'>+	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wrppmc_machine_halt(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	printk(KERN_NOTICE "You can safely turn off the power\n");</div><div class='add'>+	while (1) {</div><div class='add'>+		__asm__(</div><div class='add'>+			".set\tmips3\n\t"</div><div class='add'>+			"wait\n\t"</div><div class='add'>+			".set\tmips0"</div><div class='add'>+		);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void wrppmc_machine_power_off(void)</div><div class='add'>+{</div><div class='add'>+	wrppmc_machine_halt();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c<br/>new file mode 100644<br/>index 000000000000..429afc400cb4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/wrppmc/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/wrppmc/setup.c</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/*</div><div class='add'>+ * setup.c: Setup pointers to hardware dependent routines.</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1996, 1997, 2004 by Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copyright (C) 2006, Wind River System Inc. Rongkai.zhan &lt;rongkai.zhan@windriver.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/gt64120.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned long gt64120_base = KSEG1ADDR(0x14000000);</div><div class='add'>+</div><div class='add'>+#ifdef WRPPMC_EARLY_DEBUG</div><div class='add'>+</div><div class='add'>+static volatile unsigned char * wrppmc_led = \</div><div class='add'>+	(volatile unsigned char *)KSEG1ADDR(WRPPMC_LED_BASE);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PPMC LED control register:</div><div class='add'>+ * -) bit[0] controls DS1 LED (1 - OFF, 0 - ON)</div><div class='add'>+ * -) bit[1] controls DS2 LED (1 - OFF, 0 - ON)</div><div class='add'>+ * -) bit[2] controls DS4 LED (1 - OFF, 0 - ON)</div><div class='add'>+ */</div><div class='add'>+void wrppmc_led_on(int mask)</div><div class='add'>+{</div><div class='add'>+	unsigned char value = *wrppmc_led;</div><div class='add'>+</div><div class='add'>+	value &amp;= (0xF8 | mask);</div><div class='add'>+	*wrppmc_led = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If mask = 0, turn off all LEDs */</div><div class='add'>+void wrppmc_led_off(int mask)</div><div class='add'>+{</div><div class='add'>+	unsigned char value = *wrppmc_led;</div><div class='add'>+</div><div class='add'>+	value |= (0x7 &amp; mask);</div><div class='add'>+	*wrppmc_led = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We assume that bootloader has initialized UART16550 correctly</div><div class='add'>+ */</div><div class='add'>+void __init wrppmc_early_putc(char ch)</div><div class='add'>+{</div><div class='add'>+	static volatile unsigned char *wrppmc_uart = \</div><div class='add'>+		(volatile unsigned char *)KSEG1ADDR(WRPPMC_UART16550_BASE);</div><div class='add'>+	unsigned char value;</div><div class='add'>+</div><div class='add'>+	/* Wait until Transmit-Holding-Register is empty */</div><div class='add'>+	while (1) {</div><div class='add'>+		value = *(wrppmc_uart + 5);</div><div class='add'>+		if (value &amp; 0x20)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*wrppmc_uart = ch;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init wrppmc_early_printk(const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	static char pbuf[256] = {'\0', };</div><div class='add'>+	char *ch = pbuf;</div><div class='add'>+	va_list args;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	memset(pbuf, 0, 256);</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	i = vsprintf(pbuf, fmt, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+</div><div class='add'>+	/* Print the string */</div><div class='add'>+	while (*ch != '\0') {</div><div class='add'>+		wrppmc_early_putc(*ch);</div><div class='add'>+		/* if print '\n', also print '\r' */</div><div class='add'>+		if (*ch++ == '\n')</div><div class='add'>+			wrppmc_early_putc('\r');</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* WRPPMC_EARLY_DEBUG */</div><div class='add'>+</div><div class='add'>+unsigned long __init prom_free_prom_memory(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SERIAL_8250</div><div class='add'>+static void wrppmc_setup_serial(void)</div><div class='add'>+{</div><div class='add'>+	struct uart_port up;</div><div class='add'>+</div><div class='add'>+	memset(&amp;up, 0x00, sizeof(struct uart_port));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A note about mapbase/membase</div><div class='add'>+	 * -) mapbase is the physical address of the IO port.</div><div class='add'>+	 * -) membase is an 'ioremapped' cookie.</div><div class='add'>+	 */</div><div class='add'>+	up.line = 0;</div><div class='add'>+	up.type = PORT_16550;</div><div class='add'>+	up.iotype = UPIO_MEM;</div><div class='add'>+	up.mapbase = WRPPMC_UART16550_BASE;</div><div class='add'>+	up.membase = ioremap(up.mapbase, 8);</div><div class='add'>+	up.irq = WRPPMC_UART16550_IRQ;</div><div class='add'>+	up.uartclk = WRPPMC_UART16550_CLOCK;</div><div class='add'>+	up.flags = UPF_SKIP_TEST/* | UPF_BOOT_AUTOCONF */;</div><div class='add'>+	up.regshift = 0;</div><div class='add'>+</div><div class='add'>+	early_serial_setup(&amp;up);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='add'>+{</div><div class='add'>+	extern void wrppmc_time_init(void);</div><div class='add'>+	extern void wrppmc_machine_restart(char *command);</div><div class='add'>+	extern void wrppmc_machine_halt(void);</div><div class='add'>+	extern void wrppmc_machine_power_off(void);</div><div class='add'>+</div><div class='add'>+	_machine_restart = wrppmc_machine_restart;</div><div class='add'>+	_machine_halt	 = wrppmc_machine_halt;</div><div class='add'>+	pm_power_off	 = wrppmc_machine_power_off;</div><div class='add'>+</div><div class='add'>+	/* Use MIPS Count/Compare Timer */</div><div class='add'>+	board_time_init   = wrppmc_time_init;</div><div class='add'>+</div><div class='add'>+	/* This makes the operations of 'in/out[bwl]' to the</div><div class='add'>+	 * physical address ( &lt; KSEG0) can work via KSEG1</div><div class='add'>+	 */</div><div class='add'>+	set_io_port_base(KSEG1);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SERIAL_8250</div><div class='add'>+	wrppmc_setup_serial();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return "Wind River PPMC (GT64120)";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initializes basic routines and structures pointers, memory size (as</div><div class='add'>+ * given by the bios and saves the command line.</div><div class='add'>+ */</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	mips_machgroup = MACH_GROUP_GALILEO;</div><div class='add'>+	mips_machtype = MACH_EV64120A;</div><div class='add'>+</div><div class='add'>+	add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM);</div><div class='add'>+	add_memory_region(WRPPMC_BOOTROM_BASE, WRPPMC_BOOTROM_SIZE, BOOT_MEM_ROM_DATA);</div><div class='add'>+</div><div class='add'>+	wrppmc_early_printk("prom_init: GT64120 SDRAM Bank 0: 0x%x - 0x%08lx\n",</div><div class='add'>+			WRPPMC_SDRAM_SCS0_BASE, (WRPPMC_SDRAM_SCS0_BASE + WRPPMC_SDRAM_SCS0_SIZE));</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/gt64120/wrppmc/time.c b/arch/mips/gt64120/wrppmc/time.c<br/>new file mode 100644<br/>index 000000000000..5b440859bcee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/gt64120/wrppmc/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/gt64120/wrppmc/time.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ * time.c: MIPS CPU Count/Compare timer hookup</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark.Zhan, &lt;rongkai.zhan@windriver.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1996, 1997, 2004 by Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copyright (C) 2006, Wind River System Inc.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/param.h&gt;	/* for HZ */</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/gt64120.h&gt;</div><div class='add'>+</div><div class='add'>+#define WRPPMC_CPU_CLK_FREQ 40000000 /* 40MHZ */</div><div class='add'>+</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='add'>+{</div><div class='add'>+	/* Install ISR for timer interrupt */</div><div class='add'>+	setup_irq(WRPPMC_MIPS_TIMER_IRQ, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Estimate CPU frequency.  Sets mips_hpt_frequency as a side-effect</div><div class='add'>+ *</div><div class='add'>+ * NOTE: We disable all GT64120 timers, and use MIPS processor internal</div><div class='add'>+ * timer as the source of kernel clock tick.</div><div class='add'>+ */</div><div class='add'>+void __init wrppmc_time_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Disable GT64120 timers */</div><div class='add'>+	GT_WRITE(GT_TC_CONTROL_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_TC0_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_TC1_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_TC2_OFS, 0x00);</div><div class='add'>+	GT_WRITE(GT_TC3_OFS, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Use MIPS compare/count internal timer */</div><div class='add'>+	mips_hpt_frequency = WRPPMC_CPU_CLK_FREQ;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/ite-boards/generic/dbg_io.c b/arch/mips/ite-boards/generic/dbg_io.c<br/>index c4f8530fd07e..8e9cd8a9670a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/dbg_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ite-boards/generic/dbg_io.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +71,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='ctx'> </div><div class='del'>-	/* set up buad rate */</div><div class='add'>+	/* set up baud rate */</div><div class='ctx'> 	{</div><div class='ctx'> 		uint32 divisor;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ite-boards/generic/irq.c b/arch/mips/ite-boards/generic/irq.c<br/>index 77be7216bdd0..cb59ca4f76f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ite-boards/generic/irq.c</a></div><div class='hunk'>@@ -133,7 +133,7 @@ static void end_ite_irq(unsigned int irq)</div><div class='ctx'> 		enable_it8172_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type it8172_irq_type = {</div><div class='add'>+static struct irq_chip it8172_irq_type = {</div><div class='ctx'> 	.typename = "ITE8172",</div><div class='ctx'> 	.startup = startup_ite_irq,</div><div class='ctx'> 	.shutdown = shutdown_ite_irq,</div><div class='hunk'>@@ -153,7 +153,7 @@ static void ack_none(unsigned int irq) { }</div><div class='ctx'> #define shutdown_none	disable_none</div><div class='ctx'> #define end_none	enable_none</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type cp0_irq_type = {</div><div class='add'>+static struct irq_chip cp0_irq_type = {</div><div class='ctx'> 	.typename = "CP0 Count",</div><div class='ctx'> 	.startup = startup_none,</div><div class='ctx'> 	.shutdown = shutdown_none,</div><div class='hunk'>@@ -208,10 +208,10 @@ void __init arch_init_irq(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= IT8172_LAST_IRQ; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;it8172_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;it8172_irq_type;</div><div class='ctx'> 		spin_lock_init(&amp;irq_desc[i].lock);</div><div class='ctx'> 	}</div><div class='del'>-	irq_desc[MIPS_CPU_TIMER_IRQ].handler = &amp;cp0_irq_type;</div><div class='add'>+	irq_desc[MIPS_CPU_TIMER_IRQ].chip = &amp;cp0_irq_type;</div><div class='ctx'> 	set_c0_status(ALLINTS_NOTIMER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ite-boards/generic/it8172_cir.c b/arch/mips/ite-boards/generic/it8172_cir.c<br/>index 19deb153d005..bfc25adcfec6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/it8172_cir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/it8172_cir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/it8172_cir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ite-boards/generic/it8172_cir.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IT8172_CIR</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c<br/>index fc73c8d69df7..07faf3cacff2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/it8172_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/it8172_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/it8172_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ite-boards/generic/it8172_setup.c</a></div><div class='hunk'>@@ -26,10 +26,10 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='hunk'>@@ -59,10 +59,7 @@ extern void it8172_restart(char *command);</div><div class='ctx'> extern void it8172_halt(void);</div><div class='ctx'> extern void it8172_power_off(void);</div><div class='ctx'> </div><div class='del'>-extern void (*board_time_init)(void);</div><div class='del'>-extern void (*board_timer_setup)(struct irqaction *irq);</div><div class='ctx'> extern void it8172_time_init(void);</div><div class='del'>-extern void it8172_timer_setup(struct irqaction *irq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IT8172_REVC</div><div class='ctx'> struct {</div><div class='hunk'>@@ -72,11 +69,29 @@ struct {</div><div class='ctx'>     struct resource flash;</div><div class='ctx'>     struct resource boot;</div><div class='ctx'> } it8172_resources = {</div><div class='del'>-    { "RAM",           0,          0,          IORESOURCE_MEM }, /* to be initted */</div><div class='del'>-    { "PCI Mem",       0x10000000, 0x13FFFFFF, IORESOURCE_MEM },</div><div class='del'>-    { "PCI I/O",       0x14000000, 0x17FFFFFF                 },</div><div class='del'>-    { "Flash",         0x08000000, 0x0CFFFFFF                 },</div><div class='del'>-    { "Boot ROM",      0x1FC00000, 0x1FFFFFFF                 }</div><div class='add'>+	{</div><div class='add'>+		.start	= 0,				/* to be initted */</div><div class='add'>+		.end	= 0,</div><div class='add'>+		.name	= "RAM",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x10000000,</div><div class='add'>+		.end	= 0x13FFFFFF,</div><div class='add'>+		.name	= "PCI Mem",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x14000000,</div><div class='add'>+		.end	= 0x17FFFFFF</div><div class='add'>+		.name	= "PCI I/O",</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x08000000,</div><div class='add'>+		.end	= 0x0CFFFFFF</div><div class='add'>+		.name	= "Flash",</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1FC00000,</div><div class='add'>+		.end	= 0x1FFFFFFF</div><div class='add'>+		.name	= "Boot ROM",</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='ctx'> struct {</div><div class='hunk'>@@ -89,14 +104,44 @@ struct {</div><div class='ctx'>     struct resource flash;</div><div class='ctx'>     struct resource boot;</div><div class='ctx'> } it8172_resources = {</div><div class='del'>-    { "RAM",           0,          0,          IORESOURCE_MEM }, /* to be initted */</div><div class='del'>-    { "PCI Mem0",      0x0C000000, 0x0FFFFFFF, IORESOURCE_MEM },</div><div class='del'>-    { "PCI Mem1",      0x10000000, 0x13FFFFFF, IORESOURCE_MEM },</div><div class='del'>-    { "PCI I/O",       0x14000000, 0x17FFFFFF                 },</div><div class='del'>-    { "PCI Mem2",      0x1A000000, 0x1BFFFFFF, IORESOURCE_MEM },</div><div class='del'>-    { "PCI Mem3",      0x1C000000, 0x1FBFFFFF, IORESOURCE_MEM },</div><div class='del'>-    { "Flash",         0x08000000, 0x0CFFFFFF                 },</div><div class='del'>-    { "Boot ROM",      0x1FC00000, 0x1FFFFFFF                 }</div><div class='add'>+	{</div><div class='add'>+		.start	= 0,				/* to be initted */</div><div class='add'>+		.end	= 0,</div><div class='add'>+		.name	= "RAM",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x0C000000,</div><div class='add'>+		.end	= 0x0FFFFFFF,</div><div class='add'>+		.name	= "PCI Mem0",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	 }, {</div><div class='add'>+		.start	= 0x10000000,</div><div class='add'>+		.end	= 0x13FFFFFF,</div><div class='add'>+		.name	= "PCI Mem1",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	 }, {</div><div class='add'>+		.start	= 0x14000000,</div><div class='add'>+		.end	= 0x17FFFFFF</div><div class='add'>+		.name	= "PCI I/O",</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1A000000,</div><div class='add'>+		.end	= 0x1BFFFFFF,</div><div class='add'>+		.name	= "PCI Mem2",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1C000000,</div><div class='add'>+		.end	= 0x1FBFFFFF,</div><div class='add'>+		.name	= "PCI Mem3",</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x08000000,</div><div class='add'>+		.end	= 0x0CFFFFFF</div><div class='add'>+		.name	= "Flash",</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1FC00000,</div><div class='add'>+		.end	= 0x1FFFFFFF</div><div class='add'>+		.name	= "Boot ROM",</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +151,7 @@ void __init it8172_init_ram_resource(unsigned long memsize)</div><div class='ctx'> 	it8172_resources.ram.end = memsize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short dsr;</div><div class='ctx'> 	char *argptr;</div><div class='hunk'>@@ -122,7 +167,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	clear_c0_status(ST0_FR);</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = it8172_time_init;</div><div class='del'>-	board_timer_setup = it8172_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = it8172_restart;</div><div class='ctx'> 	_machine_halt = it8172_halt;</div><div class='head'>diff --git a/arch/mips/ite-boards/generic/pmon_prom.c b/arch/mips/ite-boards/generic/pmon_prom.c<br/>index 6e505af0cc08..7d0a79be34d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/pmon_prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/pmon_prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/pmon_prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ite-boards/generic/pmon_prom.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/mips/ite-boards/generic/time.c b/arch/mips/ite-boards/generic/time.c<br/>index dee497a91807..3dc55569ff7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/ite-boards/generic/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/ite-boards/generic/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/ite-boards/generic/time.c</a></div><div class='hunk'>@@ -233,7 +233,8 @@ void __init it8172_time_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)</div><div class='del'>-void __init it8172_timer_setup(struct irqaction *irq)</div><div class='add'>+</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	puts("timer_setup\n");</div><div class='ctx'> 	put32(NR_IRQS);</div><div class='head'>diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c<br/>index becc9accd495..eef05093deb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jazz/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jazz/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jazz/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/jazz/irq.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static void end_r4030_irq(unsigned int irq)</div><div class='ctx'> 		enable_r4030_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type r4030_irq_type = {</div><div class='add'>+static struct irq_chip r4030_irq_type = {</div><div class='ctx'> 	.typename = "R4030",</div><div class='ctx'> 	.startup = startup_r4030_irq,</div><div class='ctx'> 	.shutdown = shutdown_r4030_irq,</div><div class='hunk'>@@ -73,7 +73,7 @@ void __init init_r4030_ints(void)</div><div class='ctx'> 		irq_desc[i].status     = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action     = 0;</div><div class='ctx'> 		irq_desc[i].depth      = 1;</div><div class='del'>-		irq_desc[i].handler    = &amp;r4030_irq_type;</div><div class='add'>+		irq_desc[i].chip    = &amp;r4030_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);</div><div class='head'>diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c<br/>index 4036dc434551..487a9ea1ef00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jazz/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jazz/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jazz/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/jazz/setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/eisa.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -38,7 +37,7 @@ extern void jazz_machine_restart(char *command);</div><div class='ctx'> extern void jazz_machine_halt(void);</div><div class='ctx'> extern void jazz_machine_power_off(void);</div><div class='ctx'> </div><div class='del'>-static void __init jazz_time_init(struct irqaction *irq)</div><div class='add'>+void __init plat_time_init(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* set the clock to 100 Hz */</div><div class='ctx'> 	r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);</div><div class='hunk'>@@ -52,7 +51,7 @@ static struct resource jazz_io_resources[] = {</div><div class='ctx'> 	{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +75,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(jazz_io_resources); i++)</div><div class='ctx'> 		request_resource(&amp;ioport_resource, jazz_io_resources + i);</div><div class='ctx'> </div><div class='del'>-        board_timer_setup = jazz_time_init;</div><div class='ctx'> 	/* The RTC is outside the port address space */</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = jazz_machine_restart;</div><div class='head'>diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c<br/>index a0674d73962f..a55cb4572ded 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jmr3927/rbhma3100/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jmr3927/rbhma3100/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jmr3927/rbhma3100/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/jmr3927/rbhma3100/init.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c<br/>index 11304d1354f4..722174481467 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jmr3927/rbhma3100/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jmr3927/rbhma3100/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jmr3927/rbhma3100/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/jmr3927/rbhma3100/irq.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -417,7 +416,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	set_c0_status(ST0_IM);	/* IE bit is still 0. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller jmr3927_irq_controller = {</div><div class='add'>+static struct irq_chip jmr3927_irq_controller = {</div><div class='ctx'> 	.typename = "jmr3927_irq",</div><div class='ctx'> 	.startup = jmr3927_irq_startup,</div><div class='ctx'> 	.shutdown = jmr3927_irq_shutdown,</div><div class='hunk'>@@ -435,7 +434,7 @@ void jmr3927_irq_init(u32 irq_base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;jmr3927_irq_controller;</div><div class='add'>+		irq_desc[i].chip = &amp;jmr3927_irq_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	jmr3927_irq_base = irq_base;</div><div class='head'>diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c<br/>index 9359cc413494..025434054ed0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/jmr3927/rbhma3100/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/jmr3927/rbhma3100/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/jmr3927/rbhma3100/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/jmr3927/rbhma3100/setup.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  ***********************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='hunk'>@@ -41,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;	/* for HZ */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -82,17 +82,54 @@ struct {</div><div class='ctx'>     struct resource sio0;</div><div class='ctx'>     struct resource sio1;</div><div class='ctx'> } jmr3927_resources = {</div><div class='del'>-    { "RAM0",           0,         0x01FFFFFF,  IORESOURCE_MEM },</div><div class='del'>-    { "RAM1",          0x02000000, 0x03FFFFFF,  IORESOURCE_MEM },</div><div class='del'>-    { "PCIMEM",        0x08000000, 0x07FFFFFF,  IORESOURCE_MEM },</div><div class='del'>-    { "IOB",           0x10000000, 0x13FFFFFF                  },</div><div class='del'>-    { "IOC",           0x14000000, 0x14FFFFFF                  },</div><div class='del'>-    { "PCIIO",         0x15000000, 0x15FFFFFF                  },</div><div class='del'>-    { "JMY1394",       0x1D000000, 0x1D3FFFFF                  },</div><div class='del'>-    { "ROM1",          0x1E000000, 0x1E3FFFFF                  },</div><div class='del'>-    { "ROM0",          0x1FC00000, 0x1FFFFFFF                  },</div><div class='del'>-    { "SIO0",          0xFFFEF300, 0xFFFEF3FF                  },</div><div class='del'>-    { "SIO1",          0xFFFEF400, 0xFFFEF4FF                  },</div><div class='add'>+	{</div><div class='add'>+		.start	= 0,</div><div class='add'>+		.end	= 0x01FFFFFF,</div><div class='add'>+		.name	= "RAM0",</div><div class='add'>+		.flags = IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x02000000,</div><div class='add'>+		.end	= 0x03FFFFFF,</div><div class='add'>+		.name	= "RAM1",</div><div class='add'>+		.flags = IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x08000000,</div><div class='add'>+		.end	= 0x07FFFFFF,</div><div class='add'>+		.name	= "PCIMEM",</div><div class='add'>+		.flags = IORESOURCE_MEM</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x10000000,</div><div class='add'>+		.end	= 0x13FFFFFF,</div><div class='add'>+		.name	= "IOB"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x14000000,</div><div class='add'>+		.end	= 0x14FFFFFF,</div><div class='add'>+		.name	= "IOC"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x15000000,</div><div class='add'>+		.end	= 0x15FFFFFF,</div><div class='add'>+		.name	= "PCIIO"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1D000000,</div><div class='add'>+		.end	= 0x1D3FFFFF,</div><div class='add'>+		.name	= "JMY1394"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1E000000,</div><div class='add'>+		.end	= 0x1E3FFFFF,</div><div class='add'>+		.name	= "ROM1"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1FC00000,</div><div class='add'>+		.end	= 0x1FFFFFFF,</div><div class='add'>+		.name	= "ROM0"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0xFFFEF300,</div><div class='add'>+		.end	= 0xFFFEF3FF,</div><div class='add'>+		.name	= "SIO0"</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0xFFFEF400,</div><div class='add'>+		.end	= 0xFFFEF4FF,</div><div class='add'>+		.name	= "SIO1"</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* don't enable - see errata */</div><div class='hunk'>@@ -147,9 +184,8 @@ static void __init jmr3927_time_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long jmr3927_do_gettimeoffset(void);</div><div class='del'>-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);</div><div class='ctx'> </div><div class='del'>-static void __init jmr3927_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	do_gettimeoffset = jmr3927_do_gettimeoffset;</div><div class='ctx'> </div><div class='hunk'>@@ -201,14 +237,13 @@ static void jmr3927_board_init(void);</div><div class='ctx'> extern struct resource pci_io_resource;</div><div class='ctx'> extern struct resource pci_mem_resource;</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	char *argptr;</div><div class='ctx'> </div><div class='ctx'> 	set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = jmr3927_time_init;</div><div class='del'>-	board_timer_setup = jmr3927_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = jmr3927_machine_restart;</div><div class='ctx'> 	_machine_halt = jmr3927_machine_halt;</div><div class='head'>diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile<br/>index 34e8a256765c..881c467c6982 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/Makefile</a></div><div class='hunk'>@@ -13,6 +13,8 @@ binfmt_irix-objs	:= irixelf.o irixinv.o irixioctl.o irixsig.o	\</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_APM)		+= apm.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_CPU_R3000)		+= r2300_fpu.o r2300_switch.o</div><div class='ctx'> obj-$(CONFIG_CPU_TX39XX)	+= r2300_fpu.o r2300_switch.o</div><div class='ctx'> obj-$(CONFIG_CPU_TX49XX)	+= r4k_fpu.o r4k_switch.o</div><div class='head'>diff --git a/arch/mips/kernel/apm.c b/arch/mips/kernel/apm.c<br/>new file mode 100644<br/>index 000000000000..528e731049c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/apm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/apm.c</a></div><div class='hunk'>@@ -0,0 +1,604 @@</div><div class='add'>+/*</div><div class='add'>+ * bios-less APM driver for MIPS Linux</div><div class='add'>+ *  Jamey Hicks &lt;jamey@crl.dec.com&gt;</div><div class='add'>+ *  adapted from the APM BIOS driver for Linux by Stephen Rothwell (sfr@linuxcare.com)</div><div class='add'>+ *</div><div class='add'>+ * APM 1.2 Reference:</div><div class='add'>+ *   Intel Corporation, Microsoft Corporation. Advanced Power Management</div><div class='add'>+ *   (APM) BIOS Interface Specification, Revision 1.2, February 1996.</div><div class='add'>+ *</div><div class='add'>+ * [This document is available from Microsoft at:</div><div class='add'>+ *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/apm_bios.h&gt;</div><div class='add'>+#include &lt;linux/capability.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/apm.h&gt; /* apm_power_info */</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The apm_bios device is one of the misc char devices.</div><div class='add'>+ * This is its minor number.</div><div class='add'>+ */</div><div class='add'>+#define APM_MINOR_DEV	134</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See Documentation/Config.help for the configuration options.</div><div class='add'>+ *</div><div class='add'>+ * Various options can be changed at boot time as follows:</div><div class='add'>+ * (We allow underscores for compatibility with the modules code)</div><div class='add'>+ *	apm=on/off			enable/disable APM</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Maximum number of events stored</div><div class='add'>+ */</div><div class='add'>+#define APM_MAX_EVENTS		16</div><div class='add'>+</div><div class='add'>+struct apm_queue {</div><div class='add'>+	unsigned int		event_head;</div><div class='add'>+	unsigned int		event_tail;</div><div class='add'>+	apm_event_t		events[APM_MAX_EVENTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The per-file APM data</div><div class='add'>+ */</div><div class='add'>+struct apm_user {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+</div><div class='add'>+	unsigned int		suser: 1;</div><div class='add'>+	unsigned int		writer: 1;</div><div class='add'>+	unsigned int		reader: 1;</div><div class='add'>+</div><div class='add'>+	int			suspend_result;</div><div class='add'>+	unsigned int		suspend_state;</div><div class='add'>+#define SUSPEND_NONE	0		/* no suspend pending */</div><div class='add'>+#define SUSPEND_PENDING	1		/* suspend pending read */</div><div class='add'>+#define SUSPEND_READ	2		/* suspend read, pending ack */</div><div class='add'>+#define SUSPEND_ACKED	3		/* suspend acked */</div><div class='add'>+#define SUSPEND_DONE	4		/* suspend completed */</div><div class='add'>+</div><div class='add'>+	struct apm_queue	queue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Local variables</div><div class='add'>+ */</div><div class='add'>+static int suspends_pending;</div><div class='add'>+static int apm_disabled;</div><div class='add'>+static int mips_apm_active;</div><div class='add'>+</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is a list of everyone who has opened /dev/apm_bios</div><div class='add'>+ */</div><div class='add'>+static DECLARE_RWSEM(user_list_lock);</div><div class='add'>+static LIST_HEAD(apm_user_list);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kapmd info.  kapmd provides us a process context to handle</div><div class='add'>+ * "APM" events within - specifically necessary if we're going</div><div class='add'>+ * to be suspending the system.</div><div class='add'>+ */</div><div class='add'>+static DECLARE_WAIT_QUEUE_HEAD(kapmd_wait);</div><div class='add'>+static DECLARE_COMPLETION(kapmd_exit);</div><div class='add'>+static DEFINE_SPINLOCK(kapmd_queue_lock);</div><div class='add'>+static struct apm_queue kapmd_queue;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char driver_version[] = "1.13";	/* no spaces */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compatibility cruft until the IPAQ people move over to the new</div><div class='add'>+ * interface.</div><div class='add'>+ */</div><div class='add'>+static void __apm_get_power_status(struct apm_power_info *info)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This allows machines to provide their own "apm get power status" function.</div><div class='add'>+ */</div><div class='add'>+void (*apm_get_power_status)(struct apm_power_info *) = __apm_get_power_status;</div><div class='add'>+EXPORT_SYMBOL(apm_get_power_status);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * APM event queue management.</div><div class='add'>+ */</div><div class='add'>+static inline int queue_empty(struct apm_queue *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;event_head == q-&gt;event_tail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline apm_event_t queue_get_event(struct apm_queue *q)</div><div class='add'>+{</div><div class='add'>+	q-&gt;event_tail = (q-&gt;event_tail + 1) % APM_MAX_EVENTS;</div><div class='add'>+	return q-&gt;events[q-&gt;event_tail];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_add_event(struct apm_queue *q, apm_event_t event)</div><div class='add'>+{</div><div class='add'>+	q-&gt;event_head = (q-&gt;event_head + 1) % APM_MAX_EVENTS;</div><div class='add'>+	if (q-&gt;event_head == q-&gt;event_tail) {</div><div class='add'>+		static int notified;</div><div class='add'>+</div><div class='add'>+		if (notified++ == 0)</div><div class='add'>+		    printk(KERN_ERR "apm: an event queue overflowed\n");</div><div class='add'>+		q-&gt;event_tail = (q-&gt;event_tail + 1) % APM_MAX_EVENTS;</div><div class='add'>+	}</div><div class='add'>+	q-&gt;events[q-&gt;event_head] = event;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_event_one_user(struct apm_user *as, apm_event_t event)</div><div class='add'>+{</div><div class='add'>+	if (as-&gt;suser &amp;&amp; as-&gt;writer) {</div><div class='add'>+		switch (event) {</div><div class='add'>+		case APM_SYS_SUSPEND:</div><div class='add'>+		case APM_USER_SUSPEND:</div><div class='add'>+			/*</div><div class='add'>+			 * If this user already has a suspend pending,</div><div class='add'>+			 * don't queue another one.</div><div class='add'>+			 */</div><div class='add'>+			if (as-&gt;suspend_state != SUSPEND_NONE)</div><div class='add'>+				return;</div><div class='add'>+</div><div class='add'>+			as-&gt;suspend_state = SUSPEND_PENDING;</div><div class='add'>+			suspends_pending++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	queue_add_event(&amp;as-&gt;queue, event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_event(apm_event_t event, struct apm_user *sender)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;user_list_lock);</div><div class='add'>+	list_for_each_entry(as, &amp;apm_user_list, list) {</div><div class='add'>+		if (as != sender &amp;&amp; as-&gt;reader)</div><div class='add'>+			queue_event_one_user(as, event);</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;user_list_lock);</div><div class='add'>+	wake_up_interruptible(&amp;apm_waitqueue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void apm_suspend(void)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as;</div><div class='add'>+	int err = pm_suspend(PM_SUSPEND_MEM);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Anyone on the APM queues will think we're still suspended.</div><div class='add'>+	 * Send a message so everyone knows we're now awake again.</div><div class='add'>+	 */</div><div class='add'>+	queue_event(APM_NORMAL_RESUME, NULL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Finally, wake up anyone who is sleeping on the suspend.</div><div class='add'>+	 */</div><div class='add'>+	down_read(&amp;user_list_lock);</div><div class='add'>+	list_for_each_entry(as, &amp;apm_user_list, list) {</div><div class='add'>+		as-&gt;suspend_result = err;</div><div class='add'>+		as-&gt;suspend_state = SUSPEND_DONE;</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;user_list_lock);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;apm_suspend_waitqueue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t apm_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as = fp-&gt;private_data;</div><div class='add'>+	apm_event_t event;</div><div class='add'>+	int i = count, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (count &lt; sizeof(apm_event_t))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (queue_empty(&amp;as-&gt;queue) &amp;&amp; fp-&gt;f_flags &amp; O_NONBLOCK)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	wait_event_interruptible(apm_waitqueue, !queue_empty(&amp;as-&gt;queue));</div><div class='add'>+</div><div class='add'>+	while ((i &gt;= sizeof(event)) &amp;&amp; !queue_empty(&amp;as-&gt;queue)) {</div><div class='add'>+		event = queue_get_event(&amp;as-&gt;queue);</div><div class='add'>+</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		if (copy_to_user(buf, &amp;event, sizeof(event)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (event == APM_SYS_SUSPEND || event == APM_USER_SUSPEND)</div><div class='add'>+			as-&gt;suspend_state = SUSPEND_READ;</div><div class='add'>+</div><div class='add'>+		buf += sizeof(event);</div><div class='add'>+		i -= sizeof(event);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &lt; count)</div><div class='add'>+		ret = count - i;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int apm_poll(struct file *fp, poll_table * wait)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as = fp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(fp, &amp;apm_waitqueue, wait);</div><div class='add'>+	return queue_empty(&amp;as-&gt;queue) ? 0 : POLLIN | POLLRDNORM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * apm_ioctl - handle APM ioctl</div><div class='add'>+ *</div><div class='add'>+ * APM_IOC_SUSPEND</div><div class='add'>+ *   This IOCTL is overloaded, and performs two functions.  It is used to:</div><div class='add'>+ *     - initiate a suspend</div><div class='add'>+ *     - acknowledge a suspend read from /dev/apm_bios.</div><div class='add'>+ *   Only when everyone who has opened /dev/apm_bios with write permission</div><div class='add'>+ *   has acknowledge does the actual suspend happen.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+apm_ioctl(struct inode * inode, struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as = filp-&gt;private_data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!as-&gt;suser || !as-&gt;writer)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case APM_IOC_SUSPEND:</div><div class='add'>+		as-&gt;suspend_result = -EINTR;</div><div class='add'>+</div><div class='add'>+		if (as-&gt;suspend_state == SUSPEND_READ) {</div><div class='add'>+			/*</div><div class='add'>+			 * If we read a suspend command from /dev/apm_bios,</div><div class='add'>+			 * then the corresponding APM_IOC_SUSPEND ioctl is</div><div class='add'>+			 * interpreted as an acknowledge.</div><div class='add'>+			 */</div><div class='add'>+			as-&gt;suspend_state = SUSPEND_ACKED;</div><div class='add'>+			suspends_pending--;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * Otherwise it is a request to suspend the system.</div><div class='add'>+			 * Queue an event for all readers, and expect an</div><div class='add'>+			 * acknowledge from all writers who haven't already</div><div class='add'>+			 * acknowledged.</div><div class='add'>+			 */</div><div class='add'>+			queue_event(APM_USER_SUSPEND, as);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If there are no further acknowledges required, suspend</div><div class='add'>+		 * the system.</div><div class='add'>+		 */</div><div class='add'>+		if (suspends_pending == 0)</div><div class='add'>+			apm_suspend();</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Wait for the suspend/resume to complete.  If there are</div><div class='add'>+		 * pending acknowledges, we wait here for them.</div><div class='add'>+		 *</div><div class='add'>+		 * Note that we need to ensure that the PM subsystem does</div><div class='add'>+		 * not kick us out of the wait when it suspends the threads.</div><div class='add'>+		 */</div><div class='add'>+		flags = current-&gt;flags;</div><div class='add'>+		current-&gt;flags |= PF_NOFREEZE;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Note: do not allow a thread which is acking the suspend</div><div class='add'>+		 * to escape until the resume is complete.</div><div class='add'>+		 */</div><div class='add'>+		if (as-&gt;suspend_state == SUSPEND_ACKED)</div><div class='add'>+			wait_event(apm_suspend_waitqueue,</div><div class='add'>+					 as-&gt;suspend_state == SUSPEND_DONE);</div><div class='add'>+		else</div><div class='add'>+			wait_event_interruptible(apm_suspend_waitqueue,</div><div class='add'>+					 as-&gt;suspend_state == SUSPEND_DONE);</div><div class='add'>+</div><div class='add'>+		current-&gt;flags = flags;</div><div class='add'>+		err = as-&gt;suspend_result;</div><div class='add'>+		as-&gt;suspend_state = SUSPEND_NONE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apm_release(struct inode * inode, struct file * filp)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as = filp-&gt;private_data;</div><div class='add'>+	filp-&gt;private_data = NULL;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;user_list_lock);</div><div class='add'>+	list_del(&amp;as-&gt;list);</div><div class='add'>+	up_write(&amp;user_list_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are now unhooked from the chain.  As far as new</div><div class='add'>+	 * events are concerned, we no longer exist.  However, we</div><div class='add'>+	 * need to balance suspends_pending, which means the</div><div class='add'>+	 * possibility of sleeping.</div><div class='add'>+	 */</div><div class='add'>+	if (as-&gt;suspend_state != SUSPEND_NONE) {</div><div class='add'>+		suspends_pending -= 1;</div><div class='add'>+		if (suspends_pending == 0)</div><div class='add'>+			apm_suspend();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(as);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apm_open(struct inode * inode, struct file * filp)</div><div class='add'>+{</div><div class='add'>+	struct apm_user *as;</div><div class='add'>+</div><div class='add'>+	as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);</div><div class='add'>+	if (as) {</div><div class='add'>+		/*</div><div class='add'>+		 * XXX - this is a tiny bit broken, when we consider BSD</div><div class='add'>+		 * process accounting. If the device is opened by root, we</div><div class='add'>+		 * instantly flag that we used superuser privs. Who knows,</div><div class='add'>+		 * we might close the device immediately without doing a</div><div class='add'>+		 * privileged operation -- cevans</div><div class='add'>+		 */</div><div class='add'>+		as-&gt;suser = capable(CAP_SYS_ADMIN);</div><div class='add'>+		as-&gt;writer = (filp-&gt;f_mode &amp; FMODE_WRITE) == FMODE_WRITE;</div><div class='add'>+		as-&gt;reader = (filp-&gt;f_mode &amp; FMODE_READ) == FMODE_READ;</div><div class='add'>+</div><div class='add'>+		down_write(&amp;user_list_lock);</div><div class='add'>+		list_add(&amp;as-&gt;list, &amp;apm_user_list);</div><div class='add'>+		up_write(&amp;user_list_lock);</div><div class='add'>+</div><div class='add'>+		filp-&gt;private_data = as;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return as ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations apm_bios_fops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.read		= apm_read,</div><div class='add'>+	.poll		= apm_poll,</div><div class='add'>+	.ioctl		= apm_ioctl,</div><div class='add'>+	.open		= apm_open,</div><div class='add'>+	.release	= apm_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice apm_device = {</div><div class='add'>+	.minor		= APM_MINOR_DEV,</div><div class='add'>+	.name		= "apm_bios",</div><div class='add'>+	.fops		= &amp;apm_bios_fops</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+/*</div><div class='add'>+ * Arguments, with symbols from linux/apm_bios.h.</div><div class='add'>+ *</div><div class='add'>+ *   0) Linux driver version (this will change if format changes)</div><div class='add'>+ *   1) APM BIOS Version.  Usually 1.0, 1.1 or 1.2.</div><div class='add'>+ *   2) APM flags from APM Installation Check (0x00):</div><div class='add'>+ *	bit 0: APM_16_BIT_SUPPORT</div><div class='add'>+ *	bit 1: APM_32_BIT_SUPPORT</div><div class='add'>+ *	bit 2: APM_IDLE_SLOWS_CLOCK</div><div class='add'>+ *	bit 3: APM_BIOS_DISABLED</div><div class='add'>+ *	bit 4: APM_BIOS_DISENGAGED</div><div class='add'>+ *   3) AC line status</div><div class='add'>+ *	0x00: Off-line</div><div class='add'>+ *	0x01: On-line</div><div class='add'>+ *	0x02: On backup power (BIOS &gt;= 1.1 only)</div><div class='add'>+ *	0xff: Unknown</div><div class='add'>+ *   4) Battery status</div><div class='add'>+ *	0x00: High</div><div class='add'>+ *	0x01: Low</div><div class='add'>+ *	0x02: Critical</div><div class='add'>+ *	0x03: Charging</div><div class='add'>+ *	0x04: Selected battery not present (BIOS &gt;= 1.2 only)</div><div class='add'>+ *	0xff: Unknown</div><div class='add'>+ *   5) Battery flag</div><div class='add'>+ *	bit 0: High</div><div class='add'>+ *	bit 1: Low</div><div class='add'>+ *	bit 2: Critical</div><div class='add'>+ *	bit 3: Charging</div><div class='add'>+ *	bit 7: No system battery</div><div class='add'>+ *	0xff: Unknown</div><div class='add'>+ *   6) Remaining battery life (percentage of charge):</div><div class='add'>+ *	0-100: valid</div><div class='add'>+ *	-1: Unknown</div><div class='add'>+ *   7) Remaining battery life (time units):</div><div class='add'>+ *	Number of remaining minutes or seconds</div><div class='add'>+ *	-1: Unknown</div><div class='add'>+ *   8) min = minutes; sec = seconds</div><div class='add'>+ */</div><div class='add'>+static int apm_get_info(char *buf, char **start, off_t fpos, int length)</div><div class='add'>+{</div><div class='add'>+	struct apm_power_info info;</div><div class='add'>+	char *units;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	info.ac_line_status = 0xff;</div><div class='add'>+	info.battery_status = 0xff;</div><div class='add'>+	info.battery_flag   = 0xff;</div><div class='add'>+	info.battery_life   = -1;</div><div class='add'>+	info.time	    = -1;</div><div class='add'>+	info.units	    = -1;</div><div class='add'>+</div><div class='add'>+	if (apm_get_power_status)</div><div class='add'>+		apm_get_power_status(&amp;info);</div><div class='add'>+</div><div class='add'>+	switch (info.units) {</div><div class='add'>+	default:	units = "?";	break;</div><div class='add'>+	case 0: 	units = "min";	break;</div><div class='add'>+	case 1: 	units = "sec";	break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = sprintf(buf, "%s 1.2 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",</div><div class='add'>+		     driver_version, APM_32_BIT_SUPPORT,</div><div class='add'>+		     info.ac_line_status, info.battery_status,</div><div class='add'>+		     info.battery_flag, info.battery_life,</div><div class='add'>+		     info.time, units);</div><div class='add'>+</div><div class='add'>+ 	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int kapmd(void *arg)</div><div class='add'>+{</div><div class='add'>+	daemonize("kapmd");</div><div class='add'>+	current-&gt;flags |= PF_NOFREEZE;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		apm_event_t event;</div><div class='add'>+</div><div class='add'>+		wait_event_interruptible(kapmd_wait,</div><div class='add'>+				!queue_empty(&amp;kapmd_queue) || !mips_apm_active);</div><div class='add'>+</div><div class='add'>+		if (!mips_apm_active)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		spin_lock_irq(&amp;kapmd_queue_lock);</div><div class='add'>+		event = 0;</div><div class='add'>+		if (!queue_empty(&amp;kapmd_queue))</div><div class='add'>+			event = queue_get_event(&amp;kapmd_queue);</div><div class='add'>+		spin_unlock_irq(&amp;kapmd_queue_lock);</div><div class='add'>+</div><div class='add'>+		switch (event) {</div><div class='add'>+		case 0:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case APM_LOW_BATTERY:</div><div class='add'>+		case APM_POWER_STATUS_CHANGE:</div><div class='add'>+			queue_event(event, NULL);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case APM_USER_SUSPEND:</div><div class='add'>+		case APM_SYS_SUSPEND:</div><div class='add'>+			queue_event(event, NULL);</div><div class='add'>+			if (suspends_pending == 0)</div><div class='add'>+				apm_suspend();</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case APM_CRITICAL_SUSPEND:</div><div class='add'>+			apm_suspend();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	complete_and_exit(&amp;kapmd_exit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init apm_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (apm_disabled) {</div><div class='add'>+		printk(KERN_NOTICE "apm: disabled on user request.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mips_apm_active = 1;</div><div class='add'>+</div><div class='add'>+	ret = kernel_thread(kapmd, NULL, CLONE_KERNEL);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		mips_apm_active = 0;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+	create_proc_info_entry("apm", 0, NULL, apm_get_info);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ret = misc_register(&amp;apm_device);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		remove_proc_entry("apm", NULL);</div><div class='add'>+</div><div class='add'>+		mips_apm_active = 0;</div><div class='add'>+		wake_up(&amp;kapmd_wait);</div><div class='add'>+		wait_for_completion(&amp;kapmd_exit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit apm_exit(void)</div><div class='add'>+{</div><div class='add'>+	misc_deregister(&amp;apm_device);</div><div class='add'>+	remove_proc_entry("apm", NULL);</div><div class='add'>+</div><div class='add'>+	mips_apm_active = 0;</div><div class='add'>+	wake_up(&amp;kapmd_wait);</div><div class='add'>+	wait_for_completion(&amp;kapmd_exit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(apm_init);</div><div class='add'>+module_exit(apm_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Stephen Rothwell");</div><div class='add'>+MODULE_DESCRIPTION("Advanced Power Management");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#ifndef MODULE</div><div class='add'>+static int __init apm_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	while ((str != NULL) &amp;&amp; (*str != '\0')) {</div><div class='add'>+		if (strncmp(str, "off", 3) == 0)</div><div class='add'>+			apm_disabled = 1;</div><div class='add'>+		if (strncmp(str, "on", 2) == 0)</div><div class='add'>+			apm_disabled = 0;</div><div class='add'>+		str = strchr(str, ',');</div><div class='add'>+		if (str != NULL)</div><div class='add'>+			str += strspn(str, ", \t");</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("apm=", apm_setup);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * apm_queue_event - queue an APM event for kapmd</div><div class='add'>+ * @event: APM event</div><div class='add'>+ *</div><div class='add'>+ * Queue an APM event for kapmd to process and ultimately take the</div><div class='add'>+ * appropriate action.  Only a subset of events are handled:</div><div class='add'>+ *   %APM_LOW_BATTERY</div><div class='add'>+ *   %APM_POWER_STATUS_CHANGE</div><div class='add'>+ *   %APM_USER_SUSPEND</div><div class='add'>+ *   %APM_SYS_SUSPEND</div><div class='add'>+ *   %APM_CRITICAL_SUSPEND</div><div class='add'>+ */</div><div class='add'>+void apm_queue_event(apm_event_t event)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;kapmd_queue_lock, flags);</div><div class='add'>+	queue_add_event(&amp;kapmd_queue, event);</div><div class='add'>+	spin_unlock_irqrestore(&amp;kapmd_queue_lock, flags);</div><div class='add'>+</div><div class='add'>+	wake_up_interruptible(&amp;kapmd_wait);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(apm_queue_event);</div><div class='head'>diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c<br/>index 0facfaf4e950..ec28077d5ee2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Kevin Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com</div><div class='ctx'>  * Copyright (C) 2000 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -141,72 +140,72 @@ void output_thread_defines(void)</div><div class='ctx'> void output_thread_fpu_defines(void)</div><div class='ctx'> {</div><div class='ctx'> 	offset("#define THREAD_FPR0    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[0]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[0]);</div><div class='ctx'> 	offset("#define THREAD_FPR1    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[1]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[1]);</div><div class='ctx'> 	offset("#define THREAD_FPR2    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[2]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[2]);</div><div class='ctx'> 	offset("#define THREAD_FPR3    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[3]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[3]);</div><div class='ctx'> 	offset("#define THREAD_FPR4    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[4]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[4]);</div><div class='ctx'> 	offset("#define THREAD_FPR5    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[5]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[5]);</div><div class='ctx'> 	offset("#define THREAD_FPR6    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[6]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[6]);</div><div class='ctx'> 	offset("#define THREAD_FPR7    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[7]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[7]);</div><div class='ctx'> 	offset("#define THREAD_FPR8    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[8]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[8]);</div><div class='ctx'> 	offset("#define THREAD_FPR9    ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[9]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[9]);</div><div class='ctx'> 	offset("#define THREAD_FPR10   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[10]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[10]);</div><div class='ctx'> 	offset("#define THREAD_FPR11   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[11]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[11]);</div><div class='ctx'> 	offset("#define THREAD_FPR12   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[12]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[12]);</div><div class='ctx'> 	offset("#define THREAD_FPR13   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[13]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[13]);</div><div class='ctx'> 	offset("#define THREAD_FPR14   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[14]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[14]);</div><div class='ctx'> 	offset("#define THREAD_FPR15   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[15]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[15]);</div><div class='ctx'> 	offset("#define THREAD_FPR16   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[16]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[16]);</div><div class='ctx'> 	offset("#define THREAD_FPR17   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[17]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[17]);</div><div class='ctx'> 	offset("#define THREAD_FPR18   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[18]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[18]);</div><div class='ctx'> 	offset("#define THREAD_FPR19   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[19]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[19]);</div><div class='ctx'> 	offset("#define THREAD_FPR20   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[20]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[20]);</div><div class='ctx'> 	offset("#define THREAD_FPR21   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[21]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[21]);</div><div class='ctx'> 	offset("#define THREAD_FPR22   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[22]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[22]);</div><div class='ctx'> 	offset("#define THREAD_FPR23   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[23]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[23]);</div><div class='ctx'> 	offset("#define THREAD_FPR24   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[24]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[24]);</div><div class='ctx'> 	offset("#define THREAD_FPR25   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[25]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[25]);</div><div class='ctx'> 	offset("#define THREAD_FPR26   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[26]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[26]);</div><div class='ctx'> 	offset("#define THREAD_FPR27   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[27]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[27]);</div><div class='ctx'> 	offset("#define THREAD_FPR28   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[28]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[28]);</div><div class='ctx'> 	offset("#define THREAD_FPR29   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[29]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[29]);</div><div class='ctx'> 	offset("#define THREAD_FPR30   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[30]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[30]);</div><div class='ctx'> 	offset("#define THREAD_FPR31   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fpr[31]);</div><div class='add'>+	       struct task_struct, thread.fpu.fpr[31]);</div><div class='ctx'> </div><div class='ctx'> 	offset("#define THREAD_FCR31   ",</div><div class='del'>-	       struct task_struct, thread.fpu.hard.fcr31);</div><div class='add'>+	       struct task_struct, thread.fpu.fcr31);</div><div class='ctx'> 	linefeed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c<br/>index b6232d9033cb..76fd3f22c766 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/branch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/branch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/branch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/branch.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ int __compute_return_epc(struct pt_regs *regs)</div><div class='ctx'> 		if (is_fpu_owner())</div><div class='ctx'> 			asm volatile("cfc1\t%0,$31" : "=r" (fcr31));</div><div class='ctx'> 		else</div><div class='del'>-			fcr31 = current-&gt;thread.fpu.hard.fcr31;</div><div class='add'>+			fcr31 = current-&gt;thread.fpu.fcr31;</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 		bit = (insn.i_format.rt &gt;&gt; 2);</div><div class='head'>diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c<br/>index 47a087b6c11b..c09337b947b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-bugs64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/cpu-bugs64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-bugs64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/cpu-bugs64.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -206,7 +205,7 @@ static inline void check_daddi(void)</div><div class='ctx'> 		"daddi	%0, %1, %3\n\t"</div><div class='ctx'> 		".set	pop"</div><div class='ctx'> 		: "=r" (v), "=&amp;r" (tmp)</div><div class='del'>-		: "I" (0xffffffffffffdb9a), "I" (0x1234));</div><div class='add'>+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));</div><div class='ctx'> 	set_except_vector(12, handler);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -224,7 +223,7 @@ static inline void check_daddi(void)</div><div class='ctx'> 		"dsrl	%1, %1, 1\n\t"</div><div class='ctx'> 		"daddi	%0, %1, %3"</div><div class='ctx'> 		: "=r" (v), "=&amp;r" (tmp)</div><div class='del'>-		: "I" (0xffffffffffffdb9a), "I" (0x1234));</div><div class='add'>+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));</div><div class='ctx'> 	set_except_vector(12, handler);</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='hunk'>@@ -280,7 +279,7 @@ static inline void check_daddiu(void)</div><div class='ctx'> 		"daddu	%1, %2\n\t"</div><div class='ctx'> 		".set	pop"</div><div class='ctx'> 		: "=&amp;r" (v), "=&amp;r" (w), "=&amp;r" (tmp)</div><div class='del'>-		: "I" (0xffffffffffffdb9a), "I" (0x1234));</div><div class='add'>+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));</div><div class='ctx'> </div><div class='ctx'> 	if (v == w) {</div><div class='ctx'> 		printk("no.\n");</div><div class='hunk'>@@ -296,7 +295,7 @@ static inline void check_daddiu(void)</div><div class='ctx'> 		"addiu	%1, $0, %4\n\t"</div><div class='ctx'> 		"daddu	%1, %2"</div><div class='ctx'> 		: "=&amp;r" (v), "=&amp;r" (w), "=&amp;r" (tmp)</div><div class='del'>-		: "I" (0xffffffffffffdb9a), "I" (0x1234));</div><div class='add'>+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));</div><div class='ctx'> </div><div class='ctx'> 	if (v == w) {</div><div class='ctx'> 		printk("yes.\n");</div><div class='head'>diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c<br/>index bef3e2dc7c52..aa2caa67299a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/cpu-probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/cpu-probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/cpu-probe.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -460,7 +459,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c)</div><div class='ctx'> 	isa = (config0 &amp; MIPS_CONF_AT) &gt;&gt; 13;</div><div class='ctx'> 	switch (isa) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		switch ((config0 &gt;&gt; 10) &amp; 7) {</div><div class='add'>+		switch ((config0 &amp; MIPS_CONF_AR) &gt;&gt; 10) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			c-&gt;isa_level = MIPS_CPU_ISA_M32R1;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -472,7 +471,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		switch ((config0 &gt;&gt; 10) &amp; 7) {</div><div class='add'>+		switch ((config0 &amp; MIPS_CONF_AR) &gt;&gt; 10) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			c-&gt;isa_level = MIPS_CPU_ISA_M64R1;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -549,7 +548,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)</div><div class='ctx'> 	return config3 &amp; MIPS_CONF_M;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void decode_configs(struct cpuinfo_mips *c)</div><div class='add'>+static void __init decode_configs(struct cpuinfo_mips *c)</div><div class='ctx'> {</div><div class='ctx'> 	/* MIPS32 or MIPS64 compliant CPU.  */</div><div class='ctx'> 	c-&gt;options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER |</div><div class='hunk'>@@ -597,8 +596,6 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PRID_IMP_25KF:</div><div class='ctx'> 		c-&gt;cputype = CPU_25KF;</div><div class='del'>-		/* Probe for L2 cache */</div><div class='del'>-		c-&gt;scache.flags &amp;= ~MIPS_CACHE_NOT_PRESENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PRID_IMP_34K:</div><div class='ctx'> 		c-&gt;cputype = CPU_34K;</div><div class='hunk'>@@ -655,7 +652,7 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c)</div><div class='ctx'> 	case PRID_IMP_SB1:</div><div class='ctx'> 		c-&gt;cputype = CPU_SB1;</div><div class='ctx'> 		/* FPU in pass1 is known to have issues. */</div><div class='del'>-		if ((c-&gt;processor_id &amp; 0xff) &lt; 0x20)</div><div class='add'>+		if ((c-&gt;processor_id &amp; 0xff) &lt; 0x02)</div><div class='ctx'> 			c-&gt;options &amp;= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PRID_IMP_SB1A:</div><div class='head'>diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S<br/>index a9c6de1b9542..766655f35250 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/entry.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='hunk'>@@ -66,7 +65,7 @@ need_resched:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> FEXPORT(ret_from_fork)</div><div class='del'>-	jal	schedule_tail		# a0 = task_t *prev</div><div class='add'>+	jal	schedule_tail		# a0 = struct task_struct *prev</div><div class='ctx'> </div><div class='ctx'> FEXPORT(syscall_exit)</div><div class='ctx'> 	local_irq_disable		# make sure need_resched and</div><div class='hunk'>@@ -87,7 +86,7 @@ FEXPORT(restore_all)			# restore full frame</div><div class='ctx'> 	ori	v1, v0, TCSTATUS_IXMT</div><div class='ctx'> 	mtc0	v1, CP0_TCSTATUS</div><div class='ctx'> 	andi	v0, TCSTATUS_IXMT</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	mfc0	t0, CP0_TCCONTEXT</div><div class='ctx'> 	DMT	9				# dmt t1</div><div class='ctx'> 	jal	mips_ihb</div><div class='hunk'>@@ -95,7 +94,7 @@ FEXPORT(restore_all)			# restore full frame</div><div class='ctx'> 	andi	t3, t0, 0xff00</div><div class='ctx'> 	or	t2, t2, t3</div><div class='ctx'> 	mtc0	t2, CP0_STATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	andi	t1, t1, VPECONTROL_TE</div><div class='ctx'> 	beqz	t1, 1f</div><div class='ctx'> 	EMT</div><div class='hunk'>@@ -105,7 +104,7 @@ FEXPORT(restore_all)			# restore full frame</div><div class='ctx'> 	xori	v1, v1, TCSTATUS_IXMT</div><div class='ctx'> 	or	v1, v0, v1</div><div class='ctx'> 	mtc0	v1, CP0_TCSTATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	xor	t0, t0, t3</div><div class='ctx'> 	mtc0	t0, CP0_TCCONTEXT</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMTC */</div><div class='hunk'>@@ -114,6 +113,21 @@ FEXPORT(restore_all)			# restore full frame</div><div class='ctx'> 	RESTORE_AT</div><div class='ctx'> 	RESTORE_STATIC</div><div class='ctx'> FEXPORT(restore_partial)		# restore partial frame</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	SAVE_STATIC</div><div class='add'>+	SAVE_AT</div><div class='add'>+	SAVE_TEMP</div><div class='add'>+	LONG_L	v0, PT_STATUS(sp)</div><div class='add'>+	and	v0, 1</div><div class='add'>+	beqz	v0, 1f</div><div class='add'>+	jal	trace_hardirqs_on</div><div class='add'>+	b	2f</div><div class='add'>+1:	jal	trace_hardirqs_off</div><div class='add'>+2:</div><div class='add'>+	RESTORE_TEMP</div><div class='add'>+	RESTORE_AT</div><div class='add'>+	RESTORE_STATIC</div><div class='add'>+#endif</div><div class='ctx'> 	RESTORE_SOME</div><div class='ctx'> 	RESTORE_SP_AND_RET</div><div class='ctx'> 	.set	at</div><div class='head'>diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S<br/>index 5fd7a8af0c62..2c446063636a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/gdb-low.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/gdb-low.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/gdb-low.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/gdb-low.S</a></div><div class='hunk'>@@ -3,11 +3,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1995 Andreas Busse</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='hunk'>@@ -121,6 +121,7 @@</div><div class='ctx'> 		LONG_S	$31, GDB_FR_REG31(sp)</div><div class='ctx'> </div><div class='ctx'> 		CLI				/* disable interrupts */</div><div class='add'>+		TRACE_IRQS_OFF</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Followed by the floating point registers</div><div class='hunk'>@@ -291,7 +292,7 @@</div><div class='ctx'> 		ori	t1, t2, TCSTATUS_IXMT</div><div class='ctx'> 		mtc0	t1, CP0_TCSTATUS</div><div class='ctx'> 		andi	t2, t2, TCSTATUS_IXMT</div><div class='del'>-		ehb</div><div class='add'>+		_ehb</div><div class='ctx'> 		DMT	9				# dmt	t1</div><div class='ctx'> 		jal	mips_ihb</div><div class='ctx'> 		nop</div><div class='hunk'>@@ -310,7 +311,7 @@</div><div class='ctx'> 		xori	t1, t1, TCSTATUS_IXMT</div><div class='ctx'> 		or	t1, t1, t2</div><div class='ctx'> 		mtc0	t1, CP0_TCSTATUS</div><div class='del'>-		ehb</div><div class='add'>+		_ehb</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMTC */</div><div class='ctx'> 		LONG_L	v0, GDB_FR_STATUS(sp)</div><div class='ctx'> 		LONG_L	v1, GDB_FR_EPC(sp)</div><div class='head'>diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c<br/>index 6ecbdc1fefd1..719d26968cb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/gdb-stub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/gdb-stub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/gdb-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/gdb-stub.c</a></div><div class='hunk'>@@ -120,7 +120,6 @@</div><div class='ctx'>  *       breakpoints, single stepping,</div><div class='ctx'>  *       printing variables, etc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S<br/>index ff7af369f286..37fda3dcdfc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/genex.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/genex.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/genex.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/genex.S</a></div><div class='hunk'>@@ -8,12 +8,12 @@</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  * Copyright (C) 2002 Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='ctx'> #include &lt;asm/cacheops.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/fpregdef.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='hunk'>@@ -129,6 +129,7 @@ handle_vcei:</div><div class='ctx'> NESTED(handle_int, PT_SIZE, sp)</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	CLI</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> </div><div class='ctx'> 	PTR_LA	ra, ret_from_irq</div><div class='ctx'> 	move	a0, sp</div><div class='hunk'>@@ -214,9 +215,10 @@ NESTED(except_vec_vi_handler, 0, sp)</div><div class='ctx'> 	mtc0	t0, CP0_TCCONTEXT</div><div class='ctx'> 	xor	t1, t1, t0</div><div class='ctx'> 	mtc0	t1, CP0_STATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMTC */</div><div class='ctx'> 	CLI</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	move	a0, sp</div><div class='ctx'> 	jalr	v0</div><div class='ctx'> 	j	ret_from_irq</div><div class='hunk'>@@ -289,11 +291,13 @@ NESTED(nmi_handler, PT_SIZE, sp)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	__build_clear_sti</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	STI</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	__build_clear_cli</div><div class='ctx'> 	CLI</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	.macro	__build_clear_fpe</div><div class='hunk'>@@ -301,6 +305,7 @@ NESTED(nmi_handler, PT_SIZE, sp)</div><div class='ctx'> 	li	a2, ~(0x3f &lt;&lt; 12)</div><div class='ctx'> 	and	a2, a1</div><div class='ctx'> 	ctc1	a2, fcr31</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	STI</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +371,7 @@ NESTED(nmi_handler, PT_SIZE, sp)</div><div class='ctx'> 	BUILD_HANDLER mdmx mdmx sti silent		/* #22 */</div><div class='ctx'> 	BUILD_HANDLER watch watch sti verbose		/* #23 */</div><div class='ctx'> 	BUILD_HANDLER mcheck mcheck cli verbose		/* #24 */</div><div class='del'>-	BUILD_HANDLER mt mt sti verbose			/* #25 */</div><div class='add'>+	BUILD_HANDLER mt mt sti silent			/* #25 */</div><div class='ctx'> 	BUILD_HANDLER dsp dsp sti silent		/* #26 */</div><div class='ctx'> 	BUILD_HANDLER reserved reserved sti verbose	/* others */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S<br/>index bdf6f6eff721..8c6db0fc72f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/head.S</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994, 1995 Waldorf Electronics</div><div class='ctx'>  * Written by Ralf Baechle and Andreas Busse</div><div class='del'>- * Copyright (C) 1994, 95, 96, 97, 98, 99, 2003 Ralf Baechle</div><div class='add'>+ * Copyright (C) 1994 - 99, 2003, 06 Ralf Baechle</div><div class='ctx'>  * Copyright (C) 1996 Paul M. Antoine</div><div class='ctx'>  * Modified for DECStation and hence R3000 support by Paul M. Antoine</div><div class='ctx'>  * Further modifications by David S. Miller and Harald Koerfgen</div><div class='hunk'>@@ -13,12 +13,12 @@</div><div class='ctx'>  * Kevin Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com</div><div class='ctx'>  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='hunk'>@@ -96,7 +96,7 @@</div><div class='ctx'> 	/* Clear TKSU, leave IXMT */</div><div class='ctx'> 	xori	t0, 0x00001800</div><div class='ctx'> 	mtc0	t0, CP0_TCSTATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	/* We need to leave the global IE bit set, but clear EXL...*/</div><div class='ctx'> 	mfc0	t0, CP0_STATUS</div><div class='ctx'> 	or	t0, ST0_CU0 | ST0_EXL | ST0_ERL | \set | \clr</div><div class='head'>diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c<br/>index 2125ba5f1d9b..ea36c8e8852c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/i8259.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/i8259.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/i8259.c</a></div><div class='hunk'>@@ -51,7 +51,7 @@ static unsigned int startup_8259A_irq(unsigned int irq)</div><div class='ctx'> 	return 0; /* never anything pending */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type i8259A_irq_type = {</div><div class='add'>+static struct irq_chip i8259A_irq_type = {</div><div class='ctx'> 	.typename = "XT-PIC",</div><div class='ctx'> 	.startup = startup_8259A_irq,</div><div class='ctx'> 	.shutdown = shutdown_8259A_irq,</div><div class='hunk'>@@ -120,7 +120,7 @@ int i8259A_irq_pending(unsigned int irq)</div><div class='ctx'> void make_8259A_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;i8259A_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;i8259A_irq_type;</div><div class='ctx'> 	enable_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -302,11 +302,11 @@ static struct irqaction irq2 = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pic1_io_resource = {</div><div class='del'>-	"pic1", 0x20, 0x3f, IORESOURCE_BUSY</div><div class='add'>+	.name = "pic1", .start = 0x20, .end = 0x3f, .flags = IORESOURCE_BUSY</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pic2_io_resource = {</div><div class='del'>-	"pic2", 0xa0, 0xbf, IORESOURCE_BUSY</div><div class='add'>+	.name = "pic2", .start = 0xa0, .end = 0xbf, .flags = IORESOURCE_BUSY</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -327,7 +327,7 @@ void __init init_i8259_irqs (void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;i8259A_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;i8259A_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(2, &amp;irq2);</div><div class='head'>diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c<br/>index 10d3644e3608..ab12c8f01518 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irixelf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irixelf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irixelf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irixelf.c</a></div><div class='hunk'>@@ -999,8 +999,6 @@ static inline int maydump(struct vm_area_struct *vma)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define roundup(x, y)  ((((x)+((y)-1))/(y))*(y))</div><div class='del'>-</div><div class='ctx'> /* An ELF note in memory. */</div><div class='ctx'> struct memelfnote</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c<br/>index 8150f071f80a..676e868d26fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irixsig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irixsig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irixsig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irixsig.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/resource.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -260,7 +261,7 @@ irix_sigreturn(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 		for(i = 0; i &lt; 32; i++)</div><div class='ctx'> 			error |= __get_user(fregs[i], &amp;context-&gt;fpregs[i]);</div><div class='del'>-		error |= __get_user(current-&gt;thread.fpu.hard.fcr31, &amp;context-&gt;fpcsr);</div><div class='add'>+		error |= __get_user(current-&gt;thread.fpu.fcr31, &amp;context-&gt;fpcsr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* XXX do sigstack crapola here... XXX */</div><div class='hunk'>@@ -540,8 +541,6 @@ out:</div><div class='ctx'> #define IRIX_P_PGID   2</div><div class='ctx'> #define IRIX_P_ALL    7</div><div class='ctx'> </div><div class='del'>-extern int getrusage(struct task_struct *, int, struct rusage __user *);</div><div class='del'>-</div><div class='ctx'> #define W_EXITED     1</div><div class='ctx'> #define W_TRAPPED    2</div><div class='ctx'> #define W_STOPPED    4</div><div class='head'>diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c<br/>index 97ebdc754b9e..63dfeb41796b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-msc01.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-msc01.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-msc01.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irq-msc01.c</a></div><div class='hunk'>@@ -137,7 +137,7 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set)</div><div class='ctx'> </div><div class='ctx'> #define shutdown_msc_irq	disable_msc_irq</div><div class='ctx'> </div><div class='del'>-struct hw_interrupt_type msc_levelirq_type = {</div><div class='add'>+struct irq_chip msc_levelirq_type = {</div><div class='ctx'> 	.typename = "SOC-it-Level",</div><div class='ctx'> 	.startup = startup_msc_irq,</div><div class='ctx'> 	.shutdown = shutdown_msc_irq,</div><div class='hunk'>@@ -147,7 +147,7 @@ struct hw_interrupt_type msc_levelirq_type = {</div><div class='ctx'> 	.end = end_msc_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hw_interrupt_type msc_edgeirq_type = {</div><div class='add'>+struct irq_chip msc_edgeirq_type = {</div><div class='ctx'> 	.typename = "SOC-it-Edge",</div><div class='ctx'> 	.startup =startup_msc_irq,</div><div class='ctx'> 	.shutdown = shutdown_msc_irq,</div><div class='hunk'>@@ -174,14 +174,14 @@ void __init init_msc_irqs(unsigned int base, msc_irqmap_t *imp, int nirq)</div><div class='ctx'> </div><div class='ctx'> 		switch (imp-&gt;im_type) {</div><div class='ctx'> 		case MSC01_IRQ_EDGE:</div><div class='del'>-			irq_desc[base+n].handler = &amp;msc_edgeirq_type;</div><div class='add'>+			irq_desc[base+n].chip = &amp;msc_edgeirq_type;</div><div class='ctx'> 			if (cpu_has_veic)</div><div class='ctx'> 				MSCIC_WRITE(MSC01_IC_SUP+n*8, MSC01_IC_SUP_EDGE_BIT);</div><div class='ctx'> 			else</div><div class='ctx'> 				MSCIC_WRITE(MSC01_IC_SUP+n*8, MSC01_IC_SUP_EDGE_BIT | imp-&gt;im_lvl);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MSC01_IRQ_LEVEL:</div><div class='del'>-			irq_desc[base+n].handler = &amp;msc_levelirq_type;</div><div class='add'>+			irq_desc[base+n].chip = &amp;msc_levelirq_type;</div><div class='ctx'> 			if (cpu_has_veic)</div><div class='ctx'> 				MSCIC_WRITE(MSC01_IC_SUP+n*8, 0);</div><div class='ctx'> 			else</div><div class='head'>diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c<br/>index 0613f1f36b1b..b117e64da64d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-mv6434x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-mv6434x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-mv6434x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irq-mv6434x.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ void ll_mv64340_irq(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> #define shutdown_mv64340_irq	disable_mv64340_irq</div><div class='ctx'> </div><div class='del'>-struct hw_interrupt_type mv64340_irq_type = {</div><div class='add'>+struct irq_chip mv64340_irq_type = {</div><div class='ctx'> 	.typename = "MV-64340",</div><div class='ctx'> 	.startup = startup_mv64340_irq,</div><div class='ctx'> 	.shutdown = shutdown_mv64340_irq,</div><div class='hunk'>@@ -155,7 +155,7 @@ void __init mv64340_irq_init(unsigned int base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 2;</div><div class='del'>-		irq_desc[i].handler = &amp;mv64340_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;mv64340_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq_base = base;</div><div class='head'>diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c<br/>index 0b130c5ac5d9..6b54c7109e2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-rm7000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-rm7000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-rm7000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irq-rm7000.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ static void rm7k_cpu_irq_end(unsigned int irq)</div><div class='ctx'> 		unmask_rm7k_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller rm7k_irq_controller = {</div><div class='add'>+static struct irq_chip rm7k_irq_controller = {</div><div class='ctx'> 	.typename = "RM7000",</div><div class='ctx'> 	.startup = rm7k_cpu_irq_startup,</div><div class='ctx'> 	.shutdown = rm7k_cpu_irq_shutdown,</div><div class='hunk'>@@ -91,7 +91,7 @@ void __init rm7k_cpu_irq_init(int base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;rm7k_irq_controller;</div><div class='add'>+		irq_desc[i].chip = &amp;rm7k_irq_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq_base = base;</div><div class='head'>diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c<br/>index 9b5f20c32acb..62f011ba97a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-rm9000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq-rm9000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq-rm9000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irq-rm9000.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static void rm9k_cpu_irq_end(unsigned int irq)</div><div class='ctx'> 		unmask_rm9k_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller rm9k_irq_controller = {</div><div class='add'>+static struct irq_chip rm9k_irq_controller = {</div><div class='ctx'> 	.typename = "RM9000",</div><div class='ctx'> 	.startup = rm9k_cpu_irq_startup,</div><div class='ctx'> 	.shutdown = rm9k_cpu_irq_shutdown,</div><div class='hunk'>@@ -115,7 +115,7 @@ static hw_irq_controller rm9k_irq_controller = {</div><div class='ctx'> 	.end = rm9k_cpu_irq_end,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller rm9k_perfcounter_irq = {</div><div class='add'>+static struct irq_chip rm9k_perfcounter_irq = {</div><div class='ctx'> 	.typename = "RM9000",</div><div class='ctx'> 	.startup = rm9k_perfcounter_irq_startup,</div><div class='ctx'> 	.shutdown = rm9k_perfcounter_irq_shutdown,</div><div class='hunk'>@@ -139,11 +139,11 @@ void __init rm9k_cpu_irq_init(int base)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;rm9k_irq_controller;</div><div class='add'>+		irq_desc[i].chip = &amp;rm9k_irq_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rm9000_perfcount_irq = base + 1;</div><div class='del'>-	irq_desc[rm9000_perfcount_irq].handler = &amp;rm9k_perfcounter_irq;</div><div class='add'>+	irq_desc[rm9000_perfcount_irq].chip = &amp;rm9k_perfcounter_irq;</div><div class='ctx'> </div><div class='ctx'> 	irq_base = base;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c<br/>index 3dce742e716f..d955aaefbb8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irq.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1992 Linus Torvalds</div><div class='ctx'>  * Copyright (C) 1994 - 2000 Ralf Baechle</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -95,7 +94,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -137,7 +136,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 		irq_desc[i].status  = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action  = NULL;</div><div class='ctx'> 		irq_desc[i].depth   = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;no_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;no_irq_chip;</div><div class='ctx'> 		spin_lock_init(&amp;irq_desc[i].lock);</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMTC</div><div class='ctx'> 		irq_hwmask[i] = 0;</div><div class='head'>diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c<br/>index 5db67e31ec1a..9bb21c7f2149 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq_cpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/irq_cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/irq_cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/irq_cpu.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ static void mips_cpu_irq_end(unsigned int irq)</div><div class='ctx'> 		unmask_mips_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller mips_cpu_irq_controller = {</div><div class='add'>+static struct irq_chip mips_cpu_irq_controller = {</div><div class='ctx'> 	.typename	= "MIPS",</div><div class='ctx'> 	.startup	= mips_cpu_irq_startup,</div><div class='ctx'> 	.shutdown	= mips_cpu_irq_shutdown,</div><div class='hunk'>@@ -140,7 +140,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> #define mips_mt_cpu_irq_end mips_cpu_irq_end</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller mips_mt_cpu_irq_controller = {</div><div class='add'>+static struct irq_chip mips_mt_cpu_irq_controller = {</div><div class='ctx'> 	.typename	= "MIPS",</div><div class='ctx'> 	.startup	= mips_mt_cpu_irq_startup,</div><div class='ctx'> 	.shutdown	= mips_mt_cpu_irq_shutdown,</div><div class='hunk'>@@ -167,14 +167,14 @@ void __init mips_cpu_irq_init(int irq_base)</div><div class='ctx'> 			irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 			irq_desc[i].action = NULL;</div><div class='ctx'> 			irq_desc[i].depth = 1;</div><div class='del'>-			irq_desc[i].handler = &amp;mips_mt_cpu_irq_controller;</div><div class='add'>+			irq_desc[i].chip = &amp;mips_mt_cpu_irq_controller;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	for (i = irq_base + 2; i &lt; irq_base + 8; i++) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;mips_cpu_irq_controller;</div><div class='add'>+		irq_desc[i].chip = &amp;mips_cpu_irq_controller;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mips_cpu_irq_base = irq_base;</div><div class='head'>diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c<br/>index a7d2bb3cf835..450ac592da57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/linux32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/linux32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/linux32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/linux32.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Written by Ulf Carlsson (ulfc@engr.sgi.com)</div><div class='ctx'>  * sys32_execve from ia64/ia32 code, Feb 2000, Kanoj Sarcar (kanoj@sgi.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c<br/>index 02237a685ec7..c1373a6e668b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/mips-mt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/mips-mt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/mips-mt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/mips-mt.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -47,7 +48,7 @@ unsigned long mt_fpemul_threshold = 0;</div><div class='ctx'>  * used in sys_sched_set/getaffinity() in kernel/sched.c, so</div><div class='ctx'>  * cloned here.</div><div class='ctx'>  */</div><div class='del'>-static inline task_t *find_process_by_pid(pid_t pid)</div><div class='add'>+static inline struct task_struct *find_process_by_pid(pid_t pid)</div><div class='ctx'> {</div><div class='ctx'> 	return pid ? find_task_by_pid(pid) : current;</div><div class='ctx'> }</div><div class='hunk'>@@ -62,7 +63,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,</div><div class='ctx'> 	cpumask_t new_mask;</div><div class='ctx'> 	cpumask_t effective_mask;</div><div class='ctx'> 	int retval;</div><div class='del'>-	task_t *p;</div><div class='add'>+	struct task_struct *p;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; sizeof(new_mask))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -127,7 +128,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,</div><div class='ctx'> 	unsigned int real_len;</div><div class='ctx'> 	cpumask_t mask;</div><div class='ctx'> 	int retval;</div><div class='del'>-	task_t *p;</div><div class='add'>+	struct task_struct *p;</div><div class='ctx'> </div><div class='ctx'> 	real_len = sizeof(mask);</div><div class='ctx'> 	if (len &lt; real_len)</div><div class='head'>diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c<br/>index 0a71a4c33716..f44a01357ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/mips_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/mips_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/mips_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/mips_ksyms.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05 by Ralf Baechle</div><div class='ctx'>  * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c<br/>index e54a7f442f8a..d7bf0215bc1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/module.c</a></div><div class='hunk'>@@ -288,6 +288,9 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,</div><div class='ctx'> 		sym = (Elf_Sym *)sechdrs[symindex].sh_addr</div><div class='ctx'> 			+ ELF_MIPS_R_SYM(rel[i]);</div><div class='ctx'> 		if (!sym-&gt;st_value) {</div><div class='add'>+			/* Ignore unresolved weak symbol */</div><div class='add'>+			if (ELF_ST_BIND(sym-&gt;st_info) == STB_WEAK)</div><div class='add'>+				continue;</div><div class='ctx'> 			printk(KERN_WARNING "%s: Unknown symbol %s\n",</div><div class='ctx'> 			       me-&gt;name, strtab + sym-&gt;st_name);</div><div class='ctx'> 			return -ENOENT;</div><div class='hunk'>@@ -325,6 +328,9 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,</div><div class='ctx'> 		sym = (Elf_Sym *)sechdrs[symindex].sh_addr</div><div class='ctx'> 			+ ELF_MIPS_R_SYM(rel[i]);</div><div class='ctx'> 		if (!sym-&gt;st_value) {</div><div class='add'>+			/* Ignore unresolved weak symbol */</div><div class='add'>+			if (ELF_ST_BIND(sym-&gt;st_info) == STB_WEAK)</div><div class='add'>+				continue;</div><div class='ctx'> 			printk(KERN_WARNING "%s: Unknown symbol %s\n",</div><div class='ctx'> 			       me-&gt;name, strtab + sym-&gt;st_name);</div><div class='ctx'> 			return -ENOENT;</div><div class='head'>diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c<br/>index 9def554f335b..d8beef107902 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/proc.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *  Copyright (C) 2001, 2004  MIPS Technologies, Inc.</div><div class='ctx'>  *  Copyright (C) 2004  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c<br/>index 199a06e873c6..7ab67f786bfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/process.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2004 Thiemo Seufer</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c<br/>index 9b4733c12395..362d1728e531 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/ptrace.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * At this time Linux/MIPS64 only supports syscall tracing, even for 32-bit</div><div class='ctx'>  * binaries.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -120,11 +119,11 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)</div><div class='ctx'> 			__put_user ((__u64) -1, i + (__u64 __user *) data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	__put_user (child-&gt;thread.fpu.fcr31, data + 64);</div><div class='add'>+</div><div class='ctx'> 	if (cpu_has_fpu) {</div><div class='ctx'> 		unsigned int flags, tmp;</div><div class='ctx'> </div><div class='del'>-		__put_user (child-&gt;thread.fpu.hard.fcr31, data + 64);</div><div class='del'>-</div><div class='ctx'> 		preempt_disable();</div><div class='ctx'> 		if (cpu_has_mipsmt) {</div><div class='ctx'> 			unsigned int vpflags = dvpe();</div><div class='hunk'>@@ -142,7 +141,6 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> 		__put_user (tmp, data + 65);</div><div class='ctx'> 	} else {</div><div class='del'>-		__put_user (child-&gt;thread.fpu.soft.fcr31, data + 64);</div><div class='ctx'> 		__put_user ((__u32) 0, data + 65);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -162,10 +160,7 @@ int ptrace_setfpregs (struct task_struct *child, __u32 __user *data)</div><div class='ctx'> 	for (i = 0; i &lt; 32; i++)</div><div class='ctx'> 		__get_user (fregs[i], i + (__u64 __user *) data);</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_fpu)</div><div class='del'>-		__get_user (child-&gt;thread.fpu.hard.fcr31, data + 64);</div><div class='del'>-	else</div><div class='del'>-		__get_user (child-&gt;thread.fpu.soft.fcr31, data + 64);</div><div class='add'>+	__get_user (child-&gt;thread.fpu.fcr31, data + 64);</div><div class='ctx'> </div><div class='ctx'> 	/* FIR may not be written.  */</div><div class='ctx'> </div><div class='hunk'>@@ -241,10 +236,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 			tmp = regs-&gt;lo;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FPC_CSR:</div><div class='del'>-			if (cpu_has_fpu)</div><div class='del'>-				tmp = child-&gt;thread.fpu.hard.fcr31;</div><div class='del'>-			else</div><div class='del'>-				tmp = child-&gt;thread.fpu.soft.fcr31;</div><div class='add'>+			tmp = child-&gt;thread.fpu.fcr31;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FPC_EIR: {	/* implementation / version register */</div><div class='ctx'> 			unsigned int flags;</div><div class='hunk'>@@ -336,9 +328,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> </div><div class='ctx'> 			if (!tsk_used_math(child)) {</div><div class='ctx'> 				/* FP not yet used  */</div><div class='del'>-				memset(&amp;child-&gt;thread.fpu.hard, ~0,</div><div class='del'>-				       sizeof(child-&gt;thread.fpu.hard));</div><div class='del'>-				child-&gt;thread.fpu.hard.fcr31 = 0;</div><div class='add'>+				memset(&amp;child-&gt;thread.fpu, ~0,</div><div class='add'>+				       sizeof(child-&gt;thread.fpu));</div><div class='add'>+				child-&gt;thread.fpu.fcr31 = 0;</div><div class='ctx'> 			}</div><div class='ctx'> #ifdef CONFIG_32BIT</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -369,10 +361,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 			regs-&gt;lo = data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FPC_CSR:</div><div class='del'>-			if (cpu_has_fpu)</div><div class='del'>-				child-&gt;thread.fpu.hard.fcr31 = data;</div><div class='del'>-			else</div><div class='del'>-				child-&gt;thread.fpu.soft.fcr31 = data;</div><div class='add'>+			child-&gt;thread.fpu.fcr31 = data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DSP_BASE ... DSP_BASE + 5: {</div><div class='ctx'> 			dspreg_t *dregs;</div><div class='head'>diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c<br/>index 8704dc0496ea..f40ecd8be05f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/ptrace32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/ptrace32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/ptrace32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/ptrace32.c</a></div><div class='hunk'>@@ -166,10 +166,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='ctx'> 			tmp = regs-&gt;lo;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FPC_CSR:</div><div class='del'>-			if (cpu_has_fpu)</div><div class='del'>-				tmp = child-&gt;thread.fpu.hard.fcr31;</div><div class='del'>-			else</div><div class='del'>-				tmp = child-&gt;thread.fpu.soft.fcr31;</div><div class='add'>+			tmp = child-&gt;thread.fpu.fcr31;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FPC_EIR: {	/* implementation / version register */</div><div class='ctx'> 			unsigned int flags;</div><div class='hunk'>@@ -288,9 +285,9 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='ctx'> </div><div class='ctx'> 			if (!tsk_used_math(child)) {</div><div class='ctx'> 				/* FP not yet used  */</div><div class='del'>-				memset(&amp;child-&gt;thread.fpu.hard, ~0,</div><div class='del'>-				       sizeof(child-&gt;thread.fpu.hard));</div><div class='del'>-				child-&gt;thread.fpu.hard.fcr31 = 0;</div><div class='add'>+				memset(&amp;child-&gt;thread.fpu, ~0,</div><div class='add'>+				       sizeof(child-&gt;thread.fpu));</div><div class='add'>+				child-&gt;thread.fpu.fcr31 = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The odd registers are actually the high order bits</div><div class='hunk'>@@ -318,10 +315,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)</div><div class='ctx'> 			regs-&gt;lo = data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FPC_CSR:</div><div class='del'>-			if (cpu_has_fpu)</div><div class='del'>-				child-&gt;thread.fpu.hard.fcr31 = data;</div><div class='del'>-			else</div><div class='del'>-				child-&gt;thread.fpu.soft.fcr31 = data;</div><div class='add'>+			child-&gt;thread.fpu.fcr31 = data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DSP_BASE ... DSP_BASE + 5: {</div><div class='ctx'> 			dspreg_t *dregs;</div><div class='head'>diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S<br/>index 0d9c4a32a9c2..656bde2e11b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/r2300_switch.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/r2300_switch.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/r2300_switch.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/r2300_switch.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Further modifications to make this work:</div><div class='ctx'>  * Copyright (c) 1998-2000 Harald Koerfgen</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='ctx'> #include &lt;asm/fpregdef.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S<br/>index 283a98508fc8..880fa6e841ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/r4k_fpu.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/r4k_fpu.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/r4k_fpu.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/r4k_fpu.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Copyright (C) 2000 MIPS Technologies, Inc.</div><div class='ctx'>  * Copyright (C) 1999, 2001 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/fpregdef.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S<br/>index 0b1b54acee9f..d5c8b82fed72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/r4k_switch.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/r4k_switch.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/r4k_switch.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/r4k_switch.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright (C) 2000 MIPS Technologies, Inc.</div><div class='ctx'>  *    written by Carsten Langgaard, carstenl@mips.com</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/cachectl.h&gt;</div><div class='ctx'> #include &lt;asm/fpregdef.h&gt;</div><div class='hunk'>@@ -75,8 +74,8 @@</div><div class='ctx'> 	and	t0, t0, t1</div><div class='ctx'> 	LONG_S	t0, ST_OFF(t3)</div><div class='ctx'> </div><div class='del'>-	fpu_save_double a0 t1 t0 t2		# c0_status passed in t1</div><div class='del'>-						# clobbers t0 and t2</div><div class='add'>+	fpu_save_double a0 t0 t1		# c0_status passed in t0</div><div class='add'>+						# clobbers t1</div><div class='ctx'> 1:</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -94,7 +93,7 @@</div><div class='ctx'> 	ori	t1, t2, TCSTATUS_IXMT</div><div class='ctx'> 	mtc0	t1, CP0_TCSTATUS</div><div class='ctx'> 	andi	t2, t2, TCSTATUS_IXMT</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	DMT	8				# dmt	t0</div><div class='ctx'> 	move	t1,ra</div><div class='ctx'> 	jal	mips_ihb</div><div class='hunk'>@@ -109,7 +108,7 @@</div><div class='ctx'> 	or	a2, t1</div><div class='ctx'> 	mtc0	a2, CP0_STATUS</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_SMTC</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	andi	t0, t0, VPECONTROL_TE</div><div class='ctx'> 	beqz	t0, 1f</div><div class='ctx'> 	emt</div><div class='hunk'>@@ -118,7 +117,7 @@</div><div class='ctx'> 	xori	t1, t1, TCSTATUS_IXMT</div><div class='ctx'> 	or	t1, t1, t2</div><div class='ctx'> 	mtc0	t1, CP0_TCSTATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> #endif /* CONFIG_MIPS_MT_SMTC */</div><div class='ctx'> 	move	v0, a0</div><div class='ctx'> 	jr	ra</div><div class='hunk'>@@ -129,9 +128,9 @@</div><div class='ctx'>  */</div><div class='ctx'> LEAF(_save_fp)</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-	mfc0	t1, CP0_STATUS</div><div class='add'>+	mfc0	t0, CP0_STATUS</div><div class='ctx'> #endif</div><div class='del'>-	fpu_save_double a0 t1 t0 t2		# clobbers t1</div><div class='add'>+	fpu_save_double a0 t0 t1		# clobbers t1</div><div class='ctx'> 	jr	ra</div><div class='ctx'> 	END(_save_fp)</div><div class='ctx'> </div><div class='hunk'>@@ -139,7 +138,10 @@ LEAF(_save_fp)</div><div class='ctx'>  * Restore a thread's fp context.</div><div class='ctx'>  */</div><div class='ctx'> LEAF(_restore_fp)</div><div class='del'>-	fpu_restore_double a0, t1		# clobbers t1</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	mfc0	t0, CP0_STATUS</div><div class='add'>+#endif</div><div class='add'>+	fpu_restore_double a0 t0 t1		# clobbers t1</div><div class='ctx'> 	jr	ra</div><div class='ctx'> 	END(_restore_fp)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c<br/>index caf777f83289..cdab1b2cd134 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/rtlx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/rtlx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/rtlx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/rtlx.c</a></div><div class='hunk'>@@ -487,7 +487,7 @@ static struct file_operations rtlx_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction rtlx_irq = {</div><div class='ctx'> 	.handler	= rtlx_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "RTLX",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S<br/>index a0ac0e5f61ad..ba1bcd83c7d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall32-o32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall32-o32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall32-o32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/scall32-o32.S</a></div><div class='hunk'>@@ -3,14 +3,14 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 by Ralf Baechle</div><div class='add'>+ * Copyright (C) 1995-99, 2000- 02, 06 Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  * Copyright (C) 2004 Thiemo Seufer</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='hunk'>@@ -28,6 +28,18 @@</div><div class='ctx'> NESTED(handle_sys, PT_SIZE, sp)</div><div class='ctx'> 	.set	noat</div><div class='ctx'> 	SAVE_SOME</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='add'>+	LONG_L	$8, PT_R8(sp)</div><div class='add'>+	LONG_L	$9, PT_R9(sp)</div><div class='add'>+#endif</div><div class='add'>+	LONG_L	$7, PT_R7(sp)</div><div class='add'>+	LONG_L	$6, PT_R6(sp)</div><div class='add'>+	LONG_L	$5, PT_R5(sp)</div><div class='add'>+	LONG_L	$4, PT_R4(sp)</div><div class='add'>+	LONG_L	$2, PT_R2(sp)</div><div class='add'>+#endif</div><div class='ctx'> 	STI</div><div class='ctx'> 	.set	at</div><div class='ctx'> </div><div class='hunk'>@@ -497,7 +509,7 @@ einval:	li	v0, -EINVAL</div><div class='ctx'> 	sys	sys_sched_get_priority_min 1</div><div class='ctx'> 	sys	sys_sched_rr_get_interval 2	/* 4165 */</div><div class='ctx'> 	sys	sys_nanosleep,		2</div><div class='del'>-	sys	sys_mremap,		4</div><div class='add'>+	sys	sys_mremap,		5</div><div class='ctx'> 	sys	sys_accept		3</div><div class='ctx'> 	sys	sys_bind		3</div><div class='ctx'> 	sys	sys_connect		3	/* 4170 */</div><div class='hunk'>@@ -647,6 +659,9 @@ einval:	li	v0, -EINVAL</div><div class='ctx'> 	sys	sys_unshare		1</div><div class='ctx'> 	sys	sys_splice		4</div><div class='ctx'> 	sys	sys_sync_file_range	7	/* 4305 */</div><div class='add'>+	sys	sys_tee			4</div><div class='add'>+	sys	sys_vmsplice		4</div><div class='add'>+	sys	sys_move_pages		6</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	/* We pre-compute the number of _instruction_ bytes needed to</div><div class='head'>diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S<br/>index 9ba750887377..939e172db953 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall64-64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/scall64-64.S</a></div><div class='hunk'>@@ -7,10 +7,10 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='hunk'>@@ -34,6 +34,7 @@ NESTED(handle_sys64, PT_SIZE, sp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	.set	noat</div><div class='ctx'> 	SAVE_SOME</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	STI</div><div class='ctx'> 	.set	at</div><div class='ctx'> #endif</div><div class='hunk'>@@ -462,3 +463,6 @@ sys_call_table:</div><div class='ctx'> 	PTR	sys_unshare</div><div class='ctx'> 	PTR	sys_splice</div><div class='ctx'> 	PTR	sys_sync_file_range</div><div class='add'>+	PTR	sys_tee				/* 5265 */</div><div class='add'>+	PTR	sys_vmsplice</div><div class='add'>+	PTR	sys_move_pages</div><div class='head'>diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S<br/>index 942aca26f9c4..98abbc5a9f13 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-n32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall64-n32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-n32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/scall64-n32.S</a></div><div class='hunk'>@@ -7,10 +7,10 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='hunk'>@@ -33,6 +33,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)</div><div class='ctx'> #ifndef CONFIG_MIPS32_O32</div><div class='ctx'> 	.set	noat</div><div class='ctx'> 	SAVE_SOME</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	STI</div><div class='ctx'> 	.set	at</div><div class='ctx'> #endif</div><div class='hunk'>@@ -388,3 +389,6 @@ EXPORT(sysn32_call_table)</div><div class='ctx'> 	PTR	sys_unshare</div><div class='ctx'> 	PTR	sys_splice</div><div class='ctx'> 	PTR	sys_sync_file_range</div><div class='add'>+	PTR	sys_tee</div><div class='add'>+	PTR	sys_vmsplice			/* 6271 */</div><div class='add'>+	PTR	sys_move_pages</div><div class='head'>diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S<br/>index b53a9207f530..505c9ee54009 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-o32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/scall64-o32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/scall64-o32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/scall64-o32.S</a></div><div class='hunk'>@@ -13,10 +13,10 @@</div><div class='ctx'>  * to ABI64 calling convention.  64-bit syscalls are also processed</div><div class='ctx'>  * here for now.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='ctx'> #include &lt;asm/asmmacro.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/regdef.h&gt;</div><div class='ctx'> #include &lt;asm/stackframe.h&gt;</div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> NESTED(handle_sys, PT_SIZE, sp)</div><div class='ctx'> 	.set	noat</div><div class='ctx'> 	SAVE_SOME</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	STI</div><div class='ctx'> 	.set	at</div><div class='ctx'> 	ld	t1, PT_EPC(sp)		# skip syscall on return</div><div class='hunk'>@@ -209,7 +210,7 @@ sys_call_table:</div><div class='ctx'> 	PTR	sys_fork</div><div class='ctx'> 	PTR	sys_read</div><div class='ctx'> 	PTR	sys_write</div><div class='del'>-	PTR	sys_open			/* 4005 */</div><div class='add'>+	PTR	compat_sys_open			/* 4005 */</div><div class='ctx'> 	PTR	sys_close</div><div class='ctx'> 	PTR	sys_waitpid</div><div class='ctx'> 	PTR	sys_creat</div><div class='hunk'>@@ -510,4 +511,7 @@ sys_call_table:</div><div class='ctx'> 	PTR	sys_unshare</div><div class='ctx'> 	PTR	sys_splice</div><div class='ctx'> 	PTR	sys32_sync_file_range		/* 4305 */</div><div class='add'>+	PTR	sys_tee</div><div class='add'>+	PTR	sys_vmsplice</div><div class='add'>+	PTR	compat_sys_move_pages</div><div class='ctx'> 	.size	sys_call_table,.-sys_call_table</div><div class='head'>diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c<br/>index bcf1b10e518f..8c2b596a136f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/setup.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright (C) 1999 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2000 2001, 2002  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -25,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -246,7 +245,7 @@ static inline int parse_rd_cmdline(unsigned long* rd_start, unsigned long* rd_en</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> 	/* HACK: Guess if the sign extension was forgotten */</div><div class='ctx'> 	if (start &gt; 0x0000000080000000 &amp;&amp; start &lt; 0x00000000ffffffff)</div><div class='del'>-		start |= 0xffffffff00000000;</div><div class='add'>+		start |= 0xffffffff00000000UL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	end = start + size;</div><div class='hunk'>@@ -355,8 +354,6 @@ static inline void bootmem_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	memory_present(0, first_usable_pfn, max_low_pfn);</div><div class='del'>-</div><div class='ctx'> 	/* Initialize the boot-time allocator with low memory only.  */</div><div class='ctx'> 	bootmap_size = init_bootmem(first_usable_pfn, max_low_pfn);</div><div class='ctx'> </div><div class='hunk'>@@ -410,6 +407,7 @@ static inline void bootmem_init(void)</div><div class='ctx'> </div><div class='ctx'> 		/* Register lowmem ranges */</div><div class='ctx'> 		free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(size));</div><div class='add'>+		memory_present(0, curr_pfn, curr_pfn + size - 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve the bootmap memory.  */</div><div class='hunk'>@@ -419,17 +417,20 @@ static inline void bootmem_init(void)</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> 	initrd_below_start_ok = 1;</div><div class='ctx'> 	if (initrd_start) {</div><div class='del'>-		unsigned long initrd_size = ((unsigned char *)initrd_end) - ((unsigned char *)initrd_start);</div><div class='add'>+		unsigned long initrd_size = ((unsigned char *)initrd_end) -</div><div class='add'>+			((unsigned char *)initrd_start);</div><div class='add'>+		const int width = sizeof(long) * 2;</div><div class='add'>+</div><div class='ctx'> 		printk("Initial ramdisk at: 0x%p (%lu bytes)\n",</div><div class='ctx'> 		       (void *)initrd_start, initrd_size);</div><div class='ctx'> </div><div class='ctx'> 		if (CPHYSADDR(initrd_end) &gt; PFN_PHYS(max_low_pfn)) {</div><div class='ctx'> 			printk("initrd extends beyond end of memory "</div><div class='ctx'> 			       "(0x%0*Lx &gt; 0x%0*Lx)\ndisabling initrd\n",</div><div class='del'>-			       sizeof(long) * 2,</div><div class='del'>-			       (unsigned long long)CPHYSADDR(initrd_end),</div><div class='del'>-			       sizeof(long) * 2,</div><div class='del'>-			       (unsigned long long)PFN_PHYS(max_low_pfn));</div><div class='add'>+			       width,</div><div class='add'>+			       (unsigned long long) CPHYSADDR(initrd_end),</div><div class='add'>+			       width,</div><div class='add'>+			       (unsigned long long) PFN_PHYS(max_low_pfn));</div><div class='ctx'> 			initrd_start = initrd_end = 0;</div><div class='ctx'> 			initrd_reserve_bootmem = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -440,10 +441,55 @@ static inline void bootmem_init(void)</div><div class='ctx'> #endif /* CONFIG_BLK_DEV_INITRD  */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * arch_mem_init - initialize memory managment subsystem</div><div class='add'>+ *</div><div class='add'>+ *  o plat_mem_setup() detects the memory configuration and will record detected</div><div class='add'>+ *    memory areas using add_memory_region.</div><div class='add'>+ *  o parse_cmdline_early() parses the command line for mem= options which,</div><div class='add'>+ *    iff detected, will override the results of the automatic detection.</div><div class='add'>+ *</div><div class='add'>+ * At this stage the memory configuration of the system is known to the</div><div class='add'>+ * kernel but generic memory managment system is still entirely uninitialized.</div><div class='add'>+ *</div><div class='add'>+ *  o bootmem_init()</div><div class='add'>+ *  o sparse_init()</div><div class='add'>+ *  o paging_init()</div><div class='add'>+ *</div><div class='add'>+ * At this stage the bootmem allocator is ready to use.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: historically plat_mem_setup did the entire platform initialization.</div><div class='add'>+ *       This was rather impractical because it meant plat_mem_setup had to</div><div class='add'>+ * get away without any kind of memory allocator.  To keep old code from</div><div class='add'>+ * breaking plat_setup was just renamed to plat_setup and a second platform</div><div class='add'>+ * initialization hook for anything else was introduced.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern void plat_mem_setup(void);</div><div class='add'>+</div><div class='add'>+static void __init arch_mem_init(char **cmdline_p)</div><div class='add'>+{</div><div class='add'>+	/* call board setup routine */</div><div class='add'>+	plat_mem_setup();</div><div class='add'>+</div><div class='add'>+	strlcpy(command_line, arcs_cmdline, sizeof(command_line));</div><div class='add'>+	strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);</div><div class='add'>+</div><div class='add'>+	*cmdline_p = command_line;</div><div class='add'>+</div><div class='add'>+	parse_cmdline_early();</div><div class='add'>+	bootmem_init();</div><div class='add'>+	sparse_init();</div><div class='add'>+	paging_init();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void resource_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (UNCAC_BASE != IO_BASE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	code_resource.start = virt_to_phys(&amp;_text);</div><div class='ctx'> 	code_resource.end = virt_to_phys(&amp;_etext) - 1;</div><div class='ctx'> 	data_resource.start = virt_to_phys(&amp;_etext);</div><div class='hunk'>@@ -493,8 +539,6 @@ static inline void resource_init(void)</div><div class='ctx'> #undef MAXMEM</div><div class='ctx'> #undef MAXMEM_PFN</div><div class='ctx'> </div><div class='del'>-extern void plat_setup(void);</div><div class='del'>-</div><div class='ctx'> void __init setup_arch(char **cmdline_p)</div><div class='ctx'> {</div><div class='ctx'> 	cpu_probe();</div><div class='hunk'>@@ -509,18 +553,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* call board setup routine */</div><div class='del'>-	plat_setup();</div><div class='add'>+	arch_mem_init(cmdline_p);</div><div class='ctx'> </div><div class='del'>-	strlcpy(command_line, arcs_cmdline, sizeof(command_line));</div><div class='del'>-	strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);</div><div class='del'>-</div><div class='del'>-	*cmdline_p = command_line;</div><div class='del'>-</div><div class='del'>-	parse_cmdline_early();</div><div class='del'>-	bootmem_init();</div><div class='del'>-	sparse_init();</div><div class='del'>-	paging_init();</div><div class='ctx'> 	resource_init();</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	plat_smp_setup();</div><div class='head'>diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h<br/>index ce6cb915c0a7..b1f09d54ebe6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/signal-common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/signal-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/signal-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/signal-common.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)</div><div class='head'>diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c<br/>index 402efd27c79e..6b4d9be31615 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/signal.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1994 - 2000  Ralf Baechle</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c<br/>index 57770902b9ae..93429a4d3012 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/smp-mt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smp-mt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/smp-mt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/smp-mt.c</a></div><div class='hunk'>@@ -130,13 +130,13 @@ irqreturn_t ipi_call_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_resched = {</div><div class='ctx'> 	.handler	= ipi_resched_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "IPI_resched"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_call = {</div><div class='ctx'> 	.handler	= ipi_call_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "IPI_call"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c<br/>index d42f358754ad..221895802dca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/smp.c</a></div><div class='hunk'>@@ -247,6 +247,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	current_thread_info()-&gt;cpu = 0;</div><div class='ctx'> 	smp_tune_scheduling();</div><div class='ctx'> 	plat_prepare_cpus(max_cpus);</div><div class='add'>+#ifndef CONFIG_HOTPLUG_CPU</div><div class='add'>+	cpu_present_map = cpu_possible_map;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* preload SMP state for boot cpu */</div><div class='hunk'>@@ -316,6 +319,32 @@ static void flush_tlb_mm_ipi(void *mm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Special Variant of smp_call_function for use by TLB functions:</div><div class='add'>+ *</div><div class='add'>+ *  o No return value</div><div class='add'>+ *  o collapses to normal function call on UP kernels</div><div class='add'>+ *  o collapses to normal function call on systems with a single shared</div><div class='add'>+ *    primary cache.</div><div class='add'>+ *  o CONFIG_MIPS_MT_SMTC currently implies there is only one physical core.</div><div class='add'>+ */</div><div class='add'>+static inline void smp_on_other_tlbs(void (*func) (void *info), void *info)</div><div class='add'>+{</div><div class='add'>+#ifndef CONFIG_MIPS_MT_SMTC</div><div class='add'>+	smp_call_function(func, info, 1, 1);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smp_on_each_tlb(void (*func) (void *info), void *info)</div><div class='add'>+{</div><div class='add'>+	preempt_disable();</div><div class='add'>+</div><div class='add'>+	smp_on_other_tlbs(func, info);</div><div class='add'>+	func(info);</div><div class='add'>+</div><div class='add'>+	preempt_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * The following tlb flush calls are invoked when old translations are</div><div class='ctx'>  * being torn down, or pte attributes are changing. For single threaded</div><div class='ctx'>  * address spaces, a new context is obtained on the current cpu, and tlb</div><div class='hunk'>@@ -333,7 +362,7 @@ void flush_tlb_mm(struct mm_struct *mm)</div><div class='ctx'> 	preempt_disable();</div><div class='ctx'> </div><div class='ctx'> 	if ((atomic_read(&amp;mm-&gt;mm_users) != 1) || (current-&gt;mm != mm)) {</div><div class='del'>-		smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1, 1);</div><div class='add'>+		smp_on_other_tlbs(flush_tlb_mm_ipi, (void *)mm);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; num_online_cpus(); i++)</div><div class='hunk'>@@ -369,7 +398,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l</div><div class='ctx'> 		fd.vma = vma;</div><div class='ctx'> 		fd.addr1 = start;</div><div class='ctx'> 		fd.addr2 = end;</div><div class='del'>-		smp_call_function(flush_tlb_range_ipi, (void *)&amp;fd, 1, 1);</div><div class='add'>+		smp_on_other_tlbs(flush_tlb_range_ipi, (void *)&amp;fd);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; num_online_cpus(); i++)</div><div class='hunk'>@@ -411,7 +440,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)</div><div class='ctx'> </div><div class='ctx'> 		fd.vma = vma;</div><div class='ctx'> 		fd.addr1 = page;</div><div class='del'>-		smp_call_function(flush_tlb_page_ipi, (void *)&amp;fd, 1, 1);</div><div class='add'>+		smp_on_other_tlbs(flush_tlb_page_ipi, (void *)&amp;fd);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; num_online_cpus(); i++)</div><div class='hunk'>@@ -431,8 +460,7 @@ static void flush_tlb_one_ipi(void *info)</div><div class='ctx'> </div><div class='ctx'> void flush_tlb_one(unsigned long vaddr)</div><div class='ctx'> {</div><div class='del'>-	smp_call_function(flush_tlb_one_ipi, (void *) vaddr, 1, 1);</div><div class='del'>-	local_flush_tlb_one(vaddr);</div><div class='add'>+	smp_on_each_tlb(flush_tlb_one_ipi, (void *) vaddr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct cpu, cpu_devices);</div><div class='hunk'>@@ -442,8 +470,8 @@ static int __init topology_init(void)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	for_each_cpu(cpu) {</div><div class='del'>-		ret = register_cpu(&amp;per_cpu(cpu_devices, cpu), cpu, NULL);</div><div class='add'>+	for_each_present_cpu(cpu) {</div><div class='add'>+		ret = register_cpu(&amp;per_cpu(cpu_devices, cpu), cpu);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			printk(KERN_WARNING "topology_init: register_cpu %d "</div><div class='ctx'> 			       "failed (%d)\n", cpu, ret);</div><div class='head'>diff --git a/arch/mips/kernel/smtc-asm.S b/arch/mips/kernel/smtc-asm.S<br/>index c9d65196d917..4cc3dea36612 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/smtc-asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smtc-asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/smtc-asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/smtc-asm.S</a></div><div class='hunk'>@@ -52,12 +52,12 @@ FEXPORT(__smtc_ipi_vector)</div><div class='ctx'> 	.set	noat</div><div class='ctx'> 	/* Disable thread scheduling to make Status update atomic */</div><div class='ctx'> 	DMT	27					# dmt	k1</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	/* Set EXL */</div><div class='ctx'> 	mfc0	k0,CP0_STATUS</div><div class='ctx'> 	ori	k0,k0,ST0_EXL</div><div class='ctx'> 	mtc0	k0,CP0_STATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	/* Thread scheduling now inhibited by EXL. Restore TE state. */</div><div class='ctx'> 	andi	k1,k1,VPECONTROL_TE</div><div class='ctx'> 	beqz	k1,1f</div><div class='hunk'>@@ -82,7 +82,7 @@ FEXPORT(__smtc_ipi_vector)</div><div class='ctx'> 	li	k1,ST0_CU0</div><div class='ctx'> 	or	k1,k1,k0</div><div class='ctx'> 	mtc0	k1,CP0_STATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	get_saved_sp</div><div class='ctx'> 	/* Interrupting TC will have pre-set values in slots in the new frame */</div><div class='ctx'> 2:	subu	k1,k1,PT_SIZE</div><div class='hunk'>@@ -90,12 +90,13 @@ FEXPORT(__smtc_ipi_vector)</div><div class='ctx'> 	lw	k0,PT_TCSTATUS(k1)</div><div class='ctx'> 	/* Write it to TCStatus to restore CU/KSU/IXMT state */</div><div class='ctx'> 	mtc0	k0,$2,1</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	lw	k0,PT_EPC(k1)</div><div class='ctx'> 	mtc0	k0,CP0_EPC</div><div class='ctx'> 	/* Save all will redundantly recompute the SP, but use it for now */</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	CLI</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	move	a0,sp</div><div class='ctx'> 	/* Function to be invoked passed stack pad slot 5 */</div><div class='ctx'> 	lw	t0,PT_PADSLOT5(sp)</div><div class='hunk'>@@ -116,7 +117,7 @@ LEAF(self_ipi)</div><div class='ctx'> 	mfc0	t0,CP0_TCSTATUS</div><div class='ctx'> 	ori	t1,t0,TCSTATUS_IXMT</div><div class='ctx'> 	mtc0	t1,CP0_TCSTATUS</div><div class='del'>-	ehb</div><div class='add'>+	_ehb</div><div class='ctx'> 	/* We know we're in kernel mode, so prepare stack frame */</div><div class='ctx'> 	subu	t1,sp,PT_SIZE</div><div class='ctx'> 	sw	ra,PT_EPC(t1)</div><div class='head'>diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c<br/>index 2e8e52c135e6..604bcc5cb7c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/smtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/smtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/smtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/smtc.c</a></div><div class='hunk'>@@ -127,7 +127,7 @@ static int __init stlb_disable(char *s)</div><div class='ctx'> static int __init asidmask_set(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	get_option(&amp;str, &amp;asidmask);</div><div class='del'>-	switch(asidmask) {</div><div class='add'>+	switch (asidmask) {</div><div class='ctx'> 	case 0x1:</div><div class='ctx'> 	case 0x3:</div><div class='ctx'> 	case 0x7:</div><div class='hunk'>@@ -249,7 +249,7 @@ void smtc_configure_tlb(void)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Only count if the MMU Type indicated is TLB</div><div class='ctx'> 			 */</div><div class='del'>-			if(((read_vpe_c0_config() &amp; MIPS_CONF_MT) &gt;&gt; 7) == 1) {</div><div class='add'>+			if (((read_vpe_c0_config() &amp; MIPS_CONF_MT) &gt;&gt; 7) == 1) {</div><div class='ctx'> 				config1val = read_vpe_c0_config1();</div><div class='ctx'> 				tlbsiz += ((config1val &gt;&gt; 25) &amp; 0x3f) + 1;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -367,7 +367,7 @@ void mipsmt_prepare_cpus(void)</div><div class='ctx'> 	dvpe();</div><div class='ctx'> 	dmt();</div><div class='ctx'> </div><div class='del'>-	freeIPIq.lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+	spin_lock_init(&amp;freeIPIq.lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We probably don't have as many VPEs as we do SMP "CPUs",</div><div class='hunk'>@@ -375,7 +375,7 @@ void mipsmt_prepare_cpus(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i=0; i&lt;NR_CPUS; i++) {</div><div class='ctx'> 		IPIQ[i].head = IPIQ[i].tail = NULL;</div><div class='del'>-		IPIQ[i].lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+		spin_lock_init(&amp;IPIQ[i].lock);</div><div class='ctx'> 		IPIQ[i].depth = 0;</div><div class='ctx'> 		ipi_timer_latch[i] = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -500,7 +500,7 @@ void mipsmt_prepare_cpus(void)</div><div class='ctx'> 	/* Set up coprocessor affinity CPU mask(s) */</div><div class='ctx'> </div><div class='ctx'> 	for (tc = 0; tc &lt; ntc; tc++) {</div><div class='del'>-		if(cpu_data[tc].options &amp; MIPS_CPU_FPU)</div><div class='add'>+		if (cpu_data[tc].options &amp; MIPS_CPU_FPU)</div><div class='ctx'> 			cpu_set(tc, mt_fpu_cpumask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -577,13 +577,13 @@ void smtc_init_secondary(void)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Start timer on secondary VPEs if necessary.</div><div class='del'>-	 * mips_timer_setup should already have been invoked by init/main</div><div class='add'>+	 * plat_timer_setup has already have been invoked by init/main</div><div class='ctx'> 	 * on "boot" TC.  Like per_cpu_trap_init() hack, this assumes that</div><div class='ctx'> 	 * SMTC init code assigns TCs consdecutively and in ascending order</div><div class='ctx'> 	 * to across available VPEs.</div><div class='ctx'> 	 */</div><div class='del'>-	if(((read_c0_tcbind() &amp; TCBIND_CURTC) != 0)</div><div class='del'>-	&amp;&amp; ((read_c0_tcbind() &amp; TCBIND_CURVPE)</div><div class='add'>+	if (((read_c0_tcbind() &amp; TCBIND_CURTC) != 0) &amp;&amp;</div><div class='add'>+	    ((read_c0_tcbind() &amp; TCBIND_CURVPE)</div><div class='ctx'> 	    != cpu_data[smp_processor_id() - 1].vpe_id)){</div><div class='ctx'> 		write_c0_compare (read_c0_count() + mips_hpt_frequency/HZ);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -757,8 +757,8 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)</div><div class='ctx'> 			write_tc_c0_tchalt(0);</div><div class='ctx'> 			UNLOCK_CORE_PRA();</div><div class='ctx'> 			/* Try to reduce redundant timer interrupt messages */</div><div class='del'>-			if(type == SMTC_CLOCK_TICK) {</div><div class='del'>-			    if(atomic_postincrement(&amp;ipi_timer_latch[cpu])!=0) {</div><div class='add'>+			if (type == SMTC_CLOCK_TICK) {</div><div class='add'>+			    if (atomic_postincrement(&amp;ipi_timer_latch[cpu])!=0){</div><div class='ctx'> 				smtc_ipi_nq(&amp;freeIPIq, pipi);</div><div class='ctx'> 				return;</div><div class='ctx'> 			    }</div><div class='hunk'>@@ -797,7 +797,7 @@ void post_direct_ipi(int cpu, struct smtc_ipi *pipi)</div><div class='ctx'> 	 * CU bit of Status is indicator that TC was</div><div class='ctx'> 	 * already running on a kernel stack...</div><div class='ctx'> 	 */</div><div class='del'>-	if(tcstatus &amp; ST0_CU0)  {</div><div class='add'>+	if (tcstatus &amp; ST0_CU0)  {</div><div class='ctx'> 		/* Note that this "- 1" is pointer arithmetic */</div><div class='ctx'> 		kstack = ((struct pt_regs *)read_tc_gpr_sp()) - 1;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -840,31 +840,31 @@ void ipi_decode(struct pt_regs *regs, struct smtc_ipi *pipi)</div><div class='ctx'> </div><div class='ctx'> 	smtc_ipi_nq(&amp;freeIPIq, pipi);</div><div class='ctx'> 	switch (type_copy) {</div><div class='del'>-		case SMTC_CLOCK_TICK:</div><div class='del'>-			/* Invoke Clock "Interrupt" */</div><div class='del'>-			ipi_timer_latch[dest_copy] = 0;</div><div class='add'>+	case SMTC_CLOCK_TICK:</div><div class='add'>+		/* Invoke Clock "Interrupt" */</div><div class='add'>+		ipi_timer_latch[dest_copy] = 0;</div><div class='ctx'> #ifdef SMTC_IDLE_HOOK_DEBUG</div><div class='del'>-			clock_hang_reported[dest_copy] = 0;</div><div class='add'>+		clock_hang_reported[dest_copy] = 0;</div><div class='ctx'> #endif /* SMTC_IDLE_HOOK_DEBUG */</div><div class='del'>-			local_timer_interrupt(0, NULL, regs);</div><div class='add'>+		local_timer_interrupt(0, NULL, regs);</div><div class='add'>+		break;</div><div class='add'>+	case LINUX_SMP_IPI:</div><div class='add'>+		switch ((int)arg_copy) {</div><div class='add'>+		case SMP_RESCHEDULE_YOURSELF:</div><div class='add'>+			ipi_resched_interrupt(regs);</div><div class='ctx'> 			break;</div><div class='del'>-		case LINUX_SMP_IPI:</div><div class='del'>-			switch ((int)arg_copy) {</div><div class='del'>-			case SMP_RESCHEDULE_YOURSELF:</div><div class='del'>-				ipi_resched_interrupt(regs);</div><div class='del'>-				break;</div><div class='del'>-			case SMP_CALL_FUNCTION:</div><div class='del'>-				ipi_call_interrupt(regs);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				printk("Impossible SMTC IPI Argument 0x%x\n",</div><div class='del'>-					(int)arg_copy);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		case SMP_CALL_FUNCTION:</div><div class='add'>+			ipi_call_interrupt(regs);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk("Impossible SMTC IPI Type 0x%x\n", type_copy);</div><div class='add'>+			printk("Impossible SMTC IPI Argument 0x%x\n",</div><div class='add'>+				(int)arg_copy);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk("Impossible SMTC IPI Type 0x%x\n", type_copy);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -879,7 +879,7 @@ void deferred_smtc_ipi(struct pt_regs *regs)</div><div class='ctx'> 	 * Test is not atomic, but much faster than a dequeue,</div><div class='ctx'> 	 * and the vast majority of invocations will have a null queue.</div><div class='ctx'> 	 */</div><div class='del'>-	if(IPIQ[q].head != NULL) {</div><div class='add'>+	if (IPIQ[q].head != NULL) {</div><div class='ctx'> 		while((pipi = smtc_ipi_dq(&amp;IPIQ[q])) != NULL) {</div><div class='ctx'> 			/* ipi_decode() should be called with interrupts off */</div><div class='ctx'> 			local_irq_save(flags);</div><div class='hunk'>@@ -1002,7 +1002,7 @@ void setup_cross_vpe_interrupts(void)</div><div class='ctx'> 	set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch);</div><div class='ctx'> </div><div class='ctx'> 	irq_ipi.handler = ipi_interrupt;</div><div class='del'>-	irq_ipi.flags = SA_INTERRUPT;</div><div class='add'>+	irq_ipi.flags = IRQF_DISABLED;</div><div class='ctx'> 	irq_ipi.name = "SMTC_IPI";</div><div class='ctx'> </div><div class='ctx'> 	setup_irq_smtc(cpu_ipi_irq, &amp;irq_ipi, (0x100 &lt;&lt; MIPS_CPU_IPI_IRQ));</div><div class='hunk'>@@ -1254,7 +1254,7 @@ void smtc_flush_tlb_asid(unsigned long asid)</div><div class='ctx'> 		tlb_read();</div><div class='ctx'> 		ehb();</div><div class='ctx'> 		ehi = read_c0_entryhi();</div><div class='del'>-		if((ehi &amp; ASID_MASK) == asid) {</div><div class='add'>+		if ((ehi &amp; ASID_MASK) == asid) {</div><div class='ctx'> 		    /*</div><div class='ctx'> 		     * Invalidate only entries with specified ASID,</div><div class='ctx'> 		     * makiing sure all entries differ.</div><div class='head'>diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c<br/>index 8f4fdd94dbd0..0721314db657 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/syscall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/syscall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/syscall.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright (C) 2001 MIPS Technologies, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -276,8 +275,7 @@ void sys_set_thread_area(unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)</div><div class='ctx'> {</div><div class='del'>-	int	tmp, len;</div><div class='del'>-	char	__user *name;</div><div class='add'>+	int	tmp;</div><div class='ctx'> </div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 	case MIPS_ATOMIC_SET:</div><div class='hunk'>@@ -302,7 +300,7 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)</div><div class='ctx'>  *</div><div class='ctx'>  * This is really horribly ugly.</div><div class='ctx'>  */</div><div class='del'>-asmlinkage int sys_ipc (uint call, int first, int second,</div><div class='add'>+asmlinkage int sys_ipc (unsigned int call, int first, int second,</div><div class='ctx'> 			unsigned long third, void __user *ptr, long fifth)</div><div class='ctx'> {</div><div class='ctx'> 	int version, ret;</div><div class='hunk'>@@ -360,18 +358,18 @@ asmlinkage int sys_ipc (uint call, int first, int second,</div><div class='ctx'> 	case SHMAT:</div><div class='ctx'> 		switch (version) {</div><div class='ctx'> 		default: {</div><div class='del'>-			ulong raddr;</div><div class='add'>+			unsigned long raddr;</div><div class='ctx'> 			ret = do_shmat (first, (char __user *) ptr, second,</div><div class='ctx'> 					&amp;raddr);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='del'>-			return put_user (raddr, (ulong __user *) third);</div><div class='add'>+			return put_user (raddr, (unsigned long __user *) third);</div><div class='ctx'> 		}</div><div class='ctx'> 		case 1:	/* iBCS2 emulator entry point */</div><div class='ctx'> 			if (!segment_eq(get_fs(), get_ds()))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			return do_shmat (first, (char __user *) ptr, second,</div><div class='del'>-					 (ulong *) third);</div><div class='add'>+					 (unsigned long *) third);</div><div class='ctx'> 		}</div><div class='ctx'> 	case SHMDT:</div><div class='ctx'> 		return sys_shmdt ((char __user *)ptr);</div><div class='head'>diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c<br/>index 5407b784cd01..1137dd6ea7aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/sysirix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/sysirix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/sysirix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/sysirix.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/resource.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -235,7 +236,6 @@ asmlinkage int irix_prctl(unsigned option, ...)</div><div class='ctx'> #undef DEBUG_PROCGRPS</div><div class='ctx'> </div><div class='ctx'> extern unsigned long irix_mapelf(int fd, struct elf_phdr __user *user_phdrp, int cnt);</div><div class='del'>-extern int getrusage(struct task_struct *p, int who, struct rusage __user *ru);</div><div class='ctx'> extern char *prom_getenv(char *name);</div><div class='ctx'> extern long prom_setenv(char *name, char *value);</div><div class='ctx'> </div><div class='hunk'>@@ -694,7 +694,7 @@ asmlinkage int irix_statfs(const char __user *path,</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	error = vfs_statfs(nd.dentry-&gt;d_inode-&gt;i_sb, &amp;kbuf);</div><div class='add'>+	error = vfs_statfs(nd.dentry, &amp;kbuf);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto dput_and_out;</div><div class='ctx'> </div><div class='hunk'>@@ -732,7 +732,7 @@ asmlinkage int irix_fstatfs(unsigned int fd, struct irix_statfs __user *buf)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	error = vfs_statfs(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb, &amp;kbuf);</div><div class='add'>+	error = vfs_statfs(file-&gt;f_dentry, &amp;kbuf);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_f;</div><div class='ctx'> </div><div class='hunk'>@@ -1360,7 +1360,7 @@ asmlinkage int irix_statvfs(char __user *fname, struct irix_statvfs __user *buf)</div><div class='ctx'> 	error = user_path_walk(fname, &amp;nd);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='del'>-	error = vfs_statfs(nd.dentry-&gt;d_inode-&gt;i_sb, &amp;kbuf);</div><div class='add'>+	error = vfs_statfs(nd.dentry, &amp;kbuf);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto dput_and_out;</div><div class='ctx'> </div><div class='hunk'>@@ -1406,7 +1406,7 @@ asmlinkage int irix_fstatvfs(int fd, struct irix_statvfs __user *buf)</div><div class='ctx'> 		error = -EBADF;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	error = vfs_statfs(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb, &amp;kbuf);</div><div class='add'>+	error = vfs_statfs(file-&gt;f_dentry, &amp;kbuf);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_f;</div><div class='ctx'> </div><div class='hunk'>@@ -1611,7 +1611,7 @@ asmlinkage int irix_statvfs64(char __user *fname, struct irix_statvfs64 __user *</div><div class='ctx'> 	error = user_path_walk(fname, &amp;nd);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out;</div><div class='del'>-	error = vfs_statfs(nd.dentry-&gt;d_inode-&gt;i_sb, &amp;kbuf);</div><div class='add'>+	error = vfs_statfs(nd.dentry, &amp;kbuf);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto dput_and_out;</div><div class='ctx'> </div><div class='hunk'>@@ -1658,7 +1658,7 @@ asmlinkage int irix_fstatvfs64(int fd, struct irix_statvfs __user *buf)</div><div class='ctx'> 		error = -EBADF;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	error = vfs_statfs(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb, &amp;kbuf);</div><div class='add'>+	error = vfs_statfs(file-&gt;f_dentry, &amp;kbuf);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_f;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c<br/>index 13ff4da598cd..170cb67f4ede 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/time.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -567,20 +566,19 @@ asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs)</div><div class='ctx'>  * 2) setup xtime based on rtc_mips_get_time().</div><div class='ctx'>  * 3) choose a appropriate gettimeoffset routine.</div><div class='ctx'>  * 4) calculate a couple of cached variables for later usage</div><div class='del'>- * 5) board_timer_setup() -</div><div class='add'>+ * 5) plat_timer_setup() -</div><div class='ctx'>  *	a) (optional) over-write any choices made above by time_init().</div><div class='ctx'>  *	b) machine specific code should setup the timer irqaction.</div><div class='ctx'>  *	c) enable the timer interrupt</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void (*board_time_init)(void);</div><div class='del'>-void (*board_timer_setup)(struct irqaction *irq);</div><div class='ctx'> </div><div class='ctx'> unsigned int mips_hpt_frequency;</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_irqaction = {</div><div class='ctx'> 	.handler = timer_interrupt,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.name = "timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -719,7 +717,7 @@ void __init time_init(void)</div><div class='ctx'> 	 * to be NULL function so that we are sure the high-level code</div><div class='ctx'> 	 * is not invoked accidentally.</div><div class='ctx'> 	 */</div><div class='del'>-	board_timer_setup(&amp;timer_irqaction);</div><div class='add'>+	plat_timer_setup(&amp;timer_irqaction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define FEBRUARY		2</div><div class='head'>diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c<br/>index 35cb08da3820..954a198494ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/traps.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Copyright (C) 2000, 01 MIPS Technologies, Inc.</div><div class='ctx'>  * Copyright (C) 2002, 2003, 2004, 2005  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -65,7 +64,7 @@ extern asmlinkage void handle_mcheck(void);</div><div class='ctx'> extern asmlinkage void handle_reserved(void);</div><div class='ctx'> </div><div class='ctx'> extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,</div><div class='del'>-	struct mips_fpu_soft_struct *ctx);</div><div class='add'>+	struct mips_fpu_struct *ctx);</div><div class='ctx'> </div><div class='ctx'> void (*board_be_init)(void);</div><div class='ctx'> int (*board_be_handler)(struct pt_regs *regs, int is_fixup);</div><div class='hunk'>@@ -570,6 +569,8 @@ asmlinkage void do_ov(struct pt_regs *regs)</div><div class='ctx'>  */</div><div class='ctx'> asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)</div><div class='ctx'> {</div><div class='add'>+	die_if_kernel("FP exception in kernel code", regs);</div><div class='add'>+</div><div class='ctx'> 	if (fcr31 &amp; FPU_CSR_UNI_X) {</div><div class='ctx'> 		int sig;</div><div class='ctx'> </div><div class='hunk'>@@ -600,8 +601,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)</div><div class='ctx'> 		preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 		/* Run the emulator */</div><div class='del'>-		sig = fpu_emulator_cop1Handler (regs,</div><div class='del'>-			&amp;current-&gt;thread.fpu.soft);</div><div class='add'>+		sig = fpu_emulator_cop1Handler (regs, &amp;current-&gt;thread.fpu);</div><div class='ctx'> </div><div class='ctx'> 		preempt_disable();</div><div class='ctx'> </div><div class='hunk'>@@ -610,7 +610,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)</div><div class='ctx'> 		 * We can't allow the emulated instruction to leave any of</div><div class='ctx'> 		 * the cause bit set in $fcr31.</div><div class='ctx'> 		 */</div><div class='del'>-		current-&gt;thread.fpu.soft.fcr31 &amp;= ~FPU_CSR_ALL_X;</div><div class='add'>+		current-&gt;thread.fpu.fcr31 &amp;= ~FPU_CSR_ALL_X;</div><div class='ctx'> </div><div class='ctx'> 		/* Restore the hardware register state */</div><div class='ctx'> 		restore_fp(current);</div><div class='hunk'>@@ -755,7 +755,7 @@ asmlinkage void do_cpu(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 		if (!cpu_has_fpu) {</div><div class='ctx'> 			int sig = fpu_emulator_cop1Handler(regs,</div><div class='del'>-						&amp;current-&gt;thread.fpu.soft);</div><div class='add'>+						&amp;current-&gt;thread.fpu);</div><div class='ctx'> 			if (sig)</div><div class='ctx'> 				force_sig(sig, current);</div><div class='ctx'> #ifdef CONFIG_MIPS_MT_FPAFF</div><div class='hunk'>@@ -819,46 +819,59 @@ asmlinkage void do_watch(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_mcheck(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	const int field = 2 * sizeof(unsigned long);</div><div class='add'>+	int multi_match = regs-&gt;cp0_status &amp; ST0_TS;</div><div class='add'>+</div><div class='ctx'> 	show_regs(regs);</div><div class='del'>-	dump_tlb_all();</div><div class='add'>+</div><div class='add'>+	if (multi_match) {</div><div class='add'>+		printk("Index   : %0x\n", read_c0_index());</div><div class='add'>+		printk("Pagemask: %0x\n", read_c0_pagemask());</div><div class='add'>+		printk("EntryHi : %0*lx\n", field, read_c0_entryhi());</div><div class='add'>+		printk("EntryLo0: %0*lx\n", field, read_c0_entrylo0());</div><div class='add'>+		printk("EntryLo1: %0*lx\n", field, read_c0_entrylo1());</div><div class='add'>+		printk("\n");</div><div class='add'>+		dump_tlb_all();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	show_code((unsigned int *) regs-&gt;cp0_epc);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some chips may have other causes of machine check (e.g. SB1</div><div class='ctx'> 	 * graduation timer)</div><div class='ctx'> 	 */</div><div class='ctx'> 	panic("Caught Machine Check exception - %scaused by multiple "</div><div class='ctx'> 	      "matching entries in the TLB.",</div><div class='del'>-	      (regs-&gt;cp0_status &amp; ST0_TS) ? "" : "not ");</div><div class='add'>+	      (multi_match) ? "" : "not ");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> asmlinkage void do_mt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int subcode;</div><div class='ctx'> </div><div class='del'>-	die_if_kernel("MIPS MT Thread exception in kernel", regs);</div><div class='del'>-</div><div class='ctx'> 	subcode = (read_vpe_c0_vpecontrol() &amp; VPECONTROL_EXCPT)</div><div class='ctx'> 			&gt;&gt; VPECONTROL_EXCPT_SHIFT;</div><div class='ctx'> 	switch (subcode) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		printk(KERN_ERR "Thread Underflow\n");</div><div class='add'>+		printk(KERN_DEBUG "Thread Underflow\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		printk(KERN_ERR "Thread Overflow\n");</div><div class='add'>+		printk(KERN_DEBUG "Thread Overflow\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		printk(KERN_ERR "Invalid YIELD Qualifier\n");</div><div class='add'>+		printk(KERN_DEBUG "Invalid YIELD Qualifier\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		printk(KERN_ERR "Gating Storage Exception\n");</div><div class='add'>+		printk(KERN_DEBUG "Gating Storage Exception\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		printk(KERN_ERR "YIELD Scheduler Exception\n");</div><div class='add'>+		printk(KERN_DEBUG "YIELD Scheduler Exception\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 5:</div><div class='del'>-		printk(KERN_ERR "Gating Storage Schedulier Exception\n");</div><div class='add'>+		printk(KERN_DEBUG "Gating Storage Schedulier Exception\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "*** UNKNOWN THREAD EXCEPTION %d ***\n",</div><div class='add'>+		printk(KERN_DEBUG "*** UNKNOWN THREAD EXCEPTION %d ***\n",</div><div class='ctx'> 			subcode);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -967,10 +980,10 @@ void ejtag_exception_handler(struct pt_regs *regs)</div><div class='ctx'> 	unsigned long depc, old_epc;</div><div class='ctx'> 	unsigned int debug;</div><div class='ctx'> </div><div class='del'>-	printk("SDBBP EJTAG debug exception - not handled yet, just ignored!\n");</div><div class='add'>+	printk(KERN_DEBUG "SDBBP EJTAG debug exception - not handled yet, just ignored!\n");</div><div class='ctx'> 	depc = read_c0_depc();</div><div class='ctx'> 	debug = read_c0_debug();</div><div class='del'>-	printk("c0_depc = %0*lx, DEBUG = %08x\n", field, depc, debug);</div><div class='add'>+	printk(KERN_DEBUG "c0_depc = %0*lx, DEBUG = %08x\n", field, depc, debug);</div><div class='ctx'> 	if (debug &amp; 0x80000000) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * In branch delay slot.</div><div class='hunk'>@@ -988,7 +1001,7 @@ void ejtag_exception_handler(struct pt_regs *regs)</div><div class='ctx'> 	write_c0_depc(depc);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	printk("\n\n----- Enable EJTAG single stepping ----\n\n");</div><div class='add'>+	printk(KERN_DEBUG "\n\n----- Enable EJTAG single stepping ----\n\n");</div><div class='ctx'> 	write_c0_debug(debug | 0x100);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -1036,7 +1049,7 @@ void *set_except_vector(int n, void *addr)</div><div class='ctx'> 	return (void *)old_handler;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_MIPSR2</div><div class='add'>+#ifdef CONFIG_CPU_MIPSR2_SRS</div><div class='ctx'> /*</div><div class='ctx'>  * MIPSR2 shadow register set allocation</div><div class='ctx'>  * FIXME: SMP...</div><div class='hunk'>@@ -1055,11 +1068,9 @@ static struct shadow_registers {</div><div class='ctx'> </div><div class='ctx'> static void mips_srs_init(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_CPU_MIPSR2_SRS</div><div class='ctx'> 	shadow_registers.sr_supported = ((read_c0_srsctl() &gt;&gt; 26) &amp; 0x0f) + 1;</div><div class='ctx'> 	printk(KERN_INFO "%d MIPSR2 register sets available\n",</div><div class='ctx'> 	       shadow_registers.sr_supported);</div><div class='del'>-#endif</div><div class='ctx'> 	shadow_registers.sr_allocated = 1;	/* Set 0 used by kernel */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1195,14 @@ void *set_vi_handler(int n, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	return set_vi_srs_handler(n, addr, 0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline void mips_srs_init(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_CPU_MIPSR2_SRS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is used by native signal handling</div><div class='hunk'>@@ -1374,9 +1392,7 @@ void __init trap_init(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		ebase = CAC_BASE;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_MIPSR2</div><div class='ctx'> 	mips_srs_init();</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	per_cpu_trap_init();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c<br/>index 5b5a3736cbbc..7e7d54823486 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/unaligned.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/unaligned.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/unaligned.c</a></div><div class='hunk'>@@ -72,7 +72,6 @@</div><div class='ctx'>  *       A store crossing a page boundary might be executed only partially.</div><div class='ctx'>  *       Undo the partial store in this case.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S<br/>index b84d1f9ce28e..0bb9cd889456 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c<br/>index 85d7df7b18e1..9ee0ec2cd067 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/kernel/vpe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/kernel/vpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/kernel/vpe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/kernel/vpe.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * i.e cat spapp &gt;/dev/vpe1.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c<br/>index 2d3472b21ebb..456be8fc961a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lasat/interrupt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/interrupt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lasat/interrupt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lasat/interrupt.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static void end_lasat_irq(unsigned int irq)</div><div class='ctx'> 		enable_lasat_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type lasat_irq_type = {</div><div class='add'>+static struct irq_chip lasat_irq_type = {</div><div class='ctx'> 	.typename = "Lasat",</div><div class='ctx'> 	.startup = startup_lasat_irq,</div><div class='ctx'> 	.shutdown = shutdown_lasat_irq,</div><div class='hunk'>@@ -156,6 +156,6 @@ void __init arch_init_irq(void)</div><div class='ctx'> 		irq_desc[i].status	= IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action	= 0;</div><div class='ctx'> 		irq_desc[i].depth	= 1;</div><div class='del'>-		irq_desc[i].handler	= &amp;lasat_irq_type;</div><div class='add'>+		irq_desc[i].chip	= &amp;lasat_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c<br/>index fc9b0e2a6be1..d425120b0282 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lasat/lasat_board.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/lasat_board.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lasat/lasat_board.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lasat/lasat_board.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Routines specific to the LASAT boards</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;asm/lasat/lasat.h&gt;</div><div class='head'>diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c<br/>index 181bf68175fc..9e22acf03083 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lasat/reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lasat/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lasat/reset.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Reset the LASAT board.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c<br/>index bb70a8240e61..0ffc43c600d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lasat/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lasat/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lasat/setup.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Lasat specific setup.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -116,12 +115,9 @@ static void lasat_time_init(void)</div><div class='ctx'> 	mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lasat_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	write_c0_compare(</div><div class='del'>-		read_c0_count() +</div><div class='del'>-		mips_hpt_frequency / HZ);</div><div class='add'>+	write_c0_compare( read_c0_count() + mips_hpt_frequency / HZ);</div><div class='ctx'> 	change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -155,7 +151,7 @@ void __init serial_init(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	lasat_misc  = &amp;lasat_misc_info[mips_machtype];</div><div class='hunk'>@@ -171,7 +167,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	lasat_reboot_setup();</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = lasat_time_init;</div><div class='del'>-	board_timer_setup = lasat_timer_setup;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DS1603</div><div class='ctx'> 	ds1603 = &amp;ds_defs[mips_machtype];</div><div class='head'>diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c<br/>index e3d5aaa90f0d..6dd7ae1b7c25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lasat/sysctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lasat/sysctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lasat/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lasat/sysctl.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/lasat/lasat.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='head'>diff --git a/arch/mips/lib-32/dump_tlb.c b/arch/mips/lib-32/dump_tlb.c<br/>index c49a925d0169..6a68deb51aae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib-32/dump_tlb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib-32/dump_tlb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib-32/dump_tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib-32/dump_tlb.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.</div><div class='ctx'>  * Copyright (C) 1999 by Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/lib-64/dump_tlb.c b/arch/mips/lib-64/dump_tlb.c<br/>index 11a5f015f040..be8261be679b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib-64/dump_tlb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib-64/dump_tlb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib-64/dump_tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib-64/dump_tlb.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1994, 1995 by Waldorf Electronics, written by Ralf Baechle.</div><div class='ctx'>  * Copyright (C) 1999 by Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile<br/>index cf12caf80774..b225543f5302 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib/Makefile</a></div><div class='hunk'>@@ -7,4 +7,7 @@ lib-y	+= csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \</div><div class='ctx'> </div><div class='ctx'> obj-y	+= iomap.o</div><div class='ctx'> </div><div class='add'>+# libgcc-style stuff needed in the kernel</div><div class='add'>+lib-y += ashldi3.o ashrdi3.o lshrdi3.o</div><div class='add'>+</div><div class='ctx'> EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/lib/ashldi3.c b/arch/mips/lib/ashldi3.c<br/>new file mode 100644<br/>index 000000000000..beb80f316095<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/ashldi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib/ashldi3.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "libgcc.h"</div><div class='add'>+</div><div class='add'>+long long __ashldi3(long long u, word_type b)</div><div class='add'>+{</div><div class='add'>+	DWunion uu, w;</div><div class='add'>+	word_type bm;</div><div class='add'>+</div><div class='add'>+	if (b == 0)</div><div class='add'>+		return u;</div><div class='add'>+</div><div class='add'>+	uu.ll = u;</div><div class='add'>+	bm = 32 - b;</div><div class='add'>+</div><div class='add'>+	if (bm &lt;= 0) {</div><div class='add'>+		w.s.low = 0;</div><div class='add'>+		w.s.high = (unsigned int) uu.s.low &lt;&lt; -bm;</div><div class='add'>+	} else {</div><div class='add'>+		const unsigned int carries = (unsigned int) uu.s.low &gt;&gt; bm;</div><div class='add'>+</div><div class='add'>+		w.s.low = (unsigned int) uu.s.low &lt;&lt; b;</div><div class='add'>+		w.s.high = ((unsigned int) uu.s.high &lt;&lt; b) | carries;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return w.ll;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(__ashldi3);</div><div class='head'>diff --git a/arch/mips/lib/ashrdi3.c b/arch/mips/lib/ashrdi3.c<br/>new file mode 100644<br/>index 000000000000..c884a912b660<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/ashrdi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib/ashrdi3.c</a></div><div class='hunk'>@@ -0,0 +1,31 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "libgcc.h"</div><div class='add'>+</div><div class='add'>+long long __ashrdi3(long long u, word_type b)</div><div class='add'>+{</div><div class='add'>+	DWunion uu, w;</div><div class='add'>+	word_type bm;</div><div class='add'>+</div><div class='add'>+	if (b == 0)</div><div class='add'>+		return u;</div><div class='add'>+</div><div class='add'>+	uu.ll = u;</div><div class='add'>+	bm = 32 - b;</div><div class='add'>+</div><div class='add'>+	if (bm &lt;= 0) {</div><div class='add'>+		/* w.s.high = 1..1 or 0..0 */</div><div class='add'>+		w.s.high =</div><div class='add'>+		    uu.s.high &gt;&gt; 31;</div><div class='add'>+		w.s.low = uu.s.high &gt;&gt; -bm;</div><div class='add'>+	} else {</div><div class='add'>+		const unsigned int carries = (unsigned int) uu.s.high &lt;&lt; bm;</div><div class='add'>+</div><div class='add'>+		w.s.high = uu.s.high &gt;&gt; b;</div><div class='add'>+		w.s.low = ((unsigned int) uu.s.low &gt;&gt; b) | carries;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return w.ll;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(__ashrdi3);</div><div class='head'>diff --git a/arch/mips/lib/libgcc.h b/arch/mips/lib/libgcc.h<br/>new file mode 100644<br/>index 000000000000..3f19d1c5d942<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/libgcc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib/libgcc.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+#ifndef __ASM_LIBGCC_H</div><div class='add'>+#define __ASM_LIBGCC_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+typedef int word_type __attribute__ ((mode (__word__)));</div><div class='add'>+</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+struct DWstruct {</div><div class='add'>+	int high, low;</div><div class='add'>+};</div><div class='add'>+#elif defined(__LITTLE_ENDIAN)</div><div class='add'>+struct DWstruct {</div><div class='add'>+	int low, high;</div><div class='add'>+};</div><div class='add'>+#else</div><div class='add'>+#error I feel sick.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef union</div><div class='add'>+{</div><div class='add'>+	struct DWstruct s;</div><div class='add'>+	long long ll;</div><div class='add'>+} DWunion;</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_LIBGCC_H */</div><div class='head'>diff --git a/arch/mips/lib/lshrdi3.c b/arch/mips/lib/lshrdi3.c<br/>new file mode 100644<br/>index 000000000000..dcf8d6810b7c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/lshrdi3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib/lshrdi3.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "libgcc.h"</div><div class='add'>+</div><div class='add'>+long long __lshrdi3(long long u, word_type b)</div><div class='add'>+{</div><div class='add'>+	DWunion uu, w;</div><div class='add'>+	word_type bm;</div><div class='add'>+</div><div class='add'>+	if (b == 0)</div><div class='add'>+		return u;</div><div class='add'>+</div><div class='add'>+	uu.ll = u;</div><div class='add'>+	bm = 32 - b;</div><div class='add'>+</div><div class='add'>+	if (bm &lt;= 0) {</div><div class='add'>+		w.s.high = 0;</div><div class='add'>+		w.s.low = (unsigned int) uu.s.high &gt;&gt; -bm;</div><div class='add'>+	} else {</div><div class='add'>+		const unsigned int carries = (unsigned int) uu.s.high &lt;&lt; bm;</div><div class='add'>+</div><div class='add'>+		w.s.high = (unsigned int) uu.s.high &gt;&gt; b;</div><div class='add'>+		w.s.low = ((unsigned int) uu.s.low &gt;&gt; b) | carries;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return w.ll;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(__lshrdi3);</div><div class='head'>diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S<br/>index 7f9aafa4d80e..a526c62cb76a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/lib/memcpy.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/lib/memcpy.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/lib/memcpy.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/lib/memcpy.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Mnemonic names for arguments to memcpy/__copy_user</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Hack to resolve longstanding prefetch issue</div><div class='head'>diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c<br/>index aa5818a0d884..3f0d5d26d506 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/cp1emu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/cp1emu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/cp1emu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/cp1emu.c</a></div><div class='hunk'>@@ -60,15 +60,15 @@</div><div class='ctx'> </div><div class='ctx'> /* Function which emulates a floating point instruction. */</div><div class='ctx'> </div><div class='del'>-static int fpu_emu(struct pt_regs *, struct mips_fpu_soft_struct *,</div><div class='add'>+static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,</div><div class='ctx'> 	mips_instruction);</div><div class='ctx'> </div><div class='ctx'> #if __mips &gt;= 4 &amp;&amp; __mips != 32</div><div class='ctx'> static int fpux_emu(struct pt_regs *,</div><div class='del'>-	struct mips_fpu_soft_struct *, mips_instruction);</div><div class='add'>+	struct mips_fpu_struct *, mips_instruction);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Further private data for which no space exists in mips_fpu_soft_struct */</div><div class='add'>+/* Further private data for which no space exists in mips_fpu_struct */</div><div class='ctx'> </div><div class='ctx'> struct mips_fpu_emulator_stats fpuemustats;</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +203,7 @@ static int isBranchInstr(mips_instruction * i)</div><div class='ctx'>  * Two instructions if the instruction is in a branch delay slot.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx)</div><div class='add'>+static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	mips_instruction ir;</div><div class='ctx'> 	void * emulpc, *contpc;</div><div class='hunk'>@@ -595,7 +595,7 @@ DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub,);</div><div class='ctx'> DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg);</div><div class='ctx'> DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg);</div><div class='ctx'> </div><div class='del'>-static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,</div><div class='add'>+static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,</div><div class='ctx'> 	mips_instruction ir)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned rcsr = 0;	/* resulting csr */</div><div class='hunk'>@@ -759,7 +759,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,</div><div class='ctx'> /*</div><div class='ctx'>  * Emulate a single COP1 arithmetic instruction.</div><div class='ctx'>  */</div><div class='del'>-static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,</div><div class='add'>+static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,</div><div class='ctx'> 	mips_instruction ir)</div><div class='ctx'> {</div><div class='ctx'> 	int rfmt;		/* resulting format */</div><div class='hunk'>@@ -1233,8 +1233,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_soft_struct *ctx,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int fpu_emulator_cop1Handler(struct pt_regs *xcp,</div><div class='del'>-	struct mips_fpu_soft_struct *ctx)</div><div class='add'>+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long oldepc, prevepc;</div><div class='ctx'> 	mips_instruction insn;</div><div class='head'>diff --git a/arch/mips/math-emu/dp_fint.c b/arch/mips/math-emu/dp_fint.c<br/>index a1962eb460f8..39a71de16f47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/dp_fint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/dp_fint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/dp_fint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/dp_fint.c</a></div><div class='hunk'>@@ -29,7 +29,9 @@</div><div class='ctx'> </div><div class='ctx'> ieee754dp ieee754dp_fint(int x)</div><div class='ctx'> {</div><div class='del'>-	COMPXDP;</div><div class='add'>+	u64 xm;</div><div class='add'>+	int xe;</div><div class='add'>+	int xs;</div><div class='ctx'> </div><div class='ctx'> 	CLEARCX;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/math-emu/dp_flong.c b/arch/mips/math-emu/dp_flong.c<br/>index eae90a866aa1..f08f223e488a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/dp_flong.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/dp_flong.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/dp_flong.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/dp_flong.c</a></div><div class='hunk'>@@ -29,7 +29,9 @@</div><div class='ctx'> </div><div class='ctx'> ieee754dp ieee754dp_flong(s64 x)</div><div class='ctx'> {</div><div class='del'>-	COMPXDP;</div><div class='add'>+	u64 xm;</div><div class='add'>+	int xe;</div><div class='add'>+	int xs;</div><div class='ctx'> </div><div class='ctx'> 	CLEARCX;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/math-emu/ieee754.h b/arch/mips/math-emu/ieee754.h<br/>index 171f177c0f88..dd917332792c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/ieee754.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/ieee754.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/ieee754.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/ieee754.h</a></div><div class='hunk'>@@ -329,7 +329,7 @@ struct _ieee754_csr {</div><div class='ctx'> 	unsigned pad0:7;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='del'>-#define ieee754_csr (*(struct _ieee754_csr *)(&amp;current-&gt;thread.fpu.soft.fcr31))</div><div class='add'>+#define ieee754_csr (*(struct _ieee754_csr *)(&amp;current-&gt;thread.fpu.fcr31))</div><div class='ctx'> </div><div class='ctx'> static inline unsigned ieee754_getrm(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c<br/>index d187ab71c2ff..5b3390f64917 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/kernel_linkage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/kernel_linkage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/kernel_linkage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/kernel_linkage.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * manipulation primitives for the Algorithmics MIPS</div><div class='ctx'>  * FPU Emulator</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/signal.h&gt;</div><div class='hunk'>@@ -39,9 +38,9 @@ void fpu_emulator_init_fpu(void)</div><div class='ctx'> 		printk("Algorithmics/MIPS FPU Emulator v1.5\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	current-&gt;thread.fpu.soft.fcr31 = 0;</div><div class='add'>+	current-&gt;thread.fpu.fcr31 = 0;</div><div class='ctx'> 	for (i = 0; i &lt; 32; i++) {</div><div class='del'>-		current-&gt;thread.fpu.soft.fpr[i] = SIGNALLING_NAN;</div><div class='add'>+		current-&gt;thread.fpu.fpr[i] = SIGNALLING_NAN;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -59,10 +58,9 @@ int fpu_emulator_save_context(struct sigcontext *sc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32; i++) {</div><div class='ctx'> 		err |=</div><div class='del'>-		    __put_user(current-&gt;thread.fpu.soft.fpr[i],</div><div class='del'>-			       &amp;sc-&gt;sc_fpregs[i]);</div><div class='add'>+		    __put_user(current-&gt;thread.fpu.fpr[i], &amp;sc-&gt;sc_fpregs[i]);</div><div class='ctx'> 	}</div><div class='del'>-	err |= __put_user(current-&gt;thread.fpu.soft.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='add'>+	err |= __put_user(current-&gt;thread.fpu.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -74,10 +72,9 @@ int fpu_emulator_restore_context(struct sigcontext *sc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32; i++) {</div><div class='ctx'> 		err |=</div><div class='del'>-		    __get_user(current-&gt;thread.fpu.soft.fpr[i],</div><div class='del'>-			       &amp;sc-&gt;sc_fpregs[i]);</div><div class='add'>+		    __get_user(current-&gt;thread.fpu.fpr[i], &amp;sc-&gt;sc_fpregs[i]);</div><div class='ctx'> 	}</div><div class='del'>-	err |= __get_user(current-&gt;thread.fpu.soft.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='add'>+	err |= __get_user(current-&gt;thread.fpu.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -94,10 +91,9 @@ int fpu_emulator_save_context32(struct sigcontext32 *sc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32; i+=2) {</div><div class='ctx'> 		err |=</div><div class='del'>-		    __put_user(current-&gt;thread.fpu.soft.fpr[i],</div><div class='del'>-			       &amp;sc-&gt;sc_fpregs[i]);</div><div class='add'>+		    __put_user(current-&gt;thread.fpu.fpr[i], &amp;sc-&gt;sc_fpregs[i]);</div><div class='ctx'> 	}</div><div class='del'>-	err |= __put_user(current-&gt;thread.fpu.soft.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='add'>+	err |= __put_user(current-&gt;thread.fpu.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -109,10 +105,9 @@ int fpu_emulator_restore_context32(struct sigcontext32 *sc)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32; i+=2) {</div><div class='ctx'> 		err |=</div><div class='del'>-		    __get_user(current-&gt;thread.fpu.soft.fpr[i],</div><div class='del'>-			       &amp;sc-&gt;sc_fpregs[i]);</div><div class='add'>+		    __get_user(current-&gt;thread.fpu.fpr[i], &amp;sc-&gt;sc_fpregs[i]);</div><div class='ctx'> 	}</div><div class='del'>-	err |= __get_user(current-&gt;thread.fpu.soft.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='add'>+	err |= __get_user(current-&gt;thread.fpu.fcr31, &amp;sc-&gt;sc_fpc_csr);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/math-emu/sp_fint.c b/arch/mips/math-emu/sp_fint.c<br/>index 7aac13afb09a..e88e125e01c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/sp_fint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/sp_fint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/sp_fint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/sp_fint.c</a></div><div class='hunk'>@@ -29,7 +29,9 @@</div><div class='ctx'> </div><div class='ctx'> ieee754sp ieee754sp_fint(int x)</div><div class='ctx'> {</div><div class='del'>-	COMPXSP;</div><div class='add'>+	unsigned xm;</div><div class='add'>+	int xe;</div><div class='add'>+	int xs;</div><div class='ctx'> </div><div class='ctx'> 	CLEARCX;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/math-emu/sp_flong.c b/arch/mips/math-emu/sp_flong.c<br/>index 3d6c1d11c178..26d6919a269a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/math-emu/sp_flong.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/math-emu/sp_flong.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/math-emu/sp_flong.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/math-emu/sp_flong.c</a></div><div class='hunk'>@@ -29,7 +29,9 @@</div><div class='ctx'> </div><div class='ctx'> ieee754sp ieee754sp_flong(s64 x)</div><div class='ctx'> {</div><div class='del'>-	COMPXDP;		/* &lt;--- need 64-bit mantissa temp */</div><div class='add'>+	u64 xm;		/* &lt;--- need 64-bit mantissa temp */</div><div class='add'>+	int xe;</div><div class='add'>+	int xs;</div><div class='ctx'> </div><div class='ctx'> 	CLEARCX;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c<br/>index db53950b7cfb..fb25e0377f11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/atlas/atlas_int.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/atlas/atlas_int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/atlas/atlas_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/atlas/atlas_int.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ static void end_atlas_irq(unsigned int irq)</div><div class='ctx'> 		enable_atlas_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type atlas_irq_type = {</div><div class='add'>+static struct irq_chip atlas_irq_type = {</div><div class='ctx'> 	.typename = "Atlas",</div><div class='ctx'> 	.startup = startup_atlas_irq,</div><div class='ctx'> 	.shutdown = shutdown_atlas_irq,</div><div class='hunk'>@@ -215,7 +215,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 		irq_desc[i].status	= IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action	= 0;</div><div class='ctx'> 		irq_desc[i].depth	= 1;</div><div class='del'>-		irq_desc[i].handler	= &amp;atlas_irq_type;</div><div class='add'>+		irq_desc[i].chip	= &amp;atlas_irq_type;</div><div class='ctx'> 		spin_lock_init(&amp;irq_desc[i].lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c<br/>index c20d401ecf80..9871a91fdb07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/atlas/atlas_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/atlas/atlas_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/atlas/atlas_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/atlas/atlas_setup.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -36,7 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> extern void mips_reboot_setup(void);</div><div class='ctx'> extern void mips_time_init(void);</div><div class='del'>-extern void mips_timer_setup(struct irqaction *irq);</div><div class='ctx'> extern unsigned long mips_rtc_get_time(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='hunk'>@@ -50,7 +48,7 @@ const char *get_system_type(void)</div><div class='ctx'> 	return "MIPS Atlas";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	mips_pcibios_init();</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +62,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	mips_reboot_setup();</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = mips_time_init;</div><div class='del'>-	board_timer_setup = mips_timer_setup;</div><div class='ctx'> 	rtc_mips_get_time = mips_rtc_get_time;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c<br/>index df4e94735604..58a0fe883591 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/generic/init.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * PROM library initialisation code.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c<br/>index bc4d093685bb..be80c5dd4a0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/generic/memory.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * PROM library functions for acquiring/using memory descriptors given to</div><div class='ctx'>  * us from the YAMON.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -48,34 +47,45 @@ static char *mtypes[3] = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* determined physical memory size, not overridden by command line args  */</div><div class='add'>+unsigned long physical_memsize = 0L;</div><div class='add'>+</div><div class='ctx'> struct prom_pmemblock * __init prom_getmdesc(void)</div><div class='ctx'> {</div><div class='ctx'> 	char *memsize_str;</div><div class='ctx'> 	unsigned int memsize;</div><div class='ctx'> 	char cmdline[CL_SIZE], *ptr;</div><div class='ctx'> </div><div class='del'>-	/* Check the command line first for a memsize directive */</div><div class='add'>+	/* otherwise look in the environment */</div><div class='add'>+	memsize_str = prom_getenv("memsize");</div><div class='add'>+	if (!memsize_str) {</div><div class='add'>+		prom_printf("memsize not set in boot prom, set to default (32Mb)\n");</div><div class='add'>+		physical_memsize = 0x02000000;</div><div class='add'>+	} else {</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+		prom_printf("prom_memsize = %s\n", memsize_str);</div><div class='add'>+#endif</div><div class='add'>+		physical_memsize = simple_strtol(memsize_str, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CPU_BIG_ENDIAN</div><div class='add'>+	/* SOC-it swaps, or perhaps doesn't swap, when DMA'ing the last</div><div class='add'>+	   word of physical memory */</div><div class='add'>+	physical_memsize -= PAGE_SIZE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Check the command line for a memsize directive that overrides</div><div class='add'>+	   the physical/default amount */</div><div class='ctx'> 	strcpy(cmdline, arcs_cmdline);</div><div class='ctx'> 	ptr = strstr(cmdline, "memsize=");</div><div class='ctx'> 	if (ptr &amp;&amp; (ptr != cmdline) &amp;&amp; (*(ptr - 1) != ' '))</div><div class='ctx'> 		ptr = strstr(ptr, " memsize=");</div><div class='ctx'> </div><div class='del'>-	if (ptr) {</div><div class='add'>+	if (ptr)</div><div class='ctx'> 		memsize = memparse(ptr + 8, &amp;ptr);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* otherwise look in the environment */</div><div class='del'>-		memsize_str = prom_getenv("memsize");</div><div class='del'>-		if (!memsize_str) {</div><div class='del'>-			prom_printf("memsize not set in boot prom, set to default (32Mb)\n");</div><div class='del'>-			memsize = 0x02000000;</div><div class='del'>-		} else {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-			prom_printf("prom_memsize = %s\n", memsize_str);</div><div class='del'>-#endif</div><div class='del'>-			memsize = simple_strtol(memsize_str, NULL, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		memsize = physical_memsize;</div><div class='add'>+</div><div class='ctx'> 	memset(mdesc, 0, sizeof(mdesc));</div><div class='ctx'> </div><div class='ctx'> 	mdesc[0].type = yamon_dontuse;</div><div class='head'>diff --git a/arch/mips/mips-boards/generic/printf.c b/arch/mips/mips-boards/generic/printf.c<br/>index 2c1ab1f19fdc..1a711bd79b51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/printf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/printf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/printf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/generic/printf.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Putting things on the screen/serial line using YAMONs facilities.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='head'>diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c<br/>index 7213c395fb6b..0996ba368b2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/generic/reset.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Reset the MIPS boards.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c<br/>index a9f6124b3a22..557bf961f36a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/generic/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/generic/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/generic/time.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -229,9 +228,7 @@ unsigned long __init mips_rtc_get_time(void)</div><div class='ctx'> </div><div class='ctx'> void __init mips_time_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int est_freq, flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	unsigned int est_freq;</div><div class='ctx'> </div><div class='ctx'>         /* Set Data mode - binary. */</div><div class='ctx'>         CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);</div><div class='hunk'>@@ -242,11 +239,9 @@ void __init mips_time_init(void)</div><div class='ctx'> 	       (est_freq%1000000)*100/1000000);</div><div class='ctx'> </div><div class='ctx'>         cpu_khz = est_freq / 1000;</div><div class='del'>-</div><div class='del'>-	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init mips_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_has_veic) {</div><div class='ctx'> 		set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);</div><div class='head'>diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c<br/>index b8488aab6df1..ab460f805bef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/malta/malta_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/malta/malta_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/malta/malta_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/malta/malta_setup.c</a></div><div class='hunk'>@@ -15,12 +15,11 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='hunk'>@@ -45,7 +44,6 @@</div><div class='ctx'> </div><div class='ctx'> extern void mips_reboot_setup(void);</div><div class='ctx'> extern void mips_time_init(void);</div><div class='del'>-extern void mips_timer_setup(struct irqaction *irq);</div><div class='ctx'> extern unsigned long mips_rtc_get_time(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='hunk'>@@ -53,11 +51,11 @@ extern void kgdb_config(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct resource standard_io_resources[] = {</div><div class='del'>-	{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY },</div><div class='del'>-	{ "timer", 0x40, 0x5f, IORESOURCE_BUSY },</div><div class='del'>-	{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },</div><div class='del'>-	{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },</div><div class='del'>-	{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },</div><div class='add'>+	{ .name = "dma1", .start = 0x00, .end = 0x1f, .flags = IORESOURCE_BUSY },</div><div class='add'>+	{ .name = "timer", .start = 0x40, .end = 0x5f, .flags = IORESOURCE_BUSY },</div><div class='add'>+	{ .name = "keyboard", .start = 0x60, .end = 0x6f, .flags = IORESOURCE_BUSY },</div><div class='add'>+	{ .name = "dma page reg", .start = 0x80, .end = 0x8f, .flags = IORESOURCE_BUSY },</div><div class='add'>+	{ .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD</div><div class='hunk'>@@ -111,7 +109,7 @@ void __init fd_activate(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -224,6 +222,5 @@ void __init plat_setup(void)</div><div class='ctx'> 	mips_reboot_setup();</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = mips_time_init;</div><div class='del'>-	board_timer_setup = mips_timer_setup;</div><div class='ctx'> 	rtc_mips_get_time = mips_rtc_get_time;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/mips-boards/malta/malta_smp.c b/arch/mips/mips-boards/malta/malta_smp.c<br/>index 6c6c8eeedbce..cf967170fe29 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/malta/malta_smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/malta/malta_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/malta/malta_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/malta/malta_smp.c</a></div><div class='hunk'>@@ -34,25 +34,6 @@ void core_send_ipi(int cpu, unsigned int action)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Detect available CPUs/VPEs/TCs and populate phys_cpu_present_map</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init prom_build_cpu_map(void)</div><div class='del'>-{</div><div class='del'>-	int nextslot;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * As of November, 2004, MIPSsim only simulates one core</div><div class='del'>-	 * at a time.  However, that core may be a MIPS MT core</div><div class='del'>-	 * with multiple virtual processors and thread contexts.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (read_c0_config3() &amp; (1&lt;&lt;2)) {</div><div class='del'>-		nextslot = mipsmt_build_cpu_map(1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Platform "CPU" startup hook</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c<br/>index 4266ce445174..a189dec7c7bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sead/sead_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sead/sead_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sead/sead_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/sead/sead_setup.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * SEAD specific setup.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -36,7 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> extern void mips_reboot_setup(void);</div><div class='ctx'> extern void mips_time_init(void);</div><div class='del'>-extern void mips_timer_setup(struct irqaction *irq);</div><div class='ctx'> </div><div class='ctx'> static void __init serial_init(void);</div><div class='ctx'> </div><div class='hunk'>@@ -45,14 +43,13 @@ const char *get_system_type(void)</div><div class='ctx'> 	return "MIPS SEAD";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	ioport_resource.end = 0x7fffffff;</div><div class='ctx'> </div><div class='ctx'> 	serial_init ();</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = mips_time_init;</div><div class='del'>-	board_timer_setup = mips_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	mips_reboot_setup();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/mips-boards/sim/Makefile b/arch/mips/mips-boards/sim/Makefile<br/>index 5b977de4ecff..a12e32aafde0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/sim/Makefile</a></div><div class='hunk'>@@ -15,6 +15,5 @@</div><div class='ctx'> # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y := sim_setup.o sim_mem.o sim_time.o sim_printf.o sim_int.o sim_irq.o \</div><div class='del'>-	sim_cmdline.o</div><div class='add'>+obj-y := sim_setup.o sim_mem.o sim_time.o sim_printf.o sim_int.o sim_cmdline.o</div><div class='ctx'> obj-$(CONFIG_SMP) += sim_smp.o</div><div class='head'>diff --git a/arch/mips/mips-boards/sim/sim_IRQ.c b/arch/mips/mips-boards/sim/sim_IRQ.c<br/>deleted file mode 100644<br/>index 5b84c7fe1022..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_IRQ.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_IRQ.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Carsten Langgaard, carstenl@mips.com</div><div class='del'>- * Copyright (C) 1999, 2000 MIPS Technologies, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='del'>- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Interrupt exception dispatch code.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/regdef.h&gt;</div><div class='del'>-#include &lt;asm/stackframe.h&gt;</div><div class='del'>-</div><div class='del'>-/* A lot of complication here is taken away because:</div><div class='del'>- *</div><div class='del'>- * 1) We handle one interrupt and return, sitting in a loop and moving across</div><div class='del'>- *    all the pending IRQ bits in the cause register is _NOT_ the answer, the</div><div class='del'>- *    common case is one pending IRQ so optimize in that direction.</div><div class='del'>- *</div><div class='del'>- * 2) We need not check against bits in the status register IRQ mask, that</div><div class='del'>- *    would make this routine slow as hell.</div><div class='del'>- *</div><div class='del'>- * 3) Linux only thinks in terms of all IRQs on or all IRQs off, nothing in</div><div class='del'>- *    between like BSD spl() brain-damage.</div><div class='del'>- *</div><div class='del'>- * Furthermore, the IRQs on the MIPS board look basically (barring software</div><div class='del'>- * IRQs which we don't use at all and all external interrupt sources are</div><div class='del'>- * combined together on hardware interrupt 0 (MIPS IRQ 2)) like:</div><div class='del'>- *</div><div class='del'>- *	MIPS IRQ	Source</div><div class='del'>- *      --------        ------</div><div class='del'>- *             0	Software (ignored)</div><div class='del'>- *             1        Software (ignored)</div><div class='del'>- *             2        Combined hardware interrupt (hw0)</div><div class='del'>- *             3        Hardware (ignored)</div><div class='del'>- *             4        Hardware (ignored)</div><div class='del'>- *             5        Hardware (ignored)</div><div class='del'>- *             6        Hardware (ignored)</div><div class='del'>- *             7        R4k timer (what we use)</div><div class='del'>- *</div><div class='del'>- * Note: On the SEAD board thing are a little bit different.</div><div class='del'>- *       Here IRQ 2 (hw0) is wired to the UART0 and IRQ 3 (hw1) is wired</div><div class='del'>- *       wired to UART1.</div><div class='del'>- *</div><div class='del'>- * We handle the IRQ according to _our_ priority which is:</div><div class='del'>- *</div><div class='del'>- * Highest ----     R4k Timer</div><div class='del'>- * Lowest  ----     Combined hardware interrupt</div><div class='del'>- *</div><div class='del'>- * then we just return, if multiple IRQs are pending then we will just take</div><div class='del'>- * another exception, big deal.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	.text</div><div class='del'>-	.set	noreorder</div><div class='del'>-	.set	noat</div><div class='del'>-	.align	5</div><div class='del'>-	NESTED(mipsIRQ, PT_SIZE, sp)</div><div class='del'>-	SAVE_ALL</div><div class='del'>-	CLI</div><div class='del'>-	.set	at</div><div class='del'>-</div><div class='del'>-	mfc0	s0, CP0_CAUSE		# get irq bits</div><div class='del'>-	mfc0	s1, CP0_STATUS		# get irq mask</div><div class='del'>-	and	s0, s1</div><div class='del'>-</div><div class='del'>-	/* First we check for r4k counter/timer IRQ. */</div><div class='del'>-	andi	a0, s0, CAUSEF_IP7</div><div class='del'>-	beq	a0, zero, 1f</div><div class='del'>-	 andi	a0, s0, CAUSEF_IP2	# delay slot, check hw0 interrupt</div><div class='del'>-</div><div class='del'>-	/* Wheee, a timer interrupt. */</div><div class='del'>-	move	a0, sp</div><div class='del'>-	jal	mips_timer_interrupt</div><div class='del'>-	 nop</div><div class='del'>-</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop</div><div class='del'>-</div><div class='del'>-1:</div><div class='del'>-#if defined(CONFIG_MIPS_SEAD)</div><div class='del'>-	beq	a0, zero, 1f</div><div class='del'>-	 andi	a0, s0, CAUSEF_IP3	# delay slot, check hw1 interrupt</div><div class='del'>-#else</div><div class='del'>-	beq	a0, zero, 1f		# delay slot, check hw3 interrupt</div><div class='del'>-	 andi	a0, s0, CAUSEF_IP5</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Wheee, combined hardware level zero interrupt. */</div><div class='del'>-#if defined(CONFIG_MIPS_ATLAS)</div><div class='del'>-	jal	atlas_hw0_irqdispatch</div><div class='del'>-#elif defined(CONFIG_MIPS_MALTA)</div><div class='del'>-	jal	malta_hw0_irqdispatch</div><div class='del'>-#elif defined(CONFIG_MIPS_SEAD)</div><div class='del'>-	jal	sead_hw0_irqdispatch</div><div class='del'>-#else</div><div class='del'>-#error "MIPS board not supported\n"</div><div class='del'>-#endif</div><div class='del'>-	 move	a0, sp			# delay slot</div><div class='del'>-</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop				# delay slot</div><div class='del'>-</div><div class='del'>-1:</div><div class='del'>-#if defined(CONFIG_MIPS_SEAD)</div><div class='del'>-	beq	a0, zero, 1f</div><div class='del'>-	 andi	a0, s0, CAUSEF_IP5	# delay slot, check hw3 interrupt</div><div class='del'>-	jal	sead_hw1_irqdispatch</div><div class='del'>-	 move	a0, sp			# delay slot</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop				# delay slot</div><div class='del'>-1:</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_MIPS_MALTA)</div><div class='del'>-	beq	a0, zero, 1f            # check hw3 (coreHI) interrupt</div><div class='del'>-	 nop</div><div class='del'>-	jal	corehi_irqdispatch</div><div class='del'>-	 move	a0, sp</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop</div><div class='del'>-1:</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * Here by mistake?  This is possible, what can happen is that by the</div><div class='del'>-	 * time we take the exception the IRQ pin goes low, so just leave if</div><div class='del'>-	 * this is the case.</div><div class='del'>-	 */</div><div class='del'>-	move	a1,s0</div><div class='del'>-	PRINT("Got interrupt: c0_cause = %08x\n")</div><div class='del'>-	mfc0	a1, CP0_EPC</div><div class='del'>-	PRINT("c0_epc = %08x\n")</div><div class='del'>-</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop</div><div class='del'>-	END(mipsIRQ)</div><div class='head'>diff --git a/arch/mips/mips-boards/sim/sim_irq.S b/arch/mips/mips-boards/sim/sim_irq.S<br/>deleted file mode 100644<br/>index d16cf3822076..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_irq.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_irq.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1999, 2005 MIPS Technologies, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='del'>- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Interrupt exception dispatch code.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/asm.h&gt;</div><div class='del'>-#include &lt;asm/mipsregs.h&gt;</div><div class='del'>-#include &lt;asm/regdef.h&gt;</div><div class='del'>-#include &lt;asm/stackframe.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/mips-boards/simint.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	.text</div><div class='del'>-	.set	noreorder</div><div class='del'>-	.set	noat</div><div class='del'>-	.align	5</div><div class='del'>-	NESTED(simIRQ, PT_SIZE, sp)</div><div class='del'>-	SAVE_ALL</div><div class='del'>-	CLI</div><div class='del'>-	.set	at</div><div class='del'>-</div><div class='del'>-	mfc0	s0, CP0_CAUSE		# get irq bits</div><div class='del'>-	mfc0	s1, CP0_STATUS		# get irq mask</div><div class='del'>-	andi	s0, ST0_IM		# CAUSE.CE may be non-zero!</div><div class='del'>-	and	s0, s1</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)</div><div class='del'>-	.set	mips32</div><div class='del'>-	clz	a0, s0</div><div class='del'>-	.set	mips0</div><div class='del'>-	negu	a0</div><div class='del'>-	addu	a0, 31-CAUSEB_IP</div><div class='del'>-	bltz	a0, spurious</div><div class='del'>-#else</div><div class='del'>-	beqz	s0, spurious</div><div class='del'>-	 li	a0, 7</div><div class='del'>-</div><div class='del'>-	and	t0, s0, 0xf000</div><div class='del'>-	sltiu	t0, t0, 1</div><div class='del'>-	sll	t0, 2</div><div class='del'>-	subu	a0, t0</div><div class='del'>-	sll	s0, t0</div><div class='del'>-</div><div class='del'>-	and	t0, s0, 0xc000</div><div class='del'>-	sltiu	t0, t0, 1</div><div class='del'>-	sll	t0, 1</div><div class='del'>-	subu	a0, t0</div><div class='del'>-	sll	s0, t0</div><div class='del'>-</div><div class='del'>-	and	t0, s0, 0x8000</div><div class='del'>-	sltiu	t0, t0, 1</div><div class='del'>-	# sll	t0, 0</div><div class='del'>-	subu	a0, t0</div><div class='del'>-	# sll	s0, t0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CASCADE_IRQ</div><div class='del'>-	 li	a1, CASCADE_IRQ</div><div class='del'>-	bne	a0, a1, 1f</div><div class='del'>-	 addu	a0, MIPSCPU_INT_BASE</div><div class='del'>-</div><div class='del'>-	jal	CASCADE_DISPATCH</div><div class='del'>-	 move	 a0, sp</div><div class='del'>-</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop</div><div class='del'>-1:</div><div class='del'>-#else</div><div class='del'>-	 addu	a0, MIPSCPU_INT_BASE</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	jal	do_IRQ</div><div class='del'>-	 move	a1, sp</div><div class='del'>-</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-spurious:</div><div class='del'>-	jal	spurious_interrupt</div><div class='del'>-	 nop</div><div class='del'>-	j	ret_from_irq</div><div class='del'>-	 nop</div><div class='del'>-	END(simIRQ)</div><div class='head'>diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c<br/>index a2fd62997ca3..2659c1c3b78d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/sim/sim_setup.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -38,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> extern void sim_time_init(void);</div><div class='del'>-extern void sim_timer_setup(struct irqaction *irq);</div><div class='ctx'> static void __init serial_init(void);</div><div class='ctx'> unsigned int _isbonito = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -50,14 +48,13 @@ const char *get_system_type(void)</div><div class='ctx'> 	return "MIPSsim";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	set_io_port_base(0xbfd00000);</div><div class='ctx'> </div><div class='ctx'> 	serial_init();</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = sim_time_init;</div><div class='del'>-	board_timer_setup = sim_timer_setup;</div><div class='ctx'> 	prom_printf("Linux started...\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MT_SMP</div><div class='head'>diff --git a/arch/mips/mips-boards/sim/sim_smp.c b/arch/mips/mips-boards/sim/sim_smp.c<br/>index b7084e7c4bf9..cb47863ecf10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/sim/sim_smp.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Simulator Platform-specific hooks for SMP operation</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='hunk'>@@ -51,27 +50,6 @@ void core_send_ipi(int cpu, unsigned int action)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Detect available CPUs/VPEs/TCs and populate phys_cpu_present_map</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init prom_build_cpu_map(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MIPS_MT_SMTC</div><div class='del'>-	int nextslot;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * As of November, 2004, MIPSsim only simulates one core</div><div class='del'>-	 * at a time.  However, that core may be a MIPS MT core</div><div class='del'>-	 * with multiple virtual processors and thread contexts.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (read_c0_config3() &amp; (1&lt;&lt;2)) {</div><div class='del'>-		nextslot = mipsmt_build_cpu_map(1);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_MIPS_MT_SMTC */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Platform "CPU" startup hook</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c<br/>index 18b968c696d1..230929ecd57f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mips-boards/sim/sim_time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mips-boards/sim/sim_time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mips-boards/sim/sim_time.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -34,8 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> unsigned long cpu_khz;</div><div class='ctx'> </div><div class='del'>-extern asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs);</div><div class='del'>-</div><div class='ctx'> irqreturn_t sim_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -186,7 +183,7 @@ static void mips_timer_dispatch (struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void __init sim_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	if (cpu_has_veic) {</div><div class='ctx'> 		set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch);</div><div class='head'>diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile<br/>index 4a6220116c96..19e41fd186c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/Makefile</a></div><div class='hunk'>@@ -30,6 +30,7 @@ obj-$(CONFIG_CPU_VR41XX)	+= c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o</div><div class='ctx'> obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o</div><div class='ctx'> obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o</div><div class='ctx'> obj-$(CONFIG_RM7000_CPU_SCACHE)	+= sc-rm7k.o</div><div class='add'>+obj-$(CONFIG_MIPS_CPU_SCACHE)	+= sc-mips.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Choose one DMA coherency model</div><div class='head'>diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c<br/>index 6b3541769602..069803f58f3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r4k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/c-r4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-r4k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/c-r4k.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org)</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -60,13 +59,13 @@ static unsigned long scache_size __read_mostly;</div><div class='ctx'> /*</div><div class='ctx'>  * Dummy cache handling routines for machines without boardcaches</div><div class='ctx'>  */</div><div class='del'>-static void no_sc_noop(void) {}</div><div class='add'>+static void cache_noop(void) {}</div><div class='ctx'> </div><div class='ctx'> static struct bcache_ops no_sc_ops = {</div><div class='del'>-	.bc_enable = (void *)no_sc_noop,</div><div class='del'>-	.bc_disable = (void *)no_sc_noop,</div><div class='del'>-	.bc_wback_inv = (void *)no_sc_noop,</div><div class='del'>-	.bc_inv = (void *)no_sc_noop</div><div class='add'>+	.bc_enable = (void *)cache_noop,</div><div class='add'>+	.bc_disable = (void *)cache_noop,</div><div class='add'>+	.bc_wback_inv = (void *)cache_noop,</div><div class='add'>+	.bc_inv = (void *)cache_noop</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcache_ops *bcops = &amp;no_sc_ops;</div><div class='hunk'>@@ -94,7 +93,9 @@ static inline void r4k_blast_dcache_page_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long  dc_lsize = cpu_dcache_line_size();</div><div class='ctx'> </div><div class='del'>-	if (dc_lsize == 16)</div><div class='add'>+	if (dc_lsize == 0)</div><div class='add'>+		r4k_blast_dcache_page = (void *)cache_noop;</div><div class='add'>+	else if (dc_lsize == 16)</div><div class='ctx'> 		r4k_blast_dcache_page = blast_dcache16_page;</div><div class='ctx'> 	else if (dc_lsize == 32)</div><div class='ctx'> 		r4k_blast_dcache_page = r4k_blast_dcache_page_dc32;</div><div class='hunk'>@@ -106,7 +107,9 @@ static inline void r4k_blast_dcache_page_indexed_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dc_lsize = cpu_dcache_line_size();</div><div class='ctx'> </div><div class='del'>-	if (dc_lsize == 16)</div><div class='add'>+	if (dc_lsize == 0)</div><div class='add'>+		r4k_blast_dcache_page_indexed = (void *)cache_noop;</div><div class='add'>+	else if (dc_lsize == 16)</div><div class='ctx'> 		r4k_blast_dcache_page_indexed = blast_dcache16_page_indexed;</div><div class='ctx'> 	else if (dc_lsize == 32)</div><div class='ctx'> 		r4k_blast_dcache_page_indexed = blast_dcache32_page_indexed;</div><div class='hunk'>@@ -118,7 +121,9 @@ static inline void r4k_blast_dcache_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dc_lsize = cpu_dcache_line_size();</div><div class='ctx'> </div><div class='del'>-	if (dc_lsize == 16)</div><div class='add'>+	if (dc_lsize == 0)</div><div class='add'>+		r4k_blast_dcache = (void *)cache_noop;</div><div class='add'>+	else if (dc_lsize == 16)</div><div class='ctx'> 		r4k_blast_dcache = blast_dcache16;</div><div class='ctx'> 	else if (dc_lsize == 32)</div><div class='ctx'> 		r4k_blast_dcache = blast_dcache32;</div><div class='hunk'>@@ -201,7 +206,9 @@ static inline void r4k_blast_icache_page_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ic_lsize = cpu_icache_line_size();</div><div class='ctx'> </div><div class='del'>-	if (ic_lsize == 16)</div><div class='add'>+	if (ic_lsize == 0)</div><div class='add'>+		r4k_blast_icache_page = (void *)cache_noop;</div><div class='add'>+	else if (ic_lsize == 16)</div><div class='ctx'> 		r4k_blast_icache_page = blast_icache16_page;</div><div class='ctx'> 	else if (ic_lsize == 32)</div><div class='ctx'> 		r4k_blast_icache_page = blast_icache32_page;</div><div class='hunk'>@@ -216,7 +223,9 @@ static inline void r4k_blast_icache_page_indexed_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ic_lsize = cpu_icache_line_size();</div><div class='ctx'> </div><div class='del'>-	if (ic_lsize == 16)</div><div class='add'>+	if (ic_lsize == 0)</div><div class='add'>+		r4k_blast_icache_page_indexed = (void *)cache_noop;</div><div class='add'>+	else if (ic_lsize == 16)</div><div class='ctx'> 		r4k_blast_icache_page_indexed = blast_icache16_page_indexed;</div><div class='ctx'> 	else if (ic_lsize == 32) {</div><div class='ctx'> 		if (R4600_V1_INDEX_ICACHEOP_WAR &amp;&amp; cpu_is_r4600_v1_x())</div><div class='hunk'>@@ -238,7 +247,9 @@ static inline void r4k_blast_icache_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ic_lsize = cpu_icache_line_size();</div><div class='ctx'> </div><div class='del'>-	if (ic_lsize == 16)</div><div class='add'>+	if (ic_lsize == 0)</div><div class='add'>+		r4k_blast_icache = (void *)cache_noop;</div><div class='add'>+	else if (ic_lsize == 16)</div><div class='ctx'> 		r4k_blast_icache = blast_icache16;</div><div class='ctx'> 	else if (ic_lsize == 32) {</div><div class='ctx'> 		if (R4600_V1_INDEX_ICACHEOP_WAR &amp;&amp; cpu_is_r4600_v1_x())</div><div class='hunk'>@@ -258,7 +269,7 @@ static inline void r4k_blast_scache_page_setup(void)</div><div class='ctx'> 	unsigned long sc_lsize = cpu_scache_line_size();</div><div class='ctx'> </div><div class='ctx'> 	if (scache_size == 0)</div><div class='del'>-		r4k_blast_scache_page = (void *)no_sc_noop;</div><div class='add'>+		r4k_blast_scache_page = (void *)cache_noop;</div><div class='ctx'> 	else if (sc_lsize == 16)</div><div class='ctx'> 		r4k_blast_scache_page = blast_scache16_page;</div><div class='ctx'> 	else if (sc_lsize == 32)</div><div class='hunk'>@@ -276,7 +287,7 @@ static inline void r4k_blast_scache_page_indexed_setup(void)</div><div class='ctx'> 	unsigned long sc_lsize = cpu_scache_line_size();</div><div class='ctx'> </div><div class='ctx'> 	if (scache_size == 0)</div><div class='del'>-		r4k_blast_scache_page_indexed = (void *)no_sc_noop;</div><div class='add'>+		r4k_blast_scache_page_indexed = (void *)cache_noop;</div><div class='ctx'> 	else if (sc_lsize == 16)</div><div class='ctx'> 		r4k_blast_scache_page_indexed = blast_scache16_page_indexed;</div><div class='ctx'> 	else if (sc_lsize == 32)</div><div class='hunk'>@@ -294,7 +305,7 @@ static inline void r4k_blast_scache_setup(void)</div><div class='ctx'> 	unsigned long sc_lsize = cpu_scache_line_size();</div><div class='ctx'> </div><div class='ctx'> 	if (scache_size == 0)</div><div class='del'>-		r4k_blast_scache = (void *)no_sc_noop;</div><div class='add'>+		r4k_blast_scache = (void *)cache_noop;</div><div class='ctx'> 	else if (sc_lsize == 16)</div><div class='ctx'> 		r4k_blast_scache = blast_scache16;</div><div class='ctx'> 	else if (sc_lsize == 32)</div><div class='hunk'>@@ -508,7 +519,7 @@ static inline void local_r4k_flush_icache_range(void *args)</div><div class='ctx'> 	unsigned long end = fir_args-&gt;end;</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_has_ic_fills_f_dc) {</div><div class='del'>-		if (end - start &gt; dcache_size) {</div><div class='add'>+		if (end - start &gt;= dcache_size) {</div><div class='ctx'> 			r4k_blast_dcache();</div><div class='ctx'> 		} else {</div><div class='ctx'> 			R4600_HIT_CACHEOP_WAR_IMPL;</div><div class='hunk'>@@ -567,7 +578,7 @@ static inline void local_r4k_flush_icache_page(void *args)</div><div class='ctx'> 	 * secondary cache will result in any entries in the primary caches</div><div class='ctx'> 	 * also getting invalidated which hopefully is a bit more economical.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpu_has_subset_pcaches) {</div><div class='add'>+	if (cpu_has_inclusive_pcaches) {</div><div class='ctx'> 		unsigned long addr = (unsigned long) page_address(page);</div><div class='ctx'> </div><div class='ctx'> 		r4k_blast_scache_page(addr);</div><div class='hunk'>@@ -623,7 +634,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)</div><div class='ctx'> 	/* Catch bad driver code */</div><div class='ctx'> 	BUG_ON(size == 0);</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_subset_pcaches) {</div><div class='add'>+	if (cpu_has_inclusive_pcaches) {</div><div class='ctx'> 		if (size &gt;= scache_size)</div><div class='ctx'> 			r4k_blast_scache();</div><div class='ctx'> 		else</div><div class='hunk'>@@ -651,7 +662,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)</div><div class='ctx'> 	/* Catch bad driver code */</div><div class='ctx'> 	BUG_ON(size == 0);</div><div class='ctx'> </div><div class='del'>-	if (cpu_has_subset_pcaches) {</div><div class='add'>+	if (cpu_has_inclusive_pcaches) {</div><div class='ctx'> 		if (size &gt;= scache_size)</div><div class='ctx'> 			r4k_blast_scache();</div><div class='ctx'> 		else</div><div class='hunk'>@@ -683,10 +694,12 @@ static void local_r4k_flush_cache_sigtramp(void * arg)</div><div class='ctx'> 	unsigned long addr = (unsigned long) arg;</div><div class='ctx'> </div><div class='ctx'> 	R4600_HIT_CACHEOP_WAR_IMPL;</div><div class='del'>-	protected_writeback_dcache_line(addr &amp; ~(dc_lsize - 1));</div><div class='add'>+	if (dc_lsize)</div><div class='add'>+		protected_writeback_dcache_line(addr &amp; ~(dc_lsize - 1));</div><div class='ctx'> 	if (!cpu_icache_snoops_remote_store &amp;&amp; scache_size)</div><div class='ctx'> 		protected_writeback_scache_line(addr &amp; ~(sc_lsize - 1));</div><div class='del'>-	protected_flush_icache_line(addr &amp; ~(ic_lsize - 1));</div><div class='add'>+	if (ic_lsize)</div><div class='add'>+		protected_flush_icache_line(addr &amp; ~(ic_lsize - 1));</div><div class='ctx'> 	if (MIPS4K_ICACHE_REFILL_WAR) {</div><div class='ctx'> 		__asm__ __volatile__ (</div><div class='ctx'> 			".set push\n\t"</div><div class='hunk'>@@ -849,15 +862,18 @@ static void __init probe_pcache(void)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_VR4133:</div><div class='del'>-		write_c0_config(config &amp; ~CONF_EB);</div><div class='add'>+		write_c0_config(config &amp; ~VR41_CONF_P4K);</div><div class='ctx'> 	case CPU_VR4131:</div><div class='ctx'> 		/* Workaround for cache instruction bug of VR4131 */</div><div class='ctx'> 		if (c-&gt;processor_id == 0x0c80U || c-&gt;processor_id == 0x0c81U ||</div><div class='ctx'> 		    c-&gt;processor_id == 0x0c82U) {</div><div class='del'>-			config &amp;= ~0x00000030U;</div><div class='del'>-			config |= 0x00410000U;</div><div class='add'>+			config |= 0x00400000U;</div><div class='add'>+			if (c-&gt;processor_id == 0x0c80U)</div><div class='add'>+				config |= VR41_CONF_BP;</div><div class='ctx'> 			write_c0_config(config);</div><div class='del'>-		}</div><div class='add'>+		} else</div><div class='add'>+			c-&gt;options |= MIPS_CPU_CACHE_CDEX_P;</div><div class='add'>+</div><div class='ctx'> 		icache_size = 1 &lt;&lt; (10 + ((config &amp; CONF_IC) &gt;&gt; 9));</div><div class='ctx'> 		c-&gt;icache.linesz = 16 &lt;&lt; ((config &amp; CONF_IB) &gt;&gt; 5);</div><div class='ctx'> 		c-&gt;icache.ways = 2;</div><div class='hunk'>@@ -867,8 +883,6 @@ static void __init probe_pcache(void)</div><div class='ctx'> 		c-&gt;dcache.linesz = 16 &lt;&lt; ((config &amp; CONF_DB) &gt;&gt; 4);</div><div class='ctx'> 		c-&gt;dcache.ways = 2;</div><div class='ctx'> 		c-&gt;dcache.waybit = __ffs(dcache_size/2);</div><div class='del'>-</div><div class='del'>-		c-&gt;options |= MIPS_CPU_CACHE_CDEX_P;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_VR41XX:</div><div class='hunk'>@@ -973,8 +987,10 @@ static void __init probe_pcache(void)</div><div class='ctx'> 	c-&gt;icache.waysize = icache_size / c-&gt;icache.ways;</div><div class='ctx'> 	c-&gt;dcache.waysize = dcache_size / c-&gt;dcache.ways;</div><div class='ctx'> </div><div class='del'>-	c-&gt;icache.sets = icache_size / (c-&gt;icache.linesz * c-&gt;icache.ways);</div><div class='del'>-	c-&gt;dcache.sets = dcache_size / (c-&gt;dcache.linesz * c-&gt;dcache.ways);</div><div class='add'>+	c-&gt;icache.sets = c-&gt;icache.linesz ?</div><div class='add'>+		icache_size / (c-&gt;icache.linesz * c-&gt;icache.ways) : 0;</div><div class='add'>+	c-&gt;dcache.sets = c-&gt;dcache.linesz ?</div><div class='add'>+		dcache_size / (c-&gt;dcache.linesz * c-&gt;dcache.ways) : 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * R10000 and R12000 P-caches are odd in a positive way.  They're 32kB</div><div class='hunk'>@@ -993,10 +1009,16 @@ static void __init probe_pcache(void)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_24K:</div><div class='ctx'> 	case CPU_34K:</div><div class='del'>-		if (!(read_c0_config7() &amp; (1 &lt;&lt; 16)))</div><div class='add'>+	case CPU_74K:</div><div class='add'>+		if ((read_c0_config7() &amp; (1 &lt;&lt; 16))) {</div><div class='add'>+			/* effectively physically indexed dcache,</div><div class='add'>+			   thus no virtual aliases. */</div><div class='add'>+			c-&gt;dcache.flags |= MIPS_CACHE_PINDEX;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	default:</div><div class='del'>-			if (c-&gt;dcache.waysize &gt; PAGE_SIZE)</div><div class='del'>-				c-&gt;dcache.flags |= MIPS_CACHE_ALIASES;</div><div class='add'>+		if (c-&gt;dcache.waysize &gt; PAGE_SIZE)</div><div class='add'>+			c-&gt;dcache.flags |= MIPS_CACHE_ALIASES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (c-&gt;cputype) {</div><div class='hunk'>@@ -1092,6 +1114,7 @@ static int __init probe_scache(void)</div><div class='ctx'> </div><div class='ctx'> extern int r5k_sc_init(void);</div><div class='ctx'> extern int rm7k_sc_init(void);</div><div class='add'>+extern int mips_sc_init(void);</div><div class='ctx'> </div><div class='ctx'> static void __init setup_scache(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1139,17 +1162,29 @@ static void __init setup_scache(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='add'>+		if (c-&gt;isa_level == MIPS_CPU_ISA_M32R1 ||</div><div class='add'>+		    c-&gt;isa_level == MIPS_CPU_ISA_M32R2 ||</div><div class='add'>+		    c-&gt;isa_level == MIPS_CPU_ISA_M64R1 ||</div><div class='add'>+		    c-&gt;isa_level == MIPS_CPU_ISA_M64R2) {</div><div class='add'>+#ifdef CONFIG_MIPS_CPU_SCACHE</div><div class='add'>+			if (mips_sc_init ()) {</div><div class='add'>+				scache_size = c-&gt;scache.ways * c-&gt;scache.sets * c-&gt;scache.linesz;</div><div class='add'>+				printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",</div><div class='add'>+				       scache_size &gt;&gt; 10,</div><div class='add'>+				       way_string[c-&gt;scache.ways], c-&gt;scache.linesz);</div><div class='add'>+			}</div><div class='add'>+#else</div><div class='add'>+			if (!(c-&gt;scache.flags &amp; MIPS_CACHE_NOT_PRESENT))</div><div class='add'>+				panic("Dunno how to handle MIPS32 / MIPS64 second level cache");</div><div class='add'>+#endif</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		sc_present = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sc_present)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if ((c-&gt;isa_level == MIPS_CPU_ISA_M32R1 ||</div><div class='del'>-	     c-&gt;isa_level == MIPS_CPU_ISA_M64R1) &amp;&amp;</div><div class='del'>-	    !(c-&gt;scache.flags &amp; MIPS_CACHE_NOT_PRESENT))</div><div class='del'>-		panic("Dunno how to handle MIPS32 / MIPS64 second level cache");</div><div class='del'>-</div><div class='ctx'> 	/* compute a couple of other cache variables */</div><div class='ctx'> 	c-&gt;scache.waysize = scache_size / c-&gt;scache.ways;</div><div class='ctx'> </div><div class='hunk'>@@ -1158,7 +1193,32 @@ static void __init setup_scache(void)</div><div class='ctx'> 	printk("Unified secondary cache %ldkB %s, linesize %d bytes.\n",</div><div class='ctx'> 	       scache_size &gt;&gt; 10, way_string[c-&gt;scache.ways], c-&gt;scache.linesz);</div><div class='ctx'> </div><div class='del'>-	c-&gt;options |= MIPS_CPU_SUBSET_CACHES;</div><div class='add'>+	c-&gt;options |= MIPS_CPU_INCLUSIVE_CACHES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void au1x00_fixup_config_od(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * c0_config.od (bit 19) was write only (and read as 0)</div><div class='add'>+	 * on the early revisions of Alchemy SOCs.  It disables the bus</div><div class='add'>+	 * transaction overlapping and needs to be set to fix various errata.</div><div class='add'>+	 */</div><div class='add'>+	switch (read_c0_prid()) {</div><div class='add'>+	case 0x00030100: /* Au1000 DA */</div><div class='add'>+	case 0x00030201: /* Au1000 HA */</div><div class='add'>+	case 0x00030202: /* Au1000 HB */</div><div class='add'>+	case 0x01030200: /* Au1500 AB */</div><div class='add'>+	/*</div><div class='add'>+	 * Au1100 errata actually keeps silence about this bit, so we set it</div><div class='add'>+	 * just in case for those revisions that require it to be set according</div><div class='add'>+	 * to arch/mips/au1000/common/cputable.c</div><div class='add'>+	 */</div><div class='add'>+	case 0x02030200: /* Au1100 AB */</div><div class='add'>+	case 0x02030201: /* Au1100 BA */</div><div class='add'>+	case 0x02030202: /* Au1100 BC */</div><div class='add'>+		set_c0_config(1 &lt;&lt; 19);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void coherency_setup(void)</div><div class='hunk'>@@ -1181,6 +1241,15 @@ static inline void coherency_setup(void)</div><div class='ctx'> 	case CPU_R4400MC:</div><div class='ctx'> 		clear_c0_config(CONF_CU);</div><div class='ctx'> 		break;</div><div class='add'>+	/*</div><div class='add'>+	 * We need to catch the ealry Alchemy SOCs with</div><div class='add'>+	 * the write-only co_config.od bit and set it back to one...</div><div class='add'>+	 */</div><div class='add'>+	case CPU_AU1000: /* rev. DA, HA, HB */</div><div class='add'>+	case CPU_AU1100: /* rev. AB, BA, BC ?? */</div><div class='add'>+	case CPU_AU1500: /* rev. AB */</div><div class='add'>+		au1x00_fixup_config_od();</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1212,10 +1281,12 @@ void __init r4k_cache_init(void)</div><div class='ctx'> 	 * This code supports virtually indexed processors and will be</div><div class='ctx'> 	 * unnecessarily inefficient on physically indexed processors.</div><div class='ctx'> 	 */</div><div class='del'>-	shm_align_mask = max_t( unsigned long,</div><div class='del'>-				c-&gt;dcache.sets * c-&gt;dcache.linesz - 1,</div><div class='del'>-				PAGE_SIZE - 1);</div><div class='del'>-</div><div class='add'>+	if (c-&gt;dcache.linesz)</div><div class='add'>+		shm_align_mask = max_t( unsigned long,</div><div class='add'>+					c-&gt;dcache.sets * c-&gt;dcache.linesz - 1,</div><div class='add'>+					PAGE_SIZE - 1);</div><div class='add'>+	else</div><div class='add'>+		shm_align_mask = PAGE_SIZE-1;</div><div class='ctx'> 	flush_cache_all		= r4k_flush_cache_all;</div><div class='ctx'> 	__flush_cache_all	= r4k___flush_cache_all;</div><div class='ctx'> 	flush_cache_mm		= r4k_flush_cache_mm;</div><div class='head'>diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c<br/>index f9b129491b1e..2d71efb82ac5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/c-sb1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/c-sb1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/c-sb1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/c-sb1.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asm.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c<br/>index 83a56296be86..ddd3a2de1d73 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/cache.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994 - 2003 by Ralf Baechle</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c<br/>index 1cf3c6006ccd..e19fbb9ee47f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/cerr-sb1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/cerr-sb1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/cerr-sb1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/cerr-sb1.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/sibyte/sb1250.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/dma-coherent.c b/arch/mips/mm/dma-coherent.c<br/>index f6b3c722230c..7fa5fd16e46b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/dma-coherent.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/dma-coherent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/dma-coherent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/dma-coherent.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 2000, 2001  Ralf Baechle &lt;ralf@gnu.org&gt;</div><div class='ctx'>  * swiped from i386, and cloned for MIPS by Geert, polished by Ralf.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c<br/>index cd4ea8474f89..2eeffe5c2a3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/dma-noncoherent.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/dma-noncoherent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/dma-noncoherent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/dma-noncoherent.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 2000, 2001  Ralf Baechle &lt;ralf@gnu.org&gt;</div><div class='ctx'>  * swiped from i386, and cloned for MIPS by Geert, polished by Ralf.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c<br/>index 0c544375b856..99ebf3ccc222 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/highmem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/highmem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/highmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/highmem.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c<br/>index c22308b93ff0..c52497bb102a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/init.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com</div><div class='ctx'>  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -140,10 +139,36 @@ void __init fixrange_init(unsigned long start, unsigned long end,</div><div class='ctx'> #ifndef CONFIG_NEED_MULTIPLE_NODES</div><div class='ctx'> extern void pagetable_init(void);</div><div class='ctx'> </div><div class='add'>+static int __init page_is_ram(unsigned long pagenr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='add'>+		unsigned long addr, end;</div><div class='add'>+</div><div class='add'>+		if (boot_mem_map.map[i].type != BOOT_MEM_RAM)</div><div class='add'>+			/* not usable memory */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		addr = PFN_UP(boot_mem_map.map[i].addr);</div><div class='add'>+		end = PFN_DOWN(boot_mem_map.map[i].addr +</div><div class='add'>+			       boot_mem_map.map[i].size);</div><div class='add'>+</div><div class='add'>+		if (pagenr &gt;= addr &amp;&amp; pagenr &lt; end)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init paging_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};</div><div class='add'>+	unsigned long zones_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };</div><div class='ctx'> 	unsigned long max_dma, high, low;</div><div class='add'>+#ifndef CONFIG_FLATMEM</div><div class='add'>+	unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };</div><div class='add'>+	unsigned long i, j, pfn;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	pagetable_init();</div><div class='ctx'> </div><div class='hunk'>@@ -175,29 +200,16 @@ void __init paging_init(void)</div><div class='ctx'> 		zones_size[ZONE_HIGHMEM] = high - low;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FLATMEM</div><div class='ctx'> 	free_area_init(zones_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int page_is_ram(unsigned long pagenr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; boot_mem_map.nr_map; i++) {</div><div class='del'>-		unsigned long addr, end;</div><div class='del'>-</div><div class='del'>-		if (boot_mem_map.map[i].type != BOOT_MEM_RAM)</div><div class='del'>-			/* not usable memory */</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		addr = PFN_UP(boot_mem_map.map[i].addr);</div><div class='del'>-		end = PFN_DOWN(boot_mem_map.map[i].addr +</div><div class='del'>-			       boot_mem_map.map[i].size);</div><div class='del'>-</div><div class='del'>-		if (pagenr &gt;= addr &amp;&amp; pagenr &lt; end)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+#else</div><div class='add'>+	pfn = 0;</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_ZONES; i++)</div><div class='add'>+		for (j = 0; j &lt; zones_size[i]; j++, pfn++)</div><div class='add'>+			if (!page_is_ram(pfn))</div><div class='add'>+				zholes_size[i]++;</div><div class='add'>+	free_area_init_node(0, NODE_DATA(0), zones_size, 0, zholes_size);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct kcore_list kcore_mem, kcore_vmalloc;</div><div class='hunk'>@@ -214,9 +226,9 @@ void __init mem_init(void)</div><div class='ctx'> #ifdef CONFIG_DISCONTIGMEM</div><div class='ctx'> #error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet"</div><div class='ctx'> #endif</div><div class='del'>-	max_mapnr = num_physpages = highend_pfn;</div><div class='add'>+	max_mapnr = highend_pfn;</div><div class='ctx'> #else</div><div class='del'>-	max_mapnr = num_physpages = max_low_pfn;</div><div class='add'>+	max_mapnr = max_low_pfn;</div><div class='ctx'> #endif</div><div class='ctx'> 	high_memory = (void *) __va(max_low_pfn &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='hunk'>@@ -227,9 +239,10 @@ void __init mem_init(void)</div><div class='ctx'> 	for (tmp = 0; tmp &lt; max_low_pfn; tmp++)</div><div class='ctx'> 		if (page_is_ram(tmp)) {</div><div class='ctx'> 			ram++;</div><div class='del'>-			if (PageReserved(mem_map+tmp))</div><div class='add'>+			if (PageReserved(pfn_to_page(tmp)))</div><div class='ctx'> 				reservedpages++;</div><div class='ctx'> 		}</div><div class='add'>+	num_physpages = ram;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HIGHMEM</div><div class='ctx'> 	for (tmp = highstart_pfn; tmp &lt; highend_pfn; tmp++) {</div><div class='hunk'>@@ -248,6 +261,7 @@ void __init mem_init(void)</div><div class='ctx'> 		totalhigh_pages++;</div><div class='ctx'> 	}</div><div class='ctx'> 	totalram_pages += totalhigh_pages;</div><div class='add'>+	num_physpages += totalhigh_pages;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	codesize =  (unsigned long) &amp;_etext - (unsigned long) &amp;_text;</div><div class='head'>diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c<br/>index 148c65b9cd8b..fc3c7878fb45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/pg-sb1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/pg-sb1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/pg-sb1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/pg-sb1.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c<br/>index 4a3c4919e314..4bdaa05f485b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/pgtable-32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/pgtable-32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/pgtable-32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/pgtable-32.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003 by Ralf Baechle</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c<br/>index 3fe94202da8c..c93aa6cbcaca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/pgtable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/pgtable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/pgtable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/pgtable.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='hunk'>@@ -16,6 +15,8 @@ void show_mem(void)</div><div class='ctx'> 	printk("Free swap:       %6ldkB\n", nr_swap_pages&lt;&lt;(PAGE_SHIFT-10));</div><div class='ctx'> 	pfn = max_mapnr;</div><div class='ctx'> 	while (pfn-- &gt; 0) {</div><div class='add'>+		if (!pfn_valid(pfn))</div><div class='add'>+			continue;</div><div class='ctx'> 		page = pfn_to_page(pfn);</div><div class='ctx'> 		total++;</div><div class='ctx'> 		if (PageHighMem(page))</div><div class='head'>diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c<br/>new file mode 100644<br/>index 000000000000..42b50964c644<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/sc-mips.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/sc-mips.c</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2006 Chris Dearman (chris@mips.com),</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mipsregs.h&gt;</div><div class='add'>+#include &lt;asm/bcache.h&gt;</div><div class='add'>+#include &lt;asm/cacheops.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/mmu_context.h&gt;</div><div class='add'>+#include &lt;asm/r4kcache.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIPS32/MIPS64 L2 cache handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writeback and invalidate the secondary cache before DMA.</div><div class='add'>+ */</div><div class='add'>+static void mips_sc_wback_inv(unsigned long addr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	blast_scache_range(addr, addr + size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Invalidate the secondary cache before DMA.</div><div class='add'>+ */</div><div class='add'>+static void mips_sc_inv(unsigned long addr, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	blast_inv_scache_range(addr, addr + size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mips_sc_enable(void)</div><div class='add'>+{</div><div class='add'>+	/* L2 cache is permanently enabled */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mips_sc_disable(void)</div><div class='add'>+{</div><div class='add'>+	/* L2 cache is permanently enabled */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bcache_ops mips_sc_ops = {</div><div class='add'>+	.bc_enable = mips_sc_enable,</div><div class='add'>+	.bc_disable = mips_sc_disable,</div><div class='add'>+	.bc_wback_inv = mips_sc_wback_inv,</div><div class='add'>+	.bc_inv = mips_sc_inv</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int __init mips_sc_probe(void)</div><div class='add'>+{</div><div class='add'>+	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='add'>+	unsigned int config1, config2;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	/* Mark as not present until probe completed */</div><div class='add'>+	c-&gt;scache.flags |= MIPS_CACHE_NOT_PRESENT;</div><div class='add'>+</div><div class='add'>+	/* Ignore anything but MIPSxx processors */</div><div class='add'>+	if (c-&gt;isa_level != MIPS_CPU_ISA_M32R1 &amp;&amp;</div><div class='add'>+	    c-&gt;isa_level != MIPS_CPU_ISA_M32R2 &amp;&amp;</div><div class='add'>+	    c-&gt;isa_level != MIPS_CPU_ISA_M64R1 &amp;&amp;</div><div class='add'>+	    c-&gt;isa_level != MIPS_CPU_ISA_M64R2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Does this MIPS32/MIPS64 CPU have a config2 register? */</div><div class='add'>+	config1 = read_c0_config1();</div><div class='add'>+	if (!(config1 &amp; MIPS_CONF_M))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	config2 = read_c0_config2();</div><div class='add'>+	tmp = (config2 &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+	if (0 &lt; tmp &amp;&amp; tmp &lt;= 7)</div><div class='add'>+		c-&gt;scache.linesz = 2 &lt;&lt; tmp;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tmp = (config2 &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+	if (0 &lt;= tmp &amp;&amp; tmp &lt;= 7)</div><div class='add'>+		c-&gt;scache.sets = 64 &lt;&lt; tmp;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tmp = (config2 &gt;&gt; 0) &amp; 0x0f;</div><div class='add'>+	if (0 &lt;= tmp &amp;&amp; tmp &lt;= 7)</div><div class='add'>+		c-&gt;scache.ways = tmp + 1;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	c-&gt;scache.waysize = c-&gt;scache.sets * c-&gt;scache.linesz;</div><div class='add'>+	c-&gt;scache.waybit = __ffs(c-&gt;scache.waysize);</div><div class='add'>+</div><div class='add'>+	c-&gt;scache.flags &amp;= ~MIPS_CACHE_NOT_PRESENT;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init mips_sc_init(void)</div><div class='add'>+{</div><div class='add'>+	int found = mips_sc_probe ();</div><div class='add'>+	if (found) {</div><div class='add'>+		mips_sc_enable();</div><div class='add'>+		bcops = &amp;mips_sc_ops;</div><div class='add'>+	}</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c<br/>index 9dca099ba16b..2cde1b772443 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r4k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/tlb-r4k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r4k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/tlb-r4k.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Carsten Langgaard, carstenl@mips.com</div><div class='ctx'>  * Copyright (C) 2002 MIPS Technologies, Inc.  All rights reserved.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -413,7 +412,6 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void __init sanitize_tlb_entries(void);</div><div class='ctx'> static void __init probe_tlb(unsigned long config)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='head'>diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c<br/>index 1bfb09198ce3..266a47d65eed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r8k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/tlb-r8k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlb-r8k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/tlb-r8k.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Carsten Langgaard, carstenl@mips.com</div><div class='ctx'>  * Copyright (C) 2002 MIPS Technologies, Inc.  All rights reserved.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c<br/>index 54507be2ab5b..375e0991505d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/mm/tlbex.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/mm/tlbex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/mm/tlbex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/mm/tlbex.c</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Synthesize TLB refill handlers at runtime.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2004,2005 by Thiemo Seufer</div><div class='add'>+ * Copyright (C) 2004,2005,2006 by Thiemo Seufer</div><div class='ctx'>  * Copyright (C) 2005  Maciej W. Rozycki</div><div class='ctx'>  * Copyright (C) 2006  Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -36,8 +35,6 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/war.h&gt;</div><div class='ctx'> </div><div class='del'>-/* #define DEBUG_TLB */</div><div class='del'>-</div><div class='ctx'> static __init int __attribute__((unused)) r45k_bvahwbug(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* XXX: We should probe for the presence of this bug, but we don't. */</div><div class='hunk'>@@ -729,6 +726,7 @@ static void __init build_r3000_tlb_refill_handler(void)</div><div class='ctx'> {</div><div class='ctx'> 	long pgdc = (long)pgd_current;</div><div class='ctx'> 	u32 *p;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(tlb_handler, 0, sizeof(tlb_handler));</div><div class='ctx'> 	p = tlb_handler;</div><div class='hunk'>@@ -754,16 +752,14 @@ static void __init build_r3000_tlb_refill_handler(void)</div><div class='ctx'> 	if (p &gt; tlb_handler + 32)</div><div class='ctx'> 		panic("TLB refill handler space exceeded");</div><div class='ctx'> </div><div class='del'>-	printk("Synthesized TLB refill handler (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - tlb_handler));</div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='add'>+	pr_info("Synthesized TLB refill handler (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - tlb_handler));</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; (p - tlb_handler); i++)</div><div class='del'>-			printk("%08x\n", tlb_handler[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - tlb_handler); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", tlb_handler[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> </div><div class='ctx'> 	memcpy((void *)ebase, tlb_handler, 0x80);</div><div class='ctx'> }</div><div class='hunk'>@@ -1176,6 +1172,7 @@ static void __init build_r4000_tlb_refill_handler(void)</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='ctx'> 	u32 *f;</div><div class='ctx'> 	unsigned int final_len;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(tlb_handler, 0, sizeof(tlb_handler));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1273,24 +1270,21 @@ static void __init build_r4000_tlb_refill_handler(void)</div><div class='ctx'> #endif /* CONFIG_64BIT */</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB refill handler (%u instructions).\n",</div><div class='del'>-	       final_len);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='add'>+	pr_info("Synthesized TLB refill handler (%u instructions).\n",</div><div class='add'>+		final_len);</div><div class='ctx'> </div><div class='del'>-		f = final_handler;</div><div class='add'>+	f = final_handler;</div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='del'>-		if (final_len &gt; 32)</div><div class='del'>-			final_len = 64;</div><div class='del'>-		else</div><div class='del'>-			f = final_handler + 32;</div><div class='add'>+	if (final_len &gt; 32)</div><div class='add'>+		final_len = 64;</div><div class='add'>+	else</div><div class='add'>+		f = final_handler + 32;</div><div class='ctx'> #endif /* CONFIG_64BIT */</div><div class='del'>-		for (i = 0; i &lt; final_len; i++)</div><div class='del'>-			printk("%08x\n", f[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; final_len; i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", f[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> </div><div class='ctx'> 	memcpy((void *)ebase, final_handler, 0x100);</div><div class='ctx'> }</div><div class='hunk'>@@ -1523,6 +1517,7 @@ static void __init build_r3000_tlb_load_handler(void)</div><div class='ctx'> 	u32 *p = handle_tlbl;</div><div class='ctx'> 	struct label *l = labels;</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(handle_tlbl, 0, sizeof(handle_tlbl));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1542,17 +1537,14 @@ static void __init build_r3000_tlb_load_handler(void)</div><div class='ctx'> 		panic("TLB load handler fastpath space exceeded");</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB load handler fastpath (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - handle_tlbl));</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='add'>+	pr_info("Synthesized TLB load handler fastpath (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - handle_tlbl));</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; (p - handle_tlbl); i++)</div><div class='del'>-			printk("%08x\n", handle_tlbl[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - handle_tlbl); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", handle_tlbl[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init build_r3000_tlb_store_handler(void)</div><div class='hunk'>@@ -1560,6 +1552,7 @@ static void __init build_r3000_tlb_store_handler(void)</div><div class='ctx'> 	u32 *p = handle_tlbs;</div><div class='ctx'> 	struct label *l = labels;</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(handle_tlbs, 0, sizeof(handle_tlbs));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1579,17 +1572,14 @@ static void __init build_r3000_tlb_store_handler(void)</div><div class='ctx'> 		panic("TLB store handler fastpath space exceeded");</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB store handler fastpath (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - handle_tlbs));</div><div class='add'>+	pr_info("Synthesized TLB store handler fastpath (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - handle_tlbs));</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; (p - handle_tlbs); i++)</div><div class='del'>-			printk("%08x\n", handle_tlbs[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - handle_tlbs); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", handle_tlbs[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init build_r3000_tlb_modify_handler(void)</div><div class='hunk'>@@ -1597,6 +1587,7 @@ static void __init build_r3000_tlb_modify_handler(void)</div><div class='ctx'> 	u32 *p = handle_tlbm;</div><div class='ctx'> 	struct label *l = labels;</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(handle_tlbm, 0, sizeof(handle_tlbm));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1616,17 +1607,14 @@ static void __init build_r3000_tlb_modify_handler(void)</div><div class='ctx'> 		panic("TLB modify handler fastpath space exceeded");</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB modify handler fastpath (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - handle_tlbm));</div><div class='add'>+	pr_info("Synthesized TLB modify handler fastpath (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - handle_tlbm));</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; (p - handle_tlbm); i++)</div><div class='del'>-			printk("%08x\n", handle_tlbm[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - handle_tlbm); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", handle_tlbm[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1678,6 +1666,7 @@ static void __init build_r4000_tlb_load_handler(void)</div><div class='ctx'> 	u32 *p = handle_tlbl;</div><div class='ctx'> 	struct label *l = labels;</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(handle_tlbl, 0, sizeof(handle_tlbl));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1705,17 +1694,14 @@ static void __init build_r4000_tlb_load_handler(void)</div><div class='ctx'> 		panic("TLB load handler fastpath space exceeded");</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB load handler fastpath (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - handle_tlbl));</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='add'>+	pr_info("Synthesized TLB load handler fastpath (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - handle_tlbl));</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; (p - handle_tlbl); i++)</div><div class='del'>-			printk("%08x\n", handle_tlbl[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - handle_tlbl); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", handle_tlbl[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init build_r4000_tlb_store_handler(void)</div><div class='hunk'>@@ -1723,6 +1709,7 @@ static void __init build_r4000_tlb_store_handler(void)</div><div class='ctx'> 	u32 *p = handle_tlbs;</div><div class='ctx'> 	struct label *l = labels;</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(handle_tlbs, 0, sizeof(handle_tlbs));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1741,17 +1728,14 @@ static void __init build_r4000_tlb_store_handler(void)</div><div class='ctx'> 		panic("TLB store handler fastpath space exceeded");</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB store handler fastpath (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - handle_tlbs));</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='add'>+	pr_info("Synthesized TLB store handler fastpath (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - handle_tlbs));</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; (p - handle_tlbs); i++)</div><div class='del'>-			printk("%08x\n", handle_tlbs[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - handle_tlbs); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", handle_tlbs[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init build_r4000_tlb_modify_handler(void)</div><div class='hunk'>@@ -1759,6 +1743,7 @@ static void __init build_r4000_tlb_modify_handler(void)</div><div class='ctx'> 	u32 *p = handle_tlbm;</div><div class='ctx'> 	struct label *l = labels;</div><div class='ctx'> 	struct reloc *r = relocs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(handle_tlbm, 0, sizeof(handle_tlbm));</div><div class='ctx'> 	memset(labels, 0, sizeof(labels));</div><div class='hunk'>@@ -1778,17 +1763,14 @@ static void __init build_r4000_tlb_modify_handler(void)</div><div class='ctx'> 		panic("TLB modify handler fastpath space exceeded");</div><div class='ctx'> </div><div class='ctx'> 	resolve_relocs(relocs, labels);</div><div class='del'>-	printk("Synthesized TLB modify handler fastpath (%u instructions).\n",</div><div class='del'>-	       (unsigned int)(p - handle_tlbm));</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_TLB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; (p - handle_tlbm); i++)</div><div class='del'>-			printk("%08x\n", handle_tlbm[i]);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pr_info("Synthesized TLB modify handler fastpath (%u instructions).\n",</div><div class='add'>+		(unsigned int)(p - handle_tlbm));</div><div class='add'>+</div><div class='add'>+	pr_debug("\t.set push\n");</div><div class='add'>+	pr_debug("\t.set noreorder\n");</div><div class='add'>+	for (i = 0; i &lt; (p - handle_tlbm); i++)</div><div class='add'>+		pr_debug("\t.word 0x%08x\n", handle_tlbm[i]);</div><div class='add'>+	pr_debug("\t.set pop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init build_tlb_refill_handler(void)</div><div class='head'>diff --git a/arch/mips/momentum/jaguar_atx/dbg_io.c b/arch/mips/momentum/jaguar_atx/dbg_io.c<br/>index 542eac82b63c..b85a6521f72d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/dbg_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/jaguar_atx/dbg_io.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_REMOTE_DEBUG)</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='ctx'> </div><div class='del'>-	/* set up buad rate */</div><div class='add'>+	/* set up baud rate */</div><div class='ctx'> 	{</div><div class='ctx'> 		uint32 divisor;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/momentum/jaguar_atx/irq.c b/arch/mips/momentum/jaguar_atx/irq.c<br/>index ec4032b38f19..f9067469a656 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/jaguar_atx/irq.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cascade_mv64340 = {</div><div class='del'>-	no_action, SA_INTERRUPT, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL</div><div class='add'>+	no_action, IRQF_DISABLED, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init arch_init_irq(void)</div><div class='head'>diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c<br/>index 1cadaa92946a..3d2712929293 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/jaguar_atx/prom.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Added changes for SMP - Manish Lachwani (lachwani@pmc-sierra.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/momentum/jaguar_atx/reset.c b/arch/mips/momentum/jaguar_atx/reset.c<br/>index ce9fb2e3d952..c73b0897dc52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/jaguar_atx/reset.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Louis Hamilton, Red Hat, Inc.</div><div class='ctx'>  * hamilton@redhat.com  [MIPS64 modifications]</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c<br/>index 1379c76845dc..e6fe2992227d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/jaguar_atx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/jaguar_atx/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/jaguar_atx/setup.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -213,7 +212,7 @@ int m48t37y_set_time(unsigned long sec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void momenco_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(8, irq);</div><div class='ctx'> }</div><div class='hunk'>@@ -227,7 +226,6 @@ void momenco_time_init(void)</div><div class='ctx'> 	wire_stupidity_into_tlb();</div><div class='ctx'> </div><div class='ctx'> 	mips_hpt_frequency = cpu_clock / 2;</div><div class='del'>-	board_timer_setup = momenco_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	rtc_mips_get_time = m48t37y_get_time;</div><div class='ctx'> 	rtc_mips_set_time = m48t37y_set_time;</div><div class='hunk'>@@ -359,7 +357,7 @@ static __init int __init ja_pci_init(void)</div><div class='ctx'> </div><div class='ctx'> arch_initcall(ja_pci_init);</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmpword;</div><div class='ctx'> </div><div class='hunk'>@@ -370,8 +368,8 @@ void __init plat_setup(void)</div><div class='ctx'> 	pm_power_off = momenco_jaguar_power_off;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * initrd_start = (ulong)jaguar_initrd_start;</div><div class='del'>-	 * initrd_end = (ulong)jaguar_initrd_start + (ulong)jaguar_initrd_size;</div><div class='add'>+	 * initrd_start = (unsigned long)jaguar_initrd_start;</div><div class='add'>+	 * initrd_end = (unsigned long)jaguar_initrd_start + (ulong)jaguar_initrd_size;</div><div class='ctx'> 	 * initrd_below_start_ok = 1;</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/momentum/ocelot_3/irq.c b/arch/mips/momentum/ocelot_3/irq.c<br/>index 87c63c340ae3..793782a9c195 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_3/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_3/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_3/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_3/irq.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cascade_mv64340 = {</div><div class='del'>-	no_action, SA_INTERRUPT, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL</div><div class='add'>+	no_action, IRQF_DISABLED, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init arch_init_irq(void)</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c<br/>index 9803daa2a792..296d945bc248 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_3/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_3/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_3/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_3/prom.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * Author: Manish Lachwani, mlachwani@mvista.com</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/mv643xx.h&gt;</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c<br/>index c69195234309..435d0787329e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_3/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_3/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_3/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_3/setup.c</a></div><div class='hunk'>@@ -197,7 +197,7 @@ int m48t37y_set_time(unsigned long sec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void momenco_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(7, irq);	/* Timer interrupt, unmask status IM7 */</div><div class='ctx'> }</div><div class='hunk'>@@ -211,7 +211,6 @@ void momenco_time_init(void)</div><div class='ctx'> 	 * the Rm7900 and the Rm7065C</div><div class='ctx'> 	 */</div><div class='ctx'> 	mips_hpt_frequency = cpu_clock / 2;</div><div class='del'>-	board_timer_setup = momenco_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	rtc_mips_get_time = m48t37y_get_time;</div><div class='ctx'> 	rtc_mips_set_time = m48t37y_set_time;</div><div class='hunk'>@@ -313,7 +312,7 @@ static __init int __init ja_pci_init(void)</div><div class='ctx'> </div><div class='ctx'> arch_initcall(ja_pci_init);</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmpword;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c<br/>index bd885785e2f9..a5dc230520df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/cpci-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/cpci-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/cpci-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/cpci-irq.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ void ll_cpci_irq(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> #define shutdown_cpci_irq	disable_cpci_irq</div><div class='ctx'> </div><div class='del'>-struct hw_interrupt_type cpci_irq_type = {</div><div class='add'>+struct irq_chip cpci_irq_type = {</div><div class='ctx'> 	.typename = "CPCI/FPGA",</div><div class='ctx'> 	.startup = startup_cpci_irq,</div><div class='ctx'> 	.shutdown = shutdown_cpci_irq,</div><div class='hunk'>@@ -147,6 +147,6 @@ void cpci_irq_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 2;</div><div class='del'>-		irq_desc[i].handler = &amp;cpci_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;cpci_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/dbg_io.c b/arch/mips/momentum/ocelot_c/dbg_io.c<br/>index 8720bccfdea2..2128684584f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/dbg_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/dbg_io.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='ctx'> </div><div class='del'>-	/* set up buad rate */</div><div class='add'>+	/* set up baud rate */</div><div class='ctx'> 	{</div><div class='ctx'> 		uint32 divisor;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c<br/>index 86f61ce59e53..9d44ae1e156b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/irq.c</a></div><div class='hunk'>@@ -52,11 +52,11 @@ extern void uart_irq_init(void);</div><div class='ctx'> extern void cpci_irq_init(void);</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cascade_fpga = {</div><div class='del'>-	no_action, SA_INTERRUPT, CPU_MASK_NONE, "cascade via FPGA", NULL, NULL</div><div class='add'>+	no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via FPGA", NULL, NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cascade_mv64340 = {</div><div class='del'>-	no_action, SA_INTERRUPT, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL</div><div class='add'>+	no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void ll_uart_irq(struct pt_regs *regs);</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h b/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h<br/>index 97fb77dad723..7228cd19e5ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/ocelot_c_fpga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/ocelot_c_fpga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/ocelot_c_fpga.h</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #ifndef __OCELOT_C_FPGA_H__</div><div class='ctx'> #define __OCELOT_C_FPGA_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> #define OCELOT_C_CS0_ADDR       (0xfffffffffc000000)</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c<br/>index e92364482c7b..4c50a147f429 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/prom.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/reset.c b/arch/mips/momentum/ocelot_c/reset.c<br/>index 9dcd154c7767..3fdcb64ff1e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/reset.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Louis Hamilton, Red Hat, Inc.</div><div class='ctx'>  * hamilton@redhat.com  [MIPS64 modifications]</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c<br/>index a3e6f5575592..36f570ecc6fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/setup.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -210,7 +209,7 @@ int m48t37y_set_time(unsigned long sec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void momenco_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(7, irq);</div><div class='ctx'> }</div><div class='hunk'>@@ -225,13 +224,12 @@ void momenco_time_init(void)</div><div class='ctx'> #error Unknown CPU for this board</div><div class='ctx'> #endif</div><div class='ctx'> 	printk("momenco_time_init cpu_clock=%d\n", cpu_clock);</div><div class='del'>-	board_timer_setup = momenco_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	rtc_mips_get_time = m48t37y_get_time;</div><div class='ctx'> 	rtc_mips_set_time = m48t37y_set_time;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmpword;</div><div class='ctx'> </div><div class='hunk'>@@ -242,8 +240,8 @@ void __init plat_setup(void)</div><div class='ctx'> 	pm_power_off = momenco_ocelot_power_off;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * initrd_start = (ulong)ocelot_initrd_start;</div><div class='del'>-	 * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;</div><div class='add'>+	 * initrd_start = (unsigned long)ocelot_initrd_start;</div><div class='add'>+	 * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;</div><div class='ctx'> 	 * initrd_below_start_ok = 1;</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c<br/>index 755bde5146be..9f33d8f1d826 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/uart-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_c/uart-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_c/uart-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_c/uart-irq.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ void ll_uart_irq(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> #define shutdown_uart_irq	disable_uart_irq</div><div class='ctx'> </div><div class='del'>-struct hw_interrupt_type uart_irq_type = {</div><div class='add'>+struct irq_chip uart_irq_type = {</div><div class='ctx'> 	.typename = "UART/FPGA",</div><div class='ctx'> 	.startup = startup_uart_irq,</div><div class='ctx'> 	.shutdown = shutdown_uart_irq,</div><div class='hunk'>@@ -137,10 +137,10 @@ void uart_irq_init(void)</div><div class='ctx'> 	irq_desc[80].status = IRQ_DISABLED;</div><div class='ctx'> 	irq_desc[80].action = 0;</div><div class='ctx'> 	irq_desc[80].depth = 2;</div><div class='del'>-	irq_desc[80].handler = &amp;uart_irq_type;</div><div class='add'>+	irq_desc[80].chip = &amp;uart_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	irq_desc[81].status = IRQ_DISABLED;</div><div class='ctx'> 	irq_desc[81].action = 0;</div><div class='ctx'> 	irq_desc[81].depth = 2;</div><div class='del'>-	irq_desc[81].handler = &amp;uart_irq_type;</div><div class='add'>+	irq_desc[81].chip = &amp;uart_irq_type;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_g/dbg_io.c b/arch/mips/momentum/ocelot_g/dbg_io.c<br/>index 8720bccfdea2..2128684584f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/dbg_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/dbg_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/dbg_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_g/dbg_io.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='ctx'> </div><div class='hunk'>@@ -73,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	UART16550_WRITE(OFS_INTR_ENABLE, 0);</div><div class='ctx'> </div><div class='del'>-	/* set up buad rate */</div><div class='add'>+	/* set up baud rate */</div><div class='ctx'> 	{</div><div class='ctx'> 		uint32 divisor;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c<br/>index e5eceed1beff..9fb2493fff02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/gt-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/gt-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/gt-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_g/gt-irq.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -59,7 +58,7 @@ void hook_irq_handler(int int_cause, int bit_num, void *isr_ptr)</div><div class='ctx'>  * bit_num   - Indicates which bit number in the cause register</div><div class='ctx'>  *</div><div class='ctx'>  * Outputs :</div><div class='del'>- * 1 if succesful, 0 if failure</div><div class='add'>+ * 1 if successful, 0 if failure</div><div class='ctx'>  */</div><div class='ctx'> int enable_galileo_irq(int int_cause, int bit_num)</div><div class='ctx'> {</div><div class='hunk'>@@ -83,7 +82,7 @@ int enable_galileo_irq(int int_cause, int bit_num)</div><div class='ctx'>  * bit_num   - Indicates which bit number in the cause register</div><div class='ctx'>  *</div><div class='ctx'>  * Outputs :</div><div class='del'>- * 1 if succesful, 0 if failure</div><div class='add'>+ * 1 if successful, 0 if failure</div><div class='ctx'>  */</div><div class='ctx'> int disable_galileo_irq(int int_cause, int bit_num)</div><div class='ctx'> {</div><div class='hunk'>@@ -174,7 +173,7 @@ void gt64240_time_init(void)</div><div class='ctx'> 	 * the values to the correct interrupt line.</div><div class='ctx'> 	 */</div><div class='ctx'> 	timer.handler = &amp;gt64240_p0int_irq;</div><div class='del'>-	timer.flags = SA_SHIRQ | SA_INTERRUPT;</div><div class='add'>+	timer.flags = IRQF_SHARED | IRQF_DISABLED;</div><div class='ctx'> 	timer.name = "timer";</div><div class='ctx'> 	timer.dev_id = NULL;</div><div class='ctx'> 	timer.next = NULL;</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_g/prom.c b/arch/mips/momentum/ocelot_g/prom.c<br/>index 6b4f577c2757..6509a9c9863c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_g/prom.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c<br/>index fed4e8eee116..c580b1de33bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/momentum/ocelot_g/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/momentum/ocelot_g/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/momentum/ocelot_g/setup.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -162,7 +161,7 @@ static void __init setup_l3cache(unsigned long size)</div><div class='ctx'> 	printk("Done\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);</div><div class='ctx'> 	unsigned int tmpword;</div><div class='hunk'>@@ -174,8 +173,8 @@ void __init plat_setup(void)</div><div class='ctx'> 	pm_power_off = momenco_ocelot_power_off;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * initrd_start = (ulong)ocelot_initrd_start;</div><div class='del'>-	 * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;</div><div class='add'>+	 * initrd_start = (unsigned long)ocelot_initrd_start;</div><div class='add'>+	 * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;</div><div class='ctx'> 	 * initrd_below_start_ok = 1;</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c<br/>index 91b799d2cd88..65eb55400d77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/oprofile/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/oprofile/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/oprofile/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/oprofile/common.c</a></div><div class='hunk'>@@ -14,8 +14,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "op_impl.h"</div><div class='ctx'> </div><div class='del'>-extern struct op_mips_model op_model_mipsxx __attribute__((weak));</div><div class='del'>-extern struct op_mips_model op_model_rm9000 __attribute__((weak));</div><div class='add'>+extern struct op_mips_model op_model_mipsxx_ops __attribute__((weak));</div><div class='add'>+extern struct op_mips_model op_model_rm9000_ops __attribute__((weak));</div><div class='ctx'> </div><div class='ctx'> static struct op_mips_model *model;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +38,7 @@ static int op_mips_create_files(struct super_block * sb, struct dentry * root)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; model-&gt;num_counters; ++i) {</div><div class='ctx'> 		struct dentry *dir;</div><div class='del'>-		char buf[3];</div><div class='add'>+		char buf[4];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(buf, sizeof buf, "%d", i);</div><div class='ctx'> 		dir = oprofilefs_mkdir(sb, root, buf);</div><div class='hunk'>@@ -83,11 +83,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)</div><div class='ctx'> 	case CPU_74K:</div><div class='ctx'> 	case CPU_SB1:</div><div class='ctx'> 	case CPU_SB1A:</div><div class='del'>-		lmodel = &amp;op_model_mipsxx;</div><div class='add'>+		lmodel = &amp;op_model_mipsxx_ops;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_RM9000:</div><div class='del'>-		lmodel = &amp;op_model_rm9000;</div><div class='add'>+		lmodel = &amp;op_model_rm9000_ops;</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c<br/>index e7ce92391303..a175d673540f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/oprofile/op_model_mipsxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/oprofile/op_model_mipsxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/oprofile/op_model_mipsxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/oprofile/op_model_mipsxx.c</a></div><div class='hunk'>@@ -12,18 +12,74 @@</div><div class='ctx'> </div><div class='ctx'> #include "op_impl.h"</div><div class='ctx'> </div><div class='del'>-#define M_PERFCTL_EXL			(1UL    &lt;&lt;  0)</div><div class='del'>-#define M_PERFCTL_KERNEL		(1UL    &lt;&lt;  1)</div><div class='del'>-#define M_PERFCTL_SUPERVISOR		(1UL    &lt;&lt;  2)</div><div class='del'>-#define M_PERFCTL_USER			(1UL    &lt;&lt;  3)</div><div class='del'>-#define M_PERFCTL_INTERRUPT_ENABLE	(1UL    &lt;&lt;  4)</div><div class='del'>-#define M_PERFCTL_EVENT(event)		((event) &lt;&lt; 5)</div><div class='del'>-#define M_PERFCTL_WIDE			(1UL    &lt;&lt; 30)</div><div class='del'>-#define M_PERFCTL_MORE			(1UL    &lt;&lt; 31)</div><div class='del'>-</div><div class='del'>-#define M_COUNTER_OVERFLOW		(1UL    &lt;&lt; 31)</div><div class='add'>+#define M_PERFCTL_EXL			(1UL      &lt;&lt;  0)</div><div class='add'>+#define M_PERFCTL_KERNEL		(1UL      &lt;&lt;  1)</div><div class='add'>+#define M_PERFCTL_SUPERVISOR		(1UL      &lt;&lt;  2)</div><div class='add'>+#define M_PERFCTL_USER			(1UL      &lt;&lt;  3)</div><div class='add'>+#define M_PERFCTL_INTERRUPT_ENABLE	(1UL      &lt;&lt;  4)</div><div class='add'>+#define M_PERFCTL_EVENT(event)		((event)  &lt;&lt; 5)</div><div class='add'>+#define M_PERFCTL_VPEID(vpe)		((vpe)    &lt;&lt; 16)</div><div class='add'>+#define M_PERFCTL_MT_EN(filter)		((filter) &lt;&lt; 20)</div><div class='add'>+#define    M_TC_EN_ALL			M_PERFCTL_MT_EN(0)</div><div class='add'>+#define    M_TC_EN_VPE			M_PERFCTL_MT_EN(1)</div><div class='add'>+#define    M_TC_EN_TC			M_PERFCTL_MT_EN(2)</div><div class='add'>+#define M_PERFCTL_TCID(tcid)		((tcid)   &lt;&lt; 22)</div><div class='add'>+#define M_PERFCTL_WIDE			(1UL      &lt;&lt; 30)</div><div class='add'>+#define M_PERFCTL_MORE			(1UL      &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define M_COUNTER_OVERFLOW		(1UL      &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MIPS_MT_SMP</div><div class='add'>+#define WHAT	(M_TC_EN_VPE | M_PERFCTL_VPEID(smp_processor_id()))</div><div class='add'>+#else</div><div class='add'>+#define WHAT	0</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-struct op_mips_model op_model_mipsxx;</div><div class='add'>+#define __define_perf_accessors(r, n, np)				\</div><div class='add'>+									\</div><div class='add'>+static inline unsigned int r_c0_ ## r ## n(void)			\</div><div class='add'>+{									\</div><div class='add'>+	unsigned int cpu = smp_processor_id();				\</div><div class='add'>+									\</div><div class='add'>+	switch (cpu) {							\</div><div class='add'>+	case 0:								\</div><div class='add'>+		return read_c0_ ## r ## n();				\</div><div class='add'>+	case 1:								\</div><div class='add'>+		return read_c0_ ## r ## np();				\</div><div class='add'>+	default:							\</div><div class='add'>+		BUG();							\</div><div class='add'>+	}								\</div><div class='add'>+	return 0;							\</div><div class='add'>+}									\</div><div class='add'>+									\</div><div class='add'>+static inline void w_c0_ ## r ## n(unsigned int value)			\</div><div class='add'>+{									\</div><div class='add'>+	unsigned int cpu = smp_processor_id();				\</div><div class='add'>+									\</div><div class='add'>+	switch (cpu) {							\</div><div class='add'>+	case 0:								\</div><div class='add'>+		write_c0_ ## r ## n(value);				\</div><div class='add'>+		return;							\</div><div class='add'>+	case 1:								\</div><div class='add'>+		write_c0_ ## r ## np(value);				\</div><div class='add'>+		return;							\</div><div class='add'>+	default:							\</div><div class='add'>+		BUG();							\</div><div class='add'>+	}								\</div><div class='add'>+	return;								\</div><div class='add'>+}									\</div><div class='add'>+</div><div class='add'>+__define_perf_accessors(perfcntr, 0, 2)</div><div class='add'>+__define_perf_accessors(perfcntr, 1, 3)</div><div class='add'>+__define_perf_accessors(perfcntr, 2, 2)</div><div class='add'>+__define_perf_accessors(perfcntr, 3, 2)</div><div class='add'>+</div><div class='add'>+__define_perf_accessors(perfctrl, 0, 2)</div><div class='add'>+__define_perf_accessors(perfctrl, 1, 3)</div><div class='add'>+__define_perf_accessors(perfctrl, 2, 2)</div><div class='add'>+__define_perf_accessors(perfctrl, 3, 2)</div><div class='add'>+</div><div class='add'>+struct op_mips_model op_model_mipsxx_ops;</div><div class='ctx'> </div><div class='ctx'> static struct mipsxx_register_config {</div><div class='ctx'> 	unsigned int control[4];</div><div class='hunk'>@@ -34,7 +90,7 @@ static struct mipsxx_register_config {</div><div class='ctx'> </div><div class='ctx'> static void mipsxx_reg_setup(struct op_counter_config *ctr)</div><div class='ctx'> {</div><div class='del'>-	unsigned int counters = op_model_mipsxx.num_counters;</div><div class='add'>+	unsigned int counters = op_model_mipsxx_ops.num_counters;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Compute the performance counter control word.  */</div><div class='hunk'>@@ -62,61 +118,61 @@ static void mipsxx_reg_setup(struct op_counter_config *ctr)</div><div class='ctx'> </div><div class='ctx'> static void mipsxx_cpu_setup (void *args)</div><div class='ctx'> {</div><div class='del'>-	unsigned int counters = op_model_mipsxx.num_counters;</div><div class='add'>+	unsigned int counters = op_model_mipsxx_ops.num_counters;</div><div class='ctx'> </div><div class='ctx'> 	switch (counters) {</div><div class='ctx'> 	case 4:</div><div class='del'>-		write_c0_perfctrl3(0);</div><div class='del'>-		write_c0_perfcntr3(reg.counter[3]);</div><div class='add'>+		w_c0_perfctrl3(0);</div><div class='add'>+		w_c0_perfcntr3(reg.counter[3]);</div><div class='ctx'> 	case 3:</div><div class='del'>-		write_c0_perfctrl2(0);</div><div class='del'>-		write_c0_perfcntr2(reg.counter[2]);</div><div class='add'>+		w_c0_perfctrl2(0);</div><div class='add'>+		w_c0_perfcntr2(reg.counter[2]);</div><div class='ctx'> 	case 2:</div><div class='del'>-		write_c0_perfctrl1(0);</div><div class='del'>-		write_c0_perfcntr1(reg.counter[1]);</div><div class='add'>+		w_c0_perfctrl1(0);</div><div class='add'>+		w_c0_perfcntr1(reg.counter[1]);</div><div class='ctx'> 	case 1:</div><div class='del'>-		write_c0_perfctrl0(0);</div><div class='del'>-		write_c0_perfcntr0(reg.counter[0]);</div><div class='add'>+		w_c0_perfctrl0(0);</div><div class='add'>+		w_c0_perfcntr0(reg.counter[0]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Start all counters on current CPU */</div><div class='ctx'> static void mipsxx_cpu_start(void *args)</div><div class='ctx'> {</div><div class='del'>-	unsigned int counters = op_model_mipsxx.num_counters;</div><div class='add'>+	unsigned int counters = op_model_mipsxx_ops.num_counters;</div><div class='ctx'> </div><div class='ctx'> 	switch (counters) {</div><div class='ctx'> 	case 4:</div><div class='del'>-		write_c0_perfctrl3(reg.control[3]);</div><div class='add'>+		w_c0_perfctrl3(WHAT | reg.control[3]);</div><div class='ctx'> 	case 3:</div><div class='del'>-		write_c0_perfctrl2(reg.control[2]);</div><div class='add'>+		w_c0_perfctrl2(WHAT | reg.control[2]);</div><div class='ctx'> 	case 2:</div><div class='del'>-		write_c0_perfctrl1(reg.control[1]);</div><div class='add'>+		w_c0_perfctrl1(WHAT | reg.control[1]);</div><div class='ctx'> 	case 1:</div><div class='del'>-		write_c0_perfctrl0(reg.control[0]);</div><div class='add'>+		w_c0_perfctrl0(WHAT | reg.control[0]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Stop all counters on current CPU */</div><div class='ctx'> static void mipsxx_cpu_stop(void *args)</div><div class='ctx'> {</div><div class='del'>-	unsigned int counters = op_model_mipsxx.num_counters;</div><div class='add'>+	unsigned int counters = op_model_mipsxx_ops.num_counters;</div><div class='ctx'> </div><div class='ctx'> 	switch (counters) {</div><div class='ctx'> 	case 4:</div><div class='del'>-		write_c0_perfctrl3(0);</div><div class='add'>+		w_c0_perfctrl3(0);</div><div class='ctx'> 	case 3:</div><div class='del'>-		write_c0_perfctrl2(0);</div><div class='add'>+		w_c0_perfctrl2(0);</div><div class='ctx'> 	case 2:</div><div class='del'>-		write_c0_perfctrl1(0);</div><div class='add'>+		w_c0_perfctrl1(0);</div><div class='ctx'> 	case 1:</div><div class='del'>-		write_c0_perfctrl0(0);</div><div class='add'>+		w_c0_perfctrl0(0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mipsxx_perfcount_handler(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	unsigned int counters = op_model_mipsxx.num_counters;</div><div class='add'>+	unsigned int counters = op_model_mipsxx_ops.num_counters;</div><div class='ctx'> 	unsigned int control;</div><div class='ctx'> 	unsigned int counter;</div><div class='ctx'> 	int handled = 0;</div><div class='hunk'>@@ -124,12 +180,12 @@ static int mipsxx_perfcount_handler(struct pt_regs *regs)</div><div class='ctx'> 	switch (counters) {</div><div class='ctx'> #define HANDLE_COUNTER(n)						\</div><div class='ctx'> 	case n + 1:							\</div><div class='del'>-		control = read_c0_perfctrl ## n();			\</div><div class='del'>-		counter = read_c0_perfcntr ## n();			\</div><div class='add'>+		control = r_c0_perfctrl ## n();				\</div><div class='add'>+		counter = r_c0_perfcntr ## n();				\</div><div class='ctx'> 		if ((control &amp; M_PERFCTL_INTERRUPT_ENABLE) &amp;&amp;		\</div><div class='ctx'> 		    (counter &amp; M_COUNTER_OVERFLOW)) {			\</div><div class='ctx'> 			oprofile_add_sample(regs, n);			\</div><div class='del'>-			write_c0_perfcntr ## n(reg.counter[n]);		\</div><div class='add'>+			w_c0_perfcntr ## n(reg.counter[n]);		\</div><div class='ctx'> 			handled = 1;					\</div><div class='ctx'> 		}</div><div class='ctx'> 	HANDLE_COUNTER(3)</div><div class='hunk'>@@ -143,35 +199,47 @@ static int mipsxx_perfcount_handler(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> #define M_CONFIG1_PC	(1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='del'>-static inline int n_counters(void)</div><div class='add'>+static inline int __n_counters(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(read_c0_config1() &amp; M_CONFIG1_PC))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!(read_c0_perfctrl0() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(r_c0_perfctrl0() &amp; M_PERFCTL_MORE))</div><div class='ctx'> 		return 1;</div><div class='del'>-	if (!(read_c0_perfctrl1() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(r_c0_perfctrl1() &amp; M_PERFCTL_MORE))</div><div class='ctx'> 		return 2;</div><div class='del'>-	if (!(read_c0_perfctrl2() &amp; M_PERFCTL_MORE))</div><div class='add'>+	if (!(r_c0_perfctrl2() &amp; M_PERFCTL_MORE))</div><div class='ctx'> 		return 3;</div><div class='ctx'> </div><div class='ctx'> 	return 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int n_counters(void)</div><div class='add'>+{</div><div class='add'>+	int counters = __n_counters();</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	if (current_cpu_data.cputype == CPU_34K)</div><div class='add'>+		return counters &gt;&gt; 1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return counters;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void reset_counters(int counters)</div><div class='ctx'> {</div><div class='ctx'> 	switch (counters) {</div><div class='ctx'> 	case 4:</div><div class='del'>-		write_c0_perfctrl3(0);</div><div class='del'>-		write_c0_perfcntr3(0);</div><div class='add'>+		w_c0_perfctrl3(0);</div><div class='add'>+		w_c0_perfcntr3(0);</div><div class='ctx'> 	case 3:</div><div class='del'>-		write_c0_perfctrl2(0);</div><div class='del'>-		write_c0_perfcntr2(0);</div><div class='add'>+		w_c0_perfctrl2(0);</div><div class='add'>+		w_c0_perfcntr2(0);</div><div class='ctx'> 	case 2:</div><div class='del'>-		write_c0_perfctrl1(0);</div><div class='del'>-		write_c0_perfcntr1(0);</div><div class='add'>+		w_c0_perfctrl1(0);</div><div class='add'>+		w_c0_perfcntr1(0);</div><div class='ctx'> 	case 1:</div><div class='del'>-		write_c0_perfctrl0(0);</div><div class='del'>-		write_c0_perfcntr0(0);</div><div class='add'>+		w_c0_perfctrl0(0);</div><div class='add'>+		w_c0_perfcntr0(0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,37 +255,35 @@ static int __init mipsxx_init(void)</div><div class='ctx'> </div><div class='ctx'> 	reset_counters(counters);</div><div class='ctx'> </div><div class='del'>-	op_model_mipsxx.num_counters = counters;</div><div class='add'>+	op_model_mipsxx_ops.num_counters = counters;</div><div class='ctx'> 	switch (current_cpu_data.cputype) {</div><div class='ctx'> 	case CPU_20KC:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/20K";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/20K";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_24K:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/24K";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/24K";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_25KF:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/25K";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/25K";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SMP</div><div class='ctx'> 	case CPU_34K:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/34K";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/34K";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_74K:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/74K";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/74K";</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	case CPU_5KC:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/5K";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/5K";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPU_SB1:</div><div class='ctx'> 	case CPU_SB1A:</div><div class='del'>-		op_model_mipsxx.cpu_type = "mips/sb1";</div><div class='add'>+		op_model_mipsxx_ops.cpu_type = "mips/sb1";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -233,12 +299,12 @@ static int __init mipsxx_init(void)</div><div class='ctx'> </div><div class='ctx'> static void mipsxx_exit(void)</div><div class='ctx'> {</div><div class='del'>-	reset_counters(op_model_mipsxx.num_counters);</div><div class='add'>+	reset_counters(op_model_mipsxx_ops.num_counters);</div><div class='ctx'> </div><div class='ctx'> 	perf_irq = null_perf_irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct op_mips_model op_model_mipsxx = {</div><div class='add'>+struct op_mips_model op_model_mipsxx_ops = {</div><div class='ctx'> 	.reg_setup	= mipsxx_reg_setup,</div><div class='ctx'> 	.cpu_setup	= mipsxx_cpu_setup,</div><div class='ctx'> 	.init		= mipsxx_init,</div><div class='head'>diff --git a/arch/mips/oprofile/op_model_rm9000.c b/arch/mips/oprofile/op_model_rm9000.c<br/>index 9b75e41c78ef..b7063fefa65b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/oprofile/op_model_rm9000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/oprofile/op_model_rm9000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/oprofile/op_model_rm9000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/oprofile/op_model_rm9000.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static void rm9000_exit(void)</div><div class='ctx'> 	free_irq(rm9000_perfcount_irq, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct op_mips_model op_model_rm9000 = {</div><div class='add'>+struct op_mips_model op_model_rm9000_ops = {</div><div class='ctx'> 	.reg_setup	= rm9000_reg_setup,</div><div class='ctx'> 	.cpu_setup	= rm9000_cpu_setup,</div><div class='ctx'> 	.init		= rm9000_init,</div><div class='head'>diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile<br/>index 16205b587338..35d5927706ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/Makefile</a></div><div class='hunk'>@@ -18,12 +18,12 @@ obj-$(CONFIG_MIPS_NILE4)	+= ops-nile4.o</div><div class='ctx'> obj-$(CONFIG_MIPS_TX3927)	+= ops-tx3927.o</div><div class='ctx'> obj-$(CONFIG_PCI_VR41XX)	+= ops-vr41xx.o pci-vr41xx.o</div><div class='ctx'> obj-$(CONFIG_NEC_CMBVR4133)	+= fixup-vr4133.o</div><div class='add'>+obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # These are still pretty much in the old state, watch, go blind.</div><div class='ctx'> #</div><div class='del'>-obj-$(CONFIG_DDB5074)		+= fixup-ddb5074.o pci-ddb5074.o ops-ddb5074.o</div><div class='del'>-obj-$(CONFIG_DDB5476)		+= ops-ddb5476.o pci-ddb5476.o</div><div class='add'>+obj-$(CONFIG_BASLER_EXCITE)	+= ops-titan.o pci-excite.o fixup-excite.o</div><div class='ctx'> obj-$(CONFIG_DDB5477)		+= fixup-ddb5477.o pci-ddb5477.o ops-ddb5477.o</div><div class='ctx'> obj-$(CONFIG_LASAT)		+= pci-lasat.o</div><div class='ctx'> obj-$(CONFIG_MIPS_ATLAS)	+= fixup-atlas.o</div><div class='hunk'>@@ -43,7 +43,7 @@ obj-$(CONFIG_MOMENCO_OCELOT_C)	+= fixup-ocelot-c.o pci-ocelot-c.o</div><div class='ctx'> obj-$(CONFIG_MOMENCO_OCELOT_G)	+= fixup-ocelot-g.o pci-ocelot-g.o</div><div class='ctx'> obj-$(CONFIG_PMC_YOSEMITE)	+= fixup-yosemite.o ops-titan.o ops-titan-ht.o \</div><div class='ctx'> 				   pci-yosemite.o</div><div class='del'>-obj-$(CONFIG_SGI_IP27)		+= pci-ip27.o</div><div class='add'>+obj-$(CONFIG_SGI_IP27)		+= ops-bridge.o pci-ip27.o</div><div class='ctx'> obj-$(CONFIG_SGI_IP32)		+= fixup-ip32.o ops-mace.o pci-ip32.o</div><div class='ctx'> obj-$(CONFIG_SIBYTE_SB1250)	+= fixup-sb1250.o pci-sb1250.o</div><div class='ctx'> obj-$(CONFIG_SIBYTE_BCM112X)	+= fixup-sb1250.o pci-sb1250.o</div><div class='hunk'>@@ -57,3 +57,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4927)	+= fixup-rbtx4927.o ops-tx4927.o</div><div class='ctx'> obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-tx4938.o ops-tx4938.o</div><div class='ctx'> obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o</div><div class='ctx'> obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o</div><div class='add'>+obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o</div><div class='head'>diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c<br/>index 87920b245931..439510af3037 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-atlas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-atlas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-atlas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/fixup-atlas.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/fixup-ddb5074.c b/arch/mips/pci/fixup-ddb5074.c<br/>deleted file mode 100644<br/>index 5a4a7c239c42..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-ddb5074.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-ddb5074.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * It's nice to have the LEDs on the GPIO pins available for debugging</div><div class='del'>- */</div><div class='del'>-static void ddb5074_fixup(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	extern struct pci_dev *pci_pmu;</div><div class='del'>-	u8 t8;</div><div class='del'>-</div><div class='del'>-	pci_pmu = dev;  /* for LEDs D2 and D3 */</div><div class='del'>-	/* Program the lines for LEDs D2 and D3 to output */</div><div class='del'>-	pci_read_config_byte(dev, 0x7d, &amp;t8);</div><div class='del'>-	t8 |= 0xc0;</div><div class='del'>-	pci_write_config_byte(dev, 0x7d, t8);</div><div class='del'>-	/* Turn LEDs D2 and D3 off */</div><div class='del'>-	pci_read_config_byte(dev, 0x7e, &amp;t8);</div><div class='del'>-	t8 |= 0xc0;</div><div class='del'>-	pci_write_config_byte(dev, 0x7e, t8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,</div><div class='del'>-	  ddb5074_fixup);</div><div class='head'>diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c<br/>new file mode 100644<br/>index 000000000000..7abcfd175d43<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/fixup-emma2rh.c</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/pci/fixup-emma2rh.c</div><div class='add'>+ *      This file defines the PCI configration.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/pci.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+#define EMMA2RH_PCI_HOST_SLOT 0x09</div><div class='add'>+#define EMMA2RH_USB_SLOT 0x03</div><div class='add'>+#define PCI_DEVICE_ID_NEC_EMMA2RH      0x014b /* EMMA2RH PCI Host */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * we fix up irqs based on the slot number.</div><div class='add'>+ * The first entry is at AD:11.</div><div class='add'>+ * Fortunately this works because, although we have two pci buses,</div><div class='add'>+ * they all have different slot numbers (except for rockhopper slot 20</div><div class='add'>+ * which is handled below).</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define	MAX_SLOT_NUM 10</div><div class='add'>+static unsigned char irq_map[][5] __initdata = {</div><div class='add'>+	[3] = {0, MARKEINS_PCI_IRQ_INTB, MARKEINS_PCI_IRQ_INTC,</div><div class='add'>+	       MARKEINS_PCI_IRQ_INTD, 0,},</div><div class='add'>+	[4] = {0, MARKEINS_PCI_IRQ_INTA, 0, 0, 0,},</div><div class='add'>+	[5] = {0, 0, 0, 0, 0,},</div><div class='add'>+	[6] = {0, MARKEINS_PCI_IRQ_INTC, MARKEINS_PCI_IRQ_INTD,</div><div class='add'>+	       MARKEINS_PCI_IRQ_INTA, MARKEINS_PCI_IRQ_INTB,},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __devinit nec_usb_controller_fixup(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (PCI_SLOT(dev-&gt;devfn) == EMMA2RH_USB_SLOT)</div><div class='add'>+		/* on board USB controller configuration */</div><div class='add'>+		pci_write_config_dword(dev, 0xe4, 1 &lt;&lt; 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,</div><div class='add'>+			nec_usb_controller_fixup);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Prevent the PCI layer from seeing the resources allocated to this device</div><div class='add'>+ * if it is the host bridge by marking it as such.  These resources are of</div><div class='add'>+ * no consequence to the PCI layer (they are handled elsewhere).</div><div class='add'>+ */</div><div class='add'>+static void __devinit emma2rh_pci_host_fixup(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (PCI_SLOT(dev-&gt;devfn) == EMMA2RH_PCI_HOST_SLOT) {</div><div class='add'>+		dev-&gt;class &amp;= 0xff;</div><div class='add'>+		dev-&gt;class |= PCI_CLASS_BRIDGE_HOST &lt;&lt; 8;</div><div class='add'>+		for (i = 0; i &lt; PCI_NUM_RESOURCES; i++) {</div><div class='add'>+			dev-&gt;resource[i].start = 0;</div><div class='add'>+			dev-&gt;resource[i].end = 0;</div><div class='add'>+			dev-&gt;resource[i].flags = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH,</div><div class='add'>+			 emma2rh_pci_host_fixup);</div><div class='add'>+</div><div class='add'>+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	return irq_map[slot][pin];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Do platform specific device initialization at pci_enable_device() time */</div><div class='add'>+int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/fixup-excite.c b/arch/mips/pci/fixup-excite.c<br/>new file mode 100644<br/>index 000000000000..1da696d43f00<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-excite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/fixup-excite.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	if (pin == 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return USB_IRQ;		/* USB controller is the only PCI device */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Do platform specific device initialization at pci_enable_device() time */</div><div class='add'>+int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c<br/>index b67ddaa47122..3c9ae41f7517 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-mpc30x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-mpc30x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-mpc30x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/fixup-mpc30x.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/vr41xx/mpc30x.h&gt;</div><div class='del'>-#include &lt;asm/vr41xx/vrc4173.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const int internal_func_irqs[] __initdata = {</div><div class='ctx'> 	VRC4173_CASCADE_IRQ,</div><div class='head'>diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c<br/>index a8a47b494b23..8e01d0c1b76b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-vr4133.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/fixup-vr4133.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-vr4133.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/fixup-vr4133.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * Author: Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/fixup-wrppmc.c b/arch/mips/pci/fixup-wrppmc.c<br/>new file mode 100644<br/>index 000000000000..3357c1300bb1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/fixup-wrppmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/fixup-wrppmc.c</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/*</div><div class='add'>+ * fixup-wrppmc.c: PPMC board specific PCI fixup</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006, Wind River Inc. Rongkai.zhan (rongkai.zhan@windriver.com)</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm/gt64120.h&gt;</div><div class='add'>+</div><div class='add'>+/* PCI interrupt pins */</div><div class='add'>+#define PCI_INTA		1</div><div class='add'>+#define PCI_INTB		2</div><div class='add'>+#define PCI_INTC		3</div><div class='add'>+#define PCI_INTD		4</div><div class='add'>+</div><div class='add'>+#define PCI_SLOT_MAXNR	32 /* Each PCI bus has 32 physical slots */</div><div class='add'>+</div><div class='add'>+static char pci_irq_tab[PCI_SLOT_MAXNR][5] __initdata = {</div><div class='add'>+	/* 0    INTA   INTB   INTC   INTD */</div><div class='add'>+	[0] = {0, 0, 0, 0, 0},		/* Slot 0: GT64120 PCI bridge */</div><div class='add'>+	[6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	return pci_irq_tab[slot][pin];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Do platform specific device initialization at pci_enable_device() time */</div><div class='add'>+int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c<br/>index be1420126c42..0c0c1e6519f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-au1000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-au1000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-au1000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-au1000.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/pci/ops-bridge.c b/arch/mips/pci/ops-bridge.c<br/>new file mode 100644<br/>index 000000000000..1fa09929cd7a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-bridge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-bridge.c</a></div><div class='hunk'>@@ -0,0 +1,306 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1999, 2000, 04, 06 Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm/paccess.h&gt;</div><div class='add'>+#include &lt;asm/pci/bridge.h&gt;</div><div class='add'>+#include &lt;asm/sn/arch.h&gt;</div><div class='add'>+#include &lt;asm/sn/intr.h&gt;</div><div class='add'>+#include &lt;asm/sn/sn0/hub.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Bridge ASIC supports both type 0 and type 1 access.  Type 1 is</div><div class='add'>+ * not really documented, so right now I can't write code which uses it.</div><div class='add'>+ * Therefore we use type 0 accesses for now even though they won't work</div><div class='add'>+ * correcly for PCI-to-PCI bridges.</div><div class='add'>+ *</div><div class='add'>+ * The function is complicated by the ultimate brokeness of the IOC3 chip</div><div class='add'>+ * which is used in SGI systems.  The IOC3 can only handle 32-bit PCI</div><div class='add'>+ * accesses and does only decode parts of it's address space.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int pci_conf0_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+				 int where, int size, u32 * value)</div><div class='add'>+{</div><div class='add'>+	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='add'>+	bridge_t *bridge = bc-&gt;base;</div><div class='add'>+	int slot = PCI_SLOT(devfn);</div><div class='add'>+	int fn = PCI_FUNC(devfn);</div><div class='add'>+	volatile void *addr;</div><div class='add'>+	u32 cf, shift, mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[PCI_VENDOR_ID];</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to look at it for real ...</div><div class='add'>+	 */</div><div class='add'>+	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='add'>+		goto oh_my_gawd;</div><div class='add'>+</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[where ^ (4 - size)];</div><div class='add'>+</div><div class='add'>+	if (size == 1)</div><div class='add'>+		res = get_dbe(*value, (u8 *) addr);</div><div class='add'>+	else if (size == 2)</div><div class='add'>+		res = get_dbe(*value, (u16 *) addr);</div><div class='add'>+	else</div><div class='add'>+		res = get_dbe(*value, (u32 *) addr);</div><div class='add'>+</div><div class='add'>+	return res ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+oh_my_gawd:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to look at the wrong register.</div><div class='add'>+	 */</div><div class='add'>+	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48)) {</div><div class='add'>+		*value = 0;</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='add'>+	 * anything but 32-bit words ...</div><div class='add'>+	 */</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].l[where &gt;&gt; 2];</div><div class='add'>+</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='add'>+	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='add'>+	*value = (cf &gt;&gt; shift) &amp; mask;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_conf1_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+				 int where, int size, u32 * value)</div><div class='add'>+{</div><div class='add'>+	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='add'>+	bridge_t *bridge = bc-&gt;base;</div><div class='add'>+	int busno = bus-&gt;number;</div><div class='add'>+	int slot = PCI_SLOT(devfn);</div><div class='add'>+	int fn = PCI_FUNC(devfn);</div><div class='add'>+	volatile void *addr;</div><div class='add'>+	u32 cf, shift, mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='add'>+	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | PCI_VENDOR_ID];</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to look at it for real ...</div><div class='add'>+	 */</div><div class='add'>+	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='add'>+		goto oh_my_gawd;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='add'>+	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | (where ^ (4 - size))];</div><div class='add'>+</div><div class='add'>+	if (size == 1)</div><div class='add'>+		res = get_dbe(*value, (u8 *) addr);</div><div class='add'>+	else if (size == 2)</div><div class='add'>+		res = get_dbe(*value, (u16 *) addr);</div><div class='add'>+	else</div><div class='add'>+		res = get_dbe(*value, (u32 *) addr);</div><div class='add'>+</div><div class='add'>+	return res ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+oh_my_gawd:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to look at the wrong register.</div><div class='add'>+	 */</div><div class='add'>+	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48)) {</div><div class='add'>+		*value = 0;</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='add'>+	 * anything but 32-bit words ...</div><div class='add'>+	 */</div><div class='add'>+	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='add'>+	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | where];</div><div class='add'>+</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='add'>+	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='add'>+	*value = (cf &gt;&gt; shift) &amp; mask;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+			   int where, int size, u32 * value)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;number &gt; 0)</div><div class='add'>+		return pci_conf1_read_config(bus, devfn, where, size, value);</div><div class='add'>+</div><div class='add'>+	return pci_conf0_read_config(bus, devfn, where, size, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_conf0_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+				  int where, int size, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='add'>+	bridge_t *bridge = bc-&gt;base;</div><div class='add'>+	int slot = PCI_SLOT(devfn);</div><div class='add'>+	int fn = PCI_FUNC(devfn);</div><div class='add'>+	volatile void *addr;</div><div class='add'>+	u32 cf, shift, mask, smask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[PCI_VENDOR_ID];</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to look at it for real ...</div><div class='add'>+	 */</div><div class='add'>+	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='add'>+		goto oh_my_gawd;</div><div class='add'>+</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[where ^ (4 - size)];</div><div class='add'>+</div><div class='add'>+	if (size == 1) {</div><div class='add'>+		res = put_dbe(value, (u8 *) addr);</div><div class='add'>+	} else if (size == 2) {</div><div class='add'>+		res = put_dbe(value, (u16 *) addr);</div><div class='add'>+	} else {</div><div class='add'>+		res = put_dbe(value, (u32 *) addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+oh_my_gawd:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to touch the wrong register.</div><div class='add'>+	 */</div><div class='add'>+	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48))</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='add'>+	 * anything but 32-bit words ...</div><div class='add'>+	 */</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].l[where &gt;&gt; 2];</div><div class='add'>+</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='add'>+	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='add'>+	smask = mask &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	cf = (cf &amp; ~smask) | ((value &amp; mask) &lt;&lt; shift);</div><div class='add'>+	if (put_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_conf1_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+				  int where, int size, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='add'>+	bridge_t *bridge = bc-&gt;base;</div><div class='add'>+	int slot = PCI_SLOT(devfn);</div><div class='add'>+	int fn = PCI_FUNC(devfn);</div><div class='add'>+	int busno = bus-&gt;number;</div><div class='add'>+	volatile void *addr;</div><div class='add'>+	u32 cf, shift, mask, smask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='add'>+	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | PCI_VENDOR_ID];</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to look at it for real ...</div><div class='add'>+	 */</div><div class='add'>+	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='add'>+		goto oh_my_gawd;</div><div class='add'>+</div><div class='add'>+	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | (where ^ (4 - size))];</div><div class='add'>+</div><div class='add'>+	if (size == 1) {</div><div class='add'>+		res = put_dbe(value, (u8 *) addr);</div><div class='add'>+	} else if (size == 2) {</div><div class='add'>+		res = put_dbe(value, (u16 *) addr);</div><div class='add'>+	} else {</div><div class='add'>+		res = put_dbe(value, (u32 *) addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+oh_my_gawd:</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='add'>+	 * generic PCI code a chance to touch the wrong register.</div><div class='add'>+	 */</div><div class='add'>+	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48))</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='add'>+	 * anything but 32-bit words ...</div><div class='add'>+	 */</div><div class='add'>+	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].l[where &gt;&gt; 2];</div><div class='add'>+</div><div class='add'>+	if (get_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='add'>+	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='add'>+	smask = mask &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	cf = (cf &amp; ~smask) | ((value &amp; mask) &lt;&lt; shift);</div><div class='add'>+	if (put_dbe(cf, (u32 *) addr))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='add'>+	int where, int size, u32 value)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;number &gt; 0)</div><div class='add'>+		return pci_conf1_write_config(bus, devfn, where, size, value);</div><div class='add'>+</div><div class='add'>+	return pci_conf0_write_config(bus, devfn, where, size, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pci_ops bridge_pci_ops = {</div><div class='add'>+	.read	= pci_read_config,</div><div class='add'>+	.write	= pci_write_config,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/pci/ops-ddb5074.c b/arch/mips/pci/ops-ddb5074.c<br/>deleted file mode 100644<br/>index 89f97bef4fc4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-ddb5074.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-ddb5074.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,271 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- * arch/mips/ddb5xxx/ddb5476/pci_ops.c</div><div class='del'>- *     Define the pci_ops for DB5477.</div><div class='del'>- *</div><div class='del'>- * Much of the code is derived from the original DDB5074 port by</div><div class='del'>- * Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * config_swap structure records what set of pdar/pmr are used</div><div class='del'>- * to access pci config space.  It also provides a place hold the</div><div class='del'>- * original values for future restoring.</div><div class='del'>- */</div><div class='del'>-struct pci_config_swap {</div><div class='del'>-	u32 pdar;</div><div class='del'>-	u32 pmr;</div><div class='del'>-	u32 config_base;</div><div class='del'>-	u32 config_size;</div><div class='del'>-	u32 pdar_backup;</div><div class='del'>-	u32 pmr_backup;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On DDB5476, we have one set of swap registers</div><div class='del'>- */</div><div class='del'>-struct pci_config_swap ext_pci_swap = {</div><div class='del'>-	DDB_PCIW0,</div><div class='del'>-	DDB_PCIINIT0,</div><div class='del'>-	DDB_PCI_CONFIG_BASE,</div><div class='del'>-	DDB_PCI_CONFIG_SIZE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int pci_config_workaround = 1;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * access config space</div><div class='del'>- */</div><div class='del'>-static inline u32 ddb_access_config_base(struct pci_config_swap *swap, u32 bus,	/* 0 means top level bus */</div><div class='del'>-					 u32 slot_num)</div><div class='del'>-{</div><div class='del'>-	u32 pci_addr = 0;</div><div class='del'>-	u32 pciinit_offset = 0;</div><div class='del'>-	u32 virt_addr = swap-&gt;config_base;</div><div class='del'>-	u32 option;</div><div class='del'>-</div><div class='del'>-	if (pci_config_workaround) {</div><div class='del'>-		if (slot_num == 5)</div><div class='del'>-			slot_num = 14;</div><div class='del'>-	} else {</div><div class='del'>-		if (slot_num == 5)</div><div class='del'>-			return DDB_BASE + DDB_PCI_BASE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* minimum pdar (window) size is 2MB */</div><div class='del'>-	db_assert(swap-&gt;config_size &gt;= (2 &lt;&lt; 20));</div><div class='del'>-</div><div class='del'>-	db_assert(slot_num &lt; (1 &lt;&lt; 5));</div><div class='del'>-	db_assert(bus &lt; (1 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	/* backup registers */</div><div class='del'>-	swap-&gt;pdar_backup = ddb_in32(swap-&gt;pdar);</div><div class='del'>-	swap-&gt;pmr_backup = ddb_in32(swap-&gt;pmr);</div><div class='del'>-</div><div class='del'>-	/* set the pdar (pci window) register */</div><div class='del'>-	ddb_set_pdar(swap-&gt;pdar, swap-&gt;config_base, swap-&gt;config_size, 32,	/* 32 bit wide */</div><div class='del'>-		     0,		/* not on local memory bus */</div><div class='del'>-		     0);	/* not visible from PCI bus (N/A) */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * calcuate the absolute pci config addr;</div><div class='del'>-	 * according to the spec, we start scanning from adr:11 (0x800)</div><div class='del'>-	 */</div><div class='del'>-	if (bus == 0) {</div><div class='del'>-		/* type 0 config */</div><div class='del'>-		pci_addr = 0x00040000 &lt;&lt; slot_num;</div><div class='del'>-	} else {</div><div class='del'>-		/* type 1 config */</div><div class='del'>-		pci_addr = 0x00040000 &lt;&lt; slot_num;</div><div class='del'>-		panic</div><div class='del'>-		    ("ddb_access_config_base: we don't support type 1 config Yet");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if pci_addr is less than pci config window size,  we set</div><div class='del'>-	 * pciinit_offset to 0 and adjust the virt_address.</div><div class='del'>-	 * Otherwise we will try to adjust pciinit_offset.</div><div class='del'>-	 */</div><div class='del'>-	if (pci_addr &lt; swap-&gt;config_size) {</div><div class='del'>-		virt_addr = KSEG1ADDR(swap-&gt;config_base + pci_addr);</div><div class='del'>-		pciinit_offset = 0;</div><div class='del'>-	} else {</div><div class='del'>-		db_assert((pci_addr &amp; (swap-&gt;config_size - 1)) == 0);</div><div class='del'>-		virt_addr = KSEG1ADDR(swap-&gt;config_base);</div><div class='del'>-		pciinit_offset = pci_addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the pmr register */</div><div class='del'>-	option = DDB_PCI_ACCESS_32;</div><div class='del'>-	if (bus != 0)</div><div class='del'>-		option |= DDB_PCI_CFGTYPE1;</div><div class='del'>-	ddb_set_pmr(swap-&gt;pmr, DDB_PCICMD_CFG, pciinit_offset, option);</div><div class='del'>-</div><div class='del'>-	return virt_addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ddb_close_config_base(struct pci_config_swap *swap)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(swap-&gt;pdar, swap-&gt;pdar_backup);</div><div class='del'>-	ddb_out32(swap-&gt;pmr, swap-&gt;pmr_backup);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_config_dword(struct pci_config_swap *swap,</div><div class='del'>-			     struct pci_dev *dev, u32 where, u32 * val)</div><div class='del'>-{</div><div class='del'>-	u32 bus, slot_num, func_num;</div><div class='del'>-	u32 base;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 3) == 0);</div><div class='del'>-	db_assert(where &lt; (1 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	/* check if the bus is top-level */</div><div class='del'>-	if (dev-&gt;bus-&gt;parent != NULL) {</div><div class='del'>-		bus = dev-&gt;bus-&gt;number;</div><div class='del'>-		db_assert(bus != 0);</div><div class='del'>-	} else {</div><div class='del'>-		bus = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_num = PCI_SLOT(dev-&gt;devfn);</div><div class='del'>-	func_num = PCI_FUNC(dev-&gt;devfn);</div><div class='del'>-	base = ddb_access_config_base(swap, bus, slot_num);</div><div class='del'>-	*val = *(volatile u32 *) (base + (func_num &lt;&lt; 8) + where);</div><div class='del'>-	ddb_close_config_base(swap);</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_config_word(struct pci_config_swap *swap,</div><div class='del'>-			    struct pci_dev *dev, u32 where, u16 * val)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 1) == 0);</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		result &gt;&gt;= 16;</div><div class='del'>-	*val = result &amp; 0xffff;</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_config_byte(struct pci_config_swap *swap,</div><div class='del'>-			    struct pci_dev *dev, u32 where, u8 * val)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (where &amp; 1)</div><div class='del'>-		result &gt;&gt;= 8;</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		result &gt;&gt;= 16;</div><div class='del'>-	*val = result &amp; 0xff;</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_config_dword(struct pci_config_swap *swap,</div><div class='del'>-			      struct pci_dev *dev, u32 where, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 bus, slot_num, func_num;</div><div class='del'>-	u32 base;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 3) == 0);</div><div class='del'>-	db_assert(where &lt; (1 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	/* check if the bus is top-level */</div><div class='del'>-	if (dev-&gt;bus-&gt;parent != NULL) {</div><div class='del'>-		bus = dev-&gt;bus-&gt;number;</div><div class='del'>-		db_assert(bus != 0);</div><div class='del'>-	} else {</div><div class='del'>-		bus = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_num = PCI_SLOT(dev-&gt;devfn);</div><div class='del'>-	func_num = PCI_FUNC(dev-&gt;devfn);</div><div class='del'>-	base = ddb_access_config_base(swap, bus, slot_num);</div><div class='del'>-	*(volatile u32 *) (base + (func_num &lt;&lt; 8) + where) = val;</div><div class='del'>-	ddb_close_config_base(swap);</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_config_word(struct pci_config_swap *swap,</div><div class='del'>-			     struct pci_dev *dev, u32 where, u16 val)</div><div class='del'>-{</div><div class='del'>-	int status, shift = 0;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 1) == 0);</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (status != PCIBIOS_SUCCESSFUL)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		shift += 16;</div><div class='del'>-	result &amp;= ~(0xffff &lt;&lt; shift);</div><div class='del'>-	result |= val &lt;&lt; shift;</div><div class='del'>-	return write_config_dword(swap, dev, where &amp; ~3, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_config_byte(struct pci_config_swap *swap,</div><div class='del'>-			     struct pci_dev *dev, u32 where, u8 val)</div><div class='del'>-{</div><div class='del'>-	int status, shift = 0;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (status != PCIBIOS_SUCCESSFUL)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		shift += 16;</div><div class='del'>-	if (where &amp; 1)</div><div class='del'>-		shift += 8;</div><div class='del'>-	result &amp;= ~(0xff &lt;&lt; shift);</div><div class='del'>-	result |= val &lt;&lt; shift;</div><div class='del'>-	return write_config_dword(swap, dev, where &amp; ~3, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define	MAKE_PCI_OPS(prefix, rw, unitname, unittype, pciswap) \</div><div class='del'>-static int prefix##_##rw##_config_##unitname(struct pci_dev *dev, int where, unittype val) \</div><div class='del'>-{ \</div><div class='del'>-     return rw##_config_##unitname(pciswap, \</div><div class='del'>-                                   dev, \</div><div class='del'>-                                   where, \</div><div class='del'>-                                   val); \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MAKE_PCI_OPS(extpci, read, byte, u8 *, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, read, word, u16 *, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, read, dword, u32 *, &amp;ext_pci_swap)</div><div class='del'>-</div><div class='del'>-    MAKE_PCI_OPS(extpci, write, byte, u8, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, write, word, u16, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, write, dword, u32, &amp;ext_pci_swap)</div><div class='del'>-</div><div class='del'>-struct pci_ops ddb5476_ext_pci_ops = {</div><div class='del'>-	extpci_read_config_byte,</div><div class='del'>-	extpci_read_config_word,</div><div class='del'>-	extpci_read_config_dword,</div><div class='del'>-	extpci_write_config_byte,</div><div class='del'>-	extpci_write_config_word,</div><div class='del'>-	extpci_write_config_dword</div><div class='del'>-};</div><div class='head'>diff --git a/arch/mips/pci/ops-ddb5476.c b/arch/mips/pci/ops-ddb5476.c<br/>deleted file mode 100644<br/>index 12da58e75ec7..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-ddb5476.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-ddb5476.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,286 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net</div><div class='del'>- *</div><div class='del'>- * arch/mips/ddb5xxx/ddb5476/pci_ops.c</div><div class='del'>- *     Define the pci_ops for DB5477.</div><div class='del'>- *</div><div class='del'>- * Much of the code is derived from the original DDB5074 port by</div><div class='del'>- * Geert Uytterhoeven &lt;geert@sonycom.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- * under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/addrspace.h&gt;</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * config_swap structure records what set of pdar/pmr are used</div><div class='del'>- * to access pci config space.  It also provides a place hold the</div><div class='del'>- * original values for future restoring.</div><div class='del'>- */</div><div class='del'>-struct pci_config_swap {</div><div class='del'>-	u32 pdar;</div><div class='del'>-	u32 pmr;</div><div class='del'>-	u32 config_base;</div><div class='del'>-	u32 config_size;</div><div class='del'>-	u32 pdar_backup;</div><div class='del'>-	u32 pmr_backup;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On DDB5476, we have one set of swap registers</div><div class='del'>- */</div><div class='del'>-struct pci_config_swap ext_pci_swap = {</div><div class='del'>-	DDB_PCIW0,</div><div class='del'>-	DDB_PCIINIT0,</div><div class='del'>-	DDB_PCI_CONFIG_BASE,</div><div class='del'>-	DDB_PCI_CONFIG_SIZE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int pci_config_workaround = 1;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * access config space</div><div class='del'>- */</div><div class='del'>-static inline u32 ddb_access_config_base(struct pci_config_swap *swap, u32 bus,	/* 0 means top level bus */</div><div class='del'>-					 u32 slot_num)</div><div class='del'>-{</div><div class='del'>-	u32 pci_addr = 0;</div><div class='del'>-	u32 pciinit_offset = 0;</div><div class='del'>-	u32 virt_addr = swap-&gt;config_base;</div><div class='del'>-	u32 option;</div><div class='del'>-</div><div class='del'>-	if (pci_config_workaround) {</div><div class='del'>-		/* [jsun] work around Vrc5476 controller itself, returnning</div><div class='del'>-		 * slot 0 essentially makes vrc5476 invisible</div><div class='del'>-		 */</div><div class='del'>-		if (slot_num == 12)</div><div class='del'>-			slot_num = 0;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		/* BUG : skip P2P bridge for now */</div><div class='del'>-		if (slot_num == 5)</div><div class='del'>-			slot_num = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/* now we have to be hornest, returning the true</div><div class='del'>-		 * PCI config headers for vrc5476</div><div class='del'>-		 */</div><div class='del'>-		if (slot_num == 12) {</div><div class='del'>-			swap-&gt;pdar_backup = ddb_in32(swap-&gt;pdar);</div><div class='del'>-			swap-&gt;pmr_backup = ddb_in32(swap-&gt;pmr);</div><div class='del'>-			return DDB_BASE + DDB_PCI_BASE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* minimum pdar (window) size is 2MB */</div><div class='del'>-	db_assert(swap-&gt;config_size &gt;= (2 &lt;&lt; 20));</div><div class='del'>-</div><div class='del'>-	db_assert(slot_num &lt; (1 &lt;&lt; 5));</div><div class='del'>-	db_assert(bus &lt; (1 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	/* backup registers */</div><div class='del'>-	swap-&gt;pdar_backup = ddb_in32(swap-&gt;pdar);</div><div class='del'>-	swap-&gt;pmr_backup = ddb_in32(swap-&gt;pmr);</div><div class='del'>-</div><div class='del'>-	/* set the pdar (pci window) register */</div><div class='del'>-	ddb_set_pdar(swap-&gt;pdar, swap-&gt;config_base, swap-&gt;config_size, 32,	/* 32 bit wide */</div><div class='del'>-		     0,		/* not on local memory bus */</div><div class='del'>-		     0);	/* not visible from PCI bus (N/A) */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * calcuate the absolute pci config addr;</div><div class='del'>-	 * according to the spec, we start scanning from adr:11 (0x800)</div><div class='del'>-	 */</div><div class='del'>-	if (bus == 0) {</div><div class='del'>-		/* type 0 config */</div><div class='del'>-		pci_addr = 0x800 &lt;&lt; slot_num;</div><div class='del'>-	} else {</div><div class='del'>-		/* type 1 config */</div><div class='del'>-		pci_addr = (bus &lt;&lt; 16) | (slot_num &lt;&lt; 11);</div><div class='del'>-		/* panic("ddb_access_config_base: we don't support type 1 config Yet"); */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * if pci_addr is less than pci config window size,  we set</div><div class='del'>-	 * pciinit_offset to 0 and adjust the virt_address.</div><div class='del'>-	 * Otherwise we will try to adjust pciinit_offset.</div><div class='del'>-	 */</div><div class='del'>-	if (pci_addr &lt; swap-&gt;config_size) {</div><div class='del'>-		virt_addr = KSEG1ADDR(swap-&gt;config_base + pci_addr);</div><div class='del'>-		pciinit_offset = 0;</div><div class='del'>-	} else {</div><div class='del'>-		db_assert((pci_addr &amp; (swap-&gt;config_size - 1)) == 0);</div><div class='del'>-		virt_addr = KSEG1ADDR(swap-&gt;config_base);</div><div class='del'>-		pciinit_offset = pci_addr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the pmr register */</div><div class='del'>-	option = DDB_PCI_ACCESS_32;</div><div class='del'>-	if (bus != 0)</div><div class='del'>-		option |= DDB_PCI_CFGTYPE1;</div><div class='del'>-	ddb_set_pmr(swap-&gt;pmr, DDB_PCICMD_CFG, pciinit_offset, option);</div><div class='del'>-</div><div class='del'>-	return virt_addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ddb_close_config_base(struct pci_config_swap *swap)</div><div class='del'>-{</div><div class='del'>-	ddb_out32(swap-&gt;pdar, swap-&gt;pdar_backup);</div><div class='del'>-	ddb_out32(swap-&gt;pmr, swap-&gt;pmr_backup);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_config_dword(struct pci_config_swap *swap,</div><div class='del'>-			     struct pci_dev *dev, u32 where, u32 * val)</div><div class='del'>-{</div><div class='del'>-	u32 bus, slot_num, func_num;</div><div class='del'>-	u32 base;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 3) == 0);</div><div class='del'>-	db_assert(where &lt; (1 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	/* check if the bus is top-level */</div><div class='del'>-	if (dev-&gt;bus-&gt;parent != NULL) {</div><div class='del'>-		bus = dev-&gt;bus-&gt;number;</div><div class='del'>-		db_assert(bus != 0);</div><div class='del'>-	} else {</div><div class='del'>-		bus = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_num = PCI_SLOT(dev-&gt;devfn);</div><div class='del'>-	func_num = PCI_FUNC(dev-&gt;devfn);</div><div class='del'>-	base = ddb_access_config_base(swap, bus, slot_num);</div><div class='del'>-	*val = *(volatile u32 *) (base + (func_num &lt;&lt; 8) + where);</div><div class='del'>-	ddb_close_config_base(swap);</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_config_word(struct pci_config_swap *swap,</div><div class='del'>-			    struct pci_dev *dev, u32 where, u16 * val)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 1) == 0);</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		result &gt;&gt;= 16;</div><div class='del'>-	*val = result &amp; 0xffff;</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int read_config_byte(struct pci_config_swap *swap,</div><div class='del'>-			    struct pci_dev *dev, u32 where, u8 * val)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (where &amp; 1)</div><div class='del'>-		result &gt;&gt;= 8;</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		result &gt;&gt;= 16;</div><div class='del'>-	*val = result &amp; 0xff;</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_config_dword(struct pci_config_swap *swap,</div><div class='del'>-			      struct pci_dev *dev, u32 where, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 bus, slot_num, func_num;</div><div class='del'>-	u32 base;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 3) == 0);</div><div class='del'>-	db_assert(where &lt; (1 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	/* check if the bus is top-level */</div><div class='del'>-	if (dev-&gt;bus-&gt;parent != NULL) {</div><div class='del'>-		bus = dev-&gt;bus-&gt;number;</div><div class='del'>-		db_assert(bus != 0);</div><div class='del'>-	} else {</div><div class='del'>-		bus = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_num = PCI_SLOT(dev-&gt;devfn);</div><div class='del'>-	func_num = PCI_FUNC(dev-&gt;devfn);</div><div class='del'>-	base = ddb_access_config_base(swap, bus, slot_num);</div><div class='del'>-	*(volatile u32 *) (base + (func_num &lt;&lt; 8) + where) = val;</div><div class='del'>-	ddb_close_config_base(swap);</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_config_word(struct pci_config_swap *swap,</div><div class='del'>-			     struct pci_dev *dev, u32 where, u16 val)</div><div class='del'>-{</div><div class='del'>-	int status, shift = 0;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	db_assert((where &amp; 1) == 0);</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (status != PCIBIOS_SUCCESSFUL)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		shift += 16;</div><div class='del'>-	result &amp;= ~(0xffff &lt;&lt; shift);</div><div class='del'>-	result |= val &lt;&lt; shift;</div><div class='del'>-	return write_config_dword(swap, dev, where &amp; ~3, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_config_byte(struct pci_config_swap *swap,</div><div class='del'>-			     struct pci_dev *dev, u32 where, u8 val)</div><div class='del'>-{</div><div class='del'>-	int status, shift = 0;</div><div class='del'>-	u32 result;</div><div class='del'>-</div><div class='del'>-	status = read_config_dword(swap, dev, where &amp; ~3, &amp;result);</div><div class='del'>-	if (status != PCIBIOS_SUCCESSFUL)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	if (where &amp; 2)</div><div class='del'>-		shift += 16;</div><div class='del'>-	if (where &amp; 1)</div><div class='del'>-		shift += 8;</div><div class='del'>-	result &amp;= ~(0xff &lt;&lt; shift);</div><div class='del'>-	result |= val &lt;&lt; shift;</div><div class='del'>-	return write_config_dword(swap, dev, where &amp; ~3, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define	MAKE_PCI_OPS(prefix, rw, unitname, unittype, pciswap) \</div><div class='del'>-static int prefix##_##rw##_config_##unitname(struct pci_dev *dev, int where, unittype val) \</div><div class='del'>-{ \</div><div class='del'>-     return rw##_config_##unitname(pciswap, \</div><div class='del'>-                                   dev, \</div><div class='del'>-                                   where, \</div><div class='del'>-                                   val); \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MAKE_PCI_OPS(extpci, read, byte, u8 *, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, read, word, u16 *, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, read, dword, u32 *, &amp;ext_pci_swap)</div><div class='del'>-</div><div class='del'>-    MAKE_PCI_OPS(extpci, write, byte, u8, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, write, word, u16, &amp;ext_pci_swap)</div><div class='del'>-    MAKE_PCI_OPS(extpci, write, dword, u32, &amp;ext_pci_swap)</div><div class='del'>-</div><div class='del'>-struct pci_ops ddb5476_ext_pci_ops = {</div><div class='del'>-	extpci_read_config_byte,</div><div class='del'>-	extpci_read_config_word,</div><div class='del'>-	extpci_read_config_dword,</div><div class='del'>-	extpci_write_config_byte,</div><div class='del'>-	extpci_write_config_word,</div><div class='del'>-	extpci_write_config_dword</div><div class='del'>-};</div><div class='head'>diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c<br/>new file mode 100644<br/>index 000000000000..38f181625e10<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-emma2rh.c</a></div><div class='hunk'>@@ -0,0 +1,185 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/pci/ops-emma2rh.c</div><div class='add'>+ *      This file defines the PCI operation for EMMA2RH.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/pci/ops-vr41xx.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+#define RTABORT (0x1&lt;&lt;9)</div><div class='add'>+#define RMABORT (0x1&lt;&lt;10)</div><div class='add'>+#define EMMA2RH_PCI_SLOT_NUM 9	/* 0000:09.0 is final PCI device */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * access config space</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int check_args(struct pci_bus *bus, u32 devfn, u32 * bus_num)</div><div class='add'>+{</div><div class='add'>+	/* check if the bus is top-level */</div><div class='add'>+	if (bus-&gt;parent != NULL) {</div><div class='add'>+		*bus_num = bus-&gt;number;</div><div class='add'>+		db_assert(bus_num != 0);</div><div class='add'>+	} else</div><div class='add'>+		*bus_num = 0;</div><div class='add'>+</div><div class='add'>+	if (*bus_num == 0) {</div><div class='add'>+		/* Type 0 */</div><div class='add'>+		if (PCI_SLOT(devfn) &gt;= 10)</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	} else {</div><div class='add'>+		/* Type 1 */</div><div class='add'>+		if ((*bus_num &gt;= 64) || (PCI_SLOT(devfn) &gt;= 16))</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int set_pci_configuration_address(unsigned char bus_num,</div><div class='add'>+						unsigned int devfn, int where)</div><div class='add'>+{</div><div class='add'>+	u32 config_win0;</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_INT, ~RMABORT);</div><div class='add'>+	if (bus_num == 0)</div><div class='add'>+		/*</div><div class='add'>+		 * Type 0 configuration</div><div class='add'>+		 */</div><div class='add'>+		config_win0 = (1 &lt;&lt; (22 + PCI_SLOT(devfn))) | (5 &lt;&lt; 9);</div><div class='add'>+	else</div><div class='add'>+		/*</div><div class='add'>+		 * Type 1 configuration</div><div class='add'>+		 */</div><div class='add'>+		config_win0 = (bus_num &lt;&lt; 26) | (PCI_SLOT(devfn) &lt;&lt; 22) |</div><div class='add'>+		    (1 &lt;&lt; 15) | (5 &lt;&lt; 9);</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, config_win0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where,</div><div class='add'>+			   int size, uint32_t * val)</div><div class='add'>+{</div><div class='add'>+	u32 bus_num;</div><div class='add'>+	u32 base = KSEG1ADDR(EMMA2RH_PCI_CONFIG_BASE);</div><div class='add'>+	u32 backup_win0;</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	*val = 0xffffffffU;</div><div class='add'>+</div><div class='add'>+	if (check_args(bus, devfn, &amp;bus_num) == PCIBIOS_DEVICE_NOT_FOUND)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	backup_win0 = emma2rh_in32(EMMA2RH_PCI_IWIN0_CTR);</div><div class='add'>+</div><div class='add'>+	if (set_pci_configuration_address(bus_num, devfn, where) &lt; 0)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	data =</div><div class='add'>+	    *(volatile u32 *)(base + (PCI_FUNC(devfn) &lt;&lt; 8) +</div><div class='add'>+			      (where &amp; 0xfffffffc));</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		*val = (data &gt;&gt; ((where &amp; 3) &lt;&lt; 3)) &amp; 0xffU;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		*val = (data &gt;&gt; ((where &amp; 2) &lt;&lt; 3)) &amp; 0xffffU;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		*val = data;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, backup_win0);</div><div class='add'>+		return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, backup_win0);</div><div class='add'>+</div><div class='add'>+	if (emma2rh_in32(EMMA2RH_PCI_INT) &amp; RMABORT)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where,</div><div class='add'>+			    int size, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 bus_num;</div><div class='add'>+	u32 base = KSEG1ADDR(EMMA2RH_PCI_CONFIG_BASE);</div><div class='add'>+	u32 backup_win0;</div><div class='add'>+	u32 data;</div><div class='add'>+	int shift;</div><div class='add'>+</div><div class='add'>+	if (check_args(bus, devfn, &amp;bus_num) == PCIBIOS_DEVICE_NOT_FOUND)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	backup_win0 = emma2rh_in32(EMMA2RH_PCI_IWIN0_CTR);</div><div class='add'>+</div><div class='add'>+	if (set_pci_configuration_address(bus_num, devfn, where) &lt; 0)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/* read modify write */</div><div class='add'>+	data =</div><div class='add'>+	    *(volatile u32 *)(base + (PCI_FUNC(devfn) &lt;&lt; 8) +</div><div class='add'>+			      (where &amp; 0xfffffffc));</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		shift = (where &amp; 3) &lt;&lt; 3;</div><div class='add'>+		data &amp;= ~(0xffU &lt;&lt; shift);</div><div class='add'>+		data |= ((val &amp; 0xffU) &lt;&lt; shift);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		shift = (where &amp; 2) &lt;&lt; 3;</div><div class='add'>+		data &amp;= ~(0xffffU &lt;&lt; shift);</div><div class='add'>+		data |= ((val &amp; 0xffffU) &lt;&lt; shift);</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		data = val;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, backup_win0);</div><div class='add'>+		return PCIBIOS_FUNC_NOT_SUPPORTED;</div><div class='add'>+	}</div><div class='add'>+	*(volatile u32 *)(base + (PCI_FUNC(devfn) &lt;&lt; 8) +</div><div class='add'>+			  (where &amp; 0xfffffffc)) = data;</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, backup_win0);</div><div class='add'>+	if (emma2rh_in32(EMMA2RH_PCI_INT) &amp; RMABORT)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pci_ops emma2rh_pci_ops = {</div><div class='add'>+	.read = pci_config_read,</div><div class='add'>+	.write = pci_config_write,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/mips/pci/ops-it8172.c b/arch/mips/pci/ops-it8172.c<br/>index b7a8b9a6f9db..ba8328505a0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-it8172.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-it8172.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-it8172.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-it8172.c</a></div><div class='hunk'>@@ -50,30 +50,28 @@</div><div class='ctx'> static struct resource pci_mem_resource_1;</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_io_resource = {</div><div class='del'>-	"io pci IO space",</div><div class='del'>-	0x14018000,</div><div class='del'>-	0x17FFFFFF,</div><div class='del'>-	IORESOURCE_IO</div><div class='add'>+	.start	= 0x14018000,</div><div class='add'>+	.end	= 0x17FFFFFF,</div><div class='add'>+	.name	= "io pci IO space",</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_mem_resource_0 = {</div><div class='del'>-	"ext pci memory space 0/1",</div><div class='del'>-	0x10101000,</div><div class='del'>-	0x13FFFFFF,</div><div class='del'>-	IORESOURCE_MEM,</div><div class='del'>-	&amp;pci_mem_resource_0,</div><div class='del'>-	NULL,</div><div class='del'>-	&amp;pci_mem_resource_1</div><div class='add'>+	.start	= 0x10101000,</div><div class='add'>+	.end	= 0x13FFFFFF,</div><div class='add'>+	.name	= "ext pci memory space 0/1",</div><div class='add'>+	.flags	= IORESOURCE_MEM,</div><div class='add'>+	.parent	= &amp;pci_mem_resource_0,</div><div class='add'>+	.sibling = NULL,</div><div class='add'>+	.child	= &amp;pci_mem_resource_1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_mem_resource_1 = {</div><div class='del'>-	"ext pci memory space 2/3",</div><div class='del'>-	0x1A000000,</div><div class='del'>-	0x1FBFFFFF,</div><div class='del'>-	IORESOURCE_MEM,</div><div class='del'>-	&amp;pci_mem_resource_0,</div><div class='del'>-	NULL,</div><div class='del'>-	NULL</div><div class='add'>+	.start	= 0x1A000000,</div><div class='add'>+	.end	= 0x1FBFFFFF,</div><div class='add'>+	.name	= "ext pci memory space 2/3",</div><div class='add'>+	.flags	= IORESOURCE_MEM,</div><div class='add'>+	.parent	= &amp;pci_mem_resource_0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pci_ops it8172_pci_ops;</div><div class='head'>diff --git a/arch/mips/pci/ops-sni.c b/arch/mips/pci/ops-sni.c<br/>index 62bdd19c7f8e..2b0ccd6d9dcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-sni.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-sni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-sni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-sni.c</a></div><div class='hunk'>@@ -47,13 +47,13 @@ static int pcimt_read(struct pci_bus *bus, unsigned int devfn, int reg,</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		*val = *(volatile  u8 *) (PCIMT_CONFIG_DATA + (reg &amp; 3));</div><div class='add'>+		*val = inb(PCIMT_CONFIG_DATA + (reg &amp; 3));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		*val = *(volatile u16 *) (PCIMT_CONFIG_DATA + (reg &amp; 2));</div><div class='add'>+		*val = inw(PCIMT_CONFIG_DATA + (reg &amp; 2));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		*val = *(volatile u32 *) PCIMT_CONFIG_DATA;</div><div class='add'>+		*val = inl(PCIMT_CONFIG_DATA);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -70,13 +70,13 @@ static int pcimt_write(struct pci_bus *bus, unsigned int devfn, int reg,</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		*(volatile  u8 *) (PCIMT_CONFIG_DATA + (reg &amp; 3)) = val;</div><div class='add'>+		outb (val, PCIMT_CONFIG_DATA + (reg &amp; 3));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		*(volatile u16 *) (PCIMT_CONFIG_DATA + (reg &amp; 2)) = val;</div><div class='add'>+		outw (val, PCIMT_CONFIG_DATA + (reg &amp; 2));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		*(volatile u32 *) PCIMT_CONFIG_DATA = val;</div><div class='add'>+		outl (val, PCIMT_CONFIG_DATA);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/ops-titan.c b/arch/mips/pci/ops-titan.c<br/>index 233ec6f2054d..ebf8fc40e9b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-titan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-titan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-titan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-titan.c</a></div><div class='hunk'>@@ -26,8 +26,19 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/titan_dep.h&gt;</div><div class='add'>+#include &lt;asm/pci.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * PCI specific defines</div><div class='add'>+ */</div><div class='add'>+#define	TITAN_PCI_0_CONFIG_ADDRESS	0x780</div><div class='add'>+#define	TITAN_PCI_0_CONFIG_DATA		0x784</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Titan PCI Config Read Byte</div><div class='add'>+ */</div><div class='ctx'> static int titan_read_config(struct pci_bus *bus, unsigned int devfn, int reg,</div><div class='ctx'> 	int size, u32 * val)</div><div class='ctx'> {</div><div class='hunk'>@@ -43,8 +54,8 @@ static int titan_read_config(struct pci_bus *bus, unsigned int devfn, int reg,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* start the configuration cycle */</div><div class='del'>-	TITAN_WRITE(TITAN_PCI_0_CONFIG_ADDRESS, address);</div><div class='del'>-	tmp = TITAN_READ(TITAN_PCI_0_CONFIG_DATA) &gt;&gt; ((reg &amp; 3) &lt;&lt; 3);</div><div class='add'>+	ocd_writel(address, TITAN_PCI_0_CONFIG_ADDRESS);</div><div class='add'>+	tmp = ocd_readl(TITAN_PCI_0_CONFIG_DATA) &gt;&gt; ((reg &amp; 3) &lt;&lt; 3);</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -71,20 +82,20 @@ static int titan_write_config(struct pci_bus *bus, unsigned int devfn, int reg,</div><div class='ctx'> 		(reg &amp; 0xfc) | 0x80000000;</div><div class='ctx'> </div><div class='ctx'> 	/* start the configuration cycle */</div><div class='del'>-	TITAN_WRITE(TITAN_PCI_0_CONFIG_ADDRESS, address);</div><div class='add'>+	ocd_writel(address, TITAN_PCI_0_CONFIG_ADDRESS);</div><div class='ctx'> </div><div class='ctx'> 	/* write the data */</div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		TITAN_WRITE_8(TITAN_PCI_0_CONFIG_DATA + (~reg &amp; 0x3), val);</div><div class='add'>+		ocd_writeb(val, TITAN_PCI_0_CONFIG_DATA + (~reg &amp; 0x3));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 2:</div><div class='del'>-		TITAN_WRITE_16(TITAN_PCI_0_CONFIG_DATA + (~reg &amp; 0x2), val);</div><div class='add'>+		ocd_writew(val, TITAN_PCI_0_CONFIG_DATA + (~reg &amp; 0x2));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 4:</div><div class='del'>-		TITAN_WRITE(TITAN_PCI_0_CONFIG_DATA, val);</div><div class='add'>+		ocd_writel(val, TITAN_PCI_0_CONFIG_DATA);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c<br/>index 7688b7711329..150419c8b414 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx4927.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-tx4927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx4927.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-tx4927.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, i</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		*val = *(volatile u8 *) ((ulong) &amp; tx4927_pcicptr-&gt;</div><div class='add'>+		*val = *(volatile u8 *) ((unsigned long) &amp; tx4927_pcicptr-&gt;</div><div class='ctx'>                               g2pcfgdata |</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='ctx'> 						(where &amp; 3));</div><div class='hunk'>@@ -128,7 +128,7 @@ static int tx4927_pcibios_read_config(struct pci_bus *bus, unsigned int devfn, i</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		*val = *(volatile u16 *) ((ulong) &amp; tx4927_pcicptr-&gt;</div><div class='add'>+		*val = *(volatile u16 *) ((unsigned long) &amp; tx4927_pcicptr-&gt;</div><div class='ctx'>                                g2pcfgdata |</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='ctx'> 						(where &amp; 3));</div><div class='hunk'>@@ -168,7 +168,7 @@ static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		 *(volatile u8 *) ((ulong) &amp; tx4927_pcicptr-&gt;</div><div class='add'>+		 *(volatile u8 *) ((unsigned long) &amp; tx4927_pcicptr-&gt;</div><div class='ctx'>                           g2pcfgdata |</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='ctx'> 					(where &amp; 3)) = val;</div><div class='hunk'>@@ -178,7 +178,7 @@ static int tx4927_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 2:</div><div class='del'>-		*(volatile u16 *) ((ulong) &amp; tx4927_pcicptr-&gt;</div><div class='add'>+		*(volatile u16 *) ((unsigned long) &amp; tx4927_pcicptr-&gt;</div><div class='ctx'>                            g2pcfgdata |</div><div class='ctx'> #ifdef __LITTLE_ENDIAN</div><div class='ctx'> 					(where &amp; 3)) = val;</div><div class='head'>diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c<br/>index 0ff083489efd..445007084515 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx4938.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/ops-tx4938.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/ops-tx4938.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/ops-tx4938.c</a></div><div class='hunk'>@@ -106,7 +106,7 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		*val = *(volatile u8 *) ((ulong) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='add'>+		*val = *(volatile u8 *) ((unsigned long) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			      ((where &amp; 3) ^ 3));</div><div class='ctx'> #else</div><div class='hunk'>@@ -114,7 +114,7 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		*val = *(volatile u16 *) ((ulong) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='add'>+		*val = *(volatile u16 *) ((unsigned long) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 				((where &amp; 3) ^ 2));</div><div class='ctx'> #else</div><div class='hunk'>@@ -154,7 +154,7 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> </div><div class='ctx'> 	switch (size) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		*(volatile u8 *) ((ulong) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='add'>+		*(volatile u8 *) ((unsigned long) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			  ((where &amp; 3) ^ 3)) = val;</div><div class='ctx'> #else</div><div class='hunk'>@@ -162,7 +162,7 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		*(volatile u16 *) ((ulong) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='add'>+		*(volatile u16 *) ((unsigned long) &amp; tx4938_pcicptr-&gt;g2pcfgdata |</div><div class='ctx'> #ifdef __BIG_ENDIAN</div><div class='ctx'> 			((where &amp; 0x3) ^ 0x2)) = val;</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c<br/>index f4ef1a35ca18..f6774f54cd3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-bcm1480.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-bcm1480.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-bcm1480.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-bcm1480.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * XXX: AT THIS TIME, ONLY the NATIVE PCI-X INTERFACE IS SUPPORTED.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c<br/>index a3eebe5890a7..ba2e34b09231 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-bcm1480ht.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-bcm1480ht.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-bcm1480ht.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-bcm1480ht.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * problem.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/pci/pci-ddb5074.c b/arch/mips/pci/pci-ddb5074.c<br/>deleted file mode 100644<br/>index 73f9ceeb2f55..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ddb5074.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ddb5074.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-static struct resource extpci_io_resource = {</div><div class='del'>-	"pci IO space",</div><div class='del'>-	0x1000,			/* leave some room for ISA bus */</div><div class='del'>-	DDB_PCI_IO_SIZE - 1,</div><div class='del'>-	IORESOURCE_IO</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource extpci_mem_resource = {</div><div class='del'>-	"pci memory space",</div><div class='del'>-	DDB_PCI_MEM_BASE + 0x00100000,	/* leave 1 MB for RTC */</div><div class='del'>-	DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1,</div><div class='del'>-	IORESOURCE_MEM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct pci_ops ddb5476_ext_pci_ops;</div><div class='del'>-</div><div class='del'>-struct pci_controller ddb5476_controller = {</div><div class='del'>-	.pci_ops	= &amp;ddb5476_ext_pci_ops,</div><div class='del'>-	.io_resource	= &amp;extpci_io_resource,</div><div class='del'>-	.mem_resource	= &amp;extpci_mem_resource,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define     PCI_EXT_INTA        8</div><div class='del'>-#define     PCI_EXT_INTB        9</div><div class='del'>-#define     PCI_EXT_INTC        10</div><div class='del'>-#define     PCI_EXT_INTD        11</div><div class='del'>-#define     PCI_EXT_INTE        12</div><div class='del'>-</div><div class='del'>-#define     MAX_SLOT_NUM        14</div><div class='del'>-</div><div class='del'>-static unsigned char irq_map[MAX_SLOT_NUM] = {</div><div class='del'>-  [ 0] = nile4_to_irq(PCI_EXT_INTE),</div><div class='del'>-  [ 1] = nile4_to_irq(PCI_EXT_INTA),</div><div class='del'>-  [ 2] = nile4_to_irq(PCI_EXT_INTA),</div><div class='del'>-  [ 3] = nile4_to_irq(PCI_EXT_INTB),</div><div class='del'>-  [ 4] = nile4_to_irq(PCI_EXT_INTC),</div><div class='del'>-  [ 5] = nile4_to_irq(NILE4_INT_UART),</div><div class='del'>-  [10] = nile4_to_irq(PCI_EXT_INTE),</div><div class='del'>-  [13] = nile4_to_irq(PCI_EXT_INTE),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	return irq_map[slot];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Do platform specific device initialization at pci_enable_device() time */</div><div class='del'>-int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init ddb_pci_reset_bus(void)</div><div class='del'>-{</div><div class='del'>-	u32 temp;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I am not sure about the "official" procedure, the following</div><div class='del'>-	 * steps work as far as I know:</div><div class='del'>-	 * We first set PCI cold reset bit (bit 31) in PCICTRL-H.</div><div class='del'>-	 * Then we clear the PCI warm reset bit (bit 30) to 0 in PCICTRL-H.</div><div class='del'>-	 * The same is true for both PCI channels.</div><div class='del'>-	 */</div><div class='del'>-	temp = ddb_in32(DDB_PCICTRL + 4);</div><div class='del'>-	temp |= 0x80000000;</div><div class='del'>-	ddb_out32(DDB_PCICTRL + 4, temp);</div><div class='del'>-	temp &amp;= ~0xc0000000;</div><div class='del'>-	ddb_out32(DDB_PCICTRL + 4, temp);</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/pci/pci-ddb5476.c b/arch/mips/pci/pci-ddb5476.c<br/>deleted file mode 100644<br/>index 90dd49509800..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ddb5476.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ddb5476.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/debug.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='del'>-</div><div class='del'>-static struct resource extpci_io_resource = {</div><div class='del'>-	"pci IO space",</div><div class='del'>-	0x1000,			/* leave some room for ISA bus */</div><div class='del'>-	DDB_PCI_IO_SIZE - 1,</div><div class='del'>-	IORESOURCE_IO</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct resource extpci_mem_resource = {</div><div class='del'>-	"pci memory space",</div><div class='del'>-	DDB_PCI_MEM_BASE + 0x00100000,	/* leave 1 MB for RTC */</div><div class='del'>-	DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1,</div><div class='del'>-	IORESOURCE_MEM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct pci_ops ddb5476_ext_pci_ops;</div><div class='del'>-</div><div class='del'>-struct pci_controller ddb5476_controller = {</div><div class='del'>-	.pci_ops	= &amp;ddb5476_ext_pci_ops,</div><div class='del'>-	.io_resource	= &amp;extpci_io_resource,</div><div class='del'>-	.mem_resource	= &amp;extpci_mem_resource</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * we fix up irqs based on the slot number.</div><div class='del'>- * The first entry is at AD:11.</div><div class='del'>- *</div><div class='del'>- * This does not work for devices on sub-buses yet.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * temporary</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define		PCI_EXT_INTA		8</div><div class='del'>-#define		PCI_EXT_INTB		9</div><div class='del'>-#define		PCI_EXT_INTC		10</div><div class='del'>-#define		PCI_EXT_INTD		11</div><div class='del'>-#define		PCI_EXT_INTE		12</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * based on ddb5477 manual page 11</div><div class='del'>- */</div><div class='del'>-#define		MAX_SLOT_NUM		21</div><div class='del'>-static unsigned char irq_map[MAX_SLOT_NUM] = {</div><div class='del'>- [ 2] = 9,				/* AD:13	USB		*/</div><div class='del'>- [ 3] = 10,				/* AD:14	PMU		*/</div><div class='del'>- [ 5] = 0,				/* AD:16 	P2P bridge	*/</div><div class='del'>- [ 6] = nile4_to_irq(PCI_EXT_INTB),	/* AD:17			*/</div><div class='del'>- [ 7] =	nile4_to_irq(PCI_EXT_INTC),	/* AD:18			*/</div><div class='del'>- [ 8] = nile4_to_irq(PCI_EXT_INTD),	/* AD:19			*/</div><div class='del'>- [ 9] = nile4_to_irq(PCI_EXT_INTA),	/* AD:20			*/</div><div class='del'>- [13] = 14,				/* AD:24 HD controller, M5229	*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)</div><div class='del'>-{</div><div class='del'>-	return irq_map[slot];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Do platform specific device initialization at pci_enable_device() time */</div><div class='del'>-int pcibios_plat_dev_init(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init ddb_pci_reset_bus(void)</div><div class='del'>-{</div><div class='del'>-	u32 temp;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I am not sure about the "official" procedure, the following</div><div class='del'>-	 * steps work as far as I know:</div><div class='del'>-	 * We first set PCI cold reset bit (bit 31) in PCICTRL-H.</div><div class='del'>-	 * Then we clear the PCI warm reset bit (bit 30) to 0 in PCICTRL-H.</div><div class='del'>-	 * The same is true for both PCI channels.</div><div class='del'>-	 */</div><div class='del'>-	temp = ddb_in32(DDB_PCICTRL + 4);</div><div class='del'>-	temp |= 0x80000000;</div><div class='del'>-	ddb_out32(DDB_PCICTRL + 4, temp);</div><div class='del'>-	temp &amp;= ~0xc0000000;</div><div class='del'>-	ddb_out32(DDB_PCICTRL + 4, temp);</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c<br/>index 826d653184e5..d071bc375b11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ddb5477.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ddb5477.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ddb5477.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-ddb5477.c</a></div><div class='hunk'>@@ -22,31 +22,31 @@</div><div class='ctx'> #include &lt;asm/ddb5xxx/ddb5xxx.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct resource extpci_io_resource = {</div><div class='del'>-	"ext pci IO space",</div><div class='del'>-	DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000,</div><div class='del'>-	DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1,</div><div class='del'>-	IORESOURCE_IO</div><div class='add'>+	.start	= DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000,</div><div class='add'>+	.end	= DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1,</div><div class='add'>+	.name	= "ext pci IO space",</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource extpci_mem_resource = {</div><div class='del'>-	"ext pci memory space",</div><div class='del'>-	DDB_PCI0_MEM_BASE + 0x100000,</div><div class='del'>-	DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1,</div><div class='del'>-	IORESOURCE_MEM</div><div class='add'>+	.start	= DDB_PCI0_MEM_BASE + 0x100000,</div><div class='add'>+	.end	= DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1,</div><div class='add'>+	.name	= "ext pci memory space",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource iopci_io_resource = {</div><div class='del'>-	"io pci IO space",</div><div class='del'>-	DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE,</div><div class='del'>-	DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1,</div><div class='del'>-	IORESOURCE_IO</div><div class='add'>+	.start	= DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE,</div><div class='add'>+	.end	= DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1,</div><div class='add'>+	.name	= "io pci IO space",</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource iopci_mem_resource = {</div><div class='del'>-	"ext pci memory space",</div><div class='del'>-	DDB_PCI1_MEM_BASE,</div><div class='del'>-	DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1,</div><div class='del'>-	IORESOURCE_MEM</div><div class='add'>+	.start	= DDB_PCI1_MEM_BASE,</div><div class='add'>+	.end	= DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1,</div><div class='add'>+	.name	= "ext pci memory space",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pci_ops ddb5477_ext_pci_ops;</div><div class='head'>diff --git a/arch/mips/pci/pci-emma2rh.c b/arch/mips/pci/pci-emma2rh.c<br/>new file mode 100644<br/>index 000000000000..d99591a0cdfe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-emma2rh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-emma2rh.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/*</div><div class='add'>+ *  arch/mips/pci/pci-emma2rh.c</div><div class='add'>+ *      This file defines the PCI configration.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) NEC Electronics Corporation 2004-2006</div><div class='add'>+ *</div><div class='add'>+ *  This file is based on the arch/mips/ddb5xxx/ddb5477/pci.c</div><div class='add'>+ *</div><div class='add'>+ *	Copyright 2001 MontaVista Software Inc.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/emma2rh/emma2rh.h&gt;</div><div class='add'>+</div><div class='add'>+static struct resource pci_io_resource = {</div><div class='add'>+	.name = "pci IO space",</div><div class='add'>+	.start = EMMA2RH_PCI_IO_BASE,</div><div class='add'>+	.end = EMMA2RH_PCI_IO_BASE + EMMA2RH_PCI_IO_SIZE - 1,</div><div class='add'>+	.flags = IORESOURCE_IO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pci_mem_resource = {</div><div class='add'>+	.name = "pci memory space",</div><div class='add'>+	.start = EMMA2RH_PCI_MEM_BASE,</div><div class='add'>+	.end = EMMA2RH_PCI_MEM_BASE + EMMA2RH_PCI_MEM_SIZE - 1,</div><div class='add'>+	.flags = IORESOURCE_MEM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct pci_ops emma2rh_pci_ops;</div><div class='add'>+</div><div class='add'>+static struct pci_controller emma2rh_pci_controller = {</div><div class='add'>+	.pci_ops = &amp;emma2rh_pci_ops,</div><div class='add'>+	.mem_resource = &amp;pci_mem_resource,</div><div class='add'>+	.io_resource = &amp;pci_io_resource,</div><div class='add'>+	.mem_offset = -0x04000000,</div><div class='add'>+	.io_offset = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init emma2rh_pci_init(void)</div><div class='add'>+{</div><div class='add'>+	/* setup PCI interface */</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_ARBIT_CTR, 0x70f);</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, 0x80000a18);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_CONFIG_BASE + PCI_COMMAND,</div><div class='add'>+		      PCI_STATUS_DEVSEL_MEDIUM | PCI_STATUS_CAP_LIST |</div><div class='add'>+		      PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_CONFIG_BASE + PCI_BASE_ADDRESS_0, 0x10000000);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_CONFIG_BASE + PCI_BASE_ADDRESS_1, 0x00000000);</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_IWIN0_CTR, 0x12000000 | 0x218);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_IWIN1_CTR, 0x18000000 | 0x600);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_INIT_ESWP, 0x00000200);</div><div class='add'>+</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_TWIN_CTR, 0x00009200);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_TWIN_BADR, 0x00000000);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_TWIN0_DADR, 0x00000000);</div><div class='add'>+	emma2rh_out32(EMMA2RH_PCI_TWIN1_DADR, 0x00000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init emma2rh_pci_setup(void)</div><div class='add'>+{</div><div class='add'>+	emma2rh_pci_init();</div><div class='add'>+	register_pci_controller(&amp;emma2rh_pci_controller);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(emma2rh_pci_setup);</div><div class='head'>diff --git a/arch/mips/pci/pci-excite.c b/arch/mips/pci/pci-excite.c<br/>new file mode 100644<br/>index 000000000000..3c86c77cb74f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-excite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-excite.c</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2004 by Basler Vision Technologies AG</div><div class='add'>+ *  Author: Thomas Koeller &lt;thomas.koeller@baslerweb.com&gt;</div><div class='add'>+ *  Based on the PMC-Sierra Yosemite board support by Ralf Baechle.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;asm/rm9k-ocd.h&gt;</div><div class='add'>+#include &lt;excite.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+extern struct pci_ops titan_pci_ops;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct resource</div><div class='add'>+	mem_resource = 	{</div><div class='add'>+		.name	= "PCI memory",</div><div class='add'>+		.start	= EXCITE_PHYS_PCI_MEM,</div><div class='add'>+		.end	= EXCITE_PHYS_PCI_MEM + EXCITE_SIZE_PCI_MEM - 1,</div><div class='add'>+		.flags	= IORESOURCE_MEM</div><div class='add'>+	},</div><div class='add'>+	io_resource = {</div><div class='add'>+		.name	= "PCI I/O",</div><div class='add'>+		.start	= EXCITE_PHYS_PCI_IO,</div><div class='add'>+		.end	= EXCITE_PHYS_PCI_IO + EXCITE_SIZE_PCI_IO - 1,</div><div class='add'>+		.flags	= IORESOURCE_IO</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct pci_controller bx_controller = {</div><div class='add'>+	.pci_ops	= &amp;titan_pci_ops,</div><div class='add'>+	.mem_resource	= &amp;mem_resource,</div><div class='add'>+	.mem_offset	= 0x00000000UL,</div><div class='add'>+	.io_resource	= &amp;io_resource,</div><div class='add'>+	.io_offset	= 0x00000000UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static char</div><div class='add'>+	iopage_failed[] __initdata   = "Cannot allocate PCI I/O page",</div><div class='add'>+	modebits_no_pci[] __initdata = "PCI is not configured in mode bits";</div><div class='add'>+</div><div class='add'>+#define RM9000x2_OCD_HTSC	0x0604</div><div class='add'>+#define RM9000x2_OCD_HTBHL	0x060c</div><div class='add'>+#define RM9000x2_OCD_PCIHRST	0x078c</div><div class='add'>+</div><div class='add'>+#define RM9K_OCD_MODEBIT1	0x00d4 /* (MODEBIT1) Mode Bit 1 */</div><div class='add'>+#define RM9K_OCD_CPHDCR		0x00f4 /* CPU-PCI/HT Data Control. */</div><div class='add'>+</div><div class='add'>+#define PCISC_FB2B 		0x00000200</div><div class='add'>+#define PCISC_MWICG		0x00000010</div><div class='add'>+#define PCISC_EMC		0x00000004</div><div class='add'>+#define PCISC_ERMA		0x00000002</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init basler_excite_pci_setup(void)</div><div class='add'>+{</div><div class='add'>+	const unsigned int fullbars = memsize / (256 &lt;&lt; 20);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Check modebits to see if PCI is really enabled. */</div><div class='add'>+	if (!((ocd_readl(RM9K_OCD_MODEBIT1) &gt;&gt; (47-32)) &amp; 0x1))</div><div class='add'>+		panic(modebits_no_pci);</div><div class='add'>+</div><div class='add'>+	if (NULL == request_mem_region(EXCITE_PHYS_PCI_IO, EXCITE_SIZE_PCI_IO,</div><div class='add'>+				       "Memory-mapped PCI I/O page"))</div><div class='add'>+		panic(iopage_failed);</div><div class='add'>+</div><div class='add'>+	/* Enable PCI 0 as master for config cycles */</div><div class='add'>+	ocd_writel(PCISC_EMC | PCISC_ERMA, RM9000x2_OCD_HTSC);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Set up latency timer */</div><div class='add'>+	ocd_writel(0x8008, RM9000x2_OCD_HTBHL);</div><div class='add'>+</div><div class='add'>+	/*  Setup host IO and Memory space */</div><div class='add'>+	ocd_writel((EXCITE_PHYS_PCI_IO &gt;&gt; 4) | 1, LKB7);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_PCI_IO &gt;&gt; 4) &amp; 0x7fffff00) - 0x100, LKM7);</div><div class='add'>+	ocd_writel((EXCITE_PHYS_PCI_MEM &gt;&gt; 4) | 1, LKB8);</div><div class='add'>+	ocd_writel(((EXCITE_SIZE_PCI_MEM &gt;&gt; 4) &amp; 0x7fffff00) - 0x100, LKM8);</div><div class='add'>+</div><div class='add'>+	/* Set up PCI BARs to map all installed memory */</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		const unsigned int bar = 0x610 + i * 4;</div><div class='add'>+</div><div class='add'>+	     	if (i &lt; fullbars) {</div><div class='add'>+			ocd_writel(0x10000000 * i, bar);</div><div class='add'>+			ocd_writel(0x01000000 * i, bar + 0x140);</div><div class='add'>+			ocd_writel(0x0ffff029, bar + 0x100);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	     	if (i == fullbars) {</div><div class='add'>+			int o;</div><div class='add'>+			u32 mask;</div><div class='add'>+</div><div class='add'>+			const unsigned long rem = memsize - i * 0x10000000;</div><div class='add'>+			if (!rem) {</div><div class='add'>+				ocd_writel(0x00000000, bar + 0x100);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			o = ffs(rem) - 1;</div><div class='add'>+			if (rem &amp; ~(0x1 &lt;&lt; o))</div><div class='add'>+				o++;</div><div class='add'>+			mask = ((0x1 &lt;&lt; o) &amp; 0x0ffff000) - 0x1000;</div><div class='add'>+			ocd_writel(0x10000000 * i, bar);</div><div class='add'>+			ocd_writel(0x01000000 * i, bar + 0x140);</div><div class='add'>+			ocd_writel(0x00000029 | mask, bar + 0x100);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ocd_writel(0x00000000, bar + 0x100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Finally, enable the PCI interupt */</div><div class='add'>+#if USB_IRQ &gt; 7</div><div class='add'>+	set_c0_intcontrol(1 &lt;&lt; USB_IRQ);</div><div class='add'>+#else</div><div class='add'>+	set_c0_status(1 &lt;&lt; (USB_IRQ + 8));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ioport_resource.start = EXCITE_PHYS_PCI_IO;</div><div class='add'>+	ioport_resource.end = EXCITE_PHYS_PCI_IO + EXCITE_SIZE_PCI_IO - 1;</div><div class='add'>+	set_io_port_base((unsigned long) ioremap_nocache(EXCITE_PHYS_PCI_IO, EXCITE_SIZE_PCI_IO));</div><div class='add'>+	register_pci_controller(&amp;bx_controller);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+arch_initcall(basler_excite_pci_setup);</div><div class='head'>diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c<br/>index 6002d2a6a262..80eb9af9ecdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ip27.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ip27.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ip27.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-ip27.c</a></div><div class='hunk'>@@ -40,297 +40,7 @@ static struct bridge_controller bridges[MAX_PCI_BUSSES];</div><div class='ctx'> struct bridge_controller *irq_to_bridge[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS];</div><div class='ctx'> int irq_to_slot[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS];</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The Bridge ASIC supports both type 0 and type 1 access.  Type 1 is</div><div class='del'>- * not really documented, so right now I can't write code which uses it.</div><div class='del'>- * Therefore we use type 0 accesses for now even though they won't work</div><div class='del'>- * correcly for PCI-to-PCI bridges.</div><div class='del'>- *</div><div class='del'>- * The function is complicated by the ultimate brokeness of the IOC3 chip</div><div class='del'>- * which is used in SGI systems.  The IOC3 can only handle 32-bit PCI</div><div class='del'>- * accesses and does only decode parts of it's address space.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int pci_conf0_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='del'>-				 int where, int size, u32 * value)</div><div class='del'>-{</div><div class='del'>-	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='del'>-	bridge_t *bridge = bc-&gt;base;</div><div class='del'>-	int slot = PCI_SLOT(devfn);</div><div class='del'>-	int fn = PCI_FUNC(devfn);</div><div class='del'>-	volatile void *addr;</div><div class='del'>-	u32 cf, shift, mask;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[PCI_VENDOR_ID];</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to look at it for real ...</div><div class='del'>-	 */</div><div class='del'>-	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='del'>-		goto oh_my_gawd;</div><div class='del'>-</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[where ^ (4 - size)];</div><div class='del'>-</div><div class='del'>-	if (size == 1)</div><div class='del'>-		res = get_dbe(*value, (u8 *) addr);</div><div class='del'>-	else if (size == 2)</div><div class='del'>-		res = get_dbe(*value, (u16 *) addr);</div><div class='del'>-	else</div><div class='del'>-		res = get_dbe(*value, (u32 *) addr);</div><div class='del'>-</div><div class='del'>-	return res ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;</div><div class='del'>-</div><div class='del'>-oh_my_gawd:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to look at the wrong register.</div><div class='del'>-	 */</div><div class='del'>-	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48)) {</div><div class='del'>-		*value = 0;</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='del'>-	 * anything but 32-bit words ...</div><div class='del'>-	 */</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].l[where &gt;&gt; 2];</div><div class='del'>-</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='del'>-	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='del'>-	*value = (cf &gt;&gt; shift) &amp; mask;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pci_conf1_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='del'>-				 int where, int size, u32 * value)</div><div class='del'>-{</div><div class='del'>-	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='del'>-	bridge_t *bridge = bc-&gt;base;</div><div class='del'>-	int busno = bus-&gt;number;</div><div class='del'>-	int slot = PCI_SLOT(devfn);</div><div class='del'>-	int fn = PCI_FUNC(devfn);</div><div class='del'>-	volatile void *addr;</div><div class='del'>-	u32 cf, shift, mask;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='del'>-	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | PCI_VENDOR_ID];</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to look at it for real ...</div><div class='del'>-	 */</div><div class='del'>-	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='del'>-		goto oh_my_gawd;</div><div class='del'>-</div><div class='del'>-	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='del'>-	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | (where ^ (4 - size))];</div><div class='del'>-</div><div class='del'>-	if (size == 1)</div><div class='del'>-		res = get_dbe(*value, (u8 *) addr);</div><div class='del'>-	else if (size == 2)</div><div class='del'>-		res = get_dbe(*value, (u16 *) addr);</div><div class='del'>-	else</div><div class='del'>-		res = get_dbe(*value, (u32 *) addr);</div><div class='del'>-</div><div class='del'>-	return res ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;</div><div class='del'>-</div><div class='del'>-oh_my_gawd:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to look at the wrong register.</div><div class='del'>-	 */</div><div class='del'>-	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48)) {</div><div class='del'>-		*value = 0;</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='del'>-	 * anything but 32-bit words ...</div><div class='del'>-	 */</div><div class='del'>-	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='del'>-	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | where];</div><div class='del'>-</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='del'>-	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='del'>-	*value = (cf &gt;&gt; shift) &amp; mask;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pci_read_config(struct pci_bus *bus, unsigned int devfn,</div><div class='del'>-			   int where, int size, u32 * value)</div><div class='del'>-{</div><div class='del'>-	if (bus-&gt;number &gt; 0)</div><div class='del'>-		return pci_conf1_read_config(bus, devfn, where, size, value);</div><div class='del'>-</div><div class='del'>-	return pci_conf0_read_config(bus, devfn, where, size, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pci_conf0_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='del'>-				  int where, int size, u32 value)</div><div class='del'>-{</div><div class='del'>-	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='del'>-	bridge_t *bridge = bc-&gt;base;</div><div class='del'>-	int slot = PCI_SLOT(devfn);</div><div class='del'>-	int fn = PCI_FUNC(devfn);</div><div class='del'>-	volatile void *addr;</div><div class='del'>-	u32 cf, shift, mask, smask;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[PCI_VENDOR_ID];</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to look at it for real ...</div><div class='del'>-	 */</div><div class='del'>-	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='del'>-		goto oh_my_gawd;</div><div class='del'>-</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].c[where ^ (4 - size)];</div><div class='del'>-</div><div class='del'>-	if (size == 1) {</div><div class='del'>-		res = put_dbe(value, (u8 *) addr);</div><div class='del'>-	} else if (size == 2) {</div><div class='del'>-		res = put_dbe(value, (u16 *) addr);</div><div class='del'>-	} else {</div><div class='del'>-		res = put_dbe(value, (u32 *) addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (res)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-</div><div class='del'>-oh_my_gawd:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to touch the wrong register.</div><div class='del'>-	 */</div><div class='del'>-	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48))</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='del'>-	 * anything but 32-bit words ...</div><div class='del'>-	 */</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].l[where &gt;&gt; 2];</div><div class='del'>-</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='del'>-	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='del'>-	smask = mask &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-	cf = (cf &amp; ~smask) | ((value &amp; mask) &lt;&lt; shift);</div><div class='del'>-	if (put_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pci_conf1_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='del'>-				  int where, int size, u32 value)</div><div class='del'>-{</div><div class='del'>-	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);</div><div class='del'>-	bridge_t *bridge = bc-&gt;base;</div><div class='del'>-	int slot = PCI_SLOT(devfn);</div><div class='del'>-	int fn = PCI_FUNC(devfn);</div><div class='del'>-	int busno = bus-&gt;number;</div><div class='del'>-	volatile void *addr;</div><div class='del'>-	u32 cf, shift, mask, smask;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	bridge-&gt;b_pci_cfg = (busno &lt;&lt; 16) | (slot &lt;&lt; 11);</div><div class='del'>-	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | PCI_VENDOR_ID];</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to look at it for real ...</div><div class='del'>-	 */</div><div class='del'>-	if (cf == (PCI_VENDOR_ID_SGI | (PCI_DEVICE_ID_SGI_IOC3 &lt;&lt; 16)))</div><div class='del'>-		goto oh_my_gawd;</div><div class='del'>-</div><div class='del'>-	addr = &amp;bridge-&gt;b_type1_cfg.c[(fn &lt;&lt; 8) | (where ^ (4 - size))];</div><div class='del'>-</div><div class='del'>-	if (size == 1) {</div><div class='del'>-		res = put_dbe(value, (u8 *) addr);</div><div class='del'>-	} else if (size == 2) {</div><div class='del'>-		res = put_dbe(value, (u16 *) addr);</div><div class='del'>-	} else {</div><div class='del'>-		res = put_dbe(value, (u32 *) addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (res)</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-</div><div class='del'>-oh_my_gawd:</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't even give the</div><div class='del'>-	 * generic PCI code a chance to touch the wrong register.</div><div class='del'>-	 */</div><div class='del'>-	if ((where &gt;= 0x14 &amp;&amp; where &lt; 0x40) || (where &gt;= 0x48))</div><div class='del'>-		return PCIBIOS_SUCCESSFUL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * IOC3 is fucked fucked beyond believe ...  Don't try to access</div><div class='del'>-	 * anything but 32-bit words ...</div><div class='del'>-	 */</div><div class='del'>-	addr = &amp;bridge-&gt;b_type0_cfg_dev[slot].f[fn].l[where &gt;&gt; 2];</div><div class='del'>-</div><div class='del'>-	if (get_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	shift = ((where &amp; 3) &lt;&lt; 3);</div><div class='del'>-	mask = (0xffffffffU &gt;&gt; ((4 - size) &lt;&lt; 3));</div><div class='del'>-	smask = mask &lt;&lt; shift;</div><div class='del'>-</div><div class='del'>-	cf = (cf &amp; ~smask) | ((value &amp; mask) &lt;&lt; shift);</div><div class='del'>-	if (put_dbe(cf, (u32 *) addr))</div><div class='del'>-		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-	return PCIBIOS_SUCCESSFUL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pci_write_config(struct pci_bus *bus, unsigned int devfn,</div><div class='del'>-	int where, int size, u32 value)</div><div class='del'>-{</div><div class='del'>-	if (bus-&gt;number &gt; 0)</div><div class='del'>-		return pci_conf1_write_config(bus, devfn, where, size, value);</div><div class='del'>-</div><div class='del'>-	return pci_conf0_write_config(bus, devfn, where, size, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_ops bridge_pci_ops = {</div><div class='del'>-	.read = pci_read_config,</div><div class='del'>-	.write = pci_write_config,</div><div class='del'>-};</div><div class='add'>+extern struct pci_ops bridge_pci_ops;</div><div class='ctx'> </div><div class='ctx'> int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)</div><div class='ctx'> {</div><div class='hunk'>@@ -370,8 +80,7 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)</div><div class='ctx'> 	bc-&gt;widget_id = widget_id;</div><div class='ctx'> 	bc-&gt;nasid = nasid;</div><div class='ctx'> </div><div class='del'>-	bc-&gt;baddr = (u64)masterwid &lt;&lt; 60;</div><div class='del'>-	bc-&gt;baddr |= (1UL &lt;&lt; 56);	/* Barrier set */</div><div class='add'>+	bc-&gt;baddr = (u64)masterwid &lt;&lt; 60 | PCI64_ATTR_BAR;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * point to this bridge</div><div class='head'>diff --git a/arch/mips/pci/pci-ip32.c b/arch/mips/pci/pci-ip32.c<br/>index 180af89bcb1e..17c7932cf0ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ip32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ip32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ip32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-ip32.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 2000, 2001 Keith M Wesolowski</div><div class='ctx'>  * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c<br/>index f02ef6e36b02..cb84f4e8ccae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-jmr3927.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-jmr3927.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-jmr3927.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-jmr3927.c</a></div><div class='hunk'>@@ -35,17 +35,17 @@</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct resource pci_io_resource = {</div><div class='del'>-	"IO MEM",</div><div class='del'>-	0x1000,			/* reserve regacy I/O space */</div><div class='del'>-	0x1000 + JMR3927_PCIIO_SIZE - 1,</div><div class='del'>-	IORESOURCE_IO</div><div class='add'>+	.name	= "IO MEM",</div><div class='add'>+	.start	= 0x1000,			/* reserve regacy I/O space */</div><div class='add'>+	.end	= 0x1000 + JMR3927_PCIIO_SIZE - 1,</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct resource pci_mem_resource = {</div><div class='del'>-	"PCI MEM",</div><div class='del'>-	JMR3927_PCIMEM,</div><div class='del'>-	JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1,</div><div class='del'>-	IORESOURCE_MEM</div><div class='add'>+	.name	= "PCI MEM",</div><div class='add'>+	.start	= JMR3927_PCIMEM,</div><div class='add'>+	.end	= JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1,</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pci_ops jmr3927_pci_ops;</div><div class='head'>diff --git a/arch/mips/pci/pci-ocelot.c b/arch/mips/pci/pci-ocelot.c<br/>index 3da8a4ee6baa..2b9495dce6ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ocelot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-ocelot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-ocelot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-ocelot.c</a></div><div class='hunk'>@@ -71,13 +71,13 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct resource ocelot_mem_resource = {</div><div class='del'>-	iomem_resource.start = GT_PCI_MEM_BASE;</div><div class='del'>-	iomem_resource.end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;</div><div class='add'>+	start	= GT_PCI_MEM_BASE;</div><div class='add'>+	end	= GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource ocelot_io_resource = {</div><div class='del'>-	ioport_resource.start = GT_PCI_IO_BASE;</div><div class='del'>-	ioport_resource.end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;</div><div class='add'>+	start	= GT_PCI_IO_BASE;</div><div class='add'>+	end	= GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pci_controller ocelot_pci_controller = {</div><div class='head'>diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c<br/>index 7cca3bde59b2..80f5e8c4bcd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-sb1250.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-sb1250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-sb1250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-sb1250.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  * kernel mapped memory.  Hopefully neither of these should be a huge</div><div class='ctx'>  * problem.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/pci/pci-yosemite.c b/arch/mips/pci/pci-yosemite.c<br/>index dac9ed4b0ccf..0357946f30e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-yosemite.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci-yosemite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci-yosemite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci-yosemite.c</a></div><div class='hunk'>@@ -14,7 +14,10 @@</div><div class='ctx'> extern struct pci_ops titan_pci_ops;</div><div class='ctx'> </div><div class='ctx'> static struct resource py_mem_resource = {</div><div class='del'>-	"Titan PCI MEM", 0xe0000000UL, 0xe3ffffffUL, IORESOURCE_MEM</div><div class='add'>+	.start	= 0xe0000000UL,</div><div class='add'>+	.end	= 0xe3ffffffUL,</div><div class='add'>+	.name	= "Titan PCI MEM",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -26,7 +29,10 @@ static struct resource py_mem_resource = {</div><div class='ctx'> #define TITAN_IO_BASE	0xe8000000UL</div><div class='ctx'> </div><div class='ctx'> static struct resource py_io_resource = {</div><div class='del'>-	"Titan IO MEM", 0x00001000UL, TITAN_IO_SIZE - 1, IORESOURCE_IO,</div><div class='add'>+	.start	= 0x00001000UL,</div><div class='add'>+	.end	= TITAN_IO_SIZE - 1,</div><div class='add'>+	.name	= "Titan IO MEM",</div><div class='add'>+	.flags	= IORESOURCE_IO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pci_controller py_controller = {</div><div class='head'>diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c<br/>index 21402ffd7c98..5ace368657ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pci/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pci/pci.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2003, 04 Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -51,11 +50,11 @@ unsigned long PCIBIOS_MIN_MEM	= 0;</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-		       unsigned long size, unsigned long align)</div><div class='add'>+		       resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = data;</div><div class='ctx'> 	struct pci_controller *hose = dev-&gt;sysdata;</div><div class='del'>-	unsigned long start = res-&gt;start;</div><div class='add'>+	resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='ctx'> 		/* Make sure we start at our min on all hoses */</div><div class='hunk'>@@ -76,11 +75,6 @@ pcibios_align_resource(void *data, struct resource *res,</div><div class='ctx'> 	res-&gt;start = start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pci_controller * __init alloc_pci_controller(void)</div><div class='del'>-{</div><div class='del'>-	return alloc_bootmem(sizeof(struct pci_controller));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init register_pci_controller(struct pci_controller *hose)</div><div class='ctx'> {</div><div class='ctx'> 	*hose_tail = hose;</div><div class='head'>diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c<br/>index 39ee6314f627..099679a9dfb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/int.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/philips/pnx8550/common/int.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -208,7 +207,7 @@ static void end_irq(unsigned int irq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type level_irq_type = {</div><div class='add'>+static struct irq_chip level_irq_type = {</div><div class='ctx'> 	.typename =	"PNX Level IRQ",</div><div class='ctx'> 	.startup =	startup_irq,</div><div class='ctx'> 	.shutdown =	shutdown_irq,</div><div class='hunk'>@@ -220,13 +219,13 @@ static struct hw_interrupt_type level_irq_type = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction gic_action = {</div><div class='ctx'> 	.handler =	no_action,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"GIC",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction timer_action = {</div><div class='ctx'> 	.handler =	no_action,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"Timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +235,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	int configPR;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PNX8550_INT_CP0_TOTINT; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;level_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;level_irq_type;</div><div class='ctx'> 		pnx8550_ack(i);	/* mask the irq just in case  */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +272,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 		/* mask/priority is still 0 so we will not get any</div><div class='ctx'> 		 * interrupts until it is unmasked */</div><div class='ctx'> </div><div class='del'>-		irq_desc[i].handler = &amp;level_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;level_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Priority level 0 */</div><div class='hunk'>@@ -282,12 +281,12 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	/* Set int vector table address */</div><div class='ctx'> 	PNX8550_GIC_VECTOR_0 = PNX8550_GIC_VECTOR_1 = 0;</div><div class='ctx'> </div><div class='del'>-	irq_desc[MIPS_CPU_GIC_IRQ].handler = &amp;level_irq_type;</div><div class='add'>+	irq_desc[MIPS_CPU_GIC_IRQ].chip = &amp;level_irq_type;</div><div class='ctx'> 	setup_irq(MIPS_CPU_GIC_IRQ, &amp;gic_action);</div><div class='ctx'> </div><div class='ctx'> 	/* init of Timer interrupts */</div><div class='ctx'> 	for (i = PNX8550_INT_TIMER_MIN; i &lt;= PNX8550_INT_TIMER_MAX; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;level_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;level_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Stop Timer 1-3 */</div><div class='hunk'>@@ -295,7 +294,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	configPR |= 0x00000038;</div><div class='ctx'> 	write_c0_config7(configPR);</div><div class='ctx'> </div><div class='del'>-	irq_desc[MIPS_CPU_TIMER_IRQ].handler = &amp;level_irq_type;</div><div class='add'>+	irq_desc[MIPS_CPU_TIMER_IRQ].chip = &amp;level_irq_type;</div><div class='ctx'> 	setup_irq(MIPS_CPU_TIMER_IRQ, &amp;timer_action);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/philips/pnx8550/common/pci.c b/arch/mips/philips/pnx8550/common/pci.c<br/>index baa6905f649f..eee4f3dfc410 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/philips/pnx8550/common/pci.c</a></div><div class='hunk'>@@ -27,17 +27,17 @@</div><div class='ctx'> #include &lt;nand.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_io_resource = {</div><div class='del'>-	"pci IO space",</div><div class='del'>-	(u32)(PNX8550_PCIIO + 0x1000),	/* reserve regacy I/O space */</div><div class='del'>-	(u32)(PNX8550_PCIIO + PNX8550_PCIIO_SIZE),</div><div class='del'>-	IORESOURCE_IO</div><div class='add'>+	.start	= PNX8550_PCIIO + 0x1000,	/* reserve regacy I/O space */</div><div class='add'>+	.end	= PNX8550_PCIIO + PNX8550_PCIIO_SIZE,</div><div class='add'>+	.name	= "pci IO space",</div><div class='add'>+	.flags	= IORESOURCE_IO</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pci_mem_resource = {</div><div class='del'>-	"pci memory space",</div><div class='del'>-	(u32)(PNX8550_PCIMEM),</div><div class='del'>-	(u32)(PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1),</div><div class='del'>-	IORESOURCE_MEM</div><div class='add'>+	.start	= PNX8550_PCIMEM,</div><div class='add'>+	.end	= PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1,</div><div class='add'>+	.name	= "pci memory space",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct pci_ops pnx8550_pci_ops;</div><div class='head'>diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c<br/>index 0d8a77619391..36b0c8bc6c06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/philips/pnx8550/common/setup.c</a></div><div class='hunk'>@@ -17,10 +17,10 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -49,19 +49,33 @@ extern void pnx8550_machine_halt(void);</div><div class='ctx'> extern void pnx8550_machine_power_off(void);</div><div class='ctx'> extern struct resource ioport_resource;</div><div class='ctx'> extern struct resource iomem_resource;</div><div class='del'>-extern void (*board_time_init)(void);</div><div class='ctx'> extern void pnx8550_time_init(void);</div><div class='del'>-extern void (*board_timer_setup)(struct irqaction *irq);</div><div class='del'>-extern void pnx8550_timer_setup(struct irqaction *irq);</div><div class='ctx'> extern void rs_kgdb_hook(int tty_no);</div><div class='ctx'> extern void prom_printf(char *fmt, ...);</div><div class='ctx'> extern char *prom_getcmdline(void);</div><div class='ctx'> </div><div class='ctx'> struct resource standard_io_resources[] = {</div><div class='del'>-	{"dma1", 0x00, 0x1f, IORESOURCE_BUSY},</div><div class='del'>-	{"timer", 0x40, 0x5f, IORESOURCE_BUSY},</div><div class='del'>-	{"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY},</div><div class='del'>-	{"dma2", 0xc0, 0xdf, IORESOURCE_BUSY},</div><div class='add'>+	{</div><div class='add'>+		.start	= .0x00,</div><div class='add'>+		.end	= 0x1f,</div><div class='add'>+		.name	= "dma1",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x40,</div><div class='add'>+		.end	= 0x5f,</div><div class='add'>+		.name	= "timer",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x80,</div><div class='add'>+		.end	= 0x8f,</div><div class='add'>+		.name	= "dma page reg",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0xc0,</div><div class='add'>+		.end	= 0xdf,</div><div class='add'>+		.name	= "dma2",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))</div><div class='hunk'>@@ -82,7 +96,7 @@ unsigned long get_system_mem_size(void)</div><div class='ctx'> </div><div class='ctx'> int pnx8550_console_port = -1;</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char* argptr;</div><div class='hunk'>@@ -94,7 +108,6 @@ void __init plat_setup(void)</div><div class='ctx'>         pm_power_off = pnx8550_machine_power_off;</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = pnx8550_time_init;</div><div class='del'>-	board_timer_setup = pnx8550_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the Global 2 Register, PCI Inta Output Enable Registers</div><div class='ctx'> 	   Bit 1:Enable DAC Powerdown</div><div class='head'>diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c<br/>index 70664ea96b92..0af655b1f330 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/philips/pnx8550/common/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/philips/pnx8550/common/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/philips/pnx8550/common/time.c</a></div><div class='hunk'>@@ -70,16 +70,7 @@ void pnx8550_time_init(void)</div><div class='ctx'> 	mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * pnx8550_timer_setup() - it does the following things:</div><div class='del'>- *</div><div class='del'>- * 5) board_timer_setup() -</div><div class='del'>- *	a) (optional) over-write any choices made above by time_init().</div><div class='del'>- *	b) machine specific code should setup the timer irqaction.</div><div class='del'>- *	c) enable the timer interrupt</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void __init pnx8550_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	int configPR;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c<br/>index 54b65a80abf5..1f7c999eb7c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/ht.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/ht.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/ht.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pmc-sierra/yosemite/ht.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -383,12 +382,12 @@ void pcibios_update_resource(struct pci_dev *dev, struct resource *root,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-                            unsigned long size, unsigned long align)</div><div class='add'>+                            resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'>         struct pci_dev *dev = data;</div><div class='ctx'> </div><div class='ctx'>         if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-                unsigned long start = res-&gt;start;</div><div class='add'>+                resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'>                 /* We need to avoid collisions with `mirrored' VGA ports</div><div class='ctx'>                    and other strange ISA hardware, so we always want the</div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c<br/>index a1f524fc4c10..b91d0aa3b7ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pmc-sierra/yosemite/irq.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Second level Interrupt handlers for the PMC-Sierra Titan/Yosemite board</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c<br/>index 165275c00cbb..9fe4973377c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pmc-sierra/yosemite/prom.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Author: Manish Lachwani (lachwani@pmc-sierra.com)</div><div class='ctx'>  * Copyright (C) 2004 Ralf Baechle</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c<br/>index 3f724d661bdb..0a6ee8e5eec2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/pmc-sierra/yosemite/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/pmc-sierra/yosemite/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/pmc-sierra/yosemite/setup.c</a></div><div class='hunk'>@@ -133,14 +133,13 @@ int m48t37y_set_time(unsigned long sec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void yosemite_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(7, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void yosemite_time_init(void)</div><div class='ctx'> {</div><div class='del'>-	board_timer_setup = yosemite_timer_setup;</div><div class='ctx'> 	mips_hpt_frequency = cpu_clock / 2;</div><div class='ctx'> mips_hpt_frequency = 33000000 * 3 * 5;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,7 +217,7 @@ static void __init py_late_time_init(void)</div><div class='ctx'> 	py_rtc_setup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	board_time_init = yosemite_time_init;</div><div class='ctx'> 	late_time_init = py_late_time_init;</div><div class='head'>diff --git a/arch/mips/qemu/Makefile b/arch/mips/qemu/Makefile<br/>index 730f459f3e99..078cd3029c9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/qemu/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/qemu/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/qemu/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/qemu/Makefile</a></div><div class='hunk'>@@ -2,6 +2,6 @@</div><div class='ctx'> # Makefile for Qemu specific kernel interface routines under Linux.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y		= q-firmware.o q-irq.o q-mem.o q-setup.o</div><div class='add'>+obj-y		= q-firmware.o q-irq.o q-mem.o q-setup.o q-reset.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SMP) += q-smp.o</div><div class='head'>diff --git a/arch/mips/qemu/q-reset.c b/arch/mips/qemu/q-reset.c<br/>new file mode 100644<br/>index 000000000000..dbbe44ad7e89<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/qemu/q-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/qemu/q-reset.c</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/reboot.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+#include &lt;asm/qemu.h&gt;</div><div class='add'>+</div><div class='add'>+static void qemu_machine_restart(char *command)</div><div class='add'>+{</div><div class='add'>+	volatile unsigned int *reg = (unsigned int *)QEMU_RESTART_REG;</div><div class='add'>+</div><div class='add'>+	set_c0_status(ST0_BEV | ST0_ERL);</div><div class='add'>+	change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);</div><div class='add'>+	flush_cache_all();</div><div class='add'>+	write_c0_wired(0);</div><div class='add'>+	*reg = 42;</div><div class='add'>+	while (1)</div><div class='add'>+		cpu_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qemu_machine_halt(void)</div><div class='add'>+{</div><div class='add'>+	volatile unsigned int *reg = (unsigned int *)QEMU_HALT_REG;</div><div class='add'>+</div><div class='add'>+	*reg = 42;</div><div class='add'>+	while (1)</div><div class='add'>+		cpu_wait();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qemu_reboot_setup(void)</div><div class='add'>+{</div><div class='add'>+	_machine_restart = qemu_machine_restart;</div><div class='add'>+	_machine_halt = qemu_machine_halt;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/mips/qemu/q-setup.c b/arch/mips/qemu/q-setup.c<br/>index 022eb1af6db1..841394336f00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/qemu/q-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/qemu/q-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/qemu/q-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/qemu/q-setup.c</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> </div><div class='add'>+extern void qemu_reboot_setup(void);</div><div class='add'>+</div><div class='ctx'> #define QEMU_PORT_BASE 0xb4000000</div><div class='ctx'> </div><div class='ctx'> const char *get_system_type(void)</div><div class='hunk'>@@ -9,7 +11,7 @@ const char *get_system_type(void)</div><div class='ctx'> 	return "Qemu";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init qemu_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* set the clock to 100 Hz */</div><div class='ctx'> 	outb_p(0x34,0x43);		/* binary, mode 2, LSB/MSB, ch 0 */</div><div class='hunk'>@@ -18,8 +20,8 @@ static void __init qemu_timer_setup(struct irqaction *irq)</div><div class='ctx'> 	setup_irq(0, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	set_io_port_base(QEMU_PORT_BASE);</div><div class='del'>-	board_timer_setup = qemu_timer_setup;</div><div class='add'>+	qemu_reboot_setup();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c<br/>index b19820110aa3..ee0514a29922 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-eisa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-eisa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-eisa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip22/ip22-eisa.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * - Fix more bugs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/eisa.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -145,7 +144,7 @@ static void end_eisa1_irq(unsigned int irq)</div><div class='ctx'> 		enable_eisa1_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip22_eisa1_irq_type = {</div><div class='add'>+static struct irq_chip ip22_eisa1_irq_type = {</div><div class='ctx'> 	.typename	= "IP22 EISA",</div><div class='ctx'> 	.startup	= startup_eisa1_irq,</div><div class='ctx'> 	.shutdown	= shutdown_eisa1_irq,</div><div class='hunk'>@@ -207,7 +206,7 @@ static void end_eisa2_irq(unsigned int irq)</div><div class='ctx'> 		enable_eisa2_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip22_eisa2_irq_type = {</div><div class='add'>+static struct irq_chip ip22_eisa2_irq_type = {</div><div class='ctx'> 	.typename	= "IP22 EISA",</div><div class='ctx'> 	.startup	= startup_eisa2_irq,</div><div class='ctx'> 	.shutdown	= shutdown_eisa2_irq,</div><div class='hunk'>@@ -279,9 +278,9 @@ int __init ip22_eisa_init(void)</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='ctx'> 		if (i &lt; (SGINT_EISA + 8))</div><div class='del'>-			irq_desc[i].handler = &amp;ip22_eisa1_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;ip22_eisa1_irq_type;</div><div class='ctx'> 		else</div><div class='del'>-			irq_desc[i].handler = &amp;ip22_eisa2_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;ip22_eisa2_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Cannot use request_irq because of kmalloc not being ready at such</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c<br/>index fc6a7e2b189c..f66026e5d64b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-int.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip22/ip22-int.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *                    - Interrupt handling fixes</div><div class='ctx'>  * Copyright (C) 2001, 2003 Ladislav Michl (ladis@linux-mips.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -75,7 +74,7 @@ static void end_local0_irq (unsigned int irq)</div><div class='ctx'> 		enable_local0_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip22_local0_irq_type = {</div><div class='add'>+static struct irq_chip ip22_local0_irq_type = {</div><div class='ctx'> 	.typename	= "IP22 local 0",</div><div class='ctx'> 	.startup	= startup_local0_irq,</div><div class='ctx'> 	.shutdown	= shutdown_local0_irq,</div><div class='hunk'>@@ -121,7 +120,7 @@ static void end_local1_irq (unsigned int irq)</div><div class='ctx'> 		enable_local1_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip22_local1_irq_type = {</div><div class='add'>+static struct irq_chip ip22_local1_irq_type = {</div><div class='ctx'> 	.typename	= "IP22 local 1",</div><div class='ctx'> 	.startup	= startup_local1_irq,</div><div class='ctx'> 	.shutdown	= shutdown_local1_irq,</div><div class='hunk'>@@ -167,7 +166,7 @@ static void end_local2_irq (unsigned int irq)</div><div class='ctx'> 		enable_local2_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip22_local2_irq_type = {</div><div class='add'>+static struct irq_chip ip22_local2_irq_type = {</div><div class='ctx'> 	.typename	= "IP22 local 2",</div><div class='ctx'> 	.startup	= startup_local2_irq,</div><div class='ctx'> 	.shutdown	= shutdown_local2_irq,</div><div class='hunk'>@@ -213,7 +212,7 @@ static void end_local3_irq (unsigned int irq)</div><div class='ctx'> 		enable_local3_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip22_local3_irq_type = {</div><div class='add'>+static struct irq_chip ip22_local3_irq_type = {</div><div class='ctx'> 	.typename	= "IP22 local 3",</div><div class='ctx'> 	.startup	= startup_local3_irq,</div><div class='ctx'> 	.shutdown	= shutdown_local3_irq,</div><div class='hunk'>@@ -273,32 +272,32 @@ static void indy_buserror_irq(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction local0_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "local0 cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction local1_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "local1 cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction buserr = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "Bus Error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction map0_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "mapable0 cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_LIO3_IRQ</div><div class='ctx'> static struct irqaction map1_cascade = {</div><div class='ctx'> 	.handler	= no_action,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "mapable1 cascade",</div><div class='ctx'> };</div><div class='ctx'> #define SGI_INTERRUPTS	SGINT_END</div><div class='hunk'>@@ -422,7 +421,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	mips_cpu_irq_init(SGINT_CPU);</div><div class='ctx'> </div><div class='ctx'> 	for (i = SGINT_LOCAL0; i &lt; SGI_INTERRUPTS; i++) {</div><div class='del'>-		hw_irq_controller *handler;</div><div class='add'>+		struct irq_chip *handler;</div><div class='ctx'> </div><div class='ctx'> 		if (i &lt; SGINT_LOCAL1)</div><div class='ctx'> 			handler		= &amp;ip22_local0_irq_type;</div><div class='hunk'>@@ -436,7 +435,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 		irq_desc[i].status	= IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action	= 0;</div><div class='ctx'> 		irq_desc[i].depth	= 1;</div><div class='del'>-		irq_desc[i].handler	= handler;</div><div class='add'>+		irq_desc[i].chip	= handler;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* vector handler. this register the IRQ as non-sharable */</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c<br/>index a9c58e067b53..8134220ed600 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip22/ip22-reset.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #define POWERDOWN_TIMEOUT	120</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Blink frequency during reboot grace period and when paniced.</div><div class='add'>+ * Blink frequency during reboot grace period and when panicked.</div><div class='ctx'>  */</div><div class='ctx'> #define POWERDOWN_FREQ		(HZ / 4)</div><div class='ctx'> #define PANIC_FREQ		(HZ / 8)</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c<br/>index 7018e1833e85..25097ecc9baa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip22/ip22-setup.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)</div><div class='ctx'>  * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ds1286.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -53,7 +52,7 @@ EXPORT_SYMBOL(ip22_do_break);</div><div class='ctx'> extern void ip22_be_init(void) __init;</div><div class='ctx'> extern void ip22_time_init(void) __init;</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	char *ctype;</div><div class='ctx'> 	char *cserial;</div><div class='head'>diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c<br/>index cca688ad64ad..0e061890f797 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip22/ip22-time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip22/ip22-time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip22/ip22-time.c</a></div><div class='hunk'>@@ -7,11 +7,12 @@</div><div class='ctx'>  * Ralf Baechle or David S. Miller (sorry guys, i'm really not sure)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001 by Ladislav Michl</div><div class='del'>- * Copyright (C) 2003 Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copyright (C) 2003, 06 Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='ctx'> #include &lt;linux/ds1286.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -76,7 +77,7 @@ static int indy_rtc_set_time(unsigned long tim)</div><div class='ctx'> 	save_control = hpc3c0-&gt;rtcregs[RTC_CMD] &amp; 0xff;</div><div class='ctx'> 	hpc3c0-&gt;rtcregs[RTC_CMD] = save_control | RTC_TE;</div><div class='ctx'> </div><div class='del'>-	hpc3c0-&gt;rtcregs[RTC_YEAR] = BIN2BCD(tm.tm_sec);</div><div class='add'>+	hpc3c0-&gt;rtcregs[RTC_YEAR] = BIN2BCD(tm.tm_year);</div><div class='ctx'> 	hpc3c0-&gt;rtcregs[RTC_MONTH] = BIN2BCD(tm.tm_mon);</div><div class='ctx'> 	hpc3c0-&gt;rtcregs[RTC_DATE] = BIN2BCD(tm.tm_mday);</div><div class='ctx'> 	hpc3c0-&gt;rtcregs[RTC_HOURS] = BIN2BCD(tm.tm_hour);</div><div class='hunk'>@@ -198,9 +199,7 @@ void indy_r4k_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);</div><div class='del'>-</div><div class='del'>-static void indy_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* over-write the handler, we use our own way */</div><div class='ctx'> 	irq-&gt;handler = no_action;</div><div class='hunk'>@@ -216,5 +215,4 @@ void __init ip22_time_init(void)</div><div class='ctx'> 	rtc_mips_set_time = indy_rtc_set_time;</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = indy_time_init;</div><div class='del'>-	board_timer_setup = indy_timer_setup;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig<br/>index 7b0bc4437243..5e960ae9735a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/Kconfig</a></div><div class='hunk'>@@ -4,43 +4,42 @@</div><div class='ctx'> #	  This options adds support for userspace processes upto 16TB size.</div><div class='ctx'> #	  Normally the limit is just .5TB.</div><div class='ctx'> </div><div class='del'>-config SGI_SN0_N_MODE</div><div class='del'>-	bool "IP27 N-Mode"</div><div class='add'>+choice</div><div class='add'>+	prompt "Node addressing mode"</div><div class='ctx'> 	depends on SGI_IP27</div><div class='del'>-	help</div><div class='del'>-	  The nodes of Origin 200, Origin 2000 and Onyx 2 systems can be</div><div class='del'>-	  configured in either N-Modes which allows for more nodes or M-Mode</div><div class='del'>-	  which allows for more memory.  Your system is most probably</div><div class='del'>-	  running in M-Mode, so you should say N here.</div><div class='add'>+	default SGI_SN_M_MODE</div><div class='ctx'> </div><div class='del'>-config ARCH_DISCONTIGMEM_ENABLE</div><div class='del'>-	bool</div><div class='del'>-	default y if SGI_IP27</div><div class='add'>+config SGI_SN_M_MODE</div><div class='add'>+	bool "IP27 M-Mode"</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y to upport efficient handling of discontiguous physical memory,</div><div class='del'>-	  for architectures which are either NUMA (Non-Uniform Memory Access)</div><div class='del'>-	  or have huge holes in the physical address space for other reasons.</div><div class='del'>-	  See &lt;file:Documentation/vm/numa&gt; for more.</div><div class='add'>+	  The nodes of Origin, Onyx, Fuel and Tezro systems can be configured</div><div class='add'>+	  in either N-Modes which allows for more nodes or M-Mode which allows</div><div class='add'>+	  for more memory.  Your hardware is almost certainly running in</div><div class='add'>+	  M-Mode, so choose M-mode here.</div><div class='ctx'> </div><div class='del'>-config NUMA</div><div class='del'>-	bool "NUMA Support"</div><div class='del'>-	depends on SGI_IP27</div><div class='add'>+config SGI_SN_N_MODE</div><div class='add'>+	bool "IP27 N-Mode"</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory</div><div class='del'>-	  Access).  This option is for configuring high-end multiprocessor</div><div class='del'>-	  server machines.  If in doubt, say N.</div><div class='add'>+	  The nodes of Origin, Onyx, Fuel and Tezro systems can be configured</div><div class='add'>+	  in either N-Modes which allows for more nodes or M-Mode which allows</div><div class='add'>+	  for more memory.  Your hardware is almost certainly running in</div><div class='add'>+	  M-Mode, so choose M-mode here.</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='ctx'> </div><div class='ctx'> config MAPPED_KERNEL</div><div class='ctx'> 	bool "Mapped kernel support"</div><div class='ctx'> 	depends on SGI_IP27</div><div class='ctx'> 	help</div><div class='ctx'> 	  Change the way a Linux kernel is loaded into memory on a MIPS64</div><div class='del'>-	  machine.  This is required in order to support text replication and</div><div class='add'>+	  machine.  This is required in order to support text replication on</div><div class='ctx'> 	  NUMA.  If you need to understand it, read the source code.</div><div class='ctx'> </div><div class='ctx'> config REPLICATE_KTEXT</div><div class='ctx'> 	bool "Kernel text replication support"</div><div class='ctx'> 	depends on SGI_IP27</div><div class='add'>+	select MAPPED_KERNEL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to enable replicating the kernel text across multiple</div><div class='ctx'> 	  nodes in a NUMA cluster.  This trades memory for speed.</div><div class='head'>diff --git a/arch/mips/sgi-ip27/Makefile b/arch/mips/sgi-ip27/Makefile<br/>index 686ba14e2882..a457263f4391 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/Makefile</a></div><div class='hunk'>@@ -2,11 +2,12 @@</div><div class='ctx'> # Makefile for the IP27 specific kernel interface routines under Linux.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y	:= ip27-berr.o ip27-console.o ip27-irq.o ip27-init.o \</div><div class='del'>-	   ip27-klconfig.o ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-reset.o \</div><div class='del'>-	   ip27-timer.o ip27-hubio.o ip27-xtalk.o</div><div class='add'>+obj-y	:= ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o ip27-klnuma.o \</div><div class='add'>+	   ip27-memory.o ip27-nmi.o ip27-reset.o ip27-timer.o ip27-hubio.o \</div><div class='add'>+	   ip27-xtalk.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_KGDB)	+= ip27-dbgio.o</div><div class='del'>-obj-$(CONFIG_SMP)	+= ip27-smp.o</div><div class='add'>+obj-$(CONFIG_EARLY_PRINTK)	+= ip27-console.o</div><div class='add'>+obj-$(CONFIG_KGDB)		+= ip27-dbgio.o</div><div class='add'>+obj-$(CONFIG_SMP)		+= ip27-smp.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c<br/>index 3e1ac299b804..14211e382374 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-console.c</a></div><div class='hunk'>@@ -46,33 +46,29 @@ void prom_putchar(char c)</div><div class='ctx'> 	uart-&gt;iu_thr = c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-char __init prom_getchar(void)</div><div class='add'>+static void ioc3_console_write(struct console *con, const char *s, unsigned n)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	while (n-- &amp;&amp; *s) {</div><div class='add'>+		if (*s == '\n')</div><div class='add'>+			prom_putchar('\r');</div><div class='add'>+		prom_putchar(*s);</div><div class='add'>+		s++;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void inline ioc3_console_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct uart_port up;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Register to interrupt zero because we share the interrupt with</div><div class='del'>-	 * the serial driver which we don't properly support yet.</div><div class='del'>-	 */</div><div class='del'>-	memset(&amp;up, 0, sizeof(up));</div><div class='del'>-	up.membase	= (unsigned char *) console_uart();</div><div class='del'>-	up.irq		= 0;</div><div class='del'>-	up.uartclk	= IOC3_CLK;</div><div class='del'>-	up.regshift	= 0;</div><div class='del'>-	up.iotype	= UPIO_MEM;</div><div class='del'>-	up.flags	= IOC3_FLAGS;</div><div class='del'>-	up.line		= 0;</div><div class='add'>+static struct console ioc3_console = {</div><div class='add'>+	.name	= "ioc3",</div><div class='add'>+	.write	= ioc3_console_write,</div><div class='add'>+	.flags	= CON_PRINTBUFFER | CON_BOOT,</div><div class='add'>+	.index	= -1</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	if (early_serial_setup(&amp;up))</div><div class='del'>-		printk(KERN_ERR "Early serial init of port 0 failed\n");</div><div class='add'>+__init void ip27_setup_console(void)</div><div class='add'>+{</div><div class='add'>+	register_console(&amp;ioc3_console);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__init void ip27_setup_console(void)</div><div class='add'>+void __init disable_early_printk(void)</div><div class='ctx'> {</div><div class='del'>-	ioc3_console_probe();</div><div class='add'>+	unregister_console(&amp;ioc3_console);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c<br/>index 8651a0e75404..9094baf31d0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-init.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 2000 - 2001 by Kanoj Sarcar (kanoj@sgi.com)</div><div class='ctx'>  * Copyright (C) 2000 - 2001 by Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -196,7 +195,7 @@ extern void ip27_setup_console(void);</div><div class='ctx'> extern void ip27_time_init(void);</div><div class='ctx'> extern void ip27_reboot_setup(void);</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	hubreg_t p, e, n_mode;</div><div class='ctx'> 	nasid_t nid;</div><div class='hunk'>@@ -228,7 +227,7 @@ void __init plat_setup(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	n_mode = LOCAL_HUB_L(NI_STATUS_REV_ID) &amp; NSRI_MORENODES_MASK;</div><div class='ctx'> 	printk("Machine is in %c mode.\n", n_mode ? 'N' : 'M');</div><div class='del'>-#ifdef CONFIG_SGI_SN0_N_MODE</div><div class='add'>+#ifdef CONFIG_SGI_SN_N_MODE</div><div class='ctx'> 	if (!n_mode)</div><div class='ctx'> 		panic("Kernel compiled for M mode.");</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c<br/>index 2e643d2f51cb..24a85372284f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-irq.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -119,7 +118,7 @@ static int ms1bit(unsigned long x)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This code is unnecessarily complex, because we do SA_INTERRUPT</div><div class='add'>+ * This code is unnecessarily complex, because we do IRQF_DISABLED</div><div class='ctx'>  * intr enabling. Basically, once we grab the set of intrs we need</div><div class='ctx'>  * to service, we must mask _all_ these interrupts; firstly, to make</div><div class='ctx'>  * sure the same intr does not intr again, causing recursion that</div><div class='hunk'>@@ -297,7 +296,6 @@ static void shutdown_bridge_irq(unsigned int irq)</div><div class='ctx'> 	struct bridge_controller *bc = IRQ_TO_BRIDGE(irq);</div><div class='ctx'> 	struct hub_data *hub = hub_data(cpu_to_node(bc-&gt;irq_cpu));</div><div class='ctx'> 	bridge_t *bridge = bc-&gt;base;</div><div class='del'>-	struct slice_data *si = cpu_data[bc-&gt;irq_cpu].data;</div><div class='ctx'> 	int pin, swlevel;</div><div class='ctx'> 	cpuid_t cpu;</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +310,6 @@ static void shutdown_bridge_irq(unsigned int irq)</div><div class='ctx'> 	intr_disconnect_level(cpu, swlevel);</div><div class='ctx'> </div><div class='ctx'> 	__clear_bit(swlevel, hub-&gt;irq_alloc_mask);</div><div class='del'>-	si-&gt;level_to_irq[swlevel] = -1;</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;b_int_enable &amp;= ~(1 &lt;&lt; pin);</div><div class='ctx'> 	bridge-&gt;b_wid_tflush;</div><div class='hunk'>@@ -348,7 +345,7 @@ static void end_bridge_irq(unsigned int irq)</div><div class='ctx'> 		enable_bridge_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type bridge_irq_type = {</div><div class='add'>+static struct irq_chip bridge_irq_type = {</div><div class='ctx'> 	.typename	= "bridge",</div><div class='ctx'> 	.startup	= startup_bridge_irq,</div><div class='ctx'> 	.shutdown	= shutdown_bridge_irq,</div><div class='hunk'>@@ -360,7 +357,7 @@ static struct hw_interrupt_type bridge_irq_type = {</div><div class='ctx'> </div><div class='ctx'> static unsigned long irq_map[NR_IRQS / BITS_PER_LONG];</div><div class='ctx'> </div><div class='del'>-static int allocate_irqno(void)</div><div class='add'>+int allocate_irqno(void)</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='hunk'>@@ -386,7 +383,7 @@ void __devinit register_bridge_irq(unsigned int irq)</div><div class='ctx'> 	irq_desc[irq].status	= IRQ_DISABLED;</div><div class='ctx'> 	irq_desc[irq].action	= 0;</div><div class='ctx'> 	irq_desc[irq].depth	= 1;</div><div class='del'>-	irq_desc[irq].handler	= &amp;bridge_irq_type;</div><div class='add'>+	irq_desc[irq].chip	= &amp;bridge_irq_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __devinit request_bridge_irq(struct bridge_controller *bc)</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c<br/>index 41c3f405e00c..d777b7d1a9fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-klnuma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-klnuma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-klnuma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-klnuma.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright 2000 - 2001 Silicon Graphics, Inc.</div><div class='ctx'>  * Copyright 2000 - 2001 Kanoj Sarcar (kanoj@sgi.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c<br/>index 6c00dce9f73f..efe6971fc800 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-memory.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * On SGI IP27 the ARC memory configuration data is completly bogus but</div><div class='ctx'>  * alternate easier to use mechanisms are available.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-reset.c b/arch/mips/sgi-ip27/ip27-reset.c<br/>index 4322db57d3c1..c17076108d47 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-reset.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1997, 1998, 1999, 2000, 06 by Ralf Baechle</div><div class='ctx'>  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='head'>diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c<br/>index 36b662e27b6e..b029ba79c27a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip27/ip27-timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip27/ip27-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip27/ip27-timer.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copytight (C) 1999, 2000, 05 Ralf Baechle (ralf@linux-mips.org)</div><div class='add'>+ * Copytight (C) 1999, 2000, 05, 06 Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  * Copytight (C) 1999, 2000 Silicon Graphics, Inc.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='hunk'>@@ -89,11 +89,13 @@ static int set_rtc_mmss(unsigned long nowtime)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static unsigned int rt_timer_irq;</div><div class='add'>+</div><div class='ctx'> void ip27_rt_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> 	int cpuA = cputoslice(cpu) == 0;</div><div class='del'>-	int irq = 9;				/* XXX Assign number */</div><div class='add'>+	unsigned int irq = rt_timer_irq;</div><div class='ctx'> </div><div class='ctx'> 	irq_enter();</div><div class='ctx'> 	write_seqlock(&amp;xtime_lock);</div><div class='hunk'>@@ -179,13 +181,73 @@ static __init unsigned long get_m48t35_time(void)</div><div class='ctx'>         return mktime(year, month, date, hour, min, sec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ip27_timer_setup(struct irqaction *irq)</div><div class='add'>+static unsigned int startup_rt_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void shutdown_rt_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enable_rt_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_rt_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mask_and_ack_rt(unsigned int irq)</div><div class='ctx'> {</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void end_rt_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip rt_irq_type = {</div><div class='add'>+	.typename	= "SN HUB RT timer",</div><div class='add'>+	.startup	= startup_rt_irq,</div><div class='add'>+	.shutdown	= shutdown_rt_irq,</div><div class='add'>+	.enable		= enable_rt_irq,</div><div class='add'>+	.disable	= disable_rt_irq,</div><div class='add'>+	.ack		= mask_and_ack_rt,</div><div class='add'>+	.end		= end_rt_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct irqaction rt_irqaction = {</div><div class='add'>+	.handler	= ip27_rt_timer_interrupt,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='add'>+	.mask		= CPU_MASK_NONE,</div><div class='add'>+	.name		= "timer"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int allocate_irqno(void);</div><div class='add'>+</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='add'>+{</div><div class='add'>+	int irqno  = allocate_irqno();</div><div class='add'>+</div><div class='add'>+	if (irqno &lt; 0)</div><div class='add'>+		panic("Can't allocate interrupt number for timer interrupt");</div><div class='add'>+</div><div class='add'>+	irq_desc[irqno].status	= IRQ_DISABLED;</div><div class='add'>+	irq_desc[irqno].action	= NULL;</div><div class='add'>+	irq_desc[irqno].depth	= 1;</div><div class='add'>+	irq_desc[irqno].chip	= &amp;rt_irq_type;</div><div class='add'>+</div><div class='ctx'> 	/* over-write the handler, we use our own way */</div><div class='ctx'> 	irq-&gt;handler = no_action;</div><div class='ctx'> </div><div class='ctx'> 	/* setup irqaction */</div><div class='del'>-//	setup_irq(IP27_TIMER_IRQ, irq);		/* XXX Can't do this yet.  */</div><div class='add'>+	irq_desc[irqno].status |= IRQ_PER_CPU;</div><div class='add'>+</div><div class='add'>+	rt_timer_irq = irqno;</div><div class='add'>+	/*</div><div class='add'>+	 * Only needed to get /proc/interrupt to display timer irq stats</div><div class='add'>+	 */</div><div class='add'>+	setup_irq(irqno, &amp;rt_irqaction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init ip27_time_init(void)</div><div class='hunk'>@@ -194,8 +256,6 @@ void __init ip27_time_init(void)</div><div class='ctx'> 	xtime.tv_nsec = 0;</div><div class='ctx'> </div><div class='ctx'> 	do_gettimeoffset = ip27_do_gettimeoffset;</div><div class='del'>-</div><div class='del'>-	board_timer_setup = ip27_timer_setup;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init cpu_time_init(void)</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c<br/>index de01c9815bdd..c64a820373de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip32/ip32-irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip32/ip32-irq.c</a></div><div class='hunk'>@@ -31,12 +31,12 @@</div><div class='ctx'> /* issue a PIO read to make sure no PIO writes are pending */</div><div class='ctx'> static void inline flush_crime_bus(void)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned long junk = crime-&gt;control;</div><div class='add'>+	crime-&gt;control;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void inline flush_mace_bus(void)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned long junk = mace-&gt;perif.ctrl.misc;</div><div class='add'>+	mace-&gt;perif.ctrl.misc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_IRQ</div><div class='hunk'>@@ -125,9 +125,9 @@ extern irqreturn_t crime_memerr_intr (int irq, void *dev_id,</div><div class='ctx'> extern irqreturn_t crime_cpuerr_intr (int irq, void *dev_id,</div><div class='ctx'> 				      struct pt_regs *regs);</div><div class='ctx'> </div><div class='del'>-struct irqaction memerr_irq = { crime_memerr_intr, SA_INTERRUPT,</div><div class='add'>+struct irqaction memerr_irq = { crime_memerr_intr, IRQF_DISABLED,</div><div class='ctx'> 			CPU_MASK_NONE, "CRIME memory error", NULL, NULL };</div><div class='del'>-struct irqaction cpuerr_irq = { crime_cpuerr_intr, SA_INTERRUPT,</div><div class='add'>+struct irqaction cpuerr_irq = { crime_cpuerr_intr, IRQF_DISABLED,</div><div class='ctx'> 			CPU_MASK_NONE, "CRIME CPU error", NULL, NULL };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -160,7 +160,7 @@ static void end_cpu_irq(unsigned int irq)</div><div class='ctx'> #define shutdown_cpu_irq disable_cpu_irq</div><div class='ctx'> #define mask_and_ack_cpu_irq disable_cpu_irq</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip32_cpu_interrupt = {</div><div class='add'>+static struct irq_chip ip32_cpu_interrupt = {</div><div class='ctx'> 	.typename = "IP32 CPU",</div><div class='ctx'> 	.startup = startup_cpu_irq,</div><div class='ctx'> 	.shutdown = shutdown_cpu_irq,</div><div class='hunk'>@@ -230,7 +230,7 @@ static void end_crime_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> #define shutdown_crime_irq disable_crime_irq</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip32_crime_interrupt = {</div><div class='add'>+static struct irq_chip ip32_crime_interrupt = {</div><div class='ctx'> 	.typename = "IP32 CRIME",</div><div class='ctx'> 	.startup = startup_crime_irq,</div><div class='ctx'> 	.shutdown = shutdown_crime_irq,</div><div class='hunk'>@@ -289,7 +289,7 @@ static void end_macepci_irq(unsigned int irq)</div><div class='ctx'> #define shutdown_macepci_irq disable_macepci_irq</div><div class='ctx'> #define mask_and_ack_macepci_irq disable_macepci_irq</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip32_macepci_interrupt = {</div><div class='add'>+static struct irq_chip ip32_macepci_interrupt = {</div><div class='ctx'> 	.typename = "IP32 MACE PCI",</div><div class='ctx'> 	.startup = startup_macepci_irq,</div><div class='ctx'> 	.shutdown = shutdown_macepci_irq,</div><div class='hunk'>@@ -419,7 +419,7 @@ static void end_maceisa_irq(unsigned irq)</div><div class='ctx'> </div><div class='ctx'> #define shutdown_maceisa_irq disable_maceisa_irq</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip32_maceisa_interrupt = {</div><div class='add'>+static struct irq_chip ip32_maceisa_interrupt = {</div><div class='ctx'> 	.typename = "IP32 MACE ISA",</div><div class='ctx'> 	.startup = startup_maceisa_irq,</div><div class='ctx'> 	.shutdown = shutdown_maceisa_irq,</div><div class='hunk'>@@ -469,7 +469,7 @@ static void end_mace_irq(unsigned int irq)</div><div class='ctx'> #define shutdown_mace_irq disable_mace_irq</div><div class='ctx'> #define mask_and_ack_mace_irq disable_mace_irq</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type ip32_mace_interrupt = {</div><div class='add'>+static struct irq_chip ip32_mace_interrupt = {</div><div class='ctx'> 	.typename = "IP32 MACE",</div><div class='ctx'> 	.startup = startup_mace_irq,</div><div class='ctx'> 	.shutdown = shutdown_mace_irq,</div><div class='hunk'>@@ -575,7 +575,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 	mace-&gt;perif.ctrl.imask = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (irq = 0; irq &lt;= IP32_IRQ_MAX; irq++) {</div><div class='del'>-		hw_irq_controller *controller;</div><div class='add'>+		struct irq_chip *controller;</div><div class='ctx'> </div><div class='ctx'> 		if (irq == IP32_R4K_TIMER_IRQ)</div><div class='ctx'> 			controller = &amp;ip32_cpu_interrupt;</div><div class='hunk'>@@ -591,7 +591,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 		irq_desc[irq].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[irq].action = 0;</div><div class='ctx'> 		irq_desc[irq].depth = 0;</div><div class='del'>-		irq_desc[irq].handler = controller;</div><div class='add'>+		irq_desc[irq].chip = controller;</div><div class='ctx'> 	}</div><div class='ctx'> 	setup_irq(CRIME_MEMERR_IRQ, &amp;memerr_irq);</div><div class='ctx'> 	setup_irq(CRIME_CPUERR_IRQ, &amp;cpuerr_irq);</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c<br/>index ab9d9cef089e..79ddb4605659 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip32/ip32-reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip32/ip32-reset.c</a></div><div class='hunk'>@@ -28,13 +28,13 @@</div><div class='ctx'> </div><div class='ctx'> #define POWERDOWN_TIMEOUT	120</div><div class='ctx'> /*</div><div class='del'>- * Blink frequency during reboot grace period and when paniced.</div><div class='add'>+ * Blink frequency during reboot grace period and when panicked.</div><div class='ctx'>  */</div><div class='ctx'> #define POWERDOWN_FREQ		(HZ / 4)</div><div class='ctx'> #define PANIC_FREQ		(HZ / 8)</div><div class='ctx'> </div><div class='ctx'> static struct timer_list power_timer, blink_timer, debounce_timer;</div><div class='del'>-static int has_paniced, shuting_down;</div><div class='add'>+static int has_panicked, shuting_down;</div><div class='ctx'> </div><div class='ctx'> static void ip32_machine_restart(char *command) __attribute__((noreturn));</div><div class='ctx'> static void ip32_machine_halt(void) __attribute__((noreturn));</div><div class='hunk'>@@ -109,7 +109,7 @@ static void debounce(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> 	CMOS_WRITE(reg_a &amp; ~DS_REGA_DV0, RTC_REG_A);</div><div class='ctx'> </div><div class='del'>-	if (has_paniced)</div><div class='add'>+	if (has_panicked)</div><div class='ctx'> 		ip32_machine_restart(NULL);</div><div class='ctx'> </div><div class='ctx'> 	enable_irq(MACEISA_RTC_IRQ);</div><div class='hunk'>@@ -117,7 +117,7 @@ static void debounce(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> static inline void ip32_power_button(void)</div><div class='ctx'> {</div><div class='del'>-	if (has_paniced)</div><div class='add'>+	if (has_panicked)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (shuting_down || kill_proc(1, SIGINT, 1)) {</div><div class='hunk'>@@ -161,9 +161,9 @@ static int panic_event(struct notifier_block *this, unsigned long event,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long led;</div><div class='ctx'> </div><div class='del'>-	if (has_paniced)</div><div class='add'>+	if (has_panicked)</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='del'>-	has_paniced = 1;</div><div class='add'>+	has_panicked = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* turn off the green LED */</div><div class='ctx'> 	led = mace-&gt;perif.ctrl.misc | MACEISA_LED_GREEN;</div><div class='head'>diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c<br/>index a2dd8ae1ea8f..57708fe28bd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sgi-ip32/ip32-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sgi-ip32/ip32-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sgi-ip32/ip32-setup.c</a></div><div class='hunk'>@@ -7,8 +7,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2000 Harald Koerfgen</div><div class='ctx'>  * Copyright (C) 2002, 2003, 2005 Ilya A. Volynets</div><div class='add'>+ * Copyright (C) 2006 Ralf Baechle &lt;ralf@linux-mips.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -81,13 +81,13 @@ void __init ip32_time_init(void)</div><div class='ctx'> 	printk("%d MHz CPU detected\n", mips_hpt_frequency * 2 / 1000000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init ip32_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	irq-&gt;handler = no_action;</div><div class='ctx'> 	setup_irq(IP32_R4K_TIMER_IRQ, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	board_be_init = ip32_be_init;</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +95,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	rtc_mips_set_mmss = mc146818_set_rtc_mmss;</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = ip32_time_init;</div><div class='del'>-	board_timer_setup = ip32_timer_setup;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_8250</div><div class='ctx'> 	{</div><div class='head'>diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig<br/>index 816aee7fcd25..ec7a2cffacf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/Kconfig</a></div><div class='hunk'>@@ -3,6 +3,7 @@ config SIBYTE_SB1250</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select SIBYTE_HAS_LDT</div><div class='ctx'> 	select SIBYTE_SB1xxx_SOC</div><div class='add'>+	select SYS_SUPPORTS_SMP</div><div class='ctx'> </div><div class='ctx'> config SIBYTE_BCM1120</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -30,11 +31,13 @@ config SIBYTE_BCM1x80</div><div class='ctx'> 	bool</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select SIBYTE_SB1xxx_SOC</div><div class='add'>+	select SYS_SUPPORTS_SMP</div><div class='ctx'> </div><div class='ctx'> config SIBYTE_BCM1x55</div><div class='ctx'> 	bool</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select SIBYTE_SB1xxx_SOC</div><div class='add'>+	select SYS_SUPPORTS_SMP</div><div class='ctx'> </div><div class='ctx'> config SIBYTE_SB1xxx_SOC</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c<br/>index e61760b14d99..ed325f0ab28a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/bcm1480/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/bcm1480/irq.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='hunk'>@@ -84,7 +83,7 @@ extern char sb1250_duart_present[];</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type bcm1480_irq_type = {</div><div class='add'>+static struct irq_chip bcm1480_irq_type = {</div><div class='ctx'> 	.typename = "BCM1480-IMR",</div><div class='ctx'> 	.startup = startup_bcm1480_irq,</div><div class='ctx'> 	.shutdown = shutdown_bcm1480_irq,</div><div class='hunk'>@@ -141,7 +140,7 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0, old_cpu, cpu, int_on, k;</div><div class='ctx'> 	u64 cur_ints;</div><div class='del'>-	irq_desc_t *desc = irq_desc + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int irq_dirty;</div><div class='ctx'> </div><div class='hunk'>@@ -276,10 +275,10 @@ void __init init_bcm1480_irqs(void)</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='ctx'> 		if (i &lt; BCM1480_NR_IRQS) {</div><div class='del'>-			irq_desc[i].handler = &amp;bcm1480_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;bcm1480_irq_type;</div><div class='ctx'> 			bcm1480_irq_owner[i] = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			irq_desc[i].handler = &amp;no_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;no_irq_chip;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -302,7 +301,7 @@ static struct irqaction bcm1480_dummy_action = {</div><div class='ctx'> </div><div class='ctx'> int bcm1480_steal_irq(int irq)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -503,22 +502,23 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='ctx'> #ifdef CONFIG_SIBYTE_BCM1480_PROF</div><div class='ctx'> 	if (pending &amp; CAUSEF_IP7)	/* Cpu performance counter interrupt */</div><div class='ctx'> 		sbprof_cpu_intr(exception_epc(regs));</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (pending &amp; CAUSEF_IP4)</div><div class='ctx'> 		bcm1480_timer_interrupt(regs);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	if (pending &amp; CAUSEF_IP3)</div><div class='add'>+	else if (pending &amp; CAUSEF_IP3)</div><div class='ctx'> 		bcm1480_mailbox_interrupt(regs);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='del'>-	if (pending &amp; CAUSEF_IP6)</div><div class='add'>+	else if (pending &amp; CAUSEF_IP6)</div><div class='ctx'> 		bcm1480_kgdb_interrupt(regs);		/* KGDB (uart 1) */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (pending &amp; CAUSEF_IP2) {</div><div class='add'>+	else if (pending &amp; CAUSEF_IP2) {</div><div class='ctx'> 		unsigned long long mask_h, mask_l;</div><div class='ctx'> 		unsigned long base;</div><div class='ctx'> </div><div class='hunk'>@@ -534,7 +534,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='ctx'> 		mask_l = __raw_readq(</div><div class='ctx'> 			IOADDR(base + R_BCM1480_IMR_INTERRUPT_STATUS_BASE_L));</div><div class='ctx'> </div><div class='del'>-		if (!mask_h) {</div><div class='add'>+		if (mask_h) {</div><div class='ctx'> 			if (mask_h ^ 1)</div><div class='ctx'> 				do_IRQ(63 - dclz(mask_h), regs);</div><div class='ctx'> 			else</div><div class='head'>diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c<br/>index d90a0b87874c..8236d0c48542 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/bcm1480/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/bcm1480/setup.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/bcm1480/time.c b/arch/mips/sibyte/bcm1480/time.c<br/>index e545752695a1..7e088f6c4a86 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/bcm1480/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/bcm1480/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/bcm1480/time.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * code to do general bookkeeping (e.g. update jiffies, run</div><div class='ctx'>  * bottom halves, etc.)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -110,17 +109,18 @@ void bcm1480_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> 	__raw_writeq(M_SCD_TIMER_ENABLE|M_SCD_TIMER_MODE_CONTINUOUS,</div><div class='ctx'> 	      IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * CPU 0 handles the global timer interrupt job</div><div class='del'>-	 */</div><div class='ctx'> 	if (cpu == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * CPU 0 handles the global timer interrupt job</div><div class='add'>+		 */</div><div class='ctx'> 		ll_timer_interrupt(irq, regs);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * every CPU should do profiling and process accouting</div><div class='del'>-	 */</div><div class='del'>-	ll_local_timer_interrupt(irq, regs);</div><div class='add'>+	else {</div><div class='add'>+		/*</div><div class='add'>+		 * other CPUs should just do profiling and process accounting</div><div class='add'>+		 */</div><div class='add'>+		ll_local_timer_interrupt(irq, regs);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c<br/>index 7721100d0275..c6ec748175b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/cfe/console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/cfe/console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/cfe/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/cfe/console.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c<br/>index ea308029450e..6e8952da6e2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/cfe/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/cfe/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/cfe/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/cfe/setup.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/bus_watcher.c b/arch/mips/sibyte/sb1250/bus_watcher.c<br/>index 482dee054e68..bb90649fbc48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/bus_watcher.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/bus_watcher.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/bus_watcher.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/sb1250/bus_watcher.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * /proc/bus_watcher if PROC_FS is on.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c<br/>index 0f6e54db4888..1de71adec6c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/sb1250/irq.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='hunk'>@@ -70,7 +69,7 @@ extern char sb1250_duart_present[];</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type sb1250_irq_type = {</div><div class='add'>+static struct irq_chip sb1250_irq_type = {</div><div class='ctx'> 	.typename = "SB1250-IMR",</div><div class='ctx'> 	.startup = startup_sb1250_irq,</div><div class='ctx'> 	.shutdown = shutdown_sb1250_irq,</div><div class='hunk'>@@ -121,7 +120,7 @@ static void sb1250_set_affinity(unsigned int irq, cpumask_t mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0, old_cpu, cpu, int_on;</div><div class='ctx'> 	u64 cur_ints;</div><div class='del'>-	irq_desc_t *desc = irq_desc + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	i = first_cpu(mask);</div><div class='hunk'>@@ -246,10 +245,10 @@ void __init init_sb1250_irqs(void)</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='ctx'> 		if (i &lt; SB1250_NR_IRQS) {</div><div class='del'>-			irq_desc[i].handler = &amp;sb1250_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;sb1250_irq_type;</div><div class='ctx'> 			sb1250_irq_owner[i] = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			irq_desc[i].handler = &amp;no_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;no_irq_chip;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -272,7 +271,7 @@ static struct irqaction sb1250_dummy_action = {</div><div class='ctx'> </div><div class='ctx'> int sb1250_steal_irq(int irq)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -435,13 +434,17 @@ static inline int dclz(unsigned long long x)</div><div class='ctx'> 	return lz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern void sb1250_timer_interrupt(struct pt_regs *regs);</div><div class='add'>+extern void sb1250_mailbox_interrupt(struct pt_regs *regs);</div><div class='add'>+extern void sb1250_kgdb_interrupt(struct pt_regs *regs);</div><div class='add'>+</div><div class='ctx'> asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int pending;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SIBYTE_SB1250_PROF</div><div class='ctx'> 	/* Set compare to count to silence count/compare timer interrupts */</div><div class='del'>-	write_c0_count(read_c0_count());</div><div class='add'>+	write_c0_compare(read_c0_count());</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -457,32 +460,32 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs)</div><div class='ctx'> 	pending = read_c0_cause();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SIBYTE_SB1250_PROF</div><div class='del'>-	if (pending &amp; CAUSEF_IP7) { /* Cpu performance counter interrupt */</div><div class='add'>+	if (pending &amp; CAUSEF_IP7) /* Cpu performance counter interrupt */</div><div class='ctx'> 		sbprof_cpu_intr(exception_epc(regs));</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (pending &amp; CAUSEF_IP4)</div><div class='ctx'> 		sb1250_timer_interrupt(regs);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	if (pending &amp; CAUSEF_IP3)</div><div class='add'>+	else if (pending &amp; CAUSEF_IP3)</div><div class='ctx'> 		sb1250_mailbox_interrupt(regs);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KGDB</div><div class='del'>-	if (pending &amp; CAUSEF_IP6)			/* KGDB (uart 1) */</div><div class='add'>+	else if (pending &amp; CAUSEF_IP6)			/* KGDB (uart 1) */</div><div class='ctx'> 		sb1250_kgdb_interrupt(regs);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (pending &amp; CAUSEF_IP2) {</div><div class='add'>+	else if (pending &amp; CAUSEF_IP2) {</div><div class='ctx'> 		unsigned long long mask;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Default...we've hit an IP[2] interrupt, which means we've</div><div class='ctx'> 		 * got to check the 1250 interrupt registers to figure out what</div><div class='ctx'> 		 * to do.  Need to detect which CPU we're on, now that</div><div class='del'>-		 ~ smp_affinity is supported.</div><div class='add'>+		 * smp_affinity is supported.</div><div class='ctx'> 		 */</div><div class='ctx'> 		mask = __raw_readq(IOADDR(A_IMR_REGISTER(smp_processor_id(),</div><div class='ctx'> 		                              R_IMR_INTERRUPT_STATUS_BASE)));</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c<br/>index 742043f8d755..3c33a4517bc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/sb1250/prom.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c<br/>index fde4751c84fe..d0ee1d5b8223 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/sb1250/setup.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/sb1250/time.c b/arch/mips/sibyte/sb1250/time.c<br/>index 1588f6debd90..4b669dc86ef4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/sb1250/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/sb1250/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/sb1250/time.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * code to do general bookkeeping (e.g. update jiffies, run</div><div class='ctx'>  * bottom halves, etc.)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c<br/>index 4b5f74ff3edd..ac342f5643c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sibyte/swarm/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sibyte/swarm/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sibyte/swarm/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sibyte/swarm/setup.c</a></div><div class='hunk'>@@ -21,14 +21,13 @@</div><div class='ctx'>  * Setup code for the SWARM board</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -72,11 +71,13 @@ const char *get_system_type(void)</div><div class='ctx'> </div><div class='ctx'> void __init swarm_time_init(void)</div><div class='ctx'> {</div><div class='add'>+#if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)</div><div class='ctx'> 	/* Setup HPT */</div><div class='ctx'> 	sb1250_hpt_setup();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init swarm_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'>         /*</div><div class='ctx'>          * we don't set up irqaction, because we will deliver timer</div><div class='hunk'>@@ -103,7 +104,7 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)</div><div class='ctx'> 	return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)</div><div class='ctx'> 	bcm1480_setup();</div><div class='hunk'>@@ -116,7 +117,6 @@ void __init plat_setup(void)</div><div class='ctx'> 	panic_timeout = 5;  /* For debug.  */</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = swarm_time_init;</div><div class='del'>-	board_timer_setup = swarm_timer_setup;</div><div class='ctx'> 	board_be_handler = swarm_be_handler;</div><div class='ctx'> </div><div class='ctx'> 	if (xicor_probe()) {</div><div class='head'>diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile<br/>index 9c7eaa5fb210..a5eb0adb87c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sni/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sni/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sni/Makefile</a></div><div class='hunk'>@@ -3,5 +3,6 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-y	 	+= irq.o pcimt_scache.o reset.o setup.o</div><div class='add'>+obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c<br/>index 7365b4853ddb..cda165f42b6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sni/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sni/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sni/irq.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static void end_pciasic_irq(unsigned int irq)</div><div class='ctx'> 		enable_pciasic_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type pciasic_irq_type = {</div><div class='add'>+static struct irq_chip pciasic_irq_type = {</div><div class='ctx'> 	.typename = "ASIC-PCI",</div><div class='ctx'> 	.startup = startup_pciasic_irq,</div><div class='ctx'> 	.shutdown = shutdown_pciasic_irq,</div><div class='hunk'>@@ -203,7 +203,7 @@ void __init arch_init_irq(void)</div><div class='ctx'> 		irq_desc[i].status     = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action     = 0;</div><div class='ctx'> 		irq_desc[i].depth      = 1;</div><div class='del'>-		irq_desc[i].handler    = &amp;pciasic_irq_type;</div><div class='add'>+		irq_desc[i].chip    = &amp;pciasic_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ2|IE_IRQ3|IE_IRQ4);</div><div class='head'>diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c<br/>index 01ba6c581e3d..4e98feb15410 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/sni/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/sni/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sni/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sni/setup.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/eisa.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -19,10 +18,13 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARC</div><div class='ctx'> #include &lt;asm/arc/types.h&gt;</div><div class='ctx'> #include &lt;asm/sgialib.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/bcache.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -39,7 +41,7 @@ extern void sni_machine_restart(char *command);</div><div class='ctx'> extern void sni_machine_halt(void);</div><div class='ctx'> extern void sni_machine_power_off(void);</div><div class='ctx'> </div><div class='del'>-static void __init sni_rm200_pci_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* set the clock to 100 Hz */</div><div class='ctx'> 	outb_p(0x34,0x43);		/* binary, mode 2, LSB/MSB, ch 0 */</div><div class='hunk'>@@ -72,8 +74,7 @@ static inline void sni_pcimt_detect(void)</div><div class='ctx'> </div><div class='ctx'> static void __init sni_display_setup(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_VT</div><div class='del'>-#if defined(CONFIG_VGA_CONSOLE)</div><div class='add'>+#if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_VGA_CONSOLE) &amp;&amp; defined(CONFIG_ARC)</div><div class='ctx'> 	struct screen_info *si = &amp;screen_info;</div><div class='ctx'> 	DISPLAY_STATUS *di;</div><div class='ctx'> </div><div class='hunk'>@@ -88,24 +89,54 @@ static void __init sni_display_setup(void)</div><div class='ctx'> 		si-&gt;orig_video_points	= 16;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct resource sni_io_resource = {</div><div class='del'>-	"PCIMT IO MEM", 0x00001000UL, 0x03bfffffUL, IORESOURCE_IO,</div><div class='add'>+	.start	= 0x00001000UL,</div><div class='add'>+	.end	= 0x03bfffffUL,</div><div class='add'>+	.name	= "PCIMT IO MEM",</div><div class='add'>+	.flags	= IORESOURCE_IO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pcimt_io_resources[] = {</div><div class='del'>-	{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY },</div><div class='del'>-	{ "timer", 0x40, 0x5f, IORESOURCE_BUSY },</div><div class='del'>-	{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },</div><div class='del'>-	{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },</div><div class='del'>-	{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },</div><div class='del'>-	{ "PCI config data", 0xcfc, 0xcff, IORESOURCE_BUSY }</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x00,</div><div class='add'>+		.end	= 0x1f,</div><div class='add'>+		.name	= "dma1",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	=  0x40,</div><div class='add'>+		.end	= 0x5f,</div><div class='add'>+		.name	= "timer",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	=  0x60,</div><div class='add'>+		.end	= 0x6f,</div><div class='add'>+		.name	= "keyboard",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	=  0x80,</div><div class='add'>+		.end	= 0x8f,</div><div class='add'>+		.name	= "dma page reg",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	=  0xc0,</div><div class='add'>+		.end	= 0xdf,</div><div class='add'>+		.name	= "dma2",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	=  0xcfc,</div><div class='add'>+		.end	= 0xcff,</div><div class='add'>+		.name	= "PCI config data",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource sni_mem_resource = {</div><div class='del'>-	"PCIMT PCI MEM", 0x10000000UL, 0xffffffffUL, IORESOURCE_MEM</div><div class='add'>+	.start	= 0x10000000UL,</div><div class='add'>+	.end	= 0xffffffffUL,</div><div class='add'>+	.name	= "PCIMT PCI MEM",</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -122,19 +153,72 @@ static struct resource sni_mem_resource = {</div><div class='ctx'>  * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory</div><div class='ctx'>  */</div><div class='ctx'> static struct resource pcimt_mem_resources[] = {</div><div class='del'>-	{ "Video RAM area", 0x100a0000, 0x100bffff, IORESOURCE_BUSY },</div><div class='del'>-	{ "ISA Reserved", 0x100c0000, 0x100fffff, IORESOURCE_BUSY },</div><div class='del'>-	{ "PCI IO", 0x14000000, 0x17bfffff, IORESOURCE_BUSY },</div><div class='del'>-	{ "Cache Replacement Area", 0x17c00000, 0x17ffffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "PCI INT Acknowledge", 0x1a000000, 0x1a000003, IORESOURCE_BUSY },</div><div class='del'>-	{ "Boot PROM", 0x1fc00000, 0x1fc7ffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "Diag PROM", 0x1fc80000, 0x1fcfffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "X-Bus", 0x1fd00000, 0x1fdfffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "BIOS map", 0x1fe00000, 0x1fefffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "NVRAM / EEPROM", 0x1ff00000, 0x1ff7ffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "ASIC PCI", 0x1fff0000, 0x1fffefff, IORESOURCE_BUSY},</div><div class='del'>-	{ "MP Agent", 0x1ffff000, 0x1fffffff, IORESOURCE_BUSY},</div><div class='del'>-	{ "Main Memory", 0x20000000, 0x9fffffff, IORESOURCE_BUSY}</div><div class='add'>+	{</div><div class='add'>+		.start	= 0x100a0000,</div><div class='add'>+		.end	= 0x100bffff,</div><div class='add'>+		.name	= "Video RAM area",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x100c0000,</div><div class='add'>+		.end	= 0x100fffff,</div><div class='add'>+		.name	= "ISA Reserved",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x14000000,</div><div class='add'>+		.end	= 0x17bfffff,</div><div class='add'>+		.name	= "PCI IO",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x17c00000,</div><div class='add'>+		.end	= 0x17ffffff,</div><div class='add'>+		.name	= "Cache Replacement Area",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1a000000,</div><div class='add'>+		.end	= 0x1a000003,</div><div class='add'>+		.name	= "PCI INT Acknowledge",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1fc00000,</div><div class='add'>+		.end	= 0x1fc7ffff,</div><div class='add'>+		.name	= "Boot PROM",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1fc80000,</div><div class='add'>+		.end	= 0x1fcfffff,</div><div class='add'>+		.name	= "Diag PROM",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1fd00000,</div><div class='add'>+		.end	= 0x1fdfffff,</div><div class='add'>+		.name	= "X-Bus",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1fe00000,</div><div class='add'>+		.end	= 0x1fefffff,</div><div class='add'>+		.name	= "BIOS map",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1ff00000,</div><div class='add'>+		.end	= 0x1ff7ffff,</div><div class='add'>+		.name	= "NVRAM / EEPROM",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1fff0000,</div><div class='add'>+		.end	= 0x1fffefff,</div><div class='add'>+		.name	= "ASIC PCI",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x1ffff000,</div><div class='add'>+		.end	= 0x1fffffff,</div><div class='add'>+		.name	= "MP Agent",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}, {</div><div class='add'>+		.start	= 0x20000000,</div><div class='add'>+		.end	= 0x9fffffff,</div><div class='add'>+		.name	= "Main Memory",</div><div class='add'>+		.flags	= IORESOURCE_BUSY</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init sni_resource_init(void)</div><div class='hunk'>@@ -168,7 +252,7 @@ static inline void sni_pcimt_time_init(void)</div><div class='ctx'> 	rtc_mips_set_time = mc146818_set_rtc_mmss;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	sni_pcimt_detect();</div><div class='ctx'> 	sni_pcimt_sc_init();</div><div class='hunk'>@@ -186,7 +270,6 @@ void __init plat_setup(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	sni_resource_init();</div><div class='del'>-	board_timer_setup = sni_rm200_pci_timer_setup;</div><div class='ctx'> </div><div class='ctx'> 	_machine_restart = sni_machine_restart;</div><div class='ctx'> 	_machine_halt = sni_machine_halt;</div><div class='head'>diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c<br/>new file mode 100644<br/>index 000000000000..d1d0f1f493b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/sni/sniprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/sni/sniprom.c</a></div><div class='hunk'>@@ -0,0 +1,158 @@</div><div class='add'>+/*</div><div class='add'>+ * Big Endian PROM code for SNI RM machines</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005-2006 Florian Lohoff (flo@rfc822.org)</div><div class='add'>+ * Copyright (C) 2005-2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/addrspace.h&gt;</div><div class='add'>+#include &lt;asm/sni.h&gt;</div><div class='add'>+#include &lt;asm/mipsprom.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+</div><div class='add'>+/* special SNI prom calls */</div><div class='add'>+/*</div><div class='add'>+ * This does not exist in all proms - SINIX compares</div><div class='add'>+ * the prom env variable "version" against "2.0008"</div><div class='add'>+ * or greater. If lesser it tries to probe interesting</div><div class='add'>+ * registers</div><div class='add'>+ */</div><div class='add'>+#define PROM_GET_MEMCONF	58</div><div class='add'>+</div><div class='add'>+#define PROM_VEC		(u64 *)CKSEG1ADDR(0x1fc00000)</div><div class='add'>+#define PROM_ENTRY(x)		(PROM_VEC + (x))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG_PRINTF(x...)     prom_printf(x)</div><div class='add'>+#else</div><div class='add'>+#define DBG_PRINTF(x...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int *(*__prom_putchar)(int)        = (int *(*)(int))PROM_ENTRY(PROM_PUTCHAR);</div><div class='add'>+static char *(*__prom_getenv)(char *)     = (char *(*)(char *))PROM_ENTRY(PROM_GETENV);</div><div class='add'>+static void (*__prom_get_memconf)(void *) = (void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF);</div><div class='add'>+</div><div class='add'>+char *prom_getenv (char *s)</div><div class='add'>+{</div><div class='add'>+	return __prom_getenv(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void prom_printf(char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+	char ppbuf[1024];</div><div class='add'>+	char *bptr;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vsprintf(ppbuf, fmt, args);</div><div class='add'>+</div><div class='add'>+	bptr = ppbuf;</div><div class='add'>+</div><div class='add'>+	while (*bptr != 0) {</div><div class='add'>+		if (*bptr == '\n')</div><div class='add'>+			__prom_putchar('\r');</div><div class='add'>+</div><div class='add'>+		__prom_putchar(*bptr++);</div><div class='add'>+	}</div><div class='add'>+	va_end(args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long prom_free_prom_memory(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * /proc/cpuinfo system type</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static const char *systype = "Unknown";</div><div class='add'>+const char *get_system_type(void)</div><div class='add'>+{</div><div class='add'>+	return systype;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SNI_IDPROM_BASE                0xbff00000</div><div class='add'>+#define SNI_IDPROM_MEMSIZE             (SNI_IDPROM_BASE+0x28)  /* Memsize in 16MB quantities */</div><div class='add'>+#define SNI_IDPROM_BRDTYPE             (SNI_IDPROM_BASE+0x29)  /* Board Type */</div><div class='add'>+#define SNI_IDPROM_CPUTYPE             (SNI_IDPROM_BASE+0x30)  /* CPU Type */</div><div class='add'>+</div><div class='add'>+#define SNI_IDPROM_SIZE	0x1000</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void sni_idprom_dump(void)</div><div class='add'>+{</div><div class='add'>+	int	i;</div><div class='add'>+</div><div class='add'>+	prom_printf("SNI IDProm dump (first 128byte):\n");</div><div class='add'>+	for(i=0;i&lt;128;i++) {</div><div class='add'>+		if (i%16 == 0)</div><div class='add'>+			prom_printf("%04x ", i);</div><div class='add'>+</div><div class='add'>+		prom_printf("%02x ", *(unsigned char *) (SNI_IDPROM_BASE+i));</div><div class='add'>+</div><div class='add'>+		if (i%16 == 15)</div><div class='add'>+			prom_printf("\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void sni_mem_init(void )</div><div class='add'>+{</div><div class='add'>+	int i, memsize;</div><div class='add'>+	struct membank {</div><div class='add'>+	        u32		size;</div><div class='add'>+	        u32		base;</div><div class='add'>+	        u32		size2;</div><div class='add'>+	        u32		pad1;</div><div class='add'>+	        u32		pad2;</div><div class='add'>+	} memconf[8];</div><div class='add'>+</div><div class='add'>+	/* MemSIZE from prom in 16MByte chunks */</div><div class='add'>+	memsize=*((unsigned char *) SNI_IDPROM_MEMSIZE) * 16;</div><div class='add'>+</div><div class='add'>+	DBG_PRINTF("IDProm memsize: %lu MByte\n", memsize);</div><div class='add'>+</div><div class='add'>+	/* get memory bank layout from prom */</div><div class='add'>+	__prom_get_memconf(&amp;memconf);</div><div class='add'>+</div><div class='add'>+	DBG_PRINTF("prom_get_mem_conf memory configuration:\n");</div><div class='add'>+	for(i=0;i&lt;8 &amp;&amp; memconf[i].size;i++) {</div><div class='add'>+		prom_printf("Bank%d: %08x @ %08x\n", i,</div><div class='add'>+			memconf[i].size, memconf[i].base);</div><div class='add'>+		add_memory_region(memconf[i].base, memconf[i].size, BOOT_MEM_RAM);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_init(void)</div><div class='add'>+{</div><div class='add'>+	int argc = fw_arg0;</div><div class='add'>+	char **argv = (void *)fw_arg1;</div><div class='add'>+	unsigned int sni_brd_type = *(unsigned char *) SNI_IDPROM_BRDTYPE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DBG_PRINTF("Found SNI brdtype %02x\n", sni_brd_type);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	sni_idprom_dump();</div><div class='add'>+#endif</div><div class='add'>+	sni_mem_init();</div><div class='add'>+</div><div class='add'>+	/* copy prom cmdline parameters to kernel cmdline */</div><div class='add'>+	for (i = 1; i &lt; argc; i++) {</div><div class='add'>+		strcat(arcs_cmdline, argv[i]);</div><div class='add'>+		if (i &lt; (argc - 1))</div><div class='add'>+			strcat(arcs_cmdline, " ");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c<br/>index 8ca68015cf40..cd176f6a06c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4927/common/tx4927_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/common/tx4927_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4927/common/tx4927_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4927/common/tx4927_irq.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -147,7 +146,7 @@ static DEFINE_SPINLOCK(tx4927_cp0_lock);</div><div class='ctx'> static DEFINE_SPINLOCK(tx4927_pic_lock);</div><div class='ctx'> </div><div class='ctx'> #define TX4927_CP0_NAME "TX4927-CP0"</div><div class='del'>-static struct hw_interrupt_type tx4927_irq_cp0_type = {</div><div class='add'>+static struct irq_chip tx4927_irq_cp0_type = {</div><div class='ctx'> 	.typename	= TX4927_CP0_NAME,</div><div class='ctx'> 	.startup	= tx4927_irq_cp0_startup,</div><div class='ctx'> 	.shutdown	= tx4927_irq_cp0_shutdown,</div><div class='hunk'>@@ -159,7 +158,7 @@ static struct hw_interrupt_type tx4927_irq_cp0_type = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TX4927_PIC_NAME "TX4927-PIC"</div><div class='del'>-static struct hw_interrupt_type tx4927_irq_pic_type = {</div><div class='add'>+static struct irq_chip tx4927_irq_pic_type = {</div><div class='ctx'> 	.typename	= TX4927_PIC_NAME,</div><div class='ctx'> 	.startup	= tx4927_irq_pic_startup,</div><div class='ctx'> 	.shutdown	= tx4927_irq_pic_shutdown,</div><div class='hunk'>@@ -227,7 +226,7 @@ static void __init tx4927_irq_cp0_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;tx4927_irq_cp0_type;</div><div class='add'>+		irq_desc[i].chip = &amp;tx4927_irq_cp0_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='hunk'>@@ -435,7 +434,7 @@ static void __init tx4927_irq_pic_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 2;</div><div class='del'>-		irq_desc[i].handler = &amp;tx4927_irq_pic_type;</div><div class='add'>+		irq_desc[i].chip = &amp;tx4927_irq_pic_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &amp;tx4927_irq_pic_action);</div><div class='head'>diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c<br/>index 77c3b66fb959..3ace4037343e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4927/common/tx4927_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/common/tx4927_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4927/common/tx4927_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4927/common/tx4927_setup.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -51,7 +50,6 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='ctx'> void __init tx4927_time_init(void);</div><div class='del'>-void __init tx4927_timer_setup(struct irqaction *irq);</div><div class='ctx'> void dump_cp0(char *key);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -64,10 +62,9 @@ static void tx4927_write_buffer_flush(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	board_time_init = tx4927_time_init;</div><div class='del'>-	board_timer_setup = tx4927_timer_setup;</div><div class='ctx'> 	__wbflush = tx4927_write_buffer_flush;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_RBTX4927</div><div class='hunk'>@@ -92,7 +89,7 @@ void __init tx4927_time_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void __init tx4927_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 count;</div><div class='ctx'> 	u32 c1;</div><div class='head'>diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c<br/>index aee07ff2212a..b0f021f2a6c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c</a></div><div class='hunk'>@@ -111,7 +111,6 @@ SuperIO/PS2/Mouse, using INTR via ISA IRQ12 (mouse not currently supported)</div><div class='ctx'> JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthBridge, JP4, JP5, JP6</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -252,7 +251,7 @@ static DEFINE_SPINLOCK(toshiba_rbtx4927_ioc_lock);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"</div><div class='del'>-static struct hw_interrupt_type toshiba_rbtx4927_irq_ioc_type = {</div><div class='add'>+static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {</div><div class='ctx'> 	.typename = TOSHIBA_RBTX4927_IOC_NAME,</div><div class='ctx'> 	.startup = toshiba_rbtx4927_irq_ioc_startup,</div><div class='ctx'> 	.shutdown = toshiba_rbtx4927_irq_ioc_shutdown,</div><div class='hunk'>@@ -268,7 +267,7 @@ static struct hw_interrupt_type toshiba_rbtx4927_irq_ioc_type = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TOSHIBA_FPCIB0</div><div class='ctx'> #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"</div><div class='del'>-static struct hw_interrupt_type toshiba_rbtx4927_irq_isa_type = {</div><div class='add'>+static struct irq_chip toshiba_rbtx4927_irq_isa_type = {</div><div class='ctx'> 	.typename = TOSHIBA_RBTX4927_ISA_NAME,</div><div class='ctx'> 	.startup = toshiba_rbtx4927_irq_isa_startup,</div><div class='ctx'> 	.shutdown = toshiba_rbtx4927_irq_isa_shutdown,</div><div class='hunk'>@@ -338,7 +337,7 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> //#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }</div><div class='del'>-#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, SA_SHIRQ, CPU_MASK_NONE, s, NULL, NULL }</div><div class='add'>+#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL }</div><div class='ctx'> static struct irqaction toshiba_rbtx4927_irq_ioc_action =</div><div class='ctx'> TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);</div><div class='ctx'> #ifdef CONFIG_TOSHIBA_FPCIB0</div><div class='hunk'>@@ -368,7 +367,7 @@ static void __init toshiba_rbtx4927_irq_ioc_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 3;</div><div class='del'>-		irq_desc[i].handler = &amp;toshiba_rbtx4927_irq_ioc_type;</div><div class='add'>+		irq_desc[i].chip = &amp;toshiba_rbtx4927_irq_ioc_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC,</div><div class='hunk'>@@ -526,7 +525,7 @@ static void __init toshiba_rbtx4927_irq_isa_init(void)</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth =</div><div class='ctx'> 		    ((i &lt; TOSHIBA_RBTX4927_IRQ_ISA_MID) ? (4) : (5));</div><div class='del'>-		irq_desc[i].handler = &amp;toshiba_rbtx4927_irq_isa_type;</div><div class='add'>+		irq_desc[i].chip = &amp;toshiba_rbtx4927_irq_isa_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,</div><div class='hunk'>@@ -692,13 +691,13 @@ void toshiba_rbtx4927_irq_dump(char *key)</div><div class='ctx'> 	{</div><div class='ctx'> 		u32 i, j = 0;</div><div class='ctx'> 		for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-			if (strcmp(irq_desc[i].handler-&gt;typename, "none")</div><div class='add'>+			if (strcmp(irq_desc[i].chip-&gt;typename, "none")</div><div class='ctx'> 			    == 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			if ((i &gt;= 1)</div><div class='del'>-			    &amp;&amp; (irq_desc[i - 1].handler-&gt;typename ==</div><div class='del'>-				irq_desc[i].handler-&gt;typename)) {</div><div class='add'>+			    &amp;&amp; (irq_desc[i - 1].chip-&gt;typename ==</div><div class='add'>+				irq_desc[i].chip-&gt;typename)) {</div><div class='ctx'> 				j++;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				j = 0;</div><div class='hunk'>@@ -707,12 +706,12 @@ void toshiba_rbtx4927_irq_dump(char *key)</div><div class='ctx'> 			    (TOSHIBA_RBTX4927_IRQ_INFO,</div><div class='ctx'> 			     "%s irq=0x%02x/%3d s=0x%08x h=0x%08x a=0x%08x ah=0x%08x d=%1d n=%s/%02d\n",</div><div class='ctx'> 			     key, i, i, irq_desc[i].status,</div><div class='del'>-			     (u32) irq_desc[i].handler,</div><div class='add'>+			     (u32) irq_desc[i].chip,</div><div class='ctx'> 			     (u32) irq_desc[i].action,</div><div class='ctx'> 			     (u32) (irq_desc[i].action ? irq_desc[i].</div><div class='ctx'> 				    action-&gt;handler : 0),</div><div class='ctx'> 			     irq_desc[i].depth,</div><div class='del'>-			     irq_desc[i].handler-&gt;typename, j);</div><div class='add'>+			     irq_desc[i].chip-&gt;typename, j);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c<br/>index 6dcf077f61a0..f0d70c476005 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c<br/>index 873805178d8e..dc30d66123b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4938/common/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/common/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4938/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4938/common/irq.c</a></div><div class='hunk'>@@ -57,7 +57,7 @@ DEFINE_SPINLOCK(tx4938_cp0_lock);</div><div class='ctx'> DEFINE_SPINLOCK(tx4938_pic_lock);</div><div class='ctx'> </div><div class='ctx'> #define TX4938_CP0_NAME "TX4938-CP0"</div><div class='del'>-static struct hw_interrupt_type tx4938_irq_cp0_type = {</div><div class='add'>+static struct irq_chip tx4938_irq_cp0_type = {</div><div class='ctx'> 	.typename = TX4938_CP0_NAME,</div><div class='ctx'> 	.startup = tx4938_irq_cp0_startup,</div><div class='ctx'> 	.shutdown = tx4938_irq_cp0_shutdown,</div><div class='hunk'>@@ -69,7 +69,7 @@ static struct hw_interrupt_type tx4938_irq_cp0_type = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TX4938_PIC_NAME "TX4938-PIC"</div><div class='del'>-static struct hw_interrupt_type tx4938_irq_pic_type = {</div><div class='add'>+static struct irq_chip tx4938_irq_pic_type = {</div><div class='ctx'> 	.typename = TX4938_PIC_NAME,</div><div class='ctx'> 	.startup = tx4938_irq_pic_startup,</div><div class='ctx'> 	.shutdown = tx4938_irq_pic_shutdown,</div><div class='hunk'>@@ -102,7 +102,7 @@ tx4938_irq_cp0_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;tx4938_irq_cp0_type;</div><div class='add'>+		irq_desc[i].chip = &amp;tx4938_irq_cp0_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='hunk'>@@ -306,7 +306,7 @@ tx4938_irq_pic_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 2;</div><div class='del'>-		irq_desc[i].handler = &amp;tx4938_irq_pic_type;</div><div class='add'>+		irq_desc[i].chip = &amp;tx4938_irq_pic_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &amp;tx4938_irq_pic_action);</div><div class='head'>diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c<br/>index fc992953bf95..71859c4fee84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4938/common/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/common/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4938/common/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4938/common/setup.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@ extern void rbtx4938_time_init(void);</div><div class='ctx'> </div><div class='ctx'> void __init tx4938_setup(void);</div><div class='ctx'> void __init tx4938_time_init(void);</div><div class='del'>-void __init tx4938_timer_setup(struct irqaction *irq);</div><div class='ctx'> void dump_cp0(char *key);</div><div class='ctx'> </div><div class='ctx'> void (*__wbflush) (void);</div><div class='hunk'>@@ -61,10 +60,9 @@ tx4938_write_buffer_flush(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='del'>-plat_setup(void)</div><div class='add'>+plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	board_time_init = tx4938_time_init;</div><div class='del'>-	board_timer_setup = tx4938_timer_setup;</div><div class='ctx'> 	__wbflush = tx4938_write_buffer_flush;</div><div class='ctx'> 	toshiba_rbtx4938_setup();</div><div class='ctx'> }</div><div class='hunk'>@@ -75,8 +73,7 @@ tx4938_time_init(void)</div><div class='ctx'> 	rbtx4938_time_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='del'>-tx4938_timer_setup(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 count;</div><div class='ctx'> 	u32 c1;</div><div class='head'>diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c<br/>index 9cd9c0fe2265..83f2750825a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4938/toshiba_rbtx4938/irq.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ static void toshiba_rbtx4938_irq_ioc_end(unsigned int irq);</div><div class='ctx'> DEFINE_SPINLOCK(toshiba_rbtx4938_ioc_lock);</div><div class='ctx'> </div><div class='ctx'> #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC"</div><div class='del'>-static struct hw_interrupt_type toshiba_rbtx4938_irq_ioc_type = {</div><div class='add'>+static struct irq_chip toshiba_rbtx4938_irq_ioc_type = {</div><div class='ctx'> 	.typename = TOSHIBA_RBTX4938_IOC_NAME,</div><div class='ctx'> 	.startup = toshiba_rbtx4938_irq_ioc_startup,</div><div class='ctx'> 	.shutdown = toshiba_rbtx4938_irq_ioc_shutdown,</div><div class='hunk'>@@ -146,7 +146,7 @@ toshiba_rbtx4938_irq_ioc_init(void)</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = 0;</div><div class='ctx'> 		irq_desc[i].depth = 3;</div><div class='del'>-		irq_desc[i].handler = &amp;toshiba_rbtx4938_irq_ioc_type;</div><div class='add'>+		irq_desc[i].chip = &amp;toshiba_rbtx4938_irq_ioc_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(RBTX4938_IRQ_IOCINT,</div><div class='head'>diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c<br/>index 7df8b32ba265..e44daf30a7c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4938/toshiba_rbtx4938/prom.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c<br/>index 9166cd4557eb..66163ba452c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4938/toshiba_rbtx4938/setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -664,7 +663,10 @@ static struct resource rbtx4938_fpga_resource;</div><div class='ctx'> </div><div class='ctx'> static char pcode_str[8];</div><div class='ctx'> static struct resource tx4938_reg_resource = {</div><div class='del'>-	pcode_str, TX4938_REG_BASE, TX4938_REG_BASE+TX4938_REG_SIZE, IORESOURCE_MEM</div><div class='add'>+	.start	= TX4938_REG_BASE,</div><div class='add'>+	.end	= TX4938_REG_BASE + TX4938_REG_SIZE,</div><div class='add'>+	.name	= pcode_str,</div><div class='add'>+	.flags	= IORESOURCE_MEM</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init tx4938_board_setup(void)</div><div class='head'>diff --git a/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c b/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c<br/>index 951a208ee9b3..89596e62f909 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig<br/>index 055a2cdfc841..92f41f6f934a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/Kconfig</a></div><div class='hunk'>@@ -4,7 +4,6 @@ config CASIO_E55</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select IRQ_CPU</div><div class='ctx'> 	select ISA</div><div class='del'>-	select SYS_HAS_CPU_VR41XX</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='hunk'>@@ -14,18 +13,15 @@ config IBM_WORKPAD</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select IRQ_CPU</div><div class='ctx'> 	select ISA</div><div class='del'>-	select SYS_HAS_CPU_VR41XX</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='ctx'> config NEC_CMBVR4133</div><div class='ctx'> 	bool "Support for NEC CMB-VR4133"</div><div class='ctx'> 	depends on MACH_VR41XX</div><div class='del'>-	select CPU_VR41XX</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select IRQ_CPU</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='del'>-	select SYS_HAS_CPU_VR41XX</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +37,6 @@ config TANBAC_TB022X</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select IRQ_CPU</div><div class='del'>-	select SYS_HAS_CPU_VR41XX</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> 	help</div><div class='hunk'>@@ -74,7 +69,6 @@ config VICTOR_MPC30X</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select IRQ_CPU</div><div class='del'>-	select SYS_HAS_CPU_VR41XX</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +78,6 @@ config ZAO_CAPCELLA</div><div class='ctx'> 	select DMA_NONCOHERENT</div><div class='ctx'> 	select HW_HAS_PCI</div><div class='ctx'> 	select IRQ_CPU</div><div class='del'>-	select SYS_HAS_CPU_VR41XX</div><div class='ctx'> 	select SYS_SUPPORTS_32BIT_KERNEL</div><div class='ctx'> 	select SYS_SUPPORTS_LITTLE_ENDIAN</div><div class='ctx'> </div><div class='hunk'>@@ -93,9 +86,3 @@ config PCI_VR41XX</div><div class='ctx'> 	depends on MACH_VR41XX &amp;&amp; HW_HAS_PCI</div><div class='ctx'> 	default y</div><div class='ctx'> 	select PCI</div><div class='del'>-</div><div class='del'>-config VRC4173</div><div class='del'>-	tristate "Add NEC VRC4173 companion chip support"</div><div class='del'>-	depends on MACH_VR41XX &amp;&amp; PCI_VR41XX</div><div class='del'>-	help</div><div class='del'>-	  The NEC VRC4173 is a companion chip for NEC VR4122/VR4131.</div><div class='head'>diff --git a/arch/mips/vr41xx/casio-e55/setup.c b/arch/mips/vr41xx/casio-e55/setup.c<br/>index 814900915c28..6d9bab890587 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/casio-e55/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/casio-e55/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/casio-e55/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/casio-e55/setup.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  setup.c, Setup for the CASIO CASSIOPEIA E-11/15/55/65.</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2002-2005  Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;</div><div class='add'>+ *  Copyright (C) 2002-2006  Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -21,13 +21,18 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/vr41xx/e55.h&gt;</div><div class='add'>+</div><div class='add'>+#define E55_ISA_IO_BASE		0x1400c000</div><div class='add'>+#define E55_ISA_IO_SIZE		0x03ff4000</div><div class='add'>+#define E55_ISA_IO_START	0</div><div class='add'>+#define E55_ISA_IO_END		(E55_ISA_IO_SIZE - 1)</div><div class='add'>+#define E55_IO_PORT_BASE	KSEG1ADDR(E55_ISA_IO_BASE)</div><div class='ctx'> </div><div class='ctx'> static int __init casio_e55_setup(void)</div><div class='ctx'> {</div><div class='del'>-	set_io_port_base(IO_PORT_BASE);</div><div class='del'>-	ioport_resource.start = IO_PORT_RESOURCE_START;</div><div class='del'>-	ioport_resource.end = IO_PORT_RESOURCE_END;</div><div class='add'>+	set_io_port_base(E55_IO_PORT_BASE);</div><div class='add'>+	ioport_resource.start = E55_ISA_IO_START;</div><div class='add'>+	ioport_resource.end = E55_ISA_IO_END;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/vr41xx/common/Makefile b/arch/mips/vr41xx/common/Makefile<br/>index aa373974c80f..975d5caf9d1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/common/Makefile</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> # Makefile for common code of the NEC VR4100 series.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-y				+= bcu.o cmu.o icu.o init.o irq.o pmu.o type.o</div><div class='del'>-obj-$(CONFIG_VRC4173)		+= vrc4173.o</div><div class='add'>+obj-y	+= bcu.o cmu.o icu.o init.o irq.o pmu.o type.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_AFLAGS := $(CFLAGS)</div><div class='head'>diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c<br/>index 07ae19cf0c29..7a5c31d58378 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/icu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/icu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/icu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/common/icu.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/vr41xx/irq.h&gt;</div><div class='ctx'> #include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void __iomem *icu1_base;</div><div class='hunk'>@@ -152,7 +153,7 @@ static inline uint16_t icu2_clear(uint8_t offset, uint16_t clear)</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_piuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + PIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + PIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4111 ||</div><div class='hunk'>@@ -167,7 +168,7 @@ EXPORT_SYMBOL(vr41xx_enable_piuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_piuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + PIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + PIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4111 ||</div><div class='hunk'>@@ -182,7 +183,7 @@ EXPORT_SYMBOL(vr41xx_disable_piuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_aiuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + AIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + AIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4111 ||</div><div class='hunk'>@@ -197,7 +198,7 @@ EXPORT_SYMBOL(vr41xx_enable_aiuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_aiuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + AIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + AIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4111 ||</div><div class='hunk'>@@ -212,7 +213,7 @@ EXPORT_SYMBOL(vr41xx_disable_aiuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_kiuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + KIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + KIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4111 ||</div><div class='hunk'>@@ -227,7 +228,7 @@ EXPORT_SYMBOL(vr41xx_enable_kiuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_kiuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + KIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + KIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4111 ||</div><div class='hunk'>@@ -242,7 +243,7 @@ EXPORT_SYMBOL(vr41xx_disable_kiuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_dsiuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + DSIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + DSIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='hunk'>@@ -254,7 +255,7 @@ EXPORT_SYMBOL(vr41xx_enable_dsiuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_dsiuint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + DSIU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + DSIU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='hunk'>@@ -266,7 +267,7 @@ EXPORT_SYMBOL(vr41xx_disable_dsiuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_firint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + FIR_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + FIR_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='hunk'>@@ -278,7 +279,7 @@ EXPORT_SYMBOL(vr41xx_enable_firint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_firint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + FIR_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + FIR_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='hunk'>@@ -290,7 +291,7 @@ EXPORT_SYMBOL(vr41xx_disable_firint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_pciint(void)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + PCI_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + PCI_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -306,7 +307,7 @@ EXPORT_SYMBOL(vr41xx_enable_pciint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_pciint(void)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + PCI_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + PCI_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -322,7 +323,7 @@ EXPORT_SYMBOL(vr41xx_disable_pciint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_scuint(void)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + SCU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + SCU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -338,7 +339,7 @@ EXPORT_SYMBOL(vr41xx_enable_scuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_scuint(void)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + SCU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + SCU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -354,7 +355,7 @@ EXPORT_SYMBOL(vr41xx_disable_scuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_csiint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + CSI_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + CSI_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -370,7 +371,7 @@ EXPORT_SYMBOL(vr41xx_enable_csiint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_csiint(uint16_t mask)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + CSI_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + CSI_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -386,7 +387,7 @@ EXPORT_SYMBOL(vr41xx_disable_csiint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_enable_bcuint(void)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + BCU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + BCU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -402,7 +403,7 @@ EXPORT_SYMBOL(vr41xx_enable_bcuint);</div><div class='ctx'> </div><div class='ctx'> void vr41xx_disable_bcuint(void)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + BCU_IRQ;</div><div class='add'>+	struct irq_desc *desc = irq_desc + BCU_IRQ;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (current_cpu_data.cputype == CPU_VR4122 ||</div><div class='hunk'>@@ -442,7 +443,7 @@ static void end_sysint1_irq(unsigned int irq)</div><div class='ctx'> 		icu1_set(MSYSINT1REG, 1 &lt;&lt; SYSINT1_IRQ_TO_PIN(irq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type sysint1_irq_type = {</div><div class='add'>+static struct irq_chip sysint1_irq_type = {</div><div class='ctx'> 	.typename	= "SYSINT1",</div><div class='ctx'> 	.startup	= startup_sysint1_irq,</div><div class='ctx'> 	.shutdown	= shutdown_sysint1_irq,</div><div class='hunk'>@@ -478,7 +479,7 @@ static void end_sysint2_irq(unsigned int irq)</div><div class='ctx'> 		icu2_set(MSYSINT2REG, 1 &lt;&lt; SYSINT2_IRQ_TO_PIN(irq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type sysint2_irq_type = {</div><div class='add'>+static struct irq_chip sysint2_irq_type = {</div><div class='ctx'> 	.typename	= "SYSINT2",</div><div class='ctx'> 	.startup	= startup_sysint2_irq,</div><div class='ctx'> 	.shutdown	= shutdown_sysint2_irq,</div><div class='hunk'>@@ -490,7 +491,7 @@ static struct hw_interrupt_type sysint2_irq_type = {</div><div class='ctx'> </div><div class='ctx'> static inline int set_sysint1_assign(unsigned int irq, unsigned char assign)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='ctx'> 	uint16_t intassign0, intassign1;</div><div class='ctx'> 	unsigned int pin;</div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +550,7 @@ static inline int set_sysint1_assign(unsigned int irq, unsigned char assign)</div><div class='ctx'> </div><div class='ctx'> static inline int set_sysint2_assign(unsigned int irq, unsigned char assign)</div><div class='ctx'> {</div><div class='del'>-	irq_desc_t *desc = irq_desc + irq;</div><div class='add'>+	struct irq_desc *desc = irq_desc + irq;</div><div class='ctx'> 	uint16_t intassign2, intassign3;</div><div class='ctx'> 	unsigned int pin;</div><div class='ctx'> </div><div class='hunk'>@@ -722,10 +723,10 @@ static int __init vr41xx_icu_init(void)</div><div class='ctx'> 	icu2_write(MGIUINTHREG, 0xffff);</div><div class='ctx'> </div><div class='ctx'> 	for (i = SYSINT1_IRQ_BASE; i &lt;= SYSINT1_IRQ_LAST; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;sysint1_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;sysint1_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	for (i = SYSINT2_IRQ_BASE; i &lt;= SYSINT2_IRQ_LAST; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;sysint2_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;sysint2_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	cascade_irq(INT0_IRQ, icu_get_irq);</div><div class='ctx'> 	cascade_irq(INT1_IRQ, icu_get_irq);</div><div class='head'>diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c<br/>index 707bd0933eed..a2e285c1d4d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/common/init.c</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/vr41xx/irq.h&gt;</div><div class='ctx'> #include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IO_MEM_RESOURCE_START	0UL</div><div class='hunk'>@@ -47,7 +48,7 @@ static void __init setup_timer_frequency(void)</div><div class='ctx'> 		mips_hpt_frequency = tclock / 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init setup_timer_irq(struct irqaction *irq)</div><div class='add'>+void __init plat_timer_setup(struct irqaction *irq)</div><div class='ctx'> {</div><div class='ctx'> 	setup_irq(TIMER_IRQ, irq);</div><div class='ctx'> }</div><div class='hunk'>@@ -55,10 +56,9 @@ static void __init setup_timer_irq(struct irqaction *irq)</div><div class='ctx'> static void __init timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	board_time_init = setup_timer_frequency;</div><div class='del'>-	board_timer_setup = setup_timer_irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init plat_setup(void)</div><div class='add'>+void __init plat_mem_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	vr41xx_calculate_clock_frequency();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c<br/>index 86796bb63c3c..4733c5344467 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/common/irq.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq_cpu.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='add'>+#include &lt;asm/vr41xx/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef struct irq_cascade {</div><div class='ctx'> 	int (*get_irq)(unsigned int, struct pt_regs *);</div><div class='hunk'>@@ -62,7 +62,7 @@ EXPORT_SYMBOL_GPL(cascade_irq);</div><div class='ctx'> static void irq_dispatch(unsigned int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	irq_cascade_t *cascade;</div><div class='del'>-	irq_desc_t *desc;</div><div class='add'>+	struct irq_desc *desc;</div><div class='ctx'> </div><div class='ctx'> 	if (irq &gt;= NR_IRQS) {</div><div class='ctx'> 		atomic_inc(&amp;irq_err_count);</div><div class='hunk'>@@ -73,13 +73,13 @@ static void irq_dispatch(unsigned int irq, struct pt_regs *regs)</div><div class='ctx'> 	if (cascade-&gt;get_irq != NULL) {</div><div class='ctx'> 		unsigned int source_irq = irq;</div><div class='ctx'> 		desc = irq_desc + source_irq;</div><div class='del'>-		desc-&gt;handler-&gt;ack(source_irq);</div><div class='add'>+		desc-&gt;chip-&gt;ack(source_irq);</div><div class='ctx'> 		irq = cascade-&gt;get_irq(irq, regs);</div><div class='ctx'> 		if (irq &lt; 0)</div><div class='ctx'> 			atomic_inc(&amp;irq_err_count);</div><div class='ctx'> 		else</div><div class='ctx'> 			irq_dispatch(irq, regs);</div><div class='del'>-		desc-&gt;handler-&gt;end(source_irq);</div><div class='add'>+		desc-&gt;chip-&gt;end(source_irq);</div><div class='ctx'> 	} else</div><div class='ctx'> 		do_IRQ(irq, regs);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c<br/>deleted file mode 100644<br/>index 3e31f8193d21..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/common/vrc4173.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/common/vrc4173.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,581 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  vrc4173.c, NEC VRC4173 base driver for NEC VR4122/VR4131.</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2001-2003  MontaVista Software Inc.</div><div class='del'>- *    Author: Yoichi Yuasa &lt;yyuasa@mvista.com, or source@mvista.com&gt;</div><div class='del'>- *  Copyright (C) 2004  Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;</div><div class='del'>- *  Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='del'>-#include &lt;asm/vr41xx/vrc4173.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("NEC VRC4173 base driver for NEC VR4122/4131");</div><div class='del'>-MODULE_AUTHOR("Yoichi Yuasa &lt;yyuasa@mvista.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-#define VRC4173_CMUCLKMSK	0x040</div><div class='del'>- #define MSKPIU			0x0001</div><div class='del'>- #define MSKKIU			0x0002</div><div class='del'>- #define MSKAIU			0x0004</div><div class='del'>- #define MSKPS2CH1		0x0008</div><div class='del'>- #define MSKPS2CH2		0x0010</div><div class='del'>- #define MSKUSB			0x0020</div><div class='del'>- #define MSKCARD1		0x0040</div><div class='del'>- #define MSKCARD2		0x0080</div><div class='del'>- #define MSKAC97		0x0100</div><div class='del'>- #define MSK48MUSB		0x0400</div><div class='del'>- #define MSK48MPIN		0x0800</div><div class='del'>- #define MSK48MOSC		0x1000</div><div class='del'>-#define VRC4173_CMUSRST		0x042</div><div class='del'>- #define USBRST			0x0001</div><div class='del'>- #define CARD1RST		0x0002</div><div class='del'>- #define CARD2RST		0x0004</div><div class='del'>- #define AC97RST		0x0008</div><div class='del'>-</div><div class='del'>-#define VRC4173_SYSINT1REG	0x060</div><div class='del'>-#define VRC4173_MSYSINT1REG	0x06c</div><div class='del'>-#define VRC4173_MPIUINTREG	0x06e</div><div class='del'>-#define VRC4173_MAIUINTREG	0x070</div><div class='del'>-#define VRC4173_MKIUINTREG	0x072</div><div class='del'>-</div><div class='del'>-#define VRC4173_SELECTREG	0x09e</div><div class='del'>- #define SEL3			0x0008</div><div class='del'>- #define SEL2			0x0004</div><div class='del'>- #define SEL1			0x0002</div><div class='del'>- #define SEL0			0x0001</div><div class='del'>-</div><div class='del'>-static struct pci_device_id vrc4173_id_table[] __devinitdata = {</div><div class='del'>-	{	.vendor		= PCI_VENDOR_ID_NEC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_NEC_VRC4173,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,			},</div><div class='del'>-	{	.vendor		= 0,				},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-unsigned long vrc4173_io_offset = 0;</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_io_offset);</div><div class='del'>-</div><div class='del'>-static int vrc4173_initialized;</div><div class='del'>-static uint16_t vrc4173_cmuclkmsk;</div><div class='del'>-static uint16_t vrc4173_selectreg;</div><div class='del'>-static DEFINE_SPINLOCK(vrc4173_cmu_lock);</div><div class='del'>-static DEFINE_SPINLOCK(vrc4173_giu_lock);</div><div class='del'>-</div><div class='del'>-static inline void set_cmusrst(uint16_t val)</div><div class='del'>-{</div><div class='del'>-	uint16_t cmusrst;</div><div class='del'>-</div><div class='del'>-	cmusrst = vrc4173_inw(VRC4173_CMUSRST);</div><div class='del'>-	cmusrst |= val;</div><div class='del'>-	vrc4173_outw(cmusrst, VRC4173_CMUSRST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void clear_cmusrst(uint16_t val)</div><div class='del'>-{</div><div class='del'>-	uint16_t cmusrst;</div><div class='del'>-</div><div class='del'>-	cmusrst = vrc4173_inw(VRC4173_CMUSRST);</div><div class='del'>-	cmusrst &amp;= ~val;</div><div class='del'>-	vrc4173_outw(cmusrst, VRC4173_CMUSRST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void vrc4173_supply_clock(vrc4173_clock_t clock)</div><div class='del'>-{</div><div class='del'>-	if (vrc4173_initialized) {</div><div class='del'>-		spin_lock_irq(&amp;vrc4173_cmu_lock);</div><div class='del'>-</div><div class='del'>-		switch (clock) {</div><div class='del'>-		case VRC4173_PIU_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKPIU;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_KIU_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKKIU;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_AIU_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKAIU;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_PS2_CH1_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKPS2CH1;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_PS2_CH2_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKPS2CH2;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_USBU_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(USBRST);</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKUSB;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU1_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(CARD1RST);</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKCARD1;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU2_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(CARD2RST);</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKCARD2;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_AC97U_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(AC97RST);</div><div class='del'>-			vrc4173_cmuclkmsk |= MSKAC97;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_USBU_48MHz_CLOCK:</div><div class='del'>-			set_cmusrst(USBRST);</div><div class='del'>-			vrc4173_cmuclkmsk |= MSK48MUSB;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_EXT_48MHz_CLOCK:</div><div class='del'>-			if (vrc4173_cmuclkmsk &amp; MSK48MOSC)</div><div class='del'>-				vrc4173_cmuclkmsk |= MSK48MPIN;</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_WARNING</div><div class='del'>-				       "vrc4173_supply_clock: "</div><div class='del'>-				       "Please supply VRC4173_48MHz_CLOCK first "</div><div class='del'>-				       "rather than VRC4173_EXT_48MHz_CLOCK.\n");</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_48MHz_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk |= MSK48MOSC;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "vrc4173_supply_clock: Invalid CLOCK value %u\n", clock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vrc4173_outw(vrc4173_cmuclkmsk, VRC4173_CMUCLKMSK);</div><div class='del'>-</div><div class='del'>-		switch (clock) {</div><div class='del'>-		case VRC4173_USBU_PCI_CLOCK:</div><div class='del'>-		case VRC4173_USBU_48MHz_CLOCK:</div><div class='del'>-			clear_cmusrst(USBRST);</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU1_PCI_CLOCK:</div><div class='del'>-			clear_cmusrst(CARD1RST);</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU2_PCI_CLOCK:</div><div class='del'>-			clear_cmusrst(CARD2RST);</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_AC97U_PCI_CLOCK:</div><div class='del'>-			clear_cmusrst(AC97RST);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_irq(&amp;vrc4173_cmu_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_supply_clock);</div><div class='del'>-</div><div class='del'>-void vrc4173_mask_clock(vrc4173_clock_t clock)</div><div class='del'>-{</div><div class='del'>-	if (vrc4173_initialized) {</div><div class='del'>-		spin_lock_irq(&amp;vrc4173_cmu_lock);</div><div class='del'>-</div><div class='del'>-		switch (clock) {</div><div class='del'>-		case VRC4173_PIU_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKPIU;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_KIU_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKKIU;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_AIU_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKAIU;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_PS2_CH1_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKPS2CH1;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_PS2_CH2_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKPS2CH2;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_USBU_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(USBRST);</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKUSB;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU1_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(CARD1RST);</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKCARD1;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU2_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(CARD2RST);</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKCARD2;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_AC97U_PCI_CLOCK:</div><div class='del'>-			set_cmusrst(AC97RST);</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSKAC97;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_USBU_48MHz_CLOCK:</div><div class='del'>-			set_cmusrst(USBRST);</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSK48MUSB;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_EXT_48MHz_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSK48MPIN;</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_48MHz_CLOCK:</div><div class='del'>-			vrc4173_cmuclkmsk &amp;= ~MSK48MOSC;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_WARNING "vrc4173_mask_clock: Invalid CLOCK value %u\n", clock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vrc4173_outw(vrc4173_cmuclkmsk, VRC4173_CMUCLKMSK);</div><div class='del'>-</div><div class='del'>-		switch (clock) {</div><div class='del'>-		case VRC4173_USBU_PCI_CLOCK:</div><div class='del'>-		case VRC4173_USBU_48MHz_CLOCK:</div><div class='del'>-			clear_cmusrst(USBRST);</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU1_PCI_CLOCK:</div><div class='del'>-			clear_cmusrst(CARD1RST);</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_CARDU2_PCI_CLOCK:</div><div class='del'>-			clear_cmusrst(CARD2RST);</div><div class='del'>-			break;</div><div class='del'>-		case VRC4173_AC97U_PCI_CLOCK:</div><div class='del'>-			clear_cmusrst(AC97RST);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_irq(&amp;vrc4173_cmu_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_mask_clock);</div><div class='del'>-</div><div class='del'>-static inline void vrc4173_cmu_init(void)</div><div class='del'>-{</div><div class='del'>-	vrc4173_cmuclkmsk = vrc4173_inw(VRC4173_CMUCLKMSK);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;vrc4173_cmu_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void vrc4173_select_function(vrc4173_function_t function)</div><div class='del'>-{</div><div class='del'>-	if (vrc4173_initialized) {</div><div class='del'>-		spin_lock_irq(&amp;vrc4173_giu_lock);</div><div class='del'>-</div><div class='del'>-		switch(function) {</div><div class='del'>-		case PS2_CHANNEL1:</div><div class='del'>-			vrc4173_selectreg |= SEL2;</div><div class='del'>-			break;</div><div class='del'>-		case PS2_CHANNEL2:</div><div class='del'>-			vrc4173_selectreg |= SEL1;</div><div class='del'>-			break;</div><div class='del'>-		case TOUCHPANEL:</div><div class='del'>-			vrc4173_selectreg &amp;= SEL2 | SEL1 | SEL0;</div><div class='del'>-			break;</div><div class='del'>-		case KEYBOARD_8SCANLINES:</div><div class='del'>-			vrc4173_selectreg &amp;= SEL3 | SEL2 | SEL1;</div><div class='del'>-			break;</div><div class='del'>-		case KEYBOARD_10SCANLINES:</div><div class='del'>-			vrc4173_selectreg &amp;= SEL3 | SEL2;</div><div class='del'>-			break;</div><div class='del'>-		case KEYBOARD_12SCANLINES:</div><div class='del'>-			vrc4173_selectreg &amp;= SEL3;</div><div class='del'>-			break;</div><div class='del'>-		case GPIO_0_15PINS:</div><div class='del'>-			vrc4173_selectreg |= SEL0;</div><div class='del'>-			break;</div><div class='del'>-		case GPIO_16_20PINS:</div><div class='del'>-			vrc4173_selectreg |= SEL3;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vrc4173_outw(vrc4173_selectreg, VRC4173_SELECTREG);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irq(&amp;vrc4173_giu_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_select_function);</div><div class='del'>-</div><div class='del'>-static inline void vrc4173_giu_init(void)</div><div class='del'>-{</div><div class='del'>-	vrc4173_selectreg = vrc4173_inw(VRC4173_SELECTREG);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;vrc4173_giu_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void vrc4173_enable_piuint(uint16_t mask)</div><div class='del'>-{</div><div class='del'>-	irq_desc_t *desc = irq_desc + VRC4173_PIU_IRQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-	val = vrc4173_inw(VRC4173_MPIUINTREG);</div><div class='del'>-	val |= mask;</div><div class='del'>-	vrc4173_outw(val, VRC4173_MPIUINTREG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_enable_piuint);</div><div class='del'>-</div><div class='del'>-void vrc4173_disable_piuint(uint16_t mask)</div><div class='del'>-{</div><div class='del'>-	irq_desc_t *desc = irq_desc + VRC4173_PIU_IRQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-	val = vrc4173_inw(VRC4173_MPIUINTREG);</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	vrc4173_outw(val, VRC4173_MPIUINTREG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_disable_piuint);</div><div class='del'>-</div><div class='del'>-void vrc4173_enable_aiuint(uint16_t mask)</div><div class='del'>-{</div><div class='del'>-	irq_desc_t *desc = irq_desc + VRC4173_AIU_IRQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-	val = vrc4173_inw(VRC4173_MAIUINTREG);</div><div class='del'>-	val |= mask;</div><div class='del'>-	vrc4173_outw(val, VRC4173_MAIUINTREG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_enable_aiuint);</div><div class='del'>-</div><div class='del'>-void vrc4173_disable_aiuint(uint16_t mask)</div><div class='del'>-{</div><div class='del'>-	irq_desc_t *desc = irq_desc + VRC4173_AIU_IRQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-	val = vrc4173_inw(VRC4173_MAIUINTREG);</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	vrc4173_outw(val, VRC4173_MAIUINTREG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_disable_aiuint);</div><div class='del'>-</div><div class='del'>-void vrc4173_enable_kiuint(uint16_t mask)</div><div class='del'>-{</div><div class='del'>-	irq_desc_t *desc = irq_desc + VRC4173_KIU_IRQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-	val = vrc4173_inw(VRC4173_MKIUINTREG);</div><div class='del'>-	val |= mask;</div><div class='del'>-	vrc4173_outw(val, VRC4173_MKIUINTREG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_enable_kiuint);</div><div class='del'>-</div><div class='del'>-void vrc4173_disable_kiuint(uint16_t mask)</div><div class='del'>-{</div><div class='del'>-	irq_desc_t *desc = irq_desc + VRC4173_KIU_IRQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-	val = vrc4173_inw(VRC4173_MKIUINTREG);</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	vrc4173_outw(val, VRC4173_MKIUINTREG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(vrc4173_disable_kiuint);</div><div class='del'>-</div><div class='del'>-static void enable_vrc4173_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	val = vrc4173_inw(VRC4173_MSYSINT1REG);</div><div class='del'>-	val |= (uint16_t)1 &lt;&lt; (irq - VRC4173_IRQ_BASE);</div><div class='del'>-	vrc4173_outw(val, VRC4173_MSYSINT1REG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void disable_vrc4173_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	uint16_t val;</div><div class='del'>-</div><div class='del'>-	val = vrc4173_inw(VRC4173_MSYSINT1REG);</div><div class='del'>-	val &amp;= ~((uint16_t)1 &lt;&lt; (irq - VRC4173_IRQ_BASE));</div><div class='del'>-	vrc4173_outw(val, VRC4173_MSYSINT1REG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int startup_vrc4173_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	enable_vrc4173_irq(irq);</div><div class='del'>-	return 0; /* never anything pending */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define shutdown_vrc4173_irq	disable_vrc4173_irq</div><div class='del'>-#define ack_vrc4173_irq		disable_vrc4173_irq</div><div class='del'>-</div><div class='del'>-static void end_vrc4173_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	if (!(irq_desc[irq].status &amp; (IRQ_DISABLED | IRQ_INPROGRESS)))</div><div class='del'>-		enable_vrc4173_irq(irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hw_interrupt_type vrc4173_irq_type = {</div><div class='del'>-	.typename	= "VRC4173",</div><div class='del'>-	.startup	= startup_vrc4173_irq,</div><div class='del'>-	.shutdown	= shutdown_vrc4173_irq,</div><div class='del'>-	.enable		= enable_vrc4173_irq,</div><div class='del'>-	.disable	= disable_vrc4173_irq,</div><div class='del'>-	.ack		= ack_vrc4173_irq,</div><div class='del'>-	.end		= end_vrc4173_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int vrc4173_get_irq_number(int irq)</div><div class='del'>-{</div><div class='del'>-	uint16_t status, mask;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-        status = vrc4173_inw(VRC4173_SYSINT1REG);</div><div class='del'>-        mask = vrc4173_inw(VRC4173_MSYSINT1REG);</div><div class='del'>-</div><div class='del'>-	status &amp;= mask;</div><div class='del'>-	if (status) {</div><div class='del'>-		for (i = 0; i &lt; 16; i++)</div><div class='del'>-			if (status &amp; (0x0001 &lt;&lt; i))</div><div class='del'>-				return VRC4173_IRQ(i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int vrc4173_icu_init(int cascade_irq)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (cascade_irq &lt; GIU_IRQ(0) || cascade_irq &gt; GIU_IRQ(15))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	vrc4173_outw(0, VRC4173_MSYSINT1REG);</div><div class='del'>-</div><div class='del'>-	vr41xx_set_irq_trigger(GIU_IRQ_TO_PIN(cascade_irq), TRIGGER_LEVEL, SIGNAL_THROUGH);</div><div class='del'>-	vr41xx_set_irq_level(GIU_IRQ_TO_PIN(cascade_irq), LEVEL_LOW);</div><div class='del'>-</div><div class='del'>-	for (i = VRC4173_IRQ_BASE; i &lt;= VRC4173_IRQ_LAST; i++)</div><div class='del'>-                irq_desc[i].handler = &amp;vrc4173_irq_type;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit vrc4173_probe(struct pci_dev *dev,</div><div class='del'>-                                   const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	unsigned long start, flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(dev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "vrc4173: Failed to enable PCI device, aborting\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(dev);</div><div class='del'>-</div><div class='del'>-	start = pci_resource_start(dev, 0);</div><div class='del'>-	if (start == 0) {</div><div class='del'>-		printk(KERN_ERR "vrc4173:No such PCI I/O resource, aborting\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	flags = pci_resource_flags(dev, 0);</div><div class='del'>-	if ((flags &amp; IORESOURCE_IO) == 0) {</div><div class='del'>-		printk(KERN_ERR "vrc4173: No such PCI I/O resource, aborting\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(dev, "NEC VRC4173");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "vrc4173: PCI resources are busy, aborting\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_vrc4173_io_offset(start);</div><div class='del'>-</div><div class='del'>-	vrc4173_cmu_init();</div><div class='del'>-	vrc4173_giu_init();</div><div class='del'>-</div><div class='del'>-	err = vrc4173_icu_init(dev-&gt;irq);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "vrc4173: Invalid IRQ %d, aborting\n", dev-&gt;irq);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = vr41xx_cascade_irq(dev-&gt;irq, vrc4173_get_irq_number);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "vrc4173: IRQ resource %d is busy, aborting\n", dev-&gt;irq);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-	       "NEC VRC4173 at 0x%#08lx, IRQ is cascaded to %d\n", start, dev-&gt;irq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vrc4173_remove(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	free_irq(dev-&gt;irq, NULL);</div><div class='del'>-</div><div class='del'>-	pci_release_regions(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver vrc4173_driver = {</div><div class='del'>-	.name		= "NEC VRC4173",</div><div class='del'>-	.probe		= vrc4173_probe,</div><div class='del'>-	.remove		= vrc4173_remove,</div><div class='del'>-	.id_table	= vrc4173_id_table,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit vrc4173_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = pci_register_driver(&amp;vrc4173_driver);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	vrc4173_initialized = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit vrc4173_exit(void)</div><div class='del'>-{</div><div class='del'>-	vrc4173_initialized = 0;</div><div class='del'>-</div><div class='del'>-	pci_unregister_driver(&amp;vrc4173_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(vrc4173_init);</div><div class='del'>-module_exit(vrc4173_exit);</div><div class='head'>diff --git a/arch/mips/vr41xx/ibm-workpad/setup.c b/arch/mips/vr41xx/ibm-workpad/setup.c<br/>index 50fe8af4c52c..9eef297eca1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/ibm-workpad/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/ibm-workpad/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/ibm-workpad/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/ibm-workpad/setup.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  setup.c, Setup for the IBM WorkPad z50.</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2002-2005  Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;</div><div class='add'>+ *  Copyright (C) 2002-2006  Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -21,13 +21,18 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/vr41xx/workpad.h&gt;</div><div class='add'>+</div><div class='add'>+#define WORKPAD_ISA_IO_BASE	0x15000000</div><div class='add'>+#define WORKPAD_ISA_IO_SIZE	0x03000000</div><div class='add'>+#define WORKPAD_ISA_IO_START	0</div><div class='add'>+#define WORKPAD_ISA_IO_END	(WORKPAD_ISA_IO_SIZE - 1)</div><div class='add'>+#define WORKPAD_IO_PORT_BASE	KSEG1ADDR(WORKPAD_ISA_IO_BASE)</div><div class='ctx'> </div><div class='ctx'> static int __init ibm_workpad_setup(void)</div><div class='ctx'> {</div><div class='del'>-	set_io_port_base(IO_PORT_BASE);</div><div class='del'>-	ioport_resource.start = IO_PORT_RESOURCE_START;</div><div class='del'>-	ioport_resource.end = IO_PORT_RESOURCE_END;</div><div class='add'>+	set_io_port_base(WORKPAD_IO_PORT_BASE);</div><div class='add'>+	ioport_resource.start = WORKPAD_ISA_IO_START;</div><div class='add'>+	ioport_resource.end = WORKPAD_ISA_IO_END;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c<br/>index be590edb0b83..ae1af6b21c45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/nec-cmbvr4133/init.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * Support for NEC-CMBVR4133 in 2.6</div><div class='ctx'>  * Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ROCKHOPPER</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/mips/vr41xx/nec-cmbvr4133/irq.c b/arch/mips/vr41xx/nec-cmbvr4133/irq.c<br/>index 31db6b61a39e..2483487344c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/nec-cmbvr4133/irq.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static void end_i8259_irq(unsigned int irq)</div><div class='ctx'> 		enable_8259A_irq(irq - I8259_IRQ_BASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type i8259_irq_type = {</div><div class='add'>+static struct irq_chip i8259_irq_type = {</div><div class='ctx'> 	.typename       = "XT-PIC",</div><div class='ctx'> 	.startup        = startup_i8259_irq,</div><div class='ctx'> 	.shutdown       = shutdown_i8259_irq,</div><div class='hunk'>@@ -104,7 +104,7 @@ void __init rockhopper_init_irq(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = I8259_IRQ_BASE; i &lt;= I8259_IRQ_LAST; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;i8259_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;i8259_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(I8259_SLAVE_IRQ, &amp;i8259_slave_cascade);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c<br/>index 1f6b24ef8695..f45caccedc07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Support for NEC-CMBVR4133 in 2.6</div><div class='ctx'>  * Author: Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='head'>diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c<br/>index 53272a5c3cbe..b20b93b2b95e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/mips/vr41xx/nec-cmbvr4133/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/mips/vr41xx/nec-cmbvr4133/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/mips/vr41xx/nec-cmbvr4133/setup.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Support for CMBVR4133 board in 2.6</div><div class='ctx'>  * Author: Manish Lachwani (mlachwani@mvista.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig<br/>index 910fb3afc0b5..6dd0ea8f88e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/Kconfig</a></div><div class='hunk'>@@ -51,6 +51,10 @@ config GENERIC_HARDIRQS</div><div class='ctx'> config GENERIC_IRQ_PROBE</div><div class='ctx'> 	def_bool y</div><div class='ctx'> </div><div class='add'>+config IRQ_PER_CPU</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> # unless you want to implement ACPI on PA-RISC ... ;-)</div><div class='ctx'> config PM</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c<br/>index 05273ccced0e..cb69727027ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/hpux/sys_hpux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/hpux/sys_hpux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/hpux/sys_hpux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/hpux/sys_hpux.c</a></div><div class='hunk'>@@ -145,7 +145,7 @@ static int hpux_ustat(dev_t dev, struct hpux_ustat __user *ubuf)</div><div class='ctx'> 	s = user_get_super(dev);</div><div class='ctx'> 	if (s == NULL)</div><div class='ctx'> 		goto out;</div><div class='del'>-	err = vfs_statfs(s, &amp;sbuf);</div><div class='add'>+	err = vfs_statfs(s-&gt;s_root, &amp;sbuf);</div><div class='ctx'> 	drop_super(s);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -186,12 +186,12 @@ struct hpux_statfs {</div><div class='ctx'>      int16_t f_pad;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vfs_statfs_hpux(struct super_block *sb, struct hpux_statfs *buf)</div><div class='add'>+static int vfs_statfs_hpux(struct dentry *dentry, struct hpux_statfs *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct kstatfs st;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	</div><div class='del'>-	retval = vfs_statfs(sb, &amp;st);</div><div class='add'>+	retval = vfs_statfs(dentry, &amp;st);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +219,7 @@ asmlinkage long hpux_statfs(const char __user *path,</div><div class='ctx'> 	error = user_path_walk(path, &amp;nd);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		struct hpux_statfs tmp;</div><div class='del'>-		error = vfs_statfs_hpux(nd.dentry-&gt;d_inode-&gt;i_sb, &amp;tmp);</div><div class='add'>+		error = vfs_statfs_hpux(nd.dentry, &amp;tmp);</div><div class='ctx'> 		if (!error &amp;&amp; copy_to_user(buf, &amp;tmp, sizeof(tmp)))</div><div class='ctx'> 			error = -EFAULT;</div><div class='ctx'> 		path_release(&amp;nd);</div><div class='hunk'>@@ -237,7 +237,7 @@ asmlinkage long hpux_fstatfs(unsigned int fd, struct hpux_statfs __user * buf)</div><div class='ctx'> 	file = fget(fd);</div><div class='ctx'> 	if (!file)</div><div class='ctx'> 		goto out;</div><div class='del'>-	error = vfs_statfs_hpux(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb, &amp;tmp);</div><div class='add'>+	error = vfs_statfs_hpux(file-&gt;f_dentry, &amp;tmp);</div><div class='ctx'> 	if (!error &amp;&amp; copy_to_user(buf, &amp;tmp, sizeof(tmp)))</div><div class='ctx'> 		error = -EFAULT;</div><div class='ctx'> 	fput(file);</div><div class='head'>diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c<br/>index c057ad7605ba..bc7c4a4e26a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/cache.c</a></div><div class='hunk'>@@ -97,15 +97,17 @@ update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)</div><div class='ctx'> void</div><div class='ctx'> show_cache_info(struct seq_file *m)</div><div class='ctx'> {</div><div class='add'>+	char buf[32];</div><div class='add'>+</div><div class='ctx'> 	seq_printf(m, "I-cache\t\t: %ld KB\n", </div><div class='ctx'> 		cache_info.ic_size/1024 );</div><div class='del'>-	seq_printf(m, "D-cache\t\t: %ld KB (%s%s, %d-way associative)\n", </div><div class='add'>+	if (cache_info.dc_loop == 1)</div><div class='add'>+		snprintf(buf, 32, "%lu-way associative", cache_info.dc_loop);</div><div class='add'>+	seq_printf(m, "D-cache\t\t: %ld KB (%s%s, %s)\n",</div><div class='ctx'> 		cache_info.dc_size/1024,</div><div class='ctx'> 		(cache_info.dc_conf.cc_wt ? "WT":"WB"),</div><div class='ctx'> 		(cache_info.dc_conf.cc_sh ? ", shared I/D":""),</div><div class='del'>-		(cache_info.dc_conf.cc_assoc)</div><div class='del'>-	);</div><div class='del'>-</div><div class='add'>+		((cache_info.dc_loop == 1) ? "direct mapped" : buf));</div><div class='ctx'> 	seq_printf(m, "ITLB entries\t: %ld\n" "DTLB entries\t: %ld%s\n",</div><div class='ctx'> 		cache_info.it_size,</div><div class='ctx'> 		cache_info.dt_size,</div><div class='hunk'>@@ -158,11 +160,11 @@ parisc_cache_init(void)</div><div class='ctx'> 		cache_info.dc_conf.cc_block,</div><div class='ctx'> 		cache_info.dc_conf.cc_line,</div><div class='ctx'> 		cache_info.dc_conf.cc_shift);</div><div class='del'>-	printk("	wt %d sh %d cst %d assoc %d\n",</div><div class='add'>+	printk("	wt %d sh %d cst %d hv %d\n",</div><div class='ctx'> 		cache_info.dc_conf.cc_wt,</div><div class='ctx'> 		cache_info.dc_conf.cc_sh,</div><div class='ctx'> 		cache_info.dc_conf.cc_cst,</div><div class='del'>-		cache_info.dc_conf.cc_assoc);</div><div class='add'>+		cache_info.dc_conf.cc_hv);</div><div class='ctx'> </div><div class='ctx'> 	printk("IC  base 0x%lx stride 0x%lx count 0x%lx loop 0x%lx\n",</div><div class='ctx'> 		cache_info.ic_base,</div><div class='hunk'>@@ -176,11 +178,11 @@ parisc_cache_init(void)</div><div class='ctx'> 		cache_info.ic_conf.cc_block,</div><div class='ctx'> 		cache_info.ic_conf.cc_line,</div><div class='ctx'> 		cache_info.ic_conf.cc_shift);</div><div class='del'>-	printk("	wt %d sh %d cst %d assoc %d\n",</div><div class='add'>+	printk("	wt %d sh %d cst %d hv %d\n",</div><div class='ctx'> 		cache_info.ic_conf.cc_wt,</div><div class='ctx'> 		cache_info.ic_conf.cc_sh,</div><div class='ctx'> 		cache_info.ic_conf.cc_cst,</div><div class='del'>-		cache_info.ic_conf.cc_assoc);</div><div class='add'>+		cache_info.ic_conf.cc_hv);</div><div class='ctx'> </div><div class='ctx'> 	printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n",</div><div class='ctx'> 		cache_info.dt_conf.tc_sh,</div><div class='hunk'>@@ -234,7 +236,8 @@ parisc_cache_init(void)</div><div class='ctx'> </div><div class='ctx'> void disable_sr_hashing(void)</div><div class='ctx'> {</div><div class='del'>-	int srhash_type;</div><div class='add'>+	int srhash_type, retval;</div><div class='add'>+	unsigned long space_bits;</div><div class='ctx'> </div><div class='ctx'> 	switch (boot_cpu_data.cpu_type) {</div><div class='ctx'> 	case pcx: /* We shouldn't get this far.  setup.c should prevent it. */</div><div class='hunk'>@@ -260,6 +263,13 @@ void disable_sr_hashing(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	disable_sr_hashing_asm(srhash_type);</div><div class='add'>+</div><div class='add'>+	retval = pdc_spaceid_bits(&amp;space_bits);</div><div class='add'>+	/* If this procedure isn't implemented, don't panic. */</div><div class='add'>+	if (retval &lt; 0 &amp;&amp; retval != PDC_BAD_OPTION)</div><div class='add'>+		panic("pdc_spaceid_bits call failed.\n");</div><div class='add'>+	if (space_bits != 0)</div><div class='add'>+		panic("SpaceID hashing is still on!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void flush_dcache_page(struct page *page)</div><div class='head'>diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S<br/>index d9e53cf0372b..95c1b8ec4289 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/entry.S</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* we have the following possibilities to act on an interruption:</div><div class='hunk'>@@ -1638,7 +1637,7 @@ dbit_trap_20w:</div><div class='ctx'> 	load32		PA(pa_dbit_lock),t0</div><div class='ctx'> </div><div class='ctx'> dbit_spin_20w:</div><div class='del'>-	ldcw            0(t0),t1</div><div class='add'>+	LDCW		0(t0),t1</div><div class='ctx'> 	cmpib,=         0,t1,dbit_spin_20w</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1674,7 +1673,7 @@ dbit_trap_11:</div><div class='ctx'> 	load32		PA(pa_dbit_lock),t0</div><div class='ctx'> </div><div class='ctx'> dbit_spin_11:</div><div class='del'>-	ldcw            0(t0),t1</div><div class='add'>+	LDCW		0(t0),t1</div><div class='ctx'> 	cmpib,=         0,t1,dbit_spin_11</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='hunk'>@@ -1714,7 +1713,7 @@ dbit_trap_20:</div><div class='ctx'> 	load32		PA(pa_dbit_lock),t0</div><div class='ctx'> </div><div class='ctx'> dbit_spin_20:</div><div class='del'>-	ldcw            0(t0),t1</div><div class='add'>+	LDCW		0(t0),t1</div><div class='ctx'> 	cmpib,=         0,t1,dbit_spin_20</div><div class='ctx'> 	nop</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c<br/>index 2dc06b8e1817..4398d2a95789 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/firmware.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/firmware.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/firmware.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/firmware.c</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'>  * Copyright 1999 The Puffin Group, (Alex deVries, David Kennedy)</div><div class='ctx'>  * Copyright 2003 Grant Grundler &lt;grundler parisc-linux org&gt;</div><div class='ctx'>  * Copyright 2003,2004 Ryan Bradetich &lt;rbrad@parisc-linux.org&gt;</div><div class='del'>- * Copyright 2004 Thibaut VARENE &lt;varenet@parisc-linux.org&gt;</div><div class='add'>+ * Copyright 2004,2006 Thibaut VARENE &lt;varenet@parisc-linux.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *    This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *    it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -252,10 +252,8 @@ int pdc_pat_chassis_send_log(unsigned long state, unsigned long data)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * pdc_chassis_disp - Updates display</div><div class='add'>+ * pdc_chassis_disp - Updates chassis code</div><div class='ctx'>  * @retval: -1 on error, 0 on success</div><div class='del'>- *</div><div class='del'>- * Works on old PDC only (E class, others?)</div><div class='ctx'>  */</div><div class='ctx'> int pdc_chassis_disp(unsigned long disp)</div><div class='ctx'> {</div><div class='hunk'>@@ -269,6 +267,22 @@ int pdc_chassis_disp(unsigned long disp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pdc_chassis_warn - Fetches chassis warnings</div><div class='add'>+ * @retval: -1 on error, 0 on success</div><div class='add'>+ */</div><div class='add'>+int pdc_chassis_warn(unsigned long *warn)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;pdc_lock);</div><div class='add'>+	retval = mem_pdc_call(PDC_CHASSIS, PDC_CHASSIS_WARN, __pa(pdc_result));</div><div class='add'>+	*warn = pdc_result[0];</div><div class='add'>+	spin_unlock_irq(&amp;pdc_lock);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pdc_coproc_cfg - To identify coprocessors attached to the processor.</div><div class='ctx'>  * @pdc_coproc_info: Return buffer address.</div><div class='ctx'>  *</div><div class='hunk'>@@ -393,7 +407,9 @@ int pdc_model_info(struct pdc_model *model)</div><div class='ctx'>  * pdc_model_sysmodel - Get the system model name.</div><div class='ctx'>  * @name: A char array of at least 81 characters.</div><div class='ctx'>  *</div><div class='del'>- * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L)</div><div class='add'>+ * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L).</div><div class='add'>+ * Using OS_ID_HPUX will return the equivalent of the 'modelname' command</div><div class='add'>+ * on HP/UX.</div><div class='ctx'>  */</div><div class='ctx'> int pdc_model_sysmodel(char *name)</div><div class='ctx'> {</div><div class='hunk'>@@ -498,6 +514,26 @@ int pdc_cache_info(struct pdc_cache_info *cache_info)</div><div class='ctx'>         return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * pdc_spaceid_bits - Return whether Space ID hashing is turned on.</div><div class='add'>+ * @space_bits: Should be 0, if not, bad mojo!</div><div class='add'>+ *</div><div class='add'>+ * Returns information about Space ID hashing.</div><div class='add'>+ */</div><div class='add'>+int pdc_spaceid_bits(unsigned long *space_bits)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;pdc_lock);</div><div class='add'>+	pdc_result[0] = 0;</div><div class='add'>+	retval = mem_pdc_call(PDC_CACHE, PDC_CACHE_RET_SPID, __pa(pdc_result), 0);</div><div class='add'>+	convert_to_wide(pdc_result);</div><div class='add'>+	*space_bits = pdc_result[0];</div><div class='add'>+	spin_unlock_irq(&amp;pdc_lock);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_PA20</div><div class='ctx'> /**</div><div class='ctx'>  * pdc_btlb_info - Return block TLB information.</div><div class='head'>diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c<br/>index 197936d9359a..5b8803cc3d69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/irq.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -94,7 +93,7 @@ int cpu_check_affinity(unsigned int irq, cpumask_t *dest)</div><div class='ctx'> 	if (irq == TIMER_IRQ || irq == IPI_IRQ) {</div><div class='ctx'> 		/* Bad linux design decision.  The mask has already</div><div class='ctx'> 		 * been set; we must reset it */</div><div class='del'>-		irq_affinity[irq] = CPU_MASK_ALL;</div><div class='add'>+		irq_desc[irq].affinity = CPU_MASK_ALL;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +109,7 @@ static void cpu_set_affinity_irq(unsigned int irq, cpumask_t dest)</div><div class='ctx'> 	if (cpu_check_affinity(irq, &amp;dest))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	irq_affinity[irq] = dest;</div><div class='add'>+	irq_desc[irq].affinity = dest;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -125,6 +124,10 @@ static struct hw_interrupt_type cpu_interrupt_type = {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.set_affinity	= cpu_set_affinity_irq,</div><div class='ctx'> #endif</div><div class='add'>+	/* XXX: Needs to be written.  We managed without it so far, but</div><div class='add'>+	 * we really ought to write it.</div><div class='add'>+	 */</div><div class='add'>+	.retrigger	= NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int show_interrupts(struct seq_file *p, void *v)</div><div class='hunk'>@@ -158,7 +161,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		seq_printf(p, "%10u ", kstat_irqs(i));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> #ifndef PARISC_IRQ_CR16_COUNTS</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -210,12 +213,12 @@ int cpu_claim_irq(unsigned int irq, struct hw_interrupt_type *type, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (irq_desc[irq].action)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	if (irq_desc[irq].handler != &amp;cpu_interrupt_type)</div><div class='add'>+	if (irq_desc[irq].chip != &amp;cpu_interrupt_type)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (type) {</div><div class='del'>-		irq_desc[irq].handler = type;</div><div class='del'>-		irq_desc[irq].handler_data = data;</div><div class='add'>+		irq_desc[irq].chip = type;</div><div class='add'>+		irq_desc[irq].chip_data = data;</div><div class='ctx'> 		cpu_interrupt_type.enable(irq);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -265,7 +268,7 @@ int txn_alloc_irq(unsigned int bits_wide)</div><div class='ctx'> unsigned long txn_affinity_addr(unsigned int irq, int cpu)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	irq_affinity[irq] = cpumask_of_cpu(cpu);</div><div class='add'>+	irq_desc[irq].affinity = cpumask_of_cpu(cpu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return cpu_data[cpu].txn_addr;</div><div class='hunk'>@@ -326,7 +329,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)</div><div class='ctx'> 		/* Work our way from MSb to LSb...same order we alloc EIRs */</div><div class='ctx'> 		for (irq = TIMER_IRQ; eirr_val &amp;&amp; bit; bit&gt;&gt;=1, irq++) {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-			cpumask_t dest = irq_affinity[irq];</div><div class='add'>+			cpumask_t dest = irq_desc[irq].affinity;</div><div class='ctx'> #endif</div><div class='ctx'> 			if (!(bit &amp; eirr_val))</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -363,14 +366,14 @@ void do_cpu_irq_mask(struct pt_regs *regs)</div><div class='ctx'> static struct irqaction timer_action = {</div><div class='ctx'> 	.handler = timer_interrupt,</div><div class='ctx'> 	.name = "timer",</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static struct irqaction ipi_action = {</div><div class='ctx'> 	.handler = ipi_interrupt,</div><div class='ctx'> 	.name = "IPI",</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -378,7 +381,7 @@ static void claim_cpu_irqs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = CPU_IRQ_BASE; i &lt;= CPU_IRQ_MAX; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;cpu_interrupt_type;</div><div class='add'>+		irq_desc[i].chip = &amp;cpu_interrupt_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq_desc[TIMER_IRQ].action = &amp;timer_action;</div><div class='hunk'>@@ -404,13 +407,6 @@ void __init init_IRQ(void)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hw_resend_irq(struct hw_interrupt_type *type, unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	/* XXX: Needs to be written.  We managed without it so far, but</div><div class='del'>-	 * we really ought to write it.</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void ack_bad_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	printk("unexpected IRQ %d\n", irq);</div><div class='head'>diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c<br/>index f27cfe4771b8..aee311884f3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/module.c</a></div><div class='hunk'>@@ -89,6 +89,12 @@ static inline int is_local(struct module *me, void *loc)</div><div class='ctx'> 	return is_init(me, loc) || is_core(me, loc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int is_local_section(struct module *me, void *loc, void *dot)</div><div class='add'>+{</div><div class='add'>+	return (is_init(me, loc) &amp;&amp; is_init(me, dot)) ||</div><div class='add'>+		(is_core(me, loc) &amp;&amp; is_core(me, dot));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #ifndef __LP64__</div><div class='ctx'> struct got_entry {</div><div class='hunk'>@@ -364,8 +370,14 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)</div><div class='ctx'> }</div><div class='ctx'> #endif /* __LP64__ */</div><div class='ctx'> </div><div class='add'>+enum elf_stub_type {</div><div class='add'>+	ELF_STUB_GOT,</div><div class='add'>+	ELF_STUB_MILLI,</div><div class='add'>+	ELF_STUB_DIRECT,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,</div><div class='del'>-	int millicode, int init_section)</div><div class='add'>+	enum elf_stub_type stub_type, int init_section)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> 	struct stub_entry *stub;</div><div class='hunk'>@@ -396,7 +408,7 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,</div><div class='ctx'> 	stub-&gt;insns[1] |= reassemble_17(rrsel(value, addend) / 4);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-/* for 64-bit we have two kinds of stubs:</div><div class='add'>+/* for 64-bit we have three kinds of stubs:</div><div class='ctx'>  * for normal function calls:</div><div class='ctx'>  * 	ldd 0(%dp),%dp</div><div class='ctx'>  * 	ldd 10(%dp), %r1</div><div class='hunk'>@@ -408,18 +420,23 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,</div><div class='ctx'>  * 	ldo 0(%r1), %r1</div><div class='ctx'>  * 	ldd 10(%r1), %r1</div><div class='ctx'>  * 	bve,n (%r1)</div><div class='add'>+ *</div><div class='add'>+ * for direct branches (jumps between different section of the</div><div class='add'>+ * same module):</div><div class='add'>+ *	ldil 0, %r1</div><div class='add'>+ *	ldo 0(%r1), %r1</div><div class='add'>+ *	bve,n (%r1)</div><div class='ctx'>  */</div><div class='del'>-	if (!millicode)</div><div class='del'>-	{</div><div class='add'>+	switch (stub_type) {</div><div class='add'>+	case ELF_STUB_GOT:</div><div class='ctx'> 		stub-&gt;insns[0] = 0x537b0000;	/* ldd 0(%dp),%dp	*/</div><div class='ctx'> 		stub-&gt;insns[1] = 0x53610020;	/* ldd 10(%dp),%r1	*/</div><div class='ctx'> 		stub-&gt;insns[2] = 0xe820d000;	/* bve (%r1)		*/</div><div class='ctx'> 		stub-&gt;insns[3] = 0x537b0030;	/* ldd 18(%dp),%dp	*/</div><div class='ctx'> </div><div class='ctx'> 		stub-&gt;insns[0] |= reassemble_14(get_got(me, value, addend) &amp; 0x3fff);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='add'>+		break;</div><div class='add'>+	case ELF_STUB_MILLI:</div><div class='ctx'> 		stub-&gt;insns[0] = 0x20200000;	/* ldil 0,%r1		*/</div><div class='ctx'> 		stub-&gt;insns[1] = 0x34210000;	/* ldo 0(%r1), %r1	*/</div><div class='ctx'> 		stub-&gt;insns[2] = 0x50210020;	/* ldd 10(%r1),%r1	*/</div><div class='hunk'>@@ -427,7 +444,17 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,</div><div class='ctx'> </div><div class='ctx'> 		stub-&gt;insns[0] |= reassemble_21(lrsel(value, addend));</div><div class='ctx'> 		stub-&gt;insns[1] |= reassemble_14(rrsel(value, addend));</div><div class='add'>+		break;</div><div class='add'>+	case ELF_STUB_DIRECT:</div><div class='add'>+		stub-&gt;insns[0] = 0x20200000;    /* ldil 0,%r1           */</div><div class='add'>+		stub-&gt;insns[1] = 0x34210000;    /* ldo 0(%r1), %r1      */</div><div class='add'>+		stub-&gt;insns[2] = 0xe820d002;    /* bve,n (%r1)          */</div><div class='add'>+</div><div class='add'>+		stub-&gt;insns[0] |= reassemble_21(lrsel(value, addend));</div><div class='add'>+		stub-&gt;insns[1] |= reassemble_14(rrsel(value, addend));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return (Elf_Addr)stub;</div><div class='hunk'>@@ -539,14 +566,14 @@ int apply_relocate_add(Elf_Shdr *sechdrs,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case R_PARISC_PCREL17F:</div><div class='ctx'> 			/* 17-bit PC relative address */</div><div class='del'>-			val = get_stub(me, val, addend, 0, is_init(me, loc));</div><div class='add'>+			val = get_stub(me, val, addend, ELF_STUB_GOT, is_init(me, loc));</div><div class='ctx'> 			val = (val - dot - 8)/4;</div><div class='ctx'> 			CHECK_RELOC(val, 17)</div><div class='ctx'> 			*loc = (*loc &amp; ~0x1f1ffd) | reassemble_17(val);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case R_PARISC_PCREL22F:</div><div class='ctx'> 			/* 22-bit PC relative address; only defined for pa20 */</div><div class='del'>-			val = get_stub(me, val, addend, 0, is_init(me, loc));</div><div class='add'>+			val = get_stub(me, val, addend, ELF_STUB_GOT, is_init(me, loc));</div><div class='ctx'> 			DEBUGP("STUB FOR %s loc %lx+%lx at %lx\n", </div><div class='ctx'> 			       strtab + sym-&gt;st_name, (unsigned long)loc, addend, </div><div class='ctx'> 			       val)</div><div class='hunk'>@@ -643,13 +670,23 @@ int apply_relocate_add(Elf_Shdr *sechdrs,</div><div class='ctx'> 			       strtab + sym-&gt;st_name,</div><div class='ctx'> 			       loc, val);</div><div class='ctx'> 			/* can we reach it locally? */</div><div class='del'>-			if(!is_local(me, (void *)val)) {</div><div class='del'>-				if (strncmp(strtab + sym-&gt;st_name, "$$", 2)</div><div class='add'>+			if(!is_local_section(me, (void *)val, (void *)dot)) {</div><div class='add'>+</div><div class='add'>+				if (is_local(me, (void *)val))</div><div class='add'>+					/* this is the case where the</div><div class='add'>+					 * symbol is local to the</div><div class='add'>+					 * module, but in a different</div><div class='add'>+					 * section, so stub the jump</div><div class='add'>+					 * in case it's more than 22</div><div class='add'>+					 * bits away */</div><div class='add'>+					val = get_stub(me, val, addend, ELF_STUB_DIRECT,</div><div class='add'>+						       is_init(me, loc));</div><div class='add'>+				else if (strncmp(strtab + sym-&gt;st_name, "$$", 2)</div><div class='ctx'> 				    == 0)</div><div class='del'>-					val = get_stub(me, val, addend, 1,</div><div class='add'>+					val = get_stub(me, val, addend, ELF_STUB_MILLI,</div><div class='ctx'> 						       is_init(me, loc));</div><div class='ctx'> 				else</div><div class='del'>-					val = get_stub(me, val, addend, 0,</div><div class='add'>+					val = get_stub(me, val, addend, ELF_STUB_GOT,</div><div class='ctx'> 						       is_init(me, loc));</div><div class='ctx'> 			}</div><div class='ctx'> 			DEBUGP("STUB FOR %s loc %lx, val %lx+%lx at %lx\n", </div><div class='head'>diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S<br/>index f600556414d1..e81c9937d10a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pacache.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pacache.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pacache.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/pacache.S</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> 	.level	2.0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/psw.h&gt;</div><div class='ctx'> #include &lt;asm/assembly.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c<br/>index fc107add627c..6d57553d8ef8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/parisc_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/parisc_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/parisc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/parisc_ksyms.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c<br/>index 79c7db2705fd..d3b8fc52dfc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/pci.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 1999-2001 Hewlett-Packard Company</div><div class='ctx'>  * Copyright (C) 1999-2001 Grant Grundler</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/eisa.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -289,7 +288,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);</div><div class='ctx'>  * than res-&gt;start.</div><div class='ctx'>  */</div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-				unsigned long size, unsigned long alignment)</div><div class='add'>+				resource_size_t size, resource_size_t alignment)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask, align;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c<br/>index a45e2e2ffd9f..d47ba1aa8253 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pdc_chassis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pdc_chassis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pdc_chassis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/pdc_chassis.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /* </div><div class='del'>- *    interfaces to log Chassis Codes via PDC (firmware)</div><div class='add'>+ *    interfaces to Chassis Codes via PDC (firmware)</div><div class='ctx'>  *</div><div class='ctx'>  *    Copyright (C) 2002 Laurent Canet &lt;canetl@esiee.fr&gt;</div><div class='del'>- *    Copyright (C) 2002-2004 Thibaut VARENE &lt;varenet@parisc-linux.org&gt;</div><div class='add'>+ *    Copyright (C) 2002-2006 Thibaut VARENE &lt;varenet@parisc-linux.org&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *    This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *    it under the terms of the GNU General Public License, version 2, as</div><div class='hunk'>@@ -16,6 +16,10 @@</div><div class='ctx'>  *    You should have received a copy of the GNU General Public License</div><div class='ctx'>  *    along with this program; if not, write to the Free Software</div><div class='ctx'>  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ *    TODO: poll chassis warns, trigger (configurable) machine shutdown when</div><div class='add'>+ *    		needed.</div><div class='add'>+ *    	    Find out how to get Chassis warnings out of PAT boxes?</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #undef PDC_CHASSIS_DEBUG</div><div class='hunk'>@@ -30,15 +34,16 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pdc_chassis.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/pdc.h&gt;</div><div class='ctx'> #include &lt;asm/pdcpat.h&gt;</div><div class='ctx'> </div><div class='add'>+#define PDC_CHASSIS_VER	"0.05"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PDC_CHASSIS</div><div class='del'>-static int pdc_chassis_old __read_mostly = 0;	</div><div class='ctx'> static unsigned int pdc_chassis_enabled __read_mostly = 1;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +69,7 @@ __setup("pdcchassis=", pdc_chassis_setup);</div><div class='ctx'>  * Currently, only E class and A180 are known to work with this.</div><div class='ctx'>  * Inspired by Christoph Plattner</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+#if 0</div><div class='ctx'> static void __init pdc_chassis_checkold(void)</div><div class='ctx'> {</div><div class='ctx'> 	switch(CPU_HVERSION) {</div><div class='hunk'>@@ -73,7 +78,6 @@ static void __init pdc_chassis_checkold(void)</div><div class='ctx'> 		case 0x482:		/* E45 */</div><div class='ctx'> 		case 0x483:		/* E55 */</div><div class='ctx'> 		case 0x516:		/* A180 */</div><div class='del'>-			pdc_chassis_old = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='hunk'>@@ -81,7 +85,7 @@ static void __init pdc_chassis_checkold(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	DPRINTK(KERN_DEBUG "%s: pdc_chassis_checkold(); pdc_chassis_old = %d\n", __FILE__, pdc_chassis_old);</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pdc_chassis_panic_event() - Called by the panic handler.</div><div class='hunk'>@@ -131,30 +135,20 @@ static struct notifier_block pdc_chassis_reboot_block = {</div><div class='ctx'> void __init parisc_pdc_chassis_init(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PDC_CHASSIS</div><div class='del'>-	int handle = 0;</div><div class='ctx'> 	if (likely(pdc_chassis_enabled)) {</div><div class='ctx'> 		DPRINTK(KERN_DEBUG "%s: parisc_pdc_chassis_init()\n", __FILE__);</div><div class='ctx'> </div><div class='ctx'> 		/* Let see if we have something to handle... */</div><div class='del'>-		/* Check for PDC_PAT or old LED Panel */</div><div class='del'>-		pdc_chassis_checkold();</div><div class='del'>-		if (is_pdc_pat()) {</div><div class='del'>-			printk(KERN_INFO "Enabling PDC_PAT chassis codes support.\n");</div><div class='del'>-			handle = 1;</div><div class='del'>-		}</div><div class='del'>-		else if (unlikely(pdc_chassis_old)) {</div><div class='del'>-			printk(KERN_INFO "Enabling old style chassis LED panel support.\n");</div><div class='del'>-			handle = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (handle) {</div><div class='del'>-			/* initialize panic notifier chain */</div><div class='del'>-			atomic_notifier_chain_register(&amp;panic_notifier_list,</div><div class='del'>-					&amp;pdc_chassis_panic_block);</div><div class='del'>-</div><div class='del'>-			/* initialize reboot notifier chain */</div><div class='del'>-			register_reboot_notifier(&amp;pdc_chassis_reboot_block);</div><div class='del'>-		}</div><div class='add'>+		printk(KERN_INFO "Enabling %s chassis codes support v%s\n",</div><div class='add'>+				is_pdc_pat() ? "PDC_PAT" : "regular",</div><div class='add'>+				PDC_CHASSIS_VER);</div><div class='add'>+</div><div class='add'>+		/* initialize panic notifier chain */</div><div class='add'>+		atomic_notifier_chain_register(&amp;panic_notifier_list,</div><div class='add'>+				&amp;pdc_chassis_panic_block);</div><div class='add'>+</div><div class='add'>+		/* initialize reboot notifier chain */</div><div class='add'>+		register_reboot_notifier(&amp;pdc_chassis_reboot_block);</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_PDC_CHASSIS */</div><div class='ctx'> }</div><div class='hunk'>@@ -215,9 +209,12 @@ int pdc_chassis_send_status(int message)</div><div class='ctx'> 			}</div><div class='ctx'> 		} else retval = -1;</div><div class='ctx'> #else</div><div class='del'>-		if (unlikely(pdc_chassis_old)) {</div><div class='add'>+		if (1) {</div><div class='ctx'> 			switch (message) {</div><div class='ctx'> 				case PDC_CHASSIS_DIRECT_BSTART:</div><div class='add'>+					retval = pdc_chassis_disp(PDC_CHASSIS_DISP_DATA(OSTAT_INIT));</div><div class='add'>+					break;</div><div class='add'>+</div><div class='ctx'> 				case PDC_CHASSIS_DIRECT_BCOMPLETE:</div><div class='ctx'> 					retval = pdc_chassis_disp(PDC_CHASSIS_DISP_DATA(OSTAT_RUN));</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -244,3 +241,61 @@ int pdc_chassis_send_status(int message)</div><div class='ctx'> #endif /* CONFIG_PDC_CHASSIS */</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PDC_CHASSIS_WARN</div><div class='add'>+#ifdef CONFIG_PROC_FS</div><div class='add'>+static int pdc_chassis_warn_pread(char *page, char **start, off_t off,</div><div class='add'>+		int count, int *eof, void *data)</div><div class='add'>+{</div><div class='add'>+	char *out = page;</div><div class='add'>+	int len, ret;</div><div class='add'>+	unsigned long warn;</div><div class='add'>+	u32 warnreg;</div><div class='add'>+</div><div class='add'>+	ret = pdc_chassis_warn(&amp;warn);</div><div class='add'>+	if (ret != PDC_OK)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	warnreg = (warn &amp; 0xFFFFFFFF);</div><div class='add'>+</div><div class='add'>+	if ((warnreg &gt;&gt; 24) &amp; 0xFF)</div><div class='add'>+		out += sprintf(out, "Chassis component failure! (eg fan or PSU): 0x%.2x\n", ((warnreg &gt;&gt; 24) &amp; 0xFF));</div><div class='add'>+</div><div class='add'>+	out += sprintf(out, "Battery: %s\n", (warnreg &amp; 0x04) ? "Low!" : "OK");</div><div class='add'>+	out += sprintf(out, "Temp low: %s\n", (warnreg &amp; 0x02) ? "Exceeded!" : "OK");</div><div class='add'>+	out += sprintf(out, "Temp mid: %s\n", (warnreg &amp; 0x01) ? "Exceeded!" : "OK");</div><div class='add'>+</div><div class='add'>+	len = out - page - off;</div><div class='add'>+	if (len &lt; count) {</div><div class='add'>+		*eof = 1;</div><div class='add'>+		if (len &lt;= 0) return 0;</div><div class='add'>+	} else {</div><div class='add'>+		len = count;</div><div class='add'>+	}</div><div class='add'>+	*start = page + off;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init pdc_chassis_create_procfs(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long test;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pdc_chassis_warn(&amp;test);</div><div class='add'>+	if ((ret == PDC_BAD_PROC) || (ret == PDC_BAD_OPTION)) {</div><div class='add'>+		/* seems that some boxes (eg L1000) do not implement this */</div><div class='add'>+		printk(KERN_INFO "Chassis warnings not supported.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Enabling PDC chassis warnings support v%s\n",</div><div class='add'>+			PDC_CHASSIS_VER);</div><div class='add'>+	create_proc_read_entry("chassis", 0400, NULL, pdc_chassis_warn_pread,</div><div class='add'>+				NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__initcall(pdc_chassis_create_procfs);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_PDC_CHASSIS_WARN */</div><div class='head'>diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c<br/>index 215d78c87bc5..aab05767427c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pdc_cons.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/pdc_cons.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/pdc_cons.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/pdc_cons.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'> #define EARLY_BOOTUP_DEBUG</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -90,6 +89,8 @@ static int pdc_console_setup(struct console *co, char *options)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PDC_CONSOLE)</div><div class='add'>+#include &lt;linux/vt_kern.h&gt;</div><div class='add'>+</div><div class='ctx'> static struct tty_driver * pdc_console_device (struct console *c, int *index)</div><div class='ctx'> {</div><div class='ctx'> 	extern struct tty_driver console_driver;</div><div class='head'>diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S<br/>index adb3c6444910..5e7bb90e7e08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/perf_asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/perf_asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/perf_asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/perf_asm.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/assembly.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='head'>diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c<br/>index 6df9f62cecb5..99d7fca93104 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/processor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/processor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/processor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/processor.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c<br/>index 413292f1a4a3..3f28de974556 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/ptrace.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		int copied;</div><div class='ctx'> </div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-		if (personality(child-&gt;personality) == PER_LINUX32) {</div><div class='add'>+		if (__is_compat_task(child)) {</div><div class='ctx'> 			unsigned int tmp;</div><div class='ctx'> </div><div class='ctx'> 			addr &amp;= 0xffffffffL;</div><div class='hunk'>@@ -123,7 +123,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	case PTRACE_POKEDATA:</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-		if (personality(child-&gt;personality) == PER_LINUX32) {</div><div class='add'>+		if (__is_compat_task(child)) {</div><div class='ctx'> 			unsigned int tmp = (unsigned int)data;</div><div class='ctx'> 			DBG("sys_ptrace(POKE%s, %d, %lx, %lx)\n",</div><div class='ctx'> 				request == PTRACE_POKETEXT ? "TEXT" : "DATA",</div><div class='hunk'>@@ -146,7 +146,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 	case PTRACE_PEEKUSR: {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-		if (personality(child-&gt;personality) == PER_LINUX32) {</div><div class='add'>+		if (__is_compat_task(child)) {</div><div class='ctx'> 			unsigned int tmp;</div><div class='ctx'> </div><div class='ctx'> 			if (addr &amp; (sizeof(int)-1))</div><div class='hunk'>@@ -205,7 +205,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 			goto out_tsk;</div><div class='ctx'> 		}</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-		if (personality(child-&gt;personality) == PER_LINUX32) {</div><div class='add'>+		if (__is_compat_task(child)) {</div><div class='ctx'> 			if (addr &amp; (sizeof(int)-1))</div><div class='ctx'> 				goto out_tsk;</div><div class='ctx'> 			if ((addr = translate_usr_offset(addr)) &lt; 0)</div><div class='head'>diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S<br/>index 8c2859cca77e..789061f6ceb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/real2.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/real2.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/real2.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/real2.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 2000 Hewlett Packard (Paul Bame bame@puffin.external.hp.com)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/psw.h&gt;</div><div class='ctx'> #include &lt;asm/assembly.h&gt;</div><div class='hunk'>@@ -276,15 +275,6 @@ r64_ret:</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	.export pc_in_user_space</div><div class='del'>-	.text</div><div class='del'>-	/* Doesn't belong here but I couldn't find a nicer spot. */</div><div class='del'>-	/* Should never get called, only used by profile stuff in time.c */</div><div class='del'>-pc_in_user_space:</div><div class='del'>-	bv,n	0(%rp)</div><div class='del'>-	nop</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	.export __canonicalize_funcptr_for_compare</div><div class='ctx'> 	.text</div><div class='ctx'> 	/* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html</div><div class='head'>diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c<br/>index 4a36ec3f6ac1..3c7a3faf78ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/setup.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -303,6 +302,8 @@ extern void eisa_init(void);</div><div class='ctx'> </div><div class='ctx'> static int __init parisc_init(void)</div><div class='ctx'> {</div><div class='add'>+	u32 osid = (OS_ID_LINUX &lt;&lt; 16);</div><div class='add'>+</div><div class='ctx'> 	parisc_proc_mkdir();</div><div class='ctx'> 	parisc_init_resources();</div><div class='ctx'> 	do_device_inventory();                  /* probe for hardware */</div><div class='hunk'>@@ -311,6 +312,9 @@ static int __init parisc_init(void)</div><div class='ctx'> 	</div><div class='ctx'> 	/* set up a new led state on systems shipped LED State panel */</div><div class='ctx'> 	pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BSTART);</div><div class='add'>+</div><div class='add'>+	/* tell PDC we're Linux. Nevermind failure. */</div><div class='add'>+	pdc_stable_write(0x40, &amp;osid, sizeof(osid));</div><div class='ctx'> 	</div><div class='ctx'> 	processor_init();</div><div class='ctx'> 	printk(KERN_INFO "CPU(s): %d x %s at %d.%06d MHz\n",</div><div class='head'>diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c<br/>index 05767e83cf2d..bb83880c5ee3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/signal.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *r</div><div class='ctx'> #ifdef __LP64__</div><div class='ctx'> 	compat_sigset_t newset32;</div><div class='ctx'> </div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32){</div><div class='add'>+	if (is_compat_task()) {</div><div class='ctx'> 		/* XXX: Don't preclude handling different sized sigset_t's.  */</div><div class='ctx'> 		if (sigsetsize != sizeof(compat_sigset_t))</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -153,7 +153,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)</div><div class='ctx'> 	compat_sigset_t compat_set;</div><div class='ctx'> 	struct compat_rt_sigframe __user * compat_frame;</div><div class='ctx'> 	</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32)</div><div class='add'>+	if (is_compat_task())</div><div class='ctx'> 		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +166,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)</div><div class='ctx'> #ifdef __LP64__</div><div class='ctx'> 	compat_frame = (struct compat_rt_sigframe __user *)frame;</div><div class='ctx'> 	</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32){</div><div class='add'>+	if (is_compat_task()) {</div><div class='ctx'> 		DBG(2,"sys_rt_sigreturn: ELF32 process.\n");</div><div class='ctx'> 		if (__copy_from_user(&amp;compat_set, &amp;compat_frame-&gt;uc.uc_sigmask, sizeof(compat_set)))</div><div class='ctx'> 			goto give_sigsegv;</div><div class='hunk'>@@ -186,7 +186,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)</div><div class='ctx'> </div><div class='ctx'> 	/* Good thing we saved the old gr[30], eh? */</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32){</div><div class='add'>+	if (is_compat_task()) {</div><div class='ctx'> 		DBG(1,"sys_rt_sigreturn: compat_frame-&gt;uc.uc_mcontext 0x%p\n",</div><div class='ctx'> 				&amp;compat_frame-&gt;uc.uc_mcontext);</div><div class='ctx'> // FIXME: Load upper half from register file</div><div class='hunk'>@@ -248,7 +248,7 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)</div><div class='ctx'> 	DBG(1,"get_sigframe: ka = %#lx, sp = %#lx, frame_size = %#lx\n",</div><div class='ctx'> 			(unsigned long)ka, sp, frame_size);</div><div class='ctx'> 	</div><div class='del'>-	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! on_sig_stack(sp))</div><div class='add'>+	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! sas_ss_flags(sp))</div><div class='ctx'> 		sp = current-&gt;sas_ss_sp; /* Stacks grow up! */</div><div class='ctx'> </div><div class='ctx'> 	DBG(1,"get_sigframe: Returning sp = %#lx\n", (unsigned long)sp);</div><div class='hunk'>@@ -315,7 +315,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> </div><div class='ctx'> 	compat_frame = (struct compat_rt_sigframe __user *)frame;</div><div class='ctx'> 	</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32) {</div><div class='add'>+	if (is_compat_task()) {</div><div class='ctx'> 		DBG(1,"setup_rt_frame: frame-&gt;info = 0x%p\n", &amp;compat_frame-&gt;info);</div><div class='ctx'> 		err |= copy_siginfo_to_user32(&amp;compat_frame-&gt;info, info);</div><div class='ctx'> 		DBG(1,"SETUP_RT_FRAME: 1\n");</div><div class='hunk'>@@ -392,7 +392,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	haddr = A(ka-&gt;sa.sa_handler);</div><div class='ctx'> 	/* The sa_handler may be a pointer to a function descriptor */</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32) {</div><div class='add'>+	if (is_compat_task()) {</div><div class='ctx'> #endif</div><div class='ctx'> 		if (haddr &amp; PA_PLABEL_FDESC) {</div><div class='ctx'> 			Elf32_Fdesc fdesc;</div><div class='hunk'>@@ -427,19 +427,19 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	 */</div><div class='ctx'> 	sigframe_size = PARISC_RT_SIGFRAME_SIZE;</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32)</div><div class='add'>+	if (is_compat_task())</div><div class='ctx'> 		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (in_syscall) {</div><div class='ctx'> 		regs-&gt;gr[31] = haddr;</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-		if(personality(current-&gt;personality) == PER_LINUX)</div><div class='add'>+		if (personality(current-&gt;personality) == PER_LINUX)</div><div class='ctx'> 			sigframe_size |= 1;</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned long psw = USER_PSW;</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-		if(personality(current-&gt;personality) == PER_LINUX)</div><div class='add'>+		if (personality(current-&gt;personality) == PER_LINUX)</div><div class='ctx'> 			psw |= PSW_W;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -464,7 +464,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	regs-&gt;gr[26] = sig;               /* signal number */</div><div class='ctx'> 	</div><div class='ctx'> #ifdef __LP64__</div><div class='del'>-	if(personality(current-&gt;personality) == PER_LINUX32){</div><div class='add'>+	if (is_compat_task()) {</div><div class='ctx'> 		regs-&gt;gr[25] = A(&amp;compat_frame-&gt;info); /* siginfo pointer */</div><div class='ctx'> 		regs-&gt;gr[24] = A(&amp;compat_frame-&gt;uc);   /* ucontext pointer */</div><div class='ctx'> 	} else</div><div class='head'>diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c<br/>index d6ac1c60a471..98e40959a564 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/smp.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> */</div><div class='ctx'> #undef ENTRY_SYS_CPUS	/* syscall support for iCOD-like functionality */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c<br/>index d286f68a3d3a..b74869803081 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/sys_parisc32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/sys_parisc32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/sys_parisc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/sys_parisc32.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * environment. Based heavily on sys_ia32.c and sys_sparc32.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S<br/>index 479d9a017cd1..9670a89c77fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/syscall.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/syscall.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/syscall.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/syscall.S</a></div><div class='hunk'>@@ -29,18 +29,6 @@</div><div class='ctx'> 	.level		1.1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_64BIT</div><div class='del'>-	.macro fixup_branch,lbl</div><div class='del'>-	b	    \lbl</div><div class='del'>-	.endm</div><div class='del'>-#else</div><div class='del'>-	.macro fixup_branch,lbl</div><div class='del'>-	ldil	    L%\lbl, %r1</div><div class='del'>-	ldo	    R%\lbl(%r1), %r1</div><div class='del'>-	bv,n        %r0(%r1)</div><div class='del'>-	.endm</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='ctx'> 	.import syscall_exit,code</div><div class='hunk'>@@ -541,7 +529,7 @@ cas_nocontend:</div><div class='ctx'> # endif</div><div class='ctx'> /* ENABLE_LWS_DEBUG */</div><div class='ctx'> </div><div class='del'>-	ldcw	0(%sr2,%r20), %r28			/* Try to acquire the lock */</div><div class='add'>+	LDCW	0(%sr2,%r20), %r28			/* Try to acquire the lock */</div><div class='ctx'> 	cmpb,&lt;&gt;,n	%r0, %r28, cas_action		/* Did we get it? */</div><div class='ctx'> cas_wouldblock:</div><div class='ctx'> 	ldo	2(%r0), %r28				/* 2nd case */</div><div class='head'>diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c<br/>index 594930bc4bcf..5facc9bff4ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/time.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * 1998-12-20  Updated NTP code according to technical memorandum Jan '96</div><div class='ctx'>  *             "A Kernel Model for Precision Timekeeping" by Dave Mills</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -157,8 +156,22 @@ do_gettimeofday (struct timeval *tv)</div><div class='ctx'> 		usec += (xtime.tv_nsec / 1000);</div><div class='ctx'> 	} while (read_seqretry_irqrestore(&amp;xtime_lock, seq, flags));</div><div class='ctx'> </div><div class='del'>-	while (usec &gt;= 1000000) {</div><div class='del'>-		usec -= 1000000;</div><div class='add'>+	if (unlikely(usec &gt; LONG_MAX)) {</div><div class='add'>+		/* This can happen if the gettimeoffset adjustment is</div><div class='add'>+		 * negative and xtime.tv_nsec is smaller than the</div><div class='add'>+		 * adjustment */</div><div class='add'>+		printk(KERN_ERR "do_gettimeofday() spurious xtime.tv_nsec of %ld\n", usec);</div><div class='add'>+		usec += USEC_PER_SEC;</div><div class='add'>+		--sec;</div><div class='add'>+		/* This should never happen, it means the negative</div><div class='add'>+		 * time adjustment was more than a second, so there's</div><div class='add'>+		 * something seriously wrong */</div><div class='add'>+		BUG_ON(usec &gt; LONG_MAX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	while (usec &gt;= USEC_PER_SEC) {</div><div class='add'>+		usec -= USEC_PER_SEC;</div><div class='ctx'> 		++sec;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/topology.c b/arch/parisc/kernel/topology.c<br/>index 3ba040050e4c..068b20d822e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/topology.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/topology.c</a></div><div class='hunk'>@@ -26,11 +26,10 @@ static struct cpu cpu_devices[NR_CPUS] __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct node *parent = NULL;</div><div class='ctx'> 	int num;</div><div class='ctx'> </div><div class='ctx'> 	for_each_present_cpu(num) {</div><div class='del'>-		register_cpu(&amp;cpu_devices[num], num, parent);</div><div class='add'>+		register_cpu(&amp;cpu_devices[num], num);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c<br/>index ff200608c851..77b28cb8aca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/traps.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * state in 'asm.s'.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -66,57 +65,42 @@ int printbinary(char *buf, unsigned long x, int nbits)</div><div class='ctx'> #else</div><div class='ctx'> #define RFMT "%08lx"</div><div class='ctx'> #endif</div><div class='add'>+#define FFMT "%016llx"	/* fpregs are 64-bit always */</div><div class='ctx'> </div><div class='del'>-void show_regs(struct pt_regs *regs)</div><div class='add'>+#define PRINTREGS(lvl,r,f,fmt,x)	\</div><div class='add'>+	printk("%s%s%02d-%02d  " fmt " " fmt " " fmt " " fmt "\n",	\</div><div class='add'>+		lvl, f, (x), (x+3), (r)[(x)+0], (r)[(x)+1],		\</div><div class='add'>+		(r)[(x)+2], (r)[(x)+3])</div><div class='add'>+</div><div class='add'>+static void print_gr(char *level, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	char buf[128], *p;</div><div class='del'>-	char *level;</div><div class='del'>-	unsigned long cr30;</div><div class='del'>-	unsigned long cr31;</div><div class='del'>-	/* carlos says that gcc understands better memory in a struct,</div><div class='del'>-	 * and it makes our life easier with fpregs -- T-Bone */</div><div class='del'>-	struct { u32 sw[2]; } s;</div><div class='del'>-	</div><div class='del'>-	level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;</div><div class='del'>-</div><div class='del'>-	printk("%s\n", level); /* don't want to have that pretty register dump messed up */</div><div class='add'>+	char buf[64];</div><div class='ctx'> </div><div class='add'>+	printk("%s\n", level);</div><div class='ctx'> 	printk("%s     YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI\n", level);</div><div class='ctx'> 	printbinary(buf, regs-&gt;gr[0], 32);</div><div class='ctx'> 	printk("%sPSW: %s %s\n", level, buf, print_tainted());</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 32; i += 4) {</div><div class='del'>-		int j;</div><div class='del'>-		p = buf;</div><div class='del'>-		p += sprintf(p, "%sr%02d-%02d ", level, i, i + 3);</div><div class='del'>-		for (j = 0; j &lt; 4; j++) {</div><div class='del'>-			p += sprintf(p, " " RFMT, (i+j) == 0 ? 0 : regs-&gt;gr[i + j]);</div><div class='del'>-		}</div><div class='del'>-		printk("%s\n", buf);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; 32; i += 4)</div><div class='add'>+		PRINTREGS(level, regs-&gt;gr, "r", RFMT, i);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; i += 4) {</div><div class='del'>-		int j;</div><div class='del'>-		p = buf;</div><div class='del'>-		p += sprintf(p, "%ssr%d-%d  ", level, i, i + 3);</div><div class='del'>-		for (j = 0; j &lt; 4; j++) {</div><div class='del'>-			p += sprintf(p, " " RFMT, regs-&gt;sr[i + j]);</div><div class='del'>-		}</div><div class='del'>-		printk("%s\n", buf);</div><div class='del'>-	}</div><div class='add'>+static void print_fr(char *level, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	char buf[64];</div><div class='add'>+	struct { u32 sw[2]; } s;</div><div class='ctx'> </div><div class='ctx'> 	/* FR are 64bit everywhere. Need to use asm to get the content</div><div class='ctx'> 	 * of fpsr/fper1, and we assume that we won't have a FP Identify</div><div class='ctx'> 	 * in our way, otherwise we're screwed.</div><div class='ctx'> 	 * The fldd is used to restore the T-bit if there was one, as the</div><div class='ctx'> 	 * store clears it anyway.</div><div class='del'>-	 * BTW, PA2.0 book says "thou shall not use fstw on FPSR/FPERs". */ </div><div class='del'>-	__asm__ (</div><div class='del'>-		"fstd %%fr0,0(%1)	\n\t"</div><div class='del'>-		"fldd 0(%1),%%fr0	\n\t"</div><div class='del'>-		: "=m" (s) : "r" (&amp;s) : "%r0"</div><div class='del'>-		);</div><div class='add'>+	 * PA2.0 book says "thou shall not use fstw on FPSR/FPERs" - T-Bone */</div><div class='add'>+	asm volatile ("fstd %%fr0,0(%1)	\n\t"</div><div class='add'>+		      "fldd 0(%1),%%fr0	\n\t"</div><div class='add'>+		      : "=m" (s) : "r" (&amp;s) : "r0");</div><div class='ctx'> </div><div class='ctx'> 	printk("%s\n", level);</div><div class='ctx'> 	printk("%s      VZOUICununcqcqcqcqcqcrmunTDVZOUI\n", level);</div><div class='hunk'>@@ -125,14 +109,25 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> 	printk("%sFPER1: %08x\n", level, s.sw[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* here we'll print fr0 again, tho it'll be meaningless */</div><div class='del'>-	for (i = 0; i &lt; 32; i += 4) {</div><div class='del'>-		int j;</div><div class='del'>-		p = buf;</div><div class='del'>-		p += sprintf(p, "%sfr%02d-%02d ", level, i, i + 3);</div><div class='del'>-		for (j = 0; j &lt; 4; j++)</div><div class='del'>-			p += sprintf(p, " %016llx", (i+j) == 0 ? 0 : regs-&gt;fr[i+j]);</div><div class='del'>-		printk("%s\n", buf);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; 32; i += 4)</div><div class='add'>+		PRINTREGS(level, regs-&gt;fr, "fr", FFMT, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_regs(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	char *level;</div><div class='add'>+	unsigned long cr30, cr31;</div><div class='add'>+</div><div class='add'>+	level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;</div><div class='add'>+</div><div class='add'>+	print_gr(level, regs);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i += 4)</div><div class='add'>+		PRINTREGS(level, regs-&gt;sr, "sr", RFMT, i);</div><div class='add'>+</div><div class='add'>+	if (user_mode(regs))</div><div class='add'>+		print_fr(level, regs);</div><div class='ctx'> </div><div class='ctx'> 	cr30 = mfctl(30);</div><div class='ctx'> 	cr31 = mfctl(31);</div><div class='head'>diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c<br/>index de0a1b21cb40..bd2230d6a2a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/unaligned.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/unaligned.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/unaligned.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -43,6 +42,8 @@</div><div class='ctx'> 	"\tldil L%%" #lbl ", %%r1\n"			\</div><div class='ctx'> 	"\tldo R%%" #lbl "(%%r1), %%r1\n"		\</div><div class='ctx'> 	"\tbv,n %%r0(%%r1)\n"</div><div class='add'>+/* If you use FIXUP_BRANCH, then you must list this clobber */</div><div class='add'>+#define FIXUP_BRANCH_CLOBBER "r1"</div><div class='ctx'> </div><div class='ctx'> /* 1111 1100 0000 0000 0001 0011 1100 0000 */</div><div class='ctx'> #define OPCODE1(a,b,c)	((a)&lt;&lt;26|(b)&lt;&lt;12|(c)&lt;&lt;6) </div><div class='hunk'>@@ -157,7 +158,7 @@ static int emulate_ldh(struct pt_regs *regs, int toreg)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (val), "=r" (ret)</div><div class='ctx'> 	: "0" (val), "r" (saddr), "r" (regs-&gt;isr)</div><div class='del'>-	: "r20" );</div><div class='add'>+	: "r20", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> </div><div class='ctx'> 	DPRINTF("val = 0x" RFMT "\n", val);</div><div class='ctx'> </div><div class='hunk'>@@ -202,7 +203,7 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (val), "=r" (ret)</div><div class='ctx'> 	: "0" (val), "r" (saddr), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19", "r20" );</div><div class='add'>+	: "r19", "r20", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> </div><div class='ctx'> 	DPRINTF("val = 0x" RFMT "\n", val);</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +254,7 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (val), "=r" (ret)</div><div class='ctx'> 	: "0" (val), "r" (saddr), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19", "r20" );</div><div class='add'>+	: "r19", "r20", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> #else</div><div class='ctx'>     {</div><div class='ctx'> 	unsigned long valh=0,vall=0;</div><div class='hunk'>@@ -287,7 +288,7 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (valh), "=r" (vall), "=r" (ret)</div><div class='ctx'> 	: "0" (valh), "1" (vall), "r" (saddr), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19", "r20" );</div><div class='add'>+	: "r19", "r20", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> 	val=((__u64)valh&lt;&lt;32)|(__u64)vall;</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -335,7 +336,7 @@ static int emulate_sth(struct pt_regs *regs, int frreg)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (ret)</div><div class='ctx'> 	: "r" (val), "r" (regs-&gt;ior), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19" );</div><div class='add'>+	: "r19", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -389,7 +390,7 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (ret)</div><div class='ctx'> 	: "r" (val), "r" (regs-&gt;ior), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19", "r20", "r21", "r22", "r1" );</div><div class='add'>+	: "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -450,7 +451,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (ret)</div><div class='ctx'> 	: "r" (val), "r" (regs-&gt;ior), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19", "r20", "r21", "r22", "r1" );</div><div class='add'>+	: "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'> #else</div><div class='ctx'>     {</div><div class='ctx'> 	unsigned long valh=(val&gt;&gt;32),vall=(val&amp;0xffffffffl);</div><div class='hunk'>@@ -495,7 +496,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)</div><div class='ctx'> "	.previous\n"</div><div class='ctx'> 	: "=r" (ret)</div><div class='ctx'> 	: "r" (valh), "r" (vall), "r" (regs-&gt;ior), "r" (regs-&gt;isr)</div><div class='del'>-	: "r19", "r20", "r21", "r1" );</div><div class='add'>+	: "r19", "r20", "r21", "r1", FIXUP_BRANCH_CLOBBER );</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c<br/>index cc1c1afc3187..920bdbf8404f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/unwind.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/unwind.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/unwind.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/unwind.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * understand what is happening here</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S<br/>index 94dcc03a28ed..9989495a51dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *    along with this program; if not, write to the Free Software</div><div class='ctx'>  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> /* needed for the processor specific cache alignment size */	</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='head'>diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c<br/>index 90f400b10282..f352666b5b2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/lib/bitops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/lib/bitops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/lib/bitops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/lib/bitops.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright 2000 Grant Grundler (grundler@cup.hp.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S<br/>index e0661c2978ed..ecce3d35401f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/lib/fixup.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/lib/fixup.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/lib/fixup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/lib/fixup.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  * Fixup routines for kernel exception handling.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/assembly.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c<br/>index b7098035321f..5575e41f9d60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/lib/memcpy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/lib/memcpy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/lib/memcpy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/lib/memcpy.c</a></div><div class='hunk'>@@ -53,7 +53,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c<br/>index 631712562656..f2b96f1e0da7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/parisc/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/parisc/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/parisc/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/parisc/mm/init.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -28,6 +27,7 @@</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/pdc_chassis.h&gt;</div><div class='ctx'> #include &lt;asm/mmzone.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='hunk'>@@ -418,11 +418,10 @@ void free_initmem(void)</div><div class='ctx'> #ifdef CONFIG_DEBUG_RODATA</div><div class='ctx'> void mark_rodata_ro(void)</div><div class='ctx'> {</div><div class='del'>-	extern char __start_rodata, __end_rodata;</div><div class='ctx'> 	/* rodata memory was already mapped with KERNEL_RO access rights by</div><div class='ctx'>            pagetable_init() and map_pages(). No need to do additional stuff here */</div><div class='ctx'> 	printk (KERN_INFO "Write protecting the kernel read-only data: %luk\n",</div><div class='del'>-		(unsigned long)(&amp;__end_rodata - &amp;__start_rodata) &gt;&gt; 10);</div><div class='add'>+		(unsigned long)(__end_rodata - __start_rodata) &gt;&gt; 10);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig<br/>index 6729c98b66f9..2643dbc3f289 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/Kconfig</a></div><div class='hunk'>@@ -30,6 +30,10 @@ config GENERIC_HARDIRQS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config IRQ_PER_CPU</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -45,6 +49,10 @@ config GENERIC_CALIBRATE_DELAY</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config GENERIC_FIND_NEXT_BIT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config PPC</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -137,6 +145,15 @@ config PPC_85xx</div><div class='ctx'> 	select FSL_SOC</div><div class='ctx'> 	select 85xx</div><div class='ctx'> </div><div class='add'>+config PPC_86xx</div><div class='add'>+	bool "Freescale 86xx"</div><div class='add'>+	select 6xx</div><div class='add'>+	select FSL_SOC</div><div class='add'>+	select PPC_FPU</div><div class='add'>+	select ALTIVEC</div><div class='add'>+	help</div><div class='add'>+	  The Freescale E600 SoCs have 74xx cores.</div><div class='add'>+</div><div class='ctx'> config 40x</div><div class='ctx'> 	bool "AMCC 40x"</div><div class='ctx'> </div><div class='hunk'>@@ -323,7 +340,7 @@ config PPC_ISERIES</div><div class='ctx'> </div><div class='ctx'> config EMBEDDED6xx</div><div class='ctx'> 	bool "Embedded 6xx/7xx/7xxx-based board"</div><div class='del'>-	depends on PPC32 &amp;&amp; BROKEN</div><div class='add'>+	depends on PPC32 &amp;&amp; (BROKEN||BROKEN_ON_SMP)</div><div class='ctx'> </div><div class='ctx'> config APUS</div><div class='ctx'> 	bool "Amiga-APUS"</div><div class='hunk'>@@ -336,7 +353,7 @@ endchoice</div><div class='ctx'> </div><div class='ctx'> config PPC_PSERIES</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM &amp;&amp; PPC64</div><div class='del'>-	bool "  IBM pSeries &amp; new (POWER5-based) iSeries"</div><div class='add'>+	bool "IBM pSeries &amp; new (POWER5-based) iSeries"</div><div class='ctx'> 	select PPC_I8259</div><div class='ctx'> 	select PPC_RTAS</div><div class='ctx'> 	select RTAS_ERROR_LOGGING</div><div class='hunk'>@@ -344,7 +361,7 @@ config PPC_PSERIES</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config PPC_CHRP</div><div class='del'>-	bool "  Common Hardware Reference Platform (CHRP) based machines"</div><div class='add'>+	bool "Common Hardware Reference Platform (CHRP) based machines"</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM &amp;&amp; PPC32</div><div class='ctx'> 	select PPC_I8259</div><div class='ctx'> 	select PPC_INDIRECT_PCI</div><div class='hunk'>@@ -354,7 +371,7 @@ config PPC_CHRP</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config PPC_PMAC</div><div class='del'>-	bool "  Apple PowerMac based machines"</div><div class='add'>+	bool "Apple PowerMac based machines"</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM</div><div class='ctx'> 	select PPC_INDIRECT_PCI if PPC32</div><div class='ctx'> 	select PPC_MPC106 if PPC32</div><div class='hunk'>@@ -370,7 +387,7 @@ config PPC_PMAC64</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config PPC_PREP</div><div class='del'>-	bool "  PowerPC Reference Platform (PReP) based machines"</div><div class='add'>+	bool "PowerPC Reference Platform (PReP) based machines"</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM &amp;&amp; PPC32 &amp;&amp; BROKEN</div><div class='ctx'> 	select PPC_I8259</div><div class='ctx'> 	select PPC_INDIRECT_PCI</div><div class='hunk'>@@ -379,7 +396,7 @@ config PPC_PREP</div><div class='ctx'> </div><div class='ctx'> config PPC_MAPLE</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM &amp;&amp; PPC64</div><div class='del'>-	bool "  Maple 970FX Evaluation Board"</div><div class='add'>+	bool "Maple 970FX Evaluation Board"</div><div class='ctx'> 	select U3_DART</div><div class='ctx'> 	select MPIC_BROKEN_U3</div><div class='ctx'> 	select GENERIC_TBSYNC</div><div class='hunk'>@@ -391,11 +408,26 @@ config PPC_MAPLE</div><div class='ctx'> 	  For more informations, refer to &lt;http://www.970eval.com&gt;</div><div class='ctx'> </div><div class='ctx'> config PPC_CELL</div><div class='del'>-	bool "  Cell Broadband Processor Architecture"</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config PPC_CELL_NATIVE</div><div class='add'>+	bool</div><div class='add'>+	select PPC_CELL</div><div class='add'>+	default n</div><div class='add'>+</div><div class='add'>+config PPC_IBM_CELL_BLADE</div><div class='add'>+	bool "IBM Cell Blade"</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM &amp;&amp; PPC64</div><div class='add'>+	select PPC_CELL_NATIVE</div><div class='ctx'> 	select PPC_RTAS</div><div class='ctx'> 	select MMIO_NVRAM</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='add'>+	select UDBG_RTAS_CONSOLE</div><div class='add'>+</div><div class='add'>+config UDBG_RTAS_CONSOLE</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='ctx'> </div><div class='ctx'> config XICS</div><div class='ctx'> 	depends on PPC_PSERIES</div><div class='hunk'>@@ -408,7 +440,8 @@ config U3_DART</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='ctx'> config MPIC</div><div class='del'>-	depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE || PPC_CHRP</div><div class='add'>+	depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE || PPC_CHRP \</div><div class='add'>+			       || MPC7448HPC2</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='hunk'>@@ -439,11 +472,6 @@ config MPIC_BROKEN_U3</div><div class='ctx'> 	depends on PPC_MAPLE</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config CELL_IIC</div><div class='del'>-	depends on PPC_CELL</div><div class='del'>-	bool</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config IBMVIO</div><div class='ctx'> 	depends on PPC_PSERIES || PPC_ISERIES</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -539,12 +567,20 @@ config TAU_AVERAGE</div><div class='ctx'> 	  /proc/cpuinfo.</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N here.</div><div class='add'>+</div><div class='add'>+config PPC_TODC</div><div class='add'>+	depends on EMBEDDED6xx</div><div class='add'>+	bool "Generic Time-of-day Clock (TODC) support"</div><div class='add'>+	---help---</div><div class='add'>+	  This adds support for many TODC/RTC chips.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> source arch/powerpc/platforms/embedded6xx/Kconfig</div><div class='ctx'> source arch/powerpc/platforms/4xx/Kconfig</div><div class='ctx'> source arch/powerpc/platforms/83xx/Kconfig</div><div class='ctx'> source arch/powerpc/platforms/85xx/Kconfig</div><div class='add'>+source arch/powerpc/platforms/86xx/Kconfig</div><div class='ctx'> source arch/powerpc/platforms/8xx/Kconfig</div><div class='ctx'> source arch/powerpc/platforms/cell/Kconfig</div><div class='ctx'> </div><div class='hunk'>@@ -599,16 +635,19 @@ config HOTPLUG_CPU</div><div class='ctx'> </div><div class='ctx'> 	  Say N if you are unsure.</div><div class='ctx'> </div><div class='add'>+config ARCH_ENABLE_MEMORY_HOTPLUG</div><div class='add'>+	def_bool y</div><div class='add'>+</div><div class='ctx'> config KEXEC</div><div class='ctx'> 	bool "kexec system call (EXPERIMENTAL)"</div><div class='ctx'> 	depends on PPC_MULTIPLATFORM &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  kexec is a system call that implements the ability to shutdown your</div><div class='ctx'> 	  current kernel, and to start another kernel.  It is like a reboot</div><div class='del'>-	  but it is indepedent of the system firmware.   And like a reboot</div><div class='add'>+	  but it is independent of the system firmware.   And like a reboot</div><div class='ctx'> 	  you can start any kernel with it, not just Linux.</div><div class='ctx'> </div><div class='del'>-	  The name comes from the similiarity to the exec system call.</div><div class='add'>+	  The name comes from the similarity to the exec system call.</div><div class='ctx'> </div><div class='ctx'> 	  It is an ongoing process to be certain the hardware in a machine</div><div class='ctx'> 	  is properly shutdown, so do not be surprised if this code does not</div><div class='hunk'>@@ -699,7 +738,6 @@ config PPC_64K_PAGES</div><div class='ctx'> config SCHED_SMT</div><div class='ctx'> 	bool "SMT (Hyperthreading) scheduler support"</div><div class='ctx'> 	depends on PPC64 &amp;&amp; SMP</div><div class='del'>-	default off</div><div class='ctx'> 	help</div><div class='ctx'> 	  SMT scheduler support improves the CPU scheduler's decision making</div><div class='ctx'> 	  when dealing with POWER5 cpus at a cost of slightly increased</div><div class='hunk'>@@ -798,8 +836,9 @@ config MCA</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='ctx'> config PCI</div><div class='del'>-	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED &amp;&amp; PPC_ISERIES)</div><div class='del'>-	default y if !40x &amp;&amp; !CPM2 &amp;&amp; !8xx &amp;&amp; !APUS &amp;&amp; !PPC_83xx &amp;&amp; !PPC_85xx</div><div class='add'>+	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED &amp;&amp; PPC_ISERIES) \</div><div class='add'>+				  || MPC7448HPC2</div><div class='add'>+	default y if !40x &amp;&amp; !CPM2 &amp;&amp; !8xx &amp;&amp; !APUS &amp;&amp; !PPC_83xx &amp;&amp; !PPC_85xx &amp;&amp; !PPC_86xx</div><div class='ctx'> 	default PCI_PERMEDIA if !4xx &amp;&amp; !CPM2 &amp;&amp; !8xx &amp;&amp; APUS</div><div class='ctx'> 	default PCI_QSPAN if !4xx &amp;&amp; !CPM2 &amp;&amp; 8xx</div><div class='ctx'> 	help</div><div class='hunk'>@@ -827,12 +866,12 @@ config PCI_8260</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config 8260_PCI9</div><div class='del'>-	bool "  Enable workaround for MPC826x erratum PCI 9"</div><div class='add'>+	bool "Enable workaround for MPC826x erratum PCI 9"</div><div class='ctx'> 	depends on PCI_8260 &amp;&amp; !ADS8272</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='del'>-	prompt "  IDMA channel for PCI 9 workaround"</div><div class='add'>+	prompt "IDMA channel for PCI 9 workaround"</div><div class='ctx'> 	depends on 8260_PCI9</div><div class='ctx'> </div><div class='ctx'> config 8260_PCI9_IDMA1</div><div class='hunk'>@@ -849,6 +888,8 @@ config 8260_PCI9_IDMA4</div><div class='ctx'> </div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='add'>+source "drivers/pci/pcie/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/pci/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/pcmcia/Kconfig"</div><div class='head'>diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug<br/>index 8d48e9e7162a..e29ef77d3b00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/Kconfig.debug</a></div><div class='hunk'>@@ -110,13 +110,16 @@ config SERIAL_TEXT_DEBUG</div><div class='ctx'> 	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \</div><div class='ctx'> 		PPC_GEN550 || PPC_MPC52xx</div><div class='ctx'> </div><div class='add'>+config PPC_EARLY_DEBUG</div><div class='add'>+	bool "Early debugging (dangerous)"</div><div class='add'>+</div><div class='ctx'> choice</div><div class='del'>-	prompt "Early debugging (dangerous)"</div><div class='del'>-	bool</div><div class='del'>-	optional</div><div class='add'>+	prompt "Early debugging console"</div><div class='add'>+	depends on PPC_EARLY_DEBUG</div><div class='ctx'> 	help</div><div class='del'>-	  Enable early debugging. Careful, if you enable debugging for the</div><div class='del'>-	  wrong type of machine your kernel _will not boot_.</div><div class='add'>+	  Use the selected console for early debugging. Careful, if you</div><div class='add'>+	  enable debugging for the wrong type of machine your kernel</div><div class='add'>+	  _will not boot_.</div><div class='ctx'> </div><div class='ctx'> config PPC_EARLY_DEBUG_LPAR</div><div class='ctx'> 	bool "LPAR HV Console"</div><div class='hunk'>@@ -131,12 +134,19 @@ config PPC_EARLY_DEBUG_G5</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this to enable early debugging for Apple G5 machines.</div><div class='ctx'> </div><div class='del'>-config PPC_EARLY_DEBUG_RTAS</div><div class='add'>+config PPC_EARLY_DEBUG_RTAS_PANEL</div><div class='ctx'> 	bool "RTAS Panel"</div><div class='ctx'> 	depends on PPC_RTAS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select this to enable early debugging via the RTAS panel.</div><div class='ctx'> </div><div class='add'>+config PPC_EARLY_DEBUG_RTAS_CONSOLE</div><div class='add'>+	bool "RTAS Console"</div><div class='add'>+	depends on PPC_RTAS</div><div class='add'>+	select UDBG_RTAS_CONSOLE</div><div class='add'>+	help</div><div class='add'>+	  Select this to enable early debugging via the RTAS console.</div><div class='add'>+</div><div class='ctx'> config PPC_EARLY_DEBUG_MAPLE</div><div class='ctx'> 	bool "Maple real mode"</div><div class='ctx'> 	depends on PPC_MAPLE</div><div class='head'>diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile<br/>index ed5b26aa8be3..01667d1d571d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/Makefile</a></div><div class='hunk'>@@ -108,7 +108,6 @@ ifeq ($(CONFIG_6xx),y)</div><div class='ctx'> CFLAGS		+= -mcpu=powerpc</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-cpu-as-$(CONFIG_PPC64BRIDGE)	+= -Wa,-mppc64bridge</div><div class='ctx'> cpu-as-$(CONFIG_4xx)		+= -Wa,-m405</div><div class='ctx'> cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec</div><div class='ctx'> cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec</div><div class='head'>diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile<br/>index 840ae595a617..d961bfeed05f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/boot/Makefile</a></div><div class='hunk'>@@ -29,8 +29,8 @@ OBJCOPYFLAGS    := contents,alloc,load,readonly,data</div><div class='ctx'> OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000</div><div class='ctx'> OBJCOPY_MIB_ARGS  := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment</div><div class='ctx'> </div><div class='del'>-zlib       := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c</div><div class='del'>-zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h</div><div class='add'>+zlib       := inffast.c inflate.c inftrees.c</div><div class='add'>+zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h</div><div class='ctx'> zliblinuxheader := zlib.h zconf.h zutil.h</div><div class='ctx'> </div><div class='ctx'> $(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))</div><div class='head'>diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c<br/>index 816446f0e497..b66634c9ea34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/boot/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/boot/main.c</a></div><div class='hunk'>@@ -33,6 +33,14 @@ extern char _vmlinux_end[];</div><div class='ctx'> extern char _initrd_start[];</div><div class='ctx'> extern char _initrd_end[];</div><div class='ctx'> </div><div class='add'>+/* A buffer that may be edited by tools operating on a zImage binary so as to</div><div class='add'>+ * edit the command line passed to vmlinux (by setting /chosen/bootargs).</div><div class='add'>+ * The buffer is put in it's own section so that tools may locate it easier.</div><div class='add'>+ */</div><div class='add'>+static char builtin_cmdline[512]</div><div class='add'>+	__attribute__((section("__builtin_cmdline")));</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> struct addr_range {</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> 	unsigned long size;</div><div class='hunk'>@@ -204,6 +212,23 @@ static int is_elf32(void *hdr)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void export_cmdline(void* chosen_handle)</div><div class='add'>+{</div><div class='add'>+        int len;</div><div class='add'>+        char cmdline[2] = { 0, 0 };</div><div class='add'>+</div><div class='add'>+	if (builtin_cmdline[0] == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+        len = getprop(chosen_handle, "bootargs", cmdline, sizeof(cmdline));</div><div class='add'>+        if (len &gt; 0 &amp;&amp; cmdline[0] != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	setprop(chosen_handle, "bootargs", builtin_cmdline,</div><div class='add'>+		strlen(builtin_cmdline) + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)</div><div class='ctx'> {</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -289,6 +314,8 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)</div><div class='ctx'> 		memmove((void *)vmlinux.addr,(void *)vmlinuz.addr,vmlinuz.size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	export_cmdline(chosen_handle);</div><div class='add'>+</div><div class='ctx'> 	/* Skip over the ELF header */</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printf("... skipping 0x%lx bytes of ELF header\n\r",</div><div class='head'>diff --git a/arch/powerpc/boot/prom.h b/arch/powerpc/boot/prom.h<br/>index 3e2ddd4a5a81..a57b184c564f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/boot/prom.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/boot/prom.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/boot/prom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/boot/prom.h</a></div><div class='hunk'>@@ -31,4 +31,11 @@ static inline int getprop(void *phandle, const char *name,</div><div class='ctx'> 	return call_prom("getprop", 4, 1, phandle, name, buf, buflen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static inline int setprop(void *phandle, const char *name,</div><div class='add'>+			  void *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	return call_prom("setprop", 4, 1, phandle, name, buf, buflen);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif				/* _PPC_BOOT_PROM_H_ */</div><div class='head'>diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig<br/>index dbe421dc3c11..e028a2ecb8a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/cell_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/cell_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/cell_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/cell_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.16</div><div class='del'>-# Thu Mar 23 20:48:09 2006</div><div class='add'>+# Linux kernel version: 2.6.17-rc6</div><div class='add'>+# Thu Jun 22 15:28:36 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> CONFIG_64BIT=y</div><div class='hunk'>@@ -11,6 +11,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='ctx'> CONFIG_COMPAT=y</div><div class='hunk'>@@ -55,7 +56,7 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='del'>-# CONFIG_CPUSETS is not set</div><div class='add'>+CONFIG_CPUSETS=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='hunk'>@@ -116,13 +117,15 @@ CONFIG_PPC_MULTIPLATFORM=y</div><div class='ctx'> # CONFIG_PPC_PMAC is not set</div><div class='ctx'> # CONFIG_PPC_MAPLE is not set</div><div class='ctx'> CONFIG_PPC_CELL=y</div><div class='add'>+CONFIG_PPC_CELL_NATIVE=y</div><div class='add'>+CONFIG_PPC_IBM_CELL_BLADE=y</div><div class='add'>+CONFIG_PPC_SYSTEMSIM=y</div><div class='ctx'> # CONFIG_U3_DART is not set</div><div class='ctx'> CONFIG_PPC_RTAS=y</div><div class='ctx'> # CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='ctx'> CONFIG_RTAS_PROC=y</div><div class='ctx'> CONFIG_RTAS_FLASH=y</div><div class='ctx'> CONFIG_MMIO_NVRAM=y</div><div class='del'>-CONFIG_CELL_IIC=y</div><div class='ctx'> # CONFIG_PPC_MPC106 is not set</div><div class='ctx'> # CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='hunk'>@@ -132,7 +135,9 @@ CONFIG_CELL_IIC=y</div><div class='ctx'> # Cell Broadband Engine options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SPU_FS=m</div><div class='add'>+CONFIG_SPU_BASE=y</div><div class='ctx'> CONFIG_SPUFS_MMAP=y</div><div class='add'>+CONFIG_CBE_RAS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel options</div><div class='hunk'>@@ -152,20 +157,24 @@ CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> CONFIG_KEXEC=y</div><div class='ctx'> # CONFIG_CRASH_DUMP is not set</div><div class='ctx'> CONFIG_IRQ_ALL_CPUS=y</div><div class='del'>-# CONFIG_NUMA is not set</div><div class='add'>+CONFIG_NUMA=y</div><div class='add'>+CONFIG_NODES_SHIFT=4</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='del'>-CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='ctx'> CONFIG_SELECT_MEMORY_MODEL=y</div><div class='ctx'> # CONFIG_FLATMEM_MANUAL is not set</div><div class='ctx'> # CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='ctx'> CONFIG_SPARSEMEM_MANUAL=y</div><div class='ctx'> CONFIG_SPARSEMEM=y</div><div class='add'>+CONFIG_NEED_MULTIPLE_NODES=y</div><div class='ctx'> CONFIG_HAVE_MEMORY_PRESENT=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPARSEMEM_EXTREME=y</div><div class='del'>-# CONFIG_MEMORY_HOTPLUG is not set</div><div class='add'>+CONFIG_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_MIGRATION=y</div><div class='add'>+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y</div><div class='add'>+CONFIG_ARCH_MEMORY_PROBE=y</div><div class='ctx'> # CONFIG_PPC_64K_PAGES is not set</div><div class='ctx'> CONFIG_SCHED_SMT=y</div><div class='ctx'> CONFIG_PROC_DEVICETREE=y</div><div class='hunk'>@@ -182,6 +191,7 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> # CONFIG_PPC_INDIRECT_PCI is not set</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='add'>+CONFIG_PCIEPORTBUS=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -476,7 +486,7 @@ CONFIG_DM_MULTIPATH=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='ctx'> # CONFIG_DUMMY is not set</div><div class='del'>-# CONFIG_BONDING is not set</div><div class='add'>+CONFIG_BONDING=y</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='ctx'> # CONFIG_TUN is not set</div><div class='ctx'> </div><div class='hunk'>@@ -624,6 +634,7 @@ CONFIG_SERIAL_NONSTANDARD=y</div><div class='ctx'> # CONFIG_N_HDLC is not set</div><div class='ctx'> # CONFIG_SPECIALIX is not set</div><div class='ctx'> # CONFIG_SX is not set</div><div class='add'>+# CONFIG_RIO is not set</div><div class='ctx'> # CONFIG_STALDRV is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -766,6 +777,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -1051,14 +1063,11 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_DEBUG_STACKOVERFLOW is not set</div><div class='ctx'> # CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> CONFIG_DEBUGGER=y</div><div class='del'>-# CONFIG_XMON is not set</div><div class='add'>+CONFIG_XMON=y</div><div class='add'>+CONFIG_XMON_DEFAULT=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_LPAR is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_G5 is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_RTAS is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig<br/>new file mode 100644<br/>index 000000000000..0fa010a63a8e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/chrp32_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/chrp32_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1378 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17</div><div class='add'>+# Mon Jul  3 12:08:41 2006</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+CONFIG_GENERIC_TBSYNC=y</div><div class='add'>+# CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+# CONFIG_PPC_52xx is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_8xx is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_NR_CPUS=4</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+CONFIG_POSIX_MQUEUE=y</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+# CONFIG_CPUSETS is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+# CONFIG_EMBEDDED is not set</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+CONFIG_KMOD=y</div><div class='add'>+CONFIG_STOP_MACHINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+CONFIG_PPC_MULTIPLATFORM=y</div><div class='add'>+# CONFIG_PPC_ISERIES is not set</div><div class='add'>+# CONFIG_EMBEDDED6xx is not set</div><div class='add'>+# CONFIG_APUS is not set</div><div class='add'>+CONFIG_PPC_CHRP=y</div><div class='add'>+# CONFIG_PPC_PMAC is not set</div><div class='add'>+# CONFIG_PPC_CELL is not set</div><div class='add'>+# CONFIG_PPC_CELL_NATIVE is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='add'>+CONFIG_PPC_RTAS=y</div><div class='add'>+# CONFIG_RTAS_ERROR_LOGGING is not set</div><div class='add'>+CONFIG_RTAS_PROC=y</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+CONFIG_PPC_MPC106=y</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='add'>+# CONFIG_WANT_EARLY_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_PREEMPT_BKL=y</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+# CONFIG_KEXEC is not set</div><div class='add'>+CONFIG_IRQ_ALL_CPUS=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_ISA=y</div><div class='add'>+CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM_START=0xfe000000</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_TASK_SIZE=0x80000000</div><div class='add'>+CONFIG_BOOT_LOAD=0x00800000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+# CONFIG_IP_PNP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Virtual Server Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_VS is not set</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+CONFIG_NETFILTER=y</div><div class='add'>+# CONFIG_NETFILTER_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Core Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETFILTER_NETLINK is not set</div><div class='add'>+# CONFIG_NETFILTER_XTABLES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IP: Netfilter Configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_IP_NF_CONNTRACK=m</div><div class='add'>+# CONFIG_IP_NF_CT_ACCT is not set</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK_MARK is not set</div><div class='add'>+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set</div><div class='add'>+# CONFIG_IP_NF_CT_PROTO_SCTP is not set</div><div class='add'>+CONFIG_IP_NF_FTP=m</div><div class='add'>+CONFIG_IP_NF_IRC=m</div><div class='add'>+# CONFIG_IP_NF_NETBIOS_NS is not set</div><div class='add'>+CONFIG_IP_NF_TFTP=m</div><div class='add'>+CONFIG_IP_NF_AMANDA=m</div><div class='add'>+# CONFIG_IP_NF_PPTP is not set</div><div class='add'>+# CONFIG_IP_NF_H323 is not set</div><div class='add'>+# CONFIG_IP_NF_SIP is not set</div><div class='add'>+# CONFIG_IP_NF_QUEUE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+# CONFIG_STANDALONE is not set</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PNP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_FD=y</div><div class='add'>+# CONFIG_BLK_DEV_XD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=4096</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+CONFIG_BLK_DEV_IDE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDISK=y</div><div class='add'>+CONFIG_IDEDISK_MULTI_MODE=y</div><div class='add'>+CONFIG_BLK_DEV_IDECD=y</div><div class='add'>+# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDESCSI is not set</div><div class='add'>+# CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IDE chipset support/bugfixes</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE_GENERIC=y</div><div class='add'>+CONFIG_BLK_DEV_IDEPCI=y</div><div class='add'>+CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='add'>+# CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='add'>+CONFIG_BLK_DEV_GENERIC=y</div><div class='add'>+# CONFIG_BLK_DEV_OPTI621 is not set</div><div class='add'>+CONFIG_BLK_DEV_SL82C105=y</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set</div><div class='add'>+CONFIG_IDEDMA_PCI_AUTO=y</div><div class='add'>+# CONFIG_IDEDMA_ONLYDISK is not set</div><div class='add'>+# CONFIG_BLK_DEV_AEC62XX is not set</div><div class='add'>+# CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='add'>+# CONFIG_BLK_DEV_AMD74XX is not set</div><div class='add'>+# CONFIG_BLK_DEV_CMD64X is not set</div><div class='add'>+# CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='add'>+# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='add'>+# CONFIG_BLK_DEV_CS5520 is not set</div><div class='add'>+# CONFIG_BLK_DEV_CS5530 is not set</div><div class='add'>+# CONFIG_BLK_DEV_HPT34X is not set</div><div class='add'>+# CONFIG_BLK_DEV_HPT366 is not set</div><div class='add'>+# CONFIG_BLK_DEV_SC1200 is not set</div><div class='add'>+# CONFIG_BLK_DEV_PIIX is not set</div><div class='add'>+# CONFIG_BLK_DEV_IT821X is not set</div><div class='add'>+# CONFIG_BLK_DEV_NS87415 is not set</div><div class='add'>+# CONFIG_BLK_DEV_PDC202XX_OLD is not set</div><div class='add'>+# CONFIG_BLK_DEV_PDC202XX_NEW is not set</div><div class='add'>+# CONFIG_BLK_DEV_SVWKS is not set</div><div class='add'>+# CONFIG_BLK_DEV_SIIMAGE is not set</div><div class='add'>+# CONFIG_BLK_DEV_SLC90E66 is not set</div><div class='add'>+# CONFIG_BLK_DEV_TRM290 is not set</div><div class='add'>+CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='add'>+# CONFIG_IDE_ARM is not set</div><div class='add'>+# CONFIG_IDE_CHIPSETS is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA=y</div><div class='add'>+# CONFIG_IDEDMA_IVB is not set</div><div class='add'>+CONFIG_IDEDMA_AUTO=y</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+CONFIG_CHR_DEV_ST=y</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+CONFIG_BLK_DEV_SR=y</div><div class='add'>+CONFIG_BLK_DEV_SR_VENDOR=y</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+CONFIG_SCSI_CONSTANTS=y</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_SPI_ATTRS=y</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_7000FASST is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AHA152X is not set</div><div class='add'>+# CONFIG_SCSI_AHA1542 is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_SCSI_IN2000 is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+# CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_DTC3280 is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_GENERIC_NCR5380 is not set</div><div class='add'>+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_NCR53C406A is not set</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_2=y</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_MMIO=y</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_PAS16 is not set</div><div class='add'>+# CONFIG_SCSI_PSI240I is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_FAS is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C416 is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_T128 is not set</div><div class='add'>+# CONFIG_SCSI_U14_34F is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Old CD-ROM drivers (not SCSI, not IDE)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CD_NO_IDESCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+# CONFIG_FUSION_SPI is not set</div><div class='add'>+# CONFIG_FUSION_FC is not set</div><div class='add'>+# CONFIG_FUSION_SAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Macintosh device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_WINDFARM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHYLIB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+# CONFIG_LANCE is not set</div><div class='add'>+# CONFIG_NET_VENDOR_SMC is not set</div><div class='add'>+# CONFIG_NET_VENDOR_RACAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Tulip family network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_TULIP=y</div><div class='add'>+# CONFIG_DE2104X is not set</div><div class='add'>+# CONFIG_TULIP is not set</div><div class='add'>+CONFIG_DE4X5=y</div><div class='add'>+# CONFIG_WINBOND_840 is not set</div><div class='add'>+# CONFIG_DM9102 is not set</div><div class='add'>+# CONFIG_ULI526X is not set</div><div class='add'>+# CONFIG_AT1700 is not set</div><div class='add'>+# CONFIG_DEPCA is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_NET_ISA is not set</div><div class='add'>+CONFIG_NET_PCI=y</div><div class='add'>+CONFIG_PCNET32=y</div><div class='add'>+# CONFIG_AMD8111_ETH is not set</div><div class='add'>+# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='add'>+# CONFIG_AC3200 is not set</div><div class='add'>+# CONFIG_APRICOT is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_FORCEDETH is not set</div><div class='add'>+# CONFIG_CS89x0 is not set</div><div class='add'>+# CONFIG_DGRS is not set</div><div class='add'>+# CONFIG_EEPRO100 is not set</div><div class='add'>+# CONFIG_E100 is not set</div><div class='add'>+# CONFIG_FEALNX is not set</div><div class='add'>+# CONFIG_NATSEMI is not set</div><div class='add'>+# CONFIG_NE2K_PCI is not set</div><div class='add'>+CONFIG_8139CP=y</div><div class='add'>+CONFIG_8139TOO=y</div><div class='add'>+# CONFIG_8139TOO_PIO is not set</div><div class='add'>+# CONFIG_8139TOO_TUNE_TWISTER is not set</div><div class='add'>+# CONFIG_8139TOO_8129 is not set</div><div class='add'>+# CONFIG_8139_OLD_RX_RESET is not set</div><div class='add'>+# CONFIG_SIS900 is not set</div><div class='add'>+# CONFIG_EPIC100 is not set</div><div class='add'>+# CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='add'>+CONFIG_VIA_RHINE=y</div><div class='add'>+# CONFIG_VIA_RHINE_MMIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_MV643XX_ETH=y</div><div class='add'>+# CONFIG_MV643XX_ETH_0 is not set</div><div class='add'>+# CONFIG_MV643XX_ETH_1 is not set</div><div class='add'>+# CONFIG_MV643XX_ETH_2 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+CONFIG_PPP=m</div><div class='add'>+CONFIG_PPP_MULTILINK=y</div><div class='add'>+CONFIG_PPP_FILTER=y</div><div class='add'>+CONFIG_PPP_ASYNC=m</div><div class='add'>+CONFIG_PPP_SYNC_TTY=m</div><div class='add'>+CONFIG_PPP_DEFLATE=m</div><div class='add'>+CONFIG_PPP_BSDCOMP=m</div><div class='add'>+CONFIG_PPP_MPPE=m</div><div class='add'>+CONFIG_PPPOE=m</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_MOUSEDEV=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_PSAUX=y</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024</div><div class='add'>+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+CONFIG_INPUT_EVDEV=y</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT_KEYBOARD=y</div><div class='add'>+CONFIG_KEYBOARD_ATKBD=y</div><div class='add'>+# CONFIG_KEYBOARD_SUNKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_LKKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_XTKBD is not set</div><div class='add'>+# CONFIG_KEYBOARD_NEWTON is not set</div><div class='add'>+CONFIG_INPUT_MOUSE=y</div><div class='add'>+CONFIG_MOUSE_PS2=y</div><div class='add'>+# CONFIG_MOUSE_SERIAL is not set</div><div class='add'>+# CONFIG_MOUSE_INPORT is not set</div><div class='add'>+# CONFIG_MOUSE_LOGIBM is not set</div><div class='add'>+# CONFIG_MOUSE_PC110PAD is not set</div><div class='add'>+# CONFIG_MOUSE_VSXXXAA is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+CONFIG_INPUT_MISC=y</div><div class='add'>+# CONFIG_INPUT_PCSPKR is not set</div><div class='add'>+CONFIG_INPUT_UINPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_I8042=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_PCIPS2 is not set</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+# CONFIG_HVC_RTAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+CONFIG_NVRAM=y</div><div class='add'>+CONFIG_GEN_RTC=y</div><div class='add'>+# CONFIG_GEN_RTC_X is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C_ALGOBIT=y</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_HYDRA is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+# CONFIG_I2C_MPC is not set</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_PROSAVAGE is not set</div><div class='add'>+# CONFIG_I2C_SAVAGE4 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_M41T00 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+CONFIG_FB=y</div><div class='add'>+CONFIG_FB_CFB_FILLRECT=y</div><div class='add'>+CONFIG_FB_CFB_COPYAREA=y</div><div class='add'>+CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='add'>+CONFIG_FB_MACMODES=y</div><div class='add'>+CONFIG_FB_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='add'>+CONFIG_FB_MODE_HELPERS=y</div><div class='add'>+CONFIG_FB_TILEBLITTING=y</div><div class='add'>+# CONFIG_FB_CIRRUS is not set</div><div class='add'>+# CONFIG_FB_PM2 is not set</div><div class='add'>+# CONFIG_FB_CYBER2000 is not set</div><div class='add'>+CONFIG_FB_OF=y</div><div class='add'>+# CONFIG_FB_CT65550 is not set</div><div class='add'>+# CONFIG_FB_ASILIANT is not set</div><div class='add'>+# CONFIG_FB_IMSTT is not set</div><div class='add'>+# CONFIG_FB_VGA16 is not set</div><div class='add'>+# CONFIG_FB_S1D13XXX is not set</div><div class='add'>+# CONFIG_FB_NVIDIA is not set</div><div class='add'>+# CONFIG_FB_RIVA is not set</div><div class='add'>+CONFIG_FB_MATROX=y</div><div class='add'>+CONFIG_FB_MATROX_MILLENIUM=y</div><div class='add'>+CONFIG_FB_MATROX_MYSTIQUE=y</div><div class='add'>+CONFIG_FB_MATROX_G=y</div><div class='add'>+# CONFIG_FB_MATROX_I2C is not set</div><div class='add'>+# CONFIG_FB_MATROX_MULTIHEAD is not set</div><div class='add'>+CONFIG_FB_RADEON=y</div><div class='add'>+CONFIG_FB_RADEON_I2C=y</div><div class='add'>+# CONFIG_FB_RADEON_DEBUG is not set</div><div class='add'>+# CONFIG_FB_ATY128 is not set</div><div class='add'>+CONFIG_FB_ATY=y</div><div class='add'>+CONFIG_FB_ATY_CT=y</div><div class='add'>+# CONFIG_FB_ATY_GENERIC_LCD is not set</div><div class='add'>+CONFIG_FB_ATY_GX=y</div><div class='add'>+# CONFIG_FB_SAVAGE is not set</div><div class='add'>+# CONFIG_FB_SIS is not set</div><div class='add'>+# CONFIG_FB_NEOMAGIC is not set</div><div class='add'>+# CONFIG_FB_KYRO is not set</div><div class='add'>+CONFIG_FB_3DFX=y</div><div class='add'>+# CONFIG_FB_3DFX_ACCEL is not set</div><div class='add'>+# CONFIG_FB_VOODOO1 is not set</div><div class='add'>+# CONFIG_FB_TRIDENT is not set</div><div class='add'>+# CONFIG_FB_VIRTUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+CONFIG_VGA_CONSOLE=y</div><div class='add'>+# CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='add'>+# CONFIG_MDA_CONSOLE is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+CONFIG_FRAMEBUFFER_CONSOLE=y</div><div class='add'>+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set</div><div class='add'>+# CONFIG_FONTS is not set</div><div class='add'>+CONFIG_FONT_8x8=y</div><div class='add'>+CONFIG_FONT_8x16=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Logo configuration</div><div class='add'>+#</div><div class='add'>+CONFIG_LOGO=y</div><div class='add'>+CONFIG_LOGO_LINUX_MONO=y</div><div class='add'>+CONFIG_LOGO_LINUX_VGA16=y</div><div class='add'>+CONFIG_LOGO_LINUX_CLUT224=y</div><div class='add'>+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_EHCI_HCD=m</div><div class='add'>+# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='add'>+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_USB_UHCI_HCD=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ONETOUCH is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_HID=y</div><div class='add'>+CONFIG_USB_HIDINPUT=y</div><div class='add'>+# CONFIG_USB_HIDINPUT_POWERBOOK is not set</div><div class='add'>+# CONFIG_HID_FF is not set</div><div class='add'>+# CONFIG_USB_HIDDEV is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_ISO9660_FS=y</div><div class='add'>+# CONFIG_JOLIET is not set</div><div class='add'>+# CONFIG_ZISOFS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_FAT_FS=m</div><div class='add'>+CONFIG_MSDOS_FS=m</div><div class='add'>+CONFIG_VFAT_FS=m</div><div class='add'>+CONFIG_FAT_DEFAULT_CODEPAGE=437</div><div class='add'>+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+# CONFIG_NFS_FS is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+CONFIG_MAC_PARTITION=y</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+CONFIG_NLS_ASCII=y</div><div class='add'>+CONFIG_NLS_ISO8859_1=m</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+CONFIG_CRC_CCITT=m</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_ZLIB_INFLATE=m</div><div class='add'>+CONFIG_ZLIB_DEFLATE=m</div><div class='add'>+CONFIG_TEXTSEARCH=y</div><div class='add'>+CONFIG_TEXTSEARCH_KMP=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Instrumentation Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=15</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+CONFIG_DEBUG_SPINLOCK_SLEEP=y</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_HIGHMEM is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+CONFIG_DEBUGGER=y</div><div class='add'>+CONFIG_XMON=y</div><div class='add'>+CONFIG_XMON_DEFAULT=y</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+# CONFIG_CRYPTO_MD5 is not set</div><div class='add'>+CONFIG_CRYPTO_SHA1=m</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+# CONFIG_CRYPTO_DES is not set</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+CONFIG_CRYPTO_ARC4=m</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='head'>diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig<br/>new file mode 100644<br/>index 000000000000..15a50f4ceb1f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc7448_hpc2_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/mpc7448_hpc2_defconfig</a></div><div class='hunk'>@@ -0,0 +1,923 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17-rc4</div><div class='add'>+# Sat May 27 18:45:55 2006</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+# CONFIG_GENERIC_TBSYNC is not set</div><div class='add'>+CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+CONFIG_CLASSIC32=y</div><div class='add'>+# CONFIG_PPC_52xx is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_8xx is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+# CONFIG_ALTIVEC is not set</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+# CONFIG_SMP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC_MULTIPLATFORM is not set</div><div class='add'>+# CONFIG_PPC_ISERIES is not set</div><div class='add'>+CONFIG_EMBEDDED6xx=y</div><div class='add'>+# CONFIG_APUS is not set</div><div class='add'>+CONFIG_MPIC=y</div><div class='add'>+# CONFIG_PPC_RTAS is not set</div><div class='add'>+# CONFIG_MMIO_NVRAM is not set</div><div class='add'>+# CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='add'>+# CONFIG_CPU_FREQ is not set</div><div class='add'>+# CONFIG_TAU is not set</div><div class='add'>+# CONFIG_KATANA is not set</div><div class='add'>+# CONFIG_WILLOW is not set</div><div class='add'>+# CONFIG_CPCI690 is not set</div><div class='add'>+# CONFIG_POWERPMC250 is not set</div><div class='add'>+# CONFIG_CHESTNUT is not set</div><div class='add'>+# CONFIG_SPRUCE is not set</div><div class='add'>+# CONFIG_HDPU is not set</div><div class='add'>+# CONFIG_EV64260 is not set</div><div class='add'>+# CONFIG_LOPEC is not set</div><div class='add'>+# CONFIG_MVME5100 is not set</div><div class='add'>+# CONFIG_PPLUS is not set</div><div class='add'>+# CONFIG_PRPMC750 is not set</div><div class='add'>+# CONFIG_PRPMC800 is not set</div><div class='add'>+# CONFIG_SANDPOINT is not set</div><div class='add'>+CONFIG_MPC7448HPC2=y</div><div class='add'>+# CONFIG_RADSTONE_PPC7D is not set</div><div class='add'>+# CONFIG_PAL4 is not set</div><div class='add'>+# CONFIG_GEMINI is not set</div><div class='add'>+# CONFIG_EST8260 is not set</div><div class='add'>+# CONFIG_SBC82xx is not set</div><div class='add'>+# CONFIG_SBS8260 is not set</div><div class='add'>+# CONFIG_RPX8260 is not set</div><div class='add'>+# CONFIG_TQM8260 is not set</div><div class='add'>+# CONFIG_ADS8272 is not set</div><div class='add'>+# CONFIG_PQ2FADS is not set</div><div class='add'>+# CONFIG_LITE5200 is not set</div><div class='add'>+# CONFIG_EV64360 is not set</div><div class='add'>+CONFIG_TSI108_BRIDGE=y</div><div class='add'>+# CONFIG_WANT_EARLY_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_SOFTWARE_SUSPEND is not set</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+# CONFIG_PPC_I8259 is not set</div><div class='add'>+# CONFIG_PPC_INDIRECT_PCI is not set</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM_START=0xfe000000</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_TASK_SIZE=0x80000000</div><div class='add'>+CONFIG_BOOT_LOAD=0x00800000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+# CONFIG_CHR_DEV_SG is not set</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_SPI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+CONFIG_SCSI_SATA=y</div><div class='add'>+# CONFIG_SCSI_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SVW is not set</div><div class='add'>+# CONFIG_SCSI_ATA_PIIX is not set</div><div class='add'>+CONFIG_SCSI_SATA_MV=y</div><div class='add'>+# CONFIG_SCSI_SATA_NV is not set</div><div class='add'>+# CONFIG_SCSI_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SCSI_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SCSI_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SX4 is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SIL is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SIL24 is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SIS is not set</div><div class='add'>+# CONFIG_SCSI_SATA_ULI is not set</div><div class='add'>+# CONFIG_SCSI_SATA_VIA is not set</div><div class='add'>+# CONFIG_SCSI_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+# CONFIG_FUSION_SPI is not set</div><div class='add'>+# CONFIG_FUSION_FC is not set</div><div class='add'>+# CONFIG_FUSION_SAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Macintosh device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_WINDFARM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Tulip family network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+CONFIG_NET_PCI=y</div><div class='add'>+# CONFIG_PCNET32 is not set</div><div class='add'>+# CONFIG_AMD8111_ETH is not set</div><div class='add'>+# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_FORCEDETH is not set</div><div class='add'>+# CONFIG_DGRS is not set</div><div class='add'>+# CONFIG_EEPRO100 is not set</div><div class='add'>+CONFIG_E100=y</div><div class='add'>+# CONFIG_FEALNX is not set</div><div class='add'>+# CONFIG_NATSEMI is not set</div><div class='add'>+# CONFIG_NE2K_PCI is not set</div><div class='add'>+# CONFIG_8139CP is not set</div><div class='add'>+CONFIG_8139TOO=y</div><div class='add'>+# CONFIG_8139TOO_PIO is not set</div><div class='add'>+# CONFIG_8139TOO_TUNE_TWISTER is not set</div><div class='add'>+# CONFIG_8139TOO_8129 is not set</div><div class='add'>+# CONFIG_8139_OLD_RX_RESET is not set</div><div class='add'>+# CONFIG_SIS900 is not set</div><div class='add'>+# CONFIG_EPIC100 is not set</div><div class='add'>+# CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='add'>+# CONFIG_VIA_RHINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_TSI108_ETH=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+CONFIG_GEN_RTC=y</div><div class='add'>+# CONFIG_GEN_RTC_X is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Instrumentation Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_DEBUG_KERNEL is not set</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='add'>+# CONFIG_SERIAL_TEXT_DEBUG is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_G5 is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_RTAS is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='head'>diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig<br/>new file mode 100644<br/>index 000000000000..fc2d9789adc8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc834x_itx_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/mpc834x_itx_defconfig</a></div><div class='hunk'>@@ -0,0 +1,1336 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17</div><div class='add'>+# Fri Jun 30 17:53:25 2006</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_IRQ_PER_CPU=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+# CONFIG_GENERIC_TBSYNC is not set</div><div class='add'>+CONFIG_DEFAULT_UIMAGE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CLASSIC32 is not set</div><div class='add'>+# CONFIG_PPC_52xx is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+CONFIG_PPC_83xx=y</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+# CONFIG_PPC_86xx is not set</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_8xx is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+CONFIG_83xx=y</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+# CONFIG_SMP is not set</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+# CONFIG_KALLSYMS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+# CONFIG_EPOLL is not set</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+CONFIG_MODULES=y</div><div class='add'>+CONFIG_MODULE_UNLOAD=y</div><div class='add'>+# CONFIG_MODULE_FORCE_UNLOAD is not set</div><div class='add'>+# CONFIG_MODVERSIONS is not set</div><div class='add'>+# CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='add'>+# CONFIG_KMOD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_PPC_GEN550=y</div><div class='add'>+# CONFIG_WANT_EARLY_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MPC834x_SYS is not set</div><div class='add'>+CONFIG_MPC834x_ITX=y</div><div class='add'>+CONFIG_MPC834x=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+# CONFIG_RESOURCES_64BIT is not set</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_SOFTWARE_SUSPEND is not set</div><div class='add'>+CONFIG_SECCOMP=y</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+# CONFIG_PPC_I8259 is not set</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+# CONFIG_PCIEPORTBUS is not set</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM_START=0xfe000000</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_TASK_SIZE=0x80000000</div><div class='add'>+CONFIG_BOOT_LOAD=0x00800000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+# CONFIG_XFRM_USER is not set</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD=y</div><div class='add'>+# CONFIG_MTD_DEBUG is not set</div><div class='add'>+# CONFIG_MTD_CONCAT is not set</div><div class='add'>+# CONFIG_MTD_PARTITIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# User Modules And Translation Layers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CHAR=y</div><div class='add'>+# CONFIG_MTD_BLOCK is not set</div><div class='add'>+# CONFIG_MTD_BLOCK_RO is not set</div><div class='add'>+# CONFIG_FTL is not set</div><div class='add'>+# CONFIG_NFTL is not set</div><div class='add'>+# CONFIG_INFTL is not set</div><div class='add'>+# CONFIG_RFD_FTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RAM/ROM/Flash chip drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_MTD_CFI=y</div><div class='add'>+# CONFIG_MTD_JEDECPROBE is not set</div><div class='add'>+CONFIG_MTD_GEN_PROBE=y</div><div class='add'>+# CONFIG_MTD_CFI_ADV_OPTIONS is not set</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_1=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_2=y</div><div class='add'>+CONFIG_MTD_MAP_BANK_WIDTH_4=y</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set</div><div class='add'>+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set</div><div class='add'>+CONFIG_MTD_CFI_I1=y</div><div class='add'>+CONFIG_MTD_CFI_I2=y</div><div class='add'>+# CONFIG_MTD_CFI_I4 is not set</div><div class='add'>+# CONFIG_MTD_CFI_I8 is not set</div><div class='add'>+# CONFIG_MTD_CFI_INTELEXT is not set</div><div class='add'>+CONFIG_MTD_CFI_AMDSTD=y</div><div class='add'>+# CONFIG_MTD_CFI_STAA is not set</div><div class='add'>+CONFIG_MTD_CFI_UTIL=y</div><div class='add'>+# CONFIG_MTD_RAM is not set</div><div class='add'>+# CONFIG_MTD_ROM is not set</div><div class='add'>+# CONFIG_MTD_ABSENT is not set</div><div class='add'>+# CONFIG_MTD_OBSOLETE_CHIPS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Mapping drivers for chip access</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_COMPLEX_MAPPINGS is not set</div><div class='add'>+CONFIG_MTD_PHYSMAP=y</div><div class='add'>+CONFIG_MTD_PHYSMAP_START=0xfe000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_LEN=0x1000000</div><div class='add'>+CONFIG_MTD_PHYSMAP_BANKWIDTH=2</div><div class='add'>+# CONFIG_MTD_PLATRAM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Self-contained MTD device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_PMC551 is not set</div><div class='add'>+# CONFIG_MTD_DATAFLASH is not set</div><div class='add'>+# CONFIG_MTD_M25P80 is not set</div><div class='add'>+# CONFIG_MTD_SLRAM is not set</div><div class='add'>+# CONFIG_MTD_PHRAM is not set</div><div class='add'>+# CONFIG_MTD_MTDRAM is not set</div><div class='add'>+# CONFIG_MTD_BLOCK2MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Disk-On-Chip Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_DOC2000 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001 is not set</div><div class='add'>+# CONFIG_MTD_DOC2001PLUS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_NAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# OneNAND Flash Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD_ONENAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UB is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+# CONFIG_BLK_DEV_IDE is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD_ONLY is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+CONFIG_SCSI=y</div><div class='add'>+CONFIG_SCSI_PROC_FS=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI support type (disk, tape, CD-ROM)</div><div class='add'>+#</div><div class='add'>+CONFIG_BLK_DEV_SD=y</div><div class='add'>+# CONFIG_CHR_DEV_ST is not set</div><div class='add'>+# CONFIG_CHR_DEV_OSST is not set</div><div class='add'>+# CONFIG_BLK_DEV_SR is not set</div><div class='add'>+CONFIG_CHR_DEV_SG=y</div><div class='add'>+# CONFIG_CHR_DEV_SCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs</div><div class='add'>+#</div><div class='add'>+# CONFIG_SCSI_MULTI_LUN is not set</div><div class='add'>+# CONFIG_SCSI_CONSTANTS is not set</div><div class='add'>+# CONFIG_SCSI_LOGGING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI Transport Attributes</div><div class='add'>+#</div><div class='add'>+CONFIG_SCSI_SPI_ATTRS=y</div><div class='add'>+# CONFIG_SCSI_FC_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_ISCSI_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI low-level drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISCSI_TCP is not set</div><div class='add'>+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set</div><div class='add'>+# CONFIG_SCSI_3W_9XXX is not set</div><div class='add'>+# CONFIG_SCSI_ACARD is not set</div><div class='add'>+# CONFIG_SCSI_AACRAID is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX is not set</div><div class='add'>+# CONFIG_SCSI_AIC7XXX_OLD is not set</div><div class='add'>+# CONFIG_SCSI_AIC79XX is not set</div><div class='add'>+# CONFIG_SCSI_DPT_I2O is not set</div><div class='add'>+# CONFIG_MEGARAID_NEWGEN is not set</div><div class='add'>+# CONFIG_MEGARAID_LEGACY is not set</div><div class='add'>+# CONFIG_MEGARAID_SAS is not set</div><div class='add'>+CONFIG_SCSI_SATA=y</div><div class='add'>+# CONFIG_SCSI_SATA_AHCI is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SVW is not set</div><div class='add'>+# CONFIG_SCSI_ATA_PIIX is not set</div><div class='add'>+# CONFIG_SCSI_SATA_MV is not set</div><div class='add'>+# CONFIG_SCSI_SATA_NV is not set</div><div class='add'>+# CONFIG_SCSI_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='add'>+# CONFIG_SCSI_SATA_QSTOR is not set</div><div class='add'>+# CONFIG_SCSI_SATA_PROMISE is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SX4 is not set</div><div class='add'>+CONFIG_SCSI_SATA_SIL=y</div><div class='add'>+# CONFIG_SCSI_SATA_SIL24 is not set</div><div class='add'>+# CONFIG_SCSI_SATA_SIS is not set</div><div class='add'>+# CONFIG_SCSI_SATA_ULI is not set</div><div class='add'>+# CONFIG_SCSI_SATA_VIA is not set</div><div class='add'>+# CONFIG_SCSI_SATA_VITESSE is not set</div><div class='add'>+# CONFIG_SCSI_BUSLOGIC is not set</div><div class='add'>+# CONFIG_SCSI_DMX3191D is not set</div><div class='add'>+# CONFIG_SCSI_EATA is not set</div><div class='add'>+# CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='add'>+# CONFIG_SCSI_GDTH is not set</div><div class='add'>+# CONFIG_SCSI_IPS is not set</div><div class='add'>+# CONFIG_SCSI_INITIO is not set</div><div class='add'>+# CONFIG_SCSI_INIA100 is not set</div><div class='add'>+# CONFIG_SCSI_SYM53C8XX_2 is not set</div><div class='add'>+# CONFIG_SCSI_IPR is not set</div><div class='add'>+# CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='add'>+# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+# CONFIG_SCSI_LPFC is not set</div><div class='add'>+# CONFIG_SCSI_DC395x is not set</div><div class='add'>+# CONFIG_SCSI_DC390T is not set</div><div class='add'>+# CONFIG_SCSI_NSP32 is not set</div><div class='add'>+# CONFIG_SCSI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+CONFIG_MD=y</div><div class='add'>+CONFIG_BLK_DEV_MD=y</div><div class='add'>+CONFIG_MD_LINEAR=y</div><div class='add'>+CONFIG_MD_RAID0=y</div><div class='add'>+CONFIG_MD_RAID1=y</div><div class='add'>+# CONFIG_MD_RAID10 is not set</div><div class='add'>+# CONFIG_MD_RAID456 is not set</div><div class='add'>+# CONFIG_MD_MULTIPATH is not set</div><div class='add'>+# CONFIG_MD_FAULTY is not set</div><div class='add'>+# CONFIG_BLK_DEV_DM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+# CONFIG_FUSION_SPI is not set</div><div class='add'>+# CONFIG_FUSION_FC is not set</div><div class='add'>+# CONFIG_FUSION_SAS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Macintosh device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_WINDFARM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+CONFIG_CICADA_PHY=y</div><div class='add'>+# CONFIG_VITESSE_PHY is not set</div><div class='add'>+# CONFIG_SMSC_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Tulip family network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+CONFIG_NET_PCI=y</div><div class='add'>+# CONFIG_PCNET32 is not set</div><div class='add'>+# CONFIG_AMD8111_ETH is not set</div><div class='add'>+# CONFIG_ADAPTEC_STARFIRE is not set</div><div class='add'>+# CONFIG_B44 is not set</div><div class='add'>+# CONFIG_FORCEDETH is not set</div><div class='add'>+# CONFIG_DGRS is not set</div><div class='add'>+# CONFIG_EEPRO100 is not set</div><div class='add'>+CONFIG_E100=y</div><div class='add'>+# CONFIG_FEALNX is not set</div><div class='add'>+# CONFIG_NATSEMI is not set</div><div class='add'>+# CONFIG_NE2K_PCI is not set</div><div class='add'>+# CONFIG_8139CP is not set</div><div class='add'>+# CONFIG_8139TOO is not set</div><div class='add'>+# CONFIG_SIS900 is not set</div><div class='add'>+# CONFIG_EPIC100 is not set</div><div class='add'>+# CONFIG_SUNDANCE is not set</div><div class='add'>+# CONFIG_TLAN is not set</div><div class='add'>+# CONFIG_VIA_RHINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_VIA_VELOCITY is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='add'>+CONFIG_GFAR_NAPI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_NET_FC is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+CONFIG_WATCHDOG=y</div><div class='add'>+# CONFIG_WATCHDOG_NOWAYOUT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOFT_WATCHDOG is not set</div><div class='add'>+CONFIG_83xx_WDT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCIPCWATCHDOG is not set</div><div class='add'>+# CONFIG_WDTPCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB-based Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_USBPCWATCHDOG is not set</div><div class='add'>+CONFIG_HW_RANDOM=y</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+CONFIG_I2C_CHARDEV=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_PROSAVAGE is not set</div><div class='add'>+# CONFIG_I2C_SAVAGE4 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_M41T00 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI=y</div><div class='add'>+# CONFIG_SPI_DEBUG is not set</div><div class='add'>+CONFIG_SPI_MASTER=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Master Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SPI_BITBANG=y</div><div class='add'>+CONFIG_SPI_MPC83xx=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI Protocol Masters</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM70 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47B397 is not set</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+CONFIG_FIRMWARE_EDID=y</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+CONFIG_USB=y</div><div class='add'>+# CONFIG_USB_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous USB options</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_DEVICEFS=y</div><div class='add'>+# CONFIG_USB_BANDWIDTH is not set</div><div class='add'>+# CONFIG_USB_DYNAMIC_MINORS is not set</div><div class='add'>+# CONFIG_USB_OTG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Host Controller Drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_EHCI_HCD=y</div><div class='add'>+# CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='add'>+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='add'>+# CONFIG_USB_ISP116X_HCD is not set</div><div class='add'>+CONFIG_USB_OHCI_HCD=y</div><div class='add'>+# CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='add'>+CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='add'>+CONFIG_USB_UHCI_HCD=y</div><div class='add'>+# CONFIG_USB_SL811_HCD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Device Class drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_ACM is not set</div><div class='add'>+# CONFIG_USB_PRINTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# may also be needed; see USB_STORAGE Help for more information</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_STORAGE=y</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='add'>+# CONFIG_USB_LIBUSUAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Input Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_HID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB HID Boot Protocol drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_KBD is not set</div><div class='add'>+# CONFIG_USB_MOUSE is not set</div><div class='add'>+# CONFIG_USB_AIPTEK is not set</div><div class='add'>+# CONFIG_USB_WACOM is not set</div><div class='add'>+# CONFIG_USB_ACECAD is not set</div><div class='add'>+# CONFIG_USB_KBTAB is not set</div><div class='add'>+# CONFIG_USB_POWERMATE is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_USB_YEALINK is not set</div><div class='add'>+# CONFIG_USB_XPAD is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE is not set</div><div class='add'>+# CONFIG_USB_ATI_REMOTE2 is not set</div><div class='add'>+# CONFIG_USB_KEYSPAN_REMOTE is not set</div><div class='add'>+# CONFIG_USB_APPLETOUCH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Imaging devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_MDC800 is not set</div><div class='add'>+# CONFIG_USB_MICROTEK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Network Adapters</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_CATC is not set</div><div class='add'>+# CONFIG_USB_KAWETH is not set</div><div class='add'>+# CONFIG_USB_PEGASUS is not set</div><div class='add'>+# CONFIG_USB_RTL8150 is not set</div><div class='add'>+# CONFIG_USB_USBNET is not set</div><div class='add'>+CONFIG_USB_MON=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB port drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Serial Converter support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Miscellaneous drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_EMI62 is not set</div><div class='add'>+# CONFIG_USB_EMI26 is not set</div><div class='add'>+# CONFIG_USB_AUERSWALD is not set</div><div class='add'>+# CONFIG_USB_RIO500 is not set</div><div class='add'>+# CONFIG_USB_LEGOTOWER is not set</div><div class='add'>+# CONFIG_USB_LCD is not set</div><div class='add'>+# CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='add'>+# CONFIG_USB_CYTHERM is not set</div><div class='add'>+# CONFIG_USB_PHIDGETKIT is not set</div><div class='add'>+# CONFIG_USB_PHIDGETSERVO is not set</div><div class='add'>+# CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='add'>+# CONFIG_USB_LD is not set</div><div class='add'>+# CONFIG_USB_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB DSL modem support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_GADGET=y</div><div class='add'>+# CONFIG_USB_GADGET_DEBUG_FILES is not set</div><div class='add'>+CONFIG_USB_GADGET_SELECTED=y</div><div class='add'>+CONFIG_USB_GADGET_NET2280=y</div><div class='add'>+CONFIG_USB_NET2280=y</div><div class='add'>+# CONFIG_USB_GADGET_PXA2XX is not set</div><div class='add'>+# CONFIG_USB_GADGET_GOKU is not set</div><div class='add'>+# CONFIG_USB_GADGET_LH7A40X is not set</div><div class='add'>+# CONFIG_USB_GADGET_OMAP is not set</div><div class='add'>+# CONFIG_USB_GADGET_AT91 is not set</div><div class='add'>+# CONFIG_USB_GADGET_DUMMY_HCD is not set</div><div class='add'>+CONFIG_USB_GADGET_DUALSPEED=y</div><div class='add'>+# CONFIG_USB_ZERO is not set</div><div class='add'>+CONFIG_USB_ETH=y</div><div class='add'>+CONFIG_USB_ETH_RNDIS=y</div><div class='add'>+# CONFIG_USB_GADGETFS is not set</div><div class='add'>+# CONFIG_USB_FILE_STORAGE is not set</div><div class='add'>+# CONFIG_USB_G_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_LIB=y</div><div class='add'>+CONFIG_RTC_CLASS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS=y</div><div class='add'>+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC interfaces</div><div class='add'>+#</div><div class='add'>+CONFIG_RTC_INTF_SYSFS=y</div><div class='add'>+CONFIG_RTC_INTF_PROC=y</div><div class='add'>+CONFIG_RTC_INTF_DEV=y</div><div class='add'>+CONFIG_RTC_INTF_DEV_UIE_EMUL=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# RTC drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_DRV_X1205 is not set</div><div class='add'>+CONFIG_RTC_DRV_DS1307=y</div><div class='add'>+# CONFIG_RTC_DRV_DS1553 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1672 is not set</div><div class='add'>+# CONFIG_RTC_DRV_DS1742 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8563 is not set</div><div class='add'>+# CONFIG_RTC_DRV_PCF8583 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C348 is not set</div><div class='add'>+# CONFIG_RTC_DRV_RS5C372 is not set</div><div class='add'>+# CONFIG_RTC_DRV_M48T86 is not set</div><div class='add'>+# CONFIG_RTC_DRV_TEST is not set</div><div class='add'>+# CONFIG_RTC_DRV_MAX6902 is not set</div><div class='add'>+# CONFIG_RTC_DRV_V3020 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+CONFIG_DMA_ENGINE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_DMA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+CONFIG_INTEL_IOATDMA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_JFFS_FS is not set</div><div class='add'>+# CONFIG_JFFS2_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+# CONFIG_MSDOS_PARTITION is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Instrumentation Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+CONFIG_PRINTK_TIME=y</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=17</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+CONFIG_DEBUG_INFO=y</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+CONFIG_BOOTX_TEXT=y</div><div class='add'>+CONFIG_SERIAL_TEXT_DEBUG=y</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+CONFIG_CRYPTO=y</div><div class='add'>+# CONFIG_CRYPTO_HMAC is not set</div><div class='add'>+# CONFIG_CRYPTO_NULL is not set</div><div class='add'>+# CONFIG_CRYPTO_MD4 is not set</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+# CONFIG_CRYPTO_SHA1 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA256 is not set</div><div class='add'>+# CONFIG_CRYPTO_SHA512 is not set</div><div class='add'>+# CONFIG_CRYPTO_WP512 is not set</div><div class='add'>+# CONFIG_CRYPTO_TGR192 is not set</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_TWOFISH is not set</div><div class='add'>+# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+# CONFIG_CRYPTO_AES is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST5 is not set</div><div class='add'>+# CONFIG_CRYPTO_CAST6 is not set</div><div class='add'>+# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+# CONFIG_CRYPTO_ARC4 is not set</div><div class='add'>+# CONFIG_CRYPTO_KHAZAD is not set</div><div class='add'>+# CONFIG_CRYPTO_ANUBIS is not set</div><div class='add'>+# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+# CONFIG_CRYPTO_MICHAEL_MIC is not set</div><div class='add'>+# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+# CONFIG_CRYPTO_TEST is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='head'>diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig<br/>new file mode 100644<br/>index 000000000000..9bb022a523fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc85xx_cds_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/mpc85xx_cds_defconfig</a></div><div class='hunk'>@@ -0,0 +1,846 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.16</div><div class='add'>+# Sun Apr  2 11:23:42 2006</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+# CONFIG_GENERIC_TBSYNC is not set</div><div class='add'>+# CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CLASSIC32 is not set</div><div class='add'>+# CONFIG_PPC_52xx is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+CONFIG_PPC_85xx=y</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_8xx is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_85xx=y</div><div class='add'>+CONFIG_E500=y</div><div class='add'>+CONFIG_BOOKE=y</div><div class='add'>+CONFIG_FSL_BOOKE=y</div><div class='add'>+# CONFIG_PHYS_64BIT is not set</div><div class='add'>+CONFIG_SPE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_BROKEN_ON_SMP=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+CONFIG_LOCALVERSION_AUTO=y</div><div class='add'>+CONFIG_SWAP=y</div><div class='add'>+CONFIG_SYSVIPC=y</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+# CONFIG_IKCONFIG is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+# CONFIG_KALLSYMS_EXTRA_PASS is not set</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+CONFIG_ELF_CORE=y</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+CONFIG_SLAB=y</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+# CONFIG_SLOB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+CONFIG_IOSCHED_AS=y</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+CONFIG_IOSCHED_CFQ=y</div><div class='add'>+CONFIG_DEFAULT_AS=y</div><div class='add'>+# CONFIG_DEFAULT_DEADLINE is not set</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='add'>+CONFIG_MPIC=y</div><div class='add'>+# CONFIG_WANT_EARLY_SERIAL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MPC8540_ADS is not set</div><div class='add'>+CONFIG_MPC85xx_CDS=y</div><div class='add'>+CONFIG_MPC8540=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI_BE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+# CONFIG_HIGHMEM is not set</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+CONFIG_HZ_250=y</div><div class='add'>+# CONFIG_HZ_1000 is not set</div><div class='add'>+CONFIG_HZ=250</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+CONFIG_BINFMT_MISC=y</div><div class='add'>+CONFIG_MATH_EMULATION=y</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_SOFTWARE_SUSPEND is not set</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM_START=0xfe000000</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_TASK_SIZE=0x80000000</div><div class='add'>+CONFIG_BOOT_LOAD=0x00800000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+CONFIG_IP_MULTICAST=y</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+# CONFIG_IP_PNP_RARP is not set</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_IP_MROUTE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+CONFIG_SYN_COOKIES=y</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+# CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+# CONFIG_FW_LOADER is not set</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=32768</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE=y</div><div class='add'>+CONFIG_BLK_DEV_IDE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Please see Documentation/ide.txt for help/info on IDE drives</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_IDE_SATA is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEDISK is not set</div><div class='add'>+# CONFIG_IDEDISK_MULTI_MODE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDECD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDETAPE is not set</div><div class='add'>+# CONFIG_BLK_DEV_IDEFLOPPY is not set</div><div class='add'>+# CONFIG_IDE_TASK_IOCTL is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IDE chipset support/bugfixes</div><div class='add'>+#</div><div class='add'>+CONFIG_IDE_GENERIC=y</div><div class='add'>+CONFIG_BLK_DEV_IDEPCI=y</div><div class='add'>+CONFIG_IDEPCI_SHARE_IRQ=y</div><div class='add'>+# CONFIG_BLK_DEV_OFFBOARD is not set</div><div class='add'>+CONFIG_BLK_DEV_GENERIC=y</div><div class='add'>+# CONFIG_BLK_DEV_OPTI621 is not set</div><div class='add'>+# CONFIG_BLK_DEV_SL82C105 is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA_PCI=y</div><div class='add'>+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set</div><div class='add'>+# CONFIG_IDEDMA_PCI_AUTO is not set</div><div class='add'>+# CONFIG_BLK_DEV_AEC62XX is not set</div><div class='add'>+# CONFIG_BLK_DEV_ALI15X3 is not set</div><div class='add'>+# CONFIG_BLK_DEV_AMD74XX is not set</div><div class='add'>+# CONFIG_BLK_DEV_CMD64X is not set</div><div class='add'>+# CONFIG_BLK_DEV_TRIFLEX is not set</div><div class='add'>+# CONFIG_BLK_DEV_CY82C693 is not set</div><div class='add'>+# CONFIG_BLK_DEV_CS5520 is not set</div><div class='add'>+# CONFIG_BLK_DEV_CS5530 is not set</div><div class='add'>+# CONFIG_BLK_DEV_HPT34X is not set</div><div class='add'>+# CONFIG_BLK_DEV_HPT366 is not set</div><div class='add'>+# CONFIG_BLK_DEV_SC1200 is not set</div><div class='add'>+# CONFIG_BLK_DEV_PIIX is not set</div><div class='add'>+# CONFIG_BLK_DEV_IT821X is not set</div><div class='add'>+# CONFIG_BLK_DEV_NS87415 is not set</div><div class='add'>+# CONFIG_BLK_DEV_PDC202XX_OLD is not set</div><div class='add'>+# CONFIG_BLK_DEV_PDC202XX_NEW is not set</div><div class='add'>+# CONFIG_BLK_DEV_SVWKS is not set</div><div class='add'>+# CONFIG_BLK_DEV_SIIMAGE is not set</div><div class='add'>+# CONFIG_BLK_DEV_SLC90E66 is not set</div><div class='add'>+# CONFIG_BLK_DEV_TRM290 is not set</div><div class='add'>+CONFIG_BLK_DEV_VIA82CXXX=y</div><div class='add'>+# CONFIG_IDE_ARM is not set</div><div class='add'>+CONFIG_BLK_DEV_IDEDMA=y</div><div class='add'>+# CONFIG_IDEDMA_IVB is not set</div><div class='add'>+# CONFIG_IDEDMA_AUTO is not set</div><div class='add'>+# CONFIG_BLK_DEV_HD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Macintosh device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_WINDFARM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+# CONFIG_DUMMY is not set</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Tulip family network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+CONFIG_E1000=y</div><div class='add'>+CONFIG_E1000_NAPI=y</div><div class='add'>+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='add'>+CONFIG_GFAR_NAPI=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+# CONFIG_SERIO is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VT is not set</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='add'>+# CONFIG_SERIAL_8250_EXTENDED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTYS=y</div><div class='add'>+CONFIG_LEGACY_PTY_COUNT=256</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+CONFIG_GEN_RTC=y</div><div class='add'>+# CONFIG_GEN_RTC_X is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+CONFIG_HWMON=y</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+CONFIG_INOTIFY=y</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+CONFIG_DNOTIFY=y</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+# CONFIG_NFS_V3 is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+# CONFIG_NFSD is not set</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+# CONFIG_MSDOS_PARTITION is not set</div><div class='add'>+# CONFIG_LDM_PARTITION is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NLS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Instrumentation Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_SLAB is not set</div><div class='add'>+CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_G5 is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_RTAS is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='head'>diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig<br/>new file mode 100644<br/>index 000000000000..d7a30f9bc535<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/mpc8641_hpcn_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/mpc8641_hpcn_defconfig</a></div><div class='hunk'>@@ -0,0 +1,921 @@</div><div class='add'>+#</div><div class='add'>+# Automatically generated make config: don't edit</div><div class='add'>+# Linux kernel version: 2.6.17-rc3</div><div class='add'>+# Fri Jun 16 10:47:09 2006</div><div class='add'>+#</div><div class='add'>+# CONFIG_PPC64 is not set</div><div class='add'>+CONFIG_PPC32=y</div><div class='add'>+CONFIG_PPC_MERGE=y</div><div class='add'>+CONFIG_MMU=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='add'>+CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='add'>+CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_PPC=y</div><div class='add'>+CONFIG_EARLY_PRINTK=y</div><div class='add'>+CONFIG_GENERIC_NVRAM=y</div><div class='add'>+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y</div><div class='add'>+CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='add'>+CONFIG_PPC_OF=y</div><div class='add'>+CONFIG_PPC_UDBG_16550=y</div><div class='add'>+CONFIG_GENERIC_TBSYNC=y</div><div class='add'>+# CONFIG_DEFAULT_UIMAGE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Processor support</div><div class='add'>+#</div><div class='add'>+# CONFIG_CLASSIC32 is not set</div><div class='add'>+# CONFIG_PPC_52xx is not set</div><div class='add'>+# CONFIG_PPC_82xx is not set</div><div class='add'>+# CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='add'>+CONFIG_PPC_86xx=y</div><div class='add'>+# CONFIG_40x is not set</div><div class='add'>+# CONFIG_44x is not set</div><div class='add'>+# CONFIG_8xx is not set</div><div class='add'>+# CONFIG_E200 is not set</div><div class='add'>+CONFIG_6xx=y</div><div class='add'>+CONFIG_PPC_FPU=y</div><div class='add'>+CONFIG_ALTIVEC=y</div><div class='add'>+CONFIG_PPC_STD_MMU=y</div><div class='add'>+CONFIG_PPC_STD_MMU_32=y</div><div class='add'>+CONFIG_SMP=y</div><div class='add'>+CONFIG_NR_CPUS=2</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Code maturity level options</div><div class='add'>+#</div><div class='add'>+CONFIG_EXPERIMENTAL=y</div><div class='add'>+CONFIG_LOCK_KERNEL=y</div><div class='add'>+CONFIG_INIT_ENV_ARG_LIMIT=32</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# General setup</div><div class='add'>+#</div><div class='add'>+CONFIG_LOCALVERSION=""</div><div class='add'>+# CONFIG_LOCALVERSION_AUTO is not set</div><div class='add'>+# CONFIG_SWAP is not set</div><div class='add'>+# CONFIG_SYSVIPC is not set</div><div class='add'>+# CONFIG_POSIX_MQUEUE is not set</div><div class='add'>+# CONFIG_BSD_PROCESS_ACCT is not set</div><div class='add'>+CONFIG_SYSCTL=y</div><div class='add'>+# CONFIG_AUDIT is not set</div><div class='add'>+CONFIG_IKCONFIG=y</div><div class='add'>+CONFIG_IKCONFIG_PROC=y</div><div class='add'>+# CONFIG_CPUSETS is not set</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='add'>+CONFIG_INITRAMFS_SOURCE=""</div><div class='add'>+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='add'>+CONFIG_EMBEDDED=y</div><div class='add'>+CONFIG_KALLSYMS=y</div><div class='add'>+# CONFIG_KALLSYMS_ALL is not set</div><div class='add'>+CONFIG_KALLSYMS_EXTRA_PASS=y</div><div class='add'>+CONFIG_HOTPLUG=y</div><div class='add'>+CONFIG_PRINTK=y</div><div class='add'>+CONFIG_BUG=y</div><div class='add'>+# CONFIG_ELF_CORE is not set</div><div class='add'>+CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_FUTEX=y</div><div class='add'>+CONFIG_EPOLL=y</div><div class='add'>+CONFIG_SHMEM=y</div><div class='add'>+# CONFIG_SLAB is not set</div><div class='add'>+# CONFIG_TINY_SHMEM is not set</div><div class='add'>+CONFIG_BASE_SMALL=0</div><div class='add'>+CONFIG_SLOB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Loadable module support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MODULES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block layer</div><div class='add'>+#</div><div class='add'>+# CONFIG_LBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+# CONFIG_LSF is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IO Schedulers</div><div class='add'>+#</div><div class='add'>+CONFIG_IOSCHED_NOOP=y</div><div class='add'>+# CONFIG_IOSCHED_AS is not set</div><div class='add'>+CONFIG_IOSCHED_DEADLINE=y</div><div class='add'>+# CONFIG_IOSCHED_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_AS is not set</div><div class='add'>+CONFIG_DEFAULT_DEADLINE=y</div><div class='add'>+# CONFIG_DEFAULT_CFQ is not set</div><div class='add'>+# CONFIG_DEFAULT_NOOP is not set</div><div class='add'>+CONFIG_DEFAULT_IOSCHED="deadline"</div><div class='add'>+CONFIG_MPIC=y</div><div class='add'>+# CONFIG_WANT_EARLY_SERIAL is not set</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI_BE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Platform Support</div><div class='add'>+#</div><div class='add'>+CONFIG_MPC8641_HPCN=y</div><div class='add'>+CONFIG_MPC8641=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel options</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM=y</div><div class='add'>+# CONFIG_HZ_100 is not set</div><div class='add'>+# CONFIG_HZ_250 is not set</div><div class='add'>+CONFIG_HZ_1000=y</div><div class='add'>+CONFIG_HZ=1000</div><div class='add'>+CONFIG_PREEMPT_NONE=y</div><div class='add'>+# CONFIG_PREEMPT_VOLUNTARY is not set</div><div class='add'>+# CONFIG_PREEMPT is not set</div><div class='add'>+CONFIG_PREEMPT_BKL=y</div><div class='add'>+CONFIG_BINFMT_ELF=y</div><div class='add'>+# CONFIG_BINFMT_MISC is not set</div><div class='add'>+# CONFIG_IRQ_ALL_CPUS is not set</div><div class='add'>+CONFIG_ARCH_FLATMEM_ENABLE=y</div><div class='add'>+CONFIG_SELECT_MEMORY_MODEL=y</div><div class='add'>+CONFIG_FLATMEM_MANUAL=y</div><div class='add'>+# CONFIG_DISCONTIGMEM_MANUAL is not set</div><div class='add'>+# CONFIG_SPARSEMEM_MANUAL is not set</div><div class='add'>+CONFIG_FLATMEM=y</div><div class='add'>+CONFIG_FLAT_NODE_MEM_MAP=y</div><div class='add'>+# CONFIG_SPARSEMEM_STATIC is not set</div><div class='add'>+CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_PROC_DEVICETREE=y</div><div class='add'>+# CONFIG_CMDLINE_BOOL is not set</div><div class='add'>+# CONFIG_PM is not set</div><div class='add'>+# CONFIG_SECCOMP is not set</div><div class='add'>+CONFIG_ISA_DMA_API=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Bus options</div><div class='add'>+#</div><div class='add'>+CONFIG_GENERIC_ISA_DMA=y</div><div class='add'>+CONFIG_PPC_I8259=y</div><div class='add'>+CONFIG_PPC_INDIRECT_PCI=y</div><div class='add'>+CONFIG_FSL_SOC=y</div><div class='add'>+CONFIG_PCI=y</div><div class='add'>+CONFIG_PCI_DOMAINS=y</div><div class='add'>+# CONFIG_PCI_DEBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCCARD (PCMCIA/CardBus) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PCCARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PCI Hotplug Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HOTPLUG_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Advanced setup</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADVANCED_OPTIONS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Default settings for advanced configuration options are used</div><div class='add'>+#</div><div class='add'>+CONFIG_HIGHMEM_START=0xfe000000</div><div class='add'>+CONFIG_LOWMEM_SIZE=0x30000000</div><div class='add'>+CONFIG_KERNEL_START=0xc0000000</div><div class='add'>+CONFIG_TASK_SIZE=0x80000000</div><div class='add'>+CONFIG_BOOT_LOAD=0x00800000</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking</div><div class='add'>+#</div><div class='add'>+CONFIG_NET=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Networking options</div><div class='add'>+#</div><div class='add'>+# CONFIG_NETDEBUG is not set</div><div class='add'>+CONFIG_PACKET=y</div><div class='add'>+# CONFIG_PACKET_MMAP is not set</div><div class='add'>+CONFIG_UNIX=y</div><div class='add'>+# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_INET=y</div><div class='add'>+# CONFIG_IP_MULTICAST is not set</div><div class='add'>+# CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='add'>+CONFIG_IP_FIB_HASH=y</div><div class='add'>+CONFIG_IP_PNP=y</div><div class='add'>+CONFIG_IP_PNP_DHCP=y</div><div class='add'>+CONFIG_IP_PNP_BOOTP=y</div><div class='add'>+CONFIG_IP_PNP_RARP=y</div><div class='add'>+# CONFIG_NET_IPIP is not set</div><div class='add'>+# CONFIG_NET_IPGRE is not set</div><div class='add'>+# CONFIG_ARPD is not set</div><div class='add'>+# CONFIG_SYN_COOKIES is not set</div><div class='add'>+# CONFIG_INET_AH is not set</div><div class='add'>+# CONFIG_INET_ESP is not set</div><div class='add'>+# CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_TUNNEL is not set</div><div class='add'>+CONFIG_INET_DIAG=y</div><div class='add'>+CONFIG_INET_TCP_DIAG=y</div><div class='add'>+# CONFIG_TCP_CONG_ADVANCED is not set</div><div class='add'>+CONFIG_TCP_CONG_BIC=y</div><div class='add'>+CONFIG_IPV6=y</div><div class='add'>+# CONFIG_IPV6_PRIVACY is not set</div><div class='add'>+# CONFIG_IPV6_ROUTER_PREF is not set</div><div class='add'>+# CONFIG_INET6_AH is not set</div><div class='add'>+# CONFIG_INET6_ESP is not set</div><div class='add'>+# CONFIG_INET6_IPCOMP is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETFILTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DCCP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_DCCP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCTP Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_IP_SCTP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TIPC Configuration (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+# CONFIG_TIPC is not set</div><div class='add'>+# CONFIG_ATM is not set</div><div class='add'>+# CONFIG_BRIDGE is not set</div><div class='add'>+# CONFIG_VLAN_8021Q is not set</div><div class='add'>+# CONFIG_DECNET is not set</div><div class='add'>+# CONFIG_LLC2 is not set</div><div class='add'>+# CONFIG_IPX is not set</div><div class='add'>+# CONFIG_ATALK is not set</div><div class='add'>+# CONFIG_X25 is not set</div><div class='add'>+# CONFIG_LAPB is not set</div><div class='add'>+# CONFIG_NET_DIVERT is not set</div><div class='add'>+# CONFIG_ECONET is not set</div><div class='add'>+# CONFIG_WAN_ROUTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# QoS and/or fair queueing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_SCHED is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network testing</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_HAMRADIO is not set</div><div class='add'>+# CONFIG_IRDA is not set</div><div class='add'>+# CONFIG_BT is not set</div><div class='add'>+# CONFIG_IEEE80211 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Device Drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Generic Driver Options</div><div class='add'>+#</div><div class='add'>+CONFIG_STANDALONE=y</div><div class='add'>+CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='add'>+CONFIG_FW_LOADER=y</div><div class='add'>+# CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='add'>+#</div><div class='add'>+# CONFIG_CONNECTOR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Memory Technology Devices (MTD)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MTD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Parallel port support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PARPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Plug and Play support</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Block devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_BLK_DEV_FD is not set</div><div class='add'>+# CONFIG_BLK_CPQ_DA is not set</div><div class='add'>+# CONFIG_BLK_CPQ_CISS_DA is not set</div><div class='add'>+# CONFIG_BLK_DEV_DAC960 is not set</div><div class='add'>+# CONFIG_BLK_DEV_UMEM is not set</div><div class='add'>+# CONFIG_BLK_DEV_COW_COMMON is not set</div><div class='add'>+CONFIG_BLK_DEV_LOOP=y</div><div class='add'>+# CONFIG_BLK_DEV_CRYPTOLOOP is not set</div><div class='add'>+# CONFIG_BLK_DEV_NBD is not set</div><div class='add'>+# CONFIG_BLK_DEV_SX8 is not set</div><div class='add'>+CONFIG_BLK_DEV_RAM=y</div><div class='add'>+CONFIG_BLK_DEV_RAM_COUNT=16</div><div class='add'>+CONFIG_BLK_DEV_RAM_SIZE=131072</div><div class='add'>+CONFIG_BLK_DEV_INITRD=y</div><div class='add'>+# CONFIG_CDROM_PKTCDVD is not set</div><div class='add'>+# CONFIG_ATA_OVER_ETH is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ATA/ATAPI/MFM/RLL support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IDE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SCSI device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_RAID_ATTRS is not set</div><div class='add'>+# CONFIG_SCSI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multi-device support (RAID and LVM)</div><div class='add'>+#</div><div class='add'>+# CONFIG_MD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Fusion MPT device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FUSION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IEEE 1394 (FireWire) support</div><div class='add'>+#</div><div class='add'>+# CONFIG_IEEE1394 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2O device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2O is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Macintosh device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_WINDFARM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network device support</div><div class='add'>+#</div><div class='add'>+CONFIG_NETDEVICES=y</div><div class='add'>+CONFIG_DUMMY=y</div><div class='add'>+# CONFIG_BONDING is not set</div><div class='add'>+# CONFIG_EQUALIZER is not set</div><div class='add'>+# CONFIG_TUN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ARCnet devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_ARCNET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# PHY device support</div><div class='add'>+#</div><div class='add'>+CONFIG_PHYLIB=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MII PHY device drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_MARVELL_PHY is not set</div><div class='add'>+# CONFIG_DAVICOM_PHY is not set</div><div class='add'>+# CONFIG_QSEMI_PHY is not set</div><div class='add'>+# CONFIG_LXT_PHY is not set</div><div class='add'>+# CONFIG_CICADA_PHY is not set</div><div class='add'>+CONFIG_VITESSE_PHY=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10 or 100Mbit)</div><div class='add'>+#</div><div class='add'>+CONFIG_NET_ETHERNET=y</div><div class='add'>+CONFIG_MII=y</div><div class='add'>+# CONFIG_HAPPYMEAL is not set</div><div class='add'>+# CONFIG_SUNGEM is not set</div><div class='add'>+# CONFIG_CASSINI is not set</div><div class='add'>+# CONFIG_NET_VENDOR_3COM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Tulip family network device support</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_TULIP is not set</div><div class='add'>+# CONFIG_HP100 is not set</div><div class='add'>+# CONFIG_NET_PCI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (1000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_ACENIC is not set</div><div class='add'>+# CONFIG_DL2K is not set</div><div class='add'>+# CONFIG_E1000 is not set</div><div class='add'>+# CONFIG_NS83820 is not set</div><div class='add'>+# CONFIG_HAMACHI is not set</div><div class='add'>+# CONFIG_YELLOWFIN is not set</div><div class='add'>+# CONFIG_R8169 is not set</div><div class='add'>+# CONFIG_SIS190 is not set</div><div class='add'>+# CONFIG_SKGE is not set</div><div class='add'>+# CONFIG_SKY2 is not set</div><div class='add'>+# CONFIG_SK98LIN is not set</div><div class='add'>+# CONFIG_TIGON3 is not set</div><div class='add'>+# CONFIG_BNX2 is not set</div><div class='add'>+CONFIG_GIANFAR=y</div><div class='add'>+# CONFIG_GFAR_NAPI is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ethernet (10000 Mbit)</div><div class='add'>+#</div><div class='add'>+# CONFIG_CHELSIO_T1 is not set</div><div class='add'>+# CONFIG_IXGB is not set</div><div class='add'>+# CONFIG_S2IO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Token Ring devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TR is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wireless LAN (non-hamradio)</div><div class='add'>+#</div><div class='add'>+# CONFIG_NET_RADIO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Wan interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_WAN is not set</div><div class='add'>+# CONFIG_FDDI is not set</div><div class='add'>+# CONFIG_HIPPI is not set</div><div class='add'>+# CONFIG_PPP is not set</div><div class='add'>+# CONFIG_SLIP is not set</div><div class='add'>+# CONFIG_SHAPER is not set</div><div class='add'>+# CONFIG_NETCONSOLE is not set</div><div class='add'>+# CONFIG_NETPOLL is not set</div><div class='add'>+# CONFIG_NET_POLL_CONTROLLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# ISDN subsystem</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISDN is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Telephony Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PHONE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input device support</div><div class='add'>+#</div><div class='add'>+CONFIG_INPUT=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Userland interfaces</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_MOUSEDEV is not set</div><div class='add'>+# CONFIG_INPUT_JOYDEV is not set</div><div class='add'>+# CONFIG_INPUT_TSDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVDEV is not set</div><div class='add'>+# CONFIG_INPUT_EVBUG is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Input Device Drivers</div><div class='add'>+#</div><div class='add'>+# CONFIG_INPUT_KEYBOARD is not set</div><div class='add'>+# CONFIG_INPUT_MOUSE is not set</div><div class='add'>+# CONFIG_INPUT_JOYSTICK is not set</div><div class='add'>+# CONFIG_INPUT_TOUCHSCREEN is not set</div><div class='add'>+# CONFIG_INPUT_MISC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware I/O ports</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIO=y</div><div class='add'>+CONFIG_SERIO_I8042=y</div><div class='add'>+CONFIG_SERIO_SERPORT=y</div><div class='add'>+# CONFIG_SERIO_PCIPS2 is not set</div><div class='add'>+CONFIG_SERIO_LIBPS2=y</div><div class='add'>+# CONFIG_SERIO_RAW is not set</div><div class='add'>+# CONFIG_GAMEPORT is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Character devices</div><div class='add'>+#</div><div class='add'>+CONFIG_VT=y</div><div class='add'>+CONFIG_VT_CONSOLE=y</div><div class='add'>+CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_NONSTANDARD is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Serial drivers</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_8250=y</div><div class='add'>+CONFIG_SERIAL_8250_CONSOLE=y</div><div class='add'>+CONFIG_SERIAL_8250_PCI=y</div><div class='add'>+CONFIG_SERIAL_8250_NR_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_RUNTIME_UARTS=2</div><div class='add'>+CONFIG_SERIAL_8250_EXTENDED=y</div><div class='add'>+CONFIG_SERIAL_8250_MANY_PORTS=y</div><div class='add'>+CONFIG_SERIAL_8250_SHARE_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_DETECT_IRQ=y</div><div class='add'>+CONFIG_SERIAL_8250_RSA=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Non-8250 serial port support</div><div class='add'>+#</div><div class='add'>+CONFIG_SERIAL_CORE=y</div><div class='add'>+CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='add'>+# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_UNIX98_PTYS=y</div><div class='add'>+# CONFIG_LEGACY_PTYS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# IPMI</div><div class='add'>+#</div><div class='add'>+# CONFIG_IPMI_HANDLER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Watchdog Cards</div><div class='add'>+#</div><div class='add'>+# CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_NVRAM is not set</div><div class='add'>+# CONFIG_GEN_RTC is not set</div><div class='add'>+# CONFIG_DTLK is not set</div><div class='add'>+# CONFIG_R3964 is not set</div><div class='add'>+# CONFIG_APPLICOM is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Ftape, the floppy tape device driver</div><div class='add'>+#</div><div class='add'>+# CONFIG_AGP is not set</div><div class='add'>+# CONFIG_DRM is not set</div><div class='add'>+# CONFIG_RAW_DRIVER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# TPM devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_TCG_TPM is not set</div><div class='add'>+# CONFIG_TELCLOCK is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C support</div><div class='add'>+#</div><div class='add'>+CONFIG_I2C=y</div><div class='add'>+# CONFIG_I2C_CHARDEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+CONFIG_I2C_MPC=y</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_PROSAVAGE is not set</div><div class='add'>+# CONFIG_I2C_SAVAGE4 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+CONFIG_SENSORS_EEPROM=y</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_M41T00 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# SPI support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SPI is not set</div><div class='add'>+# CONFIG_SPI_MASTER is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Dallas's 1-wire bus</div><div class='add'>+#</div><div class='add'>+# CONFIG_W1 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware Monitoring support</div><div class='add'>+#</div><div class='add'>+# CONFIG_HWMON is not set</div><div class='add'>+# CONFIG_HWMON_VID is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Misc devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Multimedia devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_VIDEO_DEV is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Digital Video Broadcasting Devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_DVB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Graphics support</div><div class='add'>+#</div><div class='add'>+# CONFIG_FB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Console display driver support</div><div class='add'>+#</div><div class='add'>+CONFIG_VGA_CONSOLE=y</div><div class='add'>+# CONFIG_VGACON_SOFT_SCROLLBACK is not set</div><div class='add'>+CONFIG_DUMMY_CONSOLE=y</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Sound</div><div class='add'>+#</div><div class='add'>+# CONFIG_SOUND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB support</div><div class='add'>+#</div><div class='add'>+CONFIG_USB_ARCH_HAS_HCD=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='add'>+# CONFIG_USB is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# USB Gadget Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_USB_GADGET is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# MMC/SD Card support</div><div class='add'>+#</div><div class='add'>+# CONFIG_MMC is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# InfiniBand support</div><div class='add'>+#</div><div class='add'>+# CONFIG_INFINIBAND is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# File systems</div><div class='add'>+#</div><div class='add'>+CONFIG_EXT2_FS=y</div><div class='add'>+# CONFIG_EXT2_FS_XATTR is not set</div><div class='add'>+# CONFIG_EXT2_FS_XIP is not set</div><div class='add'>+CONFIG_EXT3_FS=y</div><div class='add'>+CONFIG_EXT3_FS_XATTR=y</div><div class='add'>+# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_EXT3_FS_SECURITY is not set</div><div class='add'>+CONFIG_JBD=y</div><div class='add'>+# CONFIG_JBD_DEBUG is not set</div><div class='add'>+CONFIG_FS_MBCACHE=y</div><div class='add'>+# CONFIG_REISERFS_FS is not set</div><div class='add'>+# CONFIG_JFS_FS is not set</div><div class='add'>+# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+# CONFIG_XFS_FS is not set</div><div class='add'>+# CONFIG_OCFS2_FS is not set</div><div class='add'>+# CONFIG_MINIX_FS is not set</div><div class='add'>+# CONFIG_ROMFS_FS is not set</div><div class='add'>+# CONFIG_INOTIFY is not set</div><div class='add'>+# CONFIG_QUOTA is not set</div><div class='add'>+# CONFIG_DNOTIFY is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+# CONFIG_FUSE_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# CD-ROM/DVD Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ISO9660_FS is not set</div><div class='add'>+# CONFIG_UDF_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DOS/FAT/NT Filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_MSDOS_FS is not set</div><div class='add'>+# CONFIG_VFAT_FS is not set</div><div class='add'>+# CONFIG_NTFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Pseudo filesystems</div><div class='add'>+#</div><div class='add'>+CONFIG_PROC_FS=y</div><div class='add'>+CONFIG_PROC_KCORE=y</div><div class='add'>+CONFIG_SYSFS=y</div><div class='add'>+CONFIG_TMPFS=y</div><div class='add'>+# CONFIG_HUGETLB_PAGE is not set</div><div class='add'>+CONFIG_RAMFS=y</div><div class='add'>+# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous filesystems</div><div class='add'>+#</div><div class='add'>+# CONFIG_ADFS_FS is not set</div><div class='add'>+# CONFIG_AFFS_FS is not set</div><div class='add'>+# CONFIG_HFS_FS is not set</div><div class='add'>+# CONFIG_HFSPLUS_FS is not set</div><div class='add'>+# CONFIG_BEFS_FS is not set</div><div class='add'>+# CONFIG_BFS_FS is not set</div><div class='add'>+# CONFIG_EFS_FS is not set</div><div class='add'>+# CONFIG_CRAMFS is not set</div><div class='add'>+# CONFIG_VXFS_FS is not set</div><div class='add'>+# CONFIG_HPFS_FS is not set</div><div class='add'>+# CONFIG_QNX4FS_FS is not set</div><div class='add'>+# CONFIG_SYSV_FS is not set</div><div class='add'>+# CONFIG_UFS_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Network File Systems</div><div class='add'>+#</div><div class='add'>+CONFIG_NFS_FS=y</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+# CONFIG_NFS_V3_ACL is not set</div><div class='add'>+# CONFIG_NFS_V4 is not set</div><div class='add'>+# CONFIG_NFS_DIRECTIO is not set</div><div class='add'>+CONFIG_NFSD=y</div><div class='add'>+# CONFIG_NFSD_V3 is not set</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='add'>+CONFIG_ROOT_NFS=y</div><div class='add'>+CONFIG_LOCKD=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_NFS_COMMON=y</div><div class='add'>+CONFIG_SUNRPC=y</div><div class='add'>+# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+# CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='add'>+# CONFIG_SMB_FS is not set</div><div class='add'>+# CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_NCP_FS is not set</div><div class='add'>+# CONFIG_CODA_FS is not set</div><div class='add'>+# CONFIG_AFS_FS is not set</div><div class='add'>+# CONFIG_9P_FS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Partition Types</div><div class='add'>+#</div><div class='add'>+CONFIG_PARTITION_ADVANCED=y</div><div class='add'>+# CONFIG_ACORN_PARTITION is not set</div><div class='add'>+# CONFIG_OSF_PARTITION is not set</div><div class='add'>+# CONFIG_AMIGA_PARTITION is not set</div><div class='add'>+# CONFIG_ATARI_PARTITION is not set</div><div class='add'>+# CONFIG_MAC_PARTITION is not set</div><div class='add'>+CONFIG_MSDOS_PARTITION=y</div><div class='add'>+# CONFIG_BSD_DISKLABEL is not set</div><div class='add'>+# CONFIG_MINIX_SUBPARTITION is not set</div><div class='add'>+# CONFIG_SOLARIS_X86_PARTITION is not set</div><div class='add'>+# CONFIG_UNIXWARE_DISKLABEL is not set</div><div class='add'>+CONFIG_LDM_PARTITION=y</div><div class='add'>+# CONFIG_LDM_DEBUG is not set</div><div class='add'>+# CONFIG_SGI_PARTITION is not set</div><div class='add'>+# CONFIG_ULTRIX_PARTITION is not set</div><div class='add'>+# CONFIG_SUN_PARTITION is not set</div><div class='add'>+# CONFIG_KARMA_PARTITION is not set</div><div class='add'>+# CONFIG_EFI_PARTITION is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Native Language Support</div><div class='add'>+#</div><div class='add'>+CONFIG_NLS=y</div><div class='add'>+CONFIG_NLS_DEFAULT="iso8859-1"</div><div class='add'>+# CONFIG_NLS_CODEPAGE_437 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_737 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_775 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_850 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_852 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_855 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_857 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_860 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_861 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_862 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_863 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_864 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_865 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_866 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_869 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_936 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_950 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_932 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_949 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_874 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_8 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1250 is not set</div><div class='add'>+# CONFIG_NLS_CODEPAGE_1251 is not set</div><div class='add'>+# CONFIG_NLS_ASCII is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_1 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_2 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_3 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_4 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_5 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_6 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_7 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_9 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_13 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_14 is not set</div><div class='add'>+# CONFIG_NLS_ISO8859_15 is not set</div><div class='add'>+# CONFIG_NLS_KOI8_R is not set</div><div class='add'>+# CONFIG_NLS_KOI8_U is not set</div><div class='add'>+# CONFIG_NLS_UTF8 is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Library routines</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRC_CCITT is not set</div><div class='add'>+# CONFIG_CRC16 is not set</div><div class='add'>+CONFIG_CRC32=y</div><div class='add'>+# CONFIG_LIBCRC32C is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Instrumentation Support</div><div class='add'>+#</div><div class='add'>+# CONFIG_PROFILING is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Kernel hacking</div><div class='add'>+#</div><div class='add'>+# CONFIG_PRINTK_TIME is not set</div><div class='add'>+# CONFIG_MAGIC_SYSRQ is not set</div><div class='add'>+CONFIG_DEBUG_KERNEL=y</div><div class='add'>+CONFIG_LOG_BUF_SHIFT=14</div><div class='add'>+CONFIG_DETECT_SOFTLOCKUP=y</div><div class='add'>+# CONFIG_SCHEDSTATS is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_KOBJECT is not set</div><div class='add'>+# CONFIG_DEBUG_HIGHMEM is not set</div><div class='add'>+# CONFIG_DEBUG_INFO is not set</div><div class='add'>+# CONFIG_DEBUG_FS is not set</div><div class='add'>+# CONFIG_DEBUG_VM is not set</div><div class='add'>+# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_FORCED_INLINING=y</div><div class='add'>+# CONFIG_RCU_TORTURE_TEST is not set</div><div class='add'>+# CONFIG_DEBUGGER is not set</div><div class='add'>+# CONFIG_BDI_SWITCH is not set</div><div class='add'>+# CONFIG_BOOTX_TEXT is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_G5 is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_RTAS is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Security options</div><div class='add'>+#</div><div class='add'>+# CONFIG_KEYS is not set</div><div class='add'>+# CONFIG_SECURITY is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Cryptographic options</div><div class='add'>+#</div><div class='add'>+# CONFIG_CRYPTO is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Hardware crypto devices</div><div class='add'>+#</div><div class='head'>diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig<br/>index 57a027971d67..addc79381c3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pmac32_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/pmac32_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pmac32_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/pmac32_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.16-rc6</div><div class='del'>-# Wed Mar 15 16:21:32 2006</div><div class='add'>+# Linux kernel version: 2.6.17-rc5</div><div class='add'>+# Mon May 29 14:47:49 2006</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_PPC64 is not set</div><div class='ctx'> CONFIG_PPC32=y</div><div class='hunk'>@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='add'>+CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='hunk'>@@ -27,11 +28,11 @@ CONFIG_CLASSIC32=y</div><div class='ctx'> # CONFIG_PPC_52xx is not set</div><div class='ctx'> # CONFIG_PPC_82xx is not set</div><div class='ctx'> # CONFIG_PPC_83xx is not set</div><div class='add'>+# CONFIG_PPC_85xx is not set</div><div class='ctx'> # CONFIG_40x is not set</div><div class='ctx'> # CONFIG_44x is not set</div><div class='ctx'> # CONFIG_8xx is not set</div><div class='ctx'> # CONFIG_E200 is not set</div><div class='del'>-# CONFIG_E500 is not set</div><div class='ctx'> CONFIG_6xx=y</div><div class='ctx'> CONFIG_PPC_FPU=y</div><div class='ctx'> CONFIG_ALTIVEC=y</div><div class='hunk'>@@ -59,6 +60,7 @@ CONFIG_SYSCTL=y</div><div class='ctx'> # CONFIG_AUDIT is not set</div><div class='ctx'> CONFIG_IKCONFIG=y</div><div class='ctx'> CONFIG_IKCONFIG_PROC=y</div><div class='add'>+# CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='hunk'>@@ -73,10 +75,6 @@ CONFIG_BASE_FULL=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='del'>-CONFIG_CC_ALIGN_FUNCTIONS=0</div><div class='del'>-CONFIG_CC_ALIGN_LABELS=0</div><div class='del'>-CONFIG_CC_ALIGN_LOOPS=0</div><div class='del'>-CONFIG_CC_ALIGN_JUMPS=0</div><div class='ctx'> CONFIG_SLAB=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='hunk'>@@ -88,7 +86,6 @@ CONFIG_BASE_SMALL=0</div><div class='ctx'> CONFIG_MODULES=y</div><div class='ctx'> CONFIG_MODULE_UNLOAD=y</div><div class='ctx'> CONFIG_MODULE_FORCE_UNLOAD=y</div><div class='del'>-CONFIG_OBSOLETE_MODPARM=y</div><div class='ctx'> # CONFIG_MODVERSIONS is not set</div><div class='ctx'> # CONFIG_MODULE_SRCVERSION_ALL is not set</div><div class='ctx'> CONFIG_KMOD=y</div><div class='hunk'>@@ -97,6 +94,8 @@ CONFIG_KMOD=y</div><div class='ctx'> # Block layer</div><div class='ctx'> #</div><div class='ctx'> CONFIG_LBD=y</div><div class='add'>+# CONFIG_BLK_DEV_IO_TRACE is not set</div><div class='add'>+CONFIG_LSF=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # IO Schedulers</div><div class='hunk'>@@ -124,6 +123,7 @@ CONFIG_MPIC=y</div><div class='ctx'> # CONFIG_PPC_RTAS is not set</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='ctx'> CONFIG_PPC_MPC106=y</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='ctx'> CONFIG_CPU_FREQ=y</div><div class='ctx'> CONFIG_CPU_FREQ_TABLE=y</div><div class='ctx'> # CONFIG_CPU_FREQ_DEBUG is not set</div><div class='hunk'>@@ -182,7 +182,6 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_PPC_INDIRECT_PCI=y</div><div class='ctx'> CONFIG_PCI=y</div><div class='ctx'> CONFIG_PCI_DOMAINS=y</div><div class='del'>-CONFIG_PCI_LEGACY_PROC=y</div><div class='ctx'> # CONFIG_PCI_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -239,7 +238,9 @@ CONFIG_NET=y</div><div class='ctx'> CONFIG_PACKET=y</div><div class='ctx'> # CONFIG_PACKET_MMAP is not set</div><div class='ctx'> CONFIG_UNIX=y</div><div class='del'>-# CONFIG_NET_KEY is not set</div><div class='add'>+CONFIG_XFRM=y</div><div class='add'>+CONFIG_XFRM_USER=y</div><div class='add'>+CONFIG_NET_KEY=y</div><div class='ctx'> CONFIG_INET=y</div><div class='ctx'> CONFIG_IP_MULTICAST=y</div><div class='ctx'> # CONFIG_IP_ADVANCED_ROUTER is not set</div><div class='hunk'>@@ -250,9 +251,10 @@ CONFIG_IP_FIB_HASH=y</div><div class='ctx'> # CONFIG_IP_MROUTE is not set</div><div class='ctx'> # CONFIG_ARPD is not set</div><div class='ctx'> CONFIG_SYN_COOKIES=y</div><div class='del'>-# CONFIG_INET_AH is not set</div><div class='del'>-# CONFIG_INET_ESP is not set</div><div class='add'>+CONFIG_INET_AH=y</div><div class='add'>+CONFIG_INET_ESP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='add'>+# CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='hunk'>@@ -264,6 +266,8 @@ CONFIG_TCP_CONG_BIC=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IP_VS is not set</div><div class='ctx'> # CONFIG_IPV6 is not set</div><div class='add'>+# CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_TUNNEL is not set</div><div class='ctx'> CONFIG_NETFILTER=y</div><div class='ctx'> # CONFIG_NETFILTER_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -278,12 +282,15 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_TARGET_NOTRACK=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_COMMENT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m</div><div class='del'>-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_DCCP=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_ESP=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_HELPER=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_LENGTH=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_LIMIT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MAC=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_MARK=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_POLICY=m</div><div class='add'>+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_REALM=m</div><div class='ctx'> CONFIG_NETFILTER_XT_MATCH_SCTP=m</div><div class='hunk'>@@ -305,15 +312,15 @@ CONFIG_IP_NF_NETBIOS_NS=m</div><div class='ctx'> CONFIG_IP_NF_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_PPTP=m</div><div class='add'>+CONFIG_IP_NF_H323=m</div><div class='ctx'> # CONFIG_IP_NF_QUEUE is not set</div><div class='ctx'> CONFIG_IP_NF_IPTABLES=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_IPRANGE=m</div><div class='del'>-CONFIG_IP_NF_MATCH_MULTIPORT=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_TOS=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_RECENT=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ECN=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_DSCP=m</div><div class='del'>-CONFIG_IP_NF_MATCH_AH_ESP=m</div><div class='add'>+CONFIG_IP_NF_MATCH_AH=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_TTL=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_OWNER=m</div><div class='ctx'> CONFIG_IP_NF_MATCH_ADDRTYPE=m</div><div class='hunk'>@@ -335,6 +342,7 @@ CONFIG_IP_NF_NAT_FTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_TFTP=m</div><div class='ctx'> CONFIG_IP_NF_NAT_AMANDA=m</div><div class='ctx'> CONFIG_IP_NF_NAT_PPTP=m</div><div class='add'>+CONFIG_IP_NF_NAT_H323=m</div><div class='ctx'> CONFIG_IP_NF_MANGLE=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_TOS=m</div><div class='ctx'> CONFIG_IP_NF_TARGET_ECN=m</div><div class='hunk'>@@ -350,10 +358,12 @@ CONFIG_IP_NF_ARP_MANGLE=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_IP_DCCP=m</div><div class='ctx'> CONFIG_INET_DCCP_DIAG=m</div><div class='add'>+CONFIG_IP_DCCP_ACKVEC=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # DCCP CCIDs Configuration (EXPERIMENTAL)</div><div class='ctx'> #</div><div class='add'>+CONFIG_IP_DCCP_CCID2=m</div><div class='ctx'> CONFIG_IP_DCCP_CCID3=m</div><div class='ctx'> CONFIG_IP_DCCP_TFRC_LIB=m</div><div class='ctx'> </div><div class='hunk'>@@ -361,7 +371,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m</div><div class='ctx'> # DCCP Kernel Hacking</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_IP_DCCP_DEBUG is not set</div><div class='del'>-# CONFIG_IP_DCCP_UNLOAD_HACK is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCTP Configuration (EXPERIMENTAL)</div><div class='hunk'>@@ -477,6 +486,8 @@ CONFIG_IEEE80211=m</div><div class='ctx'> CONFIG_IEEE80211_CRYPT_WEP=m</div><div class='ctx'> CONFIG_IEEE80211_CRYPT_CCMP=m</div><div class='ctx'> CONFIG_IEEE80211_CRYPT_TKIP=m</div><div class='add'>+# CONFIG_IEEE80211_SOFTMAC is not set</div><div class='add'>+CONFIG_WIRELESS_EXT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='hunk'>@@ -662,9 +673,8 @@ CONFIG_SCSI_SYM53C8XX_2=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64</div><div class='del'>-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_MMIO=y</div><div class='ctx'> # CONFIG_SCSI_IPR is not set</div><div class='del'>-# CONFIG_SCSI_QLOGIC_FC is not set</div><div class='ctx'> # CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='ctx'> # CONFIG_SCSI_QLA_FC is not set</div><div class='ctx'> # CONFIG_SCSI_LPFC is not set</div><div class='hunk'>@@ -694,16 +704,17 @@ CONFIG_BLK_DEV_MD=m</div><div class='ctx'> CONFIG_MD_LINEAR=m</div><div class='ctx'> CONFIG_MD_RAID0=m</div><div class='ctx'> CONFIG_MD_RAID1=m</div><div class='del'>-# CONFIG_MD_RAID10 is not set</div><div class='add'>+CONFIG_MD_RAID10=m</div><div class='ctx'> CONFIG_MD_RAID5=m</div><div class='add'>+CONFIG_MD_RAID5_RESHAPE=y</div><div class='ctx'> CONFIG_MD_RAID6=m</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> CONFIG_MD_FAULTY=m</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='ctx'> CONFIG_DM_CRYPT=m</div><div class='del'>-# CONFIG_DM_SNAPSHOT is not set</div><div class='del'>-# CONFIG_DM_MIRROR is not set</div><div class='del'>-# CONFIG_DM_ZERO is not set</div><div class='add'>+CONFIG_DM_SNAPSHOT=m</div><div class='add'>+CONFIG_DM_MIRROR=m</div><div class='add'>+CONFIG_DM_ZERO=m</div><div class='ctx'> # CONFIG_DM_MULTIPATH is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -740,7 +751,7 @@ CONFIG_IEEE1394_OHCI1394=m</div><div class='ctx'> CONFIG_IEEE1394_VIDEO1394=m</div><div class='ctx'> CONFIG_IEEE1394_SBP2=m</div><div class='ctx'> # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set</div><div class='del'>-CONFIG_IEEE1394_ETH1394=m</div><div class='add'>+# CONFIG_IEEE1394_ETH1394 is not set</div><div class='ctx'> CONFIG_IEEE1394_DV1394=m</div><div class='ctx'> CONFIG_IEEE1394_RAWIO=m</div><div class='ctx'> </div><div class='hunk'>@@ -769,10 +780,10 @@ CONFIG_THERM_ADT746X=m</div><div class='ctx'> # Network device support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NETDEVICES=y</div><div class='del'>-# CONFIG_DUMMY is not set</div><div class='add'>+CONFIG_DUMMY=m</div><div class='ctx'> # CONFIG_BONDING is not set</div><div class='ctx'> # CONFIG_EQUALIZER is not set</div><div class='del'>-# CONFIG_TUN is not set</div><div class='add'>+CONFIG_TUN=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ARCnet devices</div><div class='hunk'>@@ -857,6 +868,7 @@ CONFIG_PCNET32=y</div><div class='ctx'> # Wireless LAN (non-hamradio)</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_RADIO=y</div><div class='add'>+# CONFIG_NET_WIRELESS_RTNETLINK is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Obsolete Wireless cards support (pre-802.11)</div><div class='hunk'>@@ -992,6 +1004,7 @@ CONFIG_HW_CONSOLE=y</div><div class='ctx'> # Serial drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SERIAL_8250=m</div><div class='add'>+CONFIG_SERIAL_8250_PCI=m</div><div class='ctx'> # CONFIG_SERIAL_8250_CS is not set</div><div class='ctx'> CONFIG_SERIAL_8250_NR_UARTS=4</div><div class='ctx'> CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='hunk'>@@ -1027,6 +1040,7 @@ CONFIG_GEN_RTC=y</div><div class='ctx'> # Ftape, the floppy tape device driver</div><div class='ctx'> #</div><div class='ctx'> CONFIG_AGP=m</div><div class='add'>+# CONFIG_AGP_VIA is not set</div><div class='ctx'> CONFIG_AGP_UNINORTH=m</div><div class='ctx'> CONFIG_DRM=m</div><div class='ctx'> # CONFIG_DRM_TDFX is not set</div><div class='hunk'>@@ -1081,7 +1095,6 @@ CONFIG_I2C_POWERMAC=y</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_PROSAVAGE is not set</div><div class='ctx'> # CONFIG_I2C_SAVAGE4 is not set</div><div class='del'>-# CONFIG_SCx200_ACB is not set</div><div class='ctx'> # CONFIG_I2C_SIS5595 is not set</div><div class='ctx'> # CONFIG_I2C_SIS630 is not set</div><div class='ctx'> # CONFIG_I2C_SIS96X is not set</div><div class='hunk'>@@ -1100,10 +1113,8 @@ CONFIG_I2C_POWERMAC=y</div><div class='ctx'> # CONFIG_SENSORS_PCF8574 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCA9539 is not set</div><div class='ctx'> # CONFIG_SENSORS_PCF8591 is not set</div><div class='del'>-# CONFIG_SENSORS_RTC8564 is not set</div><div class='ctx'> # CONFIG_SENSORS_M41T00 is not set</div><div class='ctx'> # CONFIG_SENSORS_MAX6875 is not set</div><div class='del'>-# CONFIG_RTC_X1205_I2C is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_CORE is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_ALGO is not set</div><div class='ctx'> # CONFIG_I2C_DEBUG_BUS is not set</div><div class='hunk'>@@ -1131,18 +1142,16 @@ CONFIG_I2C_POWERMAC=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# Multimedia Capabilities Port drivers</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_DVB is not set</div><div class='add'>+# CONFIG_USB_DABUSB is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='hunk'>@@ -1152,6 +1161,7 @@ CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> CONFIG_FB_MACMODES=y</div><div class='add'>+CONFIG_FB_FIRMWARE_EDID=y</div><div class='ctx'> CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> CONFIG_FB_TILEBLITTING=y</div><div class='ctx'> # CONFIG_FB_CIRRUS is not set</div><div class='hunk'>@@ -1175,7 +1185,6 @@ CONFIG_FB_MATROX_MYSTIQUE=y</div><div class='ctx'> # CONFIG_FB_MATROX_G is not set</div><div class='ctx'> # CONFIG_FB_MATROX_I2C is not set</div><div class='ctx'> # CONFIG_FB_MATROX_MULTIHEAD is not set</div><div class='del'>-# CONFIG_FB_RADEON_OLD is not set</div><div class='ctx'> CONFIG_FB_RADEON=y</div><div class='ctx'> CONFIG_FB_RADEON_I2C=y</div><div class='ctx'> # CONFIG_FB_RADEON_DEBUG is not set</div><div class='hunk'>@@ -1234,9 +1243,11 @@ CONFIG_SND_SEQ_DUMMY=m</div><div class='ctx'> CONFIG_SND_OSSEMUL=y</div><div class='ctx'> CONFIG_SND_MIXER_OSS=m</div><div class='ctx'> CONFIG_SND_PCM_OSS=m</div><div class='add'>+CONFIG_SND_PCM_OSS_PLUGINS=y</div><div class='ctx'> CONFIG_SND_SEQUENCER_OSS=y</div><div class='ctx'> # CONFIG_SND_DYNAMIC_MINORS is not set</div><div class='ctx'> CONFIG_SND_SUPPORT_OLD_API=y</div><div class='add'>+CONFIG_SND_VERBOSE_PROCFS=y</div><div class='ctx'> # CONFIG_SND_VERBOSE_PRINTK is not set</div><div class='ctx'> # CONFIG_SND_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1253,6 +1264,7 @@ CONFIG_SND_DUMMY=m</div><div class='ctx'> # PCI devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_SND_AD1889 is not set</div><div class='add'>+# CONFIG_SND_ALS300 is not set</div><div class='ctx'> # CONFIG_SND_ALS4000 is not set</div><div class='ctx'> # CONFIG_SND_ALI5451 is not set</div><div class='ctx'> # CONFIG_SND_ATIIXP is not set</div><div class='hunk'>@@ -1285,6 +1297,7 @@ CONFIG_SND_DUMMY=m</div><div class='ctx'> # CONFIG_SND_MIXART is not set</div><div class='ctx'> # CONFIG_SND_NM256 is not set</div><div class='ctx'> # CONFIG_SND_PCXHR is not set</div><div class='add'>+# CONFIG_SND_RIPTIDE is not set</div><div class='ctx'> # CONFIG_SND_RME32 is not set</div><div class='ctx'> # CONFIG_SND_RME96 is not set</div><div class='ctx'> # CONFIG_SND_RME9652 is not set</div><div class='hunk'>@@ -1310,6 +1323,8 @@ CONFIG_SND_USB_AUDIO=m</div><div class='ctx'> #</div><div class='ctx'> # PCMCIA devices</div><div class='ctx'> #</div><div class='add'>+# CONFIG_SND_VXPOCKET is not set</div><div class='add'>+# CONFIG_SND_PDAUDIOCF is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Open Sound System</div><div class='hunk'>@@ -1321,6 +1336,7 @@ CONFIG_SND_USB_AUDIO=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_USB_ARCH_HAS_HCD=y</div><div class='ctx'> CONFIG_USB_ARCH_HAS_OHCI=y</div><div class='add'>+CONFIG_USB_ARCH_HAS_EHCI=y</div><div class='ctx'> CONFIG_USB=y</div><div class='ctx'> # CONFIG_USB_DEBUG is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1336,7 +1352,9 @@ CONFIG_USB_DYNAMIC_MINORS=y</div><div class='ctx'> #</div><div class='ctx'> # USB Host Controller Drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_USB_EHCI_HCD is not set</div><div class='add'>+CONFIG_USB_EHCI_HCD=m</div><div class='add'>+CONFIG_USB_EHCI_SPLIT_ISO=y</div><div class='add'>+CONFIG_USB_EHCI_ROOT_HUB_TT=y</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -1347,7 +1365,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y</div><div class='ctx'> #</div><div class='ctx'> # USB Device Class drivers</div><div class='ctx'> #</div><div class='del'>-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set</div><div class='ctx'> CONFIG_USB_ACM=m</div><div class='ctx'> CONFIG_USB_PRINTER=m</div><div class='ctx'> </div><div class='hunk'>@@ -1358,7 +1375,17 @@ CONFIG_USB_PRINTER=m</div><div class='ctx'> #</div><div class='ctx'> # may also be needed; see USB_STORAGE Help for more information</div><div class='ctx'> #</div><div class='del'>-# CONFIG_USB_STORAGE is not set</div><div class='add'>+CONFIG_USB_STORAGE=m</div><div class='add'>+# CONFIG_USB_STORAGE_DEBUG is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DATAFAB is not set</div><div class='add'>+# CONFIG_USB_STORAGE_FREECOM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ISD200 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_DPCM is not set</div><div class='add'>+# CONFIG_USB_STORAGE_USBAT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR09 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_SDDR55 is not set</div><div class='add'>+# CONFIG_USB_STORAGE_JUMPSHOT is not set</div><div class='add'>+# CONFIG_USB_STORAGE_ALAUDA is not set</div><div class='ctx'> # CONFIG_USB_LIBUSUAL is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1374,9 +1401,7 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y</div><div class='ctx'> # CONFIG_USB_ACECAD is not set</div><div class='ctx'> # CONFIG_USB_KBTAB is not set</div><div class='ctx'> # CONFIG_USB_POWERMATE is not set</div><div class='del'>-# CONFIG_USB_MTOUCH is not set</div><div class='del'>-# CONFIG_USB_ITMTOUCH is not set</div><div class='del'>-# CONFIG_USB_EGALAX is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='ctx'> # CONFIG_USB_YEALINK is not set</div><div class='ctx'> # CONFIG_USB_XPAD is not set</div><div class='ctx'> # CONFIG_USB_ATI_REMOTE is not set</div><div class='hunk'>@@ -1391,15 +1416,6 @@ CONFIG_USB_APPLETOUCH=y</div><div class='ctx'> # CONFIG_USB_MICROTEK is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# USB Multimedia devices</div><div class='del'>-#</div><div class='del'>-# CONFIG_USB_DABUSB is not set</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Video4Linux support is needed for USB Multimedia device support</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-#</div><div class='ctx'> # USB Network Adapters</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USB_CATC is not set</div><div class='hunk'>@@ -1429,6 +1445,7 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> # CONFIG_USB_SERIAL_GENERIC is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_AIRPRIME is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_ANYDATA is not set</div><div class='add'>+# CONFIG_USB_SERIAL_ARK3116 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_BELKIN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_WHITEHEAT is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set</div><div class='hunk'>@@ -1436,6 +1453,7 @@ CONFIG_USB_SERIAL=m</div><div class='ctx'> # CONFIG_USB_SERIAL_CYPRESS_M8 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_EMPEG is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_FTDI_SIO is not set</div><div class='add'>+# CONFIG_USB_SERIAL_FUNSOFT is not set</div><div class='ctx'> CONFIG_USB_SERIAL_VISOR=m</div><div class='ctx'> CONFIG_USB_SERIAL_IPAQ=m</div><div class='ctx'> # CONFIG_USB_SERIAL_IR is not set</div><div class='hunk'>@@ -1460,6 +1478,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y</div><div class='ctx'> # CONFIG_USB_SERIAL_KLSI is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_KOBIL_SCT is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_MCT_U232 is not set</div><div class='add'>+# CONFIG_USB_SERIAL_NAVMAN is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_PL2303 is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_HP4X is not set</div><div class='ctx'> # CONFIG_USB_SERIAL_SAFE is not set</div><div class='hunk'>@@ -1484,6 +1503,7 @@ CONFIG_USB_EZUSB=y</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='ctx'> </div><div class='hunk'>@@ -1502,6 +1522,19 @@ CONFIG_USB_EZUSB=y</div><div class='ctx'> # CONFIG_MMC is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# LED devices</div><div class='add'>+#</div><div class='add'>+# CONFIG_NEW_LEDS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # InfiniBand support</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_INFINIBAND is not set</div><div class='hunk'>@@ -1511,6 +1544,11 @@ CONFIG_USB_EZUSB=y</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# Real Time Clock</div><div class='add'>+#</div><div class='add'>+# CONFIG_RTC_CLASS is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # File systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_EXT2_FS=y</div><div class='hunk'>@@ -1518,14 +1556,14 @@ CONFIG_EXT2_FS=y</div><div class='ctx'> # CONFIG_EXT2_FS_XIP is not set</div><div class='ctx'> CONFIG_EXT3_FS=y</div><div class='ctx'> CONFIG_EXT3_FS_XATTR=y</div><div class='del'>-# CONFIG_EXT3_FS_POSIX_ACL is not set</div><div class='add'>+CONFIG_EXT3_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_EXT3_FS_SECURITY is not set</div><div class='ctx'> CONFIG_JBD=y</div><div class='ctx'> # CONFIG_JBD_DEBUG is not set</div><div class='ctx'> CONFIG_FS_MBCACHE=y</div><div class='ctx'> # CONFIG_REISERFS_FS is not set</div><div class='ctx'> # CONFIG_JFS_FS is not set</div><div class='del'>-# CONFIG_FS_POSIX_ACL is not set</div><div class='add'>+CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_FS is not set</div><div class='ctx'> # CONFIG_OCFS2_FS is not set</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='hunk'>@@ -1534,7 +1572,7 @@ CONFIG_INOTIFY=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='del'>-# CONFIG_AUTOFS4_FS is not set</div><div class='add'>+CONFIG_AUTOFS4_FS=m</div><div class='ctx'> CONFIG_FUSE_FS=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1566,7 +1604,6 @@ CONFIG_SYSFS=y</div><div class='ctx'> CONFIG_TMPFS=y</div><div class='ctx'> # CONFIG_HUGETLB_PAGE is not set</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='del'>-CONFIG_RELAYFS_FS=m</div><div class='ctx'> # CONFIG_CONFIGFS_FS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1590,17 +1627,24 @@ CONFIG_HFSPLUS_FS=m</div><div class='ctx'> # Network File Systems</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NFS_FS=y</div><div class='del'>-# CONFIG_NFS_V3 is not set</div><div class='del'>-# CONFIG_NFS_V4 is not set</div><div class='add'>+CONFIG_NFS_V3=y</div><div class='add'>+CONFIG_NFS_V3_ACL=y</div><div class='add'>+CONFIG_NFS_V4=y</div><div class='ctx'> # CONFIG_NFS_DIRECTIO is not set</div><div class='del'>-CONFIG_NFSD=y</div><div class='del'>-# CONFIG_NFSD_V3 is not set</div><div class='del'>-# CONFIG_NFSD_TCP is not set</div><div class='add'>+CONFIG_NFSD=m</div><div class='add'>+CONFIG_NFSD_V2_ACL=y</div><div class='add'>+CONFIG_NFSD_V3=y</div><div class='add'>+CONFIG_NFSD_V3_ACL=y</div><div class='add'>+CONFIG_NFSD_V4=y</div><div class='add'>+CONFIG_NFSD_TCP=y</div><div class='ctx'> CONFIG_LOCKD=y</div><div class='del'>-CONFIG_EXPORTFS=y</div><div class='add'>+CONFIG_LOCKD_V4=y</div><div class='add'>+CONFIG_EXPORTFS=m</div><div class='add'>+CONFIG_NFS_ACL_SUPPORT=y</div><div class='ctx'> CONFIG_NFS_COMMON=y</div><div class='ctx'> CONFIG_SUNRPC=y</div><div class='del'>-# CONFIG_RPCSEC_GSS_KRB5 is not set</div><div class='add'>+CONFIG_SUNRPC_GSS=y</div><div class='add'>+CONFIG_RPCSEC_GSS_KRB5=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> CONFIG_SMB_FS=m</div><div class='ctx'> # CONFIG_SMB_NLS_DEFAULT is not set</div><div class='hunk'>@@ -1681,7 +1725,7 @@ CONFIG_NLS_UTF8=m</div><div class='ctx'> CONFIG_CRC_CCITT=y</div><div class='ctx'> CONFIG_CRC16=y</div><div class='ctx'> CONFIG_CRC32=y</div><div class='del'>-# CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='ctx'> CONFIG_TEXTSEARCH=y</div><div class='hunk'>@@ -1735,29 +1779,29 @@ CONFIG_BOOTX_TEXT=y</div><div class='ctx'> # Cryptographic options</div><div class='ctx'> #</div><div class='ctx'> CONFIG_CRYPTO=y</div><div class='del'>-# CONFIG_CRYPTO_HMAC is not set</div><div class='del'>-# CONFIG_CRYPTO_NULL is not set</div><div class='del'>-# CONFIG_CRYPTO_MD4 is not set</div><div class='del'>-# CONFIG_CRYPTO_MD5 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA1 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA256 is not set</div><div class='del'>-# CONFIG_CRYPTO_SHA512 is not set</div><div class='del'>-# CONFIG_CRYPTO_WP512 is not set</div><div class='del'>-# CONFIG_CRYPTO_TGR192 is not set</div><div class='del'>-# CONFIG_CRYPTO_DES is not set</div><div class='del'>-# CONFIG_CRYPTO_BLOWFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_TWOFISH is not set</div><div class='del'>-# CONFIG_CRYPTO_SERPENT is not set</div><div class='add'>+CONFIG_CRYPTO_HMAC=y</div><div class='add'>+CONFIG_CRYPTO_NULL=m</div><div class='add'>+CONFIG_CRYPTO_MD4=m</div><div class='add'>+CONFIG_CRYPTO_MD5=y</div><div class='add'>+CONFIG_CRYPTO_SHA1=y</div><div class='add'>+CONFIG_CRYPTO_SHA256=m</div><div class='add'>+CONFIG_CRYPTO_SHA512=m</div><div class='add'>+CONFIG_CRYPTO_WP512=m</div><div class='add'>+CONFIG_CRYPTO_TGR192=m</div><div class='add'>+CONFIG_CRYPTO_DES=y</div><div class='add'>+CONFIG_CRYPTO_BLOWFISH=m</div><div class='add'>+CONFIG_CRYPTO_TWOFISH=m</div><div class='add'>+CONFIG_CRYPTO_SERPENT=m</div><div class='ctx'> CONFIG_CRYPTO_AES=m</div><div class='del'>-# CONFIG_CRYPTO_CAST5 is not set</div><div class='del'>-# CONFIG_CRYPTO_CAST6 is not set</div><div class='del'>-# CONFIG_CRYPTO_TEA is not set</div><div class='add'>+CONFIG_CRYPTO_CAST5=m</div><div class='add'>+CONFIG_CRYPTO_CAST6=m</div><div class='add'>+CONFIG_CRYPTO_TEA=m</div><div class='ctx'> CONFIG_CRYPTO_ARC4=m</div><div class='del'>-# CONFIG_CRYPTO_KHAZAD is not set</div><div class='del'>-# CONFIG_CRYPTO_ANUBIS is not set</div><div class='del'>-# CONFIG_CRYPTO_DEFLATE is not set</div><div class='add'>+CONFIG_CRYPTO_KHAZAD=m</div><div class='add'>+CONFIG_CRYPTO_ANUBIS=m</div><div class='add'>+CONFIG_CRYPTO_DEFLATE=m</div><div class='ctx'> CONFIG_CRYPTO_MICHAEL_MIC=m</div><div class='del'>-# CONFIG_CRYPTO_CRC32C is not set</div><div class='add'>+CONFIG_CRYPTO_CRC32C=m</div><div class='ctx'> # CONFIG_CRYPTO_TEST is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig<br/>index 58e68ce09b0f..31708ad4574e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pseries_defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/configs/pseries_defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/configs/pseries_defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/configs/pseries_defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc1</div><div class='del'>-# Wed Apr 19 11:48:00 2006</div><div class='add'>+# Linux kernel version: 2.6.17-rc4</div><div class='add'>+# Sun May 28 07:26:56 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PPC64=y</div><div class='ctx'> CONFIG_64BIT=y</div><div class='hunk'>@@ -11,6 +11,7 @@ CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_RWSEM_XCHGADD_ALGORITHM=y</div><div class='ctx'> CONFIG_GENERIC_HWEIGHT=y</div><div class='ctx'> CONFIG_GENERIC_CALIBRATE_DELAY=y</div><div class='add'>+CONFIG_GENERIC_FIND_NEXT_BIT=y</div><div class='ctx'> CONFIG_PPC=y</div><div class='ctx'> CONFIG_EARLY_PRINTK=y</div><div class='ctx'> CONFIG_COMPAT=y</div><div class='hunk'>@@ -126,8 +127,9 @@ CONFIG_RTAS_PROC=y</div><div class='ctx'> CONFIG_RTAS_FLASH=m</div><div class='ctx'> # CONFIG_MMIO_NVRAM is not set</div><div class='ctx'> CONFIG_IBMVIO=y</div><div class='del'>-# CONFIG_IBMEBUS is not set</div><div class='add'>+CONFIG_IBMEBUS=y</div><div class='ctx'> # CONFIG_PPC_MPC106 is not set</div><div class='add'>+# CONFIG_PPC_970_NAP is not set</div><div class='ctx'> # CONFIG_CPU_FREQ is not set</div><div class='ctx'> # CONFIG_WANT_EARLY_SERIAL is not set</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +145,7 @@ CONFIG_PREEMPT_NONE=y</div><div class='ctx'> # CONFIG_PREEMPT is not set</div><div class='ctx'> # CONFIG_PREEMPT_BKL is not set</div><div class='ctx'> CONFIG_BINFMT_ELF=y</div><div class='del'>-# CONFIG_BINFMT_MISC is not set</div><div class='add'>+CONFIG_BINFMT_MISC=m</div><div class='ctx'> CONFIG_FORCE_MAX_ZONEORDER=13</div><div class='ctx'> CONFIG_IOMMU_VMERGE=y</div><div class='ctx'> CONFIG_HOTPLUG_CPU=y</div><div class='hunk'>@@ -155,6 +157,7 @@ CONFIG_EEH=y</div><div class='ctx'> CONFIG_SCANLOG=m</div><div class='ctx'> CONFIG_LPARCFG=y</div><div class='ctx'> CONFIG_NUMA=y</div><div class='add'>+CONFIG_NODES_SHIFT=4</div><div class='ctx'> CONFIG_ARCH_SELECT_MEMORY_MODEL=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_ENABLE=y</div><div class='ctx'> CONFIG_ARCH_SPARSEMEM_DEFAULT=y</div><div class='hunk'>@@ -467,7 +470,7 @@ CONFIG_SCSI_CONSTANTS=y</div><div class='ctx'> CONFIG_SCSI_SPI_ATTRS=y</div><div class='ctx'> CONFIG_SCSI_FC_ATTRS=y</div><div class='ctx'> CONFIG_SCSI_ISCSI_ATTRS=m</div><div class='del'>-# CONFIG_SCSI_SAS_ATTRS is not set</div><div class='add'>+CONFIG_SCSI_SAS_ATTRS=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SCSI low-level drivers</div><div class='hunk'>@@ -499,13 +502,18 @@ CONFIG_SCSI_SYM53C8XX_2=y</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16</div><div class='ctx'> CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64</div><div class='del'>-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set</div><div class='add'>+CONFIG_SCSI_SYM53C8XX_MMIO=y</div><div class='ctx'> CONFIG_SCSI_IPR=y</div><div class='ctx'> CONFIG_SCSI_IPR_TRACE=y</div><div class='ctx'> CONFIG_SCSI_IPR_DUMP=y</div><div class='del'>-# CONFIG_SCSI_QLOGIC_FC is not set</div><div class='ctx'> # CONFIG_SCSI_QLOGIC_1280 is not set</div><div class='del'>-# CONFIG_SCSI_QLA_FC is not set</div><div class='add'>+CONFIG_SCSI_QLA_FC=m</div><div class='add'>+CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y</div><div class='add'>+CONFIG_SCSI_QLA21XX=m</div><div class='add'>+CONFIG_SCSI_QLA22XX=m</div><div class='add'>+CONFIG_SCSI_QLA2300=m</div><div class='add'>+CONFIG_SCSI_QLA2322=m</div><div class='add'>+CONFIG_SCSI_QLA24XX=m</div><div class='ctx'> CONFIG_SCSI_LPFC=m</div><div class='ctx'> # CONFIG_SCSI_DC395x is not set</div><div class='ctx'> # CONFIG_SCSI_DC390T is not set</div><div class='hunk'>@@ -521,7 +529,7 @@ CONFIG_MD_RAID0=y</div><div class='ctx'> CONFIG_MD_RAID1=y</div><div class='ctx'> CONFIG_MD_RAID10=m</div><div class='ctx'> CONFIG_MD_RAID5=y</div><div class='del'>-# CONFIG_MD_RAID5_RESHAPE is not set</div><div class='add'>+CONFIG_MD_RAID5_RESHAPE=y</div><div class='ctx'> CONFIG_MD_RAID6=m</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> CONFIG_MD_FAULTY=m</div><div class='hunk'>@@ -764,7 +772,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4</div><div class='ctx'> CONFIG_SERIAL_CORE=y</div><div class='ctx'> CONFIG_SERIAL_CORE_CONSOLE=y</div><div class='ctx'> CONFIG_SERIAL_ICOM=m</div><div class='del'>-# CONFIG_SERIAL_JSM is not set</div><div class='add'>+CONFIG_SERIAL_JSM=m</div><div class='ctx'> CONFIG_UNIX98_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTYS=y</div><div class='ctx'> CONFIG_LEGACY_PTY_COUNT=256</div><div class='hunk'>@@ -773,7 +781,7 @@ CONFIG_LEGACY_PTY_COUNT=256</div><div class='ctx'> # CONFIG_TIPAR is not set</div><div class='ctx'> CONFIG_HVC_DRIVER=y</div><div class='ctx'> CONFIG_HVC_CONSOLE=y</div><div class='del'>-# CONFIG_HVC_RTAS is not set</div><div class='add'>+CONFIG_HVC_RTAS=y</div><div class='ctx'> CONFIG_HVCS=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -1031,9 +1039,7 @@ CONFIG_USB_HIDDEV=y</div><div class='ctx'> # CONFIG_USB_ACECAD is not set</div><div class='ctx'> # CONFIG_USB_KBTAB is not set</div><div class='ctx'> # CONFIG_USB_POWERMATE is not set</div><div class='del'>-# CONFIG_USB_MTOUCH is not set</div><div class='del'>-# CONFIG_USB_ITMTOUCH is not set</div><div class='del'>-# CONFIG_USB_EGALAX is not set</div><div class='add'>+# CONFIG_USB_TOUCHSCREEN is not set</div><div class='ctx'> # CONFIG_USB_YEALINK is not set</div><div class='ctx'> # CONFIG_USB_XPAD is not set</div><div class='ctx'> # CONFIG_USB_ATI_REMOTE is not set</div><div class='hunk'>@@ -1105,16 +1111,25 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_NEW_LEDS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# LED drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# LED Triggers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # InfiniBand support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_INFINIBAND=m</div><div class='del'>-# CONFIG_INFINIBAND_USER_MAD is not set</div><div class='del'>-# CONFIG_INFINIBAND_USER_ACCESS is not set</div><div class='add'>+CONFIG_INFINIBAND_USER_MAD=m</div><div class='add'>+CONFIG_INFINIBAND_USER_ACCESS=m</div><div class='ctx'> CONFIG_INFINIBAND_MTHCA=m</div><div class='del'>-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set</div><div class='add'>+CONFIG_INFINIBAND_MTHCA_DEBUG=y</div><div class='ctx'> CONFIG_INFINIBAND_IPOIB=m</div><div class='del'>-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set</div><div class='del'>-# CONFIG_INFINIBAND_SRP is not set</div><div class='add'>+CONFIG_INFINIBAND_IPOIB_DEBUG=y</div><div class='add'>+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set</div><div class='add'>+CONFIG_INFINIBAND_SRP=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)</div><div class='hunk'>@@ -1159,15 +1174,15 @@ CONFIG_XFS_EXPORT=y</div><div class='ctx'> CONFIG_XFS_SECURITY=y</div><div class='ctx'> CONFIG_XFS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_XFS_RT is not set</div><div class='del'>-# CONFIG_OCFS2_FS is not set</div><div class='add'>+CONFIG_OCFS2_FS=m</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='del'>-CONFIG_AUTOFS_FS=m</div><div class='del'>-# CONFIG_AUTOFS4_FS is not set</div><div class='del'>-# CONFIG_FUSE_FS is not set</div><div class='add'>+# CONFIG_AUTOFS_FS is not set</div><div class='add'>+CONFIG_AUTOFS4_FS=m</div><div class='add'>+CONFIG_FUSE_FS=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CD-ROM/DVD Filesystems</div><div class='hunk'>@@ -1199,7 +1214,7 @@ CONFIG_TMPFS=y</div><div class='ctx'> CONFIG_HUGETLBFS=y</div><div class='ctx'> CONFIG_HUGETLB_PAGE=y</div><div class='ctx'> CONFIG_RAMFS=y</div><div class='del'>-# CONFIG_CONFIGFS_FS is not set</div><div class='add'>+CONFIG_CONFIGFS_FS=m</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Miscellaneous filesystems</div><div class='hunk'>@@ -1317,7 +1332,7 @@ CONFIG_ZLIB_DEFLATE=m</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PROFILING=y</div><div class='ctx'> CONFIG_OPROFILE=y</div><div class='del'>-# CONFIG_KPROBES is not set</div><div class='add'>+CONFIG_KPROBES=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='hunk'>@@ -1329,7 +1344,7 @@ CONFIG_LOG_BUF_SHIFT=17</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-CONFIG_DEBUG_MUTEXES=y</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='hunk'>@@ -1339,17 +1354,13 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='del'>-CONFIG_DEBUG_STACK_USAGE=y</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> CONFIG_DEBUGGER=y</div><div class='ctx'> CONFIG_XMON=y</div><div class='ctx'> CONFIG_XMON_DEFAULT=y</div><div class='ctx'> CONFIG_IRQSTACKS=y</div><div class='ctx'> # CONFIG_BOOTX_TEXT is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_LPAR is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_G5 is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_RTAS is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set</div><div class='del'>-# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set</div><div class='add'>+# CONFIG_PPC_EARLY_DEBUG is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='head'>diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile<br/>index 803858e86160..814f242aeb8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/Makefile</a></div><div class='hunk'>@@ -50,7 +50,8 @@ extra-$(CONFIG_FSL_BOOKE)	:= head_fsl_booke.o</div><div class='ctx'> extra-$(CONFIG_8xx)		:= head_8xx.o</div><div class='ctx'> extra-y				+= vmlinux.lds</div><div class='ctx'> </div><div class='del'>-obj-y				+= time.o prom.o traps.o setup-common.o udbg.o</div><div class='add'>+obj-y				+= time.o prom.o traps.o setup-common.o \</div><div class='add'>+				   udbg.o misc.o</div><div class='ctx'> obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o</div><div class='ctx'> obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o</div><div class='ctx'> obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o</div><div class='head'>diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c<br/>index faaec9c6f78f..4734b5de599d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/align.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/align.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/align.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/align.c</a></div><div class='hunk'>@@ -35,17 +35,19 @@ struct aligninfo {</div><div class='ctx'> </div><div class='ctx'> #define INVALID	{ 0, 0 }</div><div class='ctx'> </div><div class='del'>-#define LD	1	/* load */</div><div class='del'>-#define ST	2	/* store */</div><div class='del'>-#define	SE	4	/* sign-extend value */</div><div class='del'>-#define F	8	/* to/from fp regs */</div><div class='del'>-#define U	0x10	/* update index register */</div><div class='del'>-#define M	0x20	/* multiple load/store */</div><div class='del'>-#define SW	0x40	/* byte swap int or ... */</div><div class='del'>-#define S	0x40	/* ... single-precision fp */</div><div class='del'>-#define SX	0x40	/* byte count in XER */</div><div class='add'>+/* Bits in the flags field */</div><div class='add'>+#define LD	0	/* load */</div><div class='add'>+#define ST	1	/* store */</div><div class='add'>+#define	SE	2	/* sign-extend value */</div><div class='add'>+#define F	4	/* to/from fp regs */</div><div class='add'>+#define U	8	/* update index register */</div><div class='add'>+#define M	0x10	/* multiple load/store */</div><div class='add'>+#define SW	0x20	/* byte swap */</div><div class='add'>+#define S	0x40	/* single-precision fp or... */</div><div class='add'>+#define SX	0x40	/* ... byte count in XER */</div><div class='ctx'> #define HARD	0x80	/* string, stwcx. */</div><div class='ctx'> </div><div class='add'>+/* DSISR bits reported for a DCBZ instruction: */</div><div class='ctx'> #define DCBZ	0x5f	/* 8xx/82xx dcbz faults when cache not enabled */</div><div class='ctx'> </div><div class='ctx'> #define SWAP(a, b)	(t = (a), (a) = (b), (b) = t)</div><div class='hunk'>@@ -256,12 +258,16 @@ static int emulate_dcbz(struct pt_regs *regs, unsigned char __user *addr)</div><div class='ctx'> #define REG_BYTE(rp, i)		*((u8 *)(rp) + (i))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define SWIZ_PTR(p)		((unsigned char __user *)((p) ^ swiz))</div><div class='add'>+</div><div class='ctx'> static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,</div><div class='ctx'> 			    unsigned int reg, unsigned int nb,</div><div class='del'>-			    unsigned int flags, unsigned int instr)</div><div class='add'>+			    unsigned int flags, unsigned int instr,</div><div class='add'>+			    unsigned long swiz)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *rptr;</div><div class='del'>-	unsigned int nb0, i;</div><div class='add'>+	unsigned int nb0, i, bswiz;</div><div class='add'>+	unsigned long p;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We do not try to emulate 8 bytes multiple as they aren't really</div><div class='hunk'>@@ -280,9 +286,12 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,</div><div class='ctx'> 			if (nb == 0)</div><div class='ctx'> 				return 1;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (__get_user(instr,</div><div class='del'>-				       (unsigned int __user *)regs-&gt;nip))</div><div class='add'>+			unsigned long pc = regs-&gt;nip ^ (swiz &amp; 4);</div><div class='add'>+</div><div class='add'>+			if (__get_user(instr, (unsigned int __user *)pc))</div><div class='ctx'> 				return -EFAULT;</div><div class='add'>+			if (swiz == 0 &amp;&amp; (flags &amp; SW))</div><div class='add'>+				instr = cpu_to_le32(instr);</div><div class='ctx'> 			nb = (instr &gt;&gt; 11) &amp; 0x1f;</div><div class='ctx'> 			if (nb == 0)</div><div class='ctx'> 				nb = 32;</div><div class='hunk'>@@ -300,7 +309,10 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,</div><div class='ctx'> 		return -EFAULT;	/* bad address */</div><div class='ctx'> </div><div class='ctx'> 	rptr = &amp;regs-&gt;gpr[reg];</div><div class='del'>-	if (flags &amp; LD) {</div><div class='add'>+	p = (unsigned long) addr;</div><div class='add'>+	bswiz = (flags &amp; SW)? 3: 0;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; ST)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This zeroes the top 4 bytes of the affected registers</div><div class='ctx'> 		 * in 64-bit mode, and also zeroes out any remaining</div><div class='hunk'>@@ -311,26 +323,28 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,</div><div class='ctx'> 			memset(&amp;regs-&gt;gpr[0], 0,</div><div class='ctx'> 			       ((nb0 + 3) / 4) * sizeof(unsigned long));</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; nb; ++i)</div><div class='del'>-			if (__get_user(REG_BYTE(rptr, i), addr + i))</div><div class='add'>+		for (i = 0; i &lt; nb; ++i, ++p)</div><div class='add'>+			if (__get_user(REG_BYTE(rptr, i ^ bswiz), SWIZ_PTR(p)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		if (nb0 &gt; 0) {</div><div class='ctx'> 			rptr = &amp;regs-&gt;gpr[0];</div><div class='ctx'> 			addr += nb;</div><div class='del'>-			for (i = 0; i &lt; nb0; ++i)</div><div class='del'>-				if (__get_user(REG_BYTE(rptr, i), addr + i))</div><div class='add'>+			for (i = 0; i &lt; nb0; ++i, ++p)</div><div class='add'>+				if (__get_user(REG_BYTE(rptr, i ^ bswiz),</div><div class='add'>+					       SWIZ_PTR(p)))</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; nb; ++i)</div><div class='del'>-			if (__put_user(REG_BYTE(rptr, i), addr + i))</div><div class='add'>+		for (i = 0; i &lt; nb; ++i, ++p)</div><div class='add'>+			if (__put_user(REG_BYTE(rptr, i ^ bswiz), SWIZ_PTR(p)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		if (nb0 &gt; 0) {</div><div class='ctx'> 			rptr = &amp;regs-&gt;gpr[0];</div><div class='ctx'> 			addr += nb;</div><div class='del'>-			for (i = 0; i &lt; nb0; ++i)</div><div class='del'>-				if (__put_user(REG_BYTE(rptr, i), addr + i))</div><div class='add'>+			for (i = 0; i &lt; nb0; ++i, ++p)</div><div class='add'>+				if (__put_user(REG_BYTE(rptr, i ^ bswiz),</div><div class='add'>+					       SWIZ_PTR(p)))</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -352,7 +366,7 @@ int fix_alignment(struct pt_regs *regs)</div><div class='ctx'> 	unsigned int reg, areg;</div><div class='ctx'> 	unsigned int dsisr;</div><div class='ctx'> 	unsigned char __user *addr;</div><div class='del'>-	unsigned char __user *p;</div><div class='add'>+	unsigned long p, swiz;</div><div class='ctx'> 	int ret, t;</div><div class='ctx'> 	union {</div><div class='ctx'> 		u64 ll;</div><div class='hunk'>@@ -380,11 +394,15 @@ int fix_alignment(struct pt_regs *regs)</div><div class='ctx'> 	 * let's make one up from the instruction</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cpu_has_feature(CPU_FTR_NODSISRALIGN)) {</div><div class='del'>-		unsigned int real_instr;</div><div class='del'>-		if (unlikely(__get_user(real_instr,</div><div class='del'>-					(unsigned int __user *)regs-&gt;nip)))</div><div class='add'>+		unsigned long pc = regs-&gt;nip;</div><div class='add'>+</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_PPC_LE) &amp;&amp; (regs-&gt;msr &amp; MSR_LE))</div><div class='add'>+			pc ^= 4;</div><div class='add'>+		if (unlikely(__get_user(instr, (unsigned int __user *)pc)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		dsisr = make_dsisr(real_instr);</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_REAL_LE) &amp;&amp; (regs-&gt;msr &amp; MSR_LE))</div><div class='add'>+			instr = cpu_to_le32(instr);</div><div class='add'>+		dsisr = make_dsisr(instr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* extract the operation and registers from the dsisr */</div><div class='hunk'>@@ -397,6 +415,24 @@ int fix_alignment(struct pt_regs *regs)</div><div class='ctx'> 	nb = aligninfo[instr].len;</div><div class='ctx'> 	flags = aligninfo[instr].flags;</div><div class='ctx'> </div><div class='add'>+	/* Byteswap little endian loads and stores */</div><div class='add'>+	swiz = 0;</div><div class='add'>+	if (regs-&gt;msr &amp; MSR_LE) {</div><div class='add'>+		flags ^= SW;</div><div class='add'>+		/*</div><div class='add'>+		 * So-called "PowerPC little endian" mode works by</div><div class='add'>+		 * swizzling addresses rather than by actually doing</div><div class='add'>+		 * any byte-swapping.  To emulate this, we XOR each</div><div class='add'>+		 * byte address with 7.  We also byte-swap, because</div><div class='add'>+		 * the processor's address swizzling depends on the</div><div class='add'>+		 * operand size (it xors the address with 7 for bytes,</div><div class='add'>+		 * 6 for halfwords, 4 for words, 0 for doublewords) but</div><div class='add'>+		 * we will xor with 7 and load/store each byte separately.</div><div class='add'>+		 */</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_PPC_LE))</div><div class='add'>+			swiz = 7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* DAR has the operand effective address */</div><div class='ctx'> 	addr = (unsigned char __user *)regs-&gt;dar;</div><div class='ctx'> </div><div class='hunk'>@@ -412,7 +448,8 @@ int fix_alignment(struct pt_regs *regs)</div><div class='ctx'> 	 * function</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (flags &amp; M)</div><div class='del'>-		return emulate_multiple(regs, addr, reg, nb, flags, instr);</div><div class='add'>+		return emulate_multiple(regs, addr, reg, nb,</div><div class='add'>+					flags, instr, swiz);</div><div class='ctx'> </div><div class='ctx'> 	/* Verify the address of the operand */</div><div class='ctx'> 	if (unlikely(user_mode(regs) &amp;&amp;</div><div class='hunk'>@@ -431,51 +468,71 @@ int fix_alignment(struct pt_regs *regs)</div><div class='ctx'> 	/* If we are loading, get the data from user space, else</div><div class='ctx'> 	 * get it from register values</div><div class='ctx'> 	 */</div><div class='del'>-	if (flags &amp; LD) {</div><div class='add'>+	if (!(flags &amp; ST)) {</div><div class='ctx'> 		data.ll = 0;</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		p = addr;</div><div class='add'>+		p = (unsigned long) addr;</div><div class='ctx'> 		switch (nb) {</div><div class='ctx'> 		case 8:</div><div class='del'>-			ret |= __get_user(data.v[0], p++);</div><div class='del'>-			ret |= __get_user(data.v[1], p++);</div><div class='del'>-			ret |= __get_user(data.v[2], p++);</div><div class='del'>-			ret |= __get_user(data.v[3], p++);</div><div class='add'>+			ret |= __get_user(data.v[0], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __get_user(data.v[1], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __get_user(data.v[2], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __get_user(data.v[3], SWIZ_PTR(p++));</div><div class='ctx'> 		case 4:</div><div class='del'>-			ret |= __get_user(data.v[4], p++);</div><div class='del'>-			ret |= __get_user(data.v[5], p++);</div><div class='add'>+			ret |= __get_user(data.v[4], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __get_user(data.v[5], SWIZ_PTR(p++));</div><div class='ctx'> 		case 2:</div><div class='del'>-			ret |= __get_user(data.v[6], p++);</div><div class='del'>-			ret |= __get_user(data.v[7], p++);</div><div class='add'>+			ret |= __get_user(data.v[6], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __get_user(data.v[7], SWIZ_PTR(p++));</div><div class='ctx'> 			if (unlikely(ret))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (flags &amp; F)</div><div class='add'>+	} else if (flags &amp; F) {</div><div class='ctx'> 		data.dd = current-&gt;thread.fpr[reg];</div><div class='del'>-	else</div><div class='add'>+		if (flags &amp; S) {</div><div class='add'>+			/* Single-precision FP store requires conversion... */</div><div class='add'>+#ifdef CONFIG_PPC_FPU</div><div class='add'>+			preempt_disable();</div><div class='add'>+			enable_kernel_fp();</div><div class='add'>+			cvt_df(&amp;data.dd, (float *)&amp;data.v[4], &amp;current-&gt;thread);</div><div class='add'>+			preempt_enable();</div><div class='add'>+#else</div><div class='add'>+			return 0;</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='ctx'> 		data.ll = regs-&gt;gpr[reg];</div><div class='ctx'> </div><div class='del'>-	/* Perform other misc operations like sign extension, byteswap,</div><div class='add'>+	if (flags &amp; SW) {</div><div class='add'>+		switch (nb) {</div><div class='add'>+		case 8:</div><div class='add'>+			SWAP(data.v[0], data.v[7]);</div><div class='add'>+			SWAP(data.v[1], data.v[6]);</div><div class='add'>+			SWAP(data.v[2], data.v[5]);</div><div class='add'>+			SWAP(data.v[3], data.v[4]);</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			SWAP(data.v[4], data.v[7]);</div><div class='add'>+			SWAP(data.v[5], data.v[6]);</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			SWAP(data.v[6], data.v[7]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Perform other misc operations like sign extension</div><div class='ctx'> 	 * or floating point single precision conversion</div><div class='ctx'> 	 */</div><div class='del'>-	switch (flags &amp; ~U) {</div><div class='add'>+	switch (flags &amp; ~(U|SW)) {</div><div class='ctx'> 	case LD+SE:	/* sign extend */</div><div class='ctx'> 		if ( nb == 2 )</div><div class='ctx'> 			data.ll = data.x16.low16;</div><div class='ctx'> 		else	/* nb must be 4 */</div><div class='ctx'> 			data.ll = data.x32.low32;</div><div class='ctx'> 		break;</div><div class='del'>-	case LD+S:	/* byte-swap */</div><div class='del'>-	case ST+S:</div><div class='del'>-		if (nb == 2) {</div><div class='del'>-			SWAP(data.v[6], data.v[7]);</div><div class='del'>-		} else {</div><div class='del'>-			SWAP(data.v[4], data.v[7]);</div><div class='del'>-			SWAP(data.v[5], data.v[6]);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='del'>-	/* Single-precision FP load and store require conversions... */</div><div class='add'>+	/* Single-precision FP load requires conversion... */</div><div class='ctx'> 	case LD+F+S:</div><div class='ctx'> #ifdef CONFIG_PPC_FPU</div><div class='ctx'> 		preempt_disable();</div><div class='hunk'>@@ -486,34 +543,24 @@ int fix_alignment(struct pt_regs *regs)</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='del'>-	case ST+F+S:</div><div class='del'>-#ifdef CONFIG_PPC_FPU</div><div class='del'>-		preempt_disable();</div><div class='del'>-		enable_kernel_fp();</div><div class='del'>-		cvt_df(&amp;data.dd, (float *)&amp;data.v[4], &amp;current-&gt;thread);</div><div class='del'>-		preempt_enable();</div><div class='del'>-#else</div><div class='del'>-		return 0;</div><div class='del'>-#endif</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Store result to memory or update registers */</div><div class='ctx'> 	if (flags &amp; ST) {</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		p = addr;</div><div class='add'>+		p = (unsigned long) addr;</div><div class='ctx'> 		switch (nb) {</div><div class='ctx'> 		case 8:</div><div class='del'>-			ret |= __put_user(data.v[0], p++);</div><div class='del'>-			ret |= __put_user(data.v[1], p++);</div><div class='del'>-			ret |= __put_user(data.v[2], p++);</div><div class='del'>-			ret |= __put_user(data.v[3], p++);</div><div class='add'>+			ret |= __put_user(data.v[0], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __put_user(data.v[1], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __put_user(data.v[2], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __put_user(data.v[3], SWIZ_PTR(p++));</div><div class='ctx'> 		case 4:</div><div class='del'>-			ret |= __put_user(data.v[4], p++);</div><div class='del'>-			ret |= __put_user(data.v[5], p++);</div><div class='add'>+			ret |= __put_user(data.v[4], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __put_user(data.v[5], SWIZ_PTR(p++));</div><div class='ctx'> 		case 2:</div><div class='del'>-			ret |= __put_user(data.v[6], p++);</div><div class='del'>-			ret |= __put_user(data.v[7], p++);</div><div class='add'>+			ret |= __put_user(data.v[6], SWIZ_PTR(p++));</div><div class='add'>+			ret |= __put_user(data.v[7], SWIZ_PTR(p++));</div><div class='ctx'> 		}</div><div class='ctx'> 		if (unlikely(ret))</div><div class='ctx'> 			return -EFAULT;</div><div class='head'>diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c<br/>index 8f85c5e8a55a..7ee84968087b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -122,9 +121,8 @@ int main(void)</div><div class='ctx'> 	DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));</div><div class='ctx'> 	DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));</div><div class='ctx'> 	DEFINE(PACACONTEXTID, offsetof(struct paca_struct, context.id));</div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-	DEFINE(PACAPGDIR, offsetof(struct paca_struct, pgdir));</div><div class='del'>-#endif</div><div class='add'>+	DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, context.sllp));</div><div class='add'>+	DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> 	DEFINE(PACALOWHTLBAREAS, offsetof(struct paca_struct, context.low_htlb_areas));</div><div class='ctx'> 	DEFINE(PACAHIGHHTLBAREAS, offsetof(struct paca_struct, context.high_htlb_areas));</div><div class='head'>diff --git a/arch/powerpc/kernel/binfmt_elf32.c b/arch/powerpc/kernel/binfmt_elf32.c<br/>index 8ad6b0f33651..5cb58757e1b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/binfmt_elf32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/binfmt_elf32.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c<br/>index 6223d39177cb..f4e5e14ee2b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/btext.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/btext.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/btext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/btext.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -112,7 +111,7 @@ void __init btext_setup_display(int width, int height, int depth, int pitch,</div><div class='ctx'> 	logicalDisplayBase = (unsigned char *)address;</div><div class='ctx'> 	dispDeviceBase = (unsigned char *)address;</div><div class='ctx'> 	dispDeviceRowBytes = pitch;</div><div class='del'>-	dispDeviceDepth = depth;</div><div class='add'>+	dispDeviceDepth = depth == 15 ? 16 : depth;</div><div class='ctx'> 	dispDeviceRect[0] = dispDeviceRect[1] = 0;</div><div class='ctx'> 	dispDeviceRect[2] = width;</div><div class='ctx'> 	dispDeviceRect[3] = height;</div><div class='hunk'>@@ -161,20 +160,28 @@ int btext_initialize(struct device_node *np)</div><div class='ctx'> 	unsigned long address = 0;</div><div class='ctx'> 	u32 *prop;</div><div class='ctx'> </div><div class='del'>-	prop = (u32 *)get_property(np, "width", NULL);</div><div class='add'>+	prop = (u32 *)get_property(np, "linux,bootx-width", NULL);</div><div class='add'>+	if (prop == NULL)</div><div class='add'>+		prop = (u32 *)get_property(np, "width", NULL);</div><div class='ctx'> 	if (prop == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	width = *prop;</div><div class='del'>-	prop = (u32 *)get_property(np, "height", NULL);</div><div class='add'>+	prop = (u32 *)get_property(np, "linux,bootx-height", NULL);</div><div class='add'>+	if (prop == NULL)</div><div class='add'>+		prop = (u32 *)get_property(np, "height", NULL);</div><div class='ctx'> 	if (prop == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	height = *prop;</div><div class='del'>-	prop = (u32 *)get_property(np, "depth", NULL);</div><div class='add'>+	prop = (u32 *)get_property(np, "linux,bootx-depth", NULL);</div><div class='add'>+	if (prop == NULL)</div><div class='add'>+		prop = (u32 *)get_property(np, "depth", NULL);</div><div class='ctx'> 	if (prop == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	depth = *prop;</div><div class='ctx'> 	pitch = width * ((depth + 7) / 8);</div><div class='del'>-	prop = (u32 *)get_property(np, "linebytes", NULL);</div><div class='add'>+	prop = (u32 *)get_property(np, "linux,bootx-linebytes", NULL);</div><div class='add'>+	if (prop == NULL)</div><div class='add'>+		prop = (u32 *)get_property(np, "linebytes", NULL);</div><div class='ctx'> 	if (prop)</div><div class='ctx'> 		pitch = *prop;</div><div class='ctx'> 	if (pitch == 1)</div><div class='hunk'>@@ -195,7 +202,7 @@ int btext_initialize(struct device_node *np)</div><div class='ctx'> 	g_max_loc_Y = height / 16;</div><div class='ctx'> 	dispDeviceBase = (unsigned char *)address;</div><div class='ctx'> 	dispDeviceRowBytes = pitch;</div><div class='del'>-	dispDeviceDepth = depth;</div><div class='add'>+	dispDeviceDepth = depth == 15 ? 16 : depth;</div><div class='ctx'> 	dispDeviceRect[0] = dispDeviceRect[1] = 0;</div><div class='ctx'> 	dispDeviceRect[2] = width;</div><div class='ctx'> 	dispDeviceRect[3] = height;</div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S<br/>index 55ed7716636f..8b4a4ee85eca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_6xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/cpu_setup_6xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_6xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/cpu_setup_6xx.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='hunk'>@@ -210,9 +209,11 @@ setup_745x_specifics:</div><div class='ctx'> 	 * the firmware. If any, we disable NAP capability as</div><div class='ctx'> 	 * it's known to be bogus on rev 2.1 and earlier</div><div class='ctx'> 	 */</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='ctx'> 	mfspr	r11,SPRN_L3CR</div><div class='ctx'> 	andis.	r11,r11,L3CR_L3E@h</div><div class='ctx'> 	beq	1f</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_L3CR)</div><div class='ctx'> 	lwz	r6,CPU_SPEC_FEATURES(r5)</div><div class='ctx'> 	andi.	r0,r6,CPU_FTR_L3_DISABLE_NAP</div><div class='ctx'> 	beq	1f</div><div class='head'>diff --git a/arch/powerpc/kernel/cpu_setup_power4.S b/arch/powerpc/kernel/cpu_setup_power4.S<br/>index b61d86e7ceb6..f69af2c5d7b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_power4.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/cpu_setup_power4.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cpu_setup_power4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/cpu_setup_power4.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='hunk'>@@ -73,23 +72,6 @@ _GLOBAL(__970_cpu_preinit)</div><div class='ctx'> 	isync</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='del'>-_GLOBAL(__setup_cpu_power4)</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(__setup_cpu_be)</div><div class='del'>-        /* Set large page sizes LP=0: 16MB, LP=1: 64KB */</div><div class='del'>-        addi    r3, 0,  0</div><div class='del'>-        ori     r3, r3, HID6_LB</div><div class='del'>-        sldi    r3, r3, 32</div><div class='del'>-        nor     r3, r3, r3</div><div class='del'>-        mfspr   r4, SPRN_HID6</div><div class='del'>-        and     r4, r4, r3</div><div class='del'>-        addi    r3, 0, 0x02000</div><div class='del'>-        sldi    r3, r3, 32</div><div class='del'>-        or      r4, r4, r3</div><div class='del'>-        mtspr   SPRN_HID6, r4</div><div class='del'>-	blr</div><div class='del'>-</div><div class='ctx'> _GLOBAL(__setup_cpu_ppc970)</div><div class='ctx'> 	mfspr	r0,SPRN_HID0</div><div class='ctx'> 	li	r11,5			/* clear DOZE and SLEEP */</div><div class='hunk'>@@ -142,7 +124,12 @@ _GLOBAL(__save_cpu_setup)</div><div class='ctx'> 	cmpwi	r0,0x44</div><div class='ctx'> 	bne	2f</div><div class='ctx'> </div><div class='del'>-1:	/* Save HID0,1,4 and 5 */</div><div class='add'>+1:	/* skip if not running in HV mode */</div><div class='add'>+	mfmsr	r0</div><div class='add'>+	rldicl.	r0,r0,4,63</div><div class='add'>+	beq	2f</div><div class='add'>+</div><div class='add'>+	/* Save HID0,1,4 and 5 */</div><div class='ctx'> 	mfspr	r3,SPRN_HID0</div><div class='ctx'> 	std	r3,CS_HID0(r5)</div><div class='ctx'> 	mfspr	r3,SPRN_HID1</div><div class='hunk'>@@ -176,7 +163,12 @@ _GLOBAL(__restore_cpu_setup)</div><div class='ctx'> 	cmpwi	r0,0x44</div><div class='ctx'> 	bnelr</div><div class='ctx'> </div><div class='del'>-1:	/* Before accessing memory, we make sure rm_ci is clear */</div><div class='add'>+1:	/* skip if not running in HV mode */</div><div class='add'>+	mfmsr	r0</div><div class='add'>+	rldicl.	r0,r0,4,63</div><div class='add'>+	beqlr</div><div class='add'>+</div><div class='add'>+	/* Before accessing memory, we make sure rm_ci is clear */</div><div class='ctx'> 	li	r0,0</div><div class='ctx'> 	mfspr	r3,SPRN_HID4</div><div class='ctx'> 	rldimi	r3,r0,40,23	/* clear bit 23 (rm_ci) */</div><div class='head'>diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c<br/>index 3f7182db9ed5..272e43622fd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cputable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/cputable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/cputable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/cputable.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -30,11 +29,7 @@ EXPORT_SYMBOL(cur_cpu_spec);</div><div class='ctx'>  * part of the cputable though. That has to be fixed for both ppc32</div><div class='ctx'>  * and ppc64</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-extern void __setup_cpu_power3(unsigned long offset, struct cpu_spec* spec);</div><div class='del'>-extern void __setup_cpu_power4(unsigned long offset, struct cpu_spec* spec);</div><div class='del'>-extern void __setup_cpu_be(unsigned long offset, struct cpu_spec* spec);</div><div class='del'>-#else</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='ctx'> extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);</div><div class='ctx'> extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);</div><div class='ctx'> extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);</div><div class='hunk'>@@ -58,7 +53,8 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);</div><div class='ctx'> #define COMMON_USER_POWER5_PLUS	(COMMON_USER_PPC64 | PPC_FEATURE_POWER5_PLUS|\</div><div class='ctx'> 				 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP)</div><div class='ctx'> #define COMMON_USER_POWER6	(COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_05 |\</div><div class='del'>-				 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP)</div><div class='add'>+				 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \</div><div class='add'>+				 PPC_FEATURE_TRUE_LE)</div><div class='ctx'> #define COMMON_USER_BOOKE	(PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \</div><div class='ctx'> 				 PPC_FEATURE_BOOKE)</div><div class='ctx'> </div><div class='hunk'>@@ -78,11 +74,10 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00400000,</div><div class='ctx'> 		.cpu_name		= "POWER3 (630)",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_POWER3,</div><div class='del'>-		.cpu_user_features	= COMMON_USER_PPC64,</div><div class='add'>+		.cpu_user_features	= COMMON_USER_PPC64|PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power3,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power3",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_RS64,</div><div class='ctx'> 		.platform		= "power3",</div><div class='hunk'>@@ -92,11 +87,10 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00410000,</div><div class='ctx'> 		.cpu_name		= "POWER3 (630+)",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_POWER3,</div><div class='del'>-		.cpu_user_features	= COMMON_USER_PPC64,</div><div class='add'>+		.cpu_user_features	= COMMON_USER_PPC64|PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power3,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power3",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_RS64,</div><div class='ctx'> 		.platform		= "power3",</div><div class='hunk'>@@ -110,7 +104,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power3,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/rs64",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_RS64,</div><div class='ctx'> 		.platform		= "rs64",</div><div class='hunk'>@@ -124,7 +117,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power3,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/rs64",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_RS64,</div><div class='ctx'> 		.platform		= "rs64",</div><div class='hunk'>@@ -138,7 +130,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power3,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/rs64",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_RS64,</div><div class='ctx'> 		.platform		= "rs64",</div><div class='hunk'>@@ -152,7 +143,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power3,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/rs64",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_RS64,</div><div class='ctx'> 		.platform		= "rs64",</div><div class='hunk'>@@ -166,7 +156,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power4,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power4",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='ctx'> 		.platform		= "power4",</div><div class='hunk'>@@ -180,7 +169,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 8,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power4,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power4",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='ctx'> 		.platform		= "power4",</div><div class='hunk'>@@ -200,17 +188,11 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='ctx'> 		.platform		= "ppc970",</div><div class='ctx'> 	},</div><div class='del'>-#endif /* CONFIG_PPC64 */</div><div class='del'>-#if defined(CONFIG_PPC64) || defined(CONFIG_POWER4)</div><div class='ctx'> 	{	/* PPC970FX */</div><div class='ctx'> 		.pvr_mask		= 0xffff0000,</div><div class='ctx'> 		.pvr_value		= 0x003c0000,</div><div class='ctx'> 		.cpu_name		= "PPC970FX",</div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='del'>-		.cpu_features		= CPU_FTRS_970_32,</div><div class='del'>-#else</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_PPC970,</div><div class='del'>-#endif</div><div class='ctx'> 		.cpu_user_features	= COMMON_USER_POWER4 |</div><div class='ctx'> 			PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='hunk'>@@ -221,8 +203,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='ctx'> 		.platform		= "ppc970",</div><div class='ctx'> 	},</div><div class='del'>-#endif /* defined(CONFIG_PPC64) || defined(CONFIG_POWER4) */</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='ctx'> 	{	/* PPC970MP */</div><div class='ctx'> 		.pvr_mask		= 0xffff0000,</div><div class='ctx'> 		.pvr_value		= 0x00440000,</div><div class='hunk'>@@ -232,6 +212,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 			PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='add'>+		.num_pmcs		= 8,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_ppc970,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/970",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='hunk'>@@ -246,9 +227,13 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power4,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power5",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='add'>+		/* SIHV / SIPR bits are implemented on POWER4+ (GQ)</div><div class='add'>+		 * and above but only works on POWER5 and above</div><div class='add'>+		 */</div><div class='add'>+		.oprofile_mmcra_sihv	= MMCRA_SIHV,</div><div class='add'>+		.oprofile_mmcra_sipr	= MMCRA_SIPR,</div><div class='ctx'> 		.platform		= "power5",</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* Power5 GS */</div><div class='hunk'>@@ -260,9 +245,10 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power4,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power5+",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='add'>+		.oprofile_mmcra_sihv	= MMCRA_SIHV,</div><div class='add'>+		.oprofile_mmcra_sipr	= MMCRA_SIPR,</div><div class='ctx'> 		.platform		= "power5+",</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* Power6 */</div><div class='hunk'>@@ -273,10 +259,13 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.cpu_user_features	= COMMON_USER_POWER6,</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='del'>-		.num_pmcs		= 6,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power4,</div><div class='add'>+		.num_pmcs		= 8,</div><div class='ctx'> 		.oprofile_cpu_type	= "ppc64/power6",</div><div class='ctx'> 		.oprofile_type		= PPC_OPROFILE_POWER4,</div><div class='add'>+ 		.oprofile_mmcra_sihv	= POWER6_MMCRA_SIHV,</div><div class='add'>+ 		.oprofile_mmcra_sipr	= POWER6_MMCRA_SIPR,</div><div class='add'>+ 		.oprofile_mmcra_clear	= POWER6_MMCRA_THRM |</div><div class='add'>+ 			POWER6_MMCRA_OTHER,</div><div class='ctx'> 		.platform		= "power6",</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* Cell Broadband Engine */</div><div class='hunk'>@@ -289,7 +278,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 			PPC_FEATURE_SMT,</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='del'>-		.cpu_setup		= __setup_cpu_be,</div><div class='ctx'> 		.platform		= "ppc-cell-be",</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* default match */</div><div class='hunk'>@@ -301,7 +289,6 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.icache_bsize		= 128,</div><div class='ctx'> 		.dcache_bsize		= 128,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='del'>-		.cpu_setup		= __setup_cpu_power4,</div><div class='ctx'> 		.platform		= "power4",</div><div class='ctx'> 	}</div><div class='ctx'> #endif	/* CONFIG_PPC64 */</div><div class='hunk'>@@ -323,7 +310,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00030000,</div><div class='ctx'> 		.cpu_name		= "603",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_603,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_603,</div><div class='hunk'>@@ -334,7 +321,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00060000,</div><div class='ctx'> 		.cpu_name		= "603e",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_603,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_603,</div><div class='hunk'>@@ -345,7 +332,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00070000,</div><div class='ctx'> 		.cpu_name		= "603ev",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_603,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.cpu_setup		= __setup_cpu_603,</div><div class='hunk'>@@ -356,7 +343,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00040000,</div><div class='ctx'> 		.cpu_name		= "604",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_604,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 2,</div><div class='hunk'>@@ -368,7 +355,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00090000,</div><div class='ctx'> 		.cpu_name		= "604e",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_604,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -380,7 +367,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00090000,</div><div class='ctx'> 		.cpu_name		= "604r",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_604,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -392,7 +379,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x000a0000,</div><div class='ctx'> 		.cpu_name		= "604ev",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_604,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -404,7 +391,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00084202,</div><div class='ctx'> 		.cpu_name		= "740/750",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_740_NOTAU,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -416,7 +403,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00080100,</div><div class='ctx'> 		.cpu_name		= "750CX",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -428,7 +415,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00082200,</div><div class='ctx'> 		.cpu_name		= "750CX",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -440,7 +427,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00082210,</div><div class='ctx'> 		.cpu_name		= "750CXe",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -452,7 +439,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00083214,</div><div class='ctx'> 		.cpu_name		= "750CXe",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -464,7 +451,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00083000,</div><div class='ctx'> 		.cpu_name		= "745/755",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -476,7 +463,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x70000100,</div><div class='ctx'> 		.cpu_name		= "750FX",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750FX1,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -488,7 +475,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x70000200,</div><div class='ctx'> 		.cpu_name		= "750FX",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750FX2,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -500,7 +487,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x70000000,</div><div class='ctx'> 		.cpu_name		= "750FX",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750FX,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -512,7 +499,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x70020000,</div><div class='ctx'> 		.cpu_name		= "750GX",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_750GX,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -524,7 +511,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x00080000,</div><div class='ctx'> 		.cpu_name		= "740/750",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_740,</div><div class='del'>-		.cpu_user_features	= COMMON_USER,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -536,7 +523,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x000c1101,</div><div class='ctx'> 		.cpu_name		= "7400 (1.1)",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7400_NOTAU,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -548,7 +536,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x000c0000,</div><div class='ctx'> 		.cpu_name		= "7400",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7400,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -560,7 +549,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x800c0000,</div><div class='ctx'> 		.cpu_name		= "7410",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7400,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 4,</div><div class='hunk'>@@ -572,7 +562,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80000200,</div><div class='ctx'> 		.cpu_name		= "7450",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7450_20,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -586,7 +577,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80000201,</div><div class='ctx'> 		.cpu_name		= "7450",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7450_21,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -600,7 +592,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80000000,</div><div class='ctx'> 		.cpu_name		= "7450",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7450_23,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -614,7 +607,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80010100,</div><div class='ctx'> 		.cpu_name		= "7455",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7455_1,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -628,7 +622,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80010200,</div><div class='ctx'> 		.cpu_name		= "7455",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7455_20,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -642,7 +637,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80010000,</div><div class='ctx'> 		.cpu_name		= "7455",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7455,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -656,7 +652,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80020100,</div><div class='ctx'> 		.cpu_name		= "7447/7457",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7447_10,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -670,7 +667,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80020101,</div><div class='ctx'> 		.cpu_name		= "7447/7457",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7447_10,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -684,7 +682,7 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80020000,</div><div class='ctx'> 		.cpu_name		= "7447/7457",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7447,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -698,7 +696,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80030000,</div><div class='ctx'> 		.cpu_name		= "7447A",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7447A,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='hunk'>@@ -712,7 +711,8 @@ struct cpu_spec	cpu_specs[] = {</div><div class='ctx'> 		.pvr_value		= 0x80040000,</div><div class='ctx'> 		.cpu_name		= "7448",</div><div class='ctx'> 		.cpu_features		= CPU_FTRS_7447A,</div><div class='del'>-		.cpu_user_features	= COMMON_USER | PPC_FEATURE_HAS_ALTIVEC_COMP,</div><div class='add'>+		.cpu_user_features	= COMMON_USER |</div><div class='add'>+			PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,</div><div class='ctx'> 		.icache_bsize		= 32,</div><div class='ctx'> 		.dcache_bsize		= 32,</div><div class='ctx'> 		.num_pmcs		= 6,</div><div class='head'>diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c<br/>index 778f22fd85d2..358cecdc6aef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/crash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/crash.c</a></div><div class='hunk'>@@ -22,10 +22,13 @@</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/kexec.h&gt;</div><div class='ctx'> #include &lt;asm/kdump.h&gt;</div><div class='ctx'> #include &lt;asm/lmb.h&gt;</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='hunk'>@@ -40,6 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> /* This keeps a track of which one is crashing cpu. */</div><div class='ctx'> int crashing_cpu = -1;</div><div class='add'>+static cpumask_t cpus_in_crash = CPU_MASK_NONE;</div><div class='ctx'> </div><div class='ctx'> static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,</div><div class='ctx'> 							       size_t data_len)</div><div class='hunk'>@@ -97,34 +101,66 @@ static void crash_save_this_cpu(struct pt_regs *regs, int cpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-static atomic_t waiting_for_crash_ipi;</div><div class='add'>+static atomic_t enter_on_soft_reset = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> void crash_ipi_callback(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	if (cpu == crashing_cpu)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (!cpu_online(cpu))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ppc_md.kexec_cpu_down)</div><div class='del'>-		ppc_md.kexec_cpu_down(1, 1);</div><div class='del'>-</div><div class='ctx'> 	local_irq_disable();</div><div class='add'>+	if (!cpu_isset(cpu, cpus_in_crash))</div><div class='add'>+		crash_save_this_cpu(regs, cpu);</div><div class='add'>+	cpu_set(cpu, cpus_in_crash);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Entered via soft-reset - could be the kdump</div><div class='add'>+	 * process is invoked using soft-reset or user activated</div><div class='add'>+	 * it if some CPU did not respond to an IPI.</div><div class='add'>+	 * For soft-reset, the secondary CPU can enter this func</div><div class='add'>+	 * twice. 1 - using IPI, and 2. soft-reset.</div><div class='add'>+	 * Tell the kexec CPU that entered via soft-reset and ready</div><div class='add'>+	 * to go down.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_isset(cpu, cpus_in_sr)) {</div><div class='add'>+		cpu_clear(cpu, cpus_in_sr);</div><div class='add'>+		atomic_inc(&amp;enter_on_soft_reset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Starting the kdump boot.</div><div class='add'>+	 * This barrier is needed to make sure that all CPUs are stopped.</div><div class='add'>+	 * If not, soft-reset will be invoked to bring other CPUs.</div><div class='add'>+	 */</div><div class='add'>+	while (!cpu_isset(crashing_cpu, cpus_in_crash))</div><div class='add'>+		cpu_relax();</div><div class='ctx'> </div><div class='del'>-	crash_save_this_cpu(regs, cpu);</div><div class='del'>-	atomic_dec(&amp;waiting_for_crash_ipi);</div><div class='add'>+	if (ppc_md.kexec_cpu_down)</div><div class='add'>+		ppc_md.kexec_cpu_down(1, 1);</div><div class='ctx'> 	kexec_smp_wait();</div><div class='ctx'> 	/* NOTREACHED */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void crash_kexec_prepare_cpus(void)</div><div class='add'>+/*</div><div class='add'>+ * Wait until all CPUs are entered via soft-reset.</div><div class='add'>+ */</div><div class='add'>+static void crash_soft_reset_check(int cpu)</div><div class='add'>+{</div><div class='add'>+	unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */</div><div class='add'>+</div><div class='add'>+	cpu_clear(cpu, cpus_in_sr);</div><div class='add'>+	while (atomic_read(&amp;enter_on_soft_reset) != ncpus)</div><div class='add'>+		cpu_relax();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void crash_kexec_prepare_cpus(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int msecs;</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;waiting_for_crash_ipi, num_online_cpus() - 1);</div><div class='add'>+	unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */</div><div class='ctx'> </div><div class='ctx'> 	crash_send_ipi(crash_ipi_callback);</div><div class='ctx'> 	smp_wmb();</div><div class='hunk'>@@ -132,14 +168,13 @@ static void crash_kexec_prepare_cpus(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME: Until we will have the way to stop other CPUSs reliabally,</div><div class='ctx'> 	 * the crash CPU will send an IPI and wait for other CPUs to</div><div class='del'>-	 * respond. If not, proceed the kexec boot even though we failed to</div><div class='del'>-	 * capture other CPU states.</div><div class='add'>+	 * respond.</div><div class='ctx'> 	 * Delay of at least 10 seconds.</div><div class='ctx'> 	 */</div><div class='del'>-	printk(KERN_ALERT "Sending IPI to other cpus...\n");</div><div class='add'>+	printk(KERN_EMERG "Sending IPI to other cpus...\n");</div><div class='ctx'> 	msecs = 10000;</div><div class='del'>-	while ((atomic_read(&amp;waiting_for_crash_ipi) &gt; 0) &amp;&amp; (--msecs &gt; 0)) {</div><div class='del'>-		barrier();</div><div class='add'>+	while ((cpus_weight(cpus_in_crash) &lt; ncpus) &amp;&amp; (--msecs &gt; 0)) {</div><div class='add'>+		cpu_relax();</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -148,18 +183,71 @@ static void crash_kexec_prepare_cpus(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME: In case if we do not get all CPUs, one possibility: ask the</div><div class='ctx'> 	 * user to do soft reset such that we get all.</div><div class='del'>-	 * IPI handler is already set by the panic cpu initially. Therefore,</div><div class='del'>-	 * all cpus could invoke this handler from die() and the panic CPU</div><div class='del'>-	 * will call machine_kexec() directly from this handler to do</div><div class='del'>-	 * kexec boot.</div><div class='add'>+	 * Soft-reset will be used until better mechanism is implemented.</div><div class='ctx'> 	 */</div><div class='del'>-	if (atomic_read(&amp;waiting_for_crash_ipi))</div><div class='del'>-		printk(KERN_ALERT "done waiting: %d cpus not responding\n",</div><div class='del'>-			atomic_read(&amp;waiting_for_crash_ipi));</div><div class='add'>+	if (cpus_weight(cpus_in_crash) &lt; ncpus) {</div><div class='add'>+		printk(KERN_EMERG "done waiting: %d cpu(s) not responding\n",</div><div class='add'>+			ncpus - cpus_weight(cpus_in_crash));</div><div class='add'>+		printk(KERN_EMERG "Activate soft-reset to stop other cpu(s)\n");</div><div class='add'>+		cpus_in_sr = CPU_MASK_NONE;</div><div class='add'>+		atomic_set(&amp;enter_on_soft_reset, 0);</div><div class='add'>+		while (cpus_weight(cpus_in_crash) &lt; ncpus)</div><div class='add'>+			cpu_relax();</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure all CPUs are entered via soft-reset if the kdump is</div><div class='add'>+	 * invoked using soft-reset.</div><div class='add'>+	 */</div><div class='add'>+	if (cpu_isset(cpu, cpus_in_sr))</div><div class='add'>+		crash_soft_reset_check(cpu);</div><div class='ctx'> 	/* Leave the IPI callback set */</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function will be called by secondary cpus or by kexec cpu</div><div class='add'>+ * if soft-reset is activated to stop some CPUs.</div><div class='add'>+ */</div><div class='add'>+void crash_kexec_secondary(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int msecs = 5;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	/* Wait 5ms if the kexec CPU is not entered yet. */</div><div class='add'>+	while (crashing_cpu &lt; 0) {</div><div class='add'>+		if (--msecs &lt; 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Either kdump image is not loaded or</div><div class='add'>+			 * kdump process is not started - Probably xmon</div><div class='add'>+			 * exited using 'x'(exit and recover) or</div><div class='add'>+			 * kexec_should_crash() failed for all running tasks.</div><div class='add'>+			 */</div><div class='add'>+			cpu_clear(cpu, cpus_in_sr);</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		mdelay(1);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+	if (cpu == crashing_cpu) {</div><div class='add'>+		/*</div><div class='add'>+		 * Panic CPU will enter this func only via soft-reset.</div><div class='add'>+		 * Wait until all secondary CPUs entered and</div><div class='add'>+		 * then start kexec boot.</div><div class='add'>+		 */</div><div class='add'>+		crash_soft_reset_check(cpu);</div><div class='add'>+		cpu_set(crashing_cpu, cpus_in_crash);</div><div class='add'>+		if (ppc_md.kexec_cpu_down)</div><div class='add'>+			ppc_md.kexec_cpu_down(1, 0);</div><div class='add'>+		machine_kexec(kexec_crash_image);</div><div class='add'>+		/* NOTREACHED */</div><div class='add'>+	}</div><div class='add'>+	crash_ipi_callback(regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-static void crash_kexec_prepare_cpus(void)</div><div class='add'>+static void crash_kexec_prepare_cpus(int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * move the secondarys to us so that we can copy</div><div class='hunk'>@@ -170,13 +258,19 @@ static void crash_kexec_prepare_cpus(void)</div><div class='ctx'> 	smp_release_cpus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void crash_kexec_secondary(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	cpus_in_sr = CPU_MASK_NONE;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void default_machine_crash_shutdown(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function is only called after the system</div><div class='del'>-	 * has paniced or is otherwise in a critical state.</div><div class='add'>+	 * has panicked or is otherwise in a critical state.</div><div class='ctx'> 	 * The minimum amount of code to allow a kexec'd kernel</div><div class='ctx'> 	 * to run successfully needs to happen here.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -186,14 +280,24 @@ void default_machine_crash_shutdown(struct pt_regs *regs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> </div><div class='del'>-	if (ppc_md.kexec_cpu_down)</div><div class='del'>-		ppc_md.kexec_cpu_down(1, 0);</div><div class='add'>+	for_each_irq(irq) {</div><div class='add'>+		struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;status &amp; IRQ_INPROGRESS)</div><div class='add'>+			desc-&gt;chip-&gt;end(irq);</div><div class='add'>+</div><div class='add'>+		if (!(desc-&gt;status &amp; IRQ_DISABLED))</div><div class='add'>+			desc-&gt;chip-&gt;disable(irq);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make a note of crashing cpu. Will be used in machine_kexec</div><div class='ctx'> 	 * such that another IPI will not be sent.</div><div class='ctx'> 	 */</div><div class='ctx'> 	crashing_cpu = smp_processor_id();</div><div class='del'>-	crash_kexec_prepare_cpus();</div><div class='ctx'> 	crash_save_this_cpu(regs, crashing_cpu);</div><div class='add'>+	crash_kexec_prepare_cpus(crashing_cpu);</div><div class='add'>+	cpu_set(crashing_cpu, cpus_in_crash);</div><div class='add'>+	if (ppc_md.kexec_cpu_down)</div><div class='add'>+		ppc_md.kexec_cpu_down(1, 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c<br/>index 764d07329716..371973be8d71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash_dump.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/crash_dump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/crash_dump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/crash_dump.c</a></div><div class='hunk'>@@ -25,6 +25,11 @@</div><div class='ctx'> #define DBG(fmt...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+void reserve_kdump_trampoline(void)</div><div class='add'>+{</div><div class='add'>+	lmb_reserve(0, KDUMP_RESERVE_LIMIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init create_trampoline(unsigned long addr)</div><div class='ctx'> {</div><div class='ctx'> 	/* The maximum range of a single instruction branch, is the current</div><div class='hunk'>@@ -39,11 +44,11 @@ static void __init create_trampoline(unsigned long addr)</div><div class='ctx'> 	create_branch(addr + 4, addr + PHYSICAL_START, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init kdump_setup(void)</div><div class='add'>+void __init setup_kdump_trampoline(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='del'>-	DBG(" -&gt; kdump_setup()\n");</div><div class='add'>+	DBG(" -&gt; setup_kdump_trampoline()\n");</div><div class='ctx'> </div><div class='ctx'> 	for (i = KDUMP_TRAMPOLINE_START; i &lt; KDUMP_TRAMPOLINE_END; i += 8) {</div><div class='ctx'> 		create_trampoline(i);</div><div class='hunk'>@@ -52,7 +57,7 @@ void __init kdump_setup(void)</div><div class='ctx'> 	create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START);</div><div class='ctx'> 	create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START);</div><div class='ctx'> </div><div class='del'>-	DBG(" &lt;- kdump_setup()\n");</div><div class='add'>+	DBG(" &lt;- setup_kdump_trampoline()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_VMCORE</div><div class='head'>diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S<br/>index 8866fd26c6b9..c03e829fee3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/entry_32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/entry_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/entry_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/entry_32.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S<br/>index 19ad5c6b1818..54d9f5cdaab4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/entry_64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/entry_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/entry_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/entry_64.S</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -57,6 +56,7 @@ system_call_common:</div><div class='ctx'> 	beq-	1f</div><div class='ctx'> 	ld	r1,PACAKSAVE(r13)</div><div class='ctx'> 1:	std	r10,0(r1)</div><div class='add'>+	crclr	so</div><div class='ctx'> 	std	r11,_NIP(r1)</div><div class='ctx'> 	std	r12,_MSR(r1)</div><div class='ctx'> 	std	r0,GPR0(r1)</div><div class='hunk'>@@ -75,7 +75,6 @@ system_call_common:</div><div class='ctx'> 	std	r11,GPR11(r1)</div><div class='ctx'> 	std	r11,GPR12(r1)</div><div class='ctx'> 	std	r9,GPR13(r1)</div><div class='del'>-	crclr	so</div><div class='ctx'> 	mfcr	r9</div><div class='ctx'> 	mflr	r10</div><div class='ctx'> 	li	r11,0xc01</div><div class='head'>diff --git a/arch/powerpc/kernel/firmware.c b/arch/powerpc/kernel/firmware.c<br/>index 0bfe9061720a..1679a70bbcad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/firmware.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/firmware.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/firmware.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/firmware.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S<br/>index 340730fb8c91..7e2c9fe44ac1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/fpu.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/fpu.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/fpu.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/fpu.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='hunk'>@@ -72,7 +71,7 @@ _GLOBAL(load_up_fpu)</div><div class='ctx'> 	std	r12,_MSR(r1)</div><div class='ctx'> #endif</div><div class='ctx'> 	lfd	fr0,THREAD_FPSCR(r5)</div><div class='del'>-	mtfsf	0xff,fr0</div><div class='add'>+	MTFSF_L(fr0)</div><div class='ctx'> 	REST_32FPRS(0, r5)</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 	subi	r4,r5,THREAD</div><div class='hunk'>@@ -127,7 +126,7 @@ _GLOBAL(giveup_fpu)</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(cvt_fd)</div><div class='ctx'> 	lfd	0,THREAD_FPSCR(r5)	/* load up fpscr value */</div><div class='del'>-	mtfsf	0xff,0</div><div class='add'>+	MTFSF_L(0)</div><div class='ctx'> 	lfs	0,0(r3)</div><div class='ctx'> 	stfd	0,0(r4)</div><div class='ctx'> 	mffs	0</div><div class='hunk'>@@ -136,7 +135,7 @@ _GLOBAL(cvt_fd)</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(cvt_df)</div><div class='ctx'> 	lfd	0,THREAD_FPSCR(r5)	/* load up fpscr value */</div><div class='del'>-	mtfsf	0xff,0</div><div class='add'>+	MTFSF_L(0)</div><div class='ctx'> 	lfd	0,0(r3)</div><div class='ctx'> 	stfs	0,0(r4)</div><div class='ctx'> 	mffs	0</div><div class='head'>diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S<br/>index a0579e859b21..d88e182e40b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/head_32.S</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='hunk'>@@ -973,6 +972,13 @@ __secondary_start_gemini:</div><div class='ctx'>         b       __secondary_start</div><div class='ctx'> #endif /* CONFIG_GEMINI */</div><div class='ctx'> </div><div class='add'>+	.globl __secondary_start_mpc86xx</div><div class='add'>+__secondary_start_mpc86xx:</div><div class='add'>+	mfspr	r3, SPRN_PIR</div><div class='add'>+	stw	r3, __secondary_hold_acknowledge@l(0)</div><div class='add'>+	mr	r24, r3			/* cpu # */</div><div class='add'>+	b	__secondary_start</div><div class='add'>+</div><div class='ctx'> 	.globl	__secondary_start_pmac_0</div><div class='ctx'> __secondary_start_pmac_0:</div><div class='ctx'> 	/* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */</div><div class='hunk'>@@ -1088,7 +1094,12 @@ load_up_mmu:</div><div class='ctx'> 	LOAD_BAT(1,r3,r4,r5)</div><div class='ctx'> 	LOAD_BAT(2,r3,r4,r5)</div><div class='ctx'> 	LOAD_BAT(3,r3,r4,r5)</div><div class='del'>-</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	LOAD_BAT(4,r3,r4,r5)</div><div class='add'>+	LOAD_BAT(5,r3,r4,r5)</div><div class='add'>+	LOAD_BAT(6,r3,r4,r5)</div><div class='add'>+	LOAD_BAT(7,r3,r4,r5)</div><div class='add'>+END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS)</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S<br/>index 47c7fa148c9a..accb39d49911 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_44x.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_44x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_44x.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/head_44x.S</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/head_4xx.S b/arch/powerpc/kernel/head_4xx.S<br/>index 2590e97f5539..adc7f8097cd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_4xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_4xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_4xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/head_4xx.S</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S<br/>index b7d140430a41..e16eb2a33173 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/head_64.S</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -85,34 +84,6 @@ END_FTR_SECTION(0, 1)</div><div class='ctx'> 	/* Catch branch to 0 in real mode */</div><div class='ctx'> 	trap</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_ISERIES</div><div class='del'>-	/*</div><div class='del'>-	 * At offset 0x20, there is a pointer to iSeries LPAR data.</div><div class='del'>-	 * This is required by the hypervisor</div><div class='del'>-	 */</div><div class='del'>-	. = 0x20</div><div class='del'>-	.llong hvReleaseData-KERNELBASE</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * At offset 0x28 and 0x30 are offsets to the mschunks_map</div><div class='del'>-	 * array (used by the iSeries LPAR debugger to do translation</div><div class='del'>-	 * between physical addresses and absolute addresses) and</div><div class='del'>-	 * to the pidhash table (also used by the debugger)</div><div class='del'>-	 */</div><div class='del'>-	.llong mschunks_map-KERNELBASE</div><div class='del'>-	.llong 0	/* pidhash-KERNELBASE SFRXXX */</div><div class='del'>-</div><div class='del'>-	/* Offset 0x38 - Pointer to start of embedded System.map */</div><div class='del'>-	.globl	embedded_sysmap_start</div><div class='del'>-embedded_sysmap_start:</div><div class='del'>-	.llong	0</div><div class='del'>-	/* Offset 0x40 - Pointer to end of embedded System.map */</div><div class='del'>-	.globl	embedded_sysmap_end</div><div class='del'>-embedded_sysmap_end:</div><div class='del'>-	.llong	0</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PPC_ISERIES */</div><div class='del'>-</div><div class='ctx'> 	/* Secondary processors spin on this value until it goes to 1. */</div><div class='ctx'> 	.globl  __secondary_hold_spinloop</div><div class='ctx'> __secondary_hold_spinloop:</div><div class='hunk'>@@ -124,6 +95,15 @@ __secondary_hold_spinloop:</div><div class='ctx'> __secondary_hold_acknowledge:</div><div class='ctx'> 	.llong	0x0</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='add'>+	/*</div><div class='add'>+	 * At offset 0x20, there is a pointer to iSeries LPAR data.</div><div class='add'>+	 * This is required by the hypervisor</div><div class='add'>+	 */</div><div class='add'>+	. = 0x20</div><div class='add'>+	.llong hvReleaseData-KERNELBASE</div><div class='add'>+#endif /* CONFIG_PPC_ISERIES */</div><div class='add'>+</div><div class='ctx'> 	. = 0x60</div><div class='ctx'> /*</div><div class='ctx'>  * The following code is used on pSeries to hold secondary processors</div><div class='hunk'>@@ -316,6 +296,21 @@ label##_pSeries:					\</div><div class='ctx'> 	mtspr	SPRN_SPRG1,r13;		/* save r13 */	\</div><div class='ctx'> 	EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)</div><div class='ctx'> </div><div class='add'>+#define HSTD_EXCEPTION_PSERIES(n, label)		\</div><div class='add'>+	. = n;						\</div><div class='add'>+	.globl label##_pSeries;				\</div><div class='add'>+label##_pSeries:					\</div><div class='add'>+	HMT_MEDIUM;					\</div><div class='add'>+	mtspr	SPRN_SPRG1,r20;		/* save r20 */	\</div><div class='add'>+	mfspr	r20,SPRN_HSRR0;		/* copy HSRR0 to SRR0 */ \</div><div class='add'>+	mtspr	SPRN_SRR0,r20;				\</div><div class='add'>+	mfspr	r20,SPRN_HSRR1;		/* copy HSRR0 to SRR0 */ \</div><div class='add'>+	mtspr	SPRN_SRR1,r20;				\</div><div class='add'>+	mfspr	r20,SPRN_SPRG1;		/* restore r20 */ \</div><div class='add'>+	mtspr	SPRN_SPRG1,r13;		/* save r13 */	\</div><div class='add'>+	EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define STD_EXCEPTION_ISERIES(n, label, area)		\</div><div class='ctx'> 	.globl label##_iSeries;				\</div><div class='ctx'> label##_iSeries:					\</div><div class='hunk'>@@ -544,8 +539,17 @@ system_call_pSeries:</div><div class='ctx'> </div><div class='ctx'> 	STD_EXCEPTION_PSERIES(0xf20, altivec_unavailable)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CBE_RAS</div><div class='add'>+	HSTD_EXCEPTION_PSERIES(0x1200, cbe_system_error)</div><div class='add'>+#endif /* CONFIG_CBE_RAS */</div><div class='ctx'> 	STD_EXCEPTION_PSERIES(0x1300, instruction_breakpoint)</div><div class='add'>+#ifdef CONFIG_CBE_RAS</div><div class='add'>+	HSTD_EXCEPTION_PSERIES(0x1600, cbe_maintenance)</div><div class='add'>+#endif /* CONFIG_CBE_RAS */</div><div class='ctx'> 	STD_EXCEPTION_PSERIES(0x1700, altivec_assist)</div><div class='add'>+#ifdef CONFIG_CBE_RAS</div><div class='add'>+	HSTD_EXCEPTION_PSERIES(0x1800, cbe_thermal)</div><div class='add'>+#endif /* CONFIG_CBE_RAS */</div><div class='ctx'> </div><div class='ctx'> 	. = 0x3000</div><div class='ctx'> </div><div class='hunk'>@@ -827,6 +831,11 @@ machine_check_common:</div><div class='ctx'> #else</div><div class='ctx'> 	STD_EXCEPTION_COMMON(0x1700, altivec_assist, .unknown_exception)</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_CBE_RAS</div><div class='add'>+	STD_EXCEPTION_COMMON(0x1200, cbe_system_error, .cbe_system_error_exception)</div><div class='add'>+	STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, .cbe_maintenance_exception)</div><div class='add'>+	STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)</div><div class='add'>+#endif /* CONFIG_CBE_RAS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Here we have detected that the kernel stack pointer is bad.</div><div class='hunk'>@@ -1573,9 +1582,6 @@ _GLOBAL(__start_initialization_multiplatform)</div><div class='ctx'> 	/* Setup some critical 970 SPRs before switching MMU off */</div><div class='ctx'> 	bl	.__970_cpu_preinit</div><div class='ctx'> </div><div class='del'>-	/* cpu # */</div><div class='del'>-	li	r24,0</div><div class='del'>-</div><div class='ctx'> 	/* Switch off MMU if not already */</div><div class='ctx'> 	LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)</div><div class='ctx'> 	add	r4,r4,r30</div><div class='hunk'>@@ -1654,6 +1660,9 @@ _STATIC(__after_prom_start)</div><div class='ctx'> 					/*   i.e. where we are running	 */</div><div class='ctx'> 					/*	the source addr		 */</div><div class='ctx'> </div><div class='add'>+	cmpdi	r4,0			/* In some cases the loader may  */</div><div class='add'>+	beq	.start_here_multiplatform /* have already put us at zero */</div><div class='add'>+					/* so we can skip the copy.      */</div><div class='ctx'> 	LOAD_REG_IMMEDIATE(r5,copy_to_here) /* # bytes of memory to copy */</div><div class='ctx'> 	sub	r5,r5,r27</div><div class='ctx'> </div><div class='hunk'>@@ -1933,14 +1942,6 @@ _STATIC(start_here_common)</div><div class='ctx'> 	li	r3,0</div><div class='ctx'> 	bl	.do_cpu_ftr_fixups</div><div class='ctx'> </div><div class='del'>-	LOAD_REG_IMMEDIATE(r26, boot_cpuid)</div><div class='del'>-	lwz	r26,0(r26)</div><div class='del'>-</div><div class='del'>-	LOAD_REG_IMMEDIATE(r24, paca)	/* Get base vaddr of paca array  */</div><div class='del'>-	mulli	r13,r26,PACA_SIZE	/* Calculate vaddr of right paca */</div><div class='del'>-	add	r13,r13,r24		/* for this processor.		 */</div><div class='del'>-	mtspr	SPRN_SPRG3,r13</div><div class='del'>-</div><div class='ctx'> 	/* ptr to current */</div><div class='ctx'> 	LOAD_REG_IMMEDIATE(r4, init_task)</div><div class='ctx'> 	std	r4,PACACURRENT(r13)</div><div class='hunk'>@@ -1966,17 +1967,6 @@ _STATIC(start_here_common)</div><div class='ctx'> 	/* Not reached */</div><div class='ctx'> 	BUG_OPCODE</div><div class='ctx'> </div><div class='del'>-/* Put the paca pointer into r13 and SPRG3 */</div><div class='del'>-_GLOBAL(setup_boot_paca)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r3, boot_cpuid)</div><div class='del'>-	lwz	r3,0(r3)</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4, paca) 	/* Get base vaddr of paca array	 */</div><div class='del'>-	mulli	r3,r3,PACA_SIZE		/* Calculate vaddr of right paca */</div><div class='del'>-	add	r13,r3,r4		/* for this processor.		 */</div><div class='del'>-	mtspr	SPRN_SPRG3,r13</div><div class='del'>-</div><div class='del'>-	blr</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * We put a few things here that have to be page-aligned.</div><div class='ctx'>  * This stuff goes at the beginning of the bss, which is page-aligned.</div><div class='head'>diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S<br/>index 28941f5ce673..901be47a02a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_8xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_8xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_8xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/head_8xx.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S<br/>index dd86bbed7627..66877bdfe0b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_fsl_booke.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/head_fsl_booke.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/head_fsl_booke.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/head_fsl_booke.S</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c<br/>index e47d40ac6f39..68e5ab0443d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ibmebus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ibmebus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ibmebus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/ibmebus.c</a></div><div class='hunk'>@@ -323,13 +323,11 @@ int ibmebus_request_irq(struct ibmebus_dev *dev,</div><div class='ctx'> 			unsigned long irq_flags, const char * devname,</div><div class='ctx'> 			void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = virt_irq_create_mapping(ist);</div><div class='add'>+	unsigned int irq = irq_create_mapping(NULL, ist);</div><div class='ctx'> 	</div><div class='ctx'> 	if (irq == NO_IRQ)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	</div><div class='del'>-	irq = irq_offset_up(irq);</div><div class='del'>-	</div><div class='ctx'> 	return request_irq(irq, handler,</div><div class='ctx'> 			   irq_flags, devname, dev_id);</div><div class='ctx'> }</div><div class='hunk'>@@ -337,12 +335,9 @@ EXPORT_SYMBOL(ibmebus_request_irq);</div><div class='ctx'> </div><div class='ctx'> void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq = virt_irq_create_mapping(ist);</div><div class='add'>+	unsigned int irq = irq_find_mapping(NULL, ist);</div><div class='ctx'> 	</div><div class='del'>-	irq = irq_offset_up(irq);</div><div class='ctx'> 	free_irq(irq, dev_id);</div><div class='del'>-	</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ibmebus_free_irq);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c<br/>index d491052c8e0c..4180c3998b39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/idle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/idle.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S<br/>index b45fa0e37212..01bcd52bbf8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_6xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/idle_6xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_6xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/idle_6xx.S</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/idle_power4.S b/arch/powerpc/kernel/idle_power4.S<br/>index d85c7c938eed..30de81da7b40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_power4.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/idle_power4.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/idle_power4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/idle_power4.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c<br/>index fd8214caedee..a13a93dfc655 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/iomap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/iomap.c</a></div><div class='hunk'>@@ -106,8 +106,6 @@ EXPORT_SYMBOL(iowrite32_rep);</div><div class='ctx'> </div><div class='ctx'> void __iomem *ioport_map(unsigned long port, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	if (!_IO_IS_VALID(port))</div><div class='del'>-		return NULL;</div><div class='ctx'> 	return (void __iomem *) (port+pci_io_base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c<br/>index 4eba60a32890..ba0694071728 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/iommu.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -38,6 +37,7 @@</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/kdump.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DBG(...)</div><div class='ctx'> </div><div class='hunk'>@@ -418,10 +418,11 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,</div><div class='ctx'>  * Build a iommu_table structure.  This contains a bit map which</div><div class='ctx'>  * is used to manage allocation of the tce space.</div><div class='ctx'>  */</div><div class='del'>-struct iommu_table *iommu_init_table(struct iommu_table *tbl)</div><div class='add'>+struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long sz;</div><div class='ctx'> 	static int welcomed = 0;</div><div class='add'>+	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	/* Set aside 1/4 of the table for large allocations. */</div><div class='ctx'> 	tbl-&gt;it_halfpoint = tbl-&gt;it_size * 3 / 4;</div><div class='hunk'>@@ -429,18 +430,47 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl)</div><div class='ctx'> 	/* number of bytes needed for the bitmap */</div><div class='ctx'> 	sz = (tbl-&gt;it_size + 7) &gt;&gt; 3;</div><div class='ctx'> </div><div class='del'>-	tbl-&gt;it_map = (unsigned long *)__get_free_pages(GFP_ATOMIC, get_order(sz));</div><div class='del'>-	if (!tbl-&gt;it_map)</div><div class='add'>+	page = alloc_pages_node(nid, GFP_ATOMIC, get_order(sz));</div><div class='add'>+	if (!page)</div><div class='ctx'> 		panic("iommu_init_table: Can't allocate %ld bytes\n", sz);</div><div class='del'>-</div><div class='add'>+	tbl-&gt;it_map = page_address(page);</div><div class='ctx'> 	memset(tbl-&gt;it_map, 0, sz);</div><div class='ctx'> </div><div class='ctx'> 	tbl-&gt;it_hint = 0;</div><div class='ctx'> 	tbl-&gt;it_largehint = tbl-&gt;it_halfpoint;</div><div class='ctx'> 	spin_lock_init(&amp;tbl-&gt;it_lock);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CRASH_DUMP</div><div class='add'>+	if (ppc_md.tce_get) {</div><div class='add'>+		unsigned long index, tceval;</div><div class='add'>+		unsigned long tcecount = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Reserve the existing mappings left by the first kernel.</div><div class='add'>+		 */</div><div class='add'>+		for (index = 0; index &lt; tbl-&gt;it_size; index++) {</div><div class='add'>+			tceval = ppc_md.tce_get(tbl, index + tbl-&gt;it_offset);</div><div class='add'>+			/*</div><div class='add'>+			 * Freed TCE entry contains 0x7fffffffffffffff on JS20</div><div class='add'>+			 */</div><div class='add'>+			if (tceval &amp;&amp; (tceval != 0x7fffffffffffffffUL)) {</div><div class='add'>+				__set_bit(index, tbl-&gt;it_map);</div><div class='add'>+				tcecount++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ((tbl-&gt;it_size - tcecount) &lt; KDUMP_MIN_TCE_ENTRIES) {</div><div class='add'>+			printk(KERN_WARNING "TCE table is full; ");</div><div class='add'>+			printk(KERN_WARNING "freeing %d entries for the kdump boot\n",</div><div class='add'>+				KDUMP_MIN_TCE_ENTRIES);</div><div class='add'>+			for (index = tbl-&gt;it_size - KDUMP_MIN_TCE_ENTRIES;</div><div class='add'>+				index &lt; tbl-&gt;it_size; index++)</div><div class='add'>+				__clear_bit(index, tbl-&gt;it_map);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='ctx'> 	/* Clear the hardware table in case firmware left allocations in it */</div><div class='ctx'> 	ppc_md.tce_free(tbl, tbl-&gt;it_offset, tbl-&gt;it_size);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!welcomed) {</div><div class='ctx'> 		printk(KERN_INFO "IOMMU table initialized, virtual merging %s\n",</div><div class='hunk'>@@ -536,11 +566,12 @@ void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,</div><div class='ctx'>  * to the dma address (mapping) of the first page.</div><div class='ctx'>  */</div><div class='ctx'> void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size,</div><div class='del'>-		dma_addr_t *dma_handle, unsigned long mask, gfp_t flag)</div><div class='add'>+		dma_addr_t *dma_handle, unsigned long mask, gfp_t flag, int node)</div><div class='ctx'> {</div><div class='ctx'> 	void *ret = NULL;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	unsigned int npages, order;</div><div class='add'>+	struct page *page;</div><div class='ctx'> </div><div class='ctx'> 	size = PAGE_ALIGN(size);</div><div class='ctx'> 	npages = size &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -560,9 +591,10 @@ void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Alloc enough pages (and possibly more) */</div><div class='del'>-	ret = (void *)__get_free_pages(flag, order);</div><div class='del'>-	if (!ret)</div><div class='add'>+	page = alloc_pages_node(node, flag, order);</div><div class='add'>+	if (!page)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	ret = page_address(page);</div><div class='ctx'> 	memset(ret, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up tces to cover the allocated range */</div><div class='hunk'>@@ -570,9 +602,9 @@ void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size,</div><div class='ctx'> 			      mask &gt;&gt; PAGE_SHIFT, order);</div><div class='ctx'> 	if (mapping == DMA_ERROR_CODE) {</div><div class='ctx'> 		free_pages((unsigned long)ret, order);</div><div class='del'>-		ret = NULL;</div><div class='del'>-	} else</div><div class='del'>-		*dma_handle = mapping;</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	*dma_handle = mapping;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c<br/>index 57d560c68897..01bdae35cb55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/irq.c</a></div><div class='hunk'>@@ -29,6 +29,8 @@</div><div class='ctx'>  * to reduce code space and undefined function references.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -38,7 +40,6 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -47,6 +48,10 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/profile.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/radix-tree.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -57,39 +62,38 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='ctx'> #ifdef CONFIG_PPC_ISERIES</div><div class='ctx'> #include &lt;asm/paca.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> int __irq_offset_value;</div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='del'>-EXPORT_SYMBOL(__irq_offset_value);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int ppc_spurious_interrupts;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='del'>-#define NR_MASK_WORDS	((NR_IRQS + 31) / 32)</div><div class='add'>+EXPORT_SYMBOL(__irq_offset_value);</div><div class='add'>+atomic_t ppc_n_lost_interrupts;</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_PPC_MERGE</div><div class='add'>+#define NR_MASK_WORDS	((NR_IRQS + 31) / 32)</div><div class='ctx'> unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];</div><div class='del'>-atomic_t ppc_n_lost_interrupts;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TAU_INT</div><div class='ctx'> extern int tau_initialized;</div><div class='ctx'> extern int tau_interrupts(int);</div><div class='ctx'> #endif</div><div class='add'>+#endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP) &amp;&amp; !defined(CONFIG_PPC_MERGE)</div><div class='ctx'> extern atomic_t ipi_recv;</div><div class='ctx'> extern atomic_t ipi_sent;</div><div class='ctx'> #endif</div><div class='del'>-#endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> EXPORT_SYMBOL(irq_desc);</div><div class='ctx'> </div><div class='ctx'> int distribute_irqs = 1;</div><div class='del'>-u64 ppc64_interrupt_controller;</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> int show_interrupts(struct seq_file *p, void *v)</div><div class='hunk'>@@ -119,8 +123,8 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> #else</div><div class='ctx'> 		seq_printf(p, "%10u ", kstat_irqs(i));</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='del'>-		if (desc-&gt;handler)</div><div class='del'>-			seq_printf(p, " %s ", desc-&gt;handler-&gt;typename);</div><div class='add'>+		if (desc-&gt;chip)</div><div class='add'>+			seq_printf(p, " %s ", desc-&gt;chip-&gt;typename);</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(p, "  None      ");</div><div class='ctx'> 		seq_printf(p, "%s", (desc-&gt;status &amp; IRQ_LEVEL) ? "Level " : "Edge  ");</div><div class='hunk'>@@ -163,13 +167,13 @@ void fixup_irqs(cpumask_t map)</div><div class='ctx'> 		if (irq_desc[irq].status &amp; IRQ_PER_CPU)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		cpus_and(mask, irq_affinity[irq], map);</div><div class='add'>+		cpus_and(mask, irq_desc[irq].affinity, map);</div><div class='ctx'> 		if (any_online_cpu(mask) == NR_CPUS) {</div><div class='ctx'> 			printk("Breaking affinity for irq %i\n", irq);</div><div class='ctx'> 			mask = map;</div><div class='ctx'> 		}</div><div class='del'>-		if (irq_desc[irq].handler-&gt;set_affinity)</div><div class='del'>-			irq_desc[irq].handler-&gt;set_affinity(irq, mask);</div><div class='add'>+		if (irq_desc[irq].chip-&gt;set_affinity)</div><div class='add'>+			irq_desc[irq].chip-&gt;set_affinity(irq, mask);</div><div class='ctx'> 		else if (irq_desc[irq].action &amp;&amp; !(warned++))</div><div class='ctx'> 			printk("Cannot set affinity for irq %i\n", irq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -182,7 +186,7 @@ void fixup_irqs(cpumask_t map)</div><div class='ctx'> </div><div class='ctx'> void do_IRQ(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	int irq;</div><div class='add'>+	unsigned int irq;</div><div class='ctx'> #ifdef CONFIG_IRQSTACKS</div><div class='ctx'> 	struct thread_info *curtp, *irqtp;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -213,22 +217,26 @@ void do_IRQ(struct pt_regs *regs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	irq = ppc_md.get_irq(regs);</div><div class='ctx'> </div><div class='del'>-	if (irq &gt;= 0) {</div><div class='add'>+	if (irq != NO_IRQ &amp;&amp; irq != NO_IRQ_IGNORE) {</div><div class='ctx'> #ifdef CONFIG_IRQSTACKS</div><div class='ctx'> 		/* Switch to the irq stack to handle this */</div><div class='ctx'> 		curtp = current_thread_info();</div><div class='ctx'> 		irqtp = hardirq_ctx[smp_processor_id()];</div><div class='ctx'> 		if (curtp != irqtp) {</div><div class='add'>+			struct irq_desc *desc = irq_desc + irq;</div><div class='add'>+			void *handler = desc-&gt;handle_irq;</div><div class='add'>+			if (handler == NULL)</div><div class='add'>+				handler = &amp;__do_IRQ;</div><div class='ctx'> 			irqtp-&gt;task = curtp-&gt;task;</div><div class='ctx'> 			irqtp-&gt;flags = 0;</div><div class='del'>-			call___do_IRQ(irq, regs, irqtp);</div><div class='add'>+			call_handle_irq(irq, desc, regs, irqtp, handler);</div><div class='ctx'> 			irqtp-&gt;task = NULL;</div><div class='ctx'> 			if (irqtp-&gt;flags)</div><div class='ctx'> 				set_bits(irqtp-&gt;flags, &amp;curtp-&gt;flags);</div><div class='ctx'> 		} else</div><div class='ctx'> #endif</div><div class='del'>-			__do_IRQ(irq, regs);</div><div class='del'>-	} else if (irq != -2)</div><div class='add'>+			generic_handle_irq(irq, regs);</div><div class='add'>+	} else if (irq != NO_IRQ_IGNORE)</div><div class='ctx'> 		/* That's not SMP safe ... but who cares ? */</div><div class='ctx'> 		ppc_spurious_interrupts++;</div><div class='ctx'> </div><div class='hunk'>@@ -245,196 +253,595 @@ void do_IRQ(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='add'>+	ppc_md.init_IRQ();</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	static int once = 0;</div><div class='add'>+	irq_ctx_init();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IRQSTACKS</div><div class='add'>+struct thread_info *softirq_ctx[NR_CPUS] __read_mostly;</div><div class='add'>+struct thread_info *hardirq_ctx[NR_CPUS] __read_mostly;</div><div class='add'>+</div><div class='add'>+void irq_ctx_init(void)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *tp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		memset((void *)softirq_ctx[i], 0, THREAD_SIZE);</div><div class='add'>+		tp = softirq_ctx[i];</div><div class='add'>+		tp-&gt;cpu = i;</div><div class='add'>+		tp-&gt;preempt_count = SOFTIRQ_OFFSET;</div><div class='add'>+</div><div class='add'>+		memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);</div><div class='add'>+		tp = hardirq_ctx[i];</div><div class='add'>+		tp-&gt;cpu = i;</div><div class='add'>+		tp-&gt;preempt_count = HARDIRQ_OFFSET;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void do_softirq_onstack(void)</div><div class='add'>+{</div><div class='add'>+	struct thread_info *curtp, *irqtp;</div><div class='add'>+</div><div class='add'>+	curtp = current_thread_info();</div><div class='add'>+	irqtp = softirq_ctx[smp_processor_id()];</div><div class='add'>+	irqtp-&gt;task = curtp-&gt;task;</div><div class='add'>+	call_do_softirq(irqtp);</div><div class='add'>+	irqtp-&gt;task = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define do_softirq_onstack()	__do_softirq()</div><div class='add'>+#endif /* CONFIG_IRQSTACKS */</div><div class='ctx'> </div><div class='del'>-	if (once)</div><div class='add'>+void do_softirq(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (in_interrupt())</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	once++;</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-	ppc_md.init_IRQ();</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	irq_ctx_init();</div><div class='del'>-#endif</div><div class='add'>+	if (local_softirq_pending())</div><div class='add'>+		do_softirq_onstack();</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(do_softirq);</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='ctx'> /*</div><div class='del'>- * Virtual IRQ mapping code, used on systems with XICS interrupt controllers.</div><div class='add'>+ * IRQ controller and virtual interrupts</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define UNDEFINED_IRQ 0xffffffff</div><div class='del'>-unsigned int virt_irq_to_real_map[NR_IRQS];</div><div class='add'>+#ifdef CONFIG_PPC_MERGE</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Don't use virtual irqs 0, 1, 2 for devices.</div><div class='del'>- * The pcnet32 driver considers interrupt numbers &lt; 2 to be invalid,</div><div class='del'>- * and 2 is the XICS IPI interrupt.</div><div class='del'>- * We limit virtual irqs to __irq_offet_value less than virt_irq_max so</div><div class='del'>- * that when we offset them we don't end up with an interrupt</div><div class='del'>- * number &gt;= virt_irq_max.</div><div class='del'>- */</div><div class='del'>-#define MIN_VIRT_IRQ	3</div><div class='add'>+static LIST_HEAD(irq_hosts);</div><div class='add'>+static spinlock_t irq_big_lock = SPIN_LOCK_UNLOCKED;</div><div class='ctx'> </div><div class='del'>-unsigned int virt_irq_max;</div><div class='del'>-static unsigned int max_virt_irq;</div><div class='del'>-static unsigned int nr_virt_irqs;</div><div class='add'>+struct irq_map_entry irq_map[NR_IRQS];</div><div class='add'>+static unsigned int irq_virq_count = NR_IRQS;</div><div class='add'>+static struct irq_host *irq_default_host;</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-virt_irq_init(void)</div><div class='add'>+struct irq_host *irq_alloc_host(unsigned int revmap_type,</div><div class='add'>+				unsigned int revmap_arg,</div><div class='add'>+				struct irq_host_ops *ops,</div><div class='add'>+				irq_hw_number_t inval_irq)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	unsigned int size = sizeof(struct irq_host);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int *rmap;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((virt_irq_max == 0) || (virt_irq_max &gt; (NR_IRQS - 1)))</div><div class='del'>-		virt_irq_max = NR_IRQS - 1;</div><div class='del'>-	max_virt_irq = virt_irq_max - __irq_offset_value;</div><div class='del'>-	nr_virt_irqs = max_virt_irq - MIN_VIRT_IRQ + 1;</div><div class='add'>+	/* Allocate structure and revmap table if using linear mapping */</div><div class='add'>+	if (revmap_type == IRQ_HOST_MAP_LINEAR)</div><div class='add'>+		size += revmap_arg * sizeof(unsigned int);</div><div class='add'>+	if (mem_init_done)</div><div class='add'>+		host = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	else {</div><div class='add'>+		host = alloc_bootmem(size);</div><div class='add'>+		if (host)</div><div class='add'>+			memset(host, 0, size);</div><div class='add'>+	}</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NR_IRQS; i++)</div><div class='del'>-		virt_irq_to_real_map[i] = UNDEFINED_IRQ;</div><div class='add'>+	/* Fill structure */</div><div class='add'>+	host-&gt;revmap_type = revmap_type;</div><div class='add'>+	host-&gt;inval_irq = inval_irq;</div><div class='add'>+	host-&gt;ops = ops;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* If it's a legacy controller, check for duplicates and</div><div class='add'>+	 * mark it as allocated (we use irq 0 host pointer for that</div><div class='add'>+	 */</div><div class='add'>+	if (revmap_type == IRQ_HOST_MAP_LEGACY) {</div><div class='add'>+		if (irq_map[0].host != NULL) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+			/* If we are early boot, we can't free the structure,</div><div class='add'>+			 * too bad...</div><div class='add'>+			 * this will be fixed once slab is made available early</div><div class='add'>+			 * instead of the current cruft</div><div class='add'>+			 */</div><div class='add'>+			if (mem_init_done)</div><div class='add'>+				kfree(host);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		irq_map[0].host = host;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;host-&gt;link, &amp;irq_hosts);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Additional setups per revmap type */</div><div class='add'>+	switch(revmap_type) {</div><div class='add'>+	case IRQ_HOST_MAP_LEGACY:</div><div class='add'>+		/* 0 is always the invalid number for legacy */</div><div class='add'>+		host-&gt;inval_irq = 0;</div><div class='add'>+		/* setup us as the host for all legacy interrupts */</div><div class='add'>+		for (i = 1; i &lt; NUM_ISA_INTERRUPTS; i++) {</div><div class='add'>+			irq_map[i].hwirq = 0;</div><div class='add'>+			smp_wmb();</div><div class='add'>+			irq_map[i].host = host;</div><div class='add'>+			smp_wmb();</div><div class='add'>+</div><div class='add'>+			/* Clear norequest flags */</div><div class='add'>+			get_irq_desc(i)-&gt;status &amp;= ~IRQ_NOREQUEST;</div><div class='add'>+</div><div class='add'>+			/* Legacy flags are left to default at this point,</div><div class='add'>+			 * one can then use irq_create_mapping() to</div><div class='add'>+			 * explicitely change them</div><div class='add'>+			 */</div><div class='add'>+			ops-&gt;map(host, i, i);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_HOST_MAP_LINEAR:</div><div class='add'>+		rmap = (unsigned int *)(host + 1);</div><div class='add'>+		for (i = 0; i &lt; revmap_arg; i++)</div><div class='add'>+			rmap[i] = IRQ_NONE;</div><div class='add'>+		host-&gt;revmap_data.linear.size = revmap_arg;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		host-&gt;revmap_data.linear.revmap = rmap;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("irq: Allocated host of type %d @0x%p\n", revmap_type, host);</div><div class='add'>+</div><div class='add'>+	return host;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Create a mapping for a real_irq if it doesn't already exist.</div><div class='del'>- * Return the virtual irq as a convenience.</div><div class='del'>- */</div><div class='del'>-int virt_irq_create_mapping(unsigned int real_irq)</div><div class='add'>+struct irq_host *irq_find_host(struct device_node *node)</div><div class='ctx'> {</div><div class='del'>-	unsigned int virq, first_virq;</div><div class='del'>-	static int warned;</div><div class='add'>+	struct irq_host *h, *found = NULL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* We might want to match the legacy controller last since</div><div class='add'>+	 * it might potentially be set to match all interrupts in</div><div class='add'>+	 * the absence of a device node. This isn't a problem so far</div><div class='add'>+	 * yet though...</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+	list_for_each_entry(h, &amp;irq_hosts, link)</div><div class='add'>+		if (h-&gt;ops-&gt;match == NULL || h-&gt;ops-&gt;match(h, node)) {</div><div class='add'>+			found = h;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_find_host);</div><div class='ctx'> </div><div class='del'>-	if (ppc64_interrupt_controller == IC_OPEN_PIC)</div><div class='del'>-		return real_irq;	/* no mapping for openpic (for now) */</div><div class='add'>+void irq_set_default_host(struct irq_host *host)</div><div class='add'>+{</div><div class='add'>+	pr_debug("irq: Default host set to @0x%p\n", host);</div><div class='ctx'> </div><div class='del'>-	if (ppc64_interrupt_controller == IC_CELL_PIC)</div><div class='del'>-		return real_irq;	/* no mapping for iic either */</div><div class='add'>+	irq_default_host = host;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void irq_set_virq_count(unsigned int count)</div><div class='add'>+{</div><div class='add'>+	pr_debug("irq: Trying to set virq count to %d\n", count);</div><div class='ctx'> </div><div class='del'>-	/* don't map interrupts &lt; MIN_VIRT_IRQ */</div><div class='del'>-	if (real_irq &lt; MIN_VIRT_IRQ) {</div><div class='del'>-		virt_irq_to_real_map[real_irq] = real_irq;</div><div class='del'>-		return real_irq;</div><div class='add'>+	BUG_ON(count &lt; NUM_ISA_INTERRUPTS);</div><div class='add'>+	if (count &lt; NR_IRQS)</div><div class='add'>+		irq_virq_count = count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int irq_create_mapping(struct irq_host *host,</div><div class='add'>+				irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	unsigned int virq, hint;</div><div class='add'>+</div><div class='add'>+	pr_debug("irq: irq_create_mapping(0x%p, 0x%lx)\n", host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Look for default host if nececssary */</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+	if (host == NULL) {</div><div class='add'>+		printk(KERN_WARNING "irq_create_mapping called for"</div><div class='add'>+		       " NULL host, hwirq=%lx\n", hwirq);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return NO_IRQ;</div><div class='ctx'> 	}</div><div class='add'>+	pr_debug("irq: -&gt; using host @%p\n", host);</div><div class='ctx'> </div><div class='del'>-	/* map to a number between MIN_VIRT_IRQ and max_virt_irq */</div><div class='del'>-	virq = real_irq;</div><div class='del'>-	if (virq &gt; max_virt_irq)</div><div class='del'>-		virq = (virq % nr_virt_irqs) + MIN_VIRT_IRQ;</div><div class='del'>-</div><div class='del'>-	/* search for this number or a free slot */</div><div class='del'>-	first_virq = virq;</div><div class='del'>-	while (virt_irq_to_real_map[virq] != UNDEFINED_IRQ) {</div><div class='del'>-		if (virt_irq_to_real_map[virq] == real_irq)</div><div class='del'>-			return virq;</div><div class='del'>-		if (++virq &gt; max_virt_irq)</div><div class='del'>-			virq = MIN_VIRT_IRQ;</div><div class='del'>-		if (virq == first_virq)</div><div class='del'>-			goto nospace;	/* oops, no free slots */</div><div class='add'>+	/* Check if mapping already exist, if it does, call</div><div class='add'>+	 * host-&gt;ops-&gt;map() to update the flags</div><div class='add'>+	 */</div><div class='add'>+	virq = irq_find_mapping(host, hwirq);</div><div class='add'>+	if (virq != IRQ_NONE) {</div><div class='add'>+		pr_debug("irq: -&gt; existing mapping on virq %d\n", virq);</div><div class='add'>+		return virq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	virt_irq_to_real_map[virq] = real_irq;</div><div class='add'>+	/* Get a virtual interrupt number */</div><div class='add'>+	if (host-&gt;revmap_type == IRQ_HOST_MAP_LEGACY) {</div><div class='add'>+		/* Handle legacy */</div><div class='add'>+		virq = (unsigned int)hwirq;</div><div class='add'>+		if (virq == 0 || virq &gt;= NUM_ISA_INTERRUPTS)</div><div class='add'>+			return NO_IRQ;</div><div class='add'>+		return virq;</div><div class='add'>+	} else {</div><div class='add'>+		/* Allocate a virtual interrupt number */</div><div class='add'>+		hint = hwirq % irq_virq_count;</div><div class='add'>+		virq = irq_alloc_virt(host, 1, hint);</div><div class='add'>+		if (virq == NO_IRQ) {</div><div class='add'>+			pr_debug("irq: -&gt; virq allocation failed\n");</div><div class='add'>+			return NO_IRQ;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	pr_debug("irq: -&gt; obtained virq %d\n", virq);</div><div class='add'>+</div><div class='add'>+	/* Clear IRQ_NOREQUEST flag */</div><div class='add'>+	get_irq_desc(virq)-&gt;status &amp;= ~IRQ_NOREQUEST;</div><div class='add'>+</div><div class='add'>+	/* map it */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	irq_map[virq].hwirq = hwirq;</div><div class='add'>+	smp_mb();</div><div class='add'>+	if (host-&gt;ops-&gt;map(host, virq, hwirq)) {</div><div class='add'>+		pr_debug("irq: -&gt; mapping failed, freeing\n");</div><div class='add'>+		irq_free_virt(virq, 1);</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='ctx'> 	return virq;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_create_mapping);</div><div class='ctx'> </div><div class='del'>- nospace:</div><div class='del'>-	if (!warned) {</div><div class='del'>-		printk(KERN_CRIT "Interrupt table is full\n");</div><div class='del'>-		printk(KERN_CRIT "Increase virt_irq_max (currently %d) "</div><div class='del'>-		       "in your kernel sources and rebuild.\n", virt_irq_max);</div><div class='del'>-		warned = 1;</div><div class='add'>+extern unsigned int irq_create_of_mapping(struct device_node *controller,</div><div class='add'>+					  u32 *intspec, unsigned int intsize)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	irq_hw_number_t hwirq;</div><div class='add'>+	unsigned int type = IRQ_TYPE_NONE;</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='add'>+	if (controller == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+	else</div><div class='add'>+		host = irq_find_host(controller);</div><div class='add'>+	if (host == NULL) {</div><div class='add'>+		printk(KERN_WARNING "irq: no irq host found for %s !\n",</div><div class='add'>+		       controller-&gt;full_name);</div><div class='add'>+		return NO_IRQ;</div><div class='ctx'> 	}</div><div class='del'>-	return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	/* If host has no translation, then we assume interrupt line */</div><div class='add'>+	if (host-&gt;ops-&gt;xlate == NULL)</div><div class='add'>+		hwirq = intspec[0];</div><div class='add'>+	else {</div><div class='add'>+		if (host-&gt;ops-&gt;xlate(host, controller, intspec, intsize,</div><div class='add'>+				     &amp;hwirq, &amp;type))</div><div class='add'>+			return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create mapping */</div><div class='add'>+	virq = irq_create_mapping(host, hwirq);</div><div class='add'>+	if (virq == NO_IRQ)</div><div class='add'>+		return virq;</div><div class='add'>+</div><div class='add'>+	/* Set type if specified and different than the current one */</div><div class='add'>+	if (type != IRQ_TYPE_NONE &amp;&amp;</div><div class='add'>+	    type != (get_irq_desc(virq)-&gt;status &amp; IRQF_TRIGGER_MASK))</div><div class='add'>+		set_irq_type(virq, type);</div><div class='add'>+	return virq;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_create_of_mapping);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * In most cases will get a hit on the very first slot checked in the</div><div class='del'>- * virt_irq_to_real_map.  Only when there are a large number of</div><div class='del'>- * IRQs will this be expensive.</div><div class='del'>- */</div><div class='del'>-unsigned int real_irq_to_virt_slowpath(unsigned int real_irq)</div><div class='add'>+unsigned int irq_of_parse_and_map(struct device_node *dev, int index)</div><div class='ctx'> {</div><div class='del'>-	unsigned int virq;</div><div class='del'>-	unsigned int first_virq;</div><div class='add'>+	struct of_irq oirq;</div><div class='ctx'> </div><div class='del'>-	virq = real_irq;</div><div class='add'>+	if (of_irq_map_one(dev, index, &amp;oirq))</div><div class='add'>+		return NO_IRQ;</div><div class='ctx'> </div><div class='del'>-	if (virq &gt; max_virt_irq)</div><div class='del'>-		virq = (virq % nr_virt_irqs) + MIN_VIRT_IRQ;</div><div class='add'>+	return irq_create_of_mapping(oirq.controller, oirq.specifier,</div><div class='add'>+				     oirq.size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_of_parse_and_map);</div><div class='ctx'> </div><div class='del'>-	first_virq = virq;</div><div class='add'>+void irq_dispose_mapping(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *host = irq_map[virq].host;</div><div class='add'>+	irq_hw_number_t hwirq;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		if (virt_irq_to_real_map[virq] == real_irq)</div><div class='del'>-			return virq;</div><div class='add'>+	WARN_ON (host == NULL);</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		virq++;</div><div class='add'>+	/* Never unmap legacy interrupts */</div><div class='add'>+	if (host-&gt;revmap_type == IRQ_HOST_MAP_LEGACY)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		if (virq &gt;= max_virt_irq)</div><div class='del'>-			virq = 0;</div><div class='add'>+	/* remove chip and handler */</div><div class='add'>+	set_irq_chip_and_handler(virq, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	/* Make sure it's completed */</div><div class='add'>+	synchronize_irq(virq);</div><div class='add'>+</div><div class='add'>+	/* Tell the PIC about it */</div><div class='add'>+	if (host-&gt;ops-&gt;unmap)</div><div class='add'>+		host-&gt;ops-&gt;unmap(host, virq);</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	/* Clear reverse map */</div><div class='add'>+	hwirq = irq_map[virq].hwirq;</div><div class='add'>+	switch(host-&gt;revmap_type) {</div><div class='add'>+	case IRQ_HOST_MAP_LINEAR:</div><div class='add'>+		if (hwirq &lt; host-&gt;revmap_data.linear.size)</div><div class='add'>+			host-&gt;revmap_data.linear.revmap[hwirq] = IRQ_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_HOST_MAP_TREE:</div><div class='add'>+		/* Check if radix tree allocated yet */</div><div class='add'>+		if (host-&gt;revmap_data.tree.gfp_mask == 0)</div><div class='add'>+			break;</div><div class='add'>+		/* XXX radix tree not safe ! remove lock whem it becomes safe</div><div class='add'>+		 * and use some RCU sync to make sure everything is ok before we</div><div class='add'>+		 * can re-use that map entry</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+		radix_tree_delete(&amp;host-&gt;revmap_data.tree, hwirq);</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	} while (first_virq != virq);</div><div class='add'>+	/* Destroy map */</div><div class='add'>+	smp_mb();</div><div class='add'>+	irq_map[virq].hwirq = host-&gt;inval_irq;</div><div class='ctx'> </div><div class='del'>-	return NO_IRQ;</div><div class='add'>+	/* Set some flags */</div><div class='add'>+	get_irq_desc(virq)-&gt;status |= IRQ_NOREQUEST;</div><div class='ctx'> </div><div class='add'>+	/* Free it */</div><div class='add'>+	irq_free_virt(virq, 1);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PPC64 */</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_dispose_mapping);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IRQSTACKS</div><div class='del'>-struct thread_info *softirq_ctx[NR_CPUS];</div><div class='del'>-struct thread_info *hardirq_ctx[NR_CPUS];</div><div class='add'>+unsigned int irq_find_mapping(struct irq_host *host,</div><div class='add'>+			      irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int hint = hwirq % irq_virq_count;</div><div class='add'>+</div><div class='add'>+	/* Look for default host if nececssary */</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		host = irq_default_host;</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	/* legacy -&gt; bail early */</div><div class='add'>+	if (host-&gt;revmap_type == IRQ_HOST_MAP_LEGACY)</div><div class='add'>+		return hwirq;</div><div class='add'>+</div><div class='add'>+	/* Slow path does a linear search of the map */</div><div class='add'>+	if (hint &lt; NUM_ISA_INTERRUPTS)</div><div class='add'>+		hint = NUM_ISA_INTERRUPTS;</div><div class='add'>+	i = hint;</div><div class='add'>+	do  {</div><div class='add'>+		if (irq_map[i].host == host &amp;&amp;</div><div class='add'>+		    irq_map[i].hwirq == hwirq)</div><div class='add'>+			return i;</div><div class='add'>+		i++;</div><div class='add'>+		if (i &gt;= irq_virq_count)</div><div class='add'>+			i = NUM_ISA_INTERRUPTS;</div><div class='add'>+	} while(i != hint);</div><div class='add'>+	return NO_IRQ;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(irq_find_mapping);</div><div class='ctx'> </div><div class='del'>-void irq_ctx_init(void)</div><div class='add'>+</div><div class='add'>+unsigned int irq_radix_revmap(struct irq_host *host,</div><div class='add'>+			      irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *tp;</div><div class='del'>-	int i;</div><div class='add'>+	struct radix_tree_root *tree;</div><div class='add'>+	struct irq_map_entry *ptr;</div><div class='add'>+	unsigned int virq;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		memset((void *)softirq_ctx[i], 0, THREAD_SIZE);</div><div class='del'>-		tp = softirq_ctx[i];</div><div class='del'>-		tp-&gt;cpu = i;</div><div class='del'>-		tp-&gt;preempt_count = SOFTIRQ_OFFSET;</div><div class='add'>+	WARN_ON(host-&gt;revmap_type != IRQ_HOST_MAP_TREE);</div><div class='ctx'> </div><div class='del'>-		memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);</div><div class='del'>-		tp = hardirq_ctx[i];</div><div class='del'>-		tp-&gt;cpu = i;</div><div class='del'>-		tp-&gt;preempt_count = HARDIRQ_OFFSET;</div><div class='add'>+	/* Check if the radix tree exist yet. We test the value of</div><div class='add'>+	 * the gfp_mask for that. Sneaky but saves another int in the</div><div class='add'>+	 * structure. If not, we fallback to slow mode</div><div class='add'>+	 */</div><div class='add'>+	tree = &amp;host-&gt;revmap_data.tree;</div><div class='add'>+	if (tree-&gt;gfp_mask == 0)</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* XXX Current radix trees are NOT SMP safe !!! Remove that lock</div><div class='add'>+	 * when that is fixed (when Nick's patch gets in</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Now try to resolve */</div><div class='add'>+	ptr = radix_tree_lookup(tree, hwirq);</div><div class='add'>+	/* Found it, return */</div><div class='add'>+	if (ptr) {</div><div class='add'>+		virq = ptr - irq_map;</div><div class='add'>+		goto bail;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* If not there, try to insert it */</div><div class='add'>+	virq = irq_find_mapping(host, hwirq);</div><div class='add'>+	if (virq != NO_IRQ)</div><div class='add'>+		radix_tree_insert(tree, virq, &amp;irq_map[virq]);</div><div class='add'>+ bail:</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+	return virq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void do_softirq_onstack(void)</div><div class='add'>+unsigned int irq_linear_revmap(struct irq_host *host,</div><div class='add'>+			       irq_hw_number_t hwirq)</div><div class='ctx'> {</div><div class='del'>-	struct thread_info *curtp, *irqtp;</div><div class='add'>+	unsigned int *revmap;</div><div class='ctx'> </div><div class='del'>-	curtp = current_thread_info();</div><div class='del'>-	irqtp = softirq_ctx[smp_processor_id()];</div><div class='del'>-	irqtp-&gt;task = curtp-&gt;task;</div><div class='del'>-	call_do_softirq(irqtp);</div><div class='del'>-	irqtp-&gt;task = NULL;</div><div class='add'>+	WARN_ON(host-&gt;revmap_type != IRQ_HOST_MAP_LINEAR);</div><div class='add'>+</div><div class='add'>+	/* Check revmap bounds */</div><div class='add'>+	if (unlikely(hwirq &gt;= host-&gt;revmap_data.linear.size))</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Check if revmap was allocated */</div><div class='add'>+	revmap = host-&gt;revmap_data.linear.revmap;</div><div class='add'>+	if (unlikely(revmap == NULL))</div><div class='add'>+		return irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	/* Fill up revmap with slow path if no mapping found */</div><div class='add'>+	if (unlikely(revmap[hwirq] == NO_IRQ))</div><div class='add'>+		revmap[hwirq] = irq_find_mapping(host, hwirq);</div><div class='add'>+</div><div class='add'>+	return revmap[hwirq];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-#define do_softirq_onstack()	__do_softirq()</div><div class='del'>-#endif /* CONFIG_IRQSTACKS */</div><div class='add'>+unsigned int irq_alloc_virt(struct irq_host *host,</div><div class='add'>+			    unsigned int count,</div><div class='add'>+			    unsigned int hint)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int i, j, found = NO_IRQ;</div><div class='add'>+	unsigned int limit = irq_virq_count - count;</div><div class='ctx'> </div><div class='del'>-void do_softirq(void)</div><div class='add'>+	if (count == 0 || count &gt; (irq_virq_count - NUM_ISA_INTERRUPTS))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Use hint for 1 interrupt if any */</div><div class='add'>+	if (count == 1 &amp;&amp; hint &gt;= NUM_ISA_INTERRUPTS &amp;&amp;</div><div class='add'>+	    hint &lt; irq_virq_count &amp;&amp; irq_map[hint].host == NULL) {</div><div class='add'>+		found = hint;</div><div class='add'>+		goto hint_found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Look for count consecutive numbers in the allocatable</div><div class='add'>+	 * (non-legacy) space</div><div class='add'>+	 */</div><div class='add'>+	for (i = NUM_ISA_INTERRUPTS; i &lt;= limit; ) {</div><div class='add'>+		for (j = i; j &lt; (i + count); j++)</div><div class='add'>+			if (irq_map[j].host != NULL) {</div><div class='add'>+				i = j + 1;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		found = i;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (found == NO_IRQ) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+ hint_found:</div><div class='add'>+	for (i = found; i &lt; (found + count); i++) {</div><div class='add'>+		irq_map[i].hwirq = host-&gt;inval_irq;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		irq_map[i].host = host;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void irq_free_virt(unsigned int virq, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt())</div><div class='del'>-		return;</div><div class='add'>+	WARN_ON (virq &lt; NUM_ISA_INTERRUPTS);</div><div class='add'>+	WARN_ON (count == 0 || (virq + count) &gt; irq_virq_count);</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+	for (i = virq; i &lt; (virq + count); i++) {</div><div class='add'>+		struct irq_host *host;</div><div class='ctx'> </div><div class='del'>-	if (local_softirq_pending()) {</div><div class='del'>-		account_system_vtime(current);</div><div class='del'>-		local_bh_disable();</div><div class='del'>-		do_softirq_onstack();</div><div class='del'>-		account_system_vtime(current);</div><div class='del'>-		__local_bh_enable();</div><div class='add'>+		if (i &lt; NUM_ISA_INTERRUPTS ||</div><div class='add'>+		    (virq + count) &gt; irq_virq_count)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		host = irq_map[i].host;</div><div class='add'>+		irq_map[i].hwirq = host-&gt;inval_irq;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		irq_map[i].host = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+void irq_early_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_IRQS; i++)</div><div class='add'>+		get_irq_desc(i)-&gt;status |= IRQ_NOREQUEST;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(do_softirq);</div><div class='add'>+</div><div class='add'>+/* We need to create the radix trees late */</div><div class='add'>+static int irq_late_init(void)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *h;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;irq_big_lock, flags);</div><div class='add'>+	list_for_each_entry(h, &amp;irq_hosts, link) {</div><div class='add'>+		if (h-&gt;revmap_type == IRQ_HOST_MAP_TREE)</div><div class='add'>+			INIT_RADIX_TREE(&amp;h-&gt;revmap_data.tree, GFP_ATOMIC);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_big_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+arch_initcall(irq_late_init);</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_PPC_MERGE */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+int pci_enable_msi(struct pci_dev * pdev)</div><div class='add'>+{</div><div class='add'>+	if (ppc_md.enable_msi)</div><div class='add'>+		return ppc_md.enable_msi(pdev);</div><div class='add'>+	else</div><div class='add'>+		return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pci_disable_msi(struct pci_dev * pdev)</div><div class='add'>+{</div><div class='add'>+	if (ppc_md.disable_msi)</div><div class='add'>+		ppc_md.disable_msi(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pci_scan_msi_device(struct pci_dev *dev) {}</div><div class='add'>+int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) {return -1;}</div><div class='add'>+void pci_disable_msix(struct pci_dev *dev) {}</div><div class='add'>+void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}</div><div class='add'>+void disable_msi_mode(struct pci_dev *dev, int pos, int type) {}</div><div class='add'>+void pci_no_msi(void) {}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> static int __init setup_noirqdistrib(char *str)</div><div class='head'>diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c<br/>index f78866367b70..9f0898c89759 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/kprobes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/kprobes.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *		for PPC64</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S<br/>index d7f4e982b539..858f28ac8a06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/l2cr_6xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/l2cr_6xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/l2cr_6xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/l2cr_6xx.S</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> 	Author:	Terry Greeniaus (tgree@phys.ualberta.ca)</div><div class='ctx'> 	Please e-mail updates to this file to me, thanks!</div><div class='ctx'> */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c<br/>index 6e67b5b49ba1..7e98e778b52f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/legacy_serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/legacy_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/legacy_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/legacy_serial.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='hunk'>@@ -29,6 +28,7 @@ static struct legacy_serial_info {</div><div class='ctx'> 	struct device_node		*np;</div><div class='ctx'> 	unsigned int			speed;</div><div class='ctx'> 	unsigned int			clock;</div><div class='add'>+	int				irq_check_parent;</div><div class='ctx'> 	phys_addr_t			taddr;</div><div class='ctx'> } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS];</div><div class='ctx'> static unsigned int legacy_serial_count;</div><div class='hunk'>@@ -37,7 +37,7 @@ static int legacy_serial_console = -1;</div><div class='ctx'> static int __init add_legacy_port(struct device_node *np, int want_index,</div><div class='ctx'> 				  int iotype, phys_addr_t base,</div><div class='ctx'> 				  phys_addr_t taddr, unsigned long irq,</div><div class='del'>-				  upf_t flags)</div><div class='add'>+				  upf_t flags, int irq_check_parent)</div><div class='ctx'> {</div><div class='ctx'> 	u32 *clk, *spd, clock = BASE_BAUD * 16;</div><div class='ctx'> 	int index;</div><div class='hunk'>@@ -69,7 +69,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,</div><div class='ctx'> 	if (legacy_serial_infos[index].np != 0) {</div><div class='ctx'> 		/* if we still have some room, move it, else override */</div><div class='ctx'> 		if (legacy_serial_count &lt; MAX_LEGACY_SERIAL_PORTS) {</div><div class='del'>-			printk(KERN_INFO "Moved legacy port %d -&gt; %d\n",</div><div class='add'>+			printk(KERN_DEBUG "Moved legacy port %d -&gt; %d\n",</div><div class='ctx'> 			       index, legacy_serial_count);</div><div class='ctx'> 			legacy_serial_ports[legacy_serial_count] =</div><div class='ctx'> 				legacy_serial_ports[index];</div><div class='hunk'>@@ -77,7 +77,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,</div><div class='ctx'> 				legacy_serial_infos[index];</div><div class='ctx'> 			legacy_serial_count++;</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_INFO "Replacing legacy port %d\n", index);</div><div class='add'>+			printk(KERN_DEBUG "Replacing legacy port %d\n", index);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -96,10 +96,11 @@ static int __init add_legacy_port(struct device_node *np, int want_index,</div><div class='ctx'> 	legacy_serial_infos[index].np = of_node_get(np);</div><div class='ctx'> 	legacy_serial_infos[index].clock = clock;</div><div class='ctx'> 	legacy_serial_infos[index].speed = spd ? *spd : 0;</div><div class='add'>+	legacy_serial_infos[index].irq_check_parent = irq_check_parent;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Found legacy serial port %d for %s\n",</div><div class='add'>+	printk(KERN_DEBUG "Found legacy serial port %d for %s\n",</div><div class='ctx'> 	       index, np-&gt;full_name);</div><div class='del'>-	printk(KERN_INFO "  %s=%llx, taddr=%llx, irq=%lx, clk=%d, speed=%d\n",</div><div class='add'>+	printk(KERN_DEBUG "  %s=%llx, taddr=%llx, irq=%lx, clk=%d, speed=%d\n",</div><div class='ctx'> 	       (iotype == UPIO_PORT) ? "port" : "mem",</div><div class='ctx'> 	       (unsigned long long)base, (unsigned long long)taddr, irq,</div><div class='ctx'> 	       legacy_serial_ports[index].uartclk,</div><div class='hunk'>@@ -127,11 +128,13 @@ static int __init add_legacy_soc_port(struct device_node *np,</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	addr = of_translate_address(soc_dev, addrp);</div><div class='add'>+	if (addr == OF_BAD_ADDR)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Add port, irq will be dealt with later. We passed a translated</div><div class='ctx'> 	 * IO port value. It will be fixed up later along with the irq</div><div class='ctx'> 	 */</div><div class='del'>-	return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags);</div><div class='add'>+	return add_legacy_port(np, -1, UPIO_MEM, addr, addr, NO_IRQ, flags, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init add_legacy_isa_port(struct device_node *np,</div><div class='hunk'>@@ -142,6 +145,8 @@ static int __init add_legacy_isa_port(struct device_node *np,</div><div class='ctx'> 	int index = -1;</div><div class='ctx'> 	phys_addr_t taddr;</div><div class='ctx'> </div><div class='add'>+	DBG(" -&gt; add_legacy_isa_port(%s)\n", np-&gt;full_name);</div><div class='add'>+</div><div class='ctx'> 	/* Get the ISA port number */</div><div class='ctx'> 	reg = (u32 *)get_property(np, "reg", NULL);</div><div class='ctx'> 	if (reg == NULL)</div><div class='hunk'>@@ -162,9 +167,12 @@ static int __init add_legacy_isa_port(struct device_node *np,</div><div class='ctx'> </div><div class='ctx'> 	/* Translate ISA address */</div><div class='ctx'> 	taddr = of_translate_address(np, reg);</div><div class='add'>+	if (taddr == OF_BAD_ADDR)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Add port, irq will be dealt with later */</div><div class='del'>-	return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr, NO_IRQ, UPF_BOOT_AUTOCONF);</div><div class='add'>+	return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr,</div><div class='add'>+			       NO_IRQ, UPF_BOOT_AUTOCONF, 0);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -177,6 +185,8 @@ static int __init add_legacy_pci_port(struct device_node *np,</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> 	int iotype, index = -1, lindex = 0;</div><div class='ctx'> </div><div class='add'>+	DBG(" -&gt; add_legacy_pci_port(%s)\n", np-&gt;full_name);</div><div class='add'>+</div><div class='ctx'> 	/* We only support ports that have a clock frequency properly</div><div class='ctx'> 	 * encoded in the device-tree (that is have an fcode). Anything</div><div class='ctx'> 	 * else can't be used that early and will be normally probed by</div><div class='hunk'>@@ -195,6 +205,8 @@ static int __init add_legacy_pci_port(struct device_node *np,</div><div class='ctx'> 	/* We only support BAR 0 for now */</div><div class='ctx'> 	iotype = (flags &amp; IORESOURCE_MEM) ? UPIO_MEM : UPIO_PORT;</div><div class='ctx'> 	addr = of_translate_address(pci_dev, addrp);</div><div class='add'>+	if (addr == OF_BAD_ADDR)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the IO base to the same as the translated address for MMIO,</div><div class='ctx'> 	 * or to the domain local IO base for PIO (it will be fixed up later)</div><div class='hunk'>@@ -232,7 +244,8 @@ static int __init add_legacy_pci_port(struct device_node *np,</div><div class='ctx'> 	/* Add port, irq will be dealt with later. We passed a translated</div><div class='ctx'> 	 * IO port value. It will be fixed up later along with the irq</div><div class='ctx'> 	 */</div><div class='del'>-	return add_legacy_port(np, index, iotype, base, addr, NO_IRQ, UPF_BOOT_AUTOCONF);</div><div class='add'>+	return add_legacy_port(np, index, iotype, base, addr, NO_IRQ,</div><div class='add'>+			       UPF_BOOT_AUTOCONF, np != pci_dev);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -302,6 +315,17 @@ void __init find_legacy_serial_ports(void)</div><div class='ctx'> 		of_node_put(isa);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* First fill our array with tsi-bridge ports */</div><div class='add'>+	for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) != NULL;) {</div><div class='add'>+		struct device_node *tsi = of_get_parent(np);</div><div class='add'>+		if (tsi &amp;&amp; !strcmp(tsi-&gt;type, "tsi-bridge")) {</div><div class='add'>+			index = add_legacy_soc_port(np, np);</div><div class='add'>+			if (index &gt;= 0 &amp;&amp; np == stdout)</div><div class='add'>+				legacy_serial_console = index;</div><div class='add'>+		}</div><div class='add'>+		of_node_put(tsi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> 	/* Next, try to locate PCI ports */</div><div class='ctx'> 	for (np = NULL; (np = of_find_all_nodes(np));) {</div><div class='hunk'>@@ -352,27 +376,22 @@ static void __init fixup_port_irq(int index,</div><div class='ctx'> 				  struct device_node *np,</div><div class='ctx'> 				  struct plat_serial8250_port *port)</div><div class='ctx'> {</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='ctx'> 	DBG("fixup_port_irq(%d)\n", index);</div><div class='ctx'> </div><div class='del'>-	/* Check for interrupts in that node */</div><div class='del'>-	if (np-&gt;n_intrs &gt; 0) {</div><div class='del'>-		port-&gt;irq = np-&gt;intrs[0].line;</div><div class='del'>-		DBG(" port %d (%s), irq=%d\n",</div><div class='del'>-		    index, np-&gt;full_name, port-&gt;irq);</div><div class='del'>-		return;</div><div class='add'>+	virq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (virq == NO_IRQ &amp;&amp; legacy_serial_infos[index].irq_check_parent) {</div><div class='add'>+		np = of_get_parent(np);</div><div class='add'>+		if (np == NULL)</div><div class='add'>+			return;</div><div class='add'>+		virq = irq_of_parse_and_map(np, 0);</div><div class='add'>+		of_node_put(np);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Check for interrupts in the parent */</div><div class='del'>-	np = of_get_parent(np);</div><div class='del'>-	if (np == NULL)</div><div class='add'>+	if (virq == NO_IRQ)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;n_intrs &gt; 0) {</div><div class='del'>-		port-&gt;irq = np-&gt;intrs[0].line;</div><div class='del'>-		DBG(" port %d (%s), irq=%d\n",</div><div class='del'>-		    index, np-&gt;full_name, port-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-	of_node_put(np);</div><div class='add'>+	port-&gt;irq = virq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init fixup_port_pio(int index,</div><div class='head'>diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c<br/>index 2cbde865d4f5..23f34daa044a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/lparcfg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/lparcfg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/lparcfg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/lparcfg.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * keyword - value pairs that specify the configuration of the partition.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -45,11 +44,9 @@</div><div class='ctx'> static struct proc_dir_entry *proc_ppc64_lparcfg;</div><div class='ctx'> #define LPARCFG_BUFF_SIZE 4096</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_ISERIES</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * For iSeries legacy systems, the PPA purr function is available from the</div><div class='del'>- * emulated_time_base field in the paca.</div><div class='add'>+ * Track sum of all purrs across all processors. This is used to further</div><div class='add'>+ * calculate usage values by different applications</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long get_purr(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -57,48 +54,31 @@ static unsigned long get_purr(void)</div><div class='ctx'> 	int cpu;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		sum_purr += lppaca[cpu].emulated_time_base;</div><div class='add'>+		if (firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='add'>+			sum_purr += lppaca[cpu].emulated_time_base;</div><div class='add'>+		else {</div><div class='add'>+			struct cpu_usage *cu;</div><div class='ctx'> </div><div class='del'>-#ifdef PURR_DEBUG</div><div class='del'>-		printk(KERN_INFO "get_purr for cpu (%d) has value (%ld) \n",</div><div class='del'>-			cpu, lppaca[cpu].emulated_time_base);</div><div class='del'>-#endif</div><div class='add'>+			cu = &amp;per_cpu(cpu_usage_array, cpu);</div><div class='add'>+			sum_purr += cu-&gt;current_tb;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return sum_purr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define lparcfg_write NULL</div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Methods used to fetch LPAR data when running on an iSeries platform.</div><div class='ctx'>  */</div><div class='del'>-static int lparcfg_data(struct seq_file *m, void *v)</div><div class='add'>+static int iseries_lparcfg_data(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pool_id, lp_index;</div><div class='add'>+	unsigned long pool_id;</div><div class='ctx'> 	int shared, entitled_capacity, max_entitled_capacity;</div><div class='ctx'> 	int processors, max_processors;</div><div class='ctx'> 	unsigned long purr = get_purr();</div><div class='ctx'> </div><div class='del'>-	seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);</div><div class='del'>-</div><div class='ctx'> 	shared = (int)(get_lppaca()-&gt;shared_proc);</div><div class='del'>-	seq_printf(m, "serial_number=%c%c%c%c%c%c%c\n",</div><div class='del'>-		   e2a(xItExtVpdPanel.mfgID[2]),</div><div class='del'>-		   e2a(xItExtVpdPanel.mfgID[3]),</div><div class='del'>-		   e2a(xItExtVpdPanel.systemSerial[1]),</div><div class='del'>-		   e2a(xItExtVpdPanel.systemSerial[2]),</div><div class='del'>-		   e2a(xItExtVpdPanel.systemSerial[3]),</div><div class='del'>-		   e2a(xItExtVpdPanel.systemSerial[4]),</div><div class='del'>-		   e2a(xItExtVpdPanel.systemSerial[5]));</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "system_type=%c%c%c%c\n",</div><div class='del'>-		   e2a(xItExtVpdPanel.machineType[0]),</div><div class='del'>-		   e2a(xItExtVpdPanel.machineType[1]),</div><div class='del'>-		   e2a(xItExtVpdPanel.machineType[2]),</div><div class='del'>-		   e2a(xItExtVpdPanel.machineType[3]));</div><div class='del'>-</div><div class='del'>-	lp_index = HvLpConfig_getLpIndex();</div><div class='del'>-	seq_printf(m, "partition_id=%d\n", (int)lp_index);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(m, "system_active_processors=%d\n",</div><div class='ctx'> 		   (int)HvLpConfig_getSystemPhysicalProcessors());</div><div class='hunk'>@@ -137,6 +117,14 @@ static int lparcfg_data(struct seq_file *m, void *v)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#else				/* CONFIG_PPC_ISERIES */</div><div class='add'>+</div><div class='add'>+static int iseries_lparcfg_data(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif				/* CONFIG_PPC_ISERIES */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PSERIES</div><div class='hunk'>@@ -213,22 +201,6 @@ static void h_pic(unsigned long *pool_idle_time, unsigned long *num_procs)</div><div class='ctx'> 		log_plpar_hcall_return(rc, "H_PIC");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Track sum of all purrs across all processors. This is used to further */</div><div class='del'>-/* calculate usage values by different applications                       */</div><div class='del'>-</div><div class='del'>-static unsigned long get_purr(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long sum_purr = 0;</div><div class='del'>-	int cpu;</div><div class='del'>-	struct cpu_usage *cu;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		cu = &amp;per_cpu(cpu_usage_array, cpu);</div><div class='del'>-		sum_purr += cu-&gt;current_tb;</div><div class='del'>-	}</div><div class='del'>-	return sum_purr;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define SPLPAR_CHARACTERISTICS_TOKEN 20</div><div class='ctx'> #define SPLPAR_MAXLENGTH 1026*(sizeof(char))</div><div class='ctx'> </div><div class='hunk'>@@ -333,35 +305,13 @@ static int lparcfg_count_active_processors(void)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lparcfg_data(struct seq_file *m, void *v)</div><div class='add'>+static int pseries_lparcfg_data(struct seq_file *m, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	int partition_potential_processors;</div><div class='ctx'> 	int partition_active_processors;</div><div class='del'>-	struct device_node *rootdn;</div><div class='del'>-	const char *model = "";</div><div class='del'>-	const char *system_id = "";</div><div class='del'>-	unsigned int *lp_index_ptr, lp_index = 0;</div><div class='ctx'> 	struct device_node *rtas_node;</div><div class='ctx'> 	int *lrdrp = NULL;</div><div class='ctx'> </div><div class='del'>-	rootdn = find_path_device("/");</div><div class='del'>-	if (rootdn) {</div><div class='del'>-		model = get_property(rootdn, "model", NULL);</div><div class='del'>-		system_id = get_property(rootdn, "system-id", NULL);</div><div class='del'>-		lp_index_ptr = (unsigned int *)</div><div class='del'>-		    get_property(rootdn, "ibm,partition-no", NULL);</div><div class='del'>-		if (lp_index_ptr)</div><div class='del'>-			lp_index = *lp_index_ptr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "serial_number=%s\n", system_id);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "system_type=%s\n", model);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "partition_id=%d\n", (int)lp_index);</div><div class='del'>-</div><div class='ctx'> 	rtas_node = find_path_device("/rtas");</div><div class='ctx'> 	if (rtas_node)</div><div class='ctx'> 		lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity",</div><div class='hunk'>@@ -521,10 +471,10 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,</div><div class='ctx'> </div><div class='ctx'> 	current_weight = (resource &gt;&gt; 5 * 8) &amp; 0xFF;</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s: current_entitled = %lu, current_weight = %lu\n",</div><div class='add'>+	pr_debug("%s: current_entitled = %lu, current_weight = %u\n",</div><div class='ctx'> 		 __FUNCTION__, current_entitled, current_weight);</div><div class='ctx'> </div><div class='del'>-	pr_debug("%s: new_entitled = %lu, new_weight = %lu\n",</div><div class='add'>+	pr_debug("%s: new_entitled = %lu, new_weight = %u\n",</div><div class='ctx'> 		 __FUNCTION__, *new_entitled_ptr, *new_weight_ptr);</div><div class='ctx'> </div><div class='ctx'> 	retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,</div><div class='hunk'>@@ -549,8 +499,61 @@ out:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else				/* CONFIG_PPC_PSERIES */</div><div class='add'>+</div><div class='add'>+static int pseries_lparcfg_data(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t lparcfg_write(struct file *file, const char __user * buf,</div><div class='add'>+			     size_t count, loff_t * off)</div><div class='add'>+{</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif				/* CONFIG_PPC_PSERIES */</div><div class='ctx'> </div><div class='add'>+static int lparcfg_data(struct seq_file *m, void *v)</div><div class='add'>+{</div><div class='add'>+	struct device_node *rootdn;</div><div class='add'>+	const char *model = "";</div><div class='add'>+	const char *system_id = "";</div><div class='add'>+	const char *tmp;</div><div class='add'>+	unsigned int *lp_index_ptr, lp_index = 0;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);</div><div class='add'>+</div><div class='add'>+	rootdn = find_path_device("/");</div><div class='add'>+	if (rootdn) {</div><div class='add'>+		tmp = get_property(rootdn, "model", NULL);</div><div class='add'>+		if (tmp) {</div><div class='add'>+			model = tmp;</div><div class='add'>+			/* Skip "IBM," - see platforms/iseries/dt.c */</div><div class='add'>+			if (firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='add'>+				model += 4;</div><div class='add'>+		}</div><div class='add'>+		tmp = get_property(rootdn, "system-id", NULL);</div><div class='add'>+		if (tmp) {</div><div class='add'>+			system_id = tmp;</div><div class='add'>+			/* Skip "IBM," - see platforms/iseries/dt.c */</div><div class='add'>+			if (firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='add'>+				system_id += 4;</div><div class='add'>+		}</div><div class='add'>+		lp_index_ptr = (unsigned int *)</div><div class='add'>+			get_property(rootdn, "ibm,partition-no", NULL);</div><div class='add'>+		if (lp_index_ptr)</div><div class='add'>+			lp_index = *lp_index_ptr;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(m, "serial_number=%s\n", system_id);</div><div class='add'>+	seq_printf(m, "system_type=%s\n", model);</div><div class='add'>+	seq_printf(m, "partition_id=%d\n", (int)lp_index);</div><div class='add'>+</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='add'>+		return iseries_lparcfg_data(m, v);</div><div class='add'>+	return pseries_lparcfg_data(m, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lparcfg_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	return single_open(file, lparcfg_data, NULL);</div><div class='hunk'>@@ -569,7 +572,8 @@ int __init lparcfg_init(void)</div><div class='ctx'> 	mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;</div><div class='ctx'> </div><div class='ctx'> 	/* Allow writing if we have FW_FEATURE_SPLPAR */</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_SPLPAR) &amp;&amp;</div><div class='add'>+			!firmware_has_feature(FW_FEATURE_ISERIES)) {</div><div class='ctx'> 		lparcfg_fops.write = lparcfg_write;</div><div class='ctx'> 		mode |= S_IWUSR;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/machine_kexec_32.c<br/>index 443606134dff..cbaa34196797 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/machine_kexec_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/machine_kexec_32.c</a></div><div class='hunk'>@@ -30,8 +30,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(</div><div class='ctx'>  */</div><div class='ctx'> void default_machine_kexec(struct kimage *image)</div><div class='ctx'> {</div><div class='del'>-	const extern unsigned char relocate_new_kernel[];</div><div class='del'>-	const extern unsigned int relocate_new_kernel_size;</div><div class='add'>+	extern const unsigned char relocate_new_kernel[];</div><div class='add'>+	extern const unsigned int relocate_new_kernel_size;</div><div class='ctx'> 	unsigned long page_list;</div><div class='ctx'> 	unsigned long reboot_code_buffer, reboot_code_buffer_phys;</div><div class='ctx'> 	relocate_new_kernel_t rnk;</div><div class='head'>diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c<br/>index ee166c586642..b438d45a068c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/machine_kexec_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/machine_kexec_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/machine_kexec_64.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/paca.h&gt;</div><div class='add'>+#include &lt;asm/lmb.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;	/* _end */</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -335,7 +336,107 @@ static void __init export_htab_values(void)</div><div class='ctx'> 	of_node_put(node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init kexec_setup(void)</div><div class='add'>+static struct property crashk_base_prop = {</div><div class='add'>+	.name = "linux,crashkernel-base",</div><div class='add'>+	.length = sizeof(unsigned long),</div><div class='add'>+	.value = (unsigned char *)&amp;crashk_res.start,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned long crashk_size;</div><div class='add'>+</div><div class='add'>+static struct property crashk_size_prop = {</div><div class='add'>+	.name = "linux,crashkernel-size",</div><div class='add'>+	.length = sizeof(unsigned long),</div><div class='add'>+	.value = (unsigned char *)&amp;crashk_size,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init export_crashk_values(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	node = of_find_node_by_path("/chosen");</div><div class='add'>+	if (!node)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* There might be existing crash kernel properties, but we can't</div><div class='add'>+	 * be sure what's in them, so remove them. */</div><div class='add'>+	prop = of_find_property(node, "linux,crashkernel-base", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		prom_remove_property(node, prop);</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(node, "linux,crashkernel-size", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		prom_remove_property(node, prop);</div><div class='add'>+</div><div class='add'>+	if (crashk_res.start != 0) {</div><div class='add'>+		prom_add_property(node, &amp;crashk_base_prop);</div><div class='add'>+		crashk_size = crashk_res.end - crashk_res.start + 1;</div><div class='add'>+		prom_add_property(node, &amp;crashk_size_prop);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_node_put(node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init kexec_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	export_htab_values();</div><div class='add'>+	export_crashk_values();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+__initcall(kexec_setup);</div><div class='add'>+</div><div class='add'>+static int __init early_parse_crashk(char *p)</div><div class='add'>+{</div><div class='add'>+	unsigned long size;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	size = memparse(p, &amp;p);</div><div class='add'>+</div><div class='add'>+	if (*p == '@')</div><div class='add'>+		crashk_res.start = memparse(p + 1, &amp;p);</div><div class='add'>+	else</div><div class='add'>+		crashk_res.start = KDUMP_KERNELBASE;</div><div class='add'>+</div><div class='add'>+	crashk_res.end = crashk_res.start + size - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("crashkernel", early_parse_crashk);</div><div class='add'>+</div><div class='add'>+void __init reserve_crashkernel(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long size;</div><div class='add'>+</div><div class='add'>+	if (crashk_res.start == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We might have got these values via the command line or the</div><div class='add'>+	 * device tree, either way sanitise them now. */</div><div class='add'>+</div><div class='add'>+	size = crashk_res.end - crashk_res.start + 1;</div><div class='add'>+</div><div class='add'>+	if (crashk_res.start != KDUMP_KERNELBASE)</div><div class='add'>+		printk("Crash kernel location must be 0x%x\n",</div><div class='add'>+				KDUMP_KERNELBASE);</div><div class='add'>+</div><div class='add'>+	crashk_res.start = KDUMP_KERNELBASE;</div><div class='add'>+	size = PAGE_ALIGN(size);</div><div class='add'>+	crashk_res.end = crashk_res.start + size - 1;</div><div class='add'>+</div><div class='add'>+	/* Crash kernel trumps memory limit */</div><div class='add'>+	if (memory_limit &amp;&amp; memory_limit &lt;= crashk_res.end) {</div><div class='add'>+		memory_limit = crashk_res.end + 1;</div><div class='add'>+		printk("Adjusted memory limit for crashkernel, now 0x%lx\n",</div><div class='add'>+				memory_limit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lmb_reserve(crashk_res.start, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int overlaps_crashkernel(unsigned long start, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	return (start + size) &gt; crashk_res.start &amp;&amp; start &lt;= crashk_res.end;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S<br/>new file mode 100644<br/>index 000000000000..fc23040d5a26<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/misc.S</a></div><div class='hunk'>@@ -0,0 +1,203 @@</div><div class='add'>+/*</div><div class='add'>+ * This file contains miscellaneous low-level functions.</div><div class='add'>+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)</div><div class='add'>+ *</div><div class='add'>+ * Largely rewritten by Cort Dougan (cort@cs.nmt.edu)</div><div class='add'>+ * and Paul Mackerras.</div><div class='add'>+ *</div><div class='add'>+ * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)</div><div class='add'>+ * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm/ppc_asm.h&gt;</div><div class='add'>+</div><div class='add'>+	.text</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+#define IN_SYNC		twi	0,r5,0; isync</div><div class='add'>+#define EIEIO_32</div><div class='add'>+#define SYNC_64		sync</div><div class='add'>+#else /* CONFIG_PPC32 */</div><div class='add'>+#define IN_SYNC</div><div class='add'>+#define EIEIO_32	eieio</div><div class='add'>+#define SYNC_64</div><div class='add'>+#endif</div><div class='add'>+/*</div><div class='add'>+ * Returns (address we are running at) - (address we were linked at)</div><div class='add'>+ * for use before the text and data are mapped to KERNELBASE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+_GLOBAL(reloc_offset)</div><div class='add'>+	mflr	r0</div><div class='add'>+	bl	1f</div><div class='add'>+1:	mflr	r3</div><div class='add'>+	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='add'>+	subf	r3,r4,r3</div><div class='add'>+	mtlr	r0</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * add_reloc_offset(x) returns x + reloc_offset().</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(add_reloc_offset)</div><div class='add'>+	mflr	r0</div><div class='add'>+	bl	1f</div><div class='add'>+1:	mflr	r5</div><div class='add'>+	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='add'>+	subf	r5,r4,r5</div><div class='add'>+	add	r3,r3,r5</div><div class='add'>+	mtlr	r0</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * I/O string operations</div><div class='add'>+ *</div><div class='add'>+ * insb(port, buf, len)</div><div class='add'>+ * outsb(port, buf, len)</div><div class='add'>+ * insw(port, buf, len)</div><div class='add'>+ * outsw(port, buf, len)</div><div class='add'>+ * insl(port, buf, len)</div><div class='add'>+ * outsl(port, buf, len)</div><div class='add'>+ * insw_ns(port, buf, len)</div><div class='add'>+ * outsw_ns(port, buf, len)</div><div class='add'>+ * insl_ns(port, buf, len)</div><div class='add'>+ * outsl_ns(port, buf, len)</div><div class='add'>+ *</div><div class='add'>+ * The *_ns versions don't do byte-swapping.</div><div class='add'>+ */</div><div class='add'>+_GLOBAL(_insb)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,1</div><div class='add'>+	blelr-</div><div class='add'>+00:	lbz	r5,0(r3)</div><div class='add'>+	eieio</div><div class='add'>+	stbu	r5,1(r4)</div><div class='add'>+	bdnz	00b</div><div class='add'>+	IN_SYNC</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+_GLOBAL(_outsb)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,1</div><div class='add'>+	blelr-</div><div class='add'>+00:	lbzu	r5,1(r4)</div><div class='add'>+	stb	r5,0(r3)</div><div class='add'>+	EIEIO_32</div><div class='add'>+	bdnz	00b</div><div class='add'>+	SYNC_64</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+_GLOBAL(_insw)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,2</div><div class='add'>+	blelr-</div><div class='add'>+00:	lhbrx	r5,0,r3</div><div class='add'>+	eieio</div><div class='add'>+	sthu	r5,2(r4)</div><div class='add'>+	bdnz	00b</div><div class='add'>+	IN_SYNC</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+_GLOBAL(_outsw)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,2</div><div class='add'>+	blelr-</div><div class='add'>+00:	lhzu	r5,2(r4)</div><div class='add'>+	EIEIO_32</div><div class='add'>+	sthbrx	r5,0,r3</div><div class='add'>+	bdnz	00b</div><div class='add'>+	SYNC_64</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+_GLOBAL(_insl)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,4</div><div class='add'>+	blelr-</div><div class='add'>+00:	lwbrx	r5,0,r3</div><div class='add'>+	eieio</div><div class='add'>+	stwu	r5,4(r4)</div><div class='add'>+	bdnz	00b</div><div class='add'>+	IN_SYNC</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+_GLOBAL(_outsl)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,4</div><div class='add'>+	blelr-</div><div class='add'>+00:	lwzu	r5,4(r4)</div><div class='add'>+	stwbrx	r5,0,r3</div><div class='add'>+	EIEIO_32</div><div class='add'>+	bdnz	00b</div><div class='add'>+	SYNC_64</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+_GLOBAL(__ide_mm_insw)</div><div class='add'>+#endif</div><div class='add'>+_GLOBAL(_insw_ns)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,2</div><div class='add'>+	blelr-</div><div class='add'>+00:	lhz	r5,0(r3)</div><div class='add'>+	eieio</div><div class='add'>+	sthu	r5,2(r4)</div><div class='add'>+	bdnz	00b</div><div class='add'>+	IN_SYNC</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+_GLOBAL(__ide_mm_outsw)</div><div class='add'>+#endif</div><div class='add'>+_GLOBAL(_outsw_ns)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,2</div><div class='add'>+	blelr-</div><div class='add'>+00:	lhzu	r5,2(r4)</div><div class='add'>+	sth	r5,0(r3)</div><div class='add'>+	EIEIO_32</div><div class='add'>+	bdnz	00b</div><div class='add'>+	SYNC_64</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+_GLOBAL(__ide_mm_insl)</div><div class='add'>+#endif</div><div class='add'>+_GLOBAL(_insl_ns)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,4</div><div class='add'>+	blelr-</div><div class='add'>+00:	lwz	r5,0(r3)</div><div class='add'>+	eieio</div><div class='add'>+	stwu	r5,4(r4)</div><div class='add'>+	bdnz	00b</div><div class='add'>+	IN_SYNC</div><div class='add'>+	blr</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+_GLOBAL(__ide_mm_outsl)</div><div class='add'>+#endif</div><div class='add'>+_GLOBAL(_outsl_ns)</div><div class='add'>+	cmpwi	0,r5,0</div><div class='add'>+	mtctr	r5</div><div class='add'>+	subi	r4,r4,4</div><div class='add'>+	blelr-</div><div class='add'>+00:	lwzu	r5,4(r4)</div><div class='add'>+	stw	r5,0(r3)</div><div class='add'>+	EIEIO_32</div><div class='add'>+	bdnz	00b</div><div class='add'>+	SYNC_64</div><div class='add'>+	blr</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S<br/>index be982023409e..58758d883361 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc_32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/misc_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/misc_32.S</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -61,32 +60,6 @@ _GLOBAL(mulhdu)</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Returns (address we're running at) - (address we were linked at)</div><div class='del'>- * for use before the text and data are mapped to KERNELBASE.</div><div class='del'>- */</div><div class='del'>-_GLOBAL(reloc_offset)</div><div class='del'>-	mflr	r0</div><div class='del'>-	bl	1f</div><div class='del'>-1:	mflr	r3</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='del'>-	subf	r3,r4,r3</div><div class='del'>-	mtlr	r0</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * add_reloc_offset(x) returns x + reloc_offset().</div><div class='del'>- */</div><div class='del'>-_GLOBAL(add_reloc_offset)</div><div class='del'>-	mflr	r0</div><div class='del'>-	bl	1f</div><div class='del'>-1:	mflr	r5</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='del'>-	subf	r5,r4,r5</div><div class='del'>-	add	r3,r3,r5</div><div class='del'>-	mtlr	r0</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * sub_reloc_offset(x) returns x - reloc_offset().</div><div class='ctx'>  */</div><div class='ctx'> _GLOBAL(sub_reloc_offset)</div><div class='hunk'>@@ -216,7 +189,7 @@ _GLOBAL(call_setup_cpu)</div><div class='ctx'> 	lwz	r4,0(r4)</div><div class='ctx'> 	add	r4,r4,r3</div><div class='ctx'> 	lwz	r5,CPU_SPEC_SETUP(r4)</div><div class='del'>-	cmpi	0,r5,0</div><div class='add'>+	cmpwi	0,r5,0</div><div class='ctx'> 	add	r5,r5,r3</div><div class='ctx'> 	beqlr</div><div class='ctx'> 	mtctr	r5</div><div class='hunk'>@@ -781,136 +754,6 @@ _GLOBAL(atomic_set_mask)</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * I/O string operations</div><div class='del'>- *</div><div class='del'>- * insb(port, buf, len)</div><div class='del'>- * outsb(port, buf, len)</div><div class='del'>- * insw(port, buf, len)</div><div class='del'>- * outsw(port, buf, len)</div><div class='del'>- * insl(port, buf, len)</div><div class='del'>- * outsl(port, buf, len)</div><div class='del'>- * insw_ns(port, buf, len)</div><div class='del'>- * outsw_ns(port, buf, len)</div><div class='del'>- * insl_ns(port, buf, len)</div><div class='del'>- * outsl_ns(port, buf, len)</div><div class='del'>- *</div><div class='del'>- * The *_ns versions don't do byte-swapping.</div><div class='del'>- */</div><div class='del'>-_GLOBAL(_insb)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,1</div><div class='del'>-	blelr-</div><div class='del'>-00:	lbz	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	stbu	r5,1(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsb)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,1</div><div class='del'>-	blelr-</div><div class='del'>-00:	lbzu	r5,1(r4)</div><div class='del'>-	stb	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_insw)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhbrx	r5,0,r3</div><div class='del'>-	eieio</div><div class='del'>-	sthu	r5,2(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsw)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhzu	r5,2(r4)</div><div class='del'>-	eieio</div><div class='del'>-	sthbrx	r5,0,r3</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_insl)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwbrx	r5,0,r3</div><div class='del'>-	eieio</div><div class='del'>-	stwu	r5,4(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsl)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwzu	r5,4(r4)</div><div class='del'>-	stwbrx	r5,0,r3</div><div class='del'>-	eieio</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(__ide_mm_insw)</div><div class='del'>-_GLOBAL(_insw_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhz	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	sthu	r5,2(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(__ide_mm_outsw)</div><div class='del'>-_GLOBAL(_outsw_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhzu	r5,2(r4)</div><div class='del'>-	sth	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(__ide_mm_insl)</div><div class='del'>-_GLOBAL(_insl_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwz	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	stwu	r5,4(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(__ide_mm_outsl)</div><div class='del'>-_GLOBAL(_outsl_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwzu	r5,4(r4)</div><div class='del'>-	stw	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	bdnz	00b</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Extended precision shifts.</div><div class='ctx'>  *</div><div class='ctx'>  * Updated to be valid for shift counts from 0 to 63 inclusive.</div><div class='head'>diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S<br/>index 2778cce058e2..bfb407fc1aa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc_64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/misc_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/misc_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/misc_64.S</a></div><div class='hunk'>@@ -1,14 +1,12 @@</div><div class='ctx'> /*</div><div class='del'>- *  arch/powerpc/kernel/misc64.S</div><div class='del'>- *</div><div class='ctx'>  * This file contains miscellaneous low-level functions.</div><div class='ctx'>  *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)</div><div class='ctx'>  *</div><div class='ctx'>  * Largely rewritten by Cort Dougan (cort@cs.nmt.edu)</div><div class='ctx'>  * and Paul Mackerras.</div><div class='ctx'>  * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)</div><div class='del'>- * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com) </div><div class='del'>- * </div><div class='add'>+ * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='hunk'>@@ -16,7 +14,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -30,41 +27,10 @@</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Returns (address we are running at) - (address we were linked at)</div><div class='del'>- * for use before the text and data are mapped to KERNELBASE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-_GLOBAL(reloc_offset)</div><div class='del'>-	mflr	r0</div><div class='del'>-	bl	1f</div><div class='del'>-1:	mflr	r3</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='del'>-	subf	r3,r4,r3</div><div class='del'>-	mtlr	r0</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * add_reloc_offset(x) returns x + reloc_offset().</div><div class='del'>- */</div><div class='del'>-_GLOBAL(add_reloc_offset)</div><div class='del'>-	mflr	r0</div><div class='del'>-	bl	1f</div><div class='del'>-1:	mflr	r5</div><div class='del'>-	LOAD_REG_IMMEDIATE(r4,1b)</div><div class='del'>-	subf	r5,r4,r5</div><div class='del'>-	add	r3,r3,r5</div><div class='del'>-	mtlr	r0</div><div class='del'>-	blr</div><div class='del'>-</div><div class='ctx'> _GLOBAL(get_msr)</div><div class='ctx'> 	mfmsr	r3</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='del'>-_GLOBAL(get_dar)</div><div class='del'>-	mfdar	r3</div><div class='del'>-	blr</div><div class='del'>-</div><div class='ctx'> _GLOBAL(get_srr0)</div><div class='ctx'> 	mfsrr0  r3</div><div class='ctx'> 	blr</div><div class='hunk'>@@ -72,10 +38,6 @@ _GLOBAL(get_srr0)</div><div class='ctx'> _GLOBAL(get_srr1)</div><div class='ctx'> 	mfsrr1  r3</div><div class='ctx'> 	blr</div><div class='del'>-	</div><div class='del'>-_GLOBAL(get_sp)</div><div class='del'>-	mr	r3,r1</div><div class='del'>-	blr</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IRQSTACKS</div><div class='ctx'> _GLOBAL(call_do_softirq)</div><div class='hunk'>@@ -89,60 +51,20 @@ _GLOBAL(call_do_softirq)</div><div class='ctx'> 	mtlr	r0</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='del'>-_GLOBAL(call___do_IRQ)</div><div class='add'>+_GLOBAL(call_handle_irq)</div><div class='add'>+	ld	r8,0(r7)</div><div class='ctx'> 	mflr	r0</div><div class='ctx'> 	std	r0,16(r1)</div><div class='del'>-	stdu	r1,THREAD_SIZE-112(r5)</div><div class='del'>-	mr	r1,r5</div><div class='del'>-	bl	.__do_IRQ</div><div class='add'>+	mtctr	r8</div><div class='add'>+	stdu	r1,THREAD_SIZE-112(r6)</div><div class='add'>+	mr	r1,r6</div><div class='add'>+	bctrl</div><div class='ctx'> 	ld	r1,0(r1)</div><div class='ctx'> 	ld	r0,16(r1)</div><div class='ctx'> 	mtlr	r0</div><div class='ctx'> 	blr</div><div class='ctx'> #endif /* CONFIG_IRQSTACKS */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>- * To be called by C code which needs to do some operations with MMU</div><div class='del'>- * disabled. Note that interrupts have to be disabled by the caller</div><div class='del'>- * prior to calling us. The code called _MUST_ be in the RMO of course</div><div class='del'>- * and part of the linear mapping as we don't attempt to translate the</div><div class='del'>- * stack pointer at all. The function is called with the stack switched</div><div class='del'>- * to this CPU emergency stack</div><div class='del'>- *</div><div class='del'>- * prototype is void *call_with_mmu_off(void *func, void *data);</div><div class='del'>- *</div><div class='del'>- * the called function is expected to be of the form</div><div class='del'>- *</div><div class='del'>- * void *called(void *data); </div><div class='del'>- */</div><div class='del'>-_GLOBAL(call_with_mmu_off)</div><div class='del'>-	mflr	r0			/* get link, save it on stackframe */</div><div class='del'>-	std	r0,16(r1)</div><div class='del'>-	mr	r1,r5			/* save old stack ptr */</div><div class='del'>-	ld	r1,PACAEMERGSP(r13)	/* get emerg. stack */</div><div class='del'>-	subi	r1,r1,STACK_FRAME_OVERHEAD</div><div class='del'>-	std	r0,16(r1)		/* save link on emerg. stack */</div><div class='del'>-	std	r5,0(r1)		/* save old stack ptr in backchain */</div><div class='del'>-	ld	r3,0(r3)		/* get to real function ptr (assume same TOC) */</div><div class='del'>-	bl	2f			/* we need LR to return, continue at label 2 */</div><div class='del'>-</div><div class='del'>-	ld	r0,16(r1)		/* we return here from the call, get LR and */</div><div class='del'>-	ld	r1,0(r1)		/* .. old stack ptr */</div><div class='del'>-	mtspr	SPRN_SRR0,r0		/* and get back to virtual mode with these */</div><div class='del'>-	mfmsr	r4</div><div class='del'>-	ori	r4,r4,MSR_IR|MSR_DR</div><div class='del'>-	mtspr	SPRN_SRR1,r4</div><div class='del'>-	rfid</div><div class='del'>-</div><div class='del'>-2:	mtspr	SPRN_SRR0,r3		/* coming from above, enter real mode */</div><div class='del'>-	mr	r3,r4			/* get parameter */</div><div class='del'>-	mfmsr	r0</div><div class='del'>-	ori	r0,r0,MSR_IR|MSR_DR</div><div class='del'>-	xori	r0,r0,MSR_IR|MSR_DR</div><div class='del'>-	mtspr	SPRN_SRR1,r0</div><div class='del'>-	rfid</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	.section	".toc","aw"</div><div class='ctx'> PPC64_CACHES:</div><div class='ctx'> 	.tc		ppc64_caches[TC],ppc64_caches</div><div class='hunk'>@@ -323,144 +245,6 @@ _GLOBAL(__flush_dcache_icache)</div><div class='ctx'> 	bdnz	1b</div><div class='ctx'> 	isync</div><div class='ctx'> 	blr</div><div class='del'>-	</div><div class='del'>-/*</div><div class='del'>- * I/O string operations</div><div class='del'>- *</div><div class='del'>- * insb(port, buf, len)</div><div class='del'>- * outsb(port, buf, len)</div><div class='del'>- * insw(port, buf, len)</div><div class='del'>- * outsw(port, buf, len)</div><div class='del'>- * insl(port, buf, len)</div><div class='del'>- * outsl(port, buf, len)</div><div class='del'>- * insw_ns(port, buf, len)</div><div class='del'>- * outsw_ns(port, buf, len)</div><div class='del'>- * insl_ns(port, buf, len)</div><div class='del'>- * outsl_ns(port, buf, len)</div><div class='del'>- *</div><div class='del'>- * The *_ns versions don't do byte-swapping.</div><div class='del'>- */</div><div class='del'>-_GLOBAL(_insb)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,1</div><div class='del'>-	blelr-</div><div class='del'>-00:	lbz	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	stbu	r5,1(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	twi	0,r5,0</div><div class='del'>-	isync</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsb)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,1</div><div class='del'>-	blelr-</div><div class='del'>-00:	lbzu	r5,1(r4)</div><div class='del'>-	stb	r5,0(r3)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	sync</div><div class='del'>-	blr	</div><div class='del'>-</div><div class='del'>-_GLOBAL(_insw)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhbrx	r5,0,r3</div><div class='del'>-	eieio</div><div class='del'>-	sthu	r5,2(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	twi	0,r5,0</div><div class='del'>-	isync</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsw)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhzu	r5,2(r4)</div><div class='del'>-	sthbrx	r5,0,r3	</div><div class='del'>-	bdnz	00b</div><div class='del'>-	sync</div><div class='del'>-	blr	</div><div class='del'>-</div><div class='del'>-_GLOBAL(_insl)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwbrx	r5,0,r3</div><div class='del'>-	eieio</div><div class='del'>-	stwu	r5,4(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	twi	0,r5,0</div><div class='del'>-	isync</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsl)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwzu	r5,4(r4)</div><div class='del'>-	stwbrx	r5,0,r3</div><div class='del'>-	bdnz	00b</div><div class='del'>-	sync</div><div class='del'>-	blr	</div><div class='del'>-</div><div class='del'>-/* _GLOBAL(ide_insw) now in drivers/ide/ide-iops.c */</div><div class='del'>-_GLOBAL(_insw_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhz	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	sthu	r5,2(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	twi	0,r5,0</div><div class='del'>-	isync</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-/* _GLOBAL(ide_outsw) now in drivers/ide/ide-iops.c */</div><div class='del'>-_GLOBAL(_outsw_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,2</div><div class='del'>-	blelr-</div><div class='del'>-00:	lhzu	r5,2(r4)</div><div class='del'>-	sth	r5,0(r3)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	sync</div><div class='del'>-	blr	</div><div class='del'>-</div><div class='del'>-_GLOBAL(_insl_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwz	r5,0(r3)</div><div class='del'>-	eieio</div><div class='del'>-	stwu	r5,4(r4)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	twi	0,r5,0</div><div class='del'>-	isync</div><div class='del'>-	blr</div><div class='del'>-</div><div class='del'>-_GLOBAL(_outsl_ns)</div><div class='del'>-	cmpwi	0,r5,0</div><div class='del'>-	mtctr	r5</div><div class='del'>-	subi	r4,r4,4</div><div class='del'>-	blelr-</div><div class='del'>-00:	lwzu	r5,4(r4)</div><div class='del'>-	stw	r5,0(r3)</div><div class='del'>-	bdnz	00b</div><div class='del'>-	sync</div><div class='del'>-	blr	</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * identify_cpu and calls setup_cpu</div><div class='hunk'>@@ -482,7 +266,9 @@ _GLOBAL(identify_cpu)</div><div class='ctx'> 	sub	r0,r3,r5</div><div class='ctx'> 	std	r0,0(r4)</div><div class='ctx'> 	ld	r4,CPU_SPEC_SETUP(r3)</div><div class='add'>+	cmpdi	0,r4,0</div><div class='ctx'> 	add	r4,r4,r5</div><div class='add'>+	beqlr</div><div class='ctx'> 	ld	r4,0(r4)</div><div class='ctx'> 	add	r4,r4,r5</div><div class='ctx'> 	mtctr	r4</div><div class='hunk'>@@ -603,6 +389,7 @@ _GLOBAL(real_writeb)</div><div class='ctx'> 	blr</div><div class='ctx'> #endif /* defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE) */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CPU_FREQ_PMAC64</div><div class='ctx'> /*</div><div class='ctx'>  * SCOM access functions for 970 (FX only for now)</div><div class='ctx'>  *</div><div class='hunk'>@@ -671,6 +458,7 @@ _GLOBAL(scom970_write)</div><div class='ctx'> 	/* restore interrupts */</div><div class='ctx'> 	mtmsrd	r5,1</div><div class='ctx'> 	blr</div><div class='add'>+#endif /* CONFIG_CPU_FREQ_PMAC64 */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -768,9 +556,6 @@ _GLOBAL(giveup_altivec)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_ALTIVEC */</div><div class='ctx'> </div><div class='del'>-_GLOBAL(__setup_cpu_power3)</div><div class='del'>-	blr</div><div class='del'>-</div><div class='ctx'> _GLOBAL(execve)</div><div class='ctx'> 	li	r0,__NR_execve</div><div class='ctx'> 	sc</div><div class='head'>diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c<br/>index ada50aa5b600..6960f090991e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/nvram_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/nvram_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/nvram_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/nvram_64.c</a></div><div class='hunk'>@@ -204,7 +204,7 @@ static void nvram_print_partitions(char * label)</div><div class='ctx'> 	printk(KERN_WARNING "indx\t\tsig\tchks\tlen\tname\n");</div><div class='ctx'> 	list_for_each(p, &amp;nvram_part-&gt;partition) {</div><div class='ctx'> 		tmp_part = list_entry(p, struct nvram_partition, partition);</div><div class='del'>-		printk(KERN_WARNING "%d    \t%02x\t%02x\t%d\t%s\n",</div><div class='add'>+		printk(KERN_WARNING "%4d    \t%02x\t%02x\t%d\t%s\n",</div><div class='ctx'> 		       tmp_part-&gt;index, tmp_part-&gt;header.signature,</div><div class='ctx'> 		       tmp_part-&gt;header.checksum, tmp_part-&gt;header.length,</div><div class='ctx'> 		       tmp_part-&gt;header.name);</div><div class='head'>diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c<br/>index 9feeeef5a875..3262b73a3a68 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/of_device.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/of_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/of_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/of_device.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c<br/>index f505a8827e3e..c68741fed14b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/paca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/paca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/paca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/paca.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -16,7 +15,6 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/lppaca.h&gt;</div><div class='del'>-#include &lt;asm/iseries/it_lp_queue.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/it_lp_reg_save.h&gt;</div><div class='ctx'> #include &lt;asm/paca.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c<br/>index b129d2e4b759..09b1e1bbb29b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/pci_32.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Common pmac/prep/chrp pci routines. -- Cort</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -12,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +98,7 @@ pcibios_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> 		if (!res-&gt;flags)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (res-&gt;end == 0xffffffff) {</div><div class='del'>-			DBG("PCI:%s Resource %d [%08lx-%08lx] is unassigned\n",</div><div class='add'>+			DBG("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n",</div><div class='ctx'> 			    pci_name(dev), i, res-&gt;start, res-&gt;end);</div><div class='ctx'> 			res-&gt;end -= res-&gt;start;</div><div class='ctx'> 			res-&gt;start = 0;</div><div class='hunk'>@@ -117,7 +116,7 @@ pcibios_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> 			res-&gt;start += offset;</div><div class='ctx'> 			res-&gt;end += offset;</div><div class='ctx'> #ifdef DEBUG</div><div class='del'>-			printk("Fixup res %d (%lx) of dev %s: %lx -&gt; %lx\n",</div><div class='add'>+			printk("Fixup res %d (%lx) of dev %s: %llx -&gt; %llx\n",</div><div class='ctx'> 			       i, res-&gt;flags, pci_name(dev),</div><div class='ctx'> 			       res-&gt;start - offset, res-&gt;start);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -173,18 +172,18 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);</div><div class='ctx'>  * but we want to try to avoid allocating at 0x2900-0x2bff</div><div class='ctx'>  * which might have be mirrored at 0x0100-0x03ff..</div><div class='ctx'>  */</div><div class='del'>-void pcibios_align_resource(void *data, struct resource *res, unsigned long size,</div><div class='del'>-		       unsigned long align)</div><div class='add'>+void pcibios_align_resource(void *data, struct resource *res,</div><div class='add'>+				resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = data;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (size &gt; 0x100) {</div><div class='ctx'> 			printk(KERN_ERR "PCI: I/O Region %s/%d too large"</div><div class='del'>-			       " (%ld bytes)\n", pci_name(dev),</div><div class='del'>-			       dev-&gt;resource - res, size);</div><div class='add'>+			       " (%lld bytes)\n", pci_name(dev),</div><div class='add'>+			       dev-&gt;resource - res, (unsigned long long)size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='hunk'>@@ -255,8 +254,8 @@ pcibios_allocate_bus_resources(struct list_head *bus_list)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			DBG("PCI: bridge rsrc %lx..%lx (%lx), parent %p\n",</div><div class='del'>-			    res-&gt;start, res-&gt;end, res-&gt;flags, pr);</div><div class='add'>+			DBG("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n",</div><div class='add'>+				res-&gt;start, res-&gt;end, res-&gt;flags, pr);</div><div class='ctx'> 			if (pr) {</div><div class='ctx'> 				if (request_resource(pr, res) == 0)</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -306,7 +305,7 @@ reparent_resources(struct resource *parent, struct resource *res)</div><div class='ctx'> 	*pp = NULL;</div><div class='ctx'> 	for (p = res-&gt;child; p != NULL; p = p-&gt;sibling) {</div><div class='ctx'> 		p-&gt;parent = res;</div><div class='del'>-		DBG(KERN_INFO "PCI: reparented %s [%lx..%lx] under %s\n",</div><div class='add'>+		DBG(KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n",</div><div class='ctx'> 		    p-&gt;name, p-&gt;start, p-&gt;end, res-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -362,13 +361,14 @@ pci_relocate_bridge_resource(struct pci_bus *bus, int i)</div><div class='ctx'> 		try = conflict-&gt;start - 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (request_resource(pr, res)) {</div><div class='del'>-		DBG(KERN_ERR "PCI: huh? couldn't move to %lx..%lx\n",</div><div class='add'>+		DBG(KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n",</div><div class='ctx'> 		    res-&gt;start, res-&gt;end);</div><div class='ctx'> 		return -1;		/* "can't happen" */</div><div class='ctx'> 	}</div><div class='ctx'> 	update_bridge_base(bus, i);</div><div class='del'>-	printk(KERN_INFO "PCI: bridge %d resource %d moved to %lx..%lx\n",</div><div class='del'>-	       bus-&gt;number, i, res-&gt;start, res-&gt;end);</div><div class='add'>+	printk(KERN_INFO "PCI: bridge %d resource %d moved to %llx..%llx\n",</div><div class='add'>+	       bus-&gt;number, i, (unsigned long long)res-&gt;start,</div><div class='add'>+	       (unsigned long long)res-&gt;end);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -479,14 +479,14 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *pr, *r = &amp;dev-&gt;resource[idx];</div><div class='ctx'> </div><div class='del'>-	DBG("PCI:%s: Resource %d: %08lx-%08lx (f=%lx)\n",</div><div class='add'>+	DBG("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n",</div><div class='ctx'> 	    pci_name(dev), idx, r-&gt;start, r-&gt;end, r-&gt;flags);</div><div class='ctx'> 	pr = pci_find_parent_resource(dev, r);</div><div class='ctx'> 	if (!pr || request_resource(pr, r) &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "PCI: Cannot allocate resource region %d"</div><div class='ctx'> 		       " of device %s\n", idx, pci_name(dev));</div><div class='ctx'> 		if (pr)</div><div class='del'>-			DBG("PCI:  parent is %p: %08lx-%08lx (f=%lx)\n",</div><div class='add'>+			DBG("PCI:  parent is %p: %016llx-%016llx (f=%lx)\n",</div><div class='ctx'> 			    pr, pr-&gt;start, pr-&gt;end, pr-&gt;flags);</div><div class='ctx'> 		/* We'll assign a new address later */</div><div class='ctx'> 		r-&gt;flags |= IORESOURCE_UNSET;</div><div class='hunk'>@@ -956,7 +956,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,</div><div class='ctx'> 			res = &amp;hose-&gt;io_resource;</div><div class='ctx'> 			res-&gt;flags = IORESOURCE_IO;</div><div class='ctx'> 			res-&gt;start = ranges[2];</div><div class='del'>-			DBG("PCI: IO 0x%lx -&gt; 0x%lx\n",</div><div class='add'>+			DBG("PCI: IO 0x%llx -&gt; 0x%llx\n",</div><div class='ctx'> 				    res-&gt;start, res-&gt;start + size - 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:		/* memory space */</div><div class='hunk'>@@ -978,7 +978,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose,</div><div class='ctx'> 				if(ranges[0] &amp; 0x40000000)</div><div class='ctx'> 					res-&gt;flags |= IORESOURCE_PREFETCH;</div><div class='ctx'> 				res-&gt;start = ranges[na+2];</div><div class='del'>-				DBG("PCI: MEM[%d] 0x%lx -&gt; 0x%lx\n", memno,</div><div class='add'>+				DBG("PCI: MEM[%d] 0x%llx -&gt; 0x%llx\n", memno,</div><div class='ctx'> 					    res-&gt;start, res-&gt;start + size - 1);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1074,7 +1074,7 @@ do_update_p2p_io_resource(struct pci_bus *bus, int enable_vga)</div><div class='ctx'> 	DBG("Remapping Bus %d, bridge: %s\n", bus-&gt;number, pci_name(bridge));</div><div class='ctx'> 	res.start -= ((unsigned long) hose-&gt;io_base_virt - isa_io_base);</div><div class='ctx'> 	res.end -= ((unsigned long) hose-&gt;io_base_virt - isa_io_base);</div><div class='del'>-	DBG("  IO window: %08lx-%08lx\n", res.start, res.end);</div><div class='add'>+	DBG("  IO window: %016llx-%016llx\n", res.start, res.end);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the top and bottom of the PCI I/O segment for this bus. */</div><div class='ctx'> 	pci_read_config_dword(bridge, PCI_IO_BASE, &amp;l);</div><div class='hunk'>@@ -1113,9 +1113,10 @@ check_for_io_childs(struct pci_bus *bus, struct resource* res, int *found_vga)</div><div class='ctx'> 	int	i;</div><div class='ctx'> 	int	rc = 0;</div><div class='ctx'> </div><div class='del'>-#define push_end(res, size) do { unsigned long __sz = (size) ; \</div><div class='del'>-	res-&gt;end = ((res-&gt;end + __sz) / (__sz + 1)) * (__sz + 1) + __sz; \</div><div class='del'>-    } while (0)</div><div class='add'>+#define push_end(res, mask) do {		\</div><div class='add'>+	BUG_ON((mask+1) &amp; mask);		\</div><div class='add'>+	res-&gt;end = (res-&gt;end + mask) | mask;	\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list) {</div><div class='ctx'> 		u16 class = dev-&gt;class &gt;&gt; 8;</div><div class='hunk'>@@ -1222,8 +1223,8 @@ do_fixup_p2p_level(struct pci_bus *bus)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				if ((r-&gt;flags &amp; IORESOURCE_IO) == 0)</div><div class='ctx'> 					continue;</div><div class='del'>-				DBG("Trying to allocate from %08lx, size %08lx from parent"</div><div class='del'>-				    " res %d: %08lx -&gt; %08lx\n",</div><div class='add'>+				DBG("Trying to allocate from %016llx, size %016llx from parent"</div><div class='add'>+				    " res %d: %016llx -&gt; %016llx\n",</div><div class='ctx'> 					res-&gt;start, res-&gt;end, i, r-&gt;start, r-&gt;end);</div><div class='ctx'> 			</div><div class='ctx'> 				if (allocate_resource(r, res, res-&gt;end + 1, res-&gt;start, max,</div><div class='hunk'>@@ -1403,6 +1404,65 @@ pcibios_update_irq(struct pci_dev *dev, int irq)</div><div class='ctx'> 	/* XXX FIXME - update OF device tree node interrupt property */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_MERGE</div><div class='add'>+/* XXX This is a copy of the ppc64 version. This is temporary until we start</div><div class='add'>+ * merging the 2 PCI layers</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Reads the interrupt pin to determine if interrupt is use by card.</div><div class='add'>+ * If the interrupt is used, then gets the interrupt line from the</div><div class='add'>+ * openfirmware and sets it in the pci_dev and pci_config line.</div><div class='add'>+ */</div><div class='add'>+int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='add'>+{</div><div class='add'>+	struct of_irq oirq;</div><div class='add'>+	unsigned int virq;</div><div class='add'>+</div><div class='add'>+	DBG("Try to map irq for %s...\n", pci_name(pci_dev));</div><div class='add'>+</div><div class='add'>+	/* Try to get a mapping from the device-tree */</div><div class='add'>+	if (of_irq_map_pci(pci_dev, &amp;oirq)) {</div><div class='add'>+		u8 line, pin;</div><div class='add'>+</div><div class='add'>+		/* If that fails, lets fallback to what is in the config</div><div class='add'>+		 * space and map that through the default controller. We</div><div class='add'>+		 * also set the type to level low since that's what PCI</div><div class='add'>+		 * interrupts are. If your platform does differently, then</div><div class='add'>+		 * either provide a proper interrupt tree or don't use this</div><div class='add'>+		 * function.</div><div class='add'>+		 */</div><div class='add'>+		if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &amp;pin))</div><div class='add'>+			return -1;</div><div class='add'>+		if (pin == 0)</div><div class='add'>+			return -1;</div><div class='add'>+		if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &amp;line) ||</div><div class='add'>+		    line == 0xff) {</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		DBG(" -&gt; no map ! Using irq line %d from PCI config\n", line);</div><div class='add'>+</div><div class='add'>+		virq = irq_create_mapping(NULL, line);</div><div class='add'>+		if (virq != NO_IRQ)</div><div class='add'>+			set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	} else {</div><div class='add'>+		DBG(" -&gt; got one, spec %d cells (0x%08x...) on %s\n",</div><div class='add'>+		    oirq.size, oirq.specifier[0], oirq.controller-&gt;full_name);</div><div class='add'>+</div><div class='add'>+		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,</div><div class='add'>+					     oirq.size);</div><div class='add'>+	}</div><div class='add'>+	if(virq == NO_IRQ) {</div><div class='add'>+		DBG(" -&gt; failed to map !\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	pci_dev-&gt;irq = virq;</div><div class='add'>+	pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, virq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_read_irq_line);</div><div class='add'>+#endif /* CONFIG_PPC_MERGE */</div><div class='add'>+</div><div class='ctx'> int pcibios_enable_device(struct pci_dev *dev, int mask)</div><div class='ctx'> {</div><div class='ctx'> 	u16 cmd, old_cmd;</div><div class='hunk'>@@ -1573,8 +1633,8 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,</div><div class='ctx'> 	else</div><div class='ctx'> 		prot |= _PAGE_GUARDED;</div><div class='ctx'> </div><div class='del'>-	printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp-&gt;start,</div><div class='del'>-	       prot);</div><div class='add'>+	printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev),</div><div class='add'>+		(unsigned long long)rp-&gt;start, prot);</div><div class='ctx'> </div><div class='ctx'> 	return __pgprot(prot);</div><div class='ctx'> }</div><div class='hunk'>@@ -1653,7 +1713,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_pgoff = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	vma-&gt;vm_flags |= VM_SHM | VM_LOCKED | VM_IO;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pci_mmap_set_pgprot(dev, rp,</div><div class='ctx'> 						  vma-&gt;vm_page_prot,</div><div class='ctx'> 						  mmap_state, write_combine);</div><div class='hunk'>@@ -1755,7 +1814,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)</div><div class='ctx'> </div><div class='ctx'> void pci_resource_to_user(const struct pci_dev *dev, int bar,</div><div class='ctx'> 			  const struct resource *rsrc,</div><div class='del'>-			  u64 *start, u64 *end)</div><div class='add'>+			  resource_size_t *start, resource_size_t *end)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose = pci_bus_to_hose(dev-&gt;bus-&gt;number);</div><div class='ctx'> 	unsigned long offset = 0;</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c<br/>index 4c4449be81ce..2fce7738e9e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/pci_64.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -22,13 +21,13 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -42,14 +41,6 @@</div><div class='ctx'> unsigned long pci_probe_only = 1;</div><div class='ctx'> int pci_assign_all_buses = 0;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * legal IO pages under MAX_ISA_PORT.  This is to ensure we don't touch</div><div class='del'>- * devices we don't have access to.</div><div class='del'>- */</div><div class='del'>-unsigned long io_page_mask;</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(io_page_mask);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='ctx'> static void fixup_resource(struct resource *res, struct pci_dev *dev);</div><div class='ctx'> static void do_bus_setup(struct pci_bus *bus);</div><div class='hunk'>@@ -146,11 +137,11 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);</div><div class='ctx'>  * which might have be mirrored at 0x0100-0x03ff..</div><div class='ctx'>  */</div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = data;</div><div class='ctx'> 	struct pci_controller *hose = pci_bus_to_host(dev-&gt;bus);</div><div class='del'>-	unsigned long start = res-&gt;start;</div><div class='add'>+	resource_size_t start = res-&gt;start;</div><div class='ctx'> 	unsigned long alignto;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='hunk'>@@ -235,8 +226,10 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev)</div><div class='ctx'> 	pci_setup_pci_controller(phb);</div><div class='ctx'> 	phb-&gt;arch_data = dev;</div><div class='ctx'> 	phb-&gt;is_dynamic = mem_init_done;</div><div class='del'>-	if (dev)</div><div class='add'>+	if (dev) {</div><div class='add'>+		PHB_SET_NODE(phb, of_node_to_nid(dev));</div><div class='ctx'> 		add_linux_pci_domain(dev, phb);</div><div class='add'>+	}</div><div class='ctx'> 	return phb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +389,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;current_state = 4;		/* unknown power state */</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(type, "pci")) {</div><div class='add'>+	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {</div><div class='ctx'> 		/* a PCI-PCI bridge */</div><div class='ctx'> 		dev-&gt;hdr_type = PCI_HEADER_TYPE_BRIDGE;</div><div class='ctx'> 		dev-&gt;rom_base_reg = PCI_ROM_ADDRESS1;</div><div class='hunk'>@@ -405,12 +398,8 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev-&gt;hdr_type = PCI_HEADER_TYPE_NORMAL;</div><div class='ctx'> 		dev-&gt;rom_base_reg = PCI_ROM_ADDRESS;</div><div class='add'>+		/* Maybe do a default OF mapping here */</div><div class='ctx'> 		dev-&gt;irq = NO_IRQ;</div><div class='del'>-		if (node-&gt;n_intrs &gt; 0) {</div><div class='del'>-			dev-&gt;irq = node-&gt;intrs[0].line;</div><div class='del'>-			pci_write_config_byte(dev, PCI_INTERRUPT_LINE,</div><div class='del'>-					      dev-&gt;irq);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_parse_of_addrs(node, dev);</div><div class='hunk'>@@ -605,7 +594,7 @@ static int __init pcibios_init(void)</div><div class='ctx'> 	iSeries_pcibios_init(); </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	printk("PCI: Probing PCI hardware\n");</div><div class='add'>+	printk(KERN_DEBUG "PCI: Probing PCI hardware\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Scan all of the recorded PCI controllers.  */</div><div class='ctx'> 	list_for_each_entry_safe(hose, tmp, &amp;hose_list, list_node) {</div><div class='hunk'>@@ -630,14 +619,14 @@ static int __init pcibios_init(void)</div><div class='ctx'> 	/* Cache the location of the ISA bridge (if we have one) */</div><div class='ctx'> 	ppc64_isabridge_dev = pci_get_class(PCI_CLASS_BRIDGE_ISA &lt;&lt; 8, NULL);</div><div class='ctx'> 	if (ppc64_isabridge_dev != NULL)</div><div class='del'>-		printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));</div><div class='add'>+		printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='ctx'> 	/* map in PCI I/O space */</div><div class='ctx'> 	phbs_remap_io();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	printk("PCI: Probing PCI hardware done\n");</div><div class='add'>+	printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -804,7 +793,7 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,</div><div class='ctx'> 	else</div><div class='ctx'> 		prot |= _PAGE_GUARDED;</div><div class='ctx'> </div><div class='del'>-	printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp-&gt;start,</div><div class='add'>+	printk(KERN_DEBUG "PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp-&gt;start,</div><div class='ctx'> 	       prot);</div><div class='ctx'> </div><div class='ctx'> 	return __pgprot(prot);</div><div class='hunk'>@@ -883,7 +872,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_pgoff = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	vma-&gt;vm_flags |= VM_SHM | VM_LOCKED | VM_IO;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pci_mmap_set_pgprot(dev, rp,</div><div class='ctx'> 						  vma-&gt;vm_page_prot,</div><div class='ctx'> 						  mmap_state, write_combine);</div><div class='hunk'>@@ -894,8 +882,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='del'>-static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t pci_show_devspec(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct device_node *np;</div><div class='hunk'>@@ -907,13 +895,10 @@ static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *att</div><div class='ctx'> 	return sprintf(buf, "%s", np-&gt;full_name);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(devspec, S_IRUGO, pci_show_devspec, NULL);</div><div class='del'>-#endif /* CONFIG_PPC_MULTIPLATFORM */</div><div class='ctx'> </div><div class='ctx'> void pcibios_add_platform_entries(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='ctx'> 	device_create_file(&amp;pdev-&gt;dev, &amp;dev_attr_devspec);</div><div class='del'>-#endif /* CONFIG_PPC_MULTIPLATFORM */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='hunk'>@@ -1104,8 +1089,6 @@ void __init pci_setup_phb_io(struct pci_controller *hose, int primary)</div><div class='ctx'> 			pci_process_ISA_OF_ranges(isa_dn, hose-&gt;io_base_phys,</div><div class='ctx'> 						hose-&gt;io_base_virt);</div><div class='ctx'> 			of_node_put(isa_dn);</div><div class='del'>-			/* Allow all IO */</div><div class='del'>-			io_page_mask = -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1212,7 +1195,7 @@ int remap_bus_range(struct pci_bus *bus)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	if (start_phys == 0)</div><div class='ctx'> 		return 1;</div><div class='del'>-	printk("mapping IO %lx -&gt; %lx, size: %lx\n", start_phys, start_virt, size);</div><div class='add'>+	printk(KERN_DEBUG "mapping IO %lx -&gt; %lx, size: %lx\n", start_phys, start_virt, size);</div><div class='ctx'> 	if (__ioremap_explicit(start_phys, start_virt, size,</div><div class='ctx'> 			       _PAGE_NO_CACHE | _PAGE_GUARDED))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1232,27 +1215,13 @@ static void phbs_remap_io(void)</div><div class='ctx'> static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose = pci_bus_to_host(dev-&gt;bus);</div><div class='del'>-	unsigned long start, end, mask, offset;</div><div class='add'>+	unsigned long offset;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='ctx'> 		offset = (unsigned long)hose-&gt;io_base_virt - pci_io_base;</div><div class='ctx'> </div><div class='del'>-		start = res-&gt;start += offset;</div><div class='del'>-		end = res-&gt;end += offset;</div><div class='del'>-</div><div class='del'>-		/* Need to allow IO access to pages that are in the</div><div class='del'>-		   ISA range */</div><div class='del'>-		if (start &lt; MAX_ISA_PORT) {</div><div class='del'>-			if (end &gt; MAX_ISA_PORT)</div><div class='del'>-				end = MAX_ISA_PORT;</div><div class='del'>-</div><div class='del'>-			start &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-			end &gt;&gt;= PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-			/* get the range of pages for the map */</div><div class='del'>-			mask = ((1 &lt;&lt; (end+1)) - 1) ^ ((1 &lt;&lt; start) - 1);</div><div class='del'>-			io_page_mask |= mask;</div><div class='del'>-		}</div><div class='add'>+		res-&gt;start += offset;</div><div class='add'>+		res-&gt;end += offset;</div><div class='ctx'> 	} else if (res-&gt;flags &amp; IORESOURCE_MEM) {</div><div class='ctx'> 		res-&gt;start += hose-&gt;pci_mem_offset;</div><div class='ctx'> 		res-&gt;end += hose-&gt;pci_mem_offset;</div><div class='hunk'>@@ -1315,23 +1284,48 @@ EXPORT_SYMBOL(pcibios_fixup_bus);</div><div class='ctx'>  */</div><div class='ctx'> int pci_read_irq_line(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='del'>-	u8 intpin;</div><div class='del'>-	struct device_node *node;</div><div class='add'>+	struct of_irq oirq;</div><div class='add'>+	unsigned int virq;</div><div class='ctx'> </div><div class='del'>-    	pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &amp;intpin);</div><div class='del'>-	if (intpin == 0)</div><div class='del'>-		return 0;</div><div class='add'>+	DBG("Try to map irq for %s...\n", pci_name(pci_dev));</div><div class='ctx'> </div><div class='del'>-	node = pci_device_to_OF_node(pci_dev);</div><div class='del'>-	if (node == NULL)</div><div class='del'>-		return -1;</div><div class='add'>+	/* Try to get a mapping from the device-tree */</div><div class='add'>+	if (of_irq_map_pci(pci_dev, &amp;oirq)) {</div><div class='add'>+		u8 line, pin;</div><div class='ctx'> </div><div class='del'>-	if (node-&gt;n_intrs == 0)</div><div class='del'>-		return -1;</div><div class='add'>+		/* If that fails, lets fallback to what is in the config</div><div class='add'>+		 * space and map that through the default controller. We</div><div class='add'>+		 * also set the type to level low since that's what PCI</div><div class='add'>+		 * interrupts are. If your platform does differently, then</div><div class='add'>+		 * either provide a proper interrupt tree or don't use this</div><div class='add'>+		 * function.</div><div class='add'>+		 */</div><div class='add'>+		if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &amp;pin))</div><div class='add'>+			return -1;</div><div class='add'>+		if (pin == 0)</div><div class='add'>+			return -1;</div><div class='add'>+		if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &amp;line) ||</div><div class='add'>+		    line == 0xff) {</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		DBG(" -&gt; no map ! Using irq line %d from PCI config\n", line);</div><div class='ctx'> </div><div class='del'>-	pci_dev-&gt;irq = node-&gt;intrs[0].line;</div><div class='add'>+		virq = irq_create_mapping(NULL, line);</div><div class='add'>+		if (virq != NO_IRQ)</div><div class='add'>+			set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+	} else {</div><div class='add'>+		DBG(" -&gt; got one, spec %d cells (0x%08x...) on %s\n",</div><div class='add'>+		    oirq.size, oirq.specifier[0], oirq.controller-&gt;full_name);</div><div class='ctx'> </div><div class='del'>-	pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, pci_dev-&gt;irq);</div><div class='add'>+		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,</div><div class='add'>+					     oirq.size);</div><div class='add'>+	}</div><div class='add'>+	if(virq == NO_IRQ) {</div><div class='add'>+		DBG(" -&gt; failed to map !\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	pci_dev-&gt;irq = virq;</div><div class='add'>+	pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, virq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1442,3 +1436,12 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus,</div><div class='ctx'> </div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+int pcibus_to_node(struct pci_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *phb = pci_bus_to_host(bus);</div><div class='add'>+	return phb-&gt;node;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pcibus_to_node);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_direct_iommu.c b/arch/powerpc/kernel/pci_direct_iommu.c<br/>index e1a32f802c0b..72ce082ce738 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_direct_iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_direct_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_direct_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/pci_direct_iommu.c</a></div><div class='hunk'>@@ -82,13 +82,17 @@ static int pci_direct_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return mask &lt; 0x100000000ull;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dma_mapping_ops pci_direct_ops = {</div><div class='add'>+	.alloc_coherent = pci_direct_alloc_coherent,</div><div class='add'>+	.free_coherent = pci_direct_free_coherent,</div><div class='add'>+	.map_single = pci_direct_map_single,</div><div class='add'>+	.unmap_single = pci_direct_unmap_single,</div><div class='add'>+	.map_sg = pci_direct_map_sg,</div><div class='add'>+	.unmap_sg = pci_direct_unmap_sg,</div><div class='add'>+	.dma_supported = pci_direct_dma_supported,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init pci_direct_iommu_init(void)</div><div class='ctx'> {</div><div class='del'>-	pci_dma_ops.alloc_coherent = pci_direct_alloc_coherent;</div><div class='del'>-	pci_dma_ops.free_coherent = pci_direct_free_coherent;</div><div class='del'>-	pci_dma_ops.map_single = pci_direct_map_single;</div><div class='del'>-	pci_dma_ops.unmap_single = pci_direct_unmap_single;</div><div class='del'>-	pci_dma_ops.map_sg = pci_direct_map_sg;</div><div class='del'>-	pci_dma_ops.unmap_sg = pci_direct_unmap_sg;</div><div class='del'>-	pci_dma_ops.dma_supported = pci_direct_dma_supported;</div><div class='add'>+	pci_dma_ops = pci_direct_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c<br/>index 12c4c9e9bbc7..1c18953514c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_dn.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_dn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_dn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/pci_dn.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/pSeries_reconfig.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='add'>+#include &lt;asm/firmware.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Traverse_func that inits the PCI fields of the device node.</div><div class='hunk'>@@ -59,6 +60,11 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)</div><div class='ctx'> 		pdn-&gt;busno = (regs[0] &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 		pdn-&gt;devfn = (regs[0] &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	}</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_ISERIES)) {</div><div class='add'>+		u32 *busp = (u32 *)get_property(dn, "linux,subbus", NULL);</div><div class='add'>+		if (busp)</div><div class='add'>+			pdn-&gt;bussubno = *busp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pdn-&gt;pci_ext_config_space = (type &amp;&amp; *type == 1);</div><div class='ctx'> 	return NULL;</div><div class='head'>diff --git a/arch/powerpc/kernel/pci_iommu.c b/arch/powerpc/kernel/pci_iommu.c<br/>index c1d95e14bbed..0688b2534acb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pci_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pci_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/pci_iommu.c</a></div><div class='hunk'>@@ -44,16 +44,16 @@</div><div class='ctx'>  */</div><div class='ctx'> #define PCI_GET_DN(dev) ((struct device_node *)((dev)-&gt;sysdata))</div><div class='ctx'> </div><div class='del'>-static inline struct iommu_table *devnode_table(struct device *dev)</div><div class='add'>+static inline struct iommu_table *device_to_table(struct device *hwdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> </div><div class='del'>-	if (!dev) {</div><div class='add'>+	if (!hwdev) {</div><div class='ctx'> 		pdev = ppc64_isabridge_dev;</div><div class='ctx'> 		if (!pdev)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 	} else</div><div class='del'>-		pdev = to_pci_dev(dev);</div><div class='add'>+		pdev = to_pci_dev(hwdev);</div><div class='ctx'> </div><div class='ctx'> 	return PCI_DN(PCI_GET_DN(pdev))-&gt;iommu_table;</div><div class='ctx'> }</div><div class='hunk'>@@ -85,14 +85,15 @@ static inline unsigned long device_to_mask(struct device *hwdev)</div><div class='ctx'> static void *pci_iommu_alloc_coherent(struct device *hwdev, size_t size,</div><div class='ctx'> 			   dma_addr_t *dma_handle, gfp_t flag)</div><div class='ctx'> {</div><div class='del'>-	return iommu_alloc_coherent(devnode_table(hwdev), size, dma_handle,</div><div class='del'>-			device_to_mask(hwdev), flag);</div><div class='add'>+	return iommu_alloc_coherent(device_to_table(hwdev), size, dma_handle,</div><div class='add'>+			device_to_mask(hwdev), flag,</div><div class='add'>+			pcibus_to_node(to_pci_dev(hwdev)-&gt;bus));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pci_iommu_free_coherent(struct device *hwdev, size_t size,</div><div class='ctx'> 			 void *vaddr, dma_addr_t dma_handle)</div><div class='ctx'> {</div><div class='del'>-	iommu_free_coherent(devnode_table(hwdev), size, vaddr, dma_handle);</div><div class='add'>+	iommu_free_coherent(device_to_table(hwdev), size, vaddr, dma_handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Creates TCEs for a user provided buffer.  The user buffer must be </div><div class='hunk'>@@ -104,7 +105,7 @@ static void pci_iommu_free_coherent(struct device *hwdev, size_t size,</div><div class='ctx'> static dma_addr_t pci_iommu_map_single(struct device *hwdev, void *vaddr,</div><div class='ctx'> 		size_t size, enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='del'>-	return iommu_map_single(devnode_table(hwdev), vaddr, size,</div><div class='add'>+	return iommu_map_single(device_to_table(hwdev), vaddr, size,</div><div class='ctx'> 			        device_to_mask(hwdev), direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -112,27 +113,27 @@ static dma_addr_t pci_iommu_map_single(struct device *hwdev, void *vaddr,</div><div class='ctx'> static void pci_iommu_unmap_single(struct device *hwdev, dma_addr_t dma_handle,</div><div class='ctx'> 		size_t size, enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='del'>-	iommu_unmap_single(devnode_table(hwdev), dma_handle, size, direction);</div><div class='add'>+	iommu_unmap_single(device_to_table(hwdev), dma_handle, size, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int pci_iommu_map_sg(struct device *pdev, struct scatterlist *sglist,</div><div class='ctx'> 		int nelems, enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='del'>-	return iommu_map_sg(pdev, devnode_table(pdev), sglist,</div><div class='add'>+	return iommu_map_sg(pdev, device_to_table(pdev), sglist,</div><div class='ctx'> 			nelems, device_to_mask(pdev), direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pci_iommu_unmap_sg(struct device *pdev, struct scatterlist *sglist,</div><div class='ctx'> 		int nelems, enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='del'>-	iommu_unmap_sg(devnode_table(pdev), sglist, nelems, direction);</div><div class='add'>+	iommu_unmap_sg(device_to_table(pdev), sglist, nelems, direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We support DMA to/from any memory page via the iommu */</div><div class='ctx'> static int pci_iommu_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> {</div><div class='del'>-	struct iommu_table *tbl = devnode_table(dev);</div><div class='add'>+	struct iommu_table *tbl = device_to_table(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!tbl || tbl-&gt;it_offset &gt; mask) {</div><div class='ctx'> 		printk(KERN_INFO "Warning: IOMMU table offset too big for device mask\n");</div><div class='hunk'>@@ -147,13 +148,17 @@ static int pci_iommu_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 		return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct dma_mapping_ops pci_iommu_ops = {</div><div class='add'>+	.alloc_coherent = pci_iommu_alloc_coherent,</div><div class='add'>+	.free_coherent = pci_iommu_free_coherent,</div><div class='add'>+	.map_single = pci_iommu_map_single,</div><div class='add'>+	.unmap_single = pci_iommu_unmap_single,</div><div class='add'>+	.map_sg = pci_iommu_map_sg,</div><div class='add'>+	.unmap_sg = pci_iommu_unmap_sg,</div><div class='add'>+	.dma_supported = pci_iommu_dma_supported,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void pci_iommu_init(void)</div><div class='ctx'> {</div><div class='del'>-	pci_dma_ops.alloc_coherent = pci_iommu_alloc_coherent;</div><div class='del'>-	pci_dma_ops.free_coherent = pci_iommu_free_coherent;</div><div class='del'>-	pci_dma_ops.map_single = pci_iommu_map_single;</div><div class='del'>-	pci_dma_ops.unmap_single = pci_iommu_unmap_single;</div><div class='del'>-	pci_dma_ops.map_sg = pci_iommu_map_sg;</div><div class='del'>-	pci_dma_ops.unmap_sg = pci_iommu_unmap_sg;</div><div class='del'>-	pci_dma_ops.dma_supported = pci_iommu_dma_supported;</div><div class='add'>+	pci_dma_ops = pci_iommu_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/kernel/perfmon_fsl_booke.c b/arch/powerpc/kernel/perfmon_fsl_booke.c<br/>index 32455dfcc36b..bdc3977a7b06 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/perfmon_fsl_booke.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/perfmon_fsl_booke.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/perfmon_fsl_booke.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/perfmon_fsl_booke.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/pmc.c b/arch/powerpc/kernel/pmc.c<br/>index e6fb194fe537..a0a2efadeabf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pmc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/pmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/pmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/pmc.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c<br/>index 4b052ae5dc34..f6a05f090b25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ppc_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ppc_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ppc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/ppc_ksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -6,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include &lt;linux/nvram.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c<br/>index 3c2cf661f6d9..f598cb519539 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/proc_ppc64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/proc_ppc64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/proc_ppc64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/proc_ppc64.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -52,7 +51,7 @@ static int __init proc_ppc64_create(void)</div><div class='ctx'> 	if (!root)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	if (!machine_is(pseries) &amp;&amp; !machine_is(cell))</div><div class='add'>+	if (!of_find_node_by_path("/rtas"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!proc_mkdir("rtas", root))</div><div class='hunk'>@@ -115,8 +114,6 @@ static int page_map_mmap( struct file *file, struct vm_area_struct *vma )</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *dp = PDE(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> </div><div class='del'>-	vma-&gt;vm_flags |= VM_SHM | VM_LOCKED;</div><div class='del'>-</div><div class='ctx'> 	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; dp-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c<br/>index 2dd47d2dd998..a127a1e3c097 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/process.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -708,6 +707,61 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr)</div><div class='ctx'> 	return put_user(val, (unsigned int __user *) adr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int set_endian(struct task_struct *tsk, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = tsk-&gt;thread.regs;</div><div class='add'>+</div><div class='add'>+	if ((val == PR_ENDIAN_LITTLE &amp;&amp; !cpu_has_feature(CPU_FTR_REAL_LE)) ||</div><div class='add'>+	    (val == PR_ENDIAN_PPC_LITTLE &amp;&amp; !cpu_has_feature(CPU_FTR_PPC_LE)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (regs == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (val == PR_ENDIAN_BIG)</div><div class='add'>+		regs-&gt;msr &amp;= ~MSR_LE;</div><div class='add'>+	else if (val == PR_ENDIAN_LITTLE || val == PR_ENDIAN_PPC_LITTLE)</div><div class='add'>+		regs-&gt;msr |= MSR_LE;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_endian(struct task_struct *tsk, unsigned long adr)</div><div class='add'>+{</div><div class='add'>+	struct pt_regs *regs = tsk-&gt;thread.regs;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_feature(CPU_FTR_PPC_LE) &amp;&amp;</div><div class='add'>+	    !cpu_has_feature(CPU_FTR_REAL_LE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (regs == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;msr &amp; MSR_LE) {</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_REAL_LE))</div><div class='add'>+			val = PR_ENDIAN_LITTLE;</div><div class='add'>+		else</div><div class='add'>+			val = PR_ENDIAN_PPC_LITTLE;</div><div class='add'>+	} else</div><div class='add'>+		val = PR_ENDIAN_BIG;</div><div class='add'>+</div><div class='add'>+	return put_user(val, (unsigned int __user *)adr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int set_unalign_ctl(struct task_struct *tsk, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	tsk-&gt;thread.align_ctl = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int get_unalign_ctl(struct task_struct *tsk, unsigned long adr)</div><div class='add'>+{</div><div class='add'>+	return put_user(tsk-&gt;thread.align_ctl, (unsigned int __user *)adr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define TRUNC_PTR(x)	((typeof(x))(((unsigned long)(x)) &amp; 0xffffffff))</div><div class='ctx'> </div><div class='ctx'> int sys_clone(unsigned long clone_flags, unsigned long usp,</div><div class='head'>diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c<br/>index 9a07f97f0712..a1787ffb6319 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/prom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/prom.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -30,6 +29,8 @@</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='hunk'>@@ -50,6 +51,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/pSeries_reconfig.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/kexec.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> #define DBG(fmt...) printk(KERN_ERR fmt)</div><div class='hunk'>@@ -85,424 +87,6 @@ static DEFINE_RWLOCK(devtree_lock);</div><div class='ctx'> /* export that to outside world */</div><div class='ctx'> struct device_node *of_chosen;</div><div class='ctx'> </div><div class='del'>-struct device_node *dflt_interrupt_controller;</div><div class='del'>-int num_interrupt_controllers;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wrapper for allocating memory for various data that needs to be</div><div class='del'>- * attached to device nodes as they are processed at boot or when</div><div class='del'>- * added to the device tree later (e.g. DLPAR).  At boot there is</div><div class='del'>- * already a region reserved so we just increment *mem_start by size;</div><div class='del'>- * otherwise we call kmalloc.</div><div class='del'>- */</div><div class='del'>-static void * prom_alloc(unsigned long size, unsigned long *mem_start)</div><div class='del'>-{</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-</div><div class='del'>-	if (!mem_start)</div><div class='del'>-		return kmalloc(size, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	tmp = *mem_start;</div><div class='del'>-	*mem_start += size;</div><div class='del'>-	return (void *)tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find the device_node with a given phandle.</div><div class='del'>- */</div><div class='del'>-static struct device_node * find_phandle(phandle ph)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-</div><div class='del'>-	for (np = allnodes; np != 0; np = np-&gt;allnext)</div><div class='del'>-		if (np-&gt;linux_phandle == ph)</div><div class='del'>-			return np;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find the interrupt parent of a node.</div><div class='del'>- */</div><div class='del'>-static struct device_node * __devinit intr_parent(struct device_node *p)</div><div class='del'>-{</div><div class='del'>-	phandle *parp;</div><div class='del'>-</div><div class='del'>-	parp = (phandle *) get_property(p, "interrupt-parent", NULL);</div><div class='del'>-	if (parp == NULL)</div><div class='del'>-		return p-&gt;parent;</div><div class='del'>-	p = find_phandle(*parp);</div><div class='del'>-	if (p != NULL)</div><div class='del'>-		return p;</div><div class='del'>-	/*</div><div class='del'>-	 * On a powermac booted with BootX, we don't get to know the</div><div class='del'>-	 * phandles for any nodes, so find_phandle will return NULL.</div><div class='del'>-	 * Fortunately these machines only have one interrupt controller</div><div class='del'>-	 * so there isn't in fact any ambiguity.  -- paulus</div><div class='del'>-	 */</div><div class='del'>-	if (num_interrupt_controllers == 1)</div><div class='del'>-		p = dflt_interrupt_controller;</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find out the size of each entry of the interrupts property</div><div class='del'>- * for a node.</div><div class='del'>- */</div><div class='del'>-int __devinit prom_n_intr_cells(struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	struct device_node *p;</div><div class='del'>-	unsigned int *icp;</div><div class='del'>-</div><div class='del'>-	for (p = np; (p = intr_parent(p)) != NULL; ) {</div><div class='del'>-		icp = (unsigned int *)</div><div class='del'>-			get_property(p, "#interrupt-cells", NULL);</div><div class='del'>-		if (icp != NULL)</div><div class='del'>-			return *icp;</div><div class='del'>-		if (get_property(p, "interrupt-controller", NULL) != NULL</div><div class='del'>-		    || get_property(p, "interrupt-map", NULL) != NULL) {</div><div class='del'>-			printk("oops, node %s doesn't have #interrupt-cells\n",</div><div class='del'>-			       p-&gt;full_name);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG_IRQ</div><div class='del'>-	printk("prom_n_intr_cells failed for %s\n", np-&gt;full_name);</div><div class='del'>-#endif</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Map an interrupt from a device up to the platform interrupt</div><div class='del'>- * descriptor.</div><div class='del'>- */</div><div class='del'>-static int __devinit map_interrupt(unsigned int **irq, struct device_node **ictrler,</div><div class='del'>-				   struct device_node *np, unsigned int *ints,</div><div class='del'>-				   int nintrc)</div><div class='del'>-{</div><div class='del'>-	struct device_node *p, *ipar;</div><div class='del'>-	unsigned int *imap, *imask, *ip;</div><div class='del'>-	int i, imaplen, match;</div><div class='del'>-	int newintrc = 0, newaddrc = 0;</div><div class='del'>-	unsigned int *reg;</div><div class='del'>-	int naddrc;</div><div class='del'>-</div><div class='del'>-	reg = (unsigned int *) get_property(np, "reg", NULL);</div><div class='del'>-	naddrc = prom_n_addr_cells(np);</div><div class='del'>-	p = intr_parent(np);</div><div class='del'>-	while (p != NULL) {</div><div class='del'>-		if (get_property(p, "interrupt-controller", NULL) != NULL)</div><div class='del'>-			/* this node is an interrupt controller, stop here */</div><div class='del'>-			break;</div><div class='del'>-		imap = (unsigned int *)</div><div class='del'>-			get_property(p, "interrupt-map", &amp;imaplen);</div><div class='del'>-		if (imap == NULL) {</div><div class='del'>-			p = intr_parent(p);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		imask = (unsigned int *)</div><div class='del'>-			get_property(p, "interrupt-map-mask", NULL);</div><div class='del'>-		if (imask == NULL) {</div><div class='del'>-			printk("oops, %s has interrupt-map but no mask\n",</div><div class='del'>-			       p-&gt;full_name);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		imaplen /= sizeof(unsigned int);</div><div class='del'>-		match = 0;</div><div class='del'>-		ipar = NULL;</div><div class='del'>-		while (imaplen &gt; 0 &amp;&amp; !match) {</div><div class='del'>-			/* check the child-interrupt field */</div><div class='del'>-			match = 1;</div><div class='del'>-			for (i = 0; i &lt; naddrc &amp;&amp; match; ++i)</div><div class='del'>-				match = ((reg[i] ^ imap[i]) &amp; imask[i]) == 0;</div><div class='del'>-			for (; i &lt; naddrc + nintrc &amp;&amp; match; ++i)</div><div class='del'>-				match = ((ints[i-naddrc] ^ imap[i]) &amp; imask[i]) == 0;</div><div class='del'>-			imap += naddrc + nintrc;</div><div class='del'>-			imaplen -= naddrc + nintrc;</div><div class='del'>-			/* grab the interrupt parent */</div><div class='del'>-			ipar = find_phandle((phandle) *imap++);</div><div class='del'>-			--imaplen;</div><div class='del'>-			if (ipar == NULL &amp;&amp; num_interrupt_controllers == 1)</div><div class='del'>-				/* cope with BootX not giving us phandles */</div><div class='del'>-				ipar = dflt_interrupt_controller;</div><div class='del'>-			if (ipar == NULL) {</div><div class='del'>-				printk("oops, no int parent %x in map of %s\n",</div><div class='del'>-				       imap[-1], p-&gt;full_name);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			/* find the parent's # addr and intr cells */</div><div class='del'>-			ip = (unsigned int *)</div><div class='del'>-				get_property(ipar, "#interrupt-cells", NULL);</div><div class='del'>-			if (ip == NULL) {</div><div class='del'>-				printk("oops, no #interrupt-cells on %s\n",</div><div class='del'>-				       ipar-&gt;full_name);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			newintrc = *ip;</div><div class='del'>-			ip = (unsigned int *)</div><div class='del'>-				get_property(ipar, "#address-cells", NULL);</div><div class='del'>-			newaddrc = (ip == NULL)? 0: *ip;</div><div class='del'>-			imap += newaddrc + newintrc;</div><div class='del'>-			imaplen -= newaddrc + newintrc;</div><div class='del'>-		}</div><div class='del'>-		if (imaplen &lt; 0) {</div><div class='del'>-			printk("oops, error decoding int-map on %s, len=%d\n",</div><div class='del'>-			       p-&gt;full_name, imaplen);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (!match) {</div><div class='del'>-#ifdef DEBUG_IRQ</div><div class='del'>-			printk("oops, no match in %s int-map for %s\n",</div><div class='del'>-			       p-&gt;full_name, np-&gt;full_name);</div><div class='del'>-#endif</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		p = ipar;</div><div class='del'>-		naddrc = newaddrc;</div><div class='del'>-		nintrc = newintrc;</div><div class='del'>-		ints = imap - nintrc;</div><div class='del'>-		reg = ints - naddrc;</div><div class='del'>-	}</div><div class='del'>-	if (p == NULL) {</div><div class='del'>-#ifdef DEBUG_IRQ</div><div class='del'>-		printk("hmmm, int tree for %s doesn't have ctrler\n",</div><div class='del'>-		       np-&gt;full_name);</div><div class='del'>-#endif</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	*irq = ints;</div><div class='del'>-	*ictrler = p;</div><div class='del'>-	return nintrc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char map_isa_senses[4] = {</div><div class='del'>-	IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE,</div><div class='del'>-	IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE,</div><div class='del'>-	IRQ_SENSE_EDGE  | IRQ_POLARITY_NEGATIVE,</div><div class='del'>-	IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char map_mpic_senses[4] = {</div><div class='del'>-	IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE,</div><div class='del'>-	IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE,</div><div class='del'>-	/* 2 seems to be used for the 8259 cascade... */</div><div class='del'>-	IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE,</div><div class='del'>-	IRQ_SENSE_EDGE  | IRQ_POLARITY_NEGATIVE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit finish_node_interrupts(struct device_node *np,</div><div class='del'>-					    unsigned long *mem_start,</div><div class='del'>-					    int measure_only)</div><div class='del'>-{</div><div class='del'>-	unsigned int *ints;</div><div class='del'>-	int intlen, intrcells, intrcount;</div><div class='del'>-	int i, j, n, sense;</div><div class='del'>-	unsigned int *irq, virq;</div><div class='del'>-	struct device_node *ic;</div><div class='del'>-	int trace = 0;</div><div class='del'>-</div><div class='del'>-	//#define TRACE(fmt...) do { if (trace) { printk(fmt); mdelay(1000); } } while(0)</div><div class='del'>-#define TRACE(fmt...)</div><div class='del'>-</div><div class='del'>-	if (!strcmp(np-&gt;name, "smu-doorbell"))</div><div class='del'>-		trace = 1;</div><div class='del'>-</div><div class='del'>-	TRACE("Finishing SMU doorbell ! num_interrupt_controllers = %d\n",</div><div class='del'>-	      num_interrupt_controllers);</div><div class='del'>-</div><div class='del'>-	if (num_interrupt_controllers == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Old machines just have a list of interrupt numbers</div><div class='del'>-		 * and no interrupt-controller nodes.</div><div class='del'>-		 */</div><div class='del'>-		ints = (unsigned int *) get_property(np, "AAPL,interrupts",</div><div class='del'>-						     &amp;intlen);</div><div class='del'>-		/* XXX old interpret_pci_props looked in parent too */</div><div class='del'>-		/* XXX old interpret_macio_props looked for interrupts</div><div class='del'>-		   before AAPL,interrupts */</div><div class='del'>-		if (ints == NULL)</div><div class='del'>-			ints = (unsigned int *) get_property(np, "interrupts",</div><div class='del'>-							     &amp;intlen);</div><div class='del'>-		if (ints == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		np-&gt;n_intrs = intlen / sizeof(unsigned int);</div><div class='del'>-		np-&gt;intrs = prom_alloc(np-&gt;n_intrs * sizeof(np-&gt;intrs[0]),</div><div class='del'>-				       mem_start);</div><div class='del'>-		if (!np-&gt;intrs)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		if (measure_only)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; np-&gt;n_intrs; ++i) {</div><div class='del'>-			np-&gt;intrs[i].line = *ints++;</div><div class='del'>-			np-&gt;intrs[i].sense = IRQ_SENSE_LEVEL</div><div class='del'>-				| IRQ_POLARITY_NEGATIVE;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ints = (unsigned int *) get_property(np, "interrupts", &amp;intlen);</div><div class='del'>-	TRACE("ints=%p, intlen=%d\n", ints, intlen);</div><div class='del'>-	if (ints == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	intrcells = prom_n_intr_cells(np);</div><div class='del'>-	intlen /= intrcells * sizeof(unsigned int);</div><div class='del'>-	TRACE("intrcells=%d, new intlen=%d\n", intrcells, intlen);</div><div class='del'>-	np-&gt;intrs = prom_alloc(intlen * sizeof(*(np-&gt;intrs)), mem_start);</div><div class='del'>-	if (!np-&gt;intrs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (measure_only)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	intrcount = 0;</div><div class='del'>-	for (i = 0; i &lt; intlen; ++i, ints += intrcells) {</div><div class='del'>-		n = map_interrupt(&amp;irq, &amp;ic, np, ints, intrcells);</div><div class='del'>-		TRACE("map, irq=%d, ic=%p, n=%d\n", irq, ic, n);</div><div class='del'>-		if (n &lt;= 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* don't map IRQ numbers under a cascaded 8259 controller */</div><div class='del'>-		if (ic &amp;&amp; device_is_compatible(ic, "chrp,iic")) {</div><div class='del'>-			np-&gt;intrs[intrcount].line = irq[0];</div><div class='del'>-			sense = (n &gt; 1)? (irq[1] &amp; 3): 3;</div><div class='del'>-			np-&gt;intrs[intrcount].sense = map_isa_senses[sense];</div><div class='del'>-		} else {</div><div class='del'>-			virq = virt_irq_create_mapping(irq[0]);</div><div class='del'>-			TRACE("virq=%d\n", virq);</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-			if (virq == NO_IRQ) {</div><div class='del'>-				printk(KERN_CRIT "Could not allocate interrupt"</div><div class='del'>-				       " number for %s\n", np-&gt;full_name);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-			np-&gt;intrs[intrcount].line = irq_offset_up(virq);</div><div class='del'>-			sense = (n &gt; 1)? (irq[1] &amp; 3): 1;</div><div class='del'>-</div><div class='del'>-			/* Apple uses bits in there in a different way, let's</div><div class='del'>-			 * only keep the real sense bit on macs</div><div class='del'>-			 */</div><div class='del'>-			if (machine_is(powermac))</div><div class='del'>-				sense &amp;= 0x1;</div><div class='del'>-			np-&gt;intrs[intrcount].sense = map_mpic_senses[sense];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-		/* We offset irq numbers for the u3 MPIC by 128 in PowerMac */</div><div class='del'>-		if (machine_is(powermac) &amp;&amp; ic &amp;&amp; ic-&gt;parent) {</div><div class='del'>-			char *name = get_property(ic-&gt;parent, "name", NULL);</div><div class='del'>-			if (name &amp;&amp; !strcmp(name, "u3"))</div><div class='del'>-				np-&gt;intrs[intrcount].line += 128;</div><div class='del'>-			else if (!(name &amp;&amp; (!strcmp(name, "mac-io") ||</div><div class='del'>-					    !strcmp(name, "u4"))))</div><div class='del'>-				/* ignore other cascaded controllers, such as</div><div class='del'>-				   the k2-sata-root */</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-#endif /* CONFIG_PPC64 */</div><div class='del'>-		if (n &gt; 2) {</div><div class='del'>-			printk("hmmm, got %d intr cells for %s:", n,</div><div class='del'>-			       np-&gt;full_name);</div><div class='del'>-			for (j = 0; j &lt; n; ++j)</div><div class='del'>-				printk(" %d", irq[j]);</div><div class='del'>-			printk("\n");</div><div class='del'>-		}</div><div class='del'>-		++intrcount;</div><div class='del'>-	}</div><div class='del'>-	np-&gt;n_intrs = intrcount;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit finish_node(struct device_node *np,</div><div class='del'>-				 unsigned long *mem_start,</div><div class='del'>-				 int measure_only)</div><div class='del'>-{</div><div class='del'>-	struct device_node *child;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	rc = finish_node_interrupts(np, mem_start, measure_only);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	for (child = np-&gt;child; child != NULL; child = child-&gt;sibling) {</div><div class='del'>-		rc = finish_node(child, mem_start, measure_only);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init scan_interrupt_controllers(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	int n = 0;</div><div class='del'>-	char *name, *ic;</div><div class='del'>-	int iclen;</div><div class='del'>-</div><div class='del'>-	for (np = allnodes; np != NULL; np = np-&gt;allnext) {</div><div class='del'>-		ic = get_property(np, "interrupt-controller", &amp;iclen);</div><div class='del'>-		name = get_property(np, "name", NULL);</div><div class='del'>-		/* checking iclen makes sure we don't get a false</div><div class='del'>-		   match on /chosen.interrupt_controller */</div><div class='del'>-		if ((name != NULL</div><div class='del'>-		     &amp;&amp; strcmp(name, "interrupt-controller") == 0)</div><div class='del'>-		    || (ic != NULL &amp;&amp; iclen == 0</div><div class='del'>-			&amp;&amp; strcmp(name, "AppleKiwi"))) {</div><div class='del'>-			if (n == 0)</div><div class='del'>-				dflt_interrupt_controller = np;</div><div class='del'>-			++n;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	num_interrupt_controllers = n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * finish_device_tree is called once things are running normally</div><div class='del'>- * (i.e. with text and data mapped to the address they were linked at).</div><div class='del'>- * It traverses the device tree and fills in some of the additional,</div><div class='del'>- * fields in each node like {n_}addrs and {n_}intrs, the virt interrupt</div><div class='del'>- * mapping is also initialized at this point.</div><div class='del'>- */</div><div class='del'>-void __init finish_device_tree(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long start, end, size = 0;</div><div class='del'>-</div><div class='del'>-	DBG(" -&gt; finish_device_tree\n");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	/* Initialize virtual IRQ map */</div><div class='del'>-	virt_irq_init();</div><div class='del'>-#endif</div><div class='del'>-	scan_interrupt_controllers();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Finish device-tree (pre-parsing some properties etc...)</div><div class='del'>-	 * We do this in 2 passes. One with "measure_only" set, which</div><div class='del'>-	 * will only measure the amount of memory needed, then we can</div><div class='del'>-	 * allocate that memory, and call finish_node again. However,</div><div class='del'>-	 * we must be careful as most routines will fail nowadays when</div><div class='del'>-	 * prom_alloc() returns 0, so we must make sure our first pass</div><div class='del'>-	 * doesn't start at 0. We pre-initialize size to 16 for that</div><div class='del'>-	 * reason and then remove those additional 16 bytes</div><div class='del'>-	 */</div><div class='del'>-	size = 16;</div><div class='del'>-	finish_node(allnodes, &amp;size, 1);</div><div class='del'>-	size -= 16;</div><div class='del'>-</div><div class='del'>-	if (0 == size)</div><div class='del'>-		end = start = 0;</div><div class='del'>-	else</div><div class='del'>-		end = start = (unsigned long)__va(lmb_alloc(size, 128));</div><div class='del'>-</div><div class='del'>-	finish_node(allnodes, &amp;end, 0);</div><div class='del'>-	BUG_ON(end != start + size);</div><div class='del'>-</div><div class='del'>-	DBG(" &lt;- finish_device_tree\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline char *find_flat_dt_string(u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	return ((char *)initial_boot_params) +</div><div class='hunk'>@@ -836,6 +420,42 @@ static unsigned long __init unflatten_dt_node(unsigned long mem,</div><div class='ctx'> 	return mem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __init early_parse_mem(char *p)</div><div class='add'>+{</div><div class='add'>+	if (!p)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	memory_limit = PAGE_ALIGN(memparse(p, &amp;p));</div><div class='add'>+	DBG("memory limit = 0x%lx\n", memory_limit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+early_param("mem", early_parse_mem);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The device tree may be allocated below our memory limit, or inside the</div><div class='add'>+ * crash kernel region for kdump. If so, move it out now.</div><div class='add'>+ */</div><div class='add'>+static void move_device_tree(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long start, size;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	DBG("-&gt; move_device_tree\n");</div><div class='add'>+</div><div class='add'>+	start = __pa(initial_boot_params);</div><div class='add'>+	size = initial_boot_params-&gt;totalsize;</div><div class='add'>+</div><div class='add'>+	if ((memory_limit &amp;&amp; (start + size) &gt; memory_limit) ||</div><div class='add'>+			overlaps_crashkernel(start, size)) {</div><div class='add'>+		p = __va(lmb_alloc_base(size, PAGE_SIZE, lmb.rmo_size));</div><div class='add'>+		memcpy(p, initial_boot_params, size);</div><div class='add'>+		initial_boot_params = (struct boot_param_header *)p;</div><div class='add'>+		DBG("Moved device tree to 0x%p\n", p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG("&lt;- move_device_tree\n");</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * unflattens the device-tree passed by the firmware, creating the</div><div class='hunk'>@@ -911,7 +531,11 @@ static struct ibm_pa_feature {</div><div class='ctx'> 	{CPU_FTR_CTRL, 0,		0, 3, 0},</div><div class='ctx'> 	{CPU_FTR_NOEXECUTE, 0,		0, 6, 0},</div><div class='ctx'> 	{CPU_FTR_NODSISRALIGN, 0,	1, 1, 1},</div><div class='add'>+#if 0</div><div class='add'>+	/* put this back once we know how to test if firmware does 64k IO */</div><div class='ctx'> 	{CPU_FTR_CI_LARGE_PAGE, 0,	1, 2, 0},</div><div class='add'>+#endif</div><div class='add'>+	{CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __init check_cpu_pa_features(unsigned long node)</div><div class='hunk'>@@ -1070,6 +694,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node,</div><div class='ctx'> 		iommu_force_on = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	/* mem=x on the command line is the preferred mechanism */</div><div class='ctx'>  	lprop = of_get_flat_dt_prop(node, "linux,memory-limit", NULL);</div><div class='ctx'>  	if (lprop)</div><div class='ctx'>  		memory_limit = *lprop;</div><div class='hunk'>@@ -1083,24 +708,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,</div><div class='ctx'>  		tce_alloc_end = *lprop;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_RTAS</div><div class='del'>-	/* To help early debugging via the front panel, we retrieve a minimal</div><div class='del'>-	 * set of RTAS infos now if available</div><div class='del'>-	 */</div><div class='del'>-	{</div><div class='del'>-		u64 *basep, *entryp, *sizep;</div><div class='del'>-</div><div class='del'>-		basep = of_get_flat_dt_prop(node, "linux,rtas-base", NULL);</div><div class='del'>-		entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL);</div><div class='del'>-		sizep = of_get_flat_dt_prop(node, "linux,rtas-size", NULL);</div><div class='del'>-		if (basep &amp;&amp; entryp &amp;&amp; sizep) {</div><div class='del'>-			rtas.base = *basep;</div><div class='del'>-			rtas.entry = *entryp;</div><div class='del'>-			rtas.size = *sizep;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_PPC_RTAS */</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'>        lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);</div><div class='ctx'>        if (lprop)</div><div class='hunk'>@@ -1123,17 +730,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,</div><div class='ctx'> </div><div class='ctx'> 	DBG("Command line is: %s\n", cmd_line);</div><div class='ctx'> </div><div class='del'>-	if (strstr(cmd_line, "mem=")) {</div><div class='del'>-		char *p, *q;</div><div class='del'>-</div><div class='del'>-		for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) {</div><div class='del'>-			q = p + 4;</div><div class='del'>-			if (p &gt; cmd_line &amp;&amp; p[-1] != ' ')</div><div class='del'>-				continue;</div><div class='del'>-			memory_limit = memparse(q, &amp;q);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* break now */</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1237,9 +833,17 @@ static void __init early_reserve_mem(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 base, size;</div><div class='ctx'> 	u64 *reserve_map;</div><div class='add'>+	unsigned long self_base;</div><div class='add'>+	unsigned long self_size;</div><div class='ctx'> </div><div class='ctx'> 	reserve_map = (u64 *)(((unsigned long)initial_boot_params) +</div><div class='ctx'> 					initial_boot_params-&gt;off_mem_rsvmap);</div><div class='add'>+</div><div class='add'>+	/* before we do anything, lets reserve the dt blob */</div><div class='add'>+	self_base = __pa((unsigned long)initial_boot_params);</div><div class='add'>+	self_size = initial_boot_params-&gt;totalsize;</div><div class='add'>+	lmb_reserve(self_base, self_size);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='ctx'> 	/* </div><div class='ctx'> 	 * Handle the case where we might be booting from an old kexec</div><div class='hunk'>@@ -1254,6 +858,9 @@ static void __init early_reserve_mem(void)</div><div class='ctx'> 			size_32 = *(reserve_map_32++);</div><div class='ctx'> 			if (size_32 == 0)</div><div class='ctx'> 				break;</div><div class='add'>+			/* skip if the reservation is for the blob */</div><div class='add'>+			if (base_32 == self_base &amp;&amp; size_32 == self_size)</div><div class='add'>+				continue;</div><div class='ctx'> 			DBG("reserving: %x -&gt; %x\n", base_32, size_32);</div><div class='ctx'> 			lmb_reserve(base_32, size_32);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1265,6 +872,9 @@ static void __init early_reserve_mem(void)</div><div class='ctx'> 		size = *(reserve_map++);</div><div class='ctx'> 		if (size == 0)</div><div class='ctx'> 			break;</div><div class='add'>+		/* skip if the reservation is for the blob */</div><div class='add'>+		if (base == self_base &amp;&amp; size == self_size)</div><div class='add'>+			continue;</div><div class='ctx'> 		DBG("reserving: %llx -&gt; %llx\n", base, size);</div><div class='ctx'> 		lmb_reserve(base, size);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1282,6 +892,11 @@ void __init early_init_devtree(void *params)</div><div class='ctx'> 	/* Setup flat device-tree pointer */</div><div class='ctx'> 	initial_boot_params = params;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_RTAS</div><div class='add'>+	/* Some machines might need RTAS info for debugging, grab it now. */</div><div class='add'>+	of_scan_flat_dt(early_init_dt_scan_rtas, NULL);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* Retrieve various informations from the /chosen node of the</div><div class='ctx'> 	 * device-tree, including the platform type, initrd location and</div><div class='ctx'> 	 * size, TCE reserve, and more ...</div><div class='hunk'>@@ -1292,18 +907,26 @@ void __init early_init_devtree(void *params)</div><div class='ctx'> 	lmb_init();</div><div class='ctx'> 	of_scan_flat_dt(early_init_dt_scan_root, NULL);</div><div class='ctx'> 	of_scan_flat_dt(early_init_dt_scan_memory, NULL);</div><div class='del'>-	lmb_enforce_memory_limit(memory_limit);</div><div class='del'>-	lmb_analyze();</div><div class='ctx'> </div><div class='del'>-	DBG("Phys. mem: %lx\n", lmb_phys_mem_size());</div><div class='add'>+	/* Save command line for /proc/cmdline and then parse parameters */</div><div class='add'>+	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);</div><div class='add'>+	parse_early_param();</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve LMB regions used by kernel, initrd, dt, etc... */</div><div class='ctx'> 	lmb_reserve(PHYSICAL_START, __pa(klimit) - PHYSICAL_START);</div><div class='del'>-#ifdef CONFIG_CRASH_DUMP</div><div class='del'>-	lmb_reserve(0, KDUMP_RESERVE_LIMIT);</div><div class='del'>-#endif</div><div class='add'>+	reserve_kdump_trampoline();</div><div class='add'>+	reserve_crashkernel();</div><div class='ctx'> 	early_reserve_mem();</div><div class='ctx'> </div><div class='add'>+	lmb_enforce_memory_limit(memory_limit);</div><div class='add'>+	lmb_analyze();</div><div class='add'>+</div><div class='add'>+	DBG("Phys. mem: %lx\n", lmb_phys_mem_size());</div><div class='add'>+</div><div class='add'>+	/* We may need to relocate the flat tree, do it now.</div><div class='add'>+	 * FIXME .. and the initrd too? */</div><div class='add'>+	move_device_tree();</div><div class='add'>+</div><div class='ctx'> 	DBG("Scanning CPUs ...\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Retreive CPU related informations from the flat tree</div><div class='hunk'>@@ -1349,27 +972,6 @@ prom_n_size_cells(struct device_node* np)</div><div class='ctx'> EXPORT_SYMBOL(prom_n_size_cells);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Work out the sense (active-low level / active-high edge)</div><div class='del'>- * of each interrupt from the device tree.</div><div class='del'>- */</div><div class='del'>-void __init prom_get_irq_senses(unsigned char *senses, int off, int max)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	/* default to level-triggered */</div><div class='del'>-	memset(senses, IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE, max - off);</div><div class='del'>-</div><div class='del'>-	for (np = allnodes; np != 0; np = np-&gt;allnext) {</div><div class='del'>-		for (j = 0; j &lt; np-&gt;n_intrs; j++) {</div><div class='del'>-			i = np-&gt;intrs[j].line;</div><div class='del'>-			if (i &gt;= off &amp;&amp; i &lt; max)</div><div class='del'>-				senses[i-off] = np-&gt;intrs[j].sense;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * Construct and return a list of the device_nodes with a given name.</div><div class='ctx'>  */</div><div class='ctx'> struct device_node *find_devices(const char *name)</div><div class='hunk'>@@ -1768,7 +1370,6 @@ static void of_node_release(struct kref *kref)</div><div class='ctx'> 			node-&gt;deadprops = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	kfree(node-&gt;intrs);</div><div class='ctx'> 	kfree(node-&gt;full_name);</div><div class='ctx'> 	kfree(node-&gt;data);</div><div class='ctx'> 	kfree(node);</div><div class='hunk'>@@ -1841,13 +1442,7 @@ void of_detach_node(const struct device_node *np)</div><div class='ctx'> #ifdef CONFIG_PPC_PSERIES</div><div class='ctx'> /*</div><div class='ctx'>  * Fix up the uninitialized fields in a new device node:</div><div class='del'>- * name, type, n_addrs, addrs, n_intrs, intrs, and pci-specific fields</div><div class='del'>- *</div><div class='del'>- * A lot of boot-time code is duplicated here, because functions such</div><div class='del'>- * as finish_node_interrupts, interpret_pci_props, etc. cannot use the</div><div class='del'>- * slab allocator.</div><div class='del'>- *</div><div class='del'>- * This should probably be split up into smaller chunks.</div><div class='add'>+ * name, type and pci-specific fields</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int of_finish_dynamic_node(struct device_node *node)</div><div class='hunk'>@@ -1888,8 +1483,6 @@ static int prom_reconfig_notifier(struct notifier_block *nb,</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case PSERIES_RECONFIG_ADD:</div><div class='ctx'> 		err = of_finish_dynamic_node(node);</div><div class='del'>-		if (!err)</div><div class='del'>-			finish_node(node, NULL, 0);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "finish_node returned %d\n", err);</div><div class='ctx'> 			err = NOTIFY_BAD;</div><div class='hunk'>@@ -1935,8 +1528,7 @@ struct property *of_find_property(struct device_node *np, const char *name,</div><div class='ctx'>  * Find a property with a given name for a given node</div><div class='ctx'>  * and return the value.</div><div class='ctx'>  */</div><div class='del'>-unsigned char *get_property(struct device_node *np, const char *name,</div><div class='del'>-			    int *lenp)</div><div class='add'>+void *get_property(struct device_node *np, const char *name, int *lenp)</div><div class='ctx'> {</div><div class='ctx'> 	struct property *pp = of_find_property(np,name,lenp);</div><div class='ctx'> 	return pp ? pp-&gt;value : NULL;</div><div class='hunk'>@@ -2053,29 +1645,70 @@ int prom_update_property(struct device_node *np,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-/* We may have allocated the flat device tree inside the crash kernel region</div><div class='del'>- * in prom_init. If so we need to move it out into regular memory. */</div><div class='del'>-void kdump_move_device_tree(void)</div><div class='add'>+</div><div class='add'>+/* Find the device node for a given logical cpu number, also returns the cpu</div><div class='add'>+ * local thread number (index in ibm,interrupt-server#s) if relevant and</div><div class='add'>+ * asked for (non NULL)</div><div class='add'>+ */</div><div class='add'>+struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start, end;</div><div class='del'>-	struct boot_param_header *new;</div><div class='add'>+	int hardid;</div><div class='add'>+	struct device_node *np;</div><div class='ctx'> </div><div class='del'>-	start = __pa((unsigned long)initial_boot_params);</div><div class='del'>-	end = start + initial_boot_params-&gt;totalsize;</div><div class='add'>+	hardid = get_hard_smp_processor_id(cpu);</div><div class='ctx'> </div><div class='del'>-	if (end &lt; crashk_res.start || start &gt; crashk_res.end)</div><div class='del'>-		return;</div><div class='add'>+	for_each_node_by_type(np, "cpu") {</div><div class='add'>+		u32 *intserv;</div><div class='add'>+		unsigned int plen, t;</div><div class='add'>+</div><div class='add'>+		/* Check for ibm,ppc-interrupt-server#s. If it doesn't exist</div><div class='add'>+		 * fallback to "reg" property and assume no threads</div><div class='add'>+		 */</div><div class='add'>+		intserv = (u32 *)get_property(np, "ibm,ppc-interrupt-server#s",</div><div class='add'>+					      &amp;plen);</div><div class='add'>+		if (intserv == NULL) {</div><div class='add'>+			u32 *reg = (u32 *)get_property(np, "reg", NULL);</div><div class='add'>+			if (reg == NULL)</div><div class='add'>+				continue;</div><div class='add'>+			if (*reg == hardid) {</div><div class='add'>+				if (thread)</div><div class='add'>+					*thread = 0;</div><div class='add'>+				return np;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			plen /= sizeof(u32);</div><div class='add'>+			for (t = 0; t &lt; plen; t++) {</div><div class='add'>+				if (hardid == intserv[t]) {</div><div class='add'>+					if (thread)</div><div class='add'>+						*thread = t;</div><div class='add'>+					return np;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static struct debugfs_blob_wrapper flat_dt_blob;</div><div class='ctx'> </div><div class='del'>-	new = (struct boot_param_header*)</div><div class='del'>-		__va(lmb_alloc(initial_boot_params-&gt;totalsize, PAGE_SIZE));</div><div class='add'>+static int __init export_flat_device_tree(void)</div><div class='add'>+{</div><div class='add'>+	struct dentry *d;</div><div class='ctx'> </div><div class='del'>-	memcpy(new, initial_boot_params, initial_boot_params-&gt;totalsize);</div><div class='add'>+	d = debugfs_create_dir("powerpc", NULL);</div><div class='add'>+	if (!d)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	initial_boot_params = new;</div><div class='add'>+	flat_dt_blob.data = initial_boot_params;</div><div class='add'>+	flat_dt_blob.size = initial_boot_params-&gt;totalsize;</div><div class='ctx'> </div><div class='del'>-	DBG("Flat device tree blob moved to %p\n", initial_boot_params);</div><div class='add'>+	d = debugfs_create_blob("flat-device-tree", S_IFREG | S_IRUSR,</div><div class='add'>+				d, &amp;flat_dt_blob);</div><div class='add'>+	if (!d)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	/* XXX should we unreserve the old DT? */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_KEXEC */</div><div class='add'>+__initcall(export_flat_device_tree);</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c<br/>index 41e9ab40cd54..ebd501a59abd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/prom_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/prom_init.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #undef DEBUG_PROM</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -194,19 +193,12 @@ static int __initdata of_platform;</div><div class='ctx'> </div><div class='ctx'> static char __initdata prom_cmd_line[COMMAND_LINE_SIZE];</div><div class='ctx'> </div><div class='del'>-static unsigned long __initdata prom_memory_limit;</div><div class='del'>-</div><div class='ctx'> static unsigned long __initdata alloc_top;</div><div class='ctx'> static unsigned long __initdata alloc_top_high;</div><div class='ctx'> static unsigned long __initdata alloc_bottom;</div><div class='ctx'> static unsigned long __initdata rmo_top;</div><div class='ctx'> static unsigned long __initdata ram_top;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-static unsigned long __initdata prom_crashk_base;</div><div class='del'>-static unsigned long __initdata prom_crashk_size;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct mem_map_entry __initdata mem_reserve_map[MEM_RESERVE_MAP_SIZE];</div><div class='ctx'> static int __initdata mem_reserve_cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -574,7 +566,7 @@ static void __init early_cmdline_parse(void)</div><div class='ctx'> 	if ((long)_prom-&gt;chosen &gt; 0)</div><div class='ctx'> 		l = prom_getprop(_prom-&gt;chosen, "bootargs", p, COMMAND_LINE_SIZE-1);</div><div class='ctx'> #ifdef CONFIG_CMDLINE</div><div class='del'>-	if (l == 0) /* dbl check */</div><div class='add'>+	if (l &lt;= 0 || p[0] == '\0') /* dbl check */</div><div class='ctx'> 		strlcpy(RELOC(prom_cmd_line),</div><div class='ctx'> 			RELOC(CONFIG_CMDLINE), sizeof(prom_cmd_line));</div><div class='ctx'> #endif /* CONFIG_CMDLINE */</div><div class='hunk'>@@ -593,45 +585,6 @@ static void __init early_cmdline_parse(void)</div><div class='ctx'> 			RELOC(iommu_force_on) = 1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	opt = strstr(RELOC(prom_cmd_line), RELOC("mem="));</div><div class='del'>-	if (opt) {</div><div class='del'>-		opt += 4;</div><div class='del'>-		RELOC(prom_memory_limit) = prom_memparse(opt, (const char **)&amp;opt);</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-		/* Align to 16 MB == size of ppc64 large page */</div><div class='del'>-		RELOC(prom_memory_limit) = ALIGN(RELOC(prom_memory_limit), 0x1000000);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	/*</div><div class='del'>-	 * crashkernel=size@addr specifies the location to reserve for</div><div class='del'>-	 * crash kernel.</div><div class='del'>-	 */</div><div class='del'>-	opt = strstr(RELOC(prom_cmd_line), RELOC("crashkernel="));</div><div class='del'>-	if (opt) {</div><div class='del'>-		opt += 12;</div><div class='del'>-		RELOC(prom_crashk_size) = </div><div class='del'>-			prom_memparse(opt, (const char **)&amp;opt);</div><div class='del'>-</div><div class='del'>-		if (ALIGN(RELOC(prom_crashk_size), 0x1000000) !=</div><div class='del'>-			RELOC(prom_crashk_size)) {</div><div class='del'>-			prom_printf("Warning: crashkernel size is not "</div><div class='del'>-					"aligned to 16MB\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * At present, the crash kernel always run at 32MB.</div><div class='del'>-		 * Just ignore whatever user passed.</div><div class='del'>-		 */</div><div class='del'>-		RELOC(prom_crashk_base) = 0x2000000;</div><div class='del'>-		if (*opt == '@') {</div><div class='del'>-			prom_printf("Warning: PPC64 kdump kernel always runs "</div><div class='del'>-					"at 32 MB\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PSERIES</div><div class='hunk'>@@ -822,6 +775,7 @@ static void __init prom_send_capabilities(void)</div><div class='ctx'> 		/* try calling the ibm,client-architecture-support method */</div><div class='ctx'> 		if (call_prom_ret("call-method", 3, 2, &amp;ret,</div><div class='ctx'> 				  ADDR("ibm,client-architecture-support"),</div><div class='add'>+				  root,</div><div class='ctx'> 				  ADDR(ibm_architecture_vec)) == 0) {</div><div class='ctx'> 			/* the call exists... */</div><div class='ctx'> 			if (ret)</div><div class='hunk'>@@ -1033,7 +987,7 @@ static void reserve_mem(u64 base, u64 size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Initialize memory allocation mecanism, parse "memory" nodes and</div><div class='add'>+ * Initialize memory allocation mechanism, parse "memory" nodes and</div><div class='ctx'>  * obtain that way the top of memory and RMO to setup out local allocator</div><div class='ctx'>  */</div><div class='ctx'> static void __init prom_init_mem(void)</div><div class='hunk'>@@ -1115,29 +1069,6 @@ static void __init prom_init_mem(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If prom_memory_limit is set we reduce the upper limits *except* for</div><div class='del'>-	 * alloc_top_high. This must be the real top of RAM so we can put</div><div class='del'>-	 * TCE's up there.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	RELOC(alloc_top_high) = RELOC(ram_top);</div><div class='del'>-</div><div class='del'>-	if (RELOC(prom_memory_limit)) {</div><div class='del'>-		if (RELOC(prom_memory_limit) &lt;= RELOC(alloc_bottom)) {</div><div class='del'>-			prom_printf("Ignoring mem=%x &lt;= alloc_bottom.\n",</div><div class='del'>-				RELOC(prom_memory_limit));</div><div class='del'>-			RELOC(prom_memory_limit) = 0;</div><div class='del'>-		} else if (RELOC(prom_memory_limit) &gt;= RELOC(ram_top)) {</div><div class='del'>-			prom_printf("Ignoring mem=%x &gt;= ram_top.\n",</div><div class='del'>-				RELOC(prom_memory_limit));</div><div class='del'>-			RELOC(prom_memory_limit) = 0;</div><div class='del'>-		} else {</div><div class='del'>-			RELOC(ram_top) = RELOC(prom_memory_limit);</div><div class='del'>-			RELOC(rmo_top) = min(RELOC(rmo_top), RELOC(prom_memory_limit));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Setup our top alloc point, that is top of RMO or top of</div><div class='ctx'> 	 * segment 0 when running non-LPAR.</div><div class='ctx'> 	 * Some RS64 machines have buggy firmware where claims up at</div><div class='hunk'>@@ -1149,20 +1080,14 @@ static void __init prom_init_mem(void)</div><div class='ctx'> 		RELOC(rmo_top) = RELOC(ram_top);</div><div class='ctx'> 	RELOC(rmo_top) = min(0x30000000ul, RELOC(rmo_top));</div><div class='ctx'> 	RELOC(alloc_top) = RELOC(rmo_top);</div><div class='add'>+	RELOC(alloc_top_high) = RELOC(ram_top);</div><div class='ctx'> </div><div class='ctx'> 	prom_printf("memory layout at init:\n");</div><div class='del'>-	prom_printf("  memory_limit : %x (16 MB aligned)\n", RELOC(prom_memory_limit));</div><div class='ctx'> 	prom_printf("  alloc_bottom : %x\n", RELOC(alloc_bottom));</div><div class='ctx'> 	prom_printf("  alloc_top    : %x\n", RELOC(alloc_top));</div><div class='ctx'> 	prom_printf("  alloc_top_hi : %x\n", RELOC(alloc_top_high));</div><div class='ctx'> 	prom_printf("  rmo_top      : %x\n", RELOC(rmo_top));</div><div class='ctx'> 	prom_printf("  ram_top      : %x\n", RELOC(ram_top));</div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	if (RELOC(prom_crashk_base)) {</div><div class='del'>-		prom_printf("  crashk_base  : %x\n",  RELOC(prom_crashk_base));</div><div class='del'>-		prom_printf("  crashk_size  : %x\n", RELOC(prom_crashk_size));</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1348,16 +1273,10 @@ static void __init prom_initialize_tce_table(void)</div><div class='ctx'> </div><div class='ctx'> 	reserve_mem(local_alloc_bottom, local_alloc_top - local_alloc_bottom);</div><div class='ctx'> </div><div class='del'>-	if (RELOC(prom_memory_limit)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We align the start to a 16MB boundary so we can map</div><div class='del'>-		 * the TCE area using large pages if possible.</div><div class='del'>-		 * The end should be the top of RAM so no need to align it.</div><div class='del'>-		 */</div><div class='del'>-		RELOC(prom_tce_alloc_start) = _ALIGN_DOWN(local_alloc_bottom,</div><div class='del'>-							  0x1000000);</div><div class='del'>-		RELOC(prom_tce_alloc_end) = local_alloc_top;</div><div class='del'>-	}</div><div class='add'>+	/* These are only really needed if there is a memory limit in</div><div class='add'>+	 * effect, but we don't know so export them always. */</div><div class='add'>+	RELOC(prom_tce_alloc_start) = local_alloc_bottom;</div><div class='add'>+	RELOC(prom_tce_alloc_end) = local_alloc_top;</div><div class='ctx'> </div><div class='ctx'> 	/* Flag the first invalid entry */</div><div class='ctx'> 	prom_debug("ending prom_initialize_tce_table\n");</div><div class='hunk'>@@ -1622,6 +1541,15 @@ static int __init prom_find_machine_type(void)</div><div class='ctx'> 			if (strstr(p, RELOC("Power Macintosh")) ||</div><div class='ctx'> 			    strstr(p, RELOC("MacRISC")))</div><div class='ctx'> 				return PLATFORM_POWERMAC;</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+			/* We must make sure we don't detect the IBM Cell</div><div class='add'>+			 * blades as pSeries due to some firmware issues,</div><div class='add'>+			 * so we do it here.</div><div class='add'>+			 */</div><div class='add'>+			if (strstr(p, RELOC("IBM,CBEA")) ||</div><div class='add'>+			    strstr(p, RELOC("IBM,CPBW-1.0")))</div><div class='add'>+				return PLATFORM_GENERIC;</div><div class='add'>+#endif /* CONFIG_PPC64 */</div><div class='ctx'> 			i += sl + 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2031,11 +1959,7 @@ static void __init flatten_device_tree(void)</div><div class='ctx'> 	/* Version 16 is not backward compatible */</div><div class='ctx'> 	hdr-&gt;last_comp_version = 0x10;</div><div class='ctx'> </div><div class='del'>-	/* Reserve the whole thing and copy the reserve map in, we</div><div class='del'>-	 * also bump mem_reserve_cnt to cause further reservations to</div><div class='del'>-	 * fail since it's too late.</div><div class='del'>-	 */</div><div class='del'>-	reserve_mem(RELOC(dt_header_start), hdr-&gt;totalsize);</div><div class='add'>+	/* Copy the reserve map in */</div><div class='ctx'> 	memcpy(rsvmap, RELOC(mem_reserve_map), sizeof(mem_reserve_map));</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_PROM</div><div class='hunk'>@@ -2048,6 +1972,9 @@ static void __init flatten_device_tree(void)</div><div class='ctx'> 				    RELOC(mem_reserve_map)[i].size);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	/* Bump mem_reserve_cnt to cause further reservations to fail</div><div class='add'>+	 * since it's too late.</div><div class='add'>+	 */</div><div class='ctx'> 	RELOC(mem_reserve_cnt) = MEM_RESERVE_MAP_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	prom_printf("Device tree strings 0x%x -&gt; 0x%x\n",</div><div class='hunk'>@@ -2063,12 +1990,22 @@ static void __init flatten_device_tree(void)</div><div class='ctx'> static void __init fixup_device_tree_maple(void)</div><div class='ctx'> {</div><div class='ctx'> 	phandle isa;</div><div class='add'>+	u32 rloc = 0x01002000; /* IO space; PCI device = 4 */</div><div class='ctx'> 	u32 isa_ranges[6];</div><div class='del'>-</div><div class='del'>-	isa = call_prom("finddevice", 1, 1, ADDR("/ht@0/isa@4"));</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	name = "/ht@0/isa@4";</div><div class='add'>+	isa = call_prom("finddevice", 1, 1, ADDR(name));</div><div class='add'>+	if (!PHANDLE_VALID(isa)) {</div><div class='add'>+		name = "/ht@0/isa@6";</div><div class='add'>+		isa = call_prom("finddevice", 1, 1, ADDR(name));</div><div class='add'>+		rloc = 0x01003000; /* IO space; PCI device = 6 */</div><div class='add'>+	}</div><div class='ctx'> 	if (!PHANDLE_VALID(isa))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (prom_getproplen(isa, "ranges") != 12)</div><div class='add'>+		return;</div><div class='ctx'> 	if (prom_getprop(isa, "ranges", isa_ranges, sizeof(isa_ranges))</div><div class='ctx'> 		== PROM_ERROR)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2078,15 +2015,15 @@ static void __init fixup_device_tree_maple(void)</div><div class='ctx'> 		isa_ranges[2] != 0x00010000)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	prom_printf("fixing up bogus ISA range on Maple...\n");</div><div class='add'>+	prom_printf("Fixing up bogus ISA range on Maple/Apache...\n");</div><div class='ctx'> </div><div class='ctx'> 	isa_ranges[0] = 0x1;</div><div class='ctx'> 	isa_ranges[1] = 0x0;</div><div class='del'>-	isa_ranges[2] = 0x01002000; /* IO space; PCI device = 4 */</div><div class='add'>+	isa_ranges[2] = rloc;</div><div class='ctx'> 	isa_ranges[3] = 0x0;</div><div class='ctx'> 	isa_ranges[4] = 0x0;</div><div class='ctx'> 	isa_ranges[5] = 0x00010000;</div><div class='del'>-	prom_setprop(isa, "/ht@0/isa@4", "ranges",</div><div class='add'>+	prom_setprop(isa, name, "ranges",</div><div class='ctx'> 			isa_ranges, sizeof(isa_ranges));</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -2270,10 +2207,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	 */</div><div class='ctx'> 	prom_init_mem();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	if (RELOC(prom_crashk_base))</div><div class='del'>-		reserve_mem(RELOC(prom_crashk_base), RELOC(prom_crashk_size));</div><div class='del'>-#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Determine which cpu is actually running right _now_</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2307,10 +2240,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fill in some infos for use by the kernel later on</div><div class='ctx'> 	 */</div><div class='del'>-	if (RELOC(prom_memory_limit))</div><div class='del'>-		prom_setprop(_prom-&gt;chosen, "/chosen", "linux,memory-limit",</div><div class='del'>-			     &amp;RELOC(prom_memory_limit),</div><div class='del'>-			     sizeof(prom_memory_limit));</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	if (RELOC(ppc64_iommu_off))</div><div class='ctx'> 		prom_setprop(_prom-&gt;chosen, "/chosen", "linux,iommu-off",</div><div class='hunk'>@@ -2330,16 +2259,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	if (RELOC(prom_crashk_base)) {</div><div class='del'>-		prom_setprop(_prom-&gt;chosen, "/chosen", "linux,crashkernel-base",</div><div class='del'>-			PTRRELOC(&amp;prom_crashk_base),</div><div class='del'>-			sizeof(RELOC(prom_crashk_base)));</div><div class='del'>-		prom_setprop(_prom-&gt;chosen, "/chosen", "linux,crashkernel-size",</div><div class='del'>-			PTRRELOC(&amp;prom_crashk_size),</div><div class='del'>-			sizeof(RELOC(prom_crashk_size)));</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fixup any known bugs in the device-tree</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c<br/>index 3934c227549b..6a7e997c401d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom_parse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/prom_parse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/prom_parse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/prom_parse.c</a></div><div class='hunk'>@@ -38,14 +38,6 @@ static void of_dump_addr(const char *s, u32 *addr, int na)</div><div class='ctx'> static void of_dump_addr(const char *s, u32 *addr, int na) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Read a big address */</div><div class='del'>-static inline u64 of_read_addr(u32 *cell, int size)</div><div class='del'>-{</div><div class='del'>-	u64 r = 0;</div><div class='del'>-	while (size--)</div><div class='del'>-		r = (r &lt;&lt; 32) | *(cell++);</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /* Callbacks for bus specific translators */</div><div class='ctx'> struct of_bus {</div><div class='hunk'>@@ -77,9 +69,9 @@ static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna)</div><div class='ctx'> {</div><div class='ctx'> 	u64 cp, s, da;</div><div class='ctx'> </div><div class='del'>-	cp = of_read_addr(range, na);</div><div class='del'>-	s  = of_read_addr(range + na + pna, ns);</div><div class='del'>-	da = of_read_addr(addr, na);</div><div class='add'>+	cp = of_read_number(range, na);</div><div class='add'>+	s  = of_read_number(range + na + pna, ns);</div><div class='add'>+	da = of_read_number(addr, na);</div><div class='ctx'> </div><div class='ctx'> 	DBG("OF: default map, cp="PRu64", s="PRu64", da="PRu64"\n",</div><div class='ctx'> 	    cp, s, da);</div><div class='hunk'>@@ -91,7 +83,7 @@ static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna)</div><div class='ctx'> </div><div class='ctx'> static int of_bus_default_translate(u32 *addr, u64 offset, int na)</div><div class='ctx'> {</div><div class='del'>-	u64 a = of_read_addr(addr, na);</div><div class='add'>+	u64 a = of_read_number(addr, na);</div><div class='ctx'> 	memset(addr, 0, na * 4);</div><div class='ctx'> 	a += offset;</div><div class='ctx'> 	if (na &gt; 1)</div><div class='hunk'>@@ -135,9 +127,9 @@ static u64 of_bus_pci_map(u32 *addr, u32 *range, int na, int ns, int pna)</div><div class='ctx'> 		return OF_BAD_ADDR;</div><div class='ctx'> </div><div class='ctx'> 	/* Read address values, skipping high cell */</div><div class='del'>-	cp = of_read_addr(range + 1, na - 1);</div><div class='del'>-	s  = of_read_addr(range + na + pna, ns);</div><div class='del'>-	da = of_read_addr(addr + 1, na - 1);</div><div class='add'>+	cp = of_read_number(range + 1, na - 1);</div><div class='add'>+	s  = of_read_number(range + na + pna, ns);</div><div class='add'>+	da = of_read_number(addr + 1, na - 1);</div><div class='ctx'> </div><div class='ctx'> 	DBG("OF: PCI map, cp="PRu64", s="PRu64", da="PRu64"\n", cp, s, da);</div><div class='ctx'> </div><div class='hunk'>@@ -195,9 +187,9 @@ static u64 of_bus_isa_map(u32 *addr, u32 *range, int na, int ns, int pna)</div><div class='ctx'> 		return OF_BAD_ADDR;</div><div class='ctx'> </div><div class='ctx'> 	/* Read address values, skipping high cell */</div><div class='del'>-	cp = of_read_addr(range + 1, na - 1);</div><div class='del'>-	s  = of_read_addr(range + na + pna, ns);</div><div class='del'>-	da = of_read_addr(addr + 1, na - 1);</div><div class='add'>+	cp = of_read_number(range + 1, na - 1);</div><div class='add'>+	s  = of_read_number(range + na + pna, ns);</div><div class='add'>+	da = of_read_number(addr + 1, na - 1);</div><div class='ctx'> </div><div class='ctx'> 	DBG("OF: ISA map, cp="PRu64", s="PRu64", da="PRu64"\n", cp, s, da);</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +287,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ranges = (u32 *)get_property(parent, "ranges", &amp;rlen);</div><div class='ctx'> 	if (ranges == NULL || rlen == 0) {</div><div class='del'>-		offset = of_read_addr(addr, na);</div><div class='add'>+		offset = of_read_number(addr, na);</div><div class='ctx'> 		memset(addr, 0, pna * 4);</div><div class='ctx'> 		DBG("OF: no ranges, 1:1 translation\n");</div><div class='ctx'> 		goto finish;</div><div class='hunk'>@@ -378,7 +370,7 @@ u64 of_translate_address(struct device_node *dev, u32 *in_addr)</div><div class='ctx'> 		/* If root, we have finished */</div><div class='ctx'> 		if (parent == NULL) {</div><div class='ctx'> 			DBG("OF: reached root node\n");</div><div class='del'>-			result = of_read_addr(addr, na);</div><div class='add'>+			result = of_read_number(addr, na);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -442,7 +434,7 @@ u32 *of_get_address(struct device_node *dev, int index, u64 *size,</div><div class='ctx'> 	for (i = 0; psize &gt;= onesize; psize -= onesize, prop += onesize, i++)</div><div class='ctx'> 		if (i == index) {</div><div class='ctx'> 			if (size)</div><div class='del'>-				*size = of_read_addr(prop + na, ns);</div><div class='add'>+				*size = of_read_number(prop + na, ns);</div><div class='ctx'> 			if (flags)</div><div class='ctx'> 				*flags = bus-&gt;get_flags(prop);</div><div class='ctx'> 			return prop;</div><div class='hunk'>@@ -484,7 +476,7 @@ u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size,</div><div class='ctx'> 	for (i = 0; psize &gt;= onesize; psize -= onesize, prop += onesize, i++)</div><div class='ctx'> 		if ((prop[0] &amp; 0xff) == ((bar_no * 4) + PCI_BASE_ADDRESS_0)) {</div><div class='ctx'> 			if (size)</div><div class='del'>-				*size = of_read_addr(prop + na, ns);</div><div class='add'>+				*size = of_read_number(prop + na, ns);</div><div class='ctx'> 			if (flags)</div><div class='ctx'> 				*flags = bus-&gt;get_flags(prop);</div><div class='ctx'> 			return prop;</div><div class='hunk'>@@ -548,3 +540,431 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,</div><div class='ctx'> 	return __of_address_to_resource(dev, addrp, size, flags, r);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(of_pci_address_to_resource);</div><div class='add'>+</div><div class='add'>+void of_parse_dma_window(struct device_node *dn, unsigned char *dma_window_prop,</div><div class='add'>+		unsigned long *busno, unsigned long *phys, unsigned long *size)</div><div class='add'>+{</div><div class='add'>+	u32 *dma_window, cells;</div><div class='add'>+	unsigned char *prop;</div><div class='add'>+</div><div class='add'>+	dma_window = (u32 *)dma_window_prop;</div><div class='add'>+</div><div class='add'>+	/* busno is always one cell */</div><div class='add'>+	*busno = *(dma_window++);</div><div class='add'>+</div><div class='add'>+	prop = get_property(dn, "ibm,#dma-address-cells", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		prop = get_property(dn, "#address-cells", NULL);</div><div class='add'>+</div><div class='add'>+	cells = prop ? *(u32 *)prop : prom_n_addr_cells(dn);</div><div class='add'>+	*phys = of_read_number(dma_window, cells);</div><div class='add'>+</div><div class='add'>+	dma_window += cells;</div><div class='add'>+</div><div class='add'>+	prop = get_property(dn, "ibm,#dma-size-cells", NULL);</div><div class='add'>+	cells = prop ? *(u32 *)prop : prom_n_size_cells(dn);</div><div class='add'>+	*size = of_read_number(dma_window, cells);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt remapper</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static unsigned int of_irq_workarounds;</div><div class='add'>+static struct device_node *of_irq_dflt_pic;</div><div class='add'>+</div><div class='add'>+static struct device_node *of_irq_find_parent(struct device_node *child)</div><div class='add'>+{</div><div class='add'>+	struct device_node *p;</div><div class='add'>+	phandle *parp;</div><div class='add'>+</div><div class='add'>+	if (!of_node_get(child))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		parp = (phandle *)get_property(child, "interrupt-parent", NULL);</div><div class='add'>+		if (parp == NULL)</div><div class='add'>+			p = of_get_parent(child);</div><div class='add'>+		else {</div><div class='add'>+			if (of_irq_workarounds &amp; OF_IMAP_NO_PHANDLE)</div><div class='add'>+				p = of_node_get(of_irq_dflt_pic);</div><div class='add'>+			else</div><div class='add'>+				p = of_find_node_by_phandle(*parp);</div><div class='add'>+		}</div><div class='add'>+		of_node_put(child);</div><div class='add'>+		child = p;</div><div class='add'>+	} while (p &amp;&amp; get_property(p, "#interrupt-cells", NULL) == NULL);</div><div class='add'>+</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 of_irq_pci_swizzle(u8 slot, u8 pin)</div><div class='add'>+{</div><div class='add'>+	return (((pin - 1) + slot) % 4) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This doesn't need to be called if you don't have any special workaround</div><div class='add'>+ * flags to pass</div><div class='add'>+ */</div><div class='add'>+void of_irq_map_init(unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	of_irq_workarounds = flags;</div><div class='add'>+</div><div class='add'>+	/* OldWorld, don't bother looking at other things */</div><div class='add'>+	if (flags &amp; OF_IMAP_OLDWORLD_MAC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If we don't have phandles, let's try to locate a default interrupt</div><div class='add'>+	 * controller (happens when booting with BootX). We do a first match</div><div class='add'>+	 * here, hopefully, that only ever happens on machines with one</div><div class='add'>+	 * controller.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; OF_IMAP_NO_PHANDLE) {</div><div class='add'>+		struct device_node *np;</div><div class='add'>+</div><div class='add'>+		for(np = NULL; (np = of_find_all_nodes(np)) != NULL;) {</div><div class='add'>+			if (get_property(np, "interrupt-controller", NULL)</div><div class='add'>+			    == NULL)</div><div class='add'>+				continue;</div><div class='add'>+			/* Skip /chosen/interrupt-controller */</div><div class='add'>+			if (strcmp(np-&gt;name, "chosen") == 0)</div><div class='add'>+				continue;</div><div class='add'>+			/* It seems like at least one person on this planet wants</div><div class='add'>+			 * to use BootX on a machine with an AppleKiwi controller</div><div class='add'>+			 * which happens to pretend to be an interrupt</div><div class='add'>+			 * controller too.</div><div class='add'>+			 */</div><div class='add'>+			if (strcmp(np-&gt;name, "AppleKiwi") == 0)</div><div class='add'>+				continue;</div><div class='add'>+			/* I think we found one ! */</div><div class='add'>+			of_irq_dflt_pic = np;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 *addr,</div><div class='add'>+		   struct of_irq *out_irq)</div><div class='add'>+{</div><div class='add'>+	struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;</div><div class='add'>+	u32 *tmp, *imap, *imask;</div><div class='add'>+	u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;</div><div class='add'>+	int imaplen, match, i;</div><div class='add'>+</div><div class='add'>+	ipar = of_node_get(parent);</div><div class='add'>+</div><div class='add'>+	/* First get the #interrupt-cells property of the current cursor</div><div class='add'>+	 * that tells us how to interpret the passed-in intspec. If there</div><div class='add'>+	 * is none, we are nice and just walk up the tree</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		tmp = (u32 *)get_property(ipar, "#interrupt-cells", NULL);</div><div class='add'>+		if (tmp != NULL) {</div><div class='add'>+			intsize = *tmp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tnode = ipar;</div><div class='add'>+		ipar = of_irq_find_parent(ipar);</div><div class='add'>+		of_node_put(tnode);</div><div class='add'>+	} while (ipar);</div><div class='add'>+	if (ipar == NULL) {</div><div class='add'>+		DBG(" -&gt; no parent found !\n");</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG("of_irq_map_raw: ipar=%s, size=%d\n", ipar-&gt;full_name, intsize);</div><div class='add'>+</div><div class='add'>+	/* Look for this #address-cells. We have to implement the old linux</div><div class='add'>+	 * trick of looking for the parent here as some device-trees rely on it</div><div class='add'>+	 */</div><div class='add'>+	old = of_node_get(ipar);</div><div class='add'>+	do {</div><div class='add'>+		tmp = (u32 *)get_property(old, "#address-cells", NULL);</div><div class='add'>+		tnode = of_get_parent(old);</div><div class='add'>+		of_node_put(old);</div><div class='add'>+		old = tnode;</div><div class='add'>+	} while(old &amp;&amp; tmp == NULL);</div><div class='add'>+	of_node_put(old);</div><div class='add'>+	old = NULL;</div><div class='add'>+	addrsize = (tmp == NULL) ? 2 : *tmp;</div><div class='add'>+</div><div class='add'>+	DBG(" -&gt; addrsize=%d\n", addrsize);</div><div class='add'>+</div><div class='add'>+	/* Now start the actual "proper" walk of the interrupt tree */</div><div class='add'>+	while (ipar != NULL) {</div><div class='add'>+		/* Now check if cursor is an interrupt-controller and if it is</div><div class='add'>+		 * then we are done</div><div class='add'>+		 */</div><div class='add'>+		if (get_property(ipar, "interrupt-controller", NULL) != NULL) {</div><div class='add'>+			DBG(" -&gt; got it !\n");</div><div class='add'>+			memcpy(out_irq-&gt;specifier, intspec,</div><div class='add'>+			       intsize * sizeof(u32));</div><div class='add'>+			out_irq-&gt;size = intsize;</div><div class='add'>+			out_irq-&gt;controller = ipar;</div><div class='add'>+			of_node_put(old);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now look for an interrupt-map */</div><div class='add'>+		imap = (u32 *)get_property(ipar, "interrupt-map", &amp;imaplen);</div><div class='add'>+		/* No interrupt map, check for an interrupt parent */</div><div class='add'>+		if (imap == NULL) {</div><div class='add'>+			DBG(" -&gt; no map, getting parent\n");</div><div class='add'>+			newpar = of_irq_find_parent(ipar);</div><div class='add'>+			goto skiplevel;</div><div class='add'>+		}</div><div class='add'>+		imaplen /= sizeof(u32);</div><div class='add'>+</div><div class='add'>+		/* Look for a mask */</div><div class='add'>+		imask = (u32 *)get_property(ipar, "interrupt-map-mask", NULL);</div><div class='add'>+</div><div class='add'>+		/* If we were passed no "reg" property and we attempt to parse</div><div class='add'>+		 * an interrupt-map, then #address-cells must be 0.</div><div class='add'>+		 * Fail if it's not.</div><div class='add'>+		 */</div><div class='add'>+		if (addr == NULL &amp;&amp; addrsize != 0) {</div><div class='add'>+			DBG(" -&gt; no reg passed in when needed !\n");</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Parse interrupt-map */</div><div class='add'>+		match = 0;</div><div class='add'>+		while (imaplen &gt; (addrsize + intsize + 1) &amp;&amp; !match) {</div><div class='add'>+			/* Compare specifiers */</div><div class='add'>+			match = 1;</div><div class='add'>+			for (i = 0; i &lt; addrsize &amp;&amp; match; ++i) {</div><div class='add'>+				u32 mask = imask ? imask[i] : 0xffffffffu;</div><div class='add'>+				match = ((addr[i] ^ imap[i]) &amp; mask) == 0;</div><div class='add'>+			}</div><div class='add'>+			for (; i &lt; (addrsize + intsize) &amp;&amp; match; ++i) {</div><div class='add'>+				u32 mask = imask ? imask[i] : 0xffffffffu;</div><div class='add'>+				match =</div><div class='add'>+				   ((intspec[i-addrsize] ^ imap[i]) &amp; mask) == 0;</div><div class='add'>+			}</div><div class='add'>+			imap += addrsize + intsize;</div><div class='add'>+			imaplen -= addrsize + intsize;</div><div class='add'>+</div><div class='add'>+			DBG(" -&gt; match=%d (imaplen=%d)\n", match, imaplen);</div><div class='add'>+</div><div class='add'>+			/* Get the interrupt parent */</div><div class='add'>+			if (of_irq_workarounds &amp; OF_IMAP_NO_PHANDLE)</div><div class='add'>+				newpar = of_node_get(of_irq_dflt_pic);</div><div class='add'>+			else</div><div class='add'>+				newpar = of_find_node_by_phandle((phandle)*imap);</div><div class='add'>+			imap++;</div><div class='add'>+			--imaplen;</div><div class='add'>+</div><div class='add'>+			/* Check if not found */</div><div class='add'>+			if (newpar == NULL) {</div><div class='add'>+				DBG(" -&gt; imap parent not found !\n");</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Get #interrupt-cells and #address-cells of new</div><div class='add'>+			 * parent</div><div class='add'>+			 */</div><div class='add'>+			tmp = (u32 *)get_property(newpar, "#interrupt-cells",</div><div class='add'>+						  NULL);</div><div class='add'>+			if (tmp == NULL) {</div><div class='add'>+				DBG(" -&gt; parent lacks #interrupt-cells !\n");</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='add'>+			newintsize = *tmp;</div><div class='add'>+			tmp = (u32 *)get_property(newpar, "#address-cells",</div><div class='add'>+						  NULL);</div><div class='add'>+			newaddrsize = (tmp == NULL) ? 0 : *tmp;</div><div class='add'>+</div><div class='add'>+			DBG(" -&gt; newintsize=%d, newaddrsize=%d\n",</div><div class='add'>+			    newintsize, newaddrsize);</div><div class='add'>+</div><div class='add'>+			/* Check for malformed properties */</div><div class='add'>+			if (imaplen &lt; (newaddrsize + newintsize))</div><div class='add'>+				goto fail;</div><div class='add'>+</div><div class='add'>+			imap += newaddrsize + newintsize;</div><div class='add'>+			imaplen -= newaddrsize + newintsize;</div><div class='add'>+</div><div class='add'>+			DBG(" -&gt; imaplen=%d\n", imaplen);</div><div class='add'>+		}</div><div class='add'>+		if (!match)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		of_node_put(old);</div><div class='add'>+		old = of_node_get(newpar);</div><div class='add'>+		addrsize = newaddrsize;</div><div class='add'>+		intsize = newintsize;</div><div class='add'>+		intspec = imap - intsize;</div><div class='add'>+		addr = intspec - addrsize;</div><div class='add'>+</div><div class='add'>+	skiplevel:</div><div class='add'>+		/* Iterate again with new parent */</div><div class='add'>+		DBG(" -&gt; new parent: %s\n", newpar ? newpar-&gt;full_name : "&lt;&gt;");</div><div class='add'>+		of_node_put(ipar);</div><div class='add'>+		ipar = newpar;</div><div class='add'>+		newpar = NULL;</div><div class='add'>+	}</div><div class='add'>+ fail:</div><div class='add'>+	of_node_put(ipar);</div><div class='add'>+	of_node_put(old);</div><div class='add'>+	of_node_put(newpar);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_irq_map_raw);</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PPC_PMAC) &amp;&amp; defined(CONFIG_PPC32)</div><div class='add'>+static int of_irq_map_oldworld(struct device_node *device, int index,</div><div class='add'>+			       struct of_irq *out_irq)</div><div class='add'>+{</div><div class='add'>+	u32 *ints;</div><div class='add'>+	int intlen;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Old machines just have a list of interrupt numbers</div><div class='add'>+	 * and no interrupt-controller nodes.</div><div class='add'>+	 */</div><div class='add'>+	ints = (u32 *) get_property(device, "AAPL,interrupts", &amp;intlen);</div><div class='add'>+	if (ints == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	intlen /= sizeof(u32);</div><div class='add'>+</div><div class='add'>+	if (index &gt;= intlen)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	out_irq-&gt;controller = NULL;</div><div class='add'>+	out_irq-&gt;specifier[0] = ints[index];</div><div class='add'>+	out_irq-&gt;size = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else /* defined(CONFIG_PPC_PMAC) &amp;&amp; defined(CONFIG_PPC32) */</div><div class='add'>+static int of_irq_map_oldworld(struct device_node *device, int index,</div><div class='add'>+			       struct of_irq *out_irq)</div><div class='add'>+{</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+#endif /* !(defined(CONFIG_PPC_PMAC) &amp;&amp; defined(CONFIG_PPC32)) */</div><div class='add'>+</div><div class='add'>+int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq)</div><div class='add'>+{</div><div class='add'>+	struct device_node *p;</div><div class='add'>+	u32 *intspec, *tmp, intsize, intlen, *addr;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	DBG("of_irq_map_one: dev=%s, index=%d\n", device-&gt;full_name, index);</div><div class='add'>+</div><div class='add'>+	/* OldWorld mac stuff is "special", handle out of line */</div><div class='add'>+	if (of_irq_workarounds &amp; OF_IMAP_OLDWORLD_MAC)</div><div class='add'>+		return of_irq_map_oldworld(device, index, out_irq);</div><div class='add'>+</div><div class='add'>+	/* Get the interrupts property */</div><div class='add'>+	intspec = (u32 *)get_property(device, "interrupts", &amp;intlen);</div><div class='add'>+	if (intspec == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	intlen /= sizeof(u32);</div><div class='add'>+</div><div class='add'>+	/* Get the reg property (if any) */</div><div class='add'>+	addr = (u32 *)get_property(device, "reg", NULL);</div><div class='add'>+</div><div class='add'>+	/* Look for the interrupt parent. */</div><div class='add'>+	p = of_irq_find_parent(device);</div><div class='add'>+	if (p == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Get size of interrupt specifier */</div><div class='add'>+	tmp = (u32 *)get_property(p, "#interrupt-cells", NULL);</div><div class='add'>+	if (tmp == NULL) {</div><div class='add'>+		of_node_put(p);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	intsize = *tmp;</div><div class='add'>+</div><div class='add'>+	/* Check index */</div><div class='add'>+	if ((index + 1) * intsize &gt; intlen)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Get new specifier and map it */</div><div class='add'>+	res = of_irq_map_raw(p, intspec + index * intsize, addr, out_irq);</div><div class='add'>+	of_node_put(p);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_irq_map_one);</div><div class='add'>+</div><div class='add'>+int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn, *ppnode;</div><div class='add'>+	struct pci_dev *ppdev;</div><div class='add'>+	u32 lspec;</div><div class='add'>+	u32 laddr[3];</div><div class='add'>+	u8 pin;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Check if we have a device node, if yes, fallback to standard OF</div><div class='add'>+	 * parsing</div><div class='add'>+	 */</div><div class='add'>+	dn = pci_device_to_OF_node(pdev);</div><div class='add'>+	if (dn)</div><div class='add'>+		return of_irq_map_one(dn, 0, out_irq);</div><div class='add'>+</div><div class='add'>+	/* Ok, we don't, time to have fun. Let's start by building up an</div><div class='add'>+	 * interrupt spec.  we assume #interrupt-cells is 1, which is standard</div><div class='add'>+	 * for PCI. If you do different, then don't use that routine.</div><div class='add'>+	 */</div><div class='add'>+	rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &amp;pin);</div><div class='add'>+	if (rc != 0)</div><div class='add'>+		return rc;</div><div class='add'>+	/* No pin, exit */</div><div class='add'>+	if (pin == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Now we walk up the PCI tree */</div><div class='add'>+	lspec = pin;</div><div class='add'>+	for (;;) {</div><div class='add'>+		/* Get the pci_dev of our parent */</div><div class='add'>+		ppdev = pdev-&gt;bus-&gt;self;</div><div class='add'>+</div><div class='add'>+		/* Ouch, it's a host bridge... */</div><div class='add'>+		if (ppdev == NULL) {</div><div class='add'>+#ifdef CONFIG_PPC64</div><div class='add'>+			ppnode = pci_bus_to_OF_node(pdev-&gt;bus);</div><div class='add'>+#else</div><div class='add'>+			struct pci_controller *host;</div><div class='add'>+			host = pci_bus_to_host(pdev-&gt;bus);</div><div class='add'>+			ppnode = host ? host-&gt;arch_data : NULL;</div><div class='add'>+#endif</div><div class='add'>+			/* No node for host bridge ? give up */</div><div class='add'>+			if (ppnode == NULL)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		} else</div><div class='add'>+			/* We found a P2P bridge, check if it has a node */</div><div class='add'>+			ppnode = pci_device_to_OF_node(ppdev);</div><div class='add'>+</div><div class='add'>+		/* Ok, we have found a parent with a device-node, hand over to</div><div class='add'>+		 * the OF parsing code.</div><div class='add'>+		 * We build a unit address from the linux device to be used for</div><div class='add'>+		 * resolution. Note that we use the linux bus number which may</div><div class='add'>+		 * not match your firmware bus numbering.</div><div class='add'>+		 * Fortunately, in most cases, interrupt-map-mask doesn't include</div><div class='add'>+		 * the bus number as part of the matching.</div><div class='add'>+		 * You should still be careful about that though if you intend</div><div class='add'>+		 * to rely on this function (you ship  a firmware that doesn't</div><div class='add'>+		 * create device nodes for all PCI devices).</div><div class='add'>+		 */</div><div class='add'>+		if (ppnode)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* We can only get here if we hit a P2P bridge with no node,</div><div class='add'>+		 * let's do standard swizzling and try again</div><div class='add'>+		 */</div><div class='add'>+		lspec = of_irq_pci_swizzle(PCI_SLOT(pdev-&gt;devfn), lspec);</div><div class='add'>+		pdev = ppdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	laddr[0] = (pdev-&gt;bus-&gt;number &lt;&lt; 16)</div><div class='add'>+		| (pdev-&gt;devfn &lt;&lt; 8);</div><div class='add'>+	laddr[1]  = laddr[2] = 0;</div><div class='add'>+	return of_irq_map_raw(ppnode, &amp;lspec, laddr, out_irq);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_irq_map_pci);</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace-common.h b/arch/powerpc/kernel/ptrace-common.h<br/>index c42a860c8d25..8797ae737a7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace-common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ptrace-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/ptrace-common.h</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #ifndef _PPC64_PTRACE_COMMON_H</div><div class='ctx'> #define _PPC64_PTRACE_COMMON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c<br/>index 4a677d1bd4ef..dea75d73f983 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/ptrace.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * this archive for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -404,7 +403,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		ret = ptrace_detach(child, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='ctx'> 	case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */</div><div class='ctx'> 		int i;</div><div class='ctx'> 		unsigned long *reg = &amp;((unsigned long *)child-&gt;thread.regs)[0];</div><div class='hunk'>@@ -468,7 +466,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='ctx'> 	case PTRACE_GETVRREGS:</div><div class='head'>diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c<br/>index 826ee3d056de..9b9a230349bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/ptrace32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/ptrace32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/ptrace32.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * this archive for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas-rtc.c b/arch/powerpc/kernel/rtas-rtc.c<br/>index 34d073fb6091..77578c093dda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas-rtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas-rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas-rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/rtas-rtc.c</a></div><div class='hunk'>@@ -14,19 +14,20 @@</div><div class='ctx'> unsigned long __init rtas_get_boot_time(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret[8];</div><div class='del'>-	int error, wait_time;</div><div class='add'>+	int error;</div><div class='add'>+	unsigned int wait_time;</div><div class='ctx'> 	u64 max_wait_tb;</div><div class='ctx'> </div><div class='ctx'> 	max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;</div><div class='ctx'> 	do {</div><div class='ctx'> 		error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);</div><div class='del'>-		if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(error);</div><div class='add'>+</div><div class='add'>+		wait_time = rtas_busy_delay_time(error);</div><div class='add'>+		if (wait_time) {</div><div class='ctx'> 			/* This is boot time so we spin. */</div><div class='ctx'> 			udelay(wait_time*1000);</div><div class='del'>-			error = RTAS_CLOCK_BUSY;</div><div class='ctx'> 		}</div><div class='del'>-	} while (error == RTAS_CLOCK_BUSY &amp;&amp; (get_tb() &lt; max_wait_tb));</div><div class='add'>+	} while (wait_time &amp;&amp; (get_tb() &lt; max_wait_tb));</div><div class='ctx'> </div><div class='ctx'> 	if (error != 0 &amp;&amp; printk_ratelimit()) {</div><div class='ctx'> 		printk(KERN_WARNING "error: reading the clock failed (%d)\n",</div><div class='hunk'>@@ -44,24 +45,25 @@ unsigned long __init rtas_get_boot_time(void)</div><div class='ctx'> void rtas_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='ctx'> {</div><div class='ctx'>         int ret[8];</div><div class='del'>-	int error, wait_time;</div><div class='add'>+	int error;</div><div class='add'>+	unsigned int wait_time;</div><div class='ctx'> 	u64 max_wait_tb;</div><div class='ctx'> </div><div class='ctx'> 	max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;</div><div class='ctx'> 	do {</div><div class='ctx'> 		error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);</div><div class='del'>-		if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {</div><div class='add'>+</div><div class='add'>+		wait_time = rtas_busy_delay_time(error);</div><div class='add'>+		if (wait_time) {</div><div class='ctx'> 			if (in_interrupt() &amp;&amp; printk_ratelimit()) {</div><div class='ctx'> 				memset(rtc_tm, 0, sizeof(struct rtc_time));</div><div class='ctx'> 				printk(KERN_WARNING "error: reading clock"</div><div class='ctx'> 				       " would delay interrupt\n");</div><div class='ctx'> 				return;	/* delay not allowed */</div><div class='ctx'> 			}</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(error);</div><div class='ctx'> 			msleep(wait_time);</div><div class='del'>-			error = RTAS_CLOCK_BUSY;</div><div class='ctx'> 		}</div><div class='del'>-	} while (error == RTAS_CLOCK_BUSY &amp;&amp; (get_tb() &lt; max_wait_tb));</div><div class='add'>+	} while (wait_time &amp;&amp; (get_tb() &lt; max_wait_tb));</div><div class='ctx'> </div><div class='ctx'>         if (error != 0 &amp;&amp; printk_ratelimit()) {</div><div class='ctx'>                 printk(KERN_WARNING "error: reading the clock failed (%d)\n",</div><div class='hunk'>@@ -88,14 +90,14 @@ int rtas_set_rtc_time(struct rtc_time *tm)</div><div class='ctx'> 				  tm-&gt;tm_year + 1900, tm-&gt;tm_mon + 1,</div><div class='ctx'> 				  tm-&gt;tm_mday, tm-&gt;tm_hour, tm-&gt;tm_min,</div><div class='ctx'> 				  tm-&gt;tm_sec, 0);</div><div class='del'>-		if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {</div><div class='add'>+</div><div class='add'>+		wait_time = rtas_busy_delay_time(error);</div><div class='add'>+		if (wait_time) {</div><div class='ctx'> 			if (in_interrupt())</div><div class='ctx'> 				return 1;	/* probably decrementer */</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(error);</div><div class='ctx'> 			msleep(wait_time);</div><div class='del'>-			error = RTAS_CLOCK_BUSY;</div><div class='ctx'> 		}</div><div class='del'>-	} while (error == RTAS_CLOCK_BUSY &amp;&amp; (get_tb() &lt; max_wait_tb));</div><div class='add'>+	} while (wait_time &amp;&amp; (get_tb() &lt; max_wait_tb));</div><div class='ctx'> </div><div class='ctx'>         if (error != 0 &amp;&amp; printk_ratelimit())</div><div class='ctx'>                 printk(KERN_WARNING "error: setting the clock failed (%d)\n",</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c<br/>index 0112318213ab..4a4cb5598402 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/rtas.c</a></div><div class='hunk'>@@ -38,16 +38,19 @@</div><div class='ctx'> struct rtas_t rtas = {</div><div class='ctx'> 	.lock = SPIN_LOCK_UNLOCKED</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL(rtas);</div><div class='ctx'> </div><div class='ctx'> struct rtas_suspend_me_data {</div><div class='ctx'> 	long waiting;</div><div class='ctx'> 	struct rtas_args *args;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(rtas);</div><div class='del'>-</div><div class='ctx'> DEFINE_SPINLOCK(rtas_data_buf_lock);</div><div class='add'>+EXPORT_SYMBOL(rtas_data_buf_lock);</div><div class='add'>+</div><div class='ctx'> char rtas_data_buf[RTAS_DATA_BUF_SIZE] __cacheline_aligned;</div><div class='add'>+EXPORT_SYMBOL(rtas_data_buf);</div><div class='add'>+</div><div class='ctx'> unsigned long rtas_rmo_buf;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -106,11 +109,71 @@ static void call_rtas_display_status_delay(char c)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init udbg_init_rtas(void)</div><div class='add'>+void __init udbg_init_rtas_panel(void)</div><div class='ctx'> {</div><div class='ctx'> 	udbg_putc = call_rtas_display_status_delay;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_UDBG_RTAS_CONSOLE</div><div class='add'>+</div><div class='add'>+/* If you think you're dying before early_init_dt_scan_rtas() does its</div><div class='add'>+ * work, you can hard code the token values for your firmware here and</div><div class='add'>+ * hardcode rtas.base/entry etc.</div><div class='add'>+ */</div><div class='add'>+static unsigned int rtas_putchar_token = RTAS_UNKNOWN_SERVICE;</div><div class='add'>+static unsigned int rtas_getchar_token = RTAS_UNKNOWN_SERVICE;</div><div class='add'>+</div><div class='add'>+static void udbg_rtascon_putc(char c)</div><div class='add'>+{</div><div class='add'>+	int tries;</div><div class='add'>+</div><div class='add'>+	if (!rtas.base)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Add CRs before LFs */</div><div class='add'>+	if (c == '\n')</div><div class='add'>+		udbg_rtascon_putc('\r');</div><div class='add'>+</div><div class='add'>+	/* if there is more than one character to be displayed, wait a bit */</div><div class='add'>+	for (tries = 0; tries &lt; 16; tries++) {</div><div class='add'>+		if (rtas_call(rtas_putchar_token, 1, 1, NULL, c) == 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(1000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udbg_rtascon_getc_poll(void)</div><div class='add'>+{</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	if (!rtas.base)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (rtas_call(rtas_getchar_token, 0, 2, &amp;c))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int udbg_rtascon_getc(void)</div><div class='add'>+{</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	while ((c = udbg_rtascon_getc_poll()) == -1)</div><div class='add'>+		;</div><div class='add'>+</div><div class='add'>+	return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void __init udbg_init_rtas_console(void)</div><div class='add'>+{</div><div class='add'>+	udbg_putc = udbg_rtascon_putc;</div><div class='add'>+	udbg_getc = udbg_rtascon_getc;</div><div class='add'>+	udbg_getc_poll = udbg_rtascon_getc_poll;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_UDBG_RTAS_CONSOLE */</div><div class='add'>+</div><div class='ctx'> void rtas_progress(char *s, unsigned short hex)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *root;</div><div class='hunk'>@@ -236,6 +299,7 @@ int rtas_token(const char *service)</div><div class='ctx'> 	tokp = (int *) get_property(rtas.dev, service, NULL);</div><div class='ctx'> 	return tokp ? *tokp : RTAS_UNKNOWN_SERVICE;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_token);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RTAS_ERROR_LOGGING</div><div class='ctx'> /*</div><div class='hunk'>@@ -328,7 +392,7 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)</div><div class='ctx'> 	char *buff_copy = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (token == RTAS_UNKNOWN_SERVICE)</div><div class='add'>+	if (!rtas.entry || token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Gotta do something different here, use global lock for now... */</div><div class='hunk'>@@ -369,26 +433,41 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_call);</div><div class='ctx'> </div><div class='del'>-/* Given an RTAS status code of 990n compute the hinted delay of 10^n</div><div class='del'>- * (last digit) milliseconds.  For now we bound at n=5 (100 sec).</div><div class='add'>+/* For RTAS_BUSY (-2), delay for 1 millisecond.  For an extended busy status</div><div class='add'>+ * code of 990n, perform the hinted delay of 10^n (last digit) milliseconds.</div><div class='ctx'>  */</div><div class='del'>-unsigned int rtas_extended_busy_delay_time(int status)</div><div class='add'>+unsigned int rtas_busy_delay_time(int status)</div><div class='ctx'> {</div><div class='del'>-	int order = status - 9900;</div><div class='del'>-	unsigned long ms;</div><div class='add'>+	int order;</div><div class='add'>+	unsigned int ms = 0;</div><div class='add'>+</div><div class='add'>+	if (status == RTAS_BUSY) {</div><div class='add'>+		ms = 1;</div><div class='add'>+	} else if (status &gt;= 9900 &amp;&amp; status &lt;= 9905) {</div><div class='add'>+		order = status - 9900;</div><div class='add'>+		for (ms = 1; order &gt; 0; order--)</div><div class='add'>+			ms *= 10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ms;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtas_busy_delay_time);</div><div class='ctx'> </div><div class='del'>-	if (order &lt; 0)</div><div class='del'>-		order = 0;	/* RTC depends on this for -2 clock busy */</div><div class='del'>-	else if (order &gt; 5)</div><div class='del'>-		order = 5;	/* bound */</div><div class='add'>+/* For an RTAS busy status code, perform the hinted delay. */</div><div class='add'>+unsigned int rtas_busy_delay(int status)</div><div class='add'>+{</div><div class='add'>+	unsigned int ms;</div><div class='ctx'> </div><div class='del'>-	/* Use microseconds for reasonable accuracy */</div><div class='del'>-	for (ms = 1; order &gt; 0; order--)</div><div class='del'>-		ms *= 10;</div><div class='add'>+	might_sleep();</div><div class='add'>+	ms = rtas_busy_delay_time(status);</div><div class='add'>+	if (ms)</div><div class='add'>+		msleep(ms);</div><div class='ctx'> </div><div class='del'>-	return ms; </div><div class='add'>+	return ms;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_busy_delay);</div><div class='ctx'> </div><div class='ctx'> int rtas_error_rc(int rtas_rc)</div><div class='ctx'> {</div><div class='hunk'>@@ -434,82 +513,61 @@ int rtas_get_power_level(int powerdomain, int *level)</div><div class='ctx'> 		return rtas_error_rc(rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_get_power_level);</div><div class='ctx'> </div><div class='ctx'> int rtas_set_power_level(int powerdomain, int level, int *setlevel)</div><div class='ctx'> {</div><div class='ctx'> 	int token = rtas_token("set-power-level");</div><div class='del'>-	unsigned int wait_time;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	do {</div><div class='ctx'> 		rc = rtas_call(token, 2, 2, setlevel, powerdomain, level);</div><div class='del'>-		if (rc == RTAS_BUSY)</div><div class='del'>-			udelay(1);</div><div class='del'>-		else if (rtas_is_extended_busy(rc)) {</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(rc);</div><div class='del'>-			udelay(wait_time * 1000);</div><div class='del'>-		} else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	} while (rtas_busy_delay(rc));</div><div class='ctx'> </div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rtas_error_rc(rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_set_power_level);</div><div class='ctx'> </div><div class='ctx'> int rtas_get_sensor(int sensor, int index, int *state)</div><div class='ctx'> {</div><div class='ctx'> 	int token = rtas_token("get-sensor-state");</div><div class='del'>-	unsigned int wait_time;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	do {</div><div class='ctx'> 		rc = rtas_call(token, 2, 2, state, sensor, index);</div><div class='del'>-		if (rc == RTAS_BUSY)</div><div class='del'>-			udelay(1);</div><div class='del'>-		else if (rtas_is_extended_busy(rc)) {</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(rc);</div><div class='del'>-			udelay(wait_time * 1000);</div><div class='del'>-		} else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	} while (rtas_busy_delay(rc));</div><div class='ctx'> </div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rtas_error_rc(rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_get_sensor);</div><div class='ctx'> </div><div class='ctx'> int rtas_set_indicator(int indicator, int index, int new_value)</div><div class='ctx'> {</div><div class='ctx'> 	int token = rtas_token("set-indicator");</div><div class='del'>-	unsigned int wait_time;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	do {</div><div class='ctx'> 		rc = rtas_call(token, 3, 1, NULL, indicator, index, new_value);</div><div class='del'>-		if (rc == RTAS_BUSY)</div><div class='del'>-			udelay(1);</div><div class='del'>-		else if (rtas_is_extended_busy(rc)) {</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(rc);</div><div class='del'>-			udelay(wait_time * 1000);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	} while (rtas_busy_delay(rc));</div><div class='ctx'> </div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rtas_error_rc(rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(rtas_set_indicator);</div><div class='ctx'> </div><div class='ctx'> void rtas_restart(char *cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -555,13 +613,11 @@ void rtas_os_term(char *str)</div><div class='ctx'> 	do {</div><div class='ctx'> 		status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,</div><div class='ctx'> 				   __pa(rtas_os_term_buf));</div><div class='add'>+	} while (rtas_busy_delay(status));</div><div class='ctx'> </div><div class='del'>-		if (status == RTAS_BUSY)</div><div class='del'>-			udelay(1);</div><div class='del'>-		else if (status != 0)</div><div class='del'>-			printk(KERN_EMERG "ibm,os-term call failed %d\n",</div><div class='add'>+	if (status != 0)</div><div class='add'>+		printk(KERN_EMERG "ibm,os-term call failed %d\n",</div><div class='ctx'> 			       status);</div><div class='del'>-	} while (status == RTAS_BUSY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ibm_suspend_me_token = RTAS_UNKNOWN_SERVICE;</div><div class='hunk'>@@ -608,9 +664,31 @@ out:</div><div class='ctx'> static int rtas_ibm_suspend_me(struct rtas_args *args)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	long state;</div><div class='add'>+	long rc;</div><div class='add'>+	unsigned long dummy;</div><div class='ctx'> </div><div class='ctx'> 	struct rtas_suspend_me_data data;</div><div class='ctx'> </div><div class='add'>+	/* Make sure the state is valid */</div><div class='add'>+	rc = plpar_hcall(H_VASI_STATE,</div><div class='add'>+			 ((u64)args-&gt;args[0] &lt;&lt; 32) | args-&gt;args[1],</div><div class='add'>+			 0, 0, 0,</div><div class='add'>+			 &amp;state, &amp;dummy, &amp;dummy);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned %ld\n",rc);</div><div class='add'>+		return rc;</div><div class='add'>+	} else if (state == H_VASI_ENABLED) {</div><div class='add'>+		args-&gt;args[args-&gt;nargs] = RTAS_NOT_SUSPENDABLE;</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (state != H_VASI_SUSPENDING) {</div><div class='add'>+		printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned state %ld\n",</div><div class='add'>+		       state);</div><div class='add'>+		args-&gt;args[args-&gt;nargs] = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	data.waiting = 1;</div><div class='ctx'> 	data.args = args;</div><div class='ctx'> </div><div class='hunk'>@@ -784,13 +862,34 @@ void __init rtas_initialize(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __init early_init_dt_scan_rtas(unsigned long node,</div><div class='add'>+		const char *uname, int depth, void *data)</div><div class='add'>+{</div><div class='add'>+	u32 *basep, *entryp, *sizep;</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(rtas_token);</div><div class='del'>-EXPORT_SYMBOL(rtas_call);</div><div class='del'>-EXPORT_SYMBOL(rtas_data_buf);</div><div class='del'>-EXPORT_SYMBOL(rtas_data_buf_lock);</div><div class='del'>-EXPORT_SYMBOL(rtas_extended_busy_delay_time);</div><div class='del'>-EXPORT_SYMBOL(rtas_get_sensor);</div><div class='del'>-EXPORT_SYMBOL(rtas_get_power_level);</div><div class='del'>-EXPORT_SYMBOL(rtas_set_power_level);</div><div class='del'>-EXPORT_SYMBOL(rtas_set_indicator);</div><div class='add'>+	if (depth != 1 || strcmp(uname, "rtas") != 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	basep  = of_get_flat_dt_prop(node, "linux,rtas-base", NULL);</div><div class='add'>+	entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL);</div><div class='add'>+	sizep  = of_get_flat_dt_prop(node, "rtas-size", NULL);</div><div class='add'>+</div><div class='add'>+	if (basep &amp;&amp; entryp &amp;&amp; sizep) {</div><div class='add'>+		rtas.base = *basep;</div><div class='add'>+		rtas.entry = *entryp;</div><div class='add'>+		rtas.size = *sizep;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_UDBG_RTAS_CONSOLE</div><div class='add'>+	basep = of_get_flat_dt_prop(node, "put-term-char", NULL);</div><div class='add'>+	if (basep)</div><div class='add'>+		rtas_putchar_token = *basep;</div><div class='add'>+</div><div class='add'>+	basep = of_get_flat_dt_prop(node, "get-term-char", NULL);</div><div class='add'>+	if (basep)</div><div class='add'>+		rtas_getchar_token = *basep;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* break now */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c<br/>index aaf384c3f04a..1442b63a75da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas_flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/rtas_flash.c</a></div><div class='hunk'>@@ -365,20 +365,12 @@ static int rtas_excl_release(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static void manage_flash(struct rtas_manage_flash_t *args_buf)</div><div class='ctx'> {</div><div class='del'>-	unsigned int wait_time;</div><div class='ctx'> 	s32 rc;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='add'>+	do {</div><div class='ctx'> 		rc = rtas_call(rtas_token("ibm,manage-flash-image"), 1, </div><div class='ctx'> 			       1, NULL, args_buf-&gt;op);</div><div class='del'>-		if (rc == RTAS_RC_BUSY)</div><div class='del'>-			udelay(1);</div><div class='del'>-		else if (rtas_is_extended_busy(rc)) {</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(rc);</div><div class='del'>-			udelay(wait_time * 1000);</div><div class='del'>-		} else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	} while (rtas_busy_delay(rc));</div><div class='ctx'> </div><div class='ctx'> 	args_buf-&gt;status = rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -451,27 +443,18 @@ static ssize_t manage_flash_write(struct file *file, const char __user *buf,</div><div class='ctx'> static void validate_flash(struct rtas_validate_flash_t *args_buf)</div><div class='ctx'> {</div><div class='ctx'> 	int token = rtas_token("ibm,validate-flash-image");</div><div class='del'>-	unsigned int wait_time;</div><div class='ctx'> 	int update_results;</div><div class='ctx'> 	s32 rc;	</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='del'>-	while(1) {</div><div class='add'>+	do {</div><div class='ctx'> 		spin_lock(&amp;rtas_data_buf_lock);</div><div class='ctx'> 		memcpy(rtas_data_buf, args_buf-&gt;buf, VALIDATE_BUF_SIZE);</div><div class='ctx'> 		rc = rtas_call(token, 2, 2, &amp;update_results, </div><div class='ctx'> 			       (u32) __pa(rtas_data_buf), args_buf-&gt;buf_size);</div><div class='ctx'> 		memcpy(args_buf-&gt;buf, rtas_data_buf, VALIDATE_BUF_SIZE);</div><div class='ctx'> 		spin_unlock(&amp;rtas_data_buf_lock);</div><div class='del'>-			</div><div class='del'>-		if (rc == RTAS_RC_BUSY)</div><div class='del'>-			udelay(1);</div><div class='del'>-		else if (rtas_is_extended_busy(rc)) {</div><div class='del'>-			wait_time = rtas_extended_busy_delay_time(rc);</div><div class='del'>-			udelay(wait_time * 1000);</div><div class='del'>-		} else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	} while (rtas_busy_delay(rc));</div><div class='ctx'> </div><div class='ctx'> 	args_buf-&gt;status = rc;</div><div class='ctx'> 	args_buf-&gt;update_results = update_results;</div><div class='head'>diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c<br/>index 57b539a03fa9..cda022657324 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/rtas_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/rtas_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/rtas_pci.c</a></div><div class='hunk'>@@ -297,23 +297,15 @@ unsigned long __init find_and_init_phbs(void)</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> 	struct pci_controller *phb;</div><div class='ctx'> 	unsigned int index;</div><div class='del'>-	unsigned int root_size_cells = 0;</div><div class='del'>-	unsigned int *opprop = NULL;</div><div class='ctx'> 	struct device_node *root = of_find_node_by_path("/");</div><div class='ctx'> </div><div class='del'>-	if (ppc64_interrupt_controller == IC_OPEN_PIC) {</div><div class='del'>-		opprop = (unsigned int *)get_property(root,</div><div class='del'>-				"platform-open-pic", NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	root_size_cells = prom_n_size_cells(root);</div><div class='del'>-</div><div class='ctx'> 	index = 0;</div><div class='del'>-</div><div class='ctx'> 	for (node = of_get_next_child(root, NULL);</div><div class='ctx'> 	     node != NULL;</div><div class='ctx'> 	     node = of_get_next_child(root, node)) {</div><div class='del'>-		if (node-&gt;type == NULL || strcmp(node-&gt;type, "pci") != 0)</div><div class='add'>+</div><div class='add'>+		if (node-&gt;type == NULL || (strcmp(node-&gt;type, "pci") != 0 &amp;&amp;</div><div class='add'>+					   strcmp(node-&gt;type, "pciex") != 0))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		phb = pcibios_alloc_controller(node);</div><div class='hunk'>@@ -322,13 +314,6 @@ unsigned long __init find_and_init_phbs(void)</div><div class='ctx'> 		setup_phb(node, phb);</div><div class='ctx'> 		pci_process_bridge_OF_ranges(phb, node, 0);</div><div class='ctx'> 		pci_setup_phb_io(phb, index == 0);</div><div class='del'>-#ifdef CONFIG_PPC_PSERIES</div><div class='del'>-		/* XXX This code need serious fixing ... --BenH */</div><div class='del'>-		if (ppc64_interrupt_controller == IC_OPEN_PIC &amp;&amp; pSeries_mpic) {</div><div class='del'>-			int addr = root_size_cells * (index + 2) - 1;</div><div class='del'>-			mpic_assign_isu(pSeries_mpic, index, opprop[addr]);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='ctx'> 		index++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c<br/>index 684ab1d49c65..499c3861074f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup-common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/setup-common.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -27,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -443,6 +442,7 @@ void __init smp_setup_cpu_maps(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='add'>+int __initdata do_early_xmon;</div><div class='ctx'> #ifdef CONFIG_XMON</div><div class='ctx'> static int __init early_xmon(char *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -456,7 +456,7 @@ static int __init early_xmon(char *p)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	xmon_init(1);</div><div class='del'>-	debugger(NULL);</div><div class='add'>+	do_early_xmon = 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -524,3 +524,20 @@ int check_legacy_ioport(unsigned long base_port)</div><div class='ctx'> 	return ppc_md.check_legacy_ioport(base_port);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(check_legacy_ioport);</div><div class='add'>+</div><div class='add'>+static int ppc_panic_event(struct notifier_block *this,</div><div class='add'>+                             unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	ppc_md.panic(ptr);  /* May not return */</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block ppc_panic_block = {</div><div class='add'>+	.notifier_call = ppc_panic_event,</div><div class='add'>+	.priority = INT_MIN /* may not return; must be done last */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init setup_panic(void)</div><div class='add'>+{</div><div class='add'>+	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;ppc_panic_block);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h<br/>index 2ebba755272e..4c67ad7fae08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/setup.h</a></div><div class='hunk'>@@ -2,5 +2,8 @@</div><div class='ctx'> #define _POWERPC_KERNEL_SETUP_H</div><div class='ctx'> </div><div class='ctx'> void check_for_initrd(void);</div><div class='add'>+void do_init_bootmem(void);</div><div class='add'>+void setup_panic(void);</div><div class='add'>+extern int do_early_xmon;</div><div class='ctx'> </div><div class='ctx'> #endif /* _POWERPC_KERNEL_SETUP_H */</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c<br/>index 69ac25701344..e0df2ba1ab9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/setup_32.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Common prep/pmac/chrp boot and setup code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -52,7 +51,6 @@</div><div class='ctx'> </div><div class='ctx'> extern void bootx_init(unsigned long r4, unsigned long phys);</div><div class='ctx'> </div><div class='del'>-boot_infos_t *boot_infos;</div><div class='ctx'> struct ide_machdep_calls ppc_ide_md;</div><div class='ctx'> </div><div class='ctx'> int boot_cpuid;</div><div class='hunk'>@@ -131,12 +129,6 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys)</div><div class='ctx'> 	/* Do some early initialization based on the flat device tree */</div><div class='ctx'> 	early_init_devtree(__va(dt_ptr));</div><div class='ctx'> </div><div class='del'>-	/* Check default command line */</div><div class='del'>-#ifdef CONFIG_CMDLINE</div><div class='del'>-	if (cmd_line[0] == 0)</div><div class='del'>-		strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line));</div><div class='del'>-#endif /* CONFIG_CMDLINE */</div><div class='del'>-</div><div class='ctx'> 	probe_machine();</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_6xx</div><div class='hunk'>@@ -221,7 +213,7 @@ int __init ppc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* register CPU devices */</div><div class='ctx'> 	for_each_possible_cpu(i)</div><div class='del'>-		register_cpu(&amp;cpu_devices[i], i, NULL);</div><div class='add'>+		register_cpu(&amp;cpu_devices[i], i);</div><div class='ctx'> </div><div class='ctx'> 	/* call platform init */</div><div class='ctx'> 	if (ppc_md.init != NULL) {</div><div class='hunk'>@@ -235,7 +227,7 @@ arch_initcall(ppc_init);</div><div class='ctx'> /* Warning, IO base is not yet inited */</div><div class='ctx'> void __init setup_arch(char **cmdline_p)</div><div class='ctx'> {</div><div class='del'>-	extern void do_init_bootmem(void);</div><div class='add'>+	*cmdline_p = cmd_line;</div><div class='ctx'> </div><div class='ctx'> 	/* so udelay does something sensible, assume &lt;= 1000 bogomips */</div><div class='ctx'> 	loops_per_jiffy = 500000000 / HZ;</div><div class='hunk'>@@ -247,7 +239,6 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 		ppc_md.init_early();</div><div class='ctx'> </div><div class='ctx'> 	find_legacy_serial_ports();</div><div class='del'>-	finish_device_tree();</div><div class='ctx'> </div><div class='ctx'> 	smp_setup_cpu_maps();</div><div class='ctx'> </div><div class='hunk'>@@ -285,16 +276,16 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	/* reboot on panic */</div><div class='ctx'> 	panic_timeout = 180;</div><div class='ctx'> </div><div class='add'>+	if (ppc_md.panic)</div><div class='add'>+		setup_panic();</div><div class='add'>+</div><div class='ctx'> 	init_mm.start_code = PAGE_OFFSET;</div><div class='ctx'> 	init_mm.end_code = (unsigned long) _etext;</div><div class='ctx'> 	init_mm.end_data = (unsigned long) _edata;</div><div class='ctx'> 	init_mm.brk = klimit;</div><div class='ctx'> </div><div class='del'>-	/* Save unparsed command line copy for /proc/cmdline */</div><div class='del'>-	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);</div><div class='del'>-	*cmdline_p = cmd_line;</div><div class='del'>-</div><div class='del'>-	parse_early_param();</div><div class='add'>+	if (do_early_xmon)</div><div class='add'>+		debugger(NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* set up the bootmem stuff with available memory */</div><div class='ctx'> 	do_init_bootmem();</div><div class='head'>diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c<br/>index 4467c49903b6..fd1785e4c9bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/setup_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/setup_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/setup_64.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -100,12 +99,6 @@ unsigned long SYSRQ_KEY;</div><div class='ctx'> #endif /* CONFIG_MAGIC_SYSRQ */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int ppc64_panic_event(struct notifier_block *, unsigned long, void *);</div><div class='del'>-static struct notifier_block ppc64_panic_block = {</div><div class='del'>-	.notifier_call = ppc64_panic_event,</div><div class='del'>-	.priority = INT_MIN /* may not return; must be done last */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> static int smt_enabled_cmdline;</div><div class='hunk'>@@ -155,6 +148,13 @@ early_param("smt-enabled", early_smt_enabled);</div><div class='ctx'> #define check_smt_enabled()</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='add'>+/* Put the paca pointer into r13 and SPRG3 */</div><div class='add'>+void __init setup_paca(int cpu)</div><div class='add'>+{</div><div class='add'>+	local_paca = &amp;paca[cpu];</div><div class='add'>+	mtspr(SPRN_SPRG3, local_paca);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Early initialization entry point. This is called by head.S</div><div class='ctx'>  * with MMU translation disabled. We rely on the "feature" of</div><div class='hunk'>@@ -176,6 +176,9 @@ early_param("smt-enabled", early_smt_enabled);</div><div class='ctx'> </div><div class='ctx'> void __init early_setup(unsigned long dt_ptr)</div><div class='ctx'> {</div><div class='add'>+	/* Assume we're on cpu 0 for now. Don't write to the paca yet! */</div><div class='add'>+	setup_paca(0);</div><div class='add'>+</div><div class='ctx'> 	/* Enable early debugging if any specified (see udbg.h) */</div><div class='ctx'> 	udbg_early_init();</div><div class='ctx'> </div><div class='hunk'>@@ -189,7 +192,7 @@ void __init early_setup(unsigned long dt_ptr)</div><div class='ctx'> 	early_init_devtree(__va(dt_ptr));</div><div class='ctx'> </div><div class='ctx'> 	/* Now we know the logical id of our boot cpu, setup the paca. */</div><div class='del'>-	setup_boot_paca();</div><div class='add'>+	setup_paca(boot_cpuid);</div><div class='ctx'> </div><div class='ctx'> 	/* Fix up paca fields required for the boot cpu */</div><div class='ctx'> 	get_paca()-&gt;cpu_start = 1;</div><div class='hunk'>@@ -199,9 +202,7 @@ void __init early_setup(unsigned long dt_ptr)</div><div class='ctx'> 	/* Probe the machine type */</div><div class='ctx'> 	probe_machine();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CRASH_DUMP</div><div class='del'>-	kdump_setup();</div><div class='del'>-#endif</div><div class='add'>+	setup_kdump_trampoline();</div><div class='ctx'> </div><div class='ctx'> 	DBG("Found, Initializing memory management...\n");</div><div class='ctx'> </div><div class='hunk'>@@ -353,30 +354,22 @@ void __init setup_system(void)</div><div class='ctx'> {</div><div class='ctx'> 	DBG(" -&gt; setup_system()\n");</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	kdump_move_device_tree();</div><div class='del'>-#endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Unflatten the device-tree passed by prom_init or kexec</div><div class='ctx'> 	 */</div><div class='ctx'> 	unflatten_device_tree();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-	kexec_setup();	/* requires unflattened device tree. */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fill the ppc64_caches &amp; systemcfg structures with informations</div><div class='del'>-	 * retrieved from the device-tree. Need to be called before</div><div class='del'>-	 * finish_device_tree() since the later requires some of the</div><div class='del'>-	 * informations filled up here to properly parse the interrupt</div><div class='del'>-	 * tree.</div><div class='del'>-	 * It also sets up the cache line sizes which allows to call</div><div class='del'>-	 * routines like flush_icache_range (used by the hash init</div><div class='del'>-	 * later on).</div><div class='add'>+ 	 * retrieved from the device-tree.</div><div class='ctx'> 	 */</div><div class='ctx'> 	initialize_cache_info();</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Initialize irq remapping subsystem</div><div class='add'>+	 */</div><div class='add'>+	irq_early_init();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PPC_RTAS</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize RTAS if available</div><div class='hunk'>@@ -404,12 +397,6 @@ void __init setup_system(void)</div><div class='ctx'> 	find_legacy_serial_ports();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * "Finish" the device-tree, that is do the actual parsing of</div><div class='del'>-	 * some of the properties like the interrupt map</div><div class='del'>-	 */</div><div class='del'>-	finish_device_tree();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize xmon</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef CONFIG_XMON_DEFAULT</div><div class='hunk'>@@ -420,10 +407,8 @@ void __init setup_system(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	register_early_udbg_console();</div><div class='ctx'> </div><div class='del'>-	/* Save unparsed command line copy for /proc/cmdline */</div><div class='del'>-	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);</div><div class='del'>-</div><div class='del'>-	parse_early_param();</div><div class='add'>+	if (do_early_xmon)</div><div class='add'>+		debugger(NULL);</div><div class='ctx'> </div><div class='ctx'> 	check_smt_enabled();</div><div class='ctx'> 	smp_setup_cpu_maps();</div><div class='hunk'>@@ -439,8 +424,6 @@ void __init setup_system(void)</div><div class='ctx'> </div><div class='ctx'> 	printk("-----------------------------------------------------\n");</div><div class='ctx'> 	printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);</div><div class='del'>-	printk("ppc64_interrupt_controller    = 0x%ld\n",</div><div class='del'>-	       ppc64_interrupt_controller);</div><div class='ctx'> 	printk("physicalMemorySize            = 0x%lx\n", lmb_phys_mem_size());</div><div class='ctx'> 	printk("ppc64_caches.dcache_line_size = 0x%x\n",</div><div class='ctx'> 	       ppc64_caches.dline_size);</div><div class='hunk'>@@ -456,13 +439,6 @@ void __init setup_system(void)</div><div class='ctx'> 	DBG(" &lt;- setup_system()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ppc64_panic_event(struct notifier_block *this,</div><div class='del'>-                             unsigned long event, void *ptr)</div><div class='del'>-{</div><div class='del'>-	ppc_md.panic((char *)ptr);  /* May not return */</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IRQSTACKS</div><div class='ctx'> static void __init irqstack_early_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -517,8 +493,6 @@ static void __init emergency_stack_init(void)</div><div class='ctx'>  */</div><div class='ctx'> void __init setup_arch(char **cmdline_p)</div><div class='ctx'> {</div><div class='del'>-	extern void do_init_bootmem(void);</div><div class='del'>-</div><div class='ctx'> 	ppc64_boot_msg(0x12, "Setup Arch");</div><div class='ctx'> </div><div class='ctx'> 	*cmdline_p = cmd_line;</div><div class='hunk'>@@ -535,8 +509,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	panic_timeout = 180;</div><div class='ctx'> </div><div class='ctx'> 	if (ppc_md.panic)</div><div class='del'>-		atomic_notifier_chain_register(&amp;panic_notifier_list,</div><div class='del'>-				&amp;ppc64_panic_block);</div><div class='add'>+		setup_panic();</div><div class='ctx'> </div><div class='ctx'> 	init_mm.start_code = PAGE_OFFSET;</div><div class='ctx'> 	init_mm.end_code = (unsigned long) _etext;</div><div class='head'>diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c<br/>index 01e3c08cb550..320353f0926f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/signal_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/signal_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/signal_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/signal_32.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -419,9 +418,7 @@ static long restore_user_regs(struct pt_regs *regs,</div><div class='ctx'> {</div><div class='ctx'> 	long err;</div><div class='ctx'> 	unsigned int save_r2 = 0;</div><div class='del'>-#if defined(CONFIG_ALTIVEC) || defined(CONFIG_SPE)</div><div class='ctx'> 	unsigned long msr;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * restore general registers but not including MSR or SOFTE. Also</div><div class='hunk'>@@ -430,11 +427,16 @@ static long restore_user_regs(struct pt_regs *regs,</div><div class='ctx'> 	if (!sig)</div><div class='ctx'> 		save_r2 = (unsigned int)regs-&gt;gpr[2];</div><div class='ctx'> 	err = restore_general_regs(regs, sr);</div><div class='add'>+	err |= __get_user(msr, &amp;sr-&gt;mc_gregs[PT_MSR]);</div><div class='ctx'> 	if (!sig)</div><div class='ctx'> 		regs-&gt;gpr[2] = (unsigned long) save_r2;</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	/* if doing signal return, restore the previous little-endian mode */</div><div class='add'>+	if (sig)</div><div class='add'>+		regs-&gt;msr = (regs-&gt;msr &amp; ~MSR_LE) | (msr &amp; MSR_LE);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Do this before updating the thread state in</div><div class='ctx'> 	 * current-&gt;thread.fpr/vr/evr.  That way, if we get preempted</div><div class='hunk'>@@ -455,7 +457,7 @@ static long restore_user_regs(struct pt_regs *regs,</div><div class='ctx'> 	/* force the process to reload the altivec registers from</div><div class='ctx'> 	   current-&gt;thread when it next does altivec instructions */</div><div class='ctx'> 	regs-&gt;msr &amp;= ~MSR_VEC;</div><div class='del'>-	if (!__get_user(msr, &amp;sr-&gt;mc_gregs[PT_MSR]) &amp;&amp; (msr &amp; MSR_VEC) != 0) {</div><div class='add'>+	if (msr &amp; MSR_VEC) {</div><div class='ctx'> 		/* restore altivec registers from the stack */</div><div class='ctx'> 		if (__copy_from_user(current-&gt;thread.vr, &amp;sr-&gt;mc_vregs,</div><div class='ctx'> 				     sizeof(sr-&gt;mc_vregs)))</div><div class='hunk'>@@ -472,7 +474,7 @@ static long restore_user_regs(struct pt_regs *regs,</div><div class='ctx'> 	/* force the process to reload the spe registers from</div><div class='ctx'> 	   current-&gt;thread when it next does spe instructions */</div><div class='ctx'> 	regs-&gt;msr &amp;= ~MSR_SPE;</div><div class='del'>-	if (!__get_user(msr, &amp;sr-&gt;mc_gregs[PT_MSR]) &amp;&amp; (msr &amp; MSR_SPE) != 0) {</div><div class='add'>+	if (msr &amp; MSR_SPE) {</div><div class='ctx'> 		/* restore spe registers from the stack */</div><div class='ctx'> 		if (__copy_from_user(current-&gt;thread.evr, &amp;sr-&gt;mc_vregs,</div><div class='ctx'> 				     ELF_NEVRREG * sizeof(u32)))</div><div class='hunk'>@@ -757,10 +759,10 @@ static int handle_rt_signal(unsigned long sig, struct k_sigaction *ka,</div><div class='ctx'> </div><div class='ctx'> 	/* Save user registers on the stack */</div><div class='ctx'> 	frame = &amp;rt_sf-&gt;uc.uc_mcontext;</div><div class='del'>-	if (vdso32_rt_sigtramp &amp;&amp; current-&gt;thread.vdso_base) {</div><div class='add'>+	if (vdso32_rt_sigtramp &amp;&amp; current-&gt;mm-&gt;context.vdso_base) {</div><div class='ctx'> 		if (save_user_regs(regs, frame, 0))</div><div class='ctx'> 			goto badframe;</div><div class='del'>-		regs-&gt;link = current-&gt;thread.vdso_base + vdso32_rt_sigtramp;</div><div class='add'>+		regs-&gt;link = current-&gt;mm-&gt;context.vdso_base + vdso32_rt_sigtramp;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (save_user_regs(regs, frame, __NR_rt_sigreturn))</div><div class='ctx'> 			goto badframe;</div><div class='hunk'>@@ -777,6 +779,8 @@ static int handle_rt_signal(unsigned long sig, struct k_sigaction *ka,</div><div class='ctx'> 	regs-&gt;gpr[5] = (unsigned long) &amp;rt_sf-&gt;uc;</div><div class='ctx'> 	regs-&gt;gpr[6] = (unsigned long) rt_sf;</div><div class='ctx'> 	regs-&gt;nip = (unsigned long) ka-&gt;sa.sa_handler;</div><div class='add'>+	/* enter the signal handler in big-endian mode */</div><div class='add'>+	regs-&gt;msr &amp;= ~MSR_LE;</div><div class='ctx'> 	regs-&gt;trap = 0;</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -803,10 +807,13 @@ static int do_setcontext(struct ucontext __user *ucp, struct pt_regs *regs, int</div><div class='ctx'> 		if (__get_user(cmcp, &amp;ucp-&gt;uc_regs))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		mcp = (struct mcontext __user *)(u64)cmcp;</div><div class='add'>+		/* no need to check access_ok(mcp), since mcp &lt; 4GB */</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	if (__get_user(mcp, &amp;ucp-&gt;uc_regs))</div><div class='ctx'> 		return -EFAULT;</div><div class='add'>+	if (!access_ok(VERIFY_READ, mcp, sizeof(*mcp)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> #endif</div><div class='ctx'> 	restore_sigmask(&amp;set);</div><div class='ctx'> 	if (restore_user_regs(regs, mcp, sig))</div><div class='hunk'>@@ -908,13 +915,14 @@ int sys_debug_setcontext(struct ucontext __user *ctx,</div><div class='ctx'> {</div><div class='ctx'> 	struct sig_dbg_op op;</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned char tmp;</div><div class='ctx'> 	unsigned long new_msr = regs-&gt;msr;</div><div class='ctx'> #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)</div><div class='ctx'> 	unsigned long new_dbcr0 = current-&gt;thread.dbcr0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt;ndbg; i++) {</div><div class='del'>-		if (__copy_from_user(&amp;op, dbg, sizeof(op)))</div><div class='add'>+		if (copy_from_user(&amp;op, dbg + i, sizeof(op)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		switch (op.dbg_type) {</div><div class='ctx'> 		case SIG_DBG_SINGLE_STEPPING:</div><div class='hunk'>@@ -959,6 +967,11 @@ int sys_debug_setcontext(struct ucontext __user *ctx,</div><div class='ctx'> 	current-&gt;thread.dbcr0 = new_dbcr0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (!access_ok(VERIFY_READ, ctx, sizeof(*ctx))</div><div class='add'>+	    || __get_user(tmp, (u8 __user *) ctx)</div><div class='add'>+	    || __get_user(tmp, (u8 __user *) (ctx + 1) - 1))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we get a fault copying the context into the kernel's</div><div class='ctx'> 	 * image of the user's registers, we can't just return -EFAULT</div><div class='hunk'>@@ -1029,10 +1042,10 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,</div><div class='ctx'> 	    || __put_user(sig, &amp;sc-&gt;signal))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='del'>-	if (vdso32_sigtramp &amp;&amp; current-&gt;thread.vdso_base) {</div><div class='add'>+	if (vdso32_sigtramp &amp;&amp; current-&gt;mm-&gt;context.vdso_base) {</div><div class='ctx'> 		if (save_user_regs(regs, &amp;frame-&gt;mctx, 0))</div><div class='ctx'> 			goto badframe;</div><div class='del'>-		regs-&gt;link = current-&gt;thread.vdso_base + vdso32_sigtramp;</div><div class='add'>+		regs-&gt;link = current-&gt;mm-&gt;context.vdso_base + vdso32_sigtramp;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (save_user_regs(regs, &amp;frame-&gt;mctx, __NR_sigreturn))</div><div class='ctx'> 			goto badframe;</div><div class='hunk'>@@ -1047,6 +1060,8 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,</div><div class='ctx'> 	regs-&gt;gpr[3] = sig;</div><div class='ctx'> 	regs-&gt;gpr[4] = (unsigned long) sc;</div><div class='ctx'> 	regs-&gt;nip = (unsigned long) ka-&gt;sa.sa_handler;</div><div class='add'>+	/* enter the signal handler in big-endian mode */</div><div class='add'>+	regs-&gt;msr &amp;= ~MSR_LE;</div><div class='ctx'> 	regs-&gt;trap = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c<br/>index 27f65b95184d..f72e8e823d78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/signal_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/signal_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/signal_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/signal_64.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -141,9 +140,7 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,</div><div class='ctx'> 	unsigned long err = 0;</div><div class='ctx'> 	unsigned long save_r13 = 0;</div><div class='ctx'> 	elf_greg_t *gregs = (elf_greg_t *)regs;</div><div class='del'>-#ifdef CONFIG_ALTIVEC</div><div class='ctx'> 	unsigned long msr;</div><div class='del'>-#endif</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* If this is not a signal return, we preserve the TLS in r13 */</div><div class='hunk'>@@ -154,7 +151,12 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,</div><div class='ctx'> 	err |= __copy_from_user(regs, &amp;sc-&gt;gp_regs,</div><div class='ctx'> 				PT_MSR*sizeof(unsigned long));</div><div class='ctx'> </div><div class='del'>-	/* skip MSR and SOFTE */</div><div class='add'>+	/* get MSR separately, transfer the LE bit if doing signal return */</div><div class='add'>+	err |= __get_user(msr, &amp;sc-&gt;gp_regs[PT_MSR]);</div><div class='add'>+	if (sig)</div><div class='add'>+		regs-&gt;msr = (regs-&gt;msr &amp; ~MSR_LE) | (msr &amp; MSR_LE);</div><div class='add'>+</div><div class='add'>+	/* skip SOFTE */</div><div class='ctx'> 	for (i = PT_MSR+1; i &lt;= PT_RESULT; i++) {</div><div class='ctx'> 		if (i == PT_SOFTE)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -179,9 +181,10 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ALTIVEC</div><div class='ctx'> 	err |= __get_user(v_regs, &amp;sc-&gt;v_regs);</div><div class='del'>-	err |= __get_user(msr, &amp;sc-&gt;gp_regs[PT_MSR]);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='add'>+	if (v_regs &amp;&amp; !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	/* Copy 33 vec registers (vr0..31 and vscr) from the stack */</div><div class='ctx'> 	if (v_regs != 0 &amp;&amp; (msr &amp; MSR_VEC) != 0)</div><div class='ctx'> 		err |= __copy_from_user(current-&gt;thread.vr, v_regs,</div><div class='hunk'>@@ -394,8 +397,8 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 	current-&gt;thread.fpscr.val = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up to return from userspace. */</div><div class='del'>-	if (vdso64_rt_sigtramp &amp;&amp; current-&gt;thread.vdso_base) {</div><div class='del'>-		regs-&gt;link = current-&gt;thread.vdso_base + vdso64_rt_sigtramp;</div><div class='add'>+	if (vdso64_rt_sigtramp &amp;&amp; current-&gt;mm-&gt;context.vdso_base) {</div><div class='add'>+		regs-&gt;link = current-&gt;mm-&gt;context.vdso_base + vdso64_rt_sigtramp;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err |= setup_trampoline(__NR_rt_sigreturn, &amp;frame-&gt;tramp[0]);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -410,6 +413,8 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> </div><div class='ctx'> 	/* Set up "regs" so we "return" to the signal handler. */</div><div class='ctx'> 	err |= get_user(regs-&gt;nip, &amp;funct_desc_ptr-&gt;entry);</div><div class='add'>+	/* enter the signal handler in big-endian mode */</div><div class='add'>+	regs-&gt;msr &amp;= ~MSR_LE;</div><div class='ctx'> 	regs-&gt;gpr[1] = newsp;</div><div class='ctx'> 	err |= get_user(regs-&gt;gpr[2], &amp;funct_desc_ptr-&gt;toc);</div><div class='ctx'> 	regs-&gt;gpr[3] = signr;</div><div class='head'>diff --git a/arch/powerpc/kernel/smp-tbsync.c b/arch/powerpc/kernel/smp-tbsync.c<br/>index 9adef3bddad4..f19e2e0e61e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/smp-tbsync.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/smp-tbsync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/smp-tbsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/smp-tbsync.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c<br/>index 530f7dba0bd2..46c56cfd1b2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/smp.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -492,7 +491,7 @@ int __devinit __cpu_up(unsigned int cpu)</div><div class='ctx'> 	 * -- Cort</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (system_state &lt; SYSTEM_RUNNING)</div><div class='del'>-		for (c = 5000; c &amp;&amp; !cpu_callin_map[cpu]; c--)</div><div class='add'>+		for (c = 50000; c &amp;&amp; !cpu_callin_map[cpu]; c--)</div><div class='ctx'> 			udelay(100);</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	else</div><div class='head'>diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S<br/>index 69773cc1a85f..7369f9a6ad25 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/swsusp_32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/swsusp_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/swsusp_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/swsusp_32.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c<br/>index ec274e688816..2e292863e982 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sys_ppc32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/sys_ppc32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sys_ppc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/sys_ppc32.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt; </div><div class='head'>diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c<br/>index 5bc2585c8036..010435095550 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/sysfs.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -279,7 +278,7 @@ static void unregister_cpu_online(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='del'>-static int sysfs_cpu_notify(struct notifier_block *self,</div><div class='add'>+static int __devinit sysfs_cpu_notify(struct notifier_block *self,</div><div class='ctx'> 				      unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned int)(long)hcpu;</div><div class='hunk'>@@ -297,30 +296,19 @@ static int sysfs_cpu_notify(struct notifier_block *self,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block sysfs_cpu_nb = {</div><div class='add'>+static struct notifier_block __devinitdata sysfs_cpu_nb = {</div><div class='ctx'> 	.notifier_call	= sysfs_cpu_notify,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* NUMA stuff */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-static struct node node_devices[MAX_NUMNODES];</div><div class='del'>-</div><div class='ctx'> static void register_nodes(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NUMNODES; i++) {</div><div class='del'>-		if (node_online(i)) {</div><div class='del'>-			int p_node = parent_node(i);</div><div class='del'>-			struct node *parent = NULL;</div><div class='del'>-</div><div class='del'>-			if (p_node != i)</div><div class='del'>-				parent = &amp;node_devices[p_node];</div><div class='del'>-</div><div class='del'>-			register_node(&amp;node_devices[i], i, parent);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; MAX_NUMNODES; i++)</div><div class='add'>+		register_one_node(i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sysfs_add_device_to_node(struct sys_device *dev, int nid)</div><div class='hunk'>@@ -359,23 +347,13 @@ static SYSDEV_ATTR(physical_id, 0444, show_physical_id, NULL);</div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu;</div><div class='del'>-	struct node *parent = NULL;</div><div class='ctx'> </div><div class='ctx'> 	register_nodes();</div><div class='del'>-</div><div class='ctx'> 	register_cpu_notifier(&amp;sysfs_cpu_nb);</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		struct cpu *c = &amp;per_cpu(cpu_devices, cpu);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NUMA</div><div class='del'>-		/* The node to which a cpu belongs can't be known</div><div class='del'>-		 * until the cpu is made present.</div><div class='del'>-		 */</div><div class='del'>-		parent = NULL;</div><div class='del'>-		if (cpu_present(cpu))</div><div class='del'>-			parent = &amp;node_devices[cpu_to_node(cpu)];</div><div class='del'>-#endif</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For now, we just see if the system supports making</div><div class='ctx'> 		 * the RTAS calls for CPU hotplug.  But, there may be a</div><div class='hunk'>@@ -387,7 +365,7 @@ static int __init topology_init(void)</div><div class='ctx'> 			c-&gt;no_control = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (cpu_online(cpu) || (c-&gt;no_control == 0)) {</div><div class='del'>-			register_cpu(c, cpu, parent);</div><div class='add'>+			register_cpu(c, cpu);</div><div class='ctx'> </div><div class='ctx'> 			sysdev_create_file(&amp;c-&gt;sysdev, &amp;attr_physical_id);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S<br/>index 26ed1f5ef16e..579de70e0b4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/systbl.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/systbl.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/systbl.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/systbl.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -32,6 +31,10 @@</div><div class='ctx'> #define SYS32ONLY(func)		.long	sys_##func</div><div class='ctx'> #define SYSX(f, f3264, f32)	.long	f32</div><div class='ctx'> #endif</div><div class='add'>+#define SYSCALL_SPU(func)	SYSCALL(func)</div><div class='add'>+#define COMPAT_SYS_SPU(func)	COMPAT_SYS(func)</div><div class='add'>+#define PPC_SYS_SPU(func)	PPC_SYS(func)</div><div class='add'>+#define SYSX_SPU(f, f3264, f32)	SYSX(f, f3264, f32)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> #define sys_sigpending	sys_ni_syscall</div><div class='hunk'>@@ -39,309 +42,4 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> _GLOBAL(sys_call_table)</div><div class='del'>-SYSCALL(restart_syscall)</div><div class='del'>-SYSCALL(exit)</div><div class='del'>-PPC_SYS(fork)</div><div class='del'>-SYSCALL(read)</div><div class='del'>-SYSCALL(write)</div><div class='del'>-COMPAT_SYS(open)</div><div class='del'>-SYSCALL(close)</div><div class='del'>-COMPAT_SYS(waitpid)</div><div class='del'>-COMPAT_SYS(creat)</div><div class='del'>-SYSCALL(link)</div><div class='del'>-SYSCALL(unlink)</div><div class='del'>-COMPAT_SYS(execve)</div><div class='del'>-SYSCALL(chdir)</div><div class='del'>-COMPAT_SYS(time)</div><div class='del'>-SYSCALL(mknod)</div><div class='del'>-SYSCALL(chmod)</div><div class='del'>-SYSCALL(lchown)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-OLDSYS(stat)</div><div class='del'>-SYSX(sys_lseek,ppc32_lseek,sys_lseek)</div><div class='del'>-SYSCALL(getpid)</div><div class='del'>-COMPAT_SYS(mount)</div><div class='del'>-SYSX(sys_ni_syscall,sys_oldumount,sys_oldumount)</div><div class='del'>-SYSCALL(setuid)</div><div class='del'>-SYSCALL(getuid)</div><div class='del'>-COMPAT_SYS(stime)</div><div class='del'>-COMPAT_SYS(ptrace)</div><div class='del'>-SYSCALL(alarm)</div><div class='del'>-OLDSYS(fstat)</div><div class='del'>-COMPAT_SYS(pause)</div><div class='del'>-COMPAT_SYS(utime)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(access)</div><div class='del'>-COMPAT_SYS(nice)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(sync)</div><div class='del'>-COMPAT_SYS(kill)</div><div class='del'>-SYSCALL(rename)</div><div class='del'>-COMPAT_SYS(mkdir)</div><div class='del'>-SYSCALL(rmdir)</div><div class='del'>-SYSCALL(dup)</div><div class='del'>-SYSCALL(pipe)</div><div class='del'>-COMPAT_SYS(times)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(brk)</div><div class='del'>-SYSCALL(setgid)</div><div class='del'>-SYSCALL(getgid)</div><div class='del'>-SYSCALL(signal)</div><div class='del'>-SYSCALL(geteuid)</div><div class='del'>-SYSCALL(getegid)</div><div class='del'>-SYSCALL(acct)</div><div class='del'>-SYSCALL(umount)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(ioctl)</div><div class='del'>-COMPAT_SYS(fcntl)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(setpgid)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSX(sys_ni_syscall,sys_olduname, sys_olduname)</div><div class='del'>-COMPAT_SYS(umask)</div><div class='del'>-SYSCALL(chroot)</div><div class='del'>-SYSCALL(ustat)</div><div class='del'>-SYSCALL(dup2)</div><div class='del'>-SYSCALL(getppid)</div><div class='del'>-SYSCALL(getpgrp)</div><div class='del'>-SYSCALL(setsid)</div><div class='del'>-SYS32ONLY(sigaction)</div><div class='del'>-SYSCALL(sgetmask)</div><div class='del'>-COMPAT_SYS(ssetmask)</div><div class='del'>-SYSCALL(setreuid)</div><div class='del'>-SYSCALL(setregid)</div><div class='del'>-SYS32ONLY(sigsuspend)</div><div class='del'>-COMPAT_SYS(sigpending)</div><div class='del'>-COMPAT_SYS(sethostname)</div><div class='del'>-COMPAT_SYS(setrlimit)</div><div class='del'>-COMPAT_SYS(old_getrlimit)</div><div class='del'>-COMPAT_SYS(getrusage)</div><div class='del'>-COMPAT_SYS(gettimeofday)</div><div class='del'>-COMPAT_SYS(settimeofday)</div><div class='del'>-COMPAT_SYS(getgroups)</div><div class='del'>-COMPAT_SYS(setgroups)</div><div class='del'>-SYSX(sys_ni_syscall,sys_ni_syscall,ppc_select)</div><div class='del'>-SYSCALL(symlink)</div><div class='del'>-OLDSYS(lstat)</div><div class='del'>-COMPAT_SYS(readlink)</div><div class='del'>-SYSCALL(uselib)</div><div class='del'>-SYSCALL(swapon)</div><div class='del'>-SYSCALL(reboot)</div><div class='del'>-SYSX(sys_ni_syscall,old32_readdir,old_readdir)</div><div class='del'>-SYSCALL(mmap)</div><div class='del'>-SYSCALL(munmap)</div><div class='del'>-SYSCALL(truncate)</div><div class='del'>-SYSCALL(ftruncate)</div><div class='del'>-SYSCALL(fchmod)</div><div class='del'>-SYSCALL(fchown)</div><div class='del'>-COMPAT_SYS(getpriority)</div><div class='del'>-COMPAT_SYS(setpriority)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(statfs)</div><div class='del'>-COMPAT_SYS(fstatfs)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(socketcall)</div><div class='del'>-COMPAT_SYS(syslog)</div><div class='del'>-COMPAT_SYS(setitimer)</div><div class='del'>-COMPAT_SYS(getitimer)</div><div class='del'>-COMPAT_SYS(newstat)</div><div class='del'>-COMPAT_SYS(newlstat)</div><div class='del'>-COMPAT_SYS(newfstat)</div><div class='del'>-SYSX(sys_ni_syscall,sys_uname,sys_uname)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(vhangup)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(wait4)</div><div class='del'>-SYSCALL(swapoff)</div><div class='del'>-COMPAT_SYS(sysinfo)</div><div class='del'>-COMPAT_SYS(ipc)</div><div class='del'>-SYSCALL(fsync)</div><div class='del'>-SYS32ONLY(sigreturn)</div><div class='del'>-PPC_SYS(clone)</div><div class='del'>-COMPAT_SYS(setdomainname)</div><div class='del'>-PPC_SYS(newuname)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(adjtimex)</div><div class='del'>-SYSCALL(mprotect)</div><div class='del'>-SYSX(sys_ni_syscall,compat_sys_sigprocmask,sys_sigprocmask)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(init_module)</div><div class='del'>-SYSCALL(delete_module)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(quotactl)</div><div class='del'>-COMPAT_SYS(getpgid)</div><div class='del'>-SYSCALL(fchdir)</div><div class='del'>-SYSCALL(bdflush)</div><div class='del'>-COMPAT_SYS(sysfs)</div><div class='del'>-SYSX(ppc64_personality,ppc64_personality,sys_personality)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(setfsuid)</div><div class='del'>-SYSCALL(setfsgid)</div><div class='del'>-SYSCALL(llseek)</div><div class='del'>-COMPAT_SYS(getdents)</div><div class='del'>-SYSX(sys_select,ppc32_select,ppc_select)</div><div class='del'>-SYSCALL(flock)</div><div class='del'>-SYSCALL(msync)</div><div class='del'>-COMPAT_SYS(readv)</div><div class='del'>-COMPAT_SYS(writev)</div><div class='del'>-COMPAT_SYS(getsid)</div><div class='del'>-SYSCALL(fdatasync)</div><div class='del'>-COMPAT_SYS(sysctl)</div><div class='del'>-SYSCALL(mlock)</div><div class='del'>-SYSCALL(munlock)</div><div class='del'>-SYSCALL(mlockall)</div><div class='del'>-SYSCALL(munlockall)</div><div class='del'>-COMPAT_SYS(sched_setparam)</div><div class='del'>-COMPAT_SYS(sched_getparam)</div><div class='del'>-COMPAT_SYS(sched_setscheduler)</div><div class='del'>-COMPAT_SYS(sched_getscheduler)</div><div class='del'>-SYSCALL(sched_yield)</div><div class='del'>-COMPAT_SYS(sched_get_priority_max)</div><div class='del'>-COMPAT_SYS(sched_get_priority_min)</div><div class='del'>-COMPAT_SYS(sched_rr_get_interval)</div><div class='del'>-COMPAT_SYS(nanosleep)</div><div class='del'>-SYSCALL(mremap)</div><div class='del'>-SYSCALL(setresuid)</div><div class='del'>-SYSCALL(getresuid)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(poll)</div><div class='del'>-COMPAT_SYS(nfsservctl)</div><div class='del'>-SYSCALL(setresgid)</div><div class='del'>-SYSCALL(getresgid)</div><div class='del'>-COMPAT_SYS(prctl)</div><div class='del'>-COMPAT_SYS(rt_sigreturn)</div><div class='del'>-COMPAT_SYS(rt_sigaction)</div><div class='del'>-COMPAT_SYS(rt_sigprocmask)</div><div class='del'>-COMPAT_SYS(rt_sigpending)</div><div class='del'>-COMPAT_SYS(rt_sigtimedwait)</div><div class='del'>-COMPAT_SYS(rt_sigqueueinfo)</div><div class='del'>-COMPAT_SYS(rt_sigsuspend)</div><div class='del'>-COMPAT_SYS(pread64)</div><div class='del'>-COMPAT_SYS(pwrite64)</div><div class='del'>-SYSCALL(chown)</div><div class='del'>-SYSCALL(getcwd)</div><div class='del'>-SYSCALL(capget)</div><div class='del'>-SYSCALL(capset)</div><div class='del'>-COMPAT_SYS(sigaltstack)</div><div class='del'>-SYSX(sys_sendfile64,compat_sys_sendfile,sys_sendfile)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-PPC_SYS(vfork)</div><div class='del'>-COMPAT_SYS(getrlimit)</div><div class='del'>-COMPAT_SYS(readahead)</div><div class='del'>-SYS32ONLY(mmap2)</div><div class='del'>-SYS32ONLY(truncate64)</div><div class='del'>-SYS32ONLY(ftruncate64)</div><div class='del'>-SYSX(sys_ni_syscall,sys_stat64,sys_stat64)</div><div class='del'>-SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64)</div><div class='del'>-SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64)</div><div class='del'>-SYSCALL(pciconfig_read)</div><div class='del'>-SYSCALL(pciconfig_write)</div><div class='del'>-SYSCALL(pciconfig_iobase)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(getdents64)</div><div class='del'>-SYSCALL(pivot_root)</div><div class='del'>-SYSX(sys_ni_syscall,compat_sys_fcntl64,sys_fcntl64)</div><div class='del'>-SYSCALL(madvise)</div><div class='del'>-SYSCALL(mincore)</div><div class='del'>-SYSCALL(gettid)</div><div class='del'>-SYSCALL(tkill)</div><div class='del'>-SYSCALL(setxattr)</div><div class='del'>-SYSCALL(lsetxattr)</div><div class='del'>-SYSCALL(fsetxattr)</div><div class='del'>-SYSCALL(getxattr)</div><div class='del'>-SYSCALL(lgetxattr)</div><div class='del'>-SYSCALL(fgetxattr)</div><div class='del'>-SYSCALL(listxattr)</div><div class='del'>-SYSCALL(llistxattr)</div><div class='del'>-SYSCALL(flistxattr)</div><div class='del'>-SYSCALL(removexattr)</div><div class='del'>-SYSCALL(lremovexattr)</div><div class='del'>-SYSCALL(fremovexattr)</div><div class='del'>-COMPAT_SYS(futex)</div><div class='del'>-COMPAT_SYS(sched_setaffinity)</div><div class='del'>-COMPAT_SYS(sched_getaffinity)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYS32ONLY(sendfile64)</div><div class='del'>-COMPAT_SYS(io_setup)</div><div class='del'>-SYSCALL(io_destroy)</div><div class='del'>-COMPAT_SYS(io_getevents)</div><div class='del'>-COMPAT_SYS(io_submit)</div><div class='del'>-SYSCALL(io_cancel)</div><div class='del'>-SYSCALL(set_tid_address)</div><div class='del'>-SYSX(sys_fadvise64,ppc32_fadvise64,sys_fadvise64)</div><div class='del'>-SYSCALL(exit_group)</div><div class='del'>-SYSX(sys_lookup_dcookie,ppc32_lookup_dcookie,sys_lookup_dcookie)</div><div class='del'>-SYSCALL(epoll_create)</div><div class='del'>-SYSCALL(epoll_ctl)</div><div class='del'>-SYSCALL(epoll_wait)</div><div class='del'>-SYSCALL(remap_file_pages)</div><div class='del'>-SYSX(sys_timer_create,compat_sys_timer_create,sys_timer_create)</div><div class='del'>-COMPAT_SYS(timer_settime)</div><div class='del'>-COMPAT_SYS(timer_gettime)</div><div class='del'>-SYSCALL(timer_getoverrun)</div><div class='del'>-SYSCALL(timer_delete)</div><div class='del'>-COMPAT_SYS(clock_settime)</div><div class='del'>-COMPAT_SYS(clock_gettime)</div><div class='del'>-COMPAT_SYS(clock_getres)</div><div class='del'>-COMPAT_SYS(clock_nanosleep)</div><div class='del'>-SYSX(ppc64_swapcontext,ppc32_swapcontext,ppc_swapcontext)</div><div class='del'>-COMPAT_SYS(tgkill)</div><div class='del'>-COMPAT_SYS(utimes)</div><div class='del'>-COMPAT_SYS(statfs64)</div><div class='del'>-COMPAT_SYS(fstatfs64)</div><div class='del'>-SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)</div><div class='del'>-PPC_SYS(rtas)</div><div class='del'>-OLDSYS(debug_setcontext)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-SYSCALL(ni_syscall)</div><div class='del'>-COMPAT_SYS(mbind)</div><div class='del'>-COMPAT_SYS(get_mempolicy)</div><div class='del'>-COMPAT_SYS(set_mempolicy)</div><div class='del'>-COMPAT_SYS(mq_open)</div><div class='del'>-SYSCALL(mq_unlink)</div><div class='del'>-COMPAT_SYS(mq_timedsend)</div><div class='del'>-COMPAT_SYS(mq_timedreceive)</div><div class='del'>-COMPAT_SYS(mq_notify)</div><div class='del'>-COMPAT_SYS(mq_getsetattr)</div><div class='del'>-COMPAT_SYS(kexec_load)</div><div class='del'>-COMPAT_SYS(add_key)</div><div class='del'>-COMPAT_SYS(request_key)</div><div class='del'>-COMPAT_SYS(keyctl)</div><div class='del'>-COMPAT_SYS(waitid)</div><div class='del'>-COMPAT_SYS(ioprio_set)</div><div class='del'>-COMPAT_SYS(ioprio_get)</div><div class='del'>-SYSCALL(inotify_init)</div><div class='del'>-SYSCALL(inotify_add_watch)</div><div class='del'>-SYSCALL(inotify_rm_watch)</div><div class='del'>-SYSCALL(spu_run)</div><div class='del'>-SYSCALL(spu_create)</div><div class='del'>-COMPAT_SYS(pselect6)</div><div class='del'>-COMPAT_SYS(ppoll)</div><div class='del'>-SYSCALL(unshare)</div><div class='del'>-SYSCALL(splice)</div><div class='del'>-SYSCALL(tee)</div><div class='del'>-SYSCALL(vmsplice)</div><div class='del'>-COMPAT_SYS(openat)</div><div class='del'>-SYSCALL(mkdirat)</div><div class='del'>-SYSCALL(mknodat)</div><div class='del'>-SYSCALL(fchownat)</div><div class='del'>-COMPAT_SYS(futimesat)</div><div class='del'>-SYSX(sys_newfstatat, sys_fstatat64, sys_fstatat64)</div><div class='del'>-SYSCALL(unlinkat)</div><div class='del'>-SYSCALL(renameat)</div><div class='del'>-SYSCALL(linkat)</div><div class='del'>-SYSCALL(symlinkat)</div><div class='del'>-SYSCALL(readlinkat)</div><div class='del'>-SYSCALL(fchmodat)</div><div class='del'>-SYSCALL(faccessat)</div><div class='del'>-COMPAT_SYS(get_robust_list)</div><div class='del'>-COMPAT_SYS(set_robust_list)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c</div><div class='del'>- * as well when appropriate.</div><div class='del'>- */</div><div class='add'>+#include &lt;asm/systbl.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c<br/>index 26bd8ea35a4e..368a4934f7ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/tau_6xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/tau_6xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/tau_6xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/tau_6xx.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * life in portables, and add a 'performance/watt' metric somewhere in /proc</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c<br/>index 24e3ad756de0..774c0a3c5019 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/time.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -76,7 +75,6 @@</div><div class='ctx'> </div><div class='ctx'> /* keep track of when we need to update the rtc */</div><div class='ctx'> time_t last_rtc_update;</div><div class='del'>-extern int piranha_simulator;</div><div class='ctx'> #ifdef CONFIG_PPC_ISERIES</div><div class='ctx'> unsigned long iSeries_recal_titan = 0;</div><div class='ctx'> unsigned long iSeries_recal_tb = 0; </div><div class='hunk'>@@ -103,7 +101,7 @@ EXPORT_SYMBOL(tb_ticks_per_sec);	/* for cputime_t conversions */</div><div class='ctx'> u64 tb_to_xs;</div><div class='ctx'> unsigned tb_to_us;</div><div class='ctx'> </div><div class='del'>-#define TICKLEN_SCALE	(SHIFT_SCALE - 10)</div><div class='add'>+#define TICKLEN_SCALE	TICK_LENGTH_SHIFT</div><div class='ctx'> u64 last_tick_len;	/* units are ns / 2^TICKLEN_SCALE */</div><div class='ctx'> u64 ticklen_to_xs;	/* 0.64 fraction */</div><div class='ctx'> </div><div class='hunk'>@@ -858,42 +856,50 @@ int do_settimeofday(struct timespec *tv)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(do_settimeofday);</div><div class='ctx'> </div><div class='del'>-void __init generic_calibrate_decr(void)</div><div class='add'>+static int __init get_freq(char *name, int cells, unsigned long *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *cpu;</div><div class='ctx'> 	unsigned int *fp;</div><div class='del'>-	int node_found;</div><div class='add'>+	int found = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The cpu node should have a timebase-frequency property</div><div class='del'>-	 * to tell us the rate at which the decrementer counts.</div><div class='del'>-	 */</div><div class='add'>+	/* The cpu node should have timebase and clock frequency properties */</div><div class='ctx'> 	cpu = of_find_node_by_type(NULL, "cpu");</div><div class='ctx'> </div><div class='del'>-	ppc_tb_freq = DEFAULT_TB_FREQ;		/* hardcoded default */</div><div class='del'>-	node_found = 0;</div><div class='ctx'> 	if (cpu) {</div><div class='del'>-		fp = (unsigned int *)get_property(cpu, "timebase-frequency",</div><div class='del'>-						  NULL);</div><div class='add'>+		fp = (unsigned int *)get_property(cpu, name, NULL);</div><div class='ctx'> 		if (fp) {</div><div class='del'>-			node_found = 1;</div><div class='del'>-			ppc_tb_freq = *fp;</div><div class='add'>+			found = 1;</div><div class='add'>+			*val = 0;</div><div class='add'>+			while (cells--)</div><div class='add'>+				*val = (*val &lt;&lt; 32) | *fp++;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		of_node_put(cpu);</div><div class='ctx'> 	}</div><div class='del'>-	if (!node_found)</div><div class='add'>+</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init generic_calibrate_decr(void)</div><div class='add'>+{</div><div class='add'>+	ppc_tb_freq = DEFAULT_TB_FREQ;		/* hardcoded default */</div><div class='add'>+</div><div class='add'>+	if (!get_freq("ibm,extended-timebase-frequency", 2, &amp;ppc_tb_freq) &amp;&amp;</div><div class='add'>+	    !get_freq("timebase-frequency", 1, &amp;ppc_tb_freq)) {</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_ERR "WARNING: Estimating decrementer frequency "</div><div class='ctx'> 				"(not found)\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ppc_proc_freq = DEFAULT_PROC_FREQ;</div><div class='del'>-	node_found = 0;</div><div class='del'>-	if (cpu) {</div><div class='del'>-		fp = (unsigned int *)get_property(cpu, "clock-frequency",</div><div class='del'>-						  NULL);</div><div class='del'>-		if (fp) {</div><div class='del'>-			node_found = 1;</div><div class='del'>-			ppc_proc_freq = *fp;</div><div class='del'>-		}</div><div class='add'>+	ppc_proc_freq = DEFAULT_PROC_FREQ;	/* hardcoded default */</div><div class='add'>+</div><div class='add'>+	if (!get_freq("ibm,extended-clock-frequency", 2, &amp;ppc_proc_freq) &amp;&amp;</div><div class='add'>+	    !get_freq("clock-frequency", 1, &amp;ppc_proc_freq)) {</div><div class='add'>+</div><div class='add'>+		printk(KERN_ERR "WARNING: Estimating processor frequency "</div><div class='add'>+				"(not found)\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BOOKE</div><div class='ctx'> 	/* Set the time base to zero */</div><div class='ctx'> 	mtspr(SPRN_TBWL, 0);</div><div class='hunk'>@@ -905,11 +911,6 @@ void __init generic_calibrate_decr(void)</div><div class='ctx'> 	/* Enable decrementer interrupt */</div><div class='ctx'> 	mtspr(SPRN_TCR, TCR_DIE);</div><div class='ctx'> #endif</div><div class='del'>-	if (!node_found)</div><div class='del'>-		printk(KERN_ERR "WARNING: Estimating processor frequency "</div><div class='del'>-				"(not found)\n");</div><div class='del'>-</div><div class='del'>-	of_node_put(cpu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long get_boot_time(void)</div><div class='hunk'>@@ -945,9 +946,9 @@ void __init time_init(void)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Normal PowerPC with timebase register */</div><div class='ctx'> 		ppc_md.calibrate_decr();</div><div class='del'>-		printk(KERN_INFO "time_init: decrementer frequency = %lu.%.6lu MHz\n",</div><div class='add'>+		printk(KERN_DEBUG "time_init: decrementer frequency = %lu.%.6lu MHz\n",</div><div class='ctx'> 		       ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);</div><div class='del'>-		printk(KERN_INFO "time_init: processor frequency   = %lu.%.6lu MHz\n",</div><div class='add'>+		printk(KERN_DEBUG "time_init: processor frequency   = %lu.%.6lu MHz\n",</div><div class='ctx'> 		       ppc_proc_freq / 1000000, ppc_proc_freq % 1000000);</div><div class='ctx'> 		tb_last_stamp = tb_last_jiffy = get_tb();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1010,10 +1011,7 @@ void __init time_init(void)</div><div class='ctx'> 	tb_to_ns_scale = scale;</div><div class='ctx'> 	tb_to_ns_shift = shift;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_ISERIES</div><div class='del'>-	if (!piranha_simulator)</div><div class='del'>-#endif</div><div class='del'>-		tm = get_boot_time();</div><div class='add'>+	tm = get_boot_time();</div><div class='ctx'> </div><div class='ctx'> 	write_seqlock_irqsave(&amp;xtime_lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c<br/>index 064a52564692..3c668078e524 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/traps.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of hardware exceptions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -32,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -51,9 +51,13 @@</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;asm/kexec.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64	/* XXX */</div><div class='ctx'> #define _IO_BASE	pci_io_base</div><div class='add'>+#ifdef CONFIG_KEXEC</div><div class='add'>+cpumask_t cpus_in_sr = CPU_MASK_NONE;</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUGGER</div><div class='hunk'>@@ -96,7 +100,7 @@ static DEFINE_SPINLOCK(die_lock);</div><div class='ctx'> </div><div class='ctx'> int die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> {</div><div class='del'>-	static int die_counter, crash_dump_start = 0;</div><div class='add'>+	static int die_counter;</div><div class='ctx'> </div><div class='ctx'> 	if (debugger(regs))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -105,10 +109,18 @@ int die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> 	spin_lock_irq(&amp;die_lock);</div><div class='ctx'> 	bust_spinlocks(1);</div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	if (machine_is(powermac)) {</div><div class='del'>-		set_backlight_enable(1);</div><div class='del'>-		set_backlight_level(BACKLIGHT_MAX);</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (machine_is(powermac) &amp;&amp; pmac_backlight) {</div><div class='add'>+		struct backlight_properties *props;</div><div class='add'>+</div><div class='add'>+		down(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+		props = pmac_backlight-&gt;props;</div><div class='add'>+		props-&gt;brightness = props-&gt;max_brightness;</div><div class='add'>+		props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+		props-&gt;update_status(pmac_backlight);</div><div class='add'>+		up(&amp;pmac_backlight-&gt;sem);</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='ctx'> #endif</div><div class='ctx'> 	printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);</div><div class='ctx'> #ifdef CONFIG_PREEMPT</div><div class='hunk'>@@ -128,21 +140,12 @@ int die(const char *str, struct pt_regs *regs, long err)</div><div class='ctx'> 	print_modules();</div><div class='ctx'> 	show_regs(regs);</div><div class='ctx'> 	bust_spinlocks(0);</div><div class='add'>+	spin_unlock_irq(&amp;die_lock);</div><div class='ctx'> </div><div class='del'>-	if (!crash_dump_start &amp;&amp; kexec_should_crash(current)) {</div><div class='del'>-		crash_dump_start = 1;</div><div class='del'>-		spin_unlock_irq(&amp;die_lock);</div><div class='add'>+	if (kexec_should_crash(current) ||</div><div class='add'>+		kexec_sr_activated(smp_processor_id()))</div><div class='ctx'> 		crash_kexec(regs);</div><div class='del'>-		/* NOTREACHED */</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;die_lock);</div><div class='del'>-	if (crash_dump_start)</div><div class='del'>-		/*</div><div class='del'>-		 * Only for soft-reset: Other CPUs will be responded to an IPI</div><div class='del'>-		 * sent by first kexec CPU.</div><div class='del'>-		 */</div><div class='del'>-		for(;;)</div><div class='del'>-			;</div><div class='add'>+	crash_kexec_secondary(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (in_interrupt())</div><div class='ctx'> 		panic("Fatal exception in interrupt");</div><div class='hunk'>@@ -206,6 +209,10 @@ void system_reset_exception(struct pt_regs *regs)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KEXEC</div><div class='add'>+	cpu_set(smp_processor_id(), cpus_in_sr);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	die("System Reset", regs, SIGABRT);</div><div class='ctx'> </div><div class='ctx'> 	/* Must die if the interrupt is not recoverable */</div><div class='hunk'>@@ -658,7 +665,7 @@ static int emulate_instruction(struct pt_regs *regs)</div><div class='ctx'> 	u32 instword;</div><div class='ctx'> 	u32 rd;</div><div class='ctx'> </div><div class='del'>-	if (!user_mode(regs))</div><div class='add'>+	if (!user_mode(regs) || (regs-&gt;msr &amp; MSR_LE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	CHECK_FULL_REGS(regs);</div><div class='ctx'> </div><div class='hunk'>@@ -805,9 +812,11 @@ void __kprobes program_check_exception(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> void alignment_exception(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	int fixed;</div><div class='add'>+	int fixed = 0;</div><div class='ctx'> </div><div class='del'>-	fixed = fix_alignment(regs);</div><div class='add'>+	/* we don't implement logging of alignment exceptions */</div><div class='add'>+	if (!(current-&gt;thread.align_ctl &amp; PR_UNALIGN_SIGBUS))</div><div class='add'>+		fixed = fix_alignment(regs);</div><div class='ctx'> </div><div class='ctx'> 	if (fixed == 1) {</div><div class='ctx'> 		regs-&gt;nip += 4;	/* skip over emulated instruction */</div><div class='head'>diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c<br/>index 3774e80094f5..5730906b23d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/udbg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/udbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/udbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/udbg.c</a></div><div class='hunk'>@@ -10,10 +10,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -33,9 +33,12 @@ void __init udbg_early_init(void)</div><div class='ctx'> #elif defined(CONFIG_PPC_EARLY_DEBUG_G5)</div><div class='ctx'> 	/* For use on Apple G5 machines */</div><div class='ctx'> 	udbg_init_pmac_realmode();</div><div class='del'>-#elif defined(CONFIG_PPC_EARLY_DEBUG_RTAS)</div><div class='add'>+#elif defined(CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL)</div><div class='ctx'> 	/* RTAS panel debug */</div><div class='del'>-	udbg_init_rtas();</div><div class='add'>+	udbg_init_rtas_panel();</div><div class='add'>+#elif defined(CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE)</div><div class='add'>+	/* RTAS console debug */</div><div class='add'>+	udbg_init_rtas_console();</div><div class='ctx'> #elif defined(CONFIG_PPC_EARLY_DEBUG_MAPLE)</div><div class='ctx'> 	/* Maple real mode debug */</div><div class='ctx'> 	udbg_init_maple_realmode();</div><div class='hunk'>@@ -141,12 +144,14 @@ static int early_console_initialized;</div><div class='ctx'> </div><div class='ctx'> void __init disable_early_printk(void)</div><div class='ctx'> {</div><div class='del'>-#if 1</div><div class='ctx'> 	if (!early_console_initialized)</div><div class='ctx'> 		return;</div><div class='add'>+	if (strstr(saved_command_line, "udbg-immortal")) {</div><div class='add'>+		printk(KERN_INFO "early console immortal !\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	unregister_console(&amp;udbg_console);</div><div class='ctx'> 	early_console_initialized = 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called by setup_system */</div><div class='head'>diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c<br/>index 5d29dcca523c..0835b4841dea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/udbg_16550.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/udbg_16550.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/udbg_16550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/udbg_16550.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *      as published by the Free Software Foundation; either version</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c<br/>index 573afb68d69e..1a7e19cdab39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -223,6 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,</div><div class='ctx'> 	struct vm_area_struct *vma;</div><div class='ctx'> 	unsigned long vdso_pages;</div><div class='ctx'> 	unsigned long vdso_base;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 	if (test_thread_flag(TIF_32BIT)) {</div><div class='hunk'>@@ -237,20 +237,13 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,</div><div class='ctx'> 	vdso_base = VDSO32_MBASE;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	current-&gt;thread.vdso_base = 0;</div><div class='add'>+	current-&gt;mm-&gt;context.vdso_base = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* vDSO has a problem and was disabled, just don't "enable" it for the</div><div class='ctx'> 	 * process</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vdso_pages == 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);</div><div class='del'>-	if (vma == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	memset(vma, 0, sizeof(*vma));</div><div class='del'>-</div><div class='ctx'> 	/* Add a page to the vdso size for the data page */</div><div class='ctx'> 	vdso_pages ++;</div><div class='ctx'> </div><div class='hunk'>@@ -259,17 +252,23 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,</div><div class='ctx'> 	 * at vdso_base which is the "natural" base for it, but we might fail</div><div class='ctx'> 	 * and end up putting it elsewhere.</div><div class='ctx'> 	 */</div><div class='add'>+	down_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	vdso_base = get_unmapped_area(NULL, vdso_base,</div><div class='ctx'> 				      vdso_pages &lt;&lt; PAGE_SHIFT, 0, 0);</div><div class='del'>-	if (vdso_base &amp; ~PAGE_MASK) {</div><div class='del'>-		kmem_cache_free(vm_area_cachep, vma);</div><div class='del'>-		return (int)vdso_base;</div><div class='add'>+	if (IS_ERR_VALUE(vdso_base)) {</div><div class='add'>+		rc = vdso_base;</div><div class='add'>+		goto fail_mmapsem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	current-&gt;thread.vdso_base = vdso_base;</div><div class='ctx'> </div><div class='add'>+	/* Allocate a VMA structure and fill it up */</div><div class='add'>+	vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);</div><div class='add'>+	if (vma == NULL) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto fail_mmapsem;</div><div class='add'>+	}</div><div class='ctx'> 	vma-&gt;vm_mm = mm;</div><div class='del'>-	vma-&gt;vm_start = current-&gt;thread.vdso_base;</div><div class='add'>+	vma-&gt;vm_start = vdso_base;</div><div class='ctx'> 	vma-&gt;vm_end = vma-&gt;vm_start + (vdso_pages &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -282,23 +281,38 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,</div><div class='ctx'> 	 * It's fine to use that for setting breakpoints in the vDSO code</div><div class='ctx'> 	 * pages though</div><div class='ctx'> 	 */</div><div class='del'>-	vma-&gt;vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;</div><div class='add'>+	vma-&gt;vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC;</div><div class='ctx'> 	vma-&gt;vm_flags |= mm-&gt;def_flags;</div><div class='ctx'> 	vma-&gt;vm_page_prot = protection_map[vma-&gt;vm_flags &amp; 0x7];</div><div class='ctx'> 	vma-&gt;vm_ops = &amp;vdso_vmops;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	if (insert_vm_struct(mm, vma)) {</div><div class='del'>-		up_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-		kmem_cache_free(vm_area_cachep, vma);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	/* Insert new VMA */</div><div class='add'>+	rc = insert_vm_struct(mm, vma);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto fail_vma;</div><div class='add'>+</div><div class='add'>+	/* Put vDSO base into mm struct and account for memory usage */</div><div class='add'>+	current-&gt;mm-&gt;context.vdso_base = vdso_base;</div><div class='ctx'> 	mm-&gt;total_vm += (vma-&gt;vm_end - vma-&gt;vm_start) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ fail_vma:</div><div class='add'>+	kmem_cache_free(vm_area_cachep, vma);</div><div class='add'>+ fail_mmapsem:</div><div class='add'>+	up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *arch_vma_name(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	if (vma-&gt;vm_mm &amp;&amp; vma-&gt;vm_start == vma-&gt;vm_mm-&gt;context.vdso_base)</div><div class='add'>+		return "[vdso]";</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void * __init find_section32(Elf32_Ehdr *ehdr, const char *secname,</div><div class='ctx'> 				  unsigned long *size)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso32/cacheflush.S b/arch/powerpc/kernel/vdso32/cacheflush.S<br/>index 09629aea3e47..9cb319992c38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/cacheflush.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/cacheflush.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/cacheflush.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso32/cacheflush.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso32/datapage.S b/arch/powerpc/kernel/vdso32/datapage.S<br/>index 4709f1d9542c..dc21e891d2e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/datapage.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/datapage.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/datapage.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso32/datapage.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S<br/>index 7eebff03a041..05909f754307 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/gettimeofday.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/gettimeofday.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/gettimeofday.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso32/gettimeofday.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S<br/>index 0c6a37b29dde..68d49dd71dcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/sigtramp.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso32/sigtramp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso32/sigtramp.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso32/sigtramp.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso64/cacheflush.S b/arch/powerpc/kernel/vdso64/cacheflush.S<br/>index cb4ae0a5edd0..66a36d3cc6ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/cacheflush.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/cacheflush.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/cacheflush.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso64/cacheflush.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso64/datapage.S b/arch/powerpc/kernel/vdso64/datapage.S<br/>index 3b2dd7d0c1eb..79796de11737 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/datapage.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/datapage.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/datapage.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso64/datapage.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S<br/>index 4ee871f1cadb..56e76ff5498f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/gettimeofday.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/gettimeofday.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/gettimeofday.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso64/gettimeofday.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/vdso.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vdso64/sigtramp.S b/arch/powerpc/kernel/vdso64/sigtramp.S<br/>index 7479edb101b8..17a83fa6dc52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/sigtramp.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vdso64/sigtramp.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vdso64/sigtramp.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vdso64/sigtramp.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='head'>diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S<br/>index 66b3d03c5fa5..49ac3d6e1399 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vector.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vector.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vector.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vector.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -53,12 +52,12 @@ fpenable:</div><div class='ctx'> 	stfd	fr31,8(r1)</div><div class='ctx'> 	LDCONST(fr1, fpzero)</div><div class='ctx'> 	mffs	fr31</div><div class='del'>-	mtfsf	0xff,fr1</div><div class='add'>+	MTFSF_L(fr1)</div><div class='ctx'> 	blr</div><div class='ctx'> </div><div class='ctx'> fpdisable:</div><div class='ctx'> 	mtlr	r12</div><div class='del'>-	mtfsf	0xff,fr31</div><div class='add'>+	MTFSF_L(fr31)</div><div class='ctx'> 	lfd	fr31,8(r1)</div><div class='ctx'> 	lfd	fr1,16(r1)</div><div class='ctx'> 	lfd	fr0,24(r1)</div><div class='head'>diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c<br/>index 971020cf3f7d..fad8580f9081 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vio.c</a></div><div class='hunk'>@@ -13,27 +13,116 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/vio.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-</div><div class='del'>-static const struct vio_device_id *vio_match_device(</div><div class='del'>-		const struct vio_device_id *, const struct vio_dev *);</div><div class='del'>-</div><div class='del'>-struct vio_dev vio_bus_device  = { /* fake "parent" device */</div><div class='add'>+#include &lt;asm/firmware.h&gt;</div><div class='add'>+#include &lt;asm/tce.h&gt;</div><div class='add'>+#include &lt;asm/abs_addr.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/hvcall.h&gt;</div><div class='add'>+#include &lt;asm/iseries/vio.h&gt;</div><div class='add'>+#include &lt;asm/iseries/hv_types.h&gt;</div><div class='add'>+#include &lt;asm/iseries/hv_lp_config.h&gt;</div><div class='add'>+#include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='add'>+#include &lt;asm/iseries/iommu.h&gt;</div><div class='add'>+</div><div class='add'>+extern struct subsystem devices_subsys; /* needed for vio_find_name() */</div><div class='add'>+</div><div class='add'>+static struct vio_dev vio_bus_device  = { /* fake "parent" device */</div><div class='ctx'> 	.name = vio_bus_device.dev.bus_id,</div><div class='ctx'> 	.type = "",</div><div class='ctx'> 	.dev.bus_id = "vio",</div><div class='ctx'> 	.dev.bus = &amp;vio_bus_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct vio_bus_ops vio_bus_ops;</div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='add'>+struct device *iSeries_vio_dev = &amp;vio_bus_device.dev;</div><div class='add'>+EXPORT_SYMBOL(iSeries_vio_dev);</div><div class='add'>+</div><div class='add'>+static struct iommu_table veth_iommu_table;</div><div class='add'>+static struct iommu_table vio_iommu_table;</div><div class='add'>+</div><div class='add'>+static void __init iommu_vio_init(void)</div><div class='add'>+{</div><div class='add'>+	iommu_table_getparms_iSeries(255, 0, 0xff, &amp;veth_iommu_table);</div><div class='add'>+	veth_iommu_table.it_size /= 2;</div><div class='add'>+	vio_iommu_table = veth_iommu_table;</div><div class='add'>+	vio_iommu_table.it_offset += veth_iommu_table.it_size;</div><div class='add'>+</div><div class='add'>+	if (!iommu_init_table(&amp;veth_iommu_table, -1))</div><div class='add'>+		printk("Virtual Bus VETH TCE table failed.\n");</div><div class='add'>+	if (!iommu_init_table(&amp;vio_iommu_table, -1))</div><div class='add'>+		printk("Virtual Bus VIO TCE table failed.\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_ISERIES)) {</div><div class='add'>+		if (strcmp(dev-&gt;type, "network") == 0)</div><div class='add'>+			return &amp;veth_iommu_table;</div><div class='add'>+		return &amp;vio_iommu_table;</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+	{</div><div class='add'>+		unsigned char *dma_window;</div><div class='add'>+		struct iommu_table *tbl;</div><div class='add'>+		unsigned long offset, size;</div><div class='add'>+</div><div class='add'>+		dma_window = get_property(dev-&gt;dev.platform_data,</div><div class='add'>+				"ibm,my-dma-window", NULL);</div><div class='add'>+		if (!dma_window)</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		of_parse_dma_window(dev-&gt;dev.platform_data, dma_window,</div><div class='add'>+				&amp;tbl-&gt;it_index, &amp;offset, &amp;size);</div><div class='add'>+</div><div class='add'>+		/* TCE table size - measured in tce entries */</div><div class='add'>+		tbl-&gt;it_size = size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		/* offset for VIO should always be 0 */</div><div class='add'>+		tbl-&gt;it_offset = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		tbl-&gt;it_busno = 0;</div><div class='add'>+		tbl-&gt;it_type = TCE_VB;</div><div class='add'>+</div><div class='add'>+		return iommu_init_table(tbl, -1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vio_match_device: - Tell if a VIO device has a matching</div><div class='add'>+ *			VIO device id structure.</div><div class='add'>+ * @ids:	array of VIO device id structures to search in</div><div class='add'>+ * @dev:	the VIO device structure to match against</div><div class='add'>+ *</div><div class='add'>+ * Used by a driver to check whether a VIO device present in the</div><div class='add'>+ * system is in its list of supported devices. Returns the matching</div><div class='add'>+ * vio_device_id structure or NULL if there is no match.</div><div class='add'>+ */</div><div class='add'>+static const struct vio_device_id *vio_match_device(</div><div class='add'>+		const struct vio_device_id *ids, const struct vio_dev *dev)</div><div class='add'>+{</div><div class='add'>+	while (ids-&gt;type[0] != '\0') {</div><div class='add'>+		if ((strncmp(dev-&gt;type, ids-&gt;type, strlen(ids-&gt;type)) == 0) &amp;&amp;</div><div class='add'>+		    device_is_compatible(dev-&gt;dev.platform_data, ids-&gt;compat))</div><div class='add'>+			return ids;</div><div class='add'>+		ids++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Convert from struct device to struct vio_dev and pass to driver.</div><div class='hunk'>@@ -106,35 +195,100 @@ void vio_unregister_driver(struct vio_driver *viodrv)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vio_unregister_driver);</div><div class='ctx'> </div><div class='add'>+/* vio_dev refcount hit 0 */</div><div class='add'>+static void __devinit vio_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;platform_data) {</div><div class='add'>+		/* XXX free TCE table */</div><div class='add'>+		of_node_put(dev-&gt;platform_data);</div><div class='add'>+	}</div><div class='add'>+	kfree(to_vio_dev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * vio_match_device: - Tell if a VIO device has a matching</div><div class='del'>- *			VIO device id structure.</div><div class='del'>- * @ids:	array of VIO device id structures to search in</div><div class='del'>- * @dev:	the VIO device structure to match against</div><div class='add'>+ * vio_register_device_node: - Register a new vio device.</div><div class='add'>+ * @of_node:	The OF node for this device.</div><div class='ctx'>  *</div><div class='del'>- * Used by a driver to check whether a VIO device present in the</div><div class='del'>- * system is in its list of supported devices. Returns the matching</div><div class='del'>- * vio_device_id structure or NULL if there is no match.</div><div class='add'>+ * Creates and initializes a vio_dev structure from the data in</div><div class='add'>+ * of_node (dev.platform_data) and adds it to the list of virtual devices.</div><div class='add'>+ * Returns a pointer to the created vio_dev or NULL if node has</div><div class='add'>+ * NULL device_type or compatible fields.</div><div class='ctx'>  */</div><div class='del'>-static const struct vio_device_id *vio_match_device(</div><div class='del'>-		const struct vio_device_id *ids, const struct vio_dev *dev)</div><div class='add'>+struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)</div><div class='ctx'> {</div><div class='del'>-	while (ids-&gt;type[0] != '\0') {</div><div class='del'>-		if (vio_bus_ops.match(ids, dev))</div><div class='del'>-			return ids;</div><div class='del'>-		ids++;</div><div class='add'>+	struct vio_dev *viodev;</div><div class='add'>+	unsigned int *unit_address;</div><div class='add'>+</div><div class='add'>+	/* we need the 'device_type' property, in order to match with drivers */</div><div class='add'>+	if (of_node-&gt;type == NULL) {</div><div class='add'>+		printk(KERN_WARNING "%s: node %s missing 'device_type'\n",</div><div class='add'>+				__FUNCTION__,</div><div class='add'>+				of_node-&gt;name ? of_node-&gt;name : "&lt;unknown&gt;");</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='add'>+</div><div class='add'>+	unit_address = (unsigned int *)get_property(of_node, "reg", NULL);</div><div class='add'>+	if (unit_address == NULL) {</div><div class='add'>+		printk(KERN_WARNING "%s: node %s missing 'reg'\n",</div><div class='add'>+				__FUNCTION__,</div><div class='add'>+				of_node-&gt;name ? of_node-&gt;name : "&lt;unknown&gt;");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate a vio_dev for this node */</div><div class='add'>+	viodev = kzalloc(sizeof(struct vio_dev), GFP_KERNEL);</div><div class='add'>+	if (viodev == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	viodev-&gt;dev.platform_data = of_node_get(of_node);</div><div class='add'>+</div><div class='add'>+	viodev-&gt;irq = irq_of_parse_and_map(of_node, 0);</div><div class='add'>+</div><div class='add'>+	snprintf(viodev-&gt;dev.bus_id, BUS_ID_SIZE, "%x", *unit_address);</div><div class='add'>+	viodev-&gt;name = of_node-&gt;name;</div><div class='add'>+	viodev-&gt;type = of_node-&gt;type;</div><div class='add'>+	viodev-&gt;unit_address = *unit_address;</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_ISERIES)) {</div><div class='add'>+		unit_address = (unsigned int *)get_property(of_node,</div><div class='add'>+				"linux,unit_address", NULL);</div><div class='add'>+		if (unit_address != NULL)</div><div class='add'>+			viodev-&gt;unit_address = *unit_address;</div><div class='add'>+	}</div><div class='add'>+	viodev-&gt;iommu_table = vio_build_iommu_table(viodev);</div><div class='add'>+</div><div class='add'>+	/* init generic 'struct device' fields: */</div><div class='add'>+	viodev-&gt;dev.parent = &amp;vio_bus_device.dev;</div><div class='add'>+	viodev-&gt;dev.bus = &amp;vio_bus_type;</div><div class='add'>+	viodev-&gt;dev.release = vio_dev_release;</div><div class='add'>+</div><div class='add'>+	/* register with generic device framework */</div><div class='add'>+	if (device_register(&amp;viodev-&gt;dev)) {</div><div class='add'>+		printk(KERN_ERR "%s: failed to register device %s\n",</div><div class='add'>+				__FUNCTION__, viodev-&gt;dev.bus_id);</div><div class='add'>+		/* XXX free TCE table */</div><div class='add'>+		kfree(viodev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return viodev;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(vio_register_device_node);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vio_bus_init: - Initialize the virtual IO bus</div><div class='ctx'>  */</div><div class='del'>-int __init vio_bus_init(struct vio_bus_ops *ops)</div><div class='add'>+static int __init vio_bus_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	struct device_node *node_vroot;</div><div class='ctx'> </div><div class='del'>-	vio_bus_ops = *ops;</div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_ISERIES)) {</div><div class='add'>+		iommu_vio_init();</div><div class='add'>+		vio_bus_device.iommu_table = &amp;vio_iommu_table;</div><div class='add'>+		iSeries_vio_dev = &amp;vio_bus_device.dev;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	err = bus_register(&amp;vio_bus_type);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -153,47 +307,48 @@ int __init vio_bus_init(struct vio_bus_ops *ops)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	node_vroot = find_devices("vdevice");</div><div class='add'>+	if (node_vroot) {</div><div class='add'>+		struct device_node *of_node;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Create struct vio_devices for each virtual device in</div><div class='add'>+		 * the device tree. Drivers will associate with them later.</div><div class='add'>+		 */</div><div class='add'>+		for (of_node = node_vroot-&gt;child; of_node != NULL;</div><div class='add'>+				of_node = of_node-&gt;sibling) {</div><div class='add'>+			printk(KERN_DEBUG "%s: processing %p\n",</div><div class='add'>+					__FUNCTION__, of_node);</div><div class='add'>+			vio_register_device_node(of_node);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-/* vio_dev refcount hit 0 */</div><div class='del'>-static void __devinit vio_dev_release(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	if (vio_bus_ops.release_device)</div><div class='del'>-		vio_bus_ops.release_device(dev);</div><div class='del'>-	kfree(to_vio_dev(dev));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+__initcall(vio_bus_init);</div><div class='ctx'> </div><div class='del'>-static ssize_t viodev_show_name(struct device *dev,</div><div class='add'>+static ssize_t name_show(struct device *dev,</div><div class='ctx'> 		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(buf, "%s\n", to_vio_dev(dev)-&gt;name);</div><div class='ctx'> }</div><div class='del'>-DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_name, NULL);</div><div class='ctx'> </div><div class='del'>-struct vio_dev * __devinit vio_register_device(struct vio_dev *viodev)</div><div class='add'>+static ssize_t devspec_show(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	/* init generic 'struct device' fields: */</div><div class='del'>-	viodev-&gt;dev.parent = &amp;vio_bus_device.dev;</div><div class='del'>-	viodev-&gt;dev.bus = &amp;vio_bus_type;</div><div class='del'>-	viodev-&gt;dev.release = vio_dev_release;</div><div class='del'>-</div><div class='del'>-	/* register with generic device framework */</div><div class='del'>-	if (device_register(&amp;viodev-&gt;dev)) {</div><div class='del'>-		printk(KERN_ERR "%s: failed to register device %s\n",</div><div class='del'>-				__FUNCTION__, viodev-&gt;dev.bus_id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	device_create_file(&amp;viodev-&gt;dev, &amp;dev_attr_name);</div><div class='add'>+	struct device_node *of_node = dev-&gt;platform_data;</div><div class='ctx'> </div><div class='del'>-	return viodev;</div><div class='add'>+	return sprintf(buf, "%s\n", of_node ? of_node-&gt;full_name : "none");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct device_attribute vio_dev_attrs[] = {</div><div class='add'>+	__ATTR_RO(name),</div><div class='add'>+	__ATTR_RO(devspec),</div><div class='add'>+	__ATTR_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __devinit vio_unregister_device(struct vio_dev *viodev)</div><div class='ctx'> {</div><div class='del'>-	if (vio_bus_ops.unregister_device)</div><div class='del'>-		vio_bus_ops.unregister_device(viodev);</div><div class='del'>-	device_remove_file(&amp;viodev-&gt;dev, &amp;dev_attr_name);</div><div class='ctx'> 	device_unregister(&amp;viodev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(vio_unregister_device);</div><div class='hunk'>@@ -229,7 +384,7 @@ static void *vio_alloc_coherent(struct device *dev, size_t size,</div><div class='ctx'> 			   dma_addr_t *dma_handle, gfp_t flag)</div><div class='ctx'> {</div><div class='ctx'> 	return iommu_alloc_coherent(to_vio_dev(dev)-&gt;iommu_table, size,</div><div class='del'>-			dma_handle, ~0ul, flag);</div><div class='add'>+			dma_handle, ~0ul, flag, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vio_free_coherent(struct device *dev, size_t size,</div><div class='hunk'>@@ -267,22 +422,23 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp,</div><div class='ctx'> 			char *buffer, int buffer_size)</div><div class='ctx'> {</div><div class='ctx'> 	const struct vio_dev *vio_dev = to_vio_dev(dev);</div><div class='add'>+	struct device_node *dn = dev-&gt;platform_data;</div><div class='ctx'> 	char *cp;</div><div class='ctx'> 	int length;</div><div class='ctx'> </div><div class='ctx'> 	if (!num_envp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!vio_dev-&gt;dev.platform_data)</div><div class='add'>+	if (!dn)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	cp = (char *)get_property(vio_dev-&gt;dev.platform_data, "compatible", &amp;length);</div><div class='add'>+	cp = (char *)get_property(dn, "compatible", &amp;length);</div><div class='ctx'> 	if (!cp)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	envp[0] = buffer;</div><div class='ctx'> 	length = scnprintf(buffer, buffer_size, "MODALIAS=vio:T%sS%s",</div><div class='ctx'> 				vio_dev-&gt;type, cp);</div><div class='del'>-	if (buffer_size - length &lt;= 0)</div><div class='add'>+	if ((buffer_size - length) &lt;= 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	envp[1] = NULL;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -290,9 +446,81 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp,</div><div class='ctx'> </div><div class='ctx'> struct bus_type vio_bus_type = {</div><div class='ctx'> 	.name = "vio",</div><div class='add'>+	.dev_attrs = vio_dev_attrs,</div><div class='ctx'> 	.uevent = vio_hotplug,</div><div class='ctx'> 	.match = vio_bus_match,</div><div class='ctx'> 	.probe = vio_bus_probe,</div><div class='ctx'> 	.remove = vio_bus_remove,</div><div class='ctx'> 	.shutdown = vio_bus_shutdown,</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vio_get_attribute: - get attribute for virtual device</div><div class='add'>+ * @vdev:	The vio device to get property.</div><div class='add'>+ * @which:	The property/attribute to be extracted.</div><div class='add'>+ * @length:	Pointer to length of returned data size (unused if NULL).</div><div class='add'>+ *</div><div class='add'>+ * Calls prom.c's get_property() to return the value of the</div><div class='add'>+ * attribute specified by @which</div><div class='add'>+*/</div><div class='add'>+const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)</div><div class='add'>+{</div><div class='add'>+	return get_property(vdev-&gt;dev.platform_data, which, length);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vio_get_attribute);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_PSERIES</div><div class='add'>+/* vio_find_name() - internal because only vio.c knows how we formatted the</div><div class='add'>+ * kobject name</div><div class='add'>+ * XXX once vio_bus_type.devices is actually used as a kset in</div><div class='add'>+ * drivers/base/bus.c, this function should be removed in favor of</div><div class='add'>+ * "device_find(kobj_name, &amp;vio_bus_type)"</div><div class='add'>+ */</div><div class='add'>+static struct vio_dev *vio_find_name(const char *kobj_name)</div><div class='add'>+{</div><div class='add'>+	struct kobject *found;</div><div class='add'>+</div><div class='add'>+	found = kset_find_obj(&amp;devices_subsys.kset, kobj_name);</div><div class='add'>+	if (!found)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return to_vio_dev(container_of(found, struct device, kobj));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vio_find_node - find an already-registered vio_dev</div><div class='add'>+ * @vnode: device_node of the virtual device we're looking for</div><div class='add'>+ */</div><div class='add'>+struct vio_dev *vio_find_node(struct device_node *vnode)</div><div class='add'>+{</div><div class='add'>+	uint32_t *unit_address;</div><div class='add'>+	char kobj_name[BUS_ID_SIZE];</div><div class='add'>+</div><div class='add'>+	/* construct the kobject name from the device node */</div><div class='add'>+	unit_address = (uint32_t *)get_property(vnode, "reg", NULL);</div><div class='add'>+	if (!unit_address)</div><div class='add'>+		return NULL;</div><div class='add'>+	snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address);</div><div class='add'>+</div><div class='add'>+	return vio_find_name(kobj_name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vio_find_node);</div><div class='add'>+</div><div class='add'>+int vio_enable_interrupts(struct vio_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int rc = h_vio_signal(dev-&gt;unit_address, VIO_IRQ_ENABLE);</div><div class='add'>+	if (rc != H_SUCCESS)</div><div class='add'>+		printk(KERN_ERR "vio: Error 0x%x enabling interrupts\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vio_enable_interrupts);</div><div class='add'>+</div><div class='add'>+int vio_disable_interrupts(struct vio_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int rc = h_vio_signal(dev-&gt;unit_address, VIO_IRQ_DISABLE);</div><div class='add'>+	if (rc != H_SUCCESS)</div><div class='add'>+		printk(KERN_ERR "vio: Error 0x%x disabling interrupts\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vio_disable_interrupts);</div><div class='add'>+#endif /* CONFIG_PPC_PSERIES */</div><div class='head'>diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S<br/>index fe79c2584cb0..02665a02130d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #define PROVIDE32(x)	PROVIDE(__unused__##x)</div><div class='hunk'>@@ -93,6 +92,11 @@ SECTIONS</div><div class='ctx'> 		__ptov_table_begin = .;</div><div class='ctx'> 		*(.ptov_fixup);</div><div class='ctx'> 		__ptov_table_end = .;</div><div class='add'>+#ifdef CONFIG_PPC_ISERIES</div><div class='add'>+		__dt_strings_start = .;</div><div class='add'>+		*(.dt_strings);</div><div class='add'>+		__dt_strings_end = .;</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	. = ALIGN(16);</div><div class='head'>diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile<br/>index 34f5c2e074c9..ff7096458249 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/lib/Makefile</a></div><div class='hunk'>@@ -2,12 +2,15 @@</div><div class='ctx'> # Makefile for ppc-specific library files..</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+ifeq ($(CONFIG_PPC64),y)</div><div class='add'>+EXTRA_CFLAGS		+= -mno-minimal-toc</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='ctx'> obj-y			:= string.o strcase.o</div><div class='ctx'> obj-$(CONFIG_PPC32)	+= div64.o copy_32.o checksum_32.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-obj-y			+= bitops.o</div><div class='ctx'> obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o copyuser_64.o \</div><div class='ctx'> 			   memcpy_64.o usercopy_64.o mem_64.o string.o \</div><div class='ctx'> 			   strcase.o</div><div class='head'>diff --git a/arch/powerpc/lib/bitops.c b/arch/powerpc/lib/bitops.c<br/>deleted file mode 100644<br/>index f68ad71a0187..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/bitops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/bitops.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,150 +0,0 @@</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * find_next_bit - find the next set bit in a memory region</div><div class='del'>- * @addr: The address to base the search on</div><div class='del'>- * @offset: The bitnumber to start searching at</div><div class='del'>- * @size: The maximum size to search</div><div class='del'>- */</div><div class='del'>-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,</div><div class='del'>-			    unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	const unsigned long *p = addr + BITOP_WORD(offset);</div><div class='del'>-	unsigned long result = offset &amp; ~(BITS_PER_LONG-1);</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-</div><div class='del'>-	if (offset &gt;= size)</div><div class='del'>-		return size;</div><div class='del'>-	size -= result;</div><div class='del'>-	offset %= BITS_PER_LONG;</div><div class='del'>-	if (offset) {</div><div class='del'>-		tmp = *(p++);</div><div class='del'>-		tmp &amp;= (~0UL &lt;&lt; offset);</div><div class='del'>-		if (size &lt; BITS_PER_LONG)</div><div class='del'>-			goto found_first;</div><div class='del'>-		if (tmp)</div><div class='del'>-			goto found_middle;</div><div class='del'>-		size -= BITS_PER_LONG;</div><div class='del'>-		result += BITS_PER_LONG;</div><div class='del'>-	}</div><div class='del'>-	while (size &amp; ~(BITS_PER_LONG-1)) {</div><div class='del'>-		if ((tmp = *(p++)))</div><div class='del'>-			goto found_middle;</div><div class='del'>-		result += BITS_PER_LONG;</div><div class='del'>-		size -= BITS_PER_LONG;</div><div class='del'>-	}</div><div class='del'>-	if (!size)</div><div class='del'>-		return result;</div><div class='del'>-	tmp = *p;</div><div class='del'>-</div><div class='del'>-found_first:</div><div class='del'>-	tmp &amp;= (~0UL &gt;&gt; (BITS_PER_LONG - size));</div><div class='del'>-	if (tmp == 0UL)		/* Are any bits set? */</div><div class='del'>-		return result + size;	/* Nope. */</div><div class='del'>-found_middle:</div><div class='del'>-	return result + __ffs(tmp);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(find_next_bit);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This implementation of find_{first,next}_zero_bit was stolen from</div><div class='del'>- * Linus' asm-alpha/bitops.h.</div><div class='del'>- */</div><div class='del'>-unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,</div><div class='del'>-				 unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	const unsigned long *p = addr + BITOP_WORD(offset);</div><div class='del'>-	unsigned long result = offset &amp; ~(BITS_PER_LONG-1);</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-</div><div class='del'>-	if (offset &gt;= size)</div><div class='del'>-		return size;</div><div class='del'>-	size -= result;</div><div class='del'>-	offset %= BITS_PER_LONG;</div><div class='del'>-	if (offset) {</div><div class='del'>-		tmp = *(p++);</div><div class='del'>-		tmp |= ~0UL &gt;&gt; (BITS_PER_LONG - offset);</div><div class='del'>-		if (size &lt; BITS_PER_LONG)</div><div class='del'>-			goto found_first;</div><div class='del'>-		if (~tmp)</div><div class='del'>-			goto found_middle;</div><div class='del'>-		size -= BITS_PER_LONG;</div><div class='del'>-		result += BITS_PER_LONG;</div><div class='del'>-	}</div><div class='del'>-	while (size &amp; ~(BITS_PER_LONG-1)) {</div><div class='del'>-		if (~(tmp = *(p++)))</div><div class='del'>-			goto found_middle;</div><div class='del'>-		result += BITS_PER_LONG;</div><div class='del'>-		size -= BITS_PER_LONG;</div><div class='del'>-	}</div><div class='del'>-	if (!size)</div><div class='del'>-		return result;</div><div class='del'>-	tmp = *p;</div><div class='del'>-</div><div class='del'>-found_first:</div><div class='del'>-	tmp |= ~0UL &lt;&lt; size;</div><div class='del'>-	if (tmp == ~0UL)	/* Are any bits zero? */</div><div class='del'>-		return result + size;	/* Nope. */</div><div class='del'>-found_middle:</div><div class='del'>-	return result + ffz(tmp);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(find_next_zero_bit);</div><div class='del'>-</div><div class='del'>-static inline unsigned int ext2_ilog2(unsigned int x)</div><div class='del'>-{</div><div class='del'>-	int lz;</div><div class='del'>-</div><div class='del'>-	asm("cntlzw %0,%1": "=r"(lz):"r"(x));</div><div class='del'>-	return 31 - lz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int ext2_ffz(unsigned int x)</div><div class='del'>-{</div><div class='del'>-	u32 rc;</div><div class='del'>-	if ((x = ~x) == 0)</div><div class='del'>-		return 32;</div><div class='del'>-	rc = ext2_ilog2(x &amp; -x);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long find_next_zero_le_bit(const unsigned long *addr,</div><div class='del'>-				    unsigned long size, unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	const unsigned int *p = ((const unsigned int *)addr) + (offset &gt;&gt; 5);</div><div class='del'>-	unsigned int result = offset &amp; ~31;</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	if (offset &gt;= size)</div><div class='del'>-		return size;</div><div class='del'>-	size -= result;</div><div class='del'>-	offset &amp;= 31;</div><div class='del'>-	if (offset) {</div><div class='del'>-		tmp = cpu_to_le32p(p++);</div><div class='del'>-		tmp |= ~0U &gt;&gt; (32 - offset);	/* bug or feature ? */</div><div class='del'>-		if (size &lt; 32)</div><div class='del'>-			goto found_first;</div><div class='del'>-		if (tmp != ~0)</div><div class='del'>-			goto found_middle;</div><div class='del'>-		size -= 32;</div><div class='del'>-		result += 32;</div><div class='del'>-	}</div><div class='del'>-	while (size &gt;= 32) {</div><div class='del'>-		if ((tmp = cpu_to_le32p(p++)) != ~0)</div><div class='del'>-			goto found_middle;</div><div class='del'>-		result += 32;</div><div class='del'>-		size -= 32;</div><div class='del'>-	}</div><div class='del'>-	if (!size)</div><div class='del'>-		return result;</div><div class='del'>-	tmp = cpu_to_le32p(p);</div><div class='del'>-found_first:</div><div class='del'>-	tmp |= ~0 &lt;&lt; size;</div><div class='del'>-	if (tmp == ~0)		/* Are any bits zero? */</div><div class='del'>-		return result + size;	/* Nope. */</div><div class='del'>-found_middle:</div><div class='del'>-	return result + ext2_ffz(tmp);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(find_next_zero_le_bit);</div><div class='head'>diff --git a/arch/powerpc/lib/copy_32.S b/arch/powerpc/lib/copy_32.S<br/>index bee51414812e..c657de59abca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/copy_32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/copy_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/copy_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/lib/copy_32.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c<br/>index 8362fa272ca5..077bed7dc52b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/locks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/locks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/lib/locks.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c<br/>index c251d9936612..9590ba780b98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/sstep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/sstep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/sstep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/lib/sstep.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/sstep.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S<br/>index b9ca84ed8927..c4c622d8e6ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/lib/string.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/lib/string.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/lib/string.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/lib/string.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='head'>diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c<br/>index 589153472761..69058b2873de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/math-emu/math.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/math-emu/math.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/math-emu/math.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/math-emu/math.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Copyright (C) 1999  Eddie C. Dost  (ecd@atecom.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c<br/>index 3d79ce281b67..376829ed2211 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/44x_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/44x_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/44x_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/44x_mmu.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/4xx_mmu.c b/arch/powerpc/mm/4xx_mmu.c<br/>index 4d006aa1a0d1..838e09db71d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/4xx_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/4xx_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/4xx_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/4xx_mmu.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c<br/>index fdbba4206d59..78a0d59903ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/fault.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -40,6 +39,40 @@</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> #include &lt;asm/siginfo.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);</div><div class='add'>+</div><div class='add'>+/* Hook to register for page fault notifications */</div><div class='add'>+int register_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_register(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int unregister_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	struct die_args args = {</div><div class='add'>+		.regs = regs,</div><div class='add'>+		.str = str,</div><div class='add'>+		.err = err,</div><div class='add'>+		.trapnr = trap,</div><div class='add'>+		.signr = sig</div><div class='add'>+	};</div><div class='add'>+	return atomic_notifier_call_chain(&amp;notify_page_fault_chain, val, &amp;args);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Check whether the instruction at regs-&gt;nip is a store using</div><div class='ctx'>  * an update addressing form which will update r1.</div><div class='hunk'>@@ -142,7 +175,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,</div><div class='ctx'> 	is_write = error_code &amp; ESR_DST;</div><div class='ctx'> #endif /* CONFIG_4xx || CONFIG_BOOKE */</div><div class='ctx'> </div><div class='del'>-	if (notify_die(DIE_PAGE_FAULT, "page_fault", regs, error_code,</div><div class='add'>+	if (notify_page_fault(DIE_PAGE_FAULT, "page_fault", regs, error_code,</div><div class='ctx'> 				11, SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c<br/>index 5d581bb3aa12..123da03ab118 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/fsl_booke_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/fsl_booke_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/fsl_booke_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/fsl_booke_mmu.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S<br/>index ea469eefa146..bd68df5fa78a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_low_32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_low_32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_low_32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/hash_low_32.S</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -74,12 +73,6 @@ _GLOBAL(hash_page_sync)</div><div class='ctx'>  */</div><div class='ctx'> 	.text</div><div class='ctx'> _GLOBAL(hash_page)</div><div class='del'>-#ifdef CONFIG_PPC64BRIDGE</div><div class='del'>-	mfmsr	r0</div><div class='del'>-	clrldi	r0,r0,1		/* make sure it's in 32-bit mode */</div><div class='del'>-	MTMSRD(r0)</div><div class='del'>-	isync</div><div class='del'>-#endif</div><div class='ctx'> 	tophys(r7,0)			/* gets -KERNELBASE into r7 */</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	addis	r8,r7,mmu_hash_lock@h</div><div class='hunk'>@@ -285,7 +278,6 @@ Hash_base = 0xc0180000</div><div class='ctx'> Hash_bits = 12				/* e.g. 256kB hash table */</div><div class='ctx'> Hash_msk = (((1 &lt;&lt; Hash_bits) - 1) * 64)</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PPC64BRIDGE</div><div class='ctx'> /* defines for the PTE format for 32-bit PPCs */</div><div class='ctx'> #define PTE_SIZE	8</div><div class='ctx'> #define PTEG_SIZE	64</div><div class='hunk'>@@ -299,21 +291,6 @@ Hash_msk = (((1 &lt;&lt; Hash_bits) - 1) * 64)</div><div class='ctx'> #define SET_V(r)	oris r,r,PTE_V@h</div><div class='ctx'> #define CLR_V(r,t)	rlwinm r,r,0,1,31</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-/* defines for the PTE format for 64-bit PPCs */</div><div class='del'>-#define PTE_SIZE	16</div><div class='del'>-#define PTEG_SIZE	128</div><div class='del'>-#define LG_PTEG_SIZE	7</div><div class='del'>-#define LDPTEu		ldu</div><div class='del'>-#define STPTE		std</div><div class='del'>-#define CMPPTE		cmpd</div><div class='del'>-#define PTE_H		2</div><div class='del'>-#define PTE_V		1</div><div class='del'>-#define TST_V(r)	andi. r,r,PTE_V</div><div class='del'>-#define SET_V(r)	ori r,r,PTE_V</div><div class='del'>-#define CLR_V(r,t)	li t,PTE_V; andc r,r,t</div><div class='del'>-#endif /* CONFIG_PPC64BRIDGE */</div><div class='del'>-</div><div class='ctx'> #define HASH_LEFT	31-(LG_PTEG_SIZE+Hash_bits-1)</div><div class='ctx'> #define HASH_RIGHT	31-LG_PTEG_SIZE</div><div class='ctx'> </div><div class='hunk'>@@ -331,14 +308,8 @@ BEGIN_FTR_SECTION</div><div class='ctx'> END_FTR_SECTION_IFSET(CPU_FTR_NEED_COHERENT)</div><div class='ctx'> </div><div class='ctx'> 	/* Construct the high word of the PPC-style PTE (r5) */</div><div class='del'>-#ifndef CONFIG_PPC64BRIDGE</div><div class='ctx'> 	rlwinm	r5,r3,7,1,24		/* put VSID in 0x7fffff80 bits */</div><div class='ctx'> 	rlwimi	r5,r4,10,26,31		/* put in API (abbrev page index) */</div><div class='del'>-#else /* CONFIG_PPC64BRIDGE */</div><div class='del'>-	clrlwi	r3,r3,8			/* reduce vsid to 24 bits */</div><div class='del'>-	sldi	r5,r3,12		/* shift vsid into position */</div><div class='del'>-	rlwimi	r5,r4,16,20,24		/* put in API (abbrev page index) */</div><div class='del'>-#endif /* CONFIG_PPC64BRIDGE */</div><div class='ctx'> 	SET_V(r5)			/* set V (valid) bit */</div><div class='ctx'> </div><div class='ctx'> 	/* Get the address of the primary PTE group in the hash table (r3) */</div><div class='hunk'>@@ -516,14 +487,8 @@ _GLOBAL(flush_hash_pages)</div><div class='ctx'> 	add	r3,r3,r0		/* note code below trims to 24 bits */</div><div class='ctx'> </div><div class='ctx'> 	/* Construct the high word of the PPC-style PTE (r11) */</div><div class='del'>-#ifndef CONFIG_PPC64BRIDGE</div><div class='ctx'> 	rlwinm	r11,r3,7,1,24		/* put VSID in 0x7fffff80 bits */</div><div class='ctx'> 	rlwimi	r11,r4,10,26,31		/* put in API (abbrev page index) */</div><div class='del'>-#else /* CONFIG_PPC64BRIDGE */</div><div class='del'>-	clrlwi	r3,r3,8			/* reduce vsid to 24 bits */</div><div class='del'>-	sldi	r11,r3,12		/* shift vsid into position */</div><div class='del'>-	rlwimi	r11,r4,16,20,24		/* put in API (abbrev page index) */</div><div class='del'>-#endif /* CONFIG_PPC64BRIDGE */</div><div class='ctx'> 	SET_V(r11)			/* set V (valid) bit */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='head'>diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S<br/>index e0d02c4a2615..9bc0a9c2b9bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_low_64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_low_64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_low_64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/hash_low_64.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * described in the kernel's COPYING file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='hunk'>@@ -136,6 +135,7 @@ _GLOBAL(__hash_page_4K)</div><div class='ctx'> 	and	r0,r0,r4		/* _PAGE_RW &amp; _PAGE_DIRTY -&gt;r0 bit 30*/</div><div class='ctx'> 	andc	r0,r30,r0		/* r0 = pte &amp; ~r0 */</div><div class='ctx'> 	rlwimi	r3,r0,32-1,31,31	/* Insert result into PP lsb */</div><div class='add'>+	ori	r3,r3,HPTE_R_C		/* Always add "C" bit for perf. */</div><div class='ctx'> </div><div class='ctx'> 	/* We eventually do the icache sync here (maybe inline that</div><div class='ctx'> 	 * code rather than call a C function...) </div><div class='hunk'>@@ -368,6 +368,7 @@ _GLOBAL(__hash_page_4K)</div><div class='ctx'> 	rlwinm	r30,r4,32-9+7,31-7,31-7	/* _PAGE_RW -&gt; _PAGE_DIRTY */</div><div class='ctx'> 	or	r30,r30,r31</div><div class='ctx'> 	ori	r30,r30,_PAGE_BUSY | _PAGE_ACCESSED | _PAGE_HASHPTE</div><div class='add'>+	oris	r30,r30,_PAGE_COMBO@h</div><div class='ctx'> 	/* Write the linux PTE atomically (setting busy) */</div><div class='ctx'> 	stdcx.	r30,0,r6</div><div class='ctx'> 	bne-	1b</div><div class='hunk'>@@ -400,6 +401,7 @@ _GLOBAL(__hash_page_4K)</div><div class='ctx'> 	and	r0,r0,r4		/* _PAGE_RW &amp; _PAGE_DIRTY -&gt;r0 bit 30*/</div><div class='ctx'> 	andc	r0,r30,r0		/* r0 = pte &amp; ~r0 */</div><div class='ctx'> 	rlwimi	r3,r0,32-1,31,31	/* Insert result into PP lsb */</div><div class='add'>+	ori	r3,r3,HPTE_R_C		/* Always add "C" bit for perf. */</div><div class='ctx'> </div><div class='ctx'> 	/* We eventually do the icache sync here (maybe inline that</div><div class='ctx'> 	 * code rather than call a C function...)</div><div class='hunk'>@@ -426,6 +428,14 @@ END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)</div><div class='ctx'> 	andi.	r0,r31,_PAGE_HASHPTE</div><div class='ctx'> 	li	r26,0			/* Default hidx */</div><div class='ctx'> 	beq	htab_insert_pte</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the pte was already inserted into the hash table</div><div class='add'>+	 * as a 64k HW page, and invalidate the 64k HPTE if so.</div><div class='add'>+	 */</div><div class='add'>+	andis.	r0,r31,_PAGE_COMBO@h</div><div class='add'>+	beq	htab_inval_old_hpte</div><div class='add'>+</div><div class='ctx'> 	ld	r6,STK_PARM(r6)(r1)</div><div class='ctx'> 	ori	r26,r6,0x8000		/* Load the hidx mask */</div><div class='ctx'> 	ld	r26,0(r26)</div><div class='hunk'>@@ -496,6 +506,19 @@ _GLOBAL(htab_call_hpte_remove)</div><div class='ctx'> 	/* Try all again */</div><div class='ctx'> 	b	htab_insert_pte</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Call out to C code to invalidate an 64k HW HPTE that is</div><div class='add'>+	 * useless now that the segment has been switched to 4k pages.</div><div class='add'>+	 */</div><div class='add'>+htab_inval_old_hpte:</div><div class='add'>+	mr	r3,r29			/* virtual addr */</div><div class='add'>+	mr	r4,r31			/* PTE.pte */</div><div class='add'>+	li	r5,0			/* PTE.hidx */</div><div class='add'>+	li	r6,MMU_PAGE_64K		/* psize */</div><div class='add'>+	ld	r7,STK_PARM(r8)(r1)	/* local */</div><div class='add'>+	bl	.flush_hash_page</div><div class='add'>+	b	htab_insert_pte</div><div class='add'>+	</div><div class='ctx'> htab_bail_ok:</div><div class='ctx'> 	li	r3,0</div><div class='ctx'> 	b	htab_bail</div><div class='hunk'>@@ -636,6 +659,12 @@ _GLOBAL(__hash_page_64K)</div><div class='ctx'> 	 * is changing this PTE anyway and might hash it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bne-	ht64_bail_ok</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	/* Check if PTE has the cache-inhibit bit set */</div><div class='add'>+	andi.	r0,r31,_PAGE_NO_CACHE</div><div class='add'>+	/* If so, bail out and refault as a 4k page */</div><div class='add'>+	bne-	ht64_bail_ok</div><div class='add'>+END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)</div><div class='ctx'> 	/* Prepare new PTE value (turn access RW into DIRTY, then</div><div class='ctx'> 	 * add BUSY,HASHPTE and ACCESSED)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -671,6 +700,7 @@ _GLOBAL(__hash_page_64K)</div><div class='ctx'> 	and	r0,r0,r4		/* _PAGE_RW &amp; _PAGE_DIRTY -&gt;r0 bit 30*/</div><div class='ctx'> 	andc	r0,r30,r0		/* r0 = pte &amp; ~r0 */</div><div class='ctx'> 	rlwimi	r3,r0,32-1,31,31	/* Insert result into PP lsb */</div><div class='add'>+	ori	r3,r3,HPTE_R_C		/* Always add "C" bit for perf. */</div><div class='ctx'> </div><div class='ctx'> 	/* We eventually do the icache sync here (maybe inline that</div><div class='ctx'> 	 * code rather than call a C function...)</div><div class='head'>diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c<br/>index 33654d1b1b43..c90f124f3c71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_native_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_native_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_native_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/hash_native_64.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static inline void __tlbie(unsigned long va, unsigned int psize)</div><div class='ctx'> 	default:</div><div class='ctx'> 		penc = mmu_psize_defs[psize].penc;</div><div class='ctx'> 		va &amp;= ~((1ul &lt;&lt; mmu_psize_defs[psize].shift) - 1);</div><div class='del'>-		va |= (0x7f &gt;&gt; (8 - penc)) &lt;&lt; 12;</div><div class='add'>+		va |= penc &lt;&lt; 12;</div><div class='ctx'> 		asm volatile("tlbie %0,1" : : "r" (va) : "memory");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -74,7 +74,7 @@ static inline void __tlbiel(unsigned long va, unsigned int psize)</div><div class='ctx'> 	default:</div><div class='ctx'> 		penc = mmu_psize_defs[psize].penc;</div><div class='ctx'> 		va &amp;= ~((1ul &lt;&lt; mmu_psize_defs[psize].shift) - 1);</div><div class='del'>-		va |= (0x7f &gt;&gt; (8 - penc)) &lt;&lt; 12;</div><div class='add'>+		va |= penc &lt;&lt; 12;</div><div class='ctx'> 		asm volatile(".long 0x7c000224 | (%0 &lt;&lt; 11) | (1 &lt;&lt; 21)"</div><div class='ctx'> 			     : : "r"(va) : "memory");</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -238,7 +238,7 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,</div><div class='ctx'> 		DBG_LOW(" -&gt; hit\n");</div><div class='ctx'> 		/* Update the HPTE */</div><div class='ctx'> 		hptep-&gt;r = (hptep-&gt;r &amp; ~(HPTE_R_PP | HPTE_R_N)) |</div><div class='del'>-			(newpp &amp; (HPTE_R_PP | HPTE_R_N));</div><div class='add'>+			(newpp &amp; (HPTE_R_PP | HPTE_R_N | HPTE_R_C));</div><div class='ctx'> 		native_unlock_hpte(hptep);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +520,7 @@ static inline int tlb_batching_enabled(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void hpte_init_native(void)</div><div class='add'>+void __init hpte_init_native(void)</div><div class='ctx'> {</div><div class='ctx'> 	ppc_md.hpte_invalidate	= native_hpte_invalidate;</div><div class='ctx'> 	ppc_md.hpte_updatepp	= native_hpte_updatepp;</div><div class='hunk'>@@ -530,5 +530,4 @@ void hpte_init_native(void)</div><div class='ctx'> 	ppc_md.hpte_clear_all	= native_hpte_clear;</div><div class='ctx'> 	if (tlb_batching_enabled())</div><div class='ctx'> 		ppc_md.flush_hash_range = native_flush_hash_range;</div><div class='del'>-	htab_finish_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c<br/>index c006d9039633..1915661c2c81 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_utils_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/hash_utils_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/hash_utils_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/hash_utils_64.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> #undef DEBUG_LOW</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -92,10 +91,15 @@ unsigned long htab_size_bytes;</div><div class='ctx'> unsigned long htab_hash_mask;</div><div class='ctx'> int mmu_linear_psize = MMU_PAGE_4K;</div><div class='ctx'> int mmu_virtual_psize = MMU_PAGE_4K;</div><div class='add'>+int mmu_vmalloc_psize = MMU_PAGE_4K;</div><div class='add'>+int mmu_io_psize = MMU_PAGE_4K;</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> int mmu_huge_psize = MMU_PAGE_16M;</div><div class='ctx'> unsigned int HPAGE_SHIFT;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_PPC_64K_PAGES</div><div class='add'>+int mmu_ci_restrictions;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* There are definitions of page sizes arrays to be used when none</div><div class='ctx'>  * is provided by the firmware.</div><div class='hunk'>@@ -162,34 +166,12 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,</div><div class='ctx'> 		hash = hpt_hash(va, shift);</div><div class='ctx'> 		hpteg = ((hash &amp; htab_hash_mask) * HPTES_PER_GROUP);</div><div class='ctx'> </div><div class='del'>-		/* The crap below can be cleaned once ppd_md.probe() can</div><div class='del'>-		 * set up the hash callbacks, thus we can just used the</div><div class='del'>-		 * normal insert callback here.</div><div class='del'>-		 */</div><div class='del'>-#ifdef CONFIG_PPC_ISERIES</div><div class='del'>-		if (machine_is(iseries))</div><div class='del'>-			ret = iSeries_hpte_insert(hpteg, va,</div><div class='del'>-						  paddr,</div><div class='del'>-						  tmp_mode,</div><div class='del'>-						  HPTE_V_BOLTED,</div><div class='del'>-						  psize);</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PPC_PSERIES</div><div class='del'>-		if (machine_is(pseries) &amp;&amp; firmware_has_feature(FW_FEATURE_LPAR))</div><div class='del'>-			ret = pSeries_lpar_hpte_insert(hpteg, va,</div><div class='del'>-						       paddr,</div><div class='del'>-						       tmp_mode,</div><div class='del'>-						       HPTE_V_BOLTED,</div><div class='del'>-						       psize);</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='del'>-			ret = native_hpte_insert(hpteg, va,</div><div class='del'>-						 paddr,</div><div class='del'>-						 tmp_mode, HPTE_V_BOLTED,</div><div class='del'>-						 psize);</div><div class='del'>-#endif</div><div class='add'>+		DBG("htab_bolt_mapping: calling %p\n", ppc_md.hpte_insert);</div><div class='add'>+</div><div class='add'>+		BUG_ON(!ppc_md.hpte_insert);</div><div class='add'>+		ret = ppc_md.hpte_insert(hpteg, va, paddr,</div><div class='add'>+				tmp_mode, HPTE_V_BOLTED, psize);</div><div class='add'>+</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -308,20 +290,31 @@ static void __init htab_init_page_sizes(void)</div><div class='ctx'> 	else if (mmu_psize_defs[MMU_PAGE_1M].shift)</div><div class='ctx'> 		mmu_linear_psize = MMU_PAGE_1M;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PPC_64K_PAGES</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pick a size for the ordinary pages. Default is 4K, we support</div><div class='del'>-	 * 64K if cache inhibited large pages are supported by the</div><div class='del'>-	 * processor</div><div class='add'>+	 * 64K for user mappings and vmalloc if supported by the processor.</div><div class='add'>+	 * We only use 64k for ioremap if the processor</div><div class='add'>+	 * (and firmware) support cache-inhibited large pages.</div><div class='add'>+	 * If not, we use 4k and set mmu_ci_restrictions so that</div><div class='add'>+	 * hash_page knows to switch processes that use cache-inhibited</div><div class='add'>+	 * mappings to 4k pages.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-	if (mmu_psize_defs[MMU_PAGE_64K].shift &amp;&amp;</div><div class='del'>-	    cpu_has_feature(CPU_FTR_CI_LARGE_PAGE))</div><div class='add'>+	if (mmu_psize_defs[MMU_PAGE_64K].shift) {</div><div class='ctx'> 		mmu_virtual_psize = MMU_PAGE_64K;</div><div class='add'>+		mmu_vmalloc_psize = MMU_PAGE_64K;</div><div class='add'>+		if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE))</div><div class='add'>+			mmu_io_psize = MMU_PAGE_64K;</div><div class='add'>+		else</div><div class='add'>+			mmu_ci_restrictions = 1;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Page orders: linear mapping = %d, others = %d\n",</div><div class='add'>+	printk(KERN_DEBUG "Page orders: linear mapping = %d, "</div><div class='add'>+	       "virtual = %d, io = %d\n",</div><div class='ctx'> 	       mmu_psize_defs[mmu_linear_psize].shift,</div><div class='del'>-	       mmu_psize_defs[mmu_virtual_psize].shift);</div><div class='add'>+	       mmu_psize_defs[mmu_virtual_psize].shift,</div><div class='add'>+	       mmu_psize_defs[mmu_io_psize].shift);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> 	/* Init large page size. Currently, we pick 16M or 1M depending</div><div class='hunk'>@@ -397,6 +390,41 @@ void create_section_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_MEMORY_HOTPLUG */</div><div class='ctx'> </div><div class='add'>+static inline void make_bl(unsigned int *insn_addr, void *func)</div><div class='add'>+{</div><div class='add'>+	unsigned long funcp = *((unsigned long *)func);</div><div class='add'>+	int offset = funcp - (unsigned long)insn_addr;</div><div class='add'>+</div><div class='add'>+	*insn_addr = (unsigned int)(0x48000001 | (offset &amp; 0x03fffffc));</div><div class='add'>+	flush_icache_range((unsigned long)insn_addr, 4+</div><div class='add'>+			   (unsigned long)insn_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init htab_finish_init(void)</div><div class='add'>+{</div><div class='add'>+	extern unsigned int *htab_call_hpte_insert1;</div><div class='add'>+	extern unsigned int *htab_call_hpte_insert2;</div><div class='add'>+	extern unsigned int *htab_call_hpte_remove;</div><div class='add'>+	extern unsigned int *htab_call_hpte_updatepp;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PPC_64K_PAGES</div><div class='add'>+	extern unsigned int *ht64_call_hpte_insert1;</div><div class='add'>+	extern unsigned int *ht64_call_hpte_insert2;</div><div class='add'>+	extern unsigned int *ht64_call_hpte_remove;</div><div class='add'>+	extern unsigned int *ht64_call_hpte_updatepp;</div><div class='add'>+</div><div class='add'>+	make_bl(ht64_call_hpte_insert1, ppc_md.hpte_insert);</div><div class='add'>+	make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert);</div><div class='add'>+	make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove);</div><div class='add'>+	make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp);</div><div class='add'>+#endif /* CONFIG_PPC_64K_PAGES */</div><div class='add'>+</div><div class='add'>+	make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert);</div><div class='add'>+	make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert);</div><div class='add'>+	make_bl(htab_call_hpte_remove, ppc_md.hpte_remove);</div><div class='add'>+	make_bl(htab_call_hpte_updatepp, ppc_md.hpte_updatepp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init htab_initialize(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long table;</div><div class='hunk'>@@ -509,6 +537,8 @@ void __init htab_initialize(void)</div><div class='ctx'> 					 mmu_linear_psize));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	htab_finish_init();</div><div class='add'>+</div><div class='ctx'> 	DBG(" &lt;- htab_initialize()\n");</div><div class='ctx'> }</div><div class='ctx'> #undef KB</div><div class='hunk'>@@ -556,6 +586,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)</div><div class='ctx'> 	pte_t *ptep;</div><div class='ctx'> 	cpumask_t tmp;</div><div class='ctx'> 	int rc, user_region = 0, local = 0;</div><div class='add'>+	int psize;</div><div class='ctx'> </div><div class='ctx'> 	DBG_LOW("hash_page(ea=%016lx, access=%lx, trap=%lx\n",</div><div class='ctx'> 		ea, access, trap);</div><div class='hunk'>@@ -575,10 +606,15 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		vsid = get_vsid(mm-&gt;context.id, ea);</div><div class='add'>+		psize = mm-&gt;context.user_psize;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VMALLOC_REGION_ID:</div><div class='ctx'> 		mm = &amp;init_mm;</div><div class='ctx'> 		vsid = get_kernel_vsid(ea);</div><div class='add'>+		if (ea &lt; VMALLOC_END)</div><div class='add'>+			psize = mmu_vmalloc_psize;</div><div class='add'>+		else</div><div class='add'>+			psize = mmu_io_psize;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Not a valid range</div><div class='hunk'>@@ -629,7 +665,40 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)</div><div class='ctx'> #ifndef CONFIG_PPC_64K_PAGES</div><div class='ctx'> 	rc = __hash_page_4K(ea, access, vsid, ptep, trap, local);</div><div class='ctx'> #else</div><div class='del'>-	if (mmu_virtual_psize == MMU_PAGE_64K)</div><div class='add'>+	if (mmu_ci_restrictions) {</div><div class='add'>+		/* If this PTE is non-cacheable, switch to 4k */</div><div class='add'>+		if (psize == MMU_PAGE_64K &amp;&amp;</div><div class='add'>+		    (pte_val(*ptep) &amp; _PAGE_NO_CACHE)) {</div><div class='add'>+			if (user_region) {</div><div class='add'>+				psize = MMU_PAGE_4K;</div><div class='add'>+				mm-&gt;context.user_psize = MMU_PAGE_4K;</div><div class='add'>+				mm-&gt;context.sllp = SLB_VSID_USER |</div><div class='add'>+					mmu_psize_defs[MMU_PAGE_4K].sllp;</div><div class='add'>+			} else if (ea &lt; VMALLOC_END) {</div><div class='add'>+				/*</div><div class='add'>+				 * some driver did a non-cacheable mapping</div><div class='add'>+				 * in vmalloc space, so switch vmalloc</div><div class='add'>+				 * to 4k pages</div><div class='add'>+				 */</div><div class='add'>+				printk(KERN_ALERT "Reducing vmalloc segment "</div><div class='add'>+				       "to 4kB pages because of "</div><div class='add'>+				       "non-cacheable mapping\n");</div><div class='add'>+				psize = mmu_vmalloc_psize = MMU_PAGE_4K;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (user_region) {</div><div class='add'>+			if (psize != get_paca()-&gt;context.user_psize) {</div><div class='add'>+				get_paca()-&gt;context = mm-&gt;context;</div><div class='add'>+				slb_flush_and_rebolt();</div><div class='add'>+			}</div><div class='add'>+		} else if (get_paca()-&gt;vmalloc_sllp !=</div><div class='add'>+			   mmu_psize_defs[mmu_vmalloc_psize].sllp) {</div><div class='add'>+			get_paca()-&gt;vmalloc_sllp =</div><div class='add'>+				mmu_psize_defs[mmu_vmalloc_psize].sllp;</div><div class='add'>+			slb_flush_and_rebolt();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (psize == MMU_PAGE_64K)</div><div class='ctx'> 		rc = __hash_page_64K(ea, access, vsid, ptep, trap, local);</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = __hash_page_4K(ea, access, vsid, ptep, trap, local);</div><div class='hunk'>@@ -681,7 +750,18 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,</div><div class='ctx'> #ifndef CONFIG_PPC_64K_PAGES</div><div class='ctx'> 	__hash_page_4K(ea, access, vsid, ptep, trap, local);</div><div class='ctx'> #else</div><div class='del'>-	if (mmu_virtual_psize == MMU_PAGE_64K)</div><div class='add'>+	if (mmu_ci_restrictions) {</div><div class='add'>+		/* If this PTE is non-cacheable, switch to 4k */</div><div class='add'>+		if (mm-&gt;context.user_psize == MMU_PAGE_64K &amp;&amp;</div><div class='add'>+		    (pte_val(*ptep) &amp; _PAGE_NO_CACHE)) {</div><div class='add'>+			mm-&gt;context.user_psize = MMU_PAGE_4K;</div><div class='add'>+			mm-&gt;context.sllp = SLB_VSID_USER |</div><div class='add'>+				mmu_psize_defs[MMU_PAGE_4K].sllp;</div><div class='add'>+			get_paca()-&gt;context = mm-&gt;context;</div><div class='add'>+			slb_flush_and_rebolt();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (mm-&gt;context.user_psize == MMU_PAGE_64K)</div><div class='ctx'> 		__hash_page_64K(ea, access, vsid, ptep, trap, local);</div><div class='ctx'> 	else</div><div class='ctx'> 		__hash_page_4K(ea, access, vsid, ptep, trap, local);</div><div class='hunk'>@@ -721,16 +801,6 @@ void flush_hash_range(unsigned long number, int local)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void make_bl(unsigned int *insn_addr, void *func)</div><div class='del'>-{</div><div class='del'>-	unsigned long funcp = *((unsigned long *)func);</div><div class='del'>-	int offset = funcp - (unsigned long)insn_addr;</div><div class='del'>-</div><div class='del'>-	*insn_addr = (unsigned int)(0x48000001 | (offset &amp; 0x03fffffc));</div><div class='del'>-	flush_icache_range((unsigned long)insn_addr, 4+</div><div class='del'>-			   (unsigned long)insn_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * low_hash_fault is called when we the low level hash code failed</div><div class='ctx'>  * to instert a PTE due to an hypervisor error</div><div class='hunk'>@@ -749,28 +819,3 @@ void low_hash_fault(struct pt_regs *regs, unsigned long address)</div><div class='ctx'> 	}</div><div class='ctx'> 	bad_page_fault(regs, address, SIGBUS);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void __init htab_finish_init(void)</div><div class='del'>-{</div><div class='del'>-	extern unsigned int *htab_call_hpte_insert1;</div><div class='del'>-	extern unsigned int *htab_call_hpte_insert2;</div><div class='del'>-	extern unsigned int *htab_call_hpte_remove;</div><div class='del'>-	extern unsigned int *htab_call_hpte_updatepp;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-	extern unsigned int *ht64_call_hpte_insert1;</div><div class='del'>-	extern unsigned int *ht64_call_hpte_insert2;</div><div class='del'>-	extern unsigned int *ht64_call_hpte_remove;</div><div class='del'>-	extern unsigned int *ht64_call_hpte_updatepp;</div><div class='del'>-</div><div class='del'>-	make_bl(ht64_call_hpte_insert1, ppc_md.hpte_insert);</div><div class='del'>-	make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert);</div><div class='del'>-	make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove);</div><div class='del'>-	make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp);</div><div class='del'>-#endif /* CONFIG_PPC_64K_PAGES */</div><div class='del'>-</div><div class='del'>-	make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert);</div><div class='del'>-	make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert);</div><div class='del'>-	make_bl(htab_call_hpte_remove, ppc_md.hpte_remove);</div><div class='del'>-	make_bl(htab_call_hpte_updatepp, ppc_md.hpte_updatepp);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c<br/>index b57fb3a2b7bb..0e53ca8f02fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/init_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/init_32.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c<br/>index 9e30f968c184..3ff374697e34 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/init_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/init_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/init_64.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -41,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -90,7 +90,7 @@ void free_initmem(void)</div><div class='ctx'> </div><div class='ctx'> 	addr = (unsigned long)__init_begin;</div><div class='ctx'> 	for (; addr &lt; (unsigned long)__init_end; addr += PAGE_SIZE) {</div><div class='del'>-		memset((void *)addr, 0xcc, PAGE_SIZE);</div><div class='add'>+		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='ctx'> 		ClearPageReserved(virt_to_page(addr));</div><div class='ctx'> 		init_page_count(virt_to_page(addr));</div><div class='ctx'> 		free_page(addr);</div><div class='head'>diff --git a/arch/powerpc/mm/lmb.c b/arch/powerpc/mm/lmb.c<br/>index 417d58518558..4b17a7359924 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/lmb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/lmb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/lmb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/lmb.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -89,20 +88,25 @@ static long __init lmb_regions_adjacent(struct lmb_region *rgn,</div><div class='ctx'> 	return lmb_addrs_adjacent(base1, size1, base2, size2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Assumption: base addr of region 1 &lt; base addr of region 2 */</div><div class='del'>-static void __init lmb_coalesce_regions(struct lmb_region *rgn,</div><div class='del'>-		unsigned long r1, unsigned long r2)</div><div class='add'>+static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> </div><div class='del'>-	rgn-&gt;region[r1].size += rgn-&gt;region[r2].size;</div><div class='del'>-	for (i=r2; i &lt; rgn-&gt;cnt-1; i++) {</div><div class='del'>-		rgn-&gt;region[i].base = rgn-&gt;region[i+1].base;</div><div class='del'>-		rgn-&gt;region[i].size = rgn-&gt;region[i+1].size;</div><div class='add'>+	for (i = r; i &lt; rgn-&gt;cnt - 1; i++) {</div><div class='add'>+		rgn-&gt;region[i].base = rgn-&gt;region[i + 1].base;</div><div class='add'>+		rgn-&gt;region[i].size = rgn-&gt;region[i + 1].size;</div><div class='ctx'> 	}</div><div class='ctx'> 	rgn-&gt;cnt--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Assumption: base addr of region 1 &lt; base addr of region 2 */</div><div class='add'>+static void __init lmb_coalesce_regions(struct lmb_region *rgn,</div><div class='add'>+		unsigned long r1, unsigned long r2)</div><div class='add'>+{</div><div class='add'>+	rgn-&gt;region[r1].size += rgn-&gt;region[r2].size;</div><div class='add'>+	lmb_remove_region(rgn, r2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This routine called with relocation disabled. */</div><div class='ctx'> void __init lmb_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -294,17 +298,16 @@ unsigned long __init lmb_end_of_DRAM(void)</div><div class='ctx'> 	return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Truncate the lmb list to memory_limit if it's set</div><div class='del'>- * You must call lmb_analyze() after this.</div><div class='del'>- */</div><div class='add'>+/* You must call lmb_analyze() after this. */</div><div class='ctx'> void __init lmb_enforce_memory_limit(unsigned long memory_limit)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long i, limit;</div><div class='add'>+	struct lmb_property *p;</div><div class='ctx'> </div><div class='ctx'> 	if (! memory_limit)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	/* Truncate the lmb regions to satisfy the memory limit. */</div><div class='ctx'> 	limit = memory_limit;</div><div class='ctx'> 	for (i = 0; i &lt; lmb.memory.cnt; i++) {</div><div class='ctx'> 		if (limit &gt; lmb.memory.region[i].size) {</div><div class='hunk'>@@ -316,4 +319,21 @@ void __init lmb_enforce_memory_limit(unsigned long memory_limit)</div><div class='ctx'> 		lmb.memory.cnt = i + 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	lmb.rmo_size = lmb.memory.region[0].size;</div><div class='add'>+</div><div class='add'>+	/* And truncate any reserves above the limit also. */</div><div class='add'>+	for (i = 0; i &lt; lmb.reserved.cnt; i++) {</div><div class='add'>+		p = &amp;lmb.reserved.region[i];</div><div class='add'>+</div><div class='add'>+		if (p-&gt;base &gt; memory_limit)</div><div class='add'>+			p-&gt;size = 0;</div><div class='add'>+		else if ((p-&gt;base + p-&gt;size) &gt; memory_limit)</div><div class='add'>+			p-&gt;size = memory_limit - p-&gt;base;</div><div class='add'>+</div><div class='add'>+		if (p-&gt;size == 0) {</div><div class='add'>+			lmb_remove_region(&amp;lmb.reserved, i);</div><div class='add'>+			i--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c<br/>index 741dd8802d49..eebd8b83a6b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/mem.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -114,15 +113,20 @@ void online_page(struct page *page)</div><div class='ctx'> 	num_physpages++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit add_memory(u64 start, u64 size)</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+int memory_add_physaddr_to_nid(u64 start)</div><div class='add'>+{</div><div class='add'>+	return hot_add_scn_to_nid(start);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int __devinit arch_add_memory(int nid, u64 start, u64 size)</div><div class='ctx'> {</div><div class='ctx'> 	struct pglist_data *pgdata;</div><div class='ctx'> 	struct zone *zone;</div><div class='del'>-	int nid;</div><div class='ctx'> 	unsigned long start_pfn = start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long nr_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	nid = hot_add_scn_to_nid(start);</div><div class='ctx'> 	pgdata = NODE_DATA(nid);</div><div class='ctx'> </div><div class='ctx'> 	start = (unsigned long)__va(start);</div><div class='hunk'>@@ -299,9 +303,9 @@ void __init paging_init(void)</div><div class='ctx'> 	kmap_prot = PAGE_KERNEL;</div><div class='ctx'> #endif /* CONFIG_HIGHMEM */</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",</div><div class='add'>+	printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",</div><div class='ctx'> 	       top_of_ram, total_ram);</div><div class='del'>-	printk(KERN_INFO "Memory hole size: %ldMB\n",</div><div class='add'>+	printk(KERN_DEBUG "Memory hole size: %ldMB\n",</div><div class='ctx'> 	       (top_of_ram - total_ram) &gt;&gt; 20);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * All pages are DMA-able so we put them all in the DMA zone.</div><div class='hunk'>@@ -380,7 +384,7 @@ void __init mem_init(void)</div><div class='ctx'> 			totalhigh_pages++;</div><div class='ctx'> 		}</div><div class='ctx'> 		totalram_pages += totalhigh_pages;</div><div class='del'>-		printk(KERN_INFO "High memory: %luk\n",</div><div class='add'>+		printk(KERN_DEBUG "High memory: %luk\n",</div><div class='ctx'> 		       totalhigh_pages &lt;&lt; (PAGE_SHIFT-10));</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_HIGHMEM */</div><div class='head'>diff --git a/arch/powerpc/mm/mmu_context_32.c b/arch/powerpc/mm/mmu_context_32.c<br/>index a8816e0f6a86..792086b01000 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmu_context_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/mmu_context_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmu_context_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/mmu_context_32.c</a></div><div class='hunk'>@@ -23,14 +23,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-mm_context_t next_mmu_context;</div><div class='add'>+unsigned long next_mmu_context;</div><div class='ctx'> unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];</div><div class='ctx'> #ifdef FEW_CONTEXTS</div><div class='ctx'> atomic_t nr_free_contexts;</div><div class='head'>diff --git a/arch/powerpc/mm/mmu_context_64.c b/arch/powerpc/mm/mmu_context_64.c<br/>index 714a84dd8d5d..90a06ac02d5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmu_context_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/mmu_context_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/mmu_context_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/mmu_context_64.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -44,11 +43,16 @@ again:</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (index &gt; MAX_CONTEXT) {</div><div class='add'>+		spin_lock(&amp;mmu_context_lock);</div><div class='ctx'> 		idr_remove(&amp;mmu_context_idr, index);</div><div class='add'>+		spin_unlock(&amp;mmu_context_lock);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mm-&gt;context.id = index;</div><div class='add'>+	mm-&gt;context.user_psize = mmu_virtual_psize;</div><div class='add'>+	mm-&gt;context.sllp = SLB_VSID_USER |</div><div class='add'>+		mmu_psize_defs[mmu_virtual_psize].sllp;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c<br/>index 092355f37399..fbe23933f731 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/numa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/numa.c</a></div><div class='hunk'>@@ -334,7 +334,7 @@ out:</div><div class='ctx'> 	return nid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpu_numa_callback(struct notifier_block *nfb,</div><div class='add'>+static int __cpuinit cpu_numa_callback(struct notifier_block *nfb,</div><div class='ctx'> 			     unsigned long action,</div><div class='ctx'> 			     void *hcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -487,9 +487,9 @@ static void __init setup_nonnuma(void)</div><div class='ctx'> 	unsigned long total_ram = lmb_phys_mem_size();</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",</div><div class='add'>+	printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",</div><div class='ctx'> 	       top_of_ram, total_ram);</div><div class='del'>-	printk(KERN_INFO "Memory hole size: %ldMB\n",</div><div class='add'>+	printk(KERN_DEBUG "Memory hole size: %ldMB\n",</div><div class='ctx'> 	       (top_of_ram - total_ram) &gt;&gt; 20);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; lmb.memory.cnt; ++i)</div><div class='hunk'>@@ -507,7 +507,7 @@ void __init dump_numa_cpu_topology(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_node(node) {</div><div class='del'>-		printk(KERN_INFO "Node %d CPUs:", node);</div><div class='add'>+		printk(KERN_DEBUG "Node %d CPUs:", node);</div><div class='ctx'> </div><div class='ctx'> 		count = 0;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -543,7 +543,7 @@ static void __init dump_numa_memory_topology(void)</div><div class='ctx'> 	for_each_online_node(node) {</div><div class='ctx'> 		unsigned long i;</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO "Node %d Memory:", node);</div><div class='add'>+		printk(KERN_DEBUG "Node %d Memory:", node);</div><div class='ctx'> </div><div class='ctx'> 		count = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -609,14 +609,15 @@ static void __init *careful_allocation(int nid, unsigned long size,</div><div class='ctx'> 	return (void *)ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct notifier_block __cpuinitdata ppc64_numa_nb = {</div><div class='add'>+	.notifier_call = cpu_numa_callback,</div><div class='add'>+	.priority = 1 /* Must run before sched domains notifier. */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void __init do_init_bootmem(void)</div><div class='ctx'> {</div><div class='ctx'> 	int nid;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	static struct notifier_block ppc64_numa_nb = {</div><div class='del'>-		.notifier_call = cpu_numa_callback,</div><div class='del'>-		.priority = 1 /* Must run before sched domains notifier. */</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	min_low_pfn = 0;</div><div class='ctx'> 	max_low_pfn = lmb_end_of_DRAM() &gt;&gt; PAGE_SHIFT;</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c<br/>index 90628601fac7..8fcacb0239da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/pgtable_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/pgtable_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/pgtable_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/pgtable_32.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c<br/>index 7b278d83739e..b1da03165496 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/pgtable_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/pgtable_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/pgtable_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/pgtable_64.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c<br/>index ed7fcfe5fd37..7cceb2c44cb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/ppc_mmu_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/ppc_mmu_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/ppc_mmu_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/ppc_mmu_32.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -42,18 +41,14 @@ unsigned long _SDR1;</div><div class='ctx'> </div><div class='ctx'> union ubat {			/* BAT register values to be loaded */</div><div class='ctx'> 	BAT	bat;</div><div class='del'>-#ifdef CONFIG_PPC64BRIDGE</div><div class='del'>-	u64	word[2];</div><div class='del'>-#else</div><div class='ctx'> 	u32	word[2];</div><div class='del'>-#endif</div><div class='del'>-} BATS[4][2];			/* 4 pairs of IBAT, DBAT */</div><div class='add'>+} BATS[8][2];			/* 8 pairs of IBAT, DBAT */</div><div class='ctx'> </div><div class='ctx'> struct batrange {		/* stores address ranges mapped by BATs */</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> 	unsigned long limit;</div><div class='ctx'> 	unsigned long phys;</div><div class='del'>-} bat_addrs[4];</div><div class='add'>+} bat_addrs[8];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return PA for this VA if it is mapped by a BAT, or 0</div><div class='hunk'>@@ -190,7 +185,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,</div><div class='ctx'> 		return;</div><div class='ctx'> 	pmd = pmd_offset(pgd_offset(mm, ea), ea);</div><div class='ctx'> 	if (!pmd_none(*pmd))</div><div class='del'>-		add_hash_page(mm-&gt;context, ea, pmd_val(*pmd));</div><div class='add'>+		add_hash_page(mm-&gt;context.id, ea, pmd_val(*pmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -220,15 +215,9 @@ void __init MMU_init_hw(void)</div><div class='ctx'> </div><div class='ctx'> 	if ( ppc_md.progress ) ppc_md.progress("hash:enter", 0x105);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC64BRIDGE</div><div class='del'>-#define LG_HPTEG_SIZE	7		/* 128 bytes per HPTEG */</div><div class='del'>-#define SDR1_LOW_BITS	(lg_n_hpteg - 11)</div><div class='del'>-#define MIN_N_HPTEG	2048		/* min 256kB hash table */</div><div class='del'>-#else</div><div class='ctx'> #define LG_HPTEG_SIZE	6		/* 64 bytes per HPTEG */</div><div class='ctx'> #define SDR1_LOW_BITS	((n_hpteg - 1) &gt;&gt; 10)</div><div class='ctx'> #define MIN_N_HPTEG	1024		/* min 64kB hash table */</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allow 1 HPTE (1/8 HPTEG) for each page of memory.</div><div class='head'>diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c<br/>index ffc8ed4de62d..de0c8842415c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/slb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/slb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/slb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/slb.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -60,19 +59,19 @@ static inline void create_slbe(unsigned long ea, unsigned long flags,</div><div class='ctx'> 		     : "memory" );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void slb_flush_and_rebolt(void)</div><div class='add'>+void slb_flush_and_rebolt(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* If you change this make sure you change SLB_NUM_BOLTED</div><div class='ctx'> 	 * appropriately too. */</div><div class='del'>-	unsigned long linear_llp, virtual_llp, lflags, vflags;</div><div class='add'>+	unsigned long linear_llp, vmalloc_llp, lflags, vflags;</div><div class='ctx'> 	unsigned long ksp_esid_data;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!irqs_disabled());</div><div class='ctx'> </div><div class='ctx'> 	linear_llp = mmu_psize_defs[mmu_linear_psize].sllp;</div><div class='del'>-	virtual_llp = mmu_psize_defs[mmu_virtual_psize].sllp;</div><div class='add'>+	vmalloc_llp = mmu_psize_defs[mmu_vmalloc_psize].sllp;</div><div class='ctx'> 	lflags = SLB_VSID_KERNEL | linear_llp;</div><div class='del'>-	vflags = SLB_VSID_KERNEL | virtual_llp;</div><div class='add'>+	vflags = SLB_VSID_KERNEL | vmalloc_llp;</div><div class='ctx'> </div><div class='ctx'> 	ksp_esid_data = mk_esid_data(get_paca()-&gt;kstack, 2);</div><div class='ctx'> 	if ((ksp_esid_data &amp; ESID_MASK) == PAGE_OFFSET)</div><div class='hunk'>@@ -122,9 +121,6 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> 	get_paca()-&gt;slb_cache_ptr = 0;</div><div class='ctx'> 	get_paca()-&gt;context = mm-&gt;context;</div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-	get_paca()-&gt;pgdir = mm-&gt;pgd;</div><div class='del'>-#endif /* CONFIG_PPC_64K_PAGES */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * preload some userspace segments into the SLB.</div><div class='hunk'>@@ -167,11 +163,10 @@ static inline void patch_slb_encoding(unsigned int *insn_addr,</div><div class='ctx'> </div><div class='ctx'> void slb_initialize(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long linear_llp, virtual_llp;</div><div class='add'>+	unsigned long linear_llp, vmalloc_llp, io_llp;</div><div class='ctx'> 	static int slb_encoding_inited;</div><div class='ctx'> 	extern unsigned int *slb_miss_kernel_load_linear;</div><div class='del'>-	extern unsigned int *slb_miss_kernel_load_virtual;</div><div class='del'>-	extern unsigned int *slb_miss_user_load_normal;</div><div class='add'>+	extern unsigned int *slb_miss_kernel_load_io;</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> 	extern unsigned int *slb_miss_user_load_huge;</div><div class='ctx'> 	unsigned long huge_llp;</div><div class='hunk'>@@ -181,18 +176,19 @@ void slb_initialize(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare our SLB miss handler based on our page size */</div><div class='ctx'> 	linear_llp = mmu_psize_defs[mmu_linear_psize].sllp;</div><div class='del'>-	virtual_llp = mmu_psize_defs[mmu_virtual_psize].sllp;</div><div class='add'>+	io_llp = mmu_psize_defs[mmu_io_psize].sllp;</div><div class='add'>+	vmalloc_llp = mmu_psize_defs[mmu_vmalloc_psize].sllp;</div><div class='add'>+	get_paca()-&gt;vmalloc_sllp = SLB_VSID_KERNEL | vmalloc_llp;</div><div class='add'>+</div><div class='ctx'> 	if (!slb_encoding_inited) {</div><div class='ctx'> 		slb_encoding_inited = 1;</div><div class='ctx'> 		patch_slb_encoding(slb_miss_kernel_load_linear,</div><div class='ctx'> 				   SLB_VSID_KERNEL | linear_llp);</div><div class='del'>-		patch_slb_encoding(slb_miss_kernel_load_virtual,</div><div class='del'>-				   SLB_VSID_KERNEL | virtual_llp);</div><div class='del'>-		patch_slb_encoding(slb_miss_user_load_normal,</div><div class='del'>-				   SLB_VSID_USER | virtual_llp);</div><div class='add'>+		patch_slb_encoding(slb_miss_kernel_load_io,</div><div class='add'>+				   SLB_VSID_KERNEL | io_llp);</div><div class='ctx'> </div><div class='ctx'> 		DBG("SLB: linear  LLP = %04x\n", linear_llp);</div><div class='del'>-		DBG("SLB: virtual LLP = %04x\n", virtual_llp);</div><div class='add'>+		DBG("SLB: io      LLP = %04x\n", io_llp);</div><div class='ctx'> #ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> 		patch_slb_encoding(slb_miss_user_load_huge,</div><div class='ctx'> 				   SLB_VSID_USER | huge_llp);</div><div class='hunk'>@@ -207,7 +203,7 @@ void slb_initialize(void)</div><div class='ctx'> 	unsigned long lflags, vflags;</div><div class='ctx'> </div><div class='ctx'> 	lflags = SLB_VSID_KERNEL | linear_llp;</div><div class='del'>-	vflags = SLB_VSID_KERNEL | virtual_llp;</div><div class='add'>+	vflags = SLB_VSID_KERNEL | vmalloc_llp;</div><div class='ctx'> </div><div class='ctx'> 	/* Invalidate the entire SLB (even slot 0) &amp; all the ERATS */</div><div class='ctx'> 	asm volatile("isync":::"memory");</div><div class='hunk'>@@ -215,7 +211,6 @@ void slb_initialize(void)</div><div class='ctx'> 	asm volatile("isync; slbia; isync":::"memory");</div><div class='ctx'> 	create_slbe(PAGE_OFFSET, lflags, 0);</div><div class='ctx'> </div><div class='del'>-	/* VMALLOC space has 4K pages always for now */</div><div class='ctx'> 	create_slbe(VMALLOC_START, vflags, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* We don't bolt the stack for the time being - we're in boot,</div><div class='head'>diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S<br/>index abfaabf667bf..dbc1abbde038 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/slb_low.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/slb_low.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/slb_low.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/slb_low.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -59,10 +58,19 @@ _GLOBAL(slb_miss_kernel_load_linear)</div><div class='ctx'> 	li	r11,0</div><div class='ctx'> 	b	slb_finish_load</div><div class='ctx'> </div><div class='del'>-1:	/* vmalloc/ioremap mapping encoding bits, the "li" instruction below</div><div class='add'>+1:	/* vmalloc/ioremap mapping encoding bits, the "li" instructions below</div><div class='ctx'> 	 * will be patched by the kernel at boot</div><div class='ctx'> 	 */</div><div class='del'>-_GLOBAL(slb_miss_kernel_load_virtual)</div><div class='add'>+BEGIN_FTR_SECTION</div><div class='add'>+	/* check whether this is in vmalloc or ioremap space */</div><div class='add'>+	clrldi	r11,r10,48</div><div class='add'>+	cmpldi	r11,(VMALLOC_SIZE &gt;&gt; 28) - 1</div><div class='add'>+	bgt	5f</div><div class='add'>+	lhz	r11,PACAVMALLOCSLLP(r13)</div><div class='add'>+	b	slb_finish_load</div><div class='add'>+5:</div><div class='add'>+END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)</div><div class='add'>+_GLOBAL(slb_miss_kernel_load_io)</div><div class='ctx'> 	li	r11,0</div><div class='ctx'> 	b	slb_finish_load</div><div class='ctx'> </div><div class='hunk'>@@ -96,9 +104,7 @@ _GLOBAL(slb_miss_user_load_huge)</div><div class='ctx'> 1:</div><div class='ctx'> #endif /* CONFIG_HUGETLB_PAGE */</div><div class='ctx'> </div><div class='del'>-_GLOBAL(slb_miss_user_load_normal)</div><div class='del'>-	li	r11,0</div><div class='del'>-</div><div class='add'>+	lhz	r11,PACACONTEXTSLLP(r13)</div><div class='ctx'> 2:</div><div class='ctx'> 	ld	r9,PACACONTEXTID(r13)</div><div class='ctx'> 	rldimi	r10,r9,USER_ESID_BITS,0</div><div class='head'>diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c<br/>index 4a9291d9fef8..eeeacab548e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/stab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/stab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/stab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/stab.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -200,10 +199,6 @@ void switch_stab(struct task_struct *tsk, struct mm_struct *mm)</div><div class='ctx'> </div><div class='ctx'> 	__get_cpu_var(stab_cache_ptr) = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC_64K_PAGES</div><div class='del'>-	get_paca()-&gt;pgdir = mm-&gt;pgd;</div><div class='del'>-#endif /* CONFIG_PPC_64K_PAGES */</div><div class='del'>-</div><div class='ctx'> 	/* Now preload some entries for the new task */</div><div class='ctx'> 	if (test_tsk_thread_flag(tsk, TIF_32BIT))</div><div class='ctx'> 		unmapped_base = TASK_UNMAPPED_BASE_USER32;</div><div class='head'>diff --git a/arch/powerpc/mm/tlb_32.c b/arch/powerpc/mm/tlb_32.c<br/>index ad580f3742e5..925ff70be8ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/tlb_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/tlb_32.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -42,7 +41,7 @@ void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> 	if (Hash != 0) {</div><div class='ctx'> 		ptephys = __pa(ptep) &amp; PAGE_MASK;</div><div class='del'>-		flush_hash_pages(mm-&gt;context, addr, ptephys, 1);</div><div class='add'>+		flush_hash_pages(mm-&gt;context.id, addr, ptephys, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +101,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start,</div><div class='ctx'> 	pmd_t *pmd;</div><div class='ctx'> 	unsigned long pmd_end;</div><div class='ctx'> 	int count;</div><div class='del'>-	unsigned int ctx = mm-&gt;context;</div><div class='add'>+	unsigned int ctx = mm-&gt;context.id;</div><div class='ctx'> </div><div class='ctx'> 	if (Hash == 0) {</div><div class='ctx'> 		_tlbia();</div><div class='hunk'>@@ -172,7 +171,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)</div><div class='ctx'> 	mm = (vmaddr &lt; TASK_SIZE)? vma-&gt;vm_mm: &amp;init_mm;</div><div class='ctx'> 	pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr);</div><div class='ctx'> 	if (!pmd_none(*pmd))</div><div class='del'>-		flush_hash_pages(mm-&gt;context, vmaddr, pmd_val(*pmd), 1);</div><div class='add'>+		flush_hash_pages(mm-&gt;context.id, vmaddr, pmd_val(*pmd), 1);</div><div class='ctx'> 	FINISH_FLUSH;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c<br/>index f734b11566c2..f6eef78efd29 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/mm/tlb_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/mm/tlb_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/mm/tlb_64.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -131,7 +130,7 @@ void hpte_update(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> {</div><div class='ctx'> 	struct ppc64_tlb_batch *batch = &amp;__get_cpu_var(ppc64_tlb_batch);</div><div class='ctx'> 	unsigned long vsid;</div><div class='del'>-	unsigned int psize = mmu_virtual_psize;</div><div class='add'>+	unsigned int psize;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	i = batch-&gt;index;</div><div class='hunk'>@@ -148,7 +147,8 @@ void hpte_update(struct mm_struct *mm, unsigned long addr,</div><div class='ctx'> #else</div><div class='ctx'> 		BUG();</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='add'>+	} else</div><div class='add'>+		psize = pte_pagesize_index(pte);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This can happen when we are in the middle of a TLB batch and</div><div class='head'>diff --git a/arch/powerpc/oprofile/Kconfig b/arch/powerpc/oprofile/Kconfig<br/>index d03c0e5ca870..eb2dece76a54 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/oprofile/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> config PROFILING</div><div class='del'>-	depends on !PPC_ISERIES</div><div class='ctx'> 	bool "Profiling support (EXPERIMENTAL)"</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to enable the extended profiling support mechanisms used</div><div class='head'>diff --git a/arch/powerpc/oprofile/Makefile b/arch/powerpc/oprofile/Makefile<br/>index f5f9859a8338..3145d610b5b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/oprofile/Makefile</a></div><div class='hunk'>@@ -1,3 +1,7 @@</div><div class='add'>+ifeq ($(CONFIG_PPC64),y)</div><div class='add'>+EXTRA_CFLAGS	+= -mno-minimal-toc</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_OPROFILE) += oprofile.o</div><div class='ctx'> </div><div class='ctx'> DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \</div><div class='head'>diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c<br/>index 5b1de7e8041e..fd0bbbe7a4de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/oprofile/common.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;asm/pmc.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='ctx'> #include &lt;asm/oprofile_impl.h&gt;</div><div class='add'>+#include &lt;asm/firmware.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct op_powerpc_model *model;</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +94,7 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; model-&gt;num_counters; ++i) {</div><div class='ctx'> 		struct dentry *dir;</div><div class='del'>-		char buf[3];</div><div class='add'>+		char buf[4];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(buf, sizeof buf, "%d", i);</div><div class='ctx'> 		dir = oprofilefs_mkdir(sb, root, buf);</div><div class='hunk'>@@ -130,6 +131,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)</div><div class='ctx'> 	if (!cur_cpu_spec-&gt;oprofile_cpu_type)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_ISERIES))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	switch (cur_cpu_spec-&gt;oprofile_type) {</div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='ctx'> 		case PPC_OPROFILE_RS64:</div><div class='hunk'>@@ -162,7 +166,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)</div><div class='ctx'> 	ops-&gt;stop = op_powerpc_stop;</div><div class='ctx'> 	ops-&gt;backtrace = op_powerpc_backtrace;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "oprofile: using %s performance monitoring.\n",</div><div class='add'>+	printk(KERN_DEBUG "oprofile: using %s performance monitoring.\n",</div><div class='ctx'> 	       ops-&gt;cpu_type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c<br/>index 4c2beab1fdc1..506f6b79f893 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/op_model_power4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/oprofile/op_model_power4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/oprofile/op_model_power4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/oprofile/op_model_power4.c</a></div><div class='hunk'>@@ -24,10 +24,6 @@</div><div class='ctx'> static unsigned long reset_value[OP_MAX_COUNTER];</div><div class='ctx'> </div><div class='ctx'> static int oprofile_running;</div><div class='del'>-static int mmcra_has_sihv;</div><div class='del'>-/* Unfortunately these bits vary between CPUs */</div><div class='del'>-static unsigned long mmcra_sihv = MMCRA_SIHV;</div><div class='del'>-static unsigned long mmcra_sipr = MMCRA_SIPR;</div><div class='ctx'> </div><div class='ctx'> /* mmcr values are set in power4_reg_setup, used in power4_cpu_setup */</div><div class='ctx'> static u32 mmcr0_val;</div><div class='hunk'>@@ -41,16 +37,6 @@ static void power4_reg_setup(struct op_counter_config *ctr,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * SIHV / SIPR bits are only implemented on POWER4+ (GQ) and above.</div><div class='del'>-	 * However we disable it on all POWER4 until we verify it works</div><div class='del'>-	 * (I was seeing some strange behaviour last time I tried).</div><div class='del'>-	 *</div><div class='del'>-	 * It has been verified to work on POWER5 so we enable it there.</div><div class='del'>-	 */</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_MMCRA_SIHV))</div><div class='del'>-		mmcra_has_sihv = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * The performance counter event settings are given in the mmcr0,</div><div class='ctx'> 	 * mmcr1 and mmcra values passed from the user in the</div><div class='ctx'> 	 * op_system_config structure (sys variable).</div><div class='hunk'>@@ -202,18 +188,19 @@ static unsigned long get_pc(struct pt_regs *regs)</div><div class='ctx'> 	unsigned long mmcra;</div><div class='ctx'> </div><div class='ctx'> 	/* Cant do much about it */</div><div class='del'>-	if (!mmcra_has_sihv)</div><div class='add'>+	if (!cur_cpu_spec-&gt;oprofile_mmcra_sihv)</div><div class='ctx'> 		return pc;</div><div class='ctx'> </div><div class='ctx'> 	mmcra = mfspr(SPRN_MMCRA);</div><div class='ctx'> </div><div class='ctx'> 	/* Were we in the hypervisor? */</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_LPAR) &amp;&amp; (mmcra &amp; mmcra_sihv))</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR) &amp;&amp;</div><div class='add'>+	    (mmcra &amp; cur_cpu_spec-&gt;oprofile_mmcra_sihv))</div><div class='ctx'> 		/* function descriptor madness */</div><div class='ctx'> 		return *((unsigned long *)hypervisor_bucket);</div><div class='ctx'> </div><div class='ctx'> 	/* We were in userspace, nothing to do */</div><div class='del'>-	if (mmcra &amp; mmcra_sipr)</div><div class='add'>+	if (mmcra &amp; cur_cpu_spec-&gt;oprofile_mmcra_sipr)</div><div class='ctx'> 		return pc;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_RTAS</div><div class='hunk'>@@ -235,15 +222,14 @@ static unsigned long get_pc(struct pt_regs *regs)</div><div class='ctx'> 	return pc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_kernel(unsigned long pc)</div><div class='add'>+static int get_kernel(unsigned long pc, unsigned long mmcra)</div><div class='ctx'> {</div><div class='ctx'> 	int is_kernel;</div><div class='ctx'> </div><div class='del'>-	if (!mmcra_has_sihv) {</div><div class='add'>+	if (!cur_cpu_spec-&gt;oprofile_mmcra_sihv) {</div><div class='ctx'> 		is_kernel = is_kernel_addr(pc);</div><div class='ctx'> 	} else {</div><div class='del'>-		unsigned long mmcra = mfspr(SPRN_MMCRA);</div><div class='del'>-		is_kernel = ((mmcra &amp; mmcra_sipr) == 0);</div><div class='add'>+		is_kernel = ((mmcra &amp; cur_cpu_spec-&gt;oprofile_mmcra_sipr) == 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return is_kernel;</div><div class='hunk'>@@ -257,9 +243,12 @@ static void power4_handle_interrupt(struct pt_regs *regs,</div><div class='ctx'> 	int val;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned int mmcr0;</div><div class='add'>+	unsigned long mmcra;</div><div class='add'>+</div><div class='add'>+	mmcra = mfspr(SPRN_MMCRA);</div><div class='ctx'> </div><div class='ctx'> 	pc = get_pc(regs);</div><div class='del'>-	is_kernel = get_kernel(pc);</div><div class='add'>+	is_kernel = get_kernel(pc, mmcra);</div><div class='ctx'> </div><div class='ctx'> 	/* set the PMM bit (see comment below) */</div><div class='ctx'> 	mtmsrd(mfmsr() | MSR_PMM);</div><div class='hunk'>@@ -287,6 +276,10 @@ static void power4_handle_interrupt(struct pt_regs *regs,</div><div class='ctx'> 	 */</div><div class='ctx'> 	mmcr0 &amp;= ~MMCR0_PMAO;</div><div class='ctx'> </div><div class='add'>+	/* Clear the appropriate bits in the MMCRA */</div><div class='add'>+	mmcra &amp;= ~cur_cpu_spec-&gt;oprofile_mmcra_clear;</div><div class='add'>+	mtspr(SPRN_MMCRA, mmcra);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * now clear the freeze bit, counting will not start until we</div><div class='ctx'> 	 * rfid from this exception, because only at that point will</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig<br/>index 7675e675dce1..5fe7b7faf45f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/Kconfig</a></div><div class='hunk'>@@ -16,12 +16,21 @@ config MPC834x_SYS</div><div class='ctx'> 	  3 PCI slots.  The PIBs PCI initialization is the bootloader's</div><div class='ctx'> 	  responsiblilty.</div><div class='ctx'> </div><div class='add'>+config MPC834x_ITX</div><div class='add'>+	bool "Freescale MPC834x ITX"</div><div class='add'>+	select DEFAULT_UIMAGE</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the MPC 834x ITX evaluation board.</div><div class='add'>+</div><div class='add'>+	  Be aware that PCI initialization is the bootloader's</div><div class='add'>+	  responsiblilty.</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> config MPC834x</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='ctx'> 	select PPC_INDIRECT_PCI</div><div class='del'>-	default y if MPC834x_SYS</div><div class='add'>+	default y if MPC834x_SYS || MPC834x_ITX</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile<br/>index 5c72367441a8..9387a110d28a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/Makefile</a></div><div class='hunk'>@@ -4,3 +4,4 @@</div><div class='ctx'> obj-y				:= misc.o</div><div class='ctx'> obj-$(CONFIG_PCI)		+= pci.o</div><div class='ctx'> obj-$(CONFIG_MPC834x_SYS)	+= mpc834x_sys.o</div><div class='add'>+obj-$(CONFIG_MPC834x_ITX)	+= mpc834x_itx.o</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c<br/>index 1455bcef4892..f0c6df61faa9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/misc.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c<br/>new file mode 100644<br/>index 000000000000..b46305645d38<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_itx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/mpc834x_itx.c</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/powerpc/platforms/83xx/mpc834x_itx.c</div><div class='add'>+ *</div><div class='add'>+ * MPC834x ITX board specific routines</div><div class='add'>+ *</div><div class='add'>+ * Maintainer: Kumar Gala &lt;galak@kernel.crashing.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/major.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/root_dev.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/ipic.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc83xx.h"</div><div class='add'>+</div><div class='add'>+#include &lt;platforms/83xx/mpc834x_sys.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PCI</div><div class='add'>+unsigned long isa_io_base = 0;</div><div class='add'>+unsigned long isa_mem_base = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static int</div><div class='add'>+mpc83xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)</div><div class='add'>+{</div><div class='add'>+	static char pci_irq_table[][4] =</div><div class='add'>+	    /*</div><div class='add'>+	     *      PCI IDSEL/INTPIN-&gt;INTLINE</div><div class='add'>+	     *       A      B      C      D</div><div class='add'>+	     */</div><div class='add'>+	{</div><div class='add'>+		{PIRQB, PIRQC, PIRQD, PIRQA},	/* idsel 0x0e */</div><div class='add'>+		{PIRQA, PIRQB, PIRQC, PIRQD},	/* idsel 0x0f */</div><div class='add'>+		{PIRQC, PIRQD, PIRQA, PIRQB},	/* idsel 0x10 */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	const long min_idsel = 0x0e, max_idsel = 0x10, irqs_per_slot = 4;</div><div class='add'>+	return PCI_IRQ_TABLE_LOOKUP;</div><div class='add'>+}</div><div class='add'>+#endif				/* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+/* ************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Setup the architecture</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void __init mpc834x_itx_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("mpc834x_itx_setup_arch()", 0);</div><div class='add'>+</div><div class='add'>+	np = of_find_node_by_type(NULL, "cpu");</div><div class='add'>+	if (np != 0) {</div><div class='add'>+		unsigned int *fp =</div><div class='add'>+		    (int *)get_property(np, "clock-frequency", NULL);</div><div class='add'>+		if (fp != 0)</div><div class='add'>+			loops_per_jiffy = *fp / HZ;</div><div class='add'>+		else</div><div class='add'>+			loops_per_jiffy = 50000000 / HZ;</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)</div><div class='add'>+		add_bridge(np);</div><div class='add'>+</div><div class='add'>+	ppc_md.pci_swizzle = common_swizzle;</div><div class='add'>+	ppc_md.pci_map_irq = mpc83xx_map_irq;</div><div class='add'>+	ppc_md.pci_exclude_device = mpc83xx_exclude_device;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef  CONFIG_ROOT_NFS</div><div class='add'>+	ROOT_DEV = Root_NFS;</div><div class='add'>+#else</div><div class='add'>+	ROOT_DEV = Root_HDA1;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init mpc834x_itx_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	u8 senses[8] = {</div><div class='add'>+		0,			/* EXT 0 */</div><div class='add'>+		IRQ_SENSE_LEVEL,	/* EXT 1 */</div><div class='add'>+		IRQ_SENSE_LEVEL,	/* EXT 2 */</div><div class='add'>+		0,			/* EXT 3 */</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+		IRQ_SENSE_LEVEL,	/* EXT 4 */</div><div class='add'>+		IRQ_SENSE_LEVEL,	/* EXT 5 */</div><div class='add'>+		IRQ_SENSE_LEVEL,	/* EXT 6 */</div><div class='add'>+		IRQ_SENSE_LEVEL,	/* EXT 7 */</div><div class='add'>+#else</div><div class='add'>+		0,			/* EXT 4 */</div><div class='add'>+		0,			/* EXT 5 */</div><div class='add'>+		0,			/* EXT 6 */</div><div class='add'>+		0,			/* EXT 7 */</div><div class='add'>+#endif</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ipic_init(get_immrbase() + 0x00700, 0, 0, senses, 8);</div><div class='add'>+</div><div class='add'>+	/* Initialize the default interrupt mapping priorities,</div><div class='add'>+	 * in case the boot rom changed something on us.</div><div class='add'>+	 */</div><div class='add'>+	ipic_set_default_priority();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, MMU is off, device-tree isn't unflattened</div><div class='add'>+ */</div><div class='add'>+static int __init mpc834x_itx_probe(void)</div><div class='add'>+{</div><div class='add'>+	/* We always match for now, eventually we should look at the flat</div><div class='add'>+	   dev tree to ensure this is the board we are suppose to run on</div><div class='add'>+	*/</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(mpc834x_itx) {</div><div class='add'>+	.name			= "MPC834x ITX",</div><div class='add'>+	.probe			= mpc834x_itx_probe,</div><div class='add'>+	.setup_arch		= mpc834x_itx_setup_arch,</div><div class='add'>+	.init_IRQ		= mpc834x_itx_init_IRQ,</div><div class='add'>+	.get_irq		= ipic_get_irq,</div><div class='add'>+	.restart		= mpc83xx_restart,</div><div class='add'>+	.time_init		= mpc83xx_time_init,</div><div class='add'>+	.calibrate_decr		= generic_calibrate_decr,</div><div class='add'>+	.progress		= udbg_progress,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.h b/arch/powerpc/platforms/83xx/mpc834x_itx.h<br/>new file mode 100644<br/>index 000000000000..174ca4ef55f3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_itx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/mpc834x_itx.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/powerpc/platforms/83xx/mpc834x_itx.h</div><div class='add'>+ *</div><div class='add'>+ * MPC834X ITX common board definitions</div><div class='add'>+ *</div><div class='add'>+ * Maintainer: Kumar Gala &lt;galak@kernel.crashing.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_MPC83XX_ITX_H__</div><div class='add'>+#define __MACH_MPC83XX_ITX_H__</div><div class='add'>+</div><div class='add'>+#define PIRQA	MPC83xx_IRQ_EXT4</div><div class='add'>+#define PIRQB	MPC83xx_IRQ_EXT5</div><div class='add'>+#define PIRQC	MPC83xx_IRQ_EXT6</div><div class='add'>+#define PIRQD	MPC83xx_IRQ_EXT7</div><div class='add'>+</div><div class='add'>+#endif				/* __MACH_MPC83XX_ITX_H__ */</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_sys.c<br/>index 7e789d2420ba..3e1c16eb4a63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_sys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/mpc834x_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/mpc834x_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/mpc834x_sys.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c<br/>index 16f7d3b30e1d..3b5e563c279f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/83xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/83xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/83xx/pci.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -91,9 +90,10 @@ int __init add_bridge(struct device_node *dev)</div><div class='ctx'> 		mpc83xx_pci2_busno = hose-&gt;first_busno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%08lx. "</div><div class='add'>+	printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "</div><div class='ctx'> 	       "Firmware bus number: %d-&gt;%d\n",</div><div class='del'>-	       rsrc.start, hose-&gt;first_busno, hose-&gt;last_busno);</div><div class='add'>+	       (unsigned long long)rsrc.start, hose-&gt;first_busno,</div><div class='add'>+	       hose-&gt;last_busno);</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt;Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",</div><div class='ctx'> 	    hose, hose-&gt;cfg_addr, hose-&gt;cfg_data);</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig<br/>index 06e371282f57..454fc53289ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/Kconfig</a></div><div class='hunk'>@@ -11,13 +11,20 @@ config MPC8540_ADS</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables support for the MPC 8540 ADS board</div><div class='ctx'> </div><div class='add'>+config MPC85xx_CDS</div><div class='add'>+	bool "Freescale MPC85xx CDS"</div><div class='add'>+	select DEFAULT_UIMAGE</div><div class='add'>+	select PPC_I8259 if PCI</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the MPC85xx CDS board</div><div class='add'>+</div><div class='ctx'> endchoice</div><div class='ctx'> </div><div class='ctx'> config MPC8540</div><div class='ctx'> 	bool</div><div class='ctx'> 	select PPC_UDBG_16550</div><div class='ctx'> 	select PPC_INDIRECT_PCI</div><div class='del'>-	default y if MPC8540_ADS</div><div class='add'>+	default y if MPC8540_ADS || MPC85xx_CDS</div><div class='ctx'> </div><div class='ctx'> config PPC_INDIRECT_PCI_BE</div><div class='ctx'> 	bool</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile<br/>index ffc4139cb214..7615aa59c78b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/Makefile</a></div><div class='hunk'>@@ -3,3 +3,4 @@</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_PPC_85xx)	+= misc.o pci.o</div><div class='ctx'> obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o</div><div class='add'>+obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc8540_ads.h b/arch/powerpc/platforms/85xx/mpc8540_ads.h<br/>index f770cadb2080..c0d56d2bb5a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc8540_ads.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/mpc8540_ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc8540_ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/mpc8540_ads.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef __MACH_MPC8540ADS_H__</div><div class='ctx'> #define __MACH_MPC8540ADS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define BOARD_CCSRBAR		((uint)0xe0000000)</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c<br/>index 5eeff370f5fc..06a497676c99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_ads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/mpc85xx_ads.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c<br/>new file mode 100644<br/>index 000000000000..18e6e11f7020<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_cds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/mpc85xx_cds.c</a></div><div class='hunk'>@@ -0,0 +1,359 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC85xx setup and early boot code plus other random bits.</div><div class='add'>+ *</div><div class='add'>+ * Maintained by Kumar Gala (see MAINTAINERS for contact information)</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/major.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/root_dev.h&gt;</div><div class='add'>+#include &lt;linux/initrd.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fsl_devices.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/ipic.h&gt;</div><div class='add'>+#include &lt;asm/bootinfo.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/mpc85xx.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;mm/mmu_decl.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;asm/mpic.h&gt;</div><div class='add'>+#include &lt;asm/i8259.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+#include "mpc85xx.h"</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PCI</div><div class='add'>+unsigned long isa_io_base = 0;</div><div class='add'>+unsigned long isa_mem_base = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int cds_pci_slot = 2;</div><div class='add'>+static volatile u8 *cadmus;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal interrupts are all Level Sensitive, and Positive Polarity</div><div class='add'>+ *</div><div class='add'>+ * Note:  Likely, this table and the following function should be</div><div class='add'>+ *        obtained and derived from the OF Device Tree.</div><div class='add'>+ */</div><div class='add'>+static u_char mpc85xx_cds_openpic_initsenses[] __initdata = {</div><div class='add'>+	MPC85XX_INTERNAL_IRQ_SENSES,</div><div class='add'>+#if defined(CONFIG_PCI)</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Ext 0: PCI slot 0 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext 1: PCI slot 1 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext 2: PCI slot 2 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext 3: PCI slot 3 */</div><div class='add'>+#else</div><div class='add'>+	0x0,				/* External  0: */</div><div class='add'>+	0x0,				/* External  1: */</div><div class='add'>+	0x0,				/* External  2: */</div><div class='add'>+	0x0,				/* External  3: */</div><div class='add'>+#endif</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* External 5: PHY */</div><div class='add'>+	0x0,				/* External  6: */</div><div class='add'>+	0x0,				/* External  7: */</div><div class='add'>+	0x0,				/* External  8: */</div><div class='add'>+	0x0,				/* External  9: */</div><div class='add'>+	0x0,				/* External 10: */</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),    /* Ext 11: PCI2 slot 0 */</div><div class='add'>+#else</div><div class='add'>+	0x0,				/* External 11: */</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+/*</div><div class='add'>+ * interrupt routing</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = pci_bus_to_hose(dev-&gt;bus-&gt;number);</div><div class='add'>+</div><div class='add'>+	if (!hose-&gt;index)</div><div class='add'>+	{</div><div class='add'>+		/* Handle PCI1 interrupts */</div><div class='add'>+		char pci_irq_table[][4] =</div><div class='add'>+			/*</div><div class='add'>+			 *      PCI IDSEL/INTPIN-&gt;INTLINE</div><div class='add'>+			 *        A      B      C      D</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			/* Note IRQ assignment for slots is based on which slot the elysium is</div><div class='add'>+			 * in -- in this setup elysium is in slot #2 (this PIRQA as first</div><div class='add'>+			 * interrupt on slot */</div><div class='add'>+		{</div><div class='add'>+			{ 0, 1, 2, 3 }, /* 16 - PMC */</div><div class='add'>+			{ 0, 1, 2, 3 }, /* 17 P2P (Tsi320) */</div><div class='add'>+			{ 0, 1, 2, 3 }, /* 18 - Slot 1 */</div><div class='add'>+			{ 1, 2, 3, 0 }, /* 19 - Slot 2 */</div><div class='add'>+			{ 2, 3, 0, 1 }, /* 20 - Slot 3 */</div><div class='add'>+			{ 3, 0, 1, 2 }, /* 21 - Slot 4 */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		const long min_idsel = 16, max_idsel = 21, irqs_per_slot = 4;</div><div class='add'>+		int i, j;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 6; i++)</div><div class='add'>+			for (j = 0; j &lt; 4; j++)</div><div class='add'>+				pci_irq_table[i][j] =</div><div class='add'>+					((pci_irq_table[i][j] + 5 -</div><div class='add'>+					  cds_pci_slot) &amp; 0x3) + PIRQ0A;</div><div class='add'>+</div><div class='add'>+		return PCI_IRQ_TABLE_LOOKUP;</div><div class='add'>+	} else {</div><div class='add'>+		/* Handle PCI2 interrupts (if we have one) */</div><div class='add'>+		char pci_irq_table[][4] =</div><div class='add'>+		{</div><div class='add'>+			/*</div><div class='add'>+			 * We only have one slot and one interrupt</div><div class='add'>+			 * going to PIRQA - PIRQD */</div><div class='add'>+			{ PIRQ1A, PIRQ1A, PIRQ1A, PIRQ1A }, /* 21 - slot 0 */</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		const long min_idsel = 21, max_idsel = 21, irqs_per_slot = 4;</div><div class='add'>+</div><div class='add'>+		return PCI_IRQ_TABLE_LOOKUP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ARCADIA_HOST_BRIDGE_IDSEL	17</div><div class='add'>+#define ARCADIA_2ND_BRIDGE_IDSEL	3</div><div class='add'>+</div><div class='add'>+extern int mpc85xx_pci2_busno;</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mpc85xx_exclude_device(u_char bus, u_char devfn)</div><div class='add'>+{</div><div class='add'>+	if (bus == 0 &amp;&amp; PCI_SLOT(devfn) == 0)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	if (mpc85xx_pci2_busno)</div><div class='add'>+		if (bus == (mpc85xx_pci2_busno) &amp;&amp; PCI_SLOT(devfn) == 0)</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	/* We explicitly do not go past the Tundra 320 Bridge */</div><div class='add'>+	if ((bus == 1) &amp;&amp; (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	if ((bus == 0) &amp;&amp; (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	else</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+mpc85xx_cds_pcibios_fixup(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	u_char		c;</div><div class='add'>+</div><div class='add'>+	if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='add'>+					PCI_DEVICE_ID_VIA_82C586_1, NULL))) {</div><div class='add'>+		/*</div><div class='add'>+		 * U-Boot does not set the enable bits</div><div class='add'>+		 * for the IDE device. Force them on here.</div><div class='add'>+		 */</div><div class='add'>+		pci_read_config_byte(dev, 0x40, &amp;c);</div><div class='add'>+		c |= 0x03; /* IDE: Chip Enable Bits */</div><div class='add'>+		pci_write_config_byte(dev, 0x40, c);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Since only primary interface works, force the</div><div class='add'>+		 * IDE function to standard primary IDE interrupt</div><div class='add'>+		 * w/ 8259 offset</div><div class='add'>+		 */</div><div class='add'>+		dev-&gt;irq = 14;</div><div class='add'>+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev-&gt;irq);</div><div class='add'>+		pci_dev_put(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force legacy USB interrupt routing</div><div class='add'>+	 */</div><div class='add'>+	if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='add'>+					PCI_DEVICE_ID_VIA_82C586_2, NULL))) {</div><div class='add'>+		dev-&gt;irq = 10;</div><div class='add'>+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);</div><div class='add'>+		pci_dev_put(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='add'>+					PCI_DEVICE_ID_VIA_82C586_2, dev))) {</div><div class='add'>+		dev-&gt;irq = 11;</div><div class='add'>+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);</div><div class='add'>+		pci_dev_put(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+void __init mpc85xx_cds_pic_init(void)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic1;</div><div class='add'>+	phys_addr_t OpenPIC_PAddr;</div><div class='add'>+</div><div class='add'>+	/* Determine the Physical Address of the OpenPIC regs */</div><div class='add'>+	OpenPIC_PAddr = get_immrbase() + MPC85xx_OPENPIC_OFFSET;</div><div class='add'>+</div><div class='add'>+	mpic1 = mpic_alloc(OpenPIC_PAddr,</div><div class='add'>+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+			4, MPC85xx_OPENPIC_IRQ_OFFSET, 0, 250,</div><div class='add'>+			mpc85xx_cds_openpic_initsenses,</div><div class='add'>+			sizeof(mpc85xx_cds_openpic_initsenses), " OpenPIC  ");</div><div class='add'>+	BUG_ON(mpic1 == NULL);</div><div class='add'>+	mpic_assign_isu(mpic1, 0, OpenPIC_PAddr + 0x10200);</div><div class='add'>+	mpic_assign_isu(mpic1, 1, OpenPIC_PAddr + 0x10280);</div><div class='add'>+	mpic_assign_isu(mpic1, 2, OpenPIC_PAddr + 0x10300);</div><div class='add'>+	mpic_assign_isu(mpic1, 3, OpenPIC_PAddr + 0x10380);</div><div class='add'>+	mpic_assign_isu(mpic1, 4, OpenPIC_PAddr + 0x10400);</div><div class='add'>+	mpic_assign_isu(mpic1, 5, OpenPIC_PAddr + 0x10480);</div><div class='add'>+	mpic_assign_isu(mpic1, 6, OpenPIC_PAddr + 0x10500);</div><div class='add'>+	mpic_assign_isu(mpic1, 7, OpenPIC_PAddr + 0x10580);</div><div class='add'>+</div><div class='add'>+	/* dummy mappings to get to 48 */</div><div class='add'>+	mpic_assign_isu(mpic1, 8, OpenPIC_PAddr + 0x10600);</div><div class='add'>+	mpic_assign_isu(mpic1, 9, OpenPIC_PAddr + 0x10680);</div><div class='add'>+	mpic_assign_isu(mpic1, 10, OpenPIC_PAddr + 0x10700);</div><div class='add'>+	mpic_assign_isu(mpic1, 11, OpenPIC_PAddr + 0x10780);</div><div class='add'>+</div><div class='add'>+	/* External ints */</div><div class='add'>+	mpic_assign_isu(mpic1, 12, OpenPIC_PAddr + 0x10000);</div><div class='add'>+	mpic_assign_isu(mpic1, 13, OpenPIC_PAddr + 0x10080);</div><div class='add'>+	mpic_assign_isu(mpic1, 14, OpenPIC_PAddr + 0x10100);</div><div class='add'>+</div><div class='add'>+	mpic_init(mpic1);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	mpic_setup_cascade(PIRQ0A, i8259_irq_cascade, NULL);</div><div class='add'>+</div><div class='add'>+	i8259_init(0,0);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup the architecture</div><div class='add'>+ */</div><div class='add'>+static void __init</div><div class='add'>+mpc85xx_cds_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *cpu;</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	struct device_node *np;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("mpc85xx_cds_setup_arch()", 0);</div><div class='add'>+</div><div class='add'>+	cpu = of_find_node_by_type(NULL, "cpu");</div><div class='add'>+	if (cpu != 0) {</div><div class='add'>+		unsigned int *fp;</div><div class='add'>+</div><div class='add'>+		fp = (int *)get_property(cpu, "clock-frequency", NULL);</div><div class='add'>+		if (fp != 0)</div><div class='add'>+			loops_per_jiffy = *fp / HZ;</div><div class='add'>+		else</div><div class='add'>+			loops_per_jiffy = 500000000 / HZ;</div><div class='add'>+		of_node_put(cpu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cadmus = ioremap(CADMUS_BASE, CADMUS_SIZE);</div><div class='add'>+	cds_pci_slot = ((cadmus[CM_CSR] &gt;&gt; 6) &amp; 0x3) + 1;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.progress) {</div><div class='add'>+		char buf[40];</div><div class='add'>+		snprintf(buf, 40, "CDS Version = 0x%x in slot %d\n",</div><div class='add'>+				cadmus[CM_VER], cds_pci_slot);</div><div class='add'>+		ppc_md.progress(buf, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)</div><div class='add'>+		add_bridge(np);</div><div class='add'>+</div><div class='add'>+	ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;</div><div class='add'>+	ppc_md.pci_swizzle = common_swizzle;</div><div class='add'>+	ppc_md.pci_map_irq = mpc85xx_map_irq;</div><div class='add'>+	ppc_md.pci_exclude_device = mpc85xx_exclude_device;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef  CONFIG_ROOT_NFS</div><div class='add'>+	ROOT_DEV = Root_NFS;</div><div class='add'>+#else</div><div class='add'>+	ROOT_DEV = Root_HDA1;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mpc85xx_cds_show_cpuinfo(struct seq_file *m)</div><div class='add'>+{</div><div class='add'>+	uint pvid, svid, phid1;</div><div class='add'>+	uint memsize = total_memory;</div><div class='add'>+</div><div class='add'>+	pvid = mfspr(SPRN_PVR);</div><div class='add'>+	svid = mfspr(SPRN_SVR);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");</div><div class='add'>+	seq_printf(m, "Machine\t\t: MPC85xx CDS (0x%x)\n", cadmus[CM_VER]);</div><div class='add'>+	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);</div><div class='add'>+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='add'>+</div><div class='add'>+	/* Display cpu Pll setting */</div><div class='add'>+	phid1 = mfspr(SPRN_HID1);</div><div class='add'>+	seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 &gt;&gt; 24) &amp; 0x3f));</div><div class='add'>+</div><div class='add'>+	/* Display the amount of memory */</div><div class='add'>+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, device-tree isn't unflattened</div><div class='add'>+ */</div><div class='add'>+static int __init mpc85xx_cds_probe(void)</div><div class='add'>+{</div><div class='add'>+	/* We always match for now, eventually we should look at</div><div class='add'>+	 * the flat dev tree to ensure this is the board we are</div><div class='add'>+	 * supposed to run on</div><div class='add'>+	 */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+define_machine(mpc85xx_cds) {</div><div class='add'>+	.name		= "MPC85xx CDS",</div><div class='add'>+	.probe		= mpc85xx_cds_probe,</div><div class='add'>+	.setup_arch	= mpc85xx_cds_setup_arch,</div><div class='add'>+	.init_IRQ	= mpc85xx_cds_pic_init,</div><div class='add'>+	.show_cpuinfo	= mpc85xx_cds_show_cpuinfo,</div><div class='add'>+	.get_irq	= mpic_get_irq,</div><div class='add'>+	.restart	= mpc85xx_restart,</div><div class='add'>+	.calibrate_decr = generic_calibrate_decr,</div><div class='add'>+	.progress	= udbg_progress,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.h b/arch/powerpc/platforms/85xx/mpc85xx_cds.h<br/>new file mode 100644<br/>index 000000000000..671f54ff185a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/mpc85xx_cds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/mpc85xx_cds.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/ppc/platforms/85xx/mpc85xx_cds_common.h</div><div class='add'>+ *</div><div class='add'>+ * MPC85xx CDS board definitions</div><div class='add'>+ *</div><div class='add'>+ * Maintainer: Kumar Gala &lt;galak@kernel.crashing.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2004 Freescale Semiconductor, Inc</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACH_MPC85XX_CDS_H__</div><div class='add'>+#define __MACH_MPC85XX_CDS_H__</div><div class='add'>+</div><div class='add'>+/* CADMUS info */</div><div class='add'>+#define CADMUS_BASE (0xf8004000)</div><div class='add'>+#define CADMUS_SIZE (256)</div><div class='add'>+#define CM_VER	(0)</div><div class='add'>+#define CM_CSR	(1)</div><div class='add'>+#define CM_RST	(2)</div><div class='add'>+</div><div class='add'>+/* CDS NVRAM/RTC */</div><div class='add'>+#define CDS_RTC_ADDR	(0xf8000000)</div><div class='add'>+#define CDS_RTC_SIZE	(8 * 1024)</div><div class='add'>+</div><div class='add'>+/* PCI interrupt controller */</div><div class='add'>+#define PIRQ0A			MPC85xx_IRQ_EXT0</div><div class='add'>+#define PIRQ0B			MPC85xx_IRQ_EXT1</div><div class='add'>+#define PIRQ0C			MPC85xx_IRQ_EXT2</div><div class='add'>+#define PIRQ0D			MPC85xx_IRQ_EXT3</div><div class='add'>+#define PIRQ1A			MPC85xx_IRQ_EXT11</div><div class='add'>+</div><div class='add'>+#define NR_8259_INTS		16</div><div class='add'>+#define CPM_IRQ_OFFSET		NR_8259_INTS</div><div class='add'>+</div><div class='add'>+#define MPC85xx_OPENPIC_IRQ_OFFSET	80</div><div class='add'>+</div><div class='add'>+#endif /* __MACH_MPC85XX_CDS_H__ */</div><div class='head'>diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c<br/>index bad290110ed1..1d51f3242ab1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/85xx/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/85xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/85xx/pci.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -79,9 +78,10 @@ int __init add_bridge(struct device_node *dev)</div><div class='ctx'> 		mpc85xx_pci2_busno = hose-&gt;first_busno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%08lx. "</div><div class='add'>+	printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. "</div><div class='ctx'> 	       "Firmware bus number: %d-&gt;%d\n",</div><div class='del'>-		rsrc.start, hose-&gt;first_busno, hose-&gt;last_busno);</div><div class='add'>+		(unsigned long long)rsrc.start, hose-&gt;first_busno,</div><div class='add'>+		hose-&gt;last_busno);</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt;Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",</div><div class='ctx'> 		hose, hose-&gt;cfg_addr, hose-&gt;cfg_data);</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig<br/>new file mode 100644<br/>index 000000000000..d1ecc0f9ab58<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+menu "Platform Support"</div><div class='add'>+	depends on PPC_86xx</div><div class='add'>+</div><div class='add'>+choice</div><div class='add'>+	prompt "Machine Type"</div><div class='add'>+	default MPC8641_HPCN</div><div class='add'>+</div><div class='add'>+config MPC8641_HPCN</div><div class='add'>+	bool "Freescale MPC8641 HPCN"</div><div class='add'>+	select PPC_I8259</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the MPC8641 HPCN board.</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+config MPC8641</div><div class='add'>+	bool</div><div class='add'>+	select PPC_INDIRECT_PCI</div><div class='add'>+	select PPC_UDBG_16550</div><div class='add'>+	default y if MPC8641_HPCN</div><div class='add'>+</div><div class='add'>+config MPIC</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config PPC_INDIRECT_PCI_BE</div><div class='add'>+	bool</div><div class='add'>+	depends on PPC_86xx</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile<br/>new file mode 100644<br/>index 000000000000..476a6eeee710<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the PowerPC 86xx linux kernel.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SMP)		+= mpc86xx_smp.o</div><div class='add'>+obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o</div><div class='add'>+obj-$(CONFIG_PCI)		+= pci.o mpc86xx_pcie.o</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc8641_hpcn.h b/arch/powerpc/platforms/86xx/mpc8641_hpcn.h<br/>new file mode 100644<br/>index 000000000000..5d2bcf78cef7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc8641_hpcn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/mpc8641_hpcn.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC8641 HPCN board definitions</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * Author: Xianghua Xiao &lt;x.xiao@freescale.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MPC8641_HPCN_H__</div><div class='add'>+#define __MPC8641_HPCN_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+/* PCI interrupt controller */</div><div class='add'>+#define PIRQA		3</div><div class='add'>+#define PIRQB		4</div><div class='add'>+#define PIRQC		5</div><div class='add'>+#define PIRQD		6</div><div class='add'>+#define PIRQ7		7</div><div class='add'>+#define PIRQE		9</div><div class='add'>+#define PIRQF		10</div><div class='add'>+#define PIRQG		11</div><div class='add'>+#define PIRQH		12</div><div class='add'>+</div><div class='add'>+/* PCI-Express memory map */</div><div class='add'>+#define MPC86XX_PCIE_LOWER_IO        0x00000000</div><div class='add'>+#define MPC86XX_PCIE_UPPER_IO        0x00ffffff</div><div class='add'>+</div><div class='add'>+#define MPC86XX_PCIE_LOWER_MEM       0x80000000</div><div class='add'>+#define MPC86XX_PCIE_UPPER_MEM       0x9fffffff</div><div class='add'>+</div><div class='add'>+#define MPC86XX_PCIE_IO_BASE         0xe2000000</div><div class='add'>+#define MPC86XX_PCIE_MEM_OFFSET      0x00000000</div><div class='add'>+</div><div class='add'>+#define MPC86XX_PCIE_IO_SIZE         0x01000000</div><div class='add'>+</div><div class='add'>+#define PCIE1_CFG_ADDR_OFFSET    (0x8000)</div><div class='add'>+#define PCIE1_CFG_DATA_OFFSET    (0x8004)</div><div class='add'>+</div><div class='add'>+#define PCIE2_CFG_ADDR_OFFSET    (0x9000)</div><div class='add'>+#define PCIE2_CFG_DATA_OFFSET    (0x9004)</div><div class='add'>+</div><div class='add'>+#define MPC86xx_PCIE_OFFSET PCIE1_CFG_ADDR_OFFSET</div><div class='add'>+#define MPC86xx_PCIE_SIZE	(0x1000)</div><div class='add'>+</div><div class='add'>+#define MPC86XX_RSTCR_OFFSET	(0xe00b0)	/* Reset Control Register */</div><div class='add'>+</div><div class='add'>+#endif	/* __MPC8641_HPCN_H__ */</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx.h b/arch/powerpc/platforms/86xx/mpc86xx.h<br/>new file mode 100644<br/>index 000000000000..2834462590b8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/mpc86xx.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MPC86XX_H__</div><div class='add'>+#define __MPC86XX_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Declaration for the various functions exported by the</div><div class='add'>+ * mpc86xx_* files. Mostly for use by mpc86xx_setup().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+extern int add_bridge(struct device_node *dev);</div><div class='add'>+</div><div class='add'>+extern int mpc86xx_exclude_device(u_char bus, u_char devfn);</div><div class='add'>+</div><div class='add'>+extern void setup_indirect_pcie(struct pci_controller *hose,</div><div class='add'>+				       u32 cfg_addr, u32 cfg_data);</div><div class='add'>+extern void setup_indirect_pcie_nomap(struct pci_controller *hose,</div><div class='add'>+					     void __iomem *cfg_addr,</div><div class='add'>+					     void __iomem *cfg_data);</div><div class='add'>+</div><div class='add'>+extern void __init mpc86xx_smp_init(void);</div><div class='add'>+</div><div class='add'>+#endif	/* __MPC86XX_H__ */</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c<br/>new file mode 100644<br/>index 000000000000..ebae73eb0063<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/mpc86xx_hpcn.c</a></div><div class='hunk'>@@ -0,0 +1,439 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC86xx HPCN board specific routines</div><div class='add'>+ *</div><div class='add'>+ * Recode: ZHANG WEI &lt;wei.zhang@freescale.com&gt;</div><div class='add'>+ * Initial author: Xianghua Xiao &lt;x.xiao@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/root_dev.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/mpc86xx.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;mm/mmu_decl.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;asm/i8259.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mpic.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc86xx.h"</div><div class='add'>+#include "mpc8641_hpcn.h"</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PCI</div><div class='add'>+unsigned long isa_io_base = 0;</div><div class='add'>+unsigned long isa_mem_base = 0;</div><div class='add'>+unsigned long pci_dram_offset = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Internal interrupts are all Level Sensitive, and Positive Polarity</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u_char mpc86xx_hpcn_openpic_initsenses[] __initdata = {</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  0: Reserved */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  1: MCM */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  2: DDR DRAM */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  3: LBIU */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  4: DMA 0 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  5: DMA 1 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  6: DMA 2 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  7: DMA 3 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  8: PCIE1 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal  9: PCIE2 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 10: Reserved */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 11: Reserved */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 12: DUART2 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 13: TSEC 1 Transmit */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 14: TSEC 1 Receive */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 15: TSEC 3 transmit */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 16: TSEC 3 receive */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 17: TSEC 3 error */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 18: TSEC 1 Receive/Transmit Error */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 19: TSEC 2 Transmit */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 20: TSEC 2 Receive */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 21: TSEC 4 transmit */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 22: TSEC 4 receive */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 23: TSEC 4 error */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 24: TSEC 2 Receive/Transmit Error */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 25: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 26: DUART1 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 27: I2C */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 28: Performance Monitor */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 29: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 30: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 31: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 32: SRIO error/write-port unit */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 33: SRIO outbound doorbell */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 34: SRIO inbound doorbell */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 35: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 36: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 37: SRIO outbound message unit 1 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 38: SRIO inbound message unit 1 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 39: SRIO outbound message unit 2 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 40: SRIO inbound message unit 2 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 41: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 42: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 43: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 44: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 45: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 46: Unused */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* Internal 47: Unused */</div><div class='add'>+	0x0,						/* External  0: */</div><div class='add'>+	0x0,						/* External  1: */</div><div class='add'>+	0x0,						/* External  2: */</div><div class='add'>+	0x0,						/* External  3: */</div><div class='add'>+	0x0,						/* External  4: */</div><div class='add'>+	0x0,						/* External  5: */</div><div class='add'>+	0x0,						/* External  6: */</div><div class='add'>+	0x0,						/* External  7: */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* External  8: Pixis FPGA */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* External  9: ULI 8259 INTR Cascade */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* External 10: Quad ETH PHY */</div><div class='add'>+	0x0,						/* External 11: */</div><div class='add'>+	0x0,</div><div class='add'>+	0x0,</div><div class='add'>+	0x0,</div><div class='add'>+	0x0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+mpc86xx_hpcn_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic1;</div><div class='add'>+	phys_addr_t openpic_paddr;</div><div class='add'>+</div><div class='add'>+	/* Determine the Physical Address of the OpenPIC regs */</div><div class='add'>+	openpic_paddr = get_immrbase() + MPC86xx_OPENPIC_OFFSET;</div><div class='add'>+</div><div class='add'>+	/* Alloc mpic structure and per isu has 16 INT entries. */</div><div class='add'>+	mpic1 = mpic_alloc(openpic_paddr,</div><div class='add'>+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,</div><div class='add'>+			16, MPC86xx_OPENPIC_IRQ_OFFSET, 0, 250,</div><div class='add'>+			mpc86xx_hpcn_openpic_initsenses,</div><div class='add'>+			sizeof(mpc86xx_hpcn_openpic_initsenses),</div><div class='add'>+			" MPIC     ");</div><div class='add'>+	BUG_ON(mpic1 == NULL);</div><div class='add'>+</div><div class='add'>+	/* 48 Internal Interrupts */</div><div class='add'>+	mpic_assign_isu(mpic1, 0, openpic_paddr + 0x10200);</div><div class='add'>+	mpic_assign_isu(mpic1, 1, openpic_paddr + 0x10400);</div><div class='add'>+	mpic_assign_isu(mpic1, 2, openpic_paddr + 0x10600);</div><div class='add'>+</div><div class='add'>+	/* 16 External interrupts */</div><div class='add'>+	mpic_assign_isu(mpic1, 3, openpic_paddr + 0x10000);</div><div class='add'>+</div><div class='add'>+	mpic_init(mpic1);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	mpic_setup_cascade(MPC86xx_IRQ_EXT9, i8259_irq_cascade, NULL);</div><div class='add'>+	i8259_init(0, I8259_OFFSET);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+/*</div><div class='add'>+ * interrupt routing</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+mpc86xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)</div><div class='add'>+{</div><div class='add'>+	static char pci_irq_table[][4] = {</div><div class='add'>+		/*</div><div class='add'>+		 *      PCI IDSEL/INTPIN-&gt;INTLINE</div><div class='add'>+		 *       A      B      C      D</div><div class='add'>+		 */</div><div class='add'>+		{PIRQA, PIRQB, PIRQC, PIRQD},   /* IDSEL 17 -- PCI Slot 1 */</div><div class='add'>+		{PIRQB, PIRQC, PIRQD, PIRQA},	/* IDSEL 18 -- PCI Slot 2 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 19 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 20 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 21 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 22 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 23 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 24 */</div><div class='add'>+		{0, 0, 0, 0},			/* IDSEL 25 */</div><div class='add'>+		{PIRQD, PIRQA, PIRQB, PIRQC},	/* IDSEL 26 -- PCI Bridge*/</div><div class='add'>+		{PIRQC, 0, 0, 0},		/* IDSEL 27 -- LAN */</div><div class='add'>+		{PIRQE, PIRQF, PIRQH, PIRQ7},	/* IDSEL 28 -- USB 1.1 */</div><div class='add'>+		{PIRQE, PIRQF, PIRQG, 0},	/* IDSEL 29 -- Audio &amp; Modem */</div><div class='add'>+		{PIRQH, 0, 0, 0},		/* IDSEL 30 -- LPC &amp; PMU*/</div><div class='add'>+		{PIRQD, 0, 0, 0},		/* IDSEL 31 -- ATA */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	const long min_idsel = 17, max_idsel = 31, irqs_per_slot = 4;</div><div class='add'>+	return PCI_IRQ_TABLE_LOOKUP + I8259_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit quirk_ali1575(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned short temp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ALI1575 interrupts route table setup:</div><div class='add'>+	 *</div><div class='add'>+	 * IRQ pin   IRQ#</div><div class='add'>+	 * PIRQA ---- 3</div><div class='add'>+	 * PIRQB ---- 4</div><div class='add'>+	 * PIRQC ---- 5</div><div class='add'>+	 * PIRQD ---- 6</div><div class='add'>+	 * PIRQE ---- 9</div><div class='add'>+	 * PIRQF ---- 10</div><div class='add'>+	 * PIRQG ---- 11</div><div class='add'>+	 * PIRQH ---- 12</div><div class='add'>+	 *</div><div class='add'>+	 * interrupts for PCI slot0 -- PIRQA / PIRQB / PIRQC / PIRQD</div><div class='add'>+	 *                PCI slot1 -- PIRQB / PIRQC / PIRQD / PIRQA</div><div class='add'>+	 */</div><div class='add'>+	pci_write_config_dword(dev, 0x48, 0xb9317542);</div><div class='add'>+</div><div class='add'>+	/* USB 1.1 OHCI controller 1, interrupt: PIRQE */</div><div class='add'>+	pci_write_config_byte(dev, 0x86, 0x0c);</div><div class='add'>+</div><div class='add'>+	/* USB 1.1 OHCI controller 2, interrupt: PIRQF */</div><div class='add'>+	pci_write_config_byte(dev, 0x87, 0x0d);</div><div class='add'>+</div><div class='add'>+	/* USB 1.1 OHCI controller 3, interrupt: PIRQH */</div><div class='add'>+	pci_write_config_byte(dev, 0x88, 0x0f);</div><div class='add'>+</div><div class='add'>+	/* USB 2.0 controller, interrupt: PIRQ7 */</div><div class='add'>+	pci_write_config_byte(dev, 0x74, 0x06);</div><div class='add'>+</div><div class='add'>+	/* Audio controller, interrupt: PIRQE */</div><div class='add'>+	pci_write_config_byte(dev, 0x8a, 0x0c);</div><div class='add'>+</div><div class='add'>+	/* Modem controller, interrupt: PIRQF */</div><div class='add'>+	pci_write_config_byte(dev, 0x8b, 0x0d);</div><div class='add'>+</div><div class='add'>+	/* HD audio controller, interrupt: PIRQG */</div><div class='add'>+	pci_write_config_byte(dev, 0x8c, 0x0e);</div><div class='add'>+</div><div class='add'>+	/* Serial ATA interrupt: PIRQD */</div><div class='add'>+	pci_write_config_byte(dev, 0x8d, 0x0b);</div><div class='add'>+</div><div class='add'>+	/* SMB interrupt: PIRQH */</div><div class='add'>+	pci_write_config_byte(dev, 0x8e, 0x0f);</div><div class='add'>+</div><div class='add'>+	/* PMU ACPI SCI interrupt: PIRQH */</div><div class='add'>+	pci_write_config_byte(dev, 0x8f, 0x0f);</div><div class='add'>+</div><div class='add'>+	/* Primary PATA IDE IRQ: 14</div><div class='add'>+	 * Secondary PATA IDE IRQ: 15</div><div class='add'>+	 */</div><div class='add'>+	pci_write_config_byte(dev, 0x44, 0x3d);</div><div class='add'>+	pci_write_config_byte(dev, 0x75, 0x0f);</div><div class='add'>+</div><div class='add'>+	/* Set IRQ14 and IRQ15 to legacy IRQs */</div><div class='add'>+	pci_read_config_word(dev, 0x46, &amp;temp);</div><div class='add'>+	temp |= 0xc000;</div><div class='add'>+	pci_write_config_word(dev, 0x46, temp);</div><div class='add'>+</div><div class='add'>+	/* Set i8259 interrupt trigger</div><div class='add'>+	 * IRQ 3:  Level</div><div class='add'>+	 * IRQ 4:  Level</div><div class='add'>+	 * IRQ 5:  Level</div><div class='add'>+	 * IRQ 6:  Level</div><div class='add'>+	 * IRQ 7:  Level</div><div class='add'>+	 * IRQ 9:  Level</div><div class='add'>+	 * IRQ 10: Level</div><div class='add'>+	 * IRQ 11: Level</div><div class='add'>+	 * IRQ 12: Level</div><div class='add'>+	 * IRQ 14: Edge</div><div class='add'>+	 * IRQ 15: Edge</div><div class='add'>+	 */</div><div class='add'>+	outb(0xfa, 0x4d0);</div><div class='add'>+	outb(0x1e, 0x4d1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit quirk_uli5288(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned char c;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev,0x83,&amp;c);</div><div class='add'>+	c |= 0x80;</div><div class='add'>+	pci_write_config_byte(dev, 0x83, c);</div><div class='add'>+</div><div class='add'>+	pci_write_config_byte(dev, 0x09, 0x01);</div><div class='add'>+	pci_write_config_byte(dev, 0x0a, 0x06);</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev,0x83,&amp;c);</div><div class='add'>+	c &amp;= 0x7f;</div><div class='add'>+	pci_write_config_byte(dev, 0x83, c);</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev,0x84,&amp;c);</div><div class='add'>+	c |= 0x01;</div><div class='add'>+	pci_write_config_byte(dev, 0x84, c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit quirk_uli5229(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned short temp;</div><div class='add'>+	pci_write_config_word(dev, 0x04, 0x0405);</div><div class='add'>+	pci_read_config_word(dev, 0x4a, &amp;temp);</div><div class='add'>+	temp |= 0x1000;</div><div class='add'>+	pci_write_config_word(dev, 0x4a, temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit early_uli5249(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned char temp;</div><div class='add'>+	pci_write_config_word(dev, 0x04, 0x0007);</div><div class='add'>+	pci_read_config_byte(dev, 0x7c, &amp;temp);</div><div class='add'>+	pci_write_config_byte(dev, 0x7c, 0x80);</div><div class='add'>+	pci_write_config_byte(dev, 0x09, 0x01);</div><div class='add'>+	pci_write_config_byte(dev, 0x7c, temp);</div><div class='add'>+	dev-&gt;class |= 0x1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, quirk_ali1575);</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288);</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229);</div><div class='add'>+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AL, 0x5249, early_uli5249);</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+mpc86xx_hpcn_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0);</div><div class='add'>+</div><div class='add'>+	np = of_find_node_by_type(NULL, "cpu");</div><div class='add'>+	if (np != 0) {</div><div class='add'>+		unsigned int *fp;</div><div class='add'>+</div><div class='add'>+		fp = (int *)get_property(np, "clock-frequency", NULL);</div><div class='add'>+		if (fp != 0)</div><div class='add'>+			loops_per_jiffy = *fp / HZ;</div><div class='add'>+		else</div><div class='add'>+			loops_per_jiffy = 50000000 / HZ;</div><div class='add'>+		of_node_put(np);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)</div><div class='add'>+		add_bridge(np);</div><div class='add'>+</div><div class='add'>+	ppc_md.pci_swizzle = common_swizzle;</div><div class='add'>+	ppc_md.pci_map_irq = mpc86xx_map_irq;</div><div class='add'>+	ppc_md.pci_exclude_device = mpc86xx_exclude_device;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("MPC86xx HPCN board from Freescale Semiconductor\n");</div><div class='add'>+</div><div class='add'>+#ifdef  CONFIG_ROOT_NFS</div><div class='add'>+	ROOT_DEV = Root_NFS;</div><div class='add'>+#else</div><div class='add'>+	ROOT_DEV = Root_HDA1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	mpc86xx_smp_init();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)</div><div class='add'>+{</div><div class='add'>+	struct device_node *root;</div><div class='add'>+	uint memsize = total_memory;</div><div class='add'>+	const char *model = "";</div><div class='add'>+	uint svid = mfspr(SPRN_SVR);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");</div><div class='add'>+</div><div class='add'>+	root = of_find_node_by_path("/");</div><div class='add'>+	if (root)</div><div class='add'>+		model = get_property(root, "model", NULL);</div><div class='add'>+	seq_printf(m, "Machine\t\t: %s\n", model);</div><div class='add'>+	of_node_put(root);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "SVR\t\t: 0x%x\n", svid);</div><div class='add'>+	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, device-tree isn't unflattened</div><div class='add'>+ */</div><div class='add'>+static int __init mpc86xx_hpcn_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+</div><div class='add'>+	if (of_flat_dt_is_compatible(root, "mpc86xx"))</div><div class='add'>+		return 1;	/* Looks good */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+mpc86xx_restart(char *cmd)</div><div class='add'>+{</div><div class='add'>+	void __iomem *rstcr;</div><div class='add'>+</div><div class='add'>+	rstcr = ioremap(get_immrbase() + MPC86XX_RSTCR_OFFSET, 0x100);</div><div class='add'>+</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	/* Assert reset request to Reset Control Register */</div><div class='add'>+	out_be32(rstcr, 0x2);</div><div class='add'>+</div><div class='add'>+	/* not reached */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+long __init</div><div class='add'>+mpc86xx_time_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int temp;</div><div class='add'>+</div><div class='add'>+	/* Set the time base to zero */</div><div class='add'>+	mtspr(SPRN_TBWL, 0);</div><div class='add'>+	mtspr(SPRN_TBWU, 0);</div><div class='add'>+</div><div class='add'>+	temp = mfspr(SPRN_HID0);</div><div class='add'>+	temp |= HID0_TBEN;</div><div class='add'>+	mtspr(SPRN_HID0, temp);</div><div class='add'>+	asm volatile("isync");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+define_machine(mpc86xx_hpcn) {</div><div class='add'>+	.name			= "MPC86xx HPCN",</div><div class='add'>+	.probe			= mpc86xx_hpcn_probe,</div><div class='add'>+	.setup_arch		= mpc86xx_hpcn_setup_arch,</div><div class='add'>+	.init_IRQ		= mpc86xx_hpcn_init_irq,</div><div class='add'>+	.show_cpuinfo		= mpc86xx_hpcn_show_cpuinfo,</div><div class='add'>+	.get_irq		= mpic_get_irq,</div><div class='add'>+	.restart		= mpc86xx_restart,</div><div class='add'>+	.time_init		= mpc86xx_time_init,</div><div class='add'>+	.calibrate_decr		= generic_calibrate_decr,</div><div class='add'>+	.progress		= udbg_progress,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx_pcie.c b/arch/powerpc/platforms/86xx/mpc86xx_pcie.c<br/>new file mode 100644<br/>index 000000000000..a2f4f730213e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_pcie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/mpc86xx_pcie.c</a></div><div class='hunk'>@@ -0,0 +1,173 @@</div><div class='add'>+/*</div><div class='add'>+ * Support for indirect PCI bridges.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1998 Gabriel Paubert.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * "Temporary" MPC8548 Errata file -</div><div class='add'>+ * The standard indirect_pci code should work with future silicon versions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc86xx.h"</div><div class='add'>+</div><div class='add'>+#define PCI_CFG_OUT out_be32</div><div class='add'>+</div><div class='add'>+/* ERRATA PCI-Ex 14 PCIE Controller timeout */</div><div class='add'>+#define PCIE_FIX		out_be32(hose-&gt;cfg_addr+0x4, 0x0400ffff)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+indirect_read_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,</div><div class='add'>+		     int len, u32 *val)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = bus-&gt;sysdata;</div><div class='add'>+	volatile void __iomem *cfg_data;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.pci_exclude_device)</div><div class='add'>+		if (ppc_md.pci_exclude_device(bus-&gt;number, devfn))</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/* Possible artifact of CDCpp50937 needs further investigation */</div><div class='add'>+	if (devfn != 0x0 &amp;&amp; bus-&gt;number == 0xff)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	PCIE_FIX;</div><div class='add'>+	if (bus-&gt;number == 0xff) {</div><div class='add'>+		PCI_CFG_OUT(hose-&gt;cfg_addr,</div><div class='add'>+			    (0x80000000 | ((offset &amp; 0xf00) &lt;&lt; 16) |</div><div class='add'>+			     ((bus-&gt;number - hose-&gt;bus_offset) &lt;&lt; 16)</div><div class='add'>+			     | (devfn &lt;&lt; 8) | ((offset &amp; 0xfc) )));</div><div class='add'>+	} else {</div><div class='add'>+		PCI_CFG_OUT(hose-&gt;cfg_addr,</div><div class='add'>+			    (0x80000001 | ((offset &amp; 0xf00) &lt;&lt; 16) |</div><div class='add'>+			     ((bus-&gt;number - hose-&gt;bus_offset) &lt;&lt; 16)</div><div class='add'>+			     | (devfn &lt;&lt; 8) | ((offset &amp; 0xfc) )));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: the caller has already checked that offset is</div><div class='add'>+	 * suitably aligned and that len is 1, 2 or 4.</div><div class='add'>+	 */</div><div class='add'>+	/* ERRATA PCI-Ex 12 - Configuration Address/Data Alignment */</div><div class='add'>+	cfg_data = hose-&gt;cfg_data;</div><div class='add'>+	PCIE_FIX;</div><div class='add'>+	temp = in_le32(cfg_data);</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		*val = (temp &gt;&gt; (((offset &amp; 3))*8)) &amp; 0xff;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		*val = (temp &gt;&gt; (((offset &amp; 3))*8)) &amp; 0xffff;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*val = temp;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+indirect_write_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,</div><div class='add'>+		      int len, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose = bus-&gt;sysdata;</div><div class='add'>+	volatile void __iomem *cfg_data;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.pci_exclude_device)</div><div class='add'>+		if (ppc_md.pci_exclude_device(bus-&gt;number, devfn))</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	/* Possible artifact of CDCpp50937 needs further investigation */</div><div class='add'>+	if (devfn != 0x0 &amp;&amp; bus-&gt;number == 0xff)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	PCIE_FIX;</div><div class='add'>+	if (bus-&gt;number == 0xff) {</div><div class='add'>+		PCI_CFG_OUT(hose-&gt;cfg_addr,</div><div class='add'>+			    (0x80000000 | ((offset &amp; 0xf00) &lt;&lt; 16) |</div><div class='add'>+			     ((bus-&gt;number - hose-&gt;bus_offset) &lt;&lt; 16)</div><div class='add'>+			     | (devfn &lt;&lt; 8) | ((offset &amp; 0xfc) )));</div><div class='add'>+	} else {</div><div class='add'>+		PCI_CFG_OUT(hose-&gt;cfg_addr,</div><div class='add'>+			    (0x80000001 | ((offset &amp; 0xf00) &lt;&lt; 16) |</div><div class='add'>+			     ((bus-&gt;number - hose-&gt;bus_offset) &lt;&lt; 16)</div><div class='add'>+			     | (devfn &lt;&lt; 8) | ((offset &amp; 0xfc) )));</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Note: the caller has already checked that offset is</div><div class='add'>+	 * suitably aligned and that len is 1, 2 or 4.</div><div class='add'>+	 */</div><div class='add'>+	/* ERRATA PCI-Ex 12 - Configuration Address/Data Alignment */</div><div class='add'>+	cfg_data = hose-&gt;cfg_data;</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		PCIE_FIX;</div><div class='add'>+		temp = in_le32(cfg_data);</div><div class='add'>+		temp = (temp &amp; ~(0xff &lt;&lt; ((offset &amp; 3) * 8))) |</div><div class='add'>+			(val &lt;&lt; ((offset &amp; 3) * 8));</div><div class='add'>+		PCIE_FIX;</div><div class='add'>+		out_le32(cfg_data, temp);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		PCIE_FIX;</div><div class='add'>+		temp = in_le32(cfg_data);</div><div class='add'>+		temp = (temp &amp; ~(0xffff &lt;&lt; ((offset &amp; 3) * 8)));</div><div class='add'>+		temp |= (val &lt;&lt; ((offset &amp; 3) * 8)) ;</div><div class='add'>+		PCIE_FIX;</div><div class='add'>+		out_le32(cfg_data, temp);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		PCIE_FIX;</div><div class='add'>+		out_le32(cfg_data, val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	PCIE_FIX;</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_ops indirect_pcie_ops = {</div><div class='add'>+	indirect_read_config_pcie,</div><div class='add'>+	indirect_write_config_pcie</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+setup_indirect_pcie_nomap(struct pci_controller* hose, void __iomem * cfg_addr,</div><div class='add'>+	void __iomem * cfg_data)</div><div class='add'>+{</div><div class='add'>+	hose-&gt;cfg_addr = cfg_addr;</div><div class='add'>+	hose-&gt;cfg_data = cfg_data;</div><div class='add'>+	hose-&gt;ops = &amp;indirect_pcie_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+setup_indirect_pcie(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)</div><div class='add'>+{</div><div class='add'>+	unsigned long base = cfg_addr &amp; PAGE_MASK;</div><div class='add'>+	void __iomem *mbase, *addr, *data;</div><div class='add'>+</div><div class='add'>+	mbase = ioremap(base, PAGE_SIZE);</div><div class='add'>+	addr = mbase + (cfg_addr &amp; ~PAGE_MASK);</div><div class='add'>+	if ((cfg_data &amp; PAGE_MASK) != base)</div><div class='add'>+		mbase = ioremap(cfg_data &amp; PAGE_MASK, PAGE_SIZE);</div><div class='add'>+	data = mbase + (cfg_data &amp; ~PAGE_MASK);</div><div class='add'>+	setup_indirect_pcie_nomap(hose, addr, data);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c<br/>new file mode 100644<br/>index 000000000000..bb7fb41933ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/mpc86xx_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/mpc86xx_smp.c</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+/*</div><div class='add'>+ * Author: Xianghua Xiao &lt;x.xiao@freescale.com&gt;</div><div class='add'>+ *         Zhang Wei &lt;wei.zhang@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm-powerpc/mpic.h&gt;</div><div class='add'>+#include &lt;asm/mpc86xx.h&gt;</div><div class='add'>+#include &lt;asm/cacheflush.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc86xx.h"</div><div class='add'>+</div><div class='add'>+extern void __secondary_start_mpc86xx(void);</div><div class='add'>+extern unsigned long __secondary_hold_acknowledge;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+smp_86xx_release_core(int nr)</div><div class='add'>+{</div><div class='add'>+	__be32 __iomem *mcm_vaddr;</div><div class='add'>+	unsigned long pcr;</div><div class='add'>+</div><div class='add'>+	if (nr &lt; 0 || nr &gt;= NR_CPUS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Startup Core #nr.</div><div class='add'>+	 */</div><div class='add'>+	mcm_vaddr = ioremap(get_immrbase() + MPC86xx_MCM_OFFSET,</div><div class='add'>+			    MPC86xx_MCM_SIZE);</div><div class='add'>+	pcr = in_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET &gt;&gt; 2));</div><div class='add'>+	pcr |= 1 &lt;&lt; (nr + 24);</div><div class='add'>+	out_be32(mcm_vaddr + (MCM_PORT_CONFIG_OFFSET &gt;&gt; 2), pcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+smp_86xx_kick_cpu(int nr)</div><div class='add'>+{</div><div class='add'>+	unsigned int save_vector;</div><div class='add'>+	unsigned long target, flags;</div><div class='add'>+	int n = 0;</div><div class='add'>+	volatile unsigned int *vector</div><div class='add'>+		 = (volatile unsigned int *)(KERNELBASE + 0x100);</div><div class='add'>+</div><div class='add'>+	if (nr &lt; 0 || nr &gt;= NR_CPUS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	/* Save reset vector */</div><div class='add'>+	save_vector = *vector;</div><div class='add'>+</div><div class='add'>+	/* Setup fake reset vector to call __secondary_start_mpc86xx. */</div><div class='add'>+	target = (unsigned long) __secondary_start_mpc86xx;</div><div class='add'>+	create_branch((unsigned long)vector, target, BRANCH_SET_LINK);</div><div class='add'>+</div><div class='add'>+	/* Kick that CPU */</div><div class='add'>+	smp_86xx_release_core(nr);</div><div class='add'>+</div><div class='add'>+	/* Wait a bit for the CPU to take the exception. */</div><div class='add'>+	while ((__secondary_hold_acknowledge != nr) &amp;&amp; (n++, n &lt; 1000))</div><div class='add'>+		mdelay(1);</div><div class='add'>+</div><div class='add'>+	/* Restore the exception vector */</div><div class='add'>+	*vector = save_vector;</div><div class='add'>+	flush_icache_range((unsigned long) vector, (unsigned long) vector + 4);</div><div class='add'>+</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	pr_debug("wait CPU #%d for %d msecs.\n", nr, n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+smp_86xx_setup_cpu(int cpu_nr)</div><div class='add'>+{</div><div class='add'>+	mpic_setup_this_cpu();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct smp_ops_t smp_86xx_ops = {</div><div class='add'>+	.message_pass = smp_mpic_message_pass,</div><div class='add'>+	.probe = smp_mpic_probe,</div><div class='add'>+	.kick_cpu = smp_86xx_kick_cpu,</div><div class='add'>+	.setup_cpu = smp_86xx_setup_cpu,</div><div class='add'>+	.take_timebase = smp_generic_take_timebase,</div><div class='add'>+	.give_timebase = smp_generic_give_timebase,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+mpc86xx_smp_init(void)</div><div class='add'>+{</div><div class='add'>+	smp_ops = &amp;smp_86xx_ops;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c<br/>new file mode 100644<br/>index 000000000000..bc5139043112<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/86xx/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/86xx/pci.c</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+/*</div><div class='add'>+ * MPC86XX pci setup code</div><div class='add'>+ *</div><div class='add'>+ * Recode: ZHANG WEI &lt;wei.zhang@freescale.com&gt;</div><div class='add'>+ * Initial author: Xianghua Xiao &lt;x.xiao@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Freescale Semiconductor Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/immap_86xx.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;sysdev/fsl_soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mpc86xx.h"</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)</div><div class='add'>+#else</div><div class='add'>+#define DBG(fmt, args...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct pcie_outbound_window_regs {</div><div class='add'>+	uint    pexotar;               /* 0x.0 - PCI Express outbound translation address register */</div><div class='add'>+	uint    pexotear;              /* 0x.4 - PCI Express outbound translation extended address register */</div><div class='add'>+	uint    pexowbar;              /* 0x.8 - PCI Express outbound window base address register */</div><div class='add'>+	char    res1[4];</div><div class='add'>+	uint    pexowar;               /* 0x.10 - PCI Express outbound window attributes register */</div><div class='add'>+	char    res2[12];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pcie_inbound_window_regs {</div><div class='add'>+	uint    pexitar;               /* 0x.0 - PCI Express inbound translation address register */</div><div class='add'>+	char    res1[4];</div><div class='add'>+	uint    pexiwbar;              /* 0x.8 - PCI Express inbound window base address register */</div><div class='add'>+	uint    pexiwbear;             /* 0x.c - PCI Express inbound window base extended address register */</div><div class='add'>+	uint    pexiwar;               /* 0x.10 - PCI Express inbound window attributes register */</div><div class='add'>+	char    res2[12];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init setup_pcie_atmu(struct pci_controller *hose, struct resource *rsrc)</div><div class='add'>+{</div><div class='add'>+	volatile struct ccsr_pex *pcie;</div><div class='add'>+	volatile struct pcie_outbound_window_regs *pcieow;</div><div class='add'>+	volatile struct pcie_inbound_window_regs *pcieiw;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	DBG("PCIE memory map start 0x%x, size 0x%x\n", rsrc-&gt;start,</div><div class='add'>+			rsrc-&gt;end - rsrc-&gt;start + 1);</div><div class='add'>+	pcie = ioremap(rsrc-&gt;start, rsrc-&gt;end - rsrc-&gt;start + 1);</div><div class='add'>+</div><div class='add'>+	/* Disable all windows (except pexowar0 since its ignored) */</div><div class='add'>+	pcie-&gt;pexowar1 = 0;</div><div class='add'>+	pcie-&gt;pexowar2 = 0;</div><div class='add'>+ 	pcie-&gt;pexowar3 = 0;</div><div class='add'>+ 	pcie-&gt;pexowar4 = 0;</div><div class='add'>+ 	pcie-&gt;pexiwar1 = 0;</div><div class='add'>+ 	pcie-&gt;pexiwar2 = 0;</div><div class='add'>+ 	pcie-&gt;pexiwar3 = 0;</div><div class='add'>+</div><div class='add'>+ 	pcieow = (struct pcie_outbound_window_regs *)&amp;pcie-&gt;pexotar1;</div><div class='add'>+ 	pcieiw = (struct pcie_inbound_window_regs *)&amp;pcie-&gt;pexitar1;</div><div class='add'>+</div><div class='add'>+ 	/* Setup outbound MEM window */</div><div class='add'>+ 	for(i = 0; i &lt; 3; i++)</div><div class='add'>+ 		if (hose-&gt;mem_resources[i].flags &amp; IORESOURCE_MEM){</div><div class='add'>+ 			DBG("PCIE MEM resource start 0x%08x, size 0x%08x.\n",</div><div class='add'>+ 				hose-&gt;mem_resources[i].start,</div><div class='add'>+ 				hose-&gt;mem_resources[i].end</div><div class='add'>+ 				  - hose-&gt;mem_resources[i].start + 1);</div><div class='add'>+ 			pcieow-&gt;pexotar = (hose-&gt;mem_resources[i].start) &gt;&gt; 12</div><div class='add'>+ 				&amp; 0x000fffff;</div><div class='add'>+ 			pcieow-&gt;pexotear = 0;</div><div class='add'>+ 			pcieow-&gt;pexowbar = (hose-&gt;mem_resources[i].start) &gt;&gt; 12</div><div class='add'>+ 				&amp; 0x000fffff;</div><div class='add'>+ 			/* Enable, Mem R/W */</div><div class='add'>+ 			pcieow-&gt;pexowar = 0x80044000 |</div><div class='add'>+ 				(__ilog2(hose-&gt;mem_resources[i].end</div><div class='add'>+ 					 - hose-&gt;mem_resources[i].start + 1)</div><div class='add'>+ 				 - 1);</div><div class='add'>+ 			pcieow++;</div><div class='add'>+ 		}</div><div class='add'>+</div><div class='add'>+ 	/* Setup outbound IO window */</div><div class='add'>+ 	if (hose-&gt;io_resource.flags &amp; IORESOURCE_IO){</div><div class='add'>+ 		DBG("PCIE IO resource start 0x%08x, size 0x%08x, phy base 0x%08x.\n",</div><div class='add'>+ 			hose-&gt;io_resource.start,</div><div class='add'>+ 			hose-&gt;io_resource.end - hose-&gt;io_resource.start + 1,</div><div class='add'>+ 			hose-&gt;io_base_phys);</div><div class='add'>+ 		pcieow-&gt;pexotar = (hose-&gt;io_resource.start) &gt;&gt; 12 &amp; 0x000fffff;</div><div class='add'>+ 		pcieow-&gt;pexotear = 0;</div><div class='add'>+ 		pcieow-&gt;pexowbar = (hose-&gt;io_base_phys) &gt;&gt; 12 &amp; 0x000fffff;</div><div class='add'>+ 		/* Enable, IO R/W */</div><div class='add'>+ 		pcieow-&gt;pexowar = 0x80088000 | (__ilog2(hose-&gt;io_resource.end</div><div class='add'>+ 					- hose-&gt;io_resource.start + 1) - 1);</div><div class='add'>+ 	}</div><div class='add'>+</div><div class='add'>+ 	/* Setup 2G inbound Memory Window @ 0 */</div><div class='add'>+ 	pcieiw-&gt;pexitar = 0x00000000;</div><div class='add'>+ 	pcieiw-&gt;pexiwbar = 0x00000000;</div><div class='add'>+ 	/* Enable, Prefetch, Local Mem, Snoop R/W, 2G */</div><div class='add'>+ 	pcieiw-&gt;pexiwar = 0xa0f5501e;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+mpc86xx_setup_pcie(struct pci_controller *hose, u32 pcie_offset, u32 pcie_size)</div><div class='add'>+{</div><div class='add'>+	u16 cmd;</div><div class='add'>+	unsigned int temps;</div><div class='add'>+</div><div class='add'>+	DBG("PCIE host controller register offset 0x%08x, size 0x%08x.\n",</div><div class='add'>+			pcie_offset, pcie_size);</div><div class='add'>+</div><div class='add'>+	early_read_config_word(hose, 0, 0, PCI_COMMAND, &amp;cmd);</div><div class='add'>+	cmd |= PCI_COMMAND_SERR | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY</div><div class='add'>+	    | PCI_COMMAND_IO;</div><div class='add'>+	early_write_config_word(hose, 0, 0, PCI_COMMAND, cmd);</div><div class='add'>+</div><div class='add'>+	early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0x80);</div><div class='add'>+</div><div class='add'>+	/* PCIE Bus, Fix the MPC8641D host bridge's location to bus 0xFF. */</div><div class='add'>+	early_read_config_dword(hose, 0, 0, PCI_PRIMARY_BUS, &amp;temps);</div><div class='add'>+	temps = (temps &amp; 0xff000000) | (0xff) | (0x0 &lt;&lt; 8) | (0xfe &lt;&lt; 16);</div><div class='add'>+	early_write_config_dword(hose, 0, 0, PCI_PRIMARY_BUS, temps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mpc86xx_exclude_device(u_char bus, u_char devfn)</div><div class='add'>+{</div><div class='add'>+	if (bus == 0 &amp;&amp; PCI_SLOT(devfn) == 0)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init add_bridge(struct device_node *dev)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	struct pci_controller *hose;</div><div class='add'>+	struct resource rsrc;</div><div class='add'>+	int *bus_range;</div><div class='add'>+	int has_address = 0;</div><div class='add'>+	int primary = 0;</div><div class='add'>+</div><div class='add'>+	DBG("Adding PCIE host bridge %s\n", dev-&gt;full_name);</div><div class='add'>+</div><div class='add'>+	/* Fetch host bridge registers address */</div><div class='add'>+	has_address = (of_address_to_resource(dev, 0, &amp;rsrc) == 0);</div><div class='add'>+</div><div class='add'>+	/* Get bus range if any */</div><div class='add'>+	bus_range = (int *) get_property(dev, "bus-range", &amp;len);</div><div class='add'>+	if (bus_range == NULL || len &lt; 2 * sizeof(int))</div><div class='add'>+		printk(KERN_WARNING "Can't get bus-range for %s, assume"</div><div class='add'>+		       " bus 0\n", dev-&gt;full_name);</div><div class='add'>+</div><div class='add'>+	hose = pcibios_alloc_controller();</div><div class='add'>+	if (!hose)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	hose-&gt;arch_data = dev;</div><div class='add'>+	hose-&gt;set_cfg_type = 1;</div><div class='add'>+</div><div class='add'>+	/* last_busno = 0xfe cause by MPC8641 PCIE bug */</div><div class='add'>+	hose-&gt;first_busno = bus_range ? bus_range[0] : 0x0;</div><div class='add'>+	hose-&gt;last_busno = bus_range ? bus_range[1] : 0xfe;</div><div class='add'>+</div><div class='add'>+	setup_indirect_pcie(hose, rsrc.start, rsrc.start + 0x4);</div><div class='add'>+</div><div class='add'>+	/* Setup the PCIE host controller. */</div><div class='add'>+	mpc86xx_setup_pcie(hose, rsrc.start, rsrc.end - rsrc.start + 1);</div><div class='add'>+</div><div class='add'>+	if ((rsrc.start &amp; 0xfffff) == 0x8000)</div><div class='add'>+		primary = 1;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. "</div><div class='add'>+	       "Firmware bus number: %d-&gt;%d\n",</div><div class='add'>+		rsrc.start, hose-&gt;first_busno, hose-&gt;last_busno);</div><div class='add'>+</div><div class='add'>+	DBG(" -&gt;Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",</div><div class='add'>+		hose, hose-&gt;cfg_addr, hose-&gt;cfg_data);</div><div class='add'>+</div><div class='add'>+	/* Interpret the "ranges" property */</div><div class='add'>+	/* This also maps the I/O region and sets isa_io/mem_base */</div><div class='add'>+	pci_process_bridge_OF_ranges(hose, dev, primary);</div><div class='add'>+</div><div class='add'>+	/* Setup PEX window registers */</div><div class='add'>+	setup_pcie_atmu(hose, &amp;rsrc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile<br/>index c4f6b0d2d140..5cf46dc57895 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/Makefile</a></div><div class='hunk'>@@ -9,7 +9,9 @@ obj-$(CONFIG_PPC_CHRP)		+= chrp/</div><div class='ctx'> obj-$(CONFIG_4xx)		+= 4xx/</div><div class='ctx'> obj-$(CONFIG_PPC_83xx)		+= 83xx/</div><div class='ctx'> obj-$(CONFIG_PPC_85xx)		+= 85xx/</div><div class='add'>+obj-$(CONFIG_PPC_86xx)		+= 86xx/</div><div class='ctx'> obj-$(CONFIG_PPC_PSERIES)	+= pseries/</div><div class='ctx'> obj-$(CONFIG_PPC_ISERIES)	+= iseries/</div><div class='ctx'> obj-$(CONFIG_PPC_MAPLE)		+= maple/</div><div class='ctx'> obj-$(CONFIG_PPC_CELL)		+= cell/</div><div class='add'>+obj-$(CONFIG_EMBEDDED6xx)	+= embedded6xx/</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig<br/>index 6a02d51086c8..0c8c7b6ab897 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/Kconfig</a></div><div class='hunk'>@@ -5,15 +5,24 @@ config SPU_FS</div><div class='ctx'> 	tristate "SPU file system"</div><div class='ctx'> 	default m</div><div class='ctx'> 	depends on PPC_CELL</div><div class='add'>+	select SPU_BASE</div><div class='add'>+	select MEMORY_HOTPLUG</div><div class='ctx'> 	help</div><div class='ctx'> 	  The SPU file system is used to access Synergistic Processing</div><div class='ctx'> 	  Units on machines implementing the Broadband Processor</div><div class='ctx'> 	  Architecture.</div><div class='ctx'> </div><div class='add'>+config SPU_BASE</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='add'>+</div><div class='ctx'> config SPUFS_MMAP</div><div class='ctx'> 	bool</div><div class='ctx'> 	depends on SPU_FS &amp;&amp; SPARSEMEM</div><div class='del'>-	select MEMORY_HOTPLUG</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config CBE_RAS</div><div class='add'>+	bool "RAS features for bare metal Cell BE"</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile<br/>index e570bad06394..c89cdd67383b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/Makefile</a></div><div class='hunk'>@@ -1,16 +1,15 @@</div><div class='del'>-obj-y			+= interrupt.o iommu.o setup.o spider-pic.o</div><div class='del'>-obj-y			+= pervasive.o</div><div class='add'>+obj-$(CONFIG_PPC_CELL_NATIVE)		+= interrupt.o iommu.o setup.o \</div><div class='add'>+					   cbe_regs.o spider-pic.o pervasive.o</div><div class='add'>+obj-$(CONFIG_CBE_RAS)			+= ras.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_SMP)	+= smp.o</div><div class='del'>-obj-$(CONFIG_SPU_FS)	+= spu-base.o spufs/</div><div class='del'>-</div><div class='del'>-spu-base-y		+= spu_base.o spu_priv1.o</div><div class='add'>+ifeq ($(CONFIG_SMP),y)</div><div class='add'>+obj-$(CONFIG_PPC_CELL_NATIVE)		+= smp.o</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> # needed only when building loadable spufs.ko</div><div class='del'>-spufs-modular-$(CONFIG_SPU_FS) += spu_syscalls.o</div><div class='del'>-obj-y			+= $(spufs-modular-m)</div><div class='del'>-</div><div class='del'>-# always needed in kernel</div><div class='del'>-spufs-builtin-$(CONFIG_SPU_FS) += spu_callbacks.o</div><div class='del'>-obj-y			+= $(spufs-builtin-y) $(spufs-builtin-m)</div><div class='add'>+spufs-modular-$(CONFIG_SPU_FS)		+= spu_syscalls.o</div><div class='add'>+spu-priv1-$(CONFIG_PPC_CELL_NATIVE)	+= spu_priv1_mmio.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \</div><div class='add'>+					   $(spufs-modular-m) \</div><div class='add'>+					   $(spu-priv1-y) spufs/</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c<br/>new file mode 100644<br/>index 000000000000..ce696c1cca75<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/cbe_regs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/cbe_regs.c</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/*</div><div class='add'>+ * cbe_regs.c</div><div class='add'>+ *</div><div class='add'>+ * Accessor routines for the various MMIO register blocks of the CBE</div><div class='add'>+ *</div><div class='add'>+ * (c) 2006 Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;, IBM Corp.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cbe_regs.h"</div><div class='add'>+</div><div class='add'>+#define MAX_CBE		2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Current implementation uses "cpu" nodes. We build our own mapping</div><div class='add'>+ * array of cpu numbers to cpu nodes locally for now to allow interrupt</div><div class='add'>+ * time code to have a fast path rather than call of_get_cpu_node(). If</div><div class='add'>+ * we implement cpu hotplug, we'll have to install an appropriate norifier</div><div class='add'>+ * in order to release references to the cpu going away</div><div class='add'>+ */</div><div class='add'>+static struct cbe_regs_map</div><div class='add'>+{</div><div class='add'>+	struct device_node *cpu_node;</div><div class='add'>+	struct cbe_pmd_regs __iomem *pmd_regs;</div><div class='add'>+	struct cbe_iic_regs __iomem *iic_regs;</div><div class='add'>+} cbe_regs_maps[MAX_CBE];</div><div class='add'>+static int cbe_regs_map_count;</div><div class='add'>+</div><div class='add'>+static struct cbe_thread_map</div><div class='add'>+{</div><div class='add'>+	struct device_node *cpu_node;</div><div class='add'>+	struct cbe_regs_map *regs;</div><div class='add'>+} cbe_thread_map[NR_CPUS];</div><div class='add'>+</div><div class='add'>+static struct cbe_regs_map *cbe_find_map(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cbe_regs_map_count; i++)</div><div class='add'>+		if (cbe_regs_maps[i].cpu_node == np)</div><div class='add'>+			return &amp;cbe_regs_maps[i];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct cbe_regs_map *map = cbe_find_map(np);</div><div class='add'>+	if (map == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	return map-&gt;pmd_regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cbe_regs_map *map = cbe_thread_map[cpu].regs;</div><div class='add'>+	if (map == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	return map-&gt;pmd_regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct cbe_iic_regs __iomem *cbe_get_iic_regs(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct cbe_regs_map *map = cbe_find_map(np);</div><div class='add'>+	if (map == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	return map-&gt;iic_regs;</div><div class='add'>+}</div><div class='add'>+struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cbe_regs_map *map = cbe_thread_map[cpu].regs;</div><div class='add'>+	if (map == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+	return map-&gt;iic_regs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init cbe_regs_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct device_node *cpu;</div><div class='add'>+</div><div class='add'>+	/* Build local fast map of CPUs */</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);</div><div class='add'>+</div><div class='add'>+	/* Find maps for each device tree CPU */</div><div class='add'>+	for_each_node_by_type(cpu, "cpu") {</div><div class='add'>+		struct cbe_regs_map *map = &amp;cbe_regs_maps[cbe_regs_map_count++];</div><div class='add'>+</div><div class='add'>+		/* That hack must die die die ! */</div><div class='add'>+		struct address_prop {</div><div class='add'>+			unsigned long address;</div><div class='add'>+			unsigned int len;</div><div class='add'>+		} __attribute__((packed)) *prop;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		if (cbe_regs_map_count &gt; MAX_CBE) {</div><div class='add'>+			printk(KERN_ERR "cbe_regs: More BE chips than supported"</div><div class='add'>+			       "!\n");</div><div class='add'>+			cbe_regs_map_count--;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		map-&gt;cpu_node = cpu;</div><div class='add'>+		for_each_possible_cpu(i)</div><div class='add'>+			if (cbe_thread_map[i].cpu_node == cpu)</div><div class='add'>+				cbe_thread_map[i].regs = map;</div><div class='add'>+</div><div class='add'>+		prop = (struct address_prop *)get_property(cpu, "pervasive",</div><div class='add'>+							   NULL);</div><div class='add'>+		if (prop != NULL)</div><div class='add'>+			map-&gt;pmd_regs = ioremap(prop-&gt;address, prop-&gt;len);</div><div class='add'>+</div><div class='add'>+		prop = (struct address_prop *)get_property(cpu, "iic",</div><div class='add'>+							   NULL);</div><div class='add'>+		if (prop != NULL)</div><div class='add'>+			map-&gt;iic_regs = ioremap(prop-&gt;address, prop-&gt;len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h<br/>new file mode 100644<br/>index 000000000000..e76e4a6af5bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/cbe_regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/cbe_regs.h</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ * cbe_regs.h</div><div class='add'>+ *</div><div class='add'>+ * This file is intended to hold the various register definitions for CBE</div><div class='add'>+ * on-chip system devices (memory controller, IO controller, etc...)</div><div class='add'>+ *</div><div class='add'>+ * (c) 2006 Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;, IBM Corp.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CBE_REGS_H</div><div class='add'>+#define CBE_REGS_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Some HID register definitions</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* CBE specific HID0 bits */</div><div class='add'>+#define HID0_CBE_THERM_WAKEUP	0x0000020000000000ul</div><div class='add'>+#define HID0_CBE_SYSERR_WAKEUP	0x0000008000000000ul</div><div class='add'>+#define HID0_CBE_THERM_INT_EN	0x0000000400000000ul</div><div class='add'>+#define HID0_CBE_SYSERR_INT_EN	0x0000000200000000ul</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Pervasive unit register definitions</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct cbe_pmd_regs {</div><div class='add'>+	u8 pad_0x0000_0x0800[0x0800 - 0x0000];			/* 0x0000 */</div><div class='add'>+</div><div class='add'>+	/* Thermal Sensor Registers */</div><div class='add'>+	u64  ts_ctsr1;						/* 0x0800 */</div><div class='add'>+	u64  ts_ctsr2;						/* 0x0808 */</div><div class='add'>+	u64  ts_mtsr1;						/* 0x0810 */</div><div class='add'>+	u64  ts_mtsr2;						/* 0x0818 */</div><div class='add'>+	u64  ts_itr1;						/* 0x0820 */</div><div class='add'>+	u64  ts_itr2;						/* 0x0828 */</div><div class='add'>+	u64  ts_gitr;						/* 0x0830 */</div><div class='add'>+	u64  ts_isr;						/* 0x0838 */</div><div class='add'>+	u64  ts_imr;						/* 0x0840 */</div><div class='add'>+	u64  tm_cr1;						/* 0x0848 */</div><div class='add'>+	u64  tm_cr2;						/* 0x0850 */</div><div class='add'>+	u64  tm_simr;						/* 0x0858 */</div><div class='add'>+	u64  tm_tpr;						/* 0x0860 */</div><div class='add'>+	u64  tm_str1;						/* 0x0868 */</div><div class='add'>+	u64  tm_str2;						/* 0x0870 */</div><div class='add'>+	u64  tm_tsr;						/* 0x0878 */</div><div class='add'>+</div><div class='add'>+	/* Power Management */</div><div class='add'>+	u64  pm_control;					/* 0x0880 */</div><div class='add'>+#define CBE_PMD_PAUSE_ZERO_CONTROL		0x10000</div><div class='add'>+	u64  pm_status;						/* 0x0888 */</div><div class='add'>+</div><div class='add'>+	/* Time Base Register */</div><div class='add'>+	u64  tbr;						/* 0x0890 */</div><div class='add'>+</div><div class='add'>+	u8   pad_0x0898_0x0c00 [0x0c00 - 0x0898];		/* 0x0898 */</div><div class='add'>+</div><div class='add'>+	/* Fault Isolation Registers */</div><div class='add'>+	u64  checkstop_fir;					/* 0x0c00 */</div><div class='add'>+	u64  recoverable_fir;</div><div class='add'>+	u64  spec_att_mchk_fir;</div><div class='add'>+	u64  fir_mode_reg;</div><div class='add'>+	u64  fir_enable_mask;</div><div class='add'>+</div><div class='add'>+	u8   pad_0x0c28_0x1000 [0x1000 - 0x0c28];		/* 0x0c28 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);</div><div class='add'>+extern struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * IIC unit register definitions</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct cbe_iic_pending_bits {</div><div class='add'>+	u32 data;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 class;</div><div class='add'>+	u8 source;</div><div class='add'>+	u8 prio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CBE_IIC_IRQ_VALID	0x80</div><div class='add'>+#define CBE_IIC_IRQ_IPI		0x40</div><div class='add'>+</div><div class='add'>+struct cbe_iic_thread_regs {</div><div class='add'>+	struct cbe_iic_pending_bits pending;</div><div class='add'>+	struct cbe_iic_pending_bits pending_destr;</div><div class='add'>+	u64 generate;</div><div class='add'>+	u64 prio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cbe_iic_regs {</div><div class='add'>+	u8	pad_0x0000_0x0400[0x0400 - 0x0000];		/* 0x0000 */</div><div class='add'>+</div><div class='add'>+	/* IIC interrupt registers */</div><div class='add'>+	struct	cbe_iic_thread_regs thread[2];			/* 0x0400 */</div><div class='add'>+	u64     iic_ir;						/* 0x0440 */</div><div class='add'>+	u64     iic_is;						/* 0x0448 */</div><div class='add'>+</div><div class='add'>+	u8	pad_0x0450_0x0500[0x0500 - 0x0450];		/* 0x0450 */</div><div class='add'>+</div><div class='add'>+	/* IOC FIR */</div><div class='add'>+	u64	ioc_fir_reset;					/* 0x0500 */</div><div class='add'>+	u64	ioc_fir_set;</div><div class='add'>+	u64	ioc_checkstop_enable;</div><div class='add'>+	u64	ioc_fir_error_mask;</div><div class='add'>+	u64	ioc_syserr_enable;</div><div class='add'>+	u64	ioc_fir;</div><div class='add'>+</div><div class='add'>+	u8	pad_0x0530_0x1000[0x1000 - 0x0530];		/* 0x0530 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct cbe_iic_regs __iomem *cbe_get_iic_regs(struct device_node *np);</div><div class='add'>+extern struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs(int cpu);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Init this module early */</div><div class='add'>+extern void cbe_regs_init(void);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* CBE_REGS_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c<br/>index 978be1c30c1b..d7bbb61109f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/interrupt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/interrupt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/interrupt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/interrupt.c</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Cell Internal Interrupt Controller</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2006 Benjamin Herrenschmidt (benh@kernel.crashing.org)</div><div class='add'>+ *                    IBM, Corp.</div><div class='add'>+ *</div><div class='ctx'>  * (C) Copyright IBM Deutschland Entwicklung GmbH 2005</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Arnd Bergmann &lt;arndb@de.ibm.com&gt;</div><div class='hunk'>@@ -20,269 +23,84 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "interrupt.h"</div><div class='del'>-</div><div class='del'>-struct iic_pending_bits {</div><div class='del'>-	u32 data;</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 class;</div><div class='del'>-	u8 source;</div><div class='del'>-	u8 prio;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum iic_pending_flags {</div><div class='del'>-	IIC_VALID = 0x80,</div><div class='del'>-	IIC_IPI   = 0x40,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iic_regs {</div><div class='del'>-	struct iic_pending_bits pending;</div><div class='del'>-	struct iic_pending_bits pending_destr;</div><div class='del'>-	u64 generate;</div><div class='del'>-	u64 prio;</div><div class='del'>-};</div><div class='add'>+#include "cbe_regs.h"</div><div class='ctx'> </div><div class='ctx'> struct iic {</div><div class='del'>-	struct iic_regs __iomem *regs;</div><div class='add'>+	struct cbe_iic_thread_regs __iomem *regs;</div><div class='ctx'> 	u8 target_id;</div><div class='add'>+	u8 eoi_stack[16];</div><div class='add'>+	int eoi_ptr;</div><div class='add'>+	struct irq_host *host;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_PER_CPU(struct iic, iic);</div><div class='add'>+#define IIC_NODE_COUNT	2</div><div class='add'>+static struct irq_host *iic_hosts[IIC_NODE_COUNT];</div><div class='ctx'> </div><div class='del'>-void iic_local_enable(void)</div><div class='add'>+/* Convert between "pending" bits and hw irq number */</div><div class='add'>+static irq_hw_number_t iic_pending_to_hwnum(struct cbe_iic_pending_bits bits)</div><div class='ctx'> {</div><div class='del'>-	struct iic *iic = &amp;__get_cpu_var(iic);</div><div class='del'>-	u64 tmp;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * There seems to be a bug that is present in DD2.x CPUs</div><div class='del'>-	 * and still only partially fixed in DD3.1.</div><div class='del'>-	 * This bug causes a value written to the priority register</div><div class='del'>-	 * not to make it there, resulting in a system hang unless we</div><div class='del'>-	 * write it again.</div><div class='del'>-	 * Masking with 0xf0 is done because the Cell BE does not</div><div class='del'>-	 * implement the lower four bits of the interrupt priority,</div><div class='del'>-	 * they always read back as zeroes, although future CPUs</div><div class='del'>-	 * might implement different bits.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		out_be64(&amp;iic-&gt;regs-&gt;prio, 0xff);</div><div class='del'>-		tmp = in_be64(&amp;iic-&gt;regs-&gt;prio);</div><div class='del'>-	} while ((tmp &amp; 0xf0) != 0xf0);</div><div class='del'>-}</div><div class='add'>+	unsigned char unit = bits.source &amp; 0xf;</div><div class='ctx'> </div><div class='del'>-void iic_local_disable(void)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;__get_cpu_var(iic).regs-&gt;prio, 0x0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int iic_startup(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	if (bits.flags &amp; CBE_IIC_IRQ_IPI)</div><div class='add'>+		return IIC_IRQ_IPI0 | (bits.prio &gt;&gt; 4);</div><div class='add'>+	else if (bits.class &lt;= 3)</div><div class='add'>+		return (bits.class &lt;&lt; 4) | unit;</div><div class='add'>+	else</div><div class='add'>+		return IIC_IRQ_INVALID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iic_enable(unsigned int irq)</div><div class='add'>+static void iic_mask(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	iic_local_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iic_disable(unsigned int irq)</div><div class='add'>+static void iic_unmask(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void iic_end(unsigned int irq)</div><div class='add'>+static void iic_eoi(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	iic_local_enable();</div><div class='add'>+	struct iic *iic = &amp;__get_cpu_var(iic);</div><div class='add'>+	out_be64(&amp;iic-&gt;regs-&gt;prio, iic-&gt;eoi_stack[--iic-&gt;eoi_ptr]);</div><div class='add'>+	BUG_ON(iic-&gt;eoi_ptr &lt; 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type iic_pic = {</div><div class='add'>+static struct irq_chip iic_chip = {</div><div class='ctx'> 	.typename = " CELL-IIC ",</div><div class='del'>-	.startup = iic_startup,</div><div class='del'>-	.enable = iic_enable,</div><div class='del'>-	.disable = iic_disable,</div><div class='del'>-	.end = iic_end,</div><div class='add'>+	.mask = iic_mask,</div><div class='add'>+	.unmask = iic_unmask,</div><div class='add'>+	.eoi = iic_eoi,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int iic_external_get_irq(struct iic_pending_bits pending)</div><div class='del'>-{</div><div class='del'>-	int irq;</div><div class='del'>-	unsigned char node, unit;</div><div class='del'>-</div><div class='del'>-	node = pending.source &gt;&gt; 4;</div><div class='del'>-	unit = pending.source &amp; 0xf;</div><div class='del'>-	irq = -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This mapping is specific to the Cell Broadband</div><div class='del'>-	 * Engine. We might need to get the numbers</div><div class='del'>-	 * from the device tree to support future CPUs.</div><div class='del'>-	 */</div><div class='del'>-	switch (unit) {</div><div class='del'>-	case 0x00:</div><div class='del'>-	case 0x0b:</div><div class='del'>-		/*</div><div class='del'>-		 * One of these units can be connected</div><div class='del'>-		 * to an external interrupt controller.</div><div class='del'>-		 */</div><div class='del'>-		if (pending.prio &gt; 0x3f ||</div><div class='del'>-		    pending.class != 2)</div><div class='del'>-			break;</div><div class='del'>-		irq = IIC_EXT_OFFSET</div><div class='del'>-			+ spider_get_irq(node)</div><div class='del'>-			+ node * IIC_NODE_STRIDE;</div><div class='del'>-		break;</div><div class='del'>-	case 0x01 ... 0x04:</div><div class='del'>-	case 0x07 ... 0x0a:</div><div class='del'>-		/*</div><div class='del'>-		 * These units are connected to the SPEs</div><div class='del'>-		 */</div><div class='del'>-		if (pending.class &gt; 2)</div><div class='del'>-			break;</div><div class='del'>-		irq = IIC_SPE_OFFSET</div><div class='del'>-			+ pending.class * IIC_CLASS_STRIDE</div><div class='del'>-			+ node * IIC_NODE_STRIDE</div><div class='del'>-			+ unit;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (irq == -1)</div><div class='del'>-		printk(KERN_WARNING "Unexpected interrupt class %02x, "</div><div class='del'>-			"source %02x, prio %02x, cpu %02x\n", pending.class,</div><div class='del'>-			pending.source, pending.prio, smp_processor_id());</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Get an IRQ number from the pending state register of the IIC */</div><div class='del'>-int iic_get_irq(struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	struct iic *iic;</div><div class='del'>-	int irq;</div><div class='del'>-	struct iic_pending_bits pending;</div><div class='del'>-</div><div class='del'>-	iic = &amp;__get_cpu_var(iic);</div><div class='del'>-	*(unsigned long *) &amp;pending = </div><div class='del'>-		in_be64((unsigned long __iomem *) &amp;iic-&gt;regs-&gt;pending_destr);</div><div class='del'>-</div><div class='del'>-	irq = -1;</div><div class='del'>-	if (pending.flags &amp; IIC_VALID) {</div><div class='del'>-		if (pending.flags &amp; IIC_IPI) {</div><div class='del'>-			irq = IIC_IPI_OFFSET + (pending.prio &gt;&gt; 4);</div><div class='del'>-/*</div><div class='del'>-			if (irq &gt; 0x80)</div><div class='del'>-				printk(KERN_WARNING "Unexpected IPI prio %02x"</div><div class='del'>-					"on CPU %02x\n", pending.prio,</div><div class='del'>-							smp_processor_id());</div><div class='del'>-*/</div><div class='del'>-		} else {</div><div class='del'>-			irq = iic_external_get_irq(pending);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hardcoded part to be compatible with older firmware */</div><div class='del'>-</div><div class='del'>-static int setup_iic_hardcoded(void)</div><div class='add'>+static unsigned int iic_get_irq(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	int nodeid, cpu;</div><div class='del'>-	unsigned long regs;</div><div class='del'>-	struct iic *iic;</div><div class='del'>-</div><div class='del'>-	for_each_cpu(cpu) {</div><div class='del'>-		iic = &amp;per_cpu(iic, cpu);</div><div class='del'>-		nodeid = cpu/2;</div><div class='del'>-</div><div class='del'>-		for (np = of_find_node_by_type(NULL, "cpu");</div><div class='del'>-		     np;</div><div class='del'>-		     np = of_find_node_by_type(np, "cpu")) {</div><div class='del'>-			if (nodeid == *(int *)get_property(np, "node-id", NULL))</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		if (!np) {</div><div class='del'>-			printk(KERN_WARNING "IIC: CPU %d not found\n", cpu);</div><div class='del'>-			iic-&gt;regs = NULL;</div><div class='del'>-			iic-&gt;target_id = 0xff;</div><div class='del'>-			return -ENODEV;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		regs = *(long *)get_property(np, "iic", NULL);</div><div class='del'>-</div><div class='del'>-		/* hack until we have decided on the devtree info */</div><div class='del'>-		regs += 0x400;</div><div class='del'>-		if (cpu &amp; 1)</div><div class='del'>-			regs += 0x20;</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO "IIC for CPU %d at %lx\n", cpu, regs);</div><div class='del'>-		iic-&gt;regs = ioremap(regs, sizeof(struct iic_regs));</div><div class='del'>-		iic-&gt;target_id = (nodeid &lt;&lt; 4) + ((cpu &amp; 1) ? 0xf : 0xe);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int setup_iic(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dn;</div><div class='del'>-	unsigned long *regs;</div><div class='del'>-	char *compatible;</div><div class='del'>- 	unsigned *np, found = 0;</div><div class='del'>-	struct iic *iic = NULL;</div><div class='del'>-</div><div class='del'>-	for (dn = NULL; (dn = of_find_node_by_name(dn, "interrupt-controller"));) {</div><div class='del'>-		compatible = (char *)get_property(dn, "compatible", NULL);</div><div class='del'>-</div><div class='del'>-		if (!compatible) {</div><div class='del'>-			printk(KERN_WARNING "no compatible property found !\n");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>- 		if (strstr(compatible, "IBM,CBEA-Internal-Interrupt-Controller"))</div><div class='del'>- 			regs = (unsigned long *)get_property(dn,"reg", NULL);</div><div class='del'>- 		else</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>- 		if (!regs)</div><div class='del'>- 			printk(KERN_WARNING "IIC: no reg property\n");</div><div class='del'>-</div><div class='del'>- 		np = (unsigned int *)get_property(dn, "ibm,interrupt-server-ranges", NULL);</div><div class='del'>-</div><div class='del'>- 		if (!np) {</div><div class='del'>-			printk(KERN_WARNING "IIC: CPU association not found\n");</div><div class='del'>-			iic-&gt;regs = NULL;</div><div class='del'>-			iic-&gt;target_id = 0xff;</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>- 		iic = &amp;per_cpu(iic, np[0]);</div><div class='del'>- 		iic-&gt;regs = ioremap(regs[0], sizeof(struct iic_regs));</div><div class='del'>-		iic-&gt;target_id = ((np[0] &amp; 2) &lt;&lt; 3) + ((np[0] &amp; 1) ? 0xf : 0xe);</div><div class='del'>- 		printk("IIC for CPU %d at %lx mapped to %p\n", np[0], regs[0], iic-&gt;regs);</div><div class='del'>-</div><div class='del'>- 		iic = &amp;per_cpu(iic, np[1]);</div><div class='del'>- 		iic-&gt;regs = ioremap(regs[2], sizeof(struct iic_regs));</div><div class='del'>-		iic-&gt;target_id = ((np[1] &amp; 2) &lt;&lt; 3) + ((np[1] &amp; 1) ? 0xf : 0xe);</div><div class='del'>- 		printk("IIC for CPU %d at %lx mapped to %p\n", np[1], regs[2], iic-&gt;regs);</div><div class='del'>-</div><div class='del'>-		found++;</div><div class='del'>-  	}</div><div class='del'>-</div><div class='del'>-	if (found)</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return -ENODEV;</div><div class='add'>+  	struct cbe_iic_pending_bits pending;</div><div class='add'>+ 	struct iic *iic;</div><div class='add'>+</div><div class='add'>+ 	iic = &amp;__get_cpu_var(iic);</div><div class='add'>+ 	*(unsigned long *) &amp;pending =</div><div class='add'>+ 		in_be64((unsigned long __iomem *) &amp;iic-&gt;regs-&gt;pending_destr);</div><div class='add'>+ 	iic-&gt;eoi_stack[++iic-&gt;eoi_ptr] = pending.prio;</div><div class='add'>+ 	BUG_ON(iic-&gt;eoi_ptr &gt; 15);</div><div class='add'>+	if (pending.flags &amp; CBE_IIC_IRQ_VALID)</div><div class='add'>+		return irq_linear_revmap(iic-&gt;host,</div><div class='add'>+ 					 iic_pending_to_hwnum(pending));</div><div class='add'>+	return NO_IRQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -290,12 +108,12 @@ static int setup_iic(void)</div><div class='ctx'> /* Use the highest interrupt priorities for IPI */</div><div class='ctx'> static inline int iic_ipi_to_irq(int ipi)</div><div class='ctx'> {</div><div class='del'>-	return IIC_IPI_OFFSET + IIC_NUM_IPIS - 1 - ipi;</div><div class='add'>+	return IIC_IRQ_IPI0 + IIC_NUM_IPIS - 1 - ipi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int iic_irq_to_ipi(int irq)</div><div class='ctx'> {</div><div class='del'>-	return IIC_NUM_IPIS - 1 - (irq - IIC_IPI_OFFSET);</div><div class='add'>+	return IIC_NUM_IPIS - 1 - (irq - IIC_IRQ_IPI0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iic_setup_cpu(void)</div><div class='hunk'>@@ -314,22 +132,51 @@ u8 iic_get_target_id(int cpu)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iic_get_target_id);</div><div class='ctx'> </div><div class='add'>+struct irq_host *iic_get_irq_host(int node)</div><div class='add'>+{</div><div class='add'>+	if (node &lt; 0 || node &gt;= IIC_NODE_COUNT)</div><div class='add'>+		return NULL;</div><div class='add'>+	return iic_hosts[node];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iic_get_irq_host);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static irqreturn_t iic_ipi_action(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	smp_message_recv(iic_irq_to_ipi(irq), regs);</div><div class='add'>+	int ipi = (int)(long)dev_id;</div><div class='add'>+</div><div class='add'>+	smp_message_recv(ipi, regs);</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iic_request_ipi(int ipi, const char *name)</div><div class='ctx'> {</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	irq = iic_ipi_to_irq(ipi);</div><div class='del'>-	/* IPIs are marked SA_INTERRUPT as they must run with irqs</div><div class='del'>-	 * disabled */</div><div class='del'>-	get_irq_desc(irq)-&gt;handler = &amp;iic_pic;</div><div class='del'>-	get_irq_desc(irq)-&gt;status |= IRQ_PER_CPU;</div><div class='del'>-	request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL);</div><div class='add'>+	int node, virq;</div><div class='add'>+</div><div class='add'>+	for (node = 0; node &lt; IIC_NODE_COUNT; node++) {</div><div class='add'>+		char *rname;</div><div class='add'>+		if (iic_hosts[node] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		virq = irq_create_mapping(iic_hosts[node],</div><div class='add'>+					  iic_ipi_to_irq(ipi));</div><div class='add'>+		if (virq == NO_IRQ) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "iic: failed to map IPI %s on node %d\n",</div><div class='add'>+			       name, node);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		rname = kzalloc(strlen(name) + 16, GFP_KERNEL);</div><div class='add'>+		if (rname)</div><div class='add'>+			sprintf(rname, "%s node %d", name, node);</div><div class='add'>+		else</div><div class='add'>+			rname = (char *)name;</div><div class='add'>+		if (request_irq(virq, iic_ipi_action, IRQF_DISABLED,</div><div class='add'>+				rname, (void *)(long)ipi))</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "iic: failed to request IPI %s on node %d\n",</div><div class='add'>+			       name, node);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void iic_request_IPIs(void)</div><div class='hunk'>@@ -340,34 +187,119 @@ void iic_request_IPIs(void)</div><div class='ctx'> 	iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");</div><div class='ctx'> #endif /* CONFIG_DEBUGGER */</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='del'>-static void iic_setup_spe_handlers(void)</div><div class='add'>+</div><div class='add'>+static int iic_host_match(struct irq_host *h, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	return h-&gt;host_data != NULL &amp;&amp; node == h-&gt;host_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iic_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			irq_hw_number_t hw)</div><div class='ctx'> {</div><div class='del'>-	int be, isrc;</div><div class='add'>+	if (hw &lt; IIC_IRQ_IPI0)</div><div class='add'>+		set_irq_chip_and_handler(virq, &amp;iic_chip, handle_fasteoi_irq);</div><div class='add'>+	else</div><div class='add'>+		set_irq_chip_and_handler(virq, &amp;iic_chip, handle_percpu_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Assume two threads per BE are present */</div><div class='del'>-	for (be=0; be &lt; num_present_cpus() / 2; be++) {</div><div class='del'>-		for (isrc = 0; isrc &lt; IIC_CLASS_STRIDE * 3; isrc++) {</div><div class='del'>-			int irq = IIC_NODE_STRIDE * be + IIC_SPE_OFFSET + isrc;</div><div class='del'>-			get_irq_desc(irq)-&gt;handler = &amp;iic_pic;</div><div class='add'>+static int iic_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			   u32 *intspec, unsigned int intsize,</div><div class='add'>+			   irq_hw_number_t *out_hwirq, unsigned int *out_flags)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	/* Currently, we don't translate anything. That needs to be fixed as</div><div class='add'>+	 * we get better defined device-trees. iic interrupts have to be</div><div class='add'>+	 * explicitely mapped by whoever needs them</div><div class='add'>+	 */</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops iic_host_ops = {</div><div class='add'>+	.match = iic_host_match,</div><div class='add'>+	.map = iic_host_map,</div><div class='add'>+	.xlate = iic_host_xlate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init init_one_iic(unsigned int hw_cpu, unsigned long addr,</div><div class='add'>+				struct irq_host *host)</div><div class='add'>+{</div><div class='add'>+	/* XXX FIXME: should locate the linux CPU number from the HW cpu</div><div class='add'>+	 * number properly. We are lucky for now</div><div class='add'>+	 */</div><div class='add'>+	struct iic *iic = &amp;per_cpu(iic, hw_cpu);</div><div class='add'>+</div><div class='add'>+	iic-&gt;regs = ioremap(addr, sizeof(struct cbe_iic_thread_regs));</div><div class='add'>+	BUG_ON(iic-&gt;regs == NULL);</div><div class='add'>+</div><div class='add'>+	iic-&gt;target_id = ((hw_cpu &amp; 2) &lt;&lt; 3) | ((hw_cpu &amp; 1) ? 0xf : 0xe);</div><div class='add'>+	iic-&gt;eoi_stack[0] = 0xff;</div><div class='add'>+	iic-&gt;host = host;</div><div class='add'>+	out_be64(&amp;iic-&gt;regs-&gt;prio, 0);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "IIC for CPU %d at %lx mapped to %p, target id 0x%x\n",</div><div class='add'>+	       hw_cpu, addr, iic-&gt;regs, iic-&gt;target_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init setup_iic(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+	struct resource r0, r1;</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	int found = 0;</div><div class='add'>+ 	u32 *np;</div><div class='add'>+</div><div class='add'>+	for (dn = NULL;</div><div class='add'>+	     (dn = of_find_node_by_name(dn,"interrupt-controller")) != NULL;) {</div><div class='add'>+		if (!device_is_compatible(dn,</div><div class='add'>+				     "IBM,CBEA-Internal-Interrupt-Controller"))</div><div class='add'>+			continue;</div><div class='add'>+ 		np = (u32 *)get_property(dn, "ibm,interrupt-server-ranges",</div><div class='add'>+					 NULL);</div><div class='add'>+ 		if (np == NULL) {</div><div class='add'>+			printk(KERN_WARNING "IIC: CPU association not found\n");</div><div class='add'>+			of_node_put(dn);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		if (of_address_to_resource(dn, 0, &amp;r0) ||</div><div class='add'>+		    of_address_to_resource(dn, 1, &amp;r1)) {</div><div class='add'>+			printk(KERN_WARNING "IIC: Can't resolve addresses\n");</div><div class='add'>+			of_node_put(dn);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='add'>+		host = NULL;</div><div class='add'>+		if (found &lt; IIC_NODE_COUNT) {</div><div class='add'>+			host = irq_alloc_host(IRQ_HOST_MAP_LINEAR,</div><div class='add'>+					      IIC_SOURCE_COUNT,</div><div class='add'>+					      &amp;iic_host_ops,</div><div class='add'>+					      IIC_IRQ_INVALID);</div><div class='add'>+			iic_hosts[found] = host;</div><div class='add'>+			BUG_ON(iic_hosts[found] == NULL);</div><div class='add'>+			iic_hosts[found]-&gt;host_data = of_node_get(dn);</div><div class='add'>+			found++;</div><div class='add'>+		}</div><div class='add'>+		init_one_iic(np[0], r0.start, host);</div><div class='add'>+		init_one_iic(np[1], r1.start, host);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (found)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void iic_init_IRQ(void)</div><div class='add'>+void __init iic_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	int cpu, irq_offset;</div><div class='del'>-	struct iic *iic;</div><div class='del'>-</div><div class='add'>+	/* Discover and initialize iics */</div><div class='ctx'> 	if (setup_iic() &lt; 0)</div><div class='del'>-		setup_iic_hardcoded();</div><div class='add'>+		panic("IIC: Failed to initialize !\n");</div><div class='ctx'> </div><div class='del'>-	irq_offset = 0;</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		iic = &amp;per_cpu(iic, cpu);</div><div class='del'>-		if (iic-&gt;regs)</div><div class='del'>-			out_be64(&amp;iic-&gt;regs-&gt;prio, 0xff);</div><div class='del'>-	}</div><div class='del'>-	iic_setup_spe_handlers();</div><div class='add'>+	/* Set master interrupt handling function */</div><div class='add'>+	ppc_md.get_irq = iic_get_irq;</div><div class='add'>+</div><div class='add'>+	/* Enable on current CPU */</div><div class='add'>+	iic_setup_cpu();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/interrupt.h b/arch/powerpc/platforms/cell/interrupt.h<br/>index 799f77d98f96..5560a92ec3ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/interrupt.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/interrupt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/interrupt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/interrupt.h</a></div><div class='hunk'>@@ -37,27 +37,24 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='del'>-	IIC_EXT_OFFSET   = 0x00, /* Start of south bridge IRQs */</div><div class='del'>-	IIC_NUM_EXT      = 0x40, /* Number of south bridge IRQs */</div><div class='del'>-	IIC_SPE_OFFSET   = 0x40, /* Start of SPE interrupts */</div><div class='del'>-	IIC_CLASS_STRIDE = 0x10, /* SPE IRQs per class    */</div><div class='del'>-	IIC_IPI_OFFSET   = 0x70, /* Start of IPI IRQs */</div><div class='del'>-	IIC_NUM_IPIS     = 0x10, /* IRQs reserved for IPI */</div><div class='del'>-	IIC_NODE_STRIDE  = 0x80, /* Total IRQs per node   */</div><div class='add'>+	IIC_IRQ_INVALID		= 0xff,</div><div class='add'>+	IIC_IRQ_MAX		= 0x3f,</div><div class='add'>+	IIC_IRQ_EXT_IOIF0	= 0x20,</div><div class='add'>+	IIC_IRQ_EXT_IOIF1	= 0x2b,</div><div class='add'>+	IIC_IRQ_IPI0		= 0x40,</div><div class='add'>+	IIC_NUM_IPIS    	= 0x10, /* IRQs reserved for IPI */</div><div class='add'>+	IIC_SOURCE_COUNT	= 0x50,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern void iic_init_IRQ(void);</div><div class='del'>-extern int  iic_get_irq(struct pt_regs *regs);</div><div class='ctx'> extern void iic_cause_IPI(int cpu, int mesg);</div><div class='ctx'> extern void iic_request_IPIs(void);</div><div class='ctx'> extern void iic_setup_cpu(void);</div><div class='del'>-extern void iic_local_enable(void);</div><div class='del'>-extern void iic_local_disable(void);</div><div class='ctx'> </div><div class='ctx'> extern u8 iic_get_target_id(int cpu);</div><div class='add'>+extern struct irq_host *iic_get_irq_host(int node);</div><div class='ctx'> </div><div class='ctx'> extern void spider_init_IRQ(void);</div><div class='del'>-extern int spider_get_irq(int node);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> #endif /* ASM_CELL_PIC_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c<br/>index a49ceb799a8e..a35004e14c69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/iommu.c</a></div><div class='hunk'>@@ -473,6 +473,16 @@ static int cell_dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	return mask &lt; 0x100000000ull;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct dma_mapping_ops cell_iommu_ops = {</div><div class='add'>+	.alloc_coherent = cell_alloc_coherent,</div><div class='add'>+	.free_coherent = cell_free_coherent,</div><div class='add'>+	.map_single = cell_map_single,</div><div class='add'>+	.unmap_single = cell_unmap_single,</div><div class='add'>+	.map_sg = cell_map_sg,</div><div class='add'>+	.unmap_sg = cell_unmap_sg,</div><div class='add'>+	.dma_supported = cell_dma_supported,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void cell_init_iommu(void)</div><div class='ctx'> {</div><div class='ctx'> 	int setup_bus = 0;</div><div class='hunk'>@@ -498,11 +508,5 @@ void cell_init_iommu(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_dma_ops.alloc_coherent = cell_alloc_coherent;</div><div class='del'>-	pci_dma_ops.free_coherent = cell_free_coherent;</div><div class='del'>-	pci_dma_ops.map_single = cell_map_single;</div><div class='del'>-	pci_dma_ops.unmap_single = cell_unmap_single;</div><div class='del'>-	pci_dma_ops.map_sg = cell_map_sg;</div><div class='del'>-	pci_dma_ops.unmap_sg = cell_unmap_sg;</div><div class='del'>-	pci_dma_ops.dma_supported = cell_dma_supported;</div><div class='add'>+	pci_dma_ops = cell_iommu_ops;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c<br/>index 7eed8c624517..9f2e4ed20a57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/pervasive.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/pervasive.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/pervasive.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/pervasive.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='hunk'>@@ -37,36 +36,28 @@</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pervasive.h"</div><div class='add'>+#include "cbe_regs.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(cbe_pervasive_lock);</div><div class='del'>-struct cbe_pervasive {</div><div class='del'>-	struct pmd_regs __iomem *regs;</div><div class='del'>-	unsigned int thread;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* can't use per_cpu from setup_arch */</div><div class='del'>-static struct cbe_pervasive cbe_pervasive[NR_CPUS];</div><div class='ctx'> </div><div class='ctx'> static void __init cbe_enable_pause_zero(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long thread_switch_control;</div><div class='ctx'> 	unsigned long temp_register;</div><div class='del'>-	struct cbe_pervasive *p;</div><div class='del'>-	int thread;</div><div class='add'>+	struct cbe_pmd_regs __iomem *pregs;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;cbe_pervasive_lock);</div><div class='del'>-	p = &amp;cbe_pervasive[smp_processor_id()];</div><div class='del'>-</div><div class='del'>-	if (!cbe_pervasive-&gt;regs)</div><div class='add'>+	pregs = cbe_get_cpu_pmd_regs(smp_processor_id());</div><div class='add'>+	if (pregs == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Power Management: CPU %d\n", smp_processor_id());</div><div class='ctx'> </div><div class='ctx'> 	 /* Enable Pause(0) control bit */</div><div class='del'>-	temp_register = in_be64(&amp;p-&gt;regs-&gt;pm_control);</div><div class='add'>+	temp_register = in_be64(&amp;pregs-&gt;pm_control);</div><div class='ctx'> </div><div class='del'>-	out_be64(&amp;p-&gt;regs-&gt;pm_control,</div><div class='del'>-		 temp_register|PMD_PAUSE_ZERO_CONTROL);</div><div class='add'>+	out_be64(&amp;pregs-&gt;pm_control,</div><div class='add'>+		 temp_register | CBE_PMD_PAUSE_ZERO_CONTROL);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable DEC and EE interrupt request */</div><div class='ctx'> 	thread_switch_control  = mfspr(SPRN_TSC_CELL);</div><div class='hunk'>@@ -75,25 +66,16 @@ static void __init cbe_enable_pause_zero(void)</div><div class='ctx'> 	switch ((mfspr(SPRN_CTRLF) &amp; CTRL_CT)) {</div><div class='ctx'> 	case CTRL_CT0:</div><div class='ctx'> 		thread_switch_control |= TSC_CELL_DEC_ENABLE_0;</div><div class='del'>-		thread = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CTRL_CT1:</div><div class='ctx'> 		thread_switch_control |= TSC_CELL_DEC_ENABLE_1;</div><div class='del'>-		thread = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING "%s: unknown configuration\n",</div><div class='ctx'> 			__FUNCTION__);</div><div class='del'>-		thread = -1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;thread != thread)</div><div class='del'>-		printk(KERN_WARNING "%s: device tree inconsistant, "</div><div class='del'>-				     "cpu %i: %d/%d\n", __FUNCTION__,</div><div class='del'>-				     smp_processor_id(),</div><div class='del'>-				     p-&gt;thread, thread);</div><div class='del'>-</div><div class='ctx'> 	mtspr(SPRN_TSC_CELL, thread_switch_control);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -104,6 +86,11 @@ static void cbe_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ctrl;</div><div class='ctx'> </div><div class='add'>+	/* Why do we do that on every idle ? Couldn't that be done once for</div><div class='add'>+	 * all or do we lose the state some way ? Also, the pm_control</div><div class='add'>+	 * register setting, that can't be set once at boot ? We really want</div><div class='add'>+	 * to move that away in order to implement a simple powersave</div><div class='add'>+	 */</div><div class='ctx'> 	cbe_enable_pause_zero();</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -152,8 +139,15 @@ static int cbe_system_reset_exception(struct pt_regs *regs)</div><div class='ctx'> 		timer_interrupt(regs);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SRR1_WAKEMT:</div><div class='del'>-		/* no action required */</div><div class='ctx'> 		break;</div><div class='add'>+#ifdef CONFIG_CBE_RAS</div><div class='add'>+	case SRR1_WAKESYSERR:</div><div class='add'>+		cbe_system_error_exception(regs);</div><div class='add'>+		break;</div><div class='add'>+	case SRR1_WAKETHERM:</div><div class='add'>+		cbe_thermal_exception(regs);</div><div class='add'>+		break;</div><div class='add'>+#endif /* CONFIG_CBE_RAS */</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* do system reset */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -162,68 +156,11 @@ static int cbe_system_reset_exception(struct pt_regs *regs)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init cbe_find_pmd_mmio(int cpu, struct cbe_pervasive *p)</div><div class='del'>-{</div><div class='del'>-	struct device_node *node;</div><div class='del'>-	unsigned int *int_servers;</div><div class='del'>-	char *addr;</div><div class='del'>-	unsigned long real_address;</div><div class='del'>-	unsigned int size;</div><div class='del'>-</div><div class='del'>-	struct pmd_regs __iomem *pmd_mmio_area;</div><div class='del'>-	int hardid, thread;</div><div class='del'>-	int proplen;</div><div class='del'>-</div><div class='del'>-	pmd_mmio_area = NULL;</div><div class='del'>-	hardid = get_hard_smp_processor_id(cpu);</div><div class='del'>-	for (node = NULL; (node = of_find_node_by_type(node, "cpu"));) {</div><div class='del'>-		int_servers = (void *) get_property(node,</div><div class='del'>-				"ibm,ppc-interrupt-server#s", &amp;proplen);</div><div class='del'>-		if (!int_servers) {</div><div class='del'>-			printk(KERN_WARNING "%s misses "</div><div class='del'>-				"ibm,ppc-interrupt-server#s property",</div><div class='del'>-				node-&gt;full_name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		for (thread = 0; thread &lt; proplen / sizeof (int); thread++) {</div><div class='del'>-			if (hardid == int_servers[thread]) {</div><div class='del'>-				addr = get_property(node, "pervasive", NULL);</div><div class='del'>-				goto found;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_WARNING "%s: CPU %d not found\n", __FUNCTION__, cpu);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	real_address = *(unsigned long*) addr;</div><div class='del'>-	addr += sizeof (unsigned long);</div><div class='del'>-	size = *(unsigned int*) addr;</div><div class='del'>-</div><div class='del'>-	pr_debug("pervasive area for CPU %d at %lx, size %x\n",</div><div class='del'>-			cpu, real_address, size);</div><div class='del'>-	p-&gt;regs = ioremap(real_address, size);</div><div class='del'>-	p-&gt;thread = thread;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init cell_pervasive_init(void)</div><div class='add'>+void __init cbe_pervasive_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct cbe_pervasive *p;</div><div class='del'>-	int cpu;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		p = &amp;cbe_pervasive[cpu];</div><div class='del'>-		ret = cbe_find_pmd_mmio(cpu, p);</div><div class='del'>-		if (ret)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ppc_md.idle_loop = cbe_idle;</div><div class='ctx'> 	ppc_md.system_reset_exception = cbe_system_reset_exception;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/pervasive.h b/arch/powerpc/platforms/cell/pervasive.h<br/>index da1fb85ca3e8..7b50947f8044 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/pervasive.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/pervasive.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/pervasive.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/pervasive.h</a></div><div class='hunk'>@@ -25,38 +25,9 @@</div><div class='ctx'> #ifndef PERVASIVE_H</div><div class='ctx'> #define PERVASIVE_H</div><div class='ctx'> </div><div class='del'>-struct pmd_regs {</div><div class='del'>-	u8 pad_0x0000_0x0800[0x0800 - 0x0000];			/* 0x0000 */</div><div class='del'>-</div><div class='del'>-	/* Thermal Sensor Registers */</div><div class='del'>-	u64  ts_ctsr1;						/* 0x0800 */</div><div class='del'>-	u64  ts_ctsr2;						/* 0x0808 */</div><div class='del'>-	u64  ts_mtsr1;						/* 0x0810 */</div><div class='del'>-	u64  ts_mtsr2;						/* 0x0818 */</div><div class='del'>-	u64  ts_itr1;						/* 0x0820 */</div><div class='del'>-	u64  ts_itr2;						/* 0x0828 */</div><div class='del'>-	u64  ts_gitr;						/* 0x0830 */</div><div class='del'>-	u64  ts_isr;						/* 0x0838 */</div><div class='del'>-	u64  ts_imr;						/* 0x0840 */</div><div class='del'>-	u64  tm_cr1;						/* 0x0848 */</div><div class='del'>-	u64  tm_cr2;						/* 0x0850 */</div><div class='del'>-	u64  tm_simr;						/* 0x0858 */</div><div class='del'>-	u64  tm_tpr;						/* 0x0860 */</div><div class='del'>-	u64  tm_str1;						/* 0x0868 */</div><div class='del'>-	u64  tm_str2;						/* 0x0870 */</div><div class='del'>-	u64  tm_tsr;						/* 0x0878 */</div><div class='del'>-</div><div class='del'>-	/* Power Management */</div><div class='del'>-	u64  pm_control;					/* 0x0880 */</div><div class='del'>-#define PMD_PAUSE_ZERO_CONTROL		0x10000</div><div class='del'>-	u64  pm_status;						/* 0x0888 */</div><div class='del'>-</div><div class='del'>-	/* Time Base Register */</div><div class='del'>-	u64  tbr;						/* 0x0890 */</div><div class='del'>-</div><div class='del'>-	u8   pad_0x0898_0x1000 [0x1000 - 0x0898];		/* 0x0898 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init cell_pervasive_init(void);</div><div class='add'>+extern void cbe_pervasive_init(void);</div><div class='add'>+extern void cbe_system_error_exception(struct pt_regs *regs);</div><div class='add'>+extern void cbe_maintenance_exception(struct pt_regs *regs);</div><div class='add'>+extern void cbe_thermal_exception(struct pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c<br/>new file mode 100644<br/>index 000000000000..033ad6e2827b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/ras.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/ras.c</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+#define DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/smp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/reg.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ras.h"</div><div class='add'>+#include "cbe_regs.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void dump_fir(int cpu)</div><div class='add'>+{</div><div class='add'>+	struct cbe_pmd_regs __iomem *pregs = cbe_get_cpu_pmd_regs(cpu);</div><div class='add'>+	struct cbe_iic_regs __iomem *iregs = cbe_get_cpu_iic_regs(cpu);</div><div class='add'>+</div><div class='add'>+	if (pregs == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Todo: do some nicer parsing of bits and based on them go down</div><div class='add'>+	 * to other sub-units FIRs and not only IIC</div><div class='add'>+	 */</div><div class='add'>+	printk(KERN_ERR "Global Checkstop FIR    : 0x%016lx\n",</div><div class='add'>+	       in_be64(&amp;pregs-&gt;checkstop_fir));</div><div class='add'>+	printk(KERN_ERR "Global Recoverable FIR  : 0x%016lx\n",</div><div class='add'>+	       in_be64(&amp;pregs-&gt;checkstop_fir));</div><div class='add'>+	printk(KERN_ERR "Global MachineCheck FIR : 0x%016lx\n",</div><div class='add'>+	       in_be64(&amp;pregs-&gt;spec_att_mchk_fir));</div><div class='add'>+</div><div class='add'>+	if (iregs == NULL)</div><div class='add'>+		return;</div><div class='add'>+	printk(KERN_ERR "IOC FIR                 : 0x%016lx\n",</div><div class='add'>+	       in_be64(&amp;iregs-&gt;ioc_fir));</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cbe_system_error_exception(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "System Error Interrupt on CPU %d !\n", cpu);</div><div class='add'>+	dump_fir(cpu);</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cbe_maintenance_exception(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Nothing implemented for the maintenance interrupt at this point</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Unhandled Maintenance interrupt on CPU %d !\n", cpu);</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cbe_thermal_exception(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Nothing implemented for the thermal interrupt at this point</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Unhandled Thermal interrupt on CPU %d !\n", cpu);</div><div class='add'>+	dump_stack();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cbe_machine_check_handler(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Machine Check Interrupt on CPU %d !\n", cpu);</div><div class='add'>+	dump_fir(cpu);</div><div class='add'>+</div><div class='add'>+	/* No recovery from this code now, lets continue */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init cbe_ras_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long hid0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable System Error &amp; thermal interrupts and wakeup conditions</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	hid0 = mfspr(SPRN_HID0);</div><div class='add'>+	hid0 |= HID0_CBE_THERM_INT_EN | HID0_CBE_THERM_WAKEUP |</div><div class='add'>+		HID0_CBE_SYSERR_INT_EN | HID0_CBE_SYSERR_WAKEUP;</div><div class='add'>+	mtspr(SPRN_HID0, hid0);</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Install machine check handler. Leave setting of precise mode to</div><div class='add'>+	 * what the firmware did for now</div><div class='add'>+	 */</div><div class='add'>+	ppc_md.machine_check_exception = cbe_machine_check_handler;</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, we assume that IOC_FIR is already set to forward some</div><div class='add'>+	 * error conditions to the System Error handler. If that is not true</div><div class='add'>+	 * then it will have to be fixed up here.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/ras.h b/arch/powerpc/platforms/cell/ras.h<br/>new file mode 100644<br/>index 000000000000..eb7ee54c82a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/ras.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/ras.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+#ifndef RAS_H</div><div class='add'>+#define RAS_H</div><div class='add'>+</div><div class='add'>+extern void cbe_system_error_exception(struct pt_regs *regs);</div><div class='add'>+extern void cbe_maintenance_exception(struct pt_regs *regs);</div><div class='add'>+extern void cbe_thermal_exception(struct pt_regs *regs);</div><div class='add'>+extern void cbe_ras_init(void);</div><div class='add'>+</div><div class='add'>+#endif /* RAS_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c<br/>index 6574b22b3cf3..282987d6d4a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/setup.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -49,10 +48,14 @@</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='add'>+#include &lt;asm/spu_priv1.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "interrupt.h"</div><div class='ctx'> #include "iommu.h"</div><div class='add'>+#include "cbe_regs.h"</div><div class='ctx'> #include "pervasive.h"</div><div class='add'>+#include "ras.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> #define DBG(fmt...) udbg_printf(fmt)</div><div class='hunk'>@@ -77,10 +80,31 @@ static void cell_progress(char *s, unsigned short hex)</div><div class='ctx'> 	printk("*** %04x : %s\n", hex, s ? s : "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init cell_pcibios_fixup(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='add'>+</div><div class='add'>+	for_each_pci_dev(dev)</div><div class='add'>+		pci_read_irq_line(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init cell_init_irq(void)</div><div class='add'>+{</div><div class='add'>+	iic_init_IRQ();</div><div class='add'>+	spider_init_IRQ();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init cell_setup_arch(void)</div><div class='ctx'> {</div><div class='del'>-	ppc_md.init_IRQ       = iic_init_IRQ;</div><div class='del'>-	ppc_md.get_irq        = iic_get_irq;</div><div class='add'>+#ifdef CONFIG_SPU_BASE</div><div class='add'>+	spu_priv1_ops         = &amp;spu_priv1_mmio_ops;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cbe_regs_init();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CBE_RAS</div><div class='add'>+	cbe_ras_init();</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	smp_init_cell();</div><div class='hunk'>@@ -97,8 +121,7 @@ static void __init cell_setup_arch(void)</div><div class='ctx'> 	/* Find and initialize PCI host bridges */</div><div class='ctx'> 	init_pci_config_tokens();</div><div class='ctx'> 	find_and_init_phbs();</div><div class='del'>-	spider_init_IRQ();</div><div class='del'>-	cell_pervasive_init();</div><div class='add'>+	cbe_pervasive_init();</div><div class='ctx'> #ifdef CONFIG_DUMMY_CONSOLE</div><div class='ctx'> 	conswitchp = &amp;dummy_con;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -113,25 +136,26 @@ static void __init cell_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	DBG(" -&gt; cell_init_early()\n");</div><div class='ctx'> </div><div class='del'>-	hpte_init_native();</div><div class='del'>-</div><div class='ctx'> 	cell_init_iommu();</div><div class='ctx'> </div><div class='del'>-	ppc64_interrupt_controller = IC_CELL_PIC;</div><div class='del'>-</div><div class='ctx'> 	DBG(" &lt;- cell_init_early()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __init cell_probe(void)</div><div class='ctx'> {</div><div class='del'>-	/* XXX This is temporary, the Cell maintainer will come up with</div><div class='del'>-	 * more appropriate detection logic</div><div class='del'>-	 */</div><div class='ctx'> 	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))</div><div class='add'>+</div><div class='add'>+	if (!of_flat_dt_is_compatible(root, "IBM,CBEA") &amp;&amp;</div><div class='add'>+	    !of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_UDBG_RTAS_CONSOLE</div><div class='add'>+	udbg_init_rtas_console();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	hpte_init_native();</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -159,6 +183,8 @@ define_machine(cell) {</div><div class='ctx'> 	.calibrate_decr		= generic_calibrate_decr,</div><div class='ctx'> 	.check_legacy_ioport	= cell_check_legacy_ioport,</div><div class='ctx'> 	.progress		= cell_progress,</div><div class='add'>+	.init_IRQ       	= cell_init_irq,</div><div class='add'>+	.pcibios_fixup		= cell_pcibios_fixup,</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> 	.machine_kexec		= default_machine_kexec,</div><div class='ctx'> 	.machine_kexec_prepare	= default_machine_kexec_prepare,</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c<br/>index bdf6c5fe58c0..46aef0640742 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/smp.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c<br/>index 55cbdd77a62d..15217bb0402f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spider-pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spider-pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spider-pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spider-pic.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -56,184 +57,323 @@ enum {</div><div class='ctx'> 	REISWAITEN	= 0x508, /* Reissue Wait Control*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __iomem *spider_pics[4];</div><div class='add'>+#define SPIDER_CHIP_COUNT	4</div><div class='add'>+#define SPIDER_SRC_COUNT	64</div><div class='add'>+#define SPIDER_IRQ_INVALID	63</div><div class='ctx'> </div><div class='del'>-static void __iomem *spider_get_pic(int irq)</div><div class='del'>-{</div><div class='del'>-	int node = irq / IIC_NODE_STRIDE;</div><div class='del'>-	irq %= IIC_NODE_STRIDE;</div><div class='del'>-</div><div class='del'>-	if (irq &gt;= IIC_EXT_OFFSET &amp;&amp;</div><div class='del'>-	    irq &lt; IIC_EXT_OFFSET + IIC_NUM_EXT &amp;&amp;</div><div class='del'>-	    spider_pics)</div><div class='del'>-		return spider_pics[node];</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='add'>+struct spider_pic {</div><div class='add'>+	struct irq_host		*host;</div><div class='add'>+	struct device_node	*of_node;</div><div class='add'>+	void __iomem		*regs;</div><div class='add'>+	unsigned int		node_id;</div><div class='add'>+};</div><div class='add'>+static struct spider_pic spider_pics[SPIDER_CHIP_COUNT];</div><div class='ctx'> </div><div class='del'>-static int spider_get_nr(unsigned int irq)</div><div class='add'>+static struct spider_pic *spider_virq_to_pic(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	return (irq % IIC_NODE_STRIDE) - IIC_EXT_OFFSET;</div><div class='add'>+	return irq_map[virq].host-&gt;host_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __iomem *spider_get_irq_config(int irq)</div><div class='add'>+static void __iomem *spider_get_irq_config(struct spider_pic *pic,</div><div class='add'>+					   unsigned int src)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *pic;</div><div class='del'>-	pic = spider_get_pic(irq);</div><div class='del'>-	return pic + TIR_CFGA + 8 * spider_get_nr(irq);</div><div class='add'>+	return pic-&gt;regs + TIR_CFGA + 8 * src;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spider_enable_irq(unsigned int irq)</div><div class='add'>+static void spider_unmask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	int nodeid = (irq / IIC_NODE_STRIDE) * 0x10;</div><div class='del'>-	void __iomem *cfg = spider_get_irq_config(irq);</div><div class='del'>-	irq = spider_get_nr(irq);</div><div class='add'>+	struct spider_pic *pic = spider_virq_to_pic(virq);</div><div class='add'>+	void __iomem *cfg = spider_get_irq_config(pic, irq_map[virq].hwirq);</div><div class='ctx'> </div><div class='del'>-	out_be32(cfg, (in_be32(cfg) &amp; ~0xf0)| 0x3107000eu | nodeid);</div><div class='del'>-	out_be32(cfg + 4, in_be32(cfg + 4) | 0x00020000u | irq);</div><div class='add'>+	out_be32(cfg, in_be32(cfg) | 0x30000000u);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spider_disable_irq(unsigned int irq)</div><div class='add'>+static void spider_mask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *cfg = spider_get_irq_config(irq);</div><div class='del'>-	irq = spider_get_nr(irq);</div><div class='add'>+	struct spider_pic *pic = spider_virq_to_pic(virq);</div><div class='add'>+	void __iomem *cfg = spider_get_irq_config(pic, irq_map[virq].hwirq);</div><div class='ctx'> </div><div class='ctx'> 	out_be32(cfg, in_be32(cfg) &amp; ~0x30000000u);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int spider_startup_irq(unsigned int irq)</div><div class='add'>+static void spider_ack_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	spider_enable_irq(irq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct spider_pic *pic = spider_virq_to_pic(virq);</div><div class='add'>+	unsigned int src = irq_map[virq].hwirq;</div><div class='ctx'> </div><div class='del'>-static void spider_shutdown_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	spider_disable_irq(irq);</div><div class='del'>-}</div><div class='add'>+	/* Reset edge detection logic if necessary</div><div class='add'>+	 */</div><div class='add'>+	if (get_irq_desc(virq)-&gt;status &amp; IRQ_LEVEL)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-static void spider_end_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	spider_enable_irq(irq);</div><div class='add'>+	/* Only interrupts 47 to 50 can be set to edge */</div><div class='add'>+	if (src &lt; 47 || src &gt; 50)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Perform the clear of the edge logic */</div><div class='add'>+	out_be32(pic-&gt;regs + TIR_EDC, 0x100 | (src &amp; 0xf));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void spider_ack_irq(unsigned int irq)</div><div class='add'>+static int spider_set_irq_type(unsigned int virq, unsigned int type)</div><div class='ctx'> {</div><div class='del'>-	spider_disable_irq(irq);</div><div class='del'>-	iic_local_enable();</div><div class='add'>+	unsigned int sense = type &amp; IRQ_TYPE_SENSE_MASK;</div><div class='add'>+	struct spider_pic *pic = spider_virq_to_pic(virq);</div><div class='add'>+	unsigned int hw = irq_map[virq].hwirq;</div><div class='add'>+	void __iomem *cfg = spider_get_irq_config(pic, hw);</div><div class='add'>+	struct irq_desc *desc = get_irq_desc(virq);</div><div class='add'>+	u32 old_mask;</div><div class='add'>+	u32 ic;</div><div class='add'>+</div><div class='add'>+	/* Note that only level high is supported for most interrupts */</div><div class='add'>+	if (sense != IRQ_TYPE_NONE &amp;&amp; sense != IRQ_TYPE_LEVEL_HIGH &amp;&amp;</div><div class='add'>+	    (hw &lt; 47 || hw &gt; 50))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Decode sense type */</div><div class='add'>+	switch(sense) {</div><div class='add'>+	case IRQ_TYPE_EDGE_RISING:</div><div class='add'>+		ic = 0x3;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_EDGE_FALLING:</div><div class='add'>+		ic = 0x2;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_LEVEL_LOW:</div><div class='add'>+		ic = 0x0;</div><div class='add'>+		break;</div><div class='add'>+	case IRQ_TYPE_LEVEL_HIGH:</div><div class='add'>+	case IRQ_TYPE_NONE:</div><div class='add'>+		ic = 0x1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update irq_desc */</div><div class='add'>+	desc-&gt;status &amp;= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);</div><div class='add'>+	desc-&gt;status |= type &amp; IRQ_TYPE_SENSE_MASK;</div><div class='add'>+	if (type &amp; (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))</div><div class='add'>+		desc-&gt;status |= IRQ_LEVEL;</div><div class='add'>+</div><div class='add'>+	/* Configure the source. One gross hack that was there before and</div><div class='add'>+	 * that I've kept around is the priority to the BE which I set to</div><div class='add'>+	 * be the same as the interrupt source number. I don't know wether</div><div class='add'>+	 * that's supposed to make any kind of sense however, we'll have to</div><div class='add'>+	 * decide that, but for now, I'm not changing the behaviour.</div><div class='add'>+	 */</div><div class='add'>+	old_mask = in_be32(cfg) &amp; 0x30000000u;</div><div class='add'>+	out_be32(cfg, old_mask | (ic &lt;&lt; 24) | (0x7 &lt;&lt; 16) |</div><div class='add'>+		 (pic-&gt;node_id &lt;&lt; 4) | 0xe);</div><div class='add'>+	out_be32(cfg + 4, (0x2 &lt;&lt; 16) | (hw &amp; 0xff));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw_interrupt_type spider_pic = {</div><div class='add'>+static struct irq_chip spider_pic = {</div><div class='ctx'> 	.typename = " SPIDER   ",</div><div class='del'>-	.startup = spider_startup_irq,</div><div class='del'>-	.shutdown = spider_shutdown_irq,</div><div class='del'>-	.enable = spider_enable_irq,</div><div class='del'>-	.disable = spider_disable_irq,</div><div class='add'>+	.unmask = spider_unmask_irq,</div><div class='add'>+	.mask = spider_mask_irq,</div><div class='ctx'> 	.ack = spider_ack_irq,</div><div class='del'>-	.end = spider_end_irq,</div><div class='add'>+	.set_type = spider_set_irq_type,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int spider_get_irq(int node)</div><div class='add'>+static int spider_host_match(struct irq_host *h, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct spider_pic *pic = h-&gt;host_data;</div><div class='add'>+	return node == pic-&gt;of_node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spider_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			irq_hw_number_t hw)</div><div class='ctx'> {</div><div class='del'>-	unsigned long cs;</div><div class='del'>-	void __iomem *regs = spider_pics[node];</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;spider_pic, handle_level_irq);</div><div class='ctx'> </div><div class='del'>-	cs = in_be32(regs + TIR_CS) &gt;&gt; 24;</div><div class='add'>+	/* Set default irq type */</div><div class='add'>+	set_irq_type(virq, IRQ_TYPE_NONE);</div><div class='ctx'> </div><div class='del'>-	if (cs == 63)</div><div class='del'>-		return -1;</div><div class='del'>-	else</div><div class='del'>-		return cs;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* hardcoded part to be compatible with older firmware */</div><div class='add'>+static int spider_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			   u32 *intspec, unsigned int intsize,</div><div class='add'>+			   irq_hw_number_t *out_hwirq, unsigned int *out_flags)</div><div class='ctx'> </div><div class='del'>-void spider_init_IRQ_hardcoded(void)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='del'>-	long spiderpic;</div><div class='del'>-	long pics[] = { 0x24000008000, 0x34000008000 };</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	pr_debug("%s(%d): Using hardcoded defaults\n", __FUNCTION__, __LINE__);</div><div class='del'>-</div><div class='del'>-	for (node = 0; node &lt; num_present_cpus()/2; node++) {</div><div class='del'>-		spiderpic = pics[node];</div><div class='del'>-		printk(KERN_DEBUG "SPIDER addr: %lx\n", spiderpic);</div><div class='del'>-		spider_pics[node] = ioremap(spiderpic, 0x800);</div><div class='del'>-		for (n = 0; n &lt; IIC_NUM_EXT; n++) {</div><div class='del'>-			int irq = n + IIC_EXT_OFFSET + node * IIC_NODE_STRIDE;</div><div class='del'>-			get_irq_desc(irq)-&gt;handler = &amp;spider_pic;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>- 		/* do not mask any interrupts because of level */</div><div class='del'>- 		out_be32(spider_pics[node] + TIR_MSK, 0x0);</div><div class='del'>-</div><div class='del'>- 		/* disable edge detection clear */</div><div class='del'>- 		/* out_be32(spider_pics[node] + TIR_EDC, 0x0); */</div><div class='del'>-</div><div class='del'>- 		/* enable interrupt packets to be output */</div><div class='del'>- 		out_be32(spider_pics[node] + TIR_PIEN,</div><div class='del'>-			in_be32(spider_pics[node] + TIR_PIEN) | 0x1);</div><div class='del'>-</div><div class='del'>- 		/* Enable the interrupt detection enable bit. Do this last! */</div><div class='del'>- 		out_be32(spider_pics[node] + TIR_DEN,</div><div class='del'>-			in_be32(spider_pics[node] + TIR_DEN) | 0x1);</div><div class='del'>-	}</div><div class='add'>+	/* Spider interrupts have 2 cells, first is the interrupt source,</div><div class='add'>+	 * second, well, I don't know for sure yet ... We mask the top bits</div><div class='add'>+	 * because old device-trees encode a node number in there</div><div class='add'>+	 */</div><div class='add'>+	*out_hwirq = intspec[0] &amp; 0x3f;</div><div class='add'>+	*out_flags = IRQ_TYPE_LEVEL_HIGH;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void spider_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	long spider_reg;</div><div class='del'>-	struct device_node *dn;</div><div class='del'>-	char *compatible;</div><div class='del'>-	int n, node = 0;</div><div class='del'>-</div><div class='del'>-	for (dn = NULL; (dn = of_find_node_by_name(dn, "interrupt-controller"));) {</div><div class='del'>-		compatible = (char *)get_property(dn, "compatible", NULL);</div><div class='del'>-</div><div class='del'>-		if (!compatible)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (strstr(compatible, "CBEA,platform-spider-pic"))</div><div class='del'>-			spider_reg = *(long *)get_property(dn,"reg", NULL);</div><div class='del'>-		else if (strstr(compatible, "sti,platform-spider-pic")) {</div><div class='del'>-			spider_init_IRQ_hardcoded();</div><div class='del'>-			return;</div><div class='del'>-		} else</div><div class='del'>-			continue;</div><div class='add'>+static struct irq_host_ops spider_host_ops = {</div><div class='add'>+	.match = spider_host_match,</div><div class='add'>+	.map = spider_host_map,</div><div class='add'>+	.xlate = spider_host_xlate,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (!spider_reg)</div><div class='del'>-			printk("interrupt controller does not have reg property !\n");</div><div class='add'>+static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc,</div><div class='add'>+			       struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct spider_pic *pic = desc-&gt;handler_data;</div><div class='add'>+	unsigned int cs, virq;</div><div class='ctx'> </div><div class='del'>-		n = prom_n_addr_cells(dn);</div><div class='add'>+	cs = in_be32(pic-&gt;regs + TIR_CS) &gt;&gt; 24;</div><div class='add'>+	if (cs == SPIDER_IRQ_INVALID)</div><div class='add'>+		virq = NO_IRQ;</div><div class='add'>+	else</div><div class='add'>+		virq = irq_linear_revmap(pic-&gt;host, cs);</div><div class='add'>+	if (virq != NO_IRQ)</div><div class='add'>+		generic_handle_irq(virq, regs);</div><div class='add'>+	desc-&gt;chip-&gt;eoi(irq);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if ( n != 2)</div><div class='del'>-			printk("reg property with invalid number of elements \n");</div><div class='add'>+/* For hooking up the cascace we have a problem. Our device-tree is</div><div class='add'>+ * crap and we don't know on which BE iic interrupt we are hooked on at</div><div class='add'>+ * least not the "standard" way. We can reconstitute it based on two</div><div class='add'>+ * informations though: which BE node we are connected to and wether</div><div class='add'>+ * we are connected to IOIF0 or IOIF1. Right now, we really only care</div><div class='add'>+ * about the IBM cell blade and we know that its firmware gives us an</div><div class='add'>+ * interrupt-map property which is pretty strange.</div><div class='add'>+ */</div><div class='add'>+static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)</div><div class='add'>+{</div><div class='add'>+	unsigned int virq;</div><div class='add'>+	u32 *imap, *tmp;</div><div class='add'>+	int imaplen, intsize, unit;</div><div class='add'>+	struct device_node *iic;</div><div class='add'>+	struct irq_host *iic_host;</div><div class='add'>+</div><div class='add'>+#if 0 /* Enable that when we have a way to retreive the node as well */</div><div class='add'>+	/* First, we check wether we have a real "interrupts" in the device</div><div class='add'>+	 * tree in case the device-tree is ever fixed</div><div class='add'>+	 */</div><div class='add'>+	struct of_irq oirq;</div><div class='add'>+	if (of_irq_map_one(pic-&gt;of_node, 0, &amp;oirq) == 0) {</div><div class='add'>+		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,</div><div class='add'>+					     oirq.size);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Now do the horrible hacks */</div><div class='add'>+	tmp = (u32 *)get_property(pic-&gt;of_node, "#interrupt-cells", NULL);</div><div class='add'>+	if (tmp == NULL)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	intsize = *tmp;</div><div class='add'>+	imap = (u32 *)get_property(pic-&gt;of_node, "interrupt-map", &amp;imaplen);</div><div class='add'>+	if (imap == NULL || imaplen &lt; (intsize + 1))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	iic = of_find_node_by_phandle(imap[intsize]);</div><div class='add'>+	if (iic == NULL)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	imap += intsize + 1;</div><div class='add'>+	tmp = (u32 *)get_property(iic, "#interrupt-cells", NULL);</div><div class='add'>+	if (tmp == NULL)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	intsize = *tmp;</div><div class='add'>+	/* Assume unit is last entry of interrupt specifier */</div><div class='add'>+	unit = imap[intsize - 1];</div><div class='add'>+	/* Ok, we have a unit, now let's try to get the node */</div><div class='add'>+	tmp = (u32 *)get_property(iic, "ibm,interrupt-server-ranges", NULL);</div><div class='add'>+	if (tmp == NULL) {</div><div class='add'>+		of_node_put(iic);</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	}</div><div class='add'>+	/* ugly as hell but works for now */</div><div class='add'>+	pic-&gt;node_id = (*tmp) &gt;&gt; 1;</div><div class='add'>+	of_node_put(iic);</div><div class='add'>+</div><div class='add'>+	/* Ok, now let's get cracking. You may ask me why I just didn't match</div><div class='add'>+	 * the iic host from the iic OF node, but that way I'm still compatible</div><div class='add'>+	 * with really really old old firmwares for which we don't have a node</div><div class='add'>+	 */</div><div class='add'>+	iic_host = iic_get_irq_host(pic-&gt;node_id);</div><div class='add'>+	if (iic_host == NULL)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	/* Manufacture an IIC interrupt number of class 2 */</div><div class='add'>+	virq = irq_create_mapping(iic_host, 0x20 | unit);</div><div class='add'>+	if (virq == NO_IRQ)</div><div class='add'>+		printk(KERN_ERR "spider_pic: failed to map cascade !");</div><div class='add'>+	return virq;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		spider_pics[node] = ioremap(spider_reg, 0x800);</div><div class='ctx'> </div><div class='del'>-		printk("SPIDER addr: %lx with %i addr_cells mapped to %p\n",</div><div class='del'>-		       spider_reg, n, spider_pics[node]);</div><div class='add'>+static void __init spider_init_one(struct device_node *of_node, int chip,</div><div class='add'>+				   unsigned long addr)</div><div class='add'>+{</div><div class='add'>+	struct spider_pic *pic = &amp;spider_pics[chip];</div><div class='add'>+	int i, virq;</div><div class='add'>+</div><div class='add'>+	/* Map registers */</div><div class='add'>+	pic-&gt;regs = ioremap(addr, 0x1000);</div><div class='add'>+	if (pic-&gt;regs == NULL)</div><div class='add'>+		panic("spider_pic: can't map registers !");</div><div class='add'>+</div><div class='add'>+	/* Allocate a host */</div><div class='add'>+	pic-&gt;host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, SPIDER_SRC_COUNT,</div><div class='add'>+				   &amp;spider_host_ops, SPIDER_IRQ_INVALID);</div><div class='add'>+	if (pic-&gt;host == NULL)</div><div class='add'>+		panic("spider_pic: can't allocate irq host !");</div><div class='add'>+	pic-&gt;host-&gt;host_data = pic;</div><div class='add'>+</div><div class='add'>+	/* Fill out other bits */</div><div class='add'>+	pic-&gt;of_node = of_node_get(of_node);</div><div class='add'>+</div><div class='add'>+	/* Go through all sources and disable them */</div><div class='add'>+	for (i = 0; i &lt; SPIDER_SRC_COUNT; i++) {</div><div class='add'>+		void __iomem *cfg = pic-&gt;regs + TIR_CFGA + 8 * i;</div><div class='add'>+		out_be32(cfg, in_be32(cfg) &amp; ~0x30000000u);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		for (n = 0; n &lt; IIC_NUM_EXT; n++) {</div><div class='del'>-			int irq = n + IIC_EXT_OFFSET + node * IIC_NODE_STRIDE;</div><div class='del'>-			get_irq_desc(irq)-&gt;handler = &amp;spider_pic;</div><div class='del'>-		}</div><div class='add'>+	/* do not mask any interrupts because of level */</div><div class='add'>+	out_be32(pic-&gt;regs + TIR_MSK, 0x0);</div><div class='ctx'> </div><div class='del'>-		/* do not mask any interrupts because of level */</div><div class='del'>-		out_be32(spider_pics[node] + TIR_MSK, 0x0);</div><div class='add'>+	/* enable interrupt packets to be output */</div><div class='add'>+	out_be32(pic-&gt;regs + TIR_PIEN, in_be32(pic-&gt;regs + TIR_PIEN) | 0x1);</div><div class='ctx'> </div><div class='del'>-		/* disable edge detection clear */</div><div class='del'>-		/* out_be32(spider_pics[node] + TIR_EDC, 0x0); */</div><div class='add'>+	/* Hook up the cascade interrupt to the iic and nodeid */</div><div class='add'>+	virq = spider_find_cascade_and_node(pic);</div><div class='add'>+	if (virq == NO_IRQ)</div><div class='add'>+		return;</div><div class='add'>+	set_irq_data(virq, pic);</div><div class='add'>+	set_irq_chained_handler(virq, spider_irq_cascade);</div><div class='ctx'> </div><div class='del'>-		/* enable interrupt packets to be output */</div><div class='del'>-		out_be32(spider_pics[node] + TIR_PIEN,</div><div class='del'>-			in_be32(spider_pics[node] + TIR_PIEN) | 0x1);</div><div class='add'>+	printk(KERN_INFO "spider_pic: node %d, addr: 0x%lx %s\n",</div><div class='add'>+	       pic-&gt;node_id, addr, of_node-&gt;full_name);</div><div class='ctx'> </div><div class='del'>-		/* Enable the interrupt detection enable bit. Do this last! */</div><div class='del'>-		out_be32(spider_pics[node] + TIR_DEN,</div><div class='del'>-			in_be32(spider_pics[node] + TIR_DEN) | 0x1);</div><div class='add'>+	/* Enable the interrupt detection enable bit. Do this last! */</div><div class='add'>+	out_be32(pic-&gt;regs + TIR_DEN, in_be32(pic-&gt;regs + TIR_DEN) | 0x1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		node++;</div><div class='add'>+void __init spider_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	struct resource r;</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+	int chip = 0;</div><div class='add'>+</div><div class='add'>+	/* XXX node numbers are totally bogus. We _hope_ we get the device</div><div class='add'>+	 * nodes in the right order here but that's definitely not guaranteed,</div><div class='add'>+	 * we need to get the node from the device tree instead.</div><div class='add'>+	 * There is currently no proper property for it (but our whole</div><div class='add'>+	 * device-tree is bogus anyway) so all we can do is pray or maybe test</div><div class='add'>+	 * the address and deduce the node-id</div><div class='add'>+	 */</div><div class='add'>+	for (dn = NULL;</div><div class='add'>+	     (dn = of_find_node_by_name(dn, "interrupt-controller"));) {</div><div class='add'>+		if (device_is_compatible(dn, "CBEA,platform-spider-pic")) {</div><div class='add'>+			if (of_address_to_resource(dn, 0, &amp;r)) {</div><div class='add'>+				printk(KERN_WARNING "spider-pic: Failed\n");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		} else if (device_is_compatible(dn, "sti,platform-spider-pic")</div><div class='add'>+			   &amp;&amp; (chip &lt; 2)) {</div><div class='add'>+			static long hard_coded_pics[] =</div><div class='add'>+				{ 0x24000008000, 0x34000008000 };</div><div class='add'>+			r.start = hard_coded_pics[chip];</div><div class='add'>+		} else</div><div class='add'>+			continue;</div><div class='add'>+		spider_init_one(dn, chip++, r.start);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c<br/>index ad141fe8d52d..d06042deb021 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spu_base.c</a></div><div class='hunk'>@@ -34,10 +34,15 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='add'>+#include &lt;asm/spu_priv1.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "interrupt.h"</div><div class='ctx'> </div><div class='add'>+const struct spu_priv1_ops *spu_priv1_ops;</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_priv1_ops);</div><div class='add'>+</div><div class='ctx'> static int __spu_trap_invalid_dma(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	pr_debug("%s\n", __FUNCTION__);</div><div class='hunk'>@@ -71,7 +76,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_priv2 __iomem *priv2 = spu-&gt;priv2;</div><div class='ctx'> 	struct mm_struct *mm = spu-&gt;mm;</div><div class='del'>-	u64 esid, vsid;</div><div class='add'>+	u64 esid, vsid, llp;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s\n", __FUNCTION__);</div><div class='ctx'> </div><div class='hunk'>@@ -91,9 +96,14 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	esid = (ea &amp; ESID_MASK) | SLB_ESID_V;</div><div class='del'>-	vsid = (get_vsid(mm-&gt;context.id, ea) &lt;&lt; SLB_VSID_SHIFT) | SLB_VSID_USER;</div><div class='add'>+#ifdef CONFIG_HUGETLB_PAGE</div><div class='ctx'> 	if (in_hugepage_area(mm-&gt;context, ea))</div><div class='del'>-		vsid |= SLB_VSID_L;</div><div class='add'>+		llp = mmu_psize_defs[mmu_huge_psize].sllp;</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		llp = mmu_psize_defs[mmu_virtual_psize].sllp;</div><div class='add'>+	vsid = (get_vsid(mm-&gt;context.id, ea) &lt;&lt; SLB_VSID_SHIFT) |</div><div class='add'>+			SLB_VSID_USER | llp;</div><div class='ctx'> </div><div class='ctx'> 	out_be64(&amp;priv2-&gt;slb_index_W, spu-&gt;slb_replace);</div><div class='ctx'> 	out_be64(&amp;priv2-&gt;slb_vsid_RW, vsid);</div><div class='hunk'>@@ -130,57 +140,7 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)</div><div class='ctx'> 	spu-&gt;dar = ea;</div><div class='ctx'> 	spu-&gt;dsisr = dsisr;</div><div class='ctx'> 	mb();</div><div class='del'>-	if (spu-&gt;stop_callback)</div><div class='del'>-		spu-&gt;stop_callback(spu);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __spu_trap_mailbox(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	if (spu-&gt;ibox_callback)</div><div class='del'>-		spu-&gt;ibox_callback(spu);</div><div class='del'>-</div><div class='del'>-	/* atomically disable SPU mailbox interrupts */</div><div class='del'>-	spin_lock(&amp;spu-&gt;register_lock);</div><div class='del'>-	spu_int_mask_and(spu, 2, ~0x1);</div><div class='del'>-	spin_unlock(&amp;spu-&gt;register_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __spu_trap_stop(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='del'>-	spu-&gt;stop_code = in_be32(&amp;spu-&gt;problem-&gt;spu_status_R);</div><div class='del'>-	if (spu-&gt;stop_callback)</div><div class='del'>-		spu-&gt;stop_callback(spu);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __spu_trap_halt(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='del'>-	spu-&gt;stop_code = in_be32(&amp;spu-&gt;problem-&gt;spu_status_R);</div><div class='del'>-	if (spu-&gt;stop_callback)</div><div class='del'>-		spu-&gt;stop_callback(spu);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __spu_trap_tag_group(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	pr_debug("%s\n", __FUNCTION__);</div><div class='del'>-	spu-&gt;mfc_callback(spu);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __spu_trap_spubox(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	if (spu-&gt;wbox_callback)</div><div class='del'>-		spu-&gt;wbox_callback(spu);</div><div class='del'>-</div><div class='del'>-	/* atomically disable SPU mailbox interrupts */</div><div class='del'>-	spin_lock(&amp;spu-&gt;register_lock);</div><div class='del'>-	spu_int_mask_and(spu, 2, ~0x10);</div><div class='del'>-	spin_unlock(&amp;spu-&gt;register_lock);</div><div class='add'>+	spu-&gt;stop_callback(spu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,8 +151,7 @@ spu_irq_class_0(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	spu = data;</div><div class='ctx'> 	spu-&gt;class_0_pending = 1;</div><div class='del'>-	if (spu-&gt;stop_callback)</div><div class='del'>-		spu-&gt;stop_callback(spu);</div><div class='add'>+	spu-&gt;stop_callback(spu);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -209,12 +168,12 @@ spu_irq_class_0_bottom(struct spu *spu)</div><div class='ctx'> </div><div class='ctx'> 	stat &amp;= mask;</div><div class='ctx'> </div><div class='del'>-	if (stat &amp; 1) /* invalid MFC DMA */</div><div class='del'>-		__spu_trap_invalid_dma(spu);</div><div class='del'>-</div><div class='del'>-	if (stat &amp; 2) /* invalid DMA alignment */</div><div class='add'>+	if (stat &amp; 1) /* invalid DMA alignment */</div><div class='ctx'> 		__spu_trap_dma_align(spu);</div><div class='ctx'> </div><div class='add'>+	if (stat &amp; 2) /* invalid MFC DMA */</div><div class='add'>+		__spu_trap_invalid_dma(spu);</div><div class='add'>+</div><div class='ctx'> 	if (stat &amp; 4) /* error on SPU */</div><div class='ctx'> 		__spu_trap_error(spu);</div><div class='ctx'> </div><div class='hunk'>@@ -270,77 +229,92 @@ spu_irq_class_2(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 	unsigned long mask;</div><div class='ctx'> </div><div class='ctx'> 	spu = data;</div><div class='add'>+	spin_lock(&amp;spu-&gt;register_lock);</div><div class='ctx'> 	stat = spu_int_stat_get(spu, 2);</div><div class='ctx'> 	mask = spu_int_mask_get(spu, 2);</div><div class='add'>+	/* ignore interrupts we're not waiting for */</div><div class='add'>+	stat &amp;= mask;</div><div class='add'>+	/*</div><div class='add'>+	 * mailbox interrupts (0x1 and 0x10) are level triggered.</div><div class='add'>+	 * mask them now before acknowledging.</div><div class='add'>+	 */</div><div class='add'>+	if (stat &amp; 0x11)</div><div class='add'>+		spu_int_mask_and(spu, 2, ~(stat &amp; 0x11));</div><div class='add'>+	/* acknowledge all interrupts before the callbacks */</div><div class='add'>+	spu_int_stat_clear(spu, 2, stat);</div><div class='add'>+	spin_unlock(&amp;spu-&gt;register_lock);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask);</div><div class='ctx'> </div><div class='del'>-	stat &amp;= mask;</div><div class='del'>-</div><div class='ctx'> 	if (stat &amp; 1)  /* PPC core mailbox */</div><div class='del'>-		__spu_trap_mailbox(spu);</div><div class='add'>+		spu-&gt;ibox_callback(spu);</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; 2) /* SPU stop-and-signal */</div><div class='del'>-		__spu_trap_stop(spu);</div><div class='add'>+		spu-&gt;stop_callback(spu);</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; 4) /* SPU halted */</div><div class='del'>-		__spu_trap_halt(spu);</div><div class='add'>+		spu-&gt;stop_callback(spu);</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; 8) /* DMA tag group complete */</div><div class='del'>-		__spu_trap_tag_group(spu);</div><div class='add'>+		spu-&gt;mfc_callback(spu);</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; 0x10) /* SPU mailbox threshold */</div><div class='del'>-		__spu_trap_spubox(spu);</div><div class='add'>+		spu-&gt;wbox_callback(spu);</div><div class='ctx'> </div><div class='del'>-	spu_int_stat_clear(spu, 2, stat);</div><div class='ctx'> 	return stat ? IRQ_HANDLED : IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-spu_request_irqs(struct spu *spu)</div><div class='add'>+static int spu_request_irqs(struct spu *spu)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	int irq_base;</div><div class='del'>-</div><div class='del'>-	irq_base = IIC_NODE_STRIDE * spu-&gt;node + IIC_SPE_OFFSET;</div><div class='del'>-</div><div class='del'>-	snprintf(spu-&gt;irq_c0, sizeof (spu-&gt;irq_c0), "spe%02d.0", spu-&gt;number);</div><div class='del'>-	ret = request_irq(irq_base + spu-&gt;isrc,</div><div class='del'>-		 spu_irq_class_0, SA_INTERRUPT, spu-&gt;irq_c0, spu);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	snprintf(spu-&gt;irq_c1, sizeof (spu-&gt;irq_c1), "spe%02d.1", spu-&gt;number);</div><div class='del'>-	ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu-&gt;isrc,</div><div class='del'>-		 spu_irq_class_1, SA_INTERRUPT, spu-&gt;irq_c1, spu);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out1;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	snprintf(spu-&gt;irq_c2, sizeof (spu-&gt;irq_c2), "spe%02d.2", spu-&gt;number);</div><div class='del'>-	ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu-&gt;isrc,</div><div class='del'>-		 spu_irq_class_2, SA_INTERRUPT, spu-&gt;irq_c2, spu);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out2;</div><div class='del'>-	goto out;</div><div class='add'>+	if (spu-&gt;irqs[0] != NO_IRQ) {</div><div class='add'>+		snprintf(spu-&gt;irq_c0, sizeof (spu-&gt;irq_c0), "spe%02d.0",</div><div class='add'>+			 spu-&gt;number);</div><div class='add'>+		ret = request_irq(spu-&gt;irqs[0], spu_irq_class_0,</div><div class='add'>+				  IRQF_DISABLED,</div><div class='add'>+				  spu-&gt;irq_c0, spu);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto bail0;</div><div class='add'>+	}</div><div class='add'>+	if (spu-&gt;irqs[1] != NO_IRQ) {</div><div class='add'>+		snprintf(spu-&gt;irq_c1, sizeof (spu-&gt;irq_c1), "spe%02d.1",</div><div class='add'>+			 spu-&gt;number);</div><div class='add'>+		ret = request_irq(spu-&gt;irqs[1], spu_irq_class_1,</div><div class='add'>+				  IRQF_DISABLED,</div><div class='add'>+				  spu-&gt;irq_c1, spu);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto bail1;</div><div class='add'>+	}</div><div class='add'>+	if (spu-&gt;irqs[2] != NO_IRQ) {</div><div class='add'>+		snprintf(spu-&gt;irq_c2, sizeof (spu-&gt;irq_c2), "spe%02d.2",</div><div class='add'>+			 spu-&gt;number);</div><div class='add'>+		ret = request_irq(spu-&gt;irqs[2], spu_irq_class_2,</div><div class='add'>+				  IRQF_DISABLED,</div><div class='add'>+				  spu-&gt;irq_c2, spu);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto bail2;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-out2:</div><div class='del'>-	free_irq(irq_base + IIC_CLASS_STRIDE + spu-&gt;isrc, spu);</div><div class='del'>-out1:</div><div class='del'>-	free_irq(irq_base + spu-&gt;isrc, spu);</div><div class='del'>-out:</div><div class='add'>+bail2:</div><div class='add'>+	if (spu-&gt;irqs[1] != NO_IRQ)</div><div class='add'>+		free_irq(spu-&gt;irqs[1], spu);</div><div class='add'>+bail1:</div><div class='add'>+	if (spu-&gt;irqs[0] != NO_IRQ)</div><div class='add'>+		free_irq(spu-&gt;irqs[0], spu);</div><div class='add'>+bail0:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-spu_free_irqs(struct spu *spu)</div><div class='add'>+static void spu_free_irqs(struct spu *spu)</div><div class='ctx'> {</div><div class='del'>-	int irq_base;</div><div class='del'>-</div><div class='del'>-	irq_base = IIC_NODE_STRIDE * spu-&gt;node + IIC_SPE_OFFSET;</div><div class='del'>-</div><div class='del'>-	free_irq(irq_base + spu-&gt;isrc, spu);</div><div class='del'>-	free_irq(irq_base + IIC_CLASS_STRIDE + spu-&gt;isrc, spu);</div><div class='del'>-	free_irq(irq_base + 2*IIC_CLASS_STRIDE + spu-&gt;isrc, spu);</div><div class='add'>+	if (spu-&gt;irqs[0] != NO_IRQ)</div><div class='add'>+		free_irq(spu-&gt;irqs[0], spu);</div><div class='add'>+	if (spu-&gt;irqs[1] != NO_IRQ)</div><div class='add'>+		free_irq(spu-&gt;irqs[1], spu);</div><div class='add'>+	if (spu-&gt;irqs[2] != NO_IRQ)</div><div class='add'>+		free_irq(spu-&gt;irqs[2], spu);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(spu_list);</div><div class='hunk'>@@ -512,14 +486,6 @@ int spu_irq_class_1_bottom(struct spu *spu)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void spu_irq_setaffinity(struct spu *spu, int cpu)</div><div class='del'>-{</div><div class='del'>-	u64 target = iic_get_target_id(cpu);</div><div class='del'>-	u64 route = target &lt;&lt; 48 | target &lt;&lt; 32 | target &lt;&lt; 16;</div><div class='del'>-	spu_int_route_set(spu, route);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_irq_setaffinity);</div><div class='del'>-</div><div class='ctx'> static int __init find_spu_node_id(struct device_node *spe)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *id;</div><div class='hunk'>@@ -599,17 +565,38 @@ static void spu_unmap(struct spu *spu)</div><div class='ctx'> 	iounmap((u8 __iomem *)spu-&gt;local_store);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This function shall be abstracted for HV platforms */</div><div class='add'>+static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	unsigned int isrc;</div><div class='add'>+	u32 *tmp;</div><div class='add'>+</div><div class='add'>+	host = iic_get_irq_host(spu-&gt;node);</div><div class='add'>+	if (host == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Get the interrupt source from the device-tree */</div><div class='add'>+	tmp = (u32 *)get_property(np, "isrc", NULL);</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	spu-&gt;isrc = isrc = tmp[0];</div><div class='add'>+</div><div class='add'>+	/* Now map interrupts of all 3 classes */</div><div class='add'>+	spu-&gt;irqs[0] = irq_create_mapping(host, 0x00 | isrc);</div><div class='add'>+	spu-&gt;irqs[1] = irq_create_mapping(host, 0x10 | isrc);</div><div class='add'>+	spu-&gt;irqs[2] = irq_create_mapping(host, 0x20 | isrc);</div><div class='add'>+</div><div class='add'>+	/* Right now, we only fail if class 2 failed */</div><div class='add'>+	return spu-&gt;irqs[2] == NO_IRQ ? -EINVAL : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init spu_map_device(struct spu *spu, struct device_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	char *prop;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENODEV;</div><div class='del'>-	prop = get_property(node, "isrc", NULL);</div><div class='del'>-	if (!prop)</div><div class='del'>-		goto out;</div><div class='del'>-	spu-&gt;isrc = *(unsigned int *)prop;</div><div class='del'>-</div><div class='ctx'> 	spu-&gt;name = get_property(node, "name", NULL);</div><div class='ctx'> 	if (!spu-&gt;name)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -649,6 +636,47 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sysdev_class spu_sysdev_class = {</div><div class='add'>+	set_kset_name("spu")</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t spu_show_isrc(struct sys_device *sysdev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct spu *spu = container_of(sysdev, struct spu, sysdev);</div><div class='add'>+	return sprintf(buf, "%d\n", spu-&gt;isrc);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+static SYSDEV_ATTR(isrc, 0400, spu_show_isrc, NULL);</div><div class='add'>+</div><div class='add'>+extern int attach_sysdev_to_node(struct sys_device *dev, int nid);</div><div class='add'>+</div><div class='add'>+static int spu_create_sysdev(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spu-&gt;sysdev.id = spu-&gt;number;</div><div class='add'>+	spu-&gt;sysdev.cls = &amp;spu_sysdev_class;</div><div class='add'>+	ret = sysdev_register(&amp;spu-&gt;sysdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "Can't register SPU %d with sysfs\n",</div><div class='add'>+				spu-&gt;number);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spu-&gt;isrc != 0)</div><div class='add'>+		sysdev_create_file(&amp;spu-&gt;sysdev, &amp;attr_isrc);</div><div class='add'>+	sysfs_add_device_to_node(&amp;spu-&gt;sysdev, spu-&gt;nid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void spu_destroy_sysdev(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	sysdev_remove_file(&amp;spu-&gt;sysdev, &amp;attr_isrc);</div><div class='add'>+	sysfs_remove_device_from_node(&amp;spu-&gt;sysdev, spu-&gt;nid);</div><div class='add'>+	sysdev_unregister(&amp;spu-&gt;sysdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init create_spu(struct device_node *spe)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu *spu;</div><div class='hunk'>@@ -656,7 +684,7 @@ static int __init create_spu(struct device_node *spe)</div><div class='ctx'> 	static int number;</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='del'>-	spu = kmalloc(sizeof (*spu), GFP_KERNEL);</div><div class='add'>+	spu = kzalloc(sizeof (*spu), GFP_KERNEL);</div><div class='ctx'> 	if (!spu)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -668,33 +696,23 @@ static int __init create_spu(struct device_node *spe)</div><div class='ctx'> 	spu-&gt;nid = of_node_to_nid(spe);</div><div class='ctx'> 	if (spu-&gt;nid == -1)</div><div class='ctx'> 		spu-&gt;nid = 0;</div><div class='del'>-</div><div class='del'>-	spu-&gt;stop_code = 0;</div><div class='del'>-	spu-&gt;slb_replace = 0;</div><div class='del'>-	spu-&gt;mm = NULL;</div><div class='del'>-	spu-&gt;ctx = NULL;</div><div class='del'>-	spu-&gt;rq = NULL;</div><div class='del'>-	spu-&gt;pid = 0;</div><div class='del'>-	spu-&gt;class_0_pending = 0;</div><div class='del'>-	spu-&gt;flags = 0UL;</div><div class='del'>-	spu-&gt;dar = 0UL;</div><div class='del'>-	spu-&gt;dsisr = 0UL;</div><div class='add'>+	ret = spu_map_interrupts(spu, spe);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 	spin_lock_init(&amp;spu-&gt;register_lock);</div><div class='del'>-</div><div class='ctx'> 	spu_mfc_sdr_set(spu, mfspr(SPRN_SDR1));</div><div class='ctx'> 	spu_mfc_sr1_set(spu, 0x33);</div><div class='del'>-</div><div class='del'>-	spu-&gt;ibox_callback = NULL;</div><div class='del'>-	spu-&gt;wbox_callback = NULL;</div><div class='del'>-	spu-&gt;stop_callback = NULL;</div><div class='del'>-	spu-&gt;mfc_callback = NULL;</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;spu_mutex);</div><div class='add'>+</div><div class='ctx'> 	spu-&gt;number = number++;</div><div class='ctx'> 	ret = spu_request_irqs(spu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_unmap;</div><div class='ctx'> </div><div class='add'>+	ret = spu_create_sysdev(spu);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_irqs;</div><div class='add'>+</div><div class='ctx'> 	list_add(&amp;spu-&gt;list, &amp;spu_list);</div><div class='ctx'> 	mutex_unlock(&amp;spu_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -703,6 +721,9 @@ static int __init create_spu(struct device_node *spe)</div><div class='ctx'> 		spu-&gt;problem, spu-&gt;priv1, spu-&gt;priv2, spu-&gt;number);</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='add'>+out_free_irqs:</div><div class='add'>+	spu_free_irqs(spu);</div><div class='add'>+</div><div class='ctx'> out_unmap:</div><div class='ctx'> 	mutex_unlock(&amp;spu_mutex);</div><div class='ctx'> 	spu_unmap(spu);</div><div class='hunk'>@@ -716,6 +737,7 @@ static void destroy_spu(struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	list_del_init(&amp;spu-&gt;list);</div><div class='ctx'> </div><div class='add'>+	spu_destroy_sysdev(spu);</div><div class='ctx'> 	spu_free_irqs(spu);</div><div class='ctx'> 	spu_unmap(spu);</div><div class='ctx'> 	kfree(spu);</div><div class='hunk'>@@ -728,6 +750,7 @@ static void cleanup_spu_base(void)</div><div class='ctx'> 	list_for_each_entry_safe(spu, tmp, &amp;spu_list, list)</div><div class='ctx'> 		destroy_spu(spu);</div><div class='ctx'> 	mutex_unlock(&amp;spu_mutex);</div><div class='add'>+	sysdev_class_unregister(&amp;spu_sysdev_class);</div><div class='ctx'> }</div><div class='ctx'> module_exit(cleanup_spu_base);</div><div class='ctx'> </div><div class='hunk'>@@ -736,6 +759,11 @@ static int __init init_spu_base(void)</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* create sysdev class for spus */</div><div class='add'>+	ret = sysdev_class_register(&amp;spu_sysdev_class);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = -ENODEV;</div><div class='ctx'> 	for (node = of_find_node_by_type(NULL, "spe");</div><div class='ctx'> 			node; node = of_find_node_by_type(node, "spe")) {</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c<br/>index b47fcc5ddb78..47ec3be3edcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_callbacks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_callbacks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_callbacks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spu_callbacks.c</a></div><div class='hunk'>@@ -34,307 +34,19 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void *spu_syscall_table[] = {</div><div class='del'>-	[__NR_restart_syscall]		sys_ni_syscall, /* sys_restart_syscall */</div><div class='del'>-	[__NR_exit]			sys_ni_syscall, /* sys_exit */</div><div class='del'>-	[__NR_fork]			sys_ni_syscall, /* ppc_fork */</div><div class='del'>-	[__NR_read]			sys_read,</div><div class='del'>-	[__NR_write]			sys_write,</div><div class='del'>-	[__NR_open]			sys_open,</div><div class='del'>-	[__NR_close]			sys_close,</div><div class='del'>-	[__NR_waitpid]			sys_waitpid,</div><div class='del'>-	[__NR_creat]			sys_creat,</div><div class='del'>-	[__NR_link]			sys_link,</div><div class='del'>-	[__NR_unlink]			sys_unlink,</div><div class='del'>-	[__NR_execve]			sys_ni_syscall, /* sys_execve */</div><div class='del'>-	[__NR_chdir]			sys_chdir,</div><div class='del'>-	[__NR_time]			sys_time,</div><div class='del'>-	[__NR_mknod]			sys_mknod,</div><div class='del'>-	[__NR_chmod]			sys_chmod,</div><div class='del'>-	[__NR_lchown]			sys_lchown,</div><div class='del'>-	[__NR_break]			sys_ni_syscall,</div><div class='del'>-	[__NR_oldstat]			sys_ni_syscall,</div><div class='del'>-	[__NR_lseek]			sys_lseek,</div><div class='del'>-	[__NR_getpid]			sys_getpid,</div><div class='del'>-	[__NR_mount]			sys_ni_syscall, /* sys_mount */</div><div class='del'>-	[__NR_umount]			sys_ni_syscall,</div><div class='del'>-	[__NR_setuid]			sys_setuid,</div><div class='del'>-	[__NR_getuid]			sys_getuid,</div><div class='del'>-	[__NR_stime]			sys_stime,</div><div class='del'>-	[__NR_ptrace]			sys_ni_syscall, /* sys_ptrace */</div><div class='del'>-	[__NR_alarm]			sys_alarm,</div><div class='del'>-	[__NR_oldfstat]			sys_ni_syscall,</div><div class='del'>-	[__NR_pause]			sys_ni_syscall, /* sys_pause */</div><div class='del'>-	[__NR_utime]			sys_ni_syscall, /* sys_utime */</div><div class='del'>-	[__NR_stty]			sys_ni_syscall,</div><div class='del'>-	[__NR_gtty]			sys_ni_syscall,</div><div class='del'>-	[__NR_access]			sys_access,</div><div class='del'>-	[__NR_nice]			sys_nice,</div><div class='del'>-	[__NR_ftime]			sys_ni_syscall,</div><div class='del'>-	[__NR_sync]			sys_sync,</div><div class='del'>-	[__NR_kill]			sys_kill,</div><div class='del'>-	[__NR_rename]			sys_rename,</div><div class='del'>-	[__NR_mkdir]			sys_mkdir,</div><div class='del'>-	[__NR_rmdir]			sys_rmdir,</div><div class='del'>-	[__NR_dup]			sys_dup,</div><div class='del'>-	[__NR_pipe]			sys_pipe,</div><div class='del'>-	[__NR_times]			sys_times,</div><div class='del'>-	[__NR_prof]			sys_ni_syscall,</div><div class='del'>-	[__NR_brk]			sys_brk,</div><div class='del'>-	[__NR_setgid]			sys_setgid,</div><div class='del'>-	[__NR_getgid]			sys_getgid,</div><div class='del'>-	[__NR_signal]			sys_ni_syscall, /* sys_signal */</div><div class='del'>-	[__NR_geteuid]			sys_geteuid,</div><div class='del'>-	[__NR_getegid]			sys_getegid,</div><div class='del'>-	[__NR_acct]			sys_ni_syscall, /* sys_acct */</div><div class='del'>-	[__NR_umount2]			sys_ni_syscall, /* sys_umount */</div><div class='del'>-	[__NR_lock]			sys_ni_syscall,</div><div class='del'>-	[__NR_ioctl]			sys_ioctl,</div><div class='del'>-	[__NR_fcntl]			sys_fcntl,</div><div class='del'>-	[__NR_mpx]			sys_ni_syscall,</div><div class='del'>-	[__NR_setpgid]			sys_setpgid,</div><div class='del'>-	[__NR_ulimit]			sys_ni_syscall,</div><div class='del'>-	[__NR_oldolduname]		sys_ni_syscall,</div><div class='del'>-	[__NR_umask]			sys_umask,</div><div class='del'>-	[__NR_chroot]			sys_chroot,</div><div class='del'>-	[__NR_ustat]			sys_ni_syscall, /* sys_ustat */</div><div class='del'>-	[__NR_dup2]			sys_dup2,</div><div class='del'>-	[__NR_getppid]			sys_getppid,</div><div class='del'>-	[__NR_getpgrp]			sys_getpgrp,</div><div class='del'>-	[__NR_setsid]			sys_setsid,</div><div class='del'>-	[__NR_sigaction]		sys_ni_syscall,</div><div class='del'>-	[__NR_sgetmask]			sys_sgetmask,</div><div class='del'>-	[__NR_ssetmask]			sys_ssetmask,</div><div class='del'>-	[__NR_setreuid]			sys_setreuid,</div><div class='del'>-	[__NR_setregid]			sys_setregid,</div><div class='del'>-	[__NR_sigsuspend]		sys_ni_syscall,</div><div class='del'>-	[__NR_sigpending]		sys_ni_syscall,</div><div class='del'>-	[__NR_sethostname]		sys_sethostname,</div><div class='del'>-	[__NR_setrlimit]		sys_setrlimit,</div><div class='del'>-	[__NR_getrlimit]		sys_ni_syscall,</div><div class='del'>-	[__NR_getrusage]		sys_getrusage,</div><div class='del'>-	[__NR_gettimeofday]		sys_gettimeofday,</div><div class='del'>-	[__NR_settimeofday]		sys_settimeofday,</div><div class='del'>-	[__NR_getgroups]		sys_getgroups,</div><div class='del'>-	[__NR_setgroups]		sys_setgroups,</div><div class='del'>-	[__NR_select]			sys_ni_syscall,</div><div class='del'>-	[__NR_symlink]			sys_symlink,</div><div class='del'>-	[__NR_oldlstat]			sys_ni_syscall,</div><div class='del'>-	[__NR_readlink]			sys_readlink,</div><div class='del'>-	[__NR_uselib]			sys_ni_syscall, /* sys_uselib */</div><div class='del'>-	[__NR_swapon]			sys_ni_syscall, /* sys_swapon */</div><div class='del'>-	[__NR_reboot]			sys_ni_syscall, /* sys_reboot */</div><div class='del'>-	[__NR_readdir]			sys_ni_syscall,</div><div class='del'>-	[__NR_mmap]			sys_mmap,</div><div class='del'>-	[__NR_munmap]			sys_munmap,</div><div class='del'>-	[__NR_truncate]			sys_truncate,</div><div class='del'>-	[__NR_ftruncate]		sys_ftruncate,</div><div class='del'>-	[__NR_fchmod]			sys_fchmod,</div><div class='del'>-	[__NR_fchown]			sys_fchown,</div><div class='del'>-	[__NR_getpriority]		sys_getpriority,</div><div class='del'>-	[__NR_setpriority]		sys_setpriority,</div><div class='del'>-	[__NR_profil]			sys_ni_syscall,</div><div class='del'>-	[__NR_statfs]			sys_ni_syscall, /* sys_statfs */</div><div class='del'>-	[__NR_fstatfs]			sys_ni_syscall, /* sys_fstatfs */</div><div class='del'>-	[__NR_ioperm]			sys_ni_syscall,</div><div class='del'>-	[__NR_socketcall]		sys_socketcall,</div><div class='del'>-	[__NR_syslog]			sys_syslog,</div><div class='del'>-	[__NR_setitimer]		sys_setitimer,</div><div class='del'>-	[__NR_getitimer]		sys_getitimer,</div><div class='del'>-	[__NR_stat]			sys_newstat,</div><div class='del'>-	[__NR_lstat]			sys_newlstat,</div><div class='del'>-	[__NR_fstat]			sys_newfstat,</div><div class='del'>-	[__NR_olduname]			sys_ni_syscall,</div><div class='del'>-	[__NR_iopl]			sys_ni_syscall,</div><div class='del'>-	[__NR_vhangup]			sys_vhangup,</div><div class='del'>-	[__NR_idle]			sys_ni_syscall,</div><div class='del'>-	[__NR_vm86]			sys_ni_syscall,</div><div class='del'>-	[__NR_wait4]			sys_wait4,</div><div class='del'>-	[__NR_swapoff]			sys_ni_syscall, /* sys_swapoff */</div><div class='del'>-	[__NR_sysinfo]			sys_sysinfo,</div><div class='del'>-	[__NR_ipc]			sys_ni_syscall, /* sys_ipc */</div><div class='del'>-	[__NR_fsync]			sys_fsync,</div><div class='del'>-	[__NR_sigreturn]		sys_ni_syscall,</div><div class='del'>-	[__NR_clone]			sys_ni_syscall, /* ppc_clone */</div><div class='del'>-	[__NR_setdomainname]		sys_setdomainname,</div><div class='del'>-	[__NR_uname]			ppc_newuname,</div><div class='del'>-	[__NR_modify_ldt]		sys_ni_syscall,</div><div class='del'>-	[__NR_adjtimex]			sys_adjtimex,</div><div class='del'>-	[__NR_mprotect]			sys_mprotect,</div><div class='del'>-	[__NR_sigprocmask]		sys_ni_syscall,</div><div class='del'>-	[__NR_create_module]		sys_ni_syscall,</div><div class='del'>-	[__NR_init_module]		sys_ni_syscall, /* sys_init_module */</div><div class='del'>-	[__NR_delete_module]		sys_ni_syscall, /* sys_delete_module */</div><div class='del'>-	[__NR_get_kernel_syms]		sys_ni_syscall,</div><div class='del'>-	[__NR_quotactl]			sys_ni_syscall, /* sys_quotactl */</div><div class='del'>-	[__NR_getpgid]			sys_getpgid,</div><div class='del'>-	[__NR_fchdir]			sys_fchdir,</div><div class='del'>-	[__NR_bdflush]			sys_bdflush,</div><div class='del'>-	[__NR_sysfs]			sys_ni_syscall, /* sys_sysfs */</div><div class='del'>-	[__NR_personality]		ppc64_personality,</div><div class='del'>-	[__NR_afs_syscall]		sys_ni_syscall,</div><div class='del'>-	[__NR_setfsuid]			sys_setfsuid,</div><div class='del'>-	[__NR_setfsgid]			sys_setfsgid,</div><div class='del'>-	[__NR__llseek]			sys_llseek,</div><div class='del'>-	[__NR_getdents]			sys_getdents,</div><div class='del'>-	[__NR__newselect]		sys_select,</div><div class='del'>-	[__NR_flock]			sys_flock,</div><div class='del'>-	[__NR_msync]			sys_msync,</div><div class='del'>-	[__NR_readv]			sys_readv,</div><div class='del'>-	[__NR_writev]			sys_writev,</div><div class='del'>-	[__NR_getsid]			sys_getsid,</div><div class='del'>-	[__NR_fdatasync]		sys_fdatasync,</div><div class='del'>-	[__NR__sysctl]			sys_ni_syscall, /* sys_sysctl */</div><div class='del'>-	[__NR_mlock]			sys_mlock,</div><div class='del'>-	[__NR_munlock]			sys_munlock,</div><div class='del'>-	[__NR_mlockall]			sys_mlockall,</div><div class='del'>-	[__NR_munlockall]		sys_munlockall,</div><div class='del'>-	[__NR_sched_setparam]		sys_sched_setparam,</div><div class='del'>-	[__NR_sched_getparam]		sys_sched_getparam,</div><div class='del'>-	[__NR_sched_setscheduler]	sys_sched_setscheduler,</div><div class='del'>-	[__NR_sched_getscheduler]	sys_sched_getscheduler,</div><div class='del'>-	[__NR_sched_yield]		sys_sched_yield,</div><div class='del'>-	[__NR_sched_get_priority_max]	sys_sched_get_priority_max,</div><div class='del'>-	[__NR_sched_get_priority_min]	sys_sched_get_priority_min,</div><div class='del'>-	[__NR_sched_rr_get_interval]	sys_sched_rr_get_interval,</div><div class='del'>-	[__NR_nanosleep]		sys_nanosleep,</div><div class='del'>-	[__NR_mremap]			sys_mremap,</div><div class='del'>-	[__NR_setresuid]		sys_setresuid,</div><div class='del'>-	[__NR_getresuid]		sys_getresuid,</div><div class='del'>-	[__NR_query_module]		sys_ni_syscall,</div><div class='del'>-	[__NR_poll]			sys_poll,</div><div class='del'>-	[__NR_nfsservctl]		sys_ni_syscall, /* sys_nfsservctl */</div><div class='del'>-	[__NR_setresgid]		sys_setresgid,</div><div class='del'>-	[__NR_getresgid]		sys_getresgid,</div><div class='del'>-	[__NR_prctl]			sys_prctl,</div><div class='del'>-	[__NR_rt_sigreturn]		sys_ni_syscall, /* ppc64_rt_sigreturn */</div><div class='del'>-	[__NR_rt_sigaction]		sys_ni_syscall, /* sys_rt_sigaction */</div><div class='del'>-	[__NR_rt_sigprocmask]		sys_ni_syscall, /* sys_rt_sigprocmask */</div><div class='del'>-	[__NR_rt_sigpending]		sys_ni_syscall, /* sys_rt_sigpending */</div><div class='del'>-	[__NR_rt_sigtimedwait]		sys_ni_syscall, /* sys_rt_sigtimedwait */</div><div class='del'>-	[__NR_rt_sigqueueinfo]		sys_ni_syscall, /* sys_rt_sigqueueinfo */</div><div class='del'>-	[__NR_rt_sigsuspend]		sys_ni_syscall, /* sys_rt_sigsuspend */</div><div class='del'>-	[__NR_pread64]			sys_pread64,</div><div class='del'>-	[__NR_pwrite64]			sys_pwrite64,</div><div class='del'>-	[__NR_chown]			sys_chown,</div><div class='del'>-	[__NR_getcwd]			sys_getcwd,</div><div class='del'>-	[__NR_capget]			sys_capget,</div><div class='del'>-	[__NR_capset]			sys_capset,</div><div class='del'>-	[__NR_sigaltstack]		sys_ni_syscall, /* sys_sigaltstack */</div><div class='del'>-	[__NR_sendfile]			sys_sendfile64,</div><div class='del'>-	[__NR_getpmsg]			sys_ni_syscall,</div><div class='del'>-	[__NR_putpmsg]			sys_ni_syscall,</div><div class='del'>-	[__NR_vfork]			sys_ni_syscall, /* ppc_vfork */</div><div class='del'>-	[__NR_ugetrlimit]		sys_getrlimit,</div><div class='del'>-	[__NR_readahead]		sys_readahead,</div><div class='del'>-	[192]				sys_ni_syscall,</div><div class='del'>-	[193]				sys_ni_syscall,</div><div class='del'>-	[194]				sys_ni_syscall,</div><div class='del'>-	[195]				sys_ni_syscall,</div><div class='del'>-	[196]				sys_ni_syscall,</div><div class='del'>-	[197]				sys_ni_syscall,</div><div class='del'>-	[__NR_pciconfig_read]		sys_ni_syscall, /* sys_pciconfig_read */</div><div class='del'>-	[__NR_pciconfig_write]		sys_ni_syscall, /* sys_pciconfig_write */</div><div class='del'>-	[__NR_pciconfig_iobase]		sys_ni_syscall, /* sys_pciconfig_iobase */</div><div class='del'>-	[__NR_multiplexer]		sys_ni_syscall,</div><div class='del'>-	[__NR_getdents64]		sys_getdents64,</div><div class='del'>-	[__NR_pivot_root]		sys_pivot_root,</div><div class='del'>-	[204]				sys_ni_syscall,</div><div class='del'>-	[__NR_madvise]			sys_madvise,</div><div class='del'>-	[__NR_mincore]			sys_mincore,</div><div class='del'>-	[__NR_gettid]			sys_gettid,</div><div class='del'>-	[__NR_tkill]			sys_tkill,</div><div class='del'>-	[__NR_setxattr]			sys_setxattr,</div><div class='del'>-	[__NR_lsetxattr]		sys_lsetxattr,</div><div class='del'>-	[__NR_fsetxattr]		sys_fsetxattr,</div><div class='del'>-	[__NR_getxattr]			sys_getxattr,</div><div class='del'>-	[__NR_lgetxattr]		sys_lgetxattr,</div><div class='del'>-	[__NR_fgetxattr]		sys_fgetxattr,</div><div class='del'>-	[__NR_listxattr]		sys_listxattr,</div><div class='del'>-	[__NR_llistxattr]		sys_llistxattr,</div><div class='del'>-	[__NR_flistxattr]		sys_flistxattr,</div><div class='del'>-	[__NR_removexattr]		sys_removexattr,</div><div class='del'>-	[__NR_lremovexattr]		sys_lremovexattr,</div><div class='del'>-	[__NR_fremovexattr]		sys_fremovexattr,</div><div class='del'>-	[__NR_futex]			sys_futex,</div><div class='del'>-	[__NR_sched_setaffinity]	sys_sched_setaffinity,</div><div class='del'>-	[__NR_sched_getaffinity]	sys_sched_getaffinity,</div><div class='del'>-	[224]				sys_ni_syscall,</div><div class='del'>-	[__NR_tuxcall]			sys_ni_syscall,</div><div class='del'>-	[226]				sys_ni_syscall,</div><div class='del'>-	[__NR_io_setup]			sys_io_setup,</div><div class='del'>-	[__NR_io_destroy]		sys_io_destroy,</div><div class='del'>-	[__NR_io_getevents]		sys_io_getevents,</div><div class='del'>-	[__NR_io_submit]		sys_io_submit,</div><div class='del'>-	[__NR_io_cancel]		sys_io_cancel,</div><div class='del'>-	[__NR_set_tid_address]		sys_ni_syscall, /* sys_set_tid_address */</div><div class='del'>-	[__NR_fadvise64]		sys_fadvise64,</div><div class='del'>-	[__NR_exit_group]		sys_ni_syscall, /* sys_exit_group */</div><div class='del'>-	[__NR_lookup_dcookie]		sys_ni_syscall, /* sys_lookup_dcookie */</div><div class='del'>-	[__NR_epoll_create]		sys_epoll_create,</div><div class='del'>-	[__NR_epoll_ctl]		sys_epoll_ctl,</div><div class='del'>-	[__NR_epoll_wait]		sys_epoll_wait,</div><div class='del'>-	[__NR_remap_file_pages]		sys_remap_file_pages,</div><div class='del'>-	[__NR_timer_create]		sys_timer_create,</div><div class='del'>-	[__NR_timer_settime]		sys_timer_settime,</div><div class='del'>-	[__NR_timer_gettime]		sys_timer_gettime,</div><div class='del'>-	[__NR_timer_getoverrun]		sys_timer_getoverrun,</div><div class='del'>-	[__NR_timer_delete]		sys_timer_delete,</div><div class='del'>-	[__NR_clock_settime]		sys_clock_settime,</div><div class='del'>-	[__NR_clock_gettime]		sys_clock_gettime,</div><div class='del'>-	[__NR_clock_getres]		sys_clock_getres,</div><div class='del'>-	[__NR_clock_nanosleep]		sys_clock_nanosleep,</div><div class='del'>-	[__NR_swapcontext]		sys_ni_syscall, /* ppc64_swapcontext */</div><div class='del'>-	[__NR_tgkill]			sys_tgkill,</div><div class='del'>-	[__NR_utimes]			sys_utimes,</div><div class='del'>-	[__NR_statfs64]			sys_statfs64,</div><div class='del'>-	[__NR_fstatfs64]		sys_fstatfs64,</div><div class='del'>-	[254]				sys_ni_syscall,</div><div class='del'>-	[__NR_rtas]			ppc_rtas,</div><div class='del'>-	[256]				sys_ni_syscall,</div><div class='del'>-	[257]				sys_ni_syscall,</div><div class='del'>-	[258]				sys_ni_syscall,</div><div class='del'>-	[__NR_mbind]			sys_ni_syscall, /* sys_mbind */</div><div class='del'>-	[__NR_get_mempolicy]		sys_ni_syscall, /* sys_get_mempolicy */</div><div class='del'>-	[__NR_set_mempolicy]		sys_ni_syscall, /* sys_set_mempolicy */</div><div class='del'>-	[__NR_mq_open]			sys_ni_syscall, /* sys_mq_open */</div><div class='del'>-	[__NR_mq_unlink]		sys_ni_syscall, /* sys_mq_unlink */</div><div class='del'>-	[__NR_mq_timedsend]		sys_ni_syscall, /* sys_mq_timedsend */</div><div class='del'>-	[__NR_mq_timedreceive]		sys_ni_syscall, /* sys_mq_timedreceive */</div><div class='del'>-	[__NR_mq_notify]		sys_ni_syscall, /* sys_mq_notify */</div><div class='del'>-	[__NR_mq_getsetattr]		sys_ni_syscall, /* sys_mq_getsetattr */</div><div class='del'>-	[__NR_kexec_load]		sys_ni_syscall, /* sys_kexec_load */</div><div class='del'>-	[__NR_add_key]			sys_ni_syscall, /* sys_add_key */</div><div class='del'>-	[__NR_request_key]		sys_ni_syscall, /* sys_request_key */</div><div class='del'>-	[__NR_keyctl]			sys_ni_syscall, /* sys_keyctl */</div><div class='del'>-	[__NR_waitid]			sys_ni_syscall, /* sys_waitid */</div><div class='del'>-	[__NR_ioprio_set]		sys_ni_syscall, /* sys_ioprio_set */</div><div class='del'>-	[__NR_ioprio_get]		sys_ni_syscall, /* sys_ioprio_get */</div><div class='del'>-	[__NR_inotify_init]		sys_ni_syscall, /* sys_inotify_init */</div><div class='del'>-	[__NR_inotify_add_watch]	sys_ni_syscall, /* sys_inotify_add_watch */</div><div class='del'>-	[__NR_inotify_rm_watch]		sys_ni_syscall, /* sys_inotify_rm_watch */</div><div class='del'>-	[__NR_spu_run]			sys_ni_syscall, /* sys_spu_run */</div><div class='del'>-	[__NR_spu_create]		sys_ni_syscall, /* sys_spu_create */</div><div class='del'>-	[__NR_pselect6]			sys_ni_syscall, /* sys_pselect */</div><div class='del'>-	[__NR_ppoll]			sys_ni_syscall, /* sys_ppoll */</div><div class='del'>-	[__NR_unshare]			sys_unshare,</div><div class='del'>-	[__NR_splice]			sys_splice,</div><div class='del'>-	[__NR_tee]			sys_tee,</div><div class='del'>-	[__NR_vmsplice]			sys_vmsplice,</div><div class='del'>-	[__NR_openat]			sys_openat,</div><div class='del'>-	[__NR_mkdirat]			sys_mkdirat,</div><div class='del'>-	[__NR_mknodat]			sys_mknodat,</div><div class='del'>-	[__NR_fchownat]			sys_fchownat,</div><div class='del'>-	[__NR_futimesat]		sys_futimesat,</div><div class='del'>-	[__NR_newfstatat]		sys_newfstatat,</div><div class='del'>-	[__NR_unlinkat]			sys_unlinkat,</div><div class='del'>-	[__NR_renameat]			sys_renameat,</div><div class='del'>-	[__NR_linkat]			sys_linkat,</div><div class='del'>-	[__NR_symlinkat]		sys_symlinkat,</div><div class='del'>-	[__NR_readlinkat]		sys_readlinkat,</div><div class='del'>-	[__NR_fchmodat]			sys_fchmodat,</div><div class='del'>-	[__NR_faccessat]		sys_faccessat,</div><div class='del'>-	[__NR_get_robust_list]		sys_get_robust_list,</div><div class='del'>-	[__NR_set_robust_list]		sys_set_robust_list,</div><div class='add'>+#define SYSCALL(func)		sys_ni_syscall,</div><div class='add'>+#define COMPAT_SYS(func)	sys_ni_syscall,</div><div class='add'>+#define PPC_SYS(func)		sys_ni_syscall,</div><div class='add'>+#define OLDSYS(func)		sys_ni_syscall,</div><div class='add'>+#define SYS32ONLY(func)		sys_ni_syscall,</div><div class='add'>+#define SYSX(f, f3264, f32)	sys_ni_syscall,</div><div class='add'>+</div><div class='add'>+#define SYSCALL_SPU(func)	sys_##func,</div><div class='add'>+#define COMPAT_SYS_SPU(func)	sys_##func,</div><div class='add'>+#define PPC_SYS_SPU(func)	ppc_##func,</div><div class='add'>+#define SYSX_SPU(f, f3264, f32)	f,</div><div class='add'>+</div><div class='add'>+#include &lt;asm/systbl.h&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> long spu_sys_callback(struct spu_syscall_block *s)</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_priv1.c b/arch/powerpc/platforms/cell/spu_priv1.c<br/>deleted file mode 100644<br/>index b2656421c7b5..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_priv1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spu_priv1.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * access to SPU privileged registers</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/spu.h&gt;</div><div class='del'>-</div><div class='del'>-void spu_int_mask_and(struct spu *spu, int class, u64 mask)</div><div class='del'>-{</div><div class='del'>-	u64 old_mask;</div><div class='del'>-</div><div class='del'>-	old_mask = in_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class]);</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class], old_mask &amp; mask);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_mask_and);</div><div class='del'>-</div><div class='del'>-void spu_int_mask_or(struct spu *spu, int class, u64 mask)</div><div class='del'>-{</div><div class='del'>-	u64 old_mask;</div><div class='del'>-</div><div class='del'>-	old_mask = in_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class]);</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class], old_mask | mask);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_mask_or);</div><div class='del'>-</div><div class='del'>-void spu_int_mask_set(struct spu *spu, int class, u64 mask)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class], mask);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_mask_set);</div><div class='del'>-</div><div class='del'>-u64 spu_int_mask_get(struct spu *spu, int class)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class]);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_mask_get);</div><div class='del'>-</div><div class='del'>-void spu_int_stat_clear(struct spu *spu, int class, u64 stat)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;int_stat_RW[class], stat);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_stat_clear);</div><div class='del'>-</div><div class='del'>-u64 spu_int_stat_get(struct spu *spu, int class)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;int_stat_RW[class]);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_stat_get);</div><div class='del'>-</div><div class='del'>-void spu_int_route_set(struct spu *spu, u64 route)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;int_route_RW, route);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_int_route_set);</div><div class='del'>-</div><div class='del'>-u64 spu_mfc_dar_get(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_dar_RW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_dar_get);</div><div class='del'>-</div><div class='del'>-u64 spu_mfc_dsisr_get(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_dsisr_RW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_dsisr_get);</div><div class='del'>-</div><div class='del'>-void spu_mfc_dsisr_set(struct spu *spu, u64 dsisr)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;mfc_dsisr_RW, dsisr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_dsisr_set);</div><div class='del'>-</div><div class='del'>-void spu_mfc_sdr_set(struct spu *spu, u64 sdr)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;mfc_sdr_RW, sdr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_sdr_set);</div><div class='del'>-</div><div class='del'>-void spu_mfc_sr1_set(struct spu *spu, u64 sr1)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;mfc_sr1_RW, sr1);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_sr1_set);</div><div class='del'>-</div><div class='del'>-u64 spu_mfc_sr1_get(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_sr1_RW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_sr1_get);</div><div class='del'>-</div><div class='del'>-void spu_mfc_tclass_id_set(struct spu *spu, u64 tclass_id)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;mfc_tclass_id_RW, tclass_id);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_tclass_id_set);</div><div class='del'>-</div><div class='del'>-u64 spu_mfc_tclass_id_get(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_tclass_id_RW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_mfc_tclass_id_get);</div><div class='del'>-</div><div class='del'>-void spu_tlb_invalidate(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;tlb_invalidate_entry_W, 0ul);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_tlb_invalidate);</div><div class='del'>-</div><div class='del'>-void spu_resource_allocation_groupID_set(struct spu *spu, u64 id)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_groupID_RW, id);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_resource_allocation_groupID_set);</div><div class='del'>-</div><div class='del'>-u64 spu_resource_allocation_groupID_get(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_groupID_RW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_resource_allocation_groupID_get);</div><div class='del'>-</div><div class='del'>-void spu_resource_allocation_enable_set(struct spu *spu, u64 enable)</div><div class='del'>-{</div><div class='del'>-	out_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_enable_RW, enable);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_resource_allocation_enable_set);</div><div class='del'>-</div><div class='del'>-u64 spu_resource_allocation_enable_get(struct spu *spu)</div><div class='del'>-{</div><div class='del'>-	return in_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_enable_RW);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(spu_resource_allocation_enable_get);</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spu_priv1_mmio.c b/arch/powerpc/platforms/cell/spu_priv1_mmio.c<br/>new file mode 100644<br/>index 000000000000..71b69f0a1a48<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spu_priv1_mmio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spu_priv1_mmio.c</a></div><div class='hunk'>@@ -0,0 +1,159 @@</div><div class='add'>+/*</div><div class='add'>+ * spu hypervisor abstraction for direct hardware access.</div><div class='add'>+ *</div><div class='add'>+ *  (C) Copyright IBM Deutschland Entwicklung GmbH 2005</div><div class='add'>+ *  Copyright 2006 Sony Corp.</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/spu.h&gt;</div><div class='add'>+#include &lt;asm/spu_priv1.h&gt;</div><div class='add'>+</div><div class='add'>+#include "interrupt.h"</div><div class='add'>+</div><div class='add'>+static void int_mask_and(struct spu *spu, int class, u64 mask)</div><div class='add'>+{</div><div class='add'>+	u64 old_mask;</div><div class='add'>+</div><div class='add'>+	old_mask = in_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class]);</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class], old_mask &amp; mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void int_mask_or(struct spu *spu, int class, u64 mask)</div><div class='add'>+{</div><div class='add'>+	u64 old_mask;</div><div class='add'>+</div><div class='add'>+	old_mask = in_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class]);</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class], old_mask | mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void int_mask_set(struct spu *spu, int class, u64 mask)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class], mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 int_mask_get(struct spu *spu, int class)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;int_mask_RW[class]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void int_stat_clear(struct spu *spu, int class, u64 stat)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;int_stat_RW[class], stat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 int_stat_get(struct spu *spu, int class)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;int_stat_RW[class]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cpu_affinity_set(struct spu *spu, int cpu)</div><div class='add'>+{</div><div class='add'>+	u64 target = iic_get_target_id(cpu);</div><div class='add'>+	u64 route = target &lt;&lt; 48 | target &lt;&lt; 32 | target &lt;&lt; 16;</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;int_route_RW, route);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mfc_dar_get(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_dar_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mfc_dsisr_get(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_dsisr_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mfc_dsisr_set(struct spu *spu, u64 dsisr)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;mfc_dsisr_RW, dsisr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mfc_sdr_set(struct spu *spu, u64 sdr)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;mfc_sdr_RW, sdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mfc_sr1_set(struct spu *spu, u64 sr1)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;mfc_sr1_RW, sr1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mfc_sr1_get(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_sr1_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mfc_tclass_id_set(struct spu *spu, u64 tclass_id)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;mfc_tclass_id_RW, tclass_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mfc_tclass_id_get(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;mfc_tclass_id_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tlb_invalidate(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;tlb_invalidate_entry_W, 0ul);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resource_allocation_groupID_set(struct spu *spu, u64 id)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_groupID_RW, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 resource_allocation_groupID_get(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_groupID_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resource_allocation_enable_set(struct spu *spu, u64 enable)</div><div class='add'>+{</div><div class='add'>+	out_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_enable_RW, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 resource_allocation_enable_get(struct spu *spu)</div><div class='add'>+{</div><div class='add'>+	return in_be64(&amp;spu-&gt;priv1-&gt;resource_allocation_enable_RW);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct spu_priv1_ops spu_priv1_mmio_ops =</div><div class='add'>+{</div><div class='add'>+	.int_mask_and = int_mask_and,</div><div class='add'>+	.int_mask_or = int_mask_or,</div><div class='add'>+	.int_mask_set = int_mask_set,</div><div class='add'>+	.int_mask_get = int_mask_get,</div><div class='add'>+	.int_stat_clear = int_stat_clear,</div><div class='add'>+	.int_stat_get = int_stat_get,</div><div class='add'>+	.cpu_affinity_set = cpu_affinity_set,</div><div class='add'>+	.mfc_dar_get = mfc_dar_get,</div><div class='add'>+	.mfc_dsisr_get = mfc_dsisr_get,</div><div class='add'>+	.mfc_dsisr_set = mfc_dsisr_set,</div><div class='add'>+	.mfc_sdr_set = mfc_sdr_set,</div><div class='add'>+	.mfc_sr1_set = mfc_sr1_set,</div><div class='add'>+	.mfc_sr1_get = mfc_sr1_get,</div><div class='add'>+	.mfc_tclass_id_set = mfc_tclass_id_set,</div><div class='add'>+	.mfc_tclass_id_get = mfc_tclass_id_get,</div><div class='add'>+	.tlb_invalidate = tlb_invalidate,</div><div class='add'>+	.resource_allocation_groupID_set = resource_allocation_groupID_set,</div><div class='add'>+	.resource_allocation_groupID_get = resource_allocation_groupID_get,</div><div class='add'>+	.resource_allocation_enable_set = resource_allocation_enable_set,</div><div class='add'>+	.resource_allocation_enable_get = resource_allocation_enable_get,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile<br/>index a7cddf40e3d9..bb5dc634272c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/Makefile</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='add'>+obj-y += switch.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_SPU_FS) += spufs.o</div><div class='del'>-spufs-y += inode.o file.o context.o switch.o syscalls.o</div><div class='add'>+spufs-y += inode.o file.o context.o syscalls.o</div><div class='ctx'> spufs-y += sched.o backing_ops.o hw_ops.o run.o</div><div class='ctx'> </div><div class='ctx'> # Rules to build switch.o with the help of SPU tool chain</div><div class='hunk'>@@ -8,11 +10,14 @@ SPU_CC		:= $(SPU_CROSS)gcc</div><div class='ctx'> SPU_AS		:= $(SPU_CROSS)gcc</div><div class='ctx'> SPU_LD		:= $(SPU_CROSS)ld</div><div class='ctx'> SPU_OBJCOPY	:= $(SPU_CROSS)objcopy</div><div class='del'>-SPU_CFLAGS	:= -O2 -Wall -I$(srctree)/include -I$(objtree)/include2</div><div class='del'>-SPU_AFLAGS	:= -c -D__ASSEMBLY__ -I$(srctree)/include -I$(objtree)/include2</div><div class='add'>+SPU_CFLAGS	:= -O2 -Wall -I$(srctree)/include \</div><div class='add'>+		   -I$(objtree)/include2 -D__KERNEL__</div><div class='add'>+SPU_AFLAGS	:= -c -D__ASSEMBLY__ -I$(srctree)/include \</div><div class='add'>+		   -I$(objtree)/include2 -D__KERNEL__</div><div class='ctx'> SPU_LDFLAGS	:= -N -Ttext=0x0</div><div class='ctx'> </div><div class='ctx'> $(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h</div><div class='add'>+clean-files := spu_save_dump.h spu_restore_dump.h</div><div class='ctx'> </div><div class='ctx'> # Compile SPU files</div><div class='ctx'>       cmd_spu_cc = $(SPU_CC) $(SPU_CFLAGS) -c -o $@ $&lt;</div><div class='hunk'>@@ -45,7 +50,8 @@ cmd_hexdump   = ( \</div><div class='ctx'> 		echo " * Hex-dump auto generated from $*.c." ; \</div><div class='ctx'> 		echo " * Do not edit!" ; \</div><div class='ctx'> 		echo " */" ; \</div><div class='del'>-		echo "static unsigned int $*_code[] __page_aligned = {" ; \</div><div class='add'>+		echo "static unsigned int $*_code[] " \</div><div class='add'>+			"__attribute__((__aligned__(128))) = {" ; \</div><div class='ctx'> 		hexdump -v -e '"0x" 4/1 "%02x" "," "\n"' $&lt; ; \</div><div class='ctx'> 		echo "};" ; \</div><div class='ctx'> 		) &gt; $@</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c<br/>index f1d35ddc9df3..2d22cd59d6fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/backing_ops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/backing_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/backing_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/backing_ops.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c<br/>index 8bb33abfad17..36439c5e9f2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/context.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/context.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/context.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/context.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> struct spu_context *alloc_spu_context(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_context *ctx;</div><div class='del'>-	ctx = kmalloc(sizeof *ctx, GFP_KERNEL);</div><div class='add'>+	ctx = kzalloc(sizeof *ctx, GFP_KERNEL);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* Binding to physical processor deferred</div><div class='hunk'>@@ -48,17 +48,7 @@ struct spu_context *alloc_spu_context(void)</div><div class='ctx'> 	init_waitqueue_head(&amp;ctx-&gt;wbox_wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;ctx-&gt;stop_wq);</div><div class='ctx'> 	init_waitqueue_head(&amp;ctx-&gt;mfc_wq);</div><div class='del'>-	ctx-&gt;ibox_fasync = NULL;</div><div class='del'>-	ctx-&gt;wbox_fasync = NULL;</div><div class='del'>-	ctx-&gt;mfc_fasync = NULL;</div><div class='del'>-	ctx-&gt;mfc = NULL;</div><div class='del'>-	ctx-&gt;tagwait = 0;</div><div class='ctx'> 	ctx-&gt;state = SPU_STATE_SAVED;</div><div class='del'>-	ctx-&gt;local_store = NULL;</div><div class='del'>-	ctx-&gt;cntl = NULL;</div><div class='del'>-	ctx-&gt;signal1 = NULL;</div><div class='del'>-	ctx-&gt;signal2 = NULL;</div><div class='del'>-	ctx-&gt;spu = NULL;</div><div class='ctx'> 	ctx-&gt;ops = &amp;spu_backing_ops;</div><div class='ctx'> 	ctx-&gt;owner = get_task_mm(current);</div><div class='ctx'> 	goto out;</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c<br/>index 366185e92667..58e794f9da1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/file.c</a></div><div class='hunk'>@@ -204,7 +204,7 @@ static int spufs_cntl_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_flags |= VM_RESERVED;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pgprot(pgprot_val(vma-&gt;vm_page_prot)</div><div class='del'>-				     | _PAGE_NO_CACHE);</div><div class='add'>+				     | _PAGE_NO_CACHE | _PAGE_GUARDED);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_ops = &amp;spufs_cntl_mmap_vmops;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -675,7 +675,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_flags |= VM_RESERVED;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pgprot(pgprot_val(vma-&gt;vm_page_prot)</div><div class='del'>-				     | _PAGE_NO_CACHE);</div><div class='add'>+				     | _PAGE_NO_CACHE | _PAGE_GUARDED);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_ops = &amp;spufs_signal1_mmap_vmops;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -762,7 +762,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	/* FIXME: */</div><div class='ctx'> 	vma-&gt;vm_flags |= VM_RESERVED;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pgprot(pgprot_val(vma-&gt;vm_page_prot)</div><div class='del'>-				     | _PAGE_NO_CACHE);</div><div class='add'>+				     | _PAGE_NO_CACHE | _PAGE_GUARDED);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_ops = &amp;spufs_signal2_mmap_vmops;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -825,6 +825,55 @@ DEFINE_SIMPLE_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,</div><div class='ctx'> 					spufs_signal2_type_set, "%llu");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPUFS_MMAP</div><div class='add'>+static struct page *spufs_mss_mmap_nopage(struct vm_area_struct *vma,</div><div class='add'>+					   unsigned long address, int *type)</div><div class='add'>+{</div><div class='add'>+	return spufs_ps_nopage(vma, address, type, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vm_operations_struct spufs_mss_mmap_vmops = {</div><div class='add'>+	.nopage = spufs_mss_mmap_nopage,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mmap support for problem state MFC DMA area [0x0000 - 0x0fff].</div><div class='add'>+ * Mapping this area requires that the application have CAP_SYS_RAWIO,</div><div class='add'>+ * as these registers require special care when read/writing.</div><div class='add'>+ */</div><div class='add'>+static int spufs_mss_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	if (!(vma-&gt;vm_flags &amp; VM_SHARED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_flags |= VM_RESERVED;</div><div class='add'>+	vma-&gt;vm_page_prot = __pgprot(pgprot_val(vma-&gt;vm_page_prot)</div><div class='add'>+				     | _PAGE_NO_CACHE | _PAGE_GUARDED);</div><div class='add'>+</div><div class='add'>+	vma-&gt;vm_ops = &amp;spufs_mss_mmap_vmops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int spufs_mss_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct spufs_inode_info *i = SPUFS_I(inode);</div><div class='add'>+</div><div class='add'>+	file-&gt;private_data = i-&gt;i_ctx;</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations spufs_mss_fops = {</div><div class='add'>+	.open	 = spufs_mss_open,</div><div class='add'>+#ifdef CONFIG_SPUFS_MMAP</div><div class='add'>+	.mmap	 = spufs_mss_mmap,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SPUFS_MMAP</div><div class='ctx'> static struct page *spufs_mfc_mmap_nopage(struct vm_area_struct *vma,</div><div class='ctx'> 					   unsigned long address, int *type)</div><div class='ctx'> {</div><div class='hunk'>@@ -850,7 +899,7 @@ static int spufs_mfc_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_flags |= VM_RESERVED;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pgprot(pgprot_val(vma-&gt;vm_page_prot)</div><div class='del'>-				     | _PAGE_NO_CACHE);</div><div class='add'>+				     | _PAGE_NO_CACHE | _PAGE_GUARDED);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_ops = &amp;spufs_mfc_mmap_vmops;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1101,7 +1150,7 @@ static unsigned int spufs_mfc_poll(struct file *file,poll_table *wait)</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int spufs_mfc_flush(struct file *file)</div><div class='add'>+static int spufs_mfc_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_context *ctx = file-&gt;private_data;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1127,7 +1176,7 @@ out:</div><div class='ctx'> static int spufs_mfc_fsync(struct file *file, struct dentry *dentry,</div><div class='ctx'> 			   int datasync)</div><div class='ctx'> {</div><div class='del'>-	return spufs_mfc_flush(file);</div><div class='add'>+	return spufs_mfc_flush(file, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int spufs_mfc_fasync(int fd, struct file *file, int on)</div><div class='hunk'>@@ -1279,6 +1328,22 @@ static u64 spufs_srr0_get(void *data)</div><div class='ctx'> DEFINE_SIMPLE_ATTRIBUTE(spufs_srr0_ops, spufs_srr0_get, spufs_srr0_set,</div><div class='ctx'> 			"%llx\n")</div><div class='ctx'> </div><div class='add'>+static u64 spufs_id_get(void *data)</div><div class='add'>+{</div><div class='add'>+	struct spu_context *ctx = data;</div><div class='add'>+	u64 num;</div><div class='add'>+</div><div class='add'>+	spu_acquire(ctx);</div><div class='add'>+	if (ctx-&gt;state == SPU_STATE_RUNNABLE)</div><div class='add'>+		num = ctx-&gt;spu-&gt;number;</div><div class='add'>+	else</div><div class='add'>+		num = (unsigned int)-1;</div><div class='add'>+	spu_release(ctx);</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+DEFINE_SIMPLE_ATTRIBUTE(spufs_id_ops, spufs_id_get, 0, "0x%llx\n")</div><div class='add'>+</div><div class='ctx'> struct tree_descr spufs_dir_contents[] = {</div><div class='ctx'> 	{ "mem",  &amp;spufs_mem_fops,  0666, },</div><div class='ctx'> 	{ "regs", &amp;spufs_regs_fops,  0666, },</div><div class='hunk'>@@ -1292,6 +1357,7 @@ struct tree_descr spufs_dir_contents[] = {</div><div class='ctx'> 	{ "signal2", &amp;spufs_signal2_fops, 0666, },</div><div class='ctx'> 	{ "signal1_type", &amp;spufs_signal1_type, 0666, },</div><div class='ctx'> 	{ "signal2_type", &amp;spufs_signal2_type, 0666, },</div><div class='add'>+	{ "mss", &amp;spufs_mss_fops, 0666, },</div><div class='ctx'> 	{ "mfc", &amp;spufs_mfc_fops, 0666, },</div><div class='ctx'> 	{ "cntl", &amp;spufs_cntl_fops,  0666, },</div><div class='ctx'> 	{ "npc", &amp;spufs_npc_ops, 0666, },</div><div class='hunk'>@@ -1301,5 +1367,6 @@ struct tree_descr spufs_dir_contents[] = {</div><div class='ctx'> 	{ "spu_tag_mask", &amp;spufs_spu_tag_mask_ops, 0666, },</div><div class='ctx'> 	{ "event_mask", &amp;spufs_event_mask_ops, 0666, },</div><div class='ctx'> 	{ "srr0", &amp;spufs_srr0_ops, 0666, },</div><div class='add'>+	{ "phys-id", &amp;spufs_id_ops, 0666, },</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/hw_ops.c b/arch/powerpc/platforms/cell/spufs/hw_ops.c<br/>index a13a8b5a014d..c8670f519734 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/hw_ops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/hw_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/hw_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/hw_ops.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -32,6 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='add'>+#include &lt;asm/spu_priv1.h&gt;</div><div class='ctx'> #include &lt;asm/spu_csa.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include "spufs.h"</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c<br/>index d9554199afa7..7b4572805db9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/inode.c</a></div><div class='hunk'>@@ -157,20 +157,12 @@ static void spufs_prune_dir(struct dentry *dir)</div><div class='ctx'> 	mutex_unlock(&amp;dir-&gt;d_inode-&gt;i_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Caller must hold root-&gt;i_mutex */</div><div class='ctx'> static int spufs_rmdir(struct inode *root, struct dentry *dir_dentry)</div><div class='ctx'> {</div><div class='del'>-	struct spu_context *ctx;</div><div class='del'>-</div><div class='ctx'> 	/* remove all entries */</div><div class='del'>-	mutex_lock(&amp;root-&gt;i_mutex);</div><div class='ctx'> 	spufs_prune_dir(dir_dentry);</div><div class='del'>-	mutex_unlock(&amp;root-&gt;i_mutex);</div><div class='del'>-</div><div class='del'>-	/* We have to give up the mm_struct */</div><div class='del'>-	ctx = SPUFS_I(dir_dentry-&gt;d_inode)-&gt;i_ctx;</div><div class='del'>-	spu_forget(ctx);</div><div class='ctx'> </div><div class='del'>-	/* XXX Do we need to hold i_mutex here ? */</div><div class='ctx'> 	return simple_rmdir(root, dir_dentry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -199,16 +191,23 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int spufs_dir_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='add'>+	struct spu_context *ctx;</div><div class='ctx'> 	struct inode *dir;</div><div class='ctx'> 	struct dentry *dentry;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dentry = file-&gt;f_dentry;</div><div class='ctx'> 	dir = dentry-&gt;d_parent-&gt;d_inode;</div><div class='add'>+	ctx = SPUFS_I(dentry-&gt;d_inode)-&gt;i_ctx;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;dir-&gt;i_mutex);</div><div class='ctx'> 	ret = spufs_rmdir(dir, dentry);</div><div class='add'>+	mutex_unlock(&amp;dir-&gt;i_mutex);</div><div class='ctx'> 	WARN_ON(ret);</div><div class='ctx'> </div><div class='add'>+	/* We have to give up the mm_struct */</div><div class='add'>+	spu_forget(ctx);</div><div class='add'>+</div><div class='ctx'> 	return dcache_dir_close(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -305,6 +304,10 @@ long spufs_create_thread(struct nameidata *nd,</div><div class='ctx'> 	    nd-&gt;dentry != nd-&gt;dentry-&gt;d_sb-&gt;s_root)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	/* all flags are reserved */</div><div class='add'>+	if (flags)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	dentry = lookup_create(nd, 1);</div><div class='ctx'> 	ret = PTR_ERR(dentry);</div><div class='ctx'> 	if (IS_ERR(dentry))</div><div class='hunk'>@@ -324,8 +327,13 @@ long spufs_create_thread(struct nameidata *nd,</div><div class='ctx'> 	 * in error path of *_open().</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = spufs_context_open(dget(dentry), mntget(nd-&gt;mnt));</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		spufs_rmdir(nd-&gt;dentry-&gt;d_inode, dentry);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		WARN_ON(spufs_rmdir(nd-&gt;dentry-&gt;d_inode, dentry));</div><div class='add'>+		mutex_unlock(&amp;nd-&gt;dentry-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+		spu_forget(SPUFS_I(dentry-&gt;d_inode)-&gt;i_ctx);</div><div class='add'>+		dput(dentry);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> out_dput:</div><div class='ctx'> 	dput(dentry);</div><div class='hunk'>@@ -428,11 +436,11 @@ spufs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	return spufs_create_root(sb, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *</div><div class='add'>+static int</div><div class='ctx'> spufs_get_sb(struct file_system_type *fstype, int flags,</div><div class='del'>-		const char *name, void *data)</div><div class='add'>+		const char *name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fstype, flags, data, spufs_fill_super);</div><div class='add'>+	return get_sb_single(fstype, flags, data, spufs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type spufs_type = {</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c<br/>index bf652cd77000..1350294484b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/sched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/sched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/sched.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -43,6 +42,7 @@</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='ctx'> #include &lt;asm/spu_csa.h&gt;</div><div class='add'>+#include &lt;asm/spu_priv1.h&gt;</div><div class='ctx'> #include "spufs.h"</div><div class='ctx'> </div><div class='ctx'> #define SPU_MIN_TIMESLICE 	(100 * HZ / 1000)</div><div class='hunk'>@@ -363,7 +363,7 @@ int spu_activate(struct spu_context *ctx, u64 flags)</div><div class='ctx'> 	 * We're likely to wait for interrupts on the same</div><div class='ctx'> 	 * CPU that we are now on, so send them here.</div><div class='ctx'> 	 */</div><div class='del'>-	spu_irq_setaffinity(spu, raw_smp_processor_id());</div><div class='add'>+	spu_cpu_affinity_set(spu, raw_smp_processor_id());</div><div class='ctx'> 	put_active_spu(spu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped b/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped<br/>index 1b2355ff7036..15183d209b58 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped</a></div><div class='hunk'>@@ -3,229 +3,901 @@</div><div class='ctx'>  * Hex-dump auto generated from spu_restore.c.</div><div class='ctx'>  * Do not edit!</div><div class='ctx'>  */</div><div class='del'>-static unsigned int spu_restore_code[] __page_aligned = {</div><div class='del'>-0x40800000, 0x409ff801, 0x24000080, 0x24fd8081,</div><div class='del'>-0x1cd80081, 0x33001180, 0x42030003, 0x33800284,</div><div class='del'>-0x1c010204, 0x40200000, 0x40200000, 0x40200000,</div><div class='del'>-0x34000190, 0x34004191, 0x34008192, 0x3400c193,</div><div class='del'>-0x141fc205, 0x23fffd84, 0x1c100183, 0x217ffa85,</div><div class='del'>-0x3080a000, 0x3080a201, 0x3080a402, 0x3080a603,</div><div class='del'>-0x3080a804, 0x3080aa05, 0x3080ac06, 0x3080ae07,</div><div class='del'>-0x3080b008, 0x3080b209, 0x3080b40a, 0x3080b60b,</div><div class='del'>-0x3080b80c, 0x3080ba0d, 0x3080bc0e, 0x3080be0f,</div><div class='del'>-0x00003ffc, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x01a00182, 0x3ec00083, 0xb0a14103, 0x01a00204,</div><div class='del'>-0x3ec10082, 0x4202800e, 0x04000703, 0xb0a14202,</div><div class='del'>-0x21a00803, 0x3fbf028d, 0x3f20068d, 0x3fbe0682,</div><div class='del'>-0x3fe30102, 0x21a00882, 0x3f82028f, 0x3fe3078f,</div><div class='del'>-0x3fbf0784, 0x3f200204, 0x3fbe0204, 0x3fe30204,</div><div class='del'>-0x04000203, 0x21a00903, 0x40848002, 0x21a00982,</div><div class='del'>-0x40800003, 0x21a00a03, 0x40802002, 0x21a00a82,</div><div class='del'>-0x21a00083, 0x40800082, 0x21a00b02, 0x10002818,</div><div class='del'>-0x40a80002, 0x32800007, 0x4207000c, 0x18008208,</div><div class='del'>-0x40a0000b, 0x4080020a, 0x40800709, 0x00200000,</div><div class='del'>-0x42070002, 0x3ac30384, 0x1cffc489, 0x00200000,</div><div class='del'>-0x18008383, 0x38830382, 0x4cffc486, 0x3ac28185,</div><div class='del'>-0xb0408584, 0x28830382, 0x1c020387, 0x38828182,</div><div class='del'>-0xb0408405, 0x1802c408, 0x28828182, 0x217ff886,</div><div class='del'>-0x04000583, 0x21a00803, 0x3fbe0682, 0x3fe30102,</div><div class='del'>-0x04000106, 0x21a00886, 0x04000603, 0x21a00903,</div><div class='del'>-0x40803c02, 0x21a00982, 0x40800003, 0x04000184,</div><div class='del'>-0x21a00a04, 0x40802202, 0x21a00a82, 0x42028005,</div><div class='del'>-0x34208702, 0x21002282, 0x21a00804, 0x21a00886,</div><div class='del'>-0x3fbf0782, 0x3f200102, 0x3fbe0102, 0x3fe30102,</div><div class='del'>-0x21a00902, 0x40804003, 0x21a00983, 0x21a00a04,</div><div class='del'>-0x40805a02, 0x21a00a82, 0x40800083, 0x21a00b83,</div><div class='del'>-0x01a00c02, 0x01a00d83, 0x3420c282, 0x21a00e02,</div><div class='del'>-0x34210283, 0x21a00f03, 0x34200284, 0x77400200,</div><div class='del'>-0x3421c282, 0x21a00702, 0x34218283, 0x21a00083,</div><div class='del'>-0x34214282, 0x21a00b02, 0x4200480c, 0x00200000,</div><div class='del'>-0x1c010286, 0x34220284, 0x34220302, 0x0f608203,</div><div class='del'>-0x5c024204, 0x3b81810b, 0x42013c02, 0x00200000,</div><div class='del'>-0x18008185, 0x38808183, 0x3b814182, 0x21004e84,</div><div class='del'>-0x4020007f, 0x35000100, 0x000004e0, 0x000002a0,</div><div class='del'>-0x000002e8, 0x00000428, 0x00000360, 0x000002e8,</div><div class='del'>-0x000004a0, 0x00000468, 0x000003c8, 0x00000360,</div><div class='del'>-0x409ffe02, 0x30801203, 0x40800204, 0x3ec40085,</div><div class='del'>-0x10009c09, 0x3ac10606, 0xb060c105, 0x4020007f,</div><div class='del'>-0x4020007f, 0x20801203, 0x38810602, 0xb0408586,</div><div class='del'>-0x28810602, 0x32004180, 0x34204702, 0x21a00382,</div><div class='del'>-0x4020007f, 0x327fdc80, 0x409ffe02, 0x30801203,</div><div class='del'>-0x40800204, 0x3ec40087, 0x40800405, 0x00200000,</div><div class='del'>-0x40800606, 0x3ac10608, 0x3ac14609, 0x3ac1860a,</div><div class='del'>-0xb060c107, 0x20801203, 0x41004003, 0x38810602,</div><div class='del'>-0x4020007f, 0xb0408188, 0x4020007f, 0x28810602,</div><div class='del'>-0x41201002, 0x38814603, 0x10009c09, 0xb060c109,</div><div class='del'>-0x4020007f, 0x28814603, 0x41193f83, 0x38818602,</div><div class='del'>-0x60ffc003, 0xb040818a, 0x28818602, 0x32003080,</div><div class='del'>-0x409ffe02, 0x30801203, 0x40800204, 0x3ec40087,</div><div class='del'>-0x41201008, 0x10009c14, 0x40800405, 0x3ac10609,</div><div class='del'>-0x40800606, 0x3ac1460a, 0xb060c107, 0x3ac1860b,</div><div class='del'>-0x20801203, 0x38810602, 0xb0408409, 0x28810602,</div><div class='del'>-0x38814603, 0xb060c40a, 0x4020007f, 0x28814603,</div><div class='del'>-0x41193f83, 0x38818602, 0x60ffc003, 0xb040818b,</div><div class='del'>-0x28818602, 0x32002380, 0x409ffe02, 0x30801204,</div><div class='del'>-0x40800205, 0x3ec40083, 0x40800406, 0x3ac14607,</div><div class='del'>-0x3ac18608, 0xb0810103, 0x41004002, 0x20801204,</div><div class='del'>-0x4020007f, 0x38814603, 0x10009c0b, 0xb060c107,</div><div class='del'>-0x4020007f, 0x4020007f, 0x28814603, 0x38818602,</div><div class='del'>-0x4020007f, 0x4020007f, 0xb0408588, 0x28818602,</div><div class='del'>-0x4020007f, 0x32001780, 0x409ffe02, 0x1000640e,</div><div class='del'>-0x40800204, 0x30801203, 0x40800405, 0x3ec40087,</div><div class='del'>-0x40800606, 0x3ac10608, 0x3ac14609, 0x3ac1860a,</div><div class='del'>-0xb060c107, 0x20801203, 0x413d8003, 0x38810602,</div><div class='del'>-0x4020007f, 0x327fd780, 0x409ffe02, 0x10007f0c,</div><div class='del'>-0x40800205, 0x30801204, 0x40800406, 0x3ec40083,</div><div class='del'>-0x3ac14607, 0x3ac18608, 0xb0810103, 0x413d8002,</div><div class='del'>-0x20801204, 0x38814603, 0x4020007f, 0x327feb80,</div><div class='del'>-0x409ffe02, 0x30801203, 0x40800204, 0x3ec40087,</div><div class='del'>-0x40800405, 0x1000650a, 0x40800606, 0x3ac10608,</div><div class='del'>-0x3ac14609, 0x3ac1860a, 0xb060c107, 0x20801203,</div><div class='del'>-0x38810602, 0xb0408588, 0x4020007f, 0x327fc980,</div><div class='del'>-0x00400000, 0x40800003, 0x4020007f, 0x35000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+static unsigned int spu_restore_code[]  __attribute__((__aligned__(128))) = {</div><div class='add'>+0x40800000,</div><div class='add'>+0x409ff801,</div><div class='add'>+0x24000080,</div><div class='add'>+0x24fd8081,</div><div class='add'>+0x1cd80081,</div><div class='add'>+0x33001180,</div><div class='add'>+0x42030003,</div><div class='add'>+0x33800284,</div><div class='add'>+0x1c010204,</div><div class='add'>+0x40200000,</div><div class='add'>+0x40200000,</div><div class='add'>+0x40200000,</div><div class='add'>+0x34000190,</div><div class='add'>+0x34004191,</div><div class='add'>+0x34008192,</div><div class='add'>+0x3400c193,</div><div class='add'>+0x141fc205,</div><div class='add'>+0x23fffd84,</div><div class='add'>+0x1c100183,</div><div class='add'>+0x217ffa85,</div><div class='add'>+0x3080a000,</div><div class='add'>+0x3080a201,</div><div class='add'>+0x3080a402,</div><div class='add'>+0x3080a603,</div><div class='add'>+0x3080a804,</div><div class='add'>+0x3080aa05,</div><div class='add'>+0x3080ac06,</div><div class='add'>+0x3080ae07,</div><div class='add'>+0x3080b008,</div><div class='add'>+0x3080b209,</div><div class='add'>+0x3080b40a,</div><div class='add'>+0x3080b60b,</div><div class='add'>+0x3080b80c,</div><div class='add'>+0x3080ba0d,</div><div class='add'>+0x3080bc0e,</div><div class='add'>+0x3080be0f,</div><div class='add'>+0x00003ffc,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x01a00182,</div><div class='add'>+0x3ec00083,</div><div class='add'>+0xb0a14103,</div><div class='add'>+0x01a00204,</div><div class='add'>+0x3ec10082,</div><div class='add'>+0x4202800e,</div><div class='add'>+0x04000703,</div><div class='add'>+0xb0a14202,</div><div class='add'>+0x21a00803,</div><div class='add'>+0x3fbf028d,</div><div class='add'>+0x3f20068d,</div><div class='add'>+0x3fbe0682,</div><div class='add'>+0x3fe30102,</div><div class='add'>+0x21a00882,</div><div class='add'>+0x3f82028f,</div><div class='add'>+0x3fe3078f,</div><div class='add'>+0x3fbf0784,</div><div class='add'>+0x3f200204,</div><div class='add'>+0x3fbe0204,</div><div class='add'>+0x3fe30204,</div><div class='add'>+0x04000203,</div><div class='add'>+0x21a00903,</div><div class='add'>+0x40848002,</div><div class='add'>+0x21a00982,</div><div class='add'>+0x40800003,</div><div class='add'>+0x21a00a03,</div><div class='add'>+0x40802002,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x21a00083,</div><div class='add'>+0x40800082,</div><div class='add'>+0x21a00b02,</div><div class='add'>+0x10002818,</div><div class='add'>+0x42a00002,</div><div class='add'>+0x32800007,</div><div class='add'>+0x4207000c,</div><div class='add'>+0x18008208,</div><div class='add'>+0x40a0000b,</div><div class='add'>+0x4080020a,</div><div class='add'>+0x40800709,</div><div class='add'>+0x00200000,</div><div class='add'>+0x42070002,</div><div class='add'>+0x3ac30384,</div><div class='add'>+0x1cffc489,</div><div class='add'>+0x00200000,</div><div class='add'>+0x18008383,</div><div class='add'>+0x38830382,</div><div class='add'>+0x4cffc486,</div><div class='add'>+0x3ac28185,</div><div class='add'>+0xb0408584,</div><div class='add'>+0x28830382,</div><div class='add'>+0x1c020387,</div><div class='add'>+0x38828182,</div><div class='add'>+0xb0408405,</div><div class='add'>+0x1802c408,</div><div class='add'>+0x28828182,</div><div class='add'>+0x217ff886,</div><div class='add'>+0x04000583,</div><div class='add'>+0x21a00803,</div><div class='add'>+0x3fbe0682,</div><div class='add'>+0x3fe30102,</div><div class='add'>+0x04000106,</div><div class='add'>+0x21a00886,</div><div class='add'>+0x04000603,</div><div class='add'>+0x21a00903,</div><div class='add'>+0x40803c02,</div><div class='add'>+0x21a00982,</div><div class='add'>+0x40800003,</div><div class='add'>+0x04000184,</div><div class='add'>+0x21a00a04,</div><div class='add'>+0x40802202,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x42028005,</div><div class='add'>+0x34208702,</div><div class='add'>+0x21002282,</div><div class='add'>+0x21a00804,</div><div class='add'>+0x21a00886,</div><div class='add'>+0x3fbf0782,</div><div class='add'>+0x3f200102,</div><div class='add'>+0x3fbe0102,</div><div class='add'>+0x3fe30102,</div><div class='add'>+0x21a00902,</div><div class='add'>+0x40804003,</div><div class='add'>+0x21a00983,</div><div class='add'>+0x21a00a04,</div><div class='add'>+0x40805a02,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x40800083,</div><div class='add'>+0x21a00b83,</div><div class='add'>+0x01a00c02,</div><div class='add'>+0x01a00d83,</div><div class='add'>+0x3420c282,</div><div class='add'>+0x21a00e02,</div><div class='add'>+0x34210283,</div><div class='add'>+0x21a00f03,</div><div class='add'>+0x34200284,</div><div class='add'>+0x77400200,</div><div class='add'>+0x3421c282,</div><div class='add'>+0x21a00702,</div><div class='add'>+0x34218283,</div><div class='add'>+0x21a00083,</div><div class='add'>+0x34214282,</div><div class='add'>+0x21a00b02,</div><div class='add'>+0x4200480c,</div><div class='add'>+0x00200000,</div><div class='add'>+0x1c010286,</div><div class='add'>+0x34220284,</div><div class='add'>+0x34220302,</div><div class='add'>+0x0f608203,</div><div class='add'>+0x5c024204,</div><div class='add'>+0x3b81810b,</div><div class='add'>+0x42013c02,</div><div class='add'>+0x00200000,</div><div class='add'>+0x18008185,</div><div class='add'>+0x38808183,</div><div class='add'>+0x3b814182,</div><div class='add'>+0x21004e84,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x35000100,</div><div class='add'>+0x000004e0,</div><div class='add'>+0x000002a0,</div><div class='add'>+0x000002e8,</div><div class='add'>+0x00000428,</div><div class='add'>+0x00000360,</div><div class='add'>+0x000002e8,</div><div class='add'>+0x000004a0,</div><div class='add'>+0x00000468,</div><div class='add'>+0x000003c8,</div><div class='add'>+0x00000360,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x30801203,</div><div class='add'>+0x40800204,</div><div class='add'>+0x3ec40085,</div><div class='add'>+0x10009c09,</div><div class='add'>+0x3ac10606,</div><div class='add'>+0xb060c105,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x20801203,</div><div class='add'>+0x38810602,</div><div class='add'>+0xb0408586,</div><div class='add'>+0x28810602,</div><div class='add'>+0x32004180,</div><div class='add'>+0x34204702,</div><div class='add'>+0x21a00382,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x327fdc80,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x30801203,</div><div class='add'>+0x40800204,</div><div class='add'>+0x3ec40087,</div><div class='add'>+0x40800405,</div><div class='add'>+0x00200000,</div><div class='add'>+0x40800606,</div><div class='add'>+0x3ac10608,</div><div class='add'>+0x3ac14609,</div><div class='add'>+0x3ac1860a,</div><div class='add'>+0xb060c107,</div><div class='add'>+0x20801203,</div><div class='add'>+0x41004003,</div><div class='add'>+0x38810602,</div><div class='add'>+0x4020007f,</div><div class='add'>+0xb0408188,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x28810602,</div><div class='add'>+0x41201002,</div><div class='add'>+0x38814603,</div><div class='add'>+0x10009c09,</div><div class='add'>+0xb060c109,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x28814603,</div><div class='add'>+0x41193f83,</div><div class='add'>+0x38818602,</div><div class='add'>+0x60ffc003,</div><div class='add'>+0xb040818a,</div><div class='add'>+0x28818602,</div><div class='add'>+0x32003080,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x30801203,</div><div class='add'>+0x40800204,</div><div class='add'>+0x3ec40087,</div><div class='add'>+0x41201008,</div><div class='add'>+0x10009c14,</div><div class='add'>+0x40800405,</div><div class='add'>+0x3ac10609,</div><div class='add'>+0x40800606,</div><div class='add'>+0x3ac1460a,</div><div class='add'>+0xb060c107,</div><div class='add'>+0x3ac1860b,</div><div class='add'>+0x20801203,</div><div class='add'>+0x38810602,</div><div class='add'>+0xb0408409,</div><div class='add'>+0x28810602,</div><div class='add'>+0x38814603,</div><div class='add'>+0xb060c40a,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x28814603,</div><div class='add'>+0x41193f83,</div><div class='add'>+0x38818602,</div><div class='add'>+0x60ffc003,</div><div class='add'>+0xb040818b,</div><div class='add'>+0x28818602,</div><div class='add'>+0x32002380,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x30801204,</div><div class='add'>+0x40800205,</div><div class='add'>+0x3ec40083,</div><div class='add'>+0x40800406,</div><div class='add'>+0x3ac14607,</div><div class='add'>+0x3ac18608,</div><div class='add'>+0xb0810103,</div><div class='add'>+0x41004002,</div><div class='add'>+0x20801204,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x38814603,</div><div class='add'>+0x10009c0b,</div><div class='add'>+0xb060c107,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x28814603,</div><div class='add'>+0x38818602,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x4020007f,</div><div class='add'>+0xb0408588,</div><div class='add'>+0x28818602,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x32001780,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x1000640e,</div><div class='add'>+0x40800204,</div><div class='add'>+0x30801203,</div><div class='add'>+0x40800405,</div><div class='add'>+0x3ec40087,</div><div class='add'>+0x40800606,</div><div class='add'>+0x3ac10608,</div><div class='add'>+0x3ac14609,</div><div class='add'>+0x3ac1860a,</div><div class='add'>+0xb060c107,</div><div class='add'>+0x20801203,</div><div class='add'>+0x413d8003,</div><div class='add'>+0x38810602,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x327fd780,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x10007f0c,</div><div class='add'>+0x40800205,</div><div class='add'>+0x30801204,</div><div class='add'>+0x40800406,</div><div class='add'>+0x3ec40083,</div><div class='add'>+0x3ac14607,</div><div class='add'>+0x3ac18608,</div><div class='add'>+0xb0810103,</div><div class='add'>+0x413d8002,</div><div class='add'>+0x20801204,</div><div class='add'>+0x38814603,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x327feb80,</div><div class='add'>+0x409ffe02,</div><div class='add'>+0x30801203,</div><div class='add'>+0x40800204,</div><div class='add'>+0x3ec40087,</div><div class='add'>+0x40800405,</div><div class='add'>+0x1000650a,</div><div class='add'>+0x40800606,</div><div class='add'>+0x3ac10608,</div><div class='add'>+0x3ac14609,</div><div class='add'>+0x3ac1860a,</div><div class='add'>+0xb060c107,</div><div class='add'>+0x20801203,</div><div class='add'>+0x38810602,</div><div class='add'>+0xb0408588,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x327fc980,</div><div class='add'>+0x00400000,</div><div class='add'>+0x40800003,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x35000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped b/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped<br/>index 39e54003f1df..b9f81ac8a632 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped</a></div><div class='hunk'>@@ -3,189 +3,741 @@</div><div class='ctx'>  * Hex-dump auto generated from spu_save.c.</div><div class='ctx'>  * Do not edit!</div><div class='ctx'>  */</div><div class='del'>-static unsigned int spu_save_code[] __page_aligned = {</div><div class='del'>-0x20805000, 0x20805201, 0x20805402, 0x20805603,</div><div class='del'>-0x20805804, 0x20805a05, 0x20805c06, 0x20805e07,</div><div class='del'>-0x20806008, 0x20806209, 0x2080640a, 0x2080660b,</div><div class='del'>-0x2080680c, 0x20806a0d, 0x20806c0e, 0x20806e0f,</div><div class='del'>-0x4201c003, 0x33800184, 0x1c010204, 0x40200000,</div><div class='del'>-0x24000190, 0x24004191, 0x24008192, 0x2400c193,</div><div class='del'>-0x141fc205, 0x23fffd84, 0x1c100183, 0x217ffb85,</div><div class='del'>-0x40800000, 0x409ff801, 0x24000080, 0x24fd8081,</div><div class='del'>-0x1cd80081, 0x33000180, 0x00000000, 0x00000000,</div><div class='del'>-0x01a00182, 0x3ec00083, 0xb1c38103, 0x01a00204,</div><div class='del'>-0x3ec10082, 0x4201400d, 0xb1c38202, 0x01a00583,</div><div class='del'>-0x34218682, 0x3ed80684, 0xb0408184, 0x24218682,</div><div class='del'>-0x01a00603, 0x00200000, 0x34214682, 0x3ed40684,</div><div class='del'>-0xb0408184, 0x40800003, 0x24214682, 0x21a00083,</div><div class='del'>-0x40800082, 0x21a00b02, 0x4020007f, 0x1000251e,</div><div class='del'>-0x40a80002, 0x32800008, 0x4205c00c, 0x00200000,</div><div class='del'>-0x40a0000b, 0x3f82070f, 0x4080020a, 0x40800709,</div><div class='del'>-0x3fe3078f, 0x3fbf0783, 0x3f200183, 0x3fbe0183,</div><div class='del'>-0x3fe30187, 0x18008387, 0x4205c002, 0x3ac30404,</div><div class='del'>-0x1cffc489, 0x00200000, 0x18008403, 0x38830402,</div><div class='del'>-0x4cffc486, 0x3ac28185, 0xb0408584, 0x28830402,</div><div class='del'>-0x1c020408, 0x38828182, 0xb0408385, 0x1802c387,</div><div class='del'>-0x28828182, 0x217ff886, 0x04000582, 0x32800007,</div><div class='del'>-0x21a00802, 0x3fbf0705, 0x3f200285, 0x3fbe0285,</div><div class='del'>-0x3fe30285, 0x21a00885, 0x04000603, 0x21a00903,</div><div class='del'>-0x40803c02, 0x21a00982, 0x04000386, 0x21a00a06,</div><div class='del'>-0x40801202, 0x21a00a82, 0x73000003, 0x24200683,</div><div class='del'>-0x01a00404, 0x00200000, 0x34204682, 0x3ec40683,</div><div class='del'>-0xb0408203, 0x24204682, 0x01a00783, 0x00200000,</div><div class='del'>-0x3421c682, 0x3edc0684, 0xb0408184, 0x2421c682,</div><div class='del'>-0x21a00806, 0x21a00885, 0x3fbf0784, 0x3f200204,</div><div class='del'>-0x3fbe0204, 0x3fe30204, 0x21a00904, 0x40804002,</div><div class='del'>-0x21a00982, 0x21a00a06, 0x40805a02, 0x21a00a82,</div><div class='del'>-0x04000683, 0x21a00803, 0x21a00885, 0x21a00904,</div><div class='del'>-0x40848002, 0x21a00982, 0x21a00a06, 0x40801002,</div><div class='del'>-0x21a00a82, 0x21a00a06, 0x40806602, 0x00200000,</div><div class='del'>-0x35800009, 0x21a00a82, 0x40800083, 0x21a00b83,</div><div class='del'>-0x01a00c02, 0x01a00d83, 0x00003ffb, 0x40800003,</div><div class='del'>-0x4020007f, 0x35000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+static unsigned int spu_save_code[]  __attribute__((__aligned__(128))) = {</div><div class='add'>+0x20805000,</div><div class='add'>+0x20805201,</div><div class='add'>+0x20805402,</div><div class='add'>+0x20805603,</div><div class='add'>+0x20805804,</div><div class='add'>+0x20805a05,</div><div class='add'>+0x20805c06,</div><div class='add'>+0x20805e07,</div><div class='add'>+0x20806008,</div><div class='add'>+0x20806209,</div><div class='add'>+0x2080640a,</div><div class='add'>+0x2080660b,</div><div class='add'>+0x2080680c,</div><div class='add'>+0x20806a0d,</div><div class='add'>+0x20806c0e,</div><div class='add'>+0x20806e0f,</div><div class='add'>+0x4201c003,</div><div class='add'>+0x33800184,</div><div class='add'>+0x1c010204,</div><div class='add'>+0x40200000,</div><div class='add'>+0x24000190,</div><div class='add'>+0x24004191,</div><div class='add'>+0x24008192,</div><div class='add'>+0x2400c193,</div><div class='add'>+0x141fc205,</div><div class='add'>+0x23fffd84,</div><div class='add'>+0x1c100183,</div><div class='add'>+0x217ffb85,</div><div class='add'>+0x40800000,</div><div class='add'>+0x409ff801,</div><div class='add'>+0x24000080,</div><div class='add'>+0x24fd8081,</div><div class='add'>+0x1cd80081,</div><div class='add'>+0x33000180,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x01a00182,</div><div class='add'>+0x3ec00083,</div><div class='add'>+0xb1c38103,</div><div class='add'>+0x01a00204,</div><div class='add'>+0x3ec10082,</div><div class='add'>+0x4201400d,</div><div class='add'>+0xb1c38202,</div><div class='add'>+0x01a00583,</div><div class='add'>+0x34218682,</div><div class='add'>+0x3ed80684,</div><div class='add'>+0xb0408184,</div><div class='add'>+0x24218682,</div><div class='add'>+0x01a00603,</div><div class='add'>+0x00200000,</div><div class='add'>+0x34214682,</div><div class='add'>+0x3ed40684,</div><div class='add'>+0xb0408184,</div><div class='add'>+0x40800003,</div><div class='add'>+0x24214682,</div><div class='add'>+0x21a00083,</div><div class='add'>+0x40800082,</div><div class='add'>+0x21a00b02,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x1000251e,</div><div class='add'>+0x42a00002,</div><div class='add'>+0x32800008,</div><div class='add'>+0x4205c00c,</div><div class='add'>+0x00200000,</div><div class='add'>+0x40a0000b,</div><div class='add'>+0x3f82070f,</div><div class='add'>+0x4080020a,</div><div class='add'>+0x40800709,</div><div class='add'>+0x3fe3078f,</div><div class='add'>+0x3fbf0783,</div><div class='add'>+0x3f200183,</div><div class='add'>+0x3fbe0183,</div><div class='add'>+0x3fe30187,</div><div class='add'>+0x18008387,</div><div class='add'>+0x4205c002,</div><div class='add'>+0x3ac30404,</div><div class='add'>+0x1cffc489,</div><div class='add'>+0x00200000,</div><div class='add'>+0x18008403,</div><div class='add'>+0x38830402,</div><div class='add'>+0x4cffc486,</div><div class='add'>+0x3ac28185,</div><div class='add'>+0xb0408584,</div><div class='add'>+0x28830402,</div><div class='add'>+0x1c020408,</div><div class='add'>+0x38828182,</div><div class='add'>+0xb0408385,</div><div class='add'>+0x1802c387,</div><div class='add'>+0x28828182,</div><div class='add'>+0x217ff886,</div><div class='add'>+0x04000582,</div><div class='add'>+0x32800007,</div><div class='add'>+0x21a00802,</div><div class='add'>+0x3fbf0705,</div><div class='add'>+0x3f200285,</div><div class='add'>+0x3fbe0285,</div><div class='add'>+0x3fe30285,</div><div class='add'>+0x21a00885,</div><div class='add'>+0x04000603,</div><div class='add'>+0x21a00903,</div><div class='add'>+0x40803c02,</div><div class='add'>+0x21a00982,</div><div class='add'>+0x04000386,</div><div class='add'>+0x21a00a06,</div><div class='add'>+0x40801202,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x73000003,</div><div class='add'>+0x24200683,</div><div class='add'>+0x01a00404,</div><div class='add'>+0x00200000,</div><div class='add'>+0x34204682,</div><div class='add'>+0x3ec40683,</div><div class='add'>+0xb0408203,</div><div class='add'>+0x24204682,</div><div class='add'>+0x01a00783,</div><div class='add'>+0x00200000,</div><div class='add'>+0x3421c682,</div><div class='add'>+0x3edc0684,</div><div class='add'>+0xb0408184,</div><div class='add'>+0x2421c682,</div><div class='add'>+0x21a00806,</div><div class='add'>+0x21a00885,</div><div class='add'>+0x3fbf0784,</div><div class='add'>+0x3f200204,</div><div class='add'>+0x3fbe0204,</div><div class='add'>+0x3fe30204,</div><div class='add'>+0x21a00904,</div><div class='add'>+0x40804002,</div><div class='add'>+0x21a00982,</div><div class='add'>+0x21a00a06,</div><div class='add'>+0x40805a02,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x04000683,</div><div class='add'>+0x21a00803,</div><div class='add'>+0x21a00885,</div><div class='add'>+0x21a00904,</div><div class='add'>+0x40848002,</div><div class='add'>+0x21a00982,</div><div class='add'>+0x21a00a06,</div><div class='add'>+0x40801002,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x21a00a06,</div><div class='add'>+0x40806602,</div><div class='add'>+0x00200000,</div><div class='add'>+0x35800009,</div><div class='add'>+0x21a00a82,</div><div class='add'>+0x40800083,</div><div class='add'>+0x21a00b83,</div><div class='add'>+0x01a00c02,</div><div class='add'>+0x01a00d83,</div><div class='add'>+0x00003ffb,</div><div class='add'>+0x40800003,</div><div class='add'>+0x4020007f,</div><div class='add'>+0x35000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='add'>+0x00000000,</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c<br/>index 1726bfe38ee0..9d9d82dd32ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/switch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/cell/spufs/switch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/cell/spufs/switch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/cell/spufs/switch.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -46,6 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/spu.h&gt;</div><div class='add'>+#include &lt;asm/spu_priv1.h&gt;</div><div class='ctx'> #include &lt;asm/spu_csa.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +463,8 @@ static inline void wait_purge_complete(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> 	 *     Poll MFC_CNTL[Ps] until value '11' is read</div><div class='ctx'> 	 *     (purge complete).</div><div class='ctx'> 	 */</div><div class='del'>-	POLL_WHILE_FALSE(in_be64(&amp;priv2-&gt;mfc_control_RW) &amp;</div><div class='add'>+	POLL_WHILE_FALSE((in_be64(&amp;priv2-&gt;mfc_control_RW) &amp;</div><div class='add'>+			 MFC_CNTL_PURGE_DMA_STATUS_MASK) ==</div><div class='ctx'> 			 MFC_CNTL_PURGE_DMA_COMPLETE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -622,12 +623,17 @@ static inline void save_ppuint_mb(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> static inline void save_ch_part1(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_priv2 __iomem *priv2 = spu-&gt;priv2;</div><div class='del'>-	u64 idx, ch_indices[7] = { 0UL, 1UL, 3UL, 4UL, 24UL, 25UL, 27UL };</div><div class='add'>+	u64 idx, ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Save, Step 42:</div><div class='del'>-	 *     Save the following CH: [0,1,3,4,24,25,27]</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	/* Save CH 1, without channel count */</div><div class='add'>+	out_be64(&amp;priv2-&gt;spu_chnlcntptr_RW, 1);</div><div class='add'>+	csa-&gt;spu_chnldata_RW[1] = in_be64(&amp;priv2-&gt;spu_chnldata_RW);</div><div class='add'>+</div><div class='add'>+	/* Save the following CH: [0,3,4,24,25,27] */</div><div class='ctx'> 	for (i = 0; i &lt; 7; i++) {</div><div class='ctx'> 		idx = ch_indices[i];</div><div class='ctx'> 		out_be64(&amp;priv2-&gt;spu_chnlcntptr_RW, idx);</div><div class='hunk'>@@ -718,13 +724,15 @@ static inline void invalidate_slbs(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> </div><div class='ctx'> static inline void get_kernel_slb(u64 ea, u64 slb[2])</div><div class='ctx'> {</div><div class='del'>-	slb[0] = (get_kernel_vsid(ea) &lt;&lt; SLB_VSID_SHIFT) | SLB_VSID_KERNEL;</div><div class='del'>-	slb[1] = (ea &amp; ESID_MASK) | SLB_ESID_V;</div><div class='add'>+	u64 llp;</div><div class='ctx'> </div><div class='del'>-	/* Large pages are used for kernel text/data, but not vmalloc.  */</div><div class='del'>-	if (cpu_has_feature(CPU_FTR_16M_PAGE)</div><div class='del'>-	    &amp;&amp; REGION_ID(ea) == KERNEL_REGION_ID)</div><div class='del'>-		slb[0] |= SLB_VSID_L;</div><div class='add'>+	if (REGION_ID(ea) == KERNEL_REGION_ID)</div><div class='add'>+		llp = mmu_psize_defs[mmu_linear_psize].sllp;</div><div class='add'>+	else</div><div class='add'>+		llp = mmu_psize_defs[mmu_virtual_psize].sllp;</div><div class='add'>+	slb[0] = (get_kernel_vsid(ea) &lt;&lt; SLB_VSID_SHIFT) |</div><div class='add'>+		SLB_VSID_KERNEL | llp;</div><div class='add'>+	slb[1] = (ea &amp; ESID_MASK) | SLB_ESID_V;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void load_mfc_slb(struct spu *spu, u64 slb[2], int slbe)</div><div class='hunk'>@@ -1020,7 +1028,8 @@ static inline void wait_suspend_mfc_complete(struct spu_state *csa,</div><div class='ctx'> 	 * Restore, Step 47.</div><div class='ctx'> 	 *     Poll MFC_CNTL[Ss] until 11 is returned.</div><div class='ctx'> 	 */</div><div class='del'>-	POLL_WHILE_FALSE(in_be64(&amp;priv2-&gt;mfc_control_RW) &amp;</div><div class='add'>+	POLL_WHILE_FALSE((in_be64(&amp;priv2-&gt;mfc_control_RW) &amp;</div><div class='add'>+			 MFC_CNTL_SUSPEND_DMA_STATUS_MASK) ==</div><div class='ctx'> 			 MFC_CNTL_SUSPEND_COMPLETE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1103,13 +1112,18 @@ static inline void clear_spu_status(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> static inline void reset_ch_part1(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_priv2 __iomem *priv2 = spu-&gt;priv2;</div><div class='del'>-	u64 ch_indices[7] = { 0UL, 1UL, 3UL, 4UL, 24UL, 25UL, 27UL };</div><div class='add'>+	u64 ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };</div><div class='ctx'> 	u64 idx;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Restore, Step 20:</div><div class='del'>-	 *     Reset the following CH: [0,1,3,4,24,25,27]</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	/* Reset CH 1 */</div><div class='add'>+	out_be64(&amp;priv2-&gt;spu_chnlcntptr_RW, 1);</div><div class='add'>+	out_be64(&amp;priv2-&gt;spu_chnldata_RW, 0UL);</div><div class='add'>+</div><div class='add'>+	/* Reset the following CH: [0,3,4,24,25,27] */</div><div class='ctx'> 	for (i = 0; i &lt; 7; i++) {</div><div class='ctx'> 		idx = ch_indices[i];</div><div class='ctx'> 		out_be64(&amp;priv2-&gt;spu_chnlcntptr_RW, idx);</div><div class='hunk'>@@ -1570,12 +1584,17 @@ static inline void restore_decr_wrapped(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)</div><div class='ctx'> {</div><div class='ctx'> 	struct spu_priv2 __iomem *priv2 = spu-&gt;priv2;</div><div class='del'>-	u64 idx, ch_indices[7] = { 0UL, 1UL, 3UL, 4UL, 24UL, 25UL, 27UL };</div><div class='add'>+	u64 idx, ch_indices[7] = { 0UL, 3UL, 4UL, 24UL, 25UL, 27UL };</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Restore, Step 59:</div><div class='del'>-	 *     Restore the following CH: [0,1,3,4,24,25,27]</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	/* Restore CH 1 without count */</div><div class='add'>+	out_be64(&amp;priv2-&gt;spu_chnlcntptr_RW, 1);</div><div class='add'>+	out_be64(&amp;priv2-&gt;spu_chnldata_RW, csa-&gt;spu_chnldata_RW[1]);</div><div class='add'>+</div><div class='add'>+	/* Restore the following CH: [0,3,4,24,25,27] */</div><div class='ctx'> 	for (i = 0; i &lt; 7; i++) {</div><div class='ctx'> 		idx = ch_indices[i];</div><div class='ctx'> 		out_be64(&amp;priv2-&gt;spu_chnlcntptr_RW, idx);</div><div class='hunk'>@@ -2074,6 +2093,7 @@ int spu_save(struct spu_state *prev, struct spu *spu)</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_save);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * spu_restore - SPU context restore, with harvest and locking.</div><div class='hunk'>@@ -2081,7 +2101,7 @@ int spu_save(struct spu_state *prev, struct spu *spu)</div><div class='ctx'>  * @spu: pointer to SPU iomem structure.</div><div class='ctx'>  *</div><div class='ctx'>  * Perform harvest + restore, as we may not be coming</div><div class='del'>- * from a previous succesful save operation, and the</div><div class='add'>+ * from a previous successful save operation, and the</div><div class='ctx'>  * hardware state is unknown.</div><div class='ctx'>  */</div><div class='ctx'> int spu_restore(struct spu_state *new, struct spu *spu)</div><div class='hunk'>@@ -2090,7 +2110,6 @@ int spu_restore(struct spu_state *new, struct spu *spu)</div><div class='ctx'> </div><div class='ctx'> 	acquire_spu_lock(spu);</div><div class='ctx'> 	harvest(NULL, spu);</div><div class='del'>-	spu-&gt;stop_code = 0;</div><div class='ctx'> 	spu-&gt;dar = 0;</div><div class='ctx'> 	spu-&gt;dsisr = 0;</div><div class='ctx'> 	spu-&gt;slb_replace = 0;</div><div class='hunk'>@@ -2103,6 +2122,7 @@ int spu_restore(struct spu_state *new, struct spu *spu)</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_restore);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * spu_harvest - SPU harvest (reset) operation</div><div class='hunk'>@@ -2125,6 +2145,7 @@ static void init_prob(struct spu_state *csa)</div><div class='ctx'> 	csa-&gt;spu_chnlcnt_RW[28] = 1;</div><div class='ctx'> 	csa-&gt;spu_chnlcnt_RW[30] = 1;</div><div class='ctx'> 	csa-&gt;prob.spu_runcntl_RW = SPU_RUNCNTL_STOP;</div><div class='add'>+	csa-&gt;prob.mb_stat_R = 0x000400;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_priv1(struct spu_state *csa)</div><div class='hunk'>@@ -2183,7 +2204,7 @@ void spu_init_csa(struct spu_state *csa)</div><div class='ctx'> </div><div class='ctx'> 	memset(lscsa, 0, sizeof(struct spu_lscsa));</div><div class='ctx'> 	csa-&gt;lscsa = lscsa;</div><div class='del'>-	csa-&gt;register_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+	spin_lock_init(&amp;csa-&gt;register_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Set LS pages reserved to allow for user-space mapping. */</div><div class='ctx'> 	for (p = lscsa-&gt;ls; p &lt; lscsa-&gt;ls + LS_SIZE; p += PAGE_SIZE)</div><div class='hunk'>@@ -2193,6 +2214,7 @@ void spu_init_csa(struct spu_state *csa)</div><div class='ctx'> 	init_priv1(csa);</div><div class='ctx'> 	init_priv2(csa);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_init_csa);</div><div class='ctx'> </div><div class='ctx'> void spu_fini_csa(struct spu_state *csa)</div><div class='ctx'> {</div><div class='hunk'>@@ -2203,3 +2225,4 @@ void spu_fini_csa(struct spu_state *csa)</div><div class='ctx'> </div><div class='ctx'> 	vfree(csa-&gt;lscsa);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(spu_fini_csa);</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c<br/>index ac224876ce59..6802cdc3168a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/chrp/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/chrp/pci.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * CHRP pci routines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -19,7 +18,6 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='del'>-#include &lt;asm/open_pic.h&gt;</div><div class='ctx'> #include &lt;asm/grackle.h&gt;</div><div class='ctx'> #include &lt;asm/rtas.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +141,7 @@ hydra_init(void)</div><div class='ctx'> 	if (np == NULL || of_address_to_resource(np, 0, &amp;r))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	Hydra = ioremap(r.start, r.end-r.start);</div><div class='del'>-	printk("Hydra Mac I/O at %lx\n", r.start);</div><div class='add'>+	printk("Hydra Mac I/O at %llx\n", (unsigned long long)r.start);</div><div class='ctx'> 	printk("Hydra Feature_Control was %x",</div><div class='ctx'> 	       in_le32(&amp;Hydra-&gt;Feature_Control));</div><div class='ctx'> 	out_le32(&amp;Hydra-&gt;Feature_Control, (HYDRA_FC_SCC_CELL_EN |</div><div class='hunk'>@@ -162,15 +160,9 @@ void __init</div><div class='ctx'> chrp_pcibios_fixup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = NULL;</div><div class='del'>-	struct device_node *np;</div><div class='ctx'> </div><div class='del'>-	/* PCI interrupts are controlled by the OpenPIC */</div><div class='del'>-	for_each_pci_dev(dev) {</div><div class='del'>-		np = pci_device_to_OF_node(dev);</div><div class='del'>-		if ((np != 0) &amp;&amp; (np-&gt;n_intrs &gt; 0) &amp;&amp; (np-&gt;intrs[0].line != 0))</div><div class='del'>-			dev-&gt;irq = np-&gt;intrs[0].line;</div><div class='del'>-		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev-&gt;irq);</div><div class='del'>-	}</div><div class='add'>+	for_each_pci_dev(dev)</div><div class='add'>+		pci_read_irq_line(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PRG_CL_RESET_VALID 0x00010000</div><div class='hunk'>@@ -267,7 +259,7 @@ chrp_find_bridges(void)</div><div class='ctx'> 			       bus_range[0], bus_range[1]);</div><div class='ctx'> 		printk(" controlled by %s", dev-&gt;type);</div><div class='ctx'> 		if (!is_longtrail)</div><div class='del'>-			printk(" at %lx", r.start);</div><div class='add'>+			printk(" at %llx", (unsigned long long)r.start);</div><div class='ctx'> 		printk("\n");</div><div class='ctx'> </div><div class='ctx'> 		hose = pcibios_alloc_controller();</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c<br/>index 18d89f38796b..538e337d63e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/chrp/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/chrp/setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * bootup setup stuff..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -25,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/adb.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -60,7 +59,7 @@ void rtas_indicator_progress(char *, unsigned short);</div><div class='ctx'> int _chrp_type;</div><div class='ctx'> EXPORT_SYMBOL(_chrp_type);</div><div class='ctx'> </div><div class='del'>-struct mpic *chrp_mpic;</div><div class='add'>+static struct mpic *chrp_mpic;</div><div class='ctx'> </div><div class='ctx'> /* Used for doing CHRP event-scans */</div><div class='ctx'> DEFINE_PER_CPU(struct timer_list, heartbeat_timer);</div><div class='hunk'>@@ -316,24 +315,32 @@ chrp_event_scan(unsigned long unused)</div><div class='ctx'> 		  jiffies + event_scan_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc,</div><div class='add'>+			      struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int cascade_irq = i8259_irq(regs);</div><div class='add'>+	if (cascade_irq != NO_IRQ)</div><div class='add'>+		generic_handle_irq(cascade_irq, regs);</div><div class='add'>+	desc-&gt;chip-&gt;eoi(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Finds the open-pic node and sets up the mpic driver.</div><div class='ctx'>  */</div><div class='ctx'> static void __init chrp_find_openpic(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np, *root;</div><div class='del'>-	int len, i, j, irq_count;</div><div class='add'>+	int len, i, j;</div><div class='ctx'> 	int isu_size, idu_size;</div><div class='ctx'> 	unsigned int *iranges, *opprop = NULL;</div><div class='ctx'> 	int oplen = 0;</div><div class='ctx'> 	unsigned long opaddr;</div><div class='ctx'> 	int na = 1;</div><div class='del'>-	unsigned char init_senses[NR_IRQS - NUM_8259_INTERRUPTS];</div><div class='ctx'> </div><div class='del'>-	np = find_type_devices("open-pic");</div><div class='add'>+	np = of_find_node_by_type(NULL, "open-pic");</div><div class='ctx'> 	if (np == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	root = find_path_device("/");</div><div class='add'>+	root = of_find_node_by_path("/");</div><div class='ctx'> 	if (root) {</div><div class='ctx'> 		opprop = (unsigned int *) get_property</div><div class='ctx'> 			(root, "platform-open-pic", &amp;oplen);</div><div class='hunk'>@@ -344,19 +351,15 @@ static void __init chrp_find_openpic(void)</div><div class='ctx'> 		oplen /= na * sizeof(unsigned int);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct resource r;</div><div class='del'>-		if (of_address_to_resource(np, 0, &amp;r))</div><div class='del'>-			return;</div><div class='add'>+		if (of_address_to_resource(np, 0, &amp;r)) {</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='ctx'> 		opaddr = r.start;</div><div class='ctx'> 		oplen = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "OpenPIC at %lx\n", opaddr);</div><div class='ctx'> </div><div class='del'>-	irq_count = NR_IRQS - NUM_ISA_INTERRUPTS - 4; /* leave room for IPIs */</div><div class='del'>-	prom_get_irq_senses(init_senses, NUM_ISA_INTERRUPTS, NR_IRQS - 4);</div><div class='del'>-	/* i8259 cascade is always positive level */</div><div class='del'>-	init_senses[0] = IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE;</div><div class='del'>-</div><div class='ctx'> 	iranges = (unsigned int *) get_property(np, "interrupt-ranges", &amp;len);</div><div class='ctx'> 	if (iranges == NULL)</div><div class='ctx'> 		len = 0;	/* non-distributed mpic */</div><div class='hunk'>@@ -383,15 +386,12 @@ static void __init chrp_find_openpic(void)</div><div class='ctx'> 	if (len &gt; 1)</div><div class='ctx'> 		isu_size = iranges[3];</div><div class='ctx'> </div><div class='del'>-	chrp_mpic = mpic_alloc(opaddr, MPIC_PRIMARY,</div><div class='del'>-			       isu_size, NUM_ISA_INTERRUPTS, irq_count,</div><div class='del'>-			       NR_IRQS - 4, init_senses, irq_count,</div><div class='del'>-			       " MPIC    ");</div><div class='add'>+	chrp_mpic = mpic_alloc(np, opaddr, MPIC_PRIMARY,</div><div class='add'>+			       isu_size, 0, " MPIC    ");</div><div class='ctx'> 	if (chrp_mpic == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to allocate MPIC structure\n");</div><div class='del'>-		return;</div><div class='add'>+		goto bail;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	j = na - 1;</div><div class='ctx'> 	for (i = 1; i &lt; len; ++i) {</div><div class='ctx'> 		iranges += 2;</div><div class='hunk'>@@ -403,7 +403,10 @@ static void __init chrp_find_openpic(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mpic_init(chrp_mpic);</div><div class='del'>-	mpic_setup_cascade(NUM_ISA_INTERRUPTS, i8259_irq_cascade, NULL);</div><div class='add'>+	ppc_md.get_irq = mpic_get_irq;</div><div class='add'>+ bail:</div><div class='add'>+	of_node_put(root);</div><div class='add'>+	of_node_put(np);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_INPUT_ADBHID) &amp;&amp; defined(XMON)</div><div class='hunk'>@@ -414,14 +417,34 @@ static struct irqaction xmon_irqaction = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void __init chrp_init_IRQ(void)</div><div class='add'>+static void __init chrp_find_8259(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='add'>+	struct device_node *np, *pic = NULL;</div><div class='ctx'> 	unsigned long chrp_int_ack = 0;</div><div class='del'>-#if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_INPUT_ADBHID) &amp;&amp; defined(XMON)</div><div class='del'>-	struct device_node *kbd;</div><div class='del'>-#endif</div><div class='add'>+	unsigned int cascade_irq;</div><div class='add'>+</div><div class='add'>+	/* Look for cascade */</div><div class='add'>+	for_each_node_by_type(np, "interrupt-controller")</div><div class='add'>+		if (device_is_compatible(np, "chrp,iic")) {</div><div class='add'>+			pic = np;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	/* Ok, 8259 wasn't found. We need to handle the case where</div><div class='add'>+	 * we have a pegasos that claims to be chrp but doesn't have</div><div class='add'>+	 * a proper interrupt tree</div><div class='add'>+	 */</div><div class='add'>+	if (pic == NULL &amp;&amp; chrp_mpic != NULL) {</div><div class='add'>+		printk(KERN_ERR "i8259: Not found in device-tree"</div><div class='add'>+		       " assuming no legacy interrupts\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* Look for intack. In a perfect world, we would look for it on</div><div class='add'>+	 * the ISA bus that holds the 8259 but heh... Works that way. If</div><div class='add'>+	 * we ever see a problem, we can try to re-use the pSeries code here.</div><div class='add'>+	 * Also, Pegasos-type platforms don't have a proper node to start</div><div class='add'>+	 * from anyway</div><div class='add'>+	 */</div><div class='ctx'> 	for (np = find_devices("pci"); np != NULL; np = np-&gt;next) {</div><div class='ctx'> 		unsigned int *addrp = (unsigned int *)</div><div class='ctx'> 			get_property(np, "8259-interrupt-acknowledge", NULL);</div><div class='hunk'>@@ -432,11 +455,29 @@ void __init chrp_init_IRQ(void)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (np == NULL)</div><div class='del'>-		printk(KERN_ERR "Cannot find PCI interrupt acknowledge address\n");</div><div class='add'>+		printk(KERN_WARNING "Cannot find PCI interrupt acknowledge"</div><div class='add'>+		       " address, polling\n");</div><div class='add'>+</div><div class='add'>+	i8259_init(pic, chrp_int_ack);</div><div class='add'>+	if (ppc_md.get_irq == NULL)</div><div class='add'>+		ppc_md.get_irq = i8259_irq;</div><div class='add'>+	if (chrp_mpic != NULL) {</div><div class='add'>+		cascade_irq = irq_of_parse_and_map(pic, 0);</div><div class='add'>+		if (cascade_irq == NO_IRQ)</div><div class='add'>+			printk(KERN_ERR "i8259: failed to map cascade irq\n");</div><div class='add'>+		else</div><div class='add'>+			set_irq_chained_handler(cascade_irq,</div><div class='add'>+						chrp_8259_cascade);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+void __init chrp_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+#if defined(CONFIG_VT) &amp;&amp; defined(CONFIG_INPUT_ADBHID) &amp;&amp; defined(XMON)</div><div class='add'>+	struct device_node *kbd;</div><div class='add'>+#endif</div><div class='ctx'> 	chrp_find_openpic();</div><div class='del'>-</div><div class='del'>-	i8259_init(chrp_int_ack, 0);</div><div class='add'>+	chrp_find_8259();</div><div class='ctx'> </div><div class='ctx'> 	if (_chrp_type == _CHRP_Pegasos)</div><div class='ctx'> 		ppc_md.get_irq        = i8259_irq;</div><div class='hunk'>@@ -521,10 +562,6 @@ static int __init chrp_probe(void)</div><div class='ctx'> 	DMA_MODE_READ = 0x44;</div><div class='ctx'> 	DMA_MODE_WRITE = 0x48;</div><div class='ctx'> 	isa_io_base = CHRP_ISA_IO_BASE;		/* default value */</div><div class='del'>-	ppc_do_canonicalize_irqs = 1;</div><div class='del'>-</div><div class='del'>-	/* Assume we have an 8259... */</div><div class='del'>-	__irq_offset_value = NUM_ISA_INTERRUPTS;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -536,7 +573,6 @@ define_machine(chrp) {</div><div class='ctx'> 	.init			= chrp_init2,</div><div class='ctx'> 	.show_cpuinfo		= chrp_show_cpuinfo,</div><div class='ctx'> 	.init_IRQ		= chrp_init_IRQ,</div><div class='del'>-	.get_irq		= mpic_get_irq,</div><div class='ctx'> 	.pcibios_fixup		= chrp_pcibios_fixup,</div><div class='ctx'> 	.restart		= rtas_restart,</div><div class='ctx'> 	.power_off		= rtas_power_off,</div><div class='head'>diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c<br/>index b616053bc331..1d2307e87c30 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/chrp/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/chrp/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/chrp/smp.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -30,7 +29,6 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/residual.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='del'>-#include &lt;asm/open_pic.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/mpic.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig<br/>index 4fdbc9ae876b..ba07a9a7c039 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/embedded6xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/embedded6xx/Kconfig</a></div><div class='hunk'>@@ -74,6 +74,16 @@ config SANDPOINT</div><div class='ctx'> 	  Select SANDPOINT if configuring for a Motorola Sandpoint X3</div><div class='ctx'> 	  (any flavor).</div><div class='ctx'> </div><div class='add'>+config MPC7448HPC2</div><div class='add'>+	bool "Freescale MPC7448HPC2(Taiga)"</div><div class='add'>+	select TSI108_BRIDGE</div><div class='add'>+	select DEFAULT_UIMAGE</div><div class='add'>+	select PPC_UDBG_16550</div><div class='add'>+	select MPIC</div><div class='add'>+	help</div><div class='add'>+	  Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)</div><div class='add'>+	  platform</div><div class='add'>+</div><div class='ctx'> config RADSTONE_PPC7D</div><div class='ctx'> 	bool "Radstone Technology PPC7D board"</div><div class='ctx'> 	select PPC_I8259</div><div class='hunk'>@@ -221,6 +231,11 @@ config MV64X60</div><div class='ctx'> 	select PPC_INDIRECT_PCI</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config TSI108_BRIDGE</div><div class='add'>+	bool</div><div class='add'>+	depends on MPC7448HPC2</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> menu "Set bridge options"</div><div class='ctx'> 	depends on MV64X60</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile<br/>new file mode 100644<br/>index 000000000000..fa499fe59291<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/embedded6xx/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the 6xx/7xx/7xxxx linux kernel.</div><div class='add'>+#</div><div class='add'>+obj-$(CONFIG_MPC7448HPC2)	+= mpc7448_hpc2.o</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c<br/>new file mode 100644<br/>index 000000000000..d7a4fc7ca238<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c</a></div><div class='hunk'>@@ -0,0 +1,335 @@</div><div class='add'>+/*</div><div class='add'>+ * mpc7448_hpc2.c</div><div class='add'>+ *</div><div class='add'>+ * Board setup routines for the Freescale Taiga platform</div><div class='add'>+ *</div><div class='add'>+ * Author: Jacob Pan</div><div class='add'>+ *	 jacob.pan@freescale.com</div><div class='add'>+ * Author: Xianghua Xiao</div><div class='add'>+ *       x.xiao@freescale.com</div><div class='add'>+ * Maintainer: Roy Zang &lt;tie-fei.zang@freescale.com&gt;</div><div class='add'>+ * 	Add Flat Device Tree support fot mpc7448hpc2 board</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2004-2006 Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2.  This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/ide.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/root_dev.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+#include &lt;asm/tsi108.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/reg.h&gt;</div><div class='add'>+#include &lt;mm/mmu_decl.h&gt;</div><div class='add'>+#include "mpc7448_hpc2.h"</div><div class='add'>+#include &lt;asm/tsi108_irq.h&gt;</div><div class='add'>+#include &lt;asm/mpic.h&gt;</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG(fmt...) do { printk(fmt); } while(0)</div><div class='add'>+#else</div><div class='add'>+#define DBG(fmt...) do { } while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_PCI</div><div class='add'>+isa_io_base = MPC7448_HPC2_ISA_IO_BASE;</div><div class='add'>+isa_mem_base = MPC7448_HPC2_ISA_MEM_BASE;</div><div class='add'>+pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern int tsi108_setup_pci(struct device_node *dev);</div><div class='add'>+extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);</div><div class='add'>+extern void tsi108_pci_int_init(void);</div><div class='add'>+extern int tsi108_irq_cascade(struct pt_regs *regs, void *unused);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define all of the IRQ senses and polarities.  Taken from the</div><div class='add'>+ * mpc7448hpc  manual.</div><div class='add'>+ * Note:  Likely, this table and the following function should be</div><div class='add'>+ *        obtained and derived from the OF Device Tree.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u_char mpc7448_hpc2_pic_initsenses[] __initdata = {</div><div class='add'>+	/* External on-board sources */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* INT[0] XINT0 from FPGA */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* INT[1] XINT1 from FPGA */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* INT[2] PHY_INT from both GIGE */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* INT[3] RESERVED */</div><div class='add'>+	/* Internal Tsi108/109 interrupt sources */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Reserved IRQ */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Reserved IRQ */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Reserved IRQ */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Reserved IRQ */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* DMA0 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* DMA1 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* DMA2 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* DMA3 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* UART0 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* UART1 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* I2C */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* GPIO */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* GIGE0 */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* GIGE1 */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Reserved IRQ */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* HLP */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* SDC */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Processor IF */</div><div class='add'>+	(IRQ_SENSE_EDGE  | IRQ_POLARITY_POSITIVE),	/* Reserved IRQ */</div><div class='add'>+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),	/* PCI/X block */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)</div><div class='add'>+{</div><div class='add'>+	if (bus == 0 &amp;&amp; PCI_SLOT(devfn) == 0)</div><div class='add'>+		return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+	else</div><div class='add'>+		return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * find pci slot by devfn in interrupt map of OF tree</div><div class='add'>+ */</div><div class='add'>+u8 find_slot_by_devfn(unsigned int *interrupt_map, unsigned int devfn)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	for (i = 0; i &lt; 4; i++){</div><div class='add'>+		tmp = interrupt_map[i*4*7];</div><div class='add'>+		if ((tmp &gt;&gt; 11) == (devfn &gt;&gt; 3))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scans the interrupt map for pci device</div><div class='add'>+ */</div><div class='add'>+void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_controller *hose;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	unsigned int *interrupt;</div><div class='add'>+	int busnr;</div><div class='add'>+	int len;</div><div class='add'>+	u8 slot;</div><div class='add'>+	u8 pin;</div><div class='add'>+</div><div class='add'>+	/* Lookup the hose */</div><div class='add'>+	busnr = dev-&gt;bus-&gt;number;</div><div class='add'>+	hose = pci_bus_to_hose(busnr);</div><div class='add'>+	if (!hose)</div><div class='add'>+		printk(KERN_ERR "No pci hose found\n");</div><div class='add'>+</div><div class='add'>+	/* Check it has an OF node associated */</div><div class='add'>+	node = (struct device_node *) hose-&gt;arch_data;</div><div class='add'>+	if (!node)</div><div class='add'>+		printk(KERN_ERR "No pci node found\n");</div><div class='add'>+</div><div class='add'>+	interrupt = (unsigned int *) get_property(node, "interrupt-map", &amp;len);</div><div class='add'>+	slot = find_slot_by_devfn(interrupt, dev-&gt;devfn);</div><div class='add'>+	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &amp;pin);</div><div class='add'>+	if (pin == 0 || pin &gt; 4)</div><div class='add'>+		pin = 1;</div><div class='add'>+	pin--;</div><div class='add'>+	dev-&gt;irq  = interrupt[slot*4*7 + pin*7 + 5];</div><div class='add'>+	DBG("TSI_PCI: dev-&gt;irq = 0x%x\n", dev-&gt;irq);</div><div class='add'>+}</div><div class='add'>+/* temporary pci irq map fixup*/</div><div class='add'>+</div><div class='add'>+void __init mpc7448_hpc2_pcibios_fixup(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='add'>+	for_each_pci_dev(dev) {</div><div class='add'>+		mpc7448_hpc2_fixup_irq(dev);</div><div class='add'>+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init mpc7448_hpc2_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *cpu;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("mpc7448_hpc2_setup_arch():set_bridge", 0);</div><div class='add'>+</div><div class='add'>+	cpu = of_find_node_by_type(NULL, "cpu");</div><div class='add'>+	if (cpu != 0) {</div><div class='add'>+		unsigned int *fp;</div><div class='add'>+</div><div class='add'>+		fp = (int *)get_property(cpu, "clock-frequency", NULL);</div><div class='add'>+		if (fp != 0)</div><div class='add'>+			loops_per_jiffy = *fp / HZ;</div><div class='add'>+		else</div><div class='add'>+			loops_per_jiffy = 50000000 / HZ;</div><div class='add'>+		of_node_put(cpu);</div><div class='add'>+	}</div><div class='add'>+	tsi108_csr_vir_base = get_vir_csrbase();</div><div class='add'>+</div><div class='add'>+#ifdef	CONFIG_ROOT_NFS</div><div class='add'>+	ROOT_DEV = Root_NFS;</div><div class='add'>+#else</div><div class='add'>+	ROOT_DEV = Root_HDA1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	ROOT_DEV = Root_RAM0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* setup PCI host bridge */</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)</div><div class='add'>+		tsi108_setup_pci(np);</div><div class='add'>+</div><div class='add'>+	ppc_md.pci_exclude_device = mpc7448_hpc2_exclude_device;</div><div class='add'>+	if (ppc_md.progress)</div><div class='add'>+		ppc_md.progress("tsi108: resources set", 0x100);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "MPC7448HPC2 (TAIGA) Platform\n");</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "Jointly ported by Freescale and Tundra Semiconductor\n");</div><div class='add'>+	printk(KERN_INFO</div><div class='add'>+	       "Enabling L2 cache then enabling the HID0 prefetch engine.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt setup and service.  Interrrupts on the mpc7448_hpc2 come</div><div class='add'>+ * from the four external INT pins, PCI interrupts are routed via</div><div class='add'>+ * PCI interrupt control registers, it generates internal IRQ23</div><div class='add'>+ *</div><div class='add'>+ * Interrupt routing on the Taiga Board:</div><div class='add'>+ * TSI108:PB_INT[0] -&gt; CPU0:INT#</div><div class='add'>+ * TSI108:PB_INT[1] -&gt; CPU0:MCP#</div><div class='add'>+ * TSI108:PB_INT[2] -&gt; N/C</div><div class='add'>+ * TSI108:PB_INT[3] -&gt; N/C</div><div class='add'>+ */</div><div class='add'>+static void __init mpc7448_hpc2_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic;</div><div class='add'>+	phys_addr_t mpic_paddr = 0;</div><div class='add'>+	struct device_node *tsi_pic;</div><div class='add'>+</div><div class='add'>+	tsi_pic = of_find_node_by_type(NULL, "open-pic");</div><div class='add'>+	if (tsi_pic) {</div><div class='add'>+		unsigned int size;</div><div class='add'>+		void *prop = get_property(tsi_pic, "reg", &amp;size);</div><div class='add'>+		mpic_paddr = of_translate_address(tsi_pic, prop);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mpic_paddr == 0) {</div><div class='add'>+		printk("%s: No tsi108 PIC found !\n", __FUNCTION__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG("%s: tsi108pic phys_addr = 0x%x\n", __FUNCTION__,</div><div class='add'>+	    (u32) mpic_paddr);</div><div class='add'>+</div><div class='add'>+	mpic = mpic_alloc(mpic_paddr,</div><div class='add'>+			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |</div><div class='add'>+			MPIC_SPV_EOI | MPIC_MOD_ID(MPIC_ID_TSI108),</div><div class='add'>+			0, /* num_sources used */</div><div class='add'>+			TSI108_IRQ_BASE,</div><div class='add'>+			0, /* num_sources used */</div><div class='add'>+			NR_IRQS - 4 /* XXXX */,</div><div class='add'>+			mpc7448_hpc2_pic_initsenses,</div><div class='add'>+			sizeof(mpc7448_hpc2_pic_initsenses), "Tsi108_PIC");</div><div class='add'>+</div><div class='add'>+	BUG_ON(mpic == NULL); /* XXXX */</div><div class='add'>+</div><div class='add'>+	mpic_init(mpic);</div><div class='add'>+	mpic_setup_cascade(IRQ_TSI108_PCI, tsi108_irq_cascade, mpic);</div><div class='add'>+	tsi108_pci_int_init();</div><div class='add'>+</div><div class='add'>+	/* Configure MPIC outputs to CPU0 */</div><div class='add'>+	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)</div><div class='add'>+{</div><div class='add'>+	seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");</div><div class='add'>+	seq_printf(m, "machine\t\t: MPC7448hpc2\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mpc7448_hpc2_restart(char *cmd)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	/* Set exception prefix high - to the firmware */</div><div class='add'>+	_nmask_and_or_msr(0, MSR_IP);</div><div class='add'>+</div><div class='add'>+	for (;;) ;		/* Spin until reset happens */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mpc7448_hpc2_power_off(void)</div><div class='add'>+{</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	for (;;) ;		/* No way to shut power off with software */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mpc7448_hpc2_halt(void)</div><div class='add'>+{</div><div class='add'>+	mpc7448_hpc2_power_off();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called very early, device-tree isn't unflattened</div><div class='add'>+ */</div><div class='add'>+static int __init mpc7448_hpc2_probe(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='add'>+</div><div class='add'>+	if (!of_flat_dt_is_compatible(root, "mpc74xx"))</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpc7448_machine_check_exception(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	extern void tsi108_clear_pci_cfg_error(void);</div><div class='add'>+	const struct exception_table_entry *entry;</div><div class='add'>+</div><div class='add'>+	/* Are we prepared to handle this fault */</div><div class='add'>+	if ((entry = search_exception_tables(regs-&gt;nip)) != NULL) {</div><div class='add'>+		tsi108_clear_pci_cfg_error();</div><div class='add'>+		regs-&gt;msr |= MSR_RI;</div><div class='add'>+		regs-&gt;nip = entry-&gt;fixup;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+define_machine(mpc7448_hpc2){</div><div class='add'>+	.name 			= "MPC7448 HPC2",</div><div class='add'>+	.probe 			= mpc7448_hpc2_probe,</div><div class='add'>+	.setup_arch 		= mpc7448_hpc2_setup_arch,</div><div class='add'>+	.init_IRQ 		= mpc7448_hpc2_init_IRQ,</div><div class='add'>+	.show_cpuinfo 		= mpc7448_hpc2_show_cpuinfo,</div><div class='add'>+	.get_irq 		= mpic_get_irq,</div><div class='add'>+	.pcibios_fixup 		= mpc7448_hpc2_pcibios_fixup,</div><div class='add'>+	.restart 		= mpc7448_hpc2_restart,</div><div class='add'>+	.calibrate_decr 	= generic_calibrate_decr,</div><div class='add'>+	.machine_check_exception= mpc7448_machine_check_exception,</div><div class='add'>+	.progress 		= udbg_progress,</div><div class='add'>+};</div><div class='head'>diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h<br/>new file mode 100644<br/>index 000000000000..a543a5242e34<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/*</div><div class='add'>+ * mpc7448_hpc2.h</div><div class='add'>+ *</div><div class='add'>+ * Definitions for Freescale MPC7448_HPC2 platform</div><div class='add'>+ *</div><div class='add'>+ * Author: Jacob Pan</div><div class='add'>+ *         jacob.pan@freescale.com</div><div class='add'>+ * Maintainer: Roy Zang &lt;roy.zang@freescale.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2006 (c) Freescale Semiconductor, Inc.  This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2.  This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H</div><div class='add'>+#define __PPC_PLATFORMS_MPC7448_HPC2_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ppcboot.h&gt;</div><div class='add'>+</div><div class='add'>+/* Base Addresses for the PCI bus</div><div class='add'>+ */</div><div class='add'>+#define MPC7448_HPC2_PCI_MEM_OFFSET	(0x00000000)</div><div class='add'>+#define MPC7448_HPC2_ISA_IO_BASE	(0x00000000)</div><div class='add'>+#define MPC7448_HPC2_ISA_MEM_BASE	(0x00000000)</div><div class='add'>+#endif				/* __PPC_PLATFORMS_MPC7448_HPC2_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile<br/>index ce8c0b943fa0..dee4eb4d8bec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/Makefile</a></div><div class='hunk'>@@ -1,9 +1,11 @@</div><div class='ctx'> EXTRA_CFLAGS	+= -mno-minimal-toc</div><div class='ctx'> </div><div class='del'>-obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \</div><div class='add'>+obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \</div><div class='ctx'> 	hvcall.o proc.o htab.o iommu.o misc.o irq.o</div><div class='ctx'> obj-$(CONFIG_PCI) += pci.o vpdinfo.o</div><div class='del'>-obj-$(CONFIG_IBMVIO) += vio.o</div><div class='ctx'> obj-$(CONFIG_SMP) += smp.o</div><div class='ctx'> obj-$(CONFIG_VIOPATH) += viopath.o</div><div class='ctx'> obj-$(CONFIG_MODULES) += ksyms.o</div><div class='add'>+</div><div class='add'>+$(obj)/dt_mod.o:	$(obj)/dt.o</div><div class='add'>+	@$(OBJCOPY) --rename-section .rodata.str1.8=.dt_strings $(obj)/dt.o $(obj)/dt_mod.o</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/call_pci.h b/arch/powerpc/platforms/iseries/call_pci.h<br/>index 59d4e0ad5cf3..dbdf69850ed9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/call_pci.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/call_pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/call_pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/call_pci.h</a></div><div class='hunk'>@@ -145,6 +145,25 @@ static inline u64 HvCallPci_configLoad16(u16 busNumber, u8 subBusNumber,</div><div class='ctx'> 	return retVal.rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u64 HvCallPci_configLoad32(u16 busNumber, u8 subBusNumber,</div><div class='add'>+		u8 deviceId, u32 offset, u32 *value)</div><div class='add'>+{</div><div class='add'>+	struct HvCallPci_DsaAddr dsa;</div><div class='add'>+	struct HvCallPci_LoadReturn retVal;</div><div class='add'>+</div><div class='add'>+	*((u64*)&amp;dsa) = 0;</div><div class='add'>+</div><div class='add'>+	dsa.busNumber = busNumber;</div><div class='add'>+	dsa.subBusNumber = subBusNumber;</div><div class='add'>+	dsa.deviceId = deviceId;</div><div class='add'>+</div><div class='add'>+	HvCall3Ret16(HvCallPciConfigLoad32, &amp;retVal, *(u64 *)&amp;dsa, offset, 0);</div><div class='add'>+</div><div class='add'>+	*value = retVal.value;</div><div class='add'>+</div><div class='add'>+	return retVal.rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u64 HvCallPci_configStore8(u16 busNumber, u8 subBusNumber,</div><div class='ctx'> 		u8 deviceId, u32 offset, u8 value)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c<br/>new file mode 100644<br/>index 000000000000..d194140c1ebf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/dt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/dt.c</a></div><div class='hunk'>@@ -0,0 +1,617 @@</div><div class='add'>+/*</div><div class='add'>+ *    Copyright (c) 2005-2006 Michael Ellerman, IBM Corporation</div><div class='add'>+ *</div><div class='add'>+ *    Description:</div><div class='add'>+ *      This file contains all the routines to build a flattened device</div><div class='add'>+ *      tree for a legacy iSeries machine.</div><div class='add'>+ *</div><div class='add'>+ *      This program is free software; you can redistribute it and/or</div><div class='add'>+ *      modify it under the terms of the GNU General Public License</div><div class='add'>+ *      as published by the Free Software Foundation; either version</div><div class='add'>+ *      2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci_regs.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/threads.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;	/* ETH_ALEN */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/lppaca.h&gt;</div><div class='add'>+#include &lt;asm/cputable.h&gt;</div><div class='add'>+#include &lt;asm/abs_addr.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/iseries/hv_types.h&gt;</div><div class='add'>+#include &lt;asm/iseries/hv_lp_config.h&gt;</div><div class='add'>+#include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='add'>+#include &lt;asm/iseries/it_exp_vpd_panel.h&gt;</div><div class='add'>+#include &lt;asm/udbg.h&gt;</div><div class='add'>+</div><div class='add'>+#include "processor_vpd.h"</div><div class='add'>+#include "call_hpt.h"</div><div class='add'>+#include "call_pci.h"</div><div class='add'>+#include "pci.h"</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG(fmt...) udbg_printf(fmt)</div><div class='add'>+#else</div><div class='add'>+#define DBG(fmt...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are created by the linker script at the start and end</div><div class='add'>+ * of the section containing all the strings from this file.</div><div class='add'>+ */</div><div class='add'>+extern char __dt_strings_start[];</div><div class='add'>+extern char __dt_strings_end[];</div><div class='add'>+</div><div class='add'>+struct iseries_flat_dt {</div><div class='add'>+	struct boot_param_header header;</div><div class='add'>+	u64 reserve_map[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void * __initdata dt_data;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Putting these strings here keeps them out of the section</div><div class='add'>+ * that we rename to .dt_strings using objcopy and capture</div><div class='add'>+ * for the strings blob of the flattened device tree.</div><div class='add'>+ */</div><div class='add'>+static char __initdata device_type_cpu[] = "cpu";</div><div class='add'>+static char __initdata device_type_memory[] = "memory";</div><div class='add'>+static char __initdata device_type_serial[] = "serial";</div><div class='add'>+static char __initdata device_type_network[] = "network";</div><div class='add'>+static char __initdata device_type_block[] = "block";</div><div class='add'>+static char __initdata device_type_byte[] = "byte";</div><div class='add'>+static char __initdata device_type_pci[] = "pci";</div><div class='add'>+static char __initdata device_type_vdevice[] = "vdevice";</div><div class='add'>+static char __initdata device_type_vscsi[] = "vscsi";</div><div class='add'>+</div><div class='add'>+static struct iseries_flat_dt * __init dt_init(void)</div><div class='add'>+{</div><div class='add'>+	struct iseries_flat_dt *dt;</div><div class='add'>+	unsigned long str_len;</div><div class='add'>+</div><div class='add'>+	str_len = __dt_strings_end - __dt_strings_start;</div><div class='add'>+	dt = (struct iseries_flat_dt *)ALIGN(klimit, 8);</div><div class='add'>+	dt-&gt;header.off_mem_rsvmap =</div><div class='add'>+		offsetof(struct iseries_flat_dt, reserve_map);</div><div class='add'>+	dt-&gt;header.off_dt_strings = ALIGN(sizeof(*dt), 8);</div><div class='add'>+	dt-&gt;header.off_dt_struct = dt-&gt;header.off_dt_strings</div><div class='add'>+		+ ALIGN(str_len, 8);</div><div class='add'>+	dt_data = (void *)((unsigned long)dt + dt-&gt;header.off_dt_struct);</div><div class='add'>+	dt-&gt;header.dt_strings_size = str_len;</div><div class='add'>+</div><div class='add'>+	/* There is no notion of hardware cpu id on iSeries */</div><div class='add'>+	dt-&gt;header.boot_cpuid_phys = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	memcpy((char *)dt + dt-&gt;header.off_dt_strings, __dt_strings_start,</div><div class='add'>+			str_len);</div><div class='add'>+</div><div class='add'>+	dt-&gt;header.magic = OF_DT_HEADER;</div><div class='add'>+	dt-&gt;header.version = 0x10;</div><div class='add'>+	dt-&gt;header.last_comp_version = 0x10;</div><div class='add'>+</div><div class='add'>+	dt-&gt;reserve_map[0] = 0;</div><div class='add'>+	dt-&gt;reserve_map[1] = 0;</div><div class='add'>+</div><div class='add'>+	return dt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_push_u32(struct iseries_flat_dt *dt, u32 value)</div><div class='add'>+{</div><div class='add'>+	*((u32 *)dt_data) = value;</div><div class='add'>+	dt_data += sizeof(u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef notyet</div><div class='add'>+static void __init dt_push_u64(struct iseries_flat_dt *dt, u64 value)</div><div class='add'>+{</div><div class='add'>+	*((u64 *)dt_data) = value;</div><div class='add'>+	dt_data += sizeof(u64);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init dt_push_bytes(struct iseries_flat_dt *dt, const char *data,</div><div class='add'>+		int len)</div><div class='add'>+{</div><div class='add'>+	memcpy(dt_data, data, len);</div><div class='add'>+	dt_data += ALIGN(len, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_start_node(struct iseries_flat_dt *dt, const char *name)</div><div class='add'>+{</div><div class='add'>+	dt_push_u32(dt, OF_DT_BEGIN_NODE);</div><div class='add'>+	dt_push_bytes(dt, name, strlen(name) + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define dt_end_node(dt) dt_push_u32(dt, OF_DT_END_NODE)</div><div class='add'>+</div><div class='add'>+static void __init dt_prop(struct iseries_flat_dt *dt, const char *name,</div><div class='add'>+		const void *data, int len)</div><div class='add'>+{</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	dt_push_u32(dt, OF_DT_PROP);</div><div class='add'>+</div><div class='add'>+	/* Length of the data */</div><div class='add'>+	dt_push_u32(dt, len);</div><div class='add'>+</div><div class='add'>+	offset = name - __dt_strings_start;</div><div class='add'>+</div><div class='add'>+	/* The offset of the properties name in the string blob. */</div><div class='add'>+	dt_push_u32(dt, (u32)offset);</div><div class='add'>+</div><div class='add'>+	/* The actual data. */</div><div class='add'>+	dt_push_bytes(dt, data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_prop_str(struct iseries_flat_dt *dt, const char *name,</div><div class='add'>+		const char *data)</div><div class='add'>+{</div><div class='add'>+	dt_prop(dt, name, data, strlen(data) + 1); /* + 1 for NULL */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_prop_u32(struct iseries_flat_dt *dt, const char *name,</div><div class='add'>+		u32 data)</div><div class='add'>+{</div><div class='add'>+	dt_prop(dt, name, &amp;data, sizeof(u32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef notyet</div><div class='add'>+static void __init dt_prop_u64(struct iseries_flat_dt *dt, const char *name,</div><div class='add'>+		u64 data)</div><div class='add'>+{</div><div class='add'>+	dt_prop(dt, name, &amp;data, sizeof(u64));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init dt_prop_u64_list(struct iseries_flat_dt *dt,</div><div class='add'>+		const char *name, u64 *data, int n)</div><div class='add'>+{</div><div class='add'>+	dt_prop(dt, name, data, sizeof(u64) * n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_prop_u32_list(struct iseries_flat_dt *dt,</div><div class='add'>+		const char *name, u32 *data, int n)</div><div class='add'>+{</div><div class='add'>+	dt_prop(dt, name, data, sizeof(u32) * n);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef notyet</div><div class='add'>+static void __init dt_prop_empty(struct iseries_flat_dt *dt, const char *name)</div><div class='add'>+{</div><div class='add'>+	dt_prop(dt, name, NULL, 0);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void __init dt_cpus(struct iseries_flat_dt *dt)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[32];</div><div class='add'>+	unsigned char *p;</div><div class='add'>+	unsigned int i, index;</div><div class='add'>+	struct IoHriProcessorVpd *d;</div><div class='add'>+	u32 pft_size[2];</div><div class='add'>+</div><div class='add'>+	/* yuck */</div><div class='add'>+	snprintf(buf, 32, "PowerPC,%s", cur_cpu_spec-&gt;cpu_name);</div><div class='add'>+	p = strchr(buf, ' ');</div><div class='add'>+	if (!p) p = buf + strlen(buf);</div><div class='add'>+</div><div class='add'>+	dt_start_node(dt, "cpus");</div><div class='add'>+	dt_prop_u32(dt, "#address-cells", 1);</div><div class='add'>+	dt_prop_u32(dt, "#size-cells", 0);</div><div class='add'>+</div><div class='add'>+	pft_size[0] = 0; /* NUMA CEC cookie, 0 for non NUMA  */</div><div class='add'>+	pft_size[1] = __ilog2(HvCallHpt_getHptPages() * HW_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_CPUS; i++) {</div><div class='add'>+		if (lppaca[i].dyn_proc_status &gt;= 2)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		snprintf(p, 32 - (p - buf), "@%d", i);</div><div class='add'>+		dt_start_node(dt, buf);</div><div class='add'>+</div><div class='add'>+		dt_prop_str(dt, "device_type", device_type_cpu);</div><div class='add'>+</div><div class='add'>+		index = lppaca[i].dyn_hv_phys_proc_index;</div><div class='add'>+		d = &amp;xIoHriProcessorVpd[index];</div><div class='add'>+</div><div class='add'>+		dt_prop_u32(dt, "i-cache-size", d-&gt;xInstCacheSize * 1024);</div><div class='add'>+		dt_prop_u32(dt, "i-cache-line-size", d-&gt;xInstCacheOperandSize);</div><div class='add'>+</div><div class='add'>+		dt_prop_u32(dt, "d-cache-size", d-&gt;xDataL1CacheSizeKB * 1024);</div><div class='add'>+		dt_prop_u32(dt, "d-cache-line-size", d-&gt;xDataCacheOperandSize);</div><div class='add'>+</div><div class='add'>+		/* magic conversions to Hz copied from old code */</div><div class='add'>+		dt_prop_u32(dt, "clock-frequency",</div><div class='add'>+			((1UL &lt;&lt; 34) * 1000000) / d-&gt;xProcFreq);</div><div class='add'>+		dt_prop_u32(dt, "timebase-frequency",</div><div class='add'>+			((1UL &lt;&lt; 32) * 1000000) / d-&gt;xTimeBaseFreq);</div><div class='add'>+</div><div class='add'>+		dt_prop_u32(dt, "reg", i);</div><div class='add'>+</div><div class='add'>+		dt_prop_u32_list(dt, "ibm,pft-size", pft_size, 2);</div><div class='add'>+</div><div class='add'>+		dt_end_node(dt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dt_end_node(dt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_model(struct iseries_flat_dt *dt)</div><div class='add'>+{</div><div class='add'>+	char buf[16] = "IBM,";</div><div class='add'>+</div><div class='add'>+	/* N.B. lparcfg.c knows about the "IBM," prefixes ... */</div><div class='add'>+	/* "IBM," + mfgId[2:3] + systemSerial[1:5] */</div><div class='add'>+	strne2a(buf + 4, xItExtVpdPanel.mfgID + 2, 2);</div><div class='add'>+	strne2a(buf + 6, xItExtVpdPanel.systemSerial + 1, 5);</div><div class='add'>+	buf[11] = '\0';</div><div class='add'>+	dt_prop_str(dt, "system-id", buf);</div><div class='add'>+</div><div class='add'>+	/* "IBM," + machineType[0:4] */</div><div class='add'>+	strne2a(buf + 4, xItExtVpdPanel.machineType, 4);</div><div class='add'>+	buf[8] = '\0';</div><div class='add'>+	dt_prop_str(dt, "model", buf);</div><div class='add'>+</div><div class='add'>+	dt_prop_str(dt, "compatible", "IBM,iSeries");</div><div class='add'>+	dt_prop_u32(dt, "ibm,partition-no", HvLpConfig_getLpIndex());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_do_vdevice(struct iseries_flat_dt *dt,</div><div class='add'>+		const char *name, u32 reg, int unit,</div><div class='add'>+		const char *type, const char *compat, int end)</div><div class='add'>+{</div><div class='add'>+	char buf[32];</div><div class='add'>+</div><div class='add'>+	snprintf(buf, 32, "%s@%08x", name, reg + ((unit &gt;= 0) ? unit : 0));</div><div class='add'>+	dt_start_node(dt, buf);</div><div class='add'>+	dt_prop_str(dt, "device_type", type);</div><div class='add'>+	if (compat)</div><div class='add'>+		dt_prop_str(dt, "compatible", compat);</div><div class='add'>+	dt_prop_u32(dt, "reg", reg + ((unit &gt;= 0) ? unit : 0));</div><div class='add'>+	if (unit &gt;= 0)</div><div class='add'>+		dt_prop_u32(dt, "linux,unit_address", unit);</div><div class='add'>+	if (end)</div><div class='add'>+		dt_end_node(dt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_vdevices(struct iseries_flat_dt *dt)</div><div class='add'>+{</div><div class='add'>+	u32 reg = 0;</div><div class='add'>+	HvLpIndexMap vlan_map;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dt_start_node(dt, "vdevice");</div><div class='add'>+	dt_prop_str(dt, "device_type", device_type_vdevice);</div><div class='add'>+	dt_prop_str(dt, "compatible", "IBM,iSeries-vdevice");</div><div class='add'>+	dt_prop_u32(dt, "#address-cells", 1);</div><div class='add'>+	dt_prop_u32(dt, "#size-cells", 0);</div><div class='add'>+</div><div class='add'>+	dt_do_vdevice(dt, "vty", reg, -1, device_type_serial, NULL, 1);</div><div class='add'>+	reg++;</div><div class='add'>+</div><div class='add'>+	dt_do_vdevice(dt, "v-scsi", reg, -1, device_type_vscsi,</div><div class='add'>+			"IBM,v-scsi", 1);</div><div class='add'>+	reg++;</div><div class='add'>+</div><div class='add'>+	vlan_map = HvLpConfig_getVirtualLanIndexMap();</div><div class='add'>+	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALLANS; i++) {</div><div class='add'>+		unsigned char mac_addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+		if ((vlan_map &amp; (0x8000 &gt;&gt; i)) == 0)</div><div class='add'>+			continue;</div><div class='add'>+		dt_do_vdevice(dt, "l-lan", reg, i, device_type_network,</div><div class='add'>+				"IBM,iSeries-l-lan", 0);</div><div class='add'>+		mac_addr[0] = 0x02;</div><div class='add'>+		mac_addr[1] = 0x01;</div><div class='add'>+		mac_addr[2] = 0xff;</div><div class='add'>+		mac_addr[3] = i;</div><div class='add'>+		mac_addr[4] = 0xff;</div><div class='add'>+		mac_addr[5] = HvLpConfig_getLpIndex_outline();</div><div class='add'>+		dt_prop(dt, "local-mac-address", (char *)mac_addr, ETH_ALEN);</div><div class='add'>+		dt_prop(dt, "mac-address", (char *)mac_addr, ETH_ALEN);</div><div class='add'>+		dt_prop_u32(dt, "max-frame-size", 9000);</div><div class='add'>+		dt_prop_u32(dt, "address-bits", 48);</div><div class='add'>+</div><div class='add'>+		dt_end_node(dt);</div><div class='add'>+	}</div><div class='add'>+	reg += HVMAXARCHITECTEDVIRTUALLANS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALDISKS; i++)</div><div class='add'>+		dt_do_vdevice(dt, "viodasd", reg, i, device_type_block,</div><div class='add'>+				"IBM,iSeries-viodasd", 1);</div><div class='add'>+	reg += HVMAXARCHITECTEDVIRTUALDISKS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALCDROMS; i++)</div><div class='add'>+		dt_do_vdevice(dt, "viocd", reg, i, device_type_block,</div><div class='add'>+				"IBM,iSeries-viocd", 1);</div><div class='add'>+	reg += HVMAXARCHITECTEDVIRTUALCDROMS;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALTAPES; i++)</div><div class='add'>+		dt_do_vdevice(dt, "viotape", reg, i, device_type_byte,</div><div class='add'>+				"IBM,iSeries-viotape", 1);</div><div class='add'>+</div><div class='add'>+	dt_end_node(dt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pci_class_name {</div><div class='add'>+	u16 code;</div><div class='add'>+	const char *name;</div><div class='add'>+	const char *type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_class_name __initdata pci_class_name[] = {</div><div class='add'>+	{ PCI_CLASS_NETWORK_ETHERNET, "ethernet", device_type_network },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_class_name * __init dt_find_pci_class_name(u16 class_code)</div><div class='add'>+{</div><div class='add'>+	struct pci_class_name *cp;</div><div class='add'>+</div><div class='add'>+	for (cp = pci_class_name;</div><div class='add'>+			cp &lt; &amp;pci_class_name[ARRAY_SIZE(pci_class_name)]; cp++)</div><div class='add'>+		if (cp-&gt;code == class_code)</div><div class='add'>+			return cp;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This assumes that the node slot is always on the primary bus!</div><div class='add'>+ */</div><div class='add'>+static void __init scan_bridge_slot(struct iseries_flat_dt *dt,</div><div class='add'>+		HvBusNumber bus, struct HvCallPci_BridgeInfo *bridge_info)</div><div class='add'>+{</div><div class='add'>+	HvSubBusNumber sub_bus = bridge_info-&gt;subBusNumber;</div><div class='add'>+	u16 vendor_id;</div><div class='add'>+	u16 device_id;</div><div class='add'>+	u32 class_id;</div><div class='add'>+	int err;</div><div class='add'>+	char buf[32];</div><div class='add'>+	u32 reg[5];</div><div class='add'>+	int id_sel = ISERIES_GET_DEVICE_FROM_SUBBUS(sub_bus);</div><div class='add'>+	int function = ISERIES_GET_FUNCTION_FROM_SUBBUS(sub_bus);</div><div class='add'>+	HvAgentId eads_id_sel = ISERIES_PCI_AGENTID(id_sel, function);</div><div class='add'>+	u8 devfn;</div><div class='add'>+	struct pci_class_name *cp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Connect all functions of any device found.</div><div class='add'>+	 */</div><div class='add'>+	for (id_sel = 1; id_sel &lt;= bridge_info-&gt;maxAgents; id_sel++) {</div><div class='add'>+		for (function = 0; function &lt; 8; function++) {</div><div class='add'>+			HvAgentId agent_id = ISERIES_PCI_AGENTID(id_sel,</div><div class='add'>+					function);</div><div class='add'>+			err = HvCallXm_connectBusUnit(bus, sub_bus,</div><div class='add'>+					agent_id, 0);</div><div class='add'>+			if (err) {</div><div class='add'>+				if (err != 0x302)</div><div class='add'>+					DBG("connectBusUnit(%x, %x, %x) %x\n",</div><div class='add'>+						bus, sub_bus, agent_id, err);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = HvCallPci_configLoad16(bus, sub_bus, agent_id,</div><div class='add'>+					PCI_VENDOR_ID, &amp;vendor_id);</div><div class='add'>+			if (err) {</div><div class='add'>+				DBG("ReadVendor(%x, %x, %x) %x\n",</div><div class='add'>+					bus, sub_bus, agent_id, err);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			err = HvCallPci_configLoad16(bus, sub_bus, agent_id,</div><div class='add'>+					PCI_DEVICE_ID, &amp;device_id);</div><div class='add'>+			if (err) {</div><div class='add'>+				DBG("ReadDevice(%x, %x, %x) %x\n",</div><div class='add'>+					bus, sub_bus, agent_id, err);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			err = HvCallPci_configLoad32(bus, sub_bus, agent_id,</div><div class='add'>+					PCI_CLASS_REVISION , &amp;class_id);</div><div class='add'>+			if (err) {</div><div class='add'>+				DBG("ReadClass(%x, %x, %x) %x\n",</div><div class='add'>+					bus, sub_bus, agent_id, err);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			devfn = PCI_DEVFN(ISERIES_ENCODE_DEVICE(eads_id_sel),</div><div class='add'>+					function);</div><div class='add'>+			cp = dt_find_pci_class_name(class_id &gt;&gt; 16);</div><div class='add'>+			if (cp &amp;&amp; cp-&gt;name)</div><div class='add'>+				strncpy(buf, cp-&gt;name, sizeof(buf) - 1);</div><div class='add'>+			else</div><div class='add'>+				snprintf(buf, sizeof(buf), "pci%x,%x",</div><div class='add'>+						vendor_id, device_id);</div><div class='add'>+			buf[sizeof(buf) - 1] = '\0';</div><div class='add'>+			snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),</div><div class='add'>+					"@%x", PCI_SLOT(devfn));</div><div class='add'>+			buf[sizeof(buf) - 1] = '\0';</div><div class='add'>+			if (function != 0)</div><div class='add'>+				snprintf(buf + strlen(buf),</div><div class='add'>+					sizeof(buf) - strlen(buf),</div><div class='add'>+					",%x", function);</div><div class='add'>+			dt_start_node(dt, buf);</div><div class='add'>+			reg[0] = (bus &lt;&lt; 16) | (devfn &lt;&lt; 8);</div><div class='add'>+			reg[1] = 0;</div><div class='add'>+			reg[2] = 0;</div><div class='add'>+			reg[3] = 0;</div><div class='add'>+			reg[4] = 0;</div><div class='add'>+			dt_prop_u32_list(dt, "reg", reg, 5);</div><div class='add'>+			if (cp &amp;&amp; (cp-&gt;type || cp-&gt;name))</div><div class='add'>+				dt_prop_str(dt, "device_type",</div><div class='add'>+					cp-&gt;type ? cp-&gt;type : cp-&gt;name);</div><div class='add'>+			dt_prop_u32(dt, "vendor-id", vendor_id);</div><div class='add'>+			dt_prop_u32(dt, "device-id", device_id);</div><div class='add'>+			dt_prop_u32(dt, "class-code", class_id &gt;&gt; 8);</div><div class='add'>+			dt_prop_u32(dt, "revision-id", class_id &amp; 0xff);</div><div class='add'>+			dt_prop_u32(dt, "linux,subbus", sub_bus);</div><div class='add'>+			dt_prop_u32(dt, "linux,agent-id", agent_id);</div><div class='add'>+			dt_prop_u32(dt, "linux,logical-slot-number",</div><div class='add'>+					bridge_info-&gt;logicalSlotNumber);</div><div class='add'>+			dt_end_node(dt);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init scan_bridge(struct iseries_flat_dt *dt, HvBusNumber bus,</div><div class='add'>+		HvSubBusNumber sub_bus, int id_sel)</div><div class='add'>+{</div><div class='add'>+	struct HvCallPci_BridgeInfo bridge_info;</div><div class='add'>+	HvAgentId agent_id;</div><div class='add'>+	int function;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Note: hvSubBus and irq is always be 0 at this level! */</div><div class='add'>+	for (function = 0; function &lt; 8; ++function) {</div><div class='add'>+		agent_id = ISERIES_PCI_AGENTID(id_sel, function);</div><div class='add'>+		ret = HvCallXm_connectBusUnit(bus, sub_bus, agent_id, 0);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			if (ret != 0xb)</div><div class='add'>+				DBG("connectBusUnit(%x, %x, %x) %x\n",</div><div class='add'>+						bus, sub_bus, agent_id, ret);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		DBG("found device at bus %d idsel %d func %d (AgentId %x)\n",</div><div class='add'>+				bus, id_sel, function, agent_id);</div><div class='add'>+		ret = HvCallPci_getBusUnitInfo(bus, sub_bus, agent_id,</div><div class='add'>+				iseries_hv_addr(&amp;bridge_info),</div><div class='add'>+				sizeof(struct HvCallPci_BridgeInfo));</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			continue;</div><div class='add'>+		DBG("bridge info: type %x subbus %x "</div><div class='add'>+			"maxAgents %x maxsubbus %x logslot %x\n",</div><div class='add'>+			bridge_info.busUnitInfo.deviceType,</div><div class='add'>+			bridge_info.subBusNumber,</div><div class='add'>+			bridge_info.maxAgents,</div><div class='add'>+			bridge_info.maxSubBusNumber,</div><div class='add'>+			bridge_info.logicalSlotNumber);</div><div class='add'>+		if (bridge_info.busUnitInfo.deviceType ==</div><div class='add'>+				HvCallPci_BridgeDevice)</div><div class='add'>+			scan_bridge_slot(dt, bus, &amp;bridge_info);</div><div class='add'>+		else</div><div class='add'>+			DBG("PCI: Invalid Bridge Configuration(0x%02X)",</div><div class='add'>+				bridge_info.busUnitInfo.deviceType);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init scan_phb(struct iseries_flat_dt *dt, HvBusNumber bus)</div><div class='add'>+{</div><div class='add'>+	struct HvCallPci_DeviceInfo dev_info;</div><div class='add'>+	const HvSubBusNumber sub_bus = 0;	/* EADs is always 0. */</div><div class='add'>+	int err;</div><div class='add'>+	int id_sel;</div><div class='add'>+	const int max_agents = 8;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Probe for EADs Bridges</div><div class='add'>+	 */</div><div class='add'>+	for (id_sel = 1; id_sel &lt; max_agents; ++id_sel) {</div><div class='add'>+		err = HvCallPci_getDeviceInfo(bus, sub_bus, id_sel,</div><div class='add'>+				iseries_hv_addr(&amp;dev_info),</div><div class='add'>+				sizeof(struct HvCallPci_DeviceInfo));</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err != 0x302)</div><div class='add'>+				DBG("getDeviceInfo(%x, %x, %x) %x\n",</div><div class='add'>+						bus, sub_bus, id_sel, err);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (dev_info.deviceType != HvCallPci_NodeDevice) {</div><div class='add'>+			DBG("PCI: Invalid System Configuration"</div><div class='add'>+					"(0x%02X) for bus 0x%02x id 0x%02x.\n",</div><div class='add'>+					dev_info.deviceType, bus, id_sel);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		scan_bridge(dt, bus, sub_bus, id_sel);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init dt_pci_devices(struct iseries_flat_dt *dt)</div><div class='add'>+{</div><div class='add'>+	HvBusNumber bus;</div><div class='add'>+	char buf[32];</div><div class='add'>+	u32 buses[2];</div><div class='add'>+	int phb_num = 0;</div><div class='add'>+</div><div class='add'>+	/* Check all possible buses. */</div><div class='add'>+	for (bus = 0; bus &lt; 256; bus++) {</div><div class='add'>+		int err = HvCallXm_testBus(bus);</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			/*</div><div class='add'>+			 * Check for Unexpected Return code, a clue that</div><div class='add'>+			 * something has gone wrong.</div><div class='add'>+			 */</div><div class='add'>+			if (err != 0x0301)</div><div class='add'>+				DBG("Unexpected Return on Probe(0x%02X) "</div><div class='add'>+						"0x%04X\n", bus, err);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		DBG("bus %d appears to exist\n", bus);</div><div class='add'>+		snprintf(buf, 32, "pci@%d", phb_num);</div><div class='add'>+		dt_start_node(dt, buf);</div><div class='add'>+		dt_prop_str(dt, "device_type", device_type_pci);</div><div class='add'>+		dt_prop_str(dt, "compatible", "IBM,iSeries-Logical-PHB");</div><div class='add'>+		dt_prop_u32(dt, "#address-cells", 3);</div><div class='add'>+		dt_prop_u32(dt, "#size-cells", 2);</div><div class='add'>+		buses[0] = buses[1] = bus;</div><div class='add'>+		dt_prop_u32_list(dt, "bus-range", buses, 2);</div><div class='add'>+		scan_phb(dt, bus);</div><div class='add'>+		dt_end_node(dt);</div><div class='add'>+		phb_num++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dt_finish(struct iseries_flat_dt *dt)</div><div class='add'>+{</div><div class='add'>+	dt_push_u32(dt, OF_DT_END);</div><div class='add'>+	dt-&gt;header.totalsize = (unsigned long)dt_data - (unsigned long)dt;</div><div class='add'>+	klimit = ALIGN((unsigned long)dt_data, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void * __init build_flat_dt(unsigned long phys_mem_size)</div><div class='add'>+{</div><div class='add'>+	struct iseries_flat_dt *iseries_dt;</div><div class='add'>+	u64 tmp[2];</div><div class='add'>+</div><div class='add'>+	iseries_dt = dt_init();</div><div class='add'>+</div><div class='add'>+	dt_start_node(iseries_dt, "");</div><div class='add'>+</div><div class='add'>+	dt_prop_u32(iseries_dt, "#address-cells", 2);</div><div class='add'>+	dt_prop_u32(iseries_dt, "#size-cells", 2);</div><div class='add'>+	dt_model(iseries_dt);</div><div class='add'>+</div><div class='add'>+	/* /memory */</div><div class='add'>+	dt_start_node(iseries_dt, "memory@0");</div><div class='add'>+	dt_prop_str(iseries_dt, "device_type", device_type_memory);</div><div class='add'>+	tmp[0] = 0;</div><div class='add'>+	tmp[1] = phys_mem_size;</div><div class='add'>+	dt_prop_u64_list(iseries_dt, "reg", tmp, 2);</div><div class='add'>+	dt_end_node(iseries_dt);</div><div class='add'>+</div><div class='add'>+	/* /chosen */</div><div class='add'>+	dt_start_node(iseries_dt, "chosen");</div><div class='add'>+	dt_prop_str(iseries_dt, "bootargs", cmd_line);</div><div class='add'>+	dt_end_node(iseries_dt);</div><div class='add'>+</div><div class='add'>+	dt_cpus(iseries_dt);</div><div class='add'>+</div><div class='add'>+	dt_vdevices(iseries_dt);</div><div class='add'>+	dt_pci_devices(iseries_dt);</div><div class='add'>+</div><div class='add'>+	dt_end_node(iseries_dt);</div><div class='add'>+</div><div class='add'>+	dt_finish(iseries_dt);</div><div class='add'>+</div><div class='add'>+	return iseries_dt;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c<br/>index 30bdcf3925d9..ed44dfceaa45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/htab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/htab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/htab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/htab.c</a></div><div class='hunk'>@@ -242,13 +242,11 @@ static void iSeries_hpte_invalidate(unsigned long slot, unsigned long va,</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hpte_init_iSeries(void)</div><div class='add'>+void __init hpte_init_iSeries(void)</div><div class='ctx'> {</div><div class='ctx'> 	ppc_md.hpte_invalidate	= iSeries_hpte_invalidate;</div><div class='ctx'> 	ppc_md.hpte_updatepp	= iSeries_hpte_updatepp;</div><div class='ctx'> 	ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;</div><div class='ctx'> 	ppc_md.hpte_insert	= iSeries_hpte_insert;</div><div class='ctx'> 	ppc_md.hpte_remove	= iSeries_hpte_remove;</div><div class='del'>-</div><div class='del'>-	htab_finish_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c<br/>index bea0b703f409..e3bd2015f2c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/iommu.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  * Rewrite, cleanup:</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Olof Johansson &lt;olof@lixom.net&gt;, IBM Corporation</div><div class='add'>+ * Copyright (C) 2006 Olof Johansson &lt;olof@lixom.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Dynamic DMA mapping support, iSeries-specific parts.</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,42 +32,37 @@</div><div class='ctx'> #include &lt;asm/tce.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/abs_addr.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iommu.h"</div><div class='del'>-</div><div class='del'>-extern struct list_head iSeries_Global_Device_List;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/iseries/iommu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void tce_build_iSeries(struct iommu_table *tbl, long index, long npages,</div><div class='ctx'> 		unsigned long uaddr, enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rc;</div><div class='del'>-	union tce_entry tce;</div><div class='add'>+	u64 tce, rpn;</div><div class='ctx'> </div><div class='ctx'> 	index &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='ctx'> 	while (npages--) {</div><div class='del'>-		tce.te_word = 0;</div><div class='del'>-		tce.te_bits.tb_rpn = virt_to_abs(uaddr) &gt;&gt; TCE_SHIFT;</div><div class='add'>+		rpn = virt_to_abs(uaddr) &gt;&gt; TCE_SHIFT;</div><div class='add'>+		tce = (rpn &amp; TCE_RPN_MASK) &lt;&lt; TCE_RPN_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		if (tbl-&gt;it_type == TCE_VB) {</div><div class='ctx'> 			/* Virtual Bus */</div><div class='del'>-			tce.te_bits.tb_valid = 1;</div><div class='del'>-			tce.te_bits.tb_allio = 1;</div><div class='add'>+			tce |= TCE_VALID|TCE_ALLIO;</div><div class='ctx'> 			if (direction != DMA_TO_DEVICE)</div><div class='del'>-				tce.te_bits.tb_rdwr = 1;</div><div class='add'>+				tce |= TCE_VB_WRITE;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* PCI Bus */</div><div class='del'>-			tce.te_bits.tb_rdwr = 1; /* Read allowed */</div><div class='add'>+			tce |= TCE_PCI_READ; /* Read allowed */</div><div class='ctx'> 			if (direction != DMA_TO_DEVICE)</div><div class='del'>-				tce.te_bits.tb_pciwr = 1;</div><div class='add'>+				tce |= TCE_PCI_WRITE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = HvCallXm_setTce((u64)tbl-&gt;it_index, (u64)index,</div><div class='del'>-				tce.te_word);</div><div class='add'>+		rc = HvCallXm_setTce((u64)tbl-&gt;it_index, (u64)index, tce);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			panic("PCI_DMA: HvCallXm_setTce failed, Rc: 0x%lx\n",</div><div class='ctx'> 					rc);</div><div class='hunk'>@@ -124,7 +120,7 @@ void iommu_table_getparms_iSeries(unsigned long busno,</div><div class='ctx'> </div><div class='ctx'> 	/* itc_size is in pages worth of table, it_size is in # of entries */</div><div class='ctx'> 	tbl-&gt;it_size = ((parms-&gt;itc_size * TCE_PAGE_SIZE) /</div><div class='del'>-			sizeof(union tce_entry)) &gt;&gt; TCE_PAGE_FACTOR;</div><div class='add'>+			TCE_ENTRY_SIZE) &gt;&gt; TCE_PAGE_FACTOR;</div><div class='ctx'> 	tbl-&gt;it_busno = parms-&gt;itc_busno;</div><div class='ctx'> 	tbl-&gt;it_offset = parms-&gt;itc_offset &gt;&gt; TCE_PAGE_FACTOR;</div><div class='ctx'> 	tbl-&gt;it_index = parms-&gt;itc_index;</div><div class='hunk'>@@ -142,10 +138,15 @@ void iommu_table_getparms_iSeries(unsigned long busno,</div><div class='ctx'>  */</div><div class='ctx'> static struct iommu_table *iommu_table_find(struct iommu_table * tbl)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dn *pdn;</div><div class='add'>+	struct device_node *node;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(pdn, &amp;iSeries_Global_Device_List, Device_List) {</div><div class='del'>-		struct iommu_table *it = pdn-&gt;iommu_table;</div><div class='add'>+	for (node = NULL; (node = of_find_all_nodes(node)); ) {</div><div class='add'>+		struct pci_dn *pdn = PCI_DN(node);</div><div class='add'>+		struct iommu_table *it;</div><div class='add'>+</div><div class='add'>+		if (pdn == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		it = pdn-&gt;iommu_table;</div><div class='ctx'> 		if ((it != NULL) &amp;&amp;</div><div class='ctx'> 		    (it-&gt;it_type == TCE_PCI) &amp;&amp;</div><div class='ctx'> 		    (it-&gt;it_offset == tbl-&gt;it_offset) &amp;&amp;</div><div class='hunk'>@@ -161,15 +162,18 @@ void iommu_devnode_init_iSeries(struct device_node *dn)</div><div class='ctx'> {</div><div class='ctx'> 	struct iommu_table *tbl;</div><div class='ctx'> 	struct pci_dn *pdn = PCI_DN(dn);</div><div class='add'>+	u32 *lsn = (u32 *)get_property(dn, "linux,logical-slot-number", NULL);</div><div class='add'>+</div><div class='add'>+	BUG_ON(lsn == NULL);</div><div class='ctx'> </div><div class='ctx'> 	tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	iommu_table_getparms_iSeries(pdn-&gt;busno, pdn-&gt;LogicalSlot, 0, tbl);</div><div class='add'>+	iommu_table_getparms_iSeries(pdn-&gt;busno, *lsn, 0, tbl);</div><div class='ctx'> </div><div class='ctx'> 	/* Look for existing tce table */</div><div class='ctx'> 	pdn-&gt;iommu_table = iommu_table_find(tbl);</div><div class='ctx'> 	if (pdn-&gt;iommu_table == NULL)</div><div class='del'>-		pdn-&gt;iommu_table = iommu_init_table(tbl);</div><div class='add'>+		pdn-&gt;iommu_table = iommu_init_table(tbl, -1);</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree(tbl);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c<br/>index be3fbfc24e6c..e32446877e78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/irq.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *   Created, December 13, 2000 by Wayne Holm</div><div class='ctx'>  * End Change Activity</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -42,6 +41,7 @@</div><div class='ctx'> #include &lt;asm/iseries/it_lp_queue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "irq.h"</div><div class='add'>+#include "pci.h"</div><div class='ctx'> #include "call_pci.h"</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMP)</div><div class='hunk'>@@ -162,27 +162,6 @@ static void pci_event_handler(struct HvLpEvent *event, struct pt_regs *regs)</div><div class='ctx'> 		printk(KERN_ERR "pci_event_handler: NULL event received\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is called by init_IRQ.  set in ppc_md.init_IRQ by iSeries_setup.c</div><div class='del'>- * It must be called before the bus walk.</div><div class='del'>- */</div><div class='del'>-void __init iSeries_init_IRQ(void)</div><div class='del'>-{</div><div class='del'>-	/* Register PCI event handler and open an event path */</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = HvLpEvent_registerHandler(HvLpEvent_Type_PciIo,</div><div class='del'>-			&amp;pci_event_handler);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		ret = HvLpEvent_openPath(HvLpEvent_Type_PciIo, 0);</div><div class='del'>-		if (ret != 0)</div><div class='del'>-			printk(KERN_ERR "iseries_init_IRQ: open event path "</div><div class='del'>-					"failed with rc 0x%x\n", ret);</div><div class='del'>-	} else</div><div class='del'>-		printk(KERN_ERR "iseries_init_IRQ: register handler "</div><div class='del'>-				"failed with rc 0x%x\n", ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define REAL_IRQ_TO_SUBBUS(irq)	(((irq) &gt;&gt; 14) &amp; 0xff)</div><div class='ctx'> #define REAL_IRQ_TO_BUS(irq)	((((irq) &gt;&gt; 6) &amp; 0xff) + 1)</div><div class='ctx'> #define REAL_IRQ_TO_IDSEL(irq)	((((irq) &gt;&gt; 3) &amp; 7) + 1)</div><div class='hunk'>@@ -196,7 +175,7 @@ static void iseries_enable_IRQ(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bus, dev_id, function, mask;</div><div class='ctx'> 	const u32 sub_bus = 0;</div><div class='del'>-	unsigned int rirq = virt_irq_to_real_map[irq];</div><div class='add'>+	unsigned int rirq = (unsigned int)irq_map[irq].hwirq;</div><div class='ctx'> </div><div class='ctx'> 	/* The IRQ has already been locked by the caller */</div><div class='ctx'> 	bus = REAL_IRQ_TO_BUS(rirq);</div><div class='hunk'>@@ -213,7 +192,7 @@ static unsigned int iseries_startup_IRQ(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bus, dev_id, function, mask;</div><div class='ctx'> 	const u32 sub_bus = 0;</div><div class='del'>-	unsigned int rirq = virt_irq_to_real_map[irq];</div><div class='add'>+	unsigned int rirq = (unsigned int)irq_map[irq].hwirq;</div><div class='ctx'> </div><div class='ctx'> 	bus = REAL_IRQ_TO_BUS(rirq);</div><div class='ctx'> 	function = REAL_IRQ_TO_FUNC(rirq);</div><div class='hunk'>@@ -241,9 +220,9 @@ void __init iSeries_activate_IRQs()</div><div class='ctx'> 	for_each_irq (irq) {</div><div class='ctx'> 		irq_desc_t *desc = get_irq_desc(irq);</div><div class='ctx'> </div><div class='del'>-		if (desc &amp;&amp; desc-&gt;handler &amp;&amp; desc-&gt;handler-&gt;startup) {</div><div class='add'>+		if (desc &amp;&amp; desc-&gt;chip &amp;&amp; desc-&gt;chip-&gt;startup) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='del'>-			desc-&gt;handler-&gt;startup(irq);</div><div class='add'>+			desc-&gt;chip-&gt;startup(irq);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -254,7 +233,7 @@ static void iseries_shutdown_IRQ(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bus, dev_id, function, mask;</div><div class='ctx'> 	const u32 sub_bus = 0;</div><div class='del'>-	unsigned int rirq = virt_irq_to_real_map[irq];</div><div class='add'>+	unsigned int rirq = (unsigned int)irq_map[irq].hwirq;</div><div class='ctx'> </div><div class='ctx'> 	/* irq should be locked by the caller */</div><div class='ctx'> 	bus = REAL_IRQ_TO_BUS(rirq);</div><div class='hunk'>@@ -277,7 +256,7 @@ static void iseries_disable_IRQ(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 bus, dev_id, function, mask;</div><div class='ctx'> 	const u32 sub_bus = 0;</div><div class='del'>-	unsigned int rirq = virt_irq_to_real_map[irq];</div><div class='add'>+	unsigned int rirq = (unsigned int)irq_map[irq].hwirq;</div><div class='ctx'> </div><div class='ctx'> 	/* The IRQ has already been locked by the caller */</div><div class='ctx'> 	bus = REAL_IRQ_TO_BUS(rirq);</div><div class='hunk'>@@ -291,19 +270,19 @@ static void iseries_disable_IRQ(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> static void iseries_end_IRQ(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	unsigned int rirq = virt_irq_to_real_map[irq];</div><div class='add'>+	unsigned int rirq = (unsigned int)irq_map[irq].hwirq;</div><div class='ctx'> </div><div class='ctx'> 	HvCallPci_eoi(REAL_IRQ_TO_BUS(rirq), REAL_IRQ_TO_SUBBUS(rirq),</div><div class='ctx'> 		(REAL_IRQ_TO_IDSEL(rirq) &lt;&lt; 4) + REAL_IRQ_TO_FUNC(rirq));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static hw_irq_controller iSeries_IRQ_handler = {</div><div class='del'>-	.typename = "iSeries irq controller",</div><div class='del'>-	.startup = iseries_startup_IRQ,</div><div class='del'>-	.shutdown = iseries_shutdown_IRQ,</div><div class='del'>-	.enable = iseries_enable_IRQ,</div><div class='del'>-	.disable = iseries_disable_IRQ,</div><div class='del'>-	.end = iseries_end_IRQ</div><div class='add'>+static struct irq_chip iseries_pic = {</div><div class='add'>+	.typename	= "iSeries irq controller",</div><div class='add'>+	.startup	= iseries_startup_IRQ,</div><div class='add'>+	.shutdown	= iseries_shutdown_IRQ,</div><div class='add'>+	.unmask		= iseries_enable_IRQ,</div><div class='add'>+	.mask		= iseries_disable_IRQ,</div><div class='add'>+	.eoi		= iseries_end_IRQ</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -312,19 +291,16 @@ static hw_irq_controller iSeries_IRQ_handler = {</div><div class='ctx'>  * Note that sub_bus is always 0 (at the moment at least).</div><div class='ctx'>  */</div><div class='ctx'> int __init iSeries_allocate_IRQ(HvBusNumber bus,</div><div class='del'>-		HvSubBusNumber sub_bus, HvAgentId dev_id)</div><div class='add'>+		HvSubBusNumber sub_bus, u32 bsubbus)</div><div class='ctx'> {</div><div class='del'>-	int virtirq;</div><div class='ctx'> 	unsigned int realirq;</div><div class='del'>-	u8 idsel = (dev_id &gt;&gt; 4);</div><div class='del'>-	u8 function = dev_id &amp; 7;</div><div class='add'>+	u8 idsel = ISERIES_GET_DEVICE_FROM_SUBBUS(bsubbus);</div><div class='add'>+	u8 function = ISERIES_GET_FUNCTION_FROM_SUBBUS(bsubbus);</div><div class='ctx'> </div><div class='ctx'> 	realirq = (((((sub_bus &lt;&lt; 8) + (bus - 1)) &lt;&lt; 3) + (idsel - 1)) &lt;&lt; 3)</div><div class='ctx'> 		+ function;</div><div class='del'>-	virtirq = virt_irq_create_mapping(realirq);</div><div class='ctx'> </div><div class='del'>-	irq_desc[virtirq].handler = &amp;iSeries_IRQ_handler;</div><div class='del'>-	return virtirq;</div><div class='add'>+	return irq_create_mapping(NULL, realirq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='hunk'>@@ -332,10 +308,9 @@ int __init iSeries_allocate_IRQ(HvBusNumber bus,</div><div class='ctx'> /*</div><div class='ctx'>  * Get the next pending IRQ.</div><div class='ctx'>  */</div><div class='del'>-int iSeries_get_irq(struct pt_regs *regs)</div><div class='add'>+unsigned int iSeries_get_irq(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	/* -2 means ignore this interrupt */</div><div class='del'>-	int irq = -2;</div><div class='add'>+	int irq = NO_IRQ_IGNORE;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	if (get_lppaca()-&gt;int_dword.fields.ipi_cnt) {</div><div class='hunk'>@@ -358,9 +333,57 @@ int iSeries_get_irq(struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;pending_irqs_lock);</div><div class='ctx'> 		if (irq &gt;= NR_IRQS)</div><div class='del'>-			irq = -2;</div><div class='add'>+			irq = NO_IRQ_IGNORE;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return irq;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+				irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;iseries_pic, handle_fasteoi_irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops iseries_irq_host_ops = {</div><div class='add'>+	.map = iseries_irq_host_map,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is called by init_IRQ.  set in ppc_md.init_IRQ by iSeries_setup.c</div><div class='add'>+ * It must be called before the bus walk.</div><div class='add'>+ */</div><div class='add'>+void __init iSeries_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	/* Register PCI event handler and open an event path */</div><div class='add'>+	struct irq_host *host;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The Hypervisor only allows us up to 256 interrupt</div><div class='add'>+	 * sources (the irq number is passed in a u8).</div><div class='add'>+	 */</div><div class='add'>+	irq_set_virq_count(256);</div><div class='add'>+</div><div class='add'>+	/* Create irq host. No need for a revmap since HV will give us</div><div class='add'>+	 * back our virtual irq number</div><div class='add'>+	 */</div><div class='add'>+	host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &amp;iseries_irq_host_ops, 0);</div><div class='add'>+	BUG_ON(host == NULL);</div><div class='add'>+	irq_set_default_host(host);</div><div class='add'>+</div><div class='add'>+	ret = HvLpEvent_registerHandler(HvLpEvent_Type_PciIo,</div><div class='add'>+			&amp;pci_event_handler);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		ret = HvLpEvent_openPath(HvLpEvent_Type_PciIo, 0);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			printk(KERN_ERR "iseries_init_IRQ: open event path "</div><div class='add'>+					"failed with rc 0x%x\n", ret);</div><div class='add'>+	} else</div><div class='add'>+		printk(KERN_ERR "iseries_init_IRQ: register handler "</div><div class='add'>+				"failed with rc 0x%x\n", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/irq.h b/arch/powerpc/platforms/iseries/irq.h<br/>index b9c801ba5a47..1ee8985140e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/irq.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/irq.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/irq.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/irq.h</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> #define	_ISERIES_IRQ_H</div><div class='ctx'> </div><div class='ctx'> extern void iSeries_init_IRQ(void);</div><div class='del'>-extern int  iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, HvAgentId);</div><div class='add'>+extern int  iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, u32);</div><div class='ctx'> extern void iSeries_activate_IRQs(void);</div><div class='del'>-extern int iSeries_get_irq(struct pt_regs *);</div><div class='add'>+extern unsigned int iSeries_get_irq(struct pt_regs *);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ISERIES_IRQ_H */</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/lpardata.c b/arch/powerpc/platforms/iseries/lpardata.c<br/>index 438e2dba63b5..a7769445d6c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/lpardata.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/lpardata.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/lpardata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/lpardata.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c<br/>index 8ca7b9396355..2a9f81ea27d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/lpevents.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/lpevents.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/lpevents.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/lpevents.c</a></div><div class='hunk'>@@ -51,20 +51,21 @@ static unsigned lpEventHandlerPaths[HvLpEvent_Type_NumTypes];</div><div class='ctx'> static struct HvLpEvent * get_next_hvlpevent(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct HvLpEvent * event;</div><div class='del'>-	event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;</div><div class='add'>+	event = (struct HvLpEvent *)hvlpevent_queue.hq_current_event;</div><div class='ctx'> </div><div class='ctx'> 	if (hvlpevent_is_valid(event)) {</div><div class='ctx'> 		/* rmb() needed only for weakly consistent machines (regatta) */</div><div class='ctx'> 		rmb();</div><div class='ctx'> 		/* Set pointer to next potential event */</div><div class='del'>-		hvlpevent_queue.xSlicCurEventPtr += ((event-&gt;xSizeMinus1 +</div><div class='del'>-				LpEventAlign) / LpEventAlign) * LpEventAlign;</div><div class='add'>+		hvlpevent_queue.hq_current_event += ((event-&gt;xSizeMinus1 +</div><div class='add'>+				IT_LP_EVENT_ALIGN) / IT_LP_EVENT_ALIGN) *</div><div class='add'>+					IT_LP_EVENT_ALIGN;</div><div class='ctx'> </div><div class='ctx'> 		/* Wrap to beginning if no room at end */</div><div class='del'>-		if (hvlpevent_queue.xSlicCurEventPtr &gt;</div><div class='del'>-				hvlpevent_queue.xSlicLastValidEventPtr) {</div><div class='del'>-			hvlpevent_queue.xSlicCurEventPtr =</div><div class='del'>-				hvlpevent_queue.xSlicEventStackPtr;</div><div class='add'>+		if (hvlpevent_queue.hq_current_event &gt;</div><div class='add'>+				hvlpevent_queue.hq_last_event) {</div><div class='add'>+			hvlpevent_queue.hq_current_event =</div><div class='add'>+				hvlpevent_queue.hq_event_stack;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		event = NULL;</div><div class='hunk'>@@ -82,10 +83,10 @@ int hvlpevent_is_pending(void)</div><div class='ctx'> 	if (smp_processor_id() &gt;= spread_lpevents)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	next_event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;</div><div class='add'>+	next_event = (struct HvLpEvent *)hvlpevent_queue.hq_current_event;</div><div class='ctx'> </div><div class='ctx'> 	return hvlpevent_is_valid(next_event) ||</div><div class='del'>-		hvlpevent_queue.xPlicOverflowIntPending;</div><div class='add'>+		hvlpevent_queue.hq_overflow_pending;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hvlpevent_clear_valid(struct HvLpEvent * event)</div><div class='hunk'>@@ -95,18 +96,18 @@ static void hvlpevent_clear_valid(struct HvLpEvent * event)</div><div class='ctx'> 	 * ie. on 64-byte boundaries.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct HvLpEvent *tmp;</div><div class='del'>-	unsigned extra = ((event-&gt;xSizeMinus1 + LpEventAlign) /</div><div class='del'>-						 LpEventAlign) - 1;</div><div class='add'>+	unsigned extra = ((event-&gt;xSizeMinus1 + IT_LP_EVENT_ALIGN) /</div><div class='add'>+				IT_LP_EVENT_ALIGN) - 1;</div><div class='ctx'> </div><div class='ctx'> 	switch (extra) {</div><div class='ctx'> 	case 3:</div><div class='del'>-		tmp = (struct HvLpEvent*)((char*)event + 3 * LpEventAlign);</div><div class='add'>+		tmp = (struct HvLpEvent*)((char*)event + 3 * IT_LP_EVENT_ALIGN);</div><div class='ctx'> 		hvlpevent_invalidate(tmp);</div><div class='ctx'> 	case 2:</div><div class='del'>-		tmp = (struct HvLpEvent*)((char*)event + 2 * LpEventAlign);</div><div class='add'>+		tmp = (struct HvLpEvent*)((char*)event + 2 * IT_LP_EVENT_ALIGN);</div><div class='ctx'> 		hvlpevent_invalidate(tmp);</div><div class='ctx'> 	case 1:</div><div class='del'>-		tmp = (struct HvLpEvent*)((char*)event + 1 * LpEventAlign);</div><div class='add'>+		tmp = (struct HvLpEvent*)((char*)event + 1 * IT_LP_EVENT_ALIGN);</div><div class='ctx'> 		hvlpevent_invalidate(tmp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +121,7 @@ void process_hvlpevents(struct pt_regs *regs)</div><div class='ctx'> 	struct HvLpEvent * event;</div><div class='ctx'> </div><div class='ctx'> 	/* If we have recursed, just return */</div><div class='del'>-	if (!spin_trylock(&amp;hvlpevent_queue.lock))</div><div class='add'>+	if (!spin_trylock(&amp;hvlpevent_queue.hq_lock))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='hunk'>@@ -148,17 +149,17 @@ void process_hvlpevents(struct pt_regs *regs)</div><div class='ctx'> 				printk(KERN_INFO "Unexpected Lp Event type=%d\n", event-&gt;xType );</div><div class='ctx'> </div><div class='ctx'> 			hvlpevent_clear_valid(event);</div><div class='del'>-		} else if (hvlpevent_queue.xPlicOverflowIntPending)</div><div class='add'>+		} else if (hvlpevent_queue.hq_overflow_pending)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * No more valid events. If overflow events are</div><div class='ctx'> 			 * pending process them</div><div class='ctx'> 			 */</div><div class='del'>-			HvCallEvent_getOverflowLpEvents(hvlpevent_queue.xIndex);</div><div class='add'>+			HvCallEvent_getOverflowLpEvents(hvlpevent_queue.hq_index);</div><div class='ctx'> 		else</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;hvlpevent_queue.lock);</div><div class='add'>+	spin_unlock(&amp;hvlpevent_queue.hq_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_spread_lpevents(char *str)</div><div class='hunk'>@@ -184,20 +185,20 @@ void setup_hvlpevent_queue(void)</div><div class='ctx'> {</div><div class='ctx'> 	void *eventStack;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;hvlpevent_queue.lock);</div><div class='add'>+	spin_lock_init(&amp;hvlpevent_queue.hq_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a page for the Event Stack. */</div><div class='del'>-	eventStack = alloc_bootmem_pages(LpEventStackSize);</div><div class='del'>-	memset(eventStack, 0, LpEventStackSize);</div><div class='add'>+	eventStack = alloc_bootmem_pages(IT_LP_EVENT_STACK_SIZE);</div><div class='add'>+	memset(eventStack, 0, IT_LP_EVENT_STACK_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Invoke the hypervisor to initialize the event stack */</div><div class='del'>-	HvCallEvent_setLpEventStack(0, eventStack, LpEventStackSize);</div><div class='add'>+	HvCallEvent_setLpEventStack(0, eventStack, IT_LP_EVENT_STACK_SIZE);</div><div class='ctx'> </div><div class='del'>-	hvlpevent_queue.xSlicEventStackPtr = (char *)eventStack;</div><div class='del'>-	hvlpevent_queue.xSlicCurEventPtr = (char *)eventStack;</div><div class='del'>-	hvlpevent_queue.xSlicLastValidEventPtr = (char *)eventStack +</div><div class='del'>-					(LpEventStackSize - LpEventMaxSize);</div><div class='del'>-	hvlpevent_queue.xIndex = 0;</div><div class='add'>+	hvlpevent_queue.hq_event_stack = eventStack;</div><div class='add'>+	hvlpevent_queue.hq_current_event = eventStack;</div><div class='add'>+	hvlpevent_queue.hq_last_event = (char *)eventStack +</div><div class='add'>+		(IT_LP_EVENT_STACK_SIZE - IT_LP_EVENT_MAX_SIZE);</div><div class='add'>+	hvlpevent_queue.hq_index = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Register a handler for an LpEvent type */</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c<br/>index d771b8ee857d..1a2c2a50f922 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/mf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/mf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/mf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/mf.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "setup.h"</div><div class='ctx'> </div><div class='del'>-extern int piranha_simulator;</div><div class='ctx'> static int mf_initialized;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -658,7 +657,7 @@ static void mf_clear_src(void)</div><div class='ctx'> </div><div class='ctx'> void __init mf_display_progress(u16 value)</div><div class='ctx'> {</div><div class='del'>-	if (piranha_simulator || !mf_initialized)</div><div class='add'>+	if (!mf_initialized)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (0xFFFF == value)</div><div class='hunk'>@@ -1295,9 +1294,6 @@ __initcall(mf_proc_init);</div><div class='ctx'>  */</div><div class='ctx'> void iSeries_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='ctx'> {</div><div class='del'>-	if (piranha_simulator)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	mf_get_rtc(rtc_tm);</div><div class='ctx'> 	rtc_tm-&gt;tm_mon--;</div><div class='ctx'> }</div><div class='hunk'>@@ -1316,9 +1312,6 @@ unsigned long iSeries_get_boot_time(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_time tm;</div><div class='ctx'> </div><div class='del'>-	if (piranha_simulator)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	mf_get_boot_rtc(&amp;tm);</div><div class='ctx'> 	return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday,</div><div class='ctx'> 		      tm.tm_hour, tm.tm_min, tm.tm_sec);</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c<br/>index a19833b880e4..35bcc98111f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/pci.c</a></div><div class='hunk'>@@ -37,36 +37,18 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/mf.h&gt;</div><div class='add'>+#include &lt;asm/iseries/iommu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "irq.h"</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> #include "call_pci.h"</div><div class='del'>-#include "iommu.h"</div><div class='del'>-</div><div class='del'>-extern unsigned long io_page_mask;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Forward declares of prototypes.</div><div class='ctx'>  */</div><div class='ctx'> static struct device_node *find_Device_Node(int bus, int devfn);</div><div class='del'>-static void scan_PHB_slots(struct pci_controller *Phb);</div><div class='del'>-static void scan_EADS_bridge(HvBusNumber Bus, HvSubBusNumber SubBus, int IdSel);</div><div class='del'>-static int scan_bridge_slot(HvBusNumber Bus, struct HvCallPci_BridgeInfo *Info);</div><div class='del'>-</div><div class='del'>-LIST_HEAD(iSeries_Global_Device_List);</div><div class='del'>-</div><div class='del'>-static int DeviceCount;</div><div class='del'>-</div><div class='del'>-/* Counters and control flags. */</div><div class='del'>-static long Pci_Io_Read_Count;</div><div class='del'>-static long Pci_Io_Write_Count;</div><div class='del'>-#if 0</div><div class='del'>-static long Pci_Cfg_Read_Count;</div><div class='del'>-static long Pci_Cfg_Write_Count;</div><div class='del'>-#endif</div><div class='del'>-static long Pci_Error_Count;</div><div class='ctx'> </div><div class='ctx'> static int Pci_Retry_Max = 3;	/* Only retry 3 times  */</div><div class='ctx'> static int Pci_Error_Flag = 1;	/* Set Retry Error on. */</div><div class='hunk'>@@ -81,41 +63,19 @@ static struct pci_ops iSeries_pci_ops;</div><div class='ctx'> #define IOMM_TABLE_ENTRY_SIZE	0x0000000000400000UL</div><div class='ctx'> #define BASE_IO_MEMORY		0xE000000000000000UL</div><div class='ctx'> </div><div class='del'>-static unsigned long max_io_memory = 0xE000000000000000UL;</div><div class='add'>+static unsigned long max_io_memory = BASE_IO_MEMORY;</div><div class='ctx'> static long current_iomm_table_entry;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Lookup Tables.</div><div class='ctx'>  */</div><div class='del'>-static struct device_node **iomm_table;</div><div class='del'>-static u8 *iobar_table;</div><div class='add'>+static struct device_node *iomm_table[IOMM_TABLE_MAX_ENTRIES];</div><div class='add'>+static u8 iobar_table[IOMM_TABLE_MAX_ENTRIES];</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Static and Global variables</div><div class='del'>- */</div><div class='del'>-static char *pci_io_text = "iSeries PCI I/O";</div><div class='add'>+static const char pci_io_text[] = "iSeries PCI I/O";</div><div class='ctx'> static DEFINE_SPINLOCK(iomm_table_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * iomm_table_initialize</div><div class='del'>- *</div><div class='del'>- * Allocates and initalizes the Address Translation Table and Bar</div><div class='del'>- * Tables to get them ready for use.  Must be called before any</div><div class='del'>- * I/O space is handed out to the device BARs.</div><div class='del'>- */</div><div class='del'>-static void iomm_table_initialize(void)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;iomm_table_lock);</div><div class='del'>-	iomm_table = kmalloc(sizeof(*iomm_table) * IOMM_TABLE_MAX_ENTRIES,</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	iobar_table = kmalloc(sizeof(*iobar_table) * IOMM_TABLE_MAX_ENTRIES,</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-	spin_unlock(&amp;iomm_table_lock);</div><div class='del'>-	if ((iomm_table == NULL) || (iobar_table == NULL))</div><div class='del'>-		panic("PCI: I/O tables allocation failed.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * iomm_table_allocate_entry</div><div class='ctx'>  *</div><div class='ctx'>  * Adds pci_dev entry in address translation table</div><div class='hunk'>@@ -142,9 +102,8 @@ static void iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;iomm_table_lock);</div><div class='ctx'> 	bar_res-&gt;name = pci_io_text;</div><div class='del'>-	bar_res-&gt;start =</div><div class='add'>+	bar_res-&gt;start = BASE_IO_MEMORY +</div><div class='ctx'> 		IOMM_TABLE_ENTRY_SIZE * current_iomm_table_entry;</div><div class='del'>-	bar_res-&gt;start += BASE_IO_MEMORY;</div><div class='ctx'> 	bar_res-&gt;end = bar_res-&gt;start + bar_size - 1;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the number of table entries needed for BAR.</div><div class='hunk'>@@ -156,7 +115,7 @@ static void iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)</div><div class='ctx'> 		++current_iomm_table_entry;</div><div class='ctx'> 	}</div><div class='ctx'> 	max_io_memory = BASE_IO_MEMORY +</div><div class='del'>-		(IOMM_TABLE_ENTRY_SIZE * current_iomm_table_entry);</div><div class='add'>+		IOMM_TABLE_ENTRY_SIZE * current_iomm_table_entry;</div><div class='ctx'> 	spin_unlock(&amp;iomm_table_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -173,13 +132,10 @@ static void iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)</div><div class='ctx'>  */</div><div class='ctx'> static void allocate_device_bars(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *bar_res;</div><div class='ctx'> 	int bar_num;</div><div class='ctx'> </div><div class='del'>-	for (bar_num = 0; bar_num &lt;= PCI_ROM_RESOURCE; ++bar_num) {</div><div class='del'>-		bar_res = &amp;dev-&gt;resource[bar_num];</div><div class='add'>+	for (bar_num = 0; bar_num &lt;= PCI_ROM_RESOURCE; ++bar_num)</div><div class='ctx'> 		iomm_table_allocate_entry(dev, bar_num);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -199,34 +155,7 @@ static void pci_Log_Error(char *Error_Text, int Bus, int SubBus,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * build_device_node(u16 Bus, int SubBus, u8 DevFn)</div><div class='del'>- */</div><div class='del'>-static struct device_node *build_device_node(HvBusNumber Bus,</div><div class='del'>-		HvSubBusNumber SubBus, int AgentId, int Function)</div><div class='del'>-{</div><div class='del'>-	struct device_node *node;</div><div class='del'>-	struct pci_dn *pdn;</div><div class='del'>-</div><div class='del'>-	node = kmalloc(sizeof(struct device_node), GFP_KERNEL);</div><div class='del'>-	if (node == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	memset(node, 0, sizeof(struct device_node));</div><div class='del'>-	pdn = kzalloc(sizeof(*pdn), GFP_KERNEL);</div><div class='del'>-	if (pdn == NULL) {</div><div class='del'>-		kfree(node);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	node-&gt;data = pdn;</div><div class='del'>-	pdn-&gt;node = node;</div><div class='del'>-	list_add_tail(&amp;pdn-&gt;Device_List, &amp;iSeries_Global_Device_List);</div><div class='del'>-	pdn-&gt;busno = Bus;</div><div class='del'>-	pdn-&gt;bussubno = SubBus;</div><div class='del'>-	pdn-&gt;devfn = PCI_DEVFN(ISERIES_ENCODE_DEVICE(AgentId), Function);</div><div class='del'>-	return node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unsigned long __init find_and_init_phbs(void)</div><div class='add'>+ * iSeries_pcibios_init</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *   This function checks for all possible system PCI host bridges that connect</div><div class='hunk'>@@ -234,50 +163,42 @@ static struct device_node *build_device_node(HvBusNumber Bus,</div><div class='ctx'>  *   ownership status.  A pci_controller is built for any bus which is partially</div><div class='ctx'>  *   owned or fully owned by this guest partition.</div><div class='ctx'>  */</div><div class='del'>-unsigned long __init find_and_init_phbs(void)</div><div class='add'>+void iSeries_pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *phb;</div><div class='del'>-	HvBusNumber bus;</div><div class='del'>-</div><div class='del'>-	/* Check all possible buses. */</div><div class='del'>-	for (bus = 0; bus &lt; 256; bus++) {</div><div class='del'>-		int ret = HvCallXm_testBus(bus);</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			printk("bus %d appears to exist\n", bus);</div><div class='add'>+	struct device_node *root = of_find_node_by_path("/");</div><div class='add'>+	struct device_node *node = NULL;</div><div class='ctx'> </div><div class='del'>-			phb = pcibios_alloc_controller(NULL);</div><div class='del'>-			if (phb == NULL)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			phb-&gt;pci_mem_offset = phb-&gt;local_number = bus;</div><div class='del'>-			phb-&gt;first_busno = bus;</div><div class='del'>-			phb-&gt;last_busno = bus;</div><div class='del'>-			phb-&gt;ops = &amp;iSeries_pci_ops;</div><div class='del'>-</div><div class='del'>-			/* Find and connect the devices. */</div><div class='del'>-			scan_PHB_slots(phb);</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Check for Unexpected Return code, a clue that something</div><div class='del'>-		 * has gone wrong.</div><div class='del'>-		 */</div><div class='del'>-		else if (ret != 0x0301)</div><div class='del'>-			printk(KERN_ERR "Unexpected Return on Probe(0x%04X): 0x%04X",</div><div class='del'>-			       bus, ret);</div><div class='add'>+	if (root == NULL) {</div><div class='add'>+		printk(KERN_CRIT "iSeries_pcibios_init: can't find root "</div><div class='add'>+				"of device tree\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	while ((node = of_get_next_child(root, node)) != NULL) {</div><div class='add'>+		HvBusNumber bus;</div><div class='add'>+		u32 *busp;</div><div class='add'>+</div><div class='add'>+		if ((node-&gt;type == NULL) || (strcmp(node-&gt;type, "pci") != 0))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		busp = (u32 *)get_property(node, "bus-range", NULL);</div><div class='add'>+		if (busp == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		bus = *busp;</div><div class='add'>+		printk("bus %d appears to exist\n", bus);</div><div class='add'>+		phb = pcibios_alloc_controller(node);</div><div class='add'>+		if (phb == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		phb-&gt;pci_mem_offset = phb-&gt;local_number = bus;</div><div class='add'>+		phb-&gt;first_busno = bus;</div><div class='add'>+		phb-&gt;last_busno = bus;</div><div class='add'>+		phb-&gt;ops = &amp;iSeries_pci_ops;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * iSeries_pcibios_init</div><div class='del'>- *</div><div class='del'>- * Chance to initialize and structures or variable before PCI Bus walk.</div><div class='del'>- */</div><div class='del'>-void iSeries_pcibios_init(void)</div><div class='del'>-{</div><div class='del'>-	iomm_table_initialize();</div><div class='del'>-	find_and_init_phbs();</div><div class='del'>-	io_page_mask = -1;</div><div class='add'>+	of_node_put(root);</div><div class='add'>+</div><div class='add'>+	pci_devs_phb_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -299,6 +220,34 @@ void __init iSeries_pci_final_fixup(void)</div><div class='ctx'> 		       pdev-&gt;bus-&gt;number, pdev-&gt;devfn, node);</div><div class='ctx'> </div><div class='ctx'> 		if (node != NULL) {</div><div class='add'>+			struct pci_dn *pdn = PCI_DN(node);</div><div class='add'>+			u32 *agent;</div><div class='add'>+</div><div class='add'>+			agent = (u32 *)get_property(node, "linux,agent-id",</div><div class='add'>+					NULL);</div><div class='add'>+			if ((pdn != NULL) &amp;&amp; (agent != NULL)) {</div><div class='add'>+				u8 irq = iSeries_allocate_IRQ(pdn-&gt;busno, 0,</div><div class='add'>+						pdn-&gt;bussubno);</div><div class='add'>+				int err;</div><div class='add'>+</div><div class='add'>+				err = HvCallXm_connectBusUnit(pdn-&gt;busno, pdn-&gt;bussubno,</div><div class='add'>+						*agent, irq);</div><div class='add'>+				if (err)</div><div class='add'>+					pci_Log_Error("Connect Bus Unit",</div><div class='add'>+						pdn-&gt;busno, pdn-&gt;bussubno, *agent, err);</div><div class='add'>+				else {</div><div class='add'>+					err = HvCallPci_configStore8(pdn-&gt;busno, pdn-&gt;bussubno,</div><div class='add'>+							*agent,</div><div class='add'>+							PCI_INTERRUPT_LINE,</div><div class='add'>+							irq);</div><div class='add'>+					if (err)</div><div class='add'>+						pci_Log_Error("PciCfgStore Irq Failed!",</div><div class='add'>+							pdn-&gt;busno, pdn-&gt;bussubno, *agent, err);</div><div class='add'>+				}</div><div class='add'>+				if (!err)</div><div class='add'>+					pdev-&gt;irq = irq;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			++DeviceCount;</div><div class='ctx'> 			pdev-&gt;sysdata = (void *)node;</div><div class='ctx'> 			PCI_DN(node)-&gt;pcidev = pdev;</div><div class='hunk'>@@ -308,7 +257,6 @@ void __init iSeries_pci_final_fixup(void)</div><div class='ctx'> 		} else</div><div class='ctx'> 			printk("PCI: Device Tree not found for 0x%016lX\n",</div><div class='ctx'> 					(unsigned long)pdev);</div><div class='del'>-		pdev-&gt;irq = PCI_DN(node)-&gt;Irq;</div><div class='ctx'> 	}</div><div class='ctx'> 	iSeries_activate_IRQs();</div><div class='ctx'> 	mf_display_src(0xC9000200);</div><div class='hunk'>@@ -323,148 +271,6 @@ void pcibios_fixup_resources(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Loop through each node function to find usable EADs bridges.</div><div class='del'>- */</div><div class='del'>-static void scan_PHB_slots(struct pci_controller *Phb)</div><div class='del'>-{</div><div class='del'>-	struct HvCallPci_DeviceInfo *DevInfo;</div><div class='del'>-	HvBusNumber bus = Phb-&gt;local_number;	/* System Bus */</div><div class='del'>-	const HvSubBusNumber SubBus = 0;	/* EADs is always 0. */</div><div class='del'>-	int HvRc = 0;</div><div class='del'>-	int IdSel;</div><div class='del'>-	const int MaxAgents = 8;</div><div class='del'>-</div><div class='del'>-	DevInfo = (struct HvCallPci_DeviceInfo*)</div><div class='del'>-		kmalloc(sizeof(struct HvCallPci_DeviceInfo), GFP_KERNEL);</div><div class='del'>-	if (DevInfo == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Probe for EADs Bridges</div><div class='del'>-	 */</div><div class='del'>-	for (IdSel = 1; IdSel &lt; MaxAgents; ++IdSel) {</div><div class='del'>-		HvRc = HvCallPci_getDeviceInfo(bus, SubBus, IdSel,</div><div class='del'>-				iseries_hv_addr(DevInfo),</div><div class='del'>-				sizeof(struct HvCallPci_DeviceInfo));</div><div class='del'>-		if (HvRc == 0) {</div><div class='del'>-			if (DevInfo-&gt;deviceType == HvCallPci_NodeDevice)</div><div class='del'>-				scan_EADS_bridge(bus, SubBus, IdSel);</div><div class='del'>-			else</div><div class='del'>-				printk("PCI: Invalid System Configuration(0x%02X)"</div><div class='del'>-				       " for bus 0x%02x id 0x%02x.\n",</div><div class='del'>-				       DevInfo-&gt;deviceType, bus, IdSel);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			pci_Log_Error("getDeviceInfo", bus, SubBus, IdSel, HvRc);</div><div class='del'>-	}</div><div class='del'>-	kfree(DevInfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void scan_EADS_bridge(HvBusNumber bus, HvSubBusNumber SubBus,</div><div class='del'>-		int IdSel)</div><div class='del'>-{</div><div class='del'>-	struct HvCallPci_BridgeInfo *BridgeInfo;</div><div class='del'>-	HvAgentId AgentId;</div><div class='del'>-	int Function;</div><div class='del'>-	int HvRc;</div><div class='del'>-</div><div class='del'>-	BridgeInfo = (struct HvCallPci_BridgeInfo *)</div><div class='del'>-		kmalloc(sizeof(struct HvCallPci_BridgeInfo), GFP_KERNEL);</div><div class='del'>-	if (BridgeInfo == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Note: hvSubBus and irq is always be 0 at this level! */</div><div class='del'>-	for (Function = 0; Function &lt; 8; ++Function) {</div><div class='del'>-		AgentId = ISERIES_PCI_AGENTID(IdSel, Function);</div><div class='del'>-		HvRc = HvCallXm_connectBusUnit(bus, SubBus, AgentId, 0);</div><div class='del'>-		if (HvRc == 0) {</div><div class='del'>-			printk("found device at bus %d idsel %d func %d (AgentId %x)\n",</div><div class='del'>-			       bus, IdSel, Function, AgentId);</div><div class='del'>-			/*  Connect EADs: 0x18.00.12 = 0x00 */</div><div class='del'>-			HvRc = HvCallPci_getBusUnitInfo(bus, SubBus, AgentId,</div><div class='del'>-					iseries_hv_addr(BridgeInfo),</div><div class='del'>-					sizeof(struct HvCallPci_BridgeInfo));</div><div class='del'>-			if (HvRc == 0) {</div><div class='del'>-				printk("bridge info: type %x subbus %x maxAgents %x maxsubbus %x logslot %x\n",</div><div class='del'>-					BridgeInfo-&gt;busUnitInfo.deviceType,</div><div class='del'>-					BridgeInfo-&gt;subBusNumber,</div><div class='del'>-					BridgeInfo-&gt;maxAgents,</div><div class='del'>-					BridgeInfo-&gt;maxSubBusNumber,</div><div class='del'>-					BridgeInfo-&gt;logicalSlotNumber);</div><div class='del'>-				if (BridgeInfo-&gt;busUnitInfo.deviceType ==</div><div class='del'>-						HvCallPci_BridgeDevice)  {</div><div class='del'>-					/* Scan_Bridge_Slot...: 0x18.00.12 */</div><div class='del'>-					scan_bridge_slot(bus, BridgeInfo);</div><div class='del'>-				} else</div><div class='del'>-					printk("PCI: Invalid Bridge Configuration(0x%02X)",</div><div class='del'>-						BridgeInfo-&gt;busUnitInfo.deviceType);</div><div class='del'>-			}</div><div class='del'>-		} else if (HvRc != 0x000B)</div><div class='del'>-			pci_Log_Error("EADs Connect",</div><div class='del'>-					bus, SubBus, AgentId, HvRc);</div><div class='del'>-	}</div><div class='del'>-	kfree(BridgeInfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This assumes that the node slot is always on the primary bus!</div><div class='del'>- */</div><div class='del'>-static int scan_bridge_slot(HvBusNumber Bus,</div><div class='del'>-		struct HvCallPci_BridgeInfo *BridgeInfo)</div><div class='del'>-{</div><div class='del'>-	struct device_node *node;</div><div class='del'>-	HvSubBusNumber SubBus = BridgeInfo-&gt;subBusNumber;</div><div class='del'>-	u16 VendorId = 0;</div><div class='del'>-	int HvRc = 0;</div><div class='del'>-	u8 Irq = 0;</div><div class='del'>-	int IdSel = ISERIES_GET_DEVICE_FROM_SUBBUS(SubBus);</div><div class='del'>-	int Function = ISERIES_GET_FUNCTION_FROM_SUBBUS(SubBus);</div><div class='del'>-	HvAgentId EADsIdSel = ISERIES_PCI_AGENTID(IdSel, Function);</div><div class='del'>-</div><div class='del'>-	/* iSeries_allocate_IRQ.: 0x18.00.12(0xA3) */</div><div class='del'>-	Irq = iSeries_allocate_IRQ(Bus, 0, EADsIdSel);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Connect all functions of any device found.</div><div class='del'>-	 */</div><div class='del'>-	for (IdSel = 1; IdSel &lt;= BridgeInfo-&gt;maxAgents; ++IdSel) {</div><div class='del'>-		for (Function = 0; Function &lt; 8; ++Function) {</div><div class='del'>-			HvAgentId AgentId = ISERIES_PCI_AGENTID(IdSel, Function);</div><div class='del'>-			HvRc = HvCallXm_connectBusUnit(Bus, SubBus,</div><div class='del'>-					AgentId, Irq);</div><div class='del'>-			if (HvRc != 0) {</div><div class='del'>-				pci_Log_Error("Connect Bus Unit",</div><div class='del'>-					      Bus, SubBus, AgentId, HvRc);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			HvRc = HvCallPci_configLoad16(Bus, SubBus, AgentId,</div><div class='del'>-						      PCI_VENDOR_ID, &amp;VendorId);</div><div class='del'>-			if (HvRc != 0) {</div><div class='del'>-				pci_Log_Error("Read Vendor",</div><div class='del'>-					      Bus, SubBus, AgentId, HvRc);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			printk("read vendor ID: %x\n", VendorId);</div><div class='del'>-</div><div class='del'>-			/* FoundDevice: 0x18.28.10 = 0x12AE */</div><div class='del'>-			HvRc = HvCallPci_configStore8(Bus, SubBus, AgentId,</div><div class='del'>-						      PCI_INTERRUPT_LINE, Irq);</div><div class='del'>-			if (HvRc != 0)</div><div class='del'>-				pci_Log_Error("PciCfgStore Irq Failed!",</div><div class='del'>-					      Bus, SubBus, AgentId, HvRc);</div><div class='del'>-</div><div class='del'>-			++DeviceCount;</div><div class='del'>-			node = build_device_node(Bus, SubBus, EADsIdSel, Function);</div><div class='del'>-			PCI_DN(node)-&gt;Irq = Irq;</div><div class='del'>-			PCI_DN(node)-&gt;LogicalSlot = BridgeInfo-&gt;logicalSlotNumber;</div><div class='del'>-</div><div class='del'>-		} /* for (Function = 0; Function &lt; 8; ++Function) */</div><div class='del'>-	} /* for (IdSel = 1; IdSel &lt;= MaxAgents; ++IdSel) */</div><div class='del'>-	return HvRc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * I/0 Memory copy MUST use mmio commands on iSeries</div><div class='ctx'>  * To do; For performance, include the hv call directly</div><div class='ctx'>  */</div><div class='hunk'>@@ -509,11 +315,13 @@ EXPORT_SYMBOL(iSeries_memcpy_fromio);</div><div class='ctx'>  */</div><div class='ctx'> static struct device_node *find_Device_Node(int bus, int devfn)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dn *pdn;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+</div><div class='add'>+	for (node = NULL; (node = of_find_all_nodes(node)); ) {</div><div class='add'>+		struct pci_dn *pdn = PCI_DN(node);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(pdn, &amp;iSeries_Global_Device_List, Device_List) {</div><div class='del'>-		if ((bus == pdn-&gt;busno) &amp;&amp; (devfn == pdn-&gt;devfn))</div><div class='del'>-			return pdn-&gt;node;</div><div class='add'>+		if (pdn &amp;&amp; (bus == pdn-&gt;busno) &amp;&amp; (devfn == pdn-&gt;devfn))</div><div class='add'>+			return node;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -625,7 +433,6 @@ static int CheckReturnCode(char *TextHdr, struct device_node *DevNode,</div><div class='ctx'> 	if (ret != 0)  {</div><div class='ctx'> 		struct pci_dn *pdn = PCI_DN(DevNode);</div><div class='ctx'> </div><div class='del'>-		++Pci_Error_Count;</div><div class='ctx'> 		(*retry)++;</div><div class='ctx'> 		printk("PCI: %s: Device 0x%04X:%02X  I/O Error(%2d): 0x%04X\n",</div><div class='ctx'> 				TextHdr, pdn-&gt;busno, pdn-&gt;devfn,</div><div class='hunk'>@@ -707,7 +514,6 @@ u8 iSeries_Read_Byte(const volatile void __iomem *IoAddress)</div><div class='ctx'> 		return 0xff;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		++Pci_Io_Read_Count;</div><div class='ctx'> 		HvCall3Ret16(HvCallPciBarLoad8, &amp;ret, dsa, BarOffset, 0);</div><div class='ctx'> 	} while (CheckReturnCode("RDB", DevNode, &amp;retry, ret.rc) != 0);</div><div class='ctx'> </div><div class='hunk'>@@ -737,7 +543,6 @@ u16 iSeries_Read_Word(const volatile void __iomem *IoAddress)</div><div class='ctx'> 		return 0xffff;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		++Pci_Io_Read_Count;</div><div class='ctx'> 		HvCall3Ret16(HvCallPciBarLoad16, &amp;ret, dsa,</div><div class='ctx'> 				BarOffset, 0);</div><div class='ctx'> 	} while (CheckReturnCode("RDW", DevNode, &amp;retry, ret.rc) != 0);</div><div class='hunk'>@@ -768,7 +573,6 @@ u32 iSeries_Read_Long(const volatile void __iomem *IoAddress)</div><div class='ctx'> 		return 0xffffffff;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		++Pci_Io_Read_Count;</div><div class='ctx'> 		HvCall3Ret16(HvCallPciBarLoad32, &amp;ret, dsa,</div><div class='ctx'> 				BarOffset, 0);</div><div class='ctx'> 	} while (CheckReturnCode("RDL", DevNode, &amp;retry, ret.rc) != 0);</div><div class='hunk'>@@ -806,7 +610,6 @@ void iSeries_Write_Byte(u8 data, volatile void __iomem *IoAddress)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		++Pci_Io_Write_Count;</div><div class='ctx'> 		rc = HvCall4(HvCallPciBarStore8, dsa, BarOffset, data, 0);</div><div class='ctx'> 	} while (CheckReturnCode("WWB", DevNode, &amp;retry, rc) != 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -834,7 +637,6 @@ void iSeries_Write_Word(u16 data, volatile void __iomem *IoAddress)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		++Pci_Io_Write_Count;</div><div class='ctx'> 		rc = HvCall4(HvCallPciBarStore16, dsa, BarOffset, swab16(data), 0);</div><div class='ctx'> 	} while (CheckReturnCode("WWW", DevNode, &amp;retry, rc) != 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -862,7 +664,6 @@ void iSeries_Write_Long(u32 data, volatile void __iomem *IoAddress)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	do {</div><div class='del'>-		++Pci_Io_Write_Count;</div><div class='ctx'> 		rc = HvCall4(HvCallPciBarStore32, dsa, BarOffset, swab32(data), 0);</div><div class='ctx'> 	} while (CheckReturnCode("WWL", DevNode, &amp;retry, rc) != 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c<br/>index e68b6b5fa89f..c241413629ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/proc.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/lppaca.h&gt;</div><div class='del'>-#include &lt;asm/iseries/it_lp_queue.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "processor_vpd.h"</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c<br/>index a6fd9bedb074..c9605d773a77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/setup.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -50,7 +49,6 @@</div><div class='ctx'> #include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/it_lp_queue.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/mf.h&gt;</div><div class='del'>-#include &lt;asm/iseries/it_exp_vpd_panel.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/hv_lp_event.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/lpar_map.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='hunk'>@@ -81,18 +79,11 @@ extern void iSeries_pci_final_fixup(void);</div><div class='ctx'> static void iSeries_pci_final_fixup(void) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Global Variables */</div><div class='del'>-int piranha_simulator;</div><div class='del'>-</div><div class='ctx'> extern int rd_size;		/* Defined in drivers/block/rd.c */</div><div class='del'>-extern unsigned long embedded_sysmap_start;</div><div class='del'>-extern unsigned long embedded_sysmap_end;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long iSeries_recal_tb;</div><div class='ctx'> extern unsigned long iSeries_recal_titan;</div><div class='ctx'> </div><div class='del'>-static unsigned long cmd_mem_limit;</div><div class='del'>-</div><div class='ctx'> struct MemoryBlock {</div><div class='ctx'> 	unsigned long absStart;</div><div class='ctx'> 	unsigned long absEnd;</div><div class='hunk'>@@ -303,8 +294,6 @@ static void __init iSeries_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	DBG(" -&gt; iSeries_init_early()\n");</div><div class='ctx'> </div><div class='del'>-	ppc64_interrupt_controller = IC_ISERIES;</div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_BLK_DEV_INITRD)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the init RAM disk has been configured and there is</div><div class='hunk'>@@ -327,11 +316,6 @@ static void __init iSeries_init_early(void)</div><div class='ctx'> 	iSeries_recal_titan = HvCallXm_loadTod();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Initialize the hash table management pointers</div><div class='del'>-	 */</div><div class='del'>-	hpte_init_iSeries();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Initialize the DMA/TCE management</div><div class='ctx'> 	 */</div><div class='ctx'> 	iommu_init_early_iSeries();</div><div class='hunk'>@@ -340,8 +324,6 @@ static void __init iSeries_init_early(void)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	smp_init_iSeries();</div><div class='ctx'> #endif</div><div class='del'>-	if (itLpNaca.xPirEnvironMode == 0)</div><div class='del'>-		piranha_simulator = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Associate Lp Event Queue 0 with processor 0 */</div><div class='ctx'> 	HvCallEvent_setLpEventQueueInterruptProc(0, 0);</div><div class='hunk'>@@ -536,10 +518,10 @@ static void __init iSeries_setup_arch(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (get_lppaca()-&gt;shared_proc) {</div><div class='ctx'> 		ppc_md.idle_loop = iseries_shared_idle;</div><div class='del'>-		printk(KERN_INFO "Using shared processor idle loop\n");</div><div class='add'>+		printk(KERN_DEBUG "Using shared processor idle loop\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ppc_md.idle_loop = iseries_dedicated_idle;</div><div class='del'>-		printk(KERN_INFO "Using dedicated idle loop\n");</div><div class='add'>+		printk(KERN_DEBUG "Using dedicated idle loop\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the Lp Event Queue */</div><div class='hunk'>@@ -571,16 +553,6 @@ static void __init iSeries_fixup_klimit(void)</div><div class='ctx'> 	if (naca.xRamDisk)</div><div class='ctx'> 		klimit = KERNELBASE + (u64)naca.xRamDisk +</div><div class='ctx'> 			(naca.xRamDiskSize * HW_PAGE_SIZE);</div><div class='del'>-	else {</div><div class='del'>-		/*</div><div class='del'>-		 * No ram disk was included - check and see if there</div><div class='del'>-		 * was an embedded system map.  Change klimit to take</div><div class='del'>-		 * into account any embedded system map</div><div class='del'>-		 */</div><div class='del'>-		if (embedded_sysmap_end)</div><div class='del'>-			klimit = KERNELBASE + ((embedded_sysmap_end + 4095) &amp;</div><div class='del'>-					0xfffffffffffff000);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init iSeries_src_init(void)</div><div class='hunk'>@@ -685,11 +657,7 @@ static int __init iseries_probe(void)</div><div class='ctx'> 	powerpc_firmware_features |= FW_FEATURE_ISERIES;</div><div class='ctx'> 	powerpc_firmware_features |= FW_FEATURE_LPAR;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The Hypervisor only allows us up to 256 interrupt</div><div class='del'>-	 * sources (the irq number is passed in a u8).</div><div class='del'>-	 */</div><div class='del'>-	virt_irq_max = 255;</div><div class='add'>+	hpte_init_iSeries();</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -714,243 +682,6 @@ define_machine(iseries) {</div><div class='ctx'> 	/* XXX Implement enable_pmcs for iSeries */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct blob {</div><div class='del'>-	unsigned char data[PAGE_SIZE];</div><div class='del'>-	unsigned long next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iseries_flat_dt {</div><div class='del'>-	struct boot_param_header header;</div><div class='del'>-	u64 reserve_map[2];</div><div class='del'>-	struct blob dt;</div><div class='del'>-	struct blob strings;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iseries_flat_dt iseries_dt;</div><div class='del'>-</div><div class='del'>-void dt_init(struct iseries_flat_dt *dt)</div><div class='del'>-{</div><div class='del'>-	dt-&gt;header.off_mem_rsvmap =</div><div class='del'>-		offsetof(struct iseries_flat_dt, reserve_map);</div><div class='del'>-	dt-&gt;header.off_dt_struct = offsetof(struct iseries_flat_dt, dt);</div><div class='del'>-	dt-&gt;header.off_dt_strings = offsetof(struct iseries_flat_dt, strings);</div><div class='del'>-	dt-&gt;header.totalsize = sizeof(struct iseries_flat_dt);</div><div class='del'>-	dt-&gt;header.dt_strings_size = sizeof(struct blob);</div><div class='del'>-</div><div class='del'>-	/* There is no notion of hardware cpu id on iSeries */</div><div class='del'>-	dt-&gt;header.boot_cpuid_phys = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	dt-&gt;dt.next = (unsigned long)&amp;dt-&gt;dt.data;</div><div class='del'>-	dt-&gt;strings.next = (unsigned long)&amp;dt-&gt;strings.data;</div><div class='del'>-</div><div class='del'>-	dt-&gt;header.magic = OF_DT_HEADER;</div><div class='del'>-	dt-&gt;header.version = 0x10;</div><div class='del'>-	dt-&gt;header.last_comp_version = 0x10;</div><div class='del'>-</div><div class='del'>-	dt-&gt;reserve_map[0] = 0;</div><div class='del'>-	dt-&gt;reserve_map[1] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_check_blob(struct blob *b)</div><div class='del'>-{</div><div class='del'>-	if (b-&gt;next &gt;= (unsigned long)&amp;b-&gt;next) {</div><div class='del'>-		DBG("Ran out of space in flat device tree blob!\n");</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_push_u32(struct iseries_flat_dt *dt, u32 value)</div><div class='del'>-{</div><div class='del'>-	*((u32*)dt-&gt;dt.next) = value;</div><div class='del'>-	dt-&gt;dt.next += sizeof(u32);</div><div class='del'>-</div><div class='del'>-	dt_check_blob(&amp;dt-&gt;dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_push_u64(struct iseries_flat_dt *dt, u64 value)</div><div class='del'>-{</div><div class='del'>-	*((u64*)dt-&gt;dt.next) = value;</div><div class='del'>-	dt-&gt;dt.next += sizeof(u64);</div><div class='del'>-</div><div class='del'>-	dt_check_blob(&amp;dt-&gt;dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned long dt_push_bytes(struct blob *blob, char *data, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned long start = blob-&gt;next - (unsigned long)blob-&gt;data;</div><div class='del'>-</div><div class='del'>-	memcpy((char *)blob-&gt;next, data, len);</div><div class='del'>-	blob-&gt;next = _ALIGN(blob-&gt;next + len, 4);</div><div class='del'>-</div><div class='del'>-	dt_check_blob(blob);</div><div class='del'>-</div><div class='del'>-	return start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_start_node(struct iseries_flat_dt *dt, char *name)</div><div class='del'>-{</div><div class='del'>-	dt_push_u32(dt, OF_DT_BEGIN_NODE);</div><div class='del'>-	dt_push_bytes(&amp;dt-&gt;dt, name, strlen(name) + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define dt_end_node(dt) dt_push_u32(dt, OF_DT_END_NODE)</div><div class='del'>-</div><div class='del'>-void dt_prop(struct iseries_flat_dt *dt, char *name, char *data, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned long offset;</div><div class='del'>-</div><div class='del'>-	dt_push_u32(dt, OF_DT_PROP);</div><div class='del'>-</div><div class='del'>-	/* Length of the data */</div><div class='del'>-	dt_push_u32(dt, len);</div><div class='del'>-</div><div class='del'>-	/* Put the property name in the string blob. */</div><div class='del'>-	offset = dt_push_bytes(&amp;dt-&gt;strings, name, strlen(name) + 1);</div><div class='del'>-</div><div class='del'>-	/* The offset of the properties name in the string blob. */</div><div class='del'>-	dt_push_u32(dt, (u32)offset);</div><div class='del'>-</div><div class='del'>-	/* The actual data. */</div><div class='del'>-	dt_push_bytes(&amp;dt-&gt;dt, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_prop_str(struct iseries_flat_dt *dt, char *name, char *data)</div><div class='del'>-{</div><div class='del'>-	dt_prop(dt, name, data, strlen(data) + 1); /* + 1 for NULL */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_prop_u32(struct iseries_flat_dt *dt, char *name, u32 data)</div><div class='del'>-{</div><div class='del'>-	dt_prop(dt, name, (char *)&amp;data, sizeof(u32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_prop_u64(struct iseries_flat_dt *dt, char *name, u64 data)</div><div class='del'>-{</div><div class='del'>-	dt_prop(dt, name, (char *)&amp;data, sizeof(u64));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_prop_u64_list(struct iseries_flat_dt *dt, char *name, u64 *data, int n)</div><div class='del'>-{</div><div class='del'>-	dt_prop(dt, name, (char *)data, sizeof(u64) * n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_prop_u32_list(struct iseries_flat_dt *dt, char *name, u32 *data, int n)</div><div class='del'>-{</div><div class='del'>-	dt_prop(dt, name, (char *)data, sizeof(u32) * n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_prop_empty(struct iseries_flat_dt *dt, char *name)</div><div class='del'>-{</div><div class='del'>-	dt_prop(dt, name, NULL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_cpus(struct iseries_flat_dt *dt)</div><div class='del'>-{</div><div class='del'>-	unsigned char buf[32];</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	unsigned int i, index;</div><div class='del'>-	struct IoHriProcessorVpd *d;</div><div class='del'>-	u32 pft_size[2];</div><div class='del'>-</div><div class='del'>-	/* yuck */</div><div class='del'>-	snprintf(buf, 32, "PowerPC,%s", cur_cpu_spec-&gt;cpu_name);</div><div class='del'>-	p = strchr(buf, ' ');</div><div class='del'>-	if (!p) p = buf + strlen(buf);</div><div class='del'>-</div><div class='del'>-	dt_start_node(dt, "cpus");</div><div class='del'>-	dt_prop_u32(dt, "#address-cells", 1);</div><div class='del'>-	dt_prop_u32(dt, "#size-cells", 0);</div><div class='del'>-</div><div class='del'>-	pft_size[0] = 0; /* NUMA CEC cookie, 0 for non NUMA  */</div><div class='del'>-	pft_size[1] = __ilog2(HvCallHpt_getHptPages() * HW_PAGE_SIZE);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NR_CPUS; i++) {</div><div class='del'>-		if (lppaca[i].dyn_proc_status &gt;= 2)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		snprintf(p, 32 - (p - buf), "@%d", i);</div><div class='del'>-		dt_start_node(dt, buf);</div><div class='del'>-</div><div class='del'>-		dt_prop_str(dt, "device_type", "cpu");</div><div class='del'>-</div><div class='del'>-		index = lppaca[i].dyn_hv_phys_proc_index;</div><div class='del'>-		d = &amp;xIoHriProcessorVpd[index];</div><div class='del'>-</div><div class='del'>-		dt_prop_u32(dt, "i-cache-size", d-&gt;xInstCacheSize * 1024);</div><div class='del'>-		dt_prop_u32(dt, "i-cache-line-size", d-&gt;xInstCacheOperandSize);</div><div class='del'>-</div><div class='del'>-		dt_prop_u32(dt, "d-cache-size", d-&gt;xDataL1CacheSizeKB * 1024);</div><div class='del'>-		dt_prop_u32(dt, "d-cache-line-size", d-&gt;xDataCacheOperandSize);</div><div class='del'>-</div><div class='del'>-		/* magic conversions to Hz copied from old code */</div><div class='del'>-		dt_prop_u32(dt, "clock-frequency",</div><div class='del'>-			((1UL &lt;&lt; 34) * 1000000) / d-&gt;xProcFreq);</div><div class='del'>-		dt_prop_u32(dt, "timebase-frequency",</div><div class='del'>-			((1UL &lt;&lt; 32) * 1000000) / d-&gt;xTimeBaseFreq);</div><div class='del'>-</div><div class='del'>-		dt_prop_u32(dt, "reg", i);</div><div class='del'>-</div><div class='del'>-		dt_prop_u32_list(dt, "ibm,pft-size", pft_size, 2);</div><div class='del'>-</div><div class='del'>-		dt_end_node(dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dt_end_node(dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void dt_model(struct iseries_flat_dt *dt)</div><div class='del'>-{</div><div class='del'>-	char buf[16] = "IBM,";</div><div class='del'>-</div><div class='del'>-	/* "IBM," + mfgId[2:3] + systemSerial[1:5] */</div><div class='del'>-	strne2a(buf + 4, xItExtVpdPanel.mfgID + 2, 2);</div><div class='del'>-	strne2a(buf + 6, xItExtVpdPanel.systemSerial + 1, 5);</div><div class='del'>-	buf[11] = '\0';</div><div class='del'>-	dt_prop_str(dt, "system-id", buf);</div><div class='del'>-</div><div class='del'>-	/* "IBM," + machineType[0:4] */</div><div class='del'>-	strne2a(buf + 4, xItExtVpdPanel.machineType, 4);</div><div class='del'>-	buf[8] = '\0';</div><div class='del'>-	dt_prop_str(dt, "model", buf);</div><div class='del'>-</div><div class='del'>-	dt_prop_str(dt, "compatible", "IBM,iSeries");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void build_flat_dt(struct iseries_flat_dt *dt, unsigned long phys_mem_size)</div><div class='del'>-{</div><div class='del'>-	u64 tmp[2];</div><div class='del'>-</div><div class='del'>-	dt_init(dt);</div><div class='del'>-</div><div class='del'>-	dt_start_node(dt, "");</div><div class='del'>-</div><div class='del'>-	dt_prop_u32(dt, "#address-cells", 2);</div><div class='del'>-	dt_prop_u32(dt, "#size-cells", 2);</div><div class='del'>-	dt_model(dt);</div><div class='del'>-</div><div class='del'>-	/* /memory */</div><div class='del'>-	dt_start_node(dt, "memory@0");</div><div class='del'>-	dt_prop_str(dt, "name", "memory");</div><div class='del'>-	dt_prop_str(dt, "device_type", "memory");</div><div class='del'>-	tmp[0] = 0;</div><div class='del'>-	tmp[1] = phys_mem_size;</div><div class='del'>-	dt_prop_u64_list(dt, "reg", tmp, 2);</div><div class='del'>-	dt_end_node(dt);</div><div class='del'>-</div><div class='del'>-	/* /chosen */</div><div class='del'>-	dt_start_node(dt, "chosen");</div><div class='del'>-	dt_prop_str(dt, "bootargs", cmd_line);</div><div class='del'>-	if (cmd_mem_limit)</div><div class='del'>-		dt_prop_u64(dt, "linux,memory-limit", cmd_mem_limit);</div><div class='del'>-	dt_end_node(dt);</div><div class='del'>-</div><div class='del'>-	dt_cpus(dt);</div><div class='del'>-</div><div class='del'>-	dt_end_node(dt);</div><div class='del'>-</div><div class='del'>-	dt_push_u32(dt, OF_DT_END);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void * __init iSeries_early_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long phys_mem_size;</div><div class='hunk'>@@ -965,28 +696,8 @@ void * __init iSeries_early_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	iSeries_get_cmdline();</div><div class='ctx'> </div><div class='del'>-	/* Save unparsed command line copy for /proc/cmdline */</div><div class='del'>-	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Parse early parameters, in particular mem=x */</div><div class='del'>-	parse_early_param();</div><div class='del'>-</div><div class='del'>-	build_flat_dt(&amp;iseries_dt, phys_mem_size);</div><div class='del'>-</div><div class='del'>-	return (void *) __pa(&amp;iseries_dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * On iSeries we just parse the mem=X option from the command line.</div><div class='del'>- * On pSeries it's a bit more complicated, see prom_init_mem()</div><div class='del'>- */</div><div class='del'>-static int __init early_parsemem(char *p)</div><div class='del'>-{</div><div class='del'>-	if (p)</div><div class='del'>-		cmd_mem_limit = ALIGN(memparse(p, &amp;p), PAGE_SIZE);</div><div class='del'>-	return 0;</div><div class='add'>+	return (void *) __pa(build_flat_dt(phys_mem_size));</div><div class='ctx'> }</div><div class='del'>-early_param("mem", early_parsemem);</div><div class='ctx'> </div><div class='ctx'> static void hvputc(char c)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/setup.h b/arch/powerpc/platforms/iseries/setup.h<br/>index 5213044ec411..0a47ac53c959 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/setup.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/setup.h</a></div><div class='hunk'>@@ -21,4 +21,6 @@ extern unsigned long iSeries_get_boot_time(void);</div><div class='ctx'> extern int iSeries_set_rtc_time(struct rtc_time *tm);</div><div class='ctx'> extern void iSeries_get_rtc_time(struct rtc_time *tm);</div><div class='ctx'> </div><div class='add'>+extern void *build_flat_dt(unsigned long phys_mem_size);</div><div class='add'>+</div><div class='ctx'> #endif /* __ISERIES_SETUP_H__ */</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c<br/>index 6f9d407a709f..2eb095edb472 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/iseries/smp.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c<br/>deleted file mode 100644<br/>index ad36ab0639f0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/iseries/vio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/iseries/vio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * IBM PowerPC iSeries Virtual I/O Infrastructure Support.</div><div class='del'>- *</div><div class='del'>- *    Copyright (c) 2005 Stephen Rothwell, IBM Corp.</div><div class='del'>- *</div><div class='del'>- *      This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/vio.h&gt;</div><div class='del'>-#include &lt;asm/iommu.h&gt;</div><div class='del'>-#include &lt;asm/tce.h&gt;</div><div class='del'>-#include &lt;asm/abs_addr.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/iseries/vio.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_types.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_lp_config.h&gt;</div><div class='del'>-#include &lt;asm/iseries/hv_call_xm.h&gt;</div><div class='del'>-</div><div class='del'>-#include "iommu.h"</div><div class='del'>-</div><div class='del'>-struct device *iSeries_vio_dev = &amp;vio_bus_device.dev;</div><div class='del'>-EXPORT_SYMBOL(iSeries_vio_dev);</div><div class='del'>-</div><div class='del'>-static struct iommu_table veth_iommu_table;</div><div class='del'>-static struct iommu_table vio_iommu_table;</div><div class='del'>-</div><div class='del'>-static void __init iommu_vio_init(void)</div><div class='del'>-{</div><div class='del'>-	iommu_table_getparms_iSeries(255, 0, 0xff, &amp;veth_iommu_table);</div><div class='del'>-	veth_iommu_table.it_size /= 2;</div><div class='del'>-	vio_iommu_table = veth_iommu_table;</div><div class='del'>-	vio_iommu_table.it_offset += veth_iommu_table.it_size;</div><div class='del'>-</div><div class='del'>-	if (!iommu_init_table(&amp;veth_iommu_table))</div><div class='del'>-		printk("Virtual Bus VETH TCE table failed.\n");</div><div class='del'>-	if (!iommu_init_table(&amp;vio_iommu_table))</div><div class='del'>-		printk("Virtual Bus VIO TCE table failed.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_register_device_iseries: - Register a new iSeries vio device.</div><div class='del'>- * @voidev:	The device to register.</div><div class='del'>- */</div><div class='del'>-static struct vio_dev *__init vio_register_device_iseries(char *type,</div><div class='del'>-		uint32_t unit_num)</div><div class='del'>-{</div><div class='del'>-	struct vio_dev *viodev;</div><div class='del'>-</div><div class='del'>-	/* allocate a vio_dev for this device */</div><div class='del'>-	viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);</div><div class='del'>-	if (!viodev)</div><div class='del'>-		return NULL;</div><div class='del'>-	memset(viodev, 0, sizeof(struct vio_dev));</div><div class='del'>-</div><div class='del'>-	snprintf(viodev-&gt;dev.bus_id, BUS_ID_SIZE, "%s%d", type, unit_num);</div><div class='del'>-</div><div class='del'>-	viodev-&gt;name = viodev-&gt;dev.bus_id;</div><div class='del'>-	viodev-&gt;type = type;</div><div class='del'>-	viodev-&gt;unit_address = unit_num;</div><div class='del'>-	viodev-&gt;iommu_table = &amp;vio_iommu_table;</div><div class='del'>-	if (vio_register_device(viodev) == NULL) {</div><div class='del'>-		kfree(viodev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return viodev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init probe_bus_iseries(void)</div><div class='del'>-{</div><div class='del'>-	HvLpIndexMap vlan_map;</div><div class='del'>-	struct vio_dev *viodev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* there is only one of each of these */</div><div class='del'>-	vio_register_device_iseries("viocons", 0);</div><div class='del'>-	vio_register_device_iseries("vscsi", 0);</div><div class='del'>-</div><div class='del'>-	vlan_map = HvLpConfig_getVirtualLanIndexMap();</div><div class='del'>-	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALLANS; i++) {</div><div class='del'>-		if ((vlan_map &amp; (0x8000 &gt;&gt; i)) == 0)</div><div class='del'>-			continue;</div><div class='del'>-		viodev = vio_register_device_iseries("vlan", i);</div><div class='del'>-		/* veth is special and has it own iommu_table */</div><div class='del'>-		viodev-&gt;iommu_table = &amp;veth_iommu_table;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALDISKS; i++)</div><div class='del'>-		vio_register_device_iseries("viodasd", i);</div><div class='del'>-	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALCDROMS; i++)</div><div class='del'>-		vio_register_device_iseries("viocd", i);</div><div class='del'>-	for (i = 0; i &lt; HVMAXARCHITECTEDVIRTUALTAPES; i++)</div><div class='del'>-		vio_register_device_iseries("viotape", i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_match_device_iseries: - Tell if a iSeries VIO device matches a</div><div class='del'>- *	vio_device_id</div><div class='del'>- */</div><div class='del'>-static int vio_match_device_iseries(const struct vio_device_id *id,</div><div class='del'>-		const struct vio_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return strncmp(dev-&gt;type, id-&gt;type, strlen(id-&gt;type)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct vio_bus_ops vio_bus_ops_iseries = {</div><div class='del'>-	.match = vio_match_device_iseries,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_bus_init_iseries: - Initialize the iSeries virtual IO bus</div><div class='del'>- */</div><div class='del'>-static int __init vio_bus_init_iseries(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = vio_bus_init(&amp;vio_bus_ops_iseries);</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		iommu_vio_init();</div><div class='del'>-		vio_bus_device.iommu_table = &amp;vio_iommu_table;</div><div class='del'>-		iSeries_vio_dev = &amp;vio_bus_device.dev;</div><div class='del'>-		probe_bus_iseries();</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__initcall(vio_bus_init_iseries);</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c<br/>index 85d6c93659cc..63a1670d3bfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/maple/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/maple/pci.c</a></div><div class='hunk'>@@ -376,9 +376,10 @@ static void __init maple_fixup_phb_resources(void)</div><div class='ctx'> 		unsigned long offset = (unsigned long)hose-&gt;io_base_virt - pci_io_base;</div><div class='ctx'> 		hose-&gt;io_resource.start += offset;</div><div class='ctx'> 		hose-&gt;io_resource.end += offset;</div><div class='del'>-		printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",</div><div class='add'>+		printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n",</div><div class='ctx'> 		       hose-&gt;global_number,</div><div class='del'>-		       hose-&gt;io_resource.start, hose-&gt;io_resource.end);</div><div class='add'>+		       (unsigned long long)hose-&gt;io_resource.start,</div><div class='add'>+		       (unsigned long long)hose-&gt;io_resource.end);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -437,26 +438,28 @@ void __init maple_pci_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Tell pci.c to not change any resource allocations.  */</div><div class='ctx'> 	pci_probe_only = 1;</div><div class='del'>-	</div><div class='del'>-	/* Allow all IO */</div><div class='del'>-	io_page_mask = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='del'>-	int irq = channel ? 15 : 14;</div><div class='add'>+	unsigned int defirq = channel ? 15 : 14;</div><div class='add'>+	unsigned int irq;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;vendor != PCI_VENDOR_ID_AMD ||</div><div class='ctx'> 	    pdev-&gt;device != PCI_DEVICE_ID_AMD_8111_IDE)</div><div class='del'>-		return irq;</div><div class='add'>+		return defirq;</div><div class='ctx'> </div><div class='ctx'> 	np = pci_device_to_OF_node(pdev);</div><div class='ctx'> 	if (np == NULL)</div><div class='del'>-		return irq;</div><div class='del'>-	if (np-&gt;n_intrs &lt; 2)</div><div class='del'>-		return irq;</div><div class='del'>-	return np-&gt;intrs[channel &amp; 0x1].line;</div><div class='add'>+		return defirq;</div><div class='add'>+	irq = irq_of_parse_and_map(np, channel &amp; 0x1);</div><div class='add'>+	if (irq == NO_IRQ) {</div><div class='add'>+		printk("Failed to map onboard IDE interrupt for channel %d\n",</div><div class='add'>+		       channel);</div><div class='add'>+		return defirq;</div><div class='add'>+	}</div><div class='add'>+	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* XXX: To remove once all firmwares are ok */</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c<br/>index 24c0aef4ea39..cb528c9de4c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/maple/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/maple/setup.c</a></div><div class='hunk'>@@ -11,9 +11,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define DEBUG</div><div class='add'>+#undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -189,7 +188,7 @@ void __init maple_setup_arch(void)</div><div class='ctx'> 	conswitchp = &amp;dummy_con;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Using native/NAP idle loop\n");</div><div class='add'>+	printk(KERN_DEBUG "Using native/NAP idle loop\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='hunk'>@@ -199,55 +198,81 @@ static void __init maple_init_early(void)</div><div class='ctx'> {</div><div class='ctx'> 	DBG(" -&gt; maple_init_early\n");</div><div class='ctx'> </div><div class='del'>-	/* Initialize hash table, from now on, we can take hash faults</div><div class='del'>-	 * and call ioremap</div><div class='del'>-	 */</div><div class='del'>-	hpte_init_native();</div><div class='del'>-</div><div class='del'>-	/* Setup interrupt mapping options */</div><div class='del'>-	ppc64_interrupt_controller = IC_OPEN_PIC;</div><div class='del'>-</div><div class='ctx'> 	iommu_init_early_dart();</div><div class='ctx'> </div><div class='ctx'> 	DBG(" &lt;- maple_init_early\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static __init void maple_init_IRQ(void)</div><div class='add'>+/*</div><div class='add'>+ * This is almost identical to pSeries and CHRP. We need to make that</div><div class='add'>+ * code generic at one point, with appropriate bits in the device-tree to</div><div class='add'>+ * identify the presence of an HT APIC</div><div class='add'>+ */</div><div class='add'>+static void __init maple_init_IRQ(void)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *root;</div><div class='add'>+	struct device_node *root, *np, *mpic_node = NULL;</div><div class='ctx'> 	unsigned int *opprop;</div><div class='del'>-	unsigned long opic_addr;</div><div class='add'>+	unsigned long openpic_addr = 0;</div><div class='add'>+	int naddr, n, i, opplen, has_isus = 0;</div><div class='ctx'> 	struct mpic *mpic;</div><div class='del'>-	unsigned char senses[128];</div><div class='del'>-	int n;</div><div class='add'>+	unsigned int flags = MPIC_PRIMARY;</div><div class='ctx'> </div><div class='del'>-	DBG(" -&gt; maple_init_IRQ\n");</div><div class='add'>+	/* Locate MPIC in the device-tree. Note that there is a bug</div><div class='add'>+	 * in Maple device-tree where the type of the controller is</div><div class='add'>+	 * open-pic and not interrupt-controller</div><div class='add'>+	 */</div><div class='add'>+	for_each_node_by_type(np, "open-pic") {</div><div class='add'>+		mpic_node = np;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (mpic_node == NULL) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "Failed to locate the MPIC interrupt controller\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* XXX: Non standard, replace that with a proper openpic/mpic node</div><div class='del'>-	 * in the device-tree. Find the Open PIC if present */</div><div class='add'>+	/* Find address list in /platform-open-pic */</div><div class='ctx'> 	root = of_find_node_by_path("/");</div><div class='del'>-	opprop = (unsigned int *) get_property(root,</div><div class='del'>-				"platform-open-pic", NULL);</div><div class='del'>-	if (opprop == 0)</div><div class='del'>-		panic("OpenPIC not found !\n");</div><div class='del'>-</div><div class='del'>-	n = prom_n_addr_cells(root);</div><div class='del'>-	for (opic_addr = 0; n &gt; 0; --n)</div><div class='del'>-		opic_addr = (opic_addr &lt;&lt; 32) + *opprop++;</div><div class='add'>+	naddr = prom_n_addr_cells(root);</div><div class='add'>+	opprop = (unsigned int *) get_property(root, "platform-open-pic",</div><div class='add'>+					       &amp;opplen);</div><div class='add'>+	if (opprop != 0) {</div><div class='add'>+		openpic_addr = of_read_number(opprop, naddr);</div><div class='add'>+		has_isus = (opplen &gt; naddr);</div><div class='add'>+		printk(KERN_DEBUG "OpenPIC addr: %lx, has ISUs: %d\n",</div><div class='add'>+		       openpic_addr, has_isus);</div><div class='add'>+	}</div><div class='ctx'> 	of_node_put(root);</div><div class='ctx'> </div><div class='del'>-	/* Obtain sense values from device-tree */</div><div class='del'>-	prom_get_irq_senses(senses, 0, 128);</div><div class='add'>+	BUG_ON(openpic_addr == 0);</div><div class='ctx'> </div><div class='del'>-	mpic = mpic_alloc(opic_addr,</div><div class='del'>-			  MPIC_PRIMARY | MPIC_BIG_ENDIAN |</div><div class='del'>-			  MPIC_BROKEN_U3 | MPIC_WANTS_RESET,</div><div class='del'>-			  0, 0, 128, 128, senses, 128, "U3-MPIC");</div><div class='add'>+	/* Check for a big endian MPIC */</div><div class='add'>+	if (get_property(np, "big-endian", NULL) != NULL)</div><div class='add'>+		flags |= MPIC_BIG_ENDIAN;</div><div class='add'>+</div><div class='add'>+	/* XXX Maple specific bits */</div><div class='add'>+	flags |= MPIC_BROKEN_U3 | MPIC_WANTS_RESET;</div><div class='add'>+</div><div class='add'>+	/* Setup the openpic driver. More device-tree junks, we hard code no</div><div class='add'>+	 * ISUs for now. I'll have to revisit some stuffs with the folks doing</div><div class='add'>+	 * the firmware for those</div><div class='add'>+	 */</div><div class='add'>+	mpic = mpic_alloc(mpic_node, openpic_addr, flags,</div><div class='add'>+			  /*has_isus ? 16 :*/ 0, 0, " MPIC     ");</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	mpic_init(mpic);</div><div class='ctx'> </div><div class='del'>-	DBG(" &lt;- maple_init_IRQ\n");</div><div class='add'>+	/* Add ISUs */</div><div class='add'>+	opplen /= sizeof(u32);</div><div class='add'>+	for (n = 0, i = naddr; i &lt; opplen; i += naddr, n++) {</div><div class='add'>+		unsigned long isuaddr = of_read_number(opprop + i, naddr);</div><div class='add'>+		mpic_assign_isu(mpic, n, isuaddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All ISUs are setup, complete initialization */</div><div class='add'>+	mpic_init(mpic);</div><div class='add'>+	ppc_md.get_irq = mpic_get_irq;</div><div class='add'>+	of_node_put(mpic_node);</div><div class='add'>+	of_node_put(root);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init maple_progress(char *s, unsigned short hex)</div><div class='hunk'>@@ -262,7 +287,9 @@ static void __init maple_progress(char *s, unsigned short hex)</div><div class='ctx'> static int __init maple_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long root = of_get_flat_dt_root();</div><div class='del'>-	if (!of_flat_dt_is_compatible(root, "Momentum,Maple"))</div><div class='add'>+</div><div class='add'>+	if (!of_flat_dt_is_compatible(root, "Momentum,Maple") &amp;&amp;</div><div class='add'>+	    !of_flat_dt_is_compatible(root, "Momentum,Apache"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * On U3, the DART (iommu) must be allocated now since it</div><div class='hunk'>@@ -272,6 +299,8 @@ static int __init maple_probe(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	alloc_dart_table();</div><div class='ctx'> </div><div class='add'>+	hpte_init_native();</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -281,7 +310,6 @@ define_machine(maple_md) {</div><div class='ctx'> 	.setup_arch		= maple_setup_arch,</div><div class='ctx'> 	.init_early		= maple_init_early,</div><div class='ctx'> 	.init_IRQ		= maple_init_IRQ,</div><div class='del'>-	.get_irq		= mpic_get_irq,</div><div class='ctx'> 	.pcibios_fixup		= maple_pcibios_fixup,</div><div class='ctx'> 	.pci_get_legacy_ide_irq	= maple_pci_get_legacy_ide_irq,</div><div class='ctx'> 	.restart		= maple_restart,</div><div class='head'>diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c<br/>index b9a2b3d4bf33..9f7579b38c72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/maple/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/maple/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/maple/time.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/backlight.c b/arch/powerpc/platforms/powermac/backlight.c<br/>index 8be2f7d071f0..74eed6b74cd6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/backlight.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/backlight.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/backlight.c</a></div><div class='hunk'>@@ -3,200 +3,170 @@</div><div class='ctx'>  * Contains support for the backlight.</div><div class='ctx'>  *</div><div class='ctx'>  *   Copyright (C) 2000 Benjamin Herrenschmidt</div><div class='add'>+ *   Copyright (C) 2006 Michael Hanselmann &lt;linux-kernel@hansmi.ch&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/reboot.h&gt;</div><div class='del'>-#include &lt;linux/nvram.h&gt;</div><div class='del'>-#include &lt;linux/console.h&gt;</div><div class='del'>-#include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/nvram.h&gt;</div><div class='ctx'> #include &lt;asm/backlight.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/adb.h&gt;</div><div class='del'>-#include &lt;linux/pmu.h&gt;</div><div class='add'>+#define OLD_BACKLIGHT_MAX 15</div><div class='ctx'> </div><div class='del'>-static struct backlight_controller *backlighter;</div><div class='del'>-static void* backlighter_data;</div><div class='del'>-static int backlight_autosave;</div><div class='del'>-static int backlight_level = BACKLIGHT_MAX;</div><div class='del'>-static int backlight_enabled = 1;</div><div class='del'>-static int backlight_req_level = -1;</div><div class='del'>-static int backlight_req_enable = -1;</div><div class='add'>+static void pmac_backlight_key_worker(void *data);</div><div class='add'>+static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker, NULL);</div><div class='ctx'> </div><div class='del'>-static void backlight_callback(void *);</div><div class='del'>-static DECLARE_WORK(backlight_work, backlight_callback, NULL);</div><div class='add'>+/* Although this variable is used in interrupt context, it makes no sense to</div><div class='add'>+ * protect it. No user is able to produce enough key events per second and</div><div class='add'>+ * notice the errors that might happen.</div><div class='add'>+ */</div><div class='add'>+static int pmac_backlight_key_queued;</div><div class='add'>+</div><div class='add'>+/* Protect the pmac_backlight variable */</div><div class='add'>+DEFINE_MUTEX(pmac_backlight_mutex);</div><div class='ctx'> </div><div class='del'>-void register_backlight_controller(struct backlight_controller *ctrler,</div><div class='del'>-					  void *data, char *type)</div><div class='add'>+/* Main backlight storage</div><div class='add'>+ *</div><div class='add'>+ * Backlight drivers in this variable are required to have the "props"</div><div class='add'>+ * attribute set and to have an update_status function.</div><div class='add'>+ *</div><div class='add'>+ * We can only store one backlight here, but since Apple laptops have only one</div><div class='add'>+ * internal display, it doesn't matter. Other backlight drivers can be used</div><div class='add'>+ * independently.</div><div class='add'>+ *</div><div class='add'>+ * Lock ordering:</div><div class='add'>+ * pmac_backlight_mutex (global, main backlight)</div><div class='add'>+ *   pmac_backlight-&gt;sem (backlight class)</div><div class='add'>+ */</div><div class='add'>+struct backlight_device *pmac_backlight;</div><div class='add'>+</div><div class='add'>+int pmac_has_backlight_type(const char *type)</div><div class='ctx'> {</div><div class='del'>-	struct device_node* bk_node;</div><div class='del'>-	char *prop;</div><div class='del'>-	int valid = 0;</div><div class='del'>-</div><div class='del'>-	/* There's already a matching controller, bail out */</div><div class='del'>-	if (backlighter != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bk_node = find_devices("backlight");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ADB_PMU</div><div class='del'>-	/* Special case for the old PowerBook since I can't test on it */</div><div class='del'>-	backlight_autosave = machine_is_compatible("AAPL,3400/2400")</div><div class='del'>-		|| machine_is_compatible("AAPL,3500");</div><div class='del'>-	if ((backlight_autosave</div><div class='del'>-	     || machine_is_compatible("AAPL,PowerBook1998")</div><div class='del'>-	     || machine_is_compatible("PowerBook1,1"))</div><div class='del'>-	    &amp;&amp; !strcmp(type, "pmu"))</div><div class='del'>-		valid = 1;</div><div class='del'>-#endif</div><div class='add'>+	struct device_node* bk_node = find_devices("backlight");</div><div class='add'>+</div><div class='ctx'> 	if (bk_node) {</div><div class='del'>-		prop = get_property(bk_node, "backlight-control", NULL);</div><div class='del'>-		if (prop &amp;&amp; !strncmp(prop, type, strlen(type)))</div><div class='del'>-			valid = 1;</div><div class='del'>-	}</div><div class='del'>-	if (!valid)</div><div class='del'>-		return;</div><div class='del'>-	backlighter = ctrler;</div><div class='del'>-	backlighter_data = data;</div><div class='del'>-</div><div class='del'>-	if (bk_node &amp;&amp; !backlight_autosave)</div><div class='del'>-		prop = get_property(bk_node, "bklt", NULL);</div><div class='del'>-	else</div><div class='del'>-		prop = NULL;</div><div class='del'>-	if (prop) {</div><div class='del'>-		backlight_level = ((*prop)+1) &gt;&gt; 1;</div><div class='del'>-		if (backlight_level &gt; BACKLIGHT_MAX)</div><div class='del'>-			backlight_level = BACKLIGHT_MAX;</div><div class='add'>+		char *prop = get_property(bk_node, "backlight-control", NULL);</div><div class='add'>+		if (prop &amp;&amp; strncmp(prop, type, strlen(type)) == 0)</div><div class='add'>+			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ADB_PMU</div><div class='del'>-	if (backlight_autosave) {</div><div class='del'>-		struct adb_request req;</div><div class='del'>-		pmu_request(&amp;req, NULL, 2, 0xd9, 0);</div><div class='del'>-		while (!req.complete)</div><div class='del'>-			pmu_poll();</div><div class='del'>-		backlight_level = req.reply[0] &gt;&gt; 4;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	if (!backlighter-&gt;set_enable(1, backlight_level, data))</div><div class='del'>-		backlight_enabled = 1;</div><div class='del'>-	release_console_sem();</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Registered \"%s\" backlight controller,"</div><div class='del'>-	       "level: %d/15\n", type, backlight_level);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(register_backlight_controller);</div><div class='ctx'> </div><div class='del'>-void unregister_backlight_controller(struct backlight_controller</div><div class='del'>-					    *ctrler, void *data)</div><div class='add'>+int pmac_backlight_curve_lookup(struct fb_info *info, int value)</div><div class='ctx'> {</div><div class='del'>-	/* We keep the current backlight level (for now) */</div><div class='del'>-	if (ctrler == backlighter &amp;&amp; data == backlighter_data)</div><div class='del'>-		backlighter = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(unregister_backlight_controller);</div><div class='add'>+	int level = (FB_BACKLIGHT_LEVELS - 1);</div><div class='ctx'> </div><div class='del'>-static int __set_backlight_enable(int enable)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (!backlighter)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	rc = backlighter-&gt;set_enable(enable, backlight_level,</div><div class='del'>-				     backlighter_data);</div><div class='del'>-	if (!rc)</div><div class='del'>-		backlight_enabled = enable;</div><div class='del'>-	release_console_sem();</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-int set_backlight_enable(int enable)</div><div class='del'>-{</div><div class='del'>-	if (!backlighter)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	backlight_req_enable = enable;</div><div class='del'>-	schedule_work(&amp;backlight_work);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (info &amp;&amp; info-&gt;bl_dev) {</div><div class='add'>+		int i, max = 0;</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(set_backlight_enable);</div><div class='add'>+		/* Look for biggest value */</div><div class='add'>+		for (i = 0; i &lt; FB_BACKLIGHT_LEVELS; i++)</div><div class='add'>+			max = max((int)info-&gt;bl_curve[i], max);</div><div class='ctx'> </div><div class='del'>-int get_backlight_enable(void)</div><div class='del'>-{</div><div class='del'>-	if (!backlighter)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	return backlight_enabled;</div><div class='add'>+		/* Look for nearest value */</div><div class='add'>+		for (i = 0; i &lt; FB_BACKLIGHT_LEVELS; i++) {</div><div class='add'>+			int diff = abs(info-&gt;bl_curve[i] - value);</div><div class='add'>+			if (diff &lt; max) {</div><div class='add'>+				max = diff;</div><div class='add'>+				level = i;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return level;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(get_backlight_enable);</div><div class='ctx'> </div><div class='del'>-static int __set_backlight_level(int level)</div><div class='add'>+static void pmac_backlight_key_worker(void *data)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (!backlighter)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (level &lt; BACKLIGHT_MIN)</div><div class='del'>-		level = BACKLIGHT_OFF;</div><div class='del'>-	if (level &gt; BACKLIGHT_MAX)</div><div class='del'>-		level = BACKLIGHT_MAX;</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	if (backlight_enabled)</div><div class='del'>-		rc = backlighter-&gt;set_level(level, backlighter_data);</div><div class='del'>-	if (!rc)</div><div class='del'>-		backlight_level = level;</div><div class='del'>-	release_console_sem();</div><div class='del'>-	if (!rc &amp;&amp; !backlight_autosave) {</div><div class='del'>-		level &lt;&lt;=1;</div><div class='del'>-		if (level &amp; 0x10)</div><div class='del'>-			level |= 0x01;</div><div class='del'>-		// -- todo: save to property "bklt"</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (pmac_backlight) {</div><div class='add'>+		struct backlight_properties *props;</div><div class='add'>+		int brightness;</div><div class='add'>+</div><div class='add'>+		down(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+		props = pmac_backlight-&gt;props;</div><div class='add'>+</div><div class='add'>+		brightness = props-&gt;brightness +</div><div class='add'>+			((pmac_backlight_key_queued?-1:1) *</div><div class='add'>+			 (props-&gt;max_brightness / 15));</div><div class='add'>+</div><div class='add'>+		if (brightness &lt; 0)</div><div class='add'>+			brightness = 0;</div><div class='add'>+		else if (brightness &gt; props-&gt;max_brightness)</div><div class='add'>+			brightness = props-&gt;max_brightness;</div><div class='add'>+</div><div class='add'>+		props-&gt;brightness = brightness;</div><div class='add'>+		props-&gt;update_status(pmac_backlight);</div><div class='add'>+</div><div class='add'>+		up(&amp;pmac_backlight-&gt;sem);</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='ctx'> }</div><div class='del'>-int set_backlight_level(int level)</div><div class='add'>+</div><div class='add'>+void pmac_backlight_key(int direction)</div><div class='ctx'> {</div><div class='del'>-	if (!backlighter)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	backlight_req_level = level;</div><div class='del'>-	schedule_work(&amp;backlight_work);</div><div class='del'>-	return 0;</div><div class='add'>+	/* we can receive multiple interrupts here, but the scheduled work</div><div class='add'>+	 * will run only once, with the last value</div><div class='add'>+	 */</div><div class='add'>+	pmac_backlight_key_queued = direction;</div><div class='add'>+	schedule_work(&amp;pmac_backlight_key_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(set_backlight_level);</div><div class='del'>-</div><div class='del'>-int get_backlight_level(void)</div><div class='add'>+int pmac_backlight_set_legacy_brightness(int brightness)</div><div class='ctx'> {</div><div class='del'>-	if (!backlighter)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	return backlight_level;</div><div class='add'>+	int error = -ENXIO;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (pmac_backlight) {</div><div class='add'>+		struct backlight_properties *props;</div><div class='add'>+</div><div class='add'>+		down(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+		props = pmac_backlight-&gt;props;</div><div class='add'>+		props-&gt;brightness = brightness *</div><div class='add'>+			(props-&gt;max_brightness + 1) /</div><div class='add'>+			(OLD_BACKLIGHT_MAX + 1);</div><div class='add'>+</div><div class='add'>+		if (props-&gt;brightness &gt; props-&gt;max_brightness)</div><div class='add'>+			props-&gt;brightness = props-&gt;max_brightness;</div><div class='add'>+		else if (props-&gt;brightness &lt; 0)</div><div class='add'>+			props-&gt;brightness = 0;</div><div class='add'>+</div><div class='add'>+		props-&gt;update_status(pmac_backlight);</div><div class='add'>+		up(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+</div><div class='add'>+		error = 0;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(get_backlight_level);</div><div class='ctx'> </div><div class='del'>-static void backlight_callback(void *dummy)</div><div class='add'>+int pmac_backlight_get_legacy_brightness()</div><div class='ctx'> {</div><div class='del'>-	int level, enable;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		level = backlight_req_level;</div><div class='del'>-		enable = backlight_req_enable;</div><div class='del'>-		mb();</div><div class='del'>-</div><div class='del'>-		if (level &gt;= 0)</div><div class='del'>-			__set_backlight_level(level);</div><div class='del'>-		if (enable &gt;= 0)</div><div class='del'>-			__set_backlight_enable(enable);</div><div class='del'>-	} while(cmpxchg(&amp;backlight_req_level, level, -1) != level ||</div><div class='del'>-		cmpxchg(&amp;backlight_req_enable, enable, -1) != enable);</div><div class='add'>+	int result = -ENXIO;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (pmac_backlight) {</div><div class='add'>+		struct backlight_properties *props;</div><div class='add'>+</div><div class='add'>+		down(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+		props = pmac_backlight-&gt;props;</div><div class='add'>+</div><div class='add'>+		result = props-&gt;brightness *</div><div class='add'>+			(OLD_BACKLIGHT_MAX + 1) /</div><div class='add'>+			(props-&gt;max_brightness + 1);</div><div class='add'>+</div><div class='add'>+		up(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(pmac_backlight);</div><div class='add'>+EXPORT_SYMBOL_GPL(pmac_backlight_mutex);</div><div class='add'>+EXPORT_SYMBOL_GPL(pmac_has_backlight_type);</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c<br/>index eacbfd9beabc..871b002c9f90 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/bootx_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/bootx_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/bootx_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/bootx_init.c</a></div><div class='hunk'>@@ -9,11 +9,10 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='hunk'>@@ -163,6 +162,8 @@ static void __init bootx_add_chosen_props(unsigned long base,</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='add'>+	bootx_dt_add_prop("linux,bootx", NULL, 0, mem_end);</div><div class='add'>+</div><div class='ctx'> 	if (bootx_info-&gt;kernelParamsOffset) {</div><div class='ctx'> 		char *args = (char *)((unsigned long)bootx_info) +</div><div class='ctx'> 			bootx_info-&gt;kernelParamsOffset;</div><div class='hunk'>@@ -182,8 +183,25 @@ static void __init bootx_add_chosen_props(unsigned long base,</div><div class='ctx'> static void __init bootx_add_display_props(unsigned long base,</div><div class='ctx'> 					   unsigned long *mem_end)</div><div class='ctx'> {</div><div class='add'>+	boot_infos_t *bi = bootx_info;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='ctx'> 	bootx_dt_add_prop("linux,boot-display", NULL, 0, mem_end);</div><div class='ctx'> 	bootx_dt_add_prop("linux,opened", NULL, 0, mem_end);</div><div class='add'>+	tmp = bi-&gt;dispDeviceDepth;</div><div class='add'>+	bootx_dt_add_prop("linux,bootx-depth", &amp;tmp, 4, mem_end);</div><div class='add'>+	tmp = bi-&gt;dispDeviceRect[2] - bi-&gt;dispDeviceRect[0];</div><div class='add'>+	bootx_dt_add_prop("linux,bootx-width", &amp;tmp, 4, mem_end);</div><div class='add'>+	tmp = bi-&gt;dispDeviceRect[3] - bi-&gt;dispDeviceRect[1];</div><div class='add'>+	bootx_dt_add_prop("linux,bootx-height", &amp;tmp, 4, mem_end);</div><div class='add'>+	tmp = bi-&gt;dispDeviceRowBytes;</div><div class='add'>+	bootx_dt_add_prop("linux,bootx-linebytes", &amp;tmp, 4, mem_end);</div><div class='add'>+	tmp = (u32)bi-&gt;dispDeviceBase;</div><div class='add'>+	if (tmp == 0)</div><div class='add'>+		tmp = (u32)bi-&gt;logicalDisplayBase;</div><div class='add'>+	tmp += bi-&gt;dispDeviceRect[1] * bi-&gt;dispDeviceRowBytes;</div><div class='add'>+	tmp += bi-&gt;dispDeviceRect[0] * ((bi-&gt;dispDeviceDepth + 7) / 8);</div><div class='add'>+	bootx_dt_add_prop("linux,bootx-addr", &amp;tmp, 4, mem_end);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init bootx_dt_add_string(char *s, unsigned long *mem_end)</div><div class='hunk'>@@ -212,7 +230,7 @@ static void __init bootx_scan_dt_build_strings(unsigned long base,</div><div class='ctx'> </div><div class='ctx'> 	if (!strcmp(namep, "/chosen")) {</div><div class='ctx'> 		DBG(" detected /chosen ! adding properties names !\n");</div><div class='del'>-		bootx_dt_add_string("linux,platform", mem_end);</div><div class='add'>+		bootx_dt_add_string("linux,bootx", mem_end);</div><div class='ctx'> 		bootx_dt_add_string("linux,stdout-path", mem_end);</div><div class='ctx'> 		bootx_dt_add_string("linux,initrd-start", mem_end);</div><div class='ctx'> 		bootx_dt_add_string("linux,initrd-end", mem_end);</div><div class='hunk'>@@ -223,6 +241,11 @@ static void __init bootx_scan_dt_build_strings(unsigned long base,</div><div class='ctx'> 		DBG(" detected display ! adding properties names !\n");</div><div class='ctx'> 		bootx_dt_add_string("linux,boot-display", mem_end);</div><div class='ctx'> 		bootx_dt_add_string("linux,opened", mem_end);</div><div class='add'>+		bootx_dt_add_string("linux,bootx-depth", mem_end);</div><div class='add'>+		bootx_dt_add_string("linux,bootx-width", mem_end);</div><div class='add'>+		bootx_dt_add_string("linux,bootx-height", mem_end);</div><div class='add'>+		bootx_dt_add_string("linux,bootx-linebytes", mem_end);</div><div class='add'>+		bootx_dt_add_string("linux,bootx-addr", mem_end);</div><div class='ctx'> 		strncpy(bootx_disp_path, namep, 255);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -444,7 +467,14 @@ void __init bootx_init(unsigned long r3, unsigned long r4)</div><div class='ctx'> 	if (!BOOT_INFO_IS_V2_COMPATIBLE(bi))</div><div class='ctx'> 		bi-&gt;logicalDisplayBase = bi-&gt;dispDeviceBase;</div><div class='ctx'> </div><div class='add'>+	/* Fixup depth 16 -&gt; 15 as that's what MacOS calls 16bpp */</div><div class='add'>+	if (bi-&gt;dispDeviceDepth == 16)</div><div class='add'>+		bi-&gt;dispDeviceDepth = 15;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BOOTX_TEXT</div><div class='add'>+	ptr = (unsigned long)bi-&gt;logicalDisplayBase;</div><div class='add'>+	ptr += bi-&gt;dispDeviceRect[1] * bi-&gt;dispDeviceRowBytes;</div><div class='add'>+	ptr += bi-&gt;dispDeviceRect[0] * ((bi-&gt;dispDeviceDepth + 7) / 8);</div><div class='ctx'> 	btext_setup_display(bi-&gt;dispDeviceRect[2] - bi-&gt;dispDeviceRect[0],</div><div class='ctx'> 			    bi-&gt;dispDeviceRect[3] - bi-&gt;dispDeviceRect[1],</div><div class='ctx'> 			    bi-&gt;dispDeviceDepth, bi-&gt;dispDeviceRowBytes,</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/cache.S b/arch/powerpc/platforms/powermac/cache.S<br/>index fb977de6b704..6be1a4af3359 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cache.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/cache.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cache.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/cache.S</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> #include &lt;asm/cputable.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c<br/>index cfd6527a0d7e..62926248bdb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cpufreq_32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/cpufreq_32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cpufreq_32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/cpufreq_32.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -68,7 +67,7 @@ static unsigned int cur_freq;</div><div class='ctx'> static unsigned int sleep_freq;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Different models uses different mecanisms to switch the frequency</div><div class='add'>+ * Different models uses different mechanisms to switch the frequency</div><div class='ctx'>  */</div><div class='ctx'> static int (*set_speed_proc)(int low_speed);</div><div class='ctx'> static unsigned int (*get_speed_proc)(void);</div><div class='hunk'>@@ -268,7 +267,7 @@ static int pmu_set_cpu_speed(int low_speed)</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the decrementer won't interrupt us */</div><div class='ctx'> 	asm volatile("mtdec %0" : : "r" (0x7fffffff));</div><div class='del'>-	/* Make sure any pending DEC interrupt occuring while we did</div><div class='add'>+	/* Make sure any pending DEC interrupt occurring while we did</div><div class='ctx'> 	 * the above didn't re-enable the DEC */</div><div class='ctx'> 	mb();</div><div class='ctx'> 	asm volatile("mtdec %0" : : "r" (0x7fffffff));</div><div class='hunk'>@@ -314,7 +313,7 @@ static int pmu_set_cpu_speed(int low_speed)</div><div class='ctx'>  		_set_L3CR(save_l3cr);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore userland MMU context */</div><div class='del'>-	set_context(current-&gt;active_mm-&gt;context, current-&gt;active_mm-&gt;pgd);</div><div class='add'>+	set_context(current-&gt;active_mm-&gt;context.id, current-&gt;active_mm-&gt;pgd);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_FREQ</div><div class='ctx'> 	printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c<br/>index b57e465a1b71..f08a14516139 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cpufreq_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/cpufreq_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/cpufreq_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/cpufreq_64.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * that is iMac G5 and latest single CPU desktop.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c<br/>index a5063cd675c5..f8313bf9a9f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/feature.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/feature.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/feature.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/feature.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *   - Split split split...</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -2510,7 +2509,7 @@ found:</div><div class='ctx'> 		if (get_property(np, "flush-on-lock", NULL))</div><div class='ctx'> 			break;</div><div class='ctx'> 		powersave_nap = 1;</div><div class='del'>-		printk(KERN_INFO "Processor NAP mode on idle enabled.\n");</div><div class='add'>+		printk(KERN_DEBUG "Processor NAP mode on idle enabled.\n");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c<br/>index c896ce83d412..8677f50c2586 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/low_i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/low_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/low_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/low_i2c.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> #undef DEBUG_LOW</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -523,10 +522,11 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)</div><div class='ctx'> 		host-&gt;speed = KW_I2C_MODE_25KHZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}	</div><div class='del'>-	if (np-&gt;n_intrs &gt; 0)</div><div class='del'>-		host-&gt;irq = np-&gt;intrs[0].line;</div><div class='del'>-	else</div><div class='del'>-		host-&gt;irq = NO_IRQ;</div><div class='add'>+	host-&gt;irq = irq_of_parse_and_map(np, 0);</div><div class='add'>+	if (host-&gt;irq == NO_IRQ)</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "low_i2c: Failed to map interrupt for %s\n",</div><div class='add'>+		       np-&gt;full_name);</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;base = ioremap((*addrp), 0x1000);</div><div class='ctx'> 	if (host-&gt;base == NULL) {</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c<br/>index 262f967b880a..6a36ea9bf673 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/nvram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/nvram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/nvram.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Todo: - add support for the OF persistent properties</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='hunk'>@@ -30,6 +29,8 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/nvram.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "pmac.h"</div><div class='add'>+</div><div class='ctx'> #define DEBUG</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -81,9 +82,6 @@ static int nvram_partitions[3];</div><div class='ctx'> // XXX Turn that into a sem</div><div class='ctx'> static DEFINE_SPINLOCK(nv_lock);</div><div class='ctx'> </div><div class='del'>-extern int pmac_newworld;</div><div class='del'>-extern int system_running;</div><div class='del'>-</div><div class='ctx'> static int (*core99_write_bank)(int bank, u8* datas);</div><div class='ctx'> static int (*core99_erase_bank)(int bank);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c<br/>index ea179afea632..205d04471161 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/pci.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -24,10 +25,7 @@</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_feature.h&gt;</div><div class='ctx'> #include &lt;asm/grackle.h&gt;</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-//#include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/ppc-pci.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +44,8 @@ static int has_uninorth;</div><div class='ctx'> static struct pci_controller *u3_agp;</div><div class='ctx'> static struct pci_controller *u4_pcie;</div><div class='ctx'> static struct pci_controller *u3_ht;</div><div class='add'>+#else</div><div class='add'>+static int has_second_ohare;</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='ctx'> extern u8 pci_cache_line_size;</div><div class='hunk'>@@ -647,6 +647,33 @@ static void __init init_p2pbridge(void)</div><div class='ctx'> 	early_write_config_word(hose, bus, devfn, PCI_BRIDGE_CONTROL, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init init_second_ohare(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = of_find_node_by_name(NULL, "pci106b,7");</div><div class='add'>+	unsigned char bus, devfn;</div><div class='add'>+	unsigned short cmd;</div><div class='add'>+</div><div class='add'>+	if (np == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This must run before we initialize the PICs since the second</div><div class='add'>+	 * ohare hosts a PIC that will be accessed there.</div><div class='add'>+	 */</div><div class='add'>+	if (pci_device_from_OF_node(np, &amp;bus, &amp;devfn) == 0) {</div><div class='add'>+		struct pci_controller* hose =</div><div class='add'>+			pci_find_hose_for_OF_device(np);</div><div class='add'>+		if (!hose) {</div><div class='add'>+			printk(KERN_ERR "Can't find PCI hose for OHare2 !\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		early_read_config_word(hose, bus, devfn, PCI_COMMAND, &amp;cmd);</div><div class='add'>+		cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;</div><div class='add'>+		cmd &amp;= ~PCI_COMMAND_IO;</div><div class='add'>+		early_write_config_word(hose, bus, devfn, PCI_COMMAND, cmd);</div><div class='add'>+	}</div><div class='add'>+	has_second_ohare = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Some Apple desktop machines have a NEC PD720100A USB2 controller</div><div class='ctx'>  * on the motherboard. Open Firmware, on these, will disable the</div><div class='hunk'>@@ -688,9 +715,6 @@ static void __init fixup_nec_usb2(void)</div><div class='ctx'> 			       " EHCI, fixing up...\n");</div><div class='ctx'> 			data &amp;= ~1UL;</div><div class='ctx'> 			early_write_config_dword(hose, bus, devfn, 0xe4, data);</div><div class='del'>-			early_write_config_byte(hose, bus,</div><div class='del'>-						devfn | 2, PCI_INTERRUPT_LINE,</div><div class='del'>-				nec-&gt;intrs[0].line);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -939,9 +963,10 @@ static int __init add_bridge(struct device_node *dev)</div><div class='ctx'> 		disp_name = "Chaos";</div><div class='ctx'> 		primary = 0;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_INFO "Found %s PCI host bridge at 0x%08lx. "</div><div class='add'>+	printk(KERN_INFO "Found %s PCI host bridge at 0x%016llx. "</div><div class='ctx'> 	       "Firmware bus number: %d-&gt;%d\n",</div><div class='del'>-		disp_name, rsrc.start, hose-&gt;first_busno, hose-&gt;last_busno);</div><div class='add'>+		disp_name, (unsigned long long)rsrc.start, hose-&gt;first_busno,</div><div class='add'>+		hose-&gt;last_busno);</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt;Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",</div><div class='hunk'>@@ -957,30 +982,30 @@ static int __init add_bridge(struct device_node *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pcibios_fixup_OF_interrupts(void)</div><div class='add'>+void __init pmac_pcibios_fixup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev* dev = NULL;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Open Firmware often doesn't initialize the</div><div class='del'>-	 * PCI_INTERRUPT_LINE config register properly, so we</div><div class='del'>-	 * should find the device node and apply the interrupt</div><div class='del'>-	 * obtained from the OF device-tree</div><div class='del'>-	 */</div><div class='ctx'> 	for_each_pci_dev(dev) {</div><div class='del'>-		struct device_node *node;</div><div class='del'>-		node = pci_device_to_OF_node(dev);</div><div class='del'>-		/* this is the node, see if it has interrupts */</div><div class='del'>-		if (node &amp;&amp; node-&gt;n_intrs &gt; 0)</div><div class='del'>-			dev-&gt;irq = node-&gt;intrs[0].line;</div><div class='del'>-		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+		/* Read interrupt from the device-tree */</div><div class='add'>+		pci_read_irq_line(dev);</div><div class='ctx'> </div><div class='del'>-void __init pmac_pcibios_fixup(void)</div><div class='del'>-{</div><div class='del'>-	/* Fixup interrupts according to OF tree */</div><div class='del'>-	pcibios_fixup_OF_interrupts();</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+		/* Fixup interrupt for the modem/ethernet combo controller.</div><div class='add'>+		 * on machines with a second ohare chip.</div><div class='add'>+		 * The number in the device tree (27) is bogus (correct for</div><div class='add'>+		 * the ethernet-only board but not the combo ethernet/modem</div><div class='add'>+		 * board). The real interrupt is 28 on the second controller</div><div class='add'>+		 * -&gt; 28+32 = 60.</div><div class='add'>+		 */</div><div class='add'>+		if (has_second_ohare &amp;&amp;</div><div class='add'>+		    dev-&gt;vendor == PCI_VENDOR_ID_DEC &amp;&amp;</div><div class='add'>+		    dev-&gt;device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {</div><div class='add'>+			dev-&gt;irq = irq_create_mapping(NULL, 60);</div><div class='add'>+			set_irq_type(dev-&gt;irq, IRQ_TYPE_LEVEL_LOW);</div><div class='add'>+		}</div><div class='add'>+#endif /* CONFIG_PPC32 */</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='hunk'>@@ -1068,11 +1093,9 @@ void __init pmac_pci_init(void)</div><div class='ctx'> 	/* Tell pci.c to not use the common resource allocation mechanism */</div><div class='ctx'> 	pci_probe_only = 1;</div><div class='ctx'> </div><div class='del'>-	/* Allow all IO */</div><div class='del'>-	io_page_mask = -1;</div><div class='del'>-</div><div class='ctx'> #else /* CONFIG_PPC64 */</div><div class='ctx'> 	init_p2pbridge();</div><div class='add'>+	init_second_ohare();</div><div class='ctx'> 	fixup_nec_usb2();</div><div class='ctx'> </div><div class='ctx'> 	/* We are still having some issues with the Xserve G4, enabling</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c<br/>index a3bd3e728fa3..6d66359ec8c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pfunc_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pfunc_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pfunc_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/pfunc_base.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -25,19 +24,18 @@ static irqreturn_t macio_gpio_irq(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static int macio_do_gpio_irq_enable(struct pmf_function *func)</div><div class='ctx'> {</div><div class='del'>-	if (func-&gt;node-&gt;n_intrs &lt; 1)</div><div class='add'>+	unsigned int irq = irq_of_parse_and_map(func-&gt;node, 0);</div><div class='add'>+	if (irq == NO_IRQ)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return request_irq(func-&gt;node-&gt;intrs[0].line, macio_gpio_irq, 0,</div><div class='del'>-			   func-&gt;node-&gt;name, func);</div><div class='add'>+	return request_irq(irq, macio_gpio_irq, 0, func-&gt;node-&gt;name, func);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int macio_do_gpio_irq_disable(struct pmf_function *func)</div><div class='ctx'> {</div><div class='del'>-	if (func-&gt;node-&gt;n_intrs &lt; 1)</div><div class='add'>+	unsigned int irq = irq_of_parse_and_map(func-&gt;node, 0);</div><div class='add'>+	if (irq == NO_IRQ)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	free_irq(func-&gt;node-&gt;intrs[0].line, func);</div><div class='add'>+	free_irq(irq, func);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c<br/>index 4baa75b1d36f..b117adbf9571 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pfunc_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pfunc_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pfunc_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/pfunc_core.c</a></div><div class='hunk'>@@ -5,12 +5,12 @@</div><div class='ctx'>  * FIXME: LOCKING !!!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -545,7 +545,8 @@ struct pmf_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(pmf_devices);</div><div class='del'>-static spinlock_t pmf_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(pmf_lock);</div><div class='add'>+static DEFINE_MUTEX(pmf_irq_mutex);</div><div class='ctx'> </div><div class='ctx'> static void pmf_release_device(struct kref *kref)</div><div class='ctx'> {</div><div class='hunk'>@@ -864,16 +865,25 @@ int pmf_register_irq_client(struct device_node *target,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pmf_lock, flags);</div><div class='ctx'> 	func = __pmf_find_function(target, name, PMF_FLAGS_INT_GEN);</div><div class='del'>-	if (func == NULL) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;pmf_lock, flags);</div><div class='add'>+	if (func)</div><div class='add'>+		func = pmf_get_function(func);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pmf_lock, flags);</div><div class='add'>+	if (func == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/* guard against manipulations of list */</div><div class='add'>+	mutex_lock(&amp;pmf_irq_mutex);</div><div class='ctx'> 	if (list_empty(&amp;func-&gt;irq_clients))</div><div class='ctx'> 		func-&gt;dev-&gt;handlers-&gt;irq_enable(func);</div><div class='add'>+</div><div class='add'>+	/* guard against pmf_do_irq while changing list */</div><div class='add'>+	spin_lock_irqsave(&amp;pmf_lock, flags);</div><div class='ctx'> 	list_add(&amp;client-&gt;link, &amp;func-&gt;irq_clients);</div><div class='del'>-	client-&gt;func = func;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pmf_lock, flags);</div><div class='ctx'> </div><div class='add'>+	client-&gt;func = func;</div><div class='add'>+	mutex_unlock(&amp;pmf_irq_mutex);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pmf_register_irq_client);</div><div class='hunk'>@@ -885,12 +895,19 @@ void pmf_unregister_irq_client(struct pmf_irq_client *client)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(func == NULL);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pmf_lock, flags);</div><div class='add'>+	/* guard against manipulations of list */</div><div class='add'>+	mutex_lock(&amp;pmf_irq_mutex);</div><div class='ctx'> 	client-&gt;func = NULL;</div><div class='add'>+</div><div class='add'>+	/* guard against pmf_do_irq while changing list */</div><div class='add'>+	spin_lock_irqsave(&amp;pmf_lock, flags);</div><div class='ctx'> 	list_del(&amp;client-&gt;link);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pmf_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (list_empty(&amp;func-&gt;irq_clients))</div><div class='ctx'> 		func-&gt;dev-&gt;handlers-&gt;irq_disable(func);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pmf_lock, flags);</div><div class='add'>+	mutex_unlock(&amp;pmf_irq_mutex);</div><div class='add'>+	pmf_put_function(func);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pmf_unregister_irq_client);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c<br/>index 18bf3011d1e3..060789e31c67 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/pic.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -66,39 +65,36 @@ static u32 level_mask[4];</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(pmac_pic_lock);</div><div class='ctx'> </div><div class='del'>-#define GATWICK_IRQ_POOL_SIZE        10</div><div class='del'>-static struct interrupt_info gatwick_int_pool[GATWICK_IRQ_POOL_SIZE];</div><div class='del'>-</div><div class='ctx'> #define NR_MASK_WORDS	((NR_IRQS + 31) / 32)</div><div class='ctx'> static unsigned long ppc_lost_interrupts[NR_MASK_WORDS];</div><div class='add'>+static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];</div><div class='add'>+static int pmac_irq_cascade = -1;</div><div class='add'>+static struct irq_host *pmac_pic_host;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Mark an irq as "lost".  This is only used on the pmac</div><div class='del'>- * since it can lose interrupts (see pmac_set_irq_mask).</div><div class='del'>- * -- Cort</div><div class='del'>- */</div><div class='del'>-void __set_lost(unsigned long irq_nr, int nokick)</div><div class='add'>+static void __pmac_retrigger(unsigned int irq_nr)</div><div class='ctx'> {</div><div class='del'>-	if (!test_and_set_bit(irq_nr, ppc_lost_interrupts)) {</div><div class='add'>+	if (irq_nr &gt;= max_real_irqs &amp;&amp; pmac_irq_cascade &gt; 0) {</div><div class='add'>+		__set_bit(irq_nr, ppc_lost_interrupts);</div><div class='add'>+		irq_nr = pmac_irq_cascade;</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='add'>+	if (!__test_and_set_bit(irq_nr, ppc_lost_interrupts)) {</div><div class='ctx'> 		atomic_inc(&amp;ppc_n_lost_interrupts);</div><div class='del'>-		if (!nokick)</div><div class='del'>-			set_dec(1);</div><div class='add'>+		set_dec(1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pmac_mask_and_ack_irq(unsigned int irq_nr)</div><div class='add'>+static void pmac_mask_and_ack_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-        unsigned long bit = 1UL &lt;&lt; (irq_nr &amp; 0x1f);</div><div class='del'>-        int i = irq_nr &gt;&gt; 5;</div><div class='add'>+	unsigned int src = irq_map[virq].hwirq;</div><div class='add'>+        unsigned long bit = 1UL &lt;&lt; (virq &amp; 0x1f);</div><div class='add'>+        int i = virq &gt;&gt; 5;</div><div class='ctx'>         unsigned long flags;</div><div class='ctx'> </div><div class='del'>-        if ((unsigned)irq_nr &gt;= max_irqs)</div><div class='del'>-                return;</div><div class='del'>-</div><div class='del'>-        clear_bit(irq_nr, ppc_cached_irq_mask);</div><div class='del'>-        if (test_and_clear_bit(irq_nr, ppc_lost_interrupts))</div><div class='del'>-                atomic_dec(&amp;ppc_n_lost_interrupts);</div><div class='ctx'> 	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+        __clear_bit(src, ppc_cached_irq_mask);</div><div class='add'>+        if (__test_and_clear_bit(src, ppc_lost_interrupts))</div><div class='add'>+                atomic_dec(&amp;ppc_n_lost_interrupts);</div><div class='ctx'>         out_le32(&amp;pmac_irq_hw[i]-&gt;enable, ppc_cached_irq_mask[i]);</div><div class='ctx'>         out_le32(&amp;pmac_irq_hw[i]-&gt;ack, bit);</div><div class='ctx'>         do {</div><div class='hunk'>@@ -110,16 +106,29 @@ static void pmac_mask_and_ack_irq(unsigned int irq_nr)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)</div><div class='add'>+static void pmac_ack_irq(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	unsigned int src = irq_map[virq].hwirq;</div><div class='add'>+        unsigned long bit = 1UL &lt;&lt; (src &amp; 0x1f);</div><div class='add'>+        int i = src &gt;&gt; 5;</div><div class='add'>+        unsigned long flags;</div><div class='add'>+</div><div class='add'>+  	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+	if (__test_and_clear_bit(src, ppc_lost_interrupts))</div><div class='add'>+                atomic_dec(&amp;ppc_n_lost_interrupts);</div><div class='add'>+        out_le32(&amp;pmac_irq_hw[i]-&gt;ack, bit);</div><div class='add'>+        (void)in_le32(&amp;pmac_irq_hw[i]-&gt;ack);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)</div><div class='ctx'> {</div><div class='ctx'>         unsigned long bit = 1UL &lt;&lt; (irq_nr &amp; 0x1f);</div><div class='ctx'>         int i = irq_nr &gt;&gt; 5;</div><div class='del'>-        unsigned long flags;</div><div class='ctx'> </div><div class='ctx'>         if ((unsigned)irq_nr &gt;= max_irqs)</div><div class='ctx'>                 return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='ctx'>         /* enable unmasked interrupts */</div><div class='ctx'>         out_le32(&amp;pmac_irq_hw[i]-&gt;enable, ppc_cached_irq_mask[i]);</div><div class='ctx'> </div><div class='hunk'>@@ -136,71 +145,78 @@ static void pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)</div><div class='ctx'>          * the bit in the flag register or request another interrupt.</div><div class='ctx'>          */</div><div class='ctx'>         if (bit &amp; ppc_cached_irq_mask[i] &amp; in_le32(&amp;pmac_irq_hw[i]-&gt;level))</div><div class='del'>-		__set_lost((ulong)irq_nr, nokicklost);</div><div class='del'>-	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='add'>+		__pmac_retrigger(irq_nr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* When an irq gets requested for the first client, if it's an</div><div class='ctx'>  * edge interrupt, we clear any previous one on the controller</div><div class='ctx'>  */</div><div class='del'>-static unsigned int pmac_startup_irq(unsigned int irq_nr)</div><div class='add'>+static unsigned int pmac_startup_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-        unsigned long bit = 1UL &lt;&lt; (irq_nr &amp; 0x1f);</div><div class='del'>-        int i = irq_nr &gt;&gt; 5;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int src = irq_map[virq].hwirq;</div><div class='add'>+        unsigned long bit = 1UL &lt;&lt; (src &amp; 0x1f);</div><div class='add'>+        int i = src &gt;&gt; 5;</div><div class='ctx'> </div><div class='del'>-	if ((irq_desc[irq_nr].status &amp; IRQ_LEVEL) == 0)</div><div class='add'>+  	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+	if ((irq_desc[virq].status &amp; IRQ_LEVEL) == 0)</div><div class='ctx'> 		out_le32(&amp;pmac_irq_hw[i]-&gt;ack, bit);</div><div class='del'>-        set_bit(irq_nr, ppc_cached_irq_mask);</div><div class='del'>-        pmac_set_irq_mask(irq_nr, 0);</div><div class='add'>+        __set_bit(src, ppc_cached_irq_mask);</div><div class='add'>+        __pmac_set_irq_mask(src, 0);</div><div class='add'>+  	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pmac_mask_irq(unsigned int irq_nr)</div><div class='add'>+static void pmac_mask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-        clear_bit(irq_nr, ppc_cached_irq_mask);</div><div class='del'>-        pmac_set_irq_mask(irq_nr, 0);</div><div class='del'>-        mb();</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int src = irq_map[virq].hwirq;</div><div class='add'>+</div><div class='add'>+  	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+        __clear_bit(src, ppc_cached_irq_mask);</div><div class='add'>+        __pmac_set_irq_mask(src, 0);</div><div class='add'>+  	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pmac_unmask_irq(unsigned int irq_nr)</div><div class='add'>+static void pmac_unmask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-        set_bit(irq_nr, ppc_cached_irq_mask);</div><div class='del'>-        pmac_set_irq_mask(irq_nr, 0);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int src = irq_map[virq].hwirq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+	__set_bit(src, ppc_cached_irq_mask);</div><div class='add'>+        __pmac_set_irq_mask(src, 0);</div><div class='add'>+  	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pmac_end_irq(unsigned int irq_nr)</div><div class='add'>+static int pmac_retrigger(unsigned int virq)</div><div class='ctx'> {</div><div class='del'>-	if (!(irq_desc[irq_nr].status &amp; (IRQ_DISABLED|IRQ_INPROGRESS))</div><div class='del'>-	    &amp;&amp; irq_desc[irq_nr].action) {</div><div class='del'>-        	set_bit(irq_nr, ppc_cached_irq_mask);</div><div class='del'>-	        pmac_set_irq_mask(irq_nr, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+  	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+	__pmac_retrigger(irq_map[virq].hwirq);</div><div class='add'>+  	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct hw_interrupt_type pmac_pic = {</div><div class='add'>+static struct irq_chip pmac_pic = {</div><div class='ctx'> 	.typename	= " PMAC-PIC ",</div><div class='ctx'> 	.startup	= pmac_startup_irq,</div><div class='del'>-	.enable		= pmac_unmask_irq,</div><div class='del'>-	.disable	= pmac_mask_irq,</div><div class='del'>-	.ack		= pmac_mask_and_ack_irq,</div><div class='del'>-	.end		= pmac_end_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hw_interrupt_type gatwick_pic = {</div><div class='del'>-	.typename	= " GATWICK  ",</div><div class='del'>-	.startup	= pmac_startup_irq,</div><div class='del'>-	.enable		= pmac_unmask_irq,</div><div class='del'>-	.disable	= pmac_mask_irq,</div><div class='del'>-	.ack		= pmac_mask_and_ack_irq,</div><div class='del'>-	.end		= pmac_end_irq,</div><div class='add'>+	.mask		= pmac_mask_irq,</div><div class='add'>+	.ack		= pmac_ack_irq,</div><div class='add'>+	.mask_ack	= pmac_mask_and_ack_irq,</div><div class='add'>+	.unmask		= pmac_unmask_irq,</div><div class='add'>+	.retrigger	= pmac_retrigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t gatwick_action(int cpl, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int irq, bits;</div><div class='add'>+	int rc = IRQ_NONE;</div><div class='ctx'> </div><div class='add'>+  	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='ctx'> 	for (irq = max_irqs; (irq -= 32) &gt;= max_real_irqs; ) {</div><div class='ctx'> 		int i = irq &gt;&gt; 5;</div><div class='ctx'> 		bits = in_le32(&amp;pmac_irq_hw[i]-&gt;event) | ppc_lost_interrupts[i];</div><div class='hunk'>@@ -210,17 +226,20 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		if (bits == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		irq += __ilog2(bits);</div><div class='add'>+		spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='ctx'> 		__do_IRQ(irq, regs);</div><div class='del'>-		return IRQ_HANDLED;</div><div class='add'>+		spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='add'>+		rc = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='del'>-	printk("gatwick irq not from gatwick pic\n");</div><div class='del'>-	return IRQ_NONE;</div><div class='add'>+  	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pmac_get_irq(struct pt_regs *regs)</div><div class='add'>+static unsigned int pmac_pic_get_irq(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	unsigned long bits = 0;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	void psurge_smp_message_recv(struct pt_regs *);</div><div class='hunk'>@@ -228,9 +247,10 @@ static int pmac_get_irq(struct pt_regs *regs)</div><div class='ctx'>        	/* IPI's are a hack on the powersurge -- Cort */</div><div class='ctx'>        	if ( smp_processor_id() != 0 ) {</div><div class='ctx'> 		psurge_smp_message_recv(regs);</div><div class='del'>-		return -2;	/* ignore, already handled */</div><div class='add'>+		return NO_IRQ_IGNORE;	/* ignore, already handled */</div><div class='ctx'>         }</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='add'>+  	spin_lock_irqsave(&amp;pmac_pic_lock, flags);</div><div class='ctx'> 	for (irq = max_real_irqs; (irq -= 32) &gt;= 0; ) {</div><div class='ctx'> 		int i = irq &gt;&gt; 5;</div><div class='ctx'> 		bits = in_le32(&amp;pmac_irq_hw[i]-&gt;event) | ppc_lost_interrupts[i];</div><div class='hunk'>@@ -242,133 +262,10 @@ static int pmac_get_irq(struct pt_regs *regs)</div><div class='ctx'> 		irq += __ilog2(bits);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return irq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This routine will fix some missing interrupt values in the device tree</div><div class='del'>- * on the gatwick mac-io controller used by some PowerBooks</div><div class='del'>- *</div><div class='del'>- * Walking of OF nodes could use a bit more fixing up here, but it's not</div><div class='del'>- * very important as this is all boot time code on static portions of the</div><div class='del'>- * device-tree.</div><div class='del'>- *</div><div class='del'>- * However, the modifications done to "intrs" will have to be removed and</div><div class='del'>- * replaced with proper updates of the "interrupts" properties or</div><div class='del'>- * AAPL,interrupts, yet to be decided, once the dynamic parsing is there.</div><div class='del'>- */</div><div class='del'>-static void __init pmac_fix_gatwick_interrupts(struct device_node *gw,</div><div class='del'>-					       int irq_base)</div><div class='del'>-{</div><div class='del'>-	struct device_node *node;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	memset(gatwick_int_pool, 0, sizeof(gatwick_int_pool));</div><div class='del'>-	count = 0;</div><div class='del'>-	for (node = NULL; (node = of_get_next_child(gw, node)) != NULL;) {</div><div class='del'>-		/* Fix SCC */</div><div class='del'>-		if ((strcasecmp(node-&gt;name, "escc") == 0) &amp;&amp; node-&gt;child) {</div><div class='del'>-			if (node-&gt;child-&gt;n_intrs &lt; 3) {</div><div class='del'>-				node-&gt;child-&gt;intrs = &amp;gatwick_int_pool[count];</div><div class='del'>-				count += 3;</div><div class='del'>-			}</div><div class='del'>-			node-&gt;child-&gt;n_intrs = 3;</div><div class='del'>-			node-&gt;child-&gt;intrs[0].line = 15+irq_base;</div><div class='del'>-			node-&gt;child-&gt;intrs[1].line =  4+irq_base;</div><div class='del'>-			node-&gt;child-&gt;intrs[2].line =  5+irq_base;</div><div class='del'>-			printk(KERN_INFO "irq: fixed SCC on gatwick"</div><div class='del'>-			       " (%d,%d,%d)\n",</div><div class='del'>-			       node-&gt;child-&gt;intrs[0].line,</div><div class='del'>-			       node-&gt;child-&gt;intrs[1].line,</div><div class='del'>-			       node-&gt;child-&gt;intrs[2].line);</div><div class='del'>-		}</div><div class='del'>-		/* Fix media-bay &amp; left SWIM */</div><div class='del'>-		if (strcasecmp(node-&gt;name, "media-bay") == 0) {</div><div class='del'>-			struct device_node* ya_node;</div><div class='del'>-</div><div class='del'>-			if (node-&gt;n_intrs == 0)</div><div class='del'>-				node-&gt;intrs = &amp;gatwick_int_pool[count++];</div><div class='del'>-			node-&gt;n_intrs = 1;</div><div class='del'>-			node-&gt;intrs[0].line = 29+irq_base;</div><div class='del'>-			printk(KERN_INFO "irq: fixed media-bay on gatwick"</div><div class='del'>-			       " (%d)\n", node-&gt;intrs[0].line);</div><div class='del'>-</div><div class='del'>-			ya_node = node-&gt;child;</div><div class='del'>-			while(ya_node) {</div><div class='del'>-				if (strcasecmp(ya_node-&gt;name, "floppy") == 0) {</div><div class='del'>-					if (ya_node-&gt;n_intrs &lt; 2) {</div><div class='del'>-						ya_node-&gt;intrs = &amp;gatwick_int_pool[count];</div><div class='del'>-						count += 2;</div><div class='del'>-					}</div><div class='del'>-					ya_node-&gt;n_intrs = 2;</div><div class='del'>-					ya_node-&gt;intrs[0].line = 19+irq_base;</div><div class='del'>-					ya_node-&gt;intrs[1].line =  1+irq_base;</div><div class='del'>-					printk(KERN_INFO "irq: fixed floppy on second controller (%d,%d)\n",</div><div class='del'>-						ya_node-&gt;intrs[0].line, ya_node-&gt;intrs[1].line);</div><div class='del'>-				}</div><div class='del'>-				if (strcasecmp(ya_node-&gt;name, "ata4") == 0) {</div><div class='del'>-					if (ya_node-&gt;n_intrs &lt; 2) {</div><div class='del'>-						ya_node-&gt;intrs = &amp;gatwick_int_pool[count];</div><div class='del'>-						count += 2;</div><div class='del'>-					}</div><div class='del'>-					ya_node-&gt;n_intrs = 2;</div><div class='del'>-					ya_node-&gt;intrs[0].line = 14+irq_base;</div><div class='del'>-					ya_node-&gt;intrs[1].line =  3+irq_base;</div><div class='del'>-					printk(KERN_INFO "irq: fixed ide on second controller (%d,%d)\n",</div><div class='del'>-						ya_node-&gt;intrs[0].line, ya_node-&gt;intrs[1].line);</div><div class='del'>-				}</div><div class='del'>-				ya_node = ya_node-&gt;sibling;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (count &gt; 10) {</div><div class='del'>-		printk("WARNING !! Gatwick interrupt pool overflow\n");</div><div class='del'>-		printk("  GATWICK_IRQ_POOL_SIZE = %d\n", GATWICK_IRQ_POOL_SIZE);</div><div class='del'>-		printk("              requested = %d\n", count);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The PowerBook 3400/2400/3500 can have a combo ethernet/modem</div><div class='del'>- * card which includes an ohare chip that acts as a second interrupt</div><div class='del'>- * controller.  If we find this second ohare, set it up and fix the</div><div class='del'>- * interrupt value in the device tree for the ethernet chip.</div><div class='del'>- */</div><div class='del'>-static void __init enable_second_ohare(struct device_node *np)</div><div class='del'>-{</div><div class='del'>-	unsigned char bus, devfn;</div><div class='del'>-	unsigned short cmd;</div><div class='del'>-	struct device_node *ether;</div><div class='del'>-</div><div class='del'>-	/* This code doesn't strictly belong here, it could be part of</div><div class='del'>-	 * either the PCI initialisation or the feature code. It's kept</div><div class='del'>-	 * here for historical reasons.</div><div class='del'>-	 */</div><div class='del'>-	if (pci_device_from_OF_node(np, &amp;bus, &amp;devfn) == 0) {</div><div class='del'>-		struct pci_controller* hose =</div><div class='del'>-			pci_find_hose_for_OF_device(np);</div><div class='del'>-		if (!hose) {</div><div class='del'>-			printk(KERN_ERR "Can't find PCI hose for OHare2 !\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		early_read_config_word(hose, bus, devfn, PCI_COMMAND, &amp;cmd);</div><div class='del'>-		cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;</div><div class='del'>-		cmd &amp;= ~PCI_COMMAND_IO;</div><div class='del'>-		early_write_config_word(hose, bus, devfn, PCI_COMMAND, cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fix interrupt for the modem/ethernet combo controller. The number</div><div class='del'>-	 * in the device tree (27) is bogus (correct for the ethernet-only</div><div class='del'>-	 * board but not the combo ethernet/modem board).</div><div class='del'>-	 * The real interrupt is 28 on the second controller -&gt; 28+32 = 60.</div><div class='del'>-	 */</div><div class='del'>-	ether = of_find_node_by_name(NULL, "pci1011,14");</div><div class='del'>-	if (ether &amp;&amp; ether-&gt;n_intrs &gt; 0) {</div><div class='del'>-		ether-&gt;intrs[0].line = 60;</div><div class='del'>-		printk(KERN_INFO "irq: Fixed ethernet IRQ to %d\n",</div><div class='del'>-		       ether-&gt;intrs[0].line);</div><div class='del'>-	}</div><div class='del'>-	of_node_put(ether);</div><div class='add'>+  	spin_unlock_irqrestore(&amp;pmac_pic_lock, flags);</div><div class='add'>+	if (unlikely(irq &lt; 0))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	return irq_linear_revmap(pmac_pic_host, irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_XMON</div><div class='hunk'>@@ -382,22 +279,66 @@ static struct irqaction xmon_action = {</div><div class='ctx'> </div><div class='ctx'> static struct irqaction gatwick_cascade_action = {</div><div class='ctx'> 	.handler	= gatwick_action,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.mask		= CPU_MASK_NONE,</div><div class='ctx'> 	.name		= "cascade",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int pmac_pic_host_match(struct irq_host *h, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	/* We match all, we don't always have a node anyway */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			     irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	struct irq_desc *desc = get_irq_desc(virq);</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (hw &gt;= max_irqs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Mark level interrupts, set delayed disable for edge ones and set</div><div class='add'>+	 * handlers</div><div class='add'>+	 */</div><div class='add'>+	level = !!(level_mask[hw &gt;&gt; 5] &amp; (1UL &lt;&lt; (hw &amp; 0x1f)));</div><div class='add'>+	if (level)</div><div class='add'>+		desc-&gt;status |= IRQ_LEVEL;</div><div class='add'>+	else</div><div class='add'>+		desc-&gt;status |= IRQ_DELAYED_DISABLE;</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;pmac_pic, level ?</div><div class='add'>+				 handle_level_irq : handle_edge_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmac_pic_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			       u32 *intspec, unsigned int intsize,</div><div class='add'>+			       irq_hw_number_t *out_hwirq,</div><div class='add'>+			       unsigned int *out_flags)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	*out_flags = IRQ_TYPE_NONE;</div><div class='add'>+	*out_hwirq = *intspec;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops pmac_pic_host_ops = {</div><div class='add'>+	.match = pmac_pic_host_match,</div><div class='add'>+	.map = pmac_pic_host_map,</div><div class='add'>+	.xlate = pmac_pic_host_xlate,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void __init pmac_pic_probe_oldstyle(void)</div><div class='ctx'> {</div><div class='ctx'>         int i;</div><div class='del'>-	int irq_cascade = -1;</div><div class='ctx'>         struct device_node *master = NULL;</div><div class='ctx'> 	struct device_node *slave = NULL;</div><div class='ctx'> 	u8 __iomem *addr;</div><div class='ctx'> 	struct resource r;</div><div class='ctx'> </div><div class='ctx'> 	/* Set our get_irq function */</div><div class='del'>-	ppc_md.get_irq = pmac_get_irq;</div><div class='add'>+	ppc_md.get_irq = pmac_pic_get_irq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Find the interrupt controller type &amp; node</div><div class='hunk'>@@ -415,7 +356,6 @@ static void __init pmac_pic_probe_oldstyle(void)</div><div class='ctx'> 		if (slave) {</div><div class='ctx'> 			max_irqs = 64;</div><div class='ctx'> 			level_mask[1] = OHARE_LEVEL_MASK;</div><div class='del'>-			enable_second_ohare(slave);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if ((master = of_find_node_by_name(NULL, "mac-io")) != NULL) {</div><div class='ctx'> 		max_irqs = max_real_irqs = 64;</div><div class='hunk'>@@ -439,14 +379,18 @@ static void __init pmac_pic_probe_oldstyle(void)</div><div class='ctx'> 			max_irqs = 128;</div><div class='ctx'> 			level_mask[2] = HEATHROW_LEVEL_MASK;</div><div class='ctx'> 			level_mask[3] = 0;</div><div class='del'>-			pmac_fix_gatwick_interrupts(slave, max_real_irqs);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(master == NULL);</div><div class='ctx'> </div><div class='del'>-	/* Set the handler for the main PIC */</div><div class='del'>-	for ( i = 0; i &lt; max_real_irqs ; i++ )</div><div class='del'>-		irq_desc[i].handler = &amp;pmac_pic;</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate an irq host</div><div class='add'>+	 */</div><div class='add'>+	pmac_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, max_irqs,</div><div class='add'>+				       &amp;pmac_pic_host_ops,</div><div class='add'>+				       max_irqs);</div><div class='add'>+	BUG_ON(pmac_pic_host == NULL);</div><div class='add'>+	irq_set_default_host(pmac_pic_host);</div><div class='ctx'> </div><div class='ctx'> 	/* Get addresses of first controller if we have a node for it */</div><div class='ctx'> 	BUG_ON(of_address_to_resource(master, 0, &amp;r));</div><div class='hunk'>@@ -473,39 +417,38 @@ static void __init pmac_pic_probe_oldstyle(void)</div><div class='ctx'> 			pmac_irq_hw[i++] =</div><div class='ctx'> 				(volatile struct pmac_irq_hw __iomem *)</div><div class='ctx'> 				(addr + 0x10);</div><div class='del'>-		irq_cascade = slave-&gt;intrs[0].line;</div><div class='add'>+		pmac_irq_cascade = irq_of_parse_and_map(slave, 0);</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_INFO "irq: Found slave Apple PIC %s for %d irqs"</div><div class='ctx'> 		       " cascade: %d\n", slave-&gt;full_name,</div><div class='del'>-		       max_irqs - max_real_irqs, irq_cascade);</div><div class='add'>+		       max_irqs - max_real_irqs, pmac_irq_cascade);</div><div class='ctx'> 	}</div><div class='ctx'> 	of_node_put(slave);</div><div class='ctx'> </div><div class='del'>-	/* disable all interrupts in all controllers */</div><div class='add'>+	/* Disable all interrupts in all controllers */</div><div class='ctx'> 	for (i = 0; i * 32 &lt; max_irqs; ++i)</div><div class='ctx'> 		out_le32(&amp;pmac_irq_hw[i]-&gt;enable, 0);</div><div class='ctx'> </div><div class='del'>-	/* mark level interrupts */</div><div class='del'>-	for (i = 0; i &lt; max_irqs; i++)</div><div class='del'>-		if (level_mask[i &gt;&gt; 5] &amp; (1UL &lt;&lt; (i &amp; 0x1f)))</div><div class='del'>-			irq_desc[i].status = IRQ_LEVEL;</div><div class='add'>+	/* Hookup cascade irq */</div><div class='add'>+	if (slave &amp;&amp; pmac_irq_cascade != NO_IRQ)</div><div class='add'>+		setup_irq(pmac_irq_cascade, &amp;gatwick_cascade_action);</div><div class='ctx'> </div><div class='del'>-	/* Setup handlers for secondary controller and hook cascade irq*/</div><div class='del'>-	if (slave) {</div><div class='del'>-		for ( i = max_real_irqs ; i &lt; max_irqs ; i++ )</div><div class='del'>-			irq_desc[i].handler = &amp;gatwick_pic;</div><div class='del'>-		setup_irq(irq_cascade, &amp;gatwick_cascade_action);</div><div class='del'>-	}</div><div class='ctx'> 	printk(KERN_INFO "irq: System has %d possible interrupts\n", max_irqs);</div><div class='ctx'> #ifdef CONFIG_XMON</div><div class='del'>-	setup_irq(20, &amp;xmon_action);</div><div class='add'>+	setup_irq(irq_create_mapping(NULL, 20), &amp;xmon_action);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PPC32 */</div><div class='ctx'> </div><div class='del'>-static int pmac_u3_cascade(struct pt_regs *regs, void *data)</div><div class='add'>+static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc,</div><div class='add'>+			    struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	return mpic_get_one_irq((struct mpic *)data, regs);</div><div class='add'>+	struct mpic *mpic = desc-&gt;handler_data;</div><div class='add'>+</div><div class='add'>+	unsigned int cascade_irq = mpic_get_one_irq(mpic, regs);</div><div class='add'>+	if (cascade_irq != NO_IRQ)</div><div class='add'>+		generic_handle_irq(cascade_irq, regs);</div><div class='add'>+	desc-&gt;chip-&gt;eoi(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic)</div><div class='hunk'>@@ -515,21 +458,20 @@ static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic)</div><div class='ctx'> 	int nmi_irq;</div><div class='ctx'> </div><div class='ctx'> 	pswitch = of_find_node_by_name(NULL, "programmer-switch");</div><div class='del'>-	if (pswitch &amp;&amp; pswitch-&gt;n_intrs) {</div><div class='del'>-		nmi_irq = pswitch-&gt;intrs[0].line;</div><div class='del'>-		mpic_irq_set_priority(nmi_irq, 9);</div><div class='del'>-		setup_irq(nmi_irq, &amp;xmon_action);</div><div class='add'>+	if (pswitch) {</div><div class='add'>+		nmi_irq = irq_of_parse_and_map(pswitch, 0);</div><div class='add'>+		if (nmi_irq != NO_IRQ) {</div><div class='add'>+			mpic_irq_set_priority(nmi_irq, 9);</div><div class='add'>+			setup_irq(nmi_irq, &amp;xmon_action);</div><div class='add'>+		}</div><div class='add'>+		of_node_put(pswitch);</div><div class='ctx'> 	}</div><div class='del'>-	of_node_put(pswitch);</div><div class='ctx'> #endif	/* defined(CONFIG_XMON) &amp;&amp; defined(CONFIG_PPC32) */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,</div><div class='ctx'> 						int master)</div><div class='ctx'> {</div><div class='del'>-	unsigned char senses[128];</div><div class='del'>-	int offset = master ? 0 : 128;</div><div class='del'>-	int count = master ? 128 : 124;</div><div class='ctx'> 	const char *name = master ? " MPIC 1   " : " MPIC 2   ";</div><div class='ctx'> 	struct resource r;</div><div class='ctx'> 	struct mpic *mpic;</div><div class='hunk'>@@ -542,8 +484,6 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,</div><div class='ctx'> </div><div class='ctx'> 	pmac_call_feature(PMAC_FTR_ENABLE_MPIC, np, 0, 0);</div><div class='ctx'> </div><div class='del'>-	prom_get_irq_senses(senses, offset, offset + count);</div><div class='del'>-</div><div class='ctx'> 	flags |= MPIC_WANTS_RESET;</div><div class='ctx'> 	if (get_property(np, "big-endian", NULL))</div><div class='ctx'> 		flags |= MPIC_BIG_ENDIAN;</div><div class='hunk'>@@ -554,8 +494,7 @@ static struct mpic * __init pmac_setup_one_mpic(struct device_node *np,</div><div class='ctx'> 	if (master &amp;&amp; (flags &amp; MPIC_BIG_ENDIAN))</div><div class='ctx'> 		flags |= MPIC_BROKEN_U3;</div><div class='ctx'> </div><div class='del'>-	mpic = mpic_alloc(r.start, flags, 0, offset, count, master ? 252 : 0,</div><div class='del'>-			  senses, count, name);</div><div class='add'>+	mpic = mpic_alloc(np, r.start, flags, 0, 0, name);</div><div class='ctx'> 	if (mpic == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -568,6 +507,7 @@ static int __init pmac_pic_probe_mpic(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic1, *mpic2;</div><div class='ctx'> 	struct device_node *np, *master = NULL, *slave = NULL;</div><div class='add'>+	unsigned int cascade;</div><div class='ctx'> </div><div class='ctx'> 	/* We can have up to 2 MPICs cascaded */</div><div class='ctx'> 	for (np = NULL; (np = of_find_node_by_type(np, "open-pic"))</div><div class='hunk'>@@ -604,16 +544,24 @@ static int __init pmac_pic_probe_mpic(void)</div><div class='ctx'> 	of_node_put(master);</div><div class='ctx'> </div><div class='ctx'> 	/* No slave, let's go out */</div><div class='del'>-	if (slave == NULL || slave-&gt;n_intrs &lt; 1)</div><div class='add'>+	if (slave == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Get/Map slave interrupt */</div><div class='add'>+	cascade = irq_of_parse_and_map(slave, 0);</div><div class='add'>+	if (cascade == NO_IRQ) {</div><div class='add'>+		printk(KERN_ERR "Failed to map cascade IRQ\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mpic2 = pmac_setup_one_mpic(slave, 0);</div><div class='ctx'> 	if (mpic2 == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to setup slave MPIC\n");</div><div class='ctx'> 		of_node_put(slave);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	mpic_setup_cascade(slave-&gt;intrs[0].line, pmac_u3_cascade, mpic2);</div><div class='add'>+	set_irq_data(cascade, mpic2);</div><div class='add'>+	set_irq_chained_handler(cascade, pmac_u3_cascade);</div><div class='ctx'> </div><div class='ctx'> 	of_node_put(slave);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -622,6 +570,20 @@ static int __init pmac_pic_probe_mpic(void)</div><div class='ctx'> </div><div class='ctx'> void __init pmac_pic_init(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+</div><div class='add'>+	/* We configure the OF parsing based on our oldworld vs. newworld</div><div class='add'>+	 * platform type and wether we were booted by BootX.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_PPC32</div><div class='add'>+	if (!pmac_newworld)</div><div class='add'>+		flags |= OF_IMAP_OLDWORLD_MAC;</div><div class='add'>+	if (get_property(of_chosen, "linux,bootx", NULL) != NULL)</div><div class='add'>+		flags |= OF_IMAP_NO_PHANDLE;</div><div class='add'>+#endif /* CONFIG_PPC_32 */</div><div class='add'>+</div><div class='add'>+	of_irq_map_init(flags);</div><div class='add'>+</div><div class='ctx'> 	/* We first try to detect Apple's new Core99 chipset, since mac-io</div><div class='ctx'> 	 * is quite different on those machines and contains an IBM MPIC2.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -644,6 +606,7 @@ unsigned long sleep_save_mask[2];</div><div class='ctx'> </div><div class='ctx'> /* This used to be passed by the PMU driver but that link got</div><div class='ctx'>  * broken with the new driver model. We use this tweak for now...</div><div class='add'>+ * We really want to do things differently though...</div><div class='ctx'>  */</div><div class='ctx'> static int pmacpic_find_viaint(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -657,7 +620,7 @@ static int pmacpic_find_viaint(void)</div><div class='ctx'> 	np = of_find_node_by_name(NULL, "via-pmu");</div><div class='ctx'> 	if (np == NULL)</div><div class='ctx'> 		goto not_found;</div><div class='del'>-	viaint = np-&gt;intrs[0].line;</div><div class='add'>+	viaint = irq_of_parse_and_map(np, 0);;</div><div class='ctx'> #endif /* CONFIG_ADB_PMU */</div><div class='ctx'> </div><div class='ctx'> not_found:</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h<br/>index 21c7b0f8f329..94e7b24b840b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pmac.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/pmac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/pmac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/pmac.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> </div><div class='ctx'> struct rtc_time;</div><div class='ctx'> </div><div class='add'>+extern int pmac_newworld;</div><div class='add'>+</div><div class='ctx'> extern long pmac_time_init(void);</div><div class='ctx'> extern unsigned long pmac_get_boot_time(void);</div><div class='ctx'> extern void pmac_get_rtc_time(struct rtc_time *);</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c<br/>index b9200fb07815..31a9da769fa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * bootup setup stuff..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -458,7 +457,7 @@ static int pmac_pm_finish(suspend_state_t state)</div><div class='ctx'> 	printk(KERN_DEBUG "%s(%d)\n", __FUNCTION__, state);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore userland MMU context */</div><div class='del'>-	set_context(current-&gt;active_mm-&gt;context, current-&gt;active_mm-&gt;pgd);</div><div class='add'>+	set_context(current-&gt;active_mm-&gt;context.id, current-&gt;active_mm-&gt;pgd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -600,13 +599,6 @@ pmac_halt(void)</div><div class='ctx'>  */</div><div class='ctx'> static void __init pmac_init_early(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PPC64</div><div class='del'>-	/* Initialize hash table, from now on, we can take hash faults</div><div class='del'>-	 * and call ioremap</div><div class='del'>-	 */</div><div class='del'>-	hpte_init_native();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Enable early btext debug if requested */</div><div class='ctx'> 	if (strstr(cmd_line, "btextdbg")) {</div><div class='ctx'> 		udbg_adb_init_early();</div><div class='hunk'>@@ -621,9 +613,6 @@ static void __init pmac_init_early(void)</div><div class='ctx'> 	udbg_adb_init(!!strstr(cmd_line, "btextdbg"));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC64</div><div class='del'>-	/* Setup interrupt mapping options */</div><div class='del'>-	ppc64_interrupt_controller = IC_OPEN_PIC;</div><div class='del'>-</div><div class='ctx'> 	iommu_init_early_dart();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -683,6 +672,8 @@ static int __init pmac_probe(void)</div><div class='ctx'> 	 * part of the cacheable linar mapping</div><div class='ctx'> 	 */</div><div class='ctx'> 	alloc_dart_table();</div><div class='add'>+</div><div class='add'>+	hpte_init_native();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/sleep.S b/arch/powerpc/platforms/powermac/sleep.S<br/>index 22b113d19b24..1174ca128efa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/sleep.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/sleep.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/sleep.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/sleep.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c<br/>index 1065d87fc279..827b7121ffb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/smp.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *  as published by the Free Software Foundation; either version</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -378,7 +377,7 @@ static void __init psurge_dual_sync_tb(int cpu_nr)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction psurge_irqaction = {</div><div class='ctx'> 	.handler = psurge_primary_intr,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.mask = CPU_MASK_NONE,</div><div class='ctx'> 	.name = "primary IPI",</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c<br/>index 890758aa9667..a4173906e945 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/time.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 2003-2005 Benjamin Herrenschmidt.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c<br/>index 06c8265c2baf..6124e59e1038 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/udbg_adb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/udbg_adb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/udbg_adb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/udbg_adb.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c<br/>index b4fa9f03b461..37e5b1eff911 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/udbg_scc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/powermac/udbg_scc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/powermac/udbg_scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/powermac/udbg_scc.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *      as published by the Free Software Foundation; either version</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/udbg.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile<br/>index 930898635c9f..e5e0ff466904 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/Makefile</a></div><div class='hunk'>@@ -1,8 +1,11 @@</div><div class='add'>+ifeq ($(CONFIG_PPC64),y)</div><div class='add'>+EXTRA_CFLAGS		+= -mno-minimal-toc</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-y			:= pci.o lpar.o hvCall.o nvram.o reconfig.o \</div><div class='ctx'> 			   setup.o iommu.o ras.o rtasd.o pci_dlpar.o \</div><div class='ctx'> 			   firmware.o</div><div class='ctx'> obj-$(CONFIG_SMP)	+= smp.o</div><div class='del'>-obj-$(CONFIG_IBMVIO)	+= vio.o</div><div class='ctx'> obj-$(CONFIG_XICS)	+= xics.o</div><div class='ctx'> obj-$(CONFIG_SCANLOG)	+= scanlog.o</div><div class='ctx'> obj-$(CONFIG_EEH)	+= eeh.o eeh_cache.o eeh_driver.o eeh_event.o</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c<br/>index d4a402c5866c..c37a8497c60f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/eeh_cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/eeh_cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/eeh_cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/eeh_cache.c</a></div><div class='hunk'>@@ -287,7 +287,7 @@ void pci_addr_cache_remove_device(struct pci_dev *dev)</div><div class='ctx'>  * find the pci device that corresponds to a given address.</div><div class='ctx'>  * This routine scans all pci busses to build the cache.</div><div class='ctx'>  * Must be run late in boot process, after the pci controllers</div><div class='del'>- * have been scaned for devices (after all device resources are known).</div><div class='add'>+ * have been scanned for devices (after all device resources are known).</div><div class='ctx'>  */</div><div class='ctx'> void __init pci_addr_cache_build(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -304,6 +304,8 @@ void __init pci_addr_cache_build(void)</div><div class='ctx'> 		pci_addr_cache_insert_device(dev);</div><div class='ctx'> </div><div class='ctx'> 		dn = pci_device_to_OF_node(dev);</div><div class='add'>+		if (!dn)</div><div class='add'>+			continue;</div><div class='ctx'> 		pci_dev_get (dev);  /* matching put is in eeh_remove_device() */</div><div class='ctx'> 		PCI_DN(dn)-&gt;pcidev = dev;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c<br/>index 1fba695e32e8..aaad2c0afcbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/eeh_driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/eeh_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/eeh_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/eeh_driver.c</a></div><div class='hunk'>@@ -23,9 +23,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/eeh.h&gt;</div><div class='ctx'> #include &lt;asm/eeh_event.h&gt;</div><div class='hunk'>@@ -176,7 +175,7 @@ static void eeh_report_failure(struct pci_dev *dev, void *userdata)</div><div class='ctx'>  *</div><div class='ctx'>  * pSeries systems will isolate a PCI slot if the PCI-Host</div><div class='ctx'>  * bridge detects address or data parity errors, DMA's</div><div class='del'>- * occuring to wild addresses (which usually happen due to</div><div class='add'>+ * occurring to wild addresses (which usually happen due to</div><div class='ctx'>  * bugs in device drivers or in PCI adapter firmware).</div><div class='ctx'>  * Slot isolations also occur if #SERR, #PERR or other misc</div><div class='ctx'>  * PCI-related errors are detected.</div><div class='hunk'>@@ -202,7 +201,11 @@ static void eeh_report_failure(struct pci_dev *dev, void *userdata)</div><div class='ctx'> </div><div class='ctx'> static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	int cnt, rc;</div><div class='add'>+</div><div class='add'>+	/* pcibios will clear the counter; save the value */</div><div class='add'>+	cnt = pe_dn-&gt;eeh_freeze_count;</div><div class='add'>+</div><div class='ctx'> 	if (bus)</div><div class='ctx'> 		pcibios_remove_pci_devices(bus);</div><div class='ctx'> </div><div class='hunk'>@@ -241,6 +244,7 @@ static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)</div><div class='ctx'> 		ssleep (5);</div><div class='ctx'> 		pcibios_add_pci_devices(bus);</div><div class='ctx'> 	}</div><div class='add'>+	pe_dn-&gt;eeh_freeze_count = cnt;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -250,23 +254,29 @@ static int eeh_reset_device (struct pci_dn *pe_dn, struct pci_bus *bus)</div><div class='ctx'>  */</div><div class='ctx'> #define MAX_WAIT_FOR_RECOVERY 15</div><div class='ctx'> </div><div class='del'>-void handle_eeh_events (struct eeh_event *event)</div><div class='add'>+struct pci_dn * handle_eeh_events (struct eeh_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *frozen_dn;</div><div class='ctx'> 	struct pci_dn *frozen_pdn;</div><div class='ctx'> 	struct pci_bus *frozen_bus;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	enum pci_ers_result result = PCI_ERS_RESULT_NONE;</div><div class='del'>-	const char *pci_str, *drv_str;</div><div class='add'>+	const char *location, *pci_str, *drv_str;</div><div class='ctx'> </div><div class='ctx'> 	frozen_dn = find_device_pe(event-&gt;dn);</div><div class='ctx'> 	frozen_bus = pcibios_find_pci_bus(frozen_dn);</div><div class='ctx'> </div><div class='ctx'> 	if (!frozen_dn) {</div><div class='del'>-		printk(KERN_ERR "EEH: Error: Cannot find partition endpoint for %s\n",</div><div class='del'>-		        pci_name(event-&gt;dev));</div><div class='del'>-		return;</div><div class='add'>+</div><div class='add'>+		location = (char *) get_property(event-&gt;dn, "ibm,loc-code", NULL);</div><div class='add'>+		location = location ? location : "unknown";</div><div class='add'>+		printk(KERN_ERR "EEH: Error: Cannot find partition endpoint "</div><div class='add'>+		                "for location=%s pci addr=%s\n",</div><div class='add'>+		        location, pci_name(event-&gt;dev));</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='add'>+	location = (char *) get_property(frozen_dn, "ibm,loc-code", NULL);</div><div class='add'>+	location = location ? location : "unknown";</div><div class='ctx'> </div><div class='ctx'> 	/* There are two different styles for coming up with the PE.</div><div class='ctx'> 	 * In the old style, it was the highest EEH-capable device</div><div class='hunk'>@@ -278,9 +288,10 @@ void handle_eeh_events (struct eeh_event *event)</div><div class='ctx'> 		frozen_bus = pcibios_find_pci_bus (frozen_dn-&gt;parent);</div><div class='ctx'> </div><div class='ctx'> 	if (!frozen_bus) {</div><div class='del'>-		printk(KERN_ERR "EEH: Cannot find PCI bus for %s\n",</div><div class='del'>-		        frozen_dn-&gt;full_name);</div><div class='del'>-		return;</div><div class='add'>+		printk(KERN_ERR "EEH: Cannot find PCI bus "</div><div class='add'>+		        "for location=%s dn=%s\n",</div><div class='add'>+		        location, frozen_dn-&gt;full_name);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -314,8 +325,9 @@ void handle_eeh_events (struct eeh_event *event)</div><div class='ctx'> </div><div class='ctx'> 	eeh_slot_error_detail(frozen_pdn, 1 /* Temporary Error */);</div><div class='ctx'> 	printk(KERN_WARNING</div><div class='del'>-	   "EEH: This PCI device has failed %d times since last reboot: %s - %s\n",</div><div class='del'>-		frozen_pdn-&gt;eeh_freeze_count, drv_str, pci_str);</div><div class='add'>+	   "EEH: This PCI device has failed %d times since last reboot: "</div><div class='add'>+		"location=%s driver=%s pci addr=%s\n",</div><div class='add'>+		frozen_pdn-&gt;eeh_freeze_count, location, drv_str, pci_str);</div><div class='ctx'> </div><div class='ctx'> 	/* Walk the various device drivers attached to this slot through</div><div class='ctx'> 	 * a reset sequence, giving each an opportunity to do what it needs</div><div class='hunk'>@@ -355,7 +367,7 @@ void handle_eeh_events (struct eeh_event *event)</div><div class='ctx'> 	/* Tell all device drivers that they can resume operations */</div><div class='ctx'> 	pci_walk_bus(frozen_bus, eeh_report_resume, NULL);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	return frozen_pdn;</div><div class='ctx'> 	</div><div class='ctx'> excess_failures:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -364,17 +376,18 @@ excess_failures:</div><div class='ctx'> 	 * due to actual, failed cards.</div><div class='ctx'> 	 */</div><div class='ctx'> 	printk(KERN_ERR</div><div class='del'>-	   "EEH: PCI device %s - %s has failed %d times \n"</div><div class='del'>-	   "and has been permanently disabled.  Please try reseating\n"</div><div class='del'>-	   "this device or replacing it.\n",</div><div class='del'>-		drv_str, pci_str, frozen_pdn-&gt;eeh_freeze_count);</div><div class='add'>+	   "EEH: PCI device at location=%s driver=%s pci addr=%s \n"</div><div class='add'>+		"has failed %d times and has been permanently disabled. \n"</div><div class='add'>+		"Please try reseating this device or replacing it.\n",</div><div class='add'>+		location, drv_str, pci_str, frozen_pdn-&gt;eeh_freeze_count);</div><div class='ctx'> 	goto perm_error;</div><div class='ctx'> </div><div class='ctx'> hard_fail:</div><div class='ctx'> 	printk(KERN_ERR</div><div class='del'>-	   "EEH: Unable to recover from failure of PCI device %s - %s\n"</div><div class='add'>+	   "EEH: Unable to recover from failure of PCI device "</div><div class='add'>+	   "at location=%s driver=%s pci addr=%s \n"</div><div class='ctx'> 	   "Please try reseating this device or replacing it.\n",</div><div class='del'>-		drv_str, pci_str);</div><div class='add'>+		location, drv_str, pci_str);</div><div class='ctx'> </div><div class='ctx'> perm_error:</div><div class='ctx'> 	eeh_slot_error_detail(frozen_pdn, 2 /* Permanent Error */);</div><div class='hunk'>@@ -384,6 +397,8 @@ perm_error:</div><div class='ctx'> </div><div class='ctx'> 	/* Shut down the device drivers for good. */</div><div class='ctx'> 	pcibios_remove_pci_devices(frozen_bus);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---------- end of file ---------- */</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c<br/>index 40020c65c89e..45ccc687e57c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/eeh_event.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/eeh_event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/eeh_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/eeh_event.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'>  * Copyright (c) 2005 Linas Vepstas &lt;linas@linas.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -34,7 +35,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* EEH event workqueue setup. */</div><div class='del'>-static spinlock_t eeh_eventlist_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(eeh_eventlist_lock);</div><div class='ctx'> LIST_HEAD(eeh_eventlist);</div><div class='ctx'> static void eeh_thread_launcher(void *);</div><div class='ctx'> DECLARE_WORK(eeh_event_wq, eeh_thread_launcher, NULL);</div><div class='hunk'>@@ -56,38 +57,43 @@ static int eeh_event_handler(void * dummy)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct eeh_event	*event;</div><div class='add'>+	struct pci_dn *pdn;</div><div class='ctx'> </div><div class='ctx'> 	daemonize ("eehd");</div><div class='add'>+	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+	spin_lock_irqsave(&amp;eeh_eventlist_lock, flags);</div><div class='add'>+	event = NULL;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;eeh_eventlist_lock, flags);</div><div class='del'>-		event = NULL;</div><div class='add'>+	/* Unqueue the event, get ready to process. */</div><div class='add'>+	if (!list_empty(&amp;eeh_eventlist)) {</div><div class='add'>+		event = list_entry(eeh_eventlist.next, struct eeh_event, list);</div><div class='add'>+		list_del(&amp;event-&gt;list);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;eeh_eventlist_lock, flags);</div><div class='ctx'> </div><div class='del'>-		/* Unqueue the event, get ready to process. */</div><div class='del'>-		if (!list_empty(&amp;eeh_eventlist)) {</div><div class='del'>-			event = list_entry(eeh_eventlist.next, struct eeh_event, list);</div><div class='del'>-			list_del(&amp;event-&gt;list);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;eeh_eventlist_lock, flags);</div><div class='add'>+	if (event == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (event == NULL)</div><div class='del'>-			break;</div><div class='add'>+	/* Serialize processing of EEH events */</div><div class='add'>+	mutex_lock(&amp;eeh_event_mutex);</div><div class='add'>+	eeh_mark_slot(event-&gt;dn, EEH_MODE_RECOVERING);</div><div class='ctx'> </div><div class='del'>-		/* Serialize processing of EEH events */</div><div class='del'>-		mutex_lock(&amp;eeh_event_mutex);</div><div class='del'>-		eeh_mark_slot(event-&gt;dn, EEH_MODE_RECOVERING);</div><div class='add'>+	printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",</div><div class='add'>+	       pci_name(event-&gt;dev));</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO "EEH: Detected PCI bus error on device %s\n",</div><div class='del'>-		       pci_name(event-&gt;dev));</div><div class='add'>+	pdn = handle_eeh_events(event);</div><div class='ctx'> </div><div class='del'>-		handle_eeh_events(event);</div><div class='add'>+	eeh_clear_slot(event-&gt;dn, EEH_MODE_RECOVERING);</div><div class='add'>+	pci_dev_put(event-&gt;dev);</div><div class='add'>+	kfree(event);</div><div class='add'>+	mutex_unlock(&amp;eeh_event_mutex);</div><div class='ctx'> </div><div class='del'>-		eeh_clear_slot(event-&gt;dn, EEH_MODE_RECOVERING);</div><div class='del'>-		pci_dev_put(event-&gt;dev);</div><div class='del'>-		kfree(event);</div><div class='del'>-		mutex_unlock(&amp;eeh_event_mutex);</div><div class='add'>+	/* If there are no new errors after an hour, clear the counter. */</div><div class='add'>+	if (pdn &amp;&amp; pdn-&gt;eeh_freeze_count&gt;0) {</div><div class='add'>+		msleep_interruptible (3600*1000);</div><div class='add'>+		if (pdn-&gt;eeh_freeze_count&gt;0)</div><div class='add'>+			pdn-&gt;eeh_freeze_count--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c<br/>index 2643078433f0..d67af2c65754 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/iommu.c</a></div><div class='hunk'>@@ -1,29 +1,29 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2001 Mike Corrigan &amp; Dave Engebretsen, IBM Corporation</div><div class='ctx'>  *</div><div class='del'>- * Rewrite, cleanup: </div><div class='add'>+ * Rewrite, cleanup:</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Olof Johansson &lt;olof@lixom.net&gt;, IBM Corporation</div><div class='add'>+ * Copyright (C) 2006 Olof Johansson &lt;olof@lixom.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Dynamic DMA mapping support, pSeries-specific parts, both SMP and LPAR.</div><div class='ctx'>  *</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or</div><div class='ctx'>  * (at your option) any later version.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * This program is distributed in the hope that it will be useful,</div><div class='ctx'>  * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='ctx'>  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * You should have received a copy of the GNU General Public License</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -49,97 +49,101 @@</div><div class='ctx'> </div><div class='ctx'> #define DBG(fmt...)</div><div class='ctx'> </div><div class='del'>-static void tce_build_pSeries(struct iommu_table *tbl, long index, </div><div class='del'>-			      long npages, unsigned long uaddr, </div><div class='add'>+static void tce_build_pSeries(struct iommu_table *tbl, long index,</div><div class='add'>+			      long npages, unsigned long uaddr,</div><div class='ctx'> 			      enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='del'>-	union tce_entry t;</div><div class='del'>-	union tce_entry *tp;</div><div class='add'>+	u64 proto_tce;</div><div class='add'>+	u64 *tcep;</div><div class='add'>+	u64 rpn;</div><div class='ctx'> </div><div class='ctx'> 	index &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='del'>-	t.te_word = 0;</div><div class='del'>-	t.te_rdwr = 1; // Read allowed </div><div class='add'>+	proto_tce = TCE_PCI_READ; // Read allowed</div><div class='ctx'> </div><div class='ctx'> 	if (direction != DMA_TO_DEVICE)</div><div class='del'>-		t.te_pciwr = 1;</div><div class='add'>+		proto_tce |= TCE_PCI_WRITE;</div><div class='ctx'> </div><div class='del'>-	tp = ((union tce_entry *)tbl-&gt;it_base) + index;</div><div class='add'>+	tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='ctx'> </div><div class='ctx'> 	while (npages--) {</div><div class='ctx'> 		/* can't move this out since we might cross LMB boundary */</div><div class='del'>-		t.te_rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='del'>-	</div><div class='del'>-		tp-&gt;te_word = t.te_word;</div><div class='add'>+		rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='add'>+		*tcep = proto_tce | (rpn &amp; TCE_RPN_MASK) &lt;&lt; TCE_RPN_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		uaddr += TCE_PAGE_SIZE;</div><div class='del'>-		tp++;</div><div class='add'>+		tcep++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void tce_free_pSeries(struct iommu_table *tbl, long index, long npages)</div><div class='ctx'> {</div><div class='del'>-	union tce_entry t;</div><div class='del'>-	union tce_entry *tp;</div><div class='add'>+	u64 *tcep;</div><div class='ctx'> </div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	index &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='del'>-	t.te_word = 0;</div><div class='del'>-	tp  = ((union tce_entry *)tbl-&gt;it_base) + index;</div><div class='del'>-		</div><div class='del'>-	while (npages--) {</div><div class='del'>-		tp-&gt;te_word = t.te_word;</div><div class='del'>-		</div><div class='del'>-		tp++;</div><div class='del'>-	}</div><div class='add'>+	tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='add'>+</div><div class='add'>+	while (npages--)</div><div class='add'>+		*(tcep++) = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long tce_get_pseries(struct iommu_table *tbl, long index)</div><div class='add'>+{</div><div class='add'>+	u64 *tcep;</div><div class='add'>+</div><div class='add'>+	index &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='add'>+	tcep = ((u64 *)tbl-&gt;it_base) + index;</div><div class='add'>+</div><div class='add'>+	return *tcep;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> 				long npages, unsigned long uaddr,</div><div class='ctx'> 				enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rc;</div><div class='del'>-	union tce_entry tce;</div><div class='add'>+	u64 proto_tce, tce;</div><div class='add'>+	u64 rpn;</div><div class='ctx'> </div><div class='ctx'> 	tcenum &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='del'>-	tce.te_word = 0;</div><div class='del'>-	tce.te_rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='del'>-	tce.te_rdwr = 1;</div><div class='add'>+	rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='add'>+	proto_tce = TCE_PCI_READ;</div><div class='ctx'> 	if (direction != DMA_TO_DEVICE)</div><div class='del'>-		tce.te_pciwr = 1;</div><div class='add'>+		proto_tce |= TCE_PCI_WRITE;</div><div class='ctx'> </div><div class='ctx'> 	while (npages--) {</div><div class='del'>-		rc = plpar_tce_put((u64)tbl-&gt;it_index, </div><div class='del'>-				   (u64)tcenum &lt;&lt; 12, </div><div class='del'>-				   tce.te_word );</div><div class='del'>-		</div><div class='add'>+		tce = proto_tce | (rpn &amp; TCE_RPN_MASK) &lt;&lt; TCE_RPN_SHIFT;</div><div class='add'>+		rc = plpar_tce_put((u64)tbl-&gt;it_index, (u64)tcenum &lt;&lt; 12, tce);</div><div class='add'>+</div><div class='ctx'> 		if (rc &amp;&amp; printk_ratelimit()) {</div><div class='ctx'> 			printk("tce_build_pSeriesLP: plpar_tce_put failed. rc=%ld\n", rc);</div><div class='ctx'> 			printk("\tindex   = 0x%lx\n", (u64)tbl-&gt;it_index);</div><div class='ctx'> 			printk("\ttcenum  = 0x%lx\n", (u64)tcenum);</div><div class='del'>-			printk("\ttce val = 0x%lx\n", tce.te_word );</div><div class='add'>+			printk("\ttce val = 0x%lx\n", tce );</div><div class='ctx'> 			show_stack(current, (unsigned long *)__get_SP());</div><div class='ctx'> 		}</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		tcenum++;</div><div class='del'>-		tce.te_rpn++;</div><div class='add'>+		rpn++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(void *, tce_page) = NULL;</div><div class='add'>+static DEFINE_PER_CPU(u64 *, tce_page) = NULL;</div><div class='ctx'> </div><div class='ctx'> static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> 				     long npages, unsigned long uaddr,</div><div class='ctx'> 				     enum dma_data_direction direction)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rc;</div><div class='del'>-	union tce_entry tce, *tcep;</div><div class='add'>+	u64 proto_tce;</div><div class='add'>+	u64 *tcep;</div><div class='add'>+	u64 rpn;</div><div class='ctx'> 	long l, limit;</div><div class='ctx'> </div><div class='ctx'> 	if (TCE_PAGE_FACTOR == 0 &amp;&amp; npages == 1)</div><div class='hunk'>@@ -152,7 +156,7 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> 	 * from iommu_alloc{,_sg}()</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!tcep) {</div><div class='del'>-		tcep = (void *)__get_free_page(GFP_ATOMIC);</div><div class='add'>+		tcep = (u64 *)__get_free_page(GFP_ATOMIC);</div><div class='ctx'> 		/* If allocation fails, fall back to the loop implementation */</div><div class='ctx'> 		if (!tcep)</div><div class='ctx'> 			return tce_build_pSeriesLP(tbl, tcenum, npages,</div><div class='hunk'>@@ -163,11 +167,10 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> 	tcenum &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='del'>-	tce.te_word = 0;</div><div class='del'>-	tce.te_rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='del'>-	tce.te_rdwr = 1;</div><div class='add'>+	rpn = (virt_to_abs(uaddr)) &gt;&gt; TCE_SHIFT;</div><div class='add'>+	proto_tce = TCE_PCI_READ;</div><div class='ctx'> 	if (direction != DMA_TO_DEVICE)</div><div class='del'>-		tce.te_pciwr = 1;</div><div class='add'>+		proto_tce |= TCE_PCI_WRITE;</div><div class='ctx'> </div><div class='ctx'> 	/* We can map max one pageful of TCEs at a time */</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -175,11 +178,11 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> 		 * Set up the page with TCE data, looping through and setting</div><div class='ctx'> 		 * the values.</div><div class='ctx'> 		 */</div><div class='del'>-		limit = min_t(long, npages, 4096/sizeof(union tce_entry));</div><div class='add'>+		limit = min_t(long, npages, 4096/TCE_ENTRY_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		for (l = 0; l &lt; limit; l++) {</div><div class='del'>-			tcep[l] = tce;</div><div class='del'>-			tce.te_rpn++;</div><div class='add'>+			tcep[l] = proto_tce | (rpn &amp; TCE_RPN_MASK) &lt;&lt; TCE_RPN_SHIFT;</div><div class='add'>+			rpn++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rc = plpar_tce_put_indirect((u64)tbl-&gt;it_index,</div><div class='hunk'>@@ -195,7 +198,7 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> 		printk("tce_buildmulti_pSeriesLP: plpar_tce_put failed. rc=%ld\n", rc);</div><div class='ctx'> 		printk("\tindex   = 0x%lx\n", (u64)tbl-&gt;it_index);</div><div class='ctx'> 		printk("\tnpages  = 0x%lx\n", (u64)npages);</div><div class='del'>-		printk("\ttce[0] val = 0x%lx\n", tcep[0].te_word);</div><div class='add'>+		printk("\ttce[0] val = 0x%lx\n", tcep[0]);</div><div class='ctx'> 		show_stack(current, (unsigned long *)__get_SP());</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -203,23 +206,17 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,</div><div class='ctx'> static void tce_free_pSeriesLP(struct iommu_table *tbl, long tcenum, long npages)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rc;</div><div class='del'>-	union tce_entry tce;</div><div class='ctx'> </div><div class='ctx'> 	tcenum &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='del'>-	tce.te_word = 0;</div><div class='del'>-</div><div class='ctx'> 	while (npages--) {</div><div class='del'>-		rc = plpar_tce_put((u64)tbl-&gt;it_index,</div><div class='del'>-				   (u64)tcenum &lt;&lt; 12,</div><div class='del'>-				   tce.te_word);</div><div class='add'>+		rc = plpar_tce_put((u64)tbl-&gt;it_index, (u64)tcenum &lt;&lt; 12, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (rc &amp;&amp; printk_ratelimit()) {</div><div class='ctx'> 			printk("tce_free_pSeriesLP: plpar_tce_put failed. rc=%ld\n", rc);</div><div class='ctx'> 			printk("\tindex   = 0x%lx\n", (u64)tbl-&gt;it_index);</div><div class='ctx'> 			printk("\ttcenum  = 0x%lx\n", (u64)tcenum);</div><div class='del'>-			printk("\ttce val = 0x%lx\n", tce.te_word );</div><div class='ctx'> 			show_stack(current, (unsigned long *)__get_SP());</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -231,31 +228,43 @@ static void tce_free_pSeriesLP(struct iommu_table *tbl, long tcenum, long npages</div><div class='ctx'> static void tce_freemulti_pSeriesLP(struct iommu_table *tbl, long tcenum, long npages)</div><div class='ctx'> {</div><div class='ctx'> 	u64 rc;</div><div class='del'>-	union tce_entry tce;</div><div class='ctx'> </div><div class='ctx'> 	tcenum &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> 	npages &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='ctx'> </div><div class='del'>-	tce.te_word = 0;</div><div class='del'>-</div><div class='del'>-	rc = plpar_tce_stuff((u64)tbl-&gt;it_index,</div><div class='del'>-			   (u64)tcenum &lt;&lt; 12,</div><div class='del'>-			   tce.te_word,</div><div class='del'>-			   npages);</div><div class='add'>+	rc = plpar_tce_stuff((u64)tbl-&gt;it_index, (u64)tcenum &lt;&lt; 12, 0, npages);</div><div class='ctx'> </div><div class='ctx'> 	if (rc &amp;&amp; printk_ratelimit()) {</div><div class='ctx'> 		printk("tce_freemulti_pSeriesLP: plpar_tce_stuff failed\n");</div><div class='ctx'> 		printk("\trc      = %ld\n", rc);</div><div class='ctx'> 		printk("\tindex   = 0x%lx\n", (u64)tbl-&gt;it_index);</div><div class='ctx'> 		printk("\tnpages  = 0x%lx\n", (u64)npages);</div><div class='del'>-		printk("\ttce val = 0x%lx\n", tce.te_word );</div><div class='ctx'> 		show_stack(current, (unsigned long *)__get_SP());</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long tce_get_pSeriesLP(struct iommu_table *tbl, long tcenum)</div><div class='add'>+{</div><div class='add'>+	u64 rc;</div><div class='add'>+	unsigned long tce_ret;</div><div class='add'>+</div><div class='add'>+	tcenum &lt;&lt;= TCE_PAGE_FACTOR;</div><div class='add'>+	rc = plpar_tce_get((u64)tbl-&gt;it_index, (u64)tcenum &lt;&lt; 12, &amp;tce_ret);</div><div class='add'>+</div><div class='add'>+	if (rc &amp;&amp; printk_ratelimit()) {</div><div class='add'>+		printk("tce_get_pSeriesLP: plpar_tce_get failed. rc=%ld\n",</div><div class='add'>+			rc);</div><div class='add'>+		printk("\tindex   = 0x%lx\n", (u64)tbl-&gt;it_index);</div><div class='add'>+		printk("\ttcenum  = 0x%lx\n", (u64)tcenum);</div><div class='add'>+		show_stack(current, (unsigned long *)__get_SP());</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tce_ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iommu_table_setparms(struct pci_controller *phb,</div><div class='ctx'> 				 struct device_node *dn,</div><div class='del'>-				 struct iommu_table *tbl) </div><div class='add'>+				 struct iommu_table *tbl)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *node;</div><div class='ctx'> 	unsigned long *basep;</div><div class='hunk'>@@ -272,19 +281,22 @@ static void iommu_table_setparms(struct pci_controller *phb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tbl-&gt;it_base = (unsigned long)__va(*basep);</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_CRASH_DUMP</div><div class='ctx'> 	memset((void *)tbl-&gt;it_base, 0, *sizep);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	tbl-&gt;it_busno = phb-&gt;bus-&gt;number;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Units of tce entries */</div><div class='ctx'> 	tbl-&gt;it_offset = phb-&gt;dma_window_base_cur &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Test if we are going over 2GB of DMA space */</div><div class='ctx'> 	if (phb-&gt;dma_window_base_cur + phb-&gt;dma_window_size &gt; 0x80000000ul) {</div><div class='ctx'> 		udbg_printf("PCI_DMA: Unexpected number of IOAs under this PHB.\n");</div><div class='del'>-		panic("PCI_DMA: Unexpected number of IOAs under this PHB.\n"); </div><div class='add'>+		panic("PCI_DMA: Unexpected number of IOAs under this PHB.\n");</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	phb-&gt;dma_window_base_cur += phb-&gt;dma_window_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the tce table size - measured in entries */</div><div class='hunk'>@@ -299,30 +311,22 @@ static void iommu_table_setparms(struct pci_controller *phb,</div><div class='ctx'>  * iommu_table_setparms_lpar</div><div class='ctx'>  *</div><div class='ctx'>  * Function: On pSeries LPAR systems, return TCE table info, given a pci bus.</div><div class='del'>- *</div><div class='del'>- * ToDo: properly interpret the ibm,dma-window property.  The definition is:</div><div class='del'>- *	logical-bus-number	(1 word)</div><div class='del'>- *	phys-address		(#address-cells words)</div><div class='del'>- *	size			(#cell-size words)</div><div class='del'>- *</div><div class='del'>- * Currently we hard code these sizes (more or less).</div><div class='ctx'>  */</div><div class='ctx'> static void iommu_table_setparms_lpar(struct pci_controller *phb,</div><div class='ctx'> 				      struct device_node *dn,</div><div class='ctx'> 				      struct iommu_table *tbl,</div><div class='del'>-				      unsigned int *dma_window)</div><div class='add'>+				      unsigned char *dma_window)</div><div class='ctx'> {</div><div class='add'>+	unsigned long offset, size;</div><div class='add'>+</div><div class='ctx'> 	tbl-&gt;it_busno  = PCI_DN(dn)-&gt;bussubno;</div><div class='add'>+	of_parse_dma_window(dn, dma_window, &amp;tbl-&gt;it_index, &amp;offset, &amp;size);</div><div class='ctx'> </div><div class='del'>-	/* TODO: Parse field size properties properly. */</div><div class='del'>-	tbl-&gt;it_size   = (((unsigned long)dma_window[4] &lt;&lt; 32) |</div><div class='del'>-			   (unsigned long)dma_window[5]) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	tbl-&gt;it_offset = (((unsigned long)dma_window[2] &lt;&lt; 32) |</div><div class='del'>-			   (unsigned long)dma_window[3]) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	tbl-&gt;it_base   = 0;</div><div class='del'>-	tbl-&gt;it_index  = dma_window[0];</div><div class='ctx'> 	tbl-&gt;it_blocksize  = 16;</div><div class='ctx'> 	tbl-&gt;it_type = TCE_PCI;</div><div class='add'>+	tbl-&gt;it_offset = offset &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	tbl-&gt;it_size = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iommu_bus_setup_pSeries(struct pci_bus *bus)</div><div class='hunk'>@@ -357,13 +361,9 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)</div><div class='ctx'> 	if (isa_dn_orig)</div><div class='ctx'> 		of_node_put(isa_dn_orig);</div><div class='ctx'> </div><div class='del'>-	/* Count number of direct PCI children of the PHB.</div><div class='del'>-	 * All PCI device nodes have class-code property, so it's</div><div class='del'>-	 * an easy way to find them.</div><div class='del'>-	 */</div><div class='add'>+	/* Count number of direct PCI children of the PHB. */</div><div class='ctx'> 	for (children = 0, tmp = dn-&gt;child; tmp; tmp = tmp-&gt;sibling)</div><div class='del'>-		if (get_property(tmp, "class-code", NULL))</div><div class='del'>-			children++;</div><div class='add'>+		children++;</div><div class='ctx'> </div><div class='ctx'> 	DBG("Children: %d\n", children);</div><div class='ctx'> </div><div class='hunk'>@@ -394,10 +394,11 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)</div><div class='ctx'> 	pci-&gt;phb-&gt;dma_window_size = 0x8000000ul;</div><div class='ctx'> 	pci-&gt;phb-&gt;dma_window_base_cur = 0x8000000ul;</div><div class='ctx'> </div><div class='del'>-	tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);</div><div class='add'>+	tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,</div><div class='add'>+			   pci-&gt;phb-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 	iommu_table_setparms(pci-&gt;phb, dn, tbl);</div><div class='del'>-	pci-&gt;iommu_table = iommu_init_table(tbl);</div><div class='add'>+	pci-&gt;iommu_table = iommu_init_table(tbl, pci-&gt;phb-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 	/* Divide the rest (1.75GB) among the children */</div><div class='ctx'> 	pci-&gt;phb-&gt;dma_window_size = 0x80000000ul;</div><div class='hunk'>@@ -414,7 +415,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)</div><div class='ctx'> 	struct iommu_table *tbl;</div><div class='ctx'> 	struct device_node *dn, *pdn;</div><div class='ctx'> 	struct pci_dn *ppci;</div><div class='del'>-	unsigned int *dma_window = NULL;</div><div class='add'>+	unsigned char *dma_window = NULL;</div><div class='ctx'> </div><div class='ctx'> 	DBG("iommu_bus_setup_pSeriesLP, bus %p, bus-&gt;self %p\n", bus, bus-&gt;self);</div><div class='ctx'> </div><div class='hunk'>@@ -422,7 +423,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	/* Find nearest ibm,dma-window, walking up the device tree */</div><div class='ctx'> 	for (pdn = dn; pdn != NULL; pdn = pdn-&gt;parent) {</div><div class='del'>-		dma_window = (unsigned int *)get_property(pdn, "ibm,dma-window", NULL);</div><div class='add'>+		dma_window = get_property(pdn, "ibm,dma-window", NULL);</div><div class='ctx'> 		if (dma_window != NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -440,12 +441,12 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 		ppci-&gt;bussubno = bus-&gt;number;</div><div class='ctx'> </div><div class='del'>-		tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),</div><div class='del'>-						    GFP_KERNEL);</div><div class='del'>-	</div><div class='add'>+		tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,</div><div class='add'>+				   ppci-&gt;phb-&gt;node);</div><div class='add'>+</div><div class='ctx'> 		iommu_table_setparms_lpar(ppci-&gt;phb, pdn, tbl, dma_window);</div><div class='ctx'> </div><div class='del'>-		ppci-&gt;iommu_table = iommu_init_table(tbl);</div><div class='add'>+		ppci-&gt;iommu_table = iommu_init_table(tbl, ppci-&gt;phb-&gt;node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdn != dn)</div><div class='hunk'>@@ -468,9 +469,11 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!dev-&gt;bus-&gt;self) {</div><div class='ctx'> 		DBG(" --&gt; first child, no bridge. Allocating iommu table.\n");</div><div class='del'>-		tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);</div><div class='add'>+		tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,</div><div class='add'>+				   PCI_DN(dn)-&gt;phb-&gt;node);</div><div class='ctx'> 		iommu_table_setparms(PCI_DN(dn)-&gt;phb, dn, tbl);</div><div class='del'>-		PCI_DN(mydn)-&gt;iommu_table = iommu_init_table(tbl);</div><div class='add'>+		PCI_DN(dn)-&gt;iommu_table = iommu_init_table(tbl,</div><div class='add'>+						PCI_DN(dn)-&gt;phb-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -516,7 +519,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *pdn, *dn;</div><div class='ctx'> 	struct iommu_table *tbl;</div><div class='del'>-	int *dma_window = NULL;</div><div class='add'>+	unsigned char *dma_window = NULL;</div><div class='ctx'> 	struct pci_dn *pci;</div><div class='ctx'> </div><div class='ctx'> 	DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev));</div><div class='hunk'>@@ -531,8 +534,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (pdn = dn; pdn &amp;&amp; PCI_DN(pdn) &amp;&amp; !PCI_DN(pdn)-&gt;iommu_table;</div><div class='ctx'> 	     pdn = pdn-&gt;parent) {</div><div class='del'>-		dma_window = (unsigned int *)</div><div class='del'>-			get_property(pdn, "ibm,dma-window", NULL);</div><div class='add'>+		dma_window = get_property(pdn, "ibm,dma-window", NULL);</div><div class='ctx'> 		if (dma_window)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -553,12 +555,12 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)</div><div class='ctx'> 		/* iommu_table_setparms_lpar needs bussubno. */</div><div class='ctx'> 		pci-&gt;bussubno = pci-&gt;phb-&gt;bus-&gt;number;</div><div class='ctx'> </div><div class='del'>-		tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),</div><div class='del'>-						    GFP_KERNEL);</div><div class='add'>+		tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,</div><div class='add'>+				   pci-&gt;phb-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 		iommu_table_setparms_lpar(pci-&gt;phb, pdn, tbl, dma_window);</div><div class='ctx'> </div><div class='del'>-		pci-&gt;iommu_table = iommu_init_table(tbl);</div><div class='add'>+		pci-&gt;iommu_table = iommu_init_table(tbl, pci-&gt;phb-&gt;node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdn != dn)</div><div class='hunk'>@@ -588,11 +590,13 @@ void iommu_init_early_pSeries(void)</div><div class='ctx'> 			ppc_md.tce_build = tce_build_pSeriesLP;</div><div class='ctx'> 			ppc_md.tce_free	 = tce_free_pSeriesLP;</div><div class='ctx'> 		}</div><div class='add'>+		ppc_md.tce_get   = tce_get_pSeriesLP;</div><div class='ctx'> 		ppc_md.iommu_bus_setup = iommu_bus_setup_pSeriesLP;</div><div class='ctx'> 		ppc_md.iommu_dev_setup = iommu_dev_setup_pSeriesLP;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ppc_md.tce_build = tce_build_pSeries;</div><div class='ctx'> 		ppc_md.tce_free  = tce_free_pSeries;</div><div class='add'>+		ppc_md.tce_get   = tce_get_pseries;</div><div class='ctx'> 		ppc_md.iommu_bus_setup = iommu_bus_setup_pSeries;</div><div class='ctx'> 		ppc_md.iommu_dev_setup = iommu_dev_setup_pSeries;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c<br/>index 634b7d06d3cc..3aeb40699042 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/lpar.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/lpar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/lpar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/lpar.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_LOW</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='hunk'>@@ -513,7 +512,7 @@ void pSeries_lpar_flush_hash_range(unsigned long number, int local)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;pSeries_lpar_tlbie_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hpte_init_lpar(void)</div><div class='add'>+void __init hpte_init_lpar(void)</div><div class='ctx'> {</div><div class='ctx'> 	ppc_md.hpte_invalidate	= pSeries_lpar_hpte_invalidate;</div><div class='ctx'> 	ppc_md.hpte_updatepp	= pSeries_lpar_hpte_updatepp;</div><div class='hunk'>@@ -522,6 +521,4 @@ void hpte_init_lpar(void)</div><div class='ctx'> 	ppc_md.hpte_remove	= pSeries_lpar_hpte_remove;</div><div class='ctx'> 	ppc_md.flush_hash_range	= pSeries_lpar_flush_hash_range;</div><div class='ctx'> 	ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;</div><div class='del'>-</div><div class='del'>-	htab_finish_init();</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c<br/>index 9639c66b453d..c7ffde1a614e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/ras.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/ras.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/ras.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/ras.c</a></div><div class='hunk'>@@ -72,32 +72,61 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id,</div><div class='ctx'> </div><div class='ctx'> /* #define DEBUG */</div><div class='ctx'> </div><div class='del'>-static void request_ras_irqs(struct device_node *np, char *propname,</div><div class='add'>+</div><div class='add'>+static void request_ras_irqs(struct device_node *np,</div><div class='ctx'> 			irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='ctx'> 			const char *name)</div><div class='ctx'> {</div><div class='del'>-	unsigned int *ireg, len, i;</div><div class='del'>-	int virq, n_intr;</div><div class='del'>-</div><div class='del'>-	ireg = (unsigned int *)get_property(np, propname, &amp;len);</div><div class='del'>-	if (ireg == NULL)</div><div class='del'>-		return;</div><div class='del'>-	n_intr = prom_n_intr_cells(np);</div><div class='del'>-	len /= n_intr * sizeof(*ireg);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		virq = virt_irq_create_mapping(*ireg);</div><div class='del'>-		if (virq == NO_IRQ) {</div><div class='del'>-			printk(KERN_ERR "Unable to allocate interrupt "</div><div class='del'>-			       "number for %s\n", np-&gt;full_name);</div><div class='del'>-			return;</div><div class='add'>+	int i, index, count = 0;</div><div class='add'>+	struct of_irq oirq;</div><div class='add'>+	u32 *opicprop;</div><div class='add'>+	unsigned int opicplen;</div><div class='add'>+	unsigned int virqs[16];</div><div class='add'>+</div><div class='add'>+	/* Check for obsolete "open-pic-interrupt" property. If present, then</div><div class='add'>+	 * map those interrupts using the default interrupt host and default</div><div class='add'>+	 * trigger</div><div class='add'>+	 */</div><div class='add'>+	opicprop = (u32 *)get_property(np, "open-pic-interrupt", &amp;opicplen);</div><div class='add'>+	if (opicprop) {</div><div class='add'>+		opicplen /= sizeof(u32);</div><div class='add'>+		for (i = 0; i &lt; opicplen; i++) {</div><div class='add'>+			if (count &gt; 15)</div><div class='add'>+				break;</div><div class='add'>+			virqs[count] = irq_create_mapping(NULL, *(opicprop++));</div><div class='add'>+			if (virqs[count] == NO_IRQ)</div><div class='add'>+				printk(KERN_ERR "Unable to allocate interrupt "</div><div class='add'>+				       "number for %s\n", np-&gt;full_name);</div><div class='add'>+			else</div><div class='add'>+				count++;</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='del'>-		if (request_irq(irq_offset_up(virq), handler, 0, name, NULL)) {</div><div class='add'>+	}</div><div class='add'>+	/* Else use normal interrupt tree parsing */</div><div class='add'>+	else {</div><div class='add'>+		/* First try to do a proper OF tree parsing */</div><div class='add'>+		for (index = 0; of_irq_map_one(np, index, &amp;oirq) == 0;</div><div class='add'>+		     index++) {</div><div class='add'>+			if (count &gt; 15)</div><div class='add'>+				break;</div><div class='add'>+			virqs[count] = irq_create_of_mapping(oirq.controller,</div><div class='add'>+							    oirq.specifier,</div><div class='add'>+							    oirq.size);</div><div class='add'>+			if (virqs[count] == NO_IRQ)</div><div class='add'>+				printk(KERN_ERR "Unable to allocate interrupt "</div><div class='add'>+				       "number for %s\n", np-&gt;full_name);</div><div class='add'>+			else</div><div class='add'>+				count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now request them */</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (request_irq(virqs[i], handler, 0, name, NULL)) {</div><div class='ctx'> 			printk(KERN_ERR "Unable to request interrupt %d for "</div><div class='del'>-			       "%s\n", irq_offset_up(virq), np-&gt;full_name);</div><div class='add'>+			       "%s\n", virqs[i], np-&gt;full_name);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		ireg += n_intr;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -115,20 +144,14 @@ static int __init init_ras_IRQ(void)</div><div class='ctx'> 	/* Internal Errors */</div><div class='ctx'> 	np = of_find_node_by_path("/event-sources/internal-errors");</div><div class='ctx'> 	if (np != NULL) {</div><div class='del'>-		request_ras_irqs(np, "open-pic-interrupt", ras_error_interrupt,</div><div class='del'>-				 "RAS_ERROR");</div><div class='del'>-		request_ras_irqs(np, "interrupts", ras_error_interrupt,</div><div class='del'>-				 "RAS_ERROR");</div><div class='add'>+		request_ras_irqs(np, ras_error_interrupt, "RAS_ERROR");</div><div class='ctx'> 		of_node_put(np);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* EPOW Events */</div><div class='ctx'> 	np = of_find_node_by_path("/event-sources/epow-events");</div><div class='ctx'> 	if (np != NULL) {</div><div class='del'>-		request_ras_irqs(np, "open-pic-interrupt", ras_epow_interrupt,</div><div class='del'>-				 "RAS_EPOW");</div><div class='del'>-		request_ras_irqs(np, "interrupts", ras_epow_interrupt,</div><div class='del'>-				 "RAS_EPOW");</div><div class='add'>+		request_ras_irqs(np, ras_epow_interrupt, "RAS_EPOW");</div><div class='ctx'> 		of_node_put(np);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +185,7 @@ ras_epow_interrupt(int irq, void *dev_id, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	status = rtas_call(ras_check_exception_token, 6, 1, NULL,</div><div class='ctx'> 			   RAS_VECTOR_OFFSET,</div><div class='del'>-			   virt_irq_to_real(irq_offset_down(irq)),</div><div class='add'>+			   irq_map[irq].hwirq,</div><div class='ctx'> 			   RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS,</div><div class='ctx'> 			   critical, __pa(&amp;ras_log_buf),</div><div class='ctx'> 				rtas_get_error_log_max());</div><div class='hunk'>@@ -198,7 +221,7 @@ ras_error_interrupt(int irq, void *dev_id, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	status = rtas_call(ras_check_exception_token, 6, 1, NULL,</div><div class='ctx'> 			   RAS_VECTOR_OFFSET,</div><div class='del'>-			   virt_irq_to_real(irq_offset_down(irq)),</div><div class='add'>+			   irq_map[irq].hwirq,</div><div class='ctx'> 			   RTAS_INTERNAL_ERROR, 1 /*Time Critical */,</div><div class='ctx'> 			   __pa(&amp;ras_log_buf),</div><div class='ctx'> 				rtas_get_error_log_max());</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c<br/>index e0000ce769e5..2e4e04042d85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/rtasd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/rtasd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/rtasd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/rtasd.c</a></div><div class='hunk'>@@ -348,7 +348,7 @@ static int enable_surveillance(int timeout)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (error == -EINVAL) {</div><div class='del'>-		printk(KERN_INFO "rtasd: surveillance not supported\n");</div><div class='add'>+		printk(KERN_DEBUG "rtasd: surveillance not supported\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -440,7 +440,7 @@ static int rtasd(void *unused)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "RTAS daemon started\n");</div><div class='add'>+	printk(KERN_DEBUG "RTAS daemon started\n");</div><div class='ctx'> </div><div class='ctx'> 	DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));</div><div class='ctx'> </div><div class='hunk'>@@ -487,7 +487,7 @@ static int __init rtas_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* No RTAS */</div><div class='ctx'> 	if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {</div><div class='del'>-		printk(KERN_INFO "rtasd: no event-scan on system\n");</div><div class='add'>+		printk(KERN_DEBUG "rtasd: no event-scan on system\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c<br/>index 50643496eb63..77a5bb1d9c30 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/scanlog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/scanlog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/scanlog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/scanlog.c</a></div><div class='hunk'>@@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,</div><div class='ctx'> 			/* Break to sleep default time */</div><div class='ctx'> 			break;</div><div class='ctx'> 		    default:</div><div class='del'>-			if (status &gt; 9900 &amp;&amp; status &lt;= 9905) {</div><div class='del'>-				wait_time = rtas_extended_busy_delay_time(status);</div><div class='del'>-			} else {</div><div class='add'>+			/* Assume extended busy */</div><div class='add'>+			wait_time = rtas_busy_delay_time(status);</div><div class='add'>+			if (!wait_time) {</div><div class='ctx'> 				printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c<br/>index 5f79f01c44f2..54a52437265c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/setup.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -77,6 +76,9 @@</div><div class='ctx'> #define DBG(fmt...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* move those away to a .h */</div><div class='add'>+extern void smp_init_pseries_mpic(void);</div><div class='add'>+extern void smp_init_pseries_xics(void);</div><div class='ctx'> extern void find_udbg_vterm(void);</div><div class='ctx'> </div><div class='ctx'> int fwnmi_active;  /* TRUE if an FWNMI handler is present */</div><div class='hunk'>@@ -84,7 +86,7 @@ int fwnmi_active;  /* TRUE if an FWNMI handler is present */</div><div class='ctx'> static void pseries_shared_idle_sleep(void);</div><div class='ctx'> static void pseries_dedicated_idle_sleep(void);</div><div class='ctx'> </div><div class='del'>-struct mpic *pSeries_mpic;</div><div class='add'>+static struct device_node *pSeries_mpic_node;</div><div class='ctx'> </div><div class='ctx'> static void pSeries_show_cpuinfo(struct seq_file *m)</div><div class='ctx'> {</div><div class='hunk'>@@ -119,63 +121,92 @@ static void __init fwnmi_init(void)</div><div class='ctx'> 		fwnmi_active = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pSeries_init_mpic(void)</div><div class='add'>+void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc,</div><div class='add'>+			  struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-        unsigned int *addrp;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	unsigned long intack = 0;</div><div class='del'>-</div><div class='del'>-	/* All ISUs are setup, complete initialization */</div><div class='del'>-	mpic_init(pSeries_mpic);</div><div class='del'>-</div><div class='del'>-	/* Check what kind of cascade ACK we have */</div><div class='del'>-        if (!(np = of_find_node_by_name(NULL, "pci"))</div><div class='del'>-            || !(addrp = (unsigned int *)</div><div class='del'>-                 get_property(np, "8259-interrupt-acknowledge", NULL)))</div><div class='del'>-                printk(KERN_ERR "Cannot find pci to get ack address\n");</div><div class='del'>-        else</div><div class='del'>-		intack = addrp[prom_n_addr_cells(np)-1];</div><div class='del'>-	of_node_put(np);</div><div class='del'>-</div><div class='del'>-	/* Setup the legacy interrupts &amp; controller */</div><div class='del'>-	i8259_init(intack, 0);</div><div class='del'>-</div><div class='del'>-	/* Hook cascade to mpic */</div><div class='del'>-	mpic_setup_cascade(NUM_ISA_INTERRUPTS, i8259_irq_cascade, NULL);</div><div class='add'>+	unsigned int cascade_irq = i8259_irq(regs);</div><div class='add'>+	if (cascade_irq != NO_IRQ)</div><div class='add'>+		generic_handle_irq(cascade_irq, regs);</div><div class='add'>+	desc-&gt;chip-&gt;eoi(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pSeries_setup_mpic(void)</div><div class='add'>+static void __init pseries_mpic_init_IRQ(void)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *np, *old, *cascade = NULL;</div><div class='add'>+        unsigned int *addrp;</div><div class='add'>+	unsigned long intack = 0;</div><div class='ctx'> 	unsigned int *opprop;</div><div class='ctx'> 	unsigned long openpic_addr = 0;</div><div class='del'>-        unsigned char senses[NR_IRQS - NUM_ISA_INTERRUPTS];</div><div class='del'>-        struct device_node *root;</div><div class='del'>-	int irq_count;</div><div class='add'>+	unsigned int cascade_irq;</div><div class='add'>+	int naddr, n, i, opplen;</div><div class='add'>+	struct mpic *mpic;</div><div class='ctx'> </div><div class='del'>-	/* Find the Open PIC if present */</div><div class='del'>-	root = of_find_node_by_path("/");</div><div class='del'>-	opprop = (unsigned int *) get_property(root, "platform-open-pic", NULL);</div><div class='add'>+	np = of_find_node_by_path("/");</div><div class='add'>+	naddr = prom_n_addr_cells(np);</div><div class='add'>+	opprop = (unsigned int *) get_property(np, "platform-open-pic", &amp;opplen);</div><div class='ctx'> 	if (opprop != 0) {</div><div class='del'>-		int n = prom_n_addr_cells(root);</div><div class='del'>-</div><div class='del'>-		for (openpic_addr = 0; n &gt; 0; --n)</div><div class='del'>-			openpic_addr = (openpic_addr &lt;&lt; 32) + *opprop++;</div><div class='add'>+		openpic_addr = of_read_number(opprop, naddr);</div><div class='ctx'> 		printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);</div><div class='ctx'> 	}</div><div class='del'>-	of_node_put(root);</div><div class='add'>+	of_node_put(np);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(openpic_addr == 0);</div><div class='ctx'> </div><div class='del'>-	/* Get the sense values from OF */</div><div class='del'>-	prom_get_irq_senses(senses, NUM_ISA_INTERRUPTS, NR_IRQS);</div><div class='del'>-	</div><div class='ctx'> 	/* Setup the openpic driver */</div><div class='del'>-	irq_count = NR_IRQS - NUM_ISA_INTERRUPTS - 4; /* leave room for IPIs */</div><div class='del'>-	pSeries_mpic = mpic_alloc(openpic_addr, MPIC_PRIMARY,</div><div class='del'>-				  16, 16, irq_count, /* isu size, irq offset, irq count */ </div><div class='del'>-				  NR_IRQS - 4, /* ipi offset */</div><div class='del'>-				  senses, irq_count, /* sense &amp; sense size */</div><div class='del'>-				  " MPIC     ");</div><div class='add'>+	mpic = mpic_alloc(pSeries_mpic_node, openpic_addr,</div><div class='add'>+			  MPIC_PRIMARY,</div><div class='add'>+			  16, 250, /* isu size, irq count */</div><div class='add'>+			  " MPIC     ");</div><div class='add'>+	BUG_ON(mpic == NULL);</div><div class='add'>+</div><div class='add'>+	/* Add ISUs */</div><div class='add'>+	opplen /= sizeof(u32);</div><div class='add'>+	for (n = 0, i = naddr; i &lt; opplen; i += naddr, n++) {</div><div class='add'>+		unsigned long isuaddr = of_read_number(opprop + i, naddr);</div><div class='add'>+		mpic_assign_isu(mpic, n, isuaddr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* All ISUs are setup, complete initialization */</div><div class='add'>+	mpic_init(mpic);</div><div class='add'>+</div><div class='add'>+	/* Look for cascade */</div><div class='add'>+	for_each_node_by_type(np, "interrupt-controller")</div><div class='add'>+		if (device_is_compatible(np, "chrp,iic")) {</div><div class='add'>+			cascade = np;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	if (cascade == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cascade_irq = irq_of_parse_and_map(cascade, 0);</div><div class='add'>+	if (cascade == NO_IRQ) {</div><div class='add'>+		printk(KERN_ERR "xics: failed to map cascade interrupt");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check ACK type */</div><div class='add'>+	for (old = of_node_get(cascade); old != NULL ; old = np) {</div><div class='add'>+		np = of_get_parent(old);</div><div class='add'>+		of_node_put(old);</div><div class='add'>+		if (np == NULL)</div><div class='add'>+			break;</div><div class='add'>+		if (strcmp(np-&gt;name, "pci") != 0)</div><div class='add'>+			continue;</div><div class='add'>+		addrp = (u32 *)get_property(np, "8259-interrupt-acknowledge",</div><div class='add'>+					    NULL);</div><div class='add'>+		if (addrp == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		naddr = prom_n_addr_cells(np);</div><div class='add'>+		intack = addrp[naddr-1];</div><div class='add'>+		if (naddr &gt; 1)</div><div class='add'>+			intack |= ((unsigned long)addrp[naddr-2]) &lt;&lt; 32;</div><div class='add'>+	}</div><div class='add'>+	if (intack)</div><div class='add'>+		printk(KERN_DEBUG "mpic: PCI 8259 intack at 0x%016lx\n",</div><div class='add'>+		       intack);</div><div class='add'>+	i8259_init(cascade, intack);</div><div class='add'>+	of_node_put(cascade);</div><div class='add'>+	set_irq_chained_handler(cascade_irq, pseries_8259_cascade);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pseries_lpar_enable_pmcs(void)</div><div class='hunk'>@@ -193,23 +224,67 @@ static void pseries_lpar_enable_pmcs(void)</div><div class='ctx'> 		get_lppaca()-&gt;pmcregs_in_use = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init pSeries_setup_arch(void)</div><div class='add'>+#ifdef CONFIG_KEXEC</div><div class='add'>+static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary)</div><div class='ctx'> {</div><div class='del'>-	/* Fixup ppc_md depending on the type of interrupt controller */</div><div class='del'>-	if (ppc64_interrupt_controller == IC_OPEN_PIC) {</div><div class='del'>-		ppc_md.init_IRQ       = pSeries_init_mpic;</div><div class='del'>-		ppc_md.get_irq        = mpic_get_irq;</div><div class='del'>-		/* Allocate the mpic now, so that find_and_init_phbs() can</div><div class='del'>-		 * fill the ISUs */</div><div class='del'>-		pSeries_setup_mpic();</div><div class='del'>-	} else {</div><div class='del'>-		ppc_md.init_IRQ       = xics_init_IRQ;</div><div class='del'>-		ppc_md.get_irq        = xics_get_irq;</div><div class='add'>+	mpic_teardown_this_cpu(secondary);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary)</div><div class='add'>+{</div><div class='add'>+	/* Don't risk a hypervisor call if we're crashing */</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_SPLPAR) &amp;&amp; !crash_shutdown) {</div><div class='add'>+		unsigned long vpa = __pa(get_lppaca());</div><div class='add'>+</div><div class='add'>+		if (unregister_vpa(hard_smp_processor_id(), vpa)) {</div><div class='add'>+			printk("VPA deregistration of cpu %u (hw_cpu_id %d) "</div><div class='add'>+					"failed\n", smp_processor_id(),</div><div class='add'>+					hard_smp_processor_id());</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	xics_teardown_cpu(secondary);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_KEXEC */</div><div class='ctx'> </div><div class='add'>+static void __init pseries_discover_pic(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	char *typep;</div><div class='add'>+</div><div class='add'>+	for (np = NULL; (np = of_find_node_by_name(np,</div><div class='add'>+						   "interrupt-controller"));) {</div><div class='add'>+		typep = (char *)get_property(np, "compatible", NULL);</div><div class='add'>+		if (strstr(typep, "open-pic")) {</div><div class='add'>+			pSeries_mpic_node = of_node_get(np);</div><div class='add'>+			ppc_md.init_IRQ       = pseries_mpic_init_IRQ;</div><div class='add'>+			ppc_md.get_irq        = mpic_get_irq;</div><div class='add'>+#ifdef CONFIG_KEXEC</div><div class='add'>+			ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic;</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	smp_init_pSeries();</div><div class='add'>+			smp_init_pseries_mpic();</div><div class='ctx'> #endif</div><div class='add'>+			return;</div><div class='add'>+		} else if (strstr(typep, "ppc-xicp")) {</div><div class='add'>+			ppc_md.init_IRQ       = xics_init_IRQ;</div><div class='add'>+#ifdef CONFIG_KEXEC</div><div class='add'>+			ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+			smp_init_pseries_xics();</div><div class='add'>+#endif</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_ERR "pSeries_discover_pic: failed to recognize"</div><div class='add'>+	       " interrupt-controller\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init pSeries_setup_arch(void)</div><div class='add'>+{</div><div class='add'>+	/* Discover PIC type and setup ppc_md accordingly */</div><div class='add'>+	pseries_discover_pic();</div><div class='add'>+</div><div class='ctx'> 	/* openpic global configuration register (64-bit format). */</div><div class='ctx'> 	/* openpic Interrupt Source Unit pointer (64-bit format). */</div><div class='ctx'> 	/* python0 facility area (mmio) (64-bit format) REAL address. */</div><div class='hunk'>@@ -235,14 +310,14 @@ static void __init pSeries_setup_arch(void)</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {</div><div class='ctx'> 		vpa_init(boot_cpuid);</div><div class='ctx'> 		if (get_lppaca()-&gt;shared_proc) {</div><div class='del'>-			printk(KERN_INFO "Using shared processor idle loop\n");</div><div class='add'>+			printk(KERN_DEBUG "Using shared processor idle loop\n");</div><div class='ctx'> 			ppc_md.power_save = pseries_shared_idle_sleep;</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_INFO "Using dedicated idle loop\n");</div><div class='add'>+			printk(KERN_DEBUG "Using dedicated idle loop\n");</div><div class='ctx'> 			ppc_md.power_save = pseries_dedicated_idle_sleep;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO "Using default idle loop\n");</div><div class='add'>+		printk(KERN_DEBUG "Using default idle loop\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='hunk'>@@ -261,41 +336,11 @@ static int __init pSeries_init_panel(void)</div><div class='ctx'> }</div><div class='ctx'> arch_initcall(pSeries_init_panel);</div><div class='ctx'> </div><div class='del'>-static  void __init pSeries_discover_pic(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	char *typep;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Setup interrupt mapping options that are needed for finish_device_tree</div><div class='del'>-	 * to properly parse the OF interrupt tree &amp; do the virtual irq mapping</div><div class='del'>-	 */</div><div class='del'>-	__irq_offset_value = NUM_ISA_INTERRUPTS;</div><div class='del'>-	ppc64_interrupt_controller = IC_INVALID;</div><div class='del'>-	for (np = NULL; (np = of_find_node_by_name(np, "interrupt-controller"));) {</div><div class='del'>-		typep = (char *)get_property(np, "compatible", NULL);</div><div class='del'>-		if (strstr(typep, "open-pic")) {</div><div class='del'>-			ppc64_interrupt_controller = IC_OPEN_PIC;</div><div class='del'>-			break;</div><div class='del'>-		} else if (strstr(typep, "ppc-xicp")) {</div><div class='del'>-			ppc64_interrupt_controller = IC_PPC_XIC;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ppc64_interrupt_controller == IC_INVALID)</div><div class='del'>-		printk("pSeries_discover_pic: failed to recognize"</div><div class='del'>-			" interrupt-controller\n");</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void pSeries_mach_cpu_die(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	idle_task_exit();</div><div class='del'>-	/* Some hardware requires clearing the CPPR, while other hardware does not</div><div class='del'>-	 * it is safe either way</div><div class='del'>-	 */</div><div class='del'>-	pSeriesLP_cppr_info(0, 0);</div><div class='add'>+	xics_teardown_cpu(0);</div><div class='ctx'> 	rtas_stop_self();</div><div class='ctx'> 	/* Should never get here... */</div><div class='ctx'> 	BUG();</div><div class='hunk'>@@ -322,11 +367,6 @@ static void __init pSeries_init_early(void)</div><div class='ctx'> 	DBG(" -&gt; pSeries_init_early()\n");</div><div class='ctx'> </div><div class='ctx'> 	fw_feature_init();</div><div class='del'>-	</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='del'>-		hpte_init_lpar();</div><div class='del'>-	else</div><div class='del'>-		hpte_init_native();</div><div class='ctx'> </div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='ctx'> 		find_udbg_vterm();</div><div class='hunk'>@@ -338,8 +378,6 @@ static void __init pSeries_init_early(void)</div><div class='ctx'> </div><div class='ctx'> 	iommu_init_early_pSeries();</div><div class='ctx'> </div><div class='del'>-	pSeries_discover_pic();</div><div class='del'>-</div><div class='ctx'> 	DBG(" &lt;- pSeries_init_early()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -384,11 +422,17 @@ static int __init pSeries_probe_hypertas(unsigned long node,</div><div class='ctx'> 	if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL) != NULL)</div><div class='ctx'>  		powerpc_firmware_features |= FW_FEATURE_LPAR;</div><div class='ctx'> </div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		hpte_init_lpar();</div><div class='add'>+	else</div><div class='add'>+		hpte_init_native();</div><div class='add'>+</div><div class='ctx'>  	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init pSeries_probe(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned long root = of_get_flat_dt_root();</div><div class='ctx'>  	char *dtype = of_get_flat_dt_prop(of_get_flat_dt_root(),</div><div class='ctx'>  					  "device_type", NULL);</div><div class='ctx'>  	if (dtype == NULL)</div><div class='hunk'>@@ -396,6 +440,13 @@ static int __init pSeries_probe(void)</div><div class='ctx'>  	if (strcmp(dtype, "chrp"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* Cell blades firmware claims to be chrp while it's not. Until this</div><div class='add'>+	 * is fixed, we need to avoid those here.</div><div class='add'>+	 */</div><div class='add'>+	if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0") ||</div><div class='add'>+	    of_flat_dt_is_compatible(root, "IBM,CBEA"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	DBG("pSeries detected, looking for LPAR capability...\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Now try to figure out if we are running on LPAR */</div><div class='hunk'>@@ -498,27 +549,6 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)</div><div class='ctx'> 	return PCI_PROBE_NORMAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_KEXEC</div><div class='del'>-static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)</div><div class='del'>-{</div><div class='del'>-	/* Don't risk a hypervisor call if we're crashing */</div><div class='del'>-	if (firmware_has_feature(FW_FEATURE_SPLPAR) &amp;&amp; !crash_shutdown) {</div><div class='del'>-		unsigned long vpa = __pa(get_lppaca());</div><div class='del'>-</div><div class='del'>-		if (unregister_vpa(hard_smp_processor_id(), vpa)) {</div><div class='del'>-			printk("VPA deregistration of cpu %u (hw_cpu_id %d) "</div><div class='del'>-					"failed\n", smp_processor_id(),</div><div class='del'>-					hard_smp_processor_id());</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ppc64_interrupt_controller == IC_OPEN_PIC)</div><div class='del'>-		mpic_teardown_this_cpu(secondary);</div><div class='del'>-	else</div><div class='del'>-		xics_teardown_cpu(secondary);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> define_machine(pseries) {</div><div class='ctx'> 	.name			= "pSeries",</div><div class='ctx'> 	.probe			= pSeries_probe,</div><div class='hunk'>@@ -543,7 +573,6 @@ define_machine(pseries) {</div><div class='ctx'> 	.system_reset_exception = pSeries_system_reset_exception,</div><div class='ctx'> 	.machine_check_exception = pSeries_machine_check_exception,</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='del'>-	.kexec_cpu_down		= pseries_kexec_cpu_down,</div><div class='ctx'> 	.machine_kexec		= default_machine_kexec,</div><div class='ctx'> 	.machine_kexec_prepare	= default_machine_kexec_prepare,</div><div class='ctx'> 	.machine_crash_shutdown	= default_machine_crash_shutdown,</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c<br/>index 3cf78a6cd27c..ac61098ff401 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/smp.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -417,27 +416,12 @@ static struct smp_ops_t pSeries_xics_smp_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* This is called very early */</div><div class='del'>-void __init smp_init_pSeries(void)</div><div class='add'>+static void __init smp_init_pseries(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	DBG(" -&gt; smp_init_pSeries()\n");</div><div class='ctx'> </div><div class='del'>-	switch (ppc64_interrupt_controller) {</div><div class='del'>-#ifdef CONFIG_MPIC</div><div class='del'>-	case IC_OPEN_PIC:</div><div class='del'>-		smp_ops = &amp;pSeries_mpic_smp_ops;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_XICS</div><div class='del'>-	case IC_PPC_XIC:</div><div class='del'>-		smp_ops = &amp;pSeries_xics_smp_ops;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		panic("Invalid interrupt controller");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> 	smp_ops-&gt;cpu_disable = pSeries_cpu_disable;</div><div class='ctx'> 	smp_ops-&gt;cpu_die = pSeries_cpu_die;</div><div class='hunk'>@@ -472,3 +456,18 @@ void __init smp_init_pSeries(void)</div><div class='ctx'> 	DBG(" &lt;- smp_init_pSeries()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MPIC</div><div class='add'>+void __init smp_init_pseries_mpic(void)</div><div class='add'>+{</div><div class='add'>+	smp_ops = &amp;pSeries_mpic_smp_ops;</div><div class='add'>+</div><div class='add'>+	smp_init_pseries();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __init smp_init_pseries_xics(void)</div><div class='add'>+{</div><div class='add'>+	smp_ops = &amp;pSeries_xics_smp_ops;</div><div class='add'>+</div><div class='add'>+	smp_init_pseries();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c<br/>deleted file mode 100644<br/>index 8e53e04ada8b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/vio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/vio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,274 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * IBM PowerPC pSeries Virtual I/O Infrastructure Support.</div><div class='del'>- *</div><div class='del'>- *    Copyright (c) 2003-2005 IBM Corp.</div><div class='del'>- *     Dave Engebretsen engebret@us.ibm.com</div><div class='del'>- *     Santiago Leon santil@us.ibm.com</div><div class='del'>- *     Hollis Blanchard &lt;hollisb@us.ibm.com&gt;</div><div class='del'>- *     Stephen Rothwell</div><div class='del'>- *</div><div class='del'>- *      This program is free software; you can redistribute it and/or</div><div class='del'>- *      modify it under the terms of the GNU General Public License</div><div class='del'>- *      as published by the Free Software Foundation; either version</div><div class='del'>- *      2 of the License, or (at your option) any later version.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/kobject.h&gt;</div><div class='del'>-#include &lt;asm/iommu.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='del'>-#include &lt;asm/vio.h&gt;</div><div class='del'>-#include &lt;asm/hvcall.h&gt;</div><div class='del'>-#include &lt;asm/tce.h&gt;</div><div class='del'>-</div><div class='del'>-extern struct subsystem devices_subsys; /* needed for vio_find_name() */</div><div class='del'>-</div><div class='del'>-static void probe_bus_pseries(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *node_vroot, *of_node;</div><div class='del'>-</div><div class='del'>-	node_vroot = find_devices("vdevice");</div><div class='del'>-	if ((node_vroot == NULL) || (node_vroot-&gt;child == NULL))</div><div class='del'>-		/* this machine doesn't do virtual IO, and that's ok */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create struct vio_devices for each virtual device in the device tree.</div><div class='del'>-	 * Drivers will associate with them later.</div><div class='del'>-	 */</div><div class='del'>-	for (of_node = node_vroot-&gt;child; of_node != NULL;</div><div class='del'>-			of_node = of_node-&gt;sibling) {</div><div class='del'>-		printk(KERN_DEBUG "%s: processing %p\n", __FUNCTION__, of_node);</div><div class='del'>-		vio_register_device_node(of_node);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_match_device_pseries: - Tell if a pSeries VIO device matches a</div><div class='del'>- *	vio_device_id</div><div class='del'>- */</div><div class='del'>-static int vio_match_device_pseries(const struct vio_device_id *id,</div><div class='del'>-		const struct vio_dev *dev)</div><div class='del'>-{</div><div class='del'>-	return (strncmp(dev-&gt;type, id-&gt;type, strlen(id-&gt;type)) == 0) &amp;&amp;</div><div class='del'>-			device_is_compatible(dev-&gt;dev.platform_data, id-&gt;compat);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vio_release_device_pseries(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	/* XXX free TCE table */</div><div class='del'>-	of_node_put(dev-&gt;platform_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t viodev_show_devspec(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct device_node *of_node = dev-&gt;platform_data;</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%s\n", of_node-&gt;full_name);</div><div class='del'>-}</div><div class='del'>-DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL);</div><div class='del'>-</div><div class='del'>-static void vio_unregister_device_pseries(struct vio_dev *viodev)</div><div class='del'>-{</div><div class='del'>-	device_remove_file(&amp;viodev-&gt;dev, &amp;dev_attr_devspec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct vio_bus_ops vio_bus_ops_pseries = {</div><div class='del'>-	.match = vio_match_device_pseries,</div><div class='del'>-	.unregister_device = vio_unregister_device_pseries,</div><div class='del'>-	.release_device = vio_release_device_pseries,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_bus_init_pseries: - Initialize the pSeries virtual IO bus</div><div class='del'>- */</div><div class='del'>-static int __init vio_bus_init_pseries(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = vio_bus_init(&amp;vio_bus_ops_pseries);</div><div class='del'>-	if (err == 0)</div><div class='del'>-		probe_bus_pseries();</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__initcall(vio_bus_init_pseries);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_build_iommu_table: - gets the dma information from OF and</div><div class='del'>- *	builds the TCE tree.</div><div class='del'>- * @dev: the virtual device.</div><div class='del'>- *</div><div class='del'>- * Returns a pointer to the built tce tree, or NULL if it can't</div><div class='del'>- * find property.</div><div class='del'>-*/</div><div class='del'>-static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int *dma_window;</div><div class='del'>-	struct iommu_table *newTceTable;</div><div class='del'>-	unsigned long offset;</div><div class='del'>-	int dma_window_property_size;</div><div class='del'>-</div><div class='del'>-	dma_window = (unsigned int *) get_property(dev-&gt;dev.platform_data, "ibm,my-dma-window", &amp;dma_window_property_size);</div><div class='del'>-	if(!dma_window) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	newTceTable = (struct iommu_table *) kmalloc(sizeof(struct iommu_table), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	/*  There should be some code to extract the phys-encoded offset</div><div class='del'>-		using prom_n_addr_cells(). However, according to a comment</div><div class='del'>-		on earlier versions, it's always zero, so we don't bother */</div><div class='del'>-	offset = dma_window[1] &gt;&gt;  PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	/* TCE table size - measured in tce entries */</div><div class='del'>-	newTceTable-&gt;it_size		= dma_window[4] &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	/* offset for VIO should always be 0 */</div><div class='del'>-	newTceTable-&gt;it_offset		= offset;</div><div class='del'>-	newTceTable-&gt;it_busno		= 0;</div><div class='del'>-	newTceTable-&gt;it_index		= (unsigned long)dma_window[0];</div><div class='del'>-	newTceTable-&gt;it_type		= TCE_VB;</div><div class='del'>-</div><div class='del'>-	return iommu_init_table(newTceTable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_register_device_node: - Register a new vio device.</div><div class='del'>- * @of_node:	The OF node for this device.</div><div class='del'>- *</div><div class='del'>- * Creates and initializes a vio_dev structure from the data in</div><div class='del'>- * of_node (dev.platform_data) and adds it to the list of virtual devices.</div><div class='del'>- * Returns a pointer to the created vio_dev or NULL if node has</div><div class='del'>- * NULL device_type or compatible fields.</div><div class='del'>- */</div><div class='del'>-struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)</div><div class='del'>-{</div><div class='del'>-	struct vio_dev *viodev;</div><div class='del'>-	unsigned int *unit_address;</div><div class='del'>-	unsigned int *irq_p;</div><div class='del'>-</div><div class='del'>-	/* we need the 'device_type' property, in order to match with drivers */</div><div class='del'>-	if ((NULL == of_node-&gt;type)) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-			"%s: node %s missing 'device_type'\n", __FUNCTION__,</div><div class='del'>-			of_node-&gt;name ? of_node-&gt;name : "&lt;unknown&gt;");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unit_address = (unsigned int *)get_property(of_node, "reg", NULL);</div><div class='del'>-	if (!unit_address) {</div><div class='del'>-		printk(KERN_WARNING "%s: node %s missing 'reg'\n", __FUNCTION__,</div><div class='del'>-			of_node-&gt;name ? of_node-&gt;name : "&lt;unknown&gt;");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate a vio_dev for this node */</div><div class='del'>-	viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);</div><div class='del'>-	if (!viodev) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	memset(viodev, 0, sizeof(struct vio_dev));</div><div class='del'>-</div><div class='del'>-	viodev-&gt;dev.platform_data = of_node_get(of_node);</div><div class='del'>-</div><div class='del'>-	viodev-&gt;irq = NO_IRQ;</div><div class='del'>-	irq_p = (unsigned int *)get_property(of_node, "interrupts", NULL);</div><div class='del'>-	if (irq_p) {</div><div class='del'>-		int virq = virt_irq_create_mapping(*irq_p);</div><div class='del'>-		if (virq == NO_IRQ) {</div><div class='del'>-			printk(KERN_ERR "Unable to allocate interrupt "</div><div class='del'>-			       "number for %s\n", of_node-&gt;full_name);</div><div class='del'>-		} else</div><div class='del'>-			viodev-&gt;irq = irq_offset_up(virq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(viodev-&gt;dev.bus_id, BUS_ID_SIZE, "%x", *unit_address);</div><div class='del'>-	viodev-&gt;name = of_node-&gt;name;</div><div class='del'>-	viodev-&gt;type = of_node-&gt;type;</div><div class='del'>-	viodev-&gt;unit_address = *unit_address;</div><div class='del'>-	viodev-&gt;iommu_table = vio_build_iommu_table(viodev);</div><div class='del'>-</div><div class='del'>-	/* register with generic device framework */</div><div class='del'>-	if (vio_register_device(viodev) == NULL) {</div><div class='del'>-		/* XXX free TCE table */</div><div class='del'>-		kfree(viodev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	device_create_file(&amp;viodev-&gt;dev, &amp;dev_attr_devspec);</div><div class='del'>-</div><div class='del'>-	return viodev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vio_register_device_node);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_get_attribute: - get attribute for virtual device</div><div class='del'>- * @vdev:	The vio device to get property.</div><div class='del'>- * @which:	The property/attribute to be extracted.</div><div class='del'>- * @length:	Pointer to length of returned data size (unused if NULL).</div><div class='del'>- *</div><div class='del'>- * Calls prom.c's get_property() to return the value of the</div><div class='del'>- * attribute specified by the preprocessor constant @which</div><div class='del'>-*/</div><div class='del'>-const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length)</div><div class='del'>-{</div><div class='del'>-	return get_property(vdev-&gt;dev.platform_data, (char*)which, length);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vio_get_attribute);</div><div class='del'>-</div><div class='del'>-/* vio_find_name() - internal because only vio.c knows how we formatted the</div><div class='del'>- * kobject name</div><div class='del'>- * XXX once vio_bus_type.devices is actually used as a kset in</div><div class='del'>- * drivers/base/bus.c, this function should be removed in favor of</div><div class='del'>- * "device_find(kobj_name, &amp;vio_bus_type)"</div><div class='del'>- */</div><div class='del'>-static struct vio_dev *vio_find_name(const char *kobj_name)</div><div class='del'>-{</div><div class='del'>-	struct kobject *found;</div><div class='del'>-</div><div class='del'>-	found = kset_find_obj(&amp;devices_subsys.kset, kobj_name);</div><div class='del'>-	if (!found)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return to_vio_dev(container_of(found, struct device, kobj));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vio_find_node - find an already-registered vio_dev</div><div class='del'>- * @vnode: device_node of the virtual device we're looking for</div><div class='del'>- */</div><div class='del'>-struct vio_dev *vio_find_node(struct device_node *vnode)</div><div class='del'>-{</div><div class='del'>-	uint32_t *unit_address;</div><div class='del'>-	char kobj_name[BUS_ID_SIZE];</div><div class='del'>-</div><div class='del'>-	/* construct the kobject name from the device node */</div><div class='del'>-	unit_address = (uint32_t *)get_property(vnode, "reg", NULL);</div><div class='del'>-	if (!unit_address)</div><div class='del'>-		return NULL;</div><div class='del'>-	snprintf(kobj_name, BUS_ID_SIZE, "%x", *unit_address);</div><div class='del'>-</div><div class='del'>-	return vio_find_name(kobj_name);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vio_find_node);</div><div class='del'>-</div><div class='del'>-int vio_enable_interrupts(struct vio_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = h_vio_signal(dev-&gt;unit_address, VIO_IRQ_ENABLE);</div><div class='del'>-	if (rc != H_SUCCESS)</div><div class='del'>-		printk(KERN_ERR "vio: Error 0x%x enabling interrupts\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vio_enable_interrupts);</div><div class='del'>-</div><div class='del'>-int vio_disable_interrupts(struct vio_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int rc = h_vio_signal(dev-&gt;unit_address, VIO_IRQ_DISABLE);</div><div class='del'>-	if (rc != H_SUCCESS)</div><div class='del'>-		printk(KERN_ERR "vio: Error 0x%x disabling interrupts\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(vio_disable_interrupts);</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c<br/>index 2d60ea30fed6..2d0da6f9e244 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/xics.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/xics.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/xics.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/xics.c</a></div><div class='hunk'>@@ -8,7 +8,9 @@</div><div class='ctx'>  *  as published by the Free Software Foundation; either version</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -20,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/radix-tree.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/firmware.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -32,26 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "xics.h"</div><div class='ctx'> </div><div class='del'>-static unsigned int xics_startup(unsigned int irq);</div><div class='del'>-static void xics_enable_irq(unsigned int irq);</div><div class='del'>-static void xics_disable_irq(unsigned int irq);</div><div class='del'>-static void xics_mask_and_ack_irq(unsigned int irq);</div><div class='del'>-static void xics_end_irq(unsigned int irq);</div><div class='del'>-static void xics_set_affinity(unsigned int irq_nr, cpumask_t cpumask);</div><div class='del'>-</div><div class='del'>-static struct hw_interrupt_type xics_pic = {</div><div class='del'>-	.typename = " XICS     ",</div><div class='del'>-	.startup = xics_startup,</div><div class='del'>-	.enable = xics_enable_irq,</div><div class='del'>-	.disable = xics_disable_irq,</div><div class='del'>-	.ack = xics_mask_and_ack_irq,</div><div class='del'>-	.end = xics_end_irq,</div><div class='del'>-	.set_affinity = xics_set_affinity</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is used to map real irq numbers to virtual */</div><div class='del'>-static struct radix_tree_root irq_map = RADIX_TREE_INIT(GFP_ATOMIC);</div><div class='del'>-</div><div class='ctx'> #define XICS_IPI		2</div><div class='ctx'> #define XICS_IRQ_SPURIOUS	0</div><div class='ctx'> </div><div class='hunk'>@@ -60,7 +43,7 @@ static struct radix_tree_root irq_map = RADIX_TREE_INIT(GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Mark IPIs as higher priority so we can take them inside interrupts that</div><div class='del'>- * arent marked SA_INTERRUPT</div><div class='add'>+ * arent marked IRQF_DISABLED</div><div class='ctx'>  */</div><div class='ctx'> #define IPI_PRIORITY		4</div><div class='ctx'> </div><div class='hunk'>@@ -82,12 +65,12 @@ struct xics_ipl {</div><div class='ctx'> </div><div class='ctx'> static struct xics_ipl __iomem *xics_per_cpu[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-static int xics_irq_8259_cascade = 0;</div><div class='del'>-static int xics_irq_8259_cascade_real = 0;</div><div class='ctx'> static unsigned int default_server = 0xFF;</div><div class='ctx'> static unsigned int default_distrib_server = 0;</div><div class='ctx'> static unsigned int interrupt_server_size = 8;</div><div class='ctx'> </div><div class='add'>+static struct irq_host *xics_host;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * XICS only has a single IPI, so encode the messages per CPU</div><div class='ctx'>  */</div><div class='hunk'>@@ -99,48 +82,34 @@ static int ibm_set_xive;</div><div class='ctx'> static int ibm_int_on;</div><div class='ctx'> static int ibm_int_off;</div><div class='ctx'> </div><div class='del'>-typedef struct {</div><div class='del'>-	int (*xirr_info_get)(int cpu);</div><div class='del'>-	void (*xirr_info_set)(int cpu, int val);</div><div class='del'>-	void (*cppr_info)(int cpu, u8 val);</div><div class='del'>-	void (*qirr_info)(int cpu, u8 val);</div><div class='del'>-} xics_ops;</div><div class='ctx'> </div><div class='add'>+/* Direct HW low level accessors */</div><div class='ctx'> </div><div class='del'>-/* SMP */</div><div class='ctx'> </div><div class='del'>-static int pSeries_xirr_info_get(int n_cpu)</div><div class='add'>+static inline unsigned int direct_xirr_info_get(int n_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	return in_be32(&amp;xics_per_cpu[n_cpu]-&gt;xirr.word);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pSeries_xirr_info_set(int n_cpu, int value)</div><div class='add'>+static inline void direct_xirr_info_set(int n_cpu, int value)</div><div class='ctx'> {</div><div class='ctx'> 	out_be32(&amp;xics_per_cpu[n_cpu]-&gt;xirr.word, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pSeries_cppr_info(int n_cpu, u8 value)</div><div class='add'>+static inline void direct_cppr_info(int n_cpu, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	out_8(&amp;xics_per_cpu[n_cpu]-&gt;xirr.bytes[0], value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pSeries_qirr_info(int n_cpu, u8 value)</div><div class='add'>+static inline void direct_qirr_info(int n_cpu, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	out_8(&amp;xics_per_cpu[n_cpu]-&gt;qirr.bytes[0], value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static xics_ops pSeries_ops = {</div><div class='del'>-	pSeries_xirr_info_get,</div><div class='del'>-	pSeries_xirr_info_set,</div><div class='del'>-	pSeries_cppr_info,</div><div class='del'>-	pSeries_qirr_info</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static xics_ops *ops = &amp;pSeries_ops;</div><div class='add'>+/* LPAR low level accessors */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* LPAR */</div><div class='del'>-</div><div class='ctx'> static inline long plpar_eoi(unsigned long xirr)</div><div class='ctx'> {</div><div class='ctx'> 	return plpar_hcall_norets(H_EOI, xirr);</div><div class='hunk'>@@ -162,7 +131,7 @@ static inline long plpar_xirr(unsigned long *xirr_ret)</div><div class='ctx'> 	return plpar_hcall(H_XIRR, 0, 0, 0, 0, xirr_ret, &amp;dummy, &amp;dummy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pSeriesLP_xirr_info_get(int n_cpu)</div><div class='add'>+static inline unsigned int lpar_xirr_info_get(int n_cpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='ctx'> 	unsigned long return_value;</div><div class='hunk'>@@ -170,10 +139,10 @@ static int pSeriesLP_xirr_info_get(int n_cpu)</div><div class='ctx'> 	lpar_rc = plpar_xirr(&amp;return_value);</div><div class='ctx'> 	if (lpar_rc != H_SUCCESS)</div><div class='ctx'> 		panic(" bad return code xirr - rc = %lx \n", lpar_rc);</div><div class='del'>-	return (int)return_value;</div><div class='add'>+	return (unsigned int)return_value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pSeriesLP_xirr_info_set(int n_cpu, int value)</div><div class='add'>+static inline void lpar_xirr_info_set(int n_cpu, int value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='ctx'> 	unsigned long val64 = value &amp; 0xffffffff;</div><div class='hunk'>@@ -184,7 +153,7 @@ static void pSeriesLP_xirr_info_set(int n_cpu, int value)</div><div class='ctx'> 		      val64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void pSeriesLP_cppr_info(int n_cpu, u8 value)</div><div class='add'>+static inline void lpar_cppr_info(int n_cpu, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='ctx'> </div><div class='hunk'>@@ -193,7 +162,7 @@ void pSeriesLP_cppr_info(int n_cpu, u8 value)</div><div class='ctx'> 		panic("bad return code cppr - rc = %lx\n", lpar_rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pSeriesLP_qirr_info(int n_cpu , u8 value)</div><div class='add'>+static inline void lpar_qirr_info(int n_cpu , u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='ctx'> </div><div class='hunk'>@@ -202,43 +171,16 @@ static void pSeriesLP_qirr_info(int n_cpu , u8 value)</div><div class='ctx'> 		panic("bad return code qirr - rc = %lx\n", lpar_rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-xics_ops pSeriesLP_ops = {</div><div class='del'>-	pSeriesLP_xirr_info_get,</div><div class='del'>-	pSeriesLP_xirr_info_set,</div><div class='del'>-	pSeriesLP_cppr_info,</div><div class='del'>-	pSeriesLP_qirr_info</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int xics_startup(unsigned int virq)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-	irq = irq_offset_down(virq);</div><div class='del'>-	if (radix_tree_insert(&amp;irq_map, virt_irq_to_real(irq),</div><div class='del'>-			      &amp;virt_irq_to_real_map[irq]) == -ENOMEM)</div><div class='del'>-		printk(KERN_CRIT "Out of memory creating real -&gt; virtual"</div><div class='del'>-		       " IRQ mapping for irq %u (real 0x%x)\n",</div><div class='del'>-		       virq, virt_irq_to_real(irq));</div><div class='del'>-	xics_enable_irq(virq);</div><div class='del'>-	return 0;	/* return value is ignored */</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static unsigned int real_irq_to_virt(unsigned int real_irq)</div><div class='del'>-{</div><div class='del'>-	unsigned int *ptr;</div><div class='add'>+/* High level handlers and init code */</div><div class='ctx'> </div><div class='del'>-	ptr = radix_tree_lookup(&amp;irq_map, real_irq);</div><div class='del'>-	if (ptr == NULL)</div><div class='del'>-		return NO_IRQ;</div><div class='del'>-	return ptr - virt_irq_to_real_map;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-static int get_irq_server(unsigned int irq)</div><div class='add'>+static int get_irq_server(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int server;</div><div class='ctx'> 	/* For the moment only implement delivery to all cpus or one cpu */</div><div class='del'>-	cpumask_t cpumask = irq_affinity[irq];</div><div class='add'>+	cpumask_t cpumask = irq_desc[virq].affinity;</div><div class='ctx'> 	cpumask_t tmp = CPU_MASK_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (!distribute_irqs)</div><div class='hunk'>@@ -259,23 +201,28 @@ static int get_irq_server(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static int get_irq_server(unsigned int irq)</div><div class='add'>+static int get_irq_server(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	return default_server;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void xics_enable_irq(unsigned int virq)</div><div class='add'>+</div><div class='add'>+static void xics_unmask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> 	int call_status;</div><div class='ctx'> 	unsigned int server;</div><div class='ctx'> </div><div class='del'>-	irq = virt_irq_to_real(irq_offset_down(virq));</div><div class='del'>-	if (irq == XICS_IPI)</div><div class='add'>+	pr_debug("xics: unmask virq %d\n", virq);</div><div class='add'>+</div><div class='add'>+	irq = (unsigned int)irq_map[virq].hwirq;</div><div class='add'>+	pr_debug(" -&gt; map to hwirq 0x%x\n", irq);</div><div class='add'>+	if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	server = get_irq_server(virq);</div><div class='add'>+</div><div class='ctx'> 	call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,</div><div class='ctx'> 				DEFAULT_PRIORITY);</div><div class='ctx'> 	if (call_status != 0) {</div><div class='hunk'>@@ -294,7 +241,7 @@ static void xics_enable_irq(unsigned int virq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xics_disable_real_irq(unsigned int irq)</div><div class='add'>+static void xics_mask_real_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	int call_status;</div><div class='ctx'> 	unsigned int server;</div><div class='hunk'>@@ -319,75 +266,86 @@ static void xics_disable_real_irq(unsigned int irq)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xics_disable_irq(unsigned int virq)</div><div class='add'>+static void xics_mask_irq(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> </div><div class='del'>-	irq = virt_irq_to_real(irq_offset_down(virq));</div><div class='del'>-	xics_disable_real_irq(irq);</div><div class='add'>+	pr_debug("xics: mask virq %d\n", virq);</div><div class='add'>+</div><div class='add'>+	irq = (unsigned int)irq_map[virq].hwirq;</div><div class='add'>+	if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)</div><div class='add'>+		return;</div><div class='add'>+	xics_mask_real_irq(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int xics_startup(unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='add'>+	/* force a reverse mapping of the interrupt so it gets in the cache */</div><div class='add'>+	irq = (unsigned int)irq_map[virq].hwirq;</div><div class='add'>+	irq_radix_revmap(xics_host, irq);</div><div class='add'>+</div><div class='add'>+	/* unmask it */</div><div class='add'>+	xics_unmask_irq(virq);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xics_end_irq(unsigned int irq)</div><div class='add'>+static void xics_eoi_direct(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='add'>+	unsigned int irq = (unsigned int)irq_map[virq].hwirq;</div><div class='ctx'> </div><div class='ctx'> 	iosync();</div><div class='del'>-	ops-&gt;xirr_info_set(cpu, ((0xff &lt;&lt; 24) |</div><div class='del'>-				 (virt_irq_to_real(irq_offset_down(irq)))));</div><div class='del'>-</div><div class='add'>+	direct_xirr_info_set(cpu, (0xff &lt;&lt; 24) | irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xics_mask_and_ack_irq(unsigned int irq)</div><div class='add'>+</div><div class='add'>+static void xics_eoi_lpar(unsigned int virq)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='add'>+	unsigned int irq = (unsigned int)irq_map[virq].hwirq;</div><div class='ctx'> </div><div class='del'>-	if (irq &lt; irq_offset_value()) {</div><div class='del'>-		i8259_pic.ack(irq);</div><div class='del'>-		iosync();</div><div class='del'>-		ops-&gt;xirr_info_set(cpu, ((0xff&lt;&lt;24) |</div><div class='del'>-					 xics_irq_8259_cascade_real));</div><div class='del'>-		iosync();</div><div class='del'>-	}</div><div class='add'>+	iosync();</div><div class='add'>+	lpar_xirr_info_set(cpu, (0xff &lt;&lt; 24) | irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int xics_get_irq(struct pt_regs *regs)</div><div class='add'>+static inline unsigned int xics_remap_irq(unsigned int vec)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cpu = smp_processor_id();</div><div class='del'>-	unsigned int vec;</div><div class='del'>-	int irq;</div><div class='add'>+	unsigned int irq;</div><div class='ctx'> </div><div class='del'>-	vec = ops-&gt;xirr_info_get(cpu);</div><div class='del'>-	/*  (vec &gt;&gt; 24) == old priority */</div><div class='ctx'> 	vec &amp;= 0x00ffffff;</div><div class='ctx'> </div><div class='del'>-	/* for sanity, this had better be &lt; NR_IRQS - 16 */</div><div class='del'>-	if (vec == xics_irq_8259_cascade_real) {</div><div class='del'>-		irq = i8259_irq(regs);</div><div class='del'>-		xics_end_irq(irq_offset_up(xics_irq_8259_cascade));</div><div class='del'>-	} else if (vec == XICS_IRQ_SPURIOUS) {</div><div class='del'>-		irq = -1;</div><div class='del'>-	} else {</div><div class='del'>-		irq = real_irq_to_virt(vec);</div><div class='del'>-		if (irq == NO_IRQ)</div><div class='del'>-			irq = real_irq_to_virt_slowpath(vec);</div><div class='del'>-		if (irq == NO_IRQ) {</div><div class='del'>-			printk(KERN_ERR "Interrupt %u (real) is invalid,"</div><div class='del'>-			       " disabling it.\n", vec);</div><div class='del'>-			xics_disable_real_irq(vec);</div><div class='del'>-		} else</div><div class='del'>-			irq = irq_offset_up(irq);</div><div class='del'>-	}</div><div class='del'>-	return irq;</div><div class='add'>+	if (vec == XICS_IRQ_SPURIOUS)</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	irq = irq_radix_revmap(xics_host, vec);</div><div class='add'>+	if (likely(irq != NO_IRQ))</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "Interrupt %u (real) is invalid,"</div><div class='add'>+	       " disabling it.\n", vec);</div><div class='add'>+	xics_mask_real_irq(vec);</div><div class='add'>+	return NO_IRQ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='add'>+static unsigned int xics_get_irq_direct(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-static irqreturn_t xics_ipi_action(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+	return xics_remap_irq(direct_xirr_info_get(cpu));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int xics_get_irq_lpar(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	return xics_remap_irq(lpar_xirr_info_get(cpu));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ops-&gt;qirr_info(cpu, 0xff);</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='add'>+static irqreturn_t xics_ipi_dispatch(int cpu, struct pt_regs *regs)</div><div class='add'>+{</div><div class='ctx'> 	WARN_ON(cpu_is_offline(cpu));</div><div class='ctx'> </div><div class='ctx'> 	while (xics_ipi_message[cpu].value) {</div><div class='hunk'>@@ -419,18 +377,88 @@ static irqreturn_t xics_ipi_action(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	direct_qirr_info(cpu, 0xff);</div><div class='add'>+</div><div class='add'>+	return xics_ipi_dispatch(cpu, regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+</div><div class='add'>+	lpar_qirr_info(cpu, 0xff);</div><div class='add'>+</div><div class='add'>+	return xics_ipi_dispatch(cpu, regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void xics_cause_IPI(int cpu)</div><div class='ctx'> {</div><div class='del'>-	ops-&gt;qirr_info(cpu, IPI_PRIORITY);</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		lpar_qirr_info(cpu, IPI_PRIORITY);</div><div class='add'>+	else</div><div class='add'>+		direct_qirr_info(cpu, IPI_PRIORITY);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='add'>+static void xics_set_cpu_priority(int cpu, unsigned char cppr)</div><div class='add'>+{</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		lpar_cppr_info(cpu, cppr);</div><div class='add'>+	else</div><div class='add'>+		direct_cppr_info(cpu, cppr);</div><div class='add'>+	iosync();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	int status;</div><div class='add'>+	int xics_status[2];</div><div class='add'>+	unsigned long newmask;</div><div class='add'>+	cpumask_t tmp = CPU_MASK_NONE;</div><div class='add'>+</div><div class='add'>+	irq = (unsigned int)irq_map[virq].hwirq;</div><div class='add'>+	if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		printk(KERN_ERR "xics_set_affinity: irq=%u ibm,get-xive "</div><div class='add'>+		       "returns %d\n", irq, status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For the moment only implement delivery to all cpus or one cpu */</div><div class='add'>+	if (cpus_equal(cpumask, CPU_MASK_ALL)) {</div><div class='add'>+		newmask = default_distrib_server;</div><div class='add'>+	} else {</div><div class='add'>+		cpus_and(tmp, cpu_online_map, cpumask);</div><div class='add'>+		if (cpus_empty(tmp))</div><div class='add'>+			return;</div><div class='add'>+		newmask = get_hard_smp_processor_id(first_cpu(tmp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = rtas_call(ibm_set_xive, 3, 1, NULL,</div><div class='add'>+				irq, newmask, xics_status[1]);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "</div><div class='add'>+		       "returns %d\n", irq, status);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void xics_setup_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	ops-&gt;cppr_info(cpu, 0xff);</div><div class='del'>-	iosync();</div><div class='add'>+	xics_set_cpu_priority(cpu, 0xff);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Put the calling processor into the GIQ.  This is really only</div><div class='hunk'>@@ -443,72 +471,252 @@ void xics_setup_cpu(void)</div><div class='ctx'> 		(1UL &lt;&lt; interrupt_server_size) - 1 - default_distrib_server, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void xics_init_IRQ(void)</div><div class='add'>+</div><div class='add'>+static struct irq_chip xics_pic_direct = {</div><div class='add'>+	.typename = " XICS     ",</div><div class='add'>+	.startup = xics_startup,</div><div class='add'>+	.mask = xics_mask_irq,</div><div class='add'>+	.unmask = xics_unmask_irq,</div><div class='add'>+	.eoi = xics_eoi_direct,</div><div class='add'>+	.set_affinity = xics_set_affinity</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct irq_chip xics_pic_lpar = {</div><div class='add'>+	.typename = " XICS     ",</div><div class='add'>+	.startup = xics_startup,</div><div class='add'>+	.mask = xics_mask_irq,</div><div class='add'>+	.unmask = xics_unmask_irq,</div><div class='add'>+	.eoi = xics_eoi_lpar,</div><div class='add'>+	.set_affinity = xics_set_affinity</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int xics_host_match(struct irq_host *h, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	/* IBM machines have interrupt parents of various funky types for things</div><div class='add'>+	 * like vdevices, events, etc... The trick we use here is to match</div><div class='add'>+	 * everything here except the legacy 8259 which is compatible "chrp,iic"</div><div class='add'>+	 */</div><div class='add'>+	return !device_is_compatible(node, "chrp,iic");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xics_host_map_direct(struct irq_host *h, unsigned int virq,</div><div class='add'>+				irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);</div><div class='add'>+</div><div class='add'>+	get_irq_desc(virq)-&gt;status |= IRQ_LEVEL;</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;xics_pic_direct, handle_fasteoi_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xics_host_map_lpar(struct irq_host *h, unsigned int virq,</div><div class='add'>+			      irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	pr_debug("xics: map_direct virq %d, hwirq 0x%lx\n", virq, hw);</div><div class='add'>+</div><div class='add'>+	get_irq_desc(virq)-&gt;status |= IRQ_LEVEL;</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;xics_pic_lpar, handle_fasteoi_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xics_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			   u32 *intspec, unsigned int intsize,</div><div class='add'>+			   irq_hw_number_t *out_hwirq, unsigned int *out_flags)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	/* Current xics implementation translates everything</div><div class='add'>+	 * to level. It is not technically right for MSIs but this</div><div class='add'>+	 * is irrelevant at this point. We might get smarter in the future</div><div class='add'>+	 */</div><div class='add'>+	*out_hwirq = intspec[0];</div><div class='add'>+	*out_flags = IRQ_TYPE_LEVEL_LOW;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops xics_host_direct_ops = {</div><div class='add'>+	.match = xics_host_match,</div><div class='add'>+	.map = xics_host_map_direct,</div><div class='add'>+	.xlate = xics_host_xlate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops xics_host_lpar_ops = {</div><div class='add'>+	.match = xics_host_match,</div><div class='add'>+	.map = xics_host_map_lpar,</div><div class='add'>+	.xlate = xics_host_xlate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init xics_init_host(void)</div><div class='add'>+{</div><div class='add'>+	struct irq_host_ops *ops;</div><div class='add'>+</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		ops = &amp;xics_host_lpar_ops;</div><div class='add'>+	else</div><div class='add'>+		ops = &amp;xics_host_direct_ops;</div><div class='add'>+	xics_host = irq_alloc_host(IRQ_HOST_MAP_TREE, 0, ops,</div><div class='add'>+				   XICS_IRQ_SPURIOUS);</div><div class='add'>+	BUG_ON(xics_host == NULL);</div><div class='add'>+	irq_set_default_host(xics_host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init xics_map_one_cpu(int hw_id, unsigned long addr,</div><div class='add'>+				     unsigned long size)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long intr_size = 0;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	uint *ireg, ilen, indx = 0;</div><div class='del'>-	unsigned long intr_base = 0;</div><div class='del'>-	struct xics_interrupt_node {</div><div class='del'>-		unsigned long addr;</div><div class='del'>-		unsigned long size;</div><div class='del'>-	} intnodes[NR_CPUS];</div><div class='ctx'> </div><div class='del'>-	ppc64_boot_msg(0x20, "XICS Init");</div><div class='add'>+	/* This may look gross but it's good enough for now, we don't quite</div><div class='add'>+	 * have a hard -&gt; linux processor id matching.</div><div class='add'>+	 */</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		if (!cpu_present(i))</div><div class='add'>+			continue;</div><div class='add'>+		if (hw_id == get_hard_smp_processor_id(i)) {</div><div class='add'>+			xics_per_cpu[i] = ioremap(addr, size);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (hw_id != 0)</div><div class='add'>+		return;</div><div class='add'>+	xics_per_cpu[0] = ioremap(addr, size);</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ibm_get_xive = rtas_token("ibm,get-xive");</div><div class='del'>-	ibm_set_xive = rtas_token("ibm,set-xive");</div><div class='del'>-	ibm_int_on  = rtas_token("ibm,int-on");</div><div class='del'>-	ibm_int_off = rtas_token("ibm,int-off");</div><div class='add'>+static void __init xics_init_one_node(struct device_node *np,</div><div class='add'>+				      unsigned int *indx)</div><div class='add'>+{</div><div class='add'>+	unsigned int ilen;</div><div class='add'>+	u32 *ireg;</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_type(NULL, "PowerPC-External-Interrupt-Presentation");</div><div class='del'>-	if (!np)</div><div class='del'>-		panic("xics_init_IRQ: can't find interrupt presentation");</div><div class='add'>+	/* This code does the theorically broken assumption that the interrupt</div><div class='add'>+	 * server numbers are the same as the hard CPU numbers.</div><div class='add'>+	 * This happens to be the case so far but we are playing with fire...</div><div class='add'>+	 * should be fixed one of these days. -BenH.</div><div class='add'>+	 */</div><div class='add'>+	ireg = (u32 *)get_property(np, "ibm,interrupt-server-ranges", NULL);</div><div class='ctx'> </div><div class='del'>-nextnode:</div><div class='del'>-	ireg = (uint *)get_property(np, "ibm,interrupt-server-ranges", NULL);</div><div class='add'>+	/* Do that ever happen ? we'll know soon enough... but even good'old</div><div class='add'>+	 * f80 does have that property ..</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(ireg == NULL);</div><div class='ctx'> 	if (ireg) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * set node starting index for this node</div><div class='ctx'> 		 */</div><div class='del'>-		indx = *ireg;</div><div class='add'>+		*indx = *ireg;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ireg = (uint *)get_property(np, "reg", &amp;ilen);</div><div class='add'>+	ireg = (u32 *)get_property(np, "reg", &amp;ilen);</div><div class='ctx'> 	if (!ireg)</div><div class='ctx'> 		panic("xics_init_IRQ: can't find interrupt reg property");</div><div class='ctx'> </div><div class='del'>-	while (ilen) {</div><div class='del'>-		intnodes[indx].addr = (unsigned long)*ireg++ &lt;&lt; 32;</div><div class='del'>-		ilen -= sizeof(uint);</div><div class='del'>-		intnodes[indx].addr |= *ireg++;</div><div class='del'>-		ilen -= sizeof(uint);</div><div class='del'>-		intnodes[indx].size = (unsigned long)*ireg++ &lt;&lt; 32;</div><div class='del'>-		ilen -= sizeof(uint);</div><div class='del'>-		intnodes[indx].size |= *ireg++;</div><div class='del'>-		ilen -= sizeof(uint);</div><div class='del'>-		indx++;</div><div class='del'>-		if (indx &gt;= NR_CPUS) break;</div><div class='add'>+	while (ilen &gt;= (4 * sizeof(u32))) {</div><div class='add'>+		unsigned long addr, size;</div><div class='add'>+</div><div class='add'>+		/* XXX Use proper OF parsing code here !!! */</div><div class='add'>+		addr = (unsigned long)*ireg++ &lt;&lt; 32;</div><div class='add'>+		ilen -= sizeof(u32);</div><div class='add'>+		addr |= *ireg++;</div><div class='add'>+		ilen -= sizeof(u32);</div><div class='add'>+		size = (unsigned long)*ireg++ &lt;&lt; 32;</div><div class='add'>+		ilen -= sizeof(u32);</div><div class='add'>+		size |= *ireg++;</div><div class='add'>+		ilen -= sizeof(u32);</div><div class='add'>+		xics_map_one_cpu(*indx, addr, size);</div><div class='add'>+		(*indx)++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init xics_setup_8259_cascade(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np, *old, *found = NULL;</div><div class='add'>+	int cascade, naddr;</div><div class='add'>+	u32 *addrp;</div><div class='add'>+	unsigned long intack = 0;</div><div class='add'>+</div><div class='add'>+	for_each_node_by_type(np, "interrupt-controller")</div><div class='add'>+		if (device_is_compatible(np, "chrp,iic")) {</div><div class='add'>+			found = np;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	if (found == NULL) {</div><div class='add'>+		printk(KERN_DEBUG "xics: no ISA interrupt controller\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	cascade = irq_of_parse_and_map(found, 0);</div><div class='add'>+	if (cascade == NO_IRQ) {</div><div class='add'>+		printk(KERN_ERR "xics: failed to map cascade interrupt");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	pr_debug("xics: cascade mapped to irq %d\n", cascade);</div><div class='add'>+</div><div class='add'>+	for (old = of_node_get(found); old != NULL ; old = np) {</div><div class='add'>+		np = of_get_parent(old);</div><div class='add'>+		of_node_put(old);</div><div class='add'>+		if (np == NULL)</div><div class='add'>+			break;</div><div class='add'>+		if (strcmp(np-&gt;name, "pci") != 0)</div><div class='add'>+			continue;</div><div class='add'>+		addrp = (u32 *)get_property(np, "8259-interrupt-acknowledge", NULL);</div><div class='add'>+		if (addrp == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		naddr = prom_n_addr_cells(np);</div><div class='add'>+		intack = addrp[naddr-1];</div><div class='add'>+		if (naddr &gt; 1)</div><div class='add'>+			intack |= ((unsigned long)addrp[naddr-2]) &lt;&lt; 32;</div><div class='add'>+	}</div><div class='add'>+	if (intack)</div><div class='add'>+		printk(KERN_DEBUG "xics: PCI 8259 intack at 0x%016lx\n", intack);</div><div class='add'>+	i8259_init(found, intack);</div><div class='add'>+	of_node_put(found);</div><div class='add'>+	set_irq_chained_handler(cascade, pseries_8259_cascade);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init xics_init_IRQ(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	u32 *ireg, ilen, indx = 0;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	ppc64_boot_msg(0x20, "XICS Init");</div><div class='add'>+</div><div class='add'>+	ibm_get_xive = rtas_token("ibm,get-xive");</div><div class='add'>+	ibm_set_xive = rtas_token("ibm,set-xive");</div><div class='add'>+	ibm_int_on  = rtas_token("ibm,int-on");</div><div class='add'>+	ibm_int_off = rtas_token("ibm,int-off");</div><div class='add'>+</div><div class='add'>+	for_each_node_by_type(np, "PowerPC-External-Interrupt-Presentation") {</div><div class='add'>+		found = 1;</div><div class='add'>+		if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+			break;</div><div class='add'>+		xics_init_one_node(np, &amp;indx);</div><div class='ctx'> 	}</div><div class='add'>+	if (found == 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_type(np, "PowerPC-External-Interrupt-Presentation");</div><div class='del'>-	if ((indx &lt; NR_CPUS) &amp;&amp; np) goto nextnode;</div><div class='add'>+	xics_init_host();</div><div class='ctx'> </div><div class='ctx'> 	/* Find the server numbers for the boot cpu. */</div><div class='ctx'> 	for (np = of_find_node_by_type(NULL, "cpu");</div><div class='ctx'> 	     np;</div><div class='ctx'> 	     np = of_find_node_by_type(np, "cpu")) {</div><div class='del'>-		ireg = (uint *)get_property(np, "reg", &amp;ilen);</div><div class='add'>+		ireg = (u32 *)get_property(np, "reg", &amp;ilen);</div><div class='ctx'> 		if (ireg &amp;&amp; ireg[0] == get_hard_smp_processor_id(boot_cpuid)) {</div><div class='del'>-			ireg = (uint *)get_property(np, "ibm,ppc-interrupt-gserver#s",</div><div class='del'>-						    &amp;ilen);</div><div class='add'>+			ireg = (u32 *)get_property(np,</div><div class='add'>+						  "ibm,ppc-interrupt-gserver#s",</div><div class='add'>+						   &amp;ilen);</div><div class='ctx'> 			i = ilen / sizeof(int);</div><div class='ctx'> 			if (ireg &amp;&amp; i &gt; 0) {</div><div class='ctx'> 				default_server = ireg[0];</div><div class='del'>-				default_distrib_server = ireg[i-1]; /* take last element */</div><div class='add'>+				/* take last element */</div><div class='add'>+				default_distrib_server = ireg[i-1];</div><div class='ctx'> 			}</div><div class='del'>-			ireg = (uint *)get_property(np,</div><div class='add'>+			ireg = (u32 *)get_property(np,</div><div class='ctx'> 					"ibm,interrupt-server#-size", NULL);</div><div class='ctx'> 			if (ireg)</div><div class='ctx'> 				interrupt_server_size = *ireg;</div><div class='hunk'>@@ -517,147 +725,80 @@ nextnode:</div><div class='ctx'> 	}</div><div class='ctx'> 	of_node_put(np);</div><div class='ctx'> </div><div class='del'>-	intr_base = intnodes[0].addr;</div><div class='del'>-	intr_size = intnodes[0].size;</div><div class='del'>-</div><div class='del'>-	np = of_find_node_by_type(NULL, "interrupt-controller");</div><div class='del'>-	if (!np) {</div><div class='del'>-		printk(KERN_WARNING "xics: no ISA interrupt controller\n");</div><div class='del'>-		xics_irq_8259_cascade_real = -1;</div><div class='del'>-		xics_irq_8259_cascade = -1;</div><div class='del'>-	} else {</div><div class='del'>-		ireg = (uint *) get_property(np, "interrupts", NULL);</div><div class='del'>-		if (!ireg)</div><div class='del'>-			panic("xics_init_IRQ: can't find ISA interrupts property");</div><div class='del'>-</div><div class='del'>-		xics_irq_8259_cascade_real = *ireg;</div><div class='del'>-		xics_irq_8259_cascade</div><div class='del'>-			= virt_irq_create_mapping(xics_irq_8259_cascade_real);</div><div class='del'>-		i8259_init(0, 0);</div><div class='del'>-		of_node_put(np);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='del'>-		ops = &amp;pSeriesLP_ops;</div><div class='del'>-	else {</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-		for_each_possible_cpu(i) {</div><div class='del'>-			int hard_id;</div><div class='del'>-</div><div class='del'>-			/* FIXME: Do this dynamically! --RR */</div><div class='del'>-			if (!cpu_present(i))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			hard_id = get_hard_smp_processor_id(i);</div><div class='del'>-			xics_per_cpu[i] = ioremap(intnodes[hard_id].addr,</div><div class='del'>-						  intnodes[hard_id].size);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		xics_per_cpu[0] = ioremap(intr_base, intr_size);</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = irq_offset_value(); i &lt; NR_IRQS; ++i)</div><div class='del'>-		get_irq_desc(i)-&gt;handler = &amp;xics_pic;</div><div class='add'>+		ppc_md.get_irq = xics_get_irq_lpar;</div><div class='add'>+	else</div><div class='add'>+		ppc_md.get_irq = xics_get_irq_direct;</div><div class='ctx'> </div><div class='ctx'> 	xics_setup_cpu();</div><div class='ctx'> </div><div class='add'>+	xics_setup_8259_cascade();</div><div class='add'>+</div><div class='ctx'> 	ppc64_boot_msg(0x21, "XICS Done");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We cant do this in init_IRQ because we need the memory subsystem up for</div><div class='del'>- * request_irq()</div><div class='del'>- */</div><div class='del'>-static int __init xics_setup_i8259(void)</div><div class='del'>-{</div><div class='del'>-	if (ppc64_interrupt_controller == IC_PPC_XIC &amp;&amp;</div><div class='del'>-	    xics_irq_8259_cascade != -1) {</div><div class='del'>-		if (request_irq(irq_offset_up(xics_irq_8259_cascade),</div><div class='del'>-				no_action, 0, "8259 cascade", NULL))</div><div class='del'>-			printk(KERN_ERR "xics_setup_i8259: couldn't get 8259 "</div><div class='del'>-					"cascade\n");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-arch_initcall(xics_setup_i8259);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> void xics_request_IPIs(void)</div><div class='ctx'> {</div><div class='del'>-	virt_irq_to_real_map[XICS_IPI] = XICS_IPI;</div><div class='add'>+	unsigned int ipi;</div><div class='add'>+</div><div class='add'>+	ipi = irq_create_mapping(xics_host, XICS_IPI);</div><div class='add'>+	BUG_ON(ipi == NO_IRQ);</div><div class='ctx'> </div><div class='del'>-	/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */</div><div class='del'>-	request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, SA_INTERRUPT,</div><div class='del'>-		    "IPI", NULL);</div><div class='del'>-	get_irq_desc(irq_offset_up(XICS_IPI))-&gt;status |= IRQ_PER_CPU;</div><div class='add'>+	/*</div><div class='add'>+	 * IPIs are marked IRQF_DISABLED as they must run with irqs</div><div class='add'>+	 * disabled</div><div class='add'>+	 */</div><div class='add'>+	set_irq_handler(ipi, handle_percpu_irq);</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		request_irq(ipi, xics_ipi_action_lpar, IRQF_DISABLED,</div><div class='add'>+			    "IPI", NULL);</div><div class='add'>+	else</div><div class='add'>+		request_irq(ipi, xics_ipi_action_direct, IRQF_DISABLED,</div><div class='add'>+			    "IPI", NULL);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='del'>-static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)</div><div class='add'>+void xics_teardown_cpu(int secondary)</div><div class='ctx'> {</div><div class='del'>-	unsigned int irq;</div><div class='del'>-	int status;</div><div class='del'>-	int xics_status[2];</div><div class='del'>-	unsigned long newmask;</div><div class='del'>-	cpumask_t tmp = CPU_MASK_NONE;</div><div class='del'>-</div><div class='del'>-	irq = virt_irq_to_real(irq_offset_down(virq));</div><div class='del'>-	if (irq == XICS_IPI || irq == NO_IRQ)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	unsigned int ipi;</div><div class='add'>+	struct irq_desc *desc;</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		printk(KERN_ERR "xics_set_affinity: irq=%u ibm,get-xive "</div><div class='del'>-		       "returns %d\n", irq, status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	xics_set_cpu_priority(cpu, 0);</div><div class='ctx'> </div><div class='del'>-	/* For the moment only implement delivery to all cpus or one cpu */</div><div class='del'>-	if (cpus_equal(cpumask, CPU_MASK_ALL)) {</div><div class='del'>-		newmask = default_distrib_server;</div><div class='del'>-	} else {</div><div class='del'>-		cpus_and(tmp, cpu_online_map, cpumask);</div><div class='del'>-		if (cpus_empty(tmp))</div><div class='del'>-			return;</div><div class='del'>-		newmask = get_hard_smp_processor_id(first_cpu(tmp));</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Clear IPI</div><div class='add'>+	 */</div><div class='add'>+	if (firmware_has_feature(FW_FEATURE_LPAR))</div><div class='add'>+		lpar_qirr_info(cpu, 0xff);</div><div class='add'>+	else</div><div class='add'>+		direct_qirr_info(cpu, 0xff);</div><div class='ctx'> </div><div class='del'>-	status = rtas_call(ibm_set_xive, 3, 1, NULL,</div><div class='del'>-				irq, newmask, xics_status[1]);</div><div class='add'>+	/*</div><div class='add'>+	 * we need to EOI the IPI if we got here from kexec down IPI</div><div class='add'>+	 *</div><div class='add'>+	 * probably need to check all the other interrupts too</div><div class='add'>+	 * should we be flagging idle loop instead?</div><div class='add'>+	 * or creating some task to be scheduled?</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	if (status) {</div><div class='del'>-		printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "</div><div class='del'>-		       "returns %d\n", irq, status);</div><div class='add'>+	ipi = irq_find_mapping(xics_host, XICS_IPI);</div><div class='add'>+	if (ipi == XICS_IRQ_SPURIOUS)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void xics_teardown_cpu(int secondary)</div><div class='del'>-{</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='del'>-</div><div class='del'>-	ops-&gt;cppr_info(cpu, 0x00);</div><div class='del'>-	iosync();</div><div class='add'>+	desc = get_irq_desc(ipi);</div><div class='add'>+	if (desc-&gt;chip &amp;&amp; desc-&gt;chip-&gt;eoi)</div><div class='add'>+		desc-&gt;chip-&gt;eoi(ipi);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some machines need to have at least one cpu in the GIQ,</div><div class='ctx'> 	 * so leave the master cpu in the group.</div><div class='ctx'> 	 */</div><div class='del'>-	if (secondary) {</div><div class='del'>-		/*</div><div class='del'>-		 * we need to EOI the IPI if we got here from kexec down IPI</div><div class='del'>-		 *</div><div class='del'>-		 * probably need to check all the other interrupts too</div><div class='del'>-		 * should we be flagging idle loop instead?</div><div class='del'>-		 * or creating some task to be scheduled?</div><div class='del'>-		 */</div><div class='del'>-		ops-&gt;xirr_info_set(cpu, XICS_IPI);</div><div class='add'>+	if (secondary)</div><div class='ctx'> 		rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,</div><div class='del'>-			(1UL &lt;&lt; interrupt_server_size) - 1 -</div><div class='del'>-			default_distrib_server, 0);</div><div class='del'>-	}</div><div class='add'>+				   (1UL &lt;&lt; interrupt_server_size) - 1 -</div><div class='add'>+				   default_distrib_server, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG_CPU</div><div class='hunk'>@@ -669,8 +810,7 @@ void xics_migrate_irqs_away(void)</div><div class='ctx'> 	unsigned int irq, virq, cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	/* Reject any interrupt that was queued to us... */</div><div class='del'>-	ops-&gt;cppr_info(cpu, 0);</div><div class='del'>-	iosync();</div><div class='add'>+	xics_set_cpu_priority(cpu, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* remove ourselves from the global interrupt queue */</div><div class='ctx'> 	status = rtas_set_indicator(GLOBAL_INTERRUPT_QUEUE,</div><div class='hunk'>@@ -678,29 +818,28 @@ void xics_migrate_irqs_away(void)</div><div class='ctx'> 	WARN_ON(status &lt; 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow IPIs again... */</div><div class='del'>-	ops-&gt;cppr_info(cpu, DEFAULT_PRIORITY);</div><div class='del'>-	iosync();</div><div class='add'>+	xics_set_cpu_priority(cpu, DEFAULT_PRIORITY);</div><div class='ctx'> </div><div class='ctx'> 	for_each_irq(virq) {</div><div class='del'>-		irq_desc_t *desc;</div><div class='add'>+		struct irq_desc *desc;</div><div class='ctx'> 		int xics_status[2];</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		/* We cant set affinity on ISA interrupts */</div><div class='del'>-		if (virq &lt; irq_offset_value())</div><div class='add'>+		if (virq &lt; NUM_ISA_INTERRUPTS)</div><div class='ctx'> 			continue;</div><div class='del'>-</div><div class='del'>-		desc = get_irq_desc(virq);</div><div class='del'>-		irq = virt_irq_to_real(irq_offset_down(virq));</div><div class='del'>-</div><div class='add'>+		if (irq_map[virq].host != xics_host)</div><div class='add'>+			continue;</div><div class='add'>+		irq = (unsigned int)irq_map[virq].hwirq;</div><div class='ctx'> 		/* We need to get IPIs still. */</div><div class='del'>-		if (irq == XICS_IPI || irq == NO_IRQ)</div><div class='add'>+		if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)</div><div class='ctx'> 			continue;</div><div class='add'>+		desc = get_irq_desc(virq);</div><div class='ctx'> </div><div class='ctx'> 		/* We only need to migrate enabled IRQS */</div><div class='del'>-		if (desc == NULL || desc-&gt;handler == NULL</div><div class='add'>+		if (desc == NULL || desc-&gt;chip == NULL</div><div class='ctx'> 		    || desc-&gt;action == NULL</div><div class='del'>-		    || desc-&gt;handler-&gt;set_affinity == NULL)</div><div class='add'>+		    || desc-&gt;chip-&gt;set_affinity == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;desc-&gt;lock, flags);</div><div class='hunk'>@@ -725,8 +864,8 @@ void xics_migrate_irqs_away(void)</div><div class='ctx'> 		       virq, cpu);</div><div class='ctx'> </div><div class='ctx'> 		/* Reset affinity to all cpus */</div><div class='del'>-		desc-&gt;handler-&gt;set_affinity(virq, CPU_MASK_ALL);</div><div class='del'>-		irq_affinity[virq] = CPU_MASK_ALL;</div><div class='add'>+		desc-&gt;chip-&gt;set_affinity(virq, CPU_MASK_ALL);</div><div class='add'>+		irq_desc[irq].affinity = CPU_MASK_ALL;</div><div class='ctx'> unlock:</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;desc-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/powerpc/platforms/pseries/xics.h b/arch/powerpc/platforms/pseries/xics.h<br/>index e14c70868f1d..6ee1055b0ffb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/xics.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/platforms/pseries/xics.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/platforms/pseries/xics.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/platforms/pseries/xics.h</a></div><div class='hunk'>@@ -14,13 +14,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> </div><div class='del'>-void xics_init_IRQ(void);</div><div class='del'>-int xics_get_irq(struct pt_regs *);</div><div class='del'>-void xics_setup_cpu(void);</div><div class='del'>-void xics_teardown_cpu(int secondary);</div><div class='del'>-void xics_cause_IPI(int cpu);</div><div class='del'>-void xics_request_IPIs(void);</div><div class='del'>-void xics_migrate_irqs_away(void);</div><div class='add'>+extern void xics_init_IRQ(void);</div><div class='add'>+extern void xics_setup_cpu(void);</div><div class='add'>+extern void xics_teardown_cpu(int secondary);</div><div class='add'>+extern void xics_cause_IPI(int cpu);</div><div class='add'>+extern  void xics_request_IPIs(void);</div><div class='add'>+extern void xics_migrate_irqs_away(void);</div><div class='ctx'> </div><div class='ctx'> /* first argument is ignored for now*/</div><div class='ctx'> void pSeriesLP_cppr_info(int n_cpu, u8 value);</div><div class='hunk'>@@ -31,4 +30,8 @@ struct xics_ipi_struct {</div><div class='ctx'> </div><div class='ctx'> extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;</div><div class='ctx'> </div><div class='add'>+struct irq_desc;</div><div class='add'>+extern void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc,</div><div class='add'>+				 struct pt_regs *regs);</div><div class='add'>+</div><div class='ctx'> #endif /* _POWERPC_KERNEL_XICS_H */</div><div class='head'>diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile<br/>index 4c2b356774ea..cebfae242602 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/Makefile</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='add'>+ifeq ($(CONFIG_PPC64),y)</div><div class='add'>+EXTRA_CFLAGS			+= -mno-minimal-toc</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_MPIC)		+= mpic.o</div><div class='ctx'> obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indirect_pci.o</div><div class='del'>-obj-$(CONFIG_PPC_I8259)		+= i8259.o</div><div class='ctx'> obj-$(CONFIG_PPC_MPC106)	+= grackle.o</div><div class='ctx'> obj-$(CONFIG_BOOKE)		+= dcr.o</div><div class='ctx'> obj-$(CONFIG_40x)		+= dcr.o</div><div class='hunk'>@@ -8,3 +11,9 @@ obj-$(CONFIG_U3_DART)		+= dart_iommu.o</div><div class='ctx'> obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o</div><div class='ctx'> obj-$(CONFIG_PPC_83xx)		+= ipic.o</div><div class='ctx'> obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o</div><div class='add'>+obj-$(CONFIG_PPC_TODC)		+= todc.o</div><div class='add'>+obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_PPC_MERGE),y)</div><div class='add'>+obj-$(CONFIG_PPC_I8259)		+= i8259.o</div><div class='add'>+ endif</div><div class='head'>diff --git a/arch/powerpc/sysdev/dart.h b/arch/powerpc/sysdev/dart.h<br/>index c2d05763ccbe..1c8817c4835e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/dart.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/dart.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/dart.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/dart.h</a></div><div class='hunk'>@@ -47,8 +47,12 @@</div><div class='ctx'> /* U4 registers */</div><div class='ctx'> #define DART_BASE_U4_BASE_MASK	0xffffff</div><div class='ctx'> #define DART_BASE_U4_BASE_SHIFT	0</div><div class='del'>-#define DART_CNTL_U4_FLUSHTLB	0x20000000</div><div class='ctx'> #define DART_CNTL_U4_ENABLE	0x80000000</div><div class='add'>+#define DART_CNTL_U4_IONE	0x40000000</div><div class='add'>+#define DART_CNTL_U4_FLUSHTLB	0x20000000</div><div class='add'>+#define DART_CNTL_U4_IDLE	0x10000000</div><div class='add'>+#define DART_CNTL_U4_PAR_EN	0x08000000</div><div class='add'>+#define DART_CNTL_U4_IONE_MASK	0x07ffffff</div><div class='ctx'> #define DART_SIZE_U4_SIZE_MASK	0x1fff</div><div class='ctx'> #define DART_SIZE_U4_SIZE_SHIFT	0</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c<br/>index 38087bd6e3cf..e32fadde1f77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/dart_iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/dart_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/dart_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/dart_iommu.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -101,8 +100,8 @@ retry:</div><div class='ctx'> 	if (l == (1L &lt;&lt; limit)) {</div><div class='ctx'> 		if (limit &lt; 4) {</div><div class='ctx'> 			limit++;</div><div class='del'>-		        reg = DART_IN(DART_CNTL);</div><div class='del'>-		        reg &amp;= ~inv_bit;</div><div class='add'>+			reg = DART_IN(DART_CNTL);</div><div class='add'>+			reg &amp;= ~inv_bit;</div><div class='ctx'> 			DART_OUT(DART_CNTL, reg);</div><div class='ctx'> 			goto retry;</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -111,11 +110,39 @@ retry:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void dart_tlb_invalidate_one(unsigned long bus_rpn)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+	unsigned int l, limit;</div><div class='add'>+</div><div class='add'>+	reg = DART_CNTL_U4_ENABLE | DART_CNTL_U4_IONE |</div><div class='add'>+		(bus_rpn &amp; DART_CNTL_U4_IONE_MASK);</div><div class='add'>+	DART_OUT(DART_CNTL, reg);</div><div class='add'>+</div><div class='add'>+	limit = 0;</div><div class='add'>+wait_more:</div><div class='add'>+	l = 0;</div><div class='add'>+	while ((DART_IN(DART_CNTL) &amp; DART_CNTL_U4_IONE) &amp;&amp; l &lt; (1L &lt;&lt; limit)) {</div><div class='add'>+		rmb();</div><div class='add'>+		l++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (l == (1L &lt;&lt; limit)) {</div><div class='add'>+		if (limit &lt; 4) {</div><div class='add'>+			limit++;</div><div class='add'>+			goto wait_more;</div><div class='add'>+		} else</div><div class='add'>+			panic("DART: TLB did not flush after waiting a long "</div><div class='add'>+			      "time. Buggy U4 ?");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void dart_flush(struct iommu_table *tbl)</div><div class='ctx'> {</div><div class='del'>-	if (dart_dirty)</div><div class='add'>+	if (dart_dirty) {</div><div class='ctx'> 		dart_tlb_invalidate_all();</div><div class='del'>-	dart_dirty = 0;</div><div class='add'>+		dart_dirty = 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dart_build(struct iommu_table *tbl, long index,</div><div class='hunk'>@@ -124,6 +151,7 @@ static void dart_build(struct iommu_table *tbl, long index,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *dp;</div><div class='ctx'> 	unsigned int rpn;</div><div class='add'>+	long l;</div><div class='ctx'> </div><div class='ctx'> 	DBG("dart: build at: %lx, %lx, addr: %x\n", index, npages, uaddr);</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +163,8 @@ static void dart_build(struct iommu_table *tbl, long index,</div><div class='ctx'> 	/* On U3, all memory is contigous, so we can move this</div><div class='ctx'> 	 * out of the loop.</div><div class='ctx'> 	 */</div><div class='del'>-	while (npages--) {</div><div class='add'>+	l = npages;</div><div class='add'>+	while (l--) {</div><div class='ctx'> 		rpn = virt_to_abs(uaddr) &gt;&gt; DART_PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		*(dp++) = DARTMAP_VALID | (rpn &amp; DARTMAP_RPNMASK);</div><div class='hunk'>@@ -143,7 +172,14 @@ static void dart_build(struct iommu_table *tbl, long index,</div><div class='ctx'> 		uaddr += DART_PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dart_dirty = 1;</div><div class='add'>+	if (dart_is_u4) {</div><div class='add'>+		rpn = index;</div><div class='add'>+		mb(); /* make sure all updates have reached memory */</div><div class='add'>+		while (npages--)</div><div class='add'>+			dart_tlb_invalidate_one(rpn++);</div><div class='add'>+	} else {</div><div class='add'>+		dart_dirty = 1;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +282,7 @@ static void iommu_table_dart_setup(void)</div><div class='ctx'> 	iommu_table_dart.it_base = (unsigned long)dart_vbase;</div><div class='ctx'> 	iommu_table_dart.it_index = 0;</div><div class='ctx'> 	iommu_table_dart.it_blocksize = 1;</div><div class='del'>-	iommu_init_table(&amp;iommu_table_dart);</div><div class='add'>+	iommu_init_table(&amp;iommu_table_dart, -1);</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve the last page of the DART to avoid possible prefetch</div><div class='ctx'> 	 * past the DART mapped area</div><div class='head'>diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c<br/>index ceb584682fa3..e983972132d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_soc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/fsl_soc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/fsl_soc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/fsl_soc.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -372,7 +371,7 @@ static int __init fsl_usb_of_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	struct platform_device *usb_dev;</div><div class='add'>+	struct platform_device *usb_dev_mph = NULL, *usb_dev_dr = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for (np = NULL, i = 0;</div><div class='hunk'>@@ -393,15 +392,15 @@ static int __init fsl_usb_of_init(void)</div><div class='ctx'> 		r[1].end = np-&gt;intrs[0].line;</div><div class='ctx'> 		r[1].flags = IORESOURCE_IRQ;</div><div class='ctx'> </div><div class='del'>-		usb_dev =</div><div class='del'>-		    platform_device_register_simple("fsl-usb2-mph", i, r, 2);</div><div class='del'>-		if (IS_ERR(usb_dev)) {</div><div class='del'>-			ret = PTR_ERR(usb_dev);</div><div class='add'>+		usb_dev_mph =</div><div class='add'>+		    platform_device_register_simple("fsl-ehci", i, r, 2);</div><div class='add'>+		if (IS_ERR(usb_dev_mph)) {</div><div class='add'>+			ret = PTR_ERR(usb_dev_mph);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		usb_dev-&gt;dev.coherent_dma_mask = 0xffffffffUL;</div><div class='del'>-		usb_dev-&gt;dev.dma_mask = &amp;usb_dev-&gt;dev.coherent_dma_mask;</div><div class='add'>+		usb_dev_mph-&gt;dev.coherent_dma_mask = 0xffffffffUL;</div><div class='add'>+		usb_dev_mph-&gt;dev.dma_mask = &amp;usb_dev_mph-&gt;dev.coherent_dma_mask;</div><div class='ctx'> </div><div class='ctx'> 		usb_data.operating_mode = FSL_USB2_MPH_HOST;</div><div class='ctx'> </div><div class='hunk'>@@ -417,31 +416,14 @@ static int __init fsl_usb_of_init(void)</div><div class='ctx'> 		usb_data.phy_mode = determine_usb_phy(prop);</div><div class='ctx'> </div><div class='ctx'> 		ret =</div><div class='del'>-		    platform_device_add_data(usb_dev, &amp;usb_data,</div><div class='add'>+		    platform_device_add_data(usb_dev_mph, &amp;usb_data,</div><div class='ctx'> 					     sizeof(struct</div><div class='ctx'> 						    fsl_usb2_platform_data));</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto unreg;</div><div class='add'>+			goto unreg_mph;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-unreg:</div><div class='del'>-	platform_device_unregister(usb_dev);</div><div class='del'>-err:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(fsl_usb_of_init);</div><div class='del'>-</div><div class='del'>-static int __init fsl_usb_dr_of_init(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	struct platform_device *usb_dev;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	for (np = NULL, i = 0;</div><div class='add'>+	for (np = NULL;</div><div class='ctx'> 	     (np = of_find_compatible_node(np, "usb", "fsl-usb2-dr")) != NULL;</div><div class='ctx'> 	     i++) {</div><div class='ctx'> 		struct resource r[2];</div><div class='hunk'>@@ -453,21 +435,21 @@ static int __init fsl_usb_dr_of_init(void)</div><div class='ctx'> </div><div class='ctx'> 		ret = of_address_to_resource(np, 0, &amp;r[0]);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto err;</div><div class='add'>+			goto unreg_mph;</div><div class='ctx'> </div><div class='ctx'> 		r[1].start = np-&gt;intrs[0].line;</div><div class='ctx'> 		r[1].end = np-&gt;intrs[0].line;</div><div class='ctx'> 		r[1].flags = IORESOURCE_IRQ;</div><div class='ctx'> </div><div class='del'>-		usb_dev =</div><div class='del'>-		    platform_device_register_simple("fsl-usb2-dr", i, r, 2);</div><div class='del'>-		if (IS_ERR(usb_dev)) {</div><div class='del'>-			ret = PTR_ERR(usb_dev);</div><div class='add'>+		usb_dev_dr =</div><div class='add'>+		    platform_device_register_simple("fsl-ehci", i, r, 2);</div><div class='add'>+		if (IS_ERR(usb_dev_dr)) {</div><div class='add'>+			ret = PTR_ERR(usb_dev_dr);</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		usb_dev-&gt;dev.coherent_dma_mask = 0xffffffffUL;</div><div class='del'>-		usb_dev-&gt;dev.dma_mask = &amp;usb_dev-&gt;dev.coherent_dma_mask;</div><div class='add'>+		usb_dev_dr-&gt;dev.coherent_dma_mask = 0xffffffffUL;</div><div class='add'>+		usb_dev_dr-&gt;dev.dma_mask = &amp;usb_dev_dr-&gt;dev.coherent_dma_mask;</div><div class='ctx'> </div><div class='ctx'> 		usb_data.operating_mode = FSL_USB2_DR_HOST;</div><div class='ctx'> </div><div class='hunk'>@@ -475,19 +457,22 @@ static int __init fsl_usb_dr_of_init(void)</div><div class='ctx'> 		usb_data.phy_mode = determine_usb_phy(prop);</div><div class='ctx'> </div><div class='ctx'> 		ret =</div><div class='del'>-		    platform_device_add_data(usb_dev, &amp;usb_data,</div><div class='add'>+		    platform_device_add_data(usb_dev_dr, &amp;usb_data,</div><div class='ctx'> 					     sizeof(struct</div><div class='ctx'> 						    fsl_usb2_platform_data));</div><div class='ctx'> 		if (ret)</div><div class='del'>-			goto unreg;</div><div class='add'>+			goto unreg_dr;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-unreg:</div><div class='del'>-	platform_device_unregister(usb_dev);</div><div class='add'>+unreg_dr:</div><div class='add'>+	if (usb_dev_dr)</div><div class='add'>+		platform_device_unregister(usb_dev_dr);</div><div class='add'>+unreg_mph:</div><div class='add'>+	if (usb_dev_mph)</div><div class='add'>+		platform_device_unregister(usb_dev_mph);</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-arch_initcall(fsl_usb_dr_of_init);</div><div class='add'>+arch_initcall(fsl_usb_of_init);</div><div class='head'>diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c<br/>index b7ac32fdd776..9855820b9548 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/i8259.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/i8259.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/i8259.c</a></div><div class='hunk'>@@ -6,11 +6,16 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/i8259.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> static volatile void __iomem *pci_intack; /* RO, gives us the irq vector */</div><div class='ctx'> </div><div class='hunk'>@@ -20,7 +25,8 @@ static unsigned char cached_8259[2] = { 0xff, 0xff };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(i8259_lock);</div><div class='ctx'> </div><div class='del'>-static int i8259_pic_irq_offset;</div><div class='add'>+static struct device_node *i8259_node;</div><div class='add'>+static struct irq_host *i8259_host;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Acknowledge the IRQ using either the PCI host bridge's interrupt</div><div class='hunk'>@@ -28,16 +34,18 @@ static int i8259_pic_irq_offset;</div><div class='ctx'>  * which is called.  It should be noted that polling is broken on some</div><div class='ctx'>  * IBM and Motorola PReP boxes so we must use the int-ack feature on them.</div><div class='ctx'>  */</div><div class='del'>-int i8259_irq(struct pt_regs *regs)</div><div class='add'>+unsigned int i8259_irq(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;i8259_lock);</div><div class='add'>+	int lock = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Either int-ack or poll for the IRQ */</div><div class='ctx'> 	if (pci_intack)</div><div class='ctx'> 		irq = readb(pci_intack);</div><div class='ctx'> 	else {</div><div class='add'>+		spin_lock(&amp;i8259_lock);</div><div class='add'>+		lock = 1;</div><div class='add'>+</div><div class='ctx'> 		/* Perform an interrupt acknowledge cycle on controller 1. */</div><div class='ctx'> 		outb(0x0C, 0x20);		/* prepare for poll */</div><div class='ctx'> 		irq = inb(0x20) &amp; 7;</div><div class='hunk'>@@ -62,16 +70,13 @@ int i8259_irq(struct pt_regs *regs)</div><div class='ctx'> 		if (!pci_intack)</div><div class='ctx'> 			outb(0x0B, 0x20);	/* ISR register */</div><div class='ctx'> 		if(~inb(0x20) &amp; 0x80)</div><div class='del'>-			irq = -1;</div><div class='del'>-	}</div><div class='add'>+			irq = NO_IRQ;</div><div class='add'>+	} else if (irq == 0xff)</div><div class='add'>+		irq = NO_IRQ;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;i8259_lock);</div><div class='del'>-	return irq + i8259_pic_irq_offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int i8259_irq_cascade(struct pt_regs *regs, void *unused)</div><div class='del'>-{</div><div class='del'>-	return i8259_irq(regs);</div><div class='add'>+	if (lock)</div><div class='add'>+		spin_unlock(&amp;i8259_lock);</div><div class='add'>+	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void i8259_mask_and_ack_irq(unsigned int irq_nr)</div><div class='hunk'>@@ -79,7 +84,6 @@ static void i8259_mask_and_ack_irq(unsigned int irq_nr)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='del'>-	irq_nr -= i8259_pic_irq_offset;</div><div class='ctx'> 	if (irq_nr &gt; 7) {</div><div class='ctx'> 		cached_A1 |= 1 &lt;&lt; (irq_nr-8);</div><div class='ctx'> 		inb(0xA1); 	/* DUMMY */</div><div class='hunk'>@@ -105,8 +109,9 @@ static void i8259_mask_irq(unsigned int irq_nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	pr_debug("i8259_mask_irq(%d)\n", irq_nr);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='del'>-	irq_nr -= i8259_pic_irq_offset;</div><div class='ctx'> 	if (irq_nr &lt; 8)</div><div class='ctx'> 		cached_21 |= 1 &lt;&lt; irq_nr;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -119,8 +124,9 @@ static void i8259_unmask_irq(unsigned int irq_nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	pr_debug("i8259_unmask_irq(%d)\n", irq_nr);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='del'>-	irq_nr -= i8259_pic_irq_offset;</div><div class='ctx'> 	if (irq_nr &lt; 8)</div><div class='ctx'> 		cached_21 &amp;= ~(1 &lt;&lt; irq_nr);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -129,19 +135,11 @@ static void i8259_unmask_irq(unsigned int irq_nr)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;i8259_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void i8259_end_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	if (!(irq_desc[irq].status &amp; (IRQ_DISABLED|IRQ_INPROGRESS))</div><div class='del'>-	    &amp;&amp; irq_desc[irq].action)</div><div class='del'>-		i8259_unmask_irq(irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct hw_interrupt_type i8259_pic = {</div><div class='del'>-	.typename = " i8259    ",</div><div class='del'>-	.enable = i8259_unmask_irq,</div><div class='del'>-	.disable = i8259_mask_irq,</div><div class='del'>-	.ack = i8259_mask_and_ack_irq,</div><div class='del'>-	.end = i8259_end_irq,</div><div class='add'>+static struct irq_chip i8259_pic = {</div><div class='add'>+	.typename	= " i8259    ",</div><div class='add'>+	.mask		= i8259_mask_irq,</div><div class='add'>+	.unmask		= i8259_unmask_irq,</div><div class='add'>+	.mask_ack	= i8259_mask_and_ack_irq,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource pic1_iores = {</div><div class='hunk'>@@ -165,25 +163,84 @@ static struct resource pic_edgectrl_iores = {</div><div class='ctx'> 	.flags = IORESOURCE_BUSY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct irqaction i8259_irqaction = {</div><div class='del'>-	.handler = no_action,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='del'>-	.mask = CPU_MASK_NONE,</div><div class='del'>-	.name = "82c59 secondary cascade",</div><div class='add'>+static int i8259_host_match(struct irq_host *h, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	return i8259_node == NULL || i8259_node == node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i8259_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			  irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	pr_debug("i8259_host_map(%d, 0x%lx)\n", virq, hw);</div><div class='add'>+</div><div class='add'>+	/* We block the internal cascade */</div><div class='add'>+	if (hw == 2)</div><div class='add'>+		get_irq_desc(virq)-&gt;status |= IRQ_NOREQUEST;</div><div class='add'>+</div><div class='add'>+	/* We use the level handler only for now, we might want to</div><div class='add'>+	 * be more cautious here but that works for now</div><div class='add'>+	 */</div><div class='add'>+	get_irq_desc(virq)-&gt;status |= IRQ_LEVEL;</div><div class='add'>+	set_irq_chip_and_handler(virq, &amp;i8259_pic, handle_level_irq);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i8259_host_unmap(struct irq_host *h, unsigned int virq)</div><div class='add'>+{</div><div class='add'>+	/* Make sure irq is masked in hardware */</div><div class='add'>+	i8259_mask_irq(virq);</div><div class='add'>+</div><div class='add'>+	/* remove chip and handler */</div><div class='add'>+	set_irq_chip_and_handler(virq, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	/* Make sure it's completed */</div><div class='add'>+	synchronize_irq(virq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i8259_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			    u32 *intspec, unsigned int intsize,</div><div class='add'>+			    irq_hw_number_t *out_hwirq, unsigned int *out_flags)</div><div class='add'>+{</div><div class='add'>+	static unsigned char map_isa_senses[4] = {</div><div class='add'>+		IRQ_TYPE_LEVEL_LOW,</div><div class='add'>+		IRQ_TYPE_LEVEL_HIGH,</div><div class='add'>+		IRQ_TYPE_EDGE_FALLING,</div><div class='add'>+		IRQ_TYPE_EDGE_RISING,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	*out_hwirq = intspec[0];</div><div class='add'>+	if (intsize &gt; 1 &amp;&amp; intspec[1] &lt; 4)</div><div class='add'>+		*out_flags = map_isa_senses[intspec[1]];</div><div class='add'>+	else</div><div class='add'>+		*out_flags = IRQ_TYPE_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops i8259_host_ops = {</div><div class='add'>+	.match = i8259_host_match,</div><div class='add'>+	.map = i8259_host_map,</div><div class='add'>+	.unmap = i8259_host_unmap,</div><div class='add'>+	.xlate = i8259_host_xlate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * i8259_init()</div><div class='del'>- * intack_addr - PCI interrupt acknowledge (real) address which will return</div><div class='del'>- *               the active irq from the 8259</div><div class='add'>+/****</div><div class='add'>+ * i8259_init - Initialize the legacy controller</div><div class='add'>+ * @node: device node of the legacy PIC (can be NULL, but then, it will match</div><div class='add'>+ *        all interrupts, so beware)</div><div class='add'>+ * @intack_addr: PCI interrupt acknowledge (real) address which will return</div><div class='add'>+ *             	 the active irq from the 8259</div><div class='ctx'>  */</div><div class='del'>-void __init i8259_init(unsigned long intack_addr, int offset)</div><div class='add'>+void i8259_init(struct device_node *node, unsigned long intack_addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='add'>+	/* initialize the controller */</div><div class='ctx'> 	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='del'>-	i8259_pic_irq_offset = offset;</div><div class='add'>+</div><div class='add'>+	/* Mask all first */</div><div class='add'>+	outb(0xff, 0xA1);</div><div class='add'>+	outb(0xff, 0x21);</div><div class='ctx'> </div><div class='ctx'> 	/* init master interrupt controller */</div><div class='ctx'> 	outb(0x11, 0x20); /* Start init sequence */</div><div class='hunk'>@@ -197,21 +254,36 @@ void __init i8259_init(unsigned long intack_addr, int offset)</div><div class='ctx'> 	outb(0x02, 0xA1); /* edge triggered, Cascade (slave) on IRQ2 */</div><div class='ctx'> 	outb(0x01, 0xA1); /* Select 8086 mode */</div><div class='ctx'> </div><div class='add'>+	/* That thing is slow */</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='ctx'> 	/* always read ISR */</div><div class='ctx'> 	outb(0x0B, 0x20);</div><div class='ctx'> 	outb(0x0B, 0xA0);</div><div class='ctx'> </div><div class='del'>-	/* Mask all interrupts */</div><div class='add'>+	/* Unmask the internal cascade */</div><div class='add'>+	cached_21 &amp;= ~(1 &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	/* Set interrupt masks */</div><div class='ctx'> 	outb(cached_A1, 0xA1);</div><div class='ctx'> 	outb(cached_21, 0x21);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;i8259_lock, flags);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_ISA_INTERRUPTS; ++i)</div><div class='del'>-		irq_desc[offset + i].handler = &amp;i8259_pic;</div><div class='add'>+	/* create a legacy host */</div><div class='add'>+	if (node)</div><div class='add'>+		i8259_node = of_node_get(node);</div><div class='add'>+	i8259_host = irq_alloc_host(IRQ_HOST_MAP_LEGACY, 0, &amp;i8259_host_ops, 0);</div><div class='add'>+	if (i8259_host == NULL) {</div><div class='add'>+		printk(KERN_ERR "i8259: failed to allocate irq host !\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* reserve our resources */</div><div class='del'>-	setup_irq(offset + 2, &amp;i8259_irqaction);</div><div class='add'>+	/* XXX should we continue doing that ? it seems to cause problems</div><div class='add'>+	 * with further requesting of PCI IO resources for that range...</div><div class='add'>+	 * need to look into it.</div><div class='add'>+	 */</div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;pic1_iores);</div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;pic2_iores);</div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;pic_edgectrl_iores);</div><div class='hunk'>@@ -219,4 +291,5 @@ void __init i8259_init(unsigned long intack_addr, int offset)</div><div class='ctx'> 	if (intack_addr != 0)</div><div class='ctx'> 		pci_intack = ioremap(intack_addr, 1);</div><div class='ctx'> </div><div class='add'>+	printk(KERN_INFO "i8259 legacy interrupt controller initialized\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c<br/>index 8f01e0f1d847..46801f5ec03f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ipic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/ipic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/ipic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/ipic.c</a></div><div class='hunk'>@@ -472,7 +472,7 @@ void __init ipic_init(phys_addr_t phys_addr,</div><div class='ctx'> 	ipic_write(primary_ipic-&gt;regs, IPIC_SEMSR, temp);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; NR_IPIC_INTS ; i++) {</div><div class='del'>-		irq_desc[i+irq_offset].handler = &amp;ipic;</div><div class='add'>+		irq_desc[i+irq_offset].chip = &amp;ipic;</div><div class='ctx'> 		irq_desc[i+irq_offset].status = IRQ_LEVEL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c<br/>index 74e0d31a3559..615350d46b52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/mmio_nvram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/mmio_nvram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/mmio_nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/mmio_nvram.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> static void __iomem *mmio_nvram_start;</div><div class='ctx'> static long mmio_nvram_len;</div><div class='del'>-static spinlock_t mmio_nvram_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(mmio_nvram_lock);</div><div class='ctx'> </div><div class='ctx'> static ssize_t mmio_nvram_read(char *buf, size_t count, loff_t *index)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c<br/>index 7dcdfcb3c984..6e0281afa6c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/mpic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/sysdev/mpic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/mpic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/mpic.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #undef DEBUG_IRQ</div><div class='ctx'> #undef DEBUG_LOW</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -101,8 +100,8 @@ static inline u32 _mpic_cpu_read(struct mpic *mpic, unsigned int reg)</div><div class='ctx'> </div><div class='ctx'> 	if (mpic-&gt;flags &amp; MPIC_PRIMARY)</div><div class='ctx'> 		cpu = hard_smp_processor_id();</div><div class='del'>-</div><div class='del'>-	return _mpic_read(mpic-&gt;flags &amp; MPIC_BIG_ENDIAN, mpic-&gt;cpuregs[cpu], reg);</div><div class='add'>+	return _mpic_read(mpic-&gt;flags &amp; MPIC_BIG_ENDIAN,</div><div class='add'>+			  mpic-&gt;cpuregs[cpu], reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void _mpic_cpu_write(struct mpic *mpic, unsigned int reg, u32 value)</div><div class='hunk'>@@ -205,7 +204,7 @@ static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,</div><div class='ctx'> 	if (fixup-&gt;base == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	DBG("startup_ht_interrupt(%u, %u) index: %d\n",</div><div class='add'>+	DBG("startup_ht_interrupt(0x%x, 0x%x) index: %d\n",</div><div class='ctx'> 	    source, irqflags, fixup-&gt;index);</div><div class='ctx'> 	spin_lock_irqsave(&amp;mpic-&gt;fixup_lock, flags);</div><div class='ctx'> 	/* Enable and configure */</div><div class='hunk'>@@ -228,7 +227,7 @@ static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source,</div><div class='ctx'> 	if (fixup-&gt;base == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	DBG("shutdown_ht_interrupt(%u, %u)\n", source, irqflags);</div><div class='add'>+	DBG("shutdown_ht_interrupt(0x%x, 0x%x)\n", source, irqflags);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable */</div><div class='ctx'> 	spin_lock_irqsave(&amp;mpic-&gt;fixup_lock, flags);</div><div class='hunk'>@@ -338,30 +337,33 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#else /* CONFIG_MPIC_BROKEN_U3 */</div><div class='add'>+</div><div class='add'>+static inline int mpic_is_ht_interrupt(struct mpic *mpic, unsigned int source)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init mpic_scan_ht_pics(struct mpic *mpic)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#define mpic_irq_to_hw(virq)	((unsigned int)irq_map[virq].hwirq)</div><div class='add'>+</div><div class='ctx'> /* Find an mpic associated with a given linux interrupt */</div><div class='ctx'> static struct mpic *mpic_find(unsigned int irq, unsigned int *is_ipi)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic = mpics;</div><div class='del'>-</div><div class='del'>-	while(mpic) {</div><div class='del'>-		/* search IPIs first since they may override the main interrupts */</div><div class='del'>-		if (irq &gt;= mpic-&gt;ipi_offset &amp;&amp; irq &lt; (mpic-&gt;ipi_offset + 4)) {</div><div class='del'>-			if (is_ipi)</div><div class='del'>-				*is_ipi = 1;</div><div class='del'>-			return mpic;</div><div class='del'>-		}</div><div class='del'>-		if (irq &gt;= mpic-&gt;irq_offset &amp;&amp;</div><div class='del'>-		    irq &lt; (mpic-&gt;irq_offset + mpic-&gt;irq_count)) {</div><div class='del'>-			if (is_ipi)</div><div class='del'>-				*is_ipi = 0;</div><div class='del'>-			return mpic;</div><div class='del'>-		}</div><div class='del'>-		mpic = mpic -&gt; next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='add'>+</div><div class='add'>+	if (irq &lt; NUM_ISA_INTERRUPTS)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (is_ipi)</div><div class='add'>+		*is_ipi = (src &gt;= MPIC_VEC_IPI_0 &amp;&amp; src &lt;= MPIC_VEC_IPI_3);</div><div class='add'>+</div><div class='add'>+	return irq_desc[irq].chip_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Convert a cpu mask from logical to physical cpu numbers. */</div><div class='hunk'>@@ -379,14 +381,14 @@ static inline u32 mpic_physmask(u32 cpumask)</div><div class='ctx'> /* Get the mpic structure from the IPI number */</div><div class='ctx'> static inline struct mpic * mpic_from_ipi(unsigned int ipi)</div><div class='ctx'> {</div><div class='del'>-	return container_of(irq_desc[ipi].handler, struct mpic, hc_ipi);</div><div class='add'>+	return irq_desc[ipi].chip_data;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Get the mpic structure from the irq number */</div><div class='ctx'> static inline struct mpic * mpic_from_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	return container_of(irq_desc[irq].handler, struct mpic, hc_irq);</div><div class='add'>+	return irq_desc[irq].chip_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Send an EOI */</div><div class='hunk'>@@ -399,9 +401,7 @@ static inline void mpic_eoi(struct mpic *mpic)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static irqreturn_t mpic_ipi_action(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic = dev_id;</div><div class='del'>-</div><div class='del'>-	smp_message_recv(irq - mpic-&gt;ipi_offset, regs);</div><div class='add'>+	smp_message_recv(mpic_irq_to_hw(irq) - MPIC_VEC_IPI_0, regs);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='hunk'>@@ -411,58 +411,31 @@ static irqreturn_t mpic_ipi_action(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void mpic_enable_irq(unsigned int irq)</div><div class='add'>+static void mpic_unmask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int loops = 100000;</div><div class='ctx'> 	struct mpic *mpic = mpic_from_irq(irq);</div><div class='del'>-	unsigned int src = irq - mpic-&gt;irq_offset;</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> </div><div class='ctx'> 	DBG("%p: %s: enable_irq: %d (src %d)\n", mpic, mpic-&gt;name, irq, src);</div><div class='ctx'> </div><div class='ctx'> 	mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI,</div><div class='ctx'> 		       mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) &amp;</div><div class='ctx'> 		       ~MPIC_VECPRI_MASK);</div><div class='del'>-</div><div class='ctx'> 	/* make sure mask gets to controller before we return to user */</div><div class='ctx'> 	do {</div><div class='ctx'> 		if (!loops--) {</div><div class='ctx'> 			printk(KERN_ERR "mpic_enable_irq timeout\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	} while(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) &amp; MPIC_VECPRI_MASK);	</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='del'>-	if (mpic-&gt;flags &amp; MPIC_BROKEN_U3) {</div><div class='del'>-		unsigned int src = irq - mpic-&gt;irq_offset;</div><div class='del'>-		if (mpic_is_ht_interrupt(mpic, src) &amp;&amp;</div><div class='del'>-		    (irq_desc[irq].status &amp; IRQ_LEVEL))</div><div class='del'>-			mpic_ht_end_irq(mpic, src);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='add'>+	} while(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) &amp; MPIC_VECPRI_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int mpic_startup_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='del'>-	struct mpic *mpic = mpic_from_irq(irq);</div><div class='del'>-	unsigned int src = irq - mpic-&gt;irq_offset;</div><div class='del'>-#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='del'>-</div><div class='del'>-	mpic_enable_irq(irq);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='del'>-	if (mpic_is_ht_interrupt(mpic, src))</div><div class='del'>-		mpic_startup_ht_interrupt(mpic, src, irq_desc[irq].status);</div><div class='del'>-#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpic_disable_irq(unsigned int irq)</div><div class='add'>+static void mpic_mask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int loops = 100000;</div><div class='ctx'> 	struct mpic *mpic = mpic_from_irq(irq);</div><div class='del'>-	unsigned int src = irq - mpic-&gt;irq_offset;</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> </div><div class='ctx'> 	DBG("%s: disable_irq: %d (src %d)\n", mpic-&gt;name, irq, src);</div><div class='ctx'> </div><div class='hunk'>@@ -479,23 +452,58 @@ static void mpic_disable_irq(unsigned int irq)</div><div class='ctx'> 	} while(!(mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) &amp; MPIC_VECPRI_MASK));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mpic_shutdown_irq(unsigned int irq)</div><div class='add'>+static void mpic_end_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='add'>+	struct mpic *mpic = mpic_from_irq(irq);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_IRQ</div><div class='add'>+	DBG("%s: end_irq: %d\n", mpic-&gt;name, irq);</div><div class='add'>+#endif</div><div class='add'>+	/* We always EOI on end_irq() even for edge interrupts since that</div><div class='add'>+	 * should only lower the priority, the MPIC should have properly</div><div class='add'>+	 * latched another edge interrupt coming in anyway</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	mpic_eoi(mpic);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MPIC_BROKEN_U3</div><div class='add'>+</div><div class='add'>+static void mpic_unmask_ht_irq(unsigned int irq)</div><div class='add'>+{</div><div class='ctx'> 	struct mpic *mpic = mpic_from_irq(irq);</div><div class='del'>-	unsigned int src = irq - mpic-&gt;irq_offset;</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> </div><div class='del'>-	if (mpic_is_ht_interrupt(mpic, src))</div><div class='del'>-		mpic_shutdown_ht_interrupt(mpic, src, irq_desc[irq].status);</div><div class='add'>+	mpic_unmask_irq(irq);</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='add'>+	if (irq_desc[irq].status &amp; IRQ_LEVEL)</div><div class='add'>+		mpic_ht_end_irq(mpic, src);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mpic_disable_irq(irq);</div><div class='add'>+static unsigned int mpic_startup_ht_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic = mpic_from_irq(irq);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='add'>+</div><div class='add'>+	mpic_unmask_irq(irq);</div><div class='add'>+	mpic_startup_ht_interrupt(mpic, src, irq_desc[irq].status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mpic_end_irq(unsigned int irq)</div><div class='add'>+static void mpic_shutdown_ht_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic = mpic_from_irq(irq);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='add'>+</div><div class='add'>+	mpic_shutdown_ht_interrupt(mpic, src, irq_desc[irq].status);</div><div class='add'>+	mpic_mask_irq(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mpic_end_ht_irq(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic = mpic_from_irq(irq);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_IRQ</div><div class='ctx'> 	DBG("%s: end_irq: %d\n", mpic-&gt;name, irq);</div><div class='hunk'>@@ -505,30 +513,24 @@ static void mpic_end_irq(unsigned int irq)</div><div class='ctx'> 	 * latched another edge interrupt coming in anyway</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='del'>-	if (mpic-&gt;flags &amp; MPIC_BROKEN_U3) {</div><div class='del'>-		unsigned int src = irq - mpic-&gt;irq_offset;</div><div class='del'>-		if (mpic_is_ht_interrupt(mpic, src) &amp;&amp;</div><div class='del'>-		    (irq_desc[irq].status &amp; IRQ_LEVEL))</div><div class='del'>-			mpic_ht_end_irq(mpic, src);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='del'>-</div><div class='add'>+	if (irq_desc[irq].status &amp; IRQ_LEVEL)</div><div class='add'>+		mpic_ht_end_irq(mpic, src);</div><div class='ctx'> 	mpic_eoi(mpic);</div><div class='ctx'> }</div><div class='add'>+#endif /* !CONFIG_MPIC_BROKEN_U3 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='del'>-static void mpic_enable_ipi(unsigned int irq)</div><div class='add'>+static void mpic_unmask_ipi(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic = mpic_from_ipi(irq);</div><div class='del'>-	unsigned int src = irq - mpic-&gt;ipi_offset;</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq) - MPIC_VEC_IPI_0;</div><div class='ctx'> </div><div class='ctx'> 	DBG("%s: enable_ipi: %d (ipi %d)\n", mpic-&gt;name, irq, src);</div><div class='ctx'> 	mpic_ipi_write(src, mpic_ipi_read(src) &amp; ~MPIC_VECPRI_MASK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mpic_disable_ipi(unsigned int irq)</div><div class='add'>+static void mpic_mask_ipi(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	/* NEVER disable an IPI... that's just plain wrong! */</div><div class='ctx'> }</div><div class='hunk'>@@ -541,7 +543,7 @@ static void mpic_end_ipi(unsigned int irq)</div><div class='ctx'> 	 * IPIs are marked IRQ_PER_CPU. This has the side effect of</div><div class='ctx'> 	 * preventing the IRQ_PENDING/IRQ_INPROGRESS logic from</div><div class='ctx'> 	 * applying to them. We EOI them late to avoid re-entering.</div><div class='del'>-	 * We mark IPI's with SA_INTERRUPT as they must run with</div><div class='add'>+	 * We mark IPI's with IRQF_DISABLED as they must run with</div><div class='ctx'> 	 * irqs disabled.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mpic_eoi(mpic);</div><div class='hunk'>@@ -552,29 +554,206 @@ static void mpic_end_ipi(unsigned int irq)</div><div class='ctx'> static void mpic_set_affinity(unsigned int irq, cpumask_t cpumask)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic = mpic_from_irq(irq);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> </div><div class='ctx'> 	cpumask_t tmp;</div><div class='ctx'> </div><div class='ctx'> 	cpus_and(tmp, cpumask, cpu_online_map);</div><div class='ctx'> </div><div class='del'>-	mpic_irq_write(irq - mpic-&gt;irq_offset, MPIC_IRQ_DESTINATION,</div><div class='add'>+	mpic_irq_write(src, MPIC_IRQ_DESTINATION,</div><div class='ctx'> 		       mpic_physmask(cpus_addr(tmp)[0]));	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int mpic_type_to_vecpri(unsigned int type)</div><div class='add'>+{</div><div class='add'>+	/* Now convert sense value */</div><div class='add'>+	switch(type &amp; IRQ_TYPE_SENSE_MASK) {</div><div class='add'>+	case IRQ_TYPE_EDGE_RISING:</div><div class='add'>+		return MPIC_VECPRI_SENSE_EDGE | MPIC_VECPRI_POLARITY_POSITIVE;</div><div class='add'>+	case IRQ_TYPE_EDGE_FALLING:</div><div class='add'>+	case IRQ_TYPE_EDGE_BOTH:</div><div class='add'>+		return MPIC_VECPRI_SENSE_EDGE | MPIC_VECPRI_POLARITY_NEGATIVE;</div><div class='add'>+	case IRQ_TYPE_LEVEL_HIGH:</div><div class='add'>+		return MPIC_VECPRI_SENSE_LEVEL | MPIC_VECPRI_POLARITY_POSITIVE;</div><div class='add'>+	case IRQ_TYPE_LEVEL_LOW:</div><div class='add'>+	default:</div><div class='add'>+		return MPIC_VECPRI_SENSE_LEVEL | MPIC_VECPRI_POLARITY_NEGATIVE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpic_set_irq_type(unsigned int virq, unsigned int flow_type)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic = mpic_from_irq(virq);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(virq);</div><div class='add'>+	struct irq_desc *desc = get_irq_desc(virq);</div><div class='add'>+	unsigned int vecpri, vold, vnew;</div><div class='add'>+</div><div class='add'>+	DBG("mpic: set_irq_type(mpic:@%p,virq:%d,src:0x%x,type:0x%x)\n",</div><div class='add'>+	    mpic, virq, src, flow_type);</div><div class='add'>+</div><div class='add'>+	if (src &gt;= mpic-&gt;irq_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flow_type == IRQ_TYPE_NONE)</div><div class='add'>+		if (mpic-&gt;senses &amp;&amp; src &lt; mpic-&gt;senses_count)</div><div class='add'>+			flow_type = mpic-&gt;senses[src];</div><div class='add'>+	if (flow_type == IRQ_TYPE_NONE)</div><div class='add'>+		flow_type = IRQ_TYPE_LEVEL_LOW;</div><div class='add'>+</div><div class='add'>+	desc-&gt;status &amp;= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);</div><div class='add'>+	desc-&gt;status |= flow_type &amp; IRQ_TYPE_SENSE_MASK;</div><div class='add'>+	if (flow_type &amp; (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))</div><div class='add'>+		desc-&gt;status |= IRQ_LEVEL;</div><div class='add'>+</div><div class='add'>+	if (mpic_is_ht_interrupt(mpic, src))</div><div class='add'>+		vecpri = MPIC_VECPRI_POLARITY_POSITIVE |</div><div class='add'>+			MPIC_VECPRI_SENSE_EDGE;</div><div class='add'>+	else</div><div class='add'>+		vecpri = mpic_type_to_vecpri(flow_type);</div><div class='add'>+</div><div class='add'>+	vold = mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI);</div><div class='add'>+	vnew = vold &amp; ~(MPIC_VECPRI_POLARITY_MASK | MPIC_VECPRI_SENSE_MASK);</div><div class='add'>+	vnew |= vecpri;</div><div class='add'>+	if (vold != vnew)</div><div class='add'>+		mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI, vnew);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip mpic_irq_chip = {</div><div class='add'>+	.mask		= mpic_mask_irq,</div><div class='add'>+	.unmask		= mpic_unmask_irq,</div><div class='add'>+	.eoi		= mpic_end_irq,</div><div class='add'>+	.set_type	= mpic_set_irq_type,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+static struct irq_chip mpic_ipi_chip = {</div><div class='add'>+	.mask		= mpic_mask_ipi,</div><div class='add'>+	.unmask		= mpic_unmask_ipi,</div><div class='add'>+	.eoi		= mpic_end_ipi,</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='add'>+static struct irq_chip mpic_irq_ht_chip = {</div><div class='add'>+	.startup	= mpic_startup_ht_irq,</div><div class='add'>+	.shutdown	= mpic_shutdown_ht_irq,</div><div class='add'>+	.mask		= mpic_mask_irq,</div><div class='add'>+	.unmask		= mpic_unmask_ht_irq,</div><div class='add'>+	.eoi		= mpic_end_ht_irq,</div><div class='add'>+	.set_type	= mpic_set_irq_type,</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int mpic_host_match(struct irq_host *h, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic = h-&gt;host_data;</div><div class='add'>+</div><div class='add'>+	/* Exact match, unless mpic node is NULL */</div><div class='add'>+	return mpic-&gt;of_node == NULL || mpic-&gt;of_node == node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpic_host_map(struct irq_host *h, unsigned int virq,</div><div class='add'>+			 irq_hw_number_t hw)</div><div class='add'>+{</div><div class='add'>+	struct mpic *mpic = h-&gt;host_data;</div><div class='add'>+	struct irq_chip *chip;</div><div class='add'>+</div><div class='add'>+	DBG("mpic: map virq %d, hwirq 0x%lx\n", virq, hw);</div><div class='add'>+</div><div class='add'>+	if (hw == MPIC_VEC_SPURRIOUS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	else if (hw &gt;= MPIC_VEC_IPI_0) {</div><div class='add'>+		WARN_ON(!(mpic-&gt;flags &amp; MPIC_PRIMARY));</div><div class='add'>+</div><div class='add'>+		DBG("mpic: mapping as IPI\n");</div><div class='add'>+		set_irq_chip_data(virq, mpic);</div><div class='add'>+		set_irq_chip_and_handler(virq, &amp;mpic-&gt;hc_ipi,</div><div class='add'>+					 handle_percpu_irq);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_SMP */</div><div class='add'>+</div><div class='add'>+	if (hw &gt;= mpic-&gt;irq_count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Default chip */</div><div class='add'>+	chip = &amp;mpic-&gt;hc_irq;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='add'>+	/* Check for HT interrupts, override vecpri */</div><div class='add'>+	if (mpic_is_ht_interrupt(mpic, hw))</div><div class='add'>+		chip = &amp;mpic-&gt;hc_ht_irq;</div><div class='add'>+#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='add'>+</div><div class='add'>+	DBG("mpic: mapping to irq chip @%p\n", chip);</div><div class='add'>+</div><div class='add'>+	set_irq_chip_data(virq, mpic);</div><div class='add'>+	set_irq_chip_and_handler(virq, chip, handle_fasteoi_irq);</div><div class='add'>+</div><div class='add'>+	/* Set default irq type */</div><div class='add'>+	set_irq_type(virq, IRQ_TYPE_NONE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mpic_host_xlate(struct irq_host *h, struct device_node *ct,</div><div class='add'>+			   u32 *intspec, unsigned int intsize,</div><div class='add'>+			   irq_hw_number_t *out_hwirq, unsigned int *out_flags)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	static unsigned char map_mpic_senses[4] = {</div><div class='add'>+		IRQ_TYPE_EDGE_RISING,</div><div class='add'>+		IRQ_TYPE_LEVEL_LOW,</div><div class='add'>+		IRQ_TYPE_LEVEL_HIGH,</div><div class='add'>+		IRQ_TYPE_EDGE_FALLING,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	*out_hwirq = intspec[0];</div><div class='add'>+	if (intsize &gt; 1) {</div><div class='add'>+		u32 mask = 0x3;</div><div class='add'>+</div><div class='add'>+		/* Apple invented a new race of encoding on machines with</div><div class='add'>+		 * an HT APIC. They encode, among others, the index within</div><div class='add'>+		 * the HT APIC. We don't care about it here since thankfully,</div><div class='add'>+		 * it appears that they have the APIC already properly</div><div class='add'>+		 * configured, and thus our current fixup code that reads the</div><div class='add'>+		 * APIC config works fine. However, we still need to mask out</div><div class='add'>+		 * bits in the specifier to make sure we only get bit 0 which</div><div class='add'>+		 * is the level/edge bit (the only sense bit exposed by Apple),</div><div class='add'>+		 * as their bit 1 means something else.</div><div class='add'>+		 */</div><div class='add'>+		if (machine_is(powermac))</div><div class='add'>+			mask = 0x1;</div><div class='add'>+		*out_flags = map_mpic_senses[intspec[1] &amp; mask];</div><div class='add'>+	} else</div><div class='add'>+		*out_flags = IRQ_TYPE_NONE;</div><div class='add'>+</div><div class='add'>+	DBG("mpic: xlate (%d cells: 0x%08x 0x%08x) to line 0x%lx sense 0x%x\n",</div><div class='add'>+	    intsize, intspec[0], intspec[1], *out_hwirq, *out_flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_host_ops mpic_host_ops = {</div><div class='add'>+	.match = mpic_host_match,</div><div class='add'>+	.map = mpic_host_map,</div><div class='add'>+	.xlate = mpic_host_xlate,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Exported functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct mpic * __init mpic_alloc(unsigned long phys_addr,</div><div class='add'>+struct mpic * __init mpic_alloc(struct device_node *node,</div><div class='add'>+				unsigned long phys_addr,</div><div class='ctx'> 				unsigned int flags,</div><div class='ctx'> 				unsigned int isu_size,</div><div class='del'>-				unsigned int irq_offset,</div><div class='ctx'> 				unsigned int irq_count,</div><div class='del'>-				unsigned int ipi_offset,</div><div class='del'>-				unsigned char *senses,</div><div class='del'>-				unsigned int senses_count,</div><div class='ctx'> 				const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic	*mpic;</div><div class='hunk'>@@ -586,33 +765,38 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr,</div><div class='ctx'> 	if (mpic == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	</div><div class='del'>-</div><div class='ctx'> 	memset(mpic, 0, sizeof(struct mpic));</div><div class='ctx'> 	mpic-&gt;name = name;</div><div class='add'>+	mpic-&gt;of_node = node ? of_node_get(node) : NULL;</div><div class='add'>+</div><div class='add'>+	mpic-&gt;irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 256,</div><div class='add'>+				       &amp;mpic_host_ops,</div><div class='add'>+				       MPIC_VEC_SPURRIOUS);</div><div class='add'>+	if (mpic-&gt;irqhost == NULL) {</div><div class='add'>+		of_node_put(node);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	mpic-&gt;irqhost-&gt;host_data = mpic;</div><div class='add'>+	mpic-&gt;hc_irq = mpic_irq_chip;</div><div class='ctx'> 	mpic-&gt;hc_irq.typename = name;</div><div class='del'>-	mpic-&gt;hc_irq.startup = mpic_startup_irq;</div><div class='del'>-	mpic-&gt;hc_irq.shutdown = mpic_shutdown_irq;</div><div class='del'>-	mpic-&gt;hc_irq.enable = mpic_enable_irq;</div><div class='del'>-	mpic-&gt;hc_irq.disable = mpic_disable_irq;</div><div class='del'>-	mpic-&gt;hc_irq.end = mpic_end_irq;</div><div class='ctx'> 	if (flags &amp; MPIC_PRIMARY)</div><div class='ctx'> 		mpic-&gt;hc_irq.set_affinity = mpic_set_affinity;</div><div class='add'>+#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='add'>+	mpic-&gt;hc_ht_irq = mpic_irq_ht_chip;</div><div class='add'>+	mpic-&gt;hc_ht_irq.typename = name;</div><div class='add'>+	if (flags &amp; MPIC_PRIMARY)</div><div class='add'>+		mpic-&gt;hc_ht_irq.set_affinity = mpic_set_affinity;</div><div class='add'>+#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='add'>+	mpic-&gt;hc_ipi = mpic_ipi_chip;</div><div class='ctx'> 	mpic-&gt;hc_ipi.typename = name;</div><div class='del'>-	mpic-&gt;hc_ipi.enable = mpic_enable_ipi;</div><div class='del'>-	mpic-&gt;hc_ipi.disable = mpic_disable_ipi;</div><div class='del'>-	mpic-&gt;hc_ipi.end = mpic_end_ipi;</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='ctx'> 	mpic-&gt;flags = flags;</div><div class='ctx'> 	mpic-&gt;isu_size = isu_size;</div><div class='del'>-	mpic-&gt;irq_offset = irq_offset;</div><div class='ctx'> 	mpic-&gt;irq_count = irq_count;</div><div class='del'>-	mpic-&gt;ipi_offset = ipi_offset;</div><div class='ctx'> 	mpic-&gt;num_sources = 0; /* so far */</div><div class='del'>-	mpic-&gt;senses = senses;</div><div class='del'>-	mpic-&gt;senses_count = senses_count;</div><div class='ctx'> </div><div class='ctx'> 	/* Map the global registers */</div><div class='ctx'> 	mpic-&gt;gregs = ioremap(phys_addr + MPIC_GREG_BASE, 0x1000);</div><div class='hunk'>@@ -680,8 +864,10 @@ struct mpic * __init mpic_alloc(unsigned long phys_addr,</div><div class='ctx'> 	mpic-&gt;next = mpics;</div><div class='ctx'> 	mpics = mpic;</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; MPIC_PRIMARY)</div><div class='add'>+	if (flags &amp; MPIC_PRIMARY) {</div><div class='ctx'> 		mpic_primary = mpic;</div><div class='add'>+		irq_set_default_host(mpic-&gt;irqhost);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return mpic;</div><div class='ctx'> }</div><div class='hunk'>@@ -698,26 +884,10 @@ void __init mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,</div><div class='ctx'> 		mpic-&gt;num_sources = isu_first + mpic-&gt;isu_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init mpic_setup_cascade(unsigned int irq, mpic_cascade_t handler,</div><div class='del'>-			       void *data)</div><div class='add'>+void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count)</div><div class='ctx'> {</div><div class='del'>-	struct mpic *mpic = mpic_find(irq, NULL);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* Synchronization here is a bit dodgy, so don't try to replace cascade</div><div class='del'>-	 * interrupts on the fly too often ... but normally it's set up at boot.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;mpic_lock, flags);</div><div class='del'>-	if (mpic-&gt;cascade)	       </div><div class='del'>-		mpic_disable_irq(mpic-&gt;cascade_vec + mpic-&gt;irq_offset);</div><div class='del'>-	mpic-&gt;cascade = NULL;</div><div class='del'>-	wmb();</div><div class='del'>-	mpic-&gt;cascade_vec = irq - mpic-&gt;irq_offset;</div><div class='del'>-	mpic-&gt;cascade_data = data;</div><div class='del'>-	wmb();</div><div class='del'>-	mpic-&gt;cascade = handler;</div><div class='del'>-	mpic_enable_irq(irq);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpic_lock, flags);</div><div class='add'>+	mpic-&gt;senses = senses;</div><div class='add'>+	mpic-&gt;senses_count = count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init mpic_init(struct mpic *mpic)</div><div class='hunk'>@@ -725,6 +895,11 @@ void __init mpic_init(struct mpic *mpic)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(mpic-&gt;num_sources == 0);</div><div class='add'>+	WARN_ON(mpic-&gt;num_sources &gt; MPIC_VEC_IPI_0);</div><div class='add'>+</div><div class='add'>+	/* Sanitize source count */</div><div class='add'>+	if (mpic-&gt;num_sources &gt; MPIC_VEC_IPI_0)</div><div class='add'>+		mpic-&gt;num_sources = MPIC_VEC_IPI_0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "mpic: Initializing for %d sources\n", mpic-&gt;num_sources);</div><div class='ctx'> </div><div class='hunk'>@@ -748,73 +923,26 @@ void __init mpic_init(struct mpic *mpic)</div><div class='ctx'> 			       MPIC_VECPRI_MASK |</div><div class='ctx'> 			       (10 &lt;&lt; MPIC_VECPRI_PRIORITY_SHIFT) |</div><div class='ctx'> 			       (MPIC_VEC_IPI_0 + i));</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-		if (!(mpic-&gt;flags &amp; MPIC_PRIMARY))</div><div class='del'>-			continue;</div><div class='del'>-		irq_desc[mpic-&gt;ipi_offset+i].status |= IRQ_PER_CPU;</div><div class='del'>-		irq_desc[mpic-&gt;ipi_offset+i].handler = &amp;mpic-&gt;hc_ipi;</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize interrupt sources */</div><div class='ctx'> 	if (mpic-&gt;irq_count == 0)</div><div class='ctx'> 		mpic-&gt;irq_count = mpic-&gt;num_sources;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='ctx'> 	/* Do the HT PIC fixups on U3 broken mpic */</div><div class='ctx'> 	DBG("MPIC flags: %x\n", mpic-&gt;flags);</div><div class='ctx'> 	if ((mpic-&gt;flags &amp; MPIC_BROKEN_U3) &amp;&amp; (mpic-&gt;flags &amp; MPIC_PRIMARY))</div><div class='del'>-		mpic_scan_ht_pics(mpic);</div><div class='del'>-#endif /* CONFIG_MPIC_BROKEN_U3 */</div><div class='add'>+ 		mpic_scan_ht_pics(mpic);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; mpic-&gt;num_sources; i++) {</div><div class='ctx'> 		/* start with vector = source number, and masked */</div><div class='del'>-		u32 vecpri = MPIC_VECPRI_MASK | i | (8 &lt;&lt; MPIC_VECPRI_PRIORITY_SHIFT);</div><div class='del'>-		int level = 0;</div><div class='add'>+		u32 vecpri = MPIC_VECPRI_MASK | i |</div><div class='add'>+			(8 &lt;&lt; MPIC_VECPRI_PRIORITY_SHIFT);</div><div class='ctx'> 		</div><div class='del'>-		/* if it's an IPI, we skip it */</div><div class='del'>-		if ((mpic-&gt;irq_offset + i) &gt;= (mpic-&gt;ipi_offset + i) &amp;&amp;</div><div class='del'>-		    (mpic-&gt;irq_offset + i) &lt;  (mpic-&gt;ipi_offset + i + 4))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* do senses munging */</div><div class='del'>-		if (mpic-&gt;senses &amp;&amp; i &lt; mpic-&gt;senses_count) {</div><div class='del'>-			if (mpic-&gt;senses[i] &amp; IRQ_SENSE_LEVEL)</div><div class='del'>-				vecpri |= MPIC_VECPRI_SENSE_LEVEL;</div><div class='del'>-			if (mpic-&gt;senses[i] &amp; IRQ_POLARITY_POSITIVE)</div><div class='del'>-				vecpri |= MPIC_VECPRI_POLARITY_POSITIVE;</div><div class='del'>-		} else</div><div class='del'>-			vecpri |= MPIC_VECPRI_SENSE_LEVEL;</div><div class='del'>-</div><div class='del'>-		/* remember if it was a level interrupts */</div><div class='del'>-		level = (vecpri &amp; MPIC_VECPRI_SENSE_LEVEL);</div><div class='del'>-</div><div class='del'>-		/* deal with broken U3 */</div><div class='del'>-		if (mpic-&gt;flags &amp; MPIC_BROKEN_U3) {</div><div class='del'>-#ifdef CONFIG_MPIC_BROKEN_U3</div><div class='del'>-			if (mpic_is_ht_interrupt(mpic, i)) {</div><div class='del'>-				vecpri &amp;= ~(MPIC_VECPRI_SENSE_MASK |</div><div class='del'>-					    MPIC_VECPRI_POLARITY_MASK);</div><div class='del'>-				vecpri |= MPIC_VECPRI_POLARITY_POSITIVE;</div><div class='del'>-			}</div><div class='del'>-#else</div><div class='del'>-			printk(KERN_ERR "mpic: BROKEN_U3 set, but CONFIG doesn't match\n");</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		DBG("setup source %d, vecpri: %08x, level: %d\n", i, vecpri,</div><div class='del'>-		    (level != 0));</div><div class='del'>-</div><div class='ctx'> 		/* init hw */</div><div class='ctx'> 		mpic_irq_write(i, MPIC_IRQ_VECTOR_PRI, vecpri);</div><div class='ctx'> 		mpic_irq_write(i, MPIC_IRQ_DESTINATION,</div><div class='ctx'> 			       1 &lt;&lt; hard_smp_processor_id());</div><div class='del'>-</div><div class='del'>-		/* init linux descriptors */</div><div class='del'>-		if (i &lt; mpic-&gt;irq_count) {</div><div class='del'>-			irq_desc[mpic-&gt;irq_offset+i].status = level ? IRQ_LEVEL : 0;</div><div class='del'>-			irq_desc[mpic-&gt;irq_offset+i].handler = &amp;mpic-&gt;hc_irq;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* Init spurrious vector */</div><div class='hunk'>@@ -829,25 +957,49 @@ void __init mpic_init(struct mpic *mpic)</div><div class='ctx'> 	mpic_cpu_write(MPIC_CPU_CURRENT_TASK_PRI, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __init mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	v = mpic_read(mpic-&gt;gregs, MPIC_GREG_GLOBAL_CONF_1);</div><div class='add'>+	v &amp;= ~MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO_MASK;</div><div class='add'>+	v |= MPIC_GREG_GLOBAL_CONF_1_CLK_RATIO(clock_ratio);</div><div class='add'>+	mpic_write(mpic-&gt;gregs, MPIC_GREG_GLOBAL_CONF_1, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init mpic_set_serial_int(struct mpic *mpic, int enable)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 v;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;mpic_lock, flags);</div><div class='add'>+	v = mpic_read(mpic-&gt;gregs, MPIC_GREG_GLOBAL_CONF_1);</div><div class='add'>+	if (enable)</div><div class='add'>+		v |= MPIC_GREG_GLOBAL_CONF_1_SIE;</div><div class='add'>+	else</div><div class='add'>+		v &amp;= ~MPIC_GREG_GLOBAL_CONF_1_SIE;</div><div class='add'>+	mpic_write(mpic-&gt;gregs, MPIC_GREG_GLOBAL_CONF_1, v);</div><div class='add'>+	spin_unlock_irqrestore(&amp;mpic_lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> void mpic_irq_set_priority(unsigned int irq, unsigned int pri)</div><div class='ctx'> {</div><div class='ctx'> 	int is_ipi;</div><div class='ctx'> 	struct mpic *mpic = mpic_find(irq, &amp;is_ipi);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mpic_lock, flags);</div><div class='ctx'> 	if (is_ipi) {</div><div class='del'>-		reg = mpic_ipi_read(irq - mpic-&gt;ipi_offset) &amp;</div><div class='add'>+		reg = mpic_ipi_read(src - MPIC_VEC_IPI_0) &amp;</div><div class='ctx'> 			~MPIC_VECPRI_PRIORITY_MASK;</div><div class='del'>-		mpic_ipi_write(irq - mpic-&gt;ipi_offset,</div><div class='add'>+		mpic_ipi_write(src - MPIC_VEC_IPI_0,</div><div class='ctx'> 			       reg | (pri &lt;&lt; MPIC_VECPRI_PRIORITY_SHIFT));</div><div class='ctx'> 	} else {</div><div class='del'>-		reg = mpic_irq_read(irq - mpic-&gt;irq_offset,MPIC_IRQ_VECTOR_PRI)</div><div class='add'>+		reg = mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI)</div><div class='ctx'> 			&amp; ~MPIC_VECPRI_PRIORITY_MASK;</div><div class='del'>-		mpic_irq_write(irq - mpic-&gt;irq_offset, MPIC_IRQ_VECTOR_PRI,</div><div class='add'>+		mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI,</div><div class='ctx'> 			       reg | (pri &lt;&lt; MPIC_VECPRI_PRIORITY_SHIFT));</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mpic_lock, flags);</div><div class='hunk'>@@ -857,14 +1009,15 @@ unsigned int mpic_irq_get_priority(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	int is_ipi;</div><div class='ctx'> 	struct mpic *mpic = mpic_find(irq, &amp;is_ipi);</div><div class='add'>+	unsigned int src = mpic_irq_to_hw(irq);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mpic_lock, flags);</div><div class='ctx'> 	if (is_ipi)</div><div class='del'>-		reg = mpic_ipi_read(irq - mpic-&gt;ipi_offset);</div><div class='add'>+		reg = mpic_ipi_read(src = MPIC_VEC_IPI_0);</div><div class='ctx'> 	else</div><div class='del'>-		reg = mpic_irq_read(irq - mpic-&gt;irq_offset, MPIC_IRQ_VECTOR_PRI);</div><div class='add'>+		reg = mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;mpic_lock, flags);</div><div class='ctx'> 	return (reg &amp; MPIC_VECPRI_PRIORITY_MASK) &gt;&gt; MPIC_VECPRI_PRIORITY_SHIFT;</div><div class='ctx'> }</div><div class='hunk'>@@ -886,7 +1039,7 @@ void mpic_setup_this_cpu(void)</div><div class='ctx'>  	/* let the mpic know we want intrs. default affinity is 0xffffffff</div><div class='ctx'> 	 * until changed via /proc. That's how it's done on x86. If we want</div><div class='ctx'> 	 * it differently, then we should make sure we also change the default</div><div class='del'>-	 * values of irq_affinity in irq.c.</div><div class='add'>+	 * values of irq_desc[].affinity in irq.c.</div><div class='ctx'>  	 */</div><div class='ctx'> 	if (distribute_irqs) {</div><div class='ctx'> 	 	for (i = 0; i &lt; mpic-&gt;num_sources ; i++)</div><div class='hunk'>@@ -959,37 +1112,20 @@ void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask)</div><div class='ctx'> 		       mpic_physmask(cpu_mask &amp; cpus_addr(cpu_online_map)[0]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs)</div><div class='add'>+unsigned int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	u32 irq;</div><div class='add'>+	u32 src;</div><div class='ctx'> </div><div class='del'>-	irq = mpic_cpu_read(MPIC_CPU_INTACK) &amp; MPIC_VECPRI_VECTOR_MASK;</div><div class='add'>+	src = mpic_cpu_read(MPIC_CPU_INTACK) &amp; MPIC_VECPRI_VECTOR_MASK;</div><div class='ctx'> #ifdef DEBUG_LOW</div><div class='del'>-	DBG("%s: get_one_irq(): %d\n", mpic-&gt;name, irq);</div><div class='add'>+	DBG("%s: get_one_irq(): %d\n", mpic-&gt;name, src);</div><div class='ctx'> #endif</div><div class='del'>-	if (mpic-&gt;cascade &amp;&amp; irq == mpic-&gt;cascade_vec) {</div><div class='del'>-#ifdef DEBUG_LOW</div><div class='del'>-		DBG("%s: cascading ...\n", mpic-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		irq = mpic-&gt;cascade(regs, mpic-&gt;cascade_data);</div><div class='del'>-		mpic_eoi(mpic);</div><div class='del'>-		return irq;</div><div class='del'>-	}</div><div class='del'>-	if (unlikely(irq == MPIC_VEC_SPURRIOUS))</div><div class='del'>-		return -1;</div><div class='del'>-	if (irq &lt; MPIC_VEC_IPI_0) {</div><div class='del'>-#ifdef DEBUG_IRQ</div><div class='del'>-		DBG("%s: irq %d\n", mpic-&gt;name, irq + mpic-&gt;irq_offset);</div><div class='del'>-#endif</div><div class='del'>-		return irq + mpic-&gt;irq_offset;</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG_IPI</div><div class='del'>-       	DBG("%s: ipi %d !\n", mpic-&gt;name, irq - MPIC_VEC_IPI_0);</div><div class='del'>-#endif</div><div class='del'>-	return irq - MPIC_VEC_IPI_0 + mpic-&gt;ipi_offset;</div><div class='add'>+	if (unlikely(src == MPIC_VEC_SPURRIOUS))</div><div class='add'>+		return NO_IRQ;</div><div class='add'>+	return irq_linear_revmap(mpic-&gt;irqhost, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mpic_get_irq(struct pt_regs *regs)</div><div class='add'>+unsigned int mpic_get_irq(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic = mpic_primary;</div><div class='ctx'> </div><div class='hunk'>@@ -1003,22 +1139,27 @@ int mpic_get_irq(struct pt_regs *regs)</div><div class='ctx'> void mpic_request_ipis(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mpic *mpic = mpic_primary;</div><div class='del'>-</div><div class='add'>+	int i;</div><div class='add'>+	static char *ipi_names[] = {</div><div class='add'>+		"IPI0 (call function)",</div><div class='add'>+		"IPI1 (reschedule)",</div><div class='add'>+		"IPI2 (unused)",</div><div class='add'>+		"IPI3 (debugger break)",</div><div class='add'>+	};</div><div class='ctx'> 	BUG_ON(mpic == NULL);</div><div class='del'>-	</div><div class='del'>-	printk("requesting IPIs ... \n");</div><div class='del'>-</div><div class='del'>-	/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */</div><div class='del'>-	request_irq(mpic-&gt;ipi_offset+0, mpic_ipi_action, SA_INTERRUPT,</div><div class='del'>-		    "IPI0 (call function)", mpic);</div><div class='del'>-	request_irq(mpic-&gt;ipi_offset+1, mpic_ipi_action, SA_INTERRUPT,</div><div class='del'>-		   "IPI1 (reschedule)", mpic);</div><div class='del'>-	request_irq(mpic-&gt;ipi_offset+2, mpic_ipi_action, SA_INTERRUPT,</div><div class='del'>-		   "IPI2 (unused)", mpic);</div><div class='del'>-	request_irq(mpic-&gt;ipi_offset+3, mpic_ipi_action, SA_INTERRUPT,</div><div class='del'>-		   "IPI3 (debugger break)", mpic);</div><div class='del'>-</div><div class='del'>-	printk("IPIs requested... \n");</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "mpic: requesting IPIs ... \n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		unsigned int vipi = irq_create_mapping(mpic-&gt;irqhost,</div><div class='add'>+						       MPIC_VEC_IPI_0 + i);</div><div class='add'>+		if (vipi == NO_IRQ) {</div><div class='add'>+			printk(KERN_ERR "Failed to map IPI %d\n", i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		request_irq(vipi, mpic_ipi_action, IRQF_DISABLED,</div><div class='add'>+			    ipi_names[i], mpic);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void smp_mpic_message_pass(int target, int msg)</div><div class='head'>diff --git a/arch/powerpc/sysdev/todc.c b/arch/powerpc/sysdev/todc.c<br/>new file mode 100644<br/>index 000000000000..0a65980efb50<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/todc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/todc.c</a></div><div class='hunk'>@@ -0,0 +1,392 @@</div><div class='add'>+/*</div><div class='add'>+ * Time of Day Clock support for the M48T35, M48T37, M48T59, and MC146818</div><div class='add'>+ * Real Time Clocks/Timekeepers.</div><div class='add'>+ *</div><div class='add'>+ * Author: Mark A. Greer &lt;mgreer@mvista.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * 2001-2004 (c) MontaVista, Software, Inc.  This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2.  This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/mc146818rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/time.h&gt;</div><div class='add'>+#include &lt;asm/todc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Depending on the hardware on your board and your board design, the</div><div class='add'>+ * RTC/NVRAM may be accessed either directly (like normal memory) or via</div><div class='add'>+ * address/data registers.  If your board uses the direct method, set</div><div class='add'>+ * 'nvram_data' to the base address of your nvram and leave 'nvram_as0' and</div><div class='add'>+ * 'nvram_as1' NULL.  If your board uses address/data regs to access nvram,</div><div class='add'>+ * set 'nvram_as0' to the address of the lower byte, set 'nvram_as1' to the</div><div class='add'>+ * address of the upper byte (leave NULL if using mc146818), and set</div><div class='add'>+ * 'nvram_data' to the address of the 8-bit data register.</div><div class='add'>+ *</div><div class='add'>+ * Note: Even though the documentation for the various RTC chips say that it</div><div class='add'>+ * 	 take up to a second before it starts updating once the 'R' bit is</div><div class='add'>+ * 	 cleared, they always seem to update even though we bang on it many</div><div class='add'>+ * 	 times a second.  This is true, except for the Dallas Semi 1746/1747</div><div class='add'>+ * 	 (possibly others).  Those chips seem to have a real problem whenever</div><div class='add'>+ * 	 we set the 'R' bit before reading them, they basically stop counting.</div><div class='add'>+ * 	 					--MAG</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 'todc_info' should be initialized in your *_setup.c file to</div><div class='add'>+ * point to a fully initialized 'todc_info_t' structure.</div><div class='add'>+ * This structure holds all the register offsets for your particular</div><div class='add'>+ * TODC/RTC chip.</div><div class='add'>+ * TODC_ALLOC()/TODC_INIT() will allocate and initialize this table for you.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef	RTC_FREQ_SELECT</div><div class='add'>+#undef	RTC_FREQ_SELECT</div><div class='add'>+#define	RTC_FREQ_SELECT		control_b	/* Register A */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef	RTC_CONTROL</div><div class='add'>+#undef	RTC_CONTROL</div><div class='add'>+#define	RTC_CONTROL		control_a	/* Register B */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef	RTC_INTR_FLAGS</div><div class='add'>+#undef	RTC_INTR_FLAGS</div><div class='add'>+#define	RTC_INTR_FLAGS		watchdog	/* Register C */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef	RTC_VALID</div><div class='add'>+#undef	RTC_VALID</div><div class='add'>+#define	RTC_VALID		interrupts	/* Register D */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Access routines when RTC accessed directly (like normal memory) */</div><div class='add'>+u_char</div><div class='add'>+todc_direct_read_val(int addr)</div><div class='add'>+{</div><div class='add'>+	return readb((void __iomem *)(todc_info-&gt;nvram_data + addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+todc_direct_write_val(int addr, unsigned char val)</div><div class='add'>+{</div><div class='add'>+	writeb(val, (void __iomem *)(todc_info-&gt;nvram_data + addr));</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Access routines for accessing m48txx type chips via addr/data regs */</div><div class='add'>+u_char</div><div class='add'>+todc_m48txx_read_val(int addr)</div><div class='add'>+{</div><div class='add'>+	outb(addr, todc_info-&gt;nvram_as0);</div><div class='add'>+	outb(addr&gt;&gt;todc_info-&gt;as0_bits, todc_info-&gt;nvram_as1);</div><div class='add'>+	return inb(todc_info-&gt;nvram_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+todc_m48txx_write_val(int addr, unsigned char val)</div><div class='add'>+{</div><div class='add'>+	outb(addr, todc_info-&gt;nvram_as0);</div><div class='add'>+	outb(addr&gt;&gt;todc_info-&gt;as0_bits, todc_info-&gt;nvram_as1);</div><div class='add'>+	outb(val, todc_info-&gt;nvram_data);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Access routines for accessing mc146818 type chips via addr/data regs */</div><div class='add'>+u_char</div><div class='add'>+todc_mc146818_read_val(int addr)</div><div class='add'>+{</div><div class='add'>+	outb_p(addr, todc_info-&gt;nvram_as0);</div><div class='add'>+	return inb_p(todc_info-&gt;nvram_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+todc_mc146818_write_val(int addr, unsigned char val)</div><div class='add'>+{</div><div class='add'>+	outb_p(addr, todc_info-&gt;nvram_as0);</div><div class='add'>+	outb_p(val, todc_info-&gt;nvram_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Routines to make RTC chips with NVRAM buried behind an addr/data pair</div><div class='add'>+ * have the NVRAM and clock regs appear at the same level.</div><div class='add'>+ * The NVRAM will appear to start at addr 0 and the clock regs will appear</div><div class='add'>+ * to start immediately after the NVRAM (actually, start at offset</div><div class='add'>+ * todc_info-&gt;nvram_size).</div><div class='add'>+ */</div><div class='add'>+static inline u_char</div><div class='add'>+todc_read_val(int addr)</div><div class='add'>+{</div><div class='add'>+	u_char	val;</div><div class='add'>+</div><div class='add'>+	if (todc_info-&gt;sw_flags &amp; TODC_FLAG_2_LEVEL_NVRAM) {</div><div class='add'>+		if (addr &lt; todc_info-&gt;nvram_size) { /* NVRAM */</div><div class='add'>+			ppc_md.rtc_write_val(todc_info-&gt;nvram_addr_reg, addr);</div><div class='add'>+			val = ppc_md.rtc_read_val(todc_info-&gt;nvram_data_reg);</div><div class='add'>+		} else { /* Clock Reg */</div><div class='add'>+			addr -= todc_info-&gt;nvram_size;</div><div class='add'>+			val = ppc_md.rtc_read_val(addr);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		val = ppc_md.rtc_read_val(addr);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+todc_write_val(int addr, u_char val)</div><div class='add'>+{</div><div class='add'>+	if (todc_info-&gt;sw_flags &amp; TODC_FLAG_2_LEVEL_NVRAM) {</div><div class='add'>+		if (addr &lt; todc_info-&gt;nvram_size) { /* NVRAM */</div><div class='add'>+			ppc_md.rtc_write_val(todc_info-&gt;nvram_addr_reg, addr);</div><div class='add'>+			ppc_md.rtc_write_val(todc_info-&gt;nvram_data_reg, val);</div><div class='add'>+		} else { /* Clock Reg */</div><div class='add'>+			addr -= todc_info-&gt;nvram_size;</div><div class='add'>+			ppc_md.rtc_write_val(addr, val);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		ppc_md.rtc_write_val(addr, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TODC routines</div><div class='add'>+ *</div><div class='add'>+ * There is some ugly stuff in that there are assumptions for the mc146818.</div><div class='add'>+ *</div><div class='add'>+ * Assumptions:</div><div class='add'>+ *	- todc_info-&gt;control_a has the offset as mc146818 Register B reg</div><div class='add'>+ *	- todc_info-&gt;control_b has the offset as mc146818 Register A reg</div><div class='add'>+ *	- m48txx control reg's write enable or 'W' bit is same as</div><div class='add'>+ *	  mc146818 Register B 'SET' bit (i.e., 0x80)</div><div class='add'>+ *</div><div class='add'>+ * These assumptions were made to make the code simpler.</div><div class='add'>+ */</div><div class='add'>+long __init</div><div class='add'>+todc_time_init(void)</div><div class='add'>+{</div><div class='add'>+	u_char	cntl_b;</div><div class='add'>+</div><div class='add'>+	if (!ppc_md.rtc_read_val)</div><div class='add'>+		ppc_md.rtc_read_val = ppc_md.nvram_read_val;</div><div class='add'>+	if (!ppc_md.rtc_write_val)</div><div class='add'>+		ppc_md.rtc_write_val = ppc_md.nvram_write_val;</div><div class='add'>+</div><div class='add'>+	cntl_b = todc_read_val(todc_info-&gt;control_b);</div><div class='add'>+</div><div class='add'>+	if (todc_info-&gt;rtc_type == TODC_TYPE_MC146818) {</div><div class='add'>+		if ((cntl_b &amp; 0x70) != 0x20) {</div><div class='add'>+			printk(KERN_INFO "TODC real-time-clock was stopped."</div><div class='add'>+				"  Now starting...");</div><div class='add'>+			cntl_b &amp;= ~0x70;</div><div class='add'>+			cntl_b |= 0x20;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		todc_write_val(todc_info-&gt;control_b, cntl_b);</div><div class='add'>+	} else if (todc_info-&gt;rtc_type == TODC_TYPE_DS17285) {</div><div class='add'>+		u_char mode;</div><div class='add'>+</div><div class='add'>+		mode = todc_read_val(TODC_TYPE_DS17285_CNTL_A);</div><div class='add'>+		/* Make sure countdown clear is not set */</div><div class='add'>+		mode &amp;= ~0x40;</div><div class='add'>+		/* Enable oscillator, extended register set */</div><div class='add'>+		mode |= 0x30;</div><div class='add'>+		todc_write_val(TODC_TYPE_DS17285_CNTL_A, mode);</div><div class='add'>+</div><div class='add'>+	} else if (todc_info-&gt;rtc_type == TODC_TYPE_DS1501) {</div><div class='add'>+		u_char	month;</div><div class='add'>+</div><div class='add'>+		todc_info-&gt;enable_read = TODC_DS1501_CNTL_B_TE;</div><div class='add'>+		todc_info-&gt;enable_write = TODC_DS1501_CNTL_B_TE;</div><div class='add'>+</div><div class='add'>+		month = todc_read_val(todc_info-&gt;month);</div><div class='add'>+</div><div class='add'>+		if ((month &amp; 0x80) == 0x80) {</div><div class='add'>+			printk(KERN_INFO "TODC %s %s\n",</div><div class='add'>+				"real-time-clock was stopped.",</div><div class='add'>+				"Now starting...");</div><div class='add'>+			month &amp;= ~0x80;</div><div class='add'>+			todc_write_val(todc_info-&gt;month, month);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cntl_b &amp;= ~TODC_DS1501_CNTL_B_TE;</div><div class='add'>+		todc_write_val(todc_info-&gt;control_b, cntl_b);</div><div class='add'>+	} else { /* must be a m48txx type */</div><div class='add'>+		u_char	cntl_a;</div><div class='add'>+</div><div class='add'>+		todc_info-&gt;enable_read = TODC_MK48TXX_CNTL_A_R;</div><div class='add'>+		todc_info-&gt;enable_write = TODC_MK48TXX_CNTL_A_W;</div><div class='add'>+</div><div class='add'>+		cntl_a = todc_read_val(todc_info-&gt;control_a);</div><div class='add'>+</div><div class='add'>+		/* Check &amp; clear STOP bit in control B register */</div><div class='add'>+		if (cntl_b &amp; TODC_MK48TXX_DAY_CB) {</div><div class='add'>+			printk(KERN_INFO "TODC %s %s\n",</div><div class='add'>+				"real-time-clock was stopped.",</div><div class='add'>+				"Now starting...");</div><div class='add'>+</div><div class='add'>+			cntl_a |= todc_info-&gt;enable_write;</div><div class='add'>+			cntl_b &amp;= ~TODC_MK48TXX_DAY_CB;/* Start Oscil */</div><div class='add'>+</div><div class='add'>+			todc_write_val(todc_info-&gt;control_a, cntl_a);</div><div class='add'>+			todc_write_val(todc_info-&gt;control_b, cntl_b);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Make sure READ &amp; WRITE bits are cleared. */</div><div class='add'>+		cntl_a &amp;= ~(todc_info-&gt;enable_write | todc_info-&gt;enable_read);</div><div class='add'>+		todc_write_val(todc_info-&gt;control_a, cntl_a);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * There is some ugly stuff in that there are assumptions that for a mc146818,</div><div class='add'>+ * the todc_info-&gt;control_a has the offset of the mc146818 Register B reg and</div><div class='add'>+ * that the register'ss 'SET' bit is the same as the m48txx's write enable</div><div class='add'>+ * bit in the control register of the m48txx (i.e., 0x80).</div><div class='add'>+ *</div><div class='add'>+ * It was done to make the code look simpler.</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+todc_get_rtc_time(struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	uint	year = 0, mon = 0, mday = 0, hour = 0, min = 0, sec = 0;</div><div class='add'>+	uint	limit, i;</div><div class='add'>+	u_char	save_control, uip = 0;</div><div class='add'>+	extern void GregorianDay(struct rtc_time *);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rtc_lock);</div><div class='add'>+	save_control = todc_read_val(todc_info-&gt;control_a);</div><div class='add'>+</div><div class='add'>+	if (todc_info-&gt;rtc_type != TODC_TYPE_MC146818) {</div><div class='add'>+		limit = 1;</div><div class='add'>+</div><div class='add'>+		switch (todc_info-&gt;rtc_type) {</div><div class='add'>+		case TODC_TYPE_DS1553:</div><div class='add'>+		case TODC_TYPE_DS1557:</div><div class='add'>+		case TODC_TYPE_DS1743:</div><div class='add'>+		case TODC_TYPE_DS1746:	/* XXXX BAD HACK -&gt; FIX */</div><div class='add'>+		case TODC_TYPE_DS1747:</div><div class='add'>+		case TODC_TYPE_DS17285:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			todc_write_val(todc_info-&gt;control_a,</div><div class='add'>+				(save_control | todc_info-&gt;enable_read));</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		limit = 100000000;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;limit; i++) {</div><div class='add'>+		if (todc_info-&gt;rtc_type == TODC_TYPE_MC146818)</div><div class='add'>+			uip = todc_read_val(todc_info-&gt;RTC_FREQ_SELECT);</div><div class='add'>+</div><div class='add'>+		sec = todc_read_val(todc_info-&gt;seconds) &amp; 0x7f;</div><div class='add'>+		min = todc_read_val(todc_info-&gt;minutes) &amp; 0x7f;</div><div class='add'>+		hour = todc_read_val(todc_info-&gt;hours) &amp; 0x3f;</div><div class='add'>+		mday = todc_read_val(todc_info-&gt;day_of_month) &amp; 0x3f;</div><div class='add'>+		mon = todc_read_val(todc_info-&gt;month) &amp; 0x1f;</div><div class='add'>+		year = todc_read_val(todc_info-&gt;year) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		if (todc_info-&gt;rtc_type == TODC_TYPE_MC146818) {</div><div class='add'>+			uip |= todc_read_val(todc_info-&gt;RTC_FREQ_SELECT);</div><div class='add'>+			if ((uip &amp; RTC_UIP) == 0)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (todc_info-&gt;rtc_type != TODC_TYPE_MC146818) {</div><div class='add'>+		switch (todc_info-&gt;rtc_type) {</div><div class='add'>+		case TODC_TYPE_DS1553:</div><div class='add'>+		case TODC_TYPE_DS1557:</div><div class='add'>+		case TODC_TYPE_DS1743:</div><div class='add'>+		case TODC_TYPE_DS1746:	/* XXXX BAD HACK -&gt; FIX */</div><div class='add'>+		case TODC_TYPE_DS1747:</div><div class='add'>+		case TODC_TYPE_DS17285:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			save_control &amp;= ~(todc_info-&gt;enable_read);</div><div class='add'>+			todc_write_val(todc_info-&gt;control_a, save_control);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;rtc_lock);</div><div class='add'>+</div><div class='add'>+	if ((todc_info-&gt;rtc_type != TODC_TYPE_MC146818)</div><div class='add'>+			|| ((save_control &amp; RTC_DM_BINARY) == 0)</div><div class='add'>+			|| RTC_ALWAYS_BCD) {</div><div class='add'>+		BCD_TO_BIN(sec);</div><div class='add'>+		BCD_TO_BIN(min);</div><div class='add'>+		BCD_TO_BIN(hour);</div><div class='add'>+		BCD_TO_BIN(mday);</div><div class='add'>+		BCD_TO_BIN(mon);</div><div class='add'>+		BCD_TO_BIN(year);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((year + 1900) &lt; 1970) {</div><div class='add'>+		year += 100;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = sec;</div><div class='add'>+	tm-&gt;tm_min = min;</div><div class='add'>+	tm-&gt;tm_hour = hour;</div><div class='add'>+	tm-&gt;tm_mday = mday;</div><div class='add'>+	tm-&gt;tm_mon = mon;</div><div class='add'>+	tm-&gt;tm_year = year;</div><div class='add'>+</div><div class='add'>+	GregorianDay(tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+todc_set_rtc_time(struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	u_char save_control, save_freq_select = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rtc_lock);</div><div class='add'>+	save_control = todc_read_val(todc_info-&gt;control_a);</div><div class='add'>+</div><div class='add'>+	/* Assuming MK48T59_RTC_CA_WRITE &amp; RTC_SET are equal */</div><div class='add'>+	todc_write_val(todc_info-&gt;control_a,</div><div class='add'>+		(save_control | todc_info-&gt;enable_write));</div><div class='add'>+	save_control &amp;= ~(todc_info-&gt;enable_write); /* in case it was set */</div><div class='add'>+</div><div class='add'>+	if (todc_info-&gt;rtc_type == TODC_TYPE_MC146818) {</div><div class='add'>+		save_freq_select = todc_read_val(todc_info-&gt;RTC_FREQ_SELECT);</div><div class='add'>+		todc_write_val(todc_info-&gt;RTC_FREQ_SELECT,</div><div class='add'>+			save_freq_select | RTC_DIV_RESET2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((todc_info-&gt;rtc_type != TODC_TYPE_MC146818)</div><div class='add'>+			|| ((save_control &amp; RTC_DM_BINARY) == 0)</div><div class='add'>+			|| RTC_ALWAYS_BCD) {</div><div class='add'>+		BIN_TO_BCD(tm-&gt;tm_sec);</div><div class='add'>+		BIN_TO_BCD(tm-&gt;tm_min);</div><div class='add'>+		BIN_TO_BCD(tm-&gt;tm_hour);</div><div class='add'>+		BIN_TO_BCD(tm-&gt;tm_mon);</div><div class='add'>+		BIN_TO_BCD(tm-&gt;tm_mday);</div><div class='add'>+		BIN_TO_BCD(tm-&gt;tm_year);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	todc_write_val(todc_info-&gt;seconds, tm-&gt;tm_sec);</div><div class='add'>+	todc_write_val(todc_info-&gt;minutes, tm-&gt;tm_min);</div><div class='add'>+	todc_write_val(todc_info-&gt;hours, tm-&gt;tm_hour);</div><div class='add'>+	todc_write_val(todc_info-&gt;month, tm-&gt;tm_mon);</div><div class='add'>+	todc_write_val(todc_info-&gt;day_of_month, tm-&gt;tm_mday);</div><div class='add'>+	todc_write_val(todc_info-&gt;year, tm-&gt;tm_year);</div><div class='add'>+</div><div class='add'>+	todc_write_val(todc_info-&gt;control_a, save_control);</div><div class='add'>+</div><div class='add'>+	if (todc_info-&gt;rtc_type == TODC_TYPE_MC146818)</div><div class='add'>+		todc_write_val(todc_info-&gt;RTC_FREQ_SELECT, save_freq_select);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;rtc_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c<br/>new file mode 100644<br/>index 000000000000..26a0cc820cde<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/tsi108_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/tsi108_dev.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+/*</div><div class='add'>+ * tsi108/109 device setup code</div><div class='add'>+ *</div><div class='add'>+ * Maintained by Roy Zang &lt; tie-fei.zang@freescale.com &gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/major.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/tsi108.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;mm/mmu_decl.h&gt;</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG(fmt...) do { printk(fmt); } while(0)</div><div class='add'>+#else</div><div class='add'>+#define DBG(fmt...) do { } while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static phys_addr_t tsi108_csr_base = -1;</div><div class='add'>+</div><div class='add'>+phys_addr_t get_csrbase(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *tsi;</div><div class='add'>+</div><div class='add'>+	if (tsi108_csr_base != -1)</div><div class='add'>+		return tsi108_csr_base;</div><div class='add'>+</div><div class='add'>+	tsi = of_find_node_by_type(NULL, "tsi-bridge");</div><div class='add'>+	if (tsi) {</div><div class='add'>+		unsigned int size;</div><div class='add'>+		void *prop = get_property(tsi, "reg", &amp;size);</div><div class='add'>+		tsi108_csr_base = of_translate_address(tsi, prop);</div><div class='add'>+		of_node_put(tsi);</div><div class='add'>+	};</div><div class='add'>+	return tsi108_csr_base;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 get_vir_csrbase(void)</div><div class='add'>+{</div><div class='add'>+	return (u32) (ioremap(get_csrbase(), 0x10000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(get_csrbase);</div><div class='add'>+EXPORT_SYMBOL(get_vir_csrbase);</div><div class='add'>+</div><div class='add'>+static int __init tsi108_eth_of_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	struct platform_device *tsi_eth_dev;</div><div class='add'>+	struct resource res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (np = NULL, i = 0;</div><div class='add'>+	     (np = of_find_compatible_node(np, "network", "tsi-ethernet")) != NULL;</div><div class='add'>+	     i++) {</div><div class='add'>+		struct resource r[2];</div><div class='add'>+		struct device_node *phy;</div><div class='add'>+		hw_info tsi_eth_data;</div><div class='add'>+		unsigned int *id;</div><div class='add'>+		unsigned int *phy_id;</div><div class='add'>+		void *mac_addr;</div><div class='add'>+		phandle *ph;</div><div class='add'>+</div><div class='add'>+		memset(r, 0, sizeof(r));</div><div class='add'>+		memset(&amp;tsi_eth_data, 0, sizeof(tsi_eth_data));</div><div class='add'>+</div><div class='add'>+		ret = of_address_to_resource(np, 0, &amp;r[0]);</div><div class='add'>+		DBG("%s: name:start-&gt;end = %s:0x%lx-&gt; 0x%lx\n",</div><div class='add'>+			__FUNCTION__,r[0].name, r[0].start, r[0].end);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		r[1].name = "tx";</div><div class='add'>+		r[1].start = np-&gt;intrs[0].line;</div><div class='add'>+		r[1].end = np-&gt;intrs[0].line;</div><div class='add'>+		r[1].flags = IORESOURCE_IRQ;</div><div class='add'>+</div><div class='add'>+		tsi_eth_dev =</div><div class='add'>+		    platform_device_register_simple("tsi-ethernet", i, &amp;r[0],</div><div class='add'>+						    np-&gt;n_intrs + 1);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(tsi_eth_dev)) {</div><div class='add'>+			ret = PTR_ERR(tsi_eth_dev);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mac_addr = get_property(np, "address", NULL);</div><div class='add'>+		memcpy(tsi_eth_data.mac_addr, mac_addr, 6);</div><div class='add'>+</div><div class='add'>+		ph = (phandle *) get_property(np, "phy-handle", NULL);</div><div class='add'>+		phy = of_find_node_by_phandle(*ph);</div><div class='add'>+</div><div class='add'>+		if (phy == NULL) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto unreg;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		id = (u32 *) get_property(phy, "reg", NULL);</div><div class='add'>+		phy_id = (u32 *) get_property(phy, "phy-id", NULL);</div><div class='add'>+		ret = of_address_to_resource(phy, 0, &amp;res);</div><div class='add'>+		if (ret) {</div><div class='add'>+			of_node_put(phy);</div><div class='add'>+			goto unreg;</div><div class='add'>+		}</div><div class='add'>+		tsi_eth_data.regs = r[0].start;</div><div class='add'>+		tsi_eth_data.phyregs = res.start;</div><div class='add'>+		tsi_eth_data.phy = *phy_id;</div><div class='add'>+		tsi_eth_data.irq_num = np-&gt;intrs[0].line;</div><div class='add'>+		of_node_put(phy);</div><div class='add'>+		ret =</div><div class='add'>+		    platform_device_add_data(tsi_eth_dev, &amp;tsi_eth_data,</div><div class='add'>+					     sizeof(hw_info));</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unreg;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+unreg:</div><div class='add'>+	platform_device_unregister(tsi_eth_dev);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+arch_initcall(tsi108_eth_of_init);</div><div class='head'>diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c<br/>new file mode 100644<br/>index 000000000000..3265d54c82ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/sysdev/tsi108_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/sysdev/tsi108_pci.c</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+/*</div><div class='add'>+ * Common routines for Tundra Semiconductor TSI108 host bridge.</div><div class='add'>+ *</div><div class='add'>+ * 2004-2005 (c) Tundra Semiconductor Corp.</div><div class='add'>+ * Author: Alex Bounine (alexandreb@tundra.com)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#include &lt;asm/pci-bridge.h&gt;</div><div class='add'>+#include &lt;asm/tsi108.h&gt;</div><div class='add'>+#include &lt;asm/tsi108_irq.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define DBG(x...) printk(x)</div><div class='add'>+#else</div><div class='add'>+#define DBG(x...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define tsi_mk_config_addr(bus, devfunc, offset) \</div><div class='add'>+	((((bus)&lt;&lt;16) | ((devfunc)&lt;&lt;8) | (offset &amp; 0xfc)) + tsi108_pci_cfg_base)</div><div class='add'>+</div><div class='add'>+u32 tsi108_pci_cfg_base;</div><div class='add'>+u32 tsi108_csr_vir_base;</div><div class='add'>+</div><div class='add'>+extern u32 get_vir_csrbase(void);</div><div class='add'>+extern u32 tsi108_read_reg(u32 reg_offset);</div><div class='add'>+extern void tsi108_write_reg(u32 reg_offset, u32 val);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+tsi108_direct_write_config(struct pci_bus *bus, unsigned int devfunc,</div><div class='add'>+			   int offset, int len, u32 val)</div><div class='add'>+{</div><div class='add'>+	volatile unsigned char *cfg_addr;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.pci_exclude_device)</div><div class='add'>+		if (ppc_md.pci_exclude_device(bus-&gt;number, devfunc))</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	cfg_addr = (unsigned char *)(tsi_mk_config_addr(bus-&gt;number,</div><div class='add'>+							devfunc, offset) |</div><div class='add'>+							(offset &amp; 0x03));</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	printk("PCI CFG write : ");</div><div class='add'>+	printk("%d:0x%x:0x%x ", bus-&gt;number, devfunc, offset);</div><div class='add'>+	printk("%d ADDR=0x%08x ", len, (uint) cfg_addr);</div><div class='add'>+	printk("data = 0x%08x\n", val);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		out_8((u8 *) cfg_addr, val);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		out_le16((u16 *) cfg_addr, val);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		out_le32((u32 *) cfg_addr, val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsi108_clear_pci_error(u32 pci_cfg_base)</div><div class='add'>+{</div><div class='add'>+	u32 err_stat, err_addr, pci_stat;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Quietly clear PB and PCI error flags set as result</div><div class='add'>+	 * of PCI/X configuration read requests.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Read PB Error Log Registers */</div><div class='add'>+</div><div class='add'>+	err_stat = tsi108_read_reg(TSI108_PB_OFFSET + TSI108_PB_ERRCS);</div><div class='add'>+	err_addr = tsi108_read_reg(TSI108_PB_OFFSET + TSI108_PB_AERR);</div><div class='add'>+</div><div class='add'>+	if (err_stat &amp; TSI108_PB_ERRCS_ES) {</div><div class='add'>+		/* Clear error flag */</div><div class='add'>+		tsi108_write_reg(TSI108_PB_OFFSET + TSI108_PB_ERRCS,</div><div class='add'>+				 TSI108_PB_ERRCS_ES);</div><div class='add'>+</div><div class='add'>+		/* Clear read error reported in PB_ISR */</div><div class='add'>+		tsi108_write_reg(TSI108_PB_OFFSET + TSI108_PB_ISR,</div><div class='add'>+				 TSI108_PB_ISR_PBS_RD_ERR);</div><div class='add'>+</div><div class='add'>+		/* Clear PCI/X bus cfg errors if applicable */</div><div class='add'>+		if ((err_addr &amp; 0xFF000000) == pci_cfg_base) {</div><div class='add'>+			pci_stat =</div><div class='add'>+			    tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_CSR);</div><div class='add'>+			tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_CSR,</div><div class='add'>+					 pci_stat);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __tsi108_read_pci_config(x, addr, op)		\</div><div class='add'>+	__asm__ __volatile__(				\</div><div class='add'>+		"	"op" %0,0,%1\n"		\</div><div class='add'>+		"1:	eieio\n"			\</div><div class='add'>+		"2:\n"					\</div><div class='add'>+		".section .fixup,\"ax\"\n"		\</div><div class='add'>+		"3:	li %0,-1\n"			\</div><div class='add'>+		"	b 2b\n"				\</div><div class='add'>+		".section __ex_table,\"a\"\n"		\</div><div class='add'>+		"	.align 2\n"			\</div><div class='add'>+		"	.long 1b,3b\n"			\</div><div class='add'>+		".text"					\</div><div class='add'>+		: "=r"(x) : "r"(addr))</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+tsi108_direct_read_config(struct pci_bus *bus, unsigned int devfn, int offset,</div><div class='add'>+			  int len, u32 * val)</div><div class='add'>+{</div><div class='add'>+	volatile unsigned char *cfg_addr;</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	if (ppc_md.pci_exclude_device)</div><div class='add'>+		if (ppc_md.pci_exclude_device(bus-&gt;number, devfn))</div><div class='add'>+			return PCIBIOS_DEVICE_NOT_FOUND;</div><div class='add'>+</div><div class='add'>+	cfg_addr = (unsigned char *)(tsi_mk_config_addr(bus-&gt;number,</div><div class='add'>+							devfn,</div><div class='add'>+							offset) | (offset &amp;</div><div class='add'>+								   0x03));</div><div class='add'>+</div><div class='add'>+	switch (len) {</div><div class='add'>+	case 1:</div><div class='add'>+		__tsi108_read_pci_config(temp, cfg_addr, "lbzx");</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		__tsi108_read_pci_config(temp, cfg_addr, "lhbrx");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		__tsi108_read_pci_config(temp, cfg_addr, "lwbrx");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = temp;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	if ((0xFFFFFFFF != temp) &amp;&amp; (0xFFFF != temp) &amp;&amp; (0xFF != temp)) {</div><div class='add'>+		printk("PCI CFG read : ");</div><div class='add'>+		printk("%d:0x%x:0x%x ", bus-&gt;number, devfn, offset);</div><div class='add'>+		printk("%d ADDR=0x%08x ", len, (uint) cfg_addr);</div><div class='add'>+		printk("data = 0x%x\n", *val);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return PCIBIOS_SUCCESSFUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsi108_clear_pci_cfg_error(void)</div><div class='add'>+{</div><div class='add'>+	tsi108_clear_pci_error(TSI108_PCI_CFG_BASE_PHYS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_ops tsi108_direct_pci_ops = {</div><div class='add'>+	tsi108_direct_read_config,</div><div class='add'>+	tsi108_direct_write_config</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init tsi108_setup_pci(struct device_node *dev)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	struct pci_controller *hose;</div><div class='add'>+	struct resource rsrc;</div><div class='add'>+	int *bus_range;</div><div class='add'>+	int primary = 0, has_address = 0;</div><div class='add'>+</div><div class='add'>+	/* PCI Config mapping */</div><div class='add'>+	tsi108_pci_cfg_base = (u32)ioremap(TSI108_PCI_CFG_BASE_PHYS,</div><div class='add'>+			TSI108_PCI_CFG_SIZE);</div><div class='add'>+	DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __FUNCTION__,</div><div class='add'>+	    tsi108_pci_cfg_base);</div><div class='add'>+</div><div class='add'>+	/* Fetch host bridge registers address */</div><div class='add'>+	has_address = (of_address_to_resource(dev, 0, &amp;rsrc) == 0);</div><div class='add'>+</div><div class='add'>+	/* Get bus range if any */</div><div class='add'>+	bus_range = (int *)get_property(dev, "bus-range", &amp;len);</div><div class='add'>+	if (bus_range == NULL || len &lt; 2 * sizeof(int)) {</div><div class='add'>+		printk(KERN_WARNING "Can't get bus-range for %s, assume"</div><div class='add'>+		       " bus 0\n", dev-&gt;full_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hose = pcibios_alloc_controller();</div><div class='add'>+</div><div class='add'>+	if (!hose) {</div><div class='add'>+		printk("PCI Host bridge init failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	hose-&gt;arch_data = dev;</div><div class='add'>+	hose-&gt;set_cfg_type = 1;</div><div class='add'>+</div><div class='add'>+	hose-&gt;first_busno = bus_range ? bus_range[0] : 0;</div><div class='add'>+	hose-&gt;last_busno = bus_range ? bus_range[1] : 0xff;</div><div class='add'>+</div><div class='add'>+	(hose)-&gt;ops = &amp;tsi108_direct_pci_ops;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Found tsi108 PCI host bridge at 0x%08lx. "</div><div class='add'>+	       "Firmware bus number: %d-&gt;%d\n",</div><div class='add'>+	       rsrc.start, hose-&gt;first_busno, hose-&gt;last_busno);</div><div class='add'>+</div><div class='add'>+	/* Interpret the "ranges" property */</div><div class='add'>+	/* This also maps the I/O region and sets isa_io/mem_base */</div><div class='add'>+	pci_process_bridge_OF_ranges(hose, dev, primary);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Low level utility functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void tsi108_pci_int_mask(u_int irq)</div><div class='add'>+{</div><div class='add'>+	u_int irp_cfg;</div><div class='add'>+	int int_line = (irq - IRQ_PCI_INTAD_BASE);</div><div class='add'>+</div><div class='add'>+	irp_cfg = tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL);</div><div class='add'>+	mb();</div><div class='add'>+	irp_cfg |= (1 &lt;&lt; int_line);	/* INTx_DIR = output */</div><div class='add'>+	irp_cfg &amp;= ~(3 &lt;&lt; (8 + (int_line * 2)));	/* INTx_TYPE = unused */</div><div class='add'>+	tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL, irp_cfg);</div><div class='add'>+	mb();</div><div class='add'>+	irp_cfg = tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsi108_pci_int_unmask(u_int irq)</div><div class='add'>+{</div><div class='add'>+	u_int irp_cfg;</div><div class='add'>+	int int_line = (irq - IRQ_PCI_INTAD_BASE);</div><div class='add'>+</div><div class='add'>+	irp_cfg = tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL);</div><div class='add'>+	mb();</div><div class='add'>+	irp_cfg &amp;= ~(1 &lt;&lt; int_line);</div><div class='add'>+	irp_cfg |= (3 &lt;&lt; (8 + (int_line * 2)));</div><div class='add'>+	tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL, irp_cfg);</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_pci_source(void)</div><div class='add'>+{</div><div class='add'>+	tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL,</div><div class='add'>+			0x0000ff00);</div><div class='add'>+	tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_ENABLE,</div><div class='add'>+			TSI108_PCI_IRP_ENABLE_P_INT);</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int get_pci_source(void)</div><div class='add'>+{</div><div class='add'>+	u_int temp = 0;</div><div class='add'>+	int irq = -1;</div><div class='add'>+	int i;</div><div class='add'>+	u_int pci_irp_stat;</div><div class='add'>+	static int mask = 0;</div><div class='add'>+</div><div class='add'>+	/* Read PCI/X block interrupt status register */</div><div class='add'>+	pci_irp_stat = tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_STAT);</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	if (pci_irp_stat &amp; TSI108_PCI_IRP_STAT_P_INT) {</div><div class='add'>+		/* Process Interrupt from PCI bus INTA# - INTD# lines */</div><div class='add'>+		temp =</div><div class='add'>+		    tsi108_read_reg(TSI108_PCI_OFFSET +</div><div class='add'>+				    TSI108_PCI_IRP_INTAD) &amp; 0xf;</div><div class='add'>+		mb();</div><div class='add'>+		for (i = 0; i &lt; 4; i++, mask++) {</div><div class='add'>+			if (temp &amp; (1 &lt;&lt; mask % 4)) {</div><div class='add'>+				irq = IRQ_PCI_INTA + mask % 4;</div><div class='add'>+				mask++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Disable interrupts from PCI block */</div><div class='add'>+		temp = tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_ENABLE);</div><div class='add'>+		tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_ENABLE,</div><div class='add'>+				temp &amp; ~TSI108_PCI_IRP_ENABLE_P_INT);</div><div class='add'>+		mb();</div><div class='add'>+		(void)tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_ENABLE);</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	else {</div><div class='add'>+		printk("TSI108_PIC: error in TSI108_PCI_IRP_STAT\n");</div><div class='add'>+		pci_irp_stat =</div><div class='add'>+		    tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_STAT);</div><div class='add'>+		temp =</div><div class='add'>+		    tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_INTAD);</div><div class='add'>+		mb();</div><div class='add'>+		printk("&gt;&gt; stat=0x%08x intad=0x%08x ", pci_irp_stat, temp);</div><div class='add'>+		temp =</div><div class='add'>+		    tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_CFG_CTL);</div><div class='add'>+		mb();</div><div class='add'>+		printk("cfg_ctl=0x%08x ", temp);</div><div class='add'>+		temp =</div><div class='add'>+		    tsi108_read_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_ENABLE);</div><div class='add'>+		mb();</div><div class='add'>+		printk("irp_enable=0x%08x\n", temp);</div><div class='add'>+	}</div><div class='add'>+#endif	/* end of DEBUG */</div><div class='add'>+</div><div class='add'>+	return irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Linux descriptor level callbacks</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void tsi108_pci_irq_enable(u_int irq)</div><div class='add'>+{</div><div class='add'>+	tsi108_pci_int_unmask(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsi108_pci_irq_disable(u_int irq)</div><div class='add'>+{</div><div class='add'>+	tsi108_pci_int_mask(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsi108_pci_irq_ack(u_int irq)</div><div class='add'>+{</div><div class='add'>+	tsi108_pci_int_mask(irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsi108_pci_irq_end(u_int irq)</div><div class='add'>+{</div><div class='add'>+	tsi108_pci_int_unmask(irq);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts from PCI block */</div><div class='add'>+	tsi108_write_reg(TSI108_PCI_OFFSET + TSI108_PCI_IRP_ENABLE,</div><div class='add'>+			 tsi108_read_reg(TSI108_PCI_OFFSET +</div><div class='add'>+					 TSI108_PCI_IRP_ENABLE) |</div><div class='add'>+			 TSI108_PCI_IRP_ENABLE_P_INT);</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Interrupt controller descriptor for cascaded PCI interrupt controller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct hw_interrupt_type tsi108_pci_irq = {</div><div class='add'>+	.typename = "tsi108_PCI_int",</div><div class='add'>+	.enable = tsi108_pci_irq_enable,</div><div class='add'>+	.disable = tsi108_pci_irq_disable,</div><div class='add'>+	.ack = tsi108_pci_irq_ack,</div><div class='add'>+	.end = tsi108_pci_irq_end,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Exported functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Tsi108 PCI interrupts initialization routine.</div><div class='add'>+ *</div><div class='add'>+ * The INTA# - INTD# interrupts on the PCI bus are reported by the PCI block</div><div class='add'>+ * to the MPIC using single interrupt source (IRQ_TSI108_PCI). Therefore the</div><div class='add'>+ * PCI block has to be treated as a cascaded interrupt controller connected</div><div class='add'>+ * to the MPIC.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void __init tsi108_pci_int_init(void)</div><div class='add'>+{</div><div class='add'>+	u_int i;</div><div class='add'>+</div><div class='add'>+	DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_PCI_IRQS; i++) {</div><div class='add'>+		irq_desc[i + IRQ_PCI_INTAD_BASE].handler = &amp;tsi108_pci_irq;</div><div class='add'>+		irq_desc[i + IRQ_PCI_INTAD_BASE].status |= IRQ_LEVEL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_pci_source();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsi108_irq_cascade(struct pt_regs *regs, void *unused)</div><div class='add'>+{</div><div class='add'>+	return get_pci_source();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c<br/>index 4735b41c113c..179b10ced8c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/powerpc/xmon/xmon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/powerpc/xmon/xmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/powerpc/xmon/xmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/powerpc/xmon/xmon.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *      as published by the Free Software Foundation; either version</div><div class='ctx'>  *      2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -26,9 +25,6 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/xmon.h&gt;</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-#include &lt;asm/backlight.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c<br/>index 98b25fa0049a..b81a367dc278 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/4xx_io/serial_sicc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/4xx_io/serial_sicc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/4xx_io/serial_sicc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/4xx_io/serial_sicc.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * is compatible with normal ttyS* devices.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -1758,7 +1757,7 @@ int __init siccuart_init(void)</div><div class='ctx'>     siccnormal_driver-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='ctx'>     siccnormal_driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'>     siccnormal_driver-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-    siccnormal_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+    siccnormal_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'>     tty_set_operations(siccnormal_driver, &amp;sicc_ops);</div><div class='ctx'> </div><div class='ctx'>     if (tty_register_driver(siccnormal_driver))</div><div class='head'>diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c<br/>index 4edeede9ccfd..e347fe88316d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8260_io/fcc_enet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8260_io/fcc_enet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8260_io/fcc_enet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8260_io/fcc_enet.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -2117,7 +2116,7 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> #ifdef	PHY_INTERRUPT</div><div class='ctx'> #ifdef CONFIG_ADS8272</div><div class='del'>-	if (request_irq(PHY_INTERRUPT, mii_link_interrupt, SA_SHIRQ,</div><div class='add'>+	if (request_irq(PHY_INTERRUPT, mii_link_interrupt, IRQF_SHARED,</div><div class='ctx'> 				"mii", dev) &lt; 0)</div><div class='ctx'> 		printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT);</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c<br/>index 12b84ca51327..9b3ace26280c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/commproc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/commproc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/commproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8xx_io/commproc.c</a></div><div class='hunk'>@@ -187,7 +187,7 @@ cpm_interrupt_init(void)</div><div class='ctx'>          * interrupt vectors</div><div class='ctx'>          */</div><div class='ctx'>         for ( i = CPM_IRQ_OFFSET ; i &lt; CPM_IRQ_OFFSET + NR_CPM_INTS ; i++ )</div><div class='del'>-                irq_desc[i].handler = &amp;cpm_pic;</div><div class='add'>+                irq_desc[i].chip = &amp;cpm_pic;</div><div class='ctx'> </div><div class='ctx'> 	/* Set our interrupt handler with the core CPU.	*/</div><div class='ctx'> 	if (setup_irq(CPM_INTERRUPT, &amp;cpm_interrupt_irqaction))</div><div class='head'>diff --git a/arch/ppc/8xx_io/cs4218.h b/arch/ppc/8xx_io/cs4218.h<br/>index f1c7392255f8..e5f943045afa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/cs4218.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/cs4218.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/cs4218.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8xx_io/cs4218.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #define _cs4218_h_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SND_NDEVS	256	/* Number of supported devices */</div><div class='ctx'> #define SND_DEV_CTL	0	/* Control port /dev/mixer */</div><div class='head'>diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c<br/>index a892356d5c3b..f5f300fc213d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/cs4218_tdm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/cs4218_tdm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/cs4218_tdm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8xx_io/cs4218_tdm.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c<br/>index ece6a9fbe09b..a695375c3e4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/enet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/enet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/enet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8xx_io/enet.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * small packets.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c<br/>index 62f68d6181c6..8b6295bbb564 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/fec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/fec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/fec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8xx_io/fec.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * Thomas Lange, thomas@corelatus.com</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/ppc/8xx_io/micropatch.c b/arch/ppc/8xx_io/micropatch.c<br/>index 312af0776c31..cfad46ba17e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/micropatch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/8xx_io/micropatch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/8xx_io/micropatch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/8xx_io/micropatch.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * also relocates SMC2, but this would require additional changes</div><div class='ctx'>  * to uart.c, so I am holding off on that for a moment.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig<br/>index e9a8f5d1dfcd..a04cdf01596b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/Kconfig</a></div><div class='hunk'>@@ -40,6 +40,10 @@ config GENERIC_NVRAM</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config GENERIC_FIND_NEXT_BIT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config SCHED_NO_NO_OMIT_FRAME_POINTER</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -215,10 +219,10 @@ config KEXEC</div><div class='ctx'> 	help</div><div class='ctx'> 	  kexec is a system call that implements the ability to shutdown your</div><div class='ctx'> 	  current kernel, and to start another kernel.  It is like a reboot</div><div class='del'>-	  but it is indepedent of the system firmware.   And like a reboot</div><div class='add'>+	  but it is independent of the system firmware.   And like a reboot</div><div class='ctx'> 	  you can start any kernel with it, not just Linux.</div><div class='ctx'> </div><div class='del'>-	  The name comes from the similiarity to the exec system call.</div><div class='add'>+	  The name comes from the similarity to the exec system call.</div><div class='ctx'> </div><div class='ctx'> 	  It is an ongoing process to be certain the hardware in a machine</div><div class='ctx'> 	  is properly shutdown, so do not be surprised if this code does not</div><div class='head'>diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c<br/>index b2bba052ab93..265fcd3c6ab2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/amiga/amiints.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/amiga/amiints.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/amiga/amiints.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/amiga/amiints.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  *           /Jes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c<br/>index bbe47c9bd707..bc50ed11957d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/amiga/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/amiga/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/amiga/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/amiga/config.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Miscellaneous Amiga stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/common/crt0.S b/arch/ppc/boot/common/crt0.S<br/>index 4d31b824bbd1..8f0ef04b8de5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/common/crt0.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/common/crt0.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/common/crt0.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/common/crt0.S</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *    2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='head'>diff --git a/arch/ppc/boot/common/misc-common.c b/arch/ppc/boot/common/misc-common.c<br/>index 073830a8559a..8e1fccd96fc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/common/misc-common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/common/misc-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/common/misc-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/common/misc-common.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;	/* for va_ bits */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/zlib.h&gt;</div><div class='ctx'> #include "nonstdio.h"</div><div class='head'>diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c<br/>index 4f00c93ac870..fc5b72041948 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/common/ns16550.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/common/ns16550.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/common/ns16550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/common/ns16550.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * COM1 NS16550 support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/lib/Makefile b/arch/ppc/boot/lib/Makefile<br/>index 80c84d562fa4..2f995f712ec5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/lib/Makefile</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> CFLAGS_kbd.o	:= -Idrivers/char</div><div class='ctx'> CFLAGS_vreset.o := -Iarch/ppc/boot/include</div><div class='ctx'> </div><div class='del'>-zlib  := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c</div><div class='add'>+zlib  := inffast.c inflate.c inftrees.c</div><div class='ctx'> 	 </div><div class='ctx'> lib-y += $(zlib:.c=.o) div64.o</div><div class='ctx'> lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o</div><div class='head'>diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c<br/>index 3a51b1062940..840bff2a45fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/embed_config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/embed_config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/embed_config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/embed_config.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #ifdef CONFIG_8xx</div><div class='head'>diff --git a/arch/ppc/boot/simple/head.S b/arch/ppc/boot/simple/head.S<br/>index 160da1006ff8..1b4d7b1d4ec1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/head.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/m8xx_tty.c b/arch/ppc/boot/simple/m8xx_tty.c<br/>index 1d2778e248c6..cacc40fdbcfa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/m8xx_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/m8xx_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/m8xx_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/m8xx_tty.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * use COM1 instead of SMC1 as the console port.  This kinda sucks</div><div class='ctx'>  * for the rest of the kernel, so here we force the use of SMC1 again.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mpc8xx.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-chestnut.c b/arch/ppc/boot/simple/misc-chestnut.c<br/>index b94e142ad892..14a4b56d4f84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-chestnut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-chestnut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-chestnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-chestnut.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mv64x60_defs.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-embedded.c b/arch/ppc/boot/simple/misc-embedded.c<br/>index 3865f3f8dcd1..10219eeca054 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-embedded.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-embedded.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-embedded.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-embedded.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Currently maintained by: Tom Rini &lt;trini@kernel.crashing.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-ev64260.c b/arch/ppc/boot/simple/misc-ev64260.c<br/>index 2678c224af22..0b3978632aca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-ev64260.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-ev64260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-ev64260.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-ev64260.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-ev64360.c b/arch/ppc/boot/simple/misc-ev64360.c<br/>index a212b5b988cb..96eaebb78df5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-ev64360.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-ev64360.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-ev64360.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-ev64360.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mv64x60_defs.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-katana.c b/arch/ppc/boot/simple/misc-katana.c<br/>index d97f2ee6f04e..79a1bbcbc6c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-katana.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-katana.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-katana.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-katana.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mv64x60_defs.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-mv64x60.c b/arch/ppc/boot/simple/misc-mv64x60.c<br/>index 71ff20fd494a..28b3108083ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-mv64x60.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-mv64x60.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-mv64x60.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-mv64x60.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mv64x60_defs.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-prep.c b/arch/ppc/boot/simple/misc-prep.c<br/>index 63def9d13d70..0086e1cfb48c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-prep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-prep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-prep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-prep.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * In the past: Gary Thomas, Cort Dougan &lt;cort@cs.nmt.edu&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/residual.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc-spruce.c b/arch/ppc/boot/simple/misc-spruce.c<br/>index 0cad2f557a1e..5b3a6c6f113b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-spruce.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc-spruce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc-spruce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc-spruce.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/bootinfo.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c<br/>index 3d78571ad945..a5df08963695 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/misc.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/mpc52xx_tty.c b/arch/ppc/boot/simple/mpc52xx_tty.c<br/>index 1964493cf3bd..7b5924cc3c02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/mpc52xx_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/mpc52xx_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/mpc52xx_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/mpc52xx_tty.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * "as is" without any warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mpc52xx.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/mv64x60_tty.c b/arch/ppc/boot/simple/mv64x60_tty.c<br/>index 0c52f5c784a2..781e040a97d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/mv64x60_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/mv64x60_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/mv64x60_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/mv64x60_tty.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> /* This code assumes that the data cache has been disabled (L1, L2, L3). */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;asm/serial.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/openbios.c b/arch/ppc/boot/simple/openbios.c<br/>index 3f2ed53f793a..6ff2701598f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/openbios.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/openbios.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/openbios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/openbios.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> #include &lt;asm/ibm4xx.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/pibs.c b/arch/ppc/boot/simple/pibs.c<br/>index 67222d57c345..f39d01e0619d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/pibs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/pibs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/pibs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/pibs.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='head'>diff --git a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S<br/>index 2533113c1cc5..0c021556d78e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/relocate.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/boot/simple/relocate.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/boot/simple/relocate.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/boot/simple/relocate.S</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/kernel/asm-offsets.c b/arch/ppc/kernel/asm-offsets.c<br/>index 2f5c5e157617..1f91eca2f3d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * #defines from the assembly-language output.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/cpu_setup_power4.S b/arch/ppc/kernel/cpu_setup_power4.S<br/>index d7bfd60e21fc..6a674e834eeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/cpu_setup_power4.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/cpu_setup_power4.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/cpu_setup_power4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/cpu_setup_power4.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/ppc_asm.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c<br/>index 61465ec88bc7..10fec7363962 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/dma-mapping.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/dma-mapping.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/dma-mapping.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/dma-mapping.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S<br/>index 1adc9145516f..a9d455369dc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/entry.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S<br/>index 01303efeddad..100052aaea9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/head.S</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S<br/>index 0d8b88219d38..7e44de5a26db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_44x.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_44x.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_44x.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/head_44x.S</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S<br/>index 10c261c67021..51da157a629e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_4xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_4xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_4xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/head_4xx.S</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S<br/>index 7a2f20583be4..944c35c24278 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_8xx.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_8xx.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_8xx.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/head_8xx.S</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S<br/>index dd86bbed7627..66877bdfe0b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_fsl_booke.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/head_fsl_booke.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/head_fsl_booke.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/head_fsl_booke.S</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c<br/>index 84d65a87191e..a469ba438cbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(</div><div class='ctx'> 				unsigned long reboot_code_buffer,</div><div class='ctx'> 				unsigned long start_address) ATTRIB_NORET;</div><div class='ctx'> </div><div class='del'>-const extern unsigned char relocate_new_kernel[];</div><div class='del'>-const extern unsigned int relocate_new_kernel_size;</div><div class='add'>+extern const unsigned char relocate_new_kernel[];</div><div class='add'>+extern const unsigned int relocate_new_kernel_size;</div><div class='ctx'> </div><div class='ctx'> void machine_shutdown(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S<br/>index 5a936566fd61..2fa0075f2b5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/misc.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/misc.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/misc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/misc.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;asm/unistd.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c<br/>index 809673a36f7a..63808e01cb0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/pci.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Common prep/chrp pci routines. -- Cort</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -95,8 +94,10 @@ pcibios_fixup_resources(struct pci_dev *dev)</div><div class='ctx'> 		if (!res-&gt;flags)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (res-&gt;end == 0xffffffff) {</div><div class='del'>-			DBG("PCI:%s Resource %d [%08lx-%08lx] is unassigned\n",</div><div class='del'>-			    pci_name(dev), i, res-&gt;start, res-&gt;end);</div><div class='add'>+			DBG("PCI:%s Resource %d [%016llx-%016llx] is unassigned\n",</div><div class='add'>+				pci_name(dev), i,</div><div class='add'>+				(unsigned long long)res-&gt;start,</div><div class='add'>+				(unsigned long long)res-&gt;end);</div><div class='ctx'> 			res-&gt;end -= res-&gt;start;</div><div class='ctx'> 			res-&gt;start = 0;</div><div class='ctx'> 			res-&gt;flags |= IORESOURCE_UNSET;</div><div class='hunk'>@@ -169,18 +170,18 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);</div><div class='ctx'>  * but we want to try to avoid allocating at 0x2900-0x2bff</div><div class='ctx'>  * which might have be mirrored at 0x0100-0x03ff..</div><div class='ctx'>  */</div><div class='del'>-void pcibios_align_resource(void *data, struct resource *res, unsigned long size,</div><div class='del'>-		       unsigned long align)</div><div class='add'>+void pcibios_align_resource(void *data, struct resource *res,</div><div class='add'>+				resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = data;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (size &gt; 0x100) {</div><div class='ctx'> 			printk(KERN_ERR "PCI: I/O Region %s/%d too large"</div><div class='del'>-			       " (%ld bytes)\n", pci_name(dev),</div><div class='del'>-			       dev-&gt;resource - res, size);</div><div class='add'>+			       " (%lld bytes)\n", pci_name(dev),</div><div class='add'>+			       dev-&gt;resource - res, (unsigned long long)size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='hunk'>@@ -251,8 +252,9 @@ pcibios_allocate_bus_resources(struct list_head *bus_list)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			DBG("PCI: bridge rsrc %lx..%lx (%lx), parent %p\n",</div><div class='del'>-			    res-&gt;start, res-&gt;end, res-&gt;flags, pr);</div><div class='add'>+			DBG("PCI: bridge rsrc %llx..%llx (%lx), parent %p\n",</div><div class='add'>+				(unsigned long long)res-&gt;start,</div><div class='add'>+				(unsigned long long)res-&gt;end, res-&gt;flags, pr);</div><div class='ctx'> 			if (pr) {</div><div class='ctx'> 				if (request_resource(pr, res) == 0)</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -302,8 +304,9 @@ reparent_resources(struct resource *parent, struct resource *res)</div><div class='ctx'> 	*pp = NULL;</div><div class='ctx'> 	for (p = res-&gt;child; p != NULL; p = p-&gt;sibling) {</div><div class='ctx'> 		p-&gt;parent = res;</div><div class='del'>-		DBG(KERN_INFO "PCI: reparented %s [%lx..%lx] under %s\n",</div><div class='del'>-		    p-&gt;name, p-&gt;start, p-&gt;end, res-&gt;name);</div><div class='add'>+		DBG(KERN_INFO "PCI: reparented %s [%llx..%llx] under %s\n",</div><div class='add'>+			p-&gt;name, (unsigned long long)p-&gt;start,</div><div class='add'>+			(unsigned long long)p-&gt;end, res-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -358,13 +361,15 @@ pci_relocate_bridge_resource(struct pci_bus *bus, int i)</div><div class='ctx'> 		try = conflict-&gt;start - 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (request_resource(pr, res)) {</div><div class='del'>-		DBG(KERN_ERR "PCI: huh? couldn't move to %lx..%lx\n",</div><div class='del'>-		    res-&gt;start, res-&gt;end);</div><div class='add'>+		DBG(KERN_ERR "PCI: huh? couldn't move to %llx..%llx\n",</div><div class='add'>+			(unsigned long long)res-&gt;start,</div><div class='add'>+			(unsigned long long)res-&gt;end);</div><div class='ctx'> 		return -1;		/* "can't happen" */</div><div class='ctx'> 	}</div><div class='ctx'> 	update_bridge_base(bus, i);</div><div class='del'>-	printk(KERN_INFO "PCI: bridge %d resource %d moved to %lx..%lx\n",</div><div class='del'>-	       bus-&gt;number, i, res-&gt;start, res-&gt;end);</div><div class='add'>+	printk(KERN_INFO "PCI: bridge %d resource %d moved to %llx..%llx\n",</div><div class='add'>+		bus-&gt;number, i, (unsigned long long)res-&gt;start,</div><div class='add'>+		(unsigned long long)res-&gt;end);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,15 +480,17 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *pr, *r = &amp;dev-&gt;resource[idx];</div><div class='ctx'> </div><div class='del'>-	DBG("PCI:%s: Resource %d: %08lx-%08lx (f=%lx)\n",</div><div class='del'>-	    pci_name(dev), idx, r-&gt;start, r-&gt;end, r-&gt;flags);</div><div class='add'>+	DBG("PCI:%s: Resource %d: %016llx-%016llx (f=%lx)\n",</div><div class='add'>+	    pci_name(dev), idx, (unsigned long long)r-&gt;start,</div><div class='add'>+	    (unsigned long long)r-&gt;end, r-&gt;flags);</div><div class='ctx'> 	pr = pci_find_parent_resource(dev, r);</div><div class='ctx'> 	if (!pr || request_resource(pr, r) &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "PCI: Cannot allocate resource region %d"</div><div class='ctx'> 		       " of device %s\n", idx, pci_name(dev));</div><div class='ctx'> 		if (pr)</div><div class='del'>-			DBG("PCI:  parent is %p: %08lx-%08lx (f=%lx)\n",</div><div class='del'>-			    pr, pr-&gt;start, pr-&gt;end, pr-&gt;flags);</div><div class='add'>+			DBG("PCI:  parent is %p: %016llx-%016llx (f=%lx)\n",</div><div class='add'>+				pr, (unsigned long long)pr-&gt;start,</div><div class='add'>+				(unsigned long long)pr-&gt;end, pr-&gt;flags);</div><div class='ctx'> 		/* We'll assign a new address later */</div><div class='ctx'> 		r-&gt;flags |= IORESOURCE_UNSET;</div><div class='ctx'> 		r-&gt;end -= r-&gt;start;</div><div class='hunk'>@@ -952,8 +959,8 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,</div><div class='ctx'> 	else</div><div class='ctx'> 		prot |= _PAGE_GUARDED;</div><div class='ctx'> </div><div class='del'>-	printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp-&gt;start,</div><div class='del'>-	       prot);</div><div class='add'>+	printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev),</div><div class='add'>+		(unsigned long long)rp-&gt;start, prot);</div><div class='ctx'> </div><div class='ctx'> 	return __pgprot(prot);</div><div class='ctx'> }</div><div class='hunk'>@@ -1032,7 +1039,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_pgoff = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	vma-&gt;vm_flags |= VM_SHM | VM_LOCKED | VM_IO;</div><div class='ctx'> 	vma-&gt;vm_page_prot = __pci_mmap_set_pgprot(dev, rp,</div><div class='ctx'> 						  vma-&gt;vm_page_prot,</div><div class='ctx'> 						  mmap_state, write_combine);</div><div class='hunk'>@@ -1123,7 +1129,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)</div><div class='ctx'> </div><div class='ctx'> void pci_resource_to_user(const struct pci_dev *dev, int bar,</div><div class='ctx'> 			  const struct resource *rsrc,</div><div class='del'>-			  u64 *start, u64 *end)</div><div class='add'>+			  resource_size_t *start, resource_size_t *end)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller *hose = pci_bus_to_hose(dev-&gt;bus-&gt;number);</div><div class='ctx'> 	unsigned long offset = 0;</div><div class='head'>diff --git a/arch/ppc/kernel/ppc-stub.c b/arch/ppc/kernel/ppc-stub.c<br/>index d61889c24046..5f9ee7bb67ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/ppc-stub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/ppc-stub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/ppc-stub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/ppc-stub.c</a></div><div class='hunk'>@@ -99,7 +99,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c<br/>index 75c645043746..bd129d3c2cc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/ppc_htab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/ppc_htab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/ppc_htab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/ppc_htab.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c<br/>index b250b1b539b6..d1735401384c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/ppc_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/ppc_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/ppc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/ppc_ksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -6,7 +5,7 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include &lt;linux/nvram.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c<br/>index 1f79e84ab464..a74f46d9826f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/setup.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Common prep boot and setup code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -12,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='hunk'>@@ -475,7 +474,7 @@ int __init ppc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* register CPU devices */</div><div class='ctx'> 	for_each_possible_cpu(i)</div><div class='del'>-		register_cpu(&amp;cpu_devices[i], i, NULL);</div><div class='add'>+		register_cpu(&amp;cpu_devices[i], i);</div><div class='ctx'> </div><div class='ctx'> 	/* call platform init */</div><div class='ctx'> 	if (ppc_md.init != NULL) {</div><div class='head'>diff --git a/arch/ppc/kernel/smp-tbsync.c b/arch/ppc/kernel/smp-tbsync.c<br/>index 6a5694fcc711..1576758debaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/smp-tbsync.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/smp-tbsync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/smp-tbsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/smp-tbsync.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c<br/>index f77795a64dae..ca57e896a36c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/smp.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c<br/>index 53ea723af60a..6ab8cc7226ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/time.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  *             "A Kernel Model for Precision Timekeeping" by Dave Mills</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c<br/>index 1c0d68026abd..d7a433049b48 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/kernel/traps.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/prctl.h&gt;</div><div class='head'>diff --git a/arch/ppc/lib/locks.c b/arch/ppc/lib/locks.c<br/>index c450dc4b766e..ea4aee6b20e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/lib/locks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/lib/locks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/lib/locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/lib/locks.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Written by Cort Dougan (cort@cs.nmt.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/ppc/lib/string.S b/arch/ppc/lib/string.S<br/>index 2e258c49e8be..84ed33ab4c2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/lib/string.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/lib/string.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/lib/string.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/lib/string.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/44x_mmu.c b/arch/ppc/mm/44x_mmu.c<br/>index e0152a9b26e6..0a0a0487b334 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/44x_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/44x_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/44x_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/44x_mmu.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/4xx_mmu.c b/arch/ppc/mm/4xx_mmu.c<br/>index 4d006aa1a0d1..838e09db71d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/4xx_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/4xx_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/4xx_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/4xx_mmu.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c<br/>index 8e08ca32531a..5cdfb71fcb07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/fault.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/fsl_booke_mmu.c b/arch/ppc/mm/fsl_booke_mmu.c<br/>index 5d581bb3aa12..123da03ab118 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/fsl_booke_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/fsl_booke_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/fsl_booke_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/fsl_booke_mmu.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S<br/>index 31d0a924317c..e756942e65c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/hashtable.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/hashtable.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/hashtable.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/hashtable.S</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c<br/>index 386e000bcb73..523392d460fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/init.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -583,7 +582,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,</div><div class='ctx'> 		mm = (address &lt; TASK_SIZE)? vma-&gt;vm_mm: &amp;init_mm;</div><div class='ctx'> 		pmd = pmd_offset(pgd_offset(mm, address), address);</div><div class='ctx'> 		if (!pmd_none(*pmd))</div><div class='del'>-			add_hash_page(mm-&gt;context, address, pmd_val(*pmd));</div><div class='add'>+			add_hash_page(mm-&gt;context.id, address, pmd_val(*pmd));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ppc/mm/mem_pieces.c b/arch/ppc/mm/mem_pieces.c<br/>index 3d639052017e..6030a0ddfbb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/mem_pieces.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/mem_pieces.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/mem_pieces.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/mem_pieces.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/mmu_context.c b/arch/ppc/mm/mmu_context.c<br/>index b4a4b3f02a1c..85afa7f8aa78 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/mmu_context.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/mmu_context.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/mmu_context.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/mmu_context.c</a></div><div class='hunk'>@@ -23,14 +23,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='ctx'> </div><div class='del'>-mm_context_t next_mmu_context;</div><div class='add'>+unsigned long next_mmu_context;</div><div class='ctx'> unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];</div><div class='ctx'> #ifdef FEW_CONTEXTS</div><div class='ctx'> atomic_t nr_free_contexts;</div><div class='head'>diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c<br/>index 706bca8eb144..354a9408f024 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/pgtable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/pgtable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/pgtable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/pgtable.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/ppc_mmu.c b/arch/ppc/mm/ppc_mmu.c<br/>index 25bb6f3347c1..973f1e6afa53 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/ppc_mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/ppc_mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/ppc_mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/ppc_mmu.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/mm/tlb.c b/arch/ppc/mm/tlb.c<br/>index 6c3dc3c44c86..fa29740a28f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/mm/tlb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/mm/tlb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/mm/tlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/mm/tlb.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -42,7 +41,7 @@ void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> 	if (Hash != 0) {</div><div class='ctx'> 		ptephys = __pa(ptep) &amp; PAGE_MASK;</div><div class='del'>-		flush_hash_pages(mm-&gt;context, addr, ptephys, 1);</div><div class='add'>+		flush_hash_pages(mm-&gt;context.id, addr, ptephys, 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +101,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start,</div><div class='ctx'> 	pmd_t *pmd;</div><div class='ctx'> 	unsigned long pmd_end;</div><div class='ctx'> 	int count;</div><div class='del'>-	unsigned int ctx = mm-&gt;context;</div><div class='add'>+	unsigned int ctx = mm-&gt;context.id;</div><div class='ctx'> </div><div class='ctx'> 	if (Hash == 0) {</div><div class='ctx'> 		_tlbia();</div><div class='hunk'>@@ -166,7 +165,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)</div><div class='ctx'> 	mm = (vmaddr &lt; TASK_SIZE)? vma-&gt;vm_mm: &amp;init_mm;</div><div class='ctx'> 	pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr);</div><div class='ctx'> 	if (!pmd_none(*pmd))</div><div class='del'>-		flush_hash_pages(mm-&gt;context, vmaddr, pmd_val(*pmd), 1);</div><div class='add'>+		flush_hash_pages(mm-&gt;context.id, vmaddr, pmd_val(*pmd), 1);</div><div class='ctx'> 	FINISH_FLUSH;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig<br/>index 174ddbc9758b..293bd489e7d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/Kconfig</a></div><div class='hunk'>@@ -183,7 +183,7 @@ config IBM_EMAC4</div><div class='ctx'> </div><div class='ctx'> config BIOS_FIXUP</div><div class='ctx'> 	bool</div><div class='del'>-	depends on BUBINGA || EP405 || SYCAMORE || WALNUT</div><div class='add'>+	depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> # OAK doesn't exist but wanted to keep this around for any future 403GCX boards</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c<br/>index b940cfd646c2..349660b84a02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bamboo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bamboo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bamboo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/bamboo.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/bamboo.h b/arch/ppc/platforms/4xx/bamboo.h<br/>index 31c0dd6a26cb..dcd3d09a0a71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bamboo.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bamboo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bamboo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/bamboo.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __ASM_BAMBOO_H__</div><div class='ctx'> #define __ASM_BAMBOO_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm440ep.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* F/W TLB mapping used in bootloader glue to reset EMAC */</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c<br/>index ce48a4f08cbb..4009f4983ca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bubinga.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bubinga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bubinga.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/bubinga.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/bubinga.h b/arch/ppc/platforms/4xx/bubinga.h<br/>index 606aa9fa5caa..5c408060eb35 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bubinga.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/bubinga.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/bubinga.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/bubinga.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #ifndef __BUBINGA_H__</div><div class='ctx'> #define __BUBINGA_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm405ep.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c<br/>index 6571e39fbe48..367430998fc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/cpci405.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/cpci405.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/cpci405.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/cpci405.c</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Board setup routines for the esd CPCI-405 cPCI Board.</div><div class='ctx'>  *</div><div class='del'>- * Author: Stefan Roese</div><div class='del'>- *         stefan.roese@esd-electronics.com</div><div class='add'>+ * Copyright 2001-2006 esd electronic system design - hannover germany</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2001 esd electronic system design - hannover germany</div><div class='add'>+ * Authors: Matthias Fuchs</div><div class='add'>+ *          matthias.fuchs@esd-electronics.com</div><div class='add'>+ *          Stefan Roese</div><div class='add'>+ *          stefan.roese@esd-electronics.com</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute  it and/or modify it</div><div class='ctx'>  * under  the terms of  the GNU General  Public License as published by the</div><div class='hunk'>@@ -13,16 +15,23 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/todc.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='ctx'> #include &lt;asm/ocp.h&gt;</div><div class='add'>+#include &lt;asm/ibm_ocp_pci.h&gt;</div><div class='add'>+#include &lt;platforms/4xx/ibm405gp.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GEN_RTC</div><div class='ctx'> void *cpci405_nvram;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern bd_t __res;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some IRQs unique to CPCI-405.</div><div class='hunk'>@@ -36,18 +45,69 @@ ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)</div><div class='ctx'> 	 *      A       B       C       D</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='del'>-		{28,	28,	28,	28},	/* IDSEL 15 - cPCI slot 8 */</div><div class='del'>-		{29,	29,	29,	29},	/* IDSEL 16 - cPCI slot 7 */</div><div class='del'>-		{30,	30,	30,	30},	/* IDSEL 17 - cPCI slot 6 */</div><div class='del'>-		{27,	27,	27,	27},	/* IDSEL 18 - cPCI slot 5 */</div><div class='del'>-		{28,	28,	28,	28},	/* IDSEL 19 - cPCI slot 4 */</div><div class='del'>-		{29,	29,	29,	29},	/* IDSEL 20 - cPCI slot 3 */</div><div class='del'>-		{30,	30,	30,	30},	/* IDSEL 21 - cPCI slot 2 */</div><div class='add'>+		{28,	29,	30,	27},	/* IDSEL 15 - cPCI slot 8 */</div><div class='add'>+		{29,	30,	27,	28},	/* IDSEL 16 - cPCI slot 7 */</div><div class='add'>+		{30,	27,	28,	29},	/* IDSEL 17 - cPCI slot 6 */</div><div class='add'>+		{27,	28,	29,	30},	/* IDSEL 18 - cPCI slot 5 */</div><div class='add'>+		{28,	29,	30,	27},	/* IDSEL 19 - cPCI slot 4 */</div><div class='add'>+		{29,	30,	27,	28},	/* IDSEL 20 - cPCI slot 3 */</div><div class='add'>+		{30,	27,	28,	29},	/* IDSEL 21 - cPCI slot 2 */</div><div class='ctx'>         };</div><div class='ctx'> 	const long min_idsel = 15, max_idsel = 21, irqs_per_slot = 4;</div><div class='ctx'> 	return PCI_IRQ_TABLE_LOOKUP;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* The serial clock for the chip is an internal clock determined by</div><div class='add'>+ * different clock speeds/dividers.</div><div class='add'>+ * Calculate the proper input baud rate and setup the serial driver.</div><div class='add'>+ */</div><div class='add'>+static void __init</div><div class='add'>+cpci405_early_serial_map(void)</div><div class='add'>+{</div><div class='add'>+	u32 uart_div;</div><div class='add'>+	int uart_clock;</div><div class='add'>+	struct uart_port port;</div><div class='add'>+</div><div class='add'>+         /* Calculate the serial clock input frequency</div><div class='add'>+          *</div><div class='add'>+          * The uart clock is the cpu frequency (provided in the board info</div><div class='add'>+          * structure) divided by the external UART Divisor.</div><div class='add'>+          */</div><div class='add'>+	uart_div = ((mfdcr(DCRN_CHCR_BASE) &amp; CHR0_UDIV) &gt;&gt; 1) + 1;</div><div class='add'>+	uart_clock = __res.bi_procfreq / uart_div;</div><div class='add'>+</div><div class='add'>+	/* Setup serial port access */</div><div class='add'>+	memset(&amp;port, 0, sizeof(port));</div><div class='add'>+#if defined(CONFIG_UART0_TTYS0)</div><div class='add'>+	port.membase = (void*)UART0_IO_BASE;</div><div class='add'>+	port.irq = UART0_INT;</div><div class='add'>+#else</div><div class='add'>+	port.membase = (void*)UART1_IO_BASE;</div><div class='add'>+	port.irq = UART1_INT;</div><div class='add'>+#endif</div><div class='add'>+	port.uartclk = uart_clock;</div><div class='add'>+	port.regshift = 0;</div><div class='add'>+	port.iotype = UPIO_MEM;</div><div class='add'>+	port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;</div><div class='add'>+	port.line = 0;</div><div class='add'>+</div><div class='add'>+	if (early_serial_setup(&amp;port) != 0) {</div><div class='add'>+		printk("Early serial init of port 0 failed\n");</div><div class='add'>+	}</div><div class='add'>+#if defined(CONFIG_UART0_TTYS0)</div><div class='add'>+	port.membase = (void*)UART1_IO_BASE;</div><div class='add'>+	port.irq = UART1_INT;</div><div class='add'>+#else</div><div class='add'>+	port.membase = (void*)UART0_IO_BASE;</div><div class='add'>+	port.irq = UART0_INT;</div><div class='add'>+#endif</div><div class='add'>+	port.line = 1;</div><div class='add'>+</div><div class='add'>+	if (early_serial_setup(&amp;port) != 0) {</div><div class='add'>+		printk("Early serial init of port 1 failed\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init</div><div class='ctx'> cpci405_setup_arch(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -55,14 +115,68 @@ cpci405_setup_arch(void)</div><div class='ctx'> </div><div class='ctx'> 	ibm_ocp_set_emac(0, 0);</div><div class='ctx'> </div><div class='del'>-	TODC_INIT(TODC_TYPE_MK48T35, cpci405_nvram, cpci405_nvram, cpci405_nvram, 8);</div><div class='add'>+        cpci405_early_serial_map();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GEN_RTC</div><div class='add'>+	TODC_INIT(TODC_TYPE_MK48T35,</div><div class='add'>+		  cpci405_nvram, cpci405_nvram, cpci405_nvram, 8);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init</div><div class='add'>+bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)</div><div class='add'>+{</div><div class='add'>+	unsigned int bar_response, bar;</div><div class='add'>+</div><div class='add'>+	/* Disable region first */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[0].ma), 0x00000000);</div><div class='add'>+	/* PLB starting addr, PCI: 0x80000000 */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[0].la), 0x80000000);</div><div class='add'>+	/* PCI start addr, 0x80000000 */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[0].pcila), PPC405_PCI_MEM_BASE);</div><div class='add'>+	/* 512MB range of PLB to PCI */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[0].pciha), 0x00000000);</div><div class='add'>+	/* Enable no pre-fetch, enable region */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[0].ma), ((0xffffffff -</div><div class='add'>+						(PPC405_PCI_UPPER_MEM -</div><div class='add'>+						 PPC405_PCI_MEM_BASE)) | 0x01));</div><div class='add'>+</div><div class='add'>+	/* Disable region one */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[1].ma), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[1].la), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[1].pcila), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[1].pciha), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[1].ma), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;ptm1ms), 0x00000001);</div><div class='add'>+</div><div class='add'>+	/* Disable region two */</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[2].ma), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[2].la), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[2].pcila), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[2].pciha), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;pmm[2].ma), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;ptm2ms), 0x00000000);</div><div class='add'>+	out_le32((void *) &amp;(pcip-&gt;ptm2la), 0x00000000);</div><div class='add'>+</div><div class='add'>+	/* Zero config bars */</div><div class='add'>+	for (bar = PCI_BASE_ADDRESS_1; bar &lt;= PCI_BASE_ADDRESS_2; bar += 4) {</div><div class='add'>+		early_write_config_dword(hose, hose-&gt;first_busno,</div><div class='add'>+					 PCI_FUNC(hose-&gt;first_busno), bar,</div><div class='add'>+					 0x00000000);</div><div class='add'>+		early_read_config_dword(hose, hose-&gt;first_busno,</div><div class='add'>+					PCI_FUNC(hose-&gt;first_busno), bar,</div><div class='add'>+					&amp;bar_response);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='ctx'> cpci405_map_io(void)</div><div class='ctx'> {</div><div class='ctx'> 	ppc4xx_map_io();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GEN_RTC</div><div class='ctx'> 	cpci405_nvram = ioremap(CPCI405_NVRAM_PADDR, CPCI405_NVRAM_SIZE);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init</div><div class='hunk'>@@ -74,9 +188,11 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,</div><div class='ctx'> 	ppc_md.setup_arch = cpci405_setup_arch;</div><div class='ctx'> 	ppc_md.setup_io_mappings = cpci405_map_io;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GEN_RTC</div><div class='ctx'> 	ppc_md.time_init = todc_time_init;</div><div class='ctx'> 	ppc_md.set_rtc_time = todc_set_rtc_time;</div><div class='ctx'> 	ppc_md.get_rtc_time = todc_get_rtc_time;</div><div class='ctx'> 	ppc_md.nvram_read_val = todc_direct_read_val;</div><div class='ctx'> 	ppc_md.nvram_write_val = todc_direct_write_val;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/cpci405.h b/arch/ppc/platforms/4xx/cpci405.h<br/>index e27f7cb650d8..f5a5c0cd062d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/cpci405.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/cpci405.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/cpci405.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/cpci405.h</a></div><div class='hunk'>@@ -1,37 +1,29 @@</div><div class='ctx'> /*</div><div class='ctx'>  * CPCI-405 board specific definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2001 Stefan Roese (stefan.roese@esd-electronics.com)</div><div class='add'>+ * Copyright 2001-2006 esd electronic system design - hannover germany</div><div class='add'>+ *</div><div class='add'>+ * Authors: Matthias Fuchs</div><div class='add'>+ *          matthias.fuchs@esd-electronics.com</div><div class='add'>+ *          Stefan Roese</div><div class='add'>+ *          stefan.roese@esd-electronics.com</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-#ifndef __ASM_CPCI405_H__</div><div class='del'>-#define __ASM_CPCI405_H__</div><div class='add'>+#ifndef __CPCI405_H__</div><div class='add'>+#define __CPCI405_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='del'>-</div><div class='del'>-/* We have a 405GP core */</div><div class='ctx'> #include &lt;platforms/4xx/ibm405gp.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef __ASSEMBLY__</div><div class='del'>-/* Some 4xx parts use a different timebase frequency from the internal clock.</div><div class='del'>-*/</div><div class='del'>-#define bi_tbfreq bi_intfreq</div><div class='del'>-</div><div class='ctx'> /* Map for the NVRAM space */</div><div class='ctx'> #define CPCI405_NVRAM_PADDR	((uint)0xf0200000)</div><div class='ctx'> #define CPCI405_NVRAM_SIZE	((uint)32*1024)</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC405GP_INTERNAL_CLOCK</div><div class='del'>-#define BASE_BAUD		201600</div><div class='del'>-#else</div><div class='del'>-#define BASE_BAUD		691200</div><div class='del'>-#endif</div><div class='add'>+#define BASE_BAUD		0</div><div class='ctx'> </div><div class='del'>-#define PPC4xx_MACHINE_NAME "esd CPCI-405"</div><div class='add'>+#define PPC4xx_MACHINE_NAME     "esd CPCI-405"</div><div class='ctx'> </div><div class='del'>-#endif /* !__ASSEMBLY__ */</div><div class='del'>-#endif	/* __ASM_CPCI405_H__ */</div><div class='add'>+#endif	/* __CPCI405_H__ */</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c<br/>index b4ecb9c79854..f0f9cc8480ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ebony.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ebony.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ebony.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ebony.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h<br/>index 27b2e77c7c83..f40e33d39d76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ebony.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ebony.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ebony.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ebony.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __ASM_EBONY_H__</div><div class='ctx'> #define __ASM_EBONY_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm440gp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* F/W TLB mapping used in bootloader glue to reset EMAC */</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ep405.c b/arch/ppc/platforms/4xx/ep405.c<br/>index 6efa91ff9c07..ae5c82081c95 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ep405.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ep405.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ep405.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ep405.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * is licensed "as is" without any warranty of any kind, whether express</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm405ep.c b/arch/ppc/platforms/4xx/ibm405ep.c<br/>index 55af769a6e70..fb3630a1608d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405ep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405ep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405ep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm405ep.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm405ep.h b/arch/ppc/platforms/4xx/ibm405ep.h<br/>index fe46640de152..3ef20a547080 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405ep.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405ep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405ep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm405ep.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #ifndef __ASM_IBM405EP_H__</div><div class='ctx'> #define __ASM_IBM405EP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ibm405.h at bottom of this file */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm405gp.c b/arch/ppc/platforms/4xx/ibm405gp.c<br/>index e5700469a682..2ac67a2f0ba6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm405gp.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm405gp.h b/arch/ppc/platforms/4xx/ibm405gp.h<br/>index eaf0ef57028d..9f15e5518719 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm405gp.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __ASM_IBM405GP_H__</div><div class='ctx'> #define __ASM_IBM405GP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ibm405.h at bottom of this file */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm405gpr.c b/arch/ppc/platforms/4xx/ibm405gpr.c<br/>index 49da61f6854a..9f4dacffdbb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gpr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gpr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gpr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm405gpr.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm405gpr.h b/arch/ppc/platforms/4xx/ibm405gpr.h<br/>index e90c5dde01d3..9e01f1515de3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gpr.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm405gpr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm405gpr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm405gpr.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __ASM_IBM405GPR_H__</div><div class='ctx'> #define __ASM_IBM405GPR_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ibm405.h at bottom of this file */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm440ep.h b/arch/ppc/platforms/4xx/ibm440ep.h<br/>index 61717e8a799e..d92572727d20 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440ep.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440ep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440ep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm440ep.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef __PPC_PLATFORMS_IBM440EP_H</div><div class='ctx'> #define __PPC_PLATFORMS_IBM440EP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* UART */</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm440gp.h b/arch/ppc/platforms/4xx/ibm440gp.h<br/>index 7b2763b6024f..391c90e1f5ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440gp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440gp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440gp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm440gp.h</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #ifndef __PPC_PLATFORMS_IBM440GP_H</div><div class='ctx'> #define __PPC_PLATFORMS_IBM440GP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* UART */</div><div class='ctx'> #define PPC440GP_UART0_ADDR	0x0000000140000200ULL</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm440gx.h b/arch/ppc/platforms/4xx/ibm440gx.h<br/>index 070a34efe1c7..599c4289b9c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440gx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440gx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440gx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm440gx.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef __PPC_PLATFORMS_IBM440GX_H</div><div class='ctx'> #define __PPC_PLATFORMS_IBM440GX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibm440sp.h b/arch/ppc/platforms/4xx/ibm440sp.h<br/>index 77e8bb22c527..2978682f1720 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440sp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibm440sp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibm440sp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibm440sp.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __PPC_PLATFORMS_IBM440SP_H</div><div class='ctx'> #define __PPC_PLATFORMS_IBM440SP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibmnp405h.c b/arch/ppc/platforms/4xx/ibmnp405h.c<br/>index f1dcb0ac15b7..1afc3642e5b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmnp405h.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmnp405h.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmnp405h.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibmnp405h.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ocp.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibmnp405h.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibmnp405h.h b/arch/ppc/platforms/4xx/ibmnp405h.h<br/>index 2c683f6aaa66..4aa8821b478b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmnp405h.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmnp405h.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmnp405h.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibmnp405h.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __ASM_IBMNP405H_H__</div><div class='ctx'> #define __ASM_IBMNP405H_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* ibm405.h at bottom of this file */</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibmstb4.h b/arch/ppc/platforms/4xx/ibmstb4.h<br/>index 9de426597351..31a08abaa4a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmstb4.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmstb4.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmstb4.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibmstb4.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __ASM_IBMSTB4_H__</div><div class='ctx'> #define __ASM_IBMSTB4_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* serial port defines */</div><div class='ctx'> #define STB04xxx_IO_BASE	((uint)0xe0000000)</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ibmstbx25.h b/arch/ppc/platforms/4xx/ibmstbx25.h<br/>index 6884a49d3482..31b63343e641 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmstbx25.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ibmstbx25.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ibmstbx25.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ibmstbx25.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef __ASM_IBMSTBX25_H__</div><div class='ctx'> #define __ASM_IBMSTBX25_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* serial port defines */</div><div class='ctx'> #define STBx25xx_IO_BASE	((uint)0xe0000000)</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c<br/>index 5c37de28e135..61706ef37112 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/luan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/luan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/luan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/luan.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h<br/>index e0db6a810feb..68dd46b0a5c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/luan.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/luan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/luan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/luan.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #ifndef __ASM_LUAN_H__</div><div class='ctx'> #define __ASM_LUAN_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm440sp.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* F/W TLB mapping used in bootloader glue to reset EMAC */</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c<br/>index 554776d4b8ac..84e999d9a7bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ocotea.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ocotea.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ocotea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ocotea.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h<br/>index 7c799a9ff82b..89730ce2322c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ocotea.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ocotea.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ocotea.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ocotea.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #ifndef __ASM_OCOTEA_H__</div><div class='ctx'> #define __ASM_OCOTEA_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm440gx.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* F/W TLB mapping used in bootloader glue to reset EMAC */</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/ppc440spe.h b/arch/ppc/platforms/4xx/ppc440spe.h<br/>index d3a620ddcdee..f1e867c4c9fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ppc440spe.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/ppc440spe.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/ppc440spe.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/ppc440spe.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef __PPC_PLATFORMS_PPC440SPE_H</div><div class='ctx'> #define __PPC_PLATFORMS_PPC440SPE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/redwood5.c b/arch/ppc/platforms/4xx/redwood5.c<br/>index 53da2b4f7c24..edf4d37d1a52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/redwood5.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/redwood5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/redwood5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/redwood5.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/redwood6.c b/arch/ppc/platforms/4xx/redwood6.c<br/>index 41b27d106fa3..006e29f83a1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/redwood6.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/redwood6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/redwood6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/redwood6.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c<br/>index bab31eb30687..c47493e344c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/sycamore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/sycamore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/sycamore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/sycamore.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * is licensed "as is" without any warranty of any kind, whether express</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/sycamore.h b/arch/ppc/platforms/4xx/sycamore.h<br/>index dae01620227d..69b169eac053 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/sycamore.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/sycamore.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/sycamore.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/sycamore.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #ifndef __ASM_SYCAMORE_H__</div><div class='ctx'> #define __ASM_SYCAMORE_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm405gpr.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c<br/>index 6bd77902b9a4..f414d2d4c58e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/walnut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/walnut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/walnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/walnut.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * is licensed "as is" without any warranty of any kind, whether express</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/walnut.h b/arch/ppc/platforms/4xx/walnut.h<br/>index f13a577f0a41..d9c4eb788940 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/walnut.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/walnut.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/walnut.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/walnut.h</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #ifndef __ASM_WALNUT_H__</div><div class='ctx'> #define __ASM_WALNUT_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ibm405gp.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c<br/>index d97a7f269f97..fb5f0b5e13d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/xilinx_ml300.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/xilinx_ml300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/xilinx_ml300.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/xilinx_ml300.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * "as is" without any warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/xilinx_ml403.c b/arch/ppc/platforms/4xx/xilinx_ml403.c<br/>index 4c0c7e4c1114..cb3bf7a2bcbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/xilinx_ml403.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/xilinx_ml403.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/xilinx_ml403.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/xilinx_ml403.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h<br/>index 4cf21f256356..cd7d0e7d9863 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/xparameters/xparameters.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/xparameters/xparameters.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/xparameters/xparameters.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/xparameters/xparameters.h</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * "as is" without any warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_XILINX_ML300)</div><div class='ctx'>   #include "xparameters_ml300.h"</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c<br/>index f287dcdbffce..346787df0ddb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/yucca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/yucca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/yucca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/yucca.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/4xx/yucca.h b/arch/ppc/platforms/4xx/yucca.h<br/>index 7ae23012237a..bc9684e66a84 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/yucca.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/4xx/yucca.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/4xx/yucca.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/4xx/yucca.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef __ASM_YUCCA_H__</div><div class='ctx'> #define __ASM_YUCCA_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ppc440spe.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* F/W TLB mapping used in bootloader glue to reset EMAC */</div><div class='head'>diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c<br/>index 11626dd9090f..3397f0de1592 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/83xx/mpc834x_sys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/83xx/mpc834x_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/83xx/mpc834x_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/83xx/mpc834x_sys.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.h b/arch/ppc/platforms/83xx/mpc834x_sys.h<br/>index 6727bbdc36ec..d2e06c95b083 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/83xx/mpc834x_sys.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/83xx/mpc834x_sys.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/83xx/mpc834x_sys.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/83xx/mpc834x_sys.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __MACH_MPC83XX_SYS_H__</div><div class='ctx'> #define __MACH_MPC83XX_SYS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;syslib/ppc83xx_setup.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c<br/>index 9b014df516b9..4f839da6782f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8540_ads.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8540_ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8540_ads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc8540_ads.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.h b/arch/ppc/platforms/85xx/mpc8540_ads.h<br/>index 0b5e7ff856f5..7559f9e6fc28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8540_ads.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8540_ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8540_ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc8540_ads.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __MACH_MPC8540ADS_H__</div><div class='ctx'> #define __MACH_MPC8540ADS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;syslib/ppc85xx_setup.h&gt;</div><div class='ctx'> #include &lt;platforms/85xx/mpc85xx_ads_common.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc8555_cds.h b/arch/ppc/platforms/85xx/mpc8555_cds.h<br/>index 9754dbd5d18c..4f79c372c4e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8555_cds.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8555_cds.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8555_cds.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc8555_cds.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __MACH_MPC8555CDS_H__</div><div class='ctx'> #define __MACH_MPC8555CDS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;syslib/ppc85xx_setup.h&gt;</div><div class='ctx'> #include &lt;platforms/85xx/mpc85xx_cds_common.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c<br/>index 0cb2e86470e2..d90cd24d018e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8560_ads.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8560_ads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8560_ads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc8560_ads.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -132,7 +131,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cpm2_irqaction = {</div><div class='ctx'> 	.handler = cpm2_cascade,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.mask = CPU_MASK_NONE,</div><div class='ctx'> 	.name = "cpm2_cascade",</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.h b/arch/ppc/platforms/85xx/mpc8560_ads.h<br/>index c2247c21fc53..9f185ab2e019 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8560_ads.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc8560_ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc8560_ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc8560_ads.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __MACH_MPC8560ADS_H</div><div class='ctx'> #define __MACH_MPC8560ADS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;syslib/ppc85xx_setup.h&gt;</div><div class='ctx'> #include &lt;platforms/85xx/mpc85xx_ads_common.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c<br/>index 8fd9d763f58d..674806e001f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_ads_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_ads_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_ads_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc85xx_ads_common.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h<br/>index de8d41aafe11..abf32281655d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_ads_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_ads_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_ads_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc85xx_ads_common.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __MACH_MPC85XX_ADS_H__</div><div class='ctx'> #define __MACH_MPC85XX_ADS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c<br/>index c9e0aeeca3d8..75204588a3e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_cds_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_cds_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_cds_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc85xx_cds_common.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -137,7 +136,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cpm2_irqaction = {</div><div class='ctx'> 	.handler = cpm2_cascade,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.mask = CPU_MASK_NONE,</div><div class='ctx'> 	.name = "cpm2_cascade",</div><div class='ctx'> };</div><div class='hunk'>@@ -379,13 +378,12 @@ mpc85xx_cds_pcibios_fixup(void)</div><div class='ctx'>                                         PCI_DEVICE_ID_VIA_82C586_2, NULL))) {</div><div class='ctx'>                 dev-&gt;irq = 10;</div><div class='ctx'>                 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);</div><div class='del'>-		pci_dev_put(dev);</div><div class='del'>-        }</div><div class='ctx'> </div><div class='del'>-	if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='add'>+		if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='ctx'>                                         PCI_DEVICE_ID_VIA_82C586_2, dev))) {</div><div class='del'>-                dev-&gt;irq = 11;</div><div class='del'>-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);</div><div class='add'>+	                dev-&gt;irq = 11;</div><div class='add'>+	                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);</div><div class='add'>+		}</div><div class='ctx'> 		pci_dev_put(dev);</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h<br/>index 62df54f61ae3..32c5455c8b82 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_cds_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/mpc85xx_cds_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/mpc85xx_cds_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/mpc85xx_cds_common.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __MACH_MPC85XX_CDS_H__</div><div class='ctx'> #define __MACH_MPC85XX_CDS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c<br/>index b73778ecf827..764d580ff535 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc8560.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc8560.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc8560.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/sbc8560.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/sbc8560.h b/arch/ppc/platforms/85xx/sbc8560.h<br/>index 44ffaa2d2c87..c7d61cf3a449 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc8560.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc8560.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc8560.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/sbc8560.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #ifndef __MACH_SBC8560_H__</div><div class='ctx'> #define __MACH_SBC8560_H__</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/85xx/sbc85xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CPM_MAP_ADDR    (CCSRBAR + MPC85xx_CPM_OFFSET)</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c<br/>index d3ff280510ff..2c587ca97bce 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc85xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc85xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc85xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/sbc85xx.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/sbc85xx.h b/arch/ppc/platforms/85xx/sbc85xx.h<br/>index 5dd8b6a98c9b..21ea7a55639b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc85xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/sbc85xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/sbc85xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/sbc85xx.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #ifndef __PLATFORMS_85XX_SBC85XX_H__</div><div class='ctx'> #define __PLATFORMS_85XX_SBC85XX_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c<br/>index 8d7baa9a397a..495aa79bb3a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/stx_gp3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/stx_gp3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/stx_gp3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/stx_gp3.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -167,7 +166,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cpm2_irqaction = {</div><div class='ctx'> 	.handler	= cpm2_cascade,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.mask		= CPU_MASK_NONE,</div><div class='ctx'> 	.name		= "cpm2_cascade",</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/stx_gp3.h b/arch/ppc/platforms/85xx/stx_gp3.h<br/>index 3f71f8f59370..c6e34c09e979 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/stx_gp3.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/stx_gp3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/stx_gp3.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/stx_gp3.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef __MACH_STX_GP3_H</div><div class='ctx'> #define __MACH_STX_GP3_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c<br/>index 00af132262b3..189ed4175f9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/tqm85xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/tqm85xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/tqm85xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/tqm85xx.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -191,7 +190,7 @@ static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cpm2_irqaction = {</div><div class='ctx'> 	.handler = cpm2_cascade,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.mask = CPU_MASK_NONE,</div><div class='ctx'> 	.name = "cpm2_cascade",</div><div class='ctx'> };</div><div class='head'>diff --git a/arch/ppc/platforms/85xx/tqm85xx.h b/arch/ppc/platforms/85xx/tqm85xx.h<br/>index 612d80504f9b..57284e68f676 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/tqm85xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/85xx/tqm85xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/85xx/tqm85xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/85xx/tqm85xx.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #ifndef __MACH_TQM85XX_H</div><div class='ctx'> #define __MACH_TQM85XX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/apus_pci.c b/arch/ppc/platforms/apus_pci.c<br/>index 33dad6db8243..dc165f0c8908 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/apus_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/apus_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/apus_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/apus_pci.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef CONFIG_AMIGA</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c<br/>index fe0cdc04d436..1d034ead2c9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/apus_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/apus_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/apus_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/apus_setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  Amiga specific stuff into mach/amiga.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -734,9 +733,9 @@ void apus_init_IRQ(void)</div><div class='ctx'> 	for ( i = 0 ; i &lt; AMI_IRQS; i++ ) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_LEVEL;</div><div class='ctx'> 		if (i &lt; IRQ_AMIGA_AUTO) {</div><div class='del'>-			irq_desc[i].handler = &amp;amiga_irqctrl;</div><div class='add'>+			irq_desc[i].chip = &amp;amiga_irqctrl;</div><div class='ctx'> 		} else {</div><div class='del'>-			irq_desc[i].handler = &amp;amiga_sys_irqctrl;</div><div class='add'>+			irq_desc[i].chip = &amp;amiga_sys_irqctrl;</div><div class='ctx'> 			action = &amp;amiga_sys_irqaction[i-IRQ_AMIGA_AUTO];</div><div class='ctx'> 			if (action-&gt;name)</div><div class='ctx'> 				setup_irq(i, action);</div><div class='head'>diff --git a/arch/ppc/platforms/ccm.h b/arch/ppc/platforms/ccm.h<br/>index edb87b573831..69000b1c7a4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ccm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ccm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ccm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/ccm.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __MACH_CCM_H</div><div class='ctx'> #define __MACH_CCM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c<br/>index f324f757cae1..a764ae71cbcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/chestnut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/chestnut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/chestnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/chestnut.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c<br/>index 790475c22fd7..e78bccf96c9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/cpci690.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/cpci690.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/cpci690.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/cpci690.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * is licensed "as is" without any warranty of any kind, whether express</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c<br/>index 31e8e21e1d5c..4957a7bcde22 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ev64260.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ev64260.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ev64260.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/ev64260.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * Note: The 750CXe and 7450 are not stable with a 125MHz or 133MHz TCLK/SYSCLK.</div><div class='ctx'>  * 	At 100MHz, they are solid.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c<br/>index 104ac9b16e8b..90ed375c9b90 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ev64360.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ev64360.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ev64360.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/ev64360.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/fads.h b/arch/ppc/platforms/fads.h<br/>index e1c0b1b6dcb3..2f9f0f60e3f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/fads.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/fads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/fads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/fads.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #ifndef __ASM_FADS_H__</div><div class='ctx'> #define __ASM_FADS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/gemini_prom.S b/arch/ppc/platforms/gemini_prom.S<br/>index b181f2108001..e8c84d24f01f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/gemini_prom.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/gemini_prom.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/gemini_prom.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/gemini_prom.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *    ---Dan</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;platforms/gemini.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/gemini_serial.h b/arch/ppc/platforms/gemini_serial.h<br/>index 69855aeec888..b915eff79fdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/gemini_serial.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/gemini_serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/gemini_serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/gemini_serial.h</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #ifndef __ASMPPC_GEMINI_SERIAL_H</div><div class='ctx'> #define __ASMPPC_GEMINI_SERIAL_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;platforms/gemini.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_MANY_PORTS</div><div class='head'>diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c<br/>index 0090ff154608..f48048f362a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/gemini_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/gemini_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/gemini_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/gemini_setup.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c<br/>index 75dc2ee87d2f..e0f112a1fd0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/hdpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/hdpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/hdpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/hdpu.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -838,7 +837,7 @@ static void smp_hdpu_setup_cpu(int cpu_nr)</div><div class='ctx'> 		mv64x60_write(&amp;bh, MV64360_CPU0_DOORBELL_CLR, 0xff);</div><div class='ctx'> 		mv64x60_write(&amp;bh, MV64360_CPU0_DOORBELL_MASK, 0xff);</div><div class='ctx'> 		request_irq(60, hdpu_smp_cpu0_int_handler,</div><div class='del'>-			    SA_INTERRUPT, hdpu_smp0, 0);</div><div class='add'>+			    IRQF_DISABLED, hdpu_smp0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_nr == 1) {</div><div class='hunk'>@@ -858,7 +857,7 @@ static void smp_hdpu_setup_cpu(int cpu_nr)</div><div class='ctx'> 		mv64x60_write(&amp;bh, MV64360_CPU1_DOORBELL_CLR, 0x0);</div><div class='ctx'> 		mv64x60_write(&amp;bh, MV64360_CPU1_DOORBELL_MASK, 0xff);</div><div class='ctx'> 		request_irq(28, hdpu_smp_cpu1_int_handler,</div><div class='del'>-			    SA_INTERRUPT, hdpu_smp1, 0);</div><div class='add'>+			    IRQF_DISABLED, hdpu_smp1, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ppc/platforms/hermes.h b/arch/ppc/platforms/hermes.h<br/>index 198fc590b9f5..de91afff8ca1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/hermes.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/hermes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/hermes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/hermes.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __MACH_HERMES_H</div><div class='ctx'> #define __MACH_HERMES_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/ip860.h b/arch/ppc/platforms/ip860.h<br/>index 8c3836c5f054..2f1f86ce1447 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ip860.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ip860.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ip860.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/ip860.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __MACH_IP860_H</div><div class='ctx'> #define __MACH_IP860_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/ivms8.h b/arch/ppc/platforms/ivms8.h<br/>index d4be310f8084..9109e684ad9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ivms8.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/ivms8.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/ivms8.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/ivms8.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #ifndef __ASM_IVMS8_H__</div><div class='ctx'> #define __ASM_IVMS8_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c<br/>index ad21280e8920..720f8b3e2fbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/katana.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/katana.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/katana.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/katana.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Supports the Artesyn 750i, 752i, and 3750.  The 752i is virtually identical</div><div class='ctx'>  * to the 750i except that it has an mv64460 bridge.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/lantec.h b/arch/ppc/platforms/lantec.h<br/>index 8c87642c510f..5e5eb6d0f6aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lantec.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lantec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lantec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/lantec.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __MACH_LANTEC_H</div><div class='ctx'> #define __MACH_LANTEC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/lite5200.c b/arch/ppc/platforms/lite5200.c<br/>index fecbe9adc9e0..b9e9db63f65b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lite5200.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lite5200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lite5200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/lite5200.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/lopec.c b/arch/ppc/platforms/lopec.c<br/>index c6445a727ca3..18dc6e8dd4f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lopec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lopec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lopec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/lopec.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/lwmon.h b/arch/ppc/platforms/lwmon.h<br/>index 995bf5112df0..e63f3b07a5db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lwmon.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/lwmon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/lwmon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/lwmon.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __MACH_LWMON_H</div><div class='ctx'> #define __MACH_LWMON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c<br/>index d919dab61347..f19b6167c770 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mpc866ads_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mpc866ads_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mpc866ads_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/mpc866ads_setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/mpc885ads.h b/arch/ppc/platforms/mpc885ads.h<br/>index a80b7d116b49..d3bbbb3c9a1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mpc885ads.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mpc885ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mpc885ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/mpc885ads.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __ASM_MPC885ADS_H__</div><div class='ctx'> #define __ASM_MPC885ADS_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c<br/>index 4b88679cd31c..c1fc4a16fea9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mpc885ads_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mpc885ads_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mpc885ads_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/mpc885ads_setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/mvme5100.c b/arch/ppc/platforms/mvme5100.c<br/>index c717cd92c028..bb8d4a45437a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mvme5100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/mvme5100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/mvme5100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/mvme5100.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/pal4_setup.c b/arch/ppc/platforms/pal4_setup.c<br/>index 3c3d881df00d..3da47d9ec7a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pal4_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pal4_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pal4_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/pal4_setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/pcu_e.h b/arch/ppc/platforms/pcu_e.h<br/>index 91a820a6fbc4..a2c03a22875e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pcu_e.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pcu_e.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pcu_e.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/pcu_e.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __MACH_PCU_E_H</div><div class='ctx'> #define __MACH_PCU_E_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/powerpmc250.c b/arch/ppc/platforms/powerpmc250.c<br/>index c3a86be11fb7..4d46650e07fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/powerpmc250.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/powerpmc250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/powerpmc250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/powerpmc250.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c<br/>index de2761ebe0d9..9778105d4dfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pplus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pplus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pplus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/pplus.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/pq2ads.h b/arch/ppc/platforms/pq2ads.h<br/>index 6b26dd36c640..2b287f4e0ca3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pq2ads.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/pq2ads.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/pq2ads.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/pq2ads.h</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #ifndef __MACH_ADS8260_DEFS</div><div class='ctx'> #define __MACH_ADS8260_DEFS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/prep_pci.c b/arch/ppc/platforms/prep_pci.c<br/>index e50b9996848c..c627ba41335f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prep_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prep_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prep_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/prep_pci.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * The motherboard routes/maps will disappear shortly. -- Cort</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c<br/>index e86f6156d589..1cb75a1f825e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prep_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prep_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prep_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/prep_setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * bootup setup stuff..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -24,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/prpmc750.c b/arch/ppc/platforms/prpmc750.c<br/>index cdd9cfb13ee9..fcab513e206d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prpmc750.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prpmc750.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prpmc750.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/prpmc750.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/prpmc800.c b/arch/ppc/platforms/prpmc800.c<br/>index e459a199fb1d..f4ade5cd7a88 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prpmc800.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/prpmc800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/prpmc800.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/prpmc800.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c<br/>index bc26b6d71c1d..3bb530af0297 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/radstone_ppc7d.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/radstone_ppc7d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/radstone_ppc7d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/radstone_ppc7d.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * SCSI / VGA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -1311,7 +1310,7 @@ static void ppc7d_init2(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Hook up i8259 interrupt which is connected to GPP28 */</div><div class='ctx'> 	request_irq(mv64360_irq_base + MV64x60_IRQ_GPP28, ppc7d_i8259_intr,</div><div class='del'>-		    SA_INTERRUPT, "I8259 (GPP28) interrupt", (void *)0);</div><div class='add'>+		    IRQF_DISABLED, "I8259 (GPP28) interrupt", (void *)0);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure MPP16 as watchdog NMI, MPP17 as watchdog WDE */</div><div class='ctx'> 	spin_lock_irqsave(&amp;mv64x60_lock, flags);</div><div class='head'>diff --git a/arch/ppc/platforms/rpxclassic.h b/arch/ppc/platforms/rpxclassic.h<br/>index 6daa109491c4..57a2a55dab8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/rpxclassic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/rpxclassic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/rpxclassic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/rpxclassic.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #ifndef __MACH_RPX_DEFS</div><div class='ctx'> #define __MACH_RPX_DEFS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /* A Board Information structure that is given to a program when</div><div class='head'>diff --git a/arch/ppc/platforms/rpxlite.h b/arch/ppc/platforms/rpxlite.h<br/>index deee5bd36aa8..719780646270 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/rpxlite.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/rpxlite.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/rpxlite.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/rpxlite.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #ifndef __MACH_RPX_DEFS</div><div class='ctx'> #define __MACH_RPX_DEFS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> /* A Board Information structure that is given to a program when</div><div class='head'>diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c<br/>index 6dc459decb2d..a76002af686f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/sandpoint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/sandpoint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/sandpoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/sandpoint.c</a></div><div class='hunk'>@@ -60,7 +60,6 @@</div><div class='ctx'>  * found, we can hopefully stop hardcoding 32MB of RAM.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c<br/>index 866807b4ad0b..60b769c7f3fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/sbc82xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/sbc82xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/sbc82xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/sbc82xx.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -146,7 +145,7 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re</div><div class='ctx'> </div><div class='ctx'> static struct irqaction sbc82xx_i8259_irqaction = {</div><div class='ctx'> 	.handler = sbc82xx_i8259_demux,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.mask = CPU_MASK_NONE,</div><div class='ctx'> 	.name = "i8259 demux",</div><div class='ctx'> };</div><div class='hunk'>@@ -172,7 +171,7 @@ void __init sbc82xx_init_IRQ(void)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Set up the interrupt handlers for the i8259 IRQs */</div><div class='ctx'> 	for (i = NR_SIU_INTS; i &lt; NR_SIU_INTS + 8; i++) {</div><div class='del'>-                irq_desc[i].handler = &amp;sbc82xx_i8259_ic;</div><div class='add'>+                irq_desc[i].chip = &amp;sbc82xx_i8259_ic;</div><div class='ctx'> 		irq_desc[i].status |= IRQ_LEVEL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c<br/>index 3783deccd9b2..3c7842784876 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/spruce.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/spruce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/spruce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/spruce.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/platforms/tqm8260.h b/arch/ppc/platforms/tqm8260.h<br/>index c7a78a646c66..7f8c9a6928f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/tqm8260.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/tqm8260.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/tqm8260.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/tqm8260.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __TQM8260_PLATFORM</div><div class='ctx'> #define __TQM8260_PLATFORM</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/platforms/tqm8xx.h b/arch/ppc/platforms/tqm8xx.h<br/>index 43ac064ebe5a..662131d0eb39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/platforms/tqm8xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/platforms/tqm8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/platforms/tqm8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/platforms/tqm8xx.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #ifndef __MACH_TQM8xx_H</div><div class='ctx'> #define __MACH_TQM8xx_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile<br/>index 490749ca88f9..2497bbc07e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/Makefile</a></div><div class='hunk'>@@ -104,3 +104,5 @@ obj-$(CONFIG_PPC_MPC52xx)	+= mpc52xx_setup.o mpc52xx_pic.o \</div><div class='ctx'> ifeq ($(CONFIG_PPC_MPC52xx),y)</div><div class='ctx'> obj-$(CONFIG_PCI)		+= mpc52xx_pci.o</div><div class='ctx'> endif</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_PPC_I8259)		+= i8259.o</div><div class='head'>diff --git a/arch/ppc/syslib/btext.c b/arch/ppc/syslib/btext.c<br/>index 12fa83e6774a..d11667046f21 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/btext.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/btext.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/btext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/btext.c</a></div><div class='hunk'>@@ -3,11 +3,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/bootx.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/cpc700_pic.c b/arch/ppc/syslib/cpc700_pic.c<br/>index 5add0a919ef6..172aa215fdb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/cpc700_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/cpc700_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/cpc700_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/cpc700_pic.c</a></div><div class='hunk'>@@ -140,12 +140,12 @@ cpc700_init_IRQ(void)</div><div class='ctx'> 						        /* IRQ 0 is highest */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 17; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;cpc700_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;cpc700_pic;</div><div class='ctx'> 		cpc700_pic_init_irq(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 20; i &lt; 32; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;cpc700_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;cpc700_pic;</div><div class='ctx'> 		cpc700_pic_init_irq(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/cpm2_pic.c b/arch/ppc/syslib/cpm2_pic.c<br/>index 29d95d415ceb..c0fee0beb815 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/cpm2_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/cpm2_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/cpm2_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/cpm2_pic.c</a></div><div class='hunk'>@@ -171,7 +171,7 @@ void cpm2_init_IRQ(void)</div><div class='ctx'> 	/* Enable chaining to OpenPIC, and make everything level</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; NR_CPM_INTS; i++) {</div><div class='del'>-		irq_desc[i+CPM_IRQ_OFFSET].handler = &amp;cpm2_pic;</div><div class='add'>+		irq_desc[i+CPM_IRQ_OFFSET].chip = &amp;cpm2_pic;</div><div class='ctx'> 		irq_desc[i+CPM_IRQ_OFFSET].status |= IRQ_LEVEL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ppc/syslib/gen550_dbg.c b/arch/ppc/syslib/gen550_dbg.c<br/>index 9fcff74bfdd0..9293f5c59099 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/gen550_dbg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/gen550_dbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/gen550_dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/gen550_dbg.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;		/* For linux/serial_core.h */</div><div class='head'>diff --git a/arch/ppc/syslib/gen550_kgdb.c b/arch/ppc/syslib/gen550_kgdb.c<br/>index 874078a7664d..987cc0414e6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/gen550_kgdb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/gen550_kgdb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/gen550_kgdb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/gen550_kgdb.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/gt64260_pic.c b/arch/ppc/syslib/gt64260_pic.c<br/>index dc3bd9ecbbf6..7fd550a7d586 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/gt64260_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/gt64260_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/gt64260_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/gt64260_pic.c</a></div><div class='hunk'>@@ -98,7 +98,7 @@ gt64260_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	/* use the gt64260 for all (possible) interrupt sources */</div><div class='ctx'> 	for (i = gt64260_irq_base; i &lt; (gt64260_irq_base + 96); i++)</div><div class='del'>-		irq_desc[i].handler = &amp;gt64260_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;gt64260_pic;</div><div class='ctx'> </div><div class='ctx'> 	if (ppc_md.progress)</div><div class='ctx'> 		ppc_md.progress("gt64260_init_irq: exit", 0x0);</div><div class='hunk'>@@ -297,7 +297,7 @@ gt64260_register_hdlrs(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Register CPU interface error interrupt handler */</div><div class='ctx'> 	if ((rc = request_irq(MV64x60_IRQ_CPU_ERR,</div><div class='del'>-		gt64260_cpu_error_int_handler, SA_INTERRUPT, CPU_INTR_STR, 0)))</div><div class='add'>+		gt64260_cpu_error_int_handler, IRQF_DISABLED, CPU_INTR_STR, 0)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register cpu error handler: %d", rc);</div><div class='ctx'> </div><div class='ctx'> 	mv64x60_write(&amp;bh, MV64x60_CPU_ERR_MASK, 0);</div><div class='hunk'>@@ -305,7 +305,7 @@ gt64260_register_hdlrs(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Register PCI 0 error interrupt handler */</div><div class='ctx'> 	if ((rc = request_irq(MV64360_IRQ_PCI0, gt64260_pci_error_int_handler,</div><div class='del'>-		    SA_INTERRUPT, PCI0_INTR_STR, (void *)0)))</div><div class='add'>+		    IRQF_DISABLED, PCI0_INTR_STR, (void *)0)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register pci 0 error handler: %d",</div><div class='ctx'> 			rc);</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +314,7 @@ gt64260_register_hdlrs(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Register PCI 1 error interrupt handler */</div><div class='ctx'> 	if ((rc = request_irq(MV64360_IRQ_PCI1, gt64260_pci_error_int_handler,</div><div class='del'>-		    SA_INTERRUPT, PCI1_INTR_STR, (void *)1)))</div><div class='add'>+		    IRQF_DISABLED, PCI1_INTR_STR, (void *)1)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register pci 1 error handler: %d",</div><div class='ctx'> 			rc);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c<br/>new file mode 100644<br/>index 000000000000..eb35353af837<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/i8259.c</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+/*</div><div class='add'>+ * i8259 interrupt controller driver.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/i8259.h&gt;</div><div class='add'>+</div><div class='add'>+static volatile void __iomem *pci_intack; /* RO, gives us the irq vector */</div><div class='add'>+</div><div class='add'>+static unsigned char cached_8259[2] = { 0xff, 0xff };</div><div class='add'>+#define cached_A1 (cached_8259[0])</div><div class='add'>+#define cached_21 (cached_8259[1])</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(i8259_lock);</div><div class='add'>+</div><div class='add'>+static int i8259_pic_irq_offset;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Acknowledge the IRQ using either the PCI host bridge's interrupt</div><div class='add'>+ * acknowledge feature or poll.  How i8259_init() is called determines</div><div class='add'>+ * which is called.  It should be noted that polling is broken on some</div><div class='add'>+ * IBM and Motorola PReP boxes so we must use the int-ack feature on them.</div><div class='add'>+ */</div><div class='add'>+int i8259_irq(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;i8259_lock);</div><div class='add'>+</div><div class='add'>+	/* Either int-ack or poll for the IRQ */</div><div class='add'>+	if (pci_intack)</div><div class='add'>+		irq = readb(pci_intack);</div><div class='add'>+	else {</div><div class='add'>+		/* Perform an interrupt acknowledge cycle on controller 1. */</div><div class='add'>+		outb(0x0C, 0x20);		/* prepare for poll */</div><div class='add'>+		irq = inb(0x20) &amp; 7;</div><div class='add'>+		if (irq == 2 ) {</div><div class='add'>+			/*</div><div class='add'>+			 * Interrupt is cascaded so perform interrupt</div><div class='add'>+			 * acknowledge on controller 2.</div><div class='add'>+			 */</div><div class='add'>+			outb(0x0C, 0xA0);	/* prepare for poll */</div><div class='add'>+			irq = (inb(0xA0) &amp; 7) + 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq == 7) {</div><div class='add'>+		/*</div><div class='add'>+		 * This may be a spurious interrupt.</div><div class='add'>+		 *</div><div class='add'>+		 * Read the interrupt status register (ISR). If the most</div><div class='add'>+		 * significant bit is not set then there is no valid</div><div class='add'>+		 * interrupt.</div><div class='add'>+		 */</div><div class='add'>+		if (!pci_intack)</div><div class='add'>+			outb(0x0B, 0x20);	/* ISR register */</div><div class='add'>+		if(~inb(0x20) &amp; 0x80)</div><div class='add'>+			irq = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;i8259_lock);</div><div class='add'>+	return irq + i8259_pic_irq_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i8259_mask_and_ack_irq(unsigned int irq_nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='add'>+	irq_nr -= i8259_pic_irq_offset;</div><div class='add'>+	if (irq_nr &gt; 7) {</div><div class='add'>+		cached_A1 |= 1 &lt;&lt; (irq_nr-8);</div><div class='add'>+		inb(0xA1); 	/* DUMMY */</div><div class='add'>+		outb(cached_A1, 0xA1);</div><div class='add'>+		outb(0x20, 0xA0);	/* Non-specific EOI */</div><div class='add'>+		outb(0x20, 0x20);	/* Non-specific EOI to cascade */</div><div class='add'>+	} else {</div><div class='add'>+		cached_21 |= 1 &lt;&lt; irq_nr;</div><div class='add'>+		inb(0x21); 	/* DUMMY */</div><div class='add'>+		outb(cached_21, 0x21);</div><div class='add'>+		outb(0x20, 0x20);	/* Non-specific EOI */</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8259_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i8259_set_irq_mask(int irq_nr)</div><div class='add'>+{</div><div class='add'>+	outb(cached_A1,0xA1);</div><div class='add'>+	outb(cached_21,0x21);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i8259_mask_irq(unsigned int irq_nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='add'>+	irq_nr -= i8259_pic_irq_offset;</div><div class='add'>+	if (irq_nr &lt; 8)</div><div class='add'>+		cached_21 |= 1 &lt;&lt; irq_nr;</div><div class='add'>+	else</div><div class='add'>+		cached_A1 |= 1 &lt;&lt; (irq_nr-8);</div><div class='add'>+	i8259_set_irq_mask(irq_nr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8259_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i8259_unmask_irq(unsigned int irq_nr)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='add'>+	irq_nr -= i8259_pic_irq_offset;</div><div class='add'>+	if (irq_nr &lt; 8)</div><div class='add'>+		cached_21 &amp;= ~(1 &lt;&lt; irq_nr);</div><div class='add'>+	else</div><div class='add'>+		cached_A1 &amp;= ~(1 &lt;&lt; (irq_nr-8));</div><div class='add'>+	i8259_set_irq_mask(irq_nr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8259_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip i8259_pic = {</div><div class='add'>+	.typename	= " i8259    ",</div><div class='add'>+	.mask		= i8259_mask_irq,</div><div class='add'>+	.unmask		= i8259_unmask_irq,</div><div class='add'>+	.mask_ack	= i8259_mask_and_ack_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pic1_iores = {</div><div class='add'>+	.name = "8259 (master)",</div><div class='add'>+	.start = 0x20,</div><div class='add'>+	.end = 0x21,</div><div class='add'>+	.flags = IORESOURCE_BUSY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pic2_iores = {</div><div class='add'>+	.name = "8259 (slave)",</div><div class='add'>+	.start = 0xa0,</div><div class='add'>+	.end = 0xa1,</div><div class='add'>+	.flags = IORESOURCE_BUSY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct resource pic_edgectrl_iores = {</div><div class='add'>+	.name = "8259 edge control",</div><div class='add'>+	.start = 0x4d0,</div><div class='add'>+	.end = 0x4d1,</div><div class='add'>+	.flags = IORESOURCE_BUSY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct irqaction i8259_irqaction = {</div><div class='add'>+	.handler = no_action,</div><div class='add'>+	.flags = SA_INTERRUPT,</div><div class='add'>+	.mask = CPU_MASK_NONE,</div><div class='add'>+	.name = "82c59 secondary cascade",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * i8259_init()</div><div class='add'>+ * intack_addr - PCI interrupt acknowledge (real) address which will return</div><div class='add'>+ *               the active irq from the 8259</div><div class='add'>+ */</div><div class='add'>+void __init i8259_init(unsigned long intack_addr, int offset)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;i8259_lock, flags);</div><div class='add'>+	i8259_pic_irq_offset = offset;</div><div class='add'>+</div><div class='add'>+	/* init master interrupt controller */</div><div class='add'>+	outb(0x11, 0x20); /* Start init sequence */</div><div class='add'>+	outb(0x00, 0x21); /* Vector base */</div><div class='add'>+	outb(0x04, 0x21); /* edge tiggered, Cascade (slave) on IRQ2 */</div><div class='add'>+	outb(0x01, 0x21); /* Select 8086 mode */</div><div class='add'>+</div><div class='add'>+	/* init slave interrupt controller */</div><div class='add'>+	outb(0x11, 0xA0); /* Start init sequence */</div><div class='add'>+	outb(0x08, 0xA1); /* Vector base */</div><div class='add'>+	outb(0x02, 0xA1); /* edge triggered, Cascade (slave) on IRQ2 */</div><div class='add'>+	outb(0x01, 0xA1); /* Select 8086 mode */</div><div class='add'>+</div><div class='add'>+	/* always read ISR */</div><div class='add'>+	outb(0x0B, 0x20);</div><div class='add'>+	outb(0x0B, 0xA0);</div><div class='add'>+</div><div class='add'>+	/* Mask all interrupts */</div><div class='add'>+	outb(cached_A1, 0xA1);</div><div class='add'>+	outb(cached_21, 0x21);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;i8259_lock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_ISA_INTERRUPTS; ++i) {</div><div class='add'>+		set_irq_chip_and_handler(offset + i, &amp;i8259_pic,</div><div class='add'>+					 handle_level_irq);</div><div class='add'>+		irq_desc[offset + i].status |= IRQ_LEVEL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reserve our resources */</div><div class='add'>+	setup_irq(offset + 2, &amp;i8259_irqaction);</div><div class='add'>+	request_resource(&amp;ioport_resource, &amp;pic1_iores);</div><div class='add'>+	request_resource(&amp;ioport_resource, &amp;pic2_iores);</div><div class='add'>+	request_resource(&amp;ioport_resource, &amp;pic_edgectrl_iores);</div><div class='add'>+</div><div class='add'>+	if (intack_addr != 0)</div><div class='add'>+		pci_intack = ioremap(intack_addr, 1);</div><div class='add'>+</div><div class='add'>+}</div><div class='head'>diff --git a/arch/ppc/syslib/ibm440gp_common.c b/arch/ppc/syslib/ibm440gp_common.c<br/>index fbaae5f6d834..a3927ec9b5d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gp_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gp_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gp_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ibm440gp_common.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/reg.h&gt;</div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ibm440gp_common.h b/arch/ppc/syslib/ibm440gp_common.h<br/>index f48529f3c23d..94d7835038ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gp_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gp_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gp_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ibm440gp_common.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;syslib/ibm44x_common.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c<br/>index f6cc16888527..4b77e6c8c87f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gx_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gx_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gx_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ibm440gx_common.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='hunk'>@@ -150,7 +149,7 @@ void __init ibm440gx_l2c_enable(void){</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Install error handler */</div><div class='del'>-	if (request_irq(87, l2c_error_handler, SA_INTERRUPT, "L2C", 0) &lt; 0){</div><div class='add'>+	if (request_irq(87, l2c_error_handler, IRQF_DISABLED, "L2C", 0) &lt; 0){</div><div class='ctx'> 		printk(KERN_ERR "Cannot install L2C error handler, cache is not enabled\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/ppc/syslib/ibm440gx_common.h b/arch/ppc/syslib/ibm440gx_common.h<br/>index a03ec6022e8f..8d6f203e7a1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gx_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440gx_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440gx_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ibm440gx_common.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef __ASSEMBLY__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;syslib/ibm44x_common.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ibm440sp_common.c b/arch/ppc/syslib/ibm440sp_common.c<br/>index 293e4138d172..571f8bcf78e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440sp_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm440sp_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm440sp_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ibm440sp_common.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c<br/>index 14a981a5cea7..01f99b4a6649 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm44x_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ibm44x_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ibm44x_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ibm44x_common.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c<br/>index 99e4bc0e42af..974581ea4849 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m8260_pci_erratum9.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m8260_pci_erratum9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m8260_pci_erratum9.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/m8260_pci_erratum9.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c<br/>index b7a6cb2d8d52..15f0d7323535 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m8260_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m8260_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m8260_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/m8260_setup.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  Further modified for generic 8xx and 8260 by Dan.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c<br/>index 1941a8c7ca9a..d3fa264e179e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m82xx_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m82xx_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m82xx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/m82xx_pci.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction pq2pci_irqaction = {</div><div class='ctx'> 	.handler = pq2pci_irq_demux,</div><div class='del'>-	.flags 	 = SA_INTERRUPT,</div><div class='add'>+	.flags 	 = IRQF_DISABLED,</div><div class='ctx'> 	.mask	 = CPU_MASK_NONE,</div><div class='ctx'> 	.name	 = "PQ2 PCI cascade",</div><div class='ctx'> };</div><div class='hunk'>@@ -159,7 +159,7 @@ pq2pci_init_irq(void)</div><div class='ctx'> 	immap-&gt;im_memctl.memc_or8 = 0xffff8010;</div><div class='ctx'> #endif</div><div class='ctx'> 	for (irq = NR_CPM_INTS; irq &lt; NR_CPM_INTS + 4; irq++)</div><div class='del'>-		irq_desc[irq].handler = &amp;pq2pci_ic;</div><div class='add'>+		irq_desc[irq].chip = &amp;pq2pci_ic;</div><div class='ctx'> </div><div class='ctx'> 	/* make PCI IRQ level sensitive */</div><div class='ctx'> 	immap-&gt;im_intctl.ic_siexr &amp;=</div><div class='head'>diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c<br/>index dae9af78bde1..54303a7b4e69 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m8xx_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/m8xx_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/m8xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/m8xx_setup.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * bootup setup stuff..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -347,13 +346,13 @@ m8xx_init_IRQ(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = SIU_IRQ_OFFSET ; i &lt; SIU_IRQ_OFFSET + NR_SIU_INTS ; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;ppc8xx_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;ppc8xx_pic;</div><div class='ctx'> </div><div class='ctx'> 	cpm_interrupt_init();</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PCI)</div><div class='ctx'> 	for (i = I8259_IRQ_OFFSET ; i &lt; I8259_IRQ_OFFSET + NR_8259_INTS ; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;i8259_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;i8259_pic;</div><div class='ctx'> </div><div class='ctx'> 	i8259_pic_irq_offset = I8259_IRQ_OFFSET;</div><div class='ctx'> 	i8259_init(0);</div><div class='head'>diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c<br/>index 5a5a7a9cd248..20a0eac0dc3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc52xx_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc52xx_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc52xx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/mpc52xx_pci.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pci.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c<br/>index c4406f9dc6a3..6425b5cee7db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc52xx_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc52xx_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc52xx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/mpc52xx_pic.c</a></div><div class='hunk'>@@ -204,9 +204,9 @@ mpc52xx_init_irq(void)</div><div class='ctx'> 	out_be32(&amp;intr-&gt;main_pri1, 0);</div><div class='ctx'> 	out_be32(&amp;intr-&gt;main_pri2, 0);</div><div class='ctx'> </div><div class='del'>-	/* Initialize irq_desc[i].handler's with mpc52xx_ic. */</div><div class='add'>+	/* Initialize irq_desc[i].chip's with mpc52xx_ic. */</div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;mpc52xx_ic;</div><div class='add'>+		irq_desc[i].chip = &amp;mpc52xx_ic;</div><div class='ctx'> 		irq_desc[i].status = IRQ_LEVEL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c<br/>index ee6379bb415e..80c609019bda 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc52xx_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc52xx_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc52xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/mpc52xx_setup.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c<br/>index 1af2c000fcfa..5c4932ca8e9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc83xx_devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mpc83xx_devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mpc83xx_devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/mpc83xx_devices.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ struct platform_device ppc_sys_platform_devices[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[MPC83xx_USB2_DR] = {</div><div class='del'>-		.name = "fsl-usb2-dr",</div><div class='add'>+		.name = "fsl-ehci",</div><div class='ctx'> 		.id	= 1,</div><div class='ctx'> 		.num_resources	 = 2,</div><div class='ctx'> 		.resource = (struct resource[]) {</div><div class='hunk'>@@ -203,8 +203,8 @@ struct platform_device ppc_sys_platform_devices[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[MPC83xx_USB2_MPH] = {</div><div class='del'>-		.name = "fsl-usb2-mph",</div><div class='del'>-		.id	= 1,</div><div class='add'>+		.name = "fsl-ehci",</div><div class='add'>+		.id	= 2,</div><div class='ctx'> 		.num_resources	 = 2,</div><div class='ctx'> 		.resource = (struct resource[]) {</div><div class='ctx'> 			{</div><div class='head'>diff --git a/arch/ppc/syslib/mv64360_pic.c b/arch/ppc/syslib/mv64360_pic.c<br/>index 5a19697060f0..3f6d162f87cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mv64360_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mv64360_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mv64360_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/mv64360_pic.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ mv64360_init_irq(void)</div><div class='ctx'> 	/* All interrupts are level interrupts */</div><div class='ctx'> 	for (i = mv64360_irq_base; i &lt; (mv64360_irq_base + 96); i++) {</div><div class='ctx'> 		irq_desc[i].status |= IRQ_LEVEL;</div><div class='del'>-		irq_desc[i].handler = &amp;mv64360_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;mv64360_pic;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ppc_md.progress)</div><div class='hunk'>@@ -380,7 +380,7 @@ mv64360_register_hdlrs(void)</div><div class='ctx'> 	/* Clear old errors and register CPU interface error intr handler */</div><div class='ctx'> 	mv64x60_write(&amp;bh, MV64x60_CPU_ERR_CAUSE, 0);</div><div class='ctx'> 	if ((rc = request_irq(MV64x60_IRQ_CPU_ERR + mv64360_irq_base,</div><div class='del'>-		mv64360_cpu_error_int_handler, SA_INTERRUPT, CPU_INTR_STR, 0)))</div><div class='add'>+		mv64360_cpu_error_int_handler, IRQF_DISABLED, CPU_INTR_STR, 0)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register cpu error handler: %d", rc);</div><div class='ctx'> </div><div class='ctx'> 	mv64x60_write(&amp;bh, MV64x60_CPU_ERR_MASK, 0);</div><div class='hunk'>@@ -389,14 +389,14 @@ mv64360_register_hdlrs(void)</div><div class='ctx'> 	/* Clear old errors and register internal SRAM error intr handler */</div><div class='ctx'> 	mv64x60_write(&amp;bh, MV64360_SRAM_ERR_CAUSE, 0);</div><div class='ctx'> 	if ((rc = request_irq(MV64360_IRQ_SRAM_PAR_ERR + mv64360_irq_base,</div><div class='del'>-		mv64360_sram_error_int_handler,SA_INTERRUPT,SRAM_INTR_STR, 0)))</div><div class='add'>+		mv64360_sram_error_int_handler,IRQF_DISABLED,SRAM_INTR_STR, 0)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register SRAM error handler: %d",rc);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear old errors and register PCI 0 error intr handler */</div><div class='ctx'> 	mv64x60_write(&amp;bh, MV64x60_PCI0_ERR_CAUSE, 0);</div><div class='ctx'> 	if ((rc = request_irq(MV64360_IRQ_PCI0 + mv64360_irq_base,</div><div class='ctx'> 			mv64360_pci_error_int_handler,</div><div class='del'>-			SA_INTERRUPT, PCI0_INTR_STR, (void *)0)))</div><div class='add'>+			IRQF_DISABLED, PCI0_INTR_STR, (void *)0)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register pci 0 error handler: %d",</div><div class='ctx'> 			rc);</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +411,7 @@ mv64360_register_hdlrs(void)</div><div class='ctx'> 	mv64x60_write(&amp;bh, MV64x60_PCI1_ERR_CAUSE, 0);</div><div class='ctx'> 	if ((rc = request_irq(MV64360_IRQ_PCI1 + mv64360_irq_base,</div><div class='ctx'> 			mv64360_pci_error_int_handler,</div><div class='del'>-			SA_INTERRUPT, PCI1_INTR_STR, (void *)1)))</div><div class='add'>+			IRQF_DISABLED, PCI1_INTR_STR, (void *)1)))</div><div class='ctx'> 		printk(KERN_WARNING "Can't register pci 1 error handler: %d",</div><div class='ctx'> 			rc);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/mv64x60_dbg.c b/arch/ppc/syslib/mv64x60_dbg.c<br/>index 9cf18764a1a1..e1876261e5dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mv64x60_dbg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/mv64x60_dbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/mv64x60_dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/mv64x60_dbg.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/mv64x60.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c<br/>index a4ecc2ee579f..50c55622ece9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ocp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ocp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ocp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ocp.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c<br/>index 70456c8f998c..aa0b95788705 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/open_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/open_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/open_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/open_pic.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -373,7 +372,7 @@ void __init openpic_init(int offset)</div><div class='ctx'> 				OPENPIC_VEC_IPI+i+offset);</div><div class='ctx'> 		/* IPIs are per-CPU */</div><div class='ctx'> 		irq_desc[OPENPIC_VEC_IPI+i+offset].status |= IRQ_PER_CPU;</div><div class='del'>-		irq_desc[OPENPIC_VEC_IPI+i+offset].handler = &amp;open_pic_ipi;</div><div class='add'>+		irq_desc[OPENPIC_VEC_IPI+i+offset].chip = &amp;open_pic_ipi;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -408,7 +407,7 @@ void __init openpic_init(int offset)</div><div class='ctx'> </div><div class='ctx'> 	/* Init descriptors */</div><div class='ctx'> 	for (i = offset; i &lt; NumSources + offset; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;open_pic;</div><div class='add'>+		irq_desc[i].chip = &amp;open_pic;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the spurious interrupt */</div><div class='ctx'> 	if (ppc_md.progress) ppc_md.progress("openpic: spurious",0x3bd);</div><div class='hunk'>@@ -576,18 +575,21 @@ void openpic_request_IPIs(void)</div><div class='ctx'> 	if (OpenPIC == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */</div><div class='add'>+	/*</div><div class='add'>+ 	 * IPIs are marked IRQF_DISABLED as they must run with irqs</div><div class='add'>+	 * disabled</div><div class='add'>+	 */</div><div class='ctx'> 	request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset,</div><div class='del'>-		    openpic_ipi_action, SA_INTERRUPT,</div><div class='add'>+		    openpic_ipi_action, IRQF_DISABLED,</div><div class='ctx'> 		    "IPI0 (call function)", NULL);</div><div class='ctx'> 	request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+1,</div><div class='del'>-		    openpic_ipi_action, SA_INTERRUPT,</div><div class='add'>+		    openpic_ipi_action, IRQF_DISABLED,</div><div class='ctx'> 		    "IPI1 (reschedule)", NULL);</div><div class='ctx'> 	request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+2,</div><div class='del'>-		    openpic_ipi_action, SA_INTERRUPT,</div><div class='add'>+		    openpic_ipi_action, IRQF_DISABLED,</div><div class='ctx'> 		    "IPI2 (invalidate tlb)", NULL);</div><div class='ctx'> 	request_irq(OPENPIC_VEC_IPI+open_pic_irq_offset+3,</div><div class='del'>-		    openpic_ipi_action, SA_INTERRUPT,</div><div class='add'>+		    openpic_ipi_action, IRQF_DISABLED,</div><div class='ctx'> 		    "IPI3 (xmon break)", NULL);</div><div class='ctx'> </div><div class='ctx'> 	for ( i = 0; i &lt; OPENPIC_NUM_IPI ; i++ )</div><div class='hunk'>@@ -615,8 +617,8 @@ void __devinit do_openpic_setup_cpu(void)</div><div class='ctx'>  	/* let the openpic know we want intrs. default affinity</div><div class='ctx'>  	 * is 0xffffffff until changed via /proc</div><div class='ctx'>  	 * That's how it's done on x86. If we want it differently, then</div><div class='del'>- 	 * we should make sure we also change the default values of irq_affinity</div><div class='del'>- 	 * in irq.c.</div><div class='add'>+ 	 * we should make sure we also change the default values of</div><div class='add'>+	 * irq_desc[].affinity in irq.c.</div><div class='ctx'>  	 */</div><div class='ctx'>  	for (i = 0; i &lt; NumSources; i++)</div><div class='ctx'> 		openpic_mapirq(i, msk, CPU_MASK_ALL);</div><div class='hunk'>@@ -692,7 +694,7 @@ openpic_init_nmi_irq(u_int irq)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction openpic_cascade_irqaction = {</div><div class='ctx'> 	.handler = no_action,</div><div class='del'>-	.flags = SA_INTERRUPT,</div><div class='add'>+	.flags = IRQF_DISABLED,</div><div class='ctx'> 	.mask = CPU_MASK_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c<br/>index bcbe40de26fe..e1ff971539ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/open_pic2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/open_pic2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/open_pic2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/open_pic2.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  register accesses</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -290,7 +289,7 @@ void __init openpic2_init(int offset)</div><div class='ctx'> </div><div class='ctx'> 	/* Init descriptors */</div><div class='ctx'> 	for (i = offset; i &lt; NumSources + offset; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;open_pic2;</div><div class='add'>+		irq_desc[i].chip = &amp;open_pic2;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the spurious interrupt */</div><div class='ctx'> 	if (ppc_md.progress) ppc_md.progress("openpic2: spurious",0x3bd);</div><div class='head'>diff --git a/arch/ppc/syslib/ppc403_pic.c b/arch/ppc/syslib/ppc403_pic.c<br/>index c46043c47225..1584c8b1229f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc403_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc403_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc403_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc403_pic.c</a></div><div class='hunk'>@@ -121,5 +121,5 @@ ppc4xx_pic_init(void)</div><div class='ctx'> 	ppc_md.get_irq = ppc403_pic_get_irq;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;ppc403_aic;</div><div class='add'>+		irq_desc[i].chip = &amp;ppc403_aic;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/ppc/syslib/ppc440spe_pcie.c b/arch/ppc/syslib/ppc440spe_pcie.c<br/>index 1509fc1ddfb6..dd5d4b958c31 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc440spe_pcie.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc440spe_pcie.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc440spe_pcie.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc440spe_pcie.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c<br/>index b40b96a8c609..1eef4ffed4fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc4xx_dma.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c<br/>index fd9af0fc0e9f..745685df5984 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc4xx_pic.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'> */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -276,7 +275,7 @@ void __init ppc4xx_pic_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Attach low-level handlers */</div><div class='ctx'> 	for (i = 0; i &lt; (NR_UICS &lt;&lt; 5); ++i) {</div><div class='del'>-		irq_desc[i].handler = &amp;__uic[i &gt;&gt; 5].decl;</div><div class='add'>+		irq_desc[i].chip = &amp;__uic[i &gt;&gt; 5].decl;</div><div class='ctx'> 		if (is_level_sensitive(i))</div><div class='ctx'> 			irq_desc[i].status |= IRQ_LEVEL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/ppc/syslib/ppc4xx_setup.c b/arch/ppc/syslib/ppc4xx_setup.c<br/>index e83a83fd95e1..debe14c083a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc4xx_setup.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c<br/>index 280ea010a9c8..2f83e162971f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_sgdma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc4xx_sgdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc4xx_sgdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc4xx_sgdma.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c<br/>index 26afd637dc81..ec466db52114 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc83xx_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc83xx_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc83xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc83xx_setup.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Added PCI support -- Tony Li &lt;tony.li@freescale.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc83xx_setup.h b/arch/ppc/syslib/ppc83xx_setup.h<br/>index 478b011cd963..b918a2d245ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc83xx_setup.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc83xx_setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc83xx_setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc83xx_setup.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #ifndef __PPC_SYSLIB_PPC83XX_SETUP_H</div><div class='ctx'> #define __PPC_SYSLIB_PPC83XX_SETUP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long mpc83xx_find_end_of_memory(void) __init;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc85xx_common.c b/arch/ppc/syslib/ppc85xx_common.c<br/>index 0145c968f9ad..e5ac699e7316 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc85xx_common.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc85xx_common.h b/arch/ppc/syslib/ppc85xx_common.h<br/>index 182744a1321c..4fc405425113 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc85xx_common.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #ifndef __PPC_SYSLIB_PPC85XX_COMMON_H</div><div class='ctx'> #define __PPC_SYSLIB_PPC85XX_COMMON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Provide access to ccsrbar for any modules, etc */</div><div class='head'>diff --git a/arch/ppc/syslib/ppc85xx_rio.c b/arch/ppc/syslib/ppc85xx_rio.c<br/>index 297f3b549177..d9b471b4d695 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_rio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_rio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_rio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc85xx_rio.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc85xx_rio.h b/arch/ppc/syslib/ppc85xx_rio.h<br/>index c0827a2c3eec..6d3ff30b1579 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_rio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_rio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_rio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc85xx_rio.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #ifndef __PPC_SYSLIB_PPC85XX_RIO_H</div><div class='ctx'> #define __PPC_SYSLIB_PPC85XX_RIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void mpc85xx_rio_setup(int law_start, int law_size);</div><div class='head'>diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c<br/>index 79b7089d7500..2475ec6600fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc85xx_setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc85xx_setup.h b/arch/ppc/syslib/ppc85xx_setup.h<br/>index f55b8032d3d9..6ff79995210b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_setup.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc85xx_setup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc85xx_setup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc85xx_setup.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __PPC_SYSLIB_PPC85XX_SETUP_H</div><div class='ctx'> #define __PPC_SYSLIB_PPC85XX_SETUP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ppcboot.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/ppc8xx_pic.c b/arch/ppc/syslib/ppc8xx_pic.c<br/>index 3e6f51a61d46..d6c25fe25011 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc8xx_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc8xx_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc8xx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc8xx_pic.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/ppc8xx_pic.h b/arch/ppc/syslib/ppc8xx_pic.h<br/>index 784935eac365..d7d9f651a91b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc8xx_pic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/ppc8xx_pic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/ppc8xx_pic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/ppc8xx_pic.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _PPC_KERNEL_PPC8xx_H</div><div class='ctx'> #define _PPC_KERNEL_PPC8xx_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/ppc/syslib/qspan_pci.c b/arch/ppc/syslib/qspan_pci.c<br/>index 0970b5d30391..85053b2816a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/qspan_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/qspan_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/qspan_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/qspan_pci.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * we have switched the chip select.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c<br/>index e672b600f315..39a93dc6375b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/syslib/xilinx_pic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/syslib/xilinx_pic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/syslib/xilinx_pic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/syslib/xilinx_pic.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ ppc4xx_pic_init(void)</div><div class='ctx'> 	ppc_md.get_irq = xilinx_pic_get_irq;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_IRQS; ++i) {</div><div class='del'>-		irq_desc[i].handler = &amp;xilinx_intc;</div><div class='add'>+		irq_desc[i].chip = &amp;xilinx_intc;</div><div class='ctx'> </div><div class='ctx'> 		if (XPAR_INTC_0_KIND_OF_INTR &amp; (0x00000001 &lt;&lt; i))</div><div class='ctx'> 			irq_desc[i].status &amp;= ~IRQ_LEVEL;</div><div class='head'>diff --git a/arch/ppc/xmon/privinst.h b/arch/ppc/xmon/privinst.h<br/>index 93978c027ca0..c492a35687bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/xmon/privinst.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/xmon/privinst.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/xmon/privinst.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/xmon/privinst.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 1996 Paul Mackerras.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GETREG(reg)		\</div><div class='ctx'>     static inline int get_ ## reg (void)	\</div><div class='head'>diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c<br/>index cfc2d6ad464d..f7e92986952a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/xmon/start.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/xmon/start.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/xmon/start.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/xmon/start.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 1996 Paul Mackerras.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c<br/>index 06fa44b5c647..37d234f93394 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/ppc/xmon/xmon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/ppc/xmon/xmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/ppc/xmon/xmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/ppc/xmon/xmon.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1996 Paul Mackerras.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig<br/>index 01c5c082f970..ae071a11ce71 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/Kconfig</a></div><div class='hunk'>@@ -7,6 +7,14 @@ config MMU</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config LOCKDEP_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config STACKTRACE_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config RWSEM_GENERIC_SPINLOCK</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -110,13 +118,6 @@ config SYSVIPC_COMPAT</div><div class='ctx'> 	depends on COMPAT &amp;&amp; SYSVIPC</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config BINFMT_ELF32</div><div class='del'>-	tristate "Kernel support for 31 bit ELF binaries"</div><div class='del'>-	depends on COMPAT</div><div class='del'>-	help</div><div class='del'>-	  This allows you to run 32-bit Linux/ELF binaries on your zSeries</div><div class='del'>-	  in 64 bit mode. Everybody wants this; say Y.</div><div class='del'>-</div><div class='ctx'> comment "Code generation options"</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='hunk'>@@ -446,6 +447,14 @@ config NO_IDLE_HZ_INIT</div><div class='ctx'> 	  The HZ timer is switched off in idle by default. That means the</div><div class='ctx'> 	  HZ timer is already disabled at boot time.</div><div class='ctx'> </div><div class='add'>+config S390_HYPFS_FS</div><div class='add'>+	bool "s390 hypervisor file system support"</div><div class='add'>+	select SYS_HYPERVISOR</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  This is a virtual file system intended to provide accounting</div><div class='add'>+	  information in an s390 hypervisor environment.</div><div class='add'>+</div><div class='ctx'> config KEXEC</div><div class='ctx'> 	bool "kexec system call (EXPERIMENTAL)"</div><div class='ctx'> 	depends on EXPERIMENTAL</div><div class='head'>diff --git a/arch/s390/Kconfig.debug b/arch/s390/Kconfig.debug<br/>index f53b6d5300e5..2283933a9a93 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/Kconfig.debug</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='ctx'> menu "Kernel hacking"</div><div class='ctx'> </div><div class='add'>+config TRACE_IRQFLAGS_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/s390/Makefile b/arch/s390/Makefile<br/>index 7bb16fb97d4f..74ef57dcfa60 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/Makefile</a></div><div class='hunk'>@@ -34,6 +34,11 @@ cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)</div><div class='ctx'> cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)</div><div class='ctx'> cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Prevent tail-call optimizations, to get clearer backtraces:</div><div class='add'>+#</div><div class='add'>+cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls</div><div class='add'>+</div><div class='ctx'> # old style option for packed stacks</div><div class='ctx'> ifeq ($(call cc-option-yn,-mkernel-backchain),y)</div><div class='ctx'> cflags-$(CONFIG_PACK_STACK)  += -mkernel-backchain -D__PACK_STACK</div><div class='hunk'>@@ -76,7 +81,7 @@ LDFLAGS_vmlinux := -e start</div><div class='ctx'> head-y		:= arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o</div><div class='ctx'> </div><div class='ctx'> core-y		+= arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \</div><div class='del'>-		   arch/$(ARCH)/appldata/</div><div class='add'>+		   arch/$(ARCH)/appldata/ arch/$(ARCH)/hypfs/</div><div class='ctx'> libs-y		+= arch/$(ARCH)/lib/</div><div class='ctx'> drivers-y	+= drivers/s390/</div><div class='ctx'> drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/</div><div class='head'>diff --git a/arch/s390/appldata/appldata.h b/arch/s390/appldata/appldata.h<br/>index e806a8922bbb..71d65eb30650 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/appldata/appldata.h</a></div><div class='hunk'>@@ -3,9 +3,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Definitions and interface for Linux - z/VM Monitor Stream.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='add'>+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='ctx'>  *</div><div class='del'>- * Author: Gerald Schaefer &lt;geraldsc@de.ibm.com&gt;</div><div class='add'>+ * Author: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> //#define APPLDATA_DEBUG			/* Debug messages on/off */</div><div class='hunk'>@@ -29,6 +29,22 @@</div><div class='ctx'> #define CTL_APPLDATA_NET_SUM	2125</div><div class='ctx'> #define CTL_APPLDATA_PROC	2126</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_64BIT</div><div class='add'>+</div><div class='add'>+#define APPLDATA_START_INTERVAL_REC 0x00	/* Function codes for */</div><div class='add'>+#define APPLDATA_STOP_REC	    0x01	/* DIAG 0xDC	  */</div><div class='add'>+#define APPLDATA_GEN_EVENT_RECORD   0x02</div><div class='add'>+#define APPLDATA_START_CONFIG_REC   0x03</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define APPLDATA_START_INTERVAL_REC 0x80</div><div class='add'>+#define APPLDATA_STOP_REC	    0x81</div><div class='add'>+#define APPLDATA_GEN_EVENT_RECORD   0x82</div><div class='add'>+#define APPLDATA_START_CONFIG_REC   0x83</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_64BIT */</div><div class='add'>+</div><div class='ctx'> #define P_INFO(x...)	printk(KERN_INFO MY_PRINT_NAME " info: " x)</div><div class='ctx'> #define P_ERROR(x...)	printk(KERN_ERR MY_PRINT_NAME " error: " x)</div><div class='ctx'> #define P_WARNING(x...)	printk(KERN_WARNING MY_PRINT_NAME " status: " x)</div><div class='hunk'>@@ -53,7 +69,11 @@ struct appldata_ops {</div><div class='ctx'> 	void *data;				/* record data */</div><div class='ctx'> 	unsigned int size;			/* size of record */</div><div class='ctx'> 	struct module *owner;			/* THIS_MODULE */</div><div class='add'>+	char mod_lvl[2];			/* modification level, EBCDIC */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int appldata_register_ops(struct appldata_ops *ops);</div><div class='ctx'> extern void appldata_unregister_ops(struct appldata_ops *ops);</div><div class='add'>+extern int appldata_diag(char record_nr, u16 function, unsigned long buffer,</div><div class='add'>+			 u16 length, char *mod_lvl);</div><div class='add'>+</div><div class='head'>diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c<br/>index 9a22434a580c..d0f82c995af6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/appldata/appldata_base.c</a></div><div class='hunk'>@@ -5,12 +5,11 @@</div><div class='ctx'>  * Exports appldata_register_ops() and appldata_unregister_ops() for the</div><div class='ctx'>  * data gathering modules.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='add'>+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='ctx'>  *</div><div class='del'>- * Author: Gerald Schaefer &lt;geraldsc@de.ibm.com&gt;</div><div class='add'>+ * Author: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -40,22 +39,6 @@</div><div class='ctx'> </div><div class='ctx'> #define TOD_MICRO	0x01000			/* nr. of TOD clock units</div><div class='ctx'> 						   for 1 microsecond */</div><div class='del'>-#ifndef CONFIG_64BIT</div><div class='del'>-</div><div class='del'>-#define APPLDATA_START_INTERVAL_REC 0x00   	/* Function codes for */</div><div class='del'>-#define APPLDATA_STOP_REC	    0x01	/* DIAG 0xDC	  */</div><div class='del'>-#define APPLDATA_GEN_EVENT_RECORD   0x02</div><div class='del'>-#define APPLDATA_START_CONFIG_REC   0x03</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define APPLDATA_START_INTERVAL_REC 0x80</div><div class='del'>-#define APPLDATA_STOP_REC   	    0x81</div><div class='del'>-#define APPLDATA_GEN_EVENT_RECORD   0x82</div><div class='del'>-#define APPLDATA_START_CONFIG_REC   0x83</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_64BIT */</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Parameter list for DIAGNOSE X'DC'</div><div class='hunk'>@@ -195,8 +178,8 @@ static void appldata_work_fn(void *data)</div><div class='ctx'>  *</div><div class='ctx'>  * prepare parameter list, issue DIAG 0xDC</div><div class='ctx'>  */</div><div class='del'>-static int appldata_diag(char record_nr, u16 function, unsigned long buffer,</div><div class='del'>-			u16 length)</div><div class='add'>+int appldata_diag(char record_nr, u16 function, unsigned long buffer,</div><div class='add'>+			u16 length, char *mod_lvl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ry;</div><div class='ctx'> 	struct appldata_product_id {</div><div class='hunk'>@@ -214,7 +197,7 @@ static int appldata_diag(char record_nr, u16 function, unsigned long buffer,</div><div class='ctx'> 		.record_nr  = record_nr,</div><div class='ctx'> 		.version_nr = {0xF2, 0xF6},		/* "26" */</div><div class='ctx'> 		.release_nr = {0xF0, 0xF1},		/* "01" */</div><div class='del'>-		.mod_lvl    = {0xF0, 0xF0},		/* "00" */</div><div class='add'>+		.mod_lvl    = {mod_lvl[0], mod_lvl[1]},</div><div class='ctx'> 	};</div><div class='ctx'> 	struct appldata_parameter_list appldata_parameter_list = {</div><div class='ctx'> 				.diag = 0xDC,</div><div class='hunk'>@@ -467,24 +450,25 @@ appldata_generic_handler(ctl_table *ctl, int write, struct file *filp,</div><div class='ctx'> 			module_put(ops-&gt;owner);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-		ops-&gt;active = 1;</div><div class='ctx'> 		ops-&gt;callback(ops-&gt;data);	// init record</div><div class='ctx'> 		rc = appldata_diag(ops-&gt;record_nr,</div><div class='ctx'> 					APPLDATA_START_INTERVAL_REC,</div><div class='del'>-					(unsigned long) ops-&gt;data, ops-&gt;size);</div><div class='add'>+					(unsigned long) ops-&gt;data, ops-&gt;size,</div><div class='add'>+					ops-&gt;mod_lvl);</div><div class='ctx'> 		if (rc != 0) {</div><div class='ctx'> 			P_ERROR("START DIAG 0xDC for %s failed, "</div><div class='ctx'> 				"return code: %d\n", ops-&gt;name, rc);</div><div class='ctx'> 			module_put(ops-&gt;owner);</div><div class='del'>-			ops-&gt;active = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			P_INFO("Monitoring %s data enabled, "</div><div class='ctx'> 				"DIAG 0xDC started.\n", ops-&gt;name);</div><div class='add'>+			ops-&gt;active = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if ((buf[0] == '0') &amp;&amp; (ops-&gt;active == 1)) {</div><div class='ctx'> 		ops-&gt;active = 0;</div><div class='ctx'> 		rc = appldata_diag(ops-&gt;record_nr, APPLDATA_STOP_REC,</div><div class='del'>-				(unsigned long) ops-&gt;data, ops-&gt;size);</div><div class='add'>+				(unsigned long) ops-&gt;data, ops-&gt;size,</div><div class='add'>+				ops-&gt;mod_lvl);</div><div class='ctx'> 		if (rc != 0) {</div><div class='ctx'> 			P_ERROR("STOP DIAG 0xDC for %s failed, "</div><div class='ctx'> 				"return code: %d\n", ops-&gt;name, rc);</div><div class='hunk'>@@ -633,7 +617,7 @@ appldata_offline_cpu(int cpu)</div><div class='ctx'> 	spin_unlock(&amp;appldata_timer_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static int __cpuinit</div><div class='ctx'> appldata_cpu_notify(struct notifier_block *self,</div><div class='ctx'> 		    unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -652,7 +636,7 @@ appldata_cpu_notify(struct notifier_block *self,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block appldata_nb = {</div><div class='add'>+static struct notifier_block __devinitdata appldata_nb = {</div><div class='ctx'> 	.notifier_call = appldata_cpu_notify,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -710,7 +694,8 @@ static void __exit appldata_exit(void)</div><div class='ctx'> 	list_for_each(lh, &amp;appldata_ops_list) {</div><div class='ctx'> 		ops = list_entry(lh, struct appldata_ops, list);</div><div class='ctx'> 		rc = appldata_diag(ops-&gt;record_nr, APPLDATA_STOP_REC,</div><div class='del'>-				(unsigned long) ops-&gt;data, ops-&gt;size);</div><div class='add'>+				(unsigned long) ops-&gt;data, ops-&gt;size,</div><div class='add'>+				ops-&gt;mod_lvl);</div><div class='ctx'> 		if (rc != 0) {</div><div class='ctx'> 			P_ERROR("STOP DIAG 0xDC for %s failed, "</div><div class='ctx'> 				"return code: %d\n", ops-&gt;name, rc);</div><div class='hunk'>@@ -739,6 +724,7 @@ MODULE_DESCRIPTION("Linux-VM Monitor Stream, base infrastructure");</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(appldata_register_ops);</div><div class='ctx'> EXPORT_SYMBOL_GPL(appldata_unregister_ops);</div><div class='add'>+EXPORT_SYMBOL_GPL(appldata_diag);</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> /*</div><div class='hunk'>@@ -779,8 +765,6 @@ unsigned long nr_iowait(void)</div><div class='ctx'> #endif /* MODULE */</div><div class='ctx'> EXPORT_SYMBOL_GPL(si_swapinfo);</div><div class='ctx'> EXPORT_SYMBOL_GPL(nr_threads);</div><div class='del'>-EXPORT_SYMBOL_GPL(avenrun);</div><div class='del'>-EXPORT_SYMBOL_GPL(get_full_page_state);</div><div class='ctx'> EXPORT_SYMBOL_GPL(nr_running);</div><div class='ctx'> EXPORT_SYMBOL_GPL(nr_iowait);</div><div class='ctx'> //EXPORT_SYMBOL_GPL(nr_context_switches);</div><div class='head'>diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c<br/>index f0e2fbed3d4c..ab3b0765a64e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/appldata/appldata_mem.c</a></div><div class='hunk'>@@ -4,12 +4,11 @@</div><div class='ctx'>  * Data gathering module for Linux-VM Monitor Stream, Stage 1.</div><div class='ctx'>  * Collects data related to memory management.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='add'>+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='ctx'>  *</div><div class='del'>- * Author: Gerald Schaefer &lt;geraldsc@de.ibm.com&gt;</div><div class='add'>+ * Author: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -107,21 +106,21 @@ static void appldata_get_mem_data(void *data)</div><div class='ctx'> 	 * serialized through the appldata_ops_lock and can use static</div><div class='ctx'> 	 */</div><div class='ctx'> 	static struct sysinfo val;</div><div class='del'>-	static struct page_state ps;</div><div class='add'>+	unsigned long ev[NR_VM_EVENT_ITEMS];</div><div class='ctx'> 	struct appldata_mem_data *mem_data;</div><div class='ctx'> </div><div class='ctx'> 	mem_data = data;</div><div class='ctx'> 	mem_data-&gt;sync_count_1++;</div><div class='ctx'> </div><div class='del'>-	get_full_page_state(&amp;ps);</div><div class='del'>-	mem_data-&gt;pgpgin     = ps.pgpgin &gt;&gt; 1;</div><div class='del'>-	mem_data-&gt;pgpgout    = ps.pgpgout &gt;&gt; 1;</div><div class='del'>-	mem_data-&gt;pswpin     = ps.pswpin;</div><div class='del'>-	mem_data-&gt;pswpout    = ps.pswpout;</div><div class='del'>-	mem_data-&gt;pgalloc    = ps.pgalloc_high + ps.pgalloc_normal +</div><div class='del'>-			       ps.pgalloc_dma;</div><div class='del'>-	mem_data-&gt;pgfault    = ps.pgfault;</div><div class='del'>-	mem_data-&gt;pgmajfault = ps.pgmajfault;</div><div class='add'>+	all_vm_events(ev);</div><div class='add'>+	mem_data-&gt;pgpgin     = ev[PGPGIN] &gt;&gt; 1;</div><div class='add'>+	mem_data-&gt;pgpgout    = ev[PGPGOUT] &gt;&gt; 1;</div><div class='add'>+	mem_data-&gt;pswpin     = ev[PSWPIN];</div><div class='add'>+	mem_data-&gt;pswpout    = ev[PSWPOUT];</div><div class='add'>+	mem_data-&gt;pgalloc    = ev[PGALLOC_HIGH] + ev[PGALLOC_NORMAL] +</div><div class='add'>+			       ev[PGALLOC_DMA];</div><div class='add'>+	mem_data-&gt;pgfault    = ev[PGFAULT];</div><div class='add'>+	mem_data-&gt;pgmajfault = ev[PGMAJFAULT];</div><div class='ctx'> </div><div class='ctx'> 	si_meminfo(&amp;val);</div><div class='ctx'> 	mem_data-&gt;sharedram = val.sharedram;</div><div class='hunk'>@@ -130,7 +129,8 @@ static void appldata_get_mem_data(void *data)</div><div class='ctx'> 	mem_data-&gt;totalhigh = P2K(val.totalhigh);</div><div class='ctx'> 	mem_data-&gt;freehigh  = P2K(val.freehigh);</div><div class='ctx'> 	mem_data-&gt;bufferram = P2K(val.bufferram);</div><div class='del'>-	mem_data-&gt;cached    = P2K(atomic_read(&amp;nr_pagecache) - val.bufferram);</div><div class='add'>+	mem_data-&gt;cached    = P2K(global_page_state(NR_FILE_PAGES)</div><div class='add'>+				- val.bufferram);</div><div class='ctx'> </div><div class='ctx'> 	si_swapinfo(&amp;val);</div><div class='ctx'> 	mem_data-&gt;totalswap = P2K(val.totalswap);</div><div class='hunk'>@@ -152,6 +152,7 @@ static struct appldata_ops ops = {</div><div class='ctx'> 	.callback  = &amp;appldata_get_mem_data,</div><div class='ctx'> 	.data      = &amp;appldata_mem_data,</div><div class='ctx'> 	.owner     = THIS_MODULE,</div><div class='add'>+	.mod_lvl   = {0xF0, 0xF0},		/* EBCDIC "00" */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c<br/>index 2a4c7432db4a..075e619bf37d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_net_sum.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_net_sum.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_net_sum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/appldata/appldata_net_sum.c</a></div><div class='hunk'>@@ -5,12 +5,11 @@</div><div class='ctx'>  * Collects accumulated network statistics (Packets received/transmitted,</div><div class='ctx'>  * dropped, errors, ...).</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='add'>+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='ctx'>  *</div><div class='del'>- * Author: Gerald Schaefer &lt;geraldsc@de.ibm.com&gt;</div><div class='add'>+ * Author: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -152,6 +151,7 @@ static struct appldata_ops ops = {</div><div class='ctx'> 	.callback  = &amp;appldata_get_net_sum_data,</div><div class='ctx'> 	.data      = &amp;appldata_net_sum_data,</div><div class='ctx'> 	.owner     = THIS_MODULE,</div><div class='add'>+	.mod_lvl   = {0xF0, 0xF0},		/* EBCDIC "00" */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c<br/>index 99ddd3bf2fba..161acc5c8a1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_os.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/appldata/appldata_os.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/appldata/appldata_os.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/appldata/appldata_os.c</a></div><div class='hunk'>@@ -4,12 +4,11 @@</div><div class='ctx'>  * Data gathering module for Linux-VM Monitor Stream, Stage 1.</div><div class='ctx'>  * Collects misc. OS related data (CPU utilization, running processes).</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='add'>+ * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.</div><div class='ctx'>  *</div><div class='del'>- * Author: Gerald Schaefer &lt;geraldsc@de.ibm.com&gt;</div><div class='add'>+ * Author: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -44,11 +43,14 @@ struct appldata_os_per_cpu {</div><div class='ctx'> 	u32 per_cpu_system;	/* ... spent in kernel mode         */</div><div class='ctx'> 	u32 per_cpu_idle;	/* ... spent in idle mode           */</div><div class='ctx'> </div><div class='del'>-// New in 2.6 --&gt;</div><div class='add'>+	/* New in 2.6 */</div><div class='ctx'> 	u32 per_cpu_irq;	/* ... spent in interrupts          */</div><div class='ctx'> 	u32 per_cpu_softirq;	/* ... spent in softirqs            */</div><div class='ctx'> 	u32 per_cpu_iowait;	/* ... spent while waiting for I/O  */</div><div class='del'>-// &lt;-- New in 2.6</div><div class='add'>+</div><div class='add'>+	/* New in modification level 01 */</div><div class='add'>+	u32 per_cpu_steal;	/* ... stolen by hypervisor	    */</div><div class='add'>+	u32 cpu_id;		/* number of this CPU		    */</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> struct appldata_os_data {</div><div class='hunk'>@@ -68,10 +70,9 @@ struct appldata_os_data {</div><div class='ctx'> 	u32 avenrun[3];		/* average nr. of running processes during */</div><div class='ctx'> 				/* the last 1, 5 and 15 minutes */</div><div class='ctx'> </div><div class='del'>-// New in 2.6 --&gt;</div><div class='add'>+	/* New in 2.6 */</div><div class='ctx'> 	u32 nr_iowait;		/* number of blocked threads</div><div class='ctx'> 				   (waiting for I/O)               */</div><div class='del'>-// &lt;-- New in 2.6</div><div class='ctx'> </div><div class='ctx'> 	/* per cpu data */</div><div class='ctx'> 	struct appldata_os_per_cpu os_cpu[0];</div><div class='hunk'>@@ -79,6 +80,14 @@ struct appldata_os_data {</div><div class='ctx'> </div><div class='ctx'> static struct appldata_os_data *appldata_os_data;</div><div class='ctx'> </div><div class='add'>+static struct appldata_ops ops = {</div><div class='add'>+	.ctl_nr    = CTL_APPLDATA_OS,</div><div class='add'>+	.name	   = "os",</div><div class='add'>+	.record_nr = APPLDATA_RECORD_OS_ID,</div><div class='add'>+	.owner	   = THIS_MODULE,</div><div class='add'>+	.mod_lvl   = {0xF0, 0xF1},		/* EBCDIC "01" */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static inline void appldata_print_debug(struct appldata_os_data *os_data)</div><div class='ctx'> {</div><div class='hunk'>@@ -100,15 +109,17 @@ static inline void appldata_print_debug(struct appldata_os_data *os_data)</div><div class='ctx'> 	P_DEBUG("nr_cpus = %u\n", os_data-&gt;nr_cpus);</div><div class='ctx'> 	for (i = 0; i &lt; os_data-&gt;nr_cpus; i++) {</div><div class='ctx'> 		P_DEBUG("cpu%u : user = %u, nice = %u, system = %u, "</div><div class='del'>-			"idle = %u, irq = %u, softirq = %u, iowait = %u\n",</div><div class='del'>-				i,</div><div class='add'>+			"idle = %u, irq = %u, softirq = %u, iowait = %u, "</div><div class='add'>+			"steal = %u\n",</div><div class='add'>+				os_data-&gt;os_cpu[i].cpu_id,</div><div class='ctx'> 				os_data-&gt;os_cpu[i].per_cpu_user,</div><div class='ctx'> 				os_data-&gt;os_cpu[i].per_cpu_nice,</div><div class='ctx'> 				os_data-&gt;os_cpu[i].per_cpu_system,</div><div class='ctx'> 				os_data-&gt;os_cpu[i].per_cpu_idle,</div><div class='ctx'> 				os_data-&gt;os_cpu[i].per_cpu_irq,</div><div class='ctx'> 				os_data-&gt;os_cpu[i].per_cpu_softirq,</div><div class='del'>-				os_data-&gt;os_cpu[i].per_cpu_iowait);</div><div class='add'>+				os_data-&gt;os_cpu[i].per_cpu_iowait,</div><div class='add'>+				os_data-&gt;os_cpu[i].per_cpu_steal);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	P_DEBUG("sync_count_1 = %u\n", os_data-&gt;sync_count_1);</div><div class='hunk'>@@ -123,14 +134,13 @@ static inline void appldata_print_debug(struct appldata_os_data *os_data)</div><div class='ctx'>  */</div><div class='ctx'> static void appldata_get_os_data(void *data)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='add'>+	int i, j, rc;</div><div class='ctx'> 	struct appldata_os_data *os_data;</div><div class='add'>+	unsigned int new_size;</div><div class='ctx'> </div><div class='ctx'> 	os_data = data;</div><div class='ctx'> 	os_data-&gt;sync_count_1++;</div><div class='ctx'> </div><div class='del'>-	os_data-&gt;nr_cpus = num_online_cpus();</div><div class='del'>-</div><div class='ctx'> 	os_data-&gt;nr_threads = nr_threads;</div><div class='ctx'> 	os_data-&gt;nr_running = nr_running();</div><div class='ctx'> 	os_data-&gt;nr_iowait  = nr_iowait();</div><div class='hunk'>@@ -154,9 +164,44 @@ static void appldata_get_os_data(void *data)</div><div class='ctx'> 			cputime_to_jiffies(kstat_cpu(i).cpustat.softirq);</div><div class='ctx'> 		os_data-&gt;os_cpu[j].per_cpu_iowait =</div><div class='ctx'> 			cputime_to_jiffies(kstat_cpu(i).cpustat.iowait);</div><div class='add'>+		os_data-&gt;os_cpu[j].per_cpu_steal =</div><div class='add'>+			cputime_to_jiffies(kstat_cpu(i).cpustat.steal);</div><div class='add'>+		os_data-&gt;os_cpu[j].cpu_id = i;</div><div class='ctx'> 		j++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	os_data-&gt;nr_cpus = j;</div><div class='add'>+</div><div class='add'>+	new_size = sizeof(struct appldata_os_data) +</div><div class='add'>+		   (os_data-&gt;nr_cpus * sizeof(struct appldata_os_per_cpu));</div><div class='add'>+	if (ops.size != new_size) {</div><div class='add'>+		if (ops.active) {</div><div class='add'>+			rc = appldata_diag(APPLDATA_RECORD_OS_ID,</div><div class='add'>+					   APPLDATA_START_INTERVAL_REC,</div><div class='add'>+					   (unsigned long) ops.data, new_size,</div><div class='add'>+					   ops.mod_lvl);</div><div class='add'>+			if (rc != 0) {</div><div class='add'>+				P_ERROR("os: START NEW DIAG 0xDC failed, "</div><div class='add'>+					"return code: %d, new size = %i\n", rc,</div><div class='add'>+					new_size);</div><div class='add'>+				P_INFO("os: stopping old record now\n");</div><div class='add'>+			} else</div><div class='add'>+				P_INFO("os: new record size = %i\n", new_size);</div><div class='add'>+</div><div class='add'>+			rc = appldata_diag(APPLDATA_RECORD_OS_ID,</div><div class='add'>+					   APPLDATA_STOP_REC,</div><div class='add'>+					   (unsigned long) ops.data, ops.size,</div><div class='add'>+					   ops.mod_lvl);</div><div class='add'>+			if (rc != 0)</div><div class='add'>+				P_ERROR("os: STOP OLD DIAG 0xDC failed, "</div><div class='add'>+					"return code: %d, old size = %i\n", rc,</div><div class='add'>+					ops.size);</div><div class='add'>+			else</div><div class='add'>+				P_INFO("os: old record size = %i stopped\n",</div><div class='add'>+					ops.size);</div><div class='add'>+		}</div><div class='add'>+		ops.size = new_size;</div><div class='add'>+	}</div><div class='ctx'> 	os_data-&gt;timestamp = get_clock();</div><div class='ctx'> 	os_data-&gt;sync_count_2++;</div><div class='ctx'> #ifdef APPLDATA_DEBUG</div><div class='hunk'>@@ -165,15 +210,6 @@ static void appldata_get_os_data(void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct appldata_ops ops = {</div><div class='del'>-	.ctl_nr    = CTL_APPLDATA_OS,</div><div class='del'>-	.name	   = "os",</div><div class='del'>-	.record_nr = APPLDATA_RECORD_OS_ID,</div><div class='del'>-	.callback  = &amp;appldata_get_os_data,</div><div class='del'>-	.owner     = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * appldata_os_init()</div><div class='ctx'>  *</div><div class='hunk'>@@ -181,26 +217,25 @@ static struct appldata_ops ops = {</div><div class='ctx'>  */</div><div class='ctx'> static int __init appldata_os_init(void)</div><div class='ctx'> {</div><div class='del'>-	int rc, size;</div><div class='add'>+	int rc, max_size;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct appldata_os_data) +</div><div class='del'>-		(NR_CPUS * sizeof(struct appldata_os_per_cpu));</div><div class='del'>-	if (size &gt; APPLDATA_MAX_REC_SIZE) {</div><div class='del'>-		P_ERROR("Size of record = %i, bigger than maximum (%i)!\n",</div><div class='del'>-			size, APPLDATA_MAX_REC_SIZE);</div><div class='add'>+	max_size = sizeof(struct appldata_os_data) +</div><div class='add'>+		   (NR_CPUS * sizeof(struct appldata_os_per_cpu));</div><div class='add'>+	if (max_size &gt; APPLDATA_MAX_REC_SIZE) {</div><div class='add'>+		P_ERROR("Max. size of OS record = %i, bigger than maximum "</div><div class='add'>+			"record size (%i)\n", max_size, APPLDATA_MAX_REC_SIZE);</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	P_DEBUG("sizeof(os) = %i, sizeof(os_cpu) = %lu\n", size,</div><div class='add'>+	P_DEBUG("max. sizeof(os) = %i, sizeof(os_cpu) = %lu\n", max_size,</div><div class='ctx'> 		sizeof(struct appldata_os_per_cpu));</div><div class='ctx'> </div><div class='del'>-	appldata_os_data = kmalloc(size, GFP_DMA);</div><div class='add'>+	appldata_os_data = kzalloc(max_size, GFP_DMA);</div><div class='ctx'> 	if (appldata_os_data == NULL) {</div><div class='ctx'> 		P_ERROR("No memory for %s!\n", ops.name);</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	memset(appldata_os_data, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	appldata_os_data-&gt;per_cpu_size = sizeof(struct appldata_os_per_cpu);</div><div class='ctx'> 	appldata_os_data-&gt;cpu_offset   = offsetof(struct appldata_os_data,</div><div class='hunk'>@@ -208,7 +243,7 @@ static int __init appldata_os_init(void)</div><div class='ctx'> 	P_DEBUG("cpu offset = %u\n", appldata_os_data-&gt;cpu_offset);</div><div class='ctx'> </div><div class='ctx'> 	ops.data = appldata_os_data;</div><div class='del'>-	ops.size = size;</div><div class='add'>+	ops.callback  = &amp;appldata_get_os_data;</div><div class='ctx'> 	rc = appldata_register_ops(&amp;ops);</div><div class='ctx'> 	if (rc != 0) {</div><div class='ctx'> 		P_ERROR("Error registering ops, rc = %i\n", rc);</div><div class='head'>diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c<br/>index c5ca2dc5d428..5713c7e5bd16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/crypto/aes_s390.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/aes_s390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/crypto/aes_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/crypto/aes_s390.c</a></div><div class='hunk'>@@ -37,10 +37,10 @@ struct s390_aes_ctx {</div><div class='ctx'> 	int key_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int aes_set_key(void *ctx, const u8 *in_key, unsigned int key_len,</div><div class='del'>-		       u32 *flags)</div><div class='add'>+static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct s390_aes_ctx *sctx = ctx;</div><div class='add'>+	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	switch (key_len) {</div><div class='ctx'> 	case 16:</div><div class='hunk'>@@ -70,9 +70,9 @@ fail:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void aes_encrypt(void *ctx, u8 *out, const u8 *in)</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	const struct s390_aes_ctx *sctx = ctx;</div><div class='add'>+	const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	switch (sctx-&gt;key_len) {</div><div class='ctx'> 	case 16:</div><div class='hunk'>@@ -90,9 +90,9 @@ static void aes_encrypt(void *ctx, u8 *out, const u8 *in)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void aes_decrypt(void *ctx, u8 *out, const u8 *in)</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	const struct s390_aes_ctx *sctx = ctx;</div><div class='add'>+	const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	switch (sctx-&gt;key_len) {</div><div class='ctx'> 	case 16:</div><div class='head'>diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c<br/>index e3c37aa0a199..b3f7496a79b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/crypto/des_s390.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/des_s390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/crypto/des_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/crypto/des_s390.c</a></div><div class='hunk'>@@ -44,10 +44,10 @@ struct crypt_s390_des3_192_ctx {</div><div class='ctx'> 	u8 key[DES3_192_KEY_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int des_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='del'>-		      u32 *flags)</div><div class='add'>+static int des_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+		      unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* test if key is valid (not a weak key) */</div><div class='hunk'>@@ -57,16 +57,16 @@ static int des_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des_encrypt(void *ctx, u8 *out, const u8 *in)</div><div class='add'>+static void des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	crypt_s390_km(KM_DEA_ENCRYPT, dctx-&gt;key, out, in, DES_BLOCK_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des_decrypt(void *ctx, u8 *out, const u8 *in)</div><div class='add'>+static void des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	crypt_s390_km(KM_DEA_DECRYPT, dctx-&gt;key, out, in, DES_BLOCK_SIZE);</div><div class='ctx'> }</div><div class='hunk'>@@ -166,11 +166,11 @@ static struct crypto_alg des_alg = {</div><div class='ctx'>  *   Implementers MUST reject keys that exhibit this property.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='del'>-			   u32 *flags)</div><div class='add'>+static int des3_128_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			   unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	struct crypt_s390_des3_128_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u8* temp_key = key;</div><div class='ctx'> </div><div class='ctx'> 	if (!(memcmp(key, &amp;key[DES_KEY_SIZE], DES_KEY_SIZE))) {</div><div class='hunk'>@@ -186,17 +186,17 @@ static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des3_128_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des3_128_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des3_128_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	crypt_s390_km(KM_TDEA_128_ENCRYPT, dctx-&gt;key, dst, (void*)src,</div><div class='ctx'> 		      DES3_128_BLOCK_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des3_128_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des3_128_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des3_128_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	crypt_s390_km(KM_TDEA_128_DECRYPT, dctx-&gt;key, dst, (void*)src,</div><div class='ctx'> 		      DES3_128_BLOCK_SIZE);</div><div class='hunk'>@@ -302,11 +302,11 @@ static struct crypto_alg des3_128_alg = {</div><div class='ctx'>  *   property.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='del'>-			   u32 *flags)</div><div class='add'>+static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			   unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='del'>-	struct crypt_s390_des3_192_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u8* temp_key = key;</div><div class='ctx'> </div><div class='ctx'> 	if (!(memcmp(key, &amp;key[DES_KEY_SIZE], DES_KEY_SIZE) &amp;&amp;</div><div class='hunk'>@@ -325,17 +325,17 @@ static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des3_192_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des3_192_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des3_192_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx-&gt;key, dst, (void*)src,</div><div class='ctx'> 		      DES3_192_BLOCK_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des3_192_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des3_192_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_des3_192_ctx *dctx = ctx;</div><div class='add'>+	struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	crypt_s390_km(KM_TDEA_192_DECRYPT, dctx-&gt;key, dst, (void*)src,</div><div class='ctx'> 		      DES3_192_BLOCK_SIZE);</div><div class='head'>diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c<br/>index 98c896b86dcd..9d34a35b1aa5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/crypto/sha1_s390.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/sha1_s390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/crypto/sha1_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/crypto/sha1_s390.c</a></div><div class='hunk'>@@ -40,28 +40,29 @@ struct crypt_s390_sha1_ctx {</div><div class='ctx'> 	u8 buffer[2 * SHA1_BLOCK_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-sha1_init(void *ctx)</div><div class='add'>+static void sha1_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	static const struct crypt_s390_sha1_ctx initstate = {</div><div class='del'>-		.state = {</div><div class='del'>-			0x67452301,</div><div class='del'>-			0xEFCDAB89,</div><div class='del'>-			0x98BADCFE,</div><div class='del'>-			0x10325476,</div><div class='del'>-			0xC3D2E1F0</div><div class='del'>-		},</div><div class='add'>+	struct crypt_s390_sha1_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	static const u32 initstate[5] = {</div><div class='add'>+		0x67452301,</div><div class='add'>+		0xEFCDAB89,</div><div class='add'>+		0x98BADCFE,</div><div class='add'>+		0x10325476,</div><div class='add'>+		0xC3D2E1F0</div><div class='ctx'> 	};</div><div class='del'>-	memcpy(ctx, &amp;initstate, sizeof(initstate));</div><div class='add'>+</div><div class='add'>+	ctx-&gt;count = 0;</div><div class='add'>+	memcpy(ctx-&gt;state, &amp;initstate, sizeof(initstate));</div><div class='add'>+	ctx-&gt;buf_len = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-sha1_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void sha1_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct crypt_s390_sha1_ctx *sctx;</div><div class='ctx'> 	long imd_len;</div><div class='ctx'> </div><div class='del'>-	sctx = ctx;</div><div class='add'>+	sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	sctx-&gt;count += len * 8; //message bit length</div><div class='ctx'> </div><div class='ctx'> 	//anything in buffer yet? -&gt; must be completed</div><div class='hunk'>@@ -110,10 +111,9 @@ pad_message(struct crypt_s390_sha1_ctx* sctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Add padding and return the message digest. */</div><div class='del'>-static void</div><div class='del'>-sha1_final(void* ctx, u8 *out)</div><div class='add'>+static void sha1_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct crypt_s390_sha1_ctx *sctx = ctx;</div><div class='add'>+	struct crypt_s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	//must perform manual padding</div><div class='ctx'> 	pad_message(sctx);</div><div class='head'>diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c<br/>index 1ec5e92b3454..f573df30f31d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/crypto/sha256_s390.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/crypto/sha256_s390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/crypto/sha256_s390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/crypto/sha256_s390.c</a></div><div class='hunk'>@@ -31,9 +31,9 @@ struct s390_sha256_ctx {</div><div class='ctx'> 	u8 buf[2 * SHA256_BLOCK_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void sha256_init(void *ctx)</div><div class='add'>+static void sha256_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct s390_sha256_ctx *sctx = ctx;</div><div class='add'>+	struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	sctx-&gt;state[0] = 0x6a09e667;</div><div class='ctx'> 	sctx-&gt;state[1] = 0xbb67ae85;</div><div class='hunk'>@@ -44,12 +44,12 @@ static void sha256_init(void *ctx)</div><div class='ctx'> 	sctx-&gt;state[6] = 0x1f83d9ab;</div><div class='ctx'> 	sctx-&gt;state[7] = 0x5be0cd19;</div><div class='ctx'> 	sctx-&gt;count = 0;</div><div class='del'>-	memset(sctx-&gt;buf, 0, sizeof(sctx-&gt;buf));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sha256_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void sha256_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			  unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct s390_sha256_ctx *sctx = ctx;</div><div class='add'>+	struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	unsigned int index;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -108,9 +108,9 @@ static void pad_message(struct s390_sha256_ctx* sctx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Add padding and return the message digest */</div><div class='del'>-static void sha256_final(void* ctx, u8 *out)</div><div class='add'>+static void sha256_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct s390_sha256_ctx *sctx = ctx;</div><div class='add'>+	struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	/* must perform manual padding */</div><div class='ctx'> 	pad_message(sctx);</div><div class='head'>diff --git a/arch/s390/hypfs/Makefile b/arch/s390/hypfs/Makefile<br/>new file mode 100644<br/>index 000000000000..f4b00cd81f7c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/hypfs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/hypfs/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the linux hypfs filesystem routines.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_S390_HYPFS_FS) += s390_hypfs.o</div><div class='add'>+</div><div class='add'>+s390_hypfs-objs := inode.o hypfs_diag.o</div><div class='head'>diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h<br/>new file mode 100644<br/>index 000000000000..ea5567be00fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/hypfs/hypfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/hypfs/hypfs.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/*</div><div class='add'>+ *  fs/hypfs/hypfs.h</div><div class='add'>+ *    Hypervisor filesystem for Linux on s390.</div><div class='add'>+ *</div><div class='add'>+ *    Copyright (C) IBM Corp. 2006</div><div class='add'>+ *    Author(s): Michael Holzheu &lt;holzheu@de.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HYPFS_H_</div><div class='add'>+#define _HYPFS_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define REG_FILE_MODE    0440</div><div class='add'>+#define UPDATE_FILE_MODE 0220</div><div class='add'>+#define DIR_MODE         0550</div><div class='add'>+</div><div class='add'>+extern struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,</div><div class='add'>+				  const char *name);</div><div class='add'>+</div><div class='add'>+extern struct dentry *hypfs_create_u64(struct super_block *sb,</div><div class='add'>+				       struct dentry *dir, const char *name,</div><div class='add'>+				       __u64 value);</div><div class='add'>+</div><div class='add'>+extern struct dentry *hypfs_create_str(struct super_block *sb,</div><div class='add'>+				       struct dentry *dir, const char *name,</div><div class='add'>+				       char *string);</div><div class='add'>+</div><div class='add'>+#endif /* _HYPFS_H_ */</div><div class='head'>diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c<br/>new file mode 100644<br/>index 000000000000..1785bce2b919<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/hypfs/hypfs_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/hypfs/hypfs_diag.c</a></div><div class='hunk'>@@ -0,0 +1,696 @@</div><div class='add'>+/*</div><div class='add'>+ *  fs/hypfs/hypfs_diag.c</div><div class='add'>+ *    Hypervisor filesystem for Linux on s390. Diag 204 and 224</div><div class='add'>+ *    implementation.</div><div class='add'>+ *</div><div class='add'>+ *    Copyright (C) IBM Corp. 2006</div><div class='add'>+ *    Author(s): Michael Holzheu &lt;holzheu@de.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;asm/ebcdic.h&gt;</div><div class='add'>+#include "hypfs.h"</div><div class='add'>+</div><div class='add'>+#define LPAR_NAME_LEN 8		/* lpar name len in diag 204 data */</div><div class='add'>+#define CPU_NAME_LEN 16		/* type name len of cpus in diag224 name table */</div><div class='add'>+#define TMP_SIZE 64		/* size of temporary buffers */</div><div class='add'>+</div><div class='add'>+/* diag 204 subcodes */</div><div class='add'>+enum diag204_sc {</div><div class='add'>+	SUBC_STIB4 = 4,</div><div class='add'>+	SUBC_RSI = 5,</div><div class='add'>+	SUBC_STIB6 = 6,</div><div class='add'>+	SUBC_STIB7 = 7</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The two available diag 204 data formats */</div><div class='add'>+enum diag204_format {</div><div class='add'>+	INFO_SIMPLE = 0,</div><div class='add'>+	INFO_EXT = 0x00010000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* bit is set in flags, when physical cpu info is included in diag 204 data */</div><div class='add'>+#define LPAR_PHYS_FLG  0x80</div><div class='add'>+</div><div class='add'>+static char *diag224_cpu_names;			/* diag 224 name table */</div><div class='add'>+static enum diag204_sc diag204_store_sc;	/* used subcode for store */</div><div class='add'>+static enum diag204_format diag204_info_type;	/* used diag 204 data format */</div><div class='add'>+</div><div class='add'>+static void *diag204_buf;		/* 4K aligned buffer for diag204 data */</div><div class='add'>+static void *diag204_buf_vmalloc;	/* vmalloc pointer for diag204 data */</div><div class='add'>+static int diag204_buf_pages;		/* number of pages for diag204 data */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DIAG 204 data structures and member access functions.</div><div class='add'>+ *</div><div class='add'>+ * Since we have two different diag 204 data formats for old and new s390</div><div class='add'>+ * machines, we do not access the structs directly, but use getter functions for</div><div class='add'>+ * each struct member instead. This should make the code more readable.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Time information block */</div><div class='add'>+</div><div class='add'>+struct info_blk_hdr {</div><div class='add'>+	__u8  npar;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u16 tslice;</div><div class='add'>+	__u16 phys_cpus;</div><div class='add'>+	__u16 this_part;</div><div class='add'>+	__u64 curtod;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct x_info_blk_hdr {</div><div class='add'>+	__u8  npar;</div><div class='add'>+	__u8  flags;</div><div class='add'>+	__u16 tslice;</div><div class='add'>+	__u16 phys_cpus;</div><div class='add'>+	__u16 this_part;</div><div class='add'>+	__u64 curtod1;</div><div class='add'>+	__u64 curtod2;</div><div class='add'>+	char reserved[40];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+static inline int info_blk_hdr__size(enum diag204_format type)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return sizeof(struct info_blk_hdr);</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return sizeof(struct x_info_blk_hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u8 info_blk_hdr__npar(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct info_blk_hdr *)hdr)-&gt;npar;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_info_blk_hdr *)hdr)-&gt;npar;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u8 info_blk_hdr__flags(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct info_blk_hdr *)hdr)-&gt;flags;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_info_blk_hdr *)hdr)-&gt;flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u16 info_blk_hdr__pcpus(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct info_blk_hdr *)hdr)-&gt;phys_cpus;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_info_blk_hdr *)hdr)-&gt;phys_cpus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Partition header */</div><div class='add'>+</div><div class='add'>+struct part_hdr {</div><div class='add'>+	__u8 pn;</div><div class='add'>+	__u8 cpus;</div><div class='add'>+	char reserved[6];</div><div class='add'>+	char part_name[LPAR_NAME_LEN];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct x_part_hdr {</div><div class='add'>+	__u8  pn;</div><div class='add'>+	__u8  cpus;</div><div class='add'>+	__u8  rcpus;</div><div class='add'>+	__u8  pflag;</div><div class='add'>+	__u32 mlu;</div><div class='add'>+	char  part_name[LPAR_NAME_LEN];</div><div class='add'>+	char  lpc_name[8];</div><div class='add'>+	char  os_name[8];</div><div class='add'>+	__u64 online_cs;</div><div class='add'>+	__u64 online_es;</div><div class='add'>+	__u8  upid;</div><div class='add'>+	char  reserved1[3];</div><div class='add'>+	__u32 group_mlu;</div><div class='add'>+	char  group_name[8];</div><div class='add'>+	char  reserved2[32];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+static inline int part_hdr__size(enum diag204_format type)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return sizeof(struct part_hdr);</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return sizeof(struct x_part_hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u8 part_hdr__rcpus(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct part_hdr *)hdr)-&gt;cpus;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_part_hdr *)hdr)-&gt;rcpus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void part_hdr__part_name(enum diag204_format type, void *hdr,</div><div class='add'>+				       char *name)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		memcpy(name, ((struct part_hdr *)hdr)-&gt;part_name,</div><div class='add'>+		       LPAR_NAME_LEN);</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		memcpy(name, ((struct x_part_hdr *)hdr)-&gt;part_name,</div><div class='add'>+		       LPAR_NAME_LEN);</div><div class='add'>+	EBCASC(name, LPAR_NAME_LEN);</div><div class='add'>+	name[LPAR_NAME_LEN] = 0;</div><div class='add'>+	strstrip(name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cpu_info {</div><div class='add'>+	__u16 cpu_addr;</div><div class='add'>+	char  reserved1[2];</div><div class='add'>+	__u8  ctidx;</div><div class='add'>+	__u8  cflag;</div><div class='add'>+	__u16 weight;</div><div class='add'>+	__u64 acc_time;</div><div class='add'>+	__u64 lp_time;</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct x_cpu_info {</div><div class='add'>+	__u16 cpu_addr;</div><div class='add'>+	char  reserved1[2];</div><div class='add'>+	__u8  ctidx;</div><div class='add'>+	__u8  cflag;</div><div class='add'>+	__u16 weight;</div><div class='add'>+	__u64 acc_time;</div><div class='add'>+	__u64 lp_time;</div><div class='add'>+	__u16 min_weight;</div><div class='add'>+	__u16 cur_weight;</div><div class='add'>+	__u16 max_weight;</div><div class='add'>+	char  reseved2[2];</div><div class='add'>+	__u64 online_time;</div><div class='add'>+	__u64 wait_time;</div><div class='add'>+	__u32 pma_weight;</div><div class='add'>+	__u32 polar_weight;</div><div class='add'>+	char  reserved3[40];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+/* CPU info block */</div><div class='add'>+</div><div class='add'>+static inline int cpu_info__size(enum diag204_format type)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return sizeof(struct cpu_info);</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return sizeof(struct x_cpu_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u8 cpu_info__ctidx(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct cpu_info *)hdr)-&gt;ctidx;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_cpu_info *)hdr)-&gt;ctidx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u16 cpu_info__cpu_addr(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct cpu_info *)hdr)-&gt;cpu_addr;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_cpu_info *)hdr)-&gt;cpu_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u64 cpu_info__acc_time(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct cpu_info *)hdr)-&gt;acc_time;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_cpu_info *)hdr)-&gt;acc_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u64 cpu_info__lp_time(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct cpu_info *)hdr)-&gt;lp_time;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_cpu_info *)hdr)-&gt;lp_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u64 cpu_info__online_time(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return 0;	/* online_time not available in simple info */</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_cpu_info *)hdr)-&gt;online_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Physical header */</div><div class='add'>+</div><div class='add'>+struct phys_hdr {</div><div class='add'>+	char reserved1[1];</div><div class='add'>+	__u8 cpus;</div><div class='add'>+	char reserved2[6];</div><div class='add'>+	char mgm_name[8];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct x_phys_hdr {</div><div class='add'>+	char reserved1[1];</div><div class='add'>+	__u8 cpus;</div><div class='add'>+	char reserved2[6];</div><div class='add'>+	char mgm_name[8];</div><div class='add'>+	char reserved3[80];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+static inline int phys_hdr__size(enum diag204_format type)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return sizeof(struct phys_hdr);</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return sizeof(struct x_phys_hdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u8 phys_hdr__cpus(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct phys_hdr *)hdr)-&gt;cpus;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_phys_hdr *)hdr)-&gt;cpus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Physical CPU info block */</div><div class='add'>+</div><div class='add'>+struct phys_cpu {</div><div class='add'>+	__u16 cpu_addr;</div><div class='add'>+	char  reserved1[2];</div><div class='add'>+	__u8  ctidx;</div><div class='add'>+	char  reserved2[3];</div><div class='add'>+	__u64 mgm_time;</div><div class='add'>+	char  reserved3[8];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+struct x_phys_cpu {</div><div class='add'>+	__u16 cpu_addr;</div><div class='add'>+	char  reserved1[2];</div><div class='add'>+	__u8  ctidx;</div><div class='add'>+	char  reserved2[3];</div><div class='add'>+	__u64 mgm_time;</div><div class='add'>+	char  reserved3[80];</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+</div><div class='add'>+static inline int phys_cpu__size(enum diag204_format type)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return sizeof(struct phys_cpu);</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return sizeof(struct x_phys_cpu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u16 phys_cpu__cpu_addr(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct phys_cpu *)hdr)-&gt;cpu_addr;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_phys_cpu *)hdr)-&gt;cpu_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u64 phys_cpu__mgm_time(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct phys_cpu *)hdr)-&gt;mgm_time;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_phys_cpu *)hdr)-&gt;mgm_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u64 phys_cpu__ctidx(enum diag204_format type, void *hdr)</div><div class='add'>+{</div><div class='add'>+	if (type == INFO_SIMPLE)</div><div class='add'>+		return ((struct phys_cpu *)hdr)-&gt;ctidx;</div><div class='add'>+	else /* INFO_EXT */</div><div class='add'>+		return ((struct x_phys_cpu *)hdr)-&gt;ctidx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Diagnose 204 functions */</div><div class='add'>+</div><div class='add'>+static int diag204(unsigned long subcode, unsigned long size, void *addr)</div><div class='add'>+{</div><div class='add'>+	register unsigned long _subcode asm("0") = subcode;</div><div class='add'>+	register unsigned long _size asm("1") = size;</div><div class='add'>+</div><div class='add'>+	asm volatile ("   diag    %2,%0,0x204\n"</div><div class='add'>+		      "0: \n" ".section __ex_table,\"a\"\n"</div><div class='add'>+#ifndef __s390x__</div><div class='add'>+		      "    .align 4\n"</div><div class='add'>+		      "    .long  0b,0b\n"</div><div class='add'>+#else</div><div class='add'>+		      "    .align 8\n"</div><div class='add'>+		      "    .quad  0b,0b\n"</div><div class='add'>+#endif</div><div class='add'>+		      ".previous":"+d" (_subcode), "+d"(_size)</div><div class='add'>+		      :"d"(addr)</div><div class='add'>+		      :"memory");</div><div class='add'>+	if (_subcode)</div><div class='add'>+		return -1;</div><div class='add'>+	else</div><div class='add'>+		return _size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For the old diag subcode 4 with simple data format we have to use real</div><div class='add'>+ * memory. If we use subcode 6 or 7 with extended data format, we can (and</div><div class='add'>+ * should) use vmalloc, since we need a lot of memory in that case. Currently</div><div class='add'>+ * up to 93 pages!</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void diag204_free_buffer(void)</div><div class='add'>+{</div><div class='add'>+	if (!diag204_buf)</div><div class='add'>+		return;</div><div class='add'>+	if (diag204_buf_vmalloc) {</div><div class='add'>+		vfree(diag204_buf_vmalloc);</div><div class='add'>+		diag204_buf_vmalloc = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		free_pages((unsigned long) diag204_buf, 0);</div><div class='add'>+	}</div><div class='add'>+	diag204_buf_pages = 0;</div><div class='add'>+	diag204_buf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *diag204_alloc_vbuf(int pages)</div><div class='add'>+{</div><div class='add'>+	/* The buffer has to be page aligned! */</div><div class='add'>+	diag204_buf_vmalloc = vmalloc(PAGE_SIZE * (pages + 1));</div><div class='add'>+	if (!diag204_buf_vmalloc)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	diag204_buf = (void*)((unsigned long)diag204_buf_vmalloc</div><div class='add'>+				&amp; ~0xfffUL) + 0x1000;</div><div class='add'>+	diag204_buf_pages = pages;</div><div class='add'>+	return diag204_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *diag204_alloc_rbuf(void)</div><div class='add'>+{</div><div class='add'>+	diag204_buf = (void*)__get_free_pages(GFP_KERNEL,0);</div><div class='add'>+	if (diag204_buf)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	diag204_buf_pages = 1;</div><div class='add'>+	return diag204_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *diag204_get_buffer(enum diag204_format fmt, int *pages)</div><div class='add'>+{</div><div class='add'>+	if (diag204_buf) {</div><div class='add'>+		*pages = diag204_buf_pages;</div><div class='add'>+		return diag204_buf;</div><div class='add'>+	}</div><div class='add'>+	if (fmt == INFO_SIMPLE) {</div><div class='add'>+		*pages = 1;</div><div class='add'>+		return diag204_alloc_rbuf();</div><div class='add'>+	} else {/* INFO_EXT */</div><div class='add'>+		*pages = diag204(SUBC_RSI | INFO_EXT, 0, NULL);</div><div class='add'>+		if (*pages &lt;= 0)</div><div class='add'>+			return ERR_PTR(-ENOSYS);</div><div class='add'>+		else</div><div class='add'>+			return diag204_alloc_vbuf(*pages);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * diag204_probe() has to find out, which type of diagnose 204 implementation</div><div class='add'>+ * we have on our machine. Currently there are three possible scanarios:</div><div class='add'>+ *   - subcode 4   + simple data format (only one page)</div><div class='add'>+ *   - subcode 4-6 + extended data format</div><div class='add'>+ *   - subcode 4-7 + extended data format</div><div class='add'>+ *</div><div class='add'>+ * Subcode 5 is used to retrieve the size of the data, provided by subcodes</div><div class='add'>+ * 6 and 7. Subcode 7 basically has the same function as subcode 6. In addition</div><div class='add'>+ * to subcode 6 it provides also information about secondary cpus.</div><div class='add'>+ * In order to get as much information as possible, we first try</div><div class='add'>+ * subcode 7, then 6 and if both fail, we use subcode 4.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int diag204_probe(void)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+	int pages, rc;</div><div class='add'>+</div><div class='add'>+	buf = diag204_get_buffer(INFO_EXT, &amp;pages);</div><div class='add'>+	if (!IS_ERR(buf)) {</div><div class='add'>+		if (diag204(SUBC_STIB7 | INFO_EXT, pages, buf) &gt;= 0) {</div><div class='add'>+			diag204_store_sc = SUBC_STIB7;</div><div class='add'>+			diag204_info_type = INFO_EXT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (diag204(SUBC_STIB6 | INFO_EXT, pages, buf) &gt;= 0) {</div><div class='add'>+			diag204_store_sc = SUBC_STIB7;</div><div class='add'>+			diag204_info_type = INFO_EXT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		diag204_free_buffer();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* subcodes 6 and 7 failed, now try subcode 4 */</div><div class='add'>+</div><div class='add'>+	buf = diag204_get_buffer(INFO_SIMPLE, &amp;pages);</div><div class='add'>+	if (IS_ERR(buf)) {</div><div class='add'>+		rc = PTR_ERR(buf);</div><div class='add'>+		goto fail_alloc;</div><div class='add'>+	}</div><div class='add'>+	if (diag204(SUBC_STIB4 | INFO_SIMPLE, pages, buf) &gt;= 0) {</div><div class='add'>+		diag204_store_sc = SUBC_STIB4;</div><div class='add'>+		diag204_info_type = INFO_SIMPLE;</div><div class='add'>+		goto out;</div><div class='add'>+	} else {</div><div class='add'>+		rc = -ENOSYS;</div><div class='add'>+		goto fail_store;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	rc = 0;</div><div class='add'>+fail_store:</div><div class='add'>+	diag204_free_buffer();</div><div class='add'>+fail_alloc:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *diag204_store(void)</div><div class='add'>+{</div><div class='add'>+	void *buf;</div><div class='add'>+	int pages;</div><div class='add'>+</div><div class='add'>+	buf = diag204_get_buffer(diag204_info_type, &amp;pages);</div><div class='add'>+	if (IS_ERR(buf))</div><div class='add'>+		goto out;</div><div class='add'>+	if (diag204(diag204_store_sc | diag204_info_type, pages, buf) &lt; 0)</div><div class='add'>+		return ERR_PTR(-ENOSYS);</div><div class='add'>+out:</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Diagnose 224 functions */</div><div class='add'>+</div><div class='add'>+static void diag224(void *ptr)</div><div class='add'>+{</div><div class='add'>+	asm volatile("   diag    %0,%1,0x224\n"</div><div class='add'>+		     : :"d" (0), "d"(ptr) : "memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int diag224_get_name_table(void)</div><div class='add'>+{</div><div class='add'>+	/* memory must be below 2GB */</div><div class='add'>+	diag224_cpu_names = kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);</div><div class='add'>+	if (!diag224_cpu_names)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	diag224(diag224_cpu_names);</div><div class='add'>+	EBCASC(diag224_cpu_names + 16, (*diag224_cpu_names + 1) * 16);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void diag224_delete_name_table(void)</div><div class='add'>+{</div><div class='add'>+	kfree(diag224_cpu_names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int diag224_idx2name(int index, char *name)</div><div class='add'>+{</div><div class='add'>+	memcpy(name, diag224_cpu_names + ((index + 1) * CPU_NAME_LEN),</div><div class='add'>+		CPU_NAME_LEN);</div><div class='add'>+	name[CPU_NAME_LEN] = 0;</div><div class='add'>+	strstrip(name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__init int hypfs_diag_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (diag204_probe()) {</div><div class='add'>+		printk(KERN_ERR "hypfs: diag 204 not working.");</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+	rc = diag224_get_name_table();</div><div class='add'>+	if (rc) {</div><div class='add'>+		diag224_delete_name_table();</div><div class='add'>+		printk(KERN_ERR "hypfs: could not get name table.\n");</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__exit void hypfs_diag_exit(void)</div><div class='add'>+{</div><div class='add'>+	diag224_delete_name_table();</div><div class='add'>+	diag204_free_buffer();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Functions to create the directory structure</div><div class='add'>+ * *******************************************</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int hypfs_create_cpu_files(struct super_block *sb,</div><div class='add'>+				  struct dentry *cpus_dir, void *cpu_info)</div><div class='add'>+{</div><div class='add'>+	struct dentry *cpu_dir;</div><div class='add'>+	char buffer[TMP_SIZE];</div><div class='add'>+	void *rc;</div><div class='add'>+</div><div class='add'>+	snprintf(buffer, TMP_SIZE, "%d", cpu_info__cpu_addr(diag204_info_type,</div><div class='add'>+							    cpu_info));</div><div class='add'>+	cpu_dir = hypfs_mkdir(sb, cpus_dir, buffer);</div><div class='add'>+	rc = hypfs_create_u64(sb, cpu_dir, "mgmtime",</div><div class='add'>+			      cpu_info__acc_time(diag204_info_type, cpu_info) -</div><div class='add'>+			      cpu_info__lp_time(diag204_info_type, cpu_info));</div><div class='add'>+	if (IS_ERR(rc))</div><div class='add'>+		return PTR_ERR(rc);</div><div class='add'>+	rc = hypfs_create_u64(sb, cpu_dir, "cputime",</div><div class='add'>+			      cpu_info__lp_time(diag204_info_type, cpu_info));</div><div class='add'>+	if (IS_ERR(rc))</div><div class='add'>+		return PTR_ERR(rc);</div><div class='add'>+	if (diag204_info_type == INFO_EXT) {</div><div class='add'>+		rc = hypfs_create_u64(sb, cpu_dir, "onlinetime",</div><div class='add'>+				      cpu_info__online_time(diag204_info_type,</div><div class='add'>+							    cpu_info));</div><div class='add'>+		if (IS_ERR(rc))</div><div class='add'>+			return PTR_ERR(rc);</div><div class='add'>+	}</div><div class='add'>+	diag224_idx2name(cpu_info__ctidx(diag204_info_type, cpu_info), buffer);</div><div class='add'>+	rc = hypfs_create_str(sb, cpu_dir, "type", buffer);</div><div class='add'>+	if (IS_ERR(rc))</div><div class='add'>+		return PTR_ERR(rc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *hypfs_create_lpar_files(struct super_block *sb,</div><div class='add'>+				     struct dentry *systems_dir, void *part_hdr)</div><div class='add'>+{</div><div class='add'>+	struct dentry *cpus_dir;</div><div class='add'>+	struct dentry *lpar_dir;</div><div class='add'>+	char lpar_name[LPAR_NAME_LEN + 1];</div><div class='add'>+	void *cpu_info;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	part_hdr__part_name(diag204_info_type, part_hdr, lpar_name);</div><div class='add'>+	lpar_name[LPAR_NAME_LEN] = 0;</div><div class='add'>+	lpar_dir = hypfs_mkdir(sb, systems_dir, lpar_name);</div><div class='add'>+	if (IS_ERR(lpar_dir))</div><div class='add'>+		return lpar_dir;</div><div class='add'>+	cpus_dir = hypfs_mkdir(sb, lpar_dir, "cpus");</div><div class='add'>+	if (IS_ERR(cpus_dir))</div><div class='add'>+		return cpus_dir;</div><div class='add'>+	cpu_info = part_hdr + part_hdr__size(diag204_info_type);</div><div class='add'>+	for (i = 0; i &lt; part_hdr__rcpus(diag204_info_type, part_hdr); i++) {</div><div class='add'>+		int rc;</div><div class='add'>+		rc = hypfs_create_cpu_files(sb, cpus_dir, cpu_info);</div><div class='add'>+		if (rc)</div><div class='add'>+			return ERR_PTR(rc);</div><div class='add'>+		cpu_info += cpu_info__size(diag204_info_type);</div><div class='add'>+	}</div><div class='add'>+	return cpu_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hypfs_create_phys_cpu_files(struct super_block *sb,</div><div class='add'>+				       struct dentry *cpus_dir, void *cpu_info)</div><div class='add'>+{</div><div class='add'>+	struct dentry *cpu_dir;</div><div class='add'>+	char buffer[TMP_SIZE];</div><div class='add'>+	void *rc;</div><div class='add'>+</div><div class='add'>+	snprintf(buffer, TMP_SIZE, "%i", phys_cpu__cpu_addr(diag204_info_type,</div><div class='add'>+							    cpu_info));</div><div class='add'>+	cpu_dir = hypfs_mkdir(sb, cpus_dir, buffer);</div><div class='add'>+	if (IS_ERR(cpu_dir))</div><div class='add'>+		return PTR_ERR(cpu_dir);</div><div class='add'>+	rc = hypfs_create_u64(sb, cpu_dir, "mgmtime",</div><div class='add'>+			      phys_cpu__mgm_time(diag204_info_type, cpu_info));</div><div class='add'>+	if (IS_ERR(rc))</div><div class='add'>+		return PTR_ERR(rc);</div><div class='add'>+	diag224_idx2name(phys_cpu__ctidx(diag204_info_type, cpu_info), buffer);</div><div class='add'>+	rc = hypfs_create_str(sb, cpu_dir, "type", buffer);</div><div class='add'>+	if (IS_ERR(rc))</div><div class='add'>+		return PTR_ERR(rc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *hypfs_create_phys_files(struct super_block *sb,</div><div class='add'>+				     struct dentry *parent_dir, void *phys_hdr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	void *cpu_info;</div><div class='add'>+	struct dentry *cpus_dir;</div><div class='add'>+</div><div class='add'>+	cpus_dir = hypfs_mkdir(sb, parent_dir, "cpus");</div><div class='add'>+	if (IS_ERR(cpus_dir))</div><div class='add'>+		return cpus_dir;</div><div class='add'>+	cpu_info = phys_hdr + phys_hdr__size(diag204_info_type);</div><div class='add'>+	for (i = 0; i &lt; phys_hdr__cpus(diag204_info_type, phys_hdr); i++) {</div><div class='add'>+		int rc;</div><div class='add'>+		rc = hypfs_create_phys_cpu_files(sb, cpus_dir, cpu_info);</div><div class='add'>+		if (rc)</div><div class='add'>+			return ERR_PTR(rc);</div><div class='add'>+		cpu_info += phys_cpu__size(diag204_info_type);</div><div class='add'>+	}</div><div class='add'>+	return cpu_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)</div><div class='add'>+{</div><div class='add'>+	struct dentry *systems_dir, *hyp_dir;</div><div class='add'>+	void *time_hdr, *part_hdr;</div><div class='add'>+	int i, rc;</div><div class='add'>+	void *buffer, *ptr;</div><div class='add'>+</div><div class='add'>+	buffer = diag204_store();</div><div class='add'>+	if (IS_ERR(buffer))</div><div class='add'>+		return PTR_ERR(buffer);</div><div class='add'>+</div><div class='add'>+	systems_dir = hypfs_mkdir(sb, root, "systems");</div><div class='add'>+	if (IS_ERR(systems_dir)) {</div><div class='add'>+		rc = PTR_ERR(systems_dir);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	time_hdr = (struct x_info_blk_hdr *)buffer;</div><div class='add'>+	part_hdr = time_hdr + info_blk_hdr__size(diag204_info_type);</div><div class='add'>+	for (i = 0; i &lt; info_blk_hdr__npar(diag204_info_type, time_hdr); i++) {</div><div class='add'>+		part_hdr = hypfs_create_lpar_files(sb, systems_dir, part_hdr);</div><div class='add'>+		if (IS_ERR(part_hdr)) {</div><div class='add'>+			rc = PTR_ERR(part_hdr);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (info_blk_hdr__flags(diag204_info_type, time_hdr) &amp; LPAR_PHYS_FLG) {</div><div class='add'>+		ptr = hypfs_create_phys_files(sb, root, part_hdr);</div><div class='add'>+		if (IS_ERR(ptr)) {</div><div class='add'>+			rc = PTR_ERR(ptr);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hyp_dir = hypfs_mkdir(sb, root, "hyp");</div><div class='add'>+	if (IS_ERR(hyp_dir)) {</div><div class='add'>+		rc = PTR_ERR(hyp_dir);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	ptr = hypfs_create_str(sb, hyp_dir, "type", "LPAR Hypervisor");</div><div class='add'>+	if (IS_ERR(ptr)) {</div><div class='add'>+		rc = PTR_ERR(ptr);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	rc = 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/hypfs/hypfs_diag.h b/arch/s390/hypfs/hypfs_diag.h<br/>new file mode 100644<br/>index 000000000000..793dea6b9bb6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/hypfs/hypfs_diag.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/hypfs/hypfs_diag.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/*</div><div class='add'>+ *  fs/hypfs/hypfs_diag.h</div><div class='add'>+ *    Hypervisor filesystem for Linux on s390.</div><div class='add'>+ *</div><div class='add'>+ *    Copyright (C) IBM Corp. 2006</div><div class='add'>+ *    Author(s): Michael Holzheu &lt;holzheu@de.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HYPFS_DIAG_H_</div><div class='add'>+#define _HYPFS_DIAG_H_</div><div class='add'>+</div><div class='add'>+extern int hypfs_diag_init(void);</div><div class='add'>+extern void hypfs_diag_exit(void);</div><div class='add'>+extern int hypfs_diag_create_files(struct super_block *sb, struct dentry *root);</div><div class='add'>+</div><div class='add'>+#endif /* _HYPFS_DIAG_H_ */</div><div class='head'>diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c<br/>new file mode 100644<br/>index 000000000000..18c091925ea5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/hypfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/hypfs/inode.c</a></div><div class='hunk'>@@ -0,0 +1,491 @@</div><div class='add'>+/*</div><div class='add'>+ *  fs/hypfs/inode.c</div><div class='add'>+ *    Hypervisor filesystem for Linux on s390.</div><div class='add'>+ *</div><div class='add'>+ *    Copyright (C) IBM Corp. 2006</div><div class='add'>+ *    Author(s): Michael Holzheu &lt;holzheu@de.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/vfs.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/parser.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/ebcdic.h&gt;</div><div class='add'>+#include "hypfs.h"</div><div class='add'>+#include "hypfs_diag.h"</div><div class='add'>+</div><div class='add'>+#define HYPFS_MAGIC 0x687970	/* ASCII 'hyp' */</div><div class='add'>+#define TMP_SIZE 64		/* size of temporary buffers */</div><div class='add'>+</div><div class='add'>+static struct dentry *hypfs_create_update_file(struct super_block *sb,</div><div class='add'>+					       struct dentry *dir);</div><div class='add'>+</div><div class='add'>+struct hypfs_sb_info {</div><div class='add'>+	uid_t uid;			/* uid used for files and dirs */</div><div class='add'>+	gid_t gid;			/* gid used for files and dirs */</div><div class='add'>+	struct dentry *update_file;	/* file to trigger update */</div><div class='add'>+	time_t last_update;		/* last update time in secs since 1970 */</div><div class='add'>+	struct mutex lock;		/* lock to protect update process */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations hypfs_file_ops;</div><div class='add'>+static struct file_system_type hypfs_type;</div><div class='add'>+static struct super_operations hypfs_s_ops;</div><div class='add'>+</div><div class='add'>+/* start of list of all dentries, which have to be deleted on update */</div><div class='add'>+static struct dentry *hypfs_last_dentry;</div><div class='add'>+</div><div class='add'>+static void hypfs_update_update(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct hypfs_sb_info *sb_info = sb-&gt;s_fs_info;</div><div class='add'>+	struct inode *inode = sb_info-&gt;update_file-&gt;d_inode;</div><div class='add'>+</div><div class='add'>+	sb_info-&gt;last_update = get_seconds();</div><div class='add'>+	inode-&gt;i_atime = inode-&gt;i_mtime = inode-&gt;i_ctime = CURRENT_TIME;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* directory tree removal functions */</div><div class='add'>+</div><div class='add'>+static void hypfs_add_dentry(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	dentry-&gt;d_fsdata = hypfs_last_dentry;</div><div class='add'>+	hypfs_last_dentry = dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hypfs_remove(struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct dentry *parent;</div><div class='add'>+</div><div class='add'>+	parent = dentry-&gt;d_parent;</div><div class='add'>+	if (S_ISDIR(dentry-&gt;d_inode-&gt;i_mode))</div><div class='add'>+		simple_rmdir(parent-&gt;d_inode, dentry);</div><div class='add'>+	else</div><div class='add'>+		simple_unlink(parent-&gt;d_inode, dentry);</div><div class='add'>+	d_delete(dentry);</div><div class='add'>+	dput(dentry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hypfs_delete_tree(struct dentry *root)</div><div class='add'>+{</div><div class='add'>+	while (hypfs_last_dentry) {</div><div class='add'>+		struct dentry *next_dentry;</div><div class='add'>+		next_dentry = hypfs_last_dentry-&gt;d_fsdata;</div><div class='add'>+		hypfs_remove(hypfs_last_dentry);</div><div class='add'>+		hypfs_last_dentry = next_dentry;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct inode *hypfs_make_inode(struct super_block *sb, int mode)</div><div class='add'>+{</div><div class='add'>+	struct inode *ret = new_inode(sb);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		struct hypfs_sb_info *hypfs_info = sb-&gt;s_fs_info;</div><div class='add'>+		ret-&gt;i_mode = mode;</div><div class='add'>+		ret-&gt;i_uid = hypfs_info-&gt;uid;</div><div class='add'>+		ret-&gt;i_gid = hypfs_info-&gt;gid;</div><div class='add'>+		ret-&gt;i_blksize = PAGE_CACHE_SIZE;</div><div class='add'>+		ret-&gt;i_blocks = 0;</div><div class='add'>+		ret-&gt;i_atime = ret-&gt;i_mtime = ret-&gt;i_ctime = CURRENT_TIME;</div><div class='add'>+		if (mode &amp; S_IFDIR)</div><div class='add'>+			ret-&gt;i_nlink = 2;</div><div class='add'>+		else</div><div class='add'>+			ret-&gt;i_nlink = 1;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hypfs_drop_inode(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	kfree(inode-&gt;u.generic_ip);</div><div class='add'>+	generic_delete_inode(inode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hypfs_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	char *data = filp-&gt;f_dentry-&gt;d_inode-&gt;u.generic_ip;</div><div class='add'>+	struct hypfs_sb_info *fs_info;</div><div class='add'>+</div><div class='add'>+	if (filp-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='add'>+		if (!(inode-&gt;i_mode &amp; S_IWUGO))</div><div class='add'>+			return -EACCES;</div><div class='add'>+	}</div><div class='add'>+	if (filp-&gt;f_mode &amp; FMODE_READ) {</div><div class='add'>+		if (!(inode-&gt;i_mode &amp; S_IRUGO))</div><div class='add'>+			return -EACCES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fs_info = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='add'>+	if(data) {</div><div class='add'>+		mutex_lock(&amp;fs_info-&gt;lock);</div><div class='add'>+		filp-&gt;private_data = kstrdup(data, GFP_KERNEL);</div><div class='add'>+		if (!filp-&gt;private_data) {</div><div class='add'>+			mutex_unlock(&amp;fs_info-&gt;lock);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;fs_info-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hypfs_aio_read(struct kiocb *iocb, __user char *buf,</div><div class='add'>+			      size_t count, loff_t offset)</div><div class='add'>+{</div><div class='add'>+	char *data;</div><div class='add'>+	size_t len;</div><div class='add'>+	struct file *filp = iocb-&gt;ki_filp;</div><div class='add'>+</div><div class='add'>+	data = filp-&gt;private_data;</div><div class='add'>+	len = strlen(data);</div><div class='add'>+	if (offset &gt; len) {</div><div class='add'>+		count = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (count &gt; len - offset)</div><div class='add'>+		count = len - offset;</div><div class='add'>+	if (copy_to_user(buf, data + offset, count)) {</div><div class='add'>+		count = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	iocb-&gt;ki_pos += count;</div><div class='add'>+	file_accessed(filp);</div><div class='add'>+out:</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static ssize_t hypfs_aio_write(struct kiocb *iocb, const char __user *buf,</div><div class='add'>+			       size_t count, loff_t pos)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+	struct hypfs_sb_info *fs_info;</div><div class='add'>+</div><div class='add'>+	sb = iocb-&gt;ki_filp-&gt;f_dentry-&gt;d_inode-&gt;i_sb;</div><div class='add'>+	fs_info = sb-&gt;s_fs_info;</div><div class='add'>+	/*</div><div class='add'>+	 * Currently we only allow one update per second for two reasons:</div><div class='add'>+	 * 1. diag 204 is VERY expensive</div><div class='add'>+	 * 2. If several processes do updates in parallel and then read the</div><div class='add'>+	 *    hypfs data, the likelihood of collisions is reduced, if we restrict</div><div class='add'>+	 *    the minimum update interval. A collision occurs, if during the</div><div class='add'>+	 *    data gathering of one process another process triggers an update</div><div class='add'>+	 *    If the first process wants to ensure consistent data, it has</div><div class='add'>+	 *    to restart data collection in this case.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;fs_info-&gt;lock);</div><div class='add'>+	if (fs_info-&gt;last_update == get_seconds()) {</div><div class='add'>+		rc = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	hypfs_delete_tree(sb-&gt;s_root);</div><div class='add'>+	rc = hypfs_diag_create_files(sb, sb-&gt;s_root);</div><div class='add'>+	if (rc) {</div><div class='add'>+		printk(KERN_ERR "hypfs: Update failed\n");</div><div class='add'>+		hypfs_delete_tree(sb-&gt;s_root);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	hypfs_update_update(sb);</div><div class='add'>+	rc = count;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;fs_info-&gt;lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hypfs_release(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	kfree(filp-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum { opt_uid, opt_gid, opt_err };</div><div class='add'>+</div><div class='add'>+static match_table_t hypfs_tokens = {</div><div class='add'>+	{opt_uid, "uid=%u"},</div><div class='add'>+	{opt_gid, "gid=%u"},</div><div class='add'>+	{opt_err, NULL}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hypfs_parse_options(char *options, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	char *str;</div><div class='add'>+	substring_t args[MAX_OPT_ARGS];</div><div class='add'>+</div><div class='add'>+	if (!options)</div><div class='add'>+		return 0;</div><div class='add'>+	while ((str = strsep(&amp;options, ",")) != NULL) {</div><div class='add'>+		int token, option;</div><div class='add'>+		struct hypfs_sb_info *hypfs_info = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+		if (!*str)</div><div class='add'>+			continue;</div><div class='add'>+		token = match_token(str, hypfs_tokens, args);</div><div class='add'>+		switch (token) {</div><div class='add'>+		case opt_uid:</div><div class='add'>+			if (match_int(&amp;args[0], &amp;option))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			hypfs_info-&gt;uid = option;</div><div class='add'>+			break;</div><div class='add'>+		case opt_gid:</div><div class='add'>+			if (match_int(&amp;args[0], &amp;option))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			hypfs_info-&gt;gid = option;</div><div class='add'>+			break;</div><div class='add'>+		case opt_err:</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "hypfs: Unrecognized mount option "</div><div class='add'>+			       "\"%s\" or missing value\n", str);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hypfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+{</div><div class='add'>+	struct inode *root_inode;</div><div class='add'>+	struct dentry *root_dentry;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct hypfs_sb_info *sbi;</div><div class='add'>+</div><div class='add'>+	sbi = kzalloc(sizeof(struct hypfs_sb_info), GFP_KERNEL);</div><div class='add'>+	if (!sbi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	mutex_init(&amp;sbi-&gt;lock);</div><div class='add'>+	sbi-&gt;uid = current-&gt;uid;</div><div class='add'>+	sbi-&gt;gid = current-&gt;gid;</div><div class='add'>+	sb-&gt;s_fs_info = sbi;</div><div class='add'>+	sb-&gt;s_blocksize = PAGE_CACHE_SIZE;</div><div class='add'>+	sb-&gt;s_blocksize_bits = PAGE_CACHE_SHIFT;</div><div class='add'>+	sb-&gt;s_magic = HYPFS_MAGIC;</div><div class='add'>+	sb-&gt;s_op = &amp;hypfs_s_ops;</div><div class='add'>+	if (hypfs_parse_options(data, sb)) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+	root_inode = hypfs_make_inode(sb, S_IFDIR | 0755);</div><div class='add'>+	if (!root_inode) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+	root_inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='add'>+	root_inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='add'>+	root_dentry = d_alloc_root(root_inode);</div><div class='add'>+	if (!root_dentry) {</div><div class='add'>+		iput(root_inode);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='add'>+	rc = hypfs_diag_create_files(sb, root_dentry);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_tree;</div><div class='add'>+	sbi-&gt;update_file = hypfs_create_update_file(sb, root_dentry);</div><div class='add'>+	if (IS_ERR(sbi-&gt;update_file)) {</div><div class='add'>+		rc = PTR_ERR(sbi-&gt;update_file);</div><div class='add'>+		goto err_tree;</div><div class='add'>+	}</div><div class='add'>+	hypfs_update_update(sb);</div><div class='add'>+	sb-&gt;s_root = root_dentry;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_tree:</div><div class='add'>+	hypfs_delete_tree(root_dentry);</div><div class='add'>+	d_genocide(root_dentry);</div><div class='add'>+	dput(root_dentry);</div><div class='add'>+err_alloc:</div><div class='add'>+	kfree(sbi);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hypfs_get_super(struct file_system_type *fst, int flags,</div><div class='add'>+			const char *devname, void *data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	return get_sb_single(fst, flags, data, hypfs_fill_super, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hypfs_kill_super(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct hypfs_sb_info *sb_info = sb-&gt;s_fs_info;</div><div class='add'>+</div><div class='add'>+	hypfs_delete_tree(sb-&gt;s_root);</div><div class='add'>+	hypfs_remove(sb_info-&gt;update_file);</div><div class='add'>+	kfree(sb-&gt;s_fs_info);</div><div class='add'>+	sb-&gt;s_fs_info = NULL;</div><div class='add'>+	kill_litter_super(sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *hypfs_create_file(struct super_block *sb,</div><div class='add'>+					struct dentry *parent, const char *name,</div><div class='add'>+					char *data, mode_t mode)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct qstr qname;</div><div class='add'>+</div><div class='add'>+	qname.name = name;</div><div class='add'>+	qname.len = strlen(name);</div><div class='add'>+	qname.hash = full_name_hash(name, qname.len);</div><div class='add'>+	dentry = lookup_one_len(name, parent, strlen(name));</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	inode = hypfs_make_inode(sb, mode);</div><div class='add'>+	if (!inode) {</div><div class='add'>+		dput(dentry);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	if (mode &amp; S_IFREG) {</div><div class='add'>+		inode-&gt;i_fop = &amp;hypfs_file_ops;</div><div class='add'>+		if (data)</div><div class='add'>+			inode-&gt;i_size = strlen(data);</div><div class='add'>+		else</div><div class='add'>+			inode-&gt;i_size = 0;</div><div class='add'>+	} else if (mode &amp; S_IFDIR) {</div><div class='add'>+		inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='add'>+		inode-&gt;i_fop = &amp;simple_dir_operations;</div><div class='add'>+		parent-&gt;d_inode-&gt;i_nlink++;</div><div class='add'>+	} else</div><div class='add'>+		BUG();</div><div class='add'>+	inode-&gt;u.generic_ip = data;</div><div class='add'>+	d_instantiate(dentry, inode);</div><div class='add'>+	dget(dentry);</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,</div><div class='add'>+			   const char *name)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	dentry = hypfs_create_file(sb, parent, name, NULL, S_IFDIR | DIR_MODE);</div><div class='add'>+	if (IS_ERR(dentry))</div><div class='add'>+		return dentry;</div><div class='add'>+	hypfs_add_dentry(dentry);</div><div class='add'>+	parent-&gt;d_inode-&gt;i_nlink++;</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dentry *hypfs_create_update_file(struct super_block *sb,</div><div class='add'>+					       struct dentry *dir)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	dentry = hypfs_create_file(sb, dir, "update", NULL,</div><div class='add'>+				   S_IFREG | UPDATE_FILE_MODE);</div><div class='add'>+	/*</div><div class='add'>+	 * We do not put the update file on the 'delete' list with</div><div class='add'>+	 * hypfs_add_dentry(), since it should not be removed when the tree</div><div class='add'>+	 * is updated.</div><div class='add'>+	 */</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,</div><div class='add'>+				const char *name, __u64 value)</div><div class='add'>+{</div><div class='add'>+	char *buffer;</div><div class='add'>+	char tmp[TMP_SIZE];</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	snprintf(tmp, TMP_SIZE, "%lld\n", (unsigned long long int)value);</div><div class='add'>+	buffer = kstrdup(tmp, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	dentry =</div><div class='add'>+	    hypfs_create_file(sb, dir, name, buffer, S_IFREG | REG_FILE_MODE);</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='add'>+		kfree(buffer);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	hypfs_add_dentry(dentry);</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dentry *hypfs_create_str(struct super_block *sb, struct dentry *dir,</div><div class='add'>+				const char *name, char *string)</div><div class='add'>+{</div><div class='add'>+	char *buffer;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(strlen(string) + 2, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	sprintf(buffer, "%s\n", string);</div><div class='add'>+	dentry =</div><div class='add'>+	    hypfs_create_file(sb, dir, name, buffer, S_IFREG | REG_FILE_MODE);</div><div class='add'>+	if (IS_ERR(dentry)) {</div><div class='add'>+		kfree(buffer);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	hypfs_add_dentry(dentry);</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations hypfs_file_ops = {</div><div class='add'>+	.open		= hypfs_open,</div><div class='add'>+	.release	= hypfs_release,</div><div class='add'>+	.read		= do_sync_read,</div><div class='add'>+	.write		= do_sync_write,</div><div class='add'>+	.aio_read	= hypfs_aio_read,</div><div class='add'>+	.aio_write	= hypfs_aio_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_system_type hypfs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "s390_hypfs",</div><div class='add'>+	.get_sb		= hypfs_get_super,</div><div class='add'>+	.kill_sb	= hypfs_kill_super</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct super_operations hypfs_s_ops = {</div><div class='add'>+	.statfs		= simple_statfs,</div><div class='add'>+	.drop_inode	= hypfs_drop_inode,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static decl_subsys(s390, NULL, NULL);</div><div class='add'>+</div><div class='add'>+static int __init hypfs_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (MACHINE_IS_VM)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	if (hypfs_diag_init()) {</div><div class='add'>+		rc = -ENODATA;</div><div class='add'>+		goto fail_diag;</div><div class='add'>+	}</div><div class='add'>+	kset_set_kset_s(&amp;s390_subsys, hypervisor_subsys);</div><div class='add'>+	rc = subsystem_register(&amp;s390_subsys);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto fail_sysfs;</div><div class='add'>+	rc = register_filesystem(&amp;hypfs_type);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto fail_filesystem;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_filesystem:</div><div class='add'>+	subsystem_unregister(&amp;s390_subsys);</div><div class='add'>+fail_sysfs:</div><div class='add'>+	hypfs_diag_exit();</div><div class='add'>+fail_diag:</div><div class='add'>+	printk(KERN_ERR "hypfs: Initialization failed with rc = %i.\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit hypfs_exit(void)</div><div class='add'>+{</div><div class='add'>+	hypfs_diag_exit();</div><div class='add'>+	unregister_filesystem(&amp;hypfs_type);</div><div class='add'>+	subsystem_unregister(&amp;s390_subsys);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(hypfs_init)</div><div class='add'>+module_exit(hypfs_exit)</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Michael Holzheu &lt;holzheu@de.ibm.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("s390 Hypervisor Filesystem");</div><div class='head'>diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile<br/>index 9269b5788fac..86601a945709 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/Makefile</a></div><div class='hunk'>@@ -17,10 +17,11 @@ obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o</div><div class='ctx'> obj-$(CONFIG_SMP)		+= smp.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_COMPAT)		+= compat_linux.o compat_signal.o \</div><div class='del'>-					compat_wrapper.o compat_exec_domain.o</div><div class='del'>-obj-$(CONFIG_BINFMT_ELF32)	+= binfmt_elf32.o</div><div class='add'>+					compat_wrapper.o compat_exec_domain.o \</div><div class='add'>+					binfmt_elf32.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIRT_TIMER)	+= vtime.o</div><div class='add'>+obj-$(CONFIG_STACKTRACE)	+= stacktrace.o</div><div class='ctx'> </div><div class='ctx'> # Kexec part</div><div class='ctx'> S390_KEXEC_OBJS := machine_kexec.o crash.o</div><div class='head'>diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c<br/>index 3f7018e9dbe4..ec514fe5ccd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * and format the required data.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Use marker if you need to separate the values later */</div><div class='head'>diff --git a/arch/s390/kernel/binfmt_elf32.c b/arch/s390/kernel/binfmt_elf32.c<br/>index 1f451c2cb071..9565a2dcfadc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/binfmt_elf32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/binfmt_elf32.c</a></div><div class='hunk'>@@ -135,7 +135,6 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/binfmts.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='hunk'>@@ -177,11 +176,6 @@ struct elf_prpsinfo32</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/highuid.h&gt;</div><div class='ctx'> </div><div class='del'>-#undef NEW_TO_OLD_UID</div><div class='del'>-#undef NEW_TO_OLD_GID</div><div class='del'>-#define NEW_TO_OLD_UID(uid) ((uid) &gt; 65535) ? (u16)overflowuid : (u16)(uid)</div><div class='del'>-#define NEW_TO_OLD_GID(gid) ((gid) &gt; 65535) ? (u16)overflowgid : (u16)(gid) </div><div class='del'>-</div><div class='ctx'> #define elf_addr_t	u32</div><div class='ctx'> /*</div><div class='ctx'> #define init_elf_binfmt init_elf32_binfmt</div><div class='head'>diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c<br/>index 5e14de37c17b..785c9f70ac98 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_linux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/compat_linux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_linux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/compat_linux.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt; </div><div class='hunk'>@@ -410,7 +409,7 @@ asmlinkage long sys32_sysinfo(struct sysinfo32 __user *info)</div><div class='ctx'> 	mm_segment_t old_fs = get_fs ();</div><div class='ctx'> 	</div><div class='ctx'> 	set_fs (KERNEL_DS);</div><div class='del'>-	ret = sys_sysinfo(&amp;s);</div><div class='add'>+	ret = sys_sysinfo((struct sysinfo __user *) &amp;s);</div><div class='ctx'> 	set_fs (old_fs);</div><div class='ctx'> 	err = put_user (s.uptime, &amp;info-&gt;uptime);</div><div class='ctx'> 	err |= __put_user (s.loads[0], &amp;info-&gt;loads[0]);</div><div class='hunk'>@@ -439,7 +438,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,</div><div class='ctx'> 	mm_segment_t old_fs = get_fs ();</div><div class='ctx'> 	</div><div class='ctx'> 	set_fs (KERNEL_DS);</div><div class='del'>-	ret = sys_sched_rr_get_interval(pid, &amp;t);</div><div class='add'>+	ret = sys_sched_rr_get_interval(pid, (struct timespec __user *) &amp;t);</div><div class='ctx'> 	set_fs (old_fs);</div><div class='ctx'> 	if (put_compat_timespec(&amp;t, interval))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -465,7 +464,10 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	set_fs (KERNEL_DS);</div><div class='del'>-	ret = sys_rt_sigprocmask(how, set ? &amp;s : NULL, oset ? &amp;s : NULL, sigsetsize);</div><div class='add'>+	ret = sys_rt_sigprocmask(how,</div><div class='add'>+				 set ? (sigset_t __user *) &amp;s : NULL,</div><div class='add'>+				 oset ? (sigset_t __user *) &amp;s : NULL,</div><div class='add'>+				 sigsetsize);</div><div class='ctx'> 	set_fs (old_fs);</div><div class='ctx'> 	if (ret) return ret;</div><div class='ctx'> 	if (oset) {</div><div class='hunk'>@@ -490,7 +492,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,</div><div class='ctx'> 	mm_segment_t old_fs = get_fs();</div><div class='ctx'> 		</div><div class='ctx'> 	set_fs (KERNEL_DS);</div><div class='del'>-	ret = sys_rt_sigpending(&amp;s, sigsetsize);</div><div class='add'>+	ret = sys_rt_sigpending((sigset_t __user *) &amp;s, sigsetsize);</div><div class='ctx'> 	set_fs (old_fs);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		switch (_NSIG_WORDS) {</div><div class='hunk'>@@ -515,7 +517,7 @@ sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)</div><div class='ctx'> 	if (copy_siginfo_from_user32(&amp;info, uinfo))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	set_fs (KERNEL_DS);</div><div class='del'>-	ret = sys_rt_sigqueueinfo(pid, sig, &amp;info);</div><div class='add'>+	ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *) &amp;info);</div><div class='ctx'> 	set_fs (old_fs);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -675,7 +677,8 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offse</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 		</div><div class='ctx'> 	set_fs(KERNEL_DS);</div><div class='del'>-	ret = sys_sendfile(out_fd, in_fd, offset ? &amp;of : NULL, count);</div><div class='add'>+	ret = sys_sendfile(out_fd, in_fd,</div><div class='add'>+			   offset ? (off_t __user *) &amp;of : NULL, count);</div><div class='ctx'> 	set_fs(old_fs);</div><div class='ctx'> 	</div><div class='ctx'> 	if (offset &amp;&amp; put_user(of, offset))</div><div class='hunk'>@@ -695,7 +698,8 @@ asmlinkage long sys32_sendfile64(int out_fd, int in_fd,</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 		</div><div class='ctx'> 	set_fs(KERNEL_DS);</div><div class='del'>-	ret = sys_sendfile64(out_fd, in_fd, offset ? &amp;lof : NULL, count);</div><div class='add'>+	ret = sys_sendfile64(out_fd, in_fd,</div><div class='add'>+			     offset ? (loff_t __user *) &amp;lof : NULL, count);</div><div class='ctx'> 	set_fs(old_fs);</div><div class='ctx'> 	</div><div class='ctx'> 	if (offset &amp;&amp; put_user(lof, offset))</div><div class='head'>diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h<br/>index 3898f66d0b2f..1a18e29668ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_linux.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/compat_linux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/compat_linux.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _ASM_S390X_S390_H</div><div class='ctx'> #define _ASM_S390X_S390_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c<br/>index b4c815d8ef75..d49b876a83bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/compat_signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/compat_signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/compat_signal.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  1997-11-28  Modified for POSIX.1b signals by Richard Henderson</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c<br/>index 06a3fbc12536..7ba20922a535 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/debug.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *    Bugreports to: &lt;Linux390@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S<br/>index b2448487854c..5b5799ac8f83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/entry.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -59,6 +58,21 @@ STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'> </div><div class='ctx'> #define BASED(name) name-system_call(%r13)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	.macro	TRACE_IRQS_ON</div><div class='add'>+	l	%r1,BASED(.Ltrace_irq_on)</div><div class='add'>+	basr	%r14,%r1</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	TRACE_IRQS_OFF</div><div class='add'>+	l	%r1,BASED(.Ltrace_irq_off)</div><div class='add'>+	basr	%r14,%r1</div><div class='add'>+	.endm</div><div class='add'>+#else</div><div class='add'>+#define TRACE_IRQS_ON</div><div class='add'>+#define TRACE_IRQS_OFF</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Register usage in interrupt handlers:</div><div class='ctx'>  *    R9  - pointer to current task structure</div><div class='hunk'>@@ -93,13 +107,22 @@ STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'> 	l	%r13,__LC_SVC_NEW_PSW+4	# load &amp;system_call to %r13</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-	.macro	SAVE_ALL psworg,savearea,sync</div><div class='add'>+	.macro	SAVE_ALL_SYNC psworg,savearea</div><div class='ctx'> 	la	%r12,\psworg</div><div class='del'>-	.if	\sync</div><div class='ctx'> 	tm	\psworg+1,0x01		# test problem state bit</div><div class='ctx'> 	bz	BASED(2f)		# skip stack setup save</div><div class='ctx'> 	l	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-	.else</div><div class='add'>+#ifdef CONFIG_CHECK_STACK</div><div class='add'>+	b	BASED(3f)</div><div class='add'>+2:	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='add'>+	bz	BASED(stack_overflow)</div><div class='add'>+3:</div><div class='add'>+#endif</div><div class='add'>+2:</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	SAVE_ALL_ASYNC psworg,savearea</div><div class='add'>+	la	%r12,\psworg</div><div class='ctx'> 	tm	\psworg+1,0x01		# test problem state bit</div><div class='ctx'> 	bnz	BASED(1f)		# from user -&gt; load async stack</div><div class='ctx'> 	clc	\psworg+4(4),BASED(.Lcritical_end)</div><div class='hunk'>@@ -115,7 +138,6 @@ STACK_SIZE  = 1 &lt;&lt; STACK_SHIFT</div><div class='ctx'> 	sra	%r14,STACK_SHIFT</div><div class='ctx'> 	be	BASED(2f)</div><div class='ctx'> 1:	l	%r15,__LC_ASYNC_STACK</div><div class='del'>-	.endif</div><div class='ctx'> #ifdef CONFIG_CHECK_STACK</div><div class='ctx'> 	b	BASED(3f)</div><div class='ctx'> 2:	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='hunk'>@@ -196,7 +218,7 @@ system_call:</div><div class='ctx'> 	STORE_TIMER __LC_SYNC_ENTER_TIMER</div><div class='ctx'> sysc_saveall:</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA</div><div class='del'>-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	lh	%r7,0x8a	  # get svc number from lowcore</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='hunk'>@@ -221,8 +243,9 @@ sysc_do_svc:</div><div class='ctx'> sysc_nr_ok:</div><div class='ctx'> 	mvc	SP_ARGS(4,%r15),SP_R7(%r15)</div><div class='ctx'> sysc_do_restart:</div><div class='add'>+	l	%r8,BASED(.Lsysc_table)</div><div class='ctx'> 	tm	__TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)</div><div class='del'>-        l       %r8,sys_call_table-system_call(%r7,%r13) # get system call addr.</div><div class='add'>+	l	%r8,0(%r7,%r8)	  # get system call addr.</div><div class='ctx'>         bnz     BASED(sysc_tracesys)</div><div class='ctx'>         basr    %r14,%r8          # call sys_xxxx</div><div class='ctx'>         st      %r2,SP_R2(%r15)   # store return value (change R2 on stack)</div><div class='hunk'>@@ -323,9 +346,10 @@ sysc_tracesys:</div><div class='ctx'> 	basr	%r14,%r1</div><div class='ctx'> 	clc	SP_R2(4,%r15),BASED(.Lnr_syscalls)</div><div class='ctx'> 	bnl	BASED(sysc_tracenogo)</div><div class='add'>+	l	%r8,BASED(.Lsysc_table)</div><div class='ctx'> 	l	%r7,SP_R2(%r15)        # strace might have changed the </div><div class='ctx'> 	sll	%r7,2                  #  system call</div><div class='del'>-	l	%r8,sys_call_table-system_call(%r7,%r13)</div><div class='add'>+	l	%r8,0(%r7,%r8)</div><div class='ctx'> sysc_tracego:</div><div class='ctx'> 	lm	%r3,%r6,SP_R3(%r15)</div><div class='ctx'> 	l	%r2,SP_ORIG_R2(%r15)</div><div class='hunk'>@@ -352,6 +376,7 @@ ret_from_fork:</div><div class='ctx'> 	st	%r15,SP_R15(%r15)	# store stack pointer for new kthread</div><div class='ctx'> 0:	l       %r1,BASED(.Lschedtail)</div><div class='ctx'> 	basr    %r14,%r1</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'>         stosm   __SF_EMPTY(%r15),0x03     # reenable interrupts</div><div class='ctx'> 	b	BASED(sysc_return)</div><div class='ctx'> </div><div class='hunk'>@@ -425,7 +450,7 @@ pgm_check_handler:</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA</div><div class='ctx'>         tm      __LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception</div><div class='ctx'>         bnz     BASED(pgm_per)           # got per exception -&gt; special case</div><div class='del'>-	SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -464,7 +489,7 @@ pgm_per:</div><div class='ctx'> # Normal per exception</div><div class='ctx'> #</div><div class='ctx'> pgm_per_std:</div><div class='del'>-	SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -490,7 +515,7 @@ pgm_no_vtime2:</div><div class='ctx'> # it was a single stepped SVC that is causing all the trouble</div><div class='ctx'> #</div><div class='ctx'> pgm_svcper:</div><div class='del'>-	SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -507,6 +532,7 @@ pgm_no_vtime3:</div><div class='ctx'> 	mvc	__THREAD_per+__PER_address(4,%r1),__LC_PER_ADDRESS</div><div class='ctx'> 	mvc	__THREAD_per+__PER_access_id(1,%r1),__LC_PER_ACCESS_ID</div><div class='ctx'> 	oi	__TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='ctx'> 	b	BASED(sysc_do_svc)</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +545,7 @@ io_int_handler:</div><div class='ctx'> 	STORE_TIMER __LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA+16</div><div class='del'>-        SAVE_ALL __LC_IO_OLD_PSW,__LC_SAVE_AREA+16,0</div><div class='add'>+	SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+16</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_IO_OLD_PSW,__LC_SAVE_AREA+16</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -530,9 +556,11 @@ io_int_handler:</div><div class='ctx'> io_no_vtime:</div><div class='ctx'> #endif</div><div class='ctx'> 	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'>         l       %r1,BASED(.Ldo_IRQ)        # load address of do_IRQ</div><div class='ctx'>         la      %r2,SP_PTREGS(%r15) # address of register-save area</div><div class='ctx'>         basr    %r14,%r1          # branch to standard irq handler</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> </div><div class='ctx'> io_return:</div><div class='ctx'>         tm      SP_PSW+1(%r15),0x01    # returning to user ?</div><div class='hunk'>@@ -631,7 +659,7 @@ ext_int_handler:</div><div class='ctx'> 	STORE_TIMER __LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA+16</div><div class='del'>-        SAVE_ALL __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16,0</div><div class='add'>+	SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -642,10 +670,12 @@ ext_int_handler:</div><div class='ctx'> ext_no_vtime:</div><div class='ctx'> #endif</div><div class='ctx'> 	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	la	%r2,SP_PTREGS(%r15)    # address of register-save area</div><div class='ctx'> 	lh	%r3,__LC_EXT_INT_CODE  # get interruption code</div><div class='ctx'> 	l	%r1,BASED(.Ldo_extint)</div><div class='ctx'> 	basr	%r14,%r1</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	b	BASED(io_return)</div><div class='ctx'> </div><div class='ctx'> __critical_end:</div><div class='hunk'>@@ -657,21 +687,31 @@ __critical_end:</div><div class='ctx'>         .globl mcck_int_handler</div><div class='ctx'> mcck_int_handler:</div><div class='ctx'> 	spt	__LC_CPU_TIMER_SAVE_AREA	# revalidate cpu timer</div><div class='del'>-	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA</div><div class='ctx'> 	lm	%r0,%r15,__LC_GPREGS_SAVE_AREA	# revalidate gprs</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA+32</div><div class='ctx'> 	la	%r12,__LC_MCK_OLD_PSW</div><div class='ctx'> 	tm	__LC_MCCK_CODE,0x80     # system damage?</div><div class='ctx'> 	bo	BASED(mcck_int_main)	# yes -&gt; rest of mcck code invalid</div><div class='del'>-	tm	__LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?</div><div class='del'>-	bo	BASED(0f)</div><div class='del'>-	spt	__LC_LAST_UPDATE_TIMER	# revalidate cpu timer</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='del'>-	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER</div><div class='del'>-	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER</div><div class='add'>+	mvc	__LC_SAVE_AREA+52(8),__LC_ASYNC_ENTER_TIMER</div><div class='add'>+	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA</div><div class='add'>+	tm	__LC_MCCK_CODE+5,0x02	# stored cpu timer value valid?</div><div class='add'>+	bo	BASED(1f)</div><div class='add'>+	la	%r14,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	clc	0(8,%r14),__LC_ASYNC_ENTER_TIMER</div><div class='add'>+	bl	BASED(0f)</div><div class='add'>+	la	%r14,__LC_ASYNC_ENTER_TIMER</div><div class='add'>+0:	clc	0(8,%r14),__LC_EXIT_TIMER</div><div class='add'>+	bl	BASED(0f)</div><div class='add'>+	la	%r14,__LC_EXIT_TIMER</div><div class='add'>+0:	clc	0(8,%r14),__LC_LAST_UPDATE_TIMER</div><div class='add'>+	bl	BASED(0f)</div><div class='add'>+	la	%r14,__LC_LAST_UPDATE_TIMER</div><div class='add'>+0:	spt	0(%r14)</div><div class='add'>+	mvc	__LC_ASYNC_ENTER_TIMER(8),0(%r14)</div><div class='add'>+1:</div><div class='ctx'> #endif</div><div class='del'>-0:	tm	__LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?</div><div class='add'>+	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?</div><div class='ctx'> 	bno	BASED(mcck_int_main)	# no -&gt; skip cleanup critical</div><div class='ctx'> 	tm	__LC_MCK_OLD_PSW+1,0x01	# test problem state bit</div><div class='ctx'> 	bnz	BASED(mcck_int_main)	# from user -&gt; load async stack</div><div class='hunk'>@@ -691,7 +731,7 @@ mcck_int_main:</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	__LC_MCCK_CODE+2,0x08   # mwp of old psw valid?</div><div class='ctx'> 	bno	BASED(mcck_no_vtime)	# no -&gt; skip cleanup critical</div><div class='del'>-	tm	__LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?</div><div class='add'>+	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='ctx'> 	bz	BASED(mcck_no_vtime)</div><div class='ctx'> 	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='ctx'> 	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='hunk'>@@ -712,9 +752,25 @@ mcck_no_vtime:</div><div class='ctx'> 	stosm	__SF_EMPTY(%r15),0x04	# turn dat on</div><div class='ctx'> 	tm	__TI_flags+3(%r9),_TIF_MCCK_PENDING</div><div class='ctx'> 	bno	BASED(mcck_return)</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	l	%r1,BASED(.Ls390_handle_mcck)</div><div class='ctx'> 	basr	%r14,%r1		# call machine check handler</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> mcck_return:</div><div class='add'>+	mvc	__LC_RETURN_MCCK_PSW(8),SP_PSW(%r15) # move return PSW</div><div class='add'>+	ni	__LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit</div><div class='add'>+#ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='add'>+	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_SAVE_AREA+52</div><div class='add'>+	tm	__LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?</div><div class='add'>+	bno	BASED(0f)</div><div class='add'>+	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15</div><div class='add'>+	stpt	__LC_EXIT_TIMER</div><div class='add'>+	lpsw	__LC_RETURN_MCCK_PSW	# back to caller</div><div class='add'>+0:</div><div class='add'>+#endif</div><div class='add'>+	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15</div><div class='add'>+	lpsw	__LC_RETURN_MCCK_PSW	# back to caller</div><div class='add'>+</div><div class='ctx'>         RESTORE_ALL __LC_RETURN_MCCK_PSW,0</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -781,6 +837,8 @@ cleanup_table_sysc_leave:</div><div class='ctx'> 	.long	sysc_leave + 0x80000000, sysc_work_loop + 0x80000000</div><div class='ctx'> cleanup_table_sysc_work_loop:</div><div class='ctx'> 	.long	sysc_work_loop + 0x80000000, sysc_reschedule + 0x80000000</div><div class='add'>+cleanup_table_io_return:</div><div class='add'>+	.long	io_return + 0x80000000, io_leave + 0x80000000</div><div class='ctx'> cleanup_table_io_leave:</div><div class='ctx'> 	.long	io_leave + 0x80000000, io_done + 0x80000000</div><div class='ctx'> cleanup_table_io_work_loop:</div><div class='hunk'>@@ -807,6 +865,11 @@ cleanup_critical:</div><div class='ctx'> 	clc	4(4,%r12),BASED(cleanup_table_sysc_work_loop+4)</div><div class='ctx'> 	bl	BASED(cleanup_sysc_return)</div><div class='ctx'> 0:</div><div class='add'>+	clc	4(4,%r12),BASED(cleanup_table_io_return)</div><div class='add'>+	bl	BASED(0f)</div><div class='add'>+	clc	4(4,%r12),BASED(cleanup_table_io_return+4)</div><div class='add'>+	bl	BASED(cleanup_io_return)</div><div class='add'>+0:</div><div class='ctx'> 	clc	4(4,%r12),BASED(cleanup_table_io_leave)</div><div class='ctx'> 	bl	BASED(0f)</div><div class='ctx'> 	clc	4(4,%r12),BASED(cleanup_table_io_leave+4)</div><div class='hunk'>@@ -839,7 +902,7 @@ cleanup_system_call:</div><div class='ctx'> 	mvc	__LC_SAVE_AREA(16),0(%r12)</div><div class='ctx'> 0:	st	%r13,4(%r12)</div><div class='ctx'> 	st	%r12,__LC_SAVE_AREA+48	# argh</div><div class='del'>-	SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	l	%r12,__LC_SAVE_AREA+48	# argh</div><div class='ctx'> 	st	%r15,12(%r12)</div><div class='hunk'>@@ -971,7 +1034,12 @@ cleanup_io_leave_insn:</div><div class='ctx'> .Ltrace:       .long  syscall_trace</div><div class='ctx'> .Lvfork:       .long  sys_vfork</div><div class='ctx'> .Lschedtail:   .long  schedule_tail</div><div class='del'>-</div><div class='add'>+.Lsysc_table:  .long  sys_call_table</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+.Ltrace_irq_on:.long  trace_hardirqs_on</div><div class='add'>+.Ltrace_irq_off:</div><div class='add'>+	       .long  trace_hardirqs_off</div><div class='add'>+#endif</div><div class='ctx'> .Lcritical_start:</div><div class='ctx'>                .long  __critical_start + 0x80000000</div><div class='ctx'> .Lcritical_end:</div><div class='hunk'>@@ -979,9 +1047,8 @@ cleanup_io_leave_insn:</div><div class='ctx'> .Lcleanup_critical:</div><div class='ctx'>                .long  cleanup_critical</div><div class='ctx'> </div><div class='add'>+	       .section .rodata, "a"</div><div class='ctx'> #define SYSCALL(esa,esame,emu)	.long esa</div><div class='del'>-	.globl  sys_call_table</div><div class='ctx'> sys_call_table:</div><div class='ctx'> #include "syscalls.S"</div><div class='ctx'> #undef SYSCALL</div><div class='del'>-</div><div class='head'>diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S<br/>index 2ac095bc0e25..56f5f613b868 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/entry64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/entry64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/entry64.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -59,6 +58,19 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \</div><div class='ctx'> </div><div class='ctx'> #define BASED(name) name-system_call(%r13)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	.macro	TRACE_IRQS_ON</div><div class='add'>+	 brasl	%r14,trace_hardirqs_on</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	TRACE_IRQS_OFF</div><div class='add'>+	 brasl	%r14,trace_hardirqs_off</div><div class='add'>+	.endm</div><div class='add'>+#else</div><div class='add'>+#define TRACE_IRQS_ON</div><div class='add'>+#define TRACE_IRQS_OFF</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	.macro  STORE_TIMER lc_offset</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	stpt	\lc_offset</div><div class='hunk'>@@ -87,13 +99,22 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \</div><div class='ctx'> 	larl	%r13,system_call</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='del'>-        .macro  SAVE_ALL psworg,savearea,sync</div><div class='add'>+	.macro	SAVE_ALL_SYNC psworg,savearea</div><div class='ctx'> 	la	%r12,\psworg</div><div class='del'>-	.if	\sync</div><div class='ctx'> 	tm	\psworg+1,0x01		# test problem state bit</div><div class='ctx'> 	jz	2f			# skip stack setup save</div><div class='ctx'> 	lg	%r15,__LC_KERNEL_STACK	# problem state -&gt; load ksp</div><div class='del'>-	.else</div><div class='add'>+#ifdef CONFIG_CHECK_STACK</div><div class='add'>+	j	3f</div><div class='add'>+2:	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='add'>+	jz	stack_overflow</div><div class='add'>+3:</div><div class='add'>+#endif</div><div class='add'>+2:</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='add'>+	.macro	SAVE_ALL_ASYNC psworg,savearea</div><div class='add'>+	la	%r12,\psworg</div><div class='ctx'> 	tm	\psworg+1,0x01		# test problem state bit</div><div class='ctx'> 	jnz	1f			# from user -&gt; load kernel stack</div><div class='ctx'> 	clc	\psworg+8(8),BASED(.Lcritical_end)</div><div class='hunk'>@@ -108,7 +129,6 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \</div><div class='ctx'> 	srag	%r14,%r14,STACK_SHIFT</div><div class='ctx'> 	jz	2f</div><div class='ctx'> 1:	lg	%r15,__LC_ASYNC_STACK	# load async stack</div><div class='del'>-	.endif</div><div class='ctx'> #ifdef CONFIG_CHECK_STACK</div><div class='ctx'> 	j	3f</div><div class='ctx'> 2:	tml	%r15,STACK_SIZE - CONFIG_STACK_GUARD</div><div class='hunk'>@@ -187,7 +207,7 @@ system_call:</div><div class='ctx'> 	STORE_TIMER __LC_SYNC_ENTER_TIMER</div><div class='ctx'> sysc_saveall:</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA</div><div class='del'>-        SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'>         CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	llgh    %r7,__LC_SVC_INT_CODE # get svc number from lowcore</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='hunk'>@@ -347,6 +367,7 @@ ret_from_fork:</div><div class='ctx'> 	jo	0f</div><div class='ctx'> 	stg	%r15,SP_R15(%r15)	# store stack pointer for new kthread</div><div class='ctx'> 0:	brasl   %r14,schedule_tail</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'>         stosm   24(%r15),0x03     # reenable interrupts</div><div class='ctx'> 	j	sysc_return</div><div class='ctx'> </div><div class='hunk'>@@ -446,7 +467,7 @@ pgm_check_handler:</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA</div><div class='ctx'>         tm      __LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception</div><div class='ctx'>         jnz     pgm_per                  # got per exception -&gt; special case</div><div class='del'>-	SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -485,7 +506,7 @@ pgm_per:</div><div class='ctx'> # Normal per exception</div><div class='ctx'> #</div><div class='ctx'> pgm_per_std:</div><div class='del'>-	SAVE_ALL __LC_PGM_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -511,7 +532,7 @@ pgm_no_vtime2:</div><div class='ctx'> # it was a single stepped SVC that is causing all the trouble</div><div class='ctx'> #</div><div class='ctx'> pgm_svcper:</div><div class='del'>-	SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -528,6 +549,7 @@ pgm_no_vtime3:</div><div class='ctx'> 	mvc	__THREAD_per+__PER_address(8,%r1),__LC_PER_ADDRESS</div><div class='ctx'> 	mvc	__THREAD_per+__PER_access_id(1,%r1),__LC_PER_ACCESS_ID</div><div class='ctx'> 	oi	__TI_flags+7(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	stosm	__SF_EMPTY(%r15),0x03	# reenable interrupts</div><div class='ctx'> 	j	sysc_do_svc</div><div class='ctx'> </div><div class='hunk'>@@ -539,7 +561,7 @@ io_int_handler:</div><div class='ctx'> 	STORE_TIMER __LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA+32</div><div class='del'>-        SAVE_ALL __LC_IO_OLD_PSW,__LC_SAVE_AREA+32,0</div><div class='add'>+	SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+32</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_IO_OLD_PSW,__LC_SAVE_AREA+32</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -550,8 +572,10 @@ io_int_handler:</div><div class='ctx'> io_no_vtime:</div><div class='ctx'> #endif</div><div class='ctx'> 	lg	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'>         la      %r2,SP_PTREGS(%r15)    # address of register-save area</div><div class='ctx'> 	brasl   %r14,do_IRQ            # call standard irq handler</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> </div><div class='ctx'> io_return:</div><div class='ctx'>         tm      SP_PSW+1(%r15),0x01    # returning to user ?</div><div class='hunk'>@@ -647,7 +671,7 @@ ext_int_handler:</div><div class='ctx'> 	STORE_TIMER __LC_ASYNC_ENTER_TIMER</div><div class='ctx'> 	stck	__LC_INT_CLOCK</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA+32</div><div class='del'>-        SAVE_ALL __LC_EXT_OLD_PSW,__LC_SAVE_AREA+32,0</div><div class='add'>+	SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+32</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_EXT_OLD_PSW,__LC_SAVE_AREA+32</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='hunk'>@@ -658,9 +682,11 @@ ext_int_handler:</div><div class='ctx'> ext_no_vtime:</div><div class='ctx'> #endif</div><div class='ctx'> 	lg	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	la	%r2,SP_PTREGS(%r15)    # address of register-save area</div><div class='ctx'> 	llgh	%r3,__LC_EXT_INT_CODE  # get interruption code</div><div class='ctx'> 	brasl   %r14,do_extint</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	j	io_return</div><div class='ctx'> </div><div class='ctx'> __critical_end:</div><div class='hunk'>@@ -672,21 +698,32 @@ __critical_end:</div><div class='ctx'> mcck_int_handler:</div><div class='ctx'> 	la	%r1,4095		# revalidate r1</div><div class='ctx'> 	spt	__LC_CPU_TIMER_SAVE_AREA-4095(%r1)	# revalidate cpu timer</div><div class='del'>-	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA-4095(%r1)</div><div class='ctx'>   	lmg     %r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)# revalidate gprs</div><div class='ctx'> 	SAVE_ALL_BASE __LC_SAVE_AREA+64</div><div class='ctx'> 	la	%r12,__LC_MCK_OLD_PSW</div><div class='ctx'> 	tm	__LC_MCCK_CODE,0x80     # system damage?</div><div class='ctx'> 	jo	mcck_int_main		# yes -&gt; rest of mcck code invalid</div><div class='del'>-	tm	__LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?</div><div class='del'>-	jo	0f</div><div class='del'>-	spt	__LC_LAST_UPDATE_TIMER</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='del'>-	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER</div><div class='del'>-	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_LAST_UPDATE_TIMER</div><div class='del'>-	mvc	__LC_EXIT_TIMER(8),__LC_LAST_UPDATE_TIMER</div><div class='add'>+	la	%r14,4095</div><div class='add'>+	mvc	__LC_SAVE_AREA+104(8),__LC_ASYNC_ENTER_TIMER</div><div class='add'>+	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA-4095(%r14)</div><div class='add'>+	tm	__LC_MCCK_CODE+5,0x02	# stored cpu timer value valid?</div><div class='add'>+	jo	1f</div><div class='add'>+	la	%r14,__LC_SYNC_ENTER_TIMER</div><div class='add'>+	clc	0(8,%r14),__LC_ASYNC_ENTER_TIMER</div><div class='add'>+	jl	0f</div><div class='add'>+	la	%r14,__LC_ASYNC_ENTER_TIMER</div><div class='add'>+0:	clc	0(8,%r14),__LC_EXIT_TIMER</div><div class='add'>+	jl	0f</div><div class='add'>+	la	%r14,__LC_EXIT_TIMER</div><div class='add'>+0:	clc	0(8,%r14),__LC_LAST_UPDATE_TIMER</div><div class='add'>+	jl	0f</div><div class='add'>+	la	%r14,__LC_LAST_UPDATE_TIMER</div><div class='add'>+0:	spt	0(%r14)</div><div class='add'>+	mvc	__LC_ASYNC_ENTER_TIMER(8),0(%r14)</div><div class='add'>+1:</div><div class='ctx'> #endif</div><div class='del'>-0:	tm	__LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?</div><div class='add'>+	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?</div><div class='ctx'> 	jno	mcck_int_main		# no -&gt; skip cleanup critical</div><div class='ctx'> 	tm      __LC_MCK_OLD_PSW+1,0x01 # test problem state bit</div><div class='ctx'> 	jnz	mcck_int_main		# from user -&gt; load kernel stack</div><div class='hunk'>@@ -705,7 +742,7 @@ mcck_int_main:</div><div class='ctx'> #ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='ctx'> 	tm	__LC_MCCK_CODE+2,0x08	# mwp of old psw valid?</div><div class='ctx'> 	jno	mcck_no_vtime		# no -&gt; no timer update</div><div class='del'>-	tm      __LC_MCK_OLD_PSW+1,0x01 # interrupting from user ?</div><div class='add'>+	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?</div><div class='ctx'> 	jz	mcck_no_vtime</div><div class='ctx'> 	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER</div><div class='ctx'> 	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER</div><div class='hunk'>@@ -725,9 +762,21 @@ mcck_no_vtime:</div><div class='ctx'> 	stosm	__SF_EMPTY(%r15),0x04	# turn dat on</div><div class='ctx'> 	tm	__TI_flags+7(%r9),_TIF_MCCK_PENDING</div><div class='ctx'> 	jno	mcck_return</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	brasl	%r14,s390_handle_mcck</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> mcck_return:</div><div class='del'>-        RESTORE_ALL __LC_RETURN_MCCK_PSW,0</div><div class='add'>+	mvc	__LC_RETURN_MCCK_PSW(16),SP_PSW(%r15) # move return PSW</div><div class='add'>+	ni	__LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit</div><div class='add'>+	lmg	%r0,%r15,SP_R0(%r15)	# load gprs 0-15</div><div class='add'>+#ifdef CONFIG_VIRT_CPU_ACCOUNTING</div><div class='add'>+	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_SAVE_AREA+104</div><div class='add'>+	tm	__LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?</div><div class='add'>+	jno	0f</div><div class='add'>+	stpt	__LC_EXIT_TIMER</div><div class='add'>+0:</div><div class='add'>+#endif</div><div class='add'>+	lpswe	__LC_RETURN_MCCK_PSW	# back to caller</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> /*</div><div class='hunk'>@@ -789,6 +838,8 @@ cleanup_table_sysc_leave:</div><div class='ctx'> 	.quad	sysc_leave, sysc_work_loop</div><div class='ctx'> cleanup_table_sysc_work_loop:</div><div class='ctx'> 	.quad	sysc_work_loop, sysc_reschedule</div><div class='add'>+cleanup_table_io_return:</div><div class='add'>+	.quad	io_return, io_leave</div><div class='ctx'> cleanup_table_io_leave:</div><div class='ctx'> 	.quad	io_leave, io_done</div><div class='ctx'> cleanup_table_io_work_loop:</div><div class='hunk'>@@ -815,6 +866,11 @@ cleanup_critical:</div><div class='ctx'> 	clc	8(8,%r12),BASED(cleanup_table_sysc_work_loop+8)</div><div class='ctx'> 	jl	cleanup_sysc_return</div><div class='ctx'> 0:</div><div class='add'>+	clc	8(8,%r12),BASED(cleanup_table_io_return)</div><div class='add'>+	jl	0f</div><div class='add'>+	clc	8(8,%r12),BASED(cleanup_table_io_return+8)</div><div class='add'>+	jl	cleanup_io_return</div><div class='add'>+0:</div><div class='ctx'> 	clc	8(8,%r12),BASED(cleanup_table_io_leave)</div><div class='ctx'> 	jl	0f</div><div class='ctx'> 	clc	8(8,%r12),BASED(cleanup_table_io_leave+8)</div><div class='hunk'>@@ -847,7 +903,7 @@ cleanup_system_call:</div><div class='ctx'> 	mvc	__LC_SAVE_AREA(32),0(%r12)</div><div class='ctx'> 0:	stg	%r13,8(%r12)</div><div class='ctx'> 	stg	%r12,__LC_SAVE_AREA+96	# argh</div><div class='del'>-	SAVE_ALL __LC_SVC_OLD_PSW,__LC_SAVE_AREA,1</div><div class='add'>+	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA</div><div class='ctx'> 	lg	%r12,__LC_SAVE_AREA+96	# argh</div><div class='ctx'> 	stg	%r15,24(%r12)</div><div class='hunk'>@@ -956,8 +1012,8 @@ cleanup_io_leave_insn:</div><div class='ctx'> .Lcritical_end:</div><div class='ctx'>                .quad  __critical_end</div><div class='ctx'> </div><div class='add'>+	       .section .rodata, "a"</div><div class='ctx'> #define SYSCALL(esa,esame,emu)	.long esame</div><div class='del'>-	.globl  sys_call_table</div><div class='ctx'> sys_call_table:</div><div class='ctx'> #include "syscalls.S"</div><div class='ctx'> #undef SYSCALL</div><div class='hunk'>@@ -965,7 +1021,6 @@ sys_call_table:</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> </div><div class='ctx'> #define SYSCALL(esa,esame,emu)	.long emu</div><div class='del'>-	.globl  sys_call_table_emu</div><div class='ctx'> sys_call_table_emu:</div><div class='ctx'> #include "syscalls.S"</div><div class='ctx'> #undef SYSCALL</div><div class='head'>diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S<br/>index ea88d066bf04..adad8863ee2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/head.S</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  arch/s390/kernel/head.S</div><div class='ctx'>  *</div><div class='del'>- * (C) Copyright IBM Corp. 1999, 2005</div><div class='add'>+ * Copyright (C) IBM Corp. 1999,2006</div><div class='ctx'>  *</div><div class='ctx'>  *    Author(s): Hartmut Penner &lt;hp@de.ibm.com&gt;</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='hunk'>@@ -482,24 +481,23 @@ start:</div><div class='ctx'> </div><div class='ctx'> .macro GET_IPL_DEVICE</div><div class='ctx'> .Lget_ipl_device:</div><div class='del'>-	basr  %r12,0</div><div class='del'>-.LGID:	l     %r1,0xb8			# get sid</div><div class='add'>+	l     %r1,0xb8			# get sid</div><div class='ctx'> 	sll   %r1,15			# test if subchannel is enabled</div><div class='ctx'> 	srl   %r1,31</div><div class='ctx'> 	ltr   %r1,%r1</div><div class='del'>-	bz    0(%r14)			# subchannel disabled</div><div class='add'>+	bz    2f-.LPG1(%r13)		# subchannel disabled</div><div class='ctx'> 	l     %r1,0xb8</div><div class='del'>-	la    %r5,.Lipl_schib-.LGID(%r12)</div><div class='add'>+	la    %r5,.Lipl_schib-.LPG1(%r13)</div><div class='ctx'> 	stsch 0(%r5)		        # get schib of subchannel</div><div class='del'>-	bnz   0(%r14)			# schib not available</div><div class='add'>+	bnz   2f-.LPG1(%r13)		# schib not available</div><div class='ctx'> 	tm    5(%r5),0x01		# devno valid?</div><div class='del'>-	bno   0(%r14)</div><div class='del'>-	la    %r6,ipl_parameter_flags-.LGID(%r12)</div><div class='add'>+	bno   2f-.LPG1(%r13)</div><div class='add'>+	la    %r6,ipl_parameter_flags-.LPG1(%r13)</div><div class='ctx'> 	oi    3(%r6),0x01		# set flag</div><div class='del'>-	la    %r2,ipl_devno-.LGID(%r12)</div><div class='add'>+	la    %r2,ipl_devno-.LPG1(%r13)</div><div class='ctx'> 	mvc   0(2,%r2),6(%r5)		# store devno</div><div class='ctx'> 	tm    4(%r5),0x80		# qdio capable device?</div><div class='del'>-	bno   0(%r14)</div><div class='add'>+	bno   2f-.LPG1(%r13)</div><div class='ctx'> 	oi    3(%r6),0x02		# set flag</div><div class='ctx'> </div><div class='ctx'> 	# copy ipl parameters</div><div class='hunk'>@@ -523,7 +521,7 @@ start:</div><div class='ctx'> 	ar    %r2,%r1</div><div class='ctx'> 	sr    %r0,%r4</div><div class='ctx'> 	jne   1b</div><div class='del'>-	b     0(%r14)</div><div class='add'>+	b     2f-.LPG1(%r13)</div><div class='ctx'> </div><div class='ctx'> 	.align 4</div><div class='ctx'> .Lipl_schib:</div><div class='hunk'>@@ -537,6 +535,7 @@ ipl_parameter_flags:</div><div class='ctx'> 	.globl ipl_devno</div><div class='ctx'> ipl_devno:</div><div class='ctx'> 	.word 0</div><div class='add'>+2:</div><div class='ctx'> .endm</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='head'>diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S<br/>index 2d3b089bfb83..d00de17b3778 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/head31.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/head31.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/head31.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/head31.S</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/s390/kernel/head31.S</div><div class='ctx'>  *</div><div class='del'>- * (C) Copyright IBM Corp. 2005</div><div class='add'>+ * Copyright (C) IBM Corp. 2005,2006</div><div class='ctx'>  *</div><div class='ctx'>  *   Author(s):	Hartmut Penner &lt;hp@de.ibm.com&gt;</div><div class='ctx'>  *		Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='hunk'>@@ -16,12 +16,31 @@</div><div class='ctx'> # or linload or SALIPL</div><div class='ctx'> #</div><div class='ctx'> 	.org	0x10000</div><div class='del'>-startup:basr	%r13,0			 # get base</div><div class='del'>-.LPG1:	l	%r1, .Lget_ipl_device_addr-.LPG1(%r13)</div><div class='del'>-	basr	%r14, %r1</div><div class='add'>+startup:basr	%r13,0			# get base</div><div class='add'>+.LPG0:	l	%r13,0f-.LPG0(%r13)</div><div class='add'>+	b	0(%r13)</div><div class='add'>+0:	.long	startup_continue</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# params at 10400 (setup.h)</div><div class='add'>+#</div><div class='add'>+	.org	PARMAREA</div><div class='add'>+	.long	0,0			# IPL_DEVICE</div><div class='add'>+	.long	0,RAMDISK_ORIGIN	# INITRD_START</div><div class='add'>+	.long	0,RAMDISK_SIZE		# INITRD_SIZE</div><div class='add'>+</div><div class='add'>+	.org	COMMAND_LINE</div><div class='add'>+	.byte	"root=/dev/ram0 ro"</div><div class='add'>+	.byte	0</div><div class='add'>+</div><div class='add'>+	.org	0x11000</div><div class='add'>+</div><div class='add'>+startup_continue:</div><div class='add'>+	basr	%r13,0			# get base</div><div class='add'>+.LPG1:	GET_IPL_DEVICE</div><div class='ctx'> 	lctl	%c0,%c15,.Lctl-.LPG1(%r13) # load control registers</div><div class='del'>-	la	%r12,_pstart-.LPG1(%r13) # pointer to parameter area</div><div class='del'>-					 # move IPL device to lowcore</div><div class='add'>+	l	%r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area</div><div class='add'>+					# move IPL device to lowcore</div><div class='ctx'> 	mvc	__LC_IPLDEV(4),IPL_DEVICE-PARMAREA(%r12)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -51,8 +70,8 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> 	a	%r1,__LC_EXT_NEW_PSW+4	# set handler</div><div class='ctx'> 	st	%r1,__LC_EXT_NEW_PSW+4</div><div class='ctx'> </div><div class='del'>-	la	%r4,_pstart-.LPG1(%r13)	# %r4 is our index for sccb stuff</div><div class='del'>-	la	%r1, .Lsccb-PARMAREA(%r4)	# our sccb</div><div class='add'>+	l	%r4,.Lsccbaddr-.LPG1(%r13) # %r4 is our index for sccb stuff</div><div class='add'>+	lr	%r1,%r4			# our sccb</div><div class='ctx'> 	.insn	rre,0xb2200000,%r2,%r1	# service call</div><div class='ctx'> 	ipm	%r1</div><div class='ctx'> 	srl	%r1,28			# get cc code</div><div class='hunk'>@@ -63,7 +82,7 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> 	be	.Lservicecall-.LPG1(%r13)</div><div class='ctx'> 	lpsw	.Lwaitsclp-.LPG1(%r13)</div><div class='ctx'> .Lsclph:</div><div class='del'>-	lh	%r1,.Lsccbr-PARMAREA(%r4)</div><div class='add'>+	lh	%r1,.Lsccbr-.Lsccb(%r4)</div><div class='ctx'> 	chi	%r1,0x10		# 0x0010 is the sucess code</div><div class='ctx'> 	je	.Lprocsccb		# let's process the sccb</div><div class='ctx'> 	chi	%r1,0x1f0</div><div class='hunk'>@@ -74,7 +93,7 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> 	b	.Lservicecall-.LPG1(%r13)</div><div class='ctx'> .Lprocsccb:</div><div class='ctx'> 	lhi	%r1,0</div><div class='del'>-	icm	%r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0</div><div class='add'>+	icm	%r1,3,.Lscpincr1-.Lsccb(%r4) # use this one if != 0</div><div class='ctx'> 	jnz	.Lscnd</div><div class='ctx'> 	lhi	%r1,0x800		# otherwise report 2GB</div><div class='ctx'> .Lscnd:</div><div class='hunk'>@@ -84,10 +103,10 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> 	lr	%r1,%r3</div><div class='ctx'> .Lno2gb:</div><div class='ctx'> 	xr	%r3,%r3			# same logic</div><div class='del'>-	ic	%r3,.Lscpa1-PARMAREA(%r4)</div><div class='add'>+	ic	%r3,.Lscpa1-.Lsccb(%r4)</div><div class='ctx'> 	chi	%r3,0x00</div><div class='ctx'> 	jne	.Lcompmem</div><div class='del'>-	l	%r3,.Lscpa2-PARMAREA(%r13)</div><div class='add'>+	l	%r3,.Lscpa2-.Lsccb(%r4)</div><div class='ctx'> .Lcompmem:</div><div class='ctx'> 	mr	%r2,%r1			# mem in MB on 128-bit</div><div class='ctx'> 	l	%r1,.Lonemb-.LPG1(%r13)</div><div class='hunk'>@@ -95,8 +114,6 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> 	b	.Lfchunk-.LPG1(%r13)</div><div class='ctx'> </div><div class='ctx'> 	.align 4</div><div class='del'>-.Lget_ipl_device_addr:</div><div class='del'>-	.long	.Lget_ipl_device</div><div class='ctx'> .Lpmask:</div><div class='ctx'> 	.byte	0</div><div class='ctx'> .align 8</div><div class='hunk'>@@ -242,6 +259,8 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> 	.long	0			# cr13: home space segment table</div><div class='ctx'> 	.long	0xc0000000		# cr14: machine check handling off</div><div class='ctx'> 	.long	0			# cr15: linkage stack operations</div><div class='add'>+.Lduct:	.long	0,0,0,0,0,0,0,0</div><div class='add'>+	.long	0,0,0,0,0,0,0,0</div><div class='ctx'> .Lpcmem:.long	0x00080000,0x80000000 + .Lchkmem</div><div class='ctx'> .Lpcfpu:.long	0x00080000,0x80000000 + .Lchkfpu</div><div class='ctx'> .Lpccsp:.long	0x00080000,0x80000000 + .Lchkcsp</div><div class='hunk'>@@ -252,25 +271,9 @@ startup:basr	%r13,0			 # get base</div><div class='ctx'> .Lmflags:.long	machine_flags</div><div class='ctx'> .Lbss_bgn:  .long __bss_start</div><div class='ctx'> .Lbss_end:  .long _end</div><div class='del'>-</div><div class='del'>-	.org	PARMAREA-64</div><div class='del'>-.Lduct:	.long	0,0,0,0,0,0,0,0</div><div class='del'>-	.long	0,0,0,0,0,0,0,0</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# params at 10400 (setup.h)</div><div class='del'>-#</div><div class='del'>-	.org	PARMAREA</div><div class='del'>-	.global _pstart</div><div class='del'>-_pstart:</div><div class='del'>-	.long	0,0			# IPL_DEVICE</div><div class='del'>-	.long	0,RAMDISK_ORIGIN	# INITRD_START</div><div class='del'>-	.long	0,RAMDISK_SIZE		# INITRD_SIZE</div><div class='del'>-</div><div class='del'>-	.org	COMMAND_LINE</div><div class='del'>-	.byte	"root=/dev/ram0 ro"</div><div class='del'>-	.byte	0</div><div class='del'>-	.org	0x11000</div><div class='add'>+.Lparmaddr: .long PARMAREA</div><div class='add'>+.Lsccbaddr: .long .Lsccb</div><div class='add'>+	.align	4096</div><div class='ctx'> .Lsccb:</div><div class='ctx'> 	.hword	0x1000			# length, one page</div><div class='ctx'> 	.byte	0x00,0x00,0x00</div><div class='hunk'>@@ -287,18 +290,14 @@ _pstart:</div><div class='ctx'> .Lscpincr2:</div><div class='ctx'> 	.quad	0x00</div><div class='ctx'> 	.fill	3984,1,0</div><div class='del'>-	.org	0x12000</div><div class='del'>-	.global	_pend</div><div class='del'>-_pend:</div><div class='del'>-</div><div class='del'>-	GET_IPL_DEVICE</div><div class='add'>+	.align	4096</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SHARED_KERNEL</div><div class='ctx'> 	.org	0x100000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #</div><div class='del'>-# startup-code, running in virtual mode</div><div class='add'>+# startup-code, running in absolute addressing mode</div><div class='ctx'> #</div><div class='ctx'> 	.globl	_stext</div><div class='ctx'> _stext:	basr	%r13,0			# get base</div><div class='head'>diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S<br/>index f08c06f45d5c..47744fcca930 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/head64.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/head64.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/head64.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/head64.S</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * arch/s390/kernel/head64.S</div><div class='ctx'>  *</div><div class='del'>- * (C) Copyright IBM Corp. 1999,2005</div><div class='add'>+ * Copyright (C) IBM Corp. 1999,2006</div><div class='ctx'>  *</div><div class='ctx'>  *   Author(s):	Hartmut Penner &lt;hp@de.ibm.com&gt;</div><div class='ctx'>  *		Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='hunk'>@@ -15,18 +15,37 @@</div><div class='ctx'> # this is called either by the ipl loader or directly by PSW restart</div><div class='ctx'> # or linload or SALIPL</div><div class='ctx'> #</div><div class='del'>-        .org  0x10000</div><div class='del'>-startup:basr  %r13,0                     # get base</div><div class='add'>+	.org  0x10000</div><div class='add'>+startup:basr  %r13,0			 # get base</div><div class='add'>+.LPG0:	l     %r13,0f-.LPG0(%r13)</div><div class='add'>+	b     0(%r13)</div><div class='add'>+0:	.long startup_continue</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# params at 10400 (setup.h)</div><div class='add'>+#</div><div class='add'>+	.org   PARMAREA</div><div class='add'>+	.quad  0			# IPL_DEVICE</div><div class='add'>+	.quad  RAMDISK_ORIGIN		# INITRD_START</div><div class='add'>+	.quad  RAMDISK_SIZE		# INITRD_SIZE</div><div class='add'>+</div><div class='add'>+	.org   COMMAND_LINE</div><div class='add'>+	.byte  "root=/dev/ram0 ro"</div><div class='add'>+	.byte  0</div><div class='add'>+</div><div class='add'>+	.org   0x11000</div><div class='add'>+</div><div class='add'>+startup_continue:</div><div class='add'>+	basr  %r13,0			 # get base</div><div class='ctx'> .LPG1:  sll   %r13,1                     # remove high order bit</div><div class='ctx'>         srl   %r13,1</div><div class='del'>-	l     %r1,.Lget_ipl_device_addr-.LPG1(%r13)</div><div class='del'>-	basr  %r14,%r1</div><div class='add'>+	GET_IPL_DEVICE</div><div class='ctx'>         lhi   %r1,1                      # mode 1 = esame</div><div class='ctx'>         slr   %r0,%r0                    # set cpuid to zero</div><div class='ctx'>         sigp  %r1,%r0,0x12               # switch to esame mode</div><div class='ctx'> 	sam64				 # switch to 64 bit mode</div><div class='ctx'> 	lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers</div><div class='del'>-	larl  %r12,_pstart               # pointer to parameter area</div><div class='add'>+	lg    %r12,.Lparmaddr-.LPG1(%r13)# pointer to parameter area</div><div class='ctx'> 					 # move IPL device to lowcore</div><div class='ctx'>         mvc   __LC_IPLDEV(4),IPL_DEVICE+4-PARMAREA(%r12)</div><div class='ctx'> </div><div class='hunk'>@@ -55,8 +74,8 @@ startup:basr  %r13,0                     # get base</div><div class='ctx'> 	larl  %r1,.Lsclph</div><div class='ctx'> 	stg   %r1,__LC_EXT_NEW_PSW+8	# set handler</div><div class='ctx'> </div><div class='del'>-	larl  %r4,_pstart		# %r4 is our index for sccb stuff</div><div class='del'>-	la    %r1,.Lsccb-PARMAREA(%r4)	# our sccb</div><div class='add'>+	larl  %r4,.Lsccb		# %r4 is our index for sccb stuff</div><div class='add'>+	lgr   %r1,%r4			# our sccb</div><div class='ctx'> 	.insn rre,0xb2200000,%r2,%r1	# service call</div><div class='ctx'> 	ipm   %r1</div><div class='ctx'> 	srl   %r1,28			# get cc code</div><div class='hunk'>@@ -67,7 +86,7 @@ startup:basr  %r13,0                     # get base</div><div class='ctx'> 	be    .Lservicecall-.LPG1(%r13)</div><div class='ctx'> 	lpswe .Lwaitsclp-.LPG1(%r13)</div><div class='ctx'> .Lsclph:</div><div class='del'>-	lh    %r1,.Lsccbr-PARMAREA(%r4)</div><div class='add'>+	lh    %r1,.Lsccbr-.Lsccb(%r4)</div><div class='ctx'> 	chi   %r1,0x10			# 0x0010 is the sucess code</div><div class='ctx'> 	je    .Lprocsccb		# let's process the sccb</div><div class='ctx'> 	chi   %r1,0x1f0</div><div class='hunk'>@@ -78,15 +97,15 @@ startup:basr  %r13,0                     # get base</div><div class='ctx'> 	b     .Lservicecall-.LPG1(%r13)</div><div class='ctx'> .Lprocsccb:</div><div class='ctx'> 	lghi  %r1,0</div><div class='del'>-	icm   %r1,3,.Lscpincr1-PARMAREA(%r4) # use this one if != 0</div><div class='add'>+	icm   %r1,3,.Lscpincr1-.Lsccb(%r4) # use this one if != 0</div><div class='ctx'> 	jnz   .Lscnd</div><div class='del'>-	lg    %r1,.Lscpincr2-PARMAREA(%r4) # otherwise use this one</div><div class='add'>+	lg    %r1,.Lscpincr2-.Lsccb(%r4) # otherwise use this one</div><div class='ctx'> .Lscnd:</div><div class='ctx'> 	xr    %r3,%r3			# same logic</div><div class='del'>-	ic    %r3,.Lscpa1-PARMAREA(%r4)</div><div class='add'>+	ic    %r3,.Lscpa1-.Lsccb(%r4)</div><div class='ctx'> 	chi   %r3,0x00</div><div class='ctx'> 	jne   .Lcompmem</div><div class='del'>-	l     %r3,.Lscpa2-PARMAREA(%r13)</div><div class='add'>+	l     %r3,.Lscpa2-.Lsccb(%r4)</div><div class='ctx'> .Lcompmem:</div><div class='ctx'> 	mlgr  %r2,%r1			# mem in MB on 128-bit</div><div class='ctx'> 	l     %r1,.Lonemb-.LPG1(%r13)</div><div class='hunk'>@@ -94,8 +113,6 @@ startup:basr  %r13,0                     # get base</div><div class='ctx'> 	b     .Lfchunk-.LPG1(%r13)</div><div class='ctx'> </div><div class='ctx'> 	.align 4</div><div class='del'>-.Lget_ipl_device_addr:</div><div class='del'>-	.long .Lget_ipl_device</div><div class='ctx'> .Lpmask:</div><div class='ctx'> 	.byte 0</div><div class='ctx'> 	.align 8</div><div class='hunk'>@@ -242,29 +259,16 @@ startup:basr  %r13,0                     # get base</div><div class='ctx'>         .quad  0                        # cr13: home space segment table</div><div class='ctx'>         .quad  0xc0000000               # cr14: machine check handling off</div><div class='ctx'>         .quad  0                        # cr15: linkage stack operations</div><div class='add'>+.Lduct: .long 0,0,0,0,0,0,0,0</div><div class='add'>+	.long 0,0,0,0,0,0,0,0</div><div class='ctx'> .Lpcmsk:.quad  0x0000000180000000</div><div class='ctx'> .L4malign:.quad 0xffffffffffc00000</div><div class='ctx'> .Lscan2g:.quad 0x80000000 + 0x20000 - 8 # 2GB + 128K - 8</div><div class='ctx'> .Lnop:	.long  0x07000700</div><div class='add'>+.Lparmaddr:</div><div class='add'>+	.quad	PARMAREA</div><div class='ctx'> </div><div class='del'>-	.org PARMAREA-64</div><div class='del'>-.Lduct:	.long 0,0,0,0,0,0,0,0</div><div class='del'>-	.long 0,0,0,0,0,0,0,0</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# params at 10400 (setup.h)</div><div class='del'>-#</div><div class='del'>-	.org   PARMAREA</div><div class='del'>-	.global _pstart</div><div class='del'>-_pstart:</div><div class='del'>-	.quad  0                        # IPL_DEVICE</div><div class='del'>-        .quad  RAMDISK_ORIGIN           # INITRD_START</div><div class='del'>-        .quad  RAMDISK_SIZE             # INITRD_SIZE</div><div class='del'>-</div><div class='del'>-        .org   COMMAND_LINE</div><div class='del'>-    	.byte  "root=/dev/ram0 ro"</div><div class='del'>-        .byte  0</div><div class='del'>-	.org   0x11000</div><div class='add'>+	.align 4096</div><div class='ctx'> .Lsccb:</div><div class='ctx'> 	.hword 0x1000			# length, one page</div><div class='ctx'> 	.byte 0x00,0x00,0x00</div><div class='hunk'>@@ -281,18 +285,14 @@ _pstart:</div><div class='ctx'> .Lscpincr2:</div><div class='ctx'> 	.quad 0x00</div><div class='ctx'> 	.fill 3984,1,0</div><div class='del'>-	.org 0x12000</div><div class='del'>-	.global _pend</div><div class='del'>-_pend:	</div><div class='del'>-</div><div class='del'>-	GET_IPL_DEVICE</div><div class='add'>+	.align 4096</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SHARED_KERNEL</div><div class='ctx'> 	.org   0x100000</div><div class='ctx'> #endif</div><div class='ctx'> 	</div><div class='ctx'> #</div><div class='del'>-# startup-code, running in virtual mode</div><div class='add'>+# startup-code, running in absolute addressing mode</div><div class='ctx'> #</div><div class='ctx'>         .globl _stext</div><div class='ctx'> _stext:	basr  %r13,0                    # get base</div><div class='hunk'>@@ -326,4 +326,3 @@ _stext:	basr  %r13,0                    # get base</div><div class='ctx'>             .align 8</div><div class='ctx'> .Ldw:       .quad  0x0002000180000000,0x0000000000000000</div><div class='ctx'> .Laregs:    .long  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0</div><div class='del'>-</div><div class='head'>diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c<br/>index 480b6a5fef3a..1eef50918615 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/irq.c</a></div><div class='hunk'>@@ -69,10 +69,6 @@ asmlinkage void do_softirq(void)</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	account_system_vtime(current);</div><div class='del'>-</div><div class='del'>-	local_bh_disable();</div><div class='del'>-</div><div class='ctx'> 	if (local_softirq_pending()) {</div><div class='ctx'> 		/* Get current stack pointer. */</div><div class='ctx'> 		asm volatile("la %0,0(15)" : "=a" (old));</div><div class='hunk'>@@ -95,10 +91,6 @@ asmlinkage void do_softirq(void)</div><div class='ctx'> 			__do_softirq();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	account_system_vtime(current);</div><div class='del'>-</div><div class='del'>-	__local_bh_enable();</div><div class='del'>-</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c<br/>index bad81b5832db..60b1ea9f946b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@ static void kexec_halt_all_cpus(void *);</div><div class='ctx'> </div><div class='ctx'> typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);</div><div class='ctx'> </div><div class='del'>-const extern unsigned char relocate_kernel[];</div><div class='del'>-const extern unsigned long long relocate_kernel_len;</div><div class='add'>+extern const unsigned char relocate_kernel[];</div><div class='add'>+extern const unsigned long long relocate_kernel_len;</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> machine_kexec_prepare(struct kimage *image)</div><div class='hunk'>@@ -63,6 +63,7 @@ NORET_TYPE void</div><div class='ctx'> machine_kexec(struct kimage *image)</div><div class='ctx'> {</div><div class='ctx'> 	clear_all_subchannels();</div><div class='add'>+	cio_reset_channel_paths();</div><div class='ctx'> </div><div class='ctx'> 	/* Disable lowcore protection */</div><div class='ctx'> 	ctl_clear_bit(0,28);</div><div class='head'>diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c<br/>index c271cdab58e2..d989ed45a7aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/module.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,</div><div class='ctx'> 	int nrela, i, j;</div><div class='ctx'> </div><div class='ctx'> 	/* Find symbol table and string table. */</div><div class='del'>-	symtab = 0;</div><div class='add'>+	symtab = NULL;</div><div class='ctx'> 	for (i = 0; i &lt; hdr-&gt;e_shnum; i++)</div><div class='ctx'> 		switch (sechdrs[i].sh_type) {</div><div class='ctx'> 		case SHT_SYMTAB:</div><div class='head'>diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c<br/>index 4a0f5a1551ea..d3cbfa3005ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/process.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of process handling..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -143,6 +142,7 @@ static void default_idle(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	trace_hardirqs_on();</div><div class='ctx'> 	/* Wait for external, I/O or machine check interrupt. */</div><div class='ctx'> 	__load_psw_mask(PSW_KERNEL_BITS | PSW_MASK_WAIT |</div><div class='ctx'> 			PSW_MASK_IO | PSW_MASK_EXT);</div><div class='hunk'>@@ -172,7 +172,7 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> 	show_registers(regs);</div><div class='ctx'> 	/* Show stack backtrace if pt_regs is from kernel mode */</div><div class='ctx'> 	if (!(regs-&gt;psw.mask &amp; PSW_MASK_PSTATE))</div><div class='del'>-		show_trace(0,(unsigned long *) regs-&gt;gprs[15]);</div><div class='add'>+		show_trace(NULL, (unsigned long *) regs-&gt;gprs[15]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void kernel_thread_starter(void);</div><div class='head'>diff --git a/arch/s390/kernel/profile.c b/arch/s390/kernel/profile.c<br/>index 7ba777eec1a8..b81aa1f569ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/profile.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/profile.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/profile.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/profile.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@ static struct proc_dir_entry * root_irq_dir;</div><div class='ctx'> void init_irq_proc(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* create /proc/irq */</div><div class='del'>-	root_irq_dir = proc_mkdir("irq", 0);</div><div class='add'>+	root_irq_dir = proc_mkdir("irq", NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* create /proc/irq/prof_cpu_mask */</div><div class='ctx'> 	create_prof_cpu_mask(root_irq_dir);</div><div class='head'>diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c<br/>index 207bc511a6e3..c1b383537fec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/s390_ext.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/s390_ext.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/s390_ext.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/s390_ext.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'>  * (0x1202 external call, 0x1004 cpu timer, 0x2401 hwc console, 0x4000</div><div class='ctx'>  * iucv and 0x2603 pfault) this is always the first element. </div><div class='ctx'>  */</div><div class='del'>-ext_int_info_t *ext_int_hash[256] = { 0, };</div><div class='add'>+ext_int_info_t *ext_int_hash[256] = { NULL, };</div><div class='ctx'> </div><div class='ctx'> static inline int ext_hash(__u16 code)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c<br/>index 4176c77670c4..c73a45467fa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/s390_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/s390_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/s390_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/s390_ksyms.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  S390 version</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/highuid.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -46,8 +45,6 @@ EXPORT_SYMBOL(__down_interruptible);</div><div class='ctx'>  */</div><div class='ctx'> extern int dump_fpu (struct pt_regs * regs, s390_fp_regs *fpregs);</div><div class='ctx'> EXPORT_SYMBOL(dump_fpu);</div><div class='del'>-EXPORT_SYMBOL(overflowuid);</div><div class='del'>-EXPORT_SYMBOL(overflowgid);</div><div class='ctx'> EXPORT_SYMBOL(empty_zero_page);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c<br/>index 0a04e4a564b2..1ca34f54ea8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/setup.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -37,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Machine setup..</div><div class='hunk'>@@ -66,11 +67,6 @@ unsigned long __initdata zholes_size[MAX_NR_ZONES];</div><div class='ctx'> static unsigned long __initdata memory_end;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Setup options</div><div class='del'>- */</div><div class='del'>-extern int _text,_etext, _edata, _end;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This is set up by the setup-routine at boot-time</div><div class='ctx'>  * for S390 need to find out, what we have to setup</div><div class='ctx'>  * using address 0x10400 ...</div><div class='hunk'>@@ -80,15 +76,11 @@ extern int _text,_etext, _edata, _end;</div><div class='ctx'> </div><div class='ctx'> static struct resource code_resource = {</div><div class='ctx'> 	.name  = "Kernel code",</div><div class='del'>-	.start = (unsigned long) &amp;_text,</div><div class='del'>-	.end = (unsigned long) &amp;_etext - 1,</div><div class='ctx'> 	.flags = IORESOURCE_BUSY | IORESOURCE_MEM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct resource data_resource = {</div><div class='ctx'> 	.name = "Kernel data",</div><div class='del'>-	.start = (unsigned long) &amp;_etext,</div><div class='del'>-	.end = (unsigned long) &amp;_edata - 1,</div><div class='ctx'> 	.flags = IORESOURCE_BUSY | IORESOURCE_MEM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +115,7 @@ void __devinit cpu_init (void)</div><div class='ctx'>  */</div><div class='ctx'> char vmhalt_cmd[128] = "";</div><div class='ctx'> char vmpoff_cmd[128] = "";</div><div class='add'>+char vmpanic_cmd[128] = "";</div><div class='ctx'> </div><div class='ctx'> static inline void strncpy_skip_quote(char *dst, char *src, int n)</div><div class='ctx'> {</div><div class='hunk'>@@ -154,6 +147,38 @@ static int __init vmpoff_setup(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("vmpoff=", vmpoff_setup);</div><div class='ctx'> </div><div class='add'>+static int vmpanic_notify(struct notifier_block *self, unsigned long event,</div><div class='add'>+			  void *data)</div><div class='add'>+{</div><div class='add'>+	if (MACHINE_IS_VM &amp;&amp; strlen(vmpanic_cmd) &gt; 0)</div><div class='add'>+		cpcmd(vmpanic_cmd, NULL, 0, NULL);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PANIC_PRI_VMPANIC	0</div><div class='add'>+</div><div class='add'>+static struct notifier_block vmpanic_nb = {</div><div class='add'>+	.notifier_call = vmpanic_notify,</div><div class='add'>+	.priority = PANIC_PRI_VMPANIC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init vmpanic_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	static int register_done __initdata = 0;</div><div class='add'>+</div><div class='add'>+	strncpy_skip_quote(vmpanic_cmd, str, 127);</div><div class='add'>+	vmpanic_cmd[127] = 0;</div><div class='add'>+	if (!register_done) {</div><div class='add'>+		register_done = 1;</div><div class='add'>+		atomic_notifier_chain_register(&amp;panic_notifier_list,</div><div class='add'>+					       &amp;vmpanic_nb);</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("vmpanic=", vmpanic_setup);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * condev= and conmode= setup parameter.</div><div class='ctx'>  */</div><div class='hunk'>@@ -297,19 +322,34 @@ void (*_machine_power_off)(void) = do_machine_power_off_nonsmp;</div><div class='ctx'> </div><div class='ctx'> void machine_restart(char *command)</div><div class='ctx'> {</div><div class='del'>-	console_unblank();</div><div class='add'>+	if (!in_interrupt() || oops_in_progress)</div><div class='add'>+		/*</div><div class='add'>+		 * Only unblank the console if we are called in enabled</div><div class='add'>+		 * context or a bust_spinlocks cleared the way for us.</div><div class='add'>+		 */</div><div class='add'>+		console_unblank();</div><div class='ctx'> 	_machine_restart(command);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void machine_halt(void)</div><div class='ctx'> {</div><div class='del'>-	console_unblank();</div><div class='add'>+	if (!in_interrupt() || oops_in_progress)</div><div class='add'>+		/*</div><div class='add'>+		 * Only unblank the console if we are called in enabled</div><div class='add'>+		 * context or a bust_spinlocks cleared the way for us.</div><div class='add'>+		 */</div><div class='add'>+		console_unblank();</div><div class='ctx'> 	_machine_halt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void machine_power_off(void)</div><div class='ctx'> {</div><div class='del'>-	console_unblank();</div><div class='add'>+	if (!in_interrupt() || oops_in_progress)</div><div class='add'>+		/*</div><div class='add'>+		 * Only unblank the console if we are called in enabled</div><div class='add'>+		 * context or a bust_spinlocks cleared the way for us.</div><div class='add'>+		 */</div><div class='add'>+		console_unblank();</div><div class='ctx'> 	_machine_power_off();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -422,6 +462,11 @@ setup_resources(void)</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	code_resource.start = (unsigned long) &amp;_text;</div><div class='add'>+	code_resource.end = (unsigned long) &amp;_etext - 1;</div><div class='add'>+	data_resource.start = (unsigned long) &amp;_etext;</div><div class='add'>+	data_resource.end = (unsigned long) &amp;_edata - 1;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; MEMORY_CHUNKS &amp;&amp; memory_chunk[i].size &gt; 0; i++) {</div><div class='ctx'> 		res = alloc_bootmem_low(sizeof(struct resource));</div><div class='ctx'> 		res-&gt;flags = IORESOURCE_BUSY | IORESOURCE_MEM;</div><div class='head'>diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c<br/>index d48cfc726b68..a887b686f279 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/signal.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  1997-11-28  Modified for POSIX.1b signals by Richard Henderson</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c<br/>index 343120c9223d..8e03219eea76 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/smp.c</a></div><div class='hunk'>@@ -869,7 +869,7 @@ static int __init topology_init(void)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='del'>-		ret = register_cpu(&amp;per_cpu(cpu_devices, cpu), cpu, NULL);</div><div class='add'>+		ret = register_cpu(&amp;per_cpu(cpu_devices, cpu), cpu);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			printk(KERN_WARNING "topology_init: register_cpu %d "</div><div class='ctx'> 			       "failed (%d)\n", cpu, ret);</div><div class='head'>diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c<br/>new file mode 100644<br/>index 000000000000..de83f38288d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/stacktrace.c</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/s390/kernel/stacktrace.c</div><div class='add'>+ *</div><div class='add'>+ * Stack trace management functions</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) IBM Corp. 2006</div><div class='add'>+ *  Author(s): Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/stacktrace.h&gt;</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+</div><div class='add'>+static inline unsigned long save_context_stack(struct stack_trace *trace,</div><div class='add'>+					       unsigned int *skip,</div><div class='add'>+					       unsigned long sp,</div><div class='add'>+					       unsigned long low,</div><div class='add'>+					       unsigned long high)</div><div class='add'>+{</div><div class='add'>+	struct stack_frame *sf;</div><div class='add'>+	struct pt_regs *regs;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	while(1) {</div><div class='add'>+		sp &amp;= PSW_ADDR_INSN;</div><div class='add'>+		if (sp &lt; low || sp &gt; high)</div><div class='add'>+			return sp;</div><div class='add'>+		sf = (struct stack_frame *)sp;</div><div class='add'>+		while(1) {</div><div class='add'>+			addr = sf-&gt;gprs[8] &amp; PSW_ADDR_INSN;</div><div class='add'>+			if (!(*skip))</div><div class='add'>+				trace-&gt;entries[trace-&gt;nr_entries++] = addr;</div><div class='add'>+			else</div><div class='add'>+				(*skip)--;</div><div class='add'>+			if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+				return sp;</div><div class='add'>+			low = sp;</div><div class='add'>+			sp = sf-&gt;back_chain &amp; PSW_ADDR_INSN;</div><div class='add'>+			if (!sp)</div><div class='add'>+				break;</div><div class='add'>+			if (sp &lt;= low || sp &gt; high - sizeof(*sf))</div><div class='add'>+				return sp;</div><div class='add'>+			sf = (struct stack_frame *)sp;</div><div class='add'>+		}</div><div class='add'>+		/* Zero backchain detected, check for interrupt frame. */</div><div class='add'>+		sp = (unsigned long)(sf + 1);</div><div class='add'>+		if (sp &lt;= low || sp &gt; high - sizeof(*regs))</div><div class='add'>+			return sp;</div><div class='add'>+		regs = (struct pt_regs *)sp;</div><div class='add'>+		addr = regs-&gt;psw.addr &amp; PSW_ADDR_INSN;</div><div class='add'>+		if (!(*skip))</div><div class='add'>+			trace-&gt;entries[trace-&gt;nr_entries++] = addr;</div><div class='add'>+		else</div><div class='add'>+			(*skip)--;</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			return sp;</div><div class='add'>+		low = sp;</div><div class='add'>+		sp = regs-&gt;gprs[15];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void save_stack_trace(struct stack_trace *trace,</div><div class='add'>+		      struct task_struct *task, int all_contexts,</div><div class='add'>+		      unsigned int skip)</div><div class='add'>+{</div><div class='add'>+	register unsigned long sp asm ("15");</div><div class='add'>+	unsigned long orig_sp;</div><div class='add'>+</div><div class='add'>+	sp &amp;= PSW_ADDR_INSN;</div><div class='add'>+	orig_sp = sp;</div><div class='add'>+</div><div class='add'>+	sp = save_context_stack(trace, &amp;skip, sp,</div><div class='add'>+				S390_lowcore.panic_stack - PAGE_SIZE,</div><div class='add'>+				S390_lowcore.panic_stack);</div><div class='add'>+	if ((sp != orig_sp) &amp;&amp; !all_contexts)</div><div class='add'>+		return;</div><div class='add'>+	sp = save_context_stack(trace, &amp;skip, sp,</div><div class='add'>+				S390_lowcore.async_stack - ASYNC_SIZE,</div><div class='add'>+				S390_lowcore.async_stack);</div><div class='add'>+	if ((sp != orig_sp) &amp;&amp; !all_contexts)</div><div class='add'>+		return;</div><div class='add'>+	if (task)</div><div class='add'>+		save_context_stack(trace, &amp;skip, sp,</div><div class='add'>+				   (unsigned long) task_stack_page(task),</div><div class='add'>+				   (unsigned long) task_stack_page(task) + THREAD_SIZE);</div><div class='add'>+	else</div><div class='add'>+		save_context_stack(trace, &amp;skip, sp, S390_lowcore.thread_info,</div><div class='add'>+				   S390_lowcore.thread_info + THREAD_SIZE);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c<br/>index 2a6c6efb6865..74e6178fbaf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/time.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *    Copyright (C) 1991, 1992, 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -380,7 +379,7 @@ void __init time_init(void)</div><div class='ctx'>                                 -xtime.tv_sec, -xtime.tv_nsec);</div><div class='ctx'> </div><div class='ctx'> 	/* request the clock comparator external interrupt */</div><div class='del'>-        if (register_early_external_interrupt(0x1004, 0,</div><div class='add'>+	if (register_early_external_interrupt(0x1004, NULL,</div><div class='ctx'> 					      &amp;ext_int_info_cc) != 0)</div><div class='ctx'>                 panic("Couldn't request external interrupt 0x1004");</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c<br/>index a46793beeddd..bde1d1d59858 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/traps.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * 'Traps.c' handles hardware traps and faults after we have saved some</div><div class='ctx'>  * state in 'asm.s'.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -150,13 +149,11 @@ void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='ctx'> 	unsigned long *stack;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	// debugging aid: "show_stack(NULL);" prints the</div><div class='del'>-	// back trace for this cpu.</div><div class='del'>-</div><div class='ctx'> 	if (!sp)</div><div class='del'>-		sp = task ? (unsigned long *) task-&gt;thread.ksp : __r15;</div><div class='add'>+		stack = task ? (unsigned long *) task-&gt;thread.ksp : __r15;</div><div class='add'>+	else</div><div class='add'>+		stack = sp;</div><div class='ctx'> </div><div class='del'>-	stack = sp;</div><div class='ctx'> 	for (i = 0; i &lt; kstack_depth_to_print; i++) {</div><div class='ctx'> 		if (((addr_t) stack &amp; (THREAD_SIZE-1)) == 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -173,7 +170,7 @@ void show_stack(struct task_struct *task, unsigned long *sp)</div><div class='ctx'>  */</div><div class='ctx'> void dump_stack(void)</div><div class='ctx'> {</div><div class='del'>-	show_stack(0, 0);</div><div class='add'>+	show_stack(NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dump_stack);</div><div class='hunk'>@@ -334,9 +331,9 @@ static void inline do_trap(long interruption_code, int signr, char *str,</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *get_check_address(struct pt_regs *regs)</div><div class='add'>+static inline void __user *get_check_address(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	return (void *)((regs-&gt;psw.addr-S390_lowcore.pgm_ilc) &amp; PSW_ADDR_INSN);</div><div class='add'>+	return (void __user *)((regs-&gt;psw.addr-S390_lowcore.pgm_ilc) &amp; PSW_ADDR_INSN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void do_single_step(struct pt_regs *regs)</div><div class='hunk'>@@ -363,7 +360,7 @@ asmlinkage void name(struct pt_regs * regs, long interruption_code) \</div><div class='ctx'>         info.si_signo = signr; \</div><div class='ctx'>         info.si_errno = 0; \</div><div class='ctx'>         info.si_code = sicode; \</div><div class='del'>-        info.si_addr = (void *)siaddr; \</div><div class='add'>+	info.si_addr = siaddr; \</div><div class='ctx'>         do_trap(interruption_code, signr, str, regs, &amp;info); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +392,7 @@ DO_ERROR_INFO(SIGILL,  "translation exception", translation_exception,</div><div class='ctx'> 	      ILL_ILLOPN, get_check_address(regs))</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-do_fp_trap(struct pt_regs *regs, void *location,</div><div class='add'>+do_fp_trap(struct pt_regs *regs, void __user *location,</div><div class='ctx'>            int fpc, long interruption_code)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t si;</div><div class='hunk'>@@ -427,10 +424,10 @@ asmlinkage void illegal_op(struct pt_regs * regs, long interruption_code)</div><div class='ctx'> {</div><div class='ctx'> 	siginfo_t info;</div><div class='ctx'>         __u8 opcode[6];</div><div class='del'>-	__u16 *location;</div><div class='add'>+	__u16 __user *location;</div><div class='ctx'> 	int signal = 0;</div><div class='ctx'> </div><div class='del'>-	location = (__u16 *) get_check_address(regs);</div><div class='add'>+	location = get_check_address(regs);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We got all needed information from the lowcore and can</div><div class='hunk'>@@ -562,10 +559,10 @@ DO_ERROR_INFO(SIGILL, "specification exception", specification_exception,</div><div class='ctx'> </div><div class='ctx'> asmlinkage void data_exception(struct pt_regs * regs, long interruption_code)</div><div class='ctx'> {</div><div class='del'>-	__u16 *location;</div><div class='add'>+	__u16 __user *location;</div><div class='ctx'> 	int signal = 0;</div><div class='ctx'> </div><div class='del'>-	location = (__u16 *) get_check_address(regs);</div><div class='add'>+	location = get_check_address(regs);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We got all needed information from the lowcore and can</div><div class='head'>diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S<br/>index 9f34bb54c051..ff5f7bb34f75 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_64BIT</div><div class='ctx'> OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390")</div><div class='head'>diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c<br/>index dfe6f0856617..2306cd83fca1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/kernel/vtime.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/kernel/vtime.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/kernel/vtime.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/kernel/vtime.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *    Author(s): Jan Glauber &lt;jan.glauber@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -356,7 +355,7 @@ static void internal_add_vtimer(struct vtimer_list *timer)</div><div class='ctx'> </div><div class='ctx'> 	set_vtimer(event-&gt;expires);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;vt_list-&gt;lock, flags);</div><div class='del'>-	/* release CPU aquired in prepare_vtimer or mod_virt_timer() */</div><div class='add'>+	/* release CPU acquired in prepare_vtimer or mod_virt_timer() */</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c<br/>index 71f0a2fb3078..468f4ea33f99 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/lib/delay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/lib/delay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/lib/delay.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *    Copyright (C) 1997 Martin Mares &lt;mj@atrey.karlin.mff.cuni.cz&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c<br/>index 8240cc77e06e..ae5cf5d03d41 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/lib/string.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/lib/string.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/lib/string.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/lib/string.c</a></div><div class='hunk'>@@ -233,7 +233,7 @@ char * strrchr(const char * s, int c)</div><div class='ctx'> 		       if (s[len] == (char) c)</div><div class='ctx'> 			       return (char *) s + len;</div><div class='ctx'> 	       } while (--len &gt; 0);</div><div class='del'>-       return 0;</div><div class='add'>+       return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strrchr);</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +267,7 @@ char * strstr(const char * s1,const char * s2)</div><div class='ctx'> 			return (char *) s1;</div><div class='ctx'> 		s1++;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(strstr);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/math-emu/math.c b/arch/s390/math-emu/math.c<br/>index 648df7140335..b4957c84e4d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/math-emu/math.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/math-emu/math.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/math-emu/math.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/math-emu/math.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *          that does not have the IEEE fpu (all processors before G5).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c<br/>index 51596f429235..ceea51cff03b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/cmm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/mm/cmm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/cmm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/mm/cmm.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  Collaborative memory management interface.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -162,7 +161,7 @@ cmm_thread(void *dummy)</div><div class='ctx'> static void</div><div class='ctx'> cmm_start_thread(void)</div><div class='ctx'> {</div><div class='del'>-	kernel_thread(cmm_thread, 0, 0);</div><div class='add'>+	kernel_thread(cmm_thread, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c<br/>index 81ade401b073..7cd82575813d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/mm/fault.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *    Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -145,7 +144,7 @@ static void do_sigsegv(struct pt_regs *regs, unsigned long error_code,</div><div class='ctx'> #endif</div><div class='ctx'> 	si.si_signo = SIGSEGV;</div><div class='ctx'> 	si.si_code = si_code;</div><div class='del'>-	si.si_addr = (void *) address;</div><div class='add'>+	si.si_addr = (void __user *) address;</div><div class='ctx'> 	force_sig_info(SIGSEGV, &amp;si, current);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c<br/>index a055894f3bd8..eb6ebfef134a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/s390/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/s390/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/s390/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/s390/mm/init.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *    Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -24,6 +23,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/pfn.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/tlbflush.h&gt;</div><div class='add'>+#include &lt;asm/sections.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='hunk'>@@ -90,17 +91,6 @@ void show_mem(void)</div><div class='ctx'>         printk("%d pages swap cached\n",cached);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* References to section boundaries */</div><div class='del'>-</div><div class='del'>-extern unsigned long _text;</div><div class='del'>-extern unsigned long _etext;</div><div class='del'>-extern unsigned long _edata;</div><div class='del'>-extern unsigned long __bss_start;</div><div class='del'>-extern unsigned long _end;</div><div class='del'>-</div><div class='del'>-extern unsigned long __init_begin;</div><div class='del'>-extern unsigned long __init_end;</div><div class='del'>-</div><div class='ctx'> extern unsigned long __initdata zholes_size[];</div><div class='ctx'> /*</div><div class='ctx'>  * paging_init() sets up the page tables</div><div class='hunk'>@@ -117,6 +107,10 @@ void __init paging_init(void)</div><div class='ctx'>         unsigned long pfn = 0;</div><div class='ctx'>         unsigned long pgdir_k = (__pa(swapper_pg_dir) &amp; PAGE_MASK) | _KERNSEG_TABLE;</div><div class='ctx'>         static const int ssm_mask = 0x04000000L;</div><div class='add'>+	unsigned long ro_start_pfn, ro_end_pfn;</div><div class='add'>+</div><div class='add'>+	ro_start_pfn = PFN_DOWN((unsigned long)&amp;__start_rodata);</div><div class='add'>+	ro_end_pfn = PFN_UP((unsigned long)&amp;__end_rodata);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap whole virtual address space */</div><div class='ctx'> 	</div><div class='hunk'>@@ -144,7 +138,10 @@ void __init paging_init(void)</div><div class='ctx'>                 pg_dir++;</div><div class='ctx'> </div><div class='ctx'>                 for (tmp = 0 ; tmp &lt; PTRS_PER_PTE ; tmp++,pg_table++) {</div><div class='del'>-                        pte = pfn_pte(pfn, PAGE_KERNEL);</div><div class='add'>+			if (pfn &gt;= ro_start_pfn &amp;&amp; pfn &lt; ro_end_pfn)</div><div class='add'>+				pte = pfn_pte(pfn, __pgprot(_PAGE_RO));</div><div class='add'>+			else</div><div class='add'>+				pte = pfn_pte(pfn, PAGE_KERNEL);</div><div class='ctx'>                         if (pfn &gt;= max_low_pfn)</div><div class='ctx'>                                 pte_clear(&amp;init_mm, 0, &amp;pte);</div><div class='ctx'>                         set_pte(pg_table, pte);</div><div class='hunk'>@@ -176,6 +173,7 @@ void __init paging_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_64BIT */</div><div class='add'>+</div><div class='ctx'> void __init paging_init(void)</div><div class='ctx'> {</div><div class='ctx'>         pgd_t * pg_dir;</div><div class='hunk'>@@ -187,13 +185,15 @@ void __init paging_init(void)</div><div class='ctx'>         unsigned long pgdir_k = (__pa(swapper_pg_dir) &amp; PAGE_MASK) |</div><div class='ctx'>           _KERN_REGION_TABLE;</div><div class='ctx'> 	static const int ssm_mask = 0x04000000L;</div><div class='del'>-</div><div class='ctx'> 	unsigned long zones_size[MAX_NR_ZONES];</div><div class='ctx'> 	unsigned long dma_pfn, high_pfn;</div><div class='add'>+	unsigned long ro_start_pfn, ro_end_pfn;</div><div class='ctx'> </div><div class='ctx'> 	memset(zones_size, 0, sizeof(zones_size));</div><div class='ctx'> 	dma_pfn = MAX_DMA_ADDRESS &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	high_pfn = max_low_pfn;</div><div class='add'>+	ro_start_pfn = PFN_DOWN((unsigned long)&amp;__start_rodata);</div><div class='add'>+	ro_end_pfn = PFN_UP((unsigned long)&amp;__end_rodata);</div><div class='ctx'> </div><div class='ctx'> 	if (dma_pfn &gt; high_pfn)</div><div class='ctx'> 		zones_size[ZONE_DMA] = high_pfn;</div><div class='hunk'>@@ -232,7 +232,10 @@ void __init paging_init(void)</div><div class='ctx'>                         pmd_populate_kernel(&amp;init_mm, pm_dir, pt_dir);</div><div class='ctx'> 	</div><div class='ctx'>                         for (k = 0 ; k &lt; PTRS_PER_PTE ; k++,pt_dir++) {</div><div class='del'>-                                pte = pfn_pte(pfn, PAGE_KERNEL);</div><div class='add'>+				if (pfn &gt;= ro_start_pfn &amp;&amp; pfn &lt; ro_end_pfn)</div><div class='add'>+					pte = pfn_pte(pfn, __pgprot(_PAGE_RO));</div><div class='add'>+				else</div><div class='add'>+					pte = pfn_pte(pfn, PAGE_KERNEL);</div><div class='ctx'>                                 if (pfn &gt;= max_low_pfn) {</div><div class='ctx'>                                         pte_clear(&amp;init_mm, 0, &amp;pte); </div><div class='ctx'>                                         continue;</div><div class='hunk'>@@ -283,6 +286,9 @@ void __init mem_init(void)</div><div class='ctx'>                 reservedpages &lt;&lt; (PAGE_SHIFT-10),</div><div class='ctx'>                 datasize &gt;&gt;10,</div><div class='ctx'>                 initsize &gt;&gt; 10);</div><div class='add'>+	printk("Write protected kernel read-only data: %#lx - %#lx\n",</div><div class='add'>+	       (unsigned long)&amp;__start_rodata,</div><div class='add'>+	       PFN_ALIGN((unsigned long)&amp;__end_rodata) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void free_initmem(void)</div><div class='head'>diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig<br/>index 2bcecf422573..1a0db1d4c952 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/Kconfig</a></div><div class='hunk'>@@ -465,10 +465,10 @@ config KEXEC</div><div class='ctx'> 	help</div><div class='ctx'> 	  kexec is a system call that implements the ability to shutdown your</div><div class='ctx'> 	  current kernel, and to start another kernel.  It is like a reboot</div><div class='del'>-	  but it is indepedent of the system firmware.  And like a reboot</div><div class='add'>+	  but it is independent of the system firmware.  And like a reboot</div><div class='ctx'> 	  you can start any kernel with it, not just Linux.</div><div class='ctx'> </div><div class='del'>-	  The name comes from the similiarity to the exec system call.</div><div class='add'>+	  The name comes from the similarity to the exec system call.</div><div class='ctx'> </div><div class='ctx'> 	  It is an ongoing process to be certain the hardware in a machine</div><div class='ctx'> 	  is properly shutdown, so do not be surprised if this code does not</div><div class='head'>diff --git a/arch/sh/Makefile b/arch/sh/Makefile<br/>index c72e17a96eed..e467a450662b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/Makefile</a></div><div class='hunk'>@@ -147,7 +147,7 @@ endif</div><div class='ctx'> #	them changed.  We use .arch and .mach to indicate when they were</div><div class='ctx'> #	updated last, otherwise make uses the target directory mtime.</div><div class='ctx'> </div><div class='del'>-include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/MARKER</div><div class='add'>+include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/auto.conf</div><div class='ctx'> 	@echo '  SYMLINK include/asm-sh/cpu -&gt; include/asm-sh/$(cpuincdir-y)'</div><div class='ctx'> 	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi</div><div class='ctx'> 	$(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu</div><div class='hunk'>@@ -157,7 +157,7 @@ include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/MARKER</div><div class='ctx'> #	don't, just reference the parent directory so the semantics are</div><div class='ctx'> #	kept roughly the same.</div><div class='ctx'> </div><div class='del'>-include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/MARKER</div><div class='add'>+include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/auto.conf</div><div class='ctx'> 	@echo -n '  SYMLINK include/asm-sh/mach -&gt; '</div><div class='ctx'> 	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi</div><div class='ctx'> 	$(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \</div><div class='head'>diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/boards/adx/irq_maskreg.c<br/>index c0973f8d57ba..4b2abe5eb165 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/adx/irq_maskreg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/adx/irq_maskreg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/adx/irq_maskreg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/adx/irq_maskreg.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Each bit of the register is for masking each interrupt.  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='hunk'>@@ -102,6 +101,6 @@ static void end_maskreg_irq(unsigned int irq)</div><div class='ctx'> void make_maskreg_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;maskreg_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;maskreg_irq_type;</div><div class='ctx'> 	disable_maskreg_irq(irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c<br/>index a9fde781b21a..6835381da5fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/bigsur/io.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * IO functions for a Hitachi Big Sur Evaluation Board.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c<br/>index 6ddbcc77244d..ac946a2201c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/bigsur/irq.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -253,7 +252,7 @@ static void make_bigsur_l1isr(unsigned int irq) {</div><div class='ctx'>         /* sanity check first */</div><div class='ctx'>         if(irq &gt;= BIGSUR_IRQ_LOW &amp;&amp; irq &lt; BIGSUR_IRQ_HIGH) {</div><div class='ctx'>                 /* save the handler in the main description table */</div><div class='del'>-                irq_desc[irq].handler = &amp;bigsur_l1irq_type;</div><div class='add'>+                irq_desc[irq].chip = &amp;bigsur_l1irq_type;</div><div class='ctx'>                 irq_desc[irq].status = IRQ_DISABLED;</div><div class='ctx'>                 irq_desc[irq].action = 0;</div><div class='ctx'>                 irq_desc[irq].depth = 1;</div><div class='hunk'>@@ -270,7 +269,7 @@ static void make_bigsur_l2isr(unsigned int irq) {</div><div class='ctx'>         /* sanity check first */</div><div class='ctx'>         if(irq &gt;= BIGSUR_2NDLVL_IRQ_LOW &amp;&amp; irq &lt; BIGSUR_2NDLVL_IRQ_HIGH) {</div><div class='ctx'>                 /* save the handler in the main description table */</div><div class='del'>-                irq_desc[irq].handler = &amp;bigsur_l2irq_type;</div><div class='add'>+                irq_desc[irq].chip = &amp;bigsur_l2irq_type;</div><div class='ctx'>                 irq_desc[irq].status = IRQ_DISABLED;</div><div class='ctx'>                 irq_desc[irq].action = 0;</div><div class='ctx'>                 irq_desc[irq].depth = 1;</div><div class='head'>diff --git a/arch/sh/boards/bigsur/led.c b/arch/sh/boards/bigsur/led.c<br/>index 0a2339c69440..6b08c0e1c453 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/bigsur/led.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * This file contains Big Sur specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/bigsur/bigsur.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/bigsur/setup.c b/arch/sh/boards/bigsur/setup.c<br/>index e69be05195f5..dfeede9da50f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/bigsur/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/bigsur/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/bigsur/setup.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/cat68701/setup.c b/arch/sh/boards/cat68701/setup.c<br/>index ae8a350ade53..90e5175df227 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cat68701/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/cat68701/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/cat68701/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/cat68701/setup.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/mach/io.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/cqreek/irq.c b/arch/sh/boards/cqreek/irq.c<br/>index d1da0d844567..2955adc52310 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cqreek/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/cqreek/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/cqreek/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/cqreek/irq.c</a></div><div class='hunk'>@@ -103,7 +103,7 @@ void __init init_cqreek_IRQ(void)</div><div class='ctx'> 		cqreek_irq_data[14].stat_port = BRIDGE_IDE_INTR_STAT;</div><div class='ctx'> 		cqreek_irq_data[14].bit = 1;</div><div class='ctx'> </div><div class='del'>-		irq_desc[14].handler = &amp;cqreek_irq_type;</div><div class='add'>+		irq_desc[14].chip = &amp;cqreek_irq_type;</div><div class='ctx'> 		irq_desc[14].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[14].action = 0;</div><div class='ctx'> 		irq_desc[14].depth = 1;</div><div class='hunk'>@@ -117,7 +117,7 @@ void __init init_cqreek_IRQ(void)</div><div class='ctx'> 		cqreek_irq_data[10].bit = (1 &lt;&lt; 10);</div><div class='ctx'> </div><div class='ctx'> 		/* XXX: Err... we may need demultiplexer for ISA irq... */</div><div class='del'>-		irq_desc[10].handler = &amp;cqreek_irq_type;</div><div class='add'>+		irq_desc[10].chip = &amp;cqreek_irq_type;</div><div class='ctx'> 		irq_desc[10].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[10].action = 0;</div><div class='ctx'> 		irq_desc[10].depth = 1;</div><div class='head'>diff --git a/arch/sh/boards/cqreek/setup.c b/arch/sh/boards/cqreek/setup.c<br/>index 29b537cd6546..eff4ed93599f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/cqreek/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/cqreek/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/cqreek/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/cqreek/setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/dreamcast/setup.c<br/>index 55dece35cde5..0027b80a2343 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/dreamcast/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/dreamcast/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/dreamcast/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/dreamcast/setup.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ int __init platform_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Assign all virtual IRQs to the System ASIC int. handler */</div><div class='ctx'> 	for (i = HW_EVENT_IRQ_BASE; i &lt; HW_EVENT_IRQ_MAX; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;systemasic_int;</div><div class='add'>+		irq_desc[i].chip = &amp;systemasic_int;</div><div class='ctx'> </div><div class='ctx'> 	board_time_init = aica_time_init;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/ec3104/setup.c b/arch/sh/boards/ec3104/setup.c<br/>index 5130ba2b6ff1..4b3ef16a0e96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/ec3104/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/ec3104/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/ec3104/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/ec3104/setup.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ int __init platform_setup(void)</div><div class='ctx'> 		str[i] = ctrl_readb(EC3104_BASE + i);</div><div class='ctx'> </div><div class='ctx'> 	for (i = EC3104_IRQBASE; i &lt; EC3104_IRQBASE + 32; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;ec3104_int;</div><div class='add'>+		irq_desc[i].chip = &amp;ec3104_int;</div><div class='ctx'> </div><div class='ctx'> 	printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n",</div><div class='ctx'> 	       str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE);</div><div class='head'>diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c<br/>index 52d0ba39031b..96bb41c9fc55 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/harp/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/harp/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/harp/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/harp/irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Bases on the IPR irq system</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +113,7 @@ static void enable_harp_irq(unsigned int irq)</div><div class='ctx'> static void __init make_harp_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;harp_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;harp_irq_type;</div><div class='ctx'> 	disable_harp_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/harp/led.c b/arch/sh/boards/harp/led.c<br/>index 76ca4ccac703..aeb7b392b190 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/harp/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/harp/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/harp/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/harp/led.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * This file contains ST40STB1 HARP and compatible code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/harp/harp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/harp/setup.c b/arch/sh/boards/harp/setup.c<br/>index 05b01b8f40aa..886e450ab63e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/harp/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/harp/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/harp/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/harp/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * STMicroelectronics ST40STB1 HARP and compatible support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c<br/>index 6d94a8e2e67a..71f315663cc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/hp6xx/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/hp6xx/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/hp6xx/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Setup code for an HP680  (internal peripherials only)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hd64461.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/mpc1211/led.c b/arch/sh/boards/mpc1211/led.c<br/>index 0a31beec3465..1fe36927f691 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mpc1211/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/mpc1211/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mpc1211/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/mpc1211/led.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * This file contains Interface MPC-1211 specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void mach_led(int position, int value)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c<br/>index ba3a65439752..4ed1a95c6d56 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mpc1211/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/mpc1211/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mpc1211/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/mpc1211/pci.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  License.  See linux/COPYING for more information.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -273,9 +272,9 @@ void __init pcibios_fixup_irqs(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start = res-&gt;start;</div><div class='add'>+	resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='ctx'> 		if (start &gt;= 0x10000UL) {</div><div class='head'>diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c<br/>index 2bb581b91683..2bfb221cc35c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/mpc1211/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/mpc1211/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/mpc1211/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/mpc1211/setup.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='hunk'>@@ -194,7 +193,7 @@ static struct hw_interrupt_type mpc1211_irq_type = {</div><div class='ctx'> </div><div class='ctx'> static void make_mpc1211_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	irq_desc[irq].handler = &amp;mpc1211_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;mpc1211_irq_type;</div><div class='ctx'> 	irq_desc[irq].status  = IRQ_DISABLED;</div><div class='ctx'> 	irq_desc[irq].action  = 0;</div><div class='ctx'> 	irq_desc[irq].depth   = 1;</div><div class='head'>diff --git a/arch/sh/boards/overdrive/fpga.c b/arch/sh/boards/overdrive/fpga.c<br/>index 3a1ec9403441..956c23901228 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/fpga.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/fpga.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/fpga.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/overdrive/fpga.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/overdrive/galileo.c b/arch/sh/boards/overdrive/galileo.c<br/>index 276fa11ee4ce..29e48971bba0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/galileo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/galileo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/galileo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/overdrive/galileo.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='hunk'>@@ -536,7 +535,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size)</div><div class='add'>+			    resource_size_t size)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/overdrive/io.c b/arch/sh/boards/overdrive/io.c<br/>index 65f3fd0563d3..4671b6b047bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/overdrive/io.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c<br/>index 715e8feb3a68..5d730c70389e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/overdrive/irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Bases on the IPR irq system</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -150,7 +149,7 @@ static void enable_od_irq(unsigned int irq)</div><div class='ctx'> static void __init make_od_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;od_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;od_irq_type;</div><div class='ctx'> 	disable_od_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/overdrive/led.c b/arch/sh/boards/overdrive/led.c<br/>index 734742e92279..860d7f204a4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/overdrive/led.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * This file contains an Overdrive specific LED feature.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/overdrive/overdrive.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/overdrive/setup.c b/arch/sh/boards/overdrive/setup.c<br/>index 94f6165d33b8..a3a7744c2047 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/overdrive/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/overdrive/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/overdrive/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * STMicroelectronics Overdrive Support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/renesas/edosk7705/setup.c<br/>index 8b6f0c2af092..ba143fa4afaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/edosk7705/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/edosk7705/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/edosk7705/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/edosk7705/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * board by S. Dunn, 2003.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/machvec_init.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c<br/>index 456753d2649c..3a1abfa2fefb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/hs7751rvoip/io.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * expectation of later SuperIO and PCMCIA access.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c<br/>index ed4c5b50ea45..705b7ddcb0d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/hs7751rvoip/irq.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Lineo uSolutions, Inc. 2003.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -86,7 +85,7 @@ static struct hw_interrupt_type hs7751rvoip_irq_type = {</div><div class='ctx'> static void make_hs7751rvoip_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;hs7751rvoip_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;hs7751rvoip_irq_type;</div><div class='ctx'> 	disable_hs7751rvoip_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/renesas/hs7751rvoip/led.c b/arch/sh/boards/renesas/hs7751rvoip/led.c<br/>index 18a13c8da8a4..b6608fff9f38 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/hs7751rvoip/led.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Lineo uSolutions, Inc. 2003.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hs7751rvoip/hs7751rvoip.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/renesas/hs7751rvoip/mach.c b/arch/sh/boards/renesas/hs7751rvoip/mach.c<br/>index 8bbed60220ca..caf967f77c61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/mach.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/mach.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/hs7751rvoip/mach.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Machine vector for the Renesas Technology sales HS7751RVoIP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/renesas/hs7751rvoip/pci.c b/arch/sh/boards/renesas/hs7751rvoip/pci.c<br/>index 7a442d1eca46..7e5786b58110 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/hs7751rvoip/pci.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * PCI initialization for the Renesas SH7751R HS7751RVoIP board</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/renesas/hs7751rvoip/setup.c b/arch/sh/boards/renesas/hs7751rvoip/setup.c<br/>index f1a78b6c714c..29fb5ff70fb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/hs7751rvoip/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/hs7751rvoip/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/hs7751rvoip/setup.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Lineo uSolutions, Inc. 2003.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c<br/>index d36c9374aed1..154535440bbf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/rts7751r2d/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/rts7751r2d/irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Atom Create Engineering Co., Ltd. 2002.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -100,7 +99,7 @@ static struct hw_interrupt_type rts7751r2d_irq_type = {</div><div class='ctx'> static void make_rts7751r2d_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;rts7751r2d_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;rts7751r2d_irq_type;</div><div class='ctx'> 	disable_rts7751r2d_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/led.c b/arch/sh/boards/renesas/rts7751r2d/led.c<br/>index 9993259a894f..4d16de71fac1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/rts7751r2d/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/rts7751r2d/led.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * This file contains Renesas Technology Sales RTS7751R2D specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/rts7751r2d/rts7751r2d.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c<br/>index 610740512d56..5ed9e97ea197 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/mach.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/rts7751r2d/mach.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/rts7751r2d/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/rts7751r2d/mach.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Machine vector for the Renesas Technology sales RTS7751R2D</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c<br/>index 7a2eb10edb56..8372d967f601 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/systemh/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/renesas/systemh/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/renesas/systemh/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/renesas/systemh/irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Jonathan Short.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +104,7 @@ static void end_systemh_irq(unsigned int irq)</div><div class='ctx'> void make_systemh_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;systemh_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;systemh_irq_type;</div><div class='ctx'> 	disable_systemh_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/7300/io.c b/arch/sh/boards/se/7300/io.c<br/>index 3c89def46480..f449a94ddffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7300/io.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/mach/se7300.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7300/irq.c b/arch/sh/boards/se/7300/irq.c<br/>index 96c8c23d6c93..216a78d1a108 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7300/irq.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7300/led.c b/arch/sh/boards/se/7300/led.c<br/>index 02c7f846c84c..ad51f0a9c1e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7300/led.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * This file contains Solution Engine specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/mach/se7300.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/7300/setup.c b/arch/sh/boards/se/7300/setup.c<br/>index 08536bc224dc..ebcd98d4c081 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7300/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7300/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7300/setup.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/machvec_init.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/73180/io.c b/arch/sh/boards/se/73180/io.c<br/>index 73648cbe3678..755df5ac4a4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/73180/io.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/mach/se73180.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c<br/>index 70f04caad9a4..4344d0ef24aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/73180/irq.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -85,7 +84,7 @@ void</div><div class='ctx'> make_intreq_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;intreq_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;intreq_irq_type;</div><div class='ctx'> 	disable_intreq_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/73180/led.c b/arch/sh/boards/se/73180/led.c<br/>index 1e8f1cf3e10f..610439fde6ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/73180/led.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * This file contains Solution Engine specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/mach/se73180.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/73180/setup.c b/arch/sh/boards/se/73180/setup.c<br/>index 07fa90c38a06..cdb7b5f8d942 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/73180/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/73180/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/73180/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/machvec_init.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/se/770x/irq.c<br/>index 210897b315f4..3e558716ce10 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/770x/irq.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/770x/led.c b/arch/sh/boards/se/770x/led.c<br/>index 5c64e8ab2cfb..3cddbda025fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/770x/led.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * This file contains Solution Engine specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/se/se.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void mach_led(int position, int value)</div><div class='head'>diff --git a/arch/sh/boards/se/770x/mach.c b/arch/sh/boards/se/770x/mach.c<br/>index f9b4c56cc47e..6ec07bd3dcf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/mach.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/mach.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/770x/mach.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Machine vector for the Hitachi SolutionEngine</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c<br/>index 2bed46fb607d..7d1a071727cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/770x/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/770x/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/770x/setup.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/se/7751/irq.c b/arch/sh/boards/se/7751/irq.c<br/>index ad71f3e66c11..bf6c023615df 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7751/irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Ian da Silva and Jeremy Siegel, 2001.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7751/led.c b/arch/sh/boards/se/7751/led.c<br/>index 0c788230cf8f..a878726d3c7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7751/led.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * This file contains Solution Engine specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/se7751/se7751.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void mach_led(int position, int value)</div><div class='head'>diff --git a/arch/sh/boards/se/7751/mach.c b/arch/sh/boards/se/7751/mach.c<br/>index 16d386b7e3bf..62d8d3e62590 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/mach.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/mach.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7751/mach.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Machine vector for the Hitachi 7751 SolutionEngine</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7751/pci.c b/arch/sh/boards/se/7751/pci.c<br/>index 1f273efd2cf5..3ee03014dea3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7751/pci.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * PCI initialization for the Hitachi SH7751 Solution Engine board (MS7751SE01)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c<br/>index 9d111bb884f9..48dc5aee67d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/se/7751/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/se/7751/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/se/7751/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Ian da Silva and Jeremy Siegel, 2001.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/sh03/led.c b/arch/sh/boards/sh03/led.c<br/>index c851b0bec80f..d38562ad6be8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/sh03/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/sh03/led.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * This file contains Interface CTP/PCI-SH03 specific LED code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Cycle the LED's in the clasic Knightrider/Sun pattern */</div><div class='head'>diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c<br/>index d2a08ca5eb85..60290f8f289c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/sh03/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/sh03/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/sh03/setup.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/sh2000/setup.c b/arch/sh/boards/sh2000/setup.c<br/>index a290b1d09fb2..2fe6a11765e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/sh2000/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/sh2000/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/sh2000/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/sh2000/setup.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c<br/>index 08fc98342a0b..f1f7c70c9402 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/snapgear/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/snapgear/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/snapgear/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/snapgear/setup.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -51,7 +50,7 @@ static int __init eraseconfig_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("SnapGear: EraseConfig init\n");</div><div class='ctx'> 	/* Setup "EraseConfig" switch on external IRQ 0 */</div><div class='del'>-	if (request_irq(IRL0_IRQ, eraseconfig_interrupt, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(IRL0_IRQ, eraseconfig_interrupt, IRQF_DISABLED,</div><div class='ctx'> 				"Erase Config", NULL))</div><div class='ctx'> 		printk("SnapGear: failed to register IRQ%d for Reset witch\n",</div><div class='ctx'> 				IRL0_IRQ);</div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c<br/>index 1ed7f880b8c7..4836b9422e27 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/superh/microdev/io.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * License.  See linux/COPYING for more information.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c<br/>index efcbd86b7cd2..236398fbc083 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/superh/microdev/irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * License.  See linux/COPYING for more information.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +146,7 @@ static void enable_microdev_irq(unsigned int irq)</div><div class='ctx'> static void __init make_microdev_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;microdev_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;microdev_irq_type;</div><div class='ctx'> 	disable_microdev_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/led.c b/arch/sh/boards/superh/microdev/led.c<br/>index 52a98e69d3f0..a38f5351bd16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/superh/microdev/led.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define LED_REGISTER 0xa6104d20</div><div class='head'>diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/superh/microdev/setup.c<br/>index 892b14d31405..61b402a3f5d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/superh/microdev/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/superh/microdev/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/superh/microdev/setup.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * License.  See linux/COPYING for more information.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/arch/sh/boards/unknown/setup.c b/arch/sh/boards/unknown/setup.c<br/>index 02e84f03f45c..c5e4ed10876b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boards/unknown/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boards/unknown/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boards/unknown/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boards/unknown/setup.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * method to start debugging a new board during bring-up until proper board</div><div class='ctx'>  * setup code is written.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/machvec.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/sh/boot/compressed/head.S b/arch/sh/boot/compressed/head.S<br/>index 88db04d325fb..4c26a192277d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boot/compressed/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boot/compressed/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boot/compressed/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boot/compressed/head.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.global	startup</div><div class='head'>diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c<br/>index 211e9110074f..f2fed5ce5cc3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/boot/compressed/misc.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Modified to use standard LinuxSH BIOS by Greg Banks 7Jul2000</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #ifdef CONFIG_SH_STANDARD_BIOS</div><div class='ctx'> #include &lt;asm/sh_bios.h&gt;</div><div class='head'>diff --git a/arch/sh/cchips/hd6446x/hd64461/io.c b/arch/sh/cchips/hd6446x/hd64461/io.c<br/>index 4c062d6b7a97..ac3062671db7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64461/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64461/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64461/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/cchips/hd6446x/hd64461/io.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *	Typical I/O routines for HD64461 system.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hd64461/hd64461.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c<br/>index f014b9bf6922..ad126016720f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64461/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64461/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64461/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/cchips/hd6446x/hd64461/setup.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *	Hitachi HD64461 companion chip support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -134,7 +133,7 @@ int hd64461_irq_demux(int irq)</div><div class='ctx'> 	return __irq_demux(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq0 = { hd64461_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "HD64461", NULL, NULL };</div><div class='add'>+static struct irqaction irq0 = { hd64461_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64461", NULL, NULL };</div><div class='ctx'> </div><div class='ctx'> int __init setup_hd64461(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -154,7 +153,7 @@ int __init setup_hd64461(void)</div><div class='ctx'> 	outw(0xffff, HD64461_NIMR);</div><div class='ctx'> </div><div class='ctx'> 	for (i = HD64461_IRQBASE; i &lt; HD64461_IRQBASE + 16; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;hd64461_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;hd64461_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(CONFIG_HD64461_IRQ, &amp;irq0);</div><div class='head'>diff --git a/arch/sh/cchips/hd6446x/hd64465/gpio.c b/arch/sh/cchips/hd6446x/hd64465/gpio.c<br/>index 9785fdef868e..72320d02d69a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64465/gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64465/gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64465/gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/cchips/hd6446x/hd64465/gpio.c</a></div><div class='hunk'>@@ -170,7 +170,7 @@ static int __init hd64465_gpio_init(void)</div><div class='ctx'> 	if (!request_region(HD64465_REG_GPACR, 0x1000, MODNAME))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	if (request_irq(HD64465_IRQ_GPIO, hd64465_gpio_interrupt,</div><div class='del'>-	    		SA_INTERRUPT, MODNAME, 0))</div><div class='add'>+	    		IRQF_DISABLED, MODNAME, 0))</div><div class='ctx'> 		goto out_irqfailed;</div><div class='ctx'> </div><div class='ctx'>     	printk("HD64465 GPIO layer on irq %d\n", HD64465_IRQ_GPIO);</div><div class='head'>diff --git a/arch/sh/cchips/hd6446x/hd64465/io.c b/arch/sh/cchips/hd6446x/hd64465/io.c<br/>index 84cb142def0b..58704d066ae2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64465/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64465/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64465/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/cchips/hd6446x/hd64465/io.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Typical I/O routines for HD64465 system.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c<br/>index 68e4c4e4283d..d2b2851bc44b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64465/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/hd6446x/hd64465/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/cchips/hd6446x/hd64465/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/cchips/hd6446x/hd64465/setup.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 2000 YAEGASHI Takeshi</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -154,7 +153,7 @@ int hd64465_irq_demux(int irq)</div><div class='ctx'> 	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq0  = { hd64465_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "HD64465", NULL, NULL};</div><div class='add'>+static struct irqaction irq0  = { hd64465_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64465", NULL, NULL};</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __init setup_hd64465(void)</div><div class='hunk'>@@ -182,7 +181,7 @@ static int __init setup_hd64465(void)</div><div class='ctx'> 	outw(0xffff, HD64465_REG_NIMR); 	/* mask all interrupts */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HD64465_IRQ_NUM ; i++) {</div><div class='del'>-		irq_desc[HD64465_IRQ_BASE + i].handler = &amp;hd64465_irq_type;</div><div class='add'>+		irq_desc[HD64465_IRQ_BASE + i].chip = &amp;hd64465_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(CONFIG_HD64465_IRQ, &amp;irq0);</div><div class='head'>diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c<br/>index 2ee330b3c38f..0dc1fb8f9687 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/cchips/voyagergx/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/cchips/voyagergx/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/cchips/voyagergx/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/cchips/voyagergx/irq.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -166,7 +165,7 @@ int voyagergx_irq_demux(int irq)</div><div class='ctx'> static struct irqaction irq0  = {</div><div class='ctx'> 	.name		= "voyagergx",</div><div class='ctx'> 	.handler	= voyagergx_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.mask		= CPU_MASK_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +190,7 @@ void __init setup_voyagergx_irq(void)</div><div class='ctx'> 			flag = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (flag == 1)</div><div class='del'>-			irq_desc[VOYAGER_IRQ_BASE + i].handler = &amp;voyagergx_irq_type;</div><div class='add'>+			irq_desc[VOYAGER_IRQ_BASE + i].chip = &amp;voyagergx_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_irq(IRQ_VOYAGER, &amp;irq0);</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c<br/>index 5afab6f56ec3..0f866f8789f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-g2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/dma/dma-g2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-g2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/dma/dma-g2.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ static irqreturn_t g2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static struct irqaction g2_dma_irq = {</div><div class='ctx'> 	.name		= "g2 DMA handler",</div><div class='ctx'> 	.handler	= g2_dma_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int g2_enable_dma(struct dma_channel *chan)</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c<br/>index df604975ccc8..30a580aa7cbd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-pvr2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/dma/dma-pvr2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-pvr2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/dma/dma-pvr2.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ static int pvr2_xfer_dma(struct dma_channel *chan)</div><div class='ctx'> static struct irqaction pvr2_dma_irq = {</div><div class='ctx'> 	.name		= "pvr2 DMA handler",</div><div class='ctx'> 	.handler	= pvr2_dma_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dma_ops pvr2_dma_ops = {</div><div class='head'>diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c<br/>index cca26c4c9d1b..e028a2d2a4ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sh.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/dma/dma-sh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/dma/dma-sh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/dma/dma-sh.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -91,7 +90,7 @@ static int sh_dmac_request_dma(struct dma_channel *chan)</div><div class='ctx'> 		 chan-&gt;chan);</div><div class='ctx'> </div><div class='ctx'> 	return request_irq(get_dmte_irq(chan-&gt;chan), dma_tei,</div><div class='del'>-			   SA_INTERRUPT, name, chan);</div><div class='add'>+			   IRQF_DISABLED, name, chan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sh_dmac_free_dma(struct dma_channel *chan)</div><div class='hunk'>@@ -259,7 +258,7 @@ static int __init sh_dmac_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_SH4</div><div class='ctx'> 	make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);</div><div class='del'>-	i = request_irq(DMAE_IRQ, dma_err, SA_INTERRUPT, "DMAC Address Error", 0);</div><div class='add'>+	i = request_irq(DMAE_IRQ, dma_err, IRQF_DISABLED, "DMAC Address Error", 0);</div><div class='ctx'> 	if (i &lt; 0)</div><div class='ctx'> 		return i;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c<br/>index e12418bb1fa5..6acf02b9375b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/dma-dreamcast.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/dma-dreamcast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/dma-dreamcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/dma-dreamcast.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c<br/>index cf30e2fa51be..63b1c6f4b8d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/fixups-dreamcast.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/fixups-dreamcast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/fixups-dreamcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/fixups-dreamcast.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-bigsur.c b/arch/sh/drivers/pci/ops-bigsur.c<br/>index 9b43da67804b..ae82c6ca05e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-bigsur.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-bigsur.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-bigsur.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/ops-bigsur.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * PCI initialization for the Hitachi Big Sur Evaluation Board</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c<br/>index 69af80b93e3f..23d52791917e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-dreamcast.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-dreamcast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-dreamcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/ops-dreamcast.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c<br/>index beafa11f4d0c..83171d10141a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-rts7751r2d.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-rts7751r2d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-rts7751r2d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/ops-rts7751r2d.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * PCI initialization for the Renesas SH7751R RTS7751R2D board</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-sh03.c b/arch/sh/drivers/pci/ops-sh03.c<br/>index df2199732348..e58d556e5f94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-sh03.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-sh03.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-sh03.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/ops-sh03.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * PCI initialization for the Interface CTP/PCI-SH03 board</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/ops-snapgear.c b/arch/sh/drivers/pci/ops-snapgear.c<br/>index 6fdb9765c99a..3cbd14dd28fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-snapgear.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/ops-snapgear.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/ops-snapgear.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/ops-snapgear.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * PCI initialization for the SnapGear boards</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c<br/>index 30b14ac7ae5a..682f3dae305d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci-sh7751.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/pci-sh7751.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci-sh7751.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/pci-sh7751.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c<br/>index cb6752131156..7c81b8b65bb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci-st40.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/pci-st40.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci-st40.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/pci-st40.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Support functions for the ST40 PCI hardware.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='hunk'>@@ -448,7 +447,7 @@ static int __init pcibios_init(void)</div><div class='ctx'> 		     PHYSADDR(memory_end) - PHYSADDR(memory_start));</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(ST40PCI_ERR_IRQ, st40_pci_irq, </div><div class='del'>-                        SA_INTERRUPT, "st40pci", NULL)) {</div><div class='add'>+                        IRQF_DISABLED, "st40pci", NULL)) {</div><div class='ctx'> 		printk(KERN_ERR "st40pci: Cannot hook interrupt\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c<br/>index c1669905abe4..3d546ba329cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/drivers/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/drivers/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/drivers/pci/pci.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> 			    __attribute__ ((weak));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -85,10 +85,10 @@ void pcibios_align_resource(void *data, struct resource *res,</div><div class='ctx'>  * modulo 0x400.</div><div class='ctx'>  */</div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='ctx'> 			start = (start + 0x3ff) &amp; ~0x3ff;</div><div class='head'>diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c<br/>index 7a3b18faa277..f1f9ab87f0b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cf-enabler.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cf-enabler.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cf-enabler.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cf-enabler.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  Enable the CF configuration.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/cpu/irq/imask.c b/arch/sh/kernel/cpu/irq/imask.c<br/>index baed9a550d39..a33ae3e0a5a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/imask.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/imask.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/imask.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/irq/imask.c</a></div><div class='hunk'>@@ -105,6 +105,6 @@ static void shutdown_imask_irq(unsigned int irq)</div><div class='ctx'> void make_imask_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;imask_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;imask_irq_type;</div><div class='ctx'> 	enable_irq(irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c<br/>index 06e8afab32e4..30064bf6e154 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/intc2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/intc2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/intc2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/irq/intc2.c</a></div><div class='hunk'>@@ -137,7 +137,7 @@ void make_intc2_irq(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-	irq_desc[irq].handler = &amp;intc2_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;intc2_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	disable_intc2_irq(irq);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c<br/>index e55150ed0856..0f545941fb4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/ipr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/ipr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/ipr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/irq/ipr.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -115,7 +114,7 @@ void make_ipr_irq(unsigned int irq, unsigned int addr, int pos, int priority)</div><div class='ctx'> 	ipr_data[irq].shift = pos*4; /* POSition (0-3) x 4 means shift */</div><div class='ctx'> 	ipr_data[irq].priority = priority;</div><div class='ctx'> </div><div class='del'>-	irq_desc[irq].handler = &amp;ipr_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;ipr_irq_type;</div><div class='ctx'> 	disable_ipr_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/irq/pint.c b/arch/sh/kernel/cpu/irq/pint.c<br/>index 95d6024fe1ae..80cd8108d36a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/pint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/irq/pint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/irq/pint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/irq/pint.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -85,7 +84,7 @@ static void end_pint_irq(unsigned int irq)</div><div class='ctx'> void make_pint_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;pint_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;pint_irq_type;</div><div class='ctx'> 	disable_pint_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S<br/>index 966c0858b714..cc04e9e239ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh3/ex.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/sh3/ex.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh3/ex.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/sh3/ex.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.align 2</div><div class='ctx'> 	.data</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/ex.S b/arch/sh/kernel/cpu/sh4/ex.S<br/>index 8221e9d15515..26a27df06505 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/ex.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/sh4/ex.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/ex.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/sh4/ex.S</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.align 2</div><div class='ctx'> 	.data</div><div class='head'>diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c<br/>index 8437ea7430fe..781dbb11c038 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/sq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/cpu/sh4/sq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/cpu/sh4/sq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/cpu/sh4/sq.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -417,7 +416,6 @@ static struct file_operations sq_fops = {</div><div class='ctx'> static struct miscdevice sq_dev = {</div><div class='ctx'> 	.minor		= STORE_QUEUE_MINOR,</div><div class='ctx'> 	.name		= "sq",</div><div class='del'>-	.devfs_name	= "cpu/sq",</div><div class='ctx'> 	.fops		= &amp;sq_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S<br/>index a440d36ee618..7dfd2ba75f7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/entry.S</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/cpu/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c<br/>index b56e79632f24..c2e07f7f3496 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/irq.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		seq_printf(p, "%3d: ",i);</div><div class='ctx'> 		seq_printf(p, "%10u ", kstat_irqs(i));</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='head'>diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c<br/>index 43546525f28f..6bcd8d92399f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(</div><div class='ctx'> 				unsigned long start_address,</div><div class='ctx'> 				unsigned long vbr_reg) ATTRIB_NORET;</div><div class='ctx'> </div><div class='del'>-const extern unsigned char relocate_new_kernel[];</div><div class='del'>-const extern unsigned int relocate_new_kernel_size;</div><div class='add'>+extern const unsigned char relocate_new_kernel[];</div><div class='add'>+extern const unsigned int relocate_new_kernel_size;</div><div class='ctx'> extern void *gdb_vbr_vector;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c<br/>index 3887b4f6feb2..f7eebbde3291 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/ptrace.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/relocate_kernel.S b/arch/sh/kernel/relocate_kernel.S<br/>index b0695cffec6e..8221b37c9773 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/relocate_kernel.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/relocate_kernel.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/relocate_kernel.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/relocate_kernel.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Version 2.  See the file COPYING for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PAGE_SIZE      4096 /* must be same value as in &lt;asm/page.h&gt; */</div><div class='head'>diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c<br/>index bb229ef030f3..e75189cb1db7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/setup.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  * This file handles the architecture-dependent parts of initialization</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='hunk'>@@ -402,7 +402,7 @@ static int __init topology_init(void)</div><div class='ctx'> 	int cpu_id;</div><div class='ctx'> </div><div class='ctx'> 	for_each_possible_cpu(cpu_id)</div><div class='del'>-		register_cpu(&amp;cpu[cpu_id], cpu_id, NULL);</div><div class='add'>+		register_cpu(&amp;cpu[cpu_id], cpu_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c<br/>index d5d032533a8b..245ed8f945e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/sh_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/sh_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/sh_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/sh_ksyms.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c<br/>index 62c7d1c0ad7b..6c0fb7c4af11 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/smp.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Free Software Foundation; either version 2 of the License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c<br/>index 314a275c04e0..a1589f85499d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/time.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *    Copyright (C) 1991, 1992, 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c<br/>index 96a64cb13106..d4212add53b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/timers/timer-tmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/timers/timer-tmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/timers/timer-tmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/timers/timer-tmu.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static irqreturn_t tmu_timer_interrupt(int irq, void *dev_id,</div><div class='ctx'> static struct irqaction tmu_irq = {</div><div class='ctx'> 	.name		= "timer",</div><div class='ctx'> 	.handler	= tmu_timer_interrupt,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.mask		= CPU_MASK_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c<br/>index 7eb06719d844..d9db1180f770 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/traps.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * 'Traps.c' handles hardware traps and faults after we have saved some</div><div class='ctx'>  * state in 'entry.S'.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S<br/>index 51bdc1cf7838..95fdd9135fcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * ld script to make SuperH Linux kernel</div><div class='ctx'>  * Written by Niibe Yutaka</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_LITTLE_ENDIAN</div><div class='head'>diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S<br/>index 55f227441f9e..db6b736537ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/lib/memcpy-sh4.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/lib/memcpy-sh4.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/lib/memcpy-sh4.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/lib/memcpy-sh4.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * void *memcpy(void *dst, const void *src, size_t n);</div><div class='head'>diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c<br/>index ab833adf28c3..524cea5b47f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/cache-sh4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/cache-sh4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/mm/cache-sh4.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/clear_page.S b/arch/sh/mm/clear_page.S<br/>index ae58a61f0e66..08acead7b2a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/clear_page.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/clear_page.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/clear_page.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/mm/clear_page.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 2001, 2002  Niibe Yutaka</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/sh/mm/extable.c b/arch/sh/mm/extable.c<br/>index 505ede7c21bf..c1cf4463d09d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/mm/extable.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *   linux/arch/i386/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c<br/>index a3568fd51508..2a85bc15a412 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c<br/>index 77b4a838fe10..8ea27ca4b700 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/mm/init.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *   Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c<br/>index e5907c7330e5..c776b60fc250 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/mm/pg-sh4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/mm/pg-sh4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/mm/pg-sh4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/mm/pg-sh4.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Released under the terms of the GNU GPL v2.0.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sh/oprofile/op_model_sh7750.c b/arch/sh/oprofile/op_model_sh7750.c<br/>index 5ec9ddcc4b0b..c265185b22a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh/oprofile/op_model_sh7750.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh/oprofile/op_model_sh7750.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh/oprofile/op_model_sh7750.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh/oprofile/op_model_sh7750.c</a></div><div class='hunk'>@@ -198,7 +198,7 @@ static int sh7750_perf_counter_create_files(struct super_block *sb, struct dentr</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_CNTRS; i++) {</div><div class='ctx'> 		struct dentry *dir;</div><div class='del'>-		char buf[3];</div><div class='add'>+		char buf[4];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(buf, sizeof(buf), "%d", i);</div><div class='ctx'> 		dir = oprofilefs_mkdir(sb, root, buf);</div><div class='head'>diff --git a/arch/sh64/boot/compressed/misc.c b/arch/sh64/boot/compressed/misc.c<br/>index 89dbf45df3c8..ee7a1b6acb83 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/boot/compressed/misc.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Adapted for SHmedia from sh by Stuart Menefy, May 2002</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* cache.c */</div><div class='head'>diff --git a/arch/sh64/boot/compressed/vmlinux.lds.S b/arch/sh64/boot/compressed/vmlinux.lds.S<br/>index 15a737d9bba8..59c2ef4aeda5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/boot/compressed/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/boot/compressed/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/boot/compressed/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/boot/compressed/vmlinux.lds.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Modified by Stuart Menefy from arch/sh/vmlinux.lds.S written by Niibe Yutaka</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LITTLE_ENDIAN</div><div class='ctx'> /* OUTPUT_FORMAT("elf32-sh64l-linux", "elf32-sh64l-linux", "elf32-sh64l-linux") */</div><div class='head'>diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c<br/>index 56d6f9f71524..9079d1e94f2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/alphanum.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/alphanum.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/alphanum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/alphanum.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Machine-independent functions for handling 8-digit alphanumeric display</div><div class='ctx'>  * (e.g. Agilent HDSP-253x)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/kernel/dma.c b/arch/sh64/kernel/dma.c<br/>index 09cd9f4670b5..32c6f0549bf1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/dma.c</a></div><div class='hunk'>@@ -115,7 +115,7 @@ static irqreturn_t dma_mte(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_dmte = {</div><div class='ctx'> 	.handler	= dma_mte,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "DMA MTE",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +152,7 @@ static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq_derr = {</div><div class='ctx'> 	.handler	= dma_err,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> 	.name		= "DMA Error",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/kernel/entry.S b/arch/sh64/kernel/entry.S<br/>index 2e2cfe20b426..40d45346248d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/entry.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/kernel/head.S b/arch/sh64/kernel/head.S<br/>index cc0b628a9ea7..f3740ddbc471 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/head.S</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *    Add early SCIF console DTLB mapping.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='head'>diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c<br/>index d69879c0e063..e7e07f8749c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/irq.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * Naturally it's not a 1:1 relation, but there are similarities.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -65,7 +64,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		seq_printf(p, "%3d: ",i);</div><div class='ctx'> 		seq_printf(p, "%10u ", kstat_irqs(i));</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='head'>diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c<br/>index fc99bf4e362c..42c07d2e71d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/irq_intc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/irq_intc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/irq_intc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/irq_intc.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -178,7 +177,7 @@ static void end_intc_irq(unsigned int irq)</div><div class='ctx'> void make_intc_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;intc_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;intc_irq_type;</div><div class='ctx'> 	disable_intc_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -208,7 +207,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	/* Set default: per-line enable/disable, priority driven ack/eoi */</div><div class='ctx'> 	for (i = 0; i &lt; NR_INTC_IRQS; i++) {</div><div class='ctx'> 		if (platform_int_priority[i] != NO_PRIORITY) {</div><div class='del'>-			irq_desc[i].handler = &amp;intc_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;intc_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/kernel/led.c b/arch/sh64/kernel/led.c<br/>index cf993c4a9fdc..e35d3f667fb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/led.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Flash the LEDs</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c<br/>index 6197879e8578..9dae689b6a9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/pci_sh5.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/pci_sh5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/pci_sh5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/pci_sh5.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Support functions for the SH5 PCI hardware.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -474,13 +473,13 @@ static void __init pcibios_size_bridges(void)</div><div class='ctx'> static int __init pcibios_init(void)</div><div class='ctx'> {</div><div class='ctx'>         if (request_irq(IRQ_ERR, pcish5_err_irq,</div><div class='del'>-                        SA_INTERRUPT, "PCI Error",NULL) &lt; 0) {</div><div class='add'>+                        IRQF_DISABLED, "PCI Error",NULL) &lt; 0) {</div><div class='ctx'>                 printk(KERN_ERR "PCISH5: Cannot hook PCI_PERR interrupt\n");</div><div class='ctx'>                 return -EINVAL;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         if (request_irq(IRQ_SERR, pcish5_serr_irq,</div><div class='del'>-                        SA_INTERRUPT, "PCI SERR interrupt", NULL) &lt; 0) {</div><div class='add'>+                        IRQF_DISABLED, "PCI SERR interrupt", NULL) &lt; 0) {</div><div class='ctx'>                 printk(KERN_ERR "PCISH5: Cannot hook PCI_SERR interrupt\n");</div><div class='ctx'>                 return -EINVAL;</div><div class='ctx'>         }</div><div class='head'>diff --git a/arch/sh64/kernel/pcibios.c b/arch/sh64/kernel/pcibios.c<br/>index 50c61dcb9fae..945920bc24db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/pcibios.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/pcibios.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/pcibios.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/pcibios.c</a></div><div class='hunk'>@@ -69,10 +69,10 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root,</div><div class='ctx'>  * modulo 0x400.</div><div class='ctx'>  */</div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (start &amp; 0x300) {</div><div class='ctx'> 			start = (start + 0x3ff) &amp; ~0x3ff;</div><div class='head'>diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c<br/>index 1da9c61d6823..dba8e14013b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/process.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #define __KERNEL_SYSCALLS__</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c<br/>index cd22e9471316..4e95e18b46d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/ptrace.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c<br/>index d2711c9c9d13..ffb310e33cef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/setup.c</a></div><div class='hunk'>@@ -36,10 +36,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -309,7 +308,7 @@ static struct cpu cpu[1];</div><div class='ctx'> </div><div class='ctx'> static int __init topology_init(void)</div><div class='ctx'> {</div><div class='del'>-	return register_cpu(cpu, 0, NULL);</div><div class='add'>+	return register_cpu(cpu, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(topology_init);</div><div class='head'>diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c<br/>index 6f3a1c946339..4b2df7247b59 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/sh_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/sh_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/sh_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/sh_ksyms.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -19,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c<br/>index 3ea8929e483b..9e2ffc45c0e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/signal.c</a></div><div class='hunk'>@@ -407,7 +407,7 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,</div><div class='ctx'> static inline void __user *</div><div class='ctx'> get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)</div><div class='ctx'> {</div><div class='del'>-	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! on_sig_stack(sp))</div><div class='add'>+	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! sas_ss_flags(sp))</div><div class='ctx'> 		sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> </div><div class='ctx'> 	return (void __user *)((sp - frame_size) &amp; -8ul);</div><div class='head'>diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c<br/>index 6b8f4d22abc6..b8162e59030e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/time.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *      Copyright (C) 1991, 1992, 1995  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -485,8 +484,8 @@ static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id,</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction irq0  = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='del'>-static struct irqaction irq1  = { sh64_rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL};</div><div class='add'>+static struct irqaction irq0  = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL};</div><div class='add'>+static struct irqaction irq1  = { sh64_rtc_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "rtc", NULL, NULL};</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/sh64/kernel/vmlinux.lds.S b/arch/sh64/kernel/vmlinux.lds.S<br/>index 7d9f7a6339a0..a8fcc3a71585 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *    Remove support for ancient toolchains.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='head'>diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c<br/>index a82d8f1a7a64..53c1cabb3428 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/lib/c-checksum.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/c-checksum.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/lib/c-checksum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/lib/c-checksum.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c<br/>index 58087331b8a6..1326f45f31eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/lib/dbg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/dbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/lib/dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/lib/dbg.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> -- Copyright 2004 Richard Curnow (evt_debug etc)</div><div class='ctx'> --</div><div class='ctx'> --------------------------------------------------------------------------*/</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sh64/lib/io.c b/arch/sh64/lib/io.c<br/>index 277e11b10c2b..587baa3dffb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/lib/io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/lib/io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/lib/io.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/sh64/lib/iomap.c b/arch/sh64/lib/iomap.c<br/>index 83c5f0c04958..5cd3d5e9c762 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/lib/iomap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/lib/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/lib/iomap.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/lib/memcpy.c b/arch/sh64/lib/memcpy.c<br/>index c785d0aa194d..fba436a92bfa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/lib/memcpy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/memcpy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/lib/memcpy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/lib/memcpy.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/string.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/lib/udelay.c b/arch/sh64/lib/udelay.c<br/>index dad2f254efee..327653914007 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/lib/udelay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/lib/udelay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/lib/udelay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/lib/udelay.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sh64/mach-cayman/iomap.c b/arch/sh64/mach-cayman/iomap.c<br/>index d6a538c70709..2d06e9a55137 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mach-cayman/iomap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-cayman/iomap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mach-cayman/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mach-cayman/iomap.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * License.  See the file "COPYING" in the main directory of this archive</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/cayman.h&gt;</div><div class='head'>diff --git a/arch/sh64/mach-cayman/irq.c b/arch/sh64/mach-cayman/irq.c<br/>index f797c84bfdd1..228ce61c3515 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mach-cayman/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-cayman/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mach-cayman/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mach-cayman/irq.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Copyright (C) 2002 Stuart Menefy</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -45,13 +44,13 @@ static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id, struct pt_regs *</div><div class='ctx'> static struct irqaction cayman_action_smsc = {</div><div class='ctx'> 	.name		= "Cayman SMSC Mux",</div><div class='ctx'> 	.handler	= cayman_interrupt_smsc,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct irqaction cayman_action_pci2 = {</div><div class='ctx'> 	.name		= "Cayman PCI2 Mux",</div><div class='ctx'> 	.handler	= cayman_interrupt_pci2,</div><div class='del'>-	.flags		= SA_INTERRUPT,</div><div class='add'>+	.flags		= IRQF_DISABLED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void enable_cayman_irq(unsigned int irq)</div><div class='hunk'>@@ -187,7 +186,7 @@ void init_cayman_irq(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt;NR_EXT_IRQS; i++) {</div><div class='del'>-		irq_desc[START_EXT_IRQS + i].handler = &amp;cayman_irq_type;</div><div class='add'>+		irq_desc[START_EXT_IRQS + i].chip = &amp;cayman_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the SMSC interrupt */</div><div class='head'>diff --git a/arch/sh64/mach-cayman/setup.c b/arch/sh64/mach-cayman/setup.c<br/>index c793245629ad..d84895dda3cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mach-cayman/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-cayman/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mach-cayman/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mach-cayman/setup.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/sh64/mach-harp/setup.c b/arch/sh64/mach-harp/setup.c<br/>index 3938a65c4b25..fcd90afac297 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mach-harp/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-harp/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mach-harp/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mach-harp/setup.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/sh64/mach-romram/setup.c b/arch/sh64/mach-romram/setup.c<br/>index a9ba03fc5bed..eb98a1640cc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mach-romram/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-romram/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mach-romram/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mach-romram/setup.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/sh64/mach-sim/setup.c b/arch/sh64/mach-sim/setup.c<br/>index a68639cb4e5a..f09400c1ad1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mach-sim/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mach-sim/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mach-sim/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mach-sim/setup.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/arch/sh64/mm/cache.c b/arch/sh64/mm/cache.c<br/>index c0c1b21350d8..421487cfff4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mm/cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mm/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mm/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mm/cache.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sh64/mm/extable.c b/arch/sh64/mm/extable.c<br/>index 9da50e28b3fa..a2e6e0563772 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mm/extable.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Cloned from the 2.5 SH version..</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/arch/sh64/mm/hugetlbpage.c b/arch/sh64/mm/hugetlbpage.c<br/>index 3d89f2a6c785..187cf01750b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sh64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sh64/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sh64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sh64/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 2002, 2003 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile<br/>index 1b83e21841b5..6616ee05c313 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/Makefile</a></div><div class='hunk'>@@ -12,7 +12,7 @@ obj-y    := entry.o wof.o wuf.o etrap.o rtrap.o traps.o $(IRQ_OBJS) \</div><div class='ctx'> 	    sys_sparc.o sunos_asm.o systbls.o \</div><div class='ctx'> 	    time.o windows.o cpu.o devices.o sclow.o \</div><div class='ctx'> 	    tadpole.o tick14.o ptrace.o sys_solaris.o \</div><div class='del'>-	    unaligned.o muldiv.o semaphore.o</div><div class='add'>+	    unaligned.o muldiv.o semaphore.o prom.o of_device.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCI) += pcic.o</div><div class='ctx'> obj-$(CONFIG_SUN4) += sun4setup.o</div><div class='head'>diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c<br/>index 1f55231f07de..29d7cfd1c970 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * On sparc, thread_info data is static and TI_XXX offsets are computed by hand.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> // #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c<br/>index d3b3648362c0..118f3eca373e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/auxio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/auxio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/auxio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/auxio.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c<br/>index d7bfc61d2879..259a559d4cea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/cpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/cpu.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c<br/>index fcb0c049c3fe..adba9dfee35e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/devices.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c<br/>index 5c3529ceb5d6..81c0cbd96ff0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ebus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/ebus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ebus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/ebus.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Fixes for different platforms by Pete Zaitcev.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -20,6 +19,7 @@</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/bpp.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct linux_ebus *ebus_chain = NULL;</div><div class='hunk'>@@ -83,79 +83,81 @@ int __init ebus_blacklist_irq(char *name)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init fill_ebus_child(int node, struct linux_prom_registers *preg,</div><div class='del'>-				struct linux_ebus_child *dev)</div><div class='add'>+void __init fill_ebus_child(struct device_node *dp,</div><div class='add'>+			    struct linux_ebus_child *dev)</div><div class='ctx'> {</div><div class='del'>-	int regs[PROMREG_MAX];</div><div class='del'>-	int irqs[PROMREG_MAX];</div><div class='del'>-	char lbuf[128];</div><div class='add'>+	int *regs;</div><div class='add'>+	int *irqs;</div><div class='ctx'> 	int i, len;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;prom_node = node;</div><div class='del'>-	prom_getstring(node, "name", lbuf, sizeof(lbuf));</div><div class='del'>-	strcpy(dev-&gt;prom_name, lbuf);</div><div class='del'>-</div><div class='del'>-	len = prom_getproperty(node, "reg", (void *)regs, sizeof(regs));</div><div class='del'>-	if (len == -1) len = 0;</div><div class='add'>+	dev-&gt;prom_node = dp;</div><div class='add'>+	regs = of_get_property(dp, "reg", &amp;len);</div><div class='add'>+	if (!regs)</div><div class='add'>+		len = 0;</div><div class='ctx'> 	dev-&gt;num_addrs = len / sizeof(regs[0]);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_addrs; i++) {</div><div class='ctx'> 		if (regs[i] &gt;= dev-&gt;parent-&gt;num_addrs) {</div><div class='ctx'> 			prom_printf("UGH: property for %s was %d, need &lt; %d\n",</div><div class='del'>-				    dev-&gt;prom_name, len, dev-&gt;parent-&gt;num_addrs);</div><div class='add'>+				    dev-&gt;prom_node-&gt;name, len,</div><div class='add'>+				    dev-&gt;parent-&gt;num_addrs);</div><div class='ctx'> 			panic(__FUNCTION__);</div><div class='ctx'> 		}</div><div class='del'>-		dev-&gt;resource[i].start = dev-&gt;parent-&gt;resource[regs[i]].start; /* XXX resource */</div><div class='add'>+</div><div class='add'>+		/* XXX resource */</div><div class='add'>+		dev-&gt;resource[i].start =</div><div class='add'>+			dev-&gt;parent-&gt;resource[regs[i]].start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PROMINTR_MAX; i++)</div><div class='ctx'> 		dev-&gt;irqs[i] = PCI_IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;irqs[0] = ebus_blacklist_irq(dev-&gt;prom_name)) != 0) {</div><div class='add'>+	if ((dev-&gt;irqs[0] = ebus_blacklist_irq(dev-&gt;prom_node-&gt;name)) != 0) {</div><div class='ctx'> 		dev-&gt;num_irqs = 1;</div><div class='del'>-	} else if ((len = prom_getproperty(node, "interrupts",</div><div class='del'>-	    (char *)&amp;irqs, sizeof(irqs))) == -1 || len == 0) {</div><div class='del'>-		dev-&gt;num_irqs = 0;</div><div class='del'>-		dev-&gt;irqs[0] = 0;</div><div class='del'>-		if (dev-&gt;parent-&gt;num_irqs != 0) {</div><div class='del'>-			dev-&gt;num_irqs = 1;</div><div class='del'>-			dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[0];</div><div class='del'>-/* P3 */ /* printk("EBUS: dev %s irq %d from parent\n", dev-&gt;prom_name, dev-&gt;irqs[0]); */</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='del'>-		dev-&gt;num_irqs = len / sizeof(irqs[0]);</div><div class='del'>-		if (irqs[0] == 0 || irqs[0] &gt;= 8) {</div><div class='del'>-			/*</div><div class='del'>-			 * XXX Zero is a valid pin number...</div><div class='del'>-			 * This works as long as Ebus is not wired to INTA#.</div><div class='del'>-			 */</div><div class='del'>-			printk("EBUS: %s got bad irq %d from PROM\n",</div><div class='del'>-			    dev-&gt;prom_name, irqs[0]);</div><div class='add'>+		irqs = of_get_property(dp, "interrupts", &amp;len);</div><div class='add'>+		if (!irqs) {</div><div class='ctx'> 			dev-&gt;num_irqs = 0;</div><div class='ctx'> 			dev-&gt;irqs[0] = 0;</div><div class='add'>+			if (dev-&gt;parent-&gt;num_irqs != 0) {</div><div class='add'>+				dev-&gt;num_irqs = 1;</div><div class='add'>+				dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[0];</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			dev-&gt;irqs[0] = pcic_pin_to_irq(irqs[0], dev-&gt;prom_name);</div><div class='add'>+			dev-&gt;num_irqs = len / sizeof(irqs[0]);</div><div class='add'>+			if (irqs[0] == 0 || irqs[0] &gt;= 8) {</div><div class='add'>+				/*</div><div class='add'>+				 * XXX Zero is a valid pin number...</div><div class='add'>+				 * This works as long as Ebus is not wired</div><div class='add'>+				 * to INTA#.</div><div class='add'>+				 */</div><div class='add'>+				printk("EBUS: %s got bad irq %d from PROM\n",</div><div class='add'>+				       dev-&gt;prom_node-&gt;name, irqs[0]);</div><div class='add'>+				dev-&gt;num_irqs = 0;</div><div class='add'>+				dev-&gt;irqs[0] = 0;</div><div class='add'>+			} else {</div><div class='add'>+				dev-&gt;irqs[0] =</div><div class='add'>+					pcic_pin_to_irq(irqs[0],</div><div class='add'>+							dev-&gt;prom_node-&gt;name);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init fill_ebus_device(int node, struct linux_ebus_device *dev)</div><div class='add'>+void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers regs[PROMREG_MAX];</div><div class='add'>+	struct linux_prom_registers *regs;</div><div class='ctx'> 	struct linux_ebus_child *child;</div><div class='del'>-	int irqs[PROMINTR_MAX];</div><div class='del'>-	char lbuf[128];</div><div class='add'>+	int *irqs;</div><div class='ctx'> 	int i, n, len;</div><div class='ctx'> 	unsigned long baseaddr;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;prom_node = node;</div><div class='del'>-	prom_getstring(node, "name", lbuf, sizeof(lbuf));</div><div class='del'>-	strcpy(dev-&gt;prom_name, lbuf);</div><div class='add'>+	dev-&gt;prom_node = dp;</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(node, "reg", (void *)regs, sizeof(regs));</div><div class='add'>+	regs = of_get_property(dp, "reg", &amp;len);</div><div class='ctx'> 	if (len % sizeof(struct linux_prom_registers)) {</div><div class='ctx'> 		prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",</div><div class='del'>-			    dev-&gt;prom_name, len,</div><div class='add'>+			    dev-&gt;prom_node-&gt;name, len,</div><div class='ctx'> 			    (int)sizeof(struct linux_prom_registers));</div><div class='ctx'> 		panic(__FUNCTION__);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -197,7 +199,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)</div><div class='ctx'> 			if ((baseaddr = (unsigned long) ioremap(baseaddr,</div><div class='ctx'> 			    regs[i].reg_size)) == 0) {</div><div class='ctx'> 				panic("ebus: unable to remap dev %s",</div><div class='del'>-				    dev-&gt;prom_name);</div><div class='add'>+				      dev-&gt;prom_node-&gt;name);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;resource[i].start = baseaddr;	/* XXX Unaligned */</div><div class='hunk'>@@ -206,29 +208,43 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; PROMINTR_MAX; i++)</div><div class='ctx'> 		dev-&gt;irqs[i] = PCI_IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;irqs[0] = ebus_blacklist_irq(dev-&gt;prom_name)) != 0) {</div><div class='add'>+	if ((dev-&gt;irqs[0] = ebus_blacklist_irq(dev-&gt;prom_node-&gt;name)) != 0) {</div><div class='ctx'> 		dev-&gt;num_irqs = 1;</div><div class='del'>-	} else if ((len = prom_getproperty(node, "interrupts",</div><div class='del'>-	    (char *)&amp;irqs, sizeof(irqs))) == -1 || len == 0) {</div><div class='del'>-		dev-&gt;num_irqs = 0;</div><div class='del'>-		if ((dev-&gt;irqs[0] = dev-&gt;bus-&gt;self-&gt;irq) != 0) {</div><div class='del'>-			 dev-&gt;num_irqs = 1;</div><div class='del'>-/* P3 */ /* printk("EBUS: child %s irq %d from parent\n", dev-&gt;prom_name, dev-&gt;irqs[0]); */</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='del'>-		dev-&gt;num_irqs = 1;  /* dev-&gt;num_irqs = len / sizeof(irqs[0]); */</div><div class='del'>-		if (irqs[0] == 0 || irqs[0] &gt;= 8) {</div><div class='del'>-			/* See above for the parent. XXX */</div><div class='del'>-			printk("EBUS: %s got bad irq %d from PROM\n",</div><div class='del'>-			    dev-&gt;prom_name, irqs[0]);</div><div class='add'>+		irqs = of_get_property(dp, "interrupts", &amp;len);</div><div class='add'>+		if (!irqs) {</div><div class='ctx'> 			dev-&gt;num_irqs = 0;</div><div class='del'>-			dev-&gt;irqs[0] = 0;</div><div class='add'>+			if ((dev-&gt;irqs[0] = dev-&gt;bus-&gt;self-&gt;irq) != 0) {</div><div class='add'>+				dev-&gt;num_irqs = 1;</div><div class='add'>+/* P3 */ /* printk("EBUS: child %s irq %d from parent\n", dev-&gt;prom_name, dev-&gt;irqs[0]); */</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			dev-&gt;irqs[0] = pcic_pin_to_irq(irqs[0], dev-&gt;prom_name);</div><div class='add'>+			dev-&gt;num_irqs = 1;  /* dev-&gt;num_irqs = len / sizeof(irqs[0]); */</div><div class='add'>+			if (irqs[0] == 0 || irqs[0] &gt;= 8) {</div><div class='add'>+				/* See above for the parent. XXX */</div><div class='add'>+				printk("EBUS: %s got bad irq %d from PROM\n",</div><div class='add'>+				       dev-&gt;prom_node-&gt;name, irqs[0]);</div><div class='add'>+				dev-&gt;num_irqs = 0;</div><div class='add'>+				dev-&gt;irqs[0] = 0;</div><div class='add'>+			} else {</div><div class='add'>+				dev-&gt;irqs[0] =</div><div class='add'>+					pcic_pin_to_irq(irqs[0],</div><div class='add'>+							dev-&gt;prom_node-&gt;name);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((node = prom_getchild(node))) {</div><div class='add'>+	dev-&gt;ofdev.node = dp;</div><div class='add'>+	dev-&gt;ofdev.dev.parent = &amp;dev-&gt;bus-&gt;ofdev.dev;</div><div class='add'>+	dev-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='add'>+	strcpy(dev-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+	/* Register with core */</div><div class='add'>+	if (of_device_register(&amp;dev-&gt;ofdev) != 0)</div><div class='add'>+		printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='add'>+		       dev-&gt;ofdev.dev.bus_id);</div><div class='add'>+</div><div class='add'>+	if ((dp = dp-&gt;child) != NULL) {</div><div class='ctx'> 		dev-&gt;children = (struct linux_ebus_child *)</div><div class='ctx'> 			ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='ctx'> </div><div class='hunk'>@@ -236,9 +252,9 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)</div><div class='ctx'> 		child-&gt;next = NULL;</div><div class='ctx'> 		child-&gt;parent = dev;</div><div class='ctx'> 		child-&gt;bus = dev-&gt;bus;</div><div class='del'>-		fill_ebus_child(node, &amp;regs[0], child);</div><div class='add'>+		fill_ebus_child(dp, child);</div><div class='ctx'> </div><div class='del'>-		while ((node = prom_getsibling(node)) != 0) {</div><div class='add'>+		while ((dp = dp-&gt;sibling) != NULL) {</div><div class='ctx'> 			child-&gt;next = (struct linux_ebus_child *)</div><div class='ctx'> 				ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='ctx'> </div><div class='hunk'>@@ -246,51 +262,49 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev)</div><div class='ctx'> 			child-&gt;next = NULL;</div><div class='ctx'> 			child-&gt;parent = dev;</div><div class='ctx'> 			child-&gt;bus = dev-&gt;bus;</div><div class='del'>-			fill_ebus_child(node, &amp;regs[0], child);</div><div class='add'>+			fill_ebus_child(dp, child);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init ebus_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_pci_registers regs[PROMREG_MAX];</div><div class='add'>+	struct linux_prom_pci_registers *regs;</div><div class='ctx'> 	struct linux_pbm_info *pbm;</div><div class='ctx'> 	struct linux_ebus_device *dev;</div><div class='ctx'> 	struct linux_ebus *ebus;</div><div class='ctx'> 	struct ebus_system_entry *sp;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct pcidev_cookie *cookie;</div><div class='del'>-	char lbuf[128];</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> 	unsigned long addr, *base;</div><div class='ctx'> 	unsigned short pci_command;</div><div class='del'>-	int nd, len, ebusnd;</div><div class='del'>-	int reg, nreg;</div><div class='add'>+	int len, reg, nreg;</div><div class='ctx'> 	int num_ebus = 0;</div><div class='ctx'> </div><div class='del'>-	prom_getstring(prom_root_node, "name", lbuf, sizeof(lbuf));</div><div class='add'>+	dp = of_find_node_by_path("/");</div><div class='ctx'> 	for (sp = ebus_blacklist; sp-&gt;esname != NULL; sp++) {</div><div class='del'>-		if (strcmp(lbuf, sp-&gt;esname) == 0) {</div><div class='add'>+		if (strcmp(dp-&gt;name, sp-&gt;esname) == 0) {</div><div class='ctx'> 			ebus_blackp = sp-&gt;ipt;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL);</div><div class='del'>-	if (!pdev) {</div><div class='add'>+	if (!pdev)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	cookie = pdev-&gt;sysdata;</div><div class='del'>-	ebusnd = cookie-&gt;prom_node;</div><div class='add'>+	dp = cookie-&gt;prom_node;</div><div class='ctx'> </div><div class='ctx'> 	ebus_chain = ebus = (struct linux_ebus *)</div><div class='ctx'> 			ebus_alloc(sizeof(struct linux_ebus));</div><div class='ctx'> 	ebus-&gt;next = NULL;</div><div class='ctx'> </div><div class='del'>-	while (ebusnd) {</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct device_node *nd;</div><div class='ctx'> </div><div class='del'>-		prom_getstring(ebusnd, "name", lbuf, sizeof(lbuf));</div><div class='del'>-		ebus-&gt;prom_node = ebusnd;</div><div class='del'>-		strcpy(ebus-&gt;prom_name, lbuf);</div><div class='add'>+		ebus-&gt;prom_node = dp;</div><div class='ctx'> 		ebus-&gt;self = pdev;</div><div class='ctx'> 		ebus-&gt;parent = pbm = cookie-&gt;pbm;</div><div class='ctx'> </div><div class='hunk'>@@ -299,9 +313,8 @@ void __init ebus_init(void)</div><div class='ctx'> 		pci_command |= PCI_COMMAND_MASTER;</div><div class='ctx'> 		pci_write_config_word(pdev, PCI_COMMAND, pci_command);</div><div class='ctx'> </div><div class='del'>-		len = prom_getproperty(ebusnd, "reg", (void *)regs,</div><div class='del'>-				       sizeof(regs));</div><div class='del'>-		if (len == 0 || len == -1) {</div><div class='add'>+		regs = of_get_property(dp, "reg", &amp;len);</div><div class='add'>+		if (!regs) {</div><div class='ctx'> 			prom_printf("%s: can't find reg property\n",</div><div class='ctx'> 				    __FUNCTION__);</div><div class='ctx'> 			prom_halt();</div><div class='hunk'>@@ -317,7 +330,18 @@ void __init ebus_init(void)</div><div class='ctx'> 			*base++ = addr;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nd = prom_getchild(ebusnd);</div><div class='add'>+		ebus-&gt;ofdev.node = dp;</div><div class='add'>+		ebus-&gt;ofdev.dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+		ebus-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='add'>+		strcpy(ebus-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+		/* Register with core */</div><div class='add'>+		if (of_device_register(&amp;ebus-&gt;ofdev) != 0)</div><div class='add'>+			printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='add'>+			       ebus-&gt;ofdev.dev.bus_id);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		nd = dp-&gt;child;</div><div class='ctx'> 		if (!nd)</div><div class='ctx'> 			goto next_ebus;</div><div class='ctx'> </div><div class='hunk'>@@ -330,7 +354,7 @@ void __init ebus_init(void)</div><div class='ctx'> 		dev-&gt;bus = ebus;</div><div class='ctx'> 		fill_ebus_device(nd, dev);</div><div class='ctx'> </div><div class='del'>-		while ((nd = prom_getsibling(nd)) != 0) {</div><div class='add'>+		while ((nd = nd-&gt;sibling) != NULL) {</div><div class='ctx'> 			dev-&gt;next = (struct linux_ebus_device *)</div><div class='ctx'> 				ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='ctx'> </div><div class='hunk'>@@ -348,7 +372,7 @@ void __init ebus_init(void)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		cookie = pdev-&gt;sysdata;</div><div class='del'>-		ebusnd = cookie-&gt;prom_node;</div><div class='add'>+		dp = cookie-&gt;prom_node;</div><div class='ctx'> </div><div class='ctx'> 		ebus-&gt;next = (struct linux_ebus *)</div><div class='ctx'> 			ebus_alloc(sizeof(struct linux_ebus));</div><div class='head'>diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S<br/>index 887f6a160c58..a4edff4c3be3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/entry.S</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S<br/>index 42d3de59d19b..9a219e8b5ddb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/head.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c<br/>index 2e1b0f6e99d4..3a5bad525394 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/idprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/idprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/idprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/idprom.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c<br/>index f9ff29734848..8654b446ac9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ioport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/ioport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/ioport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/ioport.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -39,6 +40,9 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/vaddrs.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='add'>+#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -141,6 +145,21 @@ void __iomem *sbus_ioremap(struct resource *phyres, unsigned long offset,</div><div class='ctx'> 	    phyres-&gt;start + offset, size, name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void __iomem *of_ioremap(struct resource *res, unsigned long offset,</div><div class='add'>+			 unsigned long size, char *name)</div><div class='add'>+{</div><div class='add'>+	return _sparc_alloc_io(res-&gt;flags &amp; 0xF,</div><div class='add'>+			       res-&gt;start + offset,</div><div class='add'>+			       size, name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_ioremap);</div><div class='add'>+</div><div class='add'>+void of_iounmap(void __iomem *base, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	iounmap(base);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_iounmap);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> void sbus_iounmap(volatile void __iomem *addr, unsigned long size)</div><div class='hunk'>@@ -206,7 +225,7 @@ _sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz)</div><div class='ctx'> 	pa &amp;= PAGE_MASK;</div><div class='ctx'> 	sparc_mapiorange(bus, pa, res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='ctx'> </div><div class='del'>-	return (void __iomem *) (res-&gt;start + offset);</div><div class='add'>+	return (void __iomem *)(unsigned long)(res-&gt;start + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -224,10 +243,54 @@ static void _sparc_free_io(struct resource *res)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> </div><div class='del'>-void sbus_set_sbus64(struct sbus_dev *sdev, int x) {</div><div class='add'>+void sbus_set_sbus64(struct sbus_dev *sdev, int x)</div><div class='add'>+{</div><div class='ctx'> 	printk("sbus_set_sbus64: unsupported\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern unsigned int sun4d_build_irq(struct sbus_dev *sdev, int irq);</div><div class='add'>+void __init sbus_fill_device_irq(struct sbus_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_irqs irqs[PROMINTR_MAX];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = prom_getproperty(sdev-&gt;prom_node, "intr",</div><div class='add'>+			       (char *)irqs, sizeof(irqs));</div><div class='add'>+	if (len != -1) {</div><div class='add'>+		sdev-&gt;num_irqs = len / 8;</div><div class='add'>+		if (sdev-&gt;num_irqs == 0) {</div><div class='add'>+			sdev-&gt;irqs[0] = 0;</div><div class='add'>+		} else if (sparc_cpu_model == sun4d) {</div><div class='add'>+			for (len = 0; len &lt; sdev-&gt;num_irqs; len++)</div><div class='add'>+				sdev-&gt;irqs[len] =</div><div class='add'>+					sun4d_build_irq(sdev, irqs[len].pri);</div><div class='add'>+		} else {</div><div class='add'>+			for (len = 0; len &lt; sdev-&gt;num_irqs; len++)</div><div class='add'>+				sdev-&gt;irqs[len] = irqs[len].pri;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		int interrupts[PROMINTR_MAX];</div><div class='add'>+</div><div class='add'>+		/* No "intr" node found-- check for "interrupts" node.</div><div class='add'>+		 * This node contains SBus interrupt levels, not IPLs</div><div class='add'>+		 * as in "intr", and no vector values.  We convert</div><div class='add'>+		 * SBus interrupt levels to PILs (platform specific).</div><div class='add'>+		 */</div><div class='add'>+		len = prom_getproperty(sdev-&gt;prom_node, "interrupts",</div><div class='add'>+				       (char *)interrupts, sizeof(interrupts));</div><div class='add'>+		if (len == -1) {</div><div class='add'>+			sdev-&gt;irqs[0] = 0;</div><div class='add'>+			sdev-&gt;num_irqs = 0;</div><div class='add'>+		} else {</div><div class='add'>+			sdev-&gt;num_irqs = len / sizeof(int);</div><div class='add'>+			for (len = 0; len &lt; sdev-&gt;num_irqs; len++) {</div><div class='add'>+				sdev-&gt;irqs[len] =</div><div class='add'>+					sbint_to_irq(sdev, interrupts[len]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} </div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a chunk of memory suitable for DMA.</div><div class='ctx'>  * Typically devices use them for control blocks.</div><div class='hunk'>@@ -279,7 +342,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)</div><div class='ctx'> 		res-&gt;name = sdev-&gt;prom_name;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (void *)res-&gt;start;</div><div class='add'>+	return (void *)(unsigned long)res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> err_noiommu:</div><div class='ctx'> 	release_resource(res);</div><div class='hunk'>@@ -414,6 +477,89 @@ void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev, struct scatterlist *sg,</div><div class='ctx'> {</div><div class='ctx'> 	printk("sbus_dma_sync_sg_for_device: not implemented yet\n");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Support code for sbus_init().  */</div><div class='add'>+/*</div><div class='add'>+ * XXX This functions appears to be a distorted version of</div><div class='add'>+ * prom_sbus_ranges_init(), with all sun4d stuff cut away.</div><div class='add'>+ * Ask DaveM what is going on here, how is sun4d supposed to work... XXX</div><div class='add'>+ */</div><div class='add'>+/* added back sun4d patch from Thomas Bogendoerfer - should be OK (crn) */</div><div class='add'>+void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)</div><div class='add'>+{</div><div class='add'>+	int parent_node = pn-&gt;node;</div><div class='add'>+</div><div class='add'>+	if (sparc_cpu_model == sun4d) {</div><div class='add'>+		struct linux_prom_ranges iounit_ranges[PROMREG_MAX];</div><div class='add'>+		int num_iounit_ranges, len;</div><div class='add'>+</div><div class='add'>+		len = prom_getproperty(parent_node, "ranges",</div><div class='add'>+				       (char *) iounit_ranges,</div><div class='add'>+				       sizeof (iounit_ranges));</div><div class='add'>+		if (len != -1) {</div><div class='add'>+			num_iounit_ranges =</div><div class='add'>+				(len / sizeof(struct linux_prom_ranges));</div><div class='add'>+			prom_adjust_ranges(sbus-&gt;sbus_ranges,</div><div class='add'>+					   sbus-&gt;num_sbus_ranges,</div><div class='add'>+					   iounit_ranges, num_iounit_ranges);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent = dp-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (sparc_cpu_model != sun4d &amp;&amp;</div><div class='add'>+	    parent != NULL &amp;&amp;</div><div class='add'>+	    !strcmp(parent-&gt;name, "iommu")) {</div><div class='add'>+		extern void iommu_init(int iommu_node, struct sbus_bus *sbus);</div><div class='add'>+</div><div class='add'>+		iommu_init(parent-&gt;node, sbus);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sparc_cpu_model == sun4d) {</div><div class='add'>+		extern void iounit_init(int sbi_node, int iounit_node,</div><div class='add'>+					struct sbus_bus *sbus);</div><div class='add'>+</div><div class='add'>+		iounit_init(dp-&gt;node, parent-&gt;node, sbus);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	if (sparc_cpu_model == sun4d) {</div><div class='add'>+		struct device_node *parent = dp-&gt;parent;</div><div class='add'>+</div><div class='add'>+		sbus-&gt;devid = of_getintprop_default(parent, "device-id", 0);</div><div class='add'>+		sbus-&gt;board = of_getintprop_default(parent, "board#", 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init sbus_arch_preinit(void)</div><div class='add'>+{</div><div class='add'>+	extern void register_proc_sparc_ioport(void);</div><div class='add'>+</div><div class='add'>+	register_proc_sparc_ioport();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SUN4</div><div class='add'>+	{</div><div class='add'>+		extern void sun4_dvma_init(void);</div><div class='add'>+		sun4_dvma_init();</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_arch_postinit(void)</div><div class='add'>+{</div><div class='add'>+	if (sparc_cpu_model == sun4d) {</div><div class='add'>+		extern void sun4d_init_sbi_irq(void);</div><div class='add'>+		sun4d_init_sbi_irq();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_SBUS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -690,7 +836,9 @@ _sparc_io_get_info(char *buf, char **start, off_t fpos, int length, int *eof,</div><div class='ctx'> 		if (p + 32 &gt;= e)	/* Better than nothing */</div><div class='ctx'> 			break;</div><div class='ctx'> 		if ((nm = r-&gt;name) == 0) nm = "???";</div><div class='del'>-		p += sprintf(p, "%08lx-%08lx: %s\n", r-&gt;start, r-&gt;end, nm);</div><div class='add'>+		p += sprintf(p, "%016llx-%016llx: %s\n",</div><div class='add'>+				(unsigned long long)r-&gt;start,</div><div class='add'>+				(unsigned long long)r-&gt;end, nm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return p-buf;</div><div class='head'>diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c<br/>index aac8af5aae51..cde73327ca96 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/irq.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  Copyright (C) 1998-2000 Anton Blanchard (anton@samba.org)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -192,11 +191,11 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		seq_printf(p, " %c %s",</div><div class='del'>-			(action-&gt;flags &amp; SA_INTERRUPT) ? '+' : ' ',</div><div class='add'>+			(action-&gt;flags &amp; IRQF_DISABLED) ? '+' : ' ',</div><div class='ctx'> 			action-&gt;name);</div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next) {</div><div class='ctx'> 			seq_printf(p, ",%s %s",</div><div class='del'>-				(action-&gt;flags &amp; SA_INTERRUPT) ? " +" : "",</div><div class='add'>+				(action-&gt;flags &amp; IRQF_DISABLED) ? " +" : "",</div><div class='ctx'> 				action-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='hunk'>@@ -244,7 +243,7 @@ void free_irq(unsigned int irq, void *dev_id)</div><div class='ctx'> 			printk("Trying to free free shared IRQ%d\n",irq);</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (action-&gt;flags &amp; SA_SHIRQ) {</div><div class='add'>+	} else if (action-&gt;flags &amp; IRQF_SHARED) {</div><div class='ctx'> 		printk("Trying to free shared IRQ%d with NULL device ID\n", irq);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -396,9 +395,9 @@ int request_fast_irq(unsigned int irq,</div><div class='ctx'> </div><div class='ctx'> 	action = sparc_irq[cpu_irq].action;</div><div class='ctx'> 	if(action) {</div><div class='del'>-		if(action-&gt;flags &amp; SA_SHIRQ)</div><div class='add'>+		if(action-&gt;flags &amp; IRQF_SHARED)</div><div class='ctx'> 			panic("Trying to register fast irq when already shared.\n");</div><div class='del'>-		if(irqflags &amp; SA_SHIRQ)</div><div class='add'>+		if(irqflags &amp; IRQF_SHARED)</div><div class='ctx'> 			panic("Trying to register fast irq as shared.\n");</div><div class='ctx'> </div><div class='ctx'> 		/* Anyway, someone already owns it so cannot be made fast. */</div><div class='hunk'>@@ -498,11 +497,11 @@ int request_irq(unsigned int irq,</div><div class='ctx'> 	actionp = &amp;sparc_irq[cpu_irq].action;</div><div class='ctx'> 	action = *actionp;</div><div class='ctx'> 	if (action) {</div><div class='del'>-		if (!(action-&gt;flags &amp; SA_SHIRQ) || !(irqflags &amp; SA_SHIRQ)) {</div><div class='add'>+		if (!(action-&gt;flags &amp; IRQF_SHARED) || !(irqflags &amp; IRQF_SHARED)) {</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		if ((action-&gt;flags &amp; SA_INTERRUPT) != (irqflags &amp; SA_INTERRUPT)) {</div><div class='add'>+		if ((action-&gt;flags &amp; IRQF_DISABLED) != (irqflags &amp; IRQF_DISABLED)) {</div><div class='ctx'> 			printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto out_unlock;</div><div class='head'>diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c<br/>new file mode 100644<br/>index 000000000000..5a2faad5d043<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/of_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/of_device.c</a></div><div class='hunk'>@@ -0,0 +1,796 @@</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_match_device - Tell if an of_device structure has a matching</div><div class='add'>+ * of_match structure</div><div class='add'>+ * @ids: array of of device match structures to search in</div><div class='add'>+ * @dev: the of device structure to match against</div><div class='add'>+ *</div><div class='add'>+ * Used by a driver to check whether an of_device present in the</div><div class='add'>+ * system is in its list of supported devices.</div><div class='add'>+ */</div><div class='add'>+const struct of_device_id *of_match_device(const struct of_device_id *matches,</div><div class='add'>+					const struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;node)</div><div class='add'>+		return NULL;</div><div class='add'>+	while (matches-&gt;name[0] || matches-&gt;type[0] || matches-&gt;compatible[0]) {</div><div class='add'>+		int match = 1;</div><div class='add'>+		if (matches-&gt;name[0])</div><div class='add'>+			match &amp;= dev-&gt;node-&gt;name</div><div class='add'>+				&amp;&amp; !strcmp(matches-&gt;name, dev-&gt;node-&gt;name);</div><div class='add'>+		if (matches-&gt;type[0])</div><div class='add'>+			match &amp;= dev-&gt;node-&gt;type</div><div class='add'>+				&amp;&amp; !strcmp(matches-&gt;type, dev-&gt;node-&gt;type);</div><div class='add'>+		if (matches-&gt;compatible[0])</div><div class='add'>+			match &amp;= of_device_is_compatible(dev-&gt;node,</div><div class='add'>+							 matches-&gt;compatible);</div><div class='add'>+		if (match)</div><div class='add'>+			return matches;</div><div class='add'>+		matches++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_platform_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * of_drv = to_of_platform_driver(drv);</div><div class='add'>+	const struct of_device_id * matches = of_drv-&gt;match_table;</div><div class='add'>+</div><div class='add'>+	if (!matches)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return of_match_device(matches, of_dev) != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct of_device *of_dev_get(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device *tmp;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	tmp = get_device(&amp;dev-&gt;dev);</div><div class='add'>+	if (tmp)</div><div class='add'>+		return to_of_device(tmp);</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void of_dev_put(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev)</div><div class='add'>+		put_device(&amp;dev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int of_device_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int error = -ENODEV;</div><div class='add'>+	struct of_platform_driver *drv;</div><div class='add'>+	struct of_device *of_dev;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+</div><div class='add'>+	drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+	of_dev = to_of_device(dev);</div><div class='add'>+</div><div class='add'>+	if (!drv-&gt;probe)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	of_dev_get(of_dev);</div><div class='add'>+</div><div class='add'>+	match = of_match_device(drv-&gt;match_table, of_dev);</div><div class='add'>+	if (match)</div><div class='add'>+		error = drv-&gt;probe(of_dev, match);</div><div class='add'>+	if (error)</div><div class='add'>+		of_dev_put(of_dev);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_device_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;remove)</div><div class='add'>+		drv-&gt;remove(of_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_device_suspend(struct device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;suspend)</div><div class='add'>+		error = drv-&gt;suspend(of_dev, state);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_device_resume(struct device * dev)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;resume)</div><div class='add'>+		error = drv-&gt;resume(of_dev);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int node_match(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = to_of_device(dev);</div><div class='add'>+	struct device_node *dp = data;</div><div class='add'>+</div><div class='add'>+	return (op-&gt;node == dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct of_device *of_find_device_by_node(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = bus_find_device(&amp;of_bus_type, NULL,</div><div class='add'>+					     dp, node_match);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		return to_of_device(dev);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_device_by_node);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+struct bus_type ebus_bus_type = {</div><div class='add'>+       .name	= "ebus",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(ebus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+struct bus_type sbus_bus_type = {</div><div class='add'>+       .name	= "sbus",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(sbus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct bus_type of_bus_type = {</div><div class='add'>+       .name	= "of",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(of_bus_type);</div><div class='add'>+</div><div class='add'>+static inline u64 of_read_addr(const u32 *cell, int size)</div><div class='add'>+{</div><div class='add'>+	u64 r = 0;</div><div class='add'>+	while (size--)</div><div class='add'>+		r = (r &lt;&lt; 32) | *(cell++);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init get_cells(struct device_node *dp,</div><div class='add'>+			     int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	if (addrc)</div><div class='add'>+		*addrc = of_n_addr_cells(dp);</div><div class='add'>+	if (sizec)</div><div class='add'>+		*sizec = of_n_size_cells(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Max address size we deal with */</div><div class='add'>+#define OF_MAX_ADDR_CELLS	4</div><div class='add'>+</div><div class='add'>+struct of_bus {</div><div class='add'>+	const char	*name;</div><div class='add'>+	const char	*addr_prop_name;</div><div class='add'>+	int		(*match)(struct device_node *parent);</div><div class='add'>+	void		(*count_cells)(struct device_node *child,</div><div class='add'>+				       int *addrc, int *sizec);</div><div class='add'>+	int		(*map)(u32 *addr, const u32 *range,</div><div class='add'>+			       int na, int ns, int pna);</div><div class='add'>+	unsigned int	(*get_flags)(u32 *addr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default translator (generic bus)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void of_bus_default_count_cells(struct device_node *dev,</div><div class='add'>+				       int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	get_cells(dev, addrc, sizec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Make sure the least significant 64-bits are in-range.  Even</div><div class='add'>+ * for 3 or 4 cell values it is a good enough approximation.</div><div class='add'>+ */</div><div class='add'>+static int of_out_of_range(const u32 *addr, const u32 *base,</div><div class='add'>+			   const u32 *size, int na, int ns)</div><div class='add'>+{</div><div class='add'>+	u64 a = of_read_addr(addr, na);</div><div class='add'>+	u64 b = of_read_addr(base, na);</div><div class='add'>+</div><div class='add'>+	if (a &lt; b)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	b += of_read_addr(size, ns);</div><div class='add'>+	if (a &gt;= b)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_bus_default_map(u32 *addr, const u32 *range,</div><div class='add'>+			      int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	u32 result[OF_MAX_ADDR_CELLS];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ns &gt; 2) {</div><div class='add'>+		printk("of_device: Cannot handle size cells (%d) &gt; 2.", ns);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_out_of_range(addr, range, range + na + pna, na, ns))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Start with the parent range base.  */</div><div class='add'>+	memcpy(result, range + na, pna * 4);</div><div class='add'>+</div><div class='add'>+	/* Add in the child address offset.  */</div><div class='add'>+	for (i = 0; i &lt; na; i++)</div><div class='add'>+		result[pna - 1 - i] +=</div><div class='add'>+			(addr[na - 1 - i] -</div><div class='add'>+			 range[na - 1 - i]);</div><div class='add'>+</div><div class='add'>+	memcpy(addr, result, pna * 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int of_bus_default_get_flags(u32 *addr)</div><div class='add'>+{</div><div class='add'>+	return IORESOURCE_MEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCI bus specific translator</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int of_bus_pci_match(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(np-&gt;type, "pci") || !strcmp(np-&gt;type, "pciex")) {</div><div class='add'>+		/* Do not do PCI specific frobbing if the</div><div class='add'>+		 * PCI bridge lacks a ranges property.  We</div><div class='add'>+		 * want to pass it through up to the next</div><div class='add'>+		 * parent as-is, not with the PCI translate</div><div class='add'>+		 * method which chops off the top address cell.</div><div class='add'>+		 */</div><div class='add'>+		if (!of_find_property(np, "ranges", NULL))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void of_bus_pci_count_cells(struct device_node *np,</div><div class='add'>+				   int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	if (addrc)</div><div class='add'>+		*addrc = 3;</div><div class='add'>+	if (sizec)</div><div class='add'>+		*sizec = 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_bus_pci_map(u32 *addr, const u32 *range,</div><div class='add'>+			  int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	u32 result[OF_MAX_ADDR_CELLS];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Check address type match */</div><div class='add'>+	if ((addr[0] ^ range[0]) &amp; 0x03000000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (of_out_of_range(addr + 1, range + 1, range + na + pna,</div><div class='add'>+			    na - 1, ns))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Start with the parent range base.  */</div><div class='add'>+	memcpy(result, range + na, pna * 4);</div><div class='add'>+</div><div class='add'>+	/* Add in the child address offset, skipping high cell.  */</div><div class='add'>+	for (i = 0; i &lt; na - 1; i++)</div><div class='add'>+		result[pna - 1 - i] +=</div><div class='add'>+			(addr[na - 1 - i] -</div><div class='add'>+			 range[na - 1 - i]);</div><div class='add'>+</div><div class='add'>+	memcpy(addr, result, pna * 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int of_bus_pci_get_flags(u32 *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+	u32 w = addr[0];</div><div class='add'>+</div><div class='add'>+	switch((w &gt;&gt; 24) &amp; 0x03) {</div><div class='add'>+	case 0x01:</div><div class='add'>+		flags |= IORESOURCE_IO;</div><div class='add'>+	case 0x02: /* 32 bits */</div><div class='add'>+	case 0x03: /* 64 bits */</div><div class='add'>+		flags |= IORESOURCE_MEM;</div><div class='add'>+	}</div><div class='add'>+	if (w &amp; 0x40000000)</div><div class='add'>+		flags |= IORESOURCE_PREFETCH;</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SBUS bus specific translator</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int of_bus_sbus_match(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return !strcmp(np-&gt;name, "sbus") ||</div><div class='add'>+		!strcmp(np-&gt;name, "sbi");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void of_bus_sbus_count_cells(struct device_node *child,</div><div class='add'>+				   int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	if (addrc)</div><div class='add'>+		*addrc = 2;</div><div class='add'>+	if (sizec)</div><div class='add'>+		*sizec = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	return of_bus_default_map(addr, range, na, ns, pna);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int of_bus_sbus_get_flags(u32 *addr)</div><div class='add'>+{</div><div class='add'>+	return IORESOURCE_MEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Array of bus specific translators</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct of_bus of_busses[] = {</div><div class='add'>+	/* PCI */</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.addr_prop_name = "assigned-addresses",</div><div class='add'>+		.match = of_bus_pci_match,</div><div class='add'>+		.count_cells = of_bus_pci_count_cells,</div><div class='add'>+		.map = of_bus_pci_map,</div><div class='add'>+		.get_flags = of_bus_pci_get_flags,</div><div class='add'>+	},</div><div class='add'>+	/* SBUS */</div><div class='add'>+	{</div><div class='add'>+		.name = "sbus",</div><div class='add'>+		.addr_prop_name = "reg",</div><div class='add'>+		.match = of_bus_sbus_match,</div><div class='add'>+		.count_cells = of_bus_sbus_count_cells,</div><div class='add'>+		.map = of_bus_sbus_map,</div><div class='add'>+		.get_flags = of_bus_sbus_get_flags,</div><div class='add'>+	},</div><div class='add'>+	/* Default */</div><div class='add'>+	{</div><div class='add'>+		.name = "default",</div><div class='add'>+		.addr_prop_name = "reg",</div><div class='add'>+		.match = NULL,</div><div class='add'>+		.count_cells = of_bus_default_count_cells,</div><div class='add'>+		.map = of_bus_default_map,</div><div class='add'>+		.get_flags = of_bus_default_get_flags,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_bus *of_match_bus(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(of_busses); i ++)</div><div class='add'>+		if (!of_busses[i].match || of_busses[i].match(np))</div><div class='add'>+			return &amp;of_busses[i];</div><div class='add'>+	BUG();</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init build_one_resource(struct device_node *parent,</div><div class='add'>+				     struct of_bus *bus,</div><div class='add'>+				     struct of_bus *pbus,</div><div class='add'>+				     u32 *addr,</div><div class='add'>+				     int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	u32 *ranges;</div><div class='add'>+	unsigned int rlen;</div><div class='add'>+	int rone;</div><div class='add'>+</div><div class='add'>+	ranges = of_get_property(parent, "ranges", &amp;rlen);</div><div class='add'>+	if (ranges == NULL || rlen == 0) {</div><div class='add'>+		u32 result[OF_MAX_ADDR_CELLS];</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		memset(result, 0, pna * 4);</div><div class='add'>+		for (i = 0; i &lt; na; i++)</div><div class='add'>+			result[pna - 1 - i] =</div><div class='add'>+				addr[na - 1 - i];</div><div class='add'>+</div><div class='add'>+		memcpy(addr, result, pna * 4);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now walk through the ranges */</div><div class='add'>+	rlen /= 4;</div><div class='add'>+	rone = na + pna + ns;</div><div class='add'>+	for (; rlen &gt;= rone; rlen -= rone, ranges += rone) {</div><div class='add'>+		if (!bus-&gt;map(addr, ranges, na, ns, pna))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_resource_verbose;</div><div class='add'>+</div><div class='add'>+static void __init build_device_resources(struct of_device *op,</div><div class='add'>+					  struct device *parent)</div><div class='add'>+{</div><div class='add'>+	struct of_device *p_op;</div><div class='add'>+	struct of_bus *bus;</div><div class='add'>+	int na, ns;</div><div class='add'>+	int index, num_reg;</div><div class='add'>+	void *preg;</div><div class='add'>+</div><div class='add'>+	if (!parent)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p_op = to_of_device(parent);</div><div class='add'>+	bus = of_match_bus(p_op-&gt;node);</div><div class='add'>+	bus-&gt;count_cells(op-&gt;node, &amp;na, &amp;ns);</div><div class='add'>+</div><div class='add'>+	preg = of_get_property(op-&gt;node, bus-&gt;addr_prop_name, &amp;num_reg);</div><div class='add'>+	if (!preg || num_reg == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Convert to num-cells.  */</div><div class='add'>+	num_reg /= 4;</div><div class='add'>+</div><div class='add'>+	/* Conver to num-entries.  */</div><div class='add'>+	num_reg /= na + ns;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; num_reg; index++) {</div><div class='add'>+		struct resource *r = &amp;op-&gt;resource[index];</div><div class='add'>+		u32 addr[OF_MAX_ADDR_CELLS];</div><div class='add'>+		u32 *reg = (preg + (index * ((na + ns) * 4)));</div><div class='add'>+		struct device_node *dp = op-&gt;node;</div><div class='add'>+		struct device_node *pp = p_op-&gt;node;</div><div class='add'>+		struct of_bus *pbus;</div><div class='add'>+		u64 size, result = OF_BAD_ADDR;</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		int dna, dns;</div><div class='add'>+		int pna, pns;</div><div class='add'>+</div><div class='add'>+		size = of_read_addr(reg + na, ns);</div><div class='add'>+		flags = bus-&gt;get_flags(reg);</div><div class='add'>+</div><div class='add'>+		memcpy(addr, reg, na * 4);</div><div class='add'>+</div><div class='add'>+		/* If the immediate parent has no ranges property to apply,</div><div class='add'>+		 * just use a 1&lt;-&gt;1 mapping.</div><div class='add'>+		 */</div><div class='add'>+		if (of_find_property(pp, "ranges", NULL) == NULL) {</div><div class='add'>+			result = of_read_addr(addr, na);</div><div class='add'>+			goto build_res;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dna = na;</div><div class='add'>+		dns = ns;</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			dp = pp;</div><div class='add'>+			pp = dp-&gt;parent;</div><div class='add'>+			if (!pp) {</div><div class='add'>+				result = of_read_addr(addr, dna);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pbus = of_match_bus(pp);</div><div class='add'>+			pbus-&gt;count_cells(dp, &amp;pna, &amp;pns);</div><div class='add'>+</div><div class='add'>+			if (build_one_resource(dp, bus, pbus, addr,</div><div class='add'>+					       dna, dns, pna))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			dna = pna;</div><div class='add'>+			dns = pns;</div><div class='add'>+			bus = pbus;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	build_res:</div><div class='add'>+		memset(r, 0, sizeof(*r));</div><div class='add'>+</div><div class='add'>+		if (of_resource_verbose)</div><div class='add'>+			printk("%s reg[%d] -&gt; %llx\n",</div><div class='add'>+			       op-&gt;node-&gt;full_name, index,</div><div class='add'>+			       result);</div><div class='add'>+</div><div class='add'>+		if (result != OF_BAD_ADDR) {</div><div class='add'>+			r-&gt;start = result &amp; 0xffffffff;</div><div class='add'>+			r-&gt;end = result + size - 1;</div><div class='add'>+			r-&gt;flags = flags | ((result &gt;&gt; 32ULL) &amp; 0xffUL);</div><div class='add'>+		} else {</div><div class='add'>+			r-&gt;start = ~0UL;</div><div class='add'>+			r-&gt;end = ~0UL;</div><div class='add'>+		}</div><div class='add'>+		r-&gt;name = op-&gt;node-&gt;name;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device * __init scan_one_device(struct device_node *dp,</div><div class='add'>+						 struct device *parent)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);</div><div class='add'>+	struct linux_prom_irqs *intr;</div><div class='add'>+	int len, i;</div><div class='add'>+</div><div class='add'>+	if (!op)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	op-&gt;node = dp;</div><div class='add'>+</div><div class='add'>+	op-&gt;clock_freq = of_getintprop_default(dp, "clock-frequency",</div><div class='add'>+					       (25*1000*1000));</div><div class='add'>+	op-&gt;portid = of_getintprop_default(dp, "upa-portid", -1);</div><div class='add'>+	if (op-&gt;portid == -1)</div><div class='add'>+		op-&gt;portid = of_getintprop_default(dp, "portid", -1);</div><div class='add'>+</div><div class='add'>+	intr = of_get_property(dp, "intr", &amp;len);</div><div class='add'>+	if (intr) {</div><div class='add'>+		op-&gt;num_irqs = len / sizeof(struct linux_prom_irqs);</div><div class='add'>+		for (i = 0; i &lt; op-&gt;num_irqs; i++)</div><div class='add'>+			op-&gt;irqs[i] = intr[i].pri;</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int *irq = of_get_property(dp, "interrupts", &amp;len);</div><div class='add'>+</div><div class='add'>+		if (irq) {</div><div class='add'>+			op-&gt;num_irqs = len / sizeof(unsigned int);</div><div class='add'>+			for (i = 0; i &lt; op-&gt;num_irqs; i++)</div><div class='add'>+				op-&gt;irqs[i] = irq[i];</div><div class='add'>+		} else {</div><div class='add'>+			op-&gt;num_irqs = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sparc_cpu_model == sun4d) {</div><div class='add'>+		static int pil_to_sbus[] = {</div><div class='add'>+			0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0,</div><div class='add'>+		};</div><div class='add'>+		struct device_node *busp = dp-&gt;parent;</div><div class='add'>+		struct linux_prom_registers *regs;</div><div class='add'>+		int board = of_getintprop_default(busp, "board#", 0);</div><div class='add'>+		int slot;</div><div class='add'>+</div><div class='add'>+		regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+		slot = regs-&gt;which_io;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; op-&gt;num_irqs; i++) {</div><div class='add'>+			int this_irq = op-&gt;irqs[i];</div><div class='add'>+			int sbusl = pil_to_sbus[this_irq];</div><div class='add'>+</div><div class='add'>+			if (sbusl)</div><div class='add'>+				this_irq = (((board + 1) &lt;&lt; 5) +</div><div class='add'>+					    (sbusl &lt;&lt; 2) +</div><div class='add'>+					    slot);</div><div class='add'>+</div><div class='add'>+			op-&gt;irqs[i] = this_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	build_device_resources(op, parent);</div><div class='add'>+</div><div class='add'>+	op-&gt;dev.parent = parent;</div><div class='add'>+	op-&gt;dev.bus = &amp;of_bus_type;</div><div class='add'>+	if (!parent)</div><div class='add'>+		strcpy(op-&gt;dev.bus_id, "root");</div><div class='add'>+	else</div><div class='add'>+		strcpy(op-&gt;dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+	if (of_device_register(op)) {</div><div class='add'>+		printk("%s: Could not register of device.\n",</div><div class='add'>+		       dp-&gt;full_name);</div><div class='add'>+		kfree(op);</div><div class='add'>+		op = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return op;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init scan_tree(struct device_node *dp, struct device *parent)</div><div class='add'>+{</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct of_device *op = scan_one_device(dp, parent);</div><div class='add'>+</div><div class='add'>+		if (op)</div><div class='add'>+			scan_tree(dp-&gt;child, &amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init scan_of_devices(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *root = of_find_node_by_path("/");</div><div class='add'>+	struct of_device *parent;</div><div class='add'>+</div><div class='add'>+	parent = scan_one_device(root, NULL);</div><div class='add'>+	if (!parent)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scan_tree(root-&gt;child, &amp;parent-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init of_bus_driver_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bus_register(&amp;of_bus_type);</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (!err)</div><div class='add'>+		err = bus_register(&amp;ebus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	if (!err)</div><div class='add'>+		err = bus_register(&amp;sbus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		scan_of_devices();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+postcore_initcall(of_bus_driver_init);</div><div class='add'>+</div><div class='add'>+static int __init of_debug(char *str)</div><div class='add'>+{</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	get_option(&amp;str, &amp;val);</div><div class='add'>+	if (val &amp; 1)</div><div class='add'>+		of_resource_verbose = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("of_debug=", of_debug);</div><div class='add'>+</div><div class='add'>+int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)</div><div class='add'>+{</div><div class='add'>+	/* initialize common driver fields */</div><div class='add'>+	drv-&gt;driver.name = drv-&gt;name;</div><div class='add'>+	drv-&gt;driver.bus = bus;</div><div class='add'>+</div><div class='add'>+	/* register with core */</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void of_unregister_driver(struct of_platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct of_device *ofdev;</div><div class='add'>+</div><div class='add'>+	ofdev = to_of_device(dev);</div><div class='add'>+	return sprintf(buf, "%s", ofdev-&gt;node-&gt;full_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_release_dev - free an of device structure when all users of it are finished.</div><div class='add'>+ * @dev: device that's been disconnected</div><div class='add'>+ *</div><div class='add'>+ * Will be called only by the device core when all users of this of device are</div><div class='add'>+ * done.</div><div class='add'>+ */</div><div class='add'>+void of_release_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct of_device *ofdev;</div><div class='add'>+</div><div class='add'>+        ofdev = to_of_device(dev);</div><div class='add'>+</div><div class='add'>+	kfree(ofdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int of_device_register(struct of_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ofdev-&gt;node == NULL);</div><div class='add'>+</div><div class='add'>+	rc = device_register(&amp;ofdev-&gt;dev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = device_create_file(&amp;ofdev-&gt;dev, &amp;dev_attr_devspec);</div><div class='add'>+	if (rc)</div><div class='add'>+		device_unregister(&amp;ofdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void of_device_unregister(struct of_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	device_remove_file(&amp;ofdev-&gt;dev, &amp;dev_attr_devspec);</div><div class='add'>+	device_unregister(&amp;ofdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct of_device* of_platform_device_create(struct device_node *np,</div><div class='add'>+					    const char *bus_id,</div><div class='add'>+					    struct device *parent,</div><div class='add'>+					    struct bus_type *bus)</div><div class='add'>+{</div><div class='add'>+	struct of_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = kmalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	memset(dev, 0, sizeof(*dev));</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev.parent = parent;</div><div class='add'>+	dev-&gt;dev.bus = bus;</div><div class='add'>+	dev-&gt;dev.release = of_release_dev;</div><div class='add'>+</div><div class='add'>+	strlcpy(dev-&gt;dev.bus_id, bus_id, BUS_ID_SIZE);</div><div class='add'>+</div><div class='add'>+	if (of_device_register(dev) != 0) {</div><div class='add'>+		kfree(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(of_match_device);</div><div class='add'>+EXPORT_SYMBOL(of_register_driver);</div><div class='add'>+EXPORT_SYMBOL(of_unregister_driver);</div><div class='add'>+EXPORT_SYMBOL(of_device_register);</div><div class='add'>+EXPORT_SYMBOL(of_device_unregister);</div><div class='add'>+EXPORT_SYMBOL(of_dev_get);</div><div class='add'>+EXPORT_SYMBOL(of_dev_put);</div><div class='add'>+EXPORT_SYMBOL(of_platform_device_create);</div><div class='add'>+EXPORT_SYMBOL(of_release_dev);</div><div class='head'>diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c<br/>index 42002b742deb..bfd31aac2df3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/pcic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/pcic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/pcic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/pcic.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * CP-1200 by Eric Brower.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -31,6 +30,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/pcic.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -665,7 +665,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)</div><div class='ctx'> 		/* cookies */</div><div class='ctx'> 		pcp = pci_devcookie_alloc();</div><div class='ctx'> 		pcp-&gt;pbm = &amp;pcic-&gt;pbm;</div><div class='del'>-		pcp-&gt;prom_node = node;</div><div class='add'>+		pcp-&gt;prom_node = of_find_node_by_phandle(node);</div><div class='ctx'> 		dev-&gt;sysdata = pcp;</div><div class='ctx'> </div><div class='ctx'> 		/* fixing I/O to look like memory */</div><div class='hunk'>@@ -745,7 +745,7 @@ void __init pci_time_init(void)</div><div class='ctx'> 	writel (PCI_COUNTER_IRQ_SET(timer_irq, 0),</div><div class='ctx'> 		pcic-&gt;pcic_regs+PCI_COUNTER_IRQ);</div><div class='ctx'> 	irq = request_irq(timer_irq, pcic_timer_handler,</div><div class='del'>-			  (SA_INTERRUPT | SA_STATIC_ALLOC), "timer", NULL);</div><div class='add'>+			  (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		prom_printf("time_init: unable to attach IRQ%d\n", timer_irq);</div><div class='ctx'> 		prom_halt();</div><div class='hunk'>@@ -859,7 +859,7 @@ char * __init pcibios_setup(char *str)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -896,13 +896,6 @@ static inline unsigned long get_irqmask(int irq_nr)</div><div class='ctx'> 	return 1 &lt;&lt; irq_nr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline char *pcic_irq_itoa(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	static char buff[16];</div><div class='del'>-	sprintf(buff, "%d", irq);</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void pcic_disable_irq(unsigned int irq_nr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mask, flags;</div><div class='hunk'>@@ -955,7 +948,6 @@ void __init sun4m_pci_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_profile_irq, pcic_clear_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(__irq_itoa, pcic_irq_itoa, BTFIXUPCALL_NORM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pcibios_assign_resource(struct pci_dev *pdev, int resource)</div><div class='head'>diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c<br/>index 118cac84a0f5..89a28cc018c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/process.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c<br/>new file mode 100644<br/>index 000000000000..4b06dcb00ebd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/prom.c</a></div><div class='hunk'>@@ -0,0 +1,574 @@</div><div class='add'>+/*</div><div class='add'>+ * Procedures for creating, accessing and interpreting the device tree.</div><div class='add'>+ *</div><div class='add'>+ * Paul Mackerras	August 1996.</div><div class='add'>+ * Copyright (C) 1996-2005 Paul Mackerras.</div><div class='add'>+ * </div><div class='add'>+ *  Adapted for 64bit PowerPC by Dave Engebretsen and Peter Bergner.</div><div class='add'>+ *    {engebret|bergner}@us.ibm.com </div><div class='add'>+ *</div><div class='add'>+ *  Adapted for sparc32 by David S. Miller davem@davemloft.net</div><div class='add'>+ *</div><div class='add'>+ *      This program is free software; you can redistribute it and/or</div><div class='add'>+ *      modify it under the terms of the GNU General Public License</div><div class='add'>+ *      as published by the Free Software Foundation; either version</div><div class='add'>+ *      2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/oplib.h&gt;</div><div class='add'>+</div><div class='add'>+static struct device_node *allnodes;</div><div class='add'>+</div><div class='add'>+/* use when traversing tree through the allnext, child, sibling,</div><div class='add'>+ * or parent members of struct device_node.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_RWLOCK(devtree_lock);</div><div class='add'>+</div><div class='add'>+int of_device_is_compatible(struct device_node *device, const char *compat)</div><div class='add'>+{</div><div class='add'>+	const char* cp;</div><div class='add'>+	int cplen, l;</div><div class='add'>+</div><div class='add'>+	cp = (char *) of_get_property(device, "compatible", &amp;cplen);</div><div class='add'>+	if (cp == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	while (cplen &gt; 0) {</div><div class='add'>+		if (strncmp(cp, compat, strlen(compat)) == 0)</div><div class='add'>+			return 1;</div><div class='add'>+		l = strlen(cp) + 1;</div><div class='add'>+		cp += l;</div><div class='add'>+		cplen -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_device_is_compatible);</div><div class='add'>+</div><div class='add'>+struct device_node *of_get_parent(const struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	np = node-&gt;parent;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_parent);</div><div class='add'>+</div><div class='add'>+struct device_node *of_get_next_child(const struct device_node *node,</div><div class='add'>+	struct device_node *prev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *next;</div><div class='add'>+</div><div class='add'>+	next = prev ? prev-&gt;sibling : node-&gt;child;</div><div class='add'>+	for (; next != 0; next = next-&gt;sibling) {</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return next;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_next_child);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_path(const char *path)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = allnodes;</div><div class='add'>+</div><div class='add'>+	for (; np != 0; np = np-&gt;allnext) {</div><div class='add'>+		if (np-&gt;full_name != 0 &amp;&amp; strcmp(np-&gt;full_name, path) == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_path);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_phandle(phandle handle)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for (np = allnodes; np != 0; np = np-&gt;allnext)</div><div class='add'>+		if (np-&gt;node == handle)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_phandle);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_name(struct device_node *from,</div><div class='add'>+	const char *name)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = from ? from-&gt;allnext : allnodes;</div><div class='add'>+	for (; np != NULL; np = np-&gt;allnext)</div><div class='add'>+		if (np-&gt;name != NULL &amp;&amp; strcmp(np-&gt;name, name) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_name);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_type(struct device_node *from,</div><div class='add'>+	const char *type)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = from ? from-&gt;allnext : allnodes;</div><div class='add'>+	for (; np != 0; np = np-&gt;allnext)</div><div class='add'>+		if (np-&gt;type != 0 &amp;&amp; strcmp(np-&gt;type, type) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_type);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_compatible_node(struct device_node *from,</div><div class='add'>+	const char *type, const char *compatible)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = from ? from-&gt;allnext : allnodes;</div><div class='add'>+	for (; np != 0; np = np-&gt;allnext) {</div><div class='add'>+		if (type != NULL</div><div class='add'>+		    &amp;&amp; !(np-&gt;type != 0 &amp;&amp; strcmp(np-&gt;type, type) == 0))</div><div class='add'>+			continue;</div><div class='add'>+		if (of_device_is_compatible(np, compatible))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_compatible_node);</div><div class='add'>+</div><div class='add'>+struct property *of_find_property(struct device_node *np, const char *name,</div><div class='add'>+				  int *lenp)</div><div class='add'>+{</div><div class='add'>+	struct property *pp;</div><div class='add'>+</div><div class='add'>+	for (pp = np-&gt;properties; pp != 0; pp = pp-&gt;next) {</div><div class='add'>+		if (strcmp(pp-&gt;name, name) == 0) {</div><div class='add'>+			if (lenp != 0)</div><div class='add'>+				*lenp = pp-&gt;length;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return pp;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_property);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find a property with a given name for a given node</div><div class='add'>+ * and return the value.</div><div class='add'>+ */</div><div class='add'>+void *of_get_property(struct device_node *np, const char *name, int *lenp)</div><div class='add'>+{</div><div class='add'>+	struct property *pp = of_find_property(np,name,lenp);</div><div class='add'>+	return pp ? pp-&gt;value : NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_property);</div><div class='add'>+</div><div class='add'>+int of_getintprop_default(struct device_node *np, const char *name, int def)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(np, name, &amp;len);</div><div class='add'>+	if (!prop || len != 4)</div><div class='add'>+		return def;</div><div class='add'>+</div><div class='add'>+	return *(int *) prop-&gt;value;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_getintprop_default);</div><div class='add'>+</div><div class='add'>+int of_n_addr_cells(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int* ip;</div><div class='add'>+	do {</div><div class='add'>+		if (np-&gt;parent)</div><div class='add'>+			np = np-&gt;parent;</div><div class='add'>+		ip = of_get_property(np, "#address-cells", NULL);</div><div class='add'>+		if (ip != NULL)</div><div class='add'>+			return *ip;</div><div class='add'>+	} while (np-&gt;parent);</div><div class='add'>+	/* No #address-cells property for the root node, default to 2 */</div><div class='add'>+	return 2;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_n_addr_cells);</div><div class='add'>+</div><div class='add'>+int of_n_size_cells(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int* ip;</div><div class='add'>+	do {</div><div class='add'>+		if (np-&gt;parent)</div><div class='add'>+			np = np-&gt;parent;</div><div class='add'>+		ip = of_get_property(np, "#size-cells", NULL);</div><div class='add'>+		if (ip != NULL)</div><div class='add'>+			return *ip;</div><div class='add'>+	} while (np-&gt;parent);</div><div class='add'>+	/* No #size-cells property for the root node, default to 1 */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_n_size_cells);</div><div class='add'>+</div><div class='add'>+int of_set_property(struct device_node *dp, const char *name, void *val, int len)</div><div class='add'>+{</div><div class='add'>+	struct property **prevp;</div><div class='add'>+	void *new_val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	new_val = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!new_val)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(new_val, val, len);</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;devtree_lock);</div><div class='add'>+	prevp = &amp;dp-&gt;properties;</div><div class='add'>+	while (*prevp) {</div><div class='add'>+		struct property *prop = *prevp;</div><div class='add'>+</div><div class='add'>+		if (!strcmp(prop-&gt;name, name)) {</div><div class='add'>+			void *old_val = prop-&gt;value;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			ret = prom_setprop(dp-&gt;node, name, val, len);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			if (ret &gt;= 0) {</div><div class='add'>+				prop-&gt;value = new_val;</div><div class='add'>+				prop-&gt;length = len;</div><div class='add'>+</div><div class='add'>+				if (OF_IS_DYNAMIC(prop))</div><div class='add'>+					kfree(old_val);</div><div class='add'>+</div><div class='add'>+				OF_MARK_DYNAMIC(prop);</div><div class='add'>+</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		prevp = &amp;(*prevp)-&gt;next;</div><div class='add'>+	}</div><div class='add'>+	write_unlock(&amp;devtree_lock);</div><div class='add'>+</div><div class='add'>+	/* XXX Upate procfs if necessary... */</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_set_property);</div><div class='add'>+</div><div class='add'>+static unsigned int prom_early_allocated;</div><div class='add'>+</div><div class='add'>+static void * __init prom_early_alloc(unsigned long size)</div><div class='add'>+{</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	ret = __alloc_bootmem(size, SMP_CACHE_BYTES, 0UL);</div><div class='add'>+	if (ret != NULL)</div><div class='add'>+		memset(ret, 0, size);</div><div class='add'>+</div><div class='add'>+	prom_early_allocated += size;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_root_node(const struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	if (!dp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return (dp-&gt;parent == NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The following routines deal with the black magic of fully naming a</div><div class='add'>+ * node.</div><div class='add'>+ *</div><div class='add'>+ * Certain well known named nodes are just the simple name string.</div><div class='add'>+ *</div><div class='add'>+ * Actual devices have an address specifier appended to the base name</div><div class='add'>+ * string, like this "foo@addr".  The "addr" can be in any number of</div><div class='add'>+ * formats, and the platform plus the type of the node determine the</div><div class='add'>+ * format and how it is constructed.</div><div class='add'>+ *</div><div class='add'>+ * For children of the ROOT node, the naming convention is fixed and</div><div class='add'>+ * determined by whether this is a sun4u or sun4v system.</div><div class='add'>+ *</div><div class='add'>+ * For children of other nodes, it is bus type specific.  So</div><div class='add'>+ * we walk up the tree until we discover a "device_type" property</div><div class='add'>+ * we recognize and we go from there.</div><div class='add'>+ */</div><div class='add'>+static void __init sparc32_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_registers *regs;</div><div class='add'>+	struct property *rprop;</div><div class='add'>+</div><div class='add'>+	rprop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!rprop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = rprop-&gt;value;</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name,</div><div class='add'>+		regs-&gt;which_io, regs-&gt;phys_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@slot,offset"  */</div><div class='add'>+static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name,</div><div class='add'>+		regs-&gt;which_io,</div><div class='add'>+		regs-&gt;phys_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@devnum[,func]" */</div><div class='add'>+static void __init pci_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_pci_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	unsigned int devfn;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+	devfn = (regs-&gt;phys_hi &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	if (devfn &amp; 0x07) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			devfn &gt;&gt; 3,</div><div class='add'>+			devfn &amp; 0x07);</div><div class='add'>+	} else {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			devfn &gt;&gt; 3);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@addrhi,addrlo" */</div><div class='add'>+static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name,</div><div class='add'>+		regs-&gt;which_io, regs-&gt;phys_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init __build_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent = dp-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (parent != NULL) {</div><div class='add'>+		if (!strcmp(parent-&gt;type, "pci") ||</div><div class='add'>+		    !strcmp(parent-&gt;type, "pciex"))</div><div class='add'>+			return pci_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "sbus"))</div><div class='add'>+			return sbus_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "ebus"))</div><div class='add'>+			return ebus_path_component(dp, tmp_buf);</div><div class='add'>+</div><div class='add'>+		/* "isa" is handled with platform naming */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use platform naming convention.  */</div><div class='add'>+	return sparc32_path_component(dp, tmp_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char * __init build_path_component(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	char tmp_buf[64], *n;</div><div class='add'>+</div><div class='add'>+	tmp_buf[0] = '\0';</div><div class='add'>+	__build_path_component(dp, tmp_buf);</div><div class='add'>+	if (tmp_buf[0] == '\0')</div><div class='add'>+		strcpy(tmp_buf, dp-&gt;name);</div><div class='add'>+</div><div class='add'>+	n = prom_early_alloc(strlen(tmp_buf) + 1);</div><div class='add'>+	strcpy(n, tmp_buf);</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char * __init build_full_name(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	int len, ourlen, plen;</div><div class='add'>+	char *n;</div><div class='add'>+</div><div class='add'>+	plen = strlen(dp-&gt;parent-&gt;full_name);</div><div class='add'>+	ourlen = strlen(dp-&gt;path_component_name);</div><div class='add'>+	len = ourlen + plen + 2;</div><div class='add'>+</div><div class='add'>+	n = prom_early_alloc(len);</div><div class='add'>+	strcpy(n, dp-&gt;parent-&gt;full_name);</div><div class='add'>+	if (!is_root_node(dp-&gt;parent)) {</div><div class='add'>+		strcpy(n + plen, "/");</div><div class='add'>+		plen++;</div><div class='add'>+	}</div><div class='add'>+	strcpy(n + plen, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int unique_id;</div><div class='add'>+</div><div class='add'>+static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)</div><div class='add'>+{</div><div class='add'>+	static struct property *tmp = NULL;</div><div class='add'>+	struct property *p;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (tmp) {</div><div class='add'>+		p = tmp;</div><div class='add'>+		memset(p, 0, sizeof(*p) + 32);</div><div class='add'>+		tmp = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		p = prom_early_alloc(sizeof(struct property) + 32);</div><div class='add'>+		p-&gt;unique_id = unique_id++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;name = (char *) (p + 1);</div><div class='add'>+	if (special_name) {</div><div class='add'>+		p-&gt;length = special_len;</div><div class='add'>+		p-&gt;value = prom_early_alloc(special_len);</div><div class='add'>+		memcpy(p-&gt;value, special_val, special_len);</div><div class='add'>+	} else {</div><div class='add'>+		if (prev == NULL) {</div><div class='add'>+			prom_firstprop(node, p-&gt;name);</div><div class='add'>+		} else {</div><div class='add'>+			prom_nextprop(node, prev, p-&gt;name);</div><div class='add'>+		}</div><div class='add'>+		if (strlen(p-&gt;name) == 0) {</div><div class='add'>+			tmp = p;</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		p-&gt;length = prom_getproplen(node, p-&gt;name);</div><div class='add'>+		if (p-&gt;length &lt;= 0) {</div><div class='add'>+			p-&gt;length = 0;</div><div class='add'>+		} else {</div><div class='add'>+			p-&gt;value = prom_early_alloc(p-&gt;length + 1);</div><div class='add'>+			prom_getproperty(node, p-&gt;name, p-&gt;value, p-&gt;length);</div><div class='add'>+			((unsigned char *)p-&gt;value)[p-&gt;length] = '\0';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct property * __init build_prop_list(phandle node)</div><div class='add'>+{</div><div class='add'>+	struct property *head, *tail;</div><div class='add'>+</div><div class='add'>+	head = tail = build_one_prop(node, NULL,</div><div class='add'>+				     ".node", &amp;node, sizeof(node));</div><div class='add'>+</div><div class='add'>+	tail-&gt;next = build_one_prop(node, NULL, NULL, NULL, 0);</div><div class='add'>+	tail = tail-&gt;next;</div><div class='add'>+	while(tail) {</div><div class='add'>+		tail-&gt;next = build_one_prop(node, tail-&gt;name,</div><div class='add'>+					    NULL, NULL, 0);</div><div class='add'>+		tail = tail-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return head;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char * __init get_one_property(phandle node, char *name)</div><div class='add'>+{</div><div class='add'>+	char *buf = "&lt;NULL&gt;";</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = prom_getproplen(node, name);</div><div class='add'>+	if (len &gt; 0) {</div><div class='add'>+		buf = prom_early_alloc(len);</div><div class='add'>+		len = prom_getproperty(node, name, buf, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node * __init create_node(phandle node)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dp = prom_early_alloc(sizeof(*dp));</div><div class='add'>+	dp-&gt;unique_id = unique_id++;</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;dp-&gt;kref);</div><div class='add'>+</div><div class='add'>+	dp-&gt;name = get_one_property(node, "name");</div><div class='add'>+	dp-&gt;type = get_one_property(node, "device_type");</div><div class='add'>+	dp-&gt;node = node;</div><div class='add'>+</div><div class='add'>+	/* Build interrupts later... */</div><div class='add'>+</div><div class='add'>+	dp-&gt;properties = build_prop_list(node);</div><div class='add'>+</div><div class='add'>+	return dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	dp = create_node(node);</div><div class='add'>+	if (dp) {</div><div class='add'>+		*(*nextp) = dp;</div><div class='add'>+		*nextp = &amp;dp-&gt;allnext;</div><div class='add'>+</div><div class='add'>+		dp-&gt;parent = parent;</div><div class='add'>+		dp-&gt;path_component_name = build_path_component(dp);</div><div class='add'>+		dp-&gt;full_name = build_full_name(dp);</div><div class='add'>+</div><div class='add'>+		dp-&gt;child = build_tree(dp, prom_getchild(node), nextp);</div><div class='add'>+</div><div class='add'>+		dp-&gt;sibling = build_tree(parent, prom_getsibling(node), nextp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_build_devicetree(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node **nextp;</div><div class='add'>+</div><div class='add'>+	allnodes = create_node(prom_root_node);</div><div class='add'>+	allnodes-&gt;path_component_name = "";</div><div class='add'>+	allnodes-&gt;full_name = "/";</div><div class='add'>+</div><div class='add'>+	nextp = &amp;allnodes-&gt;allnext;</div><div class='add'>+	allnodes-&gt;child = build_tree(allnodes,</div><div class='add'>+				     prom_getchild(allnodes-&gt;node),</div><div class='add'>+				     &amp;nextp);</div><div class='add'>+	printk("PROM: Built device tree with %u bytes of memory.\n",</div><div class='add'>+	       prom_early_allocated);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c<br/>index 3509e4305532..35488d6c7457 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/setup.c</a></div><div class='hunk'>@@ -17,9 +17,8 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='hunk'>@@ -31,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/root_dev.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -331,7 +331,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	if (!root_flags)</div><div class='ctx'> 		root_mountflags &amp;= ~MS_RDONLY;</div><div class='ctx'> 	ROOT_DEV = old_decode_dev(root_dev);</div><div class='del'>-#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+#ifdef CONFIG_BLK_DEV_RAM</div><div class='ctx'> 	rd_image_start = ram_flags &amp; RAMDISK_IMAGE_START_MASK;</div><div class='ctx'> 	rd_prompt = ((ram_flags &amp; RAMDISK_PROMPT_FLAG) != 0);</div><div class='ctx'> 	rd_doload = ((ram_flags &amp; RAMDISK_LOAD_FLAG) != 0);	</div><div class='hunk'>@@ -348,6 +348,8 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	init_mm.context = (unsigned long) NO_CONTEXT;</div><div class='ctx'> 	init_task.thread.kregs = &amp;fake_swapper_regs;</div><div class='ctx'> </div><div class='add'>+	smp_setup_cpu_possible_map();</div><div class='add'>+</div><div class='ctx'> 	paging_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -389,6 +391,8 @@ console_initcall(set_preferred_console);</div><div class='ctx'> extern char *sparc_cpu_type;</div><div class='ctx'> extern char *sparc_fpu_type;</div><div class='ctx'> </div><div class='add'>+static int ncpus_probed;</div><div class='add'>+</div><div class='ctx'> static int show_cpuinfo(struct seq_file *m, void *__unused)</div><div class='ctx'> {</div><div class='ctx'> 	seq_printf(m,</div><div class='hunk'>@@ -411,7 +415,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)</div><div class='ctx'> 		   romvec-&gt;pv_printrev &gt;&gt; 16,</div><div class='ctx'> 		   romvec-&gt;pv_printrev &amp; 0xffff,</div><div class='ctx'> 		   &amp;cputypval,</div><div class='del'>-		   num_possible_cpus(),</div><div class='add'>+		   ncpus_probed,</div><div class='ctx'> 		   num_online_cpus()</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 		   , cpu_data(0).udelay_val/(500000/HZ),</div><div class='hunk'>@@ -471,3 +475,30 @@ void sun_do_break(void)</div><div class='ctx'> </div><div class='ctx'> int serial_console = -1;</div><div class='ctx'> int stop_a_enabled = 1;</div><div class='add'>+</div><div class='add'>+static int __init topology_init(void)</div><div class='add'>+{</div><div class='add'>+	int i, ncpus, err;</div><div class='add'>+</div><div class='add'>+	/* Count the number of physically present processors in</div><div class='add'>+	 * the machine, even on uniprocessor, so that /proc/cpuinfo</div><div class='add'>+	 * output is consistent with 2.4.x</div><div class='add'>+	 */</div><div class='add'>+	ncpus = 0;</div><div class='add'>+	while (!cpu_find_by_instance(ncpus, NULL, NULL))</div><div class='add'>+		ncpus++;</div><div class='add'>+	ncpus_probed = ncpus;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	for_each_online_cpu(i) {</div><div class='add'>+		struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+		if (!p)</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+		else</div><div class='add'>+			register_cpu(p, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(topology_init);</div><div class='head'>diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c<br/>index 0748d8147bbf..c9301b9143ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/signal.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *  Copyright (C) 1997 Eddie C. Dost   (ecd@skynet.be)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c<br/>index a93f5da6855d..6135d4faeeeb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/smp.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE;</div><div class='ctx'> /* Used to make bitops atomic */</div><div class='ctx'> unsigned char bitops_spinlock = 0;</div><div class='ctx'> </div><div class='del'>-void __init smp_store_cpu_info(int id)</div><div class='add'>+void __cpuinit smp_store_cpu_info(int id)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu_node;</div><div class='ctx'> </div><div class='hunk'>@@ -69,6 +69,17 @@ void __init smp_store_cpu_info(int id)</div><div class='ctx'> 						     "clock-frequency", 0);</div><div class='ctx'> 	cpu_data(id).prom_node = cpu_node;</div><div class='ctx'> 	cpu_data(id).mid = cpu_get_hwmid(cpu_node);</div><div class='add'>+</div><div class='add'>+	/* this is required to tune the scheduler correctly */</div><div class='add'>+	/* is it possible to have CPUs with different cache sizes? */</div><div class='add'>+	if (id == boot_cpu_id) {</div><div class='add'>+		int cache_line,cache_nlines;</div><div class='add'>+		cache_line = 0x20;</div><div class='add'>+		cache_line = prom_getintdefault(cpu_node, "ecache-line-size", cache_line);</div><div class='add'>+		cache_nlines = 0x8000;</div><div class='add'>+		cache_nlines = prom_getintdefault(cpu_node, "ecache-nlines", cache_nlines);</div><div class='add'>+		max_cache_size = cache_line * cache_nlines;</div><div class='add'>+	}</div><div class='ctx'> 	if (cpu_data(id).mid &lt; 0)</div><div class='ctx'> 		panic("No MID found for CPU%d at node 0x%08d", id, cpu_node);</div><div class='ctx'> }</div><div class='hunk'>@@ -256,22 +267,18 @@ int setup_profiling_timer(unsigned int multiplier)</div><div class='ctx'> void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='ctx'> 	extern void smp4m_boot_cpus(void);</div><div class='del'>-	int i, cpuid, ncpus, extra;</div><div class='add'>+	int i, cpuid, extra;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(sparc_cpu_model != sun4m);</div><div class='ctx'> 	printk("Entering SMP Mode...\n");</div><div class='ctx'> </div><div class='del'>-	ncpus = 1;</div><div class='ctx'> 	extra = 0;</div><div class='ctx'> 	for (i = 0; !cpu_find_by_instance(i, NULL, &amp;cpuid); i++) {</div><div class='del'>-		if (cpuid == boot_cpu_id)</div><div class='del'>-			continue;</div><div class='del'>-		if (cpuid &lt; NR_CPUS &amp;&amp; ncpus++ &lt; max_cpus)</div><div class='del'>-			cpu_set(cpuid, phys_cpu_present_map);</div><div class='del'>-		else</div><div class='add'>+		if (cpuid &gt;= NR_CPUS)</div><div class='ctx'> 			extra++;</div><div class='ctx'> 	}</div><div class='del'>-	if (max_cpus &gt;= NR_CPUS &amp;&amp; extra)</div><div class='add'>+	/* i = number of cpus */</div><div class='add'>+	if (extra &amp;&amp; max_cpus &gt; i - extra)</div><div class='ctx'> 		printk("Warning: NR_CPUS is too low to start all cpus\n");</div><div class='ctx'> </div><div class='ctx'> 	smp_store_cpu_info(boot_cpu_id);</div><div class='hunk'>@@ -279,7 +286,25 @@ void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	smp4m_boot_cpus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __devinit smp_prepare_boot_cpu(void)</div><div class='add'>+/* Set this up early so that things like the scheduler can init</div><div class='add'>+ * properly.  We use the same cpu mask for both the present and</div><div class='add'>+ * possible cpu map.</div><div class='add'>+ */</div><div class='add'>+void __init smp_setup_cpu_possible_map(void)</div><div class='add'>+{</div><div class='add'>+	int instance, mid;</div><div class='add'>+</div><div class='add'>+	instance = 0;</div><div class='add'>+	while (!cpu_find_by_instance(instance, NULL, &amp;mid)) {</div><div class='add'>+		if (mid &lt; NR_CPUS) {</div><div class='add'>+			cpu_set(mid, phys_cpu_present_map);</div><div class='add'>+			cpu_set(mid, cpu_present_map);</div><div class='add'>+		}</div><div class='add'>+		instance++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init smp_prepare_boot_cpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpuid = hard_smp_processor_id();</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +320,7 @@ void __devinit smp_prepare_boot_cpu(void)</div><div class='ctx'> 	cpu_set(cpuid, phys_cpu_present_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit __cpu_up(unsigned int cpu)</div><div class='add'>+int __cpuinit __cpu_up(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	extern int smp4m_boot_one_cpu(int);</div><div class='ctx'> 	int ret;</div><div class='head'>diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c<br/>index 4b376fae752c..5fb987fc3d63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sparc_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sparc_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sparc_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sparc_ksyms.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #define EXPORT_SYMTAB_STROPS</div><div class='ctx'> #define PROMLIB_INTERNAL</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='hunk'>@@ -163,7 +162,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(__hard_smp_processor_id));</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(enable_irq));</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(disable_irq));</div><div class='del'>-EXPORT_SYMBOL(BTFIXUP_CALL(__irq_itoa));</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea));</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea));</div><div class='ctx'> EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl));</div><div class='head'>diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c<br/>index 3d6a99073c42..4be2c86ea540 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4c_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4c_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4c_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sun4c_irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -180,7 +179,7 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru</div><div class='ctx'> </div><div class='ctx'> 	irq = request_irq(TIMER_IRQ,</div><div class='ctx'> 			  counter_fn,</div><div class='del'>-			  (SA_INTERRUPT | SA_STATIC_ALLOC),</div><div class='add'>+			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='ctx'> 			  "timer", NULL);</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);</div><div class='hunk'>@@ -198,8 +197,6 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru</div><div class='ctx'> static void sun4c_nop(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern char *sun4m_irq_itoa(unsigned int irq);</div><div class='del'>-</div><div class='ctx'> void __init sun4c_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct linux_prom_registers int_regs[2];</div><div class='hunk'>@@ -238,7 +235,6 @@ void __init sun4c_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);</div><div class='del'>-	BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);</div><div class='ctx'> 	sparc_init_timers = sun4c_init_timers;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);</div><div class='head'>diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c<br/>index ca656d9bd6fd..74eed9775ac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4d_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4d_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4d_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sun4d_irq.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  Heavily based on arch/sparc/kernel/irq.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -108,13 +107,13 @@ found_it:	seq_printf(p, "%3d: ", i);</div><div class='ctx'> 			       kstat_cpu(cpu_logical_map(x)).irqs[i]);</div><div class='ctx'> #endif</div><div class='ctx'> 		seq_printf(p, "%c %s",</div><div class='del'>-			(action-&gt;flags &amp; SA_INTERRUPT) ? '+' : ' ',</div><div class='add'>+			(action-&gt;flags &amp; IRQF_DISABLED) ? '+' : ' ',</div><div class='ctx'> 			action-&gt;name);</div><div class='ctx'> 		action = action-&gt;next;</div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			for (; action; action = action-&gt;next) {</div><div class='ctx'> 				seq_printf(p, ",%s %s",</div><div class='del'>-					(action-&gt;flags &amp; SA_INTERRUPT) ? " +" : "",</div><div class='add'>+					(action-&gt;flags &amp; IRQF_DISABLED) ? " +" : "",</div><div class='ctx'> 					action-&gt;name);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!sbusl) break;</div><div class='hunk'>@@ -161,7 +160,7 @@ void sun4d_free_irq(unsigned int irq, void *dev_id)</div><div class='ctx'> 			printk("Trying to free free shared IRQ%d\n",irq);</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (action-&gt;flags &amp; SA_SHIRQ) {</div><div class='add'>+	} else if (action-&gt;flags &amp; IRQF_SHARED) {</div><div class='ctx'> 		printk("Trying to free shared IRQ%d with NULL device ID\n", irq);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -299,13 +298,13 @@ int sun4d_request_irq(unsigned int irq,</div><div class='ctx'> 	action = *actionp;</div><div class='ctx'> 	</div><div class='ctx'> 	if (action) {</div><div class='del'>-		if ((action-&gt;flags &amp; SA_SHIRQ) &amp;&amp; (irqflags &amp; SA_SHIRQ)) {</div><div class='add'>+		if ((action-&gt;flags &amp; IRQF_SHARED) &amp;&amp; (irqflags &amp; IRQF_SHARED)) {</div><div class='ctx'> 			for (tmp = action; tmp-&gt;next; tmp = tmp-&gt;next);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		if ((action-&gt;flags &amp; SA_INTERRUPT) ^ (irqflags &amp; SA_INTERRUPT)) {</div><div class='add'>+		if ((action-&gt;flags &amp; IRQF_DISABLED) ^ (irqflags &amp; IRQF_DISABLED)) {</div><div class='ctx'> 			printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);</div><div class='ctx'> 			ret = -EBUSY;</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -491,7 +490,7 @@ static void __init sun4d_init_timers(irqreturn_t (*counter_fn)(int, void *, stru</div><div class='ctx'> </div><div class='ctx'> 	irq = request_irq(TIMER_IRQ,</div><div class='ctx'> 			  counter_fn,</div><div class='del'>-			  (SA_INTERRUPT | SA_STATIC_ALLOC),</div><div class='add'>+			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='ctx'> 			  "timer", NULL);</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);</div><div class='hunk'>@@ -560,17 +559,6 @@ void __init sun4d_init_sbi_irq(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *sun4d_irq_itoa(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	static char buff[16];</div><div class='del'>-	</div><div class='del'>-	if (irq &lt; (1 &lt;&lt; 5))</div><div class='del'>-		sprintf(buff, "%d", irq);</div><div class='del'>-	else</div><div class='del'>-		sprintf(buff, "%d,%x", sbus_to_pil[(irq &gt;&gt; 2) &amp; 7], irq);</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init sun4d_init_IRQ(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_disable();</div><div class='hunk'>@@ -581,7 +569,6 @@ void __init sun4d_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(__irq_itoa, sun4d_irq_itoa, BTFIXUPCALL_NORM);</div><div class='ctx'> 	sparc_init_timers = sun4d_init_timers;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM);</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c<br/>index 39d712c3c809..7cefa301efea 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4m_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4m_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4m_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sun4m_irq.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='hunk'>@@ -229,13 +228,6 @@ static void sun4m_load_profile_irq(int cpu, unsigned int limit)</div><div class='ctx'> 	sun4m_timers-&gt;cpu_timers[cpu].l14_timer_limit = limit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-char *sun4m_irq_itoa(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	static char buff[16];</div><div class='del'>-	sprintf(buff, "%d", irq);</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, struct pt_regs *))</div><div class='ctx'> {</div><div class='ctx'> 	int reg_count, irq, cpu;</div><div class='hunk'>@@ -286,7 +278,7 @@ static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, stru</div><div class='ctx'> </div><div class='ctx'> 	irq = request_irq(TIMER_IRQ,</div><div class='ctx'> 			  counter_fn,</div><div class='del'>-			  (SA_INTERRUPT | SA_STATIC_ALLOC),</div><div class='add'>+			  (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='ctx'> 			  "timer", NULL);</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);</div><div class='hunk'>@@ -388,7 +380,6 @@ void __init sun4m_init_IRQ(void)</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM);</div><div class='ctx'> 	BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);</div><div class='del'>-	BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);</div><div class='ctx'> 	sparc_init_timers = sun4m_init_timers;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);</div><div class='head'>diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c<br/>index 70b375a4c2c2..3b32096134aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4m_smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sun4m_smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sun4m_smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sun4m_smp.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val)</div><div class='ctx'> static void smp_setup_percpu_timer(void);</div><div class='ctx'> extern void cpu_probe(void);</div><div class='ctx'> </div><div class='del'>-void __init smp4m_callin(void)</div><div class='add'>+void __cpuinit smp4m_callin(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpuid = hard_smp_processor_id();</div><div class='ctx'> </div><div class='hunk'>@@ -112,13 +112,8 @@ void __init smp4m_callin(void)</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	cpu_set(cpuid, cpu_online_map);</div><div class='del'>-	/* last one in gets all the interrupts (for testing) */</div><div class='del'>-	set_irq_udt(boot_cpu_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void init_IRQ(void);</div><div class='del'>-extern void cpu_panic(void);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Cycle through the processors asking the PROM to start each one.</div><div class='ctx'>  */</div><div class='hunk'>@@ -134,7 +129,7 @@ void __init smp4m_boot_cpus(void)</div><div class='ctx'> 	local_flush_cache_all();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int smp4m_boot_one_cpu(int i)</div><div class='add'>+int __cpuinit smp4m_boot_one_cpu(int i)</div><div class='ctx'> {</div><div class='ctx'> 	extern unsigned long sun4m_cpu_startup;</div><div class='ctx'> 	unsigned long *entry = &amp;sun4m_cpu_startup;</div><div class='head'>diff --git a/arch/sparc/kernel/sys_solaris.c b/arch/sparc/kernel/sys_solaris.c<br/>index fb7578554c78..c09afd96dd9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sys_solaris.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sys_solaris.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sys_solaris.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sys_solaris.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c<br/>index 288de276d9ff..aa0fb2efb615 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sys_sunos.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/sys_sunos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/sys_sunos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/sys_sunos.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ asmlinkage int sunos_brk(unsigned long brk)</div><div class='ctx'> 	 * simple, it hopefully works in most obvious cases.. Easy to</div><div class='ctx'> 	 * fool it, but this should catch most mistakes.</div><div class='ctx'> 	 */</div><div class='del'>-	freepages = get_page_cache_size();</div><div class='add'>+	freepages = global_page_state(NR_FILE_PAGES);</div><div class='ctx'> 	freepages &gt;&gt;= 1;</div><div class='ctx'> 	freepages += nr_free_pages();</div><div class='ctx'> 	freepages += nr_swap_pages;</div><div class='head'>diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S<br/>index 2856551bddf1..10df38eeae08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/systbls.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/systbls.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/systbls.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/systbls.S</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.data</div><div class='ctx'> 	.align 4</div><div class='head'>diff --git a/arch/sparc/kernel/tick14.c b/arch/sparc/kernel/tick14.c<br/>index 591547af4c65..d3b4daac705f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/tick14.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/tick14.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/tick14.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/tick14.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ void claim_ticker14(irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='ctx'> </div><div class='ctx'> 	if (!request_irq(irq_nr,</div><div class='ctx'> 			 handler,</div><div class='del'>-			 (SA_INTERRUPT | SA_STATIC_ALLOC),</div><div class='add'>+			 (IRQF_DISABLED | SA_STATIC_ALLOC),</div><div class='ctx'> 			 "counter14",</div><div class='ctx'> 			 NULL)) {</div><div class='ctx'> 		install_linux_ticker();</div><div class='head'>diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c<br/>index 7dadcdb4ca42..04eb1eab6e3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/time.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * 1997-09-10	Updated NTP code according to technical memorandum Jan '96</div><div class='ctx'>  *		"A Kernel Model for Precision Timekeeping" by Dave Mills</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -42,6 +41,7 @@</div><div class='ctx'> #include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pcic.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern unsigned long wall_jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -273,83 +273,31 @@ static __inline__ void sun4_clock_probe(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Probe for the mostek real time clock chip. */</div><div class='del'>-static __inline__ void clock_probe(void)</div><div class='add'>+static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers clk_reg[2];</div><div class='del'>-	char model[128];</div><div class='del'>-	register int node, cpuunit, bootbus;</div><div class='del'>-	struct resource r;</div><div class='del'>-</div><div class='del'>-	cpuunit = bootbus = 0;</div><div class='del'>-	memset(&amp;r, 0, sizeof(r));</div><div class='del'>-</div><div class='del'>-	/* Determine the correct starting PROM node for the probe. */</div><div class='del'>-	node = prom_getchild(prom_root_node);</div><div class='del'>-	switch (sparc_cpu_model) {</div><div class='del'>-	case sun4c:</div><div class='del'>-		break;</div><div class='del'>-	case sun4m:</div><div class='del'>-		node = prom_getchild(prom_searchsiblings(node, "obio"));</div><div class='del'>-		break;</div><div class='del'>-	case sun4d:</div><div class='del'>-		node = prom_getchild(bootbus = prom_searchsiblings(prom_getchild(cpuunit = prom_searchsiblings(node, "cpu-unit")), "bootbus"));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		prom_printf("CLOCK: Unsupported architecture!\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	char *model = of_get_property(dp, "model", NULL);</div><div class='ctx'> </div><div class='del'>-	/* Find the PROM node describing the real time clock. */</div><div class='del'>-	sp_clock_typ = MSTK_INVALID;</div><div class='del'>-	node = prom_searchsiblings(node,"eeprom");</div><div class='del'>-	if (!node) {</div><div class='del'>-		prom_printf("CLOCK: No clock found!\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	if (!model)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Get the model name and setup everything up. */</div><div class='del'>-	model[0] = '\0';</div><div class='del'>-	prom_getstring(node, "model", model, sizeof(model));</div><div class='del'>-	if (strcmp(model, "mk48t02") == 0) {</div><div class='add'>+	if (!strcmp(model, "mk48t02")) {</div><div class='ctx'> 		sp_clock_typ = MSTK48T02;</div><div class='del'>-		if (prom_getproperty(node, "reg", (char *) clk_reg, sizeof(clk_reg)) == -1) {</div><div class='del'>-			prom_printf("clock_probe: FAILED!\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		if (sparc_cpu_model == sun4d)</div><div class='del'>-			prom_apply_generic_ranges (bootbus, cpuunit, clk_reg, 1);</div><div class='del'>-		else</div><div class='del'>-			prom_apply_obio_ranges(clk_reg, 1);</div><div class='add'>+</div><div class='ctx'> 		/* Map the clock register io area read-only */</div><div class='del'>-		r.flags = clk_reg[0].which_io;</div><div class='del'>-		r.start = clk_reg[0].phys_addr;</div><div class='del'>-		mstk48t02_regs = sbus_ioremap(&amp;r, 0,</div><div class='del'>-		    sizeof(struct mostek48t02), "mk48t02");</div><div class='add'>+		mstk48t02_regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+					    sizeof(struct mostek48t02),</div><div class='add'>+					    "mk48t02");</div><div class='ctx'> 		mstk48t08_regs = NULL;  /* To catch weirdness */</div><div class='del'>-	} else if (strcmp(model, "mk48t08") == 0) {</div><div class='add'>+	} else if (!strcmp(model, "mk48t08")) {</div><div class='ctx'> 		sp_clock_typ = MSTK48T08;</div><div class='del'>-		if(prom_getproperty(node, "reg", (char *) clk_reg,</div><div class='del'>-				    sizeof(clk_reg)) == -1) {</div><div class='del'>-			prom_printf("clock_probe: FAILED!\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		if (sparc_cpu_model == sun4d)</div><div class='del'>-			prom_apply_generic_ranges (bootbus, cpuunit, clk_reg, 1);</div><div class='del'>-		else</div><div class='del'>-			prom_apply_obio_ranges(clk_reg, 1);</div><div class='del'>-		/* Map the clock register io area read-only */</div><div class='del'>-		/* XXX r/o attribute is somewhere in r.flags */</div><div class='del'>-		r.flags = clk_reg[0].which_io;</div><div class='del'>-		r.start = clk_reg[0].phys_addr;</div><div class='del'>-		mstk48t08_regs = sbus_ioremap(&amp;r, 0,</div><div class='del'>-		    sizeof(struct mostek48t08), "mk48t08");</div><div class='add'>+		mstk48t08_regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+					    sizeof(struct mostek48t08),</div><div class='add'>+					    "mk48t08");</div><div class='ctx'> </div><div class='ctx'> 		mstk48t02_regs = &amp;mstk48t08_regs-&gt;regs;</div><div class='del'>-	} else {</div><div class='del'>-		prom_printf("CLOCK: Unknown model name '%s'\n",model);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	} else</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Report a low battery voltage condition. */</div><div class='ctx'> 	if (has_low_battery())</div><div class='hunk'>@@ -358,6 +306,28 @@ static __inline__ void clock_probe(void)</div><div class='ctx'> 	/* Kick start the clock if it is completely stopped. */</div><div class='ctx'> 	if (mostek_read(mstk48t02_regs + MOSTEK_SEC) &amp; MSTK_STOP)</div><div class='ctx'> 		kick_start_clock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id clock_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "eeprom",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver clock_driver = {</div><div class='add'>+	.name		= "clock",</div><div class='add'>+	.match_table	= clock_match,</div><div class='add'>+	.probe		= clock_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Probe for the mostek real time clock chip. */</div><div class='add'>+static void clock_init(void)</div><div class='add'>+{</div><div class='add'>+	of_register_driver(&amp;clock_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init sbus_time_init(void)</div><div class='hunk'>@@ -376,7 +346,7 @@ void __init sbus_time_init(void)</div><div class='ctx'> 	if (ARCH_SUN4)</div><div class='ctx'> 		sun4_clock_probe();</div><div class='ctx'> 	else</div><div class='del'>-		clock_probe();</div><div class='add'>+		clock_init();</div><div class='ctx'> </div><div class='ctx'> 	sparc_init_timers(timer_interrupt);</div><div class='ctx'> 	</div><div class='head'>diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c<br/>index 41d45c298fb2..6a70d215fd04 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/kernel/traps.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * I hate traps on the sparc, grrr...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;  /* for jiffies */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kallsyms.h&gt;</div><div class='head'>diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile<br/>index fa5006946062..5db7e1d85385 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/lib/Makefile</a></div><div class='hunk'>@@ -9,3 +9,5 @@ lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \</div><div class='ctx'> 	 strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \</div><div class='ctx'> 	 copy_user.o locks.o atomic.o atomic32.o bitops.o \</div><div class='ctx'> 	 lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o</div><div class='add'>+</div><div class='add'>+obj-y += iomap.o</div><div class='head'>diff --git a/arch/sparc/lib/atomic.S b/arch/sparc/lib/atomic.S<br/>index f48ad0c4dadb..178cbb8ae1b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/atomic.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/atomic.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/atomic.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/lib/atomic.S</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S<br/>index 3e9399769075..cb7fb66a40c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/bitops.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/bitops.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/bitops.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/lib/bitops.S</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/lib/iomap.c b/arch/sparc/lib/iomap.c<br/>new file mode 100644<br/>index 000000000000..54501c1ca785<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/iomap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/lib/iomap.c</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/*</div><div class='add'>+ * Implement the sparc iomap interfaces</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+/* Create a virtual mapping cookie for an IO port range */</div><div class='add'>+void __iomem *ioport_map(unsigned long port, unsigned int nr)</div><div class='add'>+{</div><div class='add'>+	return (void __iomem *) (unsigned long) port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ioport_unmap(void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	/* Nothing to do */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ioport_map);</div><div class='add'>+EXPORT_SYMBOL(ioport_unmap);</div><div class='add'>+</div><div class='add'>+/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */</div><div class='add'>+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)</div><div class='add'>+{</div><div class='add'>+	unsigned long start = pci_resource_start(dev, bar);</div><div class='add'>+	unsigned long len = pci_resource_len(dev, bar);</div><div class='add'>+	unsigned long flags = pci_resource_flags(dev, bar);</div><div class='add'>+</div><div class='add'>+	if (!len || !start)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (maxlen &amp;&amp; len &gt; maxlen)</div><div class='add'>+		len = maxlen;</div><div class='add'>+	if (flags &amp; IORESOURCE_IO)</div><div class='add'>+		return ioport_map(start, len);</div><div class='add'>+	if (flags &amp; IORESOURCE_MEM) {</div><div class='add'>+		if (flags &amp; IORESOURCE_CACHEABLE)</div><div class='add'>+			return ioremap(start, len);</div><div class='add'>+		return ioremap_nocache(start, len);</div><div class='add'>+	}</div><div class='add'>+	/* What? */</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pci_iounmap(struct pci_dev *dev, void __iomem * addr)</div><div class='add'>+{</div><div class='add'>+	/* nothing to do */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pci_iomap);</div><div class='add'>+EXPORT_SYMBOL(pci_iounmap);</div><div class='head'>diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem.S<br/>index e7578dc600b8..20657744c864 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/lib/rwsem.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/lib/rwsem.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/lib/rwsem.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/lib/rwsem.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c<br/>index f147a44c9780..ec4231c2855a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/btfixup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/btfixup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/btfixup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/btfixup.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/btfixup.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/extable.c b/arch/sparc/mm/extable.c<br/>index c9845c71f426..16cc28935e39 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/sparc/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S<br/>index a231cca37216..d29cc24c5bba 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/hypersparc.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/hypersparc.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/hypersparc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/hypersparc.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/pgtsrmmu.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='head'>diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c<br/>index 898669732466..c85ddf312747 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/init.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *  Copyright (C) 2000 Anton Blanchard (anton@samba.org)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -31,6 +30,7 @@</div><div class='ctx'> #include &lt;asm/vaddrs.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;	/* bug in asm-generic/tlb.h: check_pgt_cache */</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);</div><div class='ctx'> </div><div class='hunk'>@@ -349,6 +349,7 @@ void __init paging_init(void)</div><div class='ctx'> 	protection_map[14] = PAGE_SHARED;</div><div class='ctx'> 	protection_map[15] = PAGE_SHARED;</div><div class='ctx'> 	btfixup();</div><div class='add'>+	prom_build_devicetree();</div><div class='ctx'> 	device_scan();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c<br/>index eefffa1dc5de..42c1c700c0a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/io-unit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/io-unit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/io-unit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/io-unit.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1997,1998 Jakub Jelinek    (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c<br/>index 77840c804786..be042efd1ba4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/iommu.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1997,1998 Jakub Jelinek    (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -144,8 +143,9 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte)</div><div class='ctx'> 	unsigned long start;</div><div class='ctx'> 	unsigned long end;</div><div class='ctx'> </div><div class='del'>-	start = (unsigned long)iopte &amp; PAGE_MASK;</div><div class='add'>+	start = (unsigned long)iopte;</div><div class='ctx'> 	end = PAGE_ALIGN(start + niopte*sizeof(iopte_t));</div><div class='add'>+	start &amp;= PAGE_MASK;</div><div class='ctx'> 	if (viking_mxcc_present) {</div><div class='ctx'> 		while(start &lt; end) {</div><div class='ctx'> 			viking_mxcc_flush_page(start);</div><div class='head'>diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c<br/>index 58c65cc8d0d3..16e13f663ab0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/srmmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/srmmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/srmmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/srmmu.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 1999,2000 Anton Blanchard (anton@samba.org)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c<br/>index 49f28c1bdc6d..7fdddf3c7e16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/sun4c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/sun4c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/sun4c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/sun4c.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #define NR_TASK_BUCKETS 512</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S<br/>index cd90f3fdc4e7..9f4cd396a0fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/swift.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/swift.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/swift.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/swift.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1999 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S<br/>index 697af617594a..4988e6a310bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/tsunami.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/tsunami.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/tsunami.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/tsunami.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='head'>diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S<br/>index 3cbd6de18dde..754c622548a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/mm/viking.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/mm/viking.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/mm/viking.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/mm/viking.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1999  Pavel Semerad  (semerad@ss1000.ms.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/psr.h&gt;</div><div class='ctx'> #include &lt;asm/asm-offsets.h&gt;</div><div class='head'>diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c<br/>index b83409c81916..50abfb1b880e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/prom/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/prom/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/prom/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/prom/init.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c<br/>index c20e5309f8aa..b0c0f9c4fc14 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/prom/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/prom/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/prom/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/prom/memory.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1997 Michael A. Griffith (grif@acm.org)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c<br/>index c840c2062342..1942c7c05cb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc/prom/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc/prom/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc/prom/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc/prom/misc.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig<br/>index 43a66f5407f4..8a36ba8868db 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/Kconfig</a></div><div class='hunk'>@@ -87,6 +87,10 @@ config SYSVIPC_COMPAT</div><div class='ctx'> 	depends on COMPAT &amp;&amp; SYSVIPC</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config GENERIC_HARDIRQS</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> menu "General machine setup"</div><div class='ctx'> </div><div class='ctx'> config SMP</div><div class='hunk'>@@ -330,7 +334,7 @@ config COMPAT</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> config BINFMT_ELF32</div><div class='del'>-	tristate "Kernel support for 32-bit ELF binaries"</div><div class='add'>+	bool "Kernel support for 32-bit ELF binaries"</div><div class='ctx'> 	depends on SPARC32_COMPAT</div><div class='ctx'> 	help</div><div class='ctx'> 	  This allows you to run 32-bit Linux/ELF binaries on your Ultra.</div><div class='head'>diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig<br/>index f09a70b8aabd..38353621069e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/defconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc3</div><div class='del'>-# Fri May 12 12:43:49 2006</div><div class='add'>+# Linux kernel version: 2.6.18-rc1</div><div class='add'>+# Wed Jul 12 14:00:58 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SPARC=y</div><div class='ctx'> CONFIG_SPARC64=y</div><div class='hunk'>@@ -18,6 +18,7 @@ CONFIG_SECCOMP=y</div><div class='ctx'> CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -51,10 +52,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -87,6 +90,7 @@ CONFIG_DEFAULT_AS=y</div><div class='ctx'> # CONFIG_DEFAULT_NOOP is not set</div><div class='ctx'> CONFIG_DEFAULT_IOSCHED="anticipatory"</div><div class='ctx'> CONFIG_SYSVIPC_COMPAT=y</div><div class='add'>+CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # General machine setup</div><div class='hunk'>@@ -126,8 +130,8 @@ CONFIG_SPARSEMEM=y</div><div class='ctx'> CONFIG_HAVE_MEMORY_PRESENT=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPARSEMEM_EXTREME=y</div><div class='del'>-CONFIG_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_SBUS=y</div><div class='ctx'> CONFIG_SBUSCHAR=y</div><div class='hunk'>@@ -183,6 +187,8 @@ CONFIG_INET_ESP=y</div><div class='ctx'> CONFIG_INET_IPCOMP=y</div><div class='ctx'> CONFIG_INET_XFRM_TUNNEL=y</div><div class='ctx'> CONFIG_INET_TUNNEL=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TRANSPORT=y</div><div class='add'>+CONFIG_INET_XFRM_MODE_TUNNEL=y</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> CONFIG_TCP_CONG_ADVANCED=y</div><div class='hunk'>@@ -198,6 +204,8 @@ CONFIG_TCP_CONG_HSTCP=m</div><div class='ctx'> CONFIG_TCP_CONG_HYBLA=m</div><div class='ctx'> CONFIG_TCP_CONG_VEGAS=m</div><div class='ctx'> CONFIG_TCP_CONG_SCALABLE=m</div><div class='add'>+CONFIG_TCP_CONG_LP=m</div><div class='add'>+CONFIG_TCP_CONG_VENO=m</div><div class='ctx'> CONFIG_IPV6=m</div><div class='ctx'> CONFIG_IPV6_PRIVACY=y</div><div class='ctx'> CONFIG_IPV6_ROUTER_PREF=y</div><div class='hunk'>@@ -207,7 +215,10 @@ CONFIG_INET6_ESP=m</div><div class='ctx'> CONFIG_INET6_IPCOMP=m</div><div class='ctx'> CONFIG_INET6_XFRM_TUNNEL=m</div><div class='ctx'> CONFIG_INET6_TUNNEL=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TRANSPORT=m</div><div class='add'>+CONFIG_INET6_XFRM_MODE_TUNNEL=m</div><div class='ctx'> CONFIG_IPV6_TUNNEL=m</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -260,6 +271,7 @@ CONFIG_VLAN_8021Q=m</div><div class='ctx'> # Network testing</div><div class='ctx'> #</div><div class='ctx'> CONFIG_NET_PKTGEN=m</div><div class='add'>+CONFIG_NET_TCPPROBE=m</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='hunk'>@@ -276,6 +288,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> # CONFIG_PREVENT_FIRMWARE_BUILD is not set</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -424,6 +437,7 @@ CONFIG_ISCSI_TCP=m</div><div class='ctx'> # CONFIG_MEGARAID_LEGACY is not set</div><div class='ctx'> # CONFIG_MEGARAID_SAS is not set</div><div class='ctx'> # CONFIG_SCSI_SATA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_DMX3191D is not set</div><div class='ctx'> # CONFIG_SCSI_FUTURE_DOMAIN is not set</div><div class='ctx'> # CONFIG_SCSI_IPS is not set</div><div class='hunk'>@@ -449,9 +463,8 @@ CONFIG_MD_LINEAR=m</div><div class='ctx'> CONFIG_MD_RAID0=m</div><div class='ctx'> CONFIG_MD_RAID1=m</div><div class='ctx'> CONFIG_MD_RAID10=m</div><div class='del'>-CONFIG_MD_RAID5=m</div><div class='add'>+CONFIG_MD_RAID456=m</div><div class='ctx'> # CONFIG_MD_RAID5_RESHAPE is not set</div><div class='del'>-CONFIG_MD_RAID6=m</div><div class='ctx'> CONFIG_MD_MULTIPATH=m</div><div class='ctx'> # CONFIG_MD_FAULTY is not set</div><div class='ctx'> CONFIG_BLK_DEV_DM=m</div><div class='hunk'>@@ -562,6 +575,7 @@ CONFIG_BNX2=m</div><div class='ctx'> # CONFIG_CHELSIO_T1 is not set</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> # CONFIG_S2IO is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -650,6 +664,7 @@ CONFIG_SERIO_RAW=m</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -680,6 +695,7 @@ CONFIG_UNIX98_PTYS=y</div><div class='ctx'> # Watchdog Cards</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_WATCHDOG is not set</div><div class='add'>+# CONFIG_HW_RANDOM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='ctx'> # CONFIG_R3964 is not set</div><div class='hunk'>@@ -722,6 +738,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> # CONFIG_I2C_I810 is not set</div><div class='ctx'> # CONFIG_I2C_PIIX4 is not set</div><div class='ctx'> # CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='ctx'> # CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='ctx'> # CONFIG_I2C_PROSAVAGE is not set</div><div class='ctx'> # CONFIG_I2C_SAVAGE4 is not set</div><div class='hunk'>@@ -765,6 +782,7 @@ CONFIG_I2C_ALGOBIT=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1021 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1025 is not set</div><div class='ctx'> # CONFIG_SENSORS_ADM1026 is not set</div><div class='hunk'>@@ -793,10 +811,12 @@ CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_SENSORS_PC87360 is not set</div><div class='ctx'> # CONFIG_SENSORS_SIS5595 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='ctx'> # CONFIG_SENSORS_SMSC47B397 is not set</div><div class='ctx'> # CONFIG_SENSORS_VIA686A is not set</div><div class='ctx'> # CONFIG_SENSORS_VT8231 is not set</div><div class='ctx'> # CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83792D is not set</div><div class='ctx'> # CONFIG_SENSORS_W83L785TS is not set</div><div class='ctx'> # CONFIG_SENSORS_W83627HF is not set</div><div class='hunk'>@@ -811,6 +831,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -821,12 +842,13 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> CONFIG_FB=y</div><div class='ctx'> CONFIG_FB_CFB_FILLRECT=y</div><div class='ctx'> CONFIG_FB_CFB_COPYAREA=y</div><div class='ctx'> CONFIG_FB_CFB_IMAGEBLIT=y</div><div class='ctx'> # CONFIG_FB_MACMODES is not set</div><div class='del'>-# CONFIG_FB_FIRMWARE_EDID is not set</div><div class='add'>+# CONFIG_FB_BACKLIGHT is not set</div><div class='ctx'> CONFIG_FB_MODE_HELPERS=y</div><div class='ctx'> CONFIG_FB_TILEBLITTING=y</div><div class='ctx'> # CONFIG_FB_CIRRUS is not set</div><div class='hunk'>@@ -936,6 +958,18 @@ CONFIG_SND_ALI5451=m</div><div class='ctx'> # CONFIG_SND_CMIPCI is not set</div><div class='ctx'> # CONFIG_SND_CS4281 is not set</div><div class='ctx'> # CONFIG_SND_CS46XX is not set</div><div class='add'>+# CONFIG_SND_DARLA20 is not set</div><div class='add'>+# CONFIG_SND_GINA20 is not set</div><div class='add'>+# CONFIG_SND_LAYLA20 is not set</div><div class='add'>+# CONFIG_SND_DARLA24 is not set</div><div class='add'>+# CONFIG_SND_GINA24 is not set</div><div class='add'>+# CONFIG_SND_LAYLA24 is not set</div><div class='add'>+# CONFIG_SND_MONA is not set</div><div class='add'>+# CONFIG_SND_MIA is not set</div><div class='add'>+# CONFIG_SND_ECHO3G is not set</div><div class='add'>+# CONFIG_SND_INDIGO is not set</div><div class='add'>+# CONFIG_SND_INDIGOIO is not set</div><div class='add'>+# CONFIG_SND_INDIGODJ is not set</div><div class='ctx'> # CONFIG_SND_EMU10K1 is not set</div><div class='ctx'> # CONFIG_SND_EMU10K1X is not set</div><div class='ctx'> # CONFIG_SND_ENS1370 is not set</div><div class='hunk'>@@ -1006,6 +1040,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=m</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -1085,10 +1120,12 @@ CONFIG_USB_HIDDEV=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='hunk'>@@ -1135,6 +1172,19 @@ CONFIG_USB_HIDDEV=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Misc Linux/SPARC drivers</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SUN_OPENPROMIO=m</div><div class='hunk'>@@ -1173,6 +1223,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> # CONFIG_AUTOFS_FS is not set</div><div class='hunk'>@@ -1228,6 +1279,7 @@ CONFIG_RAMFS=y</div><div class='ctx'> # CONFIG_NFSD is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1296,14 +1348,19 @@ CONFIG_KPROBES=y</div><div class='ctx'> #</div><div class='ctx'> CONFIG_PRINTK_TIME=y</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+# CONFIG_UNUSED_SYMBOLS is not set</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=18</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> CONFIG_SCHEDSTATS=y</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> CONFIG_DEBUG_BUGVERBOSE=y</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='hunk'>@@ -1367,3 +1424,4 @@ CONFIG_CRC32=y</div><div class='ctx'> CONFIG_LIBCRC32C=m</div><div class='ctx'> CONFIG_ZLIB_INFLATE=y</div><div class='ctx'> CONFIG_ZLIB_DEFLATE=y</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile<br/>index 6f6816488b04..86c9fe3f3e4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/Makefile</a></div><div class='hunk'>@@ -12,7 +12,7 @@ obj-y		:= process.o setup.o cpu.o idprom.o \</div><div class='ctx'> 		   irq.o ptrace.o time.o sys_sparc.o signal.o \</div><div class='ctx'> 		   unaligned.o central.o pci.o starfire.o semaphore.o \</div><div class='ctx'> 		   power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \</div><div class='del'>-		   visemul.o</div><div class='add'>+		   visemul.o prom.o of_device.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_PCI)	 += ebus.o isa.o pci_common.o pci_iommu.o \</div><div class='ctx'> 			    pci_psycho.o pci_sabre.o pci_schizo.o \</div><div class='head'>diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c<br/>index 8852c20c8d99..718350aba1ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/auxio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/auxio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/auxio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/auxio.c</a></div><div class='hunk'>@@ -6,18 +6,18 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> </div><div class='del'>-/* This cannot be static, as it is referenced in irq.c */</div><div class='ctx'> void __iomem *auxio_register = NULL;</div><div class='add'>+EXPORT_SYMBOL(auxio_register);</div><div class='ctx'> </div><div class='ctx'> enum auxio_type {</div><div class='ctx'> 	AUXIO_TYPE_NODEV,</div><div class='hunk'>@@ -110,43 +110,57 @@ void auxio_set_lte(int on)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init auxio_probe(void)</div><div class='add'>+static struct of_device_id auxio_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "auxio",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, auxio_match);</div><div class='add'>+</div><div class='add'>+static int __devinit auxio_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-        struct sbus_bus *sbus;</div><div class='del'>-        struct sbus_dev *sdev = NULL;</div><div class='del'>-</div><div class='del'>-        for_each_sbus(sbus) {</div><div class='del'>-                for_each_sbusdev(sdev, sbus) {</div><div class='del'>-                        if(!strcmp(sdev-&gt;prom_name, "auxio"))</div><div class='del'>-				goto found_sdev;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-found_sdev:</div><div class='del'>-	if (sdev) {</div><div class='del'>-		auxio_devtype  = AUXIO_TYPE_SBUS;</div><div class='del'>-		auxio_register = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-					      sdev-&gt;reg_addrs[0].reg_size,</div><div class='del'>-					      "auxiliaryIO");</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	else {</div><div class='del'>-		struct linux_ebus *ebus;</div><div class='del'>-		struct linux_ebus_device *edev = NULL;</div><div class='del'>-</div><div class='del'>-		for_each_ebus(ebus) {</div><div class='del'>-			for_each_ebusdev(edev, ebus) {</div><div class='del'>-				if (!strcmp(edev-&gt;prom_name, "auxio"))</div><div class='del'>-					goto ebus_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	ebus_done:</div><div class='del'>-		if (edev) {</div><div class='del'>-			auxio_devtype  = AUXIO_TYPE_EBUS;</div><div class='del'>-			auxio_register =</div><div class='del'>-				ioremap(edev-&gt;resource[0].start, sizeof(u32));</div><div class='del'>-		}</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	unsigned long size;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(dp-&gt;parent-&gt;name, "ebus")) {</div><div class='add'>+		auxio_devtype = AUXIO_TYPE_EBUS;</div><div class='add'>+		size = sizeof(u32);</div><div class='add'>+	} else if (!strcmp(dp-&gt;parent-&gt;name, "sbus")) {</div><div class='add'>+		auxio_devtype = AUXIO_TYPE_SBUS;</div><div class='add'>+		size = 1;</div><div class='add'>+	} else {</div><div class='add'>+		printk("auxio: Unknown parent bus type [%s]\n",</div><div class='add'>+		       dp-&gt;parent-&gt;name);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	auxio_set_led(AUXIO_LED_ON);</div><div class='del'>-#endif</div><div class='add'>+	auxio_register = of_ioremap(&amp;dev-&gt;resource[0], 0, size, "auxio");</div><div class='add'>+	if (!auxio_register)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "AUXIO: Found device at %s\n",</div><div class='add'>+	       dp-&gt;full_name);</div><div class='add'>+</div><div class='add'>+	if (auxio_devtype == AUXIO_TYPE_EBUS)</div><div class='add'>+		auxio_set_led(AUXIO_LED_ON);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver auxio_driver = {</div><div class='add'>+	.name		= "auxio",</div><div class='add'>+	.match_table	= auxio_match,</div><div class='add'>+	.probe		= auxio_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init auxio_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;auxio_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be after subsys_initcall() so that busses are probed.  Must</div><div class='add'>+ * be before device_initcall() because things like the floppy driver</div><div class='add'>+ * need to use the AUXIO register.</div><div class='add'>+ */</div><div class='add'>+fs_initcall(auxio_init);</div><div class='head'>diff --git a/arch/sparc64/kernel/binfmt_elf32.c b/arch/sparc64/kernel/binfmt_elf32.c<br/>index 8a2abcce2737..a98f3ae175a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/binfmt_elf32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/binfmt_elf32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/binfmt_elf32.c</a></div><div class='hunk'>@@ -84,7 +84,6 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c<br/>index 3d184a784968..b66336db00ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/central.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/central.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/central.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/central.c</a></div><div class='hunk'>@@ -29,28 +29,34 @@ static void central_probe_failure(int line)</div><div class='ctx'> 	prom_halt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void central_ranges_init(int cnode, struct linux_central *central)</div><div class='add'>+static void central_ranges_init(struct linux_central *central)</div><div class='ctx'> {</div><div class='del'>-	int success;</div><div class='add'>+	struct device_node *dp = central-&gt;prom_node;</div><div class='add'>+	void *pval;</div><div class='add'>+	int len;</div><div class='ctx'> 	</div><div class='ctx'> 	central-&gt;num_central_ranges = 0;</div><div class='del'>-	success = prom_getproperty(central-&gt;prom_node, "ranges",</div><div class='del'>-				   (char *) central-&gt;central_ranges,</div><div class='del'>-				   sizeof (central-&gt;central_ranges));</div><div class='del'>-	if (success != -1)</div><div class='del'>-		central-&gt;num_central_ranges = (success/sizeof(struct linux_prom_ranges));</div><div class='add'>+	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='add'>+	if (pval) {</div><div class='add'>+		memcpy(central-&gt;central_ranges, pval, len);</div><div class='add'>+		central-&gt;num_central_ranges =</div><div class='add'>+			(len / sizeof(struct linux_prom_ranges));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fhc_ranges_init(int fnode, struct linux_fhc *fhc)</div><div class='add'>+static void fhc_ranges_init(struct linux_fhc *fhc)</div><div class='ctx'> {</div><div class='del'>-	int success;</div><div class='add'>+	struct device_node *dp = fhc-&gt;prom_node;</div><div class='add'>+	void *pval;</div><div class='add'>+	int len;</div><div class='ctx'> 	</div><div class='ctx'> 	fhc-&gt;num_fhc_ranges = 0;</div><div class='del'>-	success = prom_getproperty(fhc-&gt;prom_node, "ranges",</div><div class='del'>-				   (char *) fhc-&gt;fhc_ranges,</div><div class='del'>-				   sizeof (fhc-&gt;fhc_ranges));</div><div class='del'>-	if (success != -1)</div><div class='del'>-		fhc-&gt;num_fhc_ranges = (success/sizeof(struct linux_prom_ranges));</div><div class='add'>+	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='add'>+	if (pval) {</div><div class='add'>+		memcpy(fhc-&gt;fhc_ranges, pval, len);</div><div class='add'>+		fhc-&gt;num_fhc_ranges =</div><div class='add'>+			(len / sizeof(struct linux_prom_ranges));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Range application routines are exported to various drivers,</div><div class='hunk'>@@ -112,15 +118,10 @@ static unsigned long prom_reg_to_paddr(struct linux_prom_registers *r)</div><div class='ctx'> </div><div class='ctx'> static void probe_other_fhcs(void)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers fpregs[6];</div><div class='del'>-	char namebuf[128];</div><div class='del'>-	int node;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct linux_prom64_registers *fpregs;</div><div class='ctx'> </div><div class='del'>-	node = prom_getchild(prom_root_node);</div><div class='del'>-	node = prom_searchsiblings(node, "fhc");</div><div class='del'>-	if (node == 0)</div><div class='del'>-		central_probe_failure(__LINE__);</div><div class='del'>-	while (node) {</div><div class='add'>+	for_each_node_by_name(dp, "fhc") {</div><div class='ctx'> 		struct linux_fhc *fhc;</div><div class='ctx'> 		int board;</div><div class='ctx'> 		u32 tmp;</div><div class='hunk'>@@ -137,14 +138,12 @@ static void probe_other_fhcs(void)</div><div class='ctx'> 		/* Toplevel FHCs have no parent. */</div><div class='ctx'> 		fhc-&gt;parent = NULL;</div><div class='ctx'> 		</div><div class='del'>-		fhc-&gt;prom_node = node;</div><div class='del'>-		prom_getstring(node, "name", namebuf, sizeof(namebuf));</div><div class='del'>-		strcpy(fhc-&gt;prom_name, namebuf);</div><div class='del'>-		fhc_ranges_init(node, fhc);</div><div class='add'>+		fhc-&gt;prom_node = dp;</div><div class='add'>+		fhc_ranges_init(fhc);</div><div class='ctx'> </div><div class='ctx'> 		/* Non-central FHC's have 64-bit OBP format registers. */</div><div class='del'>-		if (prom_getproperty(node, "reg",</div><div class='del'>-				    (char *)&amp;fpregs[0], sizeof(fpregs)) == -1)</div><div class='add'>+		fpregs = of_get_property(dp, "reg", NULL);</div><div class='add'>+		if (!fpregs)</div><div class='ctx'> 			central_probe_failure(__LINE__);</div><div class='ctx'> </div><div class='ctx'> 		/* Only central FHC needs special ranges applied. */</div><div class='hunk'>@@ -155,7 +154,7 @@ static void probe_other_fhcs(void)</div><div class='ctx'> 		fhc-&gt;fhc_regs.uregs = fpregs[4].phys_addr;</div><div class='ctx'> 		fhc-&gt;fhc_regs.tregs = fpregs[5].phys_addr;</div><div class='ctx'> </div><div class='del'>-		board = prom_getintdefault(node, "board#", -1);</div><div class='add'>+		board = of_getintprop_default(dp, "board#", -1);</div><div class='ctx'> 		fhc-&gt;board = board;</div><div class='ctx'> </div><div class='ctx'> 		tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_JCTRL);</div><div class='hunk'>@@ -179,33 +178,33 @@ static void probe_other_fhcs(void)</div><div class='ctx'> 		tmp = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='ctx'> 		tmp |= FHC_CONTROL_IXIST;</div><div class='ctx'> 		upa_writel(tmp, fhc-&gt;fhc_regs.pregs + FHC_PREGS_CTRL);</div><div class='del'>-</div><div class='del'>-		/* Look for the next FHC. */</div><div class='del'>-		node = prom_getsibling(node);</div><div class='del'>-		if (node == 0)</div><div class='del'>-			break;</div><div class='del'>-		node = prom_searchsiblings(node, "fhc");</div><div class='del'>-		if (node == 0)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void probe_clock_board(struct linux_central *central,</div><div class='ctx'> 			      struct linux_fhc *fhc,</div><div class='del'>-			      int cnode, int fnode)</div><div class='add'>+			      struct device_node *fp)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers cregs[3];</div><div class='del'>-	int clknode, nslots, tmp, nregs;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct linux_prom_registers cregs[3], *pr;</div><div class='add'>+	int nslots, tmp, nregs;</div><div class='ctx'> </div><div class='del'>-	clknode = prom_searchsiblings(prom_getchild(fnode), "clock-board");</div><div class='del'>-	if (clknode == 0 || clknode == -1)</div><div class='add'>+	dp = fp-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		if (!strcmp(dp-&gt;name, "clock-board"))</div><div class='add'>+			break;</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+	if (!dp)</div><div class='ctx'> 		central_probe_failure(__LINE__);</div><div class='ctx'> </div><div class='del'>-	nregs = prom_getproperty(clknode, "reg", (char *)&amp;cregs[0], sizeof(cregs));</div><div class='del'>-	if (nregs == -1)</div><div class='add'>+	pr = of_get_property(dp, "reg", &amp;nregs);</div><div class='add'>+	if (!pr)</div><div class='ctx'> 		central_probe_failure(__LINE__);</div><div class='ctx'> </div><div class='add'>+	memcpy(cregs, pr, nregs);</div><div class='ctx'> 	nregs /= sizeof(struct linux_prom_registers);</div><div class='add'>+</div><div class='ctx'> 	apply_fhc_ranges(fhc, &amp;cregs[0], nregs);</div><div class='ctx'> 	apply_central_ranges(central, &amp;cregs[0], nregs);</div><div class='ctx'> 	central-&gt;cfreg = prom_reg_to_paddr(&amp;cregs[0]);</div><div class='hunk'>@@ -296,13 +295,13 @@ static void init_all_fhc_hw(void)</div><div class='ctx'> </div><div class='ctx'> void central_probe(void)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers fpregs[6];</div><div class='add'>+	struct linux_prom_registers fpregs[6], *pr;</div><div class='ctx'> 	struct linux_fhc *fhc;</div><div class='del'>-	char namebuf[128];</div><div class='del'>-	int cnode, fnode, err;</div><div class='add'>+	struct device_node *dp, *fp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	cnode = prom_finddevice("/central");</div><div class='del'>-	if (cnode == 0 || cnode == -1) {</div><div class='add'>+	dp = of_find_node_by_name(NULL, "central");</div><div class='add'>+	if (!dp) {</div><div class='ctx'> 		if (this_is_starfire)</div><div class='ctx'> 			starfire_cpu_setup();</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -321,31 +320,31 @@ void central_probe(void)</div><div class='ctx'> </div><div class='ctx'> 	/* First init central. */</div><div class='ctx'> 	central_bus-&gt;child = fhc;</div><div class='del'>-	central_bus-&gt;prom_node = cnode;</div><div class='del'>-</div><div class='del'>-	prom_getstring(cnode, "name", namebuf, sizeof(namebuf));</div><div class='del'>-	strcpy(central_bus-&gt;prom_name, namebuf);</div><div class='del'>-</div><div class='del'>-	central_ranges_init(cnode, central_bus);</div><div class='add'>+	central_bus-&gt;prom_node = dp;</div><div class='add'>+	central_ranges_init(central_bus);</div><div class='ctx'> </div><div class='ctx'> 	/* And then central's FHC. */</div><div class='ctx'> 	fhc-&gt;next = fhc_list;</div><div class='ctx'> 	fhc_list = fhc;</div><div class='ctx'> </div><div class='ctx'> 	fhc-&gt;parent = central_bus;</div><div class='del'>-	fnode = prom_searchsiblings(prom_getchild(cnode), "fhc");</div><div class='del'>-	if (fnode == 0 || fnode == -1)</div><div class='add'>+	fp = dp-&gt;child;</div><div class='add'>+	while (fp) {</div><div class='add'>+		if (!strcmp(fp-&gt;name, "fhc"))</div><div class='add'>+			break;</div><div class='add'>+		fp = fp-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+	if (!fp)</div><div class='ctx'> 		central_probe_failure(__LINE__);</div><div class='ctx'> </div><div class='del'>-	fhc-&gt;prom_node = fnode;</div><div class='del'>-	prom_getstring(fnode, "name", namebuf, sizeof(namebuf));</div><div class='del'>-	strcpy(fhc-&gt;prom_name, namebuf);</div><div class='del'>-</div><div class='del'>-	fhc_ranges_init(fnode, fhc);</div><div class='add'>+	fhc-&gt;prom_node = fp;</div><div class='add'>+	fhc_ranges_init(fhc);</div><div class='ctx'> </div><div class='ctx'> 	/* Now, map in FHC register set. */</div><div class='del'>-	if (prom_getproperty(fnode, "reg", (char *)&amp;fpregs[0], sizeof(fpregs)) == -1)</div><div class='add'>+	pr = of_get_property(fp, "reg", NULL);</div><div class='add'>+	if (!pr)</div><div class='ctx'> 		central_probe_failure(__LINE__);</div><div class='add'>+	memcpy(fpregs, pr, sizeof(fpregs));</div><div class='ctx'> </div><div class='ctx'> 	apply_central_ranges(central_bus, &amp;fpregs[0], 6);</div><div class='ctx'> 	</div><div class='hunk'>@@ -366,7 +365,7 @@ void central_probe(void)</div><div class='ctx'> 	fhc-&gt;jtag_master = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Attach the clock board registers for CENTRAL. */</div><div class='del'>-	probe_clock_board(central_bus, fhc, cnode, fnode);</div><div class='add'>+	probe_clock_board(central_bus, fhc, fp);</div><div class='ctx'> </div><div class='ctx'> 	err = upa_readl(fhc-&gt;fhc_regs.pregs + FHC_PREGS_ID);</div><div class='ctx'> 	printk("FHC(board %d): Version[%x] PartID[%x] Manuf[%x] (CENTRAL)\n",</div><div class='head'>diff --git a/arch/sparc64/kernel/chmc.c b/arch/sparc64/kernel/chmc.c<br/>index 97cf912f0853..259f37e516f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/chmc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/chmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/chmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/chmc.c</a></div><div class='hunk'>@@ -17,6 +17,7 @@</div><div class='ctx'> #include &lt;asm/spitfire.h&gt;</div><div class='ctx'> #include &lt;asm/chmctrl.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CHMCTRL_NDGRPS	2</div><div class='hunk'>@@ -67,7 +68,6 @@ struct bank_info {</div><div class='ctx'> struct mctrl_info {</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> 	int			portid;</div><div class='del'>-	int			index;</div><div class='ctx'> </div><div class='ctx'> 	struct obp_mem_layout	layout_prop;</div><div class='ctx'> 	int			layout_size;</div><div class='hunk'>@@ -339,12 +339,13 @@ static void fetch_decode_regs(struct mctrl_info *mp)</div><div class='ctx'> 				 read_mcreg(mp, CHMCTRL_DECODE4));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int init_one_mctrl(int node, int index)</div><div class='add'>+static int init_one_mctrl(struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	struct mctrl_info *mp = kmalloc(sizeof(*mp), GFP_KERNEL);</div><div class='del'>-	int portid = prom_getintdefault(node, "portid", -1);</div><div class='del'>-	struct linux_prom64_registers p_reg_prop;</div><div class='del'>-	int t;</div><div class='add'>+	int portid = of_getintprop_default(dp, "portid", -1);</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	void *pval;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (!mp)</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -353,24 +354,21 @@ static int init_one_mctrl(int node, int index)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	mp-&gt;portid = portid;</div><div class='del'>-	mp-&gt;layout_size = prom_getproplen(node, "memory-layout");</div><div class='del'>-	if (mp-&gt;layout_size &lt; 0)</div><div class='add'>+	pval = of_get_property(dp, "memory-layout", &amp;len);</div><div class='add'>+	mp-&gt;layout_size = len;</div><div class='add'>+	if (!pval)</div><div class='ctx'> 		mp-&gt;layout_size = 0;</div><div class='del'>-	if (mp-&gt;layout_size &gt; sizeof(mp-&gt;layout_prop))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (mp-&gt;layout_size &gt; 0)</div><div class='del'>-		prom_getproperty(node, "memory-layout",</div><div class='del'>-				 (char *) &amp;mp-&gt;layout_prop,</div><div class='del'>-				 mp-&gt;layout_size);</div><div class='add'>+	else {</div><div class='add'>+		if (mp-&gt;layout_size &gt; sizeof(mp-&gt;layout_prop))</div><div class='add'>+			goto fail;</div><div class='add'>+		memcpy(&amp;mp-&gt;layout_prop, pval, len);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	t = prom_getproperty(node, "reg",</div><div class='del'>-			     (char *) &amp;p_reg_prop,</div><div class='del'>-			     sizeof(p_reg_prop));</div><div class='del'>-	if (t &lt; 0 || p_reg_prop.reg_size != 0x48)</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	if (!regs || regs-&gt;reg_size != 0x48)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	mp-&gt;regs = ioremap(p_reg_prop.phys_addr, p_reg_prop.reg_size);</div><div class='add'>+	mp-&gt;regs = ioremap(regs-&gt;phys_addr, regs-&gt;reg_size);</div><div class='ctx'> 	if (mp-&gt;regs == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -384,13 +382,11 @@ static int init_one_mctrl(int node, int index)</div><div class='ctx'> </div><div class='ctx'> 	fetch_decode_regs(mp);</div><div class='ctx'> </div><div class='del'>-	mp-&gt;index = index;</div><div class='del'>-</div><div class='ctx'> 	list_add(&amp;mp-&gt;list, &amp;mctrl_list);</div><div class='ctx'> </div><div class='ctx'> 	/* Report the device. */</div><div class='del'>-	printk(KERN_INFO "chmc%d: US3 memory controller at %p [%s]\n",</div><div class='del'>-	       mp-&gt;index,</div><div class='add'>+	printk(KERN_INFO "%s: US3 memory controller at %p [%s]\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='ctx'> 	       mp-&gt;regs, (mp-&gt;layout_size ? "ACTIVE" : "INACTIVE"));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -404,34 +400,19 @@ fail:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init probe_for_string(char *name, int index)</div><div class='del'>-{</div><div class='del'>-	int node = prom_getchild(prom_root_node);</div><div class='del'>-</div><div class='del'>-	while ((node = prom_searchsiblings(node, name)) != 0) {</div><div class='del'>-		int ret = init_one_mctrl(node, index);</div><div class='del'>-</div><div class='del'>-		if (!ret)</div><div class='del'>-			index++;</div><div class='del'>-</div><div class='del'>-		node = prom_getsibling(node);</div><div class='del'>-		if (!node)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return index;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init chmc_init(void)</div><div class='ctx'> {</div><div class='del'>-	int index;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> </div><div class='ctx'> 	/* This driver is only for cheetah platforms. */</div><div class='ctx'> 	if (tlb_type != cheetah &amp;&amp; tlb_type != cheetah_plus)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	index = probe_for_string("memory-controller", 0);</div><div class='del'>-	index = probe_for_string("mc-us3", index);</div><div class='add'>+	for_each_node_by_name(dp, "memory-controller")</div><div class='add'>+		init_one_mctrl(dp);</div><div class='add'>+</div><div class='add'>+	for_each_node_by_name(dp, "mc-us3")</div><div class='add'>+		init_one_mctrl(dp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c<br/>index 11cc0caef592..7eb81d3954d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/cpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/cpu.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c<br/>index 007e8922cd16..f8ef2f2b9b37 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/devices.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/devices.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/devices.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/devices.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -21,8 +20,6 @@</div><div class='ctx'> #include &lt;asm/spitfire.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='del'>-#include &lt;asm/vdev.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Used to synchronize acceses to NatSemi SUPER I/O chip configure</div><div class='ctx'>  * operations in asm/ns87303.h</div><div class='hunk'>@@ -32,134 +29,6 @@ DEFINE_SPINLOCK(ns87303_lock);</div><div class='ctx'> extern void cpu_probe(void);</div><div class='ctx'> extern void central_probe(void);</div><div class='ctx'> </div><div class='del'>-u32 sun4v_vdev_devhandle;</div><div class='del'>-int sun4v_vdev_root;</div><div class='del'>-</div><div class='del'>-struct vdev_intmap {</div><div class='del'>-	unsigned int phys;</div><div class='del'>-	unsigned int irq;</div><div class='del'>-	unsigned int cnode;</div><div class='del'>-	unsigned int cinterrupt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct vdev_intmask {</div><div class='del'>-	unsigned int phys;</div><div class='del'>-	unsigned int interrupt;</div><div class='del'>-	unsigned int __unused;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct vdev_intmap *vdev_intmap;</div><div class='del'>-static int vdev_num_intmap;</div><div class='del'>-static struct vdev_intmask vdev_intmask;</div><div class='del'>-</div><div class='del'>-static void __init sun4v_virtual_device_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct linux_prom64_registers regs;</div><div class='del'>-	struct vdev_intmap *ip;</div><div class='del'>-	int node, sz, err;</div><div class='del'>-</div><div class='del'>-	if (tlb_type != hypervisor)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	node = prom_getchild(prom_root_node);</div><div class='del'>-	node = prom_searchsiblings(node, "virtual-devices");</div><div class='del'>-	if (!node) {</div><div class='del'>-		prom_printf("SUN4V: Fatal error, no virtual-devices node.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sun4v_vdev_root = node;</div><div class='del'>-</div><div class='del'>-	prom_getproperty(node, "reg", (char *)&amp;regs, sizeof(regs));</div><div class='del'>-	sun4v_vdev_devhandle = (regs.phys_addr &gt;&gt; 32UL) &amp; 0x0fffffff;</div><div class='del'>-</div><div class='del'>-	sz = prom_getproplen(node, "interrupt-map");</div><div class='del'>-	if (sz &lt;= 0) {</div><div class='del'>-		prom_printf("SUN4V: Error, no vdev interrupt-map.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((sz % sizeof(*ip)) != 0) {</div><div class='del'>-		prom_printf("SUN4V: Bogus interrupt-map property size %d\n",</div><div class='del'>-			    sz);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vdev_intmap = ip = alloc_bootmem_low_pages(sz);</div><div class='del'>-	if (!vdev_intmap) {</div><div class='del'>-		prom_printf("SUN4V: Error, cannot allocate vdev_intmap.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(node, "interrupt-map", (char *) ip, sz);</div><div class='del'>-	if (err == -1) {</div><div class='del'>-		prom_printf("SUN4V: Fatal error, no vdev interrupt-map.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	if (err != sz) {</div><div class='del'>-		prom_printf("SUN4V: Inconsistent interrupt-map size, "</div><div class='del'>-			    "proplen(%d) vs getprop(%d).\n", sz,err);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vdev_num_intmap = err / sizeof(*ip);</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(node, "interrupt-map-mask",</div><div class='del'>-			       (char *) &amp;vdev_intmask,</div><div class='del'>-			       sizeof(vdev_intmask));</div><div class='del'>-	if (err &lt;= 0) {</div><div class='del'>-		prom_printf("SUN4V: Fatal error, no vdev "</div><div class='del'>-			    "interrupt-map-mask.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	if (err % sizeof(vdev_intmask)) {</div><div class='del'>-		prom_printf("SUN4V: Bogus interrupt-map-mask "</div><div class='del'>-			    "property size %d\n", err);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("SUN4V: virtual-devices devhandle[%x]\n",</div><div class='del'>-	       sun4v_vdev_devhandle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int sun4v_vdev_device_interrupt(unsigned int dev_node)</div><div class='del'>-{</div><div class='del'>-	unsigned int irq, reg;</div><div class='del'>-	int err, i;</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(dev_node, "interrupts",</div><div class='del'>-			       (char *) &amp;irq, sizeof(irq));</div><div class='del'>-	if (err &lt;= 0) {</div><div class='del'>-		printk("VDEV: Cannot get \"interrupts\" "</div><div class='del'>-		       "property for OBP node %x\n", dev_node);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(dev_node, "reg",</div><div class='del'>-			       (char *) &amp;reg, sizeof(reg));</div><div class='del'>-	if (err &lt;= 0) {</div><div class='del'>-		printk("VDEV: Cannot get \"reg\" "</div><div class='del'>-		       "property for OBP node %x\n", dev_node);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; vdev_num_intmap; i++) {</div><div class='del'>-		if (vdev_intmap[i].phys == (reg &amp; vdev_intmask.phys) &amp;&amp;</div><div class='del'>-		    vdev_intmap[i].irq == (irq &amp; vdev_intmask.interrupt)) {</div><div class='del'>-			irq = vdev_intmap[i].cinterrupt;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == vdev_num_intmap) {</div><div class='del'>-		printk("VDEV: No matching interrupt map entry "</div><div class='del'>-		       "for OBP node %x\n", dev_node);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sun4v_build_irq(sun4v_vdev_devhandle, irq, 5, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const char *cpu_mid_prop(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (tlb_type == spitfire)</div><div class='hunk'>@@ -167,38 +36,44 @@ static const char *cpu_mid_prop(void)</div><div class='ctx'> 	return "portid";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_cpu_mid(int prom_node)</div><div class='add'>+static int get_cpu_mid(struct device_node *dp)</div><div class='ctx'> {</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='ctx'> 	if (tlb_type == hypervisor) {</div><div class='del'>-		struct linux_prom64_registers reg;</div><div class='add'>+		struct linux_prom64_registers *reg;</div><div class='add'>+		int len;</div><div class='ctx'> </div><div class='del'>-		if (prom_getproplen(prom_node, "cpuid") == 4)</div><div class='del'>-			return prom_getintdefault(prom_node, "cpuid", 0);</div><div class='add'>+		prop = of_find_property(dp, "cpuid", &amp;len);</div><div class='add'>+		if (prop &amp;&amp; len == 4)</div><div class='add'>+			return *(int *) prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-		prom_getproperty(prom_node, "reg", (char *) &amp;reg, sizeof(reg));</div><div class='del'>-		return (reg.phys_addr &gt;&gt; 32) &amp; 0x0fffffffUL;</div><div class='add'>+		prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+		reg = prop-&gt;value;</div><div class='add'>+		return (reg[0].phys_addr &gt;&gt; 32) &amp; 0x0fffffffUL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		const char *prop_name = cpu_mid_prop();</div><div class='ctx'> </div><div class='del'>-		return prom_getintdefault(prom_node, prop_name, 0);</div><div class='add'>+		prop = of_find_property(dp, prop_name, NULL);</div><div class='add'>+		if (prop)</div><div class='add'>+			return *(int *) prop-&gt;value;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_cpu_node(int nd, int *cur_inst,</div><div class='del'>-			  int (*compare)(int, int, void *), void *compare_arg,</div><div class='del'>-			  int *prom_node, int *mid)</div><div class='add'>+static int check_cpu_node(struct device_node *dp, int *cur_inst,</div><div class='add'>+			  int (*compare)(struct device_node *, int, void *),</div><div class='add'>+			  void *compare_arg,</div><div class='add'>+			  struct device_node **dev_node, int *mid)</div><div class='ctx'> {</div><div class='del'>-	char node_str[128];</div><div class='del'>-</div><div class='del'>-	prom_getstring(nd, "device_type", node_str, sizeof(node_str));</div><div class='del'>-	if (strcmp(node_str, "cpu"))</div><div class='add'>+	if (strcmp(dp-&gt;type, "cpu"))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!compare(nd, *cur_inst, compare_arg)) {</div><div class='del'>-		if (prom_node)</div><div class='del'>-			*prom_node = nd;</div><div class='add'>+	if (!compare(dp, *cur_inst, compare_arg)) {</div><div class='add'>+		if (dev_node)</div><div class='add'>+			*dev_node = dp;</div><div class='ctx'> 		if (mid)</div><div class='del'>-			*mid = get_cpu_mid(nd);</div><div class='add'>+			*mid = get_cpu_mid(dp);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -207,25 +82,18 @@ static int check_cpu_node(int nd, int *cur_inst,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __cpu_find_by(int (*compare)(int, int, void *), void *compare_arg,</div><div class='del'>-			 int *prom_node, int *mid)</div><div class='add'>+static int __cpu_find_by(int (*compare)(struct device_node *, int, void *),</div><div class='add'>+			 void *compare_arg,</div><div class='add'>+			 struct device_node **dev_node, int *mid)</div><div class='ctx'> {</div><div class='del'>-	int nd, cur_inst, err;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int cur_inst;</div><div class='ctx'> </div><div class='del'>-	nd = prom_root_node;</div><div class='ctx'> 	cur_inst = 0;</div><div class='del'>-</div><div class='del'>-	err = check_cpu_node(nd, &amp;cur_inst,</div><div class='del'>-			     compare, compare_arg,</div><div class='del'>-			     prom_node, mid);</div><div class='del'>-	if (err == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	nd = prom_getchild(nd);</div><div class='del'>-	while ((nd = prom_getsibling(nd)) != 0) {</div><div class='del'>-		err = check_cpu_node(nd, &amp;cur_inst,</div><div class='del'>-				     compare, compare_arg,</div><div class='del'>-				     prom_node, mid);</div><div class='add'>+	for_each_node_by_type(dp, "cpu") {</div><div class='add'>+		int err = check_cpu_node(dp, &amp;cur_inst,</div><div class='add'>+					 compare, compare_arg,</div><div class='add'>+					 dev_node, mid);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -233,7 +101,7 @@ static int __cpu_find_by(int (*compare)(int, int, void *), void *compare_arg,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpu_instance_compare(int nd, int instance, void *_arg)</div><div class='add'>+static int cpu_instance_compare(struct device_node *dp, int instance, void *_arg)</div><div class='ctx'> {</div><div class='ctx'> 	int desired_instance = (int) (long) _arg;</div><div class='ctx'> </div><div class='hunk'>@@ -242,27 +110,27 @@ static int cpu_instance_compare(int nd, int instance, void *_arg)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cpu_find_by_instance(int instance, int *prom_node, int *mid)</div><div class='add'>+int cpu_find_by_instance(int instance, struct device_node **dev_node, int *mid)</div><div class='ctx'> {</div><div class='ctx'> 	return __cpu_find_by(cpu_instance_compare, (void *)(long)instance,</div><div class='del'>-			     prom_node, mid);</div><div class='add'>+			     dev_node, mid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cpu_mid_compare(int nd, int instance, void *_arg)</div><div class='add'>+static int cpu_mid_compare(struct device_node *dp, int instance, void *_arg)</div><div class='ctx'> {</div><div class='ctx'> 	int desired_mid = (int) (long) _arg;</div><div class='ctx'> 	int this_mid;</div><div class='ctx'> </div><div class='del'>-	this_mid = get_cpu_mid(nd);</div><div class='add'>+	this_mid = get_cpu_mid(dp);</div><div class='ctx'> 	if (this_mid == desired_mid)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cpu_find_by_mid(int mid, int *prom_node)</div><div class='add'>+int cpu_find_by_mid(int mid, struct device_node **dev_node)</div><div class='ctx'> {</div><div class='ctx'> 	return __cpu_find_by(cpu_mid_compare, (void *)(long)mid,</div><div class='del'>-			     prom_node, NULL);</div><div class='add'>+			     dev_node, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init device_scan(void)</div><div class='hunk'>@@ -274,50 +142,47 @@ void __init device_scan(void)</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 	{</div><div class='del'>-		int err, cpu_node, def;</div><div class='add'>+		struct device_node *dp;</div><div class='add'>+		int err, def;</div><div class='ctx'> </div><div class='del'>-		err = cpu_find_by_instance(0, &amp;cpu_node, NULL);</div><div class='add'>+		err = cpu_find_by_instance(0, &amp;dp, NULL);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			prom_printf("No cpu nodes, cannot continue\n");</div><div class='ctx'> 			prom_halt();</div><div class='ctx'> 		}</div><div class='del'>-		cpu_data(0).clock_tick = prom_getintdefault(cpu_node,</div><div class='del'>-							    "clock-frequency",</div><div class='del'>-							    0);</div><div class='add'>+		cpu_data(0).clock_tick =</div><div class='add'>+			of_getintprop_default(dp, "clock-frequency", 0);</div><div class='ctx'> </div><div class='ctx'> 		def = ((tlb_type == hypervisor) ?</div><div class='ctx'> 		       (8 * 1024) :</div><div class='ctx'> 		       (16 * 1024));</div><div class='del'>-		cpu_data(0).dcache_size = prom_getintdefault(cpu_node,</div><div class='del'>-							     "dcache-size",</div><div class='del'>-							     def);</div><div class='add'>+		cpu_data(0).dcache_size = of_getintprop_default(dp,</div><div class='add'>+								"dcache-size",</div><div class='add'>+								def);</div><div class='ctx'> </div><div class='ctx'> 		def = 32;</div><div class='ctx'> 		cpu_data(0).dcache_line_size =</div><div class='del'>-			prom_getintdefault(cpu_node, "dcache-line-size",</div><div class='del'>-					   def);</div><div class='add'>+			of_getintprop_default(dp, "dcache-line-size", def);</div><div class='ctx'> </div><div class='ctx'> 		def = 16 * 1024;</div><div class='del'>-		cpu_data(0).icache_size = prom_getintdefault(cpu_node,</div><div class='del'>-							     "icache-size",</div><div class='del'>-							     def);</div><div class='add'>+		cpu_data(0).icache_size = of_getintprop_default(dp,</div><div class='add'>+								"icache-size",</div><div class='add'>+								def);</div><div class='ctx'> </div><div class='ctx'> 		def = 32;</div><div class='ctx'> 		cpu_data(0).icache_line_size =</div><div class='del'>-			prom_getintdefault(cpu_node, "icache-line-size",</div><div class='del'>-					   def);</div><div class='add'>+			of_getintprop_default(dp, "icache-line-size", def);</div><div class='ctx'> </div><div class='ctx'> 		def = ((tlb_type == hypervisor) ?</div><div class='ctx'> 		       (3 * 1024 * 1024) :</div><div class='ctx'> 		       (4 * 1024 * 1024));</div><div class='del'>-		cpu_data(0).ecache_size = prom_getintdefault(cpu_node,</div><div class='del'>-							     "ecache-size",</div><div class='del'>-							     def);</div><div class='add'>+		cpu_data(0).ecache_size = of_getintprop_default(dp,</div><div class='add'>+								"ecache-size",</div><div class='add'>+								def);</div><div class='ctx'> </div><div class='ctx'> 		def = 64;</div><div class='ctx'> 		cpu_data(0).ecache_line_size =</div><div class='del'>-			prom_getintdefault(cpu_node, "ecache-line-size",</div><div class='del'>-					   def);</div><div class='add'>+			of_getintprop_default(dp, "ecache-line-size", def);</div><div class='ctx'> 		printk("CPU[0]: Caches "</div><div class='ctx'> 		       "D[sz(%d):line_sz(%d)] "</div><div class='ctx'> 		       "I[sz(%d):line_sz(%d)] "</div><div class='hunk'>@@ -328,7 +193,6 @@ void __init device_scan(void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	sun4v_virtual_device_probe();</div><div class='ctx'> 	central_probe();</div><div class='ctx'> </div><div class='ctx'> 	cpu_probe();</div><div class='head'>diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c<br/>index c69504aa638f..8a9b470e1b65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ebus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/ebus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ebus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/ebus.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1999  David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -20,6 +19,8 @@</div><div class='ctx'> #include &lt;asm/pbm.h&gt;</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/bpp.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -139,7 +140,7 @@ int ebus_dma_irq_enable(struct ebus_dma_info *p, int on)</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		if (p-&gt;flags &amp; EBUS_DMA_FLAG_USE_EBDMA_HANDLER) {</div><div class='del'>-			if (request_irq(p-&gt;irq, ebus_dma_irq, SA_SHIRQ, p-&gt;name, p))</div><div class='add'>+			if (request_irq(p-&gt;irq, ebus_dma_irq, IRQF_SHARED, p-&gt;name, p))</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -269,10 +270,6 @@ EXPORT_SYMBOL(ebus_dma_enable);</div><div class='ctx'> </div><div class='ctx'> struct linux_ebus *ebus_chain = NULL;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN_AUXIO</div><div class='del'>-extern void auxio_probe(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static inline void *ebus_alloc(size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	void *mem;</div><div class='hunk'>@@ -283,77 +280,22 @@ static inline void *ebus_alloc(size_t size)</div><div class='ctx'> 	return mem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init ebus_ranges_init(struct linux_ebus *ebus)</div><div class='del'>-{</div><div class='del'>-	int success;</div><div class='del'>-</div><div class='del'>-	ebus-&gt;num_ebus_ranges = 0;</div><div class='del'>-	success = prom_getproperty(ebus-&gt;prom_node, "ranges",</div><div class='del'>-				   (char *)ebus-&gt;ebus_ranges,</div><div class='del'>-				   sizeof(ebus-&gt;ebus_ranges));</div><div class='del'>-	if (success != -1)</div><div class='del'>-		ebus-&gt;num_ebus_ranges = (success/sizeof(struct linux_prom_ebus_ranges));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init ebus_intmap_init(struct linux_ebus *ebus)</div><div class='del'>-{</div><div class='del'>-	int success;</div><div class='del'>-</div><div class='del'>-	ebus-&gt;num_ebus_intmap = 0;</div><div class='del'>-	success = prom_getproperty(ebus-&gt;prom_node, "interrupt-map",</div><div class='del'>-				   (char *)ebus-&gt;ebus_intmap,</div><div class='del'>-				   sizeof(ebus-&gt;ebus_intmap));</div><div class='del'>-	if (success == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ebus-&gt;num_ebus_intmap = (success/sizeof(struct linux_prom_ebus_intmap));</div><div class='del'>-</div><div class='del'>-	success = prom_getproperty(ebus-&gt;prom_node, "interrupt-map-mask",</div><div class='del'>-				   (char *)&amp;ebus-&gt;ebus_intmask,</div><div class='del'>-				   sizeof(ebus-&gt;ebus_intmask));</div><div class='del'>-	if (success == -1) {</div><div class='del'>-		prom_printf("%s: can't get interrupt-map-mask\n", __FUNCTION__);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init ebus_intmap_match(struct linux_ebus *ebus,</div><div class='del'>-			     struct linux_prom_registers *reg,</div><div class='del'>-			     int *interrupt)</div><div class='add'>+static void __init fill_ebus_child(struct device_node *dp,</div><div class='add'>+				   struct linux_ebus_child *dev,</div><div class='add'>+				   int non_standard_regs)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hi, lo, irq;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!ebus-&gt;num_ebus_intmap)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	hi = reg-&gt;which_io &amp; ebus-&gt;ebus_intmask.phys_hi;</div><div class='del'>-	lo = reg-&gt;phys_addr &amp; ebus-&gt;ebus_intmask.phys_lo;</div><div class='del'>-	irq = *interrupt &amp; ebus-&gt;ebus_intmask.interrupt;</div><div class='del'>-	for (i = 0; i &lt; ebus-&gt;num_ebus_intmap; i++) {</div><div class='del'>-		if ((ebus-&gt;ebus_intmap[i].phys_hi == hi) &amp;&amp;</div><div class='del'>-		    (ebus-&gt;ebus_intmap[i].phys_lo == lo) &amp;&amp;</div><div class='del'>-		    (ebus-&gt;ebus_intmap[i].interrupt == irq)) {</div><div class='del'>-			*interrupt = ebus-&gt;ebus_intmap[i].cinterrupt;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init fill_ebus_child(int node, struct linux_prom_registers *preg,</div><div class='del'>-			    struct linux_ebus_child *dev, int non_standard_regs)</div><div class='del'>-{</div><div class='del'>-	int regs[PROMREG_MAX];</div><div class='del'>-	int irqs[PROMREG_MAX];</div><div class='add'>+	struct of_device *op;</div><div class='add'>+	int *regs;</div><div class='ctx'> 	int i, len;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;prom_node = node;</div><div class='del'>-	prom_getstring(node, "name", dev-&gt;prom_name, sizeof(dev-&gt;prom_name));</div><div class='del'>-	printk(" (%s)", dev-&gt;prom_name);</div><div class='add'>+	dev-&gt;prom_node = dp;</div><div class='add'>+	printk(" (%s)", dp-&gt;name);</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(node, "reg", (void *)regs, sizeof(regs));</div><div class='del'>-	dev-&gt;num_addrs = len / sizeof(regs[0]);</div><div class='add'>+	regs = of_get_property(dp, "reg", &amp;len);</div><div class='add'>+	if (!regs)</div><div class='add'>+		dev-&gt;num_addrs = 0;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;num_addrs = len / sizeof(regs[0]);</div><div class='ctx'> </div><div class='ctx'> 	if (non_standard_regs) {</div><div class='ctx'> 		/* This is to handle reg properties which are not</div><div class='hunk'>@@ -370,30 +312,34 @@ void __init fill_ebus_child(int node, struct linux_prom_registers *preg,</div><div class='ctx'> 			int rnum = regs[i];</div><div class='ctx'> 			if (rnum &gt;= dev-&gt;parent-&gt;num_addrs) {</div><div class='ctx'> 				prom_printf("UGH: property for %s was %d, need &lt; %d\n",</div><div class='del'>-					    dev-&gt;prom_name, len, dev-&gt;parent-&gt;num_addrs);</div><div class='del'>-				panic(__FUNCTION__);</div><div class='add'>+					    dp-&gt;name, len, dev-&gt;parent-&gt;num_addrs);</div><div class='add'>+				prom_halt();</div><div class='ctx'> 			}</div><div class='ctx'> 			dev-&gt;resource[i].start = dev-&gt;parent-&gt;resource[i].start;</div><div class='ctx'> 			dev-&gt;resource[i].end = dev-&gt;parent-&gt;resource[i].end;</div><div class='ctx'> 			dev-&gt;resource[i].flags = IORESOURCE_MEM;</div><div class='del'>-			dev-&gt;resource[i].name = dev-&gt;prom_name;</div><div class='add'>+			dev-&gt;resource[i].name = dp-&gt;name;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; PROMINTR_MAX; i++)</div><div class='del'>-		dev-&gt;irqs[i] = PCI_IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	len = prom_getproperty(node, "interrupts", (char *)&amp;irqs, sizeof(irqs));</div><div class='del'>-	if ((len == -1) || (len == 0)) {</div><div class='add'>+	op = of_find_device_by_node(dp);</div><div class='add'>+	if (!op) {</div><div class='ctx'> 		dev-&gt;num_irqs = 0;</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;num_irqs = op-&gt;num_irqs;</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;num_irqs; i++)</div><div class='add'>+			dev-&gt;irqs[i] = op-&gt;irqs[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;num_irqs) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Oh, well, some PROMs don't export interrupts</div><div class='ctx'> 		 * property to children of EBus devices...</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Be smart about PS/2 keyboard and mouse.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!strcmp(dev-&gt;parent-&gt;prom_name, "8042")) {</div><div class='del'>-			if (!strcmp(dev-&gt;prom_name, "kb_ps2")) {</div><div class='add'>+		if (!strcmp(dev-&gt;parent-&gt;prom_node-&gt;name, "8042")) {</div><div class='add'>+			if (!strcmp(dev-&gt;prom_node-&gt;name, "kb_ps2")) {</div><div class='ctx'> 				dev-&gt;num_irqs = 1;</div><div class='ctx'> 				dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[0];</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -401,103 +347,57 @@ void __init fill_ebus_child(int node, struct linux_prom_registers *preg,</div><div class='ctx'> 				dev-&gt;irqs[0] = dev-&gt;parent-&gt;irqs[1];</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;num_irqs = len / sizeof(irqs[0]);</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_irqs; i++) {</div><div class='del'>-			struct pci_pbm_info *pbm = dev-&gt;bus-&gt;parent;</div><div class='del'>-			struct pci_controller_info *p = pbm-&gt;parent;</div><div class='del'>-</div><div class='del'>-			if (ebus_intmap_match(dev-&gt;bus, preg, &amp;irqs[i]) != -1) {</div><div class='del'>-				dev-&gt;irqs[i] = p-&gt;irq_build(pbm,</div><div class='del'>-							    dev-&gt;bus-&gt;self,</div><div class='del'>-							    irqs[i]);</div><div class='del'>-			} else {</div><div class='del'>-				/* If we get a bogus interrupt property, just</div><div class='del'>-				 * record the raw value instead of punting.</div><div class='del'>-				 */</div><div class='del'>-				dev-&gt;irqs[i] = irqs[i];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init child_regs_nonstandard(struct linux_ebus_device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (!strcmp(dev-&gt;prom_name, "i2c") ||</div><div class='del'>-	    !strcmp(dev-&gt;prom_name, "SUNW,lombus"))</div><div class='add'>+	if (!strcmp(dev-&gt;prom_node-&gt;name, "i2c") ||</div><div class='add'>+	    !strcmp(dev-&gt;prom_node-&gt;name, "SUNW,lombus"))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init fill_ebus_device(int node, struct linux_ebus_device *dev)</div><div class='add'>+static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers regs[PROMREG_MAX];</div><div class='ctx'> 	struct linux_ebus_child *child;</div><div class='del'>-	int irqs[PROMINTR_MAX];</div><div class='del'>-	int i, n, len;</div><div class='add'>+	struct of_device *op;</div><div class='add'>+	int i, len;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;prom_node = node;</div><div class='del'>-	prom_getstring(node, "name", dev-&gt;prom_name, sizeof(dev-&gt;prom_name));</div><div class='del'>-	printk(" [%s", dev-&gt;prom_name);</div><div class='add'>+	dev-&gt;prom_node = dp;</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(node, "reg", (void *)regs, sizeof(regs));</div><div class='del'>-	if (len == -1) {</div><div class='add'>+	printk(" [%s", dp-&gt;name);</div><div class='add'>+</div><div class='add'>+	op = of_find_device_by_node(dp);</div><div class='add'>+	if (!op) {</div><div class='ctx'> 		dev-&gt;num_addrs = 0;</div><div class='del'>-		goto probe_interrupts;</div><div class='del'>-	}</div><div class='add'>+		dev-&gt;num_irqs = 0;</div><div class='add'>+	} else {</div><div class='add'>+		(void) of_get_property(dp, "reg", &amp;len);</div><div class='add'>+		dev-&gt;num_addrs = len / sizeof(struct linux_prom_registers);</div><div class='ctx'> </div><div class='del'>-	if (len % sizeof(struct linux_prom_registers)) {</div><div class='del'>-		prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",</div><div class='del'>-			    dev-&gt;prom_name, len,</div><div class='del'>-			    (int)sizeof(struct linux_prom_registers));</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;num_addrs = len / sizeof(struct linux_prom_registers);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;num_addrs; i++) {</div><div class='del'>-		/* XXX Learn how to interpret ebus ranges... -DaveM */</div><div class='del'>-		if (regs[i].which_io &gt;= 0x10)</div><div class='del'>-			n = (regs[i].which_io - 0x10) &gt;&gt; 2;</div><div class='del'>-		else</div><div class='del'>-			n = regs[i].which_io;</div><div class='del'>-</div><div class='del'>-		dev-&gt;resource[i].start  = dev-&gt;bus-&gt;self-&gt;resource[n].start;</div><div class='del'>-		dev-&gt;resource[i].start += (unsigned long)regs[i].phys_addr;</div><div class='del'>-		dev-&gt;resource[i].end    =</div><div class='del'>-			(dev-&gt;resource[i].start + (unsigned long)regs[i].reg_size - 1UL);</div><div class='del'>-		dev-&gt;resource[i].flags  = IORESOURCE_MEM;</div><div class='del'>-		dev-&gt;resource[i].name   = dev-&gt;prom_name;</div><div class='del'>-		request_resource(&amp;dev-&gt;bus-&gt;self-&gt;resource[n],</div><div class='del'>-				 &amp;dev-&gt;resource[i]);</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;num_addrs; i++)</div><div class='add'>+			memcpy(&amp;dev-&gt;resource[i],</div><div class='add'>+			       &amp;op-&gt;resource[i],</div><div class='add'>+			       sizeof(struct resource));</div><div class='add'>+</div><div class='add'>+		dev-&gt;num_irqs = op-&gt;num_irqs;</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;num_irqs; i++)</div><div class='add'>+			dev-&gt;irqs[i] = op-&gt;irqs[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-probe_interrupts:</div><div class='del'>-	for (i = 0; i &lt; PROMINTR_MAX; i++)</div><div class='del'>-		dev-&gt;irqs[i] = PCI_IRQ_NONE;</div><div class='add'>+	dev-&gt;ofdev.node = dp;</div><div class='add'>+	dev-&gt;ofdev.dev.parent = &amp;dev-&gt;bus-&gt;ofdev.dev;</div><div class='add'>+	dev-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='add'>+	strcpy(dev-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(node, "interrupts", (char *)&amp;irqs, sizeof(irqs));</div><div class='del'>-	if ((len == -1) || (len == 0)) {</div><div class='del'>-		dev-&gt;num_irqs = 0;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;num_irqs = len / sizeof(irqs[0]);</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;num_irqs; i++) {</div><div class='del'>-			struct pci_pbm_info *pbm = dev-&gt;bus-&gt;parent;</div><div class='del'>-			struct pci_controller_info *p = pbm-&gt;parent;</div><div class='del'>-</div><div class='del'>-			if (ebus_intmap_match(dev-&gt;bus, &amp;regs[0], &amp;irqs[i]) != -1) {</div><div class='del'>-				dev-&gt;irqs[i] = p-&gt;irq_build(pbm,</div><div class='del'>-							    dev-&gt;bus-&gt;self,</div><div class='del'>-							    irqs[i]);</div><div class='del'>-			} else {</div><div class='del'>-				/* If we get a bogus interrupt property, just</div><div class='del'>-				 * record the raw value instead of punting.</div><div class='del'>-				 */</div><div class='del'>-				dev-&gt;irqs[i] = irqs[i];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Register with core */</div><div class='add'>+	if (of_device_register(&amp;dev-&gt;ofdev) != 0)</div><div class='add'>+		printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='add'>+		       dev-&gt;ofdev.dev.bus_id);</div><div class='ctx'> </div><div class='del'>-	if ((node = prom_getchild(node))) {</div><div class='add'>+	dp = dp-&gt;child;</div><div class='add'>+	if (dp) {</div><div class='ctx'> 		printk(" -&gt;");</div><div class='ctx'> 		dev-&gt;children = ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='ctx'> </div><div class='hunk'>@@ -505,18 +405,18 @@ probe_interrupts:</div><div class='ctx'> 		child-&gt;next = NULL;</div><div class='ctx'> 		child-&gt;parent = dev;</div><div class='ctx'> 		child-&gt;bus = dev-&gt;bus;</div><div class='del'>-		fill_ebus_child(node, &amp;regs[0],</div><div class='del'>-				child, child_regs_nonstandard(dev));</div><div class='add'>+		fill_ebus_child(dp, child,</div><div class='add'>+				child_regs_nonstandard(dev));</div><div class='ctx'> </div><div class='del'>-		while ((node = prom_getsibling(node)) != 0) {</div><div class='add'>+		while ((dp = dp-&gt;sibling) != NULL) {</div><div class='ctx'> 			child-&gt;next = ebus_alloc(sizeof(struct linux_ebus_child));</div><div class='ctx'> </div><div class='ctx'> 			child = child-&gt;next;</div><div class='ctx'> 			child-&gt;next = NULL;</div><div class='ctx'> 			child-&gt;parent = dev;</div><div class='ctx'> 			child-&gt;bus = dev-&gt;bus;</div><div class='del'>-			fill_ebus_child(node, &amp;regs[0],</div><div class='del'>-					child, child_regs_nonstandard(dev));</div><div class='add'>+			fill_ebus_child(dp, child,</div><div class='add'>+					child_regs_nonstandard(dev));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("]");</div><div class='hunk'>@@ -543,7 +443,8 @@ void __init ebus_init(void)</div><div class='ctx'> 	struct linux_ebus *ebus;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	struct pcidev_cookie *cookie;</div><div class='del'>-	int nd, ebusnd, is_rio;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int is_rio;</div><div class='ctx'> 	int num_ebus = 0;</div><div class='ctx'> </div><div class='ctx'> 	pdev = find_next_ebus(NULL, &amp;is_rio);</div><div class='hunk'>@@ -553,20 +454,22 @@ void __init ebus_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cookie = pdev-&gt;sysdata;</div><div class='del'>-	ebusnd = cookie-&gt;prom_node;</div><div class='add'>+	dp = cookie-&gt;prom_node;</div><div class='ctx'> </div><div class='ctx'> 	ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus));</div><div class='ctx'> 	ebus-&gt;next = NULL;</div><div class='ctx'> 	ebus-&gt;is_rio = is_rio;</div><div class='ctx'> </div><div class='del'>-	while (ebusnd) {</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct device_node *child;</div><div class='add'>+</div><div class='ctx'> 		/* SUNW,pci-qfe uses four empty ebuses on it.</div><div class='ctx'> 		   I think we should not consider them here,</div><div class='ctx'> 		   as they have half of the properties this</div><div class='ctx'> 		   code expects and once we do PCI hot-plug,</div><div class='ctx'> 		   we'd have to tweak with the ebus_chain</div><div class='ctx'> 		   in the runtime after initialization. -jj */</div><div class='del'>-		if (!prom_getchild (ebusnd)) {</div><div class='add'>+		if (!dp-&gt;child) {</div><div class='ctx'> 			pdev = find_next_ebus(pdev, &amp;is_rio);</div><div class='ctx'> 			if (!pdev) {</div><div class='ctx'> 				if (ebus == ebus_chain) {</div><div class='hunk'>@@ -578,22 +481,29 @@ void __init ebus_init(void)</div><div class='ctx'> 			}</div><div class='ctx'> 			ebus-&gt;is_rio = is_rio;</div><div class='ctx'> 			cookie = pdev-&gt;sysdata;</div><div class='del'>-			ebusnd = cookie-&gt;prom_node;</div><div class='add'>+			dp = cookie-&gt;prom_node;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk("ebus%d:", num_ebus);</div><div class='ctx'> </div><div class='del'>-		prom_getstring(ebusnd, "name", ebus-&gt;prom_name, sizeof(ebus-&gt;prom_name));</div><div class='ctx'> 		ebus-&gt;index = num_ebus;</div><div class='del'>-		ebus-&gt;prom_node = ebusnd;</div><div class='add'>+		ebus-&gt;prom_node = dp;</div><div class='ctx'> 		ebus-&gt;self = pdev;</div><div class='ctx'> 		ebus-&gt;parent = pbm = cookie-&gt;pbm;</div><div class='ctx'> </div><div class='del'>-		ebus_ranges_init(ebus);</div><div class='del'>-		ebus_intmap_init(ebus);</div><div class='add'>+		ebus-&gt;ofdev.node = dp;</div><div class='add'>+		ebus-&gt;ofdev.dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+		ebus-&gt;ofdev.dev.bus = &amp;ebus_bus_type;</div><div class='add'>+		strcpy(ebus-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+		/* Register with core */</div><div class='add'>+		if (of_device_register(&amp;ebus-&gt;ofdev) != 0)</div><div class='add'>+			printk(KERN_DEBUG "ebus: device registration error for %s!\n",</div><div class='add'>+			       ebus-&gt;ofdev.dev.bus_id);</div><div class='ctx'> </div><div class='del'>-		nd = prom_getchild(ebusnd);</div><div class='del'>-		if (!nd)</div><div class='add'>+</div><div class='add'>+		child = dp-&gt;child;</div><div class='add'>+		if (!child)</div><div class='ctx'> 			goto next_ebus;</div><div class='ctx'> </div><div class='ctx'> 		ebus-&gt;devices = ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='hunk'>@@ -602,16 +512,16 @@ void __init ebus_init(void)</div><div class='ctx'> 		dev-&gt;next = NULL;</div><div class='ctx'> 		dev-&gt;children = NULL;</div><div class='ctx'> 		dev-&gt;bus = ebus;</div><div class='del'>-		fill_ebus_device(nd, dev);</div><div class='add'>+		fill_ebus_device(child, dev);</div><div class='ctx'> </div><div class='del'>-		while ((nd = prom_getsibling(nd)) != 0) {</div><div class='add'>+		while ((child = child-&gt;sibling) != NULL) {</div><div class='ctx'> 			dev-&gt;next = ebus_alloc(sizeof(struct linux_ebus_device));</div><div class='ctx'> </div><div class='ctx'> 			dev = dev-&gt;next;</div><div class='ctx'> 			dev-&gt;next = NULL;</div><div class='ctx'> 			dev-&gt;children = NULL;</div><div class='ctx'> 			dev-&gt;bus = ebus;</div><div class='del'>-			fill_ebus_device(nd, dev);</div><div class='add'>+			fill_ebus_device(child, dev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	next_ebus:</div><div class='hunk'>@@ -622,7 +532,7 @@ void __init ebus_init(void)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		cookie = pdev-&gt;sysdata;</div><div class='del'>-		ebusnd = cookie-&gt;prom_node;</div><div class='add'>+		dp = cookie-&gt;prom_node;</div><div class='ctx'> </div><div class='ctx'> 		ebus-&gt;next = ebus_alloc(sizeof(struct linux_ebus));</div><div class='ctx'> 		ebus = ebus-&gt;next;</div><div class='hunk'>@@ -631,8 +541,4 @@ void __init ebus_init(void)</div><div class='ctx'> 		++num_ebus;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN_AUXIO</div><div class='del'>-	auxio_probe();</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S<br/>index 6d0b3ed77a02..0aaa35fc5a9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/entry.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1996,98,99 Jakub Jelinek  (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='hunk'>@@ -22,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/estate.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/sfafsr.h&gt;</div><div class='add'>+#include &lt;asm/pil.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define curptr      g6</div><div class='ctx'> </div><div class='hunk'>@@ -431,20 +431,16 @@ do_ivec:</div><div class='ctx'> 	membar		#Sync</div><div class='ctx'> </div><div class='ctx'> 	sethi		%hi(ivector_table), %g2</div><div class='del'>-	sllx		%g3, 5, %g3</div><div class='add'>+	sllx		%g3, 3, %g3</div><div class='ctx'> 	or		%g2, %lo(ivector_table), %g2</div><div class='ctx'> 	add		%g2, %g3, %g3</div><div class='del'>-	ldub		[%g3 + 0x04], %g4	/* pil */</div><div class='del'>-	mov		1, %g2</div><div class='del'>-	sllx		%g2, %g4, %g2</div><div class='del'>-	sllx		%g4, 2, %g4</div><div class='ctx'> </div><div class='ctx'> 	TRAP_LOAD_IRQ_WORK(%g6, %g1)</div><div class='ctx'> </div><div class='del'>-	lduw		[%g6 + %g4], %g5	/* g5 = irq_work(cpu, pil) */</div><div class='add'>+	lduw		[%g6], %g5		/* g5 = irq_work(cpu) */</div><div class='ctx'> 	stw		%g5, [%g3 + 0x00]	/* bucket-&gt;irq_chain = g5 */</div><div class='del'>-	stw		%g3, [%g6 + %g4]	/* irq_work(cpu, pil) = bucket */</div><div class='del'>-	wr		%g2, 0x0, %set_softint</div><div class='add'>+	stw		%g3, [%g6]		/* irq_work(cpu) = bucket */</div><div class='add'>+	wr		%g0, 1 &lt;&lt; PIL_DEVICE_IRQ, %set_softint</div><div class='ctx'> 	retry</div><div class='ctx'> do_ivec_xcall:</div><div class='ctx'> 	mov		0x50, %g1</div><div class='head'>diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S<br/>index 149383835c25..4b2bf9eb447a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/etrap.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/etrap.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/etrap.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/etrap.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S<br/>index 31c5892f5acc..c8e9dc9d68a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/head.S</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -552,9 +551,10 @@ setup_trap_table:</div><div class='ctx'> 	save	%sp, -192, %sp</div><div class='ctx'> </div><div class='ctx'> 	/* Force interrupts to be disabled. */</div><div class='del'>-	rdpr	%pstate, %o1</div><div class='del'>-	andn	%o1, PSTATE_IE, %o1</div><div class='add'>+	rdpr	%pstate, %l0</div><div class='add'>+	andn	%l0, PSTATE_IE, %o1</div><div class='ctx'> 	wrpr	%o1, 0x0, %pstate</div><div class='add'>+	rdpr	%pil, %l1</div><div class='ctx'> 	wrpr	%g0, 15, %pil</div><div class='ctx'> </div><div class='ctx'> 	/* Make the firmware call to jump over to the Linux trap table.  */</div><div class='hunk'>@@ -623,11 +623,9 @@ setup_trap_table:</div><div class='ctx'> 	call	init_irqwork_curcpu</div><div class='ctx'> 	 nop</div><div class='ctx'> </div><div class='del'>-	/* Now we can turn interrupts back on. */</div><div class='del'>-	rdpr	%pstate, %o1</div><div class='del'>-	or	%o1, PSTATE_IE, %o1</div><div class='del'>-	wrpr	%o1, 0, %pstate</div><div class='del'>-	wrpr	%g0, 0x0, %pil</div><div class='add'>+	/* Now we can restore interrupt state. */</div><div class='add'>+	wrpr	%l0, 0, %pstate</div><div class='add'>+	wrpr	%l1, 0x0, %pil</div><div class='ctx'> </div><div class='ctx'> 	ret</div><div class='ctx'> 	 restore</div><div class='head'>diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c<br/>index 11e645c9ec50..4e64724cb9ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/irq.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1998  Jakub Jelinek    (jj@ultra.linux.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -22,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='hunk'>@@ -42,10 +43,6 @@</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static void distribute_irqs(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* UPA nodes send interrupt packet to UltraSparc with first data reg</div><div class='ctx'>  * value low 5 (7 on Starfire) bits holding the IRQ identifier being</div><div class='ctx'>  * delivered.  We must translate this into a non-vector IRQ so we can</div><div class='hunk'>@@ -57,10 +54,29 @@ static void distribute_irqs(void);</div><div class='ctx'>  * The IVEC handler does not need to act atomically, the PIL dispatch</div><div class='ctx'>  * code uses CAS to get an atomic snapshot of the list and clear it</div><div class='ctx'>  * at the same time.</div><div class='add'>+ *</div><div class='add'>+ * If you make changes to ino_bucket, please update hand coded assembler</div><div class='add'>+ * of the vectored interrupt trap handler(s) in entry.S and sun4v_ivec.S</div><div class='ctx'>  */</div><div class='add'>+struct ino_bucket {</div><div class='add'>+	/* Next handler in per-CPU IRQ worklist.  We know that</div><div class='add'>+	 * bucket pointers have the high 32-bits clear, so to</div><div class='add'>+	 * save space we only store the bits we need.</div><div class='add'>+	 */</div><div class='add'>+/*0x00*/unsigned int irq_chain;</div><div class='ctx'> </div><div class='add'>+	/* Virtual interrupt number assigned to this INO.  */</div><div class='add'>+/*0x04*/unsigned int virt_irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_IVECS	(IMAP_INR + 1)</div><div class='ctx'> struct ino_bucket ivector_table[NUM_IVECS] __attribute__ ((aligned (SMP_CACHE_BYTES)));</div><div class='ctx'> </div><div class='add'>+#define __irq_ino(irq) \</div><div class='add'>+        (((struct ino_bucket *)(unsigned long)(irq)) - &amp;ivector_table[0])</div><div class='add'>+#define __bucket(irq) ((struct ino_bucket *)(unsigned long)(irq))</div><div class='add'>+#define __irq(bucket) ((unsigned int)(unsigned long)(bucket))</div><div class='add'>+</div><div class='ctx'> /* This has to be in the main kernel image, it cannot be</div><div class='ctx'>  * turned into per-cpu data.  The reason is that the main</div><div class='ctx'>  * kernel image is locked into the TLB and this structure</div><div class='hunk'>@@ -68,71 +84,82 @@ struct ino_bucket ivector_table[NUM_IVECS] __attribute__ ((aligned (SMP_CACHE_BY</div><div class='ctx'>  * access to this structure takes a TLB miss it could cause</div><div class='ctx'>  * the 5-level sparc v9 trap stack to overflow.</div><div class='ctx'>  */</div><div class='del'>-struct irq_work_struct {</div><div class='del'>-	unsigned int	irq_worklists[16];</div><div class='del'>-};</div><div class='del'>-struct irq_work_struct __irq_work[NR_CPUS];</div><div class='del'>-#define irq_work(__cpu, __pil)	&amp;(__irq_work[(__cpu)].irq_worklists[(__pil)])</div><div class='add'>+#define irq_work(__cpu)	&amp;(trap_block[(__cpu)].irq_worklist)</div><div class='ctx'> </div><div class='del'>-static struct irqaction *irq_action[NR_IRQS+1];</div><div class='add'>+static unsigned int virt_to_real_irq_table[NR_IRQS];</div><div class='add'>+static unsigned char virt_irq_cur = 1;</div><div class='ctx'> </div><div class='del'>-/* This only synchronizes entities which modify IRQ handler</div><div class='del'>- * state and some selected user-level spots that want to</div><div class='del'>- * read things in the table.  IRQ handler processing orders</div><div class='del'>- * its' accesses such that no locking is needed.</div><div class='del'>- */</div><div class='del'>-static DEFINE_SPINLOCK(irq_action_lock);</div><div class='add'>+static unsigned char virt_irq_alloc(unsigned int real_irq)</div><div class='add'>+{</div><div class='add'>+	unsigned char ent;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(NR_IRQS &gt;= 256);</div><div class='add'>+</div><div class='add'>+	ent = virt_irq_cur;</div><div class='add'>+	if (ent &gt;= NR_IRQS) {</div><div class='add'>+		printk(KERN_ERR "IRQ: Out of virtual IRQs.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	virt_irq_cur = ent + 1;</div><div class='add'>+	virt_to_real_irq_table[ent] = real_irq;</div><div class='ctx'> </div><div class='del'>-static void register_irq_proc (unsigned int irq);</div><div class='add'>+	return ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0 /* Currently unused. */</div><div class='add'>+static unsigned char real_to_virt_irq(unsigned int real_irq)</div><div class='add'>+{</div><div class='add'>+	struct ino_bucket *bucket = __bucket(real_irq);</div><div class='add'>+</div><div class='add'>+	return bucket-&gt;virt_irq;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static unsigned int virt_to_real_irq(unsigned char virt_irq)</div><div class='add'>+{</div><div class='add'>+	return virt_to_real_irq_table[virt_irq];</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Upper 2b of irqaction-&gt;flags holds the ino.</div><div class='del'>- * irqaction-&gt;mask holds the smp affinity information.</div><div class='add'>+ * /proc/interrupts printing:</div><div class='ctx'>  */</div><div class='del'>-#define put_ino_in_irqaction(action, irq) \</div><div class='del'>-	action-&gt;flags &amp;= 0xffffffffffffUL; \</div><div class='del'>-	if (__bucket(irq) == &amp;pil0_dummy_bucket) \</div><div class='del'>-		action-&gt;flags |= 0xdeadUL &lt;&lt; 48;  \</div><div class='del'>-	else \</div><div class='del'>-		action-&gt;flags |= __irq_ino(irq) &lt;&lt; 48;</div><div class='del'>-#define get_ino_in_irqaction(action)	(action-&gt;flags &gt;&gt; 48)</div><div class='del'>-</div><div class='del'>-#define put_smpaff_in_irqaction(action, smpaff)	(action)-&gt;mask = (smpaff)</div><div class='del'>-#define get_smpaff_in_irqaction(action) 	((action)-&gt;mask)</div><div class='ctx'> </div><div class='ctx'> int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> {</div><div class='add'>+	int i = *(loff_t *) v, j;</div><div class='add'>+	struct irqaction * action;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int i = *(loff_t *) v;</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	int j;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;irq_action_lock, flags);</div><div class='del'>-	if (i &lt;= NR_IRQS) {</div><div class='del'>-		if (!(action = *(i + irq_action)))</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		seq_printf(p, "%3d: ", i);</div><div class='add'>+	if (i == 0) {</div><div class='add'>+		seq_printf(p, "           ");</div><div class='add'>+		for_each_online_cpu(j)</div><div class='add'>+			seq_printf(p, "CPU%d       ",j);</div><div class='add'>+		seq_putc(p, '\n');</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &lt; NR_IRQS) {</div><div class='add'>+		spin_lock_irqsave(&amp;irq_desc[i].lock, flags);</div><div class='add'>+		action = irq_desc[i].action;</div><div class='add'>+		if (!action)</div><div class='add'>+			goto skip;</div><div class='add'>+		seq_printf(p, "%3d: ",i);</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='ctx'> 		seq_printf(p, "%10u ", kstat_irqs(i));</div><div class='ctx'> #else</div><div class='del'>-		for_each_online_cpu(j) {</div><div class='del'>-			seq_printf(p, "%10u ",</div><div class='del'>-				   kstat_cpu(j).irqs[i]);</div><div class='del'>-		}</div><div class='add'>+		for_each_online_cpu(j)</div><div class='add'>+			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %s:%lx", action-&gt;name,</div><div class='del'>-			   get_ino_in_irqaction(action));</div><div class='del'>-		for (action = action-&gt;next; action; action = action-&gt;next) {</div><div class='del'>-			seq_printf(p, ", %s:%lx", action-&gt;name,</div><div class='del'>-				   get_ino_in_irqaction(action));</div><div class='del'>-		}</div><div class='add'>+		seq_printf(p, " %9s", irq_desc[i].chip-&gt;typename);</div><div class='add'>+		seq_printf(p, "  %s", action-&gt;name);</div><div class='add'>+</div><div class='add'>+		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='add'>+			seq_printf(p, ", %s", action-&gt;name);</div><div class='add'>+</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='add'>+skip:</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_desc[i].lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-out_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -173,694 +200,371 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid)</div><div class='ctx'> 	return tid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Now these are always passed a true fully specified sun4u INO. */</div><div class='del'>-void enable_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bucket = __bucket(irq);</div><div class='del'>-	unsigned long imap, cpuid;</div><div class='del'>-</div><div class='del'>-	imap = bucket-&gt;imap;</div><div class='del'>-	if (imap == 0UL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	preempt_disable();</div><div class='add'>+struct irq_handler_data {</div><div class='add'>+	unsigned long	iclr;</div><div class='add'>+	unsigned long	imap;</div><div class='ctx'> </div><div class='del'>-	/* This gets the physical processor ID, even on uniprocessor,</div><div class='del'>-	 * so we can always program the interrupt target correctly.</div><div class='del'>-	 */</div><div class='del'>-	cpuid = real_hard_smp_processor_id();</div><div class='del'>-</div><div class='del'>-	if (tlb_type == hypervisor) {</div><div class='del'>-		unsigned int ino = __irq_ino(irq);</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		err = sun4v_intr_settarget(ino, cpuid);</div><div class='del'>-		if (err != HV_EOK)</div><div class='del'>-			printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",</div><div class='del'>-			       ino, cpuid, err);</div><div class='del'>-		err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);</div><div class='del'>-		if (err != HV_EOK)</div><div class='del'>-			printk("sun4v_intr_setenabled(%x): err(%d)\n",</div><div class='del'>-			       ino, err);</div><div class='del'>-	} else {</div><div class='del'>-		unsigned int tid = sun4u_compute_tid(imap, cpuid);</div><div class='del'>-</div><div class='del'>-		/* NOTE NOTE NOTE, IGN and INO are read-only, IGN is a product</div><div class='del'>-		 * of this SYSIO's preconfigured IGN in the SYSIO Control</div><div class='del'>-		 * Register, the hardware just mirrors that value here.</div><div class='del'>-		 * However for Graphics and UPA Slave devices the full</div><div class='del'>-		 * IMAP_INR field can be set by the programmer here.</div><div class='del'>-		 *</div><div class='del'>-		 * Things like FFB can now be handled via the new IRQ</div><div class='del'>-		 * mechanism.</div><div class='del'>-		 */</div><div class='del'>-		upa_writel(tid | IMAP_VALID, imap);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	preempt_enable();</div><div class='del'>-}</div><div class='add'>+	void		(*pre_handler)(unsigned int, void *, void *);</div><div class='add'>+	void		*pre_handler_arg1;</div><div class='add'>+	void		*pre_handler_arg2;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* This now gets passed true ino's as well. */</div><div class='del'>-void disable_irq(unsigned int irq)</div><div class='add'>+static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct ino_bucket *bucket = __bucket(irq);</div><div class='del'>-	unsigned long imap;</div><div class='del'>-</div><div class='del'>-	imap = bucket-&gt;imap;</div><div class='del'>-	if (imap != 0UL) {</div><div class='del'>-		if (tlb_type == hypervisor) {</div><div class='del'>-			unsigned int ino = __irq_ino(irq);</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			err = sun4v_intr_setenabled(ino, HV_INTR_DISABLED);</div><div class='del'>-			if (err != HV_EOK)</div><div class='del'>-				printk("sun4v_intr_setenabled(%x): "</div><div class='del'>-				       "err(%d)\n", ino, err);</div><div class='del'>-		} else {</div><div class='del'>-			u32 tmp;</div><div class='del'>-</div><div class='del'>-			/* NOTE: We do not want to futz with the IRQ clear registers</div><div class='del'>-			 *       and move the state to IDLE, the SCSI code does call</div><div class='del'>-			 *       disable_irq() to assure atomicity in the queue cmd</div><div class='del'>-			 *       SCSI adapter driver code.  Thus we'd lose interrupts.</div><div class='del'>-			 */</div><div class='del'>-			tmp = upa_readl(imap);</div><div class='del'>-			tmp &amp;= ~IMAP_VALID;</div><div class='del'>-			upa_writel(tmp, imap);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	unsigned int real_irq = virt_to_real_irq(virt_irq);</div><div class='add'>+	struct ino_bucket *bucket = NULL;</div><div class='ctx'> </div><div class='del'>-/* The timer is the one "weird" interrupt which is generated by</div><div class='del'>- * the CPU %tick register and not by some normal vectored interrupt</div><div class='del'>- * source.  To handle this special case, we use this dummy INO bucket.</div><div class='del'>- */</div><div class='del'>-static struct irq_desc pil0_dummy_desc;</div><div class='del'>-static struct ino_bucket pil0_dummy_bucket = {</div><div class='del'>-	.irq_info	=	&amp;pil0_dummy_desc,</div><div class='del'>-};</div><div class='add'>+	if (likely(real_irq))</div><div class='add'>+		bucket = __bucket(real_irq);</div><div class='ctx'> </div><div class='del'>-static void build_irq_error(const char *msg, unsigned int ino, int pil, int inofixup,</div><div class='del'>-			    unsigned long iclr, unsigned long imap,</div><div class='del'>-			    struct ino_bucket *bucket)</div><div class='del'>-{</div><div class='del'>-	prom_printf("IRQ: INO %04x (%d:%016lx:%016lx) --&gt; "</div><div class='del'>-		    "(%d:%d:%016lx:%016lx), halting...\n",</div><div class='del'>-		    ino, bucket-&gt;pil, bucket-&gt;iclr, bucket-&gt;imap,</div><div class='del'>-		    pil, inofixup, iclr, imap);</div><div class='del'>-	prom_halt();</div><div class='add'>+	return bucket;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned int build_irq(int pil, int inofixup, unsigned long iclr, unsigned long imap)</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+static int irq_choose_cpu(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	int ino;</div><div class='add'>+	cpumask_t mask = irq_desc[virt_irq].affinity;</div><div class='add'>+	int cpuid;</div><div class='ctx'> </div><div class='del'>-	if (pil == 0) {</div><div class='del'>-		if (iclr != 0UL || imap != 0UL) {</div><div class='del'>-			prom_printf("Invalid dummy bucket for PIL0 (%lx:%lx)\n",</div><div class='del'>-				    iclr, imap);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		return __irq(&amp;pil0_dummy_bucket);</div><div class='del'>-	}</div><div class='add'>+	if (cpus_equal(mask, CPU_MASK_ALL)) {</div><div class='add'>+		static int irq_rover;</div><div class='add'>+		static DEFINE_SPINLOCK(irq_rover_lock);</div><div class='add'>+		unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(tlb_type == hypervisor);</div><div class='add'>+		/* Round-robin distribution... */</div><div class='add'>+	do_round_robin:</div><div class='add'>+		spin_lock_irqsave(&amp;irq_rover_lock, flags);</div><div class='ctx'> </div><div class='del'>-	/* RULE: Both must be specified in all other cases. */</div><div class='del'>-	if (iclr == 0UL || imap == 0UL) {</div><div class='del'>-		prom_printf("Invalid build_irq %d %d %016lx %016lx\n",</div><div class='del'>-			    pil, inofixup, iclr, imap);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ino = (upa_readl(imap) &amp; (IMAP_IGN | IMAP_INO)) + inofixup;</div><div class='del'>-	if (ino &gt; NUM_IVECS) {</div><div class='del'>-		prom_printf("Invalid INO %04x (%d:%d:%016lx:%016lx)\n",</div><div class='del'>-			    ino, pil, inofixup, iclr, imap);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+		while (!cpu_online(irq_rover)) {</div><div class='add'>+			if (++irq_rover &gt;= NR_CPUS)</div><div class='add'>+				irq_rover = 0;</div><div class='add'>+		}</div><div class='add'>+		cpuid = irq_rover;</div><div class='add'>+		do {</div><div class='add'>+			if (++irq_rover &gt;= NR_CPUS)</div><div class='add'>+				irq_rover = 0;</div><div class='add'>+		} while (!cpu_online(irq_rover));</div><div class='ctx'> </div><div class='del'>-	bucket = &amp;ivector_table[ino];</div><div class='del'>-	if (bucket-&gt;flags &amp; IBF_ACTIVE)</div><div class='del'>-		build_irq_error("IRQ: Trying to build active INO bucket.\n",</div><div class='del'>-				ino, pil, inofixup, iclr, imap, bucket);</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_rover_lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		cpumask_t tmp;</div><div class='ctx'> </div><div class='del'>-	if (bucket-&gt;irq_info) {</div><div class='del'>-		if (bucket-&gt;imap != imap || bucket-&gt;iclr != iclr)</div><div class='del'>-			build_irq_error("IRQ: Trying to reinit INO bucket.\n",</div><div class='del'>-					ino, pil, inofixup, iclr, imap, bucket);</div><div class='add'>+		cpus_and(tmp, cpu_online_map, mask);</div><div class='ctx'> </div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+		if (cpus_empty(tmp))</div><div class='add'>+			goto do_round_robin;</div><div class='ctx'> </div><div class='del'>-	bucket-&gt;irq_info = kzalloc(sizeof(struct irq_desc), GFP_ATOMIC);</div><div class='del'>-	if (!bucket-&gt;irq_info) {</div><div class='del'>-		prom_printf("IRQ: Error, kmalloc(irq_desc) failed.\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+		cpuid = first_cpu(tmp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Ok, looks good, set it up.  Don't touch the irq_chain or</div><div class='del'>-	 * the pending flag.</div><div class='del'>-	 */</div><div class='del'>-	bucket-&gt;imap  = imap;</div><div class='del'>-	bucket-&gt;iclr  = iclr;</div><div class='del'>-	bucket-&gt;pil   = pil;</div><div class='del'>-	bucket-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return __irq(bucket);</div><div class='add'>+	return cpuid;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino, int pil, unsigned char flags)</div><div class='add'>+#else</div><div class='add'>+static int irq_choose_cpu(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	unsigned long sysino;</div><div class='add'>+	return real_hard_smp_processor_id();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	sysino = sun4v_devino_to_sysino(devhandle, devino);</div><div class='add'>+static void sun4u_irq_enable(unsigned int virt_irq)</div><div class='add'>+{</div><div class='add'>+	irq_desc_t *desc = irq_desc + virt_irq;</div><div class='add'>+	struct irq_handler_data *data = desc-&gt;handler_data;</div><div class='ctx'> </div><div class='del'>-	bucket = &amp;ivector_table[sysino];</div><div class='add'>+	if (likely(data)) {</div><div class='add'>+		unsigned long cpuid, imap;</div><div class='add'>+		unsigned int tid;</div><div class='ctx'> </div><div class='del'>-	/* Catch accidental accesses to these things.  IMAP/ICLR handling</div><div class='del'>-	 * is done by hypervisor calls on sun4v platforms, not by direct</div><div class='del'>-	 * register accesses.</div><div class='del'>-	 *</div><div class='del'>-	 * But we need to make them look unique for the disable_irq() logic</div><div class='del'>-	 * in free_irq().</div><div class='del'>-	 */</div><div class='del'>-	bucket-&gt;imap = ~0UL - sysino;</div><div class='del'>-	bucket-&gt;iclr = ~0UL - sysino;</div><div class='add'>+		cpuid = irq_choose_cpu(virt_irq);</div><div class='add'>+		imap = data-&gt;imap;</div><div class='ctx'> </div><div class='del'>-	bucket-&gt;pil = pil;</div><div class='del'>-	bucket-&gt;flags = flags;</div><div class='add'>+		tid = sun4u_compute_tid(imap, cpuid);</div><div class='ctx'> </div><div class='del'>-	bucket-&gt;irq_info = kzalloc(sizeof(struct irq_desc), GFP_ATOMIC);</div><div class='del'>-	if (!bucket-&gt;irq_info) {</div><div class='del'>-		prom_printf("IRQ: Error, kmalloc(irq_desc) failed.\n");</div><div class='del'>-		prom_halt();</div><div class='add'>+		upa_writel(tid | IMAP_VALID, imap);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return __irq(bucket);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atomic_bucket_insert(struct ino_bucket *bucket)</div><div class='add'>+static void sun4u_irq_disable(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	unsigned long pstate;</div><div class='del'>-	unsigned int *ent;</div><div class='add'>+	irq_desc_t *desc = irq_desc + virt_irq;</div><div class='add'>+	struct irq_handler_data *data = desc-&gt;handler_data;</div><div class='ctx'> </div><div class='del'>-	__asm__ __volatile__("rdpr %%pstate, %0" : "=r" (pstate));</div><div class='del'>-	__asm__ __volatile__("wrpr %0, %1, %%pstate"</div><div class='del'>-			     : : "r" (pstate), "i" (PSTATE_IE));</div><div class='del'>-	ent = irq_work(smp_processor_id(), bucket-&gt;pil);</div><div class='del'>-	bucket-&gt;irq_chain = *ent;</div><div class='del'>-	*ent = __irq(bucket);</div><div class='del'>-	__asm__ __volatile__("wrpr %0, 0x0, %%pstate" : : "r" (pstate));</div><div class='del'>-}</div><div class='add'>+	if (likely(data)) {</div><div class='add'>+		unsigned long imap = data-&gt;imap;</div><div class='add'>+		u32 tmp = upa_readl(imap);</div><div class='ctx'> </div><div class='del'>-static int check_irq_sharing(int pil, unsigned long irqflags)</div><div class='del'>-{</div><div class='del'>-	struct irqaction *action, *tmp;</div><div class='del'>-</div><div class='del'>-	action = *(irq_action + pil);</div><div class='del'>-	if (action) {</div><div class='del'>-		if ((action-&gt;flags &amp; SA_SHIRQ) &amp;&amp; (irqflags &amp; SA_SHIRQ)) {</div><div class='del'>-			for (tmp = action; tmp-&gt;next; tmp = tmp-&gt;next)</div><div class='del'>-				;</div><div class='del'>-		} else {</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='add'>+		tmp &amp;= ~IMAP_VALID;</div><div class='add'>+		upa_writel(tmp, imap);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void append_irq_action(int pil, struct irqaction *action)</div><div class='add'>+static void sun4u_irq_end(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct irqaction **pp = irq_action + pil;</div><div class='add'>+	irq_desc_t *desc = irq_desc + virt_irq;</div><div class='add'>+	struct irq_handler_data *data = desc-&gt;handler_data;</div><div class='ctx'> </div><div class='del'>-	while (*pp)</div><div class='del'>-		pp = &amp;((*pp)-&gt;next);</div><div class='del'>-	*pp = action;</div><div class='add'>+	if (likely(data))</div><div class='add'>+		upa_writel(ICLR_IDLE, data-&gt;iclr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct irqaction *get_action_slot(struct ino_bucket *bucket)</div><div class='add'>+static void sun4v_irq_enable(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct irq_desc *desc = bucket-&gt;irq_info;</div><div class='del'>-	int max_irq, i;</div><div class='add'>+	struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);</div><div class='add'>+	unsigned int ino = bucket - &amp;ivector_table[0];</div><div class='ctx'> </div><div class='del'>-	max_irq = 1;</div><div class='del'>-	if (bucket-&gt;flags &amp; IBF_PCI)</div><div class='del'>-		max_irq = MAX_IRQ_DESC_ACTION;</div><div class='del'>-	for (i = 0; i &lt; max_irq; i++) {</div><div class='del'>-		struct irqaction *p = &amp;desc-&gt;action[i];</div><div class='del'>-		u32 mask = (1 &lt;&lt; i);</div><div class='add'>+	if (likely(bucket)) {</div><div class='add'>+		unsigned long cpuid;</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='del'>-		if (desc-&gt;action_active_mask &amp; mask)</div><div class='del'>-			continue;</div><div class='add'>+		cpuid = irq_choose_cpu(virt_irq);</div><div class='ctx'> </div><div class='del'>-		desc-&gt;action_active_mask |= mask;</div><div class='del'>-		return p;</div><div class='add'>+		err = sun4v_intr_settarget(ino, cpuid);</div><div class='add'>+		if (err != HV_EOK)</div><div class='add'>+			printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",</div><div class='add'>+			       ino, cpuid, err);</div><div class='add'>+		err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);</div><div class='add'>+		if (err != HV_EOK)</div><div class='add'>+			printk("sun4v_intr_setenabled(%x): err(%d)\n",</div><div class='add'>+			       ino, err);</div><div class='ctx'> 	}</div><div class='del'>-	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),</div><div class='del'>-		unsigned long irqflags, const char *name, void *dev_id)</div><div class='add'>+static void sun4v_irq_disable(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-	struct ino_bucket *bucket = __bucket(irq);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int pending = 0;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!handler))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (unlikely(!bucket-&gt;irq_info))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if ((bucket != &amp;pil0_dummy_bucket) &amp;&amp; (irqflags &amp; SA_SAMPLE_RANDOM)) {</div><div class='del'>-		/*</div><div class='del'>-	 	 * This function might sleep, we want to call it first,</div><div class='del'>-	 	 * outside of the atomic block. In SA_STATIC_ALLOC case,</div><div class='del'>-		 * random driver's kmalloc will fail, but it is safe.</div><div class='del'>-		 * If already initialized, random driver will not reinit.</div><div class='del'>-	 	 * Yes, this might clear the entropy pool if the wrong</div><div class='del'>-	 	 * driver is attempted to be loaded, without actually</div><div class='del'>-	 	 * installing a new handler, but is this really a problem,</div><div class='del'>-	 	 * only the sysadmin is able to do this.</div><div class='del'>-	 	 */</div><div class='del'>-		rand_initialize_irq(irq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_action_lock, flags);</div><div class='add'>+	struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);</div><div class='add'>+	unsigned int ino = bucket - &amp;ivector_table[0];</div><div class='ctx'> </div><div class='del'>-	if (check_irq_sharing(bucket-&gt;pil, irqflags)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	action = get_action_slot(bucket);</div><div class='del'>-	if (!action) { </div><div class='del'>-		spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bucket-&gt;flags |= IBF_ACTIVE;</div><div class='del'>-	pending = 0;</div><div class='del'>-	if (bucket != &amp;pil0_dummy_bucket) {</div><div class='del'>-		pending = bucket-&gt;pending;</div><div class='del'>-		if (pending)</div><div class='del'>-			bucket-&gt;pending = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	action-&gt;handler = handler;</div><div class='del'>-	action-&gt;flags = irqflags;</div><div class='del'>-	action-&gt;name = name;</div><div class='del'>-	action-&gt;next = NULL;</div><div class='del'>-	action-&gt;dev_id = dev_id;</div><div class='del'>-	put_ino_in_irqaction(action, irq);</div><div class='del'>-	put_smpaff_in_irqaction(action, CPU_MASK_NONE);</div><div class='del'>-</div><div class='del'>-	append_irq_action(bucket-&gt;pil, action);</div><div class='del'>-</div><div class='del'>-	enable_irq(irq);</div><div class='add'>+	if (likely(bucket)) {</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='del'>-	/* We ate the IVEC already, this makes sure it does not get lost. */</div><div class='del'>-	if (pending) {</div><div class='del'>-		atomic_bucket_insert(bucket);</div><div class='del'>-		set_softint(1 &lt;&lt; bucket-&gt;pil);</div><div class='add'>+		err = sun4v_intr_setenabled(ino, HV_INTR_DISABLED);</div><div class='add'>+		if (err != HV_EOK)</div><div class='add'>+			printk("sun4v_intr_setenabled(%x): "</div><div class='add'>+			       "err(%d)\n", ino, err);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (bucket != &amp;pil0_dummy_bucket)</div><div class='del'>-		register_irq_proc(__irq_ino(irq));</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	distribute_irqs();</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(request_irq);</div><div class='del'>-</div><div class='del'>-static struct irqaction *unlink_irq_action(unsigned int irq, void *dev_id)</div><div class='add'>+static void sun4v_irq_end(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct ino_bucket *bucket = __bucket(irq);</div><div class='del'>-	struct irqaction *action, **pp;</div><div class='del'>-</div><div class='del'>-	pp = irq_action + bucket-&gt;pil;</div><div class='del'>-	action = *pp;</div><div class='del'>-	if (unlikely(!action))</div><div class='del'>-		return NULL;</div><div class='add'>+	struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);</div><div class='add'>+	unsigned int ino = bucket - &amp;ivector_table[0];</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!action-&gt;handler)) {</div><div class='del'>-		printk("Freeing free IRQ %d\n", bucket-&gt;pil);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (likely(bucket)) {</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='del'>-	while (action &amp;&amp; action-&gt;dev_id != dev_id) {</div><div class='del'>-		pp = &amp;action-&gt;next;</div><div class='del'>-		action = *pp;</div><div class='add'>+		err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);</div><div class='add'>+		if (err != HV_EOK)</div><div class='add'>+			printk("sun4v_intr_setstate(%x): "</div><div class='add'>+			       "err(%d)\n", ino, err);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (likely(action))</div><div class='del'>-		*pp = action-&gt;next;</div><div class='del'>-</div><div class='del'>-	return action;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void free_irq(unsigned int irq, void *dev_id)</div><div class='add'>+static void run_pre_handler(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	struct irqaction *action;</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_action_lock, flags);</div><div class='del'>-</div><div class='del'>-	action = unlink_irq_action(irq, dev_id);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!action))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	synchronize_irq(irq);</div><div class='add'>+	struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);</div><div class='add'>+	irq_desc_t *desc = irq_desc + virt_irq;</div><div class='add'>+	struct irq_handler_data *data = desc-&gt;handler_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;irq_action_lock, flags);</div><div class='add'>+	if (likely(data-&gt;pre_handler)) {</div><div class='add'>+		data-&gt;pre_handler(__irq_ino(__irq(bucket)),</div><div class='add'>+				  data-&gt;pre_handler_arg1,</div><div class='add'>+				  data-&gt;pre_handler_arg2);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	if (bucket != &amp;pil0_dummy_bucket) {</div><div class='del'>-		struct irq_desc *desc = bucket-&gt;irq_info;</div><div class='del'>-		int ent, i;</div><div class='add'>+static struct hw_interrupt_type sun4u_irq = {</div><div class='add'>+	.typename	= "sun4u",</div><div class='add'>+	.enable		= sun4u_irq_enable,</div><div class='add'>+	.disable	= sun4u_irq_disable,</div><div class='add'>+	.end		= sun4u_irq_end,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; MAX_IRQ_DESC_ACTION; i++) {</div><div class='del'>-			struct irqaction *p = &amp;desc-&gt;action[i];</div><div class='add'>+static struct hw_interrupt_type sun4u_irq_ack = {</div><div class='add'>+	.typename	= "sun4u+ack",</div><div class='add'>+	.enable		= sun4u_irq_enable,</div><div class='add'>+	.disable	= sun4u_irq_disable,</div><div class='add'>+	.ack		= run_pre_handler,</div><div class='add'>+	.end		= sun4u_irq_end,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-			if (p == action) {</div><div class='del'>-				desc-&gt;action_active_mask &amp;= ~(1 &lt;&lt; i);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+static struct hw_interrupt_type sun4v_irq = {</div><div class='add'>+	.typename	= "sun4v",</div><div class='add'>+	.enable		= sun4v_irq_enable,</div><div class='add'>+	.disable	= sun4v_irq_disable,</div><div class='add'>+	.end		= sun4v_irq_end,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (!desc-&gt;action_active_mask) {</div><div class='del'>-			unsigned long imap = bucket-&gt;imap;</div><div class='del'>-</div><div class='del'>-			/* This unique interrupt source is now inactive. */</div><div class='del'>-			bucket-&gt;flags &amp;= ~IBF_ACTIVE;</div><div class='del'>-</div><div class='del'>-			/* See if any other buckets share this bucket's IMAP</div><div class='del'>-			 * and are still active.</div><div class='del'>-			 */</div><div class='del'>-			for (ent = 0; ent &lt; NUM_IVECS; ent++) {</div><div class='del'>-				struct ino_bucket *bp = &amp;ivector_table[ent];</div><div class='del'>-				if (bp != bucket	&amp;&amp;</div><div class='del'>-				    bp-&gt;imap == imap	&amp;&amp;</div><div class='del'>-				    (bp-&gt;flags &amp; IBF_ACTIVE) != 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='add'>+static struct hw_interrupt_type sun4v_irq_ack = {</div><div class='add'>+	.typename	= "sun4v+ack",</div><div class='add'>+	.enable		= sun4v_irq_enable,</div><div class='add'>+	.disable	= sun4v_irq_disable,</div><div class='add'>+	.ack		= run_pre_handler,</div><div class='add'>+	.end		= sun4v_irq_end,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-			/* Only disable when no other sub-irq levels of</div><div class='del'>-			 * the same IMAP are active.</div><div class='del'>-			 */</div><div class='del'>-			if (ent == NUM_IVECS)</div><div class='del'>-				disable_irq(irq);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+void irq_install_pre_handler(int virt_irq,</div><div class='add'>+			     void (*func)(unsigned int, void *, void *),</div><div class='add'>+			     void *arg1, void *arg2)</div><div class='add'>+{</div><div class='add'>+	irq_desc_t *desc = irq_desc + virt_irq;</div><div class='add'>+	struct irq_handler_data *data = desc-&gt;handler_data;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='del'>-}</div><div class='add'>+	data-&gt;pre_handler = func;</div><div class='add'>+	data-&gt;pre_handler_arg1 = arg1;</div><div class='add'>+	data-&gt;pre_handler_arg2 = arg2;</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(free_irq);</div><div class='add'>+	if (desc-&gt;chip == &amp;sun4u_irq_ack ||</div><div class='add'>+	    desc-&gt;chip == &amp;sun4v_irq_ack)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-void synchronize_irq(unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bucket = __bucket(irq);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* The following is how I wish I could implement this.</div><div class='del'>-	 * Unfortunately the ICLR registers are read-only, you can</div><div class='del'>-	 * only write ICLR_foo values to them.  To get the current</div><div class='del'>-	 * IRQ status you would need to get at the IRQ diag registers</div><div class='del'>-	 * in the PCI/SBUS controller and the layout of those vary</div><div class='del'>-	 * from one controller to the next, sigh... -DaveM</div><div class='del'>-	 */</div><div class='del'>-	unsigned long iclr = bucket-&gt;iclr;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		u32 tmp = upa_readl(iclr);</div><div class='del'>-		</div><div class='del'>-		if (tmp == ICLR_TRANSMIT ||</div><div class='del'>-		    tmp == ICLR_PENDING) {</div><div class='del'>-			cpu_relax();</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	/* So we have to do this with a INPROGRESS bit just like x86.  */</div><div class='del'>-	while (bucket-&gt;flags &amp; IBF_INPROGRESS)</div><div class='del'>-		cpu_relax();</div><div class='del'>-#endif</div><div class='add'>+	desc-&gt;chip = (desc-&gt;chip == &amp;sun4u_irq ?</div><div class='add'>+		      &amp;sun4u_irq_ack : &amp;sun4v_irq_ack);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='del'>-static void process_bucket(int irq, struct ino_bucket *bp, struct pt_regs *regs)</div><div class='add'>+unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap)</div><div class='ctx'> {</div><div class='del'>-	struct irq_desc *desc = bp-&gt;irq_info;</div><div class='del'>-	unsigned char flags = bp-&gt;flags;</div><div class='del'>-	u32 action_mask, i;</div><div class='del'>-	int random;</div><div class='add'>+	struct ino_bucket *bucket;</div><div class='add'>+	struct irq_handler_data *data;</div><div class='add'>+	irq_desc_t *desc;</div><div class='add'>+	int ino;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;flags |= IBF_INPROGRESS;</div><div class='add'>+	BUG_ON(tlb_type == hypervisor);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!(flags &amp; IBF_ACTIVE))) {</div><div class='del'>-		bp-&gt;pending = 1;</div><div class='del'>-		goto out;</div><div class='add'>+	ino = (upa_readl(imap) &amp; (IMAP_IGN | IMAP_INO)) + inofixup;</div><div class='add'>+	bucket = &amp;ivector_table[ino];</div><div class='add'>+	if (!bucket-&gt;virt_irq) {</div><div class='add'>+		bucket-&gt;virt_irq = virt_irq_alloc(__irq(bucket));</div><div class='add'>+		irq_desc[bucket-&gt;virt_irq].chip = &amp;sun4u_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (desc-&gt;pre_handler)</div><div class='del'>-		desc-&gt;pre_handler(bp,</div><div class='del'>-				  desc-&gt;pre_handler_arg1,</div><div class='del'>-				  desc-&gt;pre_handler_arg2);</div><div class='del'>-</div><div class='del'>-	action_mask = desc-&gt;action_active_mask;</div><div class='del'>-	random = 0;</div><div class='del'>-	for (i = 0; i &lt; MAX_IRQ_DESC_ACTION; i++) {</div><div class='del'>-		struct irqaction *p = &amp;desc-&gt;action[i];</div><div class='del'>-		u32 mask = (1 &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-		if (!(action_mask &amp; mask))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		action_mask &amp;= ~mask;</div><div class='del'>-</div><div class='del'>-		if (p-&gt;handler(__irq(bp), p-&gt;dev_id, regs) == IRQ_HANDLED)</div><div class='del'>-			random |= p-&gt;flags;</div><div class='add'>+	desc = irq_desc + bucket-&gt;virt_irq;</div><div class='add'>+	if (unlikely(desc-&gt;handler_data))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		if (!action_mask)</div><div class='del'>-			break;</div><div class='add'>+	data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!data)) {</div><div class='add'>+		prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	if (bp-&gt;pil != 0) {</div><div class='del'>-		if (tlb_type == hypervisor) {</div><div class='del'>-			unsigned int ino = __irq_ino(bp);</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);</div><div class='del'>-			if (err != HV_EOK)</div><div class='del'>-				printk("sun4v_intr_setstate(%x): "</div><div class='del'>-				       "err(%d)\n", ino, err);</div><div class='del'>-		} else {</div><div class='del'>-			upa_writel(ICLR_IDLE, bp-&gt;iclr);</div><div class='del'>-		}</div><div class='add'>+	desc-&gt;handler_data = data;</div><div class='add'>+</div><div class='add'>+	data-&gt;imap  = imap;</div><div class='add'>+	data-&gt;iclr  = iclr;</div><div class='ctx'> </div><div class='del'>-		/* Test and add entropy */</div><div class='del'>-		if (random &amp; SA_SAMPLE_RANDOM)</div><div class='del'>-			add_interrupt_randomness(irq);</div><div class='del'>-	}</div><div class='ctx'> out:</div><div class='del'>-	bp-&gt;flags &amp;= ~IBF_INPROGRESS;</div><div class='add'>+	return bucket-&gt;virt_irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void handler_irq(int irq, struct pt_regs *regs)</div><div class='add'>+unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino)</div><div class='ctx'> {</div><div class='del'>-	struct ino_bucket *bp;</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='add'>+	struct ino_bucket *bucket;</div><div class='add'>+	struct irq_handler_data *data;</div><div class='add'>+	unsigned long sysino;</div><div class='add'>+	irq_desc_t *desc;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-	/*</div><div class='del'>-	 * Check for TICK_INT on level 14 softint.</div><div class='del'>-	 */</div><div class='del'>-	{</div><div class='del'>-		unsigned long clr_mask = 1 &lt;&lt; irq;</div><div class='del'>-		unsigned long tick_mask = tick_ops-&gt;softint_mask;</div><div class='add'>+	BUG_ON(tlb_type != hypervisor);</div><div class='ctx'> </div><div class='del'>-		if ((irq == 14) &amp;&amp; (get_softint() &amp; tick_mask)) {</div><div class='del'>-			irq = 0;</div><div class='del'>-			clr_mask = tick_mask;</div><div class='del'>-		}</div><div class='del'>-		clear_softint(clr_mask);</div><div class='add'>+	sysino = sun4v_devino_to_sysino(devhandle, devino);</div><div class='add'>+	bucket = &amp;ivector_table[sysino];</div><div class='add'>+	if (!bucket-&gt;virt_irq) {</div><div class='add'>+		bucket-&gt;virt_irq = virt_irq_alloc(__irq(bucket));</div><div class='add'>+		irq_desc[bucket-&gt;virt_irq].chip = &amp;sun4v_irq;</div><div class='ctx'> 	}</div><div class='del'>-#else</div><div class='del'>-	clear_softint(1 &lt;&lt; irq);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	irq_enter();</div><div class='del'>-	kstat_this_cpu.irqs[irq]++;</div><div class='del'>-</div><div class='del'>-	/* Sliiiick... */</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-	bp = ((irq != 0) ?</div><div class='del'>-	      __bucket(xchg32(irq_work(cpu, irq), 0)) :</div><div class='del'>-	      &amp;pil0_dummy_bucket);</div><div class='del'>-#else</div><div class='del'>-	bp = __bucket(xchg32(irq_work(cpu, irq), 0));</div><div class='del'>-#endif</div><div class='del'>-	while (bp) {</div><div class='del'>-		struct ino_bucket *nbp = __bucket(bp-&gt;irq_chain);</div><div class='add'>+	desc = irq_desc + bucket-&gt;virt_irq;</div><div class='add'>+	if (unlikely(desc-&gt;handler_data))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-		bp-&gt;irq_chain = 0;</div><div class='del'>-		process_bucket(irq, bp, regs);</div><div class='del'>-		bp = nbp;</div><div class='add'>+	data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!data)) {</div><div class='add'>+		prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");</div><div class='add'>+		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	irq_exit();</div><div class='del'>-}</div><div class='add'>+	desc-&gt;handler_data = data;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_FD</div><div class='del'>-extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);</div><div class='add'>+	/* Catch accidental accesses to these things.  IMAP/ICLR handling</div><div class='add'>+	 * is done by hypervisor calls on sun4v platforms, not by direct</div><div class='add'>+	 * register accesses.</div><div class='add'>+	 */</div><div class='add'>+	data-&gt;imap = ~0UL;</div><div class='add'>+	data-&gt;iclr = ~0UL;</div><div class='ctx'> </div><div class='del'>-/* XXX No easy way to include asm/floppy.h XXX */</div><div class='del'>-extern unsigned char *pdma_vaddr;</div><div class='del'>-extern unsigned long pdma_size;</div><div class='del'>-extern volatile int doing_pdma;</div><div class='del'>-extern unsigned long fdc_status;</div><div class='add'>+out:</div><div class='add'>+	return bucket-&gt;virt_irq;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie, struct pt_regs *regs)</div><div class='add'>+void hw_resend_irq(struct hw_interrupt_type *handler, unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	if (likely(doing_pdma)) {</div><div class='del'>-		void __iomem *stat = (void __iomem *) fdc_status;</div><div class='del'>-		unsigned char *vaddr = pdma_vaddr;</div><div class='del'>-		unsigned long size = pdma_size;</div><div class='del'>-		u8 val;</div><div class='del'>-</div><div class='del'>-		while (size) {</div><div class='del'>-			val = readb(stat);</div><div class='del'>-			if (unlikely(!(val &amp; 0x80))) {</div><div class='del'>-				pdma_vaddr = vaddr;</div><div class='del'>-				pdma_size = size;</div><div class='del'>-				return IRQ_HANDLED;</div><div class='del'>-			}</div><div class='del'>-			if (unlikely(!(val &amp; 0x20))) {</div><div class='del'>-				pdma_vaddr = vaddr;</div><div class='del'>-				pdma_size = size;</div><div class='del'>-				doing_pdma = 0;</div><div class='del'>-				goto main_interrupt;</div><div class='del'>-			}</div><div class='del'>-			if (val &amp; 0x40) {</div><div class='del'>-				/* read */</div><div class='del'>-				*vaddr++ = readb(stat + 1);</div><div class='del'>-			} else {</div><div class='del'>-				unsigned char data = *vaddr++;</div><div class='del'>-</div><div class='del'>-				/* write */</div><div class='del'>-				writeb(data, stat + 1);</div><div class='del'>-			}</div><div class='del'>-			size--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pdma_vaddr = vaddr;</div><div class='del'>-		pdma_size = size;</div><div class='del'>-</div><div class='del'>-		/* Send Terminal Count pulse to floppy controller. */</div><div class='del'>-		val = readb(auxio_register);</div><div class='del'>-		val |= AUXIO_AUX1_FTCNT;</div><div class='del'>-		writeb(val, auxio_register);</div><div class='del'>-		val &amp;= ~AUXIO_AUX1_FTCNT;</div><div class='del'>-		writeb(val, auxio_register);</div><div class='del'>-</div><div class='del'>-		doing_pdma = 0;</div><div class='del'>-	}</div><div class='add'>+	struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);</div><div class='add'>+	unsigned long pstate;</div><div class='add'>+	unsigned int *ent;</div><div class='ctx'> </div><div class='del'>-main_interrupt:</div><div class='del'>-	return floppy_interrupt(irq, dev_cookie, regs);</div><div class='add'>+	__asm__ __volatile__("rdpr %%pstate, %0" : "=r" (pstate));</div><div class='add'>+	__asm__ __volatile__("wrpr %0, %1, %%pstate"</div><div class='add'>+			     : : "r" (pstate), "i" (PSTATE_IE));</div><div class='add'>+	ent = irq_work(smp_processor_id());</div><div class='add'>+	bucket-&gt;irq_chain = *ent;</div><div class='add'>+	*ent = __irq(bucket);</div><div class='add'>+	set_softint(1 &lt;&lt; PIL_DEVICE_IRQ);</div><div class='add'>+	__asm__ __volatile__("wrpr %0, 0x0, %%pstate" : : "r" (pstate));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(sparc_floppy_irq);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-/* We really don't need these at all on the Sparc.  We only have</div><div class='del'>- * stubs here because they are exported to modules.</div><div class='del'>- */</div><div class='del'>-unsigned long probe_irq_on(void)</div><div class='add'>+void ack_bad_irq(unsigned int virt_irq)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct ino_bucket *bucket = virt_irq_to_bucket(virt_irq);</div><div class='add'>+	unsigned int ino = 0xdeadbeef;</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(probe_irq_on);</div><div class='add'>+	if (bucket)</div><div class='add'>+		ino = bucket - &amp;ivector_table[0];</div><div class='ctx'> </div><div class='del'>-int probe_irq_off(unsigned long mask)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	printk(KERN_CRIT "Unexpected IRQ from ino[%x] virt_irq[%u]\n",</div><div class='add'>+	       ino, virt_irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(probe_irq_off);</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-static int retarget_one_irq(struct irqaction *p, int goal_cpu)</div><div class='add'>+void timer_irq(int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct ino_bucket *bucket = get_ino_in_irqaction(p) + ivector_table;</div><div class='add'>+	unsigned long clr_mask = 1 &lt;&lt; irq;</div><div class='add'>+	unsigned long tick_mask = tick_ops-&gt;softint_mask;</div><div class='ctx'> </div><div class='del'>-	while (!cpu_online(goal_cpu)) {</div><div class='del'>-		if (++goal_cpu &gt;= NR_CPUS)</div><div class='del'>-			goal_cpu = 0;</div><div class='add'>+	if (get_softint() &amp; tick_mask) {</div><div class='add'>+		irq = 0;</div><div class='add'>+		clr_mask = tick_mask;</div><div class='ctx'> 	}</div><div class='add'>+	clear_softint(clr_mask);</div><div class='ctx'> </div><div class='del'>-	if (tlb_type == hypervisor) {</div><div class='del'>-		unsigned int ino = __irq_ino(bucket);</div><div class='del'>-</div><div class='del'>-		sun4v_intr_settarget(ino, goal_cpu);</div><div class='del'>-		sun4v_intr_setenabled(ino, HV_INTR_ENABLED);</div><div class='del'>-	} else {</div><div class='del'>-		unsigned long imap = bucket-&gt;imap;</div><div class='del'>-		unsigned int tid = sun4u_compute_tid(imap, goal_cpu);</div><div class='del'>-</div><div class='del'>-		upa_writel(tid | IMAP_VALID, imap);</div><div class='del'>-	}</div><div class='add'>+	irq_enter();</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		if (++goal_cpu &gt;= NR_CPUS)</div><div class='del'>-			goal_cpu = 0;</div><div class='del'>-	} while (!cpu_online(goal_cpu));</div><div class='add'>+	kstat_this_cpu.irqs[0]++;</div><div class='add'>+	timer_interrupt(irq, NULL, regs);</div><div class='ctx'> </div><div class='del'>-	return goal_cpu;</div><div class='add'>+	irq_exit();</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-/* Called from request_irq. */</div><div class='del'>-static void distribute_irqs(void)</div><div class='add'>+void handler_irq(int irq, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int cpu, level;</div><div class='add'>+	struct ino_bucket *bucket;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;irq_action_lock, flags);</div><div class='del'>-	cpu = 0;</div><div class='add'>+	clear_softint(1 &lt;&lt; irq);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Skip the timer at [0], and very rare error/power intrs at [15].</div><div class='del'>-	 * Also level [12], it causes problems on Ex000 systems.</div><div class='del'>-	 */</div><div class='del'>-	for (level = 1; level &lt; NR_IRQS; level++) {</div><div class='del'>-		struct irqaction *p = irq_action[level];</div><div class='add'>+	irq_enter();</div><div class='ctx'> </div><div class='del'>-		if (level == 12)</div><div class='del'>-			continue;</div><div class='add'>+	/* Sliiiick... */</div><div class='add'>+	bucket = __bucket(xchg32(irq_work(smp_processor_id()), 0));</div><div class='add'>+	while (bucket) {</div><div class='add'>+		struct ino_bucket *next = __bucket(bucket-&gt;irq_chain);</div><div class='ctx'> </div><div class='del'>-		while(p) {</div><div class='del'>-			cpu = retarget_one_irq(p, cpu);</div><div class='del'>-			p = p-&gt;next;</div><div class='del'>-		}</div><div class='add'>+		bucket-&gt;irq_chain = 0;</div><div class='add'>+		__do_IRQ(bucket-&gt;virt_irq, regs);</div><div class='add'>+</div><div class='add'>+		bucket = next;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_action_lock, flags);</div><div class='add'>+</div><div class='add'>+	irq_exit();</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> struct sun5_timer {</div><div class='ctx'> 	u64	count0;</div><div class='hunk'>@@ -874,23 +578,29 @@ static u64 prom_limit0, prom_limit1;</div><div class='ctx'> </div><div class='ctx'> static void map_prom_timers(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int addr[3];</div><div class='del'>-	int tnode, err;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	unsigned int *addr;</div><div class='ctx'> </div><div class='ctx'> 	/* PROM timer node hangs out in the top level of device siblings... */</div><div class='del'>-	tnode = prom_finddevice("/counter-timer");</div><div class='add'>+	dp = of_find_node_by_path("/");</div><div class='add'>+	dp = dp-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		if (!strcmp(dp-&gt;name, "counter-timer"))</div><div class='add'>+			break;</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Assume if node is not present, PROM uses different tick mechanism</div><div class='ctx'> 	 * which we should not care about.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tnode == 0 || tnode == -1) {</div><div class='add'>+	if (!dp) {</div><div class='ctx'> 		prom_timers = (struct sun5_timer *) 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If PROM is really using this, it must be mapped by him. */</div><div class='del'>-	err = prom_getproperty(tnode, "address", (char *)addr, sizeof(addr));</div><div class='del'>-	if (err == -1) {</div><div class='add'>+	addr = of_get_property(dp, "address", NULL);</div><div class='add'>+	if (!addr) {</div><div class='ctx'> 		prom_printf("PROM does not have timer mapped, trying to continue.\n");</div><div class='ctx'> 		prom_timers = (struct sun5_timer *) 0;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -929,7 +639,7 @@ void init_irqwork_curcpu(void)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = hard_smp_processor_id();</div><div class='ctx'> </div><div class='del'>-	memset(__irq_work + cpu, 0, sizeof(struct irq_work_struct));</div><div class='add'>+	trap_block[cpu].irq_worklist = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type)</div><div class='hunk'>@@ -1037,6 +747,10 @@ void __cpuinit sun4v_init_mondo_queues(int use_bootmem, int cpu, int alloc, int</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct irqaction timer_irq_action = {</div><div class='add'>+	.name = "timer",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Only invoked on boot processor. */</div><div class='ctx'> void __init init_IRQ(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1064,109 +778,6 @@ void __init init_IRQ(void)</div><div class='ctx'> 			     : /* No outputs */</div><div class='ctx'> 			     : "i" (PSTATE_IE)</div><div class='ctx'> 			     : "g1");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct proc_dir_entry * root_irq_dir;</div><div class='del'>-static struct proc_dir_entry * irq_dir [NUM_IVECS];</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-</div><div class='del'>-static int irq_affinity_read_proc (char *page, char **start, off_t off,</div><div class='del'>-			int count, int *eof, void *data)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bp = ivector_table + (long)data;</div><div class='del'>-	struct irq_desc *desc = bp-&gt;irq_info;</div><div class='del'>-	struct irqaction *ap = desc-&gt;action;</div><div class='del'>-	cpumask_t mask;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	mask = get_smpaff_in_irqaction(ap);</div><div class='del'>-	if (cpus_empty(mask))</div><div class='del'>-		mask = cpu_online_map;</div><div class='del'>-</div><div class='del'>-	len = cpumask_scnprintf(page, count, mask);</div><div class='del'>-	if (count - len &lt; 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	len += sprintf(page + len, "\n");</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_intr_affinity(int irq, cpumask_t hw_aff)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bp = ivector_table + irq;</div><div class='del'>-	struct irq_desc *desc = bp-&gt;irq_info;</div><div class='del'>-	struct irqaction *ap = desc-&gt;action;</div><div class='del'>-</div><div class='del'>-	/* Users specify affinity in terms of hw cpu ids.</div><div class='del'>-	 * As soon as we do this, handler_irq() might see and take action.</div><div class='del'>-	 */</div><div class='del'>-	put_smpaff_in_irqaction(ap, hw_aff);</div><div class='del'>-</div><div class='del'>-	/* Migration is simply done by the next cpu to service this</div><div class='del'>-	 * interrupt.</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int irq_affinity_write_proc (struct file *file, const char __user *buffer,</div><div class='del'>-					unsigned long count, void *data)</div><div class='del'>-{</div><div class='del'>-	int irq = (long) data, full_count = count, err;</div><div class='del'>-	cpumask_t new_value;</div><div class='del'>-</div><div class='del'>-	err = cpumask_parse(buffer, count, new_value);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Do not allow disabling IRQs completely - it's a too easy</div><div class='del'>-	 * way to make the system unusable accidentally :-) At least</div><div class='del'>-	 * one online CPU still has to be targeted.</div><div class='del'>-	 */</div><div class='del'>-	cpus_and(new_value, new_value, cpu_online_map);</div><div class='del'>-	if (cpus_empty(new_value))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	set_intr_affinity(irq, new_value);</div><div class='ctx'> </div><div class='del'>-	return full_count;</div><div class='add'>+	irq_desc[0].action = &amp;timer_irq_action;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MAX_NAMELEN 10</div><div class='del'>-</div><div class='del'>-static void register_irq_proc (unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	char name [MAX_NAMELEN];</div><div class='del'>-</div><div class='del'>-	if (!root_irq_dir || irq_dir[irq])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(name, 0, MAX_NAMELEN);</div><div class='del'>-	sprintf(name, "%x", irq);</div><div class='del'>-</div><div class='del'>-	/* create /proc/irq/1234 */</div><div class='del'>-	irq_dir[irq] = proc_mkdir(name, root_irq_dir);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-	/* XXX SMP affinity not supported on starfire yet. */</div><div class='del'>-	if (this_is_starfire == 0) {</div><div class='del'>-		struct proc_dir_entry *entry;</div><div class='del'>-</div><div class='del'>-		/* create /proc/irq/1234/smp_affinity */</div><div class='del'>-		entry = create_proc_entry("smp_affinity", 0600, irq_dir[irq]);</div><div class='del'>-</div><div class='del'>-		if (entry) {</div><div class='del'>-			entry-&gt;nlink = 1;</div><div class='del'>-			entry-&gt;data = (void *)(long)irq;</div><div class='del'>-			entry-&gt;read_proc = irq_affinity_read_proc;</div><div class='del'>-			entry-&gt;write_proc = irq_affinity_write_proc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void init_irq_proc (void)</div><div class='del'>-{</div><div class='del'>-	/* create /proc/irq */</div><div class='del'>-	root_irq_dir = proc_mkdir("irq", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c<br/>index 30862abee611..0f3aec72ef5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/isa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/isa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/isa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/isa.c</a></div><div class='hunk'>@@ -3,6 +3,8 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/isa.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct sparc_isa_bridge *isa_chain;</div><div class='hunk'>@@ -15,23 +17,19 @@ static void __init fatal_err(const char *reason)</div><div class='ctx'> static void __init report_dev(struct sparc_isa_device *isa_dev, int child)</div><div class='ctx'> {</div><div class='ctx'> 	if (child)</div><div class='del'>-		printk(" (%s)", isa_dev-&gt;prom_name);</div><div class='add'>+		printk(" (%s)", isa_dev-&gt;prom_node-&gt;name);</div><div class='ctx'> 	else</div><div class='del'>-		printk(" [%s", isa_dev-&gt;prom_name);</div><div class='add'>+		printk(" [%s", isa_dev-&gt;prom_node-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init isa_dev_get_resource(struct sparc_isa_device *isa_dev,</div><div class='del'>-					struct linux_prom_registers *pregs,</div><div class='del'>-					int pregs_size)</div><div class='add'>+static struct linux_prom_registers * __init</div><div class='add'>+isa_dev_get_resource(struct sparc_isa_device *isa_dev)</div><div class='ctx'> {</div><div class='add'>+	struct linux_prom_registers *pregs;</div><div class='ctx'> 	unsigned long base, len;</div><div class='ctx'> 	int prop_len;</div><div class='ctx'> </div><div class='del'>-	prop_len = prom_getproperty(isa_dev-&gt;prom_node, "reg",</div><div class='del'>-				    (char *) pregs, pregs_size);</div><div class='del'>-</div><div class='del'>-	if (prop_len &lt;= 0)</div><div class='del'>-		return;</div><div class='add'>+	pregs = of_get_property(isa_dev-&gt;prom_node, "reg", &amp;prop_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Only the first one is interesting. */</div><div class='ctx'> 	len = pregs[0].reg_size;</div><div class='hunk'>@@ -42,115 +40,37 @@ static void __init isa_dev_get_resource(struct sparc_isa_device *isa_dev,</div><div class='ctx'> 	isa_dev-&gt;resource.start = base;</div><div class='ctx'> 	isa_dev-&gt;resource.end   = (base + len - 1UL);</div><div class='ctx'> 	isa_dev-&gt;resource.flags = IORESOURCE_IO;</div><div class='del'>-	isa_dev-&gt;resource.name  = isa_dev-&gt;prom_name;</div><div class='add'>+	isa_dev-&gt;resource.name  = isa_dev-&gt;prom_node-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	request_resource(&amp;isa_dev-&gt;bus-&gt;parent-&gt;io_space,</div><div class='ctx'> 			 &amp;isa_dev-&gt;resource);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* I can't believe they didn't put a real INO in the isa device</div><div class='del'>- * interrupts property.  The whole point of the OBP properties</div><div class='del'>- * is to shield the kernel from IRQ routing details.</div><div class='del'>- *</div><div class='del'>- * The P1275 standard for ISA devices seems to also have been</div><div class='del'>- * totally ignored.</div><div class='del'>- *</div><div class='del'>- * On later systems, an interrupt-map and interrupt-map-mask scheme</div><div class='del'>- * akin to EBUS is used.</div><div class='del'>- */</div><div class='del'>-static struct {</div><div class='del'>-	int	obp_irq;</div><div class='del'>-	int	pci_ino;</div><div class='del'>-} grover_irq_table[] = {</div><div class='del'>-	{ 1, 0x00 },	/* dma, unknown ino at this point */</div><div class='del'>-	{ 2, 0x27 },	/* floppy */</div><div class='del'>-	{ 3, 0x22 },	/* parallel */</div><div class='del'>-	{ 4, 0x2b },	/* serial */</div><div class='del'>-	{ 5, 0x25 },	/* acpi power management */</div><div class='del'>-</div><div class='del'>-	{ 0, 0x00 }	/* end of table */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init isa_dev_get_irq_using_imap(struct sparc_isa_device *isa_dev,</div><div class='del'>-					     struct sparc_isa_bridge *isa_br,</div><div class='del'>-					     int *interrupt,</div><div class='del'>-					     struct linux_prom_registers *pregs)</div><div class='del'>-{</div><div class='del'>-	unsigned int hi, lo, irq;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	hi = pregs-&gt;which_io &amp; isa_br-&gt;isa_intmask.phys_hi;</div><div class='del'>-	lo = pregs-&gt;phys_addr &amp; isa_br-&gt;isa_intmask.phys_lo;</div><div class='del'>-	irq = *interrupt &amp; isa_br-&gt;isa_intmask.interrupt;</div><div class='del'>-	for (i = 0; i &lt; isa_br-&gt;num_isa_intmap; i++) {</div><div class='del'>-		if ((isa_br-&gt;isa_intmap[i].phys_hi == hi) &amp;&amp;</div><div class='del'>-		    (isa_br-&gt;isa_intmap[i].phys_lo == lo) &amp;&amp;</div><div class='del'>-		    (isa_br-&gt;isa_intmap[i].interrupt == irq)) {</div><div class='del'>-			*interrupt = isa_br-&gt;isa_intmap[i].cinterrupt;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='add'>+	return pregs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init isa_dev_get_irq(struct sparc_isa_device *isa_dev,</div><div class='ctx'> 				   struct linux_prom_registers *pregs)</div><div class='ctx'> {</div><div class='del'>-	int irq_prop;</div><div class='add'>+	struct of_device *op = of_find_device_by_node(isa_dev-&gt;prom_node);</div><div class='ctx'> </div><div class='del'>-	irq_prop = prom_getintdefault(isa_dev-&gt;prom_node,</div><div class='del'>-				      "interrupts", -1);</div><div class='del'>-	if (irq_prop &lt;= 0) {</div><div class='del'>-		goto no_irq;</div><div class='add'>+	if (!op || !op-&gt;num_irqs) {</div><div class='add'>+		isa_dev-&gt;irq = PCI_IRQ_NONE;</div><div class='ctx'> 	} else {</div><div class='del'>-		struct pci_controller_info *pcic;</div><div class='del'>-		struct pci_pbm_info *pbm;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (isa_dev-&gt;bus-&gt;num_isa_intmap) {</div><div class='del'>-			if (!isa_dev_get_irq_using_imap(isa_dev,</div><div class='del'>-							isa_dev-&gt;bus,</div><div class='del'>-							&amp;irq_prop,</div><div class='del'>-							pregs))</div><div class='del'>-				goto route_irq;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; grover_irq_table[i].obp_irq != 0; i++) {</div><div class='del'>-			if (grover_irq_table[i].obp_irq == irq_prop) {</div><div class='del'>-				int ino = grover_irq_table[i].pci_ino;</div><div class='del'>-</div><div class='del'>-				if (ino == 0)</div><div class='del'>-					goto no_irq;</div><div class='del'>- </div><div class='del'>-				irq_prop = ino;</div><div class='del'>-				goto route_irq;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		goto no_irq;</div><div class='del'>-</div><div class='del'>-route_irq:</div><div class='del'>-		pbm = isa_dev-&gt;bus-&gt;parent;</div><div class='del'>-		pcic = pbm-&gt;parent;</div><div class='del'>-		isa_dev-&gt;irq = pcic-&gt;irq_build(pbm, NULL, irq_prop);</div><div class='del'>-		return;</div><div class='add'>+		isa_dev-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-no_irq:</div><div class='del'>-	isa_dev-&gt;irq = PCI_IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev)</div><div class='ctx'> {</div><div class='del'>-	int node = prom_getchild(parent_isa_dev-&gt;prom_node);</div><div class='add'>+	struct device_node *dp = parent_isa_dev-&gt;prom_node-&gt;child;</div><div class='ctx'> </div><div class='del'>-	if (node == 0)</div><div class='add'>+	if (!dp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	printk(" -&gt;");</div><div class='del'>-	while (node != 0) {</div><div class='del'>-		struct linux_prom_registers regs[PROMREG_MAX];</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct linux_prom_registers *regs;</div><div class='ctx'> 		struct sparc_isa_device *isa_dev;</div><div class='del'>-		int prop_len;</div><div class='ctx'> </div><div class='ctx'> 		isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);</div><div class='ctx'> 		if (!isa_dev) {</div><div class='hunk'>@@ -165,49 +85,46 @@ static void __init isa_fill_children(struct sparc_isa_device *parent_isa_dev)</div><div class='ctx'> 		parent_isa_dev-&gt;child = isa_dev;</div><div class='ctx'> </div><div class='ctx'> 		isa_dev-&gt;bus = parent_isa_dev-&gt;bus;</div><div class='del'>-		isa_dev-&gt;prom_node = node;</div><div class='del'>-		prop_len = prom_getproperty(node, "name",</div><div class='del'>-					    (char *) isa_dev-&gt;prom_name,</div><div class='del'>-					    sizeof(isa_dev-&gt;prom_name));</div><div class='del'>-		if (prop_len &lt;= 0) {</div><div class='del'>-			fatal_err("cannot get child isa_dev OBP node name");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prop_len = prom_getproperty(node, "compatible",</div><div class='del'>-					    (char *) isa_dev-&gt;compatible,</div><div class='del'>-					    sizeof(isa_dev-&gt;compatible));</div><div class='del'>-</div><div class='del'>-		/* Not having this is OK. */</div><div class='del'>-		if (prop_len &lt;= 0)</div><div class='del'>-			isa_dev-&gt;compatible[0] = '\0';</div><div class='add'>+		isa_dev-&gt;prom_node = dp;</div><div class='ctx'> </div><div class='del'>-		isa_dev_get_resource(isa_dev, regs, sizeof(regs));</div><div class='add'>+		regs = isa_dev_get_resource(isa_dev);</div><div class='ctx'> 		isa_dev_get_irq(isa_dev, regs);</div><div class='ctx'> </div><div class='ctx'> 		report_dev(isa_dev, 1);</div><div class='ctx'> </div><div class='del'>-		node = prom_getsibling(node);</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)</div><div class='ctx'> {</div><div class='del'>-	int node = prom_getchild(isa_br-&gt;prom_node);</div><div class='add'>+	struct device_node *dp = isa_br-&gt;prom_node-&gt;child;</div><div class='ctx'> </div><div class='del'>-	while (node != 0) {</div><div class='del'>-		struct linux_prom_registers regs[PROMREG_MAX];</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct linux_prom_registers *regs;</div><div class='ctx'> 		struct sparc_isa_device *isa_dev;</div><div class='del'>-		int prop_len;</div><div class='ctx'> </div><div class='ctx'> 		isa_dev = kmalloc(sizeof(*isa_dev), GFP_KERNEL);</div><div class='ctx'> 		if (!isa_dev) {</div><div class='del'>-			fatal_err("cannot allocate isa_dev");</div><div class='del'>-			prom_halt();</div><div class='add'>+			printk(KERN_DEBUG "ISA: cannot allocate isa_dev");</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		memset(isa_dev, 0, sizeof(*isa_dev));</div><div class='ctx'> </div><div class='add'>+		isa_dev-&gt;ofdev.node = dp;</div><div class='add'>+		isa_dev-&gt;ofdev.dev.parent = &amp;isa_br-&gt;ofdev.dev;</div><div class='add'>+		isa_dev-&gt;ofdev.dev.bus = &amp;isa_bus_type;</div><div class='add'>+		strcpy(isa_dev-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+		/* Register with core */</div><div class='add'>+		if (of_device_register(&amp;isa_dev-&gt;ofdev) != 0) {</div><div class='add'>+			printk(KERN_DEBUG "isa: device registration error for %s!\n",</div><div class='add'>+			       isa_dev-&gt;ofdev.dev.bus_id);</div><div class='add'>+			kfree(isa_dev);</div><div class='add'>+			goto next_sibling;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Link it in. */</div><div class='ctx'> 		isa_dev-&gt;next = NULL;</div><div class='ctx'> 		if (isa_br-&gt;devices == NULL) {</div><div class='hunk'>@@ -222,24 +139,9 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		isa_dev-&gt;bus = isa_br;</div><div class='del'>-		isa_dev-&gt;prom_node = node;</div><div class='del'>-		prop_len = prom_getproperty(node, "name",</div><div class='del'>-					    (char *) isa_dev-&gt;prom_name,</div><div class='del'>-					    sizeof(isa_dev-&gt;prom_name));</div><div class='del'>-		if (prop_len &lt;= 0) {</div><div class='del'>-			fatal_err("cannot get isa_dev OBP node name");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prop_len = prom_getproperty(node, "compatible",</div><div class='del'>-					    (char *) isa_dev-&gt;compatible,</div><div class='del'>-					    sizeof(isa_dev-&gt;compatible));</div><div class='del'>-</div><div class='del'>-		/* Not having this is OK. */</div><div class='del'>-		if (prop_len &lt;= 0)</div><div class='del'>-			isa_dev-&gt;compatible[0] = '\0';</div><div class='add'>+		isa_dev-&gt;prom_node = dp;</div><div class='ctx'> </div><div class='del'>-		isa_dev_get_resource(isa_dev, regs, sizeof(regs));</div><div class='add'>+		regs = isa_dev_get_resource(isa_dev);</div><div class='ctx'> 		isa_dev_get_irq(isa_dev, regs);</div><div class='ctx'> </div><div class='ctx'> 		report_dev(isa_dev, 0);</div><div class='hunk'>@@ -248,7 +150,8 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)</div><div class='ctx'> </div><div class='ctx'> 		printk("]");</div><div class='ctx'> </div><div class='del'>-		node = prom_getsibling(node);</div><div class='add'>+	next_sibling:</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +169,7 @@ void __init isa_init(void)</div><div class='ctx'> 		struct pcidev_cookie *pdev_cookie;</div><div class='ctx'> 		struct pci_pbm_info *pbm;</div><div class='ctx'> 		struct sparc_isa_bridge *isa_br;</div><div class='del'>-		int prop_len;</div><div class='add'>+		struct device_node *dp;</div><div class='ctx'> </div><div class='ctx'> 		pdev_cookie = pdev-&gt;sysdata;</div><div class='ctx'> 		if (!pdev_cookie) {</div><div class='hunk'>@@ -275,15 +178,29 @@ void __init isa_init(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		pbm = pdev_cookie-&gt;pbm;</div><div class='add'>+		dp = pdev_cookie-&gt;prom_node;</div><div class='ctx'> </div><div class='ctx'> 		isa_br = kmalloc(sizeof(*isa_br), GFP_KERNEL);</div><div class='ctx'> 		if (!isa_br) {</div><div class='del'>-			fatal_err("cannot allocate sparc_isa_bridge");</div><div class='del'>-			prom_halt();</div><div class='add'>+			printk(KERN_DEBUG "isa: cannot allocate sparc_isa_bridge");</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		memset(isa_br, 0, sizeof(*isa_br));</div><div class='ctx'> </div><div class='add'>+		isa_br-&gt;ofdev.node = dp;</div><div class='add'>+		isa_br-&gt;ofdev.dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+		isa_br-&gt;ofdev.dev.bus = &amp;isa_bus_type;</div><div class='add'>+		strcpy(isa_br-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+		/* Register with core */</div><div class='add'>+		if (of_device_register(&amp;isa_br-&gt;ofdev) != 0) {</div><div class='add'>+			printk(KERN_DEBUG "isa: device registration error for %s!\n",</div><div class='add'>+			       isa_br-&gt;ofdev.dev.bus_id);</div><div class='add'>+			kfree(isa_br);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Link it in. */</div><div class='ctx'> 		isa_br-&gt;next = isa_chain;</div><div class='ctx'> 		isa_chain = isa_br;</div><div class='hunk'>@@ -292,33 +209,6 @@ void __init isa_init(void)</div><div class='ctx'> 		isa_br-&gt;self = pdev;</div><div class='ctx'> 		isa_br-&gt;index = index++;</div><div class='ctx'> 		isa_br-&gt;prom_node = pdev_cookie-&gt;prom_node;</div><div class='del'>-		strncpy(isa_br-&gt;prom_name, pdev_cookie-&gt;prom_name,</div><div class='del'>-			sizeof(isa_br-&gt;prom_name));</div><div class='del'>-</div><div class='del'>-		prop_len = prom_getproperty(isa_br-&gt;prom_node,</div><div class='del'>-					    "ranges",</div><div class='del'>-					    (char *) isa_br-&gt;isa_ranges,</div><div class='del'>-					    sizeof(isa_br-&gt;isa_ranges));</div><div class='del'>-		if (prop_len &lt;= 0)</div><div class='del'>-			isa_br-&gt;num_isa_ranges = 0;</div><div class='del'>-		else</div><div class='del'>-			isa_br-&gt;num_isa_ranges =</div><div class='del'>-				(prop_len / sizeof(struct linux_prom_isa_ranges));</div><div class='del'>-</div><div class='del'>-		prop_len = prom_getproperty(isa_br-&gt;prom_node,</div><div class='del'>-					    "interrupt-map",</div><div class='del'>-					    (char *) isa_br-&gt;isa_intmap,</div><div class='del'>-					    sizeof(isa_br-&gt;isa_intmap));</div><div class='del'>-		if (prop_len &lt;= 0)</div><div class='del'>-			isa_br-&gt;num_isa_intmap = 0;</div><div class='del'>-		else</div><div class='del'>-			isa_br-&gt;num_isa_intmap =</div><div class='del'>-				(prop_len / sizeof(struct linux_prom_isa_intmap));</div><div class='del'>-</div><div class='del'>-		prop_len = prom_getproperty(isa_br-&gt;prom_node,</div><div class='del'>-					    "interrupt-map-mask",</div><div class='del'>-					    (char *) &amp;(isa_br-&gt;isa_intmask),</div><div class='del'>-					    sizeof(isa_br-&gt;isa_intmask));</div><div class='ctx'> </div><div class='ctx'> 		printk("isa%d:", isa_br-&gt;index);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c<br/>index 2e1c824c1cc9..8e75ed762fd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/kprobes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/kprobes.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (C) 2004 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/ktlb.S b/arch/sparc64/kernel/ktlb.S<br/>index 31da1e564c95..e492db845ea3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ktlb.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/ktlb.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ktlb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/ktlb.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1996,98,99 Jakub Jelinek  (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/head.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c<br/>new file mode 100644<br/>index 000000000000..7064cee290ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/of_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/of_device.c</a></div><div class='hunk'>@@ -0,0 +1,988 @@</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_match_device - Tell if an of_device structure has a matching</div><div class='add'>+ * of_match structure</div><div class='add'>+ * @ids: array of of device match structures to search in</div><div class='add'>+ * @dev: the of device structure to match against</div><div class='add'>+ *</div><div class='add'>+ * Used by a driver to check whether an of_device present in the</div><div class='add'>+ * system is in its list of supported devices.</div><div class='add'>+ */</div><div class='add'>+const struct of_device_id *of_match_device(const struct of_device_id *matches,</div><div class='add'>+					const struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;node)</div><div class='add'>+		return NULL;</div><div class='add'>+	while (matches-&gt;name[0] || matches-&gt;type[0] || matches-&gt;compatible[0]) {</div><div class='add'>+		int match = 1;</div><div class='add'>+		if (matches-&gt;name[0])</div><div class='add'>+			match &amp;= dev-&gt;node-&gt;name</div><div class='add'>+				&amp;&amp; !strcmp(matches-&gt;name, dev-&gt;node-&gt;name);</div><div class='add'>+		if (matches-&gt;type[0])</div><div class='add'>+			match &amp;= dev-&gt;node-&gt;type</div><div class='add'>+				&amp;&amp; !strcmp(matches-&gt;type, dev-&gt;node-&gt;type);</div><div class='add'>+		if (matches-&gt;compatible[0])</div><div class='add'>+			match &amp;= of_device_is_compatible(dev-&gt;node,</div><div class='add'>+							 matches-&gt;compatible);</div><div class='add'>+		if (match)</div><div class='add'>+			return matches;</div><div class='add'>+		matches++;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_platform_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * of_drv = to_of_platform_driver(drv);</div><div class='add'>+	const struct of_device_id * matches = of_drv-&gt;match_table;</div><div class='add'>+</div><div class='add'>+	if (!matches)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return of_match_device(matches, of_dev) != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct of_device *of_dev_get(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device *tmp;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	tmp = get_device(&amp;dev-&gt;dev);</div><div class='add'>+	if (tmp)</div><div class='add'>+		return to_of_device(tmp);</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void of_dev_put(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev)</div><div class='add'>+		put_device(&amp;dev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int of_device_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int error = -ENODEV;</div><div class='add'>+	struct of_platform_driver *drv;</div><div class='add'>+	struct of_device *of_dev;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+</div><div class='add'>+	drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+	of_dev = to_of_device(dev);</div><div class='add'>+</div><div class='add'>+	if (!drv-&gt;probe)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	of_dev_get(of_dev);</div><div class='add'>+</div><div class='add'>+	match = of_match_device(drv-&gt;match_table, of_dev);</div><div class='add'>+	if (match)</div><div class='add'>+		error = drv-&gt;probe(of_dev, match);</div><div class='add'>+	if (error)</div><div class='add'>+		of_dev_put(of_dev);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_device_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;remove)</div><div class='add'>+		drv-&gt;remove(of_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_device_suspend(struct device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;suspend)</div><div class='add'>+		error = drv-&gt;suspend(of_dev, state);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_device_resume(struct device * dev)</div><div class='add'>+{</div><div class='add'>+	struct of_device * of_dev = to_of_device(dev);</div><div class='add'>+	struct of_platform_driver * drv = to_of_platform_driver(dev-&gt;driver);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver &amp;&amp; drv-&gt;resume)</div><div class='add'>+		error = drv-&gt;resume(of_dev);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name)</div><div class='add'>+{</div><div class='add'>+	unsigned long ret = res-&gt;start + offset;</div><div class='add'>+</div><div class='add'>+	if (!request_region(ret, size, name))</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	return (void __iomem *) ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_ioremap);</div><div class='add'>+</div><div class='add'>+void of_iounmap(void __iomem *base, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	release_region((unsigned long) base, size);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_iounmap);</div><div class='add'>+</div><div class='add'>+static int node_match(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = to_of_device(dev);</div><div class='add'>+	struct device_node *dp = data;</div><div class='add'>+</div><div class='add'>+	return (op-&gt;node == dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct of_device *of_find_device_by_node(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = bus_find_device(&amp;of_bus_type, NULL,</div><div class='add'>+					     dp, node_match);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		return to_of_device(dev);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_device_by_node);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+struct bus_type isa_bus_type = {</div><div class='add'>+       .name	= "isa",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(isa_bus_type);</div><div class='add'>+</div><div class='add'>+struct bus_type ebus_bus_type = {</div><div class='add'>+       .name	= "ebus",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(ebus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+struct bus_type sbus_bus_type = {</div><div class='add'>+       .name	= "sbus",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(sbus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct bus_type of_bus_type = {</div><div class='add'>+       .name	= "of",</div><div class='add'>+       .match	= of_platform_bus_match,</div><div class='add'>+       .probe	= of_device_probe,</div><div class='add'>+       .remove	= of_device_remove,</div><div class='add'>+       .suspend	= of_device_suspend,</div><div class='add'>+       .resume	= of_device_resume,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(of_bus_type);</div><div class='add'>+</div><div class='add'>+static inline u64 of_read_addr(const u32 *cell, int size)</div><div class='add'>+{</div><div class='add'>+	u64 r = 0;</div><div class='add'>+	while (size--)</div><div class='add'>+		r = (r &lt;&lt; 32) | *(cell++);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init get_cells(struct device_node *dp,</div><div class='add'>+			     int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	if (addrc)</div><div class='add'>+		*addrc = of_n_addr_cells(dp);</div><div class='add'>+	if (sizec)</div><div class='add'>+		*sizec = of_n_size_cells(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Max address size we deal with */</div><div class='add'>+#define OF_MAX_ADDR_CELLS	4</div><div class='add'>+</div><div class='add'>+struct of_bus {</div><div class='add'>+	const char	*name;</div><div class='add'>+	const char	*addr_prop_name;</div><div class='add'>+	int		(*match)(struct device_node *parent);</div><div class='add'>+	void		(*count_cells)(struct device_node *child,</div><div class='add'>+				       int *addrc, int *sizec);</div><div class='add'>+	int		(*map)(u32 *addr, const u32 *range,</div><div class='add'>+			       int na, int ns, int pna);</div><div class='add'>+	unsigned int	(*get_flags)(u32 *addr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default translator (generic bus)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void of_bus_default_count_cells(struct device_node *dev,</div><div class='add'>+				       int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	get_cells(dev, addrc, sizec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Make sure the least significant 64-bits are in-range.  Even</div><div class='add'>+ * for 3 or 4 cell values it is a good enough approximation.</div><div class='add'>+ */</div><div class='add'>+static int of_out_of_range(const u32 *addr, const u32 *base,</div><div class='add'>+			   const u32 *size, int na, int ns)</div><div class='add'>+{</div><div class='add'>+	u64 a = of_read_addr(addr, na);</div><div class='add'>+	u64 b = of_read_addr(base, na);</div><div class='add'>+</div><div class='add'>+	if (a &lt; b)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	b += of_read_addr(size, ns);</div><div class='add'>+	if (a &gt;= b)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_bus_default_map(u32 *addr, const u32 *range,</div><div class='add'>+			      int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	u32 result[OF_MAX_ADDR_CELLS];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ns &gt; 2) {</div><div class='add'>+		printk("of_device: Cannot handle size cells (%d) &gt; 2.", ns);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_out_of_range(addr, range, range + na + pna, na, ns))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Start with the parent range base.  */</div><div class='add'>+	memcpy(result, range + na, pna * 4);</div><div class='add'>+</div><div class='add'>+	/* Add in the child address offset.  */</div><div class='add'>+	for (i = 0; i &lt; na; i++)</div><div class='add'>+		result[pna - 1 - i] +=</div><div class='add'>+			(addr[na - 1 - i] -</div><div class='add'>+			 range[na - 1 - i]);</div><div class='add'>+</div><div class='add'>+	memcpy(addr, result, pna * 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int of_bus_default_get_flags(u32 *addr)</div><div class='add'>+{</div><div class='add'>+	return IORESOURCE_MEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCI bus specific translator</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int of_bus_pci_match(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(np-&gt;type, "pci") || !strcmp(np-&gt;type, "pciex")) {</div><div class='add'>+		/* Do not do PCI specific frobbing if the</div><div class='add'>+		 * PCI bridge lacks a ranges property.  We</div><div class='add'>+		 * want to pass it through up to the next</div><div class='add'>+		 * parent as-is, not with the PCI translate</div><div class='add'>+		 * method which chops off the top address cell.</div><div class='add'>+		 */</div><div class='add'>+		if (!of_find_property(np, "ranges", NULL))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void of_bus_pci_count_cells(struct device_node *np,</div><div class='add'>+				   int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	if (addrc)</div><div class='add'>+		*addrc = 3;</div><div class='add'>+	if (sizec)</div><div class='add'>+		*sizec = 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_bus_pci_map(u32 *addr, const u32 *range,</div><div class='add'>+			  int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	u32 result[OF_MAX_ADDR_CELLS];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Check address type match */</div><div class='add'>+	if ((addr[0] ^ range[0]) &amp; 0x03000000)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (of_out_of_range(addr + 1, range + 1, range + na + pna,</div><div class='add'>+			    na - 1, ns))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Start with the parent range base.  */</div><div class='add'>+	memcpy(result, range + na, pna * 4);</div><div class='add'>+</div><div class='add'>+	/* Add in the child address offset, skipping high cell.  */</div><div class='add'>+	for (i = 0; i &lt; na - 1; i++)</div><div class='add'>+		result[pna - 1 - i] +=</div><div class='add'>+			(addr[na - 1 - i] -</div><div class='add'>+			 range[na - 1 - i]);</div><div class='add'>+</div><div class='add'>+	memcpy(addr, result, pna * 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int of_bus_pci_get_flags(u32 *addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+	u32 w = addr[0];</div><div class='add'>+</div><div class='add'>+	switch((w &gt;&gt; 24) &amp; 0x03) {</div><div class='add'>+	case 0x01:</div><div class='add'>+		flags |= IORESOURCE_IO;</div><div class='add'>+	case 0x02: /* 32 bits */</div><div class='add'>+	case 0x03: /* 64 bits */</div><div class='add'>+		flags |= IORESOURCE_MEM;</div><div class='add'>+	}</div><div class='add'>+	if (w &amp; 0x40000000)</div><div class='add'>+		flags |= IORESOURCE_PREFETCH;</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SBUS bus specific translator</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int of_bus_sbus_match(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	return !strcmp(np-&gt;name, "sbus") ||</div><div class='add'>+		!strcmp(np-&gt;name, "sbi");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void of_bus_sbus_count_cells(struct device_node *child,</div><div class='add'>+				   int *addrc, int *sizec)</div><div class='add'>+{</div><div class='add'>+	if (addrc)</div><div class='add'>+		*addrc = 2;</div><div class='add'>+	if (sizec)</div><div class='add'>+		*sizec = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	return of_bus_default_map(addr, range, na, ns, pna);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int of_bus_sbus_get_flags(u32 *addr)</div><div class='add'>+{</div><div class='add'>+	return IORESOURCE_MEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Array of bus specific translators</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct of_bus of_busses[] = {</div><div class='add'>+	/* PCI */</div><div class='add'>+	{</div><div class='add'>+		.name = "pci",</div><div class='add'>+		.addr_prop_name = "assigned-addresses",</div><div class='add'>+		.match = of_bus_pci_match,</div><div class='add'>+		.count_cells = of_bus_pci_count_cells,</div><div class='add'>+		.map = of_bus_pci_map,</div><div class='add'>+		.get_flags = of_bus_pci_get_flags,</div><div class='add'>+	},</div><div class='add'>+	/* SBUS */</div><div class='add'>+	{</div><div class='add'>+		.name = "sbus",</div><div class='add'>+		.addr_prop_name = "reg",</div><div class='add'>+		.match = of_bus_sbus_match,</div><div class='add'>+		.count_cells = of_bus_sbus_count_cells,</div><div class='add'>+		.map = of_bus_sbus_map,</div><div class='add'>+		.get_flags = of_bus_sbus_get_flags,</div><div class='add'>+	},</div><div class='add'>+	/* Default */</div><div class='add'>+	{</div><div class='add'>+		.name = "default",</div><div class='add'>+		.addr_prop_name = "reg",</div><div class='add'>+		.match = NULL,</div><div class='add'>+		.count_cells = of_bus_default_count_cells,</div><div class='add'>+		.map = of_bus_default_map,</div><div class='add'>+		.get_flags = of_bus_default_get_flags,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_bus *of_match_bus(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(of_busses); i ++)</div><div class='add'>+		if (!of_busses[i].match || of_busses[i].match(np))</div><div class='add'>+			return &amp;of_busses[i];</div><div class='add'>+	BUG();</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init build_one_resource(struct device_node *parent,</div><div class='add'>+				     struct of_bus *bus,</div><div class='add'>+				     struct of_bus *pbus,</div><div class='add'>+				     u32 *addr,</div><div class='add'>+				     int na, int ns, int pna)</div><div class='add'>+{</div><div class='add'>+	u32 *ranges;</div><div class='add'>+	unsigned int rlen;</div><div class='add'>+	int rone;</div><div class='add'>+</div><div class='add'>+	ranges = of_get_property(parent, "ranges", &amp;rlen);</div><div class='add'>+	if (ranges == NULL || rlen == 0) {</div><div class='add'>+		u32 result[OF_MAX_ADDR_CELLS];</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		memset(result, 0, pna * 4);</div><div class='add'>+		for (i = 0; i &lt; na; i++)</div><div class='add'>+			result[pna - 1 - i] =</div><div class='add'>+				addr[na - 1 - i];</div><div class='add'>+</div><div class='add'>+		memcpy(addr, result, pna * 4);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now walk through the ranges */</div><div class='add'>+	rlen /= 4;</div><div class='add'>+	rone = na + pna + ns;</div><div class='add'>+	for (; rlen &gt;= rone; rlen -= rone, ranges += rone) {</div><div class='add'>+		if (!bus-&gt;map(addr, ranges, na, ns, pna))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init use_1to1_mapping(struct device_node *pp)</div><div class='add'>+{</div><div class='add'>+	char *model;</div><div class='add'>+</div><div class='add'>+	/* If this is on the PMU bus, don't try to translate it even</div><div class='add'>+	 * if a ranges property exists.</div><div class='add'>+	 */</div><div class='add'>+	if (!strcmp(pp-&gt;name, "pmu"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* If we have a ranges property in the parent, use it.  */</div><div class='add'>+	if (of_find_property(pp, "ranges", NULL) != NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If the parent is the dma node of an ISA bus, pass</div><div class='add'>+	 * the translation up to the root.</div><div class='add'>+	 */</div><div class='add'>+	if (!strcmp(pp-&gt;name, "dma"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Similarly for Simba PCI bridges.  */</div><div class='add'>+	model = of_get_property(pp, "model", NULL);</div><div class='add'>+	if (model &amp;&amp; !strcmp(model, "SUNW,simba"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_resource_verbose;</div><div class='add'>+</div><div class='add'>+static void __init build_device_resources(struct of_device *op,</div><div class='add'>+					  struct device *parent)</div><div class='add'>+{</div><div class='add'>+	struct of_device *p_op;</div><div class='add'>+	struct of_bus *bus;</div><div class='add'>+	int na, ns;</div><div class='add'>+	int index, num_reg;</div><div class='add'>+	void *preg;</div><div class='add'>+</div><div class='add'>+	if (!parent)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p_op = to_of_device(parent);</div><div class='add'>+	bus = of_match_bus(p_op-&gt;node);</div><div class='add'>+	bus-&gt;count_cells(op-&gt;node, &amp;na, &amp;ns);</div><div class='add'>+</div><div class='add'>+	preg = of_get_property(op-&gt;node, bus-&gt;addr_prop_name, &amp;num_reg);</div><div class='add'>+	if (!preg || num_reg == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Convert to num-cells.  */</div><div class='add'>+	num_reg /= 4;</div><div class='add'>+</div><div class='add'>+	/* Conver to num-entries.  */</div><div class='add'>+	num_reg /= na + ns;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; num_reg; index++) {</div><div class='add'>+		struct resource *r = &amp;op-&gt;resource[index];</div><div class='add'>+		u32 addr[OF_MAX_ADDR_CELLS];</div><div class='add'>+		u32 *reg = (preg + (index * ((na + ns) * 4)));</div><div class='add'>+		struct device_node *dp = op-&gt;node;</div><div class='add'>+		struct device_node *pp = p_op-&gt;node;</div><div class='add'>+		struct of_bus *pbus;</div><div class='add'>+		u64 size, result = OF_BAD_ADDR;</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		int dna, dns;</div><div class='add'>+		int pna, pns;</div><div class='add'>+</div><div class='add'>+		size = of_read_addr(reg + na, ns);</div><div class='add'>+		flags = bus-&gt;get_flags(reg);</div><div class='add'>+</div><div class='add'>+		memcpy(addr, reg, na * 4);</div><div class='add'>+</div><div class='add'>+		if (use_1to1_mapping(pp)) {</div><div class='add'>+			result = of_read_addr(addr, na);</div><div class='add'>+			goto build_res;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dna = na;</div><div class='add'>+		dns = ns;</div><div class='add'>+</div><div class='add'>+		while (1) {</div><div class='add'>+			dp = pp;</div><div class='add'>+			pp = dp-&gt;parent;</div><div class='add'>+			if (!pp) {</div><div class='add'>+				result = of_read_addr(addr, dna);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			pbus = of_match_bus(pp);</div><div class='add'>+			pbus-&gt;count_cells(dp, &amp;pna, &amp;pns);</div><div class='add'>+</div><div class='add'>+			if (build_one_resource(dp, bus, pbus, addr,</div><div class='add'>+					       dna, dns, pna))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			dna = pna;</div><div class='add'>+			dns = pns;</div><div class='add'>+			bus = pbus;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	build_res:</div><div class='add'>+		memset(r, 0, sizeof(*r));</div><div class='add'>+</div><div class='add'>+		if (of_resource_verbose)</div><div class='add'>+			printk("%s reg[%d] -&gt; %lx\n",</div><div class='add'>+			       op-&gt;node-&gt;full_name, index,</div><div class='add'>+			       result);</div><div class='add'>+</div><div class='add'>+		if (result != OF_BAD_ADDR) {</div><div class='add'>+			if (tlb_type == hypervisor)</div><div class='add'>+				result &amp;= 0x0fffffffffffffffUL;</div><div class='add'>+</div><div class='add'>+			r-&gt;start = result;</div><div class='add'>+			r-&gt;end = result + size - 1;</div><div class='add'>+			r-&gt;flags = flags;</div><div class='add'>+		} else {</div><div class='add'>+			r-&gt;start = ~0UL;</div><div class='add'>+			r-&gt;end = ~0UL;</div><div class='add'>+		}</div><div class='add'>+		r-&gt;name = op-&gt;node-&gt;name;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node * __init</div><div class='add'>+apply_interrupt_map(struct device_node *dp, struct device_node *pp,</div><div class='add'>+		    u32 *imap, int imlen, u32 *imask,</div><div class='add'>+		    unsigned int *irq_p)</div><div class='add'>+{</div><div class='add'>+	struct device_node *cp;</div><div class='add'>+	unsigned int irq = *irq_p;</div><div class='add'>+	struct of_bus *bus;</div><div class='add'>+	phandle handle;</div><div class='add'>+	u32 *reg;</div><div class='add'>+	int na, num_reg, i;</div><div class='add'>+</div><div class='add'>+	bus = of_match_bus(pp);</div><div class='add'>+	bus-&gt;count_cells(dp, &amp;na, NULL);</div><div class='add'>+</div><div class='add'>+	reg = of_get_property(dp, "reg", &amp;num_reg);</div><div class='add'>+	if (!reg || !num_reg)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	imlen /= ((na + 3) * 4);</div><div class='add'>+	handle = 0;</div><div class='add'>+	for (i = 0; i &lt; imlen; i++) {</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; na; j++) {</div><div class='add'>+			if ((reg[j] &amp; imask[j]) != imap[j])</div><div class='add'>+				goto next;</div><div class='add'>+		}</div><div class='add'>+		if (imap[na] == irq) {</div><div class='add'>+			handle = imap[na + 1];</div><div class='add'>+			irq = imap[na + 2];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	next:</div><div class='add'>+		imap += (na + 3);</div><div class='add'>+	}</div><div class='add'>+	if (i == imlen)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*irq_p = irq;</div><div class='add'>+	cp = of_find_node_by_phandle(handle);</div><div class='add'>+</div><div class='add'>+	return cp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int __init pci_irq_swizzle(struct device_node *dp,</div><div class='add'>+					   struct device_node *pp,</div><div class='add'>+					   unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_pci_registers *regs;</div><div class='add'>+	unsigned int devfn, slot, ret;</div><div class='add'>+</div><div class='add'>+	if (irq &lt; 1 || irq &gt; 4)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	if (!regs)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	devfn = (regs-&gt;phys_hi &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	slot = (devfn &gt;&gt; 3) &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	ret = ((irq - 1 + (slot &amp; 3)) &amp; 3) + 1;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int of_irq_verbose;</div><div class='add'>+</div><div class='add'>+static unsigned int __init build_one_device_irq(struct of_device *op,</div><div class='add'>+						struct device *parent,</div><div class='add'>+						unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct device_node *pp, *ip;</div><div class='add'>+	unsigned int orig_irq = irq;</div><div class='add'>+</div><div class='add'>+	if (irq == 0xffffffff)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;irq_trans) {</div><div class='add'>+		irq = dp-&gt;irq_trans-&gt;irq_build(dp, irq,</div><div class='add'>+					       dp-&gt;irq_trans-&gt;data);</div><div class='add'>+</div><div class='add'>+		if (of_irq_verbose)</div><div class='add'>+			printk("%s: direct translate %x --&gt; %x\n",</div><div class='add'>+			       dp-&gt;full_name, orig_irq, irq);</div><div class='add'>+</div><div class='add'>+		return irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Something more complicated.  Walk up to the root, applying</div><div class='add'>+	 * interrupt-map or bus specific translations, until we hit</div><div class='add'>+	 * an IRQ translator.</div><div class='add'>+	 *</div><div class='add'>+	 * If we hit a bus type or situation we cannot handle, we</div><div class='add'>+	 * stop and assume that the original IRQ number was in a</div><div class='add'>+	 * format which has special meaning to it's immediate parent.</div><div class='add'>+	 */</div><div class='add'>+	pp = dp-&gt;parent;</div><div class='add'>+	ip = NULL;</div><div class='add'>+	while (pp) {</div><div class='add'>+		void *imap, *imsk;</div><div class='add'>+		int imlen;</div><div class='add'>+</div><div class='add'>+		imap = of_get_property(pp, "interrupt-map", &amp;imlen);</div><div class='add'>+		imsk = of_get_property(pp, "interrupt-map-mask", NULL);</div><div class='add'>+		if (imap &amp;&amp; imsk) {</div><div class='add'>+			struct device_node *iret;</div><div class='add'>+			int this_orig_irq = irq;</div><div class='add'>+</div><div class='add'>+			iret = apply_interrupt_map(dp, pp,</div><div class='add'>+						   imap, imlen, imsk,</div><div class='add'>+						   &amp;irq);</div><div class='add'>+</div><div class='add'>+			if (of_irq_verbose)</div><div class='add'>+				printk("%s: Apply [%s:%x] imap --&gt; [%s:%x]\n",</div><div class='add'>+				       op-&gt;node-&gt;full_name,</div><div class='add'>+				       pp-&gt;full_name, this_orig_irq,</div><div class='add'>+				       (iret ? iret-&gt;full_name : "NULL"), irq);</div><div class='add'>+</div><div class='add'>+			if (!iret)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (iret-&gt;irq_trans) {</div><div class='add'>+				ip = iret;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (!strcmp(pp-&gt;type, "pci") ||</div><div class='add'>+			    !strcmp(pp-&gt;type, "pciex")) {</div><div class='add'>+				unsigned int this_orig_irq = irq;</div><div class='add'>+</div><div class='add'>+				irq = pci_irq_swizzle(dp, pp, irq);</div><div class='add'>+				if (of_irq_verbose)</div><div class='add'>+					printk("%s: PCI swizzle [%s] "</div><div class='add'>+					       "%x --&gt; %x\n",</div><div class='add'>+					       op-&gt;node-&gt;full_name,</div><div class='add'>+					       pp-&gt;full_name, this_orig_irq,</div><div class='add'>+					       irq);</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (pp-&gt;irq_trans) {</div><div class='add'>+				ip = pp;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		dp = pp;</div><div class='add'>+		pp = pp-&gt;parent;</div><div class='add'>+	}</div><div class='add'>+	if (!ip)</div><div class='add'>+		return orig_irq;</div><div class='add'>+</div><div class='add'>+	irq = ip-&gt;irq_trans-&gt;irq_build(op-&gt;node, irq,</div><div class='add'>+				       ip-&gt;irq_trans-&gt;data);</div><div class='add'>+	if (of_irq_verbose)</div><div class='add'>+		printk("%s: Apply IRQ trans [%s] %x --&gt; %x\n",</div><div class='add'>+		       op-&gt;node-&gt;full_name, ip-&gt;full_name, orig_irq, irq);</div><div class='add'>+</div><div class='add'>+	return irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device * __init scan_one_device(struct device_node *dp,</div><div class='add'>+						 struct device *parent)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = kzalloc(sizeof(*op), GFP_KERNEL);</div><div class='add'>+	unsigned int *irq;</div><div class='add'>+	int len, i;</div><div class='add'>+</div><div class='add'>+	if (!op)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	op-&gt;node = dp;</div><div class='add'>+</div><div class='add'>+	op-&gt;clock_freq = of_getintprop_default(dp, "clock-frequency",</div><div class='add'>+					       (25*1000*1000));</div><div class='add'>+	op-&gt;portid = of_getintprop_default(dp, "upa-portid", -1);</div><div class='add'>+	if (op-&gt;portid == -1)</div><div class='add'>+		op-&gt;portid = of_getintprop_default(dp, "portid", -1);</div><div class='add'>+</div><div class='add'>+	irq = of_get_property(dp, "interrupts", &amp;len);</div><div class='add'>+	if (irq) {</div><div class='add'>+		memcpy(op-&gt;irqs, irq, len);</div><div class='add'>+		op-&gt;num_irqs = len / 4;</div><div class='add'>+	} else {</div><div class='add'>+		op-&gt;num_irqs = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	build_device_resources(op, parent);</div><div class='add'>+	for (i = 0; i &lt; op-&gt;num_irqs; i++)</div><div class='add'>+		op-&gt;irqs[i] = build_one_device_irq(op, parent, op-&gt;irqs[i]);</div><div class='add'>+</div><div class='add'>+	op-&gt;dev.parent = parent;</div><div class='add'>+	op-&gt;dev.bus = &amp;of_bus_type;</div><div class='add'>+	if (!parent)</div><div class='add'>+		strcpy(op-&gt;dev.bus_id, "root");</div><div class='add'>+	else</div><div class='add'>+		strcpy(op-&gt;dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+	if (of_device_register(op)) {</div><div class='add'>+		printk("%s: Could not register of device.\n",</div><div class='add'>+		       dp-&gt;full_name);</div><div class='add'>+		kfree(op);</div><div class='add'>+		op = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return op;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init scan_tree(struct device_node *dp, struct device *parent)</div><div class='add'>+{</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct of_device *op = scan_one_device(dp, parent);</div><div class='add'>+</div><div class='add'>+		if (op)</div><div class='add'>+			scan_tree(dp-&gt;child, &amp;op-&gt;dev);</div><div class='add'>+</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init scan_of_devices(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *root = of_find_node_by_path("/");</div><div class='add'>+	struct of_device *parent;</div><div class='add'>+</div><div class='add'>+	parent = scan_one_device(root, NULL);</div><div class='add'>+	if (!parent)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scan_tree(root-&gt;child, &amp;parent-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init of_bus_driver_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bus_register(&amp;of_bus_type);</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (!err)</div><div class='add'>+		err = bus_register(&amp;isa_bus_type);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = bus_register(&amp;ebus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	if (!err)</div><div class='add'>+		err = bus_register(&amp;sbus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		scan_of_devices();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+postcore_initcall(of_bus_driver_init);</div><div class='add'>+</div><div class='add'>+static int __init of_debug(char *str)</div><div class='add'>+{</div><div class='add'>+	int val = 0;</div><div class='add'>+</div><div class='add'>+	get_option(&amp;str, &amp;val);</div><div class='add'>+	if (val &amp; 1)</div><div class='add'>+		of_resource_verbose = 1;</div><div class='add'>+	if (val &amp; 2)</div><div class='add'>+		of_irq_verbose = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("of_debug=", of_debug);</div><div class='add'>+</div><div class='add'>+int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)</div><div class='add'>+{</div><div class='add'>+	/* initialize common driver fields */</div><div class='add'>+	drv-&gt;driver.name = drv-&gt;name;</div><div class='add'>+	drv-&gt;driver.bus = bus;</div><div class='add'>+</div><div class='add'>+	/* register with core */</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void of_unregister_driver(struct of_platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct of_device *ofdev;</div><div class='add'>+</div><div class='add'>+	ofdev = to_of_device(dev);</div><div class='add'>+	return sprintf(buf, "%s", ofdev-&gt;node-&gt;full_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * of_release_dev - free an of device structure when all users of it are finished.</div><div class='add'>+ * @dev: device that's been disconnected</div><div class='add'>+ *</div><div class='add'>+ * Will be called only by the device core when all users of this of device are</div><div class='add'>+ * done.</div><div class='add'>+ */</div><div class='add'>+void of_release_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct of_device *ofdev;</div><div class='add'>+</div><div class='add'>+        ofdev = to_of_device(dev);</div><div class='add'>+</div><div class='add'>+	kfree(ofdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int of_device_register(struct of_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ofdev-&gt;node == NULL);</div><div class='add'>+</div><div class='add'>+	rc = device_register(&amp;ofdev-&gt;dev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = device_create_file(&amp;ofdev-&gt;dev, &amp;dev_attr_devspec);</div><div class='add'>+	if (rc)</div><div class='add'>+		device_unregister(&amp;ofdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void of_device_unregister(struct of_device *ofdev)</div><div class='add'>+{</div><div class='add'>+	device_remove_file(&amp;ofdev-&gt;dev, &amp;dev_attr_devspec);</div><div class='add'>+	device_unregister(&amp;ofdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct of_device* of_platform_device_create(struct device_node *np,</div><div class='add'>+					    const char *bus_id,</div><div class='add'>+					    struct device *parent,</div><div class='add'>+					    struct bus_type *bus)</div><div class='add'>+{</div><div class='add'>+	struct of_device *dev;</div><div class='add'>+</div><div class='add'>+	dev = kmalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+	memset(dev, 0, sizeof(*dev));</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev.parent = parent;</div><div class='add'>+	dev-&gt;dev.bus = bus;</div><div class='add'>+	dev-&gt;dev.release = of_release_dev;</div><div class='add'>+</div><div class='add'>+	strlcpy(dev-&gt;dev.bus_id, bus_id, BUS_ID_SIZE);</div><div class='add'>+</div><div class='add'>+	if (of_device_register(dev) != 0) {</div><div class='add'>+		kfree(dev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(of_match_device);</div><div class='add'>+EXPORT_SYMBOL(of_register_driver);</div><div class='add'>+EXPORT_SYMBOL(of_unregister_driver);</div><div class='add'>+EXPORT_SYMBOL(of_device_register);</div><div class='add'>+EXPORT_SYMBOL(of_device_unregister);</div><div class='add'>+EXPORT_SYMBOL(of_dev_get);</div><div class='add'>+EXPORT_SYMBOL(of_dev_put);</div><div class='add'>+EXPORT_SYMBOL(of_platform_device_create);</div><div class='add'>+EXPORT_SYMBOL(of_release_dev);</div><div class='head'>diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c<br/>index f97ddeb105ac..e02f01b644af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1999 Jakub Jelinek   (jj@ultra.linux.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -22,6 +21,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/isa.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long pci_memspace_mask = 0xffffffffUL;</div><div class='ctx'> </div><div class='hunk'>@@ -47,12 +47,6 @@ struct pci_controller_info *pci_controller_root = NULL;</div><div class='ctx'> /* Each PCI controller found gets a unique index. */</div><div class='ctx'> int pci_num_controllers = 0;</div><div class='ctx'> </div><div class='del'>-/* At boot time the user can give the kernel a command</div><div class='del'>- * line option which controls if and how PCI devices</div><div class='del'>- * are reordered at PCI bus probing time.</div><div class='del'>- */</div><div class='del'>-int pci_device_reorder = 0;</div><div class='del'>-</div><div class='ctx'> volatile int pci_poke_in_progress;</div><div class='ctx'> volatile int pci_poke_cpu = -1;</div><div class='ctx'> volatile int pci_poke_faulted;</div><div class='hunk'>@@ -183,16 +177,16 @@ void pci_config_write32(u32 *addr, u32 val)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Probe for all PCI controllers in the system. */</div><div class='del'>-extern void sabre_init(int, char *);</div><div class='del'>-extern void psycho_init(int, char *);</div><div class='del'>-extern void schizo_init(int, char *);</div><div class='del'>-extern void schizo_plus_init(int, char *);</div><div class='del'>-extern void tomatillo_init(int, char *);</div><div class='del'>-extern void sun4v_pci_init(int, char *);</div><div class='add'>+extern void sabre_init(struct device_node *, const char *);</div><div class='add'>+extern void psycho_init(struct device_node *, const char *);</div><div class='add'>+extern void schizo_init(struct device_node *, const char *);</div><div class='add'>+extern void schizo_plus_init(struct device_node *, const char *);</div><div class='add'>+extern void tomatillo_init(struct device_node *, const char *);</div><div class='add'>+extern void sun4v_pci_init(struct device_node *, const char *);</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='ctx'> 	char *model_name;</div><div class='del'>-	void (*init)(int, char *);</div><div class='add'>+	void (*init)(struct device_node *, const char *);</div><div class='ctx'> } pci_controller_table[] __initdata = {</div><div class='ctx'> 	{ "SUNW,sabre", sabre_init },</div><div class='ctx'> 	{ "pci108e,a000", sabre_init },</div><div class='hunk'>@@ -210,7 +204,7 @@ static struct {</div><div class='ctx'> #define PCI_NUM_CONTROLLER_TYPES (sizeof(pci_controller_table) / \</div><div class='ctx'> 				  sizeof(pci_controller_table[0]))</div><div class='ctx'> </div><div class='del'>-static int __init pci_controller_init(char *model_name, int namelen, int node)</div><div class='add'>+static int __init pci_controller_init(const char *model_name, int namelen, struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -218,18 +212,15 @@ static int __init pci_controller_init(char *model_name, int namelen, int node)</div><div class='ctx'> 		if (!strncmp(model_name,</div><div class='ctx'> 			     pci_controller_table[i].model_name,</div><div class='ctx'> 			     namelen)) {</div><div class='del'>-			pci_controller_table[i].init(node, model_name);</div><div class='add'>+			pci_controller_table[i].init(dp, model_name);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk("PCI: Warning unknown controller, model name [%s]\n",</div><div class='del'>-	       model_name);</div><div class='del'>-	printk("PCI: Ignoring controller...\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pci_is_controller(char *model_name, int namelen, int node)</div><div class='add'>+static int __init pci_is_controller(const char *model_name, int namelen, struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -243,36 +234,35 @@ static int __init pci_is_controller(char *model_name, int namelen, int node)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init pci_controller_scan(int (*handler)(char *, int, int))</div><div class='add'>+static int __init pci_controller_scan(int (*handler)(const char *, int, struct device_node *))</div><div class='ctx'> {</div><div class='del'>-	char namebuf[64];</div><div class='del'>-	int node;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='del'>-	node = prom_getchild(prom_root_node);</div><div class='del'>-	while ((node = prom_searchsiblings(node, "pci")) != 0) {</div><div class='add'>+	for_each_node_by_name(dp, "pci") {</div><div class='add'>+		struct property *prop;</div><div class='ctx'> 		int len;</div><div class='ctx'> </div><div class='del'>-		if ((len = prom_getproperty(node, "model", namebuf, sizeof(namebuf))) &gt; 0 ||</div><div class='del'>-		    (len = prom_getproperty(node, "compatible", namebuf, sizeof(namebuf))) &gt; 0) {</div><div class='add'>+		prop = of_find_property(dp, "model", &amp;len);</div><div class='add'>+		if (!prop)</div><div class='add'>+			prop = of_find_property(dp, "compatible", &amp;len);</div><div class='add'>+</div><div class='add'>+		if (prop) {</div><div class='add'>+			const char *model = prop-&gt;value;</div><div class='ctx'> 			int item_len = 0;</div><div class='ctx'> </div><div class='ctx'> 			/* Our value may be a multi-valued string in the</div><div class='ctx'> 			 * case of some compatible properties. For sanity,</div><div class='del'>-			 * only try the first one. */</div><div class='del'>-</div><div class='del'>-			while (namebuf[item_len] &amp;&amp; len) {</div><div class='add'>+			 * only try the first one.</div><div class='add'>+			 */</div><div class='add'>+			while (model[item_len] &amp;&amp; len) {</div><div class='ctx'> 				len--;</div><div class='ctx'> 				item_len++;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (handler(namebuf, item_len, node))</div><div class='add'>+			if (handler(model, item_len, dp))</div><div class='ctx'> 				count++;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		node = prom_getsibling(node);</div><div class='del'>-		if (!node)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -316,28 +306,6 @@ static void __init pci_scan_each_controller_bus(void)</div><div class='ctx'> 		p-&gt;scan_bus(p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Reorder the pci_dev chain, so that onboard devices come first</div><div class='del'>- * and then come the pluggable cards.</div><div class='del'>- */</div><div class='del'>-static void __init pci_reorder_devs(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pci_onboard = &amp;pci_devices;</div><div class='del'>-	struct list_head *walk = pci_onboard-&gt;next;</div><div class='del'>-</div><div class='del'>-	while (walk != pci_onboard) {</div><div class='del'>-		struct pci_dev *pdev = pci_dev_g(walk);</div><div class='del'>-		struct list_head *walk_next = walk-&gt;next;</div><div class='del'>-</div><div class='del'>-		if (pdev-&gt;irq &amp;&amp; (__irq_ino(pdev-&gt;irq) &amp; 0x20)) {</div><div class='del'>-			list_del(walk);</div><div class='del'>-			list_add(walk, pci_onboard);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		walk = walk_next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern void clock_probe(void);</div><div class='ctx'> extern void power_init(void);</div><div class='ctx'> </div><div class='ctx'> static int __init pcibios_init(void)</div><div class='hunk'>@@ -348,12 +316,8 @@ static int __init pcibios_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pci_scan_each_controller_bus();</div><div class='ctx'> </div><div class='del'>-	if (pci_device_reorder)</div><div class='del'>-		pci_reorder_devs();</div><div class='del'>-</div><div class='ctx'> 	isa_init();</div><div class='ctx'> 	ebus_init();</div><div class='del'>-	clock_probe();</div><div class='ctx'> 	power_init();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -390,7 +354,7 @@ void pcibios_update_irq(struct pci_dev *pdev, int irq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void pcibios_align_resource(void *data, struct resource *res,</div><div class='del'>-			    unsigned long size, unsigned long align)</div><div class='add'>+			    resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -441,14 +405,6 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);</div><div class='ctx'> </div><div class='ctx'> char * __init pcibios_setup(char *str)</div><div class='ctx'> {</div><div class='del'>-	if (!strcmp(str, "onboardfirst")) {</div><div class='del'>-		pci_device_reorder = 1;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	if (!strcmp(str, "noreorder")) {</div><div class='del'>-		pci_device_reorder = 0;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	return str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c<br/>index 33dedb1aacd4..7a59cc72c844 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci_common.c</a></div><div class='hunk'>@@ -9,6 +9,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pbm.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pci_impl.h"</div><div class='ctx'> </div><div class='ctx'> /* Fix self device of BUS and hook it into BUS-&gt;self.</div><div class='ctx'>  * The pci_scan_bus does not do this for the host bridge.</div><div class='hunk'>@@ -28,16 +32,14 @@ void __init pci_fixup_host_bridge_self(struct pci_bus *pbus)</div><div class='ctx'> 	prom_halt();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Find the OBP PROM device tree node for a PCI device.</div><div class='del'>- * Return zero if not found.</div><div class='del'>- */</div><div class='del'>-static int __init find_device_prom_node(struct pci_pbm_info *pbm,</div><div class='del'>-					struct pci_dev *pdev,</div><div class='del'>-					int bus_prom_node,</div><div class='del'>-					struct linux_prom_pci_registers *pregs,</div><div class='del'>-					int *nregs)</div><div class='add'>+/* Find the OBP PROM device tree node for a PCI device.  */</div><div class='add'>+static struct device_node * __init</div><div class='add'>+find_device_prom_node(struct pci_pbm_info *pbm, struct pci_dev *pdev,</div><div class='add'>+		      struct device_node *bus_node,</div><div class='add'>+		      struct linux_prom_pci_registers **pregs,</div><div class='add'>+		      int *nregs)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> </div><div class='ctx'> 	*nregs = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -54,24 +56,30 @@ static int __init find_device_prom_node(struct pci_pbm_info *pbm,</div><div class='ctx'> 	     pdev-&gt;device == PCI_DEVICE_ID_SUN_TOMATILLO ||</div><div class='ctx'> 	     pdev-&gt;device == PCI_DEVICE_ID_SUN_SABRE ||</div><div class='ctx'> 	     pdev-&gt;device == PCI_DEVICE_ID_SUN_HUMMINGBIRD))</div><div class='del'>-		return bus_prom_node;</div><div class='del'>-</div><div class='del'>-	node = prom_getchild(bus_prom_node);</div><div class='del'>-	while (node != 0) {</div><div class='del'>-		int err = prom_getproperty(node, "reg",</div><div class='del'>-					   (char *)pregs,</div><div class='del'>-					   sizeof(*pregs) * PROMREG_MAX);</div><div class='del'>-		if (err == 0 || err == -1)</div><div class='add'>+		return bus_node;</div><div class='add'>+</div><div class='add'>+	dp = bus_node-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct linux_prom_pci_registers *regs;</div><div class='add'>+		struct property *prop;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(dp, "reg", &amp;len);</div><div class='add'>+		if (!prop)</div><div class='ctx'> 			goto do_next_sibling;</div><div class='del'>-		if (((pregs[0].phys_hi &gt;&gt; 8) &amp; 0xff) == pdev-&gt;devfn) {</div><div class='del'>-			*nregs = err / sizeof(*pregs);</div><div class='del'>-			return node;</div><div class='add'>+</div><div class='add'>+		regs = prop-&gt;value;</div><div class='add'>+		if (((regs[0].phys_hi &gt;&gt; 8) &amp; 0xff) == pdev-&gt;devfn) {</div><div class='add'>+			*pregs = regs;</div><div class='add'>+			*nregs = len / sizeof(struct linux_prom_pci_registers);</div><div class='add'>+			return dp;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	do_next_sibling:</div><div class='del'>-		node = prom_getsibling(node);</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Older versions of OBP on PCI systems encode 64-bit MEM</div><div class='hunk'>@@ -128,15 +136,17 @@ static void __init fixup_obp_assignments(struct pci_dev *pdev,</div><div class='ctx'>  */</div><div class='ctx'> static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm,</div><div class='ctx'> 				      struct pci_dev *pdev,</div><div class='del'>-				      int bus_prom_node)</div><div class='add'>+				      struct device_node *bus_node)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_pci_registers pregs[PROMREG_MAX];</div><div class='add'>+	struct linux_prom_pci_registers *pregs = NULL;</div><div class='ctx'> 	struct pcidev_cookie *pcp;</div><div class='del'>-	int device_prom_node, nregs, err;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int nregs, len;</div><div class='ctx'> </div><div class='del'>-	device_prom_node = find_device_prom_node(pbm, pdev, bus_prom_node,</div><div class='del'>-						 pregs, &amp;nregs);</div><div class='del'>-	if (device_prom_node == 0) {</div><div class='add'>+	dp = find_device_prom_node(pbm, pdev, bus_node,</div><div class='add'>+				   &amp;pregs, &amp;nregs);</div><div class='add'>+	if (!dp) {</div><div class='ctx'> 		/* If it is not in the OBP device tree then</div><div class='ctx'> 		 * there must be a damn good reason for it.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -150,45 +160,44 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pcp = kmalloc(sizeof(*pcp), GFP_ATOMIC);</div><div class='add'>+	pcp = kzalloc(sizeof(*pcp), GFP_ATOMIC);</div><div class='ctx'> 	if (pcp == NULL) {</div><div class='ctx'> 		prom_printf("PCI_COOKIE: Fatal malloc error, aborting...\n");</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> 	pcp-&gt;pbm = pbm;</div><div class='del'>-	pcp-&gt;prom_node = device_prom_node;</div><div class='del'>-	memcpy(pcp-&gt;prom_regs, pregs, sizeof(pcp-&gt;prom_regs));</div><div class='add'>+	pcp-&gt;prom_node = dp;</div><div class='add'>+	pcp-&gt;op = of_find_device_by_node(dp);</div><div class='add'>+	memcpy(pcp-&gt;prom_regs, pregs,</div><div class='add'>+	       nregs * sizeof(struct linux_prom_pci_registers));</div><div class='ctx'> 	pcp-&gt;num_prom_regs = nregs;</div><div class='del'>-	err = prom_getproperty(device_prom_node, "name",</div><div class='del'>-			       pcp-&gt;prom_name, sizeof(pcp-&gt;prom_name));</div><div class='del'>-	if (err &gt; 0)</div><div class='del'>-		pcp-&gt;prom_name[err] = 0;</div><div class='del'>-	else</div><div class='del'>-		pcp-&gt;prom_name[0] = 0;</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(device_prom_node,</div><div class='del'>-			       "assigned-addresses",</div><div class='del'>-			       (char *)pcp-&gt;prom_assignments,</div><div class='del'>-			       sizeof(pcp-&gt;prom_assignments));</div><div class='del'>-	if (err == 0 || err == -1)</div><div class='add'>+</div><div class='add'>+	/* We can't have the pcidev_cookie assignments be just</div><div class='add'>+	 * direct pointers into the property value, since they</div><div class='add'>+	 * are potentially modified by the probing process.</div><div class='add'>+	 */</div><div class='add'>+	prop = of_find_property(dp, "assigned-addresses", &amp;len);</div><div class='add'>+	if (!prop) {</div><div class='ctx'> 		pcp-&gt;num_prom_assignments = 0;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(pcp-&gt;prom_assignments, prop-&gt;value, len);</div><div class='ctx'> 		pcp-&gt;num_prom_assignments =</div><div class='del'>-			(err / sizeof(pcp-&gt;prom_assignments[0]));</div><div class='add'>+			(len / sizeof(pcp-&gt;prom_assignments[0]));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (strcmp(pcp-&gt;prom_name, "ebus") == 0) {</div><div class='del'>-		struct linux_prom_ebus_ranges erng[PROM_PCIRNG_MAX];</div><div class='add'>+	if (strcmp(dp-&gt;name, "ebus") == 0) {</div><div class='add'>+		struct linux_prom_ebus_ranges *erng;</div><div class='ctx'> 		int iter;</div><div class='ctx'> </div><div class='ctx'> 		/* EBUS is special... */</div><div class='del'>-		err = prom_getproperty(device_prom_node, "ranges",</div><div class='del'>-				       (char *)&amp;erng[0], sizeof(erng));</div><div class='del'>-		if (err == 0 || err == -1) {</div><div class='add'>+		prop = of_find_property(dp, "ranges", &amp;len);</div><div class='add'>+		if (!prop) {</div><div class='ctx'> 			prom_printf("EBUS: Fatal error, no range property\n");</div><div class='ctx'> 			prom_halt();</div><div class='ctx'> 		}</div><div class='del'>-		err = (err / sizeof(erng[0]));</div><div class='del'>-		for(iter = 0; iter &lt; err; iter++) {</div><div class='add'>+		erng = prop-&gt;value;</div><div class='add'>+		len = (len / sizeof(erng[0]));</div><div class='add'>+		for (iter = 0; iter &lt; len; iter++) {</div><div class='ctx'> 			struct linux_prom_ebus_ranges *ep = &amp;erng[iter];</div><div class='ctx'> 			struct linux_prom_pci_registers *ap;</div><div class='ctx'> </div><div class='hunk'>@@ -200,7 +209,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm,</div><div class='ctx'> 			ap-&gt;size_hi = 0;</div><div class='ctx'> 			ap-&gt;size_lo = ep-&gt;size;</div><div class='ctx'> 		}</div><div class='del'>-		pcp-&gt;num_prom_assignments = err;</div><div class='add'>+		pcp-&gt;num_prom_assignments = len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fixup_obp_assignments(pdev, pcp);</div><div class='hunk'>@@ -210,7 +219,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm,</div><div class='ctx'> </div><div class='ctx'> void __init pci_fill_in_pbm_cookies(struct pci_bus *pbus,</div><div class='ctx'> 				    struct pci_pbm_info *pbm,</div><div class='del'>-				    int prom_node)</div><div class='add'>+				    struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev, *pdev_next;</div><div class='ctx'> 	struct pci_bus *this_pbus, *pbus_next;</div><div class='hunk'>@@ -218,7 +227,7 @@ void __init pci_fill_in_pbm_cookies(struct pci_bus *pbus,</div><div class='ctx'> 	/* This must be _safe because the cookie fillin</div><div class='ctx'> 	   routine can delete devices from the tree.  */</div><div class='ctx'> 	list_for_each_entry_safe(pdev, pdev_next, &amp;pbus-&gt;devices, bus_list)</div><div class='del'>-		pdev_cookie_fillin(pbm, pdev, prom_node);</div><div class='add'>+		pdev_cookie_fillin(pbm, pdev, dp);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(this_pbus, pbus_next, &amp;pbus-&gt;children, node) {</div><div class='ctx'> 		struct pcidev_cookie *pcp = this_pbus-&gt;self-&gt;sysdata;</div><div class='hunk'>@@ -241,7 +250,6 @@ static void __init bad_assignment(struct pci_dev *pdev,</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		prom_printf("PCI: RES[%016lx--&gt;%016lx:(%lx)]\n",</div><div class='ctx'> 			    res-&gt;start, res-&gt;end, res-&gt;flags);</div><div class='del'>-	prom_printf("Please email this information to davem@redhat.com\n");</div><div class='ctx'> 	if (do_prom_halt)</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> }</div><div class='hunk'>@@ -273,8 +281,7 @@ __init get_root_resource(struct linux_prom_pci_registers *ap,</div><div class='ctx'> 		return &amp;pbm-&gt;mem_space;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk("PCI: What is resource space %x? "</div><div class='del'>-		       "Tell davem@redhat.com about it!\n", space);</div><div class='add'>+		printk("PCI: What is resource space %x?\n", space);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='hunk'>@@ -541,287 +548,18 @@ void __init pci_assign_unassigned(struct pci_pbm_info *pbm,</div><div class='ctx'> 		pci_assign_unassigned(pbm, bus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int pci_slot_swivel(struct pci_pbm_info *pbm,</div><div class='del'>-					   struct pci_dev *toplevel_pdev,</div><div class='del'>-					   struct pci_dev *pdev,</div><div class='del'>-					   unsigned int interrupt)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-</div><div class='del'>-	if (unlikely(interrupt &lt; 1 || interrupt &gt; 4)) {</div><div class='del'>-		printk("%s: Device %s interrupt value of %u is strange.\n",</div><div class='del'>-		       pbm-&gt;name, pci_name(pdev), interrupt);</div><div class='del'>-		return interrupt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ((interrupt - 1 + (PCI_SLOT(pdev-&gt;devfn) &amp; 3)) &amp; 3) + 1;</div><div class='del'>-</div><div class='del'>-	printk("%s: %s IRQ Swivel %s [%x:%x] -&gt; [%x]\n",</div><div class='del'>-	       pbm-&gt;name, pci_name(toplevel_pdev), pci_name(pdev),</div><div class='del'>-	       interrupt, PCI_SLOT(pdev-&gt;devfn), ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int pci_apply_intmap(struct pci_pbm_info *pbm,</div><div class='del'>-					    struct pci_dev *toplevel_pdev,</div><div class='del'>-					    struct pci_dev *pbus,</div><div class='del'>-					    struct pci_dev *pdev,</div><div class='del'>-					    unsigned int interrupt,</div><div class='del'>-					    unsigned int *cnode)</div><div class='del'>-{</div><div class='del'>-	struct linux_prom_pci_intmap imap[PROM_PCIIMAP_MAX];</div><div class='del'>-	struct linux_prom_pci_intmask imask;</div><div class='del'>-	struct pcidev_cookie *pbus_pcp = pbus-&gt;sysdata;</div><div class='del'>-	struct pcidev_cookie *pdev_pcp = pdev-&gt;sysdata;</div><div class='del'>-	struct linux_prom_pci_registers *pregs = pdev_pcp-&gt;prom_regs;</div><div class='del'>-	int plen, num_imap, i;</div><div class='del'>-	unsigned int hi, mid, lo, irq, orig_interrupt;</div><div class='del'>-</div><div class='del'>-	*cnode = pbus_pcp-&gt;prom_node;</div><div class='del'>-</div><div class='del'>-	plen = prom_getproperty(pbus_pcp-&gt;prom_node, "interrupt-map",</div><div class='del'>-				(char *) &amp;imap[0], sizeof(imap));</div><div class='del'>-	if (plen &lt;= 0 ||</div><div class='del'>-	    (plen % sizeof(struct linux_prom_pci_intmap)) != 0) {</div><div class='del'>-		printk("%s: Device %s interrupt-map has bad len %d\n",</div><div class='del'>-		       pbm-&gt;name, pci_name(pbus), plen);</div><div class='del'>-		goto no_intmap;</div><div class='del'>-	}</div><div class='del'>-	num_imap = plen / sizeof(struct linux_prom_pci_intmap);</div><div class='del'>-</div><div class='del'>-	plen = prom_getproperty(pbus_pcp-&gt;prom_node, "interrupt-map-mask",</div><div class='del'>-				(char *) &amp;imask, sizeof(imask));</div><div class='del'>-	if (plen &lt;= 0 ||</div><div class='del'>-	    (plen % sizeof(struct linux_prom_pci_intmask)) != 0) {</div><div class='del'>-		printk("%s: Device %s interrupt-map-mask has bad len %d\n",</div><div class='del'>-		       pbm-&gt;name, pci_name(pbus), plen);</div><div class='del'>-		goto no_intmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	orig_interrupt = interrupt;</div><div class='del'>-</div><div class='del'>-	hi   = pregs-&gt;phys_hi &amp; imask.phys_hi;</div><div class='del'>-	mid  = pregs-&gt;phys_mid &amp; imask.phys_mid;</div><div class='del'>-	lo   = pregs-&gt;phys_lo &amp; imask.phys_lo;</div><div class='del'>-	irq  = interrupt &amp; imask.interrupt;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_imap; i++) {</div><div class='del'>-		if (imap[i].phys_hi  == hi   &amp;&amp;</div><div class='del'>-		    imap[i].phys_mid == mid  &amp;&amp;</div><div class='del'>-		    imap[i].phys_lo  == lo   &amp;&amp;</div><div class='del'>-		    imap[i].interrupt == irq) {</div><div class='del'>-			*cnode = imap[i].cnode;</div><div class='del'>-			interrupt = imap[i].cinterrupt;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("%s: %s MAP BUS %s DEV %s [%x] -&gt; [%x]\n",</div><div class='del'>-	       pbm-&gt;name, pci_name(toplevel_pdev),</div><div class='del'>-	       pci_name(pbus), pci_name(pdev),</div><div class='del'>-	       orig_interrupt, interrupt);</div><div class='del'>-</div><div class='del'>-no_intmap:</div><div class='del'>-	return interrupt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* For each PCI bus on the way to the root:</div><div class='del'>- * 1) If it has an interrupt-map property, apply it.</div><div class='del'>- * 2) Else, swivel the interrupt number based upon the PCI device number.</div><div class='del'>- *</div><div class='del'>- * Return the "IRQ controller" node.  If this is the PBM's device node,</div><div class='del'>- * all interrupt translations are complete, else we should use that node's</div><div class='del'>- * "reg" property to apply the PBM's "interrupt-{map,mask}" to the interrupt.</div><div class='del'>- */</div><div class='del'>-static unsigned int __init pci_intmap_match_to_root(struct pci_pbm_info *pbm,</div><div class='del'>-						    struct pci_dev *pdev,</div><div class='del'>-						    unsigned int *interrupt)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *toplevel_pdev = pdev;</div><div class='del'>-	struct pcidev_cookie *toplevel_pcp = toplevel_pdev-&gt;sysdata;</div><div class='del'>-	unsigned int cnode = toplevel_pcp-&gt;prom_node;</div><div class='del'>-</div><div class='del'>-	while (pdev-&gt;bus-&gt;number != pbm-&gt;pci_first_busno) {</div><div class='del'>-		struct pci_dev *pbus = pdev-&gt;bus-&gt;self;</div><div class='del'>-		struct pcidev_cookie *pcp = pbus-&gt;sysdata;</div><div class='del'>-		int plen;</div><div class='del'>-</div><div class='del'>-		plen = prom_getproplen(pcp-&gt;prom_node, "interrupt-map");</div><div class='del'>-		if (plen &lt;= 0) {</div><div class='del'>-			*interrupt = pci_slot_swivel(pbm, toplevel_pdev,</div><div class='del'>-						     pdev, *interrupt);</div><div class='del'>-			cnode = pcp-&gt;prom_node;</div><div class='del'>-		} else {</div><div class='del'>-			*interrupt = pci_apply_intmap(pbm, toplevel_pdev,</div><div class='del'>-						      pbus, pdev,</div><div class='del'>-						      *interrupt, &amp;cnode);</div><div class='del'>-</div><div class='del'>-			while (pcp-&gt;prom_node != cnode &amp;&amp;</div><div class='del'>-			       pbus-&gt;bus-&gt;number != pbm-&gt;pci_first_busno) {</div><div class='del'>-				pbus = pbus-&gt;bus-&gt;self;</div><div class='del'>-				pcp = pbus-&gt;sysdata;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		pdev = pbus;</div><div class='del'>-</div><div class='del'>-		if (cnode == pbm-&gt;prom_node)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cnode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt)</div><div class='del'>-{</div><div class='del'>-	struct pcidev_cookie *dev_pcp = pdev-&gt;sysdata;</div><div class='del'>-	struct pci_pbm_info *pbm = dev_pcp-&gt;pbm;</div><div class='del'>-	struct linux_prom_pci_registers reg[PROMREG_MAX];</div><div class='del'>-	unsigned int hi, mid, lo, irq;</div><div class='del'>-	int i, cnode, plen;</div><div class='del'>-</div><div class='del'>-	cnode = pci_intmap_match_to_root(pbm, pdev, interrupt);</div><div class='del'>-	if (cnode == pbm-&gt;prom_node)</div><div class='del'>-		goto success;</div><div class='del'>-</div><div class='del'>-	plen = prom_getproperty(cnode, "reg", (char *) reg, sizeof(reg));</div><div class='del'>-	if (plen &lt;= 0 ||</div><div class='del'>-	    (plen % sizeof(struct linux_prom_pci_registers)) != 0) {</div><div class='del'>-		printk("%s: OBP node %x reg property has bad len %d\n",</div><div class='del'>-		       pbm-&gt;name, cnode, plen);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hi   = reg[0].phys_hi &amp; pbm-&gt;pbm_intmask.phys_hi;</div><div class='del'>-	mid  = reg[0].phys_mid &amp; pbm-&gt;pbm_intmask.phys_mid;</div><div class='del'>-	lo   = reg[0].phys_lo &amp; pbm-&gt;pbm_intmask.phys_lo;</div><div class='del'>-	irq  = *interrupt &amp; pbm-&gt;pbm_intmask.interrupt;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pbm-&gt;num_pbm_intmap; i++) {</div><div class='del'>-		struct linux_prom_pci_intmap *intmap;</div><div class='del'>-</div><div class='del'>-		intmap = &amp;pbm-&gt;pbm_intmap[i];</div><div class='del'>-</div><div class='del'>-		if (intmap-&gt;phys_hi  == hi  &amp;&amp;</div><div class='del'>-		    intmap-&gt;phys_mid == mid &amp;&amp;</div><div class='del'>-		    intmap-&gt;phys_lo  == lo  &amp;&amp;</div><div class='del'>-		    intmap-&gt;interrupt == irq) {</div><div class='del'>-			*interrupt = intmap-&gt;cinterrupt;</div><div class='del'>-			goto success;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-success:</div><div class='del'>-	printk("PCI-IRQ: Routing bus[%2x] slot[%2x] to INO[%02x]\n",</div><div class='del'>-	       pdev-&gt;bus-&gt;number, PCI_SLOT(pdev-&gt;devfn),</div><div class='del'>-	       *interrupt);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init pdev_fixup_irq(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcidev_cookie *pcp = pdev-&gt;sysdata;</div><div class='del'>-	struct pci_pbm_info *pbm = pcp-&gt;pbm;</div><div class='del'>-	struct pci_controller_info *p = pbm-&gt;parent;</div><div class='del'>-	unsigned int portid = pbm-&gt;portid;</div><div class='del'>-	unsigned int prom_irq;</div><div class='del'>-	int prom_node = pcp-&gt;prom_node;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* If this is an empty EBUS device, sometimes OBP fails to</div><div class='del'>-	 * give it a valid fully specified interrupts property.</div><div class='del'>-	 * The EBUS hooked up to SunHME on PCI I/O boards of</div><div class='del'>-	 * Ex000 systems is one such case.</div><div class='del'>-	 *</div><div class='del'>-	 * The interrupt is not important so just ignore it.</div><div class='del'>-	 */</div><div class='del'>-	if (pdev-&gt;vendor == PCI_VENDOR_ID_SUN &amp;&amp;</div><div class='del'>-	    pdev-&gt;device == PCI_DEVICE_ID_SUN_EBUS &amp;&amp;</div><div class='del'>-	    !prom_getchild(prom_node)) {</div><div class='del'>-		pdev-&gt;irq = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	struct of_device *op = pcp-&gt;op;</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "interrupts",</div><div class='del'>-			       (char *)&amp;prom_irq, sizeof(prom_irq));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		pdev-&gt;irq = 0;</div><div class='add'>+	if (op-&gt;irqs[0] == 0xffffffff) {</div><div class='add'>+		pdev-&gt;irq = PCI_IRQ_NONE;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tlb_type != hypervisor) {</div><div class='del'>-		/* Fully specified already? */</div><div class='del'>-		if (((prom_irq &amp; PCI_IRQ_IGN) &gt;&gt; 6) == portid) {</div><div class='del'>-			pdev-&gt;irq = p-&gt;irq_build(pbm, pdev, prom_irq);</div><div class='del'>-			goto have_irq;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* An onboard device? (bit 5 set) */</div><div class='del'>-		if ((prom_irq &amp; PCI_IRQ_INO) &amp; 0x20) {</div><div class='del'>-			pdev-&gt;irq = p-&gt;irq_build(pbm, pdev, (portid &lt;&lt; 6 | prom_irq));</div><div class='del'>-			goto have_irq;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Can we find a matching entry in the interrupt-map? */</div><div class='del'>-	if (pci_intmap_match(pdev, &amp;prom_irq)) {</div><div class='del'>-		pdev-&gt;irq = p-&gt;irq_build(pbm, pdev, (portid &lt;&lt; 6) | prom_irq);</div><div class='del'>-		goto have_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ok, we have to do it the hard way. */</div><div class='del'>-	{</div><div class='del'>-		unsigned int bus, slot, line;</div><div class='del'>-</div><div class='del'>-		bus = (pbm == &amp;pbm-&gt;parent-&gt;pbm_B) ? (1 &lt;&lt; 4) : 0;</div><div class='del'>-</div><div class='del'>-		/* If we have a legal interrupt property, use it as</div><div class='del'>-		 * the IRQ line.</div><div class='del'>-		 */</div><div class='del'>-		if (prom_irq &gt; 0 &amp;&amp; prom_irq &lt; 5) {</div><div class='del'>-			line = ((prom_irq - 1) &amp; 3);</div><div class='del'>-		} else {</div><div class='del'>-			u8 pci_irq_line;</div><div class='del'>-</div><div class='del'>-			/* Else just directly consult PCI config space. */</div><div class='del'>-			pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &amp;pci_irq_line);</div><div class='del'>-			line = ((pci_irq_line - 1) &amp; 3);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now figure out the slot.</div><div class='del'>-		 *</div><div class='del'>-		 * Basically, device number zero on the top-level bus is</div><div class='del'>-		 * always the PCI host controller.  Slot 0 is then device 1.</div><div class='del'>-		 * PBM A supports two external slots (0 and 1), and PBM B</div><div class='del'>-		 * supports 4 external slots (0, 1, 2, and 3).  On-board PCI</div><div class='del'>-		 * devices are wired to device numbers outside of these</div><div class='del'>-		 * ranges. -DaveM</div><div class='del'>- 		 */</div><div class='del'>-		if (pdev-&gt;bus-&gt;number == pbm-&gt;pci_first_busno) {</div><div class='del'>-			slot = PCI_SLOT(pdev-&gt;devfn) - pbm-&gt;pci_first_slot;</div><div class='del'>-		} else {</div><div class='del'>-			struct pci_dev *bus_dev;</div><div class='del'>-</div><div class='del'>-			/* Underneath a bridge, use slot number of parent</div><div class='del'>-			 * bridge which is closest to the PBM.</div><div class='del'>-			 */</div><div class='del'>-			bus_dev = pdev-&gt;bus-&gt;self;</div><div class='del'>-			while (bus_dev-&gt;bus &amp;&amp;</div><div class='del'>-			       bus_dev-&gt;bus-&gt;number != pbm-&gt;pci_first_busno)</div><div class='del'>-				bus_dev = bus_dev-&gt;bus-&gt;self;</div><div class='del'>-</div><div class='del'>-			slot = PCI_SLOT(bus_dev-&gt;devfn) - pbm-&gt;pci_first_slot;</div><div class='del'>-		}</div><div class='del'>-		slot = slot &lt;&lt; 2;</div><div class='del'>-</div><div class='del'>-		pdev-&gt;irq = p-&gt;irq_build(pbm, pdev,</div><div class='del'>-					 ((portid &lt;&lt; 6) &amp; PCI_IRQ_IGN) |</div><div class='del'>-					 (bus | slot | line));</div><div class='del'>-	}</div><div class='add'>+	pdev-&gt;irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='del'>-have_irq:</div><div class='ctx'> 	pci_write_config_byte(pdev, PCI_INTERRUPT_LINE,</div><div class='ctx'> 			      pdev-&gt;irq &amp; PCI_IRQ_INO);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_impl.h b/arch/sparc64/kernel/pci_impl.h<br/>index 6c3205962544..971e2bea30b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_impl.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_impl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_impl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci_impl.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern struct pci_controller_info *pci_controller_root;</div><div class='ctx'> </div><div class='hunk'>@@ -19,7 +20,7 @@ extern int pci_num_controllers;</div><div class='ctx'> extern void pci_fixup_host_bridge_self(struct pci_bus *pbus);</div><div class='ctx'> extern void pci_fill_in_pbm_cookies(struct pci_bus *pbus,</div><div class='ctx'> 				    struct pci_pbm_info *pbm,</div><div class='del'>-				    int prom_node);</div><div class='add'>+				    struct device_node *prom_node);</div><div class='ctx'> extern void pci_record_assignments(struct pci_pbm_info *pbm,</div><div class='ctx'> 				   struct pci_bus *pbus);</div><div class='ctx'> extern void pci_assign_unassigned(struct pci_pbm_info *pbm,</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c<br/>index d17878b145c2..1ec0aab68c08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_psycho.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_psycho.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_psycho.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci_psycho.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;asm/iommu.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='hunk'>@@ -207,187 +209,6 @@ static struct pci_ops psycho_ops = {</div><div class='ctx'> 	.write =	psycho_write_pci_cfg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* PSYCHO interrupt mapping support. */</div><div class='del'>-#define PSYCHO_IMAP_A_SLOT0	0x0c00UL</div><div class='del'>-#define PSYCHO_IMAP_B_SLOT0	0x0c20UL</div><div class='del'>-static unsigned long psycho_pcislot_imap_offset(unsigned long ino)</div><div class='del'>-{</div><div class='del'>-	unsigned int bus =  (ino &amp; 0x10) &gt;&gt; 4;</div><div class='del'>-	unsigned int slot = (ino &amp; 0x0c) &gt;&gt; 2;</div><div class='del'>-</div><div class='del'>-	if (bus == 0)</div><div class='del'>-		return PSYCHO_IMAP_A_SLOT0 + (slot * 8);</div><div class='del'>-	else</div><div class='del'>-		return PSYCHO_IMAP_B_SLOT0 + (slot * 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PSYCHO_IMAP_SCSI	0x1000UL</div><div class='del'>-#define PSYCHO_IMAP_ETH		0x1008UL</div><div class='del'>-#define PSYCHO_IMAP_BPP		0x1010UL</div><div class='del'>-#define PSYCHO_IMAP_AU_REC	0x1018UL</div><div class='del'>-#define PSYCHO_IMAP_AU_PLAY	0x1020UL</div><div class='del'>-#define PSYCHO_IMAP_PFAIL	0x1028UL</div><div class='del'>-#define PSYCHO_IMAP_KMS		0x1030UL</div><div class='del'>-#define PSYCHO_IMAP_FLPY	0x1038UL</div><div class='del'>-#define PSYCHO_IMAP_SHW		0x1040UL</div><div class='del'>-#define PSYCHO_IMAP_KBD		0x1048UL</div><div class='del'>-#define PSYCHO_IMAP_MS		0x1050UL</div><div class='del'>-#define PSYCHO_IMAP_SER		0x1058UL</div><div class='del'>-#define PSYCHO_IMAP_TIM0	0x1060UL</div><div class='del'>-#define PSYCHO_IMAP_TIM1	0x1068UL</div><div class='del'>-#define PSYCHO_IMAP_UE		0x1070UL</div><div class='del'>-#define PSYCHO_IMAP_CE		0x1078UL</div><div class='del'>-#define PSYCHO_IMAP_A_ERR	0x1080UL</div><div class='del'>-#define PSYCHO_IMAP_B_ERR	0x1088UL</div><div class='del'>-#define PSYCHO_IMAP_PMGMT	0x1090UL</div><div class='del'>-#define PSYCHO_IMAP_GFX		0x1098UL</div><div class='del'>-#define PSYCHO_IMAP_EUPA	0x10a0UL</div><div class='del'>-</div><div class='del'>-static unsigned long __onboard_imap_off[] = {</div><div class='del'>-/*0x20*/	PSYCHO_IMAP_SCSI,</div><div class='del'>-/*0x21*/	PSYCHO_IMAP_ETH,</div><div class='del'>-/*0x22*/	PSYCHO_IMAP_BPP,</div><div class='del'>-/*0x23*/	PSYCHO_IMAP_AU_REC,</div><div class='del'>-/*0x24*/	PSYCHO_IMAP_AU_PLAY,</div><div class='del'>-/*0x25*/	PSYCHO_IMAP_PFAIL,</div><div class='del'>-/*0x26*/	PSYCHO_IMAP_KMS,</div><div class='del'>-/*0x27*/	PSYCHO_IMAP_FLPY,</div><div class='del'>-/*0x28*/	PSYCHO_IMAP_SHW,</div><div class='del'>-/*0x29*/	PSYCHO_IMAP_KBD,</div><div class='del'>-/*0x2a*/	PSYCHO_IMAP_MS,</div><div class='del'>-/*0x2b*/	PSYCHO_IMAP_SER,</div><div class='del'>-/*0x2c*/	PSYCHO_IMAP_TIM0,</div><div class='del'>-/*0x2d*/	PSYCHO_IMAP_TIM1,</div><div class='del'>-/*0x2e*/	PSYCHO_IMAP_UE,</div><div class='del'>-/*0x2f*/	PSYCHO_IMAP_CE,</div><div class='del'>-/*0x30*/	PSYCHO_IMAP_A_ERR,</div><div class='del'>-/*0x31*/	PSYCHO_IMAP_B_ERR,</div><div class='del'>-/*0x32*/	PSYCHO_IMAP_PMGMT</div><div class='del'>-};</div><div class='del'>-#define PSYCHO_ONBOARD_IRQ_BASE		0x20</div><div class='del'>-#define PSYCHO_ONBOARD_IRQ_LAST		0x32</div><div class='del'>-#define psycho_onboard_imap_offset(__ino) \</div><div class='del'>-	__onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE]</div><div class='del'>-</div><div class='del'>-#define PSYCHO_ICLR_A_SLOT0	0x1400UL</div><div class='del'>-#define PSYCHO_ICLR_SCSI	0x1800UL</div><div class='del'>-</div><div class='del'>-#define psycho_iclr_offset(ino)					      \</div><div class='del'>-	((ino &amp; 0x20) ? (PSYCHO_ICLR_SCSI + (((ino) &amp; 0x1f) &lt;&lt; 3)) :  \</div><div class='del'>-			(PSYCHO_ICLR_A_SLOT0 + (((ino) &amp; 0x1f)&lt;&lt;3)))</div><div class='del'>-</div><div class='del'>-/* PCI PSYCHO INO number to Sparc PIL level. */</div><div class='del'>-static unsigned char psycho_pil_table[] = {</div><div class='del'>-/*0x00*/0, 0, 0, 0,	/* PCI A slot 0  Int A, B, C, D */</div><div class='del'>-/*0x04*/0, 0, 0, 0,	/* PCI A slot 1  Int A, B, C, D */</div><div class='del'>-/*0x08*/0, 0, 0, 0,	/* PCI A slot 2  Int A, B, C, D */</div><div class='del'>-/*0x0c*/0, 0, 0, 0,	/* PCI A slot 3  Int A, B, C, D */</div><div class='del'>-/*0x10*/0, 0, 0, 0,	/* PCI B slot 0  Int A, B, C, D */</div><div class='del'>-/*0x14*/0, 0, 0, 0,	/* PCI B slot 1  Int A, B, C, D */</div><div class='del'>-/*0x18*/0, 0, 0, 0,	/* PCI B slot 2  Int A, B, C, D */</div><div class='del'>-/*0x1c*/0, 0, 0, 0,	/* PCI B slot 3  Int A, B, C, D */</div><div class='del'>-/*0x20*/5,		/* SCSI				*/</div><div class='del'>-/*0x21*/5,		/* Ethernet			*/</div><div class='del'>-/*0x22*/8,		/* Parallel Port		*/</div><div class='del'>-/*0x23*/13,		/* Audio Record			*/</div><div class='del'>-/*0x24*/14,		/* Audio Playback		*/</div><div class='del'>-/*0x25*/15,		/* PowerFail			*/</div><div class='del'>-/*0x26*/5,		/* second SCSI			*/</div><div class='del'>-/*0x27*/11,		/* Floppy			*/</div><div class='del'>-/*0x28*/5,		/* Spare Hardware		*/</div><div class='del'>-/*0x29*/9,		/* Keyboard			*/</div><div class='del'>-/*0x2a*/5,		/* Mouse			*/</div><div class='del'>-/*0x2b*/12,		/* Serial			*/</div><div class='del'>-/*0x2c*/10,		/* Timer 0			*/</div><div class='del'>-/*0x2d*/11,		/* Timer 1			*/</div><div class='del'>-/*0x2e*/15,		/* Uncorrectable ECC		*/</div><div class='del'>-/*0x2f*/15,		/* Correctable ECC		*/</div><div class='del'>-/*0x30*/15,		/* PCI Bus A Error		*/</div><div class='del'>-/*0x31*/15,		/* PCI Bus B Error		*/</div><div class='del'>-/*0x32*/15,		/* Power Management		*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = psycho_pil_table[ino];</div><div class='del'>-	if (ret == 0 &amp;&amp; pdev == NULL) {</div><div class='del'>-		ret = 5;</div><div class='del'>-	} else if (ret == 0) {</div><div class='del'>-		switch ((pdev-&gt;class &gt;&gt; 16) &amp; 0xff) {</div><div class='del'>-		case PCI_BASE_CLASS_STORAGE:</div><div class='del'>-			ret = 5;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_NETWORK:</div><div class='del'>-			ret = 6;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_DISPLAY:</div><div class='del'>-			ret = 9;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_MULTIMEDIA:</div><div class='del'>-		case PCI_BASE_CLASS_MEMORY:</div><div class='del'>-		case PCI_BASE_CLASS_BRIDGE:</div><div class='del'>-		case PCI_BASE_CLASS_SERIAL:</div><div class='del'>-			ret = 10;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			ret = 5;</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int psycho_irq_build(struct pci_pbm_info *pbm,</div><div class='del'>-				     struct pci_dev *pdev,</div><div class='del'>-				     unsigned int ino)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	unsigned long imap, iclr;</div><div class='del'>-	unsigned long imap_off, iclr_off;</div><div class='del'>-	int pil, inofixup = 0;</div><div class='del'>-</div><div class='del'>-	ino &amp;= PCI_IRQ_INO;</div><div class='del'>-	if (ino &lt; PSYCHO_ONBOARD_IRQ_BASE) {</div><div class='del'>-		/* PCI slot */</div><div class='del'>-		imap_off = psycho_pcislot_imap_offset(ino);</div><div class='del'>-	} else {</div><div class='del'>-		/* Onboard device */</div><div class='del'>-		if (ino &gt; PSYCHO_ONBOARD_IRQ_LAST) {</div><div class='del'>-			prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		imap_off = psycho_onboard_imap_offset(ino);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now build the IRQ bucket. */</div><div class='del'>-	pil = psycho_ino_to_pil(pdev, ino);</div><div class='del'>-</div><div class='del'>-	if (PIL_RESERVED(pil))</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	imap = pbm-&gt;controller_regs + imap_off;</div><div class='del'>-	imap += 4;</div><div class='del'>-</div><div class='del'>-	iclr_off = psycho_iclr_offset(ino);</div><div class='del'>-	iclr = pbm-&gt;controller_regs + iclr_off;</div><div class='del'>-	iclr += 4;</div><div class='del'>-</div><div class='del'>-	if ((ino &amp; 0x20) == 0)</div><div class='del'>-		inofixup = ino &amp; 0x03;</div><div class='del'>-</div><div class='del'>-	bucket = __bucket(build_irq(pil, inofixup, iclr, imap));</div><div class='del'>-	bucket-&gt;flags |= IBF_PCI;</div><div class='del'>-</div><div class='del'>-	return __irq(bucket);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* PSYCHO error handling support. */</div><div class='ctx'> enum psycho_error_type {</div><div class='ctx'> 	UE_ERR, CE_ERR, PCI_ERR</div><div class='hunk'>@@ -1020,51 +841,34 @@ static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg</div><div class='ctx'> #define  PSYCHO_ECCCTRL_EE	 0x8000000000000000UL /* Enable ECC Checking */</div><div class='ctx'> #define  PSYCHO_ECCCTRL_UE	 0x4000000000000000UL /* Enable UE Interrupts */</div><div class='ctx'> #define  PSYCHO_ECCCTRL_CE	 0x2000000000000000UL /* Enable CE INterrupts */</div><div class='del'>-#define PSYCHO_UE_INO		0x2e</div><div class='del'>-#define PSYCHO_CE_INO		0x2f</div><div class='del'>-#define PSYCHO_PCIERR_A_INO	0x30</div><div class='del'>-#define PSYCHO_PCIERR_B_INO	0x31</div><div class='ctx'> static void psycho_register_error_handlers(struct pci_controller_info *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = &amp;p-&gt;pbm_A; /* arbitrary */</div><div class='add'>+	struct of_device *op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='ctx'> 	unsigned long base = p-&gt;pbm_A.controller_regs;</div><div class='del'>-	unsigned int irq, portid = pbm-&gt;portid;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> </div><div class='del'>-	/* Build IRQs and register handlers. */</div><div class='del'>-	irq = psycho_irq_build(pbm, NULL, (portid &lt;&lt; 6) | PSYCHO_UE_INO);</div><div class='del'>-	if (request_irq(irq, psycho_ue_intr,</div><div class='del'>-			SA_SHIRQ, "PSYCHO UE", p) &lt; 0) {</div><div class='del'>-		prom_printf("PSYCHO%d: Cannot register UE interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	if (!op)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	irq = psycho_irq_build(pbm, NULL, (portid &lt;&lt; 6) | PSYCHO_CE_INO);</div><div class='del'>-	if (request_irq(irq, psycho_ce_intr,</div><div class='del'>-			SA_SHIRQ, "PSYCHO CE", p) &lt; 0) {</div><div class='del'>-		prom_printf("PSYCHO%d: Cannot register CE interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	/* Psycho interrupt property order is:</div><div class='add'>+	 * 0: PCIERR PBM B INO</div><div class='add'>+	 * 1: UE ERR</div><div class='add'>+	 * 2: CE ERR</div><div class='add'>+	 * 3: POWER FAIL</div><div class='add'>+	 * 4: SPARE HARDWARE</div><div class='add'>+	 * 5: PCIERR PBM A INO</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	pbm = &amp;p-&gt;pbm_A;</div><div class='del'>-	irq = psycho_irq_build(pbm, NULL, (portid &lt;&lt; 6) | PSYCHO_PCIERR_A_INO);</div><div class='del'>-	if (request_irq(irq, psycho_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "PSYCHO PCIERR", &amp;p-&gt;pbm_A) &lt; 0) {</div><div class='del'>-		prom_printf("PSYCHO%d(PBMA): Cannot register PciERR interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	if (op-&gt;num_irqs &lt; 6)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	pbm = &amp;p-&gt;pbm_B;</div><div class='del'>-	irq = psycho_irq_build(pbm, NULL, (portid &lt;&lt; 6) | PSYCHO_PCIERR_B_INO);</div><div class='del'>-	if (request_irq(irq, psycho_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "PSYCHO PCIERR", &amp;p-&gt;pbm_B) &lt; 0) {</div><div class='del'>-		prom_printf("PSYCHO%d(PBMB): Cannot register PciERR interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	request_irq(op-&gt;irqs[1], psycho_ue_intr, IRQF_SHARED, "PSYCHO UE", p);</div><div class='add'>+	request_irq(op-&gt;irqs[2], psycho_ce_intr, IRQF_SHARED, "PSYCHO CE", p);</div><div class='add'>+	request_irq(op-&gt;irqs[5], psycho_pcierr_intr, IRQF_SHARED,</div><div class='add'>+		    "PSYCHO PCIERR-A", &amp;p-&gt;pbm_A);</div><div class='add'>+	request_irq(op-&gt;irqs[0], psycho_pcierr_intr, IRQF_SHARED,</div><div class='add'>+		    "PSYCHO PCIERR-B", &amp;p-&gt;pbm_B);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable UE and CE interrupts for controller. */</div><div class='ctx'> 	psycho_write(base + PSYCHO_ECC_CTRL,</div><div class='hunk'>@@ -1247,9 +1051,7 @@ static void psycho_iommu_init(struct pci_controller_info *p)</div><div class='ctx'> </div><div class='ctx'> 	/* If necessary, hook us up for starfire IRQ translations. */</div><div class='ctx'> 	if (this_is_starfire)</div><div class='del'>-		p-&gt;starfire_cookie = starfire_hookup(p-&gt;pbm_A.portid);</div><div class='del'>-	else</div><div class='del'>-		p-&gt;starfire_cookie = NULL;</div><div class='add'>+		starfire_hookup(p-&gt;pbm_A.portid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PSYCHO_IRQ_RETRY	0x1a00UL</div><div class='hunk'>@@ -1297,9 +1099,6 @@ static void pbm_register_toplevel_resources(struct pci_controller_info *p,</div><div class='ctx'> {</div><div class='ctx'> 	char *name = pbm-&gt;name;</div><div class='ctx'> </div><div class='del'>-	sprintf(name, "PSYCHO%d PBM%c",</div><div class='del'>-		p-&gt;index,</div><div class='del'>-		(pbm == &amp;p-&gt;pbm_A ? 'A' : 'B'));</div><div class='ctx'> 	pbm-&gt;io_space.name = pbm-&gt;mem_space.name = name;</div><div class='ctx'> </div><div class='ctx'> 	request_resource(&amp;ioport_resource, &amp;pbm-&gt;io_space);</div><div class='hunk'>@@ -1368,11 +1167,12 @@ static void psycho_pbm_strbuf_init(struct pci_controller_info *p,</div><div class='ctx'> #define PSYCHO_MEMSPACE_SIZE	0x07fffffffUL</div><div class='ctx'> </div><div class='ctx'> static void psycho_pbm_init(struct pci_controller_info *p,</div><div class='del'>-			    int prom_node, int is_pbm_a)</div><div class='add'>+			    struct device_node *dp, int is_pbm_a)</div><div class='ctx'> {</div><div class='del'>-	unsigned int busrange[2];</div><div class='add'>+	unsigned int *busrange;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='del'>-	int err;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (is_pbm_a) {</div><div class='ctx'> 		pbm = &amp;p-&gt;pbm_A;</div><div class='hunk'>@@ -1387,57 +1187,53 @@ static void psycho_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;chip_type = PBM_CHIP_TYPE_PSYCHO;</div><div class='del'>-	pbm-&gt;chip_version =</div><div class='del'>-		prom_getintdefault(prom_node, "version#", 0);</div><div class='del'>-	pbm-&gt;chip_revision =</div><div class='del'>-		prom_getintdefault(prom_node, "module-revision#", 0);</div><div class='add'>+	pbm-&gt;chip_version = 0;</div><div class='add'>+	prop = of_find_property(dp, "version#", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		pbm-&gt;chip_version = *(int *) prop-&gt;value;</div><div class='add'>+	pbm-&gt;chip_revision = 0;</div><div class='add'>+	prop = of_find_property(dp, "module-revision#", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		pbm-&gt;chip_revision = *(int *) prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;io_space.end = pbm-&gt;io_space.start + PSYCHO_IOSPACE_SIZE;</div><div class='ctx'> 	pbm-&gt;io_space.flags = IORESOURCE_IO;</div><div class='ctx'> 	pbm-&gt;mem_space.end = pbm-&gt;mem_space.start + PSYCHO_MEMSPACE_SIZE;</div><div class='ctx'> 	pbm-&gt;mem_space.flags = IORESOURCE_MEM;</div><div class='del'>-	pbm_register_toplevel_resources(p, pbm);</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = prom_node;</div><div class='del'>-	prom_getstring(prom_node, "name",</div><div class='del'>-		       pbm-&gt;prom_name,</div><div class='del'>-		       sizeof(pbm-&gt;prom_name));</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(prom_node, "ranges",</div><div class='del'>-			       (char *)pbm-&gt;pbm_ranges,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_ranges));</div><div class='del'>-	if (err != -1)</div><div class='add'>+	pbm-&gt;prom_node = dp;</div><div class='add'>+	pbm-&gt;name = dp-&gt;full_name;</div><div class='add'>+</div><div class='add'>+	pbm_register_toplevel_resources(p, pbm);</div><div class='add'>+</div><div class='add'>+	printk("%s: PSYCHO PCI Bus Module ver[%x:%x]\n",</div><div class='add'>+	       pbm-&gt;name,</div><div class='add'>+	       pbm-&gt;chip_version, pbm-&gt;chip_revision);</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "ranges", &amp;len);</div><div class='add'>+	if (prop) {</div><div class='add'>+		pbm-&gt;pbm_ranges = prop-&gt;value;</div><div class='ctx'> 		pbm-&gt;num_pbm_ranges =</div><div class='del'>-			(err / sizeof(struct linux_prom_pci_ranges));</div><div class='del'>-	else</div><div class='add'>+			(len / sizeof(struct linux_prom_pci_ranges));</div><div class='add'>+	} else {</div><div class='ctx'> 		pbm-&gt;num_pbm_ranges = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "interrupt-map",</div><div class='del'>-			       (char *)pbm-&gt;pbm_intmap,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_intmap));</div><div class='del'>-	if (err != -1) {</div><div class='del'>-		pbm-&gt;num_pbm_intmap = (err / sizeof(struct linux_prom_pci_intmap));</div><div class='del'>-		err = prom_getproperty(prom_node, "interrupt-map-mask",</div><div class='del'>-				       (char *)&amp;pbm-&gt;pbm_intmask,</div><div class='del'>-				       sizeof(pbm-&gt;pbm_intmask));</div><div class='del'>-		if (err == -1) {</div><div class='del'>-			prom_printf("PSYCHO-PBM: Fatal error, no "</div><div class='del'>-				    "interrupt-map-mask.\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='add'>+	prop = of_find_property(dp, "interrupt-map", &amp;len);</div><div class='add'>+	if (prop) {</div><div class='add'>+		pbm-&gt;pbm_intmap = prop-&gt;value;</div><div class='add'>+		pbm-&gt;num_pbm_intmap =</div><div class='add'>+			(len / sizeof(struct linux_prom_pci_intmap));</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(dp, "interrupt-map-mask", NULL);</div><div class='add'>+		pbm-&gt;pbm_intmask = prop-&gt;value;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pbm-&gt;num_pbm_intmap = 0;</div><div class='del'>-		memset(&amp;pbm-&gt;pbm_intmask, 0, sizeof(pbm-&gt;pbm_intmask));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "bus-range",</div><div class='del'>-			       (char *)&amp;busrange[0],</div><div class='del'>-			       sizeof(busrange));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("PSYCHO-PBM: Fatal error, no bus-range.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "bus-range", NULL);</div><div class='add'>+	busrange = prop-&gt;value;</div><div class='ctx'> 	pbm-&gt;pci_first_busno = busrange[0];</div><div class='ctx'> 	pbm-&gt;pci_last_busno = busrange[1];</div><div class='ctx'> </div><div class='hunk'>@@ -1446,20 +1242,24 @@ static void psycho_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> </div><div class='ctx'> #define PSYCHO_CONFIGSPACE	0x001000000UL</div><div class='ctx'> </div><div class='del'>-void psycho_init(int node, char *model_name)</div><div class='add'>+void psycho_init(struct device_node *dp, char *model_name)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers pr_regs[3];</div><div class='add'>+	struct linux_prom64_registers *pr_regs;</div><div class='ctx'> 	struct pci_controller_info *p;</div><div class='ctx'> 	struct pci_iommu *iommu;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	u32 upa_portid;</div><div class='del'>-	int is_pbm_a, err;</div><div class='add'>+	int is_pbm_a;</div><div class='ctx'> </div><div class='del'>-	upa_portid = prom_getintdefault(node, "upa-portid", 0xff);</div><div class='add'>+	upa_portid = 0xff;</div><div class='add'>+	prop = of_find_property(dp, "upa-portid", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		upa_portid = *(u32 *) prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	for(p = pci_controller_root; p; p = p-&gt;next) {</div><div class='ctx'> 		if (p-&gt;pbm_A.portid == upa_portid) {</div><div class='del'>-			is_pbm_a = (p-&gt;pbm_A.prom_node == 0);</div><div class='del'>-			psycho_pbm_init(p, node, is_pbm_a);</div><div class='add'>+			is_pbm_a = (p-&gt;pbm_A.prom_node == NULL);</div><div class='add'>+			psycho_pbm_init(p, dp, is_pbm_a);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1484,28 +1284,18 @@ void psycho_init(int node, char *model_name)</div><div class='ctx'> 	p-&gt;index = pci_num_controllers++;</div><div class='ctx'> 	p-&gt;pbms_same_domain = 0;</div><div class='ctx'> 	p-&gt;scan_bus = psycho_scan_bus;</div><div class='del'>-	p-&gt;irq_build = psycho_irq_build;</div><div class='ctx'> 	p-&gt;base_address_update = psycho_base_address_update;</div><div class='ctx'> 	p-&gt;resource_adjust = psycho_resource_adjust;</div><div class='ctx'> 	p-&gt;pci_ops = &amp;psycho_ops;</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(node, "reg",</div><div class='del'>-			       (char *)&amp;pr_regs[0],</div><div class='del'>-			       sizeof(pr_regs));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("PSYCHO: Fatal error, no reg property.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	pr_regs = prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;pbm_A.controller_regs = pr_regs[2].phys_addr;</div><div class='ctx'> 	p-&gt;pbm_B.controller_regs = pr_regs[2].phys_addr;</div><div class='del'>-	printk("PCI: Found PSYCHO, control regs at %016lx\n",</div><div class='del'>-	       p-&gt;pbm_A.controller_regs);</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;pbm_A.config_space = p-&gt;pbm_B.config_space =</div><div class='ctx'> 		(pr_regs[2].phys_addr + PSYCHO_CONFIGSPACE);</div><div class='del'>-	printk("PSYCHO: Shared PCI config space at %016lx\n",</div><div class='del'>-	       p-&gt;pbm_A.config_space);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Psycho's PCI MEM space is mapped to a 2GB aligned area, so</div><div class='hunk'>@@ -1518,5 +1308,5 @@ void psycho_init(int node, char *model_name)</div><div class='ctx'> 	psycho_iommu_init(p);</div><div class='ctx'> </div><div class='ctx'> 	is_pbm_a = ((pr_regs[0].phys_addr &amp; 0x6000) == 0x2000);</div><div class='del'>-	psycho_pbm_init(p, node, is_pbm_a);</div><div class='add'>+	psycho_pbm_init(p, dp, is_pbm_a);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c<br/>index f67bb7f078cf..45891850b90d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_sabre.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_sabre.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_sabre.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci_sabre.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='hunk'>@@ -484,191 +485,6 @@ static struct pci_ops sabre_ops = {</div><div class='ctx'> 	.write =	sabre_write_pci_cfg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned long sabre_pcislot_imap_offset(unsigned long ino)</div><div class='del'>-{</div><div class='del'>-	unsigned int bus =  (ino &amp; 0x10) &gt;&gt; 4;</div><div class='del'>-	unsigned int slot = (ino &amp; 0x0c) &gt;&gt; 2;</div><div class='del'>-</div><div class='del'>-	if (bus == 0)</div><div class='del'>-		return SABRE_IMAP_A_SLOT0 + (slot * 8);</div><div class='del'>-	else</div><div class='del'>-		return SABRE_IMAP_B_SLOT0 + (slot * 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long __onboard_imap_off[] = {</div><div class='del'>-/*0x20*/	SABRE_IMAP_SCSI,</div><div class='del'>-/*0x21*/	SABRE_IMAP_ETH,</div><div class='del'>-/*0x22*/	SABRE_IMAP_BPP,</div><div class='del'>-/*0x23*/	SABRE_IMAP_AU_REC,</div><div class='del'>-/*0x24*/	SABRE_IMAP_AU_PLAY,</div><div class='del'>-/*0x25*/	SABRE_IMAP_PFAIL,</div><div class='del'>-/*0x26*/	SABRE_IMAP_KMS,</div><div class='del'>-/*0x27*/	SABRE_IMAP_FLPY,</div><div class='del'>-/*0x28*/	SABRE_IMAP_SHW,</div><div class='del'>-/*0x29*/	SABRE_IMAP_KBD,</div><div class='del'>-/*0x2a*/	SABRE_IMAP_MS,</div><div class='del'>-/*0x2b*/	SABRE_IMAP_SER,</div><div class='del'>-/*0x2c*/	0 /* reserved */,</div><div class='del'>-/*0x2d*/	0 /* reserved */,</div><div class='del'>-/*0x2e*/	SABRE_IMAP_UE,</div><div class='del'>-/*0x2f*/	SABRE_IMAP_CE,</div><div class='del'>-/*0x30*/	SABRE_IMAP_PCIERR,</div><div class='del'>-};</div><div class='del'>-#define SABRE_ONBOARD_IRQ_BASE		0x20</div><div class='del'>-#define SABRE_ONBOARD_IRQ_LAST		0x30</div><div class='del'>-#define sabre_onboard_imap_offset(__ino) \</div><div class='del'>-	__onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE]</div><div class='del'>-</div><div class='del'>-#define sabre_iclr_offset(ino)					      \</div><div class='del'>-	((ino &amp; 0x20) ? (SABRE_ICLR_SCSI + (((ino) &amp; 0x1f) &lt;&lt; 3)) :  \</div><div class='del'>-			(SABRE_ICLR_A_SLOT0 + (((ino) &amp; 0x1f)&lt;&lt;3)))</div><div class='del'>-</div><div class='del'>-/* PCI SABRE INO number to Sparc PIL level. */</div><div class='del'>-static unsigned char sabre_pil_table[] = {</div><div class='del'>-/*0x00*/0, 0, 0, 0,	/* PCI A slot 0  Int A, B, C, D */</div><div class='del'>-/*0x04*/0, 0, 0, 0,	/* PCI A slot 1  Int A, B, C, D */</div><div class='del'>-/*0x08*/0, 0, 0, 0,	/* PCI A slot 2  Int A, B, C, D */</div><div class='del'>-/*0x0c*/0, 0, 0, 0,	/* PCI A slot 3  Int A, B, C, D */</div><div class='del'>-/*0x10*/0, 0, 0, 0,	/* PCI B slot 0  Int A, B, C, D */</div><div class='del'>-/*0x14*/0, 0, 0, 0,	/* PCI B slot 1  Int A, B, C, D */</div><div class='del'>-/*0x18*/0, 0, 0, 0,	/* PCI B slot 2  Int A, B, C, D */</div><div class='del'>-/*0x1c*/0, 0, 0, 0,	/* PCI B slot 3  Int A, B, C, D */</div><div class='del'>-/*0x20*/5,		/* SCSI				*/</div><div class='del'>-/*0x21*/5,		/* Ethernet			*/</div><div class='del'>-/*0x22*/8,		/* Parallel Port		*/</div><div class='del'>-/*0x23*/13,		/* Audio Record			*/</div><div class='del'>-/*0x24*/14,		/* Audio Playback		*/</div><div class='del'>-/*0x25*/15,		/* PowerFail			*/</div><div class='del'>-/*0x26*/5,		/* second SCSI			*/</div><div class='del'>-/*0x27*/11,		/* Floppy			*/</div><div class='del'>-/*0x28*/5,		/* Spare Hardware		*/</div><div class='del'>-/*0x29*/9,		/* Keyboard			*/</div><div class='del'>-/*0x2a*/5,		/* Mouse			*/</div><div class='del'>-/*0x2b*/12,		/* Serial			*/</div><div class='del'>-/*0x2c*/10,		/* Timer 0			*/</div><div class='del'>-/*0x2d*/11,		/* Timer 1			*/</div><div class='del'>-/*0x2e*/15,		/* Uncorrectable ECC		*/</div><div class='del'>-/*0x2f*/15,		/* Correctable ECC		*/</div><div class='del'>-/*0x30*/15,		/* PCI Bus A Error		*/</div><div class='del'>-/*0x31*/15,		/* PCI Bus B Error		*/</div><div class='del'>-/*0x32*/15,		/* Power Management		*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (pdev &amp;&amp;</div><div class='del'>-	    pdev-&gt;vendor == PCI_VENDOR_ID_SUN &amp;&amp;</div><div class='del'>-	    pdev-&gt;device == PCI_DEVICE_ID_SUN_RIO_USB)</div><div class='del'>-		return 9;</div><div class='del'>-</div><div class='del'>-	ret = sabre_pil_table[ino];</div><div class='del'>-	if (ret == 0 &amp;&amp; pdev == NULL) {</div><div class='del'>-		ret = 5;</div><div class='del'>-	} else if (ret == 0) {</div><div class='del'>-		switch ((pdev-&gt;class &gt;&gt; 16) &amp; 0xff) {</div><div class='del'>-		case PCI_BASE_CLASS_STORAGE:</div><div class='del'>-			ret = 5;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_NETWORK:</div><div class='del'>-			ret = 6;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_DISPLAY:</div><div class='del'>-			ret = 9;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_MULTIMEDIA:</div><div class='del'>-		case PCI_BASE_CLASS_MEMORY:</div><div class='del'>-		case PCI_BASE_CLASS_BRIDGE:</div><div class='del'>-		case PCI_BASE_CLASS_SERIAL:</div><div class='del'>-			ret = 10;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			ret = 5;</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* When a device lives behind a bridge deeper in the PCI bus topology</div><div class='del'>- * than APB, a special sequence must run to make sure all pending DMA</div><div class='del'>- * transfers at the time of IRQ delivery are visible in the coherency</div><div class='del'>- * domain by the cpu.  This sequence is to perform a read on the far</div><div class='del'>- * side of the non-APB bridge, then perform a read of Sabre's DMA</div><div class='del'>- * write-sync register.</div><div class='del'>- */</div><div class='del'>-static void sabre_wsync_handler(struct ino_bucket *bucket, void *_arg1, void *_arg2)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = _arg1;</div><div class='del'>-	unsigned long sync_reg = (unsigned long) _arg2;</div><div class='del'>-	u16 _unused;</div><div class='del'>-</div><div class='del'>-	pci_read_config_word(pdev, PCI_VENDOR_ID, &amp;_unused);</div><div class='del'>-	sabre_read(sync_reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sabre_irq_build(struct pci_pbm_info *pbm,</div><div class='del'>-				    struct pci_dev *pdev,</div><div class='del'>-				    unsigned int ino)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	unsigned long imap, iclr;</div><div class='del'>-	unsigned long imap_off, iclr_off;</div><div class='del'>-	int pil, inofixup = 0;</div><div class='del'>-</div><div class='del'>-	ino &amp;= PCI_IRQ_INO;</div><div class='del'>-	if (ino &lt; SABRE_ONBOARD_IRQ_BASE) {</div><div class='del'>-		/* PCI slot */</div><div class='del'>-		imap_off = sabre_pcislot_imap_offset(ino);</div><div class='del'>-	} else {</div><div class='del'>-		/* onboard device */</div><div class='del'>-		if (ino &gt; SABRE_ONBOARD_IRQ_LAST) {</div><div class='del'>-			prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		imap_off = sabre_onboard_imap_offset(ino);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now build the IRQ bucket. */</div><div class='del'>-	pil = sabre_ino_to_pil(pdev, ino);</div><div class='del'>-</div><div class='del'>-	if (PIL_RESERVED(pil))</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	imap = pbm-&gt;controller_regs + imap_off;</div><div class='del'>-	imap += 4;</div><div class='del'>-</div><div class='del'>-	iclr_off = sabre_iclr_offset(ino);</div><div class='del'>-	iclr = pbm-&gt;controller_regs + iclr_off;</div><div class='del'>-	iclr += 4;</div><div class='del'>-</div><div class='del'>-	if ((ino &amp; 0x20) == 0)</div><div class='del'>-		inofixup = ino &amp; 0x03;</div><div class='del'>-</div><div class='del'>-	bucket = __bucket(build_irq(pil, inofixup, iclr, imap));</div><div class='del'>-	bucket-&gt;flags |= IBF_PCI;</div><div class='del'>-</div><div class='del'>-	if (pdev) {</div><div class='del'>-		struct pcidev_cookie *pcp = pdev-&gt;sysdata;</div><div class='del'>-</div><div class='del'>-		if (pdev-&gt;bus-&gt;number != pcp-&gt;pbm-&gt;pci_first_busno) {</div><div class='del'>-			struct pci_controller_info *p = pcp-&gt;pbm-&gt;parent;</div><div class='del'>-			struct irq_desc *d = bucket-&gt;irq_info;</div><div class='del'>-</div><div class='del'>-			d-&gt;pre_handler = sabre_wsync_handler;</div><div class='del'>-			d-&gt;pre_handler_arg1 = pdev;</div><div class='del'>-			d-&gt;pre_handler_arg2 = (void *)</div><div class='del'>-				p-&gt;pbm_A.controller_regs + SABRE_WRSYNC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return __irq(bucket);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* SABRE error handling support. */</div><div class='ctx'> static void sabre_check_iommu_error(struct pci_controller_info *p,</div><div class='ctx'> 				    unsigned long afsr,</div><div class='hunk'>@@ -1005,17 +821,30 @@ static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* XXX What about PowerFail/PowerManagement??? -DaveM */</div><div class='del'>-#define SABRE_UE_INO		0x2e</div><div class='del'>-#define SABRE_CE_INO		0x2f</div><div class='del'>-#define SABRE_PCIERR_INO	0x30</div><div class='ctx'> static void sabre_register_error_handlers(struct pci_controller_info *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm = &amp;p-&gt;pbm_A; /* arbitrary */</div><div class='add'>+	struct device_node *dp = pbm-&gt;prom_node;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	unsigned long base = pbm-&gt;controller_regs;</div><div class='del'>-	unsigned long irq, portid = pbm-&gt;portid;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> </div><div class='add'>+	if (pbm-&gt;chip_type == PBM_CHIP_TYPE_SABRE)</div><div class='add'>+		dp = dp-&gt;parent;</div><div class='add'>+</div><div class='add'>+	op = of_find_device_by_node(dp);</div><div class='add'>+	if (!op)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Sabre/Hummingbird IRQ property layout is:</div><div class='add'>+	 * 0: PCI ERR</div><div class='add'>+	 * 1: UE ERR</div><div class='add'>+	 * 2: CE ERR</div><div class='add'>+	 * 3: POWER FAIL</div><div class='add'>+	 */</div><div class='add'>+	if (op-&gt;num_irqs &lt; 4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* We clear the error bits in the appropriate AFSR before</div><div class='ctx'> 	 * registering the handler so that we don't get spurious</div><div class='ctx'> 	 * interrupts.</div><div class='hunk'>@@ -1024,32 +853,16 @@ static void sabre_register_error_handlers(struct pci_controller_info *p)</div><div class='ctx'> 		    (SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR |</div><div class='ctx'> 		     SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |</div><div class='ctx'> 		     SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE));</div><div class='del'>-	irq = sabre_irq_build(pbm, NULL, (portid &lt;&lt; 6) | SABRE_UE_INO);</div><div class='del'>-	if (request_irq(irq, sabre_ue_intr,</div><div class='del'>-			SA_SHIRQ, "SABRE UE", p) &lt; 0) {</div><div class='del'>-		prom_printf("SABRE%d: Cannot register UE interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	request_irq(op-&gt;irqs[1], sabre_ue_intr, IRQF_SHARED, "SABRE UE", p);</div><div class='ctx'> </div><div class='ctx'> 	sabre_write(base + SABRE_CE_AFSR,</div><div class='ctx'> 		    (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |</div><div class='ctx'> 		     SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR));</div><div class='del'>-	irq = sabre_irq_build(pbm, NULL, (portid &lt;&lt; 6) | SABRE_CE_INO);</div><div class='del'>-	if (request_irq(irq, sabre_ce_intr,</div><div class='del'>-			SA_SHIRQ, "SABRE CE", p) &lt; 0) {</div><div class='del'>-		prom_printf("SABRE%d: Cannot register CE interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	irq = sabre_irq_build(pbm, NULL, (portid &lt;&lt; 6) | SABRE_PCIERR_INO);</div><div class='del'>-	if (request_irq(irq, sabre_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "SABRE PCIERR", p) &lt; 0) {</div><div class='del'>-		prom_printf("SABRE%d: Cannot register PciERR interrupt.\n",</div><div class='del'>-			    p-&gt;index);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	request_irq(op-&gt;irqs[2], sabre_ce_intr, IRQF_SHARED, "SABRE CE", p);</div><div class='add'>+	request_irq(op-&gt;irqs[0], sabre_pcierr_intr, IRQF_SHARED,</div><div class='add'>+		    "SABRE PCIERR", p);</div><div class='ctx'> </div><div class='ctx'> 	tmp = sabre_read(base + SABRE_PCICTRL);</div><div class='ctx'> 	tmp |= SABRE_PCICTRL_ERREN;</div><div class='hunk'>@@ -1383,34 +1196,36 @@ static void pbm_register_toplevel_resources(struct pci_controller_info *p,</div><div class='ctx'> 					    &amp;pbm-&gt;mem_space);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dma_begin)</div><div class='add'>+static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp, u32 dma_begin)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='del'>-	char namebuf[128];</div><div class='del'>-	u32 busrange[2];</div><div class='del'>-	int node, simbas_found;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	u32 *busrange;</div><div class='add'>+	int len, simbas_found;</div><div class='ctx'> </div><div class='ctx'> 	simbas_found = 0;</div><div class='del'>-	node = prom_getchild(sabre_node);</div><div class='del'>-	while ((node = prom_searchsiblings(node, "pci")) != 0) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		err = prom_getproperty(node, "model", namebuf, sizeof(namebuf));</div><div class='del'>-		if ((err &lt;= 0) || strncmp(namebuf, "SUNW,simba", err))</div><div class='add'>+	node = dp-&gt;child;</div><div class='add'>+	while (node != NULL) {</div><div class='add'>+		if (strcmp(node-&gt;name, "pci"))</div><div class='ctx'> 			goto next_pci;</div><div class='ctx'> </div><div class='del'>-		err = prom_getproperty(node, "bus-range",</div><div class='del'>-				       (char *)&amp;busrange[0], sizeof(busrange));</div><div class='del'>-		if (err == 0 || err == -1) {</div><div class='del'>-			prom_printf("APB: Error, cannot get PCI bus-range.\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='add'>+		prop = of_find_property(node, "model", NULL);</div><div class='add'>+		if (!prop || strncmp(prop-&gt;value, "SUNW,simba", prop-&gt;length))</div><div class='add'>+			goto next_pci;</div><div class='ctx'> </div><div class='ctx'> 		simbas_found++;</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(node, "bus-range", NULL);</div><div class='add'>+		busrange = prop-&gt;value;</div><div class='ctx'> 		if (busrange[0] == 1)</div><div class='ctx'> 			pbm = &amp;p-&gt;pbm_B;</div><div class='ctx'> 		else</div><div class='ctx'> 			pbm = &amp;p-&gt;pbm_A;</div><div class='add'>+</div><div class='add'>+		pbm-&gt;name = node-&gt;full_name;</div><div class='add'>+		printk("%s: SABRE PCI Bus Module\n", pbm-&gt;name);</div><div class='add'>+</div><div class='ctx'> 		pbm-&gt;chip_type = PBM_CHIP_TYPE_SABRE;</div><div class='ctx'> 		pbm-&gt;parent = p;</div><div class='ctx'> 		pbm-&gt;prom_node = node;</div><div class='hunk'>@@ -1418,83 +1233,68 @@ static void sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dm</div><div class='ctx'> 		pbm-&gt;pci_first_busno = busrange[0];</div><div class='ctx'> 		pbm-&gt;pci_last_busno = busrange[1];</div><div class='ctx'> </div><div class='del'>-		prom_getstring(node, "name", pbm-&gt;prom_name, sizeof(pbm-&gt;prom_name));</div><div class='del'>-		err = prom_getproperty(node, "ranges",</div><div class='del'>-				       (char *)pbm-&gt;pbm_ranges,</div><div class='del'>-				       sizeof(pbm-&gt;pbm_ranges));</div><div class='del'>-		if (err != -1)</div><div class='add'>+		prop = of_find_property(node, "ranges", &amp;len);</div><div class='add'>+		if (prop) {</div><div class='add'>+			pbm-&gt;pbm_ranges = prop-&gt;value;</div><div class='ctx'> 			pbm-&gt;num_pbm_ranges =</div><div class='del'>-				(err / sizeof(struct linux_prom_pci_ranges));</div><div class='del'>-		else</div><div class='add'>+				(len / sizeof(struct linux_prom_pci_ranges));</div><div class='add'>+		} else {</div><div class='ctx'> 			pbm-&gt;num_pbm_ranges = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		err = prom_getproperty(node, "interrupt-map",</div><div class='del'>-				       (char *)pbm-&gt;pbm_intmap,</div><div class='del'>-				       sizeof(pbm-&gt;pbm_intmap));</div><div class='del'>-		if (err != -1) {</div><div class='del'>-			pbm-&gt;num_pbm_intmap = (err / sizeof(struct linux_prom_pci_intmap));</div><div class='del'>-			err = prom_getproperty(node, "interrupt-map-mask",</div><div class='del'>-					       (char *)&amp;pbm-&gt;pbm_intmask,</div><div class='del'>-					       sizeof(pbm-&gt;pbm_intmask));</div><div class='del'>-			if (err == -1) {</div><div class='del'>-				prom_printf("APB: Fatal error, no interrupt-map-mask.\n");</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='add'>+		prop = of_find_property(node, "interrupt-map", &amp;len);</div><div class='add'>+		if (prop) {</div><div class='add'>+			pbm-&gt;pbm_intmap = prop-&gt;value;</div><div class='add'>+			pbm-&gt;num_pbm_intmap =</div><div class='add'>+				(len / sizeof(struct linux_prom_pci_intmap));</div><div class='add'>+</div><div class='add'>+			prop = of_find_property(node, "interrupt-map-mask",</div><div class='add'>+						NULL);</div><div class='add'>+			pbm-&gt;pbm_intmask = prop-&gt;value;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pbm-&gt;num_pbm_intmap = 0;</div><div class='del'>-			memset(&amp;pbm-&gt;pbm_intmask, 0, sizeof(pbm-&gt;pbm_intmask));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pbm_register_toplevel_resources(p, pbm);</div><div class='ctx'> </div><div class='ctx'> 	next_pci:</div><div class='del'>-		node = prom_getsibling(node);</div><div class='del'>-		if (!node)</div><div class='del'>-			break;</div><div class='add'>+		node = node-&gt;sibling;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (simbas_found == 0) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='ctx'> 		/* No APBs underneath, probably this is a hummingbird</div><div class='ctx'> 		 * system.</div><div class='ctx'> 		 */</div><div class='ctx'> 		pbm = &amp;p-&gt;pbm_A;</div><div class='ctx'> 		pbm-&gt;parent = p;</div><div class='del'>-		pbm-&gt;prom_node = sabre_node;</div><div class='add'>+		pbm-&gt;prom_node = dp;</div><div class='ctx'> 		pbm-&gt;pci_first_busno = p-&gt;pci_first_busno;</div><div class='ctx'> 		pbm-&gt;pci_last_busno = p-&gt;pci_last_busno;</div><div class='ctx'> </div><div class='del'>-		prom_getstring(sabre_node, "name", pbm-&gt;prom_name, sizeof(pbm-&gt;prom_name));</div><div class='del'>-		err = prom_getproperty(sabre_node, "ranges",</div><div class='del'>-				       (char *) pbm-&gt;pbm_ranges,</div><div class='del'>-				       sizeof(pbm-&gt;pbm_ranges));</div><div class='del'>-		if (err != -1)</div><div class='add'>+		prop = of_find_property(dp, "ranges", &amp;len);</div><div class='add'>+		if (prop) {</div><div class='add'>+			pbm-&gt;pbm_ranges = prop-&gt;value;</div><div class='ctx'> 			pbm-&gt;num_pbm_ranges =</div><div class='del'>-				(err / sizeof(struct linux_prom_pci_ranges));</div><div class='del'>-		else</div><div class='add'>+				(len / sizeof(struct linux_prom_pci_ranges));</div><div class='add'>+		} else {</div><div class='ctx'> 			pbm-&gt;num_pbm_ranges = 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		err = prom_getproperty(sabre_node, "interrupt-map",</div><div class='del'>-				       (char *) pbm-&gt;pbm_intmap,</div><div class='del'>-				       sizeof(pbm-&gt;pbm_intmap));</div><div class='del'>-</div><div class='del'>-		if (err != -1) {</div><div class='del'>-			pbm-&gt;num_pbm_intmap = (err / sizeof(struct linux_prom_pci_intmap));</div><div class='del'>-			err = prom_getproperty(sabre_node, "interrupt-map-mask",</div><div class='del'>-					       (char *)&amp;pbm-&gt;pbm_intmask,</div><div class='del'>-					       sizeof(pbm-&gt;pbm_intmask));</div><div class='del'>-			if (err == -1) {</div><div class='del'>-				prom_printf("Hummingbird: Fatal error, no interrupt-map-mask.\n");</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='add'>+		prop = of_find_property(dp, "interrupt-map", &amp;len);</div><div class='add'>+		if (prop) {</div><div class='add'>+			pbm-&gt;pbm_intmap = prop-&gt;value;</div><div class='add'>+			pbm-&gt;num_pbm_intmap =</div><div class='add'>+				(len / sizeof(struct linux_prom_pci_intmap));</div><div class='add'>+</div><div class='add'>+			prop = of_find_property(dp, "interrupt-map-mask",</div><div class='add'>+						NULL);</div><div class='add'>+			pbm-&gt;pbm_intmask = prop-&gt;value;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pbm-&gt;num_pbm_intmap = 0;</div><div class='del'>-			memset(&amp;pbm-&gt;pbm_intmask, 0, sizeof(pbm-&gt;pbm_intmask));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		pbm-&gt;name = dp-&gt;full_name;</div><div class='add'>+		printk("%s: SABRE PCI Bus Module\n", pbm-&gt;name);</div><div class='ctx'> </div><div class='del'>-		sprintf(pbm-&gt;name, "SABRE%d PBM%c", p-&gt;index,</div><div class='del'>-			(pbm == &amp;p-&gt;pbm_A ? 'A' : 'B'));</div><div class='ctx'> 		pbm-&gt;io_space.name = pbm-&gt;mem_space.name = pbm-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 		/* Hack up top-level resources. */</div><div class='hunk'>@@ -1520,14 +1320,15 @@ static void sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dm</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sabre_init(int pnode, char *model_name)</div><div class='add'>+void sabre_init(struct device_node *dp, char *model_name)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers pr_regs[2];</div><div class='add'>+	struct linux_prom64_registers *pr_regs;</div><div class='ctx'> 	struct pci_controller_info *p;</div><div class='ctx'> 	struct pci_iommu *iommu;</div><div class='del'>-	int tsbsize, err;</div><div class='del'>-	u32 busrange[2];</div><div class='del'>-	u32 vdma[2];</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int tsbsize;</div><div class='add'>+	u32 *busrange;</div><div class='add'>+	u32 *vdma;</div><div class='ctx'> 	u32 upa_portid, dma_mask;</div><div class='ctx'> 	u64 clear_irq;</div><div class='ctx'> </div><div class='hunk'>@@ -1535,22 +1336,21 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> 	if (!strcmp(model_name, "pci108e,a001"))</div><div class='ctx'> 		hummingbird_p = 1;</div><div class='ctx'> 	else if (!strcmp(model_name, "SUNW,sabre")) {</div><div class='del'>-		char compat[64];</div><div class='add'>+		prop = of_find_property(dp, "compatible", NULL);</div><div class='add'>+		if (prop) {</div><div class='add'>+			const char *compat = prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-		if (prom_getproperty(pnode, "compatible",</div><div class='del'>-				     compat, sizeof(compat)) &gt; 0 &amp;&amp;</div><div class='del'>-		    !strcmp(compat, "pci108e,a001")) {</div><div class='del'>-			hummingbird_p = 1;</div><div class='del'>-		} else {</div><div class='del'>-			int cpu_node;</div><div class='add'>+			if (!strcmp(compat, "pci108e,a001"))</div><div class='add'>+				hummingbird_p = 1;</div><div class='add'>+		}</div><div class='add'>+		if (!hummingbird_p) {</div><div class='add'>+			struct device_node *dp;</div><div class='ctx'> </div><div class='ctx'> 			/* Of course, Sun has to encode things a thousand</div><div class='ctx'> 			 * different ways, inconsistently.</div><div class='ctx'> 			 */</div><div class='del'>-			cpu_find_by_instance(0, &amp;cpu_node, NULL);</div><div class='del'>-			if (prom_getproperty(cpu_node, "name",</div><div class='del'>-					     compat, sizeof(compat)) &gt; 0 &amp;&amp;</div><div class='del'>-			    !strcmp(compat, "SUNW,UltraSPARC-IIe"))</div><div class='add'>+			cpu_find_by_instance(0, &amp;dp, NULL);</div><div class='add'>+			if (!strcmp(dp-&gt;name, "SUNW,UltraSPARC-IIe"))</div><div class='ctx'> 				hummingbird_p = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1568,7 +1368,10 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> 	}</div><div class='ctx'> 	p-&gt;pbm_A.iommu = p-&gt;pbm_B.iommu = iommu;</div><div class='ctx'> </div><div class='del'>-	upa_portid = prom_getintdefault(pnode, "upa-portid", 0xff);</div><div class='add'>+	upa_portid = 0xff;</div><div class='add'>+	prop = of_find_property(dp, "upa-portid", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		upa_portid = *(u32 *) prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;next = pci_controller_root;</div><div class='ctx'> 	pci_controller_root = p;</div><div class='hunk'>@@ -1578,7 +1381,6 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> 	p-&gt;index = pci_num_controllers++;</div><div class='ctx'> 	p-&gt;pbms_same_domain = 1;</div><div class='ctx'> 	p-&gt;scan_bus = sabre_scan_bus;</div><div class='del'>-	p-&gt;irq_build = sabre_irq_build;</div><div class='ctx'> 	p-&gt;base_address_update = sabre_base_address_update;</div><div class='ctx'> 	p-&gt;resource_adjust = sabre_resource_adjust;</div><div class='ctx'> 	p-&gt;pci_ops = &amp;sabre_ops;</div><div class='hunk'>@@ -1586,13 +1388,9 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Map in SABRE register set and report the presence of this SABRE.</div><div class='ctx'> 	 */</div><div class='del'>-	err = prom_getproperty(pnode, "reg",</div><div class='del'>-			       (char *)&amp;pr_regs[0], sizeof(pr_regs));</div><div class='del'>-	if(err == 0 || err == -1) {</div><div class='del'>-		prom_printf("SABRE: Error, cannot get U2P registers "</div><div class='del'>-			    "from PROM.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	pr_regs = prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First REG in property is base of entire SABRE register space.</div><div class='hunk'>@@ -1600,9 +1398,6 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> 	p-&gt;pbm_A.controller_regs = pr_regs[0].phys_addr;</div><div class='ctx'> 	p-&gt;pbm_B.controller_regs = pr_regs[0].phys_addr;</div><div class='ctx'> </div><div class='del'>-	printk("PCI: Found SABRE, main regs at %016lx\n",</div><div class='del'>-	       p-&gt;pbm_A.controller_regs);</div><div class='del'>-</div><div class='ctx'> 	/* Clear interrupts */</div><div class='ctx'> </div><div class='ctx'> 	/* PCI first */</div><div class='hunk'>@@ -1621,16 +1416,9 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> 	/* Now map in PCI config space for entire SABRE. */</div><div class='ctx'> 	p-&gt;pbm_A.config_space = p-&gt;pbm_B.config_space =</div><div class='ctx'> 		(p-&gt;pbm_A.controller_regs + SABRE_CONFIGSPACE);</div><div class='del'>-	printk("SABRE: Shared PCI config space at %016lx\n",</div><div class='del'>-	       p-&gt;pbm_A.config_space);</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(pnode, "virtual-dma",</div><div class='del'>-			       (char *)&amp;vdma[0], sizeof(vdma));</div><div class='del'>-	if(err == 0 || err == -1) {</div><div class='del'>-		prom_printf("SABRE: Error, cannot get virtual-dma property "</div><div class='del'>-			    "from PROM.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "virtual-dma", NULL);</div><div class='add'>+	vdma = prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	dma_mask = vdma[0];</div><div class='ctx'> 	switch(vdma[1]) {</div><div class='hunk'>@@ -1654,21 +1442,13 @@ void sabre_init(int pnode, char *model_name)</div><div class='ctx'> </div><div class='ctx'> 	sabre_iommu_init(p, tsbsize, vdma[0], dma_mask);</div><div class='ctx'> </div><div class='del'>-	printk("SABRE: DVMA at %08x [%08x]\n", vdma[0], vdma[1]);</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(pnode, "bus-range",</div><div class='del'>-				       (char *)&amp;busrange[0], sizeof(busrange));</div><div class='del'>-	if(err == 0 || err == -1) {</div><div class='del'>-		prom_printf("SABRE: Error, cannot get PCI bus-range "</div><div class='del'>-			    " from PROM.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	prop = of_find_property(dp, "bus-range", NULL);</div><div class='add'>+	busrange = prop-&gt;value;</div><div class='ctx'> 	p-&gt;pci_first_busno = busrange[0];</div><div class='ctx'> 	p-&gt;pci_last_busno = busrange[1];</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Look for APB underneath.</div><div class='ctx'> 	 */</div><div class='del'>-	sabre_pbm_init(p, pnode, vdma[0]);</div><div class='add'>+	sabre_pbm_init(p, dp, vdma[0]);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c<br/>index 7fe4de03ac2e..75ade83ecc65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_schizo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_schizo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_schizo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci_schizo.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='hunk'>@@ -216,210 +217,6 @@ static struct pci_ops schizo_ops = {</div><div class='ctx'> 	.write =	schizo_write_pci_cfg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* SCHIZO interrupt mapping support.  Unlike Psycho, for this controller the</div><div class='del'>- * imap/iclr registers are per-PBM.</div><div class='del'>- */</div><div class='del'>-#define SCHIZO_IMAP_BASE	0x1000UL</div><div class='del'>-#define SCHIZO_ICLR_BASE	0x1400UL</div><div class='del'>-</div><div class='del'>-static unsigned long schizo_imap_offset(unsigned long ino)</div><div class='del'>-{</div><div class='del'>-	return SCHIZO_IMAP_BASE + (ino * 8UL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long schizo_iclr_offset(unsigned long ino)</div><div class='del'>-{</div><div class='del'>-	return SCHIZO_ICLR_BASE + (ino * 8UL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* PCI SCHIZO INO number to Sparc PIL level.  This table only matters for</div><div class='del'>- * INOs which will not have an associated PCI device struct, ie. onboard</div><div class='del'>- * EBUS devices and PCI controller internal error interrupts.</div><div class='del'>- */</div><div class='del'>-static unsigned char schizo_pil_table[] = {</div><div class='del'>-/*0x00*/0, 0, 0, 0,	/* PCI slot 0  Int A, B, C, D	*/</div><div class='del'>-/*0x04*/0, 0, 0, 0,	/* PCI slot 1  Int A, B, C, D	*/</div><div class='del'>-/*0x08*/0, 0, 0, 0,	/* PCI slot 2  Int A, B, C, D	*/</div><div class='del'>-/*0x0c*/0, 0, 0, 0,	/* PCI slot 3  Int A, B, C, D	*/</div><div class='del'>-/*0x10*/0, 0, 0, 0,	/* PCI slot 4  Int A, B, C, D	*/</div><div class='del'>-/*0x14*/0, 0, 0, 0,	/* PCI slot 5  Int A, B, C, D	*/</div><div class='del'>-/*0x18*/5,		/* SCSI				*/</div><div class='del'>-/*0x19*/5,		/* second SCSI			*/</div><div class='del'>-/*0x1a*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x1b*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x1c*/8,		/* Parallel			*/</div><div class='del'>-/*0x1d*/5,		/* Ethernet			*/</div><div class='del'>-/*0x1e*/8,		/* Firewire-1394		*/</div><div class='del'>-/*0x1f*/9,		/* USB				*/</div><div class='del'>-/*0x20*/13,		/* Audio Record			*/</div><div class='del'>-/*0x21*/14,		/* Audio Playback		*/</div><div class='del'>-/*0x22*/12,		/* Serial			*/</div><div class='del'>-/*0x23*/5,		/* EBUS I2C 			*/</div><div class='del'>-/*0x24*/10,		/* RTC Clock			*/</div><div class='del'>-/*0x25*/11,		/* Floppy			*/</div><div class='del'>-/*0x26*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x27*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x28*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x29*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x2a*/10,		/* UPA 1			*/</div><div class='del'>-/*0x2b*/10,		/* UPA 2			*/</div><div class='del'>-/*0x2c*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x2d*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x2e*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x2f*/0,		/* UNKNOWN			*/</div><div class='del'>-/*0x30*/15,		/* Uncorrectable ECC		*/</div><div class='del'>-/*0x31*/15,		/* Correctable ECC		*/</div><div class='del'>-/*0x32*/15,		/* PCI Bus A Error		*/</div><div class='del'>-/*0x33*/15,		/* PCI Bus B Error		*/</div><div class='del'>-/*0x34*/15,		/* Safari Bus Error		*/</div><div class='del'>-/*0x35*/0,		/* Reserved			*/</div><div class='del'>-/*0x36*/0,		/* Reserved			*/</div><div class='del'>-/*0x37*/0,		/* Reserved			*/</div><div class='del'>-/*0x38*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x39*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x3a*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x3b*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x3c*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x3d*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x3e*/0,		/* Reserved for NewLink		*/</div><div class='del'>-/*0x3f*/0,		/* Reserved for NewLink		*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (pdev &amp;&amp;</div><div class='del'>-	    pdev-&gt;vendor == PCI_VENDOR_ID_SUN &amp;&amp;</div><div class='del'>-	    pdev-&gt;device == PCI_DEVICE_ID_SUN_RIO_USB)</div><div class='del'>-		return 9;</div><div class='del'>-</div><div class='del'>-	ret = schizo_pil_table[ino];</div><div class='del'>-	if (ret == 0 &amp;&amp; pdev == NULL) {</div><div class='del'>-		ret = 5;</div><div class='del'>-	} else if (ret == 0) {</div><div class='del'>-		switch ((pdev-&gt;class &gt;&gt; 16) &amp; 0xff) {</div><div class='del'>-		case PCI_BASE_CLASS_STORAGE:</div><div class='del'>-			ret = 5;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_NETWORK:</div><div class='del'>-			ret = 6;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_DISPLAY:</div><div class='del'>-			ret = 9;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_MULTIMEDIA:</div><div class='del'>-		case PCI_BASE_CLASS_MEMORY:</div><div class='del'>-		case PCI_BASE_CLASS_BRIDGE:</div><div class='del'>-		case PCI_BASE_CLASS_SERIAL:</div><div class='del'>-			ret = 10;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			ret = 5;</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tomatillo_wsync_handler(struct ino_bucket *bucket, void *_arg1, void *_arg2)</div><div class='del'>-{</div><div class='del'>-	unsigned long sync_reg = (unsigned long) _arg2;</div><div class='del'>-	u64 mask = 1UL &lt;&lt; (__irq_ino(__irq(bucket)) &amp; IMAP_INO);</div><div class='del'>-	u64 val;</div><div class='del'>-	int limit;</div><div class='del'>-</div><div class='del'>-	schizo_write(sync_reg, mask);</div><div class='del'>-</div><div class='del'>-	limit = 100000;</div><div class='del'>-	val = 0;</div><div class='del'>-	while (--limit) {</div><div class='del'>-		val = schizo_read(sync_reg);</div><div class='del'>-		if (!(val &amp; mask))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (limit &lt;= 0) {</div><div class='del'>-		printk("tomatillo_wsync_handler: DMA won't sync [%lx:%lx]\n",</div><div class='del'>-		       val, mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (_arg1) {</div><div class='del'>-		static unsigned char cacheline[64]</div><div class='del'>-			__attribute__ ((aligned (64)));</div><div class='del'>-</div><div class='del'>-		__asm__ __volatile__("rd %%fprs, %0\n\t"</div><div class='del'>-				     "or %0, %4, %1\n\t"</div><div class='del'>-				     "wr %1, 0x0, %%fprs\n\t"</div><div class='del'>-				     "stda %%f0, [%5] %6\n\t"</div><div class='del'>-				     "wr %0, 0x0, %%fprs\n\t"</div><div class='del'>-				     "membar #Sync"</div><div class='del'>-				     : "=&amp;r" (mask), "=&amp;r" (val)</div><div class='del'>-				     : "0" (mask), "1" (val),</div><div class='del'>-				     "i" (FPRS_FEF), "r" (&amp;cacheline[0]),</div><div class='del'>-				     "i" (ASI_BLK_COMMIT_P));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int schizo_irq_build(struct pci_pbm_info *pbm,</div><div class='del'>-				     struct pci_dev *pdev,</div><div class='del'>-				     unsigned int ino)</div><div class='del'>-{</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	unsigned long imap, iclr;</div><div class='del'>-	unsigned long imap_off, iclr_off;</div><div class='del'>-	int pil, ign_fixup;</div><div class='del'>-</div><div class='del'>-	ino &amp;= PCI_IRQ_INO;</div><div class='del'>-	imap_off = schizo_imap_offset(ino);</div><div class='del'>-</div><div class='del'>-	/* Now build the IRQ bucket. */</div><div class='del'>-	pil = schizo_ino_to_pil(pdev, ino);</div><div class='del'>-</div><div class='del'>-	if (PIL_RESERVED(pil))</div><div class='del'>-		BUG();</div><div class='del'>-</div><div class='del'>-	imap = pbm-&gt;pbm_regs + imap_off;</div><div class='del'>-	imap += 4;</div><div class='del'>-</div><div class='del'>-	iclr_off = schizo_iclr_offset(ino);</div><div class='del'>-	iclr = pbm-&gt;pbm_regs + iclr_off;</div><div class='del'>-	iclr += 4;</div><div class='del'>-</div><div class='del'>-	/* On Schizo, no inofixup occurs.  This is because each</div><div class='del'>-	 * INO has it's own IMAP register.  On Psycho and Sabre</div><div class='del'>-	 * there is only one IMAP register for each PCI slot even</div><div class='del'>-	 * though four different INOs can be generated by each</div><div class='del'>-	 * PCI slot.</div><div class='del'>-	 *</div><div class='del'>-	 * But, for JBUS variants (essentially, Tomatillo), we have</div><div class='del'>-	 * to fixup the lowest bit of the interrupt group number.</div><div class='del'>-	 */</div><div class='del'>-	ign_fixup = 0;</div><div class='del'>-	if (pbm-&gt;chip_type == PBM_CHIP_TYPE_TOMATILLO) {</div><div class='del'>-		if (pbm-&gt;portid &amp; 1)</div><div class='del'>-			ign_fixup = (1 &lt;&lt; 6);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bucket = __bucket(build_irq(pil, ign_fixup, iclr, imap));</div><div class='del'>-	bucket-&gt;flags |= IBF_PCI;</div><div class='del'>-</div><div class='del'>-	if (pdev &amp;&amp; pbm-&gt;chip_type == PBM_CHIP_TYPE_TOMATILLO) {</div><div class='del'>-		struct irq_desc *p = bucket-&gt;irq_info;</div><div class='del'>-</div><div class='del'>-		p-&gt;pre_handler = tomatillo_wsync_handler;</div><div class='del'>-		p-&gt;pre_handler_arg1 = ((pbm-&gt;chip_version &lt;= 4) ?</div><div class='del'>-				       (void *) 1 : (void *) 0);</div><div class='del'>-		p-&gt;pre_handler_arg2 = (void *) pbm-&gt;sync_reg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return __irq(bucket);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* SCHIZO error handling support. */</div><div class='ctx'> enum schizo_error_type {</div><div class='ctx'> 	UE_ERR, CE_ERR, PCI_ERR, SAFARI_ERR</div><div class='hunk'>@@ -455,35 +252,6 @@ struct pci_pbm_info *pbm_for_ino(struct pci_controller_info *p, u32 ino)</div><div class='ctx'> 	return &amp;p-&gt;pbm_A;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void schizo_clear_other_err_intr(struct pci_controller_info *p, int irq)</div><div class='del'>-{</div><div class='del'>-	struct pci_pbm_info *pbm;</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='del'>-	unsigned long iclr;</div><div class='del'>-</div><div class='del'>-	/* Do not clear the interrupt for the other PCI bus.</div><div class='del'>-	 *</div><div class='del'>-	 * This "ACK both PBM IRQs" only needs to be performed</div><div class='del'>-	 * for chip-wide error interrupts.</div><div class='del'>-	 */</div><div class='del'>-	if ((irq &amp; IMAP_INO) == SCHIZO_PCIERR_A_INO ||</div><div class='del'>-	    (irq &amp; IMAP_INO) == SCHIZO_PCIERR_B_INO)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pbm = pbm_for_ino(p, irq);</div><div class='del'>-	if (pbm == &amp;p-&gt;pbm_A)</div><div class='del'>-		pbm = &amp;p-&gt;pbm_B;</div><div class='del'>-	else</div><div class='del'>-		pbm = &amp;p-&gt;pbm_A;</div><div class='del'>-</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL,</div><div class='del'>-			       (pbm-&gt;portid &lt;&lt; 6) | (irq &amp; IMAP_INO));</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	iclr = bucket-&gt;iclr;</div><div class='del'>-</div><div class='del'>-	upa_writel(ICLR_IDLE, iclr);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define SCHIZO_STC_ERR	0xb800UL /* --&gt; 0xba00 */</div><div class='ctx'> #define SCHIZO_STC_TAG	0xba00UL /* --&gt; 0xba80 */</div><div class='ctx'> #define SCHIZO_STC_LINE	0xbb00UL /* --&gt; 0xbb80 */</div><div class='hunk'>@@ -814,8 +582,6 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	/* Interrogate IOMMU for error status. */</div><div class='ctx'> 	schizo_check_iommu_error(p, UE_ERR);</div><div class='ctx'> </div><div class='del'>-	schizo_clear_other_err_intr(p, irq);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -905,8 +671,6 @@ static irqreturn_t schizo_ce_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		printk("(none)");</div><div class='ctx'> 	printk("]\n");</div><div class='ctx'> </div><div class='del'>-	schizo_clear_other_err_intr(p, irq);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1127,8 +891,6 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg</div><div class='ctx'> 	if (error_bits &amp; (SCHIZO_PCIAFSR_PPERR | SCHIZO_PCIAFSR_SPERR))</div><div class='ctx'> 		pci_scan_for_parity_error(p, pbm, pbm-&gt;pci_bus);</div><div class='ctx'> </div><div class='del'>-	schizo_clear_other_err_intr(p, irq);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +946,6 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs *</div><div class='ctx'> 		printk("PCI%d: Unexpected Safari/JBUS error interrupt, errlog[%016lx]\n",</div><div class='ctx'> 		       p-&gt;index, errlog);</div><div class='ctx'> </div><div class='del'>-		schizo_clear_other_err_intr(p, irq);</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1192,7 +953,6 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs *</div><div class='ctx'> 	       p-&gt;index);</div><div class='ctx'> 	schizo_check_iommu_error(p, SAFARI_ERR);</div><div class='ctx'> </div><div class='del'>-	schizo_clear_other_err_intr(p, irq);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1224,77 +984,47 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs *</div><div class='ctx'> static void tomatillo_register_error_handlers(struct pci_controller_info *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='del'>-	unsigned int irq;</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	u64 tmp, err_mask, err_no_mask;</div><div class='ctx'> </div><div class='del'>-	/* Build IRQs and register handlers. */</div><div class='add'>+	/* Tomatillo IRQ property layout is:</div><div class='add'>+	 * 0: PCIERR</div><div class='add'>+	 * 1: UE ERR</div><div class='add'>+	 * 2: CE ERR</div><div class='add'>+	 * 3: SERR</div><div class='add'>+	 * 4: POWER FAIL?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_UE_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_UE_INO);</div><div class='del'>-	if (request_irq(irq, schizo_ue_intr,</div><div class='del'>-			SA_SHIRQ, "TOMATILLO UE", p) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register UE interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs +</div><div class='del'>-			 schizo_imap_offset(SCHIZO_UE_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[1], schizo_ue_intr, IRQF_SHARED,</div><div class='add'>+			    "TOMATILLO_UE", p);</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_CE_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_CE_INO);</div><div class='del'>-	if (request_irq(irq, schizo_ce_intr,</div><div class='del'>-			SA_SHIRQ, "TOMATILLO CE", p) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register CE interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs +</div><div class='del'>-			 schizo_imap_offset(SCHIZO_CE_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[2], schizo_ce_intr, IRQF_SHARED,</div><div class='add'>+			    "TOMATILLO CE", p);</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, ((pbm-&gt;portid &lt;&lt; 6) |</div><div class='del'>-					   SCHIZO_PCIERR_A_INO));</div><div class='del'>-	if (request_irq(irq, schizo_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "TOMATILLO PCIERR", pbm) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register PBM A PciERR interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs +</div><div class='del'>-			 schizo_imap_offset(SCHIZO_PCIERR_A_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[0], schizo_pcierr_intr, IRQF_SHARED,</div><div class='add'>+			    "TOMATILLO PCIERR-A", pbm);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, ((pbm-&gt;portid &lt;&lt; 6) |</div><div class='del'>-					    SCHIZO_PCIERR_B_INO));</div><div class='del'>-	if (request_irq(irq, schizo_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "TOMATILLO PCIERR", pbm) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register PBM B PciERR interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs +</div><div class='del'>-			 schizo_imap_offset(SCHIZO_PCIERR_B_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[0], schizo_pcierr_intr, IRQF_SHARED,</div><div class='add'>+			    "TOMATILLO PCIERR-B", pbm);</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_SERR_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_SERR_INO);</div><div class='del'>-	if (request_irq(irq, schizo_safarierr_intr,</div><div class='del'>-			SA_SHIRQ, "TOMATILLO SERR", p) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register SafariERR interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs +</div><div class='del'>-			 schizo_imap_offset(SCHIZO_SERR_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[3], schizo_safarierr_intr, IRQF_SHARED,</div><div class='add'>+			    "TOMATILLO SERR", p);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable UE and CE interrupts for controller. */</div><div class='ctx'> 	schizo_write(p-&gt;pbm_A.controller_regs + SCHIZO_ECC_CTRL,</div><div class='hunk'>@@ -1362,70 +1092,47 @@ static void tomatillo_register_error_handlers(struct pci_controller_info *p)</div><div class='ctx'> static void schizo_register_error_handlers(struct pci_controller_info *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='del'>-	unsigned int irq;</div><div class='del'>-	struct ino_bucket *bucket;</div><div class='add'>+	struct of_device *op;</div><div class='ctx'> 	u64 tmp, err_mask, err_no_mask;</div><div class='ctx'> </div><div class='del'>-	/* Build IRQs and register handlers. */</div><div class='add'>+	/* Schizo IRQ property layout is:</div><div class='add'>+	 * 0: PCIERR</div><div class='add'>+	 * 1: UE ERR</div><div class='add'>+	 * 2: CE ERR</div><div class='add'>+	 * 3: SERR</div><div class='add'>+	 * 4: POWER FAIL?</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_UE_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_UE_INO);</div><div class='del'>-	if (request_irq(irq, schizo_ue_intr,</div><div class='del'>-			SA_SHIRQ, "SCHIZO UE", p) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register UE interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs + schizo_imap_offset(SCHIZO_UE_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[1], schizo_ue_intr, IRQF_SHARED,</div><div class='add'>+			    "SCHIZO_UE", p);</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_CE_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_CE_INO);</div><div class='del'>-	if (request_irq(irq, schizo_ce_intr,</div><div class='del'>-			SA_SHIRQ, "SCHIZO CE", p) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register CE interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs + schizo_imap_offset(SCHIZO_CE_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[2], schizo_ce_intr, IRQF_SHARED,</div><div class='add'>+			    "SCHIZO CE", p);</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_PCIERR_A_INO);</div><div class='del'>-	if (request_irq(irq, schizo_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "SCHIZO PCIERR", pbm) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register PBM A PciERR interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs + schizo_imap_offset(SCHIZO_PCIERR_A_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[0], schizo_pcierr_intr, IRQF_SHARED,</div><div class='add'>+			    "SCHIZO PCIERR-A", pbm);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_PCIERR_B_INO);</div><div class='del'>-	if (request_irq(irq, schizo_pcierr_intr,</div><div class='del'>-			SA_SHIRQ, "SCHIZO PCIERR", &amp;p-&gt;pbm_B) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register PBM B PciERR interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs + schizo_imap_offset(SCHIZO_PCIERR_B_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[0], schizo_pcierr_intr, IRQF_SHARED,</div><div class='add'>+			    "SCHIZO PCIERR-B", pbm);</div><div class='ctx'> </div><div class='ctx'> 	pbm = pbm_for_ino(p, SCHIZO_SERR_INO);</div><div class='del'>-	irq = schizo_irq_build(pbm, NULL, (pbm-&gt;portid &lt;&lt; 6) | SCHIZO_SERR_INO);</div><div class='del'>-	if (request_irq(irq, schizo_safarierr_intr,</div><div class='del'>-			SA_SHIRQ, "SCHIZO SERR", p) &lt; 0) {</div><div class='del'>-		prom_printf("%s: Cannot register SafariERR interrupt.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	bucket = __bucket(irq);</div><div class='del'>-	tmp = upa_readl(bucket-&gt;imap);</div><div class='del'>-	upa_writel(tmp, (pbm-&gt;pbm_regs + schizo_imap_offset(SCHIZO_SERR_INO) + 4));</div><div class='add'>+	op = of_find_device_by_node(pbm-&gt;prom_node);</div><div class='add'>+	if (op)</div><div class='add'>+		request_irq(op-&gt;irqs[3], schizo_safarierr_intr, IRQF_SHARED,</div><div class='add'>+			    "SCHIZO SERR", p);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable UE and CE interrupts for controller. */</div><div class='ctx'> 	schizo_write(p-&gt;pbm_A.controller_regs + SCHIZO_ECC_CTRL,</div><div class='hunk'>@@ -1560,10 +1267,12 @@ static void __schizo_scan_bus(struct pci_controller_info *p,</div><div class='ctx'> </div><div class='ctx'> 	pbm_config_busmastering(&amp;p-&gt;pbm_B);</div><div class='ctx'> 	p-&gt;pbm_B.is_66mhz_capable =</div><div class='del'>-		prom_getbool(p-&gt;pbm_B.prom_node, "66mhz-capable");</div><div class='add'>+		(of_find_property(p-&gt;pbm_B.prom_node, "66mhz-capable", NULL)</div><div class='add'>+		 != NULL);</div><div class='ctx'> 	pbm_config_busmastering(&amp;p-&gt;pbm_A);</div><div class='ctx'> 	p-&gt;pbm_A.is_66mhz_capable =</div><div class='del'>-		prom_getbool(p-&gt;pbm_A.prom_node, "66mhz-capable");</div><div class='add'>+		(of_find_property(p-&gt;pbm_A.prom_node, "66mhz-capable", NULL)</div><div class='add'>+		 != NULL);</div><div class='ctx'> 	pbm_scan_bus(p, &amp;p-&gt;pbm_B);</div><div class='ctx'> 	pbm_scan_bus(p, &amp;p-&gt;pbm_A);</div><div class='ctx'> </div><div class='hunk'>@@ -1765,13 +1474,18 @@ static void schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_iommu *iommu = pbm-&gt;iommu;</div><div class='ctx'> 	unsigned long i, tagbase, database;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	u32 vdma[2], dma_mask;</div><div class='ctx'> 	u64 control;</div><div class='del'>-	int err, tsbsize;</div><div class='add'>+	int tsbsize;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(pbm-&gt;prom_node, "virtual-dma", NULL);</div><div class='add'>+	if (prop) {</div><div class='add'>+		u32 *val = prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(pbm-&gt;prom_node, "virtual-dma",</div><div class='del'>-			       (char *)&amp;vdma[0], sizeof(vdma));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='add'>+		vdma[0] = val[0];</div><div class='add'>+		vdma[1] = val[1];</div><div class='add'>+	} else {</div><div class='ctx'> 		/* No property, use default values. */</div><div class='ctx'> 		vdma[0] = 0xc0000000;</div><div class='ctx'> 		vdma[1] = 0x40000000;</div><div class='hunk'>@@ -1882,6 +1596,7 @@ static void schizo_pbm_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> </div><div class='ctx'> static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	u64 tmp;</div><div class='ctx'> </div><div class='ctx'> 	schizo_write(pbm-&gt;pbm_regs + SCHIZO_PCI_IRQ_RETRY, 5);</div><div class='hunk'>@@ -1895,7 +1610,8 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	    pbm-&gt;chip_version &gt;= 0x2)</div><div class='ctx'> 		tmp |= 0x3UL &lt;&lt; SCHIZO_PCICTRL_PTO_SHIFT;</div><div class='ctx'> </div><div class='del'>-	if (!prom_getbool(pbm-&gt;prom_node, "no-bus-parking"))</div><div class='add'>+	prop = of_find_property(pbm-&gt;prom_node, "no-bus-parking", NULL);</div><div class='add'>+	if (!prop)</div><div class='ctx'> 		tmp |= SCHIZO_PCICTRL_PARK;</div><div class='ctx'> 	else</div><div class='ctx'> 		tmp &amp;= ~SCHIZO_PCICTRL_PARK;</div><div class='hunk'>@@ -1935,16 +1651,17 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void schizo_pbm_init(struct pci_controller_info *p,</div><div class='del'>-			    int prom_node, u32 portid,</div><div class='add'>+			    struct device_node *dp, u32 portid,</div><div class='ctx'> 			    int chip_type)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers pr_regs[4];</div><div class='del'>-	unsigned int busrange[2];</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	unsigned int *busrange;</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='ctx'> 	const char *chipset_name;</div><div class='del'>-	u32 ino_bitmap[2];</div><div class='add'>+	u32 *ino_bitmap;</div><div class='ctx'> 	int is_pbm_a;</div><div class='del'>-	int err;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	switch (chip_type) {</div><div class='ctx'> 	case PBM_CHIP_TYPE_TOMATILLO:</div><div class='hunk'>@@ -1972,16 +1689,10 @@ static void schizo_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> 	 * 3) PBM PCI config space</div><div class='ctx'> 	 * 4) Ichip regs</div><div class='ctx'> 	 */</div><div class='del'>-	err = prom_getproperty(prom_node, "reg",</div><div class='del'>-			       (char *)&amp;pr_regs[0],</div><div class='del'>-			       sizeof(pr_regs));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no reg property.\n",</div><div class='del'>-			    chipset_name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	regs = prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-	is_pbm_a = ((pr_regs[0].phys_addr &amp; 0x00700000) == 0x00600000);</div><div class='add'>+	is_pbm_a = ((regs[0].phys_addr &amp; 0x00700000) == 0x00600000);</div><div class='ctx'> </div><div class='ctx'> 	if (is_pbm_a)</div><div class='ctx'> 		pbm = &amp;p-&gt;pbm_A;</div><div class='hunk'>@@ -1990,92 +1701,62 @@ static void schizo_pbm_init(struct pci_controller_info *p,</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;portid = portid;</div><div class='ctx'> 	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = prom_node;</div><div class='add'>+	pbm-&gt;prom_node = dp;</div><div class='ctx'> 	pbm-&gt;pci_first_slot = 1;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;chip_type = chip_type;</div><div class='del'>-	pbm-&gt;chip_version =</div><div class='del'>-		prom_getintdefault(prom_node, "version#", 0);</div><div class='del'>-	pbm-&gt;chip_revision =</div><div class='del'>-		prom_getintdefault(prom_node, "module-revision#", 0);</div><div class='del'>-</div><div class='del'>-	pbm-&gt;pbm_regs = pr_regs[0].phys_addr;</div><div class='del'>-	pbm-&gt;controller_regs = pr_regs[1].phys_addr - 0x10000UL;</div><div class='add'>+	pbm-&gt;chip_version = 0;</div><div class='add'>+	prop = of_find_property(dp, "version#", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		pbm-&gt;chip_version = *(int *) prop-&gt;value;</div><div class='add'>+	pbm-&gt;chip_revision = 0;</div><div class='add'>+	prop = of_find_property(dp, "module-revision#", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		pbm-&gt;chip_revision = *(int *) prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	pbm-&gt;pbm_regs = regs[0].phys_addr;</div><div class='add'>+	pbm-&gt;controller_regs = regs[1].phys_addr - 0x10000UL;</div><div class='ctx'> </div><div class='ctx'> 	if (chip_type == PBM_CHIP_TYPE_TOMATILLO)</div><div class='del'>-		pbm-&gt;sync_reg = pr_regs[3].phys_addr + 0x1a18UL;</div><div class='add'>+		pbm-&gt;sync_reg = regs[3].phys_addr + 0x1a18UL;</div><div class='ctx'> </div><div class='del'>-	sprintf(pbm-&gt;name,</div><div class='del'>-		(chip_type == PBM_CHIP_TYPE_TOMATILLO ?</div><div class='del'>-		 "TOMATILLO%d PBM%c" :</div><div class='del'>-		 "SCHIZO%d PBM%c"),</div><div class='del'>-		p-&gt;index,</div><div class='del'>-		(pbm == &amp;p-&gt;pbm_A ? 'A' : 'B'));</div><div class='add'>+	pbm-&gt;name = dp-&gt;full_name;</div><div class='ctx'> </div><div class='del'>-	printk("%s: ver[%x:%x], portid %x, "</div><div class='del'>-	       "cregs[%lx] pregs[%lx]\n",</div><div class='add'>+	printk("%s: %s PCI Bus Module ver[%x:%x]\n",</div><div class='ctx'> 	       pbm-&gt;name,</div><div class='del'>-	       pbm-&gt;chip_version, pbm-&gt;chip_revision,</div><div class='del'>-	       pbm-&gt;portid,</div><div class='del'>-	       pbm-&gt;controller_regs,</div><div class='del'>-	       pbm-&gt;pbm_regs);</div><div class='add'>+	       (chip_type == PBM_CHIP_TYPE_TOMATILLO ?</div><div class='add'>+		"TOMATILLO" : "SCHIZO"),</div><div class='add'>+	       pbm-&gt;chip_version, pbm-&gt;chip_revision);</div><div class='ctx'> </div><div class='ctx'> 	schizo_pbm_hw_init(pbm);</div><div class='ctx'> </div><div class='del'>-	prom_getstring(prom_node, "name",</div><div class='del'>-		       pbm-&gt;prom_name,</div><div class='del'>-		       sizeof(pbm-&gt;prom_name));</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(prom_node, "ranges",</div><div class='del'>-			       (char *) pbm-&gt;pbm_ranges,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_ranges));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no ranges property.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	prop = of_find_property(dp, "ranges", &amp;len);</div><div class='add'>+	pbm-&gt;pbm_ranges = prop-&gt;value;</div><div class='ctx'> 	pbm-&gt;num_pbm_ranges =</div><div class='del'>-		(err / sizeof(struct linux_prom_pci_ranges));</div><div class='add'>+		(len / sizeof(struct linux_prom_pci_ranges));</div><div class='ctx'> </div><div class='ctx'> 	schizo_determine_mem_io_space(pbm);</div><div class='ctx'> 	pbm_register_toplevel_resources(p, pbm);</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "interrupt-map",</div><div class='del'>-			       (char *)pbm-&gt;pbm_intmap,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_intmap));</div><div class='del'>-	if (err != -1) {</div><div class='del'>-		pbm-&gt;num_pbm_intmap = (err / sizeof(struct linux_prom_pci_intmap));</div><div class='del'>-		err = prom_getproperty(prom_node, "interrupt-map-mask",</div><div class='del'>-				       (char *)&amp;pbm-&gt;pbm_intmask,</div><div class='del'>-				       sizeof(pbm-&gt;pbm_intmask));</div><div class='del'>-		if (err == -1) {</div><div class='del'>-			prom_printf("%s: Fatal error, no "</div><div class='del'>-				    "interrupt-map-mask.\n", pbm-&gt;name);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='add'>+	prop = of_find_property(dp, "interrupt-map", &amp;len);</div><div class='add'>+	if (prop) {</div><div class='add'>+		pbm-&gt;pbm_intmap = prop-&gt;value;</div><div class='add'>+		pbm-&gt;num_pbm_intmap =</div><div class='add'>+			(len / sizeof(struct linux_prom_pci_intmap));</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(dp, "interrupt-map-mask", NULL);</div><div class='add'>+		pbm-&gt;pbm_intmask = prop-&gt;value;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pbm-&gt;num_pbm_intmap = 0;</div><div class='del'>-		memset(&amp;pbm-&gt;pbm_intmask, 0, sizeof(pbm-&gt;pbm_intmask));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "ino-bitmap",</div><div class='del'>-			       (char *) &amp;ino_bitmap[0],</div><div class='del'>-			       sizeof(ino_bitmap));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no ino-bitmap.\n", pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "ino-bitmap", NULL);</div><div class='add'>+	ino_bitmap = prop-&gt;value;</div><div class='ctx'> 	pbm-&gt;ino_bitmap = (((u64)ino_bitmap[1] &lt;&lt; 32UL) |</div><div class='ctx'> 			   ((u64)ino_bitmap[0] &lt;&lt;  0UL));</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "bus-range",</div><div class='del'>-			       (char *)&amp;busrange[0],</div><div class='del'>-			       sizeof(busrange));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no bus-range.\n", pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "bus-range", NULL);</div><div class='add'>+	busrange = prop-&gt;value;</div><div class='ctx'> 	pbm-&gt;pci_first_busno = busrange[0];</div><div class='ctx'> 	pbm-&gt;pci_last_busno = busrange[1];</div><div class='ctx'> </div><div class='hunk'>@@ -2093,16 +1774,20 @@ static inline int portid_compare(u32 x, u32 y, int chip_type)</div><div class='ctx'> 	return (x == y);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __schizo_init(int node, char *model_name, int chip_type)</div><div class='add'>+static void __schizo_init(struct device_node *dp, char *model_name, int chip_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller_info *p;</div><div class='ctx'> 	struct pci_iommu *iommu;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	int is_pbm_a;</div><div class='ctx'> 	u32 portid;</div><div class='ctx'> </div><div class='del'>-	portid = prom_getintdefault(node, "portid", 0xff);</div><div class='add'>+	portid = 0xff;</div><div class='add'>+	prop = of_find_property(dp, "portid", NULL);</div><div class='add'>+	if (prop)</div><div class='add'>+		portid = *(u32 *) prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-	for(p = pci_controller_root; p; p = p-&gt;next) {</div><div class='add'>+	for (p = pci_controller_root; p; p = p-&gt;next) {</div><div class='ctx'> 		struct pci_pbm_info *pbm;</div><div class='ctx'> </div><div class='ctx'> 		if (p-&gt;pbm_A.prom_node &amp;&amp; p-&gt;pbm_B.prom_node)</div><div class='hunk'>@@ -2113,8 +1798,8 @@ static void __schizo_init(int node, char *model_name, int chip_type)</div><div class='ctx'> 		       &amp;p-&gt;pbm_B);</div><div class='ctx'> </div><div class='ctx'> 		if (portid_compare(pbm-&gt;portid, portid, chip_type)) {</div><div class='del'>-			is_pbm_a = (p-&gt;pbm_A.prom_node == 0);</div><div class='del'>-			schizo_pbm_init(p, node, portid, chip_type);</div><div class='add'>+			is_pbm_a = (p-&gt;pbm_A.prom_node == NULL);</div><div class='add'>+			schizo_pbm_init(p, dp, portid, chip_type);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2147,7 +1832,6 @@ static void __schizo_init(int node, char *model_name, int chip_type)</div><div class='ctx'> 	p-&gt;scan_bus = (chip_type == PBM_CHIP_TYPE_TOMATILLO ?</div><div class='ctx'> 		       tomatillo_scan_bus :</div><div class='ctx'> 		       schizo_scan_bus);</div><div class='del'>-	p-&gt;irq_build = schizo_irq_build;</div><div class='ctx'> 	p-&gt;base_address_update = schizo_base_address_update;</div><div class='ctx'> 	p-&gt;resource_adjust = schizo_resource_adjust;</div><div class='ctx'> 	p-&gt;pci_ops = &amp;schizo_ops;</div><div class='hunk'>@@ -2155,20 +1839,20 @@ static void __schizo_init(int node, char *model_name, int chip_type)</div><div class='ctx'> 	/* Like PSYCHO we have a 2GB aligned area for memory space. */</div><div class='ctx'> 	pci_memspace_mask = 0x7fffffffUL;</div><div class='ctx'> </div><div class='del'>-	schizo_pbm_init(p, node, portid, chip_type);</div><div class='add'>+	schizo_pbm_init(p, dp, portid, chip_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void schizo_init(int node, char *model_name)</div><div class='add'>+void schizo_init(struct device_node *dp, char *model_name)</div><div class='ctx'> {</div><div class='del'>-	__schizo_init(node, model_name, PBM_CHIP_TYPE_SCHIZO);</div><div class='add'>+	__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void schizo_plus_init(int node, char *model_name)</div><div class='add'>+void schizo_plus_init(struct device_node *dp, char *model_name)</div><div class='ctx'> {</div><div class='del'>-	__schizo_init(node, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS);</div><div class='add'>+	__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tomatillo_init(int node, char *model_name)</div><div class='add'>+void tomatillo_init(struct device_node *dp, char *model_name)</div><div class='ctx'> {</div><div class='del'>-	__schizo_init(node, model_name, PBM_CHIP_TYPE_TOMATILLO);</div><div class='add'>+	__schizo_init(dp, model_name, PBM_CHIP_TYPE_TOMATILLO);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c<br/>index 2b7a1f316a93..03ad4c06758e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_sun4v.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/pci_sun4v.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/pci_sun4v.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/pci_sun4v.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pci_impl.h"</div><div class='ctx'> #include "iommu_common.h"</div><div class='hunk'>@@ -599,18 +600,130 @@ struct pci_iommu_ops pci_sun4v_iommu_ops = {</div><div class='ctx'> </div><div class='ctx'> /* SUN4V PCI configuration space accessors. */</div><div class='ctx'> </div><div class='del'>-static inline int pci_sun4v_out_of_range(struct pci_pbm_info *pbm, unsigned int bus, unsigned int device, unsigned int func)</div><div class='add'>+struct pdev_entry {</div><div class='add'>+	struct pdev_entry	*next;</div><div class='add'>+	u32			devhandle;</div><div class='add'>+	unsigned int		bus;</div><div class='add'>+	unsigned int		device;</div><div class='add'>+	unsigned int		func;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PDEV_HTAB_SIZE	16</div><div class='add'>+#define PDEV_HTAB_MASK	(PDEV_HTAB_SIZE - 1)</div><div class='add'>+static struct pdev_entry *pdev_htab[PDEV_HTAB_SIZE];</div><div class='add'>+</div><div class='add'>+static inline unsigned int pdev_hashfn(u32 devhandle, unsigned int bus, unsigned int device, unsigned int func)</div><div class='ctx'> {</div><div class='del'>-	if (bus == pbm-&gt;pci_first_busno) {</div><div class='del'>-		if (device == 0 &amp;&amp; func == 0)</div><div class='del'>-			return 0;</div><div class='del'>-		return 1;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = (devhandle ^ (devhandle &gt;&gt; 4));</div><div class='add'>+	val ^= bus;</div><div class='add'>+	val ^= device;</div><div class='add'>+	val ^= func;</div><div class='add'>+</div><div class='add'>+	return val &amp; PDEV_HTAB_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdev_htab_add(u32 devhandle, unsigned int bus, unsigned int device, unsigned int func)</div><div class='add'>+{</div><div class='add'>+	struct pdev_entry *p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	struct pdev_entry **slot;</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	slot = &amp;pdev_htab[pdev_hashfn(devhandle, bus, device, func)];</div><div class='add'>+	p-&gt;next = *slot;</div><div class='add'>+	*slot = p;</div><div class='add'>+</div><div class='add'>+	p-&gt;devhandle = devhandle;</div><div class='add'>+	p-&gt;bus = bus;</div><div class='add'>+	p-&gt;device = device;</div><div class='add'>+	p-&gt;func = func;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Recursively descend into the OBP device tree, rooted at toplevel_node,</div><div class='add'>+ * looking for a PCI device matching bus and devfn.</div><div class='add'>+ */</div><div class='add'>+static int obp_find(struct device_node *toplevel_node, unsigned int bus, unsigned int devfn)</div><div class='add'>+{</div><div class='add'>+	toplevel_node = toplevel_node-&gt;child;</div><div class='add'>+</div><div class='add'>+	while (toplevel_node != NULL) {</div><div class='add'>+		struct linux_prom_pci_registers *regs;</div><div class='add'>+		struct property *prop;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = obp_find(toplevel_node, bus, devfn);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(toplevel_node, "reg", NULL);</div><div class='add'>+		if (!prop)</div><div class='add'>+			goto next_sibling;</div><div class='add'>+</div><div class='add'>+		regs = prop-&gt;value;</div><div class='add'>+		if (((regs-&gt;phys_hi &gt;&gt; 16) &amp; 0xff) == bus &amp;&amp;</div><div class='add'>+		    ((regs-&gt;phys_hi &gt;&gt; 8) &amp; 0xff) == devfn)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	next_sibling:</div><div class='add'>+		toplevel_node = toplevel_node-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return toplevel_node != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdev_htab_populate(struct pci_pbm_info *pbm)</div><div class='add'>+{</div><div class='add'>+	u32 devhandle = pbm-&gt;devhandle;</div><div class='add'>+	unsigned int bus;</div><div class='add'>+</div><div class='add'>+	for (bus = pbm-&gt;pci_first_busno; bus &lt;= pbm-&gt;pci_last_busno; bus++) {</div><div class='add'>+		unsigned int devfn;</div><div class='add'>+</div><div class='add'>+		for (devfn = 0; devfn &lt; 256; devfn++) {</div><div class='add'>+			unsigned int device = PCI_SLOT(devfn);</div><div class='add'>+			unsigned int func = PCI_FUNC(devfn);</div><div class='add'>+</div><div class='add'>+			if (obp_find(pbm-&gt;prom_node, bus, devfn)) {</div><div class='add'>+				int err = pdev_htab_add(devhandle, bus,</div><div class='add'>+							device, func);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pdev_entry *pdev_find(u32 devhandle, unsigned int bus, unsigned int device, unsigned int func)</div><div class='add'>+{</div><div class='add'>+	struct pdev_entry *p;</div><div class='add'>+</div><div class='add'>+	p = pdev_htab[pdev_hashfn(devhandle, bus, device, func)];</div><div class='add'>+	while (p) {</div><div class='add'>+		if (p-&gt;devhandle == devhandle &amp;&amp;</div><div class='add'>+		    p-&gt;bus == bus &amp;&amp;</div><div class='add'>+		    p-&gt;device == device &amp;&amp;</div><div class='add'>+		    p-&gt;func == func)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		p = p-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int pci_sun4v_out_of_range(struct pci_pbm_info *pbm, unsigned int bus, unsigned int device, unsigned int func)</div><div class='add'>+{</div><div class='ctx'> 	if (bus &lt; pbm-&gt;pci_first_busno ||</div><div class='ctx'> 	    bus &gt; pbm-&gt;pci_last_busno)</div><div class='ctx'> 		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+	return pdev_find(pbm-&gt;devhandle, bus, device, func) == NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pci_sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,</div><div class='hunk'>@@ -701,8 +814,7 @@ static void pbm_scan_bus(struct pci_controller_info *p,</div><div class='ctx'> 	pci_fixup_host_bridge_self(pbm-&gt;pci_bus);</div><div class='ctx'> 	pbm-&gt;pci_bus-&gt;self-&gt;sysdata = cookie;</div><div class='ctx'> #endif</div><div class='del'>-	pci_fill_in_pbm_cookies(pbm-&gt;pci_bus, pbm,</div><div class='del'>-				pbm-&gt;prom_node);</div><div class='add'>+	pci_fill_in_pbm_cookies(pbm-&gt;pci_bus, pbm, pbm-&gt;prom_node);</div><div class='ctx'> 	pci_record_assignments(pbm, pbm-&gt;pci_bus);</div><div class='ctx'> 	pci_assign_unassigned(pbm, pbm-&gt;pci_bus);</div><div class='ctx'> 	pci_fixup_irq(pbm, pbm-&gt;pci_bus);</div><div class='hunk'>@@ -712,15 +824,18 @@ static void pbm_scan_bus(struct pci_controller_info *p,</div><div class='ctx'> </div><div class='ctx'> static void pci_sun4v_scan_bus(struct pci_controller_info *p)</div><div class='ctx'> {</div><div class='del'>-	if (p-&gt;pbm_A.prom_node) {</div><div class='del'>-		p-&gt;pbm_A.is_66mhz_capable =</div><div class='del'>-			prom_getbool(p-&gt;pbm_A.prom_node, "66mhz-capable");</div><div class='add'>+	struct property *prop;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	if ((dp = p-&gt;pbm_A.prom_node) != NULL) {</div><div class='add'>+		prop = of_find_property(dp, "66mhz-capable", NULL);</div><div class='add'>+		p-&gt;pbm_A.is_66mhz_capable = (prop != NULL);</div><div class='ctx'> </div><div class='ctx'> 		pbm_scan_bus(p, &amp;p-&gt;pbm_A);</div><div class='ctx'> 	}</div><div class='del'>-	if (p-&gt;pbm_B.prom_node) {</div><div class='del'>-		p-&gt;pbm_B.is_66mhz_capable =</div><div class='del'>-			prom_getbool(p-&gt;pbm_B.prom_node, "66mhz-capable");</div><div class='add'>+	if ((dp = p-&gt;pbm_B.prom_node) != NULL) {</div><div class='add'>+		prop = of_find_property(dp, "66mhz-capable", NULL);</div><div class='add'>+		p-&gt;pbm_B.is_66mhz_capable = (prop != NULL);</div><div class='ctx'> </div><div class='ctx'> 		pbm_scan_bus(p, &amp;p-&gt;pbm_B);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -728,45 +843,6 @@ static void pci_sun4v_scan_bus(struct pci_controller_info *p)</div><div class='ctx'> 	/* XXX register error interrupt handlers XXX */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int pci_sun4v_irq_build(struct pci_pbm_info *pbm,</div><div class='del'>-					struct pci_dev *pdev,</div><div class='del'>-					unsigned int devino)</div><div class='del'>-{</div><div class='del'>-	u32 devhandle = pbm-&gt;devhandle;</div><div class='del'>-	int pil;</div><div class='del'>-</div><div class='del'>-	pil = 5;</div><div class='del'>-	if (pdev) {</div><div class='del'>-		switch ((pdev-&gt;class &gt;&gt; 16) &amp; 0xff) {</div><div class='del'>-		case PCI_BASE_CLASS_STORAGE:</div><div class='del'>-			pil = 5;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_NETWORK:</div><div class='del'>-			pil = 6;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_DISPLAY:</div><div class='del'>-			pil = 9;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case PCI_BASE_CLASS_MULTIMEDIA:</div><div class='del'>-		case PCI_BASE_CLASS_MEMORY:</div><div class='del'>-		case PCI_BASE_CLASS_BRIDGE:</div><div class='del'>-		case PCI_BASE_CLASS_SERIAL:</div><div class='del'>-			pil = 10;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			pil = 5;</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='del'>-	BUG_ON(PIL_RESERVED(pil));</div><div class='del'>-</div><div class='del'>-	return sun4v_build_irq(devhandle, devino, pil, IBF_PCI);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void pci_sun4v_base_address_update(struct pci_dev *pdev, int resource)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcidev_cookie *pcp = pdev-&gt;sysdata;</div><div class='hunk'>@@ -902,8 +978,13 @@ static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,</div><div class='ctx'> 					     HV_PCI_TSBID(0, i),</div><div class='ctx'> 					     &amp;io_attrs, &amp;ra);</div><div class='ctx'> 		if (ret == HV_EOK) {</div><div class='del'>-			cnt++;</div><div class='del'>-			__set_bit(i, arena-&gt;map);</div><div class='add'>+			if (page_in_phys_avail(ra)) {</div><div class='add'>+				pci_sun4v_iommu_demap(devhandle,</div><div class='add'>+						      HV_PCI_TSBID(0, i), 1);</div><div class='add'>+			} else {</div><div class='add'>+				cnt++;</div><div class='add'>+				__set_bit(i, arena-&gt;map);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -913,13 +994,18 @@ static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,</div><div class='ctx'> static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_iommu *iommu = pbm-&gt;iommu;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	unsigned long num_tsb_entries, sz;</div><div class='ctx'> 	u32 vdma[2], dma_mask, dma_offset;</div><div class='del'>-	int err, tsbsize;</div><div class='add'>+	int tsbsize;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(pbm-&gt;prom_node, "virtual-dma", NULL);</div><div class='add'>+	if (prop) {</div><div class='add'>+		u32 *val = prop-&gt;value;</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(pbm-&gt;prom_node, "virtual-dma",</div><div class='del'>-			       (char *)&amp;vdma[0], sizeof(vdma));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='add'>+		vdma[0] = val[0];</div><div class='add'>+		vdma[1] = val[1];</div><div class='add'>+	} else {</div><div class='ctx'> 		/* No property, use default values. */</div><div class='ctx'> 		vdma[0] = 0x80000000;</div><div class='ctx'> 		vdma[1] = 0x80000000;</div><div class='hunk'>@@ -971,34 +1057,30 @@ static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm)</div><div class='ctx'> 	iommu-&gt;arena.limit = num_tsb_entries;</div><div class='ctx'> </div><div class='ctx'> 	sz = probe_existing_entries(pbm, iommu);</div><div class='del'>-</div><div class='del'>-	printk("%s: TSB entries [%lu], existing mapings [%lu]\n",</div><div class='del'>-	       pbm-&gt;name, num_tsb_entries, sz);</div><div class='add'>+	if (sz)</div><div class='add'>+		printk("%s: Imported %lu TSB entries from OBP\n",</div><div class='add'>+		       pbm-&gt;name, sz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pci_sun4v_get_bus_range(struct pci_pbm_info *pbm)</div><div class='ctx'> {</div><div class='del'>-	unsigned int busrange[2];</div><div class='del'>-	int prom_node = pbm-&gt;prom_node;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(prom_node, "bus-range",</div><div class='del'>-			       (char *)&amp;busrange[0],</div><div class='del'>-			       sizeof(busrange));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no bus-range.\n", pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	struct property *prop;</div><div class='add'>+	unsigned int *busrange;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(pbm-&gt;prom_node, "bus-range", NULL);</div><div class='add'>+</div><div class='add'>+	busrange = prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;pci_first_busno = busrange[0];</div><div class='ctx'> 	pbm-&gt;pci_last_busno = busrange[1];</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pci_sun4v_pbm_init(struct pci_controller_info *p, int prom_node, u32 devhandle)</div><div class='add'>+static void pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node *dp, u32 devhandle)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_pbm_info *pbm;</div><div class='del'>-	int err, i;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int len, i;</div><div class='ctx'> </div><div class='ctx'> 	if (devhandle &amp; 0x40)</div><div class='ctx'> 		pbm = &amp;p-&gt;pbm_B;</div><div class='hunk'>@@ -1006,32 +1088,19 @@ static void pci_sun4v_pbm_init(struct pci_controller_info *p, int prom_node, u32</div><div class='ctx'> 		pbm = &amp;p-&gt;pbm_A;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;parent = p;</div><div class='del'>-	pbm-&gt;prom_node = prom_node;</div><div class='add'>+	pbm-&gt;prom_node = dp;</div><div class='ctx'> 	pbm-&gt;pci_first_slot = 1;</div><div class='ctx'> </div><div class='ctx'> 	pbm-&gt;devhandle = devhandle;</div><div class='ctx'> </div><div class='del'>-	sprintf(pbm-&gt;name, "SUN4V-PCI%d PBM%c",</div><div class='del'>-		p-&gt;index, (pbm == &amp;p-&gt;pbm_A ? 'A' : 'B'));</div><div class='del'>-</div><div class='del'>-	printk("%s: devhandle[%x] prom_node[%x:%x]\n",</div><div class='del'>-	       pbm-&gt;name, pbm-&gt;devhandle,</div><div class='del'>-	       pbm-&gt;prom_node, prom_getchild(pbm-&gt;prom_node));</div><div class='del'>-</div><div class='del'>-	prom_getstring(prom_node, "name",</div><div class='del'>-		       pbm-&gt;prom_name, sizeof(pbm-&gt;prom_name));</div><div class='add'>+	pbm-&gt;name = dp-&gt;full_name;</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "ranges",</div><div class='del'>-			       (char *) pbm-&gt;pbm_ranges,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_ranges));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no ranges property.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	printk("%s: SUN4V PCI Bus Module\n", pbm-&gt;name);</div><div class='ctx'> </div><div class='add'>+	prop = of_find_property(dp, "ranges", &amp;len);</div><div class='add'>+	pbm-&gt;pbm_ranges = prop-&gt;value;</div><div class='ctx'> 	pbm-&gt;num_pbm_ranges =</div><div class='del'>-		(err / sizeof(struct linux_prom_pci_ranges));</div><div class='add'>+		(len / sizeof(struct linux_prom_pci_ranges));</div><div class='ctx'> </div><div class='ctx'> 	/* Mask out the top 8 bits of the ranges, leaving the real</div><div class='ctx'> 	 * physical address.</div><div class='hunk'>@@ -1042,39 +1111,33 @@ static void pci_sun4v_pbm_init(struct pci_controller_info *p, int prom_node, u32</div><div class='ctx'> 	pci_sun4v_determine_mem_io_space(pbm);</div><div class='ctx'> 	pbm_register_toplevel_resources(p, pbm);</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "interrupt-map",</div><div class='del'>-			       (char *)pbm-&gt;pbm_intmap,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_intmap));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no interrupt-map property.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "interrupt-map", &amp;len);</div><div class='add'>+	pbm-&gt;pbm_intmap = prop-&gt;value;</div><div class='add'>+	pbm-&gt;num_pbm_intmap =</div><div class='add'>+		(len / sizeof(struct linux_prom_pci_intmap));</div><div class='ctx'> </div><div class='del'>-	pbm-&gt;num_pbm_intmap = (err / sizeof(struct linux_prom_pci_intmap));</div><div class='del'>-	err = prom_getproperty(prom_node, "interrupt-map-mask",</div><div class='del'>-			       (char *)&amp;pbm-&gt;pbm_intmask,</div><div class='del'>-			       sizeof(pbm-&gt;pbm_intmask));</div><div class='del'>-	if (err == 0 || err == -1) {</div><div class='del'>-		prom_printf("%s: Fatal error, no interrupt-map-mask.\n",</div><div class='del'>-			    pbm-&gt;name);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	prop = of_find_property(dp, "interrupt-map-mask", NULL);</div><div class='add'>+	pbm-&gt;pbm_intmask = prop-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	pci_sun4v_get_bus_range(pbm);</div><div class='ctx'> 	pci_sun4v_iommu_init(pbm);</div><div class='add'>+</div><div class='add'>+	pdev_htab_populate(pbm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sun4v_pci_init(int node, char *model_name)</div><div class='add'>+void sun4v_pci_init(struct device_node *dp, char *model_name)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_controller_info *p;</div><div class='ctx'> 	struct pci_iommu *iommu;</div><div class='del'>-	struct linux_prom64_registers regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='ctx'> 	u32 devhandle;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	prom_getproperty(node, "reg", (char *)&amp;regs, sizeof(regs));</div><div class='del'>-	devhandle = (regs.phys_addr &gt;&gt; 32UL) &amp; 0x0fffffff;</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	devhandle = (regs-&gt;phys_addr &gt;&gt; 32UL) &amp; 0x0fffffff;</div><div class='ctx'> </div><div class='ctx'> 	for (p = pci_controller_root; p; p = p-&gt;next) {</div><div class='ctx'> 		struct pci_pbm_info *pbm;</div><div class='hunk'>@@ -1087,7 +1150,7 @@ void sun4v_pci_init(int node, char *model_name)</div><div class='ctx'> 		       &amp;p-&gt;pbm_B);</div><div class='ctx'> </div><div class='ctx'> 		if (pbm-&gt;devhandle == (devhandle ^ 0x40)) {</div><div class='del'>-			pci_sun4v_pbm_init(p, node, devhandle);</div><div class='add'>+			pci_sun4v_pbm_init(p, dp, devhandle);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1128,7 +1191,6 @@ void sun4v_pci_init(int node, char *model_name)</div><div class='ctx'> 	p-&gt;pbms_same_domain = 0;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;scan_bus = pci_sun4v_scan_bus;</div><div class='del'>-	p-&gt;irq_build = pci_sun4v_irq_build;</div><div class='ctx'> 	p-&gt;base_address_update = pci_sun4v_base_address_update;</div><div class='ctx'> 	p-&gt;resource_adjust = pci_sun4v_resource_adjust;</div><div class='ctx'> 	p-&gt;pci_ops = &amp;pci_sun4v_ops;</div><div class='hunk'>@@ -1138,7 +1200,7 @@ void sun4v_pci_init(int node, char *model_name)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_memspace_mask = 0x7fffffffUL;</div><div class='ctx'> </div><div class='del'>-	pci_sun4v_pbm_init(p, node, devhandle);</div><div class='add'>+	pci_sun4v_pbm_init(p, dp, devhandle);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> fatal_memory_error:</div><div class='head'>diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c<br/>index 30bcaf58e3ab..e55466c77b61 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/power.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> #define __KERNEL_SYSCALLS__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -17,9 +16,10 @@</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/isa.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> int scons_pwroff = 1; </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> static void __iomem *power_reg;</div><div class='ctx'> </div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(powerd_wait);</div><div class='hunk'>@@ -105,87 +106,61 @@ again:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init has_button_interrupt(unsigned int irq, int prom_node)</div><div class='add'>+static int __init has_button_interrupt(unsigned int irq, struct device_node *dp)</div><div class='ctx'> {</div><div class='ctx'> 	if (irq == PCI_IRQ_NONE)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (!prom_node_has_property(prom_node, "button"))</div><div class='add'>+	if (!of_find_property(dp, "button", NULL))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init power_probe_ebus(struct resource **resp, unsigned int *irq_p, int *prom_node_p)</div><div class='add'>+static int __devinit power_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct linux_ebus_device *edev;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "power")) {</div><div class='del'>-				*resp = &amp;edev-&gt;resource[0];</div><div class='del'>-				*irq_p = edev-&gt;irqs[0];</div><div class='del'>-				*prom_node_p = edev-&gt;prom_node;</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init power_probe_isa(struct resource **resp, unsigned int *irq_p, int *prom_node_p)</div><div class='del'>-{</div><div class='del'>-	struct sparc_isa_bridge *isa_bus;</div><div class='del'>-	struct sparc_isa_device *isa_dev;</div><div class='del'>-</div><div class='del'>-	for_each_isa(isa_bus) {</div><div class='del'>-		for_each_isadev(isa_dev, isa_bus) {</div><div class='del'>-			if (!strcmp(isa_dev-&gt;prom_name, "power")) {</div><div class='del'>-				*resp = &amp;isa_dev-&gt;resource;</div><div class='del'>-				*irq_p = isa_dev-&gt;irq;</div><div class='del'>-				*prom_node_p = isa_dev-&gt;prom_node;</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __init power_init(void)</div><div class='del'>-{</div><div class='del'>-	struct resource *res = NULL;</div><div class='del'>-	unsigned int irq;</div><div class='del'>-	int prom_node;</div><div class='del'>-	static int invoked;</div><div class='add'>+	struct resource *res = &amp;op-&gt;resource[0];</div><div class='add'>+	unsigned int irq= op-&gt;irqs[0];</div><div class='ctx'> </div><div class='del'>-	if (invoked)</div><div class='del'>-		return;</div><div class='del'>-	invoked = 1;</div><div class='add'>+	power_reg = of_ioremap(res, 0, 0x4, "power");</div><div class='ctx'> </div><div class='del'>-	if (!power_probe_ebus(&amp;res, &amp;irq, &amp;prom_node))</div><div class='del'>-		goto found;</div><div class='add'>+	printk("%s: Control reg at %lx ... ",</div><div class='add'>+	       op-&gt;node-&gt;name, res-&gt;start);</div><div class='ctx'> </div><div class='del'>-	if (!power_probe_isa(&amp;res, &amp;irq, &amp;prom_node))</div><div class='del'>-		goto found;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-found:</div><div class='del'>-	power_reg = ioremap(res-&gt;start, 0x4);</div><div class='del'>-	printk("power: Control reg at %p ... ", power_reg);</div><div class='ctx'> 	poweroff_method = machine_halt;  /* able to use the standard halt */</div><div class='del'>-	if (has_button_interrupt(irq, prom_node)) {</div><div class='add'>+</div><div class='add'>+	if (has_button_interrupt(irq, op-&gt;node)) {</div><div class='ctx'> 		if (kernel_thread(powerd, NULL, CLONE_FS) &lt; 0) {</div><div class='ctx'> 			printk("Failed to start power daemon.\n");</div><div class='del'>-			return;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk("powerd running.\n");</div><div class='ctx'> </div><div class='ctx'> 		if (request_irq(irq,</div><div class='del'>-				power_handler, SA_SHIRQ, "power", NULL) &lt; 0)</div><div class='add'>+				power_handler, 0, "power", NULL) &lt; 0)</div><div class='ctx'> 			printk("power: Error, cannot register IRQ handler.\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk("not using powerd.\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id power_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "power",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver power_driver = {</div><div class='add'>+	.name		= "power",</div><div class='add'>+	.match_table	= power_match,</div><div class='add'>+	.probe		= power_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init power_init(void)</div><div class='add'>+{</div><div class='add'>+	of_register_driver(&amp;power_driver, &amp;of_bus_type);</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='head'>diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c<br/>index 1c7ca2f712d9..7d75cd4eb297 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/process.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -26,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c<br/>new file mode 100644<br/>index 000000000000..c86007a2aa3f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/prom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/prom.c</a></div><div class='hunk'>@@ -0,0 +1,1570 @@</div><div class='add'>+/*</div><div class='add'>+ * Procedures for creating, accessing and interpreting the device tree.</div><div class='add'>+ *</div><div class='add'>+ * Paul Mackerras	August 1996.</div><div class='add'>+ * Copyright (C) 1996-2005 Paul Mackerras.</div><div class='add'>+ * </div><div class='add'>+ *  Adapted for 64bit PowerPC by Dave Engebretsen and Peter Bergner.</div><div class='add'>+ *    {engebret|bergner}@us.ibm.com </div><div class='add'>+ *</div><div class='add'>+ *  Adapted for sparc64 by David S. Miller davem@davemloft.net</div><div class='add'>+ *</div><div class='add'>+ *      This program is free software; you can redistribute it and/or</div><div class='add'>+ *      modify it under the terms of the GNU General Public License</div><div class='add'>+ *      as published by the Free Software Foundation; either version</div><div class='add'>+ *      2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='add'>+#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/asi.h&gt;</div><div class='add'>+#include &lt;asm/upa.h&gt;</div><div class='add'>+</div><div class='add'>+static struct device_node *allnodes;</div><div class='add'>+</div><div class='add'>+/* use when traversing tree through the allnext, child, sibling,</div><div class='add'>+ * or parent members of struct device_node.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_RWLOCK(devtree_lock);</div><div class='add'>+</div><div class='add'>+int of_device_is_compatible(struct device_node *device, const char *compat)</div><div class='add'>+{</div><div class='add'>+	const char* cp;</div><div class='add'>+	int cplen, l;</div><div class='add'>+</div><div class='add'>+	cp = (char *) of_get_property(device, "compatible", &amp;cplen);</div><div class='add'>+	if (cp == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	while (cplen &gt; 0) {</div><div class='add'>+		if (strncmp(cp, compat, strlen(compat)) == 0)</div><div class='add'>+			return 1;</div><div class='add'>+		l = strlen(cp) + 1;</div><div class='add'>+		cp += l;</div><div class='add'>+		cplen -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_device_is_compatible);</div><div class='add'>+</div><div class='add'>+struct device_node *of_get_parent(const struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	np = node-&gt;parent;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_parent);</div><div class='add'>+</div><div class='add'>+struct device_node *of_get_next_child(const struct device_node *node,</div><div class='add'>+	struct device_node *prev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *next;</div><div class='add'>+</div><div class='add'>+	next = prev ? prev-&gt;sibling : node-&gt;child;</div><div class='add'>+	for (; next != 0; next = next-&gt;sibling) {</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return next;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_next_child);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_path(const char *path)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = allnodes;</div><div class='add'>+</div><div class='add'>+	for (; np != 0; np = np-&gt;allnext) {</div><div class='add'>+		if (np-&gt;full_name != 0 &amp;&amp; strcmp(np-&gt;full_name, path) == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_path);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_phandle(phandle handle)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	for (np = allnodes; np != 0; np = np-&gt;allnext)</div><div class='add'>+		if (np-&gt;node == handle)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_phandle);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_name(struct device_node *from,</div><div class='add'>+	const char *name)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = from ? from-&gt;allnext : allnodes;</div><div class='add'>+	for (; np != NULL; np = np-&gt;allnext)</div><div class='add'>+		if (np-&gt;name != NULL &amp;&amp; strcmp(np-&gt;name, name) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_name);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_node_by_type(struct device_node *from,</div><div class='add'>+	const char *type)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = from ? from-&gt;allnext : allnodes;</div><div class='add'>+	for (; np != 0; np = np-&gt;allnext)</div><div class='add'>+		if (np-&gt;type != 0 &amp;&amp; strcmp(np-&gt;type, type) == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_node_by_type);</div><div class='add'>+</div><div class='add'>+struct device_node *of_find_compatible_node(struct device_node *from,</div><div class='add'>+	const char *type, const char *compatible)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np;</div><div class='add'>+</div><div class='add'>+	np = from ? from-&gt;allnext : allnodes;</div><div class='add'>+	for (; np != 0; np = np-&gt;allnext) {</div><div class='add'>+		if (type != NULL</div><div class='add'>+		    &amp;&amp; !(np-&gt;type != 0 &amp;&amp; strcmp(np-&gt;type, type) == 0))</div><div class='add'>+			continue;</div><div class='add'>+		if (of_device_is_compatible(np, compatible))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return np;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_compatible_node);</div><div class='add'>+</div><div class='add'>+struct property *of_find_property(struct device_node *np, const char *name,</div><div class='add'>+				  int *lenp)</div><div class='add'>+{</div><div class='add'>+	struct property *pp;</div><div class='add'>+</div><div class='add'>+	for (pp = np-&gt;properties; pp != 0; pp = pp-&gt;next) {</div><div class='add'>+		if (strcmp(pp-&gt;name, name) == 0) {</div><div class='add'>+			if (lenp != 0)</div><div class='add'>+				*lenp = pp-&gt;length;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return pp;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_find_property);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Find a property with a given name for a given node</div><div class='add'>+ * and return the value.</div><div class='add'>+ */</div><div class='add'>+void *of_get_property(struct device_node *np, const char *name, int *lenp)</div><div class='add'>+{</div><div class='add'>+	struct property *pp = of_find_property(np,name,lenp);</div><div class='add'>+	return pp ? pp-&gt;value : NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_get_property);</div><div class='add'>+</div><div class='add'>+int of_getintprop_default(struct device_node *np, const char *name, int def)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(np, name, &amp;len);</div><div class='add'>+	if (!prop || len != 4)</div><div class='add'>+		return def;</div><div class='add'>+</div><div class='add'>+	return *(int *) prop-&gt;value;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_getintprop_default);</div><div class='add'>+</div><div class='add'>+int of_n_addr_cells(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int* ip;</div><div class='add'>+	do {</div><div class='add'>+		if (np-&gt;parent)</div><div class='add'>+			np = np-&gt;parent;</div><div class='add'>+		ip = of_get_property(np, "#address-cells", NULL);</div><div class='add'>+		if (ip != NULL)</div><div class='add'>+			return *ip;</div><div class='add'>+	} while (np-&gt;parent);</div><div class='add'>+	/* No #address-cells property for the root node, default to 2 */</div><div class='add'>+	return 2;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_n_addr_cells);</div><div class='add'>+</div><div class='add'>+int of_n_size_cells(struct device_node *np)</div><div class='add'>+{</div><div class='add'>+	int* ip;</div><div class='add'>+	do {</div><div class='add'>+		if (np-&gt;parent)</div><div class='add'>+			np = np-&gt;parent;</div><div class='add'>+		ip = of_get_property(np, "#size-cells", NULL);</div><div class='add'>+		if (ip != NULL)</div><div class='add'>+			return *ip;</div><div class='add'>+	} while (np-&gt;parent);</div><div class='add'>+	/* No #size-cells property for the root node, default to 1 */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_n_size_cells);</div><div class='add'>+</div><div class='add'>+int of_set_property(struct device_node *dp, const char *name, void *val, int len)</div><div class='add'>+{</div><div class='add'>+	struct property **prevp;</div><div class='add'>+	void *new_val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	new_val = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (!new_val)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(new_val, val, len);</div><div class='add'>+</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+</div><div class='add'>+	write_lock(&amp;devtree_lock);</div><div class='add'>+	prevp = &amp;dp-&gt;properties;</div><div class='add'>+	while (*prevp) {</div><div class='add'>+		struct property *prop = *prevp;</div><div class='add'>+</div><div class='add'>+		if (!strcmp(prop-&gt;name, name)) {</div><div class='add'>+			void *old_val = prop-&gt;value;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			ret = prom_setprop(dp-&gt;node, name, val, len);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			if (ret &gt;= 0) {</div><div class='add'>+				prop-&gt;value = new_val;</div><div class='add'>+				prop-&gt;length = len;</div><div class='add'>+</div><div class='add'>+				if (OF_IS_DYNAMIC(prop))</div><div class='add'>+					kfree(old_val);</div><div class='add'>+</div><div class='add'>+				OF_MARK_DYNAMIC(prop);</div><div class='add'>+</div><div class='add'>+				err = 0;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		prevp = &amp;(*prevp)-&gt;next;</div><div class='add'>+	}</div><div class='add'>+	write_unlock(&amp;devtree_lock);</div><div class='add'>+</div><div class='add'>+	/* XXX Upate procfs if necessary... */</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(of_set_property);</div><div class='add'>+</div><div class='add'>+static unsigned int prom_early_allocated;</div><div class='add'>+</div><div class='add'>+static void * __init prom_early_alloc(unsigned long size)</div><div class='add'>+{</div><div class='add'>+	void *ret;</div><div class='add'>+</div><div class='add'>+	ret = __alloc_bootmem(size, SMP_CACHE_BYTES, 0UL);</div><div class='add'>+	if (ret != NULL)</div><div class='add'>+		memset(ret, 0, size);</div><div class='add'>+</div><div class='add'>+	prom_early_allocated += size;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+/* PSYCHO interrupt mapping support. */</div><div class='add'>+#define PSYCHO_IMAP_A_SLOT0	0x0c00UL</div><div class='add'>+#define PSYCHO_IMAP_B_SLOT0	0x0c20UL</div><div class='add'>+static unsigned long psycho_pcislot_imap_offset(unsigned long ino)</div><div class='add'>+{</div><div class='add'>+	unsigned int bus =  (ino &amp; 0x10) &gt;&gt; 4;</div><div class='add'>+	unsigned int slot = (ino &amp; 0x0c) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	if (bus == 0)</div><div class='add'>+		return PSYCHO_IMAP_A_SLOT0 + (slot * 8);</div><div class='add'>+	else</div><div class='add'>+		return PSYCHO_IMAP_B_SLOT0 + (slot * 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PSYCHO_IMAP_SCSI	0x1000UL</div><div class='add'>+#define PSYCHO_IMAP_ETH		0x1008UL</div><div class='add'>+#define PSYCHO_IMAP_BPP		0x1010UL</div><div class='add'>+#define PSYCHO_IMAP_AU_REC	0x1018UL</div><div class='add'>+#define PSYCHO_IMAP_AU_PLAY	0x1020UL</div><div class='add'>+#define PSYCHO_IMAP_PFAIL	0x1028UL</div><div class='add'>+#define PSYCHO_IMAP_KMS		0x1030UL</div><div class='add'>+#define PSYCHO_IMAP_FLPY	0x1038UL</div><div class='add'>+#define PSYCHO_IMAP_SHW		0x1040UL</div><div class='add'>+#define PSYCHO_IMAP_KBD		0x1048UL</div><div class='add'>+#define PSYCHO_IMAP_MS		0x1050UL</div><div class='add'>+#define PSYCHO_IMAP_SER		0x1058UL</div><div class='add'>+#define PSYCHO_IMAP_TIM0	0x1060UL</div><div class='add'>+#define PSYCHO_IMAP_TIM1	0x1068UL</div><div class='add'>+#define PSYCHO_IMAP_UE		0x1070UL</div><div class='add'>+#define PSYCHO_IMAP_CE		0x1078UL</div><div class='add'>+#define PSYCHO_IMAP_A_ERR	0x1080UL</div><div class='add'>+#define PSYCHO_IMAP_B_ERR	0x1088UL</div><div class='add'>+#define PSYCHO_IMAP_PMGMT	0x1090UL</div><div class='add'>+#define PSYCHO_IMAP_GFX		0x1098UL</div><div class='add'>+#define PSYCHO_IMAP_EUPA	0x10a0UL</div><div class='add'>+</div><div class='add'>+static unsigned long __psycho_onboard_imap_off[] = {</div><div class='add'>+/*0x20*/	PSYCHO_IMAP_SCSI,</div><div class='add'>+/*0x21*/	PSYCHO_IMAP_ETH,</div><div class='add'>+/*0x22*/	PSYCHO_IMAP_BPP,</div><div class='add'>+/*0x23*/	PSYCHO_IMAP_AU_REC,</div><div class='add'>+/*0x24*/	PSYCHO_IMAP_AU_PLAY,</div><div class='add'>+/*0x25*/	PSYCHO_IMAP_PFAIL,</div><div class='add'>+/*0x26*/	PSYCHO_IMAP_KMS,</div><div class='add'>+/*0x27*/	PSYCHO_IMAP_FLPY,</div><div class='add'>+/*0x28*/	PSYCHO_IMAP_SHW,</div><div class='add'>+/*0x29*/	PSYCHO_IMAP_KBD,</div><div class='add'>+/*0x2a*/	PSYCHO_IMAP_MS,</div><div class='add'>+/*0x2b*/	PSYCHO_IMAP_SER,</div><div class='add'>+/*0x2c*/	PSYCHO_IMAP_TIM0,</div><div class='add'>+/*0x2d*/	PSYCHO_IMAP_TIM1,</div><div class='add'>+/*0x2e*/	PSYCHO_IMAP_UE,</div><div class='add'>+/*0x2f*/	PSYCHO_IMAP_CE,</div><div class='add'>+/*0x30*/	PSYCHO_IMAP_A_ERR,</div><div class='add'>+/*0x31*/	PSYCHO_IMAP_B_ERR,</div><div class='add'>+/*0x32*/	PSYCHO_IMAP_PMGMT</div><div class='add'>+};</div><div class='add'>+#define PSYCHO_ONBOARD_IRQ_BASE		0x20</div><div class='add'>+#define PSYCHO_ONBOARD_IRQ_LAST		0x32</div><div class='add'>+#define psycho_onboard_imap_offset(__ino) \</div><div class='add'>+	__psycho_onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE]</div><div class='add'>+</div><div class='add'>+#define PSYCHO_ICLR_A_SLOT0	0x1400UL</div><div class='add'>+#define PSYCHO_ICLR_SCSI	0x1800UL</div><div class='add'>+</div><div class='add'>+#define psycho_iclr_offset(ino)					      \</div><div class='add'>+	((ino &amp; 0x20) ? (PSYCHO_ICLR_SCSI + (((ino) &amp; 0x1f) &lt;&lt; 3)) :  \</div><div class='add'>+			(PSYCHO_ICLR_A_SLOT0 + (((ino) &amp; 0x1f)&lt;&lt;3)))</div><div class='add'>+</div><div class='add'>+static unsigned int psycho_irq_build(struct device_node *dp,</div><div class='add'>+				     unsigned int ino,</div><div class='add'>+				     void *_data)</div><div class='add'>+{</div><div class='add'>+	unsigned long controller_regs = (unsigned long) _data;</div><div class='add'>+	unsigned long imap, iclr;</div><div class='add'>+	unsigned long imap_off, iclr_off;</div><div class='add'>+	int inofixup = 0;</div><div class='add'>+</div><div class='add'>+	ino &amp;= 0x3f;</div><div class='add'>+	if (ino &lt; PSYCHO_ONBOARD_IRQ_BASE) {</div><div class='add'>+		/* PCI slot */</div><div class='add'>+		imap_off = psycho_pcislot_imap_offset(ino);</div><div class='add'>+	} else {</div><div class='add'>+		/* Onboard device */</div><div class='add'>+		if (ino &gt; PSYCHO_ONBOARD_IRQ_LAST) {</div><div class='add'>+			prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino);</div><div class='add'>+			prom_halt();</div><div class='add'>+		}</div><div class='add'>+		imap_off = psycho_onboard_imap_offset(ino);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now build the IRQ bucket. */</div><div class='add'>+	imap = controller_regs + imap_off;</div><div class='add'>+	imap += 4;</div><div class='add'>+</div><div class='add'>+	iclr_off = psycho_iclr_offset(ino);</div><div class='add'>+	iclr = controller_regs + iclr_off;</div><div class='add'>+	iclr += 4;</div><div class='add'>+</div><div class='add'>+	if ((ino &amp; 0x20) == 0)</div><div class='add'>+		inofixup = ino &amp; 0x03;</div><div class='add'>+</div><div class='add'>+	return build_irq(inofixup, iclr, imap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psycho_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = psycho_irq_build;</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = (void *) regs[2].phys_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define sabre_read(__reg) \</div><div class='add'>+({	u64 __ret; \</div><div class='add'>+	__asm__ __volatile__("ldxa [%1] %2, %0" \</div><div class='add'>+			     : "=r" (__ret) \</div><div class='add'>+			     : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='add'>+			     : "memory"); \</div><div class='add'>+	__ret; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+struct sabre_irq_data {</div><div class='add'>+	unsigned long controller_regs;</div><div class='add'>+	unsigned int pci_first_busno;</div><div class='add'>+};</div><div class='add'>+#define SABRE_CONFIGSPACE	0x001000000UL</div><div class='add'>+#define SABRE_WRSYNC		0x1c20UL</div><div class='add'>+</div><div class='add'>+#define SABRE_CONFIG_BASE(CONFIG_SPACE)	\</div><div class='add'>+	(CONFIG_SPACE | (1UL &lt;&lt; 24))</div><div class='add'>+#define SABRE_CONFIG_ENCODE(BUS, DEVFN, REG)	\</div><div class='add'>+	(((unsigned long)(BUS)   &lt;&lt; 16) |	\</div><div class='add'>+	 ((unsigned long)(DEVFN) &lt;&lt; 8)  |	\</div><div class='add'>+	 ((unsigned long)(REG)))</div><div class='add'>+</div><div class='add'>+/* When a device lives behind a bridge deeper in the PCI bus topology</div><div class='add'>+ * than APB, a special sequence must run to make sure all pending DMA</div><div class='add'>+ * transfers at the time of IRQ delivery are visible in the coherency</div><div class='add'>+ * domain by the cpu.  This sequence is to perform a read on the far</div><div class='add'>+ * side of the non-APB bridge, then perform a read of Sabre's DMA</div><div class='add'>+ * write-sync register.</div><div class='add'>+ */</div><div class='add'>+static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2)</div><div class='add'>+{</div><div class='add'>+	unsigned int phys_hi = (unsigned int) (unsigned long) _arg1;</div><div class='add'>+	struct sabre_irq_data *irq_data = _arg2;</div><div class='add'>+	unsigned long controller_regs = irq_data-&gt;controller_regs;</div><div class='add'>+	unsigned long sync_reg = controller_regs + SABRE_WRSYNC;</div><div class='add'>+	unsigned long config_space = controller_regs + SABRE_CONFIGSPACE;</div><div class='add'>+	unsigned int bus, devfn;</div><div class='add'>+	u16 _unused;</div><div class='add'>+</div><div class='add'>+	config_space = SABRE_CONFIG_BASE(config_space);</div><div class='add'>+</div><div class='add'>+	bus = (phys_hi &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	devfn = (phys_hi &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	config_space |= SABRE_CONFIG_ENCODE(bus, devfn, 0x00);</div><div class='add'>+</div><div class='add'>+	__asm__ __volatile__("membar #Sync\n\t"</div><div class='add'>+			     "lduha [%1] %2, %0\n\t"</div><div class='add'>+			     "membar #Sync"</div><div class='add'>+			     : "=r" (_unused)</div><div class='add'>+			     : "r" ((u16 *) config_space),</div><div class='add'>+			       "i" (ASI_PHYS_BYPASS_EC_E_L)</div><div class='add'>+			     : "memory");</div><div class='add'>+</div><div class='add'>+	sabre_read(sync_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SABRE_IMAP_A_SLOT0	0x0c00UL</div><div class='add'>+#define SABRE_IMAP_B_SLOT0	0x0c20UL</div><div class='add'>+#define SABRE_IMAP_SCSI		0x1000UL</div><div class='add'>+#define SABRE_IMAP_ETH		0x1008UL</div><div class='add'>+#define SABRE_IMAP_BPP		0x1010UL</div><div class='add'>+#define SABRE_IMAP_AU_REC	0x1018UL</div><div class='add'>+#define SABRE_IMAP_AU_PLAY	0x1020UL</div><div class='add'>+#define SABRE_IMAP_PFAIL	0x1028UL</div><div class='add'>+#define SABRE_IMAP_KMS		0x1030UL</div><div class='add'>+#define SABRE_IMAP_FLPY		0x1038UL</div><div class='add'>+#define SABRE_IMAP_SHW		0x1040UL</div><div class='add'>+#define SABRE_IMAP_KBD		0x1048UL</div><div class='add'>+#define SABRE_IMAP_MS		0x1050UL</div><div class='add'>+#define SABRE_IMAP_SER		0x1058UL</div><div class='add'>+#define SABRE_IMAP_UE		0x1070UL</div><div class='add'>+#define SABRE_IMAP_CE		0x1078UL</div><div class='add'>+#define SABRE_IMAP_PCIERR	0x1080UL</div><div class='add'>+#define SABRE_IMAP_GFX		0x1098UL</div><div class='add'>+#define SABRE_IMAP_EUPA		0x10a0UL</div><div class='add'>+#define SABRE_ICLR_A_SLOT0	0x1400UL</div><div class='add'>+#define SABRE_ICLR_B_SLOT0	0x1480UL</div><div class='add'>+#define SABRE_ICLR_SCSI		0x1800UL</div><div class='add'>+#define SABRE_ICLR_ETH		0x1808UL</div><div class='add'>+#define SABRE_ICLR_BPP		0x1810UL</div><div class='add'>+#define SABRE_ICLR_AU_REC	0x1818UL</div><div class='add'>+#define SABRE_ICLR_AU_PLAY	0x1820UL</div><div class='add'>+#define SABRE_ICLR_PFAIL	0x1828UL</div><div class='add'>+#define SABRE_ICLR_KMS		0x1830UL</div><div class='add'>+#define SABRE_ICLR_FLPY		0x1838UL</div><div class='add'>+#define SABRE_ICLR_SHW		0x1840UL</div><div class='add'>+#define SABRE_ICLR_KBD		0x1848UL</div><div class='add'>+#define SABRE_ICLR_MS		0x1850UL</div><div class='add'>+#define SABRE_ICLR_SER		0x1858UL</div><div class='add'>+#define SABRE_ICLR_UE		0x1870UL</div><div class='add'>+#define SABRE_ICLR_CE		0x1878UL</div><div class='add'>+#define SABRE_ICLR_PCIERR	0x1880UL</div><div class='add'>+</div><div class='add'>+static unsigned long sabre_pcislot_imap_offset(unsigned long ino)</div><div class='add'>+{</div><div class='add'>+	unsigned int bus =  (ino &amp; 0x10) &gt;&gt; 4;</div><div class='add'>+	unsigned int slot = (ino &amp; 0x0c) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	if (bus == 0)</div><div class='add'>+		return SABRE_IMAP_A_SLOT0 + (slot * 8);</div><div class='add'>+	else</div><div class='add'>+		return SABRE_IMAP_B_SLOT0 + (slot * 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long __sabre_onboard_imap_off[] = {</div><div class='add'>+/*0x20*/	SABRE_IMAP_SCSI,</div><div class='add'>+/*0x21*/	SABRE_IMAP_ETH,</div><div class='add'>+/*0x22*/	SABRE_IMAP_BPP,</div><div class='add'>+/*0x23*/	SABRE_IMAP_AU_REC,</div><div class='add'>+/*0x24*/	SABRE_IMAP_AU_PLAY,</div><div class='add'>+/*0x25*/	SABRE_IMAP_PFAIL,</div><div class='add'>+/*0x26*/	SABRE_IMAP_KMS,</div><div class='add'>+/*0x27*/	SABRE_IMAP_FLPY,</div><div class='add'>+/*0x28*/	SABRE_IMAP_SHW,</div><div class='add'>+/*0x29*/	SABRE_IMAP_KBD,</div><div class='add'>+/*0x2a*/	SABRE_IMAP_MS,</div><div class='add'>+/*0x2b*/	SABRE_IMAP_SER,</div><div class='add'>+/*0x2c*/	0 /* reserved */,</div><div class='add'>+/*0x2d*/	0 /* reserved */,</div><div class='add'>+/*0x2e*/	SABRE_IMAP_UE,</div><div class='add'>+/*0x2f*/	SABRE_IMAP_CE,</div><div class='add'>+/*0x30*/	SABRE_IMAP_PCIERR,</div><div class='add'>+};</div><div class='add'>+#define SABRE_ONBOARD_IRQ_BASE		0x20</div><div class='add'>+#define SABRE_ONBOARD_IRQ_LAST		0x30</div><div class='add'>+#define sabre_onboard_imap_offset(__ino) \</div><div class='add'>+	__sabre_onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE]</div><div class='add'>+</div><div class='add'>+#define sabre_iclr_offset(ino)					      \</div><div class='add'>+	((ino &amp; 0x20) ? (SABRE_ICLR_SCSI + (((ino) &amp; 0x1f) &lt;&lt; 3)) :  \</div><div class='add'>+			(SABRE_ICLR_A_SLOT0 + (((ino) &amp; 0x1f)&lt;&lt;3)))</div><div class='add'>+</div><div class='add'>+static int sabre_device_needs_wsync(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent = dp-&gt;parent;</div><div class='add'>+	char *parent_model, *parent_compat;</div><div class='add'>+</div><div class='add'>+	/* This traversal up towards the root is meant to</div><div class='add'>+	 * handle two cases:</div><div class='add'>+	 *</div><div class='add'>+	 * 1) non-PCI bus sitting under PCI, such as 'ebus'</div><div class='add'>+	 * 2) the PCI controller interrupts themselves, which</div><div class='add'>+	 *    will use the sabre_irq_build but do not need</div><div class='add'>+	 *    the DMA synchronization handling</div><div class='add'>+	 */</div><div class='add'>+	while (parent) {</div><div class='add'>+		if (!strcmp(parent-&gt;type, "pci"))</div><div class='add'>+			break;</div><div class='add'>+		parent = parent-&gt;parent;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!parent)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parent_model = of_get_property(parent,</div><div class='add'>+				       "model", NULL);</div><div class='add'>+	if (parent_model &amp;&amp;</div><div class='add'>+	    (!strcmp(parent_model, "SUNW,sabre") ||</div><div class='add'>+	     !strcmp(parent_model, "SUNW,simba")))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parent_compat = of_get_property(parent,</div><div class='add'>+					"compatible", NULL);</div><div class='add'>+	if (parent_compat &amp;&amp;</div><div class='add'>+	    (!strcmp(parent_compat, "pci108e,a000") ||</div><div class='add'>+	     !strcmp(parent_compat, "pci108e,a001")))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int sabre_irq_build(struct device_node *dp,</div><div class='add'>+				    unsigned int ino,</div><div class='add'>+				    void *_data)</div><div class='add'>+{</div><div class='add'>+	struct sabre_irq_data *irq_data = _data;</div><div class='add'>+	unsigned long controller_regs = irq_data-&gt;controller_regs;</div><div class='add'>+	struct linux_prom_pci_registers *regs;</div><div class='add'>+	unsigned long imap, iclr;</div><div class='add'>+	unsigned long imap_off, iclr_off;</div><div class='add'>+	int inofixup = 0;</div><div class='add'>+	int virt_irq;</div><div class='add'>+</div><div class='add'>+	ino &amp;= 0x3f;</div><div class='add'>+	if (ino &lt; SABRE_ONBOARD_IRQ_BASE) {</div><div class='add'>+		/* PCI slot */</div><div class='add'>+		imap_off = sabre_pcislot_imap_offset(ino);</div><div class='add'>+	} else {</div><div class='add'>+		/* onboard device */</div><div class='add'>+		if (ino &gt; SABRE_ONBOARD_IRQ_LAST) {</div><div class='add'>+			prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino);</div><div class='add'>+			prom_halt();</div><div class='add'>+		}</div><div class='add'>+		imap_off = sabre_onboard_imap_offset(ino);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now build the IRQ bucket. */</div><div class='add'>+	imap = controller_regs + imap_off;</div><div class='add'>+	imap += 4;</div><div class='add'>+</div><div class='add'>+	iclr_off = sabre_iclr_offset(ino);</div><div class='add'>+	iclr = controller_regs + iclr_off;</div><div class='add'>+	iclr += 4;</div><div class='add'>+</div><div class='add'>+	if ((ino &amp; 0x20) == 0)</div><div class='add'>+		inofixup = ino &amp; 0x03;</div><div class='add'>+</div><div class='add'>+	virt_irq = build_irq(inofixup, iclr, imap);</div><div class='add'>+</div><div class='add'>+	/* If the parent device is a PCI&lt;-&gt;PCI bridge other than</div><div class='add'>+	 * APB, we have to install a pre-handler to ensure that</div><div class='add'>+	 * all pending DMA is drained before the interrupt handler</div><div class='add'>+	 * is run.</div><div class='add'>+	 */</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	if (regs &amp;&amp; sabre_device_needs_wsync(dp)) {</div><div class='add'>+		irq_install_pre_handler(virt_irq,</div><div class='add'>+					sabre_wsync_handler,</div><div class='add'>+					(void *) (long) regs-&gt;phys_hi,</div><div class='add'>+					(void *) irq_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return virt_irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sabre_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct sabre_irq_data *irq_data;</div><div class='add'>+	u32 *busrange;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = sabre_irq_build;</div><div class='add'>+</div><div class='add'>+	irq_data = prom_early_alloc(sizeof(struct sabre_irq_data));</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	irq_data-&gt;controller_regs = regs[0].phys_addr;</div><div class='add'>+</div><div class='add'>+	busrange = of_get_property(dp, "bus-range", NULL);</div><div class='add'>+	irq_data-&gt;pci_first_busno = busrange[0];</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = irq_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SCHIZO interrupt mapping support.  Unlike Psycho, for this controller the</div><div class='add'>+ * imap/iclr registers are per-PBM.</div><div class='add'>+ */</div><div class='add'>+#define SCHIZO_IMAP_BASE	0x1000UL</div><div class='add'>+#define SCHIZO_ICLR_BASE	0x1400UL</div><div class='add'>+</div><div class='add'>+static unsigned long schizo_imap_offset(unsigned long ino)</div><div class='add'>+{</div><div class='add'>+	return SCHIZO_IMAP_BASE + (ino * 8UL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long schizo_iclr_offset(unsigned long ino)</div><div class='add'>+{</div><div class='add'>+	return SCHIZO_ICLR_BASE + (ino * 8UL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long schizo_ino_to_iclr(unsigned long pbm_regs,</div><div class='add'>+					unsigned int ino)</div><div class='add'>+{</div><div class='add'>+	return pbm_regs + schizo_iclr_offset(ino) + 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long schizo_ino_to_imap(unsigned long pbm_regs,</div><div class='add'>+					unsigned int ino)</div><div class='add'>+{</div><div class='add'>+	return pbm_regs + schizo_imap_offset(ino) + 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define schizo_read(__reg) \</div><div class='add'>+({	u64 __ret; \</div><div class='add'>+	__asm__ __volatile__("ldxa [%1] %2, %0" \</div><div class='add'>+			     : "=r" (__ret) \</div><div class='add'>+			     : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='add'>+			     : "memory"); \</div><div class='add'>+	__ret; \</div><div class='add'>+})</div><div class='add'>+#define schizo_write(__reg, __val) \</div><div class='add'>+	__asm__ __volatile__("stxa %0, [%1] %2" \</div><div class='add'>+			     : /* no outputs */ \</div><div class='add'>+			     : "r" (__val), "r" (__reg), \</div><div class='add'>+			       "i" (ASI_PHYS_BYPASS_EC_E) \</div><div class='add'>+			     : "memory")</div><div class='add'>+</div><div class='add'>+static void tomatillo_wsync_handler(unsigned int ino, void *_arg1, void *_arg2)</div><div class='add'>+{</div><div class='add'>+	unsigned long sync_reg = (unsigned long) _arg2;</div><div class='add'>+	u64 mask = 1UL &lt;&lt; (ino &amp; IMAP_INO);</div><div class='add'>+	u64 val;</div><div class='add'>+	int limit;</div><div class='add'>+</div><div class='add'>+	schizo_write(sync_reg, mask);</div><div class='add'>+</div><div class='add'>+	limit = 100000;</div><div class='add'>+	val = 0;</div><div class='add'>+	while (--limit) {</div><div class='add'>+		val = schizo_read(sync_reg);</div><div class='add'>+		if (!(val &amp; mask))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (limit &lt;= 0) {</div><div class='add'>+		printk("tomatillo_wsync_handler: DMA won't sync [%lx:%lx]\n",</div><div class='add'>+		       val, mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (_arg1) {</div><div class='add'>+		static unsigned char cacheline[64]</div><div class='add'>+			__attribute__ ((aligned (64)));</div><div class='add'>+</div><div class='add'>+		__asm__ __volatile__("rd %%fprs, %0\n\t"</div><div class='add'>+				     "or %0, %4, %1\n\t"</div><div class='add'>+				     "wr %1, 0x0, %%fprs\n\t"</div><div class='add'>+				     "stda %%f0, [%5] %6\n\t"</div><div class='add'>+				     "wr %0, 0x0, %%fprs\n\t"</div><div class='add'>+				     "membar #Sync"</div><div class='add'>+				     : "=&amp;r" (mask), "=&amp;r" (val)</div><div class='add'>+				     : "0" (mask), "1" (val),</div><div class='add'>+				     "i" (FPRS_FEF), "r" (&amp;cacheline[0]),</div><div class='add'>+				     "i" (ASI_BLK_COMMIT_P));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct schizo_irq_data {</div><div class='add'>+	unsigned long pbm_regs;</div><div class='add'>+	unsigned long sync_reg;</div><div class='add'>+	u32 portid;</div><div class='add'>+	int chip_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int schizo_irq_build(struct device_node *dp,</div><div class='add'>+				     unsigned int ino,</div><div class='add'>+				     void *_data)</div><div class='add'>+{</div><div class='add'>+	struct schizo_irq_data *irq_data = _data;</div><div class='add'>+	unsigned long pbm_regs = irq_data-&gt;pbm_regs;</div><div class='add'>+	unsigned long imap, iclr;</div><div class='add'>+	int ign_fixup;</div><div class='add'>+	int virt_irq;</div><div class='add'>+	int is_tomatillo;</div><div class='add'>+</div><div class='add'>+	ino &amp;= 0x3f;</div><div class='add'>+</div><div class='add'>+	/* Now build the IRQ bucket. */</div><div class='add'>+	imap = schizo_ino_to_imap(pbm_regs, ino);</div><div class='add'>+	iclr = schizo_ino_to_iclr(pbm_regs, ino);</div><div class='add'>+</div><div class='add'>+	/* On Schizo, no inofixup occurs.  This is because each</div><div class='add'>+	 * INO has it's own IMAP register.  On Psycho and Sabre</div><div class='add'>+	 * there is only one IMAP register for each PCI slot even</div><div class='add'>+	 * though four different INOs can be generated by each</div><div class='add'>+	 * PCI slot.</div><div class='add'>+	 *</div><div class='add'>+	 * But, for JBUS variants (essentially, Tomatillo), we have</div><div class='add'>+	 * to fixup the lowest bit of the interrupt group number.</div><div class='add'>+	 */</div><div class='add'>+	ign_fixup = 0;</div><div class='add'>+</div><div class='add'>+	is_tomatillo = (irq_data-&gt;sync_reg != 0UL);</div><div class='add'>+</div><div class='add'>+	if (is_tomatillo) {</div><div class='add'>+		if (irq_data-&gt;portid &amp; 1)</div><div class='add'>+			ign_fixup = (1 &lt;&lt; 6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	virt_irq = build_irq(ign_fixup, iclr, imap);</div><div class='add'>+</div><div class='add'>+	if (is_tomatillo) {</div><div class='add'>+		irq_install_pre_handler(virt_irq,</div><div class='add'>+					tomatillo_wsync_handler,</div><div class='add'>+					((irq_data-&gt;chip_version &lt;= 4) ?</div><div class='add'>+					 (void *) 1 : (void *) 0),</div><div class='add'>+					(void *) irq_data-&gt;sync_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return virt_irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void schizo_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct schizo_irq_data *irq_data;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = schizo_irq_build;</div><div class='add'>+</div><div class='add'>+	irq_data = prom_early_alloc(sizeof(struct schizo_irq_data));</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = irq_data;</div><div class='add'>+</div><div class='add'>+	irq_data-&gt;pbm_regs = regs[0].phys_addr;</div><div class='add'>+	irq_data-&gt;sync_reg = regs[3].phys_addr + 0x1a18UL;</div><div class='add'>+	irq_data-&gt;portid = of_getintprop_default(dp, "portid", 0);</div><div class='add'>+	irq_data-&gt;chip_version = of_getintprop_default(dp, "version#", 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int pci_sun4v_irq_build(struct device_node *dp,</div><div class='add'>+					unsigned int devino,</div><div class='add'>+					void *_data)</div><div class='add'>+{</div><div class='add'>+	u32 devhandle = (u32) (unsigned long) _data;</div><div class='add'>+</div><div class='add'>+	return sun4v_build_irq(devhandle, devino);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pci_sun4v_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = pci_sun4v_irq_build;</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = (void *) (unsigned long)</div><div class='add'>+		((regs-&gt;phys_addr &gt;&gt; 32UL) &amp; 0x0fffffff);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+/* INO number to IMAP register offset for SYSIO external IRQ's.</div><div class='add'>+ * This should conform to both Sunfire/Wildfire server and Fusion</div><div class='add'>+ * desktop designs.</div><div class='add'>+ */</div><div class='add'>+#define SYSIO_IMAP_SLOT0	0x2c04UL</div><div class='add'>+#define SYSIO_IMAP_SLOT1	0x2c0cUL</div><div class='add'>+#define SYSIO_IMAP_SLOT2	0x2c14UL</div><div class='add'>+#define SYSIO_IMAP_SLOT3	0x2c1cUL</div><div class='add'>+#define SYSIO_IMAP_SCSI		0x3004UL</div><div class='add'>+#define SYSIO_IMAP_ETH		0x300cUL</div><div class='add'>+#define SYSIO_IMAP_BPP		0x3014UL</div><div class='add'>+#define SYSIO_IMAP_AUDIO	0x301cUL</div><div class='add'>+#define SYSIO_IMAP_PFAIL	0x3024UL</div><div class='add'>+#define SYSIO_IMAP_KMS		0x302cUL</div><div class='add'>+#define SYSIO_IMAP_FLPY		0x3034UL</div><div class='add'>+#define SYSIO_IMAP_SHW		0x303cUL</div><div class='add'>+#define SYSIO_IMAP_KBD		0x3044UL</div><div class='add'>+#define SYSIO_IMAP_MS		0x304cUL</div><div class='add'>+#define SYSIO_IMAP_SER		0x3054UL</div><div class='add'>+#define SYSIO_IMAP_TIM0		0x3064UL</div><div class='add'>+#define SYSIO_IMAP_TIM1		0x306cUL</div><div class='add'>+#define SYSIO_IMAP_UE		0x3074UL</div><div class='add'>+#define SYSIO_IMAP_CE		0x307cUL</div><div class='add'>+#define SYSIO_IMAP_SBERR	0x3084UL</div><div class='add'>+#define SYSIO_IMAP_PMGMT	0x308cUL</div><div class='add'>+#define SYSIO_IMAP_GFX		0x3094UL</div><div class='add'>+#define SYSIO_IMAP_EUPA		0x309cUL</div><div class='add'>+</div><div class='add'>+#define bogon     ((unsigned long) -1)</div><div class='add'>+static unsigned long sysio_irq_offsets[] = {</div><div class='add'>+	/* SBUS Slot 0 --&gt; 3, level 1 --&gt; 7 */</div><div class='add'>+	SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0,</div><div class='add'>+	SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0, SYSIO_IMAP_SLOT0,</div><div class='add'>+	SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1,</div><div class='add'>+	SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1, SYSIO_IMAP_SLOT1,</div><div class='add'>+	SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2,</div><div class='add'>+	SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2, SYSIO_IMAP_SLOT2,</div><div class='add'>+	SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3,</div><div class='add'>+	SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3, SYSIO_IMAP_SLOT3,</div><div class='add'>+</div><div class='add'>+	/* Onboard devices (not relevant/used on SunFire). */</div><div class='add'>+	SYSIO_IMAP_SCSI,</div><div class='add'>+	SYSIO_IMAP_ETH,</div><div class='add'>+	SYSIO_IMAP_BPP,</div><div class='add'>+	bogon,</div><div class='add'>+	SYSIO_IMAP_AUDIO,</div><div class='add'>+	SYSIO_IMAP_PFAIL,</div><div class='add'>+	bogon,</div><div class='add'>+	bogon,</div><div class='add'>+	SYSIO_IMAP_KMS,</div><div class='add'>+	SYSIO_IMAP_FLPY,</div><div class='add'>+	SYSIO_IMAP_SHW,</div><div class='add'>+	SYSIO_IMAP_KBD,</div><div class='add'>+	SYSIO_IMAP_MS,</div><div class='add'>+	SYSIO_IMAP_SER,</div><div class='add'>+	bogon,</div><div class='add'>+	bogon,</div><div class='add'>+	SYSIO_IMAP_TIM0,</div><div class='add'>+	SYSIO_IMAP_TIM1,</div><div class='add'>+	bogon,</div><div class='add'>+	bogon,</div><div class='add'>+	SYSIO_IMAP_UE,</div><div class='add'>+	SYSIO_IMAP_CE,</div><div class='add'>+	SYSIO_IMAP_SBERR,</div><div class='add'>+	SYSIO_IMAP_PMGMT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#undef bogon</div><div class='add'>+</div><div class='add'>+#define NUM_SYSIO_OFFSETS ARRAY_SIZE(sysio_irq_offsets)</div><div class='add'>+</div><div class='add'>+/* Convert Interrupt Mapping register pointer to associated</div><div class='add'>+ * Interrupt Clear register pointer, SYSIO specific version.</div><div class='add'>+ */</div><div class='add'>+#define SYSIO_ICLR_UNUSED0	0x3400UL</div><div class='add'>+#define SYSIO_ICLR_SLOT0	0x340cUL</div><div class='add'>+#define SYSIO_ICLR_SLOT1	0x344cUL</div><div class='add'>+#define SYSIO_ICLR_SLOT2	0x348cUL</div><div class='add'>+#define SYSIO_ICLR_SLOT3	0x34ccUL</div><div class='add'>+static unsigned long sysio_imap_to_iclr(unsigned long imap)</div><div class='add'>+{</div><div class='add'>+	unsigned long diff = SYSIO_ICLR_UNUSED0 - SYSIO_IMAP_SLOT0;</div><div class='add'>+	return imap + diff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int sbus_of_build_irq(struct device_node *dp,</div><div class='add'>+				      unsigned int ino,</div><div class='add'>+				      void *_data)</div><div class='add'>+{</div><div class='add'>+	unsigned long reg_base = (unsigned long) _data;</div><div class='add'>+	struct linux_prom_registers *regs;</div><div class='add'>+	unsigned long imap, iclr;</div><div class='add'>+	int sbus_slot = 0;</div><div class='add'>+	int sbus_level = 0;</div><div class='add'>+</div><div class='add'>+	ino &amp;= 0x3f;</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	if (regs)</div><div class='add'>+		sbus_slot = regs-&gt;which_io;</div><div class='add'>+</div><div class='add'>+	if (ino &lt; 0x20)</div><div class='add'>+		ino += (sbus_slot * 8);</div><div class='add'>+</div><div class='add'>+	imap = sysio_irq_offsets[ino];</div><div class='add'>+	if (imap == ((unsigned long)-1)) {</div><div class='add'>+		prom_printf("get_irq_translations: Bad SYSIO INO[%x]\n",</div><div class='add'>+			    ino);</div><div class='add'>+		prom_halt();</div><div class='add'>+	}</div><div class='add'>+	imap += reg_base;</div><div class='add'>+</div><div class='add'>+	/* SYSIO inconsistency.  For external SLOTS, we have to select</div><div class='add'>+	 * the right ICLR register based upon the lower SBUS irq level</div><div class='add'>+	 * bits.</div><div class='add'>+	 */</div><div class='add'>+	if (ino &gt;= 0x20) {</div><div class='add'>+		iclr = sysio_imap_to_iclr(imap);</div><div class='add'>+	} else {</div><div class='add'>+		sbus_level = ino &amp; 0x7;</div><div class='add'>+</div><div class='add'>+		switch(sbus_slot) {</div><div class='add'>+		case 0:</div><div class='add'>+			iclr = reg_base + SYSIO_ICLR_SLOT0;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			iclr = reg_base + SYSIO_ICLR_SLOT1;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			iclr = reg_base + SYSIO_ICLR_SLOT2;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+		case 3:</div><div class='add'>+			iclr = reg_base + SYSIO_ICLR_SLOT3;</div><div class='add'>+			break;</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		iclr += ((unsigned long)sbus_level - 1UL) * 8UL;</div><div class='add'>+	}</div><div class='add'>+	return build_irq(sbus_level, iclr, imap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sbus_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = sbus_of_build_irq;</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = (void *) (unsigned long) regs-&gt;phys_addr;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SBUS */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int central_build_irq(struct device_node *dp,</div><div class='add'>+				      unsigned int ino,</div><div class='add'>+				      void *_data)</div><div class='add'>+{</div><div class='add'>+	struct device_node *central_dp = _data;</div><div class='add'>+	struct of_device *central_op = of_find_device_by_node(central_dp);</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned long imap, iclr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(dp-&gt;name, "eeprom")) {</div><div class='add'>+		res = &amp;central_op-&gt;resource[5];</div><div class='add'>+	} else if (!strcmp(dp-&gt;name, "zs")) {</div><div class='add'>+		res = &amp;central_op-&gt;resource[4];</div><div class='add'>+	} else if (!strcmp(dp-&gt;name, "clock-board")) {</div><div class='add'>+		res = &amp;central_op-&gt;resource[3];</div><div class='add'>+	} else {</div><div class='add'>+		return ino;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	imap = res-&gt;start + 0x00UL;</div><div class='add'>+	iclr = res-&gt;start + 0x10UL;</div><div class='add'>+</div><div class='add'>+	/* Set the INO state to idle, and disable.  */</div><div class='add'>+	upa_writel(0, iclr);</div><div class='add'>+	upa_readl(iclr);</div><div class='add'>+</div><div class='add'>+	tmp = upa_readl(imap);</div><div class='add'>+	tmp &amp;= ~0x80000000;</div><div class='add'>+	upa_writel(tmp, imap);</div><div class='add'>+</div><div class='add'>+	return build_irq(0, iclr, imap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void central_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = central_build_irq;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct irq_trans {</div><div class='add'>+	const char *name;</div><div class='add'>+	void (*init)(struct device_node *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static struct irq_trans pci_irq_trans_table[] = {</div><div class='add'>+	{ "SUNW,sabre", sabre_irq_trans_init },</div><div class='add'>+	{ "pci108e,a000", sabre_irq_trans_init },</div><div class='add'>+	{ "pci108e,a001", sabre_irq_trans_init },</div><div class='add'>+	{ "SUNW,psycho", psycho_irq_trans_init },</div><div class='add'>+	{ "pci108e,8000", psycho_irq_trans_init },</div><div class='add'>+	{ "SUNW,schizo", schizo_irq_trans_init },</div><div class='add'>+	{ "pci108e,8001", schizo_irq_trans_init },</div><div class='add'>+	{ "SUNW,schizo+", schizo_irq_trans_init },</div><div class='add'>+	{ "pci108e,8002", schizo_irq_trans_init },</div><div class='add'>+	{ "SUNW,tomatillo", schizo_irq_trans_init },</div><div class='add'>+	{ "pci108e,a801", schizo_irq_trans_init },</div><div class='add'>+	{ "SUNW,sun4v-pci", pci_sun4v_irq_trans_init },</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static unsigned int sun4v_vdev_irq_build(struct device_node *dp,</div><div class='add'>+					 unsigned int devino,</div><div class='add'>+					 void *_data)</div><div class='add'>+{</div><div class='add'>+	u32 devhandle = (u32) (unsigned long) _data;</div><div class='add'>+</div><div class='add'>+	return sun4v_build_irq(devhandle, devino);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sun4v_vdev_irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+</div><div class='add'>+	dp-&gt;irq_trans = prom_early_alloc(sizeof(struct of_irq_controller));</div><div class='add'>+	dp-&gt;irq_trans-&gt;irq_build = sun4v_vdev_irq_build;</div><div class='add'>+</div><div class='add'>+	regs = of_get_property(dp, "reg", NULL);</div><div class='add'>+	dp-&gt;irq_trans-&gt;data = (void *) (unsigned long)</div><div class='add'>+		((regs-&gt;phys_addr &gt;&gt; 32UL) &amp; 0x0fffffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void irq_trans_init(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	const char *model;</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	int i;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	model = of_get_property(dp, "model", NULL);</div><div class='add'>+	if (!model)</div><div class='add'>+		model = of_get_property(dp, "compatible", NULL);</div><div class='add'>+	if (!model)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pci_irq_trans_table); i++) {</div><div class='add'>+		struct irq_trans *t = &amp;pci_irq_trans_table[i];</div><div class='add'>+</div><div class='add'>+		if (!strcmp(model, t-&gt;name))</div><div class='add'>+			return t-&gt;init(dp);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	if (!strcmp(dp-&gt;name, "sbus") ||</div><div class='add'>+	    !strcmp(dp-&gt;name, "sbi"))</div><div class='add'>+		return sbus_irq_trans_init(dp);</div><div class='add'>+#endif</div><div class='add'>+	if (!strcmp(dp-&gt;name, "central"))</div><div class='add'>+		return central_irq_trans_init(dp-&gt;child);</div><div class='add'>+	if (!strcmp(dp-&gt;name, "virtual-devices"))</div><div class='add'>+		return sun4v_vdev_irq_trans_init(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_root_node(const struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	if (!dp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return (dp-&gt;parent == NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The following routines deal with the black magic of fully naming a</div><div class='add'>+ * node.</div><div class='add'>+ *</div><div class='add'>+ * Certain well known named nodes are just the simple name string.</div><div class='add'>+ *</div><div class='add'>+ * Actual devices have an address specifier appended to the base name</div><div class='add'>+ * string, like this "foo@addr".  The "addr" can be in any number of</div><div class='add'>+ * formats, and the platform plus the type of the node determine the</div><div class='add'>+ * format and how it is constructed.</div><div class='add'>+ *</div><div class='add'>+ * For children of the ROOT node, the naming convention is fixed and</div><div class='add'>+ * determined by whether this is a sun4u or sun4v system.</div><div class='add'>+ *</div><div class='add'>+ * For children of other nodes, it is bus type specific.  So</div><div class='add'>+ * we walk up the tree until we discover a "device_type" property</div><div class='add'>+ * we recognize and we go from there.</div><div class='add'>+ *</div><div class='add'>+ * As an example, the boot device on my workstation has a full path:</div><div class='add'>+ *</div><div class='add'>+ *	/pci@1e,600000/ide@d/disk@0,0:c</div><div class='add'>+ */</div><div class='add'>+static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct property *rprop;</div><div class='add'>+	u32 high_bits, low_bits, type;</div><div class='add'>+</div><div class='add'>+	rprop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!rprop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = rprop-&gt;value;</div><div class='add'>+	if (!is_root_node(dp-&gt;parent)) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			(unsigned int) (regs-&gt;phys_addr &gt;&gt; 32UL),</div><div class='add'>+			(unsigned int) (regs-&gt;phys_addr &amp; 0xffffffffUL));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	type = regs-&gt;phys_addr &gt;&gt; 60UL;</div><div class='add'>+	high_bits = (regs-&gt;phys_addr &gt;&gt; 32UL) &amp; 0x0fffffffUL;</div><div class='add'>+	low_bits = (regs-&gt;phys_addr &amp; 0xffffffffUL);</div><div class='add'>+</div><div class='add'>+	if (type == 0 || type == 8) {</div><div class='add'>+		const char *prefix = (type == 0) ? "m" : "i";</div><div class='add'>+</div><div class='add'>+		if (low_bits)</div><div class='add'>+			sprintf(tmp_buf, "%s@%s%x,%x",</div><div class='add'>+				dp-&gt;name, prefix,</div><div class='add'>+				high_bits, low_bits);</div><div class='add'>+		else</div><div class='add'>+			sprintf(tmp_buf, "%s@%s%x",</div><div class='add'>+				dp-&gt;name,</div><div class='add'>+				prefix,</div><div class='add'>+				high_bits);</div><div class='add'>+	} else if (type == 12) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x",</div><div class='add'>+			dp-&gt;name, high_bits);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+	if (!is_root_node(dp-&gt;parent)) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			(unsigned int) (regs-&gt;phys_addr &gt;&gt; 32UL),</div><div class='add'>+			(unsigned int) (regs-&gt;phys_addr &amp; 0xffffffffUL));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "upa-portid", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		prop = of_find_property(dp, "portid", NULL);</div><div class='add'>+	if (prop) {</div><div class='add'>+		unsigned long mask = 0xffffffffUL;</div><div class='add'>+</div><div class='add'>+		if (tlb_type &gt;= cheetah)</div><div class='add'>+			mask = 0x7fffff;</div><div class='add'>+</div><div class='add'>+		sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			*(u32 *)prop-&gt;value,</div><div class='add'>+			(unsigned int) (regs-&gt;phys_addr &amp; mask));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@slot,offset"  */</div><div class='add'>+static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name,</div><div class='add'>+		regs-&gt;which_io,</div><div class='add'>+		regs-&gt;phys_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@devnum[,func]" */</div><div class='add'>+static void __init pci_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom_pci_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	unsigned int devfn;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+	devfn = (regs-&gt;phys_hi &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	if (devfn &amp; 0x07) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			devfn &gt;&gt; 3,</div><div class='add'>+			devfn &amp; 0x07);</div><div class='add'>+	} else {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x",</div><div class='add'>+			dp-&gt;name,</div><div class='add'>+			devfn &gt;&gt; 3);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@UPA_PORTID,offset" */</div><div class='add'>+static void __init upa_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "upa-portid", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name,</div><div class='add'>+		*(u32 *) prop-&gt;value,</div><div class='add'>+		(unsigned int) (regs-&gt;phys_addr &amp; 0xffffffffUL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@reg" */</div><div class='add'>+static void __init vdev_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	u32 *regs;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	sprintf(tmp_buf, "%s@%x", dp-&gt;name, *regs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@addrhi,addrlo" */</div><div class='add'>+static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct linux_prom64_registers *regs;</div><div class='add'>+	struct property *prop;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name,</div><div class='add'>+		(unsigned int) (regs-&gt;phys_addr &gt;&gt; 32UL),</div><div class='add'>+		(unsigned int) (regs-&gt;phys_addr &amp; 0xffffffffUL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@bus,addr" */</div><div class='add'>+static void __init i2c_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	u32 *regs;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	/* This actually isn't right... should look at the #address-cells</div><div class='add'>+	 * property of the i2c bus node etc. etc.</div><div class='add'>+	 */</div><div class='add'>+	sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+		dp-&gt;name, regs[0], regs[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@reg0[,reg1]" */</div><div class='add'>+static void __init usb_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	u32 *regs;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	if (prop-&gt;length == sizeof(u32) || regs[1] == 1) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x",</div><div class='add'>+			dp-&gt;name, regs[0]);</div><div class='add'>+	} else {</div><div class='add'>+		sprintf(tmp_buf, "%s@%x,%x",</div><div class='add'>+			dp-&gt;name, regs[0], regs[1]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* "name@reg0reg1[,reg2reg3]" */</div><div class='add'>+static void __init ieee1394_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	u32 *regs;</div><div class='add'>+</div><div class='add'>+	prop = of_find_property(dp, "reg", NULL);</div><div class='add'>+	if (!prop)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	regs = prop-&gt;value;</div><div class='add'>+</div><div class='add'>+	if (regs[2] || regs[3]) {</div><div class='add'>+		sprintf(tmp_buf, "%s@%08x%08x,%04x%08x",</div><div class='add'>+			dp-&gt;name, regs[0], regs[1], regs[2], regs[3]);</div><div class='add'>+	} else {</div><div class='add'>+		sprintf(tmp_buf, "%s@%08x%08x",</div><div class='add'>+			dp-&gt;name, regs[0], regs[1]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init __build_path_component(struct device_node *dp, char *tmp_buf)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent = dp-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (parent != NULL) {</div><div class='add'>+		if (!strcmp(parent-&gt;type, "pci") ||</div><div class='add'>+		    !strcmp(parent-&gt;type, "pciex"))</div><div class='add'>+			return pci_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "sbus"))</div><div class='add'>+			return sbus_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "upa"))</div><div class='add'>+			return upa_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "ebus"))</div><div class='add'>+			return ebus_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;name, "usb") ||</div><div class='add'>+		    !strcmp(parent-&gt;name, "hub"))</div><div class='add'>+			return usb_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "i2c"))</div><div class='add'>+			return i2c_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "firewire"))</div><div class='add'>+			return ieee1394_path_component(dp, tmp_buf);</div><div class='add'>+		if (!strcmp(parent-&gt;type, "virtual-devices"))</div><div class='add'>+			return vdev_path_component(dp, tmp_buf);</div><div class='add'>+</div><div class='add'>+		/* "isa" is handled with platform naming */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use platform naming convention.  */</div><div class='add'>+	if (tlb_type == hypervisor)</div><div class='add'>+		return sun4v_path_component(dp, tmp_buf);</div><div class='add'>+	else</div><div class='add'>+		return sun4u_path_component(dp, tmp_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char * __init build_path_component(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	char tmp_buf[64], *n;</div><div class='add'>+</div><div class='add'>+	tmp_buf[0] = '\0';</div><div class='add'>+	__build_path_component(dp, tmp_buf);</div><div class='add'>+	if (tmp_buf[0] == '\0')</div><div class='add'>+		strcpy(tmp_buf, dp-&gt;name);</div><div class='add'>+</div><div class='add'>+	n = prom_early_alloc(strlen(tmp_buf) + 1);</div><div class='add'>+	strcpy(n, tmp_buf);</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char * __init build_full_name(struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	int len, ourlen, plen;</div><div class='add'>+	char *n;</div><div class='add'>+</div><div class='add'>+	plen = strlen(dp-&gt;parent-&gt;full_name);</div><div class='add'>+	ourlen = strlen(dp-&gt;path_component_name);</div><div class='add'>+	len = ourlen + plen + 2;</div><div class='add'>+</div><div class='add'>+	n = prom_early_alloc(len);</div><div class='add'>+	strcpy(n, dp-&gt;parent-&gt;full_name);</div><div class='add'>+	if (!is_root_node(dp-&gt;parent)) {</div><div class='add'>+		strcpy(n + plen, "/");</div><div class='add'>+		plen++;</div><div class='add'>+	}</div><div class='add'>+	strcpy(n + plen, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int unique_id;</div><div class='add'>+</div><div class='add'>+static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)</div><div class='add'>+{</div><div class='add'>+	static struct property *tmp = NULL;</div><div class='add'>+	struct property *p;</div><div class='add'>+</div><div class='add'>+	if (tmp) {</div><div class='add'>+		p = tmp;</div><div class='add'>+		memset(p, 0, sizeof(*p) + 32);</div><div class='add'>+		tmp = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		p = prom_early_alloc(sizeof(struct property) + 32);</div><div class='add'>+		p-&gt;unique_id = unique_id++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;name = (char *) (p + 1);</div><div class='add'>+	if (special_name) {</div><div class='add'>+		strcpy(p-&gt;name, special_name);</div><div class='add'>+		p-&gt;length = special_len;</div><div class='add'>+		p-&gt;value = prom_early_alloc(special_len);</div><div class='add'>+		memcpy(p-&gt;value, special_val, special_len);</div><div class='add'>+	} else {</div><div class='add'>+		if (prev == NULL) {</div><div class='add'>+			prom_firstprop(node, p-&gt;name);</div><div class='add'>+		} else {</div><div class='add'>+			prom_nextprop(node, prev, p-&gt;name);</div><div class='add'>+		}</div><div class='add'>+		if (strlen(p-&gt;name) == 0) {</div><div class='add'>+			tmp = p;</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		p-&gt;length = prom_getproplen(node, p-&gt;name);</div><div class='add'>+		if (p-&gt;length &lt;= 0) {</div><div class='add'>+			p-&gt;length = 0;</div><div class='add'>+		} else {</div><div class='add'>+			p-&gt;value = prom_early_alloc(p-&gt;length + 1);</div><div class='add'>+			prom_getproperty(node, p-&gt;name, p-&gt;value, p-&gt;length);</div><div class='add'>+			((unsigned char *)p-&gt;value)[p-&gt;length] = '\0';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct property * __init build_prop_list(phandle node)</div><div class='add'>+{</div><div class='add'>+	struct property *head, *tail;</div><div class='add'>+</div><div class='add'>+	head = tail = build_one_prop(node, NULL,</div><div class='add'>+				     ".node", &amp;node, sizeof(node));</div><div class='add'>+</div><div class='add'>+	tail-&gt;next = build_one_prop(node, NULL, NULL, NULL, 0);</div><div class='add'>+	tail = tail-&gt;next;</div><div class='add'>+	while(tail) {</div><div class='add'>+		tail-&gt;next = build_one_prop(node, tail-&gt;name,</div><div class='add'>+					    NULL, NULL, 0);</div><div class='add'>+		tail = tail-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return head;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char * __init get_one_property(phandle node, const char *name)</div><div class='add'>+{</div><div class='add'>+	char *buf = "&lt;NULL&gt;";</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = prom_getproplen(node, name);</div><div class='add'>+	if (len &gt; 0) {</div><div class='add'>+		buf = prom_early_alloc(len);</div><div class='add'>+		prom_getproperty(node, name, buf, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node * __init create_node(phandle node)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	if (!node)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dp = prom_early_alloc(sizeof(*dp));</div><div class='add'>+	dp-&gt;unique_id = unique_id++;</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;dp-&gt;kref);</div><div class='add'>+</div><div class='add'>+	dp-&gt;name = get_one_property(node, "name");</div><div class='add'>+	dp-&gt;type = get_one_property(node, "device_type");</div><div class='add'>+	dp-&gt;node = node;</div><div class='add'>+</div><div class='add'>+	dp-&gt;properties = build_prop_list(node);</div><div class='add'>+</div><div class='add'>+	irq_trans_init(dp);</div><div class='add'>+</div><div class='add'>+	return dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+</div><div class='add'>+	dp = create_node(node);</div><div class='add'>+	if (dp) {</div><div class='add'>+		*(*nextp) = dp;</div><div class='add'>+		*nextp = &amp;dp-&gt;allnext;</div><div class='add'>+</div><div class='add'>+		dp-&gt;parent = parent;</div><div class='add'>+		dp-&gt;path_component_name = build_path_component(dp);</div><div class='add'>+		dp-&gt;full_name = build_full_name(dp);</div><div class='add'>+</div><div class='add'>+		dp-&gt;child = build_tree(dp, prom_getchild(node), nextp);</div><div class='add'>+</div><div class='add'>+		dp-&gt;sibling = build_tree(parent, prom_getsibling(node), nextp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init prom_build_devicetree(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node **nextp;</div><div class='add'>+</div><div class='add'>+	allnodes = create_node(prom_root_node);</div><div class='add'>+	allnodes-&gt;path_component_name = "";</div><div class='add'>+	allnodes-&gt;full_name = "/";</div><div class='add'>+</div><div class='add'>+	nextp = &amp;allnodes-&gt;allnext;</div><div class='add'>+	allnodes-&gt;child = build_tree(allnodes,</div><div class='add'>+				     prom_getchild(allnodes-&gt;node),</div><div class='add'>+				     &amp;nextp);</div><div class='add'>+	printk("PROM: Built device tree with %u bytes of memory.\n",</div><div class='add'>+	       prom_early_allocated);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S<br/>index 7130e866f935..3522cd66f3bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/rtrap.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/rtrap.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/rtrap.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/rtrap.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/pstate.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c<br/>index 1d6ffdeabd4c..c49a57795743 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sbus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sbus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sbus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sbus.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;asm/cache.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iommu_common.h"</div><div class='hunk'>@@ -691,36 +692,6 @@ void sbus_set_sbus64(struct sbus_dev *sdev, int bursts)</div><div class='ctx'> 	upa_writeq(val, cfg_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* SBUS SYSIO INO number to Sparc PIL level. */</div><div class='del'>-static unsigned char sysio_ino_to_pil[] = {</div><div class='del'>-	0, 5, 5, 7, 5, 7, 8, 9,		/* SBUS slot 0 */</div><div class='del'>-	0, 5, 5, 7, 5, 7, 8, 9,		/* SBUS slot 1 */</div><div class='del'>-	0, 5, 5, 7, 5, 7, 8, 9,		/* SBUS slot 2 */</div><div class='del'>-	0, 5, 5, 7, 5, 7, 8, 9,		/* SBUS slot 3 */</div><div class='del'>-	5, /* Onboard SCSI */</div><div class='del'>-	5, /* Onboard Ethernet */</div><div class='del'>-/*XXX*/	8, /* Onboard BPP */</div><div class='del'>-	0, /* Bogon */</div><div class='del'>-       13, /* Audio */</div><div class='del'>-/*XXX*/15, /* PowerFail */</div><div class='del'>-	0, /* Bogon */</div><div class='del'>-	0, /* Bogon */</div><div class='del'>-       12, /* Zilog Serial Channels (incl. Keyboard/Mouse lines) */</div><div class='del'>-       11, /* Floppy */</div><div class='del'>-	0, /* Spare Hardware (bogon for now) */</div><div class='del'>-	0, /* Keyboard (bogon for now) */</div><div class='del'>-	0, /* Mouse (bogon for now) */</div><div class='del'>-	0, /* Serial (bogon for now) */</div><div class='del'>-     0, 0, /* Bogon, Bogon */</div><div class='del'>-       10, /* Timer 0 */</div><div class='del'>-       11, /* Timer 1 */</div><div class='del'>-     0, 0, /* Bogon, Bogon */</div><div class='del'>-       15, /* Uncorrectable SBUS Error */</div><div class='del'>-       15, /* Correctable SBUS Error */</div><div class='del'>-       15, /* SBUS Error */</div><div class='del'>-/*XXX*/ 0, /* Power Management (bogon for now) */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* INO number to IMAP register offset for SYSIO external IRQ's.</div><div class='ctx'>  * This should conform to both Sunfire/Wildfire server and Fusion</div><div class='ctx'>  * desktop designs.</div><div class='hunk'>@@ -812,21 +783,12 @@ unsigned int sbus_build_irq(void *buscookie, unsigned int ino)</div><div class='ctx'> 	struct sbus_iommu *iommu = sbus-&gt;iommu;</div><div class='ctx'> 	unsigned long reg_base = iommu-&gt;sbus_control_reg - 0x2000UL;</div><div class='ctx'> 	unsigned long imap, iclr;</div><div class='del'>-	int pil, sbus_level = 0;</div><div class='del'>-</div><div class='del'>-	pil = sysio_ino_to_pil[ino];</div><div class='del'>-	if (!pil) {</div><div class='del'>-		printk("sbus_irq_build: Bad SYSIO INO[%x]\n", ino);</div><div class='del'>-		panic("Bad SYSIO IRQ translations...");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (PIL_RESERVED(pil))</div><div class='del'>-		BUG();</div><div class='add'>+	int sbus_level = 0;</div><div class='ctx'> </div><div class='ctx'> 	imap = sysio_irq_offsets[ino];</div><div class='ctx'> 	if (imap == ((unsigned long)-1)) {</div><div class='del'>-		prom_printf("get_irq_translations: Bad SYSIO INO[%x] cpu[%d]\n",</div><div class='del'>-			    ino, pil);</div><div class='add'>+		prom_printf("get_irq_translations: Bad SYSIO INO[%x]\n",</div><div class='add'>+			    ino);</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> 	imap += reg_base;</div><div class='hunk'>@@ -860,7 +822,7 @@ unsigned int sbus_build_irq(void *buscookie, unsigned int ino)</div><div class='ctx'> </div><div class='ctx'> 		iclr += ((unsigned long)sbus_level - 1UL) * 8UL;</div><div class='ctx'> 	}</div><div class='del'>-	return build_irq(pil, sbus_level, iclr, imap);</div><div class='add'>+	return build_irq(sbus_level, iclr, imap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Error interrupt handling. */</div><div class='hunk'>@@ -1103,7 +1065,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)</div><div class='ctx'> </div><div class='ctx'> 	irq = sbus_build_irq(sbus, SYSIO_UE_INO);</div><div class='ctx'> 	if (request_irq(irq, sysio_ue_handler,</div><div class='del'>-			SA_SHIRQ, "SYSIO UE", sbus) &lt; 0) {</div><div class='add'>+			IRQF_SHARED, "SYSIO UE", sbus) &lt; 0) {</div><div class='ctx'> 		prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",</div><div class='ctx'> 			    sbus-&gt;portid);</div><div class='ctx'> 		prom_halt();</div><div class='hunk'>@@ -1111,7 +1073,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)</div><div class='ctx'> </div><div class='ctx'> 	irq = sbus_build_irq(sbus, SYSIO_CE_INO);</div><div class='ctx'> 	if (request_irq(irq, sysio_ce_handler,</div><div class='del'>-			SA_SHIRQ, "SYSIO CE", sbus) &lt; 0) {</div><div class='add'>+			IRQF_SHARED, "SYSIO CE", sbus) &lt; 0) {</div><div class='ctx'> 		prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",</div><div class='ctx'> 			    sbus-&gt;portid);</div><div class='ctx'> 		prom_halt();</div><div class='hunk'>@@ -1119,7 +1081,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)</div><div class='ctx'> </div><div class='ctx'> 	irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);</div><div class='ctx'> 	if (request_irq(irq, sysio_sbus_error_handler,</div><div class='del'>-			SA_SHIRQ, "SYSIO SBUS Error", sbus) &lt; 0) {</div><div class='add'>+			IRQF_SHARED, "SYSIO SBUS Error", sbus) &lt; 0) {</div><div class='ctx'> 		prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",</div><div class='ctx'> 			    sbus-&gt;portid);</div><div class='ctx'> 		prom_halt();</div><div class='hunk'>@@ -1137,24 +1099,25 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Boot time initialization. */</div><div class='del'>-void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus)</div><div class='add'>+static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers rprop;</div><div class='add'>+	struct linux_prom64_registers *pr;</div><div class='add'>+	struct device_node *dp;</div><div class='ctx'> 	struct sbus_iommu *iommu;</div><div class='ctx'> 	unsigned long regs, tsb_base;</div><div class='ctx'> 	u64 control;</div><div class='del'>-	int err, i;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	sbus-&gt;portid = prom_getintdefault(sbus-&gt;prom_node,</div><div class='del'>-					  "upa-portid", -1);</div><div class='add'>+	dp = of_find_node_by_phandle(__node);</div><div class='ctx'> </div><div class='del'>-	err = prom_getproperty(prom_node, "reg",</div><div class='del'>-			       (char *)&amp;rprop, sizeof(rprop));</div><div class='del'>-	if (err &lt; 0) {</div><div class='add'>+	sbus-&gt;portid = of_getintprop_default(dp, "upa-portid", -1);</div><div class='add'>+</div><div class='add'>+	pr = of_get_property(dp, "reg", NULL);</div><div class='add'>+	if (!pr) {</div><div class='ctx'> 		prom_printf("sbus_iommu_init: Cannot map SYSIO control registers.\n");</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='del'>-	regs = rprop.phys_addr;</div><div class='add'>+	regs = pr-&gt;phys_addr;</div><div class='ctx'> </div><div class='ctx'> 	iommu = kmalloc(sizeof(*iommu) + SMP_CACHE_BYTES, GFP_ATOMIC);</div><div class='ctx'> 	if (iommu == NULL) {</div><div class='hunk'>@@ -1258,9 +1221,52 @@ void __init sbus_iommu_init(int prom_node, struct sbus_bus *sbus)</div><div class='ctx'> </div><div class='ctx'> 	/* Now some Xfire specific grot... */</div><div class='ctx'> 	if (this_is_starfire)</div><div class='del'>-		sbus-&gt;starfire_cookie = starfire_hookup(sbus-&gt;portid);</div><div class='del'>-	else</div><div class='del'>-		sbus-&gt;starfire_cookie = NULL;</div><div class='add'>+		starfire_hookup(sbus-&gt;portid);</div><div class='ctx'> </div><div class='ctx'> 	sysio_register_error_handlers(sbus);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void sbus_fill_device_irq(struct sbus_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = of_find_node_by_phandle(sdev-&gt;prom_node);</div><div class='add'>+	struct linux_prom_irqs *irqs;</div><div class='add'>+</div><div class='add'>+	irqs = of_get_property(dp, "interrupts", NULL);</div><div class='add'>+	if (!irqs) {</div><div class='add'>+		sdev-&gt;irqs[0] = 0;</div><div class='add'>+		sdev-&gt;num_irqs = 0;</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int pri = irqs[0].pri;</div><div class='add'>+</div><div class='add'>+		sdev-&gt;num_irqs = 1;</div><div class='add'>+		if (pri &lt; 0x20)</div><div class='add'>+			pri += sdev-&gt;slot * 8;</div><div class='add'>+</div><div class='add'>+		sdev-&gt;irqs[0] =	sbus_build_irq(sdev-&gt;bus, pri);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *sbus)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+	sbus_iommu_init(dp-&gt;node, sbus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init sbus_arch_preinit(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init sbus_arch_postinit(void)</div><div class='add'>+{</div><div class='add'>+	extern void firetruck_init(void);</div><div class='add'>+</div><div class='add'>+	firetruck_init();</div><div class='add'>+}</div><div class='head'>diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c<br/>index 9cf1c88cd774..958287448cfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/setup.c</a></div><div class='hunk'>@@ -16,9 +16,8 @@</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='hunk'>@@ -376,12 +375,12 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	smp_setup_cpu_possible_map();</div><div class='del'>-</div><div class='ctx'> 	/* Get boot processor trap_block[] setup.  */</div><div class='ctx'> 	init_cur_cpu_trap(current_thread_info());</div><div class='ctx'> </div><div class='ctx'> 	paging_init();</div><div class='add'>+</div><div class='add'>+	smp_setup_cpu_possible_map();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init set_preferred_console(void)</div><div class='hunk'>@@ -537,7 +536,7 @@ static int __init topology_init(void)</div><div class='ctx'> 	for_each_possible_cpu(i) {</div><div class='ctx'> 		struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='ctx'> 		if (p) {</div><div class='del'>-			register_cpu(p, i, NULL);</div><div class='add'>+			register_cpu(p, i);</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c<br/>index ca11a4c457d4..96d56a8410ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/signal.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  Copyright (C) 1997,1998 Jakub Jelinek   (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef CONFIG_SPARC32_COMPAT</div><div class='ctx'> #include &lt;linux/compat.h&gt;	/* for compat_old_sigset_t */</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c<br/>index 4e8cd79156e0..f62bf3a2de1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/smp.c</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> #include &lt;asm/tlb.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void calibrate_delay(void);</div><div class='ctx'> </div><div class='hunk'>@@ -76,41 +77,42 @@ void smp_bogo(struct seq_file *m)</div><div class='ctx'> </div><div class='ctx'> void __init smp_store_cpu_info(int id)</div><div class='ctx'> {</div><div class='del'>-	int cpu_node, def;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int def;</div><div class='ctx'> </div><div class='ctx'> 	/* multiplier and counter set by</div><div class='ctx'> 	   smp_setup_percpu_timer()  */</div><div class='ctx'> 	cpu_data(id).udelay_val			= loops_per_jiffy;</div><div class='ctx'> </div><div class='del'>-	cpu_find_by_mid(id, &amp;cpu_node);</div><div class='del'>-	cpu_data(id).clock_tick = prom_getintdefault(cpu_node,</div><div class='del'>-						     "clock-frequency", 0);</div><div class='add'>+	cpu_find_by_mid(id, &amp;dp);</div><div class='add'>+	cpu_data(id).clock_tick =</div><div class='add'>+		of_getintprop_default(dp, "clock-frequency", 0);</div><div class='ctx'> </div><div class='ctx'> 	def = ((tlb_type == hypervisor) ? (8 * 1024) : (16 * 1024));</div><div class='del'>-	cpu_data(id).dcache_size = prom_getintdefault(cpu_node, "dcache-size",</div><div class='del'>-						      def);</div><div class='add'>+	cpu_data(id).dcache_size =</div><div class='add'>+		of_getintprop_default(dp, "dcache-size", def);</div><div class='ctx'> </div><div class='ctx'> 	def = 32;</div><div class='ctx'> 	cpu_data(id).dcache_line_size =</div><div class='del'>-		prom_getintdefault(cpu_node, "dcache-line-size", def);</div><div class='add'>+		of_getintprop_default(dp, "dcache-line-size", def);</div><div class='ctx'> </div><div class='ctx'> 	def = 16 * 1024;</div><div class='del'>-	cpu_data(id).icache_size = prom_getintdefault(cpu_node, "icache-size",</div><div class='del'>-						      def);</div><div class='add'>+	cpu_data(id).icache_size =</div><div class='add'>+		of_getintprop_default(dp, "icache-size", def);</div><div class='ctx'> </div><div class='ctx'> 	def = 32;</div><div class='ctx'> 	cpu_data(id).icache_line_size =</div><div class='del'>-		prom_getintdefault(cpu_node, "icache-line-size", def);</div><div class='add'>+		of_getintprop_default(dp, "icache-line-size", def);</div><div class='ctx'> </div><div class='ctx'> 	def = ((tlb_type == hypervisor) ?</div><div class='ctx'> 	       (3 * 1024 * 1024) :</div><div class='ctx'> 	       (4 * 1024 * 1024));</div><div class='del'>-	cpu_data(id).ecache_size = prom_getintdefault(cpu_node, "ecache-size",</div><div class='del'>-						      def);</div><div class='add'>+	cpu_data(id).ecache_size =</div><div class='add'>+		of_getintprop_default(dp, "ecache-size", def);</div><div class='ctx'> </div><div class='ctx'> 	def = 64;</div><div class='ctx'> 	cpu_data(id).ecache_line_size =</div><div class='del'>-		prom_getintdefault(cpu_node, "ecache-line-size", def);</div><div class='add'>+		of_getintprop_default(dp, "ecache-line-size", def);</div><div class='ctx'> </div><div class='ctx'> 	printk("CPU[%d]: Caches "</div><div class='ctx'> 	       "D[sz(%d):line_sz(%d)] "</div><div class='hunk'>@@ -342,10 +344,10 @@ static int __devinit smp_boot_one_cpu(unsigned int cpu)</div><div class='ctx'> </div><div class='ctx'> 		prom_startcpu_cpuid(cpu, entry, cookie);</div><div class='ctx'> 	} else {</div><div class='del'>-		int cpu_node;</div><div class='add'>+		struct device_node *dp;</div><div class='ctx'> </div><div class='del'>-		cpu_find_by_mid(cpu, &amp;cpu_node);</div><div class='del'>-		prom_startcpu(cpu_node, entry, cookie);</div><div class='add'>+		cpu_find_by_mid(cpu, &amp;dp);</div><div class='add'>+		prom_startcpu(dp-&gt;node, entry, cookie);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (timeout = 0; timeout &lt; 5000000; timeout++) {</div><div class='hunk'>@@ -1287,6 +1289,41 @@ int setup_profiling_timer(unsigned int multiplier)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __init smp_tune_scheduling(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int instance;</div><div class='add'>+	unsigned int def, smallest = ~0U;</div><div class='add'>+</div><div class='add'>+	def = ((tlb_type == hypervisor) ?</div><div class='add'>+	       (3 * 1024 * 1024) :</div><div class='add'>+	       (4 * 1024 * 1024));</div><div class='add'>+</div><div class='add'>+	instance = 0;</div><div class='add'>+	while (!cpu_find_by_instance(instance, &amp;dp, NULL)) {</div><div class='add'>+		unsigned int val;</div><div class='add'>+</div><div class='add'>+		val = of_getintprop_default(dp, "ecache-size", def);</div><div class='add'>+		if (val &lt; smallest)</div><div class='add'>+			smallest = val;</div><div class='add'>+</div><div class='add'>+		instance++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Any value less than 256K is nonsense.  */</div><div class='add'>+	if (smallest &lt; (256U * 1024U))</div><div class='add'>+		smallest = 256 * 1024;</div><div class='add'>+</div><div class='add'>+	max_cache_size = smallest;</div><div class='add'>+</div><div class='add'>+	if (smallest &lt; 1U * 1024U * 1024U)</div><div class='add'>+		printk(KERN_INFO "Using max_cache_size of %uKB\n",</div><div class='add'>+		       smallest / 1024U);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_INFO "Using max_cache_size of %uMB\n",</div><div class='add'>+		       smallest / 1024U / 1024U);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Constrain the number of cpus to max_cpus.  */</div><div class='ctx'> void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> {</div><div class='hunk'>@@ -1322,6 +1359,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	smp_store_cpu_info(boot_cpu_id);</div><div class='add'>+	smp_tune_scheduling();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set this up early so that things like the scheduler can init</div><div class='head'>diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c<br/>index 62d8a99271ea..237524d87cab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sparc64_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sparc64_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sparc64_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sparc64_ksyms.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #define EXPORT_SYMTAB_STROPS</div><div class='ctx'> #define PROMLIB_INTERNAL</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -125,14 +124,6 @@ EXPORT_SYMBOL(__write_lock);</div><div class='ctx'> EXPORT_SYMBOL(__write_unlock);</div><div class='ctx'> EXPORT_SYMBOL(__write_trylock);</div><div class='ctx'> </div><div class='del'>-/* Hard IRQ locking */</div><div class='del'>-EXPORT_SYMBOL(synchronize_irq);</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_MCOUNT)</div><div class='del'>-extern void _mcount(void);</div><div class='del'>-EXPORT_SYMBOL(_mcount);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* CPU online map and active count.  */</div><div class='ctx'> EXPORT_SYMBOL(cpu_online_map);</div><div class='ctx'> EXPORT_SYMBOL(phys_cpu_present_map);</div><div class='hunk'>@@ -140,6 +131,11 @@ EXPORT_SYMBOL(phys_cpu_present_map);</div><div class='ctx'> EXPORT_SYMBOL(smp_call_function);</div><div class='ctx'> #endif /* CONFIG_SMP */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_MCOUNT)</div><div class='add'>+extern void _mcount(void);</div><div class='add'>+EXPORT_SYMBOL(_mcount);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(sparc64_get_clock_tick);</div><div class='ctx'> </div><div class='ctx'> /* semaphores */</div><div class='hunk'>@@ -175,10 +171,6 @@ EXPORT_SYMBOL(set_bit);</div><div class='ctx'> EXPORT_SYMBOL(clear_bit);</div><div class='ctx'> EXPORT_SYMBOL(change_bit);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(ivector_table);</div><div class='del'>-EXPORT_SYMBOL(enable_irq);</div><div class='del'>-EXPORT_SYMBOL(disable_irq);</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(__flushw_user);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(tlb_type);</div><div class='hunk'>@@ -297,7 +289,6 @@ EXPORT_SYMBOL(svr4_getcontext);</div><div class='ctx'> EXPORT_SYMBOL(svr4_setcontext);</div><div class='ctx'> EXPORT_SYMBOL(compat_sys_ioctl);</div><div class='ctx'> EXPORT_SYMBOL(sparc32_open);</div><div class='del'>-EXPORT_SYMBOL(sys_close);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Special internal versions of library functions. */</div><div class='head'>diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c<br/>index ae859d40771e..b930fee7708a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/starfire.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/starfire.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/starfire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/starfire.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ struct starfire_irqinfo {</div><div class='ctx'> static struct starfire_irqinfo *sflist = NULL;</div><div class='ctx'> </div><div class='ctx'> /* Beam me up Scott(McNeil)y... */</div><div class='del'>-void *starfire_hookup(int upaid)</div><div class='add'>+void starfire_hookup(int upaid)</div><div class='ctx'> {</div><div class='ctx'> 	struct starfire_irqinfo *p;</div><div class='ctx'> 	unsigned long treg_base, hwmid, i;</div><div class='hunk'>@@ -81,8 +81,6 @@ void *starfire_hookup(int upaid)</div><div class='ctx'> 	p-&gt;upaid = upaid;</div><div class='ctx'> 	p-&gt;next = sflist;</div><div class='ctx'> 	sflist = p;</div><div class='del'>-</div><div class='del'>-	return (void *) p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int starfire_translate(unsigned long imap,</div><div class='head'>diff --git a/arch/sparc64/kernel/sun4v_ivec.S b/arch/sparc64/kernel/sun4v_ivec.S<br/>index b49a68bdda43..49703c3c5769 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sun4v_ivec.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sun4v_ivec.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sun4v_ivec.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sun4v_ivec.S</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='ctx'> #include &lt;asm/intr_queue.h&gt;</div><div class='add'>+#include &lt;asm/pil.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.align	32</div><div class='hunk'>@@ -102,23 +103,17 @@ sun4v_dev_mondo:</div><div class='ctx'> </div><div class='ctx'> 	/* Get &amp;ivector_table[IVEC] into %g4.  */</div><div class='ctx'> 	sethi	%hi(ivector_table), %g4</div><div class='del'>-	sllx	%g3, 5, %g3</div><div class='add'>+	sllx	%g3, 3, %g3</div><div class='ctx'> 	or	%g4, %lo(ivector_table), %g4</div><div class='ctx'> 	add	%g4, %g3, %g4</div><div class='ctx'> </div><div class='del'>-	/* Load IRQ %pil into %g5.  */</div><div class='del'>-	ldub	[%g4 + 0x04], %g5</div><div class='del'>-</div><div class='ctx'> 	/* Insert ivector_table[] entry into __irq_work[] queue.  */</div><div class='del'>-	sllx	%g5, 2, %g3</div><div class='del'>-	lduw	[%g1 + %g3], %g2	/* g2 = irq_work(cpu, pil) */</div><div class='add'>+	lduw	[%g1], %g2		/* g2 = irq_work(cpu) */</div><div class='ctx'> 	stw	%g2, [%g4 + 0x00]	/* bucket-&gt;irq_chain = g2 */</div><div class='del'>-	stw	%g4, [%g1 + %g3]	/* irq_work(cpu, pil) = bucket */</div><div class='add'>+	stw	%g4, [%g1]		/* irq_work(cpu) = bucket */</div><div class='ctx'> </div><div class='ctx'> 	/* Signal the interrupt by setting (1 &lt;&lt; pil) in %softint.  */</div><div class='del'>-	mov	1, %g2</div><div class='del'>-	sllx	%g2, %g5, %g2</div><div class='del'>-	wr	%g2, 0x0, %set_softint</div><div class='add'>+	wr	%g0, 1 &lt;&lt; PIL_DEVICE_IRQ, %set_softint</div><div class='ctx'> </div><div class='ctx'> sun4v_dev_mondo_queue_empty:</div><div class='ctx'> 	retry</div><div class='head'>diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S<br/>index bdf1f4d02e3f..c09ab4b9431d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys32.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys32.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys32.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sys32.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Jakub Jelinek   (jj@ultra.linux.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* NOTE: call as jump breaks return stack, we have to avoid that */</div><div class='head'>diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c<br/>index 7a869138c37f..51c056df528e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sparc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys_sparc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sparc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sys_sparc.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * platform.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c<br/>index 31030bf00f1a..c88ae23ce812 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sparc32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys_sparc32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sparc32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sys_sparc32.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * environment.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c<br/>index ae5b32f817f0..87ebdf858a3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sunos32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/sys_sunos32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/sys_sunos32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/sys_sunos32.c</a></div><div class='hunk'>@@ -155,7 +155,7 @@ asmlinkage int sunos_brk(u32 baddr)</div><div class='ctx'> 	 * simple, it hopefully works in most obvious cases.. Easy to</div><div class='ctx'> 	 * fool it, but this should catch most mistakes.</div><div class='ctx'> 	 */</div><div class='del'>-	freepages = get_page_cache_size();</div><div class='add'>+	freepages = global_page_state(NR_FILE_PAGES);</div><div class='ctx'> 	freepages &gt;&gt;= 1;</div><div class='ctx'> 	freepages += nr_free_pages();</div><div class='ctx'> 	freepages += nr_swap_pages;</div><div class='head'>diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S<br/>index 1136fc465e37..419a63fca172 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/systbls.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/systbls.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/systbls.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/systbls.S</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='ctx'> 	.align	4</div><div class='head'>diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c<br/>index e55b5c6ece02..094d3e35be18 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/time.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -38,16 +37,14 @@</div><div class='ctx'> #include &lt;asm/timer.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/fhc.h&gt;</div><div class='del'>-#include &lt;asm/pbm.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#include &lt;asm/isa.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/starfire.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/cpudata.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> DEFINE_SPINLOCK(mostek_lock);</div><div class='ctx'> DEFINE_SPINLOCK(rtc_lock);</div><div class='hunk'>@@ -457,7 +454,7 @@ static inline void timer_check_rtc(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)</div><div class='add'>+irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ticks, compare, pstate;</div><div class='ctx'> </div><div class='hunk'>@@ -755,215 +752,63 @@ retry:</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init clock_probe(void)</div><div class='add'>+static int __init clock_model_matches(char *model)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom_registers clk_reg[2];</div><div class='del'>-	char model[128];</div><div class='del'>-	int node, busnd = -1, err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct linux_central *cbus;</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	struct linux_ebus *ebus = NULL;</div><div class='del'>-	struct sparc_isa_bridge *isa_br = NULL;</div><div class='del'>-#endif</div><div class='del'>-	static int invoked;</div><div class='del'>-</div><div class='del'>-	if (invoked)</div><div class='del'>-		return;</div><div class='del'>-	invoked = 1;</div><div class='del'>-</div><div class='add'>+	if (strcmp(model, "mk48t02") &amp;&amp;</div><div class='add'>+	    strcmp(model, "mk48t08") &amp;&amp;</div><div class='add'>+	    strcmp(model, "mk48t59") &amp;&amp;</div><div class='add'>+	    strcmp(model, "m5819") &amp;&amp;</div><div class='add'>+	    strcmp(model, "m5819p") &amp;&amp;</div><div class='add'>+	    strcmp(model, "m5823") &amp;&amp;</div><div class='add'>+	    strcmp(model, "ds1287"))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if (this_is_starfire) {</div><div class='del'>-		xtime.tv_sec = starfire_get_time();</div><div class='del'>-		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-		set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>-		                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (tlb_type == hypervisor) {</div><div class='del'>-		xtime.tv_sec = hypervisor_get_time();</div><div class='del'>-		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='del'>-		set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='del'>-		                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+static int __devinit clock_probe(struct of_device *op, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	char *model = of_get_property(dp, "model", NULL);</div><div class='add'>+	unsigned long size, flags;</div><div class='add'>+	void __iomem *regs;</div><div class='ctx'> </div><div class='del'>-	cbus = central_bus;</div><div class='del'>-	if (cbus != NULL)</div><div class='del'>-		busnd = central_bus-&gt;child-&gt;prom_node;</div><div class='add'>+	if (!model || !clock_model_matches(model))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Check FHC Central then EBUSs then ISA bridges then SBUSs.</div><div class='del'>-	 * That way we handle the presence of multiple properly.</div><div class='del'>-	 *</div><div class='del'>-	 * As a special case, machines with Central must provide the</div><div class='del'>-	 * timer chip there.</div><div class='add'>+	/* On an Enterprise system there can be multiple mostek clocks.</div><div class='add'>+	 * We should only match the one that is on the central FHC bus.</div><div class='ctx'> 	 */</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	if (ebus_chain != NULL) {</div><div class='del'>-		ebus = ebus_chain;</div><div class='del'>-		if (busnd == -1)</div><div class='del'>-			busnd = ebus-&gt;prom_node;</div><div class='del'>-	}</div><div class='del'>-	if (isa_chain != NULL) {</div><div class='del'>-		isa_br = isa_chain;</div><div class='del'>-		if (busnd == -1)</div><div class='del'>-			busnd = isa_br-&gt;prom_node;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if (sbus_root != NULL &amp;&amp; busnd == -1)</div><div class='del'>-		busnd = sbus_root-&gt;prom_node;</div><div class='del'>-</div><div class='del'>-	if (busnd == -1) {</div><div class='del'>-		prom_printf("clock_probe: problem, cannot find bus to search.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	node = prom_getchild(busnd);</div><div class='add'>+	if (!strcmp(dp-&gt;parent-&gt;name, "fhc") &amp;&amp;</div><div class='add'>+	    strcmp(dp-&gt;parent-&gt;parent-&gt;name, "central") != 0)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		if (!node)</div><div class='del'>-			model[0] = 0;</div><div class='del'>-		else</div><div class='del'>-			prom_getstring(node, "model", model, sizeof(model));</div><div class='del'>-		if (strcmp(model, "mk48t02") &amp;&amp;</div><div class='del'>-		    strcmp(model, "mk48t08") &amp;&amp;</div><div class='del'>-		    strcmp(model, "mk48t59") &amp;&amp;</div><div class='del'>-		    strcmp(model, "m5819") &amp;&amp;</div><div class='del'>-		    strcmp(model, "m5819p") &amp;&amp;</div><div class='del'>-		    strcmp(model, "m5823") &amp;&amp;</div><div class='del'>-		    strcmp(model, "ds1287")) {</div><div class='del'>-			if (cbus != NULL) {</div><div class='del'>-				prom_printf("clock_probe: Central bus lacks timer chip.\n");</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='add'>+	size = (op-&gt;resource[0].end - op-&gt;resource[0].start) + 1;</div><div class='add'>+	regs = of_ioremap(&amp;op-&gt;resource[0], 0, size, "clock");</div><div class='add'>+	if (!regs)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		   	if (node != 0)</div><div class='del'>-				node = prom_getsibling(node);</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-			while ((node == 0) &amp;&amp; ebus != NULL) {</div><div class='del'>-				ebus = ebus-&gt;next;</div><div class='del'>-				if (ebus != NULL) {</div><div class='del'>-					busnd = ebus-&gt;prom_node;</div><div class='del'>-					node = prom_getchild(busnd);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			while ((node == 0) &amp;&amp; isa_br != NULL) {</div><div class='del'>-				isa_br = isa_br-&gt;next;</div><div class='del'>-				if (isa_br != NULL) {</div><div class='del'>-					busnd = isa_br-&gt;prom_node;</div><div class='del'>-					node = prom_getchild(busnd);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+	if (!strcmp(model, "ds1287") ||</div><div class='add'>+	    !strcmp(model, "m5819") ||</div><div class='add'>+	    !strcmp(model, "m5819p") ||</div><div class='add'>+	    !strcmp(model, "m5823")) {</div><div class='add'>+		ds1287_regs = (unsigned long) regs;</div><div class='add'>+	} else</div><div class='ctx'> #endif</div><div class='del'>-			if (node == 0) {</div><div class='del'>-				prom_printf("clock_probe: Cannot find timer chip\n");</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = prom_getproperty(node, "reg", (char *)clk_reg,</div><div class='del'>-				       sizeof(clk_reg));</div><div class='del'>-		if(err == -1) {</div><div class='del'>-			prom_printf("clock_probe: Cannot get Mostek reg property\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cbus != NULL) {</div><div class='del'>-			apply_fhc_ranges(central_bus-&gt;child, clk_reg, 1);</div><div class='del'>-			apply_central_ranges(central_bus, clk_reg, 1);</div><div class='del'>-		}</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-		else if (ebus != NULL) {</div><div class='del'>-			struct linux_ebus_device *edev;</div><div class='del'>-</div><div class='del'>-			for_each_ebusdev(edev, ebus)</div><div class='del'>-				if (edev-&gt;prom_node == node)</div><div class='del'>-					break;</div><div class='del'>-			if (edev == NULL) {</div><div class='del'>-				if (isa_chain != NULL)</div><div class='del'>-					goto try_isa_clock;</div><div class='del'>-				prom_printf("%s: Mostek not probed by EBUS\n",</div><div class='del'>-					    __FUNCTION__);</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='add'>+	if (model[5] == '0' &amp;&amp; model[6] == '2') {</div><div class='add'>+		mstk48t02_regs = regs;</div><div class='add'>+	} else if(model[5] == '0' &amp;&amp; model[6] == '8') {</div><div class='add'>+		mstk48t08_regs = regs;</div><div class='add'>+		mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02;</div><div class='add'>+	} else {</div><div class='add'>+		mstk48t59_regs = regs;</div><div class='add'>+		mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (!strcmp(model, "ds1287") ||</div><div class='del'>-			    !strcmp(model, "m5819") ||</div><div class='del'>-			    !strcmp(model, "m5819p") ||</div><div class='del'>-			    !strcmp(model, "m5823")) {</div><div class='del'>-				ds1287_regs = edev-&gt;resource[0].start;</div><div class='del'>-			} else {</div><div class='del'>-				mstk48t59_regs = (void __iomem *)</div><div class='del'>-					edev-&gt;resource[0].start;</div><div class='del'>-				mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		else if (isa_br != NULL) {</div><div class='del'>-			struct sparc_isa_device *isadev;</div><div class='del'>-</div><div class='del'>-try_isa_clock:</div><div class='del'>-			for_each_isadev(isadev, isa_br)</div><div class='del'>-				if (isadev-&gt;prom_node == node)</div><div class='del'>-					break;</div><div class='del'>-			if (isadev == NULL) {</div><div class='del'>-				prom_printf("%s: Mostek not probed by ISA\n");</div><div class='del'>-				prom_halt();</div><div class='del'>-			}</div><div class='del'>-			if (!strcmp(model, "ds1287") ||</div><div class='del'>-			    !strcmp(model, "m5819") ||</div><div class='del'>-			    !strcmp(model, "m5819p") ||</div><div class='del'>-			    !strcmp(model, "m5823")) {</div><div class='del'>-				ds1287_regs = isadev-&gt;resource.start;</div><div class='del'>-			} else {</div><div class='del'>-				mstk48t59_regs = (void __iomem *)</div><div class='del'>-					isadev-&gt;resource.start;</div><div class='del'>-				mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		else {</div><div class='del'>-			if (sbus_root-&gt;num_sbus_ranges) {</div><div class='del'>-				int nranges = sbus_root-&gt;num_sbus_ranges;</div><div class='del'>-				int rngc;</div><div class='del'>-</div><div class='del'>-				for (rngc = 0; rngc &lt; nranges; rngc++)</div><div class='del'>-					if (clk_reg[0].which_io ==</div><div class='del'>-					    sbus_root-&gt;sbus_ranges[rngc].ot_child_space)</div><div class='del'>-						break;</div><div class='del'>-				if (rngc == nranges) {</div><div class='del'>-					prom_printf("clock_probe: Cannot find ranges for "</div><div class='del'>-						    "clock regs.\n");</div><div class='del'>-					prom_halt();</div><div class='del'>-				}</div><div class='del'>-				clk_reg[0].which_io =</div><div class='del'>-					sbus_root-&gt;sbus_ranges[rngc].ot_parent_space;</div><div class='del'>-				clk_reg[0].phys_addr +=</div><div class='del'>-					sbus_root-&gt;sbus_ranges[rngc].ot_parent_base;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	printk(KERN_INFO "%s: Clock regs at %p\n", dp-&gt;full_name, regs);</div><div class='ctx'> </div><div class='del'>-		if(model[5] == '0' &amp;&amp; model[6] == '2') {</div><div class='del'>-			mstk48t02_regs = (void __iomem *)</div><div class='del'>-				(((u64)clk_reg[0].phys_addr) |</div><div class='del'>-				 (((u64)clk_reg[0].which_io)&lt;&lt;32UL));</div><div class='del'>-		} else if(model[5] == '0' &amp;&amp; model[6] == '8') {</div><div class='del'>-			mstk48t08_regs = (void __iomem *)</div><div class='del'>-				(((u64)clk_reg[0].phys_addr) |</div><div class='del'>-				 (((u64)clk_reg[0].which_io)&lt;&lt;32UL));</div><div class='del'>-			mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02;</div><div class='del'>-		} else {</div><div class='del'>-			mstk48t59_regs = (void __iomem *)</div><div class='del'>-				(((u64)clk_reg[0].phys_addr) |</div><div class='del'>-				 (((u64)clk_reg[0].which_io)&lt;&lt;32UL));</div><div class='del'>-			mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (mstk48t02_regs != NULL) {</div><div class='ctx'> 		/* Report a low battery voltage condition. */</div><div class='hunk'>@@ -978,17 +823,63 @@ try_isa_clock:</div><div class='ctx'> 	set_system_time();</div><div class='ctx'> 	</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct of_device_id clock_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "eeprom",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "rtc",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver clock_driver = {</div><div class='add'>+	.name		= "clock",</div><div class='add'>+	.match_table	= clock_match,</div><div class='add'>+	.probe		= clock_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init clock_init(void)</div><div class='add'>+{</div><div class='add'>+	if (this_is_starfire) {</div><div class='add'>+		xtime.tv_sec = starfire_get_time();</div><div class='add'>+		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='add'>+		set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='add'>+		                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (tlb_type == hypervisor) {</div><div class='add'>+		xtime.tv_sec = hypervisor_get_time();</div><div class='add'>+		xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);</div><div class='add'>+		set_normalized_timespec(&amp;wall_to_monotonic,</div><div class='add'>+		                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;clock_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must be after subsys_initcall() so that busses are probed.  Must</div><div class='add'>+ * be before device_initcall() because things like the RTC driver</div><div class='add'>+ * need to see the clock registers.</div><div class='add'>+ */</div><div class='add'>+fs_initcall(clock_init);</div><div class='add'>+</div><div class='ctx'> /* This is gets the master TICK_INT timer going. */</div><div class='ctx'> static unsigned long sparc64_init_timers(void)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	unsigned long clock;</div><div class='del'>-	int node;</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	extern void smp_tick_init(void);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	dp = of_find_node_by_path("/");</div><div class='ctx'> 	if (tlb_type == spitfire) {</div><div class='ctx'> 		unsigned long ver, manuf, impl;</div><div class='ctx'> </div><div class='hunk'>@@ -999,18 +890,17 @@ static unsigned long sparc64_init_timers(void)</div><div class='ctx'> 		if (manuf == 0x17 &amp;&amp; impl == 0x13) {</div><div class='ctx'> 			/* Hummingbird, aka Ultra-IIe */</div><div class='ctx'> 			tick_ops = &amp;hbtick_operations;</div><div class='del'>-			node = prom_root_node;</div><div class='del'>-			clock = prom_getint(node, "stick-frequency");</div><div class='add'>+			prop = of_find_property(dp, "stick-frequency", NULL);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			tick_ops = &amp;tick_operations;</div><div class='del'>-			cpu_find_by_instance(0, &amp;node, NULL);</div><div class='del'>-			clock = prom_getint(node, "clock-frequency");</div><div class='add'>+			cpu_find_by_instance(0, &amp;dp, NULL);</div><div class='add'>+			prop = of_find_property(dp, "clock-frequency", NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tick_ops = &amp;stick_operations;</div><div class='del'>-		node = prom_root_node;</div><div class='del'>-		clock = prom_getint(node, "stick-frequency");</div><div class='add'>+		prop = of_find_property(dp, "stick-frequency", NULL);</div><div class='ctx'> 	}</div><div class='add'>+	clock = *(unsigned int *) prop-&gt;value;</div><div class='ctx'> 	timer_tick_offset = clock / HZ;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -1020,19 +910,9 @@ static unsigned long sparc64_init_timers(void)</div><div class='ctx'> 	return clock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sparc64_start_timers(irqreturn_t (*cfunc)(int, void *, struct pt_regs *))</div><div class='add'>+static void sparc64_start_timers(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long pstate;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Register IRQ handler. */</div><div class='del'>-	err = request_irq(build_irq(0, 0, 0UL, 0UL), cfunc, 0,</div><div class='del'>-			  "timer", NULL);</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		prom_printf("Serious problem, cannot register TICK_INT\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Guarantee that the following sequences execute</div><div class='ctx'> 	 * uninterrupted.</div><div class='hunk'>@@ -1048,8 +928,6 @@ static void sparc64_start_timers(irqreturn_t (*cfunc)(int, void *, struct pt_reg</div><div class='ctx'> 	__asm__ __volatile__("wrpr	%0, 0x0, %%pstate"</div><div class='ctx'> 			     : /* no outputs */</div><div class='ctx'> 			     : "r" (pstate));</div><div class='del'>-</div><div class='del'>-	local_irq_enable();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct freq_table {</div><div class='hunk'>@@ -1116,7 +994,7 @@ void __init time_init(void)</div><div class='ctx'> 	/* Now that the interpolator is registered, it is</div><div class='ctx'> 	 * safe to start the timer ticking.</div><div class='ctx'> 	 */</div><div class='del'>-	sparc64_start_timers(timer_interrupt);</div><div class='add'>+	sparc64_start_timers();</div><div class='ctx'> </div><div class='ctx'> 	timer_ticks_per_nsec_quotient =</div><div class='ctx'> 		(((NSEC_PER_SEC &lt;&lt; SPARC64_NSEC_PER_CYC_SHIFT) +</div><div class='head'>diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c<br/>index 2793a5d82380..68420e2dad0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/traps.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * I like traps on v9, :))))</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;  /* for jiffies */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -42,6 +41,7 @@</div><div class='ctx'> #ifdef CONFIG_KMOD</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> ATOMIC_NOTIFIER_HEAD(sparc64die_chain);</div><div class='ctx'> </div><div class='hunk'>@@ -807,7 +807,8 @@ extern unsigned int cheetah_deferred_trap_vector[], cheetah_deferred_trap_vector</div><div class='ctx'> void __init cheetah_ecache_flush_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long largest_size, smallest_linesize, order, ver;</div><div class='del'>-	int node, i, instance;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int i, instance, sz;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan all cpu device tree nodes, note two values:</div><div class='ctx'> 	 * 1) largest E-cache size</div><div class='hunk'>@@ -817,14 +818,14 @@ void __init cheetah_ecache_flush_init(void)</div><div class='ctx'> 	smallest_linesize = ~0UL;</div><div class='ctx'> </div><div class='ctx'> 	instance = 0;</div><div class='del'>-	while (!cpu_find_by_instance(instance, &amp;node, NULL)) {</div><div class='add'>+	while (!cpu_find_by_instance(instance, &amp;dp, NULL)) {</div><div class='ctx'> 		unsigned long val;</div><div class='ctx'> </div><div class='del'>-		val = prom_getintdefault(node, "ecache-size",</div><div class='del'>-					 (2 * 1024 * 1024));</div><div class='add'>+		val = of_getintprop_default(dp, "ecache-size",</div><div class='add'>+					    (2 * 1024 * 1024));</div><div class='ctx'> 		if (val &gt; largest_size)</div><div class='ctx'> 			largest_size = val;</div><div class='del'>-		val = prom_getintdefault(node, "ecache-line-size", 64);</div><div class='add'>+		val = of_getintprop_default(dp, "ecache-line-size", 64);</div><div class='ctx'> 		if (val &lt; smallest_linesize)</div><div class='ctx'> 			smallest_linesize = val;</div><div class='ctx'> 		instance++;</div><div class='hunk'>@@ -849,16 +850,16 @@ void __init cheetah_ecache_flush_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now allocate error trap reporting scoreboard. */</div><div class='del'>-	node = NR_CPUS * (2 * sizeof(struct cheetah_err_info));</div><div class='add'>+	sz = NR_CPUS * (2 * sizeof(struct cheetah_err_info));</div><div class='ctx'> 	for (order = 0; order &lt; MAX_ORDER; order++) {</div><div class='del'>-		if ((PAGE_SIZE &lt;&lt; order) &gt;= node)</div><div class='add'>+		if ((PAGE_SIZE &lt;&lt; order) &gt;= sz)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	cheetah_error_log = (struct cheetah_err_info *)</div><div class='ctx'> 		__get_free_pages(GFP_KERNEL, order);</div><div class='ctx'> 	if (!cheetah_error_log) {</div><div class='ctx'> 		prom_printf("cheetah_ecache_flush_init: Failed to allocate "</div><div class='del'>-			    "error logging scoreboard (%d bytes).\n", node);</div><div class='add'>+			    "error logging scoreboard (%d bytes).\n", sz);</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(cheetah_error_log, 0, PAGE_SIZE &lt;&lt; order);</div><div class='hunk'>@@ -1797,7 +1798,9 @@ static const char *sun4v_err_type_to_str(u32 type)</div><div class='ctx'> 	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sun4v_log_error(struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt)</div><div class='add'>+extern void __show_regs(struct pt_regs * regs);</div><div class='add'>+</div><div class='add'>+static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -1830,6 +1833,8 @@ static void sun4v_log_error(struct sun4v_error_entry *ent, int cpu, const char *</div><div class='ctx'> 	       pfx,</div><div class='ctx'> 	       ent-&gt;err_raddr, ent-&gt;err_size, ent-&gt;err_cpu);</div><div class='ctx'> </div><div class='add'>+	__show_regs(regs);</div><div class='add'>+</div><div class='ctx'> 	if ((cnt = atomic_read(ocnt)) != 0) {</div><div class='ctx'> 		atomic_set(ocnt, 0);</div><div class='ctx'> 		wmb();</div><div class='hunk'>@@ -1862,7 +1867,7 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)</div><div class='ctx'> </div><div class='ctx'> 	put_cpu();</div><div class='ctx'> </div><div class='del'>-	sun4v_log_error(&amp;local_copy, cpu,</div><div class='add'>+	sun4v_log_error(regs, &amp;local_copy, cpu,</div><div class='ctx'> 			KERN_ERR "RESUMABLE ERROR",</div><div class='ctx'> 			&amp;sun4v_resum_oflow_cnt);</div><div class='ctx'> }</div><div class='hunk'>@@ -1910,7 +1915,7 @@ void sun4v_nonresum_error(struct pt_regs *regs, unsigned long offset)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	sun4v_log_error(&amp;local_copy, cpu,</div><div class='add'>+	sun4v_log_error(regs, &amp;local_copy, cpu,</div><div class='ctx'> 			KERN_EMERG "NON-RESUMABLE ERROR",</div><div class='ctx'> 			&amp;sun4v_nonresum_oflow_cnt);</div><div class='ctx'> </div><div class='hunk'>@@ -2200,7 +2205,6 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)</div><div class='ctx'> void die_if_kernel(char *str, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	static int die_counter;</div><div class='del'>-	extern void __show_regs(struct pt_regs * regs);</div><div class='ctx'> 	extern void smp_report_regs(void);</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> 	</div><div class='hunk'>@@ -2541,7 +2545,9 @@ void __init trap_init(void)</div><div class='ctx'> 	    (TRAP_PER_CPU_TSB_HUGE !=</div><div class='ctx'> 	     offsetof(struct trap_per_cpu, tsb_huge)) ||</div><div class='ctx'> 	    (TRAP_PER_CPU_TSB_HUGE_TEMP !=</div><div class='del'>-	     offsetof(struct trap_per_cpu, tsb_huge_temp)))</div><div class='add'>+	     offsetof(struct trap_per_cpu, tsb_huge_temp)) ||</div><div class='add'>+	    (TRAP_PER_CPU_IRQ_WORKLIST !=</div><div class='add'>+	     offsetof(struct trap_per_cpu, irq_worklist)))</div><div class='ctx'> 		trap_per_cpu_offsets_are_bolixed_dave();</div><div class='ctx'> </div><div class='ctx'> 	if ((TSB_CONFIG_TSB !=</div><div class='head'>diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S<br/>index a0c8ba58920b..eedf94fa5664 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/tsb.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/tsb.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/tsb.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/tsb.S</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (C) 2006 David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/tsb.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='head'>diff --git a/arch/sparc64/kernel/ttable.S b/arch/sparc64/kernel/ttable.S<br/>index 5d901519db55..d7d2a8bdc66e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ttable.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/ttable.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/ttable.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/ttable.S</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (C) 1996, 2001, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.globl	sparc64_ttable_tl0, sparc64_ttable_tl1</div><div class='ctx'> 	.globl	tl0_icpe, tl1_icpe</div><div class='hunk'>@@ -58,13 +57,11 @@ tl0_irq2:	BTRAP(0x42)</div><div class='ctx'> tl0_irq3:	BTRAP(0x43)</div><div class='ctx'> tl0_irq4:	BTRAP(0x44)</div><div class='ctx'> #endif</div><div class='del'>-tl0_irq5:	TRAP_IRQ(handler_irq, 5)  TRAP_IRQ(handler_irq, 6)</div><div class='del'>-tl0_irq7:	TRAP_IRQ(handler_irq, 7)  TRAP_IRQ(handler_irq, 8)</div><div class='del'>-tl0_irq9:	TRAP_IRQ(handler_irq, 9)  TRAP_IRQ(handler_irq, 10)</div><div class='del'>-tl0_irq11:	TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12)</div><div class='del'>-tl0_irq13:	TRAP_IRQ(handler_irq, 13)</div><div class='add'>+tl0_irq5:	TRAP_IRQ(handler_irq, 5)</div><div class='add'>+tl0_irq6:	BTRAP(0x46) BTRAP(0x47) BTRAP(0x48) BTRAP(0x49)</div><div class='add'>+tl0_irq10:	BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d)</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='del'>-tl0_irq14:	TRAP_IRQ(handler_irq, 14)</div><div class='add'>+tl0_irq14:	TRAP_IRQ(timer_irq, 14)</div><div class='ctx'> #else</div><div class='ctx'> tl0_irq14:	TICK_SMP_IRQ</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c<br/>index 001e8518331f..a9b765271b85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/unaligned.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/kernel/unaligned.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/kernel/unaligned.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/kernel/unaligned.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='ctx'> #include &lt;asm/fpumacro.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* #define DEBUG_MNA */</div><div class='hunk'>@@ -279,12 +280,22 @@ static void kernel_mna_trap_fault(void)</div><div class='ctx'> </div><div class='ctx'> asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)</div><div class='ctx'> {</div><div class='add'>+	static unsigned long count, last_time;</div><div class='ctx'> 	enum direction dir = decode_direction(insn);</div><div class='ctx'> 	int size = decode_access_size(insn);</div><div class='ctx'> </div><div class='ctx'> 	current_thread_info()-&gt;kern_una_regs = regs;</div><div class='ctx'> 	current_thread_info()-&gt;kern_una_insn = insn;</div><div class='ctx'> </div><div class='add'>+	if (jiffies - last_time &gt; 5 * HZ)</div><div class='add'>+		count = 0;</div><div class='add'>+	if (count &lt; 5) {</div><div class='add'>+		last_time = jiffies;</div><div class='add'>+		count++;</div><div class='add'>+		printk("Kernel unaligned access at TPC[%lx] ", regs-&gt;tpc);</div><div class='add'>+		print_symbol("%s\n", regs-&gt;tpc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!ok_for_kernel(insn) || dir == both) {</div><div class='ctx'> 		printk("Unsupported unaligned load/store trap for kernel "</div><div class='ctx'> 		       "at &lt;%016lx&gt;.\n", regs-&gt;tpc);</div><div class='head'>diff --git a/arch/sparc64/lib/atomic.S b/arch/sparc64/lib/atomic.S<br/>index faf87c31598b..9633750167d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/lib/atomic.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/atomic.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/lib/atomic.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/lib/atomic.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1999 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='head'>diff --git a/arch/sparc64/lib/bitops.S b/arch/sparc64/lib/bitops.S<br/>index 31afbfe6c1e8..892431a82131 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/lib/bitops.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/bitops.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/lib/bitops.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/lib/bitops.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 2000 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='head'>diff --git a/arch/sparc64/lib/checksum.S b/arch/sparc64/lib/checksum.S<br/>index ba9cd3ccc2b2..1d230f693dc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/lib/checksum.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/checksum.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/lib/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/lib/checksum.S</a></div><div class='hunk'>@@ -165,8 +165,9 @@ csum_partial_end_cruft:</div><div class='ctx'> 	sll		%g1, 8, %g1</div><div class='ctx'> 	or		%o5, %g1, %o4</div><div class='ctx'> </div><div class='del'>-1:	add		%o2, %o4, %o2</div><div class='add'>+1:	addcc		%o2, %o4, %o2</div><div class='add'>+	addc		%g0, %o2, %o2</div><div class='ctx'> </div><div class='ctx'> csum_partial_finish:</div><div class='ctx'> 	retl</div><div class='del'>-	 mov		%o2, %o0</div><div class='add'>+	 srl		%o2, 0, %o0</div><div class='head'>diff --git a/arch/sparc64/lib/csum_copy.S b/arch/sparc64/lib/csum_copy.S<br/>index 71af48839064..e566c770a0f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/lib/csum_copy.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/csum_copy.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/lib/csum_copy.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/lib/csum_copy.S</a></div><div class='hunk'>@@ -221,11 +221,12 @@ FUNC_NAME:		/* %o0=src, %o1=dst, %o2=len, %o3=sum */</div><div class='ctx'> 	sll		%g1, 8, %g1</div><div class='ctx'> 	or		%o5, %g1, %o4</div><div class='ctx'> </div><div class='del'>-1:	add		%o3, %o4, %o3</div><div class='add'>+1:	addcc		%o3, %o4, %o3</div><div class='add'>+	addc		%g0, %o3, %o3</div><div class='ctx'> </div><div class='ctx'> 70:</div><div class='ctx'> 	retl</div><div class='del'>-	 mov		%o3, %o0</div><div class='add'>+	 srl		%o3, 0, %o0</div><div class='ctx'> </div><div class='ctx'> 95:	mov		0, GLOBAL_SPARE</div><div class='ctx'> 	brlez,pn	%o2, 4f</div><div class='head'>diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S<br/>index 2ef2e268bdcf..9e4534b485c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/lib/mcount.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/lib/mcount.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/lib/mcount.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/lib/mcount.S</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * This can also be tweaked for kernel stack overflow detection.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='head'>diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c<br/>index 6e002aacb961..1605967cce91 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/mm/fault.c</a></div><div class='hunk'>@@ -31,6 +31,40 @@</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);</div><div class='add'>+</div><div class='add'>+/* Hook to register for page fault notifications */</div><div class='add'>+int register_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_register(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int unregister_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	struct die_args args = {</div><div class='add'>+		.regs = regs,</div><div class='add'>+		.str = str,</div><div class='add'>+		.err = err,</div><div class='add'>+		.trapnr = trap,</div><div class='add'>+		.signr = sig</div><div class='add'>+	};</div><div class='add'>+	return atomic_notifier_call_chain(&amp;notify_page_fault_chain, val, &amp;args);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * To debug kernel to catch accesses to certain virtual/physical addresses.</div><div class='ctx'>  * Mode = 0 selects physical watchpoints, mode = 1 selects virtual watchpoints.</div><div class='hunk'>@@ -263,7 +297,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	fault_code = get_thread_fault_code();</div><div class='ctx'> </div><div class='del'>-	if (notify_die(DIE_PAGE_FAULT, "page_fault", regs,</div><div class='add'>+	if (notify_page_fault(DIE_PAGE_FAULT, "page_fault", regs,</div><div class='ctx'> 		       fault_code, 0, SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c<br/>index fbbbebbad8a4..53b9b1f528e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/hugetlbpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/hugetlbpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/mm/hugetlbpage.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 2002, 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c<br/>index 1539a8362b6f..dcba4e6ab570 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/mm/init.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *  Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -18,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='ctx'> #include &lt;asm/tsb.h&gt;</div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern void device_scan(void);</div><div class='ctx'> </div><div class='hunk'>@@ -101,8 +102,6 @@ static void __init read_obp_memory(const char *property,</div><div class='ctx'> 		prom_halt();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*num_ents = ents;</div><div class='del'>-</div><div class='ctx'> 	/* Sanitize what we got from the firmware, by page aligning</div><div class='ctx'> 	 * everything.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -124,6 +123,25 @@ static void __init read_obp_memory(const char *property,</div><div class='ctx'> 		regs[i].phys_addr = base;</div><div class='ctx'> 		regs[i].reg_size = size;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ents; i++) {</div><div class='add'>+		if (regs[i].reg_size == 0UL) {</div><div class='add'>+			int j;</div><div class='add'>+</div><div class='add'>+			for (j = i; j &lt; ents - 1; j++) {</div><div class='add'>+				regs[j].phys_addr =</div><div class='add'>+					regs[j+1].phys_addr;</div><div class='add'>+				regs[j].reg_size =</div><div class='add'>+					regs[j+1].reg_size;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ents--;</div><div class='add'>+			i--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*num_ents = ents;</div><div class='add'>+</div><div class='ctx'> 	sort(regs, ents, sizeof(struct linux_prom64_registers),</div><div class='ctx'> 	     cmp_p64, NULL);</div><div class='ctx'> }</div><div class='hunk'>@@ -1339,6 +1357,8 @@ void __init paging_init(void)</div><div class='ctx'> </div><div class='ctx'> 	kernel_physical_mapping_init();</div><div class='ctx'> </div><div class='add'>+	prom_build_devicetree();</div><div class='add'>+</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned long zones_size[MAX_NR_ZONES];</div><div class='ctx'> 		unsigned long zholes_size[MAX_NR_ZONES];</div><div class='hunk'>@@ -1376,7 +1396,7 @@ static void __init taint_real_pages(void)</div><div class='ctx'> 		while (old_start &lt; old_end) {</div><div class='ctx'> 			int n;</div><div class='ctx'> </div><div class='del'>-			for (n = 0; pavail_rescan_ents; n++) {</div><div class='add'>+			for (n = 0; n &lt; pavail_rescan_ents; n++) {</div><div class='ctx'> 				unsigned long new_start, new_end;</div><div class='ctx'> </div><div class='ctx'> 				new_start = pavail_rescan[n].phys_addr;</div><div class='hunk'>@@ -1398,6 +1418,32 @@ static void __init taint_real_pages(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int __init page_in_phys_avail(unsigned long paddr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	paddr &amp;= PAGE_MASK;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pavail_rescan_ents; i++) {</div><div class='add'>+		unsigned long start, end;</div><div class='add'>+</div><div class='add'>+		start = pavail_rescan[i].phys_addr;</div><div class='add'>+		end = start + pavail_rescan[i].reg_size;</div><div class='add'>+</div><div class='add'>+		if (paddr &gt;= start &amp;&amp; paddr &lt; end)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	if (paddr &gt;= kern_base &amp;&amp; paddr &lt; (kern_base + kern_size))</div><div class='add'>+		return 1;</div><div class='add'>+#ifdef CONFIG_BLK_DEV_INITRD</div><div class='add'>+	if (paddr &gt;= __pa(initrd_start) &amp;&amp;</div><div class='add'>+	    paddr &lt; __pa(PAGE_ALIGN(initrd_end)))</div><div class='add'>+		return 1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init mem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long codepages, datapages, initpages;</div><div class='hunk'>@@ -1474,7 +1520,7 @@ void free_initmem(void)</div><div class='ctx'> 		page = (addr +</div><div class='ctx'> 			((unsigned long) __va(kern_base)) -</div><div class='ctx'> 			((unsigned long) KERNBASE));</div><div class='del'>-		memset((void *)addr, 0xcc, PAGE_SIZE);</div><div class='add'>+		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='ctx'> 		p = virt_to_page(page);</div><div class='ctx'> </div><div class='ctx'> 		ClearPageReserved(p);</div><div class='hunk'>@@ -1522,6 +1568,7 @@ pgprot_t PAGE_EXEC __read_mostly;</div><div class='ctx'> unsigned long pg_iobits __read_mostly;</div><div class='ctx'> </div><div class='ctx'> unsigned long _PAGE_IE __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(_PAGE_IE);</div><div class='ctx'> </div><div class='ctx'> unsigned long _PAGE_E __read_mostly;</div><div class='ctx'> EXPORT_SYMBOL(_PAGE_E);</div><div class='head'>diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S<br/>index f8479fad4047..d70b60a3bbcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/mm/ultra.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/mm/ultra.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/mm/ultra.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/mm/ultra.S</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/asi.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='head'>diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c<br/>index 577bde8b6647..0b4213720d43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/prom/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/prom/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/prom/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/prom/misc.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c<br/>index 4885ca6cbc77..0f0eb6aa1c40 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/solaris/fs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/solaris/fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/solaris/fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/solaris/fs.c</a></div><div class='hunk'>@@ -356,7 +356,7 @@ static int report_statvfs(struct vfsmount *mnt, struct inode *inode, u32 buf)</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct sol_statvfs __user *ss = A(buf);</div><div class='ctx'> </div><div class='del'>-	error = vfs_statfs(mnt-&gt;mnt_sb, &amp;s);</div><div class='add'>+	error = vfs_statfs(mnt-&gt;mnt_root, &amp;s);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		const char *p = mnt-&gt;mnt_sb-&gt;s_type-&gt;name;</div><div class='ctx'> 		int i = 0;</div><div class='hunk'>@@ -392,7 +392,7 @@ static int report_statvfs64(struct vfsmount *mnt, struct inode *inode, u32 buf)</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct sol_statvfs64 __user *ss = A(buf);</div><div class='ctx'> 			</div><div class='del'>-	error = vfs_statfs(mnt-&gt;mnt_sb, &amp;s);</div><div class='add'>+	error = vfs_statfs(mnt-&gt;mnt_root, &amp;s);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		const char *p = mnt-&gt;mnt_sb-&gt;s_type-&gt;name;</div><div class='ctx'> 		int i = 0;</div><div class='head'>diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c<br/>index 5284996780a7..8135ec322c9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/solaris/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/solaris/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/solaris/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/solaris/misc.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt; </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='hunk'>@@ -23,6 +22,7 @@</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "conv.h"</div><div class='ctx'> </div><div class='hunk'>@@ -194,14 +194,17 @@ static char *machine(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *platform(char *buffer)</div><div class='add'>+static char *platform(char *buffer, int sz)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp = of_find_node_by_path("/");</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	*buffer = 0;</div><div class='del'>-	len = prom_getproperty(prom_root_node, "name", buffer, 256);</div><div class='del'>-	if(len &gt; 0)</div><div class='del'>-		buffer[len] = 0;</div><div class='add'>+	len = strlen(dp-&gt;name);</div><div class='add'>+	if (len &gt; sz)</div><div class='add'>+		len = sz;</div><div class='add'>+	memcpy(buffer, dp-&gt;name, len);</div><div class='add'>+	buffer[len] = 0;</div><div class='ctx'> 	if (*buffer) {</div><div class='ctx'> 		char *p;</div><div class='ctx'> </div><div class='hunk'>@@ -213,16 +216,22 @@ static char *platform(char *buffer)</div><div class='ctx'> 	return "sun4u";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *serial(char *buffer)</div><div class='add'>+static char *serial(char *buffer, int sz)</div><div class='ctx'> {</div><div class='del'>-	int node = prom_getchild(prom_root_node);</div><div class='add'>+	struct device_node *dp = of_find_node_by_path("/options");</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	node = prom_searchsiblings(node, "options");</div><div class='ctx'> 	*buffer = 0;</div><div class='del'>-	len = prom_getproperty(node, "system-board-serial#", buffer, 256);</div><div class='del'>-	if(len &gt; 0)</div><div class='del'>-		buffer[len] = 0;</div><div class='add'>+	if (dp) {</div><div class='add'>+		char *val = of_get_property(dp, "system-board-serial#", &amp;len);</div><div class='add'>+</div><div class='add'>+		if (val &amp;&amp; len &gt; 0) {</div><div class='add'>+			if (len &gt; sz)</div><div class='add'>+				len = sz;</div><div class='add'>+			memcpy(buffer, val, len);</div><div class='add'>+			buffer[len] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (!*buffer)</div><div class='ctx'> 		return "4512348717234";</div><div class='ctx'> 	else</div><div class='hunk'>@@ -305,8 +314,8 @@ asmlinkage int solaris_sysinfo(int cmd, u32 buf, s32 count)</div><div class='ctx'> 	case SI_MACHINE: r = machine(); break;</div><div class='ctx'> 	case SI_ARCHITECTURE: r = "sparc"; break;</div><div class='ctx'> 	case SI_HW_PROVIDER: r = "Sun_Microsystems"; break;</div><div class='del'>-	case SI_HW_SERIAL: r = serial(buffer); break;</div><div class='del'>-	case SI_PLATFORM: r = platform(buffer); break;</div><div class='add'>+	case SI_HW_SERIAL: r = serial(buffer, sizeof(buffer)); break;</div><div class='add'>+	case SI_PLATFORM: r = platform(buffer, sizeof(buffer)); break;</div><div class='ctx'> 	case SI_SRPC_DOMAIN: r = ""; break;</div><div class='ctx'> 	case SI_VERSION: r = "Generic"; break;</div><div class='ctx'> 	default: return -EINVAL;</div><div class='head'>diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c<br/>index fc6669e8dde1..bc3df95bc057 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/sparc64/solaris/socksys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/sparc64/solaris/socksys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/sparc64/solaris/socksys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/sparc64/solaris/socksys.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -190,8 +189,6 @@ init_socksys(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUSR|S_IWUSR, "socksys");</div><div class='del'>-</div><div class='ctx'> 	file = fcheck(ret);</div><div class='ctx'> 	/* N.B. Is this valid? Suppose the f_ops are in a module ... */</div><div class='ctx'> 	socksys_file_ops = *file-&gt;f_op;</div><div class='hunk'>@@ -207,5 +204,4 @@ cleanup_socksys(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (unregister_chrdev(30, "socksys"))</div><div class='ctx'> 		printk ("Couldn't unregister socksys character device\n");</div><div class='del'>-	devfs_remove ("socksys");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug<br/>index 5681a8bd370b..09c1aca6339f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/Kconfig.debug</a></div><div class='hunk'>@@ -47,14 +47,4 @@ config GCOV</div><div class='ctx'>         If you're involved in UML kernel development and want to use gcov,</div><div class='ctx'>         say Y.  If you're unsure, say N.</div><div class='ctx'> </div><div class='del'>-config SYSCALL_DEBUG</div><div class='del'>-	bool "Enable system call debugging"</div><div class='del'>-	default N</div><div class='del'>-	depends on DEBUG_INFO</div><div class='del'>-	help</div><div class='del'>-	This adds some system debugging to UML, including keeping a ring buffer</div><div class='del'>-	with recent system calls and some global and per-task statistics.</div><div class='del'>-</div><div class='del'>-	If unsure, say N</div><div class='del'>-</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386<br/>index 7a0e04e34bf9..b65ca115ef77 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/Makefile-i386?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/Makefile-i386</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/Makefile-i386?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/Makefile-i386</a></div><div class='hunk'>@@ -33,5 +33,9 @@ include $(srctree)/arch/i386/Makefile.cpu</div><div class='ctx'> # prevent gcc from keeping the stack 16 byte aligned. Taken from i386.</div><div class='ctx'> cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)</div><div class='ctx'> </div><div class='add'>+# Prevent sprintf in nfsd from being converted to strcpy and resulting in</div><div class='add'>+# an unresolved reference.</div><div class='add'>+cflags-y += -ffreestanding</div><div class='add'>+</div><div class='ctx'> CFLAGS += $(cflags-y)</div><div class='ctx'> USER_CFLAGS += $(cflags-y)</div><div class='head'>diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64<br/>index dfd88b652fbe..9558a7cf34d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/Makefile-x86_64?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/Makefile-x86_64</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/Makefile-x86_64?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/Makefile-x86_64</a></div><div class='hunk'>@@ -6,9 +6,12 @@ START := 0x60000000</div><div class='ctx'> </div><div class='ctx'> #We #undef __x86_64__ for kernelspace, not for userspace where</div><div class='ctx'> #it's needed for headers to work!</div><div class='del'>-CFLAGS += -U__$(SUBARCH)__ -fno-builtin</div><div class='del'>-USER_CFLAGS += -fno-builtin</div><div class='add'>+CFLAGS += -U__$(SUBARCH)__ -fno-builtin -m64</div><div class='add'>+USER_CFLAGS += -fno-builtin -m64</div><div class='ctx'> CHECKFLAGS  += -m64</div><div class='add'>+AFLAGS += -m64</div><div class='add'>+LDFLAGS += -m elf_x86_64</div><div class='add'>+CPPFLAGS += -m64</div><div class='ctx'> </div><div class='ctx'> ELF_ARCH := i386:x86-64</div><div class='ctx'> ELF_FORMAT := elf64-x86-64</div><div class='hunk'>@@ -16,3 +19,4 @@ ELF_FORMAT := elf64-x86-64</div><div class='ctx'> # Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.</div><div class='ctx'> </div><div class='ctx'> LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64</div><div class='add'>+LINK-y += -m64</div><div class='head'>diff --git a/arch/um/defconfig b/arch/um/defconfig<br/>index 402a74dc5026..780cc0a4a128 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/defconfig</a></div><div class='hunk'>@@ -526,4 +526,3 @@ CONFIG_FORCED_INLINING=y</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_GPROF is not set</div><div class='ctx'> # CONFIG_GCOV is not set</div><div class='del'>-# CONFIG_SYSCALL_DEBUG is not set</div><div class='head'>diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c<br/>index d18a974735e6..64ff22aa077b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/harddog_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/harddog_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/harddog_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/harddog_kern.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c<br/>index 6c2d4ccaf20f..ebebaabb78ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/line.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/line.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/line.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/line.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include "linux/list.h"</div><div class='ctx'> #include "linux/kd.h"</div><div class='ctx'> #include "linux/interrupt.h"</div><div class='del'>-#include "linux/devfs_fs_kernel.h"</div><div class='ctx'> #include "asm/uaccess.h"</div><div class='ctx'> #include "chan_kern.h"</div><div class='ctx'> #include "irq_user.h"</div><div class='hunk'>@@ -374,7 +373,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupts are enabled here because we registered the interrupt with</div><div class='del'>-	 * SA_INTERRUPT (see line_setup_irq).*/</div><div class='add'>+	 * IRQF_DISABLED (see line_setup_irq).*/</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;line-&gt;lock);</div><div class='ctx'> 	err = flush_buffer(line);</div><div class='hunk'>@@ -407,7 +406,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data,</div><div class='ctx'> int line_setup_irq(int fd, int input, int output, struct line *line, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct line_driver *driver = line-&gt;driver;</div><div class='del'>-	int err = 0, flags = SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM;</div><div class='add'>+	int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;</div><div class='ctx'> </div><div class='ctx'> 	if (input)</div><div class='ctx'> 		err = um_request_irq(driver-&gt;read_irq, fd, IRQ_READ,</div><div class='hunk'>@@ -655,7 +654,6 @@ struct tty_driver *line_register_devfs(struct lines *set,</div><div class='ctx'> </div><div class='ctx'> 	driver-&gt;driver_name = line_driver-&gt;name;</div><div class='ctx'> 	driver-&gt;name = line_driver-&gt;device_name;</div><div class='del'>-	driver-&gt;devfs_name = line_driver-&gt;devfs_name;</div><div class='ctx'> 	driver-&gt;major = line_driver-&gt;major;</div><div class='ctx'> 	driver-&gt;minor_start = line_driver-&gt;minor_start;</div><div class='ctx'> 	driver-&gt;type = line_driver-&gt;type;</div><div class='hunk'>@@ -769,7 +767,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty)</div><div class='ctx'> 	spin_unlock(&amp;winch_handler_lock);</div><div class='ctx'> </div><div class='ctx'> 	if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,</div><div class='del'>-			  SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,</div><div class='add'>+			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 			  "winch", winch) &lt; 0)</div><div class='ctx'> 		printk("register_winch_irq - failed to register IRQ\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c<br/>index 6d7173fc55a3..b414522f7686 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/mconsole_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/mconsole_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/mconsole_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/mconsole_kern.c</a></div><div class='hunk'>@@ -300,8 +300,6 @@ void mconsole_reboot(struct mc_request *req)</div><div class='ctx'> 	machine_restart(NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void ctrl_alt_del(void);</div><div class='del'>-</div><div class='ctx'> void mconsole_cad(struct mc_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	mconsole_reply(req, "", 0, 0);</div><div class='hunk'>@@ -779,7 +777,7 @@ static int mconsole_init(void)</div><div class='ctx'> 	register_reboot_notifier(&amp;reboot_notifier);</div><div class='ctx'> </div><div class='ctx'> 	err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,</div><div class='del'>-			     SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,</div><div class='add'>+			     IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 			     "mconsole", (void *)sock);</div><div class='ctx'> 	if (err){</div><div class='ctx'> 		printk("Failed to get IRQ for management console\n");</div><div class='head'>diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c<br/>index 4b109fe7fff8..9bfd405c3bd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/mconsole_user.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/mconsole_user.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/mconsole_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/mconsole_user.c</a></div><div class='hunk'>@@ -18,7 +18,12 @@</div><div class='ctx'> #include "umid.h"</div><div class='ctx'> </div><div class='ctx'> static struct mconsole_command commands[] = {</div><div class='del'>-	{ "version", mconsole_version, MCONSOLE_INTR },</div><div class='add'>+	/* With uts namespaces, uts information becomes process-specific, so</div><div class='add'>+	 * we need a process context.  If we try handling this in interrupt</div><div class='add'>+	 * context, we may hit an exiting process without a valid uts</div><div class='add'>+	 * namespace.</div><div class='add'>+	 */</div><div class='add'>+	{ "version", mconsole_version, MCONSOLE_PROC },</div><div class='ctx'> 	{ "halt", mconsole_halt, MCONSOLE_PROC },</div><div class='ctx'> 	{ "reboot", mconsole_reboot, MCONSOLE_PROC },</div><div class='ctx'> 	{ "config", mconsole_config, MCONSOLE_PROC },</div><div class='head'>diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c<br/>index 8c7279bb353b..501f95675d89 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/net_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/net_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/net_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/net_kern.c</a></div><div class='hunk'>@@ -128,7 +128,7 @@ static int uml_net_open(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = um_request_irq(dev-&gt;irq, lp-&gt;fd, IRQ_READ, uml_net_interrupt,</div><div class='del'>-			     SA_INTERRUPT | SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+			     IRQF_DISABLED | IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if(err != 0){</div><div class='ctx'> 		printk(KERN_ERR "uml_net_open: failed to get irq(%d)\n", err);</div><div class='ctx'> 		err = -ENETUNREACH;</div><div class='head'>diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c<br/>index 0a7786e00cfb..107c5e43fa00 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/net_user.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/net_user.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/net_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/net_user.c</a></div><div class='hunk'>@@ -22,13 +22,14 @@ int tap_open_common(void *dev, char *gate_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int tap_addr[4];</div><div class='ctx'> </div><div class='del'>-	if(gate_addr == NULL) return(0);</div><div class='add'>+	if(gate_addr == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if(sscanf(gate_addr, "%d.%d.%d.%d", &amp;tap_addr[0], </div><div class='ctx'> 		  &amp;tap_addr[1], &amp;tap_addr[2], &amp;tap_addr[3]) != 4){</div><div class='ctx'> 		printk("Invalid tap IP address - '%s'\n", gate_addr);</div><div class='del'>-		return(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void tap_check_ips(char *gate_addr, unsigned char *eth_addr)</div><div class='hunk'>@@ -94,25 +95,25 @@ int net_read(int fd, void *buf, int len)</div><div class='ctx'> 	n = os_read_file(fd,  buf,  len);</div><div class='ctx'> </div><div class='ctx'> 	if(n == -EAGAIN)</div><div class='del'>-		return(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	else if(n == 0)</div><div class='del'>-		return(-ENOTCONN);</div><div class='del'>-	return(n);</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int net_recvfrom(int fd, void *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='del'>-	while(((n = recvfrom(fd,  buf,  len, 0, NULL, NULL)) &lt; 0) &amp;&amp; </div><div class='del'>-	      (errno == EINTR)) ;</div><div class='del'>-</div><div class='add'>+	CATCH_EINTR(n = recvfrom(fd,  buf,  len, 0, NULL, NULL));</div><div class='ctx'> 	if(n &lt; 0){</div><div class='del'>-		if(errno == EAGAIN) return(0);</div><div class='del'>-		return(-errno);</div><div class='add'>+		if(errno == EAGAIN)</div><div class='add'>+			return 0;</div><div class='add'>+		return -errno;</div><div class='ctx'> 	}</div><div class='del'>-	else if(n == 0) return(-ENOTCONN);</div><div class='del'>-	return(n);</div><div class='add'>+	else if(n == 0)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int net_write(int fd, void *buf, int len)</div><div class='hunk'>@@ -122,37 +123,41 @@ int net_write(int fd, void *buf, int len)</div><div class='ctx'> 	n = os_write_file(fd, buf, len);</div><div class='ctx'> </div><div class='ctx'> 	if(n == -EAGAIN)</div><div class='del'>-		return(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	else if(n == 0)</div><div class='del'>-		return(-ENOTCONN);</div><div class='del'>-	return(n);</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int net_send(int fd, void *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='del'>-	while(((n = send(fd, buf, len, 0)) &lt; 0) &amp;&amp; (errno == EINTR)) ;</div><div class='add'>+	CATCH_EINTR(n = send(fd, buf, len, 0));</div><div class='ctx'> 	if(n &lt; 0){</div><div class='del'>-		if(errno == EAGAIN) return(0);</div><div class='del'>-		return(-errno);</div><div class='add'>+		if(errno == EAGAIN)</div><div class='add'>+			return 0;</div><div class='add'>+		return -errno;</div><div class='ctx'> 	}</div><div class='del'>-	else if(n == 0) return(-ENOTCONN);</div><div class='del'>-	return(n);	</div><div class='add'>+	else if(n == 0)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int net_sendto(int fd, void *buf, int len, void *to, int sock_len)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='del'>-	while(((n = sendto(fd, buf, len, 0, (struct sockaddr *) to,</div><div class='del'>-			   sock_len)) &lt; 0) &amp;&amp; (errno == EINTR)) ;</div><div class='add'>+	CATCH_EINTR(n = sendto(fd, buf, len, 0, (struct sockaddr *) to,</div><div class='add'>+			       sock_len));</div><div class='ctx'> 	if(n &lt; 0){</div><div class='del'>-		if(errno == EAGAIN) return(0);</div><div class='del'>-		return(-errno);</div><div class='add'>+		if(errno == EAGAIN)</div><div class='add'>+			return 0;</div><div class='add'>+		return -errno;</div><div class='ctx'> 	}</div><div class='del'>-	else if(n == 0) return(-ENOTCONN);</div><div class='del'>-	return(n);	</div><div class='add'>+	else if(n == 0)</div><div class='add'>+		return -ENOTCONN;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct change_pre_exec_data {</div><div class='hunk'>@@ -176,7 +181,7 @@ static int change_tramp(char **argv, char *output, int output_len)</div><div class='ctx'> 	err = os_pipe(fds, 1, 0);</div><div class='ctx'> 	if(err &lt; 0){</div><div class='ctx'> 		printk("change_tramp - pipe failed, err = %d\n", -err);</div><div class='del'>-		return(err);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	pe_data.close_me = fds[0];</div><div class='ctx'> 	pe_data.stdout = fds[1];</div><div class='hunk'>@@ -190,7 +195,7 @@ static int change_tramp(char **argv, char *output, int output_len)</div><div class='ctx'> </div><div class='ctx'> 	if (pid &gt; 0)</div><div class='ctx'> 		CATCH_EINTR(err = waitpid(pid, NULL, 0));</div><div class='del'>-	return(pid);</div><div class='add'>+	return pid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void change(char *dev, char *what, unsigned char *addr,</div><div class='hunk'>@@ -241,26 +246,15 @@ char *split_if_spec(char *str, ...)</div><div class='ctx'> 	va_start(ap, str);</div><div class='ctx'> 	while((arg = va_arg(ap, char **)) != NULL){</div><div class='ctx'> 		if(*str == '\0')</div><div class='del'>-			return(NULL);</div><div class='add'>+			return NULL;</div><div class='ctx'> 		end = strchr(str, ',');</div><div class='ctx'> 		if(end != str)</div><div class='ctx'> 			*arg = str;</div><div class='ctx'> 		if(end == NULL)</div><div class='del'>-			return(NULL);</div><div class='add'>+			return NULL;</div><div class='ctx'> 		*end++ = '\0';</div><div class='ctx'> 		str = end;</div><div class='ctx'> 	}</div><div class='ctx'> 	va_end(ap);</div><div class='del'>-	return(str);</div><div class='add'>+	return str;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c<br/>index 189839e4f1d4..73755f37a8a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/port_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/port_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/port_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/port_kern.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ static int port_accept(struct port_list *port)</div><div class='ctx'> 		  .port 	= port });</div><div class='ctx'> </div><div class='ctx'> 	if(um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt, </div><div class='del'>-			  SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, </div><div class='add'>+			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 			  "telnetd", conn)){</div><div class='ctx'> 		printk(KERN_ERR "port_accept : failed to get IRQ for "</div><div class='ctx'> 		       "telnetd\n");</div><div class='hunk'>@@ -186,7 +186,7 @@ void *port_data(int port_num)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> 	if(um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt, </div><div class='del'>-			  SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, "port",</div><div class='add'>+			  IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM, "port",</div><div class='ctx'> 			  port)){</div><div class='ctx'> 		printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);</div><div class='ctx'> 		goto out_close;</div><div class='head'>diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c<br/>index a4d6415bc8c4..6dafd6fbfdae 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/ssl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/ssl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/ssl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/ssl.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@ static int ssl_remove(int n);</div><div class='ctx'> static struct line_driver driver = {</div><div class='ctx'> 	.name 			= "UML serial line",</div><div class='ctx'> 	.device_name 		= "ttyS",</div><div class='del'>-	.devfs_name 		= "tts/",</div><div class='ctx'> 	.major 			= TTY_MAJOR,</div><div class='ctx'> 	.minor_start 		= 64,</div><div class='ctx'> 	.type 		 	= TTY_DRIVER_TYPE_SERIAL,</div><div class='head'>diff --git a/arch/um/drivers/stderr_console.c b/arch/um/drivers/stderr_console.c<br/>index 429ae8e6c7e5..6d2cf32a9e8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/stderr_console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/stderr_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/stderr_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/stderr_console.c</a></div><div class='hunk'>@@ -8,10 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Don't register by default -- as this registeres very early in the</div><div class='del'>- * boot process it becomes the default console.  And as this isn't a</div><div class='del'>- * real tty driver init isn't able to open /dev/console then.</div><div class='del'>- *</div><div class='del'>- * In most cases this isn't what you want ...</div><div class='add'>+ * boot process it becomes the default console.</div><div class='ctx'>  */</div><div class='ctx'> static int use_stderr_console = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -43,3 +40,20 @@ static int stderr_setup(char *str)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> __setup("stderr=", stderr_setup);</div><div class='add'>+</div><div class='add'>+/* The previous behavior of not unregistering led to /dev/console being</div><div class='add'>+ * impossible to open.  My FC5 filesystem started having init die, and the</div><div class='add'>+ * system panicing because of this.  Unregistering causes the real</div><div class='add'>+ * console to become the default console, and /dev/console can then be</div><div class='add'>+ * opened.  Making this an initcall makes this happen late enough that</div><div class='add'>+ * there is no added value in dumping everything to stderr, and the</div><div class='add'>+ * normal console is good enough to show you all available output.</div><div class='add'>+ */</div><div class='add'>+static int __init unregister_stderr(void)</div><div class='add'>+{</div><div class='add'>+	unregister_console(&amp;stderr_console);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__initcall(unregister_stderr);</div><div class='head'>diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c<br/>index 61db8b2fc83f..856f568c2687 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/stdio_console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/stdio_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/stdio_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/stdio_console.c</a></div><div class='hunk'>@@ -60,7 +60,6 @@ static int con_remove(int n);</div><div class='ctx'> static struct line_driver driver = {</div><div class='ctx'> 	.name 			= "UML console",</div><div class='ctx'> 	.device_name 		= "tty",</div><div class='del'>-	.devfs_name 		= "vc/",</div><div class='ctx'> 	.major 			= TTY_MAJOR,</div><div class='ctx'> 	.minor_start 		= 0,</div><div class='ctx'> 	.type 		 	= TTY_DRIVER_TYPE_CONSOLE,</div><div class='head'>diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c<br/>index 94c9265a4f2c..9f70edf5d8ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/tty.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='hunk'>@@ -25,17 +25,17 @@ static void *tty_chan_init(char *str, int device, struct chan_opts *opts)</div><div class='ctx'> 	if(*str != ':'){</div><div class='ctx'> 		printk("tty_init : channel type 'tty' must specify "</div><div class='ctx'> 		       "a device\n");</div><div class='del'>-		return(NULL);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	str++;</div><div class='ctx'> </div><div class='ctx'> 	data = um_kmalloc(sizeof(*data));</div><div class='ctx'> 	if(data == NULL)</div><div class='del'>-		return(NULL);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	*data = ((struct tty_chan) { .dev 	= str,</div><div class='ctx'> 				     .raw 	= opts-&gt;raw });</div><div class='del'>-				     </div><div class='del'>-	return(data);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tty_open(int input, int output, int primary, void *d,</div><div class='hunk'>@@ -45,19 +45,21 @@ static int tty_open(int input, int output, int primary, void *d,</div><div class='ctx'> 	int fd, err;</div><div class='ctx'> </div><div class='ctx'> 	fd = os_open_file(data-&gt;dev, of_set_rw(OPENFLAGS(), input, output), 0);</div><div class='del'>-	if(fd &lt; 0) return(fd);</div><div class='add'>+	if(fd &lt; 0)</div><div class='add'>+		return fd;</div><div class='add'>+</div><div class='ctx'> 	if(data-&gt;raw){</div><div class='ctx'> 		CATCH_EINTR(err = tcgetattr(fd, &amp;data-&gt;tt));</div><div class='ctx'> 		if(err)</div><div class='del'>-			return(err);</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		err = raw(fd);</div><div class='ctx'> 		if(err)</div><div class='del'>-			return(err);</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*dev_out = data-&gt;dev;</div><div class='del'>-	return(fd);</div><div class='add'>+	return fd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct chan_ops tty_ops = {</div><div class='hunk'>@@ -72,14 +74,3 @@ struct chan_ops tty_ops = {</div><div class='ctx'> 	.free		= generic_free,</div><div class='ctx'> 	.winch		= 0,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c<br/>index 0897852b09a3..34085315aa57 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/ubd_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/ubd_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/ubd_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/ubd_kern.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include "linux/blkdev.h"</div><div class='ctx'> #include "linux/hdreg.h"</div><div class='ctx'> #include "linux/init.h"</div><div class='del'>-#include "linux/devfs_fs_kernel.h"</div><div class='ctx'> #include "linux/cdrom.h"</div><div class='ctx'> #include "linux/proc_fs.h"</div><div class='ctx'> #include "linux/ctype.h"</div><div class='hunk'>@@ -628,8 +627,6 @@ static int ubd_new_disk(int major, u64 size, int unit,</div><div class='ctx'> 			</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk;</div><div class='del'>-	char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")];</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	disk = alloc_disk(1 &lt;&lt; UBD_SHIFT);</div><div class='ctx'> 	if(disk == NULL)</div><div class='hunk'>@@ -639,20 +636,10 @@ static int ubd_new_disk(int major, u64 size, int unit,</div><div class='ctx'> 	disk-&gt;first_minor = unit &lt;&lt; UBD_SHIFT;</div><div class='ctx'> 	disk-&gt;fops = &amp;ubd_blops;</div><div class='ctx'> 	set_capacity(disk, size / 512);</div><div class='del'>-	if(major == MAJOR_NR){</div><div class='add'>+	if(major == MAJOR_NR)</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "ubd%c", 'a' + unit);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "ubd/disc%d", unit);</div><div class='del'>-		sprintf(from, "ubd/%d", unit);</div><div class='del'>-		sprintf(to, "disc%d/disc", unit);</div><div class='del'>-		err = devfs_mk_symlink(from, to);</div><div class='del'>-		if(err)</div><div class='del'>-			printk("ubd_new_disk failed to make link from %s to "</div><div class='del'>-			       "%s, error = %d\n", from, to, err);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='add'>+	else</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "ubd_fake%d", unit);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "ubd_fake/disc%d", unit);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* sysfs register (not for ide fake devices) */</div><div class='ctx'> 	if (major == MAJOR_NR) {</div><div class='hunk'>@@ -841,7 +828,6 @@ int ubd_init(void)</div><div class='ctx'> {</div><div class='ctx'>         int i;</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("ubd");</div><div class='ctx'> 	if (register_blkdev(MAJOR_NR, "ubd"))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -855,7 +841,6 @@ int ubd_init(void)</div><div class='ctx'> 		char name[sizeof("ubd_nnn\0")];</div><div class='ctx'> </div><div class='ctx'> 		snprintf(name, sizeof(name), "ubd_%d", fake_major);</div><div class='del'>-		devfs_mk_dir(name);</div><div class='ctx'> 		if (register_blkdev(fake_major, "ubd"))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -888,7 +873,7 @@ int ubd_driver_init(void){</div><div class='ctx'> 		return(0);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr,</div><div class='del'>-			     SA_INTERRUPT, "ubd", ubd_dev);</div><div class='add'>+			     IRQF_DISABLED, "ubd", ubd_dev);</div><div class='ctx'> 	if(err != 0)</div><div class='ctx'> 		printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1222,7 +1207,7 @@ int open_ubd_file(char *file, struct openflags *openflags, int shared,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Succesful return case! */</div><div class='add'>+	/* Successful return case! */</div><div class='ctx'> 	if(backing_file_out == NULL)</div><div class='ctx'> 		return(fd);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c<br/>index d269a80f4b0c..6036ec85895a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/drivers/xterm_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/drivers/xterm_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/drivers/xterm_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/drivers/xterm_kern.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ int xterm_fd(int socket, int *pid_out)</div><div class='ctx'> 	init_completion(&amp;data-&gt;ready);</div><div class='ctx'> </div><div class='ctx'> 	err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt, </div><div class='del'>-			     SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, </div><div class='add'>+			     IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 			     "xterm", data);</div><div class='ctx'> 	if (err){</div><div class='ctx'> 		printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "</div><div class='head'>diff --git a/arch/um/include/irq_user.h b/arch/um/include/irq_user.h<br/>index 69a93c804f0e..15d311b9be9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/irq_user.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/irq_user.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/irq_user.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/irq_user.h</a></div><div class='hunk'>@@ -6,6 +6,8 @@</div><div class='ctx'> #ifndef __IRQ_USER_H__</div><div class='ctx'> #define __IRQ_USER_H__</div><div class='ctx'> </div><div class='add'>+#include "uml-config.h"</div><div class='add'>+</div><div class='ctx'> struct irq_fd {</div><div class='ctx'> 	struct irq_fd *next;</div><div class='ctx'> 	void *id;</div><div class='hunk'>@@ -26,9 +28,10 @@ extern void free_irq_by_fd(int fd);</div><div class='ctx'> extern void reactivate_fd(int fd, int irqnum);</div><div class='ctx'> extern void deactivate_fd(int fd, int irqnum);</div><div class='ctx'> extern int deactivate_all_fds(void);</div><div class='del'>-extern void forward_interrupts(int pid);</div><div class='ctx'> extern int activate_ipi(int fd, int pid);</div><div class='del'>-extern unsigned long irq_lock(void);</div><div class='del'>-extern void irq_unlock(unsigned long flags);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MODE_TT</div><div class='add'>+extern void forward_interrupts(int pid);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h<br/>index efa3d33c0be6..b98bdd8e052a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/kern_util.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/kern_util.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/kern_util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/kern_util.h</a></div><div class='hunk'>@@ -72,10 +72,8 @@ extern void init_flush_vm(void);</div><div class='ctx'> extern void *syscall_sp(void *t);</div><div class='ctx'> extern void syscall_trace(union uml_pt_regs *regs, int entryexit);</div><div class='ctx'> extern int hz(void);</div><div class='del'>-extern void uml_idle_timer(void);</div><div class='ctx'> extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);</div><div class='ctx'> extern int external_pid(void *t);</div><div class='del'>-extern void boot_timer_handler(int sig);</div><div class='ctx'> extern void interrupt_end(void);</div><div class='ctx'> extern void initial_thread_cb(void (*proc)(void *), void *arg);</div><div class='ctx'> extern int debugger_signal(int status, int pid);</div><div class='hunk'>@@ -120,20 +118,11 @@ extern int is_syscall(unsigned long addr);</div><div class='ctx'> extern void free_irq(unsigned int, void *);</div><div class='ctx'> extern int cpu(void);</div><div class='ctx'> </div><div class='add'>+extern void time_init_kern(void);</div><div class='add'>+</div><div class='ctx'> /* Are we disallowed to sleep? Used to choose between GFP_KERNEL and GFP_ATOMIC. */</div><div class='ctx'> extern int __cant_sleep(void);</div><div class='ctx'> extern void segv_handler(int sig, union uml_pt_regs *regs);</div><div class='ctx'> extern void sigio_handler(int sig, union uml_pt_regs *regs);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/um/include/line.h b/arch/um/include/line.h<br/>index 6ac0f8252e21..27bf2f6fbc05 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/line.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/line.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/line.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/line.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> struct line_driver {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	char *device_name;</div><div class='del'>-	char *devfs_name;</div><div class='ctx'> 	short major;</div><div class='ctx'> 	short minor_start;</div><div class='ctx'> 	short type;</div><div class='head'>diff --git a/arch/um/include/longjmp.h b/arch/um/include/longjmp.h<br/>index 8e7053013f7b..1b5c0131a12e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/longjmp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/longjmp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/longjmp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/longjmp.h</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'> 	longjmp(*buf, val);	\</div><div class='ctx'> } while(0)</div><div class='ctx'> </div><div class='del'>-#define UML_SETJMP(buf, enable) ({ \</div><div class='del'>-	int n; \</div><div class='add'>+#define UML_SETJMP(buf) ({ \</div><div class='add'>+	int n, enable;	   \</div><div class='ctx'> 	enable = get_signals(); \</div><div class='ctx'> 	n = setjmp(*buf); \</div><div class='ctx'> 	if(n != 0) \</div><div class='head'>diff --git a/arch/um/include/os.h b/arch/um/include/os.h<br/>index f88856c28a66..5316e8a4a4fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/os.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/os.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/os.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/os.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='hunk'>@@ -15,9 +15,9 @@</div><div class='ctx'> #include "irq_user.h"</div><div class='ctx'> #include "sysdep/tls.h"</div><div class='ctx'> </div><div class='del'>-#define OS_TYPE_FILE 1 </div><div class='del'>-#define OS_TYPE_DIR 2 </div><div class='del'>-#define OS_TYPE_SYMLINK 3 </div><div class='add'>+#define OS_TYPE_FILE 1</div><div class='add'>+#define OS_TYPE_DIR 2</div><div class='add'>+#define OS_TYPE_SYMLINK 3</div><div class='ctx'> #define OS_TYPE_CHARDEV 4</div><div class='ctx'> #define OS_TYPE_BLOCKDEV 5</div><div class='ctx'> #define OS_TYPE_FIFO 6</div><div class='hunk'>@@ -61,68 +61,68 @@ struct openflags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define OPENFLAGS() ((struct openflags) { .r = 0, .w = 0, .s = 0, .c = 0, \</div><div class='del'>- 					  .t = 0, .a = 0, .e = 0, .cl = 0 })</div><div class='add'>+					  .t = 0, .a = 0, .e = 0, .cl = 0 })</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_read(struct openflags flags)</div><div class='ctx'> {</div><div class='del'>-	flags.r = 1; </div><div class='del'>-	return(flags);</div><div class='add'>+	flags.r = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_write(struct openflags flags)</div><div class='ctx'> {</div><div class='del'>-	flags.w = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+	flags.w = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_rdwr(struct openflags flags)</div><div class='ctx'> {</div><div class='del'>-	return(of_read(of_write(flags)));</div><div class='add'>+	return of_read(of_write(flags));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_set_rw(struct openflags flags, int r, int w)</div><div class='ctx'> {</div><div class='ctx'> 	flags.r = r;</div><div class='ctx'> 	flags.w = w;</div><div class='del'>-	return(flags);</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_sync(struct openflags flags)</div><div class='del'>-{ </div><div class='del'>-	flags.s = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+{</div><div class='add'>+	flags.s = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_create(struct openflags flags)</div><div class='del'>-{ </div><div class='del'>-	flags.c = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+{</div><div class='add'>+	flags.c = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static inline struct openflags of_trunc(struct openflags flags)</div><div class='del'>-{ </div><div class='del'>-	flags.t = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+{</div><div class='add'>+	flags.t = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static inline struct openflags of_append(struct openflags flags)</div><div class='del'>-{ </div><div class='del'>-	flags.a = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+{</div><div class='add'>+	flags.a = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static inline struct openflags of_excl(struct openflags flags)</div><div class='del'>-{ </div><div class='del'>-	flags.e = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+{</div><div class='add'>+	flags.e = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct openflags of_cloexec(struct openflags flags)</div><div class='del'>-{ </div><div class='del'>-	flags.cl = 1; </div><div class='del'>-	return(flags); </div><div class='add'>+{</div><div class='add'>+	flags.cl = 1;</div><div class='add'>+	return flags;</div><div class='ctx'> }</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> /* file.c */</div><div class='ctx'> extern int os_stat_file(const char *file_name, struct uml_stat *buf);</div><div class='ctx'> extern int os_stat_fd(const int fd, struct uml_stat *buf);</div><div class='hunk'>@@ -199,12 +199,12 @@ extern int os_getpid(void);</div><div class='ctx'> extern int os_getpgrp(void);</div><div class='ctx'> </div><div class='ctx'> extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));</div><div class='del'>-extern void init_new_thread_signals(int altstack);</div><div class='add'>+extern void init_new_thread_signals(void);</div><div class='ctx'> extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);</div><div class='ctx'> </div><div class='ctx'> extern int os_map_memory(void *virt, int fd, unsigned long long off,</div><div class='ctx'> 			 unsigned long len, int r, int w, int x);</div><div class='del'>-extern int os_protect_memory(void *addr, unsigned long len, </div><div class='add'>+extern int os_protect_memory(void *addr, unsigned long len,</div><div class='ctx'> 			     int r, int w, int x);</div><div class='ctx'> extern int os_unmap_memory(void *addr, int len);</div><div class='ctx'> extern int os_drop_memory(void *addr, int length);</div><div class='hunk'>@@ -318,7 +318,6 @@ extern void reboot_skas(void);</div><div class='ctx'> </div><div class='ctx'> /* irq.c */</div><div class='ctx'> extern int os_waiting_for_events(struct irq_fd *active_fds);</div><div class='del'>-extern int os_isatty(int fd);</div><div class='ctx'> extern int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds);</div><div class='ctx'> extern void os_free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg,</div><div class='ctx'> 		struct irq_fd *active_fds, struct irq_fd ***last_irq_ptr2);</div><div class='hunk'>@@ -330,9 +329,8 @@ extern void os_set_ioignore(void);</div><div class='ctx'> extern void init_irq_signals(int on_sigstack);</div><div class='ctx'> </div><div class='ctx'> /* sigio.c */</div><div class='del'>-extern void write_sigio_workaround(void);</div><div class='del'>-extern int add_sigio_fd(int fd, int read);</div><div class='ctx'> extern int ignore_sigio_fd(int fd);</div><div class='add'>+extern void maybe_sigio_broken(int fd, int read);</div><div class='ctx'> </div><div class='ctx'> /* skas/trap */</div><div class='ctx'> extern void sig_handler_common_skas(int sig, void *sc_ptr);</div><div class='head'>diff --git a/arch/um/include/skas/mode_kern_skas.h b/arch/um/include/skas/mode_kern_skas.h<br/>index 63c58739bde0..9cd9c6ec9a63 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/skas/mode_kern_skas.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/skas/mode_kern_skas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/skas/mode_kern_skas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/skas/mode_kern_skas.h</a></div><div class='hunk'>@@ -29,8 +29,7 @@ extern void flush_tlb_mm_skas(struct mm_struct *mm);</div><div class='ctx'> extern void force_flush_all_skas(void);</div><div class='ctx'> extern long execute_syscall_skas(void *r);</div><div class='ctx'> extern void before_mem_skas(unsigned long unused);</div><div class='del'>-extern unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out,</div><div class='del'>-					 unsigned long *task_size_out);</div><div class='add'>+extern unsigned long set_task_sizes_skas(unsigned long *task_size_out);</div><div class='ctx'> extern int start_uml_skas(void);</div><div class='ctx'> extern int external_pid_skas(struct task_struct *task);</div><div class='ctx'> extern int thread_pid_skas(struct task_struct *task);</div><div class='head'>diff --git a/arch/um/include/sysdep-x86_64/kernel-offsets.h b/arch/um/include/sysdep-x86_64/kernel-offsets.h<br/>index 939cc475757a..91d129fb3930 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/sysdep-x86_64/kernel-offsets.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/sysdep-x86_64/kernel-offsets.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/sysdep-x86_64/kernel-offsets.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/sysdep-x86_64/kernel-offsets.h</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='head'>diff --git a/arch/um/include/sysdep-x86_64/syscalls.h b/arch/um/include/sysdep-x86_64/syscalls.h<br/>index e06f83e80f4a..5e86aa047b2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/sysdep-x86_64/syscalls.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/sysdep-x86_64/syscalls.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/sysdep-x86_64/syscalls.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/sysdep-x86_64/syscalls.h</a></div><div class='hunk'>@@ -12,8 +12,6 @@</div><div class='ctx'> </div><div class='ctx'> typedef long syscall_handler_t(void);</div><div class='ctx'> </div><div class='del'>-extern syscall_handler_t *ia32_sys_call_table[];</div><div class='del'>-</div><div class='ctx'> extern syscall_handler_t *sys_call_table[];</div><div class='ctx'> </div><div class='ctx'> #define EXECUTE_SYSCALL(syscall, regs) \</div><div class='head'>diff --git a/arch/um/include/tt/mode_kern_tt.h b/arch/um/include/tt/mode_kern_tt.h<br/>index efa0012550d0..a4fc63057195 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/include/tt/mode_kern_tt.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/include/tt/mode_kern_tt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/include/tt/mode_kern_tt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/include/tt/mode_kern_tt.h</a></div><div class='hunk'>@@ -30,8 +30,7 @@ extern void flush_tlb_mm_tt(struct mm_struct *mm);</div><div class='ctx'> extern void force_flush_all_tt(void);</div><div class='ctx'> extern long execute_syscall_tt(void *r);</div><div class='ctx'> extern void before_mem_tt(unsigned long brk_start);</div><div class='del'>-extern unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out,</div><div class='del'>-				       unsigned long *task_size_out);</div><div class='add'>+extern unsigned long set_task_sizes_tt(unsigned long *task_size_out);</div><div class='ctx'> extern int start_uml_tt(void);</div><div class='ctx'> extern int external_pid_tt(struct task_struct *task);</div><div class='ctx'> extern int thread_pid_tt(struct task_struct *task);</div><div class='head'>diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile<br/>index fe08971b64cf..a2d93065b2d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/Makefile</a></div><div class='hunk'>@@ -6,16 +6,14 @@</div><div class='ctx'> extra-y := vmlinux.lds</div><div class='ctx'> clean-files :=</div><div class='ctx'> </div><div class='del'>-obj-y = config.o exec_kern.o exitcode.o \</div><div class='del'>-	init_task.o irq.o ksyms.o mem.o physmem.o \</div><div class='del'>-	process_kern.o ptrace.o reboot.o resource.o sigio_kern.o \</div><div class='del'>-	signal_kern.o smp.o syscall_kern.o sysrq.o \</div><div class='del'>-	time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o</div><div class='add'>+obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \</div><div class='add'>+	physmem.o process_kern.o ptrace.o reboot.o resource.o sigio.o \</div><div class='add'>+	signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \</div><div class='add'>+	um_arch.o umid.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o</div><div class='ctx'> obj-$(CONFIG_GPROF)	+= gprof_syms.o</div><div class='ctx'> obj-$(CONFIG_GCOV)	+= gmon_syms.o</div><div class='del'>-obj-$(CONFIG_SYSCALL_DEBUG) += syscall.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MODE_TT) += tt/</div><div class='ctx'> obj-$(CONFIG_MODE_SKAS) += skas/</div><div class='head'>diff --git a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec.c<br/>index c0cb627bf594..fc38a6d5906d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/exec_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/exec_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/exec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/exec.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='hunk'>@@ -31,18 +31,27 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)</div><div class='ctx'> 	CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_TTY_LOG</div><div class='add'>+extern void log_exec(char **argv, void *tty);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static long execve1(char *file, char __user * __user *argv,</div><div class='ctx'> 		    char __user *__user *env)</div><div class='ctx'> {</div><div class='ctx'>         long error;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_TTY_LOG</div><div class='del'>-	log_exec(argv, current-&gt;tty);</div><div class='add'>+	task_lock(current);</div><div class='add'>+	log_exec(argv, current-&gt;signal-&gt;tty);</div><div class='add'>+	task_unlock(current);</div><div class='ctx'> #endif</div><div class='ctx'>         error = do_execve(file, argv, env, &amp;current-&gt;thread.regs);</div><div class='ctx'>         if (error == 0){</div><div class='ctx'> 		task_lock(current);</div><div class='ctx'>                 current-&gt;ptrace &amp;= ~PT_DTRACE;</div><div class='add'>+#ifdef SUBARCH_EXECVE1</div><div class='add'>+		SUBARCH_EXECVE1(&amp;current-&gt;thread.regs.regs);</div><div class='add'>+#endif</div><div class='ctx'> 		task_unlock(current);</div><div class='ctx'>                 set_cmdline(current_cmd());</div><div class='ctx'>         }</div><div class='head'>diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c<br/>index 2ffda012385e..589c69a75043 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/irq.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -110,18 +110,7 @@ void sigio_handler(int sig, union uml_pt_regs *regs)</div><div class='ctx'> 	free_irqs();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void maybe_sigio_broken(int fd, int type)</div><div class='del'>-{</div><div class='del'>-	if (os_isatty(fd)) {</div><div class='del'>-		if ((type == IRQ_WRITE) &amp;&amp; !pty_output_sigio) {</div><div class='del'>-			write_sigio_workaround();</div><div class='del'>-			add_sigio_fd(fd, 0);</div><div class='del'>-		} else if ((type == IRQ_READ) &amp;&amp; !pty_close_sigio) {</div><div class='del'>-			write_sigio_workaround();</div><div class='del'>-			add_sigio_fd(fd, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+static DEFINE_SPINLOCK(irq_lock);</div><div class='ctx'> </div><div class='ctx'> int activate_fd(int irq, int fd, int type, void *dev_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -166,7 +155,7 @@ int activate_fd(int irq, int fd, int type, void *dev_id)</div><div class='ctx'> 	 * this is called only from process context, and can be locked with</div><div class='ctx'> 	 * a semaphore.</div><div class='ctx'> 	 */</div><div class='del'>-	flags = irq_lock();</div><div class='add'>+	spin_lock_irqsave(&amp;irq_lock, flags);</div><div class='ctx'> 	for (irq_fd = active_fds; irq_fd != NULL; irq_fd = irq_fd-&gt;next) {</div><div class='ctx'> 		if ((irq_fd-&gt;fd == fd) &amp;&amp; (irq_fd-&gt;type == type)) {</div><div class='ctx'> 			printk("Registering fd %d twice\n", fd);</div><div class='hunk'>@@ -199,7 +188,7 @@ int activate_fd(int irq, int fd, int type, void *dev_id)</div><div class='ctx'> 		 * so we will not be able to put new pollfd struct to pollfds</div><div class='ctx'> 		 * then we free the buffer tmp_fds and try again.</div><div class='ctx'> 		 */</div><div class='del'>-		irq_unlock(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> 		kfree(tmp_pfd);</div><div class='ctx'> 		tmp_pfd = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -207,24 +196,24 @@ int activate_fd(int irq, int fd, int type, void *dev_id)</div><div class='ctx'> 		if (tmp_pfd == NULL)</div><div class='ctx'> 			goto out_kfree;</div><div class='ctx'> </div><div class='del'>-		flags = irq_lock();</div><div class='add'>+		spin_lock_irqsave(&amp;irq_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*-------------*/</div><div class='ctx'> </div><div class='ctx'> 	*last_irq_ptr = new_fd;</div><div class='ctx'> 	last_irq_ptr = &amp;new_fd-&gt;next;</div><div class='ctx'> </div><div class='del'>-	irq_unlock(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* This calls activate_fd, so it has to be outside the critical</div><div class='ctx'> 	 * section.</div><div class='ctx'> 	 */</div><div class='del'>-	maybe_sigio_broken(fd, type);</div><div class='add'>+	maybe_sigio_broken(fd, (type == IRQ_READ));</div><div class='ctx'> </div><div class='ctx'> 	return(0);</div><div class='ctx'> </div><div class='ctx'>  out_unlock:</div><div class='del'>-	irq_unlock(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'>  out_kfree:</div><div class='ctx'> 	kfree(new_fd);</div><div class='ctx'>  out:</div><div class='hunk'>@@ -235,9 +224,9 @@ static void free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	flags = irq_lock();</div><div class='add'>+	spin_lock_irqsave(&amp;irq_lock, flags);</div><div class='ctx'> 	os_free_irq_by_cb(test, arg, active_fds, &amp;last_irq_ptr);</div><div class='del'>-	irq_unlock(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct irq_and_dev {</div><div class='hunk'>@@ -304,19 +293,19 @@ void reactivate_fd(int fd, int irqnum)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	flags = irq_lock();</div><div class='add'>+	spin_lock_irqsave(&amp;irq_lock, flags);</div><div class='ctx'> 	irq = find_irq_by_fd(fd, irqnum, &amp;i);</div><div class='ctx'> 	if (irq == NULL) {</div><div class='del'>-		irq_unlock(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	os_set_pollfd(i, irq-&gt;fd);</div><div class='del'>-	irq_unlock(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* This calls activate_fd, so it has to be outside the critical</div><div class='ctx'> 	 * section.</div><div class='ctx'> 	 */</div><div class='del'>-	maybe_sigio_broken(fd, irq-&gt;type);</div><div class='add'>+	maybe_sigio_broken(fd, (irq-&gt;type == IRQ_READ));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void deactivate_fd(int fd, int irqnum)</div><div class='hunk'>@@ -325,13 +314,13 @@ void deactivate_fd(int fd, int irqnum)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	flags = irq_lock();</div><div class='add'>+	spin_lock_irqsave(&amp;irq_lock, flags);</div><div class='ctx'> 	irq = find_irq_by_fd(fd, irqnum, &amp;i);</div><div class='ctx'> 	if (irq == NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	os_set_pollfd(i, -1);</div><div class='ctx'>  out:</div><div class='del'>-	irq_unlock(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int deactivate_all_fds(void)</div><div class='hunk'>@@ -350,13 +339,14 @@ int deactivate_all_fds(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MODE_TT</div><div class='ctx'> void forward_interrupts(int pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_fd *irq;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	flags = irq_lock();</div><div class='add'>+	spin_lock_irqsave(&amp;irq_lock, flags);</div><div class='ctx'> 	for (irq = active_fds; irq != NULL; irq = irq-&gt;next) {</div><div class='ctx'> 		err = os_set_owner(irq-&gt;fd, pid);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='hunk'>@@ -369,8 +359,9 @@ void forward_interrupts(int pid)</div><div class='ctx'> </div><div class='ctx'> 		irq-&gt;pid = pid;</div><div class='ctx'> 	}</div><div class='del'>-	irq_unlock(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_lock, flags);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * do_IRQ handles all normal device IRQ's (the special</div><div class='hunk'>@@ -403,21 +394,6 @@ int um_request_irq(unsigned int irq, int fd, int type,</div><div class='ctx'> EXPORT_SYMBOL(um_request_irq);</div><div class='ctx'> EXPORT_SYMBOL(reactivate_fd);</div><div class='ctx'> </div><div class='del'>-static DEFINE_SPINLOCK(irq_spinlock);</div><div class='del'>-</div><div class='del'>-unsigned long irq_lock(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;irq_spinlock, flags);</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void irq_unlock(unsigned long flags)</div><div class='del'>-{</div><div class='del'>-	spin_unlock_irqrestore(&amp;irq_spinlock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* hw_interrupt_type must define (startup || enable) &amp;&amp;</div><div class='ctx'>  * (shutdown || disable) &amp;&amp; end */</div><div class='ctx'> static void dummy(unsigned int irq)</div><div class='hunk'>@@ -451,13 +427,13 @@ void __init init_IRQ(void)</div><div class='ctx'> 	irq_desc[TIMER_IRQ].status = IRQ_DISABLED;</div><div class='ctx'> 	irq_desc[TIMER_IRQ].action = NULL;</div><div class='ctx'> 	irq_desc[TIMER_IRQ].depth = 1;</div><div class='del'>-	irq_desc[TIMER_IRQ].handler = &amp;SIGVTALRM_irq_type;</div><div class='add'>+	irq_desc[TIMER_IRQ].chip = &amp;SIGVTALRM_irq_type;</div><div class='ctx'> 	enable_irq(TIMER_IRQ);</div><div class='ctx'> 	for (i = 1; i &lt; NR_IRQS; i++) {</div><div class='ctx'> 		irq_desc[i].status = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[i].action = NULL;</div><div class='ctx'> 		irq_desc[i].depth = 1;</div><div class='del'>-		irq_desc[i].handler = &amp;normal_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;normal_irq_type;</div><div class='ctx'> 		enable_irq(i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -474,7 +450,7 @@ int init_aio_irq(int irq, char *name, irqreturn_t (*handler)(int, void *,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = um_request_irq(irq, fds[0], IRQ_READ, handler,</div><div class='del'>-			     SA_INTERRUPT | SA_SAMPLE_RANDOM, name,</div><div class='add'>+			     IRQF_DISABLED | IRQF_SAMPLE_RANDOM, name,</div><div class='ctx'> 			     (void *) (long) fds[0]);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk("init_aio_irq - : um_request_irq failed, err = %d\n",</div><div class='head'>diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c<br/>index 432cf0b97a13..c97045d6d89f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/ksyms.c</a></div><div class='hunk'>@@ -88,12 +88,6 @@ EXPORT_SYMBOL(dump_thread);</div><div class='ctx'> EXPORT_SYMBOL(do_gettimeofday);</div><div class='ctx'> EXPORT_SYMBOL(do_settimeofday);</div><div class='ctx'> </div><div class='del'>-/* This is here because UML expands lseek to sys_lseek, not to a system</div><div class='del'>- * call instruction.</div><div class='del'>- */</div><div class='del'>-EXPORT_SYMBOL(sys_lseek);</div><div class='del'>-EXPORT_SYMBOL(sys_wait4);</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> </div><div class='ctx'> /* required for SMP */</div><div class='head'>diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c<br/>index 44e41a35f000..61280167c560 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/mem.c</a></div><div class='hunk'>@@ -24,8 +24,6 @@</div><div class='ctx'> #include "init.h"</div><div class='ctx'> #include "kern_constants.h"</div><div class='ctx'> </div><div class='del'>-extern char __binary_start;</div><div class='del'>-</div><div class='ctx'> /* Changed during early boot */</div><div class='ctx'> unsigned long *empty_zero_page = NULL;</div><div class='ctx'> unsigned long *empty_bad_page = NULL;</div><div class='hunk'>@@ -65,8 +63,6 @@ static void setup_highmem(unsigned long highmem_start,</div><div class='ctx'> </div><div class='ctx'> void mem_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long start;</div><div class='del'>-</div><div class='ctx'> 	max_low_pfn = (high_physmem - uml_physmem) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'>         /* clear the zero-page */</div><div class='hunk'>@@ -81,13 +77,6 @@ void mem_init(void)</div><div class='ctx'> 	free_bootmem(__pa(brk_end), uml_reserved - brk_end);</div><div class='ctx'> 	uml_reserved = brk_end;</div><div class='ctx'> </div><div class='del'>-	/* Fill in any hole at the start of the binary */</div><div class='del'>-	start = (unsigned long) &amp;__binary_start &amp; PAGE_MASK;</div><div class='del'>-	if(uml_physmem != start){</div><div class='del'>-		map_memory(uml_physmem, __pa(uml_physmem), start - uml_physmem,</div><div class='del'>-			   1, 1, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* this will put all low memory onto the freelists */</div><div class='ctx'> 	totalram_pages = free_all_bootmem();</div><div class='ctx'> 	totalhigh_pages = highmem &gt;&gt; PAGE_SHIFT;</div><div class='head'>diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c<br/>index fc0f0b085ca7..abafa64b8727 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/physmem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/physmem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/physmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/physmem.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static void insert_phys_mapping(struct phys_desc *desc)</div><div class='ctx'> 		panic("Physical remapping for %p already present",</div><div class='ctx'> 		      desc-&gt;virt);</div><div class='ctx'> </div><div class='del'>-	rb_link_node(&amp;desc-&gt;rb, (*n)-&gt;rb_parent, n);</div><div class='add'>+	rb_link_node(&amp;desc-&gt;rb, rb_parent(*n), n);</div><div class='ctx'> 	rb_insert_color(&amp;desc-&gt;rb, &amp;phys_mappings);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -317,7 +317,7 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int __syscall_stub_start, __binary_start;</div><div class='add'>+extern int __syscall_stub_start;</div><div class='ctx'> </div><div class='ctx'> void setup_physmem(unsigned long start, unsigned long reserve_end,</div><div class='ctx'> 		   unsigned long len, unsigned long long highmem)</div><div class='head'>diff --git a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio.c<br/>index 1c1300fb1e95..0ad755ceb212 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/sigio_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/sigio_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/sigio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/sigio.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ int write_sigio_irq(int fd)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,</div><div class='del'>-			     SA_INTERRUPT | SA_SAMPLE_RANDOM, "write sigio",</div><div class='add'>+			     IRQF_DISABLED|IRQF_SAMPLE_RANDOM, "write sigio",</div><div class='ctx'> 			     NULL);</div><div class='ctx'> 	if(err){</div><div class='ctx'> 		printk("write_sigio_irq : um_request_irq failed, err = %d\n",</div><div class='hunk'>@@ -53,17 +53,3 @@ void sigio_unlock(void)</div><div class='ctx'> {</div><div class='ctx'> 	spin_unlock(&amp;sigio_spinlock);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-extern void sigio_cleanup(void);</div><div class='del'>-__uml_exitcall(sigio_cleanup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/um/kernel/signal_kern.c b/arch/um/kernel/signal.c<br/>index da17b7541e08..4aa9808ba264 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/signal_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/signal_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/signal.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='hunk'>@@ -36,7 +36,7 @@ EXPORT_SYMBOL(unblock_signals);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * OK, we're invoking a handler</div><div class='del'>- */	</div><div class='add'>+ */</div><div class='ctx'> static int handle_signal(struct pt_regs *regs, unsigned long signr,</div><div class='ctx'> 			 struct k_sigaction *ka, siginfo_t *info,</div><div class='ctx'> 			 sigset_t *oldset)</div><div class='hunk'>@@ -88,7 +88,7 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,</div><div class='ctx'> 		force_sigsegv(signr, current);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-		sigorsets(&amp;current-&gt;blocked, &amp;current-&gt;blocked, </div><div class='add'>+		sigorsets(&amp;current-&gt;blocked, &amp;current-&gt;blocked,</div><div class='ctx'> 			  &amp;ka-&gt;sa.sa_mask);</div><div class='ctx'> 		 if(!(ka-&gt;sa.sa_flags &amp; SA_NODEFER))</div><div class='ctx'> 			sigaddset(&amp;current-&gt;blocked, signr);</div><div class='hunk'>@@ -136,7 +136,7 @@ static int kern_do_signal(struct pt_regs *regs)</div><div class='ctx'> 			PT_REGS_RESTART_SYSCALL(regs);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -ERESTART_RESTARTBLOCK:</div><div class='del'>-			PT_REGS_SYSCALL_RET(regs) = __NR_restart_syscall;</div><div class='add'>+			PT_REGS_ORIG_SYSCALL(regs) = __NR_restart_syscall;</div><div class='ctx'> 			PT_REGS_RESTART_SYSCALL(regs);</div><div class='ctx'> 			break;</div><div class='ctx'>  		}</div><div class='hunk'>@@ -146,7 +146,7 @@ static int kern_do_signal(struct pt_regs *regs)</div><div class='ctx'> 	 * you set a breakpoint on a system call instruction and singlestep</div><div class='ctx'> 	 * from it, the tracing thread used to PTRACE_SINGLESTEP the process</div><div class='ctx'> 	 * rather than PTRACE_SYSCALL it, allowing the system call to execute</div><div class='del'>-	 * on the host.  The tracing thread will check this flag and </div><div class='add'>+	 * on the host.  The tracing thread will check this flag and</div><div class='ctx'> 	 * PTRACE_SYSCALL if necessary.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if(current-&gt;ptrace &amp; PT_DTRACE)</div><div class='head'>diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c<br/>index 88ab96c609ce..27bbf54b1e52 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/skas/mem.c</a></div><div class='hunk'>@@ -9,31 +9,19 @@</div><div class='ctx'> #include "mem_user.h"</div><div class='ctx'> #include "skas.h"</div><div class='ctx'> </div><div class='del'>-unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out, </div><div class='del'>-				  unsigned long *task_size_out)</div><div class='add'>+unsigned long set_task_sizes_skas(unsigned long *task_size_out)</div><div class='ctx'> {</div><div class='ctx'> 	/* Round up to the nearest 4M */</div><div class='del'>-	unsigned long top = ROUND_4M((unsigned long) &amp;arg);</div><div class='add'>+	unsigned long host_task_size = ROUND_4M((unsigned long)</div><div class='add'>+						&amp;host_task_size);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOST_TASK_SIZE</div><div class='del'>-	*host_size_out = CONFIG_HOST_TASK_SIZE;</div><div class='add'>+	*host_size_out = ROUND_4M(CONFIG_HOST_TASK_SIZE);</div><div class='ctx'> 	*task_size_out = CONFIG_HOST_TASK_SIZE;</div><div class='ctx'> #else</div><div class='del'>-	*host_size_out = top;</div><div class='ctx'> 	if (!skas_needs_stub)</div><div class='del'>-		*task_size_out = top;</div><div class='add'>+		*task_size_out = host_task_size;</div><div class='ctx'> 	else *task_size_out = CONFIG_STUB_START &amp; PGDIR_MASK;</div><div class='ctx'> #endif</div><div class='del'>-	return(((unsigned long) set_task_sizes_skas) &amp; ~0xffffff);</div><div class='add'>+	return host_task_size;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c<br/>index c5c9885a8297..624ca238d1fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/mmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/mmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/mmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/skas/mmu.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ void destroy_context_skas(struct mm_struct *mm)</div><div class='ctx'> 		free_page(mmu-&gt;id.stack);</div><div class='ctx'> 		pte_lock_deinit(virt_to_page(mmu-&gt;last_page_table));</div><div class='ctx'> 		pte_free_kernel((pte_t *) mmu-&gt;last_page_table);</div><div class='del'>-                dec_page_state(nr_page_table_pages);</div><div class='add'>+		dec_zone_page_state(virt_to_page(mmu-&gt;last_page_table), NR_PAGETABLE);</div><div class='ctx'> #ifdef CONFIG_3_LEVEL_PGTABLES</div><div class='ctx'> 		pmd_free((pmd_t *) mmu-&gt;last_pmd);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c<br/>index 2135eaf98a93..55caeec8b257 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/process_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/process_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/process_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/skas/process_kern.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ int start_uml_skas(void)</div><div class='ctx'> 	if(proc_mm)</div><div class='ctx'> 		userspace_pid[0] = start_userspace(0);</div><div class='ctx'> </div><div class='del'>-	init_new_thread_signals(1);</div><div class='add'>+	init_new_thread_signals();</div><div class='ctx'> </div><div class='ctx'> 	init_task.thread.request.u.thread.proc = start_kernel_proc;</div><div class='ctx'> 	init_task.thread.request.u.thread.arg = NULL;</div><div class='head'>diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c<br/>index 51fb94076fcf..0ae4eea21be4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/syscall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/syscall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/skas/syscall.c</a></div><div class='hunk'>@@ -18,11 +18,7 @@ void handle_syscall(union uml_pt_regs *r)</div><div class='ctx'> 	struct pt_regs *regs = container_of(r, struct pt_regs, regs);</div><div class='ctx'> 	long result;</div><div class='ctx'> 	int syscall;</div><div class='del'>-#ifdef UML_CONFIG_SYSCALL_DEBUG</div><div class='del'>-  	int index;</div><div class='ctx'> </div><div class='del'>-  	index = record_syscall_start(UPT_SYSCALL_NR(r));</div><div class='del'>-#endif</div><div class='ctx'> 	syscall_trace(r, 0);</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;thread.nsyscalls++;</div><div class='hunk'>@@ -44,7 +40,4 @@ void handle_syscall(union uml_pt_regs *r)</div><div class='ctx'> 	REGS_SET_SYSCALL_RETURN(r-&gt;skas.regs, result);</div><div class='ctx'> </div><div class='ctx'> 	syscall_trace(r, 1);</div><div class='del'>-#ifdef UML_CONFIG_SYSCALL_DEBUG</div><div class='del'>-  	record_syscall_end(index, result);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c<br/>index 5992c3257167..8912cec0fe43 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/uaccess.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/skas/uaccess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/skas/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/skas/uaccess.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include "linux/kernel.h"</div><div class='ctx'> #include "linux/string.h"</div><div class='ctx'> #include "linux/fs.h"</div><div class='add'>+#include "linux/hardirq.h"</div><div class='ctx'> #include "linux/highmem.h"</div><div class='ctx'> #include "asm/page.h"</div><div class='ctx'> #include "asm/pgtable.h"</div><div class='hunk'>@@ -38,7 +39,7 @@ static unsigned long maybe_map(unsigned long virt, int is_write)</div><div class='ctx'> 	return((unsigned long) phys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_op(unsigned long addr, int len, int is_write,</div><div class='add'>+static int do_op_one_page(unsigned long addr, int len, int is_write,</div><div class='ctx'> 		 int (*op)(unsigned long addr, int len, void *arg), void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='hunk'>@@ -49,9 +50,11 @@ static int do_op(unsigned long addr, int len, int is_write,</div><div class='ctx'> 		return(-1);</div><div class='ctx'> </div><div class='ctx'> 	page = phys_to_page(addr);</div><div class='del'>-	addr = (unsigned long) kmap(page) + (addr &amp; ~PAGE_MASK);</div><div class='add'>+	addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) + (addr &amp; ~PAGE_MASK);</div><div class='add'>+</div><div class='ctx'> 	n = (*op)(addr, len, arg);</div><div class='del'>-	kunmap(page);</div><div class='add'>+</div><div class='add'>+	kunmap_atomic(page, KM_UML_USERCOPY);</div><div class='ctx'> </div><div class='ctx'> 	return(n);</div><div class='ctx'> }</div><div class='hunk'>@@ -77,7 +80,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr)</div><div class='ctx'> 	remain = len;</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;thread.fault_catcher = jmpbuf;</div><div class='del'>-	n = do_op(addr, size, is_write, op, arg);</div><div class='add'>+	n = do_op_one_page(addr, size, is_write, op, arg);</div><div class='ctx'> 	if(n != 0){</div><div class='ctx'> 		*res = (n &lt; 0 ? remain : 0);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -91,7 +94,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while(addr &lt; ((addr + remain) &amp; PAGE_MASK)){</div><div class='del'>-		n = do_op(addr, PAGE_SIZE, is_write, op, arg);</div><div class='add'>+		n = do_op_one_page(addr, PAGE_SIZE, is_write, op, arg);</div><div class='ctx'> 		if(n != 0){</div><div class='ctx'> 			*res = (n &lt; 0 ? remain : 0);</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -105,7 +108,7 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	n = do_op(addr, remain, is_write, op, arg);</div><div class='add'>+	n = do_op_one_page(addr, remain, is_write, op, arg);</div><div class='ctx'> 	if(n != 0)</div><div class='ctx'> 		*res = (n &lt; 0 ? remain : 0);</div><div class='ctx'> 	else *res = 0;</div><div class='head'>diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c<br/>index 1731d90e6850..48cf88dd02d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/syscall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/syscall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/syscall.c</a></div><div class='hunk'>@@ -1,36 +1,166 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)</div><div class='add'>+ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include "linux/sched.h"</div><div class='add'>+#include "linux/file.h"</div><div class='add'>+#include "linux/smp_lock.h"</div><div class='add'>+#include "linux/mm.h"</div><div class='add'>+#include "linux/utsname.h"</div><div class='add'>+#include "linux/msg.h"</div><div class='add'>+#include "linux/shm.h"</div><div class='add'>+#include "linux/sys.h"</div><div class='add'>+#include "linux/syscalls.h"</div><div class='add'>+#include "linux/unistd.h"</div><div class='add'>+#include "linux/slab.h"</div><div class='add'>+#include "linux/utime.h"</div><div class='add'>+#include "asm/mman.h"</div><div class='add'>+#include "asm/uaccess.h"</div><div class='ctx'> #include "kern_util.h"</div><div class='del'>-#include "syscall.h"</div><div class='del'>-#include "os.h"</div><div class='add'>+#include "user_util.h"</div><div class='add'>+#include "sysdep/syscalls.h"</div><div class='add'>+#include "mode_kern.h"</div><div class='add'>+#include "choose-mode.h"</div><div class='ctx'> </div><div class='del'>-struct {</div><div class='del'>-	int syscall;</div><div class='del'>-	int pid;</div><div class='del'>-	long result;</div><div class='del'>-	unsigned long long start;</div><div class='del'>-	unsigned long long end;</div><div class='del'>-} syscall_record[1024];</div><div class='add'>+/*  Unlocked, I don't care if this is a bit off */</div><div class='add'>+int nsyscalls = 0;</div><div class='ctx'> </div><div class='del'>-int record_syscall_start(int syscall)</div><div class='add'>+long sys_fork(void)</div><div class='ctx'> {</div><div class='del'>-	int max, index;</div><div class='add'>+	long ret;</div><div class='ctx'> </div><div class='del'>-	max = sizeof(syscall_record)/sizeof(syscall_record[0]);</div><div class='del'>-	index = next_syscall_index(max);</div><div class='add'>+	current-&gt;thread.forking = 1;</div><div class='add'>+	ret = do_fork(SIGCHLD, UPT_SP(&amp;current-&gt;thread.regs.regs),</div><div class='add'>+		      &amp;current-&gt;thread.regs, 0, NULL, NULL);</div><div class='add'>+	current-&gt;thread.forking = 0;</div><div class='add'>+	return(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long sys_vfork(void)</div><div class='add'>+{</div><div class='add'>+	long ret;</div><div class='add'>+</div><div class='add'>+	current-&gt;thread.forking = 1;</div><div class='add'>+	ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,</div><div class='add'>+		      UPT_SP(&amp;current-&gt;thread.regs.regs),</div><div class='add'>+		      &amp;current-&gt;thread.regs, 0, NULL, NULL);</div><div class='add'>+	current-&gt;thread.forking = 0;</div><div class='add'>+	return(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* common code for old and new mmaps */</div><div class='add'>+long sys_mmap2(unsigned long addr, unsigned long len,</div><div class='add'>+	       unsigned long prot, unsigned long flags,</div><div class='add'>+	       unsigned long fd, unsigned long pgoff)</div><div class='add'>+{</div><div class='add'>+	long error = -EBADF;</div><div class='add'>+	struct file * file = NULL;</div><div class='add'>+</div><div class='add'>+	flags &amp;= ~(MAP_EXECUTABLE | MAP_DENYWRITE);</div><div class='add'>+	if (!(flags &amp; MAP_ANONYMOUS)) {</div><div class='add'>+		file = fget(fd);</div><div class='add'>+		if (!file)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);</div><div class='add'>+	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+	if (file)</div><div class='add'>+		fput(file);</div><div class='add'>+ out:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long old_mmap(unsigned long addr, unsigned long len,</div><div class='add'>+	      unsigned long prot, unsigned long flags,</div><div class='add'>+	      unsigned long fd, unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	long err = -EINVAL;</div><div class='add'>+	if (offset &amp; ~PAGE_MASK)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = sys_mmap2(addr, len, prot, flags, fd, offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+ out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+ * sys_pipe() is the normal C calling standard for creating</div><div class='add'>+ * a pipe. It's not the way unix traditionally does this, though.</div><div class='add'>+ */</div><div class='add'>+long sys_pipe(unsigned long __user * fildes)</div><div class='add'>+{</div><div class='add'>+        int fd[2];</div><div class='add'>+        long error;</div><div class='add'>+</div><div class='add'>+        error = do_pipe(fd);</div><div class='add'>+        if (!error) {</div><div class='add'>+		if (copy_to_user(fildes, fd, sizeof(fd)))</div><div class='add'>+                        error = -EFAULT;</div><div class='add'>+        }</div><div class='add'>+        return error;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	syscall_record[index].syscall = syscall;</div><div class='del'>-	syscall_record[index].pid = current_pid();</div><div class='del'>-	syscall_record[index].result = 0xdeadbeef;</div><div class='del'>-	syscall_record[index].start = os_nsecs();</div><div class='del'>-	return(index);</div><div class='add'>+</div><div class='add'>+long sys_uname(struct old_utsname __user * name)</div><div class='add'>+{</div><div class='add'>+	long err;</div><div class='add'>+	if (!name)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	down_read(&amp;uts_sem);</div><div class='add'>+	err = copy_to_user(name, &amp;system_utsname, sizeof (*name));</div><div class='add'>+	up_read(&amp;uts_sem);</div><div class='add'>+	return err?-EFAULT:0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void record_syscall_end(int index, long result)</div><div class='add'>+long sys_olduname(struct oldold_utsname __user * name)</div><div class='ctx'> {</div><div class='del'>-	syscall_record[index].result = result;</div><div class='del'>-	syscall_record[index].end = os_nsecs();</div><div class='add'>+	long error;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+  	down_read(&amp;uts_sem);</div><div class='add'>+</div><div class='add'>+	error = __copy_to_user(&amp;name-&gt;sysname,&amp;system_utsname.sysname,</div><div class='add'>+			       __OLD_UTS_LEN);</div><div class='add'>+	error |= __put_user(0,name-&gt;sysname+__OLD_UTS_LEN);</div><div class='add'>+	error |= __copy_to_user(&amp;name-&gt;nodename,&amp;system_utsname.nodename,</div><div class='add'>+				__OLD_UTS_LEN);</div><div class='add'>+	error |= __put_user(0,name-&gt;nodename+__OLD_UTS_LEN);</div><div class='add'>+	error |= __copy_to_user(&amp;name-&gt;release,&amp;system_utsname.release,</div><div class='add'>+				__OLD_UTS_LEN);</div><div class='add'>+	error |= __put_user(0,name-&gt;release+__OLD_UTS_LEN);</div><div class='add'>+	error |= __copy_to_user(&amp;name-&gt;version,&amp;system_utsname.version,</div><div class='add'>+				__OLD_UTS_LEN);</div><div class='add'>+	error |= __put_user(0,name-&gt;version+__OLD_UTS_LEN);</div><div class='add'>+	error |= __copy_to_user(&amp;name-&gt;machine,&amp;system_utsname.machine,</div><div class='add'>+				__OLD_UTS_LEN);</div><div class='add'>+	error |= __put_user(0,name-&gt;machine+__OLD_UTS_LEN);</div><div class='add'>+</div><div class='add'>+	up_read(&amp;uts_sem);</div><div class='add'>+</div><div class='add'>+	error = error ? -EFAULT : 0;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SPINLOCK(syscall_lock);</div><div class='add'>+</div><div class='add'>+static int syscall_index = 0;</div><div class='add'>+</div><div class='add'>+int next_syscall_index(int limit)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;syscall_lock);</div><div class='add'>+	ret = syscall_index;</div><div class='add'>+	if(++syscall_index == limit)</div><div class='add'>+		syscall_index = 0;</div><div class='add'>+	spin_unlock(&amp;syscall_lock);</div><div class='add'>+	return(ret);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c<br/>deleted file mode 100644<br/>index 37d3978337d8..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/syscall_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/syscall_kern.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-/* </div><div class='del'>- * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)</div><div class='del'>- * Licensed under the GPL</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "linux/sched.h"</div><div class='del'>-#include "linux/file.h"</div><div class='del'>-#include "linux/smp_lock.h"</div><div class='del'>-#include "linux/mm.h"</div><div class='del'>-#include "linux/utsname.h"</div><div class='del'>-#include "linux/msg.h"</div><div class='del'>-#include "linux/shm.h"</div><div class='del'>-#include "linux/sys.h"</div><div class='del'>-#include "linux/syscalls.h"</div><div class='del'>-#include "linux/unistd.h"</div><div class='del'>-#include "linux/slab.h"</div><div class='del'>-#include "linux/utime.h"</div><div class='del'>-#include "asm/mman.h"</div><div class='del'>-#include "asm/uaccess.h"</div><div class='del'>-#include "kern_util.h"</div><div class='del'>-#include "user_util.h"</div><div class='del'>-#include "sysdep/syscalls.h"</div><div class='del'>-#include "mode_kern.h"</div><div class='del'>-#include "choose-mode.h"</div><div class='del'>-</div><div class='del'>-/*  Unlocked, I don't care if this is a bit off */</div><div class='del'>-int nsyscalls = 0;</div><div class='del'>-</div><div class='del'>-long sys_fork(void)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	current-&gt;thread.forking = 1;</div><div class='del'>-	ret = do_fork(SIGCHLD, UPT_SP(&amp;current-&gt;thread.regs.regs),</div><div class='del'>-		      &amp;current-&gt;thread.regs, 0, NULL, NULL);</div><div class='del'>-	current-&gt;thread.forking = 0;</div><div class='del'>-	return(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long sys_vfork(void)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	current-&gt;thread.forking = 1;</div><div class='del'>-	ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,</div><div class='del'>-		      UPT_SP(&amp;current-&gt;thread.regs.regs),</div><div class='del'>-		      &amp;current-&gt;thread.regs, 0, NULL, NULL);</div><div class='del'>-	current-&gt;thread.forking = 0;</div><div class='del'>-	return(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* common code for old and new mmaps */</div><div class='del'>-long sys_mmap2(unsigned long addr, unsigned long len,</div><div class='del'>-	       unsigned long prot, unsigned long flags,</div><div class='del'>-	       unsigned long fd, unsigned long pgoff)</div><div class='del'>-{</div><div class='del'>-	long error = -EBADF;</div><div class='del'>-	struct file * file = NULL;</div><div class='del'>-</div><div class='del'>-	flags &amp;= ~(MAP_EXECUTABLE | MAP_DENYWRITE);</div><div class='del'>-	if (!(flags &amp; MAP_ANONYMOUS)) {</div><div class='del'>-		file = fget(fd);</div><div class='del'>-		if (!file)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);</div><div class='del'>-	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-</div><div class='del'>-	if (file)</div><div class='del'>-		fput(file);</div><div class='del'>- out:</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long old_mmap(unsigned long addr, unsigned long len,</div><div class='del'>-	      unsigned long prot, unsigned long flags,</div><div class='del'>-	      unsigned long fd, unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	long err = -EINVAL;</div><div class='del'>-	if (offset &amp; ~PAGE_MASK)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = sys_mmap2(addr, len, prot, flags, fd, offset &gt;&gt; PAGE_SHIFT);</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * sys_pipe() is the normal C calling standard for creating</div><div class='del'>- * a pipe. It's not the way unix traditionally does this, though.</div><div class='del'>- */</div><div class='del'>-long sys_pipe(unsigned long __user * fildes)</div><div class='del'>-{</div><div class='del'>-        int fd[2];</div><div class='del'>-        long error;</div><div class='del'>-</div><div class='del'>-        error = do_pipe(fd);</div><div class='del'>-        if (!error) {</div><div class='del'>-		if (copy_to_user(fildes, fd, sizeof(fd)))</div><div class='del'>-                        error = -EFAULT;</div><div class='del'>-        }</div><div class='del'>-        return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-long sys_uname(struct old_utsname __user * name)</div><div class='del'>-{</div><div class='del'>-	long err;</div><div class='del'>-	if (!name)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	down_read(&amp;uts_sem);</div><div class='del'>-	err=copy_to_user(name, &amp;system_utsname, sizeof (*name));</div><div class='del'>-	up_read(&amp;uts_sem);</div><div class='del'>-	return err?-EFAULT:0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long sys_olduname(struct oldold_utsname __user * name)</div><div class='del'>-{</div><div class='del'>-	long error;</div><div class='del'>-</div><div class='del'>-	if (!name)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-  </div><div class='del'>-  	down_read(&amp;uts_sem);</div><div class='del'>-	</div><div class='del'>-	error = __copy_to_user(&amp;name-&gt;sysname,&amp;system_utsname.sysname,</div><div class='del'>-			       __OLD_UTS_LEN);</div><div class='del'>-	error |= __put_user(0,name-&gt;sysname+__OLD_UTS_LEN);</div><div class='del'>-	error |= __copy_to_user(&amp;name-&gt;nodename,&amp;system_utsname.nodename,</div><div class='del'>-				__OLD_UTS_LEN);</div><div class='del'>-	error |= __put_user(0,name-&gt;nodename+__OLD_UTS_LEN);</div><div class='del'>-	error |= __copy_to_user(&amp;name-&gt;release,&amp;system_utsname.release,</div><div class='del'>-				__OLD_UTS_LEN);</div><div class='del'>-	error |= __put_user(0,name-&gt;release+__OLD_UTS_LEN);</div><div class='del'>-	error |= __copy_to_user(&amp;name-&gt;version,&amp;system_utsname.version,</div><div class='del'>-				__OLD_UTS_LEN);</div><div class='del'>-	error |= __put_user(0,name-&gt;version+__OLD_UTS_LEN);</div><div class='del'>-	error |= __copy_to_user(&amp;name-&gt;machine,&amp;system_utsname.machine,</div><div class='del'>-				__OLD_UTS_LEN);</div><div class='del'>-	error |= __put_user(0,name-&gt;machine+__OLD_UTS_LEN);</div><div class='del'>-	</div><div class='del'>-	up_read(&amp;uts_sem);</div><div class='del'>-	</div><div class='del'>-	error = error ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DEFINE_SPINLOCK(syscall_lock);</div><div class='del'>-</div><div class='del'>-static int syscall_index = 0;</div><div class='del'>-</div><div class='del'>-int next_syscall_index(int limit)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;syscall_lock);</div><div class='del'>-	ret = syscall_index;</div><div class='del'>-	if(++syscall_index == limit)</div><div class='del'>-		syscall_index = 0;</div><div class='del'>-	spin_unlock(&amp;syscall_lock);</div><div class='del'>-	return(ret);</div><div class='del'>-}</div><div class='head'>diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c<br/>index 8fa2ae7f3026..552ca1cb9847 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/time.c</a></div><div class='hunk'>@@ -1,172 +1,182 @@</div><div class='del'>-/* </div><div class='del'>- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include "user_util.h"</div><div class='add'>+#include "linux/kernel.h"</div><div class='add'>+#include "linux/module.h"</div><div class='add'>+#include "linux/unistd.h"</div><div class='add'>+#include "linux/stddef.h"</div><div class='add'>+#include "linux/spinlock.h"</div><div class='add'>+#include "linux/time.h"</div><div class='add'>+#include "linux/sched.h"</div><div class='add'>+#include "linux/interrupt.h"</div><div class='add'>+#include "linux/init.h"</div><div class='add'>+#include "linux/delay.h"</div><div class='add'>+#include "linux/hrtimer.h"</div><div class='add'>+#include "asm/irq.h"</div><div class='add'>+#include "asm/param.h"</div><div class='add'>+#include "asm/current.h"</div><div class='ctx'> #include "kern_util.h"</div><div class='del'>-#include "user.h"</div><div class='del'>-#include "process.h"</div><div class='del'>-#include "time_user.h"</div><div class='del'>-#include "kern_constants.h"</div><div class='add'>+#include "user_util.h"</div><div class='add'>+#include "mode.h"</div><div class='ctx'> #include "os.h"</div><div class='ctx'> </div><div class='del'>-/* XXX This really needs to be declared and initialized in a kernel file since</div><div class='del'>- * it's in &lt;linux/time.h&gt;</div><div class='add'>+int hz(void)</div><div class='add'>+{</div><div class='add'>+	return(HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scheduler clock - returns current time in nanosec units.</div><div class='ctx'>  */</div><div class='del'>-extern struct timespec wall_to_monotonic;</div><div class='add'>+unsigned long long sched_clock(void)</div><div class='add'>+{</div><div class='add'>+	return (unsigned long long)jiffies_64 * (1000000000 / HZ);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-extern struct timeval xtime;</div><div class='add'>+/* Changed at early boot */</div><div class='add'>+int timer_irq_inited = 0;</div><div class='ctx'> </div><div class='del'>-struct timeval local_offset = { 0, 0 };</div><div class='add'>+static unsigned long long prev_nsecs;</div><div class='add'>+#ifdef CONFIG_UML_REAL_TIME_CLOCK</div><div class='add'>+static long long delta;   		/* Deviation per interval */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-void timer(void)</div><div class='add'>+void timer_irq(union uml_pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	gettimeofday(&amp;xtime, NULL);</div><div class='del'>-	timeradd(&amp;xtime, &amp;local_offset, &amp;xtime);</div><div class='del'>-}</div><div class='add'>+	unsigned long long ticks = 0;</div><div class='ctx'> </div><div class='del'>-static void set_interval(int timer_type)</div><div class='del'>-{</div><div class='del'>-	int usec = 1000000/hz();</div><div class='del'>-	struct itimerval interval = ((struct itimerval) { { 0, usec },</div><div class='del'>-							  { 0, usec } });</div><div class='add'>+#ifdef CONFIG_UML_REAL_TIME_CLOCK</div><div class='add'>+	if(prev_nsecs){</div><div class='add'>+		/* We've had 1 tick */</div><div class='add'>+		unsigned long long nsecs = os_nsecs();</div><div class='ctx'> </div><div class='del'>-	if(setitimer(timer_type, &amp;interval, NULL) == -1)</div><div class='del'>-		panic("setitimer failed - errno = %d\n", errno);</div><div class='del'>-}</div><div class='add'>+		delta += nsecs - prev_nsecs;</div><div class='add'>+		prev_nsecs = nsecs;</div><div class='ctx'> </div><div class='del'>-void enable_timer(void)</div><div class='del'>-{</div><div class='del'>-	set_interval(ITIMER_VIRTUAL);</div><div class='del'>-}</div><div class='add'>+		/* Protect against the host clock being set backwards */</div><div class='add'>+		if(delta &lt; 0)</div><div class='add'>+			delta = 0;</div><div class='ctx'> </div><div class='del'>-void prepare_timer(void * ptr)</div><div class='del'>-{</div><div class='del'>-	int usec = 1000000/hz();</div><div class='del'>-	*(struct itimerval *)ptr = ((struct itimerval) { { 0, usec },</div><div class='del'>-							 { 0, usec }});</div><div class='add'>+		ticks += (delta * HZ) / BILLION;</div><div class='add'>+		delta -= (ticks * BILLION) / HZ;</div><div class='add'>+	}</div><div class='add'>+	else prev_nsecs = os_nsecs();</div><div class='add'>+#else</div><div class='add'>+	ticks = 1;</div><div class='add'>+#endif</div><div class='add'>+	while(ticks &gt; 0){</div><div class='add'>+		do_IRQ(TIMER_IRQ, regs);</div><div class='add'>+		ticks--;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void disable_timer(void)</div><div class='add'>+static DEFINE_SPINLOCK(timer_spinlock);</div><div class='add'>+</div><div class='add'>+static unsigned long long local_offset = 0;</div><div class='add'>+</div><div class='add'>+static inline unsigned long long get_time(void)</div><div class='ctx'> {</div><div class='del'>-	struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }});</div><div class='del'>-	if((setitimer(ITIMER_VIRTUAL, &amp;disable, NULL) &lt; 0) ||</div><div class='del'>-	   (setitimer(ITIMER_REAL, &amp;disable, NULL) &lt; 0))</div><div class='del'>-		printk("disnable_timer - setitimer failed, errno = %d\n",</div><div class='del'>-		       errno);</div><div class='del'>-	/* If there are signals already queued, after unblocking ignore them */</div><div class='del'>-	set_handler(SIGALRM, SIG_IGN, 0, -1);</div><div class='del'>-	set_handler(SIGVTALRM, SIG_IGN, 0, -1);</div><div class='add'>+	unsigned long long nsecs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;timer_spinlock, flags);</div><div class='add'>+	nsecs = os_nsecs();</div><div class='add'>+	nsecs += local_offset;</div><div class='add'>+	spin_unlock_irqrestore(&amp;timer_spinlock, flags);</div><div class='add'>+</div><div class='add'>+	return nsecs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void switch_timers(int to_real)</div><div class='add'>+irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }});</div><div class='del'>-	struct itimerval enable = ((struct itimerval) { { 0, 1000000/hz() },</div><div class='del'>-							{ 0, 1000000/hz() }});</div><div class='del'>-	int old, new;</div><div class='del'>-</div><div class='del'>-	if(to_real){</div><div class='del'>-		old = ITIMER_VIRTUAL;</div><div class='del'>-		new = ITIMER_REAL;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		old = ITIMER_REAL;</div><div class='del'>-		new = ITIMER_VIRTUAL;</div><div class='del'>-	}</div><div class='add'>+	unsigned long long nsecs;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	write_seqlock_irqsave(&amp;xtime_lock, flags);</div><div class='add'>+</div><div class='add'>+	do_timer(regs);</div><div class='add'>+</div><div class='add'>+	nsecs = get_time() + local_offset;</div><div class='add'>+	xtime.tv_sec = nsecs / NSEC_PER_SEC;</div><div class='add'>+	xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;</div><div class='ctx'> </div><div class='del'>-	if((setitimer(old, &amp;disable, NULL) &lt; 0) ||</div><div class='del'>-	   (setitimer(new, &amp;enable, NULL)))</div><div class='del'>-		printk("switch_timers - setitimer failed, errno = %d\n",</div><div class='del'>-		       errno);</div><div class='add'>+	write_sequnlock_irqrestore(&amp;xtime_lock, flags);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void uml_idle_timer(void)</div><div class='add'>+static void register_timer(void)</div><div class='ctx'> {</div><div class='del'>-	if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)</div><div class='del'>-		panic("Couldn't unset SIGVTALRM handler");</div><div class='del'>-	</div><div class='del'>-	set_handler(SIGALRM, (__sighandler_t) alarm_handler, </div><div class='del'>-		    SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);</div><div class='del'>-	set_interval(ITIMER_REAL);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL);</div><div class='add'>+	if(err != 0)</div><div class='add'>+		printk(KERN_ERR "timer_init : request_irq failed - "</div><div class='add'>+		       "errno = %d\n", -err);</div><div class='add'>+</div><div class='add'>+	timer_irq_inited = 1;</div><div class='add'>+</div><div class='add'>+	user_time_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void ktime_get_ts(struct timespec *ts);</div><div class='del'>-#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)</div><div class='add'>+extern void (*late_time_init)(void);</div><div class='ctx'> </div><div class='ctx'> void time_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct timespec now;</div><div class='del'>-</div><div class='del'>-	if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)</div><div class='del'>-		panic("Couldn't set SIGVTALRM handler");</div><div class='del'>-	set_interval(ITIMER_VIRTUAL);</div><div class='add'>+	long long nsecs;</div><div class='ctx'> </div><div class='del'>-	do_posix_clock_monotonic_gettime(&amp;now);</div><div class='del'>-	wall_to_monotonic.tv_sec = -now.tv_sec;</div><div class='del'>-	wall_to_monotonic.tv_nsec = -now.tv_nsec;</div><div class='add'>+	nsecs = os_nsecs();</div><div class='add'>+	set_normalized_timespec(&amp;wall_to_monotonic, -nsecs / BILLION,</div><div class='add'>+				-nsecs % BILLION);</div><div class='add'>+	late_time_init = register_timer;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Defined in linux/ktimer.h, which can't be included here */</div><div class='del'>-#define clock_was_set()		do { } while (0)</div><div class='del'>-</div><div class='ctx'> void do_gettimeofday(struct timeval *tv)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	flags = time_lock();</div><div class='del'>-	gettimeofday(tv, NULL);</div><div class='del'>-	timeradd(tv, &amp;local_offset, tv);</div><div class='del'>-	time_unlock(flags);</div><div class='del'>-	clock_was_set();</div><div class='add'>+	unsigned long long nsecs = get_time();</div><div class='add'>+</div><div class='add'>+	tv-&gt;tv_sec = nsecs / NSEC_PER_SEC;</div><div class='add'>+	/* Careful about calculations here - this was originally done as</div><div class='add'>+	 * (nsecs - tv-&gt;tv_sec * NSEC_PER_SEC) / NSEC_PER_USEC</div><div class='add'>+	 * which gave bogus (&gt; 1000000) values.  Dunno why, suspect gcc</div><div class='add'>+	 * (4.0.0) miscompiled it, or there's a subtle 64/32-bit conversion</div><div class='add'>+	 * problem that I missed.</div><div class='add'>+	 */</div><div class='add'>+	nsecs -= tv-&gt;tv_sec * NSEC_PER_SEC;</div><div class='add'>+	tv-&gt;tv_usec = (unsigned long) nsecs / NSEC_PER_USEC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int do_settimeofday(struct timespec *tv)</div><div class='add'>+static inline void set_time(unsigned long long nsecs)</div><div class='ctx'> {</div><div class='del'>-	struct timeval now;</div><div class='add'>+	unsigned long long now;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct timeval tv_in;</div><div class='ctx'> </div><div class='del'>-	if ((unsigned long) tv-&gt;tv_nsec &gt;= UM_NSEC_PER_SEC)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	spin_lock_irqsave(&amp;timer_spinlock, flags);</div><div class='add'>+	now = os_nsecs();</div><div class='add'>+	local_offset = nsecs - now;</div><div class='add'>+	spin_unlock_irqrestore(&amp;timer_spinlock, flags);</div><div class='ctx'> </div><div class='del'>-	tv_in.tv_sec = tv-&gt;tv_sec;</div><div class='del'>-	tv_in.tv_usec = tv-&gt;tv_nsec / 1000;</div><div class='del'>-</div><div class='del'>-	flags = time_lock();</div><div class='del'>-	gettimeofday(&amp;now, NULL);</div><div class='del'>-	timersub(&amp;tv_in, &amp;now, &amp;local_offset);</div><div class='del'>-	time_unlock(flags);</div><div class='del'>-</div><div class='del'>-	return(0);</div><div class='add'>+	clock_was_set();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void idle_sleep(int secs)</div><div class='add'>+int do_settimeofday(struct timespec *tv)</div><div class='ctx'> {</div><div class='del'>-	struct timespec ts;</div><div class='add'>+	set_time((unsigned long long) tv-&gt;tv_sec * NSEC_PER_SEC + tv-&gt;tv_nsec);</div><div class='ctx'> </div><div class='del'>-	ts.tv_sec = secs;</div><div class='del'>-	ts.tv_nsec = 0;</div><div class='del'>-	nanosleep(&amp;ts, NULL);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* XXX This partly duplicates init_irq_signals */</div><div class='del'>-</div><div class='del'>-void user_time_init(void)</div><div class='add'>+void timer_handler(int sig, union uml_pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	set_handler(SIGVTALRM, (__sighandler_t) alarm_handler,</div><div class='del'>-		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH,</div><div class='del'>-		    SIGALRM, SIGUSR2, -1);</div><div class='del'>-	set_handler(SIGALRM, (__sighandler_t) alarm_handler,</div><div class='del'>-		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH,</div><div class='del'>-		    SIGVTALRM, SIGUSR2, -1);</div><div class='del'>-	set_interval(ITIMER_VIRTUAL);</div><div class='add'>+	local_irq_disable();</div><div class='add'>+	irq_enter();</div><div class='add'>+	update_process_times(CHOOSE_MODE(</div><div class='add'>+	                     (UPT_SC(regs) &amp;&amp; user_context(UPT_SP(regs))),</div><div class='add'>+			     (regs)-&gt;skas.is_user));</div><div class='add'>+	irq_exit();</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	if(current_thread-&gt;cpu == 0)</div><div class='add'>+		timer_irq(regs);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c<br/>deleted file mode 100644<br/>index 528cf623f8b4..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/time_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/time_kern.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,212 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)</div><div class='del'>- * Licensed under the GPL</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "linux/kernel.h"</div><div class='del'>-#include "linux/module.h"</div><div class='del'>-#include "linux/unistd.h"</div><div class='del'>-#include "linux/stddef.h"</div><div class='del'>-#include "linux/spinlock.h"</div><div class='del'>-#include "linux/time.h"</div><div class='del'>-#include "linux/sched.h"</div><div class='del'>-#include "linux/interrupt.h"</div><div class='del'>-#include "linux/init.h"</div><div class='del'>-#include "linux/delay.h"</div><div class='del'>-#include "linux/hrtimer.h"</div><div class='del'>-#include "asm/irq.h"</div><div class='del'>-#include "asm/param.h"</div><div class='del'>-#include "asm/current.h"</div><div class='del'>-#include "kern_util.h"</div><div class='del'>-#include "user_util.h"</div><div class='del'>-#include "mode.h"</div><div class='del'>-#include "os.h"</div><div class='del'>-</div><div class='del'>-int hz(void)</div><div class='del'>-{</div><div class='del'>-	return(HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Scheduler clock - returns current time in nanosec units.</div><div class='del'>- */</div><div class='del'>-unsigned long long sched_clock(void)</div><div class='del'>-{</div><div class='del'>-	return (unsigned long long)jiffies_64 * (1000000000 / HZ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Changed at early boot */</div><div class='del'>-int timer_irq_inited = 0;</div><div class='del'>-</div><div class='del'>-static int first_tick;</div><div class='del'>-static unsigned long long prev_nsecs;</div><div class='del'>-#ifdef CONFIG_UML_REAL_TIME_CLOCK</div><div class='del'>-static long long delta;   		/* Deviation per interval */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void timer_irq(union uml_pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned long long ticks = 0;</div><div class='del'>-</div><div class='del'>-	if(!timer_irq_inited){</div><div class='del'>-		/* This is to ensure that ticks don't pile up when</div><div class='del'>-		 * the timer handler is suspended */</div><div class='del'>-		first_tick = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(first_tick){</div><div class='del'>-#ifdef CONFIG_UML_REAL_TIME_CLOCK</div><div class='del'>-		/* We've had 1 tick */</div><div class='del'>-		unsigned long long nsecs = os_nsecs();</div><div class='del'>-</div><div class='del'>-		delta += nsecs - prev_nsecs;</div><div class='del'>-		prev_nsecs = nsecs;</div><div class='del'>-</div><div class='del'>-		/* Protect against the host clock being set backwards */</div><div class='del'>-		if(delta &lt; 0)</div><div class='del'>-			delta = 0;</div><div class='del'>-</div><div class='del'>-		ticks += (delta * HZ) / BILLION;</div><div class='del'>-		delta -= (ticks * BILLION) / HZ;</div><div class='del'>-#else</div><div class='del'>-		ticks = 1;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		prev_nsecs = os_nsecs();</div><div class='del'>-		first_tick = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while(ticks &gt; 0){</div><div class='del'>-		do_IRQ(TIMER_IRQ, regs);</div><div class='del'>-		ticks--;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void do_boot_timer_handler(struct sigcontext * sc)</div><div class='del'>-{</div><div class='del'>-	struct pt_regs regs;</div><div class='del'>-</div><div class='del'>-	CHOOSE_MODE((void) (UPT_SC(&amp;regs.regs) = sc),</div><div class='del'>-		    (void) (regs.regs.skas.is_user = 0));</div><div class='del'>-	do_timer(&amp;regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(timer_spinlock);</div><div class='del'>-</div><div class='del'>-static unsigned long long local_offset = 0;</div><div class='del'>-</div><div class='del'>-static inline unsigned long long get_time(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long long nsecs;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;timer_spinlock, flags);</div><div class='del'>-	nsecs = os_nsecs();</div><div class='del'>-	nsecs += local_offset;</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer_spinlock, flags);</div><div class='del'>-</div><div class='del'>-	return nsecs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	unsigned long long nsecs;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	do_timer(regs);</div><div class='del'>-</div><div class='del'>-	write_seqlock_irqsave(&amp;xtime_lock, flags);</div><div class='del'>-	nsecs = get_time() + local_offset;</div><div class='del'>-	xtime.tv_sec = nsecs / NSEC_PER_SEC;</div><div class='del'>-	xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;</div><div class='del'>-	write_sequnlock_irqrestore(&amp;xtime_lock, flags);</div><div class='del'>-</div><div class='del'>-	return(IRQ_HANDLED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long um_time(int __user *tloc)</div><div class='del'>-{</div><div class='del'>-	long ret = get_time() / NSEC_PER_SEC;</div><div class='del'>-</div><div class='del'>-	if((tloc != NULL) &amp;&amp; put_user(ret, tloc))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void do_gettimeofday(struct timeval *tv)</div><div class='del'>-{</div><div class='del'>-	unsigned long long nsecs = get_time();</div><div class='del'>-</div><div class='del'>-	tv-&gt;tv_sec = nsecs / NSEC_PER_SEC;</div><div class='del'>-	/* Careful about calculations here - this was originally done as</div><div class='del'>-	 * (nsecs - tv-&gt;tv_sec * NSEC_PER_SEC) / NSEC_PER_USEC</div><div class='del'>-	 * which gave bogus (&gt; 1000000) values.  Dunno why, suspect gcc</div><div class='del'>-	 * (4.0.0) miscompiled it, or there's a subtle 64/32-bit conversion</div><div class='del'>-	 * problem that I missed.</div><div class='del'>-	 */</div><div class='del'>-	nsecs -= tv-&gt;tv_sec * NSEC_PER_SEC;</div><div class='del'>-	tv-&gt;tv_usec = (unsigned long) nsecs / NSEC_PER_USEC;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_time(unsigned long long nsecs)</div><div class='del'>-{</div><div class='del'>-	unsigned long long now;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;timer_spinlock, flags);</div><div class='del'>-	now = os_nsecs();</div><div class='del'>-	local_offset = nsecs - now;</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer_spinlock, flags);</div><div class='del'>-</div><div class='del'>-	clock_was_set();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-long um_stime(int __user *tptr)</div><div class='del'>-{</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	if (get_user(value, tptr))</div><div class='del'>-                return -EFAULT;</div><div class='del'>-</div><div class='del'>-	set_time((unsigned long long) value * NSEC_PER_SEC);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int do_settimeofday(struct timespec *tv)</div><div class='del'>-{</div><div class='del'>-	set_time((unsigned long long) tv-&gt;tv_sec * NSEC_PER_SEC + tv-&gt;tv_nsec);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void timer_handler(int sig, union uml_pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	local_irq_disable();</div><div class='del'>-	irq_enter();</div><div class='del'>-	update_process_times(CHOOSE_MODE(</div><div class='del'>-	                     (UPT_SC(regs) &amp;&amp; user_context(UPT_SP(regs))),</div><div class='del'>-			     (regs)-&gt;skas.is_user));</div><div class='del'>-	irq_exit();</div><div class='del'>-	local_irq_enable();</div><div class='del'>-	if(current_thread-&gt;cpu == 0)</div><div class='del'>-		timer_irq(regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __init timer_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	user_time_init();</div><div class='del'>-	err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL);</div><div class='del'>-	if(err != 0)</div><div class='del'>-		printk(KERN_ERR "timer_init : request_irq failed - "</div><div class='del'>-		       "errno = %d\n", -err);</div><div class='del'>-	timer_irq_inited = 1;</div><div class='del'>-	return(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-arch_initcall(timer_init);</div><div class='head'>diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap.c<br/>index 02f6d4d8dc3a..ac70fa5a2e2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/trap_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/trap_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/trap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/trap.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'> #include "os.h"</div><div class='ctx'> </div><div class='ctx'> /* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */</div><div class='del'>-int handle_page_fault(unsigned long address, unsigned long ip, </div><div class='add'>+int handle_page_fault(unsigned long address, unsigned long ip,</div><div class='ctx'> 		      int is_write, int is_user, int *code_out)</div><div class='ctx'> {</div><div class='ctx'> 	struct mm_struct *mm = current-&gt;mm;</div><div class='hunk'>@@ -55,20 +55,20 @@ int handle_page_fault(unsigned long address, unsigned long ip,</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> 	vma = find_vma(mm, address);</div><div class='del'>-	if(!vma) </div><div class='add'>+	if(!vma)</div><div class='ctx'> 		goto out;</div><div class='del'>-	else if(vma-&gt;vm_start &lt;= address) </div><div class='add'>+	else if(vma-&gt;vm_start &lt;= address)</div><div class='ctx'> 		goto good_area;</div><div class='del'>-	else if(!(vma-&gt;vm_flags &amp; VM_GROWSDOWN)) </div><div class='add'>+	else if(!(vma-&gt;vm_flags &amp; VM_GROWSDOWN))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	else if(is_user &amp;&amp; !ARCH_IS_STACKGROW(address))</div><div class='ctx'> 		goto out;</div><div class='del'>-	else if(expand_stack(vma, address)) </div><div class='add'>+	else if(expand_stack(vma, address))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> good_area:</div><div class='ctx'> 	*code_out = SEGV_ACCERR;</div><div class='del'>-	if(is_write &amp;&amp; !(vma-&gt;vm_flags &amp; VM_WRITE)) </div><div class='add'>+	if(is_write &amp;&amp; !(vma-&gt;vm_flags &amp; VM_WRITE))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't require VM_READ|VM_EXEC for write faults! */</div><div class='hunk'>@@ -184,14 +184,14 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, void *sc)</div><div class='ctx'> 	else if(catcher != NULL){</div><div class='ctx'> 		current-&gt;thread.fault_addr = (void *) address;</div><div class='ctx'> 		do_longjmp(catcher, 1);</div><div class='del'>-	} </div><div class='add'>+	}</div><div class='ctx'> 	else if(current-&gt;thread.fault_addr != NULL)</div><div class='ctx'> 		panic("fault_addr set but no fault catcher");</div><div class='ctx'>         else if(!is_user &amp;&amp; arch_fixup(ip, sc))</div><div class='ctx'> 		return(0);</div><div class='ctx'> </div><div class='del'>- 	if(!is_user) </div><div class='del'>-		panic("Kernel mode fault at addr 0x%lx, ip 0x%lx", </div><div class='add'>+ 	if(!is_user)</div><div class='add'>+		panic("Kernel mode fault at addr 0x%lx, ip 0x%lx",</div><div class='ctx'> 		      address, ip);</div><div class='ctx'> </div><div class='ctx'> 	if (err == -EACCES) {</div><div class='head'>diff --git a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c<br/>index 5c1e4cc1c049..ad66df17d9d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/exec_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/exec_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/exec_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/tt/exec_kern.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> static int exec_tramp(void *sig_stack)</div><div class='ctx'> {</div><div class='ctx'> 	init_new_thread_stack(sig_stack, NULL);</div><div class='del'>-	init_new_thread_signals(1);</div><div class='add'>+	init_new_thread_signals();</div><div class='ctx'> 	os_stop_process(os_getpid());</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/kernel/tt/mem.c b/arch/um/kernel/tt/mem.c<br/>index bcb8796c3cb1..84a23b14f770 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/tt/mem.c</a></div><div class='hunk'>@@ -24,22 +24,13 @@ void before_mem_tt(unsigned long brk_start)</div><div class='ctx'> #define SIZE ((CONFIG_NEST_LEVEL + CONFIG_KERNEL_HALF_GIGS) * 0x20000000)</div><div class='ctx'> #define START (CONFIG_TOP_ADDR - SIZE)</div><div class='ctx'> </div><div class='del'>-unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out, </div><div class='del'>-				unsigned long *task_size_out)</div><div class='add'>+unsigned long set_task_sizes_tt(unsigned long *task_size_out)</div><div class='ctx'> {</div><div class='add'>+	unsigned long host_task_size;</div><div class='add'>+</div><div class='ctx'> 	/* Round up to the nearest 4M */</div><div class='del'>-	*host_size_out = ROUND_4M((unsigned long) &amp;arg);</div><div class='add'>+	host_task_size = ROUND_4M((unsigned long) &amp;host_task_size);</div><div class='ctx'> 	*task_size_out = START;</div><div class='del'>-	return(START);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='add'>+	return host_task_size;</div><div class='add'>+}</div><div class='head'>diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c<br/>index a9c1443fc548..1e86f0bfef72 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/process_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/process_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/process_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/tt/process_kern.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ void suspend_new_thread(int fd)</div><div class='ctx'> 		panic("read failed in suspend_new_thread, err = %d", -err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void schedule_tail(task_t *prev);</div><div class='add'>+void schedule_tail(struct task_struct *prev);</div><div class='ctx'> </div><div class='ctx'> static void new_thread_handler(int sig)</div><div class='ctx'> {</div><div class='hunk'>@@ -142,7 +142,7 @@ static void new_thread_handler(int sig)</div><div class='ctx'> 		schedule_tail(current-&gt;thread.prev_sched);</div><div class='ctx'> 	current-&gt;thread.prev_sched = NULL;</div><div class='ctx'> </div><div class='del'>-	init_new_thread_signals(1);</div><div class='add'>+	init_new_thread_signals();</div><div class='ctx'> 	enable_timer();</div><div class='ctx'> 	free_page(current-&gt;thread.temp_stack);</div><div class='ctx'> 	set_cmdline("(kernel thread)");</div><div class='head'>diff --git a/arch/um/kernel/tt/syscall_kern.c b/arch/um/kernel/tt/syscall_kern.c<br/>index 3fda9a03c59a..293caa6d0c2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/syscall_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/syscall_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/syscall_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/tt/syscall_kern.c</a></div><div class='hunk'>@@ -21,18 +21,11 @@ void syscall_handler_tt(int sig, struct pt_regs *regs)</div><div class='ctx'> 	void *sc;</div><div class='ctx'> 	long result;</div><div class='ctx'> 	int syscall;</div><div class='del'>-#ifdef CONFIG_SYSCALL_DEBUG</div><div class='del'>-	int index;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	sc = UPT_SC(&amp;regs-&gt;regs);</div><div class='ctx'> 	SC_START_SYSCALL(sc);</div><div class='ctx'> </div><div class='ctx'> 	syscall = UPT_SYSCALL_NR(&amp;regs-&gt;regs);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCALL_DEBUG</div><div class='del'>-	index = record_syscall_start(syscall);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	syscall_trace(&amp;regs-&gt;regs, 0);</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;thread.nsyscalls++;</div><div class='hunk'>@@ -50,7 +43,4 @@ void syscall_handler_tt(int sig, struct pt_regs *regs)</div><div class='ctx'> 	SC_SET_SYSCALL_RETURN(sc, result);</div><div class='ctx'> </div><div class='ctx'> 	syscall_trace(&amp;regs-&gt;regs, 1);</div><div class='del'>-#ifdef CONFIG_SYSCALL_DEBUG</div><div class='del'>-  	record_syscall_end(index, result);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c<br/>index 71daae24e48a..9882342206ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/tracer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/tt/tracer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/tt/tracer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/tt/tracer.c</a></div><div class='hunk'>@@ -188,10 +188,7 @@ int tracer(int (*init_proc)(void *), void *sp)</div><div class='ctx'> 	int status, pid = 0, sig = 0, cont_type, tracing = 0, op = 0;</div><div class='ctx'> 	int proc_id = 0, n, err, old_tracing = 0, strace = 0;</div><div class='ctx'> 	int local_using_sysemu = 0;</div><div class='del'>-#ifdef UML_CONFIG_SYSCALL_DEBUG</div><div class='del'>-	unsigned long eip = 0;</div><div class='del'>-	int last_index;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	signal(SIGPIPE, SIG_IGN);</div><div class='ctx'> 	setup_tracer_winch();</div><div class='ctx'> 	tracing_pid = os_getpid();</div><div class='hunk'>@@ -282,23 +279,6 @@ int tracer(int (*init_proc)(void *), void *sp)</div><div class='ctx'> 		else if(WIFSTOPPED(status)){</div><div class='ctx'> 			proc_id = pid_to_processor_id(pid);</div><div class='ctx'> 			sig = WSTOPSIG(status);</div><div class='del'>-#ifdef UML_CONFIG_SYSCALL_DEBUG</div><div class='del'>-			if(signal_index[proc_id] == 1024){</div><div class='del'>-				signal_index[proc_id] = 0;</div><div class='del'>-				last_index = 1023;</div><div class='del'>-			}</div><div class='del'>-			else last_index = signal_index[proc_id] - 1;</div><div class='del'>-			if(((sig == SIGPROF) || (sig == SIGVTALRM) ||</div><div class='del'>-			    (sig == SIGALRM)) &amp;&amp;</div><div class='del'>-			   (signal_record[proc_id][last_index].signal == sig)&amp;&amp;</div><div class='del'>-			   (signal_record[proc_id][last_index].pid == pid))</div><div class='del'>-				signal_index[proc_id] = last_index;</div><div class='del'>-			signal_record[proc_id][signal_index[proc_id]].pid = pid;</div><div class='del'>-			gettimeofday(&amp;signal_record[proc_id][signal_index[proc_id]].time, NULL);</div><div class='del'>-			eip = ptrace(PTRACE_PEEKUSR, pid, PT_IP_OFFSET, 0);</div><div class='del'>-			signal_record[proc_id][signal_index[proc_id]].addr = eip;</div><div class='del'>-			signal_record[proc_id][signal_index[proc_id]++].signal = sig;</div><div class='del'>-#endif</div><div class='ctx'> 			if(proc_id == -1){</div><div class='ctx'> 				sleeping_process_signal(pid, sig);</div><div class='ctx'> 				continue;</div><div class='head'>diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c<br/>index 7d51dd7201c3..7896cf98232d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/um_arch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/um_arch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/um_arch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/um_arch.c</a></div><div class='hunk'>@@ -330,6 +330,8 @@ EXPORT_SYMBOL(end_iomem);</div><div class='ctx'> </div><div class='ctx'> #define MIN_VMALLOC (32 * 1024 * 1024)</div><div class='ctx'> </div><div class='add'>+extern char __binary_start;</div><div class='add'>+</div><div class='ctx'> int linux_main(int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long avail, diff;</div><div class='hunk'>@@ -374,8 +376,9 @@ int linux_main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	printf("UML running in %s mode\n", mode);</div><div class='ctx'> </div><div class='del'>-	uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0,</div><div class='del'>-				     &amp;host_task_size, &amp;task_size);</div><div class='add'>+	uml_start = (unsigned long) &amp;__binary_start;</div><div class='add'>+	host_task_size = CHOOSE_MODE_PROC(set_task_sizes_tt,</div><div class='add'>+					  set_task_sizes_skas, &amp;task_size);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'>  	 * Setting up handlers to 'sig_info' struct</div><div class='hunk'>@@ -395,7 +398,7 @@ int linux_main(int argc, char **argv)</div><div class='ctx'> 		physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&amp;_end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uml_physmem = uml_start;</div><div class='add'>+	uml_physmem = uml_start &amp; PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve up to 4M after the current brk */</div><div class='ctx'> 	uml_reserved = ROUND_4M(brk_start) + (1 &lt;&lt; 22);</div><div class='hunk'>@@ -495,6 +498,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SMP</div><div class='ctx'> void alternatives_smp_module_add(struct module *mod, char *name,</div><div class='ctx'> 				 void *locks, void *locks_end,</div><div class='ctx'> 				 void *text,  void *text_end)</div><div class='hunk'>@@ -504,3 +508,4 @@ void alternatives_smp_module_add(struct module *mod, char *name,</div><div class='ctx'> void alternatives_smp_module_del(struct module *mod)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S<br/>index af11915ce0a8..8eca47a6ff08 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/uml.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/uml.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/uml.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/uml.lds.S</a></div><div class='hunk'>@@ -7,13 +7,16 @@ jiffies = jiffies_64;</div><div class='ctx'> </div><div class='ctx'> SECTIONS</div><div class='ctx'> {</div><div class='del'>-  /*This must contain the right address - not quite the default ELF one.*/</div><div class='add'>+  /* This must contain the right address - not quite the default ELF one.*/</div><div class='ctx'>   PROVIDE (__executable_start = START);</div><div class='del'>-  . = START + SIZEOF_HEADERS;</div><div class='add'>+  /* Static binaries stick stuff here, like the sigreturn trampoline,</div><div class='add'>+   * invisibly to objdump.  So, just make __binary_start equal to the very</div><div class='add'>+   * beginning of the executable, and if there are unmapped pages after this,</div><div class='add'>+   * they are forever unusable.</div><div class='add'>+   */</div><div class='add'>+  __binary_start = START;</div><div class='ctx'> </div><div class='del'>-  /* Used in arch/um/kernel/mem.c. Any memory between START and __binary_start</div><div class='del'>-   * is remapped.*/</div><div class='del'>-  __binary_start = .;</div><div class='add'>+  . = START + SIZEOF_HEADERS;</div><div class='ctx'> </div><div class='ctx'> #ifdef MODE_TT</div><div class='ctx'>   .remap_data : { UNMAP_PATH (.data .bss) }</div><div class='head'>diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S<br/>index 1660a769674b..f8aeb448aab6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef CONFIG_LD_SCRIPT_STATIC</div><div class='ctx'> #include "uml.lds.S"</div><div class='ctx'> #else</div><div class='head'>diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c<br/>index 09251338d99e..189fa677085a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/file.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include "os.h"</div><div class='ctx'> #include "user.h"</div><div class='ctx'> #include "kern_util.h"</div><div class='add'>+#include "user_util.h"</div><div class='ctx'> </div><div class='ctx'> static void copy_stat(struct uml_stat *dst, struct stat64 *src)</div><div class='ctx'> {</div><div class='hunk'>@@ -42,16 +43,13 @@ int os_stat_fd(const int fd, struct uml_stat *ubuf)</div><div class='ctx'> 	struct stat64 sbuf;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		err = fstat64(fd, &amp;sbuf);</div><div class='del'>-	} while((err &lt; 0) &amp;&amp; (errno == EINTR)) ;</div><div class='del'>-</div><div class='add'>+	CATCH_EINTR(err = fstat64(fd, &amp;sbuf));</div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	if(ubuf != NULL)</div><div class='ctx'> 		copy_stat(ubuf, &amp;sbuf);</div><div class='del'>-	return(err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_stat_file(const char *file_name, struct uml_stat *ubuf)</div><div class='hunk'>@@ -64,11 +62,11 @@ int os_stat_file(const char *file_name, struct uml_stat *ubuf)</div><div class='ctx'> 	} while((err &lt; 0) &amp;&amp; (errno == EINTR)) ;</div><div class='ctx'> </div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	if(ubuf != NULL)</div><div class='ctx'> 		copy_stat(ubuf, &amp;sbuf);</div><div class='del'>-	return(err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_access(const char* file, int mode)</div><div class='hunk'>@@ -80,9 +78,9 @@ int os_access(const char* file, int mode)</div><div class='ctx'> </div><div class='ctx'> 	err = access(file, amode);</div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void os_print_error(int error, const char* str)</div><div class='hunk'>@@ -99,9 +97,9 @@ int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> 	err = ioctl(fd, cmd, arg);</div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_window_size(int fd, int *rows, int *cols)</div><div class='hunk'>@@ -109,12 +107,12 @@ int os_window_size(int fd, int *rows, int *cols)</div><div class='ctx'> 	struct winsize size;</div><div class='ctx'> </div><div class='ctx'> 	if(ioctl(fd, TIOCGWINSZ, &amp;size) &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	*rows = size.ws_row;</div><div class='ctx'> 	*cols = size.ws_col;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_new_tty_pgrp(int fd, int pid)</div><div class='hunk'>@@ -125,16 +123,16 @@ int os_new_tty_pgrp(int fd, int pid)</div><div class='ctx'> 	if(tcsetpgrp(fd, pid) &lt; 0)</div><div class='ctx'> 		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* FIXME: ensure namebuf in os_get_if_name is big enough */</div><div class='ctx'> int os_get_ifname(int fd, char* namebuf)</div><div class='ctx'> {</div><div class='ctx'> 	if(ioctl(fd, SIOCGIFNAME, namebuf) &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_set_slip(int fd)</div><div class='hunk'>@@ -149,7 +147,7 @@ int os_set_slip(int fd)</div><div class='ctx'> 	if(ioctl(fd, SIOCSIFENCAP, &amp;sencap) &lt; 0)</div><div class='ctx'> 		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_set_owner(int fd, int pid)</div><div class='hunk'>@@ -158,10 +156,10 @@ int os_set_owner(int fd, int pid)</div><div class='ctx'> 		int save_errno = errno;</div><div class='ctx'> </div><div class='ctx'> 		if(fcntl(fd, F_GETOWN, 0) != pid)</div><div class='del'>-			return(-save_errno);</div><div class='add'>+			return -save_errno;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* FIXME? moved wholesale from sigio_user.c to get fcntls out of that file */</div><div class='hunk'>@@ -192,9 +190,9 @@ int os_mode_fd(int fd, int mode)</div><div class='ctx'> 	} while((err &lt; 0) &amp;&amp; (errno==EINTR)) ;</div><div class='ctx'> </div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_file_type(char *file)</div><div class='hunk'>@@ -204,15 +202,21 @@ int os_file_type(char *file)</div><div class='ctx'> </div><div class='ctx'> 	err = os_stat_file(file, &amp;buf);</div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(err);</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if(S_ISDIR(buf.ust_mode)) return(OS_TYPE_DIR);</div><div class='del'>-	else if(S_ISLNK(buf.ust_mode)) return(OS_TYPE_SYMLINK);</div><div class='del'>-	else if(S_ISCHR(buf.ust_mode)) return(OS_TYPE_CHARDEV);</div><div class='del'>-	else if(S_ISBLK(buf.ust_mode)) return(OS_TYPE_BLOCKDEV);</div><div class='del'>-	else if(S_ISFIFO(buf.ust_mode)) return(OS_TYPE_FIFO);</div><div class='del'>-	else if(S_ISSOCK(buf.ust_mode)) return(OS_TYPE_SOCK);</div><div class='del'>-	else return(OS_TYPE_FILE);</div><div class='add'>+	if(S_ISDIR(buf.ust_mode))</div><div class='add'>+		return OS_TYPE_DIR;</div><div class='add'>+	else if(S_ISLNK(buf.ust_mode))</div><div class='add'>+		return OS_TYPE_SYMLINK;</div><div class='add'>+	else if(S_ISCHR(buf.ust_mode))</div><div class='add'>+		return OS_TYPE_CHARDEV;</div><div class='add'>+	else if(S_ISBLK(buf.ust_mode))</div><div class='add'>+		return OS_TYPE_BLOCKDEV;</div><div class='add'>+	else if(S_ISFIFO(buf.ust_mode))</div><div class='add'>+		return OS_TYPE_FIFO;</div><div class='add'>+	else if(S_ISSOCK(buf.ust_mode))</div><div class='add'>+		return OS_TYPE_SOCK;</div><div class='add'>+	else return OS_TYPE_FILE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_file_mode(char *file, struct openflags *mode_out)</div><div class='hunk'>@@ -302,8 +306,8 @@ int os_seek_file(int fd, __u64 offset)</div><div class='ctx'> </div><div class='ctx'> 	actual = lseek64(fd, offset, SEEK_SET);</div><div class='ctx'> 	if(actual != offset)</div><div class='del'>-		return(-errno);</div><div class='del'>-	return(0);</div><div class='add'>+		return -errno;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fault_buffer(void *start, int len,</div><div class='hunk'>@@ -314,13 +318,13 @@ static int fault_buffer(void *start, int len,</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i &lt; len; i += page){</div><div class='ctx'> 		if((*copy_proc)(start + i, &amp;c, sizeof(c)))</div><div class='del'>-			return(-EFAULT);</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	if((len % page) != 0){</div><div class='ctx'> 		if((*copy_proc)(start + len - 1, &amp;c, sizeof(c)))</div><div class='del'>-			return(-EFAULT);</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int file_io(int fd, void *buf, int len,</div><div class='hunk'>@@ -334,26 +338,26 @@ static int file_io(int fd, void *buf, int len,</div><div class='ctx'> 		if((n &lt; 0) &amp;&amp; (errno == EFAULT)){</div><div class='ctx'> 			err = fault_buffer(buf, len, copy_user_proc);</div><div class='ctx'> 			if(err)</div><div class='del'>-				return(err);</div><div class='add'>+				return err;</div><div class='ctx'> 			n = (*io_proc)(fd, buf, len);</div><div class='ctx'> 		}</div><div class='ctx'> 	} while((n &lt; 0) &amp;&amp; (errno == EINTR));</div><div class='ctx'> </div><div class='ctx'> 	if(n &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='del'>-	return(n);</div><div class='add'>+		return -errno;</div><div class='add'>+	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_read_file(int fd, void *buf, int len)</div><div class='ctx'> {</div><div class='del'>-	return(file_io(fd, buf, len, (int (*)(int, void *, int)) read,</div><div class='del'>-		       copy_from_user_proc));</div><div class='add'>+	return file_io(fd, buf, len, (int (*)(int, void *, int)) read,</div><div class='add'>+		       copy_from_user_proc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_write_file(int fd, const void *buf, int len)</div><div class='ctx'> {</div><div class='del'>-	return(file_io(fd, (void *) buf, len,</div><div class='del'>-		       (int (*)(int, void *, int)) write, copy_to_user_proc));</div><div class='add'>+	return file_io(fd, (void *) buf, len,</div><div class='add'>+		       (int (*)(int, void *, int)) write, copy_to_user_proc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_file_size(char *file, unsigned long long *size_out)</div><div class='hunk'>@@ -398,11 +402,11 @@ int os_file_modtime(char *file, unsigned long *modtime)</div><div class='ctx'> 	err = os_stat_file(file, &amp;buf);</div><div class='ctx'> 	if(err &lt; 0){</div><div class='ctx'> 		printk("Couldn't stat \"%s\" : err = %d\n", file, -err);</div><div class='del'>-		return(err);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*modtime = buf.ust_mtime;</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_get_exec_close(int fd, int* close_on_exec)</div><div class='hunk'>@@ -455,7 +459,7 @@ int os_pipe(int *fds, int stream, int close_on_exec)</div><div class='ctx'> 	if(err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>  error:</div><div class='ctx'> 	printk("os_pipe : Setting FD_CLOEXEC failed, err = %d\n", -err);</div><div class='hunk'>@@ -486,12 +490,12 @@ int os_set_fd_async(int fd, int owner)</div><div class='ctx'> 	   (fcntl(fd, F_SETOWN, owner) &lt; 0)){</div><div class='ctx'> 		err = -errno;</div><div class='ctx'> 		printk("os_set_fd_async : Failed to fcntl F_SETOWN "</div><div class='del'>-		       "(or F_SETSIG) fd %d to pid %d, errno = %d\n", fd, </div><div class='add'>+		       "(or F_SETSIG) fd %d to pid %d, errno = %d\n", fd,</div><div class='ctx'> 		       owner, errno);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_clear_fd_async(int fd)</div><div class='hunk'>@@ -500,8 +504,8 @@ int os_clear_fd_async(int fd)</div><div class='ctx'> </div><div class='ctx'> 	flags &amp;= ~(O_ASYNC | O_NONBLOCK);</div><div class='ctx'> 	if(fcntl(fd, F_SETFL, flags) &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='del'>-	return(0);</div><div class='add'>+		return -errno;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_set_fd_block(int fd, int blocking)</div><div class='hunk'>@@ -516,7 +520,7 @@ int os_set_fd_block(int fd, int blocking)</div><div class='ctx'> 	if(fcntl(fd, F_SETFL, flags) &lt; 0)</div><div class='ctx'> 		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_accept_connection(int fd)</div><div class='hunk'>@@ -524,9 +528,9 @@ int os_accept_connection(int fd)</div><div class='ctx'> 	int new;</div><div class='ctx'> </div><div class='ctx'> 	new = accept(fd, NULL, 0);</div><div class='del'>-	if(new &lt; 0) </div><div class='del'>-		return(-errno);</div><div class='del'>-	return(new);</div><div class='add'>+	if(new &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+	return new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef SHUT_RD</div><div class='hunk'>@@ -550,12 +554,12 @@ int os_shutdown_socket(int fd, int r, int w)</div><div class='ctx'> 	else if(w) what = SHUT_WR;</div><div class='ctx'> 	else {</div><div class='ctx'> 		printk("os_shutdown_socket : neither r or w was set\n");</div><div class='del'>-		return(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = shutdown(fd, what);</div><div class='ctx'> 	if(err &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='del'>-	return(0);</div><div class='add'>+		return -errno;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_rcv_fd(int fd, int *helper_pid_out)</div><div class='hunk'>@@ -578,7 +582,7 @@ int os_rcv_fd(int fd, int *helper_pid_out)</div><div class='ctx'> </div><div class='ctx'> 	n = recvmsg(fd, &amp;msg, 0);</div><div class='ctx'> 	if(n &lt; 0)</div><div class='del'>-		return(-errno);</div><div class='add'>+		return -errno;</div><div class='ctx'> </div><div class='ctx'> 	else if(n != sizeof(iov.iov_len))</div><div class='ctx'> 		*helper_pid_out = -1;</div><div class='hunk'>@@ -586,16 +590,16 @@ int os_rcv_fd(int fd, int *helper_pid_out)</div><div class='ctx'> 	cmsg = CMSG_FIRSTHDR(&amp;msg);</div><div class='ctx'> 	if(cmsg == NULL){</div><div class='ctx'> 		printk("rcv_fd didn't receive anything, error = %d\n", errno);</div><div class='del'>-		return(-1);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	if((cmsg-&gt;cmsg_level != SOL_SOCKET) || </div><div class='add'>+	if((cmsg-&gt;cmsg_level != SOL_SOCKET) ||</div><div class='ctx'> 	   (cmsg-&gt;cmsg_type != SCM_RIGHTS)){</div><div class='ctx'> 		printk("rcv_fd didn't receive a descriptor\n");</div><div class='del'>-		return(-1);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	new = ((int *) CMSG_DATA(cmsg))[0];</div><div class='del'>-	return(new);</div><div class='add'>+	return new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int os_create_unix_socket(char *file, int len, int close_on_exec)</div><div class='hunk'>@@ -623,7 +627,7 @@ int os_create_unix_socket(char *file, int len, int close_on_exec)</div><div class='ctx'> 	if(err &lt; 0)</div><div class='ctx'> 		return -errno;</div><div class='ctx'> </div><div class='del'>-	return(sock);</div><div class='add'>+	return sock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void os_flush_stdout(void)</div><div class='hunk'>@@ -654,16 +658,5 @@ int os_lock_file(int fd, int excl)</div><div class='ctx'> 	printk("F_SETLK failed, file already locked by pid %d\n", lock.l_pid);</div><div class='ctx'> 	err = save;</div><div class='ctx'>  out:</div><div class='del'>-	return(err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-file-style: "linux"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c<br/>index 3788d4568d33..7555bf9c33d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/irq.c</a></div><div class='hunk'>@@ -52,11 +52,6 @@ int os_waiting_for_events(struct irq_fd *active_fds)</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int os_isatty(int fd)</div><div class='del'>-{</div><div class='del'>-	return isatty(fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int os_create_pollfd(int fd, int events, void *tmp_pfd, int size_tmpfds)</div><div class='ctx'> {</div><div class='ctx'> 	if (pollfds_num == pollfds_size) {</div><div class='hunk'>@@ -142,17 +137,14 @@ void os_set_ioignore(void)</div><div class='ctx'> </div><div class='ctx'> void init_irq_signals(int on_sigstack)</div><div class='ctx'> {</div><div class='del'>-	__sighandler_t h;</div><div class='ctx'> 	int flags;</div><div class='ctx'> </div><div class='ctx'> 	flags = on_sigstack ? SA_ONSTACK : 0;</div><div class='del'>-	if (timer_irq_inited)</div><div class='del'>-		h = (__sighandler_t)alarm_handler;</div><div class='del'>-	else</div><div class='del'>-		h = boot_timer_handler;</div><div class='ctx'> </div><div class='del'>-	set_handler(SIGVTALRM, h, flags | SA_RESTART,</div><div class='del'>-		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, -1);</div><div class='add'>+	set_handler(SIGVTALRM, (__sighandler_t) alarm_handler,</div><div class='add'>+		    flags | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, -1);</div><div class='add'>+	set_handler(SIGALRM, (__sighandler_t) alarm_handler,</div><div class='add'>+		    flags | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, -1);</div><div class='ctx'> 	set_handler(SIGIO, (__sighandler_t) sig_handler, flags | SA_RESTART,</div><div class='ctx'> 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='ctx'> 	signal(SIGWINCH, SIG_IGN);</div><div class='head'>diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c<br/>index 3a0ac38e978b..90912aaca7aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/main.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static __init void do_uml_initcalls(void)</div><div class='ctx'> 	initcall_t *call;</div><div class='ctx'> </div><div class='ctx'> 	call = &amp;__uml_initcall_start;</div><div class='del'>-	while (call &lt; &amp;__uml_initcall_end){;</div><div class='add'>+	while (call &lt; &amp;__uml_initcall_end){</div><div class='ctx'> 		(*call)();</div><div class='ctx'> 		call++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c<br/>index c6432e729241..560c8063c77c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/mem.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static void __init find_tempdir(void)</div><div class='ctx'>  */</div><div class='ctx'> static int next(int fd, char *buf, int size, char c)</div><div class='ctx'> {</div><div class='del'>-	int n;</div><div class='add'>+	int n, len;</div><div class='ctx'> 	char *ptr;</div><div class='ctx'> </div><div class='ctx'> 	while((ptr = strchr(buf, c)) == NULL){</div><div class='hunk'>@@ -69,7 +69,17 @@ static int next(int fd, char *buf, int size, char c)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ptr++;</div><div class='del'>-	memmove(buf, ptr, strlen(ptr) + 1);</div><div class='add'>+	len = strlen(ptr);</div><div class='add'>+	memmove(buf, ptr, len + 1);</div><div class='add'>+</div><div class='add'>+	/* Refill the buffer so that if there's a partial string that we care</div><div class='add'>+	 * about, it will be completed, and we can recognize it.</div><div class='add'>+	 */</div><div class='add'>+	n = read(fd, &amp;buf[len], size - len - 1);</div><div class='add'>+	if(n &lt; 0)</div><div class='add'>+		return -errno;</div><div class='add'>+</div><div class='add'>+	buf[len + n] = '\0';</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -200,8 +210,11 @@ int create_tmp_file(unsigned long long len)</div><div class='ctx'> 		exit(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        if (lseek64(fd, len, SEEK_SET) &lt; 0) {</div><div class='del'>- 		perror("os_seek_file");</div><div class='add'>+	/* Seek to len - 1 because writing a character there will</div><div class='add'>+	 * increase the file size by one byte, to the desired length.</div><div class='add'>+	 */</div><div class='add'>+	if (lseek64(fd, len - 1, SEEK_SET) &lt; 0) {</div><div class='add'>+		perror("os_seek_file");</div><div class='ctx'> 		exit(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c<br/>index 233be2f4f8cb..b98d3ca2cd1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/process.c</a></div><div class='hunk'>@@ -250,36 +250,35 @@ void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))</div><div class='ctx'> 	if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void init_new_thread_signals(int altstack)</div><div class='add'>+void init_new_thread_signals(void)</div><div class='ctx'> {</div><div class='del'>-	int flags = altstack ? SA_ONSTACK : 0;</div><div class='del'>-</div><div class='del'>-	set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags,</div><div class='add'>+	set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK,</div><div class='ctx'> 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='del'>-	set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags,</div><div class='add'>+	set_handler(SIGTRAP, (__sighandler_t) sig_handler, SA_ONSTACK,</div><div class='ctx'> 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='del'>-	set_handler(SIGFPE, (__sighandler_t) sig_handler, flags,</div><div class='add'>+	set_handler(SIGFPE, (__sighandler_t) sig_handler, SA_ONSTACK,</div><div class='ctx'> 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='del'>-	set_handler(SIGILL, (__sighandler_t) sig_handler, flags,</div><div class='add'>+	set_handler(SIGILL, (__sighandler_t) sig_handler, SA_ONSTACK,</div><div class='ctx'> 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='del'>-	set_handler(SIGBUS, (__sighandler_t) sig_handler, flags,</div><div class='add'>+	set_handler(SIGBUS, (__sighandler_t) sig_handler, SA_ONSTACK,</div><div class='ctx'> 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='ctx'> 	set_handler(SIGUSR2, (__sighandler_t) sig_handler,</div><div class='del'>-		    flags, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);</div><div class='add'>+		    SA_ONSTACK, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM,</div><div class='add'>+		    -1);</div><div class='ctx'> 	signal(SIGHUP, SIG_IGN);</div><div class='ctx'> </div><div class='del'>-	init_irq_signals(altstack);</div><div class='add'>+	init_irq_signals(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	jmp_buf buf;</div><div class='del'>-	int n, enable;</div><div class='add'>+	int n;</div><div class='ctx'> </div><div class='ctx'> 	*jmp_ptr = &amp;buf;</div><div class='del'>-	n = UML_SETJMP(&amp;buf, enable);</div><div class='add'>+	n = UML_SETJMP(&amp;buf);</div><div class='ctx'> 	if(n != 0)</div><div class='del'>-		return(n);</div><div class='add'>+		return n;</div><div class='ctx'> 	(*fn)(arg);</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c<br/>index 00e9388e947a..0ecac563c7b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/sigio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/sigio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/sigio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/sigio.c</a></div><div class='hunk'>@@ -43,13 +43,13 @@ struct pollfds {</div><div class='ctx'> /* Protected by sigio_lock().  Used by the sigio thread, but the UML thread</div><div class='ctx'>  * synchronizes with it.</div><div class='ctx'>  */</div><div class='del'>-struct pollfds current_poll = {</div><div class='add'>+static struct pollfds current_poll = {</div><div class='ctx'> 	.poll  		= NULL,</div><div class='ctx'> 	.size 		= 0,</div><div class='ctx'> 	.used 		= 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct pollfds next_poll = {</div><div class='add'>+static struct pollfds next_poll = {</div><div class='ctx'> 	.poll  		= NULL,</div><div class='ctx'> 	.size 		= 0,</div><div class='ctx'> 	.used 		= 0</div><div class='hunk'>@@ -156,7 +156,7 @@ static void update_thread(void)</div><div class='ctx'> 	set_signals(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int add_sigio_fd(int fd, int read)</div><div class='add'>+static int add_sigio_fd(int fd, int read)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0, i, n, events;</div><div class='ctx'> </div><div class='hunk'>@@ -191,6 +191,13 @@ int ignore_sigio_fd(int fd)</div><div class='ctx'> 	struct pollfd *p;</div><div class='ctx'> 	int err = 0, i, n = 0;</div><div class='ctx'> </div><div class='add'>+	/* This is called from exitcalls elsewhere in UML - if</div><div class='add'>+	 * sigio_cleanup has already run, then update_thread will hang</div><div class='add'>+	 * or fail because the thread is no longer running.</div><div class='add'>+	 */</div><div class='add'>+	if(write_sigio_pid == -1)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	sigio_lock();</div><div class='ctx'> 	for(i = 0; i &lt; current_poll.used; i++){</div><div class='ctx'> 		if(current_poll.poll[i].fd == fd) break;</div><div class='hunk'>@@ -215,7 +222,7 @@ int ignore_sigio_fd(int fd)</div><div class='ctx'> 	update_thread();</div><div class='ctx'>  out:</div><div class='ctx'> 	sigio_unlock();</div><div class='del'>-	return(err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pollfd *setup_initial_poll(int fd)</div><div class='hunk'>@@ -233,7 +240,7 @@ static struct pollfd *setup_initial_poll(int fd)</div><div class='ctx'> 	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void write_sigio_workaround(void)</div><div class='add'>+static void write_sigio_workaround(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long stack;</div><div class='ctx'> 	struct pollfd *p;</div><div class='hunk'>@@ -314,10 +321,24 @@ out_close1:</div><div class='ctx'> 	close(l_write_sigio_fds[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void sigio_cleanup(void)</div><div class='add'>+void maybe_sigio_broken(int fd, int read)</div><div class='add'>+{</div><div class='add'>+	if(!isatty(fd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if((read || pty_output_sigio) &amp;&amp; (!read || pty_close_sigio))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	write_sigio_workaround();</div><div class='add'>+	add_sigio_fd(fd, read);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sigio_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	if(write_sigio_pid != -1){</div><div class='ctx'> 		os_kill_process(write_sigio_pid, 1);</div><div class='ctx'> 		write_sigio_pid = -1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+__uml_exitcall(sigio_cleanup);</div><div class='head'>diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c<br/>index f11b3124a0c8..60e4faedf254 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/signal.c</a></div><div class='hunk'>@@ -106,29 +106,6 @@ void alarm_handler(ARCH_SIGHDLR_PARAM)</div><div class='ctx'> 	set_signals(enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void do_boot_timer_handler(struct sigcontext * sc);</div><div class='del'>-</div><div class='del'>-void boot_timer_handler(ARCH_SIGHDLR_PARAM)</div><div class='del'>-{</div><div class='del'>-	struct sigcontext *sc;</div><div class='del'>-	int enabled;</div><div class='del'>-</div><div class='del'>-	ARCH_GET_SIGCONTEXT(sc, sig);</div><div class='del'>-</div><div class='del'>-	enabled = signals_enabled;</div><div class='del'>-	if(!enabled){</div><div class='del'>-		if(sig == SIGVTALRM)</div><div class='del'>-			pending |= SIGVTALRM_MASK;</div><div class='del'>-		else pending |= SIGALRM_MASK;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	block_signals();</div><div class='del'>-</div><div class='del'>-	do_boot_timer_handler(sc);</div><div class='del'>-	set_signals(enabled);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void set_sigstack(void *sig_stack, int size)</div><div class='ctx'> {</div><div class='ctx'> 	stack_t stack = ((stack_t) { .ss_flags	= 0,</div><div class='head'>diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c<br/>index bd89c6b99d5d..7baf90fda58b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/skas/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/skas/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/skas/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/skas/process.c</a></div><div class='hunk'>@@ -159,7 +159,7 @@ static int userspace_tramp(void *stack)</div><div class='ctx'> </div><div class='ctx'> 	ptrace(PTRACE_TRACEME, 0, 0, 0);</div><div class='ctx'> </div><div class='del'>-	init_new_thread_signals(1);</div><div class='add'>+	init_new_thread_signals();</div><div class='ctx'> 	enable_timer();</div><div class='ctx'> </div><div class='ctx'> 	if(!proc_mm){</div><div class='hunk'>@@ -435,7 +435,6 @@ void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	jmp_buf switch_buf, fork_buf;</div><div class='del'>-	int enable;</div><div class='ctx'> </div><div class='ctx'> 	*switch_buf_ptr = &amp;switch_buf;</div><div class='ctx'> 	*fork_buf_ptr = &amp;fork_buf;</div><div class='hunk'>@@ -450,7 +449,7 @@ void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	flags = get_signals();</div><div class='ctx'> 	block_signals();</div><div class='del'>-	if(UML_SETJMP(&amp;fork_buf, enable) == 0)</div><div class='add'>+	if(UML_SETJMP(&amp;fork_buf) == 0)</div><div class='ctx'> 		new_thread_proc(stack, handler);</div><div class='ctx'> </div><div class='ctx'> 	remove_sigstack();</div><div class='hunk'>@@ -467,21 +466,19 @@ void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr,</div><div class='ctx'> void thread_wait(void *sw, void *fb)</div><div class='ctx'> {</div><div class='ctx'> 	jmp_buf buf, **switch_buf = sw, *fork_buf;</div><div class='del'>-	int enable;</div><div class='ctx'> </div><div class='ctx'> 	*switch_buf = &amp;buf;</div><div class='ctx'> 	fork_buf = fb;</div><div class='del'>-	if(UML_SETJMP(&amp;buf, enable) == 0)</div><div class='add'>+	if(UML_SETJMP(&amp;buf) == 0)</div><div class='ctx'> 		siglongjmp(*fork_buf, INIT_JMP_REMOVE_SIGSTACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void switch_threads(void *me, void *next)</div><div class='ctx'> {</div><div class='ctx'> 	jmp_buf my_buf, **me_ptr = me, *next_buf = next;</div><div class='del'>-	int enable;</div><div class='ctx'> </div><div class='ctx'> 	*me_ptr = &amp;my_buf;</div><div class='del'>-	if(UML_SETJMP(&amp;my_buf, enable) == 0)</div><div class='add'>+	if(UML_SETJMP(&amp;my_buf) == 0)</div><div class='ctx'> 		UML_LONGJMP(next_buf, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -495,14 +492,14 @@ static jmp_buf *cb_back;</div><div class='ctx'> int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	jmp_buf **switch_buf = switch_buf_ptr;</div><div class='del'>-	int n, enable;</div><div class='add'>+	int n;</div><div class='ctx'> </div><div class='ctx'> 	set_handler(SIGWINCH, (__sighandler_t) sig_handler,</div><div class='ctx'> 		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGALRM,</div><div class='ctx'> 		    SIGVTALRM, -1);</div><div class='ctx'> </div><div class='ctx'> 	*fork_buf_ptr = &amp;initial_jmpbuf;</div><div class='del'>-	n = UML_SETJMP(&amp;initial_jmpbuf, enable);</div><div class='add'>+	n = UML_SETJMP(&amp;initial_jmpbuf);</div><div class='ctx'> 	switch(n){</div><div class='ctx'> 	case INIT_JMP_NEW_THREAD:</div><div class='ctx'> 		new_thread_proc((void *) stack, new_thread_handler);</div><div class='hunk'>@@ -529,14 +526,13 @@ int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr)</div><div class='ctx'> void initial_thread_cb_skas(void (*proc)(void *), void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	jmp_buf here;</div><div class='del'>-	int enable;</div><div class='ctx'> </div><div class='ctx'> 	cb_proc = proc;</div><div class='ctx'> 	cb_arg = arg;</div><div class='ctx'> 	cb_back = &amp;here;</div><div class='ctx'> </div><div class='ctx'> 	block_signals();</div><div class='del'>-	if(UML_SETJMP(&amp;here, enable) == 0)</div><div class='add'>+	if(UML_SETJMP(&amp;here) == 0)</div><div class='ctx'> 		UML_LONGJMP(&amp;initial_jmpbuf, INIT_JMP_CALLBACK);</div><div class='ctx'> 	unblock_signals();</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c<br/>index 6f7626775acb..4ae73c0e5485 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/time.c</a></div><div class='hunk'>@@ -17,11 +17,6 @@</div><div class='ctx'> #include "kern_constants.h"</div><div class='ctx'> #include "os.h"</div><div class='ctx'> </div><div class='del'>-/* XXX This really needs to be declared and initialized in a kernel file since</div><div class='del'>- * it's in &lt;linux/time.h&gt;</div><div class='del'>- */</div><div class='del'>-extern struct timespec wall_to_monotonic;</div><div class='del'>-</div><div class='ctx'> static void set_interval(int timer_type)</div><div class='ctx'> {</div><div class='ctx'> 	int usec = 1000000/hz();</div><div class='hunk'>@@ -71,6 +66,7 @@ void switch_timers(int to_real)</div><div class='ctx'> 		       errno);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef UML_CONFIG_MODE_TT</div><div class='ctx'> void uml_idle_timer(void)</div><div class='ctx'> {</div><div class='ctx'> 	if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)</div><div class='hunk'>@@ -80,22 +76,7 @@ void uml_idle_timer(void)</div><div class='ctx'> 		    SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);</div><div class='ctx'> 	set_interval(ITIMER_REAL);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-extern void ktime_get_ts(struct timespec *ts);</div><div class='del'>-#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)</div><div class='del'>-</div><div class='del'>-void time_init(void)</div><div class='del'>-{</div><div class='del'>-	struct timespec now;</div><div class='del'>-</div><div class='del'>-	if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)</div><div class='del'>-		panic("Couldn't set SIGVTALRM handler");</div><div class='del'>-	set_interval(ITIMER_VIRTUAL);</div><div class='del'>-</div><div class='del'>-	do_posix_clock_monotonic_gettime(&amp;now);</div><div class='del'>-	wall_to_monotonic.tv_sec = -now.tv_sec;</div><div class='del'>-	wall_to_monotonic.tv_nsec = -now.tv_nsec;</div><div class='del'>-}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> unsigned long long os_nsecs(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -114,15 +95,7 @@ void idle_sleep(int secs)</div><div class='ctx'> 	nanosleep(&amp;ts, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* XXX This partly duplicates init_irq_signals */</div><div class='del'>-</div><div class='ctx'> void user_time_init(void)</div><div class='ctx'> {</div><div class='del'>-	set_handler(SIGVTALRM, (__sighandler_t) alarm_handler,</div><div class='del'>-		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH,</div><div class='del'>-		    SIGALRM, SIGUSR2, -1);</div><div class='del'>-	set_handler(SIGALRM, (__sighandler_t) alarm_handler,</div><div class='del'>-		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH,</div><div class='del'>-		    SIGVTALRM, SIGUSR2, -1);</div><div class='ctx'> 	set_interval(ITIMER_VIRTUAL);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/um/os-Linux/uaccess.c b/arch/um/os-Linux/uaccess.c<br/>index e523719330b2..865f6a6a2590 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/uaccess.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/uaccess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/uaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/uaccess.c</a></div><div class='hunk'>@@ -14,11 +14,10 @@ unsigned long __do_user_copy(void *to, const void *from, int n,</div><div class='ctx'> 					int n), int *faulted_out)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *faddrp = (unsigned long *) fault_addr, ret;</div><div class='del'>-	int enable;</div><div class='ctx'> </div><div class='ctx'> 	jmp_buf jbuf;</div><div class='ctx'> 	*fault_catcher = &amp;jbuf;</div><div class='del'>-	if(UML_SETJMP(&amp;jbuf, enable) == 0){</div><div class='add'>+	if(UML_SETJMP(&amp;jbuf) == 0){</div><div class='ctx'> 		(*op)(to, from, n);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		*faulted_out = 0;</div><div class='head'>diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c<br/>index 362db059fe30..48092b95c8ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/os-Linux/umid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/os-Linux/umid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/os-Linux/umid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/os-Linux/umid.c</a></div><div class='hunk'>@@ -67,32 +67,53 @@ err:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int actually_do_remove(char *dir)</div><div class='add'>+/*</div><div class='add'>+ * Unlinks the files contained in @dir and then removes @dir.</div><div class='add'>+ * Doesn't handle directory trees, so it's not like rm -rf, but almost such. We</div><div class='add'>+ * ignore ENOENT errors for anything (they happen, strangely enough - possibly due</div><div class='add'>+ * to races between multiple dying UML threads).</div><div class='add'>+ */</div><div class='add'>+static int remove_files_and_dir(char *dir)</div><div class='ctx'> {</div><div class='ctx'> 	DIR *directory;</div><div class='ctx'> 	struct dirent *ent;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	char file[256];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	directory = opendir(dir);</div><div class='del'>-	if(directory == NULL)</div><div class='del'>-		return -errno;</div><div class='add'>+	if (directory == NULL) {</div><div class='add'>+		if (errno != ENOENT)</div><div class='add'>+			return -errno;</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	while((ent = readdir(directory)) != NULL){</div><div class='del'>-		if(!strcmp(ent-&gt;d_name, ".") || !strcmp(ent-&gt;d_name, ".."))</div><div class='add'>+	while ((ent = readdir(directory)) != NULL) {</div><div class='add'>+		if (!strcmp(ent-&gt;d_name, ".") || !strcmp(ent-&gt;d_name, ".."))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		len = strlen(dir) + sizeof("/") + strlen(ent-&gt;d_name) + 1;</div><div class='del'>-		if(len &gt; sizeof(file))</div><div class='del'>-			return -E2BIG;</div><div class='add'>+		if (len &gt; sizeof(file)) {</div><div class='add'>+			ret = -E2BIG;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		sprintf(file, "%s/%s", dir, ent-&gt;d_name);</div><div class='del'>-		if(unlink(file) &lt; 0)</div><div class='del'>-			return -errno;</div><div class='add'>+		if (unlink(file) &lt; 0 &amp;&amp; errno != ENOENT) {</div><div class='add'>+			ret = -errno;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if(rmdir(dir) &lt; 0)</div><div class='del'>-		return -errno;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (rmdir(dir) &lt; 0 &amp;&amp; errno != ENOENT) {</div><div class='add'>+		ret = -errno;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	closedir(directory);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This says that there isn't already a user of the specified directory even if</div><div class='hunk'>@@ -103,9 +124,10 @@ static int actually_do_remove(char *dir)</div><div class='ctx'>  * 	something other than UML sticking stuff in the directory</div><div class='ctx'>  *	this boot racing with a shutdown of the other UML</div><div class='ctx'>  * In any of these cases, the directory isn't useful for anything else.</div><div class='add'>+ *</div><div class='add'>+ * Boolean return: 1 if in use, 0 otherwise.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static int not_dead_yet(char *dir)</div><div class='add'>+static inline int is_umdir_used(char *dir)</div><div class='ctx'> {</div><div class='ctx'> 	char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];</div><div class='ctx'> 	char pid[sizeof("nnnnn\0")], *end;</div><div class='hunk'>@@ -113,7 +135,7 @@ static int not_dead_yet(char *dir)</div><div class='ctx'> </div><div class='ctx'> 	n = snprintf(file, sizeof(file), "%s/pid", dir);</div><div class='ctx'> 	if(n &gt;= sizeof(file)){</div><div class='del'>-		printk("not_dead_yet - pid filename too long\n");</div><div class='add'>+		printk("is_umdir_used - pid filename too long\n");</div><div class='ctx'> 		err = -E2BIG;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -123,7 +145,7 @@ static int not_dead_yet(char *dir)</div><div class='ctx'> 	if(fd &lt; 0) {</div><div class='ctx'> 		fd = -errno;</div><div class='ctx'> 		if(fd != -ENOENT){</div><div class='del'>-			printk("not_dead_yet : couldn't open pid file '%s', "</div><div class='add'>+			printk("is_umdir_used : couldn't open pid file '%s', "</div><div class='ctx'> 			       "err = %d\n", file, -fd);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -132,18 +154,18 @@ static int not_dead_yet(char *dir)</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	n = read(fd, pid, sizeof(pid));</div><div class='ctx'> 	if(n &lt; 0){</div><div class='del'>-		printk("not_dead_yet : couldn't read pid file '%s', "</div><div class='add'>+		printk("is_umdir_used : couldn't read pid file '%s', "</div><div class='ctx'> 		       "err = %d\n", file, errno);</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	} else if(n == 0){</div><div class='del'>-		printk("not_dead_yet : couldn't read pid file '%s', "</div><div class='add'>+		printk("is_umdir_used : couldn't read pid file '%s', "</div><div class='ctx'> 		       "0-byte read\n", file);</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	p = strtoul(pid, &amp;end, 0);</div><div class='ctx'> 	if(end == pid){</div><div class='del'>-		printk("not_dead_yet : couldn't parse pid file '%s', "</div><div class='add'>+		printk("is_umdir_used : couldn't parse pid file '%s', "</div><div class='ctx'> 		       "errno = %d\n", file, errno);</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -153,19 +175,32 @@ static int not_dead_yet(char *dir)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = actually_do_remove(dir);</div><div class='del'>-	if(err)</div><div class='del'>-		printk("not_dead_yet - actually_do_remove failed with "</div><div class='del'>-		       "err = %d\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='ctx'> out_close:</div><div class='ctx'> 	close(fd);</div><div class='ctx'> out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Try to remove the directory @dir unless it's in use.</div><div class='add'>+ * Precondition: @dir exists.</div><div class='add'>+ * Returns 0 for success, &lt; 0 for failure in removal or if the directory is in</div><div class='add'>+ * use.</div><div class='add'>+ */</div><div class='add'>+static int umdir_take_if_dead(char *dir)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	if (is_umdir_used(dir))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	ret = remove_files_and_dir(dir);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk("is_umdir_used - remove_files_and_dir failed with "</div><div class='add'>+		       "err = %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init create_pid_file(void)</div><div class='ctx'> {</div><div class='ctx'> 	char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];</div><div class='hunk'>@@ -244,11 +279,7 @@ int __init make_umid(void)</div><div class='ctx'> 		if(err != -EEXIST)</div><div class='ctx'> 			goto err;</div><div class='ctx'> </div><div class='del'>-		/* 1   -&gt; this umid is already in use</div><div class='del'>-		 * &lt; 0 -&gt; we couldn't remove the umid directory</div><div class='del'>-		 * In either case, we can't use this umid, so return -EEXIST.</div><div class='del'>-		 */</div><div class='del'>-		if(not_dead_yet(tmp) != 0)</div><div class='add'>+		if (umdir_take_if_dead(tmp) &lt; 0)</div><div class='ctx'> 			goto err;</div><div class='ctx'> </div><div class='ctx'> 		err = mkdir(tmp, 0777);</div><div class='hunk'>@@ -344,9 +375,9 @@ static void remove_umid_dir(void)</div><div class='ctx'> 	char dir[strlen(uml_dir) + UMID_LEN + 1], err;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(dir, "%s%s", uml_dir, umid);</div><div class='del'>-	err = actually_do_remove(dir);</div><div class='add'>+	err = remove_files_and_dir(dir);</div><div class='ctx'> 	if(err)</div><div class='del'>-		printf("remove_umid_dir - actually_do_remove failed with "</div><div class='add'>+		printf("remove_umid_dir - remove_files_and_dir failed with "</div><div class='ctx'> 		       "err = %d\n", err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules<br/>index 1347dc6d5218..813077fb1e5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/scripts/Makefile.rules?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/scripts/Makefile.rules</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/scripts/Makefile.rules?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/scripts/Makefile.rules</a></div><div class='hunk'>@@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m)  $(USER_SINGLE_OBJS))</div><div class='ctx'> USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))</div><div class='ctx'> </div><div class='ctx'> $(USER_OBJS:.o=.%): \</div><div class='del'>-	c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(*F).o)</div><div class='add'>+	c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(basetarget).o)</div><div class='ctx'> $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \</div><div class='ctx'> 	-Dunix -D__unix__ -D__$(SUBARCH)__</div><div class='ctx'> </div><div class='hunk'>@@ -17,7 +17,7 @@ $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \</div><div class='ctx'> UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file))</div><div class='ctx'> </div><div class='ctx'> $(UNPROFILE_OBJS:.o=.%): \</div><div class='del'>-	c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(*F).o)</div><div class='add'>+	c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(basetarget).o)</div><div class='ctx'> $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \</div><div class='ctx'> 	-Dunix -D__unix__ -D__$(SUBARCH)__</div><div class='ctx'> </div><div class='head'>diff --git a/arch/um/sys-i386/checksum.S b/arch/um/sys-i386/checksum.S<br/>index d98b2fff3d08..62c7e564f22e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-i386/checksum.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/checksum.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-i386/checksum.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-i386/checksum.S</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> 				</div><div class='ctx'> /*</div><div class='head'>diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c<br/>index 6028bc7cc01b..28bf01150323 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-i386/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-i386/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-i386/ptrace.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Licensed under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include "linux/sched.h"</div><div class='ctx'> #include "linux/mm.h"</div><div class='head'>diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S<br/>index 1ff61474b25c..2497554b7b95 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-i386/sys_call_table.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/sys_call_table.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-i386/sys_call_table.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-i386/sys_call_table.S</a></div><div class='hunk'>@@ -7,8 +7,6 @@</div><div class='ctx'> #define sys_vm86old sys_ni_syscall</div><div class='ctx'> #define sys_vm86 sys_ni_syscall</div><div class='ctx'> </div><div class='del'>-#define sys_stime um_stime</div><div class='del'>-#define sys_time um_time</div><div class='ctx'> #define old_mmap old_mmap_i386</div><div class='ctx'> </div><div class='ctx'> #include "../../i386/kernel/syscall_table.S"</div><div class='head'>diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c<br/>index 749dd1bfe60f..710d5fb807e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-i386/syscalls.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-i386/syscalls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-i386/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-i386/syscalls.c</a></div><div class='hunk'>@@ -99,11 +99,12 @@ long sys_ipc (uint call, int first, int second,</div><div class='ctx'> </div><div class='ctx'> 	switch (call) {</div><div class='ctx'> 	case SEMOP:</div><div class='del'>-		return sys_semtimedop(first, (struct sembuf *) ptr, second,</div><div class='del'>-				      NULL);</div><div class='add'>+		return sys_semtimedop(first, (struct sembuf __user *) ptr,</div><div class='add'>+				      second, NULL);</div><div class='ctx'> 	case SEMTIMEDOP:</div><div class='del'>-		return sys_semtimedop(first, (struct sembuf *) ptr, second,</div><div class='del'>-				      (const struct timespec *) fifth);</div><div class='add'>+		return sys_semtimedop(first, (struct sembuf __user *) ptr,</div><div class='add'>+				      second,</div><div class='add'>+				      (const struct timespec __user *) fifth);</div><div class='ctx'> 	case SEMGET:</div><div class='ctx'> 		return sys_semget (first, second, third);</div><div class='ctx'> 	case SEMCTL: {</div><div class='head'>diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S<br/>index 11b7bd768cfd..1364b7da578c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-ppc/misc.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-ppc/misc.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-ppc/misc.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-ppc/misc.S</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include "ppc_asm.h"</div><div class='ctx'> </div><div class='hunk'>@@ -23,14 +22,10 @@</div><div class='ctx'> #define CACHE_LINE_SIZE		16</div><div class='ctx'> #define LG_CACHE_LINE_SIZE	4</div><div class='ctx'> #define MAX_COPY_PREFETCH	1</div><div class='del'>-#elif !defined(CONFIG_PPC64BRIDGE)</div><div class='add'>+#else</div><div class='ctx'> #define CACHE_LINE_SIZE		32</div><div class='ctx'> #define LG_CACHE_LINE_SIZE	5</div><div class='ctx'> #define MAX_COPY_PREFETCH	4</div><div class='del'>-#else</div><div class='del'>-#define CACHE_LINE_SIZE		128</div><div class='del'>-#define LG_CACHE_LINE_SIZE	7</div><div class='del'>-#define MAX_COPY_PREFETCH	1</div><div class='ctx'> #endif /* CONFIG_4xx || CONFIG_8xx */</div><div class='ctx'> </div><div class='ctx'> 	.text</div><div class='head'>diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c<br/>index a4c46a8af008..9edf114faf79 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-x86_64/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-x86_64/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-x86_64/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-x86_64/signal.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include "skas.h"</div><div class='ctx'> </div><div class='ctx'> static int copy_sc_from_user_skas(struct pt_regs *regs,</div><div class='del'>-                                 struct sigcontext *from)</div><div class='add'>+                                 struct sigcontext __user *from)</div><div class='ctx'> {</div><div class='ctx'>        int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -54,7 +54,8 @@ static int copy_sc_from_user_skas(struct pt_regs *regs,</div><div class='ctx'>        return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int copy_sc_to_user_skas(struct sigcontext *to, struct _fpstate *to_fp,</div><div class='add'>+int copy_sc_to_user_skas(struct sigcontext __user *to,</div><div class='add'>+			 struct _fpstate __user *to_fp,</div><div class='ctx'> 			 struct pt_regs *regs, unsigned long mask,</div><div class='ctx'> 			 unsigned long sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -106,10 +107,11 @@ int copy_sc_to_user_skas(struct sigcontext *to, struct _fpstate *to_fp,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODE_TT</div><div class='del'>-int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext *from,</div><div class='add'>+int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext __user *from,</div><div class='ctx'> 			 int fpsize)</div><div class='ctx'> {</div><div class='del'>-	struct _fpstate *to_fp, *from_fp;</div><div class='add'>+	struct _fpstate *to_fp;</div><div class='add'>+	struct _fpstate __user *from_fp;</div><div class='ctx'> 	unsigned long sigs;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -124,13 +126,14 @@ int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext *from,</div><div class='ctx'> 	return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate *fp,</div><div class='add'>+int copy_sc_to_user_tt(struct sigcontext __user *to, struct _fpstate __user *fp,</div><div class='ctx'> 		       struct sigcontext *from, int fpsize, unsigned long sp)</div><div class='ctx'> {</div><div class='del'>-	struct _fpstate *to_fp, *from_fp;</div><div class='add'>+	struct _fpstate __user *to_fp;</div><div class='add'>+	struct _fpstate *from_fp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	to_fp = (fp ? fp : (struct _fpstate *) (to + 1));</div><div class='add'>+	to_fp = (fp ? fp : (struct _fpstate __user *) (to + 1));</div><div class='ctx'> 	from_fp = from-&gt;fpstate;</div><div class='ctx'> 	err = copy_to_user(to, from, sizeof(*to));</div><div class='ctx'> 	/* The SP in the sigcontext is the updated one for the signal</div><div class='hunk'>@@ -158,7 +161,8 @@ static int copy_sc_from_user(struct pt_regs *to, void __user *from)</div><div class='ctx'>        return(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int copy_sc_to_user(struct sigcontext *to, struct _fpstate *fp,</div><div class='add'>+static int copy_sc_to_user(struct sigcontext __user *to,</div><div class='add'>+			   struct _fpstate __user *fp,</div><div class='ctx'> 			   struct pt_regs *from, unsigned long mask,</div><div class='ctx'> 			   unsigned long sp)</div><div class='ctx'> {</div><div class='hunk'>@@ -169,7 +173,7 @@ static int copy_sc_to_user(struct sigcontext *to, struct _fpstate *fp,</div><div class='ctx'> </div><div class='ctx'> struct rt_sigframe</div><div class='ctx'> {</div><div class='del'>-       char *pretcode;</div><div class='add'>+       char __user *pretcode;</div><div class='ctx'>        struct ucontext uc;</div><div class='ctx'>        struct siginfo info;</div><div class='ctx'> };</div><div class='hunk'>@@ -188,7 +192,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,</div><div class='ctx'> </div><div class='ctx'> 	frame = (struct rt_sigframe __user *)</div><div class='ctx'> 		round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;</div><div class='del'>-        frame = (struct rt_sigframe *) ((unsigned long) frame - 128);</div><div class='add'>+        frame = (struct rt_sigframe __user *) ((unsigned long) frame - 128);</div><div class='ctx'> </div><div class='ctx'> 	if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c<br/>index 34b2e842864f..9e9ad72c2ba4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-x86_64/syscall_table.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-x86_64/syscall_table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-x86_64/syscall_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-x86_64/syscall_table.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __NO_STUBS</div><div class='ctx'> </div><div class='hunk'>@@ -20,12 +19,6 @@</div><div class='ctx'> /*#define sys_set_thread_area sys_ni_syscall</div><div class='ctx'> #define sys_get_thread_area sys_ni_syscall*/</div><div class='ctx'> </div><div class='del'>-/* For __NR_time. The x86-64 name hopefully will change from sys_time64 to</div><div class='del'>- * sys_time (since the current situation is bogus). I've sent a patch to cleanup</div><div class='del'>- * this. Remove below the obsoleted line. */</div><div class='del'>-#define sys_time64 um_time</div><div class='del'>-#define sys_time um_time</div><div class='del'>-</div><div class='ctx'> /* On UML we call it this way ("old" means it's not mmap2) */</div><div class='ctx'> #define sys_mmap old_mmap</div><div class='ctx'> /* On x86-64 sys_uname is actually sys_newuname plus a compatibility trick.</div><div class='head'>diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c<br/>index 6acee5c4ada6..6fce9f45dfdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/um/sys-x86_64/syscalls.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/um/sys-x86_64/syscalls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/um/sys-x86_64/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/um/sys-x86_64/syscalls.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@ static long arch_prctl_tt(int code, unsigned long addr)</div><div class='ctx'> 	case ARCH_GET_GS:</div><div class='ctx'> 		ret = arch_prctl(code, (unsigned long) &amp;tmp);</div><div class='ctx'> 		if(!ret)</div><div class='del'>-			ret = put_user(tmp, &amp;addr);</div><div class='add'>+			ret = put_user(tmp, (long __user *)addr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='head'>diff --git a/arch/v850/kernel/anna.c b/arch/v850/kernel/anna.c<br/>index d0502e142437..40892d3e3c24 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/anna.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/anna.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/anna.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/anna.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/as85ep1.c b/arch/v850/kernel/as85ep1.c<br/>index d78c5e4ea9bc..5352f8a5aa07 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/as85ep1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/as85ep1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/as85ep1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/as85ep1.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/fpga85e2c.c b/arch/v850/kernel/fpga85e2c.c<br/>index d8094519ad85..cb04a6954ccb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/fpga85e2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/fpga85e2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/fpga85e2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/fpga85e2c.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/gbus_int.c b/arch/v850/kernel/gbus_int.c<br/>index 92918b8d89ef..25d636e79e6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/gbus_int.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/gbus_int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/gbus_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/gbus_int.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static unsigned gbus_int_startup_irq (unsigned irq)</div><div class='ctx'> 		/* First enable the CPU interrupt.  */</div><div class='ctx'> 		int rval =</div><div class='ctx'> 			request_irq (IRQ_GINT(gint), gbus_int_handle_irq,</div><div class='del'>-				     SA_INTERRUPT,</div><div class='add'>+				     IRQF_DISABLED,</div><div class='ctx'> 				     "gbus_int_handler",</div><div class='ctx'> 				     &amp;gint_num_active_irqs[gint]);</div><div class='ctx'> 		if (rval != 0)</div><div class='head'>diff --git a/arch/v850/kernel/irq.c b/arch/v850/kernel/irq.c<br/>index 7a151c26f82e..858c45819aab 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/irq.c</a></div><div class='hunk'>@@ -65,10 +65,10 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 			int j;</div><div class='ctx'> 			int count = 0;</div><div class='ctx'> 			int num = -1;</div><div class='del'>-			const char *type_name = irq_desc[irq].handler-&gt;typename;</div><div class='add'>+			const char *type_name = irq_desc[irq].chip-&gt;typename;</div><div class='ctx'> </div><div class='ctx'> 			for (j = 0; j &lt; NR_IRQS; j++)</div><div class='del'>-				if (irq_desc[j].handler-&gt;typename == type_name){</div><div class='add'>+				if (irq_desc[j].chip-&gt;typename == type_name){</div><div class='ctx'> 					if (irq == j)</div><div class='ctx'> 						num = count;</div><div class='ctx'> 					count++;</div><div class='hunk'>@@ -117,7 +117,7 @@ init_irq_handlers (int base_irq, int num, int interval,</div><div class='ctx'> 		irq_desc[base_irq].status  = IRQ_DISABLED;</div><div class='ctx'> 		irq_desc[base_irq].action  = NULL;</div><div class='ctx'> 		irq_desc[base_irq].depth   = 1;</div><div class='del'>-		irq_desc[base_irq].handler = irq_type;</div><div class='add'>+		irq_desc[base_irq].chip = irq_type;</div><div class='ctx'> 		base_irq += interval;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/v850/kernel/ma.c b/arch/v850/kernel/ma.c<br/>index b3dfbc5d2f40..2aa8ab0f7edc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/ma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/ma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/ma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/ma.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/me2.c b/arch/v850/kernel/me2.c<br/>index 6527c218f91d..14b0c8858aa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/me2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/me2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/me2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/me2.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/process.c b/arch/v850/kernel/process.c<br/>index 57218c76925c..c4f844c86e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/process.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/rte_cb.c b/arch/v850/kernel/rte_cb.c<br/>index 0c794b9e0f9b..0f7f6cd705a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_cb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_cb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/rte_cb.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/rte_cb_leds.c b/arch/v850/kernel/rte_cb_leds.c<br/>index b662ad838940..f654088b2760 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_cb_leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_cb_leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_cb_leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/rte_cb_leds.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/rte_ma1_cb.c b/arch/v850/kernel/rte_ma1_cb.c<br/>index 3873e276392f..9a716f946421 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_ma1_cb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_ma1_cb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_ma1_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/rte_ma1_cb.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c<br/>index ffbb6d073bf2..f36b778f1432 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_mb_a_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_mb_a_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_mb_a_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/rte_mb_a_pci.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -329,7 +328,7 @@ void pcibios_fixup_bus(struct pci_bus *b)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> pcibios_align_resource (void *data, struct resource *res,</div><div class='del'>-			unsigned long size, unsigned long align)</div><div class='add'>+			resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c<br/>index faaf3d95e6cf..3be355a029e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_me2_cb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_me2_cb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_me2_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/rte_me2_cb.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='hunk'>@@ -264,7 +263,7 @@ static unsigned cb_pic_startup_irq (unsigned irq)</div><div class='ctx'> </div><div class='ctx'> 	if (cb_pic_active_irqs == 0) {</div><div class='ctx'> 		rval = request_irq (IRQ_CB_PIC, cb_pic_handle_irq,</div><div class='del'>-				    SA_INTERRUPT, "cb_pic_handler", 0);</div><div class='add'>+				    IRQF_DISABLED, "cb_pic_handler", 0);</div><div class='ctx'> 		if (rval != 0)</div><div class='ctx'> 			return rval;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/arch/v850/kernel/rte_nb85e_cb.c b/arch/v850/kernel/rte_nb85e_cb.c<br/>index 990b20bffe47..b4a045da5d70 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_nb85e_cb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/rte_nb85e_cb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/rte_nb85e_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/rte_nb85e_cb.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/signal.c b/arch/v850/kernel/signal.c<br/>index 633e4e1b825f..17c2d4359b04 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/signal.c</a></div><div class='hunk'>@@ -274,7 +274,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)</div><div class='ctx'> 	/* Default to using normal stack */</div><div class='ctx'> 	unsigned long sp = regs-&gt;gpr[GPR_SP];</div><div class='ctx'> </div><div class='del'>-	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! on_sig_stack(sp))</div><div class='add'>+	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! sas_ss_flags(sp))</div><div class='ctx'> 		sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> </div><div class='ctx'> 	return (void *)((sp - frame_size) &amp; -8UL);</div><div class='head'>diff --git a/arch/v850/kernel/sim.c b/arch/v850/kernel/sim.c<br/>index 17049aaa8f11..467b4aa0acdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/sim.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/sim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/sim.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/sim.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/sim85e2.c b/arch/v850/kernel/sim85e2.c<br/>index 9111613fb53a..566dde5e6070 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/sim85e2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/sim85e2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/sim85e2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/sim85e2.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c<br/>index 9224cb65f6ec..2ec0700fc46b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/syscalls.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/syscalls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/syscalls.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *     and Paul Mackerras (paulus@cs.anu.edu.au).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/teg.c b/arch/v850/kernel/teg.c<br/>index 495cf8f37bcb..290d50665016 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/teg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/teg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/teg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/teg.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c<br/>index c1e85c2aef65..a0b46695f186 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/time.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ EXPORT_SYMBOL(do_settimeofday);</div><div class='ctx'> static int timer_dev_id;</div><div class='ctx'> static struct irqaction timer_irqaction = {</div><div class='ctx'> 	timer_interrupt,</div><div class='del'>-	SA_INTERRUPT,</div><div class='add'>+	IRQF_DISABLED,</div><div class='ctx'> 	CPU_MASK_NONE,</div><div class='ctx'> 	"timer",</div><div class='ctx'> 	&amp;timer_dev_id,</div><div class='head'>diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c<br/>index 6bcfcfe88384..c03ad6ed61cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/v850_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/v850_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/v850_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/v850_ksyms.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #include &lt;linux/elfcore.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S<br/>index 5b2ffcc6e2b2..63399219cd9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/v850/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/v850/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/v850/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/v850/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Written by Miles Bader &lt;miles@gnu.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VMLINUX_SYMBOL(_sym_) _##_sym_</div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='head'>diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig<br/>index 408d44a59756..28df7d88ce2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/Kconfig</a></div><div class='hunk'>@@ -24,6 +24,14 @@ config X86</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config LOCKDEP_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='add'>+config STACKTRACE_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> config SEMAPHORE_SLEEPERS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -299,6 +307,7 @@ config X86_64_ACPI_NUMA</div><div class='ctx'>        bool "ACPI NUMA detection"</div><div class='ctx'>        depends on NUMA</div><div class='ctx'>        select ACPI </div><div class='add'>+	select PCI</div><div class='ctx'>        select ACPI_NUMA</div><div class='ctx'>        default y</div><div class='ctx'>        help</div><div class='hunk'>@@ -369,6 +378,8 @@ config HOTPLUG_CPU</div><div class='ctx'> 		can be controlled through /sys/devices/system/cpu/cpu#.</div><div class='ctx'> 		Say N if you want to disable CPU hotplug.</div><div class='ctx'> </div><div class='add'>+config ARCH_ENABLE_MEMORY_HOTPLUG</div><div class='add'>+	def_bool y</div><div class='ctx'> </div><div class='ctx'> config HPET_TIMER</div><div class='ctx'> 	bool</div><div class='hunk'>@@ -385,27 +396,47 @@ config HPET_EMULATE_RTC</div><div class='ctx'> 	bool "Provide RTC interrupt"</div><div class='ctx'> 	depends on HPET_TIMER &amp;&amp; RTC=y</div><div class='ctx'> </div><div class='del'>-config GART_IOMMU</div><div class='del'>-	bool "K8 GART IOMMU support"</div><div class='add'>+# Mark as embedded because too many people got it wrong.</div><div class='add'>+# The code disables itself when not needed.</div><div class='add'>+config IOMMU</div><div class='add'>+	bool "IOMMU support" if EMBEDDED</div><div class='ctx'> 	default y</div><div class='ctx'> 	select SWIOTLB</div><div class='add'>+	select AGP</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	help</div><div class='del'>-	  Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors</div><div class='del'>-	  and for the bounce buffering software IOMMU.</div><div class='del'>-	  Needed to run systems with more than 3GB of memory properly with</div><div class='del'>-	  32-bit PCI devices that do not support DAC (Double Address Cycle).</div><div class='del'>-	  The IOMMU can be turned off at runtime with the iommu=off parameter.</div><div class='del'>-  	  Normally the kernel will take the right choice by itself.</div><div class='del'>-  	  This option includes a driver for the AMD Opteron/Athlon64 IOMMU</div><div class='del'>-  	  northbridge and a software emulation used on other systems without</div><div class='del'>-	  hardware IOMMU.  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-# need this always enabled with GART_IOMMU for the VIA workaround</div><div class='add'>+	  Support for full DMA access of devices with 32bit memory access only</div><div class='add'>+	  on systems with more than 3GB. This is usually needed for USB,</div><div class='add'>+	  sound, many IDE/SATA chipsets and some other devices.</div><div class='add'>+	  Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART</div><div class='add'>+	  based IOMMU and a software bounce buffer based IOMMU used on Intel</div><div class='add'>+	  systems and as fallback.</div><div class='add'>+	  The code is only active when needed (enough memory and limited</div><div class='add'>+	  device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified</div><div class='add'>+	  too.</div><div class='add'>+</div><div class='add'>+config CALGARY_IOMMU</div><div class='add'>+	bool "IBM Calgary IOMMU support"</div><div class='add'>+	default y</div><div class='add'>+	select SWIOTLB</div><div class='add'>+	depends on PCI &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  Support for hardware IOMMUs in IBM's xSeries x366 and x460</div><div class='add'>+	  systems. Needed to run systems with more than 3GB of memory</div><div class='add'>+	  properly with 32-bit PCI devices that do not support DAC</div><div class='add'>+	  (Double Address Cycle). Calgary also supports bus level</div><div class='add'>+	  isolation, where all DMAs pass through the IOMMU.  This</div><div class='add'>+	  prevents them from going anywhere except their intended</div><div class='add'>+	  destination. This catches hard-to-find kernel bugs and</div><div class='add'>+	  mis-behaving drivers and devices that do not use the DMA-API</div><div class='add'>+	  properly to set up their DMA buffers.  The IOMMU can be</div><div class='add'>+	  turned off at boot time with the iommu=off parameter.</div><div class='add'>+	  Normally the kernel will make the right choice by itself.</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+# need this always selected by IOMMU for the VIA workaround</div><div class='ctx'> config SWIOTLB</div><div class='ctx'> 	bool</div><div class='del'>-	default y</div><div class='del'>-	depends on GART_IOMMU</div><div class='ctx'> </div><div class='ctx'> config X86_MCE</div><div class='ctx'> 	bool "Machine check support" if EMBEDDED</div><div class='hunk'>@@ -438,10 +469,10 @@ config KEXEC</div><div class='ctx'> 	help</div><div class='ctx'> 	  kexec is a system call that implements the ability to shutdown your</div><div class='ctx'> 	  current kernel, and to start another kernel.  It is like a reboot</div><div class='del'>-	  but it is indepedent of the system firmware.   And like a reboot</div><div class='add'>+	  but it is independent of the system firmware.   And like a reboot</div><div class='ctx'> 	  you can start any kernel with it, not just Linux.</div><div class='ctx'> </div><div class='del'>-	  The name comes from the similiarity to the exec system call.</div><div class='add'>+	  The name comes from the similarity to the exec system call.</div><div class='ctx'> </div><div class='ctx'> 	  It is an ongoing process to be certain the hardware in a machine</div><div class='ctx'> 	  is properly shutdown, so do not be surprised if this code does not</div><div class='hunk'>@@ -501,6 +532,10 @@ config REORDER</div><div class='ctx'>          optimal TLB usage. If you have pretty much any version of binutils, </div><div class='ctx'> 	 this can increase your kernel build time by roughly one minute.</div><div class='ctx'> </div><div class='add'>+config K8_NB</div><div class='add'>+	def_bool y</div><div class='add'>+	depends on AGP_AMD64 || IOMMU || (PCI &amp;&amp; NUMA)</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> #</div><div class='head'>diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug<br/>index ea31b4c62105..775d211a5cf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/Kconfig.debug?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/Kconfig.debug</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/Kconfig.debug?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/Kconfig.debug</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='ctx'> menu "Kernel hacking"</div><div class='ctx'> </div><div class='add'>+config TRACE_IRQFLAGS_SUPPORT</div><div class='add'>+	bool</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source "lib/Kconfig.debug"</div><div class='ctx'> </div><div class='ctx'> config DEBUG_RODATA</div><div class='hunk'>@@ -13,7 +17,7 @@ config DEBUG_RODATA</div><div class='ctx'> 	 If in doubt, say "N".</div><div class='ctx'> </div><div class='ctx'> config IOMMU_DEBUG</div><div class='del'>-       depends on GART_IOMMU &amp;&amp; DEBUG_KERNEL</div><div class='add'>+       depends on IOMMU &amp;&amp; DEBUG_KERNEL</div><div class='ctx'>        bool "Enable IOMMU debugging"</div><div class='ctx'>        help</div><div class='ctx'>          Force the IOMMU to on even when you have less than 4GB of</div><div class='hunk'>@@ -35,6 +39,22 @@ config IOMMU_LEAK</div><div class='ctx'>          Add a simple leak tracer to the IOMMU code. This is useful when you</div><div class='ctx'> 	 are debugging a buggy device driver that leaks IOMMU mappings.</div><div class='ctx'> </div><div class='add'>+config DEBUG_STACKOVERFLOW</div><div class='add'>+        bool "Check for stack overflows"</div><div class='add'>+        depends on DEBUG_KERNEL</div><div class='add'>+        help</div><div class='add'>+	  This option will cause messages to be printed if free stack space</div><div class='add'>+	  drops below a certain limit.</div><div class='add'>+</div><div class='add'>+config DEBUG_STACK_USAGE</div><div class='add'>+        bool "Stack utilization instrumentation"</div><div class='add'>+        depends on DEBUG_KERNEL</div><div class='add'>+        help</div><div class='add'>+	  Enables the display of the minimum amount of free stack which each</div><div class='add'>+	  task has ever had available in the sysrq-T and sysrq-P debug output.</div><div class='add'>+</div><div class='add'>+	  This option will slow down process creation somewhat.</div><div class='add'>+</div><div class='ctx'> #config X86_REMOTE_DEBUG</div><div class='ctx'> #       bool "kgdb debugging stub"</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile<br/>index e573e2ab5510..431bb4bc36cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/Makefile</a></div><div class='hunk'>@@ -27,6 +27,7 @@ LDFLAGS_vmlinux :=</div><div class='ctx'> CHECKFLAGS      += -D__x86_64__ -m64</div><div class='ctx'> </div><div class='ctx'> cflags-y	:=</div><div class='add'>+cflags-kernel-y	:=</div><div class='ctx'> cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)</div><div class='ctx'> cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)</div><div class='ctx'> cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)</div><div class='hunk'>@@ -35,7 +36,7 @@ cflags-y += -m64</div><div class='ctx'> cflags-y += -mno-red-zone</div><div class='ctx'> cflags-y += -mcmodel=kernel</div><div class='ctx'> cflags-y += -pipe</div><div class='del'>-cflags-$(CONFIG_REORDER) += -ffunction-sections</div><div class='add'>+cflags-kernel-$(CONFIG_REORDER) += -ffunction-sections</div><div class='ctx'> # this makes reading assembly source easier, but produces worse code</div><div class='ctx'> # actually it makes the kernel smaller too.</div><div class='ctx'> cflags-y += -fno-reorder-blocks</div><div class='hunk'>@@ -55,6 +56,7 @@ cflags-y += $(call cc-option,-funit-at-a-time)</div><div class='ctx'> cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)</div><div class='ctx'> </div><div class='ctx'> CFLAGS += $(cflags-y)</div><div class='add'>+CFLAGS_KERNEL += $(cflags-kernel-y)</div><div class='ctx'> AFLAGS += -m64</div><div class='ctx'> </div><div class='ctx'> head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o</div><div class='head'>diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile<br/>index 43ee6c50c277..deb063e7762d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/boot/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/boot/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/boot/Makefile</a></div><div class='hunk'>@@ -107,8 +107,13 @@ fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf</div><div class='ctx'> isoimage: $(BOOTIMAGE)</div><div class='ctx'> 	-rm -rf $(obj)/isoimage</div><div class='ctx'> 	mkdir $(obj)/isoimage</div><div class='del'>-	cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \</div><div class='del'>-		$(obj)/isoimage</div><div class='add'>+	for i in lib lib64 share end ; do \</div><div class='add'>+		if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \</div><div class='add'>+			cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \</div><div class='add'>+			break ; \</div><div class='add'>+		fi ; \</div><div class='add'>+		if [ $$i = end ] ; then exit 1 ; fi ; \</div><div class='add'>+	done</div><div class='ctx'> 	cp $(BOOTIMAGE) $(obj)/isoimage/linux</div><div class='ctx'> 	echo '$(image_cmdline)' &gt; $(obj)/isoimage/isolinux.cfg</div><div class='ctx'> 	if [ -f '$(FDINITRD)' ] ; then \</div><div class='head'>diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86_64/boot/compressed/misc.c<br/>index cf4b88c416dc..3755b2e394d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/boot/compressed/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/compressed/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/boot/compressed/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/boot/compressed/misc.c</a></div><div class='hunk'>@@ -77,11 +77,11 @@ static void gzip_release(void **);</div><div class='ctx'>  */</div><div class='ctx'> static unsigned char *real_mode; /* Pointer to real-mode data */</div><div class='ctx'> </div><div class='del'>-#define EXT_MEM_K   (*(unsigned short *)(real_mode + 0x2))</div><div class='add'>+#define RM_EXT_MEM_K   (*(unsigned short *)(real_mode + 0x2))</div><div class='ctx'> #ifndef STANDARD_MEMORY_BIOS_CALL</div><div class='del'>-#define ALT_MEM_K   (*(unsigned long *)(real_mode + 0x1e0))</div><div class='add'>+#define RM_ALT_MEM_K   (*(unsigned long *)(real_mode + 0x1e0))</div><div class='ctx'> #endif</div><div class='del'>-#define SCREEN_INFO (*(struct screen_info *)(real_mode+0))</div><div class='add'>+#define RM_SCREEN_INFO (*(struct screen_info *)(real_mode+0))</div><div class='ctx'> </div><div class='ctx'> extern unsigned char input_data[];</div><div class='ctx'> extern int input_len;</div><div class='hunk'>@@ -92,9 +92,9 @@ static unsigned long output_ptr = 0;</div><div class='ctx'> </div><div class='ctx'> static void *malloc(int size);</div><div class='ctx'> static void free(void *where);</div><div class='del'>- </div><div class='del'>-void* memset(void* s, int c, unsigned n);</div><div class='del'>-void* memcpy(void* dest, const void* src, unsigned n);</div><div class='add'>+</div><div class='add'>+static void *memset(void *s, int c, unsigned n);</div><div class='add'>+static void *memcpy(void *dest, const void *src, unsigned n);</div><div class='ctx'> </div><div class='ctx'> static void putstr(const char *);</div><div class='ctx'> </div><div class='hunk'>@@ -162,8 +162,8 @@ static void putstr(const char *s)</div><div class='ctx'> 	int x,y,pos;</div><div class='ctx'> 	char c;</div><div class='ctx'> </div><div class='del'>-	x = SCREEN_INFO.orig_x;</div><div class='del'>-	y = SCREEN_INFO.orig_y;</div><div class='add'>+	x = RM_SCREEN_INFO.orig_x;</div><div class='add'>+	y = RM_SCREEN_INFO.orig_y;</div><div class='ctx'> </div><div class='ctx'> 	while ( ( c = *s++ ) != '\0' ) {</div><div class='ctx'> 		if ( c == '\n' ) {</div><div class='hunk'>@@ -184,8 +184,8 @@ static void putstr(const char *s)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	SCREEN_INFO.orig_x = x;</div><div class='del'>-	SCREEN_INFO.orig_y = y;</div><div class='add'>+	RM_SCREEN_INFO.orig_x = x;</div><div class='add'>+	RM_SCREEN_INFO.orig_y = y;</div><div class='ctx'> </div><div class='ctx'> 	pos = (x + cols * y) * 2;	/* Update cursor position */</div><div class='ctx'> 	outb_p(14, vidport);</div><div class='hunk'>@@ -194,7 +194,7 @@ static void putstr(const char *s)</div><div class='ctx'> 	outb_p(0xff &amp; (pos &gt;&gt; 1), vidport+1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void* memset(void* s, int c, unsigned n)</div><div class='add'>+static void* memset(void* s, int c, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *ss = (char*)s;</div><div class='hunk'>@@ -203,7 +203,7 @@ void* memset(void* s, int c, unsigned n)</div><div class='ctx'> 	return s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void* memcpy(void* dest, const void* src, unsigned n)</div><div class='add'>+static void* memcpy(void* dest, const void* src, unsigned n)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *d = (char *)dest, *s = (char *)src;</div><div class='hunk'>@@ -278,15 +278,15 @@ static void error(char *x)</div><div class='ctx'> 	putstr(x);</div><div class='ctx'> 	putstr("\n\n -- System halted");</div><div class='ctx'> </div><div class='del'>-	while(1);</div><div class='add'>+	while(1);	/* Halt */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void setup_normal_output_buffer(void)</div><div class='add'>+static void setup_normal_output_buffer(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef STANDARD_MEMORY_BIOS_CALL</div><div class='del'>-	if (EXT_MEM_K &lt; 1024) error("Less than 2MB of memory");</div><div class='add'>+	if (RM_EXT_MEM_K &lt; 1024) error("Less than 2MB of memory");</div><div class='ctx'> #else</div><div class='del'>-	if ((ALT_MEM_K &gt; EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) &lt; 1024) error("Less than 2MB of memory");</div><div class='add'>+	if ((RM_ALT_MEM_K &gt; RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) &lt; 1024) error("Less than 2MB of memory");</div><div class='ctx'> #endif</div><div class='ctx'> 	output_data = (unsigned char *)__PHYSICAL_START; /* Normally Points to 1M */</div><div class='ctx'> 	free_mem_end_ptr = (long)real_mode;</div><div class='hunk'>@@ -297,13 +297,13 @@ struct moveparams {</div><div class='ctx'> 	uch *high_buffer_start; int hcount;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void setup_output_buffer_if_we_run_high(struct moveparams *mv)</div><div class='add'>+static void setup_output_buffer_if_we_run_high(struct moveparams *mv)</div><div class='ctx'> {</div><div class='ctx'> 	high_buffer_start = (uch *)(((ulg)&amp;end) + HEAP_SIZE);</div><div class='ctx'> #ifdef STANDARD_MEMORY_BIOS_CALL</div><div class='del'>-	if (EXT_MEM_K &lt; (3*1024)) error("Less than 4MB of memory");</div><div class='add'>+	if (RM_EXT_MEM_K &lt; (3*1024)) error("Less than 4MB of memory");</div><div class='ctx'> #else</div><div class='del'>-	if ((ALT_MEM_K &gt; EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) &lt; (3*1024)) error("Less than 4MB of memory");</div><div class='add'>+	if ((RM_ALT_MEM_K &gt; RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) &lt; (3*1024)) error("Less than 4MB of memory");</div><div class='ctx'> #endif	</div><div class='ctx'> 	mv-&gt;low_buffer_start = output_data = (unsigned char *)LOW_BUFFER_START;</div><div class='ctx'> 	low_buffer_end = ((unsigned int)real_mode &gt; LOW_BUFFER_MAX</div><div class='hunk'>@@ -319,7 +319,7 @@ void setup_output_buffer_if_we_run_high(struct moveparams *mv)</div><div class='ctx'> 	mv-&gt;high_buffer_start = high_buffer_start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void close_output_buffer_if_we_run_high(struct moveparams *mv)</div><div class='add'>+static void close_output_buffer_if_we_run_high(struct moveparams *mv)</div><div class='ctx'> {</div><div class='ctx'> 	if (bytes_out &gt; low_buffer_size) {</div><div class='ctx'> 		mv-&gt;lcount = low_buffer_size;</div><div class='hunk'>@@ -335,7 +335,7 @@ int decompress_kernel(struct moveparams *mv, void *rmode)</div><div class='ctx'> {</div><div class='ctx'> 	real_mode = rmode;</div><div class='ctx'> </div><div class='del'>-	if (SCREEN_INFO.orig_video_mode == 7) {</div><div class='add'>+	if (RM_SCREEN_INFO.orig_video_mode == 7) {</div><div class='ctx'> 		vidmem = (char *) 0xb0000;</div><div class='ctx'> 		vidport = 0x3b4;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -343,8 +343,8 @@ int decompress_kernel(struct moveparams *mv, void *rmode)</div><div class='ctx'> 		vidport = 0x3d4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lines = SCREEN_INFO.orig_video_lines;</div><div class='del'>-	cols = SCREEN_INFO.orig_video_cols;</div><div class='add'>+	lines = RM_SCREEN_INFO.orig_video_lines;</div><div class='add'>+	cols = RM_SCREEN_INFO.orig_video_cols;</div><div class='ctx'> </div><div class='ctx'> 	if (free_mem_ptr &lt; 0x100000) setup_normal_output_buffer();</div><div class='ctx'> 	else setup_output_buffer_if_we_run_high(mv);</div><div class='head'>diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S<br/>index 12ea0b6c52e2..a50b631f4d2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/boot/setup.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/setup.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/boot/setup.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/boot/setup.S</a></div><div class='hunk'>@@ -45,9 +45,8 @@</div><div class='ctx'>  * Added long mode checking and SSE force. March 2003, Andi Kleen.		</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> #include &lt;linux/compile.h&gt;</div><div class='ctx'> #include &lt;asm/boot.h&gt;</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='head'>diff --git a/arch/x86_64/boot/tools/build.c b/arch/x86_64/boot/tools/build.c<br/>index c44f5e2ec100..eae86691709a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/boot/tools/build.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/tools/build.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/boot/tools/build.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/boot/tools/build.c</a></div><div class='hunk'>@@ -149,10 +149,8 @@ int main(int argc, char ** argv)</div><div class='ctx'> 	sz = sb.st_size;</div><div class='ctx'> 	fprintf (stderr, "System is %d kB\n", sz/1024);</div><div class='ctx'> 	sys_size = (sz + 15) / 16;</div><div class='del'>-	/* 0x40000*16 = 4.0 MB, reasonable estimate for the current maximum */</div><div class='del'>-	if (sys_size &gt; (is_big_kernel ? 0x40000 : DEF_SYSSIZE))</div><div class='del'>-		die("System is too big. Try using %smodules.",</div><div class='del'>-			is_big_kernel ? "" : "bzImage or ");</div><div class='add'>+	if (!is_big_kernel &amp;&amp; sys_size &gt; DEF_SYSSIZE)</div><div class='add'>+		die("System is too big. Try using bzImage or modules.");</div><div class='ctx'> 	while (sz &gt; 0) {</div><div class='ctx'> 		int l, n;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/boot/video.S b/arch/x86_64/boot/video.S<br/>index 32327bb37aff..2aa565c136e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/boot/video.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/boot/video.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/boot/video.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/boot/video.S</a></div><div class='hunk'>@@ -1929,6 +1929,7 @@ skip10:	movb	%ah, %al</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> store_edid:</div><div class='add'>+#ifdef CONFIG_FIRMWARE_EDID</div><div class='ctx'> 	pushw	%es				# just save all registers</div><div class='ctx'> 	pushw	%ax</div><div class='ctx'> 	pushw	%bx</div><div class='hunk'>@@ -1946,6 +1947,22 @@ store_edid:</div><div class='ctx'> 	rep</div><div class='ctx'> 	stosl</div><div class='ctx'> </div><div class='add'>+	pushw   %es				# save ES</div><div class='add'>+	xorw    %di, %di                        # Report Capability</div><div class='add'>+	pushw   %di</div><div class='add'>+	popw    %es                             # ES:DI must be 0:0</div><div class='add'>+	movw	$0x4f15, %ax</div><div class='add'>+	xorw	%bx, %bx</div><div class='add'>+	xorw	%cx, %cx</div><div class='add'>+	int	$0x10</div><div class='add'>+	popw    %es                             # restore ES</div><div class='add'>+</div><div class='add'>+	cmpb    $0x00, %ah                      # call successful</div><div class='add'>+	jne     no_edid</div><div class='add'>+</div><div class='add'>+	cmpb    $0x4f, %al                      # function supported</div><div class='add'>+	jne     no_edid</div><div class='add'>+</div><div class='ctx'> 	movw	$0x4f15, %ax                    # do VBE/DDC</div><div class='ctx'> 	movw	$0x01, %bx</div><div class='ctx'> 	movw	$0x00, %cx</div><div class='hunk'>@@ -1953,12 +1970,14 @@ store_edid:</div><div class='ctx'> 	movw	$0x140, %di</div><div class='ctx'> 	int	$0x10</div><div class='ctx'> </div><div class='add'>+no_edid:</div><div class='ctx'> 	popw	%di				# restore all registers</div><div class='ctx'> 	popw	%dx</div><div class='ctx'> 	popw	%cx</div><div class='ctx'> 	popw	%bx</div><div class='ctx'> 	popw	%ax</div><div class='ctx'> 	popw	%es</div><div class='add'>+#endif</div><div class='ctx'> 	ret</div><div class='ctx'> </div><div class='ctx'> # VIDEO_SELECT-only variables</div><div class='head'>diff --git a/arch/x86_64/crypto/aes-x86_64-asm.S b/arch/x86_64/crypto/aes-x86_64-asm.S<br/>index 483cbb23ab8d..26b40de4d0b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/crypto/aes-x86_64-asm.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/crypto/aes-x86_64-asm.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/crypto/aes-x86_64-asm.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/crypto/aes-x86_64-asm.S</a></div><div class='hunk'>@@ -15,6 +15,10 @@</div><div class='ctx'> </div><div class='ctx'> .text</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/asm-offsets.h&gt;</div><div class='add'>+</div><div class='add'>+#define BASE crypto_tfm_ctx_offset</div><div class='add'>+</div><div class='ctx'> #define R1	%rax</div><div class='ctx'> #define R1E	%eax</div><div class='ctx'> #define R1X	%ax</div><div class='hunk'>@@ -46,19 +50,19 @@</div><div class='ctx'> #define R10	%r10</div><div class='ctx'> #define R11	%r11</div><div class='ctx'> </div><div class='del'>-#define prologue(FUNC,BASE,B128,B192,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11) \</div><div class='add'>+#define prologue(FUNC,KEY,B128,B192,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11) \</div><div class='ctx'> 	.global	FUNC;			\</div><div class='ctx'> 	.type	FUNC,@function;		\</div><div class='ctx'> 	.align	8;			\</div><div class='ctx'> FUNC:	movq	r1,r2;			\</div><div class='ctx'> 	movq	r3,r4;			\</div><div class='del'>-	leaq	BASE+52(r8),r9;		\</div><div class='add'>+	leaq	BASE+KEY+52(r8),r9;	\</div><div class='ctx'> 	movq	r10,r11;		\</div><div class='ctx'> 	movl	(r7),r5 ## E;		\</div><div class='ctx'> 	movl	4(r7),r1 ## E;		\</div><div class='ctx'> 	movl	8(r7),r6 ## E;		\</div><div class='ctx'> 	movl	12(r7),r7 ## E;		\</div><div class='del'>-	movl	(r8),r10 ## E;		\</div><div class='add'>+	movl	BASE(r8),r10 ## E;	\</div><div class='ctx'> 	xorl	-48(r9),r5 ## E;	\</div><div class='ctx'> 	xorl	-44(r9),r1 ## E;	\</div><div class='ctx'> 	xorl	-40(r9),r6 ## E;	\</div><div class='hunk'>@@ -128,8 +132,8 @@ FUNC:	movq	r1,r2;			\</div><div class='ctx'> 	movl	r3 ## E,r1 ## E;	\</div><div class='ctx'> 	movl	r4 ## E,r2 ## E;</div><div class='ctx'> </div><div class='del'>-#define entry(FUNC,BASE,B128,B192) \</div><div class='del'>-	prologue(FUNC,BASE,B128,B192,R2,R8,R7,R9,R1,R3,R4,R6,R10,R5,R11)</div><div class='add'>+#define entry(FUNC,KEY,B128,B192) \</div><div class='add'>+	prologue(FUNC,KEY,B128,B192,R2,R8,R7,R9,R1,R3,R4,R6,R10,R5,R11)</div><div class='ctx'> </div><div class='ctx'> #define return epilogue(R8,R2,R9,R7,R5,R6,R3,R4,R11)</div><div class='ctx'> </div><div class='hunk'>@@ -147,9 +151,9 @@ FUNC:	movq	r1,r2;			\</div><div class='ctx'> #define decrypt_final(TAB,OFFSET) \</div><div class='ctx'> 	round(TAB,OFFSET,R2,R1,R4,R3,R6,R5,R7,R10,R5,R6,R3,R4)</div><div class='ctx'> </div><div class='del'>-/* void aes_encrypt(void *ctx, u8 *out, const u8 *in) */</div><div class='add'>+/* void aes_enc_blk(stuct crypto_tfm *tfm, u8 *out, const u8 *in) */</div><div class='ctx'> </div><div class='del'>-	entry(aes_encrypt,0,enc128,enc192)</div><div class='add'>+	entry(aes_enc_blk,0,enc128,enc192)</div><div class='ctx'> 	encrypt_round(aes_ft_tab,-96)</div><div class='ctx'> 	encrypt_round(aes_ft_tab,-80)</div><div class='ctx'> enc192:	encrypt_round(aes_ft_tab,-64)</div><div class='hunk'>@@ -166,9 +170,9 @@ enc128:	encrypt_round(aes_ft_tab,-32)</div><div class='ctx'> 	encrypt_final(aes_fl_tab,112)</div><div class='ctx'> 	return</div><div class='ctx'> </div><div class='del'>-/* void aes_decrypt(void *ctx, u8 *out, const u8 *in) */</div><div class='add'>+/* void aes_dec_blk(struct crypto_tfm *tfm, u8 *out, const u8 *in) */</div><div class='ctx'> </div><div class='del'>-	entry(aes_decrypt,240,dec128,dec192)</div><div class='add'>+	entry(aes_dec_blk,240,dec128,dec192)</div><div class='ctx'> 	decrypt_round(aes_it_tab,-96)</div><div class='ctx'> 	decrypt_round(aes_it_tab,-80)</div><div class='ctx'> dec192:	decrypt_round(aes_it_tab,-64)</div><div class='head'>diff --git a/arch/x86_64/crypto/aes.c b/arch/x86_64/crypto/aes.c<br/>index 6f77e7700d32..68866fab37aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/crypto/aes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/crypto/aes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/crypto/aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/crypto/aes.c</a></div><div class='hunk'>@@ -227,10 +227,10 @@ static void __init gen_tabs(void)</div><div class='ctx'> 	t ^= E_KEY[8 * i + 7]; E_KEY[8 * i + 15] = t;	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len,</div><div class='del'>-		       u32 *flags)</div><div class='add'>+static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = ctx_arg;</div><div class='add'>+	struct aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> 	u32 i, j, t, u, v, w;</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +283,18 @@ static int aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void aes_encrypt(void *ctx_arg, u8 *out, const u8 *in);</div><div class='del'>-extern void aes_decrypt(void *ctx_arg, u8 *out, const u8 *in);</div><div class='add'>+asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *out, const u8 *in);</div><div class='add'>+asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *out, const u8 *in);</div><div class='add'>+</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	aes_enc_blk(tfm, dst, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	aes_dec_blk(tfm, dst, src);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct crypto_alg aes_alg = {</div><div class='ctx'> 	.cra_name		=	"aes",</div><div class='head'>diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig<br/>index 69db0c0721d1..83d389b8ebd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/defconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/defconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/defconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/defconfig</a></div><div class='hunk'>@@ -1,11 +1,13 @@</div><div class='ctx'> #</div><div class='ctx'> # Automatically generated make config: don't edit</div><div class='del'>-# Linux kernel version: 2.6.17-rc1-git11</div><div class='del'>-# Sun Apr 16 07:22:36 2006</div><div class='add'>+# Linux kernel version: 2.6.17-git22</div><div class='add'>+# Tue Jul  4 14:24:40 2006</div><div class='ctx'> #</div><div class='ctx'> CONFIG_X86_64=y</div><div class='ctx'> CONFIG_64BIT=y</div><div class='ctx'> CONFIG_X86=y</div><div class='add'>+CONFIG_LOCKDEP_SUPPORT=y</div><div class='add'>+CONFIG_STACKTRACE_SUPPORT=y</div><div class='ctx'> CONFIG_SEMAPHORE_SLEEPERS=y</div><div class='ctx'> CONFIG_MMU=y</div><div class='ctx'> CONFIG_RWSEM_GENERIC_SPINLOCK=y</div><div class='hunk'>@@ -17,6 +19,7 @@ CONFIG_GENERIC_ISA_DMA=y</div><div class='ctx'> CONFIG_GENERIC_IOMAP=y</div><div class='ctx'> CONFIG_ARCH_MAY_HAVE_PC_FDC=y</div><div class='ctx'> CONFIG_DMI=y</div><div class='add'>+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Code maturity level options</div><div class='hunk'>@@ -42,7 +45,6 @@ CONFIG_IKCONFIG_PROC=y</div><div class='ctx'> # CONFIG_RELAY is not set</div><div class='ctx'> CONFIG_INITRAMFS_SOURCE=""</div><div class='ctx'> CONFIG_UID16=y</div><div class='del'>-CONFIG_VM86=y</div><div class='ctx'> CONFIG_CC_OPTIMIZE_FOR_SIZE=y</div><div class='ctx'> # CONFIG_EMBEDDED is not set</div><div class='ctx'> CONFIG_KALLSYMS=y</div><div class='hunk'>@@ -53,11 +55,12 @@ CONFIG_PRINTK=y</div><div class='ctx'> CONFIG_BUG=y</div><div class='ctx'> CONFIG_ELF_CORE=y</div><div class='ctx'> CONFIG_BASE_FULL=y</div><div class='add'>+CONFIG_RT_MUTEXES=y</div><div class='ctx'> CONFIG_FUTEX=y</div><div class='ctx'> CONFIG_EPOLL=y</div><div class='ctx'> CONFIG_SHMEM=y</div><div class='ctx'> CONFIG_SLAB=y</div><div class='del'>-CONFIG_DOUBLEFAULT=y</div><div class='add'>+CONFIG_VM_EVENT_COUNTERS=y</div><div class='ctx'> # CONFIG_TINY_SHMEM is not set</div><div class='ctx'> CONFIG_BASE_SMALL=0</div><div class='ctx'> # CONFIG_SLOB is not set</div><div class='hunk'>@@ -138,13 +141,16 @@ CONFIG_NEED_MULTIPLE_NODES=y</div><div class='ctx'> # CONFIG_SPARSEMEM_STATIC is not set</div><div class='ctx'> CONFIG_SPLIT_PTLOCK_CPUS=4</div><div class='ctx'> CONFIG_MIGRATION=y</div><div class='add'>+CONFIG_RESOURCES_64BIT=y</div><div class='ctx'> CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y</div><div class='ctx'> CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y</div><div class='ctx'> CONFIG_NR_CPUS=32</div><div class='ctx'> CONFIG_HOTPLUG_CPU=y</div><div class='add'>+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y</div><div class='ctx'> CONFIG_HPET_TIMER=y</div><div class='ctx'> CONFIG_HPET_EMULATE_RTC=y</div><div class='del'>-CONFIG_GART_IOMMU=y</div><div class='add'>+CONFIG_IOMMU=y</div><div class='add'>+# CONFIG_CALGARY_IOMMU is not set</div><div class='ctx'> CONFIG_SWIOTLB=y</div><div class='ctx'> CONFIG_X86_MCE=y</div><div class='ctx'> CONFIG_X86_MCE_INTEL=y</div><div class='hunk'>@@ -158,6 +164,7 @@ CONFIG_HZ_250=y</div><div class='ctx'> # CONFIG_HZ_1000 is not set</div><div class='ctx'> CONFIG_HZ=250</div><div class='ctx'> # CONFIG_REORDER is not set</div><div class='add'>+CONFIG_K8_NB=y</div><div class='ctx'> CONFIG_GENERIC_HARDIRQS=y</div><div class='ctx'> CONFIG_GENERIC_IRQ_PROBE=y</div><div class='ctx'> CONFIG_ISA_DMA_API=y</div><div class='hunk'>@@ -186,6 +193,7 @@ CONFIG_ACPI_BUTTON=y</div><div class='ctx'> # CONFIG_ACPI_VIDEO is not set</div><div class='ctx'> # CONFIG_ACPI_HOTKEY is not set</div><div class='ctx'> CONFIG_ACPI_FAN=y</div><div class='add'>+# CONFIG_ACPI_DOCK is not set</div><div class='ctx'> CONFIG_ACPI_PROCESSOR=y</div><div class='ctx'> CONFIG_ACPI_HOTPLUG_CPU=y</div><div class='ctx'> CONFIG_ACPI_THERMAL=y</div><div class='hunk'>@@ -200,7 +208,7 @@ CONFIG_ACPI_POWER=y</div><div class='ctx'> CONFIG_ACPI_SYSTEM=y</div><div class='ctx'> CONFIG_X86_PM_TIMER=y</div><div class='ctx'> CONFIG_ACPI_CONTAINER=y</div><div class='del'>-CONFIG_ACPI_HOTPLUG_MEMORY=y</div><div class='add'>+# CONFIG_ACPI_SBS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # CPU Frequency scaling</div><div class='hunk'>@@ -293,6 +301,8 @@ CONFIG_IP_PNP_DHCP=y</div><div class='ctx'> # CONFIG_INET_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET_TUNNEL is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> CONFIG_INET_DIAG=y</div><div class='ctx'> CONFIG_INET_TCP_DIAG=y</div><div class='ctx'> # CONFIG_TCP_CONG_ADVANCED is not set</div><div class='hunk'>@@ -305,7 +315,10 @@ CONFIG_IPV6=y</div><div class='ctx'> # CONFIG_INET6_IPCOMP is not set</div><div class='ctx'> # CONFIG_INET6_XFRM_TUNNEL is not set</div><div class='ctx'> # CONFIG_INET6_TUNNEL is not set</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set</div><div class='add'>+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set</div><div class='ctx'> # CONFIG_IPV6_TUNNEL is not set</div><div class='add'>+# CONFIG_NETWORK_SECMARK is not set</div><div class='ctx'> # CONFIG_NETFILTER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -344,6 +357,7 @@ CONFIG_IPV6=y</div><div class='ctx'> # Network testing</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_NET_PKTGEN is not set</div><div class='add'>+# CONFIG_NET_TCPPROBE is not set</div><div class='ctx'> # CONFIG_HAMRADIO is not set</div><div class='ctx'> # CONFIG_IRDA is not set</div><div class='ctx'> # CONFIG_BT is not set</div><div class='hunk'>@@ -360,6 +374,7 @@ CONFIG_STANDALONE=y</div><div class='ctx'> CONFIG_PREVENT_FIRMWARE_BUILD=y</div><div class='ctx'> CONFIG_FW_LOADER=y</div><div class='ctx'> # CONFIG_DEBUG_DRIVER is not set</div><div class='add'>+# CONFIG_SYS_HYPERVISOR is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Connector - unified userspace &lt;-&gt; kernelspace linker</div><div class='hunk'>@@ -526,6 +541,7 @@ CONFIG_SCSI_ATA_PIIX=y</div><div class='ctx'> # CONFIG_SCSI_SATA_MV is not set</div><div class='ctx'> CONFIG_SCSI_SATA_NV=y</div><div class='ctx'> # CONFIG_SCSI_PDC_ADMA is not set</div><div class='add'>+# CONFIG_SCSI_HPTIOP is not set</div><div class='ctx'> # CONFIG_SCSI_SATA_QSTOR is not set</div><div class='ctx'> # CONFIG_SCSI_SATA_PROMISE is not set</div><div class='ctx'> # CONFIG_SCSI_SATA_SX4 is not set</div><div class='hunk'>@@ -591,10 +607,7 @@ CONFIG_IEEE1394=y</div><div class='ctx'> #</div><div class='ctx'> # Device Drivers</div><div class='ctx'> #</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Texas Instruments PCILynx requires I2C</div><div class='del'>-#</div><div class='add'>+# CONFIG_IEEE1394_PCILYNX is not set</div><div class='ctx'> CONFIG_IEEE1394_OHCI1394=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -645,7 +658,16 @@ CONFIG_VORTEX=y</div><div class='ctx'> #</div><div class='ctx'> # Tulip family network device support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_NET_TULIP is not set</div><div class='add'>+CONFIG_NET_TULIP=y</div><div class='add'>+# CONFIG_DE2104X is not set</div><div class='add'>+CONFIG_TULIP=y</div><div class='add'>+# CONFIG_TULIP_MWI is not set</div><div class='add'>+# CONFIG_TULIP_MMIO is not set</div><div class='add'>+# CONFIG_TULIP_NAPI is not set</div><div class='add'>+# CONFIG_DE4X5 is not set</div><div class='add'>+# CONFIG_WINBOND_840 is not set</div><div class='add'>+# CONFIG_DM9102 is not set</div><div class='add'>+# CONFIG_ULI526X is not set</div><div class='ctx'> # CONFIG_HP100 is not set</div><div class='ctx'> CONFIG_NET_PCI=y</div><div class='ctx'> # CONFIG_PCNET32 is not set</div><div class='hunk'>@@ -697,6 +719,7 @@ CONFIG_TIGON3=y</div><div class='ctx'> # CONFIG_IXGB is not set</div><div class='ctx'> CONFIG_S2IO=m</div><div class='ctx'> # CONFIG_S2IO_NAPI is not set</div><div class='add'>+# CONFIG_MYRI10GE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Token Ring devices</div><div class='hunk'>@@ -786,6 +809,7 @@ CONFIG_SERIO_LIBPS2=y</div><div class='ctx'> CONFIG_VT=y</div><div class='ctx'> CONFIG_VT_CONSOLE=y</div><div class='ctx'> CONFIG_HW_CONSOLE=y</div><div class='add'>+# CONFIG_VT_HW_CONSOLE_BINDING is not set</div><div class='ctx'> # CONFIG_SERIAL_NONSTANDARD is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -855,6 +879,9 @@ CONFIG_SOFT_WATCHDOG=y</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_USBPCWATCHDOG is not set</div><div class='ctx'> CONFIG_HW_RANDOM=y</div><div class='add'>+CONFIG_HW_RANDOM_INTEL=y</div><div class='add'>+CONFIG_HW_RANDOM_AMD=y</div><div class='add'>+# CONFIG_HW_RANDOM_GEODE is not set</div><div class='ctx'> # CONFIG_NVRAM is not set</div><div class='ctx'> CONFIG_RTC=y</div><div class='ctx'> # CONFIG_DTLK is not set</div><div class='hunk'>@@ -871,6 +898,7 @@ CONFIG_AGP_INTEL=y</div><div class='ctx'> # CONFIG_AGP_VIA is not set</div><div class='ctx'> # CONFIG_DRM is not set</div><div class='ctx'> # CONFIG_MWAVE is not set</div><div class='add'>+# CONFIG_PC8736x_GPIO is not set</div><div class='ctx'> CONFIG_RAW_DRIVER=y</div><div class='ctx'> CONFIG_MAX_RAW_DEVS=256</div><div class='ctx'> CONFIG_HPET=y</div><div class='hunk'>@@ -887,7 +915,56 @@ CONFIG_HPET_MMAP=y</div><div class='ctx'> #</div><div class='ctx'> # I2C support</div><div class='ctx'> #</div><div class='del'>-# CONFIG_I2C is not set</div><div class='add'>+CONFIG_I2C=m</div><div class='add'>+CONFIG_I2C_CHARDEV=m</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Algorithms</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALGOBIT is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCF is not set</div><div class='add'>+# CONFIG_I2C_ALGOPCA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# I2C Hardware Bus support</div><div class='add'>+#</div><div class='add'>+# CONFIG_I2C_ALI1535 is not set</div><div class='add'>+# CONFIG_I2C_ALI1563 is not set</div><div class='add'>+# CONFIG_I2C_ALI15X3 is not set</div><div class='add'>+# CONFIG_I2C_AMD756 is not set</div><div class='add'>+# CONFIG_I2C_AMD8111 is not set</div><div class='add'>+# CONFIG_I2C_I801 is not set</div><div class='add'>+# CONFIG_I2C_I810 is not set</div><div class='add'>+# CONFIG_I2C_PIIX4 is not set</div><div class='add'>+CONFIG_I2C_ISA=m</div><div class='add'>+# CONFIG_I2C_NFORCE2 is not set</div><div class='add'>+# CONFIG_I2C_OCORES is not set</div><div class='add'>+# CONFIG_I2C_PARPORT_LIGHT is not set</div><div class='add'>+# CONFIG_I2C_PROSAVAGE is not set</div><div class='add'>+# CONFIG_I2C_SAVAGE4 is not set</div><div class='add'>+# CONFIG_I2C_SIS5595 is not set</div><div class='add'>+# CONFIG_I2C_SIS630 is not set</div><div class='add'>+# CONFIG_I2C_SIS96X is not set</div><div class='add'>+# CONFIG_I2C_STUB is not set</div><div class='add'>+# CONFIG_I2C_VIA is not set</div><div class='add'>+# CONFIG_I2C_VIAPRO is not set</div><div class='add'>+# CONFIG_I2C_VOODOO3 is not set</div><div class='add'>+# CONFIG_I2C_PCA_ISA is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Miscellaneous I2C Chip support</div><div class='add'>+#</div><div class='add'>+# CONFIG_SENSORS_DS1337 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1374 is not set</div><div class='add'>+# CONFIG_SENSORS_EEPROM is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8574 is not set</div><div class='add'>+# CONFIG_SENSORS_PCA9539 is not set</div><div class='add'>+# CONFIG_SENSORS_PCF8591 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX6875 is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CORE is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_ALGO is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_BUS is not set</div><div class='add'>+# CONFIG_I2C_DEBUG_CHIP is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # SPI support</div><div class='hunk'>@@ -898,14 +975,51 @@ CONFIG_HPET_MMAP=y</div><div class='ctx'> #</div><div class='ctx'> # Dallas's 1-wire bus</div><div class='ctx'> #</div><div class='del'>-# CONFIG_W1 is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Hardware Monitoring support</div><div class='ctx'> #</div><div class='ctx'> CONFIG_HWMON=y</div><div class='ctx'> # CONFIG_HWMON_VID is not set</div><div class='add'>+# CONFIG_SENSORS_ABITUGURU is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1021 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1025 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1026 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM1031 is not set</div><div class='add'>+# CONFIG_SENSORS_ADM9240 is not set</div><div class='add'>+# CONFIG_SENSORS_ASB100 is not set</div><div class='add'>+# CONFIG_SENSORS_ATXP1 is not set</div><div class='add'>+# CONFIG_SENSORS_DS1621 is not set</div><div class='ctx'> # CONFIG_SENSORS_F71805F is not set</div><div class='add'>+# CONFIG_SENSORS_FSCHER is not set</div><div class='add'>+# CONFIG_SENSORS_FSCPOS is not set</div><div class='add'>+# CONFIG_SENSORS_GL518SM is not set</div><div class='add'>+# CONFIG_SENSORS_GL520SM is not set</div><div class='add'>+# CONFIG_SENSORS_IT87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM63 is not set</div><div class='add'>+# CONFIG_SENSORS_LM75 is not set</div><div class='add'>+# CONFIG_SENSORS_LM77 is not set</div><div class='add'>+# CONFIG_SENSORS_LM78 is not set</div><div class='add'>+# CONFIG_SENSORS_LM80 is not set</div><div class='add'>+# CONFIG_SENSORS_LM83 is not set</div><div class='add'>+# CONFIG_SENSORS_LM85 is not set</div><div class='add'>+# CONFIG_SENSORS_LM87 is not set</div><div class='add'>+# CONFIG_SENSORS_LM90 is not set</div><div class='add'>+# CONFIG_SENSORS_LM92 is not set</div><div class='add'>+# CONFIG_SENSORS_MAX1619 is not set</div><div class='add'>+# CONFIG_SENSORS_PC87360 is not set</div><div class='add'>+# CONFIG_SENSORS_SIS5595 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M1 is not set</div><div class='add'>+# CONFIG_SENSORS_SMSC47M192 is not set</div><div class='add'>+CONFIG_SENSORS_SMSC47B397=m</div><div class='add'>+# CONFIG_SENSORS_VIA686A is not set</div><div class='add'>+# CONFIG_SENSORS_VT8231 is not set</div><div class='add'>+# CONFIG_SENSORS_W83781D is not set</div><div class='add'>+# CONFIG_SENSORS_W83791D is not set</div><div class='add'>+# CONFIG_SENSORS_W83792D is not set</div><div class='add'>+# CONFIG_SENSORS_W83L785TS is not set</div><div class='add'>+# CONFIG_SENSORS_W83627HF is not set</div><div class='add'>+# CONFIG_SENSORS_W83627EHF is not set</div><div class='ctx'> # CONFIG_SENSORS_HDAPS is not set</div><div class='ctx'> # CONFIG_HWMON_DEBUG_CHIP is not set</div><div class='ctx'> </div><div class='hunk'>@@ -918,6 +1032,7 @@ CONFIG_HWMON=y</div><div class='ctx'> # Multimedia devices</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_VIDEO_DEV is not set</div><div class='add'>+CONFIG_VIDEO_V4L2=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Digital Video Broadcasting Devices</div><div class='hunk'>@@ -928,8 +1043,8 @@ CONFIG_HWMON=y</div><div class='ctx'> #</div><div class='ctx'> # Graphics support</div><div class='ctx'> #</div><div class='add'>+# CONFIG_FIRMWARE_EDID is not set</div><div class='ctx'> # CONFIG_FB is not set</div><div class='del'>-CONFIG_VIDEO_SELECT=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Console display driver support</div><div class='hunk'>@@ -937,6 +1052,7 @@ CONFIG_VIDEO_SELECT=y</div><div class='ctx'> CONFIG_VGA_CONSOLE=y</div><div class='ctx'> CONFIG_VGACON_SOFT_SCROLLBACK=y</div><div class='ctx'> CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256</div><div class='add'>+CONFIG_VIDEO_SELECT=y</div><div class='ctx'> CONFIG_DUMMY_CONSOLE=y</div><div class='ctx'> </div><div class='ctx'> #</div><div class='hunk'>@@ -953,28 +1069,17 @@ CONFIG_SOUND=y</div><div class='ctx'> # Open Sound System</div><div class='ctx'> #</div><div class='ctx'> CONFIG_SOUND_PRIME=y</div><div class='del'>-CONFIG_OBSOLETE_OSS_DRIVER=y</div><div class='ctx'> # CONFIG_SOUND_BT878 is not set</div><div class='del'>-# CONFIG_SOUND_CMPCI is not set</div><div class='ctx'> # CONFIG_SOUND_EMU10K1 is not set</div><div class='ctx'> # CONFIG_SOUND_FUSION is not set</div><div class='del'>-# CONFIG_SOUND_CS4281 is not set</div><div class='del'>-# CONFIG_SOUND_ES1370 is not set</div><div class='ctx'> # CONFIG_SOUND_ES1371 is not set</div><div class='del'>-# CONFIG_SOUND_ESSSOLO1 is not set</div><div class='del'>-# CONFIG_SOUND_MAESTRO is not set</div><div class='del'>-# CONFIG_SOUND_MAESTRO3 is not set</div><div class='ctx'> CONFIG_SOUND_ICH=y</div><div class='del'>-# CONFIG_SOUND_SONICVIBES is not set</div><div class='ctx'> # CONFIG_SOUND_TRIDENT is not set</div><div class='ctx'> # CONFIG_SOUND_MSNDCLAS is not set</div><div class='ctx'> # CONFIG_SOUND_MSNDPIN is not set</div><div class='ctx'> # CONFIG_SOUND_VIA82CXXX is not set</div><div class='ctx'> # CONFIG_SOUND_OSS is not set</div><div class='del'>-# CONFIG_SOUND_ALI5455 is not set</div><div class='del'>-# CONFIG_SOUND_FORTE is not set</div><div class='del'>-# CONFIG_SOUND_RME96XX is not set</div><div class='del'>-# CONFIG_SOUND_AD1980 is not set</div><div class='add'>+# CONFIG_SOUND_TVMIXER is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # USB support</div><div class='hunk'>@@ -1000,6 +1105,7 @@ CONFIG_USB_DEVICEFS=y</div><div class='ctx'> CONFIG_USB_EHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_EHCI_SPLIT_ISO is not set</div><div class='ctx'> # CONFIG_USB_EHCI_ROOT_HUB_TT is not set</div><div class='add'>+# CONFIG_USB_EHCI_TT_NEWSCHED is not set</div><div class='ctx'> # CONFIG_USB_ISP116X_HCD is not set</div><div class='ctx'> CONFIG_USB_OHCI_HCD=y</div><div class='ctx'> # CONFIG_USB_OHCI_BIG_ENDIAN is not set</div><div class='hunk'>@@ -1089,10 +1195,12 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_USB_LEGOTOWER is not set</div><div class='ctx'> # CONFIG_USB_LCD is not set</div><div class='ctx'> # CONFIG_USB_LED is not set</div><div class='add'>+# CONFIG_USB_CY7C63 is not set</div><div class='ctx'> # CONFIG_USB_CYTHERM is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETKIT is not set</div><div class='ctx'> # CONFIG_USB_PHIDGETSERVO is not set</div><div class='ctx'> # CONFIG_USB_IDMOUSE is not set</div><div class='add'>+# CONFIG_USB_APPLEDISPLAY is not set</div><div class='ctx'> # CONFIG_USB_SISUSBVGA is not set</div><div class='ctx'> # CONFIG_USB_LD is not set</div><div class='ctx'> # CONFIG_USB_TEST is not set</div><div class='hunk'>@@ -1141,6 +1249,19 @@ CONFIG_USB_MON=y</div><div class='ctx'> # CONFIG_RTC_CLASS is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='add'>+# DMA Engine support</div><div class='add'>+#</div><div class='add'>+# CONFIG_DMA_ENGINE is not set</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Clients</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# DMA Devices</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+#</div><div class='ctx'> # Firmware Drivers</div><div class='ctx'> #</div><div class='ctx'> # CONFIG_EDD is not set</div><div class='hunk'>@@ -1175,6 +1296,7 @@ CONFIG_FS_POSIX_ACL=y</div><div class='ctx'> # CONFIG_MINIX_FS is not set</div><div class='ctx'> # CONFIG_ROMFS_FS is not set</div><div class='ctx'> CONFIG_INOTIFY=y</div><div class='add'>+CONFIG_INOTIFY_USER=y</div><div class='ctx'> # CONFIG_QUOTA is not set</div><div class='ctx'> CONFIG_DNOTIFY=y</div><div class='ctx'> CONFIG_AUTOFS_FS=y</div><div class='hunk'>@@ -1251,6 +1373,7 @@ CONFIG_SUNRPC=y</div><div class='ctx'> # CONFIG_RPCSEC_GSS_SPKM3 is not set</div><div class='ctx'> # CONFIG_SMB_FS is not set</div><div class='ctx'> # CONFIG_CIFS is not set</div><div class='add'>+# CONFIG_CIFS_DEBUG2 is not set</div><div class='ctx'> # CONFIG_NCP_FS is not set</div><div class='ctx'> # CONFIG_CODA_FS is not set</div><div class='ctx'> # CONFIG_AFS_FS is not set</div><div class='hunk'>@@ -1316,26 +1439,37 @@ CONFIG_KPROBES=y</div><div class='ctx'> #</div><div class='ctx'> # Kernel hacking</div><div class='ctx'> #</div><div class='add'>+CONFIG_TRACE_IRQFLAGS_SUPPORT=y</div><div class='ctx'> # CONFIG_PRINTK_TIME is not set</div><div class='ctx'> CONFIG_MAGIC_SYSRQ=y</div><div class='add'>+CONFIG_UNUSED_SYMBOLS=y</div><div class='ctx'> CONFIG_DEBUG_KERNEL=y</div><div class='ctx'> CONFIG_LOG_BUF_SHIFT=18</div><div class='ctx'> CONFIG_DETECT_SOFTLOCKUP=y</div><div class='ctx'> # CONFIG_SCHEDSTATS is not set</div><div class='ctx'> # CONFIG_DEBUG_SLAB is not set</div><div class='del'>-# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RT_MUTEXES is not set</div><div class='add'>+# CONFIG_RT_MUTEX_TESTER is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK is not set</div><div class='add'>+# CONFIG_DEBUG_MUTEXES is not set</div><div class='add'>+# CONFIG_DEBUG_RWSEMS is not set</div><div class='add'>+# CONFIG_DEBUG_LOCK_ALLOC is not set</div><div class='add'>+# CONFIG_PROVE_LOCKING is not set</div><div class='ctx'> # CONFIG_DEBUG_SPINLOCK_SLEEP is not set</div><div class='add'>+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set</div><div class='ctx'> # CONFIG_DEBUG_KOBJECT is not set</div><div class='ctx'> # CONFIG_DEBUG_INFO is not set</div><div class='ctx'> CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_DEBUG_VM is not set</div><div class='ctx'> # CONFIG_FRAME_POINTER is not set</div><div class='del'>-# CONFIG_UNWIND_INFO is not set</div><div class='add'>+CONFIG_UNWIND_INFO=y</div><div class='add'>+CONFIG_STACK_UNWIND=y</div><div class='ctx'> # CONFIG_FORCED_INLINING is not set</div><div class='ctx'> # CONFIG_RCU_TORTURE_TEST is not set</div><div class='ctx'> # CONFIG_DEBUG_RODATA is not set</div><div class='ctx'> # CONFIG_IOMMU_DEBUG is not set</div><div class='add'>+CONFIG_DEBUG_STACKOVERFLOW=y</div><div class='add'>+# CONFIG_DEBUG_STACK_USAGE is not set</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Security options</div><div class='hunk'>@@ -1359,3 +1493,4 @@ CONFIG_DEBUG_FS=y</div><div class='ctx'> # CONFIG_CRC16 is not set</div><div class='ctx'> CONFIG_CRC32=y</div><div class='ctx'> # CONFIG_LIBCRC32C is not set</div><div class='add'>+CONFIG_PLIST=y</div><div class='head'>diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile<br/>index e9263b4975e0..62bc5f56da9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/Makefile</a></div><div class='hunk'>@@ -11,6 +11,9 @@ obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IA32_AOUT) += ia32_aout.o</div><div class='ctx'> </div><div class='add'>+audit-class-$(CONFIG_AUDIT) := audit.o</div><div class='add'>+obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)</div><div class='add'>+</div><div class='ctx'> $(obj)/syscall32_syscall.o: \</div><div class='ctx'> 	$(foreach F,sysenter syscall,$(obj)/vsyscall-$F.so)</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/ia32/audit.c b/arch/x86_64/ia32/audit.c<br/>new file mode 100644<br/>index 000000000000..ab94f2e58cdd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/audit.c</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#include &lt;asm-i386/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+unsigned ia32_dir_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_dir_write.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+unsigned ia32_chattr_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_change_attr.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='head'>diff --git a/arch/x86_64/ia32/fpu32.c b/arch/x86_64/ia32/fpu32.c<br/>index 1c23095f1813..2c8209a3605a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/fpu32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/fpu32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/fpu32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/fpu32.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * Copyright 2002 Andi Kleen, SuSE Labs.</div><div class='ctx'>  * FXSAVE&lt;-&gt;i387 conversion support. Based on code by Gareth Hughes.</div><div class='ctx'>  * This is used for ptrace, signals and coredumps in 32bit emulation.</div><div class='del'>- * $Id: fpu32.c,v 1.1 2002/03/21 14:16:32 ak Exp $</div><div class='ctx'>  */ </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c<br/>index 926c4743d13b..a9dc0f3b5b51 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ia32_binfmt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ia32_binfmt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ia32_binfmt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/ia32_binfmt.c</a></div><div class='hunk'>@@ -182,7 +182,7 @@ struct elf_prpsinfo</div><div class='ctx'> #define user user32</div><div class='ctx'> </div><div class='ctx'> #define __ASM_X86_64_ELF_H 1</div><div class='del'>-#define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))</div><div class='add'>+#define elf_read_implies_exec(ex, executable_stack)     (executable_stack != EXSTACK_DISABLE_X)</div><div class='ctx'> //#include &lt;asm/ia32.h&gt;</div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c<br/>index e0a92439f634..25e5ca22204c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ia32_signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ia32_signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ia32_signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/ia32_signal.c</a></div><div class='hunk'>@@ -6,8 +6,6 @@</div><div class='ctx'>  *  1997-11-28  Modified for POSIX.1b signals by Richard Henderson</div><div class='ctx'>  *  2000-06-20  Pentium III FXSR, SSE support by Gareth Hughes</div><div class='ctx'>  *  2000-12-*   x86-64 compatibility mode signal handling by Andi Kleen</div><div class='del'>- * </div><div class='del'>- *  $Id: ia32_signal.c,v 1.22 2002/07/29 10:34:03 ak Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S<br/>index 5a92fed2d1d5..9b5bb413a6e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ia32entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ia32entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ia32entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/ia32entry.S</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;	</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/vsyscall32.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)</div><div class='hunk'>@@ -75,6 +76,10 @@ ENTRY(ia32_sysenter_target)</div><div class='ctx'> 	swapgs</div><div class='ctx'> 	movq	%gs:pda_kernelstack, %rsp</div><div class='ctx'> 	addq	$(PDA_STACKOFFSET),%rsp	</div><div class='add'>+	/*</div><div class='add'>+	 * No need to follow this irqs on/off section: the syscall</div><div class='add'>+	 * disabled irqs, here we enable it straight after entry:</div><div class='add'>+	 */</div><div class='ctx'> 	sti	</div><div class='ctx'>  	movl	%ebp,%ebp		/* zero extension */</div><div class='ctx'> 	pushq	$__USER32_DS</div><div class='hunk'>@@ -118,6 +123,7 @@ sysenter_do_call:</div><div class='ctx'> 	movq	%rax,RAX-ARGOFFSET(%rsp)</div><div class='ctx'> 	GET_THREAD_INFO(%r10)</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	testl	$_TIF_ALLWORK_MASK,threadinfo_flags(%r10)</div><div class='ctx'> 	jnz	int_ret_from_sys_call</div><div class='ctx'> 	andl    $~TS_COMPAT,threadinfo_status(%r10)</div><div class='hunk'>@@ -132,6 +138,7 @@ sysenter_do_call:</div><div class='ctx'> 	CFI_REGISTER rsp,rcx</div><div class='ctx'> 	movl	$VSYSCALL32_SYSEXIT,%edx	/* User %eip */</div><div class='ctx'> 	CFI_REGISTER rip,rdx</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	swapgs</div><div class='ctx'> 	sti		/* sti only takes effect after the next instruction */</div><div class='ctx'> 	/* sysexit */</div><div class='hunk'>@@ -155,6 +162,7 @@ sysenter_tracesys:</div><div class='ctx'> 	.previous</div><div class='ctx'> 	jmp	sysenter_do_call</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+ENDPROC(ia32_sysenter_target)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 32bit SYSCALL instruction entry.</div><div class='hunk'>@@ -178,13 +186,17 @@ sysenter_tracesys:</div><div class='ctx'>  */ 	</div><div class='ctx'> ENTRY(ia32_cstar_target)</div><div class='ctx'> 	CFI_STARTPROC32	simple</div><div class='del'>-	CFI_DEF_CFA	rsp,0</div><div class='add'>+	CFI_DEF_CFA	rsp,PDA_STACKOFFSET</div><div class='ctx'> 	CFI_REGISTER	rip,rcx</div><div class='ctx'> 	/*CFI_REGISTER	rflags,r11*/</div><div class='ctx'> 	swapgs</div><div class='ctx'> 	movl	%esp,%r8d</div><div class='ctx'> 	CFI_REGISTER	rsp,r8</div><div class='ctx'> 	movq	%gs:pda_kernelstack,%rsp</div><div class='add'>+	/*</div><div class='add'>+	 * No need to follow this irqs on/off section: the syscall</div><div class='add'>+	 * disabled irqs and here we enable it straight after entry:</div><div class='add'>+	 */</div><div class='ctx'> 	sti</div><div class='ctx'> 	SAVE_ARGS 8,1,1</div><div class='ctx'> 	movl 	%eax,%eax	/* zero extension */</div><div class='hunk'>@@ -219,6 +231,7 @@ cstar_do_call:</div><div class='ctx'> 	movq %rax,RAX-ARGOFFSET(%rsp)</div><div class='ctx'> 	GET_THREAD_INFO(%r10)</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)</div><div class='ctx'> 	jnz  int_ret_from_sys_call</div><div class='ctx'> 	andl $~TS_COMPAT,threadinfo_status(%r10)</div><div class='hunk'>@@ -227,6 +240,7 @@ cstar_do_call:</div><div class='ctx'> 	CFI_REGISTER rip,rcx</div><div class='ctx'> 	movl EFLAGS-ARGOFFSET(%rsp),%r11d	</div><div class='ctx'> 	/*CFI_REGISTER rflags,r11*/</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	movl RSP-ARGOFFSET(%rsp),%esp</div><div class='ctx'> 	CFI_RESTORE rsp</div><div class='ctx'> 	swapgs</div><div class='hunk'>@@ -249,6 +263,7 @@ cstar_tracesys:</div><div class='ctx'> 	.quad 1b,ia32_badarg</div><div class='ctx'> 	.previous</div><div class='ctx'> 	jmp cstar_do_call</div><div class='add'>+END(ia32_cstar_target)</div><div class='ctx'> 				</div><div class='ctx'> ia32_badarg:</div><div class='ctx'> 	movq $-EFAULT,%rax</div><div class='hunk'>@@ -284,7 +299,11 @@ ENTRY(ia32_syscall)</div><div class='ctx'> 	/*CFI_REL_OFFSET	rflags,EFLAGS-RIP*/</div><div class='ctx'> 	/*CFI_REL_OFFSET	cs,CS-RIP*/</div><div class='ctx'> 	CFI_REL_OFFSET	rip,RIP-RIP</div><div class='del'>-	swapgs	</div><div class='add'>+	swapgs</div><div class='add'>+	/*</div><div class='add'>+	 * No need to follow this irqs on/off section: the syscall</div><div class='add'>+	 * disabled irqs and here we enable it straight after entry:</div><div class='add'>+	 */</div><div class='ctx'> 	sti</div><div class='ctx'> 	movl %eax,%eax</div><div class='ctx'> 	pushq %rax</div><div class='hunk'>@@ -314,16 +333,13 @@ ia32_tracesys:</div><div class='ctx'> 	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	jmp ia32_do_syscall</div><div class='add'>+END(ia32_syscall)</div><div class='ctx'> </div><div class='ctx'> ia32_badsys:</div><div class='ctx'> 	movq $0,ORIG_RAX-ARGOFFSET(%rsp)</div><div class='ctx'> 	movq $-ENOSYS,RAX-ARGOFFSET(%rsp)</div><div class='ctx'> 	jmp int_ret_from_sys_call</div><div class='ctx'> </div><div class='del'>-ni_syscall:</div><div class='del'>-	movq %rax,%rdi</div><div class='del'>-	jmp  sys32_ni_syscall			</div><div class='del'>-</div><div class='ctx'> quiet_ni_syscall:</div><div class='ctx'> 	movq $-ENOSYS,%rax</div><div class='ctx'> 	ret</div><div class='hunk'>@@ -370,10 +386,10 @@ ENTRY(ia32_ptregs_common)</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	jmp  ia32_sysret	/* misbalances the return cache */</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(ia32_ptregs_common)</div><div class='ctx'> </div><div class='ctx'> 	.section .rodata,"a"</div><div class='ctx'> 	.align 8</div><div class='del'>-	.globl ia32_sys_call_table</div><div class='ctx'> ia32_sys_call_table:</div><div class='ctx'> 	.quad sys_restart_syscall</div><div class='ctx'> 	.quad sys_exit</div><div class='hunk'>@@ -696,4 +712,5 @@ ia32_sys_call_table:</div><div class='ctx'> 	.quad sys_sync_file_range</div><div class='ctx'> 	.quad sys_tee</div><div class='ctx'> 	.quad compat_sys_vmsplice</div><div class='add'>+	.quad compat_sys_move_pages</div><div class='ctx'> ia32_syscall_end:		</div><div class='head'>diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c<br/>index 23a4515a73b4..659c0722f6b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ptrace32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/ptrace32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/ptrace32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/ptrace32.c</a></div><div class='hunk'>@@ -7,8 +7,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  * This allows to access 64bit processes too; but there is no way to see the extended </div><div class='ctx'>  * register contents.</div><div class='del'>- *</div><div class='del'>- * $Id: ptrace32.c,v 1.16 2003/03/14 16:06:35 ak Exp $</div><div class='ctx'>  */ </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -27,6 +25,7 @@</div><div class='ctx'> #include &lt;asm/debugreg.h&gt;</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/fpu32.h&gt;</div><div class='add'>+#include &lt;asm/ia32.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Determines which flags the user has access to [1 = access, 0 = no access].</div><div class='hunk'>@@ -199,6 +198,31 @@ static int getreg32(struct task_struct *child, unsigned regno, u32 *val)</div><div class='ctx'> </div><div class='ctx'> #undef R32</div><div class='ctx'> </div><div class='add'>+static long ptrace32_siginfo(unsigned request, u32 pid, u32 addr, u32 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	compat_siginfo_t *si32 = (compat_siginfo_t *)compat_ptr(data);</div><div class='add'>+	siginfo_t ssi; </div><div class='add'>+	siginfo_t *si = compat_alloc_user_space(sizeof(siginfo_t));</div><div class='add'>+	if (request == PTRACE_SETSIGINFO) {</div><div class='add'>+		memset(&amp;ssi, 0, sizeof(siginfo_t));</div><div class='add'>+		ret = copy_siginfo_from_user32(&amp;ssi, si32);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (copy_to_user(si, &amp;ssi, sizeof(siginfo_t)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	ret = sys_ptrace(request, pid, addr, (unsigned long)si);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (request == PTRACE_GETSIGINFO) {</div><div class='add'>+		if (copy_from_user(&amp;ssi, si, sizeof(siginfo_t)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		ret = copy_siginfo_to_user32(si32, &amp;ssi);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *child;</div><div class='hunk'>@@ -208,9 +232,19 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)</div><div class='ctx'> 	__u32 val;</div><div class='ctx'> </div><div class='ctx'> 	switch (request) { </div><div class='del'>-	default:</div><div class='add'>+	case PTRACE_TRACEME:</div><div class='add'>+	case PTRACE_ATTACH:</div><div class='add'>+	case PTRACE_KILL:</div><div class='add'>+	case PTRACE_CONT:</div><div class='add'>+	case PTRACE_SINGLESTEP:</div><div class='add'>+	case PTRACE_DETACH:</div><div class='add'>+	case PTRACE_SYSCALL:</div><div class='add'>+	case PTRACE_SETOPTIONS:</div><div class='ctx'> 		return sys_ptrace(request, pid, addr, data); </div><div class='ctx'> </div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	case PTRACE_PEEKTEXT:</div><div class='ctx'> 	case PTRACE_PEEKDATA:</div><div class='ctx'> 	case PTRACE_POKEDATA:</div><div class='hunk'>@@ -225,10 +259,11 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)</div><div class='ctx'> 	case PTRACE_GETFPXREGS:</div><div class='ctx'> 	case PTRACE_GETEVENTMSG:</div><div class='ctx'> 		break;</div><div class='del'>-	} </div><div class='ctx'> </div><div class='del'>-	if (request == PTRACE_TRACEME)</div><div class='del'>-		return ptrace_traceme();</div><div class='add'>+	case PTRACE_SETSIGINFO:</div><div class='add'>+	case PTRACE_GETSIGINFO:</div><div class='add'>+		return ptrace32_siginfo(request, pid, addr, data);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	child = ptrace_get_task_struct(pid);</div><div class='ctx'> 	if (IS_ERR(child))</div><div class='hunk'>@@ -349,8 +384,7 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='head'>diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c<br/>index f182b20858e2..9c130993380d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/sys_ia32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/ia32/sys_ia32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/ia32/sys_ia32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/ia32/sys_ia32.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * This should be fixed.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt; </div><div class='hunk'>@@ -508,19 +507,6 @@ sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, int options)</div><div class='ctx'> 	return compat_sys_wait4(pid, stat_addr, options, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sys32_ni_syscall(int call)</div><div class='del'>-{ </div><div class='del'>-	struct task_struct *me = current;</div><div class='del'>-	static char lastcomm[sizeof(me-&gt;comm)];</div><div class='del'>-</div><div class='del'>-	if (strncmp(lastcomm, me-&gt;comm, sizeof(lastcomm))) {</div><div class='del'>-		printk(KERN_INFO "IA32 syscall %d from %s not implemented\n",</div><div class='del'>-		       call, me-&gt;comm);</div><div class='del'>-		strncpy(lastcomm, me-&gt;comm, sizeof(lastcomm));</div><div class='del'>-	} </div><div class='del'>-	return -ENOSYS;	       </div><div class='del'>-} </div><div class='del'>-</div><div class='ctx'> /* 32-bit timeval and related flotsam.  */</div><div class='ctx'> </div><div class='ctx'> asmlinkage long</div><div class='hunk'>@@ -916,7 +902,7 @@ long sys32_vm86_warning(void)</div><div class='ctx'> 	struct task_struct *me = current;</div><div class='ctx'> 	static char lastcomm[sizeof(me-&gt;comm)];</div><div class='ctx'> 	if (strncmp(lastcomm, me-&gt;comm, sizeof(lastcomm))) {</div><div class='del'>-		printk(KERN_INFO "%s: vm86 mode not supported on 64 bit kernel\n",</div><div class='add'>+		compat_printk(KERN_INFO "%s: vm86 mode not supported on 64 bit kernel\n",</div><div class='ctx'> 		       me-&gt;comm);</div><div class='ctx'> 		strncpy(lastcomm, me-&gt;comm, sizeof(lastcomm));</div><div class='ctx'> 	} </div><div class='hunk'>@@ -929,13 +915,3 @@ long sys32_lookup_dcookie(u32 addr_low, u32 addr_high,</div><div class='ctx'> 	return sys_lookup_dcookie(((u64)addr_high &lt;&lt; 32) | addr_low, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init ia32_init (void)</div><div class='del'>-{</div><div class='del'>-	printk("IA32 emulation $Id: sys_ia32.c,v 1.32 2002/03/24 13:02:28 ak Exp $\n");  </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__initcall(ia32_init);</div><div class='del'>-</div><div class='del'>-extern unsigned long ia32_sys_call_table[];</div><div class='del'>-EXPORT_SYMBOL(ia32_sys_call_table);</div><div class='head'>diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile<br/>index 059c88313f4e..b5aaeafc1cd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/Makefile</a></div><div class='hunk'>@@ -8,8 +8,9 @@ obj-y	:= process.o signal.o entry.o traps.o irq.o \</div><div class='ctx'> 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \</div><div class='ctx'> 		x8664_ksyms.o i387.o syscall.o vsyscall.o \</div><div class='ctx'> 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \</div><div class='del'>-		pci-dma.o pci-nommu.o</div><div class='add'>+		pci-dma.o pci-nommu.o alternative.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_STACKTRACE)	+= stacktrace.o</div><div class='ctx'> obj-$(CONFIG_X86_MCE)         += mce.o</div><div class='ctx'> obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o</div><div class='ctx'> obj-$(CONFIG_X86_MCE_AMD)	+= mce_amd.o</div><div class='hunk'>@@ -28,11 +29,14 @@ obj-$(CONFIG_PM)		+= suspend.o</div><div class='ctx'> obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend_asm.o</div><div class='ctx'> obj-$(CONFIG_CPU_FREQ)		+= cpufreq/</div><div class='ctx'> obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o</div><div class='del'>-obj-$(CONFIG_GART_IOMMU)	+= pci-gart.o aperture.o</div><div class='add'>+obj-$(CONFIG_IOMMU)		+= pci-gart.o aperture.o</div><div class='add'>+obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary.o tce.o</div><div class='ctx'> obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb.o</div><div class='ctx'> obj-$(CONFIG_KPROBES)		+= kprobes.o</div><div class='ctx'> obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o</div><div class='ctx'> obj-$(CONFIG_X86_VSMP)		+= vsmp.o</div><div class='add'>+obj-$(CONFIG_K8_NB)		+= k8.o</div><div class='add'>+obj-$(CONFIG_AUDIT)		+= audit.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MODULES)		+= module.o</div><div class='ctx'> </div><div class='hunk'>@@ -49,3 +53,5 @@ intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o</div><div class='ctx'> quirks-y			+= ../../i386/kernel/quirks.o</div><div class='ctx'> i8237-y				+= ../../i386/kernel/i8237.o</div><div class='ctx'> msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o</div><div class='add'>+alternative-y			+= ../../i386/kernel/alternative.o</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile<br/>index 4fe97071f297..080b9963f1bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/acpi/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/acpi/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/acpi/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/acpi/Makefile</a></div><div class='hunk'>@@ -4,5 +4,6 @@ obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup.o</div><div class='ctx'> </div><div class='ctx'> ifneq ($(CONFIG_ACPI_PROCESSOR),)</div><div class='ctx'> obj-y			+= processor.o</div><div class='add'>+processor-y		:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/kernel/acpi/processor.c b/arch/x86_64/kernel/acpi/processor.c<br/>deleted file mode 100644<br/>index 3bdc2baa5bb1..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/acpi/processor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/acpi/processor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * arch/x86_64/kernel/acpi/processor.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005 Intel Corporation</div><div class='del'>- * 	Venkatesh Pallipadi &lt;venkatesh.pallipadi@intel.com&gt;</div><div class='del'>- * 	- Added _PDC for platforms with Intel CPUs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/acpi.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;acpi/processor.h&gt;</div><div class='del'>-#include &lt;asm/acpi.h&gt;</div><div class='del'>-</div><div class='del'>-static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)</div><div class='del'>-{</div><div class='del'>-	struct acpi_object_list *obj_list;</div><div class='del'>-	union acpi_object *obj;</div><div class='del'>-	u32 *buf;</div><div class='del'>-</div><div class='del'>-	/* allocate and initialize pdc. It will be used later. */</div><div class='del'>-	obj_list = kmalloc(sizeof(struct acpi_object_list), GFP_KERNEL);</div><div class='del'>-	if (!obj_list) {</div><div class='del'>-		printk(KERN_ERR "Memory allocation error\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL);</div><div class='del'>-	if (!obj) {</div><div class='del'>-		printk(KERN_ERR "Memory allocation error\n");</div><div class='del'>-		kfree(obj_list);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf = kmalloc(12, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		printk(KERN_ERR "Memory allocation error\n");</div><div class='del'>-		kfree(obj);</div><div class='del'>-		kfree(obj_list);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf[0] = ACPI_PDC_REVISION_ID;</div><div class='del'>-	buf[1] = 1;</div><div class='del'>-	buf[2] = ACPI_PDC_EST_CAPABILITY_SMP;</div><div class='del'>-</div><div class='del'>-	obj-&gt;type = ACPI_TYPE_BUFFER;</div><div class='del'>-	obj-&gt;buffer.length = 12;</div><div class='del'>-	obj-&gt;buffer.pointer = (u8 *) buf;</div><div class='del'>-	obj_list-&gt;count = 1;</div><div class='del'>-	obj_list-&gt;pointer = obj;</div><div class='del'>-	pr-&gt;pdc = obj_list;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialize _PDC data based on the CPU vendor */</div><div class='del'>-void arch_acpi_processor_init_pdc(struct acpi_processor *pr)</div><div class='del'>-{</div><div class='del'>-	unsigned int cpu = pr-&gt;id;</div><div class='del'>-	struct cpuinfo_x86 *c = cpu_data + cpu;</div><div class='del'>-</div><div class='del'>-	pr-&gt;pdc = NULL;</div><div class='del'>-	if (c-&gt;x86_vendor == X86_VENDOR_INTEL &amp;&amp; cpu_has(c, X86_FEATURE_EST))</div><div class='del'>-		init_intel_pdc(pr, c);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(arch_acpi_processor_init_pdc);</div><div class='head'>diff --git a/arch/x86_64/kernel/acpi/sleep.c b/arch/x86_64/kernel/acpi/sleep.c<br/>index 867a0ebee177..5ebf62c7a3d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/acpi/sleep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/acpi/sleep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/acpi/sleep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/acpi/sleep.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -35,6 +34,8 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/apic.h&gt;</div><div class='hunk'>@@ -66,7 +67,8 @@ static void init_low_mapping(void)</div><div class='ctx'> 	pgd_t *slot0 = pgd_offset(current-&gt;mm, 0UL);</div><div class='ctx'> 	low_ptr = *slot0;</div><div class='ctx'> 	set_pgd(slot0, *pgd_offset(current-&gt;mm, PAGE_OFFSET));</div><div class='del'>-	flush_tlb_all();</div><div class='add'>+	WARN_ON(num_online_cpus() != 1);</div><div class='add'>+	local_flush_tlb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -92,7 +94,7 @@ int acpi_save_state_mem(void)</div><div class='ctx'> void acpi_restore_state_mem(void)</div><div class='ctx'> {</div><div class='ctx'> 	set_pgd(pgd_offset(current-&gt;mm, 0UL), low_ptr);</div><div class='del'>-	flush_tlb_all();</div><div class='add'>+	local_flush_tlb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c<br/>index 70b9d21ed675..58af8e73738b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/aperture.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/aperture.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/aperture.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/aperture.c</a></div><div class='hunk'>@@ -8,9 +8,7 @@</div><div class='ctx'>  * because only the bootmem allocator can allocate 32+MB. </div><div class='ctx'>  * </div><div class='ctx'>  * Copyright 2002 Andi Kleen, SuSE Labs.</div><div class='del'>- * $Id: aperture.c,v 1.7 2003/08/01 03:36:18 ak Exp $</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,6 +22,7 @@</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/pci-direct.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/k8.h&gt;</div><div class='ctx'> </div><div class='ctx'> int iommu_aperture;</div><div class='ctx'> int iommu_aperture_disabled __initdata = 0;</div><div class='hunk'>@@ -37,8 +36,6 @@ int fix_aperture __initdata = 1;</div><div class='ctx'> /* This code runs before the PCI subsystem is initialized, so just</div><div class='ctx'>    access the northbridge directly. */</div><div class='ctx'> </div><div class='del'>-#define NB_ID_3 (PCI_VENDOR_ID_AMD | (0x1103&lt;&lt;16))</div><div class='del'>-</div><div class='ctx'> static u32 __init allocate_aperture(void) </div><div class='ctx'> {</div><div class='ctx'> 	pg_data_t *nd0 = NODE_DATA(0);</div><div class='hunk'>@@ -68,20 +65,20 @@ static u32 __init allocate_aperture(void)</div><div class='ctx'> 	return (u32)__pa(p); </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init aperture_valid(char *name, u64 aper_base, u32 aper_size) </div><div class='add'>+static int __init aperture_valid(u64 aper_base, u32 aper_size)</div><div class='ctx'> { </div><div class='ctx'> 	if (!aper_base) </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (aper_size &lt; 64*1024*1024) { </div><div class='del'>-		printk("Aperture from %s too small (%d MB)\n", name, aper_size&gt;&gt;20); </div><div class='add'>+		printk("Aperture too small (%d MB)\n", aper_size&gt;&gt;20);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (aper_base + aper_size &gt;= 0xffffffff) { </div><div class='del'>-		printk("Aperture from %s beyond 4GB. Ignoring.\n",name);</div><div class='add'>+		printk("Aperture beyond 4GB. Ignoring.\n");</div><div class='ctx'> 		return 0; </div><div class='ctx'> 	}</div><div class='ctx'> 	if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {</div><div class='del'>-		printk("Aperture from %s pointing to e820 RAM. Ignoring.\n",name);</div><div class='add'>+		printk("Aperture pointing to e820 RAM. Ignoring.\n");</div><div class='ctx'> 		return 0; </div><div class='ctx'> 	} </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -140,7 +137,7 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order)</div><div class='ctx'> 	printk("Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", </div><div class='ctx'> 	       aper, 32 &lt;&lt; *order, apsizereg);</div><div class='ctx'> </div><div class='del'>-	if (!aperture_valid("AGP bridge", aper, (32*1024*1024) &lt;&lt; *order))</div><div class='add'>+	if (!aperture_valid(aper, (32*1024*1024) &lt;&lt; *order))</div><div class='ctx'> 	    return 0;</div><div class='ctx'> 	return (u32)aper; </div><div class='ctx'> } </div><div class='hunk'>@@ -208,10 +205,10 @@ void __init iommu_hole_init(void)</div><div class='ctx'> </div><div class='ctx'> 	fix = 0;</div><div class='ctx'> 	for (num = 24; num &lt; 32; num++) {		</div><div class='del'>-		char name[30];</div><div class='del'>-		if (read_pci_config(0, num, 3, 0x00) != NB_ID_3) </div><div class='del'>-			continue;	</div><div class='add'>+		if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='add'>+		iommu_detected = 1;</div><div class='ctx'> 		iommu_aperture = 1; </div><div class='ctx'> </div><div class='ctx'> 		aper_order = (read_pci_config(0, num, 3, 0x90) &gt;&gt; 1) &amp; 7; </div><div class='hunk'>@@ -222,9 +219,7 @@ void __init iommu_hole_init(void)</div><div class='ctx'> 		printk("CPU %d: aperture @ %Lx size %u MB\n", num-24, </div><div class='ctx'> 		       aper_base, aper_size&gt;&gt;20);</div><div class='ctx'> 		</div><div class='del'>-		sprintf(name, "northbridge cpu %d", num-24); </div><div class='del'>-</div><div class='del'>-		if (!aperture_valid(name, aper_base, aper_size)) { </div><div class='add'>+		if (!aperture_valid(aper_base, aper_size)) {</div><div class='ctx'> 			fix = 1; </div><div class='ctx'> 			break; </div><div class='ctx'> 		}</div><div class='hunk'>@@ -273,7 +268,7 @@ void __init iommu_hole_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Fix up the north bridges */</div><div class='ctx'> 	for (num = 24; num &lt; 32; num++) { 		</div><div class='del'>-		if (read_pci_config(0, num, 3, 0x00) != NB_ID_3) </div><div class='add'>+		if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))</div><div class='ctx'> 			continue;	</div><div class='ctx'> </div><div class='ctx'> 		/* Don't enable translation yet. That is done later. </div><div class='head'>diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c<br/>index 100a30c40044..2b8cef037a65 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/apic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/apic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/apic.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *	Mikael Pettersson	:	PM converted to driver model.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -51,7 +50,7 @@ int disable_apic_timer __initdata;</div><div class='ctx'> static cpumask_t timer_interrupt_broadcast_ipi_mask;</div><div class='ctx'> </div><div class='ctx'> /* Using APIC to generate smp_local_timer_interrupt? */</div><div class='del'>-int using_apic_timer = 0;</div><div class='add'>+int using_apic_timer __read_mostly = 0;</div><div class='ctx'> </div><div class='ctx'> static void apic_pm_activate(void);</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +99,7 @@ void clear_local_APIC(void)</div><div class='ctx'> 	maxlvt = get_maxlvt();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Masking an LVT entry on a P6 can trigger a local APIC error</div><div class='add'>+	 * Masking an LVT entry can trigger a local APIC error</div><div class='ctx'> 	 * if the vector is zero. Mask LVTERR first to prevent this.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (maxlvt &gt;= 3) {</div><div class='hunk'>@@ -851,7 +850,18 @@ void disable_APIC_timer(void)</div><div class='ctx'> 		unsigned long v;</div><div class='ctx'> </div><div class='ctx'> 		v = apic_read(APIC_LVTT);</div><div class='del'>-		apic_write(APIC_LVTT, v | APIC_LVT_MASKED);</div><div class='add'>+		/*</div><div class='add'>+		 * When an illegal vector value (0-15) is written to an LVT</div><div class='add'>+		 * entry and delivery mode is Fixed, the APIC may signal an</div><div class='add'>+		 * illegal vector error, with out regard to whether the mask</div><div class='add'>+		 * bit is set or whether an interrupt is actually seen on input.</div><div class='add'>+		 *</div><div class='add'>+		 * Boot sequence might call this function when the LVTT has</div><div class='add'>+		 * '0' vector value. So make sure vector field is set to</div><div class='add'>+		 * valid value.</div><div class='add'>+		 */</div><div class='add'>+		v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);</div><div class='add'>+		apic_write(APIC_LVTT, v);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -909,15 +919,13 @@ int setup_profiling_timer(unsigned int multiplier)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_X86_MCE_AMD</div><div class='del'>-void setup_threshold_lvt(unsigned long lvt_off)</div><div class='add'>+void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,</div><div class='add'>+			    unsigned char msg_type, unsigned char mask)</div><div class='ctx'> {</div><div class='del'>-	unsigned int v = 0;</div><div class='del'>-	unsigned long reg = (lvt_off &lt;&lt; 4) + 0x500;</div><div class='del'>-	v |= THRESHOLD_APIC_VECTOR;</div><div class='add'>+	unsigned long reg = (lvt_off &lt;&lt; 4) + K8_APIC_EXT_LVT_BASE;</div><div class='add'>+	unsigned int  v   = (mask &lt;&lt; 16) | (msg_type &lt;&lt; 8) | vector;</div><div class='ctx'> 	apic_write(reg, v);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_X86_MCE_AMD */</div><div class='ctx'> </div><div class='ctx'> #undef APIC_DIVISOR</div><div class='ctx'> </div><div class='hunk'>@@ -983,7 +991,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * oem_force_hpet_timer -- force HPET mode for some boxes.</div><div class='add'>+ * apic_is_clustered_box() -- Check if we can expect good TSC</div><div class='ctx'>  *</div><div class='ctx'>  * Thus far, the major user of this is IBM's Summit2 series:</div><div class='ctx'>  *</div><div class='hunk'>@@ -991,7 +999,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)</div><div class='ctx'>  * multi-chassis. Use available data to take a good guess.</div><div class='ctx'>  * If in doubt, go HPET.</div><div class='ctx'>  */</div><div class='del'>-__cpuinit int oem_force_hpet_timer(void)</div><div class='add'>+__cpuinit int apic_is_clustered_box(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, clusters, zeros;</div><div class='ctx'> 	unsigned id;</div><div class='hunk'>@@ -1022,8 +1030,7 @@ __cpuinit int oem_force_hpet_timer(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If clusters &gt; 2, then should be multi-chassis.  Return 1 for HPET.</div><div class='del'>-	 * Else return 0 to use TSC.</div><div class='add'>+	 * If clusters &gt; 2, then should be multi-chassis.</div><div class='ctx'> 	 * May have to revisit this when multi-core + hyperthreaded CPUs come</div><div class='ctx'> 	 * out, but AFAIK this will work even for them.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86_64/kernel/asm-offsets.c<br/>index 38834bbbae11..96687e2beb2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/asm-offsets.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/asm-offsets.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/asm-offsets.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  * and format the required data.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/crypto.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt; </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt; </div><div class='hunk'>@@ -68,5 +69,7 @@ int main(void)</div><div class='ctx'> 	DEFINE(pbe_next, offsetof(struct pbe, next));</div><div class='ctx'> 	BLANK();</div><div class='ctx'> 	DEFINE(TSS_ist, offsetof(struct tss_struct, ist));</div><div class='add'>+	BLANK();</div><div class='add'>+	DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86_64/kernel/audit.c b/arch/x86_64/kernel/audit.c<br/>new file mode 100644<br/>index 000000000000..a067aa468a85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/audit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/audit.c</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/audit.h&gt;</div><div class='add'>+#include &lt;asm/unistd.h&gt;</div><div class='add'>+</div><div class='add'>+static unsigned dir_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_dir_write.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned chattr_class[] = {</div><div class='add'>+#include &lt;asm-generic/audit_change_attr.h&gt;</div><div class='add'>+~0U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init audit_classes_init(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_IA32_EMULATION</div><div class='add'>+	extern __u32 ia32_dir_class[];</div><div class='add'>+	extern __u32 ia32_chattr_class[];</div><div class='add'>+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);</div><div class='add'>+	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);</div><div class='add'>+#endif</div><div class='add'>+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);</div><div class='add'>+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__initcall(audit_classes_init);</div><div class='head'>diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c<br/>index 4e6c3b729e39..d8d5750d6106 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/crash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/crash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/crash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/crash.c</a></div><div class='hunk'>@@ -111,14 +111,14 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)</div><div class='ctx'> 	atomic_dec(&amp;waiting_for_crash_ipi);</div><div class='ctx'> 	/* Assume hlt works */</div><div class='ctx'> 	for(;;)</div><div class='del'>-		asm("hlt");</div><div class='add'>+		halt();</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void smp_send_nmi_allbutself(void)</div><div class='ctx'> {</div><div class='del'>-	send_IPI_allbutself(APIC_DM_NMI);</div><div class='add'>+	send_IPI_allbutself(NMI_VECTOR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -161,7 +161,7 @@ void machine_crash_shutdown(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function is only called after the system</div><div class='del'>-	 * has paniced or is otherwise in a critical state.</div><div class='add'>+	 * has panicked or is otherwise in a critical state.</div><div class='ctx'> 	 * The minimum amount of code to allow a kexec'd kernel</div><div class='ctx'> 	 * to run successfully needs to happen here.</div><div class='ctx'> 	 *</div><div class='head'>diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c<br/>index 1ef6028f721e..e56c2adf57a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/e820.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/e820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/e820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/e820.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /* </div><div class='ctx'>  * Handle the memory map.</div><div class='ctx'>  * The functions here do the job until bootmem takes over.</div><div class='del'>- * $Id: e820.c,v 1.4 2002/09/19 19:25:32 ak Exp $</div><div class='ctx'>  *</div><div class='ctx'>  *  Getting sanitize_e820_map() in sync with i386 version by applying change:</div><div class='ctx'>  *  -  Provisions for empty E820 memory regions (reported by certain BIOSes).</div><div class='hunk'>@@ -9,7 +8,6 @@</div><div class='ctx'>  *  Venkatesh Pallipadi &lt;venkatesh.pallipadi@intel.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -19,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;asm/e820.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='hunk'>@@ -621,6 +620,7 @@ void __init parse_memmapopt(char *p, char **from)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long pci_mem_start = 0xaeedbabe;</div><div class='add'>+EXPORT_SYMBOL(pci_mem_start);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Search for the biggest gap in the low 32 bits of the e820</div><div class='head'>diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c<br/>index b93ef5b51980..140051e07fa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/early_printk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/early_printk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/early_printk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/early_printk.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/fcntl.h&gt;</div><div class='head'>diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S<br/>index 586b34c00c48..d464dded68c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/entry.S</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ASSEMBLY 1</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/segment.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='hunk'>@@ -42,13 +41,24 @@</div><div class='ctx'> #include &lt;asm/thread_info.h&gt;</div><div class='ctx'> #include &lt;asm/hw_irq.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;asm/irqflags.h&gt;</div><div class='ctx'> </div><div class='ctx'> 	.code64</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PREEMPT</div><div class='ctx'> #define retint_kernel retint_restore_args</div><div class='ctx'> #endif	</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+.macro TRACE_IRQS_IRETQ offset=ARGOFFSET</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	bt   $9,EFLAGS-\offset(%rsp)	/* interrupts off? */</div><div class='add'>+	jnc  1f</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+1:</div><div class='add'>+#endif</div><div class='add'>+.endm</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * C code is not supposed to know about undefined top of stack. Every time </div><div class='ctx'>  * a C function with an pt_regs argument is called from the SYSCALL based </div><div class='hunk'>@@ -154,6 +164,7 @@ rff_trace:</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)	</div><div class='ctx'> 	jmp rff_action</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(ret_from_fork)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * System call entry. Upto 6 arguments in registers are supported.</div><div class='hunk'>@@ -188,12 +199,16 @@ rff_trace:</div><div class='ctx'> </div><div class='ctx'> ENTRY(system_call)</div><div class='ctx'> 	CFI_STARTPROC	simple</div><div class='del'>-	CFI_DEF_CFA	rsp,0</div><div class='add'>+	CFI_DEF_CFA	rsp,PDA_STACKOFFSET</div><div class='ctx'> 	CFI_REGISTER	rip,rcx</div><div class='ctx'> 	/*CFI_REGISTER	rflags,r11*/</div><div class='ctx'> 	swapgs</div><div class='ctx'> 	movq	%rsp,%gs:pda_oldrsp </div><div class='ctx'> 	movq	%gs:pda_kernelstack,%rsp</div><div class='add'>+	/*</div><div class='add'>+	 * No need to follow this irqs off/on section - it's straight</div><div class='add'>+	 * and short:</div><div class='add'>+	 */</div><div class='ctx'> 	sti					</div><div class='ctx'> 	SAVE_ARGS 8,1</div><div class='ctx'> 	movq  %rax,ORIG_RAX-ARGOFFSET(%rsp) </div><div class='hunk'>@@ -219,10 +234,15 @@ ret_from_sys_call:</div><div class='ctx'> sysret_check:		</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl threadinfo_flags(%rcx),%edx</div><div class='ctx'> 	andl %edi,%edx</div><div class='ctx'> 	CFI_REMEMBER_STATE</div><div class='ctx'> 	jnz  sysret_careful </div><div class='add'>+	/*</div><div class='add'>+	 * sysretq will re-enable interrupts:</div><div class='add'>+	 */</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	movq RIP-ARGOFFSET(%rsp),%rcx</div><div class='ctx'> 	CFI_REGISTER	rip,rcx</div><div class='ctx'> 	RESTORE_ARGS 0,-ARG_SKIP,1</div><div class='hunk'>@@ -237,6 +257,7 @@ sysret_careful:</div><div class='ctx'> 	CFI_RESTORE_STATE</div><div class='ctx'> 	bt $TIF_NEED_RESCHED,%edx</div><div class='ctx'> 	jnc sysret_signal</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	pushq %rdi</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 8</div><div class='hunk'>@@ -247,6 +268,7 @@ sysret_careful:</div><div class='ctx'> </div><div class='ctx'> 	/* Handle a signal */ </div><div class='ctx'> sysret_signal:</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP),%edx</div><div class='ctx'> 	jz    1f</div><div class='hunk'>@@ -261,6 +283,7 @@ sysret_signal:</div><div class='ctx'> 	/* Use IRET because user could have changed frame. This</div><div class='ctx'> 	   works because ptregscall_common has called FIXUP_TOP_OF_STACK. */</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	jmp int_with_check</div><div class='ctx'> 	</div><div class='ctx'> badsys:</div><div class='hunk'>@@ -285,6 +308,7 @@ tracesys:</div><div class='ctx'> 	/* Use IRET because user could have changed frame */</div><div class='ctx'> 	jmp int_ret_from_sys_call</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(system_call)</div><div class='ctx'> 		</div><div class='ctx'> /* </div><div class='ctx'>  * Syscall return path ending with IRET.</div><div class='hunk'>@@ -308,6 +332,7 @@ ENTRY(int_ret_from_sys_call)</div><div class='ctx'> 	CFI_REL_OFFSET	r10,R10-ARGOFFSET</div><div class='ctx'> 	CFI_REL_OFFSET	r11,R11-ARGOFFSET</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	testl $3,CS-ARGOFFSET(%rsp)</div><div class='ctx'> 	je retint_restore_args</div><div class='ctx'> 	movl $_TIF_ALLWORK_MASK,%edi</div><div class='hunk'>@@ -326,6 +351,7 @@ int_with_check:</div><div class='ctx'> int_careful:</div><div class='ctx'> 	bt $TIF_NEED_RESCHED,%edx</div><div class='ctx'> 	jnc  int_very_careful</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	pushq %rdi</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 8</div><div class='hunk'>@@ -333,10 +359,12 @@ int_careful:</div><div class='ctx'> 	popq %rdi</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET -8</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	jmp int_with_check</div><div class='ctx'> </div><div class='ctx'> 	/* handle signals and tracing -- both require a full stack frame */</div><div class='ctx'> int_very_careful:</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	SAVE_REST</div><div class='ctx'> 	/* Check for syscall exit trace */	</div><div class='hunk'>@@ -350,6 +378,7 @@ int_very_careful:</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET -8</div><div class='ctx'> 	andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	jmp int_restore_rest</div><div class='ctx'> 	</div><div class='ctx'> int_signal:</div><div class='hunk'>@@ -362,8 +391,10 @@ int_signal:</div><div class='ctx'> int_restore_rest:</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	jmp int_with_check</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(int_ret_from_sys_call)</div><div class='ctx'> 		</div><div class='ctx'> /* </div><div class='ctx'>  * Certain special system calls that need to save a complete full stack frame.</div><div class='hunk'>@@ -375,6 +406,7 @@ int_restore_rest:</div><div class='ctx'> 	leaq	\func(%rip),%rax</div><div class='ctx'> 	leaq    -ARGOFFSET+8(%rsp),\arg /* 8 for return address */</div><div class='ctx'> 	jmp	ptregscall_common</div><div class='add'>+END(\label)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	CFI_STARTPROC</div><div class='hunk'>@@ -404,6 +436,7 @@ ENTRY(ptregscall_common)</div><div class='ctx'> 	CFI_REL_OFFSET rip, 0</div><div class='ctx'> 	ret</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(ptregscall_common)</div><div class='ctx'> 	</div><div class='ctx'> ENTRY(stub_execve)</div><div class='ctx'> 	CFI_STARTPROC</div><div class='hunk'>@@ -418,6 +451,7 @@ ENTRY(stub_execve)</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	jmp int_ret_from_sys_call</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(stub_execve)</div><div class='ctx'> 	</div><div class='ctx'> /*</div><div class='ctx'>  * sigreturn is special because it needs to restore all registers on return.</div><div class='hunk'>@@ -435,6 +469,7 @@ ENTRY(stub_rt_sigreturn)</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	jmp int_ret_from_sys_call</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(stub_rt_sigreturn)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * initial frame state for interrupts and exceptions</div><div class='hunk'>@@ -466,29 +501,22 @@ ENTRY(stub_rt_sigreturn)</div><div class='ctx'> /* 0(%rsp): interrupt number */ </div><div class='ctx'> 	.macro interrupt func</div><div class='ctx'> 	cld</div><div class='del'>-#ifdef CONFIG_DEBUG_INFO</div><div class='del'>-	SAVE_ALL	</div><div class='del'>-	movq %rsp,%rdi</div><div class='del'>-	/*</div><div class='del'>-	 * Setup a stack frame pointer.  This allows gdb to trace</div><div class='del'>-	 * back to the original stack.</div><div class='del'>-	 */</div><div class='del'>-	movq %rsp,%rbp</div><div class='del'>-	CFI_DEF_CFA_REGISTER	rbp</div><div class='del'>-#else		</div><div class='ctx'> 	SAVE_ARGS</div><div class='ctx'> 	leaq -ARGOFFSET(%rsp),%rdi	# arg1 for handler</div><div class='del'>-#endif	</div><div class='add'>+	pushq %rbp</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET	8</div><div class='add'>+	CFI_REL_OFFSET		rbp, 0</div><div class='add'>+	movq %rsp,%rbp</div><div class='add'>+	CFI_DEF_CFA_REGISTER	rbp</div><div class='ctx'> 	testl $3,CS(%rdi)</div><div class='ctx'> 	je 1f</div><div class='ctx'> 	swapgs	</div><div class='ctx'> 1:	incl	%gs:pda_irqcount	# RED-PEN should check preempt count</div><div class='del'>-	movq %gs:pda_irqstackptr,%rax</div><div class='del'>-	cmoveq %rax,%rsp /*todo This needs CFI annotation! */</div><div class='del'>-	pushq %rdi			# save old stack	</div><div class='del'>-#ifndef CONFIG_DEBUG_INFO</div><div class='del'>-	CFI_ADJUST_CFA_OFFSET	8</div><div class='del'>-#endif</div><div class='add'>+	cmoveq %gs:pda_irqstackptr,%rsp</div><div class='add'>+	/*</div><div class='add'>+	 * We entered an interrupt context - irqs are off:</div><div class='add'>+	 */</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	call \func</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='hunk'>@@ -497,17 +525,12 @@ ENTRY(common_interrupt)</div><div class='ctx'> 	interrupt do_IRQ</div><div class='ctx'> 	/* 0(%rsp): oldrsp-ARGOFFSET */</div><div class='ctx'> ret_from_intr:</div><div class='del'>-	popq  %rdi</div><div class='del'>-#ifndef CONFIG_DEBUG_INFO</div><div class='del'>-	CFI_ADJUST_CFA_OFFSET	-8</div><div class='del'>-#endif</div><div class='ctx'> 	cli	</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	decl %gs:pda_irqcount</div><div class='del'>-#ifdef CONFIG_DEBUG_INFO</div><div class='del'>-	movq RBP(%rdi),%rbp</div><div class='add'>+	leaveq</div><div class='ctx'> 	CFI_DEF_CFA_REGISTER	rsp</div><div class='del'>-#endif</div><div class='del'>-	leaq ARGOFFSET(%rdi),%rsp /*todo This needs CFI annotation! */</div><div class='add'>+	CFI_ADJUST_CFA_OFFSET	-8</div><div class='ctx'> exit_intr:</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)</div><div class='ctx'> 	testl $3,CS-ARGOFFSET(%rsp)</div><div class='hunk'>@@ -526,9 +549,21 @@ retint_check:</div><div class='ctx'> 	CFI_REMEMBER_STATE</div><div class='ctx'> 	jnz  retint_careful</div><div class='ctx'> retint_swapgs:	 	</div><div class='add'>+	/*</div><div class='add'>+	 * The iretq could re-enable interrupts:</div><div class='add'>+	 */</div><div class='add'>+	cli</div><div class='add'>+	TRACE_IRQS_IRETQ</div><div class='ctx'> 	swapgs </div><div class='add'>+	jmp restore_args</div><div class='add'>+</div><div class='ctx'> retint_restore_args:				</div><div class='ctx'> 	cli</div><div class='add'>+	/*</div><div class='add'>+	 * The iretq could re-enable interrupts:</div><div class='add'>+	 */</div><div class='add'>+	TRACE_IRQS_IRETQ</div><div class='add'>+restore_args:</div><div class='ctx'> 	RESTORE_ARGS 0,8,0						</div><div class='ctx'> iret_label:	</div><div class='ctx'> 	iretq</div><div class='hunk'>@@ -541,6 +576,7 @@ iret_label:</div><div class='ctx'> 	/* running with kernel gs */</div><div class='ctx'> bad_iret:</div><div class='ctx'> 	movq $11,%rdi	/* SIGSEGV */</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	jmp do_exit			</div><div class='ctx'> 	.previous	</div><div class='hunk'>@@ -550,6 +586,7 @@ retint_careful:</div><div class='ctx'> 	CFI_RESTORE_STATE</div><div class='ctx'> 	bt    $TIF_NEED_RESCHED,%edx</div><div class='ctx'> 	jnc   retint_signal</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	pushq %rdi</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET	8</div><div class='hunk'>@@ -558,11 +595,13 @@ retint_careful:</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET	-8</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	jmp retint_check</div><div class='ctx'> 	</div><div class='ctx'> retint_signal:</div><div class='ctx'> 	testl $(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SINGLESTEP),%edx</div><div class='ctx'> 	jz    retint_swapgs</div><div class='add'>+	TRACE_IRQS_ON</div><div class='ctx'> 	sti</div><div class='ctx'> 	SAVE_REST</div><div class='ctx'> 	movq $-1,ORIG_RAX(%rsp) 			</div><div class='hunk'>@@ -571,6 +610,7 @@ retint_signal:</div><div class='ctx'> 	call do_notify_resume</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	movl $_TIF_NEED_RESCHED,%edi</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)</div><div class='ctx'> 	jmp retint_check</div><div class='hunk'>@@ -589,14 +629,16 @@ retint_kernel:</div><div class='ctx'> 	call preempt_schedule_irq</div><div class='ctx'> 	jmp exit_intr</div><div class='ctx'> #endif	</div><div class='add'>+</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(common_interrupt)</div><div class='ctx'> 	</div><div class='ctx'> /*</div><div class='ctx'>  * APIC interrupts.</div><div class='ctx'>  */		</div><div class='ctx'> 	.macro apicinterrupt num,func</div><div class='ctx'> 	INTR_FRAME</div><div class='del'>-	pushq $\num-256</div><div class='add'>+	pushq $~(\num)</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 8</div><div class='ctx'> 	interrupt \func</div><div class='ctx'> 	jmp ret_from_intr</div><div class='hunk'>@@ -605,17 +647,21 @@ retint_kernel:</div><div class='ctx'> </div><div class='ctx'> ENTRY(thermal_interrupt)</div><div class='ctx'> 	apicinterrupt THERMAL_APIC_VECTOR,smp_thermal_interrupt</div><div class='add'>+END(thermal_interrupt)</div><div class='ctx'> </div><div class='ctx'> ENTRY(threshold_interrupt)</div><div class='ctx'> 	apicinterrupt THRESHOLD_APIC_VECTOR,mce_threshold_interrupt</div><div class='add'>+END(threshold_interrupt)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP	</div><div class='ctx'> ENTRY(reschedule_interrupt)</div><div class='ctx'> 	apicinterrupt RESCHEDULE_VECTOR,smp_reschedule_interrupt</div><div class='add'>+END(reschedule_interrupt)</div><div class='ctx'> </div><div class='ctx'> 	.macro INVALIDATE_ENTRY num</div><div class='ctx'> ENTRY(invalidate_interrupt\num)</div><div class='ctx'> 	apicinterrupt INVALIDATE_TLB_VECTOR_START+\num,smp_invalidate_interrupt	</div><div class='add'>+END(invalidate_interrupt\num)</div><div class='ctx'> 	.endm</div><div class='ctx'> </div><div class='ctx'> 	INVALIDATE_ENTRY 0</div><div class='hunk'>@@ -629,17 +675,21 @@ ENTRY(invalidate_interrupt\num)</div><div class='ctx'> </div><div class='ctx'> ENTRY(call_function_interrupt)</div><div class='ctx'> 	apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt</div><div class='add'>+END(call_function_interrupt)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_LOCAL_APIC	</div><div class='ctx'> ENTRY(apic_timer_interrupt)</div><div class='ctx'> 	apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt</div><div class='add'>+END(apic_timer_interrupt)</div><div class='ctx'> </div><div class='ctx'> ENTRY(error_interrupt)</div><div class='ctx'> 	apicinterrupt ERROR_APIC_VECTOR,smp_error_interrupt</div><div class='add'>+END(error_interrupt)</div><div class='ctx'> </div><div class='ctx'> ENTRY(spurious_interrupt)</div><div class='ctx'> 	apicinterrupt SPURIOUS_APIC_VECTOR,smp_spurious_interrupt</div><div class='add'>+END(spurious_interrupt)</div><div class='ctx'> #endif</div><div class='ctx'> 				</div><div class='ctx'> /*</div><div class='hunk'>@@ -667,7 +717,7 @@ ENTRY(spurious_interrupt)</div><div class='ctx'> </div><div class='ctx'> 	/* error code is on the stack already */</div><div class='ctx'> 	/* handle NMI like exceptions that can happen everywhere */</div><div class='del'>-	.macro paranoidentry sym, ist=0</div><div class='add'>+	.macro paranoidentry sym, ist=0, irqtrace=1</div><div class='ctx'> 	SAVE_ALL</div><div class='ctx'> 	cld</div><div class='ctx'> 	movl $1,%ebx</div><div class='hunk'>@@ -692,8 +742,73 @@ ENTRY(spurious_interrupt)</div><div class='ctx'> 	addq	$EXCEPTION_STKSZ, per_cpu__init_tss + TSS_ist + (\ist - 1) * 8(%rbp)</div><div class='ctx'> 	.endif</div><div class='ctx'> 	cli</div><div class='add'>+	.if \irqtrace</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='add'>+	.endif</div><div class='ctx'> 	.endm</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+ 	 * "Paranoid" exit path from exception stack.</div><div class='add'>+  	 * Paranoid because this is used by NMIs and cannot take</div><div class='add'>+	 * any kernel state for granted.</div><div class='add'>+	 * We don't do kernel preemption checks here, because only</div><div class='add'>+	 * NMI should be common and it does not enable IRQs and</div><div class='add'>+	 * cannot get reschedule ticks.</div><div class='add'>+	 *</div><div class='add'>+	 * "trace" is 0 for the NMI handler only, because irq-tracing</div><div class='add'>+	 * is fundamentally NMI-unsafe. (we cannot change the soft and</div><div class='add'>+	 * hard flags at once, atomically)</div><div class='add'>+	 */</div><div class='add'>+	.macro paranoidexit trace=1</div><div class='add'>+	/* ebx:	no swapgs flag */</div><div class='add'>+paranoid_exit\trace:</div><div class='add'>+	testl %ebx,%ebx				/* swapgs needed? */</div><div class='add'>+	jnz paranoid_restore\trace</div><div class='add'>+	testl $3,CS(%rsp)</div><div class='add'>+	jnz   paranoid_userspace\trace</div><div class='add'>+paranoid_swapgs\trace:</div><div class='add'>+	TRACE_IRQS_IRETQ 0</div><div class='add'>+	swapgs</div><div class='add'>+paranoid_restore\trace:</div><div class='add'>+	RESTORE_ALL 8</div><div class='add'>+	iretq</div><div class='add'>+paranoid_userspace\trace:</div><div class='add'>+	GET_THREAD_INFO(%rcx)</div><div class='add'>+	movl threadinfo_flags(%rcx),%ebx</div><div class='add'>+	andl $_TIF_WORK_MASK,%ebx</div><div class='add'>+	jz paranoid_swapgs\trace</div><div class='add'>+	movq %rsp,%rdi			/* &amp;pt_regs */</div><div class='add'>+	call sync_regs</div><div class='add'>+	movq %rax,%rsp			/* switch stack for scheduling */</div><div class='add'>+	testl $_TIF_NEED_RESCHED,%ebx</div><div class='add'>+	jnz paranoid_schedule\trace</div><div class='add'>+	movl %ebx,%edx			/* arg3: thread flags */</div><div class='add'>+	.if \trace</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+	.endif</div><div class='add'>+	sti</div><div class='add'>+	xorl %esi,%esi 			/* arg2: oldset */</div><div class='add'>+	movq %rsp,%rdi 			/* arg1: &amp;pt_regs */</div><div class='add'>+	call do_notify_resume</div><div class='add'>+	cli</div><div class='add'>+	.if \trace</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='add'>+	.endif</div><div class='add'>+	jmp paranoid_userspace\trace</div><div class='add'>+paranoid_schedule\trace:</div><div class='add'>+	.if \trace</div><div class='add'>+	TRACE_IRQS_ON</div><div class='add'>+	.endif</div><div class='add'>+	sti</div><div class='add'>+	call schedule</div><div class='add'>+	cli</div><div class='add'>+	.if \trace</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='add'>+	.endif</div><div class='add'>+	jmp paranoid_userspace\trace</div><div class='add'>+	CFI_ENDPROC</div><div class='add'>+	.endm</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Exception entry point. This expects an error code/orig_rax on the stack</div><div class='ctx'>  * and the exception handler in %rax.	</div><div class='hunk'>@@ -749,6 +864,7 @@ error_exit:</div><div class='ctx'> 	movl %ebx,%eax		</div><div class='ctx'> 	RESTORE_REST</div><div class='ctx'> 	cli</div><div class='add'>+	TRACE_IRQS_OFF</div><div class='ctx'> 	GET_THREAD_INFO(%rcx)	</div><div class='ctx'> 	testl %eax,%eax</div><div class='ctx'> 	jne  retint_kernel</div><div class='hunk'>@@ -756,6 +872,10 @@ error_exit:</div><div class='ctx'> 	movl  $_TIF_WORK_MASK,%edi</div><div class='ctx'> 	andl  %edi,%edx</div><div class='ctx'> 	jnz  retint_careful</div><div class='add'>+	/*</div><div class='add'>+	 * The iret might restore flags:</div><div class='add'>+	 */</div><div class='add'>+	TRACE_IRQS_IRETQ</div><div class='ctx'> 	swapgs </div><div class='ctx'> 	RESTORE_ARGS 0,8,0						</div><div class='ctx'> 	jmp iret_label</div><div class='hunk'>@@ -777,6 +897,7 @@ error_kernelspace:</div><div class='ctx'> 	cmpq $gs_change,RIP(%rsp)</div><div class='ctx'>         je   error_swapgs</div><div class='ctx'> 	jmp  error_sti</div><div class='add'>+END(error_entry)</div><div class='ctx'> 	</div><div class='ctx'>        /* Reload gs selector with exception handling */</div><div class='ctx'>        /* edi:  new selector */ </div><div class='hunk'>@@ -794,6 +915,7 @@ gs_change:</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET -8</div><div class='ctx'>         ret</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+ENDPROC(load_gs_index)</div><div class='ctx'>        </div><div class='ctx'>         .section __ex_table,"a"</div><div class='ctx'>         .align 8</div><div class='hunk'>@@ -847,7 +969,7 @@ ENTRY(kernel_thread)</div><div class='ctx'> 	UNFAKE_STACK_FRAME</div><div class='ctx'> 	ret</div><div class='ctx'> 	CFI_ENDPROC</div><div class='del'>-</div><div class='add'>+ENDPROC(kernel_thread)</div><div class='ctx'> 	</div><div class='ctx'> child_rip:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -860,6 +982,7 @@ child_rip:</div><div class='ctx'> 	# exit</div><div class='ctx'> 	xorl %edi, %edi</div><div class='ctx'> 	call do_exit</div><div class='add'>+ENDPROC(child_rip)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.</div><div class='hunk'>@@ -889,19 +1012,24 @@ ENTRY(execve)</div><div class='ctx'> 	UNFAKE_STACK_FRAME</div><div class='ctx'> 	ret</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+ENDPROC(execve)</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(page_fault)</div><div class='ctx'> 	errorentry do_page_fault</div><div class='add'>+END(page_fault)</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> ENTRY(coprocessor_error)</div><div class='ctx'> 	zeroentry do_coprocessor_error</div><div class='add'>+END(coprocessor_error)</div><div class='ctx'> </div><div class='ctx'> ENTRY(simd_coprocessor_error)</div><div class='ctx'> 	zeroentry do_simd_coprocessor_error	</div><div class='add'>+END(simd_coprocessor_error)</div><div class='ctx'> </div><div class='ctx'> ENTRY(device_not_available)</div><div class='ctx'> 	zeroentry math_state_restore</div><div class='add'>+END(device_not_available)</div><div class='ctx'> </div><div class='ctx'> 	/* runs on exception stack */</div><div class='ctx'> KPROBE_ENTRY(debug)</div><div class='hunk'>@@ -909,8 +1037,8 @@ KPROBE_ENTRY(debug)</div><div class='ctx'> 	pushq $0</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 8		</div><div class='ctx'> 	paranoidentry do_debug, DEBUG_STACK</div><div class='del'>-	jmp paranoid_exit</div><div class='del'>-	CFI_ENDPROC</div><div class='add'>+	paranoidexit</div><div class='add'>+END(debug)</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> 	/* runs on exception stack */	</div><div class='hunk'>@@ -918,49 +1046,14 @@ KPROBE_ENTRY(nmi)</div><div class='ctx'> 	INTR_FRAME</div><div class='ctx'> 	pushq $-1</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 8</div><div class='del'>-	paranoidentry do_nmi</div><div class='del'>-	/*</div><div class='del'>- 	 * "Paranoid" exit path from exception stack.</div><div class='del'>-  	 * Paranoid because this is used by NMIs and cannot take</div><div class='del'>-	 * any kernel state for granted.</div><div class='del'>-	 * We don't do kernel preemption checks here, because only</div><div class='del'>-	 * NMI should be common and it does not enable IRQs and</div><div class='del'>-	 * cannot get reschedule ticks.</div><div class='del'>-	 */</div><div class='del'>-	/* ebx:	no swapgs flag */</div><div class='del'>-paranoid_exit:</div><div class='del'>-	testl %ebx,%ebx				/* swapgs needed? */</div><div class='del'>-	jnz paranoid_restore</div><div class='del'>-	testl $3,CS(%rsp)</div><div class='del'>-	jnz   paranoid_userspace</div><div class='del'>-paranoid_swapgs:	</div><div class='del'>-	swapgs</div><div class='del'>-paranoid_restore:	</div><div class='del'>-	RESTORE_ALL 8</div><div class='del'>-	iretq</div><div class='del'>-paranoid_userspace:	</div><div class='del'>-	GET_THREAD_INFO(%rcx)</div><div class='del'>-	movl threadinfo_flags(%rcx),%ebx</div><div class='del'>-	andl $_TIF_WORK_MASK,%ebx</div><div class='del'>-	jz paranoid_swapgs</div><div class='del'>-	movq %rsp,%rdi			/* &amp;pt_regs */</div><div class='del'>-	call sync_regs</div><div class='del'>-	movq %rax,%rsp			/* switch stack for scheduling */</div><div class='del'>-	testl $_TIF_NEED_RESCHED,%ebx</div><div class='del'>-	jnz paranoid_schedule</div><div class='del'>-	movl %ebx,%edx			/* arg3: thread flags */</div><div class='del'>-	sti</div><div class='del'>-	xorl %esi,%esi 			/* arg2: oldset */</div><div class='del'>-	movq %rsp,%rdi 			/* arg1: &amp;pt_regs */</div><div class='del'>-	call do_notify_resume</div><div class='del'>-	cli</div><div class='del'>-	jmp paranoid_userspace</div><div class='del'>-paranoid_schedule:</div><div class='del'>-	sti</div><div class='del'>-	call schedule</div><div class='del'>-	cli</div><div class='del'>-	jmp paranoid_userspace</div><div class='del'>-	CFI_ENDPROC</div><div class='add'>+	paranoidentry do_nmi, 0, 0</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	paranoidexit 0</div><div class='add'>+#else</div><div class='add'>+	jmp paranoid_exit1</div><div class='add'>+ 	CFI_ENDPROC</div><div class='add'>+#endif</div><div class='add'>+END(nmi)</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(int3)</div><div class='hunk'>@@ -968,57 +1061,71 @@ KPROBE_ENTRY(int3)</div><div class='ctx'>  	pushq $0</div><div class='ctx'>  	CFI_ADJUST_CFA_OFFSET 8</div><div class='ctx'>  	paranoidentry do_int3, DEBUG_STACK</div><div class='del'>- 	jmp paranoid_exit</div><div class='add'>+ 	jmp paranoid_exit1</div><div class='ctx'>  	CFI_ENDPROC</div><div class='add'>+END(int3)</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> ENTRY(overflow)</div><div class='ctx'> 	zeroentry do_overflow</div><div class='add'>+END(overflow)</div><div class='ctx'> </div><div class='ctx'> ENTRY(bounds)</div><div class='ctx'> 	zeroentry do_bounds</div><div class='add'>+END(bounds)</div><div class='ctx'> </div><div class='ctx'> ENTRY(invalid_op)</div><div class='ctx'> 	zeroentry do_invalid_op	</div><div class='add'>+END(invalid_op)</div><div class='ctx'> </div><div class='ctx'> ENTRY(coprocessor_segment_overrun)</div><div class='ctx'> 	zeroentry do_coprocessor_segment_overrun</div><div class='add'>+END(coprocessor_segment_overrun)</div><div class='ctx'> </div><div class='ctx'> ENTRY(reserved)</div><div class='ctx'> 	zeroentry do_reserved</div><div class='add'>+END(reserved)</div><div class='ctx'> </div><div class='ctx'> 	/* runs on exception stack */</div><div class='ctx'> ENTRY(double_fault)</div><div class='ctx'> 	XCPT_FRAME</div><div class='ctx'> 	paranoidentry do_double_fault</div><div class='del'>-	jmp paranoid_exit</div><div class='add'>+	jmp paranoid_exit1</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(double_fault)</div><div class='ctx'> </div><div class='ctx'> ENTRY(invalid_TSS)</div><div class='ctx'> 	errorentry do_invalid_TSS</div><div class='add'>+END(invalid_TSS)</div><div class='ctx'> </div><div class='ctx'> ENTRY(segment_not_present)</div><div class='ctx'> 	errorentry do_segment_not_present</div><div class='add'>+END(segment_not_present)</div><div class='ctx'> </div><div class='ctx'> 	/* runs on exception stack */</div><div class='ctx'> ENTRY(stack_segment)</div><div class='ctx'> 	XCPT_FRAME</div><div class='ctx'> 	paranoidentry do_stack_segment</div><div class='del'>-	jmp paranoid_exit</div><div class='add'>+	jmp paranoid_exit1</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(stack_segment)</div><div class='ctx'> </div><div class='ctx'> KPROBE_ENTRY(general_protection)</div><div class='ctx'> 	errorentry do_general_protection</div><div class='add'>+END(general_protection)</div><div class='ctx'> 	.previous .text</div><div class='ctx'> </div><div class='ctx'> ENTRY(alignment_check)</div><div class='ctx'> 	errorentry do_alignment_check</div><div class='add'>+END(alignment_check)</div><div class='ctx'> </div><div class='ctx'> ENTRY(divide_error)</div><div class='ctx'> 	zeroentry do_divide_error</div><div class='add'>+END(divide_error)</div><div class='ctx'> </div><div class='ctx'> ENTRY(spurious_interrupt_bug)</div><div class='ctx'> 	zeroentry do_spurious_interrupt_bug</div><div class='add'>+END(spurious_interrupt_bug)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_MCE</div><div class='ctx'> 	/* runs on exception stack */</div><div class='hunk'>@@ -1027,8 +1134,9 @@ ENTRY(machine_check)</div><div class='ctx'> 	pushq $0</div><div class='ctx'> 	CFI_ADJUST_CFA_OFFSET 8	</div><div class='ctx'> 	paranoidentry do_machine_check</div><div class='del'>-	jmp paranoid_exit</div><div class='add'>+	jmp paranoid_exit1</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+END(machine_check)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> ENTRY(call_softirq)</div><div class='hunk'>@@ -1046,3 +1154,37 @@ ENTRY(call_softirq)</div><div class='ctx'> 	decl %gs:pda_irqcount</div><div class='ctx'> 	ret</div><div class='ctx'> 	CFI_ENDPROC</div><div class='add'>+ENDPROC(call_softirq)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_STACK_UNWIND</div><div class='add'>+ENTRY(arch_unwind_init_running)</div><div class='add'>+	CFI_STARTPROC</div><div class='add'>+	movq	%r15, R15(%rdi)</div><div class='add'>+	movq	%r14, R14(%rdi)</div><div class='add'>+	xchgq	%rsi, %rdx</div><div class='add'>+	movq	%r13, R13(%rdi)</div><div class='add'>+	movq	%r12, R12(%rdi)</div><div class='add'>+	xorl	%eax, %eax</div><div class='add'>+	movq	%rbp, RBP(%rdi)</div><div class='add'>+	movq	%rbx, RBX(%rdi)</div><div class='add'>+	movq	(%rsp), %rcx</div><div class='add'>+	movq	%rax, R11(%rdi)</div><div class='add'>+	movq	%rax, R10(%rdi)</div><div class='add'>+	movq	%rax, R9(%rdi)</div><div class='add'>+	movq	%rax, R8(%rdi)</div><div class='add'>+	movq	%rax, RAX(%rdi)</div><div class='add'>+	movq	%rax, RCX(%rdi)</div><div class='add'>+	movq	%rax, RDX(%rdi)</div><div class='add'>+	movq	%rax, RSI(%rdi)</div><div class='add'>+	movq	%rax, RDI(%rdi)</div><div class='add'>+	movq	%rax, ORIG_RAX(%rdi)</div><div class='add'>+	movq	%rcx, RIP(%rdi)</div><div class='add'>+	leaq	8(%rsp), %rcx</div><div class='add'>+	movq	$__KERNEL_CS, CS(%rdi)</div><div class='add'>+	movq	%rax, EFLAGS(%rdi)</div><div class='add'>+	movq	%rcx, RSP(%rdi)</div><div class='add'>+	movq	$__KERNEL_DS, SS(%rdi)</div><div class='add'>+	jmpq	*%rdx</div><div class='add'>+	CFI_ENDPROC</div><div class='add'>+ENDPROC(arch_unwind_init_running)</div><div class='add'>+#endif</div><div class='head'>diff --git a/arch/x86_64/kernel/functionlist b/arch/x86_64/kernel/functionlist<br/>index 2bcebdc3eedb..01fa23580c85 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/functionlist?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/functionlist</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/functionlist?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/functionlist</a></div><div class='hunk'>@@ -384,7 +384,6 @@</div><div class='ctx'> *(.text.__end_that_request_first)</div><div class='ctx'> *(.text.wake_up_bit)</div><div class='ctx'> *(.text.unuse_mm)</div><div class='del'>-*(.text.skb_release_data)</div><div class='ctx'> *(.text.shrink_icache_memory)</div><div class='ctx'> *(.text.sched_balance_self)</div><div class='ctx'> *(.text.__pmd_alloc)</div><div class='head'>diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c<br/>index 7a64ea181788..8e78a75d1866 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/genapic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/genapic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/genapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/genapic.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and</div><div class='ctx'>  * James Cleverdon.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/x86_64/kernel/genapic_cluster.c b/arch/x86_64/kernel/genapic_cluster.c<br/>index 43fcf62fef0f..3020917546de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/genapic_cluster.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/genapic_cluster.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/genapic_cluster.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/genapic_cluster.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and</div><div class='ctx'>  * James Cleverdon.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86_64/kernel/genapic_flat.c<br/>index 1a2ab825be98..eb86d374813a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/genapic_flat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/genapic_flat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/genapic_flat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/genapic_flat.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and</div><div class='ctx'>  * James Cleverdon.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -78,22 +77,29 @@ static void flat_send_IPI_mask(cpumask_t cpumask, int vector)</div><div class='ctx'> </div><div class='ctx'> static void flat_send_IPI_allbutself(int vector)</div><div class='ctx'> {</div><div class='del'>-#ifndef CONFIG_HOTPLUG_CPU</div><div class='del'>-	if (((num_online_cpus()) - 1) &gt;= 1)</div><div class='del'>-		__send_IPI_shortcut(APIC_DEST_ALLBUT, vector,APIC_DEST_LOGICAL);</div><div class='add'>+#ifdef	CONFIG_HOTPLUG_CPU</div><div class='add'>+	int hotplug = 1;</div><div class='ctx'> #else</div><div class='del'>-	cpumask_t allbutme = cpu_online_map;</div><div class='add'>+	int hotplug = 0;</div><div class='add'>+#endif</div><div class='add'>+	if (hotplug || vector == NMI_VECTOR) {</div><div class='add'>+		cpumask_t allbutme = cpu_online_map;</div><div class='ctx'> </div><div class='del'>-	cpu_clear(smp_processor_id(), allbutme);</div><div class='add'>+		cpu_clear(smp_processor_id(), allbutme);</div><div class='ctx'> </div><div class='del'>-	if (!cpus_empty(allbutme))</div><div class='del'>-		flat_send_IPI_mask(allbutme, vector);</div><div class='del'>-#endif</div><div class='add'>+		if (!cpus_empty(allbutme))</div><div class='add'>+			flat_send_IPI_mask(allbutme, vector);</div><div class='add'>+	} else if (num_online_cpus() &gt; 1) {</div><div class='add'>+		__send_IPI_shortcut(APIC_DEST_ALLBUT, vector,APIC_DEST_LOGICAL);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void flat_send_IPI_all(int vector)</div><div class='ctx'> {</div><div class='del'>-	__send_IPI_shortcut(APIC_DEST_ALLINC, vector, APIC_DEST_LOGICAL);</div><div class='add'>+	if (vector == NMI_VECTOR)</div><div class='add'>+		flat_send_IPI_mask(cpu_online_map, vector);</div><div class='add'>+	else</div><div class='add'>+		__send_IPI_shortcut(APIC_DEST_ALLINC, vector, APIC_DEST_LOGICAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int flat_apic_id_registered(void)</div><div class='hunk'>@@ -108,10 +114,7 @@ static unsigned int flat_cpu_mask_to_apicid(cpumask_t cpumask)</div><div class='ctx'> </div><div class='ctx'> static unsigned int phys_pkg_id(int index_msb)</div><div class='ctx'> {</div><div class='del'>-	u32 ebx;</div><div class='del'>-</div><div class='del'>-	ebx = cpuid_ebx(1);</div><div class='del'>-	return ((ebx &gt;&gt; 24) &amp; 0xFF) &gt;&gt; index_msb;</div><div class='add'>+	return hard_smp_processor_id() &gt;&gt; index_msb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct genapic apic_flat =  {</div><div class='head'>diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c<br/>index cea20a66c150..36647ce6aecb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/head64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/head64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/head64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/head64.c</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'>  *  linux/arch/x86_64/kernel/head64.c -- prepare to run common code</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Andrea Arcangeli &lt;andrea@suse.de&gt; SuSE</div><div class='del'>- *</div><div class='del'>- *  $Id: head64.c,v 1.22 2001/07/06 14:28:20 ak Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -87,6 +85,11 @@ void __init x86_64_start_kernel(char * real_mode_data)</div><div class='ctx'> 	clear_bss();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * This must be called really, really early:</div><div class='add'>+	 */</div><div class='add'>+	lockdep_init();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * switch to init_level4_pgt from boot_level4_pgt</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(init_level4_pgt, boot_level4_pgt, PTRS_PER_PGD*sizeof(pgd_t));</div><div class='head'>diff --git a/arch/x86_64/kernel/i387.c b/arch/x86_64/kernel/i387.c<br/>index a5d7e16b928e..3aa1e9bb781d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/i387.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/i387.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/i387.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/i387.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  the 64bit user space sees a FXSAVE frame directly. </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='hunk'>@@ -24,7 +23,7 @@</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-unsigned int mxcsr_feature_mask = 0xffffffff;</div><div class='add'>+unsigned int mxcsr_feature_mask __read_mostly = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> void mxcsr_feature_mask_init(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c<br/>index 5ecd34ab8c2b..0434b1f8e3dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/i8259.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/i8259.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/i8259.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/i8259.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -44,11 +43,11 @@</div><div class='ctx'> 	BI(x,8) BI(x,9) BI(x,a) BI(x,b) \</div><div class='ctx'> 	BI(x,c) BI(x,d) BI(x,e) BI(x,f)</div><div class='ctx'> </div><div class='del'>-#define BUILD_14_IRQS(x) \</div><div class='add'>+#define BUILD_15_IRQS(x) \</div><div class='ctx'> 	BI(x,0) BI(x,1) BI(x,2) BI(x,3) \</div><div class='ctx'> 	BI(x,4) BI(x,5) BI(x,6) BI(x,7) \</div><div class='ctx'> 	BI(x,8) BI(x,9) BI(x,a) BI(x,b) \</div><div class='del'>-	BI(x,c) BI(x,d)</div><div class='add'>+	BI(x,c) BI(x,d) BI(x,e)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts:</div><div class='hunk'>@@ -73,13 +72,13 @@ BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb)</div><div class='ctx'> BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='del'>-	BUILD_14_IRQS(0xe)</div><div class='add'>+	BUILD_15_IRQS(0xe)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #undef BUILD_16_IRQS</div><div class='del'>-#undef BUILD_14_IRQS</div><div class='add'>+#undef BUILD_15_IRQS</div><div class='ctx'> #undef BI</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -92,11 +91,11 @@ BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd)</div><div class='ctx'> 	IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \</div><div class='ctx'> 	IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)</div><div class='ctx'> </div><div class='del'>-#define IRQLIST_14(x) \</div><div class='add'>+#define IRQLIST_15(x) \</div><div class='ctx'> 	IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \</div><div class='ctx'> 	IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \</div><div class='ctx'> 	IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \</div><div class='del'>-	IRQ(x,c), IRQ(x,d)</div><div class='add'>+	IRQ(x,c), IRQ(x,d), IRQ(x,e)</div><div class='ctx'> </div><div class='ctx'> void (*interrupt[NR_IRQS])(void) = {</div><div class='ctx'> 	IRQLIST_16(0x0),</div><div class='hunk'>@@ -108,7 +107,7 @@ void (*interrupt[NR_IRQS])(void) = {</div><div class='ctx'> 	IRQLIST_16(0xc), IRQLIST_16(0xd)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='del'>-	, IRQLIST_14(0xe)</div><div class='add'>+	, IRQLIST_15(0xe)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -235,7 +234,7 @@ void make_8259A_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='ctx'> 	disable_irq_nosync(irq);</div><div class='ctx'> 	io_apic_irqs &amp;= ~(1&lt;&lt;irq);</div><div class='del'>-	irq_desc[irq].handler = &amp;i8259A_irq_type;</div><div class='add'>+	irq_desc[irq].chip = &amp;i8259A_irq_type;</div><div class='ctx'> 	enable_irq(irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -278,7 +277,7 @@ static void mask_and_ack_8259A(unsigned int irq)</div><div class='ctx'> 	 * Lightweight spurious IRQ detection. We do not want</div><div class='ctx'> 	 * to overdo spurious IRQ handling - it's usually a sign</div><div class='ctx'> 	 * of hardware problems, so we only do the checks we can</div><div class='del'>-	 * do without slowing down good hardware unnecesserily.</div><div class='add'>+	 * do without slowing down good hardware unnecessarily.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Note that IRQ7 and IRQ15 (the two spurious IRQs</div><div class='ctx'> 	 * usually resulting from the 8259A-1|2 PICs) occur</div><div class='hunk'>@@ -468,12 +467,12 @@ void __init init_ISA_irqs (void)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * 16 old-style INTA-cycle interrupts:</div><div class='ctx'> 			 */</div><div class='del'>-			irq_desc[i].handler = &amp;i8259A_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;i8259A_irq_type;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * 'high' PCI IRQs filled in on demand</div><div class='ctx'> 			 */</div><div class='del'>-			irq_desc[i].handler = &amp;no_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;no_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c<br/>index 0de3ea938830..924a4a332954 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/io_apic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/io_apic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/io_apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/io_apic.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='hunk'>@@ -41,6 +40,7 @@</div><div class='ctx'> #include &lt;asm/mach_apic.h&gt;</div><div class='ctx'> #include &lt;asm/acpi.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/nmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __apicdebuginit  __init</div><div class='ctx'> </div><div class='hunk'>@@ -56,6 +56,7 @@ int timer_over_8254 __initdata = 0;</div><div class='ctx'> static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(ioapic_lock);</div><div class='add'>+static DEFINE_SPINLOCK(vector_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * # of IRQ routing registers</div><div class='hunk'>@@ -271,6 +272,18 @@ __setup("enable_8254_timer", setup_enable_8254_timer);</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+</div><div class='add'>+static int nvidia_hpet_detected __initdata;</div><div class='add'>+</div><div class='add'>+static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)</div><div class='add'>+{</div><div class='add'>+	nvidia_hpet_detected = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Temporary Hack. Nvidia and VIA boards currently only work with IO-APIC</div><div class='ctx'>    off. Check for an Nvidia or VIA PCI bridge and turn it off.</div><div class='ctx'>    Use pci direct infrastructure because this runs before the PCI subsystem. </div><div class='hunk'>@@ -305,7 +318,7 @@ void __init check_ioapic(void)</div><div class='ctx'> 				vendor &amp;= 0xffff;</div><div class='ctx'> 				switch (vendor) { </div><div class='ctx'> 				case PCI_VENDOR_ID_VIA:</div><div class='del'>-#ifdef CONFIG_GART_IOMMU</div><div class='add'>+#ifdef CONFIG_IOMMU</div><div class='ctx'> 					if ((end_pfn &gt; MAX_DMA32_PFN ||</div><div class='ctx'> 					     force_iommu) &amp;&amp;</div><div class='ctx'> 					    !iommu_aperture_allowed) {</div><div class='hunk'>@@ -317,11 +330,19 @@ void __init check_ioapic(void)</div><div class='ctx'> 					return;</div><div class='ctx'> 				case PCI_VENDOR_ID_NVIDIA:</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-					/* All timer overrides on Nvidia</div><div class='del'>-				           seem to be wrong. Skip them. */</div><div class='del'>-					acpi_skip_timer_override = 1;</div><div class='del'>-					printk(KERN_INFO </div><div class='del'>-	     "Nvidia board detected. Ignoring ACPI timer override.\n");</div><div class='add'>+					/*</div><div class='add'>+					 * All timer overrides on Nvidia are</div><div class='add'>+					 * wrong unless HPET is enabled.</div><div class='add'>+					 */</div><div class='add'>+					nvidia_hpet_detected = 0;</div><div class='add'>+					acpi_table_parse(ACPI_HPET,</div><div class='add'>+							nvidia_hpet_check);</div><div class='add'>+					if (nvidia_hpet_detected == 0) {</div><div class='add'>+						acpi_skip_timer_override = 1;</div><div class='add'>+						printk(KERN_INFO "Nvidia board "</div><div class='add'>+						    "detected. Ignoring ACPI "</div><div class='add'>+						    "timer override.\n");</div><div class='add'>+					}</div><div class='ctx'> #endif</div><div class='ctx'> 					/* RED-PEN skip them on mptables too? */</div><div class='ctx'> 					return;</div><div class='hunk'>@@ -814,10 +835,17 @@ u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };</div><div class='ctx'> int assign_irq_vector(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int vector;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(irq != AUTO_ASSIGN &amp;&amp; (unsigned)irq &gt;= NR_IRQ_VECTORS);</div><div class='del'>-	if (irq != AUTO_ASSIGN &amp;&amp; IO_APIC_VECTOR(irq) &gt; 0)</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;vector_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (irq != AUTO_ASSIGN &amp;&amp; IO_APIC_VECTOR(irq) &gt; 0) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;vector_lock, flags);</div><div class='ctx'> 		return IO_APIC_VECTOR(irq);</div><div class='add'>+	}</div><div class='ctx'> next:</div><div class='ctx'> 	current_vector += 8;</div><div class='ctx'> 	if (current_vector == IA32_SYSCALL_VECTOR)</div><div class='hunk'>@@ -829,11 +857,14 @@ next:</div><div class='ctx'> 		current_vector = FIRST_DEVICE_VECTOR + offset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vector_irq[current_vector] = irq;</div><div class='add'>+	vector = current_vector;</div><div class='add'>+	vector_irq[vector] = irq;</div><div class='ctx'> 	if (irq != AUTO_ASSIGN)</div><div class='del'>-		IO_APIC_VECTOR(irq) = current_vector;</div><div class='add'>+		IO_APIC_VECTOR(irq) = vector;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;vector_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return current_vector;</div><div class='add'>+	return vector;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void (*interrupt[NR_IRQS])(void);</div><div class='hunk'>@@ -844,23 +875,18 @@ static struct hw_interrupt_type ioapic_edge_type;</div><div class='ctx'> #define IOAPIC_EDGE	0</div><div class='ctx'> #define IOAPIC_LEVEL	1</div><div class='ctx'> </div><div class='del'>-static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)</div><div class='add'>+static void ioapic_register_intr(int irq, int vector, unsigned long trigger)</div><div class='ctx'> {</div><div class='del'>-	if (use_pci_vector() &amp;&amp; !platform_legacy_irq(irq)) {</div><div class='del'>-		if ((trigger == IOAPIC_AUTO &amp;&amp; IO_APIC_irq_trigger(irq)) ||</div><div class='del'>-				trigger == IOAPIC_LEVEL)</div><div class='del'>-			irq_desc[vector].handler = &amp;ioapic_level_type;</div><div class='del'>-		else</div><div class='del'>-			irq_desc[vector].handler = &amp;ioapic_edge_type;</div><div class='del'>-		set_intr_gate(vector, interrupt[vector]);</div><div class='del'>-	} else	{</div><div class='del'>-		if ((trigger == IOAPIC_AUTO &amp;&amp; IO_APIC_irq_trigger(irq)) ||</div><div class='del'>-				trigger == IOAPIC_LEVEL)</div><div class='del'>-			irq_desc[irq].handler = &amp;ioapic_level_type;</div><div class='del'>-		else</div><div class='del'>-			irq_desc[irq].handler = &amp;ioapic_edge_type;</div><div class='del'>-		set_intr_gate(vector, interrupt[irq]);</div><div class='del'>-	}</div><div class='add'>+	unsigned idx;</div><div class='add'>+</div><div class='add'>+	idx = use_pci_vector() &amp;&amp; !platform_legacy_irq(irq) ? vector : irq;</div><div class='add'>+</div><div class='add'>+	if ((trigger == IOAPIC_AUTO &amp;&amp; IO_APIC_irq_trigger(irq)) ||</div><div class='add'>+			trigger == IOAPIC_LEVEL)</div><div class='add'>+		irq_desc[idx].chip = &amp;ioapic_level_type;</div><div class='add'>+	else</div><div class='add'>+		irq_desc[idx].chip = &amp;ioapic_edge_type;</div><div class='add'>+	set_intr_gate(vector, interrupt[idx]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init setup_IO_APIC_irqs(void)</div><div class='hunk'>@@ -961,7 +987,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in</div><div class='ctx'> 	 * The timer IRQ doesn't have to know that behind the</div><div class='ctx'> 	 * scene we have a 8259A-master in AEOI mode ...</div><div class='ctx'> 	 */</div><div class='del'>-	irq_desc[0].handler = &amp;ioapic_edge_type;</div><div class='add'>+	irq_desc[0].chip = &amp;ioapic_edge_type;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add it to the IO-APIC irq-routing table:</div><div class='hunk'>@@ -1591,6 +1617,13 @@ static void set_ioapic_affinity_vector (unsigned int vector,</div><div class='ctx'> #endif // CONFIG_SMP</div><div class='ctx'> #endif // CONFIG_PCI_MSI</div><div class='ctx'> </div><div class='add'>+static int ioapic_retrigger(unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	send_IPI_self(IO_APIC_VECTOR(irq));</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Level and edge triggered IO-APIC interrupts need different handling,</div><div class='ctx'>  * so we use two separate IRQ descriptors. Edge triggered IRQs can be</div><div class='hunk'>@@ -1611,6 +1644,7 @@ static struct hw_interrupt_type ioapic_edge_type __read_mostly = {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.set_affinity = set_ioapic_affinity,</div><div class='ctx'> #endif</div><div class='add'>+	.retrigger	= ioapic_retrigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct hw_interrupt_type ioapic_level_type __read_mostly = {</div><div class='hunk'>@@ -1624,6 +1658,7 @@ static struct hw_interrupt_type ioapic_level_type __read_mostly = {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	.set_affinity = set_ioapic_affinity,</div><div class='ctx'> #endif</div><div class='add'>+	.retrigger	= ioapic_retrigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void init_IO_APIC_traps(void)</div><div class='hunk'>@@ -1658,7 +1693,7 @@ static inline void init_IO_APIC_traps(void)</div><div class='ctx'> 				make_8259A_irq(irq);</div><div class='ctx'> 			else</div><div class='ctx'> 				/* Strange. Oh, well.. */</div><div class='del'>-				irq_desc[irq].handler = &amp;no_irq_type;</div><div class='add'>+				irq_desc[irq].chip = &amp;no_irq_type;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1875,7 +1910,7 @@ static inline void check_timer(void)</div><div class='ctx'> 	apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");</div><div class='ctx'> </div><div class='ctx'> 	disable_8259A_irq(0);</div><div class='del'>-	irq_desc[0].handler = &amp;lapic_irq_type;</div><div class='add'>+	irq_desc[0].chip = &amp;lapic_irq_type;</div><div class='ctx'> 	apic_write(APIC_LVT0, APIC_DM_FIXED | vector);	/* Fixed mode */</div><div class='ctx'> 	enable_8259A_irq(0);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c<br/>index d8bd0b345b1e..5221a53e90c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/irq.c</a></div><div class='hunk'>@@ -26,6 +26,30 @@ atomic_t irq_mis_count;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='add'>+/*</div><div class='add'>+ * Probabilistic stack overflow check:</div><div class='add'>+ *</div><div class='add'>+ * Only check the stack in process context, because everything else</div><div class='add'>+ * runs on the big interrupt stacks. Checking reliably is too expensive,</div><div class='add'>+ * so we just check from interrupts.</div><div class='add'>+ */</div><div class='add'>+static inline void stack_overflow_check(struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	u64 curbase = (u64) current-&gt;thread_info;</div><div class='add'>+	static unsigned long warned = -60*HZ;</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;rsp &gt;= curbase &amp;&amp; regs-&gt;rsp &lt;= curbase + THREAD_SIZE &amp;&amp;</div><div class='add'>+	    regs-&gt;rsp &lt;  curbase + sizeof(struct thread_info) + 128 &amp;&amp;</div><div class='add'>+	    time_after(jiffies, warned + 60*HZ)) {</div><div class='add'>+		printk("do_IRQ: %s near stack overflow (cur:%Lx,rsp:%lx)\n",</div><div class='add'>+		       current-&gt;comm, curbase, regs-&gt;rsp);</div><div class='add'>+		show_stack(NULL,NULL);</div><div class='add'>+		warned = jiffies;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Generic, controller-independent functions:</div><div class='ctx'>  */</div><div class='hunk'>@@ -39,7 +63,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 	if (i == 0) {</div><div class='ctx'> 		seq_printf(p, "           ");</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='del'>-			seq_printf(p, "CPU%d       ",j);</div><div class='add'>+			seq_printf(p, "CPU%-8d",j);</div><div class='ctx'> 		seq_putc(p, '\n');</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +79,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -91,12 +115,20 @@ skip:</div><div class='ctx'>  */</div><div class='ctx'> asmlinkage unsigned int do_IRQ(struct pt_regs *regs)</div><div class='ctx'> {	</div><div class='del'>-	/* high bits used in ret_from_ code  */</div><div class='del'>-	unsigned irq = regs-&gt;orig_rax &amp; 0xff;</div><div class='add'>+	/* high bit used in ret_from_ code  */</div><div class='add'>+	unsigned irq = ~regs-&gt;orig_rax;</div><div class='add'>+</div><div class='add'>+	if (unlikely(irq &gt;= NR_IRQS)) {</div><div class='add'>+		printk(KERN_EMERG "%s: cannot handle IRQ %d\n",</div><div class='add'>+					__FUNCTION__, irq);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	exit_idle();</div><div class='ctx'> 	irq_enter();</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_DEBUG_STACKOVERFLOW</div><div class='add'>+	stack_overflow_check(regs);</div><div class='add'>+#endif</div><div class='ctx'> 	__do_IRQ(irq, regs);</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> </div><div class='hunk'>@@ -114,13 +146,13 @@ void fixup_irqs(cpumask_t map)</div><div class='ctx'> 		if (irq == 2)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		cpus_and(mask, irq_affinity[irq], map);</div><div class='add'>+		cpus_and(mask, irq_desc[irq].affinity, map);</div><div class='ctx'> 		if (any_online_cpu(mask) == NR_CPUS) {</div><div class='ctx'> 			printk("Breaking affinity for irq %i\n", irq);</div><div class='ctx'> 			mask = map;</div><div class='ctx'> 		}</div><div class='del'>-		if (irq_desc[irq].handler-&gt;set_affinity)</div><div class='del'>-			irq_desc[irq].handler-&gt;set_affinity(irq, mask);</div><div class='add'>+		if (irq_desc[irq].chip-&gt;set_affinity)</div><div class='add'>+			irq_desc[irq].chip-&gt;set_affinity(irq, mask);</div><div class='ctx'> 		else if (irq_desc[irq].action &amp;&amp; !(warned++))</div><div class='ctx'> 			printk("Cannot set affinity for irq %i\n", irq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -145,8 +177,10 @@ asmlinkage void do_softirq(void)</div><div class='ctx'>  	local_irq_save(flags);</div><div class='ctx'>  	pending = local_softirq_pending();</div><div class='ctx'>  	/* Switch to interrupt stack */</div><div class='del'>- 	if (pending)</div><div class='add'>+ 	if (pending) {</div><div class='ctx'> 		call_softirq();</div><div class='add'>+		WARN_ON_ONCE(softirq_count());</div><div class='add'>+	}</div><div class='ctx'>  	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(do_softirq);</div><div class='head'>diff --git a/arch/x86_64/kernel/k8.c b/arch/x86_64/kernel/k8.c<br/>new file mode 100644<br/>index 000000000000..6416682d33d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/k8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/k8.c</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+/*</div><div class='add'>+ * Shared support code for AMD K8 northbridges and derivates.</div><div class='add'>+ * Copyright 2006 Andi Kleen, SUSE Labs. Subject to GPLv2.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;asm/k8.h&gt;</div><div class='add'>+</div><div class='add'>+int num_k8_northbridges;</div><div class='add'>+EXPORT_SYMBOL(num_k8_northbridges);</div><div class='add'>+</div><div class='add'>+static u32 *flush_words;</div><div class='add'>+</div><div class='add'>+struct pci_device_id k8_nb_ids[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(k8_nb_ids);</div><div class='add'>+</div><div class='add'>+struct pci_dev **k8_northbridges;</div><div class='add'>+EXPORT_SYMBOL(k8_northbridges);</div><div class='add'>+</div><div class='add'>+static struct pci_dev *next_k8_northbridge(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	do {</div><div class='add'>+		dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev);</div><div class='add'>+		if (!dev)</div><div class='add'>+			break;</div><div class='add'>+	} while (!pci_match_id(&amp;k8_nb_ids[0], dev));</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cache_k8_northbridges(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	if (num_k8_northbridges)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	num_k8_northbridges = 0;</div><div class='add'>+	dev = NULL;</div><div class='add'>+	while ((dev = next_k8_northbridge(dev)) != NULL)</div><div class='add'>+		num_k8_northbridges++;</div><div class='add'>+</div><div class='add'>+	k8_northbridges = kmalloc((num_k8_northbridges + 1) * sizeof(void *),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!k8_northbridges)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	flush_words = kmalloc(num_k8_northbridges * sizeof(u32), GFP_KERNEL);</div><div class='add'>+	if (!flush_words) {</div><div class='add'>+		kfree(k8_northbridges);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = NULL;</div><div class='add'>+	i = 0;</div><div class='add'>+	while ((dev = next_k8_northbridge(dev)) != NULL) {</div><div class='add'>+		k8_northbridges[i++] = dev;</div><div class='add'>+		pci_read_config_dword(dev, 0x9c, &amp;flush_words[i]);</div><div class='add'>+	}</div><div class='add'>+	k8_northbridges[i] = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(cache_k8_northbridges);</div><div class='add'>+</div><div class='add'>+/* Ignores subdevice/subvendor but as far as I can figure out</div><div class='add'>+   they're useless anyways */</div><div class='add'>+int __init early_is_k8_nb(u32 device)</div><div class='add'>+{</div><div class='add'>+	struct pci_device_id *id;</div><div class='add'>+	u32 vendor = device &amp; 0xffff;</div><div class='add'>+	device &gt;&gt;= 16;</div><div class='add'>+	for (id = k8_nb_ids; id-&gt;vendor; id++)</div><div class='add'>+		if (vendor == id-&gt;vendor &amp;&amp; device == id-&gt;device)</div><div class='add'>+			return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void k8_flush_garts(void)</div><div class='add'>+{</div><div class='add'>+	int flushed, i;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	static DEFINE_SPINLOCK(gart_lock);</div><div class='add'>+</div><div class='add'>+	/* Avoid races between AGP and IOMMU. In theory it's not needed</div><div class='add'>+	   but I'm not sure if the hardware won't lose flush requests</div><div class='add'>+	   when another is pending. This whole thing is so expensive anyways</div><div class='add'>+	   that it doesn't matter to serialize more. -AK */</div><div class='add'>+	spin_lock_irqsave(&amp;gart_lock, flags);</div><div class='add'>+	flushed = 0;</div><div class='add'>+	for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='add'>+		pci_write_config_dword(k8_northbridges[i], 0x9c,</div><div class='add'>+				       flush_words[i]|1);</div><div class='add'>+		flushed++;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='add'>+		u32 w;</div><div class='add'>+		/* Make sure the hardware actually executed the flush*/</div><div class='add'>+		for (;;) {</div><div class='add'>+			pci_read_config_dword(k8_northbridges[i],</div><div class='add'>+					      0x9c, &amp;w);</div><div class='add'>+			if (!(w &amp; 1))</div><div class='add'>+				break;</div><div class='add'>+			cpu_relax();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;gart_lock, flags);</div><div class='add'>+	if (!flushed)</div><div class='add'>+		printk("nothing to flush?\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(k8_flush_garts);</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c<br/>index fa1d19ca700a..ffc73ac72485 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/kprobes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/kprobes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/kprobes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/kprobes.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *              Added function return probes functionality</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86_64/kernel/machine_kexec.c<br/>index 25ac8a3faae6..83fb24a02821 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/machine_kexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/machine_kexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/machine_kexec.c</a></div><div class='hunk'>@@ -149,8 +149,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(unsigned long indirection_page,</div><div class='ctx'> 					unsigned long start_address,</div><div class='ctx'> 					unsigned long pgtable) ATTRIB_NORET;</div><div class='ctx'> </div><div class='del'>-const extern unsigned char relocate_new_kernel[];</div><div class='del'>-const extern unsigned long relocate_new_kernel_size;</div><div class='add'>+extern const unsigned char relocate_new_kernel[];</div><div class='add'>+extern const unsigned long relocate_new_kernel_size;</div><div class='ctx'> </div><div class='ctx'> int machine_kexec_prepare(struct kimage *image)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c<br/>index c69fc43cee7b..88845674c661 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/mce.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/mce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/mce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/mce.c</a></div><div class='hunk'>@@ -562,7 +562,7 @@ static struct sysdev_class mce_sysclass = {</div><div class='ctx'> 	set_kset_name("machinecheck"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct sys_device, device_mce);</div><div class='add'>+DEFINE_PER_CPU(struct sys_device, device_mce);</div><div class='ctx'> </div><div class='ctx'> /* Why are there no generic functions for this? */</div><div class='ctx'> #define ACCESSOR(name, var, start) \</div><div class='hunk'>@@ -629,7 +629,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Get notified when a cpu comes on/off. Be hotplug friendly. */</div><div class='del'>-static int</div><div class='add'>+static __cpuinit int</div><div class='ctx'> mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='hunk'>@@ -647,7 +647,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block mce_cpu_notifier = {</div><div class='add'>+static struct notifier_block __cpuinitdata mce_cpu_notifier = {</div><div class='ctx'> 	.notifier_call = mce_cpu_callback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86_64/kernel/mce_amd.c<br/>index d13b241ad094..db2acbf7ad28 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/mce_amd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/mce_amd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/mce_amd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/mce_amd.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  (c) 2005 Advanced Micro Devices, Inc.</div><div class='add'>+ *  (c) 2005, 2006 Advanced Micro Devices, Inc.</div><div class='ctx'>  *  Your use of this code is subject to the terms and conditions of the</div><div class='ctx'>  *  GNU general public license version 2. See "COPYING" or</div><div class='ctx'>  *  http://www.gnu.org/licenses/gpl.html</div><div class='hunk'>@@ -8,9 +8,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Support : jacob.shin@amd.com</div><div class='ctx'>  *</div><div class='del'>- *  MC4_MISC0 DRAM ECC Error Threshold available under AMD K8 Rev F.</div><div class='del'>- *  MC4_MISC0 exists per physical processor.</div><div class='add'>+ *  April 2006</div><div class='add'>+ *     - added support for AMD Family 0x10 processors</div><div class='ctx'>  *</div><div class='add'>+ *  All MC4_MISCi registers are shared between multi-cores</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -29,32 +30,45 @@</div><div class='ctx'> #include &lt;asm/percpu.h&gt;</div><div class='ctx'> #include &lt;asm/idle.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PFX "mce_threshold: "</div><div class='del'>-#define VERSION "version 1.00.9"</div><div class='del'>-#define NR_BANKS 5</div><div class='del'>-#define THRESHOLD_MAX 0xFFF</div><div class='del'>-#define INT_TYPE_APIC 0x00020000</div><div class='del'>-#define MASK_VALID_HI 0x80000000</div><div class='del'>-#define MASK_LVTOFF_HI 0x00F00000</div><div class='del'>-#define MASK_COUNT_EN_HI 0x00080000</div><div class='del'>-#define MASK_INT_TYPE_HI 0x00060000</div><div class='del'>-#define MASK_OVERFLOW_HI 0x00010000</div><div class='add'>+#define PFX               "mce_threshold: "</div><div class='add'>+#define VERSION           "version 1.1.1"</div><div class='add'>+#define NR_BANKS          6</div><div class='add'>+#define NR_BLOCKS         9</div><div class='add'>+#define THRESHOLD_MAX     0xFFF</div><div class='add'>+#define INT_TYPE_APIC     0x00020000</div><div class='add'>+#define MASK_VALID_HI     0x80000000</div><div class='add'>+#define MASK_LVTOFF_HI    0x00F00000</div><div class='add'>+#define MASK_COUNT_EN_HI  0x00080000</div><div class='add'>+#define MASK_INT_TYPE_HI  0x00060000</div><div class='add'>+#define MASK_OVERFLOW_HI  0x00010000</div><div class='ctx'> #define MASK_ERR_COUNT_HI 0x00000FFF</div><div class='del'>-#define MASK_OVERFLOW 0x0001000000000000L</div><div class='add'>+#define MASK_BLKPTR_LO    0xFF000000</div><div class='add'>+#define MCG_XBLK_ADDR     0xC0000400</div><div class='ctx'> </div><div class='del'>-struct threshold_bank {</div><div class='add'>+struct threshold_block {</div><div class='add'>+	unsigned int block;</div><div class='add'>+	unsigned int bank;</div><div class='ctx'> 	unsigned int cpu;</div><div class='del'>-	u8 bank;</div><div class='del'>-	u8 interrupt_enable;</div><div class='add'>+	u32 address;</div><div class='add'>+	u16 interrupt_enable;</div><div class='ctx'> 	u16 threshold_limit;</div><div class='ctx'> 	struct kobject kobj;</div><div class='add'>+	struct list_head miscj;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct threshold_bank threshold_defaults = {</div><div class='add'>+/* defaults used early on boot */</div><div class='add'>+static struct threshold_block threshold_defaults = {</div><div class='ctx'> 	.interrupt_enable = 0,</div><div class='ctx'> 	.threshold_limit = THRESHOLD_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct threshold_bank {</div><div class='add'>+	struct kobject kobj;</div><div class='add'>+	struct threshold_block *blocks;</div><div class='add'>+	cpumask_t cpus;</div><div class='add'>+};</div><div class='add'>+static DEFINE_PER_CPU(struct threshold_bank *, threshold_banks[NR_BANKS]);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> static unsigned char shared_bank[NR_BANKS] = {</div><div class='ctx'> 	0, 0, 0, 0, 1</div><div class='hunk'>@@ -68,12 +82,12 @@ static DEFINE_PER_CPU(unsigned char, bank_map);	/* see which banks are on */</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* must be called with correct cpu affinity */</div><div class='del'>-static void threshold_restart_bank(struct threshold_bank *b,</div><div class='add'>+static void threshold_restart_bank(struct threshold_block *b,</div><div class='ctx'> 				   int reset, u16 old_limit)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mci_misc_hi, mci_misc_lo;</div><div class='ctx'> </div><div class='del'>-	rdmsr(MSR_IA32_MC0_MISC + b-&gt;bank * 4, mci_misc_lo, mci_misc_hi);</div><div class='add'>+	rdmsr(b-&gt;address, mci_misc_lo, mci_misc_hi);</div><div class='ctx'> </div><div class='ctx'> 	if (b-&gt;threshold_limit &lt; (mci_misc_hi &amp; THRESHOLD_MAX))</div><div class='ctx'> 		reset = 1;	/* limit cannot be lower than err count */</div><div class='hunk'>@@ -94,35 +108,57 @@ static void threshold_restart_bank(struct threshold_bank *b,</div><div class='ctx'> 	    (mci_misc_hi &amp;= ~MASK_INT_TYPE_HI);</div><div class='ctx'> </div><div class='ctx'> 	mci_misc_hi |= MASK_COUNT_EN_HI;</div><div class='del'>-	wrmsr(MSR_IA32_MC0_MISC + b-&gt;bank * 4, mci_misc_lo, mci_misc_hi);</div><div class='add'>+	wrmsr(b-&gt;address, mci_misc_lo, mci_misc_hi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* cpu init entry point, called from mce.c with preempt off */</div><div class='ctx'> void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	int bank;</div><div class='del'>-	u32 mci_misc_lo, mci_misc_hi;</div><div class='add'>+	unsigned int bank, block;</div><div class='ctx'> 	unsigned int cpu = smp_processor_id();</div><div class='add'>+	u32 low = 0, high = 0, address = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (bank = 0; bank &lt; NR_BANKS; ++bank) {</div><div class='del'>-		rdmsr(MSR_IA32_MC0_MISC + bank * 4, mci_misc_lo, mci_misc_hi);</div><div class='add'>+		for (block = 0; block &lt; NR_BLOCKS; ++block) {</div><div class='add'>+			if (block == 0)</div><div class='add'>+				address = MSR_IA32_MC0_MISC + bank * 4;</div><div class='add'>+			else if (block == 1)</div><div class='add'>+				address = MCG_XBLK_ADDR</div><div class='add'>+					+ ((low &amp; MASK_BLKPTR_LO) &gt;&gt; 21);</div><div class='add'>+			else</div><div class='add'>+				++address;</div><div class='add'>+</div><div class='add'>+			if (rdmsr_safe(address, &amp;low, &amp;high))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		/* !valid, !counter present, bios locked */</div><div class='del'>-		if (!(mci_misc_hi &amp; MASK_VALID_HI) ||</div><div class='del'>-		    !(mci_misc_hi &amp; MASK_VALID_HI &gt;&gt; 1) ||</div><div class='del'>-		    (mci_misc_hi &amp; MASK_VALID_HI &gt;&gt; 2))</div><div class='del'>-			continue;</div><div class='add'>+			if (!(high &amp; MASK_VALID_HI)) {</div><div class='add'>+				if (block)</div><div class='add'>+					continue;</div><div class='add'>+				else</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		per_cpu(bank_map, cpu) |= (1 &lt;&lt; bank);</div><div class='add'>+			if (!(high &amp; MASK_VALID_HI &gt;&gt; 1)  ||</div><div class='add'>+			     (high &amp; MASK_VALID_HI &gt;&gt; 2))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='add'>+			if (!block)</div><div class='add'>+				per_cpu(bank_map, cpu) |= (1 &lt;&lt; bank);</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-		if (shared_bank[bank] &amp;&amp; cpu_core_id[cpu])</div><div class='del'>-			continue;</div><div class='add'>+			if (shared_bank[bank] &amp;&amp; c-&gt;cpu_core_id)</div><div class='add'>+				break;</div><div class='ctx'> #endif</div><div class='add'>+			high &amp;= ~MASK_LVTOFF_HI;</div><div class='add'>+			high |= K8_APIC_EXT_LVT_ENTRY_THRESHOLD &lt;&lt; 20;</div><div class='add'>+			wrmsr(address, low, high);</div><div class='ctx'> </div><div class='del'>-		setup_threshold_lvt((mci_misc_hi &amp; MASK_LVTOFF_HI) &gt;&gt; 20);</div><div class='del'>-		threshold_defaults.cpu = cpu;</div><div class='del'>-		threshold_defaults.bank = bank;</div><div class='del'>-		threshold_restart_bank(&amp;threshold_defaults, 0, 0);</div><div class='add'>+			setup_APIC_extened_lvt(K8_APIC_EXT_LVT_ENTRY_THRESHOLD,</div><div class='add'>+					       THRESHOLD_APIC_VECTOR,</div><div class='add'>+					       K8_APIC_EXT_INT_MSG_FIX, 0);</div><div class='add'>+</div><div class='add'>+			threshold_defaults.address = address;</div><div class='add'>+			threshold_restart_bank(&amp;threshold_defaults, 0, 0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -137,8 +173,9 @@ void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c)</div><div class='ctx'>  */</div><div class='ctx'> asmlinkage void mce_threshold_interrupt(void)</div><div class='ctx'> {</div><div class='del'>-	int bank;</div><div class='add'>+	unsigned int bank, block;</div><div class='ctx'> 	struct mce m;</div><div class='add'>+	u32 low = 0, high = 0, address = 0;</div><div class='ctx'> </div><div class='ctx'> 	ack_APIC_irq();</div><div class='ctx'> 	exit_idle();</div><div class='hunk'>@@ -150,15 +187,42 @@ asmlinkage void mce_threshold_interrupt(void)</div><div class='ctx'> </div><div class='ctx'> 	/* assume first bank caused it */</div><div class='ctx'> 	for (bank = 0; bank &lt; NR_BANKS; ++bank) {</div><div class='del'>-		m.bank = MCE_THRESHOLD_BASE + bank;</div><div class='del'>-		rdmsrl(MSR_IA32_MC0_MISC + bank * 4, m.misc);</div><div class='add'>+		for (block = 0; block &lt; NR_BLOCKS; ++block) {</div><div class='add'>+			if (block == 0)</div><div class='add'>+				address = MSR_IA32_MC0_MISC + bank * 4;</div><div class='add'>+			else if (block == 1)</div><div class='add'>+				address = MCG_XBLK_ADDR</div><div class='add'>+					+ ((low &amp; MASK_BLKPTR_LO) &gt;&gt; 21);</div><div class='add'>+			else</div><div class='add'>+				++address;</div><div class='add'>+</div><div class='add'>+			if (rdmsr_safe(address, &amp;low, &amp;high))</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		if (m.misc &amp; MASK_OVERFLOW) {</div><div class='del'>-			mce_log(&amp;m);</div><div class='del'>-			goto out;</div><div class='add'>+			if (!(high &amp; MASK_VALID_HI)) {</div><div class='add'>+				if (block)</div><div class='add'>+					continue;</div><div class='add'>+				else</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!(high &amp; MASK_VALID_HI &gt;&gt; 1)  ||</div><div class='add'>+			     (high &amp; MASK_VALID_HI &gt;&gt; 2))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (high &amp; MASK_OVERFLOW_HI) {</div><div class='add'>+				rdmsrl(address, m.misc);</div><div class='add'>+				rdmsrl(MSR_IA32_MC0_STATUS + bank * 4,</div><div class='add'>+				       m.status);</div><div class='add'>+				m.bank = K8_MCE_THRESHOLD_BASE</div><div class='add'>+				       + bank * NR_BLOCKS</div><div class='add'>+				       + block;</div><div class='add'>+				mce_log(&amp;m);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-      out:</div><div class='add'>+out:</div><div class='ctx'> 	irq_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -166,20 +230,12 @@ asmlinkage void mce_threshold_interrupt(void)</div><div class='ctx'>  * Sysfs Interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct sysdev_class threshold_sysclass = {</div><div class='del'>-	set_kset_name("threshold"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DEFINE_PER_CPU(struct sys_device, device_threshold);</div><div class='del'>-</div><div class='ctx'> struct threshold_attr {</div><div class='del'>-        struct attribute attr;</div><div class='del'>-        ssize_t(*show) (struct threshold_bank *, char *);</div><div class='del'>-        ssize_t(*store) (struct threshold_bank *, const char *, size_t count);</div><div class='add'>+	struct attribute attr;</div><div class='add'>+	ssize_t(*show) (struct threshold_block *, char *);</div><div class='add'>+	ssize_t(*store) (struct threshold_block *, const char *, size_t count);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PER_CPU(struct threshold_bank *, threshold_banks[NR_BANKS]);</div><div class='del'>-</div><div class='ctx'> static cpumask_t affinity_set(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_t oldmask = current-&gt;cpus_allowed;</div><div class='hunk'>@@ -194,15 +250,15 @@ static void affinity_restore(cpumask_t oldmask)</div><div class='ctx'> 	set_cpus_allowed(current, oldmask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SHOW_FIELDS(name) \</div><div class='del'>-        static ssize_t show_ ## name(struct threshold_bank * b, char *buf) \</div><div class='del'>-        { \</div><div class='del'>-                return sprintf(buf, "%lx\n", (unsigned long) b-&gt;name); \</div><div class='del'>-        }</div><div class='add'>+#define SHOW_FIELDS(name)                                           \</div><div class='add'>+static ssize_t show_ ## name(struct threshold_block * b, char *buf) \</div><div class='add'>+{                                                                   \</div><div class='add'>+        return sprintf(buf, "%lx\n", (unsigned long) b-&gt;name);      \</div><div class='add'>+}</div><div class='ctx'> SHOW_FIELDS(interrupt_enable)</div><div class='ctx'> SHOW_FIELDS(threshold_limit)</div><div class='ctx'> </div><div class='del'>-static ssize_t store_interrupt_enable(struct threshold_bank *b,</div><div class='add'>+static ssize_t store_interrupt_enable(struct threshold_block *b,</div><div class='ctx'> 				      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	char *end;</div><div class='hunk'>@@ -219,7 +275,7 @@ static ssize_t store_interrupt_enable(struct threshold_bank *b,</div><div class='ctx'> 	return end - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_threshold_limit(struct threshold_bank *b,</div><div class='add'>+static ssize_t store_threshold_limit(struct threshold_block *b,</div><div class='ctx'> 				     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	char *end;</div><div class='hunk'>@@ -242,18 +298,18 @@ static ssize_t store_threshold_limit(struct threshold_bank *b,</div><div class='ctx'> 	return end - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_error_count(struct threshold_bank *b, char *buf)</div><div class='add'>+static ssize_t show_error_count(struct threshold_block *b, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 high, low;</div><div class='ctx'> 	cpumask_t oldmask;</div><div class='ctx'> 	oldmask = affinity_set(b-&gt;cpu);</div><div class='del'>-	rdmsr(MSR_IA32_MC0_MISC + b-&gt;bank * 4, low, high); /* ignore low 32 */</div><div class='add'>+	rdmsr(b-&gt;address, low, high);</div><div class='ctx'> 	affinity_restore(oldmask);</div><div class='ctx'> 	return sprintf(buf, "%x\n",</div><div class='ctx'> 		       (high &amp; 0xFFF) - (THRESHOLD_MAX - b-&gt;threshold_limit));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_error_count(struct threshold_bank *b,</div><div class='add'>+static ssize_t store_error_count(struct threshold_block *b,</div><div class='ctx'> 				 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	cpumask_t oldmask;</div><div class='hunk'>@@ -269,13 +325,13 @@ static ssize_t store_error_count(struct threshold_bank *b,</div><div class='ctx'>         .store = _store,                                      \</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ATTR_FIELDS(name) \</div><div class='del'>-        static struct threshold_attr name = \</div><div class='add'>+#define RW_ATTR(name)                                           \</div><div class='add'>+static struct threshold_attr name =                             \</div><div class='ctx'>         THRESHOLD_ATTR(name, 0644, show_## name, store_## name)</div><div class='ctx'> </div><div class='del'>-ATTR_FIELDS(interrupt_enable);</div><div class='del'>-ATTR_FIELDS(threshold_limit);</div><div class='del'>-ATTR_FIELDS(error_count);</div><div class='add'>+RW_ATTR(interrupt_enable);</div><div class='add'>+RW_ATTR(threshold_limit);</div><div class='add'>+RW_ATTR(error_count);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *default_attrs[] = {</div><div class='ctx'> 	&amp;interrupt_enable.attr,</div><div class='hunk'>@@ -284,12 +340,12 @@ static struct attribute *default_attrs[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define to_bank(k) container_of(k,struct threshold_bank,kobj)</div><div class='del'>-#define to_attr(a) container_of(a,struct threshold_attr,attr)</div><div class='add'>+#define to_block(k) container_of(k, struct threshold_block, kobj)</div><div class='add'>+#define to_attr(a) container_of(a, struct threshold_attr, attr)</div><div class='ctx'> </div><div class='ctx'> static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct threshold_bank *b = to_bank(kobj);</div><div class='add'>+	struct threshold_block *b = to_block(kobj);</div><div class='ctx'> 	struct threshold_attr *a = to_attr(attr);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	ret = a-&gt;show ? a-&gt;show(b, buf) : -EIO;</div><div class='hunk'>@@ -299,7 +355,7 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf)</div><div class='ctx'> static ssize_t store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 		     const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct threshold_bank *b = to_bank(kobj);</div><div class='add'>+	struct threshold_block *b = to_block(kobj);</div><div class='ctx'> 	struct threshold_attr *a = to_attr(attr);</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> 	ret = a-&gt;store ? a-&gt;store(b, buf, count) : -EIO;</div><div class='hunk'>@@ -316,69 +372,174 @@ static struct kobj_type threshold_ktype = {</div><div class='ctx'> 	.default_attrs = default_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static __cpuinit int allocate_threshold_blocks(unsigned int cpu,</div><div class='add'>+					       unsigned int bank,</div><div class='add'>+					       unsigned int block,</div><div class='add'>+					       u32 address)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 low, high;</div><div class='add'>+	struct threshold_block *b = NULL;</div><div class='add'>+</div><div class='add'>+	if ((bank &gt;= NR_BANKS) || (block &gt;= NR_BLOCKS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (rdmsr_safe(address, &amp;low, &amp;high))</div><div class='add'>+		goto recurse;</div><div class='add'>+</div><div class='add'>+	if (!(high &amp; MASK_VALID_HI)) {</div><div class='add'>+		if (block)</div><div class='add'>+			goto recurse;</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(high &amp; MASK_VALID_HI &gt;&gt; 1)  ||</div><div class='add'>+	     (high &amp; MASK_VALID_HI &gt;&gt; 2))</div><div class='add'>+		goto recurse;</div><div class='add'>+</div><div class='add'>+	b = kzalloc(sizeof(struct threshold_block), GFP_KERNEL);</div><div class='add'>+	if (!b)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(b, 0, sizeof(struct threshold_block));</div><div class='add'>+</div><div class='add'>+	b-&gt;block = block;</div><div class='add'>+	b-&gt;bank = bank;</div><div class='add'>+	b-&gt;cpu = cpu;</div><div class='add'>+	b-&gt;address = address;</div><div class='add'>+	b-&gt;interrupt_enable = 0;</div><div class='add'>+	b-&gt;threshold_limit = THRESHOLD_MAX;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;b-&gt;miscj);</div><div class='add'>+</div><div class='add'>+	if (per_cpu(threshold_banks, cpu)[bank]-&gt;blocks)</div><div class='add'>+		list_add(&amp;b-&gt;miscj,</div><div class='add'>+			 &amp;per_cpu(threshold_banks, cpu)[bank]-&gt;blocks-&gt;miscj);</div><div class='add'>+	else</div><div class='add'>+		per_cpu(threshold_banks, cpu)[bank]-&gt;blocks = b;</div><div class='add'>+</div><div class='add'>+	kobject_set_name(&amp;b-&gt;kobj, "misc%i", block);</div><div class='add'>+	b-&gt;kobj.parent = &amp;per_cpu(threshold_banks, cpu)[bank]-&gt;kobj;</div><div class='add'>+	b-&gt;kobj.ktype = &amp;threshold_ktype;</div><div class='add'>+	err = kobject_register(&amp;b-&gt;kobj);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free;</div><div class='add'>+recurse:</div><div class='add'>+	if (!block) {</div><div class='add'>+		address = (low &amp; MASK_BLKPTR_LO) &gt;&gt; 21;</div><div class='add'>+		if (!address)</div><div class='add'>+			return 0;</div><div class='add'>+		address += MCG_XBLK_ADDR;</div><div class='add'>+	} else</div><div class='add'>+		++address;</div><div class='add'>+</div><div class='add'>+	err = allocate_threshold_blocks(cpu, bank, ++block, address);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	if (b) {</div><div class='add'>+		kobject_unregister(&amp;b-&gt;kobj);</div><div class='add'>+		kfree(b);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* symlinks sibling shared banks to first core.  first core owns dir/files. */</div><div class='del'>-static __cpuinit int threshold_create_bank(unsigned int cpu, int bank)</div><div class='add'>+static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int i, err = 0;</div><div class='ctx'> 	struct threshold_bank *b = NULL;</div><div class='add'>+	cpumask_t oldmask = CPU_MASK_NONE;</div><div class='add'>+	char name[32];</div><div class='add'>+</div><div class='add'>+	sprintf(name, "threshold_bank%i", bank);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	if (cpu_core_id[cpu] &amp;&amp; shared_bank[bank]) {	/* symlink */</div><div class='del'>-		char name[16];</div><div class='del'>-		unsigned lcpu = first_cpu(cpu_core_map[cpu]);</div><div class='del'>-		if (cpu_core_id[lcpu])</div><div class='del'>-			goto out;	/* first core not up yet */</div><div class='add'>+	if (cpu_data[cpu].cpu_core_id &amp;&amp; shared_bank[bank]) {	/* symlink */</div><div class='add'>+		i = first_cpu(cpu_core_map[cpu]);</div><div class='add'>+</div><div class='add'>+		/* first core not up yet */</div><div class='add'>+		if (cpu_data[i].cpu_core_id)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* already linked */</div><div class='add'>+		if (per_cpu(threshold_banks, cpu)[bank])</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		b = per_cpu(threshold_banks, i)[bank];</div><div class='ctx'> </div><div class='del'>-		b = per_cpu(threshold_banks, lcpu)[bank];</div><div class='ctx'> 		if (!b)</div><div class='ctx'> 			goto out;</div><div class='del'>-		sprintf(name, "bank%i", bank);</div><div class='del'>-		err = sysfs_create_link(&amp;per_cpu(device_threshold, cpu).kobj,</div><div class='add'>+</div><div class='add'>+		err = sysfs_create_link(&amp;per_cpu(device_mce, cpu).kobj,</div><div class='ctx'> 					&amp;b-&gt;kobj, name);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='add'>+</div><div class='add'>+		b-&gt;cpus = cpu_core_map[cpu];</div><div class='ctx'> 		per_cpu(threshold_banks, cpu)[bank] = b;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	b = kmalloc(sizeof(struct threshold_bank), GFP_KERNEL);</div><div class='add'>+	b = kzalloc(sizeof(struct threshold_bank), GFP_KERNEL);</div><div class='ctx'> 	if (!b) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(b, 0, sizeof(struct threshold_bank));</div><div class='ctx'> </div><div class='del'>-	b-&gt;cpu = cpu;</div><div class='del'>-	b-&gt;bank = bank;</div><div class='del'>-	b-&gt;interrupt_enable = 0;</div><div class='del'>-	b-&gt;threshold_limit = THRESHOLD_MAX;</div><div class='del'>-	kobject_set_name(&amp;b-&gt;kobj, "bank%i", bank);</div><div class='del'>-	b-&gt;kobj.parent = &amp;per_cpu(device_threshold, cpu).kobj;</div><div class='del'>-	b-&gt;kobj.ktype = &amp;threshold_ktype;</div><div class='del'>-</div><div class='add'>+	kobject_set_name(&amp;b-&gt;kobj, "threshold_bank%i", bank);</div><div class='add'>+	b-&gt;kobj.parent = &amp;per_cpu(device_mce, cpu).kobj;</div><div class='add'>+#ifndef CONFIG_SMP</div><div class='add'>+	b-&gt;cpus = CPU_MASK_ALL;</div><div class='add'>+#else</div><div class='add'>+	b-&gt;cpus = cpu_core_map[cpu];</div><div class='add'>+#endif</div><div class='ctx'> 	err = kobject_register(&amp;b-&gt;kobj);</div><div class='del'>-	if (err) {</div><div class='del'>-		kfree(b);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='ctx'> 	per_cpu(threshold_banks, cpu)[bank] = b;</div><div class='del'>-      out:</div><div class='add'>+</div><div class='add'>+	oldmask = affinity_set(cpu);</div><div class='add'>+	err = allocate_threshold_blocks(cpu, bank, 0,</div><div class='add'>+					MSR_IA32_MC0_MISC + bank * 4);</div><div class='add'>+	affinity_restore(oldmask);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	for_each_cpu_mask(i, b-&gt;cpus) {</div><div class='add'>+		if (i == cpu)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = sysfs_create_link(&amp;per_cpu(device_mce, i).kobj,</div><div class='add'>+					&amp;b-&gt;kobj, name);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		per_cpu(threshold_banks, i)[bank] = b;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	per_cpu(threshold_banks, cpu)[bank] = NULL;</div><div class='add'>+	kfree(b);</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* create dir/files for all valid threshold banks */</div><div class='ctx'> static __cpuinit int threshold_create_device(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	int bank;</div><div class='add'>+	unsigned int bank;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	per_cpu(device_threshold, cpu).id = cpu;</div><div class='del'>-	per_cpu(device_threshold, cpu).cls = &amp;threshold_sysclass;</div><div class='del'>-	err = sysdev_register(&amp;per_cpu(device_threshold, cpu));</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	for (bank = 0; bank &lt; NR_BANKS; ++bank) {</div><div class='ctx'> 		if (!(per_cpu(bank_map, cpu) &amp; 1 &lt;&lt; bank))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -386,7 +547,7 @@ static __cpuinit int threshold_create_device(unsigned int cpu)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-      out:</div><div class='add'>+out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,92 +558,85 @@ static __cpuinit int threshold_create_device(unsigned int cpu)</div><div class='ctx'>  *   of shared sysfs dir/files, and rest of the cores will be symlinked to it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* cpu hotplug call removes all symlinks before first core dies */</div><div class='add'>+static __cpuinit void deallocate_threshold_block(unsigned int cpu,</div><div class='add'>+						 unsigned int bank)</div><div class='add'>+{</div><div class='add'>+	struct threshold_block *pos = NULL;</div><div class='add'>+	struct threshold_block *tmp = NULL;</div><div class='add'>+	struct threshold_bank *head = per_cpu(threshold_banks, cpu)[bank];</div><div class='add'>+</div><div class='add'>+	if (!head)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(pos, tmp, &amp;head-&gt;blocks-&gt;miscj, miscj) {</div><div class='add'>+		kobject_unregister(&amp;pos-&gt;kobj);</div><div class='add'>+		list_del(&amp;pos-&gt;miscj);</div><div class='add'>+		kfree(pos);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(per_cpu(threshold_banks, cpu)[bank]-&gt;blocks);</div><div class='add'>+	per_cpu(threshold_banks, cpu)[bank]-&gt;blocks = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static __cpuinit void threshold_remove_bank(unsigned int cpu, int bank)</div><div class='ctx'> {</div><div class='add'>+	int i = 0;</div><div class='ctx'> 	struct threshold_bank *b;</div><div class='del'>-	char name[16];</div><div class='add'>+	char name[32];</div><div class='ctx'> </div><div class='ctx'> 	b = per_cpu(threshold_banks, cpu)[bank];</div><div class='add'>+</div><div class='ctx'> 	if (!b)</div><div class='ctx'> 		return;</div><div class='del'>-	if (shared_bank[bank] &amp;&amp; atomic_read(&amp;b-&gt;kobj.kref.refcount) &gt; 2) {</div><div class='del'>-		sprintf(name, "bank%i", bank);</div><div class='del'>-		sysfs_remove_link(&amp;per_cpu(device_threshold, cpu).kobj, name);</div><div class='add'>+</div><div class='add'>+	if (!b-&gt;blocks)</div><div class='add'>+		goto free_out;</div><div class='add'>+</div><div class='add'>+	sprintf(name, "threshold_bank%i", bank);</div><div class='add'>+</div><div class='add'>+	/* sibling symlink */</div><div class='add'>+	if (shared_bank[bank] &amp;&amp; b-&gt;blocks-&gt;cpu != cpu) {</div><div class='add'>+		sysfs_remove_link(&amp;per_cpu(device_mce, cpu).kobj, name);</div><div class='ctx'> 		per_cpu(threshold_banks, cpu)[bank] = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		kobject_unregister(&amp;b-&gt;kobj);</div><div class='del'>-		kfree(per_cpu(threshold_banks, cpu)[bank]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* remove all sibling symlinks before unregistering */</div><div class='add'>+	for_each_cpu_mask(i, b-&gt;cpus) {</div><div class='add'>+		if (i == cpu)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sysfs_remove_link(&amp;per_cpu(device_mce, i).kobj, name);</div><div class='add'>+		per_cpu(threshold_banks, i)[bank] = NULL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	deallocate_threshold_block(cpu, bank);</div><div class='add'>+</div><div class='add'>+free_out:</div><div class='add'>+	kobject_unregister(&amp;b-&gt;kobj);</div><div class='add'>+	kfree(b);</div><div class='add'>+	per_cpu(threshold_banks, cpu)[bank] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __cpuinit void threshold_remove_device(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	int bank;</div><div class='add'>+	unsigned int bank;</div><div class='ctx'> </div><div class='ctx'> 	for (bank = 0; bank &lt; NR_BANKS; ++bank) {</div><div class='ctx'> 		if (!(per_cpu(bank_map, cpu) &amp; 1 &lt;&lt; bank))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		threshold_remove_bank(cpu, bank);</div><div class='ctx'> 	}</div><div class='del'>-	sysdev_unregister(&amp;per_cpu(device_threshold, cpu));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* link all existing siblings when first core comes up */</div><div class='del'>-static __cpuinit int threshold_create_symlinks(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	int bank, err = 0;</div><div class='del'>-	unsigned int lcpu = 0;</div><div class='del'>-</div><div class='del'>-	if (cpu_core_id[cpu])</div><div class='del'>-		return 0;</div><div class='del'>-	for_each_cpu_mask(lcpu, cpu_core_map[cpu]) {</div><div class='del'>-		if (lcpu == cpu)</div><div class='del'>-			continue;</div><div class='del'>-		for (bank = 0; bank &lt; NR_BANKS; ++bank) {</div><div class='del'>-			if (!(per_cpu(bank_map, cpu) &amp; 1 &lt;&lt; bank))</div><div class='del'>-				continue;</div><div class='del'>-			if (!shared_bank[bank])</div><div class='del'>-				continue;</div><div class='del'>-			err = threshold_create_bank(lcpu, bank);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* remove all symlinks before first core dies. */</div><div class='del'>-static __cpuinit void threshold_remove_symlinks(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-	int bank;</div><div class='del'>-	unsigned int lcpu = 0;</div><div class='del'>-	if (cpu_core_id[cpu])</div><div class='del'>-		return;</div><div class='del'>-	for_each_cpu_mask(lcpu, cpu_core_map[cpu]) {</div><div class='del'>-		if (lcpu == cpu)</div><div class='del'>-			continue;</div><div class='del'>-		for (bank = 0; bank &lt; NR_BANKS; ++bank) {</div><div class='del'>-			if (!(per_cpu(bank_map, cpu) &amp; 1 &lt;&lt; bank))</div><div class='del'>-				continue;</div><div class='del'>-			if (!shared_bank[bank])</div><div class='del'>-				continue;</div><div class='del'>-			threshold_remove_bank(lcpu, bank);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> #else /* !CONFIG_HOTPLUG_CPU */</div><div class='del'>-static __cpuinit void threshold_create_symlinks(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-static __cpuinit void threshold_remove_symlinks(unsigned int cpu)</div><div class='del'>-{</div><div class='del'>-}</div><div class='ctx'> static void threshold_remove_device(unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* get notified when a cpu comes on/off */</div><div class='del'>-static int threshold_cpu_callback(struct notifier_block *nfb,</div><div class='add'>+static int __cpuinit threshold_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 					    unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	/* cpu was unsigned int to begin with */</div><div class='hunk'>@@ -494,13 +648,6 @@ static int threshold_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case CPU_ONLINE:</div><div class='ctx'> 		threshold_create_device(cpu);</div><div class='del'>-		threshold_create_symlinks(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_PREPARE:</div><div class='del'>-		threshold_remove_symlinks(cpu);</div><div class='del'>-		break;</div><div class='del'>-	case CPU_DOWN_FAILED:</div><div class='del'>-		threshold_create_symlinks(cpu);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPU_DEAD:</div><div class='ctx'> 		threshold_remove_device(cpu);</div><div class='hunk'>@@ -512,29 +659,22 @@ static int threshold_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block threshold_cpu_notifier = {</div><div class='add'>+static struct notifier_block threshold_cpu_notifier __cpuinitdata = {</div><div class='ctx'> 	.notifier_call = threshold_cpu_callback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int threshold_init_device(void)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	int lcpu = 0;</div><div class='del'>-</div><div class='del'>-	err = sysdev_class_register(&amp;threshold_sysclass);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+	unsigned lcpu = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* to hit CPUs online before the notifier is up */</div><div class='ctx'> 	for_each_online_cpu(lcpu) {</div><div class='del'>-		err = threshold_create_device(lcpu);</div><div class='add'>+		int err = threshold_create_device(lcpu);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	register_cpu_notifier(&amp;threshold_cpu_notifier);</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> device_initcall(threshold_init_device);</div><div class='head'>diff --git a/arch/x86_64/kernel/module.c b/arch/x86_64/kernel/module.c<br/>index bac195c74bcc..9d0958ff547f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/module.c</a></div><div class='hunk'>@@ -145,26 +145,38 @@ int apply_relocate(Elf_Shdr *sechdrs,</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> } </div><div class='ctx'> </div><div class='del'>-extern void apply_alternatives(void *start, void *end); </div><div class='del'>-</div><div class='ctx'> int module_finalize(const Elf_Ehdr *hdr,</div><div class='del'>-		    const Elf_Shdr *sechdrs,</div><div class='del'>-		    struct module *me)</div><div class='add'>+                    const Elf_Shdr *sechdrs,</div><div class='add'>+                    struct module *me)</div><div class='ctx'> {</div><div class='del'>-	const Elf_Shdr *s;</div><div class='add'>+	const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL;</div><div class='ctx'> 	char *secstrings = (void *)hdr + sechdrs[hdr-&gt;e_shstrndx].sh_offset;</div><div class='ctx'> </div><div class='del'>-	/* look for .altinstructions to patch */ </div><div class='del'>-	for (s = sechdrs; s &lt; sechdrs + hdr-&gt;e_shnum; s++) { </div><div class='del'>-		void *seg; 		</div><div class='del'>-		if (strcmp(".altinstructions", secstrings + s-&gt;sh_name))</div><div class='del'>-			continue;</div><div class='del'>-		seg = (void *)s-&gt;sh_addr; </div><div class='del'>-		apply_alternatives(seg, seg + s-&gt;sh_size); </div><div class='del'>-	} 	</div><div class='add'>+	for (s = sechdrs; s &lt; sechdrs + hdr-&gt;e_shnum; s++) {</div><div class='add'>+		if (!strcmp(".text", secstrings + s-&gt;sh_name))</div><div class='add'>+			text = s;</div><div class='add'>+		if (!strcmp(".altinstructions", secstrings + s-&gt;sh_name))</div><div class='add'>+			alt = s;</div><div class='add'>+		if (!strcmp(".smp_locks", secstrings + s-&gt;sh_name))</div><div class='add'>+			locks= s;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (alt) {</div><div class='add'>+		/* patch .altinstructions */</div><div class='add'>+		void *aseg = (void *)alt-&gt;sh_addr;</div><div class='add'>+		apply_alternatives(aseg, aseg + alt-&gt;sh_size);</div><div class='add'>+	}</div><div class='add'>+	if (locks &amp;&amp; text) {</div><div class='add'>+		void *lseg = (void *)locks-&gt;sh_addr;</div><div class='add'>+		void *tseg = (void *)text-&gt;sh_addr;</div><div class='add'>+		alternatives_smp_module_add(me, me-&gt;name,</div><div class='add'>+					    lseg, lseg + locks-&gt;sh_size,</div><div class='add'>+					    tseg, tseg + text-&gt;sh_size);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void module_arch_cleanup(struct module *mod)</div><div class='ctx'> {</div><div class='add'>+	alternatives_smp_module_del(mod);</div><div class='ctx'> }</div><div class='head'>diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c<br/>index 083da7e606b1..a1ab4197f8a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/mpparse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/mpparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/mpparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/mpparse.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='head'>diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c<br/>index 4e6357fe0ec3..5baa0c726e97 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/nmi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/nmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/nmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/nmi.c</a></div><div class='hunk'>@@ -12,14 +12,9 @@</div><div class='ctx'>  *  Mikael Pettersson	: PM converted to driver model. Disable/enable API.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/bootmem.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-#include &lt;linux/kernel_stat.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='hunk'>@@ -27,14 +22,11 @@</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='del'>-#include &lt;asm/mtrr.h&gt;</div><div class='del'>-#include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;asm/nmi.h&gt;</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='del'>-#include &lt;asm/local.h&gt;</div><div class='ctx'> #include &lt;asm/mce.h&gt;</div><div class='add'>+#include &lt;asm/intel_arch_perfmon.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * lapic_nmi_owner tracks the ownership of the lapic NMI hardware:</div><div class='hunk'>@@ -74,6 +66,9 @@ static unsigned int nmi_p4_cccr_val;</div><div class='ctx'> #define K7_EVENT_CYCLES_PROCESSOR_IS_RUNNING	0x76</div><div class='ctx'> #define K7_NMI_EVENT		K7_EVENT_CYCLES_PROCESSOR_IS_RUNNING</div><div class='ctx'> </div><div class='add'>+#define ARCH_PERFMON_NMI_EVENT_SEL	ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL</div><div class='add'>+#define ARCH_PERFMON_NMI_EVENT_UMASK	ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK</div><div class='add'>+</div><div class='ctx'> #define MSR_P4_MISC_ENABLE	0x1A0</div><div class='ctx'> #define MSR_P4_MISC_ENABLE_PERF_AVAIL	(1&lt;&lt;7)</div><div class='ctx'> #define MSR_P4_MISC_ENABLE_PEBS_UNAVAIL	(1&lt;&lt;12)</div><div class='hunk'>@@ -105,7 +100,10 @@ static __cpuinit inline int nmi_known_cpu(void)</div><div class='ctx'> 	case X86_VENDOR_AMD:</div><div class='ctx'> 		return boot_cpu_data.x86 == 15;</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='del'>-		return boot_cpu_data.x86 == 15;</div><div class='add'>+		if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_ARCH_PERFMON))</div><div class='add'>+			return 1;</div><div class='add'>+		else</div><div class='add'>+			return (boot_cpu_data.x86 == 15);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -129,7 +127,7 @@ void __cpuinit nmi_watchdog_default(void)</div><div class='ctx'> static __init void nmi_cpu_busy(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	volatile int *endflag = data;</div><div class='del'>-	local_irq_enable();</div><div class='add'>+	local_irq_enable_in_hardirq();</div><div class='ctx'> 	/* Intentionally don't use cpu_relax here. This is</div><div class='ctx'> 	   to make sure that the performance counter really ticks,</div><div class='ctx'> 	   even if there is a simulator or similar that catches the</div><div class='hunk'>@@ -211,6 +209,8 @@ int __init setup_nmi_watchdog(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("nmi_watchdog=", setup_nmi_watchdog);</div><div class='ctx'> </div><div class='add'>+static void disable_intel_arch_watchdog(void);</div><div class='add'>+</div><div class='ctx'> static void disable_lapic_nmi_watchdog(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (nmi_active &lt;= 0)</div><div class='hunk'>@@ -223,6 +223,8 @@ static void disable_lapic_nmi_watchdog(void)</div><div class='ctx'> 		if (boot_cpu_data.x86 == 15) {</div><div class='ctx'> 			wrmsr(MSR_P4_IQ_CCCR0, 0, 0);</div><div class='ctx'> 			wrmsr(MSR_P4_CRU_ESCR0, 0, 0);</div><div class='add'>+		} else if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {</div><div class='add'>+			disable_intel_arch_watchdog();</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -375,6 +377,53 @@ static void setup_k7_watchdog(void)</div><div class='ctx'> 	wrmsr(MSR_K7_EVNTSEL0, evntsel, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void disable_intel_arch_watchdog(void)</div><div class='add'>+{</div><div class='add'>+	unsigned ebx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the Architectural PerfMon supports</div><div class='add'>+	 * Unhalted Core Cycles Event or not.</div><div class='add'>+	 * NOTE: Corresponding bit = 0 in ebp indicates event present.</div><div class='add'>+	 */</div><div class='add'>+	ebx = cpuid_ebx(10);</div><div class='add'>+	if (!(ebx &amp; ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))</div><div class='add'>+		wrmsr(MSR_ARCH_PERFMON_EVENTSEL0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_intel_arch_watchdog(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int evntsel;</div><div class='add'>+	unsigned ebx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether the Architectural PerfMon supports</div><div class='add'>+	 * Unhalted Core Cycles Event or not.</div><div class='add'>+	 * NOTE: Corresponding bit = 0 in ebp indicates event present.</div><div class='add'>+	 */</div><div class='add'>+	ebx = cpuid_ebx(10);</div><div class='add'>+	if ((ebx &amp; ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nmi_perfctr_msr = MSR_ARCH_PERFMON_PERFCTR0;</div><div class='add'>+</div><div class='add'>+	clear_msr_range(MSR_ARCH_PERFMON_EVENTSEL0, 2);</div><div class='add'>+	clear_msr_range(MSR_ARCH_PERFMON_PERFCTR0, 2);</div><div class='add'>+</div><div class='add'>+	evntsel = ARCH_PERFMON_EVENTSEL_INT</div><div class='add'>+		| ARCH_PERFMON_EVENTSEL_OS</div><div class='add'>+		| ARCH_PERFMON_EVENTSEL_USR</div><div class='add'>+		| ARCH_PERFMON_NMI_EVENT_SEL</div><div class='add'>+		| ARCH_PERFMON_NMI_EVENT_UMASK;</div><div class='add'>+</div><div class='add'>+	wrmsr(MSR_ARCH_PERFMON_EVENTSEL0, evntsel, 0);</div><div class='add'>+	wrmsrl(MSR_ARCH_PERFMON_PERFCTR0, -((u64)cpu_khz * 1000 / nmi_hz));</div><div class='add'>+	apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+	evntsel |= ARCH_PERFMON_EVENTSEL0_ENABLE;</div><div class='add'>+	wrmsr(MSR_ARCH_PERFMON_EVENTSEL0, evntsel, 0);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static int setup_p4_watchdog(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -428,10 +477,16 @@ void setup_apic_nmi_watchdog(void)</div><div class='ctx'> 		setup_k7_watchdog();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case X86_VENDOR_INTEL:</div><div class='del'>-		if (boot_cpu_data.x86 != 15)</div><div class='del'>-			return;</div><div class='del'>-		if (!setup_p4_watchdog())</div><div class='add'>+		if (cpu_has(&amp;boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {</div><div class='add'>+			if (!setup_intel_arch_watchdog())</div><div class='add'>+				return;</div><div class='add'>+		} else if (boot_cpu_data.x86 == 15) {</div><div class='add'>+			if (!setup_p4_watchdog())</div><div class='add'>+				return;</div><div class='add'>+		} else {</div><div class='ctx'> 			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -516,7 +571,14 @@ void __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)</div><div class='ctx'>  			 */</div><div class='ctx'>  			wrmsr(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val, 0);</div><div class='ctx'>  			apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='del'>- 		}</div><div class='add'>+ 		} else if (nmi_perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0) {</div><div class='add'>+			/*</div><div class='add'>+			 * For Intel based architectural perfmon</div><div class='add'>+			 * - LVTPC is masked on interrupt and must be</div><div class='add'>+			 *   unmasked by the LVTPC handler.</div><div class='add'>+			 */</div><div class='add'>+			apic_write(APIC_LVTPC, APIC_DM_NMI);</div><div class='add'>+		}</div><div class='ctx'> 		wrmsrl(nmi_perfctr_msr, -((u64)cpu_khz * 1000 / nmi_hz));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -544,11 +606,13 @@ void set_nmi_callback(nmi_callback_t callback)</div><div class='ctx'> 	vmalloc_sync_all();</div><div class='ctx'> 	rcu_assign_pointer(nmi_callback, callback);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(set_nmi_callback);</div><div class='ctx'> </div><div class='ctx'> void unset_nmi_callback(void)</div><div class='ctx'> {</div><div class='ctx'> 	nmi_callback = dummy_nmi_callback;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(unset_nmi_callback);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SYSCTL</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c<br/>new file mode 100644<br/>index 000000000000..e71ed53b08fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-calgary.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/pci-calgary.c</a></div><div class='hunk'>@@ -0,0 +1,1020 @@</div><div class='add'>+/*</div><div class='add'>+ * Derived from arch/powerpc/kernel/iommu.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) IBM Corporation, 2006</div><div class='add'>+ *</div><div class='add'>+ * Author: Jon Mason &lt;jdmason@us.ibm.com&gt;</div><div class='add'>+ * Author: Muli Ben-Yehuda &lt;muli@il.ibm.com&gt;</div><div class='add'>+</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/proto.h&gt;</div><div class='add'>+#include &lt;asm/calgary.h&gt;</div><div class='add'>+#include &lt;asm/tce.h&gt;</div><div class='add'>+#include &lt;asm/pci-direct.h&gt;</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_IBM_CALGARY 0x02a1</div><div class='add'>+#define PCI_VENDOR_DEVICE_ID_CALGARY \</div><div class='add'>+	(PCI_VENDOR_ID_IBM | PCI_DEVICE_ID_IBM_CALGARY &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+/* we need these for register space address calculation */</div><div class='add'>+#define START_ADDRESS           0xfe000000</div><div class='add'>+#define CHASSIS_BASE            0</div><div class='add'>+#define ONE_BASED_CHASSIS_NUM   1</div><div class='add'>+</div><div class='add'>+/* register offsets inside the host bridge space */</div><div class='add'>+#define PHB_CSR_OFFSET		0x0110</div><div class='add'>+#define PHB_PLSSR_OFFSET	0x0120</div><div class='add'>+#define PHB_CONFIG_RW_OFFSET	0x0160</div><div class='add'>+#define PHB_IOBASE_BAR_LOW	0x0170</div><div class='add'>+#define PHB_IOBASE_BAR_HIGH	0x0180</div><div class='add'>+#define PHB_MEM_1_LOW		0x0190</div><div class='add'>+#define PHB_MEM_1_HIGH		0x01A0</div><div class='add'>+#define PHB_IO_ADDR_SIZE	0x01B0</div><div class='add'>+#define PHB_MEM_1_SIZE		0x01C0</div><div class='add'>+#define PHB_MEM_ST_OFFSET	0x01D0</div><div class='add'>+#define PHB_AER_OFFSET		0x0200</div><div class='add'>+#define PHB_CONFIG_0_HIGH	0x0220</div><div class='add'>+#define PHB_CONFIG_0_LOW	0x0230</div><div class='add'>+#define PHB_CONFIG_0_END	0x0240</div><div class='add'>+#define PHB_MEM_2_LOW		0x02B0</div><div class='add'>+#define PHB_MEM_2_HIGH		0x02C0</div><div class='add'>+#define PHB_MEM_2_SIZE_HIGH	0x02D0</div><div class='add'>+#define PHB_MEM_2_SIZE_LOW	0x02E0</div><div class='add'>+#define PHB_DOSHOLE_OFFSET	0x08E0</div><div class='add'>+</div><div class='add'>+/* PHB_CONFIG_RW */</div><div class='add'>+#define PHB_TCE_ENABLE		0x20000000</div><div class='add'>+#define PHB_SLOT_DISABLE	0x1C000000</div><div class='add'>+#define PHB_DAC_DISABLE		0x01000000</div><div class='add'>+#define PHB_MEM2_ENABLE		0x00400000</div><div class='add'>+#define PHB_MCSR_ENABLE		0x00100000</div><div class='add'>+/* TAR (Table Address Register) */</div><div class='add'>+#define TAR_SW_BITS		0x0000ffffffff800fUL</div><div class='add'>+#define TAR_VALID		0x0000000000000008UL</div><div class='add'>+/* CSR (Channel/DMA Status Register) */</div><div class='add'>+#define CSR_AGENT_MASK		0xffe0ffff</div><div class='add'>+</div><div class='add'>+#define MAX_NUM_OF_PHBS		8 /* how many PHBs in total? */</div><div class='add'>+#define MAX_PHB_BUS_NUM		(MAX_NUM_OF_PHBS * 2) /* max dev-&gt;bus-&gt;number */</div><div class='add'>+#define PHBS_PER_CALGARY	4</div><div class='add'>+</div><div class='add'>+/* register offsets in Calgary's internal register space */</div><div class='add'>+static const unsigned long tar_offsets[] = {</div><div class='add'>+	0x0580 /* TAR0 */,</div><div class='add'>+	0x0588 /* TAR1 */,</div><div class='add'>+	0x0590 /* TAR2 */,</div><div class='add'>+	0x0598 /* TAR3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned long split_queue_offsets[] = {</div><div class='add'>+	0x4870 /* SPLIT QUEUE 0 */,</div><div class='add'>+	0x5870 /* SPLIT QUEUE 1 */,</div><div class='add'>+	0x6870 /* SPLIT QUEUE 2 */,</div><div class='add'>+	0x7870 /* SPLIT QUEUE 3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned long phb_offsets[] = {</div><div class='add'>+	0x8000 /* PHB0 */,</div><div class='add'>+	0x9000 /* PHB1 */,</div><div class='add'>+	0xA000 /* PHB2 */,</div><div class='add'>+	0xB000 /* PHB3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void* tce_table_kva[MAX_NUM_OF_PHBS * MAX_NUMNODES];</div><div class='add'>+unsigned int specified_table_size = TCE_TABLE_SIZE_UNSPECIFIED;</div><div class='add'>+static int translate_empty_slots __read_mostly = 0;</div><div class='add'>+static int calgary_detected __read_mostly = 0;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the bitmap of PHBs the user requested that we disable</div><div class='add'>+ * translation on.</div><div class='add'>+ */</div><div class='add'>+static DECLARE_BITMAP(translation_disabled, MAX_NUMNODES * MAX_PHB_BUS_NUM);</div><div class='add'>+</div><div class='add'>+static void tce_cache_blast(struct iommu_table *tbl);</div><div class='add'>+</div><div class='add'>+/* enable this to stress test the chip's TCE cache */</div><div class='add'>+#ifdef CONFIG_IOMMU_DEBUG</div><div class='add'>+static inline void tce_cache_blast_stress(struct iommu_table *tbl)</div><div class='add'>+{</div><div class='add'>+	tce_cache_blast(tbl);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void tce_cache_blast_stress(struct iommu_table *tbl)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* BLAST_TCE_CACHE_ON_UNMAP */</div><div class='add'>+</div><div class='add'>+static inline unsigned int num_dma_pages(unsigned long dma, unsigned int dmalen)</div><div class='add'>+{</div><div class='add'>+	unsigned int npages;</div><div class='add'>+</div><div class='add'>+	npages = PAGE_ALIGN(dma + dmalen) - (dma &amp; PAGE_MASK);</div><div class='add'>+	npages &gt;&gt;= PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	return npages;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int translate_phb(struct pci_dev* dev)</div><div class='add'>+{</div><div class='add'>+	int disabled = test_bit(dev-&gt;bus-&gt;number, translation_disabled);</div><div class='add'>+	return !disabled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_range_reserve(struct iommu_table *tbl,</div><div class='add'>+        unsigned long start_addr, unsigned int npages)</div><div class='add'>+{</div><div class='add'>+	unsigned long index;</div><div class='add'>+	unsigned long end;</div><div class='add'>+</div><div class='add'>+	index = start_addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* bail out if we're asked to reserve a region we don't cover */</div><div class='add'>+	if (index &gt;= tbl-&gt;it_size)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	end = index + npages;</div><div class='add'>+	if (end &gt; tbl-&gt;it_size) /* don't go off the table */</div><div class='add'>+		end = tbl-&gt;it_size;</div><div class='add'>+</div><div class='add'>+	while (index &lt; end) {</div><div class='add'>+		if (test_bit(index, tbl-&gt;it_map))</div><div class='add'>+			printk(KERN_ERR "Calgary: entry already allocated at "</div><div class='add'>+			       "0x%lx tbl %p dma 0x%lx npages %u\n",</div><div class='add'>+			       index, tbl, start_addr, npages);</div><div class='add'>+		++index;</div><div class='add'>+	}</div><div class='add'>+	set_bit_string(tbl-&gt;it_map, start_addr &gt;&gt; PAGE_SHIFT, npages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long iommu_range_alloc(struct iommu_table *tbl,</div><div class='add'>+	unsigned int npages)</div><div class='add'>+{</div><div class='add'>+	unsigned long offset;</div><div class='add'>+</div><div class='add'>+	BUG_ON(npages == 0);</div><div class='add'>+</div><div class='add'>+	offset = find_next_zero_string(tbl-&gt;it_map, tbl-&gt;it_hint,</div><div class='add'>+				       tbl-&gt;it_size, npages);</div><div class='add'>+	if (offset == ~0UL) {</div><div class='add'>+		tce_cache_blast(tbl);</div><div class='add'>+		offset = find_next_zero_string(tbl-&gt;it_map, 0,</div><div class='add'>+					       tbl-&gt;it_size, npages);</div><div class='add'>+		if (offset == ~0UL) {</div><div class='add'>+			printk(KERN_WARNING "Calgary: IOMMU full.\n");</div><div class='add'>+			if (panic_on_overflow)</div><div class='add'>+				panic("Calgary: fix the allocator.\n");</div><div class='add'>+			else</div><div class='add'>+				return bad_dma_address;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit_string(tbl-&gt;it_map, offset, npages);</div><div class='add'>+	tbl-&gt;it_hint = offset + npages;</div><div class='add'>+	BUG_ON(tbl-&gt;it_hint &gt; tbl-&gt;it_size);</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_addr_t iommu_alloc(struct iommu_table *tbl, void *vaddr,</div><div class='add'>+	unsigned int npages, int direction)</div><div class='add'>+{</div><div class='add'>+	unsigned long entry, flags;</div><div class='add'>+	dma_addr_t ret = bad_dma_address;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+</div><div class='add'>+	entry = iommu_range_alloc(tbl, npages);</div><div class='add'>+</div><div class='add'>+	if (unlikely(entry == bad_dma_address))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* set the return dma address */</div><div class='add'>+	ret = (entry &lt;&lt; PAGE_SHIFT) | ((unsigned long)vaddr &amp; ~PAGE_MASK);</div><div class='add'>+</div><div class='add'>+	/* put the TCEs in the HW table */</div><div class='add'>+	tce_build(tbl, entry, npages, (unsigned long)vaddr &amp; PAGE_MASK,</div><div class='add'>+		  direction);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+	printk(KERN_WARNING "Calgary: failed to allocate %u pages in "</div><div class='add'>+	       "iommu %p\n", npages, tbl);</div><div class='add'>+	return bad_dma_address;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,</div><div class='add'>+	unsigned int npages)</div><div class='add'>+{</div><div class='add'>+	unsigned long entry;</div><div class='add'>+	unsigned long i;</div><div class='add'>+</div><div class='add'>+	entry = dma_addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	BUG_ON(entry + npages &gt; tbl-&gt;it_size);</div><div class='add'>+</div><div class='add'>+	tce_free(tbl, entry, npages);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; npages; ++i) {</div><div class='add'>+		if (!test_bit(entry + i, tbl-&gt;it_map))</div><div class='add'>+			printk(KERN_ERR "Calgary: bit is off at 0x%lx "</div><div class='add'>+			       "tbl %p dma 0x%Lx entry 0x%lx npages %u\n",</div><div class='add'>+			       entry + i, tbl, dma_addr, entry, npages);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__clear_bit_string(tbl-&gt;it_map, entry, npages);</div><div class='add'>+</div><div class='add'>+	tce_cache_blast_stress(tbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,</div><div class='add'>+	unsigned int npages)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+</div><div class='add'>+	__iommu_free(tbl, dma_addr, npages);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __calgary_unmap_sg(struct iommu_table *tbl,</div><div class='add'>+	struct scatterlist *sglist, int nelems, int direction)</div><div class='add'>+{</div><div class='add'>+	while (nelems--) {</div><div class='add'>+		unsigned int npages;</div><div class='add'>+		dma_addr_t dma = sglist-&gt;dma_address;</div><div class='add'>+		unsigned int dmalen = sglist-&gt;dma_length;</div><div class='add'>+</div><div class='add'>+		if (dmalen == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		npages = num_dma_pages(dma, dmalen);</div><div class='add'>+		__iommu_free(tbl, dma, npages);</div><div class='add'>+		sglist++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void calgary_unmap_sg(struct device *dev, struct scatterlist *sglist,</div><div class='add'>+		      int nelems, int direction)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct iommu_table *tbl = to_pci_dev(dev)-&gt;bus-&gt;self-&gt;sysdata;</div><div class='add'>+</div><div class='add'>+	if (!translate_phb(to_pci_dev(dev)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+</div><div class='add'>+	__calgary_unmap_sg(tbl, sglist, nelems, direction);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int calgary_nontranslate_map_sg(struct device* dev,</div><div class='add'>+	struct scatterlist *sg, int nelems, int direction)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+ 	for (i = 0; i &lt; nelems; i++ ) {</div><div class='add'>+		struct scatterlist *s = &amp;sg[i];</div><div class='add'>+		BUG_ON(!s-&gt;page);</div><div class='add'>+		s-&gt;dma_address = virt_to_bus(page_address(s-&gt;page) +s-&gt;offset);</div><div class='add'>+		s-&gt;dma_length = s-&gt;length;</div><div class='add'>+	}</div><div class='add'>+	return nelems;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int calgary_map_sg(struct device *dev, struct scatterlist *sg,</div><div class='add'>+	int nelems, int direction)</div><div class='add'>+{</div><div class='add'>+	struct iommu_table *tbl = to_pci_dev(dev)-&gt;bus-&gt;self-&gt;sysdata;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned long vaddr;</div><div class='add'>+	unsigned int npages;</div><div class='add'>+	unsigned long entry;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!translate_phb(to_pci_dev(dev)))</div><div class='add'>+		return calgary_nontranslate_map_sg(dev, sg, nelems, direction);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nelems; i++ ) {</div><div class='add'>+		struct scatterlist *s = &amp;sg[i];</div><div class='add'>+		BUG_ON(!s-&gt;page);</div><div class='add'>+</div><div class='add'>+		vaddr = (unsigned long)page_address(s-&gt;page) + s-&gt;offset;</div><div class='add'>+		npages = num_dma_pages(vaddr, s-&gt;length);</div><div class='add'>+</div><div class='add'>+		entry = iommu_range_alloc(tbl, npages);</div><div class='add'>+		if (entry == bad_dma_address) {</div><div class='add'>+			/* makes sure unmap knows to stop */</div><div class='add'>+			s-&gt;dma_length = 0;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		s-&gt;dma_address = (entry &lt;&lt; PAGE_SHIFT) | s-&gt;offset;</div><div class='add'>+</div><div class='add'>+		/* insert into HW table */</div><div class='add'>+		tce_build(tbl, entry, npages, vaddr &amp; PAGE_MASK,</div><div class='add'>+			  direction);</div><div class='add'>+</div><div class='add'>+		s-&gt;dma_length = s-&gt;length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+</div><div class='add'>+	return nelems;</div><div class='add'>+error:</div><div class='add'>+	__calgary_unmap_sg(tbl, sg, nelems, direction);</div><div class='add'>+	for (i = 0; i &lt; nelems; i++) {</div><div class='add'>+		sg[i].dma_address = bad_dma_address;</div><div class='add'>+		sg[i].dma_length = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;tbl-&gt;it_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+dma_addr_t calgary_map_single(struct device *dev, void *vaddr,</div><div class='add'>+	size_t size, int direction)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma_handle = bad_dma_address;</div><div class='add'>+	unsigned long uaddr;</div><div class='add'>+	unsigned int npages;</div><div class='add'>+	struct iommu_table *tbl = to_pci_dev(dev)-&gt;bus-&gt;self-&gt;sysdata;</div><div class='add'>+</div><div class='add'>+	uaddr = (unsigned long)vaddr;</div><div class='add'>+	npages = num_dma_pages(uaddr, size);</div><div class='add'>+</div><div class='add'>+	if (translate_phb(to_pci_dev(dev)))</div><div class='add'>+		dma_handle = iommu_alloc(tbl, vaddr, npages, direction);</div><div class='add'>+	else</div><div class='add'>+		dma_handle = virt_to_bus(vaddr);</div><div class='add'>+</div><div class='add'>+	return dma_handle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,</div><div class='add'>+	size_t size, int direction)</div><div class='add'>+{</div><div class='add'>+	struct iommu_table *tbl = to_pci_dev(dev)-&gt;bus-&gt;self-&gt;sysdata;</div><div class='add'>+	unsigned int npages;</div><div class='add'>+</div><div class='add'>+	if (!translate_phb(to_pci_dev(dev)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	npages = num_dma_pages(dma_handle, size);</div><div class='add'>+	iommu_free(tbl, dma_handle, npages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void* calgary_alloc_coherent(struct device *dev, size_t size,</div><div class='add'>+	dma_addr_t *dma_handle, gfp_t flag)</div><div class='add'>+{</div><div class='add'>+	void *ret = NULL;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	unsigned int npages, order;</div><div class='add'>+	struct iommu_table *tbl;</div><div class='add'>+</div><div class='add'>+	tbl = to_pci_dev(dev)-&gt;bus-&gt;self-&gt;sysdata;</div><div class='add'>+</div><div class='add'>+	size = PAGE_ALIGN(size); /* size rounded up to full pages */</div><div class='add'>+	npages = size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	order = get_order(size);</div><div class='add'>+</div><div class='add'>+	/* alloc enough pages (and possibly more) */</div><div class='add'>+	ret = (void *)__get_free_pages(flag, order);</div><div class='add'>+	if (!ret)</div><div class='add'>+		goto error;</div><div class='add'>+	memset(ret, 0, size);</div><div class='add'>+</div><div class='add'>+	if (translate_phb(to_pci_dev(dev))) {</div><div class='add'>+		/* set up tces to cover the allocated range */</div><div class='add'>+		mapping = iommu_alloc(tbl, ret, npages, DMA_BIDIRECTIONAL);</div><div class='add'>+		if (mapping == bad_dma_address)</div><div class='add'>+			goto free;</div><div class='add'>+</div><div class='add'>+		*dma_handle = mapping;</div><div class='add'>+	} else /* non translated slot */</div><div class='add'>+		*dma_handle = virt_to_bus(ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	free_pages((unsigned long)ret, get_order(size));</div><div class='add'>+	ret = NULL;</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dma_mapping_ops calgary_dma_ops = {</div><div class='add'>+	.alloc_coherent = calgary_alloc_coherent,</div><div class='add'>+	.map_single = calgary_map_single,</div><div class='add'>+	.unmap_single = calgary_unmap_single,</div><div class='add'>+	.map_sg = calgary_map_sg,</div><div class='add'>+	.unmap_sg = calgary_unmap_sg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int busno_to_phbid(unsigned char num)</div><div class='add'>+{</div><div class='add'>+	return bus_to_phb(num) % PHBS_PER_CALGARY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long split_queue_offset(unsigned char num)</div><div class='add'>+{</div><div class='add'>+	size_t idx = busno_to_phbid(num);</div><div class='add'>+</div><div class='add'>+	return split_queue_offsets[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long tar_offset(unsigned char num)</div><div class='add'>+{</div><div class='add'>+	size_t idx = busno_to_phbid(num);</div><div class='add'>+</div><div class='add'>+	return tar_offsets[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long phb_offset(unsigned char num)</div><div class='add'>+{</div><div class='add'>+	size_t idx = busno_to_phbid(num);</div><div class='add'>+</div><div class='add'>+	return phb_offsets[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __iomem* calgary_reg(void __iomem *bar, unsigned long offset)</div><div class='add'>+{</div><div class='add'>+	unsigned long target = ((unsigned long)bar) | offset;</div><div class='add'>+	return (void __iomem*)target;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tce_cache_blast(struct iommu_table *tbl)</div><div class='add'>+{</div><div class='add'>+	u64 val;</div><div class='add'>+	u32 aer;</div><div class='add'>+	int i = 0;</div><div class='add'>+	void __iomem *bbar = tbl-&gt;bbar;</div><div class='add'>+	void __iomem *target;</div><div class='add'>+</div><div class='add'>+	/* disable arbitration on the bus */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(tbl-&gt;it_busno) | PHB_AER_OFFSET);</div><div class='add'>+	aer = readl(target);</div><div class='add'>+	writel(0, target);</div><div class='add'>+</div><div class='add'>+	/* read plssr to ensure it got there */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(tbl-&gt;it_busno) | PHB_PLSSR_OFFSET);</div><div class='add'>+	val = readl(target);</div><div class='add'>+</div><div class='add'>+	/* poll split queues until all DMA activity is done */</div><div class='add'>+	target = calgary_reg(bbar, split_queue_offset(tbl-&gt;it_busno));</div><div class='add'>+	do {</div><div class='add'>+		val = readq(target);</div><div class='add'>+		i++;</div><div class='add'>+	} while ((val &amp; 0xff) != 0xff &amp;&amp; i &lt; 100);</div><div class='add'>+	if (i == 100)</div><div class='add'>+		printk(KERN_WARNING "Calgary: PCI bus not quiesced, "</div><div class='add'>+		       "continuing anyway\n");</div><div class='add'>+</div><div class='add'>+	/* invalidate TCE cache */</div><div class='add'>+	target = calgary_reg(bbar, tar_offset(tbl-&gt;it_busno));</div><div class='add'>+	writeq(tbl-&gt;tar_val, target);</div><div class='add'>+</div><div class='add'>+	/* enable arbitration */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(tbl-&gt;it_busno) | PHB_AER_OFFSET);</div><div class='add'>+	writel(aer, target);</div><div class='add'>+	(void)readl(target); /* flush */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init calgary_reserve_mem_region(struct pci_dev *dev, u64 start,</div><div class='add'>+	u64 limit)</div><div class='add'>+{</div><div class='add'>+	unsigned int numpages;</div><div class='add'>+</div><div class='add'>+	limit = limit | 0xfffff;</div><div class='add'>+	limit++;</div><div class='add'>+</div><div class='add'>+	numpages = ((limit - start) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+	iommu_range_reserve(dev-&gt;sysdata, start, numpages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init calgary_reserve_peripheral_mem_1(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	void __iomem *target;</div><div class='add'>+	u64 low, high, sizelow;</div><div class='add'>+	u64 start, limit;</div><div class='add'>+	struct iommu_table *tbl = dev-&gt;sysdata;</div><div class='add'>+	unsigned char busnum = dev-&gt;bus-&gt;number;</div><div class='add'>+	void __iomem *bbar = tbl-&gt;bbar;</div><div class='add'>+</div><div class='add'>+	/* peripheral MEM_1 region */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_1_LOW);</div><div class='add'>+	low = be32_to_cpu(readl(target));</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_1_HIGH);</div><div class='add'>+	high = be32_to_cpu(readl(target));</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_1_SIZE);</div><div class='add'>+	sizelow = be32_to_cpu(readl(target));</div><div class='add'>+</div><div class='add'>+	start = (high &lt;&lt; 32) | low;</div><div class='add'>+	limit = sizelow;</div><div class='add'>+</div><div class='add'>+	calgary_reserve_mem_region(dev, start, limit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init calgary_reserve_peripheral_mem_2(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	void __iomem *target;</div><div class='add'>+	u32 val32;</div><div class='add'>+	u64 low, high, sizelow, sizehigh;</div><div class='add'>+	u64 start, limit;</div><div class='add'>+	struct iommu_table *tbl = dev-&gt;sysdata;</div><div class='add'>+	unsigned char busnum = dev-&gt;bus-&gt;number;</div><div class='add'>+	void __iomem *bbar = tbl-&gt;bbar;</div><div class='add'>+</div><div class='add'>+	/* is it enabled? */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_CONFIG_RW_OFFSET);</div><div class='add'>+	val32 = be32_to_cpu(readl(target));</div><div class='add'>+	if (!(val32 &amp; PHB_MEM2_ENABLE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_2_LOW);</div><div class='add'>+	low = be32_to_cpu(readl(target));</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_2_HIGH);</div><div class='add'>+	high = be32_to_cpu(readl(target));</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_2_SIZE_LOW);</div><div class='add'>+	sizelow = be32_to_cpu(readl(target));</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_MEM_2_SIZE_HIGH);</div><div class='add'>+	sizehigh = be32_to_cpu(readl(target));</div><div class='add'>+</div><div class='add'>+	start = (high &lt;&lt; 32) | low;</div><div class='add'>+	limit = (sizehigh &lt;&lt; 32) | sizelow;</div><div class='add'>+</div><div class='add'>+	calgary_reserve_mem_region(dev, start, limit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * some regions of the IO address space do not get translated, so we</div><div class='add'>+ * must not give devices IO addresses in those regions. The regions</div><div class='add'>+ * are the 640KB-1MB region and the two PCI peripheral memory holes.</div><div class='add'>+ * Reserve all of them in the IOMMU bitmap to avoid giving them out</div><div class='add'>+ * later.</div><div class='add'>+ */</div><div class='add'>+static void __init calgary_reserve_regions(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int npages;</div><div class='add'>+	void __iomem *bbar;</div><div class='add'>+	unsigned char busnum;</div><div class='add'>+	u64 start;</div><div class='add'>+	struct iommu_table *tbl = dev-&gt;sysdata;</div><div class='add'>+</div><div class='add'>+	bbar = tbl-&gt;bbar;</div><div class='add'>+	busnum = dev-&gt;bus-&gt;number;</div><div class='add'>+</div><div class='add'>+	/* reserve bad_dma_address in case it's a legal address */</div><div class='add'>+	iommu_range_reserve(tbl, bad_dma_address, 1);</div><div class='add'>+</div><div class='add'>+	/* avoid the BIOS/VGA first 640KB-1MB region */</div><div class='add'>+	start = (640 * 1024);</div><div class='add'>+	npages = ((1024 - 640) * 1024) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	iommu_range_reserve(tbl, start, npages);</div><div class='add'>+</div><div class='add'>+	/* reserve the two PCI peripheral memory regions in IO space */</div><div class='add'>+	calgary_reserve_peripheral_mem_1(dev);</div><div class='add'>+	calgary_reserve_peripheral_mem_2(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init calgary_setup_tar(struct pci_dev *dev, void __iomem *bbar)</div><div class='add'>+{</div><div class='add'>+	u64 val64;</div><div class='add'>+	u64 table_phys;</div><div class='add'>+	void __iomem *target;</div><div class='add'>+	int ret;</div><div class='add'>+	struct iommu_table *tbl;</div><div class='add'>+</div><div class='add'>+	/* build TCE tables for each PHB */</div><div class='add'>+	ret = build_tce_table(dev, bbar);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	calgary_reserve_regions(dev);</div><div class='add'>+</div><div class='add'>+	/* set TARs for each PHB */</div><div class='add'>+	target = calgary_reg(bbar, tar_offset(dev-&gt;bus-&gt;number));</div><div class='add'>+	val64 = be64_to_cpu(readq(target));</div><div class='add'>+</div><div class='add'>+	/* zero out all TAR bits under sw control */</div><div class='add'>+	val64 &amp;= ~TAR_SW_BITS;</div><div class='add'>+</div><div class='add'>+	tbl = dev-&gt;sysdata;</div><div class='add'>+	table_phys = (u64)__pa(tbl-&gt;it_base);</div><div class='add'>+	val64 |= table_phys;</div><div class='add'>+</div><div class='add'>+	BUG_ON(specified_table_size &gt; TCE_TABLE_SIZE_8M);</div><div class='add'>+	val64 |= (u64) specified_table_size;</div><div class='add'>+</div><div class='add'>+	tbl-&gt;tar_val = cpu_to_be64(val64);</div><div class='add'>+	writeq(tbl-&gt;tar_val, target);</div><div class='add'>+	readq(target); /* flush */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init calgary_free_tar(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u64 val64;</div><div class='add'>+	struct iommu_table *tbl = dev-&gt;sysdata;</div><div class='add'>+	void __iomem *target;</div><div class='add'>+</div><div class='add'>+	target = calgary_reg(tbl-&gt;bbar, tar_offset(dev-&gt;bus-&gt;number));</div><div class='add'>+	val64 = be64_to_cpu(readq(target));</div><div class='add'>+	val64 &amp;= ~TAR_SW_BITS;</div><div class='add'>+	writeq(cpu_to_be64(val64), target);</div><div class='add'>+	readq(target); /* flush */</div><div class='add'>+</div><div class='add'>+	kfree(tbl);</div><div class='add'>+	dev-&gt;sysdata = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void calgary_watchdog(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev = (struct pci_dev *)data;</div><div class='add'>+	struct iommu_table *tbl = dev-&gt;sysdata;</div><div class='add'>+	void __iomem *bbar = tbl-&gt;bbar;</div><div class='add'>+	u32 val32;</div><div class='add'>+	void __iomem *target;</div><div class='add'>+</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(tbl-&gt;it_busno) | PHB_CSR_OFFSET);</div><div class='add'>+	val32 = be32_to_cpu(readl(target));</div><div class='add'>+</div><div class='add'>+	/* If no error, the agent ID in the CSR is not valid */</div><div class='add'>+	if (val32 &amp; CSR_AGENT_MASK) {</div><div class='add'>+		printk(KERN_EMERG "calgary_watchdog: DMA error on bus %d, "</div><div class='add'>+				  "CSR = %#x\n", dev-&gt;bus-&gt;number, val32);</div><div class='add'>+		writel(0, target);</div><div class='add'>+</div><div class='add'>+		/* Disable bus that caused the error */</div><div class='add'>+		target = calgary_reg(bbar, phb_offset(tbl-&gt;it_busno) |</div><div class='add'>+					   PHB_CONFIG_RW_OFFSET);</div><div class='add'>+		val32 = be32_to_cpu(readl(target));</div><div class='add'>+		val32 |= PHB_SLOT_DISABLE;</div><div class='add'>+		writel(cpu_to_be32(val32), target);</div><div class='add'>+		readl(target); /* flush */</div><div class='add'>+	} else {</div><div class='add'>+		/* Reset the timer */</div><div class='add'>+		mod_timer(&amp;tbl-&gt;watchdog_timer, jiffies + 2 * HZ);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init calgary_enable_translation(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 val32;</div><div class='add'>+	unsigned char busnum;</div><div class='add'>+	void __iomem *target;</div><div class='add'>+	void __iomem *bbar;</div><div class='add'>+	struct iommu_table *tbl;</div><div class='add'>+</div><div class='add'>+	busnum = dev-&gt;bus-&gt;number;</div><div class='add'>+	tbl = dev-&gt;sysdata;</div><div class='add'>+	bbar = tbl-&gt;bbar;</div><div class='add'>+</div><div class='add'>+	/* enable TCE in PHB Config Register */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_CONFIG_RW_OFFSET);</div><div class='add'>+	val32 = be32_to_cpu(readl(target));</div><div class='add'>+	val32 |= PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Calgary: enabling translation on PHB %d\n", busnum);</div><div class='add'>+	printk(KERN_INFO "Calgary: errant DMAs will now be prevented on this "</div><div class='add'>+	       "bus.\n");</div><div class='add'>+</div><div class='add'>+	writel(cpu_to_be32(val32), target);</div><div class='add'>+	readl(target); /* flush */</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;tbl-&gt;watchdog_timer);</div><div class='add'>+	tbl-&gt;watchdog_timer.function = &amp;calgary_watchdog;</div><div class='add'>+	tbl-&gt;watchdog_timer.data = (unsigned long)dev;</div><div class='add'>+	mod_timer(&amp;tbl-&gt;watchdog_timer, jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init calgary_disable_translation(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 val32;</div><div class='add'>+	unsigned char busnum;</div><div class='add'>+	void __iomem *target;</div><div class='add'>+	void __iomem *bbar;</div><div class='add'>+	struct iommu_table *tbl;</div><div class='add'>+</div><div class='add'>+	busnum = dev-&gt;bus-&gt;number;</div><div class='add'>+	tbl = dev-&gt;sysdata;</div><div class='add'>+	bbar = tbl-&gt;bbar;</div><div class='add'>+</div><div class='add'>+	/* disable TCE in PHB Config Register */</div><div class='add'>+	target = calgary_reg(bbar, phb_offset(busnum) | PHB_CONFIG_RW_OFFSET);</div><div class='add'>+	val32 = be32_to_cpu(readl(target));</div><div class='add'>+	val32 &amp;= ~(PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Calgary: disabling translation on PHB %d!\n", busnum);</div><div class='add'>+	writel(cpu_to_be32(val32), target);</div><div class='add'>+	readl(target); /* flush */</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;tbl-&gt;watchdog_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int __init locate_register_space(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	int rionodeid;</div><div class='add'>+	u32 address;</div><div class='add'>+</div><div class='add'>+	rionodeid = (dev-&gt;bus-&gt;number % 15 &gt; 4) ? 3 : 2;</div><div class='add'>+	/*</div><div class='add'>+	 * register space address calculation as follows:</div><div class='add'>+	 * FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase)</div><div class='add'>+	 * ChassisBase is always zero for x366/x260/x460</div><div class='add'>+	 * RioNodeId is 2 for first Calgary, 3 for second Calgary</div><div class='add'>+	 */</div><div class='add'>+	address = START_ADDRESS	-</div><div class='add'>+		(0x800000 * (ONE_BASED_CHASSIS_NUM + dev-&gt;bus-&gt;number / 15)) +</div><div class='add'>+		(0x100000) * (rionodeid - CHASSIS_BASE);</div><div class='add'>+	return address;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init calgary_init_one_nontraslated(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;sysdata = NULL;</div><div class='add'>+	dev-&gt;bus-&gt;self = dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init calgary_init_one(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 address;</div><div class='add'>+	void __iomem *bbar;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	address = locate_register_space(dev);</div><div class='add'>+	/* map entire 1MB of Calgary config space */</div><div class='add'>+	bbar = ioremap_nocache(address, 1024 * 1024);</div><div class='add'>+	if (!bbar) {</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = calgary_setup_tar(dev, bbar);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto iounmap;</div><div class='add'>+</div><div class='add'>+	dev-&gt;bus-&gt;self = dev;</div><div class='add'>+	calgary_enable_translation(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+iounmap:</div><div class='add'>+	iounmap(bbar);</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init calgary_init(void)</div><div class='add'>+{</div><div class='add'>+	int i, ret = -ENODEV;</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= num_online_nodes() * MAX_NUM_OF_PHBS; i++) {</div><div class='add'>+		dev = pci_get_device(PCI_VENDOR_ID_IBM,</div><div class='add'>+				     PCI_DEVICE_ID_IBM_CALGARY,</div><div class='add'>+				     dev);</div><div class='add'>+		if (!dev)</div><div class='add'>+			break;</div><div class='add'>+		if (!translate_phb(dev)) {</div><div class='add'>+			calgary_init_one_nontraslated(dev);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (!tce_table_kva[i] &amp;&amp; !translate_empty_slots) {</div><div class='add'>+			pci_dev_put(dev);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		ret = calgary_init_one(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	for (i--; i &gt;= 0; i--) {</div><div class='add'>+		dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,</div><div class='add'>+					      PCI_DEVICE_ID_IBM_CALGARY,</div><div class='add'>+					      dev);</div><div class='add'>+		if (!translate_phb(dev)) {</div><div class='add'>+			pci_dev_put(dev);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (!tce_table_kva[i] &amp;&amp; !translate_empty_slots)</div><div class='add'>+			continue;</div><div class='add'>+		calgary_disable_translation(dev);</div><div class='add'>+		calgary_free_tar(dev);</div><div class='add'>+		pci_dev_put(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __init determine_tce_table_size(u64 ram)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (specified_table_size != TCE_TABLE_SIZE_UNSPECIFIED)</div><div class='add'>+		return specified_table_size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to</div><div class='add'>+	 * TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each</div><div class='add'>+	 * larger table size has twice as many entries, so shift the</div><div class='add'>+	 * max ram address by 13 to divide by 8K and then look at the</div><div class='add'>+	 * order of the result to choose between 0-7.</div><div class='add'>+	 */</div><div class='add'>+	ret = get_order(ram &gt;&gt; 13);</div><div class='add'>+	if (ret &gt; TCE_TABLE_SIZE_8M)</div><div class='add'>+		ret = TCE_TABLE_SIZE_8M;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __init detect_calgary(void)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int bus, table_idx;</div><div class='add'>+	void *tbl;</div><div class='add'>+	int detected = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if the user specified iommu=off or iommu=soft or we found</div><div class='add'>+	 * another HW IOMMU already, bail out.</div><div class='add'>+	 */</div><div class='add'>+	if (swiotlb || no_iommu || iommu_detected)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	specified_table_size = determine_tce_table_size(end_pfn * PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	for (bus = 0, table_idx = 0;</div><div class='add'>+	     bus &lt;= num_online_nodes() * MAX_PHB_BUS_NUM;</div><div class='add'>+	     bus++) {</div><div class='add'>+		BUG_ON(bus &gt; MAX_NUMNODES * MAX_PHB_BUS_NUM);</div><div class='add'>+		if (read_pci_config(bus, 0, 0, 0) != PCI_VENDOR_DEVICE_ID_CALGARY)</div><div class='add'>+			continue;</div><div class='add'>+		if (test_bit(bus, translation_disabled)) {</div><div class='add'>+			printk(KERN_INFO "Calgary: translation is disabled for "</div><div class='add'>+			       "PHB 0x%x\n", bus);</div><div class='add'>+			/* skip this phb, don't allocate a tbl for it */</div><div class='add'>+			tce_table_kva[table_idx] = NULL;</div><div class='add'>+			table_idx++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * scan the first slot of the PCI bus to see if there</div><div class='add'>+		 * are any devices present</div><div class='add'>+		 */</div><div class='add'>+		val = read_pci_config(bus, 1, 0, 0);</div><div class='add'>+		if (val != 0xffffffff || translate_empty_slots) {</div><div class='add'>+			tbl = alloc_tce_table();</div><div class='add'>+			if (!tbl)</div><div class='add'>+				goto cleanup;</div><div class='add'>+			detected = 1;</div><div class='add'>+		} else</div><div class='add'>+			tbl = NULL;</div><div class='add'>+</div><div class='add'>+		tce_table_kva[table_idx] = tbl;</div><div class='add'>+		table_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (detected) {</div><div class='add'>+		iommu_detected = 1;</div><div class='add'>+		calgary_detected = 1;</div><div class='add'>+		printk(KERN_INFO "PCI-DMA: Calgary IOMMU detected. "</div><div class='add'>+		       "TCE table spec is %d.\n", specified_table_size);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	for (--table_idx; table_idx &gt;= 0; --table_idx)</div><div class='add'>+		if (tce_table_kva[table_idx])</div><div class='add'>+			free_tce_table(tce_table_kva[table_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __init calgary_iommu_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (no_iommu || swiotlb)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!calgary_detected)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* ok, we're trying to use Calgary - let's roll */</div><div class='add'>+	printk(KERN_INFO "PCI-DMA: Using Calgary IOMMU\n");</div><div class='add'>+</div><div class='add'>+	ret = calgary_init();</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "</div><div class='add'>+		       "falling back to no_iommu\n", ret);</div><div class='add'>+		if (end_pfn &gt; MAX_DMA32_PFN)</div><div class='add'>+			printk(KERN_ERR "WARNING more than 4GB of memory, "</div><div class='add'>+					"32bit PCI may malfunction.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	force_iommu = 1;</div><div class='add'>+	dma_ops = &amp;calgary_dma_ops;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init calgary_parse_options(char *p)</div><div class='add'>+{</div><div class='add'>+	unsigned int bridge;</div><div class='add'>+	size_t len;</div><div class='add'>+	char* endp;</div><div class='add'>+</div><div class='add'>+	while (*p) {</div><div class='add'>+		if (!strncmp(p, "64k", 3))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_64K;</div><div class='add'>+		else if (!strncmp(p, "128k", 4))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_128K;</div><div class='add'>+		else if (!strncmp(p, "256k", 4))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_256K;</div><div class='add'>+		else if (!strncmp(p, "512k", 4))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_512K;</div><div class='add'>+		else if (!strncmp(p, "1M", 2))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_1M;</div><div class='add'>+		else if (!strncmp(p, "2M", 2))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_2M;</div><div class='add'>+		else if (!strncmp(p, "4M", 2))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_4M;</div><div class='add'>+		else if (!strncmp(p, "8M", 2))</div><div class='add'>+			specified_table_size = TCE_TABLE_SIZE_8M;</div><div class='add'>+</div><div class='add'>+		len = strlen("translate_empty_slots");</div><div class='add'>+		if (!strncmp(p, "translate_empty_slots", len))</div><div class='add'>+			translate_empty_slots = 1;</div><div class='add'>+</div><div class='add'>+		len = strlen("disable");</div><div class='add'>+		if (!strncmp(p, "disable", len)) {</div><div class='add'>+			p += len;</div><div class='add'>+			if (*p == '=')</div><div class='add'>+				++p;</div><div class='add'>+			if (*p == '\0')</div><div class='add'>+				break;</div><div class='add'>+			bridge = simple_strtol(p, &amp;endp, 0);</div><div class='add'>+			if (p == endp)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (bridge &lt;= (num_online_nodes() * MAX_PHB_BUS_NUM)) {</div><div class='add'>+				printk(KERN_INFO "Calgary: disabling "</div><div class='add'>+				       "translation for PHB 0x%x\n", bridge);</div><div class='add'>+				set_bit(bridge, translation_disabled);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		p = strpbrk(p, ",");</div><div class='add'>+		if (!p)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		p++; /* skip ',' */</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("calgary=", calgary_parse_options);</div><div class='head'>diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c<br/>index a9275c9557cf..9c44f4f2433d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/pci-dma.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='add'>+#include &lt;asm/calgary.h&gt;</div><div class='ctx'> </div><div class='ctx'> int iommu_merge __read_mostly = 0;</div><div class='ctx'> EXPORT_SYMBOL(iommu_merge);</div><div class='hunk'>@@ -33,12 +34,15 @@ int panic_on_overflow __read_mostly = 0;</div><div class='ctx'> int force_iommu __read_mostly= 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Set this to 1 if there is a HW IOMMU in the system */</div><div class='add'>+int iommu_detected __read_mostly = 0;</div><div class='add'>+</div><div class='ctx'> /* Dummy device used for NULL arguments (normally ISA). Better would</div><div class='ctx'>    be probably a smaller DMA mask, but this is bug-to-bug compatible</div><div class='ctx'>    to i386. */</div><div class='ctx'> struct device fallback_dev = {</div><div class='ctx'> 	.bus_id = "fallback device",</div><div class='del'>-	.coherent_dma_mask = 0xffffffff,</div><div class='add'>+	.coherent_dma_mask = DMA_32BIT_MASK,</div><div class='ctx'> 	.dma_mask = &amp;fallback_dev.coherent_dma_mask,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +81,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,</div><div class='ctx'> 		dev = &amp;fallback_dev;</div><div class='ctx'> 	dma_mask = dev-&gt;coherent_dma_mask;</div><div class='ctx'> 	if (dma_mask == 0)</div><div class='del'>-		dma_mask = 0xffffffff;</div><div class='add'>+		dma_mask = DMA_32BIT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't invoke OOM killer */</div><div class='ctx'> 	gfp |= __GFP_NORETRY;</div><div class='hunk'>@@ -90,7 +94,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,</div><div class='ctx'> 	   larger than 16MB and in this case we have a chance of</div><div class='ctx'> 	   finding fitting memory in the next higher zone first. If</div><div class='ctx'> 	   not retry with true GFP_DMA. -AK */</div><div class='del'>-	if (dma_mask &lt;= 0xffffffff)</div><div class='add'>+	if (dma_mask &lt;= DMA_32BIT_MASK)</div><div class='ctx'> 		gfp |= GFP_DMA32;</div><div class='ctx'> </div><div class='ctx'>  again:</div><div class='hunk'>@@ -111,7 +115,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,</div><div class='ctx'> </div><div class='ctx'> 			/* Don't use the 16MB ZONE_DMA unless absolutely</div><div class='ctx'> 			   needed. It's better to use remapping first. */</div><div class='del'>-			if (dma_mask &lt; 0xffffffff &amp;&amp; !(gfp &amp; GFP_DMA)) {</div><div class='add'>+			if (dma_mask &lt; DMA_32BIT_MASK &amp;&amp; !(gfp &amp; GFP_DMA)) {</div><div class='ctx'> 				gfp = (gfp &amp; ~GFP_DMA32) | GFP_DMA;</div><div class='ctx'> 				goto again;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -174,7 +178,7 @@ int dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	/* Copied from i386. Doesn't make much sense, because it will</div><div class='ctx'> 	   only work for pci_alloc_coherent.</div><div class='ctx'> 	   The caller just has to use GFP_DMA in this case. */</div><div class='del'>-        if (mask &lt; 0x00ffffff)</div><div class='add'>+        if (mask &lt; DMA_24BIT_MASK)</div><div class='ctx'>                 return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the device to use SAC when IOMMU force is on.  This</div><div class='hunk'>@@ -189,7 +193,7 @@ int dma_supported(struct device *dev, u64 mask)</div><div class='ctx'> 	   SAC for these.  Assume all masks &lt;= 40 bits are of this</div><div class='ctx'> 	   type. Normally this doesn't make any difference, but gives</div><div class='ctx'> 	   more gentle handling of IOMMU overflow. */</div><div class='del'>-	if (iommu_sac_force &amp;&amp; (mask &gt;= 0xffffffffffULL)) {</div><div class='add'>+	if (iommu_sac_force &amp;&amp; (mask &gt;= DMA_40BIT_MASK)) {</div><div class='ctx'> 		printk(KERN_INFO "%s: Force SAC with mask %Lx\n", dev-&gt;bus_id,mask);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -266,7 +270,7 @@ __init int iommu_setup(char *p)</div><div class='ctx'> 		    swiotlb = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GART_IOMMU</div><div class='add'>+#ifdef CONFIG_IOMMU</div><div class='ctx'> 	    gart_parse_options(p);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -276,3 +280,40 @@ __init int iommu_setup(char *p)</div><div class='ctx'>     }</div><div class='ctx'>     return 1;</div><div class='ctx'> }</div><div class='add'>+__setup("iommu=", iommu_setup);</div><div class='add'>+</div><div class='add'>+void __init pci_iommu_alloc(void)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The order of these functions is important for</div><div class='add'>+	 * fall-back/fail-over reasons</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_IOMMU</div><div class='add'>+	iommu_hole_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CALGARY_IOMMU</div><div class='add'>+	detect_calgary();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SWIOTLB</div><div class='add'>+	pci_swiotlb_init();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init pci_iommu_init(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_CALGARY_IOMMU</div><div class='add'>+	calgary_iommu_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IOMMU</div><div class='add'>+	gart_iommu_init();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	no_iommu_init();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Must execute after PCI subsystem */</div><div class='add'>+fs_initcall(pci_iommu_init);</div><div class='head'>diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c<br/>index 82a7c9bfdfa0..6d3e61baf7a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-gart.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-gart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-gart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/pci-gart.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright 2002 Andi Kleen, SuSE Labs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/agp_backend.h&gt;</div><div class='hunk'>@@ -32,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> #include &lt;asm/swiotlb.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/k8.h&gt;</div><div class='ctx'> </div><div class='ctx'> unsigned long iommu_bus_base;	/* GART remapping area (physical) */</div><div class='ctx'> static unsigned long iommu_size; 	/* size of remapping area bytes */</div><div class='hunk'>@@ -46,8 +46,6 @@ u32 *iommu_gatt_base; 		/* Remapping table */</div><div class='ctx'>    also seen with Qlogic at least). */</div><div class='ctx'> int iommu_fullflush = 1;</div><div class='ctx'> </div><div class='del'>-#define MAX_NB 8</div><div class='del'>-</div><div class='ctx'> /* Allocation bitmap for the remapping area */ </div><div class='ctx'> static DEFINE_SPINLOCK(iommu_bitmap_lock);</div><div class='ctx'> static unsigned long *iommu_gart_bitmap; /* guarded by iommu_bitmap_lock */</div><div class='hunk'>@@ -63,13 +61,6 @@ static u32 gart_unmapped_entry;</div><div class='ctx'> #define to_pages(addr,size) \</div><div class='ctx'> 	(round_up(((addr) &amp; ~PAGE_MASK) + (size), PAGE_SIZE) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#define for_all_nb(dev) \</div><div class='del'>-	dev = NULL;	\</div><div class='del'>-	while ((dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x1103, dev))!=NULL)</div><div class='del'>-</div><div class='del'>-static struct pci_dev *northbridges[MAX_NB];</div><div class='del'>-static u32 northbridge_flush_word[MAX_NB];</div><div class='del'>-</div><div class='ctx'> #define EMERGENCY_PAGES 32 /* = 128KB */ </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AGP</div><div class='hunk'>@@ -93,7 +84,7 @@ static unsigned long alloc_iommu(int size)</div><div class='ctx'> 	offset = find_next_zero_string(iommu_gart_bitmap,next_bit,iommu_pages,size);</div><div class='ctx'> 	if (offset == -1) {</div><div class='ctx'> 		need_flush = 1;</div><div class='del'>-	       	offset = find_next_zero_string(iommu_gart_bitmap,0,next_bit,size);</div><div class='add'>+		offset = find_next_zero_string(iommu_gart_bitmap,0,iommu_pages,size);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (offset != -1) { </div><div class='ctx'> 		set_bit_string(iommu_gart_bitmap, offset, size); </div><div class='hunk'>@@ -120,44 +111,17 @@ static void free_iommu(unsigned long offset, int size)</div><div class='ctx'> /* </div><div class='ctx'>  * Use global flush state to avoid races with multiple flushers.</div><div class='ctx'>  */</div><div class='del'>-static void flush_gart(struct device *dev)</div><div class='add'>+static void flush_gart(void)</div><div class='ctx'> { </div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int flushed = 0;</div><div class='del'>-	int i, max;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;iommu_bitmap_lock, flags);</div><div class='del'>-	if (need_flush) { </div><div class='del'>-		max = 0;</div><div class='del'>-		for (i = 0; i &lt; MAX_NB; i++) {</div><div class='del'>-			if (!northbridges[i]) </div><div class='del'>-				continue;</div><div class='del'>-			pci_write_config_dword(northbridges[i], 0x9c, </div><div class='del'>-					       northbridge_flush_word[i] | 1); </div><div class='del'>-			flushed++;</div><div class='del'>-			max = i;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt;= max; i++) {</div><div class='del'>-			u32 w;</div><div class='del'>-			if (!northbridges[i])</div><div class='del'>-				continue;</div><div class='del'>-			/* Make sure the hardware actually executed the flush. */</div><div class='del'>-			for (;;) { </div><div class='del'>-				pci_read_config_dword(northbridges[i], 0x9c, &amp;w);</div><div class='del'>-				if (!(w &amp; 1))</div><div class='del'>-					break;</div><div class='del'>-				cpu_relax();</div><div class='del'>-			}</div><div class='del'>-		} </div><div class='del'>-		if (!flushed) </div><div class='del'>-			printk("nothing to flush?\n");</div><div class='add'>+	if (need_flush) {</div><div class='add'>+		k8_flush_garts();</div><div class='ctx'> 		need_flush = 0;</div><div class='ctx'> 	} </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;iommu_bitmap_lock, flags);</div><div class='ctx'> } </div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_IOMMU_LEAK</div><div class='ctx'> </div><div class='ctx'> #define SET_LEAK(x) if (iommu_leak_tab) \</div><div class='hunk'>@@ -266,7 +230,7 @@ static dma_addr_t gart_map_simple(struct device *dev, char *buf,</div><div class='ctx'> 				 size_t size, int dir)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t map = dma_map_area(dev, virt_to_bus(buf), size, dir);</div><div class='del'>-	flush_gart(dev);</div><div class='add'>+	flush_gart();</div><div class='ctx'> 	return map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -289,6 +253,28 @@ dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Free a DMA mapping.</div><div class='add'>+ */</div><div class='add'>+void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='add'>+		      size_t size, int direction)</div><div class='add'>+{</div><div class='add'>+	unsigned long iommu_page;</div><div class='add'>+	int npages;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (dma_addr &lt; iommu_bus_base + EMERGENCY_PAGES*PAGE_SIZE ||</div><div class='add'>+	    dma_addr &gt;= iommu_bus_base + iommu_size)</div><div class='add'>+		return;</div><div class='add'>+	iommu_page = (dma_addr - iommu_bus_base)&gt;&gt;PAGE_SHIFT;</div><div class='add'>+	npages = to_pages(dma_addr, size);</div><div class='add'>+	for (i = 0; i &lt; npages; i++) {</div><div class='add'>+		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;</div><div class='add'>+		CLEAR_LEAK(iommu_page + i);</div><div class='add'>+	}</div><div class='add'>+	free_iommu(iommu_page, npages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Wrapper for pci_unmap_single working with scatterlists.</div><div class='ctx'>  */</div><div class='ctx'> void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)</div><div class='hunk'>@@ -299,7 +285,7 @@ void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int di</div><div class='ctx'> 		struct scatterlist *s = &amp;sg[i];</div><div class='ctx'> 		if (!s-&gt;dma_length || !s-&gt;length)</div><div class='ctx'> 			break;</div><div class='del'>-		dma_unmap_single(dev, s-&gt;dma_address, s-&gt;dma_length, dir);</div><div class='add'>+		gart_unmap_single(dev, s-&gt;dma_address, s-&gt;dma_length, dir);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -329,7 +315,7 @@ static int dma_map_sg_nonforce(struct device *dev, struct scatterlist *sg,</div><div class='ctx'> 		s-&gt;dma_address = addr;</div><div class='ctx'> 		s-&gt;dma_length = s-&gt;length;</div><div class='ctx'> 	}</div><div class='del'>-	flush_gart(dev);</div><div class='add'>+	flush_gart();</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -436,13 +422,13 @@ int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)</div><div class='ctx'> 	if (dma_map_cont(sg, start, i, sg+out, pages, need) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	out++;</div><div class='del'>-	flush_gart(dev);</div><div class='add'>+	flush_gart();</div><div class='ctx'> 	if (out &lt; nents) </div><div class='ctx'> 		sg[out].dma_length = 0; </div><div class='ctx'> 	return out;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	flush_gart(NULL);</div><div class='add'>+	flush_gart();</div><div class='ctx'> 	gart_unmap_sg(dev, sg, nents, dir);</div><div class='ctx'> 	/* When it was forced or merged try again in a dumb way */</div><div class='ctx'> 	if (force_iommu || iommu_merge) {</div><div class='hunk'>@@ -458,28 +444,6 @@ error:</div><div class='ctx'> 	return 0;</div><div class='ctx'> } </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Free a DMA mapping.</div><div class='del'>- */ </div><div class='del'>-void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,</div><div class='del'>-		      size_t size, int direction)</div><div class='del'>-{</div><div class='del'>-	unsigned long iommu_page; </div><div class='del'>-	int npages;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dma_addr &lt; iommu_bus_base + EMERGENCY_PAGES*PAGE_SIZE || </div><div class='del'>-	    dma_addr &gt;= iommu_bus_base + iommu_size)</div><div class='del'>-		return;</div><div class='del'>-	iommu_page = (dma_addr - iommu_bus_base)&gt;&gt;PAGE_SHIFT;	</div><div class='del'>-	npages = to_pages(dma_addr, size);</div><div class='del'>-	for (i = 0; i &lt; npages; i++) { </div><div class='del'>-		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry; </div><div class='del'>-		CLEAR_LEAK(iommu_page + i);</div><div class='del'>-	}</div><div class='del'>-	free_iommu(iommu_page, npages);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int no_agp;</div><div class='ctx'> </div><div class='ctx'> static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)</div><div class='hunk'>@@ -532,10 +496,13 @@ static __init int init_k8_gatt(struct agp_kern_info *info)</div><div class='ctx'> 	void *gatt;</div><div class='ctx'> 	unsigned aper_base, new_aper_base;</div><div class='ctx'> 	unsigned aper_size, gatt_size, new_aper_size;</div><div class='del'>-	</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "PCI-DMA: Disabling AGP.\n");</div><div class='ctx'> 	aper_size = aper_base = info-&gt;aper_size = 0;</div><div class='del'>-	for_all_nb(dev) { </div><div class='add'>+	dev = NULL;</div><div class='add'>+	for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='add'>+		dev = k8_northbridges[i];</div><div class='ctx'> 		new_aper_base = read_aperture(dev, &amp;new_aper_size); </div><div class='ctx'> 		if (!new_aper_base) </div><div class='ctx'> 			goto nommu; </div><div class='hunk'>@@ -558,11 +525,12 @@ static __init int init_k8_gatt(struct agp_kern_info *info)</div><div class='ctx'> 		panic("Cannot allocate GATT table"); </div><div class='ctx'> 	memset(gatt, 0, gatt_size); </div><div class='ctx'> 	agp_gatt_table = gatt;</div><div class='del'>-	</div><div class='del'>-	for_all_nb(dev) { </div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='ctx'> 		u32 ctl; </div><div class='ctx'> 		u32 gatt_reg; </div><div class='ctx'> </div><div class='add'>+		dev = k8_northbridges[i];</div><div class='ctx'> 		gatt_reg = __pa(gatt) &gt;&gt; 12; </div><div class='ctx'> 		gatt_reg &lt;&lt;= 4; </div><div class='ctx'> 		pci_write_config_dword(dev, 0x98, gatt_reg);</div><div class='hunk'>@@ -573,7 +541,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)</div><div class='ctx'> </div><div class='ctx'> 		pci_write_config_dword(dev, 0x90, ctl); </div><div class='ctx'> 	}</div><div class='del'>-	flush_gart(NULL); </div><div class='add'>+	flush_gart();</div><div class='ctx'> 	</div><div class='ctx'> 	printk("PCI-DMA: aperture base @ %x size %u KB\n",aper_base, aper_size&gt;&gt;10); </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -602,15 +570,19 @@ static struct dma_mapping_ops gart_dma_ops = {</div><div class='ctx'> 	.unmap_sg = gart_unmap_sg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pci_iommu_init(void)</div><div class='add'>+void __init gart_iommu_init(void)</div><div class='ctx'> { </div><div class='ctx'> 	struct agp_kern_info info;</div><div class='ctx'> 	unsigned long aper_size;</div><div class='ctx'> 	unsigned long iommu_start;</div><div class='del'>-	struct pci_dev *dev;</div><div class='ctx'> 	unsigned long scratch;</div><div class='ctx'> 	long i;</div><div class='ctx'> </div><div class='add'>+	if (cache_k8_northbridges() &lt; 0 || num_k8_northbridges == 0) {</div><div class='add'>+		printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifndef CONFIG_AGP_AMD64</div><div class='ctx'> 	no_agp = 1; </div><div class='ctx'> #else</div><div class='hunk'>@@ -622,7 +594,11 @@ static int __init pci_iommu_init(void)</div><div class='ctx'> #endif	</div><div class='ctx'> </div><div class='ctx'> 	if (swiotlb)</div><div class='del'>-		return -1; </div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Did we detect a different HW IOMMU? */</div><div class='add'>+	if (iommu_detected &amp;&amp; !iommu_aperture)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (no_iommu ||</div><div class='ctx'> 	    (!force_iommu &amp;&amp; end_pfn &lt;= MAX_DMA32_PFN) ||</div><div class='hunk'>@@ -634,15 +610,7 @@ static int __init pci_iommu_init(void)</div><div class='ctx'> 					"but IOMMU not available.\n"</div><div class='ctx'> 			       KERN_ERR "WARNING 32bit PCI may malfunction.\n");</div><div class='ctx'> 		}</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	for_all_nb(dev)</div><div class='del'>-		i++;</div><div class='del'>-	if (i &gt; MAX_NB) {</div><div class='del'>-		printk(KERN_ERR "PCI-GART: Too many northbridges (%ld). Disabled\n", i);</div><div class='del'>-		return -1;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "PCI-DMA: using GART IOMMU.\n");</div><div class='hunk'>@@ -707,26 +675,10 @@ static int __init pci_iommu_init(void)</div><div class='ctx'> 	for (i = EMERGENCY_PAGES; i &lt; iommu_pages; i++) </div><div class='ctx'> 		iommu_gatt_base[i] = gart_unmapped_entry;</div><div class='ctx'> </div><div class='del'>-	for_all_nb(dev) {</div><div class='del'>-		u32 flag; </div><div class='del'>-		int cpu = PCI_SLOT(dev-&gt;devfn) - 24;</div><div class='del'>-		if (cpu &gt;= MAX_NB)</div><div class='del'>-			continue;</div><div class='del'>-		northbridges[cpu] = dev;</div><div class='del'>-		pci_read_config_dword(dev, 0x9c, &amp;flag); /* cache flush word */</div><div class='del'>-		northbridge_flush_word[cpu] = flag; </div><div class='del'>-	}</div><div class='del'>-		     </div><div class='del'>-	flush_gart(NULL);</div><div class='del'>-</div><div class='add'>+	flush_gart();</div><div class='ctx'> 	dma_ops = &amp;gart_dma_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> } </div><div class='ctx'> </div><div class='del'>-/* Must execute after PCI subsystem */</div><div class='del'>-fs_initcall(pci_iommu_init);</div><div class='del'>-</div><div class='ctx'> void gart_parse_options(char *p)</div><div class='ctx'> {</div><div class='ctx'> 	int arg;</div><div class='head'>diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c<br/>index 1f6ecc62061d..c4c3cc36ac5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-nommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-nommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-nommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/pci-nommu.c</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -12,10 +14,11 @@ static int</div><div class='ctx'> check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)</div><div class='ctx'> {</div><div class='ctx'>         if (hwdev &amp;&amp; bus + size &gt; *hwdev-&gt;dma_mask) {</div><div class='del'>-		if (*hwdev-&gt;dma_mask &gt;= 0xffffffffULL)</div><div class='add'>+		if (*hwdev-&gt;dma_mask &gt;= DMA_32BIT_MASK)</div><div class='ctx'> 			printk(KERN_ERR</div><div class='del'>-			    "nommu_%s: overflow %Lx+%lu of device mask %Lx\n",</div><div class='del'>-	       			name, (long long)bus, size, (long long)*hwdev-&gt;dma_mask);</div><div class='add'>+			    "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",</div><div class='add'>+				name, (long long)bus, size,</div><div class='add'>+				(long long)*hwdev-&gt;dma_mask);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/arch/x86_64/kernel/pci-swiotlb.c b/arch/x86_64/kernel/pci-swiotlb.c<br/>index 990ed67896f2..ebdb77fe2057 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-swiotlb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pci-swiotlb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pci-swiotlb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/pci-swiotlb.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ struct dma_mapping_ops swiotlb_dma_ops = {</div><div class='ctx'> void pci_swiotlb_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */</div><div class='del'>-	if (!iommu_aperture &amp;&amp; !no_iommu &amp;&amp;</div><div class='add'>+	if (!iommu_detected &amp;&amp; !no_iommu &amp;&amp;</div><div class='ctx'> 	    (end_pfn &gt; MAX_DMA32_PFN || force_iommu))</div><div class='ctx'> 	       swiotlb = 1;</div><div class='ctx'> 	if (swiotlb) {</div><div class='head'>diff --git a/arch/x86_64/kernel/pmtimer.c b/arch/x86_64/kernel/pmtimer.c<br/>index bf421ed26808..7554458dc9cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pmtimer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/pmtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/pmtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/pmtimer.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> /* The I/O port the PMTMR resides at.</div><div class='ctx'>  * The location is detected during setup_arch(),</div><div class='ctx'>  * in arch/i386/kernel/acpi/boot.c */</div><div class='del'>-u32 pmtmr_ioport;</div><div class='add'>+u32 pmtmr_ioport __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /* value of the Power timer at last timer interrupt */</div><div class='ctx'> static u32 offset_delay;</div><div class='head'>diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c<br/>index fb903e65e079..bb6745d13b8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/process.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *	Andi Kleen.</div><div class='ctx'>  *</div><div class='ctx'>  *	CPU hotplug support - ashok.raj@intel.com</div><div class='del'>- *  $Id: process.c,v 1.38 2002/01/15 10:08:03 ak Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -64,6 +63,7 @@ EXPORT_SYMBOL(boot_option_idle_override);</div><div class='ctx'>  * Powermanagement idle function, if any..</div><div class='ctx'>  */</div><div class='ctx'> void (*pm_idle)(void);</div><div class='add'>+EXPORT_SYMBOL(pm_idle);</div><div class='ctx'> static DEFINE_PER_CPU(unsigned int, cpu_idle_state);</div><div class='ctx'> </div><div class='ctx'> static ATOMIC_NOTIFIER_HEAD(idle_notifier);</div><div class='hunk'>@@ -111,7 +111,7 @@ static void default_idle(void)</div><div class='ctx'> {</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='del'>-	clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+	current_thread_info()-&gt;status &amp;= ~TS_POLLING;</div><div class='ctx'> 	smp_mb__after_clear_bit();</div><div class='ctx'> 	while (!need_resched()) {</div><div class='ctx'> 		local_irq_disable();</div><div class='hunk'>@@ -120,7 +120,7 @@ static void default_idle(void)</div><div class='ctx'> 		else</div><div class='ctx'> 			local_irq_enable();</div><div class='ctx'> 	}</div><div class='del'>-	set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+	current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -203,8 +203,7 @@ static inline void play_dead(void)</div><div class='ctx'>  */</div><div class='ctx'> void cpu_idle (void)</div><div class='ctx'> {</div><div class='del'>-	set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='del'>-</div><div class='add'>+	current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> 	/* endless idle loop with no priority at all */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		while (!need_resched()) {</div><div class='hunk'>@@ -297,7 +296,7 @@ void __show_regs(struct pt_regs * regs)</div><div class='ctx'> 		system_utsname.version);</div><div class='ctx'> 	printk("RIP: %04lx:[&lt;%016lx&gt;] ", regs-&gt;cs &amp; 0xffff, regs-&gt;rip);</div><div class='ctx'> 	printk_address(regs-&gt;rip); </div><div class='del'>-	printk("\nRSP: %04lx:%016lx  EFLAGS: %08lx\n", regs-&gt;ss, regs-&gt;rsp,</div><div class='add'>+	printk("RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs-&gt;ss, regs-&gt;rsp,</div><div class='ctx'> 		regs-&gt;eflags);</div><div class='ctx'> 	printk("RAX: %016lx RBX: %016lx RCX: %016lx\n",</div><div class='ctx'> 	       regs-&gt;rax, regs-&gt;rbx, regs-&gt;rcx);</div><div class='hunk'>@@ -335,7 +334,7 @@ void show_regs(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	printk("CPU %d:", smp_processor_id());</div><div class='ctx'> 	__show_regs(regs);</div><div class='del'>-	show_trace(&amp;regs-&gt;rsp);</div><div class='add'>+	show_trace(NULL, regs, (void *)(regs + 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -365,8 +364,11 @@ void flush_thread(void)</div><div class='ctx'> 	struct task_struct *tsk = current;</div><div class='ctx'> 	struct thread_info *t = current_thread_info();</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;flags &amp; _TIF_ABI_PENDING)</div><div class='add'>+	if (t-&gt;flags &amp; _TIF_ABI_PENDING) {</div><div class='ctx'> 		t-&gt;flags ^= (_TIF_ABI_PENDING | _TIF_IA32);</div><div class='add'>+		if (t-&gt;flags &amp; _TIF_IA32)</div><div class='add'>+			current_thread_info()-&gt;status |= TS_COMPAT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tsk-&gt;thread.debugreg0 = 0;</div><div class='ctx'> 	tsk-&gt;thread.debugreg1 = 0;</div><div class='head'>diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c<br/>index 57117b8beb2b..2d6769847456 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/reboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/reboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/reboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/reboot.c</a></div><div class='hunk'>@@ -20,6 +20,7 @@</div><div class='ctx'>  * Power off function, if any</div><div class='ctx'>  */</div><div class='ctx'> void (*pm_power_off)(void);</div><div class='add'>+EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='ctx'> static long no_idt[3];</div><div class='ctx'> static enum { </div><div class='head'>diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c<br/>index 655b9192eeb3..8a099ff1f8bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/setup.c</a></div><div class='hunk'>@@ -5,8 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Nov 2001 Dave Jones &lt;davej@suse.de&gt;</div><div class='ctx'>  *  Forked from i386 setup code.</div><div class='del'>- *</div><div class='del'>- *  $Id$</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -23,10 +21,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/user.h&gt;</div><div class='ctx'> #include &lt;linux/a.out.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/initrd.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='hunk'>@@ -65,9 +62,7 @@</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/mach_apic.h&gt;</div><div class='ctx'> #include &lt;asm/numa.h&gt;</div><div class='del'>-#include &lt;asm/swiotlb.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/gart-mapping.h&gt;</div><div class='ctx'> #include &lt;asm/dmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -75,6 +70,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct cpuinfo_x86 boot_cpu_data __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(boot_cpu_data);</div><div class='ctx'> </div><div class='ctx'> unsigned long mmu_cr4_features;</div><div class='ctx'> </div><div class='hunk'>@@ -103,12 +99,14 @@ char dmi_alloc_data[DMI_MAX_DATA];</div><div class='ctx'>  * Setup options</div><div class='ctx'>  */</div><div class='ctx'> struct screen_info screen_info;</div><div class='add'>+EXPORT_SYMBOL(screen_info);</div><div class='ctx'> struct sys_desc_table_struct {</div><div class='ctx'> 	unsigned short length;</div><div class='ctx'> 	unsigned char table[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct edid_info edid_info;</div><div class='add'>+EXPORT_SYMBOL_GPL(edid_info);</div><div class='ctx'> struct e820map e820;</div><div class='ctx'> </div><div class='ctx'> extern int root_mountflags;</div><div class='hunk'>@@ -473,80 +471,6 @@ contig_initmem_init(unsigned long start_pfn, unsigned long end_pfn)</div><div class='ctx'> } </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Use inline assembly to define this because the nops are defined </div><div class='del'>-   as inline assembly strings in the include files and we cannot </div><div class='del'>-   get them easily into strings. */</div><div class='del'>-asm("\t.data\nk8nops: " </div><div class='del'>-    K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6</div><div class='del'>-    K8_NOP7 K8_NOP8); </div><div class='del'>-    </div><div class='del'>-extern unsigned char k8nops[];</div><div class='del'>-static unsigned char *k8_nops[ASM_NOP_MAX+1] = { </div><div class='del'>-     NULL,</div><div class='del'>-     k8nops,</div><div class='del'>-     k8nops + 1,</div><div class='del'>-     k8nops + 1 + 2,</div><div class='del'>-     k8nops + 1 + 2 + 3,</div><div class='del'>-     k8nops + 1 + 2 + 3 + 4,</div><div class='del'>-     k8nops + 1 + 2 + 3 + 4 + 5,</div><div class='del'>-     k8nops + 1 + 2 + 3 + 4 + 5 + 6,</div><div class='del'>-     k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,</div><div class='del'>-}; </div><div class='del'>-</div><div class='del'>-extern char __vsyscall_0;</div><div class='del'>-</div><div class='del'>-/* Replace instructions with better alternatives for this CPU type.</div><div class='del'>-</div><div class='del'>-   This runs before SMP is initialized to avoid SMP problems with</div><div class='del'>-   self modifying code. This implies that assymetric systems where</div><div class='del'>-   APs have less capabilities than the boot processor are not handled. </div><div class='del'>-   In this case boot with "noreplacement". */ </div><div class='del'>-void apply_alternatives(void *start, void *end) </div><div class='del'>-{ </div><div class='del'>-	struct alt_instr *a; </div><div class='del'>-	int diff, i, k;</div><div class='del'>-	for (a = start; (void *)a &lt; end; a++) { </div><div class='del'>-		u8 *instr;</div><div class='del'>-</div><div class='del'>-		if (!boot_cpu_has(a-&gt;cpuid))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		BUG_ON(a-&gt;replacementlen &gt; a-&gt;instrlen); </div><div class='del'>-		instr = a-&gt;instr;</div><div class='del'>-		/* vsyscall code is not mapped yet. resolve it manually. */</div><div class='del'>-		if (instr &gt;= (u8 *)VSYSCALL_START &amp;&amp; instr &lt; (u8*)VSYSCALL_END)</div><div class='del'>-			instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&amp;__vsyscall_0));</div><div class='del'>-		__inline_memcpy(instr, a-&gt;replacement, a-&gt;replacementlen);</div><div class='del'>-		diff = a-&gt;instrlen - a-&gt;replacementlen; </div><div class='del'>-</div><div class='del'>-		/* Pad the rest with nops */</div><div class='del'>-		for (i = a-&gt;replacementlen; diff &gt; 0; diff -= k, i += k) {</div><div class='del'>-			k = diff;</div><div class='del'>-			if (k &gt; ASM_NOP_MAX)</div><div class='del'>-				k = ASM_NOP_MAX;</div><div class='del'>-			__inline_memcpy(instr + i, k8_nops[k], k);</div><div class='del'>-		} </div><div class='del'>-	}</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-static int no_replacement __initdata = 0; </div><div class='del'>- </div><div class='del'>-void __init alternative_instructions(void)</div><div class='del'>-{</div><div class='del'>-	extern struct alt_instr __alt_instructions[], __alt_instructions_end[];</div><div class='del'>-	if (no_replacement) </div><div class='del'>-		return;</div><div class='del'>-	apply_alternatives(__alt_instructions, __alt_instructions_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init noreplacement_setup(char *s)</div><div class='del'>-{ </div><div class='del'>-     no_replacement = 1; </div><div class='del'>-     return 1;</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-__setup("noreplacement", noreplacement_setup); </div><div class='del'>-</div><div class='ctx'> #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)</div><div class='ctx'> struct edd edd;</div><div class='ctx'> #ifdef CONFIG_EDD_MODULE</div><div class='hunk'>@@ -728,7 +652,7 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> 	if (crashk_res.start != crashk_res.end) {</div><div class='del'>-		reserve_bootmem(crashk_res.start,</div><div class='add'>+		reserve_bootmem_generic(crashk_res.start,</div><div class='ctx'> 			crashk_res.end - crashk_res.start + 1);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -779,10 +703,6 @@ void __init setup_arch(char **cmdline_p)</div><div class='ctx'> </div><div class='ctx'> 	e820_setup_gap();</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_GART_IOMMU</div><div class='del'>-	iommu_hole_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_VT</div><div class='ctx'> #if defined(CONFIG_VGA_CONSOLE)</div><div class='ctx'> 	conswitchp = &amp;vga_con;</div><div class='hunk'>@@ -867,24 +787,32 @@ static int nearby_node(int apicid)</div><div class='ctx'> static void __init amd_detect_cmp(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	int cpu = smp_processor_id();</div><div class='ctx'> 	unsigned bits;</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='ctx'> 	int node = 0;</div><div class='ctx'> 	unsigned apicid = hard_smp_processor_id();</div><div class='ctx'> #endif</div><div class='add'>+	unsigned ecx = cpuid_ecx(0x80000008);</div><div class='add'>+</div><div class='add'>+	c-&gt;x86_max_cores = (ecx &amp; 0xff) + 1;</div><div class='ctx'> </div><div class='del'>-	bits = 0;</div><div class='del'>-	while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='del'>-		bits++;</div><div class='add'>+	/* CPU telling us the core id bits shift? */</div><div class='add'>+	bits = (ecx &gt;&gt; 12) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	/* Otherwise recompute */</div><div class='add'>+	if (bits == 0) {</div><div class='add'>+		while ((1 &lt;&lt; bits) &lt; c-&gt;x86_max_cores)</div><div class='add'>+			bits++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Low order bits define the core id (index of core in socket) */</div><div class='del'>-	cpu_core_id[cpu] = phys_proc_id[cpu] &amp; ((1 &lt;&lt; bits)-1);</div><div class='add'>+	c-&gt;cpu_core_id = c-&gt;phys_proc_id &amp; ((1 &lt;&lt; bits)-1);</div><div class='ctx'> 	/* Convert the APIC ID into the socket ID */</div><div class='del'>-	phys_proc_id[cpu] = phys_pkg_id(bits);</div><div class='add'>+	c-&gt;phys_proc_id = phys_pkg_id(bits);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='del'>-  	node = phys_proc_id[cpu];</div><div class='add'>+  	node = c-&gt;phys_proc_id;</div><div class='ctx'>  	if (apicid_to_node[apicid] != NUMA_NO_NODE)</div><div class='ctx'>  		node = apicid_to_node[apicid];</div><div class='ctx'>  	if (!node_online(node)) {</div><div class='hunk'>@@ -897,7 +825,7 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)</div><div class='ctx'>  		   but in the same order as the HT nodeids.</div><div class='ctx'>  		   If that doesn't result in a usable node fall back to the</div><div class='ctx'>  		   path for the previous case.  */</div><div class='del'>- 		int ht_nodeid = apicid - (phys_proc_id[0] &lt;&lt; bits);</div><div class='add'>+ 		int ht_nodeid = apicid - (cpu_data[0].phys_proc_id &lt;&lt; bits);</div><div class='ctx'>  		if (ht_nodeid &gt;= 0 &amp;&amp;</div><div class='ctx'>  		    apicid_to_node[ht_nodeid] != NUMA_NO_NODE)</div><div class='ctx'>  			node = apicid_to_node[ht_nodeid];</div><div class='hunk'>@@ -907,15 +835,13 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)</div><div class='ctx'>  	}</div><div class='ctx'> 	numa_set_node(cpu, node);</div><div class='ctx'> </div><div class='del'>-  	printk(KERN_INFO "CPU %d/%x(%d) -&gt; Node %d -&gt; Core %d\n",</div><div class='del'>-  			cpu, apicid, c-&gt;x86_max_cores, node, cpu_core_id[cpu]);</div><div class='add'>+	printk(KERN_INFO "CPU %d/%x -&gt; Node %d\n", cpu, apicid, node);</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init init_amd(struct cpuinfo_x86 *c)</div><div class='add'>+static void __init init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='ctx'> 	unsigned level;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='hunk'>@@ -948,8 +874,8 @@ static int __init init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86 &gt;= 6)</div><div class='ctx'> 		set_bit(X86_FEATURE_FXSAVE_LEAK, &amp;c-&gt;x86_capability);</div><div class='ctx'> </div><div class='del'>-	r = get_model_name(c);</div><div class='del'>-	if (!r) { </div><div class='add'>+	level = get_model_name(c);</div><div class='add'>+	if (!level) {</div><div class='ctx'> 		switch (c-&gt;x86) { </div><div class='ctx'> 		case 15:</div><div class='ctx'> 			/* Should distinguish Models here, but this is only</div><div class='hunk'>@@ -964,13 +890,12 @@ static int __init init_amd(struct cpuinfo_x86 *c)</div><div class='ctx'> 	if (c-&gt;x86_power &amp; (1&lt;&lt;8))</div><div class='ctx'> 		set_bit(X86_FEATURE_CONSTANT_TSC, &amp;c-&gt;x86_capability);</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;extended_cpuid_level &gt;= 0x80000008) {</div><div class='del'>-		c-&gt;x86_max_cores = (cpuid_ecx(0x80000008) &amp; 0xff) + 1;</div><div class='del'>-</div><div class='add'>+	/* Multi core CPU? */</div><div class='add'>+	if (c-&gt;extended_cpuid_level &gt;= 0x80000008)</div><div class='ctx'> 		amd_detect_cmp(c);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return r;</div><div class='add'>+	/* Fix cpuid4 emulation for more */</div><div class='add'>+	num_cache_leaves = 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='hunk'>@@ -978,13 +903,14 @@ static void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	u32 	eax, ebx, ecx, edx;</div><div class='ctx'> 	int 	index_msb, core_bits;</div><div class='del'>-	int 	cpu = smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	cpuid(1, &amp;eax, &amp;ebx, &amp;ecx, &amp;edx);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (!cpu_has(c, X86_FEATURE_HT) || cpu_has(c, X86_FEATURE_CMP_LEGACY))</div><div class='add'>+	if (!cpu_has(c, X86_FEATURE_HT))</div><div class='ctx'> 		return;</div><div class='add'>+ 	if (cpu_has(c, X86_FEATURE_CMP_LEGACY))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	smp_num_siblings = (ebx &amp; 0xff0000) &gt;&gt; 16;</div><div class='ctx'> </div><div class='hunk'>@@ -999,10 +925,7 @@ static void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		index_msb = get_count_order(smp_num_siblings);</div><div class='del'>-		phys_proc_id[cpu] = phys_pkg_id(index_msb);</div><div class='del'>-</div><div class='del'>-		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",</div><div class='del'>-		       phys_proc_id[cpu]);</div><div class='add'>+		c-&gt;phys_proc_id = phys_pkg_id(index_msb);</div><div class='ctx'> </div><div class='ctx'> 		smp_num_siblings = smp_num_siblings / c-&gt;x86_max_cores;</div><div class='ctx'> </div><div class='hunk'>@@ -1010,13 +933,15 @@ static void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'> </div><div class='ctx'> 		core_bits = get_count_order(c-&gt;x86_max_cores);</div><div class='ctx'> </div><div class='del'>-		cpu_core_id[cpu] = phys_pkg_id(index_msb) &amp;</div><div class='add'>+		c-&gt;cpu_core_id = phys_pkg_id(index_msb) &amp;</div><div class='ctx'> 					       ((1 &lt;&lt; core_bits) - 1);</div><div class='del'>-</div><div class='del'>-		if (c-&gt;x86_max_cores &gt; 1)</div><div class='del'>-			printk(KERN_INFO  "CPU: Processor Core ID: %d\n",</div><div class='del'>-			       cpu_core_id[cpu]);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='add'>+	if ((c-&gt;x86_max_cores * smp_num_siblings) &gt; 1) {</div><div class='add'>+		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n", c-&gt;phys_proc_id);</div><div class='add'>+		printk(KERN_INFO  "CPU: Processor Core ID: %d\n", c-&gt;cpu_core_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1025,15 +950,12 @@ static void __cpuinit detect_ht(struct cpuinfo_x86 *c)</div><div class='ctx'>  */</div><div class='ctx'> static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)</div><div class='ctx'> {</div><div class='del'>-	unsigned int eax;</div><div class='add'>+	unsigned int eax, t;</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;cpuid_level &lt; 4)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	__asm__("cpuid"</div><div class='del'>-		: "=a" (eax)</div><div class='del'>-		: "0" (4), "c" (0)</div><div class='del'>-		: "bx", "dx");</div><div class='add'>+	cpuid_count(4, 0, &amp;eax, &amp;t, &amp;t, &amp;t);</div><div class='ctx'> </div><div class='ctx'> 	if (eax &amp; 0x1f)</div><div class='ctx'> 		return ((eax &gt;&gt; 26) + 1);</div><div class='hunk'>@@ -1046,16 +968,17 @@ static void srat_detect_node(void)</div><div class='ctx'> #ifdef CONFIG_NUMA</div><div class='ctx'> 	unsigned node;</div><div class='ctx'> 	int cpu = smp_processor_id();</div><div class='add'>+	int apicid = hard_smp_processor_id();</div><div class='ctx'> </div><div class='ctx'> 	/* Don't do the funky fallback heuristics the AMD version employs</div><div class='ctx'> 	   for now. */</div><div class='del'>-	node = apicid_to_node[hard_smp_processor_id()];</div><div class='add'>+	node = apicid_to_node[apicid];</div><div class='ctx'> 	if (node == NUMA_NO_NODE)</div><div class='ctx'> 		node = first_node(node_online_map);</div><div class='ctx'> 	numa_set_node(cpu, node);</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_numa &gt; 0)</div><div class='del'>-		printk(KERN_INFO "CPU %d -&gt; Node %d\n", cpu, node);</div><div class='add'>+		printk(KERN_INFO "CPU %d/%x -&gt; Node %d\n", cpu, apicid, node);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1065,6 +988,13 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)</div><div class='ctx'> 	unsigned n;</div><div class='ctx'> </div><div class='ctx'> 	init_intel_cacheinfo(c);</div><div class='add'>+	if (c-&gt;cpuid_level &gt; 9 ) {</div><div class='add'>+		unsigned eax = cpuid_eax(10);</div><div class='add'>+		/* Check for version and the number of counters */</div><div class='add'>+		if ((eax &amp; 0xff) &amp;&amp; (((eax&gt;&gt;8) &amp; 0xff) &gt; 1))</div><div class='add'>+			set_bit(X86_FEATURE_ARCH_PERFMON, &amp;c-&gt;x86_capability);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	n = c-&gt;extended_cpuid_level;</div><div class='ctx'> 	if (n &gt;= 0x80000008) {</div><div class='ctx'> 		unsigned eax = cpuid_eax(0x80000008);</div><div class='hunk'>@@ -1156,7 +1086,7 @@ void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	phys_proc_id[smp_processor_id()] = (cpuid_ebx(1) &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	c-&gt;phys_proc_id = (cpuid_ebx(1) &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1283,7 +1213,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,</div><div class='del'>-		NULL, "fxsr_opt", "rdtscp", NULL, NULL, "lm", "3dnowext", "3dnow",</div><div class='add'>+		NULL, "fxsr_opt", NULL, "rdtscp", NULL, "lm", "3dnowext", "3dnow",</div><div class='ctx'> </div><div class='ctx'> 		/* Transmeta-defined */</div><div class='ctx'> 		"recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,</div><div class='hunk'>@@ -1294,7 +1224,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> 		/* Other (Linux-defined) */</div><div class='ctx'> 		"cxmmx", NULL, "cyrix_arr", "centaur_mcr", NULL,</div><div class='ctx'> 		"constant_tsc", NULL, NULL,</div><div class='del'>-		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='add'>+		"up", NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,</div><div class='ctx'> </div><div class='hunk'>@@ -1364,9 +1294,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='ctx'> 	if (smp_num_siblings * c-&gt;x86_max_cores &gt; 1) {</div><div class='ctx'> 		int cpu = c - cpu_data;</div><div class='del'>-		seq_printf(m, "physical id\t: %d\n", phys_proc_id[cpu]);</div><div class='add'>+		seq_printf(m, "physical id\t: %d\n", c-&gt;phys_proc_id);</div><div class='ctx'> 		seq_printf(m, "siblings\t: %d\n", cpus_weight(cpu_core_map[cpu]));</div><div class='del'>-		seq_printf(m, "core id\t\t: %d\n", cpu_core_id[cpu]);</div><div class='add'>+		seq_printf(m, "core id\t\t: %d\n", c-&gt;cpu_core_id);</div><div class='ctx'> 		seq_printf(m, "cpu cores\t: %d\n", c-&gt;booted_cores);</div><div class='ctx'> 	}</div><div class='ctx'> #endif	</div><div class='hunk'>@@ -1440,7 +1370,7 @@ struct seq_operations cpuinfo_op = {</div><div class='ctx'> 	.show =	show_cpuinfo,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_INPUT_PCSPKR</div><div class='add'>+#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> static __init int add_pcspkr(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c<br/>index 8a691fa6d393..6fe58a634b5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/setup64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/setup64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/setup64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/setup64.c</a></div><div class='hunk'>@@ -3,9 +3,7 @@</div><div class='ctx'>  * Copyright (C) 1995  Linus Torvalds</div><div class='ctx'>  * Copyright 2001, 2002, 2003 SuSE Labs / Andi Kleen.</div><div class='ctx'>  * See setup.c for older changelog.</div><div class='del'>- * $Id: setup64.c,v 1.12 2002/03/21 10:09:17 ak Exp $</div><div class='ctx'>  */ </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -31,6 +29,7 @@ char x86_boot_params[BOOT_PARAM_SIZE] __initdata = {0,};</div><div class='ctx'> cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;</div><div class='ctx'> </div><div class='ctx'> struct x8664_pda *_cpu_pda[NR_CPUS] __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(_cpu_pda);</div><div class='ctx'> struct x8664_pda boot_cpu_pda[NR_CPUS] __cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };</div><div class='hunk'>@@ -38,6 +37,7 @@ struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };</div><div class='ctx'> char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned")));</div><div class='ctx'> </div><div class='ctx'> unsigned long __supported_pte_mask __read_mostly = ~0UL;</div><div class='add'>+EXPORT_SYMBOL(__supported_pte_mask);</div><div class='ctx'> static int do_not_nx __cpuinitdata = 0;</div><div class='ctx'> </div><div class='ctx'> /* noexec=on|off</div><div class='head'>diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c<br/>index e5f5ce7909a3..28161170fb0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/signal.c</a></div><div class='hunk'>@@ -7,8 +7,6 @@</div><div class='ctx'>  *  1997-11-28  Modified for POSIX.1b signals by Richard Henderson</div><div class='ctx'>  *  2000-06-20  Pentium III FXSR, SSE support by Gareth Hughes</div><div class='ctx'>  *  2000-2002   x86-64 support by Andi Kleen</div><div class='del'>- * </div><div class='del'>- *  $Id: signal.c,v 1.18 2001/10/17 22:30:37 ak Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -239,7 +237,6 @@ get_stack(struct k_sigaction *ka, struct pt_regs *regs, unsigned long size)</div><div class='ctx'> 	rsp = regs-&gt;rsp - 128;</div><div class='ctx'> </div><div class='ctx'> 	/* This is the X/Open sanctioned signal stack switching.  */</div><div class='del'>-	/* RED-PEN: redzone on that stack? */</div><div class='ctx'> 	if (ka-&gt;sa.sa_flags &amp; SA_ONSTACK) {</div><div class='ctx'> 		if (sas_ss_flags(rsp) == 0)</div><div class='ctx'> 			rsp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='head'>diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c<br/>index 4a6628b14d99..5a1c0a3bf872 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/smp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/smp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/smp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/smp.c</a></div><div class='hunk'>@@ -135,10 +135,10 @@ asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	cpu = smp_processor_id();</div><div class='ctx'> 	/*</div><div class='del'>-	 * orig_rax contains the interrupt vector - 256.</div><div class='add'>+	 * orig_rax contains the negated interrupt vector.</div><div class='ctx'> 	 * Use that to determine where the sender put the data.</div><div class='ctx'> 	 */</div><div class='del'>-	sender = regs-&gt;orig_rax + 256 - INVALIDATE_TLB_VECTOR_START;</div><div class='add'>+	sender = ~regs-&gt;orig_rax - INVALIDATE_TLB_VECTOR_START;</div><div class='ctx'> 	f = &amp;per_cpu(flush_state, sender);</div><div class='ctx'> </div><div class='ctx'> 	if (!cpu_isset(cpu, f-&gt;flush_cpumask))</div><div class='hunk'>@@ -224,6 +224,7 @@ void flush_tlb_current_task(void)</div><div class='ctx'> 		flush_tlb_others(cpu_mask, mm, FLUSH_ALL);</div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(flush_tlb_current_task);</div><div class='ctx'> </div><div class='ctx'> void flush_tlb_mm (struct mm_struct * mm)</div><div class='ctx'> {</div><div class='hunk'>@@ -244,6 +245,7 @@ void flush_tlb_mm (struct mm_struct * mm)</div><div class='ctx'> </div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(flush_tlb_mm);</div><div class='ctx'> </div><div class='ctx'> void flush_tlb_page(struct vm_area_struct * vma, unsigned long va)</div><div class='ctx'> {</div><div class='hunk'>@@ -266,6 +268,7 @@ void flush_tlb_page(struct vm_area_struct * vma, unsigned long va)</div><div class='ctx'> </div><div class='ctx'> 	preempt_enable();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(flush_tlb_page);</div><div class='ctx'> </div><div class='ctx'> static void do_flush_tlb_all(void* info)</div><div class='ctx'> {</div><div class='hunk'>@@ -443,6 +446,7 @@ int smp_call_function (void (*func) (void *info), void *info, int nonatomic,</div><div class='ctx'> 	spin_unlock(&amp;call_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(smp_call_function);</div><div class='ctx'> </div><div class='ctx'> void smp_stop_cpu(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -460,7 +464,7 @@ static void smp_really_stop_cpu(void *dummy)</div><div class='ctx'> {</div><div class='ctx'> 	smp_stop_cpu(); </div><div class='ctx'> 	for (;;) </div><div class='del'>-		asm("hlt"); </div><div class='add'>+		halt();</div><div class='ctx'> } </div><div class='ctx'> </div><div class='ctx'> void smp_send_stop(void)</div><div class='hunk'>@@ -470,7 +474,7 @@ void smp_send_stop(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* Don't deadlock on the call lock in panic */</div><div class='ctx'> 	if (!spin_trylock(&amp;call_lock)) {</div><div class='del'>-		/* ignore locking because we have paniced anyways */</div><div class='add'>+		/* ignore locking because we have panicked anyways */</div><div class='ctx'> 		nolock = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	__smp_call_function(smp_really_stop_cpu, NULL, 0, 0);</div><div class='hunk'>@@ -520,13 +524,13 @@ asmlinkage void smp_call_function_interrupt(void)</div><div class='ctx'> </div><div class='ctx'> int safe_smp_processor_id(void)</div><div class='ctx'> {</div><div class='del'>-	int apicid, i;</div><div class='add'>+	unsigned apicid, i;</div><div class='ctx'> </div><div class='ctx'> 	if (disable_apic)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	apicid = hard_smp_processor_id();</div><div class='del'>-	if (x86_cpu_to_apicid[apicid] == apicid)</div><div class='add'>+	if (apicid &lt; NR_CPUS &amp;&amp; x86_cpu_to_apicid[apicid] == apicid)</div><div class='ctx'> 		return apicid;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NR_CPUS; ++i) {</div><div class='head'>diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c<br/>index 71a7222cf9ce..975380207b46 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/smpboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/smpboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/smpboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/smpboot.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -63,13 +62,11 @@</div><div class='ctx'> </div><div class='ctx'> /* Number of siblings per CPU package */</div><div class='ctx'> int smp_num_siblings = 1;</div><div class='del'>-/* Package ID of each logical CPU */</div><div class='del'>-u8 phys_proc_id[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };</div><div class='del'>-/* core ID of each logical CPU */</div><div class='del'>-u8 cpu_core_id[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };</div><div class='add'>+EXPORT_SYMBOL(smp_num_siblings);</div><div class='ctx'> </div><div class='ctx'> /* Last level cache ID of each logical CPU */</div><div class='ctx'> u8 cpu_llc_id[NR_CPUS] __cpuinitdata  = {[0 ... NR_CPUS-1] = BAD_APICID};</div><div class='add'>+EXPORT_SYMBOL(cpu_llc_id);</div><div class='ctx'> </div><div class='ctx'> /* Bitmask of currently online CPUs */</div><div class='ctx'> cpumask_t cpu_online_map __read_mostly;</div><div class='hunk'>@@ -82,18 +79,21 @@ EXPORT_SYMBOL(cpu_online_map);</div><div class='ctx'>  */</div><div class='ctx'> cpumask_t cpu_callin_map;</div><div class='ctx'> cpumask_t cpu_callout_map;</div><div class='add'>+EXPORT_SYMBOL(cpu_callout_map);</div><div class='ctx'> </div><div class='ctx'> cpumask_t cpu_possible_map;</div><div class='ctx'> EXPORT_SYMBOL(cpu_possible_map);</div><div class='ctx'> </div><div class='ctx'> /* Per CPU bogomips and other parameters */</div><div class='ctx'> struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned;</div><div class='add'>+EXPORT_SYMBOL(cpu_data);</div><div class='ctx'> </div><div class='ctx'> /* Set when the idlers are all forked */</div><div class='ctx'> int smp_threads_ready;</div><div class='ctx'> </div><div class='ctx'> /* representing HT siblings of each logical CPU */</div><div class='ctx'> cpumask_t cpu_sibling_map[NR_CPUS] __read_mostly;</div><div class='add'>+EXPORT_SYMBOL(cpu_sibling_map);</div><div class='ctx'> </div><div class='ctx'> /* representing HT and core siblings of each logical CPU */</div><div class='ctx'> cpumask_t cpu_core_map[NR_CPUS] __read_mostly;</div><div class='hunk'>@@ -454,10 +454,12 @@ cpumask_t cpu_coregroup_map(int cpu)</div><div class='ctx'> 	struct cpuinfo_x86 *c = cpu_data + cpu;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For perf, we return last level cache shared map.</div><div class='del'>-	 * TBD: when power saving sched policy is added, we will return</div><div class='del'>-	 *      cpu_core_map when power saving policy is enabled</div><div class='add'>+	 * And for power savings, we return cpu_core_map</div><div class='ctx'> 	 */</div><div class='del'>-	return c-&gt;llc_shared_map;</div><div class='add'>+	if (sched_mc_power_savings || sched_smt_power_savings)</div><div class='add'>+		return cpu_core_map[cpu];</div><div class='add'>+	else</div><div class='add'>+		return c-&gt;llc_shared_map;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* representing cpus for which sibling maps can be computed */</div><div class='hunk'>@@ -472,8 +474,8 @@ static inline void set_cpu_sibling_map(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	if (smp_num_siblings &gt; 1) {</div><div class='ctx'> 		for_each_cpu_mask(i, cpu_sibling_setup_map) {</div><div class='del'>-			if (phys_proc_id[cpu] == phys_proc_id[i] &amp;&amp;</div><div class='del'>-			    cpu_core_id[cpu] == cpu_core_id[i]) {</div><div class='add'>+			if (c[cpu].phys_proc_id == c[i].phys_proc_id &amp;&amp;</div><div class='add'>+			    c[cpu].cpu_core_id == c[i].cpu_core_id) {</div><div class='ctx'> 				cpu_set(i, cpu_sibling_map[cpu]);</div><div class='ctx'> 				cpu_set(cpu, cpu_sibling_map[i]);</div><div class='ctx'> 				cpu_set(i, cpu_core_map[cpu]);</div><div class='hunk'>@@ -500,7 +502,7 @@ static inline void set_cpu_sibling_map(int cpu)</div><div class='ctx'> 			cpu_set(i, c[cpu].llc_shared_map);</div><div class='ctx'> 			cpu_set(cpu, c[i].llc_shared_map);</div><div class='ctx'> 		}</div><div class='del'>-		if (phys_proc_id[cpu] == phys_proc_id[i]) {</div><div class='add'>+		if (c[cpu].phys_proc_id == c[i].phys_proc_id) {</div><div class='ctx'> 			cpu_set(i, cpu_core_map[cpu]);</div><div class='ctx'> 			cpu_set(cpu, cpu_core_map[i]);</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -769,7 +771,7 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)</div><div class='ctx'> 	unsigned long start_rip;</div><div class='ctx'> 	struct create_idle c_idle = {</div><div class='ctx'> 		.cpu = cpu,</div><div class='del'>-		.done = COMPLETION_INITIALIZER(c_idle.done),</div><div class='add'>+		.done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done),</div><div class='ctx'> 	};</div><div class='ctx'> 	DECLARE_WORK(work, do_fork_idle, &amp;c_idle);</div><div class='ctx'> </div><div class='hunk'>@@ -797,6 +799,8 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+	alternatives_smp_switch(1);</div><div class='add'>+</div><div class='ctx'> 	c_idle.idle = get_idle_for_cpu(cpu);</div><div class='ctx'> </div><div class='ctx'> 	if (c_idle.idle) {</div><div class='hunk'>@@ -1199,8 +1203,8 @@ static void remove_siblinginfo(int cpu)</div><div class='ctx'> 		cpu_clear(cpu, cpu_sibling_map[sibling]);</div><div class='ctx'> 	cpus_clear(cpu_sibling_map[cpu]);</div><div class='ctx'> 	cpus_clear(cpu_core_map[cpu]);</div><div class='del'>-	phys_proc_id[cpu] = BAD_APICID;</div><div class='del'>-	cpu_core_id[cpu] = BAD_APICID;</div><div class='add'>+	c[cpu].phys_proc_id = 0;</div><div class='add'>+	c[cpu].cpu_core_id = 0;</div><div class='ctx'> 	cpu_clear(cpu, cpu_sibling_setup_map);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1259,6 +1263,8 @@ void __cpu_die(unsigned int cpu)</div><div class='ctx'> 		/* They ack this in play_dead by setting CPU_DEAD */</div><div class='ctx'> 		if (per_cpu(cpu_state, cpu) == CPU_DEAD) {</div><div class='ctx'> 			printk ("CPU %d is now offline\n", cpu);</div><div class='add'>+			if (1 == num_online_cpus())</div><div class='add'>+				alternatives_smp_switch(0);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(100);</div><div class='head'>diff --git a/arch/x86_64/kernel/stacktrace.c b/arch/x86_64/kernel/stacktrace.c<br/>new file mode 100644<br/>index 000000000000..32cf55eb9af8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/stacktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/stacktrace.c</a></div><div class='hunk'>@@ -0,0 +1,221 @@</div><div class='add'>+/*</div><div class='add'>+ * arch/x86_64/kernel/stacktrace.c</div><div class='add'>+ *</div><div class='add'>+ * Stack trace management functions</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar &lt;mingo@redhat.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/stacktrace.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+in_range(unsigned long start, unsigned long addr, unsigned long end)</div><div class='add'>+{</div><div class='add'>+	return addr &gt;= start &amp;&amp; addr &lt;= end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long</div><div class='add'>+get_stack_end(struct task_struct *task, unsigned long stack)</div><div class='add'>+{</div><div class='add'>+	unsigned long stack_start, stack_end, flags;</div><div class='add'>+	int i, cpu;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The most common case is that we are in the task stack:</div><div class='add'>+	 */</div><div class='add'>+	stack_start = (unsigned long)task-&gt;thread_info;</div><div class='add'>+	stack_end = stack_start + THREAD_SIZE;</div><div class='add'>+</div><div class='add'>+	if (in_range(stack_start, stack, stack_end))</div><div class='add'>+		return stack_end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are in an interrupt if irqstackptr is set:</div><div class='add'>+	 */</div><div class='add'>+	raw_local_irq_save(flags);</div><div class='add'>+	cpu = safe_smp_processor_id();</div><div class='add'>+	stack_end = (unsigned long)cpu_pda(cpu)-&gt;irqstackptr;</div><div class='add'>+</div><div class='add'>+	if (stack_end) {</div><div class='add'>+		stack_start = stack_end &amp; ~(IRQSTACKSIZE-1);</div><div class='add'>+		if (in_range(stack_start, stack, stack_end))</div><div class='add'>+			goto out_restore;</div><div class='add'>+		/*</div><div class='add'>+		 * We get here if we are in an IRQ context but we</div><div class='add'>+		 * are also in an exception stack.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Iterate over all exception stacks, and figure out whether</div><div class='add'>+	 * 'stack' is in one of them:</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; N_EXCEPTION_STACKS; i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * set 'end' to the end of the exception stack.</div><div class='add'>+		 */</div><div class='add'>+		stack_end = per_cpu(init_tss, cpu).ist[i];</div><div class='add'>+		stack_start = stack_end - EXCEPTION_STKSZ;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Is 'stack' above this exception frame's end?</div><div class='add'>+		 * If yes then skip to the next frame.</div><div class='add'>+		 */</div><div class='add'>+		if (stack &gt;= stack_end)</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Is 'stack' above this exception frame's start address?</div><div class='add'>+		 * If yes then we found the right frame.</div><div class='add'>+		 */</div><div class='add'>+		if (stack &gt;= stack_start)</div><div class='add'>+			goto out_restore;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a debug stack, and if it has a larger size than</div><div class='add'>+		 * the usual exception stacks, then 'stack' might still</div><div class='add'>+		 * be within the lower portion of the debug stack:</div><div class='add'>+		 */</div><div class='add'>+#if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='add'>+		if (i == DEBUG_STACK - 1 &amp;&amp; stack &gt;= stack_end - DEBUG_STKSZ) {</div><div class='add'>+			/*</div><div class='add'>+			 * Black magic. A large debug stack is composed of</div><div class='add'>+			 * multiple exception stack entries, which we</div><div class='add'>+			 * iterate through now. Dont look:</div><div class='add'>+			 */</div><div class='add'>+			do {</div><div class='add'>+				stack_end -= EXCEPTION_STKSZ;</div><div class='add'>+				stack_start -= EXCEPTION_STKSZ;</div><div class='add'>+			} while (stack &lt; stack_start);</div><div class='add'>+</div><div class='add'>+			goto out_restore;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Ok, 'stack' is not pointing to any of the system stacks.</div><div class='add'>+	 */</div><div class='add'>+	stack_end = 0;</div><div class='add'>+</div><div class='add'>+out_restore:</div><div class='add'>+	raw_local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	return stack_end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save stack-backtrace addresses into a stack_trace buffer:</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long</div><div class='add'>+save_context_stack(struct stack_trace *trace, unsigned int skip,</div><div class='add'>+		   unsigned long stack, unsigned long stack_end)</div><div class='add'>+{</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FRAME_POINTER</div><div class='add'>+	unsigned long prev_stack = 0;</div><div class='add'>+</div><div class='add'>+	while (in_range(prev_stack, stack, stack_end)) {</div><div class='add'>+		pr_debug("stack:          %p\n", (void *)stack);</div><div class='add'>+		addr = (unsigned long)(((unsigned long *)stack)[1]);</div><div class='add'>+		pr_debug("addr:           %p\n", (void *)addr);</div><div class='add'>+		if (!skip)</div><div class='add'>+			trace-&gt;entries[trace-&gt;nr_entries++] = addr-1;</div><div class='add'>+		else</div><div class='add'>+			skip--;</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			break;</div><div class='add'>+		if (!addr)</div><div class='add'>+			return 0;</div><div class='add'>+		/*</div><div class='add'>+		 * Stack frames must go forwards (otherwise a loop could</div><div class='add'>+		 * happen if the stackframe is corrupted), so we move</div><div class='add'>+		 * prev_stack forwards:</div><div class='add'>+		 */</div><div class='add'>+		prev_stack = stack;</div><div class='add'>+		stack = (unsigned long)(((unsigned long *)stack)[0]);</div><div class='add'>+	}</div><div class='add'>+	pr_debug("invalid:        %p\n", (void *)stack);</div><div class='add'>+#else</div><div class='add'>+	while (stack &lt; stack_end) {</div><div class='add'>+		addr = ((unsigned long *)stack)[0];</div><div class='add'>+		stack += sizeof(long);</div><div class='add'>+		if (__kernel_text_address(addr)) {</div><div class='add'>+			if (!skip)</div><div class='add'>+				trace-&gt;entries[trace-&gt;nr_entries++] = addr-1;</div><div class='add'>+			else</div><div class='add'>+				skip--;</div><div class='add'>+			if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return stack;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_STACKS 10</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Save stack-backtrace addresses into a stack_trace buffer.</div><div class='add'>+ * If all_contexts is set, all contexts (hardirq, softirq and process)</div><div class='add'>+ * are saved. If not set then only the current context is saved.</div><div class='add'>+ */</div><div class='add'>+void save_stack_trace(struct stack_trace *trace,</div><div class='add'>+		      struct task_struct *task, int all_contexts,</div><div class='add'>+		      unsigned int skip)</div><div class='add'>+{</div><div class='add'>+	unsigned long stack = (unsigned long)&amp;stack;</div><div class='add'>+	int i, nr_stacks = 0, stacks_done[MAX_STACKS];</div><div class='add'>+</div><div class='add'>+	WARN_ON(trace-&gt;nr_entries || !trace-&gt;max_entries);</div><div class='add'>+</div><div class='add'>+	if (!task)</div><div class='add'>+		task = current;</div><div class='add'>+</div><div class='add'>+	pr_debug("task: %p, ti: %p\n", task, task-&gt;thread_info);</div><div class='add'>+</div><div class='add'>+	if (!task || task == current) {</div><div class='add'>+		/* Grab rbp right from our regs: */</div><div class='add'>+		asm ("mov %%rbp, %0" : "=r" (stack));</div><div class='add'>+		pr_debug("rbp:            %p\n", (void *)stack);</div><div class='add'>+	} else {</div><div class='add'>+		/* rbp is the last reg pushed by switch_to(): */</div><div class='add'>+		stack = task-&gt;thread.rsp;</div><div class='add'>+		pr_debug("other task rsp: %p\n", (void *)stack);</div><div class='add'>+		stack = (unsigned long)(((unsigned long *)stack)[0]);</div><div class='add'>+		pr_debug("other task rbp: %p\n", (void *)stack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		unsigned long stack_end = get_stack_end(task, stack);</div><div class='add'>+</div><div class='add'>+		pr_debug("stack:          %p\n", (void *)stack);</div><div class='add'>+		pr_debug("stack end:      %p\n", (void *)stack_end);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Invalid stack addres?</div><div class='add'>+		 */</div><div class='add'>+		if (!stack_end)</div><div class='add'>+			return;</div><div class='add'>+		/*</div><div class='add'>+		 * Were we in this stack already? (recursion)</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; nr_stacks; i++)</div><div class='add'>+			if (stacks_done[i] == stack_end)</div><div class='add'>+				return;</div><div class='add'>+		stacks_done[nr_stacks] = stack_end;</div><div class='add'>+</div><div class='add'>+		stack = save_context_stack(trace, skip, stack, stack_end);</div><div class='add'>+		if (!all_contexts || !stack ||</div><div class='add'>+				trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			return;</div><div class='add'>+		trace-&gt;entries[trace-&gt;nr_entries++] = ULONG_MAX;</div><div class='add'>+		if (trace-&gt;nr_entries &gt;= trace-&gt;max_entries)</div><div class='add'>+			return;</div><div class='add'>+		if (++nr_stacks &gt;= MAX_STACKS)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend.c<br/>index ecbd34c1093d..91f7e678bae7 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/suspend.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/suspend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/suspend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/suspend.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (c) 2001 Patrick Mochel &lt;mochel@osdl.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='head'>diff --git a/arch/x86_64/kernel/syscall.c b/arch/x86_64/kernel/syscall.c<br/>index 7c176b3edde0..213fd6ab789d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/syscall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/syscall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/syscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/syscall.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/sys.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define __NO_STUBS</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/kernel/tce.c b/arch/x86_64/kernel/tce.c<br/>new file mode 100644<br/>index 000000000000..d3a9e79e954c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/tce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/tce.c</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+/*</div><div class='add'>+ * Derived from arch/powerpc/platforms/pseries/iommu.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) IBM Corporation, 2006</div><div class='add'>+ *</div><div class='add'>+ * Author: Jon Mason &lt;jdmason@us.ibm.com&gt;</div><div class='add'>+ * Author: Muli Ben-Yehuda &lt;muli@il.ibm.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/bootmem.h&gt;</div><div class='add'>+#include &lt;asm/tce.h&gt;</div><div class='add'>+#include &lt;asm/calgary.h&gt;</div><div class='add'>+#include &lt;asm/proto.h&gt;</div><div class='add'>+</div><div class='add'>+/* flush a tce at 'tceaddr' to main memory */</div><div class='add'>+static inline void flush_tce(void* tceaddr)</div><div class='add'>+{</div><div class='add'>+	/* a single tce can't cross a cache line */</div><div class='add'>+	if (cpu_has_clflush)</div><div class='add'>+		asm volatile("clflush (%0)" :: "r" (tceaddr));</div><div class='add'>+	else</div><div class='add'>+		asm volatile("wbinvd":::"memory");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tce_build(struct iommu_table *tbl, unsigned long index,</div><div class='add'>+	unsigned int npages, unsigned long uaddr, int direction)</div><div class='add'>+{</div><div class='add'>+	u64* tp;</div><div class='add'>+	u64 t;</div><div class='add'>+	u64 rpn;</div><div class='add'>+</div><div class='add'>+	t = (1 &lt;&lt; TCE_READ_SHIFT);</div><div class='add'>+	if (direction != DMA_TO_DEVICE)</div><div class='add'>+		t |= (1 &lt;&lt; TCE_WRITE_SHIFT);</div><div class='add'>+</div><div class='add'>+	tp = ((u64*)tbl-&gt;it_base) + index;</div><div class='add'>+</div><div class='add'>+	while (npages--) {</div><div class='add'>+		rpn = (virt_to_bus((void*)uaddr)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		t &amp;= ~TCE_RPN_MASK;</div><div class='add'>+		t |= (rpn &lt;&lt; TCE_RPN_SHIFT);</div><div class='add'>+</div><div class='add'>+		*tp = cpu_to_be64(t);</div><div class='add'>+		flush_tce(tp);</div><div class='add'>+</div><div class='add'>+		uaddr += PAGE_SIZE;</div><div class='add'>+		tp++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tce_free(struct iommu_table *tbl, long index, unsigned int npages)</div><div class='add'>+{</div><div class='add'>+	u64* tp;</div><div class='add'>+</div><div class='add'>+	tp  = ((u64*)tbl-&gt;it_base) + index;</div><div class='add'>+</div><div class='add'>+	while (npages--) {</div><div class='add'>+		*tp = cpu_to_be64(0);</div><div class='add'>+		flush_tce(tp);</div><div class='add'>+		tp++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int table_size_to_number_of_entries(unsigned char size)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * size is the order of the table, 0-7</div><div class='add'>+	 * smallest table is 8K entries, so shift result by 13 to</div><div class='add'>+	 * multiply by 8K</div><div class='add'>+	 */</div><div class='add'>+	return (1 &lt;&lt; size) &lt;&lt; 13;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl)</div><div class='add'>+{</div><div class='add'>+	unsigned int bitmapsz;</div><div class='add'>+	unsigned int tce_table_index;</div><div class='add'>+	unsigned long bmppages;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tbl-&gt;it_busno = dev-&gt;bus-&gt;number;</div><div class='add'>+</div><div class='add'>+	/* set the tce table size - measured in entries */</div><div class='add'>+	tbl-&gt;it_size = table_size_to_number_of_entries(specified_table_size);</div><div class='add'>+</div><div class='add'>+	tce_table_index = bus_to_phb(tbl-&gt;it_busno);</div><div class='add'>+	tbl-&gt;it_base = (unsigned long)tce_table_kva[tce_table_index];</div><div class='add'>+	if (!tbl-&gt;it_base) {</div><div class='add'>+		printk(KERN_ERR "Calgary: iommu_table_setparms: "</div><div class='add'>+		       "no table allocated?!\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * number of bytes needed for the bitmap size in number of</div><div class='add'>+	 * entries; we need one bit per entry</div><div class='add'>+	 */</div><div class='add'>+	bitmapsz = tbl-&gt;it_size / BITS_PER_BYTE;</div><div class='add'>+	bmppages = __get_free_pages(GFP_KERNEL, get_order(bitmapsz));</div><div class='add'>+	if (!bmppages) {</div><div class='add'>+		printk(KERN_ERR "Calgary: cannot allocate bitmap\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tbl-&gt;it_map = (unsigned long*)bmppages;</div><div class='add'>+</div><div class='add'>+	memset(tbl-&gt;it_map, 0, bitmapsz);</div><div class='add'>+</div><div class='add'>+	tbl-&gt;it_hint = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;tbl-&gt;it_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int build_tce_table(struct pci_dev *dev, void __iomem *bbar)</div><div class='add'>+{</div><div class='add'>+	struct iommu_table *tbl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;sysdata) {</div><div class='add'>+		printk(KERN_ERR "Calgary: dev %p has sysdata %p\n",</div><div class='add'>+		       dev, dev-&gt;sysdata);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tbl = kzalloc(sizeof(struct iommu_table), GFP_KERNEL);</div><div class='add'>+	if (!tbl) {</div><div class='add'>+		printk(KERN_ERR "Calgary: error allocating iommu_table\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tce_table_setparms(dev, tbl);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_tbl;</div><div class='add'>+</div><div class='add'>+	tce_free(tbl, 0, tbl-&gt;it_size);</div><div class='add'>+</div><div class='add'>+	tbl-&gt;bbar = bbar;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * NUMA is already using the bus's sysdata pointer, so we use</div><div class='add'>+	 * the bus's pci_dev's sysdata instead.</div><div class='add'>+	 */</div><div class='add'>+	dev-&gt;sysdata = tbl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_tbl:</div><div class='add'>+	kfree(tbl);</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void* alloc_tce_table(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	size = table_size_to_number_of_entries(specified_table_size);</div><div class='add'>+	size *= TCE_ENTRY_SIZE;</div><div class='add'>+</div><div class='add'>+	return __alloc_bootmem_low(size, size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_tce_table(void *tbl)</div><div class='add'>+{</div><div class='add'>+	unsigned int size;</div><div class='add'>+</div><div class='add'>+	if (!tbl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	size = table_size_to_number_of_entries(specified_table_size);</div><div class='add'>+	size *= TCE_ENTRY_SIZE;</div><div class='add'>+</div><div class='add'>+	free_bootmem(__pa(tbl), size);</div><div class='add'>+}</div><div class='head'>diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c<br/>index 7392570f975d..b9ff75992c16 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/time.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  *  Copyright (c) 1995  Markus Kuhn</div><div class='ctx'>  *  Copyright (c) 1996  Ingo Molnar</div><div class='ctx'>  *  Copyright (c) 1998  Andrea Arcangeli</div><div class='del'>- *  Copyright (c) 2002  Vojtech Pavlik</div><div class='add'>+ *  Copyright (c) 2002,2006  Vojtech Pavlik</div><div class='ctx'>  *  Copyright (c) 2003  Andi Kleen</div><div class='ctx'>  *  RTC support code taken from arch/i386/kernel/timers/time_hpet.c</div><div class='ctx'>  */</div><div class='hunk'>@@ -51,14 +51,21 @@ extern int using_apic_timer;</div><div class='ctx'> static char *time_init_gtod(void);</div><div class='ctx'> </div><div class='ctx'> DEFINE_SPINLOCK(rtc_lock);</div><div class='add'>+EXPORT_SYMBOL(rtc_lock);</div><div class='ctx'> DEFINE_SPINLOCK(i8253_lock);</div><div class='ctx'> </div><div class='ctx'> int nohpet __initdata = 0;</div><div class='ctx'> static int notsc __initdata = 0;</div><div class='ctx'> </div><div class='del'>-#undef HPET_HACK_ENABLE_DANGEROUS</div><div class='add'>+#define USEC_PER_TICK (USEC_PER_SEC / HZ)</div><div class='add'>+#define NSEC_PER_TICK (NSEC_PER_SEC / HZ)</div><div class='add'>+#define FSEC_PER_TICK (FSEC_PER_SEC / HZ)</div><div class='add'>+</div><div class='add'>+#define NS_SCALE	10 /* 2^10, carefully chosen */</div><div class='add'>+#define US_SCALE	32 /* 2^32, arbitralrily chosen */</div><div class='ctx'> </div><div class='ctx'> unsigned int cpu_khz;					/* TSC clocks / usec, not used here */</div><div class='add'>+EXPORT_SYMBOL(cpu_khz);</div><div class='ctx'> static unsigned long hpet_period;			/* fsecs / HPET clock */</div><div class='ctx'> unsigned long hpet_tick;				/* HPET clocks / interrupt */</div><div class='ctx'> int hpet_use_timer;				/* Use counter of hpet for time keeping, otherwise PIT */</div><div class='hunk'>@@ -90,7 +97,7 @@ static inline unsigned int do_gettimeoffset_tsc(void)</div><div class='ctx'> 	t = get_cycles_sync();</div><div class='ctx'> 	if (t &lt; vxtime.last_tsc) </div><div class='ctx'> 		t = vxtime.last_tsc; /* hack */</div><div class='del'>-	x = ((t - vxtime.last_tsc) * vxtime.tsc_quot) &gt;&gt; 32;</div><div class='add'>+	x = ((t - vxtime.last_tsc) * vxtime.tsc_quot) &gt;&gt; US_SCALE;</div><div class='ctx'> 	return x;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +105,7 @@ static inline unsigned int do_gettimeoffset_hpet(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* cap counter read to one tick to avoid inconsistencies */</div><div class='ctx'> 	unsigned long counter = hpet_readl(HPET_COUNTER) - vxtime.last;</div><div class='del'>-	return (min(counter,hpet_tick) * vxtime.quot) &gt;&gt; 32;</div><div class='add'>+	return (min(counter,hpet_tick) * vxtime.quot) &gt;&gt; US_SCALE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int (*do_gettimeoffset)(void) = do_gettimeoffset_tsc;</div><div class='hunk'>@@ -118,7 +125,7 @@ void do_gettimeofday(struct timeval *tv)</div><div class='ctx'> 		seq = read_seqbegin(&amp;xtime_lock);</div><div class='ctx'> </div><div class='ctx'> 		sec = xtime.tv_sec;</div><div class='del'>-		usec = xtime.tv_nsec / 1000;</div><div class='add'>+		usec = xtime.tv_nsec / NSEC_PER_USEC;</div><div class='ctx'> </div><div class='ctx'> 		/* i386 does some correction here to keep the clock </div><div class='ctx'> 		   monotonous even when ntpd is fixing drift.</div><div class='hunk'>@@ -129,14 +136,14 @@ void do_gettimeofday(struct timeval *tv)</div><div class='ctx'> 		   in arch/x86_64/kernel/vsyscall.c and export all needed</div><div class='ctx'> 		   variables in vmlinux.lds. -AK */ </div><div class='ctx'> </div><div class='del'>-		t = (jiffies - wall_jiffies) * (1000000L / HZ) +</div><div class='add'>+		t = (jiffies - wall_jiffies) * USEC_PER_TICK +</div><div class='ctx'> 			do_gettimeoffset();</div><div class='ctx'> 		usec += t;</div><div class='ctx'> </div><div class='ctx'> 	} while (read_seqretry(&amp;xtime_lock, seq));</div><div class='ctx'> </div><div class='del'>-	tv-&gt;tv_sec = sec + usec / 1000000;</div><div class='del'>-	tv-&gt;tv_usec = usec % 1000000;</div><div class='add'>+	tv-&gt;tv_sec = sec + usec / USEC_PER_SEC;</div><div class='add'>+	tv-&gt;tv_usec = usec % USEC_PER_SEC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(do_gettimeofday);</div><div class='hunk'>@@ -157,8 +164,8 @@ int do_settimeofday(struct timespec *tv)</div><div class='ctx'> </div><div class='ctx'> 	write_seqlock_irq(&amp;xtime_lock);</div><div class='ctx'> </div><div class='del'>-	nsec -= do_gettimeoffset() * 1000 +</div><div class='del'>-		(jiffies - wall_jiffies) * (NSEC_PER_SEC/HZ);</div><div class='add'>+	nsec -= do_gettimeoffset() * NSEC_PER_USEC +</div><div class='add'>+		(jiffies - wall_jiffies) * NSEC_PER_TICK;</div><div class='ctx'> </div><div class='ctx'> 	wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);</div><div class='ctx'> 	wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);</div><div class='hunk'>@@ -288,7 +295,7 @@ unsigned long long monotonic_clock(void)</div><div class='ctx'> 			this_offset = hpet_readl(HPET_COUNTER);</div><div class='ctx'> 		} while (read_seqretry(&amp;xtime_lock, seq));</div><div class='ctx'> 		offset = (this_offset - last_offset);</div><div class='del'>-		offset *= (NSEC_PER_SEC/HZ) / hpet_tick;</div><div class='add'>+		offset *= NSEC_PER_TICK / hpet_tick;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		do {</div><div class='ctx'> 			seq = read_seqbegin(&amp;xtime_lock);</div><div class='hunk'>@@ -297,7 +304,8 @@ unsigned long long monotonic_clock(void)</div><div class='ctx'> 			base = monotonic_base;</div><div class='ctx'> 		} while (read_seqretry(&amp;xtime_lock, seq));</div><div class='ctx'> 		this_offset = get_cycles_sync();</div><div class='del'>-		offset = (this_offset - last_offset)*1000 / cpu_khz; </div><div class='add'>+		/* FIXME: 1000 or 1000000? */</div><div class='add'>+		offset = (this_offset - last_offset)*1000 / cpu_khz;</div><div class='ctx'> 	}</div><div class='ctx'> 	return base + offset;</div><div class='ctx'> }</div><div class='hunk'>@@ -382,7 +390,7 @@ void main_timer_handler(struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		monotonic_base += </div><div class='del'>-			(offset - vxtime.last)*(NSEC_PER_SEC/HZ) / hpet_tick;</div><div class='add'>+			(offset - vxtime.last) * NSEC_PER_TICK / hpet_tick;</div><div class='ctx'> </div><div class='ctx'> 		vxtime.last = offset;</div><div class='ctx'> #ifdef CONFIG_X86_PM_TIMER</div><div class='hunk'>@@ -391,24 +399,25 @@ void main_timer_handler(struct pt_regs *regs)</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		offset = (((tsc - vxtime.last_tsc) *</div><div class='del'>-			   vxtime.tsc_quot) &gt;&gt; 32) - (USEC_PER_SEC / HZ);</div><div class='add'>+			   vxtime.tsc_quot) &gt;&gt; US_SCALE) - USEC_PER_TICK;</div><div class='ctx'> </div><div class='ctx'> 		if (offset &lt; 0)</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> </div><div class='del'>-		if (offset &gt; (USEC_PER_SEC / HZ)) {</div><div class='del'>-			lost = offset / (USEC_PER_SEC / HZ);</div><div class='del'>-			offset %= (USEC_PER_SEC / HZ);</div><div class='add'>+		if (offset &gt; USEC_PER_TICK) {</div><div class='add'>+			lost = offset / USEC_PER_TICK;</div><div class='add'>+			offset %= USEC_PER_TICK;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		monotonic_base += (tsc - vxtime.last_tsc)*1000000/cpu_khz ;</div><div class='add'>+		/* FIXME: 1000 or 1000000? */</div><div class='add'>+		monotonic_base += (tsc - vxtime.last_tsc) * 1000000 / cpu_khz;</div><div class='ctx'> </div><div class='ctx'> 		vxtime.last_tsc = tsc - vxtime.quot * delay / vxtime.tsc_quot;</div><div class='ctx'> </div><div class='ctx'> 		if ((((tsc - vxtime.last_tsc) *</div><div class='del'>-		      vxtime.tsc_quot) &gt;&gt; 32) &lt; offset)</div><div class='add'>+		      vxtime.tsc_quot) &gt;&gt; US_SCALE) &lt; offset)</div><div class='ctx'> 			vxtime.last_tsc = tsc -</div><div class='del'>-				(((long) offset &lt;&lt; 32) / vxtime.tsc_quot) - 1;</div><div class='add'>+				(((long) offset &lt;&lt; US_SCALE) / vxtime.tsc_quot) - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (lost &gt; 0) {</div><div class='hunk'>@@ -468,16 +477,15 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int cyc2ns_scale __read_mostly;</div><div class='del'>-#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */</div><div class='ctx'> </div><div class='ctx'> static inline void set_cyc2ns_scale(unsigned long cpu_khz)</div><div class='ctx'> {</div><div class='del'>-	cyc2ns_scale = (1000000 &lt;&lt; CYC2NS_SCALE_FACTOR)/cpu_khz;</div><div class='add'>+	cyc2ns_scale = (NSEC_PER_MSEC &lt;&lt; NS_SCALE) / cpu_khz;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long long cycles_2_ns(unsigned long long cyc)</div><div class='ctx'> {</div><div class='del'>-	return (cyc * cyc2ns_scale) &gt;&gt; CYC2NS_SCALE_FACTOR;</div><div class='add'>+	return (cyc * cyc2ns_scale) &gt;&gt; NS_SCALE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long long sched_clock(void)</div><div class='hunk'>@@ -490,7 +498,7 @@ unsigned long long sched_clock(void)</div><div class='ctx'>            Disadvantage is a small drift between CPUs in some configurations,</div><div class='ctx'> 	   but that should be tolerable. */</div><div class='ctx'> 	if (__vxtime.mode == VXTIME_HPET)</div><div class='del'>-		return (hpet_readl(HPET_COUNTER) * vxtime.quot) &gt;&gt; 32;</div><div class='add'>+		return (hpet_readl(HPET_COUNTER) * vxtime.quot) &gt;&gt; US_SCALE;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Could do CPU core sync here. Opteron can execute rdtsc speculatively,</div><div class='hunk'>@@ -633,7 +641,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,</div><div class='ctx'> </div><div class='ctx'> 		cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq-&gt;new);</div><div class='ctx'> 		if (!(freq-&gt;flags &amp; CPUFREQ_CONST_LOOPS))</div><div class='del'>-			vxtime.tsc_quot = (1000L &lt;&lt; 32) / cpu_khz;</div><div class='add'>+			vxtime.tsc_quot = (USEC_PER_MSEC &lt;&lt; US_SCALE) / cpu_khz;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	set_cyc2ns_scale(cpu_khz_ref);</div><div class='hunk'>@@ -789,8 +797,8 @@ static int hpet_timer_stop_set_go(unsigned long tick)</div><div class='ctx'> 	if (hpet_use_timer) {</div><div class='ctx'> 		hpet_writel(HPET_TN_ENABLE | HPET_TN_PERIODIC | HPET_TN_SETVAL |</div><div class='ctx'> 		    HPET_TN_32BIT, HPET_T0_CFG);</div><div class='del'>-		hpet_writel(hpet_tick, HPET_T0_CMP);</div><div class='del'>-		hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */</div><div class='add'>+		hpet_writel(hpet_tick, HPET_T0_CMP); /* next interrupt */</div><div class='add'>+		hpet_writel(hpet_tick, HPET_T0_CMP); /* period */</div><div class='ctx'> 		cfg |= HPET_CFG_LEGACY;</div><div class='ctx'> 	}</div><div class='ctx'> /*</div><div class='hunk'>@@ -825,8 +833,7 @@ static int hpet_init(void)</div><div class='ctx'> 	if (hpet_period &lt; 100000 || hpet_period &gt; 100000000)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	hpet_tick = (1000000000L * (USEC_PER_SEC / HZ) + hpet_period / 2) /</div><div class='del'>-		hpet_period;</div><div class='add'>+	hpet_tick = (FSEC_PER_TICK + hpet_period / 2) / hpet_period;</div><div class='ctx'> </div><div class='ctx'> 	hpet_use_timer = (id &amp; HPET_ID_LEGSUP);</div><div class='ctx'> </div><div class='hunk'>@@ -882,7 +889,7 @@ int __init time_setup(char *str)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct irqaction irq0 = {</div><div class='del'>-	timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL</div><div class='add'>+	timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void __init time_init(void)</div><div class='hunk'>@@ -890,18 +897,6 @@ void __init time_init(void)</div><div class='ctx'> 	char *timename;</div><div class='ctx'> 	char *gtod;</div><div class='ctx'> </div><div class='del'>-#ifdef HPET_HACK_ENABLE_DANGEROUS</div><div class='del'>-        if (!vxtime.hpet_address) {</div><div class='del'>-		printk(KERN_WARNING "time.c: WARNING: Enabling HPET base "</div><div class='del'>-		       "manually!\n");</div><div class='del'>-                outl(0x800038a0, 0xcf8);</div><div class='del'>-                outl(0xff000001, 0xcfc);</div><div class='del'>-                outl(0x800038a0, 0xcf8);</div><div class='del'>-                vxtime.hpet_address = inl(0xcfc) &amp; 0xfffffffe;</div><div class='del'>-		printk(KERN_WARNING "time.c: WARNING: Enabled HPET "</div><div class='del'>-		       "at %#lx.\n", vxtime.hpet_address);</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='ctx'> 	if (nohpet)</div><div class='ctx'> 		vxtime.hpet_address = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -912,7 +907,7 @@ void __init time_init(void)</div><div class='ctx'> 	                        -xtime.tv_sec, -xtime.tv_nsec);</div><div class='ctx'> </div><div class='ctx'> 	if (!hpet_init())</div><div class='del'>-                vxtime_hz = (1000000000000000L + hpet_period / 2) / hpet_period;</div><div class='add'>+                vxtime_hz = (FSEC_PER_SEC + hpet_period / 2) / hpet_period;</div><div class='ctx'> 	else</div><div class='ctx'> 		vxtime.hpet_address = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -941,8 +936,8 @@ void __init time_init(void)</div><div class='ctx'> 	       vxtime_hz / 1000000, vxtime_hz % 1000000, timename, gtod);</div><div class='ctx'> 	printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n",</div><div class='ctx'> 		cpu_khz / 1000, cpu_khz % 1000);</div><div class='del'>-	vxtime.quot = (1000000L &lt;&lt; 32) / vxtime_hz;</div><div class='del'>-	vxtime.tsc_quot = (1000L &lt;&lt; 32) / cpu_khz;</div><div class='add'>+	vxtime.quot = (USEC_PER_SEC &lt;&lt; US_SCALE) / vxtime_hz;</div><div class='add'>+	vxtime.tsc_quot = (USEC_PER_MSEC &lt;&lt; US_SCALE) / cpu_khz;</div><div class='ctx'> 	vxtime.last_tsc = get_cycles_sync();</div><div class='ctx'> 	setup_irq(0, &amp;irq0);</div><div class='ctx'> </div><div class='hunk'>@@ -956,10 +951,10 @@ void __init time_init(void)</div><div class='ctx'> __cpuinit int unsynchronized_tsc(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-	if (oem_force_hpet_timer())</div><div class='add'>+	if (apic_is_clustered_box())</div><div class='ctx'> 		return 1;</div><div class='ctx'>  	/* Intel systems are normally all synchronized. Exceptions</div><div class='del'>- 	   are handled in the OEM check above. */</div><div class='add'>+ 	   are handled in the check above. */</div><div class='ctx'>  	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)</div><div class='ctx'>  		return 0;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c<br/>index cea335e8746c..eb39a2775236 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/traps.c</a></div><div class='hunk'>@@ -6,15 +6,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Pentium III FXSR, SSE support</div><div class='ctx'>  *	Gareth Hughes &lt;gareth@valinux.com&gt;, May 2000</div><div class='del'>- *</div><div class='del'>- *  $Id: traps.c,v 1.36 2002/03/24 11:09:10 ak Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 'Traps.c' handles hardware traps and faults after we have saved some</div><div class='ctx'>  * state in 'entry.S'.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -31,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/nmi.h&gt;</div><div class='ctx'> #include &lt;linux/kprobes.h&gt;</div><div class='ctx'> #include &lt;linux/kexec.h&gt;</div><div class='add'>+#include &lt;linux/unwind.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -41,7 +39,7 @@</div><div class='ctx'> #include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/kdebug.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/unwind.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/pda.h&gt;</div><div class='hunk'>@@ -71,19 +69,20 @@ asmlinkage void machine_check(void);</div><div class='ctx'> asmlinkage void spurious_interrupt_bug(void);</div><div class='ctx'> </div><div class='ctx'> ATOMIC_NOTIFIER_HEAD(die_chain);</div><div class='add'>+EXPORT_SYMBOL(die_chain);</div><div class='ctx'> </div><div class='ctx'> int register_die_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='ctx'> 	vmalloc_sync_all();</div><div class='ctx'> 	return atomic_notifier_chain_register(&amp;die_chain, nb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(register_die_notifier);</div><div class='add'>+EXPORT_SYMBOL(register_die_notifier); /* used modular by kdb */</div><div class='ctx'> </div><div class='ctx'> int unregister_die_notifier(struct notifier_block *nb)</div><div class='ctx'> {</div><div class='ctx'> 	return atomic_notifier_chain_unregister(&amp;die_chain, nb);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(unregister_die_notifier);</div><div class='add'>+EXPORT_SYMBOL(unregister_die_notifier); /* used modular by kdb */</div><div class='ctx'> </div><div class='ctx'> static inline void conditional_sti(struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -107,31 +106,35 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)</div><div class='ctx'> 	preempt_enable_no_resched();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kstack_depth_to_print = 10;</div><div class='add'>+static int kstack_depth_to_print = 12;</div><div class='add'>+static int call_trace = 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KALLSYMS</div><div class='del'>-#include &lt;linux/kallsyms.h&gt; </div><div class='del'>-int printk_address(unsigned long address)</div><div class='del'>-{ </div><div class='add'>+# include &lt;linux/kallsyms.h&gt;</div><div class='add'>+void printk_address(unsigned long address)</div><div class='add'>+{</div><div class='ctx'> 	unsigned long offset = 0, symsize;</div><div class='ctx'> 	const char *symname;</div><div class='ctx'> 	char *modname;</div><div class='del'>-	char *delim = ":"; </div><div class='add'>+	char *delim = ":";</div><div class='ctx'> 	char namebuf[128];</div><div class='ctx'> </div><div class='del'>-	symname = kallsyms_lookup(address, &amp;symsize, &amp;offset, &amp;modname, namebuf); </div><div class='del'>-	if (!symname) </div><div class='del'>-		return printk("[&lt;%016lx&gt;]", address);</div><div class='del'>-	if (!modname) </div><div class='add'>+	symname = kallsyms_lookup(address, &amp;symsize, &amp;offset,</div><div class='add'>+					&amp;modname, namebuf);</div><div class='add'>+	if (!symname) {</div><div class='add'>+		printk(" [&lt;%016lx&gt;]\n", address);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (!modname)</div><div class='ctx'> 		modname = delim = ""; 		</div><div class='del'>-        return printk("&lt;%016lx&gt;{%s%s%s%s%+ld}",</div><div class='del'>-		      address, delim, modname, delim, symname, offset); </div><div class='del'>-} </div><div class='add'>+	printk(" [&lt;%016lx&gt;] %s%s%s%s+0x%lx/0x%lx\n",</div><div class='add'>+		address, delim, modname, delim, symname, offset, symsize);</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='del'>-int printk_address(unsigned long address)</div><div class='del'>-{ </div><div class='del'>-	return printk("[&lt;%016lx&gt;]", address);</div><div class='del'>-} </div><div class='add'>+void printk_address(unsigned long address)</div><div class='add'>+{</div><div class='add'>+	printk(" [&lt;%016lx&gt;]\n", address);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='hunk'>@@ -149,10 +152,22 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned k;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Iterate over all exception stacks, and figure out whether</div><div class='add'>+	 * 'stack' is in one of them:</div><div class='add'>+	 */</div><div class='ctx'> 	for (k = 0; k &lt; N_EXCEPTION_STACKS; k++) {</div><div class='ctx'> 		unsigned long end;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * set 'end' to the end of the exception stack.</div><div class='add'>+		 */</div><div class='ctx'> 		switch (k + 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * TODO: this block is not needed i think, because</div><div class='add'>+		 * setup64.c:cpu_init() sets up t-&gt;ist[DEBUG_STACK]</div><div class='add'>+		 * properly too.</div><div class='add'>+		 */</div><div class='ctx'> #if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='ctx'> 		case DEBUG_STACK:</div><div class='ctx'> 			end = cpu_pda(cpu)-&gt;debugstack + DEBUG_STKSZ;</div><div class='hunk'>@@ -162,19 +177,43 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='ctx'> 			end = per_cpu(init_tss, cpu).ist[k];</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * Is 'stack' above this exception frame's end?</div><div class='add'>+		 * If yes then skip to the next frame.</div><div class='add'>+		 */</div><div class='ctx'> 		if (stack &gt;= end)</div><div class='ctx'> 			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Is 'stack' above this exception frame's start address?</div><div class='add'>+		 * If yes then we found the right frame.</div><div class='add'>+		 */</div><div class='ctx'> 		if (stack &gt;= end - EXCEPTION_STKSZ) {</div><div class='add'>+			/*</div><div class='add'>+			 * Make sure we only iterate through an exception</div><div class='add'>+			 * stack once. If it comes up for the second time</div><div class='add'>+			 * then there's something wrong going on - just</div><div class='add'>+			 * break out and return NULL:</div><div class='add'>+			 */</div><div class='ctx'> 			if (*usedp &amp; (1U &lt;&lt; k))</div><div class='ctx'> 				break;</div><div class='ctx'> 			*usedp |= 1U &lt;&lt; k;</div><div class='ctx'> 			*idp = ids[k];</div><div class='ctx'> 			return (unsigned long *)end;</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * If this is a debug stack, and if it has a larger size than</div><div class='add'>+		 * the usual exception stacks, then 'stack' might still</div><div class='add'>+		 * be within the lower portion of the debug stack:</div><div class='add'>+		 */</div><div class='ctx'> #if DEBUG_STKSZ &gt; EXCEPTION_STKSZ</div><div class='ctx'> 		if (k == DEBUG_STACK - 1 &amp;&amp; stack &gt;= end - DEBUG_STKSZ) {</div><div class='ctx'> 			unsigned j = N_EXCEPTION_STACKS - 1;</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * Black magic. A large debug stack is composed of</div><div class='add'>+			 * multiple exception stack entries, which we</div><div class='add'>+			 * iterate through now. Dont look:</div><div class='add'>+			 */</div><div class='ctx'> 			do {</div><div class='ctx'> 				++j;</div><div class='ctx'> 				end -= EXCEPTION_STKSZ;</div><div class='hunk'>@@ -191,6 +230,19 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int show_trace_unwind(struct unwind_frame_info *info, void *context)</div><div class='add'>+{</div><div class='add'>+	int n = 0;</div><div class='add'>+</div><div class='add'>+	while (unwind(info) == 0 &amp;&amp; UNW_PC(info)) {</div><div class='add'>+		n++;</div><div class='add'>+		printk_address(UNW_PC(info));</div><div class='add'>+		if (arch_unw_user_mode(info))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * x86-64 can have upto three kernel stacks: </div><div class='ctx'>  * process stack</div><div class='hunk'>@@ -198,25 +250,48 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,</div><div class='ctx'>  * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void show_trace(unsigned long *stack)</div><div class='add'>+void show_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * stack)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned cpu = safe_smp_processor_id();</div><div class='ctx'> 	unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)-&gt;irqstackptr;</div><div class='del'>-	int i;</div><div class='add'>+	int i = 11;</div><div class='ctx'> 	unsigned used = 0;</div><div class='ctx'> </div><div class='del'>-	printk("\nCall Trace:");</div><div class='add'>+	printk("\nCall Trace:\n");</div><div class='add'>+</div><div class='add'>+	if (!tsk)</div><div class='add'>+		tsk = current;</div><div class='add'>+</div><div class='add'>+	if (call_trace &gt;= 0) {</div><div class='add'>+		int unw_ret = 0;</div><div class='add'>+		struct unwind_frame_info info;</div><div class='ctx'> </div><div class='add'>+		if (regs) {</div><div class='add'>+			if (unwind_init_frame_info(&amp;info, tsk, regs) == 0)</div><div class='add'>+				unw_ret = show_trace_unwind(&amp;info, NULL);</div><div class='add'>+		} else if (tsk == current)</div><div class='add'>+			unw_ret = unwind_init_running(&amp;info, show_trace_unwind, NULL);</div><div class='add'>+		else {</div><div class='add'>+			if (unwind_init_blocked(&amp;info, tsk) == 0)</div><div class='add'>+				unw_ret = show_trace_unwind(&amp;info, NULL);</div><div class='add'>+		}</div><div class='add'>+		if (unw_ret &gt; 0) {</div><div class='add'>+			if (call_trace &gt; 0)</div><div class='add'>+				return;</div><div class='add'>+			printk("Legacy call trace:");</div><div class='add'>+			i = 18;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Print function call entries within a stack. 'cond' is the</div><div class='add'>+	 * "end of stackframe" condition, that the 'stack++'</div><div class='add'>+	 * iteration will eventually trigger.</div><div class='add'>+	 */</div><div class='ctx'> #define HANDLE_STACK(cond) \</div><div class='ctx'> 	do while (cond) { \</div><div class='ctx'> 		unsigned long addr = *stack++; \</div><div class='ctx'> 		if (kernel_text_address(addr)) { \</div><div class='del'>-			if (i &gt; 50) { \</div><div class='del'>-				printk("\n       "); \</div><div class='del'>-				i = 0; \</div><div class='del'>-			} \</div><div class='del'>-			else \</div><div class='del'>-				i += printk(" "); \</div><div class='ctx'> 			/* \</div><div class='ctx'> 			 * If the address is either in the text segment of the \</div><div class='ctx'> 			 * kernel, or in the region which contains vmalloc'ed \</div><div class='hunk'>@@ -225,20 +300,30 @@ void show_trace(unsigned long *stack)</div><div class='ctx'> 			 * down the cause of the crash will be able to figure \</div><div class='ctx'> 			 * out the call path that was taken. \</div><div class='ctx'> 			 */ \</div><div class='del'>-			i += printk_address(addr); \</div><div class='add'>+			printk_address(addr); \</div><div class='ctx'> 		} \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-	for(i = 11; ; ) {</div><div class='add'>+	/*</div><div class='add'>+	 * Print function call entries in all stacks, starting at the</div><div class='add'>+	 * current stack address. If the stacks consist of nested</div><div class='add'>+	 * exceptions</div><div class='add'>+	 */</div><div class='add'>+	for ( ; ; ) {</div><div class='ctx'> 		const char *id;</div><div class='ctx'> 		unsigned long *estack_end;</div><div class='ctx'> 		estack_end = in_exception_stack(cpu, (unsigned long)stack,</div><div class='ctx'> 						&amp;used, &amp;id);</div><div class='ctx'> </div><div class='ctx'> 		if (estack_end) {</div><div class='del'>-			i += printk(" &lt;%s&gt;", id);</div><div class='add'>+			printk(" &lt;%s&gt;", id);</div><div class='ctx'> 			HANDLE_STACK (stack &lt; estack_end);</div><div class='del'>-			i += printk(" &lt;EOE&gt;");</div><div class='add'>+			printk(" &lt;EOE&gt;");</div><div class='add'>+			/*</div><div class='add'>+			 * We link to the next stack via the</div><div class='add'>+			 * second-to-last pointer (index -2 to end) in the</div><div class='add'>+			 * exception stack:</div><div class='add'>+			 */</div><div class='ctx'> 			stack = (unsigned long *) estack_end[-2];</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -248,23 +333,32 @@ void show_trace(unsigned long *stack)</div><div class='ctx'> 				(IRQSTACKSIZE - 64) / sizeof(*irqstack);</div><div class='ctx'> </div><div class='ctx'> 			if (stack &gt;= irqstack &amp;&amp; stack &lt; irqstack_end) {</div><div class='del'>-				i += printk(" &lt;IRQ&gt;");</div><div class='add'>+				printk(" &lt;IRQ&gt;");</div><div class='ctx'> 				HANDLE_STACK (stack &lt; irqstack_end);</div><div class='add'>+				/*</div><div class='add'>+				 * We link to the next stack (which would be</div><div class='add'>+				 * the process stack normally) the last</div><div class='add'>+				 * pointer (index -1 to end) in the IRQ stack:</div><div class='add'>+				 */</div><div class='ctx'> 				stack = (unsigned long *) (irqstack_end[-1]);</div><div class='ctx'> 				irqstack_end = NULL;</div><div class='del'>-				i += printk(" &lt;EOI&gt;");</div><div class='add'>+				printk(" &lt;EOI&gt;");</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * This prints the process stack:</div><div class='add'>+	 */</div><div class='ctx'> 	HANDLE_STACK (((long) stack &amp; (THREAD_SIZE-1)) != 0);</div><div class='ctx'> #undef HANDLE_STACK</div><div class='add'>+</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void show_stack(struct task_struct *tsk, unsigned long * rsp)</div><div class='add'>+static void _show_stack(struct task_struct *tsk, struct pt_regs *regs, unsigned long * rsp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long *stack;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -294,11 +388,16 @@ void show_stack(struct task_struct *tsk, unsigned long * rsp)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (i &amp;&amp; ((i % 4) == 0))</div><div class='del'>-			printk("\n       ");</div><div class='del'>-		printk("%016lx ", *stack++);</div><div class='add'>+			printk("\n");</div><div class='add'>+		printk(" %016lx", *stack++);</div><div class='ctx'> 		touch_nmi_watchdog();</div><div class='ctx'> 	}</div><div class='del'>-	show_trace((unsigned long *)rsp);</div><div class='add'>+	show_trace(tsk, regs, rsp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void show_stack(struct task_struct *tsk, unsigned long * rsp)</div><div class='add'>+{</div><div class='add'>+	_show_stack(tsk, NULL, rsp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -307,7 +406,7 @@ void show_stack(struct task_struct *tsk, unsigned long * rsp)</div><div class='ctx'> void dump_stack(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long dummy;</div><div class='del'>-	show_trace(&amp;dummy);</div><div class='add'>+	show_trace(NULL, NULL, &amp;dummy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dump_stack);</div><div class='hunk'>@@ -334,7 +433,7 @@ void show_registers(struct pt_regs *regs)</div><div class='ctx'> 	if (in_kernel) {</div><div class='ctx'> </div><div class='ctx'> 		printk("Stack: ");</div><div class='del'>-		show_stack(NULL, (unsigned long*)rsp);</div><div class='add'>+		_show_stack(NULL, regs, (unsigned long*)rsp);</div><div class='ctx'> </div><div class='ctx'> 		printk("\nCode: ");</div><div class='ctx'> 		if (regs-&gt;rip &lt; PAGE_OFFSET)</div><div class='hunk'>@@ -383,6 +482,7 @@ void out_of_line_bug(void)</div><div class='ctx'> { </div><div class='ctx'> 	BUG(); </div><div class='ctx'> } </div><div class='add'>+EXPORT_SYMBOL(out_of_line_bug);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(die_lock);</div><div class='hunk'>@@ -1012,3 +1112,14 @@ static int __init kstack_setup(char *s)</div><div class='ctx'> }</div><div class='ctx'> __setup("kstack=", kstack_setup);</div><div class='ctx'> </div><div class='add'>+static int __init call_trace_setup(char *s)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(s, "old") == 0)</div><div class='add'>+		call_trace = -1;</div><div class='add'>+	else if (strcmp(s, "both") == 0)</div><div class='add'>+		call_trace = 0;</div><div class='add'>+	else if (strcmp(s, "new") == 0)</div><div class='add'>+		call_trace = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+__setup("call_trace=", call_trace_setup);</div><div class='head'>diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S<br/>index b81f473c4a19..7c4de31471d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef i386	/* in case the preprocessor is a 32bit one */</div><div class='ctx'> </div><div class='hunk'>@@ -45,6 +44,15 @@ SECTIONS</div><div class='ctx'> </div><div class='ctx'>   RODATA</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_STACK_UNWIND</div><div class='add'>+  . = ALIGN(8);</div><div class='add'>+  .eh_frame : AT(ADDR(.eh_frame) - LOAD_OFFSET) {</div><div class='add'>+	__start_unwind = .;</div><div class='add'>+  	*(.eh_frame)</div><div class='add'>+	__end_unwind = .;</div><div class='add'>+  }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 				/* Data */</div><div class='ctx'>   .data : AT(ADDR(.data) - LOAD_OFFSET) {</div><div class='ctx'> 	*(.data)</div><div class='hunk'>@@ -131,6 +139,26 @@ SECTIONS</div><div class='ctx'> 	*(.data.page_aligned)</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='add'>+  /* might get freed after init */</div><div class='add'>+  . = ALIGN(4096);</div><div class='add'>+  __smp_alt_begin = .;</div><div class='add'>+  __smp_alt_instructions = .;</div><div class='add'>+  .smp_altinstructions : AT(ADDR(.smp_altinstructions) - LOAD_OFFSET) {</div><div class='add'>+	*(.smp_altinstructions)</div><div class='add'>+  }</div><div class='add'>+  __smp_alt_instructions_end = .;</div><div class='add'>+  . = ALIGN(8);</div><div class='add'>+  __smp_locks = .;</div><div class='add'>+  .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {</div><div class='add'>+	*(.smp_locks)</div><div class='add'>+  }</div><div class='add'>+  __smp_locks_end = .;</div><div class='add'>+  .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) {</div><div class='add'>+	*(.smp_altinstr_replacement)</div><div class='add'>+  }</div><div class='add'>+  . = ALIGN(4096);</div><div class='add'>+  __smp_alt_end = .;</div><div class='add'>+</div><div class='ctx'>   . = ALIGN(4096);		/* Init code and data */</div><div class='ctx'>   __init_begin = .;</div><div class='ctx'>   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {</div><div class='head'>diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c<br/>index 9468fb20b0bc..f603037df162 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/vsyscall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/vsyscall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/vsyscall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/vsyscall.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static __always_inline long time_syscall(long *t)</div><div class='ctx'> </div><div class='ctx'> int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!__sysctl_vsyscall))</div><div class='add'>+	if (!__sysctl_vsyscall)</div><div class='ctx'> 		return gettimeofday(tv,tz);</div><div class='ctx'> 	if (tv)</div><div class='ctx'> 		do_vgettimeofday(tv);</div><div class='hunk'>@@ -120,7 +120,7 @@ int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)</div><div class='ctx'>  * unlikely */</div><div class='ctx'> time_t __vsyscall(1) vtime(time_t *t)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(!__sysctl_vsyscall))</div><div class='add'>+	if (!__sysctl_vsyscall)</div><div class='ctx'> 		return time_syscall(t);</div><div class='ctx'> 	else if (t)</div><div class='ctx'> 		*t = __xtime.tv_sec;		</div><div class='head'>diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c<br/>index 1def21c9f7cd..370952c4ff22 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/x8664_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/kernel/x8664_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/kernel/x8664_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/kernel/x8664_ksyms.c</a></div><div class='hunk'>@@ -1,66 +1,21 @@</div><div class='add'>+/* Exports for assembly files.</div><div class='add'>+   All C exports should go in the respective C files. */</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/user.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/in6.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/apm_bios.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/syscalls.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/i387.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/checksum.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/delay.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/mmx.h&gt;</div><div class='del'>-#include &lt;asm/desc.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/pgalloc.h&gt;</div><div class='del'>-#include &lt;asm/nmi.h&gt;</div><div class='del'>-#include &lt;asm/kdebug.h&gt;</div><div class='del'>-#include &lt;asm/unistd.h&gt;</div><div class='del'>-#include &lt;asm/tlbflush.h&gt;</div><div class='del'>-#include &lt;asm/kdebug.h&gt;</div><div class='del'>-</div><div class='del'>-extern spinlock_t rtc_lock;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-extern void __write_lock_failed(rwlock_t *rw);</div><div class='del'>-extern void __read_lock_failed(rwlock_t *rw);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* platform dependent support */</div><div class='del'>-EXPORT_SYMBOL(boot_cpu_data);</div><div class='del'>-//EXPORT_SYMBOL(dump_fpu);</div><div class='del'>-EXPORT_SYMBOL(__ioremap);</div><div class='del'>-EXPORT_SYMBOL(ioremap_nocache);</div><div class='del'>-EXPORT_SYMBOL(iounmap);</div><div class='ctx'> EXPORT_SYMBOL(kernel_thread);</div><div class='del'>-EXPORT_SYMBOL(pm_idle);</div><div class='del'>-EXPORT_SYMBOL(pm_power_off);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__down_failed);</div><div class='ctx'> EXPORT_SYMBOL(__down_failed_interruptible);</div><div class='ctx'> EXPORT_SYMBOL(__down_failed_trylock);</div><div class='ctx'> EXPORT_SYMBOL(__up_wakeup);</div><div class='del'>-/* Networking helper routines. */</div><div class='del'>-EXPORT_SYMBOL(csum_partial_copy_nocheck);</div><div class='del'>-EXPORT_SYMBOL(ip_compute_csum);</div><div class='del'>-/* Delay loops */</div><div class='del'>-EXPORT_SYMBOL(__udelay);</div><div class='del'>-EXPORT_SYMBOL(__ndelay);</div><div class='del'>-EXPORT_SYMBOL(__delay);</div><div class='del'>-EXPORT_SYMBOL(__const_udelay);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__get_user_1);</div><div class='ctx'> EXPORT_SYMBOL(__get_user_2);</div><div class='hunk'>@@ -71,42 +26,20 @@ EXPORT_SYMBOL(__put_user_2);</div><div class='ctx'> EXPORT_SYMBOL(__put_user_4);</div><div class='ctx'> EXPORT_SYMBOL(__put_user_8);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(strncpy_from_user);</div><div class='del'>-EXPORT_SYMBOL(__strncpy_from_user);</div><div class='del'>-EXPORT_SYMBOL(clear_user);</div><div class='del'>-EXPORT_SYMBOL(__clear_user);</div><div class='ctx'> EXPORT_SYMBOL(copy_user_generic);</div><div class='ctx'> EXPORT_SYMBOL(copy_from_user);</div><div class='ctx'> EXPORT_SYMBOL(copy_to_user);</div><div class='del'>-EXPORT_SYMBOL(copy_in_user);</div><div class='del'>-EXPORT_SYMBOL(strnlen_user);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-EXPORT_SYMBOL(pci_mem_start);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(copy_page);</div><div class='ctx'> EXPORT_SYMBOL(clear_page);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(_cpu_pda);</div><div class='ctx'> #ifdef CONFIG_SMP</div><div class='del'>-EXPORT_SYMBOL(cpu_data);</div><div class='add'>+extern void FASTCALL( __write_lock_failed(rwlock_t *rw));</div><div class='add'>+extern void FASTCALL( __read_lock_failed(rwlock_t *rw));</div><div class='ctx'> EXPORT_SYMBOL(__write_lock_failed);</div><div class='ctx'> EXPORT_SYMBOL(__read_lock_failed);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(smp_call_function);</div><div class='del'>-EXPORT_SYMBOL(cpu_callout_map);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_VT</div><div class='del'>-EXPORT_SYMBOL(screen_info);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(rtc_lock);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(set_nmi_callback);</div><div class='del'>-EXPORT_SYMBOL_GPL(unset_nmi_callback);</div><div class='del'>-</div><div class='ctx'> /* Export string functions. We normally rely on gcc builtin for most of these,</div><div class='ctx'>    but gcc sometimes decides not to inline them. */    </div><div class='ctx'> #undef memcpy</div><div class='hunk'>@@ -114,51 +47,14 @@ EXPORT_SYMBOL_GPL(unset_nmi_callback);</div><div class='ctx'> #undef memmove</div><div class='ctx'> </div><div class='ctx'> extern void * memset(void *,int,__kernel_size_t);</div><div class='del'>-extern size_t strlen(const char *);</div><div class='del'>-extern void * memmove(void * dest,const void *src,size_t count);</div><div class='ctx'> extern void * memcpy(void *,const void *,__kernel_size_t);</div><div class='ctx'> extern void * __memcpy(void *,const void *,__kernel_size_t);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(memset);</div><div class='del'>-EXPORT_SYMBOL(memmove);</div><div class='ctx'> EXPORT_SYMBOL(memcpy);</div><div class='ctx'> EXPORT_SYMBOL(__memcpy);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM</div><div class='del'>-/* prototypes are wrong, these are assembly with custom calling functions */</div><div class='del'>-extern void rwsem_down_read_failed_thunk(void);</div><div class='del'>-extern void rwsem_wake_thunk(void);</div><div class='del'>-extern void rwsem_downgrade_thunk(void);</div><div class='del'>-extern void rwsem_down_write_failed_thunk(void);</div><div class='del'>-EXPORT_SYMBOL(rwsem_down_read_failed_thunk);</div><div class='del'>-EXPORT_SYMBOL(rwsem_wake_thunk);</div><div class='del'>-EXPORT_SYMBOL(rwsem_downgrade_thunk);</div><div class='del'>-EXPORT_SYMBOL(rwsem_down_write_failed_thunk);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(empty_zero_page);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(die_chain);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-EXPORT_SYMBOL(cpu_sibling_map);</div><div class='del'>-EXPORT_SYMBOL(smp_num_siblings);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BUG</div><div class='del'>-EXPORT_SYMBOL(out_of_line_bug);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(init_level4_pgt);</div><div class='del'>-</div><div class='del'>-extern unsigned long __supported_pte_mask;</div><div class='del'>-EXPORT_SYMBOL(__supported_pte_mask);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SMP</div><div class='del'>-EXPORT_SYMBOL(flush_tlb_page);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(cpu_khz);</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(load_gs_index);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/lib/csum-partial.c b/arch/x86_64/lib/csum-partial.c<br/>index 5384e227cdf6..c493735218da 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/lib/csum-partial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/csum-partial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/lib/csum-partial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/lib/csum-partial.c</a></div><div class='hunk'>@@ -147,4 +147,5 @@ unsigned short ip_compute_csum(unsigned char * buff, int len)</div><div class='ctx'> {</div><div class='ctx'> 	return csum_fold(csum_partial(buff,len,0));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ip_compute_csum);</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/lib/csum-wrappers.c b/arch/x86_64/lib/csum-wrappers.c<br/>index 94323f20816e..b1320ec58428 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/lib/csum-wrappers.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/csum-wrappers.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/lib/csum-wrappers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/lib/csum-wrappers.c</a></div><div class='hunk'>@@ -109,6 +109,7 @@ csum_partial_copy_nocheck(const unsigned char *src, unsigned char *dst, int len,</div><div class='ctx'> { </div><div class='ctx'> 	return csum_partial_copy_generic(src,dst,len,sum,NULL,NULL);</div><div class='ctx'> } </div><div class='add'>+EXPORT_SYMBOL(csum_partial_copy_nocheck);</div><div class='ctx'> </div><div class='ctx'> unsigned short csum_ipv6_magic(struct in6_addr *saddr, struct in6_addr *daddr,</div><div class='ctx'> 			       __u32 len, unsigned short proto, unsigned int sum) </div><div class='head'>diff --git a/arch/x86_64/lib/delay.c b/arch/x86_64/lib/delay.c<br/>index 03c460cbdd1c..b6cd3cca2f45 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/lib/delay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/delay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/lib/delay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/lib/delay.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='hunk'>@@ -36,18 +37,22 @@ void __delay(unsigned long loops)</div><div class='ctx'> 	}</div><div class='ctx'> 	while((now-bclock) &lt; loops);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__delay);</div><div class='ctx'> </div><div class='ctx'> inline void __const_udelay(unsigned long xloops)</div><div class='ctx'> {</div><div class='ctx'> 	__delay((xloops * HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) &gt;&gt; 32);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__const_udelay);</div><div class='ctx'> </div><div class='ctx'> void __udelay(unsigned long usecs)</div><div class='ctx'> {</div><div class='ctx'> 	__const_udelay(usecs * 0x000010c6);  /* 2**32 / 1000000 */</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__udelay);</div><div class='ctx'> </div><div class='ctx'> void __ndelay(unsigned long nsecs)</div><div class='ctx'> {</div><div class='ctx'> 	__const_udelay(nsecs * 0x00005);  /* 2**32 / 1000000000 (rounded up) */</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__ndelay);</div><div class='head'>diff --git a/arch/x86_64/lib/memmove.c b/arch/x86_64/lib/memmove.c<br/>index e93d5255fdc9..751ebae8ec42 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/lib/memmove.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/memmove.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/lib/memmove.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/lib/memmove.c</a></div><div class='hunk'>@@ -3,12 +3,13 @@</div><div class='ctx'>  */</div><div class='ctx'> #define _STRING_C</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef memmove</div><div class='ctx'> void *memmove(void * dest,const void *src,size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	if (dest &lt; src) { </div><div class='del'>-		__inline_memcpy(dest,src,count);</div><div class='add'>+		return memcpy(dest,src,count);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		char *p = (char *) dest + count;</div><div class='ctx'> 		char *s = (char *) src + count;</div><div class='hunk'>@@ -17,3 +18,4 @@ void *memmove(void * dest,const void *src,size_t count)</div><div class='ctx'> 	}</div><div class='ctx'> 	return dest;</div><div class='ctx'> } </div><div class='add'>+EXPORT_SYMBOL(memmove);</div><div class='head'>diff --git a/arch/x86_64/lib/thunk.S b/arch/x86_64/lib/thunk.S<br/>index e49af0032e94..332ea5dff916 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/lib/thunk.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/thunk.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/lib/thunk.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/lib/thunk.S</a></div><div class='hunk'>@@ -47,6 +47,11 @@</div><div class='ctx'> 	thunk_retrax __down_failed_interruptible,__down_interruptible</div><div class='ctx'> 	thunk_retrax __down_failed_trylock,__down_trylock</div><div class='ctx'> 	thunk __up_wakeup,__up</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_TRACE_IRQFLAGS</div><div class='add'>+	thunk trace_hardirqs_on_thunk,trace_hardirqs_on</div><div class='add'>+	thunk trace_hardirqs_off_thunk,trace_hardirqs_off</div><div class='add'>+#endif</div><div class='ctx'> 	</div><div class='ctx'> 	/* SAVE_ARGS below is used only for the .cfi directives it contains. */</div><div class='ctx'> 	CFI_STARTPROC</div><div class='head'>diff --git a/arch/x86_64/lib/usercopy.c b/arch/x86_64/lib/usercopy.c<br/>index 9bc2c295818e..893d43f838cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/lib/usercopy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/lib/usercopy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/lib/usercopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/lib/usercopy.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  * Copyright 1997 Linus Torvalds</div><div class='ctx'>  * Copyright 2002 Andi Kleen &lt;ak@suse.de&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -47,15 +48,17 @@ __strncpy_from_user(char *dst, const char __user *src, long count)</div><div class='ctx'> 	__do_strncpy_from_user(dst, src, count, res);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__strncpy_from_user);</div><div class='ctx'> </div><div class='ctx'> long</div><div class='ctx'> strncpy_from_user(char *dst, const char __user *src, long count)</div><div class='ctx'> {</div><div class='ctx'> 	long res = -EFAULT;</div><div class='ctx'> 	if (access_ok(VERIFY_READ, src, 1))</div><div class='del'>-		__do_strncpy_from_user(dst, src, count, res);</div><div class='add'>+		return __strncpy_from_user(dst, src, count);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(strncpy_from_user);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Zero Userspace</div><div class='hunk'>@@ -94,7 +97,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)</div><div class='ctx'> 		  [zero] "r" (0UL), [eight] "r" (8UL));</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL(__clear_user);</div><div class='ctx'> </div><div class='ctx'> unsigned long clear_user(void __user *to, unsigned long n)</div><div class='ctx'> {</div><div class='hunk'>@@ -102,6 +105,7 @@ unsigned long clear_user(void __user *to, unsigned long n)</div><div class='ctx'> 		return __clear_user(to, n);</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(clear_user);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return the size of a string (including the ending 0)</div><div class='hunk'>@@ -125,6 +129,7 @@ long __strnlen_user(const char __user *s, long n)</div><div class='ctx'> 		s++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__strnlen_user);</div><div class='ctx'> </div><div class='ctx'> long strnlen_user(const char __user *s, long n)</div><div class='ctx'> {</div><div class='hunk'>@@ -132,6 +137,7 @@ long strnlen_user(const char __user *s, long n)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return __strnlen_user(s, n);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(strnlen_user);</div><div class='ctx'> </div><div class='ctx'> long strlen_user(const char __user *s)</div><div class='ctx'> {</div><div class='hunk'>@@ -147,6 +153,7 @@ long strlen_user(const char __user *s)</div><div class='ctx'> 		s++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(strlen_user);</div><div class='ctx'> </div><div class='ctx'> unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,3 +162,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from, unsigned le</div><div class='ctx'> 	} </div><div class='ctx'> 	return len;		</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(copy_in_user);</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86_64/mm/extable.c b/arch/x86_64/mm/extable.c<br/>index 2d78f9fb4035..79ac6e7100af 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/extable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/extable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/extable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/extable.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/arch/x86_64/mm/extable.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c<br/>index 55250593d8c9..ac8ea66ccb94 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/fault.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/fault.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/fault.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/fault.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *  Copyright (C) 2001,2002 Andi Kleen, SuSE Labs.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -41,6 +40,41 @@</div><div class='ctx'> #define PF_RSVD	(1&lt;&lt;3)</div><div class='ctx'> #define PF_INSTR	(1&lt;&lt;4)</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_KPROBES</div><div class='add'>+ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain);</div><div class='add'>+</div><div class='add'>+/* Hook to register for page fault notifications */</div><div class='add'>+int register_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	vmalloc_sync_all();</div><div class='add'>+	return atomic_notifier_chain_register(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int unregister_page_fault_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_unregister(&amp;notify_page_fault_chain, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	struct die_args args = {</div><div class='add'>+		.regs = regs,</div><div class='add'>+		.str = str,</div><div class='add'>+		.err = err,</div><div class='add'>+		.trapnr = trap,</div><div class='add'>+		.signr = sig</div><div class='add'>+	};</div><div class='add'>+	return atomic_notifier_call_chain(&amp;notify_page_fault_chain, val, &amp;args);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int notify_page_fault(enum die_val val, const char *str,</div><div class='add'>+			struct pt_regs *regs, long err, int trap, int sig)</div><div class='add'>+{</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> void bust_spinlocks(int yes)</div><div class='ctx'> {</div><div class='ctx'> 	int loglevel_save = console_loglevel;</div><div class='hunk'>@@ -160,7 +194,7 @@ void dump_pagetable(unsigned long address)</div><div class='ctx'> 	printk("PGD %lx ", pgd_val(*pgd));</div><div class='ctx'> 	if (!pgd_present(*pgd)) goto ret; </div><div class='ctx'> </div><div class='del'>-	pud = __pud_offset_k((pud_t *)pgd_page(*pgd), address);</div><div class='add'>+	pud = pud_offset(pgd, address);</div><div class='ctx'> 	if (bad_address(pud)) goto bad;</div><div class='ctx'> 	printk("PUD %lx ", pud_val(*pud));</div><div class='ctx'> 	if (!pud_present(*pud))	goto ret;</div><div class='hunk'>@@ -348,7 +382,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 			if (vmalloc_fault(address) &gt;= 0)</div><div class='ctx'> 				return;</div><div class='ctx'> 		}</div><div class='del'>-		if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='add'>+		if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='ctx'> 						SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 			return;</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -358,7 +392,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 		goto bad_area_nosemaphore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='add'>+	if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,</div><div class='ctx'> 					SIGSEGV) == NOTIFY_STOP)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +417,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 	/* When running in the kernel we expect faults to occur only to</div><div class='ctx'> 	 * addresses in user space.  All other faults represent errors in the</div><div class='ctx'> 	 * kernel and should generate an OOPS.  Unfortunatly, in the case of an</div><div class='del'>-	 * erroneous fault occuring in a code path which already holds mmap_sem</div><div class='add'>+	 * erroneous fault occurring in a code path which already holds mmap_sem</div><div class='ctx'> 	 * we will deadlock attempting to validate the fault against the</div><div class='ctx'> 	 * address space.  Luckily the kernel only validly references user</div><div class='ctx'> 	 * space from well defined areas of code, which are listed in the</div><div class='hunk'>@@ -410,8 +444,10 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,</div><div class='ctx'> 	if (!(vma-&gt;vm_flags &amp; VM_GROWSDOWN))</div><div class='ctx'> 		goto bad_area;</div><div class='ctx'> 	if (error_code &amp; 4) {</div><div class='del'>-		// XXX: align red zone size with ABI </div><div class='del'>-		if (address + 128 &lt; regs-&gt;rsp)</div><div class='add'>+		/* Allow userspace just enough access below the stack pointer</div><div class='add'>+		 * to let the 'enter' instruction work.</div><div class='add'>+		 */</div><div class='add'>+		if (address + 65536 + 32 * sizeof(unsigned long) &lt; regs-&gt;rsp)</div><div class='ctx'> 			goto bad_area;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (expand_stack(vma, address))</div><div class='hunk'>@@ -534,7 +570,6 @@ no_context:</div><div class='ctx'> 		printk(KERN_ALERT "Unable to handle kernel paging request");</div><div class='ctx'> 	printk(" at %016lx RIP: \n" KERN_ALERT,address);</div><div class='ctx'> 	printk_address(regs-&gt;rip);</div><div class='del'>-	printk("\n");</div><div class='ctx'> 	dump_pagetable(address);</div><div class='ctx'> 	tsk-&gt;thread.cr2 = address;</div><div class='ctx'> 	tsk-&gt;thread.trap_no = 14;</div><div class='head'>diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c<br/>index 4ba34e95d835..d14fb2dfbfc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/init.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *  Copyright (C) 2002,2003 Andi Kleen &lt;ak@suse.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -23,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/memory_hotplug.h&gt;</div><div class='hunk'>@@ -41,8 +41,6 @@</div><div class='ctx'> #include &lt;asm/proto.h&gt;</div><div class='ctx'> #include &lt;asm/smp.h&gt;</div><div class='ctx'> #include &lt;asm/sections.h&gt;</div><div class='del'>-#include &lt;asm/dma-mapping.h&gt;</div><div class='del'>-#include &lt;asm/swiotlb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef Dprintk</div><div class='ctx'> #define Dprintk(x...)</div><div class='hunk'>@@ -90,8 +88,6 @@ void show_mem(void)</div><div class='ctx'> 	printk(KERN_INFO "%lu pages swap cached\n",cached);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* References to section boundaries */</div><div class='del'>-</div><div class='ctx'> int after_bootmem;</div><div class='ctx'> </div><div class='ctx'> static __init void *spp_getpage(void)</div><div class='hunk'>@@ -261,9 +257,10 @@ phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)</div><div class='ctx'> 	for (i = 0; i &lt; PTRS_PER_PMD; pmd++, i++, address += PMD_SIZE) {</div><div class='ctx'> 		unsigned long entry;</div><div class='ctx'> </div><div class='del'>-		if (address &gt; end) {</div><div class='del'>-			for (; i &lt; PTRS_PER_PMD; i++, pmd++)</div><div class='del'>-				set_pmd(pmd, __pmd(0));</div><div class='add'>+		if (address &gt;= end) {</div><div class='add'>+			if (!after_bootmem)</div><div class='add'>+				for (; i &lt; PTRS_PER_PMD; i++, pmd++)</div><div class='add'>+					set_pmd(pmd, __pmd(0));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address;</div><div class='hunk'>@@ -341,7 +338,8 @@ static void __init find_early_table_space(unsigned long end)</div><div class='ctx'> 	table_end = table_start;</div><div class='ctx'> </div><div class='ctx'> 	early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n",</div><div class='del'>-		end, table_start &lt;&lt; PAGE_SHIFT, table_end &lt;&lt; PAGE_SHIFT);</div><div class='add'>+		end, table_start &lt;&lt; PAGE_SHIFT,</div><div class='add'>+		(table_start &lt;&lt; PAGE_SHIFT) + tables);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Setup the direct mapping of the physical memory at PAGE_OFFSET.</div><div class='hunk'>@@ -372,7 +370,7 @@ void __meminit init_memory_mapping(unsigned long start, unsigned long end)</div><div class='ctx'> 		pud_t *pud;</div><div class='ctx'> </div><div class='ctx'> 		if (after_bootmem)</div><div class='del'>-			pud = pud_offset_k(pgd, start &amp; PGDIR_MASK);</div><div class='add'>+			pud = pud_offset(pgd, start &amp; PGDIR_MASK);</div><div class='ctx'> 		else</div><div class='ctx'> 			pud = alloc_low_page(&amp;map, &amp;pud_phys);</div><div class='ctx'> </div><div class='hunk'>@@ -508,8 +506,6 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)</div><div class='ctx'> /*</div><div class='ctx'>  * Memory hotplug specific functions</div><div class='ctx'>  */</div><div class='del'>-#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)</div><div class='del'>-</div><div class='ctx'> void online_page(struct page *page)</div><div class='ctx'> {</div><div class='ctx'> 	ClearPageReserved(page);</div><div class='hunk'>@@ -519,31 +515,17 @@ void online_page(struct page *page)</div><div class='ctx'> 	num_physpages++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_MEMORY_HOTPLUG</div><div class='add'>+#ifdef CONFIG_MEMORY_HOTPLUG</div><div class='ctx'> /*</div><div class='del'>- * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,</div><div class='del'>- * just online the pages.</div><div class='add'>+ * XXX: memory_add_physaddr_to_nid() is to find node id from physical address</div><div class='add'>+ *	via probe interface of sysfs. If acpi notifies hot-add event, then it</div><div class='add'>+ *	can tell node id by searching dsdt. But, probe interface doesn't have</div><div class='add'>+ *	node id. So, return 0 as node id at this time.</div><div class='ctx'>  */</div><div class='del'>-int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)</div><div class='add'>+#ifdef CONFIG_NUMA</div><div class='add'>+int memory_add_physaddr_to_nid(u64 start)</div><div class='ctx'> {</div><div class='del'>-	int err = -EIO;</div><div class='del'>-	unsigned long pfn;</div><div class='del'>-	unsigned long total = 0, mem = 0;</div><div class='del'>-	for (pfn = start_pfn; pfn &lt; start_pfn + nr_pages; pfn++) {</div><div class='del'>-		if (pfn_valid(pfn)) {</div><div class='del'>-			online_page(pfn_to_page(pfn));</div><div class='del'>-			err = 0;</div><div class='del'>-			mem++;</div><div class='del'>-		}</div><div class='del'>-		total++;</div><div class='del'>-	}</div><div class='del'>-	if (!err) {</div><div class='del'>-		z-&gt;spanned_pages += total;</div><div class='del'>-		z-&gt;present_pages += mem;</div><div class='del'>-		z-&gt;zone_pgdat-&gt;node_spanned_pages += total;</div><div class='del'>-		z-&gt;zone_pgdat-&gt;node_present_pages += mem;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -551,9 +533,9 @@ int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)</div><div class='ctx'>  * Memory is added always to NORMAL zone. This means you will never get</div><div class='ctx'>  * additional DMA/DMA32 memory.</div><div class='ctx'>  */</div><div class='del'>-int add_memory(u64 start, u64 size)</div><div class='add'>+int arch_add_memory(int nid, u64 start, u64 size)</div><div class='ctx'> {</div><div class='del'>-	struct pglist_data *pgdat = NODE_DATA(0);</div><div class='add'>+	struct pglist_data *pgdat = NODE_DATA(nid);</div><div class='ctx'> 	struct zone *zone = pgdat-&gt;node_zones + MAX_NR_ZONES-2;</div><div class='ctx'> 	unsigned long start_pfn = start &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	unsigned long nr_pages = size &gt;&gt; PAGE_SHIFT;</div><div class='hunk'>@@ -570,7 +552,7 @@ error:</div><div class='ctx'> 	printk("%s: Problem encountered in __add_pages!\n", __func__);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(add_memory);</div><div class='add'>+EXPORT_SYMBOL_GPL(arch_add_memory);</div><div class='ctx'> </div><div class='ctx'> int remove_memory(u64 start, u64 size)</div><div class='ctx'> {</div><div class='hunk'>@@ -578,7 +560,33 @@ int remove_memory(u64 start, u64 size)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(remove_memory);</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+#else /* CONFIG_MEMORY_HOTPLUG */</div><div class='add'>+/*</div><div class='add'>+ * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,</div><div class='add'>+ * just online the pages.</div><div class='add'>+ */</div><div class='add'>+int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)</div><div class='add'>+{</div><div class='add'>+	int err = -EIO;</div><div class='add'>+	unsigned long pfn;</div><div class='add'>+	unsigned long total = 0, mem = 0;</div><div class='add'>+	for (pfn = start_pfn; pfn &lt; start_pfn + nr_pages; pfn++) {</div><div class='add'>+		if (pfn_valid(pfn)) {</div><div class='add'>+			online_page(pfn_to_page(pfn));</div><div class='add'>+			err = 0;</div><div class='add'>+			mem++;</div><div class='add'>+		}</div><div class='add'>+		total++;</div><div class='add'>+	}</div><div class='add'>+	if (!err) {</div><div class='add'>+		z-&gt;spanned_pages += total;</div><div class='add'>+		z-&gt;present_pages += mem;</div><div class='add'>+		z-&gt;zone_pgdat-&gt;node_spanned_pages += total;</div><div class='add'>+		z-&gt;zone_pgdat-&gt;node_present_pages += mem;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_MEMORY_HOTPLUG */</div><div class='ctx'> </div><div class='ctx'> static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,</div><div class='ctx'> 			 kcore_vsyscall;</div><div class='hunk'>@@ -587,10 +595,7 @@ void __init mem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	long codesize, reservedpages, datasize, initsize;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SWIOTLB</div><div class='del'>-	pci_swiotlb_init();</div><div class='del'>-#endif</div><div class='del'>-	no_iommu_init();</div><div class='add'>+	pci_iommu_alloc();</div><div class='ctx'> </div><div class='ctx'> 	/* How many end-of-memory variables you have, grandma! */</div><div class='ctx'> 	max_low_pfn = end_pfn;</div><div class='hunk'>@@ -644,34 +649,44 @@ void __init mem_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void free_initmem(void)</div><div class='add'>+void free_init_pages(char *what, unsigned long begin, unsigned long end)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='del'>-	addr = (unsigned long)(&amp;__init_begin);</div><div class='del'>-	for (; addr &lt; (unsigned long)(&amp;__init_end); addr += PAGE_SIZE) {</div><div class='add'>+	if (begin &gt;= end)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) &gt;&gt; 10);</div><div class='add'>+	for (addr = begin; addr &lt; end; addr += PAGE_SIZE) {</div><div class='ctx'> 		ClearPageReserved(virt_to_page(addr));</div><div class='ctx'> 		init_page_count(virt_to_page(addr));</div><div class='del'>-		memset((void *)(addr &amp; ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); </div><div class='add'>+		memset((void *)(addr &amp; ~(PAGE_SIZE-1)),</div><div class='add'>+			POISON_FREE_INITMEM, PAGE_SIZE);</div><div class='ctx'> 		free_page(addr);</div><div class='ctx'> 		totalram_pages++;</div><div class='ctx'> 	}</div><div class='del'>-	memset(__initdata_begin, 0xba, __initdata_end - __initdata_begin);</div><div class='del'>-	printk ("Freeing unused kernel memory: %luk freed\n", (__init_end - __init_begin) &gt;&gt; 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_initmem(void)</div><div class='add'>+{</div><div class='add'>+	memset(__initdata_begin, POISON_FREE_INITDATA,</div><div class='add'>+		__initdata_end - __initdata_begin);</div><div class='add'>+	free_init_pages("unused kernel memory",</div><div class='add'>+			(unsigned long)(&amp;__init_begin),</div><div class='add'>+			(unsigned long)(&amp;__init_end));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_RODATA</div><div class='ctx'> </div><div class='del'>-extern char __start_rodata, __end_rodata;</div><div class='ctx'> void mark_rodata_ro(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long addr = (unsigned long)&amp;__start_rodata;</div><div class='add'>+	unsigned long addr = (unsigned long)__start_rodata;</div><div class='ctx'> </div><div class='del'>-	for (; addr &lt; (unsigned long)&amp;__end_rodata; addr += PAGE_SIZE)</div><div class='add'>+	for (; addr &lt; (unsigned long)__end_rodata; addr += PAGE_SIZE)</div><div class='ctx'> 		change_page_attr_addr(addr, 1, PAGE_KERNEL_RO);</div><div class='ctx'> </div><div class='ctx'> 	printk ("Write protecting the kernel read-only data: %luk\n",</div><div class='del'>-			(&amp;__end_rodata - &amp;__start_rodata) &gt;&gt; 10);</div><div class='add'>+			(__end_rodata - __start_rodata) &gt;&gt; 10);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * change_page_attr_addr() requires a global_flush_tlb() call after it.</div><div class='hunk'>@@ -686,15 +701,7 @@ void mark_rodata_ro(void)</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_INITRD</div><div class='ctx'> void free_initrd_mem(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='del'>-	if (start &gt;= end)</div><div class='del'>-		return;</div><div class='del'>-	printk ("Freeing initrd memory: %ldk freed\n", (end - start) &gt;&gt; 10);</div><div class='del'>-	for (; start &lt; end; start += PAGE_SIZE) {</div><div class='del'>-		ClearPageReserved(virt_to_page(start));</div><div class='del'>-		init_page_count(virt_to_page(start));</div><div class='del'>-		free_page(start);</div><div class='del'>-		totalram_pages++;</div><div class='del'>-	}</div><div class='add'>+	free_init_pages("initrd memory", start, end);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c<br/>index ae207064201e..45d7d823c3b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/ioremap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/ioremap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/ioremap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/ioremap.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/pgalloc.h&gt;</div><div class='ctx'> #include &lt;asm/fixmap.h&gt;</div><div class='hunk'>@@ -219,6 +220,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l</div><div class='ctx'> 	}</div><div class='ctx'> 	return (__force void __iomem *) (offset + (char *)addr);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__ioremap);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ioremap_nocache     -   map bus memory into CPU space</div><div class='hunk'>@@ -246,6 +248,7 @@ void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	return __ioremap(phys_addr, size, _PAGE_PCD);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(ioremap_nocache);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iounmap - Free a IO remapping</div><div class='hunk'>@@ -291,3 +294,5 @@ void iounmap(volatile void __iomem *addr)</div><div class='ctx'> 	BUG_ON(p != o || o == NULL);</div><div class='ctx'> 	kfree(p); </div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(iounmap);</div><div class='add'>+</div><div class='head'>diff --git a/arch/x86_64/mm/mmap.c b/arch/x86_64/mm/mmap.c<br/>index 43e9b99bdf25..80bba0dc000e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/mmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/mmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/mmap.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /* Copyright 2005 Andi Kleen, SuSE Labs.</div><div class='ctx'>  * Licensed under GPL, v.2</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='head'>diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c<br/>index 531ad21447b1..2685b1f3671c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/pageattr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/pageattr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/pageattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/pageattr.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Thanks to Ben LaHaise for precious feedback.</div><div class='ctx'>  */ </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='head'>diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c<br/>index 474df22c6ed2..502fce65e96a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/mm/srat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/mm/srat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/mm/srat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/mm/srat.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> static struct acpi_table_slit *acpi_slit;</div><div class='ctx'> </div><div class='ctx'> static nodemask_t nodes_parsed __initdata;</div><div class='del'>-static nodemask_t nodes_found __initdata;</div><div class='ctx'> static struct bootnode nodes[MAX_NUMNODES] __initdata;</div><div class='ctx'> static struct bootnode nodes_add[MAX_NUMNODES] __initdata;</div><div class='ctx'> static int found_add_area __initdata;</div><div class='hunk'>@@ -38,33 +37,14 @@ int hotadd_percent __initdata = 0;</div><div class='ctx'> #ifndef RESERVE_HOTADD</div><div class='ctx'> #define hotadd_percent 0	/* Ignore all settings */</div><div class='ctx'> #endif</div><div class='del'>-static u8 pxm2node[256] = { [0 ... 255] = 0xff };</div><div class='ctx'> </div><div class='ctx'> /* Too small nodes confuse the VM badly. Usually they result</div><div class='ctx'>    from BIOS bugs. */</div><div class='ctx'> #define NODE_MIN_SIZE (4*1024*1024)</div><div class='ctx'> </div><div class='del'>-static int node_to_pxm(int n);</div><div class='del'>-</div><div class='del'>-int pxm_to_node(int pxm)</div><div class='del'>-{</div><div class='del'>-	if ((unsigned)pxm &gt;= 256)</div><div class='del'>-		return -1;</div><div class='del'>-	/* Extend 0xff to (int)-1 */</div><div class='del'>-	return (signed char)pxm2node[pxm];</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static __init int setup_node(int pxm)</div><div class='ctx'> {</div><div class='del'>-	unsigned node = pxm2node[pxm];</div><div class='del'>-	if (node == 0xff) {</div><div class='del'>-		if (nodes_weight(nodes_found) &gt;= MAX_NUMNODES)</div><div class='del'>-			return -1;</div><div class='del'>-		node = first_unset_node(nodes_found); </div><div class='del'>-		node_set(node, nodes_found);</div><div class='del'>-		pxm2node[pxm] = node;</div><div class='del'>-	}</div><div class='del'>-	return pxm2node[pxm];</div><div class='add'>+	return acpi_map_pxm_to_node(pxm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __init int conflicting_nodes(unsigned long start, unsigned long end)</div><div class='hunk'>@@ -440,17 +420,6 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int node_to_pxm(int n)</div><div class='del'>-{</div><div class='del'>-       int i;</div><div class='del'>-       if (pxm2node[n] == n)</div><div class='del'>-               return n;</div><div class='del'>-       for (i = 0; i &lt; 256; i++)</div><div class='del'>-               if (pxm2node[i] == n)</div><div class='del'>-                       return i;</div><div class='del'>-       return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void __init srat_reserve_add_area(int nodeid)</div><div class='ctx'> {</div><div class='ctx'> 	if (found_add_area &amp;&amp; nodes_add[nodeid].end) {</div><div class='head'>diff --git a/arch/x86_64/pci/k8-bus.c b/arch/x86_64/pci/k8-bus.c<br/>index 3acf60ded2a0..b50a7c7c47f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/pci/k8-bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/pci/k8-bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/pci/k8-bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/pci/k8-bus.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/mpspec.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='add'>+#include &lt;asm/k8.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This discovers the pcibus &lt;-&gt; node mapping on AMD K8.</div><div class='hunk'>@@ -18,7 +19,6 @@</div><div class='ctx'> #define NR_LDT_BUS_NUMBER_REGISTERS 3</div><div class='ctx'> #define SECONDARY_LDT_BUS_NUMBER(dword) ((dword &gt;&gt; 8) &amp; 0xFF)</div><div class='ctx'> #define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword &gt;&gt; 16) &amp; 0xFF)</div><div class='del'>-#define PCI_DEVICE_ID_K8HTCONFIG 0x1100</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fill_mp_bus_to_cpumask()</div><div class='hunk'>@@ -28,8 +28,7 @@</div><div class='ctx'> __init static int</div><div class='ctx'> fill_mp_bus_to_cpumask(void)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *nb_dev = NULL;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i, j, k;</div><div class='ctx'> 	u32 ldtbus, nid;</div><div class='ctx'> 	static int lbnr[3] = {</div><div class='ctx'> 		LDT_BUS_NUMBER_REGISTER_0,</div><div class='hunk'>@@ -37,8 +36,9 @@ fill_mp_bus_to_cpumask(void)</div><div class='ctx'> 		LDT_BUS_NUMBER_REGISTER_2</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	while ((nb_dev = pci_get_device(PCI_VENDOR_ID_AMD,</div><div class='del'>-			PCI_DEVICE_ID_K8HTCONFIG, nb_dev))) {</div><div class='add'>+	cache_k8_northbridges();</div><div class='add'>+	for (k = 0; k &lt; num_k8_northbridges; k++) {</div><div class='add'>+		struct pci_dev *nb_dev = k8_northbridges[k];</div><div class='ctx'> 		pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &amp;nid);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; NR_LDT_BUS_NUMBER_REGISTERS; i++) {</div><div class='head'>diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c<br/>index a2060e4d5de6..3c55c76c6fd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/x86_64/pci/mmconfig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/x86_64/pci/mmconfig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/x86_64/pci/mmconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/x86_64/pci/mmconfig.c</a></div><div class='hunk'>@@ -13,7 +13,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='del'>-#define MMCONFIG_APER_SIZE (256*1024*1024)</div><div class='add'>+/* aperture is up to 256MB but BIOS may reserve less */</div><div class='add'>+#define MMCONFIG_APER_MIN	(2 * 1024*1024)</div><div class='add'>+#define MMCONFIG_APER_MAX	(256 * 1024*1024)</div><div class='add'>+</div><div class='ctx'> /* Verify the first 16 busses. We assume that systems with more busses</div><div class='ctx'>    get MCFG right. */</div><div class='ctx'> #define MAX_CHECK_BUS 16</div><div class='hunk'>@@ -175,9 +178,10 @@ void __init pci_mmcfg_init(void)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!e820_all_mapped(pci_mmcfg_config[0].base_address,</div><div class='del'>-			pci_mmcfg_config[0].base_address + MMCONFIG_APER_SIZE,</div><div class='add'>+			pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,</div><div class='ctx'> 			E820_RESERVED)) {</div><div class='del'>-		printk(KERN_ERR "PCI: BIOS Bug: MCFG area is not E820-reserved\n");</div><div class='add'>+		printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",</div><div class='add'>+				pci_mmcfg_config[0].base_address);</div><div class='ctx'> 		printk(KERN_ERR "PCI: Not using MMCONFIG.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -190,7 +194,8 @@ void __init pci_mmcfg_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; pci_mmcfg_config_num; ++i) {</div><div class='ctx'> 		pci_mmcfg_virt[i].cfg = &amp;pci_mmcfg_config[i];</div><div class='del'>-		pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address, MMCONFIG_APER_SIZE);</div><div class='add'>+		pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address,</div><div class='add'>+							 MMCONFIG_APER_MAX);</div><div class='ctx'> 		if (!pci_mmcfg_virt[i].virt) {</div><div class='ctx'> 			printk("PCI: Cannot map mmconfig aperture for segment %d\n",</div><div class='ctx'> 			       pci_mmcfg_config[i].pci_segment_group_number);</div><div class='head'>diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig<br/>index dbeb3504c3c8..848f173db257 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/Kconfig</a></div><div class='hunk'>@@ -34,10 +34,6 @@ config GENERIC_HARDIRQS</div><div class='ctx'> 	bool</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='del'>-config RWSEM_GENERIC_SPINLOCK</div><div class='del'>-       bool</div><div class='del'>-       default y</div><div class='del'>-</div><div class='ctx'> source "init/Kconfig"</div><div class='ctx'> </div><div class='ctx'> menu "Processor type and features"</div><div class='head'>diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile<br/>index 98fac8489aed..3a3a4c66ef87 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/Makefile</a></div><div class='hunk'>@@ -71,7 +71,7 @@ archprepare: $(archinc)/.platform</div><div class='ctx'> # Update machine cpu and platform symlinks if something which affects</div><div class='ctx'> # them changed.</div><div class='ctx'> </div><div class='del'>-$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/MARKER</div><div class='add'>+$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf</div><div class='ctx'> 	@echo '  SYMLINK $(archinc)/xtensa/config -&gt; $(archinc)/xtensa/config-$(CPU)'</div><div class='ctx'> 	$(Q)mkdir -p $(archinc)</div><div class='ctx'> 	$(Q)mkdir -p $(archinc)/xtensa</div><div class='head'>diff --git a/arch/xtensa/boot/boot-elf/bootstrap.S b/arch/xtensa/boot/boot-elf/bootstrap.S<br/>index 7cba94abdab8..f857fc760aa8 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/boot/boot-elf/bootstrap.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/boot/boot-elf/bootstrap.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/boot/boot-elf/bootstrap.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/boot/boot-elf/bootstrap.S</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #include &lt;xtensa/config/specreg.h&gt;</div><div class='ctx'> #include &lt;xtensa/config/core.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/bootparam.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile<br/>index 9e73bb8aeb7a..d3d2aa2d883a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/boot/lib/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/boot/lib/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/boot/lib/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/boot/lib/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # Makefile for some libs needed by zImage.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-zlib	:= infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c</div><div class='add'>+zlib	:= inffast.c inflate.c inftrees.c</div><div class='ctx'> </div><div class='ctx'> lib-y	+= $(zlib:.c=.o) zmem.o</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S<br/>index 356192a4d39d..cf5a93fb6a2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/coprocessor.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/coprocessor.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/coprocessor.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/coprocessor.S</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * assigned when the Xtensa processor is generated.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S<br/>index 5c018c503dfa..89e409e9e0de 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/entry.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/entry.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/entry.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/entry.S</a></div><div class='hunk'>@@ -1102,7 +1102,7 @@ ENTRY(fast_syscall_sysxtensa)</div><div class='ctx'> 	s32i	a7, a2, PT_AREG7</div><div class='ctx'> </div><div class='ctx'> 	movi	a7, 4			# sizeof(unsigned int)</div><div class='del'>-	verify_area a3, a7, a0, a2, .Leac</div><div class='add'>+	access_ok a0, a3, a7, a2, .Leac</div><div class='ctx'> </div><div class='ctx'> 	_beqi	a6, SYSXTENSA_ATOMIC_SET, .Lset</div><div class='ctx'> 	_beqi	a6, SYSXTENSA_ATOMIC_EXG_ADD, .Lexg</div><div class='head'>diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S<br/>index 6e9b5225b8f6..c07cb2522993 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/head.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/head.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/head.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/head.S</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;xtensa/cacheasm.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c<br/>index 51f9bed455fa..1cf744ee0959 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/irq.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ int show_interrupts(struct seq_file *p, void *v)</div><div class='ctx'> 		for_each_online_cpu(j)</div><div class='ctx'> 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);</div><div class='ctx'> #endif</div><div class='del'>-		seq_printf(p, " %14s", irq_desc[i].handler-&gt;typename);</div><div class='add'>+		seq_printf(p, " %14s", irq_desc[i].chip-&gt;typename);</div><div class='ctx'> 		seq_printf(p, "  %s", action-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		for (action=action-&gt;next; action; action = action-&gt;next)</div><div class='hunk'>@@ -181,7 +181,7 @@ void __init init_IRQ(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; XTENSA_NR_IRQS; i++)</div><div class='del'>-		irq_desc[i].handler = &amp;xtensa_irq_type;</div><div class='add'>+		irq_desc[i].chip = &amp;xtensa_irq_type;</div><div class='ctx'> </div><div class='ctx'> 	cached_irq_mask = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c<br/>index de19501aa809..8709f8249d02 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/pci.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -71,13 +70,13 @@ static int pci_bus_count;</div><div class='ctx'>  * which might have be mirrored at 0x0100-0x03ff..</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-pcibios_align_resource(void *data, struct resource *res, unsigned long size,</div><div class='del'>-    		       unsigned long align)</div><div class='add'>+pcibios_align_resource(void *data, struct resource *res, resource_size_t size,</div><div class='add'>+    		       resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = data;</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='del'>-		unsigned long start = res-&gt;start;</div><div class='add'>+		resource_size_t start = res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 		if (size &gt; 0x100) {</div><div class='ctx'> 			printk(KERN_ERR "PCI: I/O Region %s/%d too large"</div><div class='hunk'>@@ -350,17 +349,6 @@ __pci_mmap_make_offset(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Set vm_flags of VMA, as appropriate for this architecture, for a pci device</div><div class='del'>- * mapping.</div><div class='del'>- */</div><div class='del'>-static __inline__ void</div><div class='del'>-__pci_mmap_set_flags(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='del'>-		     enum pci_mmap_state mmap_state)</div><div class='del'>-{</div><div class='del'>-	vma-&gt;vm_flags |= VM_SHM | VM_LOCKED | VM_IO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci</div><div class='ctx'>  * device mapping.</div><div class='ctx'>  */</div><div class='hunk'>@@ -399,7 +387,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	__pci_mmap_set_flags(dev, vma, mmap_state);</div><div class='ctx'> 	__pci_mmap_set_pgprot(dev, vma, mmap_state, write_combine);</div><div class='ctx'> </div><div class='ctx'> 	ret = io_remap_pfn_range(vma, vma-&gt;vm_start, vma-&gt;vm_pgoff,</div><div class='head'>diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c<br/>index a17930747f20..69675f216062 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/platform.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/platform.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Chris Zankel &lt;chris@zankel.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c<br/>index 64a649eb883f..a7c4178c2a8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/process.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/process.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/process.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/process.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Kevin Chea</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c<br/>index 4cc85285a70a..5064d9383963 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/ptrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/ptrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/ptrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/ptrace.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Marc Gauthier&lt;marc@tensilica.com&gt; &lt;marc@alumni.uwaterloo.ca&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c<br/>index 513ed8d67766..82684d05910a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/setup.c</a></div><div class='hunk'>@@ -14,11 +14,10 @@</div><div class='ctx'>  * Marc Gauthier&lt;marc@tensilica.com&gt; &lt;marc@alumni.uwaterloo.ca&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c<br/>index e252b61e45a5..c494f0826fc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/signal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/signal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/signal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/signal.c</a></div><div class='hunk'>@@ -104,7 +104,7 @@ sys_sigaction(int sig, const struct old_sigaction *act,</div><div class='ctx'> </div><div class='ctx'> 	if (act) {</div><div class='ctx'> 		old_sigset_t mask;</div><div class='del'>-		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||</div><div class='add'>+		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||</div><div class='ctx'> 		    __get_user(new_ka.sa.sa_handler, &amp;act-&gt;sa_handler) ||</div><div class='ctx'> 		    __get_user(new_ka.sa.sa_restorer, &amp;act-&gt;sa_restorer))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -116,7 +116,7 @@ sys_sigaction(int sig, const struct old_sigaction *act,</div><div class='ctx'> 	ret = do_sigaction(sig, act ? &amp;new_ka : NULL, oact ? &amp;old_ka : NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; oact) {</div><div class='del'>-		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||</div><div class='add'>+		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||</div><div class='ctx'> 		    __put_user(old_ka.sa.sa_handler, &amp;oact-&gt;sa_handler) ||</div><div class='ctx'> 		    __put_user(old_ka.sa.sa_restorer, &amp;oact-&gt;sa_restorer))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -236,7 +236,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)</div><div class='ctx'> 	err |= __copy_from_user (regs-&gt;areg, sc-&gt;sc_areg, XCHAL_NUM_AREGS*4);</div><div class='ctx'> 	err |= __get_user(buf, &amp;sc-&gt;sc_cpstate);</div><div class='ctx'> 	if (buf) {</div><div class='del'>-		if (verify_area(VERIFY_READ, buf, sizeof(*buf)))</div><div class='add'>+		if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))</div><div class='ctx'> 			goto badframe;</div><div class='ctx'> 		err |= restore_cpextra(buf);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -357,7 +357,7 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)</div><div class='ctx'> 	if (regs-&gt;depc &gt; 64)</div><div class='ctx'> 		panic ("Double exception sys_sigreturn\n");</div><div class='ctx'> </div><div class='del'>-	if (verify_area(VERIFY_READ, frame, sizeof(*frame)))</div><div class='add'>+	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='ctx'> 	if (__get_user(set.sig[0], &amp;frame-&gt;sc.oldmask)</div><div class='hunk'>@@ -394,7 +394,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (verify_area(VERIFY_READ, frame, sizeof(*frame)))</div><div class='add'>+	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))</div><div class='ctx'> 		goto badframe;</div><div class='ctx'> </div><div class='ctx'> 	if (__copy_from_user(&amp;set, &amp;frame-&gt;uc.uc_sigmask, sizeof(set)))</div><div class='hunk'>@@ -433,7 +433,7 @@ badframe:</div><div class='ctx'> static inline void *</div><div class='ctx'> get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)</div><div class='ctx'> {</div><div class='del'>-	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! on_sig_stack(sp))</div><div class='add'>+	if ((ka-&gt;sa.sa_flags &amp; SA_ONSTACK) != 0 &amp;&amp; ! sas_ss_flags(sp))</div><div class='ctx'> 		sp = current-&gt;sas_ss_sp + current-&gt;sas_ss_size;</div><div class='ctx'> </div><div class='ctx'> 	return (void *)((sp - frame_size) &amp; -16ul);</div><div class='head'>diff --git a/arch/xtensa/kernel/syscalls.c b/arch/xtensa/kernel/syscalls.c<br/>index f20c6494c518..4688ba2db84d 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/syscalls.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/syscalls.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/syscalls.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/syscalls.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEBUG	0</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c<br/>index 937d81f62f43..412ab32de391 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/time.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/time.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/time.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/time.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Chris Zankel &lt;chris@zankel.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='hunk'>@@ -29,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> extern volatile unsigned long wall_jiffies;</div><div class='ctx'> </div><div class='del'>-spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+DEFINE_SPINLOCK(rtc_lock);</div><div class='ctx'> EXPORT_SYMBOL(rtc_lock);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +52,7 @@ unsigned long long sched_clock(void)</div><div class='ctx'> static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);</div><div class='ctx'> static struct irqaction timer_irqaction = {</div><div class='ctx'> 	.handler =	timer_interrupt,</div><div class='del'>-	.flags =	SA_INTERRUPT,</div><div class='add'>+	.flags =	IRQF_DISABLED,</div><div class='ctx'> 	.name =		"timer",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c<br/>index 225d64d73f04..27e409089a7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/traps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/traps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/traps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/traps.c</a></div><div class='hunk'>@@ -461,7 +461,7 @@ void show_code(unsigned int *pc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-spinlock_t die_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+DEFINE_SPINLOCK(die_lock);</div><div class='ctx'> </div><div class='ctx'> void die(const char * str, struct pt_regs * regs, long err)</div><div class='ctx'> {</div><div class='head'>diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S<br/>index 5ed71dfc8110..ab6cdbd5eb68 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/vmlinux.lds.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/vmlinux.lds.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/vmlinux.lds.S</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm-generic/vmlinux.lds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define _NOCLANGUAGE</div><div class='ctx'> #include &lt;xtensa/config/core.h&gt;</div><div class='ctx'> #include &lt;xtensa/config/system.h&gt;</div><div class='head'>diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c<br/>index a15b6e3e72c8..0b4cb93db5a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/xtensa_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/kernel/xtensa_ksyms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/kernel/xtensa_ksyms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/kernel/xtensa_ksyms.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Joe Taylor &lt;joe@tensilica.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c<br/>index e1be4235f367..660ef058c149 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/mm/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/mm/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/mm/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/mm/init.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * Kevin Chea</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c<br/>index 2a580efb58ec..22d3c571a7bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/platform-iss/console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/platform-iss/console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/platform-iss/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/platform-iss/console.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c<br/>index 0dc55cc8691b..d96164e602fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/platform-iss/network.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/platform-iss/network.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/platform-iss/network.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/platform-iss/network.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/arch/xtensa/platform-iss/setup.c b/arch/xtensa/platform-iss/setup.c<br/>index 23790a5610e2..c8a42b60c57a 100644<br/>--- a/<a href='/cgit/linux.git/tree/arch/xtensa/platform-iss/setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>arch/xtensa/platform-iss/setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/arch/xtensa/platform-iss/setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>arch/xtensa/platform-iss/setup.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched<br/>index f3b7753aac99..48d090e266fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/Kconfig.iosched?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/Kconfig.iosched</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/Kconfig.iosched?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/Kconfig.iosched</a></div><div class='hunk'>@@ -40,7 +40,7 @@ config IOSCHED_CFQ</div><div class='ctx'> </div><div class='ctx'> choice</div><div class='ctx'> 	prompt "Default I/O scheduler"</div><div class='del'>-	default DEFAULT_AS</div><div class='add'>+	default DEFAULT_CFQ</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select the I/O scheduler which will be used by default for all</div><div class='ctx'> 	  block devices.</div><div class='head'>diff --git a/block/as-iosched.c b/block/as-iosched.c<br/>index e25a5d79ab27..5da56d48fbd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/as-iosched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/as-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/as-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/as-iosched.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -96,7 +95,7 @@ struct as_data {</div><div class='ctx'> </div><div class='ctx'> 	struct as_rq *next_arq[2];	/* next in sort order */</div><div class='ctx'> 	sector_t last_sector[2];	/* last REQ_SYNC &amp; REQ_ASYNC sectors */</div><div class='del'>-	struct list_head *hash;		/* request hash */</div><div class='add'>+	struct hlist_head *hash;	/* request hash */</div><div class='ctx'> </div><div class='ctx'> 	unsigned long exit_prob;	/* probability a task will exit while</div><div class='ctx'> 					   being waited on */</div><div class='hunk'>@@ -165,8 +164,7 @@ struct as_rq {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * request hash, key is the ending offset (for back merge lookup)</div><div class='ctx'> 	 */</div><div class='del'>-	struct list_head hash;</div><div class='del'>-	unsigned int on_hash;</div><div class='add'>+	struct hlist_node hash;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * expire fifo</div><div class='hunk'>@@ -282,17 +280,15 @@ static const int as_hash_shift = 6;</div><div class='ctx'> #define AS_HASH_FN(sec)		(hash_long(AS_HASH_BLOCK((sec)), as_hash_shift))</div><div class='ctx'> #define AS_HASH_ENTRIES		(1 &lt;&lt; as_hash_shift)</div><div class='ctx'> #define rq_hash_key(rq)		((rq)-&gt;sector + (rq)-&gt;nr_sectors)</div><div class='del'>-#define list_entry_hash(ptr)	list_entry((ptr), struct as_rq, hash)</div><div class='ctx'> </div><div class='ctx'> static inline void __as_del_arq_hash(struct as_rq *arq)</div><div class='ctx'> {</div><div class='del'>-	arq-&gt;on_hash = 0;</div><div class='del'>-	list_del_init(&amp;arq-&gt;hash);</div><div class='add'>+	hlist_del_init(&amp;arq-&gt;hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void as_del_arq_hash(struct as_rq *arq)</div><div class='ctx'> {</div><div class='del'>-	if (arq-&gt;on_hash)</div><div class='add'>+	if (!hlist_unhashed(&amp;arq-&gt;hash))</div><div class='ctx'> 		__as_del_arq_hash(arq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -300,10 +296,9 @@ static void as_add_arq_hash(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq = arq-&gt;request;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(arq-&gt;on_hash);</div><div class='add'>+	BUG_ON(!hlist_unhashed(&amp;arq-&gt;hash));</div><div class='ctx'> </div><div class='del'>-	arq-&gt;on_hash = 1;</div><div class='del'>-	list_add(&amp;arq-&gt;hash, &amp;ad-&gt;hash[AS_HASH_FN(rq_hash_key(rq))]);</div><div class='add'>+	hlist_add_head(&amp;arq-&gt;hash, &amp;ad-&gt;hash[AS_HASH_FN(rq_hash_key(rq))]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -312,31 +307,29 @@ static void as_add_arq_hash(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> static inline void as_hot_arq_hash(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq = arq-&gt;request;</div><div class='del'>-	struct list_head *head = &amp;ad-&gt;hash[AS_HASH_FN(rq_hash_key(rq))];</div><div class='add'>+	struct hlist_head *head = &amp;ad-&gt;hash[AS_HASH_FN(rq_hash_key(rq))];</div><div class='ctx'> </div><div class='del'>-	if (!arq-&gt;on_hash) {</div><div class='add'>+	if (hlist_unhashed(&amp;arq-&gt;hash)) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (arq-&gt;hash.prev != head) {</div><div class='del'>-		list_del(&amp;arq-&gt;hash);</div><div class='del'>-		list_add(&amp;arq-&gt;hash, head);</div><div class='add'>+	if (&amp;arq-&gt;hash != head-&gt;first) {</div><div class='add'>+		hlist_del(&amp;arq-&gt;hash);</div><div class='add'>+		hlist_add_head(&amp;arq-&gt;hash, head);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *as_find_arq_hash(struct as_data *ad, sector_t offset)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *hash_list = &amp;ad-&gt;hash[AS_HASH_FN(offset)];</div><div class='del'>-	struct list_head *entry, *next = hash_list-&gt;next;</div><div class='add'>+	struct hlist_head *hash_list = &amp;ad-&gt;hash[AS_HASH_FN(offset)];</div><div class='add'>+	struct hlist_node *entry, *next;</div><div class='add'>+	struct as_rq *arq;</div><div class='ctx'> </div><div class='del'>-	while ((entry = next) != hash_list) {</div><div class='del'>-		struct as_rq *arq = list_entry_hash(entry);</div><div class='add'>+	hlist_for_each_entry_safe(arq, entry, next, hash_list, hash) {</div><div class='ctx'> 		struct request *__rq = arq-&gt;request;</div><div class='ctx'> </div><div class='del'>-		next = entry-&gt;next;</div><div class='del'>-</div><div class='del'>-		BUG_ON(!arq-&gt;on_hash);</div><div class='add'>+		BUG_ON(hlist_unhashed(&amp;arq-&gt;hash));</div><div class='ctx'> </div><div class='ctx'> 		if (!rq_mergeable(__rq)) {</div><div class='ctx'> 			as_del_arq_hash(arq);</div><div class='hunk'>@@ -353,10 +346,6 @@ static struct request *as_find_arq_hash(struct as_data *ad, sector_t offset)</div><div class='ctx'> /*</div><div class='ctx'>  * rb tree support functions</div><div class='ctx'>  */</div><div class='del'>-#define RB_NONE		(2)</div><div class='del'>-#define RB_EMPTY(root)	((root)-&gt;rb_node == NULL)</div><div class='del'>-#define ON_RB(node)	((node)-&gt;rb_color != RB_NONE)</div><div class='del'>-#define RB_CLEAR(node)	((node)-&gt;rb_color = RB_NONE)</div><div class='ctx'> #define rb_entry_arq(node)	rb_entry((node), struct as_rq, rb_node)</div><div class='ctx'> #define ARQ_RB_ROOT(ad, arq)	(&amp;(ad)-&gt;sort_list[(arq)-&gt;is_sync])</div><div class='ctx'> #define rq_rb_key(rq)		(rq)-&gt;sector</div><div class='hunk'>@@ -425,13 +414,13 @@ static void as_add_arq_rb(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> </div><div class='ctx'> static inline void as_del_arq_rb(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> {</div><div class='del'>-	if (!ON_RB(&amp;arq-&gt;rb_node)) {</div><div class='add'>+	if (!RB_EMPTY_NODE(&amp;arq-&gt;rb_node)) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rb_erase(&amp;arq-&gt;rb_node, ARQ_RB_ROOT(ad, arq));</div><div class='del'>-	RB_CLEAR(&amp;arq-&gt;rb_node);</div><div class='add'>+	RB_CLEAR_NODE(&amp;arq-&gt;rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *</div><div class='hunk'>@@ -552,7 +541,7 @@ static struct as_rq *as_find_next_arq(struct as_data *ad, struct as_rq *last)</div><div class='ctx'> 	struct rb_node *rbprev = rb_prev(&amp;last-&gt;rb_node);</div><div class='ctx'> 	struct as_rq *arq_next, *arq_prev;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!ON_RB(&amp;last-&gt;rb_node));</div><div class='add'>+	BUG_ON(!RB_EMPTY_NODE(&amp;last-&gt;rb_node));</div><div class='ctx'> </div><div class='ctx'> 	if (rbprev)</div><div class='ctx'> 		arq_prev = rb_entry_arq(rbprev);</div><div class='hunk'>@@ -902,7 +891,7 @@ static int as_can_break_anticipation(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * as_can_anticipate indicates weather we should either run arq</div><div class='add'>+ * as_can_anticipate indicates whether we should either run arq</div><div class='ctx'>  * or keep anticipating a better request.</div><div class='ctx'>  */</div><div class='ctx'> static int as_can_anticipate(struct as_data *ad, struct as_rq *arq)</div><div class='hunk'>@@ -1129,7 +1118,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct as_rq *arq)</div><div class='ctx'> 	struct request *rq = arq-&gt;request;</div><div class='ctx'> 	const int data_dir = arq-&gt;is_sync;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!ON_RB(&amp;arq-&gt;rb_node));</div><div class='add'>+	BUG_ON(!RB_EMPTY_NODE(&amp;arq-&gt;rb_node));</div><div class='ctx'> </div><div class='ctx'> 	as_antic_stop(ad);</div><div class='ctx'> 	ad-&gt;antic_status = ANTIC_OFF;</div><div class='hunk'>@@ -1254,7 +1243,7 @@ static int as_dispatch_request(request_queue_t *q, int force)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (reads) {</div><div class='del'>-		BUG_ON(RB_EMPTY(&amp;ad-&gt;sort_list[REQ_SYNC]));</div><div class='add'>+		BUG_ON(RB_EMPTY_ROOT(&amp;ad-&gt;sort_list[REQ_SYNC]));</div><div class='ctx'> </div><div class='ctx'> 		if (writes &amp;&amp; ad-&gt;batch_data_dir == REQ_SYNC)</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1278,7 +1267,7 @@ static int as_dispatch_request(request_queue_t *q, int force)</div><div class='ctx'> </div><div class='ctx'> 	if (writes) {</div><div class='ctx'> dispatch_writes:</div><div class='del'>-		BUG_ON(RB_EMPTY(&amp;ad-&gt;sort_list[REQ_ASYNC]));</div><div class='add'>+		BUG_ON(RB_EMPTY_ROOT(&amp;ad-&gt;sort_list[REQ_ASYNC]));</div><div class='ctx'> </div><div class='ctx'> 		if (ad-&gt;batch_data_dir == REQ_SYNC) {</div><div class='ctx'> 			ad-&gt;changed_batch = 1;</div><div class='hunk'>@@ -1346,7 +1335,7 @@ static void as_add_request(request_queue_t *q, struct request *rq)</div><div class='ctx'> 	arq-&gt;state = AS_RQ_NEW;</div><div class='ctx'> </div><div class='ctx'> 	if (rq_data_dir(arq-&gt;request) == READ</div><div class='del'>-			|| current-&gt;flags&amp;PF_SYNCWRITE)</div><div class='add'>+			|| (arq-&gt;request-&gt;flags &amp; REQ_RW_SYNC))</div><div class='ctx'> 		arq-&gt;is_sync = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		arq-&gt;is_sync = 0;</div><div class='hunk'>@@ -1598,12 +1587,11 @@ static int as_set_request(request_queue_t *q, struct request *rq,</div><div class='ctx'> </div><div class='ctx'> 	if (arq) {</div><div class='ctx'> 		memset(arq, 0, sizeof(*arq));</div><div class='del'>-		RB_CLEAR(&amp;arq-&gt;rb_node);</div><div class='add'>+		RB_CLEAR_NODE(&amp;arq-&gt;rb_node);</div><div class='ctx'> 		arq-&gt;request = rq;</div><div class='ctx'> 		arq-&gt;state = AS_RQ_PRESCHED;</div><div class='ctx'> 		arq-&gt;io_context = NULL;</div><div class='del'>-		INIT_LIST_HEAD(&amp;arq-&gt;hash);</div><div class='del'>-		arq-&gt;on_hash = 0;</div><div class='add'>+		INIT_HLIST_NODE(&amp;arq-&gt;hash);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;arq-&gt;fifo);</div><div class='ctx'> 		rq-&gt;elevator_private = arq;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1648,26 +1636,26 @@ static void as_exit_queue(elevator_t *e)</div><div class='ctx'>  * initialize elevator private data (as_data), and alloc a arq for</div><div class='ctx'>  * each request on the free lists</div><div class='ctx'>  */</div><div class='del'>-static int as_init_queue(request_queue_t *q, elevator_t *e)</div><div class='add'>+static void *as_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct as_data *ad;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!arq_pool)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	ad = kmalloc_node(sizeof(*ad), GFP_KERNEL, q-&gt;node);</div><div class='ctx'> 	if (!ad)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	memset(ad, 0, sizeof(*ad));</div><div class='ctx'> </div><div class='ctx'> 	ad-&gt;q = q; /* Identify what queue the data belongs to */</div><div class='ctx'> </div><div class='del'>-	ad-&gt;hash = kmalloc_node(sizeof(struct list_head)*AS_HASH_ENTRIES,</div><div class='add'>+	ad-&gt;hash = kmalloc_node(sizeof(struct hlist_head)*AS_HASH_ENTRIES,</div><div class='ctx'> 				GFP_KERNEL, q-&gt;node);</div><div class='ctx'> 	if (!ad-&gt;hash) {</div><div class='ctx'> 		kfree(ad);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ad-&gt;arq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,</div><div class='hunk'>@@ -1675,7 +1663,7 @@ static int as_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	if (!ad-&gt;arq_pool) {</div><div class='ctx'> 		kfree(ad-&gt;hash);</div><div class='ctx'> 		kfree(ad);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* anticipatory scheduling helpers */</div><div class='hunk'>@@ -1685,7 +1673,7 @@ static int as_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	INIT_WORK(&amp;ad-&gt;antic_work, as_work_handler, q);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; AS_HASH_ENTRIES; i++)</div><div class='del'>-		INIT_LIST_HEAD(&amp;ad-&gt;hash[i]);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;ad-&gt;hash[i]);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ad-&gt;fifo_list[REQ_SYNC]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ad-&gt;fifo_list[REQ_ASYNC]);</div><div class='hunk'>@@ -1696,14 +1684,13 @@ static int as_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	ad-&gt;antic_expire = default_antic_expire;</div><div class='ctx'> 	ad-&gt;batch_expire[REQ_SYNC] = default_read_batch_expire;</div><div class='ctx'> 	ad-&gt;batch_expire[REQ_ASYNC] = default_write_batch_expire;</div><div class='del'>-	e-&gt;elevator_data = ad;</div><div class='ctx'> </div><div class='ctx'> 	ad-&gt;current_batch_expires = jiffies + ad-&gt;batch_expire[REQ_SYNC];</div><div class='ctx'> 	ad-&gt;write_batch_count = ad-&gt;batch_expire[REQ_ASYNC] / 10;</div><div class='ctx'> 	if (ad-&gt;write_batch_count &lt; 2)</div><div class='ctx'> 		ad-&gt;write_batch_count = 2;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ad;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/block/blktrace.c b/block/blktrace.c<br/>index 36f3a172275f..b8c0702777ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/blktrace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/blktrace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/blktrace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/blktrace.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='hunk'>@@ -70,7 +69,7 @@ static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ), BLK_TC_ACT(BLK</div><div class='ctx'> /*</div><div class='ctx'>  * Bio action bits of interest</div><div class='ctx'>  */</div><div class='del'>-static u32 bio_act[3] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_ACT(BLK_TC_SYNC) };</div><div class='add'>+static u32 bio_act[5] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_ACT(BLK_TC_SYNC), 0, BLK_TC_ACT(BLK_TC_AHEAD) };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * More could be added as needed, taking care to increment the decrementer</div><div class='hunk'>@@ -80,6 +79,8 @@ static u32 bio_act[3] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_AC</div><div class='ctx'> 	(((rw) &amp; (1 &lt;&lt; BIO_RW_BARRIER)) &gt;&gt; (BIO_RW_BARRIER - 0))</div><div class='ctx'> #define trace_sync_bit(rw)	\</div><div class='ctx'> 	(((rw) &amp; (1 &lt;&lt; BIO_RW_SYNC)) &gt;&gt; (BIO_RW_SYNC - 1))</div><div class='add'>+#define trace_ahead_bit(rw)	\</div><div class='add'>+	(((rw) &amp; (1 &lt;&lt; BIO_RW_AHEAD)) &lt;&lt; (BIO_RW_AHEAD - 0))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The worker for the various blk_add_trace*() types. Fills out a</div><div class='hunk'>@@ -101,6 +102,7 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,</div><div class='ctx'> 	what |= ddir_act[rw &amp; WRITE];</div><div class='ctx'> 	what |= bio_act[trace_barrier_bit(rw)];</div><div class='ctx'> 	what |= bio_act[trace_sync_bit(rw)];</div><div class='add'>+	what |= bio_act[trace_ahead_bit(rw)];</div><div class='ctx'> </div><div class='ctx'> 	pid = tsk-&gt;pid;</div><div class='ctx'> 	if (unlikely(act_log_check(bt, what, sector, pid)))</div><div class='head'>diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c<br/>index 8e9d84825e1c..102ebc2c5c34 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/cfq-iosched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/cfq-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/cfq-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/cfq-iosched.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Jens Axboe &lt;axboe@suse.de&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='hunk'>@@ -26,7 +25,7 @@ static const int cfq_back_penalty = 2;		/* penalty of a backwards seek */</div><div class='ctx'> static const int cfq_slice_sync = HZ / 10;</div><div class='ctx'> static int cfq_slice_async = HZ / 25;</div><div class='ctx'> static const int cfq_slice_async_rq = 2;</div><div class='del'>-static int cfq_slice_idle = HZ / 70;</div><div class='add'>+static int cfq_slice_idle = HZ / 125;</div><div class='ctx'> </div><div class='ctx'> #define CFQ_IDLE_GRACE		(HZ / 10)</div><div class='ctx'> #define CFQ_SLICE_SCALE		(5)</div><div class='hunk'>@@ -60,16 +59,6 @@ static DEFINE_SPINLOCK(cfq_exit_lock);</div><div class='ctx'> /*</div><div class='ctx'>  * rb-tree defines</div><div class='ctx'>  */</div><div class='del'>-#define RB_NONE			(2)</div><div class='del'>-#define RB_EMPTY(node)		((node)-&gt;rb_node == NULL)</div><div class='del'>-#define RB_CLEAR_COLOR(node)	(node)-&gt;rb_color = RB_NONE</div><div class='del'>-#define RB_CLEAR(node)		do {	\</div><div class='del'>-	(node)-&gt;rb_parent = NULL;	\</div><div class='del'>-	RB_CLEAR_COLOR((node));		\</div><div class='del'>-	(node)-&gt;rb_right = NULL;	\</div><div class='del'>-	(node)-&gt;rb_left = NULL;		\</div><div class='del'>-} while (0)</div><div class='del'>-#define RB_CLEAR_ROOT(root)	((root)-&gt;rb_node = NULL)</div><div class='ctx'> #define rb_entry_crq(node)	rb_entry((node), struct cfq_rq, rb_node)</div><div class='ctx'> #define rq_rb_key(rq)		(rq)-&gt;sector</div><div class='ctx'> </div><div class='hunk'>@@ -128,8 +117,6 @@ struct cfq_data {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct hlist_head *crq_hash;</div><div class='ctx'> </div><div class='del'>-	unsigned int max_queued;</div><div class='del'>-</div><div class='ctx'> 	mempool_t *crq_pool;</div><div class='ctx'> </div><div class='ctx'> 	int rq_in_driver;</div><div class='hunk'>@@ -284,8 +271,6 @@ static struct cfq_queue *cfq_find_cfq_hash(struct cfq_data *, unsigned int, unsi</div><div class='ctx'> static void cfq_dispatch_insert(request_queue_t *, struct cfq_rq *);</div><div class='ctx'> static struct cfq_queue *cfq_get_queue(struct cfq_data *cfqd, unsigned int key, struct task_struct *tsk, gfp_t gfp_mask);</div><div class='ctx'> </div><div class='del'>-#define process_sync(tsk)	((tsk)-&gt;flags &amp; PF_SYNCWRITE)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * lots of deadline iosched dupes, can be abstracted later...</div><div class='ctx'>  */</div><div class='hunk'>@@ -341,7 +326,7 @@ static int cfq_queue_empty(request_queue_t *q)</div><div class='ctx'> </div><div class='ctx'> static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)</div><div class='ctx'> {</div><div class='del'>-	if (rw == READ || process_sync(task))</div><div class='add'>+	if (rw == READ || rw == WRITE_SYNC)</div><div class='ctx'> 		return task-&gt;pid;</div><div class='ctx'> </div><div class='ctx'> 	return CFQ_KEY_ASYNC;</div><div class='hunk'>@@ -567,9 +552,8 @@ static inline void cfq_del_crq_rb(struct cfq_rq *crq)</div><div class='ctx'> 	cfq_update_next_crq(crq);</div><div class='ctx'> </div><div class='ctx'> 	rb_erase(&amp;crq-&gt;rb_node, &amp;cfqq-&gt;sort_list);</div><div class='del'>-	RB_CLEAR_COLOR(&amp;crq-&gt;rb_node);</div><div class='ctx'> </div><div class='del'>-	if (cfq_cfqq_on_rr(cfqq) &amp;&amp; RB_EMPTY(&amp;cfqq-&gt;sort_list))</div><div class='add'>+	if (cfq_cfqq_on_rr(cfqq) &amp;&amp; RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list))</div><div class='ctx'> 		cfq_del_cfqq_rr(cfqd, cfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -916,13 +900,15 @@ static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd)</div><div class='ctx'> 	return cfqq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CIC_SEEKY(cic) ((cic)-&gt;seek_mean &gt; (128 * 1024))</div><div class='add'>+</div><div class='ctx'> static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_io_context *cic;</div><div class='ctx'> 	unsigned long sl;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(!RB_EMPTY(&amp;cfqq-&gt;sort_list));</div><div class='add'>+	WARN_ON(!RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list));</div><div class='ctx'> 	WARN_ON(cfqq != cfqd-&gt;active_queue);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -949,7 +935,7 @@ static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> 	 * fair distribution of slice time for a process doing back-to-back</div><div class='ctx'> 	 * seeks. so allow a little bit of time for him to submit a new rq</div><div class='ctx'> 	 */</div><div class='del'>-	if (sample_valid(cic-&gt;seek_samples) &amp;&amp; cic-&gt;seek_mean &gt; 131072)</div><div class='add'>+	if (sample_valid(cic-&gt;seek_samples) &amp;&amp; CIC_SEEKY(cic))</div><div class='ctx'> 		sl = 2;</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;cfqd-&gt;idle_slice_timer, jiffies + sl);</div><div class='hunk'>@@ -960,11 +946,15 @@ static void cfq_dispatch_insert(request_queue_t *q, struct cfq_rq *crq)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='ctx'> 	struct cfq_queue *cfqq = crq-&gt;cfq_queue;</div><div class='add'>+	struct request *rq;</div><div class='ctx'> </div><div class='ctx'> 	cfqq-&gt;next_crq = cfq_find_next_crq(cfqd, cfqq, crq);</div><div class='ctx'> 	cfq_remove_request(crq-&gt;request);</div><div class='ctx'> 	cfqq-&gt;on_dispatch[cfq_crq_is_sync(crq)]++;</div><div class='ctx'> 	elv_dispatch_sort(q, crq-&gt;request);</div><div class='add'>+</div><div class='add'>+	rq = list_entry(q-&gt;queue_head.prev, struct request, queuelist);</div><div class='add'>+	cfqd-&gt;last_sector = rq-&gt;sector + rq-&gt;nr_sectors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1046,10 +1036,12 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd)</div><div class='ctx'> 	 * if queue has requests, dispatch one. if not, check if</div><div class='ctx'> 	 * enough slice is left to wait for one</div><div class='ctx'> 	 */</div><div class='del'>-	if (!RB_EMPTY(&amp;cfqq-&gt;sort_list))</div><div class='add'>+	if (!RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list))</div><div class='ctx'> 		goto keep_queue;</div><div class='del'>-	else if (cfq_cfqq_class_sync(cfqq) &amp;&amp;</div><div class='del'>-		 time_before(now, cfqq-&gt;slice_end)) {</div><div class='add'>+	else if (cfq_cfqq_dispatched(cfqq)) {</div><div class='add'>+		cfqq = NULL;</div><div class='add'>+		goto keep_queue;</div><div class='add'>+	} else if (cfq_cfqq_class_sync(cfqq)) {</div><div class='ctx'> 		if (cfq_arm_slice_timer(cfqd, cfqq))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1068,7 +1060,7 @@ __cfq_dispatch_requests(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> {</div><div class='ctx'> 	int dispatched = 0;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(RB_EMPTY(&amp;cfqq-&gt;sort_list));</div><div class='add'>+	BUG_ON(RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list));</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		struct cfq_rq *crq;</div><div class='hunk'>@@ -1092,14 +1084,13 @@ __cfq_dispatch_requests(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 			cfqd-&gt;active_cic = crq-&gt;io_context;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (RB_EMPTY(&amp;cfqq-&gt;sort_list))</div><div class='add'>+		if (RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 	} while (dispatched &lt; max_dispatch);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * if slice end isn't set yet, set it. if at least one request was</div><div class='del'>-	 * sync, use the sync time slice value</div><div class='add'>+	 * if slice end isn't set yet, set it.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!cfqq-&gt;slice_end)</div><div class='ctx'> 		cfq_set_prio_slice(cfqd, cfqq);</div><div class='hunk'>@@ -1110,7 +1101,8 @@ __cfq_dispatch_requests(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((!cfq_cfqq_sync(cfqq) &amp;&amp;</div><div class='ctx'> 	    cfqd-&gt;dispatch_slice &gt;= cfq_prio_to_maxrq(cfqd, cfqq)) ||</div><div class='del'>-	    cfq_class_idle(cfqq))</div><div class='add'>+	    cfq_class_idle(cfqq) ||</div><div class='add'>+	    !cfq_cfqq_idle_window(cfqq))</div><div class='ctx'> 		cfq_slice_expired(cfqd, 0);</div><div class='ctx'> </div><div class='ctx'> 	return dispatched;</div><div class='hunk'>@@ -1119,10 +1111,11 @@ __cfq_dispatch_requests(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> static int</div><div class='ctx'> cfq_forced_dispatch_cfqqs(struct list_head *list)</div><div class='ctx'> {</div><div class='del'>-	int dispatched = 0;</div><div class='ctx'> 	struct cfq_queue *cfqq, *next;</div><div class='ctx'> 	struct cfq_rq *crq;</div><div class='add'>+	int dispatched;</div><div class='ctx'> </div><div class='add'>+	dispatched = 0;</div><div class='ctx'> 	list_for_each_entry_safe(cfqq, next, list, cfq_list) {</div><div class='ctx'> 		while ((crq = cfqq-&gt;next_crq)) {</div><div class='ctx'> 			cfq_dispatch_insert(cfqq-&gt;cfqd-&gt;queue, crq);</div><div class='hunk'>@@ -1130,6 +1123,7 @@ cfq_forced_dispatch_cfqqs(struct list_head *list)</div><div class='ctx'> 		}</div><div class='ctx'> 		BUG_ON(!list_empty(&amp;cfqq-&gt;fifo));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return dispatched;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1156,7 +1150,8 @@ static int</div><div class='ctx'> cfq_dispatch_requests(request_queue_t *q, int force)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='del'>-	struct cfq_queue *cfqq;</div><div class='add'>+	struct cfq_queue *cfqq, *prev_cfqq;</div><div class='add'>+	int dispatched;</div><div class='ctx'> </div><div class='ctx'> 	if (!cfqd-&gt;busy_queues)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1164,10 +1159,17 @@ cfq_dispatch_requests(request_queue_t *q, int force)</div><div class='ctx'> 	if (unlikely(force))</div><div class='ctx'> 		return cfq_forced_dispatch(cfqd);</div><div class='ctx'> </div><div class='del'>-	cfqq = cfq_select_queue(cfqd);</div><div class='del'>-	if (cfqq) {</div><div class='add'>+	dispatched = 0;</div><div class='add'>+	prev_cfqq = NULL;</div><div class='add'>+	while ((cfqq = cfq_select_queue(cfqd)) != NULL) {</div><div class='ctx'> 		int max_dispatch;</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Don't repeat dispatch from the previous queue.</div><div class='add'>+		 */</div><div class='add'>+		if (prev_cfqq == cfqq)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		cfq_clear_cfqq_must_dispatch(cfqq);</div><div class='ctx'> 		cfq_clear_cfqq_wait_request(cfqq);</div><div class='ctx'> 		del_timer(&amp;cfqd-&gt;idle_slice_timer);</div><div class='hunk'>@@ -1176,10 +1178,19 @@ cfq_dispatch_requests(request_queue_t *q, int force)</div><div class='ctx'> 		if (cfq_class_idle(cfqq))</div><div class='ctx'> 			max_dispatch = 1;</div><div class='ctx'> </div><div class='del'>-		return __cfq_dispatch_requests(cfqd, cfqq, max_dispatch);</div><div class='add'>+		dispatched += __cfq_dispatch_requests(cfqd, cfqq, max_dispatch);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If the dispatch cfqq has idling enabled and is still</div><div class='add'>+		 * the active queue, break out.</div><div class='add'>+		 */</div><div class='add'>+		if (cfq_cfqq_idle_window(cfqq) &amp;&amp; cfqd-&gt;active_queue)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		prev_cfqq = cfqq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return dispatched;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1323,17 +1334,11 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)</div><div class='ctx'> 	struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask);</div><div class='ctx'> </div><div class='ctx'> 	if (cic) {</div><div class='del'>-		RB_CLEAR(&amp;cic-&gt;rb_node);</div><div class='del'>-		cic-&gt;key = NULL;</div><div class='del'>-		cic-&gt;cfqq[ASYNC] = NULL;</div><div class='del'>-		cic-&gt;cfqq[SYNC] = NULL;</div><div class='add'>+		memset(cic, 0, sizeof(*cic));</div><div class='ctx'> 		cic-&gt;last_end_request = jiffies;</div><div class='del'>-		cic-&gt;ttime_total = 0;</div><div class='del'>-		cic-&gt;ttime_samples = 0;</div><div class='del'>-		cic-&gt;ttime_mean = 0;</div><div class='add'>+		INIT_LIST_HEAD(&amp;cic-&gt;queue_list);</div><div class='ctx'> 		cic-&gt;dtor = cfq_free_io_context;</div><div class='ctx'> 		cic-&gt;exit = cfq_exit_io_context;</div><div class='del'>-		INIT_LIST_HEAD(&amp;cic-&gt;queue_list);</div><div class='ctx'> 		atomic_inc(&amp;ioc_count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1391,25 +1396,28 @@ static inline void changed_ioprio(struct cfq_io_context *cic)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = cic-&gt;key;</div><div class='ctx'> 	struct cfq_queue *cfqq;</div><div class='del'>-	if (cfqd) {</div><div class='del'>-		spin_lock(cfqd-&gt;queue-&gt;queue_lock);</div><div class='del'>-		cfqq = cic-&gt;cfqq[ASYNC];</div><div class='del'>-		if (cfqq) {</div><div class='del'>-			struct cfq_queue *new_cfqq;</div><div class='del'>-			new_cfqq = cfq_get_queue(cfqd, CFQ_KEY_ASYNC,</div><div class='del'>-						cic-&gt;ioc-&gt;task, GFP_ATOMIC);</div><div class='del'>-			if (new_cfqq) {</div><div class='del'>-				cic-&gt;cfqq[ASYNC] = new_cfqq;</div><div class='del'>-				cfq_put_queue(cfqq);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		cfqq = cic-&gt;cfqq[SYNC];</div><div class='del'>-		if (cfqq) {</div><div class='del'>-			cfq_mark_cfqq_prio_changed(cfqq);</div><div class='del'>-			cfq_init_prio_data(cfqq);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!cfqd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(cfqd-&gt;queue-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	cfqq = cic-&gt;cfqq[ASYNC];</div><div class='add'>+	if (cfqq) {</div><div class='add'>+		struct cfq_queue *new_cfqq;</div><div class='add'>+		new_cfqq = cfq_get_queue(cfqd, CFQ_KEY_ASYNC, cic-&gt;ioc-&gt;task,</div><div class='add'>+					 GFP_ATOMIC);</div><div class='add'>+		if (new_cfqq) {</div><div class='add'>+			cic-&gt;cfqq[ASYNC] = new_cfqq;</div><div class='add'>+			cfq_put_queue(cfqq);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(cfqd-&gt;queue-&gt;queue_lock);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	cfqq = cic-&gt;cfqq[SYNC];</div><div class='add'>+	if (cfqq)</div><div class='add'>+		cfq_mark_cfqq_prio_changed(cfqq);</div><div class='add'>+</div><div class='add'>+	spin_unlock(cfqd-&gt;queue-&gt;queue_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1466,7 +1474,6 @@ retry:</div><div class='ctx'> </div><div class='ctx'> 		INIT_HLIST_NODE(&amp;cfqq-&gt;cfq_hash);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cfqq-&gt;cfq_list);</div><div class='del'>-		RB_CLEAR_ROOT(&amp;cfqq-&gt;sort_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cfqq-&gt;fifo);</div><div class='ctx'> </div><div class='ctx'> 		cfqq-&gt;key = key;</div><div class='hunk'>@@ -1478,8 +1485,7 @@ retry:</div><div class='ctx'> 		 * set -&gt;slice_left to allow preemption for a new process</div><div class='ctx'> 		 */</div><div class='ctx'> 		cfqq-&gt;slice_left = 2 * cfqd-&gt;cfq_slice_idle;</div><div class='del'>-		if (!cfqd-&gt;hw_tag)</div><div class='del'>-			cfq_mark_cfqq_idle_window(cfqq);</div><div class='add'>+		cfq_mark_cfqq_idle_window(cfqq);</div><div class='ctx'> 		cfq_mark_cfqq_prio_changed(cfqq);</div><div class='ctx'> 		cfq_init_prio_data(cfqq);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1670,7 +1676,8 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> {</div><div class='ctx'> 	int enable_idle = cfq_cfqq_idle_window(cfqq);</div><div class='ctx'> </div><div class='del'>-	if (!cic-&gt;ioc-&gt;task || !cfqd-&gt;cfq_slice_idle || cfqd-&gt;hw_tag)</div><div class='add'>+	if (!cic-&gt;ioc-&gt;task || !cfqd-&gt;cfq_slice_idle ||</div><div class='add'>+	    (cfqd-&gt;hw_tag &amp;&amp; CIC_SEEKY(cic)))</div><div class='ctx'> 		enable_idle = 0;</div><div class='ctx'> 	else if (sample_valid(cic-&gt;ttime_samples)) {</div><div class='ctx'> 		if (cic-&gt;ttime_mean &gt; cfqd-&gt;cfq_slice_idle)</div><div class='hunk'>@@ -1700,7 +1707,7 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!cfqq)</div><div class='del'>-		return 1;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cfq_class_idle(cfqq))</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1732,7 +1739,7 @@ static void cfq_preempt_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)</div><div class='ctx'> 		cfqq-&gt;slice_left = cfq_prio_to_slice(cfqd, cfqq) / 2;</div><div class='ctx'> </div><div class='ctx'> 	cfqq-&gt;slice_end = cfqq-&gt;slice_left + jiffies;</div><div class='del'>-	__cfq_slice_expired(cfqd, cfqq, 1);</div><div class='add'>+	cfq_slice_expired(cfqd, 1);</div><div class='ctx'> 	__cfq_set_active_queue(cfqd, cfqq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1757,11 +1764,7 @@ static void</div><div class='ctx'> cfq_crq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 		 struct cfq_rq *crq)</div><div class='ctx'> {</div><div class='del'>-	struct cfq_io_context *cic;</div><div class='del'>-</div><div class='del'>-	cfqq-&gt;next_crq = cfq_choose_req(cfqd, cfqq-&gt;next_crq, crq);</div><div class='del'>-</div><div class='del'>-	cic = crq-&gt;io_context;</div><div class='add'>+	struct cfq_io_context *cic = crq-&gt;io_context;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we never wait for an async request and we don't allow preemption</div><div class='hunk'>@@ -1851,11 +1854,23 @@ static void cfq_completed_request(request_queue_t *q, struct request *rq)</div><div class='ctx'> 			cfqq-&gt;service_last = now;</div><div class='ctx'> 			cfq_resort_rr_list(cfqq, 0);</div><div class='ctx'> 		}</div><div class='del'>-		cfq_schedule_dispatch(cfqd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cfq_crq_is_sync(crq))</div><div class='add'>+	if (sync)</div><div class='ctx'> 		crq-&gt;io_context-&gt;last_end_request = now;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If this is the active queue, check if it needs to be expired,</div><div class='add'>+	 * or if we want to idle in case it has no pending requests.</div><div class='add'>+	 */</div><div class='add'>+	if (cfqd-&gt;active_queue == cfqq) {</div><div class='add'>+		if (time_after(now, cfqq-&gt;slice_end))</div><div class='add'>+			cfq_slice_expired(cfqd, 0);</div><div class='add'>+		else if (sync &amp;&amp; RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list)) {</div><div class='add'>+			if (!cfq_arm_slice_timer(cfqd, cfqq))</div><div class='add'>+				cfq_schedule_dispatch(cfqd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *</div><div class='hunk'>@@ -1922,7 +1937,6 @@ static inline int</div><div class='ctx'> __cfq_may_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 		struct task_struct *task, int rw)</div><div class='ctx'> {</div><div class='del'>-#if 1</div><div class='ctx'> 	if ((cfq_cfqq_wait_request(cfqq) || cfq_cfqq_must_alloc(cfqq)) &amp;&amp;</div><div class='ctx'> 	    !cfq_cfqq_must_alloc_slice(cfqq)) {</div><div class='ctx'> 		cfq_mark_cfqq_must_alloc_slice(cfqq);</div><div class='hunk'>@@ -1930,39 +1944,6 @@ __cfq_may_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ELV_MQUEUE_MAY;</div><div class='del'>-#else</div><div class='del'>-	if (!cfqq || task-&gt;flags &amp; PF_MEMALLOC)</div><div class='del'>-		return ELV_MQUEUE_MAY;</div><div class='del'>-	if (!cfqq-&gt;allocated[rw] || cfq_cfqq_must_alloc(cfqq)) {</div><div class='del'>-		if (cfq_cfqq_wait_request(cfqq))</div><div class='del'>-			return ELV_MQUEUE_MUST;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * only allow 1 ELV_MQUEUE_MUST per slice, otherwise we</div><div class='del'>-		 * can quickly flood the queue with writes from a single task</div><div class='del'>-		 */</div><div class='del'>-		if (rw == READ || !cfq_cfqq_must_alloc_slice(cfqq)) {</div><div class='del'>-			cfq_mark_cfqq_must_alloc_slice(cfqq);</div><div class='del'>-			return ELV_MQUEUE_MUST;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return ELV_MQUEUE_MAY;</div><div class='del'>-	}</div><div class='del'>-	if (cfq_class_idle(cfqq))</div><div class='del'>-		return ELV_MQUEUE_NO;</div><div class='del'>-	if (cfqq-&gt;allocated[rw] &gt;= cfqd-&gt;max_queued) {</div><div class='del'>-		struct io_context *ioc = get_io_context(GFP_ATOMIC);</div><div class='del'>-		int ret = ELV_MQUEUE_NO;</div><div class='del'>-</div><div class='del'>-		if (ioc &amp;&amp; ioc-&gt;nr_batch_requests)</div><div class='del'>-			ret = ELV_MQUEUE_MAY;</div><div class='del'>-</div><div class='del'>-		put_io_context(ioc);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ELV_MQUEUE_MAY;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cfq_may_queue(request_queue_t *q, int rw, struct bio *bio)</div><div class='hunk'>@@ -1991,16 +1972,13 @@ static int cfq_may_queue(request_queue_t *q, int rw, struct bio *bio)</div><div class='ctx'> static void cfq_check_waiters(request_queue_t *q, struct cfq_queue *cfqq)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd = q-&gt;elevator-&gt;elevator_data;</div><div class='del'>-	struct request_list *rl = &amp;q-&gt;rq;</div><div class='ctx'> </div><div class='del'>-	if (cfqq-&gt;allocated[READ] &lt;= cfqd-&gt;max_queued || cfqd-&gt;rq_starved) {</div><div class='add'>+	if (unlikely(cfqd-&gt;rq_starved)) {</div><div class='add'>+		struct request_list *rl = &amp;q-&gt;rq;</div><div class='add'>+</div><div class='ctx'> 		smp_mb();</div><div class='ctx'> 		if (waitqueue_active(&amp;rl-&gt;wait[READ]))</div><div class='ctx'> 			wake_up(&amp;rl-&gt;wait[READ]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfqq-&gt;allocated[WRITE] &lt;= cfqd-&gt;max_queued || cfqd-&gt;rq_starved) {</div><div class='del'>-		smp_mb();</div><div class='ctx'> 		if (waitqueue_active(&amp;rl-&gt;wait[WRITE]))</div><div class='ctx'> 			wake_up(&amp;rl-&gt;wait[WRITE]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2074,7 +2052,7 @@ cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio,</div><div class='ctx'> </div><div class='ctx'> 	crq = mempool_alloc(cfqd-&gt;crq_pool, gfp_mask);</div><div class='ctx'> 	if (crq) {</div><div class='del'>-		RB_CLEAR(&amp;crq-&gt;rb_node);</div><div class='add'>+		RB_CLEAR_NODE(&amp;crq-&gt;rb_node);</div><div class='ctx'> 		crq-&gt;rb_key = 0;</div><div class='ctx'> 		crq-&gt;request = rq;</div><div class='ctx'> 		INIT_HLIST_NODE(&amp;crq-&gt;hash);</div><div class='hunk'>@@ -2160,16 +2138,13 @@ static void cfq_idle_slice_timer(unsigned long data)</div><div class='ctx'> 		 * only expire and reinvoke request handler, if there are</div><div class='ctx'> 		 * other queues with pending requests</div><div class='ctx'> 		 */</div><div class='del'>-		if (!cfqd-&gt;busy_queues) {</div><div class='del'>-			cfqd-&gt;idle_slice_timer.expires = min(now + cfqd-&gt;cfq_slice_idle, cfqq-&gt;slice_end);</div><div class='del'>-			add_timer(&amp;cfqd-&gt;idle_slice_timer);</div><div class='add'>+		if (!cfqd-&gt;busy_queues)</div><div class='ctx'> 			goto out_cont;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * not expired and it has a request pending, let it dispatch</div><div class='ctx'> 		 */</div><div class='del'>-		if (!RB_EMPTY(&amp;cfqq-&gt;sort_list)) {</div><div class='add'>+		if (!RB_EMPTY_ROOT(&amp;cfqq-&gt;sort_list)) {</div><div class='ctx'> 			cfq_mark_cfqq_must_dispatch(cfqq);</div><div class='ctx'> 			goto out_kick;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2251,14 +2226,14 @@ static void cfq_exit_queue(elevator_t *e)</div><div class='ctx'> 	kfree(cfqd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cfq_init_queue(request_queue_t *q, elevator_t *e)</div><div class='add'>+static void *cfq_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfq_data *cfqd;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	cfqd = kmalloc(sizeof(*cfqd), GFP_KERNEL);</div><div class='ctx'> 	if (!cfqd)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	memset(cfqd, 0, sizeof(*cfqd));</div><div class='ctx'> </div><div class='hunk'>@@ -2288,13 +2263,8 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	for (i = 0; i &lt; CFQ_QHASH_ENTRIES; i++)</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;cfqd-&gt;cfq_hash[i]);</div><div class='ctx'> </div><div class='del'>-	e-&gt;elevator_data = cfqd;</div><div class='del'>-</div><div class='ctx'> 	cfqd-&gt;queue = q;</div><div class='ctx'> </div><div class='del'>-	cfqd-&gt;max_queued = q-&gt;nr_requests / 4;</div><div class='del'>-	q-&gt;nr_batching = cfq_queued;</div><div class='del'>-</div><div class='ctx'> 	init_timer(&amp;cfqd-&gt;idle_slice_timer);</div><div class='ctx'> 	cfqd-&gt;idle_slice_timer.function = cfq_idle_slice_timer;</div><div class='ctx'> 	cfqd-&gt;idle_slice_timer.data = (unsigned long) cfqd;</div><div class='hunk'>@@ -2316,14 +2286,14 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	cfqd-&gt;cfq_slice_async_rq = cfq_slice_async_rq;</div><div class='ctx'> 	cfqd-&gt;cfq_slice_idle = cfq_slice_idle;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return cfqd;</div><div class='ctx'> out_crqpool:</div><div class='ctx'> 	kfree(cfqd-&gt;cfq_hash);</div><div class='ctx'> out_cfqhash:</div><div class='ctx'> 	kfree(cfqd-&gt;crq_hash);</div><div class='ctx'> out_crqhash:</div><div class='ctx'> 	kfree(cfqd);</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cfq_slab_kill(void)</div><div class='head'>diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c<br/>index 399fa1e60e1f..c7ca9f0b6498 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/deadline-iosched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/deadline-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/deadline-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/deadline-iosched.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -30,8 +29,7 @@ static const int deadline_hash_shift = 5;</div><div class='ctx'> #define DL_HASH_FN(sec)		(hash_long(DL_HASH_BLOCK((sec)), deadline_hash_shift))</div><div class='ctx'> #define DL_HASH_ENTRIES		(1 &lt;&lt; deadline_hash_shift)</div><div class='ctx'> #define rq_hash_key(rq)		((rq)-&gt;sector + (rq)-&gt;nr_sectors)</div><div class='del'>-#define list_entry_hash(ptr)	list_entry((ptr), struct deadline_rq, hash)</div><div class='del'>-#define ON_HASH(drq)		(drq)-&gt;on_hash</div><div class='add'>+#define ON_HASH(drq)		(!hlist_unhashed(&amp;(drq)-&gt;hash))</div><div class='ctx'> </div><div class='ctx'> struct deadline_data {</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -48,7 +46,7 @@ struct deadline_data {</div><div class='ctx'> 	 * next in sort order. read, write or both are NULL</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct deadline_rq *next_drq[2];</div><div class='del'>-	struct list_head *hash;		/* request hash */</div><div class='add'>+	struct hlist_head *hash;	/* request hash */</div><div class='ctx'> 	unsigned int batching;		/* number of sequential requests made */</div><div class='ctx'> 	sector_t last_sector;		/* head position */</div><div class='ctx'> 	unsigned int starved;		/* times reads have starved writes */</div><div class='hunk'>@@ -79,8 +77,7 @@ struct deadline_rq {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * request hash, key is the ending offset (for back merge lookup)</div><div class='ctx'> 	 */</div><div class='del'>-	struct list_head hash;</div><div class='del'>-	char on_hash;</div><div class='add'>+	struct hlist_node hash;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * expire fifo</div><div class='hunk'>@@ -100,8 +97,7 @@ static kmem_cache_t *drq_pool;</div><div class='ctx'>  */</div><div class='ctx'> static inline void __deadline_del_drq_hash(struct deadline_rq *drq)</div><div class='ctx'> {</div><div class='del'>-	drq-&gt;on_hash = 0;</div><div class='del'>-	list_del_init(&amp;drq-&gt;hash);</div><div class='add'>+	hlist_del_init(&amp;drq-&gt;hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void deadline_del_drq_hash(struct deadline_rq *drq)</div><div class='hunk'>@@ -117,8 +113,7 @@ deadline_add_drq_hash(struct deadline_data *dd, struct deadline_rq *drq)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(ON_HASH(drq));</div><div class='ctx'> </div><div class='del'>-	drq-&gt;on_hash = 1;</div><div class='del'>-	list_add(&amp;drq-&gt;hash, &amp;dd-&gt;hash[DL_HASH_FN(rq_hash_key(rq))]);</div><div class='add'>+	hlist_add_head(&amp;drq-&gt;hash, &amp;dd-&gt;hash[DL_HASH_FN(rq_hash_key(rq))]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -128,26 +123,24 @@ static inline void</div><div class='ctx'> deadline_hot_drq_hash(struct deadline_data *dd, struct deadline_rq *drq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request *rq = drq-&gt;request;</div><div class='del'>-	struct list_head *head = &amp;dd-&gt;hash[DL_HASH_FN(rq_hash_key(rq))];</div><div class='add'>+	struct hlist_head *head = &amp;dd-&gt;hash[DL_HASH_FN(rq_hash_key(rq))];</div><div class='ctx'> </div><div class='del'>-	if (ON_HASH(drq) &amp;&amp; drq-&gt;hash.prev != head) {</div><div class='del'>-		list_del(&amp;drq-&gt;hash);</div><div class='del'>-		list_add(&amp;drq-&gt;hash, head);</div><div class='add'>+	if (ON_HASH(drq) &amp;&amp; &amp;drq-&gt;hash != head-&gt;first) {</div><div class='add'>+		hlist_del(&amp;drq-&gt;hash);</div><div class='add'>+		hlist_add_head(&amp;drq-&gt;hash, head);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *</div><div class='ctx'> deadline_find_drq_hash(struct deadline_data *dd, sector_t offset)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *hash_list = &amp;dd-&gt;hash[DL_HASH_FN(offset)];</div><div class='del'>-	struct list_head *entry, *next = hash_list-&gt;next;</div><div class='add'>+	struct hlist_head *hash_list = &amp;dd-&gt;hash[DL_HASH_FN(offset)];</div><div class='add'>+	struct hlist_node *entry, *next;</div><div class='add'>+	struct deadline_rq *drq;</div><div class='ctx'> </div><div class='del'>-	while ((entry = next) != hash_list) {</div><div class='del'>-		struct deadline_rq *drq = list_entry_hash(entry);</div><div class='add'>+	hlist_for_each_entry_safe(drq, entry, next, hash_list, hash) {</div><div class='ctx'> 		struct request *__rq = drq-&gt;request;</div><div class='ctx'> </div><div class='del'>-		next = entry-&gt;next;</div><div class='del'>-		</div><div class='ctx'> 		BUG_ON(!ON_HASH(drq));</div><div class='ctx'> </div><div class='ctx'> 		if (!rq_mergeable(__rq)) {</div><div class='hunk'>@@ -165,10 +158,6 @@ deadline_find_drq_hash(struct deadline_data *dd, sector_t offset)</div><div class='ctx'> /*</div><div class='ctx'>  * rb tree support functions</div><div class='ctx'>  */</div><div class='del'>-#define RB_NONE		(2)</div><div class='del'>-#define RB_EMPTY(root)	((root)-&gt;rb_node == NULL)</div><div class='del'>-#define ON_RB(node)	((node)-&gt;rb_color != RB_NONE)</div><div class='del'>-#define RB_CLEAR(node)	((node)-&gt;rb_color = RB_NONE)</div><div class='ctx'> #define rb_entry_drq(node)	rb_entry((node), struct deadline_rq, rb_node)</div><div class='ctx'> #define DRQ_RB_ROOT(dd, drq)	(&amp;(dd)-&gt;sort_list[rq_data_dir((drq)-&gt;request)])</div><div class='ctx'> #define rq_rb_key(rq)		(rq)-&gt;sector</div><div class='hunk'>@@ -227,9 +216,9 @@ deadline_del_drq_rb(struct deadline_data *dd, struct deadline_rq *drq)</div><div class='ctx'> 			dd-&gt;next_drq[data_dir] = rb_entry_drq(rbnext);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!ON_RB(&amp;drq-&gt;rb_node));</div><div class='add'>+	BUG_ON(!RB_EMPTY_NODE(&amp;drq-&gt;rb_node));</div><div class='ctx'> 	rb_erase(&amp;drq-&gt;rb_node, DRQ_RB_ROOT(dd, drq));</div><div class='del'>-	RB_CLEAR(&amp;drq-&gt;rb_node);</div><div class='add'>+	RB_CLEAR_NODE(&amp;drq-&gt;rb_node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct request *</div><div class='hunk'>@@ -503,7 +492,7 @@ static int deadline_dispatch_requests(request_queue_t *q, int force)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (reads) {</div><div class='del'>-		BUG_ON(RB_EMPTY(&amp;dd-&gt;sort_list[READ]));</div><div class='add'>+		BUG_ON(RB_EMPTY_ROOT(&amp;dd-&gt;sort_list[READ]));</div><div class='ctx'> </div><div class='ctx'> 		if (writes &amp;&amp; (dd-&gt;starved++ &gt;= dd-&gt;writes_starved))</div><div class='ctx'> 			goto dispatch_writes;</div><div class='hunk'>@@ -519,7 +508,7 @@ static int deadline_dispatch_requests(request_queue_t *q, int force)</div><div class='ctx'> </div><div class='ctx'> 	if (writes) {</div><div class='ctx'> dispatch_writes:</div><div class='del'>-		BUG_ON(RB_EMPTY(&amp;dd-&gt;sort_list[WRITE]));</div><div class='add'>+		BUG_ON(RB_EMPTY_ROOT(&amp;dd-&gt;sort_list[WRITE]));</div><div class='ctx'> </div><div class='ctx'> 		dd-&gt;starved = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -613,24 +602,24 @@ static void deadline_exit_queue(elevator_t *e)</div><div class='ctx'>  * initialize elevator private data (deadline_data), and alloc a drq for</div><div class='ctx'>  * each request on the free lists</div><div class='ctx'>  */</div><div class='del'>-static int deadline_init_queue(request_queue_t *q, elevator_t *e)</div><div class='add'>+static void *deadline_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct deadline_data *dd;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!drq_pool)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	dd = kmalloc_node(sizeof(*dd), GFP_KERNEL, q-&gt;node);</div><div class='ctx'> 	if (!dd)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	memset(dd, 0, sizeof(*dd));</div><div class='ctx'> </div><div class='del'>-	dd-&gt;hash = kmalloc_node(sizeof(struct list_head)*DL_HASH_ENTRIES,</div><div class='add'>+	dd-&gt;hash = kmalloc_node(sizeof(struct hlist_head)*DL_HASH_ENTRIES,</div><div class='ctx'> 				GFP_KERNEL, q-&gt;node);</div><div class='ctx'> 	if (!dd-&gt;hash) {</div><div class='ctx'> 		kfree(dd);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dd-&gt;drq_pool = mempool_create_node(BLKDEV_MIN_RQ, mempool_alloc_slab,</div><div class='hunk'>@@ -638,11 +627,11 @@ static int deadline_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	if (!dd-&gt;drq_pool) {</div><div class='ctx'> 		kfree(dd-&gt;hash);</div><div class='ctx'> 		kfree(dd);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; DL_HASH_ENTRIES; i++)</div><div class='del'>-		INIT_LIST_HEAD(&amp;dd-&gt;hash[i]);</div><div class='add'>+		INIT_HLIST_HEAD(&amp;dd-&gt;hash[i]);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dd-&gt;fifo_list[READ]);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dd-&gt;fifo_list[WRITE]);</div><div class='hunk'>@@ -653,8 +642,7 @@ static int deadline_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> 	dd-&gt;writes_starved = writes_starved;</div><div class='ctx'> 	dd-&gt;front_merges = 1;</div><div class='ctx'> 	dd-&gt;fifo_batch = fifo_batch;</div><div class='del'>-	e-&gt;elevator_data = dd;</div><div class='del'>-	return 0;</div><div class='add'>+	return dd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void deadline_put_request(request_queue_t *q, struct request *rq)</div><div class='hunk'>@@ -676,11 +664,10 @@ deadline_set_request(request_queue_t *q, struct request *rq, struct bio *bio,</div><div class='ctx'> 	drq = mempool_alloc(dd-&gt;drq_pool, gfp_mask);</div><div class='ctx'> 	if (drq) {</div><div class='ctx'> 		memset(drq, 0, sizeof(*drq));</div><div class='del'>-		RB_CLEAR(&amp;drq-&gt;rb_node);</div><div class='add'>+		RB_CLEAR_NODE(&amp;drq-&gt;rb_node);</div><div class='ctx'> 		drq-&gt;request = rq;</div><div class='ctx'> </div><div class='del'>-		INIT_LIST_HEAD(&amp;drq-&gt;hash);</div><div class='del'>-		drq-&gt;on_hash = 0;</div><div class='add'>+		INIT_HLIST_NODE(&amp;drq-&gt;hash);</div><div class='ctx'> </div><div class='ctx'> 		INIT_LIST_HEAD(&amp;drq-&gt;fifo);</div><div class='ctx'> </div><div class='head'>diff --git a/block/elevator.c b/block/elevator.c<br/>index 8768a367fdde..bc7baeec0d10 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/elevator.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/elevator.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/elevator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/elevator.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -121,16 +120,16 @@ static struct elevator_type *elevator_get(const char *name)</div><div class='ctx'> 	return e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int elevator_attach(request_queue_t *q, struct elevator_queue *eq)</div><div class='add'>+static void *elevator_init_queue(request_queue_t *q, struct elevator_queue *eq)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	return eq-&gt;ops-&gt;elevator_init_fn(q, eq);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void elevator_attach(request_queue_t *q, struct elevator_queue *eq,</div><div class='add'>+			   void *data)</div><div class='add'>+{</div><div class='ctx'> 	q-&gt;elevator = eq;</div><div class='del'>-</div><div class='del'>-	if (eq-&gt;ops-&gt;elevator_init_fn)</div><div class='del'>-		ret = eq-&gt;ops-&gt;elevator_init_fn(q, eq);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	eq-&gt;elevator_data = data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static char chosen_elevator[16];</div><div class='hunk'>@@ -181,6 +180,7 @@ int elevator_init(request_queue_t *q, char *name)</div><div class='ctx'> 	struct elevator_type *e = NULL;</div><div class='ctx'> 	struct elevator_queue *eq;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	void *data;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;queue_head);</div><div class='ctx'> 	q-&gt;last_merge = NULL;</div><div class='hunk'>@@ -202,10 +202,13 @@ int elevator_init(request_queue_t *q, char *name)</div><div class='ctx'> 	if (!eq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = elevator_attach(q, eq);</div><div class='del'>-	if (ret)</div><div class='add'>+	data = elevator_init_queue(q, eq);</div><div class='add'>+	if (!data) {</div><div class='ctx'> 		kobject_put(&amp;eq-&gt;kobj);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	elevator_attach(q, eq, data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -722,13 +725,16 @@ int elv_register_queue(struct request_queue *q)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __elv_unregister_queue(elevator_t *e)</div><div class='add'>+{</div><div class='add'>+	kobject_uevent(&amp;e-&gt;kobj, KOBJ_REMOVE);</div><div class='add'>+	kobject_del(&amp;e-&gt;kobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void elv_unregister_queue(struct request_queue *q)</div><div class='ctx'> {</div><div class='del'>-	if (q) {</div><div class='del'>-		elevator_t *e = q-&gt;elevator;</div><div class='del'>-		kobject_uevent(&amp;e-&gt;kobj, KOBJ_REMOVE);</div><div class='del'>-		kobject_del(&amp;e-&gt;kobj);</div><div class='del'>-	}</div><div class='add'>+	if (q)</div><div class='add'>+		__elv_unregister_queue(q-&gt;elevator);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int elv_register(struct elevator_type *e)</div><div class='hunk'>@@ -780,6 +786,7 @@ EXPORT_SYMBOL_GPL(elv_unregister);</div><div class='ctx'> static int elevator_switch(request_queue_t *q, struct elevator_type *new_e)</div><div class='ctx'> {</div><div class='ctx'> 	elevator_t *old_elevator, *e;</div><div class='add'>+	void *data;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate new elevator</div><div class='hunk'>@@ -788,6 +795,12 @@ static int elevator_switch(request_queue_t *q, struct elevator_type *new_e)</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	data = elevator_init_queue(q, e);</div><div class='add'>+	if (!data) {</div><div class='add'>+		kobject_put(&amp;e-&gt;kobj);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Turn on BYPASS and drain all requests w/ elevator private data</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -806,19 +819,19 @@ static int elevator_switch(request_queue_t *q, struct elevator_type *new_e)</div><div class='ctx'> 		elv_drain_elevator(q);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(q-&gt;queue_lock);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * unregister old elevator data</div><div class='add'>+	 * Remember old elevator.</div><div class='ctx'> 	 */</div><div class='del'>-	elv_unregister_queue(q);</div><div class='ctx'> 	old_elevator = q-&gt;elevator;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * attach and start new elevator</div><div class='ctx'> 	 */</div><div class='del'>-	if (elevator_attach(q, e))</div><div class='del'>-		goto fail;</div><div class='add'>+	elevator_attach(q, e, data);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(q-&gt;queue_lock);</div><div class='add'>+</div><div class='add'>+	__elv_unregister_queue(old_elevator);</div><div class='ctx'> </div><div class='ctx'> 	if (elv_register_queue(q))</div><div class='ctx'> 		goto fail_register;</div><div class='hunk'>@@ -836,13 +849,9 @@ fail_register:</div><div class='ctx'> 	 * one again (along with re-adding the sysfs dir)</div><div class='ctx'> 	 */</div><div class='ctx'> 	elevator_exit(e);</div><div class='del'>-	e = NULL;</div><div class='del'>-fail:</div><div class='ctx'> 	q-&gt;elevator = old_elevator;</div><div class='ctx'> 	elv_register_queue(q);</div><div class='ctx'> 	clear_bit(QUEUE_FLAG_ELVSWITCH, &amp;q-&gt;queue_flags);</div><div class='del'>-	if (e)</div><div class='del'>-		kobject_put(&amp;e-&gt;kobj);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/block/genhd.c b/block/genhd.c<br/>index 5a8d3bf02f17..25d1f42568cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/genhd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/genhd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/genhd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/genhd.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  gendisk handling</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='hunk'>@@ -17,8 +16,7 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct subsystem block_subsys;</div><div class='del'>-</div><div class='add'>+struct subsystem block_subsys;</div><div class='ctx'> static DEFINE_MUTEX(block_subsys_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -511,9 +509,7 @@ static struct kset_uevent_ops block_uevent_ops = {</div><div class='ctx'> 	.uevent		= block_uevent,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* declare block_subsys. */</div><div class='del'>-static decl_subsys(block, &amp;ktype_block, &amp;block_uevent_ops);</div><div class='del'>-</div><div class='add'>+decl_subsys(block, &amp;ktype_block, &amp;block_uevent_ops);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * aggregate disk stat collector.  Uses the same stats that the sysfs</div><div class='head'>diff --git a/block/ioctl.c b/block/ioctl.c<br/>index 9cfa2e1ecb24..309760b7e37f 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/ioctl.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> 			bdevp = bdget_disk(disk, part);</div><div class='ctx'> 			if (!bdevp)</div><div class='ctx'> 				return -ENOMEM;</div><div class='del'>-			mutex_lock(&amp;bdevp-&gt;bd_mutex);</div><div class='add'>+			mutex_lock_nested(&amp;bdevp-&gt;bd_mutex, BD_MUTEX_PARTITION);</div><div class='ctx'> 			if (bdevp-&gt;bd_openers) {</div><div class='ctx'> 				mutex_unlock(&amp;bdevp-&gt;bd_mutex);</div><div class='ctx'> 				bdput(bdevp);</div><div class='hunk'>@@ -82,7 +82,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user</div><div class='ctx'> 			fsync_bdev(bdevp);</div><div class='ctx'> 			invalidate_bdev(bdevp, 0);</div><div class='ctx'> </div><div class='del'>-			mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+			mutex_lock_nested(&amp;bdev-&gt;bd_mutex, BD_MUTEX_WHOLE);</div><div class='ctx'> 			delete_partition(disk, part);</div><div class='ctx'> 			mutex_unlock(&amp;bdev-&gt;bd_mutex);</div><div class='ctx'> 			mutex_unlock(&amp;bdevp-&gt;bd_mutex);</div><div class='head'>diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c<br/>index 7eb36c53f4b7..61d6b3c65b66 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/ll_rw_blk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/ll_rw_blk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/ll_rw_blk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/ll_rw_blk.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * This handles all read/write requests to block devices</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='hunk'>@@ -638,7 +637,7 @@ void blk_queue_bounce_limit(request_queue_t *q, u64 dma_addr)</div><div class='ctx'> 	/* Assume anything &lt;= 4GB can be handled by IOMMU.</div><div class='ctx'> 	   Actually some IOMMUs can handle everything, but I don't</div><div class='ctx'> 	   know of a way to test this here. */</div><div class='del'>-	if (bounce_pfn &lt; (0xffffffff&gt;&gt;PAGE_SHIFT))</div><div class='add'>+	if (bounce_pfn &lt; (min_t(u64,0xffffffff,BLK_BOUNCE_HIGH) &gt;&gt; PAGE_SHIFT))</div><div class='ctx'> 		dma = 1;</div><div class='ctx'> 	q-&gt;bounce_pfn = max_low_pfn;</div><div class='ctx'> #else</div><div class='hunk'>@@ -1663,6 +1662,8 @@ static void blk_unplug_timeout(unsigned long data)</div><div class='ctx'>  **/</div><div class='ctx'> void blk_start_queue(request_queue_t *q)</div><div class='ctx'> {</div><div class='add'>+	WARN_ON(!irqs_disabled());</div><div class='add'>+</div><div class='ctx'> 	clear_bit(QUEUE_FLAG_STOPPED, &amp;q-&gt;queue_flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1878,7 +1879,8 @@ EXPORT_SYMBOL(blk_alloc_queue_node);</div><div class='ctx'>  *    get dealt with eventually.</div><div class='ctx'>  *</div><div class='ctx'>  *    The queue spin lock must be held while manipulating the requests on the</div><div class='del'>- *    request queue.</div><div class='add'>+ *    request queue; this lock will be taken also from interrupt context, so irq</div><div class='add'>+ *    disabling is needed for it.</div><div class='ctx'>  *</div><div class='ctx'>  *    Function returns a pointer to the initialized request queue, or NULL if</div><div class='ctx'>  *    it didn't succeed.</div><div class='hunk'>@@ -2514,7 +2516,7 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);</div><div class='ctx'> int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,</div><div class='ctx'> 		   struct request *rq, int at_head)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_COMPLETION(wait);</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(wait);</div><div class='ctx'> 	char sense[SCSI_SENSE_BUFFERSIZE];</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2742,7 +2744,7 @@ static int attempt_merge(request_queue_t *q, struct request *req,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * not contigious</div><div class='add'>+	 * not contiguous</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (req-&gt;sector + req-&gt;nr_sectors != next-&gt;sector)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -2824,6 +2826,9 @@ static void init_request_from_bio(struct request *req, struct bio *bio)</div><div class='ctx'> 	if (unlikely(bio_barrier(bio)))</div><div class='ctx'> 		req-&gt;flags |= (REQ_HARDBARRIER | REQ_NOMERGE);</div><div class='ctx'> </div><div class='add'>+	if (bio_sync(bio))</div><div class='add'>+		req-&gt;flags |= REQ_RW_SYNC;</div><div class='add'>+</div><div class='ctx'> 	req-&gt;errors = 0;</div><div class='ctx'> 	req-&gt;hard_sector = req-&gt;sector = bio-&gt;bi_sector;</div><div class='ctx'> 	req-&gt;hard_nr_sectors = req-&gt;nr_sectors = bio_sectors(bio);</div><div class='hunk'>@@ -3111,9 +3116,9 @@ void submit_bio(int rw, struct bio *bio)</div><div class='ctx'> 	BIO_BUG_ON(!bio-&gt;bi_io_vec);</div><div class='ctx'> 	bio-&gt;bi_rw |= rw;</div><div class='ctx'> 	if (rw &amp; WRITE)</div><div class='del'>-		mod_page_state(pgpgout, count);</div><div class='add'>+		count_vm_events(PGPGOUT, count);</div><div class='ctx'> 	else</div><div class='del'>-		mod_page_state(pgpgin, count);</div><div class='add'>+		count_vm_events(PGPGIN, count);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(block_dump)) {</div><div class='ctx'> 		char b[BDEVNAME_SIZE];</div><div class='hunk'>@@ -3359,12 +3364,11 @@ EXPORT_SYMBOL(end_that_request_chunk);</div><div class='ctx'>  */</div><div class='ctx'> static void blk_done_softirq(struct softirq_action *h)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *cpu_list;</div><div class='del'>-	LIST_HEAD(local_list);</div><div class='add'>+	struct list_head *cpu_list, local_list;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_disable();</div><div class='ctx'> 	cpu_list = &amp;__get_cpu_var(blk_cpu_done);</div><div class='del'>-	list_splice_init(cpu_list, &amp;local_list);</div><div class='add'>+	list_replace_init(cpu_list, &amp;local_list);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> </div><div class='ctx'> 	while (!list_empty(&amp;local_list)) {</div><div class='hunk'>@@ -3398,7 +3402,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct notifier_block blk_cpu_notifier = {</div><div class='add'>+static struct notifier_block __devinitdata blk_cpu_notifier = {</div><div class='ctx'> 	.notifier_call	= blk_cpu_notify,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3410,7 +3414,7 @@ static struct notifier_block blk_cpu_notifier = {</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *     Ends all I/O on a request. It does not handle partial completions,</div><div class='del'>- *     unless the driver actually implements this in its completionc callback</div><div class='add'>+ *     unless the driver actually implements this in its completion callback</div><div class='ctx'>  *     through requeueing. Theh actual completion happens out-of-order,</div><div class='ctx'>  *     through a softirq handler. The user must have registered a completion</div><div class='ctx'>  *     callback through blk_queue_softirq_done().</div><div class='hunk'>@@ -3487,8 +3491,8 @@ EXPORT_SYMBOL(end_request);</div><div class='ctx'> </div><div class='ctx'> void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	/* first three bits are identical in rq-&gt;flags and bio-&gt;bi_rw */</div><div class='del'>-	rq-&gt;flags |= (bio-&gt;bi_rw &amp; 7);</div><div class='add'>+	/* first two bits are identical in rq-&gt;flags and bio-&gt;bi_rw */</div><div class='add'>+	rq-&gt;flags |= (bio-&gt;bi_rw &amp; 3);</div><div class='ctx'> </div><div class='ctx'> 	rq-&gt;nr_phys_segments = bio_phys_segments(q, bio);</div><div class='ctx'> 	rq-&gt;nr_hw_segments = bio_hw_segments(q, bio);</div><div class='hunk'>@@ -3536,9 +3540,7 @@ int __init blk_dev_init(void)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;per_cpu(blk_cpu_done, i));</div><div class='ctx'> </div><div class='ctx'> 	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);</div><div class='del'>-#ifdef CONFIG_HOTPLUG_CPU</div><div class='del'>-	register_cpu_notifier(&amp;blk_cpu_notifier);</div><div class='del'>-#endif</div><div class='add'>+	register_hotcpu_notifier(&amp;blk_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	blk_max_low_pfn = max_low_pfn;</div><div class='ctx'> 	blk_max_pfn = max_pfn;</div><div class='head'>diff --git a/block/noop-iosched.c b/block/noop-iosched.c<br/>index f370e4a7fe6d..56a7c620574f 100644<br/>--- a/<a href='/cgit/linux.git/tree/block/noop-iosched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>block/noop-iosched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/block/noop-iosched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>block/noop-iosched.c</a></div><div class='hunk'>@@ -65,16 +65,15 @@ noop_latter_request(request_queue_t *q, struct request *rq)</div><div class='ctx'> 	return list_entry(rq-&gt;queuelist.next, struct request, queuelist);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int noop_init_queue(request_queue_t *q, elevator_t *e)</div><div class='add'>+static void *noop_init_queue(request_queue_t *q, elevator_t *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct noop_data *nd;</div><div class='ctx'> </div><div class='ctx'> 	nd = kmalloc(sizeof(*nd), GFP_KERNEL);</div><div class='ctx'> 	if (!nd)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;nd-&gt;queue);</div><div class='del'>-	e-&gt;elevator_data = nd;</div><div class='del'>-	return 0;</div><div class='add'>+	return nd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void noop_exit_queue(elevator_t *e)</div><div class='head'>diff --git a/crypto/Kconfig b/crypto/Kconfig<br/>index c442f2e7ce46..ba133d557045 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/Kconfig</a></div><div class='hunk'>@@ -337,7 +337,7 @@ config CRYPTO_CRC32C</div><div class='ctx'> </div><div class='ctx'> config CRYPTO_TEST</div><div class='ctx'> 	tristate "Testing module"</div><div class='del'>-	depends on CRYPTO</div><div class='add'>+	depends on CRYPTO &amp;&amp; m</div><div class='ctx'> 	help</div><div class='ctx'> 	  Quick &amp; dirty crypto test module.</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/aes.c b/crypto/aes.c<br/>index a5017292e066..a038711831e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/aes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/aes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/aes.c</a></div><div class='hunk'>@@ -248,10 +248,10 @@ gen_tabs (void)</div><div class='ctx'>     t ^= E_KEY[8 * i + 7]; E_KEY[8 * i + 15] = t;   \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)</div><div class='add'>+static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = ctx_arg;</div><div class='add'>+	struct aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> 	u32 i, t, u, v, w;</div><div class='ctx'> </div><div class='hunk'>@@ -318,9 +318,9 @@ aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)</div><div class='ctx'>     f_rl(bo, bi, 2, k);     \</div><div class='ctx'>     f_rl(bo, bi, 3, k)</div><div class='ctx'> </div><div class='del'>-static void aes_encrypt(void *ctx_arg, u8 *out, const u8 *in)</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	const struct aes_ctx *ctx = ctx_arg;</div><div class='add'>+	const struct aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *src = (const __le32 *)in;</div><div class='ctx'> 	__le32 *dst = (__le32 *)out;</div><div class='ctx'> 	u32 b0[4], b1[4];</div><div class='hunk'>@@ -373,9 +373,9 @@ static void aes_encrypt(void *ctx_arg, u8 *out, const u8 *in)</div><div class='ctx'>     i_rl(bo, bi, 2, k);     \</div><div class='ctx'>     i_rl(bo, bi, 3, k)</div><div class='ctx'> </div><div class='del'>-static void aes_decrypt(void *ctx_arg, u8 *out, const u8 *in)</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	const struct aes_ctx *ctx = ctx_arg;</div><div class='add'>+	const struct aes_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *src = (const __le32 *)in;</div><div class='ctx'> 	__le32 *dst = (__le32 *)out;</div><div class='ctx'> 	u32 b0[4], b1[4];</div><div class='head'>diff --git a/crypto/anubis.c b/crypto/anubis.c<br/>index 2c796bdb91a6..7e2e1a29800e 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/anubis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/anubis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/anubis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/anubis.c</a></div><div class='hunk'>@@ -460,16 +460,15 @@ static const u32 rc[] = {</div><div class='ctx'> 	0xf726ffedU, 0xe89d6f8eU, 0x19a0f089U,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int anubis_setkey(void *ctx_arg, const u8 *in_key,</div><div class='add'>+static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='ctx'> 			 unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='add'>+	struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __be32 *key = (const __be32 *)in_key;</div><div class='ctx'> 	int N, R, i, r;</div><div class='ctx'> 	u32 kappa[ANUBIS_MAX_N];</div><div class='ctx'> 	u32 inter[ANUBIS_MAX_N];</div><div class='ctx'> </div><div class='del'>-	struct anubis_ctx *ctx = ctx_arg;</div><div class='del'>-</div><div class='ctx'> 	switch (key_len)</div><div class='ctx'> 	{</div><div class='ctx'> 		case 16: case 20: case 24: case 28:</div><div class='hunk'>@@ -660,15 +659,15 @@ static void anubis_crypt(u32 roundKey[ANUBIS_MAX_ROUNDS + 1][4],</div><div class='ctx'> 		dst[i] = cpu_to_be32(inter[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void anubis_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='add'>+static void anubis_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct anubis_ctx *ctx = ctx_arg;</div><div class='add'>+	struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	anubis_crypt(ctx-&gt;E, dst, src, ctx-&gt;R);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void anubis_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='add'>+static void anubis_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct anubis_ctx *ctx = ctx_arg;</div><div class='add'>+	struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	anubis_crypt(ctx-&gt;D, dst, src, ctx-&gt;R);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/api.c b/crypto/api.c<br/>index 80bba637fba7..c11ec1fd4f18 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/api.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/api.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/api.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/api.c</a></div><div class='hunk'>@@ -188,13 +188,16 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)</div><div class='ctx'> 	if (crypto_init_flags(tfm, flags))</div><div class='ctx'> 		goto out_free_tfm;</div><div class='ctx'> 		</div><div class='del'>-	if (crypto_init_ops(tfm)) {</div><div class='del'>-		crypto_exit_ops(tfm);</div><div class='add'>+	if (crypto_init_ops(tfm))</div><div class='ctx'> 		goto out_free_tfm;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (alg-&gt;cra_init &amp;&amp; alg-&gt;cra_init(tfm))</div><div class='add'>+		goto cra_init_failed;</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='add'>+cra_init_failed:</div><div class='add'>+	crypto_exit_ops(tfm);</div><div class='ctx'> out_free_tfm:</div><div class='ctx'> 	kfree(tfm);</div><div class='ctx'> 	tfm = NULL;</div><div class='hunk'>@@ -215,6 +218,8 @@ void crypto_free_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> 	alg = tfm-&gt;__crt_alg;</div><div class='ctx'> 	size = sizeof(*tfm) + alg-&gt;cra_ctxsize;</div><div class='ctx'> </div><div class='add'>+	if (alg-&gt;cra_exit)</div><div class='add'>+		alg-&gt;cra_exit(tfm);</div><div class='ctx'> 	crypto_exit_ops(tfm);</div><div class='ctx'> 	crypto_alg_put(alg);</div><div class='ctx'> 	memset(tfm, 0, size);</div><div class='hunk'>@@ -224,7 +229,7 @@ void crypto_free_tfm(struct crypto_tfm *tfm)</div><div class='ctx'> static inline int crypto_set_driver_name(struct crypto_alg *alg)</div><div class='ctx'> {</div><div class='ctx'> 	static const char suffix[] = "-generic";</div><div class='del'>-	char *driver_name = (char *)alg-&gt;cra_driver_name;</div><div class='add'>+	char *driver_name = alg-&gt;cra_driver_name;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	if (*driver_name)</div><div class='hunk'>@@ -262,13 +267,13 @@ int crypto_register_alg(struct crypto_alg *alg)</div><div class='ctx'> 	down_write(&amp;crypto_alg_sem);</div><div class='ctx'> 	</div><div class='ctx'> 	list_for_each_entry(q, &amp;crypto_alg_list, cra_list) {</div><div class='del'>-		if (!strcmp(q-&gt;cra_driver_name, alg-&gt;cra_driver_name)) {</div><div class='add'>+		if (q == alg) {</div><div class='ctx'> 			ret = -EEXIST;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	list_add_tail(&amp;alg-&gt;cra_list, &amp;crypto_alg_list);</div><div class='add'>+	list_add(&amp;alg-&gt;cra_list, &amp;crypto_alg_list);</div><div class='ctx'> out:	</div><div class='ctx'> 	up_write(&amp;crypto_alg_sem);</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/crypto/arc4.c b/crypto/arc4.c<br/>index 9efbcaae88a1..5edc6a65b987 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/arc4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/arc4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/arc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/arc4.c</a></div><div class='hunk'>@@ -24,9 +24,10 @@ struct arc4_ctx {</div><div class='ctx'> 	u8 x, y;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int arc4_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)</div><div class='add'>+static int arc4_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct arc4_ctx *ctx = ctx_arg;</div><div class='add'>+	struct arc4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int i, j = 0, k = 0;</div><div class='ctx'> </div><div class='ctx'> 	ctx-&gt;x = 1;</div><div class='hunk'>@@ -48,9 +49,9 @@ static int arc4_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void arc4_crypt(void *ctx_arg, u8 *out, const u8 *in)</div><div class='add'>+static void arc4_crypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct arc4_ctx *ctx = ctx_arg;</div><div class='add'>+	struct arc4_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	u8 *const S = ctx-&gt;S;</div><div class='ctx'> 	u8 x = ctx-&gt;x;</div><div class='head'>diff --git a/crypto/blowfish.c b/crypto/blowfish.c<br/>index 7f710b201f20..490265f42b3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/blowfish.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/blowfish.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/blowfish.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/blowfish.c</a></div><div class='hunk'>@@ -349,7 +349,7 @@ static void encrypt_block(struct bf_ctx *bctx, u32 *dst, u32 *src)</div><div class='ctx'> 	dst[1] = yl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bf_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void bf_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	const __be32 *in_blk = (const __be32 *)src;</div><div class='ctx'> 	__be32 *const out_blk = (__be32 *)dst;</div><div class='hunk'>@@ -357,17 +357,18 @@ static void bf_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> </div><div class='ctx'> 	in32[0] = be32_to_cpu(in_blk[0]);</div><div class='ctx'> 	in32[1] = be32_to_cpu(in_blk[1]);</div><div class='del'>-	encrypt_block(ctx, out32, in32);</div><div class='add'>+	encrypt_block(crypto_tfm_ctx(tfm), out32, in32);</div><div class='ctx'> 	out_blk[0] = cpu_to_be32(out32[0]);</div><div class='ctx'> 	out_blk[1] = cpu_to_be32(out32[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bf_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void bf_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='add'>+	struct bf_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __be32 *in_blk = (const __be32 *)src;</div><div class='ctx'> 	__be32 *const out_blk = (__be32 *)dst;</div><div class='del'>-	const u32 *P = ((struct bf_ctx *)ctx)-&gt;p;</div><div class='del'>-	const u32 *S = ((struct bf_ctx *)ctx)-&gt;s;</div><div class='add'>+	const u32 *P = ctx-&gt;p;</div><div class='add'>+	const u32 *S = ctx-&gt;s;</div><div class='ctx'> 	u32 yl = be32_to_cpu(in_blk[0]);</div><div class='ctx'> 	u32 yr = be32_to_cpu(in_blk[1]);</div><div class='ctx'> </div><div class='hunk'>@@ -398,12 +399,14 @@ static void bf_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> /* </div><div class='ctx'>  * Calculates the blowfish S and P boxes for encryption and decryption.</div><div class='ctx'>  */</div><div class='del'>-static int bf_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)</div><div class='add'>+static int bf_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+		     unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='add'>+	struct bf_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	u32 *P = ctx-&gt;p;</div><div class='add'>+	u32 *S = ctx-&gt;s;</div><div class='ctx'> 	short i, j, count;</div><div class='ctx'> 	u32 data[2], temp;</div><div class='del'>-	u32 *P = ((struct bf_ctx *)ctx)-&gt;p;</div><div class='del'>-	u32 *S = ((struct bf_ctx *)ctx)-&gt;s;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the initialization s-boxes */</div><div class='ctx'> 	for (i = 0, count = 0; i &lt; 256; i++)</div><div class='head'>diff --git a/crypto/cast5.c b/crypto/cast5.c<br/>index 8834c8580c04..08eef58c1d3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/cast5.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/cast5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/cast5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/cast5.c</a></div><div class='hunk'>@@ -577,9 +577,9 @@ static const u32 sb8[256] = {</div><div class='ctx'>     (((s1[I &gt;&gt; 24] + s2[(I&gt;&gt;16)&amp;0xff]) ^ s3[(I&gt;&gt;8)&amp;0xff]) - s4[I&amp;0xff]) )</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf)</div><div class='add'>+static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)</div><div class='ctx'> {</div><div class='del'>-	struct cast5_ctx *c = (struct cast5_ctx *) ctx;</div><div class='add'>+	struct cast5_ctx *c = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __be32 *src = (const __be32 *)inbuf;</div><div class='ctx'> 	__be32 *dst = (__be32 *)outbuf;</div><div class='ctx'> 	u32 l, r, t;</div><div class='hunk'>@@ -642,9 +642,9 @@ static void cast5_encrypt(void *ctx, u8 * outbuf, const u8 * inbuf)</div><div class='ctx'> 	dst[1] = cpu_to_be32(l);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cast5_decrypt(void *ctx, u8 * outbuf, const u8 * inbuf)</div><div class='add'>+static void cast5_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)</div><div class='ctx'> {</div><div class='del'>-	struct cast5_ctx *c = (struct cast5_ctx *) ctx;</div><div class='add'>+	struct cast5_ctx *c = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __be32 *src = (const __be32 *)inbuf;</div><div class='ctx'> 	__be32 *dst = (__be32 *)outbuf;</div><div class='ctx'> 	u32 l, r, t;</div><div class='hunk'>@@ -769,15 +769,15 @@ static void key_schedule(u32 * x, u32 * z, u32 * k)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-cast5_setkey(void *ctx, const u8 * key, unsigned key_len, u32 * flags)</div><div class='add'>+static int cast5_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			unsigned key_len, u32 *flags)</div><div class='ctx'> {</div><div class='add'>+	struct cast5_ctx *c = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 x[4];</div><div class='ctx'> 	u32 z[4];</div><div class='ctx'> 	u32 k[16];</div><div class='ctx'> 	__be32 p_key[4];</div><div class='del'>-	struct cast5_ctx *c = (struct cast5_ctx *) ctx;</div><div class='ctx'> 	</div><div class='ctx'> 	if (key_len &lt; 5 || key_len &gt; 16) {</div><div class='ctx'> 		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='head'>diff --git a/crypto/cast6.c b/crypto/cast6.c<br/>index 9e28740ba775..08e33bfc3ad1 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/cast6.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/cast6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/cast6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/cast6.c</a></div><div class='hunk'>@@ -381,13 +381,13 @@ static inline void W(u32 *key, unsigned int i) {</div><div class='ctx'> 	key[7] ^= F2(key[0], Tr[i % 4][7], Tm[i][7]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-cast6_setkey(void *ctx, const u8 * in_key, unsigned key_len, u32 * flags)</div><div class='add'>+static int cast6_setkey(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			unsigned key_len, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 key[8];</div><div class='ctx'> 	__be32 p_key[8]; /* padded key */</div><div class='del'>-	struct cast6_ctx *c = (struct cast6_ctx *) ctx;</div><div class='add'>+	struct cast6_ctx *c = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	if (key_len &lt; 16 || key_len &gt; 32 || key_len % 4 != 0) {</div><div class='ctx'> 		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='hunk'>@@ -444,8 +444,9 @@ static inline void QBAR (u32 * block, u8 * Kr, u32 * Km) {</div><div class='ctx'>         block[2] ^= F1(block[3], Kr[0], Km[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cast6_encrypt (void * ctx, u8 * outbuf, const u8 * inbuf) {</div><div class='del'>-	struct cast6_ctx * c = (struct cast6_ctx *)ctx;</div><div class='add'>+static void cast6_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf)</div><div class='add'>+{</div><div class='add'>+	struct cast6_ctx *c = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __be32 *src = (const __be32 *)inbuf;</div><div class='ctx'> 	__be32 *dst = (__be32 *)outbuf;</div><div class='ctx'> 	u32 block[4];</div><div class='hunk'>@@ -476,8 +477,8 @@ static void cast6_encrypt (void * ctx, u8 * outbuf, const u8 * inbuf) {</div><div class='ctx'> 	dst[3] = cpu_to_be32(block[3]);</div><div class='ctx'> }	</div><div class='ctx'> </div><div class='del'>-static void cast6_decrypt (void * ctx, u8 * outbuf, const u8 * inbuf) {</div><div class='del'>-	struct cast6_ctx * c = (struct cast6_ctx *)ctx;</div><div class='add'>+static void cast6_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) {</div><div class='add'>+	struct cast6_ctx * c = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __be32 *src = (const __be32 *)inbuf;</div><div class='ctx'> 	__be32 *dst = (__be32 *)outbuf;</div><div class='ctx'> 	u32 block[4];</div><div class='head'>diff --git a/crypto/cipher.c b/crypto/cipher.c<br/>index 65bcea0cd17c..b899eb97abd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/cipher.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/cipher.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/cipher.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/cipher.c</a></div><div class='hunk'>@@ -187,7 +187,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,</div><div class='ctx'> 	void (*xor)(u8 *, const u8 *) = tfm-&gt;crt_u.cipher.cit_xor_block;</div><div class='ctx'> 	int bsize = crypto_tfm_alg_blocksize(tfm);</div><div class='ctx'> </div><div class='del'>-	void (*fn)(void *, u8 *, const u8 *) = desc-&gt;crfn;</div><div class='add'>+	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = desc-&gt;crfn;</div><div class='ctx'> 	u8 *iv = desc-&gt;info;</div><div class='ctx'> 	unsigned int done = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +195,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		xor(iv, src);</div><div class='del'>-		fn(crypto_tfm_ctx(tfm), dst, iv);</div><div class='add'>+		fn(tfm, dst, iv);</div><div class='ctx'> 		memcpy(iv, dst, bsize);</div><div class='ctx'> </div><div class='ctx'> 		src += bsize;</div><div class='hunk'>@@ -218,7 +218,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,</div><div class='ctx'> 	u8 *buf = (u8 *)ALIGN((unsigned long)stack, alignmask + 1);</div><div class='ctx'> 	u8 **dst_p = src == dst ? &amp;buf : &amp;dst;</div><div class='ctx'> </div><div class='del'>-	void (*fn)(void *, u8 *, const u8 *) = desc-&gt;crfn;</div><div class='add'>+	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = desc-&gt;crfn;</div><div class='ctx'> 	u8 *iv = desc-&gt;info;</div><div class='ctx'> 	unsigned int done = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +227,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,</div><div class='ctx'> 	do {</div><div class='ctx'> 		u8 *tmp_dst = *dst_p;</div><div class='ctx'> </div><div class='del'>-		fn(crypto_tfm_ctx(tfm), tmp_dst, src);</div><div class='add'>+		fn(tfm, tmp_dst, src);</div><div class='ctx'> 		xor(tmp_dst, iv);</div><div class='ctx'> 		memcpy(iv, src, bsize);</div><div class='ctx'> 		if (tmp_dst != dst)</div><div class='hunk'>@@ -245,13 +245,13 @@ static unsigned int ecb_process(const struct cipher_desc *desc, u8 *dst,</div><div class='ctx'> {</div><div class='ctx'> 	struct crypto_tfm *tfm = desc-&gt;tfm;</div><div class='ctx'> 	int bsize = crypto_tfm_alg_blocksize(tfm);</div><div class='del'>-	void (*fn)(void *, u8 *, const u8 *) = desc-&gt;crfn;</div><div class='add'>+	void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = desc-&gt;crfn;</div><div class='ctx'> 	unsigned int done = 0;</div><div class='ctx'> </div><div class='ctx'> 	nbytes -= bsize;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		fn(crypto_tfm_ctx(tfm), dst, src);</div><div class='add'>+		fn(tfm, dst, src);</div><div class='ctx'> </div><div class='ctx'> 		src += bsize;</div><div class='ctx'> 		dst += bsize;</div><div class='hunk'>@@ -268,7 +268,7 @@ static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)</div><div class='ctx'> 		tfm-&gt;crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	} else</div><div class='del'>-		return cia-&gt;cia_setkey(crypto_tfm_ctx(tfm), key, keylen,</div><div class='add'>+		return cia-&gt;cia_setkey(tfm, key, keylen,</div><div class='ctx'> 		                       &amp;tfm-&gt;crt_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/compress.c b/crypto/compress.c<br/>index eb36d9364da3..eca182aa3380 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/compress.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/compress.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/compress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/compress.c</a></div><div class='hunk'>@@ -22,8 +22,7 @@ static int crypto_compress(struct crypto_tfm *tfm,</div><div class='ctx'>                             const u8 *src, unsigned int slen,</div><div class='ctx'>                             u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='del'>-	return tfm-&gt;__crt_alg-&gt;cra_compress.coa_compress(crypto_tfm_ctx(tfm),</div><div class='del'>-	                                                 src, slen, dst,</div><div class='add'>+	return tfm-&gt;__crt_alg-&gt;cra_compress.coa_compress(tfm, src, slen, dst,</div><div class='ctx'> 	                                                 dlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -31,8 +30,7 @@ static int crypto_decompress(struct crypto_tfm *tfm,</div><div class='ctx'>                              const u8 *src, unsigned int slen,</div><div class='ctx'>                              u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='del'>-	return tfm-&gt;__crt_alg-&gt;cra_compress.coa_decompress(crypto_tfm_ctx(tfm),</div><div class='del'>-	                                                   src, slen, dst,</div><div class='add'>+	return tfm-&gt;__crt_alg-&gt;cra_compress.coa_decompress(tfm, src, slen, dst,</div><div class='ctx'> 	                                                   dlen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -43,21 +41,14 @@ int crypto_init_compress_flags(struct crypto_tfm *tfm, u32 flags)</div><div class='ctx'> </div><div class='ctx'> int crypto_init_compress_ops(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='ctx'> 	struct compress_tfm *ops = &amp;tfm-&gt;crt_compress;</div><div class='del'>-	</div><div class='del'>-	ret = tfm-&gt;__crt_alg-&gt;cra_compress.coa_init(crypto_tfm_ctx(tfm));</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ops-&gt;cot_compress = crypto_compress;</div><div class='ctx'> 	ops-&gt;cot_decompress = crypto_decompress;</div><div class='ctx'> 	</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void crypto_exit_compress_ops(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	tfm-&gt;__crt_alg-&gt;cra_compress.coa_exit(crypto_tfm_ctx(tfm));</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/crc32c.c b/crypto/crc32c.c<br/>index 953362423a5c..f2660123aeb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/crc32c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/crc32c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/crc32c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/crc32c.c</a></div><div class='hunk'>@@ -31,9 +31,9 @@ struct chksum_ctx {</div><div class='ctx'>  * crc using table.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void chksum_init(void *ctx)</div><div class='add'>+static void chksum_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct chksum_ctx *mctx = ctx;</div><div class='add'>+	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	mctx-&gt;crc = ~(u32)0;			/* common usage */</div><div class='ctx'> }</div><div class='hunk'>@@ -43,10 +43,10 @@ static void chksum_init(void *ctx)</div><div class='ctx'>  * If your algorithm starts with ~0, then XOR with ~0 before you set</div><div class='ctx'>  * the seed.</div><div class='ctx'>  */</div><div class='del'>-static int chksum_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='del'>-	                  u32 *flags)</div><div class='add'>+static int chksum_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			 unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct chksum_ctx *mctx = ctx;</div><div class='add'>+	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	if (keylen != sizeof(mctx-&gt;crc)) {</div><div class='ctx'> 		if (flags)</div><div class='hunk'>@@ -57,9 +57,10 @@ static int chksum_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void chksum_update(void *ctx, const u8 *data, unsigned int length)</div><div class='add'>+static void chksum_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			  unsigned int length)</div><div class='ctx'> {</div><div class='del'>-	struct chksum_ctx *mctx = ctx;</div><div class='add'>+	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u32 mcrc;</div><div class='ctx'> </div><div class='ctx'> 	mcrc = crc32c(mctx-&gt;crc, data, (size_t)length);</div><div class='hunk'>@@ -67,9 +68,9 @@ static void chksum_update(void *ctx, const u8 *data, unsigned int length)</div><div class='ctx'> 	mctx-&gt;crc = mcrc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void chksum_final(void *ctx, u8 *out)</div><div class='add'>+static void chksum_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct chksum_ctx *mctx = ctx;</div><div class='add'>+	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u32 mcrc = (mctx-&gt;crc ^ ~(u32)0);</div><div class='ctx'> 	</div><div class='ctx'> 	*(u32 *)out = __le32_to_cpu(mcrc);</div><div class='head'>diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c<br/>index 3fcf6e887e87..a0d956b52949 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/crypto_null.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/crypto_null.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/crypto_null.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/crypto_null.c</a></div><div class='hunk'>@@ -27,8 +27,8 @@</div><div class='ctx'> #define NULL_BLOCK_SIZE		1</div><div class='ctx'> #define NULL_DIGEST_SIZE	0</div><div class='ctx'> </div><div class='del'>-static int null_compress(void *ctx, const u8 *src, unsigned int slen,</div><div class='del'>-                         u8 *dst, unsigned int *dlen)</div><div class='add'>+static int null_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			 unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='ctx'> 	if (slen &gt; *dlen)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -37,20 +37,21 @@ static int null_compress(void *ctx, const u8 *src, unsigned int slen,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void null_init(void *ctx)</div><div class='add'>+static void null_init(struct crypto_tfm *tfm)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='del'>-static void null_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void null_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			unsigned int len)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='del'>-static void null_final(void *ctx, u8 *out)</div><div class='add'>+static void null_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='del'>-static int null_setkey(void *ctx, const u8 *key,</div><div class='del'>-                       unsigned int keylen, u32 *flags)</div><div class='add'>+static int null_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+		       unsigned int keylen, u32 *flags)</div><div class='ctx'> { return 0; }</div><div class='ctx'> </div><div class='del'>-static void null_crypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void null_crypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(dst, src, NULL_BLOCK_SIZE);</div><div class='ctx'> }</div><div class='head'>diff --git a/crypto/deflate.c b/crypto/deflate.c<br/>index f209368d62ae..6588bbf82e9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/deflate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/deflate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/deflate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/deflate.c</a></div><div class='hunk'>@@ -102,8 +102,9 @@ static void deflate_decomp_exit(struct deflate_ctx *ctx)</div><div class='ctx'> 	kfree(ctx-&gt;decomp_stream.workspace);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int deflate_init(void *ctx)</div><div class='add'>+static int deflate_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='add'>+	struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	</div><div class='ctx'> 	ret = deflate_comp_init(ctx);</div><div class='hunk'>@@ -116,17 +117,19 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void deflate_exit(void *ctx)</div><div class='add'>+static void deflate_exit(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='add'>+	struct deflate_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+</div><div class='ctx'> 	deflate_comp_exit(ctx);</div><div class='ctx'> 	deflate_decomp_exit(ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int deflate_compress(void *ctx, const u8 *src, unsigned int slen,</div><div class='del'>-	                    u8 *dst, unsigned int *dlen)</div><div class='add'>+static int deflate_compress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			    unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct deflate_ctx *dctx = ctx;</div><div class='add'>+	struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct z_stream_s *stream = &amp;dctx-&gt;comp_stream;</div><div class='ctx'> </div><div class='ctx'> 	ret = zlib_deflateReset(stream);</div><div class='hunk'>@@ -151,12 +154,12 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='del'>-static int deflate_decompress(void *ctx, const u8 *src, unsigned int slen,</div><div class='del'>-                              u8 *dst, unsigned int *dlen)</div><div class='add'>+static int deflate_decompress(struct crypto_tfm *tfm, const u8 *src,</div><div class='add'>+			      unsigned int slen, u8 *dst, unsigned int *dlen)</div><div class='ctx'> {</div><div class='ctx'> 	</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct deflate_ctx *dctx = ctx;</div><div class='add'>+	struct deflate_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	struct z_stream_s *stream = &amp;dctx-&gt;decomp_stream;</div><div class='ctx'> </div><div class='ctx'> 	ret = zlib_inflateReset(stream);</div><div class='hunk'>@@ -198,9 +201,9 @@ static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_ctxsize		= sizeof(struct deflate_ctx),</div><div class='ctx'> 	.cra_module		= THIS_MODULE,</div><div class='ctx'> 	.cra_list		= LIST_HEAD_INIT(alg.cra_list),</div><div class='add'>+	.cra_init		= deflate_init,</div><div class='add'>+	.cra_exit		= deflate_exit,</div><div class='ctx'> 	.cra_u			= { .compress = {</div><div class='del'>-	.coa_init		= deflate_init,</div><div class='del'>-	.coa_exit		= deflate_exit,</div><div class='ctx'> 	.coa_compress 		= deflate_compress,</div><div class='ctx'> 	.coa_decompress  	= deflate_decompress } }</div><div class='ctx'> };</div><div class='head'>diff --git a/crypto/des.c b/crypto/des.c<br/>index 2d74cab40c3e..a9d3c235a6af 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/des.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/des.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/des.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/des.c</a></div><div class='hunk'>@@ -783,9 +783,10 @@ static void dkey(u32 *pe, const u8 *k)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)</div><div class='add'>+static int des_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+		      unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct des_ctx *dctx = ctx;</div><div class='add'>+	struct des_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u32 tmp[DES_EXPKEY_WORDS];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -803,9 +804,10 @@ static int des_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	const u32 *K = ((struct des_ctx *)ctx)-&gt;expkey;</div><div class='add'>+	struct des_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	const u32 *K = ctx-&gt;expkey;</div><div class='ctx'> 	const __le32 *s = (const __le32 *)src;</div><div class='ctx'> 	__le32 *d = (__le32 *)dst;</div><div class='ctx'> 	u32 L, R, A, B;</div><div class='hunk'>@@ -825,9 +827,10 @@ static void des_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> 	d[1] = cpu_to_le32(L);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	const u32 *K = ((struct des_ctx *)ctx)-&gt;expkey + DES_EXPKEY_WORDS - 2;</div><div class='add'>+	struct des_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	const u32 *K = ctx-&gt;expkey + DES_EXPKEY_WORDS - 2;</div><div class='ctx'> 	const __le32 *s = (const __le32 *)src;</div><div class='ctx'> 	__le32 *d = (__le32 *)dst;</div><div class='ctx'> 	u32 L, R, A, B;</div><div class='hunk'>@@ -860,11 +863,11 @@ static void des_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'>  *   property.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int des3_ede_setkey(void *ctx, const u8 *key,</div><div class='add'>+static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='ctx'> 			   unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 *K = (const u32 *)key;</div><div class='del'>-	struct des3_ede_ctx *dctx = ctx;</div><div class='add'>+	struct des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u32 *expkey = dctx-&gt;expkey;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) ||</div><div class='hunk'>@@ -881,9 +884,9 @@ static int des3_ede_setkey(void *ctx, const u8 *key,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des3_ede_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des3_ede_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct des3_ede_ctx *dctx = ctx;</div><div class='add'>+	struct des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u32 *K = dctx-&gt;expkey;</div><div class='ctx'> 	const __le32 *s = (const __le32 *)src;</div><div class='ctx'> 	__le32 *d = (__le32 *)dst;</div><div class='hunk'>@@ -912,9 +915,9 @@ static void des3_ede_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> 	d[1] = cpu_to_le32(L);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void des3_ede_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void des3_ede_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct des3_ede_ctx *dctx = ctx;</div><div class='add'>+	struct des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u32 *K = dctx-&gt;expkey + DES3_EDE_EXPKEY_WORDS - 2;</div><div class='ctx'> 	const __le32 *s = (const __le32 *)src;</div><div class='ctx'> 	__le32 *d = (__le32 *)dst;</div><div class='head'>diff --git a/crypto/digest.c b/crypto/digest.c<br/>index d9b6ac9dbf8d..603006a7bef2 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/digest.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/digest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/digest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/digest.c</a></div><div class='hunk'>@@ -20,13 +20,14 @@</div><div class='ctx'> </div><div class='ctx'> static void init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	tfm-&gt;__crt_alg-&gt;cra_digest.dia_init(crypto_tfm_ctx(tfm));</div><div class='add'>+	tfm-&gt;__crt_alg-&gt;cra_digest.dia_init(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void update(struct crypto_tfm *tfm,</div><div class='ctx'>                    struct scatterlist *sg, unsigned int nsg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	unsigned int alignmask = crypto_tfm_alg_alignmask(tfm);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nsg; i++) {</div><div class='ctx'> </div><div class='hunk'>@@ -38,12 +39,22 @@ static void update(struct crypto_tfm *tfm,</div><div class='ctx'> 			unsigned int bytes_from_page = min(l, ((unsigned int)</div><div class='ctx'> 							   (PAGE_SIZE)) - </div><div class='ctx'> 							   offset);</div><div class='del'>-			char *p = crypto_kmap(pg, 0) + offset;</div><div class='add'>+			char *src = crypto_kmap(pg, 0);</div><div class='add'>+			char *p = src + offset;</div><div class='ctx'> </div><div class='del'>-			tfm-&gt;__crt_alg-&gt;cra_digest.dia_update</div><div class='del'>-					(crypto_tfm_ctx(tfm), p,</div><div class='del'>-					 bytes_from_page);</div><div class='del'>-			crypto_kunmap(p, 0);</div><div class='add'>+			if (unlikely(offset &amp; alignmask)) {</div><div class='add'>+				unsigned int bytes =</div><div class='add'>+					alignmask + 1 - (offset &amp; alignmask);</div><div class='add'>+				bytes = min(bytes, bytes_from_page);</div><div class='add'>+				tfm-&gt;__crt_alg-&gt;cra_digest.dia_update(tfm, p,</div><div class='add'>+								      bytes);</div><div class='add'>+				p += bytes;</div><div class='add'>+				bytes_from_page -= bytes;</div><div class='add'>+				l -= bytes;</div><div class='add'>+			}</div><div class='add'>+			tfm-&gt;__crt_alg-&gt;cra_digest.dia_update(tfm, p,</div><div class='add'>+							      bytes_from_page);</div><div class='add'>+			crypto_kunmap(src, 0);</div><div class='ctx'> 			crypto_yield(tfm);</div><div class='ctx'> 			offset = 0;</div><div class='ctx'> 			pg++;</div><div class='hunk'>@@ -54,7 +65,15 @@ static void update(struct crypto_tfm *tfm,</div><div class='ctx'> </div><div class='ctx'> static void final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	tfm-&gt;__crt_alg-&gt;cra_digest.dia_final(crypto_tfm_ctx(tfm), out);</div><div class='add'>+	unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);</div><div class='add'>+	if (unlikely((unsigned long)out &amp; alignmask)) {</div><div class='add'>+		unsigned int size = crypto_tfm_alg_digestsize(tfm);</div><div class='add'>+		u8 buffer[size + alignmask];</div><div class='add'>+		u8 *dst = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);</div><div class='add'>+		tfm-&gt;__crt_alg-&gt;cra_digest.dia_final(tfm, dst);</div><div class='add'>+		memcpy(out, dst, size);</div><div class='add'>+	} else</div><div class='add'>+		tfm-&gt;__crt_alg-&gt;cra_digest.dia_final(tfm, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)</div><div class='hunk'>@@ -62,25 +81,15 @@ static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	if (tfm-&gt;__crt_alg-&gt;cra_digest.dia_setkey == NULL)</div><div class='ctx'> 		return -ENOSYS;</div><div class='del'>-	return tfm-&gt;__crt_alg-&gt;cra_digest.dia_setkey(crypto_tfm_ctx(tfm),</div><div class='del'>-						     key, keylen, &amp;flags);</div><div class='add'>+	return tfm-&gt;__crt_alg-&gt;cra_digest.dia_setkey(tfm, key, keylen, &amp;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void digest(struct crypto_tfm *tfm,</div><div class='ctx'>                    struct scatterlist *sg, unsigned int nsg, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	tfm-&gt;crt_digest.dit_init(tfm);</div><div class='del'>-		</div><div class='del'>-	for (i = 0; i &lt; nsg; i++) {</div><div class='del'>-		char *p = crypto_kmap(sg[i].page, 0) + sg[i].offset;</div><div class='del'>-		tfm-&gt;__crt_alg-&gt;cra_digest.dia_update(crypto_tfm_ctx(tfm),</div><div class='del'>-		                                      p, sg[i].length);</div><div class='del'>-		crypto_kunmap(p, 0);</div><div class='del'>-		crypto_yield(tfm);</div><div class='del'>-	}</div><div class='del'>-	crypto_digest_final(tfm, out);</div><div class='add'>+	init(tfm);</div><div class='add'>+	update(tfm, sg, nsg);</div><div class='add'>+	final(tfm, out);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags)</div><div class='head'>diff --git a/crypto/khazad.c b/crypto/khazad.c<br/>index 807f2bf4ea24..d4c9d3657b36 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/khazad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/khazad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/khazad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/khazad.c</a></div><div class='hunk'>@@ -754,11 +754,11 @@ static const u64 c[KHAZAD_ROUNDS + 1] = {</div><div class='ctx'> 	0xccc41d14c363da5dULL, 0x5fdc7dcd7f5a6c5cULL, 0xf726ffede89d6f8eULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int khazad_setkey(void *ctx_arg, const u8 *in_key,</div><div class='del'>-                       unsigned int key_len, u32 *flags)</div><div class='add'>+static int khazad_setkey(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+			 unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct khazad_ctx *ctx = ctx_arg;</div><div class='del'>-	const __be64 *key = (const __be64 *)in_key;</div><div class='add'>+	struct khazad_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	const __be32 *key = (const __be32 *)in_key;</div><div class='ctx'> 	int r;</div><div class='ctx'> 	const u64 *S = T7;</div><div class='ctx'> 	u64 K2, K1;</div><div class='hunk'>@@ -769,8 +769,9 @@ static int khazad_setkey(void *ctx_arg, const u8 *in_key,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	K2 = be64_to_cpu(key[0]);</div><div class='del'>-	K1 = be64_to_cpu(key[1]);</div><div class='add'>+	/* key is supposed to be 32-bit aligned */</div><div class='add'>+	K2 = ((u64)be32_to_cpu(key[0]) &lt;&lt; 32) | be32_to_cpu(key[1]);</div><div class='add'>+	K1 = ((u64)be32_to_cpu(key[2]) &lt;&lt; 32) | be32_to_cpu(key[3]);</div><div class='ctx'> </div><div class='ctx'> 	/* setup the encrypt key */</div><div class='ctx'> 	for (r = 0; r &lt;= KHAZAD_ROUNDS; r++) {</div><div class='hunk'>@@ -840,15 +841,15 @@ static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],</div><div class='ctx'> 	*dst = cpu_to_be64(state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void khazad_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='add'>+static void khazad_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct khazad_ctx *ctx = ctx_arg;</div><div class='add'>+	struct khazad_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	khazad_crypt(ctx-&gt;E, dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void khazad_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='add'>+static void khazad_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='del'>-	struct khazad_ctx *ctx = ctx_arg;</div><div class='add'>+	struct khazad_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	khazad_crypt(ctx-&gt;D, dst, src);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/md4.c b/crypto/md4.c<br/>index a2d6df5c0f8c..c1bc71bdc16b 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/md4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/md4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/md4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/md4.c</a></div><div class='hunk'>@@ -152,9 +152,9 @@ static inline void md4_transform_helper(struct md4_ctx *ctx)</div><div class='ctx'> 	md4_transform(ctx-&gt;hash, ctx-&gt;block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void md4_init(void *ctx)</div><div class='add'>+static void md4_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct md4_ctx *mctx = ctx;</div><div class='add'>+	struct md4_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	mctx-&gt;hash[0] = 0x67452301;</div><div class='ctx'> 	mctx-&gt;hash[1] = 0xefcdab89;</div><div class='hunk'>@@ -163,9 +163,9 @@ static void md4_init(void *ctx)</div><div class='ctx'> 	mctx-&gt;byte_count = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void md4_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void md4_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct md4_ctx *mctx = ctx;</div><div class='add'>+	struct md4_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u32 avail = sizeof(mctx-&gt;block) - (mctx-&gt;byte_count &amp; 0x3f);</div><div class='ctx'> </div><div class='ctx'> 	mctx-&gt;byte_count += len;</div><div class='hunk'>@@ -193,9 +193,9 @@ static void md4_update(void *ctx, const u8 *data, unsigned int len)</div><div class='ctx'> 	memcpy(mctx-&gt;block, data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void md4_final(void *ctx, u8 *out)</div><div class='add'>+static void md4_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct md4_ctx *mctx = ctx;</div><div class='add'>+	struct md4_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const unsigned int offset = mctx-&gt;byte_count &amp; 0x3f;</div><div class='ctx'> 	char *p = (char *)mctx-&gt;block + offset;</div><div class='ctx'> 	int padding = 56 - (offset + 1);</div><div class='head'>diff --git a/crypto/md5.c b/crypto/md5.c<br/>index 7f041aef5da2..93d18e8b3d53 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/md5.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/md5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/md5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/md5.c</a></div><div class='hunk'>@@ -147,9 +147,9 @@ static inline void md5_transform_helper(struct md5_ctx *ctx)</div><div class='ctx'> 	md5_transform(ctx-&gt;hash, ctx-&gt;block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void md5_init(void *ctx)</div><div class='add'>+static void md5_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct md5_ctx *mctx = ctx;</div><div class='add'>+	struct md5_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	mctx-&gt;hash[0] = 0x67452301;</div><div class='ctx'> 	mctx-&gt;hash[1] = 0xefcdab89;</div><div class='hunk'>@@ -158,9 +158,9 @@ static void md5_init(void *ctx)</div><div class='ctx'> 	mctx-&gt;byte_count = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void md5_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void md5_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct md5_ctx *mctx = ctx;</div><div class='add'>+	struct md5_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u32 avail = sizeof(mctx-&gt;block) - (mctx-&gt;byte_count &amp; 0x3f);</div><div class='ctx'> </div><div class='ctx'> 	mctx-&gt;byte_count += len;</div><div class='hunk'>@@ -188,9 +188,9 @@ static void md5_update(void *ctx, const u8 *data, unsigned int len)</div><div class='ctx'> 	memcpy(mctx-&gt;block, data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void md5_final(void *ctx, u8 *out)</div><div class='add'>+static void md5_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct md5_ctx *mctx = ctx;</div><div class='add'>+	struct md5_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const unsigned int offset = mctx-&gt;byte_count &amp; 0x3f;</div><div class='ctx'> 	char *p = (char *)mctx-&gt;block + offset;</div><div class='ctx'> 	int padding = 56 - (offset + 1);</div><div class='head'>diff --git a/crypto/michael_mic.c b/crypto/michael_mic.c<br/>index 4f6ab23e14ad..d061da21cfda 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/michael_mic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/michael_mic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/michael_mic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/michael_mic.c</a></div><div class='hunk'>@@ -45,16 +45,17 @@ do {				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void michael_init(void *ctx)</div><div class='add'>+static void michael_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct michael_mic_ctx *mctx = ctx;</div><div class='add'>+	struct michael_mic_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	mctx-&gt;pending_len = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void michael_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void michael_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			   unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct michael_mic_ctx *mctx = ctx;</div><div class='add'>+	struct michael_mic_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *src;</div><div class='ctx'> </div><div class='ctx'> 	if (mctx-&gt;pending_len) {</div><div class='hunk'>@@ -90,9 +91,9 @@ static void michael_update(void *ctx, const u8 *data, unsigned int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void michael_final(void *ctx, u8 *out)</div><div class='add'>+static void michael_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct michael_mic_ctx *mctx = ctx;</div><div class='add'>+	struct michael_mic_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	u8 *data = mctx-&gt;pending;</div><div class='ctx'> 	__le32 *dst = (__le32 *)out;</div><div class='ctx'> </div><div class='hunk'>@@ -121,10 +122,10 @@ static void michael_final(void *ctx, u8 *out)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int michael_setkey(void *ctx, const u8 *key, unsigned int keylen,</div><div class='del'>-			  u32 *flags)</div><div class='add'>+static int michael_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			  unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct michael_mic_ctx *mctx = ctx;</div><div class='add'>+	struct michael_mic_ctx *mctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *data = (const __le32 *)key;</div><div class='ctx'> </div><div class='ctx'> 	if (keylen != 8) {</div><div class='hunk'>@@ -145,6 +146,7 @@ static struct crypto_alg michael_mic_alg = {</div><div class='ctx'> 	.cra_blocksize	= 8,</div><div class='ctx'> 	.cra_ctxsize	= sizeof(struct michael_mic_ctx),</div><div class='ctx'> 	.cra_module	= THIS_MODULE,</div><div class='add'>+	.cra_alignmask	= 3,</div><div class='ctx'> 	.cra_list	= LIST_HEAD_INIT(michael_mic_alg.cra_list),</div><div class='ctx'> 	.cra_u		= { .digest = {</div><div class='ctx'> 	.dia_digestsize	= 8,</div><div class='head'>diff --git a/crypto/serpent.c b/crypto/serpent.c<br/>index e366406ab49d..de60cdddbf4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/serpent.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/serpent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/serpent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/serpent.c</a></div><div class='hunk'>@@ -215,9 +215,11 @@ struct serpent_ctx {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int serpent_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)</div><div class='add'>+static int serpent_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			  unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	u32 *k = ((struct serpent_ctx *)ctx)-&gt;expkey;</div><div class='add'>+	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='add'>+	u32 *k = ctx-&gt;expkey;</div><div class='ctx'> 	u8  *k8 = (u8 *)k;</div><div class='ctx'> 	u32 r0,r1,r2,r3,r4;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -365,10 +367,11 @@ static int serpent_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *fl</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void serpent_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void serpent_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='add'>+	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u32</div><div class='del'>-		*k = ((struct serpent_ctx *)ctx)-&gt;expkey,</div><div class='add'>+		*k = ctx-&gt;expkey,</div><div class='ctx'> 		*s = (const u32 *)src;</div><div class='ctx'> 	u32	*d = (u32 *)dst,</div><div class='ctx'> 		r0, r1, r2, r3, r4;</div><div class='hunk'>@@ -423,8 +426,9 @@ static void serpent_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> 	d[3] = cpu_to_le32(r3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void serpent_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='add'>+	struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const u32</div><div class='ctx'> 		*k = ((struct serpent_ctx *)ctx)-&gt;expkey,</div><div class='ctx'> 		*s = (const u32 *)src;</div><div class='hunk'>@@ -492,7 +496,8 @@ static struct crypto_alg serpent_alg = {</div><div class='ctx'> 	.cia_decrypt  		=	serpent_decrypt } }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tnepres_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *flags)</div><div class='add'>+static int tnepres_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			  unsigned int keylen, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	u8 rev_key[SERPENT_MAX_KEY_SIZE];</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -506,10 +511,10 @@ static int tnepres_setkey(void *ctx, const u8 *key, unsigned int keylen, u32 *fl</div><div class='ctx'> 	for (i = 0; i &lt; keylen; ++i)</div><div class='ctx'> 		rev_key[keylen - i - 1] = key[i];</div><div class='ctx'>  </div><div class='del'>-	return serpent_setkey(ctx, rev_key, keylen, flags);</div><div class='add'>+	return serpent_setkey(tfm, rev_key, keylen, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tnepres_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void tnepres_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 * const s = (const u32 * const)src;</div><div class='ctx'> 	u32 * const d = (u32 * const)dst;</div><div class='hunk'>@@ -521,7 +526,7 @@ static void tnepres_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> 	rs[2] = swab32(s[1]);</div><div class='ctx'> 	rs[3] = swab32(s[0]);</div><div class='ctx'> </div><div class='del'>-	serpent_encrypt(ctx, (u8 *)rd, (u8 *)rs);</div><div class='add'>+	serpent_encrypt(tfm, (u8 *)rd, (u8 *)rs);</div><div class='ctx'> </div><div class='ctx'> 	d[0] = swab32(rd[3]);</div><div class='ctx'> 	d[1] = swab32(rd[2]);</div><div class='hunk'>@@ -529,7 +534,7 @@ static void tnepres_encrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> 	d[3] = swab32(rd[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tnepres_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='add'>+static void tnepres_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='ctx'> {</div><div class='ctx'> 	const u32 * const s = (const u32 * const)src;</div><div class='ctx'> 	u32 * const d = (u32 * const)dst;</div><div class='hunk'>@@ -541,7 +546,7 @@ static void tnepres_decrypt(void *ctx, u8 *dst, const u8 *src)</div><div class='ctx'> 	rs[2] = swab32(s[1]);</div><div class='ctx'> 	rs[3] = swab32(s[0]);</div><div class='ctx'> </div><div class='del'>-	serpent_decrypt(ctx, (u8 *)rd, (u8 *)rs);</div><div class='add'>+	serpent_decrypt(tfm, (u8 *)rd, (u8 *)rs);</div><div class='ctx'> </div><div class='ctx'> 	d[0] = swab32(rd[3]);</div><div class='ctx'> 	d[1] = swab32(rd[2]);</div><div class='head'>diff --git a/crypto/sha1.c b/crypto/sha1.c<br/>index 21571ed35b7e..6c77b689f87e 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/sha1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/sha1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/sha1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/sha1.c</a></div><div class='hunk'>@@ -34,9 +34,9 @@ struct sha1_ctx {</div><div class='ctx'>         u8 buffer[64];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void sha1_init(void *ctx)</div><div class='add'>+static void sha1_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct sha1_ctx *sctx = ctx;</div><div class='add'>+	struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	static const struct sha1_ctx initstate = {</div><div class='ctx'> 	  0,</div><div class='ctx'> 	  { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 },</div><div class='hunk'>@@ -46,9 +46,10 @@ static void sha1_init(void *ctx)</div><div class='ctx'> 	*sctx = initstate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sha1_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void sha1_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct sha1_ctx *sctx = ctx;</div><div class='add'>+	struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	unsigned int partial, done;</div><div class='ctx'> 	const u8 *src;</div><div class='ctx'> </div><div class='hunk'>@@ -80,9 +81,9 @@ static void sha1_update(void *ctx, const u8 *data, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Add padding and return the message digest. */</div><div class='del'>-static void sha1_final(void* ctx, u8 *out)</div><div class='add'>+static void sha1_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct sha1_ctx *sctx = ctx;</div><div class='add'>+	struct sha1_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	__be32 *dst = (__be32 *)out;</div><div class='ctx'> 	u32 i, index, padlen;</div><div class='ctx'> 	__be64 bits;</div><div class='hunk'>@@ -93,10 +94,10 @@ static void sha1_final(void* ctx, u8 *out)</div><div class='ctx'> 	/* Pad out to 56 mod 64 */</div><div class='ctx'> 	index = sctx-&gt;count &amp; 0x3f;</div><div class='ctx'> 	padlen = (index &lt; 56) ? (56 - index) : ((64+56) - index);</div><div class='del'>-	sha1_update(sctx, padding, padlen);</div><div class='add'>+	sha1_update(tfm, padding, padlen);</div><div class='ctx'> </div><div class='ctx'> 	/* Append length */</div><div class='del'>-	sha1_update(sctx, (const u8 *)&amp;bits, sizeof(bits));</div><div class='add'>+	sha1_update(tfm, (const u8 *)&amp;bits, sizeof(bits));</div><div class='ctx'> </div><div class='ctx'> 	/* Store state in digest */</div><div class='ctx'> 	for (i = 0; i &lt; 5; i++)</div><div class='hunk'>@@ -112,6 +113,7 @@ static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_blocksize	=	SHA1_HMAC_BLOCK_SIZE,</div><div class='ctx'> 	.cra_ctxsize	=	sizeof(struct sha1_ctx),</div><div class='ctx'> 	.cra_module	=	THIS_MODULE,</div><div class='add'>+	.cra_alignmask	=	3,</div><div class='ctx'> 	.cra_list       =       LIST_HEAD_INIT(alg.cra_list),</div><div class='ctx'> 	.cra_u		=	{ .digest = {</div><div class='ctx'> 	.dia_digestsize	=	SHA1_DIGEST_SIZE,</div><div class='head'>diff --git a/crypto/sha256.c b/crypto/sha256.c<br/>index 9d5ef674d6a9..bc71d85a7d02 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/sha256.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/sha256.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/sha256.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/sha256.c</a></div><div class='hunk'>@@ -230,9 +230,9 @@ static void sha256_transform(u32 *state, const u8 *input)</div><div class='ctx'> 	memset(W, 0, 64 * sizeof(u32));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sha256_init(void *ctx)</div><div class='add'>+static void sha256_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct sha256_ctx *sctx = ctx;</div><div class='add'>+	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	sctx-&gt;state[0] = H0;</div><div class='ctx'> 	sctx-&gt;state[1] = H1;</div><div class='ctx'> 	sctx-&gt;state[2] = H2;</div><div class='hunk'>@@ -242,12 +242,12 @@ static void sha256_init(void *ctx)</div><div class='ctx'> 	sctx-&gt;state[6] = H6;</div><div class='ctx'> 	sctx-&gt;state[7] = H7;</div><div class='ctx'> 	sctx-&gt;count[0] = sctx-&gt;count[1] = 0;</div><div class='del'>-	memset(sctx-&gt;buf, 0, sizeof(sctx-&gt;buf));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sha256_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+static void sha256_update(struct crypto_tfm *tfm, const u8 *data,</div><div class='add'>+			  unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct sha256_ctx *sctx = ctx;</div><div class='add'>+	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	unsigned int i, index, part_len;</div><div class='ctx'> </div><div class='ctx'> 	/* Compute number of bytes mod 128 */</div><div class='hunk'>@@ -277,9 +277,9 @@ static void sha256_update(void *ctx, const u8 *data, unsigned int len)</div><div class='ctx'> 	memcpy(&amp;sctx-&gt;buf[index], &amp;data[i], len-i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sha256_final(void* ctx, u8 *out)</div><div class='add'>+static void sha256_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct sha256_ctx *sctx = ctx;</div><div class='add'>+	struct sha256_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	__be32 *dst = (__be32 *)out;</div><div class='ctx'> 	__be32 bits[2];</div><div class='ctx'> 	unsigned int index, pad_len;</div><div class='hunk'>@@ -293,10 +293,10 @@ static void sha256_final(void* ctx, u8 *out)</div><div class='ctx'> 	/* Pad out to 56 mod 64. */</div><div class='ctx'> 	index = (sctx-&gt;count[0] &gt;&gt; 3) &amp; 0x3f;</div><div class='ctx'> 	pad_len = (index &lt; 56) ? (56 - index) : ((64+56) - index);</div><div class='del'>-	sha256_update(sctx, padding, pad_len);</div><div class='add'>+	sha256_update(tfm, padding, pad_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Append length (before padding) */</div><div class='del'>-	sha256_update(sctx, (const u8 *)bits, sizeof(bits));</div><div class='add'>+	sha256_update(tfm, (const u8 *)bits, sizeof(bits));</div><div class='ctx'> </div><div class='ctx'> 	/* Store state in digest */</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='hunk'>@@ -313,6 +313,7 @@ static struct crypto_alg alg = {</div><div class='ctx'> 	.cra_blocksize	=	SHA256_HMAC_BLOCK_SIZE,</div><div class='ctx'> 	.cra_ctxsize	=	sizeof(struct sha256_ctx),</div><div class='ctx'> 	.cra_module	=	THIS_MODULE,</div><div class='add'>+	.cra_alignmask	=	3,</div><div class='ctx'> 	.cra_list       =       LIST_HEAD_INIT(alg.cra_list),</div><div class='ctx'> 	.cra_u		=	{ .digest = {</div><div class='ctx'> 	.dia_digestsize	=	SHA256_DIGEST_SIZE,</div><div class='head'>diff --git a/crypto/sha512.c b/crypto/sha512.c<br/>index 3e6e9392310c..2dfe7f170b48 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/sha512.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/sha512.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/sha512.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/sha512.c</a></div><div class='hunk'>@@ -161,9 +161,9 @@ sha512_transform(u64 *state, u64 *W, const u8 *input)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-sha512_init(void *ctx)</div><div class='add'>+sha512_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-        struct sha512_ctx *sctx = ctx;</div><div class='add'>+	struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	sctx-&gt;state[0] = H0;</div><div class='ctx'> 	sctx-&gt;state[1] = H1;</div><div class='ctx'> 	sctx-&gt;state[2] = H2;</div><div class='hunk'>@@ -173,13 +173,12 @@ sha512_init(void *ctx)</div><div class='ctx'> 	sctx-&gt;state[6] = H6;</div><div class='ctx'> 	sctx-&gt;state[7] = H7;</div><div class='ctx'> 	sctx-&gt;count[0] = sctx-&gt;count[1] = sctx-&gt;count[2] = sctx-&gt;count[3] = 0;</div><div class='del'>-	memset(sctx-&gt;buf, 0, sizeof(sctx-&gt;buf));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-sha384_init(void *ctx)</div><div class='add'>+sha384_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-        struct sha512_ctx *sctx = ctx;</div><div class='add'>+	struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'>         sctx-&gt;state[0] = HP0;</div><div class='ctx'>         sctx-&gt;state[1] = HP1;</div><div class='ctx'>         sctx-&gt;state[2] = HP2;</div><div class='hunk'>@@ -189,13 +188,12 @@ sha384_init(void *ctx)</div><div class='ctx'>         sctx-&gt;state[6] = HP6;</div><div class='ctx'>         sctx-&gt;state[7] = HP7;</div><div class='ctx'>         sctx-&gt;count[0] = sctx-&gt;count[1] = sctx-&gt;count[2] = sctx-&gt;count[3] = 0;</div><div class='del'>-        memset(sctx-&gt;buf, 0, sizeof(sctx-&gt;buf));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-sha512_update(void *ctx, const u8 *data, unsigned int len)</div><div class='add'>+sha512_update(struct crypto_tfm *tfm, const u8 *data, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-        struct sha512_ctx *sctx = ctx;</div><div class='add'>+	struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	unsigned int i, index, part_len;</div><div class='ctx'> </div><div class='hunk'>@@ -233,9 +231,9 @@ sha512_update(void *ctx, const u8 *data, unsigned int len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-sha512_final(void *ctx, u8 *hash)</div><div class='add'>+sha512_final(struct crypto_tfm *tfm, u8 *hash)</div><div class='ctx'> {</div><div class='del'>-        struct sha512_ctx *sctx = ctx;</div><div class='add'>+	struct sha512_ctx *sctx = crypto_tfm_ctx(tfm);</div><div class='ctx'>         static u8 padding[128] = { 0x80, };</div><div class='ctx'> 	__be64 *dst = (__be64 *)hash;</div><div class='ctx'> 	__be32 bits[4];</div><div class='hunk'>@@ -251,10 +249,10 @@ sha512_final(void *ctx, u8 *hash)</div><div class='ctx'> 	/* Pad out to 112 mod 128. */</div><div class='ctx'> 	index = (sctx-&gt;count[0] &gt;&gt; 3) &amp; 0x7f;</div><div class='ctx'> 	pad_len = (index &lt; 112) ? (112 - index) : ((128+112) - index);</div><div class='del'>-	sha512_update(sctx, padding, pad_len);</div><div class='add'>+	sha512_update(tfm, padding, pad_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Append length (before padding) */</div><div class='del'>-	sha512_update(sctx, (const u8 *)bits, sizeof(bits));</div><div class='add'>+	sha512_update(tfm, (const u8 *)bits, sizeof(bits));</div><div class='ctx'> </div><div class='ctx'> 	/* Store state in digest */</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='hunk'>@@ -264,12 +262,11 @@ sha512_final(void *ctx, u8 *hash)</div><div class='ctx'> 	memset(sctx, 0, sizeof(struct sha512_ctx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sha384_final(void *ctx, u8 *hash)</div><div class='add'>+static void sha384_final(struct crypto_tfm *tfm, u8 *hash)</div><div class='ctx'> {</div><div class='del'>-        struct sha512_ctx *sctx = ctx;</div><div class='ctx'>         u8 D[64];</div><div class='ctx'> </div><div class='del'>-        sha512_final(sctx, D);</div><div class='add'>+	sha512_final(tfm, D);</div><div class='ctx'> </div><div class='ctx'>         memcpy(hash, D, 48);</div><div class='ctx'>         memset(D, 0, 64);</div><div class='hunk'>@@ -281,6 +278,7 @@ static struct crypto_alg sha512 = {</div><div class='ctx'>         .cra_blocksize  = SHA512_HMAC_BLOCK_SIZE,</div><div class='ctx'>         .cra_ctxsize    = sizeof(struct sha512_ctx),</div><div class='ctx'>         .cra_module     = THIS_MODULE,</div><div class='add'>+	.cra_alignmask	= 3,</div><div class='ctx'>         .cra_list       = LIST_HEAD_INIT(sha512.cra_list),</div><div class='ctx'>         .cra_u          = { .digest = {</div><div class='ctx'>                                 .dia_digestsize = SHA512_DIGEST_SIZE,</div><div class='hunk'>@@ -295,6 +293,7 @@ static struct crypto_alg sha384 = {</div><div class='ctx'>         .cra_flags      = CRYPTO_ALG_TYPE_DIGEST,</div><div class='ctx'>         .cra_blocksize  = SHA384_HMAC_BLOCK_SIZE,</div><div class='ctx'>         .cra_ctxsize    = sizeof(struct sha512_ctx),</div><div class='add'>+	.cra_alignmask	= 3,</div><div class='ctx'>         .cra_module     = THIS_MODULE,</div><div class='ctx'>         .cra_list       = LIST_HEAD_INIT(sha384.cra_list),</div><div class='ctx'>         .cra_u          = { .digest = {</div><div class='head'>diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c<br/>index 49e344f00806..e52f56c5bd5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tcrypt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tcrypt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tcrypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/tcrypt.c</a></div><div class='hunk'>@@ -570,6 +570,122 @@ out:</div><div class='ctx'> 	crypto_free_tfm(tfm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void test_digest_jiffies(struct crypto_tfm *tfm, char *p, int blen,</div><div class='add'>+				int plen, char *out, int sec)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg[1];</div><div class='add'>+	unsigned long start, end;</div><div class='add'>+	int bcount, pcount;</div><div class='add'>+</div><div class='add'>+	for (start = jiffies, end = start + sec * HZ, bcount = 0;</div><div class='add'>+	     time_before(jiffies, end); bcount++) {</div><div class='add'>+		crypto_digest_init(tfm);</div><div class='add'>+		for (pcount = 0; pcount &lt; blen; pcount += plen) {</div><div class='add'>+			sg_set_buf(sg, p + pcount, plen);</div><div class='add'>+			crypto_digest_update(tfm, sg, 1);</div><div class='add'>+		}</div><div class='add'>+		/* we assume there is enough space in 'out' for the result */</div><div class='add'>+		crypto_digest_final(tfm, out);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk("%6u opers/sec, %9lu bytes/sec\n",</div><div class='add'>+	       bcount / sec, ((long)bcount * blen) / sec);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_digest_cycles(struct crypto_tfm *tfm, char *p, int blen,</div><div class='add'>+			       int plen, char *out)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist sg[1];</div><div class='add'>+	unsigned long cycles = 0;</div><div class='add'>+	int i, pcount;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	local_irq_disable();</div><div class='add'>+</div><div class='add'>+	/* Warm-up run. */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		crypto_digest_init(tfm);</div><div class='add'>+		for (pcount = 0; pcount &lt; blen; pcount += plen) {</div><div class='add'>+			sg_set_buf(sg, p + pcount, plen);</div><div class='add'>+			crypto_digest_update(tfm, sg, 1);</div><div class='add'>+		}</div><div class='add'>+		crypto_digest_final(tfm, out);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The real thing. */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		cycles_t start, end;</div><div class='add'>+</div><div class='add'>+		crypto_digest_init(tfm);</div><div class='add'>+</div><div class='add'>+		start = get_cycles();</div><div class='add'>+</div><div class='add'>+		for (pcount = 0; pcount &lt; blen; pcount += plen) {</div><div class='add'>+			sg_set_buf(sg, p + pcount, plen);</div><div class='add'>+			crypto_digest_update(tfm, sg, 1);</div><div class='add'>+		}</div><div class='add'>+		crypto_digest_final(tfm, out);</div><div class='add'>+</div><div class='add'>+		end = get_cycles();</div><div class='add'>+</div><div class='add'>+		cycles += end - start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	local_irq_enable();</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	printk("%6lu cycles/operation, %4lu cycles/byte\n",</div><div class='add'>+	       cycles / 8, cycles / (8 * blen));</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_digest_speed(char *algo, unsigned int sec,</div><div class='add'>+			      struct digest_speed *speed)</div><div class='add'>+{</div><div class='add'>+	struct crypto_tfm *tfm;</div><div class='add'>+	char output[1024];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	printk("\ntesting speed of %s\n", algo);</div><div class='add'>+</div><div class='add'>+	tfm = crypto_alloc_tfm(algo, 0);</div><div class='add'>+</div><div class='add'>+	if (tfm == NULL) {</div><div class='add'>+		printk("failed to load transform for %s\n", algo);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (crypto_tfm_alg_digestsize(tfm) &gt; sizeof(output)) {</div><div class='add'>+		printk("digestsize(%u) &gt; outputbuffer(%zu)\n",</div><div class='add'>+		       crypto_tfm_alg_digestsize(tfm), sizeof(output));</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; speed[i].blen != 0; i++) {</div><div class='add'>+		if (speed[i].blen &gt; TVMEMSIZE) {</div><div class='add'>+			printk("template (%u) too big for tvmem (%u)\n",</div><div class='add'>+			       speed[i].blen, TVMEMSIZE);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		printk("test%3u (%5u byte blocks,%5u bytes per update,%4u updates): ",</div><div class='add'>+		       i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);</div><div class='add'>+</div><div class='add'>+		memset(tvmem, 0xff, speed[i].blen);</div><div class='add'>+</div><div class='add'>+		if (sec)</div><div class='add'>+			test_digest_jiffies(tfm, tvmem, speed[i].blen, speed[i].plen, output, sec);</div><div class='add'>+		else</div><div class='add'>+			test_digest_cycles(tfm, tvmem, speed[i].blen, speed[i].plen, output);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	crypto_free_tfm(tfm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void test_deflate(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1086,6 +1202,60 @@ static void do_test(void)</div><div class='ctx'> 				  des_speed_template);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case 300:</div><div class='add'>+		/* fall through */</div><div class='add'>+</div><div class='add'>+	case 301:</div><div class='add'>+		test_digest_speed("md4", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 302:</div><div class='add'>+		test_digest_speed("md5", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 303:</div><div class='add'>+		test_digest_speed("sha1", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 304:</div><div class='add'>+		test_digest_speed("sha256", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 305:</div><div class='add'>+		test_digest_speed("sha384", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 306:</div><div class='add'>+		test_digest_speed("sha512", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 307:</div><div class='add'>+		test_digest_speed("wp256", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 308:</div><div class='add'>+		test_digest_speed("wp384", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 309:</div><div class='add'>+		test_digest_speed("wp512", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 310:</div><div class='add'>+		test_digest_speed("tgr128", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 311:</div><div class='add'>+		test_digest_speed("tgr160", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 312:</div><div class='add'>+		test_digest_speed("tgr192", sec, generic_digest_speed_template);</div><div class='add'>+		if (mode &gt; 300 &amp;&amp; mode &lt; 400) break;</div><div class='add'>+</div><div class='add'>+	case 399:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case 1000:</div><div class='ctx'> 		test_available();</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1113,7 +1283,14 @@ static int __init init(void)</div><div class='ctx'> </div><div class='ctx'> 	kfree(xbuf);</div><div class='ctx'> 	kfree(tvmem);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	/* We intentionaly return -EAGAIN to prevent keeping</div><div class='add'>+	 * the module. It does all its work from init()</div><div class='add'>+	 * and doesn't offer any runtime functionality </div><div class='add'>+	 * =&gt; we don't need it in the memory, do we?</div><div class='add'>+	 *                                        -- mludvig</div><div class='add'>+	 */</div><div class='add'>+	return -EAGAIN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h<br/>index 1f683ba794ee..1fac5602f633 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tcrypt.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tcrypt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tcrypt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/tcrypt.h</a></div><div class='hunk'>@@ -65,6 +65,11 @@ struct cipher_speed {</div><div class='ctx'> 	unsigned int blen;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct digest_speed {</div><div class='add'>+	unsigned int blen;	/* buffer length */</div><div class='add'>+	unsigned int plen;	/* per-update length */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * MD4 test vectors from RFC1320</div><div class='ctx'>  */</div><div class='hunk'>@@ -2975,4 +2980,35 @@ static struct cipher_speed des_speed_template[] = {</div><div class='ctx'> 	{  .klen = 0, .blen = 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Digest speed tests</div><div class='add'>+ */</div><div class='add'>+static struct digest_speed generic_digest_speed_template[] = {</div><div class='add'>+	{ .blen = 16, 	.plen = 16, },</div><div class='add'>+	{ .blen = 64,	.plen = 16, },</div><div class='add'>+	{ .blen = 64,	.plen = 64, },</div><div class='add'>+	{ .blen = 256,	.plen = 16, },</div><div class='add'>+	{ .blen = 256,	.plen = 64, },</div><div class='add'>+	{ .blen = 256,	.plen = 256, },</div><div class='add'>+	{ .blen = 1024,	.plen = 16, },</div><div class='add'>+	{ .blen = 1024,	.plen = 256, },</div><div class='add'>+	{ .blen = 1024,	.plen = 1024, },</div><div class='add'>+	{ .blen = 2048,	.plen = 16, },</div><div class='add'>+	{ .blen = 2048,	.plen = 256, },</div><div class='add'>+	{ .blen = 2048,	.plen = 1024, },</div><div class='add'>+	{ .blen = 2048,	.plen = 2048, },</div><div class='add'>+	{ .blen = 4096,	.plen = 16, },</div><div class='add'>+	{ .blen = 4096,	.plen = 256, },</div><div class='add'>+	{ .blen = 4096,	.plen = 1024, },</div><div class='add'>+	{ .blen = 4096,	.plen = 4096, },</div><div class='add'>+	{ .blen = 8192,	.plen = 16, },</div><div class='add'>+	{ .blen = 8192,	.plen = 256, },</div><div class='add'>+	{ .blen = 8192,	.plen = 1024, },</div><div class='add'>+	{ .blen = 8192,	.plen = 4096, },</div><div class='add'>+	{ .blen = 8192,	.plen = 8192, },</div><div class='add'>+</div><div class='add'>+	/* End marker */</div><div class='add'>+	{  .blen = 0,	.plen = 0, }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif	/* _CRYPTO_TCRYPT_H */</div><div class='head'>diff --git a/crypto/tea.c b/crypto/tea.c<br/>index a6a02b30e470..5367adc82fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tea.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tea.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/tea.c</a></div><div class='hunk'>@@ -45,10 +45,10 @@ struct xtea_ctx {</div><div class='ctx'> 	u32 KEY[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tea_setkey(void *ctx_arg, const u8 *in_key,</div><div class='del'>-                       unsigned int key_len, u32 *flags)</div><div class='del'>-{ </div><div class='del'>-	struct tea_ctx *ctx = ctx_arg;</div><div class='add'>+static int tea_setkey(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		      unsigned int key_len, u32 *flags)</div><div class='add'>+{</div><div class='add'>+	struct tea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> 	</div><div class='ctx'> 	if (key_len != 16)</div><div class='hunk'>@@ -66,12 +66,11 @@ static int tea_setkey(void *ctx_arg, const u8 *in_key,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='del'>-{ </div><div class='add'>+static void tea_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='ctx'> 	u32 y, z, n, sum = 0;</div><div class='ctx'> 	u32 k0, k1, k2, k3;</div><div class='del'>-</div><div class='del'>-	struct tea_ctx *ctx = ctx_arg;</div><div class='add'>+	struct tea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *in = (const __le32 *)src;</div><div class='ctx'> 	__le32 *out = (__le32 *)dst;</div><div class='ctx'> </div><div class='hunk'>@@ -95,11 +94,11 @@ static void tea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='ctx'> 	out[1] = cpu_to_le32(z);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='del'>-{ </div><div class='add'>+static void tea_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='ctx'> 	u32 y, z, n, sum;</div><div class='ctx'> 	u32 k0, k1, k2, k3;</div><div class='del'>-	struct tea_ctx *ctx = ctx_arg;</div><div class='add'>+	struct tea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *in = (const __le32 *)src;</div><div class='ctx'> 	__le32 *out = (__le32 *)dst;</div><div class='ctx'> </div><div class='hunk'>@@ -125,10 +124,10 @@ static void tea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='ctx'> 	out[1] = cpu_to_le32(z);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xtea_setkey(void *ctx_arg, const u8 *in_key,</div><div class='del'>-                       unsigned int key_len, u32 *flags)</div><div class='del'>-{ </div><div class='del'>-	struct xtea_ctx *ctx = ctx_arg;</div><div class='add'>+static int xtea_setkey(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len, u32 *flags)</div><div class='add'>+{</div><div class='add'>+	struct xtea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> 	</div><div class='ctx'> 	if (key_len != 16)</div><div class='hunk'>@@ -146,12 +145,11 @@ static int xtea_setkey(void *ctx_arg, const u8 *in_key,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xtea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='del'>-{ </div><div class='add'>+static void xtea_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='ctx'> 	u32 y, z, sum = 0;</div><div class='ctx'> 	u32 limit = XTEA_DELTA * XTEA_ROUNDS;</div><div class='del'>-</div><div class='del'>-	struct xtea_ctx *ctx = ctx_arg;</div><div class='add'>+	struct xtea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *in = (const __le32 *)src;</div><div class='ctx'> 	__le32 *out = (__le32 *)dst;</div><div class='ctx'> </div><div class='hunk'>@@ -168,10 +166,10 @@ static void xtea_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='ctx'> 	out[1] = cpu_to_le32(z);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xtea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='del'>-{ </div><div class='add'>+static void xtea_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='ctx'> 	u32 y, z, sum;</div><div class='del'>-	struct tea_ctx *ctx = ctx_arg;</div><div class='add'>+	struct tea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *in = (const __le32 *)src;</div><div class='ctx'> 	__le32 *out = (__le32 *)dst;</div><div class='ctx'> </div><div class='hunk'>@@ -191,12 +189,11 @@ static void xtea_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void xeta_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='del'>-{ </div><div class='add'>+static void xeta_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='ctx'> 	u32 y, z, sum = 0;</div><div class='ctx'> 	u32 limit = XTEA_DELTA * XTEA_ROUNDS;</div><div class='del'>-</div><div class='del'>-	struct xtea_ctx *ctx = ctx_arg;</div><div class='add'>+	struct xtea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *in = (const __le32 *)src;</div><div class='ctx'> 	__le32 *out = (__le32 *)dst;</div><div class='ctx'> </div><div class='hunk'>@@ -213,10 +210,10 @@ static void xeta_encrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='ctx'> 	out[1] = cpu_to_le32(z);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xeta_decrypt(void *ctx_arg, u8 *dst, const u8 *src)</div><div class='del'>-{ </div><div class='add'>+static void xeta_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)</div><div class='add'>+{</div><div class='ctx'> 	u32 y, z, sum;</div><div class='del'>-	struct tea_ctx *ctx = ctx_arg;</div><div class='add'>+	struct tea_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *in = (const __le32 *)src;</div><div class='ctx'> 	__le32 *out = (__le32 *)dst;</div><div class='ctx'> </div><div class='head'>diff --git a/crypto/tgr192.c b/crypto/tgr192.c<br/>index 2d8e44f6fbe9..a0fadf3dd3e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/tgr192.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/tgr192.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/tgr192.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/tgr192.c</a></div><div class='hunk'>@@ -496,11 +496,10 @@ static void tgr192_transform(struct tgr192_ctx *tctx, const u8 * data)</div><div class='ctx'> 	tctx-&gt;c = c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tgr192_init(void *ctx)</div><div class='add'>+static void tgr192_init(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='del'>-	struct tgr192_ctx *tctx = ctx;</div><div class='add'>+	struct tgr192_ctx *tctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='del'>-	memset (tctx-&gt;hash, 0, 64);</div><div class='ctx'> 	tctx-&gt;a = 0x0123456789abcdefULL;</div><div class='ctx'> 	tctx-&gt;b = 0xfedcba9876543210ULL;</div><div class='ctx'> 	tctx-&gt;c = 0xf096a5b4c3b2e187ULL;</div><div class='hunk'>@@ -511,9 +510,10 @@ static void tgr192_init(void *ctx)</div><div class='ctx'> </div><div class='ctx'> /* Update the message digest with the contents</div><div class='ctx'>  * of INBUF with length INLEN. */</div><div class='del'>-static void tgr192_update(void *ctx, const u8 * inbuf, unsigned int len)</div><div class='add'>+static void tgr192_update(struct crypto_tfm *tfm, const u8 *inbuf,</div><div class='add'>+			  unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct tgr192_ctx *tctx = ctx;</div><div class='add'>+	struct tgr192_ctx *tctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	if (tctx-&gt;count == 64) {	/* flush the buffer */</div><div class='ctx'> 		tgr192_transform(tctx, tctx-&gt;hash);</div><div class='hunk'>@@ -527,7 +527,7 @@ static void tgr192_update(void *ctx, const u8 * inbuf, unsigned int len)</div><div class='ctx'> 		for (; len &amp;&amp; tctx-&gt;count &lt; 64; len--) {</div><div class='ctx'> 			tctx-&gt;hash[tctx-&gt;count++] = *inbuf++;</div><div class='ctx'> 		}</div><div class='del'>-		tgr192_update(tctx, NULL, 0);</div><div class='add'>+		tgr192_update(tfm, NULL, 0);</div><div class='ctx'> 		if (!len) {</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -549,15 +549,15 @@ static void tgr192_update(void *ctx, const u8 * inbuf, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* The routine terminates the computation */</div><div class='del'>-static void tgr192_final(void *ctx, u8 * out)</div><div class='add'>+static void tgr192_final(struct crypto_tfm *tfm, u8 * out)</div><div class='ctx'> {</div><div class='del'>-	struct tgr192_ctx *tctx = ctx;</div><div class='add'>+	struct tgr192_ctx *tctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	__be64 *dst = (__be64 *)out;</div><div class='ctx'> 	__be64 *be64p;</div><div class='ctx'> 	__le32 *le32p;</div><div class='ctx'> 	u32 t, msb, lsb;</div><div class='ctx'> </div><div class='del'>-	tgr192_update(tctx, NULL, 0); /* flush */ ;</div><div class='add'>+	tgr192_update(tfm, NULL, 0); /* flush */ ;</div><div class='ctx'> </div><div class='ctx'> 	msb = 0;</div><div class='ctx'> 	t = tctx-&gt;nblocks;</div><div class='hunk'>@@ -585,7 +585,7 @@ static void tgr192_final(void *ctx, u8 * out)</div><div class='ctx'> 		while (tctx-&gt;count &lt; 64) {</div><div class='ctx'> 			tctx-&gt;hash[tctx-&gt;count++] = 0;</div><div class='ctx'> 		}</div><div class='del'>-		tgr192_update(tctx, NULL, 0); /* flush */ ;</div><div class='add'>+		tgr192_update(tfm, NULL, 0); /* flush */ ;</div><div class='ctx'> 		memset(tctx-&gt;hash, 0, 56);    /* fill next block with zeroes */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* append the 64 bit count */</div><div class='hunk'>@@ -601,22 +601,20 @@ static void tgr192_final(void *ctx, u8 * out)</div><div class='ctx'> 	dst[2] = be64p[2] = cpu_to_be64(tctx-&gt;c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tgr160_final(void *ctx, u8 * out)</div><div class='add'>+static void tgr160_final(struct crypto_tfm *tfm, u8 * out)</div><div class='ctx'> {</div><div class='del'>-	struct tgr192_ctx *wctx = ctx;</div><div class='ctx'> 	u8 D[64];</div><div class='ctx'> </div><div class='del'>-	tgr192_final(wctx, D);</div><div class='add'>+	tgr192_final(tfm, D);</div><div class='ctx'> 	memcpy(out, D, TGR160_DIGEST_SIZE);</div><div class='ctx'> 	memset(D, 0, TGR192_DIGEST_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tgr128_final(void *ctx, u8 * out)</div><div class='add'>+static void tgr128_final(struct crypto_tfm *tfm, u8 * out)</div><div class='ctx'> {</div><div class='del'>-	struct tgr192_ctx *wctx = ctx;</div><div class='ctx'> 	u8 D[64];</div><div class='ctx'> </div><div class='del'>-	tgr192_final(wctx, D);</div><div class='add'>+	tgr192_final(tfm, D);</div><div class='ctx'> 	memcpy(out, D, TGR128_DIGEST_SIZE);</div><div class='ctx'> 	memset(D, 0, TGR192_DIGEST_SIZE);</div><div class='ctx'> }</div><div class='hunk'>@@ -627,6 +625,7 @@ static struct crypto_alg tgr192 = {</div><div class='ctx'> 	.cra_blocksize = TGR192_BLOCK_SIZE,</div><div class='ctx'> 	.cra_ctxsize = sizeof(struct tgr192_ctx),</div><div class='ctx'> 	.cra_module = THIS_MODULE,</div><div class='add'>+	.cra_alignmask = 7,</div><div class='ctx'> 	.cra_list = LIST_HEAD_INIT(tgr192.cra_list),</div><div class='ctx'> 	.cra_u = {.digest = {</div><div class='ctx'> 			     .dia_digestsize = TGR192_DIGEST_SIZE,</div><div class='hunk'>@@ -641,6 +640,7 @@ static struct crypto_alg tgr160 = {</div><div class='ctx'> 	.cra_blocksize = TGR192_BLOCK_SIZE,</div><div class='ctx'> 	.cra_ctxsize = sizeof(struct tgr192_ctx),</div><div class='ctx'> 	.cra_module = THIS_MODULE,</div><div class='add'>+	.cra_alignmask = 7,</div><div class='ctx'> 	.cra_list = LIST_HEAD_INIT(tgr160.cra_list),</div><div class='ctx'> 	.cra_u = {.digest = {</div><div class='ctx'> 			     .dia_digestsize = TGR160_DIGEST_SIZE,</div><div class='hunk'>@@ -655,6 +655,7 @@ static struct crypto_alg tgr128 = {</div><div class='ctx'> 	.cra_blocksize = TGR192_BLOCK_SIZE,</div><div class='ctx'> 	.cra_ctxsize = sizeof(struct tgr192_ctx),</div><div class='ctx'> 	.cra_module = THIS_MODULE,</div><div class='add'>+	.cra_alignmask = 7,</div><div class='ctx'> 	.cra_list = LIST_HEAD_INIT(tgr128.cra_list),</div><div class='ctx'> 	.cra_u = {.digest = {</div><div class='ctx'> 			     .dia_digestsize = TGR128_DIGEST_SIZE,</div><div class='head'>diff --git a/crypto/twofish.c b/crypto/twofish.c<br/>index ddfd5a3fcc5f..ec2488242e2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/twofish.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/twofish.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/twofish.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/twofish.c</a></div><div class='hunk'>@@ -643,11 +643,11 @@ struct twofish_ctx {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Perform the key setup. */</div><div class='del'>-static int twofish_setkey(void *cx, const u8 *key,</div><div class='del'>-                          unsigned int key_len, u32 *flags)</div><div class='add'>+static int twofish_setkey(struct crypto_tfm *tfm, const u8 *key,</div><div class='add'>+			  unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	</div><div class='del'>-	struct twofish_ctx *ctx = cx;</div><div class='add'>+	struct twofish_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> </div><div class='ctx'> 	int i, j, k;</div><div class='ctx'> </div><div class='hunk'>@@ -802,9 +802,9 @@ static int twofish_setkey(void *cx, const u8 *key,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Encrypt one block.  in and out may be the same. */</div><div class='del'>-static void twofish_encrypt(void *cx, u8 *out, const u8 *in)</div><div class='add'>+static void twofish_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct twofish_ctx *ctx = cx;</div><div class='add'>+	struct twofish_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *src = (const __le32 *)in;</div><div class='ctx'> 	__le32 *dst = (__le32 *)out;</div><div class='ctx'> </div><div class='hunk'>@@ -839,9 +839,9 @@ static void twofish_encrypt(void *cx, u8 *out, const u8 *in)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Decrypt one block.  in and out may be the same. */</div><div class='del'>-static void twofish_decrypt(void *cx, u8 *out, const u8 *in)</div><div class='add'>+static void twofish_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct twofish_ctx *ctx = cx;</div><div class='add'>+	struct twofish_ctx *ctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	const __le32 *src = (const __le32 *)in;</div><div class='ctx'> 	__le32 *dst = (__le32 *)out;</div><div class='ctx'>   </div><div class='head'>diff --git a/crypto/wp512.c b/crypto/wp512.c<br/>index b226a126cfae..727d05a19ff4 100644<br/>--- a/<a href='/cgit/linux.git/tree/crypto/wp512.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>crypto/wp512.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/crypto/wp512.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>crypto/wp512.c</a></div><div class='hunk'>@@ -981,9 +981,9 @@ static void wp512_process_buffer(struct wp512_ctx *wctx) {</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wp512_init (void *ctx) {</div><div class='add'>+static void wp512_init(struct crypto_tfm *tfm) {</div><div class='add'>+	struct wp512_ctx *wctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int i;</div><div class='del'>-	struct wp512_ctx *wctx = ctx;</div><div class='ctx'> </div><div class='ctx'> 	memset(wctx-&gt;bitLength, 0, 32);</div><div class='ctx'> 	wctx-&gt;bufferBits = wctx-&gt;bufferPos = 0;</div><div class='hunk'>@@ -993,10 +993,10 @@ static void wp512_init (void *ctx) {</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wp512_update(void *ctx, const u8 *source, unsigned int len)</div><div class='add'>+static void wp512_update(struct crypto_tfm *tfm, const u8 *source,</div><div class='add'>+			 unsigned int len)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	struct wp512_ctx *wctx = ctx;</div><div class='add'>+	struct wp512_ctx *wctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int sourcePos    = 0;</div><div class='ctx'> 	unsigned int bits_len = len * 8; // convert to number of bits</div><div class='ctx'> 	int sourceGap    = (8 - ((int)bits_len &amp; 7)) &amp; 7;</div><div class='hunk'>@@ -1054,9 +1054,9 @@ static void wp512_update(void *ctx, const u8 *source, unsigned int len)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wp512_final(void *ctx, u8 *out)</div><div class='add'>+static void wp512_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct wp512_ctx *wctx = ctx;</div><div class='add'>+	struct wp512_ctx *wctx = crypto_tfm_ctx(tfm);</div><div class='ctx'> 	int i;</div><div class='ctx'>    	u8 *buffer      = wctx-&gt;buffer;</div><div class='ctx'>    	u8 *bitLength   = wctx-&gt;bitLength;</div><div class='hunk'>@@ -1087,22 +1087,20 @@ static void wp512_final(void *ctx, u8 *out)</div><div class='ctx'>    	wctx-&gt;bufferPos    = bufferPos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wp384_final(void *ctx, u8 *out)</div><div class='add'>+static void wp384_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct wp512_ctx *wctx = ctx;</div><div class='ctx'> 	u8 D[64];</div><div class='ctx'> </div><div class='del'>-	wp512_final (wctx, D);</div><div class='add'>+	wp512_final(tfm, D);</div><div class='ctx'> 	memcpy (out, D, WP384_DIGEST_SIZE);</div><div class='ctx'> 	memset (D, 0, WP512_DIGEST_SIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wp256_final(void *ctx, u8 *out)</div><div class='add'>+static void wp256_final(struct crypto_tfm *tfm, u8 *out)</div><div class='ctx'> {</div><div class='del'>-	struct wp512_ctx *wctx = ctx;</div><div class='ctx'> 	u8 D[64];</div><div class='ctx'> </div><div class='del'>-	wp512_final (wctx, D);</div><div class='add'>+	wp512_final(tfm, D);</div><div class='ctx'> 	memcpy (out, D, WP256_DIGEST_SIZE);</div><div class='ctx'> 	memset (D, 0, WP512_DIGEST_SIZE);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/Kconfig b/drivers/Kconfig<br/>index aeb5ab2391e4..8b11cebe65df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/Kconfig</a></div><div class='hunk'>@@ -72,4 +72,6 @@ source "drivers/edac/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/rtc/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/dma/Kconfig"</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/Makefile b/drivers/Makefile<br/>index 447d8e68887a..fc2d744a4e4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/Makefile</a></div><div class='hunk'>@@ -74,3 +74,5 @@ obj-$(CONFIG_SGI_SN)		+= sn/</div><div class='ctx'> obj-y				+= firmware/</div><div class='ctx'> obj-$(CONFIG_CRYPTO)		+= crypto/</div><div class='ctx'> obj-$(CONFIG_SUPERH)		+= sh/</div><div class='add'>+obj-$(CONFIG_GENERIC_TIME)	+= clocksource/</div><div class='add'>+obj-$(CONFIG_DMA_ENGINE)	+= dma/</div><div class='head'>diff --git a/drivers/acorn/block/Kconfig b/drivers/acorn/block/Kconfig<br/>index 073add35e66f..a0ff25ea439f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acorn/block/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acorn/block/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acorn/block/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acorn/block/Kconfig</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menu "Acorn-specific block devices"</div><div class='del'>-	depends on ARCH_ACORN</div><div class='add'>+	depends on ARCH_ARC || ARCH_A5K</div><div class='ctx'> </div><div class='ctx'> config BLK_DEV_FD1772</div><div class='ctx'> 	tristate "Old Archimedes floppy (1772) support"</div><div class='head'>diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c<br/>index ce074f6f3369..3dd6b7bb5d35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acorn/block/mfmhd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acorn/block/mfmhd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acorn/block/mfmhd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acorn/block/mfmhd.c</a></div><div class='hunk'>@@ -99,7 +99,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -1279,7 +1278,7 @@ static int mfm_do_init(unsigned char irqmask)</div><div class='ctx'> </div><div class='ctx'> 	printk("mfm: detected %d hard drive%s\n", mfm_drives,</div><div class='ctx'> 				mfm_drives == 1 ? "" : "s");</div><div class='del'>-	ret = request_irq(mfm_irq, mfm_interrupt_handler, SA_INTERRUPT, "MFM harddisk", NULL);</div><div class='add'>+	ret = request_irq(mfm_irq, mfm_interrupt_handler, IRQF_DISABLED, "MFM harddisk", NULL);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk("mfm: unable to get IRQ%d\n", mfm_irq);</div><div class='ctx'> 		goto out4;</div><div class='head'>diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig<br/>index c24652d31bf9..56c5ba874623 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/Kconfig</a></div><div class='hunk'>@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"</div><div class='ctx'> config ACPI</div><div class='ctx'> 	bool "ACPI Support"</div><div class='ctx'> 	depends on IA64 || X86</div><div class='add'>+	depends on PCI</div><div class='ctx'> 	select PM</div><div class='del'>-	select PCI</div><div class='del'>-</div><div class='ctx'> 	default y</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Advanced Configuration and Power Interface (ACPI) support for </div><div class='hunk'>@@ -108,7 +107,6 @@ config ACPI_BUTTON</div><div class='ctx'> config ACPI_VIDEO</div><div class='ctx'> 	tristate "Video"</div><div class='ctx'> 	depends on X86</div><div class='del'>-	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver implement the ACPI Extensions For Display Adapters</div><div class='ctx'> 	  for integrated graphics devices on motherboard, as specified in</div><div class='hunk'>@@ -134,6 +132,12 @@ config ACPI_FAN</div><div class='ctx'> 	  This driver adds support for ACPI fan devices, allowing user-mode </div><div class='ctx'> 	  applications to perform basic fan control (on, off, status).</div><div class='ctx'> </div><div class='add'>+config ACPI_DOCK</div><div class='add'>+	tristate "Dock"</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for ACPI controlled docking stations</div><div class='add'>+</div><div class='ctx'> config ACPI_PROCESSOR</div><div class='ctx'> 	tristate "Processor"</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -162,7 +166,7 @@ config ACPI_THERMAL</div><div class='ctx'> config ACPI_NUMA</div><div class='ctx'> 	bool "NUMA support"</div><div class='ctx'> 	depends on NUMA</div><div class='del'>-	depends on (IA64 || X86_64)</div><div class='add'>+	depends on (X86 || IA64)</div><div class='ctx'> 	default y if IA64_GENERIC || IA64_SGI_SN2</div><div class='ctx'> </div><div class='ctx'> config ACPI_ASUS</div><div class='hunk'>@@ -208,6 +212,7 @@ config ACPI_IBM</div><div class='ctx'> config ACPI_IBM_DOCK</div><div class='ctx'> 	bool "Legacy Docking Station Support"</div><div class='ctx'> 	depends on ACPI_IBM</div><div class='add'>+	depends on ACPI_DOCK=n</div><div class='ctx'> 	default n</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Allows the ibm_acpi driver to handle docking station events.</div><div class='hunk'>@@ -329,7 +334,7 @@ config ACPI_CONTAINER</div><div class='ctx'> config ACPI_HOTPLUG_MEMORY</div><div class='ctx'> 	tristate "Memory Hotplug"</div><div class='ctx'> 	depends on ACPI</div><div class='del'>-	depends on MEMORY_HOTPLUG || X86_64</div><div class='add'>+	depends on MEMORY_HOTPLUG</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver adds supports for ACPI Memory Hotplug.  This driver</div><div class='hunk'>@@ -346,6 +351,17 @@ config ACPI_HOTPLUG_MEMORY</div><div class='ctx'> 	  If one selects "m," this driver can be loaded using the following</div><div class='ctx'> 	  command: </div><div class='ctx'> 		$&gt;modprobe acpi_memhotplug </div><div class='add'>+</div><div class='add'>+config ACPI_SBS</div><div class='add'>+	tristate "Smart Battery System (EXPERIMENTAL)"</div><div class='add'>+	depends on X86 &amp;&amp; I2C</div><div class='add'>+	depends on EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for the Smart Battery System.</div><div class='add'>+	  Depends on I2C (Device Drivers ---&gt; I2C support)</div><div class='add'>+	  A "Smart Battery" is quite old and quite rare compared</div><div class='add'>+	  to today's ACPI "Control Method" battery.</div><div class='add'>+</div><div class='ctx'> endif	# ACPI</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile<br/>index 5984b4f6715a..bce7ca27b429 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/Makefile</a></div><div class='hunk'>@@ -42,6 +42,7 @@ obj-$(CONFIG_ACPI_BATTERY)	+= battery.o</div><div class='ctx'> obj-$(CONFIG_ACPI_BUTTON)	+= button.o</div><div class='ctx'> obj-$(CONFIG_ACPI_EC)		+= ec.o</div><div class='ctx'> obj-$(CONFIG_ACPI_FAN)		+= fan.o</div><div class='add'>+obj-$(CONFIG_ACPI_DOCK)		+= dock.o</div><div class='ctx'> obj-$(CONFIG_ACPI_VIDEO)	+= video.o </div><div class='ctx'> obj-$(CONFIG_ACPI_HOTKEY)	+= hotkey.o</div><div class='ctx'> obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o</div><div class='hunk'>@@ -57,3 +58,5 @@ obj-$(CONFIG_ACPI_IBM)		+= ibm_acpi.o</div><div class='ctx'> obj-$(CONFIG_ACPI_TOSHIBA)	+= toshiba_acpi.o</div><div class='ctx'> obj-y				+= scan.o motherboard.o</div><div class='ctx'> obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)	+= acpi_memhotplug.o</div><div class='add'>+obj-y				+= cm_sbs.o</div><div class='add'>+obj-$(CONFIG_ACPI_SBS)		+= i2c_ec.o sbs.o</div><div class='head'>diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c<br/>index 7839b831df94..96309b9660da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/ac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/ac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/ac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/ac.c</a></div><div class='hunk'>@@ -50,6 +50,9 @@ ACPI_MODULE_NAME("acpi_ac")</div><div class='ctx'> MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='add'>+extern struct proc_dir_entry *acpi_lock_ac_dir(void);</div><div class='add'>+extern void *acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);</div><div class='add'>+</div><div class='ctx'> static int acpi_ac_add(struct acpi_device *device);</div><div class='ctx'> static int acpi_ac_remove(struct acpi_device *device, int type);</div><div class='ctx'> static int acpi_ac_open_fs(struct inode *inode, struct file *file);</div><div class='hunk'>@@ -65,11 +68,11 @@ static struct acpi_driver acpi_ac_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_ac {</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device * device;</div><div class='ctx'> 	unsigned long state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_ac_fops = {</div><div class='add'>+static const struct file_operations acpi_ac_fops = {</div><div class='ctx'> 	.open = acpi_ac_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -84,20 +87,18 @@ static int acpi_ac_get_state(struct acpi_ac *ac)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_get_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!ac)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(ac-&gt;handle, "_PSR", NULL, &amp;ac-&gt;state);</div><div class='add'>+	status = acpi_evaluate_integer(ac-&gt;device-&gt;handle, "_PSR", NULL, &amp;ac-&gt;state);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error reading AC Adapter state\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Error reading AC Adapter state"));</div><div class='ctx'> 		ac-&gt;state = ACPI_AC_STATUS_UNKNOWN;</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -110,14 +111,13 @@ static int acpi_ac_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_ac *ac = (struct acpi_ac *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!ac)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_ac_get_state(ac)) {</div><div class='ctx'> 		seq_puts(seq, "ERROR: Unable to read AC Adapter state\n");</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "state:                   ");</div><div class='hunk'>@@ -133,7 +133,7 @@ static int acpi_ac_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ac_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -145,13 +145,12 @@ static int acpi_ac_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_ac_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -159,21 +158,18 @@ static int acpi_ac_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry = create_proc_entry(ACPI_AC_FILE_STATE,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_AC_FILE_STATE));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_ac_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ac_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_AC_FILE_STATE, acpi_device_dir(device));</div><div class='hunk'>@@ -182,7 +178,7 @@ static int acpi_ac_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -194,16 +190,15 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_ac *ac = (struct acpi_ac *)data;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_notify");</div><div class='ctx'> </div><div class='ctx'> 	if (!ac)</div><div class='del'>-		return_VOID;</div><div class='del'>-</div><div class='del'>-	if (acpi_bus_get_device(ac-&gt;handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+	device = ac-&gt;device;</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_AC_NOTIFY_STATUS:</div><div class='add'>+	case ACPI_NOTIFY_BUS_CHECK:</div><div class='add'>+	case ACPI_NOTIFY_DEVICE_CHECK:</div><div class='ctx'> 		acpi_ac_get_state(ac);</div><div class='ctx'> 		acpi_bus_generate_event(device, event, (u32) ac-&gt;state);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -213,7 +208,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ac_add(struct acpi_device *device)</div><div class='hunk'>@@ -222,17 +217,16 @@ static int acpi_ac_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_ac *ac = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ac = kmalloc(sizeof(struct acpi_ac), GFP_KERNEL);</div><div class='ctx'> 	if (!ac)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(ac, 0, sizeof(struct acpi_ac));</div><div class='ctx'> </div><div class='del'>-	ac-&gt;handle = device-&gt;handle;</div><div class='add'>+	ac-&gt;device = device;</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_AC_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = ac;</div><div class='hunk'>@@ -245,12 +239,10 @@ static int acpi_ac_add(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	status = acpi_install_notify_handler(ac-&gt;handle,</div><div class='del'>-					     ACPI_DEVICE_NOTIFY, acpi_ac_notify,</div><div class='add'>+	status = acpi_install_notify_handler(device-&gt;handle,</div><div class='add'>+					     ACPI_ALL_NOTIFY, acpi_ac_notify,</div><div class='ctx'> 					     ac);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error installing notify handler\n"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -265,7 +257,7 @@ static int acpi_ac_add(struct acpi_device *device)</div><div class='ctx'> 		kfree(ac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ac_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -273,55 +265,48 @@ static int acpi_ac_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_ac *ac = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ac = (struct acpi_ac *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='del'>-	status = acpi_remove_notify_handler(ac-&gt;handle,</div><div class='del'>-					    ACPI_DEVICE_NOTIFY, acpi_ac_notify);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='add'>+	status = acpi_remove_notify_handler(device-&gt;handle,</div><div class='add'>+					    ACPI_ALL_NOTIFY, acpi_ac_notify);</div><div class='ctx'> </div><div class='ctx'> 	acpi_ac_remove_fs(device);</div><div class='ctx'> </div><div class='ctx'> 	kfree(ac);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_ac_init(void)</div><div class='ctx'> {</div><div class='del'>-	int result = 0;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_init");</div><div class='ctx'> </div><div class='del'>-	acpi_ac_dir = proc_mkdir(ACPI_AC_CLASS, acpi_root_dir);</div><div class='add'>+	acpi_ac_dir = acpi_lock_ac_dir();</div><div class='ctx'> 	if (!acpi_ac_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='del'>-	acpi_ac_dir-&gt;owner = THIS_MODULE;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_ac_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		acpi_unlock_ac_dir(acpi_ac_dir);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_ac_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ac_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_ac_driver);</div><div class='ctx'> </div><div class='del'>-	remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);</div><div class='add'>+	acpi_unlock_ac_dir(acpi_ac_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_ac_init);</div><div class='head'>diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c<br/>index d882bf87fa96..81e970adeab3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/acpi_memhotplug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/acpi_memhotplug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/acpi_memhotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/acpi_memhotplug.c</a></div><div class='hunk'>@@ -57,6 +57,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int acpi_memory_device_add(struct acpi_device *device);</div><div class='ctx'> static int acpi_memory_device_remove(struct acpi_device *device, int type);</div><div class='add'>+static int acpi_memory_device_start(struct acpi_device *device);</div><div class='ctx'> </div><div class='ctx'> static struct acpi_driver acpi_memory_device_driver = {</div><div class='ctx'> 	.name = ACPI_MEMORY_DEVICE_DRIVER_NAME,</div><div class='hunk'>@@ -65,49 +66,78 @@ static struct acpi_driver acpi_memory_device_driver = {</div><div class='ctx'> 	.ops = {</div><div class='ctx'> 		.add = acpi_memory_device_add,</div><div class='ctx'> 		.remove = acpi_memory_device_remove,</div><div class='add'>+		.start = acpi_memory_device_start,</div><div class='ctx'> 		},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct acpi_memory_device {</div><div class='del'>-	acpi_handle handle;</div><div class='del'>-	unsigned int state;	/* State of the memory device */</div><div class='add'>+struct acpi_memory_info {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u64 start_addr;		/* Memory Range start physical addr */</div><div class='add'>+	u64 length;		/* Memory Range length */</div><div class='ctx'> 	unsigned short caching;	/* memory cache attribute */</div><div class='ctx'> 	unsigned short write_protect;	/* memory read/write attribute */</div><div class='del'>-	u64 start_addr;		/* Memory Range start physical addr */</div><div class='del'>-	u64 end_addr;		/* Memory Range end physical addr */</div><div class='add'>+	unsigned int enabled:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_memory_device {</div><div class='add'>+	struct acpi_device * device;</div><div class='add'>+	unsigned int state;	/* State of the memory device */</div><div class='add'>+	struct list_head res_list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static acpi_status</div><div class='add'>+acpi_memory_get_resource(struct acpi_resource *resource, void *context)</div><div class='add'>+{</div><div class='add'>+	struct acpi_memory_device *mem_device = context;</div><div class='add'>+	struct acpi_resource_address64 address64;</div><div class='add'>+	struct acpi_memory_info *info, *new;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	status = acpi_resource_to_address64(resource, &amp;address64);</div><div class='add'>+	if (ACPI_FAILURE(status) ||</div><div class='add'>+	    (address64.resource_type != ACPI_MEMORY_RANGE))</div><div class='add'>+		return AE_OK;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(info, &amp;mem_device-&gt;res_list, list) {</div><div class='add'>+		/* Can we combine the resource range information? */</div><div class='add'>+		if ((info-&gt;caching == address64.info.mem.caching) &amp;&amp;</div><div class='add'>+		    (info-&gt;write_protect == address64.info.mem.write_protect) &amp;&amp;</div><div class='add'>+		    (info-&gt;start_addr + info-&gt;length == address64.minimum)) {</div><div class='add'>+			info-&gt;length += address64.address_length;</div><div class='add'>+			return AE_OK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new = kzalloc(sizeof(struct acpi_memory_info), GFP_KERNEL);</div><div class='add'>+	if (!new)</div><div class='add'>+		return AE_ERROR;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;new-&gt;list);</div><div class='add'>+	new-&gt;caching = address64.info.mem.caching;</div><div class='add'>+	new-&gt;write_protect = address64.info.mem.write_protect;</div><div class='add'>+	new-&gt;start_addr = address64.minimum;</div><div class='add'>+	new-&gt;length = address64.address_length;</div><div class='add'>+	list_add_tail(&amp;new-&gt;list, &amp;mem_device-&gt;res_list);</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='del'>-	struct acpi_resource *resource = NULL;</div><div class='del'>-	struct acpi_resource_address64 address64;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_get_device_resources");</div><div class='add'>+	struct acpi_memory_info *info, *n;</div><div class='ctx'> </div><div class='del'>-	/* Get the range from the _CRS */</div><div class='del'>-	status = acpi_get_current_resources(mem_device-&gt;handle, &amp;buffer);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='ctx'> </div><div class='del'>-	resource = (struct acpi_resource *)buffer.pointer;</div><div class='del'>-	status = acpi_resource_to_address64(resource, &amp;address64);</div><div class='del'>-	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		if (address64.resource_type == ACPI_MEMORY_RANGE) {</div><div class='del'>-			/* Populate the structure */</div><div class='del'>-			mem_device-&gt;caching =</div><div class='del'>-			    address64.info.mem.caching;</div><div class='del'>-			mem_device-&gt;write_protect =</div><div class='del'>-			    address64.info.mem.write_protect;</div><div class='del'>-			mem_device-&gt;start_addr = address64.minimum;</div><div class='del'>-			mem_device-&gt;end_addr = address64.maximum;</div><div class='del'>-		}</div><div class='add'>+	status = acpi_walk_resources(mem_device-&gt;device-&gt;handle, METHOD_NAME__CRS,</div><div class='add'>+				     acpi_memory_get_resource, mem_device);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		list_for_each_entry_safe(info, n, &amp;mem_device-&gt;res_list, list)</div><div class='add'>+			kfree(info);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -119,23 +149,21 @@ acpi_memory_get_device(acpi_handle handle,</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	struct acpi_device *pdevice = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_get_device");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_bus_get_device(handle, &amp;device) &amp;&amp; device)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_parent(handle, &amp;phandle);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error in acpi_get_parent\n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Cannot find acpi parent"));</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the parent device */</div><div class='ctx'> 	status = acpi_bus_get_device(phandle, &amp;pdevice);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error in acpi_bus_get_device\n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Cannot get acpi bus device"));</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -144,30 +172,29 @@ acpi_memory_get_device(acpi_handle handle,</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_bus_add(&amp;device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error in acpi_bus_add\n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Cannot add acpi bus"));</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='ctx'> 	*mem_device = acpi_driver_data(device);</div><div class='ctx'> 	if (!(*mem_device)) {</div><div class='ctx'> 		printk(KERN_ERR "\n driver data not found");</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_memory_check_device(struct acpi_memory_device *mem_device)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long current_status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_check_device");</div><div class='ctx'> </div><div class='ctx'> 	/* Get device present/absent information from the _STA */</div><div class='del'>-	if (ACPI_FAILURE(acpi_evaluate_integer(mem_device-&gt;handle, "_STA",</div><div class='add'>+	if (ACPI_FAILURE(acpi_evaluate_integer(mem_device-&gt;device-&gt;handle, "_STA",</div><div class='ctx'> 					       NULL, &amp;current_status)))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check for device status. Device should be</div><div class='ctx'> 	 * present/enabled/functioning.</div><div class='hunk'>@@ -175,36 +202,55 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)</div><div class='ctx'> 	if (!((current_status &amp; ACPI_MEMORY_STA_PRESENT)</div><div class='ctx'> 	      &amp;&amp; (current_status &amp; ACPI_MEMORY_STA_ENABLED)</div><div class='ctx'> 	      &amp;&amp; (current_status &amp; ACPI_MEMORY_STA_FUNCTIONAL)))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='add'>+	int result, num_enabled = 0;</div><div class='add'>+	struct acpi_memory_info *info;</div><div class='add'>+	int node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_enable_device");</div><div class='ctx'> </div><div class='ctx'> 	/* Get the range from the _CRS */</div><div class='ctx'> 	result = acpi_memory_get_device_resources(mem_device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "\nget_device_resources failed\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "get_device_resources failed\n");</div><div class='ctx'> 		mem_device-&gt;state = MEMORY_INVALID_STATE;</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	node = acpi_get_node(mem_device-&gt;device-&gt;handle);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tell the VM there is more memory here...</div><div class='ctx'> 	 * Note: Assume that this function returns zero on success</div><div class='add'>+	 * We don't have memory-hot-add rollback function,now.</div><div class='add'>+	 * (i.e. memory-hot-remove function)</div><div class='ctx'> 	 */</div><div class='del'>-	result = add_memory(mem_device-&gt;start_addr,</div><div class='del'>-			    (mem_device-&gt;end_addr - mem_device-&gt;start_addr) + 1);</div><div class='del'>-	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n"));</div><div class='add'>+	list_for_each_entry(info, &amp;mem_device-&gt;res_list, list) {</div><div class='add'>+		u64 start_pfn, end_pfn;</div><div class='add'>+</div><div class='add'>+		start_pfn = info-&gt;start_addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		end_pfn = (info-&gt;start_addr + info-&gt;length - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+		if (pfn_valid(start_pfn) || pfn_valid(end_pfn)) {</div><div class='add'>+			/* already enabled. try next area */</div><div class='add'>+			num_enabled++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = add_memory(node, info-&gt;start_addr, info-&gt;length);</div><div class='add'>+		if (result)</div><div class='add'>+			continue;</div><div class='add'>+		info-&gt;enabled = 1;</div><div class='add'>+		num_enabled++;</div><div class='add'>+	}</div><div class='add'>+	if (!num_enabled) {</div><div class='add'>+		printk(KERN_ERR PREFIX "add_memory failed\n");</div><div class='ctx'> 		mem_device-&gt;state = MEMORY_INVALID_STATE;</div><div class='del'>-		return result;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -217,57 +263,55 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device)</div><div class='ctx'> 	union acpi_object arg;</div><div class='ctx'> 	unsigned long current_status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_powerdown_device");</div><div class='ctx'> </div><div class='ctx'> 	/* Issue the _EJ0 command */</div><div class='ctx'> 	arg_list.count = 1;</div><div class='ctx'> 	arg_list.pointer = &amp;arg;</div><div class='ctx'> 	arg.type = ACPI_TYPE_INTEGER;</div><div class='ctx'> 	arg.integer.value = 1;</div><div class='del'>-	status = acpi_evaluate_object(mem_device-&gt;handle,</div><div class='add'>+	status = acpi_evaluate_object(mem_device-&gt;device-&gt;handle,</div><div class='ctx'> 				      "_EJ0", &amp;arg_list, NULL);</div><div class='ctx'> 	/* Return on _EJ0 failure */</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "_EJ0 failed.\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "_EJ0 failed"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Evalute _STA to check if the device is disabled */</div><div class='del'>-	status = acpi_evaluate_integer(mem_device-&gt;handle, "_STA",</div><div class='add'>+	status = acpi_evaluate_integer(mem_device-&gt;device-&gt;handle, "_STA",</div><div class='ctx'> 				       NULL, &amp;current_status);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for device status.  Device should be disabled */</div><div class='ctx'> 	if (current_status &amp; ACPI_MEMORY_STA_ENABLED)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='del'>-	u64 start = mem_device-&gt;start_addr;</div><div class='del'>-	u64 len = mem_device-&gt;end_addr - start + 1;</div><div class='add'>+	struct acpi_memory_info *info, *n;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_disable_device");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ask the VM to offline this memory range.</div><div class='ctx'> 	 * Note: Assume that this function returns zero on success</div><div class='ctx'> 	 */</div><div class='del'>-	result = remove_memory(start, len);</div><div class='del'>-	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Hot-Remove failed.\n"));</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+	list_for_each_entry_safe(info, n, &amp;mem_device-&gt;res_list, list) {</div><div class='add'>+		if (info-&gt;enabled) {</div><div class='add'>+			result = remove_memory(info-&gt;start_addr, info-&gt;length);</div><div class='add'>+			if (result)</div><div class='add'>+				return result;</div><div class='add'>+		}</div><div class='add'>+		kfree(info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Power-off and eject the device */</div><div class='ctx'> 	result = acpi_memory_powerdown_device(mem_device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Device Power Down failed.\n"));</div><div class='ctx'> 		/* Set the status of the device to invalid */</div><div class='ctx'> 		mem_device-&gt;state = MEMORY_INVALID_STATE;</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -282,7 +326,6 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_memory_device *mem_device;</div><div class='ctx'> 	struct acpi_device *device;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_device_notify");</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_NOTIFY_BUS_CHECK:</div><div class='hunk'>@@ -294,15 +337,14 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 					  "\nReceived DEVICE CHECK notification for device\n"));</div><div class='ctx'> 		if (acpi_memory_get_device(handle, &amp;mem_device)) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Error in finding driver data\n"));</div><div class='del'>-			return_VOID;</div><div class='add'>+			printk(KERN_ERR PREFIX "Cannot find driver data\n");</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!acpi_memory_check_device(mem_device)) {</div><div class='ctx'> 			if (acpi_memory_enable_device(mem_device))</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-						  "Error in acpi_memory_enable_device\n"));</div><div class='add'>+				printk(KERN_ERR PREFIX</div><div class='add'>+					    "Cannot enable memory device\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACPI_NOTIFY_EJECT_REQUEST:</div><div class='hunk'>@@ -310,14 +352,12 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 				  "\nReceived EJECT REQUEST notification for device\n"));</div><div class='ctx'> </div><div class='ctx'> 		if (acpi_bus_get_device(handle, &amp;device)) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Device doesn't exist\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Device doesn't exist\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		mem_device = acpi_driver_data(device);</div><div class='ctx'> 		if (!mem_device) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Driver Data is NULL\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Driver Data is NULL\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -328,8 +368,8 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		 *      with generic sysfs driver</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (acpi_memory_disable_device(mem_device))</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Error in acpi_memory_disable_device\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Disable memory device\n");</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * TBD: Invoke acpi_bus_remove to cleanup data structures</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -340,7 +380,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_memory_device_add(struct acpi_device *device)</div><div class='hunk'>@@ -348,17 +388,17 @@ static int acpi_memory_device_add(struct acpi_device *device)</div><div class='ctx'> 	int result;</div><div class='ctx'> 	struct acpi_memory_device *mem_device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_device_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mem_device = kmalloc(sizeof(struct acpi_memory_device), GFP_KERNEL);</div><div class='ctx'> 	if (!mem_device)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(mem_device, 0, sizeof(struct acpi_memory_device));</div><div class='ctx'> </div><div class='del'>-	mem_device-&gt;handle = device-&gt;handle;</div><div class='add'>+	INIT_LIST_HEAD(&amp;mem_device-&gt;res_list);</div><div class='add'>+	mem_device-&gt;device = device;</div><div class='ctx'> 	sprintf(acpi_device_name(device), "%s", ACPI_MEMORY_DEVICE_NAME);</div><div class='ctx'> 	sprintf(acpi_device_class(device), "%s", ACPI_MEMORY_DEVICE_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = mem_device;</div><div class='hunk'>@@ -367,7 +407,7 @@ static int acpi_memory_device_add(struct acpi_device *device)</div><div class='ctx'> 	result = acpi_memory_get_device_resources(mem_device);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		kfree(mem_device);</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the device state */</div><div class='hunk'>@@ -375,22 +415,38 @@ static int acpi_memory_device_add(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s \n", acpi_device_name(device));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_memory_device_remove(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_memory_device *mem_device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_device_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	mem_device = (struct acpi_memory_device *)acpi_driver_data(device);</div><div class='ctx'> 	kfree(mem_device);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_memory_device_start (struct acpi_device *device)</div><div class='add'>+{</div><div class='add'>+	struct acpi_memory_device *mem_device;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	mem_device = acpi_driver_data(device);</div><div class='add'>+</div><div class='add'>+	if (!acpi_memory_check_device(mem_device)) {</div><div class='add'>+		/* call add_memory func */</div><div class='add'>+		result = acpi_memory_enable_device(mem_device);</div><div class='add'>+		if (result)</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				"Error in acpi_memory_enable_device\n"));</div><div class='add'>+	}</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -403,16 +459,15 @@ static acpi_status is_memory_device(acpi_handle handle)</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	struct acpi_device_info *info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("is_memory_device");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_object_info(handle, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_ACPI_STATUS(AE_ERROR);</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='ctx'> 	info = buffer.pointer;</div><div class='ctx'> 	if (!(info-&gt;valid &amp; ACPI_VALID_HID)) {</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='del'>-		return_ACPI_STATUS(AE_ERROR);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='add'>+		return AE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hardware_id = info-&gt;hardware_id.value;</div><div class='hunk'>@@ -420,8 +475,8 @@ static acpi_status is_memory_device(acpi_handle handle)</div><div class='ctx'> 	    (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))</div><div class='ctx'> 		status = AE_ERROR;</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -430,21 +485,17 @@ acpi_memory_register_notify_handler(acpi_handle handle,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_register_notify_handler");</div><div class='ctx'> </div><div class='ctx'> 	status = is_memory_device(handle);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		return_ACPI_STATUS(AE_OK);	/* continue */</div><div class='add'>+	if (ACPI_FAILURE(status)){</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "handle is no memory device"));</div><div class='add'>+		return AE_OK;	/* continue */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,</div><div class='ctx'> 					     acpi_memory_device_notify, NULL);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error installing notify handler\n"));</div><div class='del'>-		return_ACPI_STATUS(AE_OK);	/* continue */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	/* continue */</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -453,22 +504,18 @@ acpi_memory_deregister_notify_handler(acpi_handle handle,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_deregister_notify_handler");</div><div class='ctx'> </div><div class='ctx'> 	status = is_memory_device(handle);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		return_ACPI_STATUS(AE_OK);	/* continue */</div><div class='add'>+	if (ACPI_FAILURE(status)){</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "handle is no memory device"));</div><div class='add'>+		return AE_OK;	/* continue */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_remove_notify_handler(handle,</div><div class='ctx'> 					    ACPI_SYSTEM_NOTIFY,</div><div class='ctx'> 					    acpi_memory_device_notify);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='del'>-		return_ACPI_STATUS(AE_OK);	/* continue */</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	return AE_OK;	/* continue */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_memory_device_init(void)</div><div class='hunk'>@@ -476,12 +523,11 @@ static int __init acpi_memory_device_init(void)</div><div class='ctx'> 	int result;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_device_init");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_memory_device_driver);</div><div class='ctx'> </div><div class='ctx'> 	if (result &lt; 0)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,</div><div class='ctx'> 				     ACPI_UINT32_MAX,</div><div class='hunk'>@@ -489,19 +535,18 @@ static int __init acpi_memory_device_init(void)</div><div class='ctx'> 				     NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "walk_namespace failed"));</div><div class='ctx'> 		acpi_bus_unregister_driver(&amp;acpi_memory_device_driver);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_memory_device_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_memory_device_exit");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Adding this to un-install notification handlers for all the device</div><div class='hunk'>@@ -513,11 +558,11 @@ static void __exit acpi_memory_device_exit(void)</div><div class='ctx'> 				     NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "walk_namespace failed"));</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_memory_device_driver);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_memory_device_init);</div><div class='head'>diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c<br/>index f4c87750dbf2..e9ee4c52a5f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/asus_acpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/asus_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/asus_acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/asus_acpi.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  *  asus_acpi.c - Asus Laptop ACPI Extras</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2002, 2003, 2004 Julien Lerouge, Karol Kozimor</div><div class='add'>+ *  Copyright (C) 2002-2005 Julien Lerouge, 2003-2006 Karol Kozimor</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -26,11 +26,8 @@</div><div class='ctx'>  *  Pontus Fuchs   - Helper functions, cleanup</div><div class='ctx'>  *  Johann Wiesner - Small compile fixes</div><div class='ctx'>  *  John Belmonte  - ACPI code for Toshiba laptop was a good starting point.</div><div class='add'>+ *  Éric Burghard  - LED display support for W1N</div><div class='ctx'>  *</div><div class='del'>- *  TODO:</div><div class='del'>- *  add Fn key status</div><div class='del'>- *  Add mode selection on module loading (parameter) -&gt; still necessary?</div><div class='del'>- *  Complete display switching -- may require dirty hacks or calling _DOS?</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -42,12 +39,14 @@</div><div class='ctx'> #include &lt;acpi/acpi_bus.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ASUS_ACPI_VERSION "0.29"</div><div class='add'>+#define ASUS_ACPI_VERSION "0.30"</div><div class='ctx'> </div><div class='ctx'> #define PROC_ASUS       "asus"	//the directory</div><div class='ctx'> #define PROC_MLED       "mled"</div><div class='ctx'> #define PROC_WLED       "wled"</div><div class='ctx'> #define PROC_TLED       "tled"</div><div class='add'>+#define PROC_BT         "bluetooth"</div><div class='add'>+#define PROC_LEDD       "ledd"</div><div class='ctx'> #define PROC_INFO       "info"</div><div class='ctx'> #define PROC_LCD        "lcd"</div><div class='ctx'> #define PROC_BRN        "brn"</div><div class='hunk'>@@ -67,9 +66,10 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Flags for hotk status</div><div class='ctx'>  */</div><div class='del'>-#define MLED_ON     0x01	//is MLED ON ?</div><div class='del'>-#define WLED_ON     0x02</div><div class='del'>-#define TLED_ON     0x04</div><div class='add'>+#define MLED_ON     0x01	//mail LED</div><div class='add'>+#define WLED_ON     0x02	//wireless LED</div><div class='add'>+#define TLED_ON     0x04	//touchpad LED</div><div class='add'>+#define BT_ON       0x08	//internal Bluetooth</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Julien Lerouge, Karol Kozimor");</div><div class='ctx'> MODULE_DESCRIPTION(ACPI_HOTK_NAME);</div><div class='hunk'>@@ -92,7 +92,10 @@ struct model_data {</div><div class='ctx'> 	char *wled_status;	//node to handle wled reading_______A</div><div class='ctx'> 	char *mt_tled;		//method to handle tled_____________R</div><div class='ctx'> 	char *tled_status;	//node to handle tled reading_______A</div><div class='del'>-	char *mt_lcd_switch;	//method to turn LCD ON/OFF_________A</div><div class='add'>+	char *mt_ledd;		//method to handle LED display______R</div><div class='add'>+	char *mt_bt_switch;	//method to switch Bluetooth on/off_R</div><div class='add'>+	char *bt_status;	//no model currently supports this__?</div><div class='add'>+	char *mt_lcd_switch;	//method to turn LCD on/off_________A</div><div class='ctx'> 	char *lcd_status;	//node to read LCD panel state______A</div><div class='ctx'> 	char *brightness_up;	//method to set brightness up_______A</div><div class='ctx'> 	char *brightness_down;	//guess what ?______________________A</div><div class='hunk'>@@ -111,27 +114,31 @@ struct asus_hotk {</div><div class='ctx'> 	struct acpi_device *device;	//the device we are in</div><div class='ctx'> 	acpi_handle handle;	//the handle of the hotk device</div><div class='ctx'> 	char status;		//status of the hotk, for LEDs, ...</div><div class='add'>+	u32 ledd_status;	//status of the LED display</div><div class='ctx'> 	struct model_data *methods;	//methods available on the laptop</div><div class='ctx'> 	u8 brightness;		//brightness level</div><div class='ctx'> 	enum {</div><div class='ctx'> 		A1x = 0,	//A1340D, A1300F</div><div class='ctx'> 		A2x,		//A2500H</div><div class='add'>+		A4G,		//A4700G</div><div class='ctx'> 		D1x,		//D1</div><div class='ctx'> 		L2D,		//L2000D</div><div class='ctx'> 		L3C,		//L3800C</div><div class='ctx'> 		L3D,		//L3400D</div><div class='del'>-		L3H,		//L3H, but also L2000E</div><div class='add'>+		L3H,		//L3H, L2000E, L5D</div><div class='ctx'> 		L4R,		//L4500R</div><div class='ctx'> 		L5x,		//L5800C </div><div class='ctx'> 		L8L,		//L8400L</div><div class='ctx'> 		M1A,		//M1300A</div><div class='ctx'> 		M2E,		//M2400E, L4400L</div><div class='del'>-		M6N,		//M6800N</div><div class='del'>-		M6R,		//M6700R</div><div class='add'>+		M6N,		//M6800N, W3400N</div><div class='add'>+		M6R,		//M6700R, A3000G</div><div class='ctx'> 		P30,		//Samsung P30</div><div class='ctx'> 		S1x,		//S1300A, but also L1400B and M2400A (L84F)</div><div class='ctx'> 		S2x,		//S200 (J1 reported), Victor MP-XP7210</div><div class='del'>-		xxN,		//M2400N, M3700N, M5200N, S1300N, S5200N, W1OOON</div><div class='add'>+		W1N,		//W1000N</div><div class='add'>+		W5A,		//W5A</div><div class='add'>+		xxN,		//M2400N, M3700N, M5200N, M6800N, S1300N, S5200N</div><div class='ctx'> 		//(Centrino)</div><div class='ctx'> 		END_MODEL</div><div class='ctx'> 	} model;		//Models currently supported</div><div class='hunk'>@@ -149,17 +156,8 @@ struct asus_hotk {</div><div class='ctx'> </div><div class='ctx'> static struct model_data model_conf[END_MODEL] = {</div><div class='ctx'> 	/*</div><div class='del'>-	 * Those pathnames are relative to the HOTK / ATKD device :</div><div class='del'>-	 *       - mt_mled</div><div class='del'>-	 *       - mt_wled</div><div class='del'>-	 *       - brightness_set</div><div class='del'>-	 *       - brightness_get</div><div class='del'>-	 *       - display_set</div><div class='del'>-	 *       - display_get</div><div class='del'>-	 *</div><div class='ctx'> 	 * TODO I have seen a SWBX and AIBX method on some models, like L1400B,</div><div class='ctx'> 	 * it seems to be a kind of switch, but what for ?</div><div class='del'>-	 *</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -184,6 +182,16 @@ static struct model_data model_conf[END_MODEL] = {</div><div class='ctx'> 	 .display_get = "\\INFB"},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='add'>+	 .name = "A4G",</div><div class='add'>+	 .mt_mled = "MLED",</div><div class='add'>+/* WLED present, but not controlled by ACPI */</div><div class='add'>+	 .mt_lcd_switch = xxN_PREFIX "_Q10",</div><div class='add'>+	 .brightness_set = "SPLV",</div><div class='add'>+	 .brightness_get = "GPLV",</div><div class='add'>+	 .display_set = "SDSP",</div><div class='add'>+	 .display_get = "\\ADVG"},</div><div class='add'>+</div><div class='add'>+	{</div><div class='ctx'> 	 .name = "D1x",</div><div class='ctx'> 	 .mt_mled = "MLED",</div><div class='ctx'> 	 .mt_lcd_switch = "\\Q0D",</div><div class='hunk'>@@ -302,7 +310,8 @@ static struct model_data model_conf[END_MODEL] = {</div><div class='ctx'> 	 .brightness_set = "SPLV",</div><div class='ctx'> 	 .brightness_get = "GPLV",</div><div class='ctx'> 	 .display_set = "SDSP",</div><div class='del'>-	 .display_get = "\\_SB.PCI0.P0P1.VGA.GETD"},</div><div class='add'>+	 .display_get = "\\SSTE"},</div><div class='add'>+</div><div class='ctx'> 	{</div><div class='ctx'> 	 .name = "M6R",</div><div class='ctx'> 	 .mt_mled = "MLED",</div><div class='hunk'>@@ -312,7 +321,7 @@ static struct model_data model_conf[END_MODEL] = {</div><div class='ctx'> 	 .brightness_set = "SPLV",</div><div class='ctx'> 	 .brightness_get = "GPLV",</div><div class='ctx'> 	 .display_set = "SDSP",</div><div class='del'>-	 .display_get = "\\SSTE"},</div><div class='add'>+	 .display_get = "\\_SB.PCI0.P0P1.VGA.GETD"},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 	 .name = "P30",</div><div class='hunk'>@@ -345,6 +354,28 @@ static struct model_data model_conf[END_MODEL] = {</div><div class='ctx'> 	 .brightness_down = S2x_PREFIX "_Q0A"},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='add'>+	 .name = "W1N",</div><div class='add'>+	 .mt_mled = "MLED",</div><div class='add'>+	 .mt_wled = "WLED",</div><div class='add'>+	 .mt_ledd = "SLCM",</div><div class='add'>+	 .mt_lcd_switch = xxN_PREFIX "_Q10",</div><div class='add'>+	 .lcd_status = "\\BKLT",</div><div class='add'>+	 .brightness_set = "SPLV",</div><div class='add'>+	 .brightness_get = "GPLV",</div><div class='add'>+	 .display_set = "SDSP",</div><div class='add'>+	 .display_get = "\\ADVG"},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+	 .name = "W5A",</div><div class='add'>+	 .mt_bt_switch = "BLED",</div><div class='add'>+	 .mt_wled = "WLED",</div><div class='add'>+	 .mt_lcd_switch = xxN_PREFIX "_Q10",</div><div class='add'>+	 .brightness_set = "SPLV",</div><div class='add'>+	 .brightness_get = "GPLV",</div><div class='add'>+	 .display_set = "SDSP",</div><div class='add'>+	 .display_get = "\\ADVG"},</div><div class='add'>+</div><div class='add'>+	{</div><div class='ctx'> 	 .name = "xxN",</div><div class='ctx'> 	 .mt_mled = "MLED",</div><div class='ctx'> /* WLED present, but not controlled by ACPI */</div><div class='hunk'>@@ -563,6 +594,36 @@ proc_write_mled(struct file *file, const char __user * buffer,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Proc handlers for LED display</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+proc_read_ledd(char *page, char **start, off_t off, int count, int *eof,</div><div class='add'>+	       void *data)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "0x%08x\n", hotk-&gt;ledd_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+proc_write_ledd(struct file *file, const char __user * buffer,</div><div class='add'>+		unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	count = parse_arg(buffer, count, &amp;value);</div><div class='add'>+	if (count &gt; 0) {</div><div class='add'>+		if (!write_acpi_int</div><div class='add'>+		    (hotk-&gt;handle, hotk-&gt;methods-&gt;mt_ledd, value, NULL))</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "Asus ACPI: LED display write failed\n");</div><div class='add'>+		else</div><div class='add'>+			hotk-&gt;ledd_status = (u32) value;</div><div class='add'>+	} else if (count &lt; 0)</div><div class='add'>+		printk(KERN_WARNING "Asus ACPI: Error reading user input\n");</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Proc handlers for WLED</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -581,6 +642,25 @@ proc_write_wled(struct file *file, const char __user * buffer,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Proc handlers for Bluetooth</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+proc_read_bluetooth(char *page, char **start, off_t off, int count, int *eof,</div><div class='add'>+		    void *data)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%d\n", read_led(hotk-&gt;methods-&gt;bt_status, BT_ON));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+proc_write_bluetooth(struct file *file, const char __user * buffer,</div><div class='add'>+		     unsigned long count, void *data)</div><div class='add'>+{</div><div class='add'>+	/* Note: mt_bt_switch controls both internal Bluetooth adapter's </div><div class='add'>+	   presence and its LED */</div><div class='add'>+	return write_led(buffer, count, hotk-&gt;methods-&gt;mt_bt_switch, BT_ON, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Proc handlers for TLED</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -817,7 +897,7 @@ typedef int (proc_writefunc) (struct file * file, const char __user * buffer,</div><div class='ctx'> 			      unsigned long count, void *data);</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-__init asus_proc_add(char *name, proc_writefunc * writefunc,</div><div class='add'>+asus_proc_add(char *name, proc_writefunc * writefunc,</div><div class='ctx'> 		     proc_readfunc * readfunc, mode_t mode,</div><div class='ctx'> 		     struct acpi_device *device)</div><div class='ctx'> {</div><div class='hunk'>@@ -836,7 +916,7 @@ __init asus_proc_add(char *name, proc_writefunc * writefunc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init asus_hotk_add_fs(struct acpi_device *device)</div><div class='add'>+static int asus_hotk_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *proc;</div><div class='ctx'> 	mode_t mode;</div><div class='hunk'>@@ -876,6 +956,11 @@ static int __init asus_hotk_add_fs(struct acpi_device *device)</div><div class='ctx'> 			      mode, device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hotk-&gt;methods-&gt;mt_ledd) {</div><div class='add'>+		asus_proc_add(PROC_LEDD, &amp;proc_write_ledd, &amp;proc_read_ledd,</div><div class='add'>+			      mode, device);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (hotk-&gt;methods-&gt;mt_mled) {</div><div class='ctx'> 		asus_proc_add(PROC_MLED, &amp;proc_write_mled, &amp;proc_read_mled,</div><div class='ctx'> 			      mode, device);</div><div class='hunk'>@@ -886,6 +971,11 @@ static int __init asus_hotk_add_fs(struct acpi_device *device)</div><div class='ctx'> 			      mode, device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hotk-&gt;methods-&gt;mt_bt_switch) {</div><div class='add'>+		asus_proc_add(PROC_BT, &amp;proc_write_bluetooth,</div><div class='add'>+			      &amp;proc_read_bluetooth, mode, device);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* </div><div class='ctx'> 	 * We need both read node and write method as LCD switch is also accessible</div><div class='ctx'> 	 * from keyboard </div><div class='hunk'>@@ -919,6 +1009,10 @@ static int asus_hotk_remove_fs(struct acpi_device *device)</div><div class='ctx'> 			remove_proc_entry(PROC_MLED, acpi_device_dir(device));</div><div class='ctx'> 		if (hotk-&gt;methods-&gt;mt_tled)</div><div class='ctx'> 			remove_proc_entry(PROC_TLED, acpi_device_dir(device));</div><div class='add'>+		if (hotk-&gt;methods-&gt;mt_ledd)</div><div class='add'>+			remove_proc_entry(PROC_LEDD, acpi_device_dir(device));</div><div class='add'>+		if (hotk-&gt;methods-&gt;mt_bt_switch)</div><div class='add'>+			remove_proc_entry(PROC_BT, acpi_device_dir(device));</div><div class='ctx'> 		if (hotk-&gt;methods-&gt;mt_lcd_switch &amp;&amp; hotk-&gt;methods-&gt;lcd_status)</div><div class='ctx'> 			remove_proc_entry(PROC_LCD, acpi_device_dir(device));</div><div class='ctx'> 		if ((hotk-&gt;methods-&gt;brightness_up</div><div class='hunk'>@@ -951,15 +1045,75 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Match the model string to the list of supported models. Return END_MODEL if</div><div class='add'>+ * no match or model is NULL.</div><div class='add'>+ */</div><div class='add'>+static int asus_model_match(char *model)</div><div class='add'>+{</div><div class='add'>+	if (model == NULL)</div><div class='add'>+		return END_MODEL;</div><div class='add'>+</div><div class='add'>+	if (strncmp(model, "L3D", 3) == 0)</div><div class='add'>+		return L3D;</div><div class='add'>+	else if (strncmp(model, "L2E", 3) == 0 ||</div><div class='add'>+		 strncmp(model, "L3H", 3) == 0 || strncmp(model, "L5D", 3) == 0)</div><div class='add'>+		return L3H;</div><div class='add'>+	else if (strncmp(model, "L3", 2) == 0 || strncmp(model, "L2B", 3) == 0)</div><div class='add'>+		return L3C;</div><div class='add'>+	else if (strncmp(model, "L8L", 3) == 0)</div><div class='add'>+		return L8L;</div><div class='add'>+	else if (strncmp(model, "L4R", 3) == 0)</div><div class='add'>+		return L4R;</div><div class='add'>+	else if (strncmp(model, "M6N", 3) == 0 || strncmp(model, "W3N", 3) == 0)</div><div class='add'>+		return M6N;</div><div class='add'>+	else if (strncmp(model, "M6R", 3) == 0 || strncmp(model, "A3G", 3) == 0)</div><div class='add'>+		return M6R;</div><div class='add'>+	else if (strncmp(model, "M2N", 3) == 0 ||</div><div class='add'>+		 strncmp(model, "M3N", 3) == 0 ||</div><div class='add'>+		 strncmp(model, "M5N", 3) == 0 ||</div><div class='add'>+		 strncmp(model, "M6N", 3) == 0 ||</div><div class='add'>+		 strncmp(model, "S1N", 3) == 0 ||</div><div class='add'>+		 strncmp(model, "S5N", 3) == 0 || strncmp(model, "W1N", 3) == 0)</div><div class='add'>+		return xxN;</div><div class='add'>+	else if (strncmp(model, "M1", 2) == 0)</div><div class='add'>+		return M1A;</div><div class='add'>+	else if (strncmp(model, "M2", 2) == 0 || strncmp(model, "L4E", 3) == 0)</div><div class='add'>+		return M2E;</div><div class='add'>+	else if (strncmp(model, "L2", 2) == 0)</div><div class='add'>+		return L2D;</div><div class='add'>+	else if (strncmp(model, "L8", 2) == 0)</div><div class='add'>+		return S1x;</div><div class='add'>+	else if (strncmp(model, "D1", 2) == 0)</div><div class='add'>+		return D1x;</div><div class='add'>+	else if (strncmp(model, "A1", 2) == 0)</div><div class='add'>+		return A1x;</div><div class='add'>+	else if (strncmp(model, "A2", 2) == 0)</div><div class='add'>+		return A2x;</div><div class='add'>+	else if (strncmp(model, "J1", 2) == 0)</div><div class='add'>+		return S2x;</div><div class='add'>+	else if (strncmp(model, "L5", 2) == 0)</div><div class='add'>+		return L5x;</div><div class='add'>+	else if (strncmp(model, "A4G", 3) == 0)</div><div class='add'>+		return A4G;</div><div class='add'>+	else if (strncmp(model, "W1N", 3) == 0)</div><div class='add'>+		return W1N;</div><div class='add'>+	else if (strncmp(model, "W5A", 3) == 0)</div><div class='add'>+		return W5A;</div><div class='add'>+	else</div><div class='add'>+		return END_MODEL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * This function is used to initialize the hotk with right values. In this</div><div class='ctx'>  * method, we can make all the detection we want, and modify the hotk struct</div><div class='ctx'>  */</div><div class='del'>-static int __init asus_hotk_get_info(void)</div><div class='add'>+static int asus_hotk_get_info(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	union acpi_object *model = NULL;</div><div class='ctx'> 	int bsts_result;</div><div class='add'>+	char *string = NULL;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -970,7 +1124,7 @@ static int __init asus_hotk_get_info(void)</div><div class='ctx'> 	 * HID), this bit will be moved. A global variable asus_info contains</div><div class='ctx'> 	 * the DSDT header.</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_get_table(ACPI_TABLE_DSDT, 1, &amp;dsdt);</div><div class='add'>+	status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &amp;dsdt);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		printk(KERN_WARNING "  Couldn't get the DSDT table header\n");</div><div class='ctx'> 	else</div><div class='hunk'>@@ -989,119 +1143,78 @@ static int __init asus_hotk_get_info(void)</div><div class='ctx'> 		printk(KERN_NOTICE "  BSTS called, 0x%02x returned\n",</div><div class='ctx'> 		       bsts_result);</div><div class='ctx'> </div><div class='del'>-	/* This is unlikely with implicit return */</div><div class='del'>-	if (buffer.pointer == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	model = (union acpi_object *) buffer.pointer;</div><div class='ctx'> 	/*</div><div class='del'>-	 * Samsung P30 has a device with a valid _HID whose INIT does not </div><div class='del'>-	 * return anything. It used to be possible to catch this exception,</div><div class='del'>-	 * but the implicit return code will now happily confuse the </div><div class='del'>-	 * driver. We assume that every ACPI_TYPE_STRING is a valid model</div><div class='del'>-	 * identifier but it's still possible to get completely bogus data.</div><div class='add'>+	 * Try to match the object returned by INIT to the specific model.</div><div class='add'>+	 * Handle every possible object (or the lack of thereof) the DSDT </div><div class='add'>+	 * writers might throw at us. When in trouble, we pass NULL to </div><div class='add'>+	 * asus_model_match() and try something completely different.</div><div class='ctx'> 	 */</div><div class='del'>-	if (model-&gt;type == ACPI_TYPE_STRING) {</div><div class='del'>-		printk(KERN_NOTICE "  %s model detected, ", model-&gt;string.pointer);</div><div class='del'>-	} else {</div><div class='del'>-		if (asus_info &amp;&amp;	/* Samsung P30 */</div><div class='add'>+	if (buffer.pointer) {</div><div class='add'>+		model = (union acpi_object *)buffer.pointer;</div><div class='add'>+		switch (model-&gt;type) {</div><div class='add'>+		case ACPI_TYPE_STRING:</div><div class='add'>+			string = model-&gt;string.pointer;</div><div class='add'>+			break;</div><div class='add'>+		case ACPI_TYPE_BUFFER:</div><div class='add'>+			string = model-&gt;buffer.pointer;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			kfree(model);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hotk-&gt;model = asus_model_match(string);</div><div class='add'>+	if (hotk-&gt;model == END_MODEL) {	/* match failed */</div><div class='add'>+		if (asus_info &amp;&amp;</div><div class='ctx'> 		    strncmp(asus_info-&gt;oem_table_id, "ODEM", 4) == 0) {</div><div class='ctx'> 			hotk-&gt;model = P30;</div><div class='ctx'> 			printk(KERN_NOTICE</div><div class='ctx'> 			       "  Samsung P30 detected, supported\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			hotk-&gt;model = M2E;</div><div class='del'>-			printk(KERN_WARNING "  no string returned by INIT\n");</div><div class='del'>-			printk(KERN_WARNING "  trying default values, supply "</div><div class='del'>-			       "the developers with your DSDT\n");</div><div class='add'>+			printk(KERN_NOTICE "  unsupported model %s, trying "</div><div class='add'>+			       "default values\n", string);</div><div class='add'>+			printk(KERN_NOTICE</div><div class='add'>+			       "  send /proc/acpi/dsdt to the developers\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		hotk-&gt;methods = &amp;model_conf[hotk-&gt;model];</div><div class='del'>-		</div><div class='del'>-		acpi_os_free(model);</div><div class='del'>-</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hotk-&gt;model = END_MODEL;</div><div class='del'>-	if (strncmp(model-&gt;string.pointer, "L3D", 3) == 0)</div><div class='del'>-		hotk-&gt;model = L3D;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L3H", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "L2E", 3) == 0)</div><div class='del'>-		hotk-&gt;model = L3H;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L3", 2) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "L2B", 3) == 0)</div><div class='del'>-		hotk-&gt;model = L3C;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L8L", 3) == 0)</div><div class='del'>-		hotk-&gt;model = L8L;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L4R", 3) == 0)</div><div class='del'>-		hotk-&gt;model = L4R;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "M6N", 3) == 0)</div><div class='del'>-		hotk-&gt;model = M6N;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "M6R", 3) == 0)</div><div class='del'>-		hotk-&gt;model = M6R;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "M2N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "M3N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "M5N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "M6N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "S1N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "S5N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "W1N", 3) == 0)</div><div class='del'>-		hotk-&gt;model = xxN;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "M1", 2) == 0)</div><div class='del'>-		hotk-&gt;model = M1A;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "M2", 2) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "L4E", 3) == 0)</div><div class='del'>-		hotk-&gt;model = M2E;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L2", 2) == 0)</div><div class='del'>-		hotk-&gt;model = L2D;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L8", 2) == 0)</div><div class='del'>-		hotk-&gt;model = S1x;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "D1", 2) == 0)</div><div class='del'>-		hotk-&gt;model = D1x;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "A1", 2) == 0)</div><div class='del'>-		hotk-&gt;model = A1x;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "A2", 2) == 0)</div><div class='del'>-		hotk-&gt;model = A2x;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "J1", 2) == 0)</div><div class='del'>-		hotk-&gt;model = S2x;</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "L5", 2) == 0)</div><div class='del'>-		hotk-&gt;model = L5x;</div><div class='del'>-</div><div class='del'>-	if (hotk-&gt;model == END_MODEL) {</div><div class='del'>-		printk("unsupported, trying default values, supply the "</div><div class='del'>-		       "developers with your DSDT\n");</div><div class='del'>-		hotk-&gt;model = M2E;</div><div class='del'>-	} else {</div><div class='del'>-		printk("supported\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	hotk-&gt;methods = &amp;model_conf[hotk-&gt;model];</div><div class='add'>+	printk(KERN_NOTICE "  %s model detected, supported\n", string);</div><div class='ctx'> </div><div class='ctx'> 	/* Sort of per-model blacklist */</div><div class='del'>-	if (strncmp(model-&gt;string.pointer, "L2B", 3) == 0)</div><div class='add'>+	if (strncmp(string, "L2B", 3) == 0)</div><div class='ctx'> 		hotk-&gt;methods-&gt;lcd_status = NULL;</div><div class='ctx'> 	/* L2B is similar enough to L3C to use its settings, with this only </div><div class='ctx'> 	   exception */</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "S5N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "M5N", 3) == 0)</div><div class='add'>+	else if (strncmp(string, "A3G", 3) == 0)</div><div class='add'>+		hotk-&gt;methods-&gt;lcd_status = "\\BLFG";</div><div class='add'>+	/* A3G is like M6R */</div><div class='add'>+	else if (strncmp(string, "S5N", 3) == 0 ||</div><div class='add'>+		 strncmp(string, "M5N", 3) == 0 ||</div><div class='add'>+		 strncmp(string, "W3N", 3) == 0)</div><div class='ctx'> 		hotk-&gt;methods-&gt;mt_mled = NULL;</div><div class='del'>-	/* S5N and M5N have no MLED */</div><div class='del'>-	else if (strncmp(model-&gt;string.pointer, "M2N", 3) == 0 ||</div><div class='del'>-		 strncmp(model-&gt;string.pointer, "W1N", 3) == 0)</div><div class='add'>+	/* S5N, M5N and W3N have no MLED */</div><div class='add'>+	else if (strncmp(string, "L5D", 3) == 0)</div><div class='add'>+		hotk-&gt;methods-&gt;mt_wled = NULL;</div><div class='add'>+	/* L5D's WLED is not controlled by ACPI */</div><div class='add'>+	else if (strncmp(string, "M2N", 3) == 0 ||</div><div class='add'>+		 strncmp(string, "S1N", 3) == 0)</div><div class='ctx'> 		hotk-&gt;methods-&gt;mt_wled = "WLED";</div><div class='del'>-	/* M2N and W1N have a usable WLED */</div><div class='add'>+	/* M2N and S1N have a usable WLED */</div><div class='ctx'> 	else if (asus_info) {</div><div class='ctx'> 		if (strncmp(asus_info-&gt;oem_table_id, "L1", 2) == 0)</div><div class='ctx'> 			hotk-&gt;methods-&gt;mled_status = NULL;</div><div class='ctx'> 		/* S1300A reports L84F, but L1400B too, account for that */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(model);</div><div class='add'>+	kfree(model);</div><div class='ctx'> </div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init asus_hotk_check(void)</div><div class='add'>+static int asus_hotk_check(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1119,7 +1232,9 @@ static int __init asus_hotk_check(void)</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init asus_hotk_add(struct acpi_device *device)</div><div class='add'>+static int asus_hotk_found;</div><div class='add'>+</div><div class='add'>+static int asus_hotk_add(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	int result;</div><div class='hunk'>@@ -1162,8 +1277,7 @@ static int __init asus_hotk_add(struct acpi_device *device)</div><div class='ctx'> 	/* For laptops without GPLV: init the hotk-&gt;brightness value */</div><div class='ctx'> 	if ((!hotk-&gt;methods-&gt;brightness_get)</div><div class='ctx'> 	    &amp;&amp; (!hotk-&gt;methods-&gt;brightness_status)</div><div class='del'>-	    &amp;&amp; (hotk-&gt;methods-&gt;brightness_up</div><div class='del'>-		&amp;&amp; hotk-&gt;methods-&gt;brightness_down)) {</div><div class='add'>+	    &amp;&amp; (hotk-&gt;methods-&gt;brightness_up &amp;&amp; hotk-&gt;methods-&gt;brightness_down)) {</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_evaluate_object(NULL, hotk-&gt;methods-&gt;brightness_down,</div><div class='ctx'> 					 NULL, NULL);</div><div class='hunk'>@@ -1180,6 +1294,11 @@ static int __init asus_hotk_add(struct acpi_device *device)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	asus_hotk_found = 1;</div><div class='add'>+</div><div class='add'>+	/* LED display is off by default */</div><div class='add'>+	hotk-&gt;ledd_status = 0xFFF;</div><div class='add'>+</div><div class='ctx'>       end:</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		kfree(hotk);</div><div class='hunk'>@@ -1226,10 +1345,22 @@ static int __init asus_acpi_init(void)</div><div class='ctx'> 	asus_proc_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;asus_hotk_driver);</div><div class='del'>-	if (result &lt; 1) {</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		remove_proc_entry(PROC_ASUS, acpi_root_dir);</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is a bit of a kludge.  We only want this module loaded</div><div class='add'>+	 * for ASUS systems, but there's currently no way to probe the</div><div class='add'>+	 * ACPI namespace for ASUS HIDs.  So we just return failure if</div><div class='add'>+	 * we didn't find one, which will cause the module to be</div><div class='add'>+	 * unloaded.</div><div class='add'>+	 */</div><div class='add'>+	if (!asus_hotk_found) {</div><div class='ctx'> 		acpi_bus_unregister_driver(&amp;asus_hotk_driver);</div><div class='ctx'> 		remove_proc_entry(PROC_ASUS, acpi_root_dir);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1240,7 +1371,7 @@ static void __exit asus_acpi_exit(void)</div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;asus_hotk_driver);</div><div class='ctx'> 	remove_proc_entry(PROC_ASUS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(asus_info);</div><div class='add'>+	kfree(asus_info);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c<br/>index 702e857e98c5..6e5221707d97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/battery.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/battery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/battery.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/battery.c</a></div><div class='hunk'>@@ -59,6 +59,9 @@ ACPI_MODULE_NAME("acpi_battery")</div><div class='ctx'> MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='add'>+extern struct proc_dir_entry *acpi_lock_battery_dir(void);</div><div class='add'>+extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);</div><div class='add'>+</div><div class='ctx'> static int acpi_battery_add(struct acpi_device *device);</div><div class='ctx'> static int acpi_battery_remove(struct acpi_device *device, int type);</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +111,7 @@ struct acpi_battery_trips {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_battery {</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device * device;</div><div class='ctx'> 	struct acpi_battery_flags flags;</div><div class='ctx'> 	struct acpi_battery_trips trips;</div><div class='ctx'> 	unsigned long alarm;</div><div class='hunk'>@@ -132,17 +135,16 @@ acpi_battery_get_info(struct acpi_battery *battery,</div><div class='ctx'> 	struct acpi_buffer data = { 0, NULL };</div><div class='ctx'> 	union acpi_object *package = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_get_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery || !bif)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Evalute _BIF */</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(battery-&gt;handle, "_BIF", NULL, &amp;buffer);</div><div class='add'>+	status = acpi_evaluate_object(battery-&gt;device-&gt;handle, "_BIF", NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _BIF\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	package = (union acpi_object *)buffer.pointer;</div><div class='hunk'>@@ -151,7 +153,7 @@ acpi_battery_get_info(struct acpi_battery *battery,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_extract_package(package, &amp;format, &amp;data);</div><div class='ctx'> 	if (status != AE_BUFFER_OVERFLOW) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BIF\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -165,19 +167,19 @@ acpi_battery_get_info(struct acpi_battery *battery,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_extract_package(package, &amp;format, &amp;data);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BIF\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));</div><div class='ctx'> 		kfree(data.pointer);</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='ctx'> 	if (!result)</div><div class='ctx'> 		(*bif) = (struct acpi_battery_info *)data.pointer;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -193,17 +195,16 @@ acpi_battery_get_status(struct acpi_battery *battery,</div><div class='ctx'> 	struct acpi_buffer data = { 0, NULL };</div><div class='ctx'> 	union acpi_object *package = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_get_status");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery || !bst)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Evalute _BST */</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(battery-&gt;handle, "_BST", NULL, &amp;buffer);</div><div class='add'>+	status = acpi_evaluate_object(battery-&gt;device-&gt;handle, "_BST", NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _BST\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	package = (union acpi_object *)buffer.pointer;</div><div class='hunk'>@@ -212,7 +213,7 @@ acpi_battery_get_status(struct acpi_battery *battery,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_extract_package(package, &amp;format, &amp;data);</div><div class='ctx'> 	if (status != AE_BUFFER_OVERFLOW) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BST\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -226,19 +227,19 @@ acpi_battery_get_status(struct acpi_battery *battery,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_extract_package(package, &amp;format, &amp;data);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BST\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));</div><div class='ctx'> 		kfree(data.pointer);</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='ctx'> 	if (!result)</div><div class='ctx'> 		(*bst) = (struct acpi_battery_status *)data.pointer;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -248,25 +249,24 @@ acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)</div><div class='ctx'> 	union acpi_object arg0 = { ACPI_TYPE_INTEGER };</div><div class='ctx'> 	struct acpi_object_list arg_list = { 1, &amp;arg0 };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_set_alarm");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!battery-&gt;flags.alarm)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	arg0.integer.value = alarm;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(battery-&gt;handle, "_BTP", &amp;arg_list, NULL);</div><div class='add'>+	status = acpi_evaluate_object(battery-&gt;device-&gt;handle, "_BTP", &amp;arg_list, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", (u32) alarm));</div><div class='ctx'> </div><div class='ctx'> 	battery-&gt;alarm = alarm;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_check(struct acpi_battery *battery)</div><div class='hunk'>@@ -277,18 +277,15 @@ static int acpi_battery_check(struct acpi_battery *battery)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	struct acpi_battery_info *bif = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_check");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	result = acpi_bus_get_device(battery-&gt;handle, &amp;device);</div><div class='del'>-	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+	device = battery-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_status(device);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	/* Insertion? */</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +297,7 @@ static int acpi_battery_check(struct acpi_battery *battery)</div><div class='ctx'> </div><div class='ctx'> 		result = acpi_battery_get_info(battery, &amp;bif);</div><div class='ctx'> 		if (result)</div><div class='del'>-			return_VALUE(result);</div><div class='add'>+			return result;</div><div class='ctx'> </div><div class='ctx'> 		battery-&gt;flags.power_unit = bif-&gt;power_unit;</div><div class='ctx'> 		battery-&gt;trips.warning = bif-&gt;design_capacity_warning;</div><div class='hunk'>@@ -309,7 +306,7 @@ static int acpi_battery_check(struct acpi_battery *battery)</div><div class='ctx'> </div><div class='ctx'> 		/* See if alarms are supported, and if so, set default */</div><div class='ctx'> </div><div class='del'>-		status = acpi_get_handle(battery-&gt;handle, "_BTP", &amp;handle);</div><div class='add'>+		status = acpi_get_handle(battery-&gt;device-&gt;handle, "_BTP", &amp;handle);</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			battery-&gt;flags.alarm = 1;</div><div class='ctx'> 			acpi_battery_set_alarm(battery, battery-&gt;trips.warning);</div><div class='hunk'>@@ -324,7 +321,7 @@ static int acpi_battery_check(struct acpi_battery *battery)</div><div class='ctx'> </div><div class='ctx'> 	battery-&gt;flags.present = device-&gt;status.battery_present;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -339,7 +336,6 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_battery_info *bif = NULL;</div><div class='ctx'> 	char *units = "?";</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_read_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -409,7 +405,7 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)</div><div class='ctx'>       end:</div><div class='ctx'> 	kfree(bif);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -424,7 +420,6 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_battery_status *bst = NULL;</div><div class='ctx'> 	char *units = "?";</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_read_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -458,8 +453,6 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)</div><div class='ctx'> 	if ((bst-&gt;state &amp; 0x01) &amp;&amp; (bst-&gt;state &amp; 0x02)) {</div><div class='ctx'> 		seq_printf(seq,</div><div class='ctx'> 			   "charging state:          charging/discharging\n");</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Battery Charging and Discharging?\n"));</div><div class='ctx'> 	} else if (bst-&gt;state &amp; 0x01)</div><div class='ctx'> 		seq_printf(seq, "charging state:          discharging\n");</div><div class='ctx'> 	else if (bst-&gt;state &amp; 0x02)</div><div class='hunk'>@@ -489,7 +482,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)</div><div class='ctx'>       end:</div><div class='ctx'> 	kfree(bst);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -502,7 +495,6 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_battery *battery = (struct acpi_battery *)seq-&gt;private;</div><div class='ctx'> 	char *units = "?";</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_read_alarm");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -527,7 +519,7 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)</div><div class='ctx'> 		seq_printf(seq, "%d %sh\n", (u32) battery-&gt;alarm, units);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -540,25 +532,24 @@ acpi_battery_write_alarm(struct file *file,</div><div class='ctx'> 	struct seq_file *m = (struct seq_file *)file-&gt;private_data;</div><div class='ctx'> 	struct acpi_battery *battery = (struct acpi_battery *)m-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_write_alarm");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery || (count &gt; sizeof(alarm_string) - 1))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!battery-&gt;flags.present)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(alarm_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	alarm_string[count] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_battery_set_alarm(battery,</div><div class='ctx'> 					simple_strtoul(alarm_string, NULL, 0));</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -566,7 +557,7 @@ static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)</div><div class='ctx'> 	return single_open(file, acpi_battery_read_alarm, PDE(inode)-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_battery_info_ops = {</div><div class='add'>+static const struct file_operations acpi_battery_info_ops = {</div><div class='ctx'> 	.open = acpi_battery_info_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -574,7 +565,7 @@ static struct file_operations acpi_battery_info_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_battery_state_ops = {</div><div class='add'>+static const struct file_operations acpi_battery_state_ops = {</div><div class='ctx'> 	.open = acpi_battery_state_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -582,7 +573,7 @@ static struct file_operations acpi_battery_state_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_battery_alarm_ops = {</div><div class='add'>+static const struct file_operations acpi_battery_alarm_ops = {</div><div class='ctx'> 	.open = acpi_battery_alarm_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_battery_write_alarm,</div><div class='hunk'>@@ -595,13 +586,12 @@ static int acpi_battery_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_battery_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -609,9 +599,7 @@ static int acpi_battery_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry = create_proc_entry(ACPI_BATTERY_FILE_INFO,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_BATTERY_FILE_INFO));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_battery_info_ops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -622,9 +610,7 @@ static int acpi_battery_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry = create_proc_entry(ACPI_BATTERY_FILE_STATUS,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_BATTERY_FILE_STATUS));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_battery_state_ops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -636,21 +622,18 @@ static int acpi_battery_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_BATTERY_FILE_ALARM));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_battery_alarm_ops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_BATTERY_FILE_ALARM,</div><div class='hunk'>@@ -664,7 +647,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -676,17 +659,17 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_battery *battery = (struct acpi_battery *)data;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_notify");</div><div class='ctx'> </div><div class='ctx'> 	if (!battery)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (acpi_bus_get_device(handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+	device = battery-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_BATTERY_NOTIFY_STATUS:</div><div class='ctx'> 	case ACPI_BATTERY_NOTIFY_INFO:</div><div class='add'>+	case ACPI_NOTIFY_BUS_CHECK:</div><div class='add'>+	case ACPI_NOTIFY_DEVICE_CHECK:</div><div class='ctx'> 		acpi_battery_check(battery);</div><div class='ctx'> 		acpi_bus_generate_event(device, event, battery-&gt;flags.present);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -696,7 +679,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_add(struct acpi_device *device)</div><div class='hunk'>@@ -705,17 +688,16 @@ static int acpi_battery_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	struct acpi_battery *battery = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	battery = kmalloc(sizeof(struct acpi_battery), GFP_KERNEL);</div><div class='ctx'> 	if (!battery)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(battery, 0, sizeof(struct acpi_battery));</div><div class='ctx'> </div><div class='del'>-	battery-&gt;handle = device-&gt;handle;</div><div class='add'>+	battery-&gt;device = device;</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = battery;</div><div class='hunk'>@@ -728,12 +710,10 @@ static int acpi_battery_add(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	status = acpi_install_notify_handler(battery-&gt;handle,</div><div class='del'>-					     ACPI_DEVICE_NOTIFY,</div><div class='add'>+	status = acpi_install_notify_handler(device-&gt;handle,</div><div class='add'>+					     ACPI_ALL_NOTIFY,</div><div class='ctx'> 					     acpi_battery_notify, battery);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error installing notify handler\n"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -748,7 +728,7 @@ static int acpi_battery_add(struct acpi_device *device)</div><div class='ctx'> 		kfree(battery);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_battery_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -756,56 +736,48 @@ static int acpi_battery_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	struct acpi_battery *battery = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	battery = (struct acpi_battery *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='del'>-	status = acpi_remove_notify_handler(battery-&gt;handle,</div><div class='del'>-					    ACPI_DEVICE_NOTIFY,</div><div class='add'>+	status = acpi_remove_notify_handler(device-&gt;handle,</div><div class='add'>+					    ACPI_ALL_NOTIFY,</div><div class='ctx'> 					    acpi_battery_notify);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='ctx'> </div><div class='ctx'> 	acpi_battery_remove_fs(device);</div><div class='ctx'> </div><div class='ctx'> 	kfree(battery);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_battery_init(void)</div><div class='ctx'> {</div><div class='del'>-	int result = 0;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_init");</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='del'>-	acpi_battery_dir = proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir);</div><div class='add'>+	acpi_battery_dir = acpi_lock_battery_dir();</div><div class='ctx'> 	if (!acpi_battery_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='del'>-	acpi_battery_dir-&gt;owner = THIS_MODULE;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_battery_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='del'>-		remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		acpi_unlock_battery_dir(acpi_battery_dir);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_battery_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_battery_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_battery_driver);</div><div class='ctx'> </div><div class='del'>-	remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);</div><div class='add'>+	acpi_unlock_battery_dir(acpi_battery_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_battery_init);</div><div class='head'>diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c<br/>index 606f8733a776..b2977695e120 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/bus.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ ACPI_MODULE_NAME("acpi_bus")</div><div class='ctx'> extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-FADT_DESCRIPTOR acpi_fadt;</div><div class='add'>+struct fadt_descriptor acpi_fadt;</div><div class='ctx'> EXPORT_SYMBOL(acpi_fadt);</div><div class='ctx'> </div><div class='ctx'> struct acpi_device *acpi_root;</div><div class='hunk'>@@ -60,21 +60,19 @@ int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_get_device");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Support fixed-feature devices */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_data(handle, acpi_bus_data_handler, (void **)device);</div><div class='ctx'> 	if (ACPI_FAILURE(status) || !*device) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "No context for object [%p]\n",</div><div class='del'>-				  handle));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "No context for object [%p]", handle));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_get_device);</div><div class='hunk'>@@ -84,10 +82,9 @@ int acpi_bus_get_status(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	unsigned long sta = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_get_status");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Evaluate _STA if present.</div><div class='hunk'>@@ -96,7 +93,7 @@ int acpi_bus_get_status(struct acpi_device *device)</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_evaluate_integer(device-&gt;handle, "_STA", NULL, &amp;sta);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		STRUCT_TO_INT(device-&gt;status) = (int)sta;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +117,7 @@ int acpi_bus_get_status(struct acpi_device *device)</div><div class='ctx'> 			  device-&gt;pnp.bus_id,</div><div class='ctx'> 			  (u32) STRUCT_TO_INT(device-&gt;status)));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_get_status);</div><div class='hunk'>@@ -136,11 +133,10 @@ int acpi_bus_get_power(acpi_handle handle, int *state)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	unsigned long psc = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_get_power");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	*state = ACPI_STATE_UNKNOWN;</div><div class='ctx'> </div><div class='hunk'>@@ -159,12 +155,12 @@ int acpi_bus_get_power(acpi_handle handle, int *state)</div><div class='ctx'> 			status = acpi_evaluate_integer(device-&gt;handle, "_PSC",</div><div class='ctx'> 						       NULL, &amp;psc);</div><div class='ctx'> 			if (ACPI_FAILURE(status))</div><div class='del'>-				return_VALUE(-ENODEV);</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 			device-&gt;power.state = (int)psc;</div><div class='ctx'> 		} else if (device-&gt;power.flags.power_resources) {</div><div class='ctx'> 			result = acpi_power_get_inferred_state(device);</div><div class='ctx'> 			if (result)</div><div class='del'>-				return_VALUE(result);</div><div class='add'>+				return result;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		*state = device-&gt;power.state;</div><div class='hunk'>@@ -173,7 +169,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",</div><div class='ctx'> 			  device-&gt;pnp.bus_id, device-&gt;power.state));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_get_power);</div><div class='hunk'>@@ -185,42 +181,43 @@ int acpi_bus_set_power(acpi_handle handle, int state)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_set_power");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	if ((state &lt; ACPI_STATE_D0) || (state &gt; ACPI_STATE_D3))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure this is a valid target state */</div><div class='ctx'> </div><div class='ctx'> 	if (!device-&gt;flags.power_manageable) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Device is not power manageable\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable",</div><div class='add'>+				device-&gt;kobj.name));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get device's current power state if it's unknown</div><div class='ctx'> 	 * This means device power state isn't initialized or previous setting failed</div><div class='ctx'> 	 */</div><div class='del'>-	if (device-&gt;power.state == ACPI_STATE_UNKNOWN)</div><div class='del'>-		acpi_bus_get_power(device-&gt;handle, &amp;device-&gt;power.state);</div><div class='del'>-	if (state == device-&gt;power.state) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",</div><div class='del'>-				  state));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+	if (!device-&gt;flags.force_power_state) {</div><div class='add'>+		if (device-&gt;power.state == ACPI_STATE_UNKNOWN)</div><div class='add'>+			acpi_bus_get_power(device-&gt;handle, &amp;device-&gt;power.state);</div><div class='add'>+		if (state == device-&gt;power.state) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",</div><div class='add'>+					  state));</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!device-&gt;power.states[state].flags.valid) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Device does not support D%d\n",</div><div class='del'>-				  state));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (device-&gt;parent &amp;&amp; (state &lt; device-&gt;parent-&gt;power.state)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Cannot set device to a higher-powered state than parent\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_WARNING PREFIX</div><div class='add'>+			      "Cannot set device to a higher-powered"</div><div class='add'>+			      " state than parent\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -262,15 +259,15 @@ int acpi_bus_set_power(acpi_handle handle, int state)</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='ctx'> 	if (result)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Error transitioning device [%s] to D%d\n",</div><div class='del'>-				  device-&gt;pnp.bus_id, state));</div><div class='add'>+		printk(KERN_WARNING PREFIX</div><div class='add'>+			      "Transitioning device [%s] to D%d\n",</div><div class='add'>+			      device-&gt;pnp.bus_id, state);</div><div class='ctx'> 	else</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "Device [%s] transitioned to D%d\n",</div><div class='ctx'> 				  device-&gt;pnp.bus_id, state));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_set_power);</div><div class='hunk'>@@ -291,18 +288,17 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)</div><div class='ctx'> 	struct acpi_bus_event *event = NULL;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_generate_event");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* drop event on the floor if no one's listening */</div><div class='ctx'> 	if (!event_is_open)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	event = kmalloc(sizeof(struct acpi_bus_event), GFP_ATOMIC);</div><div class='ctx'> 	if (!event)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(event-&gt;device_class, device-&gt;pnp.device_class);</div><div class='ctx'> 	strcpy(event-&gt;bus_id, device-&gt;pnp.bus_id);</div><div class='hunk'>@@ -315,7 +311,7 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)</div><div class='ctx'> </div><div class='ctx'> 	wake_up_interruptible(&amp;acpi_bus_event_queue);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_generate_event);</div><div class='hunk'>@@ -327,10 +323,9 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)</div><div class='ctx'> </div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_receive_event");</div><div class='ctx'> </div><div class='ctx'> 	if (!event)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;acpi_bus_event_list)) {</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +339,7 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> </div><div class='ctx'> 		if (signal_pending(current))</div><div class='del'>-			return_VALUE(-ERESTARTSYS);</div><div class='add'>+			return -ERESTARTSYS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;acpi_bus_event_lock, flags);</div><div class='hunk'>@@ -355,13 +350,13 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;acpi_bus_event_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!entry)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(event, entry, sizeof(struct acpi_bus_event));</div><div class='ctx'> </div><div class='ctx'> 	kfree(entry);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_receive_event);</div><div class='hunk'>@@ -376,10 +371,9 @@ acpi_bus_check_device(struct acpi_device *device, int *status_changed)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	struct acpi_device_status old_status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_check_device");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (status_changed)</div><div class='ctx'> 		*status_changed = 0;</div><div class='hunk'>@@ -396,15 +390,15 @@ acpi_bus_check_device(struct acpi_device *device, int *status_changed)</div><div class='ctx'> 			if (status_changed)</div><div class='ctx'> 				*status_changed = 1;</div><div class='ctx'> 		}</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_bus_get_status(device);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (STRUCT_TO_INT(old_status) == STRUCT_TO_INT(device-&gt;status))</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (status_changed)</div><div class='ctx'> 		*status_changed = 1;</div><div class='hunk'>@@ -420,7 +414,7 @@ acpi_bus_check_device(struct acpi_device *device, int *status_changed)</div><div class='ctx'> 		/* TBD: Handle device removal */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_bus_check_scope(struct acpi_device *device)</div><div class='hunk'>@@ -428,25 +422,24 @@ static int acpi_bus_check_scope(struct acpi_device *device)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	int status_changed = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_check_scope");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Status Change? */</div><div class='ctx'> 	result = acpi_bus_check_device(device, &amp;status_changed);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	if (!status_changed)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TBD: Enumerate child devices within this device's scope and</div><div class='ctx'> 	 *       run acpi_bus_check_device()'s on them.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -459,10 +452,9 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_notify");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +529,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -551,7 +543,6 @@ static int __init acpi_bus_init_irq(void)</div><div class='ctx'> 	struct acpi_object_list arg_list = { 1, &amp;arg };</div><div class='ctx'> 	char *message = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_init_irq");</div><div class='ctx'> </div><div class='ctx'> 	/* </div><div class='ctx'> 	 * Let the system know what interrupt model we are using by</div><div class='hunk'>@@ -570,7 +561,7 @@ static int __init acpi_bus_init_irq(void)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n");</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO PREFIX "Using %s for interrupt routing\n", message);</div><div class='hunk'>@@ -579,11 +570,11 @@ static int __init acpi_bus_init_irq(void)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(NULL, "\\_PIC", &amp;arg_list, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status) &amp;&amp; (status != AE_NOT_FOUND)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PIC\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PIC"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init acpi_early_init(void)</div><div class='hunk'>@@ -591,10 +582,11 @@ void __init acpi_early_init(void)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_buffer buffer = { sizeof(acpi_fadt), &amp;acpi_fadt };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_early_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	/* enable workarounds, unless strict ACPI spec. compliance */</div><div class='ctx'> 	if (!acpi_strict)</div><div class='hunk'>@@ -617,7 +609,7 @@ void __init acpi_early_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get a separate copy of the FADT for use by other drivers.</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_get_table(ACPI_TABLE_FADT, 1, &amp;buffer);</div><div class='add'>+	status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		printk(KERN_ERR PREFIX "Unable to get the FADT\n");</div><div class='ctx'> 		goto error0;</div><div class='hunk'>@@ -652,11 +644,11 @@ void __init acpi_early_init(void)</div><div class='ctx'> 		goto error0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> </div><div class='ctx'>       error0:</div><div class='ctx'> 	disable_acpi();</div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_bus_init(void)</div><div class='hunk'>@@ -665,7 +657,6 @@ static int __init acpi_bus_init(void)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	extern acpi_status acpi_os_initialize1(void);</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_init");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_os_initialize1();</div><div class='ctx'> </div><div class='hunk'>@@ -727,12 +718,12 @@ static int __init acpi_bus_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_root_dir = proc_mkdir(ACPI_BUS_FILE_ROOT, NULL);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Mimic structured exception handling */</div><div class='ctx'>       error1:</div><div class='ctx'> 	acpi_terminate();</div><div class='del'>-	return_VALUE(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> decl_subsys(acpi, NULL, NULL);</div><div class='hunk'>@@ -741,13 +732,10 @@ static int __init acpi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_init");</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO PREFIX "Subsystem revision %08x\n", ACPI_CA_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled) {</div><div class='ctx'> 		printk(KERN_INFO PREFIX "Interpreter disabled.\n");</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	firmware_register(&amp;acpi_subsys);</div><div class='hunk'>@@ -768,7 +756,7 @@ static int __init acpi_init(void)</div><div class='ctx'> 	} else</div><div class='ctx'> 		disable_acpi();</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_init);</div><div class='head'>diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c<br/>index 4b6d9f0096a1..5ef885e82c78 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/button.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/button.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/button.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/button.c</a></div><div class='hunk'>@@ -82,20 +82,19 @@ static struct acpi_driver acpi_button_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_button {</div><div class='del'>-	acpi_handle handle;</div><div class='ctx'> 	struct acpi_device *device;	/* Fixed button kludge */</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	unsigned long pushed;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_button_info_fops = {</div><div class='add'>+static const struct file_operations acpi_button_info_fops = {</div><div class='ctx'> 	.open = acpi_button_info_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='ctx'> 	.release = single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_button_state_fops = {</div><div class='add'>+static const struct file_operations acpi_button_state_fops = {</div><div class='ctx'> 	.open = acpi_button_state_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -112,15 +111,14 @@ static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_button *button = (struct acpi_button *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_info_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!button || !button-&gt;device)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "type:                    %s\n",</div><div class='ctx'> 		   acpi_device_name(button-&gt;device));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_button_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -134,12 +132,11 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	unsigned long state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_state_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!button || !button-&gt;device)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(button-&gt;handle, "_LID", NULL, &amp;state);</div><div class='add'>+	status = acpi_evaluate_integer(button-&gt;device-&gt;handle, "_LID", NULL, &amp;state);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		seq_printf(seq, "state:      unsupported\n");</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -147,7 +144,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 			   (state ? "open" : "closed"));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_button_state_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -164,10 +161,9 @@ static int acpi_button_add_fs(struct acpi_device *device)</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> 	struct acpi_button *button = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	button = acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -195,21 +191,19 @@ static int acpi_button_add_fs(struct acpi_device *device)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!entry)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), entry);</div><div class='ctx'> 	if (!acpi_device_dir(device))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/* 'info' [R] */</div><div class='ctx'> 	entry = create_proc_entry(ACPI_BUTTON_FILE_INFO,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_BUTTON_FILE_INFO));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_button_info_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -221,9 +215,7 @@ static int acpi_button_add_fs(struct acpi_device *device)</div><div class='ctx'> 		entry = create_proc_entry(ACPI_BUTTON_FILE_STATE,</div><div class='ctx'> 					  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 		if (!entry)</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Unable to create '%s' fs entry\n",</div><div class='del'>-					  ACPI_BUTTON_FILE_INFO));</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		else {</div><div class='ctx'> 			entry-&gt;proc_fops = &amp;acpi_button_state_fops;</div><div class='ctx'> 			entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -231,14 +223,13 @@ static int acpi_button_add_fs(struct acpi_device *device)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_button_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_button *button = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	button = acpi_driver_data(device);</div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='hunk'>@@ -253,7 +244,7 @@ static int acpi_button_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -264,10 +255,9 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_button *button = (struct acpi_button *)data;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_notify");</div><div class='ctx'> </div><div class='ctx'> 	if (!button || !button-&gt;device)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_BUTTON_NOTIFY_STATUS:</div><div class='hunk'>@@ -280,21 +270,20 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status acpi_button_notify_fixed(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_button *button = (struct acpi_button *)data;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_notify_fixed");</div><div class='ctx'> </div><div class='ctx'> 	if (!button)</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='del'>-	acpi_button_notify(button-&gt;handle, ACPI_BUTTON_NOTIFY_STATUS, button);</div><div class='add'>+	acpi_button_notify(button-&gt;device-&gt;handle, ACPI_BUTTON_NOTIFY_STATUS, button);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_button_add(struct acpi_device *device)</div><div class='hunk'>@@ -303,18 +292,16 @@ static int acpi_button_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_button *button = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	button = kmalloc(sizeof(struct acpi_button), GFP_KERNEL);</div><div class='ctx'> 	if (!button)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(button, 0, sizeof(struct acpi_button));</div><div class='ctx'> </div><div class='ctx'> 	button-&gt;device = device;</div><div class='del'>-	button-&gt;handle = device-&gt;handle;</div><div class='ctx'> 	acpi_driver_data(device) = button;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -349,8 +336,8 @@ static int acpi_button_add(struct acpi_device *device)</div><div class='ctx'> 		sprintf(acpi_device_class(device), "%s/%s",</div><div class='ctx'> 			ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);</div><div class='ctx'> 	} else {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unsupported hid [%s]\n",</div><div class='del'>-				  acpi_device_hid(device)));</div><div class='add'>+		printk(KERN_ERR PREFIX "Unsupported hid [%s]\n",</div><div class='add'>+			    acpi_device_hid(device));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -373,7 +360,7 @@ static int acpi_button_add(struct acpi_device *device)</div><div class='ctx'> 						     button);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		status = acpi_install_notify_handler(button-&gt;handle,</div><div class='add'>+		status = acpi_install_notify_handler(device-&gt;handle,</div><div class='ctx'> 						     ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 						     acpi_button_notify,</div><div class='ctx'> 						     button);</div><div class='hunk'>@@ -381,8 +368,6 @@ static int acpi_button_add(struct acpi_device *device)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error installing notify handler\n"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -406,7 +391,7 @@ static int acpi_button_add(struct acpi_device *device)</div><div class='ctx'> 		kfree(button);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_button_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -414,10 +399,9 @@ static int acpi_button_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	struct acpi_button *button = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	button = acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -434,45 +418,39 @@ static int acpi_button_remove(struct acpi_device *device, int type)</div><div class='ctx'> 						    acpi_button_notify_fixed);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		status = acpi_remove_notify_handler(button-&gt;handle,</div><div class='add'>+		status = acpi_remove_notify_handler(device-&gt;handle,</div><div class='ctx'> 						    ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 						    acpi_button_notify);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='del'>-</div><div class='ctx'> 	acpi_button_remove_fs(device);</div><div class='ctx'> </div><div class='ctx'> 	kfree(button);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_button_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_init");</div><div class='ctx'> </div><div class='ctx'> 	acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_button_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	acpi_button_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_button_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_button_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_button_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_button_driver);</div><div class='ctx'> </div><div class='hunk'>@@ -484,7 +462,7 @@ static void __exit acpi_button_exit(void)</div><div class='ctx'> 		remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);</div><div class='ctx'> 	remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_button_init);</div><div class='head'>diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c<br/>new file mode 100644<br/>index 000000000000..a01ce6700bfe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/cm_sbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/cm_sbs.c</a></div><div class='hunk'>@@ -0,0 +1,113 @@</div><div class='add'>+/*</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful, but</div><div class='add'>+ *  WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ *  General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License along</div><div class='add'>+ *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;acpi/acpi_bus.h&gt;</div><div class='add'>+#include &lt;acpi/acpi_drivers.h&gt;</div><div class='add'>+#include &lt;acpi/acmacros.h&gt;</div><div class='add'>+#include &lt;acpi/actypes.h&gt;</div><div class='add'>+#include &lt;acpi/acutils.h&gt;</div><div class='add'>+</div><div class='add'>+ACPI_MODULE_NAME("cm_sbs")</div><div class='add'>+#define ACPI_AC_CLASS		"ac_adapter"</div><div class='add'>+#define ACPI_BATTERY_CLASS	"battery"</div><div class='add'>+#define ACPI_SBS_COMPONENT	0x00080000</div><div class='add'>+#define _COMPONENT		ACPI_SBS_COMPONENT</div><div class='add'>+static struct proc_dir_entry *acpi_ac_dir;</div><div class='add'>+static struct proc_dir_entry *acpi_battery_dir;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(cm_sbs_mutex);</div><div class='add'>+</div><div class='add'>+static int lock_ac_dir_cnt;</div><div class='add'>+static int lock_battery_dir_cnt;</div><div class='add'>+</div><div class='add'>+struct proc_dir_entry *acpi_lock_ac_dir(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;cm_sbs_mutex);</div><div class='add'>+	if (!acpi_ac_dir)</div><div class='add'>+		acpi_ac_dir = proc_mkdir(ACPI_AC_CLASS, acpi_root_dir);</div><div class='add'>+	if (acpi_ac_dir) {</div><div class='add'>+		lock_ac_dir_cnt++;</div><div class='add'>+	} else {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "Cannot create %s\n", ACPI_AC_CLASS));</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cm_sbs_mutex);</div><div class='add'>+	return acpi_ac_dir;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(acpi_lock_ac_dir);</div><div class='add'>+</div><div class='add'>+void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;cm_sbs_mutex);</div><div class='add'>+	if (acpi_ac_dir_param)</div><div class='add'>+		lock_ac_dir_cnt--;</div><div class='add'>+	if (lock_ac_dir_cnt == 0 &amp;&amp; acpi_ac_dir_param &amp;&amp; acpi_ac_dir) {</div><div class='add'>+		remove_proc_entry(ACPI_AC_CLASS, acpi_root_dir);</div><div class='add'>+		acpi_ac_dir = 0;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cm_sbs_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(acpi_unlock_ac_dir);</div><div class='add'>+</div><div class='add'>+struct proc_dir_entry *acpi_lock_battery_dir(void)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;cm_sbs_mutex);</div><div class='add'>+	if (!acpi_battery_dir) {</div><div class='add'>+		acpi_battery_dir =</div><div class='add'>+		    proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir);</div><div class='add'>+	}</div><div class='add'>+	if (acpi_battery_dir) {</div><div class='add'>+		lock_battery_dir_cnt++;</div><div class='add'>+	} else {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "Cannot create %s\n", ACPI_BATTERY_CLASS));</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cm_sbs_mutex);</div><div class='add'>+	return acpi_battery_dir;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(acpi_lock_battery_dir);</div><div class='add'>+</div><div class='add'>+void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;cm_sbs_mutex);</div><div class='add'>+	if (acpi_battery_dir_param)</div><div class='add'>+		lock_battery_dir_cnt--;</div><div class='add'>+	if (lock_battery_dir_cnt == 0 &amp;&amp; acpi_battery_dir_param</div><div class='add'>+	    &amp;&amp; acpi_battery_dir) {</div><div class='add'>+		remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);</div><div class='add'>+		acpi_battery_dir = 0;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cm_sbs_mutex);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(acpi_unlock_battery_dir);</div><div class='add'>+</div><div class='add'>+static int __init acpi_cm_sbs_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+subsys_initcall(acpi_cm_sbs_init);</div><div class='head'>diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c<br/>index b69a8cad82b7..871aa520ece7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/container.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/container.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/container.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/container.c</a></div><div class='hunk'>@@ -73,17 +73,16 @@ static int is_device_present(acpi_handle handle)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	unsigned long sta;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("is_device_present");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_handle(handle, "_STA", &amp;temp);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(1);	/* _STA not found, assmue device present */</div><div class='add'>+		return 1;	/* _STA not found, assmue device present */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_integer(handle, "_STA", NULL, &amp;sta);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(0);	/* Firmware error */</div><div class='add'>+		return 0;	/* Firmware error */</div><div class='ctx'> </div><div class='del'>-	return_VALUE((sta &amp; ACPI_STA_PRESENT) == ACPI_STA_PRESENT);</div><div class='add'>+	return ((sta &amp; ACPI_STA_PRESENT) == ACPI_STA_PRESENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************/</div><div class='hunk'>@@ -91,16 +90,15 @@ static int acpi_container_add(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_container *container;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_container_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "device is NULL\n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "device is NULL\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	container = kmalloc(sizeof(struct acpi_container), GFP_KERNEL);</div><div class='ctx'> 	if (!container)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	memset(container, 0, sizeof(struct acpi_container));</div><div class='ctx'> 	container-&gt;handle = device-&gt;handle;</div><div class='hunk'>@@ -111,7 +109,7 @@ static int acpi_container_add(struct acpi_device *device)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device &lt;%s&gt; bid &lt;%s&gt;\n",</div><div class='ctx'> 			  acpi_device_name(device), acpi_device_bid(device)));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_container_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -130,23 +128,22 @@ static int container_device_add(struct acpi_device **device, acpi_handle handle)</div><div class='ctx'> 	struct acpi_device *pdev;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("container_device_add");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_get_parent(handle, &amp;phandle)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(phandle, &amp;pdev)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_DEVICE)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_start(*device);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void container_notify_cb(acpi_handle handle, u32 type, void *context)</div><div class='hunk'>@@ -156,7 +153,6 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)</div><div class='ctx'> 	int present;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("container_notify_cb");</div><div class='ctx'> </div><div class='ctx'> 	present = is_device_present(handle);</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +188,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -205,11 +201,10 @@ container_walk_namespace_cb(acpi_handle handle,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	int *action = context;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("container_walk_namespace_cb");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_object_info(handle, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status) || !buffer.pointer) {</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info = buffer.pointer;</div><div class='hunk'>@@ -241,9 +236,9 @@ container_walk_namespace_cb(acpi_handle handle,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_container_init(void)</div><div class='hunk'>@@ -269,7 +264,6 @@ static void __exit acpi_container_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	int action = UNINSTALL_NOTIFY_HANDLER;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_container_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_walk_namespace(ACPI_TYPE_DEVICE,</div><div class='ctx'> 			    ACPI_ROOT_OBJECT,</div><div class='hunk'>@@ -278,7 +272,7 @@ static void __exit acpi_container_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_container_driver);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_container_init);</div><div class='head'>diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c<br/>index 263322b7d113..35c6af8a83cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/debug.c</a></div><div class='hunk'>@@ -155,13 +155,12 @@ acpi_system_write_debug(struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	char debug_string[12] = { '\0' };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_system_write_debug");</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; sizeof(debug_string) - 1)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(debug_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	debug_string[count] = '\0';</div><div class='ctx'> </div><div class='hunk'>@@ -173,10 +172,10 @@ acpi_system_write_debug(struct file *file,</div><div class='ctx'> 		acpi_dbg_level = simple_strtoul(debug_string, NULL, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_debug_init(void)</div><div class='hunk'>@@ -185,10 +184,9 @@ static int __init acpi_debug_init(void)</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	char *name;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_debug_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* 'debug_layer' [R/W] */</div><div class='ctx'> 	name = ACPI_SYSTEM_FILE_DEBUG_LAYER;</div><div class='hunk'>@@ -213,15 +211,12 @@ static int __init acpi_debug_init(void)</div><div class='ctx'> 		goto Error;</div><div class='ctx'> </div><div class='ctx'>       Done:</div><div class='del'>-	return_VALUE(error);</div><div class='add'>+	return error;</div><div class='ctx'> </div><div class='ctx'>       Error:</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-			  "Unable to create '%s' proc fs entry\n", name));</div><div class='del'>-</div><div class='ctx'> 	remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LEVEL, acpi_root_dir);</div><div class='ctx'> 	remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir);</div><div class='del'>-	error = -EFAULT;</div><div class='add'>+	error = -ENODEV;</div><div class='ctx'> 	goto Done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c<br/>index 76bc0463f6de..a6d77efb41a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsfield.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsfield.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsfield.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsfield.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,</div><div class='ctx'> 	union acpi_operand_object *second_desc = NULL;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_create_buffer_field");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_create_buffer_field);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the name_string argument */</div><div class='ctx'> </div><div class='hunk'>@@ -210,7 +210,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_integer position;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_get_field_names", info);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);</div><div class='ctx'> </div><div class='ctx'> 	/* First field starts at bit zero */</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +342,7 @@ acpi_ds_create_field(union acpi_parse_object *op,</div><div class='ctx'> 	union acpi_parse_object *arg;</div><div class='ctx'> 	struct acpi_create_field_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_create_field", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_create_field, op);</div><div class='ctx'> </div><div class='ctx'> 	/* First arg is the name of the parent op_region (must already exist) */</div><div class='ctx'> </div><div class='hunk'>@@ -399,7 +399,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	u8 type = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_init_field_objects", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_init_field_objects, op);</div><div class='ctx'> </div><div class='ctx'> 	switch (walk_state-&gt;opcode) {</div><div class='ctx'> 	case AML_FIELD_OP:</div><div class='hunk'>@@ -425,6 +425,7 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,</div><div class='ctx'> 	 * Walk the list of entries in the field_list</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (arg) {</div><div class='add'>+</div><div class='ctx'> 		/* Ignore OFFSET and ACCESSAS terms here */</div><div class='ctx'> </div><div class='ctx'> 		if (arg-&gt;common.aml_opcode == AML_INT_NAMEDFIELD_OP) {</div><div class='hunk'>@@ -481,7 +482,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,</div><div class='ctx'> 	union acpi_parse_object *arg;</div><div class='ctx'> 	struct acpi_create_field_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_create_bank_field", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_create_bank_field, op);</div><div class='ctx'> </div><div class='ctx'> 	/* First arg is the name of the parent op_region (must already exist) */</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +555,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op,</div><div class='ctx'> 	union acpi_parse_object *arg;</div><div class='ctx'> 	struct acpi_create_field_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_create_index_field", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_create_index_field, op);</div><div class='ctx'> </div><div class='ctx'> 	/* First arg is the name of the Index register (must already exist) */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c<br/>index e65a07ad2422..1888c055d10f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsinit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsinit.c</a></div><div class='hunk'>@@ -116,46 +116,6 @@ acpi_ds_init_one_object(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_METHOD:</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Set the execution data width (32 or 64) based upon the</div><div class='del'>-		 * revision number of the parent ACPI table.</div><div class='del'>-		 * TBD: This is really for possible future support of integer width</div><div class='del'>-		 * on a per-table basis. Currently, we just use a global for the width.</div><div class='del'>-		 */</div><div class='del'>-		if (info-&gt;table_desc-&gt;pointer-&gt;revision == 1) {</div><div class='del'>-			node-&gt;flags |= ANOBJ_DATA_WIDTH_32;</div><div class='del'>-		}</div><div class='del'>-#ifdef ACPI_INIT_PARSE_METHODS</div><div class='del'>-		/*</div><div class='del'>-		 * Note 11/2005: Removed this code to parse all methods during table</div><div class='del'>-		 * load because it causes problems if there are any errors during the</div><div class='del'>-		 * parse. Also, it seems like overkill and we probably don't want to</div><div class='del'>-		 * abort a table load because of an issue with a single method.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Print a dot for each method unless we are going to print</div><div class='del'>-		 * the entire pathname</div><div class='del'>-		 */</div><div class='del'>-		if (!(acpi_dbg_level &amp; ACPI_LV_INIT_NAMES)) {</div><div class='del'>-			ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Always parse methods to detect errors, we will delete</div><div class='del'>-		 * the parse tree below</div><div class='del'>-		 */</div><div class='del'>-		status = acpi_ds_parse_method(obj_handle);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Method %p [%4.4s] - parse failure, %s",</div><div class='del'>-				    obj_handle,</div><div class='del'>-				    acpi_ut_get_node_name(obj_handle),</div><div class='del'>-				    acpi_format_exception(status)));</div><div class='del'>-</div><div class='del'>-			/* This parse failed, but we will continue parsing more methods */</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='ctx'> 		info-&gt;method_count++;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +144,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Walk the namespace starting at "start_node" and perform any</div><div class='add'>+ * DESCRIPTION: Walk the namespace starting at "StartNode" and perform any</div><div class='ctx'>  *              necessary initialization on the objects found therein</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='hunk'>@@ -196,7 +156,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_init_walk_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_initialize_objects");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_initialize_objects);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='ctx'> 			  "**** Starting initialization of namespace objects ****\n"));</div><div class='hunk'>@@ -213,7 +173,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,</div><div class='ctx'> 	status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,</div><div class='ctx'> 				     acpi_ds_init_one_object, &amp;info, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c<br/>index c475546535b6..cf888add3191 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsmethod.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsmethod.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsmethod.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsmethod.c</a></div><div class='hunk'>@@ -52,6 +52,10 @@</div><div class='ctx'> #define _COMPONENT          ACPI_DISPATCHER</div><div class='ctx'> ACPI_MODULE_NAME("dsmethod")</div><div class='ctx'> </div><div class='add'>+/* Local prototypes */</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_ds_create_method_mutex(union acpi_operand_object *method_desc);</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ds_method_error</div><div class='hunk'>@@ -67,6 +71,7 @@ ACPI_MODULE_NAME("dsmethod")</div><div class='ctx'>  *              Note: Allows the exception handler to change the status code</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='add'>+</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,6 +86,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)</div><div class='ctx'> 	/* Invoke the global exception handler */</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_exception_handler) {</div><div class='add'>+</div><div class='ctx'> 		/* Exit the interpreter, allow handler to execute methods */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ex_exit_interpreter();</div><div class='hunk'>@@ -100,6 +106,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef ACPI_DISASSEMBLER</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Display method locals/args if disassembler is present */</div><div class='ctx'> </div><div class='ctx'> 		acpi_dm_dump_method_info(status, walk_state, walk_state-&gt;op);</div><div class='hunk'>@@ -111,11 +118,51 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_ds_create_method_mutex</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  obj_desc            - The method object</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Create a mutex object for a serialized control method</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_ds_create_method_mutex(union acpi_operand_object *method_desc)</div><div class='add'>+{</div><div class='add'>+	union acpi_operand_object *mutex_desc;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_create_method_mutex);</div><div class='add'>+</div><div class='add'>+	/* Create the new mutex object */</div><div class='add'>+</div><div class='add'>+	mutex_desc = acpi_ut_create_internal_object(ACPI_TYPE_MUTEX);</div><div class='add'>+	if (!mutex_desc) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create the actual OS Mutex */</div><div class='add'>+</div><div class='add'>+	status = acpi_os_create_mutex(&amp;mutex_desc-&gt;mutex.os_mutex);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_desc-&gt;mutex.sync_level = method_desc-&gt;method.sync_level;</div><div class='add'>+	method_desc-&gt;method.mutex = mutex_desc;</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_ds_begin_method_execution</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  method_node         - Node of the method</div><div class='ctx'>  *              obj_desc            - The method object</div><div class='del'>- *              calling_method_node - Caller of this method (if non-null)</div><div class='add'>+ *              walk_state          - current state, NULL if not yet executing</div><div class='add'>+ *                                    a method.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -126,13 +173,13 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,</div><div class='del'>-			       union acpi_operand_object * obj_desc,</div><div class='del'>-			       struct acpi_namespace_node * calling_method_node)</div><div class='add'>+acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,</div><div class='add'>+			       union acpi_operand_object *obj_desc,</div><div class='add'>+			       struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_begin_method_execution", method_node);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_begin_method_execution, method_node);</div><div class='ctx'> </div><div class='ctx'> 	if (!method_node) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NULL_ENTRY);</div><div class='hunk'>@@ -147,32 +194,80 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If there is a concurrency limit on this method, we need to</div><div class='del'>-	 * obtain a unit from the method semaphore.</div><div class='add'>+	 * If this method is serialized, we need to acquire the method mutex.</div><div class='ctx'> 	 */</div><div class='del'>-	if (obj_desc-&gt;method.semaphore) {</div><div class='add'>+	if (obj_desc-&gt;method.method_flags &amp; AML_METHOD_SERIALIZED) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Allow recursive method calls, up to the reentrancy/concurrency</div><div class='del'>-		 * limit imposed by the SERIALIZED rule and the sync_level method</div><div class='del'>-		 * parameter.</div><div class='del'>-		 *</div><div class='del'>-		 * The point of this code is to avoid permanently blocking a</div><div class='del'>-		 * thread that is making recursive method calls.</div><div class='add'>+		 * Create a mutex for the method if it is defined to be Serialized</div><div class='add'>+		 * and a mutex has not already been created. We defer the mutex creation</div><div class='add'>+		 * until a method is actually executed, to minimize the object count</div><div class='ctx'> 		 */</div><div class='del'>-		if (method_node == calling_method_node) {</div><div class='del'>-			if (obj_desc-&gt;method.thread_count &gt;=</div><div class='del'>-			    obj_desc-&gt;method.concurrency) {</div><div class='del'>-				return_ACPI_STATUS(AE_AML_METHOD_LIMIT);</div><div class='add'>+		if (!obj_desc-&gt;method.mutex) {</div><div class='add'>+			status = acpi_ds_create_method_mutex(obj_desc);</div><div class='add'>+			if (ACPI_FAILURE(status)) {</div><div class='add'>+				return_ACPI_STATUS(status);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Get a unit from the method semaphore. This releases the</div><div class='del'>-		 * interpreter if we block</div><div class='add'>+		 * The current_sync_level (per-thread) must be less than or equal to</div><div class='add'>+		 * the sync level of the method. This mechanism provides some</div><div class='add'>+		 * deadlock prevention</div><div class='add'>+		 *</div><div class='add'>+		 * Top-level method invocation has no walk state at this point</div><div class='add'>+		 */</div><div class='add'>+		if (walk_state &amp;&amp;</div><div class='add'>+		    (walk_state-&gt;thread-&gt;current_sync_level &gt;</div><div class='add'>+		     obj_desc-&gt;method.mutex-&gt;mutex.sync_level)) {</div><div class='add'>+			ACPI_ERROR((AE_INFO,</div><div class='add'>+				    "Cannot acquire Mutex for method [%4.4s], current SyncLevel is too large (%d)",</div><div class='add'>+				    acpi_ut_get_node_name(method_node),</div><div class='add'>+				    walk_state-&gt;thread-&gt;current_sync_level));</div><div class='add'>+</div><div class='add'>+			return_ACPI_STATUS(AE_AML_MUTEX_ORDER);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Obtain the method mutex if necessary. Do not acquire mutex for a</div><div class='add'>+		 * recursive call.</div><div class='ctx'> 		 */</div><div class='del'>-		status =</div><div class='del'>-		    acpi_ex_system_wait_semaphore(obj_desc-&gt;method.semaphore,</div><div class='del'>-						  ACPI_WAIT_FOREVER);</div><div class='add'>+		if (!walk_state ||</div><div class='add'>+		    !obj_desc-&gt;method.mutex-&gt;mutex.owner_thread ||</div><div class='add'>+		    (walk_state-&gt;thread !=</div><div class='add'>+		     obj_desc-&gt;method.mutex-&gt;mutex.owner_thread)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Acquire the method mutex. This releases the interpreter if we</div><div class='add'>+			 * block (and reacquires it before it returns)</div><div class='add'>+			 */</div><div class='add'>+			status =</div><div class='add'>+			    acpi_ex_system_wait_mutex(obj_desc-&gt;method.mutex-&gt;</div><div class='add'>+						      mutex.os_mutex,</div><div class='add'>+						      ACPI_WAIT_FOREVER);</div><div class='add'>+			if (ACPI_FAILURE(status)) {</div><div class='add'>+				return_ACPI_STATUS(status);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Update the mutex and walk info and save the original sync_level */</div><div class='add'>+</div><div class='add'>+			if (walk_state) {</div><div class='add'>+				obj_desc-&gt;method.mutex-&gt;mutex.</div><div class='add'>+				    original_sync_level =</div><div class='add'>+				    walk_state-&gt;thread-&gt;current_sync_level;</div><div class='add'>+</div><div class='add'>+				obj_desc-&gt;method.mutex-&gt;mutex.owner_thread =</div><div class='add'>+				    walk_state-&gt;thread;</div><div class='add'>+				walk_state-&gt;thread-&gt;current_sync_level =</div><div class='add'>+				    obj_desc-&gt;method.sync_level;</div><div class='add'>+			} else {</div><div class='add'>+				obj_desc-&gt;method.mutex-&gt;mutex.</div><div class='add'>+				    original_sync_level =</div><div class='add'>+				    obj_desc-&gt;method.mutex-&gt;mutex.sync_level;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Always increase acquisition depth */</div><div class='add'>+</div><div class='add'>+		obj_desc-&gt;method.mutex-&gt;mutex.acquisition_depth++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -183,7 +278,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,</div><div class='ctx'> 	if (!obj_desc-&gt;method.owner_id) {</div><div class='ctx'> 		status = acpi_ut_allocate_owner_id(&amp;obj_desc-&gt;method.owner_id);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='add'>+			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -193,6 +288,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,</div><div class='ctx'> 	 */</div><div class='ctx'> 	obj_desc-&gt;method.thread_count++;</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='add'>+</div><div class='add'>+      cleanup:</div><div class='add'>+	/* On error, must release the method mutex (if present) */</div><div class='add'>+</div><div class='add'>+	if (obj_desc-&gt;method.mutex) {</div><div class='add'>+		acpi_os_release_mutex(obj_desc-&gt;method.mutex-&gt;mutex.os_mutex);</div><div class='add'>+	}</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -218,10 +321,10 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 	struct acpi_namespace_node *method_node;</div><div class='ctx'> 	struct acpi_walk_state *next_walk_state = NULL;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_call_control_method", this_walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_call_control_method, this_walk_state);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='ctx'> 			  "Execute method %p, currentstate=%p\n",</div><div class='hunk'>@@ -240,25 +343,31 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 		return_ACPI_STATUS(AE_NULL_OBJECT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Init for new method, wait on concurrency semaphore */</div><div class='add'>+	/* Init for new method, possibly wait on method mutex */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ds_begin_method_execution(method_node, obj_desc,</div><div class='del'>-						this_walk_state-&gt;method_node);</div><div class='add'>+						this_walk_state);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto cleanup;</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * 1) Parse the method. All "normal" methods are parsed for each execution.</div><div class='add'>+	 * Internal methods (_OSI, etc.) do not require parsing.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!(obj_desc-&gt;method.method_flags &amp; AML_METHOD_INTERNAL_ONLY)) {</div><div class='del'>-		/* 1) Parse: Create a new walk state for the preempting walk */</div><div class='add'>+</div><div class='add'>+		/* Create a new walk state for the parse */</div><div class='ctx'> </div><div class='ctx'> 		next_walk_state =</div><div class='ctx'> 		    acpi_ds_create_walk_state(obj_desc-&gt;method.owner_id, op,</div><div class='ctx'> 					      obj_desc, NULL);</div><div class='ctx'> 		if (!next_walk_state) {</div><div class='del'>-			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+			status = AE_NO_MEMORY;</div><div class='add'>+			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Create and init a Root Node */</div><div class='add'>+		/* Create and init a parse tree root */</div><div class='ctx'> </div><div class='ctx'> 		op = acpi_ps_create_scope_op();</div><div class='ctx'> 		if (!op) {</div><div class='hunk'>@@ -271,17 +380,20 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 					       obj_desc-&gt;method.aml_length,</div><div class='ctx'> 					       NULL, 1);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			acpi_ds_delete_walk_state(next_walk_state);</div><div class='add'>+			acpi_ps_delete_parse_tree(op);</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Begin AML parse */</div><div class='add'>+		/* Begin AML parse (deletes next_walk_state) */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ps_parse_aml(next_walk_state);</div><div class='ctx'> 		acpi_ps_delete_parse_tree(op);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* 2) Execute: Create a new state for the preempting walk */</div><div class='add'>+	/* 2) Begin method execution. Create a new walk state */</div><div class='ctx'> </div><div class='ctx'> 	next_walk_state = acpi_ds_create_walk_state(obj_desc-&gt;method.owner_id,</div><div class='ctx'> 						    NULL, obj_desc, thread);</div><div class='hunk'>@@ -289,6 +401,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 		status = AE_NO_MEMORY;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The resolved arguments were put on the previous walk state's operand</div><div class='ctx'> 	 * stack. Operands on the previous walk state stack always</div><div class='hunk'>@@ -296,12 +409,24 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 	 */</div><div class='ctx'> 	this_walk_state-&gt;operands[this_walk_state-&gt;num_operands] = NULL;</div><div class='ctx'> </div><div class='del'>-	info.parameters = &amp;this_walk_state-&gt;operands[0];</div><div class='del'>-	info.parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate and initialize the evaluation information block</div><div class='add'>+	 * TBD: this is somewhat inefficient, should change interface to</div><div class='add'>+	 * ds_init_aml_walk. For now, keeps this struct off the CPU stack</div><div class='add'>+	 */</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;parameters = &amp;this_walk_state-&gt;operands[0];</div><div class='add'>+	info-&gt;parameter_type = ACPI_PARAM_ARGS;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ds_init_aml_walk(next_walk_state, NULL, method_node,</div><div class='ctx'> 				       obj_desc-&gt;method.aml_start,</div><div class='del'>-				       obj_desc-&gt;method.aml_length, &amp;info, 3);</div><div class='add'>+				       obj_desc-&gt;method.aml_length, info, 3);</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -323,6 +448,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 			  "Starting nested execution, newstate=%p\n",</div><div class='ctx'> 			  next_walk_state));</div><div class='ctx'> </div><div class='add'>+	/* Invoke an internal method if necessary */</div><div class='add'>+</div><div class='ctx'> 	if (obj_desc-&gt;method.method_flags &amp; AML_METHOD_INTERNAL_ONLY) {</div><div class='ctx'> 		status = obj_desc-&gt;method.implementation(next_walk_state);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -330,16 +457,14 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> </div><div class='ctx'>       cleanup:</div><div class='del'>-	/* Decrement the thread count on the method parse tree */</div><div class='ctx'> </div><div class='del'>-	if (next_walk_state &amp;&amp; (next_walk_state-&gt;method_desc)) {</div><div class='del'>-		next_walk_state-&gt;method_desc-&gt;method.thread_count--;</div><div class='del'>-	}</div><div class='add'>+	/* On error, we must terminate the method properly */</div><div class='ctx'> </div><div class='del'>-	/* On error, we must delete the new walk state */</div><div class='add'>+	acpi_ds_terminate_control_method(obj_desc, next_walk_state);</div><div class='add'>+	if (next_walk_state) {</div><div class='add'>+		acpi_ds_delete_walk_state(next_walk_state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	acpi_ds_terminate_control_method(next_walk_state);</div><div class='del'>-	acpi_ds_delete_walk_state(next_walk_state);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -362,25 +487,33 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			       union acpi_operand_object *return_desc)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	int same_as_implicit_return;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_restart_control_method", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_restart_control_method, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-			  "****Restart [%4.4s] Op %p return_value_from_callee %p\n",</div><div class='del'>-			  (char *)&amp;walk_state-&gt;method_node-&gt;name,</div><div class='add'>+			  "****Restart [%4.4s] Op %p ReturnValueFromCallee %p\n",</div><div class='add'>+			  acpi_ut_get_node_name(walk_state-&gt;method_node),</div><div class='ctx'> 			  walk_state-&gt;method_call_op, return_desc));</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-			  "    return_from_this_method_used?=%X res_stack %p Walk %p\n",</div><div class='add'>+			  "    ReturnFromThisMethodUsed?=%X ResStack %p Walk %p\n",</div><div class='ctx'> 			  walk_state-&gt;return_used,</div><div class='ctx'> 			  walk_state-&gt;results, walk_state));</div><div class='ctx'> </div><div class='ctx'> 	/* Did the called method return a value? */</div><div class='ctx'> </div><div class='ctx'> 	if (return_desc) {</div><div class='add'>+</div><div class='add'>+		/* Is the implicit return object the same as the return desc? */</div><div class='add'>+</div><div class='add'>+		same_as_implicit_return =</div><div class='add'>+		    (walk_state-&gt;implicit_return_obj == return_desc);</div><div class='add'>+</div><div class='ctx'> 		/* Are we actually going to use the return value? */</div><div class='ctx'> </div><div class='ctx'> 		if (walk_state-&gt;return_used) {</div><div class='add'>+</div><div class='ctx'> 			/* Save the return value from the previous method */</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_ds_result_push(return_desc, walk_state);</div><div class='hunk'>@@ -397,18 +530,23 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * The following code is the</div><div class='del'>-		 * optional support for a so-called "implicit return". Some AML code</div><div class='del'>-		 * assumes that the last value of the method is "implicitly" returned</div><div class='del'>-		 * to the caller. Just save the last result as the return value.</div><div class='add'>+		 * The following code is the optional support for the so-called</div><div class='add'>+		 * "implicit return". Some AML code assumes that the last value of the</div><div class='add'>+		 * method is "implicitly" returned to the caller, in the absence of an</div><div class='add'>+		 * explicit return value.</div><div class='add'>+		 *</div><div class='add'>+		 * Just save the last result of the method as the return value.</div><div class='add'>+		 *</div><div class='ctx'> 		 * NOTE: this is optional because the ASL language does not actually</div><div class='ctx'> 		 * support this behavior.</div><div class='ctx'> 		 */</div><div class='ctx'> 		else if (!acpi_ds_do_implicit_return</div><div class='del'>-			 (return_desc, walk_state, FALSE)) {</div><div class='add'>+			 (return_desc, walk_state, FALSE)</div><div class='add'>+			 || same_as_implicit_return) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Delete the return value if it will not be used by the</div><div class='del'>-			 * calling method</div><div class='add'>+			 * calling method or remove one reference if the explicit return</div><div class='add'>+			 * is the same as the implicit return value.</div><div class='ctx'> 			 */</div><div class='ctx'> 			acpi_ut_remove_reference(return_desc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -421,7 +559,8 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ds_terminate_control_method</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  walk_state          - State of the method</div><div class='add'>+ * PARAMETERS:  method_desc         - Method object</div><div class='add'>+ *              walk_state          - State associated with the method</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      None</div><div class='ctx'>  *</div><div class='hunk'>@@ -429,262 +568,106 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,</div><div class='ctx'>  *              created, delete all locals and arguments, and delete the parse</div><div class='ctx'>  *              tree if requested.</div><div class='ctx'>  *</div><div class='add'>+ * MUTEX:       Interpreter is locked</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)</div><div class='add'>+void</div><div class='add'>+acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,</div><div class='add'>+				 struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='del'>-	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	struct acpi_namespace_node *method_node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_terminate_control_method", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_terminate_control_method, walk_state);</div><div class='ctx'> </div><div class='del'>-	if (!walk_state) {</div><div class='del'>-		return_VOID;</div><div class='del'>-	}</div><div class='add'>+	/* method_desc is required, walk_state is optional */</div><div class='ctx'> </div><div class='del'>-	/* The current method object was saved in the walk state */</div><div class='del'>-</div><div class='del'>-	obj_desc = walk_state-&gt;method_desc;</div><div class='del'>-	if (!obj_desc) {</div><div class='add'>+	if (!method_desc) {</div><div class='ctx'> 		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Delete all arguments and locals */</div><div class='add'>+	if (walk_state) {</div><div class='ctx'> </div><div class='del'>-	acpi_ds_method_data_delete_all(walk_state);</div><div class='add'>+		/* Delete all arguments and locals */</div><div class='add'>+</div><div class='add'>+		acpi_ds_method_data_delete_all(walk_state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Lock the parser while we terminate this method.</div><div class='del'>-	 * If this is the last thread executing the method,</div><div class='del'>-	 * we have additional cleanup to perform</div><div class='add'>+	 * If method is serialized, release the mutex and restore the</div><div class='add'>+	 * current sync level for this thread</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_PARSER);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_VOID;</div><div class='del'>-	}</div><div class='add'>+	if (method_desc-&gt;method.mutex) {</div><div class='ctx'> </div><div class='del'>-	/* Signal completion of the execution of this method if necessary */</div><div class='add'>+		/* Acquisition Depth handles recursive calls */</div><div class='ctx'> </div><div class='del'>-	if (walk_state-&gt;method_desc-&gt;method.semaphore) {</div><div class='del'>-		status =</div><div class='del'>-		    acpi_os_signal_semaphore(walk_state-&gt;method_desc-&gt;method.</div><div class='del'>-					     semaphore, 1);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Could not signal method semaphore"));</div><div class='add'>+		method_desc-&gt;method.mutex-&gt;mutex.acquisition_depth--;</div><div class='add'>+		if (!method_desc-&gt;method.mutex-&gt;mutex.acquisition_depth) {</div><div class='add'>+			walk_state-&gt;thread-&gt;current_sync_level =</div><div class='add'>+			    method_desc-&gt;method.mutex-&gt;mutex.</div><div class='add'>+			    original_sync_level;</div><div class='ctx'> </div><div class='del'>-			/* Ignore error and continue cleanup */</div><div class='add'>+			acpi_os_release_mutex(method_desc-&gt;method.mutex-&gt;mutex.</div><div class='add'>+					      os_mutex);</div><div class='add'>+			method_desc-&gt;method.mutex-&gt;mutex.owner_thread = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * There are no more threads executing this method.  Perform</div><div class='del'>-	 * additional cleanup.</div><div class='del'>-	 *</div><div class='del'>-	 * The method Node is stored in the walk state</div><div class='del'>-	 */</div><div class='del'>-	method_node = walk_state-&gt;method_node;</div><div class='del'>-</div><div class='del'>-	/* Lock namespace for possible update */</div><div class='add'>+	if (walk_state) {</div><div class='add'>+		/*</div><div class='add'>+		 * Delete any objects created by this method during execution.</div><div class='add'>+		 * The method Node is stored in the walk state</div><div class='add'>+		 */</div><div class='add'>+		method_node = walk_state-&gt;method_node;</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto exit;</div><div class='add'>+		/*</div><div class='add'>+		 * Delete any namespace objects created anywhere within</div><div class='add'>+		 * the namespace by the execution of this method</div><div class='add'>+		 */</div><div class='add'>+		acpi_ns_delete_namespace_by_owner(method_desc-&gt;method.owner_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Delete any namespace entries created immediately underneath</div><div class='del'>-	 * the method</div><div class='del'>-	 */</div><div class='del'>-	if (method_node-&gt;child) {</div><div class='del'>-		acpi_ns_delete_namespace_subtree(method_node);</div><div class='del'>-	}</div><div class='add'>+	/* Decrement the thread count on the method */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Delete any namespace entries created anywhere else within</div><div class='del'>-	 * the namespace by the execution of this method</div><div class='del'>-	 */</div><div class='del'>-	acpi_ns_delete_namespace_by_owner(walk_state-&gt;method_desc-&gt;method.</div><div class='del'>-					  owner_id);</div><div class='del'>-	status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	if (method_desc-&gt;method.thread_count) {</div><div class='add'>+		method_desc-&gt;method.thread_count--;</div><div class='add'>+	} else {</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid zero thread count in method"));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Are there any other threads currently executing this method? */</div><div class='ctx'> </div><div class='del'>-	if (walk_state-&gt;method_desc-&gt;method.thread_count) {</div><div class='add'>+	if (method_desc-&gt;method.thread_count) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Additional threads. Do not release the owner_id in this case,</div><div class='ctx'> 		 * we immediately reuse it for the next thread executing this method</div><div class='ctx'> 		 */</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='ctx'> 				  "*** Completed execution of one thread, %d threads remaining\n",</div><div class='del'>-				  walk_state-&gt;method_desc-&gt;method.</div><div class='del'>-				  thread_count));</div><div class='add'>+				  method_desc-&gt;method.thread_count));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* This is the only executing thread for this method */</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Support to dynamically change a method from not_serialized to</div><div class='ctx'> 		 * Serialized if it appears that the method is incorrectly written and</div><div class='del'>-		 * does not support multiple thread execution.  The best example of this</div><div class='del'>-		 * is if such a method creates namespace objects and blocks.  A second</div><div class='add'>+		 * does not support multiple thread execution. The best example of this</div><div class='add'>+		 * is if such a method creates namespace objects and blocks. A second</div><div class='ctx'> 		 * thread will fail with an AE_ALREADY_EXISTS exception</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * This code is here because we must wait until the last thread exits</div><div class='ctx'> 		 * before creating the synchronization semaphore.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((walk_state-&gt;method_desc-&gt;method.concurrency == 1) &amp;&amp;</div><div class='del'>-		    (!walk_state-&gt;method_desc-&gt;method.semaphore)) {</div><div class='del'>-			status = acpi_os_create_semaphore(1, 1,</div><div class='del'>-							  &amp;walk_state-&gt;</div><div class='del'>-							  method_desc-&gt;method.</div><div class='del'>-							  semaphore);</div><div class='add'>+		if ((method_desc-&gt;method.method_flags &amp; AML_METHOD_SERIALIZED)</div><div class='add'>+		    &amp;&amp; (!method_desc-&gt;method.mutex)) {</div><div class='add'>+			status = acpi_ds_create_method_mutex(method_desc);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* No more threads, we can free the owner_id */</div><div class='ctx'> </div><div class='del'>-		acpi_ut_release_owner_id(&amp;walk_state-&gt;method_desc-&gt;method.</div><div class='del'>-					 owner_id);</div><div class='add'>+		acpi_ut_release_owner_id(&amp;method_desc-&gt;method.owner_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-      exit:</div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_PARSER);</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#ifdef ACPI_INIT_PARSE_METHODS</div><div class='del'>-	/*</div><div class='del'>-	 * Note 11/2005: Removed this code to parse all methods during table</div><div class='del'>-	 * load because it causes problems if there are any errors during the</div><div class='del'>-	 * parse. Also, it seems like overkill and we probably don't want to</div><div class='del'>-	 * abort a table load because of an issue with a single method.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ds_parse_method</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Node        - Method node</div><div class='del'>- *</div><div class='del'>- * RETURN:      Status</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Parse the AML that is associated with the method.</div><div class='del'>- *</div><div class='del'>- * MUTEX:       Assumes parser is locked</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	union acpi_operand_object *obj_desc;</div><div class='del'>-	union acpi_parse_object *op;</div><div class='del'>-	struct acpi_walk_state *walk_state;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_parse_method", node);</div><div class='del'>-</div><div class='del'>-	/* Parameter Validation */</div><div class='del'>-</div><div class='del'>-	if (!node) {</div><div class='del'>-		return_ACPI_STATUS(AE_NULL_ENTRY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-			  "**** Parsing [%4.4s] **** named_obj=%p\n",</div><div class='del'>-			  acpi_ut_get_node_name(node), node));</div><div class='del'>-</div><div class='del'>-	/* Extract the method object from the method Node */</div><div class='del'>-</div><div class='del'>-	obj_desc = acpi_ns_get_attached_object(node);</div><div class='del'>-	if (!obj_desc) {</div><div class='del'>-		return_ACPI_STATUS(AE_NULL_OBJECT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create a mutex for the method if there is a concurrency limit */</div><div class='del'>-</div><div class='del'>-	if ((obj_desc-&gt;method.concurrency != ACPI_INFINITE_CONCURRENCY) &amp;&amp;</div><div class='del'>-	    (!obj_desc-&gt;method.semaphore)) {</div><div class='del'>-		status = acpi_os_create_semaphore(obj_desc-&gt;method.concurrency,</div><div class='del'>-						  obj_desc-&gt;method.concurrency,</div><div class='del'>-						  &amp;obj_desc-&gt;method.semaphore);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate a new parser op to be the root of the parsed</div><div class='del'>-	 * method tree</div><div class='del'>-	 */</div><div class='del'>-	op = acpi_ps_alloc_op(AML_METHOD_OP);</div><div class='del'>-	if (!op) {</div><div class='del'>-		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Init new op with the method name and pointer back to the Node */</div><div class='del'>-</div><div class='del'>-	acpi_ps_set_name(op, node-&gt;name.integer);</div><div class='del'>-	op-&gt;common.node = node;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get a new owner_id for objects created by this method. Namespace</div><div class='del'>-	 * objects (such as Operation Regions) can be created during the</div><div class='del'>-	 * first pass parse.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_ut_allocate_owner_id(&amp;obj_desc-&gt;method.owner_id);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create and initialize a new walk state */</div><div class='del'>-</div><div class='del'>-	walk_state =</div><div class='del'>-	    acpi_ds_create_walk_state(obj_desc-&gt;method.owner_id, NULL, NULL,</div><div class='del'>-				      NULL);</div><div class='del'>-	if (!walk_state) {</div><div class='del'>-		status = AE_NO_MEMORY;</div><div class='del'>-		goto cleanup2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = acpi_ds_init_aml_walk(walk_state, op, node,</div><div class='del'>-				       obj_desc-&gt;method.aml_start,</div><div class='del'>-				       obj_desc-&gt;method.aml_length, NULL, 1);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		acpi_ds_delete_walk_state(walk_state);</div><div class='del'>-		goto cleanup2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Parse the method, first pass</div><div class='del'>-	 *</div><div class='del'>-	 * The first pass load is where newly declared named objects are added into</div><div class='del'>-	 * the namespace.  Actual evaluation of the named objects (what would be</div><div class='del'>-	 * called a "second pass") happens during the actual execution of the</div><div class='del'>-	 * method so that operands to the named objects can take on dynamic</div><div class='del'>-	 * run-time values.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_ps_parse_aml(walk_state);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto cleanup2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-			  "**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",</div><div class='del'>-			  acpi_ut_get_node_name(node), node, op));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Delete the parse tree. We simply re-parse the method for every</div><div class='del'>-	 * execution since there isn't much overhead (compared to keeping lots</div><div class='del'>-	 * of parse trees around)</div><div class='del'>-	 */</div><div class='del'>-	acpi_ns_delete_namespace_subtree(node);</div><div class='del'>-	acpi_ns_delete_namespace_by_owner(obj_desc-&gt;method.owner_id);</div><div class='del'>-</div><div class='del'>-      cleanup2:</div><div class='del'>-	acpi_ut_release_owner_id(&amp;obj_desc-&gt;method.owner_id);</div><div class='del'>-</div><div class='del'>-      cleanup:</div><div class='del'>-	acpi_ps_delete_parse_tree(op);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c<br/>index c025674f938b..459160ff9058 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsmthdat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsmthdat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsmthdat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsmthdat.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ acpi_ds_method_data_get_type(u16 opcode,</div><div class='ctx'>  *              special data types.</div><div class='ctx'>  *</div><div class='ctx'>  * NOTES:       walk_state fields are initialized to zero by the</div><div class='del'>- *              ACPI_MEM_CALLOCATE().</div><div class='add'>+ *              ACPI_ALLOCATE_ZEROED().</div><div class='ctx'>  *</div><div class='ctx'>  *              A pseudo-Namespace Node is assigned to each argument and local</div><div class='ctx'>  *              so that ref_of() can return a pointer to the Node.</div><div class='hunk'>@@ -92,7 +92,7 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_init");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_init);</div><div class='ctx'> </div><div class='ctx'> 	/* Init the method arguments */</div><div class='ctx'> </div><div class='hunk'>@@ -100,10 +100,10 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		ACPI_MOVE_32_TO_32(&amp;walk_state-&gt;arguments[i].name,</div><div class='ctx'> 				   NAMEOF_ARG_NTE);</div><div class='ctx'> 		walk_state-&gt;arguments[i].name.integer |= (i &lt;&lt; 24);</div><div class='del'>-		walk_state-&gt;arguments[i].descriptor = ACPI_DESC_TYPE_NAMED;</div><div class='add'>+		walk_state-&gt;arguments[i].descriptor_type = ACPI_DESC_TYPE_NAMED;</div><div class='ctx'> 		walk_state-&gt;arguments[i].type = ACPI_TYPE_ANY;</div><div class='del'>-		walk_state-&gt;arguments[i].flags = ANOBJ_END_OF_PEER_LIST |</div><div class='del'>-		    ANOBJ_METHOD_ARG;</div><div class='add'>+		walk_state-&gt;arguments[i].flags =</div><div class='add'>+		    ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_ARG;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init the method locals */</div><div class='hunk'>@@ -113,11 +113,11 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				   NAMEOF_LOCAL_NTE);</div><div class='ctx'> </div><div class='ctx'> 		walk_state-&gt;local_variables[i].name.integer |= (i &lt;&lt; 24);</div><div class='del'>-		walk_state-&gt;local_variables[i].descriptor =</div><div class='add'>+		walk_state-&gt;local_variables[i].descriptor_type =</div><div class='ctx'> 		    ACPI_DESC_TYPE_NAMED;</div><div class='ctx'> 		walk_state-&gt;local_variables[i].type = ACPI_TYPE_ANY;</div><div class='del'>-		walk_state-&gt;local_variables[i].flags = ANOBJ_END_OF_PEER_LIST |</div><div class='del'>-		    ANOBJ_METHOD_LOCAL;</div><div class='add'>+		walk_state-&gt;local_variables[i].flags =</div><div class='add'>+		    ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_LOCAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_VOID;</div><div class='hunk'>@@ -140,7 +140,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 index;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_delete_all");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_delete_all);</div><div class='ctx'> </div><div class='ctx'> 	/* Detach the locals */</div><div class='ctx'> </div><div class='hunk'>@@ -199,7 +199,7 @@ acpi_ds_method_data_init_args(union acpi_operand_object **params,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 index = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_method_data_init_args", params);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_method_data_init_args, params);</div><div class='ctx'> </div><div class='ctx'> 	if (!params) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='hunk'>@@ -251,7 +251,7 @@ acpi_ds_method_data_get_node(u16 opcode,</div><div class='ctx'> 			     struct acpi_walk_state *walk_state,</div><div class='ctx'> 			     struct acpi_namespace_node **node)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_get_node");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_get_node);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Method Locals and Arguments are supported</div><div class='hunk'>@@ -318,10 +318,10 @@ acpi_ds_method_data_set_value(u16 opcode,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_set_value");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_set_value);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-			  "new_obj %p Opcode %X, Refs=%d [%s]\n", object,</div><div class='add'>+			  "NewObj %p Opcode %X, Refs=%d [%s]\n", object,</div><div class='ctx'> 			  opcode, object-&gt;common.reference_count,</div><div class='ctx'> 			  acpi_ut_get_type_name(object-&gt;common.type)));</div><div class='ctx'> </div><div class='hunk'>@@ -336,7 +336,7 @@ acpi_ds_method_data_set_value(u16 opcode,</div><div class='ctx'> 	 * Increment ref count so object can't be deleted while installed.</div><div class='ctx'> 	 * NOTE: We do not copy the object in order to preserve the call by</div><div class='ctx'> 	 * reference semantics of ACPI Control Method invocation.</div><div class='del'>-	 * (See ACPI specification 2.0_c)</div><div class='add'>+	 * (See ACPI Specification 2.0_c)</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_ut_add_reference(object);</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +351,7 @@ acpi_ds_method_data_set_value(u16 opcode,</div><div class='ctx'>  * FUNCTION:    acpi_ds_method_data_get_value</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  Opcode              - Either AML_LOCAL_OP or AML_ARG_OP</div><div class='del'>- *              Index               - which local_var or argument to get</div><div class='add'>+ *              Index               - Which local_var or argument to get</div><div class='ctx'>  *              walk_state          - Current walk state object</div><div class='ctx'>  *              dest_desc           - Where Arg or Local value is returned</div><div class='ctx'>  *</div><div class='hunk'>@@ -372,7 +372,7 @@ acpi_ds_method_data_get_value(u16 opcode,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_operand_object *object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_get_value");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_get_value);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate the object descriptor */</div><div class='ctx'> </div><div class='hunk'>@@ -459,7 +459,7 @@ acpi_ds_method_data_get_value(u16 opcode,</div><div class='ctx'>  * FUNCTION:    acpi_ds_method_data_delete_value</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  Opcode              - Either AML_LOCAL_OP or AML_ARG_OP</div><div class='del'>- *              Index               - which local_var or argument to delete</div><div class='add'>+ *              Index               - Which local_var or argument to delete</div><div class='ctx'>  *              walk_state          - Current walk state object</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      None</div><div class='hunk'>@@ -477,7 +477,7 @@ acpi_ds_method_data_delete_value(u16 opcode,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_operand_object *object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_delete_value");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_delete_value);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the namespace node for the arg/local */</div><div class='ctx'> </div><div class='hunk'>@@ -538,7 +538,7 @@ acpi_ds_store_object_to_local(u16 opcode,</div><div class='ctx'> 	union acpi_operand_object *current_obj_desc;</div><div class='ctx'> 	union acpi_operand_object *new_obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_store_object_to_local");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_store_object_to_local);</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Opcode=%X Index=%d Obj=%p\n",</div><div class='ctx'> 			  opcode, index, obj_desc));</div><div class='ctx'> </div><div class='hunk'>@@ -614,7 +614,7 @@ acpi_ds_store_object_to_local(u16 opcode,</div><div class='ctx'> 			    &amp;&amp; (current_obj_desc-&gt;reference.opcode ==</div><div class='ctx'> 				AML_REF_OF_OP)) {</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-						  "Arg (%p) is an obj_ref(Node), storing in node %p\n",</div><div class='add'>+						  "Arg (%p) is an ObjRef(Node), storing in node %p\n",</div><div class='ctx'> 						  new_obj_desc,</div><div class='ctx'> 						  current_obj_desc));</div><div class='ctx'> </div><div class='hunk'>@@ -688,7 +688,7 @@ acpi_ds_method_data_get_type(u16 opcode,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_operand_object *object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_method_data_get_type");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_method_data_get_type);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the namespace node for the arg/local */</div><div class='ctx'> </div><div class='hunk'>@@ -701,6 +701,7 @@ acpi_ds_method_data_get_type(u16 opcode,</div><div class='ctx'> </div><div class='ctx'> 	object = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	if (!object) {</div><div class='add'>+</div><div class='ctx'> 		/* Uninitialized local/arg, return TYPE_ANY */</div><div class='ctx'> </div><div class='ctx'> 		return_VALUE(ACPI_TYPE_ANY);</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c<br/>index 8b21f0f9e517..72190abb1d59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsobject.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsobject.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_build_internal_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_build_internal_object);</div><div class='ctx'> </div><div class='ctx'> 	*obj_desc_ptr = NULL;</div><div class='ctx'> 	if (op-&gt;common.aml_opcode == AML_INT_NAMEPATH_OP) {</div><div class='hunk'>@@ -103,6 +103,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,</div><div class='ctx'> 									 common.</div><div class='ctx'> 									 node)));</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 				/* Check if we are resolving a named reference within a package */</div><div class='ctx'> </div><div class='ctx'> 				if ((status == AE_NOT_FOUND)</div><div class='hunk'>@@ -186,7 +187,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	union acpi_parse_object *byte_list;</div><div class='ctx'> 	u32 byte_list_length = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_build_internal_buffer_obj");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_build_internal_buffer_obj);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If we are evaluating a Named buffer object "Name (xxxx, Buffer)".</div><div class='hunk'>@@ -195,6 +196,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 */</div><div class='ctx'> 	obj_desc = *obj_desc_ptr;</div><div class='ctx'> 	if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* Create a new buffer object */</div><div class='ctx'> </div><div class='ctx'> 		obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER);</div><div class='hunk'>@@ -243,7 +245,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 				  "Buffer defined with zero length in AML, creating\n"));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		obj_desc-&gt;buffer.pointer =</div><div class='del'>-		    ACPI_MEM_CALLOCATE(obj_desc-&gt;buffer.length);</div><div class='add'>+		    ACPI_ALLOCATE_ZEROED(obj_desc-&gt;buffer.length);</div><div class='ctx'> 		if (!obj_desc-&gt;buffer.pointer) {</div><div class='ctx'> 			acpi_ut_delete_object_desc(obj_desc);</div><div class='ctx'> 			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='hunk'>@@ -291,7 +293,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_build_internal_package_obj");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_build_internal_package_obj);</div><div class='ctx'> </div><div class='ctx'> 	/* Find the parent of a possibly nested package */</div><div class='ctx'> </div><div class='hunk'>@@ -339,9 +341,10 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 * individual objects). Add an extra pointer slot so</div><div class='ctx'> 	 * that the list is always null terminated.</div><div class='ctx'> 	 */</div><div class='del'>-	obj_desc-&gt;package.elements = ACPI_MEM_CALLOCATE(((acpi_size) obj_desc-&gt;</div><div class='del'>-							 package.count +</div><div class='del'>-							 1) * sizeof(void *));</div><div class='add'>+	obj_desc-&gt;package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size)</div><div class='add'>+							   obj_desc-&gt;package.</div><div class='add'>+							   count +</div><div class='add'>+							   1) * sizeof(void *));</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc-&gt;package.elements) {</div><div class='ctx'> 		acpi_ut_delete_object_desc(obj_desc);</div><div class='hunk'>@@ -355,6 +358,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	arg = arg-&gt;common.next;</div><div class='ctx'> 	for (i = 0; arg; i++) {</div><div class='ctx'> 		if (arg-&gt;common.aml_opcode == AML_INT_RETURN_VALUE_OP) {</div><div class='add'>+</div><div class='ctx'> 			/* Object (package or buffer) is already built */</div><div class='ctx'> </div><div class='ctx'> 			obj_desc-&gt;package.elements[i] =</div><div class='hunk'>@@ -396,7 +400,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_create_node", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_create_node, op);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Because of the execution pass through the non-control-method</div><div class='hunk'>@@ -408,6 +412,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!op-&gt;common.value.arg) {</div><div class='add'>+</div><div class='ctx'> 		/* No arguments, there is nothing to do */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -464,11 +469,12 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_init_object_from_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_init_object_from_op);</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = *ret_obj_desc;</div><div class='ctx'> 	op_info = acpi_ps_get_opcode_info(opcode);</div><div class='ctx'> 	if (op_info-&gt;class == AML_CLASS_UNKNOWN) {</div><div class='add'>+</div><div class='ctx'> 		/* Unknown opcode */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_TYPE);</div><div class='hunk'>@@ -626,6 +632,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		default:	/* Other literals, etc.. */</div><div class='ctx'> </div><div class='ctx'> 			if (op-&gt;common.aml_opcode == AML_INT_NAMEPATH_OP) {</div><div class='add'>+</div><div class='ctx'> 				/* Node was saved in Op */</div><div class='ctx'> </div><div class='ctx'> 				obj_desc-&gt;reference.node = op-&gt;common.node;</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c<br/>index 6229c10674e1..5b974a8fe614 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsopcode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsopcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsopcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsopcode.c</a></div><div class='hunk'>@@ -91,7 +91,7 @@ acpi_ds_execute_arguments(struct acpi_namespace_node *node,</div><div class='ctx'> 	union acpi_parse_object *op;</div><div class='ctx'> 	struct acpi_walk_state *walk_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_execute_arguments");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_execute_arguments);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate a new parser op to be the root of the parsed tree</div><div class='hunk'>@@ -193,7 +193,7 @@ acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_get_buffer_field_arguments", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_field_arguments, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc-&gt;common.flags &amp; AOPOBJ_DATA_VALID) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -206,7 +206,7 @@ acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname</div><div class='ctx'> 			(ACPI_TYPE_BUFFER_FIELD, node, NULL));</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] buffer_field Arg Init\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] BufferField Arg Init\n",</div><div class='ctx'> 			  acpi_ut_get_node_name(node)));</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the AML code for the term_arg arguments */</div><div class='hunk'>@@ -235,7 +235,7 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_get_buffer_arguments", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_get_buffer_arguments, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc-&gt;common.flags &amp; AOPOBJ_DATA_VALID) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -279,7 +279,7 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_get_package_arguments", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_get_package_arguments, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc-&gt;common.flags &amp; AOPOBJ_DATA_VALID) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -324,7 +324,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	union acpi_operand_object *extra_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_get_region_arguments", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_get_region_arguments, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc-&gt;region.flags &amp; AOPOBJ_DATA_VALID) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -342,8 +342,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname</div><div class='ctx'> 			(ACPI_TYPE_REGION, node, NULL));</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-			  "[%4.4s] op_region Arg Init at AML %p\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "[%4.4s] OpRegion Arg Init at AML %p\n",</div><div class='ctx'> 			  acpi_ut_get_node_name(node),</div><div class='ctx'> 			  extra_desc-&gt;extra.aml_start));</div><div class='ctx'> </div><div class='hunk'>@@ -352,6 +351,28 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node),</div><div class='ctx'> 					   extra_desc-&gt;extra.aml_length,</div><div class='ctx'> 					   extra_desc-&gt;extra.aml_start);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate the region address/length via the host OS */</div><div class='add'>+</div><div class='add'>+	status = acpi_os_validate_address(obj_desc-&gt;region.space_id,</div><div class='add'>+					  obj_desc-&gt;region.address,</div><div class='add'>+					  (acpi_size) obj_desc-&gt;region.length);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		/*</div><div class='add'>+		 * Invalid address/length. We will emit an error message and mark</div><div class='add'>+		 * the region as invalid, so that it will cause an additional error if</div><div class='add'>+		 * it is ever used. Then return AE_OK.</div><div class='add'>+		 */</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"During address validation of OpRegion [%4.4s]",</div><div class='add'>+				node-&gt;name.ascii));</div><div class='add'>+		obj_desc-&gt;common.flags |= AOPOBJ_INVALID;</div><div class='add'>+		status = AE_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +432,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,</div><div class='ctx'> 	u8 field_flags;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_init_buffer_field", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_init_buffer_field, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Host object must be a Buffer */</div><div class='ctx'> </div><div class='hunk'>@@ -457,7 +478,7 @@ acpi_ds_init_buffer_field(u16 aml_opcode,</div><div class='ctx'> </div><div class='ctx'> 		if (bit_count == 0) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Attempt to create_field of length zero"));</div><div class='add'>+				    "Attempt to CreateField of length zero"));</div><div class='ctx'> 			status = AE_AML_OPERAND_VALUE;</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -595,7 +616,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_parse_object *next_op;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_eval_buffer_field_operands", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_eval_buffer_field_operands, op);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is where we evaluate the address and length fields of the</div><div class='hunk'>@@ -627,7 +648,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,</div><div class='ctx'> 			   acpi_ps_get_opcode_name(op-&gt;common.aml_opcode),</div><div class='ctx'> 			   walk_state-&gt;num_operands,</div><div class='del'>-			   "after acpi_ex_resolve_operands");</div><div class='add'>+			   "after AcpiExResolveOperands");</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",</div><div class='hunk'>@@ -640,6 +661,7 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	/* Initialize the Buffer Field */</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;common.aml_opcode == AML_CREATE_FIELD_OP) {</div><div class='add'>+</div><div class='ctx'> 		/* NOTE: Slightly different operands for this opcode */</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='hunk'>@@ -685,7 +707,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_parse_object *next_op;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_eval_region_operands", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_eval_region_operands, op);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is where we evaluate the address and length fields of the</div><div class='hunk'>@@ -718,7 +740,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DUMP_OPERANDS(ACPI_WALK_OPERANDS, ACPI_IMODE_EXECUTE,</div><div class='ctx'> 			   acpi_ps_get_opcode_name(op-&gt;common.aml_opcode),</div><div class='del'>-			   1, "after acpi_ex_resolve_operands");</div><div class='add'>+			   1, "after AcpiExResolveOperands");</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	if (!obj_desc) {</div><div class='hunk'>@@ -744,7 +766,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	    operand_desc-&gt;integer.value;</div><div class='ctx'> 	acpi_ut_remove_reference(operand_desc);</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "rgn_obj %p Addr %8.8X%8.8X Len %X\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "RgnObj %p Addr %8.8X%8.8X Len %X\n",</div><div class='ctx'> 			  obj_desc,</div><div class='ctx'> 			  ACPI_FORMAT_UINT64(obj_desc-&gt;region.address),</div><div class='ctx'> 			  obj_desc-&gt;region.length));</div><div class='hunk'>@@ -780,7 +802,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	union acpi_operand_object *arg_desc;</div><div class='ctx'> 	u32 length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_eval_data_object_operands");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_eval_data_object_operands);</div><div class='ctx'> </div><div class='ctx'> 	/* The first operand (for all of these data objects) is the length */</div><div class='ctx'> </div><div class='hunk'>@@ -874,7 +896,7 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_generic_state *control_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_exec_begin_control_op");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_exec_begin_control_op);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p Opcode=%2.2X State=%p\n", op,</div><div class='ctx'> 			  op-&gt;common.aml_opcode, walk_state));</div><div class='hunk'>@@ -952,7 +974,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_generic_state *control_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_exec_end_control_op");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_exec_end_control_op);</div><div class='ctx'> </div><div class='ctx'> 	switch (op-&gt;common.aml_opcode) {</div><div class='ctx'> 	case AML_IF_OP:</div><div class='hunk'>@@ -984,6 +1006,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "[WHILE_OP] Op=%p\n", op));</div><div class='ctx'> </div><div class='ctx'> 		if (walk_state-&gt;control_state-&gt;common.value) {</div><div class='add'>+</div><div class='ctx'> 			/* Predicate was true, go back and evaluate it again! */</div><div class='ctx'> </div><div class='ctx'> 			status = AE_CTRL_PENDING;</div><div class='hunk'>@@ -1014,6 +1037,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		 * has been bubbled up the tree</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (op-&gt;common.value.arg) {</div><div class='add'>+</div><div class='ctx'> 			/* Since we have a real Return(), delete any implicit return */</div><div class='ctx'> </div><div class='ctx'> 			acpi_ds_clear_implicit_return(walk_state);</div><div class='hunk'>@@ -1047,6 +1071,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 			walk_state-&gt;return_desc = walk_state-&gt;operands[0];</div><div class='ctx'> 		} else if ((walk_state-&gt;results) &amp;&amp;</div><div class='ctx'> 			   (walk_state-&gt;results-&gt;results.num_results &gt; 0)) {</div><div class='add'>+</div><div class='ctx'> 			/* Since we have a real Return(), delete any implicit return */</div><div class='ctx'> </div><div class='ctx'> 			acpi_ds_clear_implicit_return(walk_state);</div><div class='hunk'>@@ -1095,7 +1120,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-				  "Completed RETURN_OP State=%p, ret_val=%p\n",</div><div class='add'>+				  "Completed RETURN_OP State=%p, RetVal=%p\n",</div><div class='ctx'> 				  walk_state, walk_state-&gt;return_desc));</div><div class='ctx'> </div><div class='ctx'> 		/* End the control method execution right now */</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c<br/>index 53356a591ac1..05230baf5de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsutils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dsutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dsutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dsutils.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ ACPI_MODULE_NAME("dsutils")</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ds_clear_implicit_return");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_clear_implicit_return);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Slack must be enabled for this feature</div><div class='hunk'>@@ -115,7 +115,7 @@ u8</div><div class='ctx'> acpi_ds_do_implicit_return(union acpi_operand_object *return_desc,</div><div class='ctx'> 			   struct acpi_walk_state *walk_state, u8 add_reference)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ds_do_implicit_return");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_do_implicit_return);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Slack must be enabled for this feature, and we must</div><div class='hunk'>@@ -171,7 +171,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,</div><div class='ctx'> {</div><div class='ctx'> 	const struct acpi_opcode_info *parent_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_is_result_used", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_is_result_used, op);</div><div class='ctx'> </div><div class='ctx'> 	/* Must have both an Op and a Result Object */</div><div class='ctx'> </div><div class='hunk'>@@ -202,6 +202,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((!op-&gt;common.parent) ||</div><div class='ctx'> 	    (op-&gt;common.parent-&gt;common.aml_opcode == AML_SCOPE_OP)) {</div><div class='add'>+</div><div class='ctx'> 		/* No parent, the return value cannot possibly be used */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='hunk'>@@ -340,7 +341,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_delete_result_if_not_used, result_obj);</div><div class='ctx'> </div><div class='ctx'> 	if (!op) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Null Op"));</div><div class='hunk'>@@ -352,6 +353,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_ds_is_result_used(op, walk_state)) {</div><div class='add'>+</div><div class='ctx'> 		/* Must pop the result stack (obj_desc should be equal to result_obj) */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ds_result_pop(&amp;obj_desc, walk_state);</div><div class='hunk'>@@ -382,7 +384,7 @@ acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_resolve_operands", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_resolve_operands, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Attempt to resolve each of the valid operands</div><div class='hunk'>@@ -417,7 +419,7 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_clear_operands", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_clear_operands, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove a reference on each operand on the stack */</div><div class='ctx'> </div><div class='hunk'>@@ -465,7 +467,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_interpreter_mode interpreter_mode;</div><div class='ctx'> 	const struct acpi_opcode_info *op_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_create_operand", arg);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_create_operand, arg);</div><div class='ctx'> </div><div class='ctx'> 	/* A valid name must be looked up in the namespace */</div><div class='ctx'> </div><div class='hunk'>@@ -498,7 +500,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((walk_state-&gt;deferred_node) &amp;&amp;</div><div class='ctx'> 		    (walk_state-&gt;deferred_node-&gt;type == ACPI_TYPE_BUFFER_FIELD)</div><div class='del'>-		    &amp;&amp; (arg_index != 0)) {</div><div class='add'>+		    &amp;&amp; (arg_index ==</div><div class='add'>+			(u32) ((walk_state-&gt;opcode ==</div><div class='add'>+				AML_CREATE_FIELD_OP) ? 3 : 2))) {</div><div class='ctx'> 			obj_desc =</div><div class='ctx'> 			    ACPI_CAST_PTR(union acpi_operand_object,</div><div class='ctx'> 					  walk_state-&gt;deferred_node);</div><div class='hunk'>@@ -521,6 +525,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			    &amp;&amp; (parent_op-&gt;common.aml_opcode != AML_REGION_OP)</div><div class='ctx'> 			    &amp;&amp; (parent_op-&gt;common.aml_opcode !=</div><div class='ctx'> 				AML_INT_NAMEPATH_OP)) {</div><div class='add'>+</div><div class='ctx'> 				/* Enter name into namespace if not found */</div><div class='ctx'> </div><div class='ctx'> 				interpreter_mode = ACPI_IMODE_LOAD_PASS2;</div><div class='hunk'>@@ -572,7 +577,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 		/* Free the namestring created above */</div><div class='ctx'> </div><div class='del'>-		ACPI_MEM_FREE(name_string);</div><div class='add'>+		ACPI_FREE(name_string);</div><div class='ctx'> </div><div class='ctx'> 		/* Check status from the lookup */</div><div class='ctx'> </div><div class='hunk'>@@ -696,7 +701,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	union acpi_parse_object *arg;</div><div class='ctx'> 	u32 arg_count = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_create_operands", first_arg);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_create_operands, first_arg);</div><div class='ctx'> </div><div class='ctx'> 	/* For all arguments in the list... */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c<br/>index f1af655ff113..d7a616c3104e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswexec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswexec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswexec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dswexec.c</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> #include &lt;acpi/acinterp.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> #include &lt;acpi/acdebug.h&gt;</div><div class='del'>-#include &lt;acpi/acdisasm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_DISPATCHER</div><div class='ctx'> ACPI_MODULE_NAME("dswexec")</div><div class='hunk'>@@ -93,7 +92,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	union acpi_operand_object *local_obj_desc = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_get_predicate_value", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_get_predicate_value, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	walk_state-&gt;control_state-&gt;common.state = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +122,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "No predicate obj_desc=%p State=%p",</div><div class='add'>+			    "No predicate ObjDesc=%p State=%p",</div><div class='ctx'> 			    obj_desc, walk_state));</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_NO_OPERAND);</div><div class='hunk'>@@ -140,7 +139,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X",</div><div class='add'>+			    "Bad predicate (not an integer) ObjDesc=%p State=%p Type=%X",</div><div class='ctx'> 			    obj_desc, walk_state,</div><div class='ctx'> 			    ACPI_GET_OBJECT_TYPE(obj_desc)));</div><div class='ctx'> </div><div class='hunk'>@@ -214,7 +213,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u32 opcode_class;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_exec_begin_op", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_exec_begin_op, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	op = walk_state-&gt;op;</div><div class='ctx'> 	if (!op) {</div><div class='hunk'>@@ -296,7 +295,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	case AML_CLASS_NAMED_OBJECT:</div><div class='ctx'> </div><div class='del'>-		if (walk_state-&gt;walk_type == ACPI_WALK_METHOD) {</div><div class='add'>+		if (walk_state-&gt;walk_type &amp; ACPI_WALK_METHOD) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Found a named object declaration during method execution;</div><div class='ctx'> 			 * we must enter this object into the namespace.  The created</div><div class='hunk'>@@ -314,10 +313,10 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	case AML_CLASS_EXECUTE:</div><div class='ctx'> 	case AML_CLASS_CREATE:</div><div class='ctx'> 		/*</div><div class='del'>-		 * Most operators with arguments.</div><div class='add'>+		 * Most operators with arguments (except create_xxx_field operators)</div><div class='ctx'> 		 * Start a new result/operand state</div><div class='ctx'> 		 */</div><div class='del'>-		if (walk_state-&gt;opcode != AML_CREATE_FIELD_OP) {</div><div class='add'>+		if (walk_state-&gt;op_info-&gt;object_type != ACPI_TYPE_BUFFER_FIELD) {</div><div class='ctx'> 			status = acpi_ds_result_stack_push(walk_state);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -354,7 +353,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	union acpi_parse_object *next_op;</div><div class='ctx'> 	union acpi_parse_object *first_arg;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_exec_end_op", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_exec_end_op, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	op = walk_state-&gt;op;</div><div class='ctx'> 	op_type = walk_state-&gt;op_info-&gt;type;</div><div class='hunk'>@@ -409,6 +408,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		 * being the object_type and size_of operators.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!(walk_state-&gt;op_info-&gt;flags &amp; AML_NO_OPERAND_RESOLVE)) {</div><div class='add'>+</div><div class='ctx'> 			/* Resolve all operands */</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_ex_resolve_operands(walk_state-&gt;opcode,</div><div class='hunk'>@@ -423,7 +423,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 						   acpi_ps_get_opcode_name</div><div class='ctx'> 						   (walk_state-&gt;opcode),</div><div class='ctx'> 						   walk_state-&gt;num_operands,</div><div class='del'>-						   "after ex_resolve_operands");</div><div class='add'>+						   "after ExResolveOperands");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +437,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			    acpi_gbl_op_type_dispatch[op_type] (walk_state);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/*</div><div class='del'>-			 * Treat constructs of the form "Store(local_x,local_x)" as noops when the</div><div class='add'>+			 * Treat constructs of the form "Store(LocalX,LocalX)" as noops when the</div><div class='ctx'> 			 * Local is uninitialized.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if ((status == AE_AML_UNINITIALIZED_LOCAL) &amp;&amp;</div><div class='hunk'>@@ -472,7 +472,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			    acpi_ds_result_push(walk_state-&gt;result_obj,</div><div class='ctx'> 						walk_state);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -510,6 +509,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='ctx'> 						  "Method Reference in a Package, Op=%p\n",</div><div class='ctx'> 						  op));</div><div class='add'>+</div><div class='ctx'> 				op-&gt;common.node =</div><div class='ctx'> 				    (struct acpi_namespace_node *)op-&gt;asl.value.</div><div class='ctx'> 				    arg-&gt;asl.node-&gt;object;</div><div class='hunk'>@@ -548,6 +548,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			 */</div><div class='ctx'> 			status = acpi_ds_resolve_operands(walk_state);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 				/* On error, clear all resolved operands */</div><div class='ctx'> </div><div class='ctx'> 				acpi_ds_clear_operands(walk_state);</div><div class='hunk'>@@ -569,7 +570,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		case AML_TYPE_CREATE_FIELD:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-					  "Executing create_field Buffer/Index Op=%p\n",</div><div class='add'>+					  "Executing CreateField Buffer/Index Op=%p\n",</div><div class='ctx'> 					  op));</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_ds_load2_end_op(walk_state);</div><div class='hunk'>@@ -584,7 +585,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		case AML_TYPE_CREATE_OBJECT:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-					  "Executing create_object (Buffer/Package) Op=%p\n",</div><div class='add'>+					  "Executing CreateObject (Buffer/Package) Op=%p\n",</div><div class='ctx'> 					  op));</div><div class='ctx'> </div><div class='ctx'> 			switch (op-&gt;common.parent-&gt;common.aml_opcode) {</div><div class='hunk'>@@ -657,7 +658,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 			if (op-&gt;common.aml_opcode == AML_REGION_OP) {</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-						  "Executing op_region Address/Length Op=%p\n",</div><div class='add'>+						  "Executing OpRegion Address/Length Op=%p\n",</div><div class='ctx'> 						  op));</div><div class='ctx'> </div><div class='ctx'> 				status =</div><div class='hunk'>@@ -669,7 +670,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 				status = acpi_ds_result_stack_pop(walk_state);</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AML_TYPE_UNDEFINED:</div><div class='hunk'>@@ -707,7 +707,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	 * Check if we just completed the evaluation of a</div><div class='ctx'> 	 * conditional predicate</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	if ((ACPI_SUCCESS(status)) &amp;&amp;</div><div class='ctx'> 	    (walk_state-&gt;control_state) &amp;&amp;</div><div class='ctx'> 	    (walk_state-&gt;control_state-&gt;common.state ==</div><div class='hunk'>@@ -722,6 +721,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'>       cleanup:</div><div class='ctx'> </div><div class='ctx'> 	if (walk_state-&gt;result_obj) {</div><div class='add'>+</div><div class='ctx'> 		/* Break to debugger to display result */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUGGER_EXEC(acpi_db_display_result_object</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c<br/>index d3d24da31c81..e3ca7f6539c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswload.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswload.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswload.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dswload.c</a></div><div class='hunk'>@@ -127,7 +127,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 	char *path;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_load1_begin_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_load1_begin_op);</div><div class='ctx'> </div><div class='ctx'> 	op = walk_state-&gt;op;</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,</div><div class='hunk'>@@ -175,15 +175,15 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		if (status == AE_NOT_FOUND) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Table disassembly:</div><div class='del'>-			 * Target of Scope() not found.  Generate an External for it, and</div><div class='add'>+			 * Target of Scope() not found. Generate an External for it, and</div><div class='ctx'> 			 * insert the name into the namespace.</div><div class='ctx'> 			 */</div><div class='del'>-			acpi_dm_add_to_external_list(path);</div><div class='add'>+			acpi_dm_add_to_external_list(path, ACPI_TYPE_DEVICE, 0);</div><div class='ctx'> 			status =</div><div class='ctx'> 			    acpi_ns_lookup(walk_state-&gt;scope_info, path,</div><div class='ctx'> 					   object_type, ACPI_IMODE_LOAD_PASS1,</div><div class='ctx'> 					   ACPI_NS_SEARCH_PARENT, walk_state,</div><div class='del'>-					   &amp;(node));</div><div class='add'>+					   &amp;node);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -210,16 +210,15 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		case ACPI_TYPE_BUFFER:</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * These types we will allow, but we will change the type.  This</div><div class='add'>+			 * These types we will allow, but we will change the type. This</div><div class='ctx'> 			 * enables some existing code of the form:</div><div class='ctx'> 			 *</div><div class='ctx'> 			 *  Name (DEB, 0)</div><div class='ctx'> 			 *  Scope (DEB) { ... }</div><div class='ctx'> 			 *</div><div class='del'>-			 * Note: silently change the type here.  On the second pass, we will report</div><div class='add'>+			 * Note: silently change the type here. On the second pass, we will report</div><div class='ctx'> 			 * a warning</div><div class='ctx'> 			 */</div><div class='del'>-</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 					  "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n",</div><div class='ctx'> 					  path,</div><div class='hunk'>@@ -242,7 +241,6 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For all other named opcodes, we will enter the name into</div><div class='ctx'> 		 * the namespace.</div><div class='hunk'>@@ -259,8 +257,8 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		 *       buffer_field, or Package), the name of the object is already</div><div class='ctx'> 		 *       in the namespace.</div><div class='ctx'> 		 */</div><div class='del'>-</div><div class='ctx'> 		if (walk_state-&gt;deferred_node) {</div><div class='add'>+</div><div class='ctx'> 			/* This name is already in the namespace, get the node */</div><div class='ctx'> </div><div class='ctx'> 			node = walk_state-&gt;deferred_node;</div><div class='hunk'>@@ -292,18 +290,49 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Enter the named type into the internal namespace.  We enter the name</div><div class='del'>-		 * as we go downward in the parse tree.  Any necessary subobjects that</div><div class='add'>+		 * Enter the named type into the internal namespace. We enter the name</div><div class='add'>+		 * as we go downward in the parse tree. Any necessary subobjects that</div><div class='ctx'> 		 * involve arguments to the opcode must be created as we go back up the</div><div class='ctx'> 		 * parse tree later.</div><div class='ctx'> 		 */</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_ns_lookup(walk_state-&gt;scope_info, path, object_type,</div><div class='ctx'> 				   ACPI_IMODE_LOAD_PASS1, flags, walk_state,</div><div class='del'>-				   &amp;(node));</div><div class='add'>+				   &amp;node);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_ERROR_NAMESPACE(path, status);</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='add'>+			if (status == AE_ALREADY_EXISTS) {</div><div class='add'>+</div><div class='add'>+				/* The name already exists in this scope */</div><div class='add'>+</div><div class='add'>+				if (node-&gt;flags &amp; ANOBJ_IS_EXTERNAL) {</div><div class='add'>+					/*</div><div class='add'>+					 * Allow one create on an object or segment that was</div><div class='add'>+					 * previously declared External</div><div class='add'>+					 */</div><div class='add'>+					node-&gt;flags &amp;= ~ANOBJ_IS_EXTERNAL;</div><div class='add'>+					node-&gt;type = (u8) object_type;</div><div class='add'>+</div><div class='add'>+					/* Just retyped a node, probably will need to open a scope */</div><div class='add'>+</div><div class='add'>+					if (acpi_ns_opens_scope(object_type)) {</div><div class='add'>+						status =</div><div class='add'>+						    acpi_ds_scope_stack_push</div><div class='add'>+						    (node, object_type,</div><div class='add'>+						     walk_state);</div><div class='add'>+						if (ACPI_FAILURE(status)) {</div><div class='add'>+							return_ACPI_STATUS</div><div class='add'>+							    (status);</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					status = AE_OK;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ACPI_FAILURE(status)) {</div><div class='add'>+				ACPI_ERROR_NAMESPACE(path, status);</div><div class='add'>+				return_ACPI_STATUS(status);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -311,6 +340,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 	/* Common exit */</div><div class='ctx'> </div><div class='ctx'> 	if (!op) {</div><div class='add'>+</div><div class='ctx'> 		/* Create a new op */</div><div class='ctx'> </div><div class='ctx'> 		op = acpi_ps_alloc_op(walk_state-&gt;opcode);</div><div class='hunk'>@@ -359,7 +389,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_object_type object_type;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_load1_end_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_load1_end_op);</div><div class='ctx'> </div><div class='ctx'> 	op = walk_state-&gt;op;</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,</div><div class='hunk'>@@ -401,9 +431,13 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			status =</div><div class='ctx'> 			    acpi_ex_create_region(op-&gt;named.data,</div><div class='ctx'> 						  op-&gt;named.length,</div><div class='del'>-						  (acpi_adr_space_type)</div><div class='del'>-						  ((op-&gt;common.value.arg)-&gt;</div><div class='del'>-						   common.value.integer),</div><div class='add'>+						  (acpi_adr_space_type) ((op-&gt;</div><div class='add'>+									  common.</div><div class='add'>+									  value.</div><div class='add'>+									  arg)-&gt;</div><div class='add'>+									 common.</div><div class='add'>+									 value.</div><div class='add'>+									 integer),</div><div class='ctx'> 						  walk_state);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='ctx'> 				return_ACPI_STATUS(status);</div><div class='hunk'>@@ -413,6 +447,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;common.aml_opcode == AML_NAME_OP) {</div><div class='add'>+</div><div class='ctx'> 		/* For Name opcode, get the object type from the argument */</div><div class='ctx'> </div><div class='ctx'> 		if (op-&gt;common.value.arg) {</div><div class='hunk'>@@ -440,12 +475,12 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			 * method_op pkg_length name_string method_flags term_list</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * Note: We must create the method node/object pair as soon as we</div><div class='del'>-			 * see the method declaration.  This allows later pass1 parsing</div><div class='add'>+			 * see the method declaration. This allows later pass1 parsing</div><div class='ctx'> 			 * of invocations of the method (need to know the number of</div><div class='ctx'> 			 * arguments.)</div><div class='ctx'> 			 */</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-					  "LOADING-Method: State=%p Op=%p named_obj=%p\n",</div><div class='add'>+					  "LOADING-Method: State=%p Op=%p NamedObj=%p\n",</div><div class='ctx'> 					  walk_state, op, op-&gt;named.node));</div><div class='ctx'> </div><div class='ctx'> 			if (!acpi_ns_get_attached_object(op-&gt;named.node)) {</div><div class='hunk'>@@ -465,6 +500,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 								  length,</div><div class='ctx'> 								  walk_state);</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='ctx'> 				walk_state-&gt;operands[0] = NULL;</div><div class='ctx'> 				walk_state-&gt;num_operands = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +547,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_object_type object_type;</div><div class='ctx'> 	char *buffer_ptr;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_load2_begin_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_load2_begin_op);</div><div class='ctx'> </div><div class='ctx'> 	op = walk_state-&gt;op;</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,</div><div class='hunk'>@@ -521,6 +557,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		if ((walk_state-&gt;control_state) &amp;&amp;</div><div class='ctx'> 		    (walk_state-&gt;control_state-&gt;common.state ==</div><div class='ctx'> 		     ACPI_CONTROL_CONDITIONAL_EXECUTING)) {</div><div class='add'>+</div><div class='ctx'> 			/* We are executing a while loop outside of a method */</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_ds_exec_begin_op(walk_state, out_op);</div><div class='hunk'>@@ -535,7 +572,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> #ifdef ACPI_ENABLE_MODULE_LEVEL_CODE</div><div class='ctx'> 			if ((walk_state-&gt;op_info-&gt;class == AML_CLASS_EXECUTE) ||</div><div class='ctx'> 			    (walk_state-&gt;op_info-&gt;class == AML_CLASS_CONTROL)) {</div><div class='del'>-</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='ctx'> 						  "Begin/EXEC: %s (fl %8.8X)\n",</div><div class='ctx'> 						  walk_state-&gt;op_info-&gt;name,</div><div class='hunk'>@@ -554,10 +590,12 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		/* Get the name we are going to enter or lookup in the namespace */</div><div class='ctx'> </div><div class='ctx'> 		if (walk_state-&gt;opcode == AML_INT_NAMEPATH_OP) {</div><div class='add'>+</div><div class='ctx'> 			/* For Namepath op, get the path string */</div><div class='ctx'> </div><div class='ctx'> 			buffer_ptr = op-&gt;common.value.string;</div><div class='ctx'> 			if (!buffer_ptr) {</div><div class='add'>+</div><div class='ctx'> 				/* No name, just exit */</div><div class='ctx'> </div><div class='ctx'> 				return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -565,7 +603,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Get name from the op */</div><div class='ctx'> </div><div class='del'>-			buffer_ptr = (char *)&amp;op-&gt;named.name;</div><div class='add'>+			buffer_ptr = ACPI_CAST_PTR(char, &amp;op-&gt;named.name);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Get the namestring from the raw AML */</div><div class='hunk'>@@ -592,7 +630,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AML_INT_NAMEPATH_OP:</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The name_path is an object reference to an existing object.</div><div class='ctx'> 		 * Don't enter the name into the namespace, but look it up</div><div class='hunk'>@@ -605,7 +642,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AML_SCOPE_OP:</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The Path is an object reference to an existing object.</div><div class='ctx'> 		 * Don't enter the name into the namespace, but look it up</div><div class='hunk'>@@ -627,6 +663,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> #endif</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We must check to make sure that the target is</div><div class='ctx'> 		 * one of the opcodes that actually opens a scope</div><div class='hunk'>@@ -646,13 +683,12 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		case ACPI_TYPE_BUFFER:</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * These types we will allow, but we will change the type.  This</div><div class='add'>+			 * These types we will allow, but we will change the type. This</div><div class='ctx'> 			 * enables some existing code of the form:</div><div class='ctx'> 			 *</div><div class='ctx'> 			 *  Name (DEB, 0)</div><div class='ctx'> 			 *  Scope (DEB) { ... }</div><div class='ctx'> 			 */</div><div class='del'>-</div><div class='ctx'> 			ACPI_WARNING((AE_INFO,</div><div class='ctx'> 				      "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",</div><div class='ctx'> 				      buffer_ptr,</div><div class='hunk'>@@ -680,6 +716,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		/* All other opcodes */</div><div class='ctx'> </div><div class='ctx'> 		if (op &amp;&amp; op-&gt;common.node) {</div><div class='add'>+</div><div class='ctx'> 			/* This op/node was previously entered into the namespace */</div><div class='ctx'> </div><div class='ctx'> 			node = op-&gt;common.node;</div><div class='hunk'>@@ -691,20 +728,21 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 				if (ACPI_FAILURE(status)) {</div><div class='ctx'> 					return_ACPI_STATUS(status);</div><div class='ctx'> 				}</div><div class='del'>-</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Enter the named type into the internal namespace.  We enter the name</div><div class='del'>-		 * as we go downward in the parse tree.  Any necessary subobjects that</div><div class='add'>+		 * Enter the named type into the internal namespace. We enter the name</div><div class='add'>+		 * as we go downward in the parse tree. Any necessary subobjects that</div><div class='ctx'> 		 * involve arguments to the opcode must be created as we go back up the</div><div class='ctx'> 		 * parse tree later.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Note: Name may already exist if we are executing a deferred opcode.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (walk_state-&gt;deferred_node) {</div><div class='add'>+</div><div class='ctx'> 			/* This name is already in the namespace, get the node */</div><div class='ctx'> </div><div class='ctx'> 			node = walk_state-&gt;deferred_node;</div><div class='hunk'>@@ -727,6 +765,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!op) {</div><div class='add'>+</div><div class='ctx'> 		/* Create a new op */</div><div class='ctx'> </div><div class='ctx'> 		op = acpi_ps_alloc_op(walk_state-&gt;opcode);</div><div class='hunk'>@@ -747,7 +786,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 * can get it again quickly when this scope is closed</div><div class='ctx'> 	 */</div><div class='ctx'> 	op-&gt;common.node = node;</div><div class='del'>-</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -776,7 +814,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	u32 i;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_load2_end_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_load2_end_op);</div><div class='ctx'> </div><div class='ctx'> 	op = walk_state-&gt;op;</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",</div><div class='hunk'>@@ -870,7 +908,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-			  "Create-Load [%s] State=%p Op=%p named_obj=%p\n",</div><div class='add'>+			  "Create-Load [%s] State=%p Op=%p NamedObj=%p\n",</div><div class='ctx'> 			  acpi_ps_get_opcode_name(op-&gt;common.aml_opcode),</div><div class='ctx'> 			  walk_state, op, node));</div><div class='ctx'> </div><div class='hunk'>@@ -882,7 +920,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> #ifndef ACPI_NO_METHOD_EXECUTION</div><div class='ctx'> </div><div class='ctx'> 	case AML_TYPE_CREATE_FIELD:</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Create the field object, but the field buffer and index must</div><div class='ctx'> 		 * be evaluated later during the execution phase</div><div class='hunk'>@@ -891,7 +928,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case AML_TYPE_NAMED_FIELD:</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we are executing a method, initialize the field</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1011,6 +1047,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			 * argument is the space_id. (We must save the address of the</div><div class='ctx'> 			 * AML of the address and length operands)</div><div class='ctx'> 			 */</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we have a valid region, initialize it</div><div class='ctx'> 			 * Namespace is NOT locked at this point.</div><div class='hunk'>@@ -1040,12 +1077,12 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			 * method_op pkg_length name_string method_flags term_list</div><div class='ctx'> 			 *</div><div class='ctx'> 			 * Note: We must create the method node/object pair as soon as we</div><div class='del'>-			 * see the method declaration.  This allows later pass1 parsing</div><div class='add'>+			 * see the method declaration. This allows later pass1 parsing</div><div class='ctx'> 			 * of invocations of the method (need to know the number of</div><div class='ctx'> 			 * arguments.)</div><div class='ctx'> 			 */</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-					  "LOADING-Method: State=%p Op=%p named_obj=%p\n",</div><div class='add'>+					  "LOADING-Method: State=%p Op=%p NamedObj=%p\n",</div><div class='ctx'> 					  walk_state, op, op-&gt;named.node));</div><div class='ctx'> </div><div class='ctx'> 			if (!acpi_ns_get_attached_object(op-&gt;named.node)) {</div><div class='hunk'>@@ -1090,7 +1127,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	case AML_CLASS_METHOD_CALL:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='del'>-				  "RESOLVING-method_call: State=%p Op=%p named_obj=%p\n",</div><div class='add'>+				  "RESOLVING-MethodCall: State=%p Op=%p NamedObj=%p\n",</div><div class='ctx'> 				  walk_state, op, node));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1104,7 +1141,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				   ACPI_NS_DONT_OPEN_SCOPE, walk_state,</div><div class='ctx'> 				   &amp;(new_node));</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Make sure that what we found is indeed a method</div><div class='ctx'> 			 * We didn't search for a method on purpose, to see if the name</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c<br/>index ada21ef4a174..c9228972f5f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswscope.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswscope.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswscope.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dswscope.c</a></div><div class='hunk'>@@ -63,9 +63,10 @@ void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *scope_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_scope_stack_clear");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_scope_stack_clear);</div><div class='ctx'> </div><div class='ctx'> 	while (walk_state-&gt;scope_info) {</div><div class='add'>+</div><div class='ctx'> 		/* Pop a scope off the stack */</div><div class='ctx'> </div><div class='ctx'> 		scope_info = walk_state-&gt;scope_info;</div><div class='hunk'>@@ -102,9 +103,10 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,</div><div class='ctx'> 	union acpi_generic_state *scope_info;</div><div class='ctx'> 	union acpi_generic_state *old_scope_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_scope_stack_push");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_scope_stack_push);</div><div class='ctx'> </div><div class='ctx'> 	if (!node) {</div><div class='add'>+</div><div class='ctx'> 		/* Invalid scope   */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Null scope parameter"));</div><div class='hunk'>@@ -126,7 +128,7 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,</div><div class='ctx'> </div><div class='ctx'> 	/* Init new scope object */</div><div class='ctx'> </div><div class='del'>-	scope_info-&gt;common.data_type = ACPI_DESC_TYPE_STATE_WSCOPE;</div><div class='add'>+	scope_info-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_WSCOPE;</div><div class='ctx'> 	scope_info-&gt;scope.node = node;</div><div class='ctx'> 	scope_info-&gt;common.value = (u16) type;</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +178,7 @@ acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	union acpi_generic_state *scope_info;</div><div class='ctx'> 	union acpi_generic_state *new_scope_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_scope_stack_pop");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_scope_stack_pop);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Pop scope info object off the stack.</div><div class='head'>diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c<br/>index fa78cb74ee36..7817e5522679 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswstate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/dispatcher/dswstate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dispatcher/dswstate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dispatcher/dswstate.c</a></div><div class='hunk'>@@ -66,7 +66,6 @@ void *acpi_ds_obj_stack_get_value(u32 index,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ds_result_remove</div><div class='hunk'>@@ -88,7 +87,7 @@ acpi_ds_result_remove(union acpi_operand_object **object,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_remove");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_remove);</div><div class='ctx'> </div><div class='ctx'> 	state = walk_state-&gt;results;</div><div class='ctx'> 	if (!state) {</div><div class='hunk'>@@ -128,7 +127,6 @@ acpi_ds_result_remove(union acpi_operand_object **object,</div><div class='ctx'> </div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -152,7 +150,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,</div><div class='ctx'> 	acpi_native_uint index;</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_pop");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_pop);</div><div class='ctx'> </div><div class='ctx'> 	state = walk_state-&gt;results;</div><div class='ctx'> 	if (!state) {</div><div class='hunk'>@@ -170,6 +168,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,</div><div class='ctx'> 	state-&gt;results.num_results--;</div><div class='ctx'> </div><div class='ctx'> 	for (index = ACPI_OBJ_NUM_OPERANDS; index; index--) {</div><div class='add'>+</div><div class='ctx'> 		/* Check for a valid result object */</div><div class='ctx'> </div><div class='ctx'> 		if (state-&gt;results.obj_desc[index - 1]) {</div><div class='hunk'>@@ -213,7 +212,7 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,</div><div class='ctx'> 	acpi_native_uint index;</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_pop_from_bottom");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_pop_from_bottom);</div><div class='ctx'> </div><div class='ctx'> 	state = walk_state-&gt;results;</div><div class='ctx'> 	if (!state) {</div><div class='hunk'>@@ -278,7 +277,7 @@ acpi_ds_result_push(union acpi_operand_object * object,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_push");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_push);</div><div class='ctx'> </div><div class='ctx'> 	state = walk_state-&gt;results;</div><div class='ctx'> 	if (!state) {</div><div class='hunk'>@@ -331,14 +330,14 @@ acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_stack_push");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_stack_push);</div><div class='ctx'> </div><div class='ctx'> 	state = acpi_ut_create_generic_state();</div><div class='ctx'> 	if (!state) {</div><div class='ctx'> 		return (AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	state-&gt;common.data_type = ACPI_DESC_TYPE_STATE_RESULT;</div><div class='add'>+	state-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_RESULT;</div><div class='ctx'> 	acpi_ut_push_generic_state(&amp;walk_state-&gt;results, state);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Results=%p State=%p\n",</div><div class='hunk'>@@ -363,7 +362,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_stack_pop");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_stack_pop);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for stack underflow */</div><div class='ctx'> </div><div class='hunk'>@@ -376,7 +375,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)</div><div class='ctx'> 	state = acpi_ut_pop_generic_state(&amp;walk_state-&gt;results);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-			  "Result=%p remaining_results=%X State=%p\n",</div><div class='add'>+			  "Result=%p RemainingResults=%X State=%p\n",</div><div class='ctx'> 			  state, state-&gt;results.num_results, walk_state));</div><div class='ctx'> </div><div class='ctx'> 	acpi_ut_delete_generic_state(state);</div><div class='hunk'>@@ -400,7 +399,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ds_obj_stack_push");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_obj_stack_push);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for stack overflow */</div><div class='ctx'> </div><div class='hunk'>@@ -445,9 +444,10 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_obj_stack_pop");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_obj_stack_pop);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pop_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Check for stack underflow */</div><div class='ctx'> </div><div class='ctx'> 		if (walk_state-&gt;num_operands == 0) {</div><div class='hunk'>@@ -491,9 +491,10 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_obj_stack_pop_and_delete");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pop_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Check for stack underflow */</div><div class='ctx'> </div><div class='ctx'> 		if (walk_state-&gt;num_operands == 0) {</div><div class='hunk'>@@ -538,13 +539,13 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,</div><div class='ctx'> struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state</div><div class='ctx'> 						       *thread)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ds_get_current_walk_state");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_get_current_walk_state);</div><div class='ctx'> </div><div class='ctx'> 	if (!thread) {</div><div class='ctx'> 		return (NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current walk_state %p\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current WalkState %p\n",</div><div class='ctx'> 			  thread-&gt;walk_state_list));</div><div class='ctx'> </div><div class='ctx'> 	return (thread-&gt;walk_state_list);</div><div class='hunk'>@@ -567,7 +568,7 @@ void</div><div class='ctx'> acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			struct acpi_thread_state *thread)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_push_walk_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_push_walk_state);</div><div class='ctx'> </div><div class='ctx'> 	walk_state-&gt;next = thread-&gt;walk_state_list;</div><div class='ctx'> 	thread-&gt;walk_state_list = walk_state;</div><div class='hunk'>@@ -593,11 +594,12 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_walk_state *walk_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_pop_walk_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_pop_walk_state);</div><div class='ctx'> </div><div class='ctx'> 	walk_state = thread-&gt;walk_state_list;</div><div class='ctx'> </div><div class='ctx'> 	if (walk_state) {</div><div class='add'>+</div><div class='ctx'> 		/* Next walk state becomes the current walk state */</div><div class='ctx'> </div><div class='ctx'> 		thread-&gt;walk_state_list = walk_state-&gt;next;</div><div class='hunk'>@@ -618,7 +620,7 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  owner_id        - ID for object creation</div><div class='ctx'>  *              Origin          - Starting point for this walk</div><div class='del'>- *              mth_desc        - Method object</div><div class='add'>+ *              method_desc     - Method object</div><div class='ctx'>  *              Thread          - Current thread state</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Pointer to the new walk state.</div><div class='hunk'>@@ -632,24 +634,24 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,</div><div class='ctx'> 						  union acpi_parse_object</div><div class='ctx'> 						  *origin,</div><div class='ctx'> 						  union acpi_operand_object</div><div class='del'>-						  *mth_desc,</div><div class='add'>+						  *method_desc,</div><div class='ctx'> 						  struct acpi_thread_state</div><div class='ctx'> 						  *thread)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_walk_state *walk_state;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_create_walk_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_create_walk_state);</div><div class='ctx'> </div><div class='del'>-	walk_state = ACPI_MEM_CALLOCATE(sizeof(struct acpi_walk_state));</div><div class='add'>+	walk_state = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_walk_state));</div><div class='ctx'> 	if (!walk_state) {</div><div class='ctx'> 		return_PTR(NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	walk_state-&gt;data_type = ACPI_DESC_TYPE_WALK;</div><div class='add'>+	walk_state-&gt;descriptor_type = ACPI_DESC_TYPE_WALK;</div><div class='add'>+	walk_state-&gt;method_desc = method_desc;</div><div class='ctx'> 	walk_state-&gt;owner_id = owner_id;</div><div class='ctx'> 	walk_state-&gt;origin = origin;</div><div class='del'>-	walk_state-&gt;method_desc = mth_desc;</div><div class='ctx'> 	walk_state-&gt;thread = thread;</div><div class='ctx'> </div><div class='ctx'> 	walk_state-&gt;parser_state.start_op = origin;</div><div class='hunk'>@@ -664,7 +666,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ds_result_stack_push(walk_state);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_MEM_FREE(walk_state);</div><div class='add'>+		ACPI_FREE(walk_state);</div><div class='ctx'> 		return_PTR(NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -701,13 +703,13 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		      struct acpi_namespace_node *method_node,</div><div class='ctx'> 		      u8 * aml_start,</div><div class='ctx'> 		      u32 aml_length,</div><div class='del'>-		      struct acpi_parameter_info *info, u8 pass_number)</div><div class='add'>+		      struct acpi_evaluate_info *info, u8 pass_number)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_parse_state *parser_state = &amp;walk_state-&gt;parser_state;</div><div class='ctx'> 	union acpi_parse_object *extra_op;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ds_init_aml_walk");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ds_init_aml_walk);</div><div class='ctx'> </div><div class='ctx'> 	walk_state-&gt;parser_state.aml =</div><div class='ctx'> 	    walk_state-&gt;parser_state.aml_start = aml_start;</div><div class='hunk'>@@ -778,6 +780,7 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (parser_state-&gt;start_node) {</div><div class='add'>+</div><div class='ctx'> 			/* Push start scope on scope stack and make it current  */</div><div class='ctx'> </div><div class='ctx'> 			status =</div><div class='hunk'>@@ -810,21 +813,24 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_delete_walk_state", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	if (!walk_state) {</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (walk_state-&gt;data_type != ACPI_DESC_TYPE_WALK) {</div><div class='add'>+	if (walk_state-&gt;descriptor_type != ACPI_DESC_TYPE_WALK) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "%p is not a valid walk state",</div><div class='ctx'> 			    walk_state));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* There should not be any open scopes */</div><div class='add'>+</div><div class='ctx'> 	if (walk_state-&gt;parser_state.scope) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "%p walk still has a scope list",</div><div class='ctx'> 			    walk_state));</div><div class='add'>+		acpi_ps_cleanup_scope(&amp;walk_state-&gt;parser_state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Always must free any linked control states */</div><div class='hunk'>@@ -854,7 +860,7 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		acpi_ut_delete_generic_state(state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_MEM_FREE(walk_state);</div><div class='add'>+	ACPI_FREE(walk_state);</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -879,7 +885,7 @@ acpi_ds_result_insert(void *object,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ds_result_insert");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_result_insert);</div><div class='ctx'> </div><div class='ctx'> 	state = walk_state-&gt;results;</div><div class='ctx'> 	if (!state) {</div><div class='hunk'>@@ -937,7 +943,7 @@ acpi_status acpi_ds_obj_stack_delete_all(struct acpi_walk_state * walk_state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_obj_stack_delete_all", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_delete_all, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/* The stack size is configurable, but fixed */</div><div class='ctx'> </div><div class='hunk'>@@ -969,7 +975,7 @@ acpi_status</div><div class='ctx'> acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,</div><div class='ctx'> 			     struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ds_obj_stack_pop_object");</div><div class='add'>+	ACPI_FUNCTION_NAME(ds_obj_stack_pop_object);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for stack underflow */</div><div class='ctx'> </div><div class='hunk'>@@ -1025,7 +1031,7 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,</div><div class='ctx'> void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ds_obj_stack_get_value", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_get_value, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Can't do it if the stack is empty */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c<br/>new file mode 100644<br/>index 000000000000..1c0a39d8b04e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/dock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/dock.c</a></div><div class='hunk'>@@ -0,0 +1,740 @@</div><div class='add'>+/*</div><div class='add'>+ *  dock.c - ACPI dock station driver</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Kristen Carlson Accardi &lt;kristen.c.accardi@intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful, but</div><div class='add'>+ *  WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ *  General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License along</div><div class='add'>+ *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;acpi/acpi_bus.h&gt;</div><div class='add'>+#include &lt;acpi/acpi_drivers.h&gt;</div><div class='add'>+</div><div class='add'>+#define ACPI_DOCK_DRIVER_NAME "ACPI Dock Station Driver"</div><div class='add'>+</div><div class='add'>+ACPI_MODULE_NAME("dock")</div><div class='add'>+MODULE_AUTHOR("Kristen Carlson Accardi");</div><div class='add'>+MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_NAME);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static struct atomic_notifier_head dock_notifier_list;</div><div class='add'>+</div><div class='add'>+struct dock_station {</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	unsigned long last_dock_time;</div><div class='add'>+	u32 flags;</div><div class='add'>+	spinlock_t dd_lock;</div><div class='add'>+	spinlock_t hp_lock;</div><div class='add'>+	struct list_head dependent_devices;</div><div class='add'>+	struct list_head hotplug_devices;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dock_dependent_device {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct list_head hotplug_list;</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	acpi_notify_handler handler;</div><div class='add'>+	void *context;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DOCK_DOCKING	0x00000001</div><div class='add'>+#define DOCK_EVENT	KOBJ_DOCK</div><div class='add'>+#define UNDOCK_EVENT	KOBJ_UNDOCK</div><div class='add'>+</div><div class='add'>+static struct dock_station *dock_station;</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *                         Dock Dependent device functions                   *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ *  alloc_dock_dependent_device - allocate and init a dependent device</div><div class='add'>+ *  @handle: the acpi_handle of the dependent device</div><div class='add'>+ *</div><div class='add'>+ *  Allocate memory for a dependent device structure for a device referenced</div><div class='add'>+ *  by the acpi handle</div><div class='add'>+ */</div><div class='add'>+static struct dock_dependent_device *</div><div class='add'>+alloc_dock_dependent_device(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	dd = kzalloc(sizeof(*dd), GFP_KERNEL);</div><div class='add'>+	if (dd) {</div><div class='add'>+		dd-&gt;handle = handle;</div><div class='add'>+		INIT_LIST_HEAD(&amp;dd-&gt;list);</div><div class='add'>+		INIT_LIST_HEAD(&amp;dd-&gt;hotplug_list);</div><div class='add'>+	}</div><div class='add'>+	return dd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * add_dock_dependent_device - associate a device with the dock station</div><div class='add'>+ * @ds: The dock station</div><div class='add'>+ * @dd: The dependent device</div><div class='add'>+ *</div><div class='add'>+ * Add the dependent device to the dock's dependent device list.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+add_dock_dependent_device(struct dock_station *ds,</div><div class='add'>+			  struct dock_dependent_device *dd)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ds-&gt;dd_lock);</div><div class='add'>+	list_add_tail(&amp;dd-&gt;list, &amp;ds-&gt;dependent_devices);</div><div class='add'>+	spin_unlock(&amp;ds-&gt;dd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_add_hotplug_device - associate a hotplug handler with the dock station</div><div class='add'>+ * @ds: The dock station</div><div class='add'>+ * @dd: The dependent device struct</div><div class='add'>+ *</div><div class='add'>+ * Add the dependent device to the dock's hotplug device list</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+dock_add_hotplug_device(struct dock_station *ds,</div><div class='add'>+			struct dock_dependent_device *dd)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ds-&gt;hp_lock);</div><div class='add'>+	list_add_tail(&amp;dd-&gt;hotplug_list, &amp;ds-&gt;hotplug_devices);</div><div class='add'>+	spin_unlock(&amp;ds-&gt;hp_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_del_hotplug_device - remove a hotplug handler from the dock station</div><div class='add'>+ * @ds: The dock station</div><div class='add'>+ * @dd: the dependent device struct</div><div class='add'>+ *</div><div class='add'>+ * Delete the dependent device from the dock's hotplug device list</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+dock_del_hotplug_device(struct dock_station *ds,</div><div class='add'>+			struct dock_dependent_device *dd)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ds-&gt;hp_lock);</div><div class='add'>+	list_del(&amp;dd-&gt;hotplug_list);</div><div class='add'>+	spin_unlock(&amp;ds-&gt;hp_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * find_dock_dependent_device - get a device dependent on this dock</div><div class='add'>+ * @ds: the dock station</div><div class='add'>+ * @handle: the acpi_handle of the device we want</div><div class='add'>+ *</div><div class='add'>+ * iterate over the dependent device list for this dock.  If the</div><div class='add'>+ * dependent device matches the handle, return.</div><div class='add'>+ */</div><div class='add'>+static struct dock_dependent_device *</div><div class='add'>+find_dock_dependent_device(struct dock_station *ds, acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ds-&gt;dd_lock);</div><div class='add'>+	list_for_each_entry(dd, &amp;ds-&gt;dependent_devices, list) {</div><div class='add'>+		if (handle == dd-&gt;handle) {</div><div class='add'>+			spin_unlock(&amp;ds-&gt;dd_lock);</div><div class='add'>+			return dd;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ds-&gt;dd_lock);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************</div><div class='add'>+ *                         Dock functions                                    *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+/**</div><div class='add'>+ * is_dock - see if a device is a dock station</div><div class='add'>+ * @handle: acpi handle of the device</div><div class='add'>+ *</div><div class='add'>+ * If an acpi object has a _DCK method, then it is by definition a dock</div><div class='add'>+ * station, so return true.</div><div class='add'>+ */</div><div class='add'>+static int is_dock(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	acpi_handle tmp;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_handle(handle, "_DCK", &amp;tmp);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * is_dock_device - see if a device is on a dock station</div><div class='add'>+ * @handle: acpi handle of the device</div><div class='add'>+ *</div><div class='add'>+ * If this device is either the dock station itself,</div><div class='add'>+ * or is a device dependent on the dock station, then it</div><div class='add'>+ * is a dock device</div><div class='add'>+ */</div><div class='add'>+int is_dock_device(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	if (!dock_station)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (is_dock(handle) || find_dock_dependent_device(dock_station, handle))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(is_dock_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_present - see if the dock station is present.</div><div class='add'>+ * @ds: the dock station</div><div class='add'>+ *</div><div class='add'>+ * execute the _STA method.  note that present does not</div><div class='add'>+ * imply that we are docked.</div><div class='add'>+ */</div><div class='add'>+static int dock_present(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	unsigned long sta;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (ds) {</div><div class='add'>+		status = acpi_evaluate_integer(ds-&gt;handle, "_STA", NULL, &amp;sta);</div><div class='add'>+		if (ACPI_SUCCESS(status) &amp;&amp; sta)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_create_acpi_device - add new devices to acpi</div><div class='add'>+ * @handle - handle of the device to add</div><div class='add'>+ *</div><div class='add'>+ *  This function will create a new acpi_device for the given</div><div class='add'>+ *  handle if one does not exist already.  This should cause</div><div class='add'>+ *  acpi to scan for drivers for the given devices, and call</div><div class='add'>+ *  matching driver's add routine.</div><div class='add'>+ *</div><div class='add'>+ *  Returns a pointer to the acpi_device corresponding to the handle.</div><div class='add'>+ */</div><div class='add'>+static struct acpi_device * dock_create_acpi_device(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *device = NULL;</div><div class='add'>+	struct acpi_device *parent_device;</div><div class='add'>+	acpi_handle parent;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (acpi_bus_get_device(handle, &amp;device)) {</div><div class='add'>+		/*</div><div class='add'>+		 * no device created for this object,</div><div class='add'>+		 * so we should create one.</div><div class='add'>+		 */</div><div class='add'>+		acpi_get_parent(handle, &amp;parent);</div><div class='add'>+		if (acpi_bus_get_device(parent, &amp;parent_device))</div><div class='add'>+			parent_device = NULL;</div><div class='add'>+</div><div class='add'>+		ret = acpi_bus_add(&amp;device, parent_device, handle,</div><div class='add'>+			ACPI_BUS_TYPE_DEVICE);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pr_debug("error adding bus, %x\n",</div><div class='add'>+				-ret);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_remove_acpi_device - remove the acpi_device struct from acpi</div><div class='add'>+ * @handle - the handle of the device to remove</div><div class='add'>+ *</div><div class='add'>+ *  Tell acpi to remove the acpi_device.  This should cause any loaded</div><div class='add'>+ *  driver to have it's remove routine called.</div><div class='add'>+ */</div><div class='add'>+static void dock_remove_acpi_device(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *device;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!acpi_bus_get_device(handle, &amp;device)) {</div><div class='add'>+		ret = acpi_bus_trim(device, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			pr_debug("error removing bus, %x\n", -ret);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hotplug_dock_devices - insert or remove devices on the dock station</div><div class='add'>+ * @ds: the dock station</div><div class='add'>+ * @event: either bus check or eject request</div><div class='add'>+ *</div><div class='add'>+ * Some devices on the dock station need to have drivers called</div><div class='add'>+ * to perform hotplug operations after a dock event has occurred.</div><div class='add'>+ * Traverse the list of dock devices that have registered a</div><div class='add'>+ * hotplug handler, and call the handler.</div><div class='add'>+ */</div><div class='add'>+static void hotplug_dock_devices(struct dock_station *ds, u32 event)</div><div class='add'>+{</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ds-&gt;hp_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First call driver specific hotplug functions</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(dd, &amp;ds-&gt;hotplug_devices, hotplug_list) {</div><div class='add'>+		if (dd-&gt;handler)</div><div class='add'>+			dd-&gt;handler(dd-&gt;handle, event, dd-&gt;context);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now make sure that an acpi_device is created for each</div><div class='add'>+	 * dependent device, or removed if this is an eject request.</div><div class='add'>+	 * This will cause acpi_drivers to be stopped/started if they</div><div class='add'>+	 * exist</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(dd, &amp;ds-&gt;dependent_devices, list) {</div><div class='add'>+		if (event == ACPI_NOTIFY_EJECT_REQUEST)</div><div class='add'>+			dock_remove_acpi_device(dd-&gt;handle);</div><div class='add'>+		else</div><div class='add'>+			dock_create_acpi_device(dd-&gt;handle);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;ds-&gt;hp_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dock_event(struct dock_station *ds, u32 event, int num)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *device;</div><div class='add'>+</div><div class='add'>+	device = dock_create_acpi_device(ds-&gt;handle);</div><div class='add'>+	if (device)</div><div class='add'>+		kobject_uevent(&amp;device-&gt;kobj, num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * eject_dock - respond to a dock eject request</div><div class='add'>+ * @ds: the dock station</div><div class='add'>+ *</div><div class='add'>+ * This is called after _DCK is called, to execute the dock station's</div><div class='add'>+ * _EJ0 method.</div><div class='add'>+ */</div><div class='add'>+static void eject_dock(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	struct acpi_object_list arg_list;</div><div class='add'>+	union acpi_object arg;</div><div class='add'>+	acpi_status status;</div><div class='add'>+	acpi_handle tmp;</div><div class='add'>+</div><div class='add'>+	/* all dock devices should have _EJ0, but check anyway */</div><div class='add'>+	status = acpi_get_handle(ds-&gt;handle, "_EJ0", &amp;tmp);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		pr_debug("No _EJ0 support for dock device\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg_list.count = 1;</div><div class='add'>+	arg_list.pointer = &amp;arg;</div><div class='add'>+	arg.type = ACPI_TYPE_INTEGER;</div><div class='add'>+	arg.integer.value = 1;</div><div class='add'>+</div><div class='add'>+	if (ACPI_FAILURE(acpi_evaluate_object(ds-&gt;handle, "_EJ0",</div><div class='add'>+					      &amp;arg_list, NULL)))</div><div class='add'>+		pr_debug("Failed to evaluate _EJ0!\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * handle_dock - handle a dock event</div><div class='add'>+ * @ds: the dock station</div><div class='add'>+ * @dock: to dock, or undock - that is the question</div><div class='add'>+ *</div><div class='add'>+ * Execute the _DCK method in response to an acpi event</div><div class='add'>+ */</div><div class='add'>+static void handle_dock(struct dock_station *ds, int dock)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	struct acpi_object_list arg_list;</div><div class='add'>+	union acpi_object arg;</div><div class='add'>+	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+	struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='add'>+	union acpi_object *obj;</div><div class='add'>+</div><div class='add'>+	acpi_get_name(ds-&gt;handle, ACPI_FULL_PATHNAME, &amp;name_buffer);</div><div class='add'>+	obj = name_buffer.pointer;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PREFIX "%s\n", dock ? "docking" : "undocking");</div><div class='add'>+</div><div class='add'>+	/* _DCK method has one argument */</div><div class='add'>+	arg_list.count = 1;</div><div class='add'>+	arg_list.pointer = &amp;arg;</div><div class='add'>+	arg.type = ACPI_TYPE_INTEGER;</div><div class='add'>+	arg.integer.value = dock;</div><div class='add'>+	status = acpi_evaluate_object(ds-&gt;handle, "_DCK", &amp;arg_list, &amp;buffer);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		pr_debug("%s: failed to execute _DCK\n", obj-&gt;string.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='add'>+	kfree(name_buffer.pointer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dock(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	handle_dock(ds, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void undock(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	handle_dock(ds, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void begin_dock(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	ds-&gt;flags |= DOCK_DOCKING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void complete_dock(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	ds-&gt;flags &amp;= ~(DOCK_DOCKING);</div><div class='add'>+	ds-&gt;last_dock_time = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_in_progress - see if we are in the middle of handling a dock event</div><div class='add'>+ * @ds: the dock station</div><div class='add'>+ *</div><div class='add'>+ * Sometimes while docking, false dock events can be sent to the driver</div><div class='add'>+ * because good connections aren't made or some other reason.  Ignore these</div><div class='add'>+ * if we are in the middle of doing something.</div><div class='add'>+ */</div><div class='add'>+static int dock_in_progress(struct dock_station *ds)</div><div class='add'>+{</div><div class='add'>+	if ((ds-&gt;flags &amp; DOCK_DOCKING) ||</div><div class='add'>+	    time_before(jiffies, (ds-&gt;last_dock_time + HZ)))</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * register_dock_notifier - add yourself to the dock notifier list</div><div class='add'>+ * @nb: the callers notifier block</div><div class='add'>+ *</div><div class='add'>+ * If a driver wishes to be notified about dock events, they can</div><div class='add'>+ * use this function to put a notifier block on the dock notifier list.</div><div class='add'>+ * this notifier call chain will be called after a dock event, but</div><div class='add'>+ * before hotplugging any new devices.</div><div class='add'>+ */</div><div class='add'>+int register_dock_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return atomic_notifier_chain_register(&amp;dock_notifier_list, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(register_dock_notifier);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * unregister_dock_notifier - remove yourself from the dock notifier list</div><div class='add'>+ * @nb: the callers notifier block</div><div class='add'>+ */</div><div class='add'>+void unregister_dock_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	atomic_notifier_chain_unregister(&amp;dock_notifier_list, nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(unregister_dock_notifier);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * register_hotplug_dock_device - register a hotplug function</div><div class='add'>+ * @handle: the handle of the device</div><div class='add'>+ * @handler: the acpi_notifier_handler to call after docking</div><div class='add'>+ * @context: device specific data</div><div class='add'>+ *</div><div class='add'>+ * If a driver would like to perform a hotplug operation after a dock</div><div class='add'>+ * event, they can register an acpi_notifiy_handler to be called by</div><div class='add'>+ * the dock driver after _DCK is executed.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+register_hotplug_dock_device(acpi_handle handle, acpi_notify_handler handler,</div><div class='add'>+			     void *context)</div><div class='add'>+{</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	if (!dock_station)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * make sure this handle is for a device dependent on the dock,</div><div class='add'>+	 * this would include the dock station itself</div><div class='add'>+	 */</div><div class='add'>+	dd = find_dock_dependent_device(dock_station, handle);</div><div class='add'>+	if (dd) {</div><div class='add'>+		dd-&gt;handler = handler;</div><div class='add'>+		dd-&gt;context = context;</div><div class='add'>+		dock_add_hotplug_device(dock_station, dd);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(register_hotplug_dock_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * unregister_hotplug_dock_device - remove yourself from the hotplug list</div><div class='add'>+ * @handle: the acpi handle of the device</div><div class='add'>+ */</div><div class='add'>+void unregister_hotplug_dock_device(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	if (!dock_station)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dd = find_dock_dependent_device(dock_station, handle);</div><div class='add'>+	if (dd)</div><div class='add'>+		dock_del_hotplug_device(dock_station, dd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_notify - act upon an acpi dock notification</div><div class='add'>+ * @handle: the dock station handle</div><div class='add'>+ * @event: the acpi event</div><div class='add'>+ * @data: our driver data struct</div><div class='add'>+ *</div><div class='add'>+ * If we are notified to dock, then check to see if the dock is</div><div class='add'>+ * present and then dock.  Notify all drivers of the dock event,</div><div class='add'>+ * and then hotplug and devices that may need hotplugging.  For undock</div><div class='add'>+ * check to make sure the dock device is still present, then undock</div><div class='add'>+ * and hotremove all the devices that may need removing.</div><div class='add'>+ */</div><div class='add'>+static void dock_notify(acpi_handle handle, u32 event, void *data)</div><div class='add'>+{</div><div class='add'>+	struct dock_station *ds = (struct dock_station *)data;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case ACPI_NOTIFY_BUS_CHECK:</div><div class='add'>+		if (!dock_in_progress(ds) &amp;&amp; dock_present(ds)) {</div><div class='add'>+			begin_dock(ds);</div><div class='add'>+			dock(ds);</div><div class='add'>+			if (!dock_present(ds)) {</div><div class='add'>+				printk(KERN_ERR PREFIX "Unable to dock!\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			atomic_notifier_call_chain(&amp;dock_notifier_list,</div><div class='add'>+						   event, NULL);</div><div class='add'>+			hotplug_dock_devices(ds, event);</div><div class='add'>+			complete_dock(ds);</div><div class='add'>+			dock_event(ds, event, DOCK_EVENT);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ACPI_NOTIFY_DEVICE_CHECK:</div><div class='add'>+	/*</div><div class='add'>+         * According to acpi spec 3.0a, if a DEVICE_CHECK notification</div><div class='add'>+         * is sent and _DCK is present, it is assumed to mean an</div><div class='add'>+         * undock request.  This notify routine will only be called</div><div class='add'>+         * for objects defining _DCK, so we will fall through to eject</div><div class='add'>+         * request here.  However, we will pass an eject request through</div><div class='add'>+	 * to the driver who wish to hotplug.</div><div class='add'>+         */</div><div class='add'>+	case ACPI_NOTIFY_EJECT_REQUEST:</div><div class='add'>+		if (!dock_in_progress(ds) &amp;&amp; dock_present(ds)) {</div><div class='add'>+			/*</div><div class='add'>+			 * here we need to generate the undock</div><div class='add'>+			 * event prior to actually doing the undock</div><div class='add'>+			 * so that the device struct still exists.</div><div class='add'>+			 */</div><div class='add'>+			dock_event(ds, event, UNDOCK_EVENT);</div><div class='add'>+			hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);</div><div class='add'>+			undock(ds);</div><div class='add'>+			eject_dock(ds);</div><div class='add'>+			if (dock_present(ds))</div><div class='add'>+				printk(KERN_ERR PREFIX "Unable to undock!\n");</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR PREFIX "Unknown dock event %d\n", event);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * find_dock_devices - find devices on the dock station</div><div class='add'>+ * @handle: the handle of the device we are examining</div><div class='add'>+ * @lvl: unused</div><div class='add'>+ * @context: the dock station private data</div><div class='add'>+ * @rv: unused</div><div class='add'>+ *</div><div class='add'>+ * This function is called by acpi_walk_namespace.  It will</div><div class='add'>+ * check to see if an object has an _EJD method.  If it does, then it</div><div class='add'>+ * will see if it is dependent on the dock station.</div><div class='add'>+ */</div><div class='add'>+static acpi_status</div><div class='add'>+find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	acpi_handle tmp;</div><div class='add'>+	struct dock_station *ds = (struct dock_station *)context;</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	status = acpi_bus_get_ejd(handle, &amp;tmp);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return AE_OK;</div><div class='add'>+</div><div class='add'>+	if (tmp == ds-&gt;handle) {</div><div class='add'>+		dd = alloc_dock_dependent_device(handle);</div><div class='add'>+		if (dd)</div><div class='add'>+			add_dock_dependent_device(ds, dd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_add - add a new dock station</div><div class='add'>+ * @handle: the dock station handle</div><div class='add'>+ *</div><div class='add'>+ * allocated and initialize a new dock station device.  Find all devices</div><div class='add'>+ * that are on the dock station, and register for dock event notifications.</div><div class='add'>+ */</div><div class='add'>+static int dock_add(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	acpi_status status;</div><div class='add'>+	struct dock_dependent_device *dd;</div><div class='add'>+</div><div class='add'>+	/* allocate &amp; initialize the dock_station private data */</div><div class='add'>+	dock_station = kzalloc(sizeof(*dock_station), GFP_KERNEL);</div><div class='add'>+	if (!dock_station)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dock_station-&gt;handle = handle;</div><div class='add'>+	dock_station-&gt;last_dock_time = jiffies - HZ;</div><div class='add'>+	INIT_LIST_HEAD(&amp;dock_station-&gt;dependent_devices);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dock_station-&gt;hotplug_devices);</div><div class='add'>+	spin_lock_init(&amp;dock_station-&gt;dd_lock);</div><div class='add'>+	spin_lock_init(&amp;dock_station-&gt;hp_lock);</div><div class='add'>+	ATOMIC_INIT_NOTIFIER_HEAD(&amp;dock_notifier_list);</div><div class='add'>+</div><div class='add'>+	/* Find dependent devices */</div><div class='add'>+	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,</div><div class='add'>+			    ACPI_UINT32_MAX, find_dock_devices, dock_station,</div><div class='add'>+			    NULL);</div><div class='add'>+</div><div class='add'>+	/* add the dock station as a device dependent on itself */</div><div class='add'>+	dd = alloc_dock_dependent_device(handle);</div><div class='add'>+	if (!dd) {</div><div class='add'>+		kfree(dock_station);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	add_dock_dependent_device(dock_station, dd);</div><div class='add'>+</div><div class='add'>+	/* register for dock events */</div><div class='add'>+	status = acpi_install_notify_handler(dock_station-&gt;handle,</div><div class='add'>+					     ACPI_SYSTEM_NOTIFY,</div><div class='add'>+					     dock_notify, dock_station);</div><div class='add'>+</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		printk(KERN_ERR PREFIX "Error installing notify handler\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto dock_add_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_NAME);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dock_add_err:</div><div class='add'>+	kfree(dock_station);</div><div class='add'>+	kfree(dd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dock_remove - free up resources related to the dock station</div><div class='add'>+ */</div><div class='add'>+static int dock_remove(void)</div><div class='add'>+{</div><div class='add'>+	struct dock_dependent_device *dd, *tmp;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	if (!dock_station)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* remove dependent devices */</div><div class='add'>+	list_for_each_entry_safe(dd, tmp, &amp;dock_station-&gt;dependent_devices,</div><div class='add'>+				 list)</div><div class='add'>+	    kfree(dd);</div><div class='add'>+</div><div class='add'>+	/* remove dock notify handler */</div><div class='add'>+	status = acpi_remove_notify_handler(dock_station-&gt;handle,</div><div class='add'>+					    ACPI_SYSTEM_NOTIFY,</div><div class='add'>+					    dock_notify);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		printk(KERN_ERR "Error removing notify handler\n");</div><div class='add'>+</div><div class='add'>+	/* free dock station memory */</div><div class='add'>+	kfree(dock_station);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * find_dock - look for a dock station</div><div class='add'>+ * @handle: acpi handle of a device</div><div class='add'>+ * @lvl: unused</div><div class='add'>+ * @context: counter of dock stations found</div><div class='add'>+ * @rv: unused</div><div class='add'>+ *</div><div class='add'>+ * This is called by acpi_walk_namespace to look for dock stations.</div><div class='add'>+ */</div><div class='add'>+static acpi_status</div><div class='add'>+find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='add'>+{</div><div class='add'>+	int *count = (int *)context;</div><div class='add'>+	acpi_status status = AE_OK;</div><div class='add'>+</div><div class='add'>+	if (is_dock(handle)) {</div><div class='add'>+		if (dock_add(handle) &gt;= 0) {</div><div class='add'>+			(*count)++;</div><div class='add'>+			status = AE_CTRL_TERMINATE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init dock_init(void)</div><div class='add'>+{</div><div class='add'>+	int num = 0;</div><div class='add'>+</div><div class='add'>+	dock_station = NULL;</div><div class='add'>+</div><div class='add'>+	/* look for a dock station */</div><div class='add'>+	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,</div><div class='add'>+			    ACPI_UINT32_MAX, find_dock, &amp;num, NULL);</div><div class='add'>+</div><div class='add'>+	if (!num)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit dock_exit(void)</div><div class='add'>+{</div><div class='add'>+	dock_remove();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+postcore_initcall(dock_init);</div><div class='add'>+module_exit(dock_exit);</div><div class='head'>diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c<br/>index eee0864ba300..e5d796362854 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/ec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/ec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/ec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/ec.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@ union acpi_ec {</div><div class='ctx'> 		struct acpi_generic_address command_addr;</div><div class='ctx'> 		struct acpi_generic_address data_addr;</div><div class='ctx'> 		unsigned long global_lock;</div><div class='del'>-		spinlock_t lock;</div><div class='add'>+		struct semaphore sem;</div><div class='ctx'> 	} poll;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -207,16 +207,15 @@ static int acpi_ec_intr_wait(union acpi_ec *ec, unsigned int event)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_wait");</div><div class='ctx'> </div><div class='ctx'> 	ec-&gt;intr.expect_event = event;</div><div class='ctx'> 	smp_mb();</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_EC_EVENT_IBE:</div><div class='del'>-		if (~acpi_ec_read_status(ec) &amp; event) {</div><div class='add'>+		if (~acpi_ec_read_status(ec) &amp; ACPI_EC_FLAG_IBF) {</div><div class='ctx'> 			ec-&gt;intr.expect_event = 0;</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -238,16 +237,16 @@ static int acpi_ec_intr_wait(union acpi_ec *ec, unsigned int event)</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_EC_EVENT_OBF:</div><div class='ctx'> 		if (acpi_ec_read_status(ec) &amp; ACPI_EC_FLAG_OBF)</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_EC_EVENT_IBE:</div><div class='ctx'> 		if (~acpi_ec_read_status(ec) &amp; ACPI_EC_FLAG_IBF)</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(-ETIME);</div><div class='add'>+	return -ETIME;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='hunk'>@@ -260,7 +259,6 @@ int acpi_ec_enter_burst_mode(union acpi_ec *ec)</div><div class='ctx'> 	u32 tmp = 0;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_enter_burst_mode");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ec_read_status(ec);</div><div class='ctx'> 	if (status != -EINVAL &amp;&amp; !(status &amp; ACPI_EC_FLAG_BURST)) {</div><div class='hunk'>@@ -272,22 +270,21 @@ int acpi_ec_enter_burst_mode(union acpi_ec *ec)</div><div class='ctx'> 		status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);</div><div class='ctx'> 		acpi_hw_low_level_read(8, &amp;tmp, &amp;ec-&gt;common.data_addr);</div><div class='ctx'> 		if (tmp != 0x90) {	/* Burst ACK byte */</div><div class='del'>-			return_VALUE(-EINVAL);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;ec-&gt;intr.leaving_burst, 0);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'>       end:</div><div class='del'>-	printk(KERN_WARNING PREFIX "Error in acpi_ec_wait\n");</div><div class='del'>-	return_VALUE(-1);</div><div class='add'>+	ACPI_EXCEPTION ((AE_INFO, status, "EC wait, burst mode");</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_ec_leave_burst_mode(union acpi_ec *ec)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_leave_burst_mode");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ec_read_status(ec);</div><div class='ctx'> 	if (status != -EINVAL &amp;&amp; (status &amp; ACPI_EC_FLAG_BURST)){</div><div class='hunk'>@@ -298,10 +295,10 @@ int acpi_ec_leave_burst_mode(union acpi_ec *ec)</div><div class='ctx'> 		acpi_ec_wait(ec, ACPI_EC_FLAG_IBF);</div><div class='ctx'> 	} </div><div class='ctx'> 	atomic_set(&amp;ec-&gt;intr.leaving_burst, 1);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> end:</div><div class='del'>-	printk(KERN_WARNING PREFIX "leave burst_mode:error\n");</div><div class='del'>-	return_VALUE(-1);</div><div class='add'>+	ACPI_EXCEPTION((AE_INFO, status, "EC leave burst mode");</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> #endif /* ACPI_FUTURE_USAGE */</div><div class='ctx'> </div><div class='hunk'>@@ -323,24 +320,25 @@ static int acpi_ec_poll_read(union acpi_ec *ec, u8 address, u32 * data)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	int result = 0;</div><div class='del'>-	unsigned long flags = 0;</div><div class='ctx'> 	u32 glk = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_read");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec || !data)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;common.global_lock) {</div><div class='ctx'> 		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &amp;glk);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ec-&gt;poll.lock, flags);</div><div class='del'>-</div><div class='add'>+	if (down_interruptible(&amp;ec-&gt;poll.sem)) {</div><div class='add'>+		result = -ERESTARTSYS;</div><div class='add'>+		goto end_nosem;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='ctx'> 	acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ,</div><div class='ctx'> 				&amp;ec-&gt;common.command_addr);</div><div class='ctx'> 	result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);</div><div class='hunk'>@@ -358,34 +356,35 @@ static int acpi_ec_poll_read(union acpi_ec *ec, u8 address, u32 * data)</div><div class='ctx'> 			  *data, address));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	spin_unlock_irqrestore(&amp;ec-&gt;poll.lock, flags);</div><div class='del'>-</div><div class='add'>+	up(&amp;ec-&gt;poll.sem);</div><div class='add'>+end_nosem:</div><div class='ctx'> 	if (ec-&gt;common.global_lock)</div><div class='ctx'> 		acpi_release_global_lock(glk);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_poll_write(union acpi_ec *ec, u8 address, u8 data)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='del'>-	unsigned long flags = 0;</div><div class='ctx'> 	u32 glk = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_write");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;common.global_lock) {</div><div class='ctx'> 		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &amp;glk);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ec-&gt;poll.lock, flags);</div><div class='del'>-</div><div class='add'>+	if (down_interruptible(&amp;ec-&gt;poll.sem)) {</div><div class='add'>+		result = -ERESTARTSYS;</div><div class='add'>+		goto end_nosem;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='ctx'> 	acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE,</div><div class='ctx'> 				&amp;ec-&gt;common.command_addr);</div><div class='ctx'> 	result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);</div><div class='hunk'>@@ -406,12 +405,12 @@ static int acpi_ec_poll_write(union acpi_ec *ec, u8 address, u8 data)</div><div class='ctx'> 			  data, address));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	spin_unlock_irqrestore(&amp;ec-&gt;poll.lock, flags);</div><div class='del'>-</div><div class='add'>+	up(&amp;ec-&gt;poll.sem);</div><div class='add'>+end_nosem:</div><div class='ctx'> 	if (ec-&gt;common.global_lock)</div><div class='ctx'> 		acpi_release_global_lock(glk);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data)</div><div class='hunk'>@@ -419,17 +418,16 @@ static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	u32 glk;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_read");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec || !data)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;common.global_lock) {</div><div class='ctx'> 		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &amp;glk);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='hunk'>@@ -463,7 +461,7 @@ static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data)</div><div class='ctx'> 	if (ec-&gt;common.global_lock)</div><div class='ctx'> 		acpi_release_global_lock(glk);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data)</div><div class='hunk'>@@ -471,15 +469,14 @@ static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	u32 glk;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_write");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;common.global_lock) {</div><div class='ctx'> 		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &amp;glk);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='hunk'>@@ -512,7 +509,7 @@ static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data)</div><div class='ctx'> 	if (ec-&gt;common.global_lock)</div><div class='ctx'> 		acpi_release_global_lock(glk);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -568,20 +565,18 @@ static int acpi_ec_poll_query(union acpi_ec *ec, u32 * data)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='del'>-	unsigned long flags = 0;</div><div class='ctx'> 	u32 glk = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_query");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec || !data)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;common.global_lock) {</div><div class='ctx'> 		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &amp;glk);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -589,8 +584,11 @@ static int acpi_ec_poll_query(union acpi_ec *ec, u32 * data)</div><div class='ctx'> 	 * Note that successful completion of the query causes the ACPI_EC_SCI</div><div class='ctx'> 	 * bit to be cleared (and thus clearing the interrupt source).</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;ec-&gt;poll.lock, flags);</div><div class='del'>-</div><div class='add'>+	if (down_interruptible(&amp;ec-&gt;poll.sem)) {</div><div class='add'>+		result = -ERESTARTSYS;</div><div class='add'>+		goto end_nosem;</div><div class='add'>+	}</div><div class='add'>+	</div><div class='ctx'> 	acpi_hw_low_level_write(8, ACPI_EC_COMMAND_QUERY,</div><div class='ctx'> 				&amp;ec-&gt;common.command_addr);</div><div class='ctx'> 	result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);</div><div class='hunk'>@@ -602,28 +600,27 @@ static int acpi_ec_poll_query(union acpi_ec *ec, u32 * data)</div><div class='ctx'> 		result = -ENODATA;</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	spin_unlock_irqrestore(&amp;ec-&gt;poll.lock, flags);</div><div class='del'>-</div><div class='add'>+	up(&amp;ec-&gt;poll.sem);</div><div class='add'>+end_nosem:</div><div class='ctx'> 	if (ec-&gt;common.global_lock)</div><div class='ctx'> 		acpi_release_global_lock(glk);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	u32 glk;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_query");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec || !data)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;common.global_lock) {</div><div class='ctx'> 		status = acpi_acquire_global_lock(ACPI_EC_UDELAY_GLK, &amp;glk);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;ec-&gt;intr.sem);</div><div class='hunk'>@@ -656,7 +653,7 @@ static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data)</div><div class='ctx'> 	if (ec-&gt;common.global_lock)</div><div class='ctx'> 		acpi_release_global_lock(glk);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -680,20 +677,20 @@ static void acpi_ec_gpe_poll_query(void *ec_cxt)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_ec *ec = (union acpi_ec *)ec_cxt;</div><div class='ctx'> 	u32 value = 0;</div><div class='del'>-	unsigned long flags = 0;</div><div class='ctx'> 	static char object_name[5] = { '_', 'Q', '0', '0', '\0' };</div><div class='ctx'> 	const char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7',</div><div class='ctx'> 		'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_gpe_query");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec_cxt)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ec-&gt;poll.lock, flags);</div><div class='add'>+	if (down_interruptible (&amp;ec-&gt;poll.sem)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	acpi_hw_low_level_read(8, &amp;value, &amp;ec-&gt;common.command_addr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ec-&gt;poll.lock, flags);</div><div class='add'>+	up(&amp;ec-&gt;poll.sem);</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Implement asynch events!</div><div class='ctx'> 	 * NOTE: All we care about are EC-SCI's.  Other EC events are</div><div class='hunk'>@@ -727,7 +724,6 @@ static void acpi_ec_gpe_intr_query(void *ec_cxt)</div><div class='ctx'> 		'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_gpe_query");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_ec_read_status(ec) &amp; ACPI_EC_FLAG_SCI)</div><div class='ctx'> 		result = acpi_ec_query(ec, &amp;value);</div><div class='hunk'>@@ -763,8 +759,7 @@ static u32 acpi_ec_gpe_poll_handler(void *data)</div><div class='ctx'> </div><div class='ctx'> 	acpi_disable_gpe(NULL, ec-&gt;common.gpe_bit, ACPI_ISR);</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,</div><div class='del'>-					     acpi_ec_gpe_query, ec);</div><div class='add'>+	status = acpi_os_execute(OSL_EC_POLL_HANDLER, acpi_ec_gpe_query, ec);</div><div class='ctx'> </div><div class='ctx'> 	if (status == AE_OK)</div><div class='ctx'> 		return ACPI_INTERRUPT_HANDLED;</div><div class='hunk'>@@ -787,19 +782,22 @@ static u32 acpi_ec_gpe_intr_handler(void *data)</div><div class='ctx'> 	case ACPI_EC_EVENT_OBF:</div><div class='ctx'> 		if (!(value &amp; ACPI_EC_FLAG_OBF))</div><div class='ctx'> 			break;</div><div class='add'>+		ec-&gt;intr.expect_event = 0;</div><div class='add'>+		wake_up(&amp;ec-&gt;intr.wait);</div><div class='add'>+		break;</div><div class='ctx'> 	case ACPI_EC_EVENT_IBE:</div><div class='ctx'> 		if ((value &amp; ACPI_EC_FLAG_IBF))</div><div class='ctx'> 			break;</div><div class='ctx'> 		ec-&gt;intr.expect_event = 0;</div><div class='ctx'> 		wake_up(&amp;ec-&gt;intr.wait);</div><div class='del'>-		return ACPI_INTERRUPT_HANDLED;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (value &amp; ACPI_EC_FLAG_SCI) {</div><div class='ctx'> 		atomic_add(1, &amp;ec-&gt;intr.pending_gpe);</div><div class='del'>-		status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,</div><div class='add'>+		status = acpi_os_execute(OSL_EC_BURST_HANDLER,</div><div class='ctx'> 						     acpi_ec_gpe_query, ec);</div><div class='ctx'> 		return status == AE_OK ?</div><div class='ctx'> 		    ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;</div><div class='hunk'>@@ -840,15 +838,14 @@ acpi_ec_space_handler(u32 function,</div><div class='ctx'> 	acpi_integer f_v = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_space_handler");</div><div class='ctx'> </div><div class='ctx'> 	if ((address &gt; 0xFF) || !value || !handler_context)</div><div class='del'>-		return_VALUE(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	if (bit_width != 8 &amp;&amp; acpi_strict) {</div><div class='ctx'> 		printk(KERN_WARNING PREFIX</div><div class='ctx'> 		       "acpi_ec_space_handler: bit_width should be 8\n");</div><div class='del'>-		return_VALUE(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ec = (union acpi_ec *)handler_context;</div><div class='hunk'>@@ -887,16 +884,16 @@ acpi_ec_space_handler(u32 function,</div><div class='ctx'>       out:</div><div class='ctx'> 	switch (result) {</div><div class='ctx'> 	case -EINVAL:</div><div class='del'>-		return_VALUE(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ENODEV:</div><div class='del'>-		return_VALUE(AE_NOT_FOUND);</div><div class='add'>+		return AE_NOT_FOUND;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ETIME:</div><div class='del'>-		return_VALUE(AE_TIME);</div><div class='add'>+		return AE_TIME;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return_VALUE(AE_OK);</div><div class='add'>+		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -910,7 +907,6 @@ static int acpi_ec_read_info(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_ec *ec = (union acpi_ec *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_read_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!ec)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -925,7 +921,7 @@ static int acpi_ec_read_info(struct seq_file *seq, void *offset)</div><div class='ctx'> 	acpi_enable_gpe(NULL, ec-&gt;common.gpe_bit, ACPI_NOT_ISR);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -933,7 +929,7 @@ static int acpi_ec_info_open_fs(struct inode *inode, struct file *file)</div><div class='ctx'> 	return single_open(file, acpi_ec_read_info, PDE(inode)-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_ec_info_ops = {</div><div class='add'>+static const struct file_operations acpi_ec_info_ops = {</div><div class='ctx'> 	.open = acpi_ec_info_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -945,33 +941,29 @@ static int acpi_ec_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_ec_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	entry = create_proc_entry(ACPI_EC_FILE_INFO, S_IRUGO,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_EC_FILE_INFO));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_ec_info_ops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_EC_FILE_INFO, acpi_device_dir(device));</div><div class='hunk'>@@ -979,7 +971,7 @@ static int acpi_ec_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -991,21 +983,19 @@ static int acpi_ec_poll_add(struct acpi_device *device)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_ec *ec = NULL;</div><div class='del'>-	unsigned long uid;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ec = kmalloc(sizeof(union acpi_ec), GFP_KERNEL);</div><div class='ctx'> 	if (!ec)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(ec, 0, sizeof(union acpi_ec));</div><div class='ctx'> </div><div class='ctx'> 	ec-&gt;common.handle = device-&gt;handle;</div><div class='ctx'> 	ec-&gt;common.uid = -1;</div><div class='del'>-	spin_lock_init(&amp;ec-&gt;poll.lock);</div><div class='add'>+	init_MUTEX(&amp;ec-&gt;poll.sem);</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_EC_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = ec;</div><div class='hunk'>@@ -1014,10 +1004,9 @@ static int acpi_ec_poll_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_evaluate_integer(ec-&gt;common.handle, "_GLK", NULL,</div><div class='ctx'> 			      &amp;ec-&gt;common.global_lock);</div><div class='ctx'> </div><div class='del'>-	/* If our UID matches the UID for the ECDT-enumerated EC,</div><div class='del'>-	   we now have the *real* EC info, so kill the makeshift one. */</div><div class='del'>-	acpi_evaluate_integer(ec-&gt;common.handle, "_UID", NULL, &amp;uid);</div><div class='del'>-	if (ec_ecdt &amp;&amp; ec_ecdt-&gt;common.uid == uid) {</div><div class='add'>+	/* XXX we don't test uids, because on some boxes ecdt uid = 0, see:</div><div class='add'>+	   http://bugzilla.kernel.org/show_bug.cgi?id=6111 */</div><div class='add'>+	if (ec_ecdt) {</div><div class='ctx'> 		acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,</div><div class='ctx'> 						  ACPI_ADR_SPACE_EC,</div><div class='ctx'> 						  &amp;acpi_ec_space_handler);</div><div class='hunk'>@@ -1034,8 +1023,7 @@ static int acpi_ec_poll_add(struct acpi_device *device)</div><div class='ctx'> 	    acpi_evaluate_integer(ec-&gt;common.handle, "_GPE", NULL,</div><div class='ctx'> 				  &amp;ec-&gt;common.gpe_bit);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error obtaining GPE bit assignment\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Obtaining GPE bit"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1055,23 +1043,21 @@ static int acpi_ec_poll_add(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		kfree(ec);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> static int acpi_ec_intr_add(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_ec *ec = NULL;</div><div class='del'>-	unsigned long uid;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ec = kmalloc(sizeof(union acpi_ec), GFP_KERNEL);</div><div class='ctx'> 	if (!ec)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(ec, 0, sizeof(union acpi_ec));</div><div class='ctx'> </div><div class='ctx'> 	ec-&gt;common.handle = device-&gt;handle;</div><div class='hunk'>@@ -1088,10 +1074,9 @@ static int acpi_ec_intr_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_evaluate_integer(ec-&gt;common.handle, "_GLK", NULL,</div><div class='ctx'> 			      &amp;ec-&gt;common.global_lock);</div><div class='ctx'> </div><div class='del'>-	/* If our UID matches the UID for the ECDT-enumerated EC,</div><div class='del'>-	   we now have the *real* EC info, so kill the makeshift one. */</div><div class='del'>-	acpi_evaluate_integer(ec-&gt;common.handle, "_UID", NULL, &amp;uid);</div><div class='del'>-	if (ec_ecdt &amp;&amp; ec_ecdt-&gt;common.uid == uid) {</div><div class='add'>+	/* XXX we don't test uids, because on some boxes ecdt uid = 0, see:</div><div class='add'>+	   http://bugzilla.kernel.org/show_bug.cgi?id=6111 */</div><div class='add'>+	if (ec_ecdt) {</div><div class='ctx'> 		acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,</div><div class='ctx'> 						  ACPI_ADR_SPACE_EC,</div><div class='ctx'> 						  &amp;acpi_ec_space_handler);</div><div class='hunk'>@@ -1108,8 +1093,7 @@ static int acpi_ec_intr_add(struct acpi_device *device)</div><div class='ctx'> 	    acpi_evaluate_integer(ec-&gt;common.handle, "_GPE", NULL,</div><div class='ctx'> 				  &amp;ec-&gt;common.gpe_bit);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error obtaining GPE bit assignment\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Obtaining GPE bit assignment\n");</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1129,17 +1113,16 @@ static int acpi_ec_intr_add(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		kfree(ec);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_remove(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_ec *ec = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ec = acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -1147,7 +1130,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)</div><div class='ctx'> </div><div class='ctx'> 	kfree(ec);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -1186,15 +1169,14 @@ static int acpi_ec_start(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_ec *ec = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_start");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ec = acpi_driver_data(device);</div><div class='ctx'> </div><div class='ctx'> 	if (!ec)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get I/O port addresses. Convert to GAS format.</div><div class='hunk'>@@ -1203,9 +1185,8 @@ static int acpi_ec_start(struct acpi_device *device)</div><div class='ctx'> 				     acpi_ec_io_ports, ec);</div><div class='ctx'> 	if (ACPI_FAILURE(status)</div><div class='ctx'> 	    || ec-&gt;common.command_addr.register_bit_width == 0) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error getting I/O port addresses"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_ERR PREFIX "Error getting I/O port addresses\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ec-&gt;common.status_addr = ec-&gt;common.command_addr;</div><div class='hunk'>@@ -1222,7 +1203,7 @@ static int acpi_ec_start(struct acpi_device *device)</div><div class='ctx'> 					  ACPI_GPE_EDGE_TRIGGERED,</div><div class='ctx'> 					  &amp;acpi_ec_gpe_handler, ec);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	acpi_set_gpe_type(NULL, ec-&gt;common.gpe_bit, ACPI_GPE_TYPE_RUNTIME);</div><div class='ctx'> 	acpi_enable_gpe(NULL, ec-&gt;common.gpe_bit, ACPI_NOT_ISR);</div><div class='hunk'>@@ -1234,10 +1215,10 @@ static int acpi_ec_start(struct acpi_device *device)</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		acpi_remove_gpe_handler(NULL, ec-&gt;common.gpe_bit,</div><div class='ctx'> 					&amp;acpi_ec_gpe_handler);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_ec_stop(struct acpi_device *device, int type)</div><div class='hunk'>@@ -1245,10 +1226,9 @@ static int acpi_ec_stop(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_ec *ec = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_stop");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ec = acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -1256,15 +1236,15 @@ static int acpi_ec_stop(struct acpi_device *device, int type)</div><div class='ctx'> 						   ACPI_ADR_SPACE_EC,</div><div class='ctx'> 						   &amp;acpi_ec_space_handler);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='ctx'> 	    acpi_remove_gpe_handler(NULL, ec-&gt;common.gpe_bit,</div><div class='ctx'> 				    &amp;acpi_ec_gpe_handler);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status __init</div><div class='hunk'>@@ -1300,7 +1280,7 @@ acpi_fake_ecdt_poll_callback(acpi_handle handle,</div><div class='ctx'> 				  &amp;ec_ecdt-&gt;common.gpe_bit);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		return status;</div><div class='del'>-	spin_lock_init(&amp;ec_ecdt-&gt;poll.lock);</div><div class='add'>+	init_MUTEX(&amp;ec_ecdt-&gt;poll.sem);</div><div class='ctx'> 	ec_ecdt-&gt;common.global_lock = TRUE;</div><div class='ctx'> 	ec_ecdt-&gt;common.handle = handle;</div><div class='ctx'> </div><div class='hunk'>@@ -1416,7 +1396,7 @@ static int __init acpi_ec_poll_get_real_ecdt(void)</div><div class='ctx'> 	ec_ecdt-&gt;common.status_addr = ecdt_ptr-&gt;ec_control;</div><div class='ctx'> 	ec_ecdt-&gt;common.data_addr = ecdt_ptr-&gt;ec_data;</div><div class='ctx'> 	ec_ecdt-&gt;common.gpe_bit = ecdt_ptr-&gt;gpe_bit;</div><div class='del'>-	spin_lock_init(&amp;ec_ecdt-&gt;poll.lock);</div><div class='add'>+	init_MUTEX(&amp;ec_ecdt-&gt;poll.sem);</div><div class='ctx'> 	/* use the GL just to be safe */</div><div class='ctx'> 	ec_ecdt-&gt;common.global_lock = TRUE;</div><div class='ctx'> 	ec_ecdt-&gt;common.uid = ecdt_ptr-&gt;uid;</div><div class='hunk'>@@ -1534,23 +1514,22 @@ static int __init acpi_ec_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_ec_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Now register the driver for the EC */</div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_ec_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_ec_init);</div><div class='hunk'>@@ -1559,13 +1538,12 @@ subsys_initcall(acpi_ec_init);</div><div class='ctx'> #if 0</div><div class='ctx'> static void __exit acpi_ec_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ec_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_ec_driver);</div><div class='ctx'> </div><div class='ctx'> 	remove_proc_entry(ACPI_EC_CLASS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> #endif				/* 0 */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c<br/>index 2dbb1b0f11d5..959a893c8d1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/event.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/event.c</a></div><div class='hunk'>@@ -48,18 +48,17 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count,</div><div class='ctx'> 	static int chars_remaining = 0;</div><div class='ctx'> 	static char *ptr;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_system_read_event");</div><div class='ctx'> </div><div class='ctx'> 	if (!chars_remaining) {</div><div class='ctx'> 		memset(&amp;event, 0, sizeof(struct acpi_bus_event));</div><div class='ctx'> </div><div class='ctx'> 		if ((file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 		    &amp;&amp; (list_empty(&amp;acpi_bus_event_list)))</div><div class='del'>-			return_VALUE(-EAGAIN);</div><div class='add'>+			return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 		result = acpi_bus_receive_event(&amp;event);</div><div class='ctx'> 		if (result)</div><div class='del'>-			return_VALUE(result);</div><div class='add'>+			return result;</div><div class='ctx'> </div><div class='ctx'> 		chars_remaining = sprintf(str, "%s %s %08x %08x\n",</div><div class='ctx'> 					  event.device_class ? event.</div><div class='hunk'>@@ -75,13 +74,13 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(buffer, ptr, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	*ppos += count;</div><div class='ctx'> 	chars_remaining -= count;</div><div class='ctx'> 	ptr += count;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_system_close_event(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -100,7 +99,7 @@ static unsigned int acpi_system_poll_event(struct file *file, poll_table * wait)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_system_event_ops = {</div><div class='add'>+static const struct file_operations acpi_system_event_ops = {</div><div class='ctx'> 	.open = acpi_system_open_event,</div><div class='ctx'> 	.read = acpi_system_read_event,</div><div class='ctx'> 	.release = acpi_system_close_event,</div><div class='hunk'>@@ -112,22 +111,18 @@ static int __init acpi_event_init(void)</div><div class='ctx'> 	struct proc_dir_entry *entry;</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_event_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* 'event' [R] */</div><div class='ctx'> 	entry = create_proc_entry("event", S_IRUSR, acpi_root_dir);</div><div class='ctx'> 	if (entry)</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_system_event_ops;</div><div class='ctx'> 	else {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' proc fs entry\n",</div><div class='del'>-				  "event"));</div><div class='del'>-		error = -EFAULT;</div><div class='add'>+		error = -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(error);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_event_init);</div><div class='head'>diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c<br/>index c9ac05c4685f..919037d6acff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evevent.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evevent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evevent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evevent.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ acpi_status acpi_ev_initialize_events(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_initialize_events");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_initialize_events);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we have ACPI tables */</div><div class='ctx'> </div><div class='hunk'>@@ -118,7 +118,7 @@ acpi_status acpi_ev_install_fadt_gpes(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_fadt_gpes");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_fadt_gpes);</div><div class='ctx'> </div><div class='ctx'> 	/* Namespace must be locked */</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +157,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_xrupt_handlers");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers);</div><div class='ctx'> </div><div class='ctx'> 	/* Install the SCI handler */</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +241,7 @@ u32 acpi_ev_fixed_event_detect(void)</div><div class='ctx'> 	u32 fixed_enable;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ev_fixed_event_detect");</div><div class='add'>+	ACPI_FUNCTION_NAME(ev_fixed_event_detect);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read the fixed feature status and enable registers, as all the cases</div><div class='hunk'>@@ -260,12 +260,14 @@ u32 acpi_ev_fixed_event_detect(void)</div><div class='ctx'> 	 * Check for all possible Fixed Events and dispatch those that are active</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; ACPI_NUM_FIXED_EVENTS; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Both the status and enable bits must be on for this event */</div><div class='ctx'> </div><div class='ctx'> 		if ((fixed_status &amp; acpi_gbl_fixed_event_info[i].</div><div class='ctx'> 		     status_bit_mask)</div><div class='ctx'> 		    &amp;&amp; (fixed_enable &amp; acpi_gbl_fixed_event_info[i].</div><div class='ctx'> 			enable_bit_mask)) {</div><div class='add'>+</div><div class='ctx'> 			/* Found an active (signalled) event */</div><div class='ctx'> </div><div class='ctx'> 			int_status |= acpi_ev_fixed_event_dispatch((u32) i);</div><div class='head'>diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c<br/>index f64f977dd3d5..c76c0583ca6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evgpe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evgpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evgpe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evgpe.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_set_gpe_type");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_set_gpe_type);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate type and update register enable masks */</div><div class='ctx'> </div><div class='hunk'>@@ -115,7 +115,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,</div><div class='ctx'> 	struct acpi_gpe_register_info *gpe_register_info;</div><div class='ctx'> 	u8 register_bit;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_update_gpe_enable_masks");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_update_gpe_enable_masks);</div><div class='ctx'> </div><div class='ctx'> 	gpe_register_info = gpe_event_info-&gt;register_info;</div><div class='ctx'> 	if (!gpe_register_info) {</div><div class='hunk'>@@ -178,7 +178,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_enable_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_enable_gpe);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure HW enable masks are updated */</div><div class='ctx'> </div><div class='hunk'>@@ -207,6 +207,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,</div><div class='ctx'> 		ACPI_SET_BIT(gpe_event_info-&gt;flags, ACPI_GPE_RUN_ENABLED);</div><div class='ctx'> </div><div class='ctx'> 		if (write_to_hardware) {</div><div class='add'>+</div><div class='ctx'> 			/* Clear the GPE (of stale events), then enable it */</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_hw_clear_gpe(gpe_event_info);</div><div class='hunk'>@@ -243,7 +244,7 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_disable_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_disable_gpe);</div><div class='ctx'> </div><div class='ctx'> 	if (!(gpe_event_info-&gt;flags &amp; ACPI_GPE_ENABLE_MASK)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -313,6 +314,7 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,</div><div class='ctx'> 	/* A NULL gpe_block means use the FADT-defined GPE block(s) */</div><div class='ctx'> </div><div class='ctx'> 	if (!gpe_device) {</div><div class='add'>+</div><div class='ctx'> 		/* Examine GPE Block 0 and 1 (These blocks are permanent) */</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; ACPI_MAX_GPE_BLOCKS; i++) {</div><div class='hunk'>@@ -383,7 +385,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> 	acpi_native_uint j;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ev_gpe_detect");</div><div class='add'>+	ACPI_FUNCTION_NAME(ev_gpe_detect);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for the case where there are no GPEs */</div><div class='ctx'> </div><div class='hunk'>@@ -391,9 +393,15 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'> 		return (int_status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * We need to obtain the GPE lock for both the data structs and registers</div><div class='add'>+	 * Note: Not necessary to obtain the hardware lock, since the GPE registers</div><div class='add'>+	 * are owned by the gpe_lock.</div><div class='add'>+	 */</div><div class='add'>+	flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);</div><div class='add'>+</div><div class='ctx'> 	/* Examine all GPE blocks attached to this interrupt level */</div><div class='ctx'> </div><div class='del'>-	flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);</div><div class='ctx'> 	gpe_block = gpe_xrupt_list-&gt;gpe_block_list_head;</div><div class='ctx'> 	while (gpe_block) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -402,6 +410,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'> 		 * Find all currently active GP events.</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (i = 0; i &lt; gpe_block-&gt;register_count; i++) {</div><div class='add'>+</div><div class='ctx'> 			/* Get the next status/enable pair */</div><div class='ctx'> </div><div class='ctx'> 			gpe_register_info = &amp;gpe_block-&gt;register_info[i];</div><div class='hunk'>@@ -437,6 +446,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'> </div><div class='ctx'> 			enabled_status_byte = (u8) (status_reg &amp; enable_reg);</div><div class='ctx'> 			if (!enabled_status_byte) {</div><div class='add'>+</div><div class='ctx'> 				/* No active GPEs in this register, move on */</div><div class='ctx'> </div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -445,6 +455,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'> 			/* Now look at the individual GPEs in this byte register */</div><div class='ctx'> </div><div class='ctx'> 			for (j = 0; j &lt; ACPI_GPE_REGISTER_WIDTH; j++) {</div><div class='add'>+</div><div class='ctx'> 				/* Examine one GPE bit */</div><div class='ctx'> </div><div class='ctx'> 				if (enabled_status_byte &amp;</div><div class='hunk'>@@ -483,9 +494,9 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      None</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Perform the actual execution of a GPE control method.  This</div><div class='del'>- *              function is called from an invocation of acpi_os_queue_for_execution</div><div class='del'>- *              (and therefore does NOT execute at interrupt level) so that</div><div class='add'>+ * DESCRIPTION: Perform the actual execution of a GPE control method. This</div><div class='add'>+ *              function is called from an invocation of acpi_os_execute and</div><div class='add'>+ *              therefore does NOT execute at interrupt level - so that</div><div class='ctx'>  *              the control method itself is not executed in the context of</div><div class='ctx'>  *              an interrupt handler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -494,12 +505,11 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)</div><div class='ctx'> static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_gpe_event_info *gpe_event_info = (void *)context;</div><div class='del'>-	u32 gpe_number = 0;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_gpe_event_info local_gpe_event_info;</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_asynch_execute_gpe_method");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -535,22 +545,35 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((local_gpe_event_info.flags &amp; ACPI_GPE_DISPATCH_MASK) ==</div><div class='ctx'> 	    ACPI_GPE_DISPATCH_METHOD) {</div><div class='del'>-		/*</div><div class='del'>-		 * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the _Lxx/_Exx</div><div class='del'>-		 * control method that corresponds to this GPE</div><div class='del'>-		 */</div><div class='del'>-		info.node = local_gpe_event_info.dispatch.method_node;</div><div class='del'>-		info.parameters =</div><div class='del'>-		    ACPI_CAST_PTR(union acpi_operand_object *, gpe_event_info);</div><div class='del'>-		info.parameter_type = ACPI_PARAM_GPE;</div><div class='ctx'> </div><div class='del'>-		status = acpi_ns_evaluate_by_handle(&amp;info);</div><div class='add'>+		/* Allocate the evaluation information block */</div><div class='add'>+</div><div class='add'>+		info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+		if (!info) {</div><div class='add'>+			status = AE_NO_MEMORY;</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * Invoke the GPE Method (_Lxx, _Exx) i.e., evaluate the _Lxx/_Exx</div><div class='add'>+			 * control method that corresponds to this GPE</div><div class='add'>+			 */</div><div class='add'>+			info-&gt;prefix_node =</div><div class='add'>+			    local_gpe_event_info.dispatch.method_node;</div><div class='add'>+			info-&gt;parameters =</div><div class='add'>+			    ACPI_CAST_PTR(union acpi_operand_object *,</div><div class='add'>+					  gpe_event_info);</div><div class='add'>+			info-&gt;parameter_type = ACPI_PARAM_GPE;</div><div class='add'>+			info-&gt;flags = ACPI_IGNORE_RETURN_VALUE;</div><div class='add'>+</div><div class='add'>+			status = acpi_ns_evaluate(info);</div><div class='add'>+			ACPI_FREE(info);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-					"While evaluating method [%4.4s] for GPE[%2X]",</div><div class='add'>+					"While evaluating GPE method [%4.4s]",</div><div class='ctx'> 					acpi_ut_get_node_name</div><div class='ctx'> 					(local_gpe_event_info.dispatch.</div><div class='del'>-					 method_node), gpe_number));</div><div class='add'>+					 method_node)));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -593,7 +616,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_gpe_dispatch");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_gpe_dispatch);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If edge-triggered, clear the GPE status bit now.  Note that</div><div class='hunk'>@@ -669,9 +692,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)</div><div class='ctx'> 		 * Execute the method associated with the GPE</div><div class='ctx'> 		 * NOTE: Level-triggered GPEs are cleared after the method completes.</div><div class='ctx'> 		 */</div><div class='del'>-		status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,</div><div class='del'>-						     acpi_ev_asynch_execute_gpe_method,</div><div class='del'>-						     gpe_event_info);</div><div class='add'>+		status = acpi_os_execute(OSL_GPE_HANDLER,</div><div class='add'>+					 acpi_ev_asynch_execute_gpe_method,</div><div class='add'>+					 gpe_event_info);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			ACPI_EXCEPTION((AE_INFO, status,</div><div class='ctx'> 					"Unable to queue handler for GPE[%2X] - event disabled",</div><div class='hunk'>@@ -716,7 +739,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Determine if a a GPE is "wake-only".</div><div class='ctx'>  *</div><div class='del'>- *              Called from Notify() code in interpreter when a "device_wake"</div><div class='add'>+ *              Called from Notify() code in interpreter when a "DeviceWake"</div><div class='ctx'>  *              Notify comes in.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='hunk'>@@ -726,7 +749,7 @@ acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_check_for_wake_only_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_check_for_wake_only_gpe);</div><div class='ctx'> </div><div class='ctx'> 	if ((gpe_event_info) &amp;&amp;	/* Only &gt;0 for _Lxx/_Exx */</div><div class='ctx'> 	    ((gpe_event_info-&gt;flags &amp; ACPI_GPE_SYSTEM_MASK) == ACPI_GPE_SYSTEM_RUNNING)) {	/* System state at GPE time */</div><div class='head'>diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c<br/>index 0fd00b5ad650..95ddeb48bc0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evgpeblk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evgpeblk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evgpeblk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evgpeblk.c</a></div><div class='hunk'>@@ -131,14 +131,14 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-acpi_status acpi_ev_walk_gpe_list(ACPI_GPE_CALLBACK gpe_walk_callback)</div><div class='add'>+acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_gpe_block_info *gpe_block;</div><div class='ctx'> 	struct acpi_gpe_xrupt_info *gpe_xrupt_info;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_walk_gpe_list");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_walk_gpe_list);</div><div class='ctx'> </div><div class='ctx'> 	flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -146,10 +146,12 @@ acpi_status acpi_ev_walk_gpe_list(ACPI_GPE_CALLBACK gpe_walk_callback)</div><div class='ctx'> </div><div class='ctx'> 	gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;</div><div class='ctx'> 	while (gpe_xrupt_info) {</div><div class='add'>+</div><div class='ctx'> 		/* Walk all Gpe Blocks attached to this interrupt level */</div><div class='ctx'> </div><div class='ctx'> 		gpe_block = gpe_xrupt_info-&gt;gpe_block_list_head;</div><div class='ctx'> 		while (gpe_block) {</div><div class='add'>+</div><div class='ctx'> 			/* One callback per GPE block */</div><div class='ctx'> </div><div class='ctx'> 			status = gpe_walk_callback(gpe_xrupt_info, gpe_block);</div><div class='hunk'>@@ -190,11 +192,12 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> 	acpi_native_uint j;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_delete_gpe_handlers");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);</div><div class='ctx'> </div><div class='ctx'> 	/* Examine each GPE Register within the block */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; gpe_block-&gt;register_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Now look at the individual GPEs in this byte register */</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; ACPI_GPE_REGISTER_WIDTH; j++) {</div><div class='hunk'>@@ -204,7 +207,7 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,</div><div class='ctx'> </div><div class='ctx'> 			if ((gpe_event_info-&gt;flags &amp; ACPI_GPE_DISPATCH_MASK) ==</div><div class='ctx'> 			    ACPI_GPE_DISPATCH_HANDLER) {</div><div class='del'>-				ACPI_MEM_FREE(gpe_event_info-&gt;dispatch.handler);</div><div class='add'>+				ACPI_FREE(gpe_event_info-&gt;dispatch.handler);</div><div class='ctx'> 				gpe_event_info-&gt;dispatch.handler = NULL;</div><div class='ctx'> 				gpe_event_info-&gt;flags &amp;=</div><div class='ctx'> 				    ~ACPI_GPE_DISPATCH_MASK;</div><div class='hunk'>@@ -248,7 +251,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_save_method_info");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_save_method_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * _Lxx and _Exx GPE method support</div><div class='hunk'>@@ -279,9 +282,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Unknown method type, just ignore it! */</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Unknown GPE method type: %s (name not of form _Lxx or _Exx)",</div><div class='del'>-			    name));</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_LOAD,</div><div class='add'>+				  "Ignoring unknown GPE method type: %s (name not of form _Lxx or _Exx)",</div><div class='add'>+				  name));</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -289,11 +292,12 @@ acpi_ev_save_method_info(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 	gpe_number = ACPI_STRTOUL(&amp;name[2], NULL, 16);</div><div class='ctx'> 	if (gpe_number == ACPI_UINT32_MAX) {</div><div class='add'>+</div><div class='ctx'> 		/* Conversion failed; invalid method, just ignore it */</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",</div><div class='del'>-			    name));</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_LOAD,</div><div class='add'>+				  "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",</div><div class='add'>+				  name));</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -364,13 +368,14 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,</div><div class='ctx'> 	u32 gpe_number;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_match_prw_and_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for a _PRW method under this device */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_evaluate_object(obj_handle, METHOD_NAME__PRW,</div><div class='ctx'> 					 ACPI_BTYPE_PACKAGE, &amp;pkg_desc);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Ignore all errors from _PRW, we don't want to abort the subsystem */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -394,6 +399,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,</div><div class='ctx'> 	obj_desc = pkg_desc-&gt;package.elements[0];</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {</div><div class='add'>+</div><div class='ctx'> 		/* Use FADT-defined GPE device (from definition of _PRW) */</div><div class='ctx'> </div><div class='ctx'> 		target_gpe_device = acpi_gbl_fadt_gpe_device;</div><div class='hunk'>@@ -402,6 +408,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 		gpe_number = (u32) obj_desc-&gt;integer.value;</div><div class='ctx'> 	} else if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_PACKAGE) {</div><div class='add'>+</div><div class='ctx'> 		/* Package contains a GPE reference and GPE number within a GPE block */</div><div class='ctx'> </div><div class='ctx'> 		if ((obj_desc-&gt;package.count &lt; 2) ||</div><div class='hunk'>@@ -482,7 +489,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_get_gpe_xrupt_block);</div><div class='ctx'> </div><div class='ctx'> 	/* No need for lock since we are not changing any list elements here */</div><div class='ctx'> </div><div class='hunk'>@@ -497,7 +504,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32</div><div class='ctx'> </div><div class='ctx'> 	/* Not found, must allocate a new xrupt descriptor */</div><div class='ctx'> </div><div class='del'>-	gpe_xrupt = ACPI_MEM_CALLOCATE(sizeof(struct acpi_gpe_xrupt_info));</div><div class='add'>+	gpe_xrupt = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_xrupt_info));</div><div class='ctx'> 	if (!gpe_xrupt) {</div><div class='ctx'> 		return_PTR(NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -556,7 +563,7 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_delete_gpe_xrupt);</div><div class='ctx'> </div><div class='ctx'> 	/* We never want to remove the SCI interrupt handler */</div><div class='ctx'> </div><div class='hunk'>@@ -588,7 +595,7 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)</div><div class='ctx'> </div><div class='ctx'> 	/* Free the block */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEM_FREE(gpe_xrupt);</div><div class='add'>+	ACPI_FREE(gpe_xrupt);</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -614,7 +621,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_gpe_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -667,7 +674,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_gpe_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -679,6 +686,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> 	status = acpi_hw_disable_gpe_block(gpe_block-&gt;xrupt_block, gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	if (!gpe_block-&gt;previous &amp;&amp; !gpe_block-&gt;next) {</div><div class='add'>+</div><div class='ctx'> 		/* This is the last gpe_block on this interrupt */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ev_delete_gpe_xrupt(gpe_block-&gt;xrupt_block);</div><div class='hunk'>@@ -704,9 +712,9 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> </div><div class='ctx'> 	/* Free the gpe_block */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEM_FREE(gpe_block-&gt;register_info);</div><div class='del'>-	ACPI_MEM_FREE(gpe_block-&gt;event_info);</div><div class='del'>-	ACPI_MEM_FREE(gpe_block);</div><div class='add'>+	ACPI_FREE(gpe_block-&gt;register_info);</div><div class='add'>+	ACPI_FREE(gpe_block-&gt;event_info);</div><div class='add'>+	ACPI_FREE(gpe_block);</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> 	status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);</div><div class='hunk'>@@ -736,17 +744,17 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> 	acpi_native_uint j;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_create_gpe_info_blocks");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_create_gpe_info_blocks);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the GPE register information block */</div><div class='ctx'> </div><div class='del'>-	gpe_register_info = ACPI_MEM_CALLOCATE((acpi_size) gpe_block-&gt;</div><div class='del'>-					       register_count *</div><div class='del'>-					       sizeof(struct</div><div class='del'>-						      acpi_gpe_register_info));</div><div class='add'>+	gpe_register_info = ACPI_ALLOCATE_ZEROED((acpi_size) gpe_block-&gt;</div><div class='add'>+						 register_count *</div><div class='add'>+						 sizeof(struct</div><div class='add'>+							acpi_gpe_register_info));</div><div class='ctx'> 	if (!gpe_register_info) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Could not allocate the gpe_register_info table"));</div><div class='add'>+			    "Could not allocate the GpeRegisterInfo table"));</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -754,13 +762,14 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> 	 * Allocate the GPE event_info block. There are eight distinct GPEs</div><div class='ctx'> 	 * per register. Initialization to zeros is sufficient.</div><div class='ctx'> 	 */</div><div class='del'>-	gpe_event_info = ACPI_MEM_CALLOCATE(((acpi_size) gpe_block-&gt;</div><div class='del'>-					     register_count *</div><div class='del'>-					     ACPI_GPE_REGISTER_WIDTH) *</div><div class='del'>-					    sizeof(struct acpi_gpe_event_info));</div><div class='add'>+	gpe_event_info = ACPI_ALLOCATE_ZEROED(((acpi_size) gpe_block-&gt;</div><div class='add'>+					       register_count *</div><div class='add'>+					       ACPI_GPE_REGISTER_WIDTH) *</div><div class='add'>+					      sizeof(struct</div><div class='add'>+						     acpi_gpe_event_info));</div><div class='ctx'> 	if (!gpe_event_info) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Could not allocate the gpe_event_info table"));</div><div class='add'>+			    "Could not allocate the GpeEventInfo table"));</div><div class='ctx'> 		status = AE_NO_MEMORY;</div><div class='ctx'> 		goto error_exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -780,6 +789,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> 	this_event = gpe_event_info;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; gpe_block-&gt;register_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Init the register_info for this GPE register (8 GPEs) */</div><div class='ctx'> </div><div class='ctx'> 		this_register-&gt;base_gpe_number =</div><div class='hunk'>@@ -839,10 +849,10 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)</div><div class='ctx'> </div><div class='ctx'>       error_exit:</div><div class='ctx'> 	if (gpe_register_info) {</div><div class='del'>-		ACPI_MEM_FREE(gpe_register_info);</div><div class='add'>+		ACPI_FREE(gpe_register_info);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (gpe_event_info) {</div><div class='del'>-		ACPI_MEM_FREE(gpe_event_info);</div><div class='add'>+		ACPI_FREE(gpe_event_info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -878,7 +888,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_gpe_block_info *gpe_block;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_create_gpe_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_create_gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	if (!register_count) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -886,7 +896,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new GPE block */</div><div class='ctx'> </div><div class='del'>-	gpe_block = ACPI_MEM_CALLOCATE(sizeof(struct acpi_gpe_block_info));</div><div class='add'>+	gpe_block = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_block_info));</div><div class='ctx'> 	if (!gpe_block) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -906,7 +916,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_ev_create_gpe_info_blocks(gpe_block);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_MEM_FREE(gpe_block);</div><div class='add'>+		ACPI_FREE(gpe_block);</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -914,7 +924,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ev_install_gpe_block(gpe_block, interrupt_number);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_MEM_FREE(gpe_block);</div><div class='add'>+		ACPI_FREE(gpe_block);</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -971,7 +981,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> 	acpi_native_uint j;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_initialize_gpe_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_initialize_gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore a null GPE block (e.g., if no GPE block 1 exists) */</div><div class='ctx'> </div><div class='hunk'>@@ -1013,6 +1023,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; gpe_block-&gt;register_count; i++) {</div><div class='ctx'> 		for (j = 0; j &lt; 8; j++) {</div><div class='add'>+</div><div class='ctx'> 			/* Get the info block for this particular GPE */</div><div class='ctx'> </div><div class='ctx'> 			gpe_event_info =</div><div class='hunk'>@@ -1040,7 +1051,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Could not enable GPEs in gpe_block %p",</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",</div><div class='ctx'> 			    gpe_block));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1066,7 +1077,7 @@ acpi_status acpi_ev_gpe_initialize(void)</div><div class='ctx'> 	u32 gpe_number_max = 0;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_gpe_initialize");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_gpe_initialize);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -1099,6 +1110,7 @@ acpi_status acpi_ev_gpe_initialize(void)</div><div class='ctx'> 	 * particular block is not supported.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (acpi_gbl_FADT-&gt;gpe0_blk_len &amp;&amp; acpi_gbl_FADT-&gt;xgpe0_blk.address) {</div><div class='add'>+</div><div class='ctx'> 		/* GPE block 0 exists (has both length and address &gt; 0) */</div><div class='ctx'> </div><div class='ctx'> 		register_count0 = (u16) (acpi_gbl_FADT-&gt;gpe0_blk_len / 2);</div><div class='hunk'>@@ -1121,6 +1133,7 @@ acpi_status acpi_ev_gpe_initialize(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_FADT-&gt;gpe1_blk_len &amp;&amp; acpi_gbl_FADT-&gt;xgpe1_blk.address) {</div><div class='add'>+</div><div class='ctx'> 		/* GPE block 1 exists (has both length and address &gt; 0) */</div><div class='ctx'> </div><div class='ctx'> 		register_count1 = (u16) (acpi_gbl_FADT-&gt;gpe1_blk_len / 2);</div><div class='hunk'>@@ -1168,6 +1181,7 @@ acpi_status acpi_ev_gpe_initialize(void)</div><div class='ctx'> 	/* Exit if there are no GPE registers */</div><div class='ctx'> </div><div class='ctx'> 	if ((register_count0 + register_count1) == 0) {</div><div class='add'>+</div><div class='ctx'> 		/* GPEs are not required by ACPI, this is OK */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INIT,</div><div class='head'>diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c<br/>index 0909ba69577e..6eef4efddcf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evmisc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evmisc.c</a></div><div class='hunk'>@@ -49,12 +49,13 @@</div><div class='ctx'> #define _COMPONENT          ACPI_EVENTS</div><div class='ctx'> ACPI_MODULE_NAME("evmisc")</div><div class='ctx'> </div><div class='add'>+/* Names for Notify() values, used for debug output */</div><div class='ctx'> #ifdef ACPI_DEBUG_OUTPUT</div><div class='ctx'> static const char *acpi_notify_value_names[] = {</div><div class='ctx'> 	"Bus Check",</div><div class='ctx'> 	"Device Check",</div><div class='ctx'> 	"Device Wake",</div><div class='del'>-	"Eject request",</div><div class='add'>+	"Eject Request",</div><div class='ctx'> 	"Device Check Light",</div><div class='ctx'> 	"Frequency Mismatch",</div><div class='ctx'> 	"Bus Mode Mismatch",</div><div class='hunk'>@@ -124,7 +125,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,</div><div class='ctx'> 	union acpi_generic_state *notify_info;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ev_queue_notify_request");</div><div class='add'>+	ACPI_FUNCTION_NAME(ev_queue_notify_request);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For value 3 (Ejection Request), some device method may need to be run.</div><div class='hunk'>@@ -150,6 +151,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	if (obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* We have the notify object, Get the right handler */</div><div class='ctx'> </div><div class='ctx'> 		switch (node-&gt;type) {</div><div class='hunk'>@@ -184,14 +186,15 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,</div><div class='ctx'> 			return (AE_NO_MEMORY);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		notify_info-&gt;common.data_type = ACPI_DESC_TYPE_STATE_NOTIFY;</div><div class='add'>+		notify_info-&gt;common.descriptor_type =</div><div class='add'>+		    ACPI_DESC_TYPE_STATE_NOTIFY;</div><div class='ctx'> 		notify_info-&gt;notify.node = node;</div><div class='ctx'> 		notify_info-&gt;notify.value = (u16) notify_value;</div><div class='ctx'> 		notify_info-&gt;notify.handler_obj = handler_obj;</div><div class='ctx'> </div><div class='del'>-		status = acpi_os_queue_for_execution(OSD_PRIORITY_HIGH,</div><div class='del'>-						     acpi_ev_notify_dispatch,</div><div class='del'>-						     notify_info);</div><div class='add'>+		status =</div><div class='add'>+		    acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,</div><div class='add'>+				    notify_info);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			acpi_ut_delete_generic_state(notify_info);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -240,6 +243,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)</div><div class='ctx'> 	 * to the device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (notify_info-&gt;notify.value &lt;= ACPI_MAX_SYS_NOTIFY) {</div><div class='add'>+</div><div class='ctx'> 		/* Global system notification handler */</div><div class='ctx'> </div><div class='ctx'> 		if (acpi_gbl_system_notify.handler) {</div><div class='hunk'>@@ -297,6 +301,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context)</div><div class='ctx'> 	/* Signal threads that are waiting for the lock */</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_global_lock_thread_count) {</div><div class='add'>+</div><div class='ctx'> 		/* Send sufficient units to the semaphore */</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='hunk'>@@ -335,15 +340,16 @@ static u32 acpi_ev_global_lock_handler(void *context)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_common_fACS.global_lock, acquired);</div><div class='ctx'> 	if (acquired) {</div><div class='add'>+</div><div class='ctx'> 		/* Got the lock, now wake all threads waiting for it */</div><div class='ctx'> </div><div class='ctx'> 		acpi_gbl_global_lock_acquired = TRUE;</div><div class='ctx'> </div><div class='ctx'> 		/* Run the Global Lock thread which will signal all waiting threads */</div><div class='ctx'> </div><div class='del'>-		status = acpi_os_queue_for_execution(OSD_PRIORITY_HIGH,</div><div class='del'>-						     acpi_ev_global_lock_thread,</div><div class='del'>-						     context);</div><div class='add'>+		status =</div><div class='add'>+		    acpi_os_execute(OSL_GLOBAL_LOCK_HANDLER,</div><div class='add'>+				    acpi_ev_global_lock_thread, context);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			ACPI_EXCEPTION((AE_INFO, status,</div><div class='ctx'> 					"Could not queue Global Lock thread"));</div><div class='hunk'>@@ -371,7 +377,7 @@ acpi_status acpi_ev_init_global_lock_handler(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_init_global_lock_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_global_lock_present = TRUE;</div><div class='ctx'> 	status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,</div><div class='hunk'>@@ -413,7 +419,7 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u8 acquired = FALSE;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_acquire_global_lock");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_acquire_global_lock);</div><div class='ctx'> </div><div class='ctx'> #ifndef ACPI_APPLICATION</div><div class='ctx'> 	/* Make sure that we actually have a global lock */</div><div class='hunk'>@@ -439,6 +445,7 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_common_fACS.global_lock, acquired);</div><div class='ctx'> 	if (acquired) {</div><div class='add'>+</div><div class='ctx'> 		/* We got the lock */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='hunk'>@@ -458,8 +465,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)</div><div class='ctx'> 	 * Acquire the global lock semaphore first.</div><div class='ctx'> 	 * Since this wait will block, we must release the interpreter</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore,</div><div class='del'>-					       timeout);</div><div class='add'>+	status =</div><div class='add'>+	    acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore,</div><div class='add'>+					  timeout);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -480,7 +488,7 @@ acpi_status acpi_ev_release_global_lock(void)</div><div class='ctx'> 	u8 pending = FALSE;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_release_global_lock");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_release_global_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_global_lock_thread_count) {</div><div class='ctx'> 		ACPI_WARNING((AE_INFO,</div><div class='hunk'>@@ -492,6 +500,7 @@ acpi_status acpi_ev_release_global_lock(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_global_lock_thread_count--;</div><div class='ctx'> 	if (acpi_gbl_global_lock_thread_count) {</div><div class='add'>+</div><div class='ctx'> 		/* There are still some threads holding the lock, cannot release */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -533,7 +542,7 @@ void acpi_ev_terminate(void)</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_terminate");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_terminate);</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_events_initialized) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -573,7 +582,7 @@ void acpi_ev_terminate(void)</div><div class='ctx'> 	if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {</div><div class='ctx'> 		status = acpi_disable();</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_WARNING((AE_INFO, "acpi_disable failed"));</div><div class='add'>+			ACPI_WARNING((AE_INFO, "AcpiDisable failed"));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return_VOID;</div><div class='head'>diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c<br/>index 6da58e776413..21caae04fe85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evregion.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evregion.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evregion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evregion.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ acpi_status acpi_ev_install_region_handlers(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_region_handlers");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_region_handlers);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -153,7 +153,7 @@ acpi_status acpi_ev_initialize_op_regions(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_initialize_op_regions");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_initialize_op_regions);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -164,6 +164,7 @@ acpi_status acpi_ev_initialize_op_regions(void)</div><div class='ctx'> 	 * Run the _REG methods for op_regions in each default address space</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; ACPI_NUM_DEFAULT_SPACES; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* TBD: Make sure handler is the DEFAULT handler, otherwise</div><div class='ctx'> 		 * _REG will have already been run.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -192,12 +193,12 @@ acpi_status acpi_ev_initialize_op_regions(void)</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='del'>-	union acpi_operand_object *params[3];</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='add'>+	union acpi_operand_object *args[3];</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_execute_reg_method");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_execute_reg_method);</div><div class='ctx'> </div><div class='ctx'> 	region_obj2 = acpi_ns_get_secondary_object(region_obj);</div><div class='ctx'> 	if (!region_obj2) {</div><div class='hunk'>@@ -208,48 +209,60 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Allocate and initialize the evaluation information block */</div><div class='add'>+</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;prefix_node = region_obj2-&gt;extra.method_REG;</div><div class='add'>+	info-&gt;pathname = NULL;</div><div class='add'>+	info-&gt;parameters = args;</div><div class='add'>+	info-&gt;parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	info-&gt;flags = ACPI_IGNORE_RETURN_VALUE;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The _REG method has two arguments:</div><div class='ctx'> 	 *</div><div class='del'>-	 * Arg0, Integer: Operation region space ID</div><div class='del'>-	 *          Same value as region_obj-&gt;Region.space_id</div><div class='del'>-	 * Arg1, Integer: connection status</div><div class='del'>-	 *          1 for connecting the handler,</div><div class='del'>-	 *          0 for disconnecting the handler</div><div class='del'>-	 *          Passed as a parameter</div><div class='add'>+	 * Arg0 - Integer:</div><div class='add'>+	 *  Operation region space ID Same value as region_obj-&gt;Region.space_id</div><div class='add'>+	 *</div><div class='add'>+	 * Arg1 - Integer:</div><div class='add'>+	 *  connection status 1 for connecting the handler, 0 for disconnecting</div><div class='add'>+	 *  the handler (Passed as a parameter)</div><div class='ctx'> 	 */</div><div class='del'>-	params[0] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='del'>-	if (!params[0]) {</div><div class='del'>-		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	args[0] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='add'>+	if (!args[0]) {</div><div class='add'>+		status = AE_NO_MEMORY;</div><div class='add'>+		goto cleanup1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	params[1] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='del'>-	if (!params[1]) {</div><div class='add'>+	args[1] = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='add'>+	if (!args[1]) {</div><div class='ctx'> 		status = AE_NO_MEMORY;</div><div class='del'>-		goto cleanup;</div><div class='add'>+		goto cleanup2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the parameter objects */</div><div class='ctx'> </div><div class='del'>-	params[0]-&gt;integer.value = region_obj-&gt;region.space_id;</div><div class='del'>-	params[1]-&gt;integer.value = function;</div><div class='del'>-	params[2] = NULL;</div><div class='del'>-</div><div class='del'>-	info.node = region_obj2-&gt;extra.method_REG;</div><div class='del'>-	info.parameters = params;</div><div class='del'>-	info.parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	args[0]-&gt;integer.value = region_obj-&gt;region.space_id;</div><div class='add'>+	args[1]-&gt;integer.value = function;</div><div class='add'>+	args[2] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the method, no return value */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname</div><div class='del'>-			(ACPI_TYPE_METHOD, info.node, NULL));</div><div class='del'>-	status = acpi_ns_evaluate_by_handle(&amp;info);</div><div class='add'>+			(ACPI_TYPE_METHOD, info-&gt;prefix_node, NULL));</div><div class='ctx'> </div><div class='del'>-	acpi_ut_remove_reference(params[1]);</div><div class='add'>+	status = acpi_ns_evaluate(info);</div><div class='add'>+	acpi_ut_remove_reference(args[1]);</div><div class='ctx'> </div><div class='del'>-      cleanup:</div><div class='del'>-	acpi_ut_remove_reference(params[0]);</div><div class='add'>+      cleanup2:</div><div class='add'>+	acpi_ut_remove_reference(args[0]);</div><div class='ctx'> </div><div class='add'>+      cleanup1:</div><div class='add'>+	ACPI_FREE(info);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +274,8 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)</div><div class='ctx'>  *              Function            - Read or Write operation</div><div class='ctx'>  *              Address             - Where in the space to read or write</div><div class='ctx'>  *              bit_width           - Field width in bits (8, 16, 32, or 64)</div><div class='del'>- *              Value               - Pointer to in or out value</div><div class='add'>+ *              Value               - Pointer to in or out value, must be</div><div class='add'>+ *                                    full 64-bit acpi_integer</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -274,7 +288,7 @@ acpi_status</div><div class='ctx'> acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 			       u32 function,</div><div class='ctx'> 			       acpi_physical_address address,</div><div class='del'>-			       u32 bit_width, void *value)</div><div class='add'>+			       u32 bit_width, acpi_integer * value)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_status status2;</div><div class='hunk'>@@ -284,7 +298,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> 	void *region_context = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_address_space_dispatch");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_address_space_dispatch);</div><div class='ctx'> </div><div class='ctx'> 	region_obj2 = acpi_ns_get_secondary_object(region_obj);</div><div class='ctx'> 	if (!region_obj2) {</div><div class='hunk'>@@ -315,6 +329,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 		 */</div><div class='ctx'> 		region_setup = handler_desc-&gt;address_space.setup;</div><div class='ctx'> 		if (!region_setup) {</div><div class='add'>+</div><div class='ctx'> 			/* No initialization routine, exit with error */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -361,9 +376,10 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 			region_obj-&gt;region.flags |= AOPOBJ_SETUP_COMPLETE;</div><div class='ctx'> </div><div class='ctx'> 			if (region_obj2-&gt;extra.region_context) {</div><div class='add'>+</div><div class='ctx'> 				/* The handler for this region was already installed */</div><div class='ctx'> </div><div class='del'>-				ACPI_MEM_FREE(region_context);</div><div class='add'>+				ACPI_FREE(region_context);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Save the returned context for use in all accesses to</div><div class='hunk'>@@ -386,9 +402,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 			  acpi_ut_get_region_name(region_obj-&gt;region.</div><div class='ctx'> 						  space_id)));</div><div class='ctx'> </div><div class='del'>-	if (!</div><div class='del'>-	    (handler_desc-&gt;address_space.</div><div class='del'>-	     hflags &amp; ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {</div><div class='add'>+	if (!(handler_desc-&gt;address_space.handler_flags &amp;</div><div class='add'>+	      ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For handlers other than the default (supplied) handlers, we must</div><div class='ctx'> 		 * exit the interpreter because the handler *might* block -- we don't</div><div class='hunk'>@@ -409,9 +424,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,</div><div class='ctx'> 							space_id)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!</div><div class='del'>-	    (handler_desc-&gt;address_space.</div><div class='del'>-	     hflags &amp; ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {</div><div class='add'>+	if (!(handler_desc-&gt;address_space.handler_flags &amp;</div><div class='add'>+	      ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We just returned from a non-default handler, we must re-enter the</div><div class='ctx'> 		 * interpreter</div><div class='hunk'>@@ -451,7 +465,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_detach_region");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_detach_region);</div><div class='ctx'> </div><div class='ctx'> 	region_obj2 = acpi_ns_get_secondary_object(region_obj);</div><div class='ctx'> 	if (!region_obj2) {</div><div class='hunk'>@@ -463,6 +477,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,</div><div class='ctx'> </div><div class='ctx'> 	handler_obj = region_obj-&gt;region.handler;</div><div class='ctx'> 	if (!handler_obj) {</div><div class='add'>+</div><div class='ctx'> 		/* This region has no handler, all done */</div><div class='ctx'> </div><div class='ctx'> 		return_VOID;</div><div class='hunk'>@@ -474,6 +489,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 	last_obj_ptr = &amp;handler_obj-&gt;address_space.region_list;</div><div class='ctx'> </div><div class='ctx'> 	while (obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* Is this the correct Region? */</div><div class='ctx'> </div><div class='ctx'> 		if (obj_desc == region_obj) {</div><div class='hunk'>@@ -512,34 +528,40 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/* Call the setup handler with the deactivate notification */</div><div class='add'>+			/*</div><div class='add'>+			 * If the region has been activated, call the setup handler</div><div class='add'>+			 * with the deactivate notification</div><div class='add'>+			 */</div><div class='add'>+			if (region_obj-&gt;region.flags &amp; AOPOBJ_SETUP_COMPLETE) {</div><div class='add'>+				region_setup = handler_obj-&gt;address_space.setup;</div><div class='add'>+				status =</div><div class='add'>+				    region_setup(region_obj,</div><div class='add'>+						 ACPI_REGION_DEACTIVATE,</div><div class='add'>+						 handler_obj-&gt;address_space.</div><div class='add'>+						 context, region_context);</div><div class='ctx'> </div><div class='del'>-			region_setup = handler_obj-&gt;address_space.setup;</div><div class='del'>-			status =</div><div class='del'>-			    region_setup(region_obj, ACPI_REGION_DEACTIVATE,</div><div class='del'>-					 handler_obj-&gt;address_space.context,</div><div class='del'>-					 region_context);</div><div class='add'>+				/* Init routine may fail, Just ignore errors */</div><div class='ctx'> </div><div class='del'>-			/* Init routine may fail, Just ignore errors */</div><div class='add'>+				if (ACPI_FAILURE(status)) {</div><div class='add'>+					ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+							"from region handler - deactivate, [%s]",</div><div class='add'>+							acpi_ut_get_region_name</div><div class='add'>+							(region_obj-&gt;region.</div><div class='add'>+							 space_id)));</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-			if (ACPI_FAILURE(status)) {</div><div class='del'>-				ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-						"from region init, [%s]",</div><div class='del'>-						acpi_ut_get_region_name</div><div class='del'>-						(region_obj-&gt;region.space_id)));</div><div class='add'>+				region_obj-&gt;region.flags &amp;=</div><div class='add'>+				    ~(AOPOBJ_SETUP_COMPLETE);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			region_obj-&gt;region.flags &amp;= ~(AOPOBJ_SETUP_COMPLETE);</div><div class='del'>-</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Remove handler reference in the region</div><div class='ctx'> 			 *</div><div class='del'>-			 * NOTE: this doesn't mean that the region goes away</div><div class='del'>-			 * The region is just inaccessible as indicated to</div><div class='del'>-			 * the _REG method</div><div class='add'>+			 * NOTE: this doesn't mean that the region goes away, the region</div><div class='add'>+			 * is just inaccessible as indicated to the _REG method</div><div class='ctx'> 			 *</div><div class='del'>-			 * If the region is on the handler's list</div><div class='del'>-			 * this better be the region's handler</div><div class='add'>+			 * If the region is on the handler's list, this must be the</div><div class='add'>+			 * region's handler</div><div class='ctx'> 			 */</div><div class='ctx'> 			region_obj-&gt;region.handler = NULL;</div><div class='ctx'> 			acpi_ut_remove_reference(handler_obj);</div><div class='hunk'>@@ -583,7 +605,7 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj,</div><div class='ctx'> 		      u8 acpi_ns_is_locked)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_attach_region");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_attach_region);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,</div><div class='ctx'> 			  "Adding Region [%4.4s] %p to address handler %p [%s]\n",</div><div class='hunk'>@@ -636,7 +658,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ev_install_handler");</div><div class='add'>+	ACPI_FUNCTION_NAME(ev_install_handler);</div><div class='ctx'> </div><div class='ctx'> 	handler_obj = (union acpi_operand_object *)context;</div><div class='ctx'> </div><div class='hunk'>@@ -666,6 +688,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* No object, just exit */</div><div class='ctx'> </div><div class='ctx'> 		return (AE_OK);</div><div class='hunk'>@@ -674,10 +697,12 @@ acpi_ev_install_handler(acpi_handle obj_handle,</div><div class='ctx'> 	/* Devices are handled different than regions */</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_DEVICE) {</div><div class='add'>+</div><div class='ctx'> 		/* Check if this Device already has a handler for this address space */</div><div class='ctx'> </div><div class='ctx'> 		next_handler_obj = obj_desc-&gt;device.handler;</div><div class='ctx'> 		while (next_handler_obj) {</div><div class='add'>+</div><div class='ctx'> 			/* Found a handler, is it for the same address space? */</div><div class='ctx'> </div><div class='ctx'> 			if (next_handler_obj-&gt;address_space.space_id ==</div><div class='hunk'>@@ -764,9 +789,9 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,</div><div class='ctx'> 	union acpi_operand_object *handler_obj;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_object_type type;</div><div class='del'>-	u16 flags = 0;</div><div class='add'>+	u8 flags = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This registration is valid for only the types below</div><div class='hunk'>@@ -839,6 +864,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,</div><div class='ctx'> 		/* Walk the handler list for this device */</div><div class='ctx'> </div><div class='ctx'> 		while (handler_obj) {</div><div class='add'>+</div><div class='ctx'> 			/* Same space_id indicates a handler already installed */</div><div class='ctx'> </div><div class='ctx'> 			if (handler_obj-&gt;address_space.space_id == space_id) {</div><div class='hunk'>@@ -921,7 +947,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,</div><div class='ctx'> 	/* Init handler obj */</div><div class='ctx'> </div><div class='ctx'> 	handler_obj-&gt;address_space.space_id = (u8) space_id;</div><div class='del'>-	handler_obj-&gt;address_space.hflags = flags;</div><div class='add'>+	handler_obj-&gt;address_space.handler_flags = flags;</div><div class='ctx'> 	handler_obj-&gt;address_space.region_list = NULL;</div><div class='ctx'> 	handler_obj-&gt;address_space.node = node;</div><div class='ctx'> 	handler_obj-&gt;address_space.handler = handler;</div><div class='hunk'>@@ -979,7 +1005,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_execute_reg_methods");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_execute_reg_methods);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Run all _REG methods for all Operation Regions for this</div><div class='hunk'>@@ -1001,7 +1027,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  walk_namespace callback</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Run _REg method for region objects of the requested space_iD</div><div class='add'>+ * DESCRIPTION: Run _REG method for region objects of the requested space_iD</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -1035,6 +1061,7 @@ acpi_ev_reg_run(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* No object, just exit */</div><div class='ctx'> </div><div class='ctx'> 		return (AE_OK);</div><div class='head'>diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c<br/>index baed8c1a1b9f..5b3c7a85eb9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evrgnini.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evrgnini.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evrgnini.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evrgnini.c</a></div><div class='hunk'>@@ -71,11 +71,22 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,</div><div class='ctx'> 	    (union acpi_operand_object *)handle;</div><div class='ctx'> 	struct acpi_mem_space_context *local_region_context;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_system_memory_region_setup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_system_memory_region_setup);</div><div class='ctx'> </div><div class='ctx'> 	if (function == ACPI_REGION_DEACTIVATE) {</div><div class='ctx'> 		if (*region_context) {</div><div class='del'>-			ACPI_MEM_FREE(*region_context);</div><div class='add'>+			local_region_context =</div><div class='add'>+			    (struct acpi_mem_space_context *)*region_context;</div><div class='add'>+</div><div class='add'>+			/* Delete a cached mapping if present */</div><div class='add'>+</div><div class='add'>+			if (local_region_context-&gt;mapped_length) {</div><div class='add'>+				acpi_os_unmap_memory(local_region_context-&gt;</div><div class='add'>+						     mapped_logical_address,</div><div class='add'>+						     local_region_context-&gt;</div><div class='add'>+						     mapped_length);</div><div class='add'>+			}</div><div class='add'>+			ACPI_FREE(local_region_context);</div><div class='ctx'> 			*region_context = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -84,7 +95,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,</div><div class='ctx'> 	/* Create a new context */</div><div class='ctx'> </div><div class='ctx'> 	local_region_context =</div><div class='del'>-	    ACPI_MEM_CALLOCATE(sizeof(struct acpi_mem_space_context));</div><div class='add'>+	    ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_mem_space_context));</div><div class='ctx'> 	if (!(local_region_context)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -118,7 +129,7 @@ acpi_ev_io_space_region_setup(acpi_handle handle,</div><div class='ctx'> 			      u32 function,</div><div class='ctx'> 			      void *handler_context, void **region_context)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_io_space_region_setup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_io_space_region_setup);</div><div class='ctx'> </div><div class='ctx'> 	if (function == ACPI_REGION_DEACTIVATE) {</div><div class='ctx'> 		*region_context = NULL;</div><div class='hunk'>@@ -161,7 +172,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,</div><div class='ctx'> 	    (union acpi_operand_object *)handle;</div><div class='ctx'> 	struct acpi_device_id object_hID;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_pci_config_region_setup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_pci_config_region_setup);</div><div class='ctx'> </div><div class='ctx'> 	handler_obj = region_obj-&gt;region.handler;</div><div class='ctx'> 	if (!handler_obj) {</div><div class='hunk'>@@ -178,7 +189,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,</div><div class='ctx'> 	*region_context = NULL;</div><div class='ctx'> 	if (function == ACPI_REGION_DEACTIVATE) {</div><div class='ctx'> 		if (pci_id) {</div><div class='del'>-			ACPI_MEM_FREE(pci_id);</div><div class='add'>+			ACPI_FREE(pci_id);</div><div class='ctx'> 		}</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -199,6 +210,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,</div><div class='ctx'> 	 * handlers with that device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (handler_obj-&gt;address_space.node == acpi_gbl_root_node) {</div><div class='add'>+</div><div class='ctx'> 		/* Start search from the parent object */</div><div class='ctx'> </div><div class='ctx'> 		pci_root_node = parent_node;</div><div class='hunk'>@@ -220,6 +232,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,</div><div class='ctx'> 					PCI_EXPRESS_ROOT_HID_STRING,</div><div class='ctx'> 					sizeof(PCI_EXPRESS_ROOT_HID_STRING)))))</div><div class='ctx'> 				{</div><div class='add'>+</div><div class='ctx'> 					/* Install a handler for this PCI root bridge */</div><div class='ctx'> </div><div class='ctx'> 					status =</div><div class='hunk'>@@ -235,7 +248,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,</div><div class='ctx'> 						} else {</div><div class='ctx'> 							ACPI_EXCEPTION((AE_INFO,</div><div class='ctx'> 									status,</div><div class='del'>-									"Could not install pci_config handler for Root Bridge %4.4s",</div><div class='add'>+									"Could not install PciConfig handler for Root Bridge %4.4s",</div><div class='ctx'> 									acpi_ut_get_node_name</div><div class='ctx'> 									(pci_root_node)));</div><div class='ctx'> 						}</div><div class='hunk'>@@ -262,7 +275,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,</div><div class='ctx'> </div><div class='ctx'> 	/* Region is still not initialized. Create a new context */</div><div class='ctx'> </div><div class='del'>-	pci_id = ACPI_MEM_CALLOCATE(sizeof(struct acpi_pci_id));</div><div class='add'>+	pci_id = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pci_id));</div><div class='ctx'> 	if (!pci_id) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -337,7 +350,7 @@ acpi_ev_pci_bar_region_setup(acpi_handle handle,</div><div class='ctx'> 			     u32 function,</div><div class='ctx'> 			     void *handler_context, void **region_context)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_pci_bar_region_setup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_pci_bar_region_setup);</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='hunk'>@@ -364,7 +377,7 @@ acpi_ev_cmos_region_setup(acpi_handle handle,</div><div class='ctx'> 			  u32 function,</div><div class='ctx'> 			  void *handler_context, void **region_context)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_cmos_region_setup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_cmos_region_setup);</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='hunk'>@@ -389,7 +402,7 @@ acpi_ev_default_region_setup(acpi_handle handle,</div><div class='ctx'> 			     u32 function,</div><div class='ctx'> 			     void *handler_context, void **region_context)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_default_region_setup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_default_region_setup);</div><div class='ctx'> </div><div class='ctx'> 	if (function == ACPI_REGION_DEACTIVATE) {</div><div class='ctx'> 		*region_context = NULL;</div><div class='hunk'>@@ -435,7 +448,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 	acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ev_initialize_region", acpi_ns_locked);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ev_initialize_region, acpi_ns_locked);</div><div class='ctx'> </div><div class='ctx'> 	if (!region_obj) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -462,8 +475,9 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> </div><div class='ctx'> 	/* Find any "_REG" method associated with this region definition */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_search_node(*reg_name_ptr, node,</div><div class='del'>-				     ACPI_TYPE_METHOD, &amp;method_node);</div><div class='add'>+	status =</div><div class='add'>+	    acpi_ns_search_one_scope(*reg_name_ptr, node, ACPI_TYPE_METHOD,</div><div class='add'>+				     &amp;method_node);</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The _REG method is optional and there can be only one per region</div><div class='hunk'>@@ -478,11 +492,13 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 	 * ie: acpi_gbl_root_node-&gt;parent_entry being set to NULL</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (node) {</div><div class='add'>+</div><div class='ctx'> 		/* Check to see if a handler exists */</div><div class='ctx'> </div><div class='ctx'> 		handler_obj = NULL;</div><div class='ctx'> 		obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 		if (obj_desc) {</div><div class='add'>+</div><div class='ctx'> 			/* Can only be a handler if the object exists */</div><div class='ctx'> </div><div class='ctx'> 			switch (node-&gt;type) {</div><div class='hunk'>@@ -507,10 +523,12 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			while (handler_obj) {</div><div class='add'>+</div><div class='ctx'> 				/* Is this handler of the correct type? */</div><div class='ctx'> </div><div class='ctx'> 				if (handler_obj-&gt;address_space.space_id ==</div><div class='ctx'> 				    space_id) {</div><div class='add'>+</div><div class='ctx'> 					/* Found correct handler */</div><div class='ctx'> </div><div class='ctx'> 					ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,</div><div class='hunk'>@@ -571,7 +589,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,</div><div class='ctx'> 	/* If we get here, there is no handler for this region */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,</div><div class='del'>-			  "No handler for region_type %s(%X) (region_obj %p)\n",</div><div class='add'>+			  "No handler for RegionType %s(%X) (RegionObj %p)\n",</div><div class='ctx'> 			  acpi_ut_get_region_name(space_id), space_id,</div><div class='ctx'> 			  region_obj));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c<br/>index 9a622169008a..8106215ad554 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evsci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evsci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evsci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evsci.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)</div><div class='ctx'> 	struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;</div><div class='ctx'> 	u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_sci_xrupt_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_sci_xrupt_handler);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are guaranteed by the ACPI CA initialization/shutdown code that</div><div class='hunk'>@@ -108,7 +108,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)</div><div class='ctx'> 	struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;</div><div class='ctx'> 	u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_gpe_xrupt_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We are guaranteed by the ACPI CA initialization/shutdown code that</div><div class='hunk'>@@ -140,7 +140,7 @@ u32 acpi_ev_install_sci_handler(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_install_sci_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_install_sci_handler);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT-&gt;sci_int,</div><div class='ctx'> 						   acpi_ev_sci_xrupt_handler,</div><div class='hunk'>@@ -171,7 +171,7 @@ acpi_status acpi_ev_remove_sci_handler(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ev_remove_sci_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ev_remove_sci_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Just let the OS remove the handler and disable the level */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c<br/>index b38b39dde543..923fd2b46955 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evxface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evxface.c</a></div><div class='hunk'>@@ -41,8 +41,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> #include &lt;acpi/acevents.h&gt;</div><div class='hunk'>@@ -68,7 +66,7 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_install_exception_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_install_exception_handler);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -90,6 +88,8 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -107,14 +107,13 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)</div><div class='ctx'>  *              event.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_install_fixed_event_handler(u32 event,</div><div class='ctx'> 				 acpi_event_handler handler, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_install_fixed_event_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_install_fixed_event_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +160,7 @@ acpi_install_fixed_event_handler(u32 event,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_install_fixed_event_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_fixed_event_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -175,13 +174,12 @@ EXPORT_SYMBOL(acpi_install_fixed_event_handler);</div><div class='ctx'>  * DESCRIPTION: Disables the event and unregisters the event handler.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_remove_fixed_event_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_remove_fixed_event_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +214,7 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_remove_fixed_event_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_remove_fixed_event_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -235,7 +233,6 @@ EXPORT_SYMBOL(acpi_remove_fixed_event_handler);</div><div class='ctx'>  * DESCRIPTION: Install a handler for notifies on an ACPI device</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_install_notify_handler(acpi_handle device,</div><div class='ctx'> 			    u32 handler_type,</div><div class='hunk'>@@ -246,7 +243,7 @@ acpi_install_notify_handler(acpi_handle device,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_install_notify_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_install_notify_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -275,6 +272,7 @@ acpi_install_notify_handler(acpi_handle device,</div><div class='ctx'> 	 * only one &lt;external&gt; global handler can be regsitered (per notify type).</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (device == ACPI_ROOT_OBJECT) {</div><div class='add'>+</div><div class='ctx'> 		/* Make sure the handler is not already installed */</div><div class='ctx'> </div><div class='ctx'> 		if (((handler_type &amp; ACPI_SYSTEM_NOTIFY) &amp;&amp;</div><div class='hunk'>@@ -317,6 +315,7 @@ acpi_install_notify_handler(acpi_handle device,</div><div class='ctx'> </div><div class='ctx'> 		obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 		if (obj_desc) {</div><div class='add'>+</div><div class='ctx'> 			/* Object exists - make sure there's no handler */</div><div class='ctx'> </div><div class='ctx'> 			if (((handler_type &amp; ACPI_SYSTEM_NOTIFY) &amp;&amp;</div><div class='hunk'>@@ -370,6 +369,7 @@ acpi_install_notify_handler(acpi_handle device,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (handler_type == ACPI_ALL_NOTIFY) {</div><div class='add'>+</div><div class='ctx'> 			/* Extra ref if installed in both */</div><div class='ctx'> </div><div class='ctx'> 			acpi_ut_add_reference(notify_obj);</div><div class='hunk'>@@ -381,7 +381,7 @@ acpi_install_notify_handler(acpi_handle device,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_install_notify_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_notify_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -399,7 +399,6 @@ EXPORT_SYMBOL(acpi_install_notify_handler);</div><div class='ctx'>  * DESCRIPTION: Remove a handler for notifies on an ACPI device</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> 			   u32 handler_type, acpi_notify_handler handler)</div><div class='hunk'>@@ -409,18 +408,19 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_remove_notify_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='ctx'> 	if ((!device) ||</div><div class='ctx'> 	    (!handler) || (handler_type &gt; ACPI_MAX_NOTIFY_HANDLER_TYPE)) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		status = AE_BAD_PARAMETER;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Convert and validate the device handle */</div><div class='hunk'>@@ -451,7 +451,7 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> 		acpi_os_wait_events_complete(NULL);</div><div class='ctx'> 		status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='add'>+			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (handler_type &amp; ACPI_SYSTEM_NOTIFY) {</div><div class='hunk'>@@ -489,8 +489,12 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> </div><div class='ctx'> 		if (handler_type &amp; ACPI_SYSTEM_NOTIFY) {</div><div class='ctx'> 			notify_obj = obj_desc-&gt;common_notify.system_notify;</div><div class='del'>-			if ((!notify_obj) ||</div><div class='del'>-			    (notify_obj-&gt;notify.handler != handler)) {</div><div class='add'>+			if (!notify_obj) {</div><div class='add'>+				status = AE_NOT_EXIST;</div><div class='add'>+				goto unlock_and_exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (notify_obj-&gt;notify.handler != handler) {</div><div class='ctx'> 				status = AE_BAD_PARAMETER;</div><div class='ctx'> 				goto unlock_and_exit;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -500,7 +504,7 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> 			acpi_os_wait_events_complete(NULL);</div><div class='ctx'> 			status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='del'>-				return_ACPI_STATUS(status);</div><div class='add'>+				goto exit;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Remove the handler */</div><div class='hunk'>@@ -510,8 +514,12 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> </div><div class='ctx'> 		if (handler_type &amp; ACPI_DEVICE_NOTIFY) {</div><div class='ctx'> 			notify_obj = obj_desc-&gt;common_notify.device_notify;</div><div class='del'>-			if ((!notify_obj) ||</div><div class='del'>-			    (notify_obj-&gt;notify.handler != handler)) {</div><div class='add'>+			if (!notify_obj) {</div><div class='add'>+				status = AE_NOT_EXIST;</div><div class='add'>+				goto unlock_and_exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (notify_obj-&gt;notify.handler != handler) {</div><div class='ctx'> 				status = AE_BAD_PARAMETER;</div><div class='ctx'> 				goto unlock_and_exit;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -521,7 +529,7 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> 			acpi_os_wait_events_complete(NULL);</div><div class='ctx'> 			status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='del'>-				return_ACPI_STATUS(status);</div><div class='add'>+				goto exit;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Remove the handler */</div><div class='hunk'>@@ -532,10 +540,13 @@ acpi_remove_notify_handler(acpi_handle device,</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+      exit:</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Removing notify handler"));</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_remove_notify_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -554,7 +565,6 @@ EXPORT_SYMBOL(acpi_remove_notify_handler);</div><div class='ctx'>  * DESCRIPTION: Install a handler for a General Purpose Event.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_install_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> 			 u32 gpe_number,</div><div class='hunk'>@@ -565,17 +575,18 @@ acpi_install_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_install_gpe_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_install_gpe_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='ctx'> 	if ((!address) || (type &gt; ACPI_GPE_XRUPT_TYPE_MASK)) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		status = AE_BAD_PARAMETER;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that we have a valid GPE number */</div><div class='hunk'>@@ -596,7 +607,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate and init handler object */</div><div class='ctx'> </div><div class='del'>-	handler = ACPI_MEM_CALLOCATE(sizeof(struct acpi_handler_info));</div><div class='add'>+	handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_handler_info));</div><div class='ctx'> 	if (!handler) {</div><div class='ctx'> 		status = AE_NO_MEMORY;</div><div class='ctx'> 		goto unlock_and_exit;</div><div class='hunk'>@@ -627,10 +638,14 @@ acpi_install_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);</div><div class='add'>+      exit:</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Installing notify handler failed"));</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_install_gpe_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_gpe_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -646,7 +661,6 @@ EXPORT_SYMBOL(acpi_install_gpe_handler);</div><div class='ctx'>  * DESCRIPTION: Remove a handler for a General Purpose acpi_event.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_remove_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> 			u32 gpe_number, acpi_event_handler address)</div><div class='hunk'>@@ -656,7 +670,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_remove_gpe_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -724,14 +738,14 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can free the handler object */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEM_FREE(handler);</div><div class='add'>+	ACPI_FREE(handler);</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_remove_gpe_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_remove_gpe_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -746,7 +760,6 @@ EXPORT_SYMBOL(acpi_remove_gpe_handler);</div><div class='ctx'>  * DESCRIPTION: Acquire the ACPI Global Lock</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='hunk'>@@ -771,7 +784,7 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_acquire_global_lock);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_acquire_global_lock)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -784,7 +797,6 @@ EXPORT_SYMBOL(acpi_acquire_global_lock);</div><div class='ctx'>  * DESCRIPTION: Release the ACPI Global Lock. The handle must be valid.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_release_global_lock(u32 handle)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='hunk'>@@ -797,4 +809,4 @@ acpi_status acpi_release_global_lock(u32 handle)</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_release_global_lock);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_release_global_lock)</div><div class='head'>diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c<br/>index ec9ce8429f15..7ebc2efac936 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evxfevnt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evxfevnt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evxfevnt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evxfevnt.c</a></div><div class='hunk'>@@ -41,8 +41,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acevents.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='hunk'>@@ -65,7 +63,7 @@ acpi_status acpi_enable(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enable");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enable);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we have the FADT */</div><div class='ctx'> </div><div class='hunk'>@@ -94,6 +92,8 @@ acpi_status acpi_enable(void)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enable)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_disable</div><div class='hunk'>@@ -105,12 +105,11 @@ acpi_status acpi_enable(void)</div><div class='ctx'>  * DESCRIPTION: Transfers the system into LEGACY (non-ACPI) mode.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_disable(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_disable");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_disable);</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_FADT) {</div><div class='ctx'> 		ACPI_WARNING((AE_INFO, "No FADT information present!"));</div><div class='hunk'>@@ -137,6 +136,8 @@ acpi_status acpi_disable(void)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_disable)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_enable_event</div><div class='hunk'>@@ -149,13 +150,12 @@ acpi_status acpi_disable(void)</div><div class='ctx'>  * DESCRIPTION: Enable an ACPI event (fixed)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_enable_event(u32 event, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enable_event");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enable_event);</div><div class='ctx'> </div><div class='ctx'> 	/* Decode the Fixed Event */</div><div class='ctx'> </div><div class='hunk'>@@ -193,7 +193,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_enable_event);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enable_event)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -208,13 +208,12 @@ EXPORT_SYMBOL(acpi_enable_event);</div><div class='ctx'>  * DESCRIPTION: Set the type of an individual GPE</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_gpe_event_info *gpe_event_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_set_gpe_type");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_set_gpe_type);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that we have a valid GPE number */</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +235,7 @@ acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_set_gpe_type);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -252,13 +251,12 @@ EXPORT_SYMBOL(acpi_set_gpe_type);</div><div class='ctx'>  * DESCRIPTION: Enable an ACPI event (general purpose)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_gpe_event_info *gpe_event_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enable_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enable_gpe);</div><div class='ctx'> </div><div class='ctx'> 	/* Use semaphore lock if not executing at interrupt level */</div><div class='ctx'> </div><div class='hunk'>@@ -288,7 +286,7 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_enable_gpe);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enable_gpe)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -304,13 +302,12 @@ EXPORT_SYMBOL(acpi_enable_gpe);</div><div class='ctx'>  * DESCRIPTION: Disable an ACPI event (general purpose)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_gpe_event_info *gpe_event_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_disable_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_disable_gpe);</div><div class='ctx'> </div><div class='ctx'> 	/* Use semaphore lock if not executing at interrupt level */</div><div class='ctx'> </div><div class='hunk'>@@ -338,6 +335,8 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_disable_gpe)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_disable_event</div><div class='hunk'>@@ -350,13 +349,12 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'>  * DESCRIPTION: Disable an ACPI event (fixed)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_disable_event(u32 event, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_disable_event");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_disable_event);</div><div class='ctx'> </div><div class='ctx'> 	/* Decode the Fixed Event */</div><div class='ctx'> </div><div class='hunk'>@@ -392,7 +390,7 @@ acpi_status acpi_disable_event(u32 event, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_disable_event);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_disable_event)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -405,12 +403,11 @@ EXPORT_SYMBOL(acpi_disable_event);</div><div class='ctx'>  * DESCRIPTION: Clear an ACPI event (fixed)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_clear_event(u32 event)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_clear_event");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_clear_event);</div><div class='ctx'> </div><div class='ctx'> 	/* Decode the Fixed Event */</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +426,7 @@ acpi_status acpi_clear_event(u32 event)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_clear_event);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_clear_event)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -444,13 +441,12 @@ EXPORT_SYMBOL(acpi_clear_event);</div><div class='ctx'>  * DESCRIPTION: Clear an ACPI event (general purpose)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_gpe_event_info *gpe_event_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_clear_gpe");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_clear_gpe);</div><div class='ctx'> </div><div class='ctx'> 	/* Use semaphore lock if not executing at interrupt level */</div><div class='ctx'> </div><div class='hunk'>@@ -478,6 +474,8 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_clear_gpe)</div><div class='add'>+</div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -492,12 +490,11 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)</div><div class='ctx'>  * DESCRIPTION: Obtains and returns the current status of the event</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_event_status");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_event_status);</div><div class='ctx'> </div><div class='ctx'> 	if (!event_status) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -518,6 +515,8 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_event_status)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_gpe_status</div><div class='hunk'>@@ -533,7 +532,6 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)</div><div class='ctx'>  * DESCRIPTION: Get status of an event (general purpose)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_gpe_status(acpi_handle gpe_device,</div><div class='ctx'> 		    u32 gpe_number, u32 flags, acpi_event_status * event_status)</div><div class='hunk'>@@ -541,7 +539,7 @@ acpi_get_gpe_status(acpi_handle gpe_device,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_gpe_event_info *gpe_event_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_gpe_status");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_gpe_status);</div><div class='ctx'> </div><div class='ctx'> 	/* Use semaphore lock if not executing at interrupt level */</div><div class='ctx'> </div><div class='hunk'>@@ -570,6 +568,8 @@ acpi_get_gpe_status(acpi_handle gpe_device,</div><div class='ctx'> 	}</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -586,7 +586,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,</div><div class='ctx'>  * DESCRIPTION: Create and Install a block of GPE registers</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_install_gpe_block(acpi_handle gpe_device,</div><div class='ctx'> 		       struct acpi_generic_address *gpe_block_address,</div><div class='hunk'>@@ -597,7 +596,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	struct acpi_gpe_block_info *gpe_block;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_install_gpe_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_install_gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -636,6 +635,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* No object, create a new one */</div><div class='ctx'> </div><div class='ctx'> 		obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);</div><div class='hunk'>@@ -665,7 +665,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_install_gpe_block);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -678,14 +678,13 @@ EXPORT_SYMBOL(acpi_install_gpe_block);</div><div class='ctx'>  * DESCRIPTION: Remove a previously installed block of GPE registers</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_remove_gpe_block");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);</div><div class='ctx'> </div><div class='ctx'> 	if (!gpe_device) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -721,4 +720,4 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_remove_gpe_block);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)</div><div class='head'>diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c<br/>index abf5caca9ae5..83b12a9afa32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/events/evxfregn.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/events/evxfregn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/events/evxfregn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/events/evxfregn.c</a></div><div class='hunk'>@@ -42,8 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> #include &lt;acpi/acevents.h&gt;</div><div class='hunk'>@@ -75,7 +73,7 @@ acpi_install_address_space_handler(acpi_handle device,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_install_address_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_install_address_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +112,7 @@ acpi_install_address_space_handler(acpi_handle device,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_install_address_space_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_address_space_handler)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -129,7 +127,6 @@ EXPORT_SYMBOL(acpi_install_address_space_handler);</div><div class='ctx'>  * DESCRIPTION: Remove a previously installed handler.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_remove_address_space_handler(acpi_handle device,</div><div class='ctx'> 				  acpi_adr_space_type space_id,</div><div class='hunk'>@@ -142,7 +139,7 @@ acpi_remove_address_space_handler(acpi_handle device,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_remove_address_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_remove_address_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +155,11 @@ acpi_remove_address_space_handler(acpi_handle device,</div><div class='ctx'> 	/* Convert and validate the device handle */</div><div class='ctx'> </div><div class='ctx'> 	node = acpi_ns_map_handle_to_node(device);</div><div class='del'>-	if (!node) {</div><div class='add'>+	if (!node ||</div><div class='add'>+	    ((node-&gt;type != ACPI_TYPE_DEVICE) &amp;&amp;</div><div class='add'>+	     (node-&gt;type != ACPI_TYPE_PROCESSOR) &amp;&amp;</div><div class='add'>+	     (node-&gt;type != ACPI_TYPE_THERMAL) &amp;&amp;</div><div class='add'>+	     (node != acpi_gbl_root_node))) {</div><div class='ctx'> 		status = AE_BAD_PARAMETER;</div><div class='ctx'> 		goto unlock_and_exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -176,9 +177,18 @@ acpi_remove_address_space_handler(acpi_handle device,</div><div class='ctx'> 	handler_obj = obj_desc-&gt;device.handler;</div><div class='ctx'> 	last_obj_ptr = &amp;obj_desc-&gt;device.handler;</div><div class='ctx'> 	while (handler_obj) {</div><div class='add'>+</div><div class='ctx'> 		/* We have a handler, see if user requested this one */</div><div class='ctx'> </div><div class='ctx'> 		if (handler_obj-&gt;address_space.space_id == space_id) {</div><div class='add'>+</div><div class='add'>+			/* Handler must be the same as the installed handler */</div><div class='add'>+</div><div class='add'>+			if (handler_obj-&gt;address_space.handler != handler) {</div><div class='add'>+				status = AE_BAD_PARAMETER;</div><div class='add'>+				goto unlock_and_exit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/* Matched space_id, first dereference this in the Regions */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,</div><div class='hunk'>@@ -229,7 +239,7 @@ acpi_remove_address_space_handler(acpi_handle device,</div><div class='ctx'> 	/* The handler does not exist */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,</div><div class='del'>-			  "Unable to remove address handler %p for %s(%X), dev_node %p, obj %p\n",</div><div class='add'>+			  "Unable to remove address handler %p for %s(%X), DevNode %p, obj %p\n",</div><div class='ctx'> 			  handler, acpi_ut_get_region_name(space_id), space_id,</div><div class='ctx'> 			  node, obj_desc));</div><div class='ctx'> </div><div class='hunk'>@@ -240,4 +250,4 @@ acpi_remove_address_space_handler(acpi_handle device,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_remove_address_space_handler);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_remove_address_space_handler)</div><div class='head'>diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c<br/>index a29782fe3ecf..c8341fa5fe01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exconfig.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exconfig.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exconfig.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exconfig.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ acpi_ex_add_table(struct acpi_table_header *table,</div><div class='ctx'> 	struct acpi_table_desc table_info;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_add_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_add_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Create an object to be the table handle */</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +100,7 @@ acpi_ex_add_table(struct acpi_table_header *table,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_MEMSET(&amp;table_info, 0, sizeof(struct acpi_table_desc));</div><div class='ctx'> </div><div class='del'>-	table_info.type = ACPI_TABLE_SSDT;</div><div class='add'>+	table_info.type = ACPI_TABLE_ID_SSDT;</div><div class='ctx'> 	table_info.pointer = table;</div><div class='ctx'> 	table_info.length = (acpi_size) table-&gt;length;</div><div class='ctx'> 	table_info.allocation = ACPI_MEM_ALLOCATED;</div><div class='hunk'>@@ -110,6 +110,7 @@ acpi_ex_add_table(struct acpi_table_header *table,</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		if (status == AE_ALREADY_EXISTS) {</div><div class='add'>+</div><div class='ctx'> 			/* Table already exists, just return the handle */</div><div class='ctx'> </div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -121,6 +122,7 @@ acpi_ex_add_table(struct acpi_table_header *table,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ns_load_table(table_info.installed_desc, parent_node);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Uninstall table on error */</div><div class='ctx'> </div><div class='ctx'> 		(void)acpi_tb_uninstall_table(table_info.installed_desc);</div><div class='hunk'>@@ -160,7 +162,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	struct acpi_namespace_node *parameter_node = NULL;</div><div class='ctx'> 	union acpi_operand_object *ddb_handle;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_load_table_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_load_table_op);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -169,6 +171,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_tb_match_signature(operand[0]-&gt;string.pointer, NULL);</div><div class='ctx'> 	if (status == AE_OK) {</div><div class='add'>+</div><div class='ctx'> 		/* Signature matched -- don't allow override */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_ALREADY_EXISTS);</div><div class='hunk'>@@ -211,9 +214,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		 * location within the namespace where the table will be loaded.</div><div class='ctx'> 		 */</div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_ns_get_node_by_path(operand[3]-&gt;string.pointer,</div><div class='del'>-					     start_node, ACPI_NS_SEARCH_PARENT,</div><div class='del'>-					     &amp;parent_node);</div><div class='add'>+		    acpi_ns_get_node(start_node, operand[3]-&gt;string.pointer,</div><div class='add'>+				     ACPI_NS_SEARCH_PARENT, &amp;parent_node);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -234,9 +236,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		/* Find the node referenced by the parameter_path_string */</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_ns_get_node_by_path(operand[4]-&gt;string.pointer,</div><div class='del'>-					     start_node, ACPI_NS_SEARCH_PARENT,</div><div class='del'>-					     &amp;parameter_node);</div><div class='add'>+		    acpi_ns_get_node(start_node, operand[4]-&gt;string.pointer,</div><div class='add'>+				     ACPI_NS_SEARCH_PARENT, &amp;parameter_node);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -252,6 +253,7 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	/* Parameter Data (optional) */</div><div class='ctx'> </div><div class='ctx'> 	if (parameter_node) {</div><div class='add'>+</div><div class='ctx'> 		/* Store the parameter data into the optional parameter object */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ex_store(operand[5],</div><div class='hunk'>@@ -264,6 +266,10 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ACPI_INFO((AE_INFO,</div><div class='add'>+		   "Dynamic OEM Table Load - [%4.4s] OemId [%6.6s] OemTableId [%8.8s]",</div><div class='add'>+		   table-&gt;signature, table-&gt;oem_id, table-&gt;oem_table_id));</div><div class='add'>+</div><div class='ctx'> 	*return_desc = ddb_handle;</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='hunk'>@@ -294,9 +300,10 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	struct acpi_table_header *table_ptr = NULL;</div><div class='ctx'> 	acpi_physical_address address;</div><div class='ctx'> 	struct acpi_table_header table_header;</div><div class='add'>+	acpi_integer temp;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_load_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_load_op);</div><div class='ctx'> </div><div class='ctx'> 	/* Object can be either an op_region or a Field */</div><div class='ctx'> </div><div class='hunk'>@@ -322,7 +329,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 		address = obj_desc-&gt;region.address;</div><div class='ctx'> </div><div class='del'>-		/* Get the table length from the table header */</div><div class='add'>+		/* Get part of the table header to get the table length */</div><div class='ctx'> </div><div class='ctx'> 		table_header.length = 0;</div><div class='ctx'> 		for (i = 0; i &lt; 8; i++) {</div><div class='hunk'>@@ -330,11 +337,14 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> 			    acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,</div><div class='ctx'> 							   (acpi_physical_address)</div><div class='ctx'> 							   (i + address), 8,</div><div class='del'>-							   ((u8 *) &amp;</div><div class='del'>-							    table_header) + i);</div><div class='add'>+							   &amp;temp);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='ctx'> 				return_ACPI_STATUS(status);</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* Get the one valid byte of the returned 64-bit value */</div><div class='add'>+</div><div class='add'>+			ACPI_CAST_PTR(u8, &amp;table_header)[i] = (u8) temp;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Sanity check the table length */</div><div class='hunk'>@@ -345,7 +355,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate a buffer for the entire table */</div><div class='ctx'> </div><div class='del'>-		table_ptr = ACPI_MEM_ALLOCATE(table_header.length);</div><div class='add'>+		table_ptr = ACPI_ALLOCATE(table_header.length);</div><div class='ctx'> 		if (!table_ptr) {</div><div class='ctx'> 			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -357,11 +367,14 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> 			    acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,</div><div class='ctx'> 							   (acpi_physical_address)</div><div class='ctx'> 							   (i + address), 8,</div><div class='del'>-							   ((u8 *) table_ptr +</div><div class='del'>-							    i));</div><div class='add'>+							   &amp;temp);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* Get the one valid byte of the returned 64-bit value */</div><div class='add'>+</div><div class='add'>+			ACPI_CAST_PTR(u8, table_ptr)[i] = (u8) temp;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -407,12 +420,8 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 	/* The table must be either an SSDT or a PSDT */</div><div class='ctx'> </div><div class='del'>-	if ((!ACPI_STRNCMP(table_ptr-&gt;signature,</div><div class='del'>-			   acpi_gbl_table_data[ACPI_TABLE_PSDT].signature,</div><div class='del'>-			   acpi_gbl_table_data[ACPI_TABLE_PSDT].sig_length)) &amp;&amp;</div><div class='del'>-	    (!ACPI_STRNCMP(table_ptr-&gt;signature,</div><div class='del'>-			   acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,</div><div class='del'>-			   acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {</div><div class='add'>+	if ((!ACPI_COMPARE_NAME(table_ptr-&gt;signature, PSDT_SIG)) &amp;&amp;</div><div class='add'>+	    (!ACPI_COMPARE_NAME(table_ptr-&gt;signature, SSDT_SIG))) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Table has invalid signature [%4.4s], must be SSDT or PSDT",</div><div class='ctx'> 			    table_ptr-&gt;signature));</div><div class='hunk'>@@ -424,6 +433,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ex_add_table(table_ptr, acpi_gbl_root_node, &amp;ddb_handle);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* On error, table_ptr was deallocated above */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -440,9 +450,13 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ACPI_INFO((AE_INFO,</div><div class='add'>+		   "Dynamic SSDT Load - OemId [%6.6s] OemTableId [%8.8s]",</div><div class='add'>+		   table_ptr-&gt;oem_id, table_ptr-&gt;oem_table_id));</div><div class='add'>+</div><div class='ctx'>       cleanup:</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_MEM_FREE(table_ptr);</div><div class='add'>+		ACPI_FREE(table_ptr);</div><div class='ctx'> 	}</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='hunk'>@@ -465,7 +479,7 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)</div><div class='ctx'> 	union acpi_operand_object *table_desc = ddb_handle;</div><div class='ctx'> 	struct acpi_table_desc *table_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_unload_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_unload_table);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Validate the handle</div><div class='hunk'>@@ -488,7 +502,6 @@ acpi_status acpi_ex_unload_table(union acpi_operand_object *ddb_handle)</div><div class='ctx'> 	 * (Offset contains the table_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_ns_delete_namespace_by_owner(table_info-&gt;owner_id);</div><div class='del'>-	acpi_ut_release_owner_id(&amp;table_info-&gt;owner_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Delete the table itself */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c<br/>index e6d52e12d77a..544e81a6a438 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exconvrt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exconvrt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exconvrt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exconvrt.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	u32 count;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_convert_to_integer", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_convert_to_integer, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {</div><div class='ctx'> 	case ACPI_TYPE_INTEGER:</div><div class='hunk'>@@ -170,6 +170,9 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Converted value: %8.8X%8.8X\n",</div><div class='add'>+			  ACPI_FORMAT_UINT64(result)));</div><div class='add'>+</div><div class='ctx'> 	/* Save the Result */</div><div class='ctx'> </div><div class='ctx'> 	return_desc-&gt;integer.value = result;</div><div class='hunk'>@@ -199,7 +202,7 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	union acpi_operand_object *return_desc;</div><div class='ctx'> 	u8 *new_buf;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_convert_to_buffer", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_convert_to_buffer, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {</div><div class='ctx'> 	case ACPI_TYPE_BUFFER:</div><div class='hunk'>@@ -319,6 +322,7 @@ acpi_ex_convert_to_ascii(acpi_integer integer,</div><div class='ctx'> 		remainder = 0;</div><div class='ctx'> </div><div class='ctx'> 		for (i = decimal_length; i &gt; 0; i--) {</div><div class='add'>+</div><div class='ctx'> 			/* Divide by nth factor of 10 */</div><div class='ctx'> </div><div class='ctx'> 			digit = integer;</div><div class='hunk'>@@ -346,6 +350,7 @@ acpi_ex_convert_to_ascii(acpi_integer integer,</div><div class='ctx'> </div><div class='ctx'> 		hex_length = (acpi_native_uint) ACPI_MUL_2(data_width);</div><div class='ctx'> 		for (i = 0, j = (hex_length - 1); i &lt; hex_length; i++, j--) {</div><div class='add'>+</div><div class='ctx'> 			/* Get one hex digit, most significant digits first */</div><div class='ctx'> </div><div class='ctx'> 			string[k] =</div><div class='hunk'>@@ -400,7 +405,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,</div><div class='ctx'> 	u16 base = 16;</div><div class='ctx'> 	u8 separator = ',';</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_convert_to_string", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_convert_to_string, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {</div><div class='ctx'> 	case ACPI_TYPE_STRING:</div><div class='hunk'>@@ -567,7 +572,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_convert_to_target_type");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_convert_to_target_type);</div><div class='ctx'> </div><div class='ctx'> 	/* Default behavior */</div><div class='ctx'> </div><div class='hunk'>@@ -657,7 +662,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Unknown Target type ID 0x%X aml_opcode %X dest_type %s",</div><div class='add'>+			    "Unknown Target type ID 0x%X AmlOpcode %X DestType %s",</div><div class='ctx'> 			    GET_CURRENT_ARG_TYPE(walk_state-&gt;op_info-&gt;</div><div class='ctx'> 						 runtime_args),</div><div class='ctx'> 			    walk_state-&gt;opcode,</div><div class='head'>diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c<br/>index 680575402835..34eec82c1b1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/excreate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/excreate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/excreate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/excreate.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	struct acpi_namespace_node *alias_node;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_create_alias");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_create_alias);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the source/alias operands (both namespace nodes) */</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +164,7 @@ acpi_status acpi_ex_create_event(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_create_event");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_create_event);</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_EVENT);</div><div class='ctx'> 	if (!obj_desc) {</div><div class='hunk'>@@ -177,7 +177,7 @@ acpi_status acpi_ex_create_event(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	 * that the event is created in an unsignalled state</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_os_create_semaphore(ACPI_NO_UNIT_LIMIT, 0,</div><div class='del'>-					  &amp;obj_desc-&gt;event.semaphore);</div><div class='add'>+					  &amp;obj_desc-&gt;event.os_semaphore);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -216,7 +216,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_create_mutex", ACPI_WALK_OPERANDS);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_create_mutex, ACPI_WALK_OPERANDS);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the new mutex object */</div><div class='ctx'> </div><div class='hunk'>@@ -226,12 +226,9 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Create the actual OS semaphore.</div><div class='del'>-	 * One unit max to make it a mutex, with one initial unit to allow</div><div class='del'>-	 * the mutex to be acquired.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_os_create_semaphore(1, 1, &amp;obj_desc-&gt;mutex.semaphore);</div><div class='add'>+	/* Create the actual OS Mutex */</div><div class='add'>+</div><div class='add'>+	status = acpi_os_create_mutex(&amp;obj_desc-&gt;mutex.os_mutex);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -243,8 +240,9 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	obj_desc-&gt;mutex.node =</div><div class='ctx'> 	    (struct acpi_namespace_node *)walk_state-&gt;operands[0];</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_attach_object(obj_desc-&gt;mutex.node,</div><div class='del'>-				       obj_desc, ACPI_TYPE_MUTEX);</div><div class='add'>+	status =</div><div class='add'>+	    acpi_ns_attach_object(obj_desc-&gt;mutex.node, obj_desc,</div><div class='add'>+				  ACPI_TYPE_MUTEX);</div><div class='ctx'> </div><div class='ctx'>       cleanup:</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -280,7 +278,7 @@ acpi_ex_create_region(u8 * aml_start,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_create_region");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_create_region);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the Namespace Node */</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +298,7 @@ acpi_ex_create_region(u8 * aml_start,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((region_space &gt;= ACPI_NUM_PREDEFINED_REGIONS) &amp;&amp;</div><div class='ctx'> 	    (region_space &lt; ACPI_USER_REGION_BEGIN)) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid address_space type %X",</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid AddressSpace type %X",</div><div class='ctx'> 			    region_space));</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -364,7 +362,7 @@ acpi_status acpi_ex_create_table_region(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	struct acpi_table_header *table;</div><div class='ctx'> 	union acpi_operand_object *region_obj2;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_create_table_region");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_create_table_region);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the Node from the object stack  */</div><div class='ctx'> </div><div class='hunk'>@@ -452,7 +450,7 @@ acpi_status acpi_ex_create_processor(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_create_processor", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_create_processor, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the processor object */</div><div class='ctx'> </div><div class='hunk'>@@ -464,9 +462,9 @@ acpi_status acpi_ex_create_processor(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	/* Initialize the processor object from the operands */</div><div class='ctx'> </div><div class='ctx'> 	obj_desc-&gt;processor.proc_id = (u8) operand[1]-&gt;integer.value;</div><div class='add'>+	obj_desc-&gt;processor.length = (u8) operand[3]-&gt;integer.value;</div><div class='ctx'> 	obj_desc-&gt;processor.address =</div><div class='ctx'> 	    (acpi_io_address) operand[2]-&gt;integer.value;</div><div class='del'>-	obj_desc-&gt;processor.length = (u8) operand[3]-&gt;integer.value;</div><div class='ctx'> </div><div class='ctx'> 	/* Install the processor object in the parent Node */</div><div class='ctx'> </div><div class='hunk'>@@ -499,7 +497,7 @@ acpi_status acpi_ex_create_power_resource(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_create_power_resource", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_create_power_resource, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the power resource object */</div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +547,7 @@ acpi_ex_create_method(u8 * aml_start,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u8 method_flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_create_method", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_create_method, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Create a new method object */</div><div class='ctx'> </div><div class='hunk'>@@ -564,7 +562,7 @@ acpi_ex_create_method(u8 * aml_start,</div><div class='ctx'> 	obj_desc-&gt;method.aml_length = aml_length;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Disassemble the method flags.  Split off the Arg Count</div><div class='add'>+	 * Disassemble the method flags. Split off the Arg Count</div><div class='ctx'> 	 * for efficiency</div><div class='ctx'> 	 */</div><div class='ctx'> 	method_flags = (u8) operand[1]-&gt;integer.value;</div><div class='hunk'>@@ -575,21 +573,19 @@ acpi_ex_create_method(u8 * aml_start,</div><div class='ctx'> 	    (u8) (method_flags &amp; AML_METHOD_ARG_COUNT);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Get the concurrency count.  If required, a semaphore will be</div><div class='add'>+	 * Get the sync_level. If method is serialized, a mutex will be</div><div class='ctx'> 	 * created for this method when it is parsed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (acpi_gbl_all_methods_serialized) {</div><div class='del'>-		obj_desc-&gt;method.concurrency = 1;</div><div class='add'>+		obj_desc-&gt;method.sync_level = 0;</div><div class='ctx'> 		obj_desc-&gt;method.method_flags |= AML_METHOD_SERIALIZED;</div><div class='ctx'> 	} else if (method_flags &amp; AML_METHOD_SERIALIZED) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * ACPI 1.0: Concurrency = 1</div><div class='del'>-		 * ACPI 2.0: Concurrency = (sync_level (in method declaration) + 1)</div><div class='add'>+		 * ACPI 1.0: sync_level = 0</div><div class='add'>+		 * ACPI 2.0: sync_level = sync_level in method declaration</div><div class='ctx'> 		 */</div><div class='del'>-		obj_desc-&gt;method.concurrency = (u8)</div><div class='del'>-		    (((method_flags &amp; AML_METHOD_SYNCH_LEVEL) &gt;&gt; 4) + 1);</div><div class='del'>-	} else {</div><div class='del'>-		obj_desc-&gt;method.concurrency = ACPI_INFINITE_CONCURRENCY;</div><div class='add'>+		obj_desc-&gt;method.sync_level = (u8)</div><div class='add'>+		    ((method_flags &amp; AML_METHOD_SYNCH_LEVEL) &gt;&gt; 4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Attach the new object to the method Node */</div><div class='head'>diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c<br/>index a7cca8d4f855..2450943add33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exdump.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exdump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exdump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exdump.c</a></div><div class='hunk'>@@ -61,6 +61,10 @@ static void acpi_ex_out_pointer(char *title, void *value);</div><div class='ctx'> </div><div class='ctx'> static void acpi_ex_out_address(char *title, acpi_physical_address value);</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+acpi_ex_dump_object(union acpi_operand_object *obj_desc,</div><div class='add'>+		    struct acpi_exdump_info *info);</div><div class='add'>+</div><div class='ctx'> static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -114,14 +118,14 @@ static struct acpi_exdump_info acpi_ex_dump_device[4] = {</div><div class='ctx'> </div><div class='ctx'> static struct acpi_exdump_info acpi_ex_dump_event[2] = {</div><div class='ctx'> 	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_event), NULL},</div><div class='del'>-	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(event.semaphore), "Semaphore"}</div><div class='add'>+	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(event.os_semaphore), "OsSemaphore"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct acpi_exdump_info acpi_ex_dump_method[8] = {</div><div class='ctx'> 	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},</div><div class='del'>-	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "param_count"},</div><div class='del'>-	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.concurrency), "Concurrency"},</div><div class='del'>-	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.semaphore), "Semaphore"},</div><div class='add'>+	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "ParamCount"},</div><div class='add'>+	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.sync_level), "Sync Level"},</div><div class='add'>+	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.mutex), "Mutex"},</div><div class='ctx'> 	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.owner_id), "Owner Id"},</div><div class='ctx'> 	{ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.thread_count), "Thread Count"},</div><div class='ctx'> 	{ACPI_EXD_UINT32, ACPI_EXD_OFFSET(method.aml_length), "Aml Length"},</div><div class='hunk'>@@ -134,7 +138,7 @@ static struct acpi_exdump_info acpi_ex_dump_mutex[5] = {</div><div class='ctx'> 	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread), "Owner Thread"},</div><div class='ctx'> 	{ACPI_EXD_UINT16, ACPI_EXD_OFFSET(mutex.acquisition_depth),</div><div class='ctx'> 	 "Acquire Depth"},</div><div class='del'>-	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.semaphore), "Semaphore"}</div><div class='add'>+	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.os_mutex), "OsMutex"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct acpi_exdump_info acpi_ex_dump_region[7] = {</div><div class='hunk'>@@ -263,12 +267,10 @@ static struct acpi_exdump_info acpi_ex_dump_field_common[7] = {</div><div class='ctx'> 	{ACPI_EXD_POINTER, ACPI_EXD_OFFSET(common_field.node), "Parent Node"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct acpi_exdump_info acpi_ex_dump_node[6] = {</div><div class='add'>+static struct acpi_exdump_info acpi_ex_dump_node[5] = {</div><div class='ctx'> 	{ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_node), NULL},</div><div class='ctx'> 	{ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET(flags), "Flags"},</div><div class='ctx'> 	{ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET(owner_id), "Owner Id"},</div><div class='del'>-	{ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET(reference_count),</div><div class='del'>-	 "Reference Count"},</div><div class='ctx'> 	{ACPI_EXD_POINTER, ACPI_EXD_NSOFFSET(child), "Child List"},</div><div class='ctx'> 	{ACPI_EXD_POINTER, ACPI_EXD_NSOFFSET(peer), "Next Peer"}</div><div class='ctx'> };</div><div class='hunk'>@@ -330,7 +332,7 @@ acpi_ex_dump_object(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 	if (!info) {</div><div class='ctx'> 		acpi_os_printf</div><div class='del'>-		    ("ex_dump_object: Display not implemented for object type %s\n",</div><div class='add'>+		    ("ExDumpObject: Display not implemented for object type %s\n",</div><div class='ctx'> 		     acpi_ut_get_object_type_name(obj_desc));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -454,7 +456,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	u32 index;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ex_dump_operand")</div><div class='add'>+	ACPI_FUNCTION_NAME(ex_dump_operand)</div><div class='ctx'> </div><div class='ctx'> 	    if (!</div><div class='ctx'> 		((ACPI_LV_EXEC &amp; acpi_dbg_level)</div><div class='hunk'>@@ -463,6 +465,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* This could be a null element of a package */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Null Object Descriptor\n"));</div><div class='hunk'>@@ -522,7 +525,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> </div><div class='ctx'> 		case AML_REF_OF_OP:</div><div class='ctx'> </div><div class='del'>-			acpi_os_printf("Reference: (ref_of) %p\n",</div><div class='add'>+			acpi_os_printf("Reference: (RefOf) %p\n",</div><div class='ctx'> 				       obj_desc-&gt;reference.object);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -532,6 +535,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> 				       obj_desc-&gt;reference.offset);</div><div class='ctx'> </div><div class='ctx'> 			if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {</div><div class='add'>+</div><div class='ctx'> 				/* Value is an Integer */</div><div class='ctx'> </div><div class='ctx'> 				acpi_os_printf(" value is [%8.8X%8.8x]",</div><div class='hunk'>@@ -610,7 +614,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_PACKAGE:</div><div class='ctx'> </div><div class='del'>-		acpi_os_printf("Package [Len %X] element_array %p\n",</div><div class='add'>+		acpi_os_printf("Package [Len %X] ElementArray %p\n",</div><div class='ctx'> 			       obj_desc-&gt;package.count,</div><div class='ctx'> 			       obj_desc-&gt;package.elements);</div><div class='ctx'> </div><div class='hunk'>@@ -662,13 +666,13 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_LOCAL_BANK_FIELD:</div><div class='ctx'> </div><div class='del'>-		acpi_os_printf("bank_field\n");</div><div class='add'>+		acpi_os_printf("BankField\n");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_LOCAL_REGION_FIELD:</div><div class='ctx'> </div><div class='ctx'> 		acpi_os_printf</div><div class='del'>-		    ("region_field: Bits=%X acc_width=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n",</div><div class='add'>+		    ("RegionField: Bits=%X AccWidth=%X Lock=%X Update=%X at byte=%X bit=%X of below:\n",</div><div class='ctx'> 		     obj_desc-&gt;field.bit_length,</div><div class='ctx'> 		     obj_desc-&gt;field.access_byte_width,</div><div class='ctx'> 		     obj_desc-&gt;field.field_flags &amp; AML_FIELD_LOCK_RULE_MASK,</div><div class='hunk'>@@ -681,12 +685,12 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_LOCAL_INDEX_FIELD:</div><div class='ctx'> </div><div class='del'>-		acpi_os_printf("index_field\n");</div><div class='add'>+		acpi_os_printf("IndexField\n");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_BUFFER_FIELD:</div><div class='ctx'> </div><div class='del'>-		acpi_os_printf("buffer_field: %X bits at byte %X bit %X of\n",</div><div class='add'>+		acpi_os_printf("BufferField: %X bits at byte %X bit %X of\n",</div><div class='ctx'> 			       obj_desc-&gt;buffer_field.bit_length,</div><div class='ctx'> 			       obj_desc-&gt;buffer_field.base_byte_offset,</div><div class='ctx'> 			       obj_desc-&gt;buffer_field.start_field_bit_offset);</div><div class='hunk'>@@ -777,7 +781,7 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ex_dump_operands");</div><div class='add'>+	ACPI_FUNCTION_NAME(ex_dump_operands);</div><div class='ctx'> </div><div class='ctx'> 	if (!ident) {</div><div class='ctx'> 		ident = "?";</div><div class='hunk'>@@ -901,7 +905,7 @@ static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)</div><div class='ctx'> 			acpi_os_printf("Could not convert name to pathname\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			acpi_os_printf("%s\n", (char *)ret_buf.pointer);</div><div class='del'>-			ACPI_MEM_FREE(ret_buf.pointer);</div><div class='add'>+			ACPI_FREE(ret_buf.pointer);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (obj_desc-&gt;reference.object) {</div><div class='ctx'> 		acpi_os_printf("\nReferenced Object: %p\n",</div><div class='hunk'>@@ -1017,7 +1021,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,</div><div class='ctx'> void</div><div class='ctx'> acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_dump_object_descriptor");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_dump_object_descriptor);</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		return_VOID;</div><div class='hunk'>@@ -1046,7 +1050,7 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_OPERAND) {</div><div class='ctx'> 		acpi_os_printf</div><div class='del'>-		    ("ex_dump_object_descriptor: %p is not an ACPI operand object: [%s]\n",</div><div class='add'>+		    ("ExDumpObjectDescriptor: %p is not an ACPI operand object: [%s]\n",</div><div class='ctx'> 		     obj_desc, acpi_ut_get_descriptor_name(obj_desc));</div><div class='ctx'> 		return_VOID;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c<br/>index e259201ce9a0..9ea9c3a67ca9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exfield.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exfield.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exfield.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exfield.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	void *buffer;</div><div class='ctx'> 	u8 locked;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_read_data_from_field", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_read_data_from_field, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -142,6 +142,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	length =</div><div class='ctx'> 	    (acpi_size) ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc-&gt;field.bit_length);</div><div class='ctx'> 	if (length &gt; acpi_gbl_integer_byte_width) {</div><div class='add'>+</div><div class='ctx'> 		/* Field is too large for an Integer, create a Buffer instead */</div><div class='ctx'> </div><div class='ctx'> 		buffer_desc = acpi_ut_create_buffer_object(length);</div><div class='hunk'>@@ -163,11 +164,11 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-			  "field_read [TO]:  Obj %p, Type %X, Buf %p, byte_len %X\n",</div><div class='add'>+			  "FieldRead [TO]:   Obj %p, Type %X, Buf %p, ByteLen %X\n",</div><div class='ctx'> 			  obj_desc, ACPI_GET_OBJECT_TYPE(obj_desc), buffer,</div><div class='ctx'> 			  (u32) length));</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-			  "field_read [FROM]: bit_len %X, bit_off %X, byte_off %X\n",</div><div class='add'>+			  "FieldRead [FROM]: BitLen %X, BitOff %X, ByteOff %X\n",</div><div class='ctx'> 			  obj_desc-&gt;common_field.bit_length,</div><div class='ctx'> 			  obj_desc-&gt;common_field.start_field_bit_offset,</div><div class='ctx'> 			  obj_desc-&gt;common_field.base_byte_offset));</div><div class='hunk'>@@ -219,7 +220,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> 	u8 locked;</div><div class='ctx'> 	union acpi_operand_object *buffer_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_write_data_to_field", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_write_data_to_field, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -329,9 +330,10 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> 	    ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc-&gt;common_field.bit_length);</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; required_length) {</div><div class='add'>+</div><div class='ctx'> 		/* We need to create a new buffer */</div><div class='ctx'> </div><div class='del'>-		new_buffer = ACPI_MEM_CALLOCATE(required_length);</div><div class='add'>+		new_buffer = ACPI_ALLOCATE_ZEROED(required_length);</div><div class='ctx'> 		if (!new_buffer) {</div><div class='ctx'> 			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -347,14 +349,14 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-			  "field_write [FROM]: Obj %p (%s:%X), Buf %p, byte_len %X\n",</div><div class='add'>+			  "FieldWrite [FROM]: Obj %p (%s:%X), Buf %p, ByteLen %X\n",</div><div class='ctx'> 			  source_desc,</div><div class='ctx'> 			  acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE</div><div class='ctx'> 						(source_desc)),</div><div class='ctx'> 			  ACPI_GET_OBJECT_TYPE(source_desc), buffer, length));</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-			  "field_write [TO]:  Obj %p (%s:%X), bit_len %X, bit_off %X, byte_off %X\n",</div><div class='add'>+			  "FieldWrite [TO]:   Obj %p (%s:%X), BitLen %X, BitOff %X, ByteOff %X\n",</div><div class='ctx'> 			  obj_desc,</div><div class='ctx'> 			  acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE(obj_desc)),</div><div class='ctx'> 			  ACPI_GET_OBJECT_TYPE(obj_desc),</div><div class='hunk'>@@ -375,7 +377,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,</div><div class='ctx'> 	/* Free temporary buffer if we used one */</div><div class='ctx'> </div><div class='ctx'> 	if (new_buffer) {</div><div class='del'>-		ACPI_MEM_FREE(new_buffer);</div><div class='add'>+		ACPI_FREE(new_buffer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='head'>diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c<br/>index bd1af35f7fcf..40f0bee6faa5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exfldio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exfldio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exfldio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exfldio.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object *rgn_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ex_setup_region", field_datum_byte_offset);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset);</div><div class='ctx'> </div><div class='ctx'> 	rgn_desc = obj_desc-&gt;common_field.region_obj;</div><div class='ctx'> </div><div class='hunk'>@@ -112,7 +112,18 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Exit if Address/Length have been disallowed by the host OS */</div><div class='add'>+</div><div class='add'>+	if (rgn_desc-&gt;common.flags &amp; AOPOBJ_INVALID) {</div><div class='add'>+		return_ACPI_STATUS(AE_AML_ILLEGAL_ADDRESS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Exit now for SMBus address space, it has a non-linear address space</div><div class='add'>+	 * and the request cannot be directly validated</div><div class='add'>+	 */</div><div class='ctx'> 	if (rgn_desc-&gt;region.space_id == ACPI_ADR_SPACE_SMBUS) {</div><div class='add'>+</div><div class='ctx'> 		/* SMBus has a non-linear address space */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -134,10 +145,10 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	 * length of one field datum (access width) must fit within the region.</div><div class='ctx'> 	 * (Region length is specified in bytes)</div><div class='ctx'> 	 */</div><div class='del'>-	if (rgn_desc-&gt;region.length &lt; (obj_desc-&gt;common_field.base_byte_offset +</div><div class='del'>-				       field_datum_byte_offset +</div><div class='del'>-				       obj_desc-&gt;common_field.</div><div class='del'>-				       access_byte_width)) {</div><div class='add'>+	if (rgn_desc-&gt;region.length &lt;</div><div class='add'>+	    (obj_desc-&gt;common_field.base_byte_offset +</div><div class='add'>+	     field_datum_byte_offset +</div><div class='add'>+	     obj_desc-&gt;common_field.access_byte_width)) {</div><div class='ctx'> 		if (acpi_gbl_enable_interpreter_slack) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Slack mode only:  We will go ahead and allow access to this</div><div class='hunk'>@@ -217,7 +228,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	union acpi_operand_object *rgn_desc;</div><div class='ctx'> 	acpi_physical_address address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_access_region");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_access_region);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that the region operands are fully evaluated and verify</div><div class='hunk'>@@ -246,7 +257,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_BFIELD,</div><div class='del'>-			      " Region [%s:%X], Width %X, byte_base %X, Offset %X at %8.8X%8.8X\n",</div><div class='add'>+			      " Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n",</div><div class='ctx'> 			      acpi_ut_get_region_name(rgn_desc-&gt;region.</div><div class='ctx'> 						      space_id),</div><div class='ctx'> 			      rgn_desc-&gt;region.space_id,</div><div class='hunk'>@@ -352,7 +363,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_integer local_value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ex_field_datum_io", field_datum_byte_offset);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ex_field_datum_io, field_datum_byte_offset);</div><div class='ctx'> </div><div class='ctx'> 	if (read_write == ACPI_READ) {</div><div class='ctx'> 		if (!value) {</div><div class='hunk'>@@ -487,10 +498,11 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-				  "I/O to Data Register: value_ptr %p\n",</div><div class='add'>+				  "I/O to Data Register: ValuePtr %p\n",</div><div class='ctx'> 				  value));</div><div class='ctx'> </div><div class='ctx'> 		if (read_write == ACPI_READ) {</div><div class='add'>+</div><div class='ctx'> 			/* Read the datum from the data_register */</div><div class='ctx'> </div><div class='ctx'> 			status =</div><div class='hunk'>@@ -559,7 +571,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	acpi_integer merged_value;</div><div class='ctx'> 	acpi_integer current_value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ex_write_with_update_rule", mask);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ex_write_with_update_rule, mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Start with the new bits  */</div><div class='ctx'> </div><div class='hunk'>@@ -568,6 +580,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	/* If the mask is all ones, we don't need to worry about the update rule */</div><div class='ctx'> </div><div class='ctx'> 	if (mask != ACPI_INTEGER_MAX) {</div><div class='add'>+</div><div class='ctx'> 		/* Decode the update rule */</div><div class='ctx'> </div><div class='ctx'> 		switch (obj_desc-&gt;common_field.</div><div class='hunk'>@@ -614,7 +627,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		default:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Unknown update_rule value: %X",</div><div class='add'>+				    "Unknown UpdateRule value: %X",</div><div class='ctx'> 				    (obj_desc-&gt;common_field.</div><div class='ctx'> 				     field_flags &amp;</div><div class='ctx'> 				     AML_FIELD_UPDATE_RULE_MASK)));</div><div class='hunk'>@@ -623,7 +636,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-			  "Mask %8.8X%8.8X, datum_offset %X, Width %X, Value %8.8X%8.8X, merged_value %8.8X%8.8X\n",</div><div class='add'>+			  "Mask %8.8X%8.8X, DatumOffset %X, Width %X, Value %8.8X%8.8X, MergedValue %8.8X%8.8X\n",</div><div class='ctx'> 			  ACPI_FORMAT_UINT64(mask),</div><div class='ctx'> 			  field_datum_byte_offset,</div><div class='ctx'> 			  obj_desc-&gt;common_field.access_byte_width,</div><div class='hunk'>@@ -666,7 +679,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	u32 field_datum_count;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_extract_from_field");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_extract_from_field);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate target buffer and clear it */</div><div class='ctx'> </div><div class='hunk'>@@ -704,6 +717,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	/* Read the rest of the field */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; field_datum_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Get next input datum from the field */</div><div class='ctx'> </div><div class='ctx'> 		field_offset += obj_desc-&gt;common_field.access_byte_width;</div><div class='hunk'>@@ -713,11 +727,23 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Merge with previous datum if necessary */</div><div class='del'>-</div><div class='del'>-		merged_datum |= raw_datum &lt;&lt;</div><div class='del'>-		    (obj_desc-&gt;common_field.access_bit_width -</div><div class='del'>-		     obj_desc-&gt;common_field.start_field_bit_offset);</div><div class='add'>+		/*</div><div class='add'>+		 * Merge with previous datum if necessary.</div><div class='add'>+		 *</div><div class='add'>+		 * Note: Before the shift, check if the shift value will be larger than</div><div class='add'>+		 * the integer size. If so, there is no need to perform the operation.</div><div class='add'>+		 * This avoids the differences in behavior between different compilers</div><div class='add'>+		 * concerning shift values larger than the target data width.</div><div class='add'>+		 */</div><div class='add'>+		if ((obj_desc-&gt;common_field.access_bit_width -</div><div class='add'>+		     obj_desc-&gt;common_field.start_field_bit_offset) &lt;</div><div class='add'>+		    ACPI_INTEGER_BIT_SIZE) {</div><div class='add'>+			merged_datum |=</div><div class='add'>+			    raw_datum &lt;&lt; (obj_desc-&gt;common_field.</div><div class='add'>+					  access_bit_width -</div><div class='add'>+					  obj_desc-&gt;common_field.</div><div class='add'>+					  start_field_bit_offset);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (i == datum_count) {</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -771,6 +797,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_integer mask;</div><div class='add'>+	acpi_integer width_mask;</div><div class='ctx'> 	acpi_integer merged_datum;</div><div class='ctx'> 	acpi_integer raw_datum = 0;</div><div class='ctx'> 	u32 field_offset = 0;</div><div class='hunk'>@@ -780,7 +807,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	u32 field_datum_count;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_insert_into_field");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_insert_into_field);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate input buffer */</div><div class='ctx'> </div><div class='hunk'>@@ -793,17 +820,32 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 		return_ACPI_STATUS(AE_BUFFER_OVERFLOW);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Compute the number of datums (access width data items) */</div><div class='add'>+	/*</div><div class='add'>+	 * Create the bitmasks used for bit insertion.</div><div class='add'>+	 * Note: This if/else is used to bypass compiler differences with the</div><div class='add'>+	 * shift operator</div><div class='add'>+	 */</div><div class='add'>+	if (obj_desc-&gt;common_field.access_bit_width == ACPI_INTEGER_BIT_SIZE) {</div><div class='add'>+		width_mask = ACPI_INTEGER_MAX;</div><div class='add'>+	} else {</div><div class='add'>+		width_mask =</div><div class='add'>+		    ACPI_MASK_BITS_ABOVE(obj_desc-&gt;common_field.</div><div class='add'>+					 access_bit_width);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mask =</div><div class='add'>+	mask = width_mask &amp;</div><div class='ctx'> 	    ACPI_MASK_BITS_BELOW(obj_desc-&gt;common_field.start_field_bit_offset);</div><div class='del'>-	datum_count =</div><div class='del'>-	    ACPI_ROUND_UP_TO(obj_desc-&gt;common_field.bit_length,</div><div class='del'>-			     obj_desc-&gt;common_field.access_bit_width);</div><div class='del'>-	field_datum_count =</div><div class='del'>-	    ACPI_ROUND_UP_TO(obj_desc-&gt;common_field.bit_length +</div><div class='del'>-			     obj_desc-&gt;common_field.start_field_bit_offset,</div><div class='del'>-			     obj_desc-&gt;common_field.access_bit_width);</div><div class='add'>+</div><div class='add'>+	/* Compute the number of datums (access width data items) */</div><div class='add'>+</div><div class='add'>+	datum_count = ACPI_ROUND_UP_TO(obj_desc-&gt;common_field.bit_length,</div><div class='add'>+				       obj_desc-&gt;common_field.access_bit_width);</div><div class='add'>+</div><div class='add'>+	field_datum_count = ACPI_ROUND_UP_TO(obj_desc-&gt;common_field.bit_length +</div><div class='add'>+					     obj_desc-&gt;common_field.</div><div class='add'>+					     start_field_bit_offset,</div><div class='add'>+					     obj_desc-&gt;common_field.</div><div class='add'>+					     access_bit_width);</div><div class='ctx'> </div><div class='ctx'> 	/* Get initial Datum from the input buffer */</div><div class='ctx'> </div><div class='hunk'>@@ -817,6 +859,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	/* Write the entire field */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; field_datum_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Write merged datum to the target field */</div><div class='ctx'> </div><div class='ctx'> 		merged_datum &amp;= mask;</div><div class='hunk'>@@ -827,13 +870,30 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Start new output datum by merging with previous input datum */</div><div class='del'>-</div><div class='ctx'> 		field_offset += obj_desc-&gt;common_field.access_byte_width;</div><div class='del'>-		merged_datum = raw_datum &gt;&gt;</div><div class='del'>-		    (obj_desc-&gt;common_field.access_bit_width -</div><div class='del'>-		     obj_desc-&gt;common_field.start_field_bit_offset);</div><div class='del'>-		mask = ACPI_INTEGER_MAX;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Start new output datum by merging with previous input datum</div><div class='add'>+		 * if necessary.</div><div class='add'>+		 *</div><div class='add'>+		 * Note: Before the shift, check if the shift value will be larger than</div><div class='add'>+		 * the integer size. If so, there is no need to perform the operation.</div><div class='add'>+		 * This avoids the differences in behavior between different compilers</div><div class='add'>+		 * concerning shift values larger than the target data width.</div><div class='add'>+		 */</div><div class='add'>+		if ((obj_desc-&gt;common_field.access_bit_width -</div><div class='add'>+		     obj_desc-&gt;common_field.start_field_bit_offset) &lt;</div><div class='add'>+		    ACPI_INTEGER_BIT_SIZE) {</div><div class='add'>+			merged_datum =</div><div class='add'>+			    raw_datum &gt;&gt; (obj_desc-&gt;common_field.</div><div class='add'>+					  access_bit_width -</div><div class='add'>+					  obj_desc-&gt;common_field.</div><div class='add'>+					  start_field_bit_offset);</div><div class='add'>+		} else {</div><div class='add'>+			merged_datum = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mask = width_mask;</div><div class='ctx'> </div><div class='ctx'> 		if (i == datum_count) {</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c<br/>index 48c18d29222a..bd98aab017cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exmisc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exmisc.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	union acpi_operand_object *reference_obj;</div><div class='ctx'> 	union acpi_operand_object *referenced_obj;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_get_object_reference", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_get_object_reference, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	*return_desc = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +168,7 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,</div><div class='ctx'> 	acpi_size length1;</div><div class='ctx'> 	acpi_size new_length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_concat_template");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_concat_template);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Find the end_tag descriptor in each resource template.</div><div class='hunk'>@@ -250,7 +250,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,</div><div class='ctx'> 	char *new_buf;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_do_concatenate");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_do_concatenate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Convert the second operand if necessary.  The first operand</div><div class='hunk'>@@ -445,10 +445,24 @@ acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1)</div><div class='ctx'> </div><div class='ctx'> 	case AML_SHIFT_LEFT_OP:	/* shift_left (Operand, shift_count, Result) */</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * We need to check if the shiftcount is larger than the integer bit</div><div class='add'>+		 * width since the behavior of this is not well-defined in the C language.</div><div class='add'>+		 */</div><div class='add'>+		if (integer1 &gt;= acpi_gbl_integer_bit_width) {</div><div class='add'>+			return (0);</div><div class='add'>+		}</div><div class='ctx'> 		return (integer0 &lt;&lt; integer1);</div><div class='ctx'> </div><div class='ctx'> 	case AML_SHIFT_RIGHT_OP:	/* shift_right (Operand, shift_count, Result) */</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * We need to check if the shiftcount is larger than the integer bit</div><div class='add'>+		 * width since the behavior of this is not well-defined in the C language.</div><div class='add'>+		 */</div><div class='add'>+		if (integer1 &gt;= acpi_gbl_integer_bit_width) {</div><div class='add'>+			return (0);</div><div class='add'>+		}</div><div class='ctx'> 		return (integer0 &gt;&gt; integer1);</div><div class='ctx'> </div><div class='ctx'> 	case AML_SUBTRACT_OP:	/* Subtract (Integer0, Integer1, Result) */</div><div class='hunk'>@@ -489,7 +503,7 @@ acpi_ex_do_logical_numeric_op(u16 opcode,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u8 local_result = FALSE;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_do_logical_numeric_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_do_logical_numeric_op);</div><div class='ctx'> </div><div class='ctx'> 	switch (opcode) {</div><div class='ctx'> 	case AML_LAND_OP:	/* LAnd (Integer0, Integer1) */</div><div class='hunk'>@@ -557,7 +571,7 @@ acpi_ex_do_logical_op(u16 opcode,</div><div class='ctx'> 	u8 local_result = FALSE;</div><div class='ctx'> 	int compare;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_do_logical_op");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_do_logical_op);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Convert the second operand if necessary.  The first operand</div><div class='hunk'>@@ -649,6 +663,7 @@ acpi_ex_do_logical_op(u16 opcode,</div><div class='ctx'> 			/* Length and all bytes must be equal */</div><div class='ctx'> </div><div class='ctx'> 			if ((length0 == length1) &amp;&amp; (compare == 0)) {</div><div class='add'>+</div><div class='ctx'> 				/* Length and all bytes match ==&gt; TRUE */</div><div class='ctx'> </div><div class='ctx'> 				local_result = TRUE;</div><div class='head'>diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c<br/>index f843b22e20b9..3a39c2e8e104 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exmutex.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exmutex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exmutex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exmutex.c</a></div><div class='hunk'>@@ -61,7 +61,7 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      None</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Remove a mutex from the "acquired_mutex" list</div><div class='add'>+ * DESCRIPTION: Remove a mutex from the "AcquiredMutex" list</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -95,7 +95,7 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      None</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Add a mutex to the "acquired_mutex" list for this walk</div><div class='add'>+ * DESCRIPTION: Add a mutex to the "AcquiredMutex" list for this walk</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -144,7 +144,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_acquire_mutex", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_acquire_mutex, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -161,24 +161,25 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Current Sync must be less than or equal to the sync level of the</div><div class='del'>-	 * mutex.  This mechanism provides some deadlock prevention</div><div class='add'>+	 * mutex. This mechanism provides some deadlock prevention</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (walk_state-&gt;thread-&gt;current_sync_level &gt; obj_desc-&gt;mutex.sync_level) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Cannot acquire Mutex [%4.4s], incorrect sync_level",</div><div class='del'>-			    acpi_ut_get_node_name(obj_desc-&gt;mutex.node)));</div><div class='add'>+			    "Cannot acquire Mutex [%4.4s], current SyncLevel is too large (%d)",</div><div class='add'>+			    acpi_ut_get_node_name(obj_desc-&gt;mutex.node),</div><div class='add'>+			    walk_state-&gt;thread-&gt;current_sync_level));</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_MUTEX_ORDER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Support for multiple acquires by the owning thread */</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc-&gt;mutex.owner_thread) {</div><div class='add'>+</div><div class='ctx'> 		/* Special case for Global Lock, allow all threads */</div><div class='ctx'> </div><div class='ctx'> 		if ((obj_desc-&gt;mutex.owner_thread-&gt;thread_id ==</div><div class='ctx'> 		     walk_state-&gt;thread-&gt;thread_id) ||</div><div class='del'>-		    (obj_desc-&gt;mutex.semaphore ==</div><div class='del'>-		     acpi_gbl_global_lock_semaphore)) {</div><div class='add'>+		    (obj_desc-&gt;mutex.os_mutex == ACPI_GLOBAL_LOCK)) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The mutex is already owned by this thread,</div><div class='ctx'> 			 * just increment the acquisition depth</div><div class='hunk'>@@ -192,6 +193,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ex_system_acquire_mutex(time_desc, obj_desc);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Includes failure from a timeout on time_desc */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -232,7 +234,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_release_mutex");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_release_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -262,12 +264,12 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((obj_desc-&gt;mutex.owner_thread-&gt;thread_id !=</div><div class='ctx'> 	     walk_state-&gt;thread-&gt;thread_id)</div><div class='del'>-	    &amp;&amp; (obj_desc-&gt;mutex.semaphore != acpi_gbl_global_lock_semaphore)) {</div><div class='add'>+	    &amp;&amp; (obj_desc-&gt;mutex.os_mutex != ACPI_GLOBAL_LOCK)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Thread %X cannot release Mutex [%4.4s] acquired by thread %X",</div><div class='del'>-			    walk_state-&gt;thread-&gt;thread_id,</div><div class='add'>+			    (u32) walk_state-&gt;thread-&gt;thread_id,</div><div class='ctx'> 			    acpi_ut_get_node_name(obj_desc-&gt;mutex.node),</div><div class='del'>-			    obj_desc-&gt;mutex.owner_thread-&gt;thread_id));</div><div class='add'>+			    (u32) obj_desc-&gt;mutex.owner_thread-&gt;thread_id));</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_NOT_OWNER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -277,7 +279,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (obj_desc-&gt;mutex.sync_level &gt; walk_state-&gt;thread-&gt;current_sync_level) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Cannot release Mutex [%4.4s], incorrect sync_level",</div><div class='add'>+			    "Cannot release Mutex [%4.4s], incorrect SyncLevel",</div><div class='ctx'> 			    acpi_ut_get_node_name(obj_desc-&gt;mutex.node)));</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_MUTEX_ORDER);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -286,6 +288,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,</div><div class='ctx'> </div><div class='ctx'> 	obj_desc-&gt;mutex.acquisition_depth--;</div><div class='ctx'> 	if (obj_desc-&gt;mutex.acquisition_depth != 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Just decrement the depth and return */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='head'>diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c<br/>index 054fe5e1a314..d3d70364626c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exnames.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exnames.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exnames.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exnames.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)</div><div class='ctx'> 	char *name_string;</div><div class='ctx'> 	u32 size_needed;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_allocate_name_string");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_allocate_name_string);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix.</div><div class='hunk'>@@ -85,6 +85,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)</div><div class='ctx'> 	 * This may actually be somewhat longer than needed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (prefix_count == ACPI_UINT32_MAX) {</div><div class='add'>+</div><div class='ctx'> 		/* Special case for root */</div><div class='ctx'> </div><div class='ctx'> 		size_needed = 1 + (ACPI_NAME_SIZE * num_name_segs) + 2 + 1;</div><div class='hunk'>@@ -97,7 +98,7 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)</div><div class='ctx'> 	 * Allocate a buffer for the name.</div><div class='ctx'> 	 * This buffer must be deleted by the caller!</div><div class='ctx'> 	 */</div><div class='del'>-	name_string = ACPI_MEM_ALLOCATE(size_needed);</div><div class='add'>+	name_string = ACPI_ALLOCATE(size_needed);</div><div class='ctx'> 	if (!name_string) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Could not allocate size %d", size_needed));</div><div class='hunk'>@@ -119,11 +120,13 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)</div><div class='ctx'> 	/* Set up Dual or Multi prefixes if needed */</div><div class='ctx'> </div><div class='ctx'> 	if (num_name_segs &gt; 2) {</div><div class='add'>+</div><div class='ctx'> 		/* Set up multi prefixes   */</div><div class='ctx'> </div><div class='ctx'> 		*temp_ptr++ = AML_MULTI_NAME_PREFIX_OP;</div><div class='ctx'> 		*temp_ptr++ = (char)num_name_segs;</div><div class='ctx'> 	} else if (2 == num_name_segs) {</div><div class='add'>+</div><div class='ctx'> 		/* Set up dual prefixes */</div><div class='ctx'> </div><div class='ctx'> 		*temp_ptr++ = AML_DUAL_NAME_PREFIX;</div><div class='hunk'>@@ -159,7 +162,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)</div><div class='ctx'> 	u32 index;</div><div class='ctx'> 	char char_buf[5];</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_name_segment");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_name_segment);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If first character is a digit, then we know that we aren't looking at a</div><div class='hunk'>@@ -176,7 +179,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0;</div><div class='ctx'> 	     (index &lt; ACPI_NAME_SIZE)</div><div class='del'>-	     &amp;&amp; (acpi_ut_valid_acpi_character(*aml_address)); index++) {</div><div class='add'>+	     &amp;&amp; (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) {</div><div class='ctx'> 		char_buf[index] = *aml_address++;</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -184,6 +187,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)</div><div class='ctx'> 	/* Valid name segment  */</div><div class='ctx'> </div><div class='ctx'> 	if (index == 4) {</div><div class='add'>+</div><div class='ctx'> 		/* Found 4 valid characters */</div><div class='ctx'> </div><div class='ctx'> 		char_buf[4] = '\0';</div><div class='hunk'>@@ -249,11 +253,12 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> 	u32 prefix_count = 0;</div><div class='ctx'> 	u8 has_prefix = FALSE;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_get_name_string", aml_address);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_get_name_string, aml_address);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||</div><div class='ctx'> 	    ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||</div><div class='ctx'> 	    ACPI_TYPE_LOCAL_INDEX_FIELD == data_type) {</div><div class='add'>+</div><div class='ctx'> 		/* Disallow prefixes for types associated with field_unit names */</div><div class='ctx'> </div><div class='ctx'> 		name_string = acpi_ex_allocate_name_string(0, 1);</div><div class='hunk'>@@ -272,7 +277,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> 		case AML_ROOT_PREFIX:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_LOAD,</div><div class='del'>-					  "root_prefix(\\) at %p\n",</div><div class='add'>+					  "RootPrefix(\\) at %p\n",</div><div class='ctx'> 					  aml_address));</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='hunk'>@@ -290,7 +295,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> </div><div class='ctx'> 			do {</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_LOAD,</div><div class='del'>-						  "parent_prefix (^) at %p\n",</div><div class='add'>+						  "ParentPrefix (^) at %p\n",</div><div class='ctx'> 						  aml_address));</div><div class='ctx'> </div><div class='ctx'> 				aml_address++;</div><div class='hunk'>@@ -314,7 +319,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> 		case AML_DUAL_NAME_PREFIX:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_LOAD,</div><div class='del'>-					  "dual_name_prefix at %p\n",</div><div class='add'>+					  "DualNamePrefix at %p\n",</div><div class='ctx'> 					  aml_address));</div><div class='ctx'> </div><div class='ctx'> 			aml_address++;</div><div class='hunk'>@@ -341,7 +346,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> 		case AML_MULTI_NAME_PREFIX_OP:</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_LOAD,</div><div class='del'>-					  "multi_name_prefix at %p\n",</div><div class='add'>+					  "MultiNamePrefix at %p\n",</div><div class='ctx'> 					  aml_address));</div><div class='ctx'> </div><div class='ctx'> 			/* Fetch count of segments remaining in name path */</div><div class='hunk'>@@ -377,7 +382,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> </div><div class='ctx'> 			if (prefix_count == ACPI_UINT32_MAX) {</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-						  "name_seg is \"\\\" followed by NULL\n"));</div><div class='add'>+						  "NameSeg is \"\\\" followed by NULL\n"));</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Consume the NULL byte */</div><div class='hunk'>@@ -410,6 +415,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (AE_CTRL_PENDING == status &amp;&amp; has_prefix) {</div><div class='add'>+</div><div class='ctx'> 		/* Ran out of segments after processing a prefix */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string));</div><div class='hunk'>@@ -418,7 +424,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		if (name_string) {</div><div class='del'>-			ACPI_MEM_FREE(name_string);</div><div class='add'>+			ACPI_FREE(name_string);</div><div class='ctx'> 		}</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c<br/>index 23d0823bcd5e..6374d8be88e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exoparg1.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object *return_desc = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_0A_0T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_0A_0T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Examine the AML opcode */</div><div class='hunk'>@@ -150,7 +150,7 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	union acpi_operand_object **operand = &amp;walk_state-&gt;operands[0];</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_0T_0R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_0R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Examine the AML opcode */</div><div class='hunk'>@@ -216,7 +216,7 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object **operand = &amp;walk_state-&gt;operands[0];</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_1T_0R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_0R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Examine the AML opcode */</div><div class='hunk'>@@ -264,7 +264,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_integer power_of_ten;</div><div class='ctx'> 	acpi_integer digit;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_1T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Examine the AML opcode */</div><div class='hunk'>@@ -322,8 +322,9 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 			/* Since the bit position is one-based, subtract from 33 (65) */</div><div class='ctx'> </div><div class='del'>-			return_desc-&gt;integer.value = temp32 == 0 ? 0 :</div><div class='del'>-			    (ACPI_INTEGER_BIT_SIZE + 1) - temp32;</div><div class='add'>+			return_desc-&gt;integer.value =</div><div class='add'>+			    temp32 ==</div><div class='add'>+			    0 ? 0 : (ACPI_INTEGER_BIT_SIZE + 1) - temp32;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AML_FROM_BCD_OP:	/* from_bcd (BCDValue, Result) */</div><div class='hunk'>@@ -342,6 +343,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			for (i = 0;</div><div class='ctx'> 			     (i &lt; acpi_gbl_integer_nybble_width) &amp;&amp; (digit &gt; 0);</div><div class='ctx'> 			     i++) {</div><div class='add'>+</div><div class='ctx'> 				/* Get the least significant 4-bit BCD digit */</div><div class='ctx'> </div><div class='ctx'> 				temp32 = ((u32) digit) &amp; 0xF;</div><div class='hunk'>@@ -487,6 +489,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		status = acpi_ex_convert_to_string(operand[0], &amp;return_desc,</div><div class='ctx'> 						   ACPI_EXPLICIT_CONVERT_DECIMAL);</div><div class='ctx'> 		if (return_desc == operand[0]) {</div><div class='add'>+</div><div class='ctx'> 			/* No conversion performed, add ref to handle return value */</div><div class='ctx'> 			acpi_ut_add_reference(return_desc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -497,6 +500,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		status = acpi_ex_convert_to_string(operand[0], &amp;return_desc,</div><div class='ctx'> 						   ACPI_EXPLICIT_CONVERT_HEX);</div><div class='ctx'> 		if (return_desc == operand[0]) {</div><div class='add'>+</div><div class='ctx'> 			/* No conversion performed, add ref to handle return value */</div><div class='ctx'> 			acpi_ut_add_reference(return_desc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -506,6 +510,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ex_convert_to_buffer(operand[0], &amp;return_desc);</div><div class='ctx'> 		if (return_desc == operand[0]) {</div><div class='add'>+</div><div class='ctx'> 			/* No conversion performed, add ref to handle return value */</div><div class='ctx'> 			acpi_ut_add_reference(return_desc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -516,6 +521,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		status = acpi_ex_convert_to_integer(operand[0], &amp;return_desc,</div><div class='ctx'> 						    ACPI_ANY_BASE);</div><div class='ctx'> 		if (return_desc == operand[0]) {</div><div class='add'>+</div><div class='ctx'> 			/* No conversion performed, add ref to handle return value */</div><div class='ctx'> 			acpi_ut_add_reference(return_desc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -541,6 +547,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Store the return value computed above into the target object */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ex_store(return_desc, operand[1], walk_state);</div><div class='hunk'>@@ -548,16 +555,18 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'>       cleanup:</div><div class='ctx'> </div><div class='del'>-	if (!walk_state-&gt;result_obj) {</div><div class='del'>-		walk_state-&gt;result_obj = return_desc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Delete return object on error */</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		acpi_ut_remove_reference(return_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Save return object on success */</div><div class='add'>+</div><div class='add'>+	else if (!walk_state-&gt;result_obj) {</div><div class='add'>+		walk_state-&gt;result_obj = return_desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -582,7 +591,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	u32 type;</div><div class='ctx'> 	acpi_integer value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_1A_0T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Examine the AML opcode */</div><div class='hunk'>@@ -625,6 +634,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		temp_desc = operand[0];</div><div class='ctx'> 		if (ACPI_GET_DESCRIPTOR_TYPE(temp_desc) ==</div><div class='ctx'> 		    ACPI_DESC_TYPE_OPERAND) {</div><div class='add'>+</div><div class='ctx'> 			/* Internal reference object - prevent deletion */</div><div class='ctx'> </div><div class='ctx'> 			acpi_ut_add_reference(temp_desc);</div><div class='hunk'>@@ -689,6 +699,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		/* Allocate a descriptor to hold the type. */</div><div class='ctx'> </div><div class='ctx'> 		return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='hunk'>@@ -777,8 +788,25 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 		/* Check for a method local or argument, or standalone String */</div><div class='ctx'> </div><div class='del'>-		if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) !=</div><div class='add'>+		if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) ==</div><div class='ctx'> 		    ACPI_DESC_TYPE_NAMED) {</div><div class='add'>+			temp_desc =</div><div class='add'>+			    acpi_ns_get_attached_object((struct</div><div class='add'>+							 acpi_namespace_node *)</div><div class='add'>+							operand[0]);</div><div class='add'>+			if (temp_desc</div><div class='add'>+			    &amp;&amp;</div><div class='add'>+			    ((ACPI_GET_OBJECT_TYPE(temp_desc) ==</div><div class='add'>+			      ACPI_TYPE_STRING)</div><div class='add'>+			     || (ACPI_GET_OBJECT_TYPE(temp_desc) ==</div><div class='add'>+				 ACPI_TYPE_LOCAL_REFERENCE))) {</div><div class='add'>+				operand[0] = temp_desc;</div><div class='add'>+				acpi_ut_add_reference(temp_desc);</div><div class='add'>+			} else {</div><div class='add'>+				status = AE_AML_OPERAND_TYPE;</div><div class='add'>+				goto cleanup;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='ctx'> 			switch (ACPI_GET_OBJECT_TYPE(operand[0])) {</div><div class='ctx'> 			case ACPI_TYPE_LOCAL_REFERENCE:</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -827,26 +855,35 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			case ACPI_TYPE_STRING:</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='add'>+			default:</div><div class='add'>+				status = AE_AML_OPERAND_TYPE;</div><div class='add'>+				goto cleanup;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ACPI_GET_DESCRIPTOR_TYPE(operand[0]) !=</div><div class='add'>+		    ACPI_DESC_TYPE_NAMED) {</div><div class='add'>+			if (ACPI_GET_OBJECT_TYPE(operand[0]) ==</div><div class='add'>+			    ACPI_TYPE_STRING) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * This is a deref_of (String). The string is a reference</div><div class='ctx'> 				 * to a named ACPI object.</div><div class='ctx'> 				 *</div><div class='ctx'> 				 * 1) Find the owning Node</div><div class='del'>-				 * 2) Dereference the node to an actual object.  Could be a</div><div class='add'>+				 * 2) Dereference the node to an actual object. Could be a</div><div class='ctx'> 				 *    Field, so we need to resolve the node to a value.</div><div class='ctx'> 				 */</div><div class='ctx'> 				status =</div><div class='del'>-				    acpi_ns_get_node_by_path(operand[0]-&gt;string.</div><div class='del'>-							     pointer,</div><div class='del'>-							     walk_state-&gt;</div><div class='del'>-							     scope_info-&gt;scope.</div><div class='del'>-							     node,</div><div class='del'>-							     ACPI_NS_SEARCH_PARENT,</div><div class='del'>-							     ACPI_CAST_INDIRECT_PTR</div><div class='del'>-							     (struct</div><div class='del'>-							      acpi_namespace_node,</div><div class='del'>-							      &amp;return_desc));</div><div class='add'>+				    acpi_ns_get_node(walk_state-&gt;scope_info-&gt;</div><div class='add'>+						     scope.node,</div><div class='add'>+						     operand[0]-&gt;string.pointer,</div><div class='add'>+						     ACPI_NS_SEARCH_PARENT,</div><div class='add'>+						     ACPI_CAST_INDIRECT_PTR</div><div class='add'>+						     (struct</div><div class='add'>+						      acpi_namespace_node,</div><div class='add'>+						      &amp;return_desc));</div><div class='ctx'> 				if (ACPI_FAILURE(status)) {</div><div class='ctx'> 					goto cleanup;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -857,11 +894,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				     (struct acpi_namespace_node, &amp;return_desc),</div><div class='ctx'> 				     walk_state);</div><div class='ctx'> 				goto cleanup;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-</div><div class='del'>-				status = AE_AML_OPERAND_TYPE;</div><div class='del'>-				goto cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -937,13 +969,12 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 						acpi_ut_add_reference</div><div class='ctx'> 						    (return_desc);</div><div class='ctx'> 					}</div><div class='del'>-</div><div class='ctx'> 					break;</div><div class='ctx'> </div><div class='ctx'> 				default:</div><div class='ctx'> </div><div class='ctx'> 					ACPI_ERROR((AE_INFO,</div><div class='del'>-						    "Unknown Index target_type %X in obj %p",</div><div class='add'>+						    "Unknown Index TargetType %X in obj %p",</div><div class='ctx'> 						    operand[0]-&gt;reference.</div><div class='ctx'> 						    target_type, operand[0]));</div><div class='ctx'> 					status = AE_AML_OPERAND_TYPE;</div><div class='hunk'>@@ -957,7 +988,6 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 				if (ACPI_GET_DESCRIPTOR_TYPE(return_desc) ==</div><div class='ctx'> 				    ACPI_DESC_TYPE_NAMED) {</div><div class='del'>-</div><div class='ctx'> 					return_desc =</div><div class='ctx'> 					    acpi_ns_get_attached_object((struct</div><div class='ctx'> 									 acpi_namespace_node</div><div class='hunk'>@@ -972,7 +1002,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 			default:</div><div class='ctx'> 				ACPI_ERROR((AE_INFO,</div><div class='del'>-					    "Unknown opcode in ref(%p) - %X",</div><div class='add'>+					    "Unknown opcode in reference(%p) - %X",</div><div class='ctx'> 					    operand[0],</div><div class='ctx'> 					    operand[0]-&gt;reference.opcode));</div><div class='ctx'> </div><div class='hunk'>@@ -998,6 +1028,11 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		acpi_ut_remove_reference(return_desc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	walk_state-&gt;result_obj = return_desc;</div><div class='add'>+	/* Save return object on success */</div><div class='add'>+</div><div class='add'>+	else {</div><div class='add'>+		walk_state-&gt;result_obj = return_desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c<br/>index e263a5ddd405..7d2cbc113160 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exoparg2.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_0T_0R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_0T_0R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Examine the opcode */</div><div class='hunk'>@@ -121,7 +121,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> #ifdef ACPI_GPE_NOTIFY_CHECK</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * GPE method wake/notify check.  Here, we want to ensure that we</div><div class='del'>-		 * don't receive any "device_wake" Notifies from a GPE _Lxx or _Exx</div><div class='add'>+		 * don't receive any "DeviceWake" Notifies from a GPE _Lxx or _Exx</div><div class='ctx'> 		 * GPE method during system runtime.  If we do, the GPE is marked</div><div class='ctx'> 		 * as "wake-only" and disabled.</div><div class='ctx'> 		 *</div><div class='hunk'>@@ -138,6 +138,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			    acpi_ev_check_for_wake_only_gpe(walk_state-&gt;</div><div class='ctx'> 							    gpe_event_info);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 				/* AE_WAKE_ONLY_GPE only error, means ignore this notify */</div><div class='ctx'> </div><div class='ctx'> 				return_ACPI_STATUS(AE_OK)</div><div class='hunk'>@@ -185,7 +186,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	union acpi_operand_object *return_desc2 = NULL;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_2T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_2T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the opcode */</div><div class='hunk'>@@ -252,6 +253,7 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_ut_remove_reference(return_desc2);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Delete the return object */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ut_remove_reference(return_desc1);</div><div class='hunk'>@@ -281,12 +283,13 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	acpi_size length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_1T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_1T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the opcode */</div><div class='ctx'> </div><div class='ctx'> 	if (walk_state-&gt;op_info-&gt;flags &amp; AML_MATH) {</div><div class='add'>+</div><div class='ctx'> 		/* All simple math opcodes (add, etc.) */</div><div class='ctx'> </div><div class='ctx'> 		return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='hunk'>@@ -383,54 +386,70 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Initialize the Index reference object */</div><div class='add'>+</div><div class='ctx'> 		index = operand[1]-&gt;integer.value;</div><div class='add'>+		return_desc-&gt;reference.offset = (u32) index;</div><div class='add'>+		return_desc-&gt;reference.opcode = AML_INDEX_OP;</div><div class='ctx'> </div><div class='del'>-		/* At this point, the Source operand is a Package, Buffer, or String */</div><div class='add'>+		/*</div><div class='add'>+		 * At this point, the Source operand is a String, Buffer, or Package.</div><div class='add'>+		 * Verify that the index is within range.</div><div class='add'>+		 */</div><div class='add'>+		switch (ACPI_GET_OBJECT_TYPE(operand[0])) {</div><div class='add'>+		case ACPI_TYPE_STRING:</div><div class='ctx'> </div><div class='del'>-		if (ACPI_GET_OBJECT_TYPE(operand[0]) == ACPI_TYPE_PACKAGE) {</div><div class='del'>-			/* Object to be indexed is a Package */</div><div class='add'>+			if (index &gt;= operand[0]-&gt;string.length) {</div><div class='add'>+				status = AE_AML_STRING_LIMIT;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return_desc-&gt;reference.target_type =</div><div class='add'>+			    ACPI_TYPE_BUFFER_FIELD;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_TYPE_BUFFER:</div><div class='add'>+</div><div class='add'>+			if (index &gt;= operand[0]-&gt;buffer.length) {</div><div class='add'>+				status = AE_AML_BUFFER_LIMIT;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			return_desc-&gt;reference.target_type =</div><div class='add'>+			    ACPI_TYPE_BUFFER_FIELD;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ACPI_TYPE_PACKAGE:</div><div class='ctx'> </div><div class='ctx'> 			if (index &gt;= operand[0]-&gt;package.count) {</div><div class='del'>-				ACPI_ERROR((AE_INFO,</div><div class='del'>-					    "Index value (%X%8.8X) beyond package end (%X)",</div><div class='del'>-					    ACPI_FORMAT_UINT64(index),</div><div class='del'>-					    operand[0]-&gt;package.count));</div><div class='ctx'> 				status = AE_AML_PACKAGE_LIMIT;</div><div class='del'>-				goto cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			return_desc-&gt;reference.target_type = ACPI_TYPE_PACKAGE;</div><div class='del'>-			return_desc-&gt;reference.object = operand[0];</div><div class='ctx'> 			return_desc-&gt;reference.where =</div><div class='ctx'> 			    &amp;operand[0]-&gt;package.elements[index];</div><div class='del'>-		} else {</div><div class='del'>-			/* Object to be indexed is a Buffer/String */</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-			if (index &gt;= operand[0]-&gt;buffer.length) {</div><div class='del'>-				ACPI_ERROR((AE_INFO,</div><div class='del'>-					    "Index value (%X%8.8X) beyond end of buffer (%X)",</div><div class='del'>-					    ACPI_FORMAT_UINT64(index),</div><div class='del'>-					    operand[0]-&gt;buffer.length));</div><div class='del'>-				status = AE_AML_BUFFER_LIMIT;</div><div class='del'>-				goto cleanup;</div><div class='del'>-			}</div><div class='add'>+		default:</div><div class='ctx'> </div><div class='del'>-			return_desc-&gt;reference.target_type =</div><div class='del'>-			    ACPI_TYPE_BUFFER_FIELD;</div><div class='del'>-			return_desc-&gt;reference.object = operand[0];</div><div class='add'>+			status = AE_AML_INTERNAL;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Failure means that the Index was beyond the end of the object */</div><div class='add'>+</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+					"Index (%X%8.8X) is beyond end of object",</div><div class='add'>+					ACPI_FORMAT_UINT64(index)));</div><div class='add'>+			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Add a reference to the target package/buffer/string for the life</div><div class='del'>-		 * of the index.</div><div class='add'>+		 * Save the target object and add a reference to it for the life</div><div class='add'>+		 * of the index</div><div class='ctx'> 		 */</div><div class='add'>+		return_desc-&gt;reference.object = operand[0];</div><div class='ctx'> 		acpi_ut_add_reference(operand[0]);</div><div class='ctx'> </div><div class='del'>-		/* Complete the Index reference object */</div><div class='del'>-</div><div class='del'>-		return_desc-&gt;reference.opcode = AML_INDEX_OP;</div><div class='del'>-		return_desc-&gt;reference.offset = (u32) index;</div><div class='del'>-</div><div class='ctx'> 		/* Store the reference to the Target */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ex_store(return_desc, operand[2], walk_state);</div><div class='hunk'>@@ -495,7 +514,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u8 logical_result = FALSE;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_2A_0T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_0T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	/* Create the internal return object */</div><div class='hunk'>@@ -509,6 +528,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	/* Execute the Opcode */</div><div class='ctx'> </div><div class='ctx'> 	if (walk_state-&gt;op_info-&gt;flags &amp; AML_LOGICAL_NUMERIC) {</div><div class='add'>+</div><div class='ctx'> 		/* logical_op (Operand0, Operand1) */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ex_do_logical_numeric_op(walk_state-&gt;opcode,</div><div class='hunk'>@@ -518,6 +538,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 						       value, &amp;logical_result);</div><div class='ctx'> 		goto store_logical_result;</div><div class='ctx'> 	} else if (walk_state-&gt;op_info-&gt;flags &amp; AML_LOGICAL) {</div><div class='add'>+</div><div class='ctx'> 		/* logical_op (Operand0, Operand1) */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ex_do_logical_op(walk_state-&gt;opcode, operand[0],</div><div class='head'>diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c<br/>index 6a3a883cb8a3..e2d945dfd509 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exoparg3.c</a></div><div class='hunk'>@@ -88,20 +88,19 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	struct acpi_signal_fatal_info *fatal;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_3A_0T_0R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_0T_0R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	switch (walk_state-&gt;opcode) {</div><div class='ctx'> 	case AML_FATAL_OP:	/* Fatal (fatal_type fatal_code fatal_arg) */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='del'>-				  "fatal_op: Type %X Code %X Arg %X &lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;\n",</div><div class='add'>+				  "FatalOp: Type %X Code %X Arg %X &lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;\n",</div><div class='ctx'> 				  (u32) operand[0]-&gt;integer.value,</div><div class='ctx'> 				  (u32) operand[1]-&gt;integer.value,</div><div class='ctx'> 				  (u32) operand[2]-&gt;integer.value));</div><div class='ctx'> </div><div class='del'>-		fatal =</div><div class='del'>-		    ACPI_MEM_ALLOCATE(sizeof(struct acpi_signal_fatal_info));</div><div class='add'>+		fatal = ACPI_ALLOCATE(sizeof(struct acpi_signal_fatal_info));</div><div class='ctx'> 		if (fatal) {</div><div class='ctx'> 			fatal-&gt;type = (u32) operand[0]-&gt;integer.value;</div><div class='ctx'> 			fatal-&gt;code = (u32) operand[1]-&gt;integer.value;</div><div class='hunk'>@@ -114,7 +113,7 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 		/* Might return while OS is shutting down, just continue */</div><div class='ctx'> </div><div class='del'>-		ACPI_MEM_FREE(fatal);</div><div class='add'>+		ACPI_FREE(fatal);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -151,7 +150,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	acpi_integer index;</div><div class='ctx'> 	acpi_size length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_3A_1T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_1T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	switch (walk_state-&gt;opcode) {</div><div class='hunk'>@@ -196,7 +195,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 			/* Always allocate a new buffer for the String */</div><div class='ctx'> </div><div class='del'>-			buffer = ACPI_MEM_CALLOCATE((acpi_size) length + 1);</div><div class='add'>+			buffer = ACPI_ALLOCATE_ZEROED((acpi_size) length + 1);</div><div class='ctx'> 			if (!buffer) {</div><div class='ctx'> 				status = AE_NO_MEMORY;</div><div class='ctx'> 				goto cleanup;</div><div class='hunk'>@@ -208,9 +207,10 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			/* If the requested length is zero, don't allocate a buffer */</div><div class='ctx'> </div><div class='ctx'> 			if (length &gt; 0) {</div><div class='add'>+</div><div class='ctx'> 				/* Allocate a new buffer for the Buffer */</div><div class='ctx'> </div><div class='del'>-				buffer = ACPI_MEM_CALLOCATE(length);</div><div class='add'>+				buffer = ACPI_ALLOCATE_ZEROED(length);</div><div class='ctx'> 				if (!buffer) {</div><div class='ctx'> 					status = AE_NO_MEMORY;</div><div class='ctx'> 					goto cleanup;</div><div class='hunk'>@@ -225,6 +225,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (buffer) {</div><div class='add'>+</div><div class='ctx'> 			/* We have a buffer, copy the portion requested */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_MEMCPY(buffer, operand[0]-&gt;string.pointer + index,</div><div class='head'>diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c<br/>index e043d924444f..f0c0ba6eb408 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg6.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exoparg6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exoparg6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exoparg6.c</a></div><div class='hunk'>@@ -220,7 +220,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)</div><div class='ctx'> 	acpi_integer index;</div><div class='ctx'> 	union acpi_operand_object *this_element;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ex_opcode_6A_0T_1R",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ex_opcode_6A_0T_1R,</div><div class='ctx'> 				acpi_ps_get_opcode_name(walk_state-&gt;opcode));</div><div class='ctx'> </div><div class='ctx'> 	switch (walk_state-&gt;opcode) {</div><div class='hunk'>@@ -276,6 +276,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)</div><div class='ctx'> 		 * match was found.</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (; index &lt; operand[0]-&gt;package.count; index++) {</div><div class='add'>+</div><div class='ctx'> 			/* Get the current package element */</div><div class='ctx'> </div><div class='ctx'> 			this_element = operand[0]-&gt;package.elements[index];</div><div class='head'>diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c<br/>index 7719ae5d4f16..44d064f427b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exprep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exprep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exprep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exprep.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ acpi_ex_generate_access(u32 field_bit_offset,</div><div class='ctx'> 	u32 minimum_accesses = 0xFFFFFFFF;</div><div class='ctx'> 	u32 accesses;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_generate_access");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_generate_access);</div><div class='ctx'> </div><div class='ctx'> 	/* Round Field start offset and length to "minimal" byte boundaries */</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +146,7 @@ acpi_ex_generate_access(u32 field_bit_offset,</div><div class='ctx'> 			accesses = field_end_offset - field_start_offset;</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-					  "access_width %d end is within region\n",</div><div class='add'>+					  "AccessWidth %d end is within region\n",</div><div class='ctx'> 					  access_byte_width));</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='hunk'>@@ -173,7 +173,7 @@ acpi_ex_generate_access(u32 field_bit_offset,</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-					  "access_width %d end is NOT within region\n",</div><div class='add'>+					  "AccessWidth %d end is NOT within region\n",</div><div class='ctx'> 					  access_byte_width));</div><div class='ctx'> 			if (access_byte_width == 1) {</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='hunk'>@@ -228,7 +228,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	u32 byte_alignment;</div><div class='ctx'> 	u32 bit_length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_decode_field_access");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_decode_field_access);</div><div class='ctx'> </div><div class='ctx'> 	access = (field_flags &amp; AML_FIELD_ACCESS_TYPE_MASK);</div><div class='ctx'> </div><div class='hunk'>@@ -322,7 +322,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,</div><div class='ctx'> 	u32 byte_alignment;</div><div class='ctx'> 	u32 nearest_byte_address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_prep_common_field_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_prep_common_field_object);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: the structure being initialized is the</div><div class='hunk'>@@ -415,13 +415,13 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)</div><div class='ctx'> 	u32 type;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_prep_field_value");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_prep_field_value);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {</div><div class='ctx'> 		if (!info-&gt;region_node) {</div><div class='del'>-			ACPI_ERROR((AE_INFO, "Null region_node"));</div><div class='add'>+			ACPI_ERROR((AE_INFO, "Null RegionNode"));</div><div class='ctx'> 			return_ACPI_STATUS(AE_AML_NO_OPERAND);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -467,7 +467,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)</div><div class='ctx'> 		acpi_ut_add_reference(obj_desc-&gt;field.region_obj);</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-				  "region_field: bit_off %X, Off %X, Gran %X, Region %p\n",</div><div class='add'>+				  "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n",</div><div class='ctx'> 				  obj_desc-&gt;field.start_field_bit_offset,</div><div class='ctx'> 				  obj_desc-&gt;field.base_byte_offset,</div><div class='ctx'> 				  obj_desc-&gt;field.access_byte_width,</div><div class='hunk'>@@ -488,7 +488,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)</div><div class='ctx'> 		acpi_ut_add_reference(obj_desc-&gt;bank_field.bank_obj);</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-				  "Bank Field: bit_off %X, Off %X, Gran %X, Region %p, bank_reg %p\n",</div><div class='add'>+				  "Bank Field: BitOff %X, Off %X, Gran %X, Region %p, BankReg %p\n",</div><div class='ctx'> 				  obj_desc-&gt;bank_field.start_field_bit_offset,</div><div class='ctx'> 				  obj_desc-&gt;bank_field.base_byte_offset,</div><div class='ctx'> 				  obj_desc-&gt;field.access_byte_width,</div><div class='hunk'>@@ -519,16 +519,29 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)</div><div class='ctx'> 		acpi_ut_add_reference(obj_desc-&gt;index_field.index_obj);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='add'>+		 * April 2006: Changed to match MS behavior</div><div class='add'>+		 *</div><div class='ctx'> 		 * The value written to the Index register is the byte offset of the</div><div class='del'>-		 * target field</div><div class='del'>-		 * Note: may change code to: ACPI_DIV_8 (Info-&gt;field_bit_position)</div><div class='add'>+		 * target field in units of the granularity of the index_field</div><div class='add'>+		 *</div><div class='add'>+		 * Previously, the value was calculated as an index in terms of the</div><div class='add'>+		 * width of the Data register, as below:</div><div class='add'>+		 *</div><div class='add'>+		 *      obj_desc-&gt;index_field.Value = (u32)</div><div class='add'>+		 *          (Info-&gt;field_bit_position / ACPI_MUL_8 (</div><div class='add'>+		 *              obj_desc-&gt;Field.access_byte_width));</div><div class='add'>+		 *</div><div class='add'>+		 * February 2006: Tried value as a byte offset:</div><div class='add'>+		 *      obj_desc-&gt;index_field.Value = (u32)</div><div class='add'>+		 *          ACPI_DIV_8 (Info-&gt;field_bit_position);</div><div class='ctx'> 		 */</div><div class='del'>-		obj_desc-&gt;index_field.value = (u32)</div><div class='del'>-		    (info-&gt;field_bit_position /</div><div class='del'>-		     ACPI_MUL_8(obj_desc-&gt;field.access_byte_width));</div><div class='add'>+		obj_desc-&gt;index_field.value =</div><div class='add'>+		    (u32) ACPI_ROUND_DOWN(ACPI_DIV_8(info-&gt;field_bit_position),</div><div class='add'>+					  obj_desc-&gt;index_field.</div><div class='add'>+					  access_byte_width);</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-				  "index_field: bit_off %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",</div><div class='add'>+				  "IndexField: BitOff %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",</div><div class='ctx'> 				  obj_desc-&gt;index_field.start_field_bit_offset,</div><div class='ctx'> 				  obj_desc-&gt;index_field.base_byte_offset,</div><div class='ctx'> 				  obj_desc-&gt;index_field.value,</div><div class='hunk'>@@ -550,7 +563,7 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)</div><div class='ctx'> 				       acpi_ns_get_type(info-&gt;field_node));</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,</div><div class='del'>-			  "Set named_obj %p [%4.4s], obj_desc %p\n",</div><div class='add'>+			  "Set NamedObj %p [%4.4s], ObjDesc %p\n",</div><div class='ctx'> 			  info-&gt;field_node,</div><div class='ctx'> 			  acpi_ut_get_node_name(info-&gt;field_node), obj_desc));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c<br/>index 6a4cfdff606d..3cc97ba48b36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exregion.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exregion.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exregion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exregion.c</a></div><div class='hunk'>@@ -81,7 +81,7 @@ acpi_ex_system_memory_space_handler(u32 function,</div><div class='ctx'> 	u32 remainder;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_system_memory_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_memory_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate and translate the bit width */</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +103,7 @@ acpi_ex_system_memory_space_handler(u32 function,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid system_memory width %d",</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid SystemMemory width %d",</div><div class='ctx'> 			    bit_width));</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_OPERAND_VALUE);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -135,6 +135,7 @@ acpi_ex_system_memory_space_handler(u32 function,</div><div class='ctx'> 		 * Delete the existing mapping and create a new one.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (mem_info-&gt;mapped_length) {</div><div class='add'>+</div><div class='ctx'> 			/* Valid mapping, delete it */</div><div class='ctx'> </div><div class='ctx'> 			acpi_os_unmap_memory(mem_info-&gt;mapped_logical_address,</div><div class='hunk'>@@ -181,8 +182,8 @@ acpi_ex_system_memory_space_handler(u32 function,</div><div class='ctx'> 	     (acpi_integer) mem_info-&gt;mapped_physical_address);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='del'>-			  "system_memory %d (%d width) Address=%8.8X%8.8X\n",</div><div class='del'>-			  function, bit_width, ACPI_FORMAT_UINT64(address)));</div><div class='add'>+			  "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",</div><div class='add'>+			  bit_width, function, ACPI_FORMAT_UINT64(address)));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Perform the memory read or write</div><div class='hunk'>@@ -283,11 +284,11 @@ acpi_ex_system_io_space_handler(u32 function,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	u32 value32;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_system_io_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_io_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='del'>-			  "system_iO %d (%d width) Address=%8.8X%8.8X\n",</div><div class='del'>-			  function, bit_width, ACPI_FORMAT_UINT64(address)));</div><div class='add'>+			  "System-IO (width %d) R/W %d Address=%8.8X%8.8X\n",</div><div class='add'>+			  bit_width, function, ACPI_FORMAT_UINT64(address)));</div><div class='ctx'> </div><div class='ctx'> 	/* Decode the function parameter */</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +343,7 @@ acpi_ex_pci_config_space_handler(u32 function,</div><div class='ctx'> 	struct acpi_pci_id *pci_id;</div><div class='ctx'> 	u16 pci_register;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_pci_config_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  The arguments to acpi_os(Read|Write)pci_configuration are:</div><div class='hunk'>@@ -360,7 +361,7 @@ acpi_ex_pci_config_space_handler(u32 function,</div><div class='ctx'> 	pci_register = (u16) (u32) address;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='del'>-			  "pci_config %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",</div><div class='add'>+			  "Pci-Config %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n",</div><div class='ctx'> 			  function, bit_width, pci_id-&gt;segment, pci_id-&gt;bus,</div><div class='ctx'> 			  pci_id-&gt;device, pci_id-&gt;function, pci_register));</div><div class='ctx'> </div><div class='hunk'>@@ -414,7 +415,7 @@ acpi_ex_cmos_space_handler(u32 function,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_cmos_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_cmos_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='hunk'>@@ -446,7 +447,7 @@ acpi_ex_pci_bar_space_handler(u32 function,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_pci_bar_space_handler");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_pci_bar_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='hunk'>@@ -476,23 +477,16 @@ acpi_ex_data_table_space_handler(u32 function,</div><div class='ctx'> 				 acpi_integer * value,</div><div class='ctx'> 				 void *handler_context, void *region_context)</div><div class='ctx'> {</div><div class='del'>-	acpi_status status = AE_OK;</div><div class='del'>-	u32 byte_width = ACPI_DIV_8(bit_width);</div><div class='del'>-	u32 i;</div><div class='del'>-	char *logical_addr_ptr;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_data_table_space_handler");</div><div class='del'>-</div><div class='del'>-	logical_addr_ptr = ACPI_PHYSADDR_TO_PTR(address);</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_data_table_space_handler);</div><div class='ctx'> </div><div class='ctx'> 	/* Perform the memory read or write */</div><div class='ctx'> </div><div class='ctx'> 	switch (function) {</div><div class='ctx'> 	case ACPI_READ:</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; byte_width; i++) {</div><div class='del'>-			((char *)value)[i] = logical_addr_ptr[i];</div><div class='del'>-		}</div><div class='add'>+		ACPI_MEMCPY(ACPI_CAST_PTR(char, value),</div><div class='add'>+			    ACPI_PHYSADDR_TO_PTR(address),</div><div class='add'>+			    ACPI_DIV_8(bit_width));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_WRITE:</div><div class='hunk'>@@ -501,5 +495,5 @@ acpi_ex_data_table_space_handler(u32 function,</div><div class='ctx'> 		return_ACPI_STATUS(AE_SUPPORT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c<br/>index 01b26c80d22b..3089b05a1368 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exresnte.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exresnte.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exresnte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exresnte.c</a></div><div class='hunk'>@@ -87,7 +87,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_object_type entry_type;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_resolve_node_to_value");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_resolve_node_to_value);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The stack pointer points to a struct acpi_namespace_node (Node).  Get the</div><div class='hunk'>@@ -97,12 +97,13 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> 	source_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 	entry_type = acpi_ns_get_type((acpi_handle) node);</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Entry=%p source_desc=%p [%s]\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Entry=%p SourceDesc=%p [%s]\n",</div><div class='ctx'> 			  node, source_desc,</div><div class='ctx'> 			  acpi_ut_get_type_name(entry_type)));</div><div class='ctx'> </div><div class='ctx'> 	if ((entry_type == ACPI_TYPE_LOCAL_ALIAS) ||</div><div class='ctx'> 	    (entry_type == ACPI_TYPE_LOCAL_METHOD_ALIAS)) {</div><div class='add'>+</div><div class='ctx'> 		/* There is always exactly one level of indirection */</div><div class='ctx'> </div><div class='ctx'> 		node = ACPI_CAST_PTR(struct acpi_namespace_node, node-&gt;object);</div><div class='hunk'>@@ -113,10 +114,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Several object types require no further processing:</div><div class='del'>-	 * 1) Devices rarely have an attached object, return the Node</div><div class='add'>+	 * 1) Device/Thermal objects don't have a "real" subobject, return the Node</div><div class='ctx'> 	 * 2) Method locals and arguments have a pseudo-Node</div><div class='ctx'> 	 */</div><div class='del'>-	if (entry_type == ACPI_TYPE_DEVICE ||</div><div class='add'>+	if ((entry_type == ACPI_TYPE_DEVICE) ||</div><div class='add'>+	    (entry_type == ACPI_TYPE_THERMAL) ||</div><div class='ctx'> 	    (node-&gt;flags &amp; (ANOBJ_METHOD_ARG | ANOBJ_METHOD_LOCAL))) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -141,6 +143,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ds_get_package_arguments(source_desc);</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Return an additional reference to the object */</div><div class='ctx'> </div><div class='ctx'> 			obj_desc = source_desc;</div><div class='hunk'>@@ -158,6 +161,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ds_get_buffer_arguments(source_desc);</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Return an additional reference to the object */</div><div class='ctx'> </div><div class='ctx'> 			obj_desc = source_desc;</div><div class='hunk'>@@ -199,7 +203,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> 	case ACPI_TYPE_LOCAL_INDEX_FIELD:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-				  "field_read Node=%p source_desc=%p Type=%X\n",</div><div class='add'>+				  "FieldRead Node=%p SourceDesc=%p Type=%X\n",</div><div class='ctx'> 				  node, source_desc, entry_type));</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='hunk'>@@ -213,7 +217,6 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> 	case ACPI_TYPE_METHOD:</div><div class='ctx'> 	case ACPI_TYPE_POWER:</div><div class='ctx'> 	case ACPI_TYPE_PROCESSOR:</div><div class='del'>-	case ACPI_TYPE_THERMAL:</div><div class='ctx'> 	case ACPI_TYPE_EVENT:</div><div class='ctx'> 	case ACPI_TYPE_REGION:</div><div class='ctx'> </div><div class='hunk'>@@ -240,6 +243,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,</div><div class='ctx'> 			/* This is a ddb_handle */</div><div class='ctx'> 			/* Return an additional reference to the object */</div><div class='ctx'> </div><div class='add'>+		case AML_REF_OF_OP:</div><div class='add'>+</div><div class='ctx'> 			obj_desc = source_desc;</div><div class='ctx'> 			acpi_ut_add_reference(obj_desc);</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c<br/>index 1deed492fe88..6499de878017 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exresolv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exresolv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exresolv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exresolv.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_resolve_to_value, stack_ptr);</div><div class='ctx'> </div><div class='ctx'> 	if (!stack_ptr || !*stack_ptr) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Internal - null pointer"));</div><div class='hunk'>@@ -144,7 +144,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	u16 opcode;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_resolve_object_to_value");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_resolve_object_to_value);</div><div class='ctx'> </div><div class='ctx'> 	stack_desc = *stack_ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +190,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-					  "[Arg/Local %X] value_obj is %p\n",</div><div class='add'>+					  "[Arg/Local %X] ValueObj is %p\n",</div><div class='ctx'> 					  stack_desc-&gt;reference.offset,</div><div class='ctx'> 					  obj_desc));</div><div class='ctx'> </div><div class='hunk'>@@ -239,7 +239,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,</div><div class='ctx'> 				/* Invalid reference object */</div><div class='ctx'> </div><div class='ctx'> 				ACPI_ERROR((AE_INFO,</div><div class='del'>-					    "Unknown target_type %X in Index/Reference obj %p",</div><div class='add'>+					    "Unknown TargetType %X in Index/Reference obj %p",</div><div class='ctx'> 					    stack_desc-&gt;reference.target_type,</div><div class='ctx'> 					    stack_desc));</div><div class='ctx'> 				status = AE_AML_INTERNAL;</div><div class='hunk'>@@ -257,10 +257,24 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,</div><div class='ctx'> </div><div class='ctx'> 		case AML_INT_NAMEPATH_OP:	/* Reference to a named object */</div><div class='ctx'> </div><div class='del'>-			/* Get the object pointed to by the namespace node */</div><div class='add'>+			/* Dereference the name */</div><div class='add'>+</div><div class='add'>+			if ((stack_desc-&gt;reference.node-&gt;type ==</div><div class='add'>+			     ACPI_TYPE_DEVICE)</div><div class='add'>+			    || (stack_desc-&gt;reference.node-&gt;type ==</div><div class='add'>+				ACPI_TYPE_THERMAL)) {</div><div class='add'>+</div><div class='add'>+				/* These node types do not have 'real' subobjects */</div><div class='add'>+</div><div class='add'>+				*stack_ptr = (void *)stack_desc-&gt;reference.node;</div><div class='add'>+			} else {</div><div class='add'>+				/* Get the object pointed to by the namespace node */</div><div class='add'>+</div><div class='add'>+				*stack_ptr =</div><div class='add'>+				    (stack_desc-&gt;reference.node)-&gt;object;</div><div class='add'>+				acpi_ut_add_reference(*stack_ptr);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			*stack_ptr = (stack_desc-&gt;reference.node)-&gt;object;</div><div class='del'>-			acpi_ut_add_reference(*stack_ptr);</div><div class='ctx'> 			acpi_ut_remove_reference(stack_desc);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +307,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,</div><div class='ctx'> 	case ACPI_TYPE_LOCAL_INDEX_FIELD:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-				  "field_read source_desc=%p Type=%X\n",</div><div class='add'>+				  "FieldRead SourceDesc=%p Type=%X\n",</div><div class='ctx'> 				  stack_desc,</div><div class='ctx'> 				  ACPI_GET_OBJECT_TYPE(stack_desc)));</div><div class='ctx'> </div><div class='hunk'>@@ -337,7 +351,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	acpi_object_type type;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_ex_resolve_multiple");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_ex_resolve_multiple);</div><div class='ctx'> </div><div class='ctx'> 	/* Operand can be either a namespace node or an operand descriptor */</div><div class='ctx'> </div><div class='hunk'>@@ -382,10 +396,16 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	while (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_REFERENCE) {</div><div class='ctx'> 		switch (obj_desc-&gt;reference.opcode) {</div><div class='ctx'> 		case AML_REF_OF_OP:</div><div class='add'>+		case AML_INT_NAMEPATH_OP:</div><div class='ctx'> </div><div class='ctx'> 			/* Dereference the reference pointer */</div><div class='ctx'> </div><div class='del'>-			node = obj_desc-&gt;reference.object;</div><div class='add'>+			if (obj_desc-&gt;reference.opcode == AML_REF_OF_OP) {</div><div class='add'>+				node = obj_desc-&gt;reference.object;</div><div class='add'>+			} else {	/* AML_INT_NAMEPATH_OP */</div><div class='add'>+</div><div class='add'>+				node = obj_desc-&gt;reference.node;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* All "References" point to a NS node */</div><div class='ctx'> </div><div class='hunk'>@@ -401,6 +421,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 			obj_desc = acpi_ns_get_attached_object(node);</div><div class='ctx'> 			if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 				/* No object, use the NS node type */</div><div class='ctx'> </div><div class='ctx'> 				type = acpi_ns_get_type(node);</div><div class='hunk'>@@ -432,6 +453,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			 */</div><div class='ctx'> 			obj_desc = *(obj_desc-&gt;reference.where);</div><div class='ctx'> 			if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 				/* NULL package elements are allowed */</div><div class='ctx'> </div><div class='ctx'> 				type = 0;	/* Uninitialized */</div><div class='hunk'>@@ -439,39 +461,6 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case AML_INT_NAMEPATH_OP:</div><div class='del'>-</div><div class='del'>-			/* Dereference the reference pointer */</div><div class='del'>-</div><div class='del'>-			node = obj_desc-&gt;reference.node;</div><div class='del'>-</div><div class='del'>-			/* All "References" point to a NS node */</div><div class='del'>-</div><div class='del'>-			if (ACPI_GET_DESCRIPTOR_TYPE(node) !=</div><div class='del'>-			    ACPI_DESC_TYPE_NAMED) {</div><div class='del'>-				ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",</div><div class='del'>-					    node,</div><div class='del'>-					    acpi_ut_get_descriptor_name(node)));</div><div class='del'>-				return_ACPI_STATUS(AE_AML_INTERNAL);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Get the attached object */</div><div class='del'>-</div><div class='del'>-			obj_desc = acpi_ns_get_attached_object(node);</div><div class='del'>-			if (!obj_desc) {</div><div class='del'>-				/* No object, use the NS node type */</div><div class='del'>-</div><div class='del'>-				type = acpi_ns_get_type(node);</div><div class='del'>-				goto exit;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Check for circular references */</div><div class='del'>-</div><div class='del'>-			if (obj_desc == operand) {</div><div class='del'>-				return_ACPI_STATUS(AE_AML_CIRCULAR_REFERENCE);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		case AML_LOCAL_OP:</div><div class='ctx'> 		case AML_ARG_OP:</div><div class='ctx'> </div><div class='hunk'>@@ -513,7 +502,7 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 		case AML_DEBUG_OP:</div><div class='ctx'> </div><div class='del'>-			/* The Debug Object is of type "debug_object" */</div><div class='add'>+			/* The Debug Object is of type "DebugObject" */</div><div class='ctx'> </div><div class='ctx'> 			type = ACPI_TYPE_DEBUG_OBJECT;</div><div class='ctx'> 			goto exit;</div><div class='head'>diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c<br/>index a1c000f5a415..4c93d0972333 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exresop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exresop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exresop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exresop.c</a></div><div class='hunk'>@@ -77,6 +77,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='ctx'> 	if (type_needed == ACPI_TYPE_ANY) {</div><div class='add'>+</div><div class='ctx'> 		/* All types OK, so we don't perform any typechecks */</div><div class='ctx'> </div><div class='ctx'> 		return (AE_OK);</div><div class='hunk'>@@ -143,7 +144,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> 	acpi_object_type type_needed;</div><div class='ctx'> 	u16 target_op = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ex_resolve_operands", opcode);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ex_resolve_operands, opcode);</div><div class='ctx'> </div><div class='ctx'> 	op_info = acpi_ps_get_opcode_info(opcode);</div><div class='ctx'> 	if (op_info-&gt;class == AML_CLASS_UNKNOWN) {</div><div class='hunk'>@@ -158,7 +159,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-			  "Opcode %X [%s] required_operand_types=%8.8X\n",</div><div class='add'>+			  "Opcode %X [%s] RequiredOperandTypes=%8.8X\n",</div><div class='ctx'> 			  opcode, op_info-&gt;name, arg_types));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -224,6 +225,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (object_type == (u8) ACPI_TYPE_LOCAL_REFERENCE) {</div><div class='add'>+</div><div class='ctx'> 				/* Decode the Reference */</div><div class='ctx'> </div><div class='ctx'> 				op_info = acpi_ps_get_opcode_info(opcode);</div><div class='hunk'>@@ -247,7 +249,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> </div><div class='ctx'> 					ACPI_DEBUG_ONLY_MEMBERS(ACPI_DEBUG_PRINT</div><div class='ctx'> 								((ACPI_DB_EXEC,</div><div class='del'>-								  "Operand is a Reference, ref_opcode [%s]\n",</div><div class='add'>+								  "Operand is a Reference, RefOpcode [%s]\n",</div><div class='ctx'> 								  (acpi_ps_get_opcode_info</div><div class='ctx'> 								   (obj_desc-&gt;</div><div class='ctx'> 								    reference.</div><div class='hunk'>@@ -332,6 +334,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (obj_desc-&gt;reference.opcode == AML_NAME_OP) {</div><div class='add'>+</div><div class='ctx'> 				/* Convert a named reference to the actual named object */</div><div class='ctx'> </div><div class='ctx'> 				temp_node = obj_desc-&gt;reference.object;</div><div class='hunk'>@@ -623,7 +626,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> </div><div class='ctx'> 			default:</div><div class='ctx'> 				ACPI_ERROR((AE_INFO,</div><div class='del'>-					    "Needed [Region/region_field], found [%s] %p",</div><div class='add'>+					    "Needed [Region/RegionField], found [%s] %p",</div><div class='ctx'> 					    acpi_ut_get_object_type_name</div><div class='ctx'> 					    (obj_desc), obj_desc));</div><div class='ctx'> </div><div class='hunk'>@@ -662,6 +665,7 @@ acpi_ex_resolve_operands(u16 opcode,</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				if (target_op == AML_DEBUG_OP) {</div><div class='add'>+</div><div class='ctx'> 					/* Allow store of any object to the Debug object */</div><div class='ctx'> </div><div class='ctx'> 					break;</div><div class='head'>diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c<br/>index 3f020c0e2b95..0456405ba019 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exstore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exstore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exstore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exstore.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_do_debug_object", source_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",</div><div class='ctx'> 			      level, " "));</div><div class='hunk'>@@ -245,7 +245,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_operand_object *ref_desc = dest_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_store", dest_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_store, dest_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate parameters */</div><div class='ctx'> </div><div class='hunk'>@@ -297,7 +297,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DUMP_STACK_ENTRY(source_desc);</div><div class='ctx'> 		ACPI_DUMP_STACK_ENTRY(dest_desc);</div><div class='del'>-		ACPI_DUMP_OPERANDS(&amp;dest_desc, ACPI_IMODE_EXECUTE, "ex_store",</div><div class='add'>+		ACPI_DUMP_OPERANDS(&amp;dest_desc, ACPI_IMODE_EXECUTE, "ExStore",</div><div class='ctx'> 				   2,</div><div class='ctx'> 				   "Target is not a Reference or Constant object");</div><div class='ctx'> </div><div class='hunk'>@@ -396,7 +396,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,</div><div class='ctx'> 	u8 value = 0;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_store_object_to_index");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_store_object_to_index);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Destination must be a reference pointer, and</div><div class='hunk'>@@ -423,6 +423,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (obj_desc) {</div><div class='add'>+</div><div class='ctx'> 			/* Decrement reference count by the ref count of the parent package */</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; ((union acpi_operand_object *)</div><div class='hunk'>@@ -502,8 +503,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Target is not a Package or buffer_field"));</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Target is not a Package or BufferField"));</div><div class='ctx'> 		status = AE_AML_OPERAND_TYPE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -548,7 +548,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,</div><div class='ctx'> 	union acpi_operand_object *new_desc;</div><div class='ctx'> 	acpi_object_type target_type;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_node", source_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_node, source_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Get current type of the node, and object attached to Node */</div><div class='ctx'> </div><div class='hunk'>@@ -572,6 +572,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,</div><div class='ctx'> 	/* If no implicit conversion, drop into the default case below */</div><div class='ctx'> </div><div class='ctx'> 	if ((!implicit_conversion) || (walk_state-&gt;opcode == AML_COPY_OP)) {</div><div class='add'>+</div><div class='ctx'> 		/* Force execution of default (no implicit conversion) */</div><div class='ctx'> </div><div class='ctx'> 		target_type = ACPI_TYPE_ANY;</div><div class='head'>diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c<br/>index 42967baf760d..591aaf0e18b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exstoren.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exstoren.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exstoren.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exstoren.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,</div><div class='ctx'> 	union acpi_operand_object *source_desc = *source_desc_ptr;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_resolve_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_resolve_object);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure we have a Target that can be stored to */</div><div class='ctx'> </div><div class='hunk'>@@ -97,6 +97,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ACPI_GET_OBJECT_TYPE(source_desc) ==</div><div class='ctx'> 		    ACPI_TYPE_LOCAL_REFERENCE) {</div><div class='add'>+</div><div class='ctx'> 			/* Resolve a reference object first */</div><div class='ctx'> </div><div class='ctx'> 			status =</div><div class='hunk'>@@ -121,6 +122,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,</div><div class='ctx'> 		    !((ACPI_GET_OBJECT_TYPE(source_desc) ==</div><div class='ctx'> 		       ACPI_TYPE_LOCAL_REFERENCE)</div><div class='ctx'> 		      &amp;&amp; (source_desc-&gt;reference.opcode == AML_LOAD_OP))) {</div><div class='add'>+</div><div class='ctx'> 			/* Conversion successful but still not a valid type */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -199,7 +201,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,</div><div class='ctx'> 	union acpi_operand_object *actual_src_desc;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_object", source_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_object, source_desc);</div><div class='ctx'> </div><div class='ctx'> 	actual_src_desc = source_desc;</div><div class='ctx'> 	if (!dest_desc) {</div><div class='hunk'>@@ -289,6 +291,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (actual_src_desc != source_desc) {</div><div class='add'>+</div><div class='ctx'> 		/* Delete the intermediate (temporary) source object */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ut_remove_reference(actual_src_desc);</div><div class='head'>diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c<br/>index 6ab707087750..99ebe5adfcda 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exstorob.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exstorob.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exstorob.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exstorob.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	u8 *buffer;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_store_buffer_to_buffer", source_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_store_buffer_to_buffer, source_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* We know that source_desc is a buffer by now */</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +80,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((target_desc-&gt;buffer.length == 0) ||</div><div class='ctx'> 	    (target_desc-&gt;common.flags &amp; AOPOBJ_STATIC_POINTER)) {</div><div class='del'>-		target_desc-&gt;buffer.pointer = ACPI_MEM_ALLOCATE(length);</div><div class='add'>+		target_desc-&gt;buffer.pointer = ACPI_ALLOCATE(length);</div><div class='ctx'> 		if (!target_desc-&gt;buffer.pointer) {</div><div class='ctx'> 			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -91,6 +91,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,</div><div class='ctx'> 	/* Copy source buffer to target buffer */</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt;= target_desc-&gt;buffer.length) {</div><div class='add'>+</div><div class='ctx'> 		/* Clear existing buffer and copy in the new one */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_MEMSET(target_desc-&gt;buffer.pointer, 0,</div><div class='hunk'>@@ -102,7 +103,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,</div><div class='ctx'> 		 * NOTE: ACPI versions up to 3.0 specified that the buffer must be</div><div class='ctx'> 		 * truncated if the string is smaller than the buffer.  However, "other"</div><div class='ctx'> 		 * implementations of ACPI never did this and thus became the defacto</div><div class='del'>-		 * standard. ACPi 3.0_a changes this behavior such that the buffer</div><div class='add'>+		 * standard. ACPI 3.0_a changes this behavior such that the buffer</div><div class='ctx'> 		 * is no longer truncated.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='hunk'>@@ -113,6 +114,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,</div><div class='ctx'> 		 * copy must not truncate the original buffer.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (original_src_type == ACPI_TYPE_STRING) {</div><div class='add'>+</div><div class='ctx'> 			/* Set the new length of the target */</div><div class='ctx'> </div><div class='ctx'> 			target_desc-&gt;buffer.length = length;</div><div class='hunk'>@@ -156,7 +158,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	u8 *buffer;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_store_string_to_string", source_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_store_string_to_string, source_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* We know that source_desc is a string by now */</div><div class='ctx'> </div><div class='hunk'>@@ -183,13 +185,14 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (target_desc-&gt;string.pointer &amp;&amp;</div><div class='ctx'> 		    (!(target_desc-&gt;common.flags &amp; AOPOBJ_STATIC_POINTER))) {</div><div class='add'>+</div><div class='ctx'> 			/* Only free if not a pointer into the DSDT */</div><div class='ctx'> </div><div class='del'>-			ACPI_MEM_FREE(target_desc-&gt;string.pointer);</div><div class='add'>+			ACPI_FREE(target_desc-&gt;string.pointer);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		target_desc-&gt;string.pointer = ACPI_MEM_CALLOCATE((acpi_size)</div><div class='del'>-								 length + 1);</div><div class='add'>+		target_desc-&gt;string.pointer = ACPI_ALLOCATE_ZEROED((acpi_size)</div><div class='add'>+								   length + 1);</div><div class='ctx'> 		if (!target_desc-&gt;string.pointer) {</div><div class='ctx'> 			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c<br/>index ea9144f42e1f..28aef3e69ecc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exsystem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exsystem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exsystem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exsystem.c</a></div><div class='hunk'>@@ -60,22 +60,23 @@ ACPI_MODULE_NAME("exsystem")</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Implements a semaphore wait with a check to see if the</div><div class='ctx'>  *              semaphore is available immediately.  If it is not, the</div><div class='del'>- *              interpreter is released.</div><div class='add'>+ *              interpreter is released before waiting.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-acpi_status acpi_ex_system_wait_semaphore(acpi_handle semaphore, u16 timeout)</div><div class='add'>+acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_status status2;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_system_wait_semaphore");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_wait_semaphore(semaphore, 1, 0);</div><div class='add'>+	status = acpi_os_wait_semaphore(semaphore, 1, ACPI_DO_NOT_WAIT);</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status == AE_TIME) {</div><div class='add'>+</div><div class='ctx'> 		/* We must wait, so unlock the interpreter */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ex_exit_interpreter();</div><div class='hunk'>@@ -90,6 +91,60 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_handle semaphore, u16 timeout)</div><div class='ctx'> </div><div class='ctx'> 		status2 = acpi_ex_enter_interpreter();</div><div class='ctx'> 		if (ACPI_FAILURE(status2)) {</div><div class='add'>+</div><div class='add'>+			/* Report fatal error, could not acquire interpreter */</div><div class='add'>+</div><div class='add'>+			return_ACPI_STATUS(status2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ex_system_wait_mutex</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Mutex           - Mutex to wait on</div><div class='add'>+ *              Timeout         - Max time to wait</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Implements a mutex wait with a check to see if the</div><div class='add'>+ *              mutex is available immediately.  If it is not, the</div><div class='add'>+ *              interpreter is released before waiting.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	acpi_status status2;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_wait_mutex);</div><div class='add'>+</div><div class='add'>+	status = acpi_os_acquire_mutex(mutex, ACPI_DO_NOT_WAIT);</div><div class='add'>+	if (ACPI_SUCCESS(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status == AE_TIME) {</div><div class='add'>+</div><div class='add'>+		/* We must wait, so unlock the interpreter */</div><div class='add'>+</div><div class='add'>+		acpi_ex_exit_interpreter();</div><div class='add'>+</div><div class='add'>+		status = acpi_os_acquire_mutex(mutex, timeout);</div><div class='add'>+</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='add'>+				  "*** Thread awake after blocking, %s\n",</div><div class='add'>+				  acpi_format_exception(status)));</div><div class='add'>+</div><div class='add'>+		/* Reacquire the interpreter */</div><div class='add'>+</div><div class='add'>+		status2 = acpi_ex_enter_interpreter();</div><div class='add'>+		if (ACPI_FAILURE(status2)) {</div><div class='add'>+</div><div class='ctx'> 			/* Report fatal error, could not acquire interpreter */</div><div class='ctx'> </div><div class='ctx'> 			return_ACPI_STATUS(status2);</div><div class='hunk'>@@ -174,7 +229,7 @@ acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ex_system_acquire_mutex</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  time_desc       - The 'time to delay' object descriptor</div><div class='add'>+ * PARAMETERS:  time_desc       - Maximum time to wait for the mutex</div><div class='ctx'>  *              obj_desc        - The object descriptor for this op</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='hunk'>@@ -191,7 +246,7 @@ acpi_ex_system_acquire_mutex(union acpi_operand_object * time_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ex_system_acquire_mutex", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ex_system_acquire_mutex, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -199,14 +254,14 @@ acpi_ex_system_acquire_mutex(union acpi_operand_object * time_desc,</div><div class='ctx'> </div><div class='ctx'> 	/* Support for the _GL_ Mutex object -- go get the global lock */</div><div class='ctx'> </div><div class='del'>-	if (obj_desc-&gt;mutex.semaphore == acpi_gbl_global_lock_semaphore) {</div><div class='add'>+	if (obj_desc-&gt;mutex.os_mutex == ACPI_GLOBAL_LOCK) {</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_ev_acquire_global_lock((u16) time_desc-&gt;integer.value);</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_ex_system_wait_semaphore(obj_desc-&gt;mutex.semaphore,</div><div class='del'>-					       (u16) time_desc-&gt;integer.value);</div><div class='add'>+	status = acpi_ex_system_wait_mutex(obj_desc-&gt;mutex.os_mutex,</div><div class='add'>+					   (u16) time_desc-&gt;integer.value);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +284,7 @@ acpi_status acpi_ex_system_release_mutex(union acpi_operand_object *obj_desc)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_system_release_mutex");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_release_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -237,13 +292,13 @@ acpi_status acpi_ex_system_release_mutex(union acpi_operand_object *obj_desc)</div><div class='ctx'> </div><div class='ctx'> 	/* Support for the _GL_ Mutex object -- release the global lock */</div><div class='ctx'> </div><div class='del'>-	if (obj_desc-&gt;mutex.semaphore == acpi_gbl_global_lock_semaphore) {</div><div class='add'>+	if (obj_desc-&gt;mutex.os_mutex == ACPI_GLOBAL_LOCK) {</div><div class='ctx'> 		status = acpi_ev_release_global_lock();</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_signal_semaphore(obj_desc-&gt;mutex.semaphore, 1);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	acpi_os_release_mutex(obj_desc-&gt;mutex.os_mutex);</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -263,10 +318,11 @@ acpi_status acpi_ex_system_signal_event(union acpi_operand_object *obj_desc)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_system_signal_event");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_signal_event);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc) {</div><div class='del'>-		status = acpi_os_signal_semaphore(obj_desc-&gt;event.semaphore, 1);</div><div class='add'>+		status =</div><div class='add'>+		    acpi_os_signal_semaphore(obj_desc-&gt;event.os_semaphore, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -293,11 +349,11 @@ acpi_ex_system_wait_event(union acpi_operand_object *time_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_system_wait_event");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_system_wait_event);</div><div class='ctx'> </div><div class='ctx'> 	if (obj_desc) {</div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_ex_system_wait_semaphore(obj_desc-&gt;event.semaphore,</div><div class='add'>+		    acpi_ex_system_wait_semaphore(obj_desc-&gt;event.os_semaphore,</div><div class='ctx'> 						  (u16) time_desc-&gt;integer.</div><div class='ctx'> 						  value);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -320,7 +376,7 @@ acpi_ex_system_wait_event(union acpi_operand_object *time_desc,</div><div class='ctx'> acpi_status acpi_ex_system_reset_event(union acpi_operand_object *obj_desc)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='del'>-	void *temp_semaphore;</div><div class='add'>+	acpi_semaphore temp_semaphore;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='hunk'>@@ -331,8 +387,8 @@ acpi_status acpi_ex_system_reset_event(union acpi_operand_object *obj_desc)</div><div class='ctx'> 	status =</div><div class='ctx'> 	    acpi_os_create_semaphore(ACPI_NO_UNIT_LIMIT, 0, &amp;temp_semaphore);</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		(void)acpi_os_delete_semaphore(obj_desc-&gt;event.semaphore);</div><div class='del'>-		obj_desc-&gt;event.semaphore = temp_semaphore;</div><div class='add'>+		(void)acpi_os_delete_semaphore(obj_desc-&gt;event.os_semaphore);</div><div class='add'>+		obj_desc-&gt;event.os_semaphore = temp_semaphore;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (status);</div><div class='head'>diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c<br/>index f73a61aeb7ec..982c8b65876f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exutils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/executer/exutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/executer/exutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/executer/exutils.c</a></div><div class='hunk'>@@ -87,9 +87,9 @@ acpi_status acpi_ex_enter_interpreter(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_enter_interpreter");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_enter_interpreter);</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);</div><div class='add'>+	status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -123,9 +123,9 @@ void acpi_ex_exit_interpreter(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_exit_interpreter");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_exit_interpreter);</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);</div><div class='add'>+	status = acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -189,11 +189,12 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)</div><div class='ctx'> 	u8 locked = FALSE;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_acquire_global_lock");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_acquire_global_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Only attempt lock if the always_lock bit is set */</div><div class='ctx'> </div><div class='ctx'> 	if (field_flags &amp; AML_FIELD_LOCK_RULE_MASK) {</div><div class='add'>+</div><div class='ctx'> 		/* We should attempt to get the lock, wait forever */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);</div><div class='hunk'>@@ -225,15 +226,17 @@ void acpi_ex_release_global_lock(u8 locked_by_me)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_release_global_lock");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_release_global_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Only attempt unlock if the caller locked it */</div><div class='ctx'> </div><div class='ctx'> 	if (locked_by_me) {</div><div class='add'>+</div><div class='ctx'> 		/* OK, now release the lock */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ev_release_global_lock();</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Report the error, but there isn't much else we can do */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_EXCEPTION((AE_INFO, status,</div><div class='hunk'>@@ -263,7 +266,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)</div><div class='ctx'> 	u32 num_digits;</div><div class='ctx'> 	acpi_integer current_value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ex_digits_needed");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ex_digits_needed);</div><div class='ctx'> </div><div class='ctx'> 	/* acpi_integer is unsigned, so we don't worry about a '-' prefix */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c<br/>index e8165c4f162a..045c89477e59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/fan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/fan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/fan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/fan.c</a></div><div class='hunk'>@@ -48,6 +48,8 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int acpi_fan_add(struct acpi_device *device);</div><div class='ctx'> static int acpi_fan_remove(struct acpi_device *device, int type);</div><div class='add'>+static int acpi_fan_suspend(struct acpi_device *device, int state);</div><div class='add'>+static int acpi_fan_resume(struct acpi_device *device, int state);</div><div class='ctx'> </div><div class='ctx'> static struct acpi_driver acpi_fan_driver = {</div><div class='ctx'> 	.name = ACPI_FAN_DRIVER_NAME,</div><div class='hunk'>@@ -56,11 +58,13 @@ static struct acpi_driver acpi_fan_driver = {</div><div class='ctx'> 	.ops = {</div><div class='ctx'> 		.add = acpi_fan_add,</div><div class='ctx'> 		.remove = acpi_fan_remove,</div><div class='add'>+		.suspend = acpi_fan_suspend,</div><div class='add'>+		.resume = acpi_fan_resume,</div><div class='ctx'> 		},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_fan {</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device * device;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -74,16 +78,15 @@ static int acpi_fan_read_state(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_fan *fan = seq-&gt;private;</div><div class='ctx'> 	int state = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_read_state");</div><div class='ctx'> </div><div class='ctx'> 	if (fan) {</div><div class='del'>-		if (acpi_bus_get_power(fan-&gt;handle, &amp;state))</div><div class='add'>+		if (acpi_bus_get_power(fan-&gt;device-&gt;handle, &amp;state))</div><div class='ctx'> 			seq_printf(seq, "status:                  ERROR\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_printf(seq, "status:                  %s\n",</div><div class='ctx'> 				   !state ? "on" : "off");</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_fan_state_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -100,25 +103,24 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,</div><div class='ctx'> 	struct acpi_fan *fan = (struct acpi_fan *)m-&gt;private;</div><div class='ctx'> 	char state_string[12] = { '\0' };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_write_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!fan || (count &gt; sizeof(state_string) - 1))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(state_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	state_string[count] = '\0';</div><div class='ctx'> </div><div class='del'>-	result = acpi_bus_set_power(fan-&gt;handle,</div><div class='add'>+	result = acpi_bus_set_power(fan-&gt;device-&gt;handle,</div><div class='ctx'> 				    simple_strtoul(state_string, NULL, 0));</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_fan_state_ops = {</div><div class='add'>+static const struct file_operations acpi_fan_state_ops = {</div><div class='ctx'> 	.open = acpi_fan_state_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_fan_write_state,</div><div class='hunk'>@@ -131,16 +133,15 @@ static int acpi_fan_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_fan_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -149,21 +150,18 @@ static int acpi_fan_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_FAN_FILE_STATE));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_fan_state_ops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_fan_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_FAN_FILE_STATE, acpi_device_dir(device));</div><div class='hunk'>@@ -171,7 +169,7 @@ static int acpi_fan_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -184,28 +182,30 @@ static int acpi_fan_add(struct acpi_device *device)</div><div class='ctx'> 	struct acpi_fan *fan = NULL;</div><div class='ctx'> 	int state = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fan = kmalloc(sizeof(struct acpi_fan), GFP_KERNEL);</div><div class='ctx'> 	if (!fan)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(fan, 0, sizeof(struct acpi_fan));</div><div class='ctx'> </div><div class='del'>-	fan-&gt;handle = device-&gt;handle;</div><div class='add'>+	fan-&gt;device = device;</div><div class='ctx'> 	strcpy(acpi_device_name(device), "Fan");</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_FAN_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = fan;</div><div class='ctx'> </div><div class='del'>-	result = acpi_bus_get_power(fan-&gt;handle, &amp;state);</div><div class='add'>+	result = acpi_bus_get_power(device-&gt;handle, &amp;state);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error reading power state\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Reading power state\n");</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	device-&gt;flags.force_power_state = 1;</div><div class='add'>+	acpi_bus_set_power(device-&gt;handle, state);</div><div class='add'>+	device-&gt;flags.force_power_state = 0;</div><div class='add'>+</div><div class='ctx'> 	result = acpi_fan_add_fs(device);</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -218,17 +218,16 @@ static int acpi_fan_add(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		kfree(fan);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_fan_remove(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_fan *fan = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	fan = (struct acpi_fan *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -236,38 +235,68 @@ static int acpi_fan_remove(struct acpi_device *device, int type)</div><div class='ctx'> </div><div class='ctx'> 	kfree(fan);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_fan_suspend(struct acpi_device *device, int state)</div><div class='add'>+{</div><div class='add'>+	if (!device)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	acpi_bus_set_power(device-&gt;handle, ACPI_STATE_D0);</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_fan_resume(struct acpi_device *device, int state)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	int power_state = 0;</div><div class='add'>+</div><div class='add'>+	if (!device)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	result = acpi_bus_get_power(device-&gt;handle, &amp;power_state);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "Error reading fan power state\n"));</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device-&gt;flags.force_power_state = 1;</div><div class='add'>+	acpi_bus_set_power(device-&gt;handle, power_state);</div><div class='add'>+	device-&gt;flags.force_power_state = 0;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_fan_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_init");</div><div class='ctx'> </div><div class='ctx'> 	acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_fan_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	acpi_fan_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_fan_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_fan_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_fan_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_fan_driver);</div><div class='ctx'> </div><div class='ctx'> 	remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_fan_init);</div><div class='head'>diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c<br/>index 8daef57b994c..10f160dc75b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/glue.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/glue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/glue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/glue.c</a></div><div class='hunk'>@@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle)</div><div class='ctx'> 		bbn = bus;</div><div class='ctx'> 	}</div><div class='ctx'>       exit:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> 	return (int)bbn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 		find-&gt;handle = handle;</div><div class='ctx'> 	status = AE_OK;</div><div class='ctx'>       exit:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 		info = buffer.pointer;</div><div class='ctx'> 		if (info-&gt;address == find-&gt;address)</div><div class='ctx'> 			find-&gt;handle = handle;</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 	}</div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 		acpi_get_name(dev-&gt;firmware_data, ACPI_FULL_PATHNAME, &amp;buffer);</div><div class='ctx'> 		DBG("Device %s -&gt; %s\n", dev-&gt;bus_id, (char *)buffer.pointer);</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 	} else</div><div class='ctx'> 		DBG("Device %s -&gt; No ACPI support\n", dev-&gt;bus_id);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c<br/>index ea2f13271ff1..de50fab2a910 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwacpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwacpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwacpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/hardware/hwacpi.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@ acpi_status acpi_hw_initialize(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_initialize");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_initialize);</div><div class='ctx'> </div><div class='ctx'> 	/* We must have the ACPI tables by the time we get here */</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +100,7 @@ acpi_status acpi_hw_set_mode(u32 mode)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 retry;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_set_mode");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_set_mode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,</div><div class='hunk'>@@ -198,7 +198,7 @@ u32 acpi_hw_get_mode(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_get_mode");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_get_mode);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,</div><div class='head'>diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c<br/>index d84942d22dd5..608a3a60ee11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwgpe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwgpe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwgpe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/hardware/hwgpe.c</a></div><div class='hunk'>@@ -214,6 +214,7 @@ acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,</div><div class='ctx'> 	/* Examine each GPE Register within the block */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; gpe_block-&gt;register_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Disable all GPEs in this register */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_hw_low_level_write(8, 0x00,</div><div class='hunk'>@@ -250,6 +251,7 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,</div><div class='ctx'> 	/* Examine each GPE Register within the block */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; gpe_block-&gt;register_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Clear status on all GPEs in this register */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_hw_low_level_write(8, 0xFF,</div><div class='hunk'>@@ -368,7 +370,7 @@ acpi_status acpi_hw_disable_all_gpes(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_disable_all_gpes");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_disable_all_gpes);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ev_walk_gpe_list(acpi_hw_disable_gpe_block);</div><div class='ctx'> 	status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block);</div><div class='hunk'>@@ -391,7 +393,7 @@ acpi_status acpi_hw_enable_all_runtime_gpes(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_enable_all_runtime_gpes");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_enable_all_runtime_gpes);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ev_walk_gpe_list(acpi_hw_enable_runtime_gpe_block);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -413,7 +415,7 @@ acpi_status acpi_hw_enable_all_wakeup_gpes(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_enable_all_wakeup_gpes");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_enable_all_wakeup_gpes);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ev_walk_gpe_list(acpi_hw_enable_wakeup_gpe_block);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='head'>diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c<br/>index e1fe75498415..3143f36fcec9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwregs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwregs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwregs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/hardware/hwregs.c</a></div><div class='hunk'>@@ -43,8 +43,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> #include &lt;acpi/acevents.h&gt;</div><div class='hunk'>@@ -63,23 +61,21 @@ ACPI_MODULE_NAME("hwregs")</div><div class='ctx'>  * DESCRIPTION: Clears all fixed and general purpose status bits</div><div class='ctx'>  *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED</div><div class='ctx'>  *</div><div class='add'>+ * NOTE: TBD: Flags parameter is obsolete, to be removed</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> acpi_status acpi_hw_clear_acpi_status(u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	acpi_cpu_flags lock_flags = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_clear_acpi_status");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_clear_acpi_status);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_IO, "About to write %04X to %04X\n",</div><div class='ctx'> 			  ACPI_BITMASK_ALL_FIXED_STATUS,</div><div class='ctx'> 			  (u16) acpi_gbl_FADT-&gt;xpm1a_evt_blk.address));</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ACPI_MTX_LOCK) {</div><div class='del'>-		status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,</div><div class='ctx'> 					ACPI_REGISTER_PM1_STATUS,</div><div class='hunk'>@@ -104,9 +100,7 @@ acpi_status acpi_hw_clear_acpi_status(u32 flags)</div><div class='ctx'> 	status = acpi_ev_walk_gpe_list(acpi_hw_clear_gpe_block);</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='del'>-	if (flags &amp; ACPI_MTX_LOCK) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-	}</div><div class='add'>+	acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,10 +123,9 @@ acpi_status</div><div class='ctx'> acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='del'>-	char *sleep_state_name;</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_sleep_type_data");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_sleep_type_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate parameters */</div><div class='ctx'> </div><div class='hunk'>@@ -140,47 +133,52 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Evaluate the namespace object containing the values for this state */</div><div class='add'>+	/* Allocate the evaluation information block */</div><div class='ctx'> </div><div class='del'>-	info.parameters = NULL;</div><div class='del'>-	info.return_object = NULL;</div><div class='del'>-	sleep_state_name =</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;pathname =</div><div class='ctx'> 	    ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]);</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_evaluate_by_name(sleep_state_name, &amp;info);</div><div class='add'>+	/* Evaluate the namespace object containing the values for this state */</div><div class='add'>+</div><div class='add'>+	status = acpi_ns_evaluate(info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-				  "%s while evaluating sleep_state [%s]\n",</div><div class='add'>+				  "%s while evaluating SleepState [%s]\n",</div><div class='ctx'> 				  acpi_format_exception(status),</div><div class='del'>-				  sleep_state_name));</div><div class='add'>+				  info-&gt;pathname));</div><div class='ctx'> </div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Must have a return object */</div><div class='ctx'> </div><div class='del'>-	if (!info.return_object) {</div><div class='add'>+	if (!info-&gt;return_object) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",</div><div class='del'>-			    sleep_state_name));</div><div class='add'>+			    info-&gt;pathname));</div><div class='ctx'> 		status = AE_NOT_EXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* It must be of type Package */</div><div class='ctx'> </div><div class='del'>-	else if (ACPI_GET_OBJECT_TYPE(info.return_object) != ACPI_TYPE_PACKAGE) {</div><div class='add'>+	else if (ACPI_GET_OBJECT_TYPE(info-&gt;return_object) != ACPI_TYPE_PACKAGE) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Sleep State return object is not a Package"));</div><div class='ctx'> 		status = AE_AML_OPERAND_TYPE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The package must have at least two elements.  NOTE (March 2005): This</div><div class='add'>+	 * The package must have at least two elements. NOTE (March 2005): This</div><div class='ctx'> 	 * goes against the current ACPI spec which defines this object as a</div><div class='del'>-	 * package with one encoded DWORD element.  However, existing practice</div><div class='add'>+	 * package with one encoded DWORD element. However, existing practice</div><div class='ctx'> 	 * by BIOS vendors seems to be to have 2 or more elements, at least</div><div class='ctx'> 	 * one per sleep type (A/B).</div><div class='ctx'> 	 */</div><div class='del'>-	else if (info.return_object-&gt;package.count &lt; 2) {</div><div class='add'>+	else if (info-&gt;return_object-&gt;package.count &lt; 2) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Sleep State return package does not have at least two elements"));</div><div class='ctx'> 		status = AE_AML_NO_OPERAND;</div><div class='hunk'>@@ -188,39 +186,42 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)</div><div class='ctx'> </div><div class='ctx'> 	/* The first two elements must both be of type Integer */</div><div class='ctx'> </div><div class='del'>-	else if ((ACPI_GET_OBJECT_TYPE(info.return_object-&gt;package.elements[0])</div><div class='add'>+	else if ((ACPI_GET_OBJECT_TYPE(info-&gt;return_object-&gt;package.elements[0])</div><div class='ctx'> 		  != ACPI_TYPE_INTEGER) ||</div><div class='del'>-		 (ACPI_GET_OBJECT_TYPE(info.return_object-&gt;package.elements[1])</div><div class='add'>+		 (ACPI_GET_OBJECT_TYPE(info-&gt;return_object-&gt;package.elements[1])</div><div class='ctx'> 		  != ACPI_TYPE_INTEGER)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Sleep State return package elements are not both Integers (%s, %s)",</div><div class='del'>-			    acpi_ut_get_object_type_name(info.return_object-&gt;</div><div class='add'>+			    acpi_ut_get_object_type_name(info-&gt;return_object-&gt;</div><div class='ctx'> 							 package.elements[0]),</div><div class='del'>-			    acpi_ut_get_object_type_name(info.return_object-&gt;</div><div class='add'>+			    acpi_ut_get_object_type_name(info-&gt;return_object-&gt;</div><div class='ctx'> 							 package.elements[1])));</div><div class='ctx'> 		status = AE_AML_OPERAND_TYPE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Valid _Sx_ package size, type, and value */</div><div class='ctx'> </div><div class='ctx'> 		*sleep_type_a = (u8)</div><div class='del'>-		    (info.return_object-&gt;package.elements[0])-&gt;integer.value;</div><div class='add'>+		    (info-&gt;return_object-&gt;package.elements[0])-&gt;integer.value;</div><div class='ctx'> 		*sleep_type_b = (u8)</div><div class='del'>-		    (info.return_object-&gt;package.elements[1])-&gt;integer.value;</div><div class='add'>+		    (info-&gt;return_object-&gt;package.elements[1])-&gt;integer.value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-				"While evaluating sleep_state [%s], bad Sleep object %p type %s",</div><div class='del'>-				sleep_state_name, info.return_object,</div><div class='del'>-				acpi_ut_get_object_type_name(info.</div><div class='add'>+				"While evaluating SleepState [%s], bad Sleep object %p type %s",</div><div class='add'>+				info-&gt;pathname, info-&gt;return_object,</div><div class='add'>+				acpi_ut_get_object_type_name(info-&gt;</div><div class='ctx'> 							     return_object)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_ut_remove_reference(info.return_object);</div><div class='add'>+	acpi_ut_remove_reference(info-&gt;return_object);</div><div class='add'>+</div><div class='add'>+      cleanup:</div><div class='add'>+	ACPI_FREE(info);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_sleep_type_data);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_sleep_type_data)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -233,13 +234,12 @@ EXPORT_SYMBOL(acpi_get_sleep_type_data);</div><div class='ctx'>  * DESCRIPTION: Map register_id into a register bitmask.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)</div><div class='ctx'> {</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='ctx'> 	if (register_id &gt; ACPI_BITREG_MAX) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid bit_register ID: %X",</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid BitRegister ID: %X",</div><div class='ctx'> 			    register_id));</div><div class='ctx'> 		return (NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -255,11 +255,13 @@ struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)</div><div class='ctx'>  *              return_value    - Value that was read from the register</div><div class='ctx'>  *              Flags           - Lock the hardware or not</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      Status and the value read from specified Register.  Value</div><div class='add'>+ * RETURN:      Status and the value read from specified Register. Value</div><div class='ctx'>  *              returned is normalized to bit0 (is shifted all the way right)</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: ACPI bit_register read function.</div><div class='ctx'>  *</div><div class='add'>+ * NOTE: TBD: Flags parameter is obsolete, to be removed</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)</div><div class='hunk'>@@ -268,7 +270,7 @@ acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)</div><div class='ctx'> 	struct acpi_bit_register_info *bit_reg_info;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_register");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_register);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the info structure corresponding to the requested ACPI Register */</div><div class='ctx'> </div><div class='hunk'>@@ -277,24 +279,14 @@ acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ACPI_MTX_LOCK) {</div><div class='del'>-		status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Read from the register */</div><div class='ctx'> </div><div class='del'>-	status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,</div><div class='add'>+	status = acpi_hw_register_read(ACPI_MTX_LOCK,</div><div class='ctx'> 				       bit_reg_info-&gt;parent_register,</div><div class='ctx'> 				       &amp;register_value);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ACPI_MTX_LOCK) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Normalize the value that was read */</div><div class='ctx'> </div><div class='ctx'> 		register_value =</div><div class='hunk'>@@ -311,7 +303,7 @@ acpi_status acpi_get_register(u32 register_id, u32 * return_value, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_register);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_register)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -326,31 +318,28 @@ EXPORT_SYMBOL(acpi_get_register);</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: ACPI Bit Register write function.</div><div class='ctx'>  *</div><div class='add'>+ * NOTE: TBD: Flags parameter is obsolete, to be removed</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	u32 register_value = 0;</div><div class='ctx'> 	struct acpi_bit_register_info *bit_reg_info;</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	acpi_cpu_flags lock_flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("acpi_set_register", register_id);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(acpi_set_register, register_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the info structure corresponding to the requested ACPI Register */</div><div class='ctx'> </div><div class='ctx'> 	bit_reg_info = acpi_hw_get_bit_register_info(register_id);</div><div class='ctx'> 	if (!bit_reg_info) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Bad ACPI HW register_id: %X",</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Bad ACPI HW RegisterId: %X",</div><div class='ctx'> 			    register_id));</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ACPI_MTX_LOCK) {</div><div class='del'>-		status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Always do a register read first so we can insert the new bits  */</div><div class='ctx'> </div><div class='hunk'>@@ -372,8 +361,8 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)</div><div class='ctx'> 	case ACPI_REGISTER_PM1_STATUS:</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Status Registers are different from the rest.  Clear by</div><div class='del'>-		 * writing 1, and writing 0 has no effect.  So, the only relevant</div><div class='add'>+		 * Status Registers are different from the rest. Clear by</div><div class='add'>+		 * writing 1, and writing 0 has no effect. So, the only relevant</div><div class='ctx'> 		 * information is the single bit we're interested in, all others should</div><div class='ctx'> 		 * be written as 0 so they will be left unchanged.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -458,9 +447,7 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; ACPI_MTX_LOCK) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-	}</div><div class='add'>+	acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Normalize the value that was read */</div><div class='ctx'> </div><div class='hunk'>@@ -474,37 +461,33 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_set_register);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_set_register)</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_hw_register_read</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  use_lock            - Mutex hw access</div><div class='del'>- *              register_id         - register_iD + Offset</div><div class='add'>+ * PARAMETERS:  use_lock            - Lock hardware? True/False</div><div class='add'>+ *              register_id         - ACPI Register ID</div><div class='ctx'>  *              return_value        - Where the register value is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status and the value read.</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Acpi register read function.  Registers are read at the</div><div class='del'>- *              given offset.</div><div class='add'>+ * DESCRIPTION: Read from the specified ACPI register</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)</div><div class='ctx'> {</div><div class='ctx'> 	u32 value1 = 0;</div><div class='ctx'> 	u32 value2 = 0;</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	acpi_cpu_flags lock_flags = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_register_read");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_register_read);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_MTX_LOCK == use_lock) {</div><div class='del'>-		status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='add'>+		lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (register_id) {</div><div class='hunk'>@@ -582,7 +565,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> 	if (ACPI_MTX_LOCK == use_lock) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_HARDWARE);</div><div class='add'>+		acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='hunk'>@@ -596,33 +579,60 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_hw_register_write</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  use_lock            - Mutex hw access</div><div class='del'>- *              register_id         - register_iD + Offset</div><div class='add'>+ * PARAMETERS:  use_lock            - Lock hardware? True/False</div><div class='add'>+ *              register_id         - ACPI Register ID</div><div class='ctx'>  *              Value               - The value to write</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Acpi register Write function.  Registers are written at the</div><div class='del'>- *              given offset.</div><div class='add'>+ * DESCRIPTION: Write to the specified ACPI register</div><div class='add'>+ *</div><div class='add'>+ * NOTE: In accordance with the ACPI specification, this function automatically</div><div class='add'>+ * preserves the value of the following bits, meaning that these bits cannot be</div><div class='add'>+ * changed via this interface:</div><div class='add'>+ *</div><div class='add'>+ * PM1_CONTROL[0] = SCI_EN</div><div class='add'>+ * PM1_CONTROL[9]</div><div class='add'>+ * PM1_STATUS[11]</div><div class='add'>+ *</div><div class='add'>+ * ACPI References:</div><div class='add'>+ * 1) Hardware Ignored Bits: When software writes to a register with ignored</div><div class='add'>+ *      bit fields, it preserves the ignored bit fields</div><div class='add'>+ * 2) SCI_EN: OSPM always preserves this bit position</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	acpi_cpu_flags lock_flags = 0;</div><div class='add'>+	u32 read_value;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hw_register_write");</div><div class='add'>+	ACPI_FUNCTION_TRACE(hw_register_write);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_MTX_LOCK == use_lock) {</div><div class='del'>-		status = acpi_ut_acquire_mutex(ACPI_MTX_HARDWARE);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='add'>+		lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (register_id) {</div><div class='ctx'> 	case ACPI_REGISTER_PM1_STATUS:	/* 16-bit access */</div><div class='ctx'> </div><div class='add'>+		/* Perform a read first to preserve certain bits (per ACPI spec) */</div><div class='add'>+</div><div class='add'>+		status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,</div><div class='add'>+					       ACPI_REGISTER_PM1_STATUS,</div><div class='add'>+					       &amp;read_value);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			goto unlock_and_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Insert the bits to be preserved */</div><div class='add'>+</div><div class='add'>+		ACPI_INSERT_BITS(value, ACPI_PM1_STATUS_PRESERVED_BITS,</div><div class='add'>+				 read_value);</div><div class='add'>+</div><div class='add'>+		/* Now we can write the data */</div><div class='add'>+</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_hw_low_level_write(16, value,</div><div class='ctx'> 					    &amp;acpi_gbl_FADT-&gt;xpm1a_evt_blk);</div><div class='hunk'>@@ -653,6 +663,25 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_REGISTER_PM1_CONTROL:	/* 16-bit access */</div><div class='ctx'> </div><div class='add'>+		/*</div><div class='add'>+		 * Perform a read first to preserve certain bits (per ACPI spec)</div><div class='add'>+		 *</div><div class='add'>+		 * Note: This includes SCI_EN, we never want to change this bit</div><div class='add'>+		 */</div><div class='add'>+		status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK,</div><div class='add'>+					       ACPI_REGISTER_PM1_CONTROL,</div><div class='add'>+					       &amp;read_value);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			goto unlock_and_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Insert the bits to be preserved */</div><div class='add'>+</div><div class='add'>+		ACPI_INSERT_BITS(value, ACPI_PM1_CONTROL_PRESERVED_BITS,</div><div class='add'>+				 read_value);</div><div class='add'>+</div><div class='add'>+		/* Now we can write the data */</div><div class='add'>+</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_hw_low_level_write(16, value,</div><div class='ctx'> 					    &amp;acpi_gbl_FADT-&gt;xpm1a_cnt_blk);</div><div class='hunk'>@@ -707,7 +736,7 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value)</div><div class='ctx'> </div><div class='ctx'>       unlock_and_exit:</div><div class='ctx'> 	if (ACPI_MTX_LOCK == use_lock) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_HARDWARE);</div><div class='add'>+		acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -733,7 +762,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)</div><div class='ctx'> 	u64 address;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("hw_low_level_read");</div><div class='add'>+	ACPI_FUNCTION_NAME(hw_low_level_read);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must have a valid pointer to a GAS structure, and</div><div class='hunk'>@@ -744,7 +773,7 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)</div><div class='ctx'> 		return (AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get a local copy of the address.  Handles possible alignment issues */</div><div class='add'>+	/* Get a local copy of the address. Handles possible alignment issues */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_MOVE_64_TO_64(&amp;address, &amp;reg-&gt;address);</div><div class='ctx'> 	if (!address) {</div><div class='hunk'>@@ -805,7 +834,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)</div><div class='ctx'> 	u64 address;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("hw_low_level_write");</div><div class='add'>+	ACPI_FUNCTION_NAME(hw_low_level_write);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must have a valid pointer to a GAS structure, and</div><div class='hunk'>@@ -816,7 +845,7 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)</div><div class='ctx'> 		return (AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get a local copy of the address.  Handles possible alignment issues */</div><div class='add'>+	/* Get a local copy of the address. Handles possible alignment issues */</div><div class='ctx'> </div><div class='ctx'> 	ACPI_MOVE_64_TO_64(&amp;address, &amp;reg-&gt;address);</div><div class='ctx'> 	if (!address) {</div><div class='head'>diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c<br/>index 89269272fd62..8bb43cae60c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwsleep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwsleep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwsleep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/hardware/hwsleep.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_HARDWARE</div><div class='hunk'>@@ -64,7 +63,7 @@ acpi_status</div><div class='ctx'> acpi_set_firmware_waking_vector(acpi_physical_address physical_address)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_set_firmware_waking_vector");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the vector */</div><div class='ctx'> </div><div class='hunk'>@@ -79,6 +78,8 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_firmware_waking_vector</div><div class='hunk'>@@ -92,13 +93,12 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address)</div><div class='ctx'>  * DESCRIPTION: Access function for the firmware_waking_vector field in FACS</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_firmware_waking_vector");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_firmware_waking_vector);</div><div class='ctx'> </div><div class='ctx'> 	if (!physical_address) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -118,6 +118,8 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_firmware_waking_vector)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -134,14 +136,13 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)</div><div class='ctx'>  *              various OS-specific tasks between the two steps.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_object_list arg_list;</div><div class='ctx'> 	union acpi_object arg;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enter_sleep_state_prep");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_prep);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * _PSW methods could be run here to enable wake-on keyboard, LAN, etc.</div><div class='hunk'>@@ -206,6 +207,8 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_enter_sleep_state</div><div class='hunk'>@@ -218,7 +221,6 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)</div><div class='ctx'>  *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)</div><div class='ctx'> {</div><div class='ctx'> 	u32 PM1Acontrol;</div><div class='hunk'>@@ -228,7 +230,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)</div><div class='ctx'> 	u32 in_value;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enter_sleep_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);</div><div class='ctx'> </div><div class='ctx'> 	if ((acpi_gbl_sleep_type_a &gt; ACPI_SLEEP_TYPE_MAX) ||</div><div class='ctx'> 	    (acpi_gbl_sleep_type_b &gt; ACPI_SLEEP_TYPE_MAX)) {</div><div class='hunk'>@@ -378,7 +380,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_enter_sleep_state);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -392,13 +394,12 @@ EXPORT_SYMBOL(acpi_enter_sleep_state);</div><div class='ctx'>  *              THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 in_value;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enter_sleep_state_s4bios");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='ctx'> 	    acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);</div><div class='hunk'>@@ -443,7 +444,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -457,7 +458,6 @@ EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios);</div><div class='ctx'>  *              Called with interrupts ENABLED.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_leave_sleep_state(u8 sleep_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_object_list arg_list;</div><div class='hunk'>@@ -468,7 +468,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)</div><div class='ctx'> 	u32 PM1Acontrol;</div><div class='ctx'> 	u32 PM1Bcontrol;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_leave_sleep_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set SLP_TYPE and SLP_EN to state S0.</div><div class='hunk'>@@ -490,6 +490,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)</div><div class='ctx'> 					       ACPI_REGISTER_PM1_CONTROL,</div><div class='ctx'> 					       &amp;PM1Acontrol);</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Clear SLP_EN and SLP_TYP fields */</div><div class='ctx'> </div><div class='ctx'> 			PM1Acontrol &amp;= ~(sleep_type_reg_info-&gt;access_bit_mask |</div><div class='hunk'>@@ -583,3 +584,5 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_leave_sleep_state)</div><div class='head'>diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c<br/>index fc10b7cb456f..c4ec47c939fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwtimer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hardware/hwtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/hardware/hwtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/hardware/hwtimer.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_HARDWARE</div><div class='hunk'>@@ -61,13 +60,13 @@ ACPI_MODULE_NAME("hwtimer")</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> acpi_status acpi_get_timer_resolution(u32 * resolution)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_timer_resolution");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_timer_resolution);</div><div class='ctx'> </div><div class='ctx'> 	if (!resolution) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (0 == acpi_gbl_FADT-&gt;tmr_val_ext) {</div><div class='add'>+	if (acpi_gbl_FADT-&gt;tmr_val_ext == 0) {</div><div class='ctx'> 		*resolution = 24;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*resolution = 32;</div><div class='hunk'>@@ -76,6 +75,8 @@ acpi_status acpi_get_timer_resolution(u32 * resolution)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_timer_resolution)</div><div class='add'>+</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_timer</div><div class='hunk'>@@ -87,12 +88,11 @@ acpi_status acpi_get_timer_resolution(u32 * resolution)</div><div class='ctx'>  * DESCRIPTION: Obtains current value of ACPI PM Timer (in ticks).</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_get_timer(u32 * ticks)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_timer");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (!ticks) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -103,7 +103,7 @@ acpi_status acpi_get_timer(u32 * ticks)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_timer);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_timer)</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -133,7 +133,6 @@ EXPORT_SYMBOL(acpi_get_timer);</div><div class='ctx'>  *              2**32 Ticks / 3,600,000 Ticks/Sec = 1193 sec or 19.88 minutes</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)</div><div class='ctx'> {</div><div class='hunk'>@@ -141,7 +140,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)</div><div class='ctx'> 	u32 delta_ticks;</div><div class='ctx'> 	acpi_integer quotient;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_timer_duration");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_timer_duration);</div><div class='ctx'> </div><div class='ctx'> 	if (!time_elapsed) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -154,7 +153,8 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)</div><div class='ctx'> 	if (start_ticks &lt; end_ticks) {</div><div class='ctx'> 		delta_ticks = end_ticks - start_ticks;</div><div class='ctx'> 	} else if (start_ticks &gt; end_ticks) {</div><div class='del'>-		if (0 == acpi_gbl_FADT-&gt;tmr_val_ext) {</div><div class='add'>+		if (acpi_gbl_FADT-&gt;tmr_val_ext == 0) {</div><div class='add'>+</div><div class='ctx'> 			/* 24-bit Timer */</div><div class='ctx'> </div><div class='ctx'> 			delta_ticks =</div><div class='hunk'>@@ -183,4 +183,4 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_timer_duration);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_timer_duration)</div><div class='head'>diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c<br/>index 2e2e4051dfa7..32c9d88fd196 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/hotkey.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/hotkey.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/hotkey.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/hotkey.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ static union acpi_hotkey *get_hotkey_by_event(struct</div><div class='ctx'> 					      *hotkey_list, int event);</div><div class='ctx'> </div><div class='ctx'> /* event based config */</div><div class='del'>-static struct file_operations hotkey_config_fops = {</div><div class='add'>+static const struct file_operations hotkey_config_fops = {</div><div class='ctx'> 	.open = hotkey_open_config,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = hotkey_write_config,</div><div class='hunk'>@@ -193,7 +193,7 @@ static struct file_operations hotkey_config_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* polling based config */</div><div class='del'>-static struct file_operations hotkey_poll_config_fops = {</div><div class='add'>+static const struct file_operations hotkey_poll_config_fops = {</div><div class='ctx'> 	.open = hotkey_poll_open_config,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = hotkey_write_config,</div><div class='hunk'>@@ -202,7 +202,7 @@ static struct file_operations hotkey_poll_config_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hotkey driver info */</div><div class='del'>-static struct file_operations hotkey_info_fops = {</div><div class='add'>+static const struct file_operations hotkey_info_fops = {</div><div class='ctx'> 	.open = hotkey_info_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -210,7 +210,7 @@ static struct file_operations hotkey_info_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* action */</div><div class='del'>-static struct file_operations hotkey_action_fops = {</div><div class='add'>+static const struct file_operations hotkey_action_fops = {</div><div class='ctx'> 	.open = hotkey_action_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = hotkey_execute_aml_method,</div><div class='hunk'>@@ -219,7 +219,7 @@ static struct file_operations hotkey_action_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* polling results */</div><div class='del'>-static struct file_operations hotkey_polling_fops = {</div><div class='add'>+static const struct file_operations hotkey_polling_fops = {</div><div class='ctx'> 	.open = hotkey_polling_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -231,11 +231,10 @@ struct list_head hotkey_entries;	/* head of the list of hotkey_list */</div><div class='ctx'> </div><div class='ctx'> static int hotkey_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_info_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "Hotkey generic driver ver: %s\n", HOTKEY_ACPI_VERSION);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -266,7 +265,6 @@ static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	    (struct acpi_polling_hotkey *)seq-&gt;private;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_polling_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (poll_hotkey-&gt;poll_result) {</div><div class='ctx'> 		buf = format_result(poll_hotkey-&gt;poll_result);</div><div class='hunk'>@@ -274,7 +272,7 @@ static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 			seq_printf(seq, "%s", buf);</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_polling_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -293,7 +291,6 @@ static int hotkey_get_internal_event(int event, struct acpi_hotkey_list *list)</div><div class='ctx'> 	struct list_head *entries;</div><div class='ctx'> 	int val = -1;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_get_internal_event");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each(entries, list-&gt;entries) {</div><div class='ctx'> 		union acpi_hotkey *key =</div><div class='hunk'>@@ -305,7 +302,7 @@ static int hotkey_get_internal_event(int event, struct acpi_hotkey_list *list)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(val);</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -314,15 +311,14 @@ acpi_hotkey_notify_handler(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	u32 internal_event;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_hotkey_notify_handler");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	internal_event = hotkey_get_internal_event(event, &amp;global_hotkey_list);</div><div class='ctx'> 	acpi_bus_generate_event(device, internal_event, 0);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Need to invent automatically hotkey add method */</div><div class='hunk'>@@ -346,7 +342,6 @@ static int create_polling_proc(union acpi_hotkey *device)</div><div class='ctx'> 	char proc_name[80];</div><div class='ctx'> 	mode_t mode;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("create_polling_proc");</div><div class='ctx'> 	mode = S_IFREG | S_IRUGO | S_IWUGO;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(proc_name, "%d", device-&gt;link.hotkey_standard_num);</div><div class='hunk'>@@ -356,10 +351,7 @@ static int create_polling_proc(union acpi_hotkey *device)</div><div class='ctx'> 	proc = create_proc_entry(proc_name, mode, hotkey_proc_dir);</div><div class='ctx'> </div><div class='ctx'> 	if (!proc) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Hotkey: Unable to create %s entry\n",</div><div class='del'>-				  device-&gt;poll_hotkey.poll_method));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		proc-&gt;proc_fops = &amp;hotkey_polling_fops;</div><div class='ctx'> 		proc-&gt;owner = THIS_MODULE;</div><div class='hunk'>@@ -368,7 +360,7 @@ static int create_polling_proc(union acpi_hotkey *device)</div><div class='ctx'> 		proc-&gt;gid = 0;</div><div class='ctx'> 		device-&gt;poll_hotkey.proc = proc;</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_add(union acpi_hotkey *device)</div><div class='hunk'>@@ -376,7 +368,6 @@ static int hotkey_add(union acpi_hotkey *device)</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	struct acpi_device *dev = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_add");</div><div class='ctx'> </div><div class='ctx'> 	if (device-&gt;link.hotkey_type == ACPI_HOTKEY_EVENT) {</div><div class='ctx'> 		acpi_bus_get_device(device-&gt;event_hotkey.bus_handle, &amp;dev);</div><div class='hunk'>@@ -391,14 +382,13 @@ static int hotkey_add(union acpi_hotkey *device)</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;device-&gt;link.entries, global_hotkey_list.entries);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_remove(union acpi_hotkey *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *entries, *next;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_remove");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(entries, next, global_hotkey_list.entries) {</div><div class='ctx'> 		union acpi_hotkey *key =</div><div class='hunk'>@@ -412,14 +402,13 @@ static int hotkey_remove(union acpi_hotkey *device)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(device);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_update(union acpi_hotkey *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *entries;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_update");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each(entries, global_hotkey_list.entries) {</div><div class='ctx'> 		union acpi_hotkey *tmp =</div><div class='hunk'>@@ -461,19 +450,18 @@ static int hotkey_update(union acpi_hotkey *key)</div><div class='ctx'> 				 */</div><div class='ctx'> 				kfree(key);</div><div class='ctx'> 			}</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_hotkey_device(union acpi_hotkey *key)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_device *dev;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("free_hotkey_device");</div><div class='ctx'> </div><div class='ctx'> 	if (key-&gt;link.hotkey_type == ACPI_HOTKEY_EVENT) {</div><div class='ctx'> 		acpi_bus_get_device(key-&gt;event_hotkey.bus_handle, &amp;dev);</div><div class='hunk'>@@ -493,7 +481,7 @@ static void free_hotkey_device(union acpi_hotkey *key)</div><div class='ctx'> 		free_poll_hotkey_buffer(key);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(key);</div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_hotkey_buffer(union acpi_hotkey *key)</div><div class='hunk'>@@ -514,7 +502,6 @@ init_hotkey_device(union acpi_hotkey *key, char *bus_str, char *action_str,</div><div class='ctx'> 	acpi_handle tmp_handle;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("init_hotkey_device");</div><div class='ctx'> </div><div class='ctx'> 	if (std_num &lt; 0 || IS_POLL(std_num) || !key)</div><div class='ctx'> 		goto do_fail;</div><div class='hunk'>@@ -541,9 +528,9 @@ init_hotkey_device(union acpi_hotkey *key, char *bus_str, char *action_str,</div><div class='ctx'> 				 method, &amp;tmp_handle);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		goto do_fail;</div><div class='del'>-	return_VALUE(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'>       do_fail:</div><div class='del'>-	return_VALUE(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -555,7 +542,6 @@ init_poll_hotkey_device(union acpi_hotkey *key,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	acpi_handle tmp_handle;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("init_poll_hotkey_device");</div><div class='ctx'> </div><div class='ctx'> 	if (std_num &lt; 0 || IS_EVENT(std_num) || !key)</div><div class='ctx'> 		goto do_fail;</div><div class='hunk'>@@ -590,22 +576,20 @@ init_poll_hotkey_device(union acpi_hotkey *key,</div><div class='ctx'> 	    (union acpi_object *)kmalloc(sizeof(union acpi_object), GFP_KERNEL);</div><div class='ctx'> 	if (!key-&gt;poll_hotkey.poll_result)</div><div class='ctx'> 		goto do_fail;</div><div class='del'>-	return_VALUE(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'>       do_fail:</div><div class='del'>-	return_VALUE(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_open_config(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_open_config");</div><div class='del'>-	return_VALUE(single_open</div><div class='add'>+	return (single_open</div><div class='ctx'> 		     (file, hotkey_config_seq_show, PDE(inode)-&gt;data));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_poll_open_config(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_poll_open_config");</div><div class='del'>-	return_VALUE(single_open</div><div class='add'>+	return (single_open</div><div class='ctx'> 		     (file, hotkey_poll_config_seq_show, PDE(inode)-&gt;data));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +602,6 @@ static int hotkey_config_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_buffer bus = { ACPI_PATHNAME_MAX, bus_name };</div><div class='ctx'> 	struct acpi_buffer act = { ACPI_PATHNAME_MAX, action_name };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE(("hotkey_config_seq_show"));</div><div class='ctx'> </div><div class='ctx'> 	list_for_each(entries, hotkey_list-&gt;entries) {</div><div class='ctx'> 		union acpi_hotkey *key =</div><div class='hunk'>@@ -636,7 +619,7 @@ static int hotkey_config_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_puts(seq, "\n");</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hotkey_poll_config_seq_show(struct seq_file *seq, void *offset)</div><div class='hunk'>@@ -648,7 +631,6 @@ static int hotkey_poll_config_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_buffer bus = { ACPI_PATHNAME_MAX, bus_name };</div><div class='ctx'> 	struct acpi_buffer act = { ACPI_PATHNAME_MAX, action_name };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE(("hotkey_config_seq_show"));</div><div class='ctx'> </div><div class='ctx'> 	list_for_each(entries, hotkey_list-&gt;entries) {</div><div class='ctx'> 		union acpi_hotkey *key =</div><div class='hunk'>@@ -666,7 +648,7 @@ static int hotkey_poll_config_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_puts(seq, "\n");</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -678,7 +660,6 @@ get_parms(char *config_record,</div><div class='ctx'> 	  char **method, int *internal_event_num, int *external_event_num)</div><div class='ctx'> {</div><div class='ctx'> 	char *tmp, *tmp1, count;</div><div class='del'>-	ACPI_FUNCTION_TRACE(("get_parms"));</div><div class='ctx'> </div><div class='ctx'> 	sscanf(config_record, "%d", cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -723,6 +704,8 @@ get_parms(char *config_record,</div><div class='ctx'> 		goto do_fail;</div><div class='ctx'> 	count = tmp1 - tmp;</div><div class='ctx'> 	*action_handle = (char *)kmalloc(count + 1, GFP_KERNEL);</div><div class='add'>+	if (!*action_handle)</div><div class='add'>+		goto do_fail;</div><div class='ctx'> 	strncpy(*action_handle, tmp, count);</div><div class='ctx'> 	*(*action_handle + count) = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -742,9 +725,9 @@ get_parms(char *config_record,</div><div class='ctx'> 	    0)</div><div class='ctx'> 		goto do_fail;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(6);</div><div class='add'>+	return 6;</div><div class='ctx'>       do_fail:</div><div class='del'>-	return_VALUE(-1);</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*  count is length for one input record */</div><div class='hunk'>@@ -761,16 +744,15 @@ static ssize_t hotkey_write_config(struct file *file,</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	union acpi_hotkey *key = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE(("hotkey_write_config"));</div><div class='ctx'> </div><div class='ctx'> 	config_record = (char *)kmalloc(count + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!config_record)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(config_record, buffer, count)) {</div><div class='ctx'> 		kfree(config_record);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data \n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid data\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	config_record[count] = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -790,9 +772,8 @@ static ssize_t hotkey_write_config(struct file *file,</div><div class='ctx'> 		kfree(bus_method);</div><div class='ctx'> 		kfree(action_handle);</div><div class='ctx'> 		kfree(method);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid data format ret=%d\n", ret));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid data format ret=%d\n", ret);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	key = kmalloc(sizeof(union acpi_hotkey), GFP_KERNEL);</div><div class='hunk'>@@ -804,7 +785,7 @@ static ssize_t hotkey_write_config(struct file *file,</div><div class='ctx'> 		tmp = get_hotkey_by_event(&amp;global_hotkey_list,</div><div class='ctx'> 					  internal_event_num);</div><div class='ctx'> 		if (!tmp)</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid key"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Invalid key\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			memcpy(key, tmp, sizeof(union acpi_hotkey));</div><div class='ctx'> 		goto cont_cmd;</div><div class='hunk'>@@ -826,8 +807,8 @@ static ssize_t hotkey_write_config(struct file *file,</div><div class='ctx'> 		else</div><div class='ctx'> 			free_poll_hotkey_buffer(key);</div><div class='ctx'> 		kfree(key);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid hotkey \n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid hotkey\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       cont_cmd:</div><div class='hunk'>@@ -853,15 +834,15 @@ static ssize_t hotkey_write_config(struct file *file,</div><div class='ctx'> 		goto fail_out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'>       fail_out:</div><div class='ctx'> 	if (IS_EVENT(internal_event_num))</div><div class='ctx'> 		free_hotkey_buffer(key);</div><div class='ctx'> 	else</div><div class='ctx'> 		free_poll_hotkey_buffer(key);</div><div class='ctx'> 	kfree(key);</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "invalid key\n"));</div><div class='del'>-	return_VALUE(-EINVAL);</div><div class='add'>+	printk(KERN_ERR PREFIX "invalid key\n");</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -878,7 +859,6 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val,</div><div class='ctx'> 	union acpi_object in_obj;	/* the only param we use */</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("write_acpi_int");</div><div class='ctx'> 	params.count = 1;</div><div class='ctx'> 	params.pointer = &amp;in_obj;</div><div class='ctx'> 	in_obj.type = ACPI_TYPE_INTEGER;</div><div class='hunk'>@@ -886,7 +866,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(handle, (char *)method, &amp;params, output);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status == AE_OK);</div><div class='add'>+	return (status == AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int read_acpi_int(acpi_handle handle, const char *method,</div><div class='hunk'>@@ -896,7 +876,6 @@ static int read_acpi_int(acpi_handle handle, const char *method,</div><div class='ctx'> 	union acpi_object out_obj;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("read_acpi_int");</div><div class='ctx'> 	output.length = sizeof(out_obj);</div><div class='ctx'> 	output.pointer = &amp;out_obj;</div><div class='ctx'> </div><div class='hunk'>@@ -905,8 +884,8 @@ static int read_acpi_int(acpi_handle handle, const char *method,</div><div class='ctx'> 		val-&gt;integer.value = out_obj.integer.value;</div><div class='ctx'> 		val-&gt;type = out_obj.type;</div><div class='ctx'> 	} else</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "null val pointer"));</div><div class='del'>-	return_VALUE((status == AE_OK)</div><div class='add'>+		printk(KERN_ERR PREFIX "null val pointer\n");</div><div class='add'>+	return ((status == AE_OK)</div><div class='ctx'> 		     &amp;&amp; (out_obj.type == ACPI_TYPE_INTEGER));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -943,24 +922,23 @@ static ssize_t hotkey_execute_aml_method(struct file *file,</div><div class='ctx'> 	int event, method_type, type, value;</div><div class='ctx'> 	union acpi_hotkey *key;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_execte_aml_method");</div><div class='ctx'> </div><div class='ctx'> 	arg = (char *)kmalloc(count + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!arg)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	arg[count] = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(arg, buffer, count)) {</div><div class='ctx'> 		kfree(arg);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument 2"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid argument 2\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(arg, "%d:%d:%d:%d", &amp;event, &amp;method_type, &amp;type, &amp;value) !=</div><div class='ctx'> 	    4) {</div><div class='ctx'> 		kfree(arg);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument 3"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid argument 3\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(arg);</div><div class='ctx'> 	if (type == ACPI_TYPE_INTEGER) {</div><div class='hunk'>@@ -985,12 +963,12 @@ static ssize_t hotkey_execute_aml_method(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Not supported"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_WARNING "Not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'>       do_fail:</div><div class='del'>-	return_VALUE(-EINVAL);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -999,7 +977,6 @@ static int __init hotkey_init(void)</div><div class='ctx'> 	int result;</div><div class='ctx'> 	mode_t mode = S_IFREG | S_IRUGO | S_IWUGO;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1011,9 +988,6 @@ static int __init hotkey_init(void)</div><div class='ctx'> </div><div class='ctx'> 	hotkey_proc_dir = proc_mkdir(HOTKEY_PROC, acpi_root_dir);</div><div class='ctx'> 	if (!hotkey_proc_dir) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Hotkey: Unable to create %s entry\n",</div><div class='del'>-				  HOTKEY_PROC));</div><div class='ctx'> 		return (-ENODEV);</div><div class='ctx'> 	}</div><div class='ctx'> 	hotkey_proc_dir-&gt;owner = THIS_MODULE;</div><div class='hunk'>@@ -1021,9 +995,6 @@ static int __init hotkey_init(void)</div><div class='ctx'> 	hotkey_config =</div><div class='ctx'> 	    create_proc_entry(HOTKEY_EV_CONFIG, mode, hotkey_proc_dir);</div><div class='ctx'> 	if (!hotkey_config) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Hotkey: Unable to create %s entry\n",</div><div class='del'>-				  HOTKEY_EV_CONFIG));</div><div class='ctx'> 		goto do_fail1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hotkey_config-&gt;proc_fops = &amp;hotkey_config_fops;</div><div class='hunk'>@@ -1036,10 +1007,6 @@ static int __init hotkey_init(void)</div><div class='ctx'> 	hotkey_poll_config =</div><div class='ctx'> 	    create_proc_entry(HOTKEY_PL_CONFIG, mode, hotkey_proc_dir);</div><div class='ctx'> 	if (!hotkey_poll_config) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Hotkey: Unable to create %s entry\n",</div><div class='del'>-				  HOTKEY_EV_CONFIG));</div><div class='del'>-</div><div class='ctx'> 		goto do_fail2;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hotkey_poll_config-&gt;proc_fops = &amp;hotkey_poll_config_fops;</div><div class='hunk'>@@ -1051,9 +1018,6 @@ static int __init hotkey_init(void)</div><div class='ctx'> </div><div class='ctx'> 	hotkey_action = create_proc_entry(HOTKEY_ACTION, mode, hotkey_proc_dir);</div><div class='ctx'> 	if (!hotkey_action) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Hotkey: Unable to create %s entry\n",</div><div class='del'>-				  HOTKEY_ACTION));</div><div class='ctx'> 		goto do_fail3;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hotkey_action-&gt;proc_fops = &amp;hotkey_action_fops;</div><div class='hunk'>@@ -1064,9 +1028,6 @@ static int __init hotkey_init(void)</div><div class='ctx'> </div><div class='ctx'> 	hotkey_info = create_proc_entry(HOTKEY_INFO, mode, hotkey_proc_dir);</div><div class='ctx'> 	if (!hotkey_info) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Hotkey: Unable to create %s entry\n",</div><div class='del'>-				  HOTKEY_INFO));</div><div class='ctx'> 		goto do_fail4;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hotkey_info-&gt;proc_fops = &amp;hotkey_info_fops;</div><div class='hunk'>@@ -1102,7 +1063,6 @@ static void __exit hotkey_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *entries, *next;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("hotkey_exit");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(entries, next, global_hotkey_list.entries) {</div><div class='ctx'> 		union acpi_hotkey *key =</div><div class='head'>diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c<br/>new file mode 100644<br/>index 000000000000..84239d51dc0c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/i2c_ec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/i2c_ec.c</a></div><div class='hunk'>@@ -0,0 +1,406 @@</div><div class='add'>+/*</div><div class='add'>+ * SMBus driver for ACPI Embedded Controller ($Revision: 1.3 $)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002, 2005 Ducrot Bruno</div><div class='add'>+ * Copyright (c) 2005 Rich Townsend (tiny hacks &amp; tweaks)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation version 2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/stddef.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "i2c_ec.h"</div><div class='add'>+</div><div class='add'>+#define	xudelay(t)	udelay(t)</div><div class='add'>+#define	xmsleep(t)	msleep(t)</div><div class='add'>+</div><div class='add'>+#define ACPI_EC_HC_COMPONENT	0x00080000</div><div class='add'>+#define ACPI_EC_HC_CLASS	"ec_hc_smbus"</div><div class='add'>+#define ACPI_EC_HC_HID		"ACPI0001"</div><div class='add'>+#define ACPI_EC_HC_DRIVER_NAME	"ACPI EC HC smbus driver"</div><div class='add'>+#define ACPI_EC_HC_DEVICE_NAME	"EC HC smbus"</div><div class='add'>+</div><div class='add'>+#define _COMPONENT		ACPI_EC_HC_COMPONENT</div><div class='add'>+</div><div class='add'>+ACPI_MODULE_NAME("acpi_smbus")</div><div class='add'>+</div><div class='add'>+static int acpi_ec_hc_add(struct acpi_device *device);</div><div class='add'>+static int acpi_ec_hc_remove(struct acpi_device *device, int type);</div><div class='add'>+</div><div class='add'>+static struct acpi_driver acpi_ec_hc_driver = {</div><div class='add'>+	.name = ACPI_EC_HC_DRIVER_NAME,</div><div class='add'>+	.class = ACPI_EC_HC_CLASS,</div><div class='add'>+	.ids = ACPI_EC_HC_HID,</div><div class='add'>+	.ops = {</div><div class='add'>+		.add = acpi_ec_hc_add,</div><div class='add'>+		.remove = acpi_ec_hc_remove,</div><div class='add'>+		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Various bit mask for EC_SC (R) */</div><div class='add'>+#define OBF		0x01</div><div class='add'>+#define IBF		0x02</div><div class='add'>+#define CMD		0x08</div><div class='add'>+#define BURST		0x10</div><div class='add'>+#define SCI_EVT		0x20</div><div class='add'>+#define SMI_EVT		0x40</div><div class='add'>+</div><div class='add'>+/* Commands for EC_SC (W) */</div><div class='add'>+#define RD_EC		0x80</div><div class='add'>+#define WR_EC		0x81</div><div class='add'>+#define BE_EC		0x82</div><div class='add'>+#define BD_EC		0x83</div><div class='add'>+#define QR_EC		0x84</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ACPI 2.0 chapter 13 SMBus 2.0 EC register model</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ACPI_EC_SMB_PRTCL	0x00	/* protocol, PEC */</div><div class='add'>+#define ACPI_EC_SMB_STS		0x01	/* status */</div><div class='add'>+#define ACPI_EC_SMB_ADDR	0x02	/* address */</div><div class='add'>+#define ACPI_EC_SMB_CMD		0x03	/* command */</div><div class='add'>+#define ACPI_EC_SMB_DATA	0x04	/* 32 data registers */</div><div class='add'>+#define ACPI_EC_SMB_BCNT	0x24	/* number of data bytes */</div><div class='add'>+#define ACPI_EC_SMB_ALRM_A	0x25	/* alarm address */</div><div class='add'>+#define ACPI_EC_SMB_ALRM_D	0x26	/* 2 bytes alarm data */</div><div class='add'>+</div><div class='add'>+#define ACPI_EC_SMB_STS_DONE	0x80</div><div class='add'>+#define ACPI_EC_SMB_STS_ALRM	0x40</div><div class='add'>+#define ACPI_EC_SMB_STS_RES	0x20</div><div class='add'>+#define ACPI_EC_SMB_STS_STATUS	0x1f</div><div class='add'>+</div><div class='add'>+#define ACPI_EC_SMB_STATUS_OK		0x00</div><div class='add'>+#define ACPI_EC_SMB_STATUS_FAIL		0x07</div><div class='add'>+#define ACPI_EC_SMB_STATUS_DNAK		0x10</div><div class='add'>+#define ACPI_EC_SMB_STATUS_DERR		0x11</div><div class='add'>+#define ACPI_EC_SMB_STATUS_CMD_DENY	0x12</div><div class='add'>+#define ACPI_EC_SMB_STATUS_UNKNOWN	0x13</div><div class='add'>+#define ACPI_EC_SMB_STATUS_ACC_DENY	0x17</div><div class='add'>+#define ACPI_EC_SMB_STATUS_TIMEOUT	0x18</div><div class='add'>+#define ACPI_EC_SMB_STATUS_NOTSUP	0x19</div><div class='add'>+#define ACPI_EC_SMB_STATUS_BUSY		0x1A</div><div class='add'>+#define ACPI_EC_SMB_STATUS_PEC		0x1F</div><div class='add'>+</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_WRITE			0x00</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_READ			0x01</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_QUICK			0x02</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_BYTE			0x04</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_BYTE_DATA		0x06</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_WORD_DATA		0x08</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_BLOCK_DATA		0x0a</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_PROC_CALL		0x0c</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_BLOCK_PROC_CALL	0x0d</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_I2C_BLOCK_DATA	0x4a</div><div class='add'>+#define ACPI_EC_SMB_PRTCL_PEC			0x80</div><div class='add'>+</div><div class='add'>+/* Length of pre/post transaction sleep (msec) */</div><div class='add'>+#define ACPI_EC_SMB_TRANSACTION_SLEEP		1</div><div class='add'>+#define ACPI_EC_SMB_ACCESS_SLEEP1		1</div><div class='add'>+#define ACPI_EC_SMB_ACCESS_SLEEP2		10</div><div class='add'>+</div><div class='add'>+static int acpi_ec_smb_read(struct acpi_ec_smbus *smbus, u8 address, u8 * data)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ec_read(smbus-&gt;base + address, &amp;val);</div><div class='add'>+	if (!err) {</div><div class='add'>+		*data = val;</div><div class='add'>+	}</div><div class='add'>+	xmsleep(ACPI_EC_SMB_TRANSACTION_SLEEP);</div><div class='add'>+	return (err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_ec_smb_write(struct acpi_ec_smbus *smbus, u8 address, u8 data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ec_write(smbus-&gt;base + address, data);</div><div class='add'>+	return (err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+acpi_ec_smb_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,</div><div class='add'>+		   char read_write, u8 command, int size,</div><div class='add'>+		   union i2c_smbus_data *data)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = adap-&gt;algo_data;</div><div class='add'>+	unsigned char protocol, len = 0, pec, temp[2] = { 0, 0 };</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (read_write == I2C_SMBUS_READ) {</div><div class='add'>+		protocol = ACPI_EC_SMB_PRTCL_READ;</div><div class='add'>+	} else {</div><div class='add'>+		protocol = ACPI_EC_SMB_PRTCL_WRITE;</div><div class='add'>+	}</div><div class='add'>+	pec = (flags &amp; I2C_CLIENT_PEC) ? ACPI_EC_SMB_PRTCL_PEC : 0;</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_QUICK:</div><div class='add'>+		protocol |= ACPI_EC_SMB_PRTCL_QUICK;</div><div class='add'>+		read_write = I2C_SMBUS_WRITE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_BYTE:</div><div class='add'>+		if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+			acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA, data-&gt;byte);</div><div class='add'>+		}</div><div class='add'>+		protocol |= ACPI_EC_SMB_PRTCL_BYTE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_BYTE_DATA:</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_CMD, command);</div><div class='add'>+		if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+			acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA, data-&gt;byte);</div><div class='add'>+		}</div><div class='add'>+		protocol |= ACPI_EC_SMB_PRTCL_BYTE_DATA;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_WORD_DATA:</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_CMD, command);</div><div class='add'>+		if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+			acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA, data-&gt;word);</div><div class='add'>+			acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA + 1,</div><div class='add'>+					  data-&gt;word &gt;&gt; 8);</div><div class='add'>+		}</div><div class='add'>+		protocol |= ACPI_EC_SMB_PRTCL_WORD_DATA | pec;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_BLOCK_DATA:</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_CMD, command);</div><div class='add'>+		if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+			len = min_t(u8, data-&gt;block[0], 32);</div><div class='add'>+			acpi_ec_smb_write(smbus, ACPI_EC_SMB_BCNT, len);</div><div class='add'>+			for (i = 0; i &lt; len; i++)</div><div class='add'>+				acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA + i,</div><div class='add'>+						  data-&gt;block[i + 1]);</div><div class='add'>+		}</div><div class='add'>+		protocol |= ACPI_EC_SMB_PRTCL_BLOCK_DATA | pec;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_I2C_BLOCK_DATA:</div><div class='add'>+		len = min_t(u8, data-&gt;block[0], 32);</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_CMD, command);</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_BCNT, len);</div><div class='add'>+		if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+			for (i = 0; i &lt; len; i++) {</div><div class='add'>+				acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA + i,</div><div class='add'>+						  data-&gt;block[i + 1]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		protocol |= ACPI_EC_SMB_PRTCL_I2C_BLOCK_DATA;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_PROC_CALL:</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_CMD, command);</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA, data-&gt;word);</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA + 1, data-&gt;word &gt;&gt; 8);</div><div class='add'>+		protocol = ACPI_EC_SMB_PRTCL_PROC_CALL | pec;</div><div class='add'>+		read_write = I2C_SMBUS_READ;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_BLOCK_PROC_CALL:</div><div class='add'>+		protocol |= pec;</div><div class='add'>+		len = min_t(u8, data-&gt;block[0], 31);</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_CMD, command);</div><div class='add'>+		acpi_ec_smb_write(smbus, ACPI_EC_SMB_BCNT, len);</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			acpi_ec_smb_write(smbus, ACPI_EC_SMB_DATA + i,</div><div class='add'>+					  data-&gt;block[i + 1]);</div><div class='add'>+		protocol = ACPI_EC_SMB_PRTCL_BLOCK_PROC_CALL | pec;</div><div class='add'>+		read_write = I2C_SMBUS_READ;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "EC SMBus adapter: "</div><div class='add'>+				  "Unsupported transaction %d\n", size));</div><div class='add'>+		return (-1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_ec_smb_write(smbus, ACPI_EC_SMB_ADDR, addr &lt;&lt; 1);</div><div class='add'>+	acpi_ec_smb_write(smbus, ACPI_EC_SMB_PRTCL, protocol);</div><div class='add'>+</div><div class='add'>+	acpi_ec_smb_read(smbus, ACPI_EC_SMB_STS, temp + 0);</div><div class='add'>+</div><div class='add'>+	if (~temp[0] &amp; ACPI_EC_SMB_STS_DONE) {</div><div class='add'>+		xudelay(500);</div><div class='add'>+		acpi_ec_smb_read(smbus, ACPI_EC_SMB_STS, temp + 0);</div><div class='add'>+	}</div><div class='add'>+	if (~temp[0] &amp; ACPI_EC_SMB_STS_DONE) {</div><div class='add'>+		xmsleep(ACPI_EC_SMB_ACCESS_SLEEP2);</div><div class='add'>+		acpi_ec_smb_read(smbus, ACPI_EC_SMB_STS, temp + 0);</div><div class='add'>+	}</div><div class='add'>+	if ((~temp[0] &amp; ACPI_EC_SMB_STS_DONE)</div><div class='add'>+	    || (temp[0] &amp; ACPI_EC_SMB_STS_STATUS)) {</div><div class='add'>+		return (-1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (read_write == I2C_SMBUS_WRITE) {</div><div class='add'>+		return (0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (size) {</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_BYTE:</div><div class='add'>+	case I2C_SMBUS_BYTE_DATA:</div><div class='add'>+		acpi_ec_smb_read(smbus, ACPI_EC_SMB_DATA, &amp;data-&gt;byte);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_WORD_DATA:</div><div class='add'>+	case I2C_SMBUS_PROC_CALL:</div><div class='add'>+		acpi_ec_smb_read(smbus, ACPI_EC_SMB_DATA, temp + 0);</div><div class='add'>+		acpi_ec_smb_read(smbus, ACPI_EC_SMB_DATA + 1, temp + 1);</div><div class='add'>+		data-&gt;word = (temp[1] &lt;&lt; 8) | temp[0];</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case I2C_SMBUS_BLOCK_DATA:</div><div class='add'>+	case I2C_SMBUS_BLOCK_PROC_CALL:</div><div class='add'>+		len = 0;</div><div class='add'>+		acpi_ec_smb_read(smbus, ACPI_EC_SMB_BCNT, &amp;len);</div><div class='add'>+		len = min_t(u8, len, 32);</div><div class='add'>+	case I2C_SMBUS_I2C_BLOCK_DATA:</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			acpi_ec_smb_read(smbus, ACPI_EC_SMB_DATA + i,</div><div class='add'>+					 data-&gt;block + i + 1);</div><div class='add'>+		data-&gt;block[0] = len;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 acpi_ec_smb_func(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	return (I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |</div><div class='add'>+		I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |</div><div class='add'>+		I2C_FUNC_SMBUS_BLOCK_DATA |</div><div class='add'>+		I2C_FUNC_SMBUS_PROC_CALL |</div><div class='add'>+		I2C_FUNC_SMBUS_BLOCK_PROC_CALL |</div><div class='add'>+		I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_HWPEC_CALC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm acpi_ec_smbus_algorithm = {</div><div class='add'>+	.smbus_xfer = acpi_ec_smb_access,</div><div class='add'>+	.functionality = acpi_ec_smb_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int acpi_ec_hc_add(struct acpi_device *device)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	struct acpi_ec_hc *ec_hc;</div><div class='add'>+	struct acpi_ec_smbus *smbus;</div><div class='add'>+</div><div class='add'>+	if (!device) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ec_hc = kmalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);</div><div class='add'>+	if (!ec_hc) {</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memset(ec_hc, 0, sizeof(struct acpi_ec_hc));</div><div class='add'>+</div><div class='add'>+	smbus = kmalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);</div><div class='add'>+	if (!smbus) {</div><div class='add'>+		kfree(ec_hc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memset(smbus, 0, sizeof(struct acpi_ec_smbus));</div><div class='add'>+</div><div class='add'>+	ec_hc-&gt;handle = device-&gt;handle;</div><div class='add'>+	strcpy(acpi_device_name(device), ACPI_EC_HC_DEVICE_NAME);</div><div class='add'>+	strcpy(acpi_device_class(device), ACPI_EC_HC_CLASS);</div><div class='add'>+	acpi_driver_data(device) = ec_hc;</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_integer(ec_hc-&gt;handle, "_EC", NULL, &amp;val);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Error obtaining _EC\n"));</div><div class='add'>+		kfree(ec_hc-&gt;smbus);</div><div class='add'>+		kfree(smbus);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	smbus-&gt;ec = acpi_driver_data(device-&gt;parent);</div><div class='add'>+	smbus-&gt;base = (val &amp; 0xff00ull) &gt;&gt; 8;</div><div class='add'>+	smbus-&gt;alert = val &amp; 0xffull;</div><div class='add'>+</div><div class='add'>+	smbus-&gt;adapter.owner = THIS_MODULE;</div><div class='add'>+	smbus-&gt;adapter.algo = &amp;acpi_ec_smbus_algorithm;</div><div class='add'>+	smbus-&gt;adapter.algo_data = smbus;</div><div class='add'>+</div><div class='add'>+	if (i2c_add_adapter(&amp;smbus-&gt;adapter)) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='add'>+				  "EC SMBus adapter: Failed to register adapter\n"));</div><div class='add'>+		kfree(smbus);</div><div class='add'>+		kfree(ec_hc);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ec_hc-&gt;smbus = smbus;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PREFIX "%s [%s]\n",</div><div class='add'>+	       acpi_device_name(device), acpi_device_bid(device));</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_ec_hc_remove(struct acpi_device *device, int type)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_hc *ec_hc;</div><div class='add'>+</div><div class='add'>+	if (!device) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ec_hc = acpi_driver_data(device);</div><div class='add'>+</div><div class='add'>+	i2c_del_adapter(&amp;ec_hc-&gt;smbus-&gt;adapter);</div><div class='add'>+	kfree(ec_hc-&gt;smbus);</div><div class='add'>+	kfree(ec_hc);</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init acpi_ec_hc_init(void)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	result = acpi_bus_register_driver(&amp;acpi_ec_hc_driver);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit acpi_ec_hc_exit(void)</div><div class='add'>+{</div><div class='add'>+	acpi_bus_unregister_driver(&amp;acpi_ec_hc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device)</div><div class='add'>+{</div><div class='add'>+	return ((struct acpi_ec_hc *)acpi_driver_data(device-&gt;parent));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(acpi_get_ec_hc);</div><div class='add'>+</div><div class='add'>+module_init(acpi_ec_hc_init);</div><div class='add'>+module_exit(acpi_ec_hc_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Ducrot Bruno");</div><div class='add'>+MODULE_DESCRIPTION("ACPI EC SMBus driver");</div><div class='head'>diff --git a/drivers/acpi/i2c_ec.h b/drivers/acpi/i2c_ec.h<br/>new file mode 100644<br/>index 000000000000..7c53fb732d61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/i2c_ec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/i2c_ec.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/*</div><div class='add'>+ * SMBus driver for ACPI Embedded Controller ($Revision: 1.2 $)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2002, 2005 Ducrot Bruno</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation version 2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct acpi_ec_smbus {</div><div class='add'>+	struct i2c_adapter adapter;</div><div class='add'>+	union acpi_ec *ec;</div><div class='add'>+	int base;</div><div class='add'>+	int alert;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_ec_hc {</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	struct acpi_ec_smbus *smbus;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device);</div><div class='head'>diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c<br/>index 262b1f41335a..15fc12482ba0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/ibm_acpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/ibm_acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/ibm_acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/ibm_acpi.c</a></div><div class='hunk'>@@ -567,6 +567,69 @@ static int bluetooth_write(char *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int wan_supported;</div><div class='add'>+</div><div class='add'>+static int wan_init(void)</div><div class='add'>+{</div><div class='add'>+	wan_supported = hkey_handle &amp;&amp;</div><div class='add'>+	    acpi_evalf(hkey_handle, NULL, "GWAN", "qv");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wan_status(void)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!wan_supported ||</div><div class='add'>+	    !acpi_evalf(hkey_handle, &amp;status, "GWAN", "d"))</div><div class='add'>+		status = 0;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wan_read(char *p)</div><div class='add'>+{</div><div class='add'>+	int len = 0;</div><div class='add'>+	int status = wan_status();</div><div class='add'>+</div><div class='add'>+	if (!wan_supported)</div><div class='add'>+		len += sprintf(p + len, "status:\t\tnot supported\n");</div><div class='add'>+	else if (!(status &amp; 1))</div><div class='add'>+		len += sprintf(p + len, "status:\t\tnot installed\n");</div><div class='add'>+	else {</div><div class='add'>+		len += sprintf(p + len, "status:\t\t%s\n", enabled(status, 1));</div><div class='add'>+		len += sprintf(p + len, "commands:\tenable, disable\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wan_write(char *buf)</div><div class='add'>+{</div><div class='add'>+	int status = wan_status();</div><div class='add'>+	char *cmd;</div><div class='add'>+	int do_cmd = 0;</div><div class='add'>+</div><div class='add'>+	if (!wan_supported)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	while ((cmd = next_cmd(&amp;buf))) {</div><div class='add'>+		if (strlencmp(cmd, "enable") == 0) {</div><div class='add'>+			status |= 2;</div><div class='add'>+		} else if (strlencmp(cmd, "disable") == 0) {</div><div class='add'>+			status &amp;= ~2;</div><div class='add'>+		} else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		do_cmd = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (do_cmd &amp;&amp; !acpi_evalf(hkey_handle, NULL, "SWAN", "vd", status))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int video_supported;</div><div class='ctx'> static int video_orig_autosw;</div><div class='ctx'> </div><div class='hunk'>@@ -1563,6 +1626,13 @@ static struct ibm_struct ibms[] = {</div><div class='ctx'> 	 .write = bluetooth_write,</div><div class='ctx'> 	 },</div><div class='ctx'> 	{</div><div class='add'>+	 .name = "wan",</div><div class='add'>+	 .init = wan_init,</div><div class='add'>+	 .read = wan_read,</div><div class='add'>+	 .write = wan_write,</div><div class='add'>+	 .experimental = 1,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='ctx'> 	 .name = "video",</div><div class='ctx'> 	 .init = video_init,</div><div class='ctx'> 	 .read = video_read,</div><div class='head'>diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c<br/>index 468244147ec1..ec6b7f9ede34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/motherboard.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/motherboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/motherboard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/motherboard.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@ ACPI_MODULE_NAME("acpi_motherboard")</div><div class='ctx'> #define ACPI_MB_HID2			"PNP0C02"</div><div class='ctx'> /**</div><div class='ctx'>  * Doesn't care about legacy IO ports, only IO ports beyond 0x1000 are reserved</div><div class='del'>- * Doesn't care about the failure of 'request_region', since other may reserve </div><div class='add'>+ * Doesn't care about the failure of 'request_region', since other may reserve</div><div class='ctx'>  * the io ports as well</div><div class='ctx'>  */</div><div class='ctx'> #define IS_RESERVED_ADDR(base, len) \</div><div class='hunk'>@@ -46,19 +46,18 @@ ACPI_MODULE_NAME("acpi_motherboard")</div><div class='ctx'> /*</div><div class='ctx'>  * Clearing the flag (IORESOURCE_BUSY) allows drivers to use</div><div class='ctx'>  * the io ports if they really know they can use it, while</div><div class='del'>- * still preventing hotplug PCI devices from using it. </div><div class='add'>+ * still preventing hotplug PCI devices from using it.</div><div class='ctx'>  */</div><div class='ctx'> static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *requested_res = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges");</div><div class='ctx'> </div><div class='ctx'> 	if (res-&gt;type == ACPI_RESOURCE_TYPE_IO) {</div><div class='ctx'> 		struct acpi_resource_io *io_res = &amp;res-&gt;data.io;</div><div class='ctx'> </div><div class='ctx'> 		if (io_res-&gt;minimum != io_res-&gt;maximum)</div><div class='del'>-			return_VALUE(AE_OK);</div><div class='add'>+			return AE_OK;</div><div class='ctx'> 		if (IS_RESERVED_ADDR</div><div class='ctx'> 		    (io_res-&gt;minimum, io_res-&gt;address_length)) {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='hunk'>@@ -92,7 +91,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (requested_res)</div><div class='ctx'> 		requested_res-&gt;flags &amp;= ~IORESOURCE_BUSY;</div><div class='del'>-	return_VALUE(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_motherboard_add(struct acpi_device *device)</div><div class='hunk'>@@ -123,49 +122,54 @@ static struct acpi_driver acpi_motherboard_driver2 = {</div><div class='ctx'> 		},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void __init acpi_request_region (struct acpi_generic_address *addr,</div><div class='add'>+	unsigned int length, char *desc)</div><div class='add'>+{</div><div class='add'>+	if (!addr-&gt;address || !length)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (addr-&gt;address_space_id == ACPI_ADR_SPACE_SYSTEM_IO)</div><div class='add'>+		request_region(addr-&gt;address, length, desc);</div><div class='add'>+	else if (addr-&gt;address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)</div><div class='add'>+		request_mem_region(addr-&gt;address, length, desc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __init acpi_reserve_resources(void)</div><div class='ctx'> {</div><div class='del'>-	if (acpi_gbl_FADT-&gt;xpm1a_evt_blk.address &amp;&amp; acpi_gbl_FADT-&gt;pm1_evt_len)</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xpm1a_evt_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;pm1_evt_len, "PM1a_EVT_BLK");</div><div class='add'>+	acpi_request_region(&amp;acpi_gbl_FADT-&gt;xpm1a_evt_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;pm1_evt_len, "ACPI PM1a_EVT_BLK");</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xpm1b_evt_blk.address &amp;&amp; acpi_gbl_FADT-&gt;pm1_evt_len)</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xpm1b_evt_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;pm1_evt_len, "PM1b_EVT_BLK");</div><div class='add'>+	acpi_request_region(&amp;acpi_gbl_FADT-&gt;xpm1b_evt_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;pm1_evt_len, "ACPI PM1b_EVT_BLK");</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xpm1a_cnt_blk.address &amp;&amp; acpi_gbl_FADT-&gt;pm1_cnt_len)</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xpm1a_cnt_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;pm1_cnt_len, "PM1a_CNT_BLK");</div><div class='add'>+	acpi_request_region(&amp;acpi_gbl_FADT-&gt;xpm1a_cnt_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;pm1_cnt_len, "ACPI PM1a_CNT_BLK");</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xpm1b_cnt_blk.address &amp;&amp; acpi_gbl_FADT-&gt;pm1_cnt_len)</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xpm1b_cnt_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;pm1_cnt_len, "PM1b_CNT_BLK");</div><div class='add'>+	acpi_request_region(&amp;acpi_gbl_FADT-&gt;xpm1b_cnt_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;pm1_cnt_len, "ACPI PM1b_CNT_BLK");</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xpm_tmr_blk.address &amp;&amp; acpi_gbl_FADT-&gt;pm_tm_len == 4)</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xpm_tmr_blk.address, 4, "PM_TMR");</div><div class='add'>+	if (acpi_gbl_FADT-&gt;pm_tm_len == 4)</div><div class='add'>+		acpi_request_region(&amp;acpi_gbl_FADT-&gt;xpm_tmr_blk, 4, "ACPI PM_TMR");</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xpm2_cnt_blk.address &amp;&amp; acpi_gbl_FADT-&gt;pm2_cnt_len)</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xpm2_cnt_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;pm2_cnt_len, "PM2_CNT_BLK");</div><div class='add'>+	acpi_request_region(&amp;acpi_gbl_FADT-&gt;xpm2_cnt_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;pm2_cnt_len, "ACPI PM2_CNT_BLK");</div><div class='ctx'> </div><div class='ctx'> 	/* Length of GPE blocks must be a non-negative multiple of 2 */</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xgpe0_blk.address &amp;&amp; acpi_gbl_FADT-&gt;gpe0_blk_len &amp;&amp;</div><div class='del'>-	    !(acpi_gbl_FADT-&gt;gpe0_blk_len &amp; 0x1))</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xgpe0_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;gpe0_blk_len, "GPE0_BLK");</div><div class='add'>+	if (!(acpi_gbl_FADT-&gt;gpe0_blk_len &amp; 0x1))</div><div class='add'>+		acpi_request_region(&amp;acpi_gbl_FADT-&gt;xgpe0_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;gpe0_blk_len, "ACPI GPE0_BLK");</div><div class='ctx'> </div><div class='del'>-	if (acpi_gbl_FADT-&gt;xgpe1_blk.address &amp;&amp; acpi_gbl_FADT-&gt;gpe1_blk_len &amp;&amp;</div><div class='del'>-	    !(acpi_gbl_FADT-&gt;gpe1_blk_len &amp; 0x1))</div><div class='del'>-		request_region(acpi_gbl_FADT-&gt;xgpe1_blk.address,</div><div class='del'>-			       acpi_gbl_FADT-&gt;gpe1_blk_len, "GPE1_BLK");</div><div class='add'>+	if (!(acpi_gbl_FADT-&gt;gpe1_blk_len &amp; 0x1))</div><div class='add'>+		acpi_request_region(&amp;acpi_gbl_FADT-&gt;xgpe1_blk,</div><div class='add'>+			       acpi_gbl_FADT-&gt;gpe1_blk_len, "ACPI GPE1_BLK");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_motherboard_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_bus_register_driver(&amp;acpi_motherboard_driver1);</div><div class='ctx'> 	acpi_bus_register_driver(&amp;acpi_motherboard_driver2);</div><div class='del'>-	/* </div><div class='add'>+	/*</div><div class='ctx'> 	 * Guarantee motherboard IO reservation first</div><div class='ctx'> 	 * This module must run after scan.c</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c<br/>index 1149bc18fb35..c1c6c236df9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsaccess.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsaccess.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsaccess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsaccess.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ acpi_status acpi_ns_root_initialize(void)</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_string val = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_root_initialize");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_root_initialize);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -98,6 +98,7 @@ acpi_status acpi_ns_root_initialize(void)</div><div class='ctx'> 			  "Entering predefined entries into namespace\n"));</div><div class='ctx'> </div><div class='ctx'> 	for (init_val = acpi_gbl_pre_defined_names; init_val-&gt;name; init_val++) {</div><div class='add'>+</div><div class='ctx'> 		/* _OSI is optional for now, will be permanent later */</div><div class='ctx'> </div><div class='ctx'> 		if (!ACPI_STRCMP(init_val-&gt;name, "_OSI")</div><div class='hunk'>@@ -156,7 +157,7 @@ acpi_status acpi_ns_root_initialize(void)</div><div class='ctx'> </div><div class='ctx'> #if defined (ACPI_ASL_COMPILER)</div><div class='ctx'> </div><div class='del'>-				/* save the parameter count for the i_aSL compiler */</div><div class='add'>+				/* Save the parameter count for the i_aSL compiler */</div><div class='ctx'> </div><div class='ctx'> 				new_node-&gt;value = obj_desc-&gt;method.param_count;</div><div class='ctx'> #else</div><div class='hunk'>@@ -195,33 +196,30 @@ acpi_status acpi_ns_root_initialize(void)</div><div class='ctx'> 				    (u8) (ACPI_TO_INTEGER(val) - 1);</div><div class='ctx'> </div><div class='ctx'> 				if (ACPI_STRCMP(init_val-&gt;name, "_GL_") == 0) {</div><div class='del'>-					/*</div><div class='del'>-					 * Create a counting semaphore for the</div><div class='del'>-					 * global lock</div><div class='del'>-					 */</div><div class='add'>+</div><div class='add'>+					/* Create a counting semaphore for the global lock */</div><div class='add'>+</div><div class='ctx'> 					status =</div><div class='ctx'> 					    acpi_os_create_semaphore</div><div class='ctx'> 					    (ACPI_NO_UNIT_LIMIT, 1,</div><div class='del'>-					     &amp;obj_desc-&gt;mutex.semaphore);</div><div class='add'>+					     &amp;acpi_gbl_global_lock_semaphore);</div><div class='ctx'> 					if (ACPI_FAILURE(status)) {</div><div class='ctx'> 						acpi_ut_remove_reference</div><div class='ctx'> 						    (obj_desc);</div><div class='ctx'> 						goto unlock_and_exit;</div><div class='ctx'> 					}</div><div class='ctx'> </div><div class='del'>-					/*</div><div class='del'>-					 * We just created the mutex for the</div><div class='del'>-					 * global lock, save it</div><div class='del'>-					 */</div><div class='del'>-					acpi_gbl_global_lock_semaphore =</div><div class='del'>-					    obj_desc-&gt;mutex.semaphore;</div><div class='add'>+					/* Mark this mutex as very special */</div><div class='add'>+</div><div class='add'>+					obj_desc-&gt;mutex.os_mutex =</div><div class='add'>+					    ACPI_GLOBAL_LOCK;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					/* Create a mutex */</div><div class='ctx'> </div><div class='del'>-					status = acpi_os_create_semaphore(1, 1,</div><div class='del'>-									  &amp;obj_desc-&gt;</div><div class='del'>-									  mutex.</div><div class='del'>-									  semaphore);</div><div class='add'>+					status =</div><div class='add'>+					    acpi_os_create_mutex(&amp;obj_desc-&gt;</div><div class='add'>+								 mutex.</div><div class='add'>+								 os_mutex);</div><div class='ctx'> 					if (ACPI_FAILURE(status)) {</div><div class='ctx'> 						acpi_ut_remove_reference</div><div class='ctx'> 						    (obj_desc);</div><div class='hunk'>@@ -258,10 +256,8 @@ acpi_status acpi_ns_root_initialize(void)</div><div class='ctx'> 	/* Save a handle to "_GPE", it is always present */</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		status =</div><div class='del'>-		    acpi_ns_get_node_by_path("\\_GPE", NULL,</div><div class='del'>-					     ACPI_NS_NO_UPSEARCH,</div><div class='del'>-					     &amp;acpi_gbl_fadt_gpe_device);</div><div class='add'>+		status = acpi_ns_get_node(NULL, "\\_GPE", ACPI_NS_NO_UPSEARCH,</div><div class='add'>+					  &amp;acpi_gbl_fadt_gpe_device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -310,17 +306,17 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 	acpi_object_type type_to_check_for;</div><div class='ctx'> 	acpi_object_type this_search_type;</div><div class='ctx'> 	u32 search_parent_flag = ACPI_NS_SEARCH_PARENT;</div><div class='del'>-	u32 local_flags = flags &amp; ~(ACPI_NS_ERROR_IF_FOUND |</div><div class='del'>-				    ACPI_NS_SEARCH_PARENT);</div><div class='add'>+	u32 local_flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_lookup");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_lookup);</div><div class='ctx'> </div><div class='ctx'> 	if (!return_node) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_gbl_ns_lookup_count++;</div><div class='add'>+	local_flags = flags &amp; ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_SEARCH_PARENT);</div><div class='ctx'> 	*return_node = ACPI_ENTRY_NOT_FOUND;</div><div class='add'>+	acpi_gbl_ns_lookup_count++;</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_root_node) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_NAMESPACE);</div><div class='hunk'>@@ -346,14 +342,17 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 			return_ACPI_STATUS(AE_AML_INTERNAL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This node might not be a actual "scope" node (such as a</div><div class='del'>-		 * Device/Method, etc.)  It could be a Package or other object node.</div><div class='del'>-		 * Backup up the tree to find the containing scope node.</div><div class='del'>-		 */</div><div class='del'>-		while (!acpi_ns_opens_scope(prefix_node-&gt;type) &amp;&amp;</div><div class='del'>-		       prefix_node-&gt;type != ACPI_TYPE_ANY) {</div><div class='del'>-			prefix_node = acpi_ns_get_parent_node(prefix_node);</div><div class='add'>+		if (!(flags &amp; ACPI_NS_PREFIX_IS_SCOPE)) {</div><div class='add'>+			/*</div><div class='add'>+			 * This node might not be a actual "scope" node (such as a</div><div class='add'>+			 * Device/Method, etc.)  It could be a Package or other object node.</div><div class='add'>+			 * Backup up the tree to find the containing scope node.</div><div class='add'>+			 */</div><div class='add'>+			while (!acpi_ns_opens_scope(prefix_node-&gt;type) &amp;&amp;</div><div class='add'>+			       prefix_node-&gt;type != ACPI_TYPE_ANY) {</div><div class='add'>+				prefix_node =</div><div class='add'>+				    acpi_ns_get_parent_node(prefix_node);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -365,6 +364,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 	 * Begin examination of the actual pathname</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!pathname) {</div><div class='add'>+</div><div class='ctx'> 		/* A Null name_path is allowed and refers to the root */</div><div class='ctx'> </div><div class='ctx'> 		num_segments = 0;</div><div class='hunk'>@@ -389,6 +389,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 		 * to the current scope).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (*path == (u8) AML_ROOT_PREFIX) {</div><div class='add'>+</div><div class='ctx'> 			/* Pathname is fully qualified, start from the root */</div><div class='ctx'> </div><div class='ctx'> 			this_node = acpi_gbl_root_node;</div><div class='hunk'>@@ -416,6 +417,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 			this_node = prefix_node;</div><div class='ctx'> 			num_carats = 0;</div><div class='ctx'> 			while (*path == (u8) AML_PARENT_PREFIX) {</div><div class='add'>+</div><div class='ctx'> 				/* Name is fully qualified, no search rules apply */</div><div class='ctx'> </div><div class='ctx'> 				search_parent_flag = ACPI_NS_NO_UPSEARCH;</div><div class='hunk'>@@ -430,6 +432,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 				num_carats++;</div><div class='ctx'> 				this_node = acpi_ns_get_parent_node(this_node);</div><div class='ctx'> 				if (!this_node) {</div><div class='add'>+</div><div class='ctx'> 					/* Current scope has no parent scope */</div><div class='ctx'> </div><div class='ctx'> 					ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -569,6 +572,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 					     &amp;this_node);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			if (status == AE_NOT_FOUND) {</div><div class='add'>+</div><div class='ctx'> 				/* Name not found in ACPI namespace */</div><div class='ctx'> </div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='hunk'>@@ -602,10 +606,11 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,</div><div class='ctx'> 		    (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) &amp;&amp;</div><div class='ctx'> 		    (this_node-&gt;type != ACPI_TYPE_ANY) &amp;&amp;</div><div class='ctx'> 		    (this_node-&gt;type != type_to_check_for)) {</div><div class='add'>+</div><div class='ctx'> 			/* Complain about a type mismatch */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_WARNING((AE_INFO,</div><div class='del'>-				      "ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)",</div><div class='add'>+				      "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",</div><div class='ctx'> 				      ACPI_CAST_PTR(char, &amp;simple_name),</div><div class='ctx'> 				      acpi_ut_get_type_name(this_node-&gt;type),</div><div class='ctx'> 				      acpi_ut_get_type_name</div><div class='head'>diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c<br/>index 9b871f38b61b..55b407aae266 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsalloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsalloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsalloc.c</a></div><div class='hunk'>@@ -47,9 +47,6 @@</div><div class='ctx'> #define _COMPONENT          ACPI_NAMESPACE</div><div class='ctx'> ACPI_MODULE_NAME("nsalloc")</div><div class='ctx'> </div><div class='del'>-/* Local prototypes */</div><div class='del'>-static void acpi_ns_remove_reference(struct acpi_namespace_node *node);</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ns_create_node</div><div class='hunk'>@@ -61,14 +58,13 @@ static void acpi_ns_remove_reference(struct acpi_namespace_node *node);</div><div class='ctx'>  * DESCRIPTION: Create a namespace node</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> struct acpi_namespace_node *acpi_ns_create_node(u32 name)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_create_node");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_create_node);</div><div class='ctx'> </div><div class='del'>-	node = ACPI_MEM_CALLOCATE(sizeof(struct acpi_namespace_node));</div><div class='add'>+	node = acpi_os_acquire_object(acpi_gbl_namespace_cache);</div><div class='ctx'> 	if (!node) {</div><div class='ctx'> 		return_PTR(NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -76,9 +72,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)</div><div class='ctx'> 	ACPI_MEM_TRACKING(acpi_gbl_ns_node_list-&gt;total_allocated++);</div><div class='ctx'> </div><div class='ctx'> 	node-&gt;name.integer = name;</div><div class='del'>-	node-&gt;reference_count = 1;</div><div class='ctx'> 	ACPI_SET_DESCRIPTOR_TYPE(node, ACPI_DESC_TYPE_NAMED);</div><div class='del'>-</div><div class='ctx'> 	return_PTR(node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +94,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)</div><div class='ctx'> 	struct acpi_namespace_node *prev_node;</div><div class='ctx'> 	struct acpi_namespace_node *next_node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_delete_node", node);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_delete_node, node);</div><div class='ctx'> </div><div class='ctx'> 	parent_node = acpi_ns_get_parent_node(node);</div><div class='ctx'> </div><div class='hunk'>@@ -115,6 +109,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (prev_node) {</div><div class='add'>+</div><div class='ctx'> 		/* Node is not first child, unlink it */</div><div class='ctx'> </div><div class='ctx'> 		prev_node-&gt;peer = next_node-&gt;peer;</div><div class='hunk'>@@ -125,6 +120,7 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)</div><div class='ctx'> 		/* Node is first child (has no previous peer) */</div><div class='ctx'> </div><div class='ctx'> 		if (next_node-&gt;flags &amp; ANOBJ_END_OF_PEER_LIST) {</div><div class='add'>+</div><div class='ctx'> 			/* No peers at all */</div><div class='ctx'> </div><div class='ctx'> 			parent_node-&gt;child = NULL;</div><div class='hunk'>@@ -137,10 +133,10 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)</div><div class='ctx'> 	ACPI_MEM_TRACKING(acpi_gbl_ns_node_list-&gt;total_freed++);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Detach an object if there is one then delete the node</div><div class='add'>+	 * Detach an object if there is one, then delete the node</div><div class='ctx'> 	 */</div><div class='ctx'> 	acpi_ns_detach_object(node);</div><div class='del'>-	ACPI_MEM_FREE(node);</div><div class='add'>+	(void)acpi_os_release_object(acpi_gbl_namespace_cache, node);</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +167,7 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp</div><div class='ctx'> 	acpi_owner_id owner_id = 0;</div><div class='ctx'> 	struct acpi_namespace_node *child_node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_install_node");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_install_node);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get the owner ID from the Walk state</div><div class='hunk'>@@ -216,14 +212,6 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp</div><div class='ctx'> 			  acpi_ut_get_type_name(parent_node-&gt;type),</div><div class='ctx'> 			  parent_node));</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Increment the reference count(s) of all parents up to</div><div class='del'>-	 * the root!</div><div class='del'>-	 */</div><div class='del'>-	while ((node = acpi_ns_get_parent_node(node)) != NULL) {</div><div class='del'>-		node-&gt;reference_count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -244,10 +232,9 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_namespace_node *child_node;</div><div class='ctx'> 	struct acpi_namespace_node *next_node;</div><div class='del'>-	struct acpi_namespace_node *node;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_delete_children", parent_node);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_delete_children, parent_node);</div><div class='ctx'> </div><div class='ctx'> 	if (!parent_node) {</div><div class='ctx'> 		return_VOID;</div><div class='hunk'>@@ -264,6 +251,7 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)</div><div class='ctx'> 	 * Deallocate all children at this level</div><div class='ctx'> 	 */</div><div class='ctx'> 	do {</div><div class='add'>+</div><div class='ctx'> 		/* Get the things we need */</div><div class='ctx'> </div><div class='ctx'> 		next_node = child_node-&gt;peer;</div><div class='hunk'>@@ -289,26 +277,10 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)</div><div class='ctx'> 		 */</div><div class='ctx'> 		acpi_ns_detach_object(child_node);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Decrement the reference count(s) of all parents up to</div><div class='del'>-		 * the root! (counts were incremented when the node was created)</div><div class='del'>-		 */</div><div class='del'>-		node = child_node;</div><div class='del'>-		while ((node = acpi_ns_get_parent_node(node)) != NULL) {</div><div class='del'>-			node-&gt;reference_count--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* There should be only one reference remaining on this node */</div><div class='del'>-</div><div class='del'>-		if (child_node-&gt;reference_count != 1) {</div><div class='del'>-			ACPI_WARNING((AE_INFO,</div><div class='del'>-				      "Existing references (%d) on node being deleted (%p)",</div><div class='del'>-				      child_node-&gt;reference_count, child_node));</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Now we can delete the node */</div><div class='ctx'> </div><div class='del'>-		ACPI_MEM_FREE(child_node);</div><div class='add'>+		(void)acpi_os_release_object(acpi_gbl_namespace_cache,</div><div class='add'>+					     child_node);</div><div class='ctx'> </div><div class='ctx'> 		/* And move on to the next child in the list */</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +313,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)</div><div class='ctx'> 	struct acpi_namespace_node *child_node = NULL;</div><div class='ctx'> 	u32 level = 1;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_delete_namespace_subtree");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_delete_namespace_subtree);</div><div class='ctx'> </div><div class='ctx'> 	if (!parent_node) {</div><div class='ctx'> 		return_VOID;</div><div class='hunk'>@@ -352,11 +324,14 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)</div><div class='ctx'> 	 * to where we started.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (level &gt; 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Get the next node in this scope (NULL if none) */</div><div class='ctx'> </div><div class='del'>-		child_node = acpi_ns_get_next_node(ACPI_TYPE_ANY, parent_node,</div><div class='del'>-						   child_node);</div><div class='add'>+		child_node =</div><div class='add'>+		    acpi_ns_get_next_node(ACPI_TYPE_ANY, parent_node,</div><div class='add'>+					  child_node);</div><div class='ctx'> 		if (child_node) {</div><div class='add'>+</div><div class='ctx'> 			/* Found a child node - detach any attached object */</div><div class='ctx'> </div><div class='ctx'> 			acpi_ns_detach_object(child_node);</div><div class='hunk'>@@ -401,55 +376,6 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ns_remove_reference</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Node           - Named node whose reference count is to be</div><div class='del'>- *                               decremented</div><div class='del'>- *</div><div class='del'>- * RETURN:      None.</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Remove a Node reference.  Decrements the reference count</div><div class='del'>- *              of all parent Nodes up to the root.  Any node along</div><div class='del'>- *              the way that reaches zero references is freed.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static void acpi_ns_remove_reference(struct acpi_namespace_node *node)</div><div class='del'>-{</div><div class='del'>-	struct acpi_namespace_node *parent_node;</div><div class='del'>-	struct acpi_namespace_node *this_node;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_ENTRY();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Decrement the reference count(s) of this node and all</div><div class='del'>-	 * nodes up to the root,  Delete anything with zero remaining references.</div><div class='del'>-	 */</div><div class='del'>-	this_node = node;</div><div class='del'>-	while (this_node) {</div><div class='del'>-		/* Prepare to move up to parent */</div><div class='del'>-</div><div class='del'>-		parent_node = acpi_ns_get_parent_node(this_node);</div><div class='del'>-</div><div class='del'>-		/* Decrement the reference count on this node */</div><div class='del'>-</div><div class='del'>-		this_node-&gt;reference_count--;</div><div class='del'>-</div><div class='del'>-		/* Delete the node if no more references */</div><div class='del'>-</div><div class='del'>-		if (!this_node-&gt;reference_count) {</div><div class='del'>-			/* Delete all children and delete the node */</div><div class='del'>-</div><div class='del'>-			acpi_ns_delete_children(this_node);</div><div class='del'>-			acpi_ns_delete_node(this_node);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		this_node = parent_node;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='ctx'>  * FUNCTION:    acpi_ns_delete_namespace_by_owner</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  owner_id    - All nodes with this owner will be deleted</div><div class='hunk'>@@ -460,24 +386,34 @@ static void acpi_ns_remove_reference(struct acpi_namespace_node *node)</div><div class='ctx'>  *              specific ID.  Used to delete entire ACPI tables.  All</div><div class='ctx'>  *              reference counts are updated.</div><div class='ctx'>  *</div><div class='add'>+ * MUTEX:       Locks namespace during deletion walk.</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_namespace_node *child_node;</div><div class='ctx'> 	struct acpi_namespace_node *deletion_node;</div><div class='del'>-	u32 level;</div><div class='ctx'> 	struct acpi_namespace_node *parent_node;</div><div class='add'>+	u32 level;</div><div class='add'>+	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ns_delete_namespace_by_owner", owner_id);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ns_delete_namespace_by_owner, owner_id);</div><div class='ctx'> </div><div class='ctx'> 	if (owner_id == 0) {</div><div class='ctx'> 		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Lock namespace for possible update */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_VOID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	deletion_node = NULL;</div><div class='ctx'> 	parent_node = acpi_gbl_root_node;</div><div class='ctx'> 	child_node = NULL;</div><div class='del'>-	deletion_node = NULL;</div><div class='ctx'> 	level = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -494,12 +430,14 @@ void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id)</div><div class='ctx'> 					  child_node);</div><div class='ctx'> </div><div class='ctx'> 		if (deletion_node) {</div><div class='del'>-			acpi_ns_remove_reference(deletion_node);</div><div class='add'>+			acpi_ns_delete_children(deletion_node);</div><div class='add'>+			acpi_ns_delete_node(deletion_node);</div><div class='ctx'> 			deletion_node = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (child_node) {</div><div class='ctx'> 			if (child_node-&gt;owner_id == owner_id) {</div><div class='add'>+</div><div class='ctx'> 				/* Found a matching child node - detach any attached object */</div><div class='ctx'> </div><div class='ctx'> 				acpi_ns_detach_object(child_node);</div><div class='hunk'>@@ -541,5 +479,6 @@ void acpi_ns_delete_namespace_by_owner(acpi_owner_id owner_id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c<br/>index a2807317a84b..d72df66aa965 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsdump.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsdump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsdump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsdump.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ns_print_pathname");</div><div class='add'>+	ACPI_FUNCTION_NAME(ns_print_pathname);</div><div class='ctx'> </div><div class='ctx'> 	if (!(acpi_dbg_level &amp; ACPI_LV_NAMES)</div><div class='ctx'> 	    || !(acpi_dbg_layer &amp; ACPI_NAMESPACE)) {</div><div class='hunk'>@@ -123,7 +123,7 @@ void</div><div class='ctx'> acpi_ns_dump_pathname(acpi_handle handle, char *msg, u32 level, u32 component)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_dump_pathname");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_dump_pathname);</div><div class='ctx'> </div><div class='ctx'> 	/* Do this only if the requested debug level and component are enabled */</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +167,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,</div><div class='ctx'> 	u32 dbg_level;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ns_dump_one_object");</div><div class='add'>+	ACPI_FUNCTION_NAME(ns_dump_one_object);</div><div class='ctx'> </div><div class='ctx'> 	/* Is output enabled? */</div><div class='ctx'> </div><div class='hunk'>@@ -191,6 +191,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(info-&gt;display_type &amp; ACPI_DISPLAY_SHORT)) {</div><div class='add'>+</div><div class='ctx'> 		/* Indent the object according to the level */</div><div class='ctx'> </div><div class='ctx'> 		acpi_os_printf("%2d%*s", (u32) level - 1, (int)level * 2, " ");</div><div class='hunk'>@@ -203,6 +204,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!acpi_ut_valid_acpi_name(this_node-&gt;name.integer)) {</div><div class='add'>+			this_node-&gt;name.integer =</div><div class='add'>+			    acpi_ut_repair_name(this_node-&gt;name.integer);</div><div class='add'>+</div><div class='ctx'> 			ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",</div><div class='ctx'> 				      this_node-&gt;name.integer));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -226,6 +230,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,</div><div class='ctx'> 	case ACPI_DISPLAY_SUMMARY:</div><div class='ctx'> </div><div class='ctx'> 		if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 			/* No attached object, we are done */</div><div class='ctx'> </div><div class='ctx'> 			acpi_os_printf("\n");</div><div class='hunk'>@@ -419,6 +424,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> 		acpi_os_printf("O:%p", obj_desc);</div><div class='ctx'> 		if (!obj_desc) {</div><div class='add'>+</div><div class='ctx'> 			/* No attached object, we are done */</div><div class='ctx'> </div><div class='ctx'> 			acpi_os_printf("\n");</div><div class='hunk'>@@ -669,7 +675,7 @@ void acpi_ns_dump_tables(acpi_handle search_base, u32 max_depth)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_handle search_handle = search_base;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_dump_tables");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_dump_tables);</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_root_node) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -682,6 +688,7 @@ void acpi_ns_dump_tables(acpi_handle search_base, u32 max_depth)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_NS_ALL == search_base) {</div><div class='add'>+</div><div class='ctx'> 		/* Entire namespace */</div><div class='ctx'> </div><div class='ctx'> 		search_handle = acpi_gbl_root_node;</div><div class='head'>diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c<br/>index aff899a935e3..c6bf5d30fca3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsdumpdv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsdumpdv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsdumpdv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsdumpdv.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ns_dump_one_device");</div><div class='add'>+	ACPI_FUNCTION_NAME(ns_dump_one_device);</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='ctx'> 	    acpi_ns_dump_one_object(obj_handle, level, context, return_value);</div><div class='hunk'>@@ -92,7 +92,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,</div><div class='ctx'> 				      info-&gt;hardware_id.value,</div><div class='ctx'> 				      ACPI_FORMAT_UINT64(info-&gt;address),</div><div class='ctx'> 				      info-&gt;current_status));</div><div class='del'>-		ACPI_MEM_FREE(info);</div><div class='add'>+		ACPI_FREE(info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (status);</div><div class='hunk'>@@ -115,7 +115,7 @@ void acpi_ns_dump_root_devices(void)</div><div class='ctx'> 	acpi_handle sys_bus_handle;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ns_dump_root_devices");</div><div class='add'>+	ACPI_FUNCTION_NAME(ns_dump_root_devices);</div><div class='ctx'> </div><div class='ctx'> 	/* Only dump the table if tracing is enabled */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c<br/>index 19d7b94d40c3..4b0a4a8c9843 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nseval.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nseval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nseval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nseval.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * Module Name: nseval - Object evaluation interfaces -- includes control</div><div class='del'>- *                       method lookup and execution.</div><div class='add'>+ * Module Name: nseval - Object evaluation, includes control method execution</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -50,196 +49,14 @@</div><div class='ctx'> #define _COMPONENT          ACPI_NAMESPACE</div><div class='ctx'> ACPI_MODULE_NAME("nseval")</div><div class='ctx'> </div><div class='del'>-/* Local prototypes */</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ns_execute_control_method(struct acpi_parameter_info *info);</div><div class='del'>-</div><div class='del'>-static acpi_status acpi_ns_get_object_value(struct acpi_parameter_info *info);</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ns_evaluate_relative</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Pathname        - Name of method to execute, If NULL, the</div><div class='del'>- *                                handle is the object to execute</div><div class='del'>- *              Info            - Method info block, contains:</div><div class='del'>- *                  return_object   - Where to put method's return value (if</div><div class='del'>- *                                    any).  If NULL, no value is returned.</div><div class='del'>- *                  Params          - List of parameters to pass to the method,</div><div class='del'>- *                                    terminated by NULL.  Params itself may be</div><div class='del'>- *                                    NULL if no parameters are being passed.</div><div class='del'>- *</div><div class='del'>- * RETURN:      Status</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Evaluate the object or find and execute the requested method</div><div class='del'>- *</div><div class='del'>- * MUTEX:       Locks Namespace</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-acpi_status</div><div class='del'>-acpi_ns_evaluate_relative(char *pathname, struct acpi_parameter_info *info)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	struct acpi_namespace_node *node = NULL;</div><div class='del'>-	union acpi_generic_state *scope_info;</div><div class='del'>-	char *internal_path = NULL;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_evaluate_relative");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Must have a valid object handle</div><div class='del'>-	 */</div><div class='del'>-	if (!info || !info-&gt;node) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Build an internal name string for the method */</div><div class='del'>-</div><div class='del'>-	status = acpi_ns_internalize_name(pathname, &amp;internal_path);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	scope_info = acpi_ut_create_generic_state();</div><div class='del'>-	if (!scope_info) {</div><div class='del'>-		goto cleanup1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the prefix handle and Node */</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;node = acpi_ns_map_handle_to_node(info-&gt;node);</div><div class='del'>-	if (!info-&gt;node) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-		status = AE_BAD_PARAMETER;</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Lookup the name in the namespace */</div><div class='del'>-</div><div class='del'>-	scope_info-&gt;scope.node = info-&gt;node;</div><div class='del'>-	status = acpi_ns_lookup(scope_info, internal_path, ACPI_TYPE_ANY,</div><div class='del'>-				ACPI_IMODE_EXECUTE, ACPI_NS_NO_UPSEARCH, NULL,</div><div class='del'>-				&amp;node);</div><div class='del'>-</div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "Object [%s] not found [%s]\n",</div><div class='del'>-				  pathname, acpi_format_exception(status)));</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now that we have a handle to the object, we can attempt to evaluate it.</div><div class='del'>-	 */</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "%s [%p] Value %p\n",</div><div class='del'>-			  pathname, node, acpi_ns_get_attached_object(node)));</div><div class='del'>-</div><div class='del'>-	info-&gt;node = node;</div><div class='del'>-	status = acpi_ns_evaluate_by_handle(info);</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='del'>-			  "*** Completed eval of object %s ***\n", pathname));</div><div class='del'>-</div><div class='del'>-      cleanup:</div><div class='del'>-	acpi_ut_delete_generic_state(scope_info);</div><div class='del'>-</div><div class='del'>-      cleanup1:</div><div class='del'>-	ACPI_MEM_FREE(internal_path);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ns_evaluate_by_name</div><div class='add'>+ * FUNCTION:    acpi_ns_evaluate</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Pathname        - Fully qualified pathname to the object</div><div class='del'>- *              Info                - Method info block, contains:</div><div class='del'>- *                  return_object   - Where to put method's return value (if</div><div class='del'>- *                                    any).  If NULL, no value is returned.</div><div class='del'>- *                  Params          - List of parameters to pass to the method,</div><div class='del'>- *                                    terminated by NULL.  Params itself may be</div><div class='del'>- *                                    NULL if no parameters are being passed.</div><div class='del'>- *</div><div class='del'>- * RETURN:      Status</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Evaluate the object or rind and execute the requested method</div><div class='del'>- *              passing the given parameters</div><div class='del'>- *</div><div class='del'>- * MUTEX:       Locks Namespace</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-acpi_status</div><div class='del'>-acpi_ns_evaluate_by_name(char *pathname, struct acpi_parameter_info *info)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	char *internal_path = NULL;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_evaluate_by_name");</div><div class='del'>-</div><div class='del'>-	/* Build an internal name string for the method */</div><div class='del'>-</div><div class='del'>-	status = acpi_ns_internalize_name(pathname, &amp;internal_path);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Lookup the name in the namespace */</div><div class='del'>-</div><div class='del'>-	status = acpi_ns_lookup(NULL, internal_path, ACPI_TYPE_ANY,</div><div class='del'>-				ACPI_IMODE_EXECUTE, ACPI_NS_NO_UPSEARCH, NULL,</div><div class='del'>-				&amp;info-&gt;node);</div><div class='del'>-</div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='del'>-				  "Object at [%s] was not found, status=%.4X\n",</div><div class='del'>-				  pathname, status));</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now that we have a handle to the object, we can attempt to evaluate it.</div><div class='del'>-	 */</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "%s [%p] Value %p\n",</div><div class='del'>-			  pathname, info-&gt;node,</div><div class='del'>-			  acpi_ns_get_attached_object(info-&gt;node)));</div><div class='del'>-</div><div class='del'>-	status = acpi_ns_evaluate_by_handle(info);</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='del'>-			  "*** Completed eval of object %s ***\n", pathname));</div><div class='del'>-</div><div class='del'>-      cleanup:</div><div class='del'>-</div><div class='del'>-	/* Cleanup */</div><div class='del'>-</div><div class='del'>-	if (internal_path) {</div><div class='del'>-		ACPI_MEM_FREE(internal_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ns_evaluate_by_handle</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Info            - Method info block, contains:</div><div class='del'>- *                  Node            - Method/Object Node to execute</div><div class='add'>+ * PARAMETERS:  Info            - Evaluation info block, contains:</div><div class='add'>+ *                  prefix_node     - Prefix or Method/Object Node to execute</div><div class='add'>+ *                  Pathname        - Name of method to execute, If NULL, the</div><div class='add'>+ *                                    Node is the object to execute</div><div class='ctx'>  *                  Parameters      - List of parameters to pass to the method,</div><div class='ctx'>  *                                    terminated by NULL. Params itself may be</div><div class='ctx'>  *                                    NULL if no parameters are being passed.</div><div class='hunk'>@@ -248,29 +65,21 @@ acpi_ns_evaluate_by_name(char *pathname, struct acpi_parameter_info *info)</div><div class='ctx'>  *                  parameter_type  - Type of Parameter list</div><div class='ctx'>  *                  return_object   - Where to put method's return value (if</div><div class='ctx'>  *                                    any). If NULL, no value is returned.</div><div class='add'>+ *                  Flags           - ACPI_IGNORE_RETURN_VALUE to delete return</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Evaluate object or execute the requested method passing the</div><div class='del'>- *              given parameters</div><div class='add'>+ * DESCRIPTION: Execute a control method or return the current value of an</div><div class='add'>+ *              ACPI namespace object.</div><div class='ctx'>  *</div><div class='del'>- * MUTEX:       Locks Namespace</div><div class='add'>+ * MUTEX:       Locks interpreter</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='del'>-acpi_status acpi_ns_evaluate_by_handle(struct acpi_parameter_info *info)</div><div class='add'>+acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_evaluate_by_handle");</div><div class='del'>-</div><div class='del'>-	/* Check if namespace has been initialized */</div><div class='del'>-</div><div class='del'>-	if (!acpi_gbl_root_node) {</div><div class='del'>-		return_ACPI_STATUS(AE_NO_NAMESPACE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parameter Validation */</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_evaluate);</div><div class='ctx'> </div><div class='ctx'> 	if (!info) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -280,202 +89,120 @@ acpi_status acpi_ns_evaluate_by_handle(struct acpi_parameter_info *info)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;return_object = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Get the prefix handle and Node */</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	/*</div><div class='add'>+	 * Get the actual namespace node for the target object. Handles these cases:</div><div class='add'>+	 *</div><div class='add'>+	 * 1) Null node, Pathname (absolute path)</div><div class='add'>+	 * 2) Node, Pathname (path relative to Node)</div><div class='add'>+	 * 3) Node, Null Pathname</div><div class='add'>+	 */</div><div class='add'>+	status = acpi_ns_get_node(info-&gt;prefix_node, info-&gt;pathname,</div><div class='add'>+				  ACPI_NS_NO_UPSEARCH, &amp;info-&gt;resolved_node);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info-&gt;node = acpi_ns_map_handle_to_node(info-&gt;node);</div><div class='del'>-	if (!info-&gt;node) {</div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For a method alias, we must grab the actual method node so that proper</div><div class='ctx'> 	 * scoping context will be established before execution.</div><div class='ctx'> 	 */</div><div class='del'>-	if (acpi_ns_get_type(info-&gt;node) == ACPI_TYPE_LOCAL_METHOD_ALIAS) {</div><div class='del'>-		info-&gt;node =</div><div class='add'>+	if (acpi_ns_get_type(info-&gt;resolved_node) ==</div><div class='add'>+	    ACPI_TYPE_LOCAL_METHOD_ALIAS) {</div><div class='add'>+		info-&gt;resolved_node =</div><div class='ctx'> 		    ACPI_CAST_PTR(struct acpi_namespace_node,</div><div class='del'>-				  info-&gt;node-&gt;object);</div><div class='add'>+				  info-&gt;resolved_node-&gt;object);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "%s [%p] Value %p\n", info-&gt;pathname,</div><div class='add'>+			  info-&gt;resolved_node,</div><div class='add'>+			  acpi_ns_get_attached_object(info-&gt;resolved_node)));</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Two major cases here:</div><div class='del'>-	 * 1) The object is an actual control method -- execute it.</div><div class='del'>-	 * 2) The object is not a method -- just return it's current value</div><div class='ctx'> 	 *</div><div class='del'>-	 * In both cases, the namespace is unlocked by the acpi_ns* procedure</div><div class='add'>+	 * 1) The object is a control method -- execute it</div><div class='add'>+	 * 2) The object is not a method -- just return it's current value</div><div class='ctx'> 	 */</div><div class='del'>-	if (acpi_ns_get_type(info-&gt;node) == ACPI_TYPE_METHOD) {</div><div class='del'>-		/*</div><div class='del'>-		 * Case 1) We have an actual control method to execute</div><div class='del'>-		 */</div><div class='del'>-		status = acpi_ns_execute_control_method(info);</div><div class='del'>-	} else {</div><div class='add'>+	if (acpi_ns_get_type(info-&gt;resolved_node) == ACPI_TYPE_METHOD) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Case 2) Object is NOT a method, just return its current value</div><div class='add'>+		 * 1) Object is a control method - execute it</div><div class='ctx'> 		 */</div><div class='del'>-		status = acpi_ns_get_object_value(info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if there is a return value on the stack that must be dealt with</div><div class='del'>-	 */</div><div class='del'>-	if (status == AE_CTRL_RETURN_VALUE) {</div><div class='del'>-		/* Map AE_CTRL_RETURN_VALUE to AE_OK, we are done with it */</div><div class='del'>-</div><div class='del'>-		status = AE_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Namespace was unlocked by the handling acpi_ns* function, so we</div><div class='del'>-	 * just return</div><div class='del'>-	 */</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ns_execute_control_method</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Info            - Method info block, contains:</div><div class='del'>- *                  Node            - Method Node to execute</div><div class='del'>- *                  obj_desc        - Method object</div><div class='del'>- *                  Parameters      - List of parameters to pass to the method,</div><div class='del'>- *                                    terminated by NULL. Params itself may be</div><div class='del'>- *                                    NULL if no parameters are being passed.</div><div class='del'>- *                  return_object   - Where to put method's return value (if</div><div class='del'>- *                                    any). If NULL, no value is returned.</div><div class='del'>- *                  parameter_type  - Type of Parameter list</div><div class='del'>- *                  return_object   - Where to put method's return value (if</div><div class='del'>- *                                    any). If NULL, no value is returned.</div><div class='del'>- *</div><div class='del'>- * RETURN:      Status</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Execute the requested method passing the given parameters</div><div class='del'>- *</div><div class='del'>- * MUTEX:       Assumes namespace is locked</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ns_execute_control_method(struct acpi_parameter_info *info)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_execute_control_method");</div><div class='del'>-</div><div class='del'>-	/* Verify that there is a method associated with this object */</div><div class='del'>-</div><div class='del'>-	info-&gt;obj_desc = acpi_ns_get_attached_object(info-&gt;node);</div><div class='del'>-	if (!info-&gt;obj_desc) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "No attached method object"));</div><div class='ctx'> </div><div class='del'>-		(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-		return_ACPI_STATUS(AE_NULL_OBJECT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ACPI_DUMP_PATHNAME(info-&gt;node, "Execute Method:",</div><div class='del'>-			   ACPI_LV_INFO, _COMPONENT);</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Method at AML address %p Length %X\n",</div><div class='del'>-			  info-&gt;obj_desc-&gt;method.aml_start + 1,</div><div class='del'>-			  info-&gt;obj_desc-&gt;method.aml_length - 1));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Unlock the namespace before execution.  This allows namespace access</div><div class='del'>-	 * via the external Acpi* interfaces while a method is being executed.</div><div class='del'>-	 * However, any namespace deletion must acquire both the namespace and</div><div class='del'>-	 * interpreter locks to ensure that no thread is using the portion of the</div><div class='del'>-	 * namespace that is being deleted.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='add'>+		/* Verify that there is a method object associated with this node */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Execute the method via the interpreter.  The interpreter is locked</div><div class='del'>-	 * here before calling into the AML parser</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_ex_enter_interpreter();</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='add'>+		info-&gt;obj_desc =</div><div class='add'>+		    acpi_ns_get_attached_object(info-&gt;resolved_node);</div><div class='add'>+		if (!info-&gt;obj_desc) {</div><div class='add'>+			ACPI_ERROR((AE_INFO,</div><div class='add'>+				    "Control method has no attached sub-object"));</div><div class='add'>+			return_ACPI_STATUS(AE_NULL_OBJECT);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	status = acpi_ps_execute_method(info);</div><div class='del'>-	acpi_ex_exit_interpreter();</div><div class='add'>+		ACPI_DUMP_PATHNAME(info-&gt;resolved_node, "Execute Method:",</div><div class='add'>+				   ACPI_LV_INFO, _COMPONENT);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='add'>+				  "Method at AML address %p Length %X\n",</div><div class='add'>+				  info-&gt;obj_desc-&gt;method.aml_start + 1,</div><div class='add'>+				  info-&gt;obj_desc-&gt;method.aml_length - 1));</div><div class='ctx'> </div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ns_get_object_value</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Info            - Method info block, contains:</div><div class='del'>- *                  Node            - Object's NS node</div><div class='del'>- *                  return_object   - Where to put object value (if</div><div class='del'>- *                                    any). If NULL, no value is returned.</div><div class='del'>- *</div><div class='del'>- * RETURN:      Status</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Return the current value of the object</div><div class='del'>- *</div><div class='del'>- * MUTEX:       Assumes namespace is locked, leaves namespace unlocked</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='add'>+		/*</div><div class='add'>+		 * Any namespace deletion must acquire both the namespace and</div><div class='add'>+		 * interpreter locks to ensure that no thread is using the portion of</div><div class='add'>+		 * the namespace that is being deleted.</div><div class='add'>+		 *</div><div class='add'>+		 * Execute the method via the interpreter. The interpreter is locked</div><div class='add'>+		 * here before calling into the AML parser</div><div class='add'>+		 */</div><div class='add'>+		status = acpi_ex_enter_interpreter();</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			return_ACPI_STATUS(status);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-static acpi_status acpi_ns_get_object_value(struct acpi_parameter_info *info)</div><div class='del'>-{</div><div class='del'>-	acpi_status status = AE_OK;</div><div class='del'>-	struct acpi_namespace_node *resolved_node = info-&gt;node;</div><div class='add'>+		status = acpi_ps_execute_method(info);</div><div class='add'>+		acpi_ex_exit_interpreter();</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * 2) Object is not a method, return its current value</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_get_object_value");</div><div class='add'>+		/*</div><div class='add'>+		 * Objects require additional resolution steps (e.g., the Node may be</div><div class='add'>+		 * a field that must be read, etc.) -- we can't just grab the object</div><div class='add'>+		 * out of the node.</div><div class='add'>+		 *</div><div class='add'>+		 * Use resolve_node_to_value() to get the associated value.</div><div class='add'>+		 *</div><div class='add'>+		 * NOTE: we can get away with passing in NULL for a walk state because</div><div class='add'>+		 * resolved_node is guaranteed to not be a reference to either a method</div><div class='add'>+		 * local or a method argument (because this interface is never called</div><div class='add'>+		 * from a running method.)</div><div class='add'>+		 *</div><div class='add'>+		 * Even though we do not directly invoke the interpreter for object</div><div class='add'>+		 * resolution, we must lock it because we could access an opregion.</div><div class='add'>+		 * The opregion access code assumes that the interpreter is locked.</div><div class='add'>+		 */</div><div class='add'>+		status = acpi_ex_enter_interpreter();</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			return_ACPI_STATUS(status);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Objects require additional resolution steps (e.g., the Node may be a</div><div class='del'>-	 * field that must be read, etc.) -- we can't just grab the object out of</div><div class='del'>-	 * the node.</div><div class='del'>-	 */</div><div class='add'>+		/* Function has a strange interface */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Use resolve_node_to_value() to get the associated value. This call always</div><div class='del'>-	 * deletes obj_desc (allocated above).</div><div class='del'>-	 *</div><div class='del'>-	 * NOTE: we can get away with passing in NULL for a walk state because</div><div class='del'>-	 * obj_desc is guaranteed to not be a reference to either a method local or</div><div class='del'>-	 * a method argument (because this interface can only be called from the</div><div class='del'>-	 * acpi_evaluate external interface, never called from a running method.)</div><div class='del'>-	 *</div><div class='del'>-	 * Even though we do not directly invoke the interpreter for this, we must</div><div class='del'>-	 * enter it because we could access an opregion. The opregion access code</div><div class='del'>-	 * assumes that the interpreter is locked.</div><div class='del'>-	 *</div><div class='del'>-	 * We must release the namespace lock before entering the intepreter.</div><div class='del'>-	 */</div><div class='del'>-	status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='add'>+		status =</div><div class='add'>+		    acpi_ex_resolve_node_to_value(&amp;info-&gt;resolved_node, NULL);</div><div class='add'>+		acpi_ex_exit_interpreter();</div><div class='ctx'> </div><div class='del'>-	status = acpi_ex_enter_interpreter();</div><div class='del'>-	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		status = acpi_ex_resolve_node_to_value(&amp;resolved_node, NULL);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If acpi_ex_resolve_node_to_value() succeeded, the return value was placed</div><div class='ctx'> 		 * in resolved_node.</div><div class='ctx'> 		 */</div><div class='del'>-		acpi_ex_exit_interpreter();</div><div class='del'>-</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			status = AE_CTRL_RETURN_VALUE;</div><div class='del'>-			info-&gt;return_object = ACPI_CAST_PTR</div><div class='del'>-			    (union acpi_operand_object, resolved_node);</div><div class='add'>+			info-&gt;return_object =</div><div class='add'>+			    ACPI_CAST_PTR(union acpi_operand_object,</div><div class='add'>+					  info-&gt;resolved_node);</div><div class='add'>+</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='ctx'> 					  "Returning object %p [%s]\n",</div><div class='ctx'> 					  info-&gt;return_object,</div><div class='hunk'>@@ -484,7 +211,30 @@ static acpi_status acpi_ns_get_object_value(struct acpi_parameter_info *info)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Namespace is unlocked */</div><div class='add'>+	/*</div><div class='add'>+	 * Check if there is a return value that must be dealt with</div><div class='add'>+	 */</div><div class='add'>+	if (status == AE_CTRL_RETURN_VALUE) {</div><div class='add'>+</div><div class='add'>+		/* If caller does not want the return value, delete it */</div><div class='ctx'> </div><div class='add'>+		if (info-&gt;flags &amp; ACPI_IGNORE_RETURN_VALUE) {</div><div class='add'>+			acpi_ut_remove_reference(info-&gt;return_object);</div><div class='add'>+			info-&gt;return_object = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Map AE_CTRL_RETURN_VALUE to AE_OK, we are done with it */</div><div class='add'>+</div><div class='add'>+		status = AE_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='add'>+			  "*** Completed evaluation of object %s ***\n",</div><div class='add'>+			  info-&gt;pathname));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Namespace was unlocked by the handling acpi_ns* function, so we</div><div class='add'>+	 * just return</div><div class='add'>+	 */</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c<br/>index 9f929e479fd8..aec8488c0019 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsinit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsinit.c</a></div><div class='hunk'>@@ -58,6 +58,10 @@ static acpi_status</div><div class='ctx'> acpi_ns_init_one_device(acpi_handle obj_handle,</div><div class='ctx'> 			u32 nesting_level, void *context, void **return_value);</div><div class='ctx'> </div><div class='add'>+static acpi_status</div><div class='add'>+acpi_ns_find_ini_methods(acpi_handle obj_handle,</div><div class='add'>+			 u32 nesting_level, void *context, void **return_value);</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ns_initialize_objects</div><div class='hunk'>@@ -76,7 +80,7 @@ acpi_status acpi_ns_initialize_objects(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_init_walk_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_initialize_objects");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_initialize_objects);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,</div><div class='ctx'> 			  "**** Starting initialization of namespace objects ****\n"));</div><div class='hunk'>@@ -93,7 +97,7 @@ acpi_status acpi_ns_initialize_objects(void)</div><div class='ctx'> 				     ACPI_UINT32_MAX, acpi_ns_init_one_object,</div><div class='ctx'> 				     &amp;info, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,</div><div class='hunk'>@@ -133,7 +137,7 @@ acpi_status acpi_ns_initialize_devices(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_device_walk_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_initialize_devices");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_initialize_devices);</div><div class='ctx'> </div><div class='ctx'> 	/* Init counters */</div><div class='ctx'> </div><div class='hunk'>@@ -142,30 +146,46 @@ acpi_status acpi_ns_initialize_devices(void)</div><div class='ctx'> 	info.num_INI = 0;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,</div><div class='del'>-			      "Executing all Device _STA and_INI methods:"));</div><div class='add'>+			      "Initializing Device/Processor/Thermal objects by executing _INI methods:"));</div><div class='add'>+</div><div class='add'>+	/* Tree analysis: find all subtrees that contain _INI methods */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);</div><div class='add'>+	status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,</div><div class='add'>+					ACPI_UINT32_MAX, FALSE,</div><div class='add'>+					acpi_ns_find_ini_methods, &amp;info, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto error_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Walk namespace for all objects */</div><div class='add'>+	/* Allocate the evaluation information block */</div><div class='add'>+</div><div class='add'>+	info.evaluate_info =</div><div class='add'>+	    ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info.evaluate_info) {</div><div class='add'>+		status = AE_NO_MEMORY;</div><div class='add'>+		goto error_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Walk namespace to execute all _INIs on present devices */</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,</div><div class='del'>-					ACPI_UINT32_MAX, TRUE,</div><div class='add'>+					ACPI_UINT32_MAX, FALSE,</div><div class='ctx'> 					acpi_ns_init_one_device, &amp;info, NULL);</div><div class='ctx'> </div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='del'>-</div><div class='add'>+	ACPI_FREE(info.evaluate_info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));</div><div class='add'>+		goto error_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,</div><div class='del'>-			      "\n%hd Devices found - executed %hd _STA, %hd _INI methods\n",</div><div class='del'>-			      info.device_count, info.num_STA, info.num_INI));</div><div class='add'>+			      "\nExecuted %hd _INI methods requiring %hd _STA executions (examined %hd objects)\n",</div><div class='add'>+			      info.num_INI, info.num_STA, info.device_count));</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='add'>+</div><div class='add'>+      error_exit:</div><div class='add'>+	ACPI_EXCEPTION((AE_INFO, status, "During device initialization"));</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -200,7 +220,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,</div><div class='ctx'> 	    (struct acpi_namespace_node *)obj_handle;</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ns_init_one_object");</div><div class='add'>+	ACPI_FUNCTION_NAME(ns_init_one_object);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;object_count++;</div><div class='ctx'> </div><div class='hunk'>@@ -311,6 +331,72 @@ acpi_ns_init_one_object(acpi_handle obj_handle,</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_ns_find_ini_methods</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  acpi_walk_callback</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      acpi_status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Called during namespace walk. Finds objects named _INI under</div><div class='add'>+ *              device/processor/thermal objects, and marks the entire subtree</div><div class='add'>+ *              with a SUBTREE_HAS_INI flag. This flag is used during the</div><div class='add'>+ *              subsequent device initialization walk to avoid entire subtrees</div><div class='add'>+ *              that do not contain an _INI.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_ns_find_ini_methods(acpi_handle obj_handle,</div><div class='add'>+			 u32 nesting_level, void *context, void **return_value)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device_walk_info *info =</div><div class='add'>+	    ACPI_CAST_PTR(struct acpi_device_walk_info, context);</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='add'>+	struct acpi_namespace_node *parent_node;</div><div class='add'>+</div><div class='add'>+	/* Keep count of device/processor/thermal objects */</div><div class='add'>+</div><div class='add'>+	node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);</div><div class='add'>+	if ((node-&gt;type == ACPI_TYPE_DEVICE) ||</div><div class='add'>+	    (node-&gt;type == ACPI_TYPE_PROCESSOR) ||</div><div class='add'>+	    (node-&gt;type == ACPI_TYPE_THERMAL)) {</div><div class='add'>+		info-&gt;device_count++;</div><div class='add'>+		return (AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We are only looking for methods named _INI */</div><div class='add'>+</div><div class='add'>+	if (!ACPI_COMPARE_NAME(node-&gt;name.ascii, METHOD_NAME__INI)) {</div><div class='add'>+		return (AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The only _INI methods that we care about are those that are</div><div class='add'>+	 * present under Device, Processor, and Thermal objects.</div><div class='add'>+	 */</div><div class='add'>+	parent_node = acpi_ns_get_parent_node(node);</div><div class='add'>+	switch (parent_node-&gt;type) {</div><div class='add'>+	case ACPI_TYPE_DEVICE:</div><div class='add'>+	case ACPI_TYPE_PROCESSOR:</div><div class='add'>+	case ACPI_TYPE_THERMAL:</div><div class='add'>+</div><div class='add'>+		/* Mark parent and bubble up the INI present flag to the root */</div><div class='add'>+</div><div class='add'>+		while (parent_node) {</div><div class='add'>+			parent_node-&gt;flags |= ANOBJ_SUBTREE_HAS_INI;</div><div class='add'>+			parent_node = acpi_ns_get_parent_node(parent_node);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (AE_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_ns_init_one_device</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  acpi_walk_callback</div><div class='hunk'>@@ -327,119 +413,165 @@ static acpi_status</div><div class='ctx'> acpi_ns_init_one_device(acpi_handle obj_handle,</div><div class='ctx'> 			u32 nesting_level, void *context, void **return_value)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_device_walk_info *info =</div><div class='del'>-	    (struct acpi_device_walk_info *)context;</div><div class='del'>-	struct acpi_parameter_info pinfo;</div><div class='add'>+	struct acpi_device_walk_info *walk_info =</div><div class='add'>+	    ACPI_CAST_PTR(struct acpi_device_walk_info, context);</div><div class='add'>+	struct acpi_evaluate_info *info = walk_info-&gt;evaluate_info;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	struct acpi_namespace_node *ini_node;</div><div class='ctx'> 	struct acpi_namespace_node *device_node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_init_one_device");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_init_one_device);</div><div class='ctx'> </div><div class='del'>-	device_node = acpi_ns_map_handle_to_node(obj_handle);</div><div class='del'>-	if (!device_node) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='del'>-	}</div><div class='add'>+	/* We are interested in Devices, Processors and thermal_zones only */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We will run _STA/_INI on Devices, Processors and thermal_zones only</div><div class='del'>-	 */</div><div class='add'>+	device_node = ACPI_CAST_PTR(struct acpi_namespace_node, obj_handle);</div><div class='ctx'> 	if ((device_node-&gt;type != ACPI_TYPE_DEVICE) &amp;&amp;</div><div class='ctx'> 	    (device_node-&gt;type != ACPI_TYPE_PROCESSOR) &amp;&amp;</div><div class='ctx'> 	    (device_node-&gt;type != ACPI_TYPE_THERMAL)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((acpi_dbg_level &lt;= ACPI_LV_ALL_EXCEPTIONS) &amp;&amp;</div><div class='del'>-	    (!(acpi_dbg_level &amp; ACPI_LV_INFO))) {</div><div class='del'>-		ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;device_count++;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Check if the _INI method exists for this device -</div><div class='del'>-	 * if _INI does not exist, there is no need to run _STA</div><div class='del'>-	 * No _INI means device requires no initialization</div><div class='add'>+	 * Because of an earlier namespace analysis, all subtrees that contain an</div><div class='add'>+	 * _INI method are tagged.</div><div class='add'>+	 *</div><div class='add'>+	 * If this device subtree does not contain any _INI methods, we</div><div class='add'>+	 * can exit now and stop traversing this entire subtree.</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI),</div><div class='del'>-				     device_node, ACPI_TYPE_METHOD, &amp;ini_node);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		/* No _INI method found - move on to next device */</div><div class='del'>-</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	if (!(device_node-&gt;flags &amp; ANOBJ_SUBTREE_HAS_INI)) {</div><div class='add'>+		return_ACPI_STATUS(AE_CTRL_DEPTH);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Run _STA to determine if we can run _INI on the device -</div><div class='del'>-	 * the device must be present before _INI can be run.</div><div class='del'>-	 * However, _STA is not required - assume device present if no _STA</div><div class='add'>+	 * Run _STA to determine if this device is present and functioning. We</div><div class='add'>+	 * must know this information for two important reasons (from ACPI spec):</div><div class='add'>+	 *</div><div class='add'>+	 * 1) We can only run _INI if the device is present.</div><div class='add'>+	 * 2) We must abort the device tree walk on this subtree if the device is</div><div class='add'>+	 *    not present and is not functional (we will not examine the children)</div><div class='add'>+	 *</div><div class='add'>+	 * The _STA method is not required to be present under the device, we</div><div class='add'>+	 * assume the device is present if _STA does not exist.</div><div class='ctx'> 	 */</div><div class='del'>-	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,</div><div class='del'>-						      device_node,</div><div class='del'>-						      METHOD_NAME__STA));</div><div class='del'>-</div><div class='del'>-	pinfo.node = device_node;</div><div class='del'>-	pinfo.parameters = NULL;</div><div class='del'>-	pinfo.parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname</div><div class='add'>+			(ACPI_TYPE_METHOD, device_node, METHOD_NAME__STA));</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_execute_STA(pinfo.node, &amp;flags);</div><div class='add'>+	status = acpi_ut_execute_STA(device_node, &amp;flags);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Ignore error and move on to next device */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Flags == -1 means that _STA was not found. In this case, we assume that</div><div class='add'>+	 * the device is both present and functional.</div><div class='add'>+	 *</div><div class='add'>+	 * From the ACPI spec, description of _STA:</div><div class='add'>+	 *</div><div class='add'>+	 * "If a device object (including the processor object) does not have an</div><div class='add'>+	 * _STA object, then OSPM assumes that all of the above bits are set (in</div><div class='add'>+	 * other words, the device is present, ..., and functioning)"</div><div class='add'>+	 */</div><div class='ctx'> 	if (flags != ACPI_UINT32_MAX) {</div><div class='del'>-		info-&gt;num_STA++;</div><div class='add'>+		walk_info-&gt;num_STA++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Examine the PRESENT and FUNCTIONING status bits</div><div class='add'>+	 *</div><div class='add'>+	 * Note: ACPI spec does not seem to specify behavior for the present but</div><div class='add'>+	 * not functioning case, so we assume functioning if present.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!(flags &amp; ACPI_STA_DEVICE_PRESENT)) {</div><div class='del'>-		/* Don't look at children of a not present device */</div><div class='ctx'> </div><div class='del'>-		return_ACPI_STATUS(AE_CTRL_DEPTH);</div><div class='add'>+		/* Device is not present, we must examine the Functioning bit */</div><div class='add'>+</div><div class='add'>+		if (flags &amp; ACPI_STA_DEVICE_FUNCTIONING) {</div><div class='add'>+			/*</div><div class='add'>+			 * Device is not present but is "functioning". In this case,</div><div class='add'>+			 * we will not run _INI, but we continue to examine the children</div><div class='add'>+			 * of this device.</div><div class='add'>+			 *</div><div class='add'>+			 * From the ACPI spec, description of _STA: (Note - no mention</div><div class='add'>+			 * of whether to run _INI or not on the device in question)</div><div class='add'>+			 *</div><div class='add'>+			 * "_STA may return bit 0 clear (not present) with bit 3 set</div><div class='add'>+			 * (device is functional). This case is used to indicate a valid</div><div class='add'>+			 * device for which no device driver should be loaded (for example,</div><div class='add'>+			 * a bridge device.) Children of this device may be present and</div><div class='add'>+			 * valid. OSPM should continue enumeration below a device whose</div><div class='add'>+			 * _STA returns this bit combination"</div><div class='add'>+			 */</div><div class='add'>+			return_ACPI_STATUS(AE_OK);</div><div class='add'>+		} else {</div><div class='add'>+			/*</div><div class='add'>+			 * Device is not present and is not functioning. We must abort the</div><div class='add'>+			 * walk of this subtree immediately -- don't look at the children</div><div class='add'>+			 * of such a device.</div><div class='add'>+			 *</div><div class='add'>+			 * From the ACPI spec, description of _INI:</div><div class='add'>+			 *</div><div class='add'>+			 * "If the _STA method indicates that the device is not present,</div><div class='add'>+			 * OSPM will not run the _INI and will not examine the children</div><div class='add'>+			 * of the device for _INI methods"</div><div class='add'>+			 */</div><div class='add'>+			return_ACPI_STATUS(AE_CTRL_DEPTH);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The device is present and _INI exists. Run the _INI method.</div><div class='del'>-	 * (We already have the _INI node from above)</div><div class='add'>+	 * The device is present or is assumed present if no _STA exists.</div><div class='add'>+	 * Run the _INI if it exists (not required to exist)</div><div class='add'>+	 *</div><div class='add'>+	 * Note: We know there is an _INI within this subtree, but it may not be</div><div class='add'>+	 * under this particular device, it may be lower in the branch.</div><div class='ctx'> 	 */</div><div class='del'>-	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,</div><div class='del'>-						      pinfo.node,</div><div class='del'>-						      METHOD_NAME__INI));</div><div class='add'>+	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname</div><div class='add'>+			(ACPI_TYPE_METHOD, device_node, METHOD_NAME__INI));</div><div class='add'>+</div><div class='add'>+	info-&gt;prefix_node = device_node;</div><div class='add'>+	info-&gt;pathname = METHOD_NAME__INI;</div><div class='add'>+	info-&gt;parameters = NULL;</div><div class='add'>+	info-&gt;parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	info-&gt;flags = ACPI_IGNORE_RETURN_VALUE;</div><div class='add'>+</div><div class='add'>+	status = acpi_ns_evaluate(info);</div><div class='add'>+	if (ACPI_SUCCESS(status)) {</div><div class='add'>+		walk_info-&gt;num_INI++;</div><div class='add'>+</div><div class='add'>+		if ((acpi_dbg_level &lt;= ACPI_LV_ALL_EXCEPTIONS) &amp;&amp;</div><div class='add'>+		    (!(acpi_dbg_level &amp; ACPI_LV_INFO))) {</div><div class='add'>+			ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#ifdef ACPI_DEBUG_OUTPUT</div><div class='add'>+	else if (status != AE_NOT_FOUND) {</div><div class='ctx'> </div><div class='del'>-	pinfo.node = ini_node;</div><div class='del'>-	status = acpi_ns_evaluate_by_handle(&amp;pinfo);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		/* Ignore error and move on to next device */</div><div class='ctx'> </div><div class='del'>-#ifdef ACPI_DEBUG_OUTPUT</div><div class='del'>-		char *scope_name = acpi_ns_get_external_pathname(ini_node);</div><div class='del'>-</div><div class='del'>-		ACPI_WARNING((AE_INFO, "%s._INI failed: %s",</div><div class='del'>-			      scope_name, acpi_format_exception(status)));</div><div class='add'>+		char *scope_name =</div><div class='add'>+		    acpi_ns_get_external_pathname(info-&gt;resolved_node);</div><div class='ctx'> </div><div class='del'>-		ACPI_MEM_FREE(scope_name);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",</div><div class='add'>+				scope_name));</div><div class='add'>+		ACPI_FREE(scope_name);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='del'>-	} else {</div><div class='del'>-		/* Delete any return object (especially if implicit_return is enabled) */</div><div class='ctx'> </div><div class='del'>-		if (pinfo.return_object) {</div><div class='del'>-			acpi_ut_remove_reference(pinfo.return_object);</div><div class='del'>-		}</div><div class='add'>+	/* Ignore errors from above */</div><div class='ctx'> </div><div class='del'>-		/* Count of successful INIs */</div><div class='del'>-</div><div class='del'>-		info-&gt;num_INI++;</div><div class='del'>-	}</div><div class='add'>+	status = AE_OK;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The _INI method has been run if present; call the Global Initialization</div><div class='add'>+	 * Handler for this device.</div><div class='add'>+	 */</div><div class='ctx'> 	if (acpi_gbl_init_handler) {</div><div class='del'>-		/* External initialization handler is present, call it */</div><div class='del'>-</div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI);</div><div class='add'>+		    acpi_gbl_init_handler(device_node, ACPI_INIT_DEVICE_INI);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c<br/>index 4e0b0524c188..fe75d888e183 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsload.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsload.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsload.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsload.c</a></div><div class='hunk'>@@ -77,13 +77,14 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_load_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_load_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if table contains valid AML (must be DSDT, PSDT, SSDT, etc.) */</div><div class='ctx'> </div><div class='ctx'> 	if (!</div><div class='ctx'> 	    (acpi_gbl_table_data[table_desc-&gt;type].</div><div class='ctx'> 	     flags &amp; ACPI_TABLE_EXECUTABLE)) {</div><div class='add'>+</div><div class='ctx'> 		/* Just ignore this table */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -168,7 +169,7 @@ static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_load_table_by_type");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_load_table_by_type);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -180,11 +181,11 @@ static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)</div><div class='ctx'> 	 * DSDT (one), SSDT/PSDT (multiple)</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (table_type) {</div><div class='del'>-	case ACPI_TABLE_DSDT:</div><div class='add'>+	case ACPI_TABLE_ID_DSDT:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Namespace load: DSDT\n"));</div><div class='ctx'> </div><div class='del'>-		table_desc = acpi_gbl_table_lists[ACPI_TABLE_DSDT].next;</div><div class='add'>+		table_desc = acpi_gbl_table_lists[ACPI_TABLE_ID_DSDT].next;</div><div class='ctx'> </div><div class='ctx'> 		/* If table already loaded into namespace, just return */</div><div class='ctx'> </div><div class='hunk'>@@ -200,8 +201,8 @@ static acpi_status acpi_ns_load_table_by_type(acpi_table_type table_type)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_SSDT:</div><div class='del'>-	case ACPI_TABLE_PSDT:</div><div class='add'>+	case ACPI_TABLE_ID_SSDT:</div><div class='add'>+	case ACPI_TABLE_ID_PSDT:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "Namespace load: %d SSDT or PSDTs\n",</div><div class='hunk'>@@ -258,7 +259,7 @@ acpi_status acpi_ns_load_namespace(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_load_name_space");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_load_name_space);</div><div class='ctx'> </div><div class='ctx'> 	/* There must be at least a DSDT installed */</div><div class='ctx'> </div><div class='hunk'>@@ -271,15 +272,15 @@ acpi_status acpi_ns_load_namespace(void)</div><div class='ctx'> 	 * Load the namespace.  The DSDT is required,</div><div class='ctx'> 	 * but the SSDT and PSDT tables are optional.</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_ns_load_table_by_type(ACPI_TABLE_DSDT);</div><div class='add'>+	status = acpi_ns_load_table_by_type(ACPI_TABLE_ID_DSDT);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore exceptions from these */</div><div class='ctx'> </div><div class='del'>-	(void)acpi_ns_load_table_by_type(ACPI_TABLE_SSDT);</div><div class='del'>-	(void)acpi_ns_load_table_by_type(ACPI_TABLE_PSDT);</div><div class='add'>+	(void)acpi_ns_load_table_by_type(ACPI_TABLE_ID_SSDT);</div><div class='add'>+	(void)acpi_ns_load_table_by_type(ACPI_TABLE_ID_PSDT);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,</div><div class='ctx'> 			      "ACPI Namespace successfully loaded at root %p\n",</div><div class='hunk'>@@ -314,7 +315,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)</div><div class='ctx'> 	acpi_handle dummy;</div><div class='ctx'> 	u32 level;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_delete_subtree");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_delete_subtree);</div><div class='ctx'> </div><div class='ctx'> 	parent_handle = start_handle;</div><div class='ctx'> 	child_handle = NULL;</div><div class='hunk'>@@ -325,6 +326,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)</div><div class='ctx'> 	 * to where we started.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (level &gt; 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Attempt to get the next object in this scope */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_get_next_object(ACPI_TYPE_ANY, parent_handle,</div><div class='hunk'>@@ -335,6 +337,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)</div><div class='ctx'> 		/* Did we get a new object? */</div><div class='ctx'> </div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Check if this object has any children */</div><div class='ctx'> </div><div class='ctx'> 			if (ACPI_SUCCESS</div><div class='hunk'>@@ -392,7 +395,7 @@ acpi_status acpi_ns_unload_namespace(acpi_handle handle)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_unload_name_space");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_unload_name_space);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c<br/>index 639f653b4b6b..97b8332c9746 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsnames.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsnames.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsnames.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsnames.c</a></div><div class='hunk'>@@ -48,11 +48,6 @@</div><div class='ctx'> #define _COMPONENT          ACPI_NAMESPACE</div><div class='ctx'> ACPI_MODULE_NAME("nsnames")</div><div class='ctx'> </div><div class='del'>-/* Local prototypes */</div><div class='del'>-static void</div><div class='del'>-acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='del'>-			    acpi_size size, char *name_buffer);</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ns_build_external_path</div><div class='hunk'>@@ -67,8 +62,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='ctx'>  * DESCRIPTION: Generate a full pathaname</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> acpi_ns_build_external_path(struct acpi_namespace_node *node,</div><div class='ctx'> 			    acpi_size size, char *name_buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -138,7 +132,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)</div><div class='ctx'> 	char *name_buffer;</div><div class='ctx'> 	acpi_size size;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_get_external_pathname", node);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_get_external_pathname, node);</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate required buffer size based on depth below root */</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +140,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a buffer to be returned to caller */</div><div class='ctx'> </div><div class='del'>-	name_buffer = ACPI_MEM_CALLOCATE(size);</div><div class='add'>+	name_buffer = ACPI_ALLOCATE_ZEROED(size);</div><div class='ctx'> 	if (!name_buffer) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Allocation failure"));</div><div class='ctx'> 		return_PTR(NULL);</div><div class='hunk'>@@ -219,7 +213,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	acpi_size required_size;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_handle_to_pathname", target_handle);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_handle_to_pathname, target_handle);</div><div class='ctx'> </div><div class='ctx'> 	node = acpi_ns_map_handle_to_node(target_handle);</div><div class='ctx'> 	if (!node) {</div><div class='head'>diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c<br/>index 10ae6292bca4..aabe8794b908 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsobject.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsobject.c</a></div><div class='hunk'>@@ -76,19 +76,21 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,</div><div class='ctx'> 	union acpi_operand_object *last_obj_desc;</div><div class='ctx'> 	acpi_object_type object_type = ACPI_TYPE_ANY;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_attach_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_attach_object);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Parameter validation</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!node) {</div><div class='add'>+</div><div class='ctx'> 		/* Invalid handle */</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((AE_INFO, "Null named_obj handle"));</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Null NamedObj handle"));</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!object &amp;&amp; (ACPI_TYPE_ANY != type)) {</div><div class='add'>+</div><div class='ctx'> 		/* Null object */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -97,6 +99,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {</div><div class='add'>+</div><div class='ctx'> 		/* Not a name handle */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Invalid handle %p [%s]",</div><div class='hunk'>@@ -108,7 +111,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,</div><div class='ctx'> </div><div class='ctx'> 	if (node-&gt;object == object) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-				  "Obj %p already installed in name_obj %p\n",</div><div class='add'>+				  "Obj %p already installed in NameObj %p\n",</div><div class='ctx'> 				  object, node));</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='hunk'>@@ -201,7 +204,7 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_detach_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_detach_object);</div><div class='ctx'> </div><div class='ctx'> 	obj_desc = node-&gt;object;</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct</div><div class='ctx'> 						       acpi_namespace_node</div><div class='ctx'> 						       *node)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_get_attached_object, node);</div><div class='ctx'> </div><div class='ctx'> 	if (!node) {</div><div class='ctx'> 		ACPI_WARNING((AE_INFO, "Null Node ptr"));</div><div class='hunk'>@@ -287,7 +290,7 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union</div><div class='ctx'> 							acpi_operand_object</div><div class='ctx'> 							*obj_desc)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_get_secondary_object", obj_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_get_secondary_object, obj_desc);</div><div class='ctx'> </div><div class='ctx'> 	if ((!obj_desc) ||</div><div class='ctx'> 	    (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_DATA) ||</div><div class='head'>diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c<br/>index 232be4303653..155505a4ef69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsparse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsparse.c</a></div><div class='hunk'>@@ -62,13 +62,13 @@ ACPI_MODULE_NAME("nsparse")</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc * table_desc)</div><div class='add'>+acpi_ns_one_complete_parse(u8 pass_number, struct acpi_table_desc *table_desc)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_parse_object *parse_root;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_walk_state *walk_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_one_complete_parse");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_one_complete_parse);</div><div class='ctx'> </div><div class='ctx'> 	/* Create and init a Root Node */</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,7 @@ acpi_ns_parse_table(struct acpi_table_desc *table_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_parse_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_parse_table);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * AML Parse, pass 1</div><div class='head'>diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c<br/>index d64b78952f24..500e2bbcfaf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nssearch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nssearch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nssearch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nssearch.c</a></div><div class='hunk'>@@ -56,16 +56,16 @@ acpi_ns_search_parent_tree(u32 target_name,</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ns_search_node</div><div class='add'>+ * FUNCTION:    acpi_ns_search_one_scope</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  target_name     - Ascii ACPI name to search for</div><div class='del'>- *              Node            - Starting node where search will begin</div><div class='add'>+ *              parent_node     - Starting node where search will begin</div><div class='ctx'>  *              Type            - Object type to match</div><div class='ctx'>  *              return_node     - Where the matched Named obj is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Search a single level of the namespace.  Performs a</div><div class='add'>+ * DESCRIPTION: Search a single level of the namespace. Performs a</div><div class='ctx'>  *              simple search of the specified level, and does not add</div><div class='ctx'>  *              entries or search parents.</div><div class='ctx'>  *</div><div class='hunk'>@@ -75,35 +75,40 @@ acpi_ns_search_parent_tree(u32 target_name,</div><div class='ctx'>  *</div><div class='ctx'>  *      All namespace searching is linear in this implementation, but</div><div class='ctx'>  *      could be easily modified to support any improved search</div><div class='del'>- *      algorithm.  However, the linear search was chosen for simplicity</div><div class='add'>+ *      algorithm. However, the linear search was chosen for simplicity</div><div class='ctx'>  *      and because the trees are small and the other interpreter</div><div class='ctx'>  *      execution overhead is relatively high.</div><div class='ctx'>  *</div><div class='add'>+ *      Note: CPU execution analysis has shown that the AML interpreter spends</div><div class='add'>+ *      a very small percentage of its time searching the namespace. Therefore,</div><div class='add'>+ *      the linear search seems to be sufficient, as there would seem to be</div><div class='add'>+ *      little value in improving the search.</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_ns_search_node(u32 target_name,</div><div class='del'>-		    struct acpi_namespace_node *node,</div><div class='del'>-		    acpi_object_type type,</div><div class='del'>-		    struct acpi_namespace_node **return_node)</div><div class='add'>+acpi_ns_search_one_scope(u32 target_name,</div><div class='add'>+			 struct acpi_namespace_node *parent_node,</div><div class='add'>+			 acpi_object_type type,</div><div class='add'>+			 struct acpi_namespace_node **return_node)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_namespace_node *next_node;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_search_node");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_search_one_scope);</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_DEBUG_OUTPUT</div><div class='ctx'> 	if (ACPI_LV_NAMES &amp; acpi_dbg_level) {</div><div class='ctx'> 		char *scope_name;</div><div class='ctx'> </div><div class='del'>-		scope_name = acpi_ns_get_external_pathname(node);</div><div class='add'>+		scope_name = acpi_ns_get_external_pathname(parent_node);</div><div class='ctx'> 		if (scope_name) {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='ctx'> 					  "Searching %s (%p) For [%4.4s] (%s)\n",</div><div class='del'>-					  scope_name, node, ACPI_CAST_PTR(char,</div><div class='del'>-									  &amp;target_name),</div><div class='add'>+					  scope_name, parent_node,</div><div class='add'>+					  ACPI_CAST_PTR(char, &amp;target_name),</div><div class='ctx'> 					  acpi_ut_get_type_name(type)));</div><div class='ctx'> </div><div class='del'>-			ACPI_MEM_FREE(scope_name);</div><div class='add'>+			ACPI_FREE(scope_name);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -112,32 +117,33 @@ acpi_ns_search_node(u32 target_name,</div><div class='ctx'> 	 * Search for name at this namespace level, which is to say that we</div><div class='ctx'> 	 * must search for the name among the children of this object</div><div class='ctx'> 	 */</div><div class='del'>-	next_node = node-&gt;child;</div><div class='del'>-	while (next_node) {</div><div class='add'>+	node = parent_node-&gt;child;</div><div class='add'>+	while (node) {</div><div class='add'>+</div><div class='ctx'> 		/* Check for match against the name */</div><div class='ctx'> </div><div class='del'>-		if (next_node-&gt;name.integer == target_name) {</div><div class='add'>+		if (node-&gt;name.integer == target_name) {</div><div class='add'>+</div><div class='ctx'> 			/* Resolve a control method alias if any */</div><div class='ctx'> </div><div class='del'>-			if (acpi_ns_get_type(next_node) ==</div><div class='add'>+			if (acpi_ns_get_type(node) ==</div><div class='ctx'> 			    ACPI_TYPE_LOCAL_METHOD_ALIAS) {</div><div class='del'>-				next_node =</div><div class='add'>+				node =</div><div class='ctx'> 				    ACPI_CAST_PTR(struct acpi_namespace_node,</div><div class='del'>-						  next_node-&gt;object);</div><div class='add'>+						  node-&gt;object);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			 * Found matching entry.</div><div class='del'>-			 */</div><div class='add'>+			/* Found matching entry */</div><div class='add'>+</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='ctx'> 					  "Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",</div><div class='ctx'> 					  ACPI_CAST_PTR(char, &amp;target_name),</div><div class='del'>-					  acpi_ut_get_type_name(next_node-&gt;</div><div class='del'>-								type),</div><div class='del'>-					  next_node,</div><div class='del'>-					  acpi_ut_get_node_name(node), node));</div><div class='add'>+					  acpi_ut_get_type_name(node-&gt;type),</div><div class='add'>+					  node,</div><div class='add'>+					  acpi_ut_get_node_name(parent_node),</div><div class='add'>+					  parent_node));</div><div class='ctx'> </div><div class='del'>-			*return_node = next_node;</div><div class='add'>+			*return_node = node;</div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +151,8 @@ acpi_ns_search_node(u32 target_name,</div><div class='ctx'> 		 * The last entry in the list points back to the parent,</div><div class='ctx'> 		 * so a flag is used to indicate the end-of-list</div><div class='ctx'> 		 */</div><div class='del'>-		if (next_node-&gt;flags &amp; ANOBJ_END_OF_PEER_LIST) {</div><div class='add'>+		if (node-&gt;flags &amp; ANOBJ_END_OF_PEER_LIST) {</div><div class='add'>+</div><div class='ctx'> 			/* Searched entire list, we are done */</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='hunk'>@@ -153,7 +160,7 @@ acpi_ns_search_node(u32 target_name,</div><div class='ctx'> </div><div class='ctx'> 		/* Didn't match name, move on to the next peer object */</div><div class='ctx'> </div><div class='del'>-		next_node = next_node-&gt;peer;</div><div class='add'>+		node = node-&gt;peer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Searched entire namespace level, not found */</div><div class='hunk'>@@ -162,7 +169,8 @@ acpi_ns_search_node(u32 target_name,</div><div class='ctx'> 			  "Name [%4.4s] (%s) not found in search in scope [%4.4s] %p first child %p\n",</div><div class='ctx'> 			  ACPI_CAST_PTR(char, &amp;target_name),</div><div class='ctx'> 			  acpi_ut_get_type_name(type),</div><div class='del'>-			  acpi_ut_get_node_name(node), node, node-&gt;child));</div><div class='add'>+			  acpi_ut_get_node_name(parent_node), parent_node,</div><div class='add'>+			  parent_node-&gt;child));</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(AE_NOT_FOUND);</div><div class='ctx'> }</div><div class='hunk'>@@ -179,14 +187,14 @@ acpi_ns_search_node(u32 target_name,</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Called when a name has not been found in the current namespace</div><div class='del'>- *              level.  Before adding it or giving up, ACPI scope rules require</div><div class='add'>+ *              level. Before adding it or giving up, ACPI scope rules require</div><div class='ctx'>  *              searching enclosing scopes in cases identified by acpi_ns_local().</div><div class='ctx'>  *</div><div class='ctx'>  *              "A name is located by finding the matching name in the current</div><div class='ctx'>  *              name space, and then in the parent name space. If the parent</div><div class='ctx'>  *              name space does not contain the name, the search continues</div><div class='ctx'>  *              recursively until either the name is found or the name space</div><div class='del'>- *              does not have a parent (the root of the name space).  This</div><div class='add'>+ *              does not have a parent (the root of the name space). This</div><div class='ctx'>  *              indicates that the name is not found" (From ACPI Specification,</div><div class='ctx'>  *              section 5.3)</div><div class='ctx'>  *</div><div class='hunk'>@@ -201,7 +209,7 @@ acpi_ns_search_parent_tree(u32 target_name,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_namespace_node *parent_node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_search_parent_tree");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_search_parent_tree);</div><div class='ctx'> </div><div class='ctx'> 	parent_node = acpi_ns_get_parent_node(node);</div><div class='ctx'> </div><div class='hunk'>@@ -235,20 +243,19 @@ acpi_ns_search_parent_tree(u32 target_name,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (parent_node) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Search parent scope.  Use TYPE_ANY because we don't care about the</div><div class='add'>+		 * Search parent scope. Use TYPE_ANY because we don't care about the</div><div class='ctx'> 		 * object type at this point, we only care about the existence of</div><div class='del'>-		 * the actual name we are searching for.  Typechecking comes later.</div><div class='add'>+		 * the actual name we are searching for. Typechecking comes later.</div><div class='ctx'> 		 */</div><div class='del'>-		status = acpi_ns_search_node(target_name, parent_node,</div><div class='add'>+		status =</div><div class='add'>+		    acpi_ns_search_one_scope(target_name, parent_node,</div><div class='ctx'> 					     ACPI_TYPE_ANY, return_node);</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Not found here, go up another level</div><div class='del'>-		 * (until we reach the root)</div><div class='del'>-		 */</div><div class='add'>+		/* Not found here, go up another level (until we reach the root) */</div><div class='add'>+</div><div class='ctx'> 		parent_node = acpi_ns_get_parent_node(parent_node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +280,7 @@ acpi_ns_search_parent_tree(u32 target_name,</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Search for a name segment in a single namespace level,</div><div class='del'>- *              optionally adding it if it is not found.  If the passed</div><div class='add'>+ *              optionally adding it if it is not found. If the passed</div><div class='ctx'>  *              Type is not Any and the type previously stored in the</div><div class='ctx'>  *              entry was Any (i.e. unknown), update the stored type.</div><div class='ctx'>  *</div><div class='hunk'>@@ -293,29 +300,46 @@ acpi_ns_search_and_enter(u32 target_name,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_namespace_node *new_node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_search_and_enter");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_search_and_enter);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='ctx'> 	if (!node || !target_name || !return_node) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Null param: Node %p Name %X return_node %p",</div><div class='add'>+			    "Null parameter: Node %p Name %X ReturnNode %p",</div><div class='ctx'> 			    node, target_name, return_node));</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Name must consist of printable characters */</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * Name must consist of valid ACPI characters. We will repair the name if</div><div class='add'>+	 * necessary because we don't want to abort because of this, but we want</div><div class='add'>+	 * all namespace names to be printable. A warning message is appropriate.</div><div class='add'>+	 *</div><div class='add'>+	 * This issue came up because there are in fact machines that exhibit</div><div class='add'>+	 * this problem, and we want to be able to enable ACPI support for them,</div><div class='add'>+	 * even though there are a few bad names.</div><div class='add'>+	 */</div><div class='ctx'> 	if (!acpi_ut_valid_acpi_name(target_name)) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Bad character in ACPI Name: %X",</div><div class='del'>-			    target_name));</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_CHARACTER);</div><div class='add'>+		target_name = acpi_ut_repair_name(target_name);</div><div class='add'>+</div><div class='add'>+		/* Report warning only if in strict mode or debug mode */</div><div class='add'>+</div><div class='add'>+		if (!acpi_gbl_enable_interpreter_slack) {</div><div class='add'>+			ACPI_WARNING((AE_INFO,</div><div class='add'>+				      "Found bad character(s) in name, repaired: [%4.4s]\n",</div><div class='add'>+				      ACPI_CAST_PTR(char, &amp;target_name)));</div><div class='add'>+		} else {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='add'>+					  "Found bad character(s) in name, repaired: [%4.4s]\n",</div><div class='add'>+					  ACPI_CAST_PTR(char, &amp;target_name)));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Try to find the name in the namespace level specified by the caller */</div><div class='ctx'> </div><div class='ctx'> 	*return_node = ACPI_ENTRY_NOT_FOUND;</div><div class='del'>-	status = acpi_ns_search_node(target_name, node, type, return_node);</div><div class='add'>+	status = acpi_ns_search_one_scope(target_name, node, type, return_node);</div><div class='ctx'> 	if (status != AE_NOT_FOUND) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we found it AND the request specifies that a find is an error,</div><div class='hunk'>@@ -325,18 +349,16 @@ acpi_ns_search_and_enter(u32 target_name,</div><div class='ctx'> 			status = AE_ALREADY_EXISTS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Either found it or there was an error</div><div class='del'>-		 * -- finished either way</div><div class='del'>-		 */</div><div class='add'>+		/* Either found it or there was an error: finished either way */</div><div class='add'>+</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * The name was not found.  If we are NOT performing the first pass</div><div class='add'>+	 * The name was not found. If we are NOT performing the first pass</div><div class='ctx'> 	 * (name entry) of loading the namespace, search the parent tree (all the</div><div class='ctx'> 	 * way to the root if necessary.) We don't want to perform the parent</div><div class='del'>-	 * search when the namespace is actually being loaded.  We want to perform</div><div class='add'>+	 * search when the namespace is actually being loaded. We want to perform</div><div class='ctx'> 	 * the search when namespace references are being resolved (load pass 2)</div><div class='ctx'> 	 * and during the execution phase.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -354,9 +376,8 @@ acpi_ns_search_and_enter(u32 target_name,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * In execute mode, just search, never add names.  Exit now.</div><div class='del'>-	 */</div><div class='add'>+	/* In execute mode, just search, never add names. Exit now */</div><div class='add'>+</div><div class='ctx'> 	if (interpreter_mode == ACPI_IMODE_EXECUTE) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_NAMES,</div><div class='ctx'> 				  "%4.4s Not found in %p [Not adding]\n",</div><div class='hunk'>@@ -371,11 +392,18 @@ acpi_ns_search_and_enter(u32 target_name,</div><div class='ctx'> 	if (!new_node) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='add'>+#ifdef ACPI_ASL_COMPILER</div><div class='add'>+	/*</div><div class='add'>+	 * Node is an object defined by an External() statement</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; ACPI_NS_EXTERNAL) {</div><div class='add'>+		new_node-&gt;flags |= ANOBJ_IS_EXTERNAL;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Install the new object into the parent's list of children */</div><div class='ctx'> </div><div class='ctx'> 	acpi_ns_install_node(walk_state, node, new_node, type);</div><div class='ctx'> 	*return_node = new_node;</div><div class='del'>-</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c<br/>index 3e7cad549a38..aa4e799d9a8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsutils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsutils.c</a></div><div class='hunk'>@@ -78,15 +78,17 @@ acpi_ns_report_error(char *module_name,</div><div class='ctx'> 		     char *internal_name, acpi_status lookup_status)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	u32 bad_name;</div><div class='ctx'> 	char *name = NULL;</div><div class='ctx'> </div><div class='del'>-	acpi_ut_report_error(module_name, line_number);</div><div class='add'>+	acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);</div><div class='ctx'> </div><div class='ctx'> 	if (lookup_status == AE_BAD_CHARACTER) {</div><div class='add'>+</div><div class='ctx'> 		/* There is a non-ascii character in the name */</div><div class='ctx'> </div><div class='del'>-		acpi_os_printf("[0x%4.4X] (NON-ASCII)",</div><div class='del'>-			       *(ACPI_CAST_PTR(u32, internal_name)));</div><div class='add'>+		ACPI_MOVE_32_TO_32(&amp;bad_name, internal_name);</div><div class='add'>+		acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Convert path to external format */</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +104,7 @@ acpi_ns_report_error(char *module_name,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (name) {</div><div class='del'>-			ACPI_MEM_FREE(name);</div><div class='add'>+			ACPI_FREE(name);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -137,11 +139,12 @@ acpi_ns_report_method_error(char *module_name,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_namespace_node *node = prefix_node;</div><div class='ctx'> </div><div class='del'>-	acpi_ut_report_error(module_name, line_number);</div><div class='add'>+	acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);</div><div class='ctx'> </div><div class='ctx'> 	if (path) {</div><div class='del'>-		status = acpi_ns_get_node_by_path(path, prefix_node,</div><div class='del'>-						  ACPI_NS_NO_UPSEARCH, &amp;node);</div><div class='add'>+		status =</div><div class='add'>+		    acpi_ns_get_node(prefix_node, path, ACPI_NS_NO_UPSEARCH,</div><div class='add'>+				     &amp;node);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			acpi_os_printf("[Could not get node by pathname]");</div><div class='ctx'> 		}</div><div class='hunk'>@@ -185,7 +188,7 @@ acpi_ns_print_node_pathname(struct acpi_namespace_node *node, char *message)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		acpi_os_printf("[%s] (Node %p)", (char *)buffer.pointer, node);</div><div class='del'>-		ACPI_MEM_FREE(buffer.pointer);</div><div class='add'>+		ACPI_FREE(buffer.pointer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -239,7 +242,7 @@ static u8 acpi_ns_valid_path_separator(char sep)</div><div class='ctx'> </div><div class='ctx'> acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_get_type");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_get_type);</div><div class='ctx'> </div><div class='ctx'> 	if (!node) {</div><div class='ctx'> 		ACPI_WARNING((AE_INFO, "Null Node parameter"));</div><div class='hunk'>@@ -264,9 +267,10 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)</div><div class='ctx'> </div><div class='ctx'> u32 acpi_ns_local(acpi_object_type type)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_local");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_local);</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_ut_valid_object_type(type)) {</div><div class='add'>+</div><div class='ctx'> 		/* Type code out of range  */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));</div><div class='hunk'>@@ -363,7 +367,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)</div><div class='ctx'> 	char *result = NULL;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_build_internal_name");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_build_internal_name);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the correct prefixes, counts, and pointers */</div><div class='ctx'> </div><div class='hunk'>@@ -411,6 +415,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)</div><div class='ctx'> 		for (i = 0; i &lt; ACPI_NAME_SIZE; i++) {</div><div class='ctx'> 			if (acpi_ns_valid_path_separator(*external_name) ||</div><div class='ctx'> 			    (*external_name == 0)) {</div><div class='add'>+</div><div class='ctx'> 				/* Pad the segment with underscore(s) if segment is short */</div><div class='ctx'> </div><div class='ctx'> 				result[i] = '_';</div><div class='hunk'>@@ -473,7 +478,7 @@ acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)</div><div class='ctx'> 	struct acpi_namestring_info info;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_internalize_name");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_internalize_name);</div><div class='ctx'> </div><div class='ctx'> 	if ((!external_name) || (*external_name == 0) || (!converted_name)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -486,7 +491,7 @@ acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)</div><div class='ctx'> </div><div class='ctx'> 	/* We need a segment to store the internal  name */</div><div class='ctx'> </div><div class='del'>-	internal_name = ACPI_MEM_CALLOCATE(info.length);</div><div class='add'>+	internal_name = ACPI_ALLOCATE_ZEROED(info.length);</div><div class='ctx'> 	if (!internal_name) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -496,7 +501,7 @@ acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)</div><div class='ctx'> 	info.internal_name = internal_name;</div><div class='ctx'> 	status = acpi_ns_build_internal_name(&amp;info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_MEM_FREE(internal_name);</div><div class='add'>+		ACPI_FREE(internal_name);</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -533,7 +538,7 @@ acpi_ns_externalize_name(u32 internal_name_length,</div><div class='ctx'> 	acpi_native_uint i = 0;</div><div class='ctx'> 	acpi_native_uint j = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_externalize_name");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_externalize_name);</div><div class='ctx'> </div><div class='ctx'> 	if (!internal_name_length || !internal_name || !converted_name) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -628,7 +633,7 @@ acpi_ns_externalize_name(u32 internal_name_length,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Build converted_name</div><div class='ctx'> 	 */</div><div class='del'>-	*converted_name = ACPI_MEM_CALLOCATE(required_length);</div><div class='add'>+	*converted_name = ACPI_ALLOCATE_ZEROED(required_length);</div><div class='ctx'> 	if (!(*converted_name)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -681,13 +686,9 @@ struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle)</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Simple implementation.</div><div class='add'>+	 * Simple implementation</div><div class='ctx'> 	 */</div><div class='del'>-	if (!handle) {</div><div class='del'>-		return (NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (handle == ACPI_ROOT_OBJECT) {</div><div class='add'>+	if ((!handle) || (handle == ACPI_ROOT_OBJECT)) {</div><div class='ctx'> 		return (acpi_gbl_root_node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -697,7 +698,7 @@ struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle)</div><div class='ctx'> 		return (NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ((struct acpi_namespace_node *)handle);</div><div class='add'>+	return (ACPI_CAST_PTR(struct acpi_namespace_node, handle));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -752,7 +753,7 @@ void acpi_ns_terminate(void)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_terminate");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_terminate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * 1) Free the entire namespace -- all nodes and objects</div><div class='hunk'>@@ -792,9 +793,10 @@ void acpi_ns_terminate(void)</div><div class='ctx'> </div><div class='ctx'> u32 acpi_ns_opens_scope(acpi_object_type type)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ns_opens_scope", acpi_ut_get_type_name(type));</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ns_opens_scope, acpi_ut_get_type_name(type));</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_ut_valid_object_type(type)) {</div><div class='add'>+</div><div class='ctx'> 		/* type code out of range  */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));</div><div class='hunk'>@@ -806,12 +808,12 @@ u32 acpi_ns_opens_scope(acpi_object_type type)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ns_get_node_by_path</div><div class='add'>+ * FUNCTION:    acpi_ns_get_node</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  *Pathname   - Name to be found, in external (ASL) format. The</div><div class='ctx'>  *                            \ (backslash) and ^ (carat) prefixes, and the</div><div class='ctx'>  *                            . (period) to separate segments are supported.</div><div class='del'>- *              start_node  - Root of subtree to be searched, or NS_ALL for the</div><div class='add'>+ *              prefix_node  - Root of subtree to be searched, or NS_ALL for the</div><div class='ctx'>  *                            root of the name space.  If Name is fully</div><div class='ctx'>  *                            qualified (first s8 is '\'), the passed value</div><div class='ctx'>  *                            of Scope will not be accessed.</div><div class='hunk'>@@ -827,23 +829,29 @@ u32 acpi_ns_opens_scope(acpi_object_type type)</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_ns_get_node_by_path(char *pathname,</div><div class='del'>-			 struct acpi_namespace_node *start_node,</div><div class='del'>-			 u32 flags, struct acpi_namespace_node **return_node)</div><div class='add'>+acpi_ns_get_node(struct acpi_namespace_node *prefix_node,</div><div class='add'>+		 char *pathname,</div><div class='add'>+		 u32 flags, struct acpi_namespace_node **return_node)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state scope_info;</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	char *internal_path = NULL;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ns_get_node_by_path", pathname);</div><div class='add'>+	char *internal_path;</div><div class='ctx'> </div><div class='del'>-	if (pathname) {</div><div class='del'>-		/* Convert path to internal representation */</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ns_get_node, pathname);</div><div class='ctx'> </div><div class='del'>-		status = acpi_ns_internalize_name(pathname, &amp;internal_path);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='add'>+	if (!pathname) {</div><div class='add'>+		*return_node = prefix_node;</div><div class='add'>+		if (!prefix_node) {</div><div class='add'>+			*return_node = acpi_gbl_root_node;</div><div class='ctx'> 		}</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convert path to internal representation */</div><div class='add'>+</div><div class='add'>+	status = acpi_ns_internalize_name(pathname, &amp;internal_path);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Must lock namespace during lookup */</div><div class='hunk'>@@ -855,26 +863,23 @@ acpi_ns_get_node_by_path(char *pathname,</div><div class='ctx'> </div><div class='ctx'> 	/* Setup lookup scope (search starting point) */</div><div class='ctx'> </div><div class='del'>-	scope_info.scope.node = start_node;</div><div class='add'>+	scope_info.scope.node = prefix_node;</div><div class='ctx'> </div><div class='ctx'> 	/* Lookup the name in the namespace */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_lookup(&amp;scope_info, internal_path,</div><div class='del'>-				ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,</div><div class='del'>-				(flags | ACPI_NS_DONT_OPEN_SCOPE),</div><div class='del'>-				NULL, return_node);</div><div class='add'>+	status = acpi_ns_lookup(&amp;scope_info, internal_path, ACPI_TYPE_ANY,</div><div class='add'>+				ACPI_IMODE_EXECUTE,</div><div class='add'>+				(flags | ACPI_NS_DONT_OPEN_SCOPE), NULL,</div><div class='add'>+				return_node);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s, %s\n",</div><div class='del'>-				  internal_path,</div><div class='del'>-				  acpi_format_exception(status)));</div><div class='add'>+				  pathname, acpi_format_exception(status)));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> </div><div class='ctx'>       cleanup:</div><div class='del'>-	if (internal_path) {</div><div class='del'>-		ACPI_MEM_FREE(internal_path);</div><div class='del'>-	}</div><div class='add'>+	ACPI_FREE(internal_path);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -960,9 +965,10 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node * child_node)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_namespace_node *parent_node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_find_parent_name");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_find_parent_name);</div><div class='ctx'> </div><div class='ctx'> 	if (child_node) {</div><div class='add'>+</div><div class='ctx'> 		/* Valid entry.  Get the parent Node */</div><div class='ctx'> </div><div class='ctx'> 		parent_node = acpi_ns_get_parent_node(child_node);</div><div class='head'>diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c<br/>index fcab1e784b81..c8f6bef16ed0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nswalk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nswalk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nswalk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nswalk.c</a></div><div class='hunk'>@@ -76,6 +76,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='ctx'> 	if (!child_node) {</div><div class='add'>+</div><div class='ctx'> 		/* It's really the parent's _scope_ that we want */</div><div class='ctx'> </div><div class='ctx'> 		if (parent_node-&gt;child) {</div><div class='hunk'>@@ -92,6 +93,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,</div><div class='ctx'> 	/* If any type is OK, we are done */</div><div class='ctx'> </div><div class='ctx'> 	if (type == ACPI_TYPE_ANY) {</div><div class='add'>+</div><div class='ctx'> 		/* next_node is NULL if we are at the end-of-list */</div><div class='ctx'> </div><div class='ctx'> 		return (next_node);</div><div class='hunk'>@@ -100,6 +102,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,</div><div class='ctx'> 	/* Must search for the node -- but within this scope only */</div><div class='ctx'> </div><div class='ctx'> 	while (next_node) {</div><div class='add'>+</div><div class='ctx'> 		/* If type matches, we are done */</div><div class='ctx'> </div><div class='ctx'> 		if (next_node-&gt;type == type) {</div><div class='hunk'>@@ -161,7 +164,7 @@ acpi_ns_walk_namespace(acpi_object_type type,</div><div class='ctx'> 	acpi_object_type child_type;</div><div class='ctx'> 	u32 level;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ns_walk_namespace");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ns_walk_namespace);</div><div class='ctx'> </div><div class='ctx'> 	/* Special case for the namespace Root Node */</div><div class='ctx'> </div><div class='hunk'>@@ -182,6 +185,7 @@ acpi_ns_walk_namespace(acpi_object_type type,</div><div class='ctx'> 	 * bubbled up to (and passed) the original parent handle (start_entry)</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (level &gt; 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Get the next node in this scope.  Null if not found */</div><div class='ctx'> </div><div class='ctx'> 		status = AE_OK;</div><div class='head'>diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c<br/>index a95f636dc35d..dca6799ac678 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsxfeval.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsxfeval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsxfeval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsxfeval.c</a></div><div class='hunk'>@@ -42,8 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> #include &lt;acpi/acinterp.h&gt;</div><div class='hunk'>@@ -51,6 +49,7 @@</div><div class='ctx'> #define _COMPONENT          ACPI_NAMESPACE</div><div class='ctx'> ACPI_MODULE_NAME("nsxfeval")</div><div class='ctx'> </div><div class='add'>+#ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_evaluate_object_typed</div><div class='hunk'>@@ -71,18 +70,17 @@ ACPI_MODULE_NAME("nsxfeval")</div><div class='ctx'>  *              be valid (non-null)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-#ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_evaluate_object_typed(acpi_handle handle,</div><div class='ctx'> 			   acpi_string pathname,</div><div class='del'>-			   struct acpi_object_list *external_params,</div><div class='del'>-			   struct acpi_buffer *return_buffer,</div><div class='add'>+			   struct acpi_object_list * external_params,</div><div class='add'>+			   struct acpi_buffer * return_buffer,</div><div class='ctx'> 			   acpi_object_type return_type)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u8 must_free = FALSE;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_evaluate_object_typed");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_evaluate_object_typed);</div><div class='ctx'> </div><div class='ctx'> 	/* Return buffer must be valid */</div><div class='ctx'> </div><div class='hunk'>@@ -110,6 +108,7 @@ acpi_evaluate_object_typed(acpi_handle handle,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (return_buffer-&gt;length == 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Error because caller specifically asked for a return value */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "No return value"));</div><div class='hunk'>@@ -131,15 +130,18 @@ acpi_evaluate_object_typed(acpi_handle handle,</div><div class='ctx'> 		    acpi_ut_get_type_name(return_type)));</div><div class='ctx'> </div><div class='ctx'> 	if (must_free) {</div><div class='add'>+</div><div class='ctx'> 		/* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */</div><div class='ctx'> </div><div class='del'>-		acpi_os_free(return_buffer-&gt;pointer);</div><div class='add'>+		ACPI_FREE(return_buffer-&gt;pointer);</div><div class='ctx'> 		return_buffer-&gt;pointer = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_buffer-&gt;length = 0;</div><div class='ctx'> 	return_ACPI_STATUS(AE_TYPE);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -161,7 +163,6 @@ acpi_evaluate_object_typed(acpi_handle handle,</div><div class='ctx'>  *              be valid (non-null)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 		     acpi_string pathname,</div><div class='hunk'>@@ -170,51 +171,61 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_status status2;</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='ctx'> 	acpi_size buffer_space_needed;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_evaluate_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_evaluate_object);</div><div class='ctx'> </div><div class='del'>-	info.node = handle;</div><div class='del'>-	info.parameters = NULL;</div><div class='del'>-	info.return_object = NULL;</div><div class='del'>-	info.parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	/* Allocate and initialize the evaluation information block */</div><div class='add'>+</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;pathname = pathname;</div><div class='add'>+	info-&gt;parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+</div><div class='add'>+	/* Convert and validate the device handle */</div><div class='add'>+</div><div class='add'>+	info-&gt;prefix_node = acpi_ns_map_handle_to_node(handle);</div><div class='add'>+	if (!info-&gt;prefix_node) {</div><div class='add'>+		status = AE_BAD_PARAMETER;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If there are parameters to be passed to the object</div><div class='del'>-	 * (which must be a control method), the external objects</div><div class='del'>-	 * must be converted to internal objects</div><div class='add'>+	 * If there are parameters to be passed to a control method, the external</div><div class='add'>+	 * objects must all be converted to internal objects</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (external_params &amp;&amp; external_params-&gt;count) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Allocate a new parameter block for the internal objects</div><div class='ctx'> 		 * Add 1 to count to allow for null terminated internal list</div><div class='ctx'> 		 */</div><div class='del'>-		info.parameters = ACPI_MEM_CALLOCATE(((acpi_size)</div><div class='del'>-						      external_params-&gt;count +</div><div class='del'>-						      1) * sizeof(void *));</div><div class='del'>-		if (!info.parameters) {</div><div class='del'>-			return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+		info-&gt;parameters = ACPI_ALLOCATE_ZEROED(((acpi_size)</div><div class='add'>+							 external_params-&gt;</div><div class='add'>+							 count +</div><div class='add'>+							 1) * sizeof(void *));</div><div class='add'>+		if (!info-&gt;parameters) {</div><div class='add'>+			status = AE_NO_MEMORY;</div><div class='add'>+			goto cleanup;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Convert each external object in the list to an</div><div class='del'>-		 * internal object</div><div class='del'>-		 */</div><div class='add'>+		/* Convert each external object in the list to an internal object */</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; external_params-&gt;count; i++) {</div><div class='ctx'> 			status =</div><div class='ctx'> 			    acpi_ut_copy_eobject_to_iobject(&amp;external_params-&gt;</div><div class='ctx'> 							    pointer[i],</div><div class='del'>-							    &amp;info.</div><div class='add'>+							    &amp;info-&gt;</div><div class='ctx'> 							    parameters[i]);</div><div class='ctx'> 			if (ACPI_FAILURE(status)) {</div><div class='del'>-				acpi_ut_delete_internal_object_list(info.</div><div class='del'>-								    parameters);</div><div class='del'>-				return_ACPI_STATUS(status);</div><div class='add'>+				goto cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		info.parameters[external_params-&gt;count] = NULL;</div><div class='add'>+		info-&gt;parameters[external_params-&gt;count] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -224,43 +235,31 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 	 * 3) Valid handle</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((pathname) &amp;&amp; (acpi_ns_valid_root_prefix(pathname[0]))) {</div><div class='del'>-		/*</div><div class='del'>-		 *  The path is fully qualified, just evaluate by name</div><div class='del'>-		 */</div><div class='del'>-		status = acpi_ns_evaluate_by_name(pathname, &amp;info);</div><div class='add'>+</div><div class='add'>+		/* The path is fully qualified, just evaluate by name */</div><div class='add'>+</div><div class='add'>+		info-&gt;prefix_node = NULL;</div><div class='add'>+		status = acpi_ns_evaluate(info);</div><div class='ctx'> 	} else if (!handle) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * A handle is optional iff a fully qualified pathname</div><div class='del'>-		 * is specified.  Since we've already handled fully</div><div class='del'>-		 * qualified names above, this is an error</div><div class='add'>+		 * A handle is optional iff a fully qualified pathname is specified.</div><div class='add'>+		 * Since we've already handled fully qualified names above, this is</div><div class='add'>+		 * an error</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!pathname) {</div><div class='del'>-			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Both Handle and Pathname are NULL"));</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='add'>+					  "Both Handle and Pathname are NULL"));</div><div class='ctx'> 		} else {</div><div class='del'>-			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "Handle is NULL and Pathname is relative"));</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='add'>+					  "Null Handle with relative pathname [%s]",</div><div class='add'>+					  pathname));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		status = AE_BAD_PARAMETER;</div><div class='ctx'> 	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * We get here if we have a handle -- and if we have a</div><div class='del'>-		 * pathname it is relative.  The handle will be validated</div><div class='del'>-		 * in the lower procedures</div><div class='del'>-		 */</div><div class='del'>-		if (!pathname) {</div><div class='del'>-			/*</div><div class='del'>-			 * The null pathname case means the handle is for</div><div class='del'>-			 * the actual object to be evaluated</div><div class='del'>-			 */</div><div class='del'>-			status = acpi_ns_evaluate_by_handle(&amp;info);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * Both a Handle and a relative Pathname</div><div class='del'>-			 */</div><div class='del'>-			status = acpi_ns_evaluate_relative(pathname, &amp;info);</div><div class='del'>-		}</div><div class='add'>+		/* We have a namespace a node and a possible relative path */</div><div class='add'>+</div><div class='add'>+		status = acpi_ns_evaluate(info);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -268,10 +267,10 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 	 * copy the return value to an external object.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (return_buffer) {</div><div class='del'>-		if (!info.return_object) {</div><div class='add'>+		if (!info-&gt;return_object) {</div><div class='ctx'> 			return_buffer-&gt;length = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (ACPI_GET_DESCRIPTOR_TYPE(info.return_object) ==</div><div class='add'>+			if (ACPI_GET_DESCRIPTOR_TYPE(info-&gt;return_object) ==</div><div class='ctx'> 			    ACPI_DESC_TYPE_NAMED) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * If we received a NS Node as a return object, this means that</div><div class='hunk'>@@ -282,19 +281,19 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 				 * support for various types at a later date if necessary.</div><div class='ctx'> 				 */</div><div class='ctx'> 				status = AE_TYPE;</div><div class='del'>-				info.return_object = NULL;	/* No need to delete a NS Node */</div><div class='add'>+				info-&gt;return_object = NULL;	/* No need to delete a NS Node */</div><div class='ctx'> 				return_buffer-&gt;length = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (ACPI_SUCCESS(status)) {</div><div class='del'>-				/*</div><div class='del'>-				 * Find out how large a buffer is needed</div><div class='del'>-				 * to contain the returned object</div><div class='del'>-				 */</div><div class='add'>+</div><div class='add'>+				/* Get the size of the returned object */</div><div class='add'>+</div><div class='ctx'> 				status =</div><div class='del'>-				    acpi_ut_get_object_size(info.return_object,</div><div class='add'>+				    acpi_ut_get_object_size(info-&gt;return_object,</div><div class='ctx'> 							    &amp;buffer_space_needed);</div><div class='ctx'> 				if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 					/* Validate/Allocate/Clear caller buffer */</div><div class='ctx'> </div><div class='ctx'> 					status =</div><div class='hunk'>@@ -303,7 +302,8 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 					     buffer_space_needed);</div><div class='ctx'> 					if (ACPI_FAILURE(status)) {</div><div class='ctx'> 						/*</div><div class='del'>-						 * Caller's buffer is too small or a new one can't be allocated</div><div class='add'>+						 * Caller's buffer is too small or a new one can't</div><div class='add'>+						 * be allocated</div><div class='ctx'> 						 */</div><div class='ctx'> 						ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 								  "Needed buffer size %X, %s\n",</div><div class='hunk'>@@ -312,12 +312,11 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 								  acpi_format_exception</div><div class='ctx'> 								  (status)));</div><div class='ctx'> 					} else {</div><div class='del'>-						/*</div><div class='del'>-						 *  We have enough space for the object, build it</div><div class='del'>-						 */</div><div class='add'>+						/* We have enough space for the object, build it */</div><div class='add'>+</div><div class='ctx'> 						status =</div><div class='ctx'> 						    acpi_ut_copy_iobject_to_eobject</div><div class='del'>-						    (info.return_object,</div><div class='add'>+						    (info-&gt;return_object,</div><div class='ctx'> 						     return_buffer);</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='hunk'>@@ -325,35 +324,37 @@ acpi_evaluate_object(acpi_handle handle,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info.return_object) {</div><div class='add'>+	if (info-&gt;return_object) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Delete the internal return object.  NOTE: Interpreter</div><div class='del'>-		 * must be locked to avoid race condition.</div><div class='add'>+		 * Delete the internal return object. NOTE: Interpreter must be</div><div class='add'>+		 * locked to avoid race condition.</div><div class='ctx'> 		 */</div><div class='ctx'> 		status2 = acpi_ex_enter_interpreter();</div><div class='ctx'> 		if (ACPI_SUCCESS(status2)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Delete the internal return object. (Or at least</div><div class='del'>-			 * decrement the reference count by one)</div><div class='del'>-			 */</div><div class='del'>-			acpi_ut_remove_reference(info.return_object);</div><div class='add'>+</div><div class='add'>+			/* Remove one reference on the return object (should delete it) */</div><div class='add'>+</div><div class='add'>+			acpi_ut_remove_reference(info-&gt;return_object);</div><div class='ctx'> 			acpi_ex_exit_interpreter();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Free the input parameter list (if we created one),</div><div class='del'>-	 */</div><div class='del'>-	if (info.parameters) {</div><div class='add'>+      cleanup:</div><div class='add'>+</div><div class='add'>+	/* Free the input parameter list (if we created one) */</div><div class='add'>+</div><div class='add'>+	if (info-&gt;parameters) {</div><div class='add'>+</div><div class='ctx'> 		/* Free the allocated parameter block */</div><div class='ctx'> </div><div class='del'>-		acpi_ut_delete_internal_object_list(info.parameters);</div><div class='add'>+		acpi_ut_delete_internal_object_list(info-&gt;parameters);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ACPI_FREE(info);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_evaluate_object);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_evaluate_object)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -384,7 +385,6 @@ EXPORT_SYMBOL(acpi_evaluate_object);</div><div class='ctx'>  *              function, etc.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_walk_namespace(acpi_object_type type,</div><div class='ctx'> 		    acpi_handle start_object,</div><div class='hunk'>@@ -394,7 +394,7 @@ acpi_walk_namespace(acpi_object_type type,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_walk_namespace");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_walk_namespace);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +421,7 @@ acpi_walk_namespace(acpi_object_type type,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_walk_namespace);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_walk_namespace)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -436,7 +436,6 @@ EXPORT_SYMBOL(acpi_walk_namespace);</div><div class='ctx'>  *              on that.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> static acpi_status</div><div class='ctx'> acpi_ns_get_device_callback(acpi_handle obj_handle,</div><div class='ctx'> 			    u32 nesting_level,</div><div class='hunk'>@@ -473,6 +472,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(flags &amp; ACPI_STA_DEVICE_PRESENT)) {</div><div class='add'>+</div><div class='ctx'> 		/* Don't examine children of the device if not present */</div><div class='ctx'> </div><div class='ctx'> 		return (AE_CTRL_DEPTH);</div><div class='hunk'>@@ -489,6 +489,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (ACPI_STRNCMP(hid.value, info-&gt;hid, sizeof(hid.value)) != 0) {</div><div class='add'>+</div><div class='ctx'> 			/* Get the list of Compatible IDs */</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_ut_execute_CID(node, &amp;cid);</div><div class='hunk'>@@ -505,11 +506,11 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,</div><div class='ctx'> 						 sizeof(struct</div><div class='ctx'> 							acpi_compatible_id)) !=</div><div class='ctx'> 				    0) {</div><div class='del'>-					ACPI_MEM_FREE(cid);</div><div class='add'>+					ACPI_FREE(cid);</div><div class='ctx'> 					return (AE_OK);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			ACPI_MEM_FREE(cid);</div><div class='add'>+			ACPI_FREE(cid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +552,7 @@ acpi_get_devices(char *HID,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_get_devices_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_devices");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_devices);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -563,9 +564,9 @@ acpi_get_devices(char *HID,</div><div class='ctx'> 	 * We're going to call their callback from OUR callback, so we need</div><div class='ctx'> 	 * to know what it is, and their context parameter.</div><div class='ctx'> 	 */</div><div class='add'>+	info.hid = HID;</div><div class='ctx'> 	info.context = context;</div><div class='ctx'> 	info.user_function = user_function;</div><div class='del'>-	info.hid = HID;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Lock the namespace around the walk.</div><div class='hunk'>@@ -578,9 +579,8 @@ acpi_get_devices(char *HID,</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_walk_namespace(ACPI_TYPE_DEVICE,</div><div class='del'>-					ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,</div><div class='del'>-					ACPI_NS_WALK_UNLOCK,</div><div class='add'>+	status = acpi_ns_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,</div><div class='add'>+					ACPI_UINT32_MAX, ACPI_NS_WALK_UNLOCK,</div><div class='ctx'> 					acpi_ns_get_device_callback, &amp;info,</div><div class='ctx'> 					return_value);</div><div class='ctx'> </div><div class='hunk'>@@ -588,7 +588,7 @@ acpi_get_devices(char *HID,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_devices);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_devices)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -603,7 +603,6 @@ EXPORT_SYMBOL(acpi_get_devices);</div><div class='ctx'>  * DESCRIPTION: Attach arbitrary data and handler to a namespace node.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_attach_data(acpi_handle obj_handle,</div><div class='ctx'> 		 acpi_object_handler handler, void *data)</div><div class='hunk'>@@ -637,6 +636,8 @@ acpi_attach_data(acpi_handle obj_handle,</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_attach_data)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_detach_data</div><div class='hunk'>@@ -649,7 +650,6 @@ acpi_attach_data(acpi_handle obj_handle,</div><div class='ctx'>  * DESCRIPTION: Remove data that was previously attached to a node.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_detach_data(acpi_handle obj_handle, acpi_object_handler handler)</div><div class='ctx'> {</div><div class='hunk'>@@ -682,6 +682,8 @@ acpi_detach_data(acpi_handle obj_handle, acpi_object_handler handler)</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_detach_data)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_data</div><div class='hunk'>@@ -695,7 +697,6 @@ acpi_detach_data(acpi_handle obj_handle, acpi_object_handler handler)</div><div class='ctx'>  * DESCRIPTION: Retrieve data that was previously attached to a namespace node.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_data(acpi_handle obj_handle, acpi_object_handler handler, void **data)</div><div class='ctx'> {</div><div class='hunk'>@@ -727,3 +728,5 @@ acpi_get_data(acpi_handle obj_handle, acpi_object_handler handler, void **data)</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_data)</div><div class='head'>diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c<br/>index 8cd8675a47c0..978213a6c19f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsxfname.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsxfname.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsxfname.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsxfname.c</a></div><div class='hunk'>@@ -42,8 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -114,9 +112,8 @@ acpi_get_handle(acpi_handle parent,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Find the Node and convert to a handle</div><div class='ctx'> 	 */</div><div class='del'>-	status =</div><div class='del'>-	    acpi_ns_get_node_by_path(pathname, prefix_node, ACPI_NS_NO_UPSEARCH,</div><div class='del'>-				     &amp;node);</div><div class='add'>+	status = acpi_ns_get_node(prefix_node, pathname, ACPI_NS_NO_UPSEARCH,</div><div class='add'>+				  &amp;node);</div><div class='ctx'> </div><div class='ctx'> 	*ret_handle = NULL;</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='hunk'>@@ -126,7 +123,7 @@ acpi_get_handle(acpi_handle parent,</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_handle);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_handle)</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -143,7 +140,6 @@ EXPORT_SYMBOL(acpi_get_handle);</div><div class='ctx'>  *              complementary functions.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -162,6 +158,7 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (name_type == ACPI_FULL_PATHNAME) {</div><div class='add'>+</div><div class='ctx'> 		/* Get the full pathname (From the namespace root) */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ns_handle_to_pathname(handle, buffer);</div><div class='hunk'>@@ -203,7 +200,7 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_name);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_name)</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -219,7 +216,6 @@ EXPORT_SYMBOL(acpi_get_name);</div><div class='ctx'>  *              control methods (Such as in the case of a device.)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -241,7 +237,7 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)</div><div class='ctx'> 		return (status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info = ACPI_MEM_CALLOCATE(sizeof(struct acpi_device_info));</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_device_info));</div><div class='ctx'> 	if (!info) {</div><div class='ctx'> 		return (AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -345,11 +341,11 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       cleanup:</div><div class='del'>-	ACPI_MEM_FREE(info);</div><div class='add'>+	ACPI_FREE(info);</div><div class='ctx'> 	if (cid_list) {</div><div class='del'>-		ACPI_MEM_FREE(cid_list);</div><div class='add'>+		ACPI_FREE(cid_list);</div><div class='ctx'> 	}</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_object_info);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_object_info)</div><div class='head'>diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c<br/>index a0332595677a..a163e1d3708d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsxfobj.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/namespace/nsxfobj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/namespace/nsxfobj.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/namespace/nsxfobj.c</a></div><div class='hunk'>@@ -42,8 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +99,7 @@ acpi_status acpi_get_type(acpi_handle handle, acpi_object_type * ret_type)</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_type);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_type)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -116,7 +114,6 @@ EXPORT_SYMBOL(acpi_get_type);</div><div class='ctx'>  *              Handle.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='hunk'>@@ -162,7 +159,7 @@ acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_parent);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_parent)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -181,7 +178,6 @@ EXPORT_SYMBOL(acpi_get_parent);</div><div class='ctx'>  *              Scope is returned.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_next_object(acpi_object_type type,</div><div class='ctx'> 		     acpi_handle parent,</div><div class='hunk'>@@ -206,6 +202,7 @@ acpi_get_next_object(acpi_object_type type,</div><div class='ctx'> 	/* If null handle, use the parent */</div><div class='ctx'> </div><div class='ctx'> 	if (!child) {</div><div class='add'>+</div><div class='ctx'> 		/* Start search at the beginning of the specified scope */</div><div class='ctx'> </div><div class='ctx'> 		parent_node = acpi_ns_map_handle_to_node(parent);</div><div class='hunk'>@@ -242,4 +239,4 @@ acpi_get_next_object(acpi_object_type type,</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_next_object);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_next_object)</div><div class='head'>diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c<br/>index 64b98e82feb7..e5e448edca41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/numa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/numa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/numa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/numa.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -36,12 +35,60 @@</div><div class='ctx'> #define _COMPONENT	ACPI_NUMA</div><div class='ctx'> ACPI_MODULE_NAME("numa")</div><div class='ctx'> </div><div class='add'>+static nodemask_t nodes_found_map = NODE_MASK_NONE;</div><div class='add'>+#define PXM_INVAL	-1</div><div class='add'>+#define NID_INVAL	-1</div><div class='add'>+</div><div class='add'>+/* maps to convert between proximity domain and logical node ID */</div><div class='add'>+int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]</div><div class='add'>+				= { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };</div><div class='add'>+int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]</div><div class='add'>+				= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };</div><div class='add'>+</div><div class='ctx'> extern int __init acpi_table_parse_madt_family(enum acpi_table_id id,</div><div class='ctx'> 					       unsigned long madt_size,</div><div class='ctx'> 					       int entry_id,</div><div class='ctx'> 					       acpi_madt_entry_handler handler,</div><div class='ctx'> 					       unsigned int max_entries);</div><div class='ctx'> </div><div class='add'>+int __cpuinit pxm_to_node(int pxm)</div><div class='add'>+{</div><div class='add'>+	if (pxm &lt; 0)</div><div class='add'>+		return NID_INVAL;</div><div class='add'>+	return pxm_to_node_map[pxm];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __cpuinit node_to_pxm(int node)</div><div class='add'>+{</div><div class='add'>+	if (node &lt; 0)</div><div class='add'>+		return PXM_INVAL;</div><div class='add'>+	return node_to_pxm_map[node];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __cpuinit acpi_map_pxm_to_node(int pxm)</div><div class='add'>+{</div><div class='add'>+	int node = pxm_to_node_map[pxm];</div><div class='add'>+</div><div class='add'>+	if (node &lt; 0){</div><div class='add'>+		if (nodes_weight(nodes_found_map) &gt;= MAX_NUMNODES)</div><div class='add'>+			return NID_INVAL;</div><div class='add'>+		node = first_unset_node(nodes_found_map);</div><div class='add'>+		pxm_to_node_map[pxm] = node;</div><div class='add'>+		node_to_pxm_map[node] = pxm;</div><div class='add'>+		node_set(node, nodes_found_map);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return node;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __cpuinit acpi_unmap_pxm_to_node(int node)</div><div class='add'>+{</div><div class='add'>+	int pxm = node_to_pxm_map[node];</div><div class='add'>+	pxm_to_node_map[pxm] = NID_INVAL;</div><div class='add'>+	node_to_pxm_map[node] = PXM_INVAL;</div><div class='add'>+	node_clear(node, nodes_found_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -206,5 +253,16 @@ int acpi_get_pxm(acpi_handle h)</div><div class='ctx'> 	} while (ACPI_SUCCESS(status));</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(acpi_get_pxm);</div><div class='add'>+</div><div class='add'>+int acpi_get_node(acpi_handle *handle)</div><div class='add'>+{</div><div class='add'>+	int pxm, node = -1;</div><div class='add'>+</div><div class='add'>+	pxm = acpi_get_pxm(handle);</div><div class='add'>+	if (pxm &gt;= 0)</div><div class='add'>+		node = acpi_map_pxm_to_node(pxm);</div><div class='add'>+</div><div class='add'>+	return node;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(acpi_get_node);</div><div class='head'>diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c<br/>index 13b5fd5854a8..b7d1514cd199 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/osl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/osl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/osl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/osl.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -136,22 +135,6 @@ void acpi_os_vprintf(const char *fmt, va_list args)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern int acpi_in_resume;</div><div class='del'>-void *acpi_os_allocate(acpi_size size)</div><div class='del'>-{</div><div class='del'>-	if (acpi_in_resume)</div><div class='del'>-		return kmalloc(size, GFP_ATOMIC);</div><div class='del'>-	else</div><div class='del'>-		return kmalloc(size, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void acpi_os_free(void *ptr)</div><div class='del'>-{</div><div class='del'>-	kfree(ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(acpi_os_free);</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (efi_enabled) {</div><div class='hunk'>@@ -279,7 +262,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,</div><div class='ctx'> </div><div class='ctx'> 	acpi_irq_handler = handler;</div><div class='ctx'> 	acpi_irq_context = context;</div><div class='del'>-	if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) {</div><div class='add'>+	if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {</div><div class='ctx'> 		printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);</div><div class='ctx'> 		return AE_NOT_ACQUIRED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -585,23 +568,36 @@ static void acpi_os_execute_deferred(void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_os_dpc *dpc = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("os_execute_deferred");</div><div class='ctx'> </div><div class='ctx'> 	dpc = (struct acpi_os_dpc *)context;</div><div class='ctx'> 	if (!dpc) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid (NULL) context.\n"));</div><div class='del'>-		return_VOID;</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid (NULL) context\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dpc-&gt;function(dpc-&gt;context);</div><div class='ctx'> </div><div class='ctx'> 	kfree(dpc);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_os_queue_for_execution(u32 priority,</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_os_execute</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Type               - Type of the callback</div><div class='add'>+ *              Function           - Function to be executed</div><div class='add'>+ *              Context            - Function parameters</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Depending on type, either queues function for deferred execution or</div><div class='add'>+ *              immediately executes function on a separate thread.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status acpi_os_execute(acpi_execute_type type,</div><div class='ctx'> 			    acpi_osd_exec_callback function, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='hunk'>@@ -650,7 +646,7 @@ acpi_os_queue_for_execution(u32 priority,</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_os_queue_for_execution);</div><div class='add'>+EXPORT_SYMBOL(acpi_os_execute);</div><div class='ctx'> </div><div class='ctx'> void acpi_os_wait_events_complete(void *context)</div><div class='ctx'> {</div><div class='hunk'>@@ -662,35 +658,19 @@ EXPORT_SYMBOL(acpi_os_wait_events_complete);</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate the memory for a spinlock and initialize it.</div><div class='ctx'>  */</div><div class='del'>-acpi_status acpi_os_create_lock(acpi_handle * out_handle)</div><div class='add'>+acpi_status acpi_os_create_lock(acpi_spinlock * handle)</div><div class='ctx'> {</div><div class='del'>-	spinlock_t *lock_ptr;</div><div class='add'>+	spin_lock_init(*handle);</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("os_create_lock");</div><div class='del'>-</div><div class='del'>-	lock_ptr = acpi_os_allocate(sizeof(spinlock_t));</div><div class='del'>-</div><div class='del'>-	spin_lock_init(lock_ptr);</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Creating spinlock[%p].\n", lock_ptr));</div><div class='del'>-</div><div class='del'>-	*out_handle = lock_ptr;</div><div class='del'>-</div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Deallocate the memory for a spinlock.</div><div class='ctx'>  */</div><div class='del'>-void acpi_os_delete_lock(acpi_handle handle)</div><div class='add'>+void acpi_os_delete_lock(acpi_spinlock handle)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("os_create_lock");</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting spinlock[%p].\n", handle));</div><div class='del'>-</div><div class='del'>-	acpi_os_free(handle);</div><div class='del'>-</div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='hunk'>@@ -698,11 +678,10 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct semaphore *sem = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("os_create_semaphore");</div><div class='ctx'> </div><div class='ctx'> 	sem = acpi_os_allocate(sizeof(struct semaphore));</div><div class='ctx'> 	if (!sem)</div><div class='del'>-		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+		return AE_NO_MEMORY;</div><div class='ctx'> 	memset(sem, 0, sizeof(struct semaphore));</div><div class='ctx'> </div><div class='ctx'> 	sema_init(sem, initial_units);</div><div class='hunk'>@@ -712,7 +691,7 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Creating semaphore[%p|%d].\n",</div><div class='ctx'> 			  *handle, initial_units));</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_os_create_semaphore);</div><div class='hunk'>@@ -728,17 +707,16 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct semaphore *sem = (struct semaphore *)handle;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("os_delete_semaphore");</div><div class='ctx'> </div><div class='ctx'> 	if (!sem)</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle));</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(sem);</div><div class='add'>+	kfree(sem);</div><div class='ctx'> 	sem = NULL;</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_os_delete_semaphore);</div><div class='hunk'>@@ -758,20 +736,16 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)</div><div class='ctx'> 	struct semaphore *sem = (struct semaphore *)handle;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("os_wait_semaphore");</div><div class='ctx'> </div><div class='ctx'> 	if (!sem || (units &lt; 1))</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	if (units &gt; 1)</div><div class='del'>-		return_ACPI_STATUS(AE_SUPPORT);</div><div class='add'>+		return AE_SUPPORT;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n",</div><div class='ctx'> 			  handle, units, timeout));</div><div class='ctx'> </div><div class='del'>-	if (in_atomic())</div><div class='del'>-		timeout = 0;</div><div class='del'>-</div><div class='ctx'> 	switch (timeout) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No Wait:</div><div class='hunk'>@@ -816,17 +790,17 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Failed to acquire semaphore[%p|%d|%d], %s\n",</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,</div><div class='add'>+				  "Failed to acquire semaphore[%p|%d|%d], %s",</div><div class='ctx'> 				  handle, units, timeout,</div><div class='ctx'> 				  acpi_format_exception(status)));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,</div><div class='del'>-				  "Acquired semaphore[%p|%d|%d]\n", handle,</div><div class='add'>+				  "Acquired semaphore[%p|%d|%d]", handle,</div><div class='ctx'> 				  units, timeout));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_os_wait_semaphore);</div><div class='hunk'>@@ -838,20 +812,19 @@ acpi_status acpi_os_signal_semaphore(acpi_handle handle, u32 units)</div><div class='ctx'> {</div><div class='ctx'> 	struct semaphore *sem = (struct semaphore *)handle;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("os_signal_semaphore");</div><div class='ctx'> </div><div class='ctx'> 	if (!sem || (units &lt; 1))</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	if (units &gt; 1)</div><div class='del'>-		return_ACPI_STATUS(AE_SUPPORT);</div><div class='add'>+		return AE_SUPPORT;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Signaling semaphore[%p|%d]\n", handle,</div><div class='ctx'> 			  units));</div><div class='ctx'> </div><div class='ctx'> 	up(sem);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_os_signal_semaphore);</div><div class='hunk'>@@ -896,14 +869,6 @@ u8 acpi_os_writable(void *ptr, acpi_size len)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-u32 acpi_os_get_thread_id(void)</div><div class='del'>-{</div><div class='del'>-	if (!in_atomic())</div><div class='del'>-		return current-&gt;pid;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_os_signal(u32 function, void *info)</div><div class='ctx'> {</div><div class='ctx'> 	switch (function) {</div><div class='hunk'>@@ -1028,10 +993,10 @@ EXPORT_SYMBOL(max_cstate);</div><div class='ctx'>  * handle is a pointer to the spinlock_t.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-acpi_cpu_flags acpi_os_acquire_lock(acpi_handle handle)</div><div class='add'>+acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock lockp)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_cpu_flags flags;</div><div class='del'>-	spin_lock_irqsave((spinlock_t *) handle, flags);</div><div class='add'>+	spin_lock_irqsave(lockp, flags);</div><div class='ctx'> 	return flags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1039,9 +1004,9 @@ acpi_cpu_flags acpi_os_acquire_lock(acpi_handle handle)</div><div class='ctx'>  * Release a spinlock. See above.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void acpi_os_release_lock(acpi_handle handle, acpi_cpu_flags flags)</div><div class='add'>+void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)</div><div class='ctx'> {</div><div class='del'>-	spin_unlock_irqrestore((spinlock_t *) handle, flags);</div><div class='add'>+	spin_unlock_irqrestore(lockp, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef ACPI_USE_LOCAL_CACHE</div><div class='hunk'>@@ -1050,12 +1015,12 @@ void acpi_os_release_lock(acpi_handle handle, acpi_cpu_flags flags)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_os_create_cache</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  CacheName       - Ascii name for the cache</div><div class='del'>- *              ObjectSize      - Size of each cached object</div><div class='del'>- *              MaxDepth        - Maximum depth of the cache (in objects)</div><div class='del'>- *              ReturnCache     - Where the new cache object is returned</div><div class='add'>+ * PARAMETERS:  name      - Ascii name for the cache</div><div class='add'>+ *              size      - Size of each cached object</div><div class='add'>+ *              depth     - Maximum depth of the cache (in objects) &lt;ignored&gt;</div><div class='add'>+ *              cache     - Where the new cache object is returned</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      Status</div><div class='add'>+ * RETURN:      status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Create a cache object</div><div class='ctx'>  *</div><div class='hunk'>@@ -1065,7 +1030,10 @@ acpi_status</div><div class='ctx'> acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)</div><div class='ctx'> {</div><div class='ctx'> 	*cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);</div><div class='del'>-	return AE_OK;</div><div class='add'>+	if (cache == NULL)</div><div class='add'>+		return AE_ERROR;</div><div class='add'>+	else</div><div class='add'>+		return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -1125,25 +1093,52 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object)</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*******************************************************************************</div><div class='add'>+/******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_os_acquire_object</div><div class='add'>+ * FUNCTION:    acpi_os_validate_interface</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Cache           - Handle to cache object</div><div class='del'>- *              ReturnObject    - Where the object is returned</div><div class='add'>+ * PARAMETERS:  interface           - Requested interface to be validated</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      Status</div><div class='add'>+ * RETURN:      AE_OK if interface is supported, AE_SUPPORT otherwise</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Get an object from the specified cache.  If cache is empty,</div><div class='del'>- *              the object is allocated.</div><div class='add'>+ * DESCRIPTION: Match an interface string to the interfaces supported by the</div><div class='add'>+ *              host. Strings originate from an AML call to the _OSI method.</div><div class='ctx'>  *</div><div class='del'>- ******************************************************************************/</div><div class='add'>+ *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-void *acpi_os_acquire_object(acpi_cache_t * cache)</div><div class='add'>+acpi_status</div><div class='add'>+acpi_os_validate_interface (char *interface)</div><div class='ctx'> {</div><div class='del'>-	void *object = kmem_cache_alloc(cache, GFP_KERNEL);</div><div class='del'>-	WARN_ON(!object);</div><div class='del'>-	return object;</div><div class='add'>+</div><div class='add'>+    return AE_SUPPORT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_os_validate_address</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  space_id             - ACPI space ID</div><div class='add'>+ *              address             - Physical address</div><div class='add'>+ *              length              - Address length</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      AE_OK if address/length is valid for the space_id. Otherwise,</div><div class='add'>+ *              should return AE_AML_ILLEGAL_ADDRESS.</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Validate a system address via the host OS. Used to validate</div><div class='add'>+ *              the addresses accessed by AML operation regions.</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_os_validate_address (</div><div class='add'>+    u8                   space_id,</div><div class='add'>+    acpi_physical_address   address,</div><div class='add'>+    acpi_size               length)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+    return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c<br/>index de573be52718..bf88e076c3e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psargs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psargs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psargs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psargs.c</a></div><div class='hunk'>@@ -79,7 +79,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)</div><div class='ctx'> 	acpi_native_uint byte_count;</div><div class='ctx'> 	u8 byte_zero_mask = 0x3F;	/* Default [0:5] */</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_get_next_package_length");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_get_next_package_length);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Byte 0 bits [6:7] contain the number of additional bytes</div><div class='hunk'>@@ -128,7 +128,7 @@ u8 *acpi_ps_get_next_package_end(struct acpi_parse_state *parser_state)</div><div class='ctx'> 	u8 *start = parser_state-&gt;aml;</div><div class='ctx'> 	u32 package_length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_get_next_package_end");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_get_next_package_end);</div><div class='ctx'> </div><div class='ctx'> 	/* Function below updates parser_state-&gt;Aml */</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +157,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)</div><div class='ctx'> 	u8 *start = parser_state-&gt;aml;</div><div class='ctx'> 	u8 *end = parser_state-&gt;aml;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_get_next_namestring");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_get_next_namestring);</div><div class='ctx'> </div><div class='ctx'> 	/* Point past any namestring prefix characters (backslash or carat) */</div><div class='ctx'> </div><div class='hunk'>@@ -237,7 +237,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	struct acpi_namespace_node *node;</div><div class='ctx'> 	union acpi_generic_state scope_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_get_next_namepath");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_get_next_namepath);</div><div class='ctx'> </div><div class='ctx'> 	path = acpi_ps_get_next_namestring(parser_state);</div><div class='ctx'> 	acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);</div><div class='hunk'>@@ -275,6 +275,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ACPI_SUCCESS(status) &amp;&amp;</div><div class='ctx'> 	    possible_method_call &amp;&amp; (node-&gt;type == ACPI_TYPE_METHOD)) {</div><div class='add'>+</div><div class='ctx'> 		/* This name is actually a control method invocation */</div><div class='ctx'> </div><div class='ctx'> 		method_desc = acpi_ns_get_attached_object(node);</div><div class='hunk'>@@ -319,6 +320,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	 * some not_found cases are allowed</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (status == AE_NOT_FOUND) {</div><div class='add'>+</div><div class='ctx'> 		/* 1) not_found is ok during load pass 1/2 (allow forward references) */</div><div class='ctx'> </div><div class='ctx'> 		if ((walk_state-&gt;parse_flags &amp; ACPI_PARSE_MODE_MASK) !=</div><div class='hunk'>@@ -354,6 +356,7 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 		if ((walk_state-&gt;parse_flags &amp; ACPI_PARSE_MODE_MASK) ==</div><div class='ctx'> 		    ACPI_PARSE_EXECUTE) {</div><div class='add'>+</div><div class='ctx'> 			/* Report a control method execution error */</div><div class='ctx'> </div><div class='ctx'> 			status = acpi_ds_method_error(status, walk_state);</div><div class='hunk'>@@ -388,7 +391,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,</div><div class='ctx'> 	u16 opcode;</div><div class='ctx'> 	u8 *aml = parser_state-&gt;aml;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ps_get_next_simple_arg", arg_type);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ps_get_next_simple_arg, arg_type);</div><div class='ctx'> </div><div class='ctx'> 	switch (arg_type) {</div><div class='ctx'> 	case ARGP_BYTEDATA:</div><div class='hunk'>@@ -453,7 +456,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid arg_type %X", arg_type));</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid ArgType %X", arg_type));</div><div class='ctx'> 		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -484,7 +487,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state</div><div class='ctx'> 	u16 opcode;</div><div class='ctx'> 	u32 name;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_get_next_field");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_get_next_field);</div><div class='ctx'> </div><div class='ctx'> 	/* Determine field type */</div><div class='ctx'> </div><div class='hunk'>@@ -590,7 +593,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	u32 subop;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_get_next_arg", parser_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_get_next_arg, parser_state);</div><div class='ctx'> </div><div class='ctx'> 	switch (arg_type) {</div><div class='ctx'> 	case ARGP_BYTEDATA:</div><div class='hunk'>@@ -620,6 +623,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	case ARGP_FIELDLIST:</div><div class='ctx'> </div><div class='ctx'> 		if (parser_state-&gt;aml &lt; parser_state-&gt;pkg_end) {</div><div class='add'>+</div><div class='ctx'> 			/* Non-empty list */</div><div class='ctx'> </div><div class='ctx'> 			while (parser_state-&gt;aml &lt; parser_state-&gt;pkg_end) {</div><div class='hunk'>@@ -645,6 +649,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	case ARGP_BYTELIST:</div><div class='ctx'> </div><div class='ctx'> 		if (parser_state-&gt;aml &lt; parser_state-&gt;pkg_end) {</div><div class='add'>+</div><div class='ctx'> 			/* Non-empty list */</div><div class='ctx'> </div><div class='ctx'> 			arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP);</div><div class='hunk'>@@ -673,6 +678,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 		if (subop == 0 ||</div><div class='ctx'> 		    acpi_ps_is_leading_char(subop) ||</div><div class='ctx'> 		    acpi_ps_is_prefix_char(subop)) {</div><div class='add'>+</div><div class='ctx'> 			/* null_name or name_string */</div><div class='ctx'> </div><div class='ctx'> 			arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);</div><div class='hunk'>@@ -703,6 +709,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	case ARGP_OBJLIST:</div><div class='ctx'> </div><div class='ctx'> 		if (parser_state-&gt;aml &lt; parser_state-&gt;pkg_end) {</div><div class='add'>+</div><div class='ctx'> 			/* Non-empty list of variable arguments, nothing returned */</div><div class='ctx'> </div><div class='ctx'> 			walk_state-&gt;arg_count = ACPI_VAR_ARGS;</div><div class='hunk'>@@ -711,7 +718,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid arg_type: %X", arg_type));</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid ArgType: %X", arg_type));</div><div class='ctx'> 		status = AE_AML_OPERAND_TYPE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c<br/>index 00b072e15d19..e1541db3753a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psloop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psloop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psloop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psloop.c</a></div><div class='hunk'>@@ -83,7 +83,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	struct acpi_parse_state *parser_state;</div><div class='ctx'> 	u8 *aml_op_start = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_parse_loop", walk_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_parse_loop, walk_state);</div><div class='ctx'> </div><div class='ctx'> 	if (walk_state-&gt;descending_callback == NULL) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -95,6 +95,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> #if (!defined (ACPI_NO_METHOD_EXECUTION) &amp;&amp; !defined (ACPI_CONSTANT_EVAL_ONLY))</div><div class='ctx'> </div><div class='ctx'> 	if (walk_state-&gt;walk_type &amp; ACPI_WALK_METHOD_RESTART) {</div><div class='add'>+</div><div class='ctx'> 		/* We are restarting a preempted control method */</div><div class='ctx'> </div><div class='ctx'> 		if (acpi_ps_has_completed_scope(parser_state)) {</div><div class='hunk'>@@ -128,7 +129,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 					}</div><div class='ctx'> 					ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-							"get_predicate Failed"));</div><div class='add'>+							"GetPredicate Failed"));</div><div class='ctx'> 					return_ACPI_STATUS(status);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -143,6 +144,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='ctx'> 					  "Popped scope, Op=%p\n", op));</div><div class='ctx'> 		} else if (walk_state-&gt;prev_op) {</div><div class='add'>+</div><div class='ctx'> 			/* We were in the middle of an op */</div><div class='ctx'> </div><div class='ctx'> 			op = walk_state-&gt;prev_op;</div><div class='hunk'>@@ -156,6 +158,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	while ((parser_state-&gt;aml &lt; parser_state-&gt;aml_end) || (op)) {</div><div class='ctx'> 		aml_op_start = parser_state-&gt;aml;</div><div class='ctx'> 		if (!op) {</div><div class='add'>+</div><div class='ctx'> 			/* Get the next opcode from the AML stream */</div><div class='ctx'> </div><div class='ctx'> 			walk_state-&gt;aml_offset =</div><div class='hunk'>@@ -213,6 +216,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			/* Create Op structure and append to parent's argument list */</div><div class='ctx'> </div><div class='ctx'> 			if (walk_state-&gt;op_info-&gt;flags &amp; AML_NAMED) {</div><div class='add'>+</div><div class='ctx'> 				/* Allocate a new pre_op if necessary */</div><div class='ctx'> </div><div class='ctx'> 				if (!pre_op) {</div><div class='hunk'>@@ -371,7 +375,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 			if (walk_state-&gt;op_info) {</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-						  "Opcode %4.4X [%s] Op %p Aml %p aml_offset %5.5X\n",</div><div class='add'>+						  "Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",</div><div class='ctx'> 						  (u32) op-&gt;common.aml_opcode,</div><div class='ctx'> 						  walk_state-&gt;op_info-&gt;name, op,</div><div class='ctx'> 						  parser_state-&gt;aml,</div><div class='hunk'>@@ -388,6 +392,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		/* Are there any arguments that must be processed? */</div><div class='ctx'> </div><div class='ctx'> 		if (walk_state-&gt;arg_types) {</div><div class='add'>+</div><div class='ctx'> 			/* Get arguments */</div><div class='ctx'> </div><div class='ctx'> 			switch (op-&gt;common.aml_opcode) {</div><div class='hunk'>@@ -742,7 +747,19 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 					if (ACPI_FAILURE(status2)) {</div><div class='ctx'> 						return_ACPI_STATUS(status2);</div><div class='ctx'> 					}</div><div class='add'>+</div><div class='add'>+					status2 =</div><div class='add'>+					    acpi_ds_result_stack_pop</div><div class='add'>+					    (walk_state);</div><div class='add'>+					if (ACPI_FAILURE(status2)) {</div><div class='add'>+						return_ACPI_STATUS(status2);</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					acpi_ut_delete_generic_state</div><div class='add'>+					    (acpi_ut_pop_generic_state</div><div class='add'>+					     (&amp;walk_state-&gt;control_state));</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='ctx'> 				acpi_ps_pop_scope(parser_state, &amp;op,</div><div class='ctx'> 						  &amp;walk_state-&gt;arg_types,</div><div class='ctx'> 						  &amp;walk_state-&gt;arg_count);</div><div class='hunk'>@@ -762,6 +779,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 						return_ACPI_STATUS(status2);</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='ctx'> 				acpi_ps_pop_scope(parser_state, &amp;op,</div><div class='ctx'> 						  &amp;walk_state-&gt;arg_types,</div><div class='ctx'> 						  &amp;walk_state-&gt;arg_count);</div><div class='hunk'>@@ -853,6 +871,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				else if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 					/* First error is most important */</div><div class='ctx'> </div><div class='ctx'> 					(void)</div><div class='head'>diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c<br/>index 11d6351ab8b2..4bd25e32769f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psopcode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psopcode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psopcode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psopcode.c</a></div><div class='hunk'>@@ -725,12 +725,13 @@ static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {</div><div class='ctx'> </div><div class='ctx'> const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ps_get_opcode_info");</div><div class='add'>+	ACPI_FUNCTION_NAME(ps_get_opcode_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Detect normal 8-bit opcode or extended 16-bit opcode</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(opcode &amp; 0xFF00)) {</div><div class='add'>+</div><div class='ctx'> 		/* Simple (8-bit) opcode: 0-255, can't index beyond table  */</div><div class='ctx'> </div><div class='ctx'> 		return (&amp;acpi_gbl_aml_op_info</div><div class='hunk'>@@ -739,6 +740,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)</div><div class='ctx'> </div><div class='ctx'> 	if (((opcode &amp; 0xFF00) == AML_EXTENDED_OPCODE) &amp;&amp;</div><div class='ctx'> 	    (((u8) opcode) &lt;= MAX_EXTENDED_OPCODE)) {</div><div class='add'>+</div><div class='ctx'> 		/* Valid extended (16-bit) opcode */</div><div class='ctx'> </div><div class='ctx'> 		return (&amp;acpi_gbl_aml_op_info</div><div class='hunk'>@@ -779,7 +781,7 @@ char *acpi_ps_get_opcode_name(u16 opcode)</div><div class='ctx'> 	return (op-&gt;name);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='del'>-	return ("AE_NOT_CONFIGURED");</div><div class='add'>+	return ("OpcodeName unavailable");</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c<br/>index a9f3229f4106..a02aa62fe1e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psparse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psparse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psparse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psparse.c</a></div><div class='hunk'>@@ -106,6 +106,7 @@ u16 acpi_ps_peek_opcode(struct acpi_parse_state * parser_state)</div><div class='ctx'> 	opcode = (u16) ACPI_GET8(aml);</div><div class='ctx'> </div><div class='ctx'> 	if (opcode == AML_EXTENDED_OP_PREFIX) {</div><div class='add'>+</div><div class='ctx'> 		/* Extended opcode, get the second opcode byte */</div><div class='ctx'> </div><div class='ctx'> 		aml++;</div><div class='hunk'>@@ -137,7 +138,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 	const struct acpi_opcode_info *parent_info;</div><div class='ctx'> 	union acpi_parse_object *replacement_op = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_complete_this_op", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_complete_this_op, op);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for null Op, can happen if AML code is corrupt */</div><div class='ctx'> </div><div class='hunk'>@@ -158,6 +159,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 	if (op-&gt;common.parent) {</div><div class='ctx'> 		prev = op-&gt;common.parent-&gt;common.value.arg;</div><div class='ctx'> 		if (!prev) {</div><div class='add'>+</div><div class='ctx'> 			/* Nothing more to do */</div><div class='ctx'> </div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -245,6 +247,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> 		/* We must unlink this op from the parent tree */</div><div class='ctx'> </div><div class='ctx'> 		if (prev == op) {</div><div class='add'>+</div><div class='ctx'> 			/* This op is the first in the list */</div><div class='ctx'> </div><div class='ctx'> 			if (replacement_op) {</div><div class='hunk'>@@ -265,6 +268,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state,</div><div class='ctx'> </div><div class='ctx'> 		else</div><div class='ctx'> 			while (prev) {</div><div class='add'>+</div><div class='ctx'> 				/* Traverse all siblings in the parent's argument list */</div><div class='ctx'> </div><div class='ctx'> 				next = prev-&gt;common.next;</div><div class='hunk'>@@ -329,7 +333,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,</div><div class='ctx'> 	struct acpi_parse_state *parser_state = &amp;walk_state-&gt;parser_state;</div><div class='ctx'> 	acpi_status status = AE_CTRL_PENDING;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_next_parse_state", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_next_parse_state, op);</div><div class='ctx'> </div><div class='ctx'> 	switch (callback_status) {</div><div class='ctx'> 	case AE_CTRL_TERMINATE:</div><div class='hunk'>@@ -449,10 +453,10 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 	struct acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list;</div><div class='ctx'> 	struct acpi_walk_state *previous_walk_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_parse_aml");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_parse_aml);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-			  "Entered with walk_state=%p Aml=%p size=%X\n",</div><div class='add'>+			  "Entered with WalkState=%p Aml=%p size=%X\n",</div><div class='ctx'> 			  walk_state, walk_state-&gt;parser_state.aml,</div><div class='ctx'> 			  walk_state-&gt;parser_state.aml_size));</div><div class='ctx'> </div><div class='hunk'>@@ -460,10 +464,21 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> </div><div class='ctx'> 	thread = acpi_ut_create_thread_state();</div><div class='ctx'> 	if (!thread) {</div><div class='add'>+		acpi_ds_delete_walk_state(walk_state);</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	walk_state-&gt;thread = thread;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If executing a method, the starting sync_level is this method's</div><div class='add'>+	 * sync_level</div><div class='add'>+	 */</div><div class='add'>+	if (walk_state-&gt;method_desc) {</div><div class='add'>+		walk_state-&gt;thread-&gt;current_sync_level =</div><div class='add'>+		    walk_state-&gt;method_desc-&gt;method.sync_level;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	acpi_ds_push_walk_state(walk_state, thread);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -500,6 +515,10 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			status =</div><div class='ctx'> 			    acpi_ds_call_control_method(thread, walk_state,</div><div class='ctx'> 							NULL);</div><div class='add'>+			if (ACPI_FAILURE(status)) {</div><div class='add'>+				status =</div><div class='add'>+				    acpi_ds_method_error(status, walk_state);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If the transfer to the new method method call worked, a new walk</div><div class='hunk'>@@ -510,6 +529,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		} else if (status == AE_CTRL_TERMINATE) {</div><div class='ctx'> 			status = AE_OK;</div><div class='ctx'> 		} else if ((status != AE_OK) &amp;&amp; (walk_state-&gt;method_desc)) {</div><div class='add'>+</div><div class='ctx'> 			/* Either the method parse or actual execution failed */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_ERROR_METHOD("Method parse/execution failed",</div><div class='hunk'>@@ -519,7 +539,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			/* Check for possible multi-thread reentrancy problem */</div><div class='ctx'> </div><div class='ctx'> 			if ((status == AE_ALREADY_EXISTS) &amp;&amp;</div><div class='del'>-			    (!walk_state-&gt;method_desc-&gt;method.semaphore)) {</div><div class='add'>+			    (!walk_state-&gt;method_desc-&gt;method.mutex)) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Method tried to create an object twice. The probable cause is</div><div class='ctx'> 				 * that the method cannot handle reentrancy.</div><div class='hunk'>@@ -531,7 +551,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 				 */</div><div class='ctx'> 				walk_state-&gt;method_desc-&gt;method.method_flags |=</div><div class='ctx'> 				    AML_METHOD_SERIALIZED;</div><div class='del'>-				walk_state-&gt;method_desc-&gt;method.concurrency = 1;</div><div class='add'>+				walk_state-&gt;method_desc-&gt;method.sync_level = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -550,20 +570,9 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (((walk_state-&gt;parse_flags &amp; ACPI_PARSE_MODE_MASK) ==</div><div class='ctx'> 		     ACPI_PARSE_EXECUTE) || (ACPI_FAILURE(status))) {</div><div class='del'>-			if (walk_state-&gt;method_desc) {</div><div class='del'>-				/* Decrement the thread count on the method parse tree */</div><div class='del'>-</div><div class='del'>-				if (walk_state-&gt;method_desc-&gt;method.</div><div class='del'>-				    thread_count) {</div><div class='del'>-					walk_state-&gt;method_desc-&gt;method.</div><div class='del'>-					    thread_count--;</div><div class='del'>-				} else {</div><div class='del'>-					ACPI_ERROR((AE_INFO,</div><div class='del'>-						    "Invalid zero thread count in method"));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			acpi_ds_terminate_control_method(walk_state);</div><div class='add'>+			acpi_ds_terminate_control_method(walk_state-&gt;</div><div class='add'>+							 method_desc,</div><div class='add'>+							 walk_state);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Delete this walk state and all linked control states */</div><div class='hunk'>@@ -572,7 +581,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		previous_walk_state = walk_state;</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-				  "return_value=%p, implicit_value=%p State=%p\n",</div><div class='add'>+				  "ReturnValue=%p, ImplicitValue=%p State=%p\n",</div><div class='ctx'> 				  walk_state-&gt;return_desc,</div><div class='ctx'> 				  walk_state-&gt;implicit_return_obj, walk_state));</div><div class='ctx'> </div><div class='hunk'>@@ -633,12 +642,14 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (previous_walk_state-&gt;return_desc) {</div><div class='add'>+</div><div class='ctx'> 				/* Caller doesn't want it, must delete it */</div><div class='ctx'> </div><div class='ctx'> 				acpi_ut_remove_reference(previous_walk_state-&gt;</div><div class='ctx'> 							 return_desc);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (previous_walk_state-&gt;implicit_return_obj) {</div><div class='add'>+</div><div class='ctx'> 				/* Caller doesn't want it, must delete it */</div><div class='ctx'> </div><div class='ctx'> 				acpi_ut_remove_reference(previous_walk_state-&gt;</div><div class='head'>diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c<br/>index bc6047caccd9..a3e0314de24d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psscope.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psscope.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psscope.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psscope.c</a></div><div class='hunk'>@@ -106,14 +106,14 @@ acpi_ps_init_scope(struct acpi_parse_state * parser_state,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *scope;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_init_scope", root_op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_init_scope, root_op);</div><div class='ctx'> </div><div class='ctx'> 	scope = acpi_ut_create_generic_state();</div><div class='ctx'> 	if (!scope) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scope-&gt;common.data_type = ACPI_DESC_TYPE_STATE_RPSCOPE;</div><div class='add'>+	scope-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_RPSCOPE;</div><div class='ctx'> 	scope-&gt;parse_scope.op = root_op;</div><div class='ctx'> 	scope-&gt;parse_scope.arg_count = ACPI_VAR_ARGS;</div><div class='ctx'> 	scope-&gt;parse_scope.arg_end = parser_state-&gt;aml_end;</div><div class='hunk'>@@ -147,14 +147,14 @@ acpi_ps_push_scope(struct acpi_parse_state *parser_state,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *scope;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_push_scope", op);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_push_scope, op);</div><div class='ctx'> </div><div class='ctx'> 	scope = acpi_ut_create_generic_state();</div><div class='ctx'> 	if (!scope) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	scope-&gt;common.data_type = ACPI_DESC_TYPE_STATE_PSCOPE;</div><div class='add'>+	scope-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_PSCOPE;</div><div class='ctx'> 	scope-&gt;parse_scope.op = op;</div><div class='ctx'> 	scope-&gt;parse_scope.arg_list = remaining_args;</div><div class='ctx'> 	scope-&gt;parse_scope.arg_count = arg_count;</div><div class='hunk'>@@ -165,6 +165,7 @@ acpi_ps_push_scope(struct acpi_parse_state *parser_state,</div><div class='ctx'> 	acpi_ut_push_generic_state(&amp;parser_state-&gt;scope, scope);</div><div class='ctx'> </div><div class='ctx'> 	if (arg_count == ACPI_VAR_ARGS) {</div><div class='add'>+</div><div class='ctx'> 		/* Multiple arguments */</div><div class='ctx'> </div><div class='ctx'> 		scope-&gt;parse_scope.arg_end = parser_state-&gt;pkg_end;</div><div class='hunk'>@@ -199,14 +200,14 @@ acpi_ps_pop_scope(struct acpi_parse_state *parser_state,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *scope = parser_state-&gt;scope;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_pop_scope");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_pop_scope);</div><div class='ctx'> </div><div class='ctx'> 	/* Only pop the scope if there is in fact a next scope */</div><div class='ctx'> </div><div class='ctx'> 	if (scope-&gt;common.next) {</div><div class='ctx'> 		scope = acpi_ut_pop_generic_state(&amp;parser_state-&gt;scope);</div><div class='ctx'> </div><div class='del'>-		/* return to parsing previous op */</div><div class='add'>+		/* Return to parsing previous op */</div><div class='ctx'> </div><div class='ctx'> 		*op = scope-&gt;parse_scope.op;</div><div class='ctx'> 		*arg_list = scope-&gt;parse_scope.arg_list;</div><div class='hunk'>@@ -217,7 +218,7 @@ acpi_ps_pop_scope(struct acpi_parse_state *parser_state,</div><div class='ctx'> </div><div class='ctx'> 		acpi_ut_delete_generic_state(scope);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* empty parse stack, prepare to fetch next opcode */</div><div class='add'>+		/* Empty parse stack, prepare to fetch next opcode */</div><div class='ctx'> </div><div class='ctx'> 		*op = NULL;</div><div class='ctx'> 		*arg_list = 0;</div><div class='hunk'>@@ -246,7 +247,7 @@ void acpi_ps_cleanup_scope(struct acpi_parse_state *parser_state)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *scope;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_cleanup_scope", parser_state);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_cleanup_scope, parser_state);</div><div class='ctx'> </div><div class='ctx'> 	if (!parser_state) {</div><div class='ctx'> 		return_VOID;</div><div class='head'>diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c<br/>index dd6f16726fc4..0015717ef096 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/pstree.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/pstree.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/pstree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/pstree.c</a></div><div class='hunk'>@@ -77,6 +77,7 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)</div><div class='ctx'> </div><div class='ctx'> 	op_info = acpi_ps_get_opcode_info(op-&gt;common.aml_opcode);</div><div class='ctx'> 	if (op_info-&gt;class == AML_CLASS_UNKNOWN) {</div><div class='add'>+</div><div class='ctx'> 		/* Invalid opcode or ASCII character */</div><div class='ctx'> </div><div class='ctx'> 		return (NULL);</div><div class='hunk'>@@ -85,6 +86,7 @@ union acpi_parse_object *acpi_ps_get_arg(union acpi_parse_object *op, u32 argn)</div><div class='ctx'> 	/* Check if this opcode requires argument sub-objects */</div><div class='ctx'> </div><div class='ctx'> 	if (!(op_info-&gt;flags &amp; AML_HAS_ARGS)) {</div><div class='add'>+</div><div class='ctx'> 		/* Has no linked argument objects */</div><div class='ctx'> </div><div class='ctx'> 		return (NULL);</div><div class='hunk'>@@ -130,6 +132,7 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> </div><div class='ctx'> 	op_info = acpi_ps_get_opcode_info(op-&gt;common.aml_opcode);</div><div class='ctx'> 	if (op_info-&gt;class == AML_CLASS_UNKNOWN) {</div><div class='add'>+</div><div class='ctx'> 		/* Invalid opcode */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Invalid AML Opcode: 0x%2.2X",</div><div class='hunk'>@@ -140,6 +143,7 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> 	/* Check if this opcode requires argument sub-objects */</div><div class='ctx'> </div><div class='ctx'> 	if (!(op_info-&gt;flags &amp; AML_HAS_ARGS)) {</div><div class='add'>+</div><div class='ctx'> 		/* Has no linked argument objects */</div><div class='ctx'> </div><div class='ctx'> 		return;</div><div class='hunk'>@@ -148,6 +152,7 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)</div><div class='ctx'> 	/* Append the argument to the linked argument list */</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;common.value.arg) {</div><div class='add'>+</div><div class='ctx'> 		/* Append to existing argument list */</div><div class='ctx'> </div><div class='ctx'> 		prev_arg = op-&gt;common.value.arg;</div><div class='hunk'>@@ -222,12 +227,14 @@ union acpi_parse_object *acpi_ps_get_depth_next(union acpi_parse_object *origin,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (arg == origin) {</div><div class='add'>+</div><div class='ctx'> 			/* Reached parent of origin, end search */</div><div class='ctx'> </div><div class='ctx'> 			return (NULL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (parent-&gt;common.next) {</div><div class='add'>+</div><div class='ctx'> 			/* Found sibling of parent */</div><div class='ctx'> </div><div class='ctx'> 			return (parent-&gt;common.next);</div><div class='hunk'>@@ -299,5 +306,4 @@ union acpi_parse_object *acpi_ps_get_child(union acpi_parse_object *op)</div><div class='ctx'> 	return (child);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='head'>diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c<br/>index 3e07cb9cb748..d405387b7414 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psutils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psutils.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)</div><div class='ctx'> {</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='del'>-	op-&gt;common.data_type = ACPI_DESC_TYPE_PARSER;</div><div class='add'>+	op-&gt;common.descriptor_type = ACPI_DESC_TYPE_PARSER;</div><div class='ctx'> 	op-&gt;common.aml_opcode = opcode;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DISASM_ONLY_MEMBERS(ACPI_STRNCPY(op-&gt;common.aml_op_name,</div><div class='hunk'>@@ -135,15 +135,14 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)</div><div class='ctx'> 	/* Allocate the minimum required size object */</div><div class='ctx'> </div><div class='ctx'> 	if (flags == ACPI_PARSEOP_GENERIC) {</div><div class='add'>+</div><div class='ctx'> 		/* The generic op (default) is by far the most common (16 to 1) */</div><div class='ctx'> </div><div class='ctx'> 		op = acpi_os_acquire_object(acpi_gbl_ps_node_cache);</div><div class='del'>-		memset(op, 0, sizeof(struct acpi_parse_obj_common));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Extended parseop */</div><div class='ctx'> </div><div class='ctx'> 		op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache);</div><div class='del'>-		memset(op, 0, sizeof(struct acpi_parse_obj_named));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the Op */</div><div class='hunk'>@@ -171,7 +170,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)</div><div class='ctx'> </div><div class='ctx'> void acpi_ps_free_op(union acpi_parse_object *op)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_NAME("ps_free_op");</div><div class='add'>+	ACPI_FUNCTION_NAME(ps_free_op);</div><div class='ctx'> </div><div class='ctx'> 	if (op-&gt;common.aml_opcode == AML_INT_RETURN_VALUE_OP) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Free retval op: %p\n",</div><div class='head'>diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c<br/>index 06f05bfd7612..a84a547a0f1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/pswalk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/pswalk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/pswalk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/pswalk.c</a></div><div class='hunk'>@@ -64,18 +64,21 @@ void acpi_ps_delete_parse_tree(union acpi_parse_object *subtree_root)</div><div class='ctx'> 	union acpi_parse_object *next = NULL;</div><div class='ctx'> 	union acpi_parse_object *parent = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ps_delete_parse_tree", subtree_root);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ps_delete_parse_tree, subtree_root);</div><div class='ctx'> </div><div class='ctx'> 	/* Visit all nodes in the subtree */</div><div class='ctx'> </div><div class='ctx'> 	while (op) {</div><div class='add'>+</div><div class='ctx'> 		/* Check if we are not ascending */</div><div class='ctx'> </div><div class='ctx'> 		if (op != parent) {</div><div class='add'>+</div><div class='ctx'> 			/* Look for an argument or child of the current op */</div><div class='ctx'> </div><div class='ctx'> 			next = acpi_ps_get_arg(op, 0);</div><div class='ctx'> 			if (next) {</div><div class='add'>+</div><div class='ctx'> 				/* Still going downward in tree (Op is not completed yet) */</div><div class='ctx'> </div><div class='ctx'> 				op = next;</div><div class='head'>diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c<br/>index 2dd48cbb7c02..5d996c1140af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psxface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/parser/psxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/parser/psxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/parser/psxface.c</a></div><div class='hunk'>@@ -50,14 +50,14 @@</div><div class='ctx'> ACPI_MODULE_NAME("psxface")</div><div class='ctx'> </div><div class='ctx'> /* Local Prototypes */</div><div class='del'>-static void acpi_ps_start_trace(struct acpi_parameter_info *info);</div><div class='add'>+static void acpi_ps_start_trace(struct acpi_evaluate_info *info);</div><div class='ctx'> </div><div class='del'>-static void acpi_ps_stop_trace(struct acpi_parameter_info *info);</div><div class='add'>+static void acpi_ps_stop_trace(struct acpi_evaluate_info *info);</div><div class='ctx'> </div><div class='del'>-static acpi_status acpi_ps_execute_pass(struct acpi_parameter_info *info);</div><div class='add'>+static acpi_status acpi_ps_execute_pass(struct acpi_evaluate_info *info);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_ps_update_parameter_list(struct acpi_parameter_info *info, u16 action);</div><div class='add'>+acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action);</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -113,7 +113,7 @@ acpi_debug_trace(char *name, u32 debug_level, u32 debug_layer, u32 flags)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void acpi_ps_start_trace(struct acpi_parameter_info *info)</div><div class='add'>+static void acpi_ps_start_trace(struct acpi_evaluate_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +125,7 @@ static void acpi_ps_start_trace(struct acpi_parameter_info *info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((!acpi_gbl_trace_method_name) ||</div><div class='del'>-	    (acpi_gbl_trace_method_name != info-&gt;node-&gt;name.integer)) {</div><div class='add'>+	    (acpi_gbl_trace_method_name != info-&gt;resolved_node-&gt;name.integer)) {</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +158,7 @@ static void acpi_ps_start_trace(struct acpi_parameter_info *info)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void acpi_ps_stop_trace(struct acpi_parameter_info *info)</div><div class='add'>+static void acpi_ps_stop_trace(struct acpi_evaluate_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='hunk'>@@ -170,7 +170,7 @@ static void acpi_ps_stop_trace(struct acpi_parameter_info *info)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((!acpi_gbl_trace_method_name) ||</div><div class='del'>-	    (acpi_gbl_trace_method_name != info-&gt;node-&gt;name.integer)) {</div><div class='add'>+	    (acpi_gbl_trace_method_name != info-&gt;resolved_node-&gt;name.integer)) {</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -212,22 +212,23 @@ static void acpi_ps_stop_trace(struct acpi_parameter_info *info)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)</div><div class='add'>+acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_execute_method");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_execute_method);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate the Info and method Node */</div><div class='ctx'> </div><div class='del'>-	if (!info || !info-&gt;node) {</div><div class='add'>+	if (!info || !info-&gt;resolved_node) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NULL_ENTRY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init for new method, wait on concurrency semaphore */</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_ds_begin_method_execution(info-&gt;node, info-&gt;obj_desc, NULL);</div><div class='add'>+	    acpi_ds_begin_method_execution(info-&gt;resolved_node, info-&gt;obj_desc,</div><div class='add'>+					   NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -248,7 +249,7 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='ctx'> 			  "**** Begin Method Parse **** Entry=%p obj=%p\n",</div><div class='del'>-			  info-&gt;node, info-&gt;obj_desc));</div><div class='add'>+			  info-&gt;resolved_node, info-&gt;obj_desc));</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;pass_number = 1;</div><div class='ctx'> 	status = acpi_ps_execute_pass(info);</div><div class='hunk'>@@ -261,7 +262,7 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)</div><div class='ctx'> 	 */</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='ctx'> 			  "**** Begin Method Execution **** Entry=%p obj=%p\n",</div><div class='del'>-			  info-&gt;node, info-&gt;obj_desc));</div><div class='add'>+			  info-&gt;resolved_node, info-&gt;obj_desc));</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;pass_number = 3;</div><div class='ctx'> 	status = acpi_ps_execute_pass(info);</div><div class='hunk'>@@ -286,8 +287,7 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)</div><div class='ctx'> 	 * a control exception code</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (info-&gt;return_object) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_PARSE,</div><div class='del'>-				  "Method returned obj_desc=%p\n",</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Method returned ObjDesc=%p\n",</div><div class='ctx'> 				  info-&gt;return_object));</div><div class='ctx'> 		ACPI_DUMP_STACK_ENTRY(info-&gt;return_object);</div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +301,7 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ps_update_parameter_list</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Info            - See struct acpi_parameter_info</div><div class='add'>+ * PARAMETERS:  Info            - See struct acpi_evaluate_info</div><div class='ctx'>  *                                (Used: parameter_type and Parameters)</div><div class='ctx'>  *              Action          - Add or Remove reference</div><div class='ctx'>  *</div><div class='hunk'>@@ -312,14 +312,16 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_ps_update_parameter_list(struct acpi_parameter_info *info, u16 action)</div><div class='add'>+acpi_ps_update_parameter_list(struct acpi_evaluate_info *info, u16 action)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='ctx'> 	if ((info-&gt;parameter_type == ACPI_PARAM_ARGS) &amp;&amp; (info-&gt;parameters)) {</div><div class='add'>+</div><div class='ctx'> 		/* Update reference count for each parameter */</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; info-&gt;parameters[i]; i++) {</div><div class='add'>+</div><div class='ctx'> 			/* Ignore errors, just do them all */</div><div class='ctx'> </div><div class='ctx'> 			(void)acpi_ut_update_object_reference(info-&gt;</div><div class='hunk'>@@ -333,7 +335,7 @@ acpi_ps_update_parameter_list(struct acpi_parameter_info *info, u16 action)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ps_execute_pass</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Info            - See struct acpi_parameter_info</div><div class='add'>+ * PARAMETERS:  Info            - See struct acpi_evaluate_info</div><div class='ctx'>  *                                (Used: pass_number, Node, and obj_desc)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='hunk'>@@ -342,13 +344,13 @@ acpi_ps_update_parameter_list(struct acpi_parameter_info *info, u16 action)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-static acpi_status acpi_ps_execute_pass(struct acpi_parameter_info *info)</div><div class='add'>+static acpi_status acpi_ps_execute_pass(struct acpi_evaluate_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	union acpi_parse_object *op;</div><div class='ctx'> 	struct acpi_walk_state *walk_state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ps_execute_pass");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ps_execute_pass);</div><div class='ctx'> </div><div class='ctx'> 	/* Create and init a Root Node */</div><div class='ctx'> </div><div class='hunk'>@@ -367,7 +369,7 @@ static acpi_status acpi_ps_execute_pass(struct acpi_parameter_info *info)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_ds_init_aml_walk(walk_state, op, info-&gt;node,</div><div class='add'>+	status = acpi_ds_init_aml_walk(walk_state, op, info-&gt;resolved_node,</div><div class='ctx'> 				       info-&gt;obj_desc-&gt;method.aml_start,</div><div class='ctx'> 				       info-&gt;obj_desc-&gt;method.aml_length,</div><div class='ctx'> 				       info-&gt;pass_number == 1 ? NULL : info,</div><div class='head'>diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c<br/>index 2a718df769b5..1e2ae6e7a7e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_bind.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_bind.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_bind.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/pci_bind.c</a></div><div class='hunk'>@@ -47,11 +47,10 @@ struct acpi_pci_data {</div><div class='ctx'> static void acpi_pci_data_handler(acpi_handle handle, u32 function,</div><div class='ctx'> 				  void *context)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_data_handler");</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Anything we need to do here? */</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -68,25 +67,24 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	struct acpi_pci_data *data = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_pci_id");</div><div class='ctx'> </div><div class='ctx'> 	if (!id)</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid ACPI Bus context for device %s\n",</div><div class='del'>-				  acpi_device_bid(device)));</div><div class='del'>-		return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='add'>+		printk(KERN_ERR PREFIX</div><div class='add'>+			    "Invalid ACPI Bus context for device %s\n",</div><div class='add'>+			    acpi_device_bid(device));</div><div class='add'>+		return AE_NOT_EXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_data(handle, acpi_pci_data_handler, (void **)&amp;data);</div><div class='ctx'> 	if (ACPI_FAILURE(status) || !data) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid ACPI-PCI context for device %s\n",</div><div class='del'>-				  acpi_device_bid(device)));</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Invalid ACPI-PCI context for device %s",</div><div class='add'>+				acpi_device_bid(device)));</div><div class='add'>+		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*id = data-&gt;id;</div><div class='hunk'>@@ -103,7 +101,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)</div><div class='ctx'> 			  acpi_device_bid(device), id-&gt;segment, id-&gt;bus,</div><div class='ctx'> 			  id-&gt;device, id-&gt;function));</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_get_pci_id);</div><div class='hunk'>@@ -120,14 +118,13 @@ int acpi_pci_bind(struct acpi_device *device)</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_bind");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !device-&gt;parent)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);</div><div class='ctx'> 	if (!pathname)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(pathname, 0, ACPI_PATHNAME_MAX);</div><div class='ctx'> 	buffer.length = ACPI_PATHNAME_MAX;</div><div class='ctx'> 	buffer.pointer = pathname;</div><div class='hunk'>@@ -135,7 +132,7 @@ int acpi_pci_bind(struct acpi_device *device)</div><div class='ctx'> 	data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);</div><div class='ctx'> 	if (!data) {</div><div class='ctx'> 		kfree(pathname);</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(data, 0, sizeof(struct acpi_pci_data));</div><div class='ctx'> </div><div class='hunk'>@@ -151,9 +148,9 @@ int acpi_pci_bind(struct acpi_device *device)</div><div class='ctx'> 	status = acpi_get_data(device-&gt;parent-&gt;handle, acpi_pci_data_handler,</div><div class='ctx'> 			       (void **)&amp;pdata);</div><div class='ctx'> 	if (ACPI_FAILURE(status) || !pdata || !pdata-&gt;bus) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid ACPI-PCI context for parent device %s\n",</div><div class='del'>-				  acpi_device_bid(device-&gt;parent)));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Invalid ACPI-PCI context for parent device %s",</div><div class='add'>+				acpi_device_bid(device-&gt;parent)));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -206,10 +203,10 @@ int acpi_pci_bind(struct acpi_device *device)</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!data-&gt;dev-&gt;bus) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",</div><div class='del'>-				  data-&gt;id.segment, data-&gt;id.bus,</div><div class='del'>-				  data-&gt;id.device, data-&gt;id.function));</div><div class='add'>+		printk(KERN_ERR PREFIX</div><div class='add'>+			    "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",</div><div class='add'>+			    data-&gt;id.segment, data-&gt;id.bus,</div><div class='add'>+			    data-&gt;id.device, data-&gt;id.function);</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -237,9 +234,9 @@ int acpi_pci_bind(struct acpi_device *device)</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_attach_data(device-&gt;handle, acpi_pci_data_handler, data);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to attach ACPI-PCI context to device %s\n",</div><div class='del'>-				  acpi_device_bid(device)));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Unable to attach ACPI-PCI context to device %s",</div><div class='add'>+				acpi_device_bid(device)));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -269,7 +266,7 @@ int acpi_pci_bind(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_pci_unbind(struct acpi_device *device)</div><div class='hunk'>@@ -280,14 +277,13 @@ int acpi_pci_unbind(struct acpi_device *device)</div><div class='ctx'> 	char *pathname = NULL;</div><div class='ctx'> 	struct acpi_buffer buffer = { 0, NULL };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_unbind");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !device-&gt;parent)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);</div><div class='ctx'> 	if (!pathname)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(pathname, 0, ACPI_PATHNAME_MAX);</div><div class='ctx'> </div><div class='ctx'> 	buffer.length = ACPI_PATHNAME_MAX;</div><div class='hunk'>@@ -301,18 +297,18 @@ int acpi_pci_unbind(struct acpi_device *device)</div><div class='ctx'> 	    acpi_get_data(device-&gt;handle, acpi_pci_data_handler,</div><div class='ctx'> 			  (void **)&amp;data);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to get data from device %s\n",</div><div class='del'>-				  acpi_device_bid(device)));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Unable to get data from device %s",</div><div class='add'>+				acpi_device_bid(device)));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_detach_data(device-&gt;handle, acpi_pci_data_handler);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to detach data from device %s\n",</div><div class='del'>-				  acpi_device_bid(device)));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Unable to detach data from device %s",</div><div class='add'>+				acpi_device_bid(device)));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -322,7 +318,7 @@ int acpi_pci_unbind(struct acpi_device *device)</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -335,11 +331,10 @@ acpi_pci_bind_root(struct acpi_device *device,</div><div class='ctx'> 	char *pathname = NULL;</div><div class='ctx'> 	struct acpi_buffer buffer = { 0, NULL };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_bind_root");</div><div class='ctx'> </div><div class='ctx'> 	pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);</div><div class='ctx'> 	if (!pathname)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(pathname, 0, ACPI_PATHNAME_MAX);</div><div class='ctx'> </div><div class='ctx'> 	buffer.length = ACPI_PATHNAME_MAX;</div><div class='hunk'>@@ -347,13 +342,13 @@ acpi_pci_bind_root(struct acpi_device *device,</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !id || !bus) {</div><div class='ctx'> 		kfree(pathname);</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);</div><div class='ctx'> 	if (!data) {</div><div class='ctx'> 		kfree(pathname);</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(data, 0, sizeof(struct acpi_pci_data));</div><div class='ctx'> </div><div class='hunk'>@@ -369,9 +364,9 @@ acpi_pci_bind_root(struct acpi_device *device,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_attach_data(device-&gt;handle, acpi_pci_data_handler, data);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to attach ACPI-PCI context to device %s\n",</div><div class='del'>-				  pathname));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Unable to attach ACPI-PCI context to device %s",</div><div class='add'>+				pathname));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -381,5 +376,5 @@ acpi_pci_bind_root(struct acpi_device *device,</div><div class='ctx'> 	if (result != 0)</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c<br/>index 65aee79b3971..feda0341f5a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/pci_irq.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -55,10 +54,9 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,</div><div class='ctx'> 	struct list_head *node = NULL;</div><div class='ctx'> 	struct acpi_prt_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_find_prt_entry");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_prt.count)</div><div class='del'>-		return_PTR(NULL);</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Parse through all PRT entries looking for a match on the specified</div><div class='hunk'>@@ -73,12 +71,12 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,</div><div class='ctx'> 		    &amp;&amp; (device == entry-&gt;id.device)</div><div class='ctx'> 		    &amp;&amp; (pin == entry-&gt;pin)) {</div><div class='ctx'> 			spin_unlock(&amp;acpi_prt_lock);</div><div class='del'>-			return_PTR(entry);</div><div class='add'>+			return entry;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;acpi_prt_lock);</div><div class='del'>-	return_PTR(NULL);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -87,14 +85,13 @@ acpi_pci_irq_add_entry(acpi_handle handle,</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_prt_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_add_entry");</div><div class='ctx'> </div><div class='ctx'> 	if (!prt)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	entry = kmalloc(sizeof(struct acpi_prt_entry), GFP_KERNEL);</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(entry, 0, sizeof(struct acpi_prt_entry));</div><div class='ctx'> </div><div class='ctx'> 	entry-&gt;id.segment = segment;</div><div class='hunk'>@@ -141,7 +138,7 @@ acpi_pci_irq_add_entry(acpi_handle handle,</div><div class='ctx'> 	acpi_prt.count++;</div><div class='ctx'> 	spin_unlock(&amp;acpi_prt_lock);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -163,11 +160,10 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)</div><div class='ctx'> 	struct acpi_pci_routing_table *entry = NULL;</div><div class='ctx'> 	static int first_time = 1;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_add_prt");</div><div class='ctx'> </div><div class='ctx'> 	pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);</div><div class='ctx'> 	if (!pathname)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(pathname, 0, ACPI_PATHNAME_MAX);</div><div class='ctx'> </div><div class='ctx'> 	if (first_time) {</div><div class='hunk'>@@ -197,24 +193,24 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)</div><div class='ctx'> 	kfree(pathname);</div><div class='ctx'> 	status = acpi_get_irq_routing_table(handle, &amp;buffer);</div><div class='ctx'> 	if (status != AE_BUFFER_OVERFLOW) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRT [%s]\n",</div><div class='del'>-				  acpi_format_exception(status)));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRT [%s]",</div><div class='add'>+				acpi_format_exception(status)));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	prt = kmalloc(buffer.length, GFP_KERNEL);</div><div class='ctx'> 	if (!prt) {</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(prt, 0, buffer.length);</div><div class='ctx'> 	buffer.pointer = prt;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_irq_routing_table(handle, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRT [%s]\n",</div><div class='del'>-				  acpi_format_exception(status)));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRT [%s]",</div><div class='add'>+				acpi_format_exception(status)));</div><div class='ctx'> 		kfree(buffer.pointer);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	entry = prt;</div><div class='hunk'>@@ -227,7 +223,7 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)</div><div class='ctx'> </div><div class='ctx'> 	kfree(prt);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void acpi_pci_irq_del_prt(int segment, int bus)</div><div class='hunk'>@@ -262,16 +258,15 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_allocate_irq");</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;link.handle) {</div><div class='ctx'> 		irq = acpi_pci_link_allocate_irq(entry-&gt;link.handle,</div><div class='ctx'> 						 entry-&gt;link.index, triggering,</div><div class='ctx'> 						 polarity, link);</div><div class='ctx'> 		if (irq &lt; 0) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-					  "Invalid IRQ link routing entry\n"));</div><div class='del'>-			return_VALUE(-1);</div><div class='add'>+			printk(KERN_WARNING PREFIX</div><div class='add'>+				      "Invalid IRQ link routing entry\n");</div><div class='add'>+			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		irq = entry-&gt;link.index;</div><div class='hunk'>@@ -280,7 +275,7 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found IRQ %d\n", irq));</div><div class='del'>-	return_VALUE(irq);</div><div class='add'>+	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -289,13 +284,12 @@ acpi_pci_free_irq(struct acpi_prt_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_free_irq");</div><div class='ctx'> 	if (entry-&gt;link.handle) {</div><div class='ctx'> 		irq = acpi_pci_link_free_irq(entry-&gt;link.handle);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		irq = entry-&gt;link.index;</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(irq);</div><div class='add'>+	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -315,7 +309,6 @@ acpi_pci_irq_lookup(struct pci_bus *bus,</div><div class='ctx'> 	int bus_nr = bus-&gt;number;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_lookup");</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 			  "Searching for PRT entry for %02x:%02x:%02x[%c]\n",</div><div class='hunk'>@@ -324,11 +317,11 @@ acpi_pci_irq_lookup(struct pci_bus *bus,</div><div class='ctx'> 	entry = acpi_pci_irq_find_prt_entry(segment, bus_nr, device, pin);</div><div class='ctx'> 	if (!entry) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "PRT entry not found\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = func(entry, triggering, polarity, link);</div><div class='del'>-	return_VALUE(ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -346,10 +339,9 @@ acpi_pci_irq_derive(struct pci_dev *dev,</div><div class='ctx'> 	int irq = -1;</div><div class='ctx'> 	u8 bridge_pin = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_derive");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* </div><div class='ctx'> 	 * Attempt to derive an IRQ for this device from a parent bridge's</div><div class='hunk'>@@ -366,7 +358,7 @@ acpi_pci_irq_derive(struct pci_dev *dev,</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 						  "No interrupt pin configured for device %s\n",</div><div class='ctx'> 						  pci_name(bridge)));</div><div class='del'>-				return_VALUE(-1);</div><div class='add'>+				return -1;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Pin is from 0 to 3 */</div><div class='ctx'> 			bridge_pin--;</div><div class='hunk'>@@ -379,16 +371,15 @@ acpi_pci_irq_derive(struct pci_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Unable to derive IRQ for device %s\n",</div><div class='del'>-				  pci_name(dev)));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n",</div><div class='add'>+			      pci_name(dev));</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Derive IRQ %d for device %s from %s\n",</div><div class='ctx'> 			  irq, pci_name(dev), pci_name(bridge)));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(irq);</div><div class='add'>+	return irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -406,24 +397,22 @@ int acpi_pci_irq_enable(struct pci_dev *dev)</div><div class='ctx'> 	char *link = NULL;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pin = dev-&gt;pin;</div><div class='ctx'> 	if (!pin) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "No interrupt pin configured for device %s\n",</div><div class='ctx'> 				  pci_name(dev)));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	pin--;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;bus) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid (NULL) 'bus' field\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid (NULL) 'bus' field\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* </div><div class='hunk'>@@ -455,10 +444,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev)</div><div class='ctx'> 			printk(" - using IRQ %d\n", dev-&gt;irq);</div><div class='ctx'> 			acpi_register_gsi(dev-&gt;irq, ACPI_LEVEL_SENSITIVE,</div><div class='ctx'> 					  ACPI_ACTIVE_LOW);</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk("\n");</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -466,7 +455,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "</div><div class='ctx'> 		       "to register GSI\n", pci_name(dev), ('A' + pin));</div><div class='del'>-		return_VALUE(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;irq = rc;</div><div class='ctx'> </div><div class='hunk'>@@ -480,7 +469,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)</div><div class='ctx'> 	       (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",</div><div class='ctx'> 	       (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_pci_irq_enable);</div><div class='hunk'>@@ -497,14 +486,13 @@ void acpi_pci_irq_disable(struct pci_dev *dev)</div><div class='ctx'> 	int triggering = ACPI_LEVEL_SENSITIVE;</div><div class='ctx'> 	int polarity = ACPI_ACTIVE_LOW;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_irq_disable");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !dev-&gt;bus)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	pin = dev-&gt;pin;</div><div class='ctx'> 	if (!pin)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> 	pin--;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -522,7 +510,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)</div><div class='ctx'> 					  &amp;triggering, &amp;polarity, NULL,</div><div class='ctx'> 					  acpi_pci_free_irq);</div><div class='ctx'> 	if (gsi &lt; 0)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * TBD: It might be worth clearing dev-&gt;irq by magic constant</div><div class='hunk'>@@ -534,5 +522,5 @@ void acpi_pci_irq_disable(struct pci_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	acpi_unregister_gsi(gsi);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c<br/>index 07bc6dfe662b..7f3e7e77e794 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_link.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_link.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_link.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/pci_link.c</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;acpi/acpi_bus.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi_drivers.h&gt;</div><div class='hunk'>@@ -82,7 +83,6 @@ struct acpi_pci_link_irq {</div><div class='ctx'> struct acpi_pci_link {</div><div class='ctx'> 	struct list_head node;</div><div class='ctx'> 	struct acpi_device *device;</div><div class='del'>-	acpi_handle handle;</div><div class='ctx'> 	struct acpi_pci_link_irq irq;</div><div class='ctx'> 	int refcnt;</div><div class='ctx'> };</div><div class='hunk'>@@ -91,7 +91,7 @@ static struct {</div><div class='ctx'> 	int count;</div><div class='ctx'> 	struct list_head entries;</div><div class='ctx'> } acpi_link;</div><div class='del'>-DECLARE_MUTEX(acpi_link_lock);</div><div class='add'>+DEFINE_MUTEX(acpi_link_lock);</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                             PCI Link Device Management</div><div class='hunk'>@@ -106,26 +106,23 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)</div><div class='ctx'> 	struct acpi_pci_link *link = (struct acpi_pci_link *)context;</div><div class='ctx'> 	u32 i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible");</div><div class='ctx'> </div><div class='ctx'> 	switch (resource-&gt;type) {</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_START_DEPENDENT:</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+		return AE_OK;</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_IRQ:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct acpi_resource_irq *p = &amp;resource-&gt;data.irq;</div><div class='ctx'> 			if (!p || !p-&gt;interrupt_count) {</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-						  "Blank IRQ resource\n"));</div><div class='del'>-				return_ACPI_STATUS(AE_OK);</div><div class='add'>+				printk(KERN_WARNING PREFIX "Blank IRQ resource\n");</div><div class='add'>+				return AE_OK;</div><div class='ctx'> 			}</div><div class='ctx'> 			for (i = 0;</div><div class='ctx'> 			     (i &lt; p-&gt;interrupt_count</div><div class='ctx'> 			      &amp;&amp; i &lt; ACPI_PCI_LINK_MAX_POSSIBLE); i++) {</div><div class='ctx'> 				if (!p-&gt;interrupts[i]) {</div><div class='del'>-					ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-							  "Invalid IRQ %d\n",</div><div class='del'>-							  p-&gt;interrupts[i]));</div><div class='add'>+					printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",</div><div class='add'>+						      p-&gt;interrupts[i]);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				link-&gt;irq.possible[i] = p-&gt;interrupts[i];</div><div class='hunk'>@@ -141,17 +138,16 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)</div><div class='ctx'> 			struct acpi_resource_extended_irq *p =</div><div class='ctx'> 			    &amp;resource-&gt;data.extended_irq;</div><div class='ctx'> 			if (!p || !p-&gt;interrupt_count) {</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-						  "Blank EXT IRQ resource\n"));</div><div class='del'>-				return_ACPI_STATUS(AE_OK);</div><div class='add'>+				printk(KERN_WARNING PREFIX</div><div class='add'>+					      "Blank EXT IRQ resource\n");</div><div class='add'>+				return AE_OK;</div><div class='ctx'> 			}</div><div class='ctx'> 			for (i = 0;</div><div class='ctx'> 			     (i &lt; p-&gt;interrupt_count</div><div class='ctx'> 			      &amp;&amp; i &lt; ACPI_PCI_LINK_MAX_POSSIBLE); i++) {</div><div class='ctx'> 				if (!p-&gt;interrupts[i]) {</div><div class='del'>-					ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-							  "Invalid IRQ %d\n",</div><div class='del'>-							  p-&gt;interrupts[i]));</div><div class='add'>+					printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",</div><div class='add'>+						      p-&gt;interrupts[i]);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				link-&gt;irq.possible[i] = p-&gt;interrupts[i];</div><div class='hunk'>@@ -163,35 +159,33 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	default:</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Resource is not an IRQ entry\n"));</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+		printk(KERN_ERR PREFIX "Resource is not an IRQ entry\n");</div><div class='add'>+		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_CTRL_TERMINATE);</div><div class='add'>+	return AE_CTRL_TERMINATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_pci_link_get_possible(struct acpi_pci_link *link)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_get_possible");</div><div class='ctx'> </div><div class='ctx'> 	if (!link)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	status = acpi_walk_resources(link-&gt;handle, METHOD_NAME__PRS,</div><div class='add'>+	status = acpi_walk_resources(link-&gt;device-&gt;handle, METHOD_NAME__PRS,</div><div class='ctx'> 				     acpi_pci_link_check_possible, link);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRS\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRS"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 			  "Found %d possible IRQs\n",</div><div class='ctx'> 			  link-&gt;irq.possible_count));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -199,7 +193,6 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	int *irq = (int *)context;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_check_current");</div><div class='ctx'> </div><div class='ctx'> 	switch (resource-&gt;type) {</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_IRQ:</div><div class='hunk'>@@ -212,7 +205,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)</div><div class='ctx'> 				 */</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 						  "Blank IRQ resource\n"));</div><div class='del'>-				return_ACPI_STATUS(AE_OK);</div><div class='add'>+				return AE_OK;</div><div class='ctx'> 			}</div><div class='ctx'> 			*irq = p-&gt;interrupts[0];</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -226,20 +219,20 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)</div><div class='ctx'> 				 * extended IRQ descriptors must</div><div class='ctx'> 				 * return at least 1 IRQ</div><div class='ctx'> 				 */</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-						  "Blank EXT IRQ resource\n"));</div><div class='del'>-				return_ACPI_STATUS(AE_OK);</div><div class='add'>+				printk(KERN_WARNING PREFIX</div><div class='add'>+					      "Blank EXT IRQ resource\n");</div><div class='add'>+				return AE_OK;</div><div class='ctx'> 			}</div><div class='ctx'> 			*irq = p-&gt;interrupts[0];</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Resource %d isn't an IRQ\n", resource-&gt;type));</div><div class='add'>+		printk(KERN_ERR PREFIX "Resource %d isn't an IRQ\n", resource-&gt;type);</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_END_TAG:</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+		return AE_OK;</div><div class='ctx'> 	}</div><div class='del'>-	return_ACPI_STATUS(AE_CTRL_TERMINATE);</div><div class='add'>+	return AE_CTRL_TERMINATE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -255,10 +248,8 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	int irq = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_get_current");</div><div class='del'>-</div><div class='del'>-	if (!link || !link-&gt;handle)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+	if (!link)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;irq.active = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -267,14 +258,13 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)</div><div class='ctx'> 		/* Query _STA, set link-&gt;device-&gt;status */</div><div class='ctx'> 		result = acpi_bus_get_status(link-&gt;device);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Unable to read status\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Unable to read status\n");</div><div class='ctx'> 			goto end;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!link-&gt;device-&gt;status.enabled) {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Link disabled\n"));</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -282,16 +272,16 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)</div><div class='ctx'> 	 * Query and parse _CRS to get the current IRQ assignment. </div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	status = acpi_walk_resources(link-&gt;handle, METHOD_NAME__CRS,</div><div class='add'>+	status = acpi_walk_resources(link-&gt;device-&gt;handle, METHOD_NAME__CRS,</div><div class='ctx'> 				     acpi_pci_link_check_current, &amp;irq);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _CRS\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _CRS"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_strict &amp;&amp; !irq) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "_CRS returned 0\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "_CRS returned 0\n");</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -300,7 +290,7 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Link at IRQ %d \n", link-&gt;irq.active));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='hunk'>@@ -313,14 +303,13 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='ctx'> 	} *resource;</div><div class='ctx'> 	struct acpi_buffer buffer = { 0, NULL };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_set");</div><div class='ctx'> </div><div class='ctx'> 	if (!link || !irq)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);</div><div class='ctx'> 	if (!resource)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	memset(resource, 0, sizeof(*resource) + 1);</div><div class='ctx'> 	buffer.length = sizeof(*resource) + 1;</div><div class='hunk'>@@ -361,7 +350,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='ctx'> 		/* ignore resource_source, it's optional */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("ACPI BUG: resource_type %d\n", link-&gt;irq.resource_type);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid Resource_type %d\n", link-&gt;irq.resource_type);</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='hunk'>@@ -369,11 +358,11 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='ctx'> 	resource-&gt;end.type = ACPI_RESOURCE_TYPE_END_TAG;</div><div class='ctx'> </div><div class='ctx'> 	/* Attempt to set the resource */</div><div class='del'>-	status = acpi_set_current_resources(link-&gt;handle, &amp;buffer);</div><div class='add'>+	status = acpi_set_current_resources(link-&gt;device-&gt;handle, &amp;buffer);</div><div class='ctx'> </div><div class='ctx'> 	/* check for total failure */</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _SRS\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _SRS"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -381,14 +370,14 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='ctx'> 	/* Query _STA, set device-&gt;status */</div><div class='ctx'> 	result = acpi_bus_get_status(link-&gt;device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to read status\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Unable to read status\n");</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!link-&gt;device-&gt;status.enabled) {</div><div class='ctx'> 		printk(KERN_WARNING PREFIX</div><div class='del'>-		       "%s [%s] disabled and referenced, BIOS bug.\n",</div><div class='del'>-		       acpi_device_name(link-&gt;device),</div><div class='del'>-		       acpi_device_bid(link-&gt;device));</div><div class='add'>+			      "%s [%s] disabled and referenced, BIOS bug\n",</div><div class='add'>+			      acpi_device_name(link-&gt;device),</div><div class='add'>+			      acpi_device_bid(link-&gt;device));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Query _CRS, set link-&gt;irq.active */</div><div class='hunk'>@@ -407,9 +396,9 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='ctx'> 		 * assume _SRS worked and override _CRS value.</div><div class='ctx'> 		 */</div><div class='ctx'> 		printk(KERN_WARNING PREFIX</div><div class='del'>-		       "%s [%s] BIOS reported IRQ %d, using IRQ %d\n",</div><div class='del'>-		       acpi_device_name(link-&gt;device),</div><div class='del'>-		       acpi_device_bid(link-&gt;device), link-&gt;irq.active, irq);</div><div class='add'>+			      "%s [%s] BIOS reported IRQ %d, using IRQ %d\n",</div><div class='add'>+			      acpi_device_name(link-&gt;device),</div><div class='add'>+			      acpi_device_bid(link-&gt;device), link-&gt;irq.active, irq);</div><div class='ctx'> 		link-&gt;irq.active = irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -417,7 +406,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='ctx'> 	kfree(resource);</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -491,7 +480,6 @@ int __init acpi_irq_penalty_init(void)</div><div class='ctx'> 	struct acpi_pci_link *link = NULL;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_irq_penalty_init");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update penalties to facilitate IRQ balancing.</div><div class='hunk'>@@ -500,8 +488,7 @@ int __init acpi_irq_penalty_init(void)</div><div class='ctx'> </div><div class='ctx'> 		link = list_entry(node, struct acpi_pci_link, node);</div><div class='ctx'> 		if (!link) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Invalid link context\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Invalid link context\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -529,7 +516,7 @@ int __init acpi_irq_penalty_init(void)</div><div class='ctx'> 	/* Add a penalty for the SCI */</div><div class='ctx'> 	acpi_irq_penalty[acpi_fadt.sci_int] += PIRQ_PENALTY_PCI_USING;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_irq_balance;	/* 0: static, 1: balance */</div><div class='hunk'>@@ -539,13 +526,12 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_allocate");</div><div class='ctx'> </div><div class='ctx'> 	if (link-&gt;irq.initialized) {</div><div class='ctx'> 		if (link-&gt;refcnt == 0)</div><div class='ctx'> 			/* This means the link is disabled but initialized */</div><div class='ctx'> 			acpi_pci_link_set(link, link-&gt;irq.active);</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -561,7 +547,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)</div><div class='ctx'> 	if (i == link-&gt;irq.possible_count) {</div><div class='ctx'> 		if (acpi_strict)</div><div class='ctx'> 			printk(KERN_WARNING PREFIX "_CRS %d not found"</div><div class='del'>-			       " in _PRS\n", link-&gt;irq.active);</div><div class='add'>+				      " in _PRS\n", link-&gt;irq.active);</div><div class='ctx'> 		link-&gt;irq.active = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -588,12 +574,11 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)</div><div class='ctx'> </div><div class='ctx'> 	/* Attempt to enable the link device at this IRQ. */</div><div class='ctx'> 	if (acpi_pci_link_set(link, irq)) {</div><div class='del'>-		printk(PREFIX</div><div class='del'>-		       "Unable to set IRQ for %s [%s] (likely buggy ACPI BIOS).\n"</div><div class='del'>-		       "Try pci=noacpi or acpi=off\n",</div><div class='del'>-		       acpi_device_name(link-&gt;device),</div><div class='del'>-		       acpi_device_bid(link-&gt;device));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_ERR PREFIX "Unable to set IRQ for %s [%s]. "</div><div class='add'>+			    "Try pci=noacpi or acpi=off\n",</div><div class='add'>+			    acpi_device_name(link-&gt;device),</div><div class='add'>+			    acpi_device_bid(link-&gt;device));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		acpi_irq_penalty[link-&gt;irq.active] += PIRQ_PENALTY_PCI_USING;</div><div class='ctx'> 		printk(PREFIX "%s [%s] enabled at IRQ %d\n",</div><div class='hunk'>@@ -603,7 +588,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;irq.initialized = 1;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -621,39 +606,38 @@ acpi_pci_link_allocate_irq(acpi_handle handle,</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	struct acpi_pci_link *link = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_allocate_irq");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link device\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid link device\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	link = (struct acpi_pci_link *)acpi_driver_data(device);</div><div class='ctx'> 	if (!link) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link context\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid link context\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Support multiple index (IRQ) entries per Link Device */</div><div class='ctx'> 	if (index) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid index %d\n", index));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid index %d\n", index);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down(&amp;acpi_link_lock);</div><div class='add'>+	mutex_lock(&amp;acpi_link_lock);</div><div class='ctx'> 	if (acpi_pci_link_allocate(link)) {</div><div class='del'>-		up(&amp;acpi_link_lock);</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		mutex_unlock(&amp;acpi_link_lock);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!link-&gt;irq.active) {</div><div class='del'>-		up(&amp;acpi_link_lock);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Link active IRQ is 0!\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		mutex_unlock(&amp;acpi_link_lock);</div><div class='add'>+		printk(KERN_ERR PREFIX "Link active IRQ is 0!\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	link-&gt;refcnt++;</div><div class='del'>-	up(&amp;acpi_link_lock);</div><div class='add'>+	mutex_unlock(&amp;acpi_link_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (triggering)</div><div class='ctx'> 		*triggering = link-&gt;irq.triggering;</div><div class='hunk'>@@ -664,7 +648,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle,</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 			  "Link %s is referenced\n",</div><div class='ctx'> 			  acpi_device_bid(link-&gt;device)));</div><div class='del'>-	return_VALUE(link-&gt;irq.active);</div><div class='add'>+	return (link-&gt;irq.active);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -677,25 +661,24 @@ int acpi_pci_link_free_irq(acpi_handle handle)</div><div class='ctx'> 	struct acpi_pci_link *link = NULL;</div><div class='ctx'> 	acpi_status result;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_free_irq");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link device\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid link device\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	link = (struct acpi_pci_link *)acpi_driver_data(device);</div><div class='ctx'> 	if (!link) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid link context\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid link context\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down(&amp;acpi_link_lock);</div><div class='add'>+	mutex_lock(&amp;acpi_link_lock);</div><div class='ctx'> 	if (!link-&gt;irq.initialized) {</div><div class='del'>-		up(&amp;acpi_link_lock);</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Link isn't initialized\n"));</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		mutex_unlock(&amp;acpi_link_lock);</div><div class='add'>+		printk(KERN_ERR PREFIX "Link isn't initialized\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef	FUTURE_USE</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -714,10 +697,10 @@ int acpi_pci_link_free_irq(acpi_handle handle)</div><div class='ctx'> 			  acpi_device_bid(link-&gt;device)));</div><div class='ctx'> </div><div class='ctx'> 	if (link-&gt;refcnt == 0) {</div><div class='del'>-		acpi_ut_evaluate_object(link-&gt;handle, "_DIS", 0, NULL);</div><div class='add'>+		acpi_ut_evaluate_object(link-&gt;device-&gt;handle, "_DIS", 0, NULL);</div><div class='ctx'> 	}</div><div class='del'>-	up(&amp;acpi_link_lock);</div><div class='del'>-	return_VALUE(link-&gt;irq.active);</div><div class='add'>+	mutex_unlock(&amp;acpi_link_lock);</div><div class='add'>+	return (link-&gt;irq.active);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -731,23 +714,21 @@ static int acpi_pci_link_add(struct acpi_device *device)</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	link = kmalloc(sizeof(struct acpi_pci_link), GFP_KERNEL);</div><div class='ctx'> 	if (!link)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(link, 0, sizeof(struct acpi_pci_link));</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;device = device;</div><div class='del'>-	link-&gt;handle = device-&gt;handle;</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = link;</div><div class='ctx'> </div><div class='del'>-	down(&amp;acpi_link_lock);</div><div class='add'>+	mutex_lock(&amp;acpi_link_lock);</div><div class='ctx'> 	result = acpi_pci_link_get_possible(link);</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -781,69 +762,61 @@ static int acpi_pci_link_add(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='ctx'> 	/* disable all links -- to be activated on use */</div><div class='del'>-	acpi_ut_evaluate_object(link-&gt;handle, "_DIS", 0, NULL);</div><div class='del'>-	up(&amp;acpi_link_lock);</div><div class='add'>+	acpi_ut_evaluate_object(device-&gt;handle, "_DIS", 0, NULL);</div><div class='add'>+	mutex_unlock(&amp;acpi_link_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (result)</div><div class='ctx'> 		kfree(link);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_pci_link_resume(struct acpi_pci_link *link)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_resume");</div><div class='ctx'> </div><div class='ctx'> 	if (link-&gt;refcnt &amp;&amp; link-&gt;irq.active &amp;&amp; link-&gt;irq.initialized)</div><div class='del'>-		return_VALUE(acpi_pci_link_set(link, link-&gt;irq.active));</div><div class='add'>+		return (acpi_pci_link_set(link, link-&gt;irq.active));</div><div class='ctx'> 	else</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * FIXME: this is a workaround to avoid nasty warning.  It will be removed</div><div class='del'>- * after every device calls pci_disable_device in .resume.</div><div class='del'>- */</div><div class='del'>-int acpi_in_resume;</div><div class='ctx'> static int irqrouter_resume(struct sys_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *node = NULL;</div><div class='ctx'> 	struct acpi_pci_link *link = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("irqrouter_resume");</div><div class='ctx'> </div><div class='del'>-	acpi_in_resume = 1;</div><div class='add'>+	/* Make sure SCI is enabled again (Apple firmware bug?) */</div><div class='add'>+	acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1, ACPI_MTX_DO_NOT_LOCK);</div><div class='add'>+</div><div class='ctx'> 	list_for_each(node, &amp;acpi_link.entries) {</div><div class='ctx'> 		link = list_entry(node, struct acpi_pci_link, node);</div><div class='ctx'> 		if (!link) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Invalid link context\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Invalid link context\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		acpi_pci_link_resume(link);</div><div class='ctx'> 	}</div><div class='del'>-	acpi_in_resume = 0;</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_pci_link_remove(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_pci_link *link = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	link = (struct acpi_pci_link *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='del'>-	down(&amp;acpi_link_lock);</div><div class='add'>+	mutex_lock(&amp;acpi_link_lock);</div><div class='ctx'> 	list_del(&amp;link-&gt;node);</div><div class='del'>-	up(&amp;acpi_link_lock);</div><div class='add'>+	mutex_unlock(&amp;acpi_link_lock);</div><div class='ctx'> </div><div class='ctx'> 	kfree(link);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -949,34 +922,32 @@ static int __init irqrouter_init_sysfs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("irqrouter_init_sysfs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled || acpi_noirq)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	error = sysdev_class_register(&amp;irqrouter_sysdev_class);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = sysdev_register(&amp;device_irqrouter);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(error);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> device_initcall(irqrouter_init_sysfs);</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_pci_link_init(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_link_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_noirq)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	acpi_link.count = 0;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;acpi_link.entries);</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_register_driver(&amp;acpi_pci_link_driver) &lt; 0)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_pci_link_init);</div><div class='head'>diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c<br/>index 4c313eab6313..0984a1ee24ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/pci_root.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/pci_root.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/pci_root.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/pci_root.c</a></div><div class='hunk'>@@ -58,7 +58,7 @@ static struct acpi_driver acpi_pci_root_driver = {</div><div class='ctx'> </div><div class='ctx'> struct acpi_pci_root {</div><div class='ctx'> 	struct list_head node;</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device * device;</div><div class='ctx'> 	struct acpi_pci_id id;</div><div class='ctx'> 	struct pci_bus *bus;</div><div class='ctx'> };</div><div class='hunk'>@@ -83,7 +83,7 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver)</div><div class='ctx'> 	list_for_each(entry, &amp;acpi_pci_roots) {</div><div class='ctx'> 		struct acpi_pci_root *root;</div><div class='ctx'> 		root = list_entry(entry, struct acpi_pci_root, node);</div><div class='del'>-		driver-&gt;add(root-&gt;handle);</div><div class='add'>+		driver-&gt;add(root-&gt;device-&gt;handle);</div><div class='ctx'> 		n++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +110,7 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)</div><div class='ctx'> 	list_for_each(entry, &amp;acpi_pci_roots) {</div><div class='ctx'> 		struct acpi_pci_root *root;</div><div class='ctx'> 		root = list_entry(entry, struct acpi_pci_root, node);</div><div class='del'>-		driver-&gt;remove(root-&gt;handle);</div><div class='add'>+		driver-&gt;remove(root-&gt;device-&gt;handle);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -160,18 +160,17 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 	unsigned long value = 0;</div><div class='ctx'> 	acpi_handle handle = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_root_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	root = kmalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);</div><div class='ctx'> 	if (!root)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(root, 0, sizeof(struct acpi_pci_root));</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;root-&gt;node);</div><div class='ctx'> </div><div class='del'>-	root-&gt;handle = device-&gt;handle;</div><div class='add'>+	root-&gt;device = device;</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = root;</div><div class='hunk'>@@ -186,7 +185,7 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 	 * -------</div><div class='ctx'> 	 * Obtained via _SEG, if exists, otherwise assumed to be zero (0).</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_evaluate_integer(root-&gt;handle, METHOD_NAME__SEG, NULL,</div><div class='add'>+	status = acpi_evaluate_integer(device-&gt;handle, METHOD_NAME__SEG, NULL,</div><div class='ctx'> 				       &amp;value);</div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 	case AE_OK:</div><div class='hunk'>@@ -198,7 +197,7 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 		root-&gt;id.segment = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _SEG\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _SEG"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -208,7 +207,7 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 	 * ---</div><div class='ctx'> 	 * Obtained via _BBN, if exists, otherwise assumed to be zero (0).</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_evaluate_integer(root-&gt;handle, METHOD_NAME__BBN, NULL,</div><div class='add'>+	status = acpi_evaluate_integer(device-&gt;handle, METHOD_NAME__BBN, NULL,</div><div class='ctx'> 				       &amp;value);</div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 	case AE_OK:</div><div class='hunk'>@@ -219,7 +218,7 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 		root-&gt;id.bus = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _BBN\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BBN"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -231,10 +230,11 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 			int bus = 0;</div><div class='ctx'> 			acpi_status status;</div><div class='ctx'> </div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Wrong _BBN value, please reboot and using option 'pci=noacpi'\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Wrong _BBN value, reboot"</div><div class='add'>+				    " and use option 'pci=noacpi'\n");</div><div class='ctx'> </div><div class='del'>-			status = try_get_root_bridge_busnr(root-&gt;handle, &amp;bus);</div><div class='add'>+			status = try_get_root_bridge_busnr(device-&gt;handle, &amp;bus);</div><div class='ctx'> 			if (ACPI_FAILURE(status))</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (bus != root-&gt;id.bus) {</div><div class='hunk'>@@ -273,9 +273,9 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 	 */</div><div class='ctx'> 	root-&gt;bus = pci_acpi_scan_root(device, root-&gt;id.segment, root-&gt;id.bus);</div><div class='ctx'> 	if (!root-&gt;bus) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Bus %04x:%02x not present in PCI namespace\n",</div><div class='del'>-				  root-&gt;id.segment, root-&gt;id.bus));</div><div class='add'>+		printk(KERN_ERR PREFIX</div><div class='add'>+			    "Bus %04x:%02x not present in PCI namespace\n",</div><div class='add'>+			    root-&gt;id.segment, root-&gt;id.bus);</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -294,9 +294,9 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 	 * -----------------</div><div class='ctx'> 	 * Evaluate and parse _PRT, if exists.</div><div class='ctx'> 	 */</div><div class='del'>-	status = acpi_get_handle(root-&gt;handle, METHOD_NAME__PRT, &amp;handle);</div><div class='add'>+	status = acpi_get_handle(device-&gt;handle, METHOD_NAME__PRT, &amp;handle);</div><div class='ctx'> 	if (ACPI_SUCCESS(status))</div><div class='del'>-		result = acpi_pci_irq_add_prt(root-&gt;handle, root-&gt;id.segment,</div><div class='add'>+		result = acpi_pci_irq_add_prt(device-&gt;handle, root-&gt;id.segment,</div><div class='ctx'> 					      root-&gt;id.bus);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='hunk'>@@ -306,46 +306,43 @@ static int acpi_pci_root_add(struct acpi_device *device)</div><div class='ctx'> 		kfree(root);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_pci_root_start(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_pci_root *root;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_root_start");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(root, &amp;acpi_pci_roots, node) {</div><div class='del'>-		if (root-&gt;handle == device-&gt;handle) {</div><div class='add'>+		if (root-&gt;device == device) {</div><div class='ctx'> 			pci_bus_add_devices(root-&gt;bus);</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_pci_root_remove(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_pci_root *root = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_root_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	root = (struct acpi_pci_root *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='ctx'> 	kfree(root);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_pci_root_init(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_pci_root_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_pci_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* DEBUG:</div><div class='ctx'> 	   acpi_dbg_layer = ACPI_PCI_COMPONENT;</div><div class='hunk'>@@ -353,9 +350,9 @@ static int __init acpi_pci_root_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_register_driver(&amp;acpi_pci_root_driver) &lt; 0)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_pci_root_init);</div><div class='head'>diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c<br/>index 62a5595ed8bc..fec225d1b6b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/power.c</a></div><div class='hunk'>@@ -70,7 +70,7 @@ static struct acpi_driver acpi_power_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_power_resource {</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device * device;</div><div class='ctx'> 	acpi_bus_id name;</div><div class='ctx'> 	u32 system_level;</div><div class='ctx'> 	u32 order;</div><div class='hunk'>@@ -80,7 +80,7 @@ struct acpi_power_resource {</div><div class='ctx'> </div><div class='ctx'> static struct list_head acpi_power_resource_list;</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_power_fops = {</div><div class='add'>+static const struct file_operations acpi_power_fops = {</div><div class='ctx'> 	.open = acpi_power_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -98,23 +98,21 @@ acpi_power_get_context(acpi_handle handle,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_get_context");</div><div class='ctx'> </div><div class='ctx'> 	if (!resource)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Error getting context [%p]\n",</div><div class='del'>-				  handle));</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Getting context [%p]\n", handle);</div><div class='add'>+		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*resource = (struct acpi_power_resource *)acpi_driver_data(device);</div><div class='ctx'> 	if (!resource)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_get_state(struct acpi_power_resource *resource)</div><div class='hunk'>@@ -122,14 +120,13 @@ static int acpi_power_get_state(struct acpi_power_resource *resource)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	unsigned long sta = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_get_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!resource)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(resource-&gt;handle, "_STA", NULL, &amp;sta);</div><div class='add'>+	status = acpi_evaluate_integer(resource-&gt;device-&gt;handle, "_STA", NULL, &amp;sta);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (sta &amp; 0x01)</div><div class='ctx'> 		resource-&gt;state = ACPI_POWER_RESOURCE_STATE_ON;</div><div class='hunk'>@@ -139,7 +136,7 @@ static int acpi_power_get_state(struct acpi_power_resource *resource)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",</div><div class='ctx'> 			  resource-&gt;name, resource-&gt;state ? "on" : "off"));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)</div><div class='hunk'>@@ -148,20 +145,19 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)</div><div class='ctx'> 	struct acpi_power_resource *resource = NULL;</div><div class='ctx'> 	u32 i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_get_list_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!list || !state)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* The state of the list is 'on' IFF all resources are 'on'. */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; list-&gt;count; i++) {</div><div class='ctx'> 		result = acpi_power_get_context(list-&gt;handles[i], &amp;resource);</div><div class='ctx'> 		if (result)</div><div class='del'>-			return_VALUE(result);</div><div class='add'>+			return result;</div><div class='ctx'> 		result = acpi_power_get_state(resource);</div><div class='ctx'> 		if (result)</div><div class='del'>-			return_VALUE(result);</div><div class='add'>+			return result;</div><div class='ctx'> </div><div class='ctx'> 		*state = resource-&gt;state;</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +168,7 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource list is %s\n",</div><div class='ctx'> 			  *state ? "on" : "off"));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_on(acpi_handle handle)</div><div class='hunk'>@@ -182,11 +178,10 @@ static int acpi_power_on(acpi_handle handle)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	struct acpi_power_resource *resource = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_on");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_power_get_context(handle, &amp;resource);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	resource-&gt;references++;</div><div class='ctx'> </div><div class='hunk'>@@ -194,29 +189,27 @@ static int acpi_power_on(acpi_handle handle)</div><div class='ctx'> 	    || (resource-&gt;state == ACPI_POWER_RESOURCE_STATE_ON)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already on\n",</div><div class='ctx'> 				  resource-&gt;name));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(resource-&gt;handle, "_ON", NULL, NULL);</div><div class='add'>+	status = acpi_evaluate_object(resource-&gt;device-&gt;handle, "_ON", NULL, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_power_get_state(resource);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> 	if (resource-&gt;state != ACPI_POWER_RESOURCE_STATE_ON)</div><div class='del'>-		return_VALUE(-ENOEXEC);</div><div class='add'>+		return -ENOEXEC;</div><div class='ctx'> </div><div class='ctx'> 	/* Update the power resource's _device_ power state */</div><div class='del'>-	result = acpi_bus_get_device(resource-&gt;handle, &amp;device);</div><div class='del'>-	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='del'>-	device-&gt;power.state = ACPI_STATE_D0;</div><div class='add'>+	device = resource-&gt;device;</div><div class='add'>+	resource-&gt;device-&gt;power.state = ACPI_STATE_D0;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned on\n",</div><div class='ctx'> 			  resource-&gt;name));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_off_device(acpi_handle handle)</div><div class='hunk'>@@ -226,11 +219,10 @@ static int acpi_power_off_device(acpi_handle handle)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	struct acpi_power_resource *resource = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_off_device");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_power_get_context(handle, &amp;resource);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	if (resource-&gt;references)</div><div class='ctx'> 		resource-&gt;references--;</div><div class='hunk'>@@ -239,35 +231,33 @@ static int acpi_power_off_device(acpi_handle handle)</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "Resource [%s] is still in use, dereferencing\n",</div><div class='ctx'> 				  device-&gt;pnp.bus_id));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (resource-&gt;state == ACPI_POWER_RESOURCE_STATE_OFF) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already off\n",</div><div class='ctx'> 				  device-&gt;pnp.bus_id));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(resource-&gt;handle, "_OFF", NULL, NULL);</div><div class='add'>+	status = acpi_evaluate_object(resource-&gt;device-&gt;handle, "_OFF", NULL, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_power_get_state(resource);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> 	if (resource-&gt;state != ACPI_POWER_RESOURCE_STATE_OFF)</div><div class='del'>-		return_VALUE(-ENOEXEC);</div><div class='add'>+		return -ENOEXEC;</div><div class='ctx'> </div><div class='ctx'> 	/* Update the power resource's _device_ power state */</div><div class='del'>-	result = acpi_bus_get_device(resource-&gt;handle, &amp;device);</div><div class='del'>-	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+	device = resource-&gt;device;</div><div class='ctx'> 	device-&gt;power.state = ACPI_STATE_D3;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned off\n",</div><div class='ctx'> 			  resource-&gt;name));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -283,31 +273,29 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device_power");</div><div class='ctx'> 	if (!dev || !dev-&gt;wakeup.flags.valid)</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	arg.integer.value = 1;</div><div class='ctx'> 	/* Open power resource */</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;wakeup.resources.count; i++) {</div><div class='ctx'> 		ret = acpi_power_on(dev-&gt;wakeup.resources.handles[i]);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Error transition power state\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Transition power state\n");</div><div class='ctx'> 			dev-&gt;wakeup.flags.valid = 0;</div><div class='del'>-			return_VALUE(-1);</div><div class='add'>+			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Execute PSW */</div><div class='ctx'> 	status = acpi_evaluate_object(dev-&gt;handle, "_PSW", &amp;arg_list, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status) &amp;&amp; (status != AE_NOT_FOUND)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluate _PSW\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Evaluate _PSW\n");</div><div class='ctx'> 		dev-&gt;wakeup.flags.valid = 0;</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -323,32 +311,30 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_disable_wakeup_device_power");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !dev-&gt;wakeup.flags.valid)</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	arg.integer.value = 0;</div><div class='ctx'> 	/* Execute PSW */</div><div class='ctx'> 	status = acpi_evaluate_object(dev-&gt;handle, "_PSW", &amp;arg_list, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status) &amp;&amp; (status != AE_NOT_FOUND)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluate _PSW\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Evaluate _PSW\n");</div><div class='ctx'> 		dev-&gt;wakeup.flags.valid = 0;</div><div class='del'>-		return_VALUE(-1);</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Close power resource */</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;wakeup.resources.count; i++) {</div><div class='ctx'> 		ret = acpi_power_off_device(dev-&gt;wakeup.resources.handles[i]);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Error transition power state\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Transition power state\n");</div><div class='ctx'> 			dev-&gt;wakeup.flags.valid = 0;</div><div class='del'>-			return_VALUE(-1);</div><div class='add'>+			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -362,10 +348,9 @@ int acpi_power_get_inferred_state(struct acpi_device *device)</div><div class='ctx'> 	int list_state = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_get_inferred_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;power.state = ACPI_STATE_UNKNOWN;</div><div class='ctx'> </div><div class='hunk'>@@ -380,17 +365,17 @@ int acpi_power_get_inferred_state(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 		result = acpi_power_get_list_state(list, &amp;list_state);</div><div class='ctx'> 		if (result)</div><div class='del'>-			return_VALUE(result);</div><div class='add'>+			return result;</div><div class='ctx'> </div><div class='ctx'> 		if (list_state == ACPI_POWER_RESOURCE_STATE_ON) {</div><div class='ctx'> 			device-&gt;power.state = i;</div><div class='del'>-			return_VALUE(0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;power.state = ACPI_STATE_D3;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_power_transition(struct acpi_device *device, int state)</div><div class='hunk'>@@ -400,14 +385,13 @@ int acpi_power_transition(struct acpi_device *device, int state)</div><div class='ctx'> 	struct acpi_handle_list *tl = NULL;	/* Target Resources */</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_transition");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || (state &lt; ACPI_STATE_D0) || (state &gt; ACPI_STATE_D3))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((device-&gt;power.state &lt; ACPI_STATE_D0)</div><div class='ctx'> 	    || (device-&gt;power.state &gt; ACPI_STATE_D3))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	cl = &amp;device-&gt;power.states[device-&gt;power.state].resources;</div><div class='ctx'> 	tl = &amp;device-&gt;power.states[state].resources;</div><div class='hunk'>@@ -444,11 +428,10 @@ int acpi_power_transition(struct acpi_device *device, int state)</div><div class='ctx'> 	device-&gt;power.state = state;</div><div class='ctx'>       end:</div><div class='ctx'> 	if (result)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Error transitioning device [%s] to D%d\n",</div><div class='del'>-				  device-&gt;pnp.bus_id, state));</div><div class='add'>+		printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",</div><div class='add'>+			      device-&gt;pnp.bus_id, state);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -461,7 +444,6 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_power_resource *resource = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	resource = (struct acpi_power_resource *)seq-&gt;private;</div><div class='ctx'> </div><div class='hunk'>@@ -488,7 +470,7 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   resource-&gt;order, resource-&gt;references);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -500,36 +482,32 @@ static int acpi_power_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_power_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 'status' [R] */</div><div class='ctx'> 	entry = create_proc_entry(ACPI_POWER_FILE_STATUS,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_POWER_FILE_STATUS));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_power_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_POWER_FILE_STATUS,</div><div class='hunk'>@@ -538,7 +516,7 @@ static int acpi_power_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -553,24 +531,23 @@ static int acpi_power_add(struct acpi_device *device)</div><div class='ctx'> 	union acpi_object acpi_object;</div><div class='ctx'> 	struct acpi_buffer buffer = { sizeof(acpi_object), &amp;acpi_object };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	resource = kmalloc(sizeof(struct acpi_power_resource), GFP_KERNEL);</div><div class='ctx'> 	if (!resource)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(resource, 0, sizeof(struct acpi_power_resource));</div><div class='ctx'> </div><div class='del'>-	resource-&gt;handle = device-&gt;handle;</div><div class='add'>+	resource-&gt;device = device;</div><div class='ctx'> 	strcpy(resource-&gt;name, device-&gt;pnp.bus_id);</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_POWER_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = resource;</div><div class='ctx'> </div><div class='ctx'> 	/* Evalute the object to get the system level and resource order. */</div><div class='del'>-	status = acpi_evaluate_object(resource-&gt;handle, NULL, NULL, &amp;buffer);</div><div class='add'>+	status = acpi_evaluate_object(device-&gt;handle, NULL, NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -605,17 +582,16 @@ static int acpi_power_add(struct acpi_device *device)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		kfree(resource);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_power_remove(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_power_resource *resource = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	resource = (struct acpi_power_resource *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -623,31 +599,30 @@ static int acpi_power_remove(struct acpi_device *device, int type)</div><div class='ctx'> </div><div class='ctx'> 	kfree(resource);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_power_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_power_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;acpi_power_resource_list);</div><div class='ctx'> </div><div class='ctx'> 	acpi_power_dir = proc_mkdir(ACPI_POWER_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_power_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_power_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_POWER_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_power_init);</div><div class='head'>diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c<br/>index 713b763884a9..b13d64415b7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/processor_core.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ static struct acpi_driver acpi_processor_driver = {</div><div class='ctx'> #define INSTALL_NOTIFY_HANDLER		1</div><div class='ctx'> #define UNINSTALL_NOTIFY_HANDLER	2</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_processor_info_fops = {</div><div class='add'>+static const struct file_operations acpi_processor_info_fops = {</div><div class='ctx'> 	.open = acpi_processor_info_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -110,7 +110,7 @@ static struct file_operations acpi_processor_info_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_processor *processors[NR_CPUS];</div><div class='del'>-struct acpi_processor_errata errata;</div><div class='add'>+struct acpi_processor_errata errata __read_mostly;</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                                 Errata Handling</div><div class='hunk'>@@ -122,10 +122,9 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)</div><div class='ctx'> 	u8 value1 = 0;</div><div class='ctx'> 	u8 value2 = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_errata_piix4");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that 'dev' references the PIIX4 ACPI Controller.</div><div class='hunk'>@@ -218,7 +217,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "Type-F DMA livelock erratum (C3 disabled)\n"));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_errata(struct acpi_processor *pr)</div><div class='hunk'>@@ -226,10 +225,9 @@ static int acpi_processor_errata(struct acpi_processor *pr)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct pci_dev *dev = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_errata");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PIIX4</div><div class='hunk'>@@ -242,7 +240,7 @@ static int acpi_processor_errata(struct acpi_processor *pr)</div><div class='ctx'> 		pci_dev_put(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -258,10 +256,9 @@ static int acpi_processor_set_pdc(struct acpi_processor *pr)</div><div class='ctx'> 	struct acpi_object_list *pdc_in = pr-&gt;pdc;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_set_pdc");</div><div class='ctx'> </div><div class='ctx'> 	if (!pdc_in)</div><div class='del'>-		return_VALUE(status);</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(pr-&gt;handle, "_PDC", pdc_in, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +266,7 @@ static int acpi_processor_set_pdc(struct acpi_processor *pr)</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 		    "Could not evaluate _PDC, using legacy perf. control...\n"));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -282,7 +279,6 @@ static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_processor *pr = (struct acpi_processor *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_info_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -301,7 +297,7 @@ static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   pr-&gt;flags.limit ? "yes" : "no");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -314,13 +310,12 @@ static int acpi_processor_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_processor_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='hunk'>@@ -328,9 +323,7 @@ static int acpi_processor_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry = create_proc_entry(ACPI_PROCESSOR_FILE_INFO,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_PROCESSOR_FILE_INFO));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_processor_info_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -342,9 +335,7 @@ static int acpi_processor_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_PROCESSOR_FILE_THROTTLING));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_processor_throttling_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -356,21 +347,18 @@ static int acpi_processor_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_PROCESSOR_FILE_LIMIT));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_processor_limit_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_PROCESSOR_FILE_INFO,</div><div class='hunk'>@@ -383,12 +371,12 @@ static int acpi_processor_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Use the acpiid in MADT to map cpus in case of SMP */</div><div class='ctx'> #ifndef CONFIG_SMP</div><div class='del'>-#define convert_acpiid_to_cpu(acpi_id) (0xff)</div><div class='add'>+#define convert_acpiid_to_cpu(acpi_id) (-1)</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IA64</div><div class='hunk'>@@ -401,7 +389,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)</div><div class='ctx'> #define ARCH_BAD_APICID		(0xff)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static u8 convert_acpiid_to_cpu(u8 acpi_id)</div><div class='add'>+static int convert_acpiid_to_cpu(u8 acpi_id)</div><div class='ctx'> {</div><div class='ctx'> 	u16 apic_id;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -427,13 +415,12 @@ static int acpi_processor_get_info(struct acpi_processor *pr)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	union acpi_object object = { 0 };</div><div class='ctx'> 	struct acpi_buffer buffer = { sizeof(union acpi_object), &amp;object };</div><div class='del'>-	u8 cpu_index;</div><div class='add'>+	int cpu_index;</div><div class='ctx'> 	static int cpu0_initialized;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (num_online_cpus() &gt; 1)</div><div class='ctx'> 		errata.smp = TRUE;</div><div class='hunk'>@@ -459,9 +446,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_evaluate_object(pr-&gt;handle, NULL, NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error evaluating processor object\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_ERR PREFIX "Evaluating processor object\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -473,7 +459,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)</div><div class='ctx'> 	cpu_index = convert_acpiid_to_cpu(pr-&gt;acpi_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Handle UP system running SMP kernel, with no LAPIC in MADT */</div><div class='del'>-	if (!cpu0_initialized &amp;&amp; (cpu_index == 0xff) &amp;&amp;</div><div class='add'>+	if (!cpu0_initialized &amp;&amp; (cpu_index == -1) &amp;&amp;</div><div class='ctx'> 	    (num_online_cpus() == 1)) {</div><div class='ctx'> 		cpu_index = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -487,13 +473,13 @@ static int acpi_processor_get_info(struct acpi_processor *pr)</div><div class='ctx'> 	 *  less than the max # of CPUs. They should be ignored _iff</div><div class='ctx'> 	 *  they are physically not present.</div><div class='ctx'> 	 */</div><div class='del'>-	if (cpu_index &gt;= NR_CPUS) {</div><div class='add'>+	if (cpu_index == -1) {</div><div class='ctx'> 		if (ACPI_FAILURE</div><div class='ctx'> 		    (acpi_processor_hotadd_init(pr-&gt;handle, &amp;pr-&gt;id))) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Error getting cpuindex for acpiid 0x%x\n",</div><div class='del'>-					  pr-&gt;acpi_id));</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Getting cpuindex for acpiid 0x%x\n",</div><div class='add'>+				    pr-&gt;acpi_id);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -503,8 +489,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)</div><div class='ctx'> 	if (!object.processor.pblk_address)</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));</div><div class='ctx'> 	else if (object.processor.pblk_length != 6)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid PBLK length [%d]\n",</div><div class='del'>-				  object.processor.pblk_length));</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid PBLK length [%d]\n",</div><div class='add'>+			    object.processor.pblk_length);</div><div class='ctx'> 	else {</div><div class='ctx'> 		pr-&gt;throttling.address = object.processor.pblk_address;</div><div class='ctx'> 		pr-&gt;throttling.duty_offset = acpi_fadt.duty_offset;</div><div class='hunk'>@@ -528,7 +514,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)</div><div class='ctx'> 	acpi_processor_get_throttling_info(pr);</div><div class='ctx'> 	acpi_processor_get_limit_info(pr);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *processor_device_array[NR_CPUS];</div><div class='hunk'>@@ -539,14 +525,13 @@ static int acpi_processor_start(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_start");</div><div class='ctx'> </div><div class='ctx'> 	pr = acpi_driver_data(device);</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_processor_get_info(pr);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		/* Processor is physically not present */</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON((pr-&gt;id &gt;= NR_CPUS) || (pr-&gt;id &lt; 0));</div><div class='hunk'>@@ -558,9 +543,9 @@ static int acpi_processor_start(struct acpi_device *device)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (processor_device_array[pr-&gt;id] != NULL &amp;&amp;</div><div class='ctx'> 	    processor_device_array[pr-&gt;id] != (void *)device) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "BIOS reporting wrong ACPI id"</div><div class='del'>-			"for the processor\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		printk(KERN_WARNING "BIOS reported wrong ACPI id"</div><div class='add'>+			"for the processor\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	processor_device_array[pr-&gt;id] = (void *)device;</div><div class='ctx'> </div><div class='hunk'>@@ -572,10 +557,6 @@ static int acpi_processor_start(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_install_notify_handler(pr-&gt;handle, ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					     acpi_processor_notify, pr);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error installing device notify handler\n"));</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* _PDC call should be done before doing anything else (if reqd.). */</div><div class='ctx'> 	arch_acpi_processor_init_pdc(pr);</div><div class='hunk'>@@ -592,7 +573,7 @@ static int acpi_processor_start(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)</div><div class='hunk'>@@ -600,13 +581,12 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_processor *pr = (struct acpi_processor *)data;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_notify");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(pr-&gt;handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:</div><div class='hunk'>@@ -624,21 +604,20 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_add(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_processor *pr = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pr = kmalloc(sizeof(struct acpi_processor), GFP_KERNEL);</div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(pr, 0, sizeof(struct acpi_processor));</div><div class='ctx'> </div><div class='ctx'> 	pr-&gt;handle = device-&gt;handle;</div><div class='hunk'>@@ -646,7 +625,7 @@ static int acpi_processor_add(struct acpi_device *device)</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_PROCESSOR_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = pr;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -654,31 +633,26 @@ static int acpi_processor_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_processor *pr = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	pr = (struct acpi_processor *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='ctx'> 	if (pr-&gt;id &gt;= NR_CPUS) {</div><div class='ctx'> 		kfree(pr);</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (type == ACPI_BUS_REMOVAL_EJECT) {</div><div class='ctx'> 		if (acpi_processor_handle_eject(pr))</div><div class='del'>-			return_VALUE(-EINVAL);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_power_exit(pr, device);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_remove_notify_handler(pr-&gt;handle, ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					    acpi_processor_notify);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_remove_fs(device);</div><div class='ctx'> </div><div class='hunk'>@@ -686,7 +660,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)</div><div class='ctx'> </div><div class='ctx'> 	kfree(pr);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI_HOTPLUG_CPU</div><div class='hunk'>@@ -701,15 +675,13 @@ static int is_processor_present(acpi_handle handle)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	unsigned long sta = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("is_processor_present");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_integer(handle, "_STA", NULL, &amp;sta);</div><div class='ctx'> 	if (ACPI_FAILURE(status) || !(sta &amp; ACPI_STA_PRESENT)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Processor Device is not present\n"));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Processor Device is not present"));</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(1);</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='hunk'>@@ -719,30 +691,29 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)</div><div class='ctx'> 	struct acpi_device *pdev;</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_device_add");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_get_parent(handle, &amp;phandle)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(phandle, &amp;pdev)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_PROCESSOR)) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_start(*device);</div><div class='ctx'> </div><div class='ctx'> 	pr = acpi_driver_data(*device);</div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if ((pr-&gt;id &gt;= 0) &amp;&amp; (pr-&gt;id &lt; NR_CPUS)) {</div><div class='ctx'> 		kobject_uevent(&amp;(*device)-&gt;kobj, KOBJ_ONLINE);</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -752,7 +723,6 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_hotplug_notify");</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_NOTIFY_BUS_CHECK:</div><div class='hunk'>@@ -767,15 +737,14 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		if (acpi_bus_get_device(handle, &amp;device)) {</div><div class='ctx'> 			result = acpi_processor_device_add(handle, &amp;device);</div><div class='ctx'> 			if (result)</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-						  "Unable to add the device\n"));</div><div class='add'>+				printk(KERN_ERR PREFIX</div><div class='add'>+					    "Unable to add the device\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pr = acpi_driver_data(device);</div><div class='ctx'> 		if (!pr) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Driver data is NULL\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Driver data is NULL\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -788,9 +757,8 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		if ((!result) &amp;&amp; ((pr-&gt;id &gt;= 0) &amp;&amp; (pr-&gt;id &lt; NR_CPUS))) {</div><div class='ctx'> 			kobject_uevent(&amp;device-&gt;kobj, KOBJ_ONLINE);</div><div class='ctx'> 		} else {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Device [%s] failed to start\n",</div><div class='del'>-					  acpi_device_bid(device)));</div><div class='add'>+			printk(KERN_ERR PREFIX "Device [%s] failed to start\n",</div><div class='add'>+				    acpi_device_bid(device));</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACPI_NOTIFY_EJECT_REQUEST:</div><div class='hunk'>@@ -798,15 +766,15 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 				  "received ACPI_NOTIFY_EJECT_REQUEST\n"));</div><div class='ctx'> </div><div class='ctx'> 		if (acpi_bus_get_device(handle, &amp;device)) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Device don't exist, dropping EJECT\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Device don't exist, dropping EJECT\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		pr = acpi_driver_data(device);</div><div class='ctx'> 		if (!pr) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Driver data is NULL, dropping EJECT\n"));</div><div class='del'>-			return_VOID;</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Driver data is NULL, dropping EJECT\n");</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((pr-&gt;id &lt; NR_CPUS) &amp;&amp; (cpu_present(pr-&gt;id)))</div><div class='hunk'>@@ -818,7 +786,7 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -857,21 +825,20 @@ processor_walk_namespace_cb(acpi_handle handle,</div><div class='ctx'> </div><div class='ctx'> static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_hotadd_init");</div><div class='ctx'> </div><div class='ctx'> 	if (!is_processor_present(handle)) {</div><div class='del'>-		return_VALUE(AE_ERROR);</div><div class='add'>+		return AE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_map_lsapic(handle, p_cpu))</div><div class='del'>-		return_VALUE(AE_ERROR);</div><div class='add'>+		return AE_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	if (arch_register_cpu(*p_cpu)) {</div><div class='ctx'> 		acpi_unmap_lsapic(*p_cpu);</div><div class='del'>-		return_VALUE(AE_ERROR);</div><div class='add'>+		return AE_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_handle_eject(struct acpi_processor *pr)</div><div class='hunk'>@@ -928,20 +895,19 @@ static int __init acpi_processor_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_init");</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;processors, 0, sizeof(processors));</div><div class='ctx'> 	memset(&amp;errata, 0, sizeof(errata));</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_processor_dir)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	acpi_processor_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_processor_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_install_hotplug_notify();</div><div class='hunk'>@@ -950,12 +916,11 @@ static int __init acpi_processor_init(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_ppc_init();</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_processor_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_processor_ppc_exit();</div><div class='ctx'> </div><div class='hunk'>@@ -967,7 +932,7 @@ static void __exit acpi_processor_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_processor_init);</div><div class='head'>diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c<br/>index 80fa43471f48..71066066d626 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_idle.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_idle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_idle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/processor_idle.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2001, 2002 Andy Grover &lt;andrew.grover@intel.com&gt;</div><div class='ctx'>  *  Copyright (C) 2001, 2002 Paul Diefenbaugh &lt;paul.s.diefenbaugh@intel.com&gt;</div><div class='del'>- *  Copyright (C) 2004       Dominik Brodowski &lt;linux@brodo.de&gt;</div><div class='add'>+ *  Copyright (C) 2004, 2005 Dominik Brodowski &lt;linux@brodo.de&gt;</div><div class='ctx'>  *  Copyright (C) 2004  Anil S Keshavamurthy &lt;anil.s.keshavamurthy@intel.com&gt;</div><div class='ctx'>  *  			- Added processor hotplug support</div><div class='ctx'>  *  Copyright (C) 2005  Venkatesh Pallipadi &lt;venkatesh.pallipadi@intel.com&gt;</div><div class='hunk'>@@ -54,10 +54,10 @@ ACPI_MODULE_NAME("acpi_processor")</div><div class='ctx'> #define US_TO_PM_TIMER_TICKS(t)		((t * (PM_TIMER_FREQUENCY/1000)) / 1000)</div><div class='ctx'> #define C2_OVERHEAD			4	/* 1us (3.579 ticks per us) */</div><div class='ctx'> #define C3_OVERHEAD			4	/* 1us (3.579 ticks per us) */</div><div class='del'>-static void (*pm_idle_save) (void);</div><div class='add'>+static void (*pm_idle_save) (void) __read_mostly;</div><div class='ctx'> module_param(max_cstate, uint, 0644);</div><div class='ctx'> </div><div class='del'>-static unsigned int nocst = 0;</div><div class='add'>+static unsigned int nocst __read_mostly;</div><div class='ctx'> module_param(nocst, uint, 0000);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -67,7 +67,7 @@ module_param(nocst, uint, 0000);</div><div class='ctx'>  * 100 HZ: 0x0000000F: 4 jiffies = 40ms</div><div class='ctx'>  * reduce history for more aggressive entry into C3</div><div class='ctx'>  */</div><div class='del'>-static unsigned int bm_history =</div><div class='add'>+static unsigned int bm_history __read_mostly =</div><div class='ctx'>     (HZ &gt;= 800 ? 0xFFFFFFFF : ((1U &lt;&lt; (HZ / 25)) - 1));</div><div class='ctx'> module_param(bm_history, uint, 0644);</div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -99,6 +99,9 @@ static int set_max_cstate(struct dmi_system_id *id)</div><div class='ctx'> static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {</div><div class='ctx'> 	{ set_max_cstate, "IBM ThinkPad R40e", {</div><div class='ctx'> 	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),</div><div class='add'>+	  DMI_MATCH(DMI_BIOS_VERSION,"1SET70WW")}, (void *)1},</div><div class='add'>+	{ set_max_cstate, "IBM ThinkPad R40e", {</div><div class='add'>+	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),</div><div class='ctx'> 	  DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1},</div><div class='ctx'> 	{ set_max_cstate, "IBM ThinkPad R40e", {</div><div class='ctx'> 	  DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),</div><div class='hunk'>@@ -206,11 +209,11 @@ acpi_processor_power_activate(struct acpi_processor *pr,</div><div class='ctx'> </div><div class='ctx'> static void acpi_safe_halt(void)</div><div class='ctx'> {</div><div class='del'>-	clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+	current_thread_info()-&gt;status &amp;= ~TS_POLLING;</div><div class='ctx'> 	smp_mb__after_clear_bit();</div><div class='ctx'> 	if (!need_resched())</div><div class='ctx'> 		safe_halt();</div><div class='del'>-	set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+	current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static atomic_t c3_cpu_count;</div><div class='hunk'>@@ -261,21 +264,15 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		u32 bm_status = 0;</div><div class='ctx'> 		unsigned long diff = jiffies - pr-&gt;power.bm_check_timestamp;</div><div class='ctx'> </div><div class='del'>-		if (diff &gt; 32)</div><div class='del'>-			diff = 32;</div><div class='add'>+		if (diff &gt; 31)</div><div class='add'>+			diff = 31;</div><div class='ctx'> </div><div class='del'>-		while (diff) {</div><div class='del'>-			/* if we didn't get called, assume there was busmaster activity */</div><div class='del'>-			diff--;</div><div class='del'>-			if (diff)</div><div class='del'>-				pr-&gt;power.bm_activity |= 0x1;</div><div class='del'>-			pr-&gt;power.bm_activity &lt;&lt;= 1;</div><div class='del'>-		}</div><div class='add'>+		pr-&gt;power.bm_activity &lt;&lt;= diff;</div><div class='ctx'> </div><div class='ctx'> 		acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS,</div><div class='ctx'> 				  &amp;bm_status, ACPI_MTX_DO_NOT_LOCK);</div><div class='ctx'> 		if (bm_status) {</div><div class='del'>-			pr-&gt;power.bm_activity++;</div><div class='add'>+			pr-&gt;power.bm_activity |= 0x1;</div><div class='ctx'> 			acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS,</div><div class='ctx'> 					  1, ACPI_MTX_DO_NOT_LOCK);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -287,16 +284,16 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		else if (errata.piix4.bmisx) {</div><div class='ctx'> 			if ((inb_p(errata.piix4.bmisx + 0x02) &amp; 0x01)</div><div class='ctx'> 			    || (inb_p(errata.piix4.bmisx + 0x0A) &amp; 0x01))</div><div class='del'>-				pr-&gt;power.bm_activity++;</div><div class='add'>+				pr-&gt;power.bm_activity |= 0x1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pr-&gt;power.bm_check_timestamp = jiffies;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Apply bus mastering demotion policy.  Automatically demote</div><div class='add'>+		 * If bus mastering is or was active this jiffy, demote</div><div class='ctx'> 		 * to avoid a faulty transition.  Note that the processor</div><div class='ctx'> 		 * won't enter a low-power state during this call (to this</div><div class='del'>-		 * funciton) but should upon the next.</div><div class='add'>+		 * function) but should upon the next.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * TBD: A better policy might be to fallback to the demotion</div><div class='ctx'> 		 *      state (use it for this quantum only) istead of</div><div class='hunk'>@@ -304,7 +301,8 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		 *      qualification.  This may, however, introduce DMA</div><div class='ctx'> 		 *      issues (e.g. floppy DMA transfer overrun/underrun).</div><div class='ctx'> 		 */</div><div class='del'>-		if (pr-&gt;power.bm_activity &amp; cx-&gt;demotion.threshold.bm) {</div><div class='add'>+		if ((pr-&gt;power.bm_activity &amp; 0x1) &amp;&amp;</div><div class='add'>+		    cx-&gt;demotion.threshold.bm) {</div><div class='ctx'> 			local_irq_enable();</div><div class='ctx'> 			next_state = cx-&gt;demotion.state;</div><div class='ctx'> 			goto end;</div><div class='hunk'>@@ -322,18 +320,16 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		cx = &amp;pr-&gt;power.states[ACPI_STATE_C1];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	cx-&gt;usage++;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Sleep:</div><div class='ctx'> 	 * ------</div><div class='ctx'> 	 * Invoke the current Cx state to put the processor to sleep.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cx-&gt;type == ACPI_STATE_C2 || cx-&gt;type == ACPI_STATE_C3) {</div><div class='del'>-		clear_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status &amp;= ~TS_POLLING;</div><div class='ctx'> 		smp_mb__after_clear_bit();</div><div class='ctx'> 		if (need_resched()) {</div><div class='del'>-			set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+			current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> 			local_irq_enable();</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -365,13 +361,20 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		t1 = inl(acpi_fadt.xpm_tmr_blk.address);</div><div class='ctx'> 		/* Invoke C2 */</div><div class='ctx'> 		inb(cx-&gt;address);</div><div class='del'>-		/* Dummy op - must do something useless after P_LVL2 read */</div><div class='add'>+		/* Dummy wait op - must do something useless after P_LVL2 read</div><div class='add'>+		   because chipsets cannot guarantee that STPCLK# signal</div><div class='add'>+		   gets asserted in time to freeze execution properly. */</div><div class='ctx'> 		t2 = inl(acpi_fadt.xpm_tmr_blk.address);</div><div class='ctx'> 		/* Get end time (ticks) */</div><div class='ctx'> 		t2 = inl(acpi_fadt.xpm_tmr_blk.address);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GENERIC_TIME</div><div class='add'>+		/* TSC halts in C2, so notify users */</div><div class='add'>+		mark_tsc_unstable();</div><div class='add'>+#endif</div><div class='ctx'> 		/* Re-enable interrupts */</div><div class='ctx'> 		local_irq_enable();</div><div class='del'>-		set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> 		/* Compute time (ticks) that we were actually asleep */</div><div class='ctx'> 		sleep_ticks =</div><div class='ctx'> 		    ticks_elapsed(t1, t2) - cx-&gt;latency_ticks - C2_OVERHEAD;</div><div class='hunk'>@@ -398,7 +401,7 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		t1 = inl(acpi_fadt.xpm_tmr_blk.address);</div><div class='ctx'> 		/* Invoke C3 */</div><div class='ctx'> 		inb(cx-&gt;address);</div><div class='del'>-		/* Dummy op - must do something useless after P_LVL3 read */</div><div class='add'>+		/* Dummy wait op (see above) */</div><div class='ctx'> 		t2 = inl(acpi_fadt.xpm_tmr_blk.address);</div><div class='ctx'> 		/* Get end time (ticks) */</div><div class='ctx'> 		t2 = inl(acpi_fadt.xpm_tmr_blk.address);</div><div class='hunk'>@@ -409,9 +412,13 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 					  ACPI_MTX_DO_NOT_LOCK);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GENERIC_TIME</div><div class='add'>+		/* TSC halts in C3, so notify users */</div><div class='add'>+		mark_tsc_unstable();</div><div class='add'>+#endif</div><div class='ctx'> 		/* Re-enable interrupts */</div><div class='ctx'> 		local_irq_enable();</div><div class='del'>-		set_thread_flag(TIF_POLLING_NRFLAG);</div><div class='add'>+		current_thread_info()-&gt;status |= TS_POLLING;</div><div class='ctx'> 		/* Compute time (ticks) that we were actually asleep */</div><div class='ctx'> 		sleep_ticks =</div><div class='ctx'> 		    ticks_elapsed(t1, t2) - cx-&gt;latency_ticks - C3_OVERHEAD;</div><div class='hunk'>@@ -421,6 +428,9 @@ static void acpi_processor_idle(void)</div><div class='ctx'> 		local_irq_enable();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	cx-&gt;usage++;</div><div class='add'>+	if ((cx-&gt;type != ACPI_STATE_C1) &amp;&amp; (sleep_ticks &gt; 0))</div><div class='add'>+		cx-&gt;time += sleep_ticks;</div><div class='ctx'> </div><div class='ctx'> 	next_state = pr-&gt;power.state;</div><div class='ctx'> </div><div class='hunk'>@@ -508,10 +518,9 @@ static int acpi_processor_set_power_policy(struct acpi_processor *pr)</div><div class='ctx'> 	struct acpi_processor_cx *higher = NULL;</div><div class='ctx'> 	struct acpi_processor_cx *cx;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_set_power_policy");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This function sets the default Cx state policy (OS idle handler).</div><div class='hunk'>@@ -535,7 +544,7 @@ static int acpi_processor_set_power_policy(struct acpi_processor *pr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!state_is_set)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* demotion */</div><div class='ctx'> 	for (i = 1; i &lt; ACPI_PROCESSOR_MAX_POWER; i++) {</div><div class='hunk'>@@ -574,18 +583,17 @@ static int acpi_processor_set_power_policy(struct acpi_processor *pr)</div><div class='ctx'> 		higher = cx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_fadt");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!pr-&gt;pblk)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* if info is obtained from pblk/fadt, type equals state */</div><div class='ctx'> 	pr-&gt;power.states[ACPI_STATE_C2].type = ACPI_STATE_C2;</div><div class='hunk'>@@ -597,7 +605,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)</div><div class='ctx'> 	 * an SMP system. </div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((num_online_cpus() &gt; 1) &amp;&amp; !acpi_fadt.plvl2_up)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* determine C2 and C3 address from pblk */</div><div class='hunk'>@@ -613,12 +621,11 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)</div><div class='ctx'> 			  pr-&gt;power.states[ACPI_STATE_C2].address,</div><div class='ctx'> 			  pr-&gt;power.states[ACPI_STATE_C3].address));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_get_power_info_default_c1(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_default_c1");</div><div class='ctx'> </div><div class='ctx'> 	/* Zero initialize all the C-states info. */</div><div class='ctx'> 	memset(pr-&gt;power.states, 0, sizeof(pr-&gt;power.states));</div><div class='hunk'>@@ -631,7 +638,7 @@ static int acpi_processor_get_power_info_default_c1(struct acpi_processor *pr)</div><div class='ctx'> 	pr-&gt;power.states[ACPI_STATE_C0].valid = 1;</div><div class='ctx'> 	pr-&gt;power.states[ACPI_STATE_C1].valid = 1;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)</div><div class='hunk'>@@ -643,10 +650,9 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	union acpi_object *cst;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_cst");</div><div class='ctx'> </div><div class='ctx'> 	if (nocst)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	current_count = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -658,15 +664,14 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)</div><div class='ctx'> 	status = acpi_evaluate_object(pr-&gt;handle, "_CST", NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _CST, giving up\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cst = (union acpi_object *)buffer.pointer;</div><div class='ctx'> </div><div class='ctx'> 	/* There must be at least 2 elements */</div><div class='ctx'> 	if (!cst || (cst-&gt;type != ACPI_TYPE_PACKAGE) || cst-&gt;package.count &lt; 2) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "not enough elements in _CST\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "not enough elements in _CST\n");</div><div class='ctx'> 		status = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -675,8 +680,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)</div><div class='ctx'> </div><div class='ctx'> 	/* Validate number of power states. */</div><div class='ctx'> 	if (count &lt; 1 || count != cst-&gt;package.count - 1) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "count given by _CST is not valid\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "count given by _CST is not valid\n");</div><div class='ctx'> 		status = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -764,17 +768,16 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)</div><div class='ctx'> 		status = -EFAULT;</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_power_verify_c2");</div><div class='ctx'> </div><div class='ctx'> 	if (!cx-&gt;address)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * C2 latency must be less than or equal to 100</div><div class='hunk'>@@ -783,7 +786,7 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)</div><div class='ctx'> 	else if (cx-&gt;latency &gt; ACPI_PROCESSOR_MAX_C2_LATENCY) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "latency too large [%d]\n", cx-&gt;latency));</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -793,7 +796,7 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)</div><div class='ctx'> 	cx-&gt;valid = 1;</div><div class='ctx'> 	cx-&gt;latency_ticks = US_TO_PM_TIMER_TICKS(cx-&gt;latency);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='hunk'>@@ -801,10 +804,9 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='ctx'> {</div><div class='ctx'> 	static int bm_check_flag;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_power_verify_c3");</div><div class='ctx'> </div><div class='ctx'> 	if (!cx-&gt;address)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * C3 latency must be less than or equal to 1000</div><div class='hunk'>@@ -813,7 +815,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='ctx'> 	else if (cx-&gt;latency &gt; ACPI_PROCESSOR_MAX_C3_LATENCY) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "latency too large [%d]\n", cx-&gt;latency));</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -826,7 +828,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='ctx'> 	else if (errata.piix4.fdma) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "C3 not supported on PIIX4 with Type-F DMA\n"));</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* All the logic here assumes flags.bm_check is same across all CPUs */</div><div class='hunk'>@@ -843,7 +845,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='ctx'> 		if (!pr-&gt;flags.bm_control) {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 					  "C3 support requires bus mastering control\n"));</div><div class='del'>-			return_VOID;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -854,7 +856,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 					  "Cache invalidation should work properly"</div><div class='ctx'> 					  " for C3 to be enabled on SMP systems\n"));</div><div class='del'>-			return_VOID;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD,</div><div class='ctx'> 				  0, ACPI_MTX_DO_NOT_LOCK);</div><div class='hunk'>@@ -869,7 +871,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,</div><div class='ctx'> 	cx-&gt;valid = 1;</div><div class='ctx'> 	cx-&gt;latency_ticks = US_TO_PM_TIMER_TICKS(cx-&gt;latency);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_power_verify(struct acpi_processor *pr)</div><div class='hunk'>@@ -928,7 +930,6 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_power_info");</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: the idle thread may not be running while calling</div><div class='ctx'> 	 * this function */</div><div class='hunk'>@@ -951,7 +952,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)</div><div class='ctx'> 	 */</div><div class='ctx'> 	result = acpi_processor_set_power_policy(pr);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if one state of type C2 or C3 is available, mark this</div><div class='hunk'>@@ -965,24 +966,23 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_cst_has_changed(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_cst_has_changed");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (nocst) {</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pr-&gt;flags.power_setup_done)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Fall back to the default idle loop */</div><div class='ctx'> 	pm_idle = pm_idle_save;</div><div class='hunk'>@@ -993,7 +993,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)</div><div class='ctx'> 	if ((pr-&gt;flags.power == 1) &amp;&amp; (pr-&gt;flags.power_setup_done))</div><div class='ctx'> 		pm_idle = acpi_processor_idle;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* proc interface */</div><div class='hunk'>@@ -1003,7 +1003,6 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_processor *pr = (struct acpi_processor *)seq-&gt;private;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_power_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -1055,13 +1054,14 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		else</div><div class='ctx'> 			seq_puts(seq, "demotion[--] ");</div><div class='ctx'> </div><div class='del'>-		seq_printf(seq, "latency[%03d] usage[%08d]\n",</div><div class='add'>+		seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",</div><div class='ctx'> 			   pr-&gt;power.states[i].latency,</div><div class='del'>-			   pr-&gt;power.states[i].usage);</div><div class='add'>+			   pr-&gt;power.states[i].usage,</div><div class='add'>+			   pr-&gt;power.states[i].time);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_power_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1070,7 +1070,7 @@ static int acpi_processor_power_open_fs(struct inode *inode, struct file *file)</div><div class='ctx'> 			   PDE(inode)-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_processor_power_fops = {</div><div class='add'>+static const struct file_operations acpi_processor_power_fops = {</div><div class='ctx'> 	.open = acpi_processor_power_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -1081,11 +1081,10 @@ int acpi_processor_power_init(struct acpi_processor *pr,</div><div class='ctx'> 			      struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = 0;</div><div class='del'>-	static int first_run = 0;</div><div class='add'>+	static int first_run;</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_power_init");</div><div class='ctx'> </div><div class='ctx'> 	if (!first_run) {</div><div class='ctx'> 		dmi_check_system(processor_power_dmi_table);</div><div class='hunk'>@@ -1097,14 +1096,14 @@ int acpi_processor_power_init(struct acpi_processor *pr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_fadt.cst_cnt &amp;&amp; !nocst) {</div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_os_write_port(acpi_fadt.smi_cmd, acpi_fadt.cst_cnt, 8);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Notifying BIOS of _CST ability failed\n"));</div><div class='add'>+			ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+					"Notifying BIOS of _CST ability failed"));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1133,9 +1132,7 @@ int acpi_processor_power_init(struct acpi_processor *pr,</div><div class='ctx'> 	entry = create_proc_entry(ACPI_PROCESSOR_FILE_POWER,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_PROCESSOR_FILE_POWER));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_processor_power_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1144,13 +1141,12 @@ int acpi_processor_power_init(struct acpi_processor *pr,</div><div class='ctx'> </div><div class='ctx'> 	pr-&gt;flags.power_setup_done = 1;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_power_exit(struct acpi_processor *pr,</div><div class='ctx'> 			      struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_power_exit");</div><div class='ctx'> </div><div class='ctx'> 	pr-&gt;flags.power_setup_done = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1170,5 +1166,5 @@ int acpi_processor_power_exit(struct acpi_processor *pr,</div><div class='ctx'> 		cpu_idle_wait();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c<br/>index abbdb37a7f5f..7ba5e49ab302 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_perflib.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_perflib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_perflib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/processor_perflib.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -48,7 +49,7 @@</div><div class='ctx'> #define _COMPONENT		ACPI_PROCESSOR_COMPONENT</div><div class='ctx'> ACPI_MODULE_NAME("acpi_processor")</div><div class='ctx'> </div><div class='del'>-static DECLARE_MUTEX(performance_sem);</div><div class='add'>+static DEFINE_MUTEX(performance_mutex);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * _PPC support is implemented as a CPUfreq policy notifier:</div><div class='hunk'>@@ -72,7 +73,7 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> 	unsigned int ppc = 0;</div><div class='ctx'> </div><div class='del'>-	down(&amp;performance_sem);</div><div class='add'>+	mutex_lock(&amp;performance_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (event != CPUFREQ_INCOMPATIBLE)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -93,7 +94,7 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,</div><div class='ctx'> 				     core_frequency * 1000);</div><div class='ctx'> </div><div class='ctx'>       out:</div><div class='del'>-	up(&amp;performance_sem);</div><div class='add'>+	mutex_unlock(&amp;performance_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -107,10 +108,9 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	unsigned long ppc = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_platform_limit");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * _PPC indicates the maximum state currently supported by the platform</div><div class='hunk'>@@ -122,13 +122,13 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)</div><div class='ctx'> 		acpi_processor_ppc_status |= PPC_IN_USE;</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status) &amp;&amp; status != AE_NOT_FOUND) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PPC\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PPC"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr-&gt;performance_platform_limit = (int)ppc;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_ppc_has_changed(struct acpi_processor *pr)</div><div class='hunk'>@@ -167,18 +167,17 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)</div><div class='ctx'> 	union acpi_object *pct = NULL;</div><div class='ctx'> 	union acpi_object obj = { 0 };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_performance_control");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(pr-&gt;handle, "_PCT", NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PCT\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PCT"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pct = (union acpi_object *)buffer.pointer;</div><div class='ctx'> 	if (!pct || (pct-&gt;type != ACPI_TYPE_PACKAGE)</div><div class='ctx'> 	    || (pct-&gt;package.count != 2)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PCT data\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid _PCT data\n");</div><div class='ctx'> 		result = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -192,8 +191,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)</div><div class='ctx'> 	if ((obj.type != ACPI_TYPE_BUFFER)</div><div class='ctx'> 	    || (obj.buffer.length &lt; sizeof(struct acpi_pct_register))</div><div class='ctx'> 	    || (obj.buffer.pointer == NULL)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid _PCT data (control_register)\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid _PCT data (control_register)\n");</div><div class='ctx'> 		result = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -209,8 +207,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)</div><div class='ctx'> 	if ((obj.type != ACPI_TYPE_BUFFER)</div><div class='ctx'> 	    || (obj.buffer.length &lt; sizeof(struct acpi_pct_register))</div><div class='ctx'> 	    || (obj.buffer.pointer == NULL)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Invalid _PCT data (status_register)\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid _PCT data (status_register)\n");</div><div class='ctx'> 		result = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -219,9 +216,9 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)</div><div class='ctx'> 	       sizeof(struct acpi_pct_register));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_get_performance_states(struct acpi_processor *pr)</div><div class='hunk'>@@ -234,17 +231,16 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)</div><div class='ctx'> 	union acpi_object *pss = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_performance_states");</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(pr-&gt;handle, "_PSS", NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PSS\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PSS"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pss = (union acpi_object *)buffer.pointer;</div><div class='ctx'> 	if (!pss || (pss-&gt;type != ACPI_TYPE_PACKAGE)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSS data\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid _PSS data\n");</div><div class='ctx'> 		result = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -273,8 +269,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)</div><div class='ctx'> 		status = acpi_extract_package(&amp;(pss-&gt;package.elements[i]),</div><div class='ctx'> 					      &amp;format, &amp;state);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Invalid _PSS data\n"));</div><div class='add'>+			ACPI_EXCEPTION((AE_INFO, status, "Invalid _PSS data"));</div><div class='ctx'> 			result = -EFAULT;</div><div class='ctx'> 			kfree(pr-&gt;performance-&gt;states);</div><div class='ctx'> 			goto end;</div><div class='hunk'>@@ -290,8 +285,8 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)</div><div class='ctx'> 				  (u32) px-&gt;control, (u32) px-&gt;status));</div><div class='ctx'> </div><div class='ctx'> 		if (!px-&gt;core_frequency) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Invalid _PSS data: freq is zero\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Invalid _PSS data: freq is zero\n");</div><div class='ctx'> 			result = -EFAULT;</div><div class='ctx'> 			kfree(pr-&gt;performance-&gt;states);</div><div class='ctx'> 			goto end;</div><div class='hunk'>@@ -299,9 +294,9 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_get_performance_info(struct acpi_processor *pr)</div><div class='hunk'>@@ -310,31 +305,30 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	acpi_handle handle = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_performance_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr || !pr-&gt;performance || !pr-&gt;handle)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_handle(pr-&gt;handle, "_PCT", &amp;handle);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "ACPI-based processor performance control unavailable\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_processor_get_performance_control(pr);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_processor_get_performance_states(pr);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_processor_get_platform_limit(pr);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_notify_smm(struct module *calling_module)</div><div class='hunk'>@@ -342,13 +336,12 @@ int acpi_processor_notify_smm(struct module *calling_module)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	static int is_done = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_notify_smm");</div><div class='ctx'> </div><div class='ctx'> 	if (!(acpi_processor_ppc_status &amp; PPC_REGISTERED))</div><div class='del'>-		return_VALUE(-EBUSY);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (!try_module_get(calling_module))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* is_done is set to negative if an error occured,</div><div class='ctx'> 	 * and to postitive if _no_ error occured, but SMM</div><div class='hunk'>@@ -357,10 +350,10 @@ int acpi_processor_notify_smm(struct module *calling_module)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_done &gt; 0) {</div><div class='ctx'> 		module_put(calling_module);</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	} else if (is_done &lt; 0) {</div><div class='ctx'> 		module_put(calling_module);</div><div class='del'>-		return_VALUE(is_done);</div><div class='add'>+		return is_done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	is_done = -EIO;</div><div class='hunk'>@@ -369,7 +362,7 @@ int acpi_processor_notify_smm(struct module *calling_module)</div><div class='ctx'> 	if ((!acpi_fadt.smi_cmd) || (!acpi_fadt.pstate_cnt)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No SMI port or pstate_cnt\n"));</div><div class='ctx'> 		module_put(calling_module);</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='hunk'>@@ -386,12 +379,12 @@ int acpi_processor_notify_smm(struct module *calling_module)</div><div class='ctx'> 	status = acpi_os_write_port(acpi_fadt.smi_cmd,</div><div class='ctx'> 				    (u32) acpi_fadt.pstate_cnt, 8);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Failed to write pstate_cnt [0x%x] to "</div><div class='del'>-				  "smi_cmd [0x%x]\n", acpi_fadt.pstate_cnt,</div><div class='del'>-				  acpi_fadt.smi_cmd));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Failed to write pstate_cnt [0x%x] to "</div><div class='add'>+				"smi_cmd [0x%x]", acpi_fadt.pstate_cnt,</div><div class='add'>+				acpi_fadt.smi_cmd));</div><div class='ctx'> 		module_put(calling_module);</div><div class='del'>-		return_VALUE(status);</div><div class='add'>+		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Success. If there's no _PPC, we need to fear nothing, so</div><div class='hunk'>@@ -401,7 +394,7 @@ int acpi_processor_notify_smm(struct module *calling_module)</div><div class='ctx'> 	if (!(acpi_processor_ppc_status &amp; PPC_IN_USE))</div><div class='ctx'> 		module_put(calling_module);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_processor_notify_smm);</div><div class='hunk'>@@ -422,7 +415,6 @@ static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_processor *pr = (struct acpi_processor *)seq-&gt;private;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_perf_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -446,7 +438,7 @@ static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 			   (u32) pr-&gt;performance-&gt;states[i].transition_latency);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -468,23 +460,22 @@ acpi_processor_write_performance(struct file *file,</div><div class='ctx'> 	unsigned int new_state = 0;</div><div class='ctx'> 	struct cpufreq_policy policy;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_write_performance");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr || (count &gt; sizeof(state_string) - 1))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	perf = pr-&gt;performance;</div><div class='ctx'> 	if (!perf)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(state_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	state_string[count] = '\0';</div><div class='ctx'> 	new_state = simple_strtoul(state_string, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (new_state &gt;= perf-&gt;state_count)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	cpufreq_get_policy(&amp;policy, pr-&gt;id);</div><div class='ctx'> </div><div class='hunk'>@@ -494,9 +485,9 @@ acpi_processor_write_performance(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	result = cpufreq_set_policy(&amp;policy);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_cpufreq_add_file(struct acpi_processor *pr)</div><div class='hunk'>@@ -504,42 +495,36 @@ static void acpi_cpufreq_add_file(struct acpi_processor *pr)</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_cpufreq_addfile");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(pr-&gt;handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* add file 'performance' [R/W] */</div><div class='ctx'> 	entry = create_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='del'>-	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_PROCESSOR_FILE_PERFORMANCE));</div><div class='del'>-	else {</div><div class='add'>+	if (entry){</div><div class='ctx'> 		acpi_processor_perf_fops.write = acpi_processor_write_performance;</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_processor_perf_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_cpufreq_remove_file(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_cpufreq_addfile");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_bus_get_device(pr-&gt;handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* remove file 'performance' */</div><div class='ctx'> 	remove_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,</div><div class='ctx'> 			  acpi_device_dir(device));</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -553,42 +538,267 @@ static void acpi_cpufreq_remove_file(struct acpi_processor *pr)</div><div class='ctx'> }</div><div class='ctx'> #endif				/* CONFIG_X86_ACPI_CPUFREQ_PROC_INTF */</div><div class='ctx'> </div><div class='add'>+static int acpi_processor_get_psd(struct acpi_processor	*pr)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	acpi_status status = AE_OK;</div><div class='add'>+	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='add'>+	struct acpi_buffer format = {sizeof("NNNNN"), "NNNNN"};</div><div class='add'>+	struct acpi_buffer state = {0, NULL};</div><div class='add'>+	union acpi_object  *psd = NULL;</div><div class='add'>+	struct acpi_psd_package *pdomain;</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(pr-&gt;handle, "_PSD", NULL, &amp;buffer);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	psd = (union acpi_object *) buffer.pointer;</div><div class='add'>+	if (!psd || (psd-&gt;type != ACPI_TYPE_PACKAGE)) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));</div><div class='add'>+		result = -EFAULT;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (psd-&gt;package.count != 1) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));</div><div class='add'>+		result = -EFAULT;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdomain = &amp;(pr-&gt;performance-&gt;domain_info);</div><div class='add'>+</div><div class='add'>+	state.length = sizeof(struct acpi_psd_package);</div><div class='add'>+	state.pointer = pdomain;</div><div class='add'>+</div><div class='add'>+	status = acpi_extract_package(&amp;(psd-&gt;package.elements[0]),</div><div class='add'>+		&amp;format, &amp;state);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));</div><div class='add'>+		result = -EFAULT;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdomain-&gt;num_entries != ACPI_PSD_REV0_ENTRIES) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:num_entries\n"));</div><div class='add'>+		result = -EFAULT;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdomain-&gt;revision != ACPI_PSD_REV0_REVISION) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:revision\n"));</div><div class='add'>+		result = -EFAULT;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	kfree(buffer.pointer);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acpi_processor_preregister_performance(</div><div class='add'>+		struct acpi_processor_performance **performance)</div><div class='add'>+{</div><div class='add'>+	int count, count_target;</div><div class='add'>+	int retval = 0;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	cpumask_t covered_cpus;</div><div class='add'>+	struct acpi_processor *pr;</div><div class='add'>+	struct acpi_psd_package *pdomain;</div><div class='add'>+	struct acpi_processor *match_pr;</div><div class='add'>+	struct acpi_psd_package *match_pdomain;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;performance_mutex);</div><div class='add'>+</div><div class='add'>+	retval = 0;</div><div class='add'>+</div><div class='add'>+	/* Call _PSD for all CPUs */</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		pr = processors[i];</div><div class='add'>+		if (!pr) {</div><div class='add'>+			/* Look only at processors in ACPI namespace */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pr-&gt;performance) {</div><div class='add'>+			retval = -EBUSY;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!performance || !performance[i]) {</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pr-&gt;performance = performance[i];</div><div class='add'>+		cpu_set(i, pr-&gt;performance-&gt;shared_cpu_map);</div><div class='add'>+		if (acpi_processor_get_psd(pr)) {</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err_ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now that we have _PSD data from all CPUs, lets setup P-state </div><div class='add'>+	 * domain info.</div><div class='add'>+	 */</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		pr = processors[i];</div><div class='add'>+		if (!pr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Basic validity check for domain info */</div><div class='add'>+		pdomain = &amp;(pr-&gt;performance-&gt;domain_info);</div><div class='add'>+		if ((pdomain-&gt;revision != ACPI_PSD_REV0_REVISION) ||</div><div class='add'>+		    (pdomain-&gt;num_entries != ACPI_PSD_REV0_ENTRIES)) {</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+			goto err_ret;</div><div class='add'>+		}</div><div class='add'>+		if (pdomain-&gt;coord_type != DOMAIN_COORD_TYPE_SW_ALL &amp;&amp;</div><div class='add'>+		    pdomain-&gt;coord_type != DOMAIN_COORD_TYPE_SW_ANY &amp;&amp;</div><div class='add'>+		    pdomain-&gt;coord_type != DOMAIN_COORD_TYPE_HW_ALL) {</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+			goto err_ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpus_clear(covered_cpus);</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		pr = processors[i];</div><div class='add'>+		if (!pr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cpu_isset(i, covered_cpus))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pdomain = &amp;(pr-&gt;performance-&gt;domain_info);</div><div class='add'>+		cpu_set(i, pr-&gt;performance-&gt;shared_cpu_map);</div><div class='add'>+		cpu_set(i, covered_cpus);</div><div class='add'>+		if (pdomain-&gt;num_processors &lt;= 1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Validate the Domain info */</div><div class='add'>+		count_target = pdomain-&gt;num_processors;</div><div class='add'>+		count = 1;</div><div class='add'>+		if (pdomain-&gt;coord_type == DOMAIN_COORD_TYPE_SW_ALL)</div><div class='add'>+			pr-&gt;performance-&gt;shared_type = CPUFREQ_SHARED_TYPE_ALL;</div><div class='add'>+		else if (pdomain-&gt;coord_type == DOMAIN_COORD_TYPE_HW_ALL)</div><div class='add'>+			pr-&gt;performance-&gt;shared_type = CPUFREQ_SHARED_TYPE_HW;</div><div class='add'>+		else if (pdomain-&gt;coord_type == DOMAIN_COORD_TYPE_SW_ANY)</div><div class='add'>+			pr-&gt;performance-&gt;shared_type = CPUFREQ_SHARED_TYPE_ANY;</div><div class='add'>+</div><div class='add'>+		for_each_possible_cpu(j) {</div><div class='add'>+			if (i == j)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			match_pr = processors[j];</div><div class='add'>+			if (!match_pr)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			match_pdomain = &amp;(match_pr-&gt;performance-&gt;domain_info);</div><div class='add'>+			if (match_pdomain-&gt;domain != pdomain-&gt;domain)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* Here i and j are in the same domain */</div><div class='add'>+</div><div class='add'>+			if (match_pdomain-&gt;num_processors != count_target) {</div><div class='add'>+				retval = -EINVAL;</div><div class='add'>+				goto err_ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (pdomain-&gt;coord_type != match_pdomain-&gt;coord_type) {</div><div class='add'>+				retval = -EINVAL;</div><div class='add'>+				goto err_ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			cpu_set(j, covered_cpus);</div><div class='add'>+			cpu_set(j, pr-&gt;performance-&gt;shared_cpu_map);</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for_each_possible_cpu(j) {</div><div class='add'>+			if (i == j)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			match_pr = processors[j];</div><div class='add'>+			if (!match_pr)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			match_pdomain = &amp;(match_pr-&gt;performance-&gt;domain_info);</div><div class='add'>+			if (match_pdomain-&gt;domain != pdomain-&gt;domain)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			match_pr-&gt;performance-&gt;shared_type = </div><div class='add'>+					pr-&gt;performance-&gt;shared_type;</div><div class='add'>+			match_pr-&gt;performance-&gt;shared_cpu_map =</div><div class='add'>+				pr-&gt;performance-&gt;shared_cpu_map;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_ret:</div><div class='add'>+	if (retval) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error while parsing _PSD domain information. Assuming no coordination\n"));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i) {</div><div class='add'>+		pr = processors[i];</div><div class='add'>+		if (!pr || !pr-&gt;performance)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Assume no coordination on any error parsing domain info */</div><div class='add'>+		if (retval) {</div><div class='add'>+			cpus_clear(pr-&gt;performance-&gt;shared_cpu_map);</div><div class='add'>+			cpu_set(i, pr-&gt;performance-&gt;shared_cpu_map);</div><div class='add'>+			pr-&gt;performance-&gt;shared_type = CPUFREQ_SHARED_TYPE_ALL;</div><div class='add'>+		}</div><div class='add'>+		pr-&gt;performance = NULL; /* Will be set for real in register */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;performance_mutex);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(acpi_processor_preregister_performance);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> acpi_processor_register_performance(struct acpi_processor_performance</div><div class='ctx'> 				    *performance, unsigned int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_register_performance");</div><div class='ctx'> </div><div class='ctx'> 	if (!(acpi_processor_ppc_status &amp; PPC_REGISTERED))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	down(&amp;performance_sem);</div><div class='add'>+	mutex_lock(&amp;performance_mutex);</div><div class='ctx'> </div><div class='ctx'> 	pr = processors[cpu];</div><div class='ctx'> 	if (!pr) {</div><div class='del'>-		up(&amp;performance_sem);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		mutex_unlock(&amp;performance_mutex);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pr-&gt;performance) {</div><div class='del'>-		up(&amp;performance_sem);</div><div class='del'>-		return_VALUE(-EBUSY);</div><div class='add'>+		mutex_unlock(&amp;performance_mutex);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	WARN_ON(!performance);</div><div class='add'>+</div><div class='ctx'> 	pr-&gt;performance = performance;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_processor_get_performance_info(pr)) {</div><div class='ctx'> 		pr-&gt;performance = NULL;</div><div class='del'>-		up(&amp;performance_sem);</div><div class='del'>-		return_VALUE(-EIO);</div><div class='add'>+		mutex_unlock(&amp;performance_mutex);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	acpi_cpufreq_add_file(pr);</div><div class='ctx'> </div><div class='del'>-	up(&amp;performance_sem);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	mutex_unlock(&amp;performance_mutex);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_processor_register_performance);</div><div class='hunk'>@@ -599,24 +809,24 @@ acpi_processor_unregister_performance(struct acpi_processor_performance</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_processor *pr;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_unregister_performance");</div><div class='ctx'> </div><div class='del'>-	down(&amp;performance_sem);</div><div class='add'>+	mutex_lock(&amp;performance_mutex);</div><div class='ctx'> </div><div class='ctx'> 	pr = processors[cpu];</div><div class='ctx'> 	if (!pr) {</div><div class='del'>-		up(&amp;performance_sem);</div><div class='del'>-		return_VOID;</div><div class='add'>+		mutex_unlock(&amp;performance_mutex);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(pr-&gt;performance-&gt;states);</div><div class='add'>+	if (pr-&gt;performance)</div><div class='add'>+		kfree(pr-&gt;performance-&gt;states);</div><div class='ctx'> 	pr-&gt;performance = NULL;</div><div class='ctx'> </div><div class='ctx'> 	acpi_cpufreq_remove_file(pr);</div><div class='ctx'> </div><div class='del'>-	up(&amp;performance_sem);</div><div class='add'>+	mutex_unlock(&amp;performance_mutex);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_processor_unregister_performance);</div><div class='head'>diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c<br/>index f99ad05cd6a2..ef5e0f6efdba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_thermal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_thermal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_thermal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/processor_thermal.c</a></div><div class='hunk'>@@ -54,13 +54,12 @@ static int acpi_processor_apply_limit(struct acpi_processor *pr)</div><div class='ctx'> 	u16 px = 0;</div><div class='ctx'> 	u16 tx = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_apply_limit");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!pr-&gt;flags.limit)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (pr-&gt;flags.throttling) {</div><div class='ctx'> 		if (pr-&gt;limit.user.tx &gt; tx)</div><div class='hunk'>@@ -82,9 +81,9 @@ static int acpi_processor_apply_limit(struct acpi_processor *pr)</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='ctx'> 	if (result)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to set limit\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Unable to set limit\n");</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CPU_FREQ</div><div class='hunk'>@@ -200,19 +199,18 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> 	int tx = 0, max_tx_px = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_set_thermal_limit");</div><div class='ctx'> </div><div class='ctx'> 	if ((type &lt; ACPI_PROCESSOR_LIMIT_NONE)</div><div class='ctx'> 	    || (type &gt; ACPI_PROCESSOR_LIMIT_DECREMENT))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_get_device(handle, &amp;device);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	pr = (struct acpi_processor *)acpi_driver_data(device);</div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* Thermal limits are always relative to the current Px/Tx state. */</div><div class='ctx'> 	if (pr-&gt;flags.throttling)</div><div class='hunk'>@@ -289,30 +287,28 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)</div><div class='ctx'> </div><div class='ctx'> 		result = acpi_processor_apply_limit(pr);</div><div class='ctx'> 		if (result)</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Unable to set thermal limit\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Unable to set thermal limit\n");</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n",</div><div class='ctx'> 				  pr-&gt;limit.thermal.px, pr-&gt;limit.thermal.tx));</div><div class='ctx'> 	} else</div><div class='ctx'> 		result = 0;</div><div class='ctx'> 	if (max_tx_px)</div><div class='del'>-		return_VALUE(1);</div><div class='add'>+		return 1;</div><div class='ctx'> 	else</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_get_limit_info(struct acpi_processor *pr)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_limit_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (pr-&gt;flags.throttling)</div><div class='ctx'> 		pr-&gt;flags.limit = 1;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* /proc interface */</div><div class='hunk'>@@ -321,7 +317,6 @@ static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_processor *pr = (struct acpi_processor *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_limit_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -339,7 +334,7 @@ static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   pr-&gt;limit.thermal.px, pr-&gt;limit.thermal.tx);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_limit_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -359,36 +354,33 @@ static ssize_t acpi_processor_write_limit(struct file * file,</div><div class='ctx'> 	int px = 0;</div><div class='ctx'> 	int tx = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_write_limit");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr || (count &gt; sizeof(limit_string) - 1)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(limit_string, buffer, count)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data\n"));</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	limit_string[count] = '\0';</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(limit_string, "%d:%d", &amp;px, &amp;tx) != 2) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data format\n"));</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid data format\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pr-&gt;flags.throttling) {</div><div class='ctx'> 		if ((tx &lt; 0) || (tx &gt; (pr-&gt;throttling.state_count - 1))) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid tx\n"));</div><div class='del'>-			return_VALUE(-EINVAL);</div><div class='add'>+			printk(KERN_ERR PREFIX "Invalid tx\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		pr-&gt;limit.user.tx = tx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_processor_apply_limit(pr);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file_operations acpi_processor_limit_fops = {</div><div class='head'>diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c<br/>index b966549ec000..d044ec519db0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/processor_throttling.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/processor_throttling.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/processor_throttling.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/processor_throttling.c</a></div><div class='hunk'>@@ -55,13 +55,12 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)</div><div class='ctx'> 	u32 duty_mask = 0;</div><div class='ctx'> 	u32 duty_value = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_throttling");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!pr-&gt;flags.throttling)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	pr-&gt;throttling.state = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +92,7 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)</div><div class='ctx'> 			  "Throttling state is T%d (%d%% throttling applied)\n",</div><div class='ctx'> 			  state, pr-&gt;throttling.states[state].performance));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_set_throttling(struct acpi_processor *pr, int state)</div><div class='hunk'>@@ -102,19 +101,18 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)</div><div class='ctx'> 	u32 duty_mask = 0;</div><div class='ctx'> 	u32 duty_value = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_set_throttling");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((state &lt; 0) || (state &gt; (pr-&gt;throttling.state_count - 1)))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!pr-&gt;flags.throttling)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (state == pr-&gt;throttling.state)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Calculate the duty_value and duty_mask.</div><div class='hunk'>@@ -165,7 +163,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)</div><div class='ctx'> 			  (pr-&gt;throttling.states[state].performance ? pr-&gt;</div><div class='ctx'> 			   throttling.states[state].performance / 10 : 0)));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_processor_get_throttling_info(struct acpi_processor *pr)</div><div class='hunk'>@@ -174,7 +172,6 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)</div><div class='ctx'> 	int step = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_get_throttling_info");</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 			  "pblk_address[0x%08x] duty_offset[%d] duty_width[%d]\n",</div><div class='hunk'>@@ -183,21 +180,21 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)</div><div class='ctx'> 			  pr-&gt;throttling.duty_width));</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Support ACPI 2.0 objects */</div><div class='ctx'> </div><div class='ctx'> 	if (!pr-&gt;throttling.address) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No throttling register\n"));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	} else if (!pr-&gt;throttling.duty_width) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No throttling states\n"));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* TBD: Support duty_cycle values that span bit 4. */</div><div class='ctx'> 	else if ((pr-&gt;throttling.duty_offset + pr-&gt;throttling.duty_width) &gt; 4) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "duty_cycle spans bit 4\n"));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		printk(KERN_WARNING PREFIX "duty_cycle spans bit 4\n");</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -208,7 +205,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)</div><div class='ctx'> 	if (errata.piix4.throttle) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 				  "Throttling not supported on PIIX4 A- or B-step\n"));</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pr-&gt;throttling.state_count = 1 &lt;&lt; acpi_fadt.duty_width;</div><div class='hunk'>@@ -254,7 +251,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		pr-&gt;flags.throttling = 0;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* proc interface */</div><div class='hunk'>@@ -266,7 +263,6 @@ static int acpi_processor_throttling_seq_show(struct seq_file *seq,</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_throttling_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -296,7 +292,7 @@ static int acpi_processor_throttling_seq_show(struct seq_file *seq,</div><div class='ctx'> 			    throttling.states[i].performance / 10 : 0));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_processor_throttling_open_fs(struct inode *inode,</div><div class='hunk'>@@ -315,13 +311,12 @@ static ssize_t acpi_processor_write_throttling(struct file * file,</div><div class='ctx'> 	struct acpi_processor *pr = (struct acpi_processor *)m-&gt;private;</div><div class='ctx'> 	char state_string[12] = { '\0' };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_processor_write_throttling");</div><div class='ctx'> </div><div class='ctx'> 	if (!pr || (count &gt; sizeof(state_string) - 1))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(state_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	state_string[count] = '\0';</div><div class='ctx'> </div><div class='hunk'>@@ -329,9 +324,9 @@ static ssize_t acpi_processor_write_throttling(struct file * file,</div><div class='ctx'> 					       simple_strtoul(state_string,</div><div class='ctx'> 							      NULL, 0));</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file_operations acpi_processor_throttling_fops = {</div><div class='head'>diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c<br/>index 4038dbfa63a0..cf87b0230026 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rscalc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rscalc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rscalc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rscalc.c</a></div><div class='hunk'>@@ -78,6 +78,7 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='ctx'> 	for (bits_set = 0; bit_field; bits_set++) {</div><div class='add'>+</div><div class='ctx'> 		/* Zero the least significant bit that is set */</div><div class='ctx'> </div><div class='ctx'> 		bit_field &amp;= (bit_field - 1);</div><div class='hunk'>@@ -154,15 +155,18 @@ acpi_rs_stream_option_length(u32 resource_length,</div><div class='ctx'> 	 * length, minus one byte for the resource_source_index itself.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (resource_length &gt; minimum_aml_resource_length) {</div><div class='add'>+</div><div class='ctx'> 		/* Compute the length of the optional string */</div><div class='ctx'> </div><div class='ctx'> 		string_length =</div><div class='ctx'> 		    resource_length - minimum_aml_resource_length - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Round up length to 32 bits for internal structure alignment */</div><div class='del'>-</div><div class='del'>-	return (ACPI_ROUND_UP_to_32_bITS(string_length));</div><div class='add'>+	/*</div><div class='add'>+	 * Round the length up to a multiple of the native word in order to</div><div class='add'>+	 * guarantee that the entire resource descriptor is native word aligned</div><div class='add'>+	 */</div><div class='add'>+	return ((u32) ACPI_ROUND_UP_TO_NATIVE_WORD(string_length));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -186,11 +190,12 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)</div><div class='ctx'> 	acpi_size aml_size_needed = 0;</div><div class='ctx'> 	acpi_rs_length total_size;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_aml_length");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_aml_length);</div><div class='ctx'> </div><div class='ctx'> 	/* Traverse entire list of internal resource descriptors */</div><div class='ctx'> </div><div class='ctx'> 	while (resource) {</div><div class='add'>+</div><div class='ctx'> 		/* Validate the descriptor type */</div><div class='ctx'> </div><div class='ctx'> 		if (resource-&gt;type &gt; ACPI_RESOURCE_TYPE_MAX) {</div><div class='hunk'>@@ -214,6 +219,7 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)</div><div class='ctx'> 			 * is a Large Resource data type.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (resource-&gt;data.vendor.byte_length &gt; 7) {</div><div class='add'>+</div><div class='ctx'> 				/* Base size of a Large resource descriptor */</div><div class='ctx'> </div><div class='ctx'> 				total_size =</div><div class='hunk'>@@ -332,20 +338,22 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u8 *end_aml;</div><div class='ctx'> 	u8 *buffer;</div><div class='del'>-	u32 buffer_size = 0;</div><div class='add'>+	u32 buffer_size;</div><div class='ctx'> 	u16 temp16;</div><div class='ctx'> 	u16 resource_length;</div><div class='ctx'> 	u32 extra_struct_bytes;</div><div class='ctx'> 	u8 resource_index;</div><div class='ctx'> 	u8 minimum_aml_resource_length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_list_length");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_list_length);</div><div class='ctx'> </div><div class='add'>+	*size_needed = 0;</div><div class='ctx'> 	end_aml = aml_buffer + aml_buffer_length;</div><div class='ctx'> </div><div class='ctx'> 	/* Walk the list of AML resource descriptors */</div><div class='ctx'> </div><div class='ctx'> 	while (aml_buffer &lt; end_aml) {</div><div class='add'>+</div><div class='ctx'> 		/* Validate the Resource Type and Resource Length */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ut_validate_resource(aml_buffer, &amp;resource_index);</div><div class='hunk'>@@ -386,35 +394,28 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_NAME_VENDOR_SMALL:</div><div class='add'>+		case ACPI_RESOURCE_NAME_VENDOR_LARGE:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Vendor Resource:</div><div class='del'>-			 * Ensure a 32-bit boundary for the structure</div><div class='add'>+			 * Get the number of vendor data bytes</div><div class='ctx'> 			 */</div><div class='del'>-			extra_struct_bytes =</div><div class='del'>-			    ACPI_ROUND_UP_to_32_bITS(resource_length);</div><div class='add'>+			extra_struct_bytes = resource_length;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_NAME_END_TAG:</div><div class='ctx'> 			/*</div><div class='del'>-			 * End Tag: This is the normal exit, add size of end_tag</div><div class='add'>+			 * End Tag:</div><div class='add'>+			 * This is the normal exit, add size of end_tag</div><div class='ctx'> 			 */</div><div class='del'>-			*size_needed = buffer_size + ACPI_RS_SIZE_MIN;</div><div class='add'>+			*size_needed += ACPI_RS_SIZE_MIN;</div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='ctx'> </div><div class='del'>-		case ACPI_RESOURCE_NAME_VENDOR_LARGE:</div><div class='del'>-			/*</div><div class='del'>-			 * Vendor Resource:</div><div class='del'>-			 * Add vendor data and ensure a 32-bit boundary for the structure</div><div class='del'>-			 */</div><div class='del'>-			extra_struct_bytes =</div><div class='del'>-			    ACPI_ROUND_UP_to_32_bITS(resource_length);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		case ACPI_RESOURCE_NAME_ADDRESS32:</div><div class='ctx'> 		case ACPI_RESOURCE_NAME_ADDRESS16:</div><div class='add'>+		case ACPI_RESOURCE_NAME_ADDRESS64:</div><div class='ctx'> 			/*</div><div class='del'>-			 * 32-Bit or 16-bit Address Resource:</div><div class='del'>-			 * Add the size of any optional data (resource_source)</div><div class='add'>+			 * Address Resource:</div><div class='add'>+			 * Add the size of the optional resource_source</div><div class='ctx'> 			 */</div><div class='ctx'> 			extra_struct_bytes =</div><div class='ctx'> 			    acpi_rs_stream_option_length(resource_length,</div><div class='hunk'>@@ -423,50 +424,46 @@ acpi_rs_get_list_length(u8 * aml_buffer,</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_NAME_EXTENDED_IRQ:</div><div class='ctx'> 			/*</div><div class='del'>-			 * Extended IRQ:</div><div class='del'>-			 * Point past the interrupt_vector_flags to get the</div><div class='del'>-			 * interrupt_table_length.</div><div class='add'>+			 * Extended IRQ Resource:</div><div class='add'>+			 * Using the interrupt_table_length, add 4 bytes for each additional</div><div class='add'>+			 * interrupt. Note: at least one interrupt is required and is</div><div class='add'>+			 * included in the minimum descriptor size (reason for the -1)</div><div class='ctx'> 			 */</div><div class='del'>-			buffer++;</div><div class='add'>+			extra_struct_bytes = (buffer[1] - 1) * sizeof(u32);</div><div class='ctx'> </div><div class='del'>-			extra_struct_bytes =</div><div class='del'>-			    /*</div><div class='del'>-			     * Add 4 bytes for each additional interrupt. Note: at</div><div class='del'>-			     * least one interrupt is required and is included in</div><div class='del'>-			     * the minimum descriptor size</div><div class='del'>-			     */</div><div class='del'>-			    ((*buffer - 1) * sizeof(u32)) +</div><div class='del'>-			    /* Add the size of any optional data (resource_source) */</div><div class='add'>+			/* Add the size of the optional resource_source */</div><div class='add'>+</div><div class='add'>+			extra_struct_bytes +=</div><div class='ctx'> 			    acpi_rs_stream_option_length(resource_length -</div><div class='ctx'> 							 extra_struct_bytes,</div><div class='ctx'> 							 minimum_aml_resource_length);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case ACPI_RESOURCE_NAME_ADDRESS64:</div><div class='del'>-			/*</div><div class='del'>-			 * 64-Bit Address Resource:</div><div class='del'>-			 * Add the size of any optional data (resource_source)</div><div class='del'>-			 * Ensure a 64-bit boundary for the structure</div><div class='del'>-			 */</div><div class='del'>-			extra_struct_bytes =</div><div class='del'>-			    ACPI_ROUND_UP_to_64_bITS</div><div class='del'>-			    (acpi_rs_stream_option_length</div><div class='del'>-			     (resource_length, minimum_aml_resource_length));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Update the required buffer size for the internal descriptor structs */</div><div class='add'>+		/*</div><div class='add'>+		 * Update the required buffer size for the internal descriptor structs</div><div class='add'>+		 *</div><div class='add'>+		 * Important: Round the size up for the appropriate alignment. This</div><div class='add'>+		 * is a requirement on IA64.</div><div class='add'>+		 */</div><div class='add'>+		buffer_size = acpi_gbl_resource_struct_sizes[resource_index] +</div><div class='add'>+		    extra_struct_bytes;</div><div class='add'>+		buffer_size = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);</div><div class='ctx'> </div><div class='del'>-		temp16 = (u16) (acpi_gbl_resource_struct_sizes[resource_index] +</div><div class='del'>-				extra_struct_bytes);</div><div class='del'>-		buffer_size += (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(temp16);</div><div class='add'>+		*size_needed += buffer_size;</div><div class='add'>+</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,</div><div class='add'>+				  "Type %.2X, AmlLength %.2X InternalLength %.2X\n",</div><div class='add'>+				  acpi_ut_get_resource_type(aml_buffer),</div><div class='add'>+				  acpi_ut_get_descriptor_length(aml_buffer),</div><div class='add'>+				  buffer_size));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Point to the next resource within the stream</div><div class='del'>-		 * using the size of the header plus the length contained in the header</div><div class='add'>+		 * Point to the next resource within the AML stream using the length</div><div class='add'>+		 * contained in the resource descriptor header</div><div class='ctx'> 		 */</div><div class='ctx'> 		aml_buffer += acpi_ut_get_descriptor_length(aml_buffer);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -506,7 +503,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,</div><div class='ctx'> 	u8 name_found;</div><div class='ctx'> 	u32 table_index;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_pci_routing_table_length");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_pci_routing_table_length);</div><div class='ctx'> </div><div class='ctx'> 	number_of_elements = package_object-&gt;package.count;</div><div class='ctx'> </div><div class='hunk'>@@ -523,6 +520,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,</div><div class='ctx'> 	top_object_list = package_object-&gt;package.elements;</div><div class='ctx'> </div><div class='ctx'> 	for (index = 0; index &lt; number_of_elements; index++) {</div><div class='add'>+</div><div class='ctx'> 		/* Dereference the sub-package */</div><div class='ctx'> </div><div class='ctx'> 		package_element = *top_object_list;</div><div class='hunk'>@@ -581,7 +579,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,</div><div class='ctx'> </div><div class='ctx'> 		/* Round up the size since each element must be aligned */</div><div class='ctx'> </div><div class='del'>-		temp_size_needed = ACPI_ROUND_UP_to_64_bITS(temp_size_needed);</div><div class='add'>+		temp_size_needed = ACPI_ROUND_UP_TO_64BIT(temp_size_needed);</div><div class='ctx'> </div><div class='ctx'> 		/* Point to the next union acpi_operand_object */</div><div class='ctx'> </div><div class='hunk'>@@ -589,7 +587,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Adding an extra element to the end of the list, essentially a</div><div class='add'>+	 * Add an extra element to the end of the list, essentially a</div><div class='ctx'> 	 * NULL terminator</div><div class='ctx'> 	 */</div><div class='ctx'> 	*buffer_size_needed =</div><div class='head'>diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c<br/>index 8c128dea3252..008058acdd39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rscreate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rscreate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rscreate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rscreate.c</a></div><div class='hunk'>@@ -75,10 +75,11 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,</div><div class='ctx'> 	u8 *aml_start;</div><div class='ctx'> 	acpi_size list_size_needed = 0;</div><div class='ctx'> 	u32 aml_buffer_length;</div><div class='add'>+	void *resource;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_create_resource_list");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_create_resource_list);</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_buffer = %p\n", aml_buffer));</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlBuffer = %p\n", aml_buffer));</div><div class='ctx'> </div><div class='ctx'> 	/* Params already validated, so we don't re-validate here */</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +93,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,</div><div class='ctx'> 	status = acpi_rs_get_list_length(aml_start, aml_buffer_length,</div><div class='ctx'> 					 &amp;list_size_needed);</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X list_size_needed=%X\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X ListSizeNeeded=%X\n",</div><div class='ctx'> 			  status, (u32) list_size_needed));</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -107,13 +108,15 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,</div><div class='ctx'> </div><div class='ctx'> 	/* Do the conversion */</div><div class='ctx'> </div><div class='del'>-	status = acpi_rs_convert_aml_to_resources(aml_start, aml_buffer_length,</div><div class='del'>-						  output_buffer-&gt;pointer);</div><div class='add'>+	resource = output_buffer-&gt;pointer;</div><div class='add'>+	status = acpi_ut_walk_aml_resources(aml_start, aml_buffer_length,</div><div class='add'>+					    acpi_rs_convert_aml_to_resources,</div><div class='add'>+					    &amp;resource);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",</div><div class='ctx'> 			  output_buffer-&gt;pointer, (u32) output_buffer-&gt;length));</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='hunk'>@@ -155,7 +158,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_buffer path_buffer;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_create_pci_routing_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_create_pci_routing_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Params already validated, so we don't re-validate here */</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +170,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "buffer_size_needed = %X\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "BufferSizeNeeded = %X\n",</div><div class='ctx'> 			  (u32) buffer_size_needed));</div><div class='ctx'> </div><div class='ctx'> 	/* Validate/Allocate/Clear caller buffer */</div><div class='hunk'>@@ -332,7 +335,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,</div><div class='ctx'> 		/* Now align the current length */</div><div class='ctx'> </div><div class='ctx'> 		user_prt-&gt;length =</div><div class='del'>-		    (u32) ACPI_ROUND_UP_to_64_bITS(user_prt-&gt;length);</div><div class='add'>+		    (u32) ACPI_ROUND_UP_TO_64BIT(user_prt-&gt;length);</div><div class='ctx'> </div><div class='ctx'> 		/* 4) Fourth subobject: Dereference the PRT.source_index */</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +344,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,</div><div class='ctx'> 			user_prt-&gt;source_index = (u32) obj_desc-&gt;integer.value;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='del'>-				    "(PRT[%X].source_index) Need Integer, found %s",</div><div class='add'>+				    "(PRT[%X].SourceIndex) Need Integer, found %s",</div><div class='ctx'> 				    index,</div><div class='ctx'> 				    acpi_ut_get_object_type_name(obj_desc)));</div><div class='ctx'> 			return_ACPI_STATUS(AE_BAD_DATA);</div><div class='hunk'>@@ -352,7 +355,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,</div><div class='ctx'> 		top_object_list++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",</div><div class='ctx'> 			  output_buffer-&gt;pointer, (u32) output_buffer-&gt;length));</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='hunk'>@@ -382,9 +385,9 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_size aml_size_needed = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_create_aml_resources");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_create_aml_resources);</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "linked_list_buffer = %p\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "LinkedListBuffer = %p\n",</div><div class='ctx'> 			  linked_list_buffer));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -395,7 +398,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_rs_get_aml_length(linked_list_buffer, &amp;aml_size_needed);</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_size_needed=%X, %s\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlSizeNeeded=%X, %s\n",</div><div class='ctx'> 			  (u32) aml_size_needed,</div><div class='ctx'> 			  acpi_format_exception(status)));</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -419,7 +422,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "output_buffer %p Length %X\n",</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "OutputBuffer %p Length %X\n",</div><div class='ctx'> 			  output_buffer-&gt;pointer, (u32) output_buffer-&gt;length));</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c<br/>index e7de061cf883..9c99a723a860 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsdump.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsdump.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsdump.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rsdump.c</a></div><div class='hunk'>@@ -91,11 +91,11 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table);</div><div class='ctx'> struct acpi_rsdump_info acpi_rs_dump_irq[6] = {</div><div class='ctx'> 	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_irq), "IRQ", NULL},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.triggering), "Triggering",</div><div class='del'>-	 acpi_gbl_HEdecode},</div><div class='add'>+	 acpi_gbl_he_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",</div><div class='del'>-	 acpi_gbl_LLdecode},</div><div class='add'>+	 acpi_gbl_ll_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing",</div><div class='del'>-	 acpi_gbl_SHRdecode},</div><div class='add'>+	 acpi_gbl_shr_decode},</div><div class='ctx'> 	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count),</div><div class='ctx'> 	 "Interrupt Count", NULL},</div><div class='ctx'> 	{ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(irq.interrupts[0]),</div><div class='hunk'>@@ -105,11 +105,11 @@ struct acpi_rsdump_info acpi_rs_dump_irq[6] = {</div><div class='ctx'> struct acpi_rsdump_info acpi_rs_dump_dma[6] = {</div><div class='ctx'> 	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_dma), "DMA", NULL},</div><div class='ctx'> 	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.type), "Speed",</div><div class='del'>-	 acpi_gbl_TYPdecode},</div><div class='add'>+	 acpi_gbl_typ_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(dma.bus_master), "Mastering",</div><div class='del'>-	 acpi_gbl_BMdecode},</div><div class='add'>+	 acpi_gbl_bm_decode},</div><div class='ctx'> 	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.transfer), "Transfer Type",</div><div class='del'>-	 acpi_gbl_SIZdecode},</div><div class='add'>+	 acpi_gbl_siz_decode},</div><div class='ctx'> 	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(dma.channel_count), "Channel Count",</div><div class='ctx'> 	 NULL},</div><div class='ctx'> 	{ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(dma.channels[0]), "Channel List",</div><div class='hunk'>@@ -158,7 +158,7 @@ struct acpi_rsdump_info acpi_rs_dump_vendor[3] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_rsdump_info acpi_rs_dump_end_tag[1] = {</div><div class='del'>-	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "end_tag",</div><div class='add'>+	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "EndTag",</div><div class='ctx'> 	 NULL}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +166,7 @@ struct acpi_rsdump_info acpi_rs_dump_memory24[6] = {</div><div class='ctx'> 	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory24),</div><div class='ctx'> 	 "24-Bit Memory Range", NULL},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory24.write_protect),</div><div class='del'>-	 "Write Protect", acpi_gbl_RWdecode},</div><div class='add'>+	 "Write Protect", acpi_gbl_rw_decode},</div><div class='ctx'> 	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.minimum), "Address Minimum",</div><div class='ctx'> 	 NULL},</div><div class='ctx'> 	{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.maximum), "Address Maximum",</div><div class='hunk'>@@ -181,7 +181,7 @@ struct acpi_rsdump_info acpi_rs_dump_memory32[6] = {</div><div class='ctx'> 	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory32),</div><div class='ctx'> 	 "32-Bit Memory Range", NULL},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory32.write_protect),</div><div class='del'>-	 "Write Protect", acpi_gbl_RWdecode},</div><div class='add'>+	 "Write Protect", acpi_gbl_rw_decode},</div><div class='ctx'> 	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.minimum), "Address Minimum",</div><div class='ctx'> 	 NULL},</div><div class='ctx'> 	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.maximum), "Address Maximum",</div><div class='hunk'>@@ -196,7 +196,7 @@ struct acpi_rsdump_info acpi_rs_dump_fixed_memory32[4] = {</div><div class='ctx'> 	{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_memory32),</div><div class='ctx'> 	 "32-Bit Fixed Memory Range", NULL},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(fixed_memory32.write_protect),</div><div class='del'>-	 "Write Protect", acpi_gbl_RWdecode},</div><div class='add'>+	 "Write Protect", acpi_gbl_rw_decode},</div><div class='ctx'> 	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address), "Address",</div><div class='ctx'> 	 NULL},</div><div class='ctx'> 	{ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address_length),</div><div class='hunk'>@@ -278,11 +278,11 @@ struct acpi_rsdump_info acpi_rs_dump_ext_irq[8] = {</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.producer_consumer),</div><div class='ctx'> 	 "Type", acpi_gbl_consume_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.triggering),</div><div class='del'>-	 "Triggering", acpi_gbl_HEdecode},</div><div class='add'>+	 "Triggering", acpi_gbl_he_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity",</div><div class='del'>-	 acpi_gbl_LLdecode},</div><div class='add'>+	 acpi_gbl_ll_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing",</div><div class='del'>-	 acpi_gbl_SHRdecode},</div><div class='add'>+	 acpi_gbl_shr_decode},</div><div class='ctx'> 	{ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL,</div><div class='ctx'> 	 NULL},</div><div class='ctx'> 	{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(extended_irq.interrupt_count),</div><div class='hunk'>@@ -314,7 +314,7 @@ static struct acpi_rsdump_info acpi_rs_dump_general_flags[5] = {</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.producer_consumer),</div><div class='ctx'> 	 "Consumer/Producer", acpi_gbl_consume_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.decode), "Address Decode",</div><div class='del'>-	 acpi_gbl_DECdecode},</div><div class='add'>+	 acpi_gbl_dec_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.min_address_fixed),</div><div class='ctx'> 	 "Min Relocatability", acpi_gbl_min_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.max_address_fixed),</div><div class='hunk'>@@ -325,24 +325,24 @@ static struct acpi_rsdump_info acpi_rs_dump_memory_flags[5] = {</div><div class='ctx'> 	{ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory_flags),</div><div class='ctx'> 	 "Resource Type", (void *)"Memory Range"},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.write_protect),</div><div class='del'>-	 "Write Protect", acpi_gbl_RWdecode},</div><div class='add'>+	 "Write Protect", acpi_gbl_rw_decode},</div><div class='ctx'> 	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.caching),</div><div class='del'>-	 "Caching", acpi_gbl_MEMdecode},</div><div class='add'>+	 "Caching", acpi_gbl_mem_decode},</div><div class='ctx'> 	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.range_type),</div><div class='del'>-	 "Range Type", acpi_gbl_MTPdecode},</div><div class='add'>+	 "Range Type", acpi_gbl_mtp_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.translation),</div><div class='del'>-	 "Translation", acpi_gbl_TTPdecode}</div><div class='add'>+	 "Translation", acpi_gbl_ttp_decode}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct acpi_rsdump_info acpi_rs_dump_io_flags[4] = {</div><div class='ctx'> 	{ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_io_flags),</div><div class='ctx'> 	 "Resource Type", (void *)"I/O Range"},</div><div class='ctx'> 	{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.io.range_type),</div><div class='del'>-	 "Range Type", acpi_gbl_RNGdecode},</div><div class='add'>+	 "Range Type", acpi_gbl_rng_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation),</div><div class='del'>-	 "Translation", acpi_gbl_TTPdecode},</div><div class='add'>+	 "Translation", acpi_gbl_ttp_decode},</div><div class='ctx'> 	{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation_type),</div><div class='del'>-	 "Translation Type", acpi_gbl_TRSdecode}</div><div class='add'>+	 "Translation Type", acpi_gbl_trs_decode}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c<br/>index d9ae64b77bd9..9e7ae2f8a1d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsinfo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rsinfo.c</a></div><div class='hunk'>@@ -141,6 +141,7 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {</div><div class='ctx'> 	acpi_rs_dump_generic_reg,	/* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #endif	/* ACPI_FUTURE_USAGE */</div><div class='ctx'> /*</div><div class='ctx'>  * Base sizes for external AML resource descriptors, indexed by internal type.</div><div class='head'>diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c<br/>index 1434e786477e..29423ce030ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rslist.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rslist.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rslist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rslist.c</a></div><div class='hunk'>@@ -51,76 +51,62 @@ ACPI_MODULE_NAME("rslist")</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_convert_aml_to_resources</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Aml                 - Pointer to the resource byte stream</div><div class='del'>- *              aml_length          - Length of Aml</div><div class='del'>- *              output_buffer       - Pointer to the buffer that will</div><div class='del'>- *                                    contain the output structures</div><div class='add'>+ * PARAMETERS:  acpi_walk_aml_callback</div><div class='add'>+ *              resource_ptr            - Pointer to the buffer that will</div><div class='add'>+ *                                        contain the output structures</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Takes the resource byte stream and parses it, creating a</div><div class='del'>- *              linked list of resources in the caller's output buffer</div><div class='add'>+ * DESCRIPTION: Convert an AML resource to an internal representation of the</div><div class='add'>+ *              resource that is aligned and easier to access.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_rs_convert_aml_to_resources(u8 * aml, u32 aml_length, u8 * output_buffer)</div><div class='add'>+acpi_rs_convert_aml_to_resources(u8 * aml,</div><div class='add'>+				 u32 length,</div><div class='add'>+				 u32 offset, u8 resource_index, void **context)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_resource *resource = (void *)output_buffer;</div><div class='add'>+	struct acpi_resource **resource_ptr =</div><div class='add'>+	    ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context);</div><div class='add'>+	struct acpi_resource *resource;</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	u8 resource_index;</div><div class='del'>-	u8 *end_aml;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_convert_aml_to_resources");</div><div class='del'>-</div><div class='del'>-	end_aml = aml + aml_length;</div><div class='del'>-</div><div class='del'>-	/* Loop until end-of-buffer or an end_tag is found */</div><div class='del'>-</div><div class='del'>-	while (aml &lt; end_aml) {</div><div class='del'>-		/* Validate the Resource Type and Resource Length */</div><div class='del'>-</div><div class='del'>-		status = acpi_ut_validate_resource(aml, &amp;resource_index);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* Convert the AML byte stream resource to a local resource struct */</div><div class='del'>-</div><div class='del'>-		status =</div><div class='del'>-		    acpi_rs_convert_aml_to_resource(resource,</div><div class='del'>-						    ACPI_CAST_PTR(union</div><div class='del'>-								  aml_resource,</div><div class='del'>-								  aml),</div><div class='del'>-						    acpi_gbl_get_resource_dispatch</div><div class='del'>-						    [resource_index]);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-					"Could not convert AML resource (Type %X)",</div><div class='del'>-					*aml));</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources);</div><div class='ctx'> </div><div class='del'>-		/* Normal exit on completion of an end_tag resource descriptor */</div><div class='del'>-</div><div class='del'>-		if (acpi_ut_get_resource_type(aml) ==</div><div class='del'>-		    ACPI_RESOURCE_NAME_END_TAG) {</div><div class='del'>-			return_ACPI_STATUS(AE_OK);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Point to the next input AML resource */</div><div class='del'>-</div><div class='del'>-		aml += acpi_ut_get_descriptor_length(aml);</div><div class='del'>-</div><div class='del'>-		/* Point to the next structure in the output buffer */</div><div class='add'>+	/*</div><div class='add'>+	 * Check that the input buffer and all subsequent pointers into it</div><div class='add'>+	 * are aligned on a native word boundary. Most important on IA64</div><div class='add'>+	 */</div><div class='add'>+	resource = *resource_ptr;</div><div class='add'>+	if (ACPI_IS_MISALIGNED(resource)) {</div><div class='add'>+		ACPI_WARNING((AE_INFO,</div><div class='add'>+			      "Misaligned resource pointer %p", resource));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		resource =</div><div class='del'>-		    ACPI_ADD_PTR(struct acpi_resource, resource,</div><div class='del'>-				 resource-&gt;length);</div><div class='add'>+	/* Convert the AML byte stream resource to a local resource struct */</div><div class='add'>+</div><div class='add'>+	status =</div><div class='add'>+	    acpi_rs_convert_aml_to_resource(resource,</div><div class='add'>+					    ACPI_CAST_PTR(union aml_resource,</div><div class='add'>+							  aml),</div><div class='add'>+					    acpi_gbl_get_resource_dispatch</div><div class='add'>+					    [resource_index]);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+				"Could not convert AML resource (Type %X)",</div><div class='add'>+				*aml));</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Did not find an end_tag resource descriptor */</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,</div><div class='add'>+			  "Type %.2X, AmlLength %.2X InternalLength %.2X\n",</div><div class='add'>+			  acpi_ut_get_resource_type(aml), length,</div><div class='add'>+			  resource-&gt;length));</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+	/* Point to the next structure in the output buffer */</div><div class='add'>+</div><div class='add'>+	*resource_ptr = ACPI_ADD_PTR(void, resource, resource-&gt;length);</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -150,11 +136,12 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,</div><div class='ctx'> 	u8 *end_aml = output_buffer + aml_size_needed;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_convert_resources_to_aml");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml);</div><div class='ctx'> </div><div class='ctx'> 	/* Walk the resource descriptor list, convert each descriptor */</div><div class='ctx'> </div><div class='ctx'> 	while (aml &lt; end_aml) {</div><div class='add'>+</div><div class='ctx'> 		/* Validate the (internal) Resource Type */</div><div class='ctx'> </div><div class='ctx'> 		if (resource-&gt;type &gt; ACPI_RESOURCE_TYPE_MAX) {</div><div class='hunk'>@@ -191,6 +178,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,</div><div class='ctx'> 		/* Check for end-of-list, normal exit */</div><div class='ctx'> </div><div class='ctx'> 		if (resource-&gt;type == ACPI_RESOURCE_TYPE_END_TAG) {</div><div class='add'>+</div><div class='ctx'> 			/* An End Tag indicates the end of the input Resource Template */</div><div class='ctx'> </div><div class='ctx'> 			return_ACPI_STATUS(AE_OK);</div><div class='head'>diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c<br/>index ed866cf1c6d2..faf6e106b785 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsmisc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rsmisc.c</a></div><div class='hunk'>@@ -81,9 +81,10 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> 	u16 item_count = 0;</div><div class='ctx'> 	u16 temp16 = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_resource");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);</div><div class='ctx'> </div><div class='ctx'> 	if (((acpi_native_uint) resource) &amp; 0x3) {</div><div class='add'>+</div><div class='ctx'> 		/* Each internal resource struct is expected to be 32-bit aligned */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_WARNING((AE_INFO,</div><div class='hunk'>@@ -295,9 +296,11 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,</div><div class='ctx'> </div><div class='ctx'>       exit:</div><div class='ctx'> 	if (!flags_mode) {</div><div class='del'>-		/* Round the resource struct length up to the next 32-bit boundary */</div><div class='ctx'> </div><div class='del'>-		resource-&gt;length = ACPI_ROUND_UP_to_32_bITS(resource-&gt;length);</div><div class='add'>+		/* Round the resource struct length up to the next boundary (32 or 64) */</div><div class='add'>+</div><div class='add'>+		resource-&gt;length =</div><div class='add'>+		    (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(resource-&gt;length);</div><div class='ctx'> 	}</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='hunk'>@@ -329,7 +332,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,</div><div class='ctx'> 	u16 temp16 = 0;</div><div class='ctx'> 	u16 item_count = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_convert_resource_to_aml");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First table entry must be ACPI_RSC_INITxxx and must contain the</div><div class='hunk'>@@ -535,6 +538,7 @@ if (((aml-&gt;irq.flags &amp; 0x09) == 0x00) || ((aml-&gt;irq.flags &amp; 0x09) == 0x09)) {</div><div class='ctx'> </div><div class='ctx'> resource-&gt;data.extended_irq.interrupt_count = temp8;</div><div class='ctx'> if (temp8 &lt; 1) {</div><div class='add'>+</div><div class='ctx'> 	/* Must have at least one IRQ */</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);</div><div class='head'>diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c<br/>index 25b5aedd6612..a9cbee8e8b44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsutils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rsutils.c</a></div><div class='hunk'>@@ -205,6 +205,7 @@ acpi_rs_set_resource_length(acpi_rsdesc_size total_length,</div><div class='ctx'> 	/* Length is stored differently for large and small descriptors */</div><div class='ctx'> </div><div class='ctx'> 	if (aml-&gt;small_header.descriptor_type &amp; ACPI_RESOURCE_NAME_LARGE) {</div><div class='add'>+</div><div class='ctx'> 		/* Large descriptor -- bytes 1-2 contain the 16-bit length */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_MOVE_16_TO_16(&amp;aml-&gt;large_header.resource_length,</div><div class='hunk'>@@ -298,7 +299,8 @@ static u16 acpi_rs_strcpy(char *destination, char *source)</div><div class='ctx'>  *              string_ptr          - (optional) where to store the actual</div><div class='ctx'>  *                                    resource_source string</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      Length of the string plus NULL terminator, rounded up to 32 bit</div><div class='add'>+ * RETURN:      Length of the string plus NULL terminator, rounded up to native</div><div class='add'>+ *              word boundary</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Copy the optional resource_source data from a raw AML descriptor</div><div class='ctx'>  *              to an internal resource descriptor</div><div class='hunk'>@@ -328,6 +330,7 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,</div><div class='ctx'> 	 * we add 1 to the minimum length.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (total_length &gt; (acpi_rsdesc_size) (minimum_length + 1)) {</div><div class='add'>+</div><div class='ctx'> 		/* Get the resource_source_index */</div><div class='ctx'> </div><div class='ctx'> 		resource_source-&gt;index = aml_resource_source[0];</div><div class='hunk'>@@ -344,23 +347,26 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * In order for the struct_size to fall on a 32-bit boundary, calculate</div><div class='del'>-		 * the length of the string (+1 for the NULL terminator) and expand the</div><div class='del'>-		 * struct_size to the next 32-bit boundary.</div><div class='add'>+		 * In order for the Resource length to be a multiple of the native</div><div class='add'>+		 * word, calculate the length of the string (+1 for NULL terminator)</div><div class='add'>+		 * and expand to the next word multiple.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Zero the entire area of the buffer.</div><div class='ctx'> 		 */</div><div class='ctx'> 		total_length =</div><div class='del'>-		    ACPI_ROUND_UP_to_32_bITS(ACPI_STRLEN</div><div class='del'>-					     ((char *)&amp;aml_resource_source[1]) +</div><div class='del'>-					     1);</div><div class='add'>+		    (u32)</div><div class='add'>+		    ACPI_STRLEN(ACPI_CAST_PTR(char, &amp;aml_resource_source[1])) +</div><div class='add'>+		    1;</div><div class='add'>+		total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);</div><div class='add'>+</div><div class='ctx'> 		ACPI_MEMSET(resource_source-&gt;string_ptr, 0, total_length);</div><div class='ctx'> </div><div class='ctx'> 		/* Copy the resource_source string to the destination */</div><div class='ctx'> </div><div class='ctx'> 		resource_source-&gt;string_length =</div><div class='ctx'> 		    acpi_rs_strcpy(resource_source-&gt;string_ptr,</div><div class='del'>-				   (char *)&amp;aml_resource_source[1]);</div><div class='add'>+				   ACPI_CAST_PTR(char,</div><div class='add'>+						 &amp;aml_resource_source[1]));</div><div class='ctx'> </div><div class='ctx'> 		return ((acpi_rs_length) total_length);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -405,6 +411,7 @@ acpi_rs_set_resource_source(union aml_resource * aml,</div><div class='ctx'> 	/* Non-zero string length indicates presence of a resource_source */</div><div class='ctx'> </div><div class='ctx'> 	if (resource_source-&gt;string_length) {</div><div class='add'>+</div><div class='ctx'> 		/* Point to the end of the AML descriptor */</div><div class='ctx'> </div><div class='ctx'> 		aml_resource_source = ACPI_ADD_PTR(u8, aml, minimum_length);</div><div class='hunk'>@@ -415,7 +422,7 @@ acpi_rs_set_resource_source(union aml_resource * aml,</div><div class='ctx'> </div><div class='ctx'> 		/* Copy the resource_source string */</div><div class='ctx'> </div><div class='del'>-		ACPI_STRCPY((char *)&amp;aml_resource_source[1],</div><div class='add'>+		ACPI_STRCPY(ACPI_CAST_PTR(char, &amp;aml_resource_source[1]),</div><div class='ctx'> 			    resource_source-&gt;string_ptr);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -435,9 +442,9 @@ acpi_rs_set_resource_source(union aml_resource * aml,</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_get_prt_method_data</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Handle          - a handle to the containing object</div><div class='del'>- *              ret_buffer      - a pointer to a buffer structure for the</div><div class='del'>- *                                  results</div><div class='add'>+ * PARAMETERS:  Node            - Device node</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer structure for the</div><div class='add'>+ *                                results</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -450,18 +457,19 @@ acpi_rs_set_resource_source(union aml_resource * aml,</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer * ret_buffer)</div><div class='add'>+acpi_rs_get_prt_method_data(struct acpi_namespace_node * node,</div><div class='add'>+			    struct acpi_buffer * ret_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_prt_method_data");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_prt_method_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameters guaranteed valid by caller */</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the method, no parameters */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_evaluate_object(handle, METHOD_NAME__PRT,</div><div class='add'>+	status = acpi_ut_evaluate_object(node, METHOD_NAME__PRT,</div><div class='ctx'> 					 ACPI_BTYPE_PACKAGE, &amp;obj_desc);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -483,9 +491,9 @@ acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer * ret_buffer)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_get_crs_method_data</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Handle          - a handle to the containing object</div><div class='del'>- *              ret_buffer      - a pointer to a buffer structure for the</div><div class='del'>- *                                  results</div><div class='add'>+ * PARAMETERS:  Node            - Device node</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer structure for the</div><div class='add'>+ *                                results</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -498,18 +506,19 @@ acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer * ret_buffer)</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='add'>+acpi_rs_get_crs_method_data(struct acpi_namespace_node *node,</div><div class='add'>+			    struct acpi_buffer *ret_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_crs_method_data");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_crs_method_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameters guaranteed valid by caller */</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the method, no parameters */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_evaluate_object(handle, METHOD_NAME__CRS,</div><div class='add'>+	status = acpi_ut_evaluate_object(node, METHOD_NAME__CRS,</div><div class='ctx'> 					 ACPI_BTYPE_BUFFER, &amp;obj_desc);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -522,7 +531,7 @@ acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_rs_create_resource_list(obj_desc, ret_buffer);</div><div class='ctx'> </div><div class='del'>-	/* on exit, we must delete the object returned by evaluate_object */</div><div class='add'>+	/* On exit, we must delete the object returned by evaluate_object */</div><div class='ctx'> </div><div class='ctx'> 	acpi_ut_remove_reference(obj_desc);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -532,9 +541,9 @@ acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_get_prs_method_data</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Handle          - a handle to the containing object</div><div class='del'>- *              ret_buffer      - a pointer to a buffer structure for the</div><div class='del'>- *                                  results</div><div class='add'>+ * PARAMETERS:  Node            - Device node</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer structure for the</div><div class='add'>+ *                                results</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -548,18 +557,19 @@ acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_rs_get_prs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='add'>+acpi_rs_get_prs_method_data(struct acpi_namespace_node *node,</div><div class='add'>+			    struct acpi_buffer *ret_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_prs_method_data");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_prs_method_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameters guaranteed valid by caller */</div><div class='ctx'> </div><div class='ctx'> 	/* Execute the method, no parameters */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_evaluate_object(handle, METHOD_NAME__PRS,</div><div class='add'>+	status = acpi_ut_evaluate_object(node, METHOD_NAME__PRS,</div><div class='ctx'> 					 ACPI_BTYPE_BUFFER, &amp;obj_desc);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -572,7 +582,7 @@ acpi_rs_get_prs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_rs_create_resource_list(obj_desc, ret_buffer);</div><div class='ctx'> </div><div class='del'>-	/* on exit, we must delete the object returned by evaluate_object */</div><div class='add'>+	/* On exit, we must delete the object returned by evaluate_object */</div><div class='ctx'> </div><div class='ctx'> 	acpi_ut_remove_reference(obj_desc);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='hunk'>@@ -583,10 +593,10 @@ acpi_rs_get_prs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_get_method_data</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Handle          - a handle to the containing object</div><div class='add'>+ * PARAMETERS:  Handle          - Handle to the containing object</div><div class='ctx'>  *              Path            - Path to method, relative to Handle</div><div class='del'>- *              ret_buffer      - a pointer to a buffer structure for the</div><div class='del'>- *                                  results</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer structure for the</div><div class='add'>+ *                                results</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -605,7 +615,7 @@ acpi_rs_get_method_data(acpi_handle handle,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_get_method_data");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_get_method_data);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameters guaranteed valid by caller */</div><div class='ctx'> </div><div class='hunk'>@@ -634,9 +644,9 @@ acpi_rs_get_method_data(acpi_handle handle,</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_set_srs_method_data</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Handle          - a handle to the containing object</div><div class='del'>- *              in_buffer       - a pointer to a buffer structure of the</div><div class='del'>- *                                  parameter</div><div class='add'>+ * PARAMETERS:  Node            - Device node</div><div class='add'>+ *              in_buffer       - Pointer to a buffer structure of the</div><div class='add'>+ *                                parameter</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -646,23 +656,37 @@ acpi_rs_get_method_data(acpi_handle handle,</div><div class='ctx'>  *              If the function fails an appropriate status will be returned</div><div class='ctx'>  *              and the contents of the callers buffer is undefined.</div><div class='ctx'>  *</div><div class='add'>+ * Note: Parameters guaranteed valid by caller</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_rs_set_srs_method_data(acpi_handle handle, struct acpi_buffer *in_buffer)</div><div class='add'>+acpi_rs_set_srs_method_data(struct acpi_namespace_node *node,</div><div class='add'>+			    struct acpi_buffer *in_buffer)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='del'>-	union acpi_operand_object *params[2];</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='add'>+	union acpi_operand_object *args[2];</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_buffer buffer;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("rs_set_srs_method_data");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_set_srs_method_data);</div><div class='ctx'> </div><div class='del'>-	/* Parameters guaranteed valid by caller */</div><div class='add'>+	/* Allocate and initialize the evaluation information block */</div><div class='add'>+</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;prefix_node = node;</div><div class='add'>+	info-&gt;pathname = METHOD_NAME__SRS;</div><div class='add'>+	info-&gt;parameters = args;</div><div class='add'>+	info-&gt;parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	info-&gt;flags = ACPI_IGNORE_RETURN_VALUE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The in_buffer parameter will point to a linked list of</div><div class='del'>-	 * resource parameters.  It needs to be formatted into a</div><div class='add'>+	 * resource parameters. It needs to be formatted into a</div><div class='ctx'> 	 * byte stream to be sent in as an input parameter to _SRS</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Convert the linked list into a byte stream</div><div class='hunk'>@@ -670,41 +694,36 @@ acpi_rs_set_srs_method_data(acpi_handle handle, struct acpi_buffer *in_buffer)</div><div class='ctx'> 	buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;</div><div class='ctx'> 	status = acpi_rs_create_aml_resources(in_buffer-&gt;pointer, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Init the param object */</div><div class='add'>+	/* Create and initialize the method parameter object */</div><div class='ctx'> </div><div class='del'>-	params[0] = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER);</div><div class='del'>-	if (!params[0]) {</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='del'>-		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	args[0] = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER);</div><div class='add'>+	if (!args[0]) {</div><div class='add'>+		/*</div><div class='add'>+		 * Must free the buffer allocated above (otherwise it is freed</div><div class='add'>+		 * later)</div><div class='add'>+		 */</div><div class='add'>+		ACPI_FREE(buffer.pointer);</div><div class='add'>+		status = AE_NO_MEMORY;</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Set up the parameter object */</div><div class='del'>-</div><div class='del'>-	params[0]-&gt;buffer.length = (u32) buffer.length;</div><div class='del'>-	params[0]-&gt;buffer.pointer = buffer.pointer;</div><div class='del'>-	params[0]-&gt;common.flags = AOPOBJ_DATA_VALID;</div><div class='del'>-	params[1] = NULL;</div><div class='del'>-</div><div class='del'>-	info.node = handle;</div><div class='del'>-	info.parameters = params;</div><div class='del'>-	info.parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	args[0]-&gt;buffer.length = (u32) buffer.length;</div><div class='add'>+	args[0]-&gt;buffer.pointer = buffer.pointer;</div><div class='add'>+	args[0]-&gt;common.flags = AOPOBJ_DATA_VALID;</div><div class='add'>+	args[1] = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Execute the method, no return value */</div><div class='add'>+	/* Execute the method, no return value is expected */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_evaluate_relative(METHOD_NAME__SRS, &amp;info);</div><div class='del'>-	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		/* Delete any return object (especially if implicit_return is enabled) */</div><div class='add'>+	status = acpi_ns_evaluate(info);</div><div class='ctx'> </div><div class='del'>-		if (info.return_object) {</div><div class='del'>-			acpi_ut_remove_reference(info.return_object);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Clean up and return the status from acpi_ns_evaluate */</div><div class='ctx'> </div><div class='del'>-	/* Clean up and return the status from acpi_ns_evaluate_relative */</div><div class='add'>+	acpi_ut_remove_reference(args[0]);</div><div class='ctx'> </div><div class='del'>-	acpi_ut_remove_reference(params[0]);</div><div class='add'>+      cleanup:</div><div class='add'>+	ACPI_FREE(info);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c<br/>index 88b67077aeeb..1999e2ab7daa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsxface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/resources/rsxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/resources/rsxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/resources/rsxface.c</a></div><div class='hunk'>@@ -41,10 +41,9 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acresrc.h&gt;</div><div class='add'>+#include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_RESOURCES</div><div class='ctx'> ACPI_MODULE_NAME("rsxface")</div><div class='hunk'>@@ -68,312 +67,262 @@ ACPI_MODULE_NAME("rsxface")</div><div class='ctx'> static acpi_status</div><div class='ctx'> acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context);</div><div class='ctx'> </div><div class='add'>+static acpi_status</div><div class='add'>+acpi_rs_validate_parameters(acpi_handle device_handle,</div><div class='add'>+			    struct acpi_buffer *buffer,</div><div class='add'>+			    struct acpi_namespace_node **return_node);</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_get_irq_routing_table</div><div class='add'>+ * FUNCTION:    acpi_rs_validate_parameters</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  device_handle   - a handle to the Bus device we are querying</div><div class='del'>- *              ret_buffer      - a pointer to a buffer to receive the</div><div class='del'>- *                                current resources for the device</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle to a device</div><div class='add'>+ *              Buffer          - Pointer to a data buffer</div><div class='add'>+ *              return_node     - Pointer to where the device node is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: This function is called to get the IRQ routing table for a</div><div class='del'>- *              specific bus.  The caller must first acquire a handle for the</div><div class='del'>- *              desired bus.  The routine table is placed in the buffer pointed</div><div class='del'>- *              to by the ret_buffer variable parameter.</div><div class='del'>- *</div><div class='del'>- *              If the function fails an appropriate status will be returned</div><div class='del'>- *              and the value of ret_buffer is undefined.</div><div class='del'>- *</div><div class='del'>- *              This function attempts to execute the _PRT method contained in</div><div class='del'>- *              the object indicated by the passed device_handle.</div><div class='add'>+ * DESCRIPTION: Common parameter validation for resource interfaces</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_get_irq_routing_table(acpi_handle device_handle,</div><div class='del'>-			   struct acpi_buffer *ret_buffer)</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_rs_validate_parameters(acpi_handle device_handle,</div><div class='add'>+			    struct acpi_buffer *buffer,</div><div class='add'>+			    struct acpi_namespace_node **return_node)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_irq_routing_table ");</div><div class='add'>+	ACPI_FUNCTION_TRACE(rs_validate_parameters);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Must have a valid handle and buffer, So we have to have a handle</div><div class='del'>-	 * and a return buffer structure, and if there is a non-zero buffer length</div><div class='del'>-	 * we also need a valid pointer in the buffer. If it's a zero buffer length,</div><div class='del'>-	 * we'll be returning the needed buffer size, so keep going.</div><div class='add'>+	 * Must have a valid handle to an ACPI device</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!device_handle) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_validate_buffer(ret_buffer);</div><div class='add'>+	node = acpi_ns_map_handle_to_node(device_handle);</div><div class='add'>+	if (!node) {</div><div class='add'>+		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (node-&gt;type != ACPI_TYPE_DEVICE) {</div><div class='add'>+		return_ACPI_STATUS(AE_TYPE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Validate the user buffer object</div><div class='add'>+	 *</div><div class='add'>+	 * if there is a non-zero buffer length we also need a valid pointer in</div><div class='add'>+	 * the buffer. If it's a zero buffer length, we'll be returning the</div><div class='add'>+	 * needed buffer size (later), so keep going.</div><div class='add'>+	 */</div><div class='add'>+	status = acpi_ut_validate_buffer(buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_rs_get_prt_method_data(device_handle, ret_buffer);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	*return_node = node;</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_get_current_resources</div><div class='add'>+ * FUNCTION:    acpi_get_irq_routing_table</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  device_handle   - a handle to the device object for the</div><div class='del'>- *                                device we are querying</div><div class='del'>- *              ret_buffer      - a pointer to a buffer to receive the</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle to the Bus device we are querying</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer to receive the</div><div class='ctx'>  *                                current resources for the device</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: This function is called to get the current resources for a</div><div class='del'>- *              specific device.  The caller must first acquire a handle for</div><div class='del'>- *              the desired device.  The resource data is placed in the buffer</div><div class='del'>- *              pointed to by the ret_buffer variable parameter.</div><div class='add'>+ * DESCRIPTION: This function is called to get the IRQ routing table for a</div><div class='add'>+ *              specific bus. The caller must first acquire a handle for the</div><div class='add'>+ *              desired bus. The routine table is placed in the buffer pointed</div><div class='add'>+ *              to by the ret_buffer variable parameter.</div><div class='ctx'>  *</div><div class='ctx'>  *              If the function fails an appropriate status will be returned</div><div class='ctx'>  *              and the value of ret_buffer is undefined.</div><div class='ctx'>  *</div><div class='del'>- *              This function attempts to execute the _CRS method contained in</div><div class='add'>+ *              This function attempts to execute the _PRT method contained in</div><div class='ctx'>  *              the object indicated by the passed device_handle.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_get_current_resources(acpi_handle device_handle,</div><div class='add'>+acpi_get_irq_routing_table(acpi_handle device_handle,</div><div class='ctx'> 			   struct acpi_buffer *ret_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_current_resources");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_irq_routing_table);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Must have a valid handle and buffer, So we have to have a handle</div><div class='del'>-	 * and a return buffer structure, and if there is a non-zero buffer length</div><div class='del'>-	 * we also need a valid pointer in the buffer. If it's a zero buffer length,</div><div class='del'>-	 * we'll be returning the needed buffer size, so keep going.</div><div class='del'>-	 */</div><div class='del'>-	if (!device_handle) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='del'>-	}</div><div class='add'>+	/* Validate parameters then dispatch to internal routine */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_validate_buffer(ret_buffer);</div><div class='add'>+	status = acpi_rs_validate_parameters(device_handle, ret_buffer, &amp;node);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_rs_get_crs_method_data(device_handle, ret_buffer);</div><div class='add'>+	status = acpi_rs_get_prt_method_data(node, ret_buffer);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_current_resources);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_irq_routing_table)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_get_possible_resources</div><div class='add'>+ * FUNCTION:    acpi_get_current_resources</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  device_handle   - a handle to the device object for the</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle to the device object for the</div><div class='ctx'>  *                                device we are querying</div><div class='del'>- *              ret_buffer      - a pointer to a buffer to receive the</div><div class='del'>- *                                resources for the device</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer to receive the</div><div class='add'>+ *                                current resources for the device</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: This function is called to get a list of the possible resources</div><div class='del'>- *              for a specific device.  The caller must first acquire a handle</div><div class='del'>- *              for the desired device.  The resource data is placed in the</div><div class='del'>- *              buffer pointed to by the ret_buffer variable.</div><div class='add'>+ * DESCRIPTION: This function is called to get the current resources for a</div><div class='add'>+ *              specific device. The caller must first acquire a handle for</div><div class='add'>+ *              the desired device. The resource data is placed in the buffer</div><div class='add'>+ *              pointed to by the ret_buffer variable parameter.</div><div class='ctx'>  *</div><div class='ctx'>  *              If the function fails an appropriate status will be returned</div><div class='ctx'>  *              and the value of ret_buffer is undefined.</div><div class='ctx'>  *</div><div class='add'>+ *              This function attempts to execute the _CRS method contained in</div><div class='add'>+ *              the object indicated by the passed device_handle.</div><div class='add'>+ *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_get_possible_resources(acpi_handle device_handle,</div><div class='del'>-			    struct acpi_buffer *ret_buffer)</div><div class='add'>+acpi_get_current_resources(acpi_handle device_handle,</div><div class='add'>+			   struct acpi_buffer *ret_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_possible_resources");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_current_resources);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Must have a valid handle and buffer, So we have to have a handle</div><div class='del'>-	 * and a return buffer structure, and if there is a non-zero buffer length</div><div class='del'>-	 * we also need a valid pointer in the buffer. If it's a zero buffer length,</div><div class='del'>-	 * we'll be returning the needed buffer size, so keep going.</div><div class='del'>-	 */</div><div class='del'>-	if (!device_handle) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='del'>-	}</div><div class='add'>+	/* Validate parameters then dispatch to internal routine */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ut_validate_buffer(ret_buffer);</div><div class='add'>+	status = acpi_rs_validate_parameters(device_handle, ret_buffer, &amp;node);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_rs_get_prs_method_data(device_handle, ret_buffer);</div><div class='add'>+	status = acpi_rs_get_crs_method_data(node, ret_buffer);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_possible_resources);</div><div class='del'>-#endif				/*  ACPI_FUTURE_USAGE  */</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_current_resources)</div><div class='ctx'> </div><div class='add'>+#ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_walk_resources</div><div class='add'>+ * FUNCTION:    acpi_get_possible_resources</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  device_handle   - Handle to the device object for the</div><div class='ctx'>  *                                device we are querying</div><div class='del'>- *              Name            - Method name of the resources we want</div><div class='del'>- *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)</div><div class='del'>- *              user_function   - Called for each resource</div><div class='del'>- *              Context         - Passed to user_function</div><div class='add'>+ *              ret_buffer      - Pointer to a buffer to receive the</div><div class='add'>+ *                                resources for the device</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Retrieves the current or possible resource list for the</div><div class='del'>- *              specified device.  The user_function is called once for</div><div class='del'>- *              each resource in the list.</div><div class='add'>+ * DESCRIPTION: This function is called to get a list of the possible resources</div><div class='add'>+ *              for a specific device. The caller must first acquire a handle</div><div class='add'>+ *              for the desired device. The resource data is placed in the</div><div class='add'>+ *              buffer pointed to by the ret_buffer variable.</div><div class='add'>+ *</div><div class='add'>+ *              If the function fails an appropriate status will be returned</div><div class='add'>+ *              and the value of ret_buffer is undefined.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='del'>-acpi_walk_resources(acpi_handle device_handle,</div><div class='del'>-		    char *name,</div><div class='del'>-		    ACPI_WALK_RESOURCE_CALLBACK user_function, void *context)</div><div class='add'>+acpi_get_possible_resources(acpi_handle device_handle,</div><div class='add'>+			    struct acpi_buffer *ret_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	struct acpi_buffer buffer;</div><div class='del'>-	struct acpi_resource *resource;</div><div class='del'>-	struct acpi_resource *resource_end;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_walk_resources");</div><div class='del'>-</div><div class='del'>-	/* Parameter validation */</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	if (!device_handle || !user_function || !name ||</div><div class='del'>-	    (ACPI_STRNCMP(name, METHOD_NAME__CRS, sizeof(METHOD_NAME__CRS)) &amp;&amp;</div><div class='del'>-	     ACPI_STRNCMP(name, METHOD_NAME__PRS, sizeof(METHOD_NAME__PRS)))) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='del'>-	}</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_possible_resources);</div><div class='ctx'> </div><div class='del'>-	/* Get the _CRS or _PRS resource list */</div><div class='add'>+	/* Validate parameters then dispatch to internal routine */</div><div class='ctx'> </div><div class='del'>-	buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;</div><div class='del'>-	status = acpi_rs_get_method_data(device_handle, name, &amp;buffer);</div><div class='add'>+	status = acpi_rs_validate_parameters(device_handle, ret_buffer, &amp;node);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Buffer now contains the resource list */</div><div class='del'>-</div><div class='del'>-	resource = ACPI_CAST_PTR(struct acpi_resource, buffer.pointer);</div><div class='del'>-	resource_end =</div><div class='del'>-	    ACPI_ADD_PTR(struct acpi_resource, buffer.pointer, buffer.length);</div><div class='del'>-</div><div class='del'>-	/* Walk the resource list until the end_tag is found (or buffer end) */</div><div class='del'>-</div><div class='del'>-	while (resource &lt; resource_end) {</div><div class='del'>-		/* Sanity check the resource */</div><div class='del'>-</div><div class='del'>-		if (resource-&gt;type &gt; ACPI_RESOURCE_TYPE_MAX) {</div><div class='del'>-			status = AE_AML_INVALID_RESOURCE_TYPE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Invoke the user function, abort on any error returned */</div><div class='del'>-</div><div class='del'>-		status = user_function(resource, context);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			if (status == AE_CTRL_TERMINATE) {</div><div class='del'>-				/* This is an OK termination by the user function */</div><div class='del'>-</div><div class='del'>-				status = AE_OK;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* end_tag indicates end-of-list */</div><div class='del'>-</div><div class='del'>-		if (resource-&gt;type == ACPI_RESOURCE_TYPE_END_TAG) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Get the next resource descriptor */</div><div class='del'>-</div><div class='del'>-		resource =</div><div class='del'>-		    ACPI_ADD_PTR(struct acpi_resource, resource,</div><div class='del'>-				 resource-&gt;length);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ACPI_MEM_FREE(buffer.pointer);</div><div class='add'>+	status = acpi_rs_get_prs_method_data(node, ret_buffer);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_walk_resources);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_possible_resources)</div><div class='add'>+#endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_set_current_resources</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  device_handle   - a handle to the device object for the</div><div class='del'>- *                                device we are changing the resources of</div><div class='del'>- *              in_buffer       - a pointer to a buffer containing the</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle to the device object for the</div><div class='add'>+ *                                device we are setting resources</div><div class='add'>+ *              in_buffer       - Pointer to a buffer containing the</div><div class='ctx'>  *                                resources to be set for the device</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: This function is called to set the current resources for a</div><div class='del'>- *              specific device.  The caller must first acquire a handle for</div><div class='del'>- *              the desired device.  The resource data is passed to the routine</div><div class='add'>+ *              specific device. The caller must first acquire a handle for</div><div class='add'>+ *              the desired device. The resource data is passed to the routine</div><div class='ctx'>  *              the buffer pointed to by the in_buffer variable.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_set_current_resources(acpi_handle device_handle,</div><div class='ctx'> 			   struct acpi_buffer *in_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='add'>+	struct acpi_namespace_node *node;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_set_current_resources");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_set_current_resources);</div><div class='ctx'> </div><div class='del'>-	/* Must have a valid handle and buffer */</div><div class='add'>+	/* Validate the buffer, don't allow zero length */</div><div class='ctx'> </div><div class='del'>-	if ((!device_handle) ||</div><div class='del'>-	    (!in_buffer) || (!in_buffer-&gt;pointer) || (!in_buffer-&gt;length)) {</div><div class='add'>+	if ((!in_buffer) || (!in_buffer-&gt;pointer) || (!in_buffer-&gt;length)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_rs_set_srs_method_data(device_handle, in_buffer);</div><div class='add'>+	/* Validate parameters then dispatch to internal routine */</div><div class='add'>+</div><div class='add'>+	status = acpi_rs_validate_parameters(device_handle, in_buffer, &amp;node);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = acpi_rs_set_srs_method_data(node, in_buffer);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_set_current_resources);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_set_current_resources)</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_resource_to_address64</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Resource                - Pointer to a resource</div><div class='del'>- *              Out                     - Pointer to the users's return</div><div class='del'>- *                                        buffer (a struct</div><div class='del'>- *                                        struct acpi_resource_address64)</div><div class='add'>+ * PARAMETERS:  Resource        - Pointer to a resource</div><div class='add'>+ *              Out             - Pointer to the users's return buffer</div><div class='add'>+ *                                (a struct acpi_resource_address64)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: If the resource is an address16, address32, or address64,</div><div class='del'>- *              copy it to the address64 return buffer.  This saves the</div><div class='add'>+ *              copy it to the address64 return buffer. This saves the</div><div class='ctx'>  *              caller from having to duplicate code for different-sized</div><div class='ctx'>  *              addresses.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_resource_to_address64(struct acpi_resource *resource,</div><div class='ctx'> 			   struct acpi_resource_address64 *out)</div><div class='hunk'>@@ -415,18 +364,18 @@ acpi_resource_to_address64(struct acpi_resource *resource,</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_resource_to_address64);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_resource_to_address64)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_vendor_resource</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  device_handle       - Handle for the parent device object</div><div class='del'>- *              Name                - Method name for the parent resource</div><div class='del'>- *                                    (METHOD_NAME__CRS or METHOD_NAME__PRS)</div><div class='del'>- *              Uuid                - Pointer to the UUID to be matched.</div><div class='del'>- *                                    includes both subtype and 16-byte UUID</div><div class='del'>- *              ret_buffer          - Where the vendor resource is returned</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle for the parent device object</div><div class='add'>+ *              Name            - Method name for the parent resource</div><div class='add'>+ *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)</div><div class='add'>+ *              Uuid            - Pointer to the UUID to be matched.</div><div class='add'>+ *                                includes both subtype and 16-byte UUID</div><div class='add'>+ *              ret_buffer      - Where the vendor resource is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='hunk'>@@ -435,7 +384,6 @@ EXPORT_SYMBOL(acpi_resource_to_address64);</div><div class='ctx'>  *              UUID subtype. Returns a struct acpi_resource of type Vendor.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_vendor_resource(acpi_handle device_handle,</div><div class='ctx'> 			 char *name,</div><div class='hunk'>@@ -467,18 +415,19 @@ acpi_get_vendor_resource(acpi_handle device_handle,</div><div class='ctx'> 	return (info.status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_vendor_resource)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_rs_match_vendor_resource</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  ACPI_WALK_RESOURCE_CALLBACK</div><div class='add'>+ * PARAMETERS:  acpi_walk_resource_callback</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: Match a vendor resource via the ACPI 3.0 UUID</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> static acpi_status</div><div class='ctx'> acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)</div><div class='ctx'> {</div><div class='hunk'>@@ -526,3 +475,101 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)</div><div class='ctx'> 	info-&gt;status = AE_OK;</div><div class='ctx'> 	return (AE_CTRL_TERMINATE);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_walk_resources</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  device_handle   - Handle to the device object for the</div><div class='add'>+ *                                device we are querying</div><div class='add'>+ *              Name            - Method name of the resources we want</div><div class='add'>+ *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)</div><div class='add'>+ *              user_function   - Called for each resource</div><div class='add'>+ *              Context         - Passed to user_function</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Retrieves the current or possible resource list for the</div><div class='add'>+ *              specified device. The user_function is called once for</div><div class='add'>+ *              each resource in the list.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_walk_resources(acpi_handle device_handle,</div><div class='add'>+		    char *name,</div><div class='add'>+		    acpi_walk_resource_callback user_function, void *context)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	struct acpi_buffer buffer;</div><div class='add'>+	struct acpi_resource *resource;</div><div class='add'>+	struct acpi_resource *resource_end;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_walk_resources);</div><div class='add'>+</div><div class='add'>+	/* Parameter validation */</div><div class='add'>+</div><div class='add'>+	if (!device_handle || !user_function || !name ||</div><div class='add'>+	    (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) &amp;&amp;</div><div class='add'>+	     !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) {</div><div class='add'>+		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the _CRS or _PRS resource list */</div><div class='add'>+</div><div class='add'>+	buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;</div><div class='add'>+	status = acpi_rs_get_method_data(device_handle, name, &amp;buffer);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return_ACPI_STATUS(status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Buffer now contains the resource list */</div><div class='add'>+</div><div class='add'>+	resource = ACPI_CAST_PTR(struct acpi_resource, buffer.pointer);</div><div class='add'>+	resource_end =</div><div class='add'>+	    ACPI_ADD_PTR(struct acpi_resource, buffer.pointer, buffer.length);</div><div class='add'>+</div><div class='add'>+	/* Walk the resource list until the end_tag is found (or buffer end) */</div><div class='add'>+</div><div class='add'>+	while (resource &lt; resource_end) {</div><div class='add'>+</div><div class='add'>+		/* Sanity check the resource */</div><div class='add'>+</div><div class='add'>+		if (resource-&gt;type &gt; ACPI_RESOURCE_TYPE_MAX) {</div><div class='add'>+			status = AE_AML_INVALID_RESOURCE_TYPE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Invoke the user function, abort on any error returned */</div><div class='add'>+</div><div class='add'>+		status = user_function(resource, context);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			if (status == AE_CTRL_TERMINATE) {</div><div class='add'>+</div><div class='add'>+				/* This is an OK termination by the user function */</div><div class='add'>+</div><div class='add'>+				status = AE_OK;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* end_tag indicates end-of-list */</div><div class='add'>+</div><div class='add'>+		if (resource-&gt;type == ACPI_RESOURCE_TYPE_END_TAG) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get the next resource descriptor */</div><div class='add'>+</div><div class='add'>+		resource =</div><div class='add'>+		    ACPI_ADD_PTR(struct acpi_resource, resource,</div><div class='add'>+				 resource-&gt;length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(buffer.pointer);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_walk_resources)</div><div class='head'>diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c<br/>new file mode 100644<br/>index 000000000000..db7b350a5035<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/sbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/sbs.c</a></div><div class='hunk'>@@ -0,0 +1,1766 @@</div><div class='add'>+/*</div><div class='add'>+ *  acpi_sbs.c - ACPI Smart Battery System Driver ($Revision: 1.16 $)</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2005 Rich Townsend &lt;rhdt@bartol.udel.edu&gt;</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or (at</div><div class='add'>+ *  your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful, but</div><div class='add'>+ *  WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ *  General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License along</div><div class='add'>+ *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='add'>+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "i2c_ec.h"</div><div class='add'>+</div><div class='add'>+#define	DEF_CAPACITY_UNIT	3</div><div class='add'>+#define	MAH_CAPACITY_UNIT	1</div><div class='add'>+#define	MWH_CAPACITY_UNIT	2</div><div class='add'>+#define	CAPACITY_UNIT		DEF_CAPACITY_UNIT</div><div class='add'>+</div><div class='add'>+#define	REQUEST_UPDATE_MODE	1</div><div class='add'>+#define	QUEUE_UPDATE_MODE	2</div><div class='add'>+</div><div class='add'>+#define	DATA_TYPE_COMMON	0</div><div class='add'>+#define	DATA_TYPE_INFO		1</div><div class='add'>+#define	DATA_TYPE_STATE		2</div><div class='add'>+#define	DATA_TYPE_ALARM		3</div><div class='add'>+#define	DATA_TYPE_AC_STATE	4</div><div class='add'>+</div><div class='add'>+extern struct proc_dir_entry *acpi_lock_ac_dir(void);</div><div class='add'>+extern struct proc_dir_entry *acpi_lock_battery_dir(void);</div><div class='add'>+extern void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);</div><div class='add'>+extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);</div><div class='add'>+</div><div class='add'>+#define ACPI_SBS_COMPONENT		0x00080000</div><div class='add'>+#define ACPI_SBS_CLASS			"sbs"</div><div class='add'>+#define ACPI_AC_CLASS			"ac_adapter"</div><div class='add'>+#define ACPI_BATTERY_CLASS		"battery"</div><div class='add'>+#define ACPI_SBS_HID			"ACPI0002"</div><div class='add'>+#define ACPI_SBS_DRIVER_NAME		"ACPI Smart Battery System Driver"</div><div class='add'>+#define ACPI_SBS_DEVICE_NAME		"Smart Battery System"</div><div class='add'>+#define ACPI_SBS_FILE_INFO		"info"</div><div class='add'>+#define ACPI_SBS_FILE_STATE		"state"</div><div class='add'>+#define ACPI_SBS_FILE_ALARM		"alarm"</div><div class='add'>+#define ACPI_BATTERY_DIR_NAME		"BAT%i"</div><div class='add'>+#define ACPI_AC_DIR_NAME		"AC0"</div><div class='add'>+#define ACPI_SBC_SMBUS_ADDR		0x9</div><div class='add'>+#define ACPI_SBSM_SMBUS_ADDR		0xa</div><div class='add'>+#define ACPI_SB_SMBUS_ADDR		0xb</div><div class='add'>+#define ACPI_SBS_AC_NOTIFY_STATUS	0x80</div><div class='add'>+#define ACPI_SBS_BATTERY_NOTIFY_STATUS	0x80</div><div class='add'>+#define ACPI_SBS_BATTERY_NOTIFY_INFO	0x81</div><div class='add'>+</div><div class='add'>+#define _COMPONENT			ACPI_SBS_COMPONENT</div><div class='add'>+</div><div class='add'>+#define	MAX_SBS_BAT			4</div><div class='add'>+#define	MAX_SMBUS_ERR			1</div><div class='add'>+</div><div class='add'>+ACPI_MODULE_NAME("acpi_sbs");</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rich Townsend");</div><div class='add'>+MODULE_DESCRIPTION("Smart Battery System ACPI interface driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static struct semaphore sbs_sem;</div><div class='add'>+</div><div class='add'>+#define	UPDATE_MODE		QUEUE_UPDATE_MODE</div><div class='add'>+/* REQUEST_UPDATE_MODE  QUEUE_UPDATE_MODE */</div><div class='add'>+#define	UPDATE_INFO_MODE	0</div><div class='add'>+#define	UPDATE_TIME		60</div><div class='add'>+#define	UPDATE_TIME2		0</div><div class='add'>+</div><div class='add'>+static int capacity_mode = CAPACITY_UNIT;</div><div class='add'>+static int update_mode = UPDATE_MODE;</div><div class='add'>+static int update_info_mode = UPDATE_INFO_MODE;</div><div class='add'>+static int update_time = UPDATE_TIME;</div><div class='add'>+static int update_time2 = UPDATE_TIME2;</div><div class='add'>+</div><div class='add'>+module_param(capacity_mode, int, CAPACITY_UNIT);</div><div class='add'>+module_param(update_mode, int, UPDATE_MODE);</div><div class='add'>+module_param(update_info_mode, int, UPDATE_INFO_MODE);</div><div class='add'>+module_param(update_time, int, UPDATE_TIME);</div><div class='add'>+module_param(update_time2, int, UPDATE_TIME2);</div><div class='add'>+</div><div class='add'>+static int acpi_sbs_add(struct acpi_device *device);</div><div class='add'>+static int acpi_sbs_remove(struct acpi_device *device, int type);</div><div class='add'>+static void acpi_battery_smbus_err_handler(struct acpi_ec_smbus *smbus);</div><div class='add'>+static void acpi_sbs_update_queue(void *data);</div><div class='add'>+</div><div class='add'>+static struct acpi_driver acpi_sbs_driver = {</div><div class='add'>+	.name = ACPI_SBS_DRIVER_NAME,</div><div class='add'>+	.class = ACPI_SBS_CLASS,</div><div class='add'>+	.ids = ACPI_SBS_HID,</div><div class='add'>+	.ops = {</div><div class='add'>+		.add = acpi_sbs_add,</div><div class='add'>+		.remove = acpi_sbs_remove,</div><div class='add'>+		},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_battery_info {</div><div class='add'>+	int capacity_mode;</div><div class='add'>+	s16 full_charge_capacity;</div><div class='add'>+	s16 design_capacity;</div><div class='add'>+	s16 design_voltage;</div><div class='add'>+	int vscale;</div><div class='add'>+	int ipscale;</div><div class='add'>+	s16 serial_number;</div><div class='add'>+	char manufacturer_name[I2C_SMBUS_BLOCK_MAX + 3];</div><div class='add'>+	char device_name[I2C_SMBUS_BLOCK_MAX + 3];</div><div class='add'>+	char device_chemistry[I2C_SMBUS_BLOCK_MAX + 3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_battery_state {</div><div class='add'>+	s16 voltage;</div><div class='add'>+	s16 amperage;</div><div class='add'>+	s16 remaining_capacity;</div><div class='add'>+	s16 average_time_to_empty;</div><div class='add'>+	s16 average_time_to_full;</div><div class='add'>+	s16 battery_status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_battery_alarm {</div><div class='add'>+	s16 remaining_capacity;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_battery {</div><div class='add'>+	int alive;</div><div class='add'>+	int battery_present;</div><div class='add'>+	int id;</div><div class='add'>+	int init_state;</div><div class='add'>+	struct acpi_sbs *sbs;</div><div class='add'>+	struct acpi_battery_info info;</div><div class='add'>+	struct acpi_battery_state state;</div><div class='add'>+	struct acpi_battery_alarm alarm;</div><div class='add'>+	struct proc_dir_entry *battery_entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acpi_sbs {</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	struct acpi_device *device;</div><div class='add'>+	struct acpi_ec_smbus *smbus;</div><div class='add'>+	int sbsm_present;</div><div class='add'>+	int sbsm_batteries_supported;</div><div class='add'>+	int ac_present;</div><div class='add'>+	struct proc_dir_entry *ac_entry;</div><div class='add'>+	struct acpi_battery battery[MAX_SBS_BAT];</div><div class='add'>+	int update_info_mode;</div><div class='add'>+	int zombie;</div><div class='add'>+	int update_time;</div><div class='add'>+	int update_time2;</div><div class='add'>+	struct timer_list update_timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void acpi_update_delay(struct acpi_sbs *sbs);</div><div class='add'>+static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type);</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------------</div><div class='add'>+                               SMBus Communication</div><div class='add'>+   -------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static void acpi_battery_smbus_err_handler(struct acpi_ec_smbus *smbus)</div><div class='add'>+{</div><div class='add'>+	union i2c_smbus_data data;</div><div class='add'>+	int result = 0;</div><div class='add'>+	char *err_str;</div><div class='add'>+	int err_number;</div><div class='add'>+</div><div class='add'>+	data.word = 0;</div><div class='add'>+</div><div class='add'>+	result = smbus-&gt;adapter.algo-&gt;</div><div class='add'>+	    smbus_xfer(&amp;smbus-&gt;adapter,</div><div class='add'>+		       ACPI_SB_SMBUS_ADDR,</div><div class='add'>+		       0, I2C_SMBUS_READ, 0x16, I2C_SMBUS_BLOCK_DATA, &amp;data);</div><div class='add'>+</div><div class='add'>+	err_number = (data.word &amp; 0x000f);</div><div class='add'>+</div><div class='add'>+	switch (data.word &amp; 0x000f) {</div><div class='add'>+	case 0x0000:</div><div class='add'>+		err_str = "unexpected bus error";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0001:</div><div class='add'>+		err_str = "busy";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0002:</div><div class='add'>+		err_str = "reserved command";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0003:</div><div class='add'>+		err_str = "unsupported command";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0004:</div><div class='add'>+		err_str = "access denied";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0005:</div><div class='add'>+		err_str = "overflow/underflow";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0006:</div><div class='add'>+		err_str = "bad size";</div><div class='add'>+		break;</div><div class='add'>+	case 0x0007:</div><div class='add'>+		err_str = "unknown error";</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err_str = "unrecognized error";</div><div class='add'>+	}</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+			  "%s: ret %i, err %i\n", err_str, result, err_number));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+acpi_sbs_smbus_read_word(struct acpi_ec_smbus *smbus, int addr, int func,</div><div class='add'>+			 u16 * word,</div><div class='add'>+			 void (*err_handler) (struct acpi_ec_smbus * smbus))</div><div class='add'>+{</div><div class='add'>+	union i2c_smbus_data data;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (err_handler == NULL) {</div><div class='add'>+		err_handler = acpi_battery_smbus_err_handler;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_SMBUS_ERR; i++) {</div><div class='add'>+		result =</div><div class='add'>+		    smbus-&gt;adapter.algo-&gt;smbus_xfer(&amp;smbus-&gt;adapter, addr, 0,</div><div class='add'>+						    I2C_SMBUS_READ, func,</div><div class='add'>+						    I2C_SMBUS_WORD_DATA, &amp;data);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "try %i: smbus-&gt;adapter.algo-&gt;smbus_xfer() failed\n",</div><div class='add'>+					  i));</div><div class='add'>+			if (err_handler) {</div><div class='add'>+				err_handler(smbus);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			*word = data.word;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+acpi_sbs_smbus_read_str(struct acpi_ec_smbus *smbus, int addr, int func,</div><div class='add'>+			char *str,</div><div class='add'>+			void (*err_handler) (struct acpi_ec_smbus * smbus))</div><div class='add'>+{</div><div class='add'>+	union i2c_smbus_data data;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (err_handler == NULL) {</div><div class='add'>+		err_handler = acpi_battery_smbus_err_handler;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_SMBUS_ERR; i++) {</div><div class='add'>+		result =</div><div class='add'>+		    smbus-&gt;adapter.algo-&gt;smbus_xfer(&amp;smbus-&gt;adapter, addr, 0,</div><div class='add'>+						    I2C_SMBUS_READ, func,</div><div class='add'>+						    I2C_SMBUS_BLOCK_DATA,</div><div class='add'>+						    &amp;data);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "try %i: smbus-&gt;adapter.algo-&gt;smbus_xfer() failed\n",</div><div class='add'>+					  i));</div><div class='add'>+			if (err_handler) {</div><div class='add'>+				err_handler(smbus);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			strncpy(str, (const char *)data.block + 1,</div><div class='add'>+				data.block[0]);</div><div class='add'>+			str[data.block[0]] = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+acpi_sbs_smbus_write_word(struct acpi_ec_smbus *smbus, int addr, int func,</div><div class='add'>+			  int word,</div><div class='add'>+			  void (*err_handler) (struct acpi_ec_smbus * smbus))</div><div class='add'>+{</div><div class='add'>+	union i2c_smbus_data data;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (err_handler == NULL) {</div><div class='add'>+		err_handler = acpi_battery_smbus_err_handler;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data.word = word;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_SMBUS_ERR; i++) {</div><div class='add'>+		result =</div><div class='add'>+		    smbus-&gt;adapter.algo-&gt;smbus_xfer(&amp;smbus-&gt;adapter, addr, 0,</div><div class='add'>+						    I2C_SMBUS_WRITE, func,</div><div class='add'>+						    I2C_SMBUS_WORD_DATA, &amp;data);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "try %i: smbus-&gt;adapter.algo"</div><div class='add'>+					  "-&gt;smbus_xfer() failed\n", i));</div><div class='add'>+			if (err_handler) {</div><div class='add'>+				err_handler(smbus);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------------</div><div class='add'>+                            Smart Battery System Management</div><div class='add'>+   -------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* Smart Battery */</div><div class='add'>+</div><div class='add'>+static int acpi_sbs_generate_event(struct acpi_device *device,</div><div class='add'>+				   int event, int state, char *bid, char *class)</div><div class='add'>+{</div><div class='add'>+	char bid_saved[5];</div><div class='add'>+	char class_saved[20];</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	strcpy(bid_saved, acpi_device_bid(device));</div><div class='add'>+	strcpy(class_saved, acpi_device_class(device));</div><div class='add'>+</div><div class='add'>+	strcpy(acpi_device_bid(device), bid);</div><div class='add'>+	strcpy(acpi_device_class(device), class);</div><div class='add'>+</div><div class='add'>+	result = acpi_bus_generate_event(device, event, state);</div><div class='add'>+</div><div class='add'>+	strcpy(acpi_device_bid(device), bid_saved);</div><div class='add'>+	strcpy(acpi_device_class(device), class_saved);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_get_present(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	s16 state;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int is_present = 0;</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(battery-&gt;sbs-&gt;smbus,</div><div class='add'>+					  ACPI_SBSM_SMBUS_ADDR, 0x01,</div><div class='add'>+					  &amp;state, NULL);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed"));</div><div class='add'>+	}</div><div class='add'>+	if (!result) {</div><div class='add'>+		is_present = (state &amp; 0x000f) &amp; (1 &lt;&lt; battery-&gt;id);</div><div class='add'>+	}</div><div class='add'>+	battery-&gt;battery_present = is_present;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_is_present(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	return (battery-&gt;battery_present);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_ac_is_present(struct acpi_sbs *sbs)</div><div class='add'>+{</div><div class='add'>+	return (sbs-&gt;ac_present);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_select(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = battery-&gt;sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+	s16 state;</div><div class='add'>+	int foo;</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;sbs-&gt;sbsm_present) {</div><div class='add'>+</div><div class='add'>+		/* Take special care not to knobble other nibbles of</div><div class='add'>+		 * state (aka selector_state), since</div><div class='add'>+		 * it causes charging to halt on SBSELs */</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    acpi_sbs_smbus_read_word(smbus, ACPI_SBSM_SMBUS_ADDR, 0x01,</div><div class='add'>+					     &amp;state, NULL);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		foo = (state &amp; 0x0fff) | (1 &lt;&lt; (battery-&gt;id + 12));</div><div class='add'>+		result =</div><div class='add'>+		    acpi_sbs_smbus_write_word(smbus, ACPI_SBSM_SMBUS_ADDR, 0x01,</div><div class='add'>+					      foo, NULL);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_smbus_write_word() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_sbsm_get_info(struct acpi_sbs *sbs)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+	s16 battery_system_info;</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SBSM_SMBUS_ADDR, 0x04,</div><div class='add'>+					  &amp;battery_system_info, NULL);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbs-&gt;sbsm_batteries_supported = battery_system_info &amp; 0x000f;</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_get_info(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = battery-&gt;sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+	s16 battery_mode;</div><div class='add'>+	s16 specification_info;</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x03,</div><div class='add'>+					  &amp;battery_mode,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	battery-&gt;info.capacity_mode = (battery_mode &amp; 0x8000) &gt;&gt; 15;</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x10,</div><div class='add'>+					  &amp;battery-&gt;info.full_charge_capacity,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x18,</div><div class='add'>+					  &amp;battery-&gt;info.design_capacity,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x19,</div><div class='add'>+					  &amp;battery-&gt;info.design_voltage,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x1a,</div><div class='add'>+					  &amp;specification_info,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((specification_info &amp; 0x0f00) &gt;&gt; 8) {</div><div class='add'>+	case 1:</div><div class='add'>+		battery-&gt;info.vscale = 10;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		battery-&gt;info.vscale = 100;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		battery-&gt;info.vscale = 1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		battery-&gt;info.vscale = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((specification_info &amp; 0xf000) &gt;&gt; 12) {</div><div class='add'>+	case 1:</div><div class='add'>+		battery-&gt;info.ipscale = 10;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		battery-&gt;info.ipscale = 100;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		battery-&gt;info.ipscale = 1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		battery-&gt;info.ipscale = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x1c,</div><div class='add'>+					  &amp;battery-&gt;info.serial_number,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_str(smbus, ACPI_SB_SMBUS_ADDR, 0x20,</div><div class='add'>+					 battery-&gt;info.manufacturer_name,</div><div class='add'>+					 &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_str() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_str(smbus, ACPI_SB_SMBUS_ADDR, 0x21,</div><div class='add'>+					 battery-&gt;info.device_name,</div><div class='add'>+					 &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_str() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_str(smbus, ACPI_SB_SMBUS_ADDR, 0x22,</div><div class='add'>+					 battery-&gt;info.device_chemistry,</div><div class='add'>+					 &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_str() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_update_delay(struct acpi_sbs *sbs)</div><div class='add'>+{</div><div class='add'>+	if (sbs-&gt;zombie) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (sbs-&gt;update_time2 &gt; 0) {</div><div class='add'>+		msleep(sbs-&gt;update_time2 * 1000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_get_state(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = battery-&gt;sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x09,</div><div class='add'>+					  &amp;battery-&gt;state.voltage,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x0a,</div><div class='add'>+					  &amp;battery-&gt;state.amperage,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x0f,</div><div class='add'>+					  &amp;battery-&gt;state.remaining_capacity,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x12,</div><div class='add'>+					  &amp;battery-&gt;state.average_time_to_empty,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x13,</div><div class='add'>+					  &amp;battery-&gt;state.average_time_to_full,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x16,</div><div class='add'>+					  &amp;battery-&gt;state.battery_status,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_get_alarm(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = battery-&gt;sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x01,</div><div class='add'>+					  &amp;battery-&gt;alarm.remaining_capacity,</div><div class='add'>+					  &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_update_delay(battery-&gt;sbs);</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_set_alarm(struct acpi_battery *battery,</div><div class='add'>+				  unsigned long alarm)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = battery-&gt;sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+	s16 battery_mode;</div><div class='add'>+	int foo;</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_select(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_select() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If necessary, enable the alarm */</div><div class='add'>+</div><div class='add'>+	if (alarm &gt; 0) {</div><div class='add'>+		result =</div><div class='add'>+		    acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x03,</div><div class='add'>+					     &amp;battery_mode,</div><div class='add'>+					     &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result =</div><div class='add'>+		    acpi_sbs_smbus_write_word(smbus, ACPI_SB_SMBUS_ADDR, 0x01,</div><div class='add'>+					      battery_mode &amp; 0xbfff,</div><div class='add'>+					      &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_smbus_write_word() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	foo = alarm / (battery-&gt;info.capacity_mode ? 10 : 1);</div><div class='add'>+	result = acpi_sbs_smbus_write_word(smbus, ACPI_SB_SMBUS_ADDR, 0x01,</div><div class='add'>+					   foo,</div><div class='add'>+					   &amp;acpi_battery_smbus_err_handler);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_write_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_set_mode(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+	s16 battery_mode;</div><div class='add'>+</div><div class='add'>+	if (capacity_mode == DEF_CAPACITY_UNIT) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(battery-&gt;sbs-&gt;smbus,</div><div class='add'>+					  ACPI_SB_SMBUS_ADDR, 0x03,</div><div class='add'>+					  &amp;battery_mode, NULL);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (capacity_mode == MAH_CAPACITY_UNIT) {</div><div class='add'>+		battery_mode &amp;= 0x7fff;</div><div class='add'>+	} else {</div><div class='add'>+		battery_mode |= 0x8000;</div><div class='add'>+	}</div><div class='add'>+	result = acpi_sbs_smbus_write_word(battery-&gt;sbs-&gt;smbus,</div><div class='add'>+					   ACPI_SB_SMBUS_ADDR, 0x03,</div><div class='add'>+					   battery_mode, NULL);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_write_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(battery-&gt;sbs-&gt;smbus,</div><div class='add'>+					  ACPI_SB_SMBUS_ADDR, 0x03,</div><div class='add'>+					  &amp;battery_mode, NULL);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_init(struct acpi_battery *battery)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_select(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_init() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_set_mode(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_set_mode() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_get_info(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_get_info() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_get_state(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_get_state() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_get_alarm(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_get_alarm() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_ac_get_present(struct acpi_sbs *sbs)</div><div class='add'>+{</div><div class='add'>+	struct acpi_ec_smbus *smbus = sbs-&gt;smbus;</div><div class='add'>+	int result = 0;</div><div class='add'>+	s16 charger_status;</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_smbus_read_word(smbus, ACPI_SBC_SMBUS_ADDR, 0x13,</div><div class='add'>+					  &amp;charger_status, NULL);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_smbus_read_word() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbs-&gt;ac_present = (charger_status &amp; 0x8000) &gt;&gt; 15;</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------------</div><div class='add'>+                              FS Interface (/proc/acpi)</div><div class='add'>+   -------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* Generic Routines */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+acpi_sbs_generic_add_fs(struct proc_dir_entry **dir,</div><div class='add'>+			struct proc_dir_entry *parent_dir,</div><div class='add'>+			char *dir_name,</div><div class='add'>+			struct file_operations *info_fops,</div><div class='add'>+			struct file_operations *state_fops,</div><div class='add'>+			struct file_operations *alarm_fops, void *data)</div><div class='add'>+{</div><div class='add'>+	struct proc_dir_entry *entry = NULL;</div><div class='add'>+</div><div class='add'>+	if (!*dir) {</div><div class='add'>+		*dir = proc_mkdir(dir_name, parent_dir);</div><div class='add'>+		if (!*dir) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "proc_mkdir() failed\n"));</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		(*dir)-&gt;owner = THIS_MODULE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 'info' [R] */</div><div class='add'>+	if (info_fops) {</div><div class='add'>+		entry = create_proc_entry(ACPI_SBS_FILE_INFO, S_IRUGO, *dir);</div><div class='add'>+		if (!entry) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "create_proc_entry() failed\n"));</div><div class='add'>+		} else {</div><div class='add'>+			entry-&gt;proc_fops = info_fops;</div><div class='add'>+			entry-&gt;data = data;</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 'state' [R] */</div><div class='add'>+	if (state_fops) {</div><div class='add'>+		entry = create_proc_entry(ACPI_SBS_FILE_STATE, S_IRUGO, *dir);</div><div class='add'>+		if (!entry) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "create_proc_entry() failed\n"));</div><div class='add'>+		} else {</div><div class='add'>+			entry-&gt;proc_fops = state_fops;</div><div class='add'>+			entry-&gt;data = data;</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 'alarm' [R/W] */</div><div class='add'>+	if (alarm_fops) {</div><div class='add'>+		entry = create_proc_entry(ACPI_SBS_FILE_ALARM, S_IRUGO, *dir);</div><div class='add'>+		if (!entry) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "create_proc_entry() failed\n"));</div><div class='add'>+		} else {</div><div class='add'>+			entry-&gt;proc_fops = alarm_fops;</div><div class='add'>+			entry-&gt;data = data;</div><div class='add'>+			entry-&gt;owner = THIS_MODULE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir,</div><div class='add'>+			   struct proc_dir_entry *parent_dir)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (*dir) {</div><div class='add'>+		remove_proc_entry(ACPI_SBS_FILE_INFO, *dir);</div><div class='add'>+		remove_proc_entry(ACPI_SBS_FILE_STATE, *dir);</div><div class='add'>+		remove_proc_entry(ACPI_SBS_FILE_ALARM, *dir);</div><div class='add'>+		remove_proc_entry((*dir)-&gt;name, parent_dir);</div><div class='add'>+		*dir = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Smart Battery Interface */</div><div class='add'>+</div><div class='add'>+static struct proc_dir_entry *acpi_battery_dir = NULL;</div><div class='add'>+</div><div class='add'>+static int acpi_battery_read_info(struct seq_file *seq, void *offset)</div><div class='add'>+{</div><div class='add'>+	struct acpi_battery *battery = (struct acpi_battery *)seq-&gt;private;</div><div class='add'>+	int cscale;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;sbs-&gt;zombie) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (update_mode == REQUEST_UPDATE_MODE) {</div><div class='add'>+		result = acpi_sbs_update_run(battery-&gt;sbs, DATA_TYPE_INFO);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_update_run() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (acpi_battery_is_present(battery)) {</div><div class='add'>+		seq_printf(seq, "present:                 yes\n");</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(seq, "present:                 no\n");</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;info.capacity_mode) {</div><div class='add'>+		cscale = battery-&gt;info.vscale * battery-&gt;info.ipscale;</div><div class='add'>+	} else {</div><div class='add'>+		cscale = battery-&gt;info.ipscale;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(seq, "design capacity:         %i%s",</div><div class='add'>+		   battery-&gt;info.design_capacity * cscale,</div><div class='add'>+		   battery-&gt;info.capacity_mode ? "0 mWh\n" : " mAh\n");</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "last full capacity:      %i%s",</div><div class='add'>+		   battery-&gt;info.full_charge_capacity * cscale,</div><div class='add'>+		   battery-&gt;info.capacity_mode ? "0 mWh\n" : " mAh\n");</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "battery technology:      rechargeable\n");</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "design voltage:          %i mV\n",</div><div class='add'>+		   battery-&gt;info.design_voltage * battery-&gt;info.vscale);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "design capacity warning: unknown\n");</div><div class='add'>+	seq_printf(seq, "design capacity low:     unknown\n");</div><div class='add'>+	seq_printf(seq, "capacity granularity 1:  unknown\n");</div><div class='add'>+	seq_printf(seq, "capacity granularity 2:  unknown\n");</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "model number:            %s\n",</div><div class='add'>+		   battery-&gt;info.device_name);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "serial number:           %i\n",</div><div class='add'>+		   battery-&gt;info.serial_number);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "battery type:            %s\n",</div><div class='add'>+		   battery-&gt;info.device_chemistry);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "OEM info:                %s\n",</div><div class='add'>+		   battery-&gt;info.manufacturer_name);</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	up(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, acpi_battery_read_info, PDE(inode)-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_read_state(struct seq_file *seq, void *offset)</div><div class='add'>+{</div><div class='add'>+	struct acpi_battery *battery = (struct acpi_battery *)seq-&gt;private;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int cscale;</div><div class='add'>+	int foo;</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;sbs-&gt;zombie) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (update_mode == REQUEST_UPDATE_MODE) {</div><div class='add'>+		result = acpi_sbs_update_run(battery-&gt;sbs, DATA_TYPE_STATE);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_update_run() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (acpi_battery_is_present(battery)) {</div><div class='add'>+		seq_printf(seq, "present:                 yes\n");</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(seq, "present:                 no\n");</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;info.capacity_mode) {</div><div class='add'>+		cscale = battery-&gt;info.vscale * battery-&gt;info.ipscale;</div><div class='add'>+	} else {</div><div class='add'>+		cscale = battery-&gt;info.ipscale;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;state.battery_status &amp; 0x0010) {</div><div class='add'>+		seq_printf(seq, "capacity state:          critical\n");</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(seq, "capacity state:          ok\n");</div><div class='add'>+	}</div><div class='add'>+	if (battery-&gt;state.amperage &lt; 0) {</div><div class='add'>+		seq_printf(seq, "charging state:          discharging\n");</div><div class='add'>+		foo = battery-&gt;state.remaining_capacity * cscale * 60 /</div><div class='add'>+		    (battery-&gt;state.average_time_to_empty == 0 ? 1 :</div><div class='add'>+		     battery-&gt;state.average_time_to_empty);</div><div class='add'>+		seq_printf(seq, "present rate:            %i%s\n",</div><div class='add'>+			   foo, battery-&gt;info.capacity_mode ? "0 mW" : " mA");</div><div class='add'>+	} else if (battery-&gt;state.amperage &gt; 0) {</div><div class='add'>+		seq_printf(seq, "charging state:          charging\n");</div><div class='add'>+		foo = (battery-&gt;info.full_charge_capacity -</div><div class='add'>+		       battery-&gt;state.remaining_capacity) * cscale * 60 /</div><div class='add'>+		    (battery-&gt;state.average_time_to_full == 0 ? 1 :</div><div class='add'>+		     battery-&gt;state.average_time_to_full);</div><div class='add'>+		seq_printf(seq, "present rate:            %i%s\n",</div><div class='add'>+			   foo, battery-&gt;info.capacity_mode ? "0 mW" : " mA");</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(seq, "charging state:          charged\n");</div><div class='add'>+		seq_printf(seq, "present rate:            0 %s\n",</div><div class='add'>+			   battery-&gt;info.capacity_mode ? "mW" : "mA");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "remaining capacity:      %i%s",</div><div class='add'>+		   battery-&gt;state.remaining_capacity * cscale,</div><div class='add'>+		   battery-&gt;info.capacity_mode ? "0 mWh\n" : " mAh\n");</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "present voltage:         %i mV\n",</div><div class='add'>+		   battery-&gt;state.voltage * battery-&gt;info.vscale);</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	up(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, acpi_battery_read_state, PDE(inode)-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)</div><div class='add'>+{</div><div class='add'>+	struct acpi_battery *battery = (struct acpi_battery *)seq-&gt;private;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int cscale;</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;sbs-&gt;zombie) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (update_mode == REQUEST_UPDATE_MODE) {</div><div class='add'>+		result = acpi_sbs_update_run(battery-&gt;sbs, DATA_TYPE_ALARM);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_update_run() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!acpi_battery_is_present(battery)) {</div><div class='add'>+		seq_printf(seq, "present:                 no\n");</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;info.capacity_mode) {</div><div class='add'>+		cscale = battery-&gt;info.vscale * battery-&gt;info.ipscale;</div><div class='add'>+	} else {</div><div class='add'>+		cscale = battery-&gt;info.ipscale;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "alarm:                   ");</div><div class='add'>+	if (battery-&gt;alarm.remaining_capacity) {</div><div class='add'>+		seq_printf(seq, "%i%s",</div><div class='add'>+			   battery-&gt;alarm.remaining_capacity * cscale,</div><div class='add'>+			   battery-&gt;info.capacity_mode ? "0 mWh\n" : " mAh\n");</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(seq, "disabled\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	up(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+acpi_battery_write_alarm(struct file *file, const char __user * buffer,</div><div class='add'>+			 size_t count, loff_t * ppos)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *seq = (struct seq_file *)file-&gt;private_data;</div><div class='add'>+	struct acpi_battery *battery = (struct acpi_battery *)seq-&gt;private;</div><div class='add'>+	char alarm_string[12] = { '\0' };</div><div class='add'>+	int result, old_alarm, new_alarm;</div><div class='add'>+</div><div class='add'>+	if (battery-&gt;sbs-&gt;zombie) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (!acpi_battery_is_present(battery)) {</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &gt; sizeof(alarm_string) - 1) {</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(alarm_string, buffer, count)) {</div><div class='add'>+		result = -EFAULT;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alarm_string[count] = 0;</div><div class='add'>+</div><div class='add'>+	old_alarm = battery-&gt;alarm.remaining_capacity;</div><div class='add'>+	new_alarm = simple_strtoul(alarm_string, NULL, 0);</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_set_alarm(battery, new_alarm);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_set_alarm() failed\n"));</div><div class='add'>+		(void)acpi_battery_set_alarm(battery, old_alarm);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	result = acpi_battery_get_alarm(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_get_alarm() failed\n"));</div><div class='add'>+		(void)acpi_battery_set_alarm(battery, old_alarm);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	up(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (result) {</div><div class='add'>+		return result;</div><div class='add'>+	} else {</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, acpi_battery_read_alarm, PDE(inode)-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations acpi_battery_info_fops = {</div><div class='add'>+	.open = acpi_battery_info_open_fs,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = single_release,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations acpi_battery_state_fops = {</div><div class='add'>+	.open = acpi_battery_state_open_fs,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = single_release,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations acpi_battery_alarm_fops = {</div><div class='add'>+	.open = acpi_battery_alarm_open_fs,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.write = acpi_battery_write_alarm,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = single_release,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Legacy AC Adapter Interface */</div><div class='add'>+</div><div class='add'>+static struct proc_dir_entry *acpi_ac_dir = NULL;</div><div class='add'>+</div><div class='add'>+static int acpi_ac_read_state(struct seq_file *seq, void *offset)</div><div class='add'>+{</div><div class='add'>+	struct acpi_sbs *sbs = (struct acpi_sbs *)seq-&gt;private;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	if (sbs-&gt;zombie) {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	down(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (update_mode == REQUEST_UPDATE_MODE) {</div><div class='add'>+		result = acpi_sbs_update_run(sbs, DATA_TYPE_AC_STATE);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_update_run() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "state:                   %s\n",</div><div class='add'>+		   sbs-&gt;ac_present ? "on-line" : "off-line");</div><div class='add'>+</div><div class='add'>+	up(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_ac_state_open_fs(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	return single_open(file, acpi_ac_read_state, PDE(inode)-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations acpi_ac_state_fops = {</div><div class='add'>+	.open = acpi_ac_state_open_fs,</div><div class='add'>+	.read = seq_read,</div><div class='add'>+	.llseek = seq_lseek,</div><div class='add'>+	.release = single_release,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------------</div><div class='add'>+                                 Driver Interface</div><div class='add'>+   -------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* Smart Battery */</div><div class='add'>+</div><div class='add'>+static int acpi_battery_add(struct acpi_sbs *sbs, int id)</div><div class='add'>+{</div><div class='add'>+	int is_present;</div><div class='add'>+	int result;</div><div class='add'>+	char dir_name[32];</div><div class='add'>+	struct acpi_battery *battery;</div><div class='add'>+</div><div class='add'>+	battery = &amp;sbs-&gt;battery[id];</div><div class='add'>+</div><div class='add'>+	battery-&gt;alive = 0;</div><div class='add'>+</div><div class='add'>+	battery-&gt;init_state = 0;</div><div class='add'>+	battery-&gt;id = id;</div><div class='add'>+	battery-&gt;sbs = sbs;</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_select(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_select() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_battery_get_present(battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_battery_get_present() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	is_present = acpi_battery_is_present(battery);</div><div class='add'>+</div><div class='add'>+	if (is_present) {</div><div class='add'>+		result = acpi_battery_init(battery);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_battery_init() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		battery-&gt;init_state = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_generic_add_fs(&amp;battery-&gt;battery_entry,</div><div class='add'>+					 acpi_battery_dir,</div><div class='add'>+					 dir_name,</div><div class='add'>+					 &amp;acpi_battery_info_fops,</div><div class='add'>+					 &amp;acpi_battery_state_fops,</div><div class='add'>+					 &amp;acpi_battery_alarm_fops, battery);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_generic_add_fs() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	battery-&gt;alive = 1;</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_battery_remove(struct acpi_sbs *sbs, int id)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (sbs-&gt;battery[id].battery_entry) {</div><div class='add'>+		acpi_sbs_generic_remove_fs(&amp;(sbs-&gt;battery[id].battery_entry),</div><div class='add'>+					   acpi_battery_dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_ac_add(struct acpi_sbs *sbs)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	result = acpi_ac_get_present(sbs);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_ac_get_present() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_generic_add_fs(&amp;sbs-&gt;ac_entry,</div><div class='add'>+					 acpi_ac_dir,</div><div class='add'>+					 ACPI_AC_DIR_NAME,</div><div class='add'>+					 NULL, &amp;acpi_ac_state_fops, NULL, sbs);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_generic_add_fs() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_ac_remove(struct acpi_sbs *sbs)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (sbs-&gt;ac_entry) {</div><div class='add'>+		acpi_sbs_generic_remove_fs(&amp;sbs-&gt;ac_entry, acpi_ac_dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_sbs_update_queue_run(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_queue, (void *)data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)</div><div class='add'>+{</div><div class='add'>+	struct acpi_battery *battery;</div><div class='add'>+	int result = 0;</div><div class='add'>+	int old_ac_present;</div><div class='add'>+	int old_battery_present;</div><div class='add'>+	int new_ac_present;</div><div class='add'>+	int new_battery_present;</div><div class='add'>+	int id;</div><div class='add'>+	char dir_name[32];</div><div class='add'>+	int do_battery_init, do_ac_init;</div><div class='add'>+	s16 old_remaining_capacity;</div><div class='add'>+</div><div class='add'>+	if (sbs-&gt;zombie) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_ac_present = acpi_ac_is_present(sbs);</div><div class='add'>+</div><div class='add'>+	result = acpi_ac_get_present(sbs);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_ac_get_present() failed\n"));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_ac_present = acpi_ac_is_present(sbs);</div><div class='add'>+</div><div class='add'>+	do_ac_init = (old_ac_present != new_ac_present);</div><div class='add'>+</div><div class='add'>+	if (data_type == DATA_TYPE_AC_STATE) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; MAX_SBS_BAT; id++) {</div><div class='add'>+		battery = &amp;sbs-&gt;battery[id];</div><div class='add'>+		if (battery-&gt;alive == 0) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		old_remaining_capacity = battery-&gt;state.remaining_capacity;</div><div class='add'>+</div><div class='add'>+		old_battery_present = acpi_battery_is_present(battery);</div><div class='add'>+</div><div class='add'>+		result = acpi_battery_select(battery);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_battery_select() failed\n"));</div><div class='add'>+		}</div><div class='add'>+		if (sbs-&gt;zombie) {</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = acpi_battery_get_present(battery);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_battery_get_present() failed\n"));</div><div class='add'>+		}</div><div class='add'>+		if (sbs-&gt;zombie) {</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		new_battery_present = acpi_battery_is_present(battery);</div><div class='add'>+</div><div class='add'>+		do_battery_init = ((old_battery_present != new_battery_present)</div><div class='add'>+				   &amp;&amp; new_battery_present);</div><div class='add'>+</div><div class='add'>+		if (sbs-&gt;zombie) {</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		if (do_ac_init || do_battery_init ||</div><div class='add'>+		    update_info_mode || sbs-&gt;update_info_mode) {</div><div class='add'>+			if (sbs-&gt;update_info_mode) {</div><div class='add'>+				sbs-&gt;update_info_mode = 0;</div><div class='add'>+			} else {</div><div class='add'>+				sbs-&gt;update_info_mode = 1;</div><div class='add'>+			}</div><div class='add'>+			result = acpi_battery_init(battery);</div><div class='add'>+			if (result) {</div><div class='add'>+				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+						  "acpi_battery_init() "</div><div class='add'>+						  "failed\n"));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (data_type == DATA_TYPE_INFO) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sbs-&gt;zombie) {</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		if (new_battery_present) {</div><div class='add'>+			result = acpi_battery_get_alarm(battery);</div><div class='add'>+			if (result) {</div><div class='add'>+				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+						  "acpi_battery_get_alarm() "</div><div class='add'>+						  "failed\n"));</div><div class='add'>+			}</div><div class='add'>+			if (data_type == DATA_TYPE_ALARM) {</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			result = acpi_battery_get_state(battery);</div><div class='add'>+			if (result) {</div><div class='add'>+				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+						  "acpi_battery_get_state() "</div><div class='add'>+						  "failed\n"));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (sbs-&gt;zombie) {</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		if (data_type != DATA_TYPE_COMMON) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (old_battery_present != new_battery_present) {</div><div class='add'>+			(void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);</div><div class='add'>+			result = acpi_sbs_generate_event(sbs-&gt;device,</div><div class='add'>+							 ACPI_SBS_BATTERY_NOTIFY_STATUS,</div><div class='add'>+							 new_battery_present,</div><div class='add'>+							 dir_name,</div><div class='add'>+							 ACPI_BATTERY_CLASS);</div><div class='add'>+			if (result) {</div><div class='add'>+				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+						  "acpi_sbs_generate_event() "</div><div class='add'>+						  "failed\n"));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (old_remaining_capacity != battery-&gt;state.remaining_capacity) {</div><div class='add'>+			(void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);</div><div class='add'>+			result = acpi_sbs_generate_event(sbs-&gt;device,</div><div class='add'>+							 ACPI_SBS_BATTERY_NOTIFY_STATUS,</div><div class='add'>+							 new_battery_present,</div><div class='add'>+							 dir_name,</div><div class='add'>+							 ACPI_BATTERY_CLASS);</div><div class='add'>+			if (result) {</div><div class='add'>+				ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+						  "acpi_sbs_generate_event() failed\n"));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (sbs-&gt;zombie) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	if (data_type != DATA_TYPE_COMMON) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old_ac_present != new_ac_present) {</div><div class='add'>+		result = acpi_sbs_generate_event(sbs-&gt;device,</div><div class='add'>+						 ACPI_SBS_AC_NOTIFY_STATUS,</div><div class='add'>+						 new_ac_present,</div><div class='add'>+						 ACPI_AC_DIR_NAME,</div><div class='add'>+						 ACPI_AC_CLASS);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_generate_event() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acpi_sbs_update_queue(void *data)</div><div class='add'>+{</div><div class='add'>+	struct acpi_sbs *sbs = data;</div><div class='add'>+	unsigned long delay = -1;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	if (sbs-&gt;zombie) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_sbs_update_run(sbs, DATA_TYPE_COMMON);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_sbs_update_run() failed\n"));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sbs-&gt;zombie) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (update_mode == REQUEST_UPDATE_MODE) {</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	delay = jiffies + HZ * update_time;</div><div class='add'>+	sbs-&gt;update_timer.data = (unsigned long)data;</div><div class='add'>+	sbs-&gt;update_timer.function = acpi_sbs_update_queue_run;</div><div class='add'>+	sbs-&gt;update_timer.expires = delay;</div><div class='add'>+	add_timer(&amp;sbs-&gt;update_timer);</div><div class='add'>+      end:</div><div class='add'>+	;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_sbs_add(struct acpi_device *device)</div><div class='add'>+{</div><div class='add'>+	struct acpi_sbs *sbs = NULL;</div><div class='add'>+	struct acpi_ec_hc *ec_hc = NULL;</div><div class='add'>+	int result, remove_result = 0;</div><div class='add'>+	unsigned long sbs_obj;</div><div class='add'>+	int id, cnt;</div><div class='add'>+	acpi_status status = AE_OK;</div><div class='add'>+</div><div class='add'>+	sbs = kmalloc(sizeof(struct acpi_sbs), GFP_KERNEL);</div><div class='add'>+	if (!sbs) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "kmalloc() failed\n"));</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memset(sbs, 0, sizeof(struct acpi_sbs));</div><div class='add'>+</div><div class='add'>+	cnt = 0;</div><div class='add'>+	while (cnt &lt; 10) {</div><div class='add'>+		cnt++;</div><div class='add'>+		ec_hc = acpi_get_ec_hc(device);</div><div class='add'>+		if (ec_hc) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		msleep(1000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ec_hc) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_get_ec_hc() failed: "</div><div class='add'>+				  "NO driver found for EC HC SMBus\n"));</div><div class='add'>+		result = -ENODEV;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbs-&gt;device = device;</div><div class='add'>+	sbs-&gt;smbus = ec_hc-&gt;smbus;</div><div class='add'>+</div><div class='add'>+	strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);</div><div class='add'>+	strcpy(acpi_device_class(device), ACPI_SBS_CLASS);</div><div class='add'>+	acpi_driver_data(device) = sbs;</div><div class='add'>+</div><div class='add'>+	sbs-&gt;update_time = 0;</div><div class='add'>+	sbs-&gt;update_time2 = 0;</div><div class='add'>+</div><div class='add'>+	result = acpi_ac_add(sbs);</div><div class='add'>+	if (result) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "acpi_ac_add() failed\n"));</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	result = acpi_evaluate_integer(device-&gt;handle, "_SBS", NULL, &amp;sbs_obj);</div><div class='add'>+	if (ACPI_FAILURE(result)) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_evaluate_integer() failed\n"));</div><div class='add'>+		result = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sbs_obj &gt; 0) {</div><div class='add'>+		result = acpi_sbsm_get_info(sbs);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbsm_get_info() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		sbs-&gt;sbsm_present = 1;</div><div class='add'>+	}</div><div class='add'>+	if (sbs-&gt;sbsm_present == 0) {</div><div class='add'>+		result = acpi_battery_add(sbs, 0);</div><div class='add'>+		if (result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_battery_add() failed\n"));</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (id = 0; id &lt; MAX_SBS_BAT; id++) {</div><div class='add'>+			if ((sbs-&gt;sbsm_batteries_supported &amp; (1 &lt;&lt; id))) {</div><div class='add'>+				result = acpi_battery_add(sbs, id);</div><div class='add'>+				if (result) {</div><div class='add'>+					ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+							  "acpi_battery_add() "</div><div class='add'>+							  "failed\n"));</div><div class='add'>+					goto end;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbs-&gt;handle = device-&gt;handle;</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;sbs-&gt;update_timer);</div><div class='add'>+	if (update_mode == QUEUE_UPDATE_MODE) {</div><div class='add'>+		status = acpi_os_execute(OSL_GPE_HANDLER,</div><div class='add'>+					 acpi_sbs_update_queue, (void *)sbs);</div><div class='add'>+		if (status != AE_OK) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_os_execute() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	sbs-&gt;update_time = update_time;</div><div class='add'>+	sbs-&gt;update_time2 = update_time2;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO PREFIX "%s [%s]\n",</div><div class='add'>+	       acpi_device_name(device), acpi_device_bid(device));</div><div class='add'>+</div><div class='add'>+      end:</div><div class='add'>+	if (result) {</div><div class='add'>+		remove_result = acpi_sbs_remove(device, 0);</div><div class='add'>+		if (remove_result) {</div><div class='add'>+			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+					  "acpi_sbs_remove() failed\n"));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acpi_sbs_remove(struct acpi_device *device, int type)</div><div class='add'>+{</div><div class='add'>+	struct acpi_sbs *sbs = (struct acpi_sbs *)acpi_driver_data(device);</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (!device || !sbs) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sbs-&gt;zombie = 1;</div><div class='add'>+	sbs-&gt;update_time = 0;</div><div class='add'>+	sbs-&gt;update_time2 = 0;</div><div class='add'>+	del_timer_sync(&amp;sbs-&gt;update_timer);</div><div class='add'>+	acpi_os_wait_events_complete(NULL);</div><div class='add'>+	del_timer_sync(&amp;sbs-&gt;update_timer);</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; MAX_SBS_BAT; id++) {</div><div class='add'>+		acpi_battery_remove(sbs, id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_ac_remove(sbs);</div><div class='add'>+</div><div class='add'>+	kfree(sbs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init acpi_sbs_init(void)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	init_MUTEX(&amp;sbs_sem);</div><div class='add'>+</div><div class='add'>+	if (capacity_mode != DEF_CAPACITY_UNIT</div><div class='add'>+	    &amp;&amp; capacity_mode != MAH_CAPACITY_UNIT</div><div class='add'>+	    &amp;&amp; capacity_mode != MWH_CAPACITY_UNIT) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "acpi_sbs_init: "</div><div class='add'>+				  "invalid capacity_mode = %d\n",</div><div class='add'>+				  capacity_mode));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_ac_dir = acpi_lock_ac_dir();</div><div class='add'>+	if (!acpi_ac_dir) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_lock_ac_dir() failed\n"));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_battery_dir = acpi_lock_battery_dir();</div><div class='add'>+	if (!acpi_battery_dir) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_lock_battery_dir() failed\n"));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = acpi_bus_register_driver(&amp;acpi_sbs_driver);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='add'>+				  "acpi_bus_register_driver() failed\n"));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit acpi_sbs_exit(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	acpi_bus_unregister_driver(&amp;acpi_sbs_driver);</div><div class='add'>+</div><div class='add'>+	acpi_unlock_ac_dir(acpi_ac_dir);</div><div class='add'>+	acpi_ac_dir = NULL;</div><div class='add'>+	acpi_unlock_battery_dir(acpi_battery_dir);</div><div class='add'>+	acpi_battery_dir = NULL;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(acpi_sbs_init);</div><div class='add'>+module_exit(acpi_sbs_exit);</div><div class='head'>diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c<br/>index a0ab828b2cc5..5fcb50c7b778 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/scan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/scan.c</a></div><div class='hunk'>@@ -142,7 +142,7 @@ static void acpi_device_register(struct acpi_device *device,</div><div class='ctx'> 	create_sysfs_device_files(device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int acpi_device_unregister(struct acpi_device *device, int type)</div><div class='add'>+static void acpi_device_unregister(struct acpi_device *device, int type)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	if (device-&gt;parent) {</div><div class='hunk'>@@ -158,16 +158,14 @@ static int acpi_device_unregister(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_detach_data(device-&gt;handle, acpi_bus_data_handler);</div><div class='ctx'> 	remove_sysfs_device_files(device);</div><div class='ctx'> 	kobject_unregister(&amp;device-&gt;kobj);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_data_handler");</div><div class='ctx'> </div><div class='ctx'> 	/* TBD */</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_bus_get_power_flags(struct acpi_device *device)</div><div class='hunk'>@@ -176,7 +174,6 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)</div><div class='ctx'> 	acpi_handle handle = NULL;</div><div class='ctx'> 	u32 i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_get_power_flags");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Power Management Flags</div><div class='hunk'>@@ -229,17 +226,14 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;power.state = ACPI_STATE_UNKNOWN;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int acpi_match_ids(struct acpi_device *device, char *ids)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='del'>-	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='del'>-</div><div class='ctx'> 	if (device-&gt;flags.hardware_id)</div><div class='ctx'> 		if (strstr(ids, device-&gt;pnp.hardware_id))</div><div class='del'>-			goto Done;</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (device-&gt;flags.compatible_ids) {</div><div class='ctx'> 		struct acpi_compatible_id_list *cid_list = device-&gt;pnp.cid_list;</div><div class='hunk'>@@ -248,15 +242,10 @@ int acpi_match_ids(struct acpi_device *device, char *ids)</div><div class='ctx'> 		/* compare multiple _CID entries against driver ids */</div><div class='ctx'> 		for (i = 0; i &lt; cid_list-&gt;count; i++) {</div><div class='ctx'> 			if (strstr(ids, cid_list-&gt;id[i].value))</div><div class='del'>-				goto Done;</div><div class='add'>+				return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	error = -ENOENT;</div><div class='del'>-</div><div class='del'>-      Done:</div><div class='del'>-	if (buffer.pointer)</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='del'>-	return error;</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -315,24 +304,22 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	union acpi_object *package = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_get_wakeup_flags");</div><div class='ctx'> </div><div class='ctx'> 	/* _PRW */</div><div class='ctx'> 	status = acpi_evaluate_object(device-&gt;handle, "_PRW", NULL, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRW\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRW"));</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	package = (union acpi_object *)buffer.pointer;</div><div class='ctx'> 	status = acpi_bus_extract_wakeup_device_power_package(device, package);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error extracting _PRW package\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Extracting _PRW package"));</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;wakeup.flags.valid = 1;</div><div class='ctx'> 	/* Power button, Lid switch always enable wakeup */</div><div class='hunk'>@@ -342,7 +329,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)</div><div class='ctx'>       end:</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		device-&gt;flags.wake_capable = 0;</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -441,10 +428,7 @@ acpi_eject_store(struct acpi_device *device, const char *buf, size_t count)</div><div class='ctx'> 	islockable = device-&gt;flags.lockable;</div><div class='ctx'> 	handle = device-&gt;handle;</div><div class='ctx'> </div><div class='del'>-	if (type == ACPI_TYPE_PROCESSOR)</div><div class='del'>-		result = acpi_bus_trim(device, 0);</div><div class='del'>-	else</div><div class='del'>-		result = acpi_bus_trim(device, 1);</div><div class='add'>+	result = acpi_bus_trim(device, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (!result)</div><div class='ctx'> 		result = acpi_eject_operation(handle, islockable);</div><div class='hunk'>@@ -471,7 +455,6 @@ static int acpi_bus_get_perf_flags(struct acpi_device *device)</div><div class='ctx'>    -------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(acpi_bus_drivers);</div><div class='del'>-static DECLARE_MUTEX(acpi_bus_drivers_lock);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * acpi_bus_match - match device IDs to driver's supported IDs</div><div class='hunk'>@@ -502,19 +485,18 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_driver_init");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !driver)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!driver-&gt;ops.add)</div><div class='del'>-		return_VALUE(-ENOSYS);</div><div class='add'>+		return -ENOSYS;</div><div class='ctx'> </div><div class='ctx'> 	result = driver-&gt;ops.add(device);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		device-&gt;driver = NULL;</div><div class='ctx'> 		acpi_driver_data(device) = NULL;</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	device-&gt;driver = driver;</div><div class='hunk'>@@ -526,7 +508,7 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 			  "Driver successfully bound to device\n"));</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_start_single_object(struct acpi_device *device)</div><div class='hunk'>@@ -534,10 +516,9 @@ static int acpi_start_single_object(struct acpi_device *device)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_driver *driver;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_start_single_object");</div><div class='ctx'> </div><div class='ctx'> 	if (!(driver = device-&gt;driver))</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (driver-&gt;ops.start) {</div><div class='ctx'> 		result = driver-&gt;ops.start(device);</div><div class='hunk'>@@ -545,15 +526,13 @@ static int acpi_start_single_object(struct acpi_device *device)</div><div class='ctx'> 			driver-&gt;ops.remove(device, ACPI_BUS_REMOVAL_NORMAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int acpi_driver_attach(struct acpi_driver *drv)</div><div class='add'>+static void acpi_driver_attach(struct acpi_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *node, *next;</div><div class='del'>-	int count = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_driver_attach");</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	list_for_each_safe(node, next, &amp;acpi_device_list) {</div><div class='hunk'>@@ -568,7 +547,6 @@ static int acpi_driver_attach(struct acpi_driver *drv)</div><div class='ctx'> 			if (!acpi_bus_driver_init(dev, drv)) {</div><div class='ctx'> 				acpi_start_single_object(dev);</div><div class='ctx'> 				atomic_inc(&amp;drv-&gt;references);</div><div class='del'>-				count++;</div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 						  "Found driver [%s] for device [%s]\n",</div><div class='ctx'> 						  drv-&gt;name, dev-&gt;pnp.bus_id));</div><div class='hunk'>@@ -577,14 +555,12 @@ static int acpi_driver_attach(struct acpi_driver *drv)</div><div class='ctx'> 		spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;acpi_device_lock);</div><div class='del'>-	return_VALUE(count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int acpi_driver_detach(struct acpi_driver *drv)</div><div class='add'>+static void acpi_driver_detach(struct acpi_driver *drv)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *node, *next;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_driver_detach");</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	list_for_each_safe(node, next, &amp;acpi_device_list) {</div><div class='hunk'>@@ -602,7 +578,6 @@ static int acpi_driver_detach(struct acpi_driver *drv)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;acpi_device_lock);</div><div class='del'>-	return_VALUE(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -610,28 +585,21 @@ static int acpi_driver_detach(struct acpi_driver *drv)</div><div class='ctx'>  * @driver: driver being registered</div><div class='ctx'>  *</div><div class='ctx'>  * Registers a driver with the ACPI bus.  Searches the namespace for all</div><div class='del'>- * devices that match the driver's criteria and binds.  Returns the</div><div class='del'>- * number of devices that were claimed by the driver, or a negative</div><div class='del'>- * error status for failure.</div><div class='add'>+ * devices that match the driver's criteria and binds.  Returns zero for</div><div class='add'>+ * success or a negative error status for failure.</div><div class='ctx'>  */</div><div class='ctx'> int acpi_bus_register_driver(struct acpi_driver *driver)</div><div class='ctx'> {</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_register_driver");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='del'>-</div><div class='del'>-	if (!driver)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	list_add_tail(&amp;driver-&gt;node, &amp;acpi_bus_drivers);</div><div class='ctx'> 	spin_unlock(&amp;acpi_device_lock);</div><div class='del'>-	count = acpi_driver_attach(driver);</div><div class='add'>+	acpi_driver_attach(driver);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_register_driver);</div><div class='hunk'>@@ -643,23 +611,16 @@ EXPORT_SYMBOL(acpi_bus_register_driver);</div><div class='ctx'>  * Unregisters a driver with the ACPI bus.  Searches the namespace for all</div><div class='ctx'>  * devices that match the driver's criteria and unbinds.</div><div class='ctx'>  */</div><div class='del'>-int acpi_bus_unregister_driver(struct acpi_driver *driver)</div><div class='add'>+void acpi_bus_unregister_driver(struct acpi_driver *driver)</div><div class='ctx'> {</div><div class='del'>-	int error = 0;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_unregister_driver");</div><div class='add'>+	acpi_driver_detach(driver);</div><div class='ctx'> </div><div class='del'>-	if (driver) {</div><div class='del'>-		acpi_driver_detach(driver);</div><div class='del'>-</div><div class='del'>-		if (!atomic_read(&amp;driver-&gt;references)) {</div><div class='del'>-			spin_lock(&amp;acpi_device_lock);</div><div class='del'>-			list_del_init(&amp;driver-&gt;node);</div><div class='del'>-			spin_unlock(&amp;acpi_device_lock);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-	return_VALUE(error);</div><div class='add'>+	if (!atomic_read(&amp;driver-&gt;references)) {</div><div class='add'>+		spin_lock(&amp;acpi_device_lock);</div><div class='add'>+		list_del_init(&amp;driver-&gt;node);</div><div class='add'>+		spin_unlock(&amp;acpi_device_lock);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_unregister_driver);</div><div class='hunk'>@@ -676,7 +637,6 @@ static int acpi_bus_find_driver(struct acpi_device *device)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct list_head *node, *next;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_find_driver");</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	list_for_each_safe(node, next, &amp;acpi_bus_drivers) {</div><div class='hunk'>@@ -696,19 +656,41 @@ static int acpi_bus_find_driver(struct acpi_device *device)</div><div class='ctx'> 	spin_unlock(&amp;acpi_device_lock);</div><div class='ctx'> </div><div class='ctx'>       Done:</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                                  Device Enumeration</div><div class='ctx'>    -------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+acpi_status</div><div class='add'>+acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	acpi_handle tmp;</div><div class='add'>+	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='add'>+	union acpi_object *obj;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_handle(handle, "_EJD", &amp;tmp);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(handle, "_EJD", NULL, &amp;buffer);</div><div class='add'>+	if (ACPI_SUCCESS(status)) {</div><div class='add'>+		obj = buffer.pointer;</div><div class='add'>+		status = acpi_get_handle(NULL, obj-&gt;string.pointer, ejd);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(acpi_bus_get_ejd);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int acpi_bus_get_flags(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	acpi_handle temp = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_get_flags");</div><div class='ctx'> </div><div class='ctx'> 	/* Presence of _STA indicates 'dynamic_status' */</div><div class='ctx'> 	status = acpi_get_handle(device-&gt;handle, "_STA", &amp;temp);</div><div class='hunk'>@@ -754,7 +736,7 @@ static int acpi_bus_get_flags(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Peformance management */</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_device_get_busid(struct acpi_device *device,</div><div class='hunk'>@@ -872,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device,</div><div class='ctx'> 			printk(KERN_ERR "Memory allocation error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_device_set_context(struct acpi_device *device, int type)</div><div class='hunk'>@@ -948,10 +930,9 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_driver *driver;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	driver = dev-&gt;driver;</div><div class='ctx'> </div><div class='hunk'>@@ -960,12 +941,12 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)</div><div class='ctx'> 		if (driver-&gt;ops.stop) {</div><div class='ctx'> 			result = driver-&gt;ops.stop(dev, ACPI_BUS_REMOVAL_EJECT);</div><div class='ctx'> 			if (result)</div><div class='del'>-				return_VALUE(result);</div><div class='add'>+				return result;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		result = dev-&gt;driver-&gt;ops.remove(dev, ACPI_BUS_REMOVAL_EJECT);</div><div class='ctx'> 		if (result) {</div><div class='del'>-			return_VALUE(result);</div><div class='add'>+			return result;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		atomic_dec(&amp;dev-&gt;driver-&gt;references);</div><div class='hunk'>@@ -974,7 +955,7 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!rmdevice)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags.bus_address) {</div><div class='ctx'> 		if ((dev-&gt;parent) &amp;&amp; (dev-&gt;parent-&gt;ops.unbind))</div><div class='hunk'>@@ -983,7 +964,7 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)</div><div class='ctx'> </div><div class='ctx'> 	acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -993,15 +974,14 @@ acpi_add_single_object(struct acpi_device **child,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_add_single_object");</div><div class='ctx'> </div><div class='ctx'> 	if (!child)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL);</div><div class='ctx'> 	if (!device) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Memory allocation error\n"));</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		printk(KERN_ERR PREFIX "Memory allocation error\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(device, 0, sizeof(struct acpi_device));</div><div class='ctx'> </div><div class='hunk'>@@ -1126,7 +1106,7 @@ acpi_add_single_object(struct acpi_device **child,</div><div class='ctx'> 		kfree(device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops)</div><div class='hunk'>@@ -1139,10 +1119,9 @@ static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops)</div><div class='ctx'> 	acpi_object_type type = 0;</div><div class='ctx'> 	u32 level = 1;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_scan");</div><div class='ctx'> </div><div class='ctx'> 	if (!start)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	parent = start;</div><div class='ctx'> 	phandle = start-&gt;handle;</div><div class='hunk'>@@ -1239,7 +1218,7 @@ static int acpi_bus_scan(struct acpi_device *start, struct acpi_bus_ops *ops)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -1249,7 +1228,6 @@ acpi_bus_add(struct acpi_device **child,</div><div class='ctx'> 	int result;</div><div class='ctx'> 	struct acpi_bus_ops ops;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_add");</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_add_single_object(child, parent, handle, type);</div><div class='ctx'> 	if (!result) {</div><div class='hunk'>@@ -1257,7 +1235,7 @@ acpi_bus_add(struct acpi_device **child,</div><div class='ctx'> 		ops.acpi_op_add = 1;</div><div class='ctx'> 		result = acpi_bus_scan(*child, &amp;ops);</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_add);</div><div class='hunk'>@@ -1267,10 +1245,9 @@ int acpi_bus_start(struct acpi_device *device)</div><div class='ctx'> 	int result;</div><div class='ctx'> 	struct acpi_bus_ops ops;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_start");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_start_single_object(device);</div><div class='ctx'> 	if (!result) {</div><div class='hunk'>@@ -1278,7 +1255,7 @@ int acpi_bus_start(struct acpi_device *device)</div><div class='ctx'> 		ops.acpi_op_start = 1;</div><div class='ctx'> 		result = acpi_bus_scan(device, &amp;ops);</div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_bus_start);</div><div class='hunk'>@@ -1344,10 +1321,9 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_bus_scan_fixed");</div><div class='ctx'> </div><div class='ctx'> 	if (!root)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enumerate all fixed-feature devices.</div><div class='hunk'>@@ -1368,21 +1344,120 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)</div><div class='ctx'> 			result = acpi_start_single_object(device);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline struct acpi_device * to_acpi_dev(struct device * dev)</div><div class='add'>+{</div><div class='add'>+	return container_of(dev, struct acpi_device, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int root_suspend(struct acpi_device * acpi_dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device * dev, * next;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;acpi_device_lock);</div><div class='add'>+	list_for_each_entry_safe_reverse(dev, next, &amp;acpi_device_list, g_list) {</div><div class='add'>+		if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;ops.suspend) {</div><div class='add'>+			spin_unlock(&amp;acpi_device_lock);</div><div class='add'>+			result = dev-&gt;driver-&gt;ops.suspend(dev, 0);</div><div class='add'>+			if (result) {</div><div class='add'>+				printk(KERN_ERR PREFIX "[%s - %s] Suspend failed: %d\n",</div><div class='add'>+				       acpi_device_name(dev),</div><div class='add'>+				       acpi_device_bid(dev), result);</div><div class='add'>+			}</div><div class='add'>+			spin_lock(&amp;acpi_device_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;acpi_device_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int acpi_device_suspend(struct device * dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device * acpi_dev = to_acpi_dev(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, we should only register 1 generic device -</div><div class='add'>+	 * the ACPI root device - and from there, we walk the</div><div class='add'>+	 * tree of ACPI devices to suspend each one using the</div><div class='add'>+	 * ACPI driver methods.</div><div class='add'>+	 */</div><div class='add'>+	if (acpi_dev-&gt;handle == ACPI_ROOT_OBJECT)</div><div class='add'>+		root_suspend(acpi_dev, state);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int root_resume(struct acpi_device * acpi_dev)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device * dev, * next;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;acpi_device_lock);</div><div class='add'>+	list_for_each_entry_safe(dev, next, &amp;acpi_device_list, g_list) {</div><div class='add'>+		if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;ops.resume) {</div><div class='add'>+			spin_unlock(&amp;acpi_device_lock);</div><div class='add'>+			result = dev-&gt;driver-&gt;ops.resume(dev, 0);</div><div class='add'>+			if (result) {</div><div class='add'>+				printk(KERN_ERR PREFIX "[%s - %s] resume failed: %d\n",</div><div class='add'>+				       acpi_device_name(dev),</div><div class='add'>+				       acpi_device_bid(dev), result);</div><div class='add'>+			}</div><div class='add'>+			spin_lock(&amp;acpi_device_lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;acpi_device_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int acpi_device_resume(struct device * dev)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device * acpi_dev = to_acpi_dev(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For now, we should only register 1 generic device -</div><div class='add'>+	 * the ACPI root device - and from there, we walk the</div><div class='add'>+	 * tree of ACPI devices to resume each one using the</div><div class='add'>+	 * ACPI driver methods.</div><div class='add'>+	 */</div><div class='add'>+	if (acpi_dev-&gt;handle == ACPI_ROOT_OBJECT)</div><div class='add'>+		root_resume(acpi_dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct bus_type acpi_bus_type = {</div><div class='add'>+	.name		= "acpi",</div><div class='add'>+	.suspend	= acpi_device_suspend,</div><div class='add'>+	.resume		= acpi_device_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int __init acpi_scan_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	struct acpi_bus_ops ops;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_scan_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	kset_register(&amp;acpi_namespace_kset);</div><div class='ctx'> </div><div class='add'>+	result = bus_register(&amp;acpi_bus_type);</div><div class='add'>+	if (result) {</div><div class='add'>+		/* We don't want to quit even if we failed to add suspend/resume */</div><div class='add'>+		printk(KERN_ERR PREFIX "Could not register bus type\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create the root device in the bus's device tree</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1392,6 +1467,16 @@ static int __init acpi_scan_init(void)</div><div class='ctx'> 		goto Done;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_start_single_object(acpi_root);</div><div class='add'>+	if (result)</div><div class='add'>+		goto Done;</div><div class='add'>+</div><div class='add'>+	acpi_root-&gt;dev.bus = &amp;acpi_bus_type;</div><div class='add'>+	snprintf(acpi_root-&gt;dev.bus_id, BUS_ID_SIZE, "%s", acpi_bus_type.name);</div><div class='add'>+	result = device_register(&amp;acpi_root-&gt;dev);</div><div class='add'>+	if (result) {</div><div class='add'>+		/* We don't want to quit even if we failed to add suspend/resume */</div><div class='add'>+		printk(KERN_ERR PREFIX "Could not register device\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enumerate devices in the ACPI namespace.</div><div class='hunk'>@@ -1408,7 +1493,7 @@ static int __init acpi_scan_init(void)</div><div class='ctx'> 		acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);</div><div class='ctx'> </div><div class='ctx'>       Done:</div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> subsys_initcall(acpi_scan_init);</div><div class='head'>diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c<br/>index 930427fc0c4b..62ce87d71651 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/sleep/main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sleep/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/sleep/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/sleep/main.c</a></div><div class='hunk'>@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t pm_state)</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* ACPI 3.0 specs (P62) says that it's the responsabilty</div><div class='add'>+	 * of the OSPM to clear the status bit [ implying that the</div><div class='add'>+	 * POWER_BUTTON event should not reach userspace ]</div><div class='add'>+	 */</div><div class='add'>+	if (ACPI_SUCCESS(status) &amp;&amp; (acpi_state == ACPI_STATE_S3))</div><div class='add'>+		acpi_clear_event(ACPI_EVENT_POWER_BUTTON);</div><div class='add'>+</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> 	printk(KERN_DEBUG "Back to C!\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c<br/>index 4696a85a98b9..34962578039d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/sleep/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sleep/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/sleep/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/sleep/proc.c</a></div><div class='hunk'>@@ -434,7 +434,7 @@ acpi_system_wakeup_device_open_fs(struct inode *inode, struct file *file)</div><div class='ctx'> 			   PDE(inode)-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_system_wakeup_device_fops = {</div><div class='add'>+static const struct file_operations acpi_system_wakeup_device_fops = {</div><div class='ctx'> 	.open = acpi_system_wakeup_device_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_system_write_wakeup_device,</div><div class='hunk'>@@ -443,7 +443,7 @@ static struct file_operations acpi_system_wakeup_device_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_ACPI_SLEEP_PROC_SLEEP</div><div class='del'>-static struct file_operations acpi_system_sleep_fops = {</div><div class='add'>+static const struct file_operations acpi_system_sleep_fops = {</div><div class='ctx'> 	.open = acpi_system_sleep_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_system_write_sleep,</div><div class='hunk'>@@ -452,7 +452,7 @@ static struct file_operations acpi_system_sleep_fops = {</div><div class='ctx'> };</div><div class='ctx'> #endif				/* CONFIG_ACPI_SLEEP_PROC_SLEEP */</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_system_alarm_fops = {</div><div class='add'>+static const struct file_operations acpi_system_alarm_fops = {</div><div class='ctx'> 	.open = acpi_system_alarm_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_system_write_alarm,</div><div class='head'>diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c<br/>index 85df0ceda2a9..af1dbabaf0b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/sleep/wakeup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/sleep/wakeup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/sleep/wakeup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/sleep/wakeup.c</a></div><div class='hunk'>@@ -155,7 +155,6 @@ static int __init acpi_wakeup_device_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='ctx'> 		return 0;</div><div class='del'>-	printk("ACPI wakeup devices: \n");</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 	list_for_each_safe(node, next, &amp;acpi_wakeup_device_list) {</div><div class='hunk'>@@ -174,10 +173,8 @@ static int __init acpi_wakeup_device_init(void)</div><div class='ctx'> 			dev-&gt;wakeup.state.enabled = 1;</div><div class='ctx'> 			spin_lock(&amp;acpi_device_lock);</div><div class='ctx'> 		}</div><div class='del'>-		printk("%4s ", dev-&gt;pnp.bus_id);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;acpi_device_lock);</div><div class='del'>-	printk("\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c<br/>index e4308c7a6743..d86dcb3c2366 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/system.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/system.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/system.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/system.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ ACPI_MODULE_NAME("acpi_system")</div><div class='ctx'> #define ACPI_SYSTEM_FILE_EVENT		"event"</div><div class='ctx'> #define ACPI_SYSTEM_FILE_DSDT		"dsdt"</div><div class='ctx'> #define ACPI_SYSTEM_FILE_FADT		"fadt"</div><div class='del'>-extern FADT_DESCRIPTOR acpi_fadt;</div><div class='add'>+extern struct fadt_descriptor acpi_fadt;</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='ctx'>                               FS Interface (/proc)</div><div class='hunk'>@@ -47,10 +47,9 @@ extern FADT_DESCRIPTOR acpi_fadt;</div><div class='ctx'> </div><div class='ctx'> static int acpi_system_read_info(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_system_read_info");</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "version:                 %x\n", ACPI_CA_VERSION);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_system_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -58,7 +57,7 @@ static int acpi_system_info_open_fs(struct inode *inode, struct file *file)</div><div class='ctx'> 	return single_open(file, acpi_system_read_info, PDE(inode)-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_system_info_ops = {</div><div class='add'>+static const struct file_operations acpi_system_info_ops = {</div><div class='ctx'> 	.open = acpi_system_info_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='hunk'>@@ -68,7 +67,7 @@ static struct file_operations acpi_system_info_ops = {</div><div class='ctx'> static ssize_t acpi_system_read_dsdt(struct file *, char __user *, size_t,</div><div class='ctx'> 				     loff_t *);</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_system_dsdt_ops = {</div><div class='add'>+static const struct file_operations acpi_system_dsdt_ops = {</div><div class='ctx'> 	.read = acpi_system_read_dsdt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -80,23 +79,22 @@ acpi_system_read_dsdt(struct file *file,</div><div class='ctx'> 	struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_system_read_dsdt");</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_table(ACPI_TABLE_DSDT, 1, &amp;dsdt);</div><div class='add'>+	status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &amp;dsdt);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	res = simple_read_from_buffer(buffer, count, ppos,</div><div class='ctx'> 				      dsdt.pointer, dsdt.length);</div><div class='del'>-	acpi_os_free(dsdt.pointer);</div><div class='add'>+	kfree(dsdt.pointer);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(res);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t acpi_system_read_fadt(struct file *, char __user *, size_t,</div><div class='ctx'> 				     loff_t *);</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_system_fadt_ops = {</div><div class='add'>+static const struct file_operations acpi_system_fadt_ops = {</div><div class='ctx'> 	.read = acpi_system_read_fadt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -108,17 +106,16 @@ acpi_system_read_fadt(struct file *file,</div><div class='ctx'> 	struct acpi_buffer fadt = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	ssize_t res;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_system_read_fadt");</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_table(ACPI_TABLE_FADT, 1, &amp;fadt);</div><div class='add'>+	status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &amp;fadt);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	res = simple_read_from_buffer(buffer, count, ppos,</div><div class='ctx'> 				      fadt.pointer, fadt.length);</div><div class='del'>-	acpi_os_free(fadt.pointer);</div><div class='add'>+	kfree(fadt.pointer);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(res);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_system_init(void)</div><div class='hunk'>@@ -127,10 +124,9 @@ static int __init acpi_system_init(void)</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> 	char *name;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_system_init");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_disabled)</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* 'info' [R] */</div><div class='ctx'> 	name = ACPI_SYSTEM_FILE_INFO;</div><div class='hunk'>@@ -158,12 +154,9 @@ static int __init acpi_system_init(void)</div><div class='ctx'> 		goto Error;</div><div class='ctx'> </div><div class='ctx'>       Done:</div><div class='del'>-	return_VALUE(error);</div><div class='add'>+	return error;</div><div class='ctx'> </div><div class='ctx'>       Error:</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-			  "Unable to create '%s' proc fs entry\n", name));</div><div class='del'>-</div><div class='ctx'> 	remove_proc_entry(ACPI_SYSTEM_FILE_FADT, acpi_root_dir);</div><div class='ctx'> 	remove_proc_entry(ACPI_SYSTEM_FILE_DSDT, acpi_root_dir);</div><div class='ctx'> 	remove_proc_entry(ACPI_SYSTEM_FILE_INFO, acpi_root_dir);</div><div class='head'>diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c<br/>index 7f37c7cc5ef1..bfb3bfcf9e91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -282,8 +281,8 @@ acpi_get_table_header_early(enum acpi_table_id id,</div><div class='ctx'> </div><div class='ctx'> 	/* Map the DSDT header via the pointer in the FADT */</div><div class='ctx'> 	if (id == ACPI_DSDT) {</div><div class='del'>-		struct fadt_descriptor_rev2 *fadt =</div><div class='del'>-		    (struct fadt_descriptor_rev2 *)*header;</div><div class='add'>+		struct fadt_descriptor *fadt =</div><div class='add'>+		    (struct fadt_descriptor *)*header;</div><div class='ctx'> </div><div class='ctx'> 		if (fadt-&gt;revision == 3 &amp;&amp; fadt-&gt;Xdsdt) {</div><div class='ctx'> 			*header = (void *)__acpi_map_table(fadt-&gt;Xdsdt,</div><div class='head'>diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c<br/>index 03b37d2223bc..d697fcb35d52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbconvrt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbconvrt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbconvrt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbconvrt.c</a></div><div class='hunk'>@@ -41,8 +41,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/actables.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -56,15 +54,15 @@ acpi_tb_init_generic_address(struct acpi_generic_address *new_gas_struct,</div><div class='ctx'> 			     acpi_physical_address address);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_tb_convert_fadt1(struct fadt_descriptor_rev2 *local_fadt,</div><div class='add'>+acpi_tb_convert_fadt1(struct fadt_descriptor *local_fadt,</div><div class='ctx'> 		      struct fadt_descriptor_rev1 *original_fadt);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_tb_convert_fadt2(struct fadt_descriptor_rev2 *local_fadt,</div><div class='del'>-		      struct fadt_descriptor_rev2 *original_fadt);</div><div class='add'>+acpi_tb_convert_fadt2(struct fadt_descriptor *local_fadt,</div><div class='add'>+		      struct fadt_descriptor *original_fadt);</div><div class='ctx'> </div><div class='ctx'> u8 acpi_fadt_is_v1;</div><div class='del'>-EXPORT_SYMBOL(acpi_fadt_is_v1);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_fadt_is_v1)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -122,7 +120,7 @@ acpi_status acpi_tb_convert_to_xsdt(struct acpi_table_desc *table_info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_size table_size;</div><div class='ctx'> 	u32 i;</div><div class='del'>-	XSDT_DESCRIPTOR *new_table;</div><div class='add'>+	struct xsdt_descriptor *new_table;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +131,7 @@ acpi_status acpi_tb_convert_to_xsdt(struct acpi_table_desc *table_info)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate an XSDT */</div><div class='ctx'> </div><div class='del'>-	new_table = ACPI_MEM_CALLOCATE(table_size);</div><div class='add'>+	new_table = ACPI_ALLOCATE_ZEROED(table_size);</div><div class='ctx'> 	if (!new_table) {</div><div class='ctx'> 		return (AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -147,17 +145,18 @@ acpi_status acpi_tb_convert_to_xsdt(struct acpi_table_desc *table_info)</div><div class='ctx'> 	/* Copy the table pointers */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; acpi_gbl_rsdt_table_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* RSDT pointers are 32 bits, XSDT pointers are 64 bits */</div><div class='ctx'> </div><div class='ctx'> 		if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {</div><div class='ctx'> 			ACPI_STORE_ADDRESS(new_table-&gt;table_offset_entry[i],</div><div class='ctx'> 					   (ACPI_CAST_PTR</div><div class='del'>-					    (struct rsdt_descriptor_rev1,</div><div class='add'>+					    (struct rsdt_descriptor,</div><div class='ctx'> 					     table_info-&gt;pointer))-&gt;</div><div class='ctx'> 					   table_offset_entry[i]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			new_table-&gt;table_offset_entry[i] =</div><div class='del'>-			    (ACPI_CAST_PTR(XSDT_DESCRIPTOR,</div><div class='add'>+			    (ACPI_CAST_PTR(struct xsdt_descriptor,</div><div class='ctx'> 					   table_info-&gt;pointer))-&gt;</div><div class='ctx'> 			    table_offset_entry[i];</div><div class='ctx'> 		}</div><div class='hunk'>@@ -219,7 +218,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *new_gas_struct,</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_tb_convert_fadt1(struct fadt_descriptor_rev2 *local_fadt,</div><div class='add'>+acpi_tb_convert_fadt1(struct fadt_descriptor *local_fadt,</div><div class='ctx'> 		      struct fadt_descriptor_rev1 *original_fadt)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -365,14 +364,13 @@ acpi_tb_convert_fadt1(struct fadt_descriptor_rev2 *local_fadt,</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_tb_convert_fadt2(struct fadt_descriptor_rev2 *local_fadt,</div><div class='del'>-		      struct fadt_descriptor_rev2 *original_fadt)</div><div class='add'>+acpi_tb_convert_fadt2(struct fadt_descriptor *local_fadt,</div><div class='add'>+		      struct fadt_descriptor *original_fadt)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	/* We have an ACPI 2.0 FADT but we must copy it to our local buffer */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEMCPY(local_fadt, original_fadt,</div><div class='del'>-		    sizeof(struct fadt_descriptor_rev2));</div><div class='add'>+	ACPI_MEMCPY(local_fadt, original_fadt, sizeof(struct fadt_descriptor));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * "X" fields are optional extensions to the original V1.0 fields, so</div><div class='hunk'>@@ -491,10 +489,10 @@ acpi_tb_convert_fadt2(struct fadt_descriptor_rev2 *local_fadt,</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_tb_convert_table_fadt(void)</div><div class='ctx'> {</div><div class='del'>-	struct fadt_descriptor_rev2 *local_fadt;</div><div class='add'>+	struct fadt_descriptor *local_fadt;</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_convert_table_fadt");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_convert_table_fadt);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * acpi_gbl_FADT is valid. Validate the FADT length. The table must be</div><div class='hunk'>@@ -508,13 +506,14 @@ acpi_status acpi_tb_convert_table_fadt(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate buffer for the ACPI 2.0(+) FADT */</div><div class='ctx'> </div><div class='del'>-	local_fadt = ACPI_MEM_CALLOCATE(sizeof(struct fadt_descriptor_rev2));</div><div class='add'>+	local_fadt = ACPI_ALLOCATE_ZEROED(sizeof(struct fadt_descriptor));</div><div class='ctx'> 	if (!local_fadt) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_gbl_FADT-&gt;revision &gt;= FADT2_REVISION_ID) {</div><div class='del'>-		if (acpi_gbl_FADT-&gt;length &lt; sizeof(struct fadt_descriptor_rev2)) {</div><div class='add'>+		if (acpi_gbl_FADT-&gt;length &lt; sizeof(struct fadt_descriptor)) {</div><div class='add'>+</div><div class='ctx'> 			/* Length is too short to be a V2.0 table */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_WARNING((AE_INFO,</div><div class='hunk'>@@ -538,11 +537,11 @@ acpi_status acpi_tb_convert_table_fadt(void)</div><div class='ctx'> 	/* Global FADT pointer will point to the new common V2.0 FADT */</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_FADT = local_fadt;</div><div class='del'>-	acpi_gbl_FADT-&gt;length = sizeof(FADT_DESCRIPTOR);</div><div class='add'>+	acpi_gbl_FADT-&gt;length = sizeof(struct fadt_descriptor);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the original table */</div><div class='ctx'> </div><div class='del'>-	table_desc = acpi_gbl_table_lists[ACPI_TABLE_FADT].next;</div><div class='add'>+	table_desc = acpi_gbl_table_lists[ACPI_TABLE_ID_FADT].next;</div><div class='ctx'> 	acpi_tb_delete_single_table(table_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Install the new table */</div><div class='hunk'>@@ -550,7 +549,7 @@ acpi_status acpi_tb_convert_table_fadt(void)</div><div class='ctx'> 	table_desc-&gt;pointer =</div><div class='ctx'> 	    ACPI_CAST_PTR(struct acpi_table_header, acpi_gbl_FADT);</div><div class='ctx'> 	table_desc-&gt;allocation = ACPI_MEM_ALLOCATED;</div><div class='del'>-	table_desc-&gt;length = sizeof(struct fadt_descriptor_rev2);</div><div class='add'>+	table_desc-&gt;length = sizeof(struct fadt_descriptor);</div><div class='ctx'> </div><div class='ctx'> 	/* Dump the entire FADT */</div><div class='ctx'> </div><div class='hunk'>@@ -580,7 +579,7 @@ acpi_status acpi_tb_convert_table_fadt(void)</div><div class='ctx'> acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_build_common_facs");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_build_common_facs);</div><div class='ctx'> </div><div class='ctx'> 	/* Absolute minimum length is 24, but the ACPI spec says 64 */</div><div class='ctx'> </div><div class='hunk'>@@ -603,6 +602,7 @@ acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)</div><div class='ctx'> 	if ((acpi_gbl_RSDP-&gt;revision &lt; 2) ||</div><div class='ctx'> 	    (acpi_gbl_FACS-&gt;length &lt; 32) ||</div><div class='ctx'> 	    (!(acpi_gbl_FACS-&gt;xfirmware_waking_vector))) {</div><div class='add'>+</div><div class='ctx'> 		/* ACPI 1.0 FACS or short table or optional X_ field is zero */</div><div class='ctx'> </div><div class='ctx'> 		acpi_gbl_common_fACS.firmware_waking_vector = ACPI_CAST_PTR(u64,</div><div class='head'>diff --git a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c<br/>index 09b4ee6dfd60..7856db759af0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbget.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbget.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbget.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@ acpi_tb_get_table(struct acpi_pointer *address,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_table_header header;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the header in order to get signature and table size */</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,7 @@ acpi_tb_get_table_header(struct acpi_pointer *address,</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_table_header *header = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_table_header");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_table_header);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Flags contains the current processor mode (Virtual or Physical</div><div class='hunk'>@@ -148,6 +148,10 @@ acpi_tb_get_table_header(struct acpi_pointer *address,</div><div class='ctx'> 					    sizeof(struct acpi_table_header),</div><div class='ctx'> 					    (void *)&amp;header);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='add'>+			ACPI_ERROR((AE_INFO,</div><div class='add'>+				    "Could not map memory at %8.8X%8.8X for table header",</div><div class='add'>+				    ACPI_FORMAT_UINT64(address-&gt;pointer.</div><div class='add'>+						       physical)));</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +202,7 @@ acpi_tb_get_table_body(struct acpi_pointer *address,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_table_body");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_table_body);</div><div class='ctx'> </div><div class='ctx'> 	if (!table_info || !address) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -208,6 +212,7 @@ acpi_tb_get_table_body(struct acpi_pointer *address,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_tb_table_override(header, table_info);</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Table was overridden by the host OS */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(status);</div><div class='hunk'>@@ -241,7 +246,7 @@ acpi_tb_table_override(struct acpi_table_header *header,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_pointer address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_table_override");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_table_override);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The OSL will examine the header and decide whether to override this</div><div class='hunk'>@@ -250,6 +255,7 @@ acpi_tb_table_override(struct acpi_table_header *header,</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = acpi_os_table_override(header, &amp;new_table);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Some severe error from the OSL, but we basically ignore it */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_EXCEPTION((AE_INFO, status,</div><div class='hunk'>@@ -258,6 +264,7 @@ acpi_tb_table_override(struct acpi_table_header *header,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!new_table) {</div><div class='add'>+</div><div class='ctx'> 		/* No table override */</div><div class='ctx'> </div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_ACPI_TABLES);</div><div class='hunk'>@@ -311,7 +318,17 @@ acpi_tb_get_this_table(struct acpi_pointer *address,</div><div class='ctx'> 	u8 allocation;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_this_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_this_table);</div><div class='add'>+</div><div class='add'>+	/* Validate minimum length */</div><div class='add'>+</div><div class='add'>+	if (header-&gt;length &lt; sizeof(struct acpi_table_header)) {</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "Table length (%X) is smaller than minimum (%X)",</div><div class='add'>+			    header-&gt;length, sizeof(struct acpi_table_header)));</div><div class='add'>+</div><div class='add'>+		return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Flags contains the current processor mode (Virtual or Physical</div><div class='hunk'>@@ -323,7 +340,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,</div><div class='ctx'> </div><div class='ctx'> 		/* Pointer matches processor mode, copy the table to a new buffer */</div><div class='ctx'> </div><div class='del'>-		full_table = ACPI_MEM_ALLOCATE(header-&gt;length);</div><div class='add'>+		full_table = ACPI_ALLOCATE(header-&gt;length);</div><div class='ctx'> 		if (!full_table) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='ctx'> 				    "Could not allocate table memory for [%4.4s] length %X",</div><div class='hunk'>@@ -349,7 +366,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,</div><div class='ctx'> 		 */</div><div class='ctx'> 		status = acpi_os_map_memory(address-&gt;pointer.physical,</div><div class='ctx'> 					    (acpi_size) header-&gt;length,</div><div class='del'>-					    (void *)&amp;full_table);</div><div class='add'>+					    ACPI_CAST_PTR(void, &amp;full_table));</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO,</div><div class='ctx'> 				    "Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X",</div><div class='hunk'>@@ -376,11 +393,12 @@ acpi_tb_get_this_table(struct acpi_pointer *address,</div><div class='ctx'> 	 * Validate checksum for _most_ tables,</div><div class='ctx'> 	 * even the ones whose signature we don't recognize</div><div class='ctx'> 	 */</div><div class='del'>-	if (table_info-&gt;type != ACPI_TABLE_FACS) {</div><div class='add'>+	if (table_info-&gt;type != ACPI_TABLE_ID_FACS) {</div><div class='ctx'> 		status = acpi_tb_verify_table_checksum(full_table);</div><div class='ctx'> </div><div class='ctx'> #if (!ACPI_CHECKSUM_ABORT)</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Ignore the error if configuration says so */</div><div class='ctx'> </div><div class='ctx'> 			status = AE_OK;</div><div class='hunk'>@@ -409,7 +427,7 @@ acpi_tb_get_this_table(struct acpi_pointer *address,</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  table_type      - one of the defined table types</div><div class='ctx'>  *              Instance        - Which table of this type</div><div class='del'>- *              table_ptr_loc   - pointer to location to place the pointer for</div><div class='add'>+ *              return_table    - pointer to location to place the pointer for</div><div class='ctx'>  *                                return</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='hunk'>@@ -420,57 +438,34 @@ acpi_tb_get_this_table(struct acpi_pointer *address,</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_tb_get_table_ptr(acpi_table_type table_type,</div><div class='del'>-		      u32 instance, struct acpi_table_header **table_ptr_loc)</div><div class='add'>+		      u32 instance, struct acpi_table_header **return_table)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_table_ptr");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_table_ptr);</div><div class='ctx'> </div><div class='del'>-	if (!acpi_gbl_DSDT) {</div><div class='del'>-		return_ACPI_STATUS(AE_NO_ACPI_TABLES);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (table_type &gt; ACPI_TABLE_MAX) {</div><div class='add'>+	if (table_type &gt; ACPI_TABLE_ID_MAX) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For all table types (Single/Multiple), the first</div><div class='del'>-	 * instance is always in the list head.</div><div class='del'>-	 */</div><div class='del'>-	if (instance == 1) {</div><div class='del'>-		/* Get the first */</div><div class='del'>-</div><div class='del'>-		*table_ptr_loc = NULL;</div><div class='del'>-		if (acpi_gbl_table_lists[table_type].next) {</div><div class='del'>-			*table_ptr_loc =</div><div class='del'>-			    acpi_gbl_table_lists[table_type].next-&gt;pointer;</div><div class='del'>-		}</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for instance out of range */</div><div class='add'>+	/* Check for instance out of range of the current table count */</div><div class='ctx'> </div><div class='ctx'> 	if (instance &gt; acpi_gbl_table_lists[table_type].count) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Walk the list to get the desired table</div><div class='del'>-	 * Since the if (Instance == 1) check above checked for the</div><div class='del'>-	 * first table, setting table_desc equal to the .Next member</div><div class='del'>-	 * is actually pointing to the second table.  Therefore, we</div><div class='del'>-	 * need to walk from the 2nd table until we reach the Instance</div><div class='del'>-	 * that the user is looking for and return its table pointer.</div><div class='add'>+	/*</div><div class='add'>+	 * Walk the list to get the desired table</div><div class='add'>+	 * Note: Instance is one-based</div><div class='ctx'> 	 */</div><div class='ctx'> 	table_desc = acpi_gbl_table_lists[table_type].next;</div><div class='del'>-	for (i = 2; i &lt; instance; i++) {</div><div class='add'>+	for (i = 1; i &lt; instance; i++) {</div><div class='ctx'> 		table_desc = table_desc-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We are now pointing to the requested table's descriptor */</div><div class='ctx'> </div><div class='del'>-	*table_ptr_loc = table_desc-&gt;pointer;</div><div class='del'>-</div><div class='add'>+	*return_table = table_desc-&gt;pointer;</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c<br/>index 134e5dce0bc1..ad982112e4c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbgetall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbgetall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbgetall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbgetall.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ acpi_tb_get_primary_table(struct acpi_pointer *address,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_table_header header;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_primary_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_primary_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Ignore a NULL address in the RSDT */</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +140,7 @@ acpi_tb_get_secondary_table(struct acpi_pointer *address,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_table_header header;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("tb_get_secondary_table", signature);</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(tb_get_secondary_table, signature);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the header in order to match the signature */</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +151,7 @@ acpi_tb_get_secondary_table(struct acpi_pointer *address,</div><div class='ctx'> </div><div class='ctx'> 	/* Signature must match request */</div><div class='ctx'> </div><div class='del'>-	if (ACPI_STRNCMP(header.signature, signature, ACPI_NAME_SIZE)) {</div><div class='add'>+	if (!ACPI_COMPARE_NAME(header.signature, signature)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Incorrect table signature - wanted [%s] found [%4.4s]",</div><div class='ctx'> 			    signature, header.signature));</div><div class='hunk'>@@ -207,7 +207,7 @@ acpi_status acpi_tb_get_required_tables(void)</div><div class='ctx'> 	struct acpi_table_desc table_info;</div><div class='ctx'> 	struct acpi_pointer address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_required_tables");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_required_tables);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%d ACPI tables in RSDT\n",</div><div class='ctx'> 			  acpi_gbl_rsdt_table_count));</div><div class='hunk'>@@ -223,6 +223,7 @@ acpi_status acpi_tb_get_required_tables(void)</div><div class='ctx'> 	 * any SSDTs.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; acpi_gbl_rsdt_table_count; i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Get the table address from the common internal XSDT */</div><div class='ctx'> </div><div class='ctx'> 		address.pointer.value = acpi_gbl_XSDT-&gt;table_offset_entry[i];</div><div class='hunk'>@@ -305,6 +306,6 @@ acpi_status acpi_tb_get_required_tables(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Always delete the RSDP mapping, we are done with it */</div><div class='ctx'> </div><div class='del'>-	acpi_tb_delete_tables_by_type(ACPI_TABLE_RSDP);</div><div class='add'>+	acpi_tb_delete_tables_by_type(ACPI_TABLE_ID_RSDP);</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c<br/>index 7ffd0fddb4e5..1668a232fb67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbinstal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbinstal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbinstal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbinstal.c</a></div><div class='hunk'>@@ -73,17 +73,18 @@ acpi_tb_match_signature(char *signature,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_match_signature");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_match_signature);</div><div class='ctx'> </div><div class='ctx'> 	/* Search for a signature match among the known table types */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_ACPI_TABLE_TYPES; i++) {</div><div class='add'>+	for (i = 0; i &lt; (ACPI_TABLE_ID_MAX + 1); i++) {</div><div class='ctx'> 		if (!(acpi_gbl_table_data[i].flags &amp; search_type)) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!ACPI_STRNCMP(signature, acpi_gbl_table_data[i].signature,</div><div class='ctx'> 				  acpi_gbl_table_data[i].sig_length)) {</div><div class='add'>+</div><div class='ctx'> 			/* Found a signature match, return index if requested */</div><div class='ctx'> </div><div class='ctx'> 			if (table_info) {</div><div class='hunk'>@@ -122,7 +123,7 @@ acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_install_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_install_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Lock tables while installing */</div><div class='ctx'> </div><div class='hunk'>@@ -187,7 +188,7 @@ acpi_tb_recognize_table(struct acpi_table_desc *table_info, u8 search_type)</div><div class='ctx'> 	struct acpi_table_header *table_header;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_recognize_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_recognize_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that we have a valid table pointer */</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +219,6 @@ acpi_tb_recognize_table(struct acpi_table_desc *table_info, u8 search_type)</div><div class='ctx'> 	/* Return the table type and length via the info struct */</div><div class='ctx'> </div><div class='ctx'> 	table_info-&gt;length = (acpi_size) table_header-&gt;length;</div><div class='del'>-</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -243,11 +243,11 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("tb_init_table_descriptor", table_type);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(tb_init_table_descriptor, table_type);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a descriptor for this table */</div><div class='ctx'> </div><div class='del'>-	table_desc = ACPI_MEM_CALLOCATE(sizeof(struct acpi_table_desc));</div><div class='add'>+	table_desc = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc));</div><div class='ctx'> 	if (!table_desc) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -256,7 +256,7 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_allocate_owner_id(&amp;table_desc-&gt;owner_id);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto error_exit1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Install the table into the global data structure */</div><div class='hunk'>@@ -274,8 +274,8 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,</div><div class='ctx'> 		 * at this location, so return an error.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (list_head-&gt;next) {</div><div class='del'>-			ACPI_MEM_FREE(table_desc);</div><div class='del'>-			return_ACPI_STATUS(AE_ALREADY_EXISTS);</div><div class='add'>+			status = AE_ALREADY_EXISTS;</div><div class='add'>+			goto error_exit2;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		table_desc-&gt;next = list_head-&gt;next;</div><div class='hunk'>@@ -312,15 +312,14 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	/* Finish initialization of the table descriptor */</div><div class='ctx'> </div><div class='add'>+	table_desc-&gt;loaded_into_namespace = FALSE;</div><div class='ctx'> 	table_desc-&gt;type = (u8) table_type;</div><div class='ctx'> 	table_desc-&gt;pointer = table_info-&gt;pointer;</div><div class='ctx'> 	table_desc-&gt;length = table_info-&gt;length;</div><div class='ctx'> 	table_desc-&gt;allocation = table_info-&gt;allocation;</div><div class='ctx'> 	table_desc-&gt;aml_start = (u8 *) (table_desc-&gt;pointer + 1),</div><div class='del'>-	    table_desc-&gt;aml_length = (u32) (table_desc-&gt;length -</div><div class='del'>-					    (u32) sizeof(struct</div><div class='del'>-							 acpi_table_header));</div><div class='del'>-	table_desc-&gt;loaded_into_namespace = FALSE;</div><div class='add'>+	    table_desc-&gt;aml_length = (u32)</div><div class='add'>+	    (table_desc-&gt;length - (u32) sizeof(struct acpi_table_header));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the appropriate global pointer (if there is one) to point to the</div><div class='hunk'>@@ -335,8 +334,18 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	table_info-&gt;owner_id = table_desc-&gt;owner_id;</div><div class='ctx'> 	table_info-&gt;installed_desc = table_desc;</div><div class='del'>-</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='add'>+</div><div class='add'>+	/* Error exit with cleanup */</div><div class='add'>+</div><div class='add'>+      error_exit2:</div><div class='add'>+</div><div class='add'>+	acpi_ut_release_owner_id(&amp;table_desc-&gt;owner_id);</div><div class='add'>+</div><div class='add'>+      error_exit1:</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(table_desc);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -359,7 +368,7 @@ void acpi_tb_delete_all_tables(void)</div><div class='ctx'> 	 * Free memory allocated for ACPI tables</div><div class='ctx'> 	 * Memory can either be mapped or allocated</div><div class='ctx'> 	 */</div><div class='del'>-	for (type = 0; type &lt; NUM_ACPI_TABLE_TYPES; type++) {</div><div class='add'>+	for (type = 0; type &lt; (ACPI_TABLE_ID_MAX + 1); type++) {</div><div class='ctx'> 		acpi_tb_delete_tables_by_type(type);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -383,9 +392,9 @@ void acpi_tb_delete_tables_by_type(acpi_table_type type)</div><div class='ctx'> 	u32 count;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("tb_delete_tables_by_type", type);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(tb_delete_tables_by_type, type);</div><div class='ctx'> </div><div class='del'>-	if (type &gt; ACPI_TABLE_MAX) {</div><div class='add'>+	if (type &gt; ACPI_TABLE_ID_MAX) {</div><div class='ctx'> 		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -396,28 +405,28 @@ void acpi_tb_delete_tables_by_type(acpi_table_type type)</div><div class='ctx'> 	/* Clear the appropriate "typed" global table pointer */</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='del'>-	case ACPI_TABLE_RSDP:</div><div class='add'>+	case ACPI_TABLE_ID_RSDP:</div><div class='ctx'> 		acpi_gbl_RSDP = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_DSDT:</div><div class='add'>+	case ACPI_TABLE_ID_DSDT:</div><div class='ctx'> 		acpi_gbl_DSDT = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_FADT:</div><div class='add'>+	case ACPI_TABLE_ID_FADT:</div><div class='ctx'> 		acpi_gbl_FADT = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_FACS:</div><div class='add'>+	case ACPI_TABLE_ID_FACS:</div><div class='ctx'> 		acpi_gbl_FACS = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_XSDT:</div><div class='add'>+	case ACPI_TABLE_ID_XSDT:</div><div class='ctx'> 		acpi_gbl_XSDT = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_SSDT:</div><div class='del'>-	case ACPI_TABLE_PSDT:</div><div class='add'>+	case ACPI_TABLE_ID_SSDT:</div><div class='add'>+	case ACPI_TABLE_ID_PSDT:</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -471,7 +480,7 @@ void acpi_tb_delete_single_table(struct acpi_table_desc *table_desc)</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_MEM_ALLOCATED:</div><div class='ctx'> </div><div class='del'>-		ACPI_MEM_FREE(table_desc-&gt;pointer);</div><div class='add'>+		ACPI_FREE(table_desc-&gt;pointer);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_MEM_MAPPED:</div><div class='hunk'>@@ -503,7 +512,7 @@ struct acpi_table_desc *acpi_tb_uninstall_table(struct acpi_table_desc</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_desc *next_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("tb_uninstall_table", table_desc);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(tb_uninstall_table, table_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (!table_desc) {</div><div class='ctx'> 		return_PTR(NULL);</div><div class='hunk'>@@ -527,10 +536,14 @@ struct acpi_table_desc *acpi_tb_uninstall_table(struct acpi_table_desc</div><div class='ctx'> </div><div class='ctx'> 	acpi_tb_delete_single_table(table_desc);</div><div class='ctx'> </div><div class='add'>+	/* Free the owner ID associated with this table */</div><div class='add'>+</div><div class='add'>+	acpi_ut_release_owner_id(&amp;table_desc-&gt;owner_id);</div><div class='add'>+</div><div class='ctx'> 	/* Free the table descriptor */</div><div class='ctx'> </div><div class='ctx'> 	next_desc = table_desc-&gt;next;</div><div class='del'>-	ACPI_MEM_FREE(table_desc);</div><div class='add'>+	ACPI_FREE(table_desc);</div><div class='ctx'> </div><div class='ctx'> 	/* Return pointer to the next descriptor */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c<br/>index 4d308220225d..0ad3dbb9ebca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbrsdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbrsdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbrsdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbrsdt.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct rsdp_descriptor *rsdp;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_verify_rsdp");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_verify_rsdp);</div><div class='ctx'> </div><div class='ctx'> 	switch (address-&gt;pointer_type) {</div><div class='ctx'> 	case ACPI_LOGICAL_POINTER:</div><div class='hunk'>@@ -78,7 +78,7 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)</div><div class='ctx'> 		 */</div><div class='ctx'> 		status = acpi_os_map_memory(address-&gt;pointer.physical,</div><div class='ctx'> 					    sizeof(struct rsdp_descriptor),</div><div class='del'>-					    (void *)&amp;rsdp);</div><div class='add'>+					    ACPI_CAST_PTR(void, &amp;rsdp));</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -95,15 +95,20 @@ acpi_status acpi_tb_verify_rsdp(struct acpi_pointer *address)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The RSDP supplied is OK */</div><div class='add'>+	/* RSDP is ok. Init the table info */</div><div class='ctx'> </div><div class='ctx'> 	table_info.pointer = ACPI_CAST_PTR(struct acpi_table_header, rsdp);</div><div class='ctx'> 	table_info.length = sizeof(struct rsdp_descriptor);</div><div class='del'>-	table_info.allocation = ACPI_MEM_MAPPED;</div><div class='add'>+</div><div class='add'>+	if (address-&gt;pointer_type == ACPI_PHYSICAL_POINTER) {</div><div class='add'>+		table_info.allocation = ACPI_MEM_MAPPED;</div><div class='add'>+	} else {</div><div class='add'>+		table_info.allocation = ACPI_MEM_NOT_ALLOCATED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Save the table pointers and allocation info */</div><div class='ctx'> </div><div class='del'>-	status = acpi_tb_init_table_descriptor(ACPI_TABLE_RSDP, &amp;table_info);</div><div class='add'>+	status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_RSDP, &amp;table_info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -174,22 +179,31 @@ void acpi_tb_get_rsdt_address(struct acpi_pointer *out_address)</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)</div><div class='ctx'> {</div><div class='del'>-	int no_match;</div><div class='add'>+	char *signature;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Search for appropriate signature, RSDT or XSDT</div><div class='del'>-	 */</div><div class='add'>+	/* Validate minimum length */</div><div class='add'>+</div><div class='add'>+	if (table_ptr-&gt;length &lt; sizeof(struct acpi_table_header)) {</div><div class='add'>+		ACPI_ERROR((AE_INFO,</div><div class='add'>+			    "RSDT/XSDT length (%X) is smaller than minimum (%X)",</div><div class='add'>+			    table_ptr-&gt;length,</div><div class='add'>+			    sizeof(struct acpi_table_header)));</div><div class='add'>+</div><div class='add'>+		return (AE_INVALID_TABLE_LENGTH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Search for appropriate signature, RSDT or XSDT */</div><div class='add'>+</div><div class='ctx'> 	if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {</div><div class='del'>-		no_match = ACPI_STRNCMP((char *)table_ptr, RSDT_SIG,</div><div class='del'>-					sizeof(RSDT_SIG) - 1);</div><div class='add'>+		signature = RSDT_SIG;</div><div class='ctx'> 	} else {</div><div class='del'>-		no_match = ACPI_STRNCMP((char *)table_ptr, XSDT_SIG,</div><div class='del'>-					sizeof(XSDT_SIG) - 1);</div><div class='add'>+		signature = XSDT_SIG;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (no_match) {</div><div class='add'>+	if (!ACPI_COMPARE_NAME(table_ptr-&gt;signature, signature)) {</div><div class='add'>+</div><div class='ctx'> 		/* Invalid RSDT or XSDT signature */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -198,10 +212,8 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)</div><div class='ctx'> 		ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "RSDT/XSDT signature at %X (%p) is invalid",</div><div class='del'>-			    acpi_gbl_RSDP-&gt;rsdt_physical_address,</div><div class='del'>-			    (void *)(acpi_native_uint) acpi_gbl_RSDP-&gt;</div><div class='del'>-			    rsdt_physical_address));</div><div class='add'>+			    "RSDT/XSDT signature at %X is invalid",</div><div class='add'>+			    acpi_gbl_RSDP-&gt;rsdt_physical_address));</div><div class='ctx'> </div><div class='ctx'> 		if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO, "Looking for RSDT"));</div><div class='hunk'>@@ -209,7 +221,7 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)</div><div class='ctx'> 			ACPI_ERROR((AE_INFO, "Looking for XSDT"));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ACPI_DUMP_BUFFER((char *)table_ptr, 48);</div><div class='add'>+		ACPI_DUMP_BUFFER(ACPI_CAST_PTR(char, table_ptr), 48);</div><div class='ctx'> 		return (AE_BAD_SIGNATURE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -234,13 +246,13 @@ acpi_status acpi_tb_get_table_rsdt(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_pointer address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_get_table_rsdt");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_get_table_rsdt);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the RSDT/XSDT via the RSDP */</div><div class='ctx'> </div><div class='ctx'> 	acpi_tb_get_rsdt_address(&amp;address);</div><div class='ctx'> </div><div class='del'>-	table_info.type = ACPI_TABLE_XSDT;</div><div class='add'>+	table_info.type = ACPI_TABLE_ID_XSDT;</div><div class='ctx'> 	status = acpi_tb_get_table(&amp;address, &amp;table_info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_EXCEPTION((AE_INFO, status,</div><div class='hunk'>@@ -257,7 +269,7 @@ acpi_status acpi_tb_get_table_rsdt(void)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_tb_validate_rsdt(table_info.pointer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto error_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the number of tables defined in the RSDT or XSDT */</div><div class='hunk'>@@ -269,18 +281,27 @@ acpi_status acpi_tb_get_table_rsdt(void)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_tb_convert_to_xsdt(&amp;table_info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto error_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Save the table pointers and allocation info */</div><div class='ctx'> </div><div class='del'>-	status = acpi_tb_init_table_descriptor(ACPI_TABLE_XSDT, &amp;table_info);</div><div class='add'>+	status = acpi_tb_init_table_descriptor(ACPI_TABLE_ID_XSDT, &amp;table_info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto error_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_gbl_XSDT = ACPI_CAST_PTR(XSDT_DESCRIPTOR, table_info.pointer);</div><div class='add'>+	acpi_gbl_XSDT =</div><div class='add'>+	    ACPI_CAST_PTR(struct xsdt_descriptor, table_info.pointer);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "XSDT located at %p\n", acpi_gbl_XSDT));</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='add'>+</div><div class='add'>+      error_cleanup:</div><div class='add'>+</div><div class='add'>+	/* Free table allocated by acpi_tb_get_table */</div><div class='add'>+</div><div class='add'>+	acpi_tb_delete_single_table(&amp;table_info);</div><div class='add'>+</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c<br/>index bc571592f087..209a401801e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbutils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbutils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbutils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbutils.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@ acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_is_table_installed");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_is_table_installed);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the list descriptor and first table descriptor */</div><div class='ctx'> </div><div class='hunk'>@@ -96,10 +96,11 @@ acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)</div><div class='ctx'> 		    (!ACPI_MEMCMP</div><div class='ctx'> 		     (table_desc-&gt;pointer, new_table_desc-&gt;pointer,</div><div class='ctx'> 		      new_table_desc-&gt;pointer-&gt;length))) {</div><div class='add'>+</div><div class='ctx'> 			/* Match: this table is already installed */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_TABLES,</div><div class='del'>-					  "Table [%4.4s] already installed: Rev %X oem_table_id [%8.8s]\n",</div><div class='add'>+					  "Table [%4.4s] already installed: Rev %X OemTableId [%8.8s]\n",</div><div class='ctx'> 					  new_table_desc-&gt;pointer-&gt;signature,</div><div class='ctx'> 					  new_table_desc-&gt;pointer-&gt;revision,</div><div class='ctx'> 					  new_table_desc-&gt;pointer-&gt;</div><div class='hunk'>@@ -159,12 +160,8 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_MOVE_32_TO_32(&amp;signature, table_header-&gt;signature);</div><div class='ctx'> 	if (!acpi_ut_valid_acpi_name(signature)) {</div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Table signature at %p [%p] has invalid characters",</div><div class='del'>-			    table_header, &amp;signature));</div><div class='del'>-</div><div class='del'>-		ACPI_WARNING((AE_INFO, "Invalid table signature found: [%4.4s]",</div><div class='del'>-			      ACPI_CAST_PTR(char, &amp;signature)));</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid table signature 0x%8.8X",</div><div class='add'>+			    signature));</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DUMP_BUFFER(table_header,</div><div class='ctx'> 				 sizeof(struct acpi_table_header));</div><div class='hunk'>@@ -175,12 +172,9 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)</div><div class='ctx'> </div><div class='ctx'> 	if (table_header-&gt;length &lt; sizeof(struct acpi_table_header)) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Invalid length in table header %p name %4.4s",</div><div class='del'>-			    table_header, (char *)&amp;signature));</div><div class='del'>-</div><div class='del'>-		ACPI_WARNING((AE_INFO,</div><div class='del'>-			      "Invalid table header length (0x%X) found",</div><div class='del'>-			      (u32) table_header-&gt;length));</div><div class='add'>+			    "Invalid length 0x%X in table with signature %4.4s",</div><div class='add'>+			    (u32) table_header-&gt;length,</div><div class='add'>+			    ACPI_CAST_PTR(char, &amp;signature)));</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DUMP_BUFFER(table_header,</div><div class='ctx'> 				 sizeof(struct acpi_table_header));</div><div class='hunk'>@@ -192,72 +186,119 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_tb_verify_table_checksum</div><div class='add'>+ * FUNCTION:    acpi_tb_sum_table</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  *table_header           - ACPI table to verify</div><div class='add'>+ * PARAMETERS:  Buffer              - Buffer to sum</div><div class='add'>+ *              Length              - Size of the buffer</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      8 bit checksum of table</div><div class='add'>+ * RETURN:      8 bit sum of buffer</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Does an 8 bit checksum of table and returns status.  A correct</div><div class='del'>- *              table should have a checksum of 0.</div><div class='add'>+ * DESCRIPTION: Computes an 8 bit sum of the buffer(length) and returns it.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-acpi_status</div><div class='del'>-acpi_tb_verify_table_checksum(struct acpi_table_header * table_header)</div><div class='add'>+u8 acpi_tb_sum_table(void *buffer, u32 length)</div><div class='add'>+{</div><div class='add'>+	acpi_native_uint i;</div><div class='add'>+	u8 sum = 0;</div><div class='add'>+</div><div class='add'>+	if (!buffer || !length) {</div><div class='add'>+		return (0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		sum = (u8) (sum + ((u8 *) buffer)[i]);</div><div class='add'>+	}</div><div class='add'>+	return (sum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_tb_generate_checksum</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Table               - Pointer to a valid ACPI table (with a</div><div class='add'>+ *                                    standard ACPI header)</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      8 bit checksum of buffer</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Computes an 8 bit checksum of the table.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+u8 acpi_tb_generate_checksum(struct acpi_table_header * table)</div><div class='ctx'> {</div><div class='ctx'> 	u8 checksum;</div><div class='del'>-	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_verify_table_checksum");</div><div class='add'>+	/* Sum the entire table as-is */</div><div class='ctx'> </div><div class='del'>-	/* Compute the checksum on the table */</div><div class='add'>+	checksum = acpi_tb_sum_table(table, table-&gt;length);</div><div class='ctx'> </div><div class='del'>-	checksum =</div><div class='del'>-	    acpi_tb_generate_checksum(table_header, table_header-&gt;length);</div><div class='add'>+	/* Subtract off the existing checksum value in the table */</div><div class='ctx'> </div><div class='del'>-	/* Return the appropriate exception */</div><div class='add'>+	checksum = (u8) (checksum - table-&gt;checksum);</div><div class='ctx'> </div><div class='del'>-	if (checksum) {</div><div class='del'>-		ACPI_WARNING((AE_INFO,</div><div class='del'>-			      "Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)",</div><div class='del'>-			      table_header-&gt;signature,</div><div class='del'>-			      (u32) table_header-&gt;checksum, (u32) checksum));</div><div class='add'>+	/* Compute the final checksum */</div><div class='ctx'> </div><div class='del'>-		status = AE_BAD_CHECKSUM;</div><div class='del'>-	}</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	checksum = (u8) (0 - checksum);</div><div class='add'>+	return (checksum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_tb_generate_checksum</div><div class='add'>+ * FUNCTION:    acpi_tb_set_checksum</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Buffer              - Buffer to checksum</div><div class='del'>- *              Length              - Size of the buffer</div><div class='add'>+ * PARAMETERS:  Table               - Pointer to a valid ACPI table (with a</div><div class='add'>+ *                                    standard ACPI header)</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      8 bit checksum of buffer</div><div class='add'>+ * RETURN:      None. Sets the table checksum field</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Computes an 8 bit checksum of the buffer(length) and returns it.</div><div class='add'>+ * DESCRIPTION: Computes an 8 bit checksum of the table and inserts the</div><div class='add'>+ *              checksum into the table header.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-u8 acpi_tb_generate_checksum(void *buffer, u32 length)</div><div class='add'>+void acpi_tb_set_checksum(struct acpi_table_header *table)</div><div class='ctx'> {</div><div class='del'>-	u8 *end_buffer;</div><div class='del'>-	u8 *rover;</div><div class='del'>-	u8 sum = 0;</div><div class='ctx'> </div><div class='del'>-	if (buffer &amp;&amp; length) {</div><div class='del'>-		/*  Buffer and Length are valid   */</div><div class='add'>+	table-&gt;checksum = acpi_tb_generate_checksum(table);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		end_buffer = ACPI_ADD_PTR(u8, buffer, length);</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_tb_verify_table_checksum</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  *table_header           - ACPI table to verify</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      8 bit checksum of table</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Generates an 8 bit checksum of table and returns and compares</div><div class='add'>+ *              it to the existing checksum value.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-		for (rover = buffer; rover &lt; end_buffer; rover++) {</div><div class='del'>-			sum = (u8) (sum + *rover);</div><div class='del'>-		}</div><div class='add'>+acpi_status</div><div class='add'>+acpi_tb_verify_table_checksum(struct acpi_table_header *table_header)</div><div class='add'>+{</div><div class='add'>+	u8 checksum;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_verify_table_checksum);</div><div class='add'>+</div><div class='add'>+	/* Compute the checksum on the table */</div><div class='add'>+</div><div class='add'>+	checksum = acpi_tb_generate_checksum(table_header);</div><div class='add'>+</div><div class='add'>+	/* Checksum ok? */</div><div class='add'>+</div><div class='add'>+	if (checksum == table_header-&gt;checksum) {</div><div class='add'>+		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='del'>-	return (sum);</div><div class='add'>+</div><div class='add'>+	ACPI_WARNING((AE_INFO,</div><div class='add'>+		      "Incorrect checksum in table [%4.4s] - is %2.2X, should be %2.2X",</div><div class='add'>+		      table_header-&gt;signature, table_header-&gt;checksum,</div><div class='add'>+		      checksum));</div><div class='add'>+</div><div class='add'>+	return_ACPI_STATUS(AE_BAD_CHECKSUM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_OBSOLETE_FUNCTIONS</div><div class='hunk'>@@ -276,12 +317,12 @@ u8 acpi_tb_generate_checksum(void *buffer, u32 length)</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_tb_handle_to_object(u16 table_id,</div><div class='del'>-			 struct acpi_table_desc ** return_table_desc)</div><div class='add'>+			 struct acpi_table_desc **return_table_desc)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("tb_handle_to_object");</div><div class='add'>+	ACPI_FUNCTION_NAME(tb_handle_to_object);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ACPI_TABLE_MAX; i++) {</div><div class='ctx'> 		table_desc = acpi_gbl_table_lists[i].next;</div><div class='hunk'>@@ -295,7 +336,7 @@ acpi_tb_handle_to_object(u16 table_id,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ACPI_ERROR((AE_INFO, "table_id=%X does not exist", table_id));</div><div class='add'>+	ACPI_ERROR((AE_INFO, "TableId=%X does not exist", table_id));</div><div class='ctx'> 	return (AE_BAD_PARAMETER);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c<br/>index 9fe53c9d5b9a..7767987be15a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbxface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbxface.c</a></div><div class='hunk'>@@ -42,8 +42,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> #include &lt;acpi/actables.h&gt;</div><div class='hunk'>@@ -68,7 +66,7 @@ acpi_status acpi_load_tables(void)</div><div class='ctx'> 	struct acpi_pointer rsdp_address;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_load_tables");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_load_tables);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the RSDP */</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +121,8 @@ acpi_status acpi_load_tables(void)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_load_tables)</div><div class='add'>+</div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -134,19 +134,18 @@ acpi_status acpi_load_tables(void)</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION: This function is called to load a table from the caller's</div><div class='del'>- *              buffer.  The buffer must contain an entire ACPI Table including</div><div class='del'>- *              a valid header.  The header fields will be verified, and if it</div><div class='add'>+ *              buffer. The buffer must contain an entire ACPI Table including</div><div class='add'>+ *              a valid header. The header fields will be verified, and if it</div><div class='ctx'>  *              is determined that the table is invalid, the call will fail.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_load_table(struct acpi_table_header *table_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_table_desc table_info;</div><div class='ctx'> 	struct acpi_pointer address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_load_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_load_table);</div><div class='ctx'> </div><div class='ctx'> 	if (!table_ptr) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -174,6 +173,7 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)</div><div class='ctx'> 	status = acpi_tb_install_table(&amp;table_info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		if (status == AE_ALREADY_EXISTS) {</div><div class='add'>+</div><div class='ctx'> 			/* Table already exists, no error */</div><div class='ctx'> </div><div class='ctx'> 			status = AE_OK;</div><div class='hunk'>@@ -188,12 +188,12 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)</div><div class='ctx'> 	/* Convert the table to common format if necessary */</div><div class='ctx'> </div><div class='ctx'> 	switch (table_info.type) {</div><div class='del'>-	case ACPI_TABLE_FADT:</div><div class='add'>+	case ACPI_TABLE_ID_FADT:</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_tb_convert_table_fadt();</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ACPI_TABLE_FACS:</div><div class='add'>+	case ACPI_TABLE_ID_FACS:</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_tb_build_common_facs(&amp;table_info);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -208,6 +208,7 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* Uninstall table and free the buffer */</div><div class='ctx'> </div><div class='ctx'> 		(void)acpi_tb_uninstall_table(table_info.installed_desc);</div><div class='hunk'>@@ -216,6 +217,8 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_load_table)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_unload_table</div><div class='hunk'>@@ -227,31 +230,33 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)</div><div class='ctx'>  * DESCRIPTION: This routine is used to force the unload of a table</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_unload_table(acpi_table_type table_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_desc *table_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_unload_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_unload_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='del'>-	if (table_type &gt; ACPI_TABLE_MAX) {</div><div class='add'>+	if (table_type &gt; ACPI_TABLE_ID_MAX) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Find all tables of the requested type */</div><div class='ctx'> </div><div class='ctx'> 	table_desc = acpi_gbl_table_lists[table_type].next;</div><div class='add'>+	if (!table_desc) {</div><div class='add'>+		return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	while (table_desc) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * Delete all namespace entries owned by this table.  Note that these</div><div class='del'>-		 * entries can appear anywhere in the namespace by virtue of the AML</div><div class='del'>-		 * "Scope" operator.  Thus, we need to track ownership by an ID, not</div><div class='add'>+		 * Delete all namespace objects owned by this table. Note that these</div><div class='add'>+		 * objects can appear anywhere in the namespace by virtue of the AML</div><div class='add'>+		 * "Scope" operator. Thus, we need to track ownership by an ID, not</div><div class='ctx'> 		 * simply a position within the hierarchy</div><div class='ctx'> 		 */</div><div class='ctx'> 		acpi_ns_delete_namespace_by_owner(table_desc-&gt;owner_id);</div><div class='del'>-		acpi_ut_release_owner_id(&amp;table_desc-&gt;owner_id);</div><div class='ctx'> 		table_desc = table_desc-&gt;next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -261,6 +266,8 @@ acpi_status acpi_unload_table(acpi_table_type table_type)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_unload_table)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_table_header</div><div class='hunk'>@@ -271,17 +278,16 @@ acpi_status acpi_unload_table(acpi_table_type table_type)</div><div class='ctx'>  *                                see acpi_gbl_acpi_table_flag</div><div class='ctx'>  *              out_table_header - pointer to the struct acpi_table_header if successful</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: This function is called to get an ACPI table header.  The caller</div><div class='add'>+ * DESCRIPTION: This function is called to get an ACPI table header. The caller</div><div class='ctx'>  *              supplies an pointer to a data area sufficient to contain an ACPI</div><div class='ctx'>  *              struct acpi_table_header structure.</div><div class='ctx'>  *</div><div class='ctx'>  *              The header contains a length field that can be used to determine</div><div class='del'>- *              the size of the buffer needed to contain the entire table.  This</div><div class='add'>+ *              the size of the buffer needed to contain the entire table. This</div><div class='ctx'>  *              function is not valid for the RSD PTR table since it does not</div><div class='ctx'>  *              have a standard header and is fixed length.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_table_header(acpi_table_type table_type,</div><div class='ctx'> 		      u32 instance, struct acpi_table_header *out_table_header)</div><div class='hunk'>@@ -289,16 +295,16 @@ acpi_get_table_header(acpi_table_type table_type,</div><div class='ctx'> 	struct acpi_table_header *tbl_ptr;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_table_header");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_table_header);</div><div class='ctx'> </div><div class='ctx'> 	if ((instance == 0) ||</div><div class='del'>-	    (table_type == ACPI_TABLE_RSDP) || (!out_table_header)) {</div><div class='add'>+	    (table_type == ACPI_TABLE_ID_RSDP) || (!out_table_header)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check the table type and instance */</div><div class='ctx'> </div><div class='del'>-	if ((table_type &gt; ACPI_TABLE_MAX) ||</div><div class='add'>+	if ((table_type &gt; ACPI_TABLE_ID_MAX) ||</div><div class='ctx'> 	    (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) &amp;&amp;</div><div class='ctx'> 	     instance &gt; 1)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -319,12 +325,14 @@ acpi_get_table_header(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the header to the caller's buffer */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEMCPY((void *)out_table_header, (void *)tbl_ptr,</div><div class='add'>+	ACPI_MEMCPY(ACPI_CAST_PTR(void, out_table_header),</div><div class='add'>+		    ACPI_CAST_PTR(void, tbl_ptr),</div><div class='ctx'> 		    sizeof(struct acpi_table_header));</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_table_header)</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -340,16 +348,15 @@ acpi_get_table_header(acpi_table_type table_type,</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: This function is called to get an ACPI table.  The caller</div><div class='add'>+ * DESCRIPTION: This function is called to get an ACPI table. The caller</div><div class='ctx'>  *              supplies an out_buffer large enough to contain the entire ACPI</div><div class='del'>- *              table.  The caller should call the acpi_get_table_header function</div><div class='del'>- *              first to determine the buffer size needed.  Upon completion</div><div class='add'>+ *              table. The caller should call the acpi_get_table_header function</div><div class='add'>+ *              first to determine the buffer size needed. Upon completion</div><div class='ctx'>  *              the out_buffer-&gt;Length field will indicate the number of bytes</div><div class='ctx'>  *              copied into the out_buffer-&gt;buf_ptr buffer. This table will be</div><div class='ctx'>  *              a complete table including the header.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_get_table(acpi_table_type table_type,</div><div class='ctx'> 	       u32 instance, struct acpi_buffer *ret_buffer)</div><div class='hunk'>@@ -358,7 +365,7 @@ acpi_get_table(acpi_table_type table_type,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	acpi_size table_length;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -373,7 +380,7 @@ acpi_get_table(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	/* Check the table type and instance */</div><div class='ctx'> </div><div class='del'>-	if ((table_type &gt; ACPI_TABLE_MAX) ||</div><div class='add'>+	if ((table_type &gt; ACPI_TABLE_ID_MAX) ||</div><div class='ctx'> 	    (ACPI_IS_SINGLE_TABLE(acpi_gbl_table_data[table_type].flags) &amp;&amp;</div><div class='ctx'> 	     instance &gt; 1)) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='hunk'>@@ -396,7 +403,8 @@ acpi_get_table(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	/* Get the table length */</div><div class='ctx'> </div><div class='del'>-	if (table_type == ACPI_TABLE_RSDP) {</div><div class='add'>+	if (table_type == ACPI_TABLE_ID_RSDP) {</div><div class='add'>+</div><div class='ctx'> 		/* RSD PTR is the only "table" without a header */</div><div class='ctx'> </div><div class='ctx'> 		table_length = sizeof(struct rsdp_descriptor);</div><div class='hunk'>@@ -413,8 +421,10 @@ acpi_get_table(acpi_table_type table_type,</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the table to the buffer */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEMCPY((void *)ret_buffer-&gt;pointer, (void *)tbl_ptr, table_length);</div><div class='add'>+	ACPI_MEMCPY(ACPI_CAST_PTR(void, ret_buffer-&gt;pointer),</div><div class='add'>+		    ACPI_CAST_PTR(void, tbl_ptr), table_length);</div><div class='add'>+</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_table);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_table)</div><div class='head'>diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c<br/>index a62db6af83c9..da2648bbdbc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbxfroot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/tables/tbxfroot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/tables/tbxfroot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/tables/tbxfroot.c</a></div><div class='hunk'>@@ -41,8 +41,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/actables.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -75,6 +73,7 @@ acpi_status acpi_tb_validate_rsdp(struct rsdp_descriptor *rsdp)</div><div class='ctx'> 	 *  The signature and checksum must both be correct</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ACPI_STRNCMP((char *)rsdp, RSDP_SIG, sizeof(RSDP_SIG) - 1) != 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Nope, BAD Signature */</div><div class='ctx'> </div><div class='ctx'> 		return (AE_BAD_SIGNATURE);</div><div class='hunk'>@@ -82,15 +81,14 @@ acpi_status acpi_tb_validate_rsdp(struct rsdp_descriptor *rsdp)</div><div class='ctx'> </div><div class='ctx'> 	/* Check the standard checksum */</div><div class='ctx'> </div><div class='del'>-	if (acpi_tb_generate_checksum(rsdp, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {</div><div class='add'>+	if (acpi_tb_sum_table(rsdp, ACPI_RSDP_CHECKSUM_LENGTH) != 0) {</div><div class='ctx'> 		return (AE_BAD_CHECKSUM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check extended checksum if table version &gt;= 2 */</div><div class='ctx'> </div><div class='ctx'> 	if ((rsdp-&gt;revision &gt;= 2) &amp;&amp;</div><div class='del'>-	    (acpi_tb_generate_checksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) !=</div><div class='del'>-	     0)) {</div><div class='add'>+	    (acpi_tb_sum_table(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0)) {</div><div class='ctx'> 		return (AE_BAD_CHECKSUM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -121,7 +119,7 @@ acpi_tb_find_table(char *signature,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_table_header *table;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_find_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_find_table);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate string lengths */</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +129,7 @@ acpi_tb_find_table(char *signature,</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_STRING_LIMIT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ACPI_STRNCMP(signature, DSDT_SIG, ACPI_NAME_SIZE)) {</div><div class='add'>+	if (ACPI_COMPARE_NAME(signature, DSDT_SIG)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The DSDT pointer is contained in the FADT, not the RSDT.</div><div class='ctx'> 		 * This code should suffice, because the only code that would perform</div><div class='hunk'>@@ -156,10 +154,12 @@ acpi_tb_find_table(char *signature,</div><div class='ctx'> </div><div class='ctx'> 	/* Check oem_id and oem_table_id */</div><div class='ctx'> </div><div class='del'>-	if ((oem_id[0] &amp;&amp; ACPI_STRNCMP(oem_id, table-&gt;oem_id,</div><div class='del'>-				       sizeof(table-&gt;oem_id))) ||</div><div class='del'>-	    (oem_table_id[0] &amp;&amp; ACPI_STRNCMP(oem_table_id, table-&gt;oem_table_id,</div><div class='del'>-					     sizeof(table-&gt;oem_table_id)))) {</div><div class='add'>+	if ((oem_id[0] &amp;&amp;</div><div class='add'>+	     ACPI_STRNCMP(oem_id, table-&gt;oem_id,</div><div class='add'>+			  sizeof(table-&gt;oem_id))) ||</div><div class='add'>+	    (oem_table_id[0] &amp;&amp;</div><div class='add'>+	     ACPI_STRNCMP(oem_table_id, table-&gt;oem_table_id,</div><div class='add'>+			  sizeof(table-&gt;oem_table_id)))) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_AML_NAME_NOT_FOUND);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +203,7 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	u32 j;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_firmware_table");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_firmware_table);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that at least the table manager is initialized.  We don't</div><div class='hunk'>@@ -217,6 +217,7 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> 	/* Ensure that we have a RSDP */</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_RSDP) {</div><div class='add'>+</div><div class='ctx'> 		/* Get the RSDP */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_os_get_root_pointer(flags, &amp;address);</div><div class='hunk'>@@ -261,7 +262,7 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> </div><div class='ctx'> 	/* Get and validate the RSDT */</div><div class='ctx'> </div><div class='del'>-	rsdt_info = ACPI_MEM_CALLOCATE(sizeof(struct acpi_table_desc));</div><div class='add'>+	rsdt_info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc));</div><div class='ctx'> 	if (!rsdt_info) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -278,13 +279,13 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a scratch table header and table descriptor */</div><div class='ctx'> </div><div class='del'>-	header = ACPI_MEM_ALLOCATE(sizeof(struct acpi_table_header));</div><div class='add'>+	header = ACPI_ALLOCATE(sizeof(struct acpi_table_header));</div><div class='ctx'> 	if (!header) {</div><div class='ctx'> 		status = AE_NO_MEMORY;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table_info = ACPI_MEM_ALLOCATE(sizeof(struct acpi_table_desc));</div><div class='add'>+	table_info = ACPI_ALLOCATE(sizeof(struct acpi_table_desc));</div><div class='ctx'> 	if (!table_info) {</div><div class='ctx'> 		status = AE_NO_MEMORY;</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -308,12 +309,12 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> 		if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {</div><div class='ctx'> 			address.pointer.value =</div><div class='ctx'> 			    (ACPI_CAST_PTR</div><div class='del'>-			     (RSDT_DESCRIPTOR,</div><div class='add'>+			     (struct rsdt_descriptor,</div><div class='ctx'> 			      rsdt_info-&gt;pointer))-&gt;table_offset_entry[i];</div><div class='ctx'> 		} else {</div><div class='ctx'> 			address.pointer.value =</div><div class='ctx'> 			    (ACPI_CAST_PTR</div><div class='del'>-			     (XSDT_DESCRIPTOR,</div><div class='add'>+			     (struct xsdt_descriptor,</div><div class='ctx'> 			      rsdt_info-&gt;pointer))-&gt;table_offset_entry[i];</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -326,11 +327,13 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> </div><div class='ctx'> 		/* Compare table signatures and table instance */</div><div class='ctx'> </div><div class='del'>-		if (!ACPI_STRNCMP(header-&gt;signature, signature, ACPI_NAME_SIZE)) {</div><div class='add'>+		if (ACPI_COMPARE_NAME(header-&gt;signature, signature)) {</div><div class='add'>+</div><div class='ctx'> 			/* An instance of the table was found */</div><div class='ctx'> </div><div class='ctx'> 			j++;</div><div class='ctx'> 			if (j &gt;= instance) {</div><div class='add'>+</div><div class='ctx'> 				/* Found the correct instance, get the entire table */</div><div class='ctx'> </div><div class='ctx'> 				status =</div><div class='hunk'>@@ -355,23 +358,21 @@ acpi_get_firmware_table(acpi_string signature,</div><div class='ctx'> 		acpi_os_unmap_memory(rsdt_info-&gt;pointer,</div><div class='ctx'> 				     (acpi_size) rsdt_info-&gt;pointer-&gt;length);</div><div class='ctx'> 	}</div><div class='del'>-	ACPI_MEM_FREE(rsdt_info);</div><div class='add'>+	ACPI_FREE(rsdt_info);</div><div class='ctx'> </div><div class='ctx'> 	if (header) {</div><div class='del'>-		ACPI_MEM_FREE(header);</div><div class='add'>+		ACPI_FREE(header);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (table_info) {</div><div class='del'>-		ACPI_MEM_FREE(table_info);</div><div class='add'>+		ACPI_FREE(table_info);</div><div class='ctx'> 	}</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_firmware_table);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_firmware_table)</div><div class='ctx'> </div><div class='ctx'> /* TBD: Move to a new file */</div><div class='del'>-</div><div class='ctx'> #if ACPI_MACHINE_WIDTH != 16</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_find_root_pointer</div><div class='hunk'>@@ -384,13 +385,12 @@ EXPORT_SYMBOL(acpi_get_firmware_table);</div><div class='ctx'>  * DESCRIPTION: Find the RSDP</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_table_desc table_info;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_find_root_pointer");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_find_root_pointer);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the RSDP */</div><div class='ctx'> </div><div class='hunk'>@@ -407,6 +407,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_find_root_pointer)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_tb_scan_memory_for_rsdp</div><div class='hunk'>@@ -419,14 +421,13 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)</div><div class='ctx'>  * DESCRIPTION: Search a block of memory for the RSDP signature</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u8 *mem_rover;</div><div class='ctx'> 	u8 *end_address;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_scan_memory_for_rsdp");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_scan_memory_for_rsdp);</div><div class='ctx'> </div><div class='ctx'> 	end_address = start_address + length;</div><div class='ctx'> </div><div class='hunk'>@@ -434,12 +435,14 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)</div><div class='ctx'> </div><div class='ctx'> 	for (mem_rover = start_address; mem_rover &lt; end_address;</div><div class='ctx'> 	     mem_rover += ACPI_RSDP_SCAN_STEP) {</div><div class='add'>+</div><div class='ctx'> 		/* The RSDP signature and checksum must both be correct */</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='ctx'> 		    acpi_tb_validate_rsdp(ACPI_CAST_PTR</div><div class='ctx'> 					  (struct rsdp_descriptor, mem_rover));</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='ctx'> 			/* Sig and checksum valid, we have found a real RSDP */</div><div class='ctx'> </div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='hunk'>@@ -469,10 +472,10 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status, RSDP physical address</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: search lower 1_mbyte of memory for the root system descriptor</div><div class='add'>+ * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor</div><div class='ctx'>  *              pointer structure.  If it is found, set *RSDP to point to it.</div><div class='ctx'>  *</div><div class='del'>- *              NOTE1: The RSDp must be either in the first 1_k of the Extended</div><div class='add'>+ *              NOTE1: The RSDP must be either in the first 1_k of the Extended</div><div class='ctx'>  *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)</div><div class='ctx'>  *              Only a 32-bit physical address is necessary.</div><div class='ctx'>  *</div><div class='hunk'>@@ -489,12 +492,13 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> 	u32 physical_address;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("tb_find_rsdp");</div><div class='add'>+	ACPI_FUNCTION_TRACE(tb_find_rsdp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Scan supports either logical addressing or physical addressing</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((flags &amp; ACPI_MEMORY_MODE) == ACPI_LOGICAL_ADDRESSING) {</div><div class='add'>+</div><div class='ctx'> 		/* 1a) Get the location of the Extended BIOS Data Area (EBDA) */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_os_map_memory((acpi_physical_address)</div><div class='hunk'>@@ -521,7 +525,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> </div><div class='ctx'> 		if (physical_address &gt; 0x400) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * 1b) Search EBDA paragraphs (EBDa is required to be a</div><div class='add'>+			 * 1b) Search EBDA paragraphs (EBDA is required to be a</div><div class='ctx'> 			 *     minimum of 1_k length)</div><div class='ctx'> 			 */</div><div class='ctx'> 			status = acpi_os_map_memory((acpi_physical_address)</div><div class='hunk'>@@ -542,10 +546,11 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> 			acpi_os_unmap_memory(table_ptr, ACPI_EBDA_WINDOW_SIZE);</div><div class='ctx'> </div><div class='ctx'> 			if (mem_rover) {</div><div class='add'>+</div><div class='ctx'> 				/* Return the physical address */</div><div class='ctx'> </div><div class='ctx'> 				physical_address +=</div><div class='del'>-				    ACPI_PTR_DIFF(mem_rover, table_ptr);</div><div class='add'>+				    (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);</div><div class='ctx'> </div><div class='ctx'> 				table_info-&gt;physical_address =</div><div class='ctx'> 				    (acpi_physical_address) physical_address;</div><div class='hunk'>@@ -576,11 +581,12 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> 		acpi_os_unmap_memory(table_ptr, ACPI_HI_RSDP_WINDOW_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		if (mem_rover) {</div><div class='add'>+</div><div class='ctx'> 			/* Return the physical address */</div><div class='ctx'> </div><div class='del'>-			physical_address =</div><div class='del'>-			    ACPI_HI_RSDP_WINDOW_BASE + ACPI_PTR_DIFF(mem_rover,</div><div class='del'>-								     table_ptr);</div><div class='add'>+			physical_address = (u32)</div><div class='add'>+			    (ACPI_HI_RSDP_WINDOW_BASE +</div><div class='add'>+			     ACPI_PTR_DIFF(mem_rover, table_ptr));</div><div class='ctx'> </div><div class='ctx'> 			table_info-&gt;physical_address =</div><div class='ctx'> 			    (acpi_physical_address) physical_address;</div><div class='hunk'>@@ -601,7 +607,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> </div><div class='ctx'> 		if (physical_address &gt; 0x400) {</div><div class='ctx'> 			/*</div><div class='del'>-			 * 1b) Search EBDA paragraphs (EBDa is required to be a minimum of</div><div class='add'>+			 * 1b) Search EBDA paragraphs (EBDA is required to be a minimum of</div><div class='ctx'> 			 *     1_k length)</div><div class='ctx'> 			 */</div><div class='ctx'> 			mem_rover =</div><div class='hunk'>@@ -609,6 +615,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> 							 (physical_address),</div><div class='ctx'> 							 ACPI_EBDA_WINDOW_SIZE);</div><div class='ctx'> 			if (mem_rover) {</div><div class='add'>+</div><div class='ctx'> 				/* Return the physical address */</div><div class='ctx'> </div><div class='ctx'> 				table_info-&gt;physical_address =</div><div class='hunk'>@@ -624,6 +631,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)</div><div class='ctx'> 						 (ACPI_HI_RSDP_WINDOW_BASE),</div><div class='ctx'> 						 ACPI_HI_RSDP_WINDOW_SIZE);</div><div class='ctx'> 		if (mem_rover) {</div><div class='add'>+</div><div class='ctx'> 			/* Found it, return the physical address */</div><div class='ctx'> </div><div class='ctx'> 			table_info-&gt;physical_address =</div><div class='head'>diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c<br/>index 19f3ea48475e..5753d06b7860 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/thermal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/thermal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/thermal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/thermal.c</a></div><div class='hunk'>@@ -82,6 +82,7 @@ MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_add(struct acpi_device *device);</div><div class='ctx'> static int acpi_thermal_remove(struct acpi_device *device, int type);</div><div class='add'>+static int acpi_thermal_resume(struct acpi_device *device, int state);</div><div class='ctx'> static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);</div><div class='ctx'> static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);</div><div class='ctx'> static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);</div><div class='hunk'>@@ -103,6 +104,7 @@ static struct acpi_driver acpi_thermal_driver = {</div><div class='ctx'> 	.ops = {</div><div class='ctx'> 		.add = acpi_thermal_add,</div><div class='ctx'> 		.remove = acpi_thermal_remove,</div><div class='add'>+		.resume = acpi_thermal_resume,</div><div class='ctx'> 		},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +162,7 @@ struct acpi_thermal_flags {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_thermal {</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device * device;</div><div class='ctx'> 	acpi_bus_id name;</div><div class='ctx'> 	unsigned long temperature;</div><div class='ctx'> 	unsigned long last_temperature;</div><div class='hunk'>@@ -174,21 +176,21 @@ struct acpi_thermal {</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_thermal_state_fops = {</div><div class='add'>+static const struct file_operations acpi_thermal_state_fops = {</div><div class='ctx'> 	.open = acpi_thermal_state_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='ctx'> 	.release = single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_thermal_temp_fops = {</div><div class='add'>+static const struct file_operations acpi_thermal_temp_fops = {</div><div class='ctx'> 	.open = acpi_thermal_temp_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.llseek = seq_lseek,</div><div class='ctx'> 	.release = single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_thermal_trip_fops = {</div><div class='add'>+static const struct file_operations acpi_thermal_trip_fops = {</div><div class='ctx'> 	.open = acpi_thermal_trip_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_thermal_write_trip_points,</div><div class='hunk'>@@ -196,7 +198,7 @@ static struct file_operations acpi_thermal_trip_fops = {</div><div class='ctx'> 	.release = single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_thermal_cooling_fops = {</div><div class='add'>+static const struct file_operations acpi_thermal_cooling_fops = {</div><div class='ctx'> 	.open = acpi_thermal_cooling_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_thermal_write_cooling_mode,</div><div class='hunk'>@@ -204,7 +206,7 @@ static struct file_operations acpi_thermal_cooling_fops = {</div><div class='ctx'> 	.release = single_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations acpi_thermal_polling_fops = {</div><div class='add'>+static const struct file_operations acpi_thermal_polling_fops = {</div><div class='ctx'> 	.open = acpi_thermal_polling_open_fs,</div><div class='ctx'> 	.read = seq_read,</div><div class='ctx'> 	.write = acpi_thermal_write_polling,</div><div class='hunk'>@@ -220,51 +222,48 @@ static int acpi_thermal_get_temperature(struct acpi_thermal *tz)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_get_temperature");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tz-&gt;last_temperature = tz-&gt;temperature;</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_evaluate_integer(tz-&gt;handle, "_TMP", NULL, &amp;tz-&gt;temperature);</div><div class='add'>+	    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_TMP", NULL, &amp;tz-&gt;temperature);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Temperature is %lu dK\n",</div><div class='ctx'> 			  tz-&gt;temperature));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_get_polling_frequency(struct acpi_thermal *tz)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_get_polling_frequency");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_evaluate_integer(tz-&gt;handle, "_TZP", NULL,</div><div class='add'>+	    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_TZP", NULL,</div><div class='ctx'> 				  &amp;tz-&gt;polling_frequency);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Polling frequency is %lu dS\n",</div><div class='ctx'> 			  tz-&gt;polling_frequency));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_set_polling(struct acpi_thermal *tz, int seconds)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_set_polling");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tz-&gt;polling_frequency = seconds * 10;	/* Convert value to deci-seconds */</div><div class='ctx'> </div><div class='hunk'>@@ -272,7 +271,7 @@ static int acpi_thermal_set_polling(struct acpi_thermal *tz, int seconds)</div><div class='ctx'> 			  "Polling frequency set to %lu seconds\n",</div><div class='ctx'> 			  tz-&gt;polling_frequency));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)</div><div class='hunk'>@@ -282,29 +281,28 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)</div><div class='ctx'> 	struct acpi_object_list arg_list = { 1, &amp;arg0 };</div><div class='ctx'> 	acpi_handle handle = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_set_cooling_mode");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_handle(tz-&gt;handle, "_SCP", &amp;handle);</div><div class='add'>+	status = acpi_get_handle(tz-&gt;device-&gt;handle, "_SCP", &amp;handle);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_SCP not present\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arg0.integer.value = mode;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(handle, NULL, &amp;arg_list, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	tz-&gt;cooling_mode = mode;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cooling mode [%s]\n",</div><div class='ctx'> 			  mode ? "passive" : "active"));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='hunk'>@@ -312,19 +310,18 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_get_trip_points");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Critical Shutdown (required) */</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(tz-&gt;handle, "_CRT", NULL,</div><div class='add'>+	status = acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_CRT", NULL,</div><div class='ctx'> 				       &amp;tz-&gt;trips.critical.temperature);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		tz-&gt;trips.critical.flags.valid = 0;</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No critical threshold\n"));</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "No critical threshold"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tz-&gt;trips.critical.flags.valid = 1;</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='hunk'>@@ -335,7 +332,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='ctx'> 	/* Critical Sleep (optional) */</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_evaluate_integer(tz-&gt;handle, "_HOT", NULL,</div><div class='add'>+	    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_HOT", NULL,</div><div class='ctx'> 				  &amp;tz-&gt;trips.hot.temperature);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		tz-&gt;trips.hot.flags.valid = 0;</div><div class='hunk'>@@ -349,7 +346,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='ctx'> 	/* Passive: Processors (optional) */</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_evaluate_integer(tz-&gt;handle, "_PSV", NULL,</div><div class='add'>+	    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_PSV", NULL,</div><div class='ctx'> 				  &amp;tz-&gt;trips.passive.temperature);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		tz-&gt;trips.passive.flags.valid = 0;</div><div class='hunk'>@@ -358,32 +355,31 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='ctx'> 		tz-&gt;trips.passive.flags.valid = 1;</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_evaluate_integer(tz-&gt;handle, "_TC1", NULL,</div><div class='add'>+		    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_TC1", NULL,</div><div class='ctx'> 					  &amp;tz-&gt;trips.passive.tc1);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='ctx'> 			tz-&gt;trips.passive.flags.valid = 0;</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_evaluate_integer(tz-&gt;handle, "_TC2", NULL,</div><div class='add'>+		    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_TC2", NULL,</div><div class='ctx'> 					  &amp;tz-&gt;trips.passive.tc2);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='ctx'> 			tz-&gt;trips.passive.flags.valid = 0;</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_evaluate_integer(tz-&gt;handle, "_TSP", NULL,</div><div class='add'>+		    acpi_evaluate_integer(tz-&gt;device-&gt;handle, "_TSP", NULL,</div><div class='ctx'> 					  &amp;tz-&gt;trips.passive.tsp);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='ctx'> 			tz-&gt;trips.passive.flags.valid = 0;</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_evaluate_reference(tz-&gt;handle, "_PSL", NULL,</div><div class='add'>+		    acpi_evaluate_reference(tz-&gt;device-&gt;handle, "_PSL", NULL,</div><div class='ctx'> 					    &amp;tz-&gt;trips.passive.devices);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='ctx'> 			tz-&gt;trips.passive.flags.valid = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (!tz-&gt;trips.passive.flags.valid)</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-					  "Invalid passive threshold\n"));</div><div class='add'>+			printk(KERN_WARNING PREFIX "Invalid passive threshold\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,</div><div class='ctx'> 					  "Found passive threshold [%lu]\n",</div><div class='hunk'>@@ -397,14 +393,14 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='ctx'> 		char name[5] = { '_', 'A', 'C', ('0' + i), '\0' };</div><div class='ctx'> </div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_evaluate_integer(tz-&gt;handle, name, NULL,</div><div class='add'>+		    acpi_evaluate_integer(tz-&gt;device-&gt;handle, name, NULL,</div><div class='ctx'> 					  &amp;tz-&gt;trips.active[i].temperature);</div><div class='ctx'> 		if (ACPI_FAILURE(status))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		name[2] = 'L';</div><div class='ctx'> 		status =</div><div class='del'>-		    acpi_evaluate_reference(tz-&gt;handle, name, NULL,</div><div class='add'>+		    acpi_evaluate_reference(tz-&gt;device-&gt;handle, name, NULL,</div><div class='ctx'> 					    &amp;tz-&gt;trips.active[i].devices);</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			tz-&gt;trips.active[i].flags.valid = 1;</div><div class='hunk'>@@ -412,29 +408,27 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)</div><div class='ctx'> 					  "Found active threshold [%d]:[%lu]\n",</div><div class='ctx'> 					  i, tz-&gt;trips.active[i].temperature));</div><div class='ctx'> 		} else</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Invalid active threshold [%d]\n",</div><div class='del'>-					  i));</div><div class='add'>+			ACPI_EXCEPTION((AE_INFO, status,</div><div class='add'>+					"Invalid active threshold [%d]", i));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_get_devices(struct acpi_thermal *tz)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_get_devices");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_evaluate_reference(tz-&gt;handle, "_TZD", NULL, &amp;tz-&gt;devices);</div><div class='add'>+	    acpi_evaluate_reference(tz-&gt;device-&gt;handle, "_TZD", NULL, &amp;tz-&gt;devices);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_call_usermode(char *path)</div><div class='hunk'>@@ -442,10 +436,9 @@ static int acpi_thermal_call_usermode(char *path)</div><div class='ctx'> 	char *argv[2] = { NULL, NULL };</div><div class='ctx'> 	char *envp[3] = { NULL, NULL, NULL };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_call_usermode");</div><div class='ctx'> </div><div class='ctx'> 	if (!path)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	argv[0] = path;</div><div class='ctx'> </div><div class='hunk'>@@ -455,66 +448,48 @@ static int acpi_thermal_call_usermode(char *path)</div><div class='ctx'> </div><div class='ctx'> 	call_usermodehelper(argv[0], argv, envp, 0);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_critical(struct acpi_thermal *tz)</div><div class='ctx'> {</div><div class='del'>-	int result = 0;</div><div class='del'>-	struct acpi_device *device = NULL;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_critical");</div><div class='del'>-</div><div class='ctx'> 	if (!tz || !tz-&gt;trips.critical.flags.valid)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (tz-&gt;temperature &gt;= tz-&gt;trips.critical.temperature) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Critical trip point\n"));</div><div class='add'>+		printk(KERN_WARNING PREFIX "Critical trip point\n");</div><div class='ctx'> 		tz-&gt;trips.critical.flags.enabled = 1;</div><div class='ctx'> 	} else if (tz-&gt;trips.critical.flags.enabled)</div><div class='ctx'> 		tz-&gt;trips.critical.flags.enabled = 0;</div><div class='ctx'> </div><div class='del'>-	result = acpi_bus_get_device(tz-&gt;handle, &amp;device);</div><div class='del'>-	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_EMERG</div><div class='ctx'> 	       "Critical temperature reached (%ld C), shutting down.\n",</div><div class='ctx'> 	       KELVIN_TO_CELSIUS(tz-&gt;temperature));</div><div class='del'>-	acpi_bus_generate_event(device, ACPI_THERMAL_NOTIFY_CRITICAL,</div><div class='add'>+	acpi_bus_generate_event(tz-&gt;device, ACPI_THERMAL_NOTIFY_CRITICAL,</div><div class='ctx'> 				tz-&gt;trips.critical.flags.enabled);</div><div class='ctx'> </div><div class='ctx'> 	acpi_thermal_call_usermode(ACPI_THERMAL_PATH_POWEROFF);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_hot(struct acpi_thermal *tz)</div><div class='ctx'> {</div><div class='del'>-	int result = 0;</div><div class='del'>-	struct acpi_device *device = NULL;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_hot");</div><div class='del'>-</div><div class='ctx'> 	if (!tz || !tz-&gt;trips.hot.flags.valid)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (tz-&gt;temperature &gt;= tz-&gt;trips.hot.temperature) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Hot trip point\n"));</div><div class='add'>+		printk(KERN_WARNING PREFIX "Hot trip point\n");</div><div class='ctx'> 		tz-&gt;trips.hot.flags.enabled = 1;</div><div class='ctx'> 	} else if (tz-&gt;trips.hot.flags.enabled)</div><div class='ctx'> 		tz-&gt;trips.hot.flags.enabled = 0;</div><div class='ctx'> </div><div class='del'>-	result = acpi_bus_get_device(tz-&gt;handle, &amp;device);</div><div class='del'>-	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='del'>-</div><div class='del'>-	acpi_bus_generate_event(device, ACPI_THERMAL_NOTIFY_HOT,</div><div class='add'>+	acpi_bus_generate_event(tz-&gt;device, ACPI_THERMAL_NOTIFY_HOT,</div><div class='ctx'> 				tz-&gt;trips.hot.flags.enabled);</div><div class='ctx'> </div><div class='ctx'> 	/* TBD: Call user-mode "sleep(S4)" function */</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_thermal_passive(struct acpi_thermal *tz)</div><div class='hunk'>@@ -524,7 +499,6 @@ static void acpi_thermal_passive(struct acpi_thermal *tz)</div><div class='ctx'> 	int trend = 0;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_passive");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz || !tz-&gt;trips.passive.flags.valid)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -613,7 +587,6 @@ static void acpi_thermal_active(struct acpi_thermal *tz)</div><div class='ctx'> 	int j = 0;</div><div class='ctx'> 	unsigned long maxtemp = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_active");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -640,10 +613,10 @@ static void acpi_thermal_active(struct acpi_thermal *tz)</div><div class='ctx'> 						       handles[j],</div><div class='ctx'> 						       ACPI_STATE_D0);</div><div class='ctx'> 				if (result) {</div><div class='del'>-					ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-							  "Unable to turn cooling device [%p] 'on'\n",</div><div class='del'>-							  active-&gt;devices.</div><div class='del'>-							  handles[j]));</div><div class='add'>+					printk(KERN_WARNING PREFIX</div><div class='add'>+						      "Unable to turn cooling device [%p] 'on'\n",</div><div class='add'>+						      active-&gt;devices.</div><div class='add'>+						      handles[j]);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				active-&gt;flags.enabled = 1;</div><div class='hunk'>@@ -665,9 +638,9 @@ static void acpi_thermal_active(struct acpi_thermal *tz)</div><div class='ctx'> 			result = acpi_bus_set_power(active-&gt;devices.handles[j],</div><div class='ctx'> 						    ACPI_STATE_D3);</div><div class='ctx'> 			if (result) {</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-						  "Unable to turn cooling device [%p] 'off'\n",</div><div class='del'>-						  active-&gt;devices.handles[j]));</div><div class='add'>+				printk(KERN_WARNING PREFIX</div><div class='add'>+					      "Unable to turn cooling device [%p] 'off'\n",</div><div class='add'>+					      active-&gt;devices.handles[j]);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			active-&gt;flags.enabled = 0;</div><div class='hunk'>@@ -684,8 +657,7 @@ static void acpi_thermal_run(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_thermal *tz = (struct acpi_thermal *)data;</div><div class='ctx'> 	if (!tz-&gt;zombie)</div><div class='del'>-		acpi_os_queue_for_execution(OSD_PRIORITY_GPE,</div><div class='del'>-					    acpi_thermal_check, (void *)data);</div><div class='add'>+		acpi_os_execute(OSL_GPE_HANDLER, acpi_thermal_check, (void *)data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_thermal_check(void *data)</div><div class='hunk'>@@ -696,18 +668,17 @@ static void acpi_thermal_check(void *data)</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	struct acpi_thermal_state state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_check");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid (NULL) context.\n"));</div><div class='del'>-		return_VOID;</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid (NULL) context\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	state = tz-&gt;state;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_thermal_get_temperature(tz);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;tz-&gt;state, 0, sizeof(tz-&gt;state));</div><div class='ctx'> </div><div class='hunk'>@@ -796,7 +767,7 @@ static void acpi_thermal_check(void *data)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -809,7 +780,6 @@ static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_thermal *tz = (struct acpi_thermal *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_state_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -832,7 +802,7 @@ static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -845,7 +815,6 @@ static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	struct acpi_thermal *tz = (struct acpi_thermal *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_temp_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -858,7 +827,7 @@ static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   KELVIN_TO_CELSIUS(tz-&gt;temperature));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -872,7 +841,6 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int j = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_trip_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -912,7 +880,7 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -933,26 +901,25 @@ acpi_thermal_write_trip_points(struct file *file,</div><div class='ctx'> 	int *active;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_write_trip_points");</div><div class='ctx'> </div><div class='ctx'> 	limit_string = kmalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!limit_string)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);</div><div class='ctx'> </div><div class='ctx'> 	active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);</div><div class='del'>-	if (!active)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+	if (!active) {</div><div class='add'>+		kfree(limit_string);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!tz || (count &gt; ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n"));</div><div class='ctx'> 		count = -EINVAL;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(limit_string, buffer, count)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data\n"));</div><div class='ctx'> 		count = -EFAULT;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -965,7 +932,6 @@ acpi_thermal_write_trip_points(struct file *file,</div><div class='ctx'> 		     &amp;active[5], &amp;active[6], &amp;active[7], &amp;active[8],</div><div class='ctx'> 		     &amp;active[9]);</div><div class='ctx'> 	if (!(num &gt;= 5 &amp;&amp; num &lt; (ACPI_THERMAL_MAX_ACTIVE + 3))) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data format\n"));</div><div class='ctx'> 		count = -EINVAL;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -982,14 +948,13 @@ acpi_thermal_write_trip_points(struct file *file,</div><div class='ctx'>       end:</div><div class='ctx'> 	kfree(active);</div><div class='ctx'> 	kfree(limit_string);</div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_thermal *tz = (struct acpi_thermal *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_cooling_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -1005,7 +970,7 @@ static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 			   tz-&gt;cooling_mode ? "passive" : "active");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1024,16 +989,15 @@ acpi_thermal_write_cooling_mode(struct file *file,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	char mode_string[12] = { '\0' };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_write_cooling_mode");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz || (count &gt; sizeof(mode_string) - 1))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!tz-&gt;flags.cooling_mode)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(mode_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	mode_string[count] = '\0';</div><div class='ctx'> </div><div class='hunk'>@@ -1041,18 +1005,17 @@ acpi_thermal_write_cooling_mode(struct file *file,</div><div class='ctx'> 					       simple_strtoul(mode_string, NULL,</div><div class='ctx'> 							      0));</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	acpi_thermal_check(tz);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_thermal *tz = (struct acpi_thermal *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_polling_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -1066,7 +1029,7 @@ static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   (tz-&gt;polling_frequency / 10));</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_polling_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1086,13 +1049,12 @@ acpi_thermal_write_polling(struct file *file,</div><div class='ctx'> 	char polling_string[12] = { '\0' };</div><div class='ctx'> 	int seconds = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_write_polling");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz || (count &gt; sizeof(polling_string) - 1))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(polling_string, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	polling_string[count] = '\0';</div><div class='ctx'> </div><div class='hunk'>@@ -1100,24 +1062,23 @@ acpi_thermal_write_polling(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_thermal_set_polling(tz, seconds);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	acpi_thermal_check(tz);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_add_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_thermal_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1125,9 +1086,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry = create_proc_entry(ACPI_THERMAL_FILE_STATE,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_THERMAL_FILE_STATE));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_thermal_state_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1138,9 +1097,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry = create_proc_entry(ACPI_THERMAL_FILE_TEMPERATURE,</div><div class='ctx'> 				  S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_THERMAL_FILE_TEMPERATURE));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_thermal_temp_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1152,9 +1109,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_THERMAL_FILE_TRIP_POINTS));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_thermal_trip_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1166,9 +1121,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_THERMAL_FILE_COOLING_MODE));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_thermal_cooling_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1180,21 +1133,18 @@ static int acpi_thermal_add_fs(struct acpi_device *device)</div><div class='ctx'> 				  S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 				  acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create '%s' fs entry\n",</div><div class='del'>-				  ACPI_THERMAL_FILE_POLLING_FREQ));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_thermal_polling_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry(ACPI_THERMAL_FILE_POLLING_FREQ,</div><div class='hunk'>@@ -1211,7 +1161,7 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -1223,13 +1173,11 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_thermal *tz = (struct acpi_thermal *)data;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_notify");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (acpi_bus_get_device(tz-&gt;handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+	device = tz-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_THERMAL_NOTIFY_TEMPERATURE:</div><div class='hunk'>@@ -1251,27 +1199,26 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_get_info(struct acpi_thermal *tz)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_get_info");</div><div class='ctx'> </div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Get temperature [_TMP] (required) */</div><div class='ctx'> 	result = acpi_thermal_get_temperature(tz);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	/* Get trip points [_CRT, _PSV, etc.] (required) */</div><div class='ctx'> 	result = acpi_thermal_get_trip_points(tz);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the cooling mode [_SCP] to active cooling (default) */</div><div class='ctx'> 	result = acpi_thermal_set_cooling_mode(tz, ACPI_THERMAL_MODE_ACTIVE);</div><div class='hunk'>@@ -1311,7 +1258,7 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)</div><div class='ctx'> 	if (!result)</div><div class='ctx'> 		tz-&gt;flags.devices = 1;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_add(struct acpi_device *device)</div><div class='hunk'>@@ -1320,17 +1267,16 @@ static int acpi_thermal_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_thermal *tz = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tz = kmalloc(sizeof(struct acpi_thermal), GFP_KERNEL);</div><div class='ctx'> 	if (!tz)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(tz, 0, sizeof(struct acpi_thermal));</div><div class='ctx'> </div><div class='del'>-	tz-&gt;handle = device-&gt;handle;</div><div class='add'>+	tz-&gt;device = device;</div><div class='ctx'> 	strcpy(tz-&gt;name, device-&gt;pnp.bus_id);</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);</div><div class='hunk'>@@ -1342,18 +1288,16 @@ static int acpi_thermal_add(struct acpi_device *device)</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_thermal_add_fs(device);</div><div class='ctx'> 	if (result)</div><div class='del'>-		return_VALUE(result);</div><div class='add'>+		goto end;</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;tz-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	acpi_thermal_check(tz);</div><div class='ctx'> </div><div class='del'>-	status = acpi_install_notify_handler(tz-&gt;handle,</div><div class='add'>+	status = acpi_install_notify_handler(device-&gt;handle,</div><div class='ctx'> 					     ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					     acpi_thermal_notify, tz);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error installing notify handler\n"));</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1368,7 +1312,7 @@ static int acpi_thermal_add(struct acpi_device *device)</div><div class='ctx'> 		kfree(tz);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_thermal_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -1376,10 +1320,9 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	struct acpi_thermal *tz = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tz = (struct acpi_thermal *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -1392,12 +1335,9 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	/* deferred task may reinsert timer */</div><div class='ctx'> 	del_timer_sync(&amp;(tz-&gt;timer));</div><div class='ctx'> </div><div class='del'>-	status = acpi_remove_notify_handler(tz-&gt;handle,</div><div class='add'>+	status = acpi_remove_notify_handler(device-&gt;handle,</div><div class='ctx'> 					    ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					    acpi_thermal_notify);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* Terminate policy */</div><div class='ctx'> 	if (tz-&gt;trips.passive.flags.valid &amp;&amp; tz-&gt;trips.passive.flags.enabled) {</div><div class='hunk'>@@ -1413,38 +1353,65 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_thermal_remove_fs(device);</div><div class='ctx'> </div><div class='ctx'> 	kfree(tz);</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int acpi_thermal_resume(struct acpi_device *device, int state)</div><div class='add'>+{</div><div class='add'>+	struct acpi_thermal *tz = NULL;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!device || !acpi_driver_data(device))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tz = (struct acpi_thermal *)acpi_driver_data(device);</div><div class='add'>+</div><div class='add'>+	acpi_thermal_get_temperature(tz);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ACPI_THERMAL_MAX_ACTIVE; i++) {</div><div class='add'>+		if (tz-&gt;trips.active[i].flags.valid) {</div><div class='add'>+ 			tz-&gt;temperature = tz-&gt;trips.active[i].temperature;</div><div class='add'>+			tz-&gt;trips.active[i].flags.enabled = 0;</div><div class='add'>+</div><div class='add'>+			acpi_thermal_active(tz);</div><div class='add'>+</div><div class='add'>+			tz-&gt;state.active |= tz-&gt;trips.active[i].flags.enabled;</div><div class='add'>+			tz-&gt;state.active_index = i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ 	acpi_thermal_check(tz);</div><div class='add'>+</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_thermal_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_init");</div><div class='ctx'> </div><div class='ctx'> 	acpi_thermal_dir = proc_mkdir(ACPI_THERMAL_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_thermal_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	acpi_thermal_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_thermal_driver);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_THERMAL_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_thermal_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_thermal_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_thermal_driver);</div><div class='ctx'> </div><div class='ctx'> 	remove_proc_entry(ACPI_THERMAL_CLASS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_thermal_init);</div><div class='head'>diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c<br/>index 03b0044974c2..f6cbc0b1bfd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utalloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utalloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utalloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utalloc.c</a></div><div class='hunk'>@@ -46,24 +46,6 @@</div><div class='ctx'> #define _COMPONENT          ACPI_UTILITIES</div><div class='ctx'> ACPI_MODULE_NAME("utalloc")</div><div class='ctx'> </div><div class='del'>-/* Local prototypes */</div><div class='del'>-#ifdef ACPI_DBG_TRACK_ALLOCATIONS</div><div class='del'>-static struct acpi_debug_mem_block *acpi_ut_find_allocation(void *allocation);</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ut_track_allocation(struct acpi_debug_mem_block *address,</div><div class='del'>-			 acpi_size size,</div><div class='del'>-			 u8 alloc_type, u32 component, char *module, u32 line);</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ut_remove_allocation(struct acpi_debug_mem_block *address,</div><div class='del'>-			  u32 component, char *module, u32 line);</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ut_create_list(char *list_name,</div><div class='del'>-		    u16 object_size, struct acpi_memory_list **return_cache);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ut_create_caches</div><div class='hunk'>@@ -75,33 +57,23 @@ acpi_ut_create_list(char *list_name,</div><div class='ctx'>  * DESCRIPTION: Create all local caches</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_ut_create_caches(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-#ifdef ACPI_DBG_TRACK_ALLOCATIONS</div><div class='del'>-</div><div class='del'>-	/* Memory allocation lists */</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_create_list("Acpi-Global", 0, &amp;acpi_gbl_global_list);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return (status);</div><div class='del'>-	}</div><div class='add'>+	/* Object Caches, for frequently used objects */</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_ut_create_list("Acpi-Namespace",</div><div class='del'>-				sizeof(struct acpi_namespace_node),</div><div class='del'>-				&amp;acpi_gbl_ns_node_list);</div><div class='add'>+	    acpi_os_create_cache("Acpi-Namespace",</div><div class='add'>+				 sizeof(struct acpi_namespace_node),</div><div class='add'>+				 ACPI_MAX_NAMESPACE_CACHE_DEPTH,</div><div class='add'>+				 &amp;acpi_gbl_namespace_cache);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		return (status);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Object Caches, for frequently used objects */</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_os_create_cache("acpi_state", sizeof(union acpi_generic_state),</div><div class='add'>+	    acpi_os_create_cache("Acpi-State", sizeof(union acpi_generic_state),</div><div class='ctx'> 				 ACPI_MAX_STATE_CACHE_DEPTH,</div><div class='ctx'> 				 &amp;acpi_gbl_state_cache);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -109,7 +81,7 @@ acpi_status acpi_ut_create_caches(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_os_create_cache("acpi_parse",</div><div class='add'>+	    acpi_os_create_cache("Acpi-Parse",</div><div class='ctx'> 				 sizeof(struct acpi_parse_obj_common),</div><div class='ctx'> 				 ACPI_MAX_PARSE_CACHE_DEPTH,</div><div class='ctx'> 				 &amp;acpi_gbl_ps_node_cache);</div><div class='hunk'>@@ -118,7 +90,7 @@ acpi_status acpi_ut_create_caches(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_os_create_cache("acpi_parse_ext",</div><div class='add'>+	    acpi_os_create_cache("Acpi-ParseExt",</div><div class='ctx'> 				 sizeof(struct acpi_parse_obj_named),</div><div class='ctx'> 				 ACPI_MAX_EXTPARSE_CACHE_DEPTH,</div><div class='ctx'> 				 &amp;acpi_gbl_ps_node_ext_cache);</div><div class='hunk'>@@ -127,7 +99,7 @@ acpi_status acpi_ut_create_caches(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='del'>-	    acpi_os_create_cache("acpi_operand",</div><div class='add'>+	    acpi_os_create_cache("Acpi-Operand",</div><div class='ctx'> 				 sizeof(union acpi_operand_object),</div><div class='ctx'> 				 ACPI_MAX_OBJECT_CACHE_DEPTH,</div><div class='ctx'> 				 &amp;acpi_gbl_operand_cache);</div><div class='hunk'>@@ -135,6 +107,24 @@ acpi_status acpi_ut_create_caches(void)</div><div class='ctx'> 		return (status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef ACPI_DBG_TRACK_ALLOCATIONS</div><div class='add'>+</div><div class='add'>+	/* Memory allocation lists */</div><div class='add'>+</div><div class='add'>+	status = acpi_ut_create_list("Acpi-Global", 0, &amp;acpi_gbl_global_list);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status =</div><div class='add'>+	    acpi_ut_create_list("Acpi-Namespace",</div><div class='add'>+				sizeof(struct acpi_namespace_node),</div><div class='add'>+				&amp;acpi_gbl_ns_node_list);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		return (status);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -153,6 +143,9 @@ acpi_status acpi_ut_create_caches(void)</div><div class='ctx'> acpi_status acpi_ut_delete_caches(void)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='add'>+	(void)acpi_os_delete_cache(acpi_gbl_namespace_cache);</div><div class='add'>+	acpi_gbl_namespace_cache = NULL;</div><div class='add'>+</div><div class='ctx'> 	(void)acpi_os_delete_cache(acpi_gbl_state_cache);</div><div class='ctx'> 	acpi_gbl_state_cache = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -165,6 +158,21 @@ acpi_status acpi_ut_delete_caches(void)</div><div class='ctx'> 	(void)acpi_os_delete_cache(acpi_gbl_ps_node_ext_cache);</div><div class='ctx'> 	acpi_gbl_ps_node_ext_cache = NULL;</div><div class='ctx'> </div><div class='add'>+#ifdef ACPI_DBG_TRACK_ALLOCATIONS</div><div class='add'>+</div><div class='add'>+	/* Debug only - display leftover memory allocation, if any */</div><div class='add'>+</div><div class='add'>+	acpi_ut_dump_allocations(ACPI_UINT32_MAX, NULL);</div><div class='add'>+</div><div class='add'>+	/* Free memory lists */</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(acpi_gbl_global_list);</div><div class='add'>+	acpi_gbl_global_list = NULL;</div><div class='add'>+</div><div class='add'>+	ACPI_FREE(acpi_gbl_ns_node_list);</div><div class='add'>+	acpi_gbl_ns_node_list = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +260,7 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate a new buffer with local interface to allow tracking */</div><div class='ctx'> </div><div class='del'>-		buffer-&gt;pointer = ACPI_MEM_CALLOCATE(required_length);</div><div class='add'>+		buffer-&gt;pointer = ACPI_ALLOCATE_ZEROED(required_length);</div><div class='ctx'> 		if (!buffer-&gt;pointer) {</div><div class='ctx'> 			return (AE_NO_MEMORY);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -277,6 +285,7 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef NOT_USED_BY_LINUX</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ut_allocate</div><div class='hunk'>@@ -288,7 +297,7 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Address of the allocated memory on success, NULL on failure.</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: The subsystem's equivalent of malloc.</div><div class='add'>+ * DESCRIPTION: Subsystem equivalent of malloc.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -296,23 +305,23 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)</div><div class='ctx'> {</div><div class='ctx'> 	void *allocation;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_allocate", size);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ut_allocate, size);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for an inadvertent size of zero bytes */</div><div class='ctx'> </div><div class='ctx'> 	if (!size) {</div><div class='del'>-		ACPI_ERROR((module, line,</div><div class='del'>-			    "ut_allocate: Attempt to allocate zero bytes, allocating 1 byte"));</div><div class='add'>+		ACPI_WARNING((module, line,</div><div class='add'>+			      "Attempt to allocate zero bytes, allocating 1 byte"));</div><div class='ctx'> 		size = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	allocation = acpi_os_allocate(size);</div><div class='ctx'> 	if (!allocation) {</div><div class='add'>+</div><div class='ctx'> 		/* Report allocation error */</div><div class='ctx'> </div><div class='del'>-		ACPI_ERROR((module, line,</div><div class='del'>-			    "ut_allocate: Could not allocate size %X",</div><div class='del'>-			    (u32) size));</div><div class='add'>+		ACPI_WARNING((module, line,</div><div class='add'>+			      "Could not allocate size %X", (u32) size));</div><div class='ctx'> </div><div class='ctx'> 		return_PTR(NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -322,7 +331,7 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ut_callocate</div><div class='add'>+ * FUNCTION:    acpi_ut_allocate_zeroed</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  Size                - Size of the allocation</div><div class='ctx'>  *              Component           - Component type of caller</div><div class='hunk'>@@ -331,542 +340,25 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Address of the allocated memory on success, NULL on failure.</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Subsystem equivalent of calloc.</div><div class='add'>+ * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)</div><div class='add'>+void *acpi_ut_allocate_zeroed(acpi_size size,</div><div class='add'>+			      u32 component, char *module, u32 line)</div><div class='ctx'> {</div><div class='ctx'> 	void *allocation;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_callocate", size);</div><div class='del'>-</div><div class='del'>-	/* Check for an inadvertent size of zero bytes */</div><div class='del'>-</div><div class='del'>-	if (!size) {</div><div class='del'>-		ACPI_ERROR((module, line,</div><div class='del'>-			    "Attempt to allocate zero bytes, allocating 1 byte"));</div><div class='del'>-		size = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	allocation = acpi_os_allocate(size);</div><div class='del'>-	if (!allocation) {</div><div class='del'>-		/* Report allocation error */</div><div class='del'>-</div><div class='del'>-		ACPI_ERROR((module, line,</div><div class='del'>-			    "Could not allocate size %X", (u32) size));</div><div class='del'>-		return_PTR(NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear the memory block */</div><div class='del'>-</div><div class='del'>-	ACPI_MEMSET(allocation, 0, size);</div><div class='del'>-	return_PTR(allocation);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef ACPI_DBG_TRACK_ALLOCATIONS</div><div class='del'>-/*</div><div class='del'>- * These procedures are used for tracking memory leaks in the subsystem, and</div><div class='del'>- * they get compiled out when the ACPI_DBG_TRACK_ALLOCATIONS is not set.</div><div class='del'>- *</div><div class='del'>- * Each memory allocation is tracked via a doubly linked list.  Each</div><div class='del'>- * element contains the caller's component, module name, function name, and</div><div class='del'>- * line number.  acpi_ut_allocate and acpi_ut_callocate call</div><div class='del'>- * acpi_ut_track_allocation to add an element to the list; deletion</div><div class='del'>- * occurs in the body of acpi_ut_free.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_create_list</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  cache_name      - Ascii name for the cache</div><div class='del'>- *              object_size     - Size of each cached object</div><div class='del'>- *              return_cache    - Where the new cache object is returned</div><div class='del'>- *</div><div class='del'>- * RETURN:      Status</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Create a local memory list for tracking purposed</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ut_create_list(char *list_name,</div><div class='del'>-		    u16 object_size, struct acpi_memory_list **return_cache)</div><div class='del'>-{</div><div class='del'>-	struct acpi_memory_list *cache;</div><div class='del'>-</div><div class='del'>-	cache = acpi_os_allocate(sizeof(struct acpi_memory_list));</div><div class='del'>-	if (!cache) {</div><div class='del'>-		return (AE_NO_MEMORY);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));</div><div class='del'>-</div><div class='del'>-	cache-&gt;list_name = list_name;</div><div class='del'>-	cache-&gt;object_size = object_size;</div><div class='del'>-</div><div class='del'>-	*return_cache = cache;</div><div class='del'>-	return (AE_OK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_allocate_and_track</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Size                - Size of the allocation</div><div class='del'>- *              Component           - Component type of caller</div><div class='del'>- *              Module              - Source file name of caller</div><div class='del'>- *              Line                - Line number of caller</div><div class='del'>- *</div><div class='del'>- * RETURN:      Address of the allocated memory on success, NULL on failure.</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: The subsystem's equivalent of malloc.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-void *acpi_ut_allocate_and_track(acpi_size size,</div><div class='del'>-				 u32 component, char *module, u32 line)</div><div class='del'>-{</div><div class='del'>-	struct acpi_debug_mem_block *allocation;</div><div class='del'>-	acpi_status status;</div><div class='del'>-</div><div class='del'>-	allocation =</div><div class='del'>-	    acpi_ut_allocate(size + sizeof(struct acpi_debug_mem_header),</div><div class='del'>-			     component, module, line);</div><div class='del'>-	if (!allocation) {</div><div class='del'>-		return (NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_track_allocation(allocation, size,</div><div class='del'>-					  ACPI_MEM_MALLOC, component, module,</div><div class='del'>-					  line);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		acpi_os_free(allocation);</div><div class='del'>-		return (NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	acpi_gbl_global_list-&gt;total_allocated++;</div><div class='del'>-	acpi_gbl_global_list-&gt;current_total_size += (u32) size;</div><div class='del'>-</div><div class='del'>-	return ((void *)&amp;allocation-&gt;user_space);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_callocate_and_track</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Size                - Size of the allocation</div><div class='del'>- *              Component           - Component type of caller</div><div class='del'>- *              Module              - Source file name of caller</div><div class='del'>- *              Line                - Line number of caller</div><div class='del'>- *</div><div class='del'>- * RETURN:      Address of the allocated memory on success, NULL on failure.</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Subsystem equivalent of calloc.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-void *acpi_ut_callocate_and_track(acpi_size size,</div><div class='del'>-				  u32 component, char *module, u32 line)</div><div class='del'>-{</div><div class='del'>-	struct acpi_debug_mem_block *allocation;</div><div class='del'>-	acpi_status status;</div><div class='del'>-</div><div class='del'>-	allocation =</div><div class='del'>-	    acpi_ut_callocate(size + sizeof(struct acpi_debug_mem_header),</div><div class='del'>-			      component, module, line);</div><div class='del'>-	if (!allocation) {</div><div class='del'>-		/* Report allocation error */</div><div class='del'>-</div><div class='del'>-		ACPI_ERROR((module, line,</div><div class='del'>-			    "Could not allocate size %X", (u32) size));</div><div class='del'>-		return (NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_track_allocation(allocation, size,</div><div class='del'>-					  ACPI_MEM_CALLOC, component, module,</div><div class='del'>-					  line);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		acpi_os_free(allocation);</div><div class='del'>-		return (NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	acpi_gbl_global_list-&gt;total_allocated++;</div><div class='del'>-	acpi_gbl_global_list-&gt;current_total_size += (u32) size;</div><div class='del'>-</div><div class='del'>-	return ((void *)&amp;allocation-&gt;user_space);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_free_and_track</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Allocation          - Address of the memory to deallocate</div><div class='del'>- *              Component           - Component type of caller</div><div class='del'>- *              Module              - Source file name of caller</div><div class='del'>- *              Line                - Line number of caller</div><div class='del'>- *</div><div class='del'>- * RETURN:      None</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Frees the memory at Allocation</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)</div><div class='del'>-{</div><div class='del'>-	struct acpi_debug_mem_block *debug_block;</div><div class='del'>-	acpi_status status;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_free", allocation);</div><div class='del'>-</div><div class='del'>-	if (NULL == allocation) {</div><div class='del'>-		ACPI_ERROR((module, line, "Attempt to delete a NULL address"));</div><div class='del'>-</div><div class='del'>-		return_VOID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	debug_block = ACPI_CAST_PTR(struct acpi_debug_mem_block,</div><div class='del'>-				    (((char *)allocation) -</div><div class='del'>-				     sizeof(struct acpi_debug_mem_header)));</div><div class='del'>-</div><div class='del'>-	acpi_gbl_global_list-&gt;total_freed++;</div><div class='del'>-	acpi_gbl_global_list-&gt;current_total_size -= debug_block-&gt;size;</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_remove_allocation(debug_block,</div><div class='del'>-					   component, module, line);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status, "Could not free memory"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	acpi_os_free(debug_block);</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "%p freed\n", allocation));</div><div class='del'>-	return_VOID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_find_allocation</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Allocation              - Address of allocated memory</div><div class='del'>- *</div><div class='del'>- * RETURN:      A list element if found; NULL otherwise.</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Searches for an element in the global allocation tracking list.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static struct acpi_debug_mem_block *acpi_ut_find_allocation(void *allocation)</div><div class='del'>-{</div><div class='del'>-	struct acpi_debug_mem_block *element;</div><div class='del'>-</div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='del'>-	element = acpi_gbl_global_list-&gt;list_head;</div><div class='add'>+	allocation = acpi_ut_allocate(size, component, module, line);</div><div class='add'>+	if (allocation) {</div><div class='ctx'> </div><div class='del'>-	/* Search for the address. */</div><div class='add'>+		/* Clear the memory block */</div><div class='ctx'> </div><div class='del'>-	while (element) {</div><div class='del'>-		if (element == allocation) {</div><div class='del'>-			return (element);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		element = element-&gt;next;</div><div class='add'>+		ACPI_MEMSET(allocation, 0, size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (NULL);</div><div class='add'>+	return (allocation);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_track_allocation</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Allocation          - Address of allocated memory</div><div class='del'>- *              Size                - Size of the allocation</div><div class='del'>- *              alloc_type          - MEM_MALLOC or MEM_CALLOC</div><div class='del'>- *              Component           - Component type of caller</div><div class='del'>- *              Module              - Source file name of caller</div><div class='del'>- *              Line                - Line number of caller</div><div class='del'>- *</div><div class='del'>- * RETURN:      None.</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Inserts an element into the global allocation tracking list.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,</div><div class='del'>-			 acpi_size size,</div><div class='del'>-			 u8 alloc_type, u32 component, char *module, u32 line)</div><div class='del'>-{</div><div class='del'>-	struct acpi_memory_list *mem_list;</div><div class='del'>-	struct acpi_debug_mem_block *element;</div><div class='del'>-	acpi_status status = AE_OK;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_track_allocation", allocation);</div><div class='del'>-</div><div class='del'>-	mem_list = acpi_gbl_global_list;</div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Search list for this address to make sure it is not already on the list.</div><div class='del'>-	 * This will catch several kinds of problems.</div><div class='del'>-	 */</div><div class='del'>-	element = acpi_ut_find_allocation(allocation);</div><div class='del'>-	if (element) {</div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "ut_track_allocation: Allocation already present in list! (%p)",</div><div class='del'>-			    allocation));</div><div class='del'>-</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Element %p Address %p",</div><div class='del'>-			    element, allocation));</div><div class='del'>-</div><div class='del'>-		goto unlock_and_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fill in the instance data. */</div><div class='del'>-</div><div class='del'>-	allocation-&gt;size = (u32) size;</div><div class='del'>-	allocation-&gt;alloc_type = alloc_type;</div><div class='del'>-	allocation-&gt;component = component;</div><div class='del'>-	allocation-&gt;line = line;</div><div class='del'>-</div><div class='del'>-	ACPI_STRNCPY(allocation-&gt;module, module, ACPI_MAX_MODULE_NAME);</div><div class='del'>-	allocation-&gt;module[ACPI_MAX_MODULE_NAME - 1] = 0;</div><div class='del'>-</div><div class='del'>-	/* Insert at list head */</div><div class='del'>-</div><div class='del'>-	if (mem_list-&gt;list_head) {</div><div class='del'>-		((struct acpi_debug_mem_block *)(mem_list-&gt;list_head))-&gt;</div><div class='del'>-		    previous = allocation;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	allocation-&gt;next = mem_list-&gt;list_head;</div><div class='del'>-	allocation-&gt;previous = NULL;</div><div class='del'>-</div><div class='del'>-	mem_list-&gt;list_head = allocation;</div><div class='del'>-</div><div class='del'>-      unlock_and_exit:</div><div class='del'>-	status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_remove_allocation</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Allocation          - Address of allocated memory</div><div class='del'>- *              Component           - Component type of caller</div><div class='del'>- *              Module              - Source file name of caller</div><div class='del'>- *              Line                - Line number of caller</div><div class='del'>- *</div><div class='del'>- * RETURN:</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Deletes an element from the global allocation tracking list.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,</div><div class='del'>-			  u32 component, char *module, u32 line)</div><div class='del'>-{</div><div class='del'>-	struct acpi_memory_list *mem_list;</div><div class='del'>-	acpi_status status;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_remove_allocation");</div><div class='del'>-</div><div class='del'>-	mem_list = acpi_gbl_global_list;</div><div class='del'>-	if (NULL == mem_list-&gt;list_head) {</div><div class='del'>-		/* No allocations! */</div><div class='del'>-</div><div class='del'>-		ACPI_ERROR((module, line,</div><div class='del'>-			    "Empty allocation list, nothing to free!"));</div><div class='del'>-</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Unlink */</div><div class='del'>-</div><div class='del'>-	if (allocation-&gt;previous) {</div><div class='del'>-		(allocation-&gt;previous)-&gt;next = allocation-&gt;next;</div><div class='del'>-	} else {</div><div class='del'>-		mem_list-&gt;list_head = allocation-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (allocation-&gt;next) {</div><div class='del'>-		(allocation-&gt;next)-&gt;previous = allocation-&gt;previous;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Mark the segment as deleted */</div><div class='del'>-</div><div class='del'>-	ACPI_MEMSET(&amp;allocation-&gt;user_space, 0xEA, allocation-&gt;size);</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Freeing size 0%X\n",</div><div class='del'>-			  allocation-&gt;size));</div><div class='del'>-</div><div class='del'>-	status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);</div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_dump_allocation_info</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:</div><div class='del'>- *</div><div class='del'>- * RETURN:      None</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Print some info about the outstanding allocations.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-#ifdef ACPI_FUTURE_USAGE</div><div class='del'>-void acpi_ut_dump_allocation_info(void)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>-	struct acpi_memory_list         *mem_list;</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_dump_allocation_info");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-	ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,</div><div class='del'>-			  ("%30s: %4d (%3d Kb)\n", "Current allocations",</div><div class='del'>-			  mem_list-&gt;current_count,</div><div class='del'>-			  ROUND_UP_TO_1K (mem_list-&gt;current_size)));</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,</div><div class='del'>-			  ("%30s: %4d (%3d Kb)\n", "Max concurrent allocations",</div><div class='del'>-			  mem_list-&gt;max_concurrent_count,</div><div class='del'>-			  ROUND_UP_TO_1K (mem_list-&gt;max_concurrent_size)));</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,</div><div class='del'>-			  ("%30s: %4d (%3d Kb)\n", "Total (all) internal objects",</div><div class='del'>-			  running_object_count,</div><div class='del'>-			  ROUND_UP_TO_1K (running_object_size)));</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,</div><div class='del'>-			  ("%30s: %4d (%3d Kb)\n", "Total (all) allocations",</div><div class='del'>-			  running_alloc_count,</div><div class='del'>-			  ROUND_UP_TO_1K (running_alloc_size)));</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,</div><div class='del'>-			  ("%30s: %4d (%3d Kb)\n", "Current Nodes",</div><div class='del'>-			  acpi_gbl_current_node_count,</div><div class='del'>-			  ROUND_UP_TO_1K (acpi_gbl_current_node_size)));</div><div class='del'>-</div><div class='del'>-	ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,</div><div class='del'>-			  ("%30s: %4d (%3d Kb)\n", "Max Nodes",</div><div class='del'>-			  acpi_gbl_max_concurrent_node_count,</div><div class='del'>-			  ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count *</div><div class='del'>-					 sizeof (struct acpi_namespace_node)))));</div><div class='del'>-*/</div><div class='del'>-	return_VOID;</div><div class='del'>-}</div><div class='del'>-#endif				/*  ACPI_FUTURE_USAGE  */</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_dump_allocations</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Component           - Component(s) to dump info for.</div><div class='del'>- *              Module              - Module to dump info for.  NULL means all.</div><div class='del'>- *</div><div class='del'>- * RETURN:      None</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Print a list of all outstanding allocations.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-void acpi_ut_dump_allocations(u32 component, char *module)</div><div class='del'>-{</div><div class='del'>-	struct acpi_debug_mem_block *element;</div><div class='del'>-	union acpi_descriptor *descriptor;</div><div class='del'>-	u32 num_outstanding = 0;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_dump_allocations");</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Walk the allocation list.</div><div class='del'>-	 */</div><div class='del'>-	if (ACPI_FAILURE(acpi_ut_acquire_mutex(ACPI_MTX_MEMORY))) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	element = acpi_gbl_global_list-&gt;list_head;</div><div class='del'>-	while (element) {</div><div class='del'>-		if ((element-&gt;component &amp; component) &amp;&amp;</div><div class='del'>-		    ((module == NULL)</div><div class='del'>-		     || (0 == ACPI_STRCMP(module, element-&gt;module)))) {</div><div class='del'>-			/* Ignore allocated objects that are in a cache */</div><div class='del'>-</div><div class='del'>-			descriptor =</div><div class='del'>-			    ACPI_CAST_PTR(union acpi_descriptor,</div><div class='del'>-					  &amp;element-&gt;user_space);</div><div class='del'>-			if (descriptor-&gt;descriptor_id != ACPI_DESC_TYPE_CACHED) {</div><div class='del'>-				acpi_os_printf("%p Len %04X %9.9s-%d [%s] ",</div><div class='del'>-					       descriptor, element-&gt;size,</div><div class='del'>-					       element-&gt;module, element-&gt;line,</div><div class='del'>-					       acpi_ut_get_descriptor_name</div><div class='del'>-					       (descriptor));</div><div class='del'>-</div><div class='del'>-				/* Most of the elements will be Operand objects. */</div><div class='del'>-</div><div class='del'>-				switch (ACPI_GET_DESCRIPTOR_TYPE(descriptor)) {</div><div class='del'>-				case ACPI_DESC_TYPE_OPERAND:</div><div class='del'>-					acpi_os_printf("%12.12s R%hd",</div><div class='del'>-						       acpi_ut_get_type_name</div><div class='del'>-						       (descriptor-&gt;object.</div><div class='del'>-							common.type),</div><div class='del'>-						       descriptor-&gt;object.</div><div class='del'>-						       common.reference_count);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case ACPI_DESC_TYPE_PARSER:</div><div class='del'>-					acpi_os_printf("aml_opcode %04hX",</div><div class='del'>-						       descriptor-&gt;op.asl.</div><div class='del'>-						       aml_opcode);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case ACPI_DESC_TYPE_NAMED:</div><div class='del'>-					acpi_os_printf("%4.4s",</div><div class='del'>-						       acpi_ut_get_node_name</div><div class='del'>-						       (&amp;descriptor-&gt;node));</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				default:</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				acpi_os_printf("\n");</div><div class='del'>-				num_outstanding++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		element = element-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	(void)acpi_ut_release_mutex(ACPI_MTX_MEMORY);</div><div class='del'>-</div><div class='del'>-	/* Print summary */</div><div class='del'>-</div><div class='del'>-	if (!num_outstanding) {</div><div class='del'>-		ACPI_INFO((AE_INFO, "No outstanding allocations"));</div><div class='del'>-	} else {</div><div class='del'>-		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "%d(%X) Outstanding allocations",</div><div class='del'>-			    num_outstanding, num_outstanding));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return_VOID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif				/* #ifdef ACPI_DBG_TRACK_ALLOCATIONS */</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c<br/>index 2177cb1ef2c4..1a1f8109159c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utcache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utcache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utcache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utcache.c</a></div><div class='hunk'>@@ -118,13 +118,14 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)</div><div class='ctx'> 	/* Walk the list of objects in this cache */</div><div class='ctx'> </div><div class='ctx'> 	while (cache-&gt;list_head) {</div><div class='add'>+</div><div class='ctx'> 		/* Delete and unlink one cached state object */</div><div class='ctx'> </div><div class='ctx'> 		next = *(ACPI_CAST_INDIRECT_PTR(char,</div><div class='ctx'> 						&amp;(((char *)cache-&gt;</div><div class='ctx'> 						   list_head)[cache-&gt;</div><div class='ctx'> 							      link_offset])));</div><div class='del'>-		ACPI_MEM_FREE(cache-&gt;list_head);</div><div class='add'>+		ACPI_FREE(cache-&gt;list_head);</div><div class='ctx'> </div><div class='ctx'> 		cache-&gt;list_head = next;</div><div class='ctx'> 		cache-&gt;current_depth--;</div><div class='hunk'>@@ -161,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can delete the cache object */</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(cache);</div><div class='add'>+	ACPI_FREE(cache);</div><div class='ctx'> 	return (AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,7 +194,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)</div><div class='ctx'> 	/* If cache is full, just free this object */</div><div class='ctx'> </div><div class='ctx'> 	if (cache-&gt;current_depth &gt;= cache-&gt;max_depth) {</div><div class='del'>-		ACPI_MEM_FREE(object);</div><div class='add'>+		ACPI_FREE(object);</div><div class='ctx'> 		ACPI_MEM_TRACKING(cache-&gt;total_freed++);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -243,7 +244,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	void *object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("os_acquire_object");</div><div class='add'>+	ACPI_FUNCTION_NAME(os_acquire_object);</div><div class='ctx'> </div><div class='ctx'> 	if (!cache) {</div><div class='ctx'> 		return (NULL);</div><div class='hunk'>@@ -259,6 +260,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)</div><div class='ctx'> 	/* Check the cache first */</div><div class='ctx'> </div><div class='ctx'> 	if (cache-&gt;list_head) {</div><div class='add'>+</div><div class='ctx'> 		/* There is an object available, use it */</div><div class='ctx'> </div><div class='ctx'> 		object = cache-&gt;list_head;</div><div class='hunk'>@@ -270,9 +272,9 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)</div><div class='ctx'> 		cache-&gt;current_depth--;</div><div class='ctx'> </div><div class='ctx'> 		ACPI_MEM_TRACKING(cache-&gt;hits++);</div><div class='del'>-		ACPI_MEM_TRACKING(ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-						    "Object %p from %s cache\n",</div><div class='del'>-						    object, cache-&gt;list_name)));</div><div class='add'>+		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='add'>+				  "Object %p from %s cache\n", object,</div><div class='add'>+				  cache-&gt;list_name));</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -287,14 +289,14 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)</div><div class='ctx'> </div><div class='ctx'> 		ACPI_MEM_TRACKING(cache-&gt;total_allocated++);</div><div class='ctx'> </div><div class='del'>-		/* Avoid deadlock with ACPI_MEM_CALLOCATE */</div><div class='add'>+		/* Avoid deadlock with ACPI_ALLOCATE_ZEROED */</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			return (NULL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		object = ACPI_MEM_CALLOCATE(cache-&gt;object_size);</div><div class='add'>+		object = ACPI_ALLOCATE_ZEROED(cache-&gt;object_size);</div><div class='ctx'> 		if (!object) {</div><div class='ctx'> 			return (NULL);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c<br/>index df2d32096b72..5e1a80d1bc36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utcopy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utcopy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utcopy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utcopy.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_isimple_to_esimple");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_isimple_to_esimple);</div><div class='ctx'> </div><div class='ctx'> 	*buffer_space_used = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -325,7 +325,7 @@ acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_pkg_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_ipackage_to_epackage");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_ipackage_to_epackage);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First package at head of the buffer</div><div class='hunk'>@@ -383,7 +383,7 @@ acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *internal_object,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_iobject_to_eobject");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_iobject_to_eobject);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -442,7 +442,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *internal_object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_esimple_to_isimple");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_esimple_to_isimple);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Simple types supported are: String, Buffer, Integer</div><div class='hunk'>@@ -472,8 +472,8 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,</div><div class='ctx'> 	case ACPI_TYPE_STRING:</div><div class='ctx'> </div><div class='ctx'> 		internal_object-&gt;string.pointer =</div><div class='del'>-		    ACPI_MEM_CALLOCATE((acpi_size) external_object-&gt;string.</div><div class='del'>-				       length + 1);</div><div class='add'>+		    ACPI_ALLOCATE_ZEROED((acpi_size) external_object-&gt;string.</div><div class='add'>+					 length + 1);</div><div class='ctx'> 		if (!internal_object-&gt;string.pointer) {</div><div class='ctx'> 			goto error_exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -488,7 +488,7 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,</div><div class='ctx'> 	case ACPI_TYPE_BUFFER:</div><div class='ctx'> </div><div class='ctx'> 		internal_object-&gt;buffer.pointer =</div><div class='del'>-		    ACPI_MEM_CALLOCATE(external_object-&gt;buffer.length);</div><div class='add'>+		    ACPI_ALLOCATE_ZEROED(external_object-&gt;buffer.length);</div><div class='ctx'> 		if (!internal_object-&gt;buffer.pointer) {</div><div class='ctx'> 			goto error_exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -552,7 +552,7 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_operand_object *internal_object,</div><div class='ctx'> 	union acpi_operand_object *this_internal_obj;</div><div class='ctx'> 	union acpi_object *this_external_obj;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_epackage_to_ipackage");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_epackage_to_ipackage);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * First package at head of the buffer</div><div class='hunk'>@@ -600,7 +600,7 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_eobject_to_iobject");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_eobject_to_iobject);</div><div class='ctx'> </div><div class='ctx'> 	if (external_object-&gt;type == ACPI_TYPE_PACKAGE) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -676,7 +676,7 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,</div><div class='ctx'> 		if ((source_desc-&gt;buffer.pointer) &amp;&amp;</div><div class='ctx'> 		    (source_desc-&gt;buffer.length)) {</div><div class='ctx'> 			dest_desc-&gt;buffer.pointer =</div><div class='del'>-			    ACPI_MEM_ALLOCATE(source_desc-&gt;buffer.length);</div><div class='add'>+			    ACPI_ALLOCATE(source_desc-&gt;buffer.length);</div><div class='ctx'> 			if (!dest_desc-&gt;buffer.pointer) {</div><div class='ctx'> 				return (AE_NO_MEMORY);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -697,8 +697,8 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (source_desc-&gt;string.pointer) {</div><div class='ctx'> 			dest_desc-&gt;string.pointer =</div><div class='del'>-			    ACPI_MEM_ALLOCATE((acpi_size) source_desc-&gt;string.</div><div class='del'>-					      length + 1);</div><div class='add'>+			    ACPI_ALLOCATE((acpi_size) source_desc-&gt;string.</div><div class='add'>+					  length + 1);</div><div class='ctx'> 			if (!dest_desc-&gt;string.pointer) {</div><div class='ctx'> 				return (AE_NO_MEMORY);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -805,9 +805,7 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Create the object array</div><div class='ctx'> 		 */</div><div class='del'>-		target_object-&gt;package.elements =</div><div class='del'>-		    ACPI_MEM_CALLOCATE(((acpi_size) source_object-&gt;package.</div><div class='del'>-					count + 1) * sizeof(void *));</div><div class='add'>+		target_object-&gt;package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size) source_object-&gt;package.count + 1) * sizeof(void *));</div><div class='ctx'> 		if (!target_object-&gt;package.elements) {</div><div class='ctx'> 			status = AE_NO_MEMORY;</div><div class='ctx'> 			goto error_exit;</div><div class='hunk'>@@ -856,7 +854,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_ipackage_to_ipackage");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_ipackage_to_ipackage);</div><div class='ctx'> </div><div class='ctx'> 	dest_obj-&gt;common.type = ACPI_GET_OBJECT_TYPE(source_obj);</div><div class='ctx'> 	dest_obj-&gt;common.flags = source_obj-&gt;common.flags;</div><div class='hunk'>@@ -865,10 +863,10 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create the object array and walk the source package tree</div><div class='ctx'> 	 */</div><div class='del'>-	dest_obj-&gt;package.elements = ACPI_MEM_CALLOCATE(((acpi_size)</div><div class='del'>-							 source_obj-&gt;package.</div><div class='del'>-							 count +</div><div class='del'>-							 1) * sizeof(void *));</div><div class='add'>+	dest_obj-&gt;package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size)</div><div class='add'>+							   source_obj-&gt;package.</div><div class='add'>+							   count +</div><div class='add'>+							   1) * sizeof(void *));</div><div class='ctx'> 	if (!dest_obj-&gt;package.elements) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Package allocation failure"));</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='hunk'>@@ -882,6 +880,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,</div><div class='ctx'> 					   acpi_ut_copy_ielement_to_ielement,</div><div class='ctx'> 					   walk_state);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='add'>+</div><div class='ctx'> 		/* On failure, delete the destination package object */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ut_remove_reference(dest_obj);</div><div class='hunk'>@@ -911,7 +910,7 @@ acpi_ut_copy_iobject_to_iobject(union acpi_operand_object *source_desc,</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_copy_iobject_to_iobject");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_copy_iobject_to_iobject);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the top level object */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c<br/>index 35f3d581e034..bb1eaf9aa653 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utdebug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utdebug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utdebug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utdebug.c</a></div><div class='hunk'>@@ -41,15 +41,13 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_UTILITIES</div><div class='ctx'> ACPI_MODULE_NAME("utdebug")</div><div class='ctx'> </div><div class='ctx'> #ifdef ACPI_DEBUG_OUTPUT</div><div class='del'>-static u32 acpi_gbl_prev_thread_id = 0xFFFFFFFF;</div><div class='add'>+static acpi_thread_id acpi_gbl_prev_thread_id;</div><div class='ctx'> static char *acpi_gbl_fn_entry_str = "----Entry";</div><div class='ctx'> static char *acpi_gbl_fn_exit_str = "----Exit-";</div><div class='ctx'> </div><div class='hunk'>@@ -123,12 +121,14 @@ static const char *acpi_ut_trim_function_name(const char *function_name)</div><div class='ctx'> 	/* All Function names are longer than 4 chars, check is safe */</div><div class='ctx'> </div><div class='ctx'> 	if (*(ACPI_CAST_PTR(u32, function_name)) == ACPI_PREFIX_MIXED) {</div><div class='add'>+</div><div class='ctx'> 		/* This is the case where the original source has not been modified */</div><div class='ctx'> </div><div class='ctx'> 		return (function_name + 4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (*(ACPI_CAST_PTR(u32, function_name)) == ACPI_PREFIX_LOWER) {</div><div class='add'>+</div><div class='ctx'> 		/* This is the case where the source has been 'linuxized' */</div><div class='ctx'> </div><div class='ctx'> 		return (function_name + 5);</div><div class='hunk'>@@ -162,7 +162,7 @@ acpi_ut_debug_print(u32 requested_debug_level,</div><div class='ctx'> 		    const char *function_name,</div><div class='ctx'> 		    char *module_name, u32 component_id, char *format, ...)</div><div class='ctx'> {</div><div class='del'>-	u32 thread_id;</div><div class='add'>+	acpi_thread_id thread_id;</div><div class='ctx'> 	va_list args;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -177,12 +177,11 @@ acpi_ut_debug_print(u32 requested_debug_level,</div><div class='ctx'> 	 * Thread tracking and context switch notification</div><div class='ctx'> 	 */</div><div class='ctx'> 	thread_id = acpi_os_get_thread_id();</div><div class='del'>-</div><div class='ctx'> 	if (thread_id != acpi_gbl_prev_thread_id) {</div><div class='ctx'> 		if (ACPI_LV_THREADS &amp; acpi_dbg_level) {</div><div class='ctx'> 			acpi_os_printf</div><div class='ctx'> 			    ("\n**** Context Switch from TID %X to TID %X ****\n\n",</div><div class='del'>-			     acpi_gbl_prev_thread_id, thread_id);</div><div class='add'>+			     (u32) acpi_gbl_prev_thread_id, (u32) thread_id);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		acpi_gbl_prev_thread_id = thread_id;</div><div class='hunk'>@@ -206,7 +205,7 @@ acpi_ut_debug_print(u32 requested_debug_level,</div><div class='ctx'> 	acpi_os_vprintf(format, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_ut_debug_print);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_ut_debug_print)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -226,7 +225,6 @@ EXPORT_SYMBOL(acpi_ut_debug_print);</div><div class='ctx'>  *              debug_print so that the same macros can be used.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> void ACPI_INTERNAL_VAR_XFACE</div><div class='ctx'> acpi_ut_debug_print_raw(u32 requested_debug_level,</div><div class='ctx'> 			u32 line_number,</div><div class='hunk'>@@ -244,7 +242,7 @@ acpi_ut_debug_print_raw(u32 requested_debug_level,</div><div class='ctx'> 	acpi_os_vprintf(format, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_ut_debug_print_raw);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_raw)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -261,7 +259,6 @@ EXPORT_SYMBOL(acpi_ut_debug_print_raw);</div><div class='ctx'>  *              set in debug_level</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> acpi_ut_trace(u32 line_number,</div><div class='ctx'> 	      const char *function_name, char *module_name, u32 component_id)</div><div class='hunk'>@@ -275,7 +272,7 @@ acpi_ut_trace(u32 line_number,</div><div class='ctx'> 			    component_id, "%s\n", acpi_gbl_fn_entry_str);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_ut_trace);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_ut_trace)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -293,7 +290,6 @@ EXPORT_SYMBOL(acpi_ut_trace);</div><div class='ctx'>  *              set in debug_level</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> acpi_ut_trace_ptr(u32 line_number,</div><div class='ctx'> 		  const char *function_name,</div><div class='hunk'>@@ -400,7 +396,7 @@ acpi_ut_exit(u32 line_number,</div><div class='ctx'> 	acpi_gbl_nesting_level--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_ut_exit);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_ut_exit)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -418,7 +414,6 @@ EXPORT_SYMBOL(acpi_ut_exit);</div><div class='ctx'>  *              set in debug_level. Prints exit status also.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> acpi_ut_status_exit(u32 line_number,</div><div class='ctx'> 		    const char *function_name,</div><div class='hunk'>@@ -442,7 +437,7 @@ acpi_ut_status_exit(u32 line_number,</div><div class='ctx'> 	acpi_gbl_nesting_level--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_ut_status_exit);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -460,7 +455,6 @@ EXPORT_SYMBOL(acpi_ut_status_exit);</div><div class='ctx'>  *              set in debug_level. Prints exit value also.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> acpi_ut_value_exit(u32 line_number,</div><div class='ctx'> 		   const char *function_name,</div><div class='hunk'>@@ -475,7 +469,7 @@ acpi_ut_value_exit(u32 line_number,</div><div class='ctx'> 	acpi_gbl_nesting_level--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_ut_value_exit);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -493,7 +487,6 @@ EXPORT_SYMBOL(acpi_ut_value_exit);</div><div class='ctx'>  *              set in debug_level. Prints exit value also.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> acpi_ut_ptr_exit(u32 line_number,</div><div class='ctx'> 		 const char *function_name,</div><div class='hunk'>@@ -524,20 +517,13 @@ acpi_ut_ptr_exit(u32 line_number,</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)</div><div class='add'>+void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_native_uint i = 0;</div><div class='ctx'> 	acpi_native_uint j;</div><div class='ctx'> 	u32 temp32;</div><div class='ctx'> 	u8 buf_char;</div><div class='ctx'> </div><div class='del'>-	/* Only dump the buffer if tracing is enabled */</div><div class='del'>-</div><div class='del'>-	if (!((ACPI_LV_TABLES &amp; acpi_dbg_level) &amp;&amp;</div><div class='del'>-	      (component_id &amp; acpi_dbg_layer))) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if ((count &lt; 4) || (count &amp; 0x01)) {</div><div class='ctx'> 		display = DB_BYTE_DISPLAY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -545,6 +531,7 @@ void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)</div><div class='ctx'> 	/* Nasty little dump buffer routine! */</div><div class='ctx'> </div><div class='ctx'> 	while (i &lt; count) {</div><div class='add'>+</div><div class='ctx'> 		/* Print current offset */</div><div class='ctx'> </div><div class='ctx'> 		acpi_os_printf("%6.4X: ", (u32) i);</div><div class='hunk'>@@ -553,6 +540,7 @@ void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; 16;) {</div><div class='ctx'> 			if (i + j &gt;= count) {</div><div class='add'>+</div><div class='ctx'> 				/* Dump fill spaces */</div><div class='ctx'> </div><div class='ctx'> 				acpi_os_printf("%*s", ((display * 2) + 1), " ");</div><div class='hunk'>@@ -561,6 +549,7 @@ void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			switch (display) {</div><div class='add'>+			case DB_BYTE_DISPLAY:</div><div class='ctx'> 			default:	/* Default is BYTE display */</div><div class='ctx'> </div><div class='ctx'> 				acpi_os_printf("%02X ", buffer[i + j]);</div><div class='hunk'>@@ -618,3 +607,31 @@ void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * FUNCTION:    acpi_ut_dump_buffer</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Buffer              - Buffer to dump</div><div class='add'>+ *              Count               - Amount to dump, in bytes</div><div class='add'>+ *              Display             - BYTE, WORD, DWORD, or QWORD display</div><div class='add'>+ *              component_iD        - Caller's component ID</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      None</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Generic dump buffer in both hex and ascii.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* Only dump the buffer if tracing is enabled */</div><div class='add'>+</div><div class='add'>+	if (!((ACPI_LV_TABLES &amp; acpi_dbg_level) &amp;&amp;</div><div class='add'>+	      (component_id &amp; acpi_dbg_layer))) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acpi_ut_dump_buffer2(buffer, count, display);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c<br/>index 1db9695b0029..9d3f1149ba21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utdelete.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utdelete.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utdelete.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utdelete.c</a></div><div class='hunk'>@@ -76,7 +76,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 	union acpi_operand_object *second_desc;</div><div class='ctx'> 	union acpi_operand_object *next_desc;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_delete_internal_obj", object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_delete_internal_obj, object);</div><div class='ctx'> </div><div class='ctx'> 	if (!object) {</div><div class='ctx'> 		return_VOID;</div><div class='hunk'>@@ -96,6 +96,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 		/* Free the actual string buffer */</div><div class='ctx'> </div><div class='ctx'> 		if (!(object-&gt;common.flags &amp; AOPOBJ_STATIC_POINTER)) {</div><div class='add'>+</div><div class='ctx'> 			/* But only if it is NOT a pointer into an ACPI table */</div><div class='ctx'> </div><div class='ctx'> 			obj_pointer = object-&gt;string.pointer;</div><div class='hunk'>@@ -111,6 +112,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 		/* Free the actual buffer */</div><div class='ctx'> </div><div class='ctx'> 		if (!(object-&gt;common.flags &amp; AOPOBJ_STATIC_POINTER)) {</div><div class='add'>+</div><div class='ctx'> 			/* But only if it is NOT a pointer into an ACPI table */</div><div class='ctx'> </div><div class='ctx'> 			obj_pointer = object-&gt;buffer.pointer;</div><div class='hunk'>@@ -153,21 +155,30 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 	case ACPI_TYPE_MUTEX:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,</div><div class='del'>-				  "***** Mutex %p, Semaphore %p\n",</div><div class='del'>-				  object, object-&gt;mutex.semaphore));</div><div class='add'>+				  "***** Mutex %p, OS Mutex %p\n",</div><div class='add'>+				  object, object-&gt;mutex.os_mutex));</div><div class='add'>+</div><div class='add'>+		if (object-&gt;mutex.os_mutex != ACPI_GLOBAL_LOCK) {</div><div class='add'>+			acpi_ex_unlink_mutex(object);</div><div class='add'>+			acpi_os_delete_mutex(object-&gt;mutex.os_mutex);</div><div class='add'>+		} else {</div><div class='add'>+			/* Global Lock "mutex" is actually a counting semaphore */</div><div class='ctx'> </div><div class='del'>-		acpi_ex_unlink_mutex(object);</div><div class='del'>-		(void)acpi_os_delete_semaphore(object-&gt;mutex.semaphore);</div><div class='add'>+			(void)</div><div class='add'>+			    acpi_os_delete_semaphore</div><div class='add'>+			    (acpi_gbl_global_lock_semaphore);</div><div class='add'>+			acpi_gbl_global_lock_semaphore = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_EVENT:</div><div class='ctx'> </div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,</div><div class='del'>-				  "***** Event %p, Semaphore %p\n",</div><div class='del'>-				  object, object-&gt;event.semaphore));</div><div class='add'>+				  "***** Event %p, OS Semaphore %p\n",</div><div class='add'>+				  object, object-&gt;event.os_semaphore));</div><div class='ctx'> </div><div class='del'>-		(void)acpi_os_delete_semaphore(object-&gt;event.semaphore);</div><div class='del'>-		object-&gt;event.semaphore = NULL;</div><div class='add'>+		(void)acpi_os_delete_semaphore(object-&gt;event.os_semaphore);</div><div class='add'>+		object-&gt;event.os_semaphore = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_TYPE_METHOD:</div><div class='hunk'>@@ -175,12 +186,13 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,</div><div class='ctx'> 				  "***** Method %p\n", object));</div><div class='ctx'> </div><div class='del'>-		/* Delete the method semaphore if it exists */</div><div class='add'>+		/* Delete the method mutex if it exists */</div><div class='ctx'> </div><div class='del'>-		if (object-&gt;method.semaphore) {</div><div class='del'>-			(void)acpi_os_delete_semaphore(object-&gt;method.</div><div class='del'>-						       semaphore);</div><div class='del'>-			object-&gt;method.semaphore = NULL;</div><div class='add'>+		if (object-&gt;method.mutex) {</div><div class='add'>+			acpi_os_delete_mutex(object-&gt;method.mutex-&gt;mutex.</div><div class='add'>+					     os_mutex);</div><div class='add'>+			acpi_ut_delete_object_desc(object-&gt;method.mutex);</div><div class='add'>+			object-&gt;method.mutex = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -198,11 +210,22 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 			 */</div><div class='ctx'> 			handler_desc = object-&gt;region.handler;</div><div class='ctx'> 			if (handler_desc) {</div><div class='del'>-				if (handler_desc-&gt;address_space.</div><div class='del'>-				    hflags &amp;</div><div class='add'>+				if (handler_desc-&gt;address_space.handler_flags &amp;</div><div class='ctx'> 				    ACPI_ADDR_HANDLER_DEFAULT_INSTALLED) {</div><div class='del'>-					obj_pointer =</div><div class='del'>-					    second_desc-&gt;extra.region_context;</div><div class='add'>+</div><div class='add'>+					/* Deactivate region and free region context */</div><div class='add'>+</div><div class='add'>+					if (handler_desc-&gt;address_space.setup) {</div><div class='add'>+						(void)handler_desc-&gt;</div><div class='add'>+						    address_space.setup(object,</div><div class='add'>+									ACPI_REGION_DEACTIVATE,</div><div class='add'>+									handler_desc-&gt;</div><div class='add'>+									address_space.</div><div class='add'>+									context,</div><div class='add'>+									&amp;second_desc-&gt;</div><div class='add'>+									extra.</div><div class='add'>+									region_context);</div><div class='add'>+					}</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				acpi_ut_remove_reference(handler_desc);</div><div class='hunk'>@@ -234,7 +257,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)</div><div class='ctx'> 	if (obj_pointer) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,</div><div class='ctx'> 				  "Deleting Object Subptr %p\n", obj_pointer));</div><div class='del'>-		ACPI_MEM_FREE(obj_pointer);</div><div class='add'>+		ACPI_FREE(obj_pointer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now the object can be safely deleted */</div><div class='hunk'>@@ -263,7 +286,7 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object **internal_obj;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_delete_internal_object_list");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_delete_internal_object_list);</div><div class='ctx'> </div><div class='ctx'> 	/* Walk the null-terminated internal list */</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +296,7 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)</div><div class='ctx'> </div><div class='ctx'> 	/* Free the combined parameter pointer list and object array */</div><div class='ctx'> </div><div class='del'>-	ACPI_MEM_FREE(obj_list);</div><div class='add'>+	ACPI_FREE(obj_list);</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -296,7 +319,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)</div><div class='ctx'> 	u16 count;</div><div class='ctx'> 	u16 new_count;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ut_update_ref_count");</div><div class='add'>+	ACPI_FUNCTION_NAME(ut_update_ref_count);</div><div class='ctx'> </div><div class='ctx'> 	if (!object) {</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -306,11 +329,9 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)</div><div class='ctx'> 	new_count = count;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Perform the reference count action</div><div class='del'>-	 * (increment, decrement, or force delete)</div><div class='add'>+	 * Perform the reference count action (increment, decrement, force delete)</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (action) {</div><div class='del'>-</div><div class='ctx'> 	case REF_INCREMENT:</div><div class='ctx'> </div><div class='ctx'> 		new_count++;</div><div class='hunk'>@@ -347,7 +368,6 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)</div><div class='ctx'> 		if (new_count == 0) {</div><div class='ctx'> 			acpi_ut_delete_internal_obj(object);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case REF_FORCE_DELETE:</div><div class='hunk'>@@ -372,13 +392,10 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)</div><div class='ctx'> 	 * (A deleted object will have a huge reference count)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (count &gt; ACPI_MAX_REFERENCE_COUNT) {</div><div class='del'>-</div><div class='ctx'> 		ACPI_WARNING((AE_INFO,</div><div class='del'>-			      "Large Reference Count (%X) in object %p",</div><div class='del'>-			      count, object));</div><div class='add'>+			      "Large Reference Count (%X) in object %p", count,</div><div class='add'>+			      object));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -404,7 +421,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status</div><div class='del'>-acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)</div><div class='add'>+acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	union acpi_generic_state *state_list = NULL;</div><div class='hunk'>@@ -412,9 +429,10 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_update_object_reference", object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_update_object_reference, object);</div><div class='ctx'> </div><div class='ctx'> 	while (object) {</div><div class='add'>+</div><div class='ctx'> 		/* Make sure that this isn't a namespace handle */</div><div class='ctx'> </div><div class='ctx'> 		if (ACPI_GET_DESCRIPTOR_TYPE(object) == ACPI_DESC_TYPE_NAMED) {</div><div class='hunk'>@@ -429,11 +447,16 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch (ACPI_GET_OBJECT_TYPE(object)) {</div><div class='ctx'> 		case ACPI_TYPE_DEVICE:</div><div class='add'>+		case ACPI_TYPE_PROCESSOR:</div><div class='add'>+		case ACPI_TYPE_POWER:</div><div class='add'>+		case ACPI_TYPE_THERMAL:</div><div class='add'>+</div><div class='add'>+			/* Update the notify objects for these types (if present) */</div><div class='ctx'> </div><div class='del'>-			acpi_ut_update_ref_count(object-&gt;device.system_notify,</div><div class='del'>-						 action);</div><div class='del'>-			acpi_ut_update_ref_count(object-&gt;device.device_notify,</div><div class='del'>-						 action);</div><div class='add'>+			acpi_ut_update_ref_count(object-&gt;common_notify.</div><div class='add'>+						 system_notify, action);</div><div class='add'>+			acpi_ut_update_ref_count(object-&gt;common_notify.</div><div class='add'>+						 device_notify, action);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_TYPE_PACKAGE:</div><div class='hunk'>@@ -507,11 +530,11 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_TYPE_REGION:</div><div class='ctx'> 		default:</div><div class='del'>-			break;	/* No subobjects */</div><div class='add'>+			break;	/* No subobjects for all other types */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * Now we can update the count in the main object.  This can only</div><div class='add'>+		 * Now we can update the count in the main object. This can only</div><div class='ctx'> 		 * happen after we update the sub-objects in case this causes the</div><div class='ctx'> 		 * main object to be deleted.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -556,7 +579,7 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)</div><div class='ctx'> void acpi_ut_add_reference(union acpi_operand_object *object)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_add_reference", object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_add_reference, object);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that we have a valid object */</div><div class='ctx'> </div><div class='hunk'>@@ -589,11 +612,11 @@ void acpi_ut_add_reference(union acpi_operand_object *object)</div><div class='ctx'> void acpi_ut_remove_reference(union acpi_operand_object *object)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_remove_reference", object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_remove_reference, object);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Allow a NULL pointer to be passed in, just ignore it.  This saves</div><div class='del'>-	 * each caller from having to check.  Also, ignore NS nodes.</div><div class='add'>+	 * Allow a NULL pointer to be passed in, just ignore it. This saves</div><div class='add'>+	 * each caller from having to check. Also, ignore NS nodes.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!object ||</div><div class='hunk'>@@ -613,7 +636,7 @@ void acpi_ut_remove_reference(union acpi_operand_object *object)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Decrement the reference count, and only actually delete the object</div><div class='del'>-	 * if the reference count becomes 0.  (Must also decrement the ref count</div><div class='add'>+	 * if the reference count becomes 0. (Must also decrement the ref count</div><div class='ctx'> 	 * of all subobjects!)</div><div class='ctx'> 	 */</div><div class='ctx'> 	(void)acpi_ut_update_object_reference(object, REF_DECREMENT);</div><div class='head'>diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c<br/>index 106cc97cb4af..d6d7121583c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/uteval.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/uteval.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/uteval.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/uteval.c</a></div><div class='hunk'>@@ -56,6 +56,34 @@ static acpi_status</div><div class='ctx'> acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,</div><div class='ctx'> 			  struct acpi_compatible_id *one_cid);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Strings supported by the _OSI predefined (internal) method.</div><div class='add'>+ */</div><div class='add'>+static const char *acpi_interfaces_supported[] = {</div><div class='add'>+	/* Operating System Vendor Strings */</div><div class='add'>+</div><div class='add'>+	"Linux",</div><div class='add'>+	"Windows 2000",</div><div class='add'>+	"Windows 2001",</div><div class='add'>+	"Windows 2001 SP0",</div><div class='add'>+	"Windows 2001 SP1",</div><div class='add'>+	"Windows 2001 SP2",</div><div class='add'>+	"Windows 2001 SP3",</div><div class='add'>+	"Windows 2001 SP4",</div><div class='add'>+	"Windows 2001.1",</div><div class='add'>+	"Windows 2001.1 SP1",	/* Added 03/2006 */</div><div class='add'>+	"Windows 2006",		/* Added 03/2006 */</div><div class='add'>+</div><div class='add'>+	/* Feature Group Strings */</div><div class='add'>+</div><div class='add'>+	"Extended Address Space Descriptor"</div><div class='add'>+	    /*</div><div class='add'>+	     * All "optional" feature group strings (features that are implemented</div><div class='add'>+	     * by the host) should be implemented in the host version of</div><div class='add'>+	     * acpi_os_validate_interface and should not be added here.</div><div class='add'>+	     */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_ut_osi_implementation</div><div class='hunk'>@@ -64,18 +92,18 @@ acpi_ut_translate_one_cid(union acpi_operand_object *obj_desc,</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Implementation of _OSI predefined control method</div><div class='del'>- *              Supported = _OSI (String)</div><div class='add'>+ * DESCRIPTION: Implementation of the _OSI predefined control method</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)</div><div class='ctx'> {</div><div class='add'>+	acpi_status status;</div><div class='ctx'> 	union acpi_operand_object *string_desc;</div><div class='ctx'> 	union acpi_operand_object *return_desc;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_osi_implementation");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_osi_implementation);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate the string input argument */</div><div class='ctx'> </div><div class='hunk'>@@ -84,28 +112,47 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)</div><div class='ctx'> 		return_ACPI_STATUS(AE_TYPE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Create a return object (Default value = 0) */</div><div class='add'>+	/* Create a return object */</div><div class='ctx'> </div><div class='ctx'> 	return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);</div><div class='ctx'> 	if (!return_desc) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Compare input string to table of supported strings */</div><div class='add'>+	/* Default return value is SUPPORTED */</div><div class='add'>+</div><div class='add'>+	return_desc-&gt;integer.value = ACPI_UINT32_MAX;</div><div class='add'>+	walk_state-&gt;return_desc = return_desc;</div><div class='add'>+</div><div class='add'>+	/* Compare input string to static table of supported interfaces */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ACPI_NUM_OSI_STRINGS; i++) {</div><div class='del'>-		if (!ACPI_STRCMP(string_desc-&gt;string.pointer,</div><div class='del'>-				 ACPI_CAST_PTR(char,</div><div class='del'>-					       acpi_gbl_valid_osi_strings[i])))</div><div class='del'>-		{</div><div class='del'>-			/* This string is supported */</div><div class='add'>+	for (i = 0; i &lt; ACPI_ARRAY_LENGTH(acpi_interfaces_supported); i++) {</div><div class='add'>+		if (!ACPI_STRCMP</div><div class='add'>+		    (string_desc-&gt;string.pointer,</div><div class='add'>+		     acpi_interfaces_supported[i])) {</div><div class='ctx'> </div><div class='del'>-			return_desc-&gt;integer.value = 0xFFFFFFFF;</div><div class='del'>-			break;</div><div class='add'>+			/* The interface is supported */</div><div class='add'>+</div><div class='add'>+			return_ACPI_STATUS(AE_CTRL_TERMINATE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	walk_state-&gt;return_desc = return_desc;</div><div class='add'>+	/*</div><div class='add'>+	 * Did not match the string in the static table, call the host OSL to</div><div class='add'>+	 * check for a match with one of the optional strings (such as</div><div class='add'>+	 * "Module Device", "3.0 Thermal Model", etc.)</div><div class='add'>+	 */</div><div class='add'>+	status = acpi_os_validate_interface(string_desc-&gt;string.pointer);</div><div class='add'>+	if (ACPI_SUCCESS(status)) {</div><div class='add'>+</div><div class='add'>+		/* The interface is supported */</div><div class='add'>+</div><div class='add'>+		return_ACPI_STATUS(AE_CTRL_TERMINATE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The interface is not supported */</div><div class='add'>+</div><div class='add'>+	return_desc-&gt;integer.value = 0;</div><div class='ctx'> 	return_ACPI_STATUS(AE_CTRL_TERMINATE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -134,19 +181,26 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,</div><div class='ctx'> 			u32 expected_return_btypes,</div><div class='ctx'> 			union acpi_operand_object **return_desc)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_parameter_info info;</div><div class='add'>+	struct acpi_evaluate_info *info;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 return_btype;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_evaluate_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_evaluate_object);</div><div class='ctx'> </div><div class='del'>-	info.node = prefix_node;</div><div class='del'>-	info.parameters = NULL;</div><div class='del'>-	info.parameter_type = ACPI_PARAM_ARGS;</div><div class='add'>+	/* Allocate the evaluation information block */</div><div class='add'>+</div><div class='add'>+	info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info));</div><div class='add'>+	if (!info) {</div><div class='add'>+		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;prefix_node = prefix_node;</div><div class='add'>+	info-&gt;pathname = path;</div><div class='add'>+	info-&gt;parameter_type = ACPI_PARAM_ARGS;</div><div class='ctx'> </div><div class='ctx'> 	/* Evaluate the object/method */</div><div class='ctx'> </div><div class='del'>-	status = acpi_ns_evaluate_relative(path, &amp;info);</div><div class='add'>+	status = acpi_ns_evaluate(info);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		if (status == AE_NOT_FOUND) {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='hunk'>@@ -158,25 +212,25 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,</div><div class='ctx'> 					  prefix_node, path, status);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Did we get a return object? */</div><div class='ctx'> </div><div class='del'>-	if (!info.return_object) {</div><div class='add'>+	if (!info-&gt;return_object) {</div><div class='ctx'> 		if (expected_return_btypes) {</div><div class='ctx'> 			ACPI_ERROR_METHOD("No object was returned from",</div><div class='ctx'> 					  prefix_node, path, AE_NOT_EXIST);</div><div class='ctx'> </div><div class='del'>-			return_ACPI_STATUS(AE_NOT_EXIST);</div><div class='add'>+			status = AE_NOT_EXIST;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Map the return object type to the bitmapped type */</div><div class='ctx'> </div><div class='del'>-	switch (ACPI_GET_OBJECT_TYPE(info.return_object)) {</div><div class='add'>+	switch (ACPI_GET_OBJECT_TYPE(info-&gt;return_object)) {</div><div class='ctx'> 	case ACPI_TYPE_INTEGER:</div><div class='ctx'> 		return_btype = ACPI_BTYPE_INTEGER;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -204,8 +258,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,</div><div class='ctx'> 		 * happen frequently if the "implicit return" feature is enabled.</div><div class='ctx'> 		 * Just delete the return object and return AE_OK.</div><div class='ctx'> 		 */</div><div class='del'>-		acpi_ut_remove_reference(info.return_object);</div><div class='del'>-		return_ACPI_STATUS(AE_OK);</div><div class='add'>+		acpi_ut_remove_reference(info-&gt;return_object);</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Is the return object one of the expected types? */</div><div class='hunk'>@@ -217,19 +271,23 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='ctx'> 			    "Type returned from %s was incorrect: %s, expected Btypes: %X",</div><div class='ctx'> 			    path,</div><div class='del'>-			    acpi_ut_get_object_type_name(info.return_object),</div><div class='add'>+			    acpi_ut_get_object_type_name(info-&gt;return_object),</div><div class='ctx'> 			    expected_return_btypes));</div><div class='ctx'> </div><div class='ctx'> 		/* On error exit, we must delete the return object */</div><div class='ctx'> </div><div class='del'>-		acpi_ut_remove_reference(info.return_object);</div><div class='del'>-		return_ACPI_STATUS(AE_TYPE);</div><div class='add'>+		acpi_ut_remove_reference(info-&gt;return_object);</div><div class='add'>+		status = AE_TYPE;</div><div class='add'>+		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Object type is OK, return it */</div><div class='ctx'> </div><div class='del'>-	*return_desc = info.return_object;</div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	*return_desc = info-&gt;return_object;</div><div class='add'>+</div><div class='add'>+      cleanup:</div><div class='add'>+	ACPI_FREE(info);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -257,7 +315,7 @@ acpi_ut_evaluate_numeric_object(char *object_name,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_evaluate_numeric_object");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_evaluate_numeric_object);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_evaluate_object(device_node, object_name,</div><div class='ctx'> 					 ACPI_BTYPE_INTEGER, &amp;obj_desc);</div><div class='hunk'>@@ -333,7 +391,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_execute_HID");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_execute_HID);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_evaluate_object(device_node, METHOD_NAME__HID,</div><div class='ctx'> 					 ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,</div><div class='hunk'>@@ -343,6 +401,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {</div><div class='add'>+</div><div class='ctx'> 		/* Convert the Numeric HID to string */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ex_eisa_id_to_string((u32) obj_desc-&gt;integer.value,</div><div class='hunk'>@@ -436,7 +495,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,</div><div class='ctx'> 	struct acpi_compatible_id_list *cid_list;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_execute_CID");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_execute_CID);</div><div class='ctx'> </div><div class='ctx'> 	/* Evaluate the _CID method for this device */</div><div class='ctx'> </div><div class='hunk'>@@ -459,7 +518,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,</div><div class='ctx'> 	size = (((count - 1) * sizeof(struct acpi_compatible_id)) +</div><div class='ctx'> 		sizeof(struct acpi_compatible_id_list));</div><div class='ctx'> </div><div class='del'>-	cid_list = ACPI_MEM_CALLOCATE((acpi_size) size);</div><div class='add'>+	cid_list = ACPI_ALLOCATE_ZEROED((acpi_size) size);</div><div class='ctx'> 	if (!cid_list) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -479,6 +538,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,</div><div class='ctx'> 	/* The _CID object can be either a single CID or a package (list) of CIDs */</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_PACKAGE) {</div><div class='add'>+</div><div class='ctx'> 		/* Translate each package element */</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; count; i++) {</div><div class='hunk'>@@ -499,7 +559,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node * device_node,</div><div class='ctx'> 	/* Cleanup on error */</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_MEM_FREE(cid_list);</div><div class='add'>+		ACPI_FREE(cid_list);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*return_cid_list = cid_list;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -533,7 +593,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_execute_UID");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_execute_UID);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_evaluate_object(device_node, METHOD_NAME__UID,</div><div class='ctx'> 					 ACPI_BTYPE_INTEGER | ACPI_BTYPE_STRING,</div><div class='hunk'>@@ -543,6 +603,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {</div><div class='add'>+</div><div class='ctx'> 		/* Convert the Numeric UID to string */</div><div class='ctx'> </div><div class='ctx'> 		acpi_ex_unsigned_integer_to_string(obj_desc-&gt;integer.value,</div><div class='hunk'>@@ -582,7 +643,7 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 * flags)</div><div class='ctx'> 	union acpi_operand_object *obj_desc;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_execute_STA");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_execute_STA);</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_ut_evaluate_object(device_node, METHOD_NAME__STA,</div><div class='ctx'> 					 ACPI_BTYPE_INTEGER, &amp;obj_desc);</div><div class='hunk'>@@ -632,7 +693,7 @@ acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_execute_Sxds");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_execute_sxds);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		highest[i] = 0xFF;</div><div class='head'>diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c<br/>index ffd13383a325..014030af8b50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utglobal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utglobal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utglobal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utglobal.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEFINE_ACPI_GLOBALS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -119,6 +118,7 @@ const char *acpi_format_exception(acpi_status status)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!exception) {</div><div class='add'>+</div><div class='ctx'> 		/* Exception code was not recognized */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -143,12 +143,10 @@ const char *acpi_format_exception(acpi_status status)</div><div class='ctx'> </div><div class='ctx'> /* Debug switch - level and trace mask */</div><div class='ctx'> u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;</div><div class='del'>-EXPORT_SYMBOL(acpi_dbg_level);</div><div class='ctx'> </div><div class='ctx'> /* Debug switch - layer (component) mask */</div><div class='ctx'> </div><div class='ctx'> u32 acpi_dbg_layer = ACPI_COMPONENT_DEFAULT | ACPI_ALL_DRIVERS;</div><div class='del'>-EXPORT_SYMBOL(acpi_dbg_layer);</div><div class='ctx'> u32 acpi_gbl_nesting_level = 0;</div><div class='ctx'> </div><div class='ctx'> /* Debugger globals */</div><div class='hunk'>@@ -183,28 +181,6 @@ const char *acpi_gbl_highest_dstate_names[4] = {</div><div class='ctx'> 	"_S4D"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Strings supported by the _OSI predefined (internal) method.</div><div class='del'>- * When adding strings, be sure to update ACPI_NUM_OSI_STRINGS.</div><div class='del'>- */</div><div class='del'>-const char *acpi_gbl_valid_osi_strings[ACPI_NUM_OSI_STRINGS] = {</div><div class='del'>-	/* Operating System Vendor Strings */</div><div class='del'>-</div><div class='del'>-	"Linux",</div><div class='del'>-	"Windows 2000",</div><div class='del'>-	"Windows 2001",</div><div class='del'>-	"Windows 2001.1",</div><div class='del'>-	"Windows 2001 SP0",</div><div class='del'>-	"Windows 2001 SP1",</div><div class='del'>-	"Windows 2001 SP2",</div><div class='del'>-	"Windows 2001 SP3",</div><div class='del'>-	"Windows 2001 SP4",</div><div class='del'>-</div><div class='del'>-	/* Feature Group Strings */</div><div class='del'>-</div><div class='del'>-	"Extended Address Space Descriptor"</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Namespace globals</div><div class='hunk'>@@ -317,9 +293,9 @@ char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position)</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-struct acpi_table_list acpi_gbl_table_lists[NUM_ACPI_TABLE_TYPES];</div><div class='add'>+struct acpi_table_list acpi_gbl_table_lists[ACPI_TABLE_ID_MAX + 1];</div><div class='ctx'> </div><div class='del'>-struct acpi_table_support acpi_gbl_table_data[NUM_ACPI_TABLE_TYPES] = {</div><div class='add'>+struct acpi_table_support acpi_gbl_table_data[ACPI_TABLE_ID_MAX + 1] = {</div><div class='ctx'> 	/***********    Name,   Signature, Global typed pointer     Signature size,      Type                  How many allowed?,    Contains valid AML? */</div><div class='ctx'> </div><div class='ctx'> 	/* RSDP 0 */ {RSDP_NAME, RSDP_SIG, NULL, sizeof(RSDP_SIG) - 1,</div><div class='hunk'>@@ -467,7 +443,6 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =</div><div class='ctx'> /* Region type decoding */</div><div class='ctx'> </div><div class='ctx'> const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {</div><div class='del'>-/*! [Begin] no source code translation (keep these ASL Keywords as-is) */</div><div class='ctx'> 	"SystemMemory",</div><div class='ctx'> 	"SystemIO",</div><div class='ctx'> 	"PCI_Config",</div><div class='hunk'>@@ -476,16 +451,15 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {</div><div class='ctx'> 	"CMOS",</div><div class='ctx'> 	"PCIBARTarget",</div><div class='ctx'> 	"DataTable"</div><div class='del'>-/*! [End] no source code translation !*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> char *acpi_ut_get_region_name(u8 space_id)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (space_id &gt;= ACPI_USER_REGION_BEGIN) {</div><div class='del'>-		return ("user_defined_region");</div><div class='add'>+		return ("UserDefinedRegion");</div><div class='ctx'> 	} else if (space_id &gt;= ACPI_NUM_PREDEFINED_REGIONS) {</div><div class='del'>-		return ("invalid_space_id");</div><div class='add'>+		return ("InvalidSpaceId");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (ACPI_CAST_PTR(char, acpi_gbl_region_types[space_id]));</div><div class='hunk'>@@ -506,20 +480,18 @@ char *acpi_ut_get_region_name(u8 space_id)</div><div class='ctx'> /* Event type decoding */</div><div class='ctx'> </div><div class='ctx'> static const char *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] = {</div><div class='del'>-/*! [Begin] no source code translation (keep these strings as-is) */</div><div class='ctx'> 	"PM_Timer",</div><div class='ctx'> 	"GlobalLock",</div><div class='ctx'> 	"PowerButton",</div><div class='ctx'> 	"SleepButton",</div><div class='ctx'> 	"RealTimeClock",</div><div class='del'>-/*! [End] no source code translation !*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> char *acpi_ut_get_event_name(u32 event_id)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (event_id &gt; ACPI_EVENT_MAX) {</div><div class='del'>-		return ("invalid_event_iD");</div><div class='add'>+		return ("InvalidEventID");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));</div><div class='hunk'>@@ -550,7 +522,6 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";</div><div class='ctx'> /* Printable names of the ACPI object types */</div><div class='ctx'> </div><div class='ctx'> static const char *acpi_gbl_ns_type_names[] = {</div><div class='del'>-/*! [Begin] no source code translation (keep these strings as-is) */</div><div class='ctx'> 	/* 00 */ "Untyped",</div><div class='ctx'> 	/* 01 */ "Integer",</div><div class='ctx'> 	/* 02 */ "String",</div><div class='hunk'>@@ -582,7 +553,6 @@ static const char *acpi_gbl_ns_type_names[] = {</div><div class='ctx'> 	/* 28 */ "Extra",</div><div class='ctx'> 	/* 29 */ "Data",</div><div class='ctx'> 	/* 30 */ "Invalid"</div><div class='del'>-/*! [End] no source code translation !*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> char *acpi_ut_get_type_name(acpi_object_type type)</div><div class='hunk'>@@ -635,14 +605,14 @@ char *acpi_ut_get_node_name(void *object)</div><div class='ctx'> </div><div class='ctx'> 	/* Descriptor must be a namespace node */</div><div class='ctx'> </div><div class='del'>-	if (node-&gt;descriptor != ACPI_DESC_TYPE_NAMED) {</div><div class='add'>+	if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {</div><div class='ctx'> 		return ("####");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Name must be a valid ACPI name */</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_ut_valid_acpi_name(node-&gt;name.integer)) {</div><div class='del'>-		return ("????");</div><div class='add'>+		node-&gt;name.integer = acpi_ut_repair_name(node-&gt;name.integer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Return the name */</div><div class='hunk'>@@ -665,7 +635,6 @@ char *acpi_ut_get_node_name(void *object)</div><div class='ctx'> /* Printable names of object descriptor types */</div><div class='ctx'> </div><div class='ctx'> static const char *acpi_gbl_desc_type_names[] = {</div><div class='del'>-/*! [Begin] no source code translation (keep these ASL Keywords as-is) */</div><div class='ctx'> 	/* 00 */ "Invalid",</div><div class='ctx'> 	/* 01 */ "Cached",</div><div class='ctx'> 	/* 02 */ "State-Generic",</div><div class='hunk'>@@ -682,7 +651,6 @@ static const char *acpi_gbl_desc_type_names[] = {</div><div class='ctx'> 	/* 13 */ "Parser",</div><div class='ctx'> 	/* 14 */ "Operand",</div><div class='ctx'> 	/* 15 */ "Node"</div><div class='del'>-/*! [End] no source code translation !*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> char *acpi_ut_get_descriptor_name(void *object)</div><div class='hunk'>@@ -723,7 +691,7 @@ char *acpi_ut_get_descriptor_name(void *object)</div><div class='ctx'> char *acpi_ut_get_mutex_name(u32 mutex_id)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	if (mutex_id &gt; MAX_MUTEX) {</div><div class='add'>+	if (mutex_id &gt; ACPI_MAX_MUTEX) {</div><div class='ctx'> 		return ("Invalid Mutex ID");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -747,6 +715,7 @@ u8 acpi_ut_valid_object_type(acpi_object_type type)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (type &gt; ACPI_TYPE_LOCAL_MAX) {</div><div class='add'>+</div><div class='ctx'> 		/* Note: Assumes all TYPEs are contiguous (external/local) */</div><div class='ctx'> </div><div class='ctx'> 		return (FALSE);</div><div class='hunk'>@@ -773,7 +742,7 @@ void acpi_ut_init_globals(void)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_init_globals");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_init_globals);</div><div class='ctx'> </div><div class='ctx'> 	/* Create all memory caches */</div><div class='ctx'> </div><div class='hunk'>@@ -784,14 +753,14 @@ void acpi_ut_init_globals(void)</div><div class='ctx'> </div><div class='ctx'> 	/* ACPI table structure */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_ACPI_TABLE_TYPES; i++) {</div><div class='add'>+	for (i = 0; i &lt; (ACPI_TABLE_ID_MAX + 1); i++) {</div><div class='ctx'> 		acpi_gbl_table_lists[i].next = NULL;</div><div class='ctx'> 		acpi_gbl_table_lists[i].count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mutex locked flags */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_MUTEX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ACPI_NUM_MUTEX; i++) {</div><div class='ctx'> 		acpi_gbl_mutex_info[i].mutex = NULL;</div><div class='ctx'> 		acpi_gbl_mutex_info[i].thread_id = ACPI_MUTEX_NOT_ACQUIRED;</div><div class='ctx'> 		acpi_gbl_mutex_info[i].use_count = 0;</div><div class='hunk'>@@ -825,6 +794,7 @@ void acpi_ut_init_globals(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Global Lock support */</div><div class='ctx'> </div><div class='add'>+	acpi_gbl_global_lock_semaphore = NULL;</div><div class='ctx'> 	acpi_gbl_global_lock_acquired = FALSE;</div><div class='ctx'> 	acpi_gbl_global_lock_thread_count = 0;</div><div class='ctx'> 	acpi_gbl_global_lock_handle = 0;</div><div class='hunk'>@@ -856,7 +826,7 @@ void acpi_ut_init_globals(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_root_node = NULL;</div><div class='ctx'> 	acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME;</div><div class='del'>-	acpi_gbl_root_node_struct.descriptor = ACPI_DESC_TYPE_NAMED;</div><div class='add'>+	acpi_gbl_root_node_struct.descriptor_type = ACPI_DESC_TYPE_NAMED;</div><div class='ctx'> 	acpi_gbl_root_node_struct.type = ACPI_TYPE_DEVICE;</div><div class='ctx'> 	acpi_gbl_root_node_struct.child = NULL;</div><div class='ctx'> 	acpi_gbl_root_node_struct.peer = NULL;</div><div class='hunk'>@@ -869,3 +839,6 @@ void acpi_ut_init_globals(void)</div><div class='ctx'> </div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_dbg_level)</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_dbg_layer)</div><div class='head'>diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c<br/>index ba771b4f39bc..ff76055eb7d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utinit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utinit.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ ACPI_MODULE_NAME("utinit")</div><div class='ctx'> </div><div class='ctx'> /* Local prototypes */</div><div class='ctx'> static void</div><div class='del'>-acpi_ut_fadt_register_error(char *register_name, u32 value, acpi_size offset);</div><div class='add'>+acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset);</div><div class='ctx'> </div><div class='ctx'> static void acpi_ut_terminate(void);</div><div class='ctx'> </div><div class='hunk'>@@ -69,12 +69,12 @@ static void acpi_ut_terminate(void);</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-acpi_ut_fadt_register_error(char *register_name, u32 value, acpi_size offset)</div><div class='add'>+acpi_ut_fadt_register_error(char *register_name, u32 value, u8 offset)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	ACPI_WARNING((AE_INFO,</div><div class='ctx'> 		      "Invalid FADT value %s=%X at offset %X FADT=%p",</div><div class='del'>-		      register_name, value, (u32) offset, acpi_gbl_FADT));</div><div class='add'>+		      register_name, value, offset, acpi_gbl_FADT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -176,7 +176,7 @@ static void acpi_ut_terminate(void)</div><div class='ctx'> 	struct acpi_gpe_xrupt_info *gpe_xrupt_info;</div><div class='ctx'> 	struct acpi_gpe_xrupt_info *next_gpe_xrupt_info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_terminate");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_terminate);</div><div class='ctx'> </div><div class='ctx'> 	/* Free global tables, etc. */</div><div class='ctx'> 	/* Free global GPE blocks and related info structures */</div><div class='hunk'>@@ -186,14 +186,14 @@ static void acpi_ut_terminate(void)</div><div class='ctx'> 		gpe_block = gpe_xrupt_info-&gt;gpe_block_list_head;</div><div class='ctx'> 		while (gpe_block) {</div><div class='ctx'> 			next_gpe_block = gpe_block-&gt;next;</div><div class='del'>-			ACPI_MEM_FREE(gpe_block-&gt;event_info);</div><div class='del'>-			ACPI_MEM_FREE(gpe_block-&gt;register_info);</div><div class='del'>-			ACPI_MEM_FREE(gpe_block);</div><div class='add'>+			ACPI_FREE(gpe_block-&gt;event_info);</div><div class='add'>+			ACPI_FREE(gpe_block-&gt;register_info);</div><div class='add'>+			ACPI_FREE(gpe_block);</div><div class='ctx'> </div><div class='ctx'> 			gpe_block = next_gpe_block;</div><div class='ctx'> 		}</div><div class='ctx'> 		next_gpe_xrupt_info = gpe_xrupt_info-&gt;next;</div><div class='del'>-		ACPI_MEM_FREE(gpe_xrupt_info);</div><div class='add'>+		ACPI_FREE(gpe_xrupt_info);</div><div class='ctx'> 		gpe_xrupt_info = next_gpe_xrupt_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +216,7 @@ static void acpi_ut_terminate(void)</div><div class='ctx'> void acpi_ut_subsystem_shutdown(void)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_subsystem_shutdown");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_subsystem_shutdown);</div><div class='ctx'> </div><div class='ctx'> 	/* Just exit if subsystem is already shutdown */</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +228,7 @@ void acpi_ut_subsystem_shutdown(void)</div><div class='ctx'> 	/* Subsystem appears active, go ahead and shut it down */</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_shutdown = TRUE;</div><div class='add'>+	acpi_gbl_startup_flags = 0;</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* Close the acpi_event Handling */</div><div class='hunk'>@@ -245,12 +246,5 @@ void acpi_ut_subsystem_shutdown(void)</div><div class='ctx'> 	/* Purge the local caches */</div><div class='ctx'> </div><div class='ctx'> 	(void)acpi_ut_delete_caches();</div><div class='del'>-</div><div class='del'>-	/* Debug only - display leftover memory allocation, if any */</div><div class='del'>-</div><div class='del'>-#ifdef ACPI_DBG_TRACK_ALLOCATIONS</div><div class='del'>-	acpi_ut_dump_allocations(ACPI_UINT32_MAX, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c<br/>index 4a3360484e72..19d74bedce27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utmath.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utmath.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utmath.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utmath.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ acpi_ut_short_divide(acpi_integer dividend,</div><div class='ctx'> 	union uint64_overlay quotient;</div><div class='ctx'> 	u32 remainder32;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_short_divide");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_short_divide);</div><div class='ctx'> </div><div class='ctx'> 	/* Always check for a zero divisor */</div><div class='ctx'> </div><div class='hunk'>@@ -139,7 +139,7 @@ acpi_ut_divide(acpi_integer in_dividend,</div><div class='ctx'> 	union uint64_overlay partial2;</div><div class='ctx'> 	union uint64_overlay partial3;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_divide");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_divide);</div><div class='ctx'> </div><div class='ctx'> 	/* Always check for a zero divisor */</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +261,7 @@ acpi_ut_short_divide(acpi_integer in_dividend,</div><div class='ctx'> 		     acpi_integer * out_quotient, u32 * out_remainder)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_short_divide");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_short_divide);</div><div class='ctx'> </div><div class='ctx'> 	/* Always check for a zero divisor */</div><div class='ctx'> </div><div class='hunk'>@@ -287,7 +287,7 @@ acpi_ut_divide(acpi_integer in_dividend,</div><div class='ctx'> 	       acpi_integer in_divisor,</div><div class='ctx'> 	       acpi_integer * out_quotient, acpi_integer * out_remainder)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_divide");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_divide);</div><div class='ctx'> </div><div class='ctx'> 	/* Always check for a zero divisor */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c<br/>index 7364f5f8c9cd..6d8a8211be90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utmisc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utmisc.c</a></div><div class='hunk'>@@ -41,6 +41,8 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -49,6 +51,33 @@ ACPI_MODULE_NAME("utmisc")</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_ut_is_aml_table</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Table               - An ACPI table</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      TRUE if table contains executable AML; FALSE otherwise</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Check ACPI Signature for a table that contains AML code.</div><div class='add'>+ *              Currently, these are DSDT,SSDT,PSDT. All other table types are</div><div class='add'>+ *              data tables that do not contain AML code.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+u8 acpi_ut_is_aml_table(struct acpi_table_header *table)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	/* These are the only tables that contain executable AML */</div><div class='add'>+</div><div class='add'>+	if (ACPI_COMPARE_NAME(table-&gt;signature, DSDT_SIG) ||</div><div class='add'>+	    ACPI_COMPARE_NAME(table-&gt;signature, PSDT_SIG) ||</div><div class='add'>+	    ACPI_COMPARE_NAME(table-&gt;signature, SSDT_SIG)) {</div><div class='add'>+		return (TRUE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (FALSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_ut_allocate_owner_id</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  owner_id        - Where the new owner ID is returned</div><div class='hunk'>@@ -60,6 +89,7 @@ ACPI_MODULE_NAME("utmisc")</div><div class='ctx'>  *              when the method exits or the table is unloaded.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='add'>+</div><div class='ctx'> acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_native_uint i;</div><div class='hunk'>@@ -67,7 +97,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)</div><div class='ctx'> 	acpi_native_uint k;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_allocate_owner_id");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_allocate_owner_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Guard against multiple allocations of ID to the same location */</div><div class='ctx'> </div><div class='hunk'>@@ -97,6 +127,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)</div><div class='ctx'> </div><div class='ctx'> 		for (k = acpi_gbl_next_owner_id_offset; k &lt; 32; k++) {</div><div class='ctx'> 			if (acpi_gbl_owner_id_mask[j] == ACPI_UINT32_MAX) {</div><div class='add'>+</div><div class='ctx'> 				/* There are no free IDs in this mask */</div><div class='ctx'> </div><div class='ctx'> 				break;</div><div class='hunk'>@@ -123,7 +154,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)</div><div class='ctx'> 				    (acpi_owner_id) ((k + 1) + ACPI_MUL_32(j));</div><div class='ctx'> </div><div class='ctx'> 				ACPI_DEBUG_PRINT((ACPI_DB_VALUES,</div><div class='del'>-						  "Allocated owner_id: %2.2X\n",</div><div class='add'>+						  "Allocated OwnerId: %2.2X\n",</div><div class='ctx'> 						  (unsigned int)*owner_id));</div><div class='ctx'> 				goto exit;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -144,7 +175,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = AE_OWNER_ID_LIMIT;</div><div class='ctx'> 	ACPI_ERROR((AE_INFO,</div><div class='del'>-		    "Could not allocate new owner_id (255 max), AE_OWNER_ID_LIMIT"));</div><div class='add'>+		    "Could not allocate new OwnerId (255 max), AE_OWNER_ID_LIMIT"));</div><div class='ctx'> </div><div class='ctx'>       exit:</div><div class='ctx'> 	(void)acpi_ut_release_mutex(ACPI_MTX_CACHES);</div><div class='hunk'>@@ -172,7 +203,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)</div><div class='ctx'> 	acpi_native_uint index;</div><div class='ctx'> 	u32 bit;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_release_owner_id", owner_id);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ut_release_owner_id, owner_id);</div><div class='ctx'> </div><div class='ctx'> 	/* Always clear the input owner_id (zero is an invalid ID) */</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +212,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)</div><div class='ctx'> 	/* Zero is not a valid owner_iD */</div><div class='ctx'> </div><div class='ctx'> 	if (owner_id == 0) {</div><div class='del'>-		ACPI_ERROR((AE_INFO, "Invalid owner_id: %2.2X", owner_id));</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid OwnerId: %2.2X", owner_id));</div><div class='ctx'> 		return_VOID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +238,7 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)</div><div class='ctx'> 		acpi_gbl_owner_id_mask[index] ^= bit;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO,</div><div class='del'>-			    "Release of non-allocated owner_id: %2.2X",</div><div class='add'>+			    "Release of non-allocated OwnerId: %2.2X",</div><div class='ctx'> 			    owner_id + 1));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -273,6 +304,7 @@ void acpi_ut_print_string(char *string, u8 max_length)</div><div class='ctx'> </div><div class='ctx'> 	acpi_os_printf("\"");</div><div class='ctx'> 	for (i = 0; string[i] &amp;&amp; (i &lt; max_length); i++) {</div><div class='add'>+</div><div class='ctx'> 		/* Escape sequences */</div><div class='ctx'> </div><div class='ctx'> 		switch (string[i]) {</div><div class='hunk'>@@ -387,10 +419,15 @@ void acpi_ut_set_integer_width(u8 revision)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (revision &lt;= 1) {</div><div class='add'>+</div><div class='add'>+		/* 32-bit case */</div><div class='add'>+</div><div class='ctx'> 		acpi_gbl_integer_bit_width = 32;</div><div class='ctx'> 		acpi_gbl_integer_nybble_width = 8;</div><div class='ctx'> 		acpi_gbl_integer_byte_width = 4;</div><div class='ctx'> 	} else {</div><div class='add'>+		/* 64-bit case (ACPI 2.0+) */</div><div class='add'>+</div><div class='ctx'> 		acpi_gbl_integer_bit_width = 64;</div><div class='ctx'> 		acpi_gbl_integer_nybble_width = 16;</div><div class='ctx'> 		acpi_gbl_integer_byte_width = 8;</div><div class='hunk'>@@ -461,12 +498,48 @@ acpi_ut_display_init_pathname(u8 type,</div><div class='ctx'> 	}</div><div class='ctx'> 	acpi_os_printf("\n");</div><div class='ctx'> </div><div class='del'>-	ACPI_MEM_FREE(buffer.pointer);</div><div class='add'>+	ACPI_FREE(buffer.pointer);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_ut_valid_acpi_char</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Char            - The character to be examined</div><div class='add'>+ *              Position        - Byte position (0-3)</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      TRUE if the character is valid, FALSE otherwise</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Check for a valid ACPI character. Must be one of:</div><div class='add'>+ *              1) Upper case alpha</div><div class='add'>+ *              2) numeric</div><div class='add'>+ *              3) underscore</div><div class='add'>+ *</div><div class='add'>+ *              We allow a '!' as the last character because of the ASF! table</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+u8 acpi_ut_valid_acpi_char(char character, acpi_native_uint position)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!((character &gt;= 'A' &amp;&amp; character &lt;= 'Z') ||</div><div class='add'>+	      (character &gt;= '0' &amp;&amp; character &lt;= '9') || (character == '_'))) {</div><div class='add'>+</div><div class='add'>+		/* Allow a '!' in the last position */</div><div class='add'>+</div><div class='add'>+		if (character == '!' &amp;&amp; position == 3) {</div><div class='add'>+			return (TRUE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return (FALSE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (TRUE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_ut_valid_acpi_name</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  Name            - The name to be examined</div><div class='hunk'>@@ -482,19 +555,13 @@ acpi_ut_display_init_pathname(u8 type,</div><div class='ctx'> </div><div class='ctx'> u8 acpi_ut_valid_acpi_name(u32 name)</div><div class='ctx'> {</div><div class='del'>-	char *name_ptr = (char *)&amp;name;</div><div class='del'>-	char character;</div><div class='ctx'> 	acpi_native_uint i;</div><div class='ctx'> </div><div class='ctx'> 	ACPI_FUNCTION_ENTRY();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ACPI_NAME_SIZE; i++) {</div><div class='del'>-		character = *name_ptr;</div><div class='del'>-		name_ptr++;</div><div class='del'>-</div><div class='del'>-		if (!((character == '_') ||</div><div class='del'>-		      (character &gt;= 'A' &amp;&amp; character &lt;= 'Z') ||</div><div class='del'>-		      (character &gt;= '0' &amp;&amp; character &lt;= '9'))) {</div><div class='add'>+		if (!acpi_ut_valid_acpi_char</div><div class='add'>+		    ((ACPI_CAST_PTR(char, &amp;name))[i], i)) {</div><div class='ctx'> 			return (FALSE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -504,24 +571,37 @@ u8 acpi_ut_valid_acpi_name(u32 name)</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ut_valid_acpi_character</div><div class='add'>+ * FUNCTION:    acpi_ut_repair_name</div><div class='ctx'>  *</div><div class='del'>- * PARAMETERS:  Character           - The character to be examined</div><div class='add'>+ * PARAMETERS:  Name            - The ACPI name to be repaired</div><div class='ctx'>  *</div><div class='del'>- * RETURN:      1 if Character may appear in a name, else 0</div><div class='add'>+ * RETURN:      Repaired version of the name</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Check for a printable character</div><div class='add'>+ * DESCRIPTION: Repair an ACPI name: Change invalid characters to '*' and</div><div class='add'>+ *              return the new name.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-u8 acpi_ut_valid_acpi_character(char character)</div><div class='add'>+acpi_name acpi_ut_repair_name(acpi_name name)</div><div class='ctx'> {</div><div class='add'>+	char *name_ptr = ACPI_CAST_PTR(char, &amp;name);</div><div class='add'>+	char new_name[ACPI_NAME_SIZE];</div><div class='add'>+	acpi_native_uint i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_ENTRY();</div><div class='add'>+	for (i = 0; i &lt; ACPI_NAME_SIZE; i++) {</div><div class='add'>+		new_name[i] = name_ptr[i];</div><div class='ctx'> </div><div class='del'>-	return ((u8) ((character == '_') ||</div><div class='del'>-		      (character &gt;= 'A' &amp;&amp; character &lt;= 'Z') ||</div><div class='del'>-		      (character &gt;= '0' &amp;&amp; character &lt;= '9')));</div><div class='add'>+		/*</div><div class='add'>+		 * Replace a bad character with something printable, yet technically</div><div class='add'>+		 * still invalid. This prevents any collisions with existing "good"</div><div class='add'>+		 * names in the namespace.</div><div class='add'>+		 */</div><div class='add'>+		if (!acpi_ut_valid_acpi_char(name_ptr[i], i)) {</div><div class='add'>+			new_name[i] = '*';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (*ACPI_CAST_PTR(u32, new_name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -529,12 +609,15 @@ u8 acpi_ut_valid_acpi_character(char character)</div><div class='ctx'>  * FUNCTION:    acpi_ut_strtoul64</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  String          - Null terminated string</div><div class='del'>- *              Base            - Radix of the string: 10, 16, or ACPI_ANY_BASE</div><div class='add'>+ *              Base            - Radix of the string: 16 or ACPI_ANY_BASE;</div><div class='add'>+ *                                ACPI_ANY_BASE means 'in behalf of to_integer'</div><div class='ctx'>  *              ret_integer     - Where the converted integer is returned</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      Status and Converted value</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Convert a string into an unsigned value.</div><div class='add'>+ * DESCRIPTION: Convert a string into an unsigned value. Performs either a</div><div class='add'>+ *              32-bit or 64-bit conversion, depending on the current mode</div><div class='add'>+ *              of the interpreter.</div><div class='ctx'>  *              NOTE: Does not support Octal strings, not needed.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='hunk'>@@ -545,16 +628,17 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)</div><div class='ctx'> 	u32 this_digit = 0;</div><div class='ctx'> 	acpi_integer return_value = 0;</div><div class='ctx'> 	acpi_integer quotient;</div><div class='add'>+	acpi_integer dividend;</div><div class='add'>+	u32 to_integer_op = (base == ACPI_ANY_BASE);</div><div class='add'>+	u32 mode32 = (acpi_gbl_integer_byte_width == 4);</div><div class='add'>+	u8 valid_digits = 0;</div><div class='add'>+	u8 sign_of0x = 0;</div><div class='add'>+	u8 term = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_stroul64");</div><div class='del'>-</div><div class='del'>-	if ((!string) || !(*string)) {</div><div class='del'>-		goto error_exit;</div><div class='del'>-	}</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ut_stroul64, string);</div><div class='ctx'> </div><div class='ctx'> 	switch (base) {</div><div class='ctx'> 	case ACPI_ANY_BASE:</div><div class='del'>-	case 10:</div><div class='ctx'> 	case 16:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -563,76 +647,112 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!string) {</div><div class='add'>+		goto error_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Skip over any white space in the buffer */</div><div class='ctx'> </div><div class='del'>-	while (ACPI_IS_SPACE(*string) || *string == '\t') {</div><div class='add'>+	while ((*string) &amp;&amp; (ACPI_IS_SPACE(*string) || *string == '\t')) {</div><div class='ctx'> 		string++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If the input parameter Base is zero, then we need to</div><div class='del'>-	 * determine if it is decimal or hexadecimal:</div><div class='del'>-	 */</div><div class='del'>-	if (base == 0) {</div><div class='add'>+	if (to_integer_op) {</div><div class='add'>+		/*</div><div class='add'>+		 * Base equal to ACPI_ANY_BASE means 'to_integer operation case'.</div><div class='add'>+		 * We need to determine if it is decimal or hexadecimal.</div><div class='add'>+		 */</div><div class='ctx'> 		if ((*string == '0') &amp;&amp; (ACPI_TOLOWER(*(string + 1)) == 'x')) {</div><div class='add'>+			sign_of0x = 1;</div><div class='ctx'> 			base = 16;</div><div class='add'>+</div><div class='add'>+			/* Skip over the leading '0x' */</div><div class='ctx'> 			string += 2;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			base = 10;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * For hexadecimal base, skip over the leading</div><div class='del'>-	 * 0 or 0x, if they are present.</div><div class='del'>-	 */</div><div class='del'>-	if ((base == 16) &amp;&amp;</div><div class='del'>-	    (*string == '0') &amp;&amp; (ACPI_TOLOWER(*(string + 1)) == 'x')) {</div><div class='del'>-		string += 2;</div><div class='del'>-	}</div><div class='add'>+	/* Any string left? Check that '0x' is not followed by white space. */</div><div class='ctx'> </div><div class='del'>-	/* Any string left? */</div><div class='del'>-</div><div class='del'>-	if (!(*string)) {</div><div class='del'>-		goto error_exit;</div><div class='add'>+	if (!(*string) || ACPI_IS_SPACE(*string) || *string == '\t') {</div><div class='add'>+		if (to_integer_op) {</div><div class='add'>+			goto error_exit;</div><div class='add'>+		} else {</div><div class='add'>+			goto all_done;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Main loop: convert the string to a 64-bit integer */</div><div class='add'>+	/*</div><div class='add'>+	 * Perform a 32-bit or 64-bit conversion, depending upon the current</div><div class='add'>+	 * execution mode of the interpreter</div><div class='add'>+	 */</div><div class='add'>+	dividend = (mode32) ? ACPI_UINT32_MAX : ACPI_UINT64_MAX;</div><div class='add'>+</div><div class='add'>+	/* Main loop: convert the string to a 32- or 64-bit integer */</div><div class='ctx'> </div><div class='ctx'> 	while (*string) {</div><div class='ctx'> 		if (ACPI_IS_DIGIT(*string)) {</div><div class='add'>+</div><div class='ctx'> 			/* Convert ASCII 0-9 to Decimal value */</div><div class='ctx'> </div><div class='ctx'> 			this_digit = ((u8) * string) - '0';</div><div class='del'>-		} else {</div><div class='del'>-			if (base == 10) {</div><div class='del'>-				/* Digit is out of range */</div><div class='add'>+		} else if (base == 10) {</div><div class='ctx'> </div><div class='del'>-				goto error_exit;</div><div class='del'>-			}</div><div class='add'>+			/* Digit is out of range; possible in to_integer case only */</div><div class='ctx'> </div><div class='add'>+			term = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			this_digit = (u8) ACPI_TOUPPER(*string);</div><div class='ctx'> 			if (ACPI_IS_XDIGIT((char)this_digit)) {</div><div class='add'>+</div><div class='ctx'> 				/* Convert ASCII Hex char to value */</div><div class='ctx'> </div><div class='ctx'> 				this_digit = this_digit - 'A' + 10;</div><div class='ctx'> 			} else {</div><div class='del'>-				/*</div><div class='del'>-				 * We allow non-hex chars, just stop now, same as end-of-string.</div><div class='del'>-				 * See ACPI spec, string-to-integer conversion.</div><div class='del'>-				 */</div><div class='add'>+				term = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (term) {</div><div class='add'>+			if (to_integer_op) {</div><div class='add'>+				goto error_exit;</div><div class='add'>+			} else {</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+		} else if ((valid_digits == 0) &amp;&amp; (this_digit == 0)</div><div class='add'>+			   &amp;&amp; !sign_of0x) {</div><div class='add'>+</div><div class='add'>+			/* Skip zeros */</div><div class='add'>+			string++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		valid_digits++;</div><div class='add'>+</div><div class='add'>+		if (sign_of0x</div><div class='add'>+		    &amp;&amp; ((valid_digits &gt; 16)</div><div class='add'>+			|| ((valid_digits &gt; 8) &amp;&amp; mode32))) {</div><div class='add'>+			/*</div><div class='add'>+			 * This is to_integer operation case.</div><div class='add'>+			 * No any restrictions for string-to-integer conversion,</div><div class='add'>+			 * see ACPI spec.</div><div class='add'>+			 */</div><div class='add'>+			goto error_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Divide the digit into the correct position */</div><div class='ctx'> </div><div class='ctx'> 		(void)</div><div class='del'>-		    acpi_ut_short_divide((ACPI_INTEGER_MAX -</div><div class='del'>-					  (acpi_integer) this_digit), base,</div><div class='del'>-					 &amp;quotient, NULL);</div><div class='add'>+		    acpi_ut_short_divide((dividend - (acpi_integer) this_digit),</div><div class='add'>+					 base, &amp;quotient, NULL);</div><div class='add'>+</div><div class='ctx'> 		if (return_value &gt; quotient) {</div><div class='del'>-			goto error_exit;</div><div class='add'>+			if (to_integer_op) {</div><div class='add'>+				goto error_exit;</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return_value *= base;</div><div class='hunk'>@@ -642,6 +762,11 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)</div><div class='ctx'> </div><div class='ctx'> 	/* All done, normal exit */</div><div class='ctx'> </div><div class='add'>+      all_done:</div><div class='add'>+</div><div class='add'>+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Converted value: %8.8X%8.8X\n",</div><div class='add'>+			  ACPI_FORMAT_UINT64(return_value)));</div><div class='add'>+</div><div class='ctx'> 	*ret_integer = return_value;</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> </div><div class='hunk'>@@ -719,7 +844,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,</div><div class='ctx'> 	u32 this_index;</div><div class='ctx'> 	union acpi_operand_object *this_source_obj;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_walk_package_tree");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_walk_package_tree);</div><div class='ctx'> </div><div class='ctx'> 	state = acpi_ut_create_pkg_state(source_object, target_object, 0);</div><div class='ctx'> 	if (!state) {</div><div class='hunk'>@@ -727,6 +852,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (state) {</div><div class='add'>+</div><div class='ctx'> 		/* Get one element of the package */</div><div class='ctx'> </div><div class='ctx'> 		this_index = state-&gt;pkg.index;</div><div class='hunk'>@@ -814,31 +940,6 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='del'>- * FUNCTION:    acpi_ut_generate_checksum</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  Buffer          - Buffer to be scanned</div><div class='del'>- *              Length          - number of bytes to examine</div><div class='del'>- *</div><div class='del'>- * RETURN:      The generated checksum</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Generate a checksum on a raw buffer</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-u8 acpi_ut_generate_checksum(u8 * buffer, u32 length)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-	signed char sum = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; length; i++) {</div><div class='del'>-		sum = (signed char)(sum + buffer[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ((u8) (0 - sum));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='ctx'>  * FUNCTION:    acpi_ut_error, acpi_ut_warning, acpi_ut_info</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  module_name         - Caller's module name (for error output)</div><div class='hunk'>@@ -876,6 +977,7 @@ acpi_ut_exception(char *module_name,</div><div class='ctx'> 	acpi_os_vprintf(format, args);</div><div class='ctx'> 	acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(acpi_ut_exception);</div><div class='ctx'> </div><div class='ctx'> void ACPI_INTERNAL_VAR_XFACE</div><div class='ctx'> acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)</div><div class='hunk'>@@ -900,36 +1002,3 @@ acpi_ut_info(char *module_name, u32 line_number, char *format, ...)</div><div class='ctx'> 	acpi_os_vprintf(format, args);</div><div class='ctx'> 	acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*******************************************************************************</div><div class='del'>- *</div><div class='del'>- * FUNCTION:    acpi_ut_report_error, Warning, Info</div><div class='del'>- *</div><div class='del'>- * PARAMETERS:  module_name         - Caller's module name (for error output)</div><div class='del'>- *              line_number         - Caller's line number (for error output)</div><div class='del'>- *</div><div class='del'>- * RETURN:      None</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION: Print error message</div><div class='del'>- *</div><div class='del'>- * Note: Legacy only, should be removed when no longer used by drivers.</div><div class='del'>- *</div><div class='del'>- ******************************************************************************/</div><div class='del'>-</div><div class='del'>-void acpi_ut_report_error(char *module_name, u32 line_number)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void acpi_ut_report_warning(char *module_name, u32 line_number)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void acpi_ut_report_info(char *module_name, u32 line_number)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	acpi_os_printf("ACPI (%s-%04d): ", module_name, line_number);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c<br/>index 45a7244df924..c39062a047cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utmutex.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utmutex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utmutex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utmutex.c</a></div><div class='hunk'>@@ -68,19 +68,23 @@ acpi_status acpi_ut_mutex_initialize(void)</div><div class='ctx'> 	u32 i;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_mutex_initialize");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_mutex_initialize);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Create each of the predefined mutex objects</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; NUM_MUTEX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ACPI_NUM_MUTEX; i++) {</div><div class='ctx'> 		status = acpi_ut_create_mutex(i);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_create_lock(&amp;acpi_gbl_gpe_lock);</div><div class='add'>+	/* Create the spinlocks for use at interrupt level */</div><div class='add'>+</div><div class='add'>+	spin_lock_init(acpi_gbl_gpe_lock);</div><div class='add'>+	spin_lock_init(acpi_gbl_hardware_lock);</div><div class='add'>+</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -100,16 +104,19 @@ void acpi_ut_mutex_terminate(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_mutex_terminate");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_mutex_terminate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Delete each predefined mutex object</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; NUM_MUTEX; i++) {</div><div class='add'>+	for (i = 0; i &lt; ACPI_NUM_MUTEX; i++) {</div><div class='ctx'> 		(void)acpi_ut_delete_mutex(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Delete the spinlocks */</div><div class='add'>+</div><div class='ctx'> 	acpi_os_delete_lock(acpi_gbl_gpe_lock);</div><div class='add'>+	acpi_os_delete_lock(acpi_gbl_hardware_lock);</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -129,16 +136,15 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_create_mutex", mutex_id);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ut_create_mutex, mutex_id);</div><div class='ctx'> </div><div class='del'>-	if (mutex_id &gt; MAX_MUTEX) {</div><div class='add'>+	if (mutex_id &gt; ACPI_MAX_MUTEX) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_gbl_mutex_info[mutex_id].mutex) {</div><div class='del'>-		status = acpi_os_create_semaphore(1, 1,</div><div class='del'>-						  &amp;acpi_gbl_mutex_info</div><div class='del'>-						  [mutex_id].mutex);</div><div class='add'>+		status =</div><div class='add'>+		    acpi_os_create_mutex(&amp;acpi_gbl_mutex_info[mutex_id].mutex);</div><div class='ctx'> 		acpi_gbl_mutex_info[mutex_id].thread_id =</div><div class='ctx'> 		    ACPI_MUTEX_NOT_ACQUIRED;</div><div class='ctx'> 		acpi_gbl_mutex_info[mutex_id].use_count = 0;</div><div class='hunk'>@@ -161,20 +167,19 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> </div><div class='ctx'> static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> {</div><div class='del'>-	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_delete_mutex", mutex_id);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ut_delete_mutex, mutex_id);</div><div class='ctx'> </div><div class='del'>-	if (mutex_id &gt; MAX_MUTEX) {</div><div class='add'>+	if (mutex_id &gt; ACPI_MAX_MUTEX) {</div><div class='ctx'> 		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_delete_semaphore(acpi_gbl_mutex_info[mutex_id].mutex);</div><div class='add'>+	acpi_os_delete_mutex(acpi_gbl_mutex_info[mutex_id].mutex);</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_mutex_info[mutex_id].mutex = NULL;</div><div class='ctx'> 	acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='hunk'>@@ -192,11 +197,11 @@ static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	u32 this_thread_id;</div><div class='add'>+	acpi_thread_id this_thread_id;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ut_acquire_mutex");</div><div class='add'>+	ACPI_FUNCTION_NAME(ut_acquire_mutex);</div><div class='ctx'> </div><div class='del'>-	if (mutex_id &gt; MAX_MUTEX) {</div><div class='add'>+	if (mutex_id &gt; ACPI_MAX_MUTEX) {</div><div class='ctx'> 		return (AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +218,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> 		 * the mutex ordering rule.  This indicates a coding error somewhere in</div><div class='ctx'> 		 * the ACPI subsystem code.</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = mutex_id; i &lt; MAX_MUTEX; i++) {</div><div class='add'>+		for (i = mutex_id; i &lt; ACPI_MAX_MUTEX; i++) {</div><div class='ctx'> 			if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {</div><div class='ctx'> 				if (i == mutex_id) {</div><div class='ctx'> 					ACPI_ERROR((AE_INFO,</div><div class='hunk'>@@ -239,14 +244,14 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,</div><div class='ctx'> 			  "Thread %X attempting to acquire Mutex [%s]\n",</div><div class='del'>-			  this_thread_id, acpi_ut_get_mutex_name(mutex_id)));</div><div class='add'>+			  (u32) this_thread_id, acpi_ut_get_mutex_name(mutex_id)));</div><div class='ctx'> </div><div class='del'>-	status = acpi_os_wait_semaphore(acpi_gbl_mutex_info[mutex_id].mutex,</div><div class='del'>-					1, ACPI_WAIT_FOREVER);</div><div class='add'>+	status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,</div><div class='add'>+				       ACPI_WAIT_FOREVER);</div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,</div><div class='ctx'> 				  "Thread %X acquired Mutex [%s]\n",</div><div class='del'>-				  this_thread_id,</div><div class='add'>+				  (u32) this_thread_id,</div><div class='ctx'> 				  acpi_ut_get_mutex_name(mutex_id)));</div><div class='ctx'> </div><div class='ctx'> 		acpi_gbl_mutex_info[mutex_id].use_count++;</div><div class='hunk'>@@ -254,7 +259,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ACPI_EXCEPTION((AE_INFO, status,</div><div class='ctx'> 				"Thread %X could not acquire Mutex [%X]",</div><div class='del'>-				this_thread_id, mutex_id));</div><div class='add'>+				(u32) this_thread_id, mutex_id));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (status);</div><div class='hunk'>@@ -274,17 +279,16 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> </div><div class='ctx'> acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> {</div><div class='del'>-	acpi_status status;</div><div class='del'>-	u32 this_thread_id;</div><div class='add'>+	acpi_thread_id this_thread_id;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ut_release_mutex");</div><div class='add'>+	ACPI_FUNCTION_NAME(ut_release_mutex);</div><div class='ctx'> </div><div class='ctx'> 	this_thread_id = acpi_os_get_thread_id();</div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,</div><div class='del'>-			  "Thread %X releasing Mutex [%s]\n", this_thread_id,</div><div class='add'>+			  "Thread %X releasing Mutex [%s]\n", (u32) this_thread_id,</div><div class='ctx'> 			  acpi_ut_get_mutex_name(mutex_id)));</div><div class='ctx'> </div><div class='del'>-	if (mutex_id &gt; MAX_MUTEX) {</div><div class='add'>+	if (mutex_id &gt; ACPI_MAX_MUTEX) {</div><div class='ctx'> 		return (AE_BAD_PARAMETER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -309,7 +313,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> 		 * ordering rule.  This indicates a coding error somewhere in</div><div class='ctx'> 		 * the ACPI subsystem code.</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = mutex_id; i &lt; MAX_MUTEX; i++) {</div><div class='add'>+		for (i = mutex_id; i &lt; ACPI_MAX_MUTEX; i++) {</div><div class='ctx'> 			if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {</div><div class='ctx'> 				if (i == mutex_id) {</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -330,19 +334,6 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)</div><div class='ctx'> </div><div class='ctx'> 	acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;</div><div class='ctx'> </div><div class='del'>-	status =</div><div class='del'>-	    acpi_os_signal_semaphore(acpi_gbl_mutex_info[mutex_id].mutex, 1);</div><div class='del'>-</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		ACPI_EXCEPTION((AE_INFO, status,</div><div class='del'>-				"Thread %X could not release Mutex [%X]",</div><div class='del'>-				this_thread_id, mutex_id));</div><div class='del'>-	} else {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,</div><div class='del'>-				  "Thread %X released Mutex [%s]\n",</div><div class='del'>-				  this_thread_id,</div><div class='del'>-				  acpi_ut_get_mutex_name(mutex_id)));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (status);</div><div class='add'>+	acpi_os_release_mutex(acpi_gbl_mutex_info[mutex_id].mutex);</div><div class='add'>+	return (AE_OK);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c<br/>index 7ee2d1d98071..ba7d8ac702df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utobject.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utobject.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utobject.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utobject.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ union acpi_operand_object *acpi_ut_create_internal_object_dbg(char *module_name,</div><div class='ctx'> 	union acpi_operand_object *object;</div><div class='ctx'> 	union acpi_operand_object *second_object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_STR("ut_create_internal_object_dbg",</div><div class='add'>+	ACPI_FUNCTION_TRACE_STR(ut_create_internal_object_dbg,</div><div class='ctx'> 				acpi_ut_get_type_name(type));</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the raw object descriptor */</div><div class='hunk'>@@ -161,7 +161,7 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)</div><div class='ctx'> 	union acpi_operand_object *buffer_desc;</div><div class='ctx'> 	u8 *buffer = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_create_buffer_object", buffer_size);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ut_create_buffer_object, buffer_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Create a new Buffer object */</div><div class='ctx'> </div><div class='hunk'>@@ -173,9 +173,10 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)</div><div class='ctx'> 	/* Create an actual buffer only if size &gt; 0 */</div><div class='ctx'> </div><div class='ctx'> 	if (buffer_size &gt; 0) {</div><div class='add'>+</div><div class='ctx'> 		/* Allocate the actual buffer */</div><div class='ctx'> </div><div class='del'>-		buffer = ACPI_MEM_CALLOCATE(buffer_size);</div><div class='add'>+		buffer = ACPI_ALLOCATE_ZEROED(buffer_size);</div><div class='ctx'> 		if (!buffer) {</div><div class='ctx'> 			ACPI_ERROR((AE_INFO, "Could not allocate size %X",</div><div class='ctx'> 				    (u32) buffer_size));</div><div class='hunk'>@@ -214,7 +215,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)</div><div class='ctx'> 	union acpi_operand_object *string_desc;</div><div class='ctx'> 	char *string;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_U32("ut_create_string_object", string_size);</div><div class='add'>+	ACPI_FUNCTION_TRACE_U32(ut_create_string_object, string_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Create a new String object */</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +228,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)</div><div class='ctx'> 	 * Allocate the actual string buffer -- (Size + 1) for NULL terminator.</div><div class='ctx'> 	 * NOTE: Zero-length strings are NULL terminated</div><div class='ctx'> 	 */</div><div class='del'>-	string = ACPI_MEM_CALLOCATE(string_size + 1);</div><div class='add'>+	string = ACPI_ALLOCATE_ZEROED(string_size + 1);</div><div class='ctx'> 	if (!string) {</div><div class='ctx'> 		ACPI_ERROR((AE_INFO, "Could not allocate size %X",</div><div class='ctx'> 			    (u32) string_size));</div><div class='hunk'>@@ -260,7 +261,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)</div><div class='ctx'> u8 acpi_ut_valid_internal_object(void *object)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_NAME("ut_valid_internal_object");</div><div class='add'>+	ACPI_FUNCTION_NAME(ut_valid_internal_object);</div><div class='ctx'> </div><div class='ctx'> 	/* Check for a null pointer */</div><div class='ctx'> </div><div class='hunk'>@@ -308,7 +309,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_operand_object *object;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_allocate_object_desc_dbg");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_allocate_object_desc_dbg);</div><div class='ctx'> </div><div class='ctx'> 	object = acpi_os_acquire_object(acpi_gbl_operand_cache);</div><div class='ctx'> 	if (!object) {</div><div class='hunk'>@@ -319,6 +320,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the descriptor type */</div><div class='add'>+</div><div class='ctx'> 	memset(object, 0, sizeof(union acpi_operand_object));</div><div class='ctx'> 	ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_OPERAND);</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +344,7 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,</div><div class='ctx'> </div><div class='ctx'> void acpi_ut_delete_object_desc(union acpi_operand_object *object)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_delete_object_desc", object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);</div><div class='ctx'> </div><div class='ctx'> 	/* Object must be an union acpi_operand_object    */</div><div class='ctx'> </div><div class='hunk'>@@ -381,7 +383,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,</div><div class='ctx'> 	acpi_size length;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_get_simple_object_size", internal_object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_get_simple_object_size, internal_object);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Handle a null object (Could be a uninitialized package</div><div class='hunk'>@@ -397,6 +399,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,</div><div class='ctx'> 	length = sizeof(union acpi_object);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_GET_DESCRIPTOR_TYPE(internal_object) == ACPI_DESC_TYPE_NAMED) {</div><div class='add'>+</div><div class='ctx'> 		/* Object is a named object (reference), just return the length */</div><div class='ctx'> </div><div class='ctx'> 		*obj_length = ACPI_ROUND_UP_TO_NATIVE_WORD(length);</div><div class='hunk'>@@ -559,7 +562,7 @@ acpi_ut_get_package_object_size(union acpi_operand_object *internal_object,</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_pkg_info info;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_get_package_object_size", internal_object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_get_package_object_size, internal_object);</div><div class='ctx'> </div><div class='ctx'> 	info.length = 0;</div><div class='ctx'> 	info.object_space = 0;</div><div class='head'>diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c<br/>index 16461317113f..5a2de92831d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utresrc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utresrc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utresrc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utresrc.c</a></div><div class='hunk'>@@ -45,113 +45,113 @@</div><div class='ctx'> #include &lt;acpi/amlresrc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define _COMPONENT          ACPI_UTILITIES</div><div class='del'>-ACPI_MODULE_NAME("utmisc")</div><div class='add'>+ACPI_MODULE_NAME("utresrc")</div><div class='ctx'> </div><div class='ctx'> #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)</div><div class='ctx'> /*</div><div class='ctx'>  * Strings used to decode resource descriptors.</div><div class='ctx'>  * Used by both the disasssembler and the debugger resource dump routines</div><div class='ctx'>  */</div><div class='del'>-const char *acpi_gbl_BMdecode[2] = {</div><div class='del'>-	"not_bus_master",</div><div class='del'>-	"bus_master"</div><div class='add'>+const char *acpi_gbl_bm_decode[] = {</div><div class='add'>+	"NotBusMaster",</div><div class='add'>+	"BusMaster"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_config_decode[4] = {</div><div class='add'>+const char *acpi_gbl_config_decode[] = {</div><div class='ctx'> 	"0 - Good Configuration",</div><div class='ctx'> 	"1 - Acceptable Configuration",</div><div class='ctx'> 	"2 - Suboptimal Configuration",</div><div class='ctx'> 	"3 - ***Invalid Configuration***",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_consume_decode[2] = {</div><div class='del'>-	"resource_producer",</div><div class='del'>-	"resource_consumer"</div><div class='add'>+const char *acpi_gbl_consume_decode[] = {</div><div class='add'>+	"ResourceProducer",</div><div class='add'>+	"ResourceConsumer"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_DECdecode[2] = {</div><div class='del'>-	"pos_decode",</div><div class='del'>-	"sub_decode"</div><div class='add'>+const char *acpi_gbl_dec_decode[] = {</div><div class='add'>+	"PosDecode",</div><div class='add'>+	"SubDecode"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_HEdecode[2] = {</div><div class='add'>+const char *acpi_gbl_he_decode[] = {</div><div class='ctx'> 	"Level",</div><div class='ctx'> 	"Edge"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_io_decode[2] = {</div><div class='add'>+const char *acpi_gbl_io_decode[] = {</div><div class='ctx'> 	"Decode10",</div><div class='ctx'> 	"Decode16"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_LLdecode[2] = {</div><div class='del'>-	"active_high",</div><div class='del'>-	"active_low"</div><div class='add'>+const char *acpi_gbl_ll_decode[] = {</div><div class='add'>+	"ActiveHigh",</div><div class='add'>+	"ActiveLow"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_max_decode[2] = {</div><div class='del'>-	"max_not_fixed",</div><div class='del'>-	"max_fixed"</div><div class='add'>+const char *acpi_gbl_max_decode[] = {</div><div class='add'>+	"MaxNotFixed",</div><div class='add'>+	"MaxFixed"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_MEMdecode[4] = {</div><div class='del'>-	"non_cacheable",</div><div class='add'>+const char *acpi_gbl_mem_decode[] = {</div><div class='add'>+	"NonCacheable",</div><div class='ctx'> 	"Cacheable",</div><div class='del'>-	"write_combining",</div><div class='add'>+	"WriteCombining",</div><div class='ctx'> 	"Prefetchable"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_min_decode[2] = {</div><div class='del'>-	"min_not_fixed",</div><div class='del'>-	"min_fixed"</div><div class='add'>+const char *acpi_gbl_min_decode[] = {</div><div class='add'>+	"MinNotFixed",</div><div class='add'>+	"MinFixed"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_MTPdecode[4] = {</div><div class='del'>-	"address_range_memory",</div><div class='del'>-	"address_range_reserved",</div><div class='del'>-	"address_range_aCPI",</div><div class='del'>-	"address_range_nVS"</div><div class='add'>+const char *acpi_gbl_mtp_decode[] = {</div><div class='add'>+	"AddressRangeMemory",</div><div class='add'>+	"AddressRangeReserved",</div><div class='add'>+	"AddressRangeACPI",</div><div class='add'>+	"AddressRangeNVS"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_RNGdecode[4] = {</div><div class='del'>-	"invalid_ranges",</div><div class='del'>-	"non_iSAonly_ranges",</div><div class='del'>-	"ISAonly_ranges",</div><div class='del'>-	"entire_range"</div><div class='add'>+const char *acpi_gbl_rng_decode[] = {</div><div class='add'>+	"InvalidRanges",</div><div class='add'>+	"NonISAOnlyRanges",</div><div class='add'>+	"ISAOnlyRanges",</div><div class='add'>+	"EntireRange"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_RWdecode[2] = {</div><div class='del'>-	"read_only",</div><div class='del'>-	"read_write"</div><div class='add'>+const char *acpi_gbl_rw_decode[] = {</div><div class='add'>+	"ReadOnly",</div><div class='add'>+	"ReadWrite"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_SHRdecode[2] = {</div><div class='add'>+const char *acpi_gbl_shr_decode[] = {</div><div class='ctx'> 	"Exclusive",</div><div class='ctx'> 	"Shared"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_SIZdecode[4] = {</div><div class='add'>+const char *acpi_gbl_siz_decode[] = {</div><div class='ctx'> 	"Transfer8",</div><div class='ctx'> 	"Transfer8_16",</div><div class='ctx'> 	"Transfer16",</div><div class='del'>-	"invalid_size"</div><div class='add'>+	"InvalidSize"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_TRSdecode[2] = {</div><div class='del'>-	"dense_translation",</div><div class='del'>-	"sparse_translation"</div><div class='add'>+const char *acpi_gbl_trs_decode[] = {</div><div class='add'>+	"DenseTranslation",</div><div class='add'>+	"SparseTranslation"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_TTPdecode[2] = {</div><div class='del'>-	"type_static",</div><div class='del'>-	"type_translation"</div><div class='add'>+const char *acpi_gbl_ttp_decode[] = {</div><div class='add'>+	"TypeStatic",</div><div class='add'>+	"TypeTranslation"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const char *acpi_gbl_TYPdecode[4] = {</div><div class='add'>+const char *acpi_gbl_typ_decode[] = {</div><div class='ctx'> 	"Compatibility",</div><div class='del'>-	"type_a",</div><div class='del'>-	"type_b",</div><div class='del'>-	"type_f"</div><div class='add'>+	"TypeA",</div><div class='add'>+	"TypeB",</div><div class='add'>+	"TypeF"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -240,6 +240,104 @@ static const u8 acpi_gbl_resource_types[] = {</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='add'>+ * FUNCTION:    acpi_ut_walk_aml_resources</div><div class='add'>+ *</div><div class='add'>+ * PARAMETERS:  Aml             - Pointer to the raw AML resource template</div><div class='add'>+ *              aml_length      - Length of the entire template</div><div class='add'>+ *              user_function   - Called once for each descriptor found. If</div><div class='add'>+ *                                NULL, a pointer to the end_tag is returned</div><div class='add'>+ *              Context         - Passed to user_function</div><div class='add'>+ *</div><div class='add'>+ * RETURN:      Status</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: Walk a raw AML resource list(buffer). User function called</div><div class='add'>+ *              once for each resource found.</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+acpi_status</div><div class='add'>+acpi_ut_walk_aml_resources(u8 * aml,</div><div class='add'>+			   acpi_size aml_length,</div><div class='add'>+			   acpi_walk_aml_callback user_function, void **context)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	u8 *end_aml;</div><div class='add'>+	u8 resource_index;</div><div class='add'>+	u32 length;</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_walk_aml_resources);</div><div class='add'>+</div><div class='add'>+	/* The absolute minimum resource template is one end_tag descriptor */</div><div class='add'>+</div><div class='add'>+	if (aml_length &lt; sizeof(struct aml_resource_end_tag)) {</div><div class='add'>+		return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Point to the end of the resource template buffer */</div><div class='add'>+</div><div class='add'>+	end_aml = aml + aml_length;</div><div class='add'>+</div><div class='add'>+	/* Walk the byte list, abort on any invalid descriptor type or length */</div><div class='add'>+</div><div class='add'>+	while (aml &lt; end_aml) {</div><div class='add'>+</div><div class='add'>+		/* Validate the Resource Type and Resource Length */</div><div class='add'>+</div><div class='add'>+		status = acpi_ut_validate_resource(aml, &amp;resource_index);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='add'>+			return_ACPI_STATUS(status);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get the length of this descriptor */</div><div class='add'>+</div><div class='add'>+		length = acpi_ut_get_descriptor_length(aml);</div><div class='add'>+</div><div class='add'>+		/* Invoke the user function */</div><div class='add'>+</div><div class='add'>+		if (user_function) {</div><div class='add'>+			status =</div><div class='add'>+			    user_function(aml, length, offset, resource_index,</div><div class='add'>+					  context);</div><div class='add'>+			if (ACPI_FAILURE(status)) {</div><div class='add'>+				return (status);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* An end_tag descriptor terminates this resource template */</div><div class='add'>+</div><div class='add'>+		if (acpi_ut_get_resource_type(aml) ==</div><div class='add'>+		    ACPI_RESOURCE_NAME_END_TAG) {</div><div class='add'>+			/*</div><div class='add'>+			 * There must be at least one more byte in the buffer for</div><div class='add'>+			 * the 2nd byte of the end_tag</div><div class='add'>+			 */</div><div class='add'>+			if ((aml + 1) &gt;= end_aml) {</div><div class='add'>+				return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Return the pointer to the end_tag if requested */</div><div class='add'>+</div><div class='add'>+			if (!user_function) {</div><div class='add'>+				*context = aml;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Normal exit */</div><div class='add'>+</div><div class='add'>+			return_ACPI_STATUS(AE_OK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		aml += length;</div><div class='add'>+		offset += length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Did not find an end_tag descriptor */</div><div class='add'>+</div><div class='add'>+	return (AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='ctx'>  * FUNCTION:    acpi_ut_validate_resource</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor</div><div class='hunk'>@@ -273,6 +371,7 @@ acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)</div><div class='ctx'> 	 * Examine the large/small bit in the resource header</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (resource_type &amp; ACPI_RESOURCE_NAME_LARGE) {</div><div class='add'>+</div><div class='ctx'> 		/* Verify the large resource type (name) against the max */</div><div class='ctx'> </div><div class='ctx'> 		if (resource_type &gt; ACPI_RESOURCE_NAME_LARGE_MAX) {</div><div class='hunk'>@@ -376,6 +475,7 @@ u8 acpi_ut_get_resource_type(void *aml)</div><div class='ctx'> 	 * Examine the large/small bit in the resource header</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ACPI_GET8(aml) &amp; ACPI_RESOURCE_NAME_LARGE) {</div><div class='add'>+</div><div class='ctx'> 		/* Large Resource Type -- bits 6:0 contain the name */</div><div class='ctx'> </div><div class='ctx'> 		return (ACPI_GET8(aml));</div><div class='hunk'>@@ -411,6 +511,7 @@ u16 acpi_ut_get_resource_length(void *aml)</div><div class='ctx'> 	 * Examine the large/small bit in the resource header</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ACPI_GET8(aml) &amp; ACPI_RESOURCE_NAME_LARGE) {</div><div class='add'>+</div><div class='ctx'> 		/* Large Resource type -- bytes 1-2 contain the 16-bit length */</div><div class='ctx'> </div><div class='ctx'> 		ACPI_MOVE_16_TO_16(&amp;resource_length, ACPI_ADD_PTR(u8, aml, 1));</div><div class='hunk'>@@ -495,60 +596,21 @@ acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc,</div><div class='ctx'> 			     u8 ** end_tag)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	u8 *aml;</div><div class='del'>-	u8 *end_aml;</div><div class='del'>-</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_get_resource_end_tag");</div><div class='ctx'> </div><div class='del'>-	/* Get start and end pointers */</div><div class='del'>-</div><div class='del'>-	aml = obj_desc-&gt;buffer.pointer;</div><div class='del'>-	end_aml = aml + obj_desc-&gt;buffer.length;</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_get_resource_end_tag);</div><div class='ctx'> </div><div class='ctx'> 	/* Allow a buffer length of zero */</div><div class='ctx'> </div><div class='ctx'> 	if (!obj_desc-&gt;buffer.length) {</div><div class='del'>-		*end_tag = aml;</div><div class='add'>+		*end_tag = obj_desc-&gt;buffer.pointer;</div><div class='ctx'> 		return_ACPI_STATUS(AE_OK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Walk the resource template, one descriptor per iteration */</div><div class='del'>-</div><div class='del'>-	while (aml &lt; end_aml) {</div><div class='del'>-		/* Validate the Resource Type and Resource Length */</div><div class='del'>-</div><div class='del'>-		status = acpi_ut_validate_resource(aml, NULL);</div><div class='del'>-		if (ACPI_FAILURE(status)) {</div><div class='del'>-			return_ACPI_STATUS(status);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* end_tag resource indicates the end of the resource template */</div><div class='del'>-</div><div class='del'>-		if (acpi_ut_get_resource_type(aml) ==</div><div class='del'>-		    ACPI_RESOURCE_NAME_END_TAG) {</div><div class='del'>-			/*</div><div class='del'>-			 * There must be at least one more byte in the buffer for</div><div class='del'>-			 * the 2nd byte of the end_tag</div><div class='del'>-			 */</div><div class='del'>-			if ((aml + 1) &gt;= end_aml) {</div><div class='del'>-				return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Return the pointer to the end_tag */</div><div class='del'>-</div><div class='del'>-			*end_tag = aml;</div><div class='del'>-			return_ACPI_STATUS(AE_OK);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Point to the next resource descriptor in the AML buffer. The</div><div class='del'>-		 * descriptor length is guaranteed to be non-zero by resource</div><div class='del'>-		 * validation above.</div><div class='del'>-		 */</div><div class='del'>-		aml += acpi_ut_get_descriptor_length(aml);</div><div class='del'>-	}</div><div class='add'>+	/* Validate the template and get a pointer to the end_tag */</div><div class='ctx'> </div><div class='del'>-	/* Did not find an end_tag resource descriptor */</div><div class='add'>+	status = acpi_ut_walk_aml_resources(obj_desc-&gt;buffer.pointer,</div><div class='add'>+					    obj_desc-&gt;buffer.length, NULL,</div><div class='add'>+					    (void **)end_tag);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);</div><div class='add'>+	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c<br/>index 4b134a722907..eaa13d05c859 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utstate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utstate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utstate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utstate.c</a></div><div class='hunk'>@@ -96,7 +96,7 @@ void</div><div class='ctx'> acpi_ut_push_generic_state(union acpi_generic_state **list_head,</div><div class='ctx'> 			   union acpi_generic_state *state)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_push_generic_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_push_generic_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Push the state object onto the front of the list (stack) */</div><div class='ctx'> </div><div class='hunk'>@@ -123,12 +123,13 @@ union acpi_generic_state *acpi_ut_pop_generic_state(union acpi_generic_state</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_pop_generic_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_pop_generic_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Remove the state object at the head of the list (stack) */</div><div class='ctx'> </div><div class='ctx'> 	state = *list_head;</div><div class='ctx'> 	if (state) {</div><div class='add'>+</div><div class='ctx'> 		/* Update the list head */</div><div class='ctx'> </div><div class='ctx'> 		*list_head = state-&gt;common.next;</div><div class='hunk'>@@ -158,9 +159,10 @@ union acpi_generic_state *acpi_ut_create_generic_state(void)</div><div class='ctx'> </div><div class='ctx'> 	state = acpi_os_acquire_object(acpi_gbl_state_cache);</div><div class='ctx'> 	if (state) {</div><div class='add'>+</div><div class='ctx'> 		/* Initialize */</div><div class='ctx'> 		memset(state, 0, sizeof(union acpi_generic_state));</div><div class='del'>-		state-&gt;common.data_type = ACPI_DESC_TYPE_STATE;</div><div class='add'>+		state-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (state);</div><div class='hunk'>@@ -183,7 +185,7 @@ struct acpi_thread_state *acpi_ut_create_thread_state(void)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_create_thread_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_create_thread_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the generic state object */</div><div class='ctx'> </div><div class='hunk'>@@ -194,9 +196,16 @@ struct acpi_thread_state *acpi_ut_create_thread_state(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Init fields specific to the update struct */</div><div class='ctx'> </div><div class='del'>-	state-&gt;common.data_type = ACPI_DESC_TYPE_STATE_THREAD;</div><div class='add'>+	state-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_THREAD;</div><div class='ctx'> 	state-&gt;thread.thread_id = acpi_os_get_thread_id();</div><div class='ctx'> </div><div class='add'>+	/* Check for invalid thread ID - zero is very bad, it will break things */</div><div class='add'>+</div><div class='add'>+	if (!state-&gt;thread.thread_id) {</div><div class='add'>+		ACPI_ERROR((AE_INFO, "Invalid zero ID from AcpiOsGetThreadId"));</div><div class='add'>+		state-&gt;thread.thread_id = (acpi_thread_id) 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return_PTR((struct acpi_thread_state *)state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +229,7 @@ union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_create_update_state", object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_create_update_state, object);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the generic state object */</div><div class='ctx'> </div><div class='hunk'>@@ -231,7 +240,7 @@ union acpi_generic_state *acpi_ut_create_update_state(union acpi_operand_object</div><div class='ctx'> </div><div class='ctx'> 	/* Init fields specific to the update struct */</div><div class='ctx'> </div><div class='del'>-	state-&gt;common.data_type = ACPI_DESC_TYPE_STATE_UPDATE;</div><div class='add'>+	state-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_UPDATE;</div><div class='ctx'> 	state-&gt;update.object = object;</div><div class='ctx'> 	state-&gt;update.value = action;</div><div class='ctx'> </div><div class='hunk'>@@ -257,7 +266,7 @@ union acpi_generic_state *acpi_ut_create_pkg_state(void *internal_object,</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE_PTR("ut_create_pkg_state", internal_object);</div><div class='add'>+	ACPI_FUNCTION_TRACE_PTR(ut_create_pkg_state, internal_object);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the generic state object */</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +277,7 @@ union acpi_generic_state *acpi_ut_create_pkg_state(void *internal_object,</div><div class='ctx'> </div><div class='ctx'> 	/* Init fields specific to the update struct */</div><div class='ctx'> </div><div class='del'>-	state-&gt;common.data_type = ACPI_DESC_TYPE_STATE_PACKAGE;</div><div class='add'>+	state-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_PACKAGE;</div><div class='ctx'> 	state-&gt;pkg.source_object = (union acpi_operand_object *)internal_object;</div><div class='ctx'> 	state-&gt;pkg.dest_object = external_object;</div><div class='ctx'> 	state-&gt;pkg.index = index;</div><div class='hunk'>@@ -294,7 +303,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void)</div><div class='ctx'> {</div><div class='ctx'> 	union acpi_generic_state *state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_create_control_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_create_control_state);</div><div class='ctx'> </div><div class='ctx'> 	/* Create the generic state object */</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +314,7 @@ union acpi_generic_state *acpi_ut_create_control_state(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Init fields specific to the control struct */</div><div class='ctx'> </div><div class='del'>-	state-&gt;common.data_type = ACPI_DESC_TYPE_STATE_CONTROL;</div><div class='add'>+	state-&gt;common.descriptor_type = ACPI_DESC_TYPE_STATE_CONTROL;</div><div class='ctx'> 	state-&gt;common.state = ACPI_CONTROL_CONDITIONAL_EXECUTING;</div><div class='ctx'> </div><div class='ctx'> 	return_PTR(state);</div><div class='hunk'>@@ -319,15 +328,19 @@ union acpi_generic_state *acpi_ut_create_control_state(void)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN:      None</div><div class='ctx'>  *</div><div class='del'>- * DESCRIPTION: Put a state object back into the global state cache.  The object</div><div class='del'>- *              is not actually freed at this time.</div><div class='add'>+ * DESCRIPTION: Release a state object to the state cache. NULL state objects</div><div class='add'>+ *              are ignored.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> void acpi_ut_delete_generic_state(union acpi_generic_state *state)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("ut_delete_generic_state");</div><div class='add'>+	ACPI_FUNCTION_TRACE(ut_delete_generic_state);</div><div class='add'>+</div><div class='add'>+	/* Ignore null state */</div><div class='ctx'> </div><div class='del'>-	(void)acpi_os_release_object(acpi_gbl_state_cache, state);</div><div class='add'>+	if (state) {</div><div class='add'>+		(void)acpi_os_release_object(acpi_gbl_state_cache, state);</div><div class='add'>+	}</div><div class='ctx'> 	return_VOID;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c<br/>index 308a960871be..3538f69c82a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utxface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utilities/utxface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utilities/utxface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utilities/utxface.c</a></div><div class='hunk'>@@ -41,8 +41,6 @@</div><div class='ctx'>  * POSSIBILITY OF SUCH DAMAGES.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;acpi/acpi.h&gt;</div><div class='ctx'> #include &lt;acpi/acevents.h&gt;</div><div class='ctx'> #include &lt;acpi/acnamesp.h&gt;</div><div class='hunk'>@@ -67,7 +65,7 @@ acpi_status acpi_initialize_subsystem(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_initialize_subsystem");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());</div><div class='ctx'> </div><div class='hunk'>@@ -109,6 +107,8 @@ acpi_status acpi_initialize_subsystem(void)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_enable_subsystem</div><div class='hunk'>@@ -121,12 +121,11 @@ acpi_status acpi_initialize_subsystem(void)</div><div class='ctx'>  *              Puts system into ACPI mode if it isn't already.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_enable_subsystem(u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_enable_subsystem");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_enable_subsystem);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We must initialize the hardware before we can enable ACPI.</div><div class='hunk'>@@ -152,7 +151,7 @@ acpi_status acpi_enable_subsystem(u32 flags)</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_enable();</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_WARNING((AE_INFO, "acpi_enable failed"));</div><div class='add'>+			ACPI_WARNING((AE_INFO, "AcpiEnable failed"));</div><div class='ctx'> 			return_ACPI_STATUS(status);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -229,6 +228,8 @@ acpi_status acpi_enable_subsystem(u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_enable_subsystem)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_initialize_objects</div><div class='hunk'>@@ -241,12 +242,11 @@ acpi_status acpi_enable_subsystem(u32 flags)</div><div class='ctx'>  *              objects and executing AML code for Regions, buffers, etc.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_initialize_objects(u32 flags)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_initialize_objects");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_initialize_objects);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Run all _REG methods</div><div class='hunk'>@@ -257,7 +257,7 @@ acpi_status acpi_initialize_objects(u32 flags)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(flags &amp; ACPI_NO_ADDRESS_SPACE_INIT)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,</div><div class='del'>-				  "[Init] Executing _REG op_region methods\n"));</div><div class='add'>+				  "[Init] Executing _REG OpRegion methods\n"));</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_ev_initialize_op_regions();</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='hunk'>@@ -305,6 +305,8 @@ acpi_status acpi_initialize_objects(u32 flags)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_initialize_objects)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_terminate</div><div class='hunk'>@@ -316,12 +318,11 @@ acpi_status acpi_initialize_objects(u32 flags)</div><div class='ctx'>  * DESCRIPTION: Shutdown the ACPI subsystem.  Release all resources.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_terminate(void)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_terminate");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_terminate);</div><div class='ctx'> </div><div class='ctx'> 	/* Terminate the AML Debugger if present */</div><div class='ctx'> </div><div class='hunk'>@@ -348,6 +349,8 @@ acpi_status acpi_terminate(void)</div><div class='ctx'> 	return_ACPI_STATUS(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_terminate)</div><div class='add'>+</div><div class='ctx'> #ifdef ACPI_FUTURE_USAGE</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -362,7 +365,6 @@ acpi_status acpi_terminate(void)</div><div class='ctx'>  *              initialized successfully.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_subsystem_status(void)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -373,6 +375,8 @@ acpi_status acpi_subsystem_status(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_subsystem_status)</div><div class='add'>+</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * FUNCTION:    acpi_get_system_info</div><div class='hunk'>@@ -390,14 +394,13 @@ acpi_status acpi_subsystem_status(void)</div><div class='ctx'>  *              and the value of out_buffer is undefined.</div><div class='ctx'>  *</div><div class='ctx'>  ******************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_system_info *info_ptr;</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_get_system_info");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_get_system_info);</div><div class='ctx'> </div><div class='ctx'> 	/* Parameter validation */</div><div class='ctx'> </div><div class='hunk'>@@ -448,15 +451,15 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)</div><div class='ctx'> </div><div class='ctx'> 	/* Current status of the ACPI tables, per table type */</div><div class='ctx'> </div><div class='del'>-	info_ptr-&gt;num_table_types = NUM_ACPI_TABLE_TYPES;</div><div class='del'>-	for (i = 0; i &lt; NUM_ACPI_TABLE_TYPES; i++) {</div><div class='add'>+	info_ptr-&gt;num_table_types = ACPI_TABLE_ID_MAX + 1;</div><div class='add'>+	for (i = 0; i &lt; (ACPI_TABLE_ID_MAX + 1); i++) {</div><div class='ctx'> 		info_ptr-&gt;table_info[i].count = acpi_gbl_table_lists[i].count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(acpi_get_system_info);</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_get_system_info)</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -472,7 +475,6 @@ EXPORT_SYMBOL(acpi_get_system_info);</div><div class='ctx'>  * TBD: When a second function is added, must save the Function also.</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status</div><div class='ctx'> acpi_install_initialization_handler(acpi_init_handler handler, u32 function)</div><div class='ctx'> {</div><div class='hunk'>@@ -489,6 +491,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)</div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)</div><div class='ctx'> #endif				/*  ACPI_FUTURE_USAGE  */</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -502,10 +505,9 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)</div><div class='ctx'>  * DESCRIPTION: Empty all caches (delete the cached objects)</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-</div><div class='ctx'> acpi_status acpi_purge_cached_objects(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_purge_cached_objects");</div><div class='add'>+	ACPI_FUNCTION_TRACE(acpi_purge_cached_objects);</div><div class='ctx'> </div><div class='ctx'> 	(void)acpi_os_purge_cache(acpi_gbl_state_cache);</div><div class='ctx'> 	(void)acpi_os_purge_cache(acpi_gbl_operand_cache);</div><div class='hunk'>@@ -513,3 +515,5 @@ acpi_status acpi_purge_cached_objects(void)</div><div class='ctx'> 	(void)acpi_os_purge_cache(acpi_gbl_ps_node_ext_cache);</div><div class='ctx'> 	return_ACPI_STATUS(AE_OK);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+ACPI_EXPORT_SYMBOL(acpi_purge_cached_objects)</div><div class='head'>diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c<br/>index 6458c47f7ac2..f48227f4c8c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/utils.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/utils.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/utils.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/utils.c</a></div><div class='hunk'>@@ -58,31 +58,29 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 	u8 *head = NULL;</div><div class='ctx'> 	u8 *tail = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_extract_package");</div><div class='ctx'> </div><div class='ctx'> 	if (!package || (package-&gt;type != ACPI_TYPE_PACKAGE)</div><div class='ctx'> 	    || (package-&gt;package.count &lt; 1)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Invalid 'package' argument\n"));</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Invalid package argument\n");</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!format || !format-&gt;pointer || (format-&gt;length &lt; 1)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'format' argument\n"));</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Invalid format argument\n");</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!buffer) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Invalid 'buffer' argument\n"));</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Invalid buffer argument\n");</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	format_count = (format-&gt;length / sizeof(char)) - 1;</div><div class='ctx'> 	if (format_count &gt; package-&gt;package.count) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-				  "Format specifies more objects [%d] than exist in package [%d].",</div><div class='del'>-				  format_count, package-&gt;package.count));</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+		printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"</div><div class='add'>+			      " than exist in package [%d].\n",</div><div class='add'>+			      format_count, package-&gt;package.count);</div><div class='add'>+		return AE_BAD_DATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	format_string = (char *)format-&gt;pointer;</div><div class='hunk'>@@ -95,7 +93,7 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 		union acpi_object *element = &amp;(package-&gt;package.elements[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (!element) {</div><div class='del'>-			return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+			return AE_BAD_DATA;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (element-&gt;type) {</div><div class='hunk'>@@ -113,10 +111,11 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 				tail_offset += sizeof(char *);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-						  "Invalid package element [%d]: got number, expecing [%c].\n",</div><div class='del'>-						  i, format_string[i]));</div><div class='del'>-				return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+				printk(KERN_WARNING PREFIX "Invalid package element"</div><div class='add'>+					      " [%d]: got number, expecing"</div><div class='add'>+					      " [%c]\n",</div><div class='add'>+					      i, format_string[i]);</div><div class='add'>+				return AE_BAD_DATA;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -138,10 +137,11 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 				tail_offset += sizeof(u8 *);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				ACPI_DEBUG_PRINT((ACPI_DB_WARN,</div><div class='del'>-						  "Invalid package element [%d] got string/buffer, expecing [%c].\n",</div><div class='del'>-						  i, format_string[i]));</div><div class='del'>-				return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+				printk(KERN_WARNING PREFIX "Invalid package element"</div><div class='add'>+					      " [%d] got string/buffer,"</div><div class='add'>+					      " expecing [%c]\n",</div><div class='add'>+					      i, format_string[i]);</div><div class='add'>+				return AE_BAD_DATA;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -152,7 +152,7 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 					  "Found unsupported element at index=%d\n",</div><div class='ctx'> 					  i));</div><div class='ctx'> 			/* TBD: handle nested packages... */</div><div class='del'>-			return_ACPI_STATUS(AE_SUPPORT);</div><div class='add'>+			return AE_SUPPORT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -162,9 +162,9 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (buffer-&gt;length &lt; size_required) {</div><div class='ctx'> 		buffer-&gt;length = size_required;</div><div class='del'>-		return_ACPI_STATUS(AE_BUFFER_OVERFLOW);</div><div class='add'>+		return AE_BUFFER_OVERFLOW;</div><div class='ctx'> 	} else if (buffer-&gt;length != size_required || !buffer-&gt;pointer) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	head = buffer-&gt;pointer;</div><div class='hunk'>@@ -179,7 +179,7 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 		union acpi_object *element = &amp;(package-&gt;package.elements[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (!element) {</div><div class='del'>-			return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+			return AE_BAD_DATA;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (element-&gt;type) {</div><div class='hunk'>@@ -244,7 +244,7 @@ acpi_extract_package(union acpi_object *package,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_extract_package);</div><div class='hunk'>@@ -258,14 +258,13 @@ acpi_evaluate_integer(acpi_handle handle,</div><div class='ctx'> 	union acpi_object *element;</div><div class='ctx'> 	struct acpi_buffer buffer = { 0, NULL };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_evaluate_integer");</div><div class='ctx'> </div><div class='ctx'> 	if (!data)</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);</div><div class='ctx'> 	if (!element)</div><div class='del'>-		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+		return AE_NO_MEMORY;</div><div class='ctx'> </div><div class='ctx'> 	memset(element, 0, sizeof(union acpi_object));</div><div class='ctx'> 	buffer.length = sizeof(union acpi_object);</div><div class='hunk'>@@ -273,12 +272,14 @@ acpi_evaluate_integer(acpi_handle handle,</div><div class='ctx'> 	status = acpi_evaluate_object(handle, pathname, arguments, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, status);</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		kfree(element);</div><div class='add'>+		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (element-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, AE_BAD_DATA);</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+		kfree(element);</div><div class='add'>+		return AE_BAD_DATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*data = element-&gt;integer.value;</div><div class='hunk'>@@ -286,7 +287,7 @@ acpi_evaluate_integer(acpi_handle handle,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%lu]\n", *data));</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_evaluate_integer);</div><div class='hunk'>@@ -301,15 +302,14 @@ acpi_evaluate_string(acpi_handle handle,</div><div class='ctx'> 	acpi_object *element = NULL;</div><div class='ctx'> 	acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_evaluate_string");</div><div class='ctx'> </div><div class='ctx'> 	if (!data)</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_object(handle, pathname, arguments, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, status);</div><div class='del'>-		return_ACPI_STATUS(status);</div><div class='add'>+		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	element = (acpi_object *) buffer.pointer;</div><div class='hunk'>@@ -318,13 +318,13 @@ acpi_evaluate_string(acpi_handle handle,</div><div class='ctx'> 	    || (element-&gt;type != ACPI_TYPE_BUFFER)</div><div class='ctx'> 	    || !element-&gt;string.length) {</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, AE_BAD_DATA);</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_DATA);</div><div class='add'>+		return AE_BAD_DATA;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*data = kmalloc(element-&gt;string.length + 1, GFP_KERNEL);</div><div class='ctx'> 	if (!data) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Memory allocation error\n"));</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		printk(KERN_ERR PREFIX "Memory allocation\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(*data, 0, element-&gt;string.length + 1);</div><div class='ctx'> </div><div class='hunk'>@@ -332,9 +332,9 @@ acpi_evaluate_string(acpi_handle handle,</div><div class='ctx'> </div><div class='ctx'> 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(AE_OK);</div><div class='add'>+	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -350,10 +350,9 @@ acpi_evaluate_reference(acpi_handle handle,</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	u32 i = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_evaluate_reference");</div><div class='ctx'> </div><div class='ctx'> 	if (!list) {</div><div class='del'>-		return_ACPI_STATUS(AE_BAD_PARAMETER);</div><div class='add'>+		return AE_BAD_PARAMETER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Evaluate object. */</div><div class='hunk'>@@ -365,32 +364,29 @@ acpi_evaluate_reference(acpi_handle handle,</div><div class='ctx'> 	package = (union acpi_object *)buffer.pointer;</div><div class='ctx'> </div><div class='ctx'> 	if ((buffer.length == 0) || !package) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "No return object (len %X ptr %p)\n",</div><div class='del'>-				  (unsigned)buffer.length, package));</div><div class='add'>+		printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",</div><div class='add'>+			    (unsigned)buffer.length, package);</div><div class='ctx'> 		status = AE_BAD_DATA;</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, status);</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (package-&gt;type != ACPI_TYPE_PACKAGE) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Expecting a [Package], found type %X\n",</div><div class='del'>-				  package-&gt;type));</div><div class='add'>+		printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",</div><div class='add'>+			    package-&gt;type);</div><div class='ctx'> 		status = AE_BAD_DATA;</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, status);</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!package-&gt;package.count) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "[Package] has zero elements (%p)\n",</div><div class='del'>-				  package));</div><div class='add'>+		printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",</div><div class='add'>+			    package);</div><div class='ctx'> 		status = AE_BAD_DATA;</div><div class='ctx'> 		acpi_util_eval_error(handle, pathname, status);</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (package-&gt;package.count &gt; ACPI_MAX_HANDLES) {</div><div class='del'>-		return_ACPI_STATUS(AE_NO_MEMORY);</div><div class='add'>+		return AE_NO_MEMORY;</div><div class='ctx'> 	}</div><div class='ctx'> 	list-&gt;count = package-&gt;package.count;</div><div class='ctx'> </div><div class='hunk'>@@ -402,9 +398,9 @@ acpi_evaluate_reference(acpi_handle handle,</div><div class='ctx'> </div><div class='ctx'> 		if (element-&gt;type != ACPI_TYPE_ANY) {</div><div class='ctx'> 			status = AE_BAD_DATA;</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Expecting a [Reference] package element, found type %X\n",</div><div class='del'>-					  element-&gt;type));</div><div class='add'>+			printk(KERN_ERR PREFIX</div><div class='add'>+				    "Expecting a [Reference] package element, found type %X\n",</div><div class='add'>+				    element-&gt;type);</div><div class='ctx'> 			acpi_util_eval_error(handle, pathname, status);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -422,9 +418,9 @@ acpi_evaluate_reference(acpi_handle handle,</div><div class='ctx'> 		//kfree(list-&gt;handles);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_ACPI_STATUS(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(acpi_evaluate_reference);</div><div class='head'>diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c<br/>index bd4887518373..56666a982476 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/acpi/video.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/acpi/video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/acpi/video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/acpi/video.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ struct acpi_video_enumerated_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_video_bus {</div><div class='del'>-	acpi_handle handle;</div><div class='add'>+	struct acpi_device *device;</div><div class='ctx'> 	u8 dos_setting;</div><div class='ctx'> 	struct acpi_video_enumerated_device *attached_array;</div><div class='ctx'> 	u8 attached_count;</div><div class='hunk'>@@ -155,7 +155,6 @@ struct acpi_video_device_brightness {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct acpi_video_device {</div><div class='del'>-	acpi_handle handle;</div><div class='ctx'> 	unsigned long device_id;</div><div class='ctx'> 	struct acpi_video_device_flags flags;</div><div class='ctx'> 	struct acpi_video_device_cap cap;</div><div class='hunk'>@@ -272,10 +271,10 @@ static int</div><div class='ctx'> acpi_video_device_query(struct acpi_video_device *device, unsigned long *state)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_query");</div><div class='del'>-	status = acpi_evaluate_integer(device-&gt;handle, "_DGS", NULL, state);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	status = acpi_evaluate_integer(device-&gt;dev-&gt;handle, "_DGS", NULL, state);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -284,11 +283,9 @@ acpi_video_device_get_state(struct acpi_video_device *device,</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_get_state");</div><div class='del'>-</div><div class='del'>-	status = acpi_evaluate_integer(device-&gt;handle, "_DCS", NULL, state);</div><div class='add'>+	status = acpi_evaluate_integer(device-&gt;dev-&gt;handle, "_DCS", NULL, state);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -299,12 +296,11 @@ acpi_video_device_set_state(struct acpi_video_device *device, int state)</div><div class='ctx'> 	struct acpi_object_list args = { 1, &amp;arg0 };</div><div class='ctx'> 	unsigned long ret;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_set_state");</div><div class='ctx'> </div><div class='ctx'> 	arg0.integer.value = state;</div><div class='del'>-	status = acpi_evaluate_integer(device-&gt;handle, "_DSS", &amp;args, &amp;ret);</div><div class='add'>+	status = acpi_evaluate_integer(device-&gt;dev-&gt;handle, "_DSS", &amp;args, &amp;ret);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -315,28 +311,27 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,</div><div class='ctx'> 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	union acpi_object *obj;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_lcd_query_levels");</div><div class='ctx'> </div><div class='ctx'> 	*levels = NULL;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(device-&gt;handle, "_BCL", NULL, &amp;buffer);</div><div class='add'>+	status = acpi_evaluate_object(device-&gt;dev-&gt;handle, "_BCL", NULL, &amp;buffer);</div><div class='ctx'> 	if (!ACPI_SUCCESS(status))</div><div class='del'>-		return_VALUE(status);</div><div class='add'>+		return status;</div><div class='ctx'> 	obj = (union acpi_object *)buffer.pointer;</div><div class='del'>-	if (!obj &amp;&amp; (obj-&gt;type != ACPI_TYPE_PACKAGE)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n"));</div><div class='add'>+	if (!obj || (obj-&gt;type != ACPI_TYPE_PACKAGE)) {</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid _BCL data\n");</div><div class='ctx'> 		status = -EFAULT;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*levels = obj;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>       err:</div><div class='ctx'> 	kfree(buffer.pointer);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -346,13 +341,12 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)</div><div class='ctx'> 	union acpi_object arg0 = { ACPI_TYPE_INTEGER };</div><div class='ctx'> 	struct acpi_object_list args = { 1, &amp;arg0 };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_lcd_set_level");</div><div class='ctx'> </div><div class='ctx'> 	arg0.integer.value = level;</div><div class='del'>-	status = acpi_evaluate_object(device-&gt;handle, "_BCM", &amp;args, NULL);</div><div class='add'>+	status = acpi_evaluate_object(device-&gt;dev-&gt;handle, "_BCM", &amp;args, NULL);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "set_level status: %x\n", status);</div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -360,11 +354,10 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,</div><div class='ctx'> 					unsigned long *level)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_lcd_get_level_current");</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(device-&gt;handle, "_BQC", NULL, level);</div><div class='add'>+	status = acpi_evaluate_integer(device-&gt;dev-&gt;handle, "_BQC", NULL, level);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -377,34 +370,33 @@ acpi_video_device_EDID(struct acpi_video_device *device,</div><div class='ctx'> 	union acpi_object arg0 = { ACPI_TYPE_INTEGER };</div><div class='ctx'> 	struct acpi_object_list args = { 1, &amp;arg0 };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_get_EDID");</div><div class='ctx'> </div><div class='ctx'> 	*edid = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (length == 128)</div><div class='ctx'> 		arg0.integer.value = 1;</div><div class='ctx'> 	else if (length == 256)</div><div class='ctx'> 		arg0.integer.value = 2;</div><div class='ctx'> 	else</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_object(device-&gt;handle, "_DDC", &amp;args, &amp;buffer);</div><div class='add'>+	status = acpi_evaluate_object(device-&gt;dev-&gt;handle, "_DDC", &amp;args, &amp;buffer);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	obj = (union acpi_object *)buffer.pointer;</div><div class='ctx'> </div><div class='ctx'> 	if (obj &amp;&amp; obj-&gt;type == ACPI_TYPE_BUFFER)</div><div class='ctx'> 		*edid = obj;</div><div class='ctx'> 	else {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DDC data\n"));</div><div class='add'>+		printk(KERN_ERR PREFIX "Invalid _DDC data\n");</div><div class='ctx'> 		status = -EFAULT;</div><div class='ctx'> 		kfree(obj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* bus */</div><div class='hunk'>@@ -417,15 +409,14 @@ acpi_video_bus_set_POST(struct acpi_video_bus *video, unsigned long option)</div><div class='ctx'> 	union acpi_object arg0 = { ACPI_TYPE_INTEGER };</div><div class='ctx'> 	struct acpi_object_list args = { 1, &amp;arg0 };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_set_POST");</div><div class='ctx'> </div><div class='ctx'> 	arg0.integer.value = option;</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(video-&gt;handle, "_SPD", &amp;args, &amp;tmp);</div><div class='add'>+	status = acpi_evaluate_integer(video-&gt;device-&gt;handle, "_SPD", &amp;args, &amp;tmp);</div><div class='ctx'> 	if (ACPI_SUCCESS(status))</div><div class='ctx'> 		status = tmp ? (-EINVAL) : (AE_OK);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -433,11 +424,9 @@ acpi_video_bus_get_POST(struct acpi_video_bus *video, unsigned long *id)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_get_POST");</div><div class='add'>+	status = acpi_evaluate_integer(video-&gt;device-&gt;handle, "_GPD", NULL, id);</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(video-&gt;handle, "_GPD", NULL, id);</div><div class='del'>-</div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -445,12 +434,11 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video,</div><div class='ctx'> 			    unsigned long *options)</div><div class='ctx'> {</div><div class='ctx'> 	int status;</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_POST_options");</div><div class='ctx'> </div><div class='del'>-	status = acpi_evaluate_integer(video-&gt;handle, "_VPO", NULL, options);</div><div class='add'>+	status = acpi_evaluate_integer(video-&gt;device-&gt;handle, "_VPO", NULL, options);</div><div class='ctx'> 	*options &amp;= 3;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -481,7 +469,6 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)</div><div class='ctx'> 	union acpi_object arg0 = { ACPI_TYPE_INTEGER };</div><div class='ctx'> 	struct acpi_object_list args = { 1, &amp;arg0 };</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_DOS");</div><div class='ctx'> </div><div class='ctx'> 	if (bios_flag &lt; 0 || bios_flag &gt; 3 || lcd_flag &lt; 0 || lcd_flag &gt; 1) {</div><div class='ctx'> 		status = -1;</div><div class='hunk'>@@ -489,10 +476,10 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)</div><div class='ctx'> 	}</div><div class='ctx'> 	arg0.integer.value = (lcd_flag &lt;&lt; 2) | bios_flag;</div><div class='ctx'> 	video-&gt;dos_setting = arg0.integer.value;</div><div class='del'>-	acpi_evaluate_object(video-&gt;handle, "_DOS", &amp;args, NULL);</div><div class='add'>+	acpi_evaluate_object(video-&gt;device-&gt;handle, "_DOS", &amp;args, NULL);</div><div class='ctx'> </div><div class='ctx'>       Failed:</div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -514,29 +501,28 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)</div><div class='ctx'> 	union acpi_object *obj = NULL;</div><div class='ctx'> 	struct acpi_video_device_brightness *br = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_find_cap");</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;device-&gt;cap, 0, 4);</div><div class='ctx'> </div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_ADR", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_ADR", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._ADR = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_BCL", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_BCL", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._BCL = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_BCM", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_BCM", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._BCM = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_DDC", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_DDC", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._DDC = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_DCS", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_DCS", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._DCS = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_DGS", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_DGS", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._DGS = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_DSS", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;dev-&gt;handle, "_DSS", &amp;h_dummy1))) {</div><div class='ctx'> 		device-&gt;cap._DSS = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -560,8 +546,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)</div><div class='ctx'> 				o = (union acpi_object *)&amp;obj-&gt;package.</div><div class='ctx'> 				    elements[i];</div><div class='ctx'> 				if (o-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='del'>-					ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-							  "Invalid data\n"));</div><div class='add'>+					printk(KERN_ERR PREFIX "Invalid data\n");</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				br-&gt;levels[count] = (u32) o-&gt;integer.value;</div><div class='hunk'>@@ -583,7 +568,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)</div><div class='ctx'> </div><div class='ctx'> 	kfree(obj);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -601,22 +586,22 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)</div><div class='ctx'> 	acpi_handle h_dummy1;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;video-&gt;cap, 0, 4);</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;handle, "_DOS", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;device-&gt;handle, "_DOS", &amp;h_dummy1))) {</div><div class='ctx'> 		video-&gt;cap._DOS = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;handle, "_DOD", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;device-&gt;handle, "_DOD", &amp;h_dummy1))) {</div><div class='ctx'> 		video-&gt;cap._DOD = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;handle, "_ROM", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;device-&gt;handle, "_ROM", &amp;h_dummy1))) {</div><div class='ctx'> 		video-&gt;cap._ROM = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;handle, "_GPD", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;device-&gt;handle, "_GPD", &amp;h_dummy1))) {</div><div class='ctx'> 		video-&gt;cap._GPD = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;handle, "_SPD", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;device-&gt;handle, "_SPD", &amp;h_dummy1))) {</div><div class='ctx'> 		video-&gt;cap._SPD = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;handle, "_VPO", &amp;h_dummy1))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(video-&gt;device-&gt;handle, "_VPO", &amp;h_dummy1))) {</div><div class='ctx'> 		video-&gt;cap._VPO = 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -630,10 +615,9 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_check");</div><div class='ctx'> </div><div class='ctx'> 	if (!video)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Since there is no HID, CID and so on for VGA driver, we have</div><div class='ctx'> 	 * to check well known required nodes.</div><div class='hunk'>@@ -657,7 +641,7 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)</div><div class='ctx'> 		status = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -673,7 +657,6 @@ static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	struct acpi_video_device *dev =</div><div class='ctx'> 	    (struct acpi_video_device *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_info_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -692,7 +675,7 @@ static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	seq_printf(seq, "known by bios: %s\n", dev-&gt;flags.bios ? "yes" : "no");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -709,7 +692,6 @@ static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	    (struct acpi_video_device *)seq-&gt;private;</div><div class='ctx'> 	unsigned long state;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_state_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -729,7 +711,7 @@ static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		seq_printf(seq, "&lt;not supported&gt;\n");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -750,13 +732,12 @@ acpi_video_device_write_state(struct file *file,</div><div class='ctx'> 	char str[12] = { 0 };</div><div class='ctx'> 	u32 state = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_write_state");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || count + 1 &gt; sizeof str)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(str, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	str[count] = 0;</div><div class='ctx'> 	state = simple_strtoul(str, NULL, 0);</div><div class='hunk'>@@ -765,9 +746,9 @@ acpi_video_device_write_state(struct file *file,</div><div class='ctx'> 	status = acpi_video_device_set_state(dev, state);</div><div class='ctx'> </div><div class='ctx'> 	if (status)</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -777,11 +758,10 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	    (struct acpi_video_device *)seq-&gt;private;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_brightness_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !dev-&gt;brightness) {</div><div class='ctx'> 		seq_printf(seq, "&lt;not supported&gt;\n");</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "levels: ");</div><div class='hunk'>@@ -789,7 +769,7 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		seq_printf(seq, " %d", dev-&gt;brightness-&gt;levels[i]);</div><div class='ctx'> 	seq_printf(seq, "\ncurrent: %d\n", dev-&gt;brightness-&gt;curr);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -810,19 +790,18 @@ acpi_video_device_write_brightness(struct file *file,</div><div class='ctx'> 	unsigned int level = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !dev-&gt;brightness || count + 1 &gt; sizeof str)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(str, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	str[count] = 0;</div><div class='ctx'> 	level = simple_strtoul(str, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (level &gt; 100)</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* validate though the list of available levels */</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;brightness-&gt;count; i++)</div><div class='hunk'>@@ -833,7 +812,7 @@ acpi_video_device_write_brightness(struct file *file,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)</div><div class='hunk'>@@ -844,7 +823,6 @@ static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	union acpi_object *edid = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_EDID_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -869,7 +847,7 @@ static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree(edid);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -884,28 +862,26 @@ static int acpi_video_device_add_fs(struct acpi_device *device)</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> 	struct acpi_video_device *vid_dev;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	vid_dev = (struct acpi_video_device *)acpi_driver_data(device);</div><div class='ctx'> 	if (!vid_dev)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!acpi_device_dir(device)) {</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     vid_dev-&gt;video-&gt;dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* 'info' [R] */</div><div class='ctx'> 	entry = create_proc_entry("info", S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'info' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_device_info_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -917,8 +893,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)</div><div class='ctx'> 	    create_proc_entry("state", S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 			      acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'state' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		acpi_video_device_state_fops.write = acpi_video_device_write_state;</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_device_state_fops;</div><div class='hunk'>@@ -931,8 +906,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)</div><div class='ctx'> 	    create_proc_entry("brightness", S_IFREG | S_IRUGO | S_IWUSR,</div><div class='ctx'> 			      acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'brightness' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		acpi_video_device_brightness_fops.write = acpi_video_device_write_brightness;</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_device_brightness_fops;</div><div class='hunk'>@@ -943,25 +917,23 @@ static int acpi_video_device_add_fs(struct acpi_device *device)</div><div class='ctx'> 	/* 'EDID' [R] */</div><div class='ctx'> 	entry = create_proc_entry("EDID", S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'brightness' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_device_EDID_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_device_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_video_device *vid_dev;</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	vid_dev = (struct acpi_video_device *)acpi_driver_data(device);</div><div class='ctx'> 	if (!vid_dev || !vid_dev-&gt;video || !vid_dev-&gt;video-&gt;dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (acpi_device_dir(device)) {</div><div class='ctx'> 		remove_proc_entry("info", acpi_device_dir(device));</div><div class='hunk'>@@ -972,7 +944,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* video bus */</div><div class='hunk'>@@ -980,7 +952,6 @@ static int acpi_video_bus_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_video_bus *video = (struct acpi_video_bus *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_info_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!video)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -993,7 +964,7 @@ static int acpi_video_bus_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 		   video-&gt;flags.post ? "yes" : "no");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1006,7 +977,6 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_video_bus *video = (struct acpi_video_bus *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_ROM_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!video)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -1015,7 +985,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	seq_printf(seq, "&lt;TODO&gt;\n");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1029,7 +999,6 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	unsigned long options;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_POST_info_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!video)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -1052,7 +1021,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	} else</div><div class='ctx'> 		seq_printf(seq, "&lt;not supported&gt;\n");</div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1068,7 +1037,6 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	int status;</div><div class='ctx'> 	unsigned long id;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_POST_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	if (!video)</div><div class='ctx'> 		goto end;</div><div class='hunk'>@@ -1081,18 +1049,17 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> 	seq_printf(seq, "device posted is &lt;%s&gt;\n", device_decode[id &amp; 3]);</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_DOS_seq_show(struct seq_file *seq, void *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_video_bus *video = (struct acpi_video_bus *)seq-&gt;private;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_DOS_seq_show");</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "DOS setting: &lt;%d&gt;\n", video-&gt;dos_setting);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1117,22 +1084,21 @@ acpi_video_bus_write_POST(struct file *file,</div><div class='ctx'> 	char str[12] = { 0 };</div><div class='ctx'> 	unsigned long opt, options;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_write_POST");</div><div class='ctx'> </div><div class='ctx'> 	if (!video || count + 1 &gt; sizeof str)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_video_bus_POST_options(video, &amp;options);</div><div class='ctx'> 	if (!ACPI_SUCCESS(status))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(str, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	str[count] = 0;</div><div class='ctx'> 	opt = strtoul(str, NULL, 0);</div><div class='ctx'> 	if (opt &gt; 3)</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* just in case an OEM 'forget' the motherboard... */</div><div class='ctx'> 	options |= 1;</div><div class='hunk'>@@ -1140,11 +1106,11 @@ acpi_video_bus_write_POST(struct file *file,</div><div class='ctx'> 	if (options &amp; (1ul &lt;&lt; opt)) {</div><div class='ctx'> 		status = acpi_video_bus_set_POST(video, opt);</div><div class='ctx'> 		if (!ACPI_SUCCESS(status))</div><div class='del'>-			return_VALUE(-EFAULT);</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -1158,25 +1124,24 @@ acpi_video_bus_write_DOS(struct file *file,</div><div class='ctx'> 	char str[12] = { 0 };</div><div class='ctx'> 	unsigned long opt;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_write_DOS");</div><div class='ctx'> </div><div class='ctx'> 	if (!video || count + 1 &gt; sizeof str)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(str, buffer, count))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	str[count] = 0;</div><div class='ctx'> 	opt = strtoul(str, NULL, 0);</div><div class='ctx'> 	if (opt &gt; 7)</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_video_bus_DOS(video, opt &amp; 0x3, (opt &amp; 0x4) &gt;&gt; 2);</div><div class='ctx'> </div><div class='ctx'> 	if (!ACPI_SUCCESS(status))</div><div class='del'>-		return_VALUE(-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(count);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='hunk'>@@ -1184,7 +1149,6 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 	struct proc_dir_entry *entry = NULL;</div><div class='ctx'> 	struct acpi_video_bus *video;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_add_fs");</div><div class='ctx'> </div><div class='ctx'> 	video = (struct acpi_video_bus *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -1192,7 +1156,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),</div><div class='ctx'> 						     acpi_video_dir);</div><div class='ctx'> 		if (!acpi_device_dir(device))</div><div class='del'>-			return_VALUE(-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		video-&gt;dir = acpi_device_dir(device);</div><div class='ctx'> 		acpi_device_dir(device)-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1200,8 +1164,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 	/* 'info' [R] */</div><div class='ctx'> 	entry = create_proc_entry("info", S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'info' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_bus_info_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1211,8 +1174,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 	/* 'ROM' [R] */</div><div class='ctx'> 	entry = create_proc_entry("ROM", S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'ROM' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_bus_ROM_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1223,8 +1185,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 	entry =</div><div class='ctx'> 	    create_proc_entry("POST_info", S_IRUGO, acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'POST_info' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_bus_POST_info_fops;</div><div class='ctx'> 		entry-&gt;data = acpi_driver_data(device);</div><div class='hunk'>@@ -1236,8 +1197,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 	    create_proc_entry("POST", S_IFREG | S_IRUGO | S_IRUSR,</div><div class='ctx'> 			      acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'POST' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_bus_POST_fops;</div><div class='hunk'>@@ -1250,8 +1210,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 	    create_proc_entry("DOS", S_IFREG | S_IRUGO | S_IRUSR,</div><div class='ctx'> 			      acpi_device_dir(device));</div><div class='ctx'> 	if (!entry)</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Unable to create 'DOS' fs entry\n"));</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	else {</div><div class='ctx'> 		acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;</div><div class='ctx'> 		entry-&gt;proc_fops = &amp;acpi_video_bus_DOS_fops;</div><div class='hunk'>@@ -1259,14 +1218,13 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)</div><div class='ctx'> 		entry-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_remove_fs(struct acpi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_video_bus *video;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_remove_fs");</div><div class='ctx'> </div><div class='ctx'> 	video = (struct acpi_video_bus *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='hunk'>@@ -1280,7 +1238,7 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)</div><div class='ctx'> 		acpi_device_dir(device) = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------------</div><div class='hunk'>@@ -1294,13 +1252,12 @@ acpi_video_bus_get_one_device(struct acpi_device *device,</div><div class='ctx'> 			      struct acpi_video_bus *video)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long device_id;</div><div class='del'>-	int status, result;</div><div class='add'>+	int status;</div><div class='ctx'> 	struct acpi_video_device *data;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_get_one_device");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !video)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	status =</div><div class='ctx'> 	    acpi_evaluate_integer(device-&gt;handle, "_ADR", NULL, &amp;device_id);</div><div class='hunk'>@@ -1308,11 +1265,10 @@ acpi_video_bus_get_one_device(struct acpi_device *device,</div><div class='ctx'> </div><div class='ctx'> 		data = kmalloc(sizeof(struct acpi_video_device), GFP_KERNEL);</div><div class='ctx'> 		if (!data)</div><div class='del'>-			return_VALUE(-ENOMEM);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 		memset(data, 0, sizeof(struct acpi_video_device));</div><div class='ctx'> </div><div class='del'>-		data-&gt;handle = device-&gt;handle;</div><div class='ctx'> 		strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);</div><div class='ctx'> 		strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);</div><div class='ctx'> 		acpi_driver_data(device) = data;</div><div class='hunk'>@@ -1339,15 +1295,18 @@ acpi_video_bus_get_one_device(struct acpi_device *device,</div><div class='ctx'> 		acpi_video_device_bind(video, data);</div><div class='ctx'> 		acpi_video_device_find_cap(data);</div><div class='ctx'> </div><div class='del'>-		status = acpi_install_notify_handler(data-&gt;handle,</div><div class='add'>+		status = acpi_install_notify_handler(device-&gt;handle,</div><div class='ctx'> 						     ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 						     acpi_video_device_notify,</div><div class='ctx'> 						     data);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='ctx'> 					  "Error installing notify handler\n"));</div><div class='del'>-			result = -ENODEV;</div><div class='del'>-			goto end;</div><div class='add'>+			if(data-&gt;brightness)</div><div class='add'>+				kfree(data-&gt;brightness-&gt;levels);</div><div class='add'>+			kfree(data-&gt;brightness);</div><div class='add'>+			kfree(data);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		down(&amp;video-&gt;sem);</div><div class='hunk'>@@ -1356,11 +1315,10 @@ acpi_video_bus_get_one_device(struct acpi_device *device,</div><div class='ctx'> </div><div class='ctx'> 		acpi_video_device_add_fs(device);</div><div class='ctx'> </div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-      end:</div><div class='del'>-	return_VALUE(-ENOENT);</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1403,7 +1361,6 @@ acpi_video_device_bind(struct acpi_video_bus *video,</div><div class='ctx'> 		       struct acpi_video_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_bind");</div><div class='ctx'> </div><div class='ctx'> #define IDS_VAL(i) video-&gt;attached_array[i].value.int_val</div><div class='ctx'> #define IDS_BIND(i) video-&gt;attached_array[i].bind_info</div><div class='hunk'>@@ -1440,17 +1397,15 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)</div><div class='ctx'> 	union acpi_object *dod = NULL;</div><div class='ctx'> 	union acpi_object *obj;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_enumerate");</div><div class='del'>-</div><div class='del'>-	status = acpi_evaluate_object(video-&gt;handle, "_DOD", NULL, &amp;buffer);</div><div class='add'>+	status = acpi_evaluate_object(video-&gt;device-&gt;handle, "_DOD", NULL, &amp;buffer);</div><div class='ctx'> 	if (!ACPI_SUCCESS(status)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _DOD\n"));</div><div class='del'>-		return_VALUE(status);</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _DOD"));</div><div class='add'>+		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dod = (union acpi_object *)buffer.pointer;</div><div class='ctx'> 	if (!dod || (dod-&gt;type != ACPI_TYPE_PACKAGE)) {</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DOD data\n"));</div><div class='add'>+		ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));</div><div class='ctx'> 		status = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1474,8 +1429,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)</div><div class='ctx'> 		obj = (union acpi_object *)&amp;dod-&gt;package.elements[i];</div><div class='ctx'> </div><div class='ctx'> 		if (obj-&gt;type != ACPI_TYPE_INTEGER) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Invalid _DOD data\n"));</div><div class='add'>+			printk(KERN_ERR PREFIX "Invalid _DOD data\n");</div><div class='ctx'> 			active_device_list[i].value.int_val =</div><div class='ctx'> 			    ACPI_VIDEO_HEAD_INVALID;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1492,8 +1446,8 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)</div><div class='ctx'> 	video-&gt;attached_array = active_device_list;</div><div class='ctx'> 	video-&gt;attached_count = count;</div><div class='ctx'>       out:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1518,7 +1472,6 @@ static int acpi_video_switch_output(struct acpi_video_bus *video, int event)</div><div class='ctx'> 	unsigned long state;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_switch_output");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(node, next, &amp;video-&gt;video_device_list) {</div><div class='ctx'> 		dev = container_of(node, struct acpi_video_device, entry);</div><div class='hunk'>@@ -1549,7 +1502,7 @@ static int acpi_video_switch_output(struct acpi_video_bus *video, int event)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1576,7 +1529,6 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	struct list_head *node, *next;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_get_devices");</div><div class='ctx'> </div><div class='ctx'> 	acpi_video_device_enumerate(video);</div><div class='ctx'> </div><div class='hunk'>@@ -1589,13 +1541,12 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,</div><div class='ctx'> </div><div class='ctx'> 		status = acpi_video_bus_get_one_device(dev, video);</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='del'>-			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-					  "Cant attach device\n"));</div><div class='add'>+			ACPI_EXCEPTION((AE_INFO, status, "Cant attach device"));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-	return_VALUE(status);</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_put_one_device(struct acpi_video_device *device)</div><div class='hunk'>@@ -1603,10 +1554,9 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> 	struct acpi_video_bus *video;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_put_one_device");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !device-&gt;video)</div><div class='del'>-		return_VALUE(-ENOENT);</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	video = device-&gt;video;</div><div class='ctx'> </div><div class='hunk'>@@ -1615,14 +1565,11 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)</div><div class='ctx'> 	up(&amp;video-&gt;sem);</div><div class='ctx'> 	acpi_video_device_remove_fs(device-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	status = acpi_remove_notify_handler(device-&gt;handle,</div><div class='add'>+	status = acpi_remove_notify_handler(device-&gt;dev-&gt;handle,</div><div class='ctx'> 					    ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					    acpi_video_device_notify);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_put_devices(struct acpi_video_bus *video)</div><div class='hunk'>@@ -1630,7 +1577,6 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)</div><div class='ctx'> 	int status;</div><div class='ctx'> 	struct list_head *node, *next;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_put_devices");</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(node, next, &amp;video-&gt;video_device_list) {</div><div class='ctx'> 		struct acpi_video_device *data =</div><div class='hunk'>@@ -1643,12 +1589,13 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)</div><div class='ctx'> 			printk(KERN_WARNING PREFIX</div><div class='ctx'> 			       "hhuuhhuu bug in acpi video driver.\n");</div><div class='ctx'> </div><div class='add'>+		if (data-&gt;brightness)</div><div class='add'>+			kfree(data-&gt;brightness-&gt;levels);</div><div class='ctx'> 		kfree(data-&gt;brightness);</div><div class='del'>-</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* acpi_video interface */</div><div class='hunk'>@@ -1668,14 +1615,12 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	struct acpi_video_bus *video = (struct acpi_video_bus *)data;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_notify");</div><div class='ctx'> 	printk("video bus notify\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!video)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (acpi_bus_get_device(handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+	device = video-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_VIDEO_NOTIFY_SWITCH:	/* User request that a switch occur,</div><div class='hunk'>@@ -1704,7 +1649,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='hunk'>@@ -1713,14 +1658,12 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 	    (struct acpi_video_device *)data;</div><div class='ctx'> 	struct acpi_device *device = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_device_notify");</div><div class='ctx'> </div><div class='ctx'> 	printk("video device notify\n");</div><div class='ctx'> 	if (!video_device)</div><div class='del'>-		return_VOID;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (acpi_bus_get_device(handle, &amp;device))</div><div class='del'>-		return_VOID;</div><div class='add'>+	device = video_device-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ACPI_VIDEO_NOTIFY_SWITCH:	/* change in status (cycle output device) */</div><div class='hunk'>@@ -1740,7 +1683,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='ctx'> 				  "Unsupported event [0x%x]\n", event));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_add(struct acpi_device *device)</div><div class='hunk'>@@ -1749,17 +1692,16 @@ static int acpi_video_bus_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	struct acpi_video_bus *video = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_add");</div><div class='ctx'> </div><div class='ctx'> 	if (!device)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	video = kmalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);</div><div class='ctx'> 	if (!video)</div><div class='del'>-		return_VALUE(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(video, 0, sizeof(struct acpi_video_bus));</div><div class='ctx'> </div><div class='del'>-	video-&gt;handle = device-&gt;handle;</div><div class='add'>+	video-&gt;device = device;</div><div class='ctx'> 	strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);</div><div class='ctx'> 	strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);</div><div class='ctx'> 	acpi_driver_data(device) = video;</div><div class='hunk'>@@ -1779,12 +1721,16 @@ static int acpi_video_bus_add(struct acpi_device *device)</div><div class='ctx'> 	acpi_video_bus_get_devices(video, device);</div><div class='ctx'> 	acpi_video_bus_start_devices(video);</div><div class='ctx'> </div><div class='del'>-	status = acpi_install_notify_handler(video-&gt;handle,</div><div class='add'>+	status = acpi_install_notify_handler(device-&gt;handle,</div><div class='ctx'> 					     ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					     acpi_video_bus_notify, video);</div><div class='ctx'> 	if (ACPI_FAILURE(status)) {</div><div class='ctx'> 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='ctx'> 				  "Error installing notify handler\n"));</div><div class='add'>+		acpi_video_bus_stop_devices(video);</div><div class='add'>+		acpi_video_bus_put_devices(video);</div><div class='add'>+		kfree(video-&gt;attached_array);</div><div class='add'>+		acpi_video_bus_remove_fs(device);</div><div class='ctx'> 		result = -ENODEV;</div><div class='ctx'> 		goto end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1796,12 +1742,10 @@ static int acpi_video_bus_add(struct acpi_device *device)</div><div class='ctx'> 	       video-&gt;flags.post ? "yes" : "no");</div><div class='ctx'> </div><div class='ctx'>       end:</div><div class='del'>-	if (result) {</div><div class='del'>-		acpi_video_bus_remove_fs(device);</div><div class='add'>+	if (result)</div><div class='ctx'> 		kfree(video);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(result);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int acpi_video_bus_remove(struct acpi_device *device, int type)</div><div class='hunk'>@@ -1809,21 +1753,17 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	acpi_status status = 0;</div><div class='ctx'> 	struct acpi_video_bus *video = NULL;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_remove");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !acpi_driver_data(device))</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	video = (struct acpi_video_bus *)acpi_driver_data(device);</div><div class='ctx'> </div><div class='ctx'> 	acpi_video_bus_stop_devices(video);</div><div class='ctx'> </div><div class='del'>-	status = acpi_remove_notify_handler(video-&gt;handle,</div><div class='add'>+	status = acpi_remove_notify_handler(video-&gt;device-&gt;handle,</div><div class='ctx'> 					    ACPI_DEVICE_NOTIFY,</div><div class='ctx'> 					    acpi_video_bus_notify);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,</div><div class='del'>-				  "Error removing notify handler\n"));</div><div class='ctx'> </div><div class='ctx'> 	acpi_video_bus_put_devices(video);</div><div class='ctx'> 	acpi_video_bus_remove_fs(device);</div><div class='hunk'>@@ -1831,7 +1771,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)</div><div class='ctx'> 	kfree(video-&gt;attached_array);</div><div class='ctx'> 	kfree(video);</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1841,10 +1781,9 @@ acpi_video_bus_match(struct acpi_device *device, struct acpi_driver *driver)</div><div class='ctx'> 	acpi_handle h_dummy2;</div><div class='ctx'> 	acpi_handle h_dummy3;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_bus_match");</div><div class='ctx'> </div><div class='ctx'> 	if (!device || !driver)</div><div class='del'>-		return_VALUE(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Since there is no HID, CID for ACPI Video drivers, we have</div><div class='ctx'> 	 * to check well known required nodes for each feature we support.</div><div class='hunk'>@@ -1853,26 +1792,25 @@ acpi_video_bus_match(struct acpi_device *device, struct acpi_driver *driver)</div><div class='ctx'> 	/* Does this device able to support video switching ? */</div><div class='ctx'> 	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_DOD", &amp;h_dummy1)) &amp;&amp;</div><div class='ctx'> 	    ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_DOS", &amp;h_dummy2)))</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Does this device able to retrieve a video ROM ? */</div><div class='ctx'> 	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_ROM", &amp;h_dummy1)))</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Does this device able to configure which video head to be POSTed ? */</div><div class='ctx'> 	if (ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_VPO", &amp;h_dummy1)) &amp;&amp;</div><div class='ctx'> 	    ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_GPD", &amp;h_dummy2)) &amp;&amp;</div><div class='ctx'> 	    ACPI_SUCCESS(acpi_get_handle(device-&gt;handle, "_SPD", &amp;h_dummy3)))</div><div class='del'>-		return_VALUE(0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return_VALUE(-ENODEV);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init acpi_video_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_init");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	   acpi_dbg_level = 0xFFFFFFFF;</div><div class='hunk'>@@ -1881,27 +1819,26 @@ static int __init acpi_video_init(void)</div><div class='ctx'> </div><div class='ctx'> 	acpi_video_dir = proc_mkdir(ACPI_VIDEO_CLASS, acpi_root_dir);</div><div class='ctx'> 	if (!acpi_video_dir)</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	acpi_video_dir-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	result = acpi_bus_register_driver(&amp;acpi_video_bus);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		remove_proc_entry(ACPI_VIDEO_CLASS, acpi_root_dir);</div><div class='del'>-		return_VALUE(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return_VALUE(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit acpi_video_exit(void)</div><div class='ctx'> {</div><div class='del'>-	ACPI_FUNCTION_TRACE("acpi_video_exit");</div><div class='ctx'> </div><div class='ctx'> 	acpi_bus_unregister_driver(&amp;acpi_video_bus);</div><div class='ctx'> </div><div class='ctx'> 	remove_proc_entry(ACPI_VIDEO_CLASS, acpi_root_dir);</div><div class='ctx'> </div><div class='del'>-	return_VOID;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpi_video_init);</div><div class='head'>diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c<br/>index 889855d8d9f9..9e3e2a69c03a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/amba/bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/amba/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/amba/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/amba/bus.c</a></div><div class='hunk'>@@ -180,8 +180,9 @@ static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)</div><div class='ctx'> amba_attr(id, "%08x\n", dev-&gt;periphid);</div><div class='ctx'> amba_attr(irq0, "%u\n", dev-&gt;irq[0]);</div><div class='ctx'> amba_attr(irq1, "%u\n", dev-&gt;irq[1]);</div><div class='del'>-amba_attr(resource, "\t%08lx\t%08lx\t%08lx\n",</div><div class='del'>-	  dev-&gt;res.start, dev-&gt;res.end, dev-&gt;res.flags);</div><div class='add'>+amba_attr(resource, "\t%016llx\t%016llx\t%016lx\n",</div><div class='add'>+	 (unsigned long long)dev-&gt;res.start, (unsigned long long)dev-&gt;res.end,</div><div class='add'>+	 dev-&gt;res.flags);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	amba_device_register - register an AMBA device</div><div class='head'>diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig<br/>index 01a9f1cb7743..cfa5af883e13 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/Kconfig</a></div><div class='hunk'>@@ -398,7 +398,7 @@ config ATM_FORE200E_USE_TASKLET</div><div class='ctx'> 	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  This defers work to be done by the interrupt handler to a</div><div class='del'>-	  tasklet instead of hanlding everything at interrupt time.  This</div><div class='add'>+	  tasklet instead of handling everything at interrupt time.  This</div><div class='ctx'> 	  may improve the responsive of the host.</div><div class='ctx'> </div><div class='ctx'> config ATM_FORE200E_TX_RETRY</div><div class='head'>diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c<br/>index d1387cfe2d30..6cc93de0b71d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/adummy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/adummy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/adummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/adummy.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * adummy.c: a dummy ATM driver</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c<br/>index 4b6bf19c39c0..4521a249dd56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/ambassador.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/ambassador.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/ambassador.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/ambassador.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/atmdev.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -1995,7 +1996,7 @@ static int __devinit ucode_init (loader_block * lb, amb_dev * dev) {</div><div class='ctx'>     }</div><div class='ctx'>     i += 1;</div><div class='ctx'>   }</div><div class='del'>-  if (*pointer == 0xdeadbeef) {</div><div class='add'>+  if (*pointer == ATM_POISON) {</div><div class='ctx'>     return loader_start (lb, dev, ucode_start);</div><div class='ctx'>   } else {</div><div class='ctx'>     // cast needed as there is no %? for pointer differnces</div><div class='hunk'>@@ -2257,7 +2258,8 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at"</div><div class='del'>-		" IO %lx, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1),</div><div class='add'>+		" IO %llx, IRQ %u, MEM %p",</div><div class='add'>+		(unsigned long long)pci_resource_start(pci_dev, 1),</div><div class='ctx'> 		irq, bus_to_virt(pci_resource_start(pci_dev, 0)));</div><div class='ctx'> </div><div class='ctx'> 	// check IO region</div><div class='hunk'>@@ -2285,7 +2287,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_</div><div class='ctx'> 	setup_pci_dev(pci_dev);</div><div class='ctx'> </div><div class='ctx'> 	// grab (but share) IRQ and install handler</div><div class='del'>-	err = request_irq(irq, interrupt_handler, SA_SHIRQ, DEV_LABEL, dev);</div><div class='add'>+	err = request_irq(irq, interrupt_handler, IRQF_SHARED, DEV_LABEL, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		PRINTK (KERN_ERR, "request IRQ failed!");</div><div class='ctx'> 		goto out_reset;</div><div class='head'>diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h<br/>index 84a93063cfe1..8296420ceaef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/ambassador.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/ambassador.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/ambassador.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/ambassador.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #ifndef AMBASSADOR_H</div><div class='ctx'> #define AMBASSADOR_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATM_AMBASSADOR_DEBUG</div><div class='ctx'> #define DEBUG_AMBASSADOR</div><div class='head'>diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c<br/>index c13c4d736ef5..df359a6c14f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/eni.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/eni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/eni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/eni.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -1798,7 +1797,7 @@ static int __devinit eni_start(struct atm_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("&gt;eni_start\n");</div><div class='ctx'> 	eni_dev = ENI_DEV(dev);</div><div class='del'>-	if (request_irq(eni_dev-&gt;irq,&amp;eni_int,SA_SHIRQ,DEV_LABEL,dev)) {</div><div class='add'>+	if (request_irq(eni_dev-&gt;irq,&amp;eni_int,IRQF_SHARED,DEV_LABEL,dev)) {</div><div class='ctx'> 		printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",</div><div class='ctx'> 		    dev-&gt;number,eni_dev-&gt;irq);</div><div class='ctx'> 		error = -EAGAIN;</div><div class='head'>diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c<br/>index 7f7ec288824d..38fc054bd671 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/firestream.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/firestream.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/firestream.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/firestream.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/atm.h&gt;</div><div class='ctx'> #include &lt;linux/atmdev.h&gt;</div><div class='hunk'>@@ -754,7 +755,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)</div><div class='ctx'> 			fs_kfree_skb (skb);</div><div class='ctx'> </div><div class='ctx'> 			fs_dprintk (FS_DEBUG_ALLOC, "Free trans-d: %p\n", td); </div><div class='del'>-			memset (td, 0x12, sizeof (struct FS_BPENTRY));</div><div class='add'>+			memset (td, ATM_POISON_FREE, sizeof(struct FS_BPENTRY));</div><div class='ctx'> 			kfree (td);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -951,7 +952,7 @@ static int fs_open(struct atm_vcc *atm_vcc)</div><div class='ctx'> 		   it most likely that the chip will notice it. It also prevents us</div><div class='ctx'> 		   from having to wait for completion. On the other hand, we may</div><div class='ctx'> 		   need to wait for completion anyway, to see if it completed</div><div class='del'>-		   succesfully. */</div><div class='add'>+		   successfully. */</div><div class='ctx'> </div><div class='ctx'> 		switch (atm_vcc-&gt;qos.aal) {</div><div class='ctx'> 		case ATM_AAL2:</div><div class='hunk'>@@ -1657,9 +1658,10 @@ static int __devinit fs_init (struct fs_dev *dev)</div><div class='ctx'> 	func_enter ();</div><div class='ctx'> 	pci_dev = dev-&gt;pci_dev;</div><div class='ctx'> </div><div class='del'>-	printk (KERN_INFO "found a FireStream %d card, base %08lx, irq%d.\n", </div><div class='add'>+	printk (KERN_INFO "found a FireStream %d card, base %16llx, irq%d.\n",</div><div class='ctx'> 		IS_FS50(dev)?50:155,</div><div class='del'>-		pci_resource_start(pci_dev, 0), dev-&gt;pci_dev-&gt;irq);</div><div class='add'>+		(unsigned long long)pci_resource_start(pci_dev, 0),</div><div class='add'>+		dev-&gt;pci_dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	if (fs_debug &amp; FS_DEBUG_INIT)</div><div class='ctx'> 		my_hd ((unsigned char *) dev, sizeof (*dev));</div><div class='hunk'>@@ -1827,7 +1829,7 @@ static int __devinit fs_init (struct fs_dev *dev)</div><div class='ctx'> 		init_q (dev, &amp;dev-&gt;rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = pci_dev-&gt;irq;</div><div class='del'>-	if (request_irq (dev-&gt;irq, fs_irq, SA_SHIRQ, "firestream", dev)) {</div><div class='add'>+	if (request_irq (dev-&gt;irq, fs_irq, IRQF_SHARED, "firestream", dev)) {</div><div class='ctx'> 		printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev-&gt;irq);</div><div class='ctx'> 		/* XXX undo all previous stuff... */</div><div class='ctx'> 		return 1;</div><div class='head'>diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c<br/>index 05983a312d50..98622130de5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/fore200e.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/fore200e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/fore200e.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/fore200e.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -167,13 +166,9 @@ fore200e_atm2fore_aal(int aal)</div><div class='ctx'> static char*</div><div class='ctx'> fore200e_irq_itoa(int irq)</div><div class='ctx'> {</div><div class='del'>-#if defined(__sparc_v9__)</div><div class='del'>-    return __irq_itoa(irq);</div><div class='del'>-#else</div><div class='ctx'>     static char str[8];</div><div class='ctx'>     sprintf(str, "%d", irq);</div><div class='ctx'>     return str;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2128,7 +2123,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags)</div><div class='ctx'> static int __devinit</div><div class='ctx'> fore200e_irq_request(struct fore200e* fore200e)</div><div class='ctx'> {</div><div class='del'>-    if (request_irq(fore200e-&gt;irq, fore200e_interrupt, SA_SHIRQ, fore200e-&gt;name, fore200e-&gt;atm_dev) &lt; 0) {</div><div class='add'>+    if (request_irq(fore200e-&gt;irq, fore200e_interrupt, IRQF_SHARED, fore200e-&gt;name, fore200e-&gt;atm_dev) &lt; 0) {</div><div class='ctx'> </div><div class='ctx'> 	printk(FORE200E "unable to reserve IRQ %s for device %s\n",</div><div class='ctx'> 	       fore200e_irq_itoa(fore200e-&gt;irq), fore200e-&gt;name);</div><div class='head'>diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h<br/>index 2558eb853235..f9abfdac33e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/fore200e.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/fore200e.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/fore200e.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/fore200e.h</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> #define _FORE200E_H</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* rx buffer sizes */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/he.c b/drivers/atm/he.c<br/>index fde9334059af..d369130f4235 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/he.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/he.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/he.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/he.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -1008,7 +1007,7 @@ he_init_irq(struct he_dev *he_dev)</div><div class='ctx'> 	he_writel(he_dev, 0x0, GRP_54_MAP);</div><div class='ctx'> 	he_writel(he_dev, 0x0, GRP_76_MAP);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(he_dev-&gt;pci_dev-&gt;irq, he_irq_handler, SA_INTERRUPT|SA_SHIRQ, DEV_LABEL, he_dev)) {</div><div class='add'>+	if (request_irq(he_dev-&gt;pci_dev-&gt;irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) {</div><div class='ctx'> 		hprintk("irq %d already in use\n", he_dev-&gt;pci_dev-&gt;irq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}   </div><div class='hunk'>@@ -1018,7 +1017,7 @@ he_init_irq(struct he_dev *he_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> he_start(struct atm_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct he_dev *he_dev;</div><div class='head'>diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c<br/>index 821c81e8cd38..d1113e845f95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/horizon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/horizon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/horizon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/horizon.c</a></div><div class='hunk'>@@ -2735,7 +2735,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_</div><div class='ctx'> 	irq = pci_dev-&gt;irq;</div><div class='ctx'> 	if (request_irq(irq,</div><div class='ctx'> 			interrupt_handler,</div><div class='del'>-			SA_SHIRQ, /* irqflags guess */</div><div class='add'>+			IRQF_SHARED, /* irqflags guess */</div><div class='ctx'> 			DEV_LABEL, /* name guess */</div><div class='ctx'> 			dev)) {</div><div class='ctx'> 		PRINTD(DBG_WARN, "request IRQ failed!");</div><div class='head'>diff --git a/drivers/atm/horizon.h b/drivers/atm/horizon.h<br/>index e2cc7020fa3b..4461229f56a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/horizon.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/horizon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/horizon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/horizon.h</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #ifndef DRIVER_ATM_HORIZON_H</div><div class='ctx'> #define DRIVER_ATM_HORIZON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATM_HORIZON_DEBUG</div><div class='ctx'> #define DEBUG_HORIZON</div><div class='head'>diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c<br/>index 0aabfc2a59d9..325325afabec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/idt77105.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/idt77105.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/idt77105.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/idt77105.c</a></div><div class='hunk'>@@ -358,7 +358,7 @@ static const struct atmphy_ops idt77105_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int idt77105_init(struct atm_dev *dev)</div><div class='add'>+int __devinit idt77105_init(struct atm_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;phy = &amp;idt77105_ops;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/atm/idt77105.h b/drivers/atm/idt77105.h<br/>index 8ba8218aaefe..3fd2bc899761 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/idt77105.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/idt77105.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/idt77105.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/idt77105.h</a></div><div class='hunk'>@@ -76,7 +76,7 @@</div><div class='ctx'> #define IDT77105_CTRSEL_RHEC	0x01	/* W, Rx HEC Error Counter */</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='del'>-int idt77105_init(struct atm_dev *dev) __init;</div><div class='add'>+int idt77105_init(struct atm_dev *dev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c<br/>index b4a76cade646..b0369bb20f08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/idt77252.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/idt77252.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/idt77252.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/idt77252.c</a></div><div class='hunk'>@@ -34,8 +34,8 @@ static char const rcsid[] =</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -3387,7 +3387,7 @@ init_card(struct atm_dev *dev)</div><div class='ctx'> 		writel(SAR_STAT_TMROF, SAR_REG_STAT);</div><div class='ctx'> 	}</div><div class='ctx'> 	IPRINTK("%s: Request IRQ ... ", card-&gt;name);</div><div class='del'>-	if (request_irq(pcidev-&gt;irq, idt77252_interrupt, SA_INTERRUPT|SA_SHIRQ,</div><div class='add'>+	if (request_irq(pcidev-&gt;irq, idt77252_interrupt, IRQF_DISABLED|IRQF_SHARED,</div><div class='ctx'> 			card-&gt;name, card) != 0) {</div><div class='ctx'> 		printk("%s: can't allocate IRQ.\n", card-&gt;name);</div><div class='ctx'> 		deinit_card(card);</div><div class='hunk'>@@ -3658,7 +3658,7 @@ probe_sram(struct idt77252_dev *card)</div><div class='ctx'> 	writel(SAR_CMD_WRITE_SRAM | (0 &lt;&lt; 2), SAR_REG_CMD);</div><div class='ctx'> </div><div class='ctx'> 	for (addr = 0x4000; addr &lt; 0x80000; addr += 0x4000) {</div><div class='del'>-		writel(0xdeadbeef, SAR_REG_DR0);</div><div class='add'>+		writel(ATM_POISON, SAR_REG_DR0);</div><div class='ctx'> 		writel(SAR_CMD_WRITE_SRAM | (addr &lt;&lt; 2), SAR_REG_CMD);</div><div class='ctx'> </div><div class='ctx'> 		writel(SAR_CMD_READ_SRAM | (0 &lt;&lt; 2), SAR_REG_CMD);</div><div class='head'>diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c<br/>index 2e2e50e1167a..f20b0b2c06c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/iphase.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/iphase.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/iphase.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/iphase.c</a></div><div class='hunk'>@@ -2284,7 +2284,7 @@ static int reset_sar(struct atm_dev *dev)</div><div class='ctx'> }  </div><div class='ctx'> 	  </div><div class='ctx'> 	  </div><div class='del'>-static int __init ia_init(struct atm_dev *dev)</div><div class='add'>+static int __devinit ia_init(struct atm_dev *dev)</div><div class='ctx'> {  </div><div class='ctx'> 	IADEV *iadev;  </div><div class='ctx'> 	unsigned long real_base;</div><div class='hunk'>@@ -2480,7 +2480,7 @@ static void ia_free_rx(IADEV *iadev)</div><div class='ctx'> 			  iadev-&gt;rx_dle_dma);  </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init ia_start(struct atm_dev *dev)</div><div class='add'>+static int __devinit ia_start(struct atm_dev *dev)</div><div class='ctx'> {  </div><div class='ctx'> 	IADEV *iadev;  </div><div class='ctx'> 	int error;  </div><div class='hunk'>@@ -2488,7 +2488,7 @@ static int __init ia_start(struct atm_dev *dev)</div><div class='ctx'> 	u32 ctrl_reg;  </div><div class='ctx'> 	IF_EVENT(printk("&gt;ia_start\n");)  </div><div class='ctx'> 	iadev = INPH_IA_DEV(dev);  </div><div class='del'>-        if (request_irq(iadev-&gt;irq, &amp;ia_int, SA_SHIRQ, DEV_LABEL, dev)) {  </div><div class='add'>+        if (request_irq(iadev-&gt;irq, &amp;ia_int, IRQF_SHARED, DEV_LABEL, dev)) {</div><div class='ctx'>                 printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",  </div><div class='ctx'>                     dev-&gt;number, iadev-&gt;irq);  </div><div class='ctx'> 		error = -EAGAIN;</div><div class='head'>diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h<br/>index b8d0bd4d6c30..133eefcc0475 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/iphase.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/iphase.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/iphase.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/iphase.h</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> #ifndef IPHASE_H  </div><div class='ctx'> #define IPHASE_H  </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /************************ IADBG DEFINE *********************************/</div><div class='ctx'> /* IADebugFlag Bit Map */ </div><div class='head'>diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c<br/>index cac09e353be8..fe60a59b7fc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/lanai.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/lanai.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/lanai.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/lanai.c</a></div><div class='hunk'>@@ -2240,7 +2240,7 @@ static int __devinit lanai_dev_open(struct atm_dev *atmdev)</div><div class='ctx'> 	conf2_write(lanai);</div><div class='ctx'> 	reg_write(lanai, TX_FIFO_DEPTH, TxDepth_Reg);</div><div class='ctx'> 	reg_write(lanai, 0, CBR_ICG_Reg);	/* CBR defaults to no limit */</div><div class='del'>-	if ((result = request_irq(lanai-&gt;pci-&gt;irq, lanai_int, SA_SHIRQ,</div><div class='add'>+	if ((result = request_irq(lanai-&gt;pci-&gt;irq, lanai_int, IRQF_SHARED,</div><div class='ctx'> 	    DEV_LABEL, lanai)) != 0) {</div><div class='ctx'> 		printk(KERN_ERR DEV_LABEL ": can't allocate interrupt\n");</div><div class='ctx'> 		goto error_vcctable;</div><div class='head'>diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c<br/>index 074abc81ec3d..b8036899e56f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/nicstar.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/nicstar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/nicstar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/nicstar.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> /* Header files ***************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/atmdev.h&gt;</div><div class='hunk'>@@ -626,7 +625,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)</div><div class='ctx'>    if (mac[i] == NULL)</div><div class='ctx'>       nicstar_init_eprom(card-&gt;membase);</div><div class='ctx'> </div><div class='del'>-   if (request_irq(pcidev-&gt;irq, &amp;ns_irq_handler, SA_INTERRUPT | SA_SHIRQ, "nicstar", card) != 0)</div><div class='add'>+   if (request_irq(pcidev-&gt;irq, &amp;ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)</div><div class='ctx'>    {</div><div class='ctx'>       printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev-&gt;irq);</div><div class='ctx'>       error = 9;</div><div class='head'>diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c<br/>index b1d063cc4fbe..f04f39c00833 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/suni.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/suni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/suni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/suni.c</a></div><div class='hunk'>@@ -289,7 +289,7 @@ static const struct atmphy_ops suni_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int suni_init(struct atm_dev *dev)</div><div class='add'>+int __devinit suni_init(struct atm_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char mri;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c<br/>index f484747f255e..2c65e82f0d6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/zatm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/zatm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/zatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/zatm.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1271,7 +1270,7 @@ static int __init zatm_start(struct atm_dev *dev)</div><div class='ctx'> 	zatm_dev-&gt;rx_map = zatm_dev-&gt;tx_map = NULL;</div><div class='ctx'>  	for (i = 0; i &lt; NR_MBX; i++)</div><div class='ctx'>  		zatm_dev-&gt;mbx_start[i] = 0;</div><div class='del'>- 	error = request_irq(zatm_dev-&gt;irq, zatm_int, SA_SHIRQ, DEV_LABEL, dev);</div><div class='add'>+ 	error = request_irq(zatm_dev-&gt;irq, zatm_int, IRQF_SHARED, DEV_LABEL, dev);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'>  		printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",</div><div class='ctx'>  		    dev-&gt;number,zatm_dev-&gt;irq);</div><div class='head'>diff --git a/drivers/atm/zatm.h b/drivers/atm/zatm.h<br/>index 416fe0fda60c..ae9165ce15a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/atm/zatm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/atm/zatm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/atm/zatm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/atm/zatm.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'> #ifndef DRIVER_ATM_ZATM_H</div><div class='ctx'> #define DRIVER_ATM_ZATM_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/atm.h&gt;</div><div class='ctx'> #include &lt;linux/atmdev.h&gt;</div><div class='head'>diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig<br/>index f0eff3dac58d..0b4e22436935 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/Kconfig</a></div><div class='hunk'>@@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD</div><div class='ctx'> </div><div class='ctx'> config FW_LOADER</div><div class='ctx'> 	tristate "Userspace firmware loading support"</div><div class='del'>-	select HOTPLUG</div><div class='add'>+	depends on HOTPLUG</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This option is provided for the case where no in-kernel-tree modules</div><div class='ctx'> 	  require userspace firmware loading support, but a module built outside</div><div class='hunk'>@@ -38,3 +38,7 @@ config DEBUG_DRIVER</div><div class='ctx'> 	  If you are unsure about this, say N here.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='add'>+</div><div class='add'>+config SYS_HYPERVISOR</div><div class='add'>+	bool</div><div class='add'>+	default n</div><div class='head'>diff --git a/drivers/base/Makefile b/drivers/base/Makefile<br/>index e99471d3232b..b539e5e75b56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/Makefile</a></div><div class='hunk'>@@ -5,10 +5,12 @@ obj-y			:= core.o sys.o bus.o dd.o \</div><div class='ctx'> 			   cpu.o firmware.o init.o map.o dmapool.o \</div><div class='ctx'> 			   attribute_container.o transport_class.o</div><div class='ctx'> obj-y			+= power/</div><div class='add'>+obj-$(CONFIG_ISA)	+= isa.o</div><div class='ctx'> obj-$(CONFIG_FW_LOADER)	+= firmware_class.o</div><div class='ctx'> obj-$(CONFIG_NUMA)	+= node.o</div><div class='ctx'> obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o</div><div class='ctx'> obj-$(CONFIG_SMP)	+= topology.o</div><div class='add'>+obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_DEBUG_DRIVER),y)</div><div class='ctx'> EXTRA_CFLAGS += -DDEBUG</div><div class='head'>diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c<br/>index 2a7d7ae83e1e..22220733f76f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/attribute_container.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/attribute_container.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/attribute_container.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/attribute_container.c</a></div><div class='hunk'>@@ -236,7 +236,6 @@ attribute_container_remove_device(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;attribute_container_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_remove_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_device_trigger - execute a trigger for each matching classdev</div><div class='hunk'>@@ -276,7 +275,6 @@ attribute_container_device_trigger(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;attribute_container_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_device_trigger);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_trigger - trigger a function for each matching container</div><div class='hunk'>@@ -304,7 +302,6 @@ attribute_container_trigger(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;attribute_container_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_trigger);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_add_attrs - add attributes</div><div class='hunk'>@@ -333,7 +330,6 @@ attribute_container_add_attrs(struct class_device *classdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_add_attrs);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_add_class_device - same function as class_device_add</div><div class='hunk'>@@ -352,7 +348,6 @@ attribute_container_add_class_device(struct class_device *classdev)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	return attribute_container_add_attrs(classdev);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_add_class_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_add_class_device_adapter - simple adapter for triggers</div><div class='hunk'>@@ -367,7 +362,6 @@ attribute_container_add_class_device_adapter(struct attribute_container *cont,</div><div class='ctx'> {</div><div class='ctx'> 	return attribute_container_add_class_device(classdev);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_add_class_device_adapter);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_remove_attrs - remove any attribute files</div><div class='hunk'>@@ -389,7 +383,6 @@ attribute_container_remove_attrs(struct class_device *classdev)</div><div class='ctx'> 	for (i = 0; attrs[i]; i++)</div><div class='ctx'> 		class_device_remove_file(classdev, attrs[i]);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_remove_attrs);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_class_device_del - equivalent of class_device_del</div><div class='hunk'>@@ -405,7 +398,6 @@ attribute_container_class_device_del(struct class_device *classdev)</div><div class='ctx'> 	attribute_container_remove_attrs(classdev);</div><div class='ctx'> 	class_device_del(classdev);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(attribute_container_class_device_del);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * attribute_container_find_class_device - find the corresponding class_device</div><div class='head'>diff --git a/drivers/base/base.h b/drivers/base/base.h<br/>index 5735b38582d0..c3b8dc98b8a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/base.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/base.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/base.h</a></div><div class='hunk'>@@ -5,13 +5,21 @@ extern int devices_init(void);</div><div class='ctx'> extern int buses_init(void);</div><div class='ctx'> extern int classes_init(void);</div><div class='ctx'> extern int firmware_init(void);</div><div class='add'>+#ifdef CONFIG_SYS_HYPERVISOR</div><div class='add'>+extern int hypervisor_init(void);</div><div class='add'>+#else</div><div class='add'>+static inline int hypervisor_init(void) { return 0; }</div><div class='add'>+#endif</div><div class='ctx'> extern int platform_bus_init(void);</div><div class='ctx'> extern int system_bus_init(void);</div><div class='ctx'> extern int cpu_dev_init(void);</div><div class='ctx'> extern int attribute_container_init(void);</div><div class='ctx'> </div><div class='ctx'> extern int bus_add_device(struct device * dev);</div><div class='add'>+extern void bus_attach_device(struct device * dev);</div><div class='ctx'> extern void bus_remove_device(struct device * dev);</div><div class='add'>+extern struct bus_type *get_bus(struct bus_type * bus);</div><div class='add'>+extern void put_bus(struct bus_type * bus);</div><div class='ctx'> </div><div class='ctx'> extern int bus_add_driver(struct device_driver *);</div><div class='ctx'> extern void bus_remove_driver(struct device_driver *);</div><div class='hunk'>@@ -34,4 +42,5 @@ struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)</div><div class='ctx'> 	return container_of(_attr, struct class_device_attribute, attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern char *make_class_name(const char *name, struct kobject *kobj);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/bus.c b/drivers/base/bus.c<br/>index 76656acd00d4..2e954d07175a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/bus.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -130,7 +129,7 @@ static struct kobj_type ktype_bus = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-decl_subsys(bus, &amp;ktype_bus, NULL);</div><div class='add'>+static decl_subsys(bus, &amp;ktype_bus, NULL);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG</div><div class='hunk'>@@ -362,8 +361,7 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev)</div><div class='ctx'>  *	@dev:	device being added</div><div class='ctx'>  *</div><div class='ctx'>  *	- Add the device to its bus's list of devices.</div><div class='del'>- *	- Try to attach to driver.</div><div class='del'>- *	- Create link to device's physical location.</div><div class='add'>+ *	- Create link to device's bus.</div><div class='ctx'>  */</div><div class='ctx'> int bus_add_device(struct device * dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -372,11 +370,10 @@ int bus_add_device(struct device * dev)</div><div class='ctx'> </div><div class='ctx'> 	if (bus) {</div><div class='ctx'> 		pr_debug("bus %s: add device %s\n", bus-&gt;name, dev-&gt;bus_id);</div><div class='del'>-		device_attach(dev);</div><div class='del'>-		klist_add_tail(&amp;dev-&gt;knode_bus, &amp;bus-&gt;klist_devices);</div><div class='ctx'> 		error = device_add_attrs(bus, dev);</div><div class='ctx'> 		if (!error) {</div><div class='ctx'> 			sysfs_create_link(&amp;bus-&gt;devices.kobj, &amp;dev-&gt;kobj, dev-&gt;bus_id);</div><div class='add'>+			sysfs_create_link(&amp;dev-&gt;kobj, &amp;dev-&gt;bus-&gt;subsys.kset.kobj, "subsystem");</div><div class='ctx'> 			sysfs_create_link(&amp;dev-&gt;kobj, &amp;dev-&gt;bus-&gt;subsys.kset.kobj, "bus");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -384,6 +381,22 @@ int bus_add_device(struct device * dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	bus_attach_device - add device to bus</div><div class='add'>+ *	@dev:	device tried to attach to a driver</div><div class='add'>+ *</div><div class='add'>+ *	- Try to attach to driver.</div><div class='add'>+ */</div><div class='add'>+void bus_attach_device(struct device * dev)</div><div class='add'>+{</div><div class='add'>+	struct bus_type * bus = dev-&gt;bus;</div><div class='add'>+</div><div class='add'>+	if (bus) {</div><div class='add'>+		device_attach(dev);</div><div class='add'>+		klist_add_tail(&amp;dev-&gt;knode_bus, &amp;bus-&gt;klist_devices);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	bus_remove_device - remove device from bus</div><div class='ctx'>  *	@dev:	device to be removed</div><div class='ctx'>  *</div><div class='hunk'>@@ -395,6 +408,7 @@ int bus_add_device(struct device * dev)</div><div class='ctx'> void bus_remove_device(struct device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;bus) {</div><div class='add'>+		sysfs_remove_link(&amp;dev-&gt;kobj, "subsystem");</div><div class='ctx'> 		sysfs_remove_link(&amp;dev-&gt;kobj, "bus");</div><div class='ctx'> 		sysfs_remove_link(&amp;dev-&gt;bus-&gt;devices.kobj, dev-&gt;bus_id);</div><div class='ctx'> 		device_remove_attrs(dev-&gt;bus, dev);</div><div class='hunk'>@@ -584,12 +598,13 @@ void put_bus(struct bus_type * bus)</div><div class='ctx'>  *</div><div class='ctx'>  *	Note that kset_find_obj increments bus' reference count.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='add'>+#if 0</div><div class='ctx'> struct bus_type * find_bus(char * name)</div><div class='ctx'> {</div><div class='ctx'> 	struct kobject * k = kset_find_obj(&amp;bus_subsys.kset, name);</div><div class='ctx'> 	return k ? to_bus(k) : NULL;</div><div class='ctx'> }</div><div class='add'>+#endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -732,14 +747,9 @@ EXPORT_SYMBOL_GPL(bus_for_each_dev);</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_find_device);</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_for_each_drv);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(bus_add_device);</div><div class='del'>-EXPORT_SYMBOL_GPL(bus_remove_device);</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_register);</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_unregister);</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_rescan_devices);</div><div class='del'>-EXPORT_SYMBOL_GPL(get_bus);</div><div class='del'>-EXPORT_SYMBOL_GPL(put_bus);</div><div class='del'>-EXPORT_SYMBOL_GPL(find_bus);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_create_file);</div><div class='ctx'> EXPORT_SYMBOL_GPL(bus_remove_file);</div><div class='head'>diff --git a/drivers/base/class.c b/drivers/base/class.c<br/>index b1ea4df85c7d..de8908320f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/class.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/class.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -91,14 +90,14 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)</div><div class='ctx'> 		sysfs_remove_file(&amp;cls-&gt;subsys.kset.kobj, &amp;attr-&gt;attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct class * class_get(struct class * cls)</div><div class='add'>+static struct class *class_get(struct class *cls)</div><div class='ctx'> {</div><div class='ctx'> 	if (cls)</div><div class='ctx'> 		return container_of(subsys_get(&amp;cls-&gt;subsys), struct class, subsys);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void class_put(struct class * cls)</div><div class='add'>+static void class_put(struct class * cls)</div><div class='ctx'> {</div><div class='ctx'> 	if (cls)</div><div class='ctx'> 		subsys_put(&amp;cls-&gt;subsys);</div><div class='hunk'>@@ -142,6 +141,7 @@ int class_register(struct class * cls)</div><div class='ctx'> 	pr_debug("device class '%s': registering\n", cls-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cls-&gt;children);</div><div class='add'>+	INIT_LIST_HEAD(&amp;cls-&gt;devices);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;cls-&gt;interfaces);</div><div class='ctx'> 	init_MUTEX(&amp;cls-&gt;sem);</div><div class='ctx'> 	error = kobject_set_name(&amp;cls-&gt;subsys.kset.kobj, "%s", cls-&gt;name);</div><div class='hunk'>@@ -504,22 +504,21 @@ void class_device_initialize(struct class_device *class_dev)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;class_dev-&gt;node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *make_class_name(struct class_device *class_dev)</div><div class='add'>+char *make_class_name(const char *name, struct kobject *kobj)</div><div class='ctx'> {</div><div class='del'>-	char *name;</div><div class='add'>+	char *class_name;</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='del'>-	size = strlen(class_dev-&gt;class-&gt;name) +</div><div class='del'>-		strlen(kobject_name(&amp;class_dev-&gt;kobj)) + 2;</div><div class='add'>+	size = strlen(name) + strlen(kobject_name(kobj)) + 2;</div><div class='ctx'> </div><div class='del'>-	name = kmalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!name)</div><div class='add'>+	class_name = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!class_name)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	strcpy(name, class_dev-&gt;class-&gt;name);</div><div class='del'>-	strcat(name, ":");</div><div class='del'>-	strcat(name, kobject_name(&amp;class_dev-&gt;kobj));</div><div class='del'>-	return name;</div><div class='add'>+	strcpy(class_name, name);</div><div class='add'>+	strcat(class_name, ":");</div><div class='add'>+	strcat(class_name, kobject_name(kobj));</div><div class='add'>+	return class_name;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int class_device_add(struct class_device *class_dev)</div><div class='hunk'>@@ -535,18 +534,22 @@ int class_device_add(struct class_device *class_dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!strlen(class_dev-&gt;class_id))</div><div class='del'>-		goto register_done;</div><div class='add'>+		goto out1;</div><div class='ctx'> </div><div class='ctx'> 	parent_class = class_get(class_dev-&gt;class);</div><div class='ctx'> 	if (!parent_class)</div><div class='del'>-		goto register_done;</div><div class='add'>+		goto out1;</div><div class='add'>+</div><div class='ctx'> 	parent_class_dev = class_device_get(class_dev-&gt;parent);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("CLASS: registering class device: ID = '%s'\n",</div><div class='ctx'> 		 class_dev-&gt;class_id);</div><div class='ctx'> </div><div class='ctx'> 	/* first, register with generic layer. */</div><div class='del'>-	kobject_set_name(&amp;class_dev-&gt;kobj, "%s", class_dev-&gt;class_id);</div><div class='add'>+	error = kobject_set_name(&amp;class_dev-&gt;kobj, "%s", class_dev-&gt;class_id);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out2;</div><div class='add'>+</div><div class='ctx'> 	if (parent_class_dev)</div><div class='ctx'> 		class_dev-&gt;kobj.parent = &amp;parent_class_dev-&gt;kobj;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -554,41 +557,58 @@ int class_device_add(struct class_device *class_dev)</div><div class='ctx'> </div><div class='ctx'> 	error = kobject_add(&amp;class_dev-&gt;kobj);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto register_done;</div><div class='add'>+		goto out2;</div><div class='ctx'> </div><div class='ctx'> 	/* add the needed attributes to this device */</div><div class='add'>+	sysfs_create_link(&amp;class_dev-&gt;kobj, &amp;parent_class-&gt;subsys.kset.kobj, "subsystem");</div><div class='ctx'> 	class_dev-&gt;uevent_attr.attr.name = "uevent";</div><div class='ctx'> 	class_dev-&gt;uevent_attr.attr.mode = S_IWUSR;</div><div class='ctx'> 	class_dev-&gt;uevent_attr.attr.owner = parent_class-&gt;owner;</div><div class='ctx'> 	class_dev-&gt;uevent_attr.store = store_uevent;</div><div class='del'>-	class_device_create_file(class_dev, &amp;class_dev-&gt;uevent_attr);</div><div class='add'>+	error = class_device_create_file(class_dev, &amp;class_dev-&gt;uevent_attr);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out3;</div><div class='ctx'> </div><div class='ctx'> 	if (MAJOR(class_dev-&gt;devt)) {</div><div class='ctx'> 		struct class_device_attribute *attr;</div><div class='ctx'> 		attr = kzalloc(sizeof(*attr), GFP_KERNEL);</div><div class='ctx'> 		if (!attr) {</div><div class='ctx'> 			error = -ENOMEM;</div><div class='del'>-			kobject_del(&amp;class_dev-&gt;kobj);</div><div class='del'>-			goto register_done;</div><div class='add'>+			goto out4;</div><div class='ctx'> 		}</div><div class='ctx'> 		attr-&gt;attr.name = "dev";</div><div class='ctx'> 		attr-&gt;attr.mode = S_IRUGO;</div><div class='ctx'> 		attr-&gt;attr.owner = parent_class-&gt;owner;</div><div class='ctx'> 		attr-&gt;show = show_dev;</div><div class='del'>-		class_device_create_file(class_dev, attr);</div><div class='add'>+		error = class_device_create_file(class_dev, attr);</div><div class='add'>+		if (error) {</div><div class='add'>+			kfree(attr);</div><div class='add'>+			goto out4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		class_dev-&gt;devt_attr = attr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	class_device_add_attrs(class_dev);</div><div class='add'>+	error = class_device_add_attrs(class_dev);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out5;</div><div class='add'>+</div><div class='ctx'> 	if (class_dev-&gt;dev) {</div><div class='del'>-		class_name = make_class_name(class_dev);</div><div class='del'>-		sysfs_create_link(&amp;class_dev-&gt;kobj,</div><div class='del'>-				  &amp;class_dev-&gt;dev-&gt;kobj, "device");</div><div class='del'>-		sysfs_create_link(&amp;class_dev-&gt;dev-&gt;kobj, &amp;class_dev-&gt;kobj,</div><div class='del'>-				  class_name);</div><div class='add'>+		class_name = make_class_name(class_dev-&gt;class-&gt;name,</div><div class='add'>+					     &amp;class_dev-&gt;kobj);</div><div class='add'>+		error = sysfs_create_link(&amp;class_dev-&gt;kobj,</div><div class='add'>+					  &amp;class_dev-&gt;dev-&gt;kobj, "device");</div><div class='add'>+		if (error)</div><div class='add'>+			goto out6;</div><div class='add'>+		error = sysfs_create_link(&amp;class_dev-&gt;dev-&gt;kobj, &amp;class_dev-&gt;kobj,</div><div class='add'>+					  class_name);</div><div class='add'>+		if (error)</div><div class='add'>+			goto out7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	class_device_add_groups(class_dev);</div><div class='add'>+	error = class_device_add_groups(class_dev);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out8;</div><div class='ctx'> </div><div class='ctx'> 	kobject_uevent(&amp;class_dev-&gt;kobj, KOBJ_ADD);</div><div class='ctx'> </div><div class='hunk'>@@ -601,11 +621,28 @@ int class_device_add(struct class_device *class_dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;parent_class-&gt;sem);</div><div class='ctx'> </div><div class='del'>- register_done:</div><div class='del'>-	if (error) {</div><div class='del'>-		class_put(parent_class);</div><div class='add'>+	goto out1;</div><div class='add'>+</div><div class='add'>+ out8:</div><div class='add'>+	if (class_dev-&gt;dev)</div><div class='add'>+		sysfs_remove_link(&amp;class_dev-&gt;kobj, class_name);</div><div class='add'>+ out7:</div><div class='add'>+	if (class_dev-&gt;dev)</div><div class='add'>+		sysfs_remove_link(&amp;class_dev-&gt;kobj, "device");</div><div class='add'>+ out6:</div><div class='add'>+	class_device_remove_attrs(class_dev);</div><div class='add'>+ out5:</div><div class='add'>+	if (class_dev-&gt;devt_attr)</div><div class='add'>+		class_device_remove_file(class_dev, class_dev-&gt;devt_attr);</div><div class='add'>+ out4:</div><div class='add'>+	class_device_remove_file(class_dev, &amp;class_dev-&gt;uevent_attr);</div><div class='add'>+ out3:</div><div class='add'>+	kobject_del(&amp;class_dev-&gt;kobj);</div><div class='add'>+ out2:</div><div class='add'>+	if(parent_class_dev)</div><div class='ctx'> 		class_device_put(parent_class_dev);</div><div class='del'>-	}</div><div class='add'>+	class_put(parent_class);</div><div class='add'>+ out1:</div><div class='ctx'> 	class_device_put(class_dev);</div><div class='ctx'> 	kfree(class_name);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -695,10 +732,12 @@ void class_device_del(struct class_device *class_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (class_dev-&gt;dev) {</div><div class='del'>-		class_name = make_class_name(class_dev);</div><div class='add'>+		class_name = make_class_name(class_dev-&gt;class-&gt;name,</div><div class='add'>+					     &amp;class_dev-&gt;kobj);</div><div class='ctx'> 		sysfs_remove_link(&amp;class_dev-&gt;kobj, "device");</div><div class='ctx'> 		sysfs_remove_link(&amp;class_dev-&gt;dev-&gt;kobj, class_name);</div><div class='ctx'> 	}</div><div class='add'>+	sysfs_remove_link(&amp;class_dev-&gt;kobj, "subsystem");</div><div class='ctx'> 	class_device_remove_file(class_dev, &amp;class_dev-&gt;uevent_attr);</div><div class='ctx'> 	if (class_dev-&gt;devt_attr)</div><div class='ctx'> 		class_device_remove_file(class_dev, class_dev-&gt;devt_attr);</div><div class='hunk'>@@ -760,14 +799,16 @@ int class_device_rename(struct class_device *class_dev, char *new_name)</div><div class='ctx'> 		 new_name);</div><div class='ctx'> </div><div class='ctx'> 	if (class_dev-&gt;dev)</div><div class='del'>-		old_class_name = make_class_name(class_dev);</div><div class='add'>+		old_class_name = make_class_name(class_dev-&gt;class-&gt;name,</div><div class='add'>+						 &amp;class_dev-&gt;kobj);</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(class_dev-&gt;class_id, new_name, KOBJ_NAME_LEN);</div><div class='ctx'> </div><div class='ctx'> 	error = kobject_rename(&amp;class_dev-&gt;kobj, new_name);</div><div class='ctx'> </div><div class='ctx'> 	if (class_dev-&gt;dev) {</div><div class='del'>-		new_class_name = make_class_name(class_dev);</div><div class='add'>+		new_class_name = make_class_name(class_dev-&gt;class-&gt;name,</div><div class='add'>+						 &amp;class_dev-&gt;kobj);</div><div class='ctx'> 		sysfs_create_link(&amp;class_dev-&gt;dev-&gt;kobj, &amp;class_dev-&gt;kobj,</div><div class='ctx'> 				  new_class_name);</div><div class='ctx'> 		sysfs_remove_link(&amp;class_dev-&gt;dev-&gt;kobj, old_class_name);</div><div class='hunk'>@@ -858,8 +899,6 @@ EXPORT_SYMBOL_GPL(class_create_file);</div><div class='ctx'> EXPORT_SYMBOL_GPL(class_remove_file);</div><div class='ctx'> EXPORT_SYMBOL_GPL(class_register);</div><div class='ctx'> EXPORT_SYMBOL_GPL(class_unregister);</div><div class='del'>-EXPORT_SYMBOL_GPL(class_get);</div><div class='del'>-EXPORT_SYMBOL_GPL(class_put);</div><div class='ctx'> EXPORT_SYMBOL_GPL(class_create);</div><div class='ctx'> EXPORT_SYMBOL_GPL(class_destroy);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/core.c b/drivers/base/core.c<br/>index 6b355bd7816d..be6b5bc0677d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/core.c</a></div><div class='hunk'>@@ -8,13 +8,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -28,6 +28,22 @@ int (*platform_notify_remove)(struct device * dev) = NULL;</div><div class='ctx'>  * sysfs bindings for devices.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * dev_driver_string - Return a device's driver name, if at all possible</div><div class='add'>+ * @dev: struct device to get the name of</div><div class='add'>+ *</div><div class='add'>+ * Will return the device's driver's name if it is bound to a device.  If</div><div class='add'>+ * the device is not bound to a device, it will return the name of the bus</div><div class='add'>+ * it is attached to.  If it is not attached to a bus either, an empty</div><div class='add'>+ * string will be returned.</div><div class='add'>+ */</div><div class='add'>+const char *dev_driver_string(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;driver ? dev-&gt;driver-&gt;name :</div><div class='add'>+			(dev-&gt;bus ? dev-&gt;bus-&gt;name : "");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dev_driver_string);</div><div class='add'>+</div><div class='ctx'> #define to_dev(obj) container_of(obj, struct device, kobj)</div><div class='ctx'> #define to_dev_attr(_attr) container_of(_attr, struct device_attribute, attr)</div><div class='ctx'> </div><div class='hunk'>@@ -98,6 +114,8 @@ static int dev_uevent_filter(struct kset *kset, struct kobject *kobj)</div><div class='ctx'> 		struct device *dev = to_dev(kobj);</div><div class='ctx'> 		if (dev-&gt;bus)</div><div class='ctx'> 			return 1;</div><div class='add'>+		if (dev-&gt;class)</div><div class='add'>+			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -106,7 +124,11 @@ static const char *dev_uevent_name(struct kset *kset, struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = to_dev(kobj);</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;bus-&gt;name;</div><div class='add'>+	if (dev-&gt;bus)</div><div class='add'>+		return dev-&gt;bus-&gt;name;</div><div class='add'>+	if (dev-&gt;class)</div><div class='add'>+		return dev-&gt;class-&gt;name;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,</div><div class='hunk'>@@ -117,6 +139,16 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,</div><div class='ctx'> 	int length = 0;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='add'>+	/* add the major/minor if present */</div><div class='add'>+	if (MAJOR(dev-&gt;devt)) {</div><div class='add'>+		add_uevent_var(envp, num_envp, &amp;i,</div><div class='add'>+			       buffer, buffer_size, &amp;length,</div><div class='add'>+			       "MAJOR=%u", MAJOR(dev-&gt;devt));</div><div class='add'>+		add_uevent_var(envp, num_envp, &amp;i,</div><div class='add'>+			       buffer, buffer_size, &amp;length,</div><div class='add'>+			       "MINOR=%u", MINOR(dev-&gt;devt));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* add bus name of physical device */</div><div class='ctx'> 	if (dev-&gt;bus)</div><div class='ctx'> 		add_uevent_var(envp, num_envp, &amp;i,</div><div class='hunk'>@@ -161,6 +193,12 @@ static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t show_dev(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	return print_dev_t(buf, dev-&gt;devt);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	devices_subsys - structure to be registered with kobject core.</div><div class='ctx'>  */</div><div class='hunk'>@@ -231,6 +269,7 @@ void device_initialize(struct device *dev)</div><div class='ctx'> 	klist_init(&amp;dev-&gt;klist_children, klist_children_get,</div><div class='ctx'> 		   klist_children_put);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;dma_pools);</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;node);</div><div class='ctx'> 	init_MUTEX(&amp;dev-&gt;sem);</div><div class='ctx'> 	device_init_wakeup(dev, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -249,6 +288,7 @@ void device_initialize(struct device *dev)</div><div class='ctx'> int device_add(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *parent = NULL;</div><div class='add'>+	char *class_name = NULL;</div><div class='ctx'> 	int error = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dev = get_device(dev);</div><div class='hunk'>@@ -274,23 +314,69 @@ int device_add(struct device *dev)</div><div class='ctx'> 	dev-&gt;uevent_attr.store = store_uevent;</div><div class='ctx'> 	device_create_file(dev, &amp;dev-&gt;uevent_attr);</div><div class='ctx'> </div><div class='del'>-	kobject_uevent(&amp;dev-&gt;kobj, KOBJ_ADD);</div><div class='add'>+	if (MAJOR(dev-&gt;devt)) {</div><div class='add'>+		struct device_attribute *attr;</div><div class='add'>+		attr = kzalloc(sizeof(*attr), GFP_KERNEL);</div><div class='add'>+		if (!attr) {</div><div class='add'>+			error = -ENOMEM;</div><div class='add'>+			goto PMError;</div><div class='add'>+		}</div><div class='add'>+		attr-&gt;attr.name = "dev";</div><div class='add'>+		attr-&gt;attr.mode = S_IRUGO;</div><div class='add'>+		if (dev-&gt;driver)</div><div class='add'>+			attr-&gt;attr.owner = dev-&gt;driver-&gt;owner;</div><div class='add'>+		attr-&gt;show = show_dev;</div><div class='add'>+		error = device_create_file(dev, attr);</div><div class='add'>+		if (error) {</div><div class='add'>+			kfree(attr);</div><div class='add'>+			goto attrError;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;devt_attr = attr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;class) {</div><div class='add'>+		sysfs_create_link(&amp;dev-&gt;kobj, &amp;dev-&gt;class-&gt;subsys.kset.kobj,</div><div class='add'>+				  "subsystem");</div><div class='add'>+		sysfs_create_link(&amp;dev-&gt;class-&gt;subsys.kset.kobj, &amp;dev-&gt;kobj,</div><div class='add'>+				  dev-&gt;bus_id);</div><div class='add'>+</div><div class='add'>+		sysfs_create_link(&amp;dev-&gt;kobj, &amp;dev-&gt;parent-&gt;kobj, "device");</div><div class='add'>+		class_name = make_class_name(dev-&gt;class-&gt;name, &amp;dev-&gt;kobj);</div><div class='add'>+		sysfs_create_link(&amp;dev-&gt;parent-&gt;kobj, &amp;dev-&gt;kobj, class_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((error = device_pm_add(dev)))</div><div class='ctx'> 		goto PMError;</div><div class='ctx'> 	if ((error = bus_add_device(dev)))</div><div class='ctx'> 		goto BusError;</div><div class='add'>+	kobject_uevent(&amp;dev-&gt;kobj, KOBJ_ADD);</div><div class='add'>+	bus_attach_device(dev);</div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		klist_add_tail(&amp;dev-&gt;knode_parent, &amp;parent-&gt;klist_children);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;class) {</div><div class='add'>+		/* tie the class to the device */</div><div class='add'>+		down(&amp;dev-&gt;class-&gt;sem);</div><div class='add'>+		list_add_tail(&amp;dev-&gt;node, &amp;dev-&gt;class-&gt;devices);</div><div class='add'>+		up(&amp;dev-&gt;class-&gt;sem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* notify platform of device entry */</div><div class='ctx'> 	if (platform_notify)</div><div class='ctx'> 		platform_notify(dev);</div><div class='ctx'>  Done:</div><div class='add'>+ 	kfree(class_name);</div><div class='ctx'> 	put_device(dev);</div><div class='ctx'> 	return error;</div><div class='ctx'>  BusError:</div><div class='ctx'> 	device_pm_remove(dev);</div><div class='ctx'>  PMError:</div><div class='add'>+	if (dev-&gt;devt_attr) {</div><div class='add'>+		device_remove_file(dev, dev-&gt;devt_attr);</div><div class='add'>+		kfree(dev-&gt;devt_attr);</div><div class='add'>+	}</div><div class='add'>+ attrError:</div><div class='ctx'> 	kobject_uevent(&amp;dev-&gt;kobj, KOBJ_REMOVE);</div><div class='ctx'> 	kobject_del(&amp;dev-&gt;kobj);</div><div class='ctx'>  Error:</div><div class='hunk'>@@ -362,9 +448,23 @@ void put_device(struct device * dev)</div><div class='ctx'> void device_del(struct device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device * parent = dev-&gt;parent;</div><div class='add'>+	char *class_name = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (parent)</div><div class='ctx'> 		klist_del(&amp;dev-&gt;knode_parent);</div><div class='add'>+	if (dev-&gt;devt_attr)</div><div class='add'>+		device_remove_file(dev, dev-&gt;devt_attr);</div><div class='add'>+	if (dev-&gt;class) {</div><div class='add'>+		sysfs_remove_link(&amp;dev-&gt;kobj, "subsystem");</div><div class='add'>+		sysfs_remove_link(&amp;dev-&gt;class-&gt;subsys.kset.kobj, dev-&gt;bus_id);</div><div class='add'>+		class_name = make_class_name(dev-&gt;class-&gt;name, &amp;dev-&gt;kobj);</div><div class='add'>+		sysfs_remove_link(&amp;dev-&gt;kobj, "device");</div><div class='add'>+		sysfs_remove_link(&amp;dev-&gt;parent-&gt;kobj, class_name);</div><div class='add'>+		kfree(class_name);</div><div class='add'>+		down(&amp;dev-&gt;class-&gt;sem);</div><div class='add'>+		list_del_init(&amp;dev-&gt;node);</div><div class='add'>+		up(&amp;dev-&gt;class-&gt;sem);</div><div class='add'>+	}</div><div class='ctx'> 	device_remove_file(dev, &amp;dev-&gt;uevent_attr);</div><div class='ctx'> </div><div class='ctx'> 	/* Notify the platform of the removal, in case they</div><div class='hunk'>@@ -449,3 +549,98 @@ EXPORT_SYMBOL_GPL(put_device);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(device_create_file);</div><div class='ctx'> EXPORT_SYMBOL_GPL(device_remove_file);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void device_create_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	pr_debug("%s called for %s\n", __FUNCTION__, dev-&gt;bus_id);</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_create - creates a device and registers it with sysfs</div><div class='add'>+ * @class: pointer to the struct class that this device should be registered to</div><div class='add'>+ * @parent: pointer to the parent struct device of this new device, if any</div><div class='add'>+ * @devt: the dev_t for the char device to be added</div><div class='add'>+ * @fmt: string for the device's name</div><div class='add'>+ *</div><div class='add'>+ * This function can be used by char device classes.  A struct device</div><div class='add'>+ * will be created in sysfs, registered to the specified class.</div><div class='add'>+ *</div><div class='add'>+ * A "dev" file will be created, showing the dev_t for the device, if</div><div class='add'>+ * the dev_t is not 0,0.</div><div class='add'>+ * If a pointer to a parent struct device is passed in, the newly created</div><div class='add'>+ * struct device will be a child of that device in sysfs.</div><div class='add'>+ * The pointer to the struct device will be returned from the call.</div><div class='add'>+ * Any further sysfs files that might be required can be created using this</div><div class='add'>+ * pointer.</div><div class='add'>+ *</div><div class='add'>+ * Note: the struct class passed to this function must have previously</div><div class='add'>+ * been created with a call to class_create().</div><div class='add'>+ */</div><div class='add'>+struct device *device_create(struct class *class, struct device *parent,</div><div class='add'>+			     dev_t devt, char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+	struct device *dev = NULL;</div><div class='add'>+	int retval = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (class == NULL || IS_ERR(class))</div><div class='add'>+		goto error;</div><div class='add'>+	if (parent == NULL) {</div><div class='add'>+		printk(KERN_WARNING "%s does not work yet for NULL parents\n", __FUNCTION__);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;devt = devt;</div><div class='add'>+	dev-&gt;class = class;</div><div class='add'>+	dev-&gt;parent = parent;</div><div class='add'>+	dev-&gt;release = device_create_release;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	vsnprintf(dev-&gt;bus_id, BUS_ID_SIZE, fmt, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+	retval = device_register(dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return ERR_PTR(retval);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * device_destroy - removes a device that was created with device_create()</div><div class='add'>+ * @class: pointer to the struct class that this device was registered with</div><div class='add'>+ * @devt: the dev_t of the device that was previously registered</div><div class='add'>+ *</div><div class='add'>+ * This call unregisters and cleans up a device that was created with a</div><div class='add'>+ * call to device_create().</div><div class='add'>+ */</div><div class='add'>+void device_destroy(struct class *class, dev_t devt)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = NULL;</div><div class='add'>+	struct device *dev_tmp;</div><div class='add'>+</div><div class='add'>+	down(&amp;class-&gt;sem);</div><div class='add'>+	list_for_each_entry(dev_tmp, &amp;class-&gt;devices, node) {</div><div class='add'>+		if (dev_tmp-&gt;devt == devt) {</div><div class='add'>+			dev = dev_tmp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	up(&amp;class-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		device_unregister(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(device_destroy);</div><div class='head'>diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c<br/>index dd712b24ec91..4bef76a2f3f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/cpu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/cpu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/cpu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/cpu.c</a></div><div class='hunk'>@@ -8,6 +8,7 @@</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/node.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "base.h"</div><div class='ctx'> </div><div class='hunk'>@@ -57,13 +58,12 @@ static void __devinit register_cpu_control(struct cpu *cpu)</div><div class='ctx'> {</div><div class='ctx'> 	sysdev_create_file(&amp;cpu-&gt;sysdev, &amp;attr_online);</div><div class='ctx'> }</div><div class='del'>-void unregister_cpu(struct cpu *cpu, struct node *root)</div><div class='add'>+void unregister_cpu(struct cpu *cpu)</div><div class='ctx'> {</div><div class='ctx'> 	int logical_cpu = cpu-&gt;sysdev.id;</div><div class='ctx'> </div><div class='del'>-	if (root)</div><div class='del'>-		sysfs_remove_link(&amp;root-&gt;sysdev.kobj,</div><div class='del'>-				  kobject_name(&amp;cpu-&gt;sysdev.kobj));</div><div class='add'>+	unregister_cpu_under_node(logical_cpu, cpu_to_node(logical_cpu));</div><div class='add'>+</div><div class='ctx'> 	sysdev_remove_file(&amp;cpu-&gt;sysdev, &amp;attr_online);</div><div class='ctx'> </div><div class='ctx'> 	sysdev_unregister(&amp;cpu-&gt;sysdev);</div><div class='hunk'>@@ -109,23 +109,21 @@ static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);</div><div class='ctx'>  *</div><div class='ctx'>  * Initialize and register the CPU device.</div><div class='ctx'>  */</div><div class='del'>-int __devinit register_cpu(struct cpu *cpu, int num, struct node *root)</div><div class='add'>+int __devinit register_cpu(struct cpu *cpu, int num)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='del'>-</div><div class='ctx'> 	cpu-&gt;node_id = cpu_to_node(num);</div><div class='ctx'> 	cpu-&gt;sysdev.id = num;</div><div class='ctx'> 	cpu-&gt;sysdev.cls = &amp;cpu_sysdev_class;</div><div class='ctx'> </div><div class='ctx'> 	error = sysdev_register(&amp;cpu-&gt;sysdev);</div><div class='del'>-	if (!error &amp;&amp; root)</div><div class='del'>-		error = sysfs_create_link(&amp;root-&gt;sysdev.kobj,</div><div class='del'>-					  &amp;cpu-&gt;sysdev.kobj,</div><div class='del'>-					  kobject_name(&amp;cpu-&gt;sysdev.kobj));</div><div class='add'>+</div><div class='ctx'> 	if (!error &amp;&amp; !cpu-&gt;no_control)</div><div class='ctx'> 		register_cpu_control(cpu);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		cpu_sys_devices[num] = &amp;cpu-&gt;sysdev;</div><div class='add'>+	if (!error)</div><div class='add'>+		register_cpu_under_node(num, cpu_to_node(num));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KEXEC</div><div class='ctx'> 	if (!error)</div><div class='hunk'>@@ -145,5 +143,13 @@ EXPORT_SYMBOL_GPL(get_cpu_sysdev);</div><div class='ctx'> </div><div class='ctx'> int __init cpu_dev_init(void)</div><div class='ctx'> {</div><div class='del'>-	return sysdev_class_register(&amp;cpu_sysdev_class);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = sysdev_class_register(&amp;cpu_sysdev_class);</div><div class='add'>+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)</div><div class='add'>+	if (!err)</div><div class='add'>+		err = sched_create_sysfs_power_savings_entries(&amp;cpu_sysdev_class);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c<br/>index e2f64f91ed05..33c5cce1560b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/dmapool.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/dmapool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/dmapool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/dmapool.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/dmapool.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Pool allocator ... wraps the dma_alloc_coherent page allocator, so</div><div class='hunk'>@@ -35,8 +36,6 @@ struct dma_page {	/* cacheable header for 'allocation' bytes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	POOL_TIMEOUT_JIFFIES	((100 /* msec */ * HZ) / 1000)</div><div class='del'>-#define	POOL_POISON_FREED	0xa7	/* !inuse */</div><div class='del'>-#define	POOL_POISON_ALLOCATED	0xa9	/* !initted */</div><div class='ctx'> </div><div class='ctx'> static DECLARE_MUTEX (pools_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/driver.c b/drivers/base/driver.c<br/>index b400314e1c62..562600dd540a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/driver.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c<br/>index 0c99ae6a3407..5d6c011183f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/firmware_class.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/firmware_class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/firmware_class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/firmware_class.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include "base.h"</div><div class='hunk'>@@ -36,7 +36,7 @@ static int loading_timeout = 10;	/* In seconds */</div><div class='ctx'> </div><div class='ctx'> /* fw_lock could be moved to 'struct firmware_priv' but since it is just</div><div class='ctx'>  * guarding for corner cases a global lock should be OK */</div><div class='del'>-static DECLARE_MUTEX(fw_lock);</div><div class='add'>+static DEFINE_MUTEX(fw_lock);</div><div class='ctx'> </div><div class='ctx'> struct firmware_priv {</div><div class='ctx'> 	char fw_id[FIRMWARE_NAME_MAX];</div><div class='hunk'>@@ -142,9 +142,9 @@ firmware_loading_store(struct class_device *class_dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (loading) {</div><div class='ctx'> 	case 1:</div><div class='del'>-		down(&amp;fw_lock);</div><div class='add'>+		mutex_lock(&amp;fw_lock);</div><div class='ctx'> 		if (!fw_priv-&gt;fw) {</div><div class='del'>-			up(&amp;fw_lock);</div><div class='add'>+			mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		vfree(fw_priv-&gt;fw-&gt;data);</div><div class='hunk'>@@ -152,7 +152,7 @@ firmware_loading_store(struct class_device *class_dev,</div><div class='ctx'> 		fw_priv-&gt;fw-&gt;size = 0;</div><div class='ctx'> 		fw_priv-&gt;alloc_size = 0;</div><div class='ctx'> 		set_bit(FW_STATUS_LOADING, &amp;fw_priv-&gt;status);</div><div class='del'>-		up(&amp;fw_lock);</div><div class='add'>+		mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		if (test_bit(FW_STATUS_LOADING, &amp;fw_priv-&gt;status)) {</div><div class='hunk'>@@ -185,7 +185,7 @@ firmware_data_read(struct kobject *kobj,</div><div class='ctx'> 	struct firmware *fw;</div><div class='ctx'> 	ssize_t ret_count = count;</div><div class='ctx'> </div><div class='del'>-	down(&amp;fw_lock);</div><div class='add'>+	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	fw = fw_priv-&gt;fw;</div><div class='ctx'> 	if (!fw || test_bit(FW_STATUS_DONE, &amp;fw_priv-&gt;status)) {</div><div class='ctx'> 		ret_count = -ENODEV;</div><div class='hunk'>@@ -200,7 +200,7 @@ firmware_data_read(struct kobject *kobj,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(buffer, fw-&gt;data + offset, ret_count);</div><div class='ctx'> out:</div><div class='del'>-	up(&amp;fw_lock);</div><div class='add'>+	mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 	return ret_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -253,7 +253,7 @@ firmware_data_write(struct kobject *kobj,</div><div class='ctx'> 	if (!capable(CAP_SYS_RAWIO))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	down(&amp;fw_lock);</div><div class='add'>+	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	fw = fw_priv-&gt;fw;</div><div class='ctx'> 	if (!fw || test_bit(FW_STATUS_DONE, &amp;fw_priv-&gt;status)) {</div><div class='ctx'> 		retval = -ENODEV;</div><div class='hunk'>@@ -268,7 +268,7 @@ firmware_data_write(struct kobject *kobj,</div><div class='ctx'> 	fw-&gt;size = max_t(size_t, offset + count, fw-&gt;size);</div><div class='ctx'> 	retval = count;</div><div class='ctx'> out:</div><div class='del'>-	up(&amp;fw_lock);</div><div class='add'>+	mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -436,14 +436,14 @@ _request_firmware(const struct firmware **firmware_p, const char *name,</div><div class='ctx'> 	} else</div><div class='ctx'> 		wait_for_completion(&amp;fw_priv-&gt;completion);</div><div class='ctx'> </div><div class='del'>-	down(&amp;fw_lock);</div><div class='add'>+	mutex_lock(&amp;fw_lock);</div><div class='ctx'> 	if (!fw_priv-&gt;fw-&gt;size || test_bit(FW_STATUS_ABORT, &amp;fw_priv-&gt;status)) {</div><div class='ctx'> 		retval = -ENOENT;</div><div class='ctx'> 		release_firmware(fw_priv-&gt;fw);</div><div class='ctx'> 		*firmware_p = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	fw_priv-&gt;fw = NULL;</div><div class='del'>-	up(&amp;fw_lock);</div><div class='add'>+	mutex_unlock(&amp;fw_lock);</div><div class='ctx'> 	class_device_unregister(class_dev);</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c<br/>new file mode 100644<br/>index 000000000000..0c85e9d6a448<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/hypervisor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/hypervisor.c</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/*</div><div class='add'>+ * hypervisor.c - /sys/hypervisor subsystem.</div><div class='add'>+ *</div><div class='add'>+ * This file is released under the GPLv2</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kobject.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "base.h"</div><div class='add'>+</div><div class='add'>+decl_subsys(hypervisor, NULL, NULL);</div><div class='add'>+EXPORT_SYMBOL_GPL(hypervisor_subsys);</div><div class='add'>+</div><div class='add'>+int __init hypervisor_init(void)</div><div class='add'>+{</div><div class='add'>+	return subsystem_register(&amp;hypervisor_subsys);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/base/init.c b/drivers/base/init.c<br/>index c648914b9cde..37138154f9e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/init.c</a></div><div class='hunk'>@@ -27,6 +27,7 @@ void __init driver_init(void)</div><div class='ctx'> 	buses_init();</div><div class='ctx'> 	classes_init();</div><div class='ctx'> 	firmware_init();</div><div class='add'>+	hypervisor_init();</div><div class='ctx'> </div><div class='ctx'> 	/* These are also core pieces, but must come after the</div><div class='ctx'> 	 * core core pieces.</div><div class='head'>diff --git a/drivers/base/isa.c b/drivers/base/isa.c<br/>new file mode 100644<br/>index 000000000000..d2222397a401<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/isa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/isa.c</a></div><div class='hunk'>@@ -0,0 +1,180 @@</div><div class='add'>+/*</div><div class='add'>+ * ISA bus.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/isa.h&gt;</div><div class='add'>+</div><div class='add'>+static struct device isa_bus = {</div><div class='add'>+	.bus_id		= "isa"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct isa_dev {</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct device *next;</div><div class='add'>+	unsigned int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_isa_dev(x) container_of((x), struct isa_dev, dev)</div><div class='add'>+</div><div class='add'>+static int isa_bus_match(struct device *dev, struct device_driver *driver)</div><div class='add'>+{</div><div class='add'>+	struct isa_driver *isa_driver = to_isa_driver(driver);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;platform_data == isa_driver) {</div><div class='add'>+		if (!isa_driver-&gt;match ||</div><div class='add'>+			isa_driver-&gt;match(dev, to_isa_dev(dev)-&gt;id))</div><div class='add'>+			return 1;</div><div class='add'>+		dev-&gt;platform_data = NULL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isa_bus_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct isa_driver *isa_driver = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (isa_driver-&gt;probe)</div><div class='add'>+		return isa_driver-&gt;probe(dev, to_isa_dev(dev)-&gt;id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isa_bus_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct isa_driver *isa_driver = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (isa_driver-&gt;remove)</div><div class='add'>+		return isa_driver-&gt;remove(dev, to_isa_dev(dev)-&gt;id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isa_bus_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct isa_driver *isa_driver = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (isa_driver-&gt;shutdown)</div><div class='add'>+		isa_driver-&gt;shutdown(dev, to_isa_dev(dev)-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isa_bus_suspend(struct device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct isa_driver *isa_driver = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (isa_driver-&gt;suspend)</div><div class='add'>+		return isa_driver-&gt;suspend(dev, to_isa_dev(dev)-&gt;id, state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isa_bus_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct isa_driver *isa_driver = dev-&gt;platform_data;</div><div class='add'>+</div><div class='add'>+	if (isa_driver-&gt;resume)</div><div class='add'>+		return isa_driver-&gt;resume(dev, to_isa_dev(dev)-&gt;id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bus_type isa_bus_type = {</div><div class='add'>+	.name		= "isa",</div><div class='add'>+	.match		= isa_bus_match,</div><div class='add'>+	.probe		= isa_bus_probe,</div><div class='add'>+	.remove		= isa_bus_remove,</div><div class='add'>+	.shutdown	= isa_bus_shutdown,</div><div class='add'>+	.suspend	= isa_bus_suspend,</div><div class='add'>+	.resume		= isa_bus_resume</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void isa_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(to_isa_dev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void isa_unregister_driver(struct isa_driver *isa_driver)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = isa_driver-&gt;devices;</div><div class='add'>+</div><div class='add'>+	while (dev) {</div><div class='add'>+		struct device *tmp = to_isa_dev(dev)-&gt;next;</div><div class='add'>+		device_unregister(dev);</div><div class='add'>+		dev = tmp;</div><div class='add'>+	}</div><div class='add'>+	driver_unregister(&amp;isa_driver-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(isa_unregister_driver);</div><div class='add'>+</div><div class='add'>+int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+	unsigned int id;</div><div class='add'>+</div><div class='add'>+	isa_driver-&gt;driver.bus	= &amp;isa_bus_type;</div><div class='add'>+	isa_driver-&gt;devices	= NULL;</div><div class='add'>+</div><div class='add'>+	error = driver_register(&amp;isa_driver-&gt;driver);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; ndev; id++) {</div><div class='add'>+		struct isa_dev *isa_dev;</div><div class='add'>+</div><div class='add'>+		isa_dev = kzalloc(sizeof *isa_dev, GFP_KERNEL);</div><div class='add'>+		if (!isa_dev) {</div><div class='add'>+			error = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		isa_dev-&gt;dev.parent	= &amp;isa_bus;</div><div class='add'>+		isa_dev-&gt;dev.bus	= &amp;isa_bus_type;</div><div class='add'>+</div><div class='add'>+		snprintf(isa_dev-&gt;dev.bus_id, BUS_ID_SIZE, "%s.%u",</div><div class='add'>+				isa_driver-&gt;driver.name, id);</div><div class='add'>+</div><div class='add'>+		isa_dev-&gt;dev.platform_data	= isa_driver;</div><div class='add'>+		isa_dev-&gt;dev.release		= isa_dev_release;</div><div class='add'>+		isa_dev-&gt;id			= id;</div><div class='add'>+</div><div class='add'>+		error = device_register(&amp;isa_dev-&gt;dev);</div><div class='add'>+		if (error) {</div><div class='add'>+			put_device(&amp;isa_dev-&gt;dev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (isa_dev-&gt;dev.platform_data) {</div><div class='add'>+			isa_dev-&gt;next = isa_driver-&gt;devices;</div><div class='add'>+			isa_driver-&gt;devices = &amp;isa_dev-&gt;dev;</div><div class='add'>+		} else</div><div class='add'>+			device_unregister(&amp;isa_dev-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!error &amp;&amp; !isa_driver-&gt;devices)</div><div class='add'>+		error = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		isa_unregister_driver(isa_driver);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(isa_register_driver);</div><div class='add'>+</div><div class='add'>+static int __init isa_bus_init(void)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = bus_register(&amp;isa_bus_type);</div><div class='add'>+	if (!error) {</div><div class='add'>+		error = device_register(&amp;isa_bus);</div><div class='add'>+		if (error)</div><div class='add'>+			bus_unregister(&amp;isa_bus_type);</div><div class='add'>+	}</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+device_initcall(isa_bus_init);</div><div class='head'>diff --git a/drivers/base/memory.c b/drivers/base/memory.c<br/>index dd547af4681a..c6b7d9c4b651 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/memory.c</a></div><div class='hunk'>@@ -306,11 +306,13 @@ static ssize_t</div><div class='ctx'> memory_probe_store(struct class *class, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	u64 phys_addr;</div><div class='add'>+	int nid;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	phys_addr = simple_strtoull(buf, NULL, 0);</div><div class='ctx'> </div><div class='del'>-	ret = add_memory(phys_addr, PAGES_PER_SECTION &lt;&lt; PAGE_SHIFT);</div><div class='add'>+	nid = memory_add_physaddr_to_nid(phys_addr);</div><div class='add'>+	ret = add_memory(nid, phys_addr, PAGES_PER_SECTION &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		count = ret;</div><div class='head'>diff --git a/drivers/base/node.c b/drivers/base/node.c<br/>index c80c3aeed004..d7de1753e094 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/node.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/node.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/node.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/node.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/topology.h&gt;</div><div class='ctx'> #include &lt;linux/nodemask.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct sysdev_class node_class = {</div><div class='ctx'> 	set_kset_name("node"),</div><div class='hunk'>@@ -39,24 +40,13 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)</div><div class='ctx'> 	int n;</div><div class='ctx'> 	int nid = dev-&gt;id;</div><div class='ctx'> 	struct sysinfo i;</div><div class='del'>-	struct page_state ps;</div><div class='ctx'> 	unsigned long inactive;</div><div class='ctx'> 	unsigned long active;</div><div class='ctx'> 	unsigned long free;</div><div class='ctx'> </div><div class='ctx'> 	si_meminfo_node(&amp;i, nid);</div><div class='del'>-	get_page_state_node(&amp;ps, nid);</div><div class='ctx'> 	__get_zone_counts(&amp;active, &amp;inactive, &amp;free, NODE_DATA(nid));</div><div class='ctx'> </div><div class='del'>-	/* Check for negative values in these approximate counters */</div><div class='del'>-	if ((long)ps.nr_dirty &lt; 0)</div><div class='del'>-		ps.nr_dirty = 0;</div><div class='del'>-	if ((long)ps.nr_writeback &lt; 0)</div><div class='del'>-		ps.nr_writeback = 0;</div><div class='del'>-	if ((long)ps.nr_mapped &lt; 0)</div><div class='del'>-		ps.nr_mapped = 0;</div><div class='del'>-	if ((long)ps.nr_slab &lt; 0)</div><div class='del'>-		ps.nr_slab = 0;</div><div class='ctx'> </div><div class='ctx'> 	n = sprintf(buf, "\n"</div><div class='ctx'> 		       "Node %d MemTotal:     %8lu kB\n"</div><div class='hunk'>@@ -70,7 +60,12 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)</div><div class='ctx'> 		       "Node %d LowFree:      %8lu kB\n"</div><div class='ctx'> 		       "Node %d Dirty:        %8lu kB\n"</div><div class='ctx'> 		       "Node %d Writeback:    %8lu kB\n"</div><div class='add'>+		       "Node %d FilePages:    %8lu kB\n"</div><div class='ctx'> 		       "Node %d Mapped:       %8lu kB\n"</div><div class='add'>+		       "Node %d AnonPages:    %8lu kB\n"</div><div class='add'>+		       "Node %d PageTables:   %8lu kB\n"</div><div class='add'>+		       "Node %d NFS Unstable: %8lu kB\n"</div><div class='add'>+		       "Node %d Bounce:       %8lu kB\n"</div><div class='ctx'> 		       "Node %d Slab:         %8lu kB\n",</div><div class='ctx'> 		       nid, K(i.totalram),</div><div class='ctx'> 		       nid, K(i.freeram),</div><div class='hunk'>@@ -81,10 +76,15 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)</div><div class='ctx'> 		       nid, K(i.freehigh),</div><div class='ctx'> 		       nid, K(i.totalram - i.totalhigh),</div><div class='ctx'> 		       nid, K(i.freeram - i.freehigh),</div><div class='del'>-		       nid, K(ps.nr_dirty),</div><div class='del'>-		       nid, K(ps.nr_writeback),</div><div class='del'>-		       nid, K(ps.nr_mapped),</div><div class='del'>-		       nid, K(ps.nr_slab));</div><div class='add'>+		       nid, K(node_page_state(nid, NR_FILE_DIRTY)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_WRITEBACK)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_FILE_PAGES)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_ANON_PAGES)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_PAGETABLE)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_BOUNCE)),</div><div class='add'>+		       nid, K(node_page_state(nid, NR_SLAB)));</div><div class='ctx'> 	n += hugetlb_report_node_meminfo(nid, buf + n);</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='hunk'>@@ -94,28 +94,6 @@ static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t node_read_numastat(struct sys_device * dev, char * buf)</div><div class='ctx'> {</div><div class='del'>-	unsigned long numa_hit, numa_miss, interleave_hit, numa_foreign;</div><div class='del'>-	unsigned long local_node, other_node;</div><div class='del'>-	int i, cpu;</div><div class='del'>-	pg_data_t *pg = NODE_DATA(dev-&gt;id);</div><div class='del'>-	numa_hit = 0;</div><div class='del'>-	numa_miss = 0;</div><div class='del'>-	interleave_hit = 0;</div><div class='del'>-	numa_foreign = 0;</div><div class='del'>-	local_node = 0;</div><div class='del'>-	other_node = 0;</div><div class='del'>-	for (i = 0; i &lt; MAX_NR_ZONES; i++) {</div><div class='del'>-		struct zone *z = &amp;pg-&gt;node_zones[i];</div><div class='del'>-		for_each_online_cpu(cpu) {</div><div class='del'>-			struct per_cpu_pageset *ps = zone_pcp(z,cpu);</div><div class='del'>-			numa_hit += ps-&gt;numa_hit;</div><div class='del'>-			numa_miss += ps-&gt;numa_miss;</div><div class='del'>-			numa_foreign += ps-&gt;numa_foreign;</div><div class='del'>-			interleave_hit += ps-&gt;interleave_hit;</div><div class='del'>-			local_node += ps-&gt;local_node;</div><div class='del'>-			other_node += ps-&gt;other_node;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	return sprintf(buf,</div><div class='ctx'> 		       "numa_hit %lu\n"</div><div class='ctx'> 		       "numa_miss %lu\n"</div><div class='hunk'>@@ -123,12 +101,12 @@ static ssize_t node_read_numastat(struct sys_device * dev, char * buf)</div><div class='ctx'> 		       "interleave_hit %lu\n"</div><div class='ctx'> 		       "local_node %lu\n"</div><div class='ctx'> 		       "other_node %lu\n",</div><div class='del'>-		       numa_hit,</div><div class='del'>-		       numa_miss,</div><div class='del'>-		       numa_foreign,</div><div class='del'>-		       interleave_hit,</div><div class='del'>-		       local_node,</div><div class='del'>-		       other_node);</div><div class='add'>+		       node_page_state(dev-&gt;id, NUMA_HIT),</div><div class='add'>+		       node_page_state(dev-&gt;id, NUMA_MISS),</div><div class='add'>+		       node_page_state(dev-&gt;id, NUMA_FOREIGN),</div><div class='add'>+		       node_page_state(dev-&gt;id, NUMA_INTERLEAVE_HIT),</div><div class='add'>+		       node_page_state(dev-&gt;id, NUMA_LOCAL),</div><div class='add'>+		       node_page_state(dev-&gt;id, NUMA_OTHER));</div><div class='ctx'> }</div><div class='ctx'> static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -190,6 +168,66 @@ void unregister_node(struct node *node)</div><div class='ctx'> 	sysdev_unregister(&amp;node-&gt;sysdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct node node_devices[MAX_NUMNODES];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * register cpu under node</div><div class='add'>+ */</div><div class='add'>+int register_cpu_under_node(unsigned int cpu, unsigned int nid)</div><div class='add'>+{</div><div class='add'>+	if (node_online(nid)) {</div><div class='add'>+		struct sys_device *obj = get_cpu_sysdev(cpu);</div><div class='add'>+		if (!obj)</div><div class='add'>+			return 0;</div><div class='add'>+		return sysfs_create_link(&amp;node_devices[nid].sysdev.kobj,</div><div class='add'>+					 &amp;obj-&gt;kobj,</div><div class='add'>+					 kobject_name(&amp;obj-&gt;kobj));</div><div class='add'>+	 }</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)</div><div class='add'>+{</div><div class='add'>+	if (node_online(nid)) {</div><div class='add'>+		struct sys_device *obj = get_cpu_sysdev(cpu);</div><div class='add'>+		if (obj)</div><div class='add'>+			sysfs_remove_link(&amp;node_devices[nid].sysdev.kobj,</div><div class='add'>+					 kobject_name(&amp;obj-&gt;kobj));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int register_one_node(int nid)</div><div class='add'>+{</div><div class='add'>+	int error = 0;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	if (node_online(nid)) {</div><div class='add'>+		int p_node = parent_node(nid);</div><div class='add'>+		struct node *parent = NULL;</div><div class='add'>+</div><div class='add'>+		if (p_node != nid)</div><div class='add'>+			parent = &amp;node_devices[p_node];</div><div class='add'>+</div><div class='add'>+		error = register_node(&amp;node_devices[nid], nid, parent);</div><div class='add'>+</div><div class='add'>+		/* link cpu under this node */</div><div class='add'>+		for_each_present_cpu(cpu) {</div><div class='add'>+			if (cpu_to_node(cpu) == nid)</div><div class='add'>+				register_cpu_under_node(cpu, nid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void unregister_one_node(int nid)</div><div class='add'>+{</div><div class='add'>+	unregister_node(&amp;node_devices[nid]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init register_node_type(void)</div><div class='ctx'> {</div><div class='ctx'> 	return sysdev_class_register(&amp;node_class);</div><div class='head'>diff --git a/drivers/base/platform.c b/drivers/base/platform.c<br/>index 83f5c5984d1a..2b8755db76c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/platform.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/platform.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/platform.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/platform.c</a></div><div class='hunk'>@@ -275,7 +275,7 @@ int platform_device_add(struct platform_device *pdev)</div><div class='ctx'> 	pr_debug("Registering platform device '%s'. Parent at %s\n",</div><div class='ctx'> 		 pdev-&gt;dev.bus_id, pdev-&gt;dev.parent-&gt;bus_id);</div><div class='ctx'> </div><div class='del'>-	ret = device_register(&amp;pdev-&gt;dev);</div><div class='add'>+	ret = device_add(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -452,6 +452,37 @@ void platform_driver_unregister(struct platform_driver *drv)</div><div class='ctx'> EXPORT_SYMBOL_GPL(platform_driver_unregister);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* modalias support enables more hands-off userspace setup:</div><div class='add'>+ * (a) environment variable lets new-style hotplug events work once system is</div><div class='add'>+ *     fully running:  "modprobe $MODALIAS"</div><div class='add'>+ * (b) sysfs attribute lets new-style coldplug recover from hotplug events</div><div class='add'>+ *     mishandled before system is fully running:  "modprobe $(cat modalias)"</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+modalias_show(struct device *dev, struct device_attribute *a, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct platform_device	*pdev = to_platform_device(dev);</div><div class='add'>+	int len = snprintf(buf, PAGE_SIZE, "%s\n", pdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return (len &gt;= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_attribute platform_dev_attrs[] = {</div><div class='add'>+	__ATTR_RO(modalias),</div><div class='add'>+	__ATTR_NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int platform_uevent(struct device *dev, char **envp, int num_envp,</div><div class='add'>+		char *buffer, int buffer_size)</div><div class='add'>+{</div><div class='add'>+	struct platform_device	*pdev = to_platform_device(dev);</div><div class='add'>+</div><div class='add'>+	envp[0] = buffer;</div><div class='add'>+	snprintf(buffer, buffer_size, "MODALIAS=%s", pdev-&gt;name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	platform_match - bind platform device to platform driver.</div><div class='ctx'>  *	@dev:	device.</div><div class='hunk'>@@ -496,7 +527,9 @@ static int platform_resume(struct device * dev)</div><div class='ctx'> </div><div class='ctx'> struct bus_type platform_bus_type = {</div><div class='ctx'> 	.name		= "platform",</div><div class='add'>+	.dev_attrs	= platform_dev_attrs,</div><div class='ctx'> 	.match		= platform_match,</div><div class='add'>+	.uevent		= platform_uevent,</div><div class='ctx'> 	.suspend	= platform_suspend,</div><div class='ctx'> 	.resume		= platform_resume,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile<br/>index c0219ad94aca..91f230939c1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/power/Makefile</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> obj-y			:= shutdown.o</div><div class='ctx'> obj-$(CONFIG_PM)	+= main.o suspend.o resume.o runtime.o sysfs.o</div><div class='add'>+obj-$(CONFIG_PM_TRACE)	+= trace.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_DEBUG_DRIVER),y)</div><div class='ctx'> EXTRA_CFLAGS += -DDEBUG</div><div class='ctx'> endif</div><div class='add'>+ifeq ($(CONFIG_PM_DEBUG),y)</div><div class='add'>+EXTRA_CFLAGS += -DDEBUG</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c<br/>index 0d2e101e4f15..fdfa3d0cf6af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/power/main.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * ancestral dependencies that the subsystem list maintains.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include "power.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c<br/>index 317edbf0feca..826093ef4c7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/resume.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/resume.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/resume.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/power/resume.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/resume-trace.h&gt;</div><div class='ctx'> #include "../base.h"</div><div class='ctx'> #include "power.h"</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +24,8 @@ int resume_device(struct device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	int error = 0;</div><div class='ctx'> </div><div class='add'>+	TRACE_DEVICE(dev);</div><div class='add'>+	TRACE_RESUME(0);</div><div class='ctx'> 	down(&amp;dev-&gt;sem);</div><div class='ctx'> 	if (dev-&gt;power.pm_parent</div><div class='ctx'> 			&amp;&amp; dev-&gt;power.pm_parent-&gt;power.power_state.event) {</div><div class='hunk'>@@ -36,6 +39,7 @@ int resume_device(struct device * dev)</div><div class='ctx'> 		error = dev-&gt;bus-&gt;resume(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;dev-&gt;sem);</div><div class='add'>+	TRACE_RESUME(error);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -49,8 +53,7 @@ void dpm_resume(void)</div><div class='ctx'> 		struct device * dev = to_device(entry);</div><div class='ctx'> </div><div class='ctx'> 		get_device(dev);</div><div class='del'>-		list_del_init(entry);</div><div class='del'>-		list_add_tail(entry, &amp;dpm_active);</div><div class='add'>+		list_move_tail(entry, &amp;dpm_active);</div><div class='ctx'> </div><div class='ctx'> 		up(&amp;dpm_list_sem);</div><div class='ctx'> 		if (!dev-&gt;power.prev_state.event)</div><div class='hunk'>@@ -97,8 +100,7 @@ void dpm_power_up(void)</div><div class='ctx'> 		struct device * dev = to_device(entry);</div><div class='ctx'> </div><div class='ctx'> 		get_device(dev);</div><div class='del'>-		list_del_init(entry);</div><div class='del'>-		list_add_tail(entry, &amp;dpm_active);</div><div class='add'>+		list_move_tail(entry, &amp;dpm_active);</div><div class='ctx'> 		resume_device(dev);</div><div class='ctx'> 		put_device(dev);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c<br/>index 8826a5b6673e..3483ae4d57f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/shutdown.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/shutdown.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/shutdown.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/power/shutdown.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c<br/>index 2a769cc6f5f9..69509e02f703 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/power/suspend.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/power/suspend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/suspend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/power/suspend.c</a></div><div class='hunk'>@@ -29,6 +29,15 @@</div><div class='ctx'>  * lists. This way, the ancestors will be accessed before their descendents.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static inline char *suspend_verb(u32 event)</div><div class='add'>+{</div><div class='add'>+	switch (event) {</div><div class='add'>+	case PM_EVENT_SUSPEND:	return "suspend";</div><div class='add'>+	case PM_EVENT_FREEZE:	return "freeze";</div><div class='add'>+	default:		return "(unknown suspend event)";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	suspend_device - Save state of one device.</div><div class='hunk'>@@ -57,7 +66,13 @@ int suspend_device(struct device * dev, pm_message_t state)</div><div class='ctx'> 	dev-&gt;power.prev_state = dev-&gt;power.power_state;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;bus &amp;&amp; dev-&gt;bus-&gt;suspend &amp;&amp; !dev-&gt;power.power_state.event) {</div><div class='del'>-		dev_dbg(dev, "suspending\n");</div><div class='add'>+		dev_dbg(dev, "%s%s\n",</div><div class='add'>+			suspend_verb(state.event),</div><div class='add'>+			((state.event == PM_EVENT_SUSPEND)</div><div class='add'>+					&amp;&amp; device_may_wakeup(dev))</div><div class='add'>+				? ", may wakeup"</div><div class='add'>+				: ""</div><div class='add'>+			);</div><div class='ctx'> 		error = dev-&gt;bus-&gt;suspend(dev, state);</div><div class='ctx'> 		suspend_report_result(dev-&gt;bus-&gt;suspend, error);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -101,12 +116,10 @@ int device_suspend(pm_message_t state)</div><div class='ctx'> 		/* Check if the device got removed */</div><div class='ctx'> 		if (!list_empty(&amp;dev-&gt;power.entry)) {</div><div class='ctx'> 			/* Move it to the dpm_off or dpm_off_irq list */</div><div class='del'>-			if (!error) {</div><div class='del'>-				list_del(&amp;dev-&gt;power.entry);</div><div class='del'>-				list_add(&amp;dev-&gt;power.entry, &amp;dpm_off);</div><div class='del'>-			} else if (error == -EAGAIN) {</div><div class='del'>-				list_del(&amp;dev-&gt;power.entry);</div><div class='del'>-				list_add(&amp;dev-&gt;power.entry, &amp;dpm_off_irq);</div><div class='add'>+			if (!error)</div><div class='add'>+				list_move(&amp;dev-&gt;power.entry, &amp;dpm_off);</div><div class='add'>+			else if (error == -EAGAIN) {</div><div class='add'>+				list_move(&amp;dev-&gt;power.entry, &amp;dpm_off_irq);</div><div class='ctx'> 				error = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -124,8 +137,7 @@ int device_suspend(pm_message_t state)</div><div class='ctx'> 		 */</div><div class='ctx'> 		while (!list_empty(&amp;dpm_off_irq)) {</div><div class='ctx'> 			struct list_head * entry = dpm_off_irq.next;</div><div class='del'>-			list_del(entry);</div><div class='del'>-			list_add(entry, &amp;dpm_off);</div><div class='add'>+			list_move(entry, &amp;dpm_off);</div><div class='ctx'> 		}</div><div class='ctx'> 		dpm_resume();</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c<br/>new file mode 100644<br/>index 000000000000..a9ab30fefffc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/power/trace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/power/trace.c</a></div><div class='hunk'>@@ -0,0 +1,228 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/base/power/trace.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Linus Torvalds</div><div class='add'>+ *</div><div class='add'>+ * Trace facility for suspend/resume problems, when none of the</div><div class='add'>+ * devices may be working.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/resume-trace.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "power.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Horrid, horrid, horrid.</div><div class='add'>+ *</div><div class='add'>+ * It turns out that the _only_ piece of hardware that actually</div><div class='add'>+ * keeps its value across a hard boot (and, more importantly, the</div><div class='add'>+ * POST init sequence) is literally the realtime clock.</div><div class='add'>+ *</div><div class='add'>+ * Never mind that an RTC chip has 114 bytes (and often a whole</div><div class='add'>+ * other bank of an additional 128 bytes) of nice SRAM that is</div><div class='add'>+ * _designed_ to keep data - the POST will clear it. So we literally</div><div class='add'>+ * can just use the few bytes of actual time data, which means that</div><div class='add'>+ * we're really limited.</div><div class='add'>+ *</div><div class='add'>+ * It means, for example, that we can't use the seconds at all</div><div class='add'>+ * (since the time between the hang and the boot might be more</div><div class='add'>+ * than a minute), and we'd better not depend on the low bits of</div><div class='add'>+ * the minutes either.</div><div class='add'>+ *</div><div class='add'>+ * There are the wday fields etc, but I wouldn't guarantee those</div><div class='add'>+ * are dependable either. And if the date isn't valid, either the</div><div class='add'>+ * hw or POST will do strange things.</div><div class='add'>+ *</div><div class='add'>+ * So we're left with:</div><div class='add'>+ *  - year: 0-99</div><div class='add'>+ *  - month: 0-11</div><div class='add'>+ *  - day-of-month: 1-28</div><div class='add'>+ *  - hour: 0-23</div><div class='add'>+ *  - min: (0-30)*2</div><div class='add'>+ *</div><div class='add'>+ * Giving us a total range of 0-16128000 (0xf61800), ie less</div><div class='add'>+ * than 24 bits of actual data we can save across reboots.</div><div class='add'>+ *</div><div class='add'>+ * And if your box can't boot in less than three minutes,</div><div class='add'>+ * you're screwed.</div><div class='add'>+ *</div><div class='add'>+ * Now, almost 24 bits of data is pitifully small, so we need</div><div class='add'>+ * to be pretty dense if we want to use it for anything nice.</div><div class='add'>+ * What we do is that instead of saving off nice readable info,</div><div class='add'>+ * we save off _hashes_ of information that we can hopefully</div><div class='add'>+ * regenerate after the reboot.</div><div class='add'>+ *</div><div class='add'>+ * In particular, this means that we might be unlucky, and hit</div><div class='add'>+ * a case where we have a hash collision, and we end up not</div><div class='add'>+ * being able to tell for certain exactly which case happened.</div><div class='add'>+ * But that's hopefully unlikely.</div><div class='add'>+ *</div><div class='add'>+ * What we do is to take the bits we can fit, and split them</div><div class='add'>+ * into three parts (16*997*1009 = 16095568), and use the values</div><div class='add'>+ * for:</div><div class='add'>+ *  - 0-15: user-settable</div><div class='add'>+ *  - 0-996: file + line number</div><div class='add'>+ *  - 0-1008: device</div><div class='add'>+ */</div><div class='add'>+#define USERHASH (16)</div><div class='add'>+#define FILEHASH (997)</div><div class='add'>+#define DEVHASH (1009)</div><div class='add'>+</div><div class='add'>+#define DEVSEED (7919)</div><div class='add'>+</div><div class='add'>+static unsigned int dev_hash_value;</div><div class='add'>+</div><div class='add'>+static int set_magic_time(unsigned int user, unsigned int file, unsigned int device)</div><div class='add'>+{</div><div class='add'>+	unsigned int n = user + USERHASH*(file + FILEHASH*device);</div><div class='add'>+</div><div class='add'>+	// June 7th, 2006</div><div class='add'>+	static struct rtc_time time = {</div><div class='add'>+		.tm_sec = 0,</div><div class='add'>+		.tm_min = 0,</div><div class='add'>+		.tm_hour = 0,</div><div class='add'>+		.tm_mday = 7,</div><div class='add'>+		.tm_mon = 5,	// June - counting from zero</div><div class='add'>+		.tm_year = 106,</div><div class='add'>+		.tm_wday = 3,</div><div class='add'>+		.tm_yday = 160,</div><div class='add'>+		.tm_isdst = 1</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	time.tm_year = (n % 100);</div><div class='add'>+	n /= 100;</div><div class='add'>+	time.tm_mon = (n % 12);</div><div class='add'>+	n /= 12;</div><div class='add'>+	time.tm_mday = (n % 28) + 1;</div><div class='add'>+	n /= 28;</div><div class='add'>+	time.tm_hour = (n % 24);</div><div class='add'>+	n /= 24;</div><div class='add'>+	time.tm_min = (n % 20) * 3;</div><div class='add'>+	n /= 20;</div><div class='add'>+	set_rtc_time(&amp;time);</div><div class='add'>+	return n ? -1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int read_magic_time(void)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time time;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	get_rtc_time(&amp;time);</div><div class='add'>+	printk("Time: %2d:%02d:%02d  Date: %02d/%02d/%02d\n",</div><div class='add'>+		time.tm_hour, time.tm_min, time.tm_sec,</div><div class='add'>+		time.tm_mon, time.tm_mday, time.tm_year);</div><div class='add'>+	val = time.tm_year;				/* 100 years */</div><div class='add'>+	if (val &gt; 100)</div><div class='add'>+		val -= 100;</div><div class='add'>+	val += time.tm_mon * 100;			/* 12 months */</div><div class='add'>+	val += (time.tm_mday-1) * 100 * 12;		/* 28 month-days */</div><div class='add'>+	val += time.tm_hour * 100 * 12 * 28;		/* 24 hours */</div><div class='add'>+	val += (time.tm_min / 3) * 100 * 12 * 28 * 24;	/* 20 3-minute intervals */</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is just the sdbm hash function with a user-supplied</div><div class='add'>+ * seed and final size parameter.</div><div class='add'>+ */</div><div class='add'>+static unsigned int hash_string(unsigned int seed, const char *data, unsigned int mod)</div><div class='add'>+{</div><div class='add'>+	unsigned char c;</div><div class='add'>+	while ((c = *data++) != 0) {</div><div class='add'>+		seed = (seed &lt;&lt; 16) + (seed &lt;&lt; 6) - seed + c;</div><div class='add'>+	}</div><div class='add'>+	return seed % mod;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void set_trace_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev_hash_value = hash_string(DEVSEED, dev-&gt;bus_id, DEVHASH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We could just take the "tracedata" index into the .tracedata</div><div class='add'>+ * section instead. Generating a hash of the data gives us a</div><div class='add'>+ * chance to work across kernel versions, and perhaps more</div><div class='add'>+ * importantly it also gives us valid/invalid check (ie we will</div><div class='add'>+ * likely not give totally bogus reports - if the hash matches,</div><div class='add'>+ * it's not any guarantee, but it's a high _likelihood_ that</div><div class='add'>+ * the match is valid).</div><div class='add'>+ */</div><div class='add'>+void generate_resume_trace(void *tracedata, unsigned int user)</div><div class='add'>+{</div><div class='add'>+	unsigned short lineno = *(unsigned short *)tracedata;</div><div class='add'>+	const char *file = *(const char **)(tracedata + 2);</div><div class='add'>+	unsigned int user_hash_value, file_hash_value;</div><div class='add'>+</div><div class='add'>+	user_hash_value = user % USERHASH;</div><div class='add'>+	file_hash_value = hash_string(lineno, file, FILEHASH);</div><div class='add'>+	set_magic_time(user_hash_value, file_hash_value, dev_hash_value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern char __tracedata_start, __tracedata_end;</div><div class='add'>+static int show_file_hash(unsigned int value)</div><div class='add'>+{</div><div class='add'>+	int match;</div><div class='add'>+	char *tracedata;</div><div class='add'>+</div><div class='add'>+	match = 0;</div><div class='add'>+	for (tracedata = &amp;__tracedata_start ; tracedata &lt; &amp;__tracedata_end ; tracedata += 6) {</div><div class='add'>+		unsigned short lineno = *(unsigned short *)tracedata;</div><div class='add'>+		const char *file = *(const char **)(tracedata + 2);</div><div class='add'>+		unsigned int hash = hash_string(lineno, file, FILEHASH);</div><div class='add'>+		if (hash != value)</div><div class='add'>+			continue;</div><div class='add'>+		printk("  hash matches %s:%u\n", file, lineno);</div><div class='add'>+		match++;</div><div class='add'>+	}</div><div class='add'>+	return match;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int show_dev_hash(unsigned int value)</div><div class='add'>+{</div><div class='add'>+	int match = 0;</div><div class='add'>+	struct list_head * entry = dpm_active.prev;</div><div class='add'>+</div><div class='add'>+	while (entry != &amp;dpm_active) {</div><div class='add'>+		struct device * dev = to_device(entry);</div><div class='add'>+		unsigned int hash = hash_string(DEVSEED, dev-&gt;bus_id, DEVHASH);</div><div class='add'>+		if (hash == value) {</div><div class='add'>+			printk("  hash matches device %s\n", dev-&gt;bus_id);</div><div class='add'>+			match++;</div><div class='add'>+		}</div><div class='add'>+		entry = entry-&gt;prev;</div><div class='add'>+	}</div><div class='add'>+	return match;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int hash_value_early_read;</div><div class='add'>+</div><div class='add'>+static int early_resume_init(void)</div><div class='add'>+{</div><div class='add'>+	hash_value_early_read = read_magic_time();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int late_resume_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = hash_value_early_read;</div><div class='add'>+	unsigned int user, file, dev;</div><div class='add'>+</div><div class='add'>+	user = val % USERHASH;</div><div class='add'>+	val = val / USERHASH;</div><div class='add'>+	file = val % FILEHASH;</div><div class='add'>+	val = val / FILEHASH;</div><div class='add'>+	dev = val /* % DEVHASH */;</div><div class='add'>+</div><div class='add'>+	printk("  Magic number: %d:%d:%d\n", user, file, dev);</div><div class='add'>+	show_file_hash(file);</div><div class='add'>+	show_dev_hash(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+core_initcall(early_resume_init);</div><div class='add'>+late_initcall(late_resume_init);</div><div class='head'>diff --git a/drivers/base/sys.c b/drivers/base/sys.c<br/>index 6fc23ab127bd..04e5db445c74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/sys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/sys.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * add themselves as children of the system bus.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -80,10 +79,59 @@ void sysdev_remove_file(struct sys_device * s, struct sysdev_attribute * a)</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysdev_create_file);</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysdev_remove_file);</div><div class='ctx'> </div><div class='add'>+#define to_sysdev_class(k) container_of(k, struct sysdev_class, kset.kobj)</div><div class='add'>+#define to_sysdev_class_attr(a) container_of(a, \</div><div class='add'>+	struct sysdev_class_attribute, attr)</div><div class='add'>+</div><div class='add'>+static ssize_t sysdev_class_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				 char *buffer)</div><div class='add'>+{</div><div class='add'>+	struct sysdev_class * class = to_sysdev_class(kobj);</div><div class='add'>+	struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);</div><div class='add'>+</div><div class='add'>+	if (class_attr-&gt;show)</div><div class='add'>+		return class_attr-&gt;show(class, buffer);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				  const char *buffer, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sysdev_class * class = to_sysdev_class(kobj);</div><div class='add'>+	struct sysdev_class_attribute * class_attr = to_sysdev_class_attr(attr);</div><div class='add'>+</div><div class='add'>+	if (class_attr-&gt;store)</div><div class='add'>+		return class_attr-&gt;store(class, buffer, count);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sysfs_ops sysfs_class_ops = {</div><div class='add'>+	.show	= sysdev_class_show,</div><div class='add'>+	.store	= sysdev_class_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kobj_type ktype_sysdev_class = {</div><div class='add'>+	.sysfs_ops	= &amp;sysfs_class_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sysdev_class_create_file(struct sysdev_class *c,</div><div class='add'>+			     struct sysdev_class_attribute *a)</div><div class='add'>+{</div><div class='add'>+	return sysfs_create_file(&amp;c-&gt;kset.kobj, &amp;a-&gt;attr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sysdev_class_create_file);</div><div class='add'>+</div><div class='add'>+void sysdev_class_remove_file(struct sysdev_class *c,</div><div class='add'>+			      struct sysdev_class_attribute *a)</div><div class='add'>+{</div><div class='add'>+	sysfs_remove_file(&amp;c-&gt;kset.kobj, &amp;a-&gt;attr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(sysdev_class_remove_file);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * declare system_subsys</div><div class='ctx'>  */</div><div class='del'>-static decl_subsys(system, &amp;ktype_sysdev, NULL);</div><div class='add'>+static decl_subsys(system, &amp;ktype_sysdev_class, NULL);</div><div class='ctx'> </div><div class='ctx'> int sysdev_class_register(struct sysdev_class * cls)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/base/topology.c b/drivers/base/topology.c<br/>index 8c52421cbc54..c2d621632383 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/base/topology.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/base/topology.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/base/topology.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/base/topology.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int topology_cpu_callback(struct notifier_block *nfb,</div><div class='add'>+static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 		unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cpu = (unsigned long)hcpu;</div><div class='hunk'>@@ -125,7 +125,7 @@ static int topology_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block topology_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata topology_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'> 	.notifier_call = topology_cpu_callback,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c<br/>index 45bcda544880..4cd23c3eab41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/DAC960.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/DAC960.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/DAC960.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/DAC960.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define DAC960_DriverVersion			"2.5.47"</div><div class='del'>-#define DAC960_DriverDate			"14 November 2002"</div><div class='add'>+#define DAC960_DriverVersion			"2.5.48"</div><div class='add'>+#define DAC960_DriverDate			"14 May 2006"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -2530,7 +2530,6 @@ static boolean DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)</div><div class='ctx'> 	blk_queue_max_sectors(RequestQueue, Controller-&gt;MaxBlocksPerCommand);</div><div class='ctx'> 	disk-&gt;queue = RequestQueue;</div><div class='ctx'> 	sprintf(disk-&gt;disk_name, "rd/c%dd%d", Controller-&gt;ControllerNumber, n);</div><div class='del'>-	sprintf(disk-&gt;devfs_name, "rd/host%d/target%d", Controller-&gt;ControllerNumber, n);</div><div class='ctx'> 	disk-&gt;major = MajorNumber;</div><div class='ctx'> 	disk-&gt;first_minor = n &lt;&lt; DAC960_MaxPartitionsBits;</div><div class='ctx'> 	disk-&gt;fops = &amp;DAC960_BlockDeviceOperations;</div><div class='hunk'>@@ -3015,7 +3014,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device,</div><div class='ctx'>      Acquire shared access to the IRQ Channel.</div><div class='ctx'>   */</div><div class='ctx'>   IRQ_Channel = PCI_Device-&gt;irq;</div><div class='del'>-  if (request_irq(IRQ_Channel, InterruptHandler, SA_SHIRQ,</div><div class='add'>+  if (request_irq(IRQ_Channel, InterruptHandler, IRQF_SHARED,</div><div class='ctx'> 		      Controller-&gt;FullModelName, Controller) &lt; 0)</div><div class='ctx'>   {</div><div class='ctx'> 	DAC960_Error("Unable to acquire IRQ Channel %d for Controller at\n",</div><div class='hunk'>@@ -4780,15 +4779,16 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)</div><div class='ctx'> 	      (NewPhysicalDeviceInfo-&gt;LogicalUnit !=</div><div class='ctx'> 	       PhysicalDeviceInfo-&gt;LogicalUnit))</div><div class='ctx'> 	    {</div><div class='del'>-	      PhysicalDeviceInfo = (DAC960_V2_PhysicalDeviceInfo_T *)</div><div class='add'>+	      PhysicalDeviceInfo =</div><div class='ctx'> 		kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T), GFP_ATOMIC);</div><div class='ctx'> 	      InquiryUnitSerialNumber =</div><div class='del'>-		(DAC960_SCSI_Inquiry_UnitSerialNumber_T *)</div><div class='ctx'> 		  kmalloc(sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T),</div><div class='ctx'> 			  GFP_ATOMIC);</div><div class='del'>-	      if (InquiryUnitSerialNumber == NULL &amp;&amp;</div><div class='del'>-		  PhysicalDeviceInfo != NULL)</div><div class='add'>+	      if (InquiryUnitSerialNumber == NULL ||</div><div class='add'>+		  PhysicalDeviceInfo == NULL)</div><div class='ctx'> 		{</div><div class='add'>+		  kfree(InquiryUnitSerialNumber);</div><div class='add'>+		  InquiryUnitSerialNumber = NULL;</div><div class='ctx'> 		  kfree(PhysicalDeviceInfo);</div><div class='ctx'> 		  PhysicalDeviceInfo = NULL;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig<br/>index ae0949b3394f..b5382cedf0c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/Kconfig</a></div><div class='hunk'>@@ -400,8 +400,19 @@ config BLK_DEV_RAM_SIZE</div><div class='ctx'> 	  what are you doing. If you are using IBM S/390, then set this to</div><div class='ctx'> 	  8192.</div><div class='ctx'> </div><div class='add'>+config BLK_DEV_RAM_BLOCKSIZE</div><div class='add'>+	int "Default RAM disk block size (bytes)"</div><div class='add'>+	depends on BLK_DEV_RAM</div><div class='add'>+	default "1024"</div><div class='add'>+	help</div><div class='add'>+	  The default value is 1024 kilobytes.  PAGE_SIZE is a much more</div><div class='add'>+	  efficient choice however.  The default is kept to ensure initrd</div><div class='add'>+	  setups function - apparently needed by the rd_load_image routine</div><div class='add'>+	  that supposes the filesystem in the image uses a 1024 blocksize.</div><div class='add'>+</div><div class='ctx'> config BLK_DEV_INITRD</div><div class='ctx'> 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"</div><div class='add'>+	depends on BROKEN || !FRV</div><div class='ctx'> 	help</div><div class='ctx'> 	  The initial RAM filesystem is a ramfs which is loaded by the</div><div class='ctx'> 	  boot loader (loadlin or lilo) and that is mounted as root</div><div class='head'>diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c<br/>index 196c0ec9cd54..0b80fbb8dbfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/acsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/acsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/acsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/acsi.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -1732,13 +1731,10 @@ int acsi_init( void )</div><div class='ctx'> 		struct gendisk *disk = acsi_gendisk[i];</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "ad%c", 'a'+i);</div><div class='ctx'> 		aip = &amp;acsi_info[NDevices];</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "ad/target%d/lun%d", aip-&gt;target, aip-&gt;lun);</div><div class='ctx'> 		disk-&gt;major = ACSI_MAJOR;</div><div class='ctx'> 		disk-&gt;first_minor = i &lt;&lt; 4;</div><div class='del'>-		if (acsi_info[i].type != HARDDISK) {</div><div class='add'>+		if (acsi_info[i].type != HARDDISK)</div><div class='ctx'> 			disk-&gt;minors = 1;</div><div class='del'>-			strcat(disk-&gt;devfs_name, "/disc");</div><div class='del'>-		}</div><div class='ctx'> 		disk-&gt;fops = &amp;acsi_fops;</div><div class='ctx'> 		disk-&gt;private_data = &amp;acsi_info[i];</div><div class='ctx'> 		set_capacity(disk, acsi_info[i].size);</div><div class='head'>diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c<br/>index 4cb9c1336287..4030a8fd1187 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/acsi_slm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/acsi_slm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/acsi_slm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/acsi_slm.c</a></div><div class='hunk'>@@ -65,7 +65,6 @@ not be guaranteed. There are several ways to assure this:</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='hunk'>@@ -1005,11 +1004,6 @@ int slm_init( void )</div><div class='ctx'> 	BufferP = SLMBuffer;</div><div class='ctx'> 	SLMState = IDLE;</div><div class='ctx'> 	</div><div class='del'>-	devfs_mk_dir("slm");</div><div class='del'>-	for (i = 0; i &lt; MAX_SLM; i++) {</div><div class='del'>-		devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),</div><div class='del'>-				S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1032,10 +1026,6 @@ int init_module(void)</div><div class='ctx'> </div><div class='ctx'> void cleanup_module(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; MAX_SLM; i++)</div><div class='del'>-		devfs_remove("slm/%d", i);</div><div class='del'>-	devfs_remove("slm");</div><div class='ctx'> 	if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)</div><div class='ctx'> 		printk( KERN_ERR "acsi_slm: cleanup_module failed\n");</div><div class='ctx'> 	atari_stram_free( SLMBuffer );</div><div class='head'>diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c<br/>index 2a8af685926f..2641597c6549 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/amiflop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/amiflop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/amiflop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/amiflop.c</a></div><div class='hunk'>@@ -64,6 +64,7 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/elevator.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c<br/>index 5327f553b4f5..1bc1cf9603f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoechr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/aoe/aoechr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoechr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/aoe/aoechr.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ aoechr_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	int n, i;</div><div class='ctx'> </div><div class='del'>-	n = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	n = iminor(inode);</div><div class='ctx'> 	filp-&gt;private_data = (void *) (unsigned long) n;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(chardevs); ++i)</div><div class='head'>diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c<br/>index fdff774b8ab9..c1434ed11880 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoenet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/aoe/aoenet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/aoe/aoenet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/aoe/aoenet.c</a></div><div class='hunk'>@@ -116,8 +116,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,</div><div class='ctx'> 	skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='ctx'> 	if (skb == NULL)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (skb_is_nonlinear(skb))</div><div class='del'>-	if (skb_linearize(skb, GFP_ATOMIC) &lt; 0)</div><div class='add'>+	if (skb_linearize(skb))</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	if (!is_aoe_netif(ifp))</div><div class='ctx'> 		goto exit;</div><div class='head'>diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c<br/>index 1319d8f20640..1c4df22dfd2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cciss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/cciss.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt; </div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='hunk'>@@ -64,143 +64,129 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* define the PCI info for the cards we can control */</div><div class='ctx'> static const struct pci_device_id cciss_pci_device_id[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,</div><div class='del'>-			0x0E11, 0x4070, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,</div><div class='del'>-                        0x0E11, 0x4080, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,</div><div class='del'>-                        0x0E11, 0x4082, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB,</div><div class='del'>-                        0x0E11, 0x4083, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,</div><div class='del'>-		0x0E11, 0x409A, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,</div><div class='del'>-		0x0E11, 0x409B, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,</div><div class='del'>-		0x0E11, 0x409C, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,</div><div class='del'>-		0x0E11, 0x409D, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC,</div><div class='del'>-		0x0E11, 0x4091, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSA,</div><div class='del'>-		0x103C, 0x3225, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,</div><div class='del'>-		0x103c, 0x3223, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,</div><div class='del'>-		0x103c, 0x3234, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC,</div><div class='del'>-		0x103c, 0x3235, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,</div><div class='del'>-		0x103c, 0x3211, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,</div><div class='del'>-		0x103c, 0x3212, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,</div><div class='del'>-		0x103c, 0x3213, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,</div><div class='del'>-		0x103c, 0x3214, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD,</div><div class='del'>-		0x103c, 0x3215, 0, 0, 0},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,  0x0E11, 0x4070},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4080},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4082},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4083},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x4091},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409A},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409B},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409C},</div><div class='add'>+	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSC, 0x0E11, 0x409D},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSA,     0x103C, 0x3225},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3223},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3234},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3235},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3211},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3212},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3213},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3214},</div><div class='add'>+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSD,     0x103C, 0x3215},</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);</div><div class='ctx'> </div><div class='del'>-#define NR_PRODUCTS ARRAY_SIZE(products)</div><div class='add'>+MODULE_DEVICE_TABLE(pci, cciss_pci_device_id);</div><div class='ctx'> </div><div class='ctx'> /*  board_id = Subsystem Device ID &amp; Vendor ID</div><div class='ctx'>  *  product = Marketing Name for the board</div><div class='del'>- *  access = Address of the struct of function pointers </div><div class='add'>+ *  access = Address of the struct of function pointers</div><div class='ctx'>  */</div><div class='ctx'> static struct board_type products[] = {</div><div class='del'>-	{ 0x40700E11, "Smart Array 5300", &amp;SA5_access },</div><div class='del'>-	{ 0x40800E11, "Smart Array 5i", &amp;SA5B_access},</div><div class='del'>-	{ 0x40820E11, "Smart Array 532", &amp;SA5B_access},</div><div class='del'>-	{ 0x40830E11, "Smart Array 5312", &amp;SA5B_access},</div><div class='del'>-	{ 0x409A0E11, "Smart Array 641", &amp;SA5_access},</div><div class='del'>-	{ 0x409B0E11, "Smart Array 642", &amp;SA5_access},</div><div class='del'>-	{ 0x409C0E11, "Smart Array 6400", &amp;SA5_access},</div><div class='del'>-	{ 0x409D0E11, "Smart Array 6400 EM", &amp;SA5_access},</div><div class='del'>-	{ 0x40910E11, "Smart Array 6i", &amp;SA5_access},</div><div class='del'>-	{ 0x3225103C, "Smart Array P600", &amp;SA5_access},</div><div class='del'>-	{ 0x3223103C, "Smart Array P800", &amp;SA5_access},</div><div class='del'>-	{ 0x3234103C, "Smart Array P400", &amp;SA5_access},</div><div class='del'>-	{ 0x3235103C, "Smart Array P400i", &amp;SA5_access},</div><div class='del'>-	{ 0x3211103C, "Smart Array E200i", &amp;SA5_access},</div><div class='del'>-	{ 0x3212103C, "Smart Array E200", &amp;SA5_access},</div><div class='del'>-	{ 0x3213103C, "Smart Array E200i", &amp;SA5_access},</div><div class='del'>-	{ 0x3214103C, "Smart Array E200i", &amp;SA5_access},</div><div class='del'>-	{ 0x3215103C, "Smart Array E200i", &amp;SA5_access},</div><div class='add'>+	{0x40700E11, "Smart Array 5300", &amp;SA5_access},</div><div class='add'>+	{0x40800E11, "Smart Array 5i", &amp;SA5B_access},</div><div class='add'>+	{0x40820E11, "Smart Array 532", &amp;SA5B_access},</div><div class='add'>+	{0x40830E11, "Smart Array 5312", &amp;SA5B_access},</div><div class='add'>+	{0x409A0E11, "Smart Array 641", &amp;SA5_access},</div><div class='add'>+	{0x409B0E11, "Smart Array 642", &amp;SA5_access},</div><div class='add'>+	{0x409C0E11, "Smart Array 6400", &amp;SA5_access},</div><div class='add'>+	{0x409D0E11, "Smart Array 6400 EM", &amp;SA5_access},</div><div class='add'>+	{0x40910E11, "Smart Array 6i", &amp;SA5_access},</div><div class='add'>+	{0x3225103C, "Smart Array P600", &amp;SA5_access},</div><div class='add'>+	{0x3223103C, "Smart Array P800", &amp;SA5_access},</div><div class='add'>+	{0x3234103C, "Smart Array P400", &amp;SA5_access},</div><div class='add'>+	{0x3235103C, "Smart Array P400i", &amp;SA5_access},</div><div class='add'>+	{0x3211103C, "Smart Array E200i", &amp;SA5_access},</div><div class='add'>+	{0x3212103C, "Smart Array E200", &amp;SA5_access},</div><div class='add'>+	{0x3213103C, "Smart Array E200i", &amp;SA5_access},</div><div class='add'>+	{0x3214103C, "Smart Array E200i", &amp;SA5_access},</div><div class='add'>+	{0x3215103C, "Smart Array E200i", &amp;SA5_access},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* How long to wait (in millesconds) for board to go into simple mode */</div><div class='del'>-#define MAX_CONFIG_WAIT 30000 </div><div class='add'>+/* How long to wait (in milliseconds) for board to go into simple mode */</div><div class='add'>+#define MAX_CONFIG_WAIT 30000</div><div class='ctx'> #define MAX_IOCTL_CONFIG_WAIT 1000</div><div class='ctx'> </div><div class='ctx'> /*define how many times we will try a command because of bus resets */</div><div class='ctx'> #define MAX_CMD_RETRIES 3</div><div class='ctx'> </div><div class='ctx'> #define READ_AHEAD 	 1024</div><div class='del'>-#define NR_CMDS		 384 /* #commands that can be outstanding */</div><div class='add'>+#define NR_CMDS		 384	/* #commands that can be outstanding */</div><div class='ctx'> #define MAX_CTLR	32</div><div class='ctx'> </div><div class='ctx'> /* Originally cciss driver only supports 8 major numbers */</div><div class='ctx'> #define MAX_CTLR_ORIG 	8</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static ctlr_info_t *hba[MAX_CTLR];</div><div class='ctx'> </div><div class='ctx'> static void do_cciss_request(request_queue_t *q);</div><div class='ctx'> static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs);</div><div class='ctx'> static int cciss_open(struct inode *inode, struct file *filep);</div><div class='ctx'> static int cciss_release(struct inode *inode, struct file *filep);</div><div class='del'>-static int cciss_ioctl(struct inode *inode, struct file *filep, </div><div class='del'>-		unsigned int cmd, unsigned long arg);</div><div class='add'>+static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='add'>+		       unsigned int cmd, unsigned long arg);</div><div class='ctx'> static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo);</div><div class='ctx'> </div><div class='ctx'> static int revalidate_allvol(ctlr_info_t *host);</div><div class='ctx'> static int cciss_revalidate(struct gendisk *disk);</div><div class='ctx'> static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk);</div><div class='del'>-static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, int clear_all);</div><div class='add'>+static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,</div><div class='add'>+			   int clear_all);</div><div class='ctx'> </div><div class='ctx'> static void cciss_read_capacity(int ctlr, int logvol, ReadCapdata_struct *buf,</div><div class='del'>-	int withirq, unsigned int *total_size, unsigned int *block_size);</div><div class='del'>-static void cciss_geometry_inquiry(int ctlr, int logvol,</div><div class='del'>-			int withirq, unsigned int total_size,</div><div class='del'>-			unsigned int block_size, InquiryData_struct *inq_buff,</div><div class='del'>-			drive_info_struct *drv);</div><div class='add'>+				int withirq, unsigned int *total_size,</div><div class='add'>+				unsigned int *block_size);</div><div class='add'>+static void cciss_geometry_inquiry(int ctlr, int logvol, int withirq,</div><div class='add'>+				   unsigned int total_size,</div><div class='add'>+				   unsigned int block_size,</div><div class='add'>+				   InquiryData_struct *inq_buff,</div><div class='add'>+				   drive_info_struct *drv);</div><div class='ctx'> static void cciss_getgeometry(int cntl_num);</div><div class='del'>-static void __devinit cciss_interrupt_mode(ctlr_info_t *, struct pci_dev *, __u32);</div><div class='del'>-static void start_io( ctlr_info_t *h);</div><div class='del'>-static int sendcmd( __u8 cmd, int ctlr, void *buff, size_t size,</div><div class='del'>-	unsigned int use_unit_num, unsigned int log_unit, __u8 page_code,</div><div class='del'>-	unsigned char *scsi3addr, int cmd_type);</div><div class='del'>-static int sendcmd_withirq(__u8	cmd, int ctlr, void *buff, size_t size,</div><div class='del'>-	unsigned int use_unit_num, unsigned int log_unit, __u8	page_code,</div><div class='del'>-	int cmd_type);</div><div class='add'>+static void __devinit cciss_interrupt_mode(ctlr_info_t *, struct pci_dev *,</div><div class='add'>+					   __u32);</div><div class='add'>+static void start_io(ctlr_info_t *h);</div><div class='add'>+static int sendcmd(__u8 cmd, int ctlr, void *buff, size_t size,</div><div class='add'>+		   unsigned int use_unit_num, unsigned int log_unit,</div><div class='add'>+		   __u8 page_code, unsigned char *scsi3addr, int cmd_type);</div><div class='add'>+static int sendcmd_withirq(__u8 cmd, int ctlr, void *buff, size_t size,</div><div class='add'>+			   unsigned int use_unit_num, unsigned int log_unit,</div><div class='add'>+			   __u8 page_code, int cmd_type);</div><div class='ctx'> </div><div class='ctx'> static void fail_all_cmds(unsigned long ctlr);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-static int cciss_proc_get_info(char *buffer, char **start, off_t offset, </div><div class='del'>-		int length, int *eof, void *data);</div><div class='add'>+static int cciss_proc_get_info(char *buffer, char **start, off_t offset,</div><div class='add'>+			       int length, int *eof, void *data);</div><div class='ctx'> static void cciss_procinit(int i);</div><div class='ctx'> #else</div><div class='del'>-static void cciss_procinit(int i) {}</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+static void cciss_procinit(int i)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif				/* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct block_device_operations cciss_fops  = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= cciss_open, </div><div class='del'>-	.release       	= cciss_release,</div><div class='del'>-        .ioctl		= cciss_ioctl,</div><div class='del'>-        .getgeo		= cciss_getgeo,</div><div class='add'>+static struct block_device_operations cciss_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.open = cciss_open,</div><div class='add'>+	.release = cciss_release,</div><div class='add'>+	.ioctl = cciss_ioctl,</div><div class='add'>+	.getgeo = cciss_getgeo,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	.compat_ioctl   = cciss_compat_ioctl,</div><div class='add'>+	.compat_ioctl = cciss_compat_ioctl,</div><div class='ctx'> #endif</div><div class='del'>-	.revalidate_disk= cciss_revalidate,</div><div class='add'>+	.revalidate_disk = cciss_revalidate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -208,28 +194,29 @@ static struct block_device_operations cciss_fops  = {</div><div class='ctx'>  */</div><div class='ctx'> static inline void addQ(CommandList_struct **Qptr, CommandList_struct *c)</div><div class='ctx'> {</div><div class='del'>-        if (*Qptr == NULL) {</div><div class='del'>-                *Qptr = c;</div><div class='del'>-                c-&gt;next = c-&gt;prev = c;</div><div class='del'>-        } else {</div><div class='del'>-                c-&gt;prev = (*Qptr)-&gt;prev;</div><div class='del'>-                c-&gt;next = (*Qptr);</div><div class='del'>-                (*Qptr)-&gt;prev-&gt;next = c;</div><div class='del'>-                (*Qptr)-&gt;prev = c;</div><div class='del'>-        }</div><div class='add'>+	if (*Qptr == NULL) {</div><div class='add'>+		*Qptr = c;</div><div class='add'>+		c-&gt;next = c-&gt;prev = c;</div><div class='add'>+	} else {</div><div class='add'>+		c-&gt;prev = (*Qptr)-&gt;prev;</div><div class='add'>+		c-&gt;next = (*Qptr);</div><div class='add'>+		(*Qptr)-&gt;prev-&gt;next = c;</div><div class='add'>+		(*Qptr)-&gt;prev = c;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline CommandList_struct *removeQ(CommandList_struct **Qptr, </div><div class='del'>-						CommandList_struct *c)</div><div class='add'>+static inline CommandList_struct *removeQ(CommandList_struct **Qptr,</div><div class='add'>+					  CommandList_struct *c)</div><div class='ctx'> {</div><div class='del'>-        if (c &amp;&amp; c-&gt;next != c) {</div><div class='del'>-                if (*Qptr == c) *Qptr = c-&gt;next;</div><div class='del'>-                c-&gt;prev-&gt;next = c-&gt;next;</div><div class='del'>-                c-&gt;next-&gt;prev = c-&gt;prev;</div><div class='del'>-        } else {</div><div class='del'>-                *Qptr = NULL;</div><div class='del'>-        }</div><div class='del'>-        return c;</div><div class='add'>+	if (c &amp;&amp; c-&gt;next != c) {</div><div class='add'>+		if (*Qptr == c)</div><div class='add'>+			*Qptr = c-&gt;next;</div><div class='add'>+		c-&gt;prev-&gt;next = c-&gt;next;</div><div class='add'>+		c-&gt;next-&gt;prev = c-&gt;prev;</div><div class='add'>+	} else {</div><div class='add'>+		*Qptr = NULL;</div><div class='add'>+	}</div><div class='add'>+	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #include "cciss_scsi.c"		/* For SCSI tape support */</div><div class='hunk'>@@ -242,23 +229,24 @@ static inline CommandList_struct *removeQ(CommandList_struct **Qptr,</div><div class='ctx'> #define ENG_GIG 1000000000</div><div class='ctx'> #define ENG_GIG_FACTOR (ENG_GIG/512)</div><div class='ctx'> #define RAID_UNKNOWN 6</div><div class='del'>-static const char *raid_label[] = {"0","4","1(1+0)","5","5+1","ADG",</div><div class='del'>-	                                   "UNKNOWN"};</div><div class='add'>+static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",</div><div class='add'>+	"UNKNOWN"</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct proc_dir_entry *proc_cciss;</div><div class='ctx'> </div><div class='del'>-static int cciss_proc_get_info(char *buffer, char **start, off_t offset, </div><div class='del'>-		int length, int *eof, void *data)</div><div class='add'>+static int cciss_proc_get_info(char *buffer, char **start, off_t offset,</div><div class='add'>+			       int length, int *eof, void *data)</div><div class='ctx'> {</div><div class='del'>-        off_t pos = 0;</div><div class='del'>-        off_t len = 0;</div><div class='del'>-        int size, i, ctlr;</div><div class='del'>-        ctlr_info_t *h = (ctlr_info_t*)data;</div><div class='del'>-        drive_info_struct *drv;</div><div class='add'>+	off_t pos = 0;</div><div class='add'>+	off_t len = 0;</div><div class='add'>+	int size, i, ctlr;</div><div class='add'>+	ctlr_info_t *h = (ctlr_info_t *) data;</div><div class='add'>+	drive_info_struct *drv;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-        sector_t vol_sz, vol_sz_frac;</div><div class='add'>+	sector_t vol_sz, vol_sz_frac;</div><div class='ctx'> </div><div class='del'>-        ctlr = h-&gt;ctlr;</div><div class='add'>+	ctlr = h-&gt;ctlr;</div><div class='ctx'> </div><div class='ctx'> 	/* prevent displaying bogus info during configuration</div><div class='ctx'> 	 * or deconfiguration of a logical volume</div><div class='hunk'>@@ -266,35 +254,35 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,</div><div class='ctx'> 	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> 	if (h-&gt;busy_configuring) {</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='del'>-	return -EBUSY;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	h-&gt;busy_configuring = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> </div><div class='del'>-        size = sprintf(buffer, "%s: HP %s Controller\n"</div><div class='del'>-		"Board ID: 0x%08lx\n"</div><div class='del'>-		"Firmware Version: %c%c%c%c\n"</div><div class='del'>-		"IRQ: %d\n"</div><div class='del'>-		"Logical drives: %d\n"</div><div class='del'>-		"Current Q depth: %d\n"</div><div class='del'>-		"Current # commands on controller: %d\n"</div><div class='del'>-		"Max Q depth since init: %d\n"</div><div class='del'>-		"Max # commands on controller since init: %d\n"</div><div class='del'>-		"Max SG entries since init: %d\n\n",</div><div class='del'>-                h-&gt;devname,</div><div class='del'>-                h-&gt;product_name,</div><div class='del'>-                (unsigned long)h-&gt;board_id,</div><div class='del'>-		h-&gt;firm_ver[0], h-&gt;firm_ver[1], h-&gt;firm_ver[2], h-&gt;firm_ver[3],</div><div class='del'>-                (unsigned int)h-&gt;intr[SIMPLE_MODE_INT],</div><div class='del'>-                h-&gt;num_luns, </div><div class='del'>-		h-&gt;Qdepth, h-&gt;commands_outstanding,</div><div class='del'>-		h-&gt;maxQsinceinit, h-&gt;max_outstanding, h-&gt;maxSG);</div><div class='del'>-</div><div class='del'>-        pos += size; len += size;</div><div class='add'>+	size = sprintf(buffer, "%s: HP %s Controller\n"</div><div class='add'>+		       "Board ID: 0x%08lx\n"</div><div class='add'>+		       "Firmware Version: %c%c%c%c\n"</div><div class='add'>+		       "IRQ: %d\n"</div><div class='add'>+		       "Logical drives: %d\n"</div><div class='add'>+		       "Current Q depth: %d\n"</div><div class='add'>+		       "Current # commands on controller: %d\n"</div><div class='add'>+		       "Max Q depth since init: %d\n"</div><div class='add'>+		       "Max # commands on controller since init: %d\n"</div><div class='add'>+		       "Max SG entries since init: %d\n\n",</div><div class='add'>+		       h-&gt;devname,</div><div class='add'>+		       h-&gt;product_name,</div><div class='add'>+		       (unsigned long)h-&gt;board_id,</div><div class='add'>+		       h-&gt;firm_ver[0], h-&gt;firm_ver[1], h-&gt;firm_ver[2],</div><div class='add'>+		       h-&gt;firm_ver[3], (unsigned int)h-&gt;intr[SIMPLE_MODE_INT],</div><div class='add'>+		       h-&gt;num_luns, h-&gt;Qdepth, h-&gt;commands_outstanding,</div><div class='add'>+		       h-&gt;maxQsinceinit, h-&gt;max_outstanding, h-&gt;maxSG);</div><div class='add'>+</div><div class='add'>+	pos += size;</div><div class='add'>+	len += size;</div><div class='ctx'> 	cciss_proc_tape_report(ctlr, buffer, &amp;pos, &amp;len);</div><div class='del'>-	for(i=0; i&lt;=h-&gt;highest_lun; i++) {</div><div class='add'>+	for (i = 0; i &lt;= h-&gt;highest_lun; i++) {</div><div class='ctx'> </div><div class='del'>-                drv = &amp;h-&gt;drv[i];</div><div class='add'>+		drv = &amp;h-&gt;drv[i];</div><div class='ctx'> 		if (drv-&gt;heads == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -305,25 +293,26 @@ static int cciss_proc_get_info(char *buffer, char **start, off_t offset,</div><div class='ctx'> </div><div class='ctx'> 		if (drv-&gt;raid_level &gt; 5)</div><div class='ctx'> 			drv-&gt;raid_level = RAID_UNKNOWN;</div><div class='del'>-		size = sprintf(buffer+len, "cciss/c%dd%d:"</div><div class='del'>-				"\t%4u.%02uGB\tRAID %s\n",</div><div class='del'>-				ctlr, i, (int)vol_sz, (int)vol_sz_frac,</div><div class='del'>-				raid_label[drv-&gt;raid_level]);</div><div class='del'>-                pos += size; len += size;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        *eof = 1;</div><div class='del'>-        *start = buffer+offset;</div><div class='del'>-        len -= offset;</div><div class='del'>-        if (len&gt;length)</div><div class='del'>-                len = length;</div><div class='add'>+		size = sprintf(buffer + len, "cciss/c%dd%d:"</div><div class='add'>+			       "\t%4u.%02uGB\tRAID %s\n",</div><div class='add'>+			       ctlr, i, (int)vol_sz, (int)vol_sz_frac,</div><div class='add'>+			       raid_label[drv-&gt;raid_level]);</div><div class='add'>+		pos += size;</div><div class='add'>+		len += size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*eof = 1;</div><div class='add'>+	*start = buffer + offset;</div><div class='add'>+	len -= offset;</div><div class='add'>+	if (len &gt; length)</div><div class='add'>+		len = length;</div><div class='ctx'> 	h-&gt;busy_configuring = 0;</div><div class='del'>-        return len;</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='del'>-cciss_proc_write(struct file *file, const char __user *buffer, </div><div class='del'>-			unsigned long count, void *data)</div><div class='add'>+static int</div><div class='add'>+cciss_proc_write(struct file *file, const char __user *buffer,</div><div class='add'>+		 unsigned long count, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char cmd[80];</div><div class='ctx'> 	int len;</div><div class='hunk'>@@ -332,20 +321,23 @@ cciss_proc_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 	int rc;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (count &gt; sizeof(cmd)-1) return -EINVAL;</div><div class='del'>-	if (copy_from_user(cmd, buffer, count)) return -EFAULT;</div><div class='add'>+	if (count &gt; sizeof(cmd) - 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (copy_from_user(cmd, buffer, count))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	cmd[count] = '\0';</div><div class='ctx'> 	len = strlen(cmd);	// above 3 lines ensure safety</div><div class='del'>-	if (len &amp;&amp; cmd[len-1] == '\n')</div><div class='add'>+	if (len &amp;&amp; cmd[len - 1] == '\n')</div><div class='ctx'> 		cmd[--len] = '\0';</div><div class='ctx'> #	ifdef CONFIG_CISS_SCSI_TAPE</div><div class='del'>-		if (strcmp("engage scsi", cmd)==0) {</div><div class='del'>-			rc = cciss_engage_scsi(h-&gt;ctlr);</div><div class='del'>-			if (rc != 0) return -rc;</div><div class='del'>-			return count;</div><div class='del'>-		}</div><div class='del'>-		/* might be nice to have "disengage" too, but it's not </div><div class='del'>-		   safely possible. (only 1 module use count, lock issues.) */</div><div class='add'>+	if (strcmp("engage scsi", cmd) == 0) {</div><div class='add'>+		rc = cciss_engage_scsi(h-&gt;ctlr);</div><div class='add'>+		if (rc != 0)</div><div class='add'>+			return -rc;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+	/* might be nice to have "disengage" too, but it's not</div><div class='add'>+	   safely possible. (only 1 module use count, lock issues.) */</div><div class='ctx'> #	endif</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -358,116 +350,113 @@ static void __devinit cciss_procinit(int i)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *pde;</div><div class='ctx'> </div><div class='del'>-        if (proc_cciss == NULL) {</div><div class='del'>-                proc_cciss = proc_mkdir("cciss", proc_root_driver);</div><div class='del'>-                if (!proc_cciss) </div><div class='add'>+	if (proc_cciss == NULL) {</div><div class='add'>+		proc_cciss = proc_mkdir("cciss", proc_root_driver);</div><div class='add'>+		if (!proc_cciss)</div><div class='ctx'> 			return;</div><div class='del'>-        }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pde = create_proc_read_entry(hba[i]-&gt;devname, </div><div class='del'>-		S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH, </div><div class='del'>-		proc_cciss, cciss_proc_get_info, hba[i]);</div><div class='add'>+	pde = create_proc_read_entry(hba[i]-&gt;devname,</div><div class='add'>+				     S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH,</div><div class='add'>+				     proc_cciss, cciss_proc_get_info, hba[i]);</div><div class='ctx'> 	pde-&gt;write_proc = cciss_proc_write;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif				/* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * For operations that cannot sleep, a command block is allocated at init, </div><div class='add'>+/*</div><div class='add'>+ * For operations that cannot sleep, a command block is allocated at init,</div><div class='ctx'>  * and managed by cmd_alloc() and cmd_free() using a simple bitmap to track</div><div class='del'>- * which ones are free or in use.  For operations that can wait for kmalloc </div><div class='del'>- * to possible sleep, this routine can be called with get_from_pool set to 0. </div><div class='del'>- * cmd_free() MUST be called with a got_from_pool set to 0 if cmd_alloc was. </div><div class='del'>- */ </div><div class='del'>-static CommandList_struct * cmd_alloc(ctlr_info_t *h, int get_from_pool)</div><div class='add'>+ * which ones are free or in use.  For operations that can wait for kmalloc</div><div class='add'>+ * to possible sleep, this routine can be called with get_from_pool set to 0.</div><div class='add'>+ * cmd_free() MUST be called with a got_from_pool set to 0 if cmd_alloc was.</div><div class='add'>+ */</div><div class='add'>+static CommandList_struct *cmd_alloc(ctlr_info_t *h, int get_from_pool)</div><div class='ctx'> {</div><div class='ctx'> 	CommandList_struct *c;</div><div class='del'>-	int i; </div><div class='add'>+	int i;</div><div class='ctx'> 	u64bit temp64;</div><div class='ctx'> 	dma_addr_t cmd_dma_handle, err_dma_handle;</div><div class='ctx'> </div><div class='del'>-	if (!get_from_pool)</div><div class='del'>-	{</div><div class='del'>-		c = (CommandList_struct *) pci_alloc_consistent(</div><div class='del'>-			h-&gt;pdev, sizeof(CommandList_struct), &amp;cmd_dma_handle); </div><div class='del'>-        	if(c==NULL)</div><div class='del'>-                 	return NULL;</div><div class='add'>+	if (!get_from_pool) {</div><div class='add'>+		c = (CommandList_struct *) pci_alloc_consistent(h-&gt;pdev,</div><div class='add'>+			sizeof(CommandList_struct), &amp;cmd_dma_handle);</div><div class='add'>+		if (c == NULL)</div><div class='add'>+			return NULL;</div><div class='ctx'> 		memset(c, 0, sizeof(CommandList_struct));</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;cmdindex = -1;</div><div class='ctx'> </div><div class='del'>-		c-&gt;err_info = (ErrorInfo_struct *)pci_alloc_consistent(</div><div class='del'>-					h-&gt;pdev, sizeof(ErrorInfo_struct), </div><div class='del'>-					&amp;err_dma_handle);</div><div class='del'>-	</div><div class='del'>-		if (c-&gt;err_info == NULL)</div><div class='del'>-		{</div><div class='del'>-			pci_free_consistent(h-&gt;pdev, </div><div class='add'>+		c-&gt;err_info = (ErrorInfo_struct *)</div><div class='add'>+		    pci_alloc_consistent(h-&gt;pdev, sizeof(ErrorInfo_struct),</div><div class='add'>+			    &amp;err_dma_handle);</div><div class='add'>+</div><div class='add'>+		if (c-&gt;err_info == NULL) {</div><div class='add'>+			pci_free_consistent(h-&gt;pdev,</div><div class='ctx'> 				sizeof(CommandList_struct), c, cmd_dma_handle);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(c-&gt;err_info, 0, sizeof(ErrorInfo_struct));</div><div class='del'>-	} else /* get it out of the controllers pool */ </div><div class='del'>-	{</div><div class='del'>-	     	do {</div><div class='del'>-                	i = find_first_zero_bit(h-&gt;cmd_pool_bits, NR_CMDS);</div><div class='del'>-                        if (i == NR_CMDS)</div><div class='del'>-                                return NULL;</div><div class='del'>-                } while(test_and_set_bit(i &amp; (BITS_PER_LONG - 1), h-&gt;cmd_pool_bits+(i/BITS_PER_LONG)) != 0);</div><div class='add'>+	} else {		/* get it out of the controllers pool */</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			i = find_first_zero_bit(h-&gt;cmd_pool_bits, NR_CMDS);</div><div class='add'>+			if (i == NR_CMDS)</div><div class='add'>+				return NULL;</div><div class='add'>+		} while (test_and_set_bit</div><div class='add'>+			 (i &amp; (BITS_PER_LONG - 1),</div><div class='add'>+			  h-&gt;cmd_pool_bits + (i / BITS_PER_LONG)) != 0);</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 		printk(KERN_DEBUG "cciss: using command buffer %d\n", i);</div><div class='ctx'> #endif</div><div class='del'>-                c = h-&gt;cmd_pool + i;</div><div class='add'>+		c = h-&gt;cmd_pool + i;</div><div class='ctx'> 		memset(c, 0, sizeof(CommandList_struct));</div><div class='del'>-		cmd_dma_handle = h-&gt;cmd_pool_dhandle </div><div class='del'>-					+ i*sizeof(CommandList_struct);</div><div class='add'>+		cmd_dma_handle = h-&gt;cmd_pool_dhandle</div><div class='add'>+		    + i * sizeof(CommandList_struct);</div><div class='ctx'> 		c-&gt;err_info = h-&gt;errinfo_pool + i;</div><div class='ctx'> 		memset(c-&gt;err_info, 0, sizeof(ErrorInfo_struct));</div><div class='del'>-		err_dma_handle = h-&gt;errinfo_pool_dhandle </div><div class='del'>-					+ i*sizeof(ErrorInfo_struct);</div><div class='del'>-                h-&gt;nr_allocs++;</div><div class='add'>+		err_dma_handle = h-&gt;errinfo_pool_dhandle</div><div class='add'>+		    + i * sizeof(ErrorInfo_struct);</div><div class='add'>+		h-&gt;nr_allocs++;</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;cmdindex = i;</div><div class='del'>-        }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;busaddr = (__u32) cmd_dma_handle;</div><div class='del'>-	temp64.val = (__u64) err_dma_handle;	</div><div class='add'>+	temp64.val = (__u64) err_dma_handle;</div><div class='ctx'> 	c-&gt;ErrDesc.Addr.lower = temp64.val32.lower;</div><div class='ctx'> 	c-&gt;ErrDesc.Addr.upper = temp64.val32.upper;</div><div class='ctx'> 	c-&gt;ErrDesc.Len = sizeof(ErrorInfo_struct);</div><div class='del'>-	</div><div class='del'>-	c-&gt;ctlr = h-&gt;ctlr;</div><div class='del'>-        return c;</div><div class='del'>-</div><div class='ctx'> </div><div class='add'>+	c-&gt;ctlr = h-&gt;ctlr;</div><div class='add'>+	return c;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Frees a command block that was previously allocated with cmd_alloc(). </div><div class='add'>+/*</div><div class='add'>+ * Frees a command block that was previously allocated with cmd_alloc().</div><div class='ctx'>  */</div><div class='ctx'> static void cmd_free(ctlr_info_t *h, CommandList_struct *c, int got_from_pool)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u64bit temp64;</div><div class='ctx'> </div><div class='del'>-	if( !got_from_pool)</div><div class='del'>-	{ </div><div class='add'>+	if (!got_from_pool) {</div><div class='ctx'> 		temp64.val32.lower = c-&gt;ErrDesc.Addr.lower;</div><div class='ctx'> 		temp64.val32.upper = c-&gt;ErrDesc.Addr.upper;</div><div class='del'>-		pci_free_consistent(h-&gt;pdev, sizeof(ErrorInfo_struct), </div><div class='del'>-			c-&gt;err_info, (dma_addr_t) temp64.val);</div><div class='del'>-		pci_free_consistent(h-&gt;pdev, sizeof(CommandList_struct), </div><div class='del'>-			c, (dma_addr_t) c-&gt;busaddr);</div><div class='del'>-	} else </div><div class='del'>-	{</div><div class='add'>+		pci_free_consistent(h-&gt;pdev, sizeof(ErrorInfo_struct),</div><div class='add'>+				    c-&gt;err_info, (dma_addr_t) temp64.val);</div><div class='add'>+		pci_free_consistent(h-&gt;pdev, sizeof(CommandList_struct),</div><div class='add'>+				    c, (dma_addr_t) c-&gt;busaddr);</div><div class='add'>+	} else {</div><div class='ctx'> 		i = c - h-&gt;cmd_pool;</div><div class='del'>-		clear_bit(i&amp;(BITS_PER_LONG-1), h-&gt;cmd_pool_bits+(i/BITS_PER_LONG));</div><div class='del'>-                h-&gt;nr_frees++;</div><div class='del'>-        }</div><div class='add'>+		clear_bit(i &amp; (BITS_PER_LONG - 1),</div><div class='add'>+			  h-&gt;cmd_pool_bits + (i / BITS_PER_LONG));</div><div class='add'>+		h-&gt;nr_frees++;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline ctlr_info_t *get_host(struct gendisk *disk)</div><div class='ctx'> {</div><div class='del'>-	return disk-&gt;queue-&gt;queuedata; </div><div class='add'>+	return disk-&gt;queue-&gt;queuedata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline drive_info_struct *get_drv(struct gendisk *disk)</div><div class='hunk'>@@ -485,7 +474,7 @@ static int cciss_open(struct inode *inode, struct file *filep)</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk(KERN_DEBUG "cciss_open %s\n", inode-&gt;i_bdev-&gt;bd_disk-&gt;disk_name);</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;busy_initializing || drv-&gt;busy_configuring)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -498,10 +487,10 @@ static int cciss_open(struct inode *inode, struct file *filep)</div><div class='ctx'> 	 * for "raw controller".</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (drv-&gt;nr_blocks == 0) {</div><div class='del'>-		if (iminor(inode) != 0)	{ 	/* not node 0? */</div><div class='add'>+		if (iminor(inode) != 0) {	/* not node 0? */</div><div class='ctx'> 			/* if not node 0 make sure it is a partition = 0 */</div><div class='ctx'> 			if (iminor(inode) &amp; 0x0f) {</div><div class='del'>-			return -ENXIO;</div><div class='add'>+				return -ENXIO;</div><div class='ctx'> 				/* if it is, make sure we have a LUN ID */</div><div class='ctx'> 			} else if (drv-&gt;LunID == 0) {</div><div class='ctx'> 				return -ENXIO;</div><div class='hunk'>@@ -514,6 +503,7 @@ static int cciss_open(struct inode *inode, struct file *filep)</div><div class='ctx'> 	host-&gt;usage_count++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Close.  Sync first.</div><div class='ctx'>  */</div><div class='hunk'>@@ -523,8 +513,9 @@ static int cciss_release(struct inode *inode, struct file *filep)</div><div class='ctx'> 	drive_info_struct *drv = get_drv(inode-&gt;i_bdev-&gt;bd_disk);</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "cciss_release %s\n", inode-&gt;i_bdev-&gt;bd_disk-&gt;disk_name);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+	printk(KERN_DEBUG "cciss_release %s\n",</div><div class='add'>+	       inode-&gt;i_bdev-&gt;bd_disk-&gt;disk_name);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	drv-&gt;usage_count--;</div><div class='ctx'> 	host-&gt;usage_count--;</div><div class='hunk'>@@ -542,8 +533,10 @@ static int do_ioctl(struct file *f, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long arg);</div><div class='del'>-static int cciss_ioctl32_big_passthru(struct file *f, unsigned cmd, unsigned long arg);</div><div class='add'>+static int cciss_ioctl32_passthru(struct file *f, unsigned cmd,</div><div class='add'>+				  unsigned long arg);</div><div class='add'>+static int cciss_ioctl32_big_passthru(struct file *f, unsigned cmd,</div><div class='add'>+				      unsigned long arg);</div><div class='ctx'> </div><div class='ctx'> static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -575,19 +568,26 @@ static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long arg)</div><div class='add'>+static int cciss_ioctl32_passthru(struct file *f, unsigned cmd,</div><div class='add'>+				  unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	IOCTL32_Command_struct __user *arg32 =</div><div class='del'>-		(IOCTL32_Command_struct __user *) arg;</div><div class='add'>+	    (IOCTL32_Command_struct __user *) arg;</div><div class='ctx'> 	IOCTL_Command_struct arg64;</div><div class='ctx'> 	IOCTL_Command_struct __user *p = compat_alloc_user_space(sizeof(arg64));</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 cp;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	err |= copy_from_user(&amp;arg64.LUN_info, &amp;arg32-&gt;LUN_info, sizeof(arg64.LUN_info));</div><div class='del'>-	err |= copy_from_user(&amp;arg64.Request, &amp;arg32-&gt;Request, sizeof(arg64.Request));</div><div class='del'>-	err |= copy_from_user(&amp;arg64.error_info, &amp;arg32-&gt;error_info, sizeof(arg64.error_info));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_from_user(&amp;arg64.LUN_info, &amp;arg32-&gt;LUN_info,</div><div class='add'>+			   sizeof(arg64.LUN_info));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_from_user(&amp;arg64.Request, &amp;arg32-&gt;Request,</div><div class='add'>+			   sizeof(arg64.Request));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_from_user(&amp;arg64.error_info, &amp;arg32-&gt;error_info,</div><div class='add'>+			   sizeof(arg64.error_info));</div><div class='ctx'> 	err |= get_user(arg64.buf_size, &amp;arg32-&gt;buf_size);</div><div class='ctx'> 	err |= get_user(cp, &amp;arg32-&gt;buf);</div><div class='ctx'> 	arg64.buf = compat_ptr(cp);</div><div class='hunk'>@@ -596,28 +596,38 @@ static int cciss_ioctl32_passthru(struct file *f, unsigned cmd, unsigned long ar</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	err = do_ioctl(f, CCISS_PASSTHRU, (unsigned long) p);</div><div class='add'>+	err = do_ioctl(f, CCISS_PASSTHRU, (unsigned long)p);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	err |= copy_in_user(&amp;arg32-&gt;error_info, &amp;p-&gt;error_info, sizeof(arg32-&gt;error_info));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_in_user(&amp;arg32-&gt;error_info, &amp;p-&gt;error_info,</div><div class='add'>+			 sizeof(arg32-&gt;error_info));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd, unsigned long arg)</div><div class='add'>+static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd,</div><div class='add'>+				      unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	BIG_IOCTL32_Command_struct __user *arg32 =</div><div class='del'>-		(BIG_IOCTL32_Command_struct __user *) arg;</div><div class='add'>+	    (BIG_IOCTL32_Command_struct __user *) arg;</div><div class='ctx'> 	BIG_IOCTL_Command_struct arg64;</div><div class='del'>-	BIG_IOCTL_Command_struct __user *p = compat_alloc_user_space(sizeof(arg64));</div><div class='add'>+	BIG_IOCTL_Command_struct __user *p =</div><div class='add'>+	    compat_alloc_user_space(sizeof(arg64));</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 cp;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	err |= copy_from_user(&amp;arg64.LUN_info, &amp;arg32-&gt;LUN_info, sizeof(arg64.LUN_info));</div><div class='del'>-	err |= copy_from_user(&amp;arg64.Request, &amp;arg32-&gt;Request, sizeof(arg64.Request));</div><div class='del'>-	err |= copy_from_user(&amp;arg64.error_info, &amp;arg32-&gt;error_info, sizeof(arg64.error_info));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_from_user(&amp;arg64.LUN_info, &amp;arg32-&gt;LUN_info,</div><div class='add'>+			   sizeof(arg64.LUN_info));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_from_user(&amp;arg64.Request, &amp;arg32-&gt;Request,</div><div class='add'>+			   sizeof(arg64.Request));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_from_user(&amp;arg64.error_info, &amp;arg32-&gt;error_info,</div><div class='add'>+			   sizeof(arg64.error_info));</div><div class='ctx'> 	err |= get_user(arg64.buf_size, &amp;arg32-&gt;buf_size);</div><div class='ctx'> 	err |= get_user(arg64.malloc_size, &amp;arg32-&gt;malloc_size);</div><div class='ctx'> 	err |= get_user(cp, &amp;arg32-&gt;buf);</div><div class='hunk'>@@ -625,12 +635,14 @@ static int cciss_ioctl32_big_passthru(struct file *file, unsigned cmd, unsigned</div><div class='ctx'> 	err |= copy_to_user(p, &amp;arg64, sizeof(arg64));</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		 return -EFAULT;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	err = do_ioctl(file, CCISS_BIG_PASSTHRU, (unsigned long) p);</div><div class='add'>+	err = do_ioctl(file, CCISS_BIG_PASSTHRU, (unsigned long)p);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	err |= copy_in_user(&amp;arg32-&gt;error_info, &amp;p-&gt;error_info, sizeof(arg32-&gt;error_info));</div><div class='add'>+	err |=</div><div class='add'>+	    copy_in_user(&amp;arg32-&gt;error_info, &amp;p-&gt;error_info,</div><div class='add'>+			 sizeof(arg32-&gt;error_info));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -651,10 +663,10 @@ static int cciss_getgeo(struct block_device *bdev, struct hd_geometry *geo)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ioctl </div><div class='add'>+ * ioctl</div><div class='ctx'>  */</div><div class='del'>-static int cciss_ioctl(struct inode *inode, struct file *filep, </div><div class='del'>-		unsigned int cmd, unsigned long arg)</div><div class='add'>+static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='add'>+		       unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev = inode-&gt;i_bdev;</div><div class='ctx'> 	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='hunk'>@@ -665,171 +677,193 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk(KERN_DEBUG "cciss_ioctl: Called with cmd=%x %lx\n", cmd, arg);</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='del'>-	</div><div class='del'>-	switch(cmd) {</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='ctx'> 	case CCISS_GETPCIINFO:</div><div class='del'>-	{</div><div class='del'>-		cciss_pci_info_struct pciinfo;</div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-		pciinfo.domain = pci_domain_nr(host-&gt;pdev-&gt;bus);</div><div class='del'>-		pciinfo.bus = host-&gt;pdev-&gt;bus-&gt;number;</div><div class='del'>-		pciinfo.dev_fn = host-&gt;pdev-&gt;devfn;</div><div class='del'>-		pciinfo.board_id = host-&gt;board_id;</div><div class='del'>-		if (copy_to_user(argp, &amp;pciinfo,  sizeof( cciss_pci_info_struct )))</div><div class='del'>-			return  -EFAULT;</div><div class='del'>-		return(0);</div><div class='del'>-	}	</div><div class='add'>+		{</div><div class='add'>+			cciss_pci_info_struct pciinfo;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			pciinfo.domain = pci_domain_nr(host-&gt;pdev-&gt;bus);</div><div class='add'>+			pciinfo.bus = host-&gt;pdev-&gt;bus-&gt;number;</div><div class='add'>+			pciinfo.dev_fn = host-&gt;pdev-&gt;devfn;</div><div class='add'>+			pciinfo.board_id = host-&gt;board_id;</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, &amp;pciinfo, sizeof(cciss_pci_info_struct)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case CCISS_GETINTINFO:</div><div class='del'>-	{</div><div class='del'>-		cciss_coalint_struct intinfo;</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-		intinfo.delay = readl(&amp;host-&gt;cfgtable-&gt;HostWrite.CoalIntDelay);</div><div class='del'>-		intinfo.count = readl(&amp;host-&gt;cfgtable-&gt;HostWrite.CoalIntCount);</div><div class='del'>-		if (copy_to_user(argp, &amp;intinfo, sizeof( cciss_coalint_struct )))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='add'>+		{</div><div class='add'>+			cciss_coalint_struct intinfo;</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			intinfo.delay =</div><div class='add'>+			    readl(&amp;host-&gt;cfgtable-&gt;HostWrite.CoalIntDelay);</div><div class='add'>+			intinfo.count =</div><div class='add'>+			    readl(&amp;host-&gt;cfgtable-&gt;HostWrite.CoalIntCount);</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, &amp;intinfo, sizeof(cciss_coalint_struct)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case CCISS_SETINTINFO:</div><div class='del'>-        {</div><div class='del'>-                cciss_coalint_struct intinfo;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;	</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN)) return -EPERM;</div><div class='del'>-		if (copy_from_user(&amp;intinfo, argp, sizeof( cciss_coalint_struct)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if ( (intinfo.delay == 0 ) &amp;&amp; (intinfo.count == 0))</div><div class='del'>-</div><div class='ctx'> 		{</div><div class='del'>-//			printk("cciss_ioctl: delay and count cannot be 0\n");</div><div class='del'>-			return( -EINVAL);</div><div class='add'>+			cciss_coalint_struct intinfo;</div><div class='add'>+			unsigned long flags;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+				return -EPERM;</div><div class='add'>+			if (copy_from_user</div><div class='add'>+			    (&amp;intinfo, argp, sizeof(cciss_coalint_struct)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			if ((intinfo.delay == 0) &amp;&amp; (intinfo.count == 0))</div><div class='add'>+			{</div><div class='add'>+//                      printk("cciss_ioctl: delay and count cannot be 0\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			/* Update the field, and then ring the doorbell */</div><div class='add'>+			writel(intinfo.delay,</div><div class='add'>+			       &amp;(host-&gt;cfgtable-&gt;HostWrite.CoalIntDelay));</div><div class='add'>+			writel(intinfo.count,</div><div class='add'>+			       &amp;(host-&gt;cfgtable-&gt;HostWrite.CoalIntCount));</div><div class='add'>+			writel(CFGTBL_ChangeReq, host-&gt;vaddr + SA5_DOORBELL);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; MAX_IOCTL_CONFIG_WAIT; i++) {</div><div class='add'>+				if (!(readl(host-&gt;vaddr + SA5_DOORBELL)</div><div class='add'>+				      &amp; CFGTBL_ChangeReq))</div><div class='add'>+					break;</div><div class='add'>+				/* delay and try again */</div><div class='add'>+				udelay(1000);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			if (i &gt;= MAX_IOCTL_CONFIG_WAIT)</div><div class='add'>+				return -EAGAIN;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='del'>-		/* Update the field, and then ring the doorbell */ </div><div class='del'>-		writel( intinfo.delay, </div><div class='del'>-			&amp;(host-&gt;cfgtable-&gt;HostWrite.CoalIntDelay));</div><div class='del'>-		writel( intinfo.count, </div><div class='del'>-                        &amp;(host-&gt;cfgtable-&gt;HostWrite.CoalIntCount));</div><div class='del'>-		writel( CFGTBL_ChangeReq, host-&gt;vaddr + SA5_DOORBELL);</div><div class='del'>-</div><div class='del'>-		for(i=0;i&lt;MAX_IOCTL_CONFIG_WAIT;i++) {</div><div class='del'>-			if (!(readl(host-&gt;vaddr + SA5_DOORBELL) </div><div class='del'>-					&amp; CFGTBL_ChangeReq))</div><div class='del'>-				break;</div><div class='del'>-			/* delay and try again */</div><div class='del'>-			udelay(1000);</div><div class='del'>-		}	</div><div class='del'>-		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='del'>-		if (i &gt;= MAX_IOCTL_CONFIG_WAIT)</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='ctx'> 	case CCISS_GETNODENAME:</div><div class='del'>-        {</div><div class='del'>-                NodeName_type NodeName;</div><div class='del'>-		int i; </div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-		for(i=0;i&lt;16;i++)</div><div class='del'>-			NodeName[i] = readb(&amp;host-&gt;cfgtable-&gt;ServerName[i]);</div><div class='del'>-                if (copy_to_user(argp, NodeName, sizeof( NodeName_type)))</div><div class='del'>-                	return  -EFAULT;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='add'>+		{</div><div class='add'>+			NodeName_type NodeName;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			for (i = 0; i &lt; 16; i++)</div><div class='add'>+				NodeName[i] =</div><div class='add'>+				    readb(&amp;host-&gt;cfgtable-&gt;ServerName[i]);</div><div class='add'>+			if (copy_to_user(argp, NodeName, sizeof(NodeName_type)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case CCISS_SETNODENAME:</div><div class='del'>-	{</div><div class='del'>-		NodeName_type NodeName;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-		if (!capable(CAP_SYS_ADMIN)) return -EPERM;</div><div class='del'>-		</div><div class='del'>-		if (copy_from_user(NodeName, argp, sizeof( NodeName_type)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='del'>-</div><div class='del'>-			/* Update the field, and then ring the doorbell */ </div><div class='del'>-		for(i=0;i&lt;16;i++)</div><div class='del'>-			writeb( NodeName[i], &amp;host-&gt;cfgtable-&gt;ServerName[i]);</div><div class='del'>-			</div><div class='del'>-		writel( CFGTBL_ChangeReq, host-&gt;vaddr + SA5_DOORBELL);</div><div class='del'>-</div><div class='del'>-		for(i=0;i&lt;MAX_IOCTL_CONFIG_WAIT;i++) {</div><div class='del'>-			if (!(readl(host-&gt;vaddr + SA5_DOORBELL) </div><div class='del'>-					&amp; CFGTBL_ChangeReq))</div><div class='del'>-				break;</div><div class='del'>-			/* delay and try again */</div><div class='del'>-			udelay(1000);</div><div class='del'>-		}	</div><div class='del'>-		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='del'>-		if (i &gt;= MAX_IOCTL_CONFIG_WAIT)</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='add'>+		{</div><div class='add'>+			NodeName_type NodeName;</div><div class='add'>+			unsigned long flags;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+				return -EPERM;</div><div class='add'>+</div><div class='add'>+			if (copy_from_user</div><div class='add'>+			    (NodeName, argp, sizeof(NodeName_type)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='add'>+</div><div class='add'>+			/* Update the field, and then ring the doorbell */</div><div class='add'>+			for (i = 0; i &lt; 16; i++)</div><div class='add'>+				writeb(NodeName[i],</div><div class='add'>+				       &amp;host-&gt;cfgtable-&gt;ServerName[i]);</div><div class='add'>+</div><div class='add'>+			writel(CFGTBL_ChangeReq, host-&gt;vaddr + SA5_DOORBELL);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; MAX_IOCTL_CONFIG_WAIT; i++) {</div><div class='add'>+				if (!(readl(host-&gt;vaddr + SA5_DOORBELL)</div><div class='add'>+				      &amp; CFGTBL_ChangeReq))</div><div class='add'>+					break;</div><div class='add'>+				/* delay and try again */</div><div class='add'>+				udelay(1000);</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			if (i &gt;= MAX_IOCTL_CONFIG_WAIT)</div><div class='add'>+				return -EAGAIN;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	case CCISS_GETHEARTBEAT:</div><div class='del'>-        {</div><div class='del'>-                Heartbeat_type heartbeat;</div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-                heartbeat = readl(&amp;host-&gt;cfgtable-&gt;HeartBeat);</div><div class='del'>-                if (copy_to_user(argp, &amp;heartbeat, sizeof( Heartbeat_type)))</div><div class='del'>-                	return -EFAULT;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='add'>+		{</div><div class='add'>+			Heartbeat_type heartbeat;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			heartbeat = readl(&amp;host-&gt;cfgtable-&gt;HeartBeat);</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, &amp;heartbeat, sizeof(Heartbeat_type)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case CCISS_GETBUSTYPES:</div><div class='del'>-        {</div><div class='del'>-                BusTypes_type BusTypes;</div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-                BusTypes = readl(&amp;host-&gt;cfgtable-&gt;BusTypes);</div><div class='del'>-                if (copy_to_user(argp, &amp;BusTypes, sizeof( BusTypes_type) ))</div><div class='del'>-                	return  -EFAULT;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='add'>+		{</div><div class='add'>+			BusTypes_type BusTypes;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			BusTypes = readl(&amp;host-&gt;cfgtable-&gt;BusTypes);</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, &amp;BusTypes, sizeof(BusTypes_type)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case CCISS_GETFIRMVER:</div><div class='del'>-        {</div><div class='del'>-		FirmwareVer_type firmware;</div><div class='add'>+		{</div><div class='add'>+			FirmwareVer_type firmware;</div><div class='ctx'> </div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-		memcpy(firmware, host-&gt;firm_ver, 4);</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			memcpy(firmware, host-&gt;firm_ver, 4);</div><div class='ctx'> </div><div class='del'>-                if (copy_to_user(argp, firmware, sizeof( FirmwareVer_type)))</div><div class='del'>-                	return -EFAULT;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='del'>-        case CCISS_GETDRIVVER:</div><div class='del'>-        {</div><div class='del'>-		DriverVer_type DriverVer = DRIVER_VERSION;</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, firmware, sizeof(FirmwareVer_type)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	case CCISS_GETDRIVVER:</div><div class='add'>+		{</div><div class='add'>+			DriverVer_type DriverVer = DRIVER_VERSION;</div><div class='ctx'> </div><div class='del'>-                if (!arg) return -EINVAL;</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-                if (copy_to_user(argp, &amp;DriverVer, sizeof( DriverVer_type) ))</div><div class='del'>-                	return -EFAULT;</div><div class='del'>-                return(0);</div><div class='del'>-        }</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, &amp;DriverVer, sizeof(DriverVer_type)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	case CCISS_REVALIDVOLS:</div><div class='ctx'> 		if (bdev != bdev-&gt;bd_contains || drv != host-&gt;drv)</div><div class='ctx'> 			return -ENXIO;</div><div class='del'>-                return revalidate_allvol(host);</div><div class='del'>-</div><div class='del'>- 	case CCISS_GETLUNINFO: {</div><div class='del'>- 		LogvolInfo_struct luninfo;</div><div class='del'>- 		</div><div class='del'>- 		luninfo.LunID = drv-&gt;LunID;</div><div class='del'>- 		luninfo.num_opens = drv-&gt;usage_count;</div><div class='del'>- 		luninfo.num_parts = 0;</div><div class='del'>- 		if (copy_to_user(argp, &amp;luninfo,</div><div class='del'>- 				sizeof(LogvolInfo_struct)))</div><div class='del'>- 			return -EFAULT;</div><div class='del'>- 		return(0);</div><div class='del'>- 	}</div><div class='add'>+		return revalidate_allvol(host);</div><div class='add'>+</div><div class='add'>+	case CCISS_GETLUNINFO:{</div><div class='add'>+			LogvolInfo_struct luninfo;</div><div class='add'>+</div><div class='add'>+			luninfo.LunID = drv-&gt;LunID;</div><div class='add'>+			luninfo.num_opens = drv-&gt;usage_count;</div><div class='add'>+			luninfo.num_parts = 0;</div><div class='add'>+			if (copy_to_user(argp, &amp;luninfo,</div><div class='add'>+					 sizeof(LogvolInfo_struct)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	case CCISS_DEREGDISK:</div><div class='ctx'> 		return rebuild_lun_table(host, disk);</div><div class='ctx'> </div><div class='hunk'>@@ -837,278 +871,284 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> 		return rebuild_lun_table(host, NULL);</div><div class='ctx'> </div><div class='ctx'> 	case CCISS_PASSTHRU:</div><div class='del'>-	{</div><div class='del'>-		IOCTL_Command_struct iocommand;</div><div class='del'>-		CommandList_struct *c;</div><div class='del'>-		char 	*buff = NULL;</div><div class='del'>-		u64bit	temp64;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		DECLARE_COMPLETION(wait);</div><div class='del'>-</div><div class='del'>-		if (!arg) return -EINVAL;</div><div class='del'>-	</div><div class='del'>-		if (!capable(CAP_SYS_RAWIO)) return -EPERM;</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(&amp;iocommand, argp, sizeof( IOCTL_Command_struct) ))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if((iocommand.buf_size &lt; 1) &amp;&amp; </div><div class='del'>-				(iocommand.Request.Type.Direction != XFER_NONE))</div><div class='del'>-		{	</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		} </div><div class='del'>-#if 0 /* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */</div><div class='del'>-		/* Check kmalloc limits */</div><div class='del'>-		if(iocommand.buf_size &gt; 128000)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-#endif</div><div class='del'>-		if(iocommand.buf_size &gt; 0)</div><div class='del'>-		{</div><div class='del'>-			buff =  kmalloc(iocommand.buf_size, GFP_KERNEL);</div><div class='del'>-			if( buff == NULL) </div><div class='del'>-				return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		if (iocommand.Request.Type.Direction == XFER_WRITE)</div><div class='del'>-		{</div><div class='del'>-			/* Copy the data into the buffer we created */ </div><div class='del'>-			if (copy_from_user(buff, iocommand.buf, iocommand.buf_size))</div><div class='del'>-			{</div><div class='del'>-				kfree(buff);</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			memset(buff, 0, iocommand.buf_size);</div><div class='del'>-		}</div><div class='del'>-		if ((c = cmd_alloc(host , 0)) == NULL)</div><div class='del'>-		{</div><div class='del'>-			kfree(buff);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-			// Fill in the command type </div><div class='del'>-		c-&gt;cmd_type = CMD_IOCTL_PEND;</div><div class='del'>-			// Fill in Command Header </div><div class='del'>-		c-&gt;Header.ReplyQueue = 0;  // unused in simple mode</div><div class='del'>-		if( iocommand.buf_size &gt; 0) 	// buffer to fill </div><div class='ctx'> 		{</div><div class='del'>-			c-&gt;Header.SGList = 1;</div><div class='del'>-			c-&gt;Header.SGTotal= 1;</div><div class='del'>-		} else	// no buffers to fill  </div><div class='del'>-		{</div><div class='del'>-			c-&gt;Header.SGList = 0;</div><div class='del'>-                	c-&gt;Header.SGTotal= 0;</div><div class='del'>-		}</div><div class='del'>-		c-&gt;Header.LUN = iocommand.LUN_info;</div><div class='del'>-		c-&gt;Header.Tag.lower = c-&gt;busaddr;  // use the kernel address the cmd block for tag</div><div class='del'>-		</div><div class='del'>-		// Fill in Request block </div><div class='del'>-		c-&gt;Request = iocommand.Request; </div><div class='del'>-	</div><div class='del'>-		// Fill in the scatter gather information</div><div class='del'>-		if (iocommand.buf_size &gt; 0 ) </div><div class='del'>-		{</div><div class='del'>-			temp64.val = pci_map_single( host-&gt;pdev, buff,</div><div class='del'>-                                        iocommand.buf_size, </div><div class='del'>-                                PCI_DMA_BIDIRECTIONAL);	</div><div class='del'>-			c-&gt;SG[0].Addr.lower = temp64.val32.lower;</div><div class='del'>-			c-&gt;SG[0].Addr.upper = temp64.val32.upper;</div><div class='del'>-			c-&gt;SG[0].Len = iocommand.buf_size;</div><div class='del'>-			c-&gt;SG[0].Ext = 0;  // we are not chaining</div><div class='del'>-		}</div><div class='del'>-		c-&gt;waiting = &amp;wait;</div><div class='add'>+			IOCTL_Command_struct iocommand;</div><div class='add'>+			CommandList_struct *c;</div><div class='add'>+			char *buff = NULL;</div><div class='add'>+			u64bit temp64;</div><div class='add'>+			unsigned long flags;</div><div class='add'>+			DECLARE_COMPLETION(wait);</div><div class='ctx'> </div><div class='del'>-		/* Put the request on the tail of the request queue */</div><div class='del'>-		spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='del'>-		addQ(&amp;host-&gt;reqQ, c);</div><div class='del'>-		host-&gt;Qdepth++;</div><div class='del'>-		start_io(host);</div><div class='del'>-		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		wait_for_completion(&amp;wait);</div><div class='add'>+			if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+				return -EPERM;</div><div class='ctx'> </div><div class='del'>-		/* unlock the buffers from DMA */</div><div class='del'>-		temp64.val32.lower = c-&gt;SG[0].Addr.lower;</div><div class='del'>-                temp64.val32.upper = c-&gt;SG[0].Addr.upper;</div><div class='del'>-                pci_unmap_single( host-&gt;pdev, (dma_addr_t) temp64.val,</div><div class='del'>-                	iocommand.buf_size, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+			if (copy_from_user</div><div class='add'>+			    (&amp;iocommand, argp, sizeof(IOCTL_Command_struct)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			if ((iocommand.buf_size &lt; 1) &amp;&amp;</div><div class='add'>+			    (iocommand.Request.Type.Direction != XFER_NONE)) {</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+#if 0				/* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */</div><div class='add'>+			/* Check kmalloc limits */</div><div class='add'>+			if (iocommand.buf_size &gt; 128000)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+#endif</div><div class='add'>+			if (iocommand.buf_size &gt; 0) {</div><div class='add'>+				buff = kmalloc(iocommand.buf_size, GFP_KERNEL);</div><div class='add'>+				if (buff == NULL)</div><div class='add'>+					return -EFAULT;</div><div class='add'>+			}</div><div class='add'>+			if (iocommand.Request.Type.Direction == XFER_WRITE) {</div><div class='add'>+				/* Copy the data into the buffer we created */</div><div class='add'>+				if (copy_from_user</div><div class='add'>+				    (buff, iocommand.buf, iocommand.buf_size)) {</div><div class='add'>+					kfree(buff);</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				memset(buff, 0, iocommand.buf_size);</div><div class='add'>+			}</div><div class='add'>+			if ((c = cmd_alloc(host, 0)) == NULL) {</div><div class='add'>+				kfree(buff);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+			// Fill in the command type</div><div class='add'>+			c-&gt;cmd_type = CMD_IOCTL_PEND;</div><div class='add'>+			// Fill in Command Header</div><div class='add'>+			c-&gt;Header.ReplyQueue = 0;	// unused in simple mode</div><div class='add'>+			if (iocommand.buf_size &gt; 0)	// buffer to fill</div><div class='add'>+			{</div><div class='add'>+				c-&gt;Header.SGList = 1;</div><div class='add'>+				c-&gt;Header.SGTotal = 1;</div><div class='add'>+			} else	// no buffers to fill</div><div class='add'>+			{</div><div class='add'>+				c-&gt;Header.SGList = 0;</div><div class='add'>+				c-&gt;Header.SGTotal = 0;</div><div class='add'>+			}</div><div class='add'>+			c-&gt;Header.LUN = iocommand.LUN_info;</div><div class='add'>+			c-&gt;Header.Tag.lower = c-&gt;busaddr;	// use the kernel address the cmd block for tag</div><div class='ctx'> </div><div class='del'>-		/* Copy the error information out */ </div><div class='del'>-		iocommand.error_info = *(c-&gt;err_info);</div><div class='del'>-		if ( copy_to_user(argp, &amp;iocommand, sizeof( IOCTL_Command_struct) ) )</div><div class='del'>-		{</div><div class='del'>-			kfree(buff);</div><div class='del'>-			cmd_free(host, c, 0);</div><div class='del'>-			return( -EFAULT);	</div><div class='del'>-		} 	</div><div class='add'>+			// Fill in Request block</div><div class='add'>+			c-&gt;Request = iocommand.Request;</div><div class='ctx'> </div><div class='del'>-		if (iocommand.Request.Type.Direction == XFER_READ)</div><div class='del'>-                {</div><div class='del'>-                        /* Copy the data out of the buffer we created */</div><div class='del'>-                        if (copy_to_user(iocommand.buf, buff, iocommand.buf_size))</div><div class='del'>-			{</div><div class='del'>-                        	kfree(buff);</div><div class='add'>+			// Fill in the scatter gather information</div><div class='add'>+			if (iocommand.buf_size &gt; 0) {</div><div class='add'>+				temp64.val = pci_map_single(host-&gt;pdev, buff,</div><div class='add'>+					iocommand.buf_size,</div><div class='add'>+					PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+				c-&gt;SG[0].Addr.lower = temp64.val32.lower;</div><div class='add'>+				c-&gt;SG[0].Addr.upper = temp64.val32.upper;</div><div class='add'>+				c-&gt;SG[0].Len = iocommand.buf_size;</div><div class='add'>+				c-&gt;SG[0].Ext = 0;	// we are not chaining</div><div class='add'>+			}</div><div class='add'>+			c-&gt;waiting = &amp;wait;</div><div class='add'>+</div><div class='add'>+			/* Put the request on the tail of the request queue */</div><div class='add'>+			spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			addQ(&amp;host-&gt;reqQ, c);</div><div class='add'>+			host-&gt;Qdepth++;</div><div class='add'>+			start_io(host);</div><div class='add'>+			spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='add'>+</div><div class='add'>+			wait_for_completion(&amp;wait);</div><div class='add'>+</div><div class='add'>+			/* unlock the buffers from DMA */</div><div class='add'>+			temp64.val32.lower = c-&gt;SG[0].Addr.lower;</div><div class='add'>+			temp64.val32.upper = c-&gt;SG[0].Addr.upper;</div><div class='add'>+			pci_unmap_single(host-&gt;pdev, (dma_addr_t) temp64.val,</div><div class='add'>+					 iocommand.buf_size,</div><div class='add'>+					 PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+			/* Copy the error information out */</div><div class='add'>+			iocommand.error_info = *(c-&gt;err_info);</div><div class='add'>+			if (copy_to_user</div><div class='add'>+			    (argp, &amp;iocommand, sizeof(IOCTL_Command_struct))) {</div><div class='add'>+				kfree(buff);</div><div class='ctx'> 				cmd_free(host, c, 0);</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='del'>-                }</div><div class='del'>-                kfree(buff);</div><div class='del'>-		cmd_free(host, c, 0);</div><div class='del'>-                return(0);</div><div class='del'>-	} </div><div class='del'>-	case CCISS_BIG_PASSTHRU: {</div><div class='del'>-		BIG_IOCTL_Command_struct *ioc;</div><div class='del'>-		CommandList_struct *c;</div><div class='del'>-		unsigned char **buff = NULL;</div><div class='del'>-		int	*buff_size = NULL;</div><div class='del'>-		u64bit	temp64;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		BYTE sg_used = 0;</div><div class='del'>-		int status = 0;</div><div class='del'>-		int i;</div><div class='del'>-		DECLARE_COMPLETION(wait);</div><div class='del'>-		__u32   left;</div><div class='del'>-		__u32	sz;</div><div class='del'>-		BYTE    __user *data_ptr;</div><div class='del'>-</div><div class='del'>-		if (!arg)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (!capable(CAP_SYS_RAWIO))</div><div class='del'>-			return -EPERM;</div><div class='del'>-		ioc = (BIG_IOCTL_Command_struct *) </div><div class='del'>-			kmalloc(sizeof(*ioc), GFP_KERNEL);</div><div class='del'>-		if (!ioc) {</div><div class='del'>-			status = -ENOMEM;</div><div class='del'>-			goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user(ioc, argp, sizeof(*ioc))) {</div><div class='del'>-			status = -EFAULT;</div><div class='del'>-			goto cleanup1;</div><div class='add'>+</div><div class='add'>+			if (iocommand.Request.Type.Direction == XFER_READ) {</div><div class='add'>+				/* Copy the data out of the buffer we created */</div><div class='add'>+				if (copy_to_user</div><div class='add'>+				    (iocommand.buf, buff, iocommand.buf_size)) {</div><div class='add'>+					kfree(buff);</div><div class='add'>+					cmd_free(host, c, 0);</div><div class='add'>+					return -EFAULT;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			kfree(buff);</div><div class='add'>+			cmd_free(host, c, 0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		if ((ioc-&gt;buf_size &lt; 1) &amp;&amp;</div><div class='del'>-			(ioc-&gt;Request.Type.Direction != XFER_NONE)) {</div><div class='add'>+	case CCISS_BIG_PASSTHRU:{</div><div class='add'>+			BIG_IOCTL_Command_struct *ioc;</div><div class='add'>+			CommandList_struct *c;</div><div class='add'>+			unsigned char **buff = NULL;</div><div class='add'>+			int *buff_size = NULL;</div><div class='add'>+			u64bit temp64;</div><div class='add'>+			unsigned long flags;</div><div class='add'>+			BYTE sg_used = 0;</div><div class='add'>+			int status = 0;</div><div class='add'>+			int i;</div><div class='add'>+			DECLARE_COMPLETION(wait);</div><div class='add'>+			__u32 left;</div><div class='add'>+			__u32 sz;</div><div class='add'>+			BYTE __user *data_ptr;</div><div class='add'>+</div><div class='add'>+			if (!arg)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+				return -EPERM;</div><div class='add'>+			ioc = (BIG_IOCTL_Command_struct *)</div><div class='add'>+			    kmalloc(sizeof(*ioc), GFP_KERNEL);</div><div class='add'>+			if (!ioc) {</div><div class='add'>+				status = -ENOMEM;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			if (copy_from_user(ioc, argp, sizeof(*ioc))) {</div><div class='add'>+				status = -EFAULT;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			if ((ioc-&gt;buf_size &lt; 1) &amp;&amp;</div><div class='add'>+			    (ioc-&gt;Request.Type.Direction != XFER_NONE)) {</div><div class='ctx'> 				status = -EINVAL;</div><div class='ctx'> 				goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		/* Check kmalloc limits  using all SGs */</div><div class='del'>-		if (ioc-&gt;malloc_size &gt; MAX_KMALLOC_SIZE) {</div><div class='del'>-			status = -EINVAL;</div><div class='del'>-			goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		if (ioc-&gt;buf_size &gt; ioc-&gt;malloc_size * MAXSGENTRIES) {</div><div class='del'>-			status = -EINVAL;</div><div class='del'>-			goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		buff = kzalloc(MAXSGENTRIES * sizeof(char *), GFP_KERNEL);</div><div class='del'>-		if (!buff) {</div><div class='del'>-			status = -ENOMEM;</div><div class='del'>-			goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		buff_size = (int *) kmalloc(MAXSGENTRIES * sizeof(int), </div><div class='del'>-					GFP_KERNEL);</div><div class='del'>-		if (!buff_size) {</div><div class='del'>-			status = -ENOMEM;</div><div class='del'>-			goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		left = ioc-&gt;buf_size;</div><div class='del'>-		data_ptr = ioc-&gt;buf;</div><div class='del'>-		while (left) {</div><div class='del'>-			sz = (left &gt; ioc-&gt;malloc_size) ? ioc-&gt;malloc_size : left;</div><div class='del'>-			buff_size[sg_used] = sz;</div><div class='del'>-			buff[sg_used] = kmalloc(sz, GFP_KERNEL);</div><div class='del'>-			if (buff[sg_used] == NULL) {</div><div class='add'>+			}</div><div class='add'>+			/* Check kmalloc limits  using all SGs */</div><div class='add'>+			if (ioc-&gt;malloc_size &gt; MAX_KMALLOC_SIZE) {</div><div class='add'>+				status = -EINVAL;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			if (ioc-&gt;buf_size &gt; ioc-&gt;malloc_size * MAXSGENTRIES) {</div><div class='add'>+				status = -EINVAL;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			buff =</div><div class='add'>+			    kzalloc(MAXSGENTRIES * sizeof(char *), GFP_KERNEL);</div><div class='add'>+			if (!buff) {</div><div class='ctx'> 				status = -ENOMEM;</div><div class='ctx'> 				goto cleanup1;</div><div class='ctx'> 			}</div><div class='del'>-			if (ioc-&gt;Request.Type.Direction == XFER_WRITE) {</div><div class='del'>-				if (copy_from_user(buff[sg_used], data_ptr, sz)) {</div><div class='add'>+			buff_size = (int *)kmalloc(MAXSGENTRIES * sizeof(int),</div><div class='add'>+						   GFP_KERNEL);</div><div class='add'>+			if (!buff_size) {</div><div class='add'>+				status = -ENOMEM;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			left = ioc-&gt;buf_size;</div><div class='add'>+			data_ptr = ioc-&gt;buf;</div><div class='add'>+			while (left) {</div><div class='add'>+				sz = (left &gt;</div><div class='add'>+				      ioc-&gt;malloc_size) ? ioc-&gt;</div><div class='add'>+				    malloc_size : left;</div><div class='add'>+				buff_size[sg_used] = sz;</div><div class='add'>+				buff[sg_used] = kmalloc(sz, GFP_KERNEL);</div><div class='add'>+				if (buff[sg_used] == NULL) {</div><div class='ctx'> 					status = -ENOMEM;</div><div class='ctx'> 					goto cleanup1;</div><div class='ctx'> 				}</div><div class='add'>+				if (ioc-&gt;Request.Type.Direction == XFER_WRITE) {</div><div class='add'>+					if (copy_from_user</div><div class='add'>+					    (buff[sg_used], data_ptr, sz)) {</div><div class='add'>+						status = -ENOMEM;</div><div class='add'>+						goto cleanup1;</div><div class='add'>+					}</div><div class='add'>+				} else {</div><div class='add'>+					memset(buff[sg_used], 0, sz);</div><div class='add'>+				}</div><div class='add'>+				left -= sz;</div><div class='add'>+				data_ptr += sz;</div><div class='add'>+				sg_used++;</div><div class='add'>+			}</div><div class='add'>+			if ((c = cmd_alloc(host, 0)) == NULL) {</div><div class='add'>+				status = -ENOMEM;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			c-&gt;cmd_type = CMD_IOCTL_PEND;</div><div class='add'>+			c-&gt;Header.ReplyQueue = 0;</div><div class='add'>+</div><div class='add'>+			if (ioc-&gt;buf_size &gt; 0) {</div><div class='add'>+				c-&gt;Header.SGList = sg_used;</div><div class='add'>+				c-&gt;Header.SGTotal = sg_used;</div><div class='ctx'> 			} else {</div><div class='del'>-				memset(buff[sg_used], 0, sz);</div><div class='add'>+				c-&gt;Header.SGList = 0;</div><div class='add'>+				c-&gt;Header.SGTotal = 0;</div><div class='ctx'> 			}</div><div class='del'>-			left -= sz;</div><div class='del'>-			data_ptr += sz;</div><div class='del'>-			sg_used++;</div><div class='del'>-		}</div><div class='del'>-		if ((c = cmd_alloc(host , 0)) == NULL) {</div><div class='del'>-			status = -ENOMEM;</div><div class='del'>-			goto cleanup1;	</div><div class='del'>-		}</div><div class='del'>-		c-&gt;cmd_type = CMD_IOCTL_PEND;</div><div class='del'>-		c-&gt;Header.ReplyQueue = 0;</div><div class='del'>-		</div><div class='del'>-		if( ioc-&gt;buf_size &gt; 0) {</div><div class='del'>-			c-&gt;Header.SGList = sg_used;</div><div class='del'>-			c-&gt;Header.SGTotal= sg_used;</div><div class='del'>-		} else { </div><div class='del'>-			c-&gt;Header.SGList = 0;</div><div class='del'>-			c-&gt;Header.SGTotal= 0;</div><div class='del'>-		}</div><div class='del'>-		c-&gt;Header.LUN = ioc-&gt;LUN_info;</div><div class='del'>-		c-&gt;Header.Tag.lower = c-&gt;busaddr;</div><div class='del'>-		</div><div class='del'>-		c-&gt;Request = ioc-&gt;Request;</div><div class='del'>-		if (ioc-&gt;buf_size &gt; 0 ) {</div><div class='del'>-			int i;</div><div class='del'>-			for(i=0; i&lt;sg_used; i++) {</div><div class='del'>-				temp64.val = pci_map_single( host-&gt;pdev, buff[i],</div><div class='del'>-					buff_size[i],</div><div class='add'>+			c-&gt;Header.LUN = ioc-&gt;LUN_info;</div><div class='add'>+			c-&gt;Header.Tag.lower = c-&gt;busaddr;</div><div class='add'>+</div><div class='add'>+			c-&gt;Request = ioc-&gt;Request;</div><div class='add'>+			if (ioc-&gt;buf_size &gt; 0) {</div><div class='add'>+				int i;</div><div class='add'>+				for (i = 0; i &lt; sg_used; i++) {</div><div class='add'>+					temp64.val =</div><div class='add'>+					    pci_map_single(host-&gt;pdev, buff[i],</div><div class='add'>+						    buff_size[i],</div><div class='add'>+						    PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+					c-&gt;SG[i].Addr.lower =</div><div class='add'>+					    temp64.val32.lower;</div><div class='add'>+					c-&gt;SG[i].Addr.upper =</div><div class='add'>+					    temp64.val32.upper;</div><div class='add'>+					c-&gt;SG[i].Len = buff_size[i];</div><div class='add'>+					c-&gt;SG[i].Ext = 0;	/* we are not chaining */</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			c-&gt;waiting = &amp;wait;</div><div class='add'>+			/* Put the request on the tail of the request queue */</div><div class='add'>+			spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			addQ(&amp;host-&gt;reqQ, c);</div><div class='add'>+			host-&gt;Qdepth++;</div><div class='add'>+			start_io(host);</div><div class='add'>+			spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='add'>+			wait_for_completion(&amp;wait);</div><div class='add'>+			/* unlock the buffers from DMA */</div><div class='add'>+			for (i = 0; i &lt; sg_used; i++) {</div><div class='add'>+				temp64.val32.lower = c-&gt;SG[i].Addr.lower;</div><div class='add'>+				temp64.val32.upper = c-&gt;SG[i].Addr.upper;</div><div class='add'>+				pci_unmap_single(host-&gt;pdev,</div><div class='add'>+					(dma_addr_t) temp64.val, buff_size[i],</div><div class='ctx'> 					PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-				c-&gt;SG[i].Addr.lower = temp64.val32.lower;</div><div class='del'>-				c-&gt;SG[i].Addr.upper = temp64.val32.upper;</div><div class='del'>-				c-&gt;SG[i].Len = buff_size[i];</div><div class='del'>-				c-&gt;SG[i].Ext = 0;  /* we are not chaining */</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		c-&gt;waiting = &amp;wait;</div><div class='del'>-		/* Put the request on the tail of the request queue */</div><div class='del'>-		spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='del'>-		addQ(&amp;host-&gt;reqQ, c);</div><div class='del'>-		host-&gt;Qdepth++;</div><div class='del'>-		start_io(host);</div><div class='del'>-		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='del'>-		wait_for_completion(&amp;wait);</div><div class='del'>-		/* unlock the buffers from DMA */</div><div class='del'>-		for(i=0; i&lt;sg_used; i++) {</div><div class='del'>-			temp64.val32.lower = c-&gt;SG[i].Addr.lower;</div><div class='del'>-			temp64.val32.upper = c-&gt;SG[i].Addr.upper;</div><div class='del'>-			pci_unmap_single( host-&gt;pdev, (dma_addr_t) temp64.val,</div><div class='del'>-				buff_size[i], PCI_DMA_BIDIRECTIONAL);</div><div class='del'>-		}</div><div class='del'>-		/* Copy the error information out */</div><div class='del'>-		ioc-&gt;error_info = *(c-&gt;err_info);</div><div class='del'>-		if (copy_to_user(argp, ioc, sizeof(*ioc))) {</div><div class='del'>-			cmd_free(host, c, 0);</div><div class='del'>-			status = -EFAULT;</div><div class='del'>-			goto cleanup1;</div><div class='del'>-		}</div><div class='del'>-		if (ioc-&gt;Request.Type.Direction == XFER_READ) {</div><div class='del'>-			/* Copy the data out of the buffer we created */</div><div class='del'>-			BYTE __user *ptr = ioc-&gt;buf;</div><div class='del'>-	        	for(i=0; i&lt; sg_used; i++) {</div><div class='del'>-				if (copy_to_user(ptr, buff[i], buff_size[i])) {</div><div class='del'>-					cmd_free(host, c, 0);</div><div class='del'>-					status = -EFAULT;</div><div class='del'>-					goto cleanup1;</div><div class='add'>+			/* Copy the error information out */</div><div class='add'>+			ioc-&gt;error_info = *(c-&gt;err_info);</div><div class='add'>+			if (copy_to_user(argp, ioc, sizeof(*ioc))) {</div><div class='add'>+				cmd_free(host, c, 0);</div><div class='add'>+				status = -EFAULT;</div><div class='add'>+				goto cleanup1;</div><div class='add'>+			}</div><div class='add'>+			if (ioc-&gt;Request.Type.Direction == XFER_READ) {</div><div class='add'>+				/* Copy the data out of the buffer we created */</div><div class='add'>+				BYTE __user *ptr = ioc-&gt;buf;</div><div class='add'>+				for (i = 0; i &lt; sg_used; i++) {</div><div class='add'>+					if (copy_to_user</div><div class='add'>+					    (ptr, buff[i], buff_size[i])) {</div><div class='add'>+						cmd_free(host, c, 0);</div><div class='add'>+						status = -EFAULT;</div><div class='add'>+						goto cleanup1;</div><div class='add'>+					}</div><div class='add'>+					ptr += buff_size[i];</div><div class='ctx'> 				}</div><div class='del'>-				ptr += buff_size[i];</div><div class='ctx'> 			}</div><div class='add'>+			cmd_free(host, c, 0);</div><div class='add'>+			status = 0;</div><div class='add'>+		      cleanup1:</div><div class='add'>+			if (buff) {</div><div class='add'>+				for (i = 0; i &lt; sg_used; i++)</div><div class='add'>+					kfree(buff[i]);</div><div class='add'>+				kfree(buff);</div><div class='add'>+			}</div><div class='add'>+			kfree(buff_size);</div><div class='add'>+			kfree(ioc);</div><div class='add'>+			return status;</div><div class='ctx'> 		}</div><div class='del'>-		cmd_free(host, c, 0);</div><div class='del'>-		status = 0;</div><div class='del'>-cleanup1:</div><div class='del'>-		if (buff) {</div><div class='del'>-			for(i=0; i&lt;sg_used; i++)</div><div class='del'>-				kfree(buff[i]);</div><div class='del'>-			kfree(buff);</div><div class='del'>-		}</div><div class='del'>-		kfree(buff_size);</div><div class='del'>-		kfree(ioc);</div><div class='del'>-		return(status);</div><div class='del'>-	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1119,7 +1159,7 @@ cleanup1:</div><div class='ctx'>  *</div><div class='ctx'>  * Right now I'm using the getgeometry() function to do this, but this</div><div class='ctx'>  * function should probably be finer grained and allow you to revalidate one</div><div class='del'>- * particualar logical volume (instead of all of them on a particular</div><div class='add'>+ * particular logical volume (instead of all of them on a particular</div><div class='ctx'>  * controller).</div><div class='ctx'>  */</div><div class='ctx'> static int revalidate_allvol(ctlr_info_t *host)</div><div class='hunk'>@@ -1127,17 +1167,17 @@ static int revalidate_allvol(ctlr_info_t *host)</div><div class='ctx'> 	int ctlr = host-&gt;ctlr, i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-        spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='del'>-        if (host-&gt;usage_count &gt; 1) {</div><div class='del'>-                spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='del'>-                printk(KERN_WARNING "cciss: Device busy for volume"</div><div class='del'>-                        " revalidation (usage=%d)\n", host-&gt;usage_count);</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        }</div><div class='del'>-        host-&gt;usage_count++;</div><div class='add'>+	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='add'>+	if (host-&gt;usage_count &gt; 1) {</div><div class='add'>+		spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='add'>+		printk(KERN_WARNING "cciss: Device busy for volume"</div><div class='add'>+		       " revalidation (usage=%d)\n", host-&gt;usage_count);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	host-&gt;usage_count++;</div><div class='ctx'> 	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> </div><div class='del'>-	for(i=0; i&lt; NWD; i++) {</div><div class='add'>+	for (i = 0; i &lt; NWD; i++) {</div><div class='ctx'> 		struct gendisk *disk = host-&gt;gendisk[i];</div><div class='ctx'> 		if (disk) {</div><div class='ctx'> 			request_queue_t *q = disk-&gt;queue;</div><div class='hunk'>@@ -1149,22 +1189,22 @@ static int revalidate_allvol(ctlr_info_t *host)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        /*</div><div class='del'>-         * Set the partition and block size structures for all volumes</div><div class='del'>-         * on this controller to zero.  We will reread all of this data</div><div class='del'>-         */</div><div class='del'>-        memset(host-&gt;drv,        0, sizeof(drive_info_struct)</div><div class='del'>-						* CISS_MAX_LUN);</div><div class='del'>-        /*</div><div class='del'>-         * Tell the array controller not to give us any interrupts while</div><div class='del'>-         * we check the new geometry.  Then turn interrupts back on when</div><div class='del'>-         * we're done.</div><div class='del'>-         */</div><div class='del'>-        host-&gt;access.set_intr_mask(host, CCISS_INTR_OFF);</div><div class='del'>-        cciss_getgeometry(ctlr);</div><div class='del'>-        host-&gt;access.set_intr_mask(host, CCISS_INTR_ON);</div><div class='del'>-</div><div class='del'>-	/* Loop through each real device */ </div><div class='add'>+	/*</div><div class='add'>+	 * Set the partition and block size structures for all volumes</div><div class='add'>+	 * on this controller to zero.  We will reread all of this data</div><div class='add'>+	 */</div><div class='add'>+	memset(host-&gt;drv, 0, sizeof(drive_info_struct)</div><div class='add'>+	       * CISS_MAX_LUN);</div><div class='add'>+	/*</div><div class='add'>+	 * Tell the array controller not to give us any interrupts while</div><div class='add'>+	 * we check the new geometry.  Then turn interrupts back on when</div><div class='add'>+	 * we're done.</div><div class='add'>+	 */</div><div class='add'>+	host-&gt;access.set_intr_mask(host, CCISS_INTR_OFF);</div><div class='add'>+	cciss_getgeometry(ctlr);</div><div class='add'>+	host-&gt;access.set_intr_mask(host, CCISS_INTR_ON);</div><div class='add'>+</div><div class='add'>+	/* Loop through each real device */</div><div class='ctx'> 	for (i = 0; i &lt; NWD; i++) {</div><div class='ctx'> 		struct gendisk *disk = host-&gt;gendisk[i];</div><div class='ctx'> 		drive_info_struct *drv = &amp;(host-&gt;drv[i]);</div><div class='hunk'>@@ -1176,8 +1216,8 @@ static int revalidate_allvol(ctlr_info_t *host)</div><div class='ctx'> 		set_capacity(disk, drv-&gt;nr_blocks);</div><div class='ctx'> 		add_disk(disk);</div><div class='ctx'> 	}</div><div class='del'>-        host-&gt;usage_count--;</div><div class='del'>-        return 0;</div><div class='add'>+	host-&gt;usage_count--;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void complete_buffers(struct bio *bio, int status)</div><div class='hunk'>@@ -1191,7 +1231,6 @@ static inline void complete_buffers(struct bio *bio, int status)</div><div class='ctx'> 		bio_endio(bio, nr_sectors &lt;&lt; 9, status ? 0 : -EIO);</div><div class='ctx'> 		bio = xbh;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cciss_softirq_done(struct request *rq)</div><div class='hunk'>@@ -1209,7 +1248,7 @@ static void cciss_softirq_done(struct request *rq)</div><div class='ctx'> </div><div class='ctx'> 	/* command did not need to be retried */</div><div class='ctx'> 	/* unmap the DMA mapping for all the scatter gather elements */</div><div class='del'>-	for(i=0; i&lt;cmd-&gt;Header.SGList; i++) {</div><div class='add'>+	for (i = 0; i &lt; cmd-&gt;Header.SGList; i++) {</div><div class='ctx'> 		temp64.val32.lower = cmd-&gt;SG[i].Addr.lower;</div><div class='ctx'> 		temp64.val32.upper = cmd-&gt;SG[i].Addr.upper;</div><div class='ctx'> 		pci_unmap_page(h-&gt;pdev, temp64.val, cmd-&gt;SG[i].Len, ddir);</div><div class='hunk'>@@ -1219,11 +1258,12 @@ static void cciss_softirq_done(struct request *rq)</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("Done with %p\n", rq);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='add'>+	add_disk_randomness(rq-&gt;rq_disk);</div><div class='ctx'> 	spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='ctx'> 	end_that_request_last(rq, rq-&gt;errors);</div><div class='del'>-	cmd_free(h, cmd,1);</div><div class='add'>+	cmd_free(h, cmd, 1);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1234,9 +1274,9 @@ static void cciss_softirq_done(struct request *rq)</div><div class='ctx'>  * will always be left registered with the kernel since it is also the</div><div class='ctx'>  * controller node.  Any changes to disk 0 will show up on the next</div><div class='ctx'>  * reboot.</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='del'>-  {</div><div class='add'>+{</div><div class='ctx'> 	ctlr_info_t *h = hba[ctlr];</div><div class='ctx'> 	struct gendisk *disk;</div><div class='ctx'> 	ReadCapdata_struct *size_buff = NULL;</div><div class='hunk'>@@ -1246,13 +1286,13 @@ static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* if the disk already exists then deregister it before proceeding*/</div><div class='del'>-	if (h-&gt;drv[drv_index].raid_level != -1){</div><div class='add'>+	/* if the disk already exists then deregister it before proceeding */</div><div class='add'>+	if (h-&gt;drv[drv_index].raid_level != -1) {</div><div class='ctx'> 		spin_lock_irqsave(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 		h-&gt;drv[drv_index].busy_configuring = 1;</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 		ret = deregister_disk(h-&gt;gendisk[drv_index],</div><div class='del'>-			&amp;h-&gt;drv[drv_index], 0);</div><div class='add'>+				      &amp;h-&gt;drv[drv_index], 0);</div><div class='ctx'> 		h-&gt;drv[drv_index].busy_configuring = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1260,27 +1300,25 @@ static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	/* Get information about the disk and modify the driver sturcture */</div><div class='del'>-	size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);</div><div class='del'>-        if (size_buff == NULL)</div><div class='add'>+	/* Get information about the disk and modify the driver structure */</div><div class='add'>+	size_buff = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);</div><div class='add'>+	if (size_buff == NULL)</div><div class='ctx'> 		goto mem_msg;</div><div class='del'>-	inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);</div><div class='add'>+	inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);</div><div class='ctx'> 	if (inq_buff == NULL)</div><div class='ctx'> 		goto mem_msg;</div><div class='ctx'> </div><div class='ctx'> 	cciss_read_capacity(ctlr, drv_index, size_buff, 1,</div><div class='del'>-		&amp;total_size, &amp;block_size);</div><div class='add'>+			    &amp;total_size, &amp;block_size);</div><div class='ctx'> 	cciss_geometry_inquiry(ctlr, drv_index, 1, total_size, block_size,</div><div class='del'>-		inq_buff, &amp;h-&gt;drv[drv_index]);</div><div class='add'>+			       inq_buff, &amp;h-&gt;drv[drv_index]);</div><div class='ctx'> </div><div class='ctx'> 	++h-&gt;num_luns;</div><div class='ctx'> 	disk = h-&gt;gendisk[drv_index];</div><div class='ctx'> 	set_capacity(disk, h-&gt;drv[drv_index].nr_blocks);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* if it's the controller it's already added */</div><div class='del'>-	if (drv_index){</div><div class='add'>+	if (drv_index) {</div><div class='ctx'> 		disk-&gt;queue = blk_init_queue(do_cciss_request, &amp;h-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/* Set up queue information */</div><div class='hunk'>@@ -1300,17 +1338,17 @@ static void cciss_update_drive_info(int ctlr, int drv_index)</div><div class='ctx'> 		disk-&gt;queue-&gt;queuedata = hba[ctlr];</div><div class='ctx'> </div><div class='ctx'> 		blk_queue_hardsect_size(disk-&gt;queue,</div><div class='del'>-			hba[ctlr]-&gt;drv[drv_index].block_size);</div><div class='add'>+					hba[ctlr]-&gt;drv[drv_index].block_size);</div><div class='ctx'> </div><div class='ctx'> 		h-&gt;drv[drv_index].queue = disk-&gt;queue;</div><div class='ctx'> 		add_disk(disk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-freeret:</div><div class='add'>+      freeret:</div><div class='ctx'> 	kfree(size_buff);</div><div class='ctx'> 	kfree(inq_buff);</div><div class='ctx'> 	return;</div><div class='del'>-mem_msg:</div><div class='add'>+      mem_msg:</div><div class='ctx'> 	printk(KERN_ERR "cciss: out of memory\n");</div><div class='ctx'> 	goto freeret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1320,13 +1358,13 @@ mem_msg:</div><div class='ctx'>  * where new drives will be added.  If the index to be returned is greater</div><div class='ctx'>  * than the highest_lun index for the controller then highest_lun is set</div><div class='ctx'>  * to this new index.  If there are no available indexes then -1 is returned.</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> static int cciss_find_free_drive_index(int ctlr)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; CISS_MAX_LUN; i++){</div><div class='del'>-		if (hba[ctlr]-&gt;drv[i].raid_level == -1){</div><div class='add'>+	for (i = 0; i &lt; CISS_MAX_LUN; i++) {</div><div class='add'>+		if (hba[ctlr]-&gt;drv[i].raid_level == -1) {</div><div class='ctx'> 			if (i &gt; hba[ctlr]-&gt;highest_lun)</div><div class='ctx'> 				hba[ctlr]-&gt;highest_lun = i;</div><div class='ctx'> 			return i;</div><div class='hunk'>@@ -1336,7 +1374,7 @@ static int cciss_find_free_drive_index(int ctlr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function will add and remove logical drives from the Logical</div><div class='del'>- * drive array of the controller and maintain persistancy of ordering</div><div class='add'>+ * drive array of the controller and maintain persistency of ordering</div><div class='ctx'>  * so that mount points are preserved until the next reboot.  This allows</div><div class='ctx'>  * for the removal of logical drives in the middle of the drive array</div><div class='ctx'>  * without a re-ordering of those drives.</div><div class='hunk'>@@ -1344,7 +1382,7 @@ static int cciss_find_free_drive_index(int ctlr)</div><div class='ctx'>  * h		= The controller to perform the operations on</div><div class='ctx'>  * del_disk	= The disk to remove if specified.  If the value given</div><div class='ctx'>  *		  is NULL then no disk is removed.</div><div class='del'>-*/</div><div class='add'>+ */</div><div class='ctx'> static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> {</div><div class='ctx'> 	int ctlr = h-&gt;ctlr;</div><div class='hunk'>@@ -1361,12 +1399,12 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> </div><div class='ctx'> 	/* Set busy_configuring flag for this operation */</div><div class='ctx'> 	spin_lock_irqsave(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='del'>-	if (h-&gt;num_luns &gt;= CISS_MAX_LUN){</div><div class='add'>+	if (h-&gt;num_luns &gt;= CISS_MAX_LUN) {</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (h-&gt;busy_configuring){</div><div class='add'>+	if (h-&gt;busy_configuring) {</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1376,7 +1414,7 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> 	 * and update the logical drive table.  If it is not NULL then</div><div class='ctx'> 	 * we will check if the disk is in use or not.</div><div class='ctx'> 	 */</div><div class='del'>-	if (del_disk != NULL){</div><div class='add'>+	if (del_disk != NULL) {</div><div class='ctx'> 		drv = get_drv(del_disk);</div><div class='ctx'> 		drv-&gt;busy_configuring = 1;</div><div class='ctx'> 		spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='hunk'>@@ -1394,61 +1432,67 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> 			goto mem_msg;</div><div class='ctx'> </div><div class='ctx'> 		return_code = sendcmd_withirq(CISS_REPORT_LOG, ctlr, ld_buff,</div><div class='del'>-				sizeof(ReportLunData_struct), 0, 0, 0,</div><div class='del'>-				TYPE_CMD);</div><div class='del'>-</div><div class='del'>-		if (return_code == IO_OK){</div><div class='del'>-			listlength |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[0])) &lt;&lt; 24;</div><div class='del'>-			listlength |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[1])) &lt;&lt; 16;</div><div class='del'>-			listlength |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[2])) &lt;&lt; 8;</div><div class='del'>-			listlength |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[3]);</div><div class='del'>-		} else{ /* reading number of logical volumes failed */</div><div class='add'>+					      sizeof(ReportLunData_struct), 0,</div><div class='add'>+					      0, 0, TYPE_CMD);</div><div class='add'>+</div><div class='add'>+		if (return_code == IO_OK) {</div><div class='add'>+			listlength |=</div><div class='add'>+			    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[0]))</div><div class='add'>+			    &lt;&lt; 24;</div><div class='add'>+			listlength |=</div><div class='add'>+			    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[1]))</div><div class='add'>+			    &lt;&lt; 16;</div><div class='add'>+			listlength |=</div><div class='add'>+			    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[2]))</div><div class='add'>+			    &lt;&lt; 8;</div><div class='add'>+			listlength |=</div><div class='add'>+			    0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[3]);</div><div class='add'>+		} else {	/* reading number of logical volumes failed */</div><div class='ctx'> 			printk(KERN_WARNING "cciss: report logical volume"</div><div class='del'>-				" command failed\n");</div><div class='add'>+			       " command failed\n");</div><div class='ctx'> 			listlength = 0;</div><div class='ctx'> 			goto freeret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		num_luns = listlength / 8;	/* 8 bytes per entry */</div><div class='del'>-		if (num_luns &gt; CISS_MAX_LUN){</div><div class='add'>+		if (num_luns &gt; CISS_MAX_LUN) {</div><div class='ctx'> 			num_luns = CISS_MAX_LUN;</div><div class='ctx'> 			printk(KERN_WARNING "cciss: more luns configured"</div><div class='del'>-				" on controller than can be handled by"</div><div class='del'>-				" this driver.\n");</div><div class='add'>+			       " on controller than can be handled by"</div><div class='add'>+			       " this driver.\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Compare controller drive array to drivers drive array.</div><div class='del'>-	 	* Check for updates in the drive information and any new drives</div><div class='del'>-	 	* on the controller.</div><div class='del'>-	 	*/</div><div class='del'>-		for (i=0; i &lt; num_luns; i++){</div><div class='add'>+		 * Check for updates in the drive information and any new drives</div><div class='add'>+		 * on the controller.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; num_luns; i++) {</div><div class='ctx'> 			int j;</div><div class='ctx'> </div><div class='ctx'> 			drv_found = 0;</div><div class='ctx'> </div><div class='del'>-	  		lunid = (0xff &amp;</div><div class='del'>-				(unsigned int)(ld_buff-&gt;LUN[i][3])) &lt;&lt; 24;</div><div class='del'>-        		lunid |= (0xff &amp;</div><div class='del'>-				(unsigned int)(ld_buff-&gt;LUN[i][2])) &lt;&lt; 16;</div><div class='del'>-        		lunid |= (0xff &amp;</div><div class='del'>-				(unsigned int)(ld_buff-&gt;LUN[i][1])) &lt;&lt; 8;</div><div class='del'>-        		lunid |= 0xff &amp;</div><div class='del'>-				(unsigned int)(ld_buff-&gt;LUN[i][0]);</div><div class='add'>+			lunid = (0xff &amp;</div><div class='add'>+				 (unsigned int)(ld_buff-&gt;LUN[i][3])) &lt;&lt; 24;</div><div class='add'>+			lunid |= (0xff &amp;</div><div class='add'>+				  (unsigned int)(ld_buff-&gt;LUN[i][2])) &lt;&lt; 16;</div><div class='add'>+			lunid |= (0xff &amp;</div><div class='add'>+				  (unsigned int)(ld_buff-&gt;LUN[i][1])) &lt;&lt; 8;</div><div class='add'>+			lunid |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][0]);</div><div class='ctx'> </div><div class='ctx'> 			/* Find if the LUN is already in the drive array</div><div class='ctx'> 			 * of the controller.  If so then update its info</div><div class='ctx'> 			 * if not is use.  If it does not exist then find</div><div class='ctx'> 			 * the first free index and add it.</div><div class='del'>-			*/</div><div class='del'>-			for (j=0; j &lt;= h-&gt;highest_lun; j++){</div><div class='del'>-				if (h-&gt;drv[j].LunID == lunid){</div><div class='add'>+			 */</div><div class='add'>+			for (j = 0; j &lt;= h-&gt;highest_lun; j++) {</div><div class='add'>+				if (h-&gt;drv[j].LunID == lunid) {</div><div class='ctx'> 					drv_index = j;</div><div class='ctx'> 					drv_found = 1;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* check if the drive was found already in the array */</div><div class='del'>-			if (!drv_found){</div><div class='add'>+			if (!drv_found) {</div><div class='ctx'> 				drv_index = cciss_find_free_drive_index(ctlr);</div><div class='ctx'> 				if (drv_index == -1)</div><div class='ctx'> 					goto freeret;</div><div class='hunk'>@@ -1456,18 +1500,18 @@ static int rebuild_lun_table(ctlr_info_t *h, struct gendisk *del_disk)</div><div class='ctx'> 			}</div><div class='ctx'> 			h-&gt;drv[drv_index].LunID = lunid;</div><div class='ctx'> 			cciss_update_drive_info(ctlr, drv_index);</div><div class='del'>-		} /* end for */</div><div class='del'>-	} /* end else */</div><div class='add'>+		}		/* end for */</div><div class='add'>+	}			/* end else */</div><div class='ctx'> </div><div class='del'>-freeret:</div><div class='add'>+      freeret:</div><div class='ctx'> 	kfree(ld_buff);</div><div class='ctx'> 	h-&gt;busy_configuring = 0;</div><div class='ctx'> 	/* We return -1 here to tell the ACU that we have registered/updated</div><div class='ctx'> 	 * all of the drives that we can and to keep it from calling us</div><div class='ctx'> 	 * additional times.</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> 	return -1;</div><div class='del'>-mem_msg:</div><div class='add'>+      mem_msg:</div><div class='ctx'> 	printk(KERN_ERR "cciss: out of memory\n");</div><div class='ctx'> 	goto freeret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1483,7 +1527,7 @@ mem_msg:</div><div class='ctx'>  * clear_all = This flag determines whether or not the disk information</div><div class='ctx'>  *             is going to be completely cleared out and the highest_lun</div><div class='ctx'>  *             reset.  Sometimes we want to clear out information about</div><div class='del'>- *             the disk in preperation for re-adding it.  In this case</div><div class='add'>+ *             the disk in preparation for re-adding it.  In this case</div><div class='ctx'>  *             the highest_lun should be left unchanged and the LunID</div><div class='ctx'>  *             should not be cleared.</div><div class='ctx'> */</div><div class='hunk'>@@ -1496,19 +1540,17 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/* make sure logical volume is NOT is use */</div><div class='del'>-	if(clear_all || (h-&gt;gendisk[0] == disk)) {</div><div class='del'>-	if (drv-&gt;usage_count &gt; 1)</div><div class='del'>-                return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-        else</div><div class='del'>-        	if( drv-&gt;usage_count &gt; 0 )</div><div class='del'>-                	return -EBUSY;</div><div class='add'>+	if (clear_all || (h-&gt;gendisk[0] == disk)) {</div><div class='add'>+		if (drv-&gt;usage_count &gt; 1)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	} else if (drv-&gt;usage_count &gt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* invalidate the devices and deregister the disk.  If it is disk</div><div class='ctx'> 	 * zero do not deregister it but just zero out it's values.  This</div><div class='ctx'> 	 * allows us to delete disk zero but keep the controller registered.</div><div class='del'>-	*/</div><div class='del'>-	if (h-&gt;gendisk[0] != disk){</div><div class='add'>+	 */</div><div class='add'>+	if (h-&gt;gendisk[0] != disk) {</div><div class='ctx'> 		if (disk) {</div><div class='ctx'> 			request_queue_t *q = disk-&gt;queue;</div><div class='ctx'> 			if (disk-&gt;flags &amp; GENHD_FL_UP)</div><div class='hunk'>@@ -1530,91 +1572,90 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,</div><div class='ctx'> 	drv-&gt;raid_level = -1;	/* This can be used as a flag variable to</div><div class='ctx'> 				 * indicate that this element of the drive</div><div class='ctx'> 				 * array is free.</div><div class='del'>-				*/</div><div class='del'>-</div><div class='del'>-	if (clear_all){</div><div class='del'>-	/* check to see if it was the last disk */</div><div class='del'>-	if (drv == h-&gt;drv + h-&gt;highest_lun) {</div><div class='del'>-		/* if so, find the new hightest lun */</div><div class='del'>-		int i, newhighest =-1;</div><div class='del'>-		for(i=0; i&lt;h-&gt;highest_lun; i++) {</div><div class='del'>-			/* if the disk has size &gt; 0, it is available */</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+	if (clear_all) {</div><div class='add'>+		/* check to see if it was the last disk */</div><div class='add'>+		if (drv == h-&gt;drv + h-&gt;highest_lun) {</div><div class='add'>+			/* if so, find the new hightest lun */</div><div class='add'>+			int i, newhighest = -1;</div><div class='add'>+			for (i = 0; i &lt; h-&gt;highest_lun; i++) {</div><div class='add'>+				/* if the disk has size &gt; 0, it is available */</div><div class='ctx'> 				if (h-&gt;drv[i].heads)</div><div class='del'>-				newhighest = i;</div><div class='add'>+					newhighest = i;</div><div class='add'>+			}</div><div class='add'>+			h-&gt;highest_lun = newhighest;</div><div class='ctx'> 		}</div><div class='del'>-		h-&gt;highest_lun = newhighest;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	drv-&gt;LunID = 0;</div><div class='add'>+		drv-&gt;LunID = 0;</div><div class='ctx'> 	}</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,</div><div class='del'>-	size_t size,</div><div class='del'>-	unsigned int use_unit_num, /* 0: address the controller,</div><div class='del'>-				      1: address logical volume log_unit,</div><div class='del'>-				      2: periph device address is scsi3addr */</div><div class='del'>-	unsigned int log_unit, __u8 page_code, unsigned char *scsi3addr,</div><div class='del'>-	int cmd_type)</div><div class='add'>+static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, size_t size, unsigned int use_unit_num,	/* 0: address the controller,</div><div class='add'>+															   1: address logical volume log_unit,</div><div class='add'>+															   2: periph device address is scsi3addr */</div><div class='add'>+		    unsigned int log_unit, __u8 page_code,</div><div class='add'>+		    unsigned char *scsi3addr, int cmd_type)</div><div class='ctx'> {</div><div class='del'>-	ctlr_info_t *h= hba[ctlr];</div><div class='add'>+	ctlr_info_t *h = hba[ctlr];</div><div class='ctx'> 	u64bit buff_dma_handle;</div><div class='ctx'> 	int status = IO_OK;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;cmd_type = CMD_IOCTL_PEND;</div><div class='ctx'> 	c-&gt;Header.ReplyQueue = 0;</div><div class='del'>-	if( buff != NULL) {</div><div class='add'>+	if (buff != NULL) {</div><div class='ctx'> 		c-&gt;Header.SGList = 1;</div><div class='del'>-		c-&gt;Header.SGTotal= 1;</div><div class='add'>+		c-&gt;Header.SGTotal = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		c-&gt;Header.SGList = 0;</div><div class='del'>-                c-&gt;Header.SGTotal= 0;</div><div class='add'>+		c-&gt;Header.SGTotal = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	c-&gt;Header.Tag.lower = c-&gt;busaddr;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;Request.Type.Type = cmd_type;</div><div class='ctx'> 	if (cmd_type == TYPE_CMD) {</div><div class='del'>-		switch(cmd) {</div><div class='del'>-		case  CISS_INQUIRY:</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case CISS_INQUIRY:</div><div class='ctx'> 			/* If the logical unit number is 0 then, this is going</div><div class='del'>-			to controller so It's a physical command</div><div class='del'>-			mode = 0 target = 0.  So we have nothing to write.</div><div class='del'>-			otherwise, if use_unit_num == 1,</div><div class='del'>-			mode = 1(volume set addressing) target = LUNID</div><div class='del'>-			otherwise, if use_unit_num == 2,</div><div class='del'>-			mode = 0(periph dev addr) target = scsi3addr */</div><div class='add'>+			   to controller so It's a physical command</div><div class='add'>+			   mode = 0 target = 0.  So we have nothing to write.</div><div class='add'>+			   otherwise, if use_unit_num == 1,</div><div class='add'>+			   mode = 1(volume set addressing) target = LUNID</div><div class='add'>+			   otherwise, if use_unit_num == 2,</div><div class='add'>+			   mode = 0(periph dev addr) target = scsi3addr */</div><div class='ctx'> 			if (use_unit_num == 1) {</div><div class='del'>-				c-&gt;Header.LUN.LogDev.VolId=</div><div class='del'>-					h-&gt;drv[log_unit].LunID;</div><div class='del'>-                        	c-&gt;Header.LUN.LogDev.Mode = 1;</div><div class='add'>+				c-&gt;Header.LUN.LogDev.VolId =</div><div class='add'>+				    h-&gt;drv[log_unit].LunID;</div><div class='add'>+				c-&gt;Header.LUN.LogDev.Mode = 1;</div><div class='ctx'> 			} else if (use_unit_num == 2) {</div><div class='del'>-				memcpy(c-&gt;Header.LUN.LunAddrBytes,scsi3addr,8);</div><div class='add'>+				memcpy(c-&gt;Header.LUN.LunAddrBytes, scsi3addr,</div><div class='add'>+				       8);</div><div class='ctx'> 				c-&gt;Header.LUN.LogDev.Mode = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* are we trying to read a vital product page */</div><div class='del'>-			if(page_code != 0) {</div><div class='add'>+			if (page_code != 0) {</div><div class='ctx'> 				c-&gt;Request.CDB[1] = 0x01;</div><div class='ctx'> 				c-&gt;Request.CDB[2] = page_code;</div><div class='ctx'> 			}</div><div class='ctx'> 			c-&gt;Request.CDBLen = 6;</div><div class='del'>-			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;  </div><div class='add'>+			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='ctx'> 			c-&gt;Request.Type.Direction = XFER_READ;</div><div class='ctx'> 			c-&gt;Request.Timeout = 0;</div><div class='del'>-			c-&gt;Request.CDB[0] =  CISS_INQUIRY;</div><div class='del'>-			c-&gt;Request.CDB[4] = size  &amp; 0xFF;  </div><div class='del'>-		break;</div><div class='add'>+			c-&gt;Request.CDB[0] = CISS_INQUIRY;</div><div class='add'>+			c-&gt;Request.CDB[4] = size &amp; 0xFF;</div><div class='add'>+			break;</div><div class='ctx'> 		case CISS_REPORT_LOG:</div><div class='ctx'> 		case CISS_REPORT_PHYS:</div><div class='del'>-                        /* Talking to controller so It's a physical command</div><div class='add'>+			/* Talking to controller so It's a physical command</div><div class='ctx'> 			   mode = 00 target = 0.  Nothing to write.</div><div class='del'>-                        */</div><div class='add'>+			 */</div><div class='ctx'> 			c-&gt;Request.CDBLen = 12;</div><div class='ctx'> 			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='ctx'> 			c-&gt;Request.Type.Direction = XFER_READ;</div><div class='ctx'> 			c-&gt;Request.Timeout = 0;</div><div class='ctx'> 			c-&gt;Request.CDB[0] = cmd;</div><div class='del'>-			c-&gt;Request.CDB[6] = (size &gt;&gt; 24) &amp; 0xFF;  //MSB</div><div class='add'>+			c-&gt;Request.CDB[6] = (size &gt;&gt; 24) &amp; 0xFF;	//MSB</div><div class='ctx'> 			c-&gt;Request.CDB[7] = (size &gt;&gt; 16) &amp; 0xFF;</div><div class='ctx'> 			c-&gt;Request.CDB[8] = (size &gt;&gt; 8) &amp; 0xFF;</div><div class='ctx'> 			c-&gt;Request.CDB[9] = size &amp; 0xFF;</div><div class='hunk'>@@ -1628,7 +1669,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,</div><div class='ctx'> 			c-&gt;Request.Type.Direction = XFER_READ;</div><div class='ctx'> 			c-&gt;Request.Timeout = 0;</div><div class='ctx'> 			c-&gt;Request.CDB[0] = cmd;</div><div class='del'>-		break;</div><div class='add'>+			break;</div><div class='ctx'> 		case CCISS_CACHE_FLUSH:</div><div class='ctx'> 			c-&gt;Request.CDBLen = 12;</div><div class='ctx'> 			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='hunk'>@@ -1636,32 +1677,32 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,</div><div class='ctx'> 			c-&gt;Request.Timeout = 0;</div><div class='ctx'> 			c-&gt;Request.CDB[0] = BMIC_WRITE;</div><div class='ctx'> 			c-&gt;Request.CDB[6] = BMIC_CACHE_FLUSH;</div><div class='del'>-		break;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='del'>-				"cciss%d:  Unknown Command 0x%c\n", ctlr, cmd);</div><div class='del'>-			return(IO_ERROR);</div><div class='add'>+			       "cciss%d:  Unknown Command 0x%c\n", ctlr, cmd);</div><div class='add'>+			return IO_ERROR;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (cmd_type == TYPE_MSG) {</div><div class='ctx'> 		switch (cmd) {</div><div class='del'>-		case 0: /* ABORT message */</div><div class='add'>+		case 0:	/* ABORT message */</div><div class='ctx'> 			c-&gt;Request.CDBLen = 12;</div><div class='ctx'> 			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='ctx'> 			c-&gt;Request.Type.Direction = XFER_WRITE;</div><div class='ctx'> 			c-&gt;Request.Timeout = 0;</div><div class='del'>-			c-&gt;Request.CDB[0] = cmd; /* abort */</div><div class='del'>-			c-&gt;Request.CDB[1] = 0;   /* abort a command */</div><div class='add'>+			c-&gt;Request.CDB[0] = cmd;	/* abort */</div><div class='add'>+			c-&gt;Request.CDB[1] = 0;	/* abort a command */</div><div class='ctx'> 			/* buff contains the tag of the command to abort */</div><div class='ctx'> 			memcpy(&amp;c-&gt;Request.CDB[4], buff, 8);</div><div class='ctx'> 			break;</div><div class='del'>-		case 1: /* RESET message */</div><div class='add'>+		case 1:	/* RESET message */</div><div class='ctx'> 			c-&gt;Request.CDBLen = 12;</div><div class='ctx'> 			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='ctx'> 			c-&gt;Request.Type.Direction = XFER_WRITE;</div><div class='ctx'> 			c-&gt;Request.Timeout = 0;</div><div class='ctx'> 			memset(&amp;c-&gt;Request.CDB[0], 0, sizeof(c-&gt;Request.CDB));</div><div class='del'>-			c-&gt;Request.CDB[0] = cmd;  /* reset */</div><div class='del'>-			c-&gt;Request.CDB[1] = 0x04; /* reset a LUN */</div><div class='add'>+			c-&gt;Request.CDB[0] = cmd;	/* reset */</div><div class='add'>+			c-&gt;Request.CDB[1] = 0x04;	/* reset a LUN */</div><div class='ctx'> 		case 3:	/* No-Op message */</div><div class='ctx'> 			c-&gt;Request.CDBLen = 1;</div><div class='ctx'> 			c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='hunk'>@@ -1671,168 +1712,164 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='del'>-				"cciss%d: unknown message type %d\n",</div><div class='del'>-				ctlr, cmd);</div><div class='add'>+			       "cciss%d: unknown message type %d\n", ctlr, cmd);</div><div class='ctx'> 			return IO_ERROR;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='del'>-			"cciss%d: unknown command type %d\n", ctlr, cmd_type);</div><div class='add'>+		       "cciss%d: unknown command type %d\n", ctlr, cmd_type);</div><div class='ctx'> 		return IO_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Fill in the scatter gather information */</div><div class='ctx'> 	if (size &gt; 0) {</div><div class='ctx'> 		buff_dma_handle.val = (__u64) pci_map_single(h-&gt;pdev,</div><div class='del'>-			buff, size, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+							     buff, size,</div><div class='add'>+							     PCI_DMA_BIDIRECTIONAL);</div><div class='ctx'> 		c-&gt;SG[0].Addr.lower = buff_dma_handle.val32.lower;</div><div class='ctx'> 		c-&gt;SG[0].Addr.upper = buff_dma_handle.val32.upper;</div><div class='ctx'> 		c-&gt;SG[0].Len = size;</div><div class='del'>-		c-&gt;SG[0].Ext = 0;  /* we are not chaining */</div><div class='add'>+		c-&gt;SG[0].Ext = 0;	/* we are not chaining */</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='del'>-static int sendcmd_withirq(__u8	cmd,</div><div class='del'>-	int	ctlr,</div><div class='del'>-	void	*buff,</div><div class='del'>-	size_t	size,</div><div class='del'>-	unsigned int use_unit_num,</div><div class='del'>-	unsigned int log_unit,</div><div class='del'>-	__u8	page_code,</div><div class='del'>-	int cmd_type)</div><div class='add'>+</div><div class='add'>+static int sendcmd_withirq(__u8 cmd,</div><div class='add'>+			   int ctlr,</div><div class='add'>+			   void *buff,</div><div class='add'>+			   size_t size,</div><div class='add'>+			   unsigned int use_unit_num,</div><div class='add'>+			   unsigned int log_unit, __u8 page_code, int cmd_type)</div><div class='ctx'> {</div><div class='ctx'> 	ctlr_info_t *h = hba[ctlr];</div><div class='ctx'> 	CommandList_struct *c;</div><div class='del'>-	u64bit	buff_dma_handle;</div><div class='add'>+	u64bit buff_dma_handle;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int return_status;</div><div class='ctx'> 	DECLARE_COMPLETION(wait);</div><div class='del'>-	</div><div class='del'>-	if ((c = cmd_alloc(h , 0)) == NULL)</div><div class='add'>+</div><div class='add'>+	if ((c = cmd_alloc(h, 0)) == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return_status = fill_cmd(c, cmd, ctlr, buff, size, use_unit_num,</div><div class='del'>-		log_unit, page_code, NULL, cmd_type);</div><div class='add'>+				 log_unit, page_code, NULL, cmd_type);</div><div class='ctx'> 	if (return_status != IO_OK) {</div><div class='ctx'> 		cmd_free(h, c, 0);</div><div class='ctx'> 		return return_status;</div><div class='ctx'> 	}</div><div class='del'>-resend_cmd2:</div><div class='add'>+      resend_cmd2:</div><div class='ctx'> 	c-&gt;waiting = &amp;wait;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Put the request on the tail of the queue and send it */</div><div class='ctx'> 	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> 	addQ(&amp;h-&gt;reqQ, c);</div><div class='ctx'> 	h-&gt;Qdepth++;</div><div class='ctx'> 	start_io(h);</div><div class='ctx'> 	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	wait_for_completion(&amp;wait);</div><div class='ctx'> </div><div class='del'>-	if(c-&gt;err_info-&gt;CommandStatus != 0) </div><div class='del'>-	{ /* an error has occurred */ </div><div class='del'>-		switch(c-&gt;err_info-&gt;CommandStatus)</div><div class='del'>-		{</div><div class='del'>-			case CMD_TARGET_STATUS:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p has "</div><div class='del'>-					" completed with errors\n", c);</div><div class='del'>-				if( c-&gt;err_info-&gt;ScsiStatus)</div><div class='del'>-                		{</div><div class='del'>-                    			printk(KERN_WARNING "cciss: cmd %p "</div><div class='del'>-					"has SCSI Status = %x\n",</div><div class='del'>-                        			c,  </div><div class='del'>-						c-&gt;err_info-&gt;ScsiStatus);</div><div class='del'>-                		}</div><div class='add'>+	if (c-&gt;err_info-&gt;CommandStatus != 0) {	/* an error has occurred */</div><div class='add'>+		switch (c-&gt;err_info-&gt;CommandStatus) {</div><div class='add'>+		case CMD_TARGET_STATUS:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p has "</div><div class='add'>+			       " completed with errors\n", c);</div><div class='add'>+			if (c-&gt;err_info-&gt;ScsiStatus) {</div><div class='add'>+				printk(KERN_WARNING "cciss: cmd %p "</div><div class='add'>+				       "has SCSI Status = %x\n",</div><div class='add'>+				       c, c-&gt;err_info-&gt;ScsiStatus);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_DATA_UNDERRUN:</div><div class='del'>-			case CMD_DATA_OVERRUN:</div><div class='add'>+		case CMD_DATA_UNDERRUN:</div><div class='add'>+		case CMD_DATA_OVERRUN:</div><div class='ctx'> 			/* expected for inquire and report lun commands */</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_INVALID:</div><div class='del'>-				printk(KERN_WARNING "cciss: Cmd %p is "</div><div class='del'>-					"reported invalid\n", c);</div><div class='del'>-				return_status = IO_ERROR;</div><div class='add'>+		case CMD_INVALID:</div><div class='add'>+			printk(KERN_WARNING "cciss: Cmd %p is "</div><div class='add'>+			       "reported invalid\n", c);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_PROTOCOL_ERR:</div><div class='del'>-                                printk(KERN_WARNING "cciss: cmd %p has "</div><div class='del'>-					"protocol error \n", c);</div><div class='del'>-                                return_status = IO_ERROR;</div><div class='del'>-                        break;</div><div class='del'>-case CMD_HARDWARE_ERR:</div><div class='del'>-                                printk(KERN_WARNING "cciss: cmd %p had " </div><div class='del'>-                                        " hardware error\n", c);</div><div class='del'>-                                return_status = IO_ERROR;</div><div class='del'>-                        break;</div><div class='del'>-			case CMD_CONNECTION_LOST:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p had "</div><div class='del'>-					"connection lost\n", c);</div><div class='del'>-				return_status = IO_ERROR;</div><div class='add'>+		case CMD_PROTOCOL_ERR:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p has "</div><div class='add'>+			       "protocol error \n", c);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_ABORTED:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p was "</div><div class='del'>-					"aborted\n", c);</div><div class='del'>-				return_status = IO_ERROR;</div><div class='add'>+		case CMD_HARDWARE_ERR:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p had "</div><div class='add'>+			       " hardware error\n", c);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_ABORT_FAILED:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p reports "</div><div class='del'>-					"abort failed\n", c);</div><div class='del'>-				return_status = IO_ERROR;</div><div class='add'>+		case CMD_CONNECTION_LOST:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p had "</div><div class='add'>+			       "connection lost\n", c);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_UNSOLICITED_ABORT:</div><div class='del'>-				printk(KERN_WARNING </div><div class='del'>-					"cciss%d: unsolicited abort %p\n",</div><div class='del'>-					ctlr, c);</div><div class='del'>-				if (c-&gt;retry_count &lt; MAX_CMD_RETRIES) {</div><div class='del'>-					printk(KERN_WARNING </div><div class='del'>-						"cciss%d: retrying %p\n", </div><div class='del'>-						ctlr, c);</div><div class='del'>-					c-&gt;retry_count++;</div><div class='del'>-					/* erase the old error information */</div><div class='del'>-					memset(c-&gt;err_info, 0,</div><div class='del'>-						sizeof(ErrorInfo_struct));</div><div class='del'>-					return_status = IO_OK;</div><div class='del'>-					INIT_COMPLETION(wait);</div><div class='del'>-					goto resend_cmd2;</div><div class='del'>-				}</div><div class='del'>-				return_status = IO_ERROR;</div><div class='add'>+		case CMD_ABORTED:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p was "</div><div class='add'>+			       "aborted\n", c);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='add'>+			break;</div><div class='add'>+		case CMD_ABORT_FAILED:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p reports "</div><div class='add'>+			       "abort failed\n", c);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='ctx'> 			break;</div><div class='del'>-			default:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p returned "</div><div class='del'>-					"unknown status %x\n", c, </div><div class='del'>-						c-&gt;err_info-&gt;CommandStatus); </div><div class='del'>-				return_status = IO_ERROR;</div><div class='add'>+		case CMD_UNSOLICITED_ABORT:</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "cciss%d: unsolicited abort %p\n", ctlr, c);</div><div class='add'>+			if (c-&gt;retry_count &lt; MAX_CMD_RETRIES) {</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "cciss%d: retrying %p\n", ctlr, c);</div><div class='add'>+				c-&gt;retry_count++;</div><div class='add'>+				/* erase the old error information */</div><div class='add'>+				memset(c-&gt;err_info, 0,</div><div class='add'>+				       sizeof(ErrorInfo_struct));</div><div class='add'>+				return_status = IO_OK;</div><div class='add'>+				INIT_COMPLETION(wait);</div><div class='add'>+				goto resend_cmd2;</div><div class='add'>+			}</div><div class='add'>+			return_status = IO_ERROR;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p returned "</div><div class='add'>+			       "unknown status %x\n", c,</div><div class='add'>+			       c-&gt;err_info-&gt;CommandStatus);</div><div class='add'>+			return_status = IO_ERROR;</div><div class='ctx'> 		}</div><div class='del'>-	}	</div><div class='add'>+	}</div><div class='ctx'> 	/* unlock the buffers from DMA */</div><div class='ctx'> 	buff_dma_handle.val32.lower = c-&gt;SG[0].Addr.lower;</div><div class='ctx'> 	buff_dma_handle.val32.upper = c-&gt;SG[0].Addr.upper;</div><div class='del'>-	pci_unmap_single( h-&gt;pdev, (dma_addr_t) buff_dma_handle.val,</div><div class='del'>-			c-&gt;SG[0].Len, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+	pci_unmap_single(h-&gt;pdev, (dma_addr_t) buff_dma_handle.val,</div><div class='add'>+			 c-&gt;SG[0].Len, PCI_DMA_BIDIRECTIONAL);</div><div class='ctx'> 	cmd_free(h, c, 0);</div><div class='del'>-        return(return_status);</div><div class='del'>-</div><div class='add'>+	return return_status;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static void cciss_geometry_inquiry(int ctlr, int logvol,</div><div class='del'>-			int withirq, unsigned int total_size,</div><div class='del'>-			unsigned int block_size, InquiryData_struct *inq_buff,</div><div class='del'>-			drive_info_struct *drv)</div><div class='add'>+				   int withirq, unsigned int total_size,</div><div class='add'>+				   unsigned int block_size,</div><div class='add'>+				   InquiryData_struct *inq_buff,</div><div class='add'>+				   drive_info_struct *drv)</div><div class='ctx'> {</div><div class='ctx'> 	int return_code;</div><div class='ctx'> 	memset(inq_buff, 0, sizeof(InquiryData_struct));</div><div class='ctx'> 	if (withirq)</div><div class='ctx'> 		return_code = sendcmd_withirq(CISS_INQUIRY, ctlr,</div><div class='del'>-			inq_buff, sizeof(*inq_buff), 1, logvol ,0xC1, TYPE_CMD);</div><div class='add'>+					      inq_buff, sizeof(*inq_buff), 1,</div><div class='add'>+					      logvol, 0xC1, TYPE_CMD);</div><div class='ctx'> 	else</div><div class='ctx'> 		return_code = sendcmd(CISS_INQUIRY, ctlr, inq_buff,</div><div class='del'>-			sizeof(*inq_buff), 1, logvol ,0xC1, NULL, TYPE_CMD);</div><div class='add'>+				      sizeof(*inq_buff), 1, logvol, 0xC1, NULL,</div><div class='add'>+				      TYPE_CMD);</div><div class='ctx'> 	if (return_code == IO_OK) {</div><div class='del'>-		if(inq_buff-&gt;data_byte[8] == 0xFF) {</div><div class='add'>+		if (inq_buff-&gt;data_byte[8] == 0xFF) {</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='del'>-				"cciss: reading geometry failed, volume "</div><div class='del'>-				"does not support reading geometry\n");</div><div class='add'>+			       "cciss: reading geometry failed, volume "</div><div class='add'>+			       "does not support reading geometry\n");</div><div class='ctx'> 			drv-&gt;block_size = block_size;</div><div class='ctx'> 			drv-&gt;nr_blocks = total_size;</div><div class='ctx'> 			drv-&gt;heads = 255;</div><div class='del'>-			drv-&gt;sectors = 32; // Sectors per track</div><div class='add'>+			drv-&gt;sectors = 32;	// Sectors per track</div><div class='ctx'> 			drv-&gt;cylinders = total_size / 255 / 32;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			unsigned int t;</div><div class='hunk'>@@ -1846,37 +1883,42 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,</div><div class='ctx'> 			drv-&gt;raid_level = inq_buff-&gt;data_byte[8];</div><div class='ctx'> 			t = drv-&gt;heads * drv-&gt;sectors;</div><div class='ctx'> 			if (t &gt; 1) {</div><div class='del'>-				drv-&gt;cylinders = total_size/t;</div><div class='add'>+				drv-&gt;cylinders = total_size / t;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	} else { /* Get geometry failed */</div><div class='add'>+	} else {		/* Get geometry failed */</div><div class='ctx'> 		printk(KERN_WARNING "cciss: reading geometry failed\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "      heads= %d, sectors= %d, cylinders= %d\n\n",</div><div class='del'>-		drv-&gt;heads, drv-&gt;sectors, drv-&gt;cylinders);</div><div class='add'>+	       drv-&gt;heads, drv-&gt;sectors, drv-&gt;cylinders);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> cciss_read_capacity(int ctlr, int logvol, ReadCapdata_struct *buf,</div><div class='del'>-		int withirq, unsigned int *total_size, unsigned int *block_size)</div><div class='add'>+		    int withirq, unsigned int *total_size,</div><div class='add'>+		    unsigned int *block_size)</div><div class='ctx'> {</div><div class='ctx'> 	int return_code;</div><div class='ctx'> 	memset(buf, 0, sizeof(*buf));</div><div class='ctx'> 	if (withirq)</div><div class='ctx'> 		return_code = sendcmd_withirq(CCISS_READ_CAPACITY,</div><div class='del'>-			ctlr, buf, sizeof(*buf), 1, logvol, 0, TYPE_CMD);</div><div class='add'>+					      ctlr, buf, sizeof(*buf), 1,</div><div class='add'>+					      logvol, 0, TYPE_CMD);</div><div class='ctx'> 	else</div><div class='ctx'> 		return_code = sendcmd(CCISS_READ_CAPACITY,</div><div class='del'>-			ctlr, buf, sizeof(*buf), 1, logvol, 0, NULL, TYPE_CMD);</div><div class='add'>+				      ctlr, buf, sizeof(*buf), 1, logvol, 0,</div><div class='add'>+				      NULL, TYPE_CMD);</div><div class='ctx'> 	if (return_code == IO_OK) {</div><div class='del'>-		*total_size = be32_to_cpu(*((__be32 *) &amp;buf-&gt;total_size[0]))+1;</div><div class='del'>-		*block_size = be32_to_cpu(*((__be32 *) &amp;buf-&gt;block_size[0]));</div><div class='del'>-	} else { /* read capacity command failed */</div><div class='add'>+		*total_size =</div><div class='add'>+		    be32_to_cpu(*((__be32 *) &amp; buf-&gt;total_size[0])) + 1;</div><div class='add'>+		*block_size = be32_to_cpu(*((__be32 *) &amp; buf-&gt;block_size[0]));</div><div class='add'>+	} else {		/* read capacity command failed */</div><div class='ctx'> 		printk(KERN_WARNING "cciss: read capacity failed\n");</div><div class='ctx'> 		*total_size = 0;</div><div class='ctx'> 		*block_size = BLOCK_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "      blocks= %u block_size= %d\n",</div><div class='del'>-		*total_size, *block_size);</div><div class='add'>+	       *total_size, *block_size);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1885,38 +1927,38 @@ static int cciss_revalidate(struct gendisk *disk)</div><div class='ctx'> 	ctlr_info_t *h = get_host(disk);</div><div class='ctx'> 	drive_info_struct *drv = get_drv(disk);</div><div class='ctx'> 	int logvol;</div><div class='del'>-	int FOUND=0;</div><div class='add'>+	int FOUND = 0;</div><div class='ctx'> 	unsigned int block_size;</div><div class='ctx'> 	unsigned int total_size;</div><div class='ctx'> 	ReadCapdata_struct *size_buff = NULL;</div><div class='ctx'> 	InquiryData_struct *inq_buff = NULL;</div><div class='ctx'> </div><div class='del'>-	for(logvol=0; logvol &lt; CISS_MAX_LUN; logvol++)</div><div class='del'>-	{</div><div class='del'>-		if(h-&gt;drv[logvol].LunID == drv-&gt;LunID) {</div><div class='del'>-			FOUND=1;</div><div class='add'>+	for (logvol = 0; logvol &lt; CISS_MAX_LUN; logvol++) {</div><div class='add'>+		if (h-&gt;drv[logvol].LunID == drv-&gt;LunID) {</div><div class='add'>+			FOUND = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!FOUND) return 1;</div><div class='add'>+	if (!FOUND)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);</div><div class='del'>-        if (size_buff == NULL)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_WARNING "cciss: out of memory\n");</div><div class='del'>-                return 1;</div><div class='del'>-        }</div><div class='del'>-	inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);</div><div class='del'>-        if (inq_buff == NULL)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_WARNING "cciss: out of memory\n");</div><div class='add'>+	size_buff = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);</div><div class='add'>+	if (size_buff == NULL) {</div><div class='add'>+		printk(KERN_WARNING "cciss: out of memory\n");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);</div><div class='add'>+	if (inq_buff == NULL) {</div><div class='add'>+		printk(KERN_WARNING "cciss: out of memory\n");</div><div class='ctx'> 		kfree(size_buff);</div><div class='del'>-                return 1;</div><div class='del'>-        }</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	cciss_read_capacity(h-&gt;ctlr, logvol, size_buff, 1, &amp;total_size, &amp;block_size);</div><div class='del'>-	cciss_geometry_inquiry(h-&gt;ctlr, logvol, 1, total_size, block_size, inq_buff, drv);</div><div class='add'>+	cciss_read_capacity(h-&gt;ctlr, logvol, size_buff, 1, &amp;total_size,</div><div class='add'>+			    &amp;block_size);</div><div class='add'>+	cciss_geometry_inquiry(h-&gt;ctlr, logvol, 1, total_size, block_size,</div><div class='add'>+			       inq_buff, drv);</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_hardsect_size(drv-&gt;queue, drv-&gt;block_size);</div><div class='ctx'> 	set_capacity(disk, drv-&gt;nr_blocks);</div><div class='hunk'>@@ -1943,7 +1985,7 @@ static unsigned long pollcomplete(int ctlr)</div><div class='ctx'> 		if (done == FIFO_EMPTY)</div><div class='ctx'> 			schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		else</div><div class='del'>-			return (done);</div><div class='add'>+			return done;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Invalid address to tell caller we ran out of time */</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1952,28 +1994,28 @@ static unsigned long pollcomplete(int ctlr)</div><div class='ctx'> static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)</div><div class='ctx'> {</div><div class='ctx'> 	/* We get in here if sendcmd() is polling for completions</div><div class='del'>-	   and gets some command back that it wasn't expecting -- </div><div class='del'>-	   something other than that which it just sent down.  </div><div class='del'>-	   Ordinarily, that shouldn't happen, but it can happen when </div><div class='add'>+	   and gets some command back that it wasn't expecting --</div><div class='add'>+	   something other than that which it just sent down.</div><div class='add'>+	   Ordinarily, that shouldn't happen, but it can happen when</div><div class='ctx'> 	   the scsi tape stuff gets into error handling mode, and</div><div class='del'>-	   starts using sendcmd() to try to abort commands and </div><div class='add'>+	   starts using sendcmd() to try to abort commands and</div><div class='ctx'> 	   reset tape drives.  In that case, sendcmd may pick up</div><div class='ctx'> 	   completions of commands that were sent to logical drives</div><div class='del'>-	   through the block i/o system, or cciss ioctls completing, etc. </div><div class='add'>+	   through the block i/o system, or cciss ioctls completing, etc.</div><div class='ctx'> 	   In that case, we need to save those completions for later</div><div class='ctx'> 	   processing by the interrupt handler.</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='del'>-	struct sendcmd_reject_list *srl = &amp;hba[ctlr]-&gt;scsi_rejects;	</div><div class='add'>+	struct sendcmd_reject_list *srl = &amp;hba[ctlr]-&gt;scsi_rejects;</div><div class='ctx'> </div><div class='ctx'> 	/* If it's not the scsi tape stuff doing error handling, (abort */</div><div class='ctx'> 	/* or reset) then we don't expect anything weird. */</div><div class='ctx'> 	if (cmd != CCISS_RESET_MSG &amp;&amp; cmd != CCISS_ABORT_MSG) {</div><div class='ctx'> #endif</div><div class='del'>-		printk( KERN_WARNING "cciss cciss%d: SendCmd "</div><div class='del'>-		      "Invalid command list address returned! (%lx)\n",</div><div class='del'>-			ctlr, complete);</div><div class='add'>+		printk(KERN_WARNING "cciss cciss%d: SendCmd "</div><div class='add'>+		       "Invalid command list address returned! (%lx)\n",</div><div class='add'>+		       ctlr, complete);</div><div class='ctx'> 		/* not much we can do. */</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1984,7 +2026,7 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)</div><div class='ctx'> 	if (srl-&gt;ncompletions &gt;= (NR_CMDS + 2)) {</div><div class='ctx'> 		/* Uh oh.  No room to save it for later... */</div><div class='ctx'> 		printk(KERN_WARNING "cciss%d: Sendcmd: Invalid command addr, "</div><div class='del'>-			"reject list overflow, command lost!\n", ctlr);</div><div class='add'>+		       "reject list overflow, command lost!\n", ctlr);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Save it for later */</div><div class='hunk'>@@ -1995,340 +2037,327 @@ static int add_sendcmd_reject(__u8 cmd, int ctlr, unsigned long complete)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Send a command to the controller, and wait for it to complete.  </div><div class='del'>- * Only used at init time. </div><div class='add'>+ * Send a command to the controller, and wait for it to complete.</div><div class='add'>+ * Only used at init time.</div><div class='ctx'>  */</div><div class='del'>-static int sendcmd(</div><div class='del'>-	__u8	cmd,</div><div class='del'>-	int	ctlr,</div><div class='del'>-	void	*buff,</div><div class='del'>-	size_t	size,</div><div class='del'>-	unsigned int use_unit_num, /* 0: address the controller,</div><div class='del'>-				      1: address logical volume log_unit, </div><div class='del'>-				      2: periph device address is scsi3addr */</div><div class='del'>-	unsigned int log_unit,</div><div class='del'>-	__u8	page_code,</div><div class='del'>-	unsigned char *scsi3addr,</div><div class='del'>-	int cmd_type)</div><div class='add'>+static int sendcmd(__u8 cmd, int ctlr, void *buff, size_t size, unsigned int use_unit_num,	/* 0: address the controller,</div><div class='add'>+												   1: address logical volume log_unit,</div><div class='add'>+												   2: periph device address is scsi3addr */</div><div class='add'>+		   unsigned int log_unit,</div><div class='add'>+		   __u8 page_code, unsigned char *scsi3addr, int cmd_type)</div><div class='ctx'> {</div><div class='ctx'> 	CommandList_struct *c;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long complete;</div><div class='del'>-	ctlr_info_t *info_p= hba[ctlr];</div><div class='add'>+	ctlr_info_t *info_p = hba[ctlr];</div><div class='ctx'> 	u64bit buff_dma_handle;</div><div class='ctx'> 	int status, done = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((c = cmd_alloc(info_p, 1)) == NULL) {</div><div class='ctx'> 		printk(KERN_WARNING "cciss: unable to get memory");</div><div class='del'>-		return(IO_ERROR);</div><div class='add'>+		return IO_ERROR;</div><div class='ctx'> 	}</div><div class='ctx'> 	status = fill_cmd(c, cmd, ctlr, buff, size, use_unit_num,</div><div class='del'>-		log_unit, page_code, scsi3addr, cmd_type);</div><div class='add'>+			  log_unit, page_code, scsi3addr, cmd_type);</div><div class='ctx'> 	if (status != IO_OK) {</div><div class='ctx'> 		cmd_free(info_p, c, 1);</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='del'>-resend_cmd1:</div><div class='add'>+      resend_cmd1:</div><div class='ctx'> 	/*</div><div class='del'>-         * Disable interrupt</div><div class='del'>-         */</div><div class='add'>+	 * Disable interrupt</div><div class='add'>+	 */</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk(KERN_DEBUG "cciss: turning intr off\n");</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='del'>-        info_p-&gt;access.set_intr_mask(info_p, CCISS_INTR_OFF);</div><div class='del'>-	</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+	info_p-&gt;access.set_intr_mask(info_p, CCISS_INTR_OFF);</div><div class='add'>+</div><div class='ctx'> 	/* Make sure there is room in the command FIFO */</div><div class='del'>-        /* Actually it should be completely empty at this time */</div><div class='add'>+	/* Actually it should be completely empty at this time */</div><div class='ctx'> 	/* unless we are in here doing error handling for the scsi */</div><div class='ctx'> 	/* tape side of the driver. */</div><div class='del'>-        for (i = 200000; i &gt; 0; i--) </div><div class='del'>-	{</div><div class='add'>+	for (i = 200000; i &gt; 0; i--) {</div><div class='ctx'> 		/* if fifo isn't full go */</div><div class='del'>-                if (!(info_p-&gt;access.fifo_full(info_p))) </div><div class='del'>-		{</div><div class='del'>-			</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-                udelay(10);</div><div class='del'>-                printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full,"</div><div class='del'>-                        " waiting!\n", ctlr);</div><div class='del'>-        }</div><div class='del'>-        /*</div><div class='del'>-         * Send the cmd</div><div class='del'>-         */</div><div class='del'>-        info_p-&gt;access.submit_command(info_p, c);</div><div class='add'>+		if (!(info_p-&gt;access.fifo_full(info_p))) {</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		udelay(10);</div><div class='add'>+		printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full,"</div><div class='add'>+		       " waiting!\n", ctlr);</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Send the cmd</div><div class='add'>+	 */</div><div class='add'>+	info_p-&gt;access.submit_command(info_p, c);</div><div class='ctx'> 	done = 0;</div><div class='ctx'> 	do {</div><div class='ctx'> 		complete = pollcomplete(ctlr);</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 		printk(KERN_DEBUG "cciss: command completed\n");</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 		if (complete == 1) {</div><div class='del'>-			printk( KERN_WARNING</div><div class='del'>-				"cciss cciss%d: SendCmd Timeout out, "</div><div class='del'>-				"No command list address returned!\n",</div><div class='del'>-				ctlr);</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "cciss cciss%d: SendCmd Timeout out, "</div><div class='add'>+			       "No command list address returned!\n", ctlr);</div><div class='ctx'> 			status = IO_ERROR;</div><div class='ctx'> 			done = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* This will need to change for direct lookup completions */</div><div class='del'>-		if ( (complete &amp; CISS_ERROR_BIT)</div><div class='del'>-		     &amp;&amp; (complete &amp; ~CISS_ERROR_BIT) == c-&gt;busaddr)</div><div class='del'>-		     {</div><div class='del'>-			/* if data overrun or underun on Report command </div><div class='del'>-				ignore it </div><div class='del'>-			*/</div><div class='add'>+		if ((complete &amp; CISS_ERROR_BIT)</div><div class='add'>+		    &amp;&amp; (complete &amp; ~CISS_ERROR_BIT) == c-&gt;busaddr) {</div><div class='add'>+			/* if data overrun or underun on Report command</div><div class='add'>+			   ignore it</div><div class='add'>+			 */</div><div class='ctx'> 			if (((c-&gt;Request.CDB[0] == CISS_REPORT_LOG) ||</div><div class='ctx'> 			     (c-&gt;Request.CDB[0] == CISS_REPORT_PHYS) ||</div><div class='ctx'> 			     (c-&gt;Request.CDB[0] == CISS_INQUIRY)) &amp;&amp;</div><div class='del'>-				((c-&gt;err_info-&gt;CommandStatus == </div><div class='del'>-					CMD_DATA_OVERRUN) || </div><div class='del'>-				 (c-&gt;err_info-&gt;CommandStatus == </div><div class='del'>-					CMD_DATA_UNDERRUN)</div><div class='del'>-			 	))</div><div class='del'>-			{</div><div class='add'>+			    ((c-&gt;err_info-&gt;CommandStatus ==</div><div class='add'>+			      CMD_DATA_OVERRUN) ||</div><div class='add'>+			     (c-&gt;err_info-&gt;CommandStatus == CMD_DATA_UNDERRUN)</div><div class='add'>+			    )) {</div><div class='ctx'> 				complete = c-&gt;busaddr;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (c-&gt;err_info-&gt;CommandStatus ==</div><div class='del'>-						CMD_UNSOLICITED_ABORT) {</div><div class='add'>+				    CMD_UNSOLICITED_ABORT) {</div><div class='ctx'> 					printk(KERN_WARNING "cciss%d: "</div><div class='del'>-						"unsolicited abort %p\n",</div><div class='del'>-						ctlr, c);</div><div class='add'>+					       "unsolicited abort %p\n",</div><div class='add'>+					       ctlr, c);</div><div class='ctx'> 					if (c-&gt;retry_count &lt; MAX_CMD_RETRIES) {</div><div class='ctx'> 						printk(KERN_WARNING</div><div class='del'>-						   "cciss%d: retrying %p\n",</div><div class='del'>-						   ctlr, c);</div><div class='add'>+						       "cciss%d: retrying %p\n",</div><div class='add'>+						       ctlr, c);</div><div class='ctx'> 						c-&gt;retry_count++;</div><div class='ctx'> 						/* erase the old error */</div><div class='ctx'> 						/* information */</div><div class='ctx'> 						memset(c-&gt;err_info, 0,</div><div class='del'>-						   sizeof(ErrorInfo_struct));</div><div class='add'>+						       sizeof</div><div class='add'>+						       (ErrorInfo_struct));</div><div class='ctx'> 						goto resend_cmd1;</div><div class='ctx'> 					} else {</div><div class='ctx'> 						printk(KERN_WARNING</div><div class='del'>-						   "cciss%d: retried %p too "</div><div class='del'>-						   "many times\n", ctlr, c);</div><div class='add'>+						       "cciss%d: retried %p too "</div><div class='add'>+						       "many times\n", ctlr, c);</div><div class='ctx'> 						status = IO_ERROR;</div><div class='ctx'> 						goto cleanup1;</div><div class='ctx'> 					}</div><div class='del'>-				} else if (c-&gt;err_info-&gt;CommandStatus == CMD_UNABORTABLE) {</div><div class='del'>-					printk(KERN_WARNING "cciss%d: command could not be aborted.\n", ctlr);</div><div class='add'>+				} else if (c-&gt;err_info-&gt;CommandStatus ==</div><div class='add'>+					   CMD_UNABORTABLE) {</div><div class='add'>+					printk(KERN_WARNING</div><div class='add'>+					       "cciss%d: command could not be aborted.\n",</div><div class='add'>+					       ctlr);</div><div class='ctx'> 					status = IO_ERROR;</div><div class='ctx'> 					goto cleanup1;</div><div class='ctx'> 				}</div><div class='ctx'> 				printk(KERN_WARNING "ciss ciss%d: sendcmd"</div><div class='del'>-				" Error %x \n", ctlr, </div><div class='del'>-					c-&gt;err_info-&gt;CommandStatus); </div><div class='add'>+				       " Error %x \n", ctlr,</div><div class='add'>+				       c-&gt;err_info-&gt;CommandStatus);</div><div class='ctx'> 				printk(KERN_WARNING "ciss ciss%d: sendcmd"</div><div class='del'>-				" offensive info\n"</div><div class='del'>-				"  size %x\n   num %x   value %x\n", ctlr,</div><div class='del'>-				  c-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.offense_size,</div><div class='del'>-				  c-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.offense_num,</div><div class='del'>-				  c-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.offense_value);</div><div class='add'>+				       " offensive info\n"</div><div class='add'>+				       "  size %x\n   num %x   value %x\n",</div><div class='add'>+				       ctlr,</div><div class='add'>+				       c-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.</div><div class='add'>+				       offense_size,</div><div class='add'>+				       c-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.</div><div class='add'>+				       offense_num,</div><div class='add'>+				       c-&gt;err_info-&gt;MoreErrInfo.Invalid_Cmd.</div><div class='add'>+				       offense_value);</div><div class='ctx'> 				status = IO_ERROR;</div><div class='ctx'> 				goto cleanup1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* This will need changing for direct lookup completions */</div><div class='del'>-                if (complete != c-&gt;busaddr) {</div><div class='add'>+		if (complete != c-&gt;busaddr) {</div><div class='ctx'> 			if (add_sendcmd_reject(cmd, ctlr, complete) != 0) {</div><div class='del'>-				BUG(); /* we are pretty much hosed if we get here. */</div><div class='add'>+				BUG();	/* we are pretty much hosed if we get here. */</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='del'>-                } else</div><div class='add'>+		} else</div><div class='ctx'> 			done = 1;</div><div class='del'>-        } while (!done);</div><div class='del'>-		</div><div class='del'>-cleanup1:	</div><div class='add'>+	} while (!done);</div><div class='add'>+</div><div class='add'>+      cleanup1:</div><div class='ctx'> 	/* unlock the data buffer from DMA */</div><div class='ctx'> 	buff_dma_handle.val32.lower = c-&gt;SG[0].Addr.lower;</div><div class='ctx'> 	buff_dma_handle.val32.upper = c-&gt;SG[0].Addr.upper;</div><div class='ctx'> 	pci_unmap_single(info_p-&gt;pdev, (dma_addr_t) buff_dma_handle.val,</div><div class='del'>-				c-&gt;SG[0].Len, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+			 c-&gt;SG[0].Len, PCI_DMA_BIDIRECTIONAL);</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> 	/* if we saved some commands for later, process them now. */</div><div class='ctx'> 	if (info_p-&gt;scsi_rejects.ncompletions &gt; 0)</div><div class='ctx'> 		do_cciss_intr(0, info_p, NULL);</div><div class='ctx'> #endif</div><div class='ctx'> 	cmd_free(info_p, c, 1);</div><div class='del'>-	return (status);</div><div class='del'>-} </div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Map (physical) PCI mem into (virtual) kernel space</div><div class='ctx'>  */</div><div class='ctx'> static void __iomem *remap_pci_mem(ulong base, ulong size)</div><div class='ctx'> {</div><div class='del'>-        ulong page_base        = ((ulong) base) &amp; PAGE_MASK;</div><div class='del'>-        ulong page_offs        = ((ulong) base) - page_base;</div><div class='del'>-        void __iomem *page_remapped = ioremap(page_base, page_offs+size);</div><div class='add'>+	ulong page_base = ((ulong) base) &amp; PAGE_MASK;</div><div class='add'>+	ulong page_offs = ((ulong) base) - page_base;</div><div class='add'>+	void __iomem *page_remapped = ioremap(page_base, page_offs + size);</div><div class='ctx'> </div><div class='del'>-        return page_remapped ? (page_remapped + page_offs) : NULL;</div><div class='add'>+	return page_remapped ? (page_remapped + page_offs) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Takes jobs of the Q and sends them to the hardware, then puts it on </div><div class='del'>- * the Q to wait for completion. </div><div class='del'>- */ </div><div class='del'>-static void start_io( ctlr_info_t *h)</div><div class='add'>+/*</div><div class='add'>+ * Takes jobs of the Q and sends them to the hardware, then puts it on</div><div class='add'>+ * the Q to wait for completion.</div><div class='add'>+ */</div><div class='add'>+static void start_io(ctlr_info_t *h)</div><div class='ctx'> {</div><div class='ctx'> 	CommandList_struct *c;</div><div class='del'>-	</div><div class='del'>-	while(( c = h-&gt;reqQ) != NULL )</div><div class='del'>-	{</div><div class='add'>+</div><div class='add'>+	while ((c = h-&gt;reqQ) != NULL) {</div><div class='ctx'> 		/* can't do anything if fifo is full */</div><div class='ctx'> 		if ((h-&gt;access.fifo_full(h))) {</div><div class='ctx'> 			printk(KERN_WARNING "cciss: fifo full\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Get the first entry from the Request Q */ </div><div class='add'>+		/* Get the first entry from the Request Q */</div><div class='ctx'> 		removeQ(&amp;(h-&gt;reqQ), c);</div><div class='ctx'> 		h-&gt;Qdepth--;</div><div class='del'>-	</div><div class='del'>-		/* Tell the controller execute command */ </div><div class='add'>+</div><div class='add'>+		/* Tell the controller execute command */</div><div class='ctx'> 		h-&gt;access.submit_command(h, c);</div><div class='del'>-		</div><div class='del'>-		/* Put job onto the completed Q */ </div><div class='del'>-		addQ (&amp;(h-&gt;cmpQ), c); </div><div class='add'>+</div><div class='add'>+		/* Put job onto the completed Q */</div><div class='add'>+		addQ(&amp;(h-&gt;cmpQ), c);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /* Assumes that CCISS_LOCK(h-&gt;ctlr) is held. */</div><div class='ctx'> /* Zeros out the error record and then resends the command back */</div><div class='ctx'> /* to the controller */</div><div class='del'>-static inline void resend_cciss_cmd( ctlr_info_t *h, CommandList_struct *c)</div><div class='add'>+static inline void resend_cciss_cmd(ctlr_info_t *h, CommandList_struct *c)</div><div class='ctx'> {</div><div class='ctx'> 	/* erase the old error information */</div><div class='ctx'> 	memset(c-&gt;err_info, 0, sizeof(ErrorInfo_struct));</div><div class='ctx'> </div><div class='ctx'> 	/* add it to software queue and then send it to the controller */</div><div class='del'>-	addQ(&amp;(h-&gt;reqQ),c);</div><div class='add'>+	addQ(&amp;(h-&gt;reqQ), c);</div><div class='ctx'> 	h-&gt;Qdepth++;</div><div class='del'>-	if(h-&gt;Qdepth &gt; h-&gt;maxQsinceinit)</div><div class='add'>+	if (h-&gt;Qdepth &gt; h-&gt;maxQsinceinit)</div><div class='ctx'> 		h-&gt;maxQsinceinit = h-&gt;Qdepth;</div><div class='ctx'> </div><div class='ctx'> 	start_io(h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* checks the status of the job and calls complete buffers to mark all </div><div class='add'>+/* checks the status of the job and calls complete buffers to mark all</div><div class='ctx'>  * buffers for the completed job. Note that this function does not need</div><div class='ctx'>  * to hold the hba/queue lock.</div><div class='del'>- */ </div><div class='del'>-static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd,</div><div class='del'>-		int timeout)</div><div class='add'>+ */</div><div class='add'>+static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,</div><div class='add'>+				    int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	int status = 1;</div><div class='ctx'> 	int retry_cmd = 0;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	if (timeout)</div><div class='del'>-		status = 0; </div><div class='add'>+		status = 0;</div><div class='ctx'> </div><div class='del'>-	if(cmd-&gt;err_info-&gt;CommandStatus != 0) </div><div class='del'>-	{ /* an error has occurred */ </div><div class='del'>-		switch(cmd-&gt;err_info-&gt;CommandStatus)</div><div class='del'>-		{</div><div class='add'>+	if (cmd-&gt;err_info-&gt;CommandStatus != 0) {	/* an error has occurred */</div><div class='add'>+		switch (cmd-&gt;err_info-&gt;CommandStatus) {</div><div class='ctx'> 			unsigned char sense_key;</div><div class='del'>-			case CMD_TARGET_STATUS:</div><div class='del'>-				status = 0;</div><div class='del'>-			</div><div class='del'>-				if( cmd-&gt;err_info-&gt;ScsiStatus == 0x02)</div><div class='del'>-				{</div><div class='del'>-					printk(KERN_WARNING "cciss: cmd %p "</div><div class='del'>-                                        	"has CHECK CONDITION "</div><div class='del'>-						" byte 2 = 0x%x\n", cmd,</div><div class='del'>-						cmd-&gt;err_info-&gt;SenseInfo[2]</div><div class='del'>-					);</div><div class='del'>-					/* check the sense key */</div><div class='del'>-					sense_key = 0xf &amp; </div><div class='del'>-						cmd-&gt;err_info-&gt;SenseInfo[2];</div><div class='del'>-					/* no status or recovered error */</div><div class='del'>-					if((sense_key == 0x0) ||</div><div class='del'>-					    (sense_key == 0x1))</div><div class='del'>-					{</div><div class='del'>-							status = 1;</div><div class='del'>-					}</div><div class='del'>-				} else</div><div class='del'>-				{</div><div class='del'>-					printk(KERN_WARNING "cciss: cmd %p "</div><div class='del'>-                                                "has SCSI Status 0x%x\n",</div><div class='del'>-						cmd, cmd-&gt;err_info-&gt;ScsiStatus);</div><div class='add'>+		case CMD_TARGET_STATUS:</div><div class='add'>+			status = 0;</div><div class='add'>+</div><div class='add'>+			if (cmd-&gt;err_info-&gt;ScsiStatus == 0x02) {</div><div class='add'>+				printk(KERN_WARNING "cciss: cmd %p "</div><div class='add'>+				       "has CHECK CONDITION "</div><div class='add'>+				       " byte 2 = 0x%x\n", cmd,</div><div class='add'>+				       cmd-&gt;err_info-&gt;SenseInfo[2]</div><div class='add'>+				    );</div><div class='add'>+				/* check the sense key */</div><div class='add'>+				sense_key = 0xf &amp; cmd-&gt;err_info-&gt;SenseInfo[2];</div><div class='add'>+				/* no status or recovered error */</div><div class='add'>+				if ((sense_key == 0x0) || (sense_key == 0x1)) {</div><div class='add'>+					status = 1;</div><div class='ctx'> 				}</div><div class='add'>+			} else {</div><div class='add'>+				printk(KERN_WARNING "cciss: cmd %p "</div><div class='add'>+				       "has SCSI Status 0x%x\n",</div><div class='add'>+				       cmd, cmd-&gt;err_info-&gt;ScsiStatus);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_DATA_UNDERRUN:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p has"</div><div class='del'>-					" completed with data underrun "</div><div class='del'>-					"reported\n", cmd);</div><div class='add'>+		case CMD_DATA_UNDERRUN:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p has"</div><div class='add'>+			       " completed with data underrun "</div><div class='add'>+			       "reported\n", cmd);</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_DATA_OVERRUN:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p has"</div><div class='del'>-					" completed with data overrun "</div><div class='del'>-					"reported\n", cmd);</div><div class='add'>+		case CMD_DATA_OVERRUN:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p has"</div><div class='add'>+			       " completed with data overrun "</div><div class='add'>+			       "reported\n", cmd);</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_INVALID:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p is "</div><div class='del'>-					"reported invalid\n", cmd);</div><div class='del'>-				status = 0;</div><div class='add'>+		case CMD_INVALID:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p is "</div><div class='add'>+			       "reported invalid\n", cmd);</div><div class='add'>+			status = 0;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_PROTOCOL_ERR:</div><div class='del'>-                                printk(KERN_WARNING "cciss: cmd %p has "</div><div class='del'>-					"protocol error \n", cmd);</div><div class='del'>-                                status = 0;</div><div class='del'>-                        break;</div><div class='del'>-			case CMD_HARDWARE_ERR:</div><div class='del'>-                                printk(KERN_WARNING "cciss: cmd %p had " </div><div class='del'>-                                        " hardware error\n", cmd);</div><div class='del'>-                                status = 0;</div><div class='del'>-                        break;</div><div class='del'>-			case CMD_CONNECTION_LOST:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p had "</div><div class='del'>-					"connection lost\n", cmd);</div><div class='del'>-				status=0;</div><div class='add'>+		case CMD_PROTOCOL_ERR:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p has "</div><div class='add'>+			       "protocol error \n", cmd);</div><div class='add'>+			status = 0;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_ABORTED:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p was "</div><div class='del'>-					"aborted\n", cmd);</div><div class='del'>-				status=0;</div><div class='add'>+		case CMD_HARDWARE_ERR:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p had "</div><div class='add'>+			       " hardware error\n", cmd);</div><div class='add'>+			status = 0;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_ABORT_FAILED:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p reports "</div><div class='del'>-					"abort failed\n", cmd);</div><div class='del'>-				status=0;</div><div class='add'>+		case CMD_CONNECTION_LOST:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p had "</div><div class='add'>+			       "connection lost\n", cmd);</div><div class='add'>+			status = 0;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_UNSOLICITED_ABORT:</div><div class='del'>-				printk(KERN_WARNING "cciss%d: unsolicited "</div><div class='del'>-					"abort %p\n", h-&gt;ctlr, cmd);</div><div class='del'>-				if (cmd-&gt;retry_count &lt; MAX_CMD_RETRIES) {</div><div class='del'>-					retry_cmd=1;</div><div class='del'>-					printk(KERN_WARNING</div><div class='del'>-						"cciss%d: retrying %p\n",</div><div class='del'>-						h-&gt;ctlr, cmd);</div><div class='del'>-					cmd-&gt;retry_count++;</div><div class='del'>-				} else</div><div class='del'>-					printk(KERN_WARNING</div><div class='del'>-						"cciss%d: %p retried too "</div><div class='del'>-						"many times\n", h-&gt;ctlr, cmd);</div><div class='del'>-				status=0;</div><div class='add'>+		case CMD_ABORTED:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p was "</div><div class='add'>+			       "aborted\n", cmd);</div><div class='add'>+			status = 0;</div><div class='add'>+			break;</div><div class='add'>+		case CMD_ABORT_FAILED:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p reports "</div><div class='add'>+			       "abort failed\n", cmd);</div><div class='add'>+			status = 0;</div><div class='add'>+			break;</div><div class='add'>+		case CMD_UNSOLICITED_ABORT:</div><div class='add'>+			printk(KERN_WARNING "cciss%d: unsolicited "</div><div class='add'>+			       "abort %p\n", h-&gt;ctlr, cmd);</div><div class='add'>+			if (cmd-&gt;retry_count &lt; MAX_CMD_RETRIES) {</div><div class='add'>+				retry_cmd = 1;</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "cciss%d: retrying %p\n", h-&gt;ctlr, cmd);</div><div class='add'>+				cmd-&gt;retry_count++;</div><div class='add'>+			} else</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "cciss%d: %p retried too "</div><div class='add'>+				       "many times\n", h-&gt;ctlr, cmd);</div><div class='add'>+			status = 0;</div><div class='ctx'> 			break;</div><div class='del'>-			case CMD_TIMEOUT:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p timedout\n",</div><div class='del'>-					cmd);</div><div class='del'>-				status=0;</div><div class='add'>+		case CMD_TIMEOUT:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p timedout\n", cmd);</div><div class='add'>+			status = 0;</div><div class='ctx'> 			break;</div><div class='del'>-			default:</div><div class='del'>-				printk(KERN_WARNING "cciss: cmd %p returned "</div><div class='del'>-					"unknown status %x\n", cmd, </div><div class='del'>-						cmd-&gt;err_info-&gt;CommandStatus); </div><div class='del'>-				status=0;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_WARNING "cciss: cmd %p returned "</div><div class='add'>+			       "unknown status %x\n", cmd,</div><div class='add'>+			       cmd-&gt;err_info-&gt;CommandStatus);</div><div class='add'>+			status = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* We need to return this command */</div><div class='del'>-	if(retry_cmd) {</div><div class='del'>-		resend_cciss_cmd(h,cmd);</div><div class='add'>+	if (retry_cmd) {</div><div class='add'>+		resend_cciss_cmd(h, cmd);</div><div class='ctx'> 		return;</div><div class='del'>-	}	</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;rq-&gt;completion_data = cmd;</div><div class='ctx'> 	cmd-&gt;rq-&gt;errors = status;</div><div class='hunk'>@@ -2336,12 +2365,12 @@ static inline void complete_command( ctlr_info_t *h, CommandList_struct *cmd,</div><div class='ctx'> 	blk_complete_request(cmd-&gt;rq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Get a request and submit it to the controller. </div><div class='add'>+/*</div><div class='add'>+ * Get a request and submit it to the controller.</div><div class='ctx'>  */</div><div class='ctx'> static void do_cciss_request(request_queue_t *q)</div><div class='ctx'> {</div><div class='del'>-	ctlr_info_t *h= q-&gt;queuedata; </div><div class='add'>+	ctlr_info_t *h = q-&gt;queuedata;</div><div class='ctx'> 	CommandList_struct *c;</div><div class='ctx'> 	int start_blk, seg;</div><div class='ctx'> 	struct request *creq;</div><div class='hunk'>@@ -2352,18 +2381,18 @@ static void do_cciss_request(request_queue_t *q)</div><div class='ctx'> </div><div class='ctx'> 	/* We call start_io here in case there is a command waiting on the</div><div class='ctx'> 	 * queue that has not been sent.</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> 	if (blk_queue_plugged(q))</div><div class='ctx'> 		goto startio;</div><div class='ctx'> </div><div class='del'>-queue:</div><div class='add'>+      queue:</div><div class='ctx'> 	creq = elv_next_request(q);</div><div class='ctx'> 	if (!creq)</div><div class='ctx'> 		goto startio;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(creq-&gt;nr_phys_segments &gt; MAXSGENTRIES);</div><div class='ctx'> </div><div class='del'>-	if (( c = cmd_alloc(h, 1)) == NULL)</div><div class='add'>+	if ((c = cmd_alloc(h, 1)) == NULL)</div><div class='ctx'> 		goto full;</div><div class='ctx'> </div><div class='ctx'> 	blkdev_dequeue_request(creq);</div><div class='hunk'>@@ -2372,81 +2401,82 @@ queue:</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;cmd_type = CMD_RWREQ;</div><div class='ctx'> 	c-&gt;rq = creq;</div><div class='del'>-	</div><div class='del'>-	/* fill in the request */ </div><div class='add'>+</div><div class='add'>+	/* fill in the request */</div><div class='ctx'> 	drv = creq-&gt;rq_disk-&gt;private_data;</div><div class='del'>-	c-&gt;Header.ReplyQueue = 0;  // unused in simple mode</div><div class='add'>+	c-&gt;Header.ReplyQueue = 0;	// unused in simple mode</div><div class='ctx'> 	/* got command from pool, so use the command block index instead */</div><div class='ctx'> 	/* for direct lookups. */</div><div class='ctx'> 	/* The first 2 bits are reserved for controller error reporting. */</div><div class='ctx'> 	c-&gt;Header.Tag.lower = (c-&gt;cmdindex &lt;&lt; 3);</div><div class='del'>-	c-&gt;Header.Tag.lower |= 0x04; /* flag for direct lookup. */</div><div class='del'>-	c-&gt;Header.LUN.LogDev.VolId= drv-&gt;LunID;</div><div class='add'>+	c-&gt;Header.Tag.lower |= 0x04;	/* flag for direct lookup. */</div><div class='add'>+	c-&gt;Header.LUN.LogDev.VolId = drv-&gt;LunID;</div><div class='ctx'> 	c-&gt;Header.LUN.LogDev.Mode = 1;</div><div class='del'>-	c-&gt;Request.CDBLen = 10; // 12 byte commands not in FW yet;</div><div class='del'>-	c-&gt;Request.Type.Type =  TYPE_CMD; // It is a command. </div><div class='del'>-	c-&gt;Request.Type.Attribute = ATTR_SIMPLE; </div><div class='del'>-	c-&gt;Request.Type.Direction = </div><div class='del'>-		(rq_data_dir(creq) == READ) ? XFER_READ: XFER_WRITE; </div><div class='del'>-	c-&gt;Request.Timeout = 0; // Don't time out	</div><div class='del'>-	c-&gt;Request.CDB[0] = (rq_data_dir(creq) == READ) ? CCISS_READ : CCISS_WRITE;</div><div class='add'>+	c-&gt;Request.CDBLen = 10;	// 12 byte commands not in FW yet;</div><div class='add'>+	c-&gt;Request.Type.Type = TYPE_CMD;	// It is a command.</div><div class='add'>+	c-&gt;Request.Type.Attribute = ATTR_SIMPLE;</div><div class='add'>+	c-&gt;Request.Type.Direction =</div><div class='add'>+	    (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;</div><div class='add'>+	c-&gt;Request.Timeout = 0;	// Don't time out</div><div class='add'>+	c-&gt;Request.CDB[0] =</div><div class='add'>+	    (rq_data_dir(creq) == READ) ? CCISS_READ : CCISS_WRITE;</div><div class='ctx'> 	start_blk = creq-&gt;sector;</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n",(int) creq-&gt;sector,</div><div class='del'>-		(int) creq-&gt;nr_sectors);	</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+	printk(KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n", (int)creq-&gt;sector,</div><div class='add'>+	       (int)creq-&gt;nr_sectors);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	seg = blk_rq_map_sg(q, creq, tmp_sg);</div><div class='ctx'> </div><div class='del'>-	/* get the DMA records for the setup */ </div><div class='add'>+	/* get the DMA records for the setup */</div><div class='ctx'> 	if (c-&gt;Request.Type.Direction == XFER_READ)</div><div class='ctx'> 		dir = PCI_DMA_FROMDEVICE;</div><div class='ctx'> 	else</div><div class='ctx'> 		dir = PCI_DMA_TODEVICE;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;seg; i++)</div><div class='del'>-	{</div><div class='add'>+	for (i = 0; i &lt; seg; i++) {</div><div class='ctx'> 		c-&gt;SG[i].Len = tmp_sg[i].length;</div><div class='ctx'> 		temp64.val = (__u64) pci_map_page(h-&gt;pdev, tmp_sg[i].page,</div><div class='del'>-			 		  tmp_sg[i].offset, tmp_sg[i].length,</div><div class='del'>-					  dir);</div><div class='add'>+						  tmp_sg[i].offset,</div><div class='add'>+						  tmp_sg[i].length, dir);</div><div class='ctx'> 		c-&gt;SG[i].Addr.lower = temp64.val32.lower;</div><div class='del'>-                c-&gt;SG[i].Addr.upper = temp64.val32.upper;</div><div class='del'>-                c-&gt;SG[i].Ext = 0;  // we are not chaining</div><div class='add'>+		c-&gt;SG[i].Addr.upper = temp64.val32.upper;</div><div class='add'>+		c-&gt;SG[i].Ext = 0;	// we are not chaining</div><div class='ctx'> 	}</div><div class='del'>-	/* track how many SG entries we are using */ </div><div class='del'>-	if( seg &gt; h-&gt;maxSG)</div><div class='del'>-		h-&gt;maxSG = seg; </div><div class='add'>+	/* track how many SG entries we are using */</div><div class='add'>+	if (seg &gt; h-&gt;maxSG)</div><div class='add'>+		h-&gt;maxSG = seg;</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "cciss: Submitting %d sectors in %d segments\n", creq-&gt;nr_sectors, seg);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+	printk(KERN_DEBUG "cciss: Submitting %d sectors in %d segments\n",</div><div class='add'>+	       creq-&gt;nr_sectors, seg);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;Header.SGList = c-&gt;Header.SGTotal = seg;</div><div class='del'>-	c-&gt;Request.CDB[1]= 0;</div><div class='del'>-	c-&gt;Request.CDB[2]= (start_blk &gt;&gt; 24) &amp; 0xff;	//MSB</div><div class='del'>-	c-&gt;Request.CDB[3]= (start_blk &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	c-&gt;Request.CDB[4]= (start_blk &gt;&gt;  8) &amp; 0xff;</div><div class='del'>-	c-&gt;Request.CDB[5]= start_blk &amp; 0xff;</div><div class='del'>-	c-&gt;Request.CDB[6]= 0; // (sect &gt;&gt; 24) &amp; 0xff; MSB</div><div class='del'>-	c-&gt;Request.CDB[7]= (creq-&gt;nr_sectors &gt;&gt;  8) &amp; 0xff; </div><div class='del'>-	c-&gt;Request.CDB[8]= creq-&gt;nr_sectors &amp; 0xff; </div><div class='add'>+	c-&gt;Request.CDB[1] = 0;</div><div class='add'>+	c-&gt;Request.CDB[2] = (start_blk &gt;&gt; 24) &amp; 0xff;	//MSB</div><div class='add'>+	c-&gt;Request.CDB[3] = (start_blk &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	c-&gt;Request.CDB[4] = (start_blk &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	c-&gt;Request.CDB[5] = start_blk &amp; 0xff;</div><div class='add'>+	c-&gt;Request.CDB[6] = 0;	// (sect &gt;&gt; 24) &amp; 0xff; MSB</div><div class='add'>+	c-&gt;Request.CDB[7] = (creq-&gt;nr_sectors &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	c-&gt;Request.CDB[8] = creq-&gt;nr_sectors &amp; 0xff;</div><div class='ctx'> 	c-&gt;Request.CDB[9] = c-&gt;Request.CDB[11] = c-&gt;Request.CDB[12] = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(q-&gt;queue_lock);</div><div class='ctx'> </div><div class='del'>-	addQ(&amp;(h-&gt;reqQ),c);</div><div class='add'>+	addQ(&amp;(h-&gt;reqQ), c);</div><div class='ctx'> 	h-&gt;Qdepth++;</div><div class='del'>-	if(h-&gt;Qdepth &gt; h-&gt;maxQsinceinit)</div><div class='del'>-		h-&gt;maxQsinceinit = h-&gt;Qdepth; </div><div class='add'>+	if (h-&gt;Qdepth &gt; h-&gt;maxQsinceinit)</div><div class='add'>+		h-&gt;maxQsinceinit = h-&gt;Qdepth;</div><div class='ctx'> </div><div class='ctx'> 	goto queue;</div><div class='del'>-full:</div><div class='add'>+      full:</div><div class='ctx'> 	blk_stop_queue(q);</div><div class='del'>-startio:</div><div class='add'>+      startio:</div><div class='ctx'> 	/* We will already have the driver lock here so not need</div><div class='ctx'> 	 * to lock it.</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> 	start_io(h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2473,7 +2503,7 @@ static inline unsigned long get_next_completion(ctlr_info_t *h)</div><div class='ctx'> static inline int interrupt_pending(ctlr_info_t *h)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='del'>-	return ( h-&gt;access.intr_pending(h) </div><div class='add'>+	return (h-&gt;access.intr_pending(h)</div><div class='ctx'> 		|| (h-&gt;scsi_rejects.ncompletions &gt; 0));</div><div class='ctx'> #else</div><div class='ctx'> 	return h-&gt;access.intr_pending(h);</div><div class='hunk'>@@ -2483,11 +2513,11 @@ static inline int interrupt_pending(ctlr_info_t *h)</div><div class='ctx'> static inline long interrupt_not_for_us(ctlr_info_t *h)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='del'>-	return (((h-&gt;access.intr_pending(h) == 0) || </div><div class='del'>-		 (h-&gt;interrupts_enabled == 0)) </div><div class='del'>-	      &amp;&amp; (h-&gt;scsi_rejects.ncompletions == 0));</div><div class='add'>+	return (((h-&gt;access.intr_pending(h) == 0) ||</div><div class='add'>+		 (h-&gt;interrupts_enabled == 0))</div><div class='add'>+		&amp;&amp; (h-&gt;scsi_rejects.ncompletions == 0));</div><div class='ctx'> #else</div><div class='del'>-	return (((h-&gt;access.intr_pending(h) == 0) || </div><div class='add'>+	return (((h-&gt;access.intr_pending(h) == 0) ||</div><div class='ctx'> 		 (h-&gt;interrupts_enabled == 0)));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -2509,12 +2539,14 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irqsave(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 	while (interrupt_pending(h)) {</div><div class='del'>-		while((a = get_next_completion(h)) != FIFO_EMPTY) {</div><div class='add'>+		while ((a = get_next_completion(h)) != FIFO_EMPTY) {</div><div class='ctx'> 			a1 = a;</div><div class='ctx'> 			if ((a &amp; 0x04)) {</div><div class='ctx'> 				a2 = (a &gt;&gt; 3);</div><div class='ctx'> 				if (a2 &gt;= NR_CMDS) {</div><div class='del'>-					printk(KERN_WARNING "cciss: controller cciss%d failed, stopping.\n", h-&gt;ctlr);</div><div class='add'>+					printk(KERN_WARNING</div><div class='add'>+					       "cciss: controller cciss%d failed, stopping.\n",</div><div class='add'>+					       h-&gt;ctlr);</div><div class='ctx'> 					fail_all_cmds(h-&gt;ctlr);</div><div class='ctx'> 					return IRQ_HANDLED;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2523,22 +2555,24 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 				a = c-&gt;busaddr;</div><div class='ctx'> </div><div class='ctx'> 			} else {</div><div class='del'>-			a &amp;= ~3;</div><div class='add'>+				a &amp;= ~3;</div><div class='ctx'> 				if ((c = h-&gt;cmpQ) == NULL) {</div><div class='del'>-					printk(KERN_WARNING "cciss: Completion of %08x ignored\n", a1);</div><div class='del'>-				continue;	</div><div class='del'>-			} </div><div class='del'>-			while(c-&gt;busaddr != a) {</div><div class='del'>-				c = c-&gt;next;</div><div class='del'>-				if (c == h-&gt;cmpQ) </div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='add'>+					printk(KERN_WARNING</div><div class='add'>+					       "cciss: Completion of %08x ignored\n",</div><div class='add'>+					       a1);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				while (c-&gt;busaddr != a) {</div><div class='add'>+					c = c-&gt;next;</div><div class='add'>+					if (c == h-&gt;cmpQ)</div><div class='add'>+						break;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If we've found the command, take it off the</div><div class='ctx'> 			 * completion Q and free it</div><div class='ctx'> 			 */</div><div class='del'>-			 if (c-&gt;busaddr == a) {</div><div class='add'>+			if (c-&gt;busaddr == a) {</div><div class='ctx'> 				removeQ(&amp;h-&gt;cmpQ, c);</div><div class='ctx'> 				if (c-&gt;cmd_type == CMD_RWREQ) {</div><div class='ctx'> 					complete_command(h, c, 0);</div><div class='hunk'>@@ -2554,130 +2588,118 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- 	/* check to see if we have maxed out the number of commands that can</div><div class='del'>- 	 * be placed on the queue.  If so then exit.  We do this check here</div><div class='del'>- 	 * in case the interrupt we serviced was from an ioctl and did not</div><div class='del'>- 	 * free any new commands.</div><div class='add'>+	/* check to see if we have maxed out the number of commands that can</div><div class='add'>+	 * be placed on the queue.  If so then exit.  We do this check here</div><div class='add'>+	 * in case the interrupt we serviced was from an ioctl and did not</div><div class='add'>+	 * free any new commands.</div><div class='add'>+	 */</div><div class='add'>+	if ((find_first_zero_bit(h-&gt;cmd_pool_bits, NR_CMDS)) == NR_CMDS)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	/* We have room on the queue for more commands.  Now we need to queue</div><div class='add'>+	 * them up.  We will also keep track of the next queue to run so</div><div class='add'>+	 * that every queue gets a chance to be started first.</div><div class='ctx'> 	 */</div><div class='del'>- 	if ((find_first_zero_bit(h-&gt;cmd_pool_bits, NR_CMDS)) == NR_CMDS)</div><div class='del'>- 		goto cleanup;</div><div class='del'>-</div><div class='del'>- 	/* We have room on the queue for more commands.  Now we need to queue</div><div class='del'>- 	 * them up.  We will also keep track of the next queue to run so</div><div class='del'>- 	 * that every queue gets a chance to be started first.</div><div class='del'>- 	*/</div><div class='del'>-	for (j=0; j &lt; h-&gt;highest_lun + 1; j++){</div><div class='add'>+	for (j = 0; j &lt; h-&gt;highest_lun + 1; j++) {</div><div class='ctx'> 		int curr_queue = (start_queue + j) % (h-&gt;highest_lun + 1);</div><div class='del'>- 		/* make sure the disk has been added and the drive is real</div><div class='del'>- 		 * because this can be called from the middle of init_one.</div><div class='del'>- 		*/</div><div class='del'>-		if(!(h-&gt;drv[curr_queue].queue) ||</div><div class='del'>-		 		   !(h-&gt;drv[curr_queue].heads))</div><div class='del'>- 			continue;</div><div class='del'>- 		blk_start_queue(h-&gt;gendisk[curr_queue]-&gt;queue);</div><div class='del'>-</div><div class='del'>- 		/* check to see if we have maxed out the number of commands</div><div class='del'>- 		 * that can be placed on the queue.</div><div class='del'>- 		*/</div><div class='del'>- 		if ((find_first_zero_bit(h-&gt;cmd_pool_bits, NR_CMDS)) == NR_CMDS)</div><div class='del'>- 		{</div><div class='del'>- 			if (curr_queue == start_queue){</div><div class='del'>-				h-&gt;next_to_run = (start_queue + 1) % (h-&gt;highest_lun + 1);</div><div class='del'>- 				goto cleanup;</div><div class='del'>- 			} else {</div><div class='del'>- 				h-&gt;next_to_run = curr_queue;</div><div class='del'>- 				goto cleanup;</div><div class='del'>- 	}</div><div class='del'>- 		} else {</div><div class='add'>+		/* make sure the disk has been added and the drive is real</div><div class='add'>+		 * because this can be called from the middle of init_one.</div><div class='add'>+		 */</div><div class='add'>+		if (!(h-&gt;drv[curr_queue].queue) || !(h-&gt;drv[curr_queue].heads))</div><div class='add'>+			continue;</div><div class='add'>+		blk_start_queue(h-&gt;gendisk[curr_queue]-&gt;queue);</div><div class='add'>+</div><div class='add'>+		/* check to see if we have maxed out the number of commands</div><div class='add'>+		 * that can be placed on the queue.</div><div class='add'>+		 */</div><div class='add'>+		if ((find_first_zero_bit(h-&gt;cmd_pool_bits, NR_CMDS)) == NR_CMDS) {</div><div class='add'>+			if (curr_queue == start_queue) {</div><div class='add'>+				h-&gt;next_to_run =</div><div class='add'>+				    (start_queue + 1) % (h-&gt;highest_lun + 1);</div><div class='add'>+				goto cleanup;</div><div class='add'>+			} else {</div><div class='add'>+				h-&gt;next_to_run = curr_queue;</div><div class='add'>+				goto cleanup;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='ctx'> 			curr_queue = (curr_queue + 1) % (h-&gt;highest_lun + 1);</div><div class='del'>- 		}</div><div class='del'>- 	}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-cleanup:</div><div class='add'>+      cleanup:</div><div class='ctx'> 	spin_unlock_irqrestore(CCISS_LOCK(h-&gt;ctlr), flags);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='del'>-/* </div><div class='del'>- *  We cannot read the structure directly, for portablity we must use </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  We cannot read the structure directly, for portability we must use</div><div class='ctx'>  *   the io functions.</div><div class='del'>- *   This is for debug only. </div><div class='add'>+ *   This is for debug only.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-static void print_cfg_table( CfgTable_struct *tb)</div><div class='add'>+static void print_cfg_table(CfgTable_struct *tb)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char temp_name[17];</div><div class='ctx'> </div><div class='ctx'> 	printk("Controller Configuration information\n");</div><div class='ctx'> 	printk("------------------------------------\n");</div><div class='del'>-	for(i=0;i&lt;4;i++)</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		temp_name[i] = readb(&amp;(tb-&gt;Signature[i]));</div><div class='del'>-	temp_name[4]='\0';</div><div class='del'>-	printk("   Signature = %s\n", temp_name); </div><div class='add'>+	temp_name[4] = '\0';</div><div class='add'>+	printk("   Signature = %s\n", temp_name);</div><div class='ctx'> 	printk("   Spec Number = %d\n", readl(&amp;(tb-&gt;SpecValence)));</div><div class='del'>-	printk("   Transport methods supported = 0x%x\n", </div><div class='del'>-				readl(&amp;(tb-&gt; TransportSupport)));</div><div class='del'>-	printk("   Transport methods active = 0x%x\n", </div><div class='del'>-				readl(&amp;(tb-&gt;TransportActive)));</div><div class='del'>-	printk("   Requested transport Method = 0x%x\n", </div><div class='del'>-			readl(&amp;(tb-&gt;HostWrite.TransportRequest)));</div><div class='del'>-	printk("   Coalese Interrupt Delay = 0x%x\n", </div><div class='del'>-			readl(&amp;(tb-&gt;HostWrite.CoalIntDelay)));</div><div class='del'>-	printk("   Coalese Interrupt Count = 0x%x\n", </div><div class='del'>-			readl(&amp;(tb-&gt;HostWrite.CoalIntCount)));</div><div class='del'>-	printk("   Max outstanding commands = 0x%d\n", </div><div class='del'>-			readl(&amp;(tb-&gt;CmdsOutMax)));</div><div class='del'>-	printk("   Bus Types = 0x%x\n", readl(&amp;(tb-&gt; BusTypes)));</div><div class='del'>-	for(i=0;i&lt;16;i++)</div><div class='add'>+	printk("   Transport methods supported = 0x%x\n",</div><div class='add'>+	       readl(&amp;(tb-&gt;TransportSupport)));</div><div class='add'>+	printk("   Transport methods active = 0x%x\n",</div><div class='add'>+	       readl(&amp;(tb-&gt;TransportActive)));</div><div class='add'>+	printk("   Requested transport Method = 0x%x\n",</div><div class='add'>+	       readl(&amp;(tb-&gt;HostWrite.TransportRequest)));</div><div class='add'>+	printk("   Coalesce Interrupt Delay = 0x%x\n",</div><div class='add'>+	       readl(&amp;(tb-&gt;HostWrite.CoalIntDelay)));</div><div class='add'>+	printk("   Coalesce Interrupt Count = 0x%x\n",</div><div class='add'>+	       readl(&amp;(tb-&gt;HostWrite.CoalIntCount)));</div><div class='add'>+	printk("   Max outstanding commands = 0x%d\n",</div><div class='add'>+	       readl(&amp;(tb-&gt;CmdsOutMax)));</div><div class='add'>+	printk("   Bus Types = 0x%x\n", readl(&amp;(tb-&gt;BusTypes)));</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='ctx'> 		temp_name[i] = readb(&amp;(tb-&gt;ServerName[i]));</div><div class='ctx'> 	temp_name[16] = '\0';</div><div class='ctx'> 	printk("   Server Name = %s\n", temp_name);</div><div class='del'>-	printk("   Heartbeat Counter = 0x%x\n\n\n", </div><div class='del'>-			readl(&amp;(tb-&gt;HeartBeat)));</div><div class='del'>-}</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='del'>-</div><div class='del'>-static void release_io_mem(ctlr_info_t *c)</div><div class='del'>-{</div><div class='del'>-	/* if IO mem was not protected do nothing */</div><div class='del'>-	if( c-&gt;io_mem_addr == 0)</div><div class='del'>-		return;</div><div class='del'>-	release_region(c-&gt;io_mem_addr, c-&gt;io_mem_length);</div><div class='del'>-	c-&gt;io_mem_addr = 0;</div><div class='del'>-	c-&gt;io_mem_length = 0;</div><div class='add'>+	printk("   Heartbeat Counter = 0x%x\n\n\n", readl(&amp;(tb-&gt;HeartBeat)));</div><div class='ctx'> }</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='del'>-static int find_PCI_BAR_index(struct pci_dev *pdev,</div><div class='del'>-				unsigned long pci_bar_addr)</div><div class='add'>+static int find_PCI_BAR_index(struct pci_dev *pdev, unsigned long pci_bar_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int i, offset, mem_type, bar_type;</div><div class='del'>-	if (pci_bar_addr == PCI_BASE_ADDRESS_0) /* looking for BAR zero? */</div><div class='add'>+	if (pci_bar_addr == PCI_BASE_ADDRESS_0)	/* looking for BAR zero? */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	offset = 0;</div><div class='del'>-	for (i=0; i&lt;DEVICE_COUNT_RESOURCE; i++) {</div><div class='del'>-		bar_type = pci_resource_flags(pdev, i) &amp;</div><div class='del'>-			PCI_BASE_ADDRESS_SPACE;</div><div class='add'>+	for (i = 0; i &lt; DEVICE_COUNT_RESOURCE; i++) {</div><div class='add'>+		bar_type = pci_resource_flags(pdev, i) &amp; PCI_BASE_ADDRESS_SPACE;</div><div class='ctx'> 		if (bar_type == PCI_BASE_ADDRESS_SPACE_IO)</div><div class='ctx'> 			offset += 4;</div><div class='ctx'> 		else {</div><div class='ctx'> 			mem_type = pci_resource_flags(pdev, i) &amp;</div><div class='del'>-				PCI_BASE_ADDRESS_MEM_TYPE_MASK;</div><div class='add'>+			    PCI_BASE_ADDRESS_MEM_TYPE_MASK;</div><div class='ctx'> 			switch (mem_type) {</div><div class='del'>-				case PCI_BASE_ADDRESS_MEM_TYPE_32:</div><div class='del'>-				case PCI_BASE_ADDRESS_MEM_TYPE_1M:</div><div class='del'>-					offset += 4; /* 32 bit */</div><div class='del'>-					break;</div><div class='del'>-				case PCI_BASE_ADDRESS_MEM_TYPE_64:</div><div class='del'>-					offset += 8;</div><div class='del'>-					break;</div><div class='del'>-				default: /* reserved in PCI 2.2 */</div><div class='del'>-					printk(KERN_WARNING "Base address is invalid\n");</div><div class='del'>-			       		return -1;</div><div class='add'>+			case PCI_BASE_ADDRESS_MEM_TYPE_32:</div><div class='add'>+			case PCI_BASE_ADDRESS_MEM_TYPE_1M:</div><div class='add'>+				offset += 4;	/* 32 bit */</div><div class='add'>+				break;</div><div class='add'>+			case PCI_BASE_ADDRESS_MEM_TYPE_64:</div><div class='add'>+				offset += 8;</div><div class='add'>+				break;</div><div class='add'>+			default:	/* reserved in PCI 2.2 */</div><div class='add'>+				printk(KERN_WARNING</div><div class='add'>+				       "Base address is invalid\n");</div><div class='add'>+				return -1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>- 		if (offset == pci_bar_addr - PCI_BASE_ADDRESS_0)</div><div class='del'>-			return i+1;</div><div class='add'>+		if (offset == pci_bar_addr - PCI_BASE_ADDRESS_0)</div><div class='add'>+			return i + 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='hunk'>@@ -2686,53 +2708,54 @@ static int find_PCI_BAR_index(struct pci_dev *pdev,</div><div class='ctx'>  * controllers that are capable. If not, we use IO-APIC mode.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __devinit cciss_interrupt_mode(ctlr_info_t *c, struct pci_dev *pdev, __u32 board_id)</div><div class='add'>+static void __devinit cciss_interrupt_mode(ctlr_info_t *c,</div><div class='add'>+					   struct pci_dev *pdev, __u32 board_id)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='del'>-        int err;</div><div class='del'>-        struct msix_entry cciss_msix_entries[4] = {{0,0}, {0,1},</div><div class='del'>-						   {0,2}, {0,3}};</div><div class='add'>+	int err;</div><div class='add'>+	struct msix_entry cciss_msix_entries[4] = { {0, 0}, {0, 1},</div><div class='add'>+	{0, 2}, {0, 3}</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* Some boards advertise MSI but don't really support it */</div><div class='ctx'> 	if ((board_id == 0x40700E11) ||</div><div class='del'>-		(board_id == 0x40800E11) ||</div><div class='del'>-		(board_id == 0x40820E11) ||</div><div class='del'>-		(board_id == 0x40830E11))</div><div class='add'>+	    (board_id == 0x40800E11) ||</div><div class='add'>+	    (board_id == 0x40820E11) || (board_id == 0x40830E11))</div><div class='ctx'> 		goto default_int_mode;</div><div class='ctx'> </div><div class='del'>-        if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) {</div><div class='del'>-                err = pci_enable_msix(pdev, cciss_msix_entries, 4);</div><div class='del'>-                if (!err) {</div><div class='del'>-                        c-&gt;intr[0] = cciss_msix_entries[0].vector;</div><div class='del'>-                        c-&gt;intr[1] = cciss_msix_entries[1].vector;</div><div class='del'>-                        c-&gt;intr[2] = cciss_msix_entries[2].vector;</div><div class='del'>-                        c-&gt;intr[3] = cciss_msix_entries[3].vector;</div><div class='del'>-                        c-&gt;msix_vector = 1;</div><div class='del'>-                        return;</div><div class='del'>-                }</div><div class='del'>-                if (err &gt; 0) {</div><div class='del'>-                        printk(KERN_WARNING "cciss: only %d MSI-X vectors "</div><div class='del'>-                                        "available\n", err);</div><div class='del'>-                } else {</div><div class='del'>-                        printk(KERN_WARNING "cciss: MSI-X init failed %d\n",</div><div class='del'>-						err);</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-        if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) {</div><div class='del'>-                if (!pci_enable_msi(pdev)) {</div><div class='del'>-                        c-&gt;intr[SIMPLE_MODE_INT] = pdev-&gt;irq;</div><div class='del'>-                        c-&gt;msi_vector = 1;</div><div class='del'>-                        return;</div><div class='del'>-                } else {</div><div class='del'>-                        printk(KERN_WARNING "cciss: MSI init failed\n");</div><div class='del'>-        		c-&gt;intr[SIMPLE_MODE_INT] = pdev-&gt;irq;</div><div class='del'>-                        return;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-default_int_mode:</div><div class='del'>-#endif /* CONFIG_PCI_MSI */</div><div class='add'>+	if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) {</div><div class='add'>+		err = pci_enable_msix(pdev, cciss_msix_entries, 4);</div><div class='add'>+		if (!err) {</div><div class='add'>+			c-&gt;intr[0] = cciss_msix_entries[0].vector;</div><div class='add'>+			c-&gt;intr[1] = cciss_msix_entries[1].vector;</div><div class='add'>+			c-&gt;intr[2] = cciss_msix_entries[2].vector;</div><div class='add'>+			c-&gt;intr[3] = cciss_msix_entries[3].vector;</div><div class='add'>+			c-&gt;msix_vector = 1;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		if (err &gt; 0) {</div><div class='add'>+			printk(KERN_WARNING "cciss: only %d MSI-X vectors "</div><div class='add'>+			       "available\n", err);</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_WARNING "cciss: MSI-X init failed %d\n",</div><div class='add'>+			       err);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (pci_find_capability(pdev, PCI_CAP_ID_MSI)) {</div><div class='add'>+		if (!pci_enable_msi(pdev)) {</div><div class='add'>+			c-&gt;intr[SIMPLE_MODE_INT] = pdev-&gt;irq;</div><div class='add'>+			c-&gt;msi_vector = 1;</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_WARNING "cciss: MSI init failed\n");</div><div class='add'>+			c-&gt;intr[SIMPLE_MODE_INT] = pdev-&gt;irq;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+      default_int_mode:</div><div class='add'>+#endif				/* CONFIG_PCI_MSI */</div><div class='ctx'> 	/* if we get here we're going to use the default interrupt mode */</div><div class='del'>-        c-&gt;intr[SIMPLE_MODE_INT] = pdev-&gt;irq;</div><div class='add'>+	c-&gt;intr[SIMPLE_MODE_INT] = pdev-&gt;irq;</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2743,58 +2766,40 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)</div><div class='ctx'> 	__u64 cfg_offset;</div><div class='ctx'> 	__u32 cfg_base_addr;</div><div class='ctx'> 	__u64 cfg_base_addr_index;</div><div class='del'>-	int i;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	/* check to see if controller has been disabled */</div><div class='ctx'> 	/* BEFORE trying to enable it */</div><div class='del'>-	(void) pci_read_config_word(pdev, PCI_COMMAND,&amp;command);</div><div class='del'>-	if(!(command &amp; 0x02))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "cciss: controller appears to be disabled\n");</div><div class='del'>-		return(-1);</div><div class='add'>+	(void)pci_read_config_word(pdev, PCI_COMMAND, &amp;command);</div><div class='add'>+	if (!(command &amp; 0x02)) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "cciss: controller appears to be disabled\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-	{</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "cciss: Unable to Enable PCI device\n");</div><div class='del'>-		return( -1);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, "cciss");</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "cciss: Cannot obtain PCI resources, "</div><div class='add'>+		       "aborting\n");</div><div class='add'>+		goto err_out_disable_pdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	subsystem_vendor_id = pdev-&gt;subsystem_vendor;</div><div class='ctx'> 	subsystem_device_id = pdev-&gt;subsystem_device;</div><div class='ctx'> 	board_id = (((__u32) (subsystem_device_id &lt;&lt; 16) &amp; 0xffff0000) |</div><div class='del'>-					subsystem_vendor_id);</div><div class='del'>-</div><div class='del'>-	/* search for our IO range so we can protect it */</div><div class='del'>-	for(i=0; i&lt;DEVICE_COUNT_RESOURCE; i++)</div><div class='del'>-	{</div><div class='del'>-		/* is this an IO range */ </div><div class='del'>-		if( pci_resource_flags(pdev, i) &amp; 0x01 ) {</div><div class='del'>-			c-&gt;io_mem_addr = pci_resource_start(pdev, i);</div><div class='del'>-			c-&gt;io_mem_length = pci_resource_end(pdev, i) -</div><div class='del'>-				pci_resource_start(pdev, i) +1;</div><div class='del'>-#ifdef CCISS_DEBUG</div><div class='del'>-			printk("IO value found base_addr[%d] %lx %lx\n", i,</div><div class='del'>-				c-&gt;io_mem_addr, c-&gt;io_mem_length);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='del'>-			/* register the IO range */ </div><div class='del'>-			if(!request_region( c-&gt;io_mem_addr,</div><div class='del'>-                                        c-&gt;io_mem_length, "cciss"))</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_WARNING "cciss I/O memory range already in use addr=%lx length=%ld\n",</div><div class='del'>-				c-&gt;io_mem_addr, c-&gt;io_mem_length);</div><div class='del'>-				c-&gt;io_mem_addr= 0;</div><div class='del'>-				c-&gt;io_mem_length = 0;</div><div class='del'>-			} </div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+		    subsystem_vendor_id);</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("command = %x\n", command);</div><div class='ctx'> 	printk("irq = %x\n", pdev-&gt;irq);</div><div class='ctx'> 	printk("board_id = %x\n", board_id);</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> /* If the kernel supports MSI/MSI-X we will try to enable that functionality,</div><div class='ctx'>  * else we use the IO-APIC interrupt assigned to us by system ROM.</div><div class='hunk'>@@ -2803,27 +2808,28 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Memory base addr is first addr , the second points to the config</div><div class='del'>-         *   table</div><div class='add'>+	 *   table</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	c-&gt;paddr = pci_resource_start(pdev, 0); /* addressing mode bits already removed */</div><div class='add'>+	c-&gt;paddr = pci_resource_start(pdev, 0);	/* addressing mode bits already removed */</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("address 0 = %x\n", c-&gt;paddr);</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> 	c-&gt;vaddr = remap_pci_mem(c-&gt;paddr, 200);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for the board to become ready.  (PCI hotplug needs this.)</div><div class='ctx'> 	 * We poll for up to 120 secs, once per 100ms. */</div><div class='del'>-	for (i=0; i &lt; 1200; i++) {</div><div class='add'>+	for (i = 0; i &lt; 1200; i++) {</div><div class='ctx'> 		scratchpad = readl(c-&gt;vaddr + SA5_SCRATCHPAD_OFFSET);</div><div class='ctx'> 		if (scratchpad == CCISS_FIRMWARE_READY)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-		schedule_timeout(HZ / 10); /* wait 100ms */</div><div class='add'>+		schedule_timeout(HZ / 10);	/* wait 100ms */</div><div class='ctx'> 	}</div><div class='ctx'> 	if (scratchpad != CCISS_FIRMWARE_READY) {</div><div class='ctx'> 		printk(KERN_WARNING "cciss: Board not ready.  Timed out.\n");</div><div class='del'>-		return -1;</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get the address index number */</div><div class='hunk'>@@ -2831,103 +2837,108 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)</div><div class='ctx'> 	cfg_base_addr &amp;= (__u32) 0x0000ffff;</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("cfg base address = %x\n", cfg_base_addr);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='del'>-	cfg_base_addr_index =</div><div class='del'>-		find_PCI_BAR_index(pdev, cfg_base_addr);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+	cfg_base_addr_index = find_PCI_BAR_index(pdev, cfg_base_addr);</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("cfg base address index = %x\n", cfg_base_addr_index);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> 	if (cfg_base_addr_index == -1) {</div><div class='ctx'> 		printk(KERN_WARNING "cciss: Cannot find cfg_base_addr_index\n");</div><div class='del'>-		release_io_mem(c);</div><div class='del'>-		return -1;</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfg_offset = readl(c-&gt;vaddr + SA5_CTMEM_OFFSET);</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("cfg offset = %x\n", cfg_offset);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='del'>-	c-&gt;cfgtable =  remap_pci_mem(pci_resource_start(pdev,</div><div class='del'>-				cfg_base_addr_index) + cfg_offset,</div><div class='del'>-				sizeof(CfgTable_struct));</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+	c-&gt;cfgtable = remap_pci_mem(pci_resource_start(pdev,</div><div class='add'>+						       cfg_base_addr_index) +</div><div class='add'>+				    cfg_offset, sizeof(CfgTable_struct));</div><div class='ctx'> 	c-&gt;board_id = board_id;</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	print_cfg_table(c-&gt;cfgtable);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='del'>-	for(i=0; i&lt;NR_PRODUCTS; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(products); i++) {</div><div class='ctx'> 		if (board_id == products[i].board_id) {</div><div class='ctx'> 			c-&gt;product_name = products[i].product_name;</div><div class='ctx'> 			c-&gt;access = *(products[i].access);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (i == NR_PRODUCTS) {</div><div class='add'>+	if (i == ARRAY_SIZE(products)) {</div><div class='ctx'> 		printk(KERN_WARNING "cciss: Sorry, I don't know how"</div><div class='del'>-			" to access the Smart Array controller %08lx\n", </div><div class='del'>-				(unsigned long)board_id);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if (  (readb(&amp;c-&gt;cfgtable-&gt;Signature[0]) != 'C') ||</div><div class='del'>-	      (readb(&amp;c-&gt;cfgtable-&gt;Signature[1]) != 'I') ||</div><div class='del'>-	      (readb(&amp;c-&gt;cfgtable-&gt;Signature[2]) != 'S') ||</div><div class='del'>-	      (readb(&amp;c-&gt;cfgtable-&gt;Signature[3]) != 'S') )</div><div class='del'>-	{</div><div class='add'>+		       " to access the Smart Array controller %08lx\n",</div><div class='add'>+		       (unsigned long)board_id);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_free_res;</div><div class='add'>+	}</div><div class='add'>+	if ((readb(&amp;c-&gt;cfgtable-&gt;Signature[0]) != 'C') ||</div><div class='add'>+	    (readb(&amp;c-&gt;cfgtable-&gt;Signature[1]) != 'I') ||</div><div class='add'>+	    (readb(&amp;c-&gt;cfgtable-&gt;Signature[2]) != 'S') ||</div><div class='add'>+	    (readb(&amp;c-&gt;cfgtable-&gt;Signature[3]) != 'S')) {</div><div class='ctx'> 		printk("Does not appear to be a valid CISS config table\n");</div><div class='del'>-		return -1;</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_X86</div><div class='del'>-{</div><div class='del'>-	/* Need to enable prefetch in the SCSI core for 6400 in x86 */</div><div class='del'>-	__u32 prefetch;</div><div class='del'>-	prefetch = readl(&amp;(c-&gt;cfgtable-&gt;SCSI_Prefetch));</div><div class='del'>-	prefetch |= 0x100;</div><div class='del'>-	writel(prefetch, &amp;(c-&gt;cfgtable-&gt;SCSI_Prefetch));</div><div class='del'>-}</div><div class='add'>+	{</div><div class='add'>+		/* Need to enable prefetch in the SCSI core for 6400 in x86 */</div><div class='add'>+		__u32 prefetch;</div><div class='add'>+		prefetch = readl(&amp;(c-&gt;cfgtable-&gt;SCSI_Prefetch));</div><div class='add'>+		prefetch |= 0x100;</div><div class='add'>+		writel(prefetch, &amp;(c-&gt;cfgtable-&gt;SCSI_Prefetch));</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 	printk("Trying to put board into Simple mode\n");</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> 	c-&gt;max_commands = readl(&amp;(c-&gt;cfgtable-&gt;CmdsOutMax));</div><div class='del'>-	/* Update the field, and then ring the doorbell */ </div><div class='del'>-	writel( CFGTBL_Trans_Simple, </div><div class='del'>-		&amp;(c-&gt;cfgtable-&gt;HostWrite.TransportRequest));</div><div class='del'>-	writel( CFGTBL_ChangeReq, c-&gt;vaddr + SA5_DOORBELL);</div><div class='add'>+	/* Update the field, and then ring the doorbell */</div><div class='add'>+	writel(CFGTBL_Trans_Simple, &amp;(c-&gt;cfgtable-&gt;HostWrite.TransportRequest));</div><div class='add'>+	writel(CFGTBL_ChangeReq, c-&gt;vaddr + SA5_DOORBELL);</div><div class='ctx'> </div><div class='ctx'> 	/* under certain very rare conditions, this can take awhile.</div><div class='ctx'> 	 * (e.g.: hot replace a failed 144GB drive in a RAID 5 set right</div><div class='ctx'> 	 * as we enter this code.) */</div><div class='del'>-	for(i=0;i&lt;MAX_CONFIG_WAIT;i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_CONFIG_WAIT; i++) {</div><div class='ctx'> 		if (!(readl(c-&gt;vaddr + SA5_DOORBELL) &amp; CFGTBL_ChangeReq))</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* delay and try again */</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		schedule_timeout(10);</div><div class='del'>-	}	</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "I counter got to %d %x\n", i, readl(c-&gt;vaddr + SA5_DOORBELL));</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+	printk(KERN_DEBUG "I counter got to %d %x\n", i,</div><div class='add'>+	       readl(c-&gt;vaddr + SA5_DOORBELL));</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	print_cfg_table(c-&gt;cfgtable);	</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='add'>+	print_cfg_table(c-&gt;cfgtable);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='del'>-	if (!(readl(&amp;(c-&gt;cfgtable-&gt;TransportActive)) &amp; CFGTBL_Trans_Simple))</div><div class='del'>-	{</div><div class='add'>+	if (!(readl(&amp;(c-&gt;cfgtable-&gt;TransportActive)) &amp; CFGTBL_Trans_Simple)) {</div><div class='ctx'> 		printk(KERN_WARNING "cciss: unable to get board into"</div><div class='del'>-					" simple mode\n");</div><div class='del'>-		return -1;</div><div class='add'>+		       " simple mode\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+      err_out_free_res:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+</div><div class='add'>+      err_out_disable_pdev:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Gets information about the local volumes attached to the controller. </div><div class='del'>- */ </div><div class='add'>+/*</div><div class='add'>+ * Gets information about the local volumes attached to the controller.</div><div class='add'>+ */</div><div class='ctx'> static void cciss_getgeometry(int cntl_num)</div><div class='ctx'> {</div><div class='ctx'> 	ReportLunData_struct *ld_buff;</div><div class='hunk'>@@ -2938,102 +2949,102 @@ static void cciss_getgeometry(int cntl_num)</div><div class='ctx'> 	int listlength = 0;</div><div class='ctx'> 	__u32 lunid = 0;</div><div class='ctx'> 	int block_size;</div><div class='del'>-	int total_size; </div><div class='add'>+	int total_size;</div><div class='ctx'> </div><div class='ctx'> 	ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);</div><div class='del'>-	if (ld_buff == NULL)</div><div class='del'>-	{</div><div class='add'>+	if (ld_buff == NULL) {</div><div class='add'>+		printk(KERN_ERR "cciss: out of memory\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	size_buff = kmalloc(sizeof(ReadCapdata_struct), GFP_KERNEL);</div><div class='add'>+	if (size_buff == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "cciss: out of memory\n");</div><div class='add'>+		kfree(ld_buff);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);</div><div class='del'>-        if (size_buff == NULL)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR "cciss: out of memory\n");</div><div class='add'>+	inq_buff = kmalloc(sizeof(InquiryData_struct), GFP_KERNEL);</div><div class='add'>+	if (inq_buff == NULL) {</div><div class='add'>+		printk(KERN_ERR "cciss: out of memory\n");</div><div class='ctx'> 		kfree(ld_buff);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-	inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);</div><div class='del'>-        if (inq_buff == NULL)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_ERR "cciss: out of memory\n");</div><div class='del'>-                kfree(ld_buff);</div><div class='ctx'> 		kfree(size_buff);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-	/* Get the firmware version */ </div><div class='del'>-	return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff, </div><div class='del'>-		sizeof(InquiryData_struct), 0, 0 ,0, NULL, TYPE_CMD);</div><div class='del'>-	if (return_code == IO_OK)</div><div class='del'>-	{</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* Get the firmware version */</div><div class='add'>+	return_code = sendcmd(CISS_INQUIRY, cntl_num, inq_buff,</div><div class='add'>+			      sizeof(InquiryData_struct), 0, 0, 0, NULL,</div><div class='add'>+			      TYPE_CMD);</div><div class='add'>+	if (return_code == IO_OK) {</div><div class='ctx'> 		hba[cntl_num]-&gt;firm_ver[0] = inq_buff-&gt;data_byte[32];</div><div class='ctx'> 		hba[cntl_num]-&gt;firm_ver[1] = inq_buff-&gt;data_byte[33];</div><div class='ctx'> 		hba[cntl_num]-&gt;firm_ver[2] = inq_buff-&gt;data_byte[34];</div><div class='ctx'> 		hba[cntl_num]-&gt;firm_ver[3] = inq_buff-&gt;data_byte[35];</div><div class='del'>-	} else /* send command failed */</div><div class='del'>-	{</div><div class='add'>+	} else {		/* send command failed */</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_WARNING "cciss: unable to determine firmware"</div><div class='del'>-			" version of controller\n");</div><div class='add'>+		       " version of controller\n");</div><div class='ctx'> 	}</div><div class='del'>-	/* Get the number of logical volumes */ </div><div class='del'>-	return_code = sendcmd(CISS_REPORT_LOG, cntl_num, ld_buff, </div><div class='del'>-			sizeof(ReportLunData_struct), 0, 0, 0, NULL, TYPE_CMD);</div><div class='add'>+	/* Get the number of logical volumes */</div><div class='add'>+	return_code = sendcmd(CISS_REPORT_LOG, cntl_num, ld_buff,</div><div class='add'>+			      sizeof(ReportLunData_struct), 0, 0, 0, NULL,</div><div class='add'>+			      TYPE_CMD);</div><div class='ctx'> </div><div class='del'>-	if( return_code == IO_OK)</div><div class='del'>-	{</div><div class='add'>+	if (return_code == IO_OK) {</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='ctx'> 		printk("LUN Data\n--------------------------\n");</div><div class='del'>-#endif /* CCISS_DEBUG */ </div><div class='del'>-</div><div class='del'>-		listlength |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[0])) &lt;&lt; 24;</div><div class='del'>-		listlength |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[1])) &lt;&lt; 16;</div><div class='del'>-		listlength |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[2])) &lt;&lt; 8;	</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+</div><div class='add'>+		listlength |=</div><div class='add'>+		    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[0])) &lt;&lt; 24;</div><div class='add'>+		listlength |=</div><div class='add'>+		    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[1])) &lt;&lt; 16;</div><div class='add'>+		listlength |=</div><div class='add'>+		    (0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[2])) &lt;&lt; 8;</div><div class='ctx'> 		listlength |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUNListLength[3]);</div><div class='del'>-	} else /* reading number of logical volumes failed */</div><div class='del'>-	{</div><div class='add'>+	} else {		/* reading number of logical volumes failed */</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_WARNING "cciss: report logical volume"</div><div class='del'>-			" command failed\n");</div><div class='add'>+		       " command failed\n");</div><div class='ctx'> 		listlength = 0;</div><div class='ctx'> 	}</div><div class='del'>-	hba[cntl_num]-&gt;num_luns = listlength / 8; // 8 bytes pre entry</div><div class='del'>-	if (hba[cntl_num]-&gt;num_luns &gt; CISS_MAX_LUN)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "ciss:  only %d number of logical volumes supported\n",</div><div class='del'>-			CISS_MAX_LUN);</div><div class='add'>+	hba[cntl_num]-&gt;num_luns = listlength / 8;	// 8 bytes pre entry</div><div class='add'>+	if (hba[cntl_num]-&gt;num_luns &gt; CISS_MAX_LUN) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "ciss:  only %d number of logical volumes supported\n",</div><div class='add'>+		       CISS_MAX_LUN);</div><div class='ctx'> 		hba[cntl_num]-&gt;num_luns = CISS_MAX_LUN;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "Length = %x %x %x %x = %d\n", ld_buff-&gt;LUNListLength[0],</div><div class='del'>-		ld_buff-&gt;LUNListLength[1], ld_buff-&gt;LUNListLength[2],</div><div class='del'>-		ld_buff-&gt;LUNListLength[3],  hba[cntl_num]-&gt;num_luns);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='del'>-</div><div class='del'>-	hba[cntl_num]-&gt;highest_lun = hba[cntl_num]-&gt;num_luns-1;</div><div class='del'>-//	for(i=0; i&lt;  hba[cntl_num]-&gt;num_luns; i++)</div><div class='del'>-	for(i=0; i &lt; CISS_MAX_LUN; i++)</div><div class='del'>-	{</div><div class='del'>-		if (i &lt; hba[cntl_num]-&gt;num_luns){</div><div class='del'>-		  	lunid = (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][3]))</div><div class='del'>-				 &lt;&lt; 24;</div><div class='del'>-        		lunid |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][2]))</div><div class='del'>-				 &lt;&lt; 16;</div><div class='del'>-        		lunid |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][1]))</div><div class='del'>-				 &lt;&lt; 8;</div><div class='del'>-        	lunid |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][0]);</div><div class='del'>-		</div><div class='del'>-		hba[cntl_num]-&gt;drv[i].LunID = lunid;</div><div class='del'>-</div><div class='add'>+	printk(KERN_DEBUG "Length = %x %x %x %x = %d\n",</div><div class='add'>+	       ld_buff-&gt;LUNListLength[0], ld_buff-&gt;LUNListLength[1],</div><div class='add'>+	       ld_buff-&gt;LUNListLength[2], ld_buff-&gt;LUNListLength[3],</div><div class='add'>+	       hba[cntl_num]-&gt;num_luns);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+</div><div class='add'>+	hba[cntl_num]-&gt;highest_lun = hba[cntl_num]-&gt;num_luns - 1;</div><div class='add'>+//      for(i=0; i&lt;  hba[cntl_num]-&gt;num_luns; i++)</div><div class='add'>+	for (i = 0; i &lt; CISS_MAX_LUN; i++) {</div><div class='add'>+		if (i &lt; hba[cntl_num]-&gt;num_luns) {</div><div class='add'>+			lunid = (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][3]))</div><div class='add'>+			    &lt;&lt; 24;</div><div class='add'>+			lunid |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][2]))</div><div class='add'>+			    &lt;&lt; 16;</div><div class='add'>+			lunid |= (0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][1]))</div><div class='add'>+			    &lt;&lt; 8;</div><div class='add'>+			lunid |= 0xff &amp; (unsigned int)(ld_buff-&gt;LUN[i][0]);</div><div class='add'>+</div><div class='add'>+			hba[cntl_num]-&gt;drv[i].LunID = lunid;</div><div class='ctx'> </div><div class='ctx'> #ifdef CCISS_DEBUG</div><div class='del'>-	  	printk(KERN_DEBUG "LUN[%d]:  %x %x %x %x = %x\n", i, </div><div class='del'>-			ld_buff-&gt;LUN[i][0], ld_buff-&gt;LUN[i][1],</div><div class='del'>-			ld_buff-&gt;LUN[i][2], ld_buff-&gt;LUN[i][3],</div><div class='del'>-			hba[cntl_num]-&gt;drv[i].LunID);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='del'>-		cciss_read_capacity(cntl_num, i, size_buff, 0,</div><div class='del'>-			&amp;total_size, &amp;block_size);</div><div class='add'>+			printk(KERN_DEBUG "LUN[%d]:  %x %x %x %x = %x\n", i,</div><div class='add'>+			       ld_buff-&gt;LUN[i][0], ld_buff-&gt;LUN[i][1],</div><div class='add'>+			       ld_buff-&gt;LUN[i][2], ld_buff-&gt;LUN[i][3],</div><div class='add'>+			       hba[cntl_num]-&gt;drv[i].LunID);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='add'>+			cciss_read_capacity(cntl_num, i, size_buff, 0,</div><div class='add'>+					    &amp;total_size, &amp;block_size);</div><div class='ctx'> 			cciss_geometry_inquiry(cntl_num, i, 0, total_size,</div><div class='del'>-				block_size, inq_buff, &amp;hba[cntl_num]-&gt;drv[i]);</div><div class='add'>+					       block_size, inq_buff,</div><div class='add'>+					       &amp;hba[cntl_num]-&gt;drv[i]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* initialize raid_level to indicate a free space */</div><div class='ctx'> 			hba[cntl_num]-&gt;drv[i].raid_level = -1;</div><div class='hunk'>@@ -3042,7 +3053,7 @@ static void cciss_getgeometry(int cntl_num)</div><div class='ctx'> 	kfree(ld_buff);</div><div class='ctx'> 	kfree(size_buff);</div><div class='ctx'> 	kfree(inq_buff);</div><div class='del'>-}	</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Function to find the first free pointer into our hba[] array */</div><div class='ctx'> /* Returns -1 if no free entries are left.  */</div><div class='hunk'>@@ -3056,7 +3067,7 @@ static int alloc_cciss_hba(void)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for(i=0; i&lt; MAX_CTLR; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_CTLR; i++) {</div><div class='ctx'> 		if (!hba[i]) {</div><div class='ctx'> 			ctlr_info_t *p;</div><div class='ctx'> 			p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);</div><div class='hunk'>@@ -3069,11 +3080,11 @@ static int alloc_cciss_hba(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_WARNING "cciss: This driver supports a maximum"</div><div class='del'>-		" of %d controllers.\n", MAX_CTLR);</div><div class='add'>+	       " of %d controllers.\n", MAX_CTLR);</div><div class='ctx'> 	goto out;</div><div class='del'>-Enomem:</div><div class='add'>+      Enomem:</div><div class='ctx'> 	printk(KERN_ERR "cciss: out of memory.\n");</div><div class='del'>-out:</div><div class='add'>+      out:</div><div class='ctx'> 	while (n--)</div><div class='ctx'> 		put_disk(disk[n]);</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -3096,20 +3107,17 @@ static void free_hba(int i)</div><div class='ctx'>  *  returns the number of block devices registered.</div><div class='ctx'>  */</div><div class='ctx'> static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='del'>-	const struct pci_device_id *ent)</div><div class='add'>+				    const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	request_queue_t *q;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int j;</div><div class='ctx'> 	int rc;</div><div class='add'>+	int dac;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "cciss: Device 0x%x has been found at"</div><div class='del'>-			" bus %d dev %d func %d\n",</div><div class='del'>-		pdev-&gt;device, pdev-&gt;bus-&gt;number, PCI_SLOT(pdev-&gt;devfn),</div><div class='del'>-			PCI_FUNC(pdev-&gt;devfn));</div><div class='ctx'> 	i = alloc_cciss_hba();</div><div class='del'>-	if(i &lt; 0)</div><div class='del'>-		return (-1);</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='ctx'> 	hba[i]-&gt;busy_initializing = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -3122,11 +3130,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* configure PCI DMA stuff */</div><div class='ctx'> 	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))</div><div class='del'>-		printk("cciss: using DAC cycles\n");</div><div class='add'>+		dac = 1;</div><div class='ctx'> 	else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))</div><div class='del'>-		printk("cciss: not using DAC cycles\n");</div><div class='add'>+		dac = 0;</div><div class='ctx'> 	else {</div><div class='del'>-		printk("cciss: no suitable DMA available\n");</div><div class='add'>+		printk(KERN_ERR "cciss: no suitable DMA available\n");</div><div class='ctx'> 		goto clean1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3138,60 +3146,69 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	if (i &lt; MAX_CTLR_ORIG)</div><div class='ctx'> 		hba[i]-&gt;major = COMPAQ_CISS_MAJOR + i;</div><div class='ctx'> 	rc = register_blkdev(hba[i]-&gt;major, hba[i]-&gt;devname);</div><div class='del'>-	if(rc == -EBUSY || rc == -EINVAL) {</div><div class='add'>+	if (rc == -EBUSY || rc == -EINVAL) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='del'>-			"cciss:  Unable to get major number %d for %s "</div><div class='del'>-			"on hba %d\n", hba[i]-&gt;major, hba[i]-&gt;devname, i);</div><div class='add'>+		       "cciss:  Unable to get major number %d for %s "</div><div class='add'>+		       "on hba %d\n", hba[i]-&gt;major, hba[i]-&gt;devname, i);</div><div class='ctx'> 		goto clean1;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		if (i &gt;= MAX_CTLR_ORIG)</div><div class='ctx'> 			hba[i]-&gt;major = rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* make sure the board interrupts are off */</div><div class='ctx'> 	hba[i]-&gt;access.set_intr_mask(hba[i], CCISS_INTR_OFF);</div><div class='del'>-	if( request_irq(hba[i]-&gt;intr[SIMPLE_MODE_INT], do_cciss_intr,</div><div class='del'>-		SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM, </div><div class='del'>-			hba[i]-&gt;devname, hba[i])) {</div><div class='add'>+	if (request_irq(hba[i]-&gt;intr[SIMPLE_MODE_INT], do_cciss_intr,</div><div class='add'>+			IRQF_DISABLED | IRQF_SHARED, hba[i]-&gt;devname, hba[i])) {</div><div class='ctx'> 		printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",</div><div class='del'>-			hba[i]-&gt;intr[SIMPLE_MODE_INT], hba[i]-&gt;devname);</div><div class='add'>+		       hba[i]-&gt;intr[SIMPLE_MODE_INT], hba[i]-&gt;devname);</div><div class='ctx'> 		goto clean2;</div><div class='ctx'> 	}</div><div class='del'>-	hba[i]-&gt;cmd_pool_bits = kmalloc(((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long), GFP_KERNEL);</div><div class='del'>-	hba[i]-&gt;cmd_pool = (CommandList_struct *)pci_alloc_consistent(</div><div class='del'>-		hba[i]-&gt;pdev, NR_CMDS * sizeof(CommandList_struct), </div><div class='del'>-		&amp;(hba[i]-&gt;cmd_pool_dhandle));</div><div class='del'>-	hba[i]-&gt;errinfo_pool = (ErrorInfo_struct *)pci_alloc_consistent(</div><div class='del'>-		hba[i]-&gt;pdev, NR_CMDS * sizeof( ErrorInfo_struct), </div><div class='del'>-		&amp;(hba[i]-&gt;errinfo_pool_dhandle));</div><div class='del'>-	if((hba[i]-&gt;cmd_pool_bits == NULL) </div><div class='del'>-		|| (hba[i]-&gt;cmd_pool == NULL)</div><div class='del'>-		|| (hba[i]-&gt;errinfo_pool == NULL)) {</div><div class='del'>-                printk( KERN_ERR "cciss: out of memory");</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: &lt;0x%x&gt; at PCI %s IRQ %d%s using DAC\n",</div><div class='add'>+	       hba[i]-&gt;devname, pdev-&gt;device, pci_name(pdev),</div><div class='add'>+	       hba[i]-&gt;intr[SIMPLE_MODE_INT], dac ? "" : " not");</div><div class='add'>+</div><div class='add'>+	hba[i]-&gt;cmd_pool_bits =</div><div class='add'>+	    kmalloc(((NR_CMDS + BITS_PER_LONG -</div><div class='add'>+		      1) / BITS_PER_LONG) * sizeof(unsigned long), GFP_KERNEL);</div><div class='add'>+	hba[i]-&gt;cmd_pool = (CommandList_struct *)</div><div class='add'>+	    pci_alloc_consistent(hba[i]-&gt;pdev,</div><div class='add'>+		    NR_CMDS * sizeof(CommandList_struct),</div><div class='add'>+		    &amp;(hba[i]-&gt;cmd_pool_dhandle));</div><div class='add'>+	hba[i]-&gt;errinfo_pool = (ErrorInfo_struct *)</div><div class='add'>+	    pci_alloc_consistent(hba[i]-&gt;pdev,</div><div class='add'>+		    NR_CMDS * sizeof(ErrorInfo_struct),</div><div class='add'>+		    &amp;(hba[i]-&gt;errinfo_pool_dhandle));</div><div class='add'>+	if ((hba[i]-&gt;cmd_pool_bits == NULL)</div><div class='add'>+	    || (hba[i]-&gt;cmd_pool == NULL)</div><div class='add'>+	    || (hba[i]-&gt;errinfo_pool == NULL)) {</div><div class='add'>+		printk(KERN_ERR "cciss: out of memory");</div><div class='ctx'> 		goto clean4;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='del'>-	hba[i]-&gt;scsi_rejects.complete = </div><div class='del'>-		kmalloc(sizeof(hba[i]-&gt;scsi_rejects.complete[0]) * </div><div class='del'>-			(NR_CMDS + 5), GFP_KERNEL);</div><div class='add'>+	hba[i]-&gt;scsi_rejects.complete =</div><div class='add'>+	    kmalloc(sizeof(hba[i]-&gt;scsi_rejects.complete[0]) *</div><div class='add'>+		    (NR_CMDS + 5), GFP_KERNEL);</div><div class='ctx'> 	if (hba[i]-&gt;scsi_rejects.complete == NULL) {</div><div class='del'>-                printk( KERN_ERR "cciss: out of memory");</div><div class='add'>+		printk(KERN_ERR "cciss: out of memory");</div><div class='ctx'> 		goto clean4;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_lock_init(&amp;hba[i]-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* Initialize the pdev driver private data. </div><div class='del'>-		have it point to hba[i].  */</div><div class='add'>+	/* Initialize the pdev driver private data.</div><div class='add'>+	   have it point to hba[i].  */</div><div class='ctx'> 	pci_set_drvdata(pdev, hba[i]);</div><div class='del'>-	/* command and error info recs zeroed out before </div><div class='del'>-			they are used */</div><div class='del'>-        memset(hba[i]-&gt;cmd_pool_bits, 0, ((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long));</div><div class='add'>+	/* command and error info recs zeroed out before</div><div class='add'>+	   they are used */</div><div class='add'>+	memset(hba[i]-&gt;cmd_pool_bits, 0,</div><div class='add'>+	       ((NR_CMDS + BITS_PER_LONG -</div><div class='add'>+		 1) / BITS_PER_LONG) * sizeof(unsigned long));</div><div class='ctx'> </div><div class='del'>-#ifdef CCISS_DEBUG	</div><div class='del'>-	printk(KERN_DEBUG "Scanning for drives on controller cciss%d\n",i);</div><div class='del'>-#endif /* CCISS_DEBUG */</div><div class='add'>+#ifdef CCISS_DEBUG</div><div class='add'>+	printk(KERN_DEBUG "Scanning for drives on controller cciss%d\n", i);</div><div class='add'>+#endif				/* CCISS_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	cciss_getgeometry(i);</div><div class='ctx'> </div><div class='hunk'>@@ -3203,15 +3220,15 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	cciss_procinit(i);</div><div class='ctx'> 	hba[i]-&gt;busy_initializing = 0;</div><div class='ctx'> </div><div class='del'>-	for(j=0; j &lt; NWD; j++) { /* mfm */</div><div class='add'>+	for (j = 0; j &lt; NWD; j++) {	/* mfm */</div><div class='ctx'> 		drive_info_struct *drv = &amp;(hba[i]-&gt;drv[j]);</div><div class='ctx'> 		struct gendisk *disk = hba[i]-&gt;gendisk[j];</div><div class='ctx'> </div><div class='ctx'> 		q = blk_init_queue(do_cciss_request, &amp;hba[i]-&gt;lock);</div><div class='ctx'> 		if (!q) {</div><div class='ctx'> 			printk(KERN_ERR</div><div class='del'>-			   "cciss:  unable to allocate queue for disk %d\n",</div><div class='del'>-			   j);</div><div class='add'>+			       "cciss:  unable to allocate queue for disk %d\n",</div><div class='add'>+			       j);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		drv-&gt;queue = q;</div><div class='hunk'>@@ -3231,100 +3248,95 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 		q-&gt;queuedata = hba[i];</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "cciss/c%dd%d", i, j);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "cciss/host%d/target%d", i, j);</div><div class='ctx'> 		disk-&gt;major = hba[i]-&gt;major;</div><div class='ctx'> 		disk-&gt;first_minor = j &lt;&lt; NWD_SHIFT;</div><div class='ctx'> 		disk-&gt;fops = &amp;cciss_fops;</div><div class='ctx'> 		disk-&gt;queue = q;</div><div class='ctx'> 		disk-&gt;private_data = drv;</div><div class='add'>+		disk-&gt;driverfs_dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 		/* we must register the controller even if no disks exist */</div><div class='ctx'> 		/* this is for the online array utilities */</div><div class='del'>-		if(!drv-&gt;heads &amp;&amp; j)</div><div class='add'>+		if (!drv-&gt;heads &amp;&amp; j)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		blk_queue_hardsect_size(q, drv-&gt;block_size);</div><div class='ctx'> 		set_capacity(disk, drv-&gt;nr_blocks);</div><div class='ctx'> 		add_disk(disk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(1);</div><div class='add'>+	return 1;</div><div class='ctx'> </div><div class='del'>-clean4:</div><div class='add'>+      clean4:</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> 	kfree(hba[i]-&gt;scsi_rejects.complete);</div><div class='ctx'> #endif</div><div class='ctx'> 	kfree(hba[i]-&gt;cmd_pool_bits);</div><div class='del'>-	if(hba[i]-&gt;cmd_pool)</div><div class='add'>+	if (hba[i]-&gt;cmd_pool)</div><div class='ctx'> 		pci_free_consistent(hba[i]-&gt;pdev,</div><div class='del'>-			NR_CMDS * sizeof(CommandList_struct),</div><div class='del'>-			hba[i]-&gt;cmd_pool, hba[i]-&gt;cmd_pool_dhandle);</div><div class='del'>-	if(hba[i]-&gt;errinfo_pool)</div><div class='add'>+				    NR_CMDS * sizeof(CommandList_struct),</div><div class='add'>+				    hba[i]-&gt;cmd_pool, hba[i]-&gt;cmd_pool_dhandle);</div><div class='add'>+	if (hba[i]-&gt;errinfo_pool)</div><div class='ctx'> 		pci_free_consistent(hba[i]-&gt;pdev,</div><div class='del'>-			NR_CMDS * sizeof( ErrorInfo_struct),</div><div class='del'>-			hba[i]-&gt;errinfo_pool,</div><div class='del'>-			hba[i]-&gt;errinfo_pool_dhandle);</div><div class='add'>+				    NR_CMDS * sizeof(ErrorInfo_struct),</div><div class='add'>+				    hba[i]-&gt;errinfo_pool,</div><div class='add'>+				    hba[i]-&gt;errinfo_pool_dhandle);</div><div class='ctx'> 	free_irq(hba[i]-&gt;intr[SIMPLE_MODE_INT], hba[i]);</div><div class='del'>-clean2:</div><div class='add'>+      clean2:</div><div class='ctx'> 	unregister_blkdev(hba[i]-&gt;major, hba[i]-&gt;devname);</div><div class='del'>-clean1:</div><div class='del'>-	release_io_mem(hba[i]);</div><div class='add'>+      clean1:</div><div class='ctx'> 	hba[i]-&gt;busy_initializing = 0;</div><div class='ctx'> 	free_hba(i);</div><div class='del'>-	return(-1);</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit cciss_remove_one (struct pci_dev *pdev)</div><div class='add'>+static void __devexit cciss_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	ctlr_info_t *tmp_ptr;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	char flush_buf[4];</div><div class='del'>-	int return_code; </div><div class='add'>+	int return_code;</div><div class='ctx'> </div><div class='del'>-	if (pci_get_drvdata(pdev) == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk( KERN_ERR "cciss: Unable to remove device \n");</div><div class='add'>+	if (pci_get_drvdata(pdev) == NULL) {</div><div class='add'>+		printk(KERN_ERR "cciss: Unable to remove device \n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	tmp_ptr = pci_get_drvdata(pdev);</div><div class='ctx'> 	i = tmp_ptr-&gt;ctlr;</div><div class='del'>-	if (hba[i] == NULL) </div><div class='del'>-	{</div><div class='add'>+	if (hba[i] == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "cciss: device appears to "</div><div class='del'>-			"already be removed \n");</div><div class='add'>+		       "already be removed \n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Turn board interrupts off  and send the flush cache command */</div><div class='ctx'> 	/* sendcmd will turn off interrupt, and send the flush...</div><div class='del'>-	* To write all data in the battery backed cache to disks */</div><div class='add'>+	 * To write all data in the battery backed cache to disks */</div><div class='ctx'> 	memset(flush_buf, 0, 4);</div><div class='ctx'> 	return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,</div><div class='del'>-				TYPE_CMD);</div><div class='del'>-	if(return_code != IO_OK)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "Error Flushing cache on controller %d\n", </div><div class='del'>-			i);</div><div class='add'>+			      TYPE_CMD);</div><div class='add'>+	if (return_code != IO_OK) {</div><div class='add'>+		printk(KERN_WARNING "Error Flushing cache on controller %d\n",</div><div class='add'>+		       i);</div><div class='ctx'> 	}</div><div class='ctx'> 	free_irq(hba[i]-&gt;intr[2], hba[i]);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='del'>-        if (hba[i]-&gt;msix_vector)</div><div class='del'>-                pci_disable_msix(hba[i]-&gt;pdev);</div><div class='del'>-        else if (hba[i]-&gt;msi_vector)</div><div class='del'>-                pci_disable_msi(hba[i]-&gt;pdev);</div><div class='del'>-#endif /* CONFIG_PCI_MSI */</div><div class='add'>+	if (hba[i]-&gt;msix_vector)</div><div class='add'>+		pci_disable_msix(hba[i]-&gt;pdev);</div><div class='add'>+	else if (hba[i]-&gt;msi_vector)</div><div class='add'>+		pci_disable_msi(hba[i]-&gt;pdev);</div><div class='add'>+#endif				/* CONFIG_PCI_MSI */</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	iounmap(hba[i]-&gt;vaddr);</div><div class='del'>-	cciss_unregister_scsi(i);  /* unhook from SCSI subsystem */</div><div class='add'>+	cciss_unregister_scsi(i);	/* unhook from SCSI subsystem */</div><div class='ctx'> 	unregister_blkdev(hba[i]-&gt;major, hba[i]-&gt;devname);</div><div class='del'>-	remove_proc_entry(hba[i]-&gt;devname, proc_cciss);	</div><div class='del'>-	</div><div class='add'>+	remove_proc_entry(hba[i]-&gt;devname, proc_cciss);</div><div class='add'>+</div><div class='ctx'> 	/* remove it from the disk list */</div><div class='ctx'> 	for (j = 0; j &lt; NWD; j++) {</div><div class='ctx'> 		struct gendisk *disk = hba[i]-&gt;gendisk[j];</div><div class='ctx'> 		if (disk) {</div><div class='ctx'> 			request_queue_t *q = disk-&gt;queue;</div><div class='ctx'> </div><div class='del'>-			if (disk-&gt;flags &amp; GENHD_FL_UP) </div><div class='add'>+			if (disk-&gt;flags &amp; GENHD_FL_UP)</div><div class='ctx'> 				del_gendisk(disk);</div><div class='ctx'> 			if (q)</div><div class='ctx'> 				blk_cleanup_queue(q);</div><div class='hunk'>@@ -3333,26 +3345,28 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_free_consistent(hba[i]-&gt;pdev, NR_CMDS * sizeof(CommandList_struct),</div><div class='ctx'> 			    hba[i]-&gt;cmd_pool, hba[i]-&gt;cmd_pool_dhandle);</div><div class='del'>-	pci_free_consistent(hba[i]-&gt;pdev, NR_CMDS * sizeof( ErrorInfo_struct),</div><div class='del'>-		hba[i]-&gt;errinfo_pool, hba[i]-&gt;errinfo_pool_dhandle);</div><div class='add'>+	pci_free_consistent(hba[i]-&gt;pdev, NR_CMDS * sizeof(ErrorInfo_struct),</div><div class='add'>+			    hba[i]-&gt;errinfo_pool, hba[i]-&gt;errinfo_pool_dhandle);</div><div class='ctx'> 	kfree(hba[i]-&gt;cmd_pool_bits);</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='ctx'> 	kfree(hba[i]-&gt;scsi_rejects.complete);</div><div class='ctx'> #endif</div><div class='del'>- 	release_io_mem(hba[i]);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_hba(i);</div><div class='del'>-}	</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver cciss_pci_driver = {</div><div class='del'>-	.name =		"cciss",</div><div class='del'>-	.probe =	cciss_init_one,</div><div class='del'>-	.remove =	__devexit_p(cciss_remove_one),</div><div class='del'>-	.id_table =	cciss_pci_device_id, /* id_table */</div><div class='add'>+	.name = "cciss",</div><div class='add'>+	.probe = cciss_init_one,</div><div class='add'>+	.remove = __devexit_p(cciss_remove_one),</div><div class='add'>+	.id_table = cciss_pci_device_id,	/* id_table */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  This is it.  Register the PCI driver information for the cards we control</div><div class='del'>- *  the OS will call our registered routines when it finds one of our cards. </div><div class='add'>+ *  the OS will call our registered routines when it finds one of our cards.</div><div class='ctx'>  */</div><div class='ctx'> static int __init cciss_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -3368,12 +3382,10 @@ static void __exit cciss_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> 	pci_unregister_driver(&amp;cciss_pci_driver);</div><div class='ctx'> 	/* double check that all controller entrys have been removed */</div><div class='del'>-	for (i=0; i&lt; MAX_CTLR; i++) </div><div class='del'>-	{</div><div class='del'>-		if (hba[i] != NULL)</div><div class='del'>-		{</div><div class='add'>+	for (i = 0; i &lt; MAX_CTLR; i++) {</div><div class='add'>+		if (hba[i] != NULL) {</div><div class='ctx'> 			printk(KERN_WARNING "cciss: had to remove"</div><div class='del'>-					" controller %d\n", i);</div><div class='add'>+			       " controller %d\n", i);</div><div class='ctx'> 			cciss_remove_one(hba[i]-&gt;pdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3388,21 +3400,21 @@ static void fail_all_cmds(unsigned long ctlr)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_WARNING "cciss%d: controller not responding.\n", h-&gt;ctlr);</div><div class='del'>-	h-&gt;alive = 0;	/* the controller apparently died... */</div><div class='add'>+	h-&gt;alive = 0;		/* the controller apparently died... */</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(h-&gt;pdev); /* Make sure it is really dead. */</div><div class='add'>+	pci_disable_device(h-&gt;pdev);	/* Make sure it is really dead. */</div><div class='ctx'> </div><div class='ctx'> 	/* move everything off the request queue onto the completed queue */</div><div class='del'>-	while( (c = h-&gt;reqQ) != NULL ) {</div><div class='add'>+	while ((c = h-&gt;reqQ) != NULL) {</div><div class='ctx'> 		removeQ(&amp;(h-&gt;reqQ), c);</div><div class='ctx'> 		h-&gt;Qdepth--;</div><div class='del'>-		addQ (&amp;(h-&gt;cmpQ), c);</div><div class='add'>+		addQ(&amp;(h-&gt;cmpQ), c);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now, fail everything on the completed queue with a HW error */</div><div class='del'>-	while( (c = h-&gt;cmpQ) != NULL ) {</div><div class='add'>+	while ((c = h-&gt;cmpQ) != NULL) {</div><div class='ctx'> 		removeQ(&amp;h-&gt;cmpQ, c);</div><div class='ctx'> 		c-&gt;err_info-&gt;CommandStatus = CMD_HARDWARE_ERR;</div><div class='ctx'> 		if (c-&gt;cmd_type == CMD_RWREQ) {</div><div class='hunk'>@@ -3410,8 +3422,8 @@ static void fail_all_cmds(unsigned long ctlr)</div><div class='ctx'> 		} else if (c-&gt;cmd_type == CMD_IOCTL_PEND)</div><div class='ctx'> 			complete(c-&gt;waiting);</div><div class='ctx'> #ifdef CONFIG_CISS_SCSI_TAPE</div><div class='del'>-			else if (c-&gt;cmd_type == CMD_SCSI)</div><div class='del'>-				complete_scsi_command(c, 0, 0);</div><div class='add'>+		else if (c-&gt;cmd_type == CMD_SCSI)</div><div class='add'>+			complete_scsi_command(c, 0, 0);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);</div><div class='head'>diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h<br/>index b24fc0553ccf..868e0d862b0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cciss.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/cciss.h</a></div><div class='hunk'>@@ -60,8 +60,6 @@ struct ctlr_info</div><div class='ctx'> 	__u32	board_id;</div><div class='ctx'> 	void __iomem *vaddr;</div><div class='ctx'> 	unsigned long paddr;</div><div class='del'>-	unsigned long io_mem_addr;</div><div class='del'>-	unsigned long io_mem_length;</div><div class='ctx'> 	CfgTable_struct __iomem *cfgtable;</div><div class='ctx'> 	int	interrupts_enabled;</div><div class='ctx'> 	int	major;</div><div class='head'>diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c<br/>index 597c007fe81b..afdff32f6724 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cciss_scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cciss_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cciss_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/cciss_scsi.c</a></div><div class='hunk'>@@ -578,7 +578,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag)</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;use_sg) {</div><div class='ctx'> 		pci_unmap_sg(ctlr-&gt;pdev,</div><div class='del'>-			cmd-&gt;buffer, cmd-&gt;use_sg,</div><div class='add'>+			cmd-&gt;request_buffer, cmd-&gt;use_sg,</div><div class='ctx'> 				cmd-&gt;sc_data_direction); </div><div class='ctx'> 	}</div><div class='ctx'> 	else if (cmd-&gt;request_bufflen) {</div><div class='hunk'>@@ -1210,7 +1210,7 @@ cciss_scatter_gather(struct pci_dev *pdev,</div><div class='ctx'> 		struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int use_sg, nsegs=0, len;</div><div class='del'>-	struct scatterlist *scatter = (struct scatterlist *) cmd-&gt;buffer;</div><div class='add'>+	struct scatterlist *scatter = (struct scatterlist *) cmd-&gt;request_buffer;</div><div class='ctx'> 	__u64 addr64;</div><div class='ctx'> </div><div class='ctx'> 	/* is it just one virtual address? */	</div><div class='hunk'>@@ -1232,7 +1232,7 @@ cciss_scatter_gather(struct pci_dev *pdev,</div><div class='ctx'> 	} /* else, must be a list of virtual addresses.... */</div><div class='ctx'> 	else if (cmd-&gt;use_sg &lt;= MAXSGENTRIES) {	/* not too many addrs? */</div><div class='ctx'> </div><div class='del'>-		use_sg = pci_map_sg(pdev, cmd-&gt;buffer, cmd-&gt;use_sg, </div><div class='add'>+		use_sg = pci_map_sg(pdev, cmd-&gt;request_buffer, cmd-&gt;use_sg,</div><div class='ctx'> 			cmd-&gt;sc_data_direction);</div><div class='ctx'> </div><div class='ctx'> 		for (nsegs=0; nsegs &lt; use_sg; nsegs++) {</div><div class='head'>diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c<br/>index b6ea2f0c7276..78082edc14b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/cpqarray.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/cpqarray.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/cpqarray.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/cpqarray.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -348,7 +347,6 @@ static void __devexit cpqarray_remove_one(int i)</div><div class='ctx'> 	for(j = 0; j &lt; NWD; j++) {</div><div class='ctx'> 		if (ida_gendisk[i][j]-&gt;flags &amp; GENHD_FL_UP)</div><div class='ctx'> 			del_gendisk(ida_gendisk[i][j]);</div><div class='del'>-		devfs_remove("ida/c%dd%d",i,j);</div><div class='ctx'> 		put_disk(ida_gendisk[i][j]);</div><div class='ctx'> 	}</div><div class='ctx'> 	blk_cleanup_queue(hba[i]-&gt;queue);</div><div class='hunk'>@@ -392,7 +390,7 @@ static void __devexit cpqarray_remove_one_eisa (int i)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* pdev is NULL for eisa */</div><div class='del'>-static int cpqarray_register_ctlr( int i, struct pci_dev *pdev)</div><div class='add'>+static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	request_queue_t *q;</div><div class='ctx'> 	int j;</div><div class='hunk'>@@ -410,8 +408,7 @@ static int cpqarray_register_ctlr( int i, struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	hba[i]-&gt;access.set_intr_mask(hba[i], 0);</div><div class='ctx'> 	if (request_irq(hba[i]-&gt;intr, do_ida_intr,</div><div class='del'>-		SA_INTERRUPT|SA_SHIRQ|SA_SAMPLE_RANDOM,</div><div class='del'>-		hba[i]-&gt;devname, hba[i]))</div><div class='add'>+		IRQF_DISABLED|IRQF_SHARED, hba[i]-&gt;devname, hba[i]))</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",</div><div class='ctx'> 				hba[i]-&gt;intr, hba[i]-&gt;devname);</div><div class='hunk'>@@ -745,7 +742,7 @@ __setup("smart2=", cpqarray_setup);</div><div class='ctx'> /*</div><div class='ctx'>  * Find an EISA controller's signature.  Set up an hba if we find it.</div><div class='ctx'>  */</div><div class='del'>-static int cpqarray_eisa_detect(void)</div><div class='add'>+static int __init cpqarray_eisa_detect(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i=0, j;</div><div class='ctx'> 	__u32 board_id;</div><div class='hunk'>@@ -1036,6 +1033,8 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)</div><div class='ctx'> </div><div class='ctx'> 	complete_buffers(cmd-&gt;rq-&gt;bio, ok);</div><div class='ctx'> </div><div class='add'>+	add_disk_randomness(cmd-&gt;rq-&gt;rq_disk);</div><div class='add'>+</div><div class='ctx'>         DBGPX(printk("Done with %p\n", cmd-&gt;rq););</div><div class='ctx'> 	end_that_request_last(cmd-&gt;rq, ok ? 1 : -EIO);</div><div class='ctx'> }</div><div class='hunk'>@@ -1740,8 +1739,6 @@ static void getgeometry(int ctlr)</div><div class='ctx'> 	     (log_index &lt; id_ctlr_buf-&gt;nr_drvs)</div><div class='ctx'> 	     &amp;&amp; (log_unit &lt; NWD);</div><div class='ctx'> 	     log_unit++) {</div><div class='del'>-		struct gendisk *disk = ida_gendisk[ctlr][log_unit];</div><div class='del'>-</div><div class='ctx'> 		size = sizeof(sense_log_drv_stat_t);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1806,8 +1803,6 @@ static void getgeometry(int ctlr)</div><div class='ctx'> </div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				sprintf(disk-&gt;devfs_name, "ida/c%dd%d", ctlr, log_unit);</div><div class='del'>-</div><div class='ctx'> 				info_p-&gt;phys_drives =</div><div class='ctx'> 				    sense_config_buf-&gt;ctlr_phys_drv;</div><div class='ctx'> 				info_p-&gt;drv_assign_map</div><div class='hunk'>@@ -1843,7 +1838,6 @@ static void __exit cpqarray_exit(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_remove("ida");</div><div class='ctx'> 	remove_proc_entry("cpqarray", proc_root_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c<br/>index dff1e67b1dd4..5109fa37c662 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/floppy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/floppy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/floppy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/floppy.c</a></div><div class='hunk'>@@ -177,7 +177,6 @@ static int print_unex = 1;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;	/* for invalidate_buffers() */</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -224,7 +223,6 @@ static struct completion device_release;</div><div class='ctx'> static unsigned short virtual_dma_port = 0x3f0;</div><div class='ctx'> irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);</div><div class='ctx'> static int set_dor(int fdc, char mask, char data);</div><div class='del'>-static void register_devfs_entries(int drive) __init;</div><div class='ctx'> </div><div class='ctx'> #define K_64	0x10000		/* 64KB */</div><div class='ctx'> </div><div class='hunk'>@@ -251,18 +249,6 @@ static int irqdma_allocated;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;	/* for the compatibility eject ioctl */</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Interrupt freeing also means /proc VFS work - dont do it</div><div class='del'>- * from interrupt context. We push this work into keventd:</div><div class='del'>- */</div><div class='del'>-static void fd_free_irq_fn(void *data)</div><div class='del'>-{</div><div class='del'>-	fd_free_irq();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DECLARE_WORK(fd_free_irq_work, fd_free_irq_fn, NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static struct request *current_req;</div><div class='ctx'> static struct request_queue *floppy_queue;</div><div class='ctx'> static void do_fd_request(request_queue_t * q);</div><div class='hunk'>@@ -828,15 +814,6 @@ static int set_dor(int fdc, char mask, char data)</div><div class='ctx'> 			UDRS-&gt;select_date = jiffies;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 *      We should propagate failures to grab the resources back</div><div class='del'>-	 *      nicely from here. Actually we ought to rewrite the fd</div><div class='del'>-	 *      driver some day too.</div><div class='del'>-	 */</div><div class='del'>-	if (newdor &amp; FLOPPY_MOTOR_MASK)</div><div class='del'>-		floppy_grab_irq_and_dma();</div><div class='del'>-	if (olddor &amp; FLOPPY_MOTOR_MASK)</div><div class='del'>-		floppy_release_irq_and_dma();</div><div class='ctx'> 	return olddor;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -894,8 +871,6 @@ static int _lock_fdc(int drive, int interruptible, int line)</div><div class='ctx'> 		       line);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	if (floppy_grab_irq_and_dma() == -1)</div><div class='del'>-		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit(0, &amp;fdc_busy)) {</div><div class='ctx'> 		DECLARE_WAITQUEUE(wait, current);</div><div class='hunk'>@@ -917,6 +892,8 @@ static int _lock_fdc(int drive, int interruptible, int line)</div><div class='ctx'> </div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		remove_wait_queue(&amp;fdc_wait, &amp;wait);</div><div class='add'>+</div><div class='add'>+		flush_scheduled_work();</div><div class='ctx'> 	}</div><div class='ctx'> 	command_status = FD_COMMAND_NONE;</div><div class='ctx'> </div><div class='hunk'>@@ -950,7 +927,6 @@ static inline void unlock_fdc(void)</div><div class='ctx'> 	if (elv_next_request(floppy_queue))</div><div class='ctx'> 		do_fd_request(floppy_queue);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;floppy_lock, flags);</div><div class='del'>-	floppy_release_irq_and_dma();</div><div class='ctx'> 	wake_up(&amp;fdc_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3676,7 +3652,6 @@ static void __init config_types(void)</div><div class='ctx'> 				first = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			printk("%s fd%d is %s", prepend, drive, name);</div><div class='del'>-			register_devfs_entries(drive);</div><div class='ctx'> 		}</div><div class='ctx'> 		*UDP = *params;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3697,8 +3672,8 @@ static int floppy_release(struct inode *inode, struct file *filp)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!UDRS-&gt;fd_ref)</div><div class='ctx'> 		opened_bdev[drive] = NULL;</div><div class='del'>-	floppy_release_irq_and_dma();</div><div class='ctx'> 	mutex_unlock(&amp;open_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3729,9 +3704,6 @@ static int floppy_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	if (UDRS-&gt;fd_ref == -1 || (UDRS-&gt;fd_ref &amp;&amp; (filp-&gt;f_flags &amp; O_EXCL)))</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='del'>-	if (floppy_grab_irq_and_dma())</div><div class='del'>-		goto out2;</div><div class='del'>-</div><div class='ctx'> 	if (filp-&gt;f_flags &amp; O_EXCL)</div><div class='ctx'> 		UDRS-&gt;fd_ref = -1;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3808,7 +3780,6 @@ out:</div><div class='ctx'> 		UDRS-&gt;fd_ref--;</div><div class='ctx'> 	if (!UDRS-&gt;fd_ref)</div><div class='ctx'> 		opened_bdev[drive] = NULL;</div><div class='del'>-	floppy_release_irq_and_dma();</div><div class='ctx'> out2:</div><div class='ctx'> 	mutex_unlock(&amp;open_lock);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -3825,14 +3796,9 @@ static int check_floppy_change(struct gendisk *disk)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	if (time_after(jiffies, UDRS-&gt;last_checked + UDP-&gt;checkfreq)) {</div><div class='del'>-		if (floppy_grab_irq_and_dma()) {</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		lock_fdc(drive, 0);</div><div class='ctx'> 		poll_drive(0, 0);</div><div class='ctx'> 		process_fd_request();</div><div class='del'>-		floppy_release_irq_and_dma();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (UTESTF(FD_DISK_CHANGED) ||</div><div class='hunk'>@@ -3954,37 +3920,6 @@ static struct block_device_operations floppy_fops = {</div><div class='ctx'> 	.media_changed	= check_floppy_change,</div><div class='ctx'> 	.revalidate_disk = floppy_revalidate,</div><div class='ctx'> };</div><div class='del'>-static char *table[] = {</div><div class='del'>-	"", "d360", "h1200", "u360", "u720", "h360", "h720",</div><div class='del'>-	"u1440", "u2880", "CompaQ", "h1440", "u1680", "h410",</div><div class='del'>-	"u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743",</div><div class='del'>-	"h880", "u1040", "u1120", "h1600", "u1760", "u1920",</div><div class='del'>-	"u3200", "u3520", "u3840", "u1840", "u800", "u1600",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-static int t360[] = { 1, 0 },</div><div class='del'>-	t1200[] = { 2, 5, 6, 10, 12, 14, 16, 18, 20, 23, 0 },</div><div class='del'>-	t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13,</div><div class='del'>-			17, 21, 22, 30, 0 };</div><div class='del'>-static int *table_sup[] =</div><div class='del'>-    { NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in };</div><div class='del'>-</div><div class='del'>-static void __init register_devfs_entries(int drive)</div><div class='del'>-{</div><div class='del'>-	int base_minor = (drive &lt; 4) ? drive : (124 + drive);</div><div class='del'>-</div><div class='del'>-	if (UDP-&gt;cmos &lt; ARRAY_SIZE(default_drive_params)) {</div><div class='del'>-		int i = 0;</div><div class='del'>-		do {</div><div class='del'>-			int minor = base_minor + (table_sup[UDP-&gt;cmos][i] &lt;&lt; 2);</div><div class='del'>-</div><div class='del'>-			devfs_mk_bdev(MKDEV(FLOPPY_MAJOR, minor),</div><div class='del'>-				      S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP |</div><div class='del'>-				      S_IWGRP, "floppy/%d%s", drive,</div><div class='del'>-				      table[table_sup[UDP-&gt;cmos][i]]);</div><div class='del'>-		} while (table_sup[UDP-&gt;cmos][i++]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Floppy Driver initialization</div><div class='hunk'>@@ -4261,11 +4196,9 @@ static int __init floppy_init(void)</div><div class='ctx'> 		motor_off_timer[dr].function = motor_off_callback;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("floppy");</div><div class='del'>-</div><div class='ctx'> 	err = register_blkdev(FLOPPY_MAJOR, "fd");</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_devfs_remove;</div><div class='add'>+		goto out_put_disk;</div><div class='ctx'> </div><div class='ctx'> 	floppy_queue = blk_init_queue(do_fd_request, &amp;floppy_lock);</div><div class='ctx'> 	if (!floppy_queue) {</div><div class='hunk'>@@ -4382,7 +4315,6 @@ static int __init floppy_init(void)</div><div class='ctx'> 	fdc = 0;</div><div class='ctx'> 	del_timer(&amp;fd_timeout);</div><div class='ctx'> 	current_drive = 0;</div><div class='del'>-	floppy_release_irq_and_dma();</div><div class='ctx'> 	initialising = 0;</div><div class='ctx'> 	if (have_no_fdc) {</div><div class='ctx'> 		DPRINT("no floppy controllers found\n");</div><div class='hunk'>@@ -4424,8 +4356,6 @@ out_unreg_region:</div><div class='ctx'> 	blk_cleanup_queue(floppy_queue);</div><div class='ctx'> out_unreg_blkdev:</div><div class='ctx'> 	unregister_blkdev(FLOPPY_MAJOR, "fd");</div><div class='del'>-out_devfs_remove:</div><div class='del'>-	devfs_remove("floppy");</div><div class='ctx'> out_put_disk:</div><div class='ctx'> 	while (dr--) {</div><div class='ctx'> 		del_timer(&amp;motor_off_timer[dr]);</div><div class='hunk'>@@ -4542,7 +4472,7 @@ static void floppy_release_irq_and_dma(void)</div><div class='ctx'> 	if (irqdma_allocated) {</div><div class='ctx'> 		fd_disable_dma();</div><div class='ctx'> 		fd_free_dma();</div><div class='del'>-		schedule_work(&amp;fd_free_irq_work);</div><div class='add'>+		fd_free_irq();</div><div class='ctx'> 		irqdma_allocated = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_dor(0, ~0, 8);</div><div class='hunk'>@@ -4586,19 +4516,6 @@ static void floppy_release_irq_and_dma(void)</div><div class='ctx'> </div><div class='ctx'> static char *floppy;</div><div class='ctx'> </div><div class='del'>-static void unregister_devfs_entries(int drive)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (UDP-&gt;cmos &lt; ARRAY_SIZE(default_drive_params)) {</div><div class='del'>-		i = 0;</div><div class='del'>-		do {</div><div class='del'>-			devfs_remove("floppy/%d%s", drive,</div><div class='del'>-				     table[table_sup[UDP-&gt;cmos][i]]);</div><div class='del'>-		} while (table_sup[UDP-&gt;cmos][i++]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init parse_floppy_cfg_string(char *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	char *ptr;</div><div class='hunk'>@@ -4635,13 +4552,11 @@ void cleanup_module(void)</div><div class='ctx'> 		if ((allowed_drive_mask &amp; (1 &lt;&lt; drive)) &amp;&amp;</div><div class='ctx'> 		    fdc_state[FDC(drive)].version != FDC_NONE) {</div><div class='ctx'> 			del_gendisk(disks[drive]);</div><div class='del'>-			unregister_devfs_entries(drive);</div><div class='ctx'> 			device_remove_file(&amp;floppy_device[drive].dev, &amp;dev_attr_cmos);</div><div class='ctx'> 			platform_device_unregister(&amp;floppy_device[drive]);</div><div class='ctx'> 		}</div><div class='ctx'> 		put_disk(disks[drive]);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_remove("floppy");</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;fd_timeout);</div><div class='ctx'> 	del_timer_sync(&amp;fd_timer);</div><div class='hunk'>@@ -4653,8 +4568,6 @@ void cleanup_module(void)</div><div class='ctx'> 	/* eject disk, if any */</div><div class='ctx'> 	fd_eject(0);</div><div class='ctx'> </div><div class='del'>-	flush_scheduled_work();		/* fd_free_irq() might be pending */</div><div class='del'>-</div><div class='ctx'> 	wait_for_completion(&amp;device_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/loop.c b/drivers/block/loop.c<br/>index 9c3b94e8f03b..7b3b94ddddcc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/loop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/loop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/loop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/loop.c</a></div><div class='hunk'>@@ -50,7 +50,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -63,7 +62,6 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/swap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -210,7 +208,7 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file = lo-&gt;lo_backing_file; /* kudos to NFsckingS */</div><div class='ctx'> 	struct address_space *mapping = file-&gt;f_mapping;</div><div class='del'>-	struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='add'>+	const struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='ctx'> 	pgoff_t index;</div><div class='ctx'> 	unsigned offset, bv_offs;</div><div class='ctx'> 	int len, ret;</div><div class='hunk'>@@ -784,7 +782,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,</div><div class='ctx'> </div><div class='ctx'> 	error = -EINVAL;</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode) || S_ISBLK(inode-&gt;i_mode)) {</div><div class='del'>-		struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='add'>+		const struct address_space_operations *aops = mapping-&gt;a_ops;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we can't read - sorry. If we only can't write - well,</div><div class='ctx'> 		 * it's going to be read-only.</div><div class='hunk'>@@ -818,7 +816,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,</div><div class='ctx'> 	lo-&gt;lo_device = bdev;</div><div class='ctx'> 	lo-&gt;lo_flags = lo_flags;</div><div class='ctx'> 	lo-&gt;lo_backing_file = file;</div><div class='del'>-	lo-&gt;transfer = NULL;</div><div class='add'>+	lo-&gt;transfer = transfer_none;</div><div class='ctx'> 	lo-&gt;ioctl = NULL;</div><div class='ctx'> 	lo-&gt;lo_sizelimit = 0;</div><div class='ctx'> 	lo-&gt;old_gfp_mask = mapping_gfp_mask(mapping);</div><div class='hunk'>@@ -1277,8 +1275,6 @@ static int __init loop_init(void)</div><div class='ctx'> 			goto out_mem3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("loop");</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; max_loop; i++) {</div><div class='ctx'> 		struct loop_device *lo = &amp;loop_dev[i];</div><div class='ctx'> 		struct gendisk *disk = disks[i];</div><div class='hunk'>@@ -1296,7 +1292,6 @@ static int __init loop_init(void)</div><div class='ctx'> 		disk-&gt;first_minor = i;</div><div class='ctx'> 		disk-&gt;fops = &amp;lo_fops;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "loop%d", i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "loop/%d", i);</div><div class='ctx'> 		disk-&gt;private_data = lo;</div><div class='ctx'> 		disk-&gt;queue = lo-&gt;lo_queue;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1310,7 +1305,6 @@ static int __init loop_init(void)</div><div class='ctx'> out_mem4:</div><div class='ctx'> 	while (i--)</div><div class='ctx'> 		blk_cleanup_queue(loop_dev[i].lo_queue);</div><div class='del'>-	devfs_remove("loop");</div><div class='ctx'> 	i = max_loop;</div><div class='ctx'> out_mem3:</div><div class='ctx'> 	while (i--)</div><div class='hunk'>@@ -1333,7 +1327,6 @@ static void loop_exit(void)</div><div class='ctx'> 		blk_cleanup_queue(loop_dev[i].lo_queue);</div><div class='ctx'> 		put_disk(disks[i]);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_remove("loop");</div><div class='ctx'> 	if (unregister_blkdev(LOOP_MAJOR, "loop"))</div><div class='ctx'> 		printk(KERN_WARNING "loop: cannot unregister blkdev\n");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c<br/>index 8bca4905d7f7..0a1b1ea36ddc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/nbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/nbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/nbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/nbd.c</a></div><div class='hunk'>@@ -7,39 +7,9 @@</div><div class='ctx'>  * Copyright 1997-2000 Pavel Machek &lt;pavel@ucw.cz&gt;</div><div class='ctx'>  * Parts copyright 2001 Steven Whitehouse &lt;steve@chygwyn.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * (part of code stolen from loop.c)</div><div class='add'>+ * This file is released under GPLv2 or later.</div><div class='ctx'>  *</div><div class='del'>- * 97-3-25 compiled 0-th version, not yet tested it </div><div class='del'>- *   (it did not work, BTW) (later that day) HEY! it works!</div><div class='del'>- *   (bit later) hmm, not that much... 2:00am next day:</div><div class='del'>- *   yes, it works, but it gives something like 50kB/sec</div><div class='del'>- * 97-4-01 complete rewrite to make it possible for many requests at </div><div class='del'>- *   once to be processed</div><div class='del'>- * 97-4-11 Making protocol independent of endianity etc.</div><div class='del'>- * 97-9-13 Cosmetic changes</div><div class='del'>- * 98-5-13 Attempt to make 64-bit-clean on 64-bit machines</div><div class='del'>- * 99-1-11 Attempt to make 64-bit-clean on 32-bit machines &lt;ankry@mif.pg.gda.pl&gt;</div><div class='del'>- * 01-2-27 Fix to store proper blockcount for kernel (calculated using</div><div class='del'>- *   BLOCK_SIZE_BITS, not device blocksize) &lt;aga@permonline.ru&gt;</div><div class='del'>- * 01-3-11 Make nbd work with new Linux block layer code. It now supports</div><div class='del'>- *   plugging like all the other block devices. Also added in MSG_MORE to</div><div class='del'>- *   reduce number of partial TCP segments sent. &lt;steve@chygwyn.com&gt;</div><div class='del'>- * 01-12-6 Fix deadlock condition by making queue locks independent of</div><div class='del'>- *   the transmit lock. &lt;steve@chygwyn.com&gt;</div><div class='del'>- * 02-10-11 Allow hung xmit to be aborted via SIGKILL &amp; various fixes.</div><div class='del'>- *   &lt;Paul.Clements@SteelEye.com&gt; &lt;James.Bottomley@SteelEye.com&gt;</div><div class='del'>- * 03-06-22 Make nbd work with new linux 2.5 block layer design. This fixes</div><div class='del'>- *   memory corruption from module removal and possible memory corruption</div><div class='del'>- *   from sending/receiving disk data. &lt;ldl@aros.net&gt;</div><div class='del'>- * 03-06-23 Cosmetic changes. &lt;ldl@aros.net&gt;</div><div class='del'>- * 03-06-23 Enhance diagnostics support. &lt;ldl@aros.net&gt;</div><div class='del'>- * 03-06-24 Remove unneeded blksize_bits field from nbd_device struct.</div><div class='del'>- *   &lt;ldl@aros.net&gt;</div><div class='del'>- * 03-06-24 Cleanup PARANOIA usage &amp; code. &lt;ldl@aros.net&gt;</div><div class='del'>- * 04-02-19 Remove PARANOIA, plus various cleanups (Paul Clements)</div><div class='del'>- * possible FIXME: make set_sock / set_blksize / set_size / do_it one syscall</div><div class='del'>- * why not: would need access_ok and friends, would share yet another</div><div class='del'>- *          structure with userland</div><div class='add'>+ * (part of code stolen from loop.c)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -59,8 +29,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='hunk'>@@ -82,9 +50,9 @@</div><div class='ctx'> #define DBG_RX          0x0200</div><div class='ctx'> #define DBG_TX          0x0400</div><div class='ctx'> static unsigned int debugflags;</div><div class='del'>-static unsigned int nbds_max = 16;</div><div class='ctx'> #endif /* NDEBUG */</div><div class='ctx'> </div><div class='add'>+static unsigned int nbds_max = 16;</div><div class='ctx'> static struct nbd_device nbd_dev[MAX_NBD];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -672,7 +640,6 @@ static int __init nbd_init(void)</div><div class='ctx'> 	printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);</div><div class='ctx'> 	dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("nbd");</div><div class='ctx'> 	for (i = 0; i &lt; nbds_max; i++) {</div><div class='ctx'> 		struct gendisk *disk = nbd_dev[i].disk;</div><div class='ctx'> 		nbd_dev[i].file = NULL;</div><div class='hunk'>@@ -690,7 +657,6 @@ static int __init nbd_init(void)</div><div class='ctx'> 		disk-&gt;private_data = &amp;nbd_dev[i];</div><div class='ctx'> 		disk-&gt;flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "nbd%d", i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "nbd/%d", i);</div><div class='ctx'> 		set_capacity(disk, 0x7ffffc00ULL &lt;&lt; 1); /* 2 TB */</div><div class='ctx'> 		add_disk(disk);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -716,7 +682,6 @@ static void __exit nbd_cleanup(void)</div><div class='ctx'> 			put_disk(disk);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	devfs_remove("nbd");</div><div class='ctx'> 	unregister_blkdev(NBD_MAJOR, "nbd");</div><div class='ctx'> 	printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c<br/>index ce94aa11f6a7..4b258f7836f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/paride.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/paride.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/paride.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/paride/paride.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #define PI_VERSION      "1.06"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c<br/>index 852b564e903a..1a9dee19efcf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/pf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/paride/pf.c</a></div><div class='hunk'>@@ -707,7 +707,7 @@ static int pf_detect(void)</div><div class='ctx'> 			if (pi_init(pf-&gt;pi, 0, conf[D_PRT], conf[D_MOD],</div><div class='ctx'> 				    conf[D_UNI], conf[D_PRO], conf[D_DLY],</div><div class='ctx'> 				    pf_scratch, PI_PF, verbose, pf-&gt;name)) {</div><div class='del'>-				if (!pf_probe(pf) &amp;&amp; pf-&gt;disk) {</div><div class='add'>+				if (pf-&gt;disk &amp;&amp; !pf_probe(pf)) {</div><div class='ctx'> 					pf-&gt;present = 1;</div><div class='ctx'> 					k++;</div><div class='ctx'> 				} else</div><div class='head'>diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c<br/>index 79b868254032..13f998aa1cd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/pg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/paride/pg.c</a></div><div class='hunk'>@@ -156,7 +156,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mtio.h&gt;</div><div class='hunk'>@@ -674,25 +673,15 @@ static int __init pg_init(void)</div><div class='ctx'> 		err = PTR_ERR(pg_class);</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_dir("pg");</div><div class='ctx'> 	for (unit = 0; unit &lt; PG_UNITS; unit++) {</div><div class='ctx'> 		struct pg *dev = &amp;devices[unit];</div><div class='del'>-		if (dev-&gt;present) {</div><div class='add'>+		if (dev-&gt;present)</div><div class='ctx'> 			class_device_create(pg_class, NULL, MKDEV(major, unit),</div><div class='ctx'> 					NULL, "pg%u", unit);</div><div class='del'>-			err = devfs_mk_cdev(MKDEV(major, unit),</div><div class='del'>-				      S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u",</div><div class='del'>-				      unit);</div><div class='del'>-			if (err) </div><div class='del'>-				goto out_class;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='del'>-out_class:</div><div class='del'>-	class_device_destroy(pg_class, MKDEV(major, unit));</div><div class='del'>-	class_destroy(pg_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(major, "pg");</div><div class='ctx'> out:</div><div class='hunk'>@@ -705,13 +694,10 @@ static void __exit pg_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	for (unit = 0; unit &lt; PG_UNITS; unit++) {</div><div class='ctx'> 		struct pg *dev = &amp;devices[unit];</div><div class='del'>-		if (dev-&gt;present) {</div><div class='add'>+		if (dev-&gt;present)</div><div class='ctx'> 			class_device_destroy(pg_class, MKDEV(major, unit));</div><div class='del'>-			devfs_remove("pg/%u", unit);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	class_destroy(pg_class);</div><div class='del'>-	devfs_remove("pg");</div><div class='ctx'> 	unregister_chrdev(major, name);</div><div class='ctx'> </div><div class='ctx'> 	for (unit = 0; unit &lt; PG_UNITS; unit++) {</div><div class='head'>diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c<br/>index d2013d362403..35fb26636721 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/paride/pt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/paride/pt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/paride/pt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/paride/pt.c</a></div><div class='hunk'>@@ -141,7 +141,6 @@ static int (*drives[4])[6] = {&amp;drive0, &amp;drive1, &amp;drive2, &amp;drive3};</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mtio.h&gt;</div><div class='hunk'>@@ -971,32 +970,15 @@ static int __init pt_init(void)</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("pt");</div><div class='ctx'> 	for (unit = 0; unit &lt; PT_UNITS; unit++)</div><div class='ctx'> 		if (pt[unit].present) {</div><div class='ctx'> 			class_device_create(pt_class, NULL, MKDEV(major, unit),</div><div class='ctx'> 					NULL, "pt%d", unit);</div><div class='del'>-			err = devfs_mk_cdev(MKDEV(major, unit),</div><div class='del'>-				      S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				      "pt/%d", unit);</div><div class='del'>-			if (err) {</div><div class='del'>-				class_device_destroy(pt_class, MKDEV(major, unit));</div><div class='del'>-				goto out_class;</div><div class='del'>-			}</div><div class='ctx'> 			class_device_create(pt_class, NULL, MKDEV(major, unit + 128),</div><div class='ctx'> 					NULL, "pt%dn", unit);</div><div class='del'>-			err = devfs_mk_cdev(MKDEV(major, unit + 128),</div><div class='del'>-				      S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				      "pt/%dn", unit);</div><div class='del'>-			if (err) {</div><div class='del'>-				class_device_destroy(pt_class, MKDEV(major, unit + 128));</div><div class='del'>-				goto out_class;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='del'>-out_class:</div><div class='del'>-	class_destroy(pt_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(major, "pt");</div><div class='ctx'> out:</div><div class='hunk'>@@ -1009,12 +991,9 @@ static void __exit pt_exit(void)</div><div class='ctx'> 	for (unit = 0; unit &lt; PT_UNITS; unit++)</div><div class='ctx'> 		if (pt[unit].present) {</div><div class='ctx'> 			class_device_destroy(pt_class, MKDEV(major, unit));</div><div class='del'>-			devfs_remove("pt/%d", unit);</div><div class='ctx'> 			class_device_destroy(pt_class, MKDEV(major, unit + 128));</div><div class='del'>-			devfs_remove("pt/%dn", unit);</div><div class='ctx'> 		}</div><div class='ctx'> 	class_destroy(pt_class);</div><div class='del'>-	devfs_remove("pt");</div><div class='ctx'> 	unregister_chrdev(major, name);</div><div class='ctx'> 	for (unit = 0; unit &lt; PT_UNITS; unit++)</div><div class='ctx'> 		if (pt[unit].present)</div><div class='head'>diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c<br/>index a04f60693c39..bde2c64b6346 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/pktcdvd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/pktcdvd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/pktcdvd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/pktcdvd.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pktcdvd.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -2612,7 +2611,6 @@ static struct file_operations pkt_ctl_fops = {</div><div class='ctx'> static struct miscdevice pkt_misc = {</div><div class='ctx'> 	.minor 		= MISC_DYNAMIC_MINOR,</div><div class='ctx'> 	.name  		= "pktcdvd",</div><div class='del'>-	.devfs_name 	= "pktcdvd/control",</div><div class='ctx'> 	.fops  		= &amp;pkt_ctl_fops</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c<br/>index bea75f2cb211..5537974fb242 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/ps2esdi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/ps2esdi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/ps2esdi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/ps2esdi.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEVICE_NAME "PS/2 ESDI"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='hunk'>@@ -341,9 +340,9 @@ static int __init ps2esdi_geninit(void)</div><div class='ctx'> 	/* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can</div><div class='ctx'> 	   share with the SCSI driver */</div><div class='ctx'> 	if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,</div><div class='del'>-		  SA_INTERRUPT | SA_SHIRQ, "PS/2 ESDI", &amp;ps2esdi_gendisk)</div><div class='add'>+		  IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &amp;ps2esdi_gendisk)</div><div class='ctx'> 	    &amp;&amp; request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,</div><div class='del'>-			   SA_SHIRQ, "PS/2 ESDI", &amp;ps2esdi_gendisk)</div><div class='add'>+			   IRQF_SHARED, "PS/2 ESDI", &amp;ps2esdi_gendisk)</div><div class='ctx'> 	    ) {</div><div class='ctx'> 		printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);</div><div class='ctx'> 		error = -EBUSY;</div><div class='hunk'>@@ -421,7 +420,6 @@ static int __init ps2esdi_geninit(void)</div><div class='ctx'> 		disk-&gt;major = PS2ESDI_MAJOR;</div><div class='ctx'> 		disk-&gt;first_minor = i&lt;&lt;6;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "ed%c", 'a'+i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "ed/target%d", i);</div><div class='ctx'> 		disk-&gt;fops = &amp;ps2esdi_fops;</div><div class='ctx'> 		ps2esdi_gendisk[i] = disk;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/block/rd.c b/drivers/block/rd.c<br/>index 940bfd7951e5..a3f64bfe6b58 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/rd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/rd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/rd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/rd.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  * and set blk_size for -ENOSPC,     Werner Fink &lt;werner@suse.de&gt;, Apr '99</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='hunk'>@@ -50,7 +49,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='hunk'>@@ -86,7 +84,7 @@ int rd_size = CONFIG_BLK_DEV_RAM_SIZE;		/* Size of the RAM disks */</div><div class='ctx'>  * behaviour. The default is still BLOCK_SIZE (needed by rd_load_image that</div><div class='ctx'>  * supposes the filesystem in the image uses a BLOCK_SIZE blocksize).</div><div class='ctx'>  */</div><div class='del'>-static int rd_blocksize = BLOCK_SIZE;		/* blocksize of the RAM disks */</div><div class='add'>+static int rd_blocksize = CONFIG_BLK_DEV_RAM_BLOCKSIZE;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2000 Linus Torvalds.</div><div class='hunk'>@@ -191,7 +189,7 @@ static int ramdisk_set_page_dirty(struct page *page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations ramdisk_aops = {</div><div class='add'>+static const struct address_space_operations ramdisk_aops = {</div><div class='ctx'> 	.readpage	= ramdisk_readpage,</div><div class='ctx'> 	.prepare_write	= ramdisk_prepare_write,</div><div class='ctx'> 	.commit_write	= ramdisk_commit_write,</div><div class='hunk'>@@ -412,7 +410,6 @@ static void __exit rd_cleanup(void)</div><div class='ctx'> 		put_disk(rd_disks[i]);</div><div class='ctx'> 		blk_cleanup_queue(rd_queue[i]);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_remove("rd");</div><div class='ctx'> 	unregister_blkdev(RAMDISK_MAJOR, "ramdisk");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -442,8 +439,6 @@ static int __init rd_init(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("rd");</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; CONFIG_BLK_DEV_RAM_COUNT; i++) {</div><div class='ctx'> 		struct gendisk *disk = rd_disks[i];</div><div class='ctx'> </div><div class='hunk'>@@ -461,7 +456,6 @@ static int __init rd_init(void)</div><div class='ctx'> 		disk-&gt;queue = rd_queue[i];</div><div class='ctx'> 		disk-&gt;flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "ram%d", i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "rd/%d", i);</div><div class='ctx'> 		set_capacity(disk, rd_size * 2);</div><div class='ctx'> 		add_disk(rd_disks[i]);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c<br/>index 01f042f6f1c4..cc42e762396f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/swim3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/swim3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/swim3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/swim3.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * handle GCR disks</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -25,7 +24,6 @@</div><div class='ctx'> #include &lt;linux/fd.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -252,8 +250,6 @@ static int floppy_open(struct inode *inode, struct file *filp);</div><div class='ctx'> static int floppy_release(struct inode *inode, struct file *filp);</div><div class='ctx'> static int floppy_check_change(struct gendisk *disk);</div><div class='ctx'> static int floppy_revalidate(struct gendisk *disk);</div><div class='del'>-static int swim3_add_device(struct device_node *swims);</div><div class='del'>-int swim3_init(void);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PMAC_MEDIABAY</div><div class='ctx'> #define check_media_bay(which, what)	1</div><div class='hunk'>@@ -1013,117 +1009,63 @@ static struct block_device_operations floppy_fops = {</div><div class='ctx'> 	.revalidate_disk= floppy_revalidate,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int swim3_init(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *swim;</div><div class='del'>-	int err = -ENOMEM;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	devfs_mk_dir("floppy");</div><div class='del'>-</div><div class='del'>-	swim = find_devices("floppy");</div><div class='del'>-	while (swim &amp;&amp; (floppy_count &lt; MAX_FLOPPIES))</div><div class='del'>-	{</div><div class='del'>-		swim3_add_device(swim);</div><div class='del'>-		swim = swim-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	swim = find_devices("swim3");</div><div class='del'>-	while (swim &amp;&amp; (floppy_count &lt; MAX_FLOPPIES))</div><div class='del'>-	{</div><div class='del'>-		swim3_add_device(swim);</div><div class='del'>-		swim = swim-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!floppy_count)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; floppy_count; i++) {</div><div class='del'>-		disks[i] = alloc_disk(1);</div><div class='del'>-		if (!disks[i])</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (register_blkdev(FLOPPY_MAJOR, "fd")) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	swim3_queue = blk_init_queue(do_fd_request, &amp;swim3_lock);</div><div class='del'>-	if (!swim3_queue) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out_queue;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; floppy_count; i++) {</div><div class='del'>-		struct gendisk *disk = disks[i];</div><div class='del'>-		disk-&gt;major = FLOPPY_MAJOR;</div><div class='del'>-		disk-&gt;first_minor = i;</div><div class='del'>-		disk-&gt;fops = &amp;floppy_fops;</div><div class='del'>-		disk-&gt;private_data = &amp;floppy_states[i];</div><div class='del'>-		disk-&gt;queue = swim3_queue;</div><div class='del'>-		disk-&gt;flags |= GENHD_FL_REMOVABLE;</div><div class='del'>-		sprintf(disk-&gt;disk_name, "fd%d", i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "floppy/%d", i);</div><div class='del'>-		set_capacity(disk, 2880);</div><div class='del'>-		add_disk(disk);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_queue:</div><div class='del'>-	unregister_blkdev(FLOPPY_MAJOR, "fd");</div><div class='del'>-out:</div><div class='del'>-	while (i--)</div><div class='del'>-		put_disk(disks[i]);</div><div class='del'>-	/* shouldn't we do something with results of swim_add_device()? */</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int swim3_add_device(struct device_node *swim)</div><div class='add'>+static int swim3_add_device(struct macio_dev *mdev, int index)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *swim = mdev-&gt;ofdev.node;</div><div class='ctx'> 	struct device_node *mediabay;</div><div class='del'>-	struct floppy_state *fs = &amp;floppy_states[floppy_count];</div><div class='del'>-	struct resource res_reg, res_dma;</div><div class='add'>+	struct floppy_state *fs = &amp;floppy_states[index];</div><div class='add'>+	int rc = -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (of_address_to_resource(swim, 0, &amp;res_reg) ||</div><div class='del'>-	    of_address_to_resource(swim, 1, &amp;res_dma)) {</div><div class='del'>-		printk(KERN_ERR "swim3: Can't get addresses\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* Check &amp; Request resources */</div><div class='add'>+	if (macio_resource_count(mdev) &lt; 2) {</div><div class='add'>+		printk(KERN_WARNING "ifd%d: no address for %s\n",</div><div class='add'>+		       index, swim-&gt;full_name);</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (request_mem_region(res_reg.start, res_reg.end - res_reg.start + 1,</div><div class='del'>-			       " (reg)") == NULL) {</div><div class='del'>-		printk(KERN_ERR "swim3: Can't request register space\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (macio_irq_count(mdev) &lt; 2) {</div><div class='add'>+		printk(KERN_WARNING "fd%d: no intrs for device %s\n",</div><div class='add'>+			index, swim-&gt;full_name);</div><div class='ctx'> 	}</div><div class='del'>-	if (request_mem_region(res_dma.start, res_dma.end - res_dma.start + 1,</div><div class='del'>-			       " (dma)") == NULL) {</div><div class='del'>-		release_mem_region(res_reg.start,</div><div class='del'>-				   res_reg.end - res_reg.start + 1);</div><div class='del'>-		printk(KERN_ERR "swim3: Can't request DMA space\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (macio_request_resource(mdev, 0, "swim3 (mmio)")) {</div><div class='add'>+		printk(KERN_ERR "fd%d: can't request mmio resource for %s\n",</div><div class='add'>+		       index, swim-&gt;full_name);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (swim-&gt;n_intrs &lt; 2) {</div><div class='del'>-		printk(KERN_INFO "swim3: expecting 2 intrs (n_intrs:%d)\n",</div><div class='del'>-		       swim-&gt;n_intrs);</div><div class='del'>-		release_mem_region(res_reg.start,</div><div class='del'>-				   res_reg.end - res_reg.start + 1);</div><div class='del'>-		release_mem_region(res_dma.start,</div><div class='del'>-				   res_dma.end - res_dma.start + 1);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (macio_request_resource(mdev, 1, "swim3 (dma)")) {</div><div class='add'>+		printk(KERN_ERR "fd%d: can't request dma resource for %s\n",</div><div class='add'>+		       index, swim-&gt;full_name);</div><div class='add'>+		macio_release_resource(mdev, 0);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+	dev_set_drvdata(&amp;mdev-&gt;ofdev.dev, fs);</div><div class='ctx'> </div><div class='del'>-	mediabay = (strcasecmp(swim-&gt;parent-&gt;type, "media-bay") == 0) ? swim-&gt;parent : NULL;</div><div class='add'>+	mediabay = (strcasecmp(swim-&gt;parent-&gt;type, "media-bay") == 0) ?</div><div class='add'>+		swim-&gt;parent : NULL;</div><div class='ctx'> 	if (mediabay == NULL)</div><div class='ctx'> 		pmac_call_feature(PMAC_FTR_SWIM3_ENABLE, swim, 0, 1);</div><div class='ctx'> 	</div><div class='ctx'> 	memset(fs, 0, sizeof(*fs));</div><div class='ctx'> 	spin_lock_init(&amp;fs-&gt;lock);</div><div class='ctx'> 	fs-&gt;state = idle;</div><div class='del'>-	fs-&gt;swim3 = (struct swim3 __iomem *)ioremap(res_reg.start, 0x200);</div><div class='del'>-	fs-&gt;dma = (struct dbdma_regs __iomem *)ioremap(res_dma.start, 0x200);</div><div class='del'>-	fs-&gt;swim3_intr = swim-&gt;intrs[0].line;</div><div class='del'>-	fs-&gt;dma_intr = swim-&gt;intrs[1].line;</div><div class='add'>+	fs-&gt;swim3 = (struct swim3 __iomem *)</div><div class='add'>+		ioremap(macio_resource_start(mdev, 0), 0x200);</div><div class='add'>+	if (fs-&gt;swim3 == NULL) {</div><div class='add'>+		printk("fd%d: couldn't map registers for %s\n",</div><div class='add'>+		       index, swim-&gt;full_name);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_release;</div><div class='add'>+	}</div><div class='add'>+	fs-&gt;dma = (struct dbdma_regs __iomem *)</div><div class='add'>+		ioremap(macio_resource_start(mdev, 1), 0x200);</div><div class='add'>+	if (fs-&gt;dma == NULL) {</div><div class='add'>+		printk("fd%d: couldn't map DMA for %s\n",</div><div class='add'>+		       index, swim-&gt;full_name);</div><div class='add'>+		iounmap(fs-&gt;swim3);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_release;</div><div class='add'>+	}</div><div class='add'>+	fs-&gt;swim3_intr = macio_irq(mdev, 0);</div><div class='add'>+	fs-&gt;dma_intr = macio_irq(mdev, 1);;</div><div class='ctx'> 	fs-&gt;cur_cyl = -1;</div><div class='ctx'> 	fs-&gt;cur_sector = -1;</div><div class='ctx'> 	fs-&gt;secpercyl = 36;</div><div class='hunk'>@@ -1137,15 +1079,16 @@ static int swim3_add_device(struct device_node *swim)</div><div class='ctx'> 	st_le16(&amp;fs-&gt;dma_cmd[1].command, DBDMA_STOP);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(fs-&gt;swim3_intr, swim3_interrupt, 0, "SWIM3", fs)) {</div><div class='del'>-		printk(KERN_ERR "Couldn't get irq %d for SWIM3\n", fs-&gt;swim3_intr);</div><div class='add'>+		printk(KERN_ERR "fd%d: couldn't request irq %d for %s\n",</div><div class='add'>+		       index, fs-&gt;swim3_intr, swim-&gt;full_name);</div><div class='ctx'> 		pmac_call_feature(PMAC_FTR_SWIM3_ENABLE, swim, 0, 0);</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> /*</div><div class='ctx'> 	if (request_irq(fs-&gt;dma_intr, fd_dma_interrupt, 0, "SWIM3-dma", fs)) {</div><div class='ctx'> 		printk(KERN_ERR "Couldn't get irq %d for SWIM3 DMA",</div><div class='ctx'> 		       fs-&gt;dma_intr);</div><div class='del'>-		pmac_call_feature(PMAC_FTR_SWIM3_ENABLE, swim, 0, 0);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> */</div><div class='hunk'>@@ -1155,8 +1098,90 @@ static int swim3_add_device(struct device_node *swim)</div><div class='ctx'> 	printk(KERN_INFO "fd%d: SWIM3 floppy controller %s\n", floppy_count,</div><div class='ctx'> 		mediabay ? "in media bay" : "");</div><div class='ctx'> </div><div class='del'>-	floppy_count++;</div><div class='del'>-	</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_unmap:</div><div class='add'>+	iounmap(fs-&gt;dma);</div><div class='add'>+	iounmap(fs-&gt;swim3);</div><div class='add'>+</div><div class='add'>+ out_release:</div><div class='add'>+	macio_release_resource(mdev, 0);</div><div class='add'>+	macio_release_resource(mdev, 1);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit swim3_attach(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	int i, rc;</div><div class='add'>+	struct gendisk *disk;</div><div class='add'>+</div><div class='add'>+	/* Add the drive */</div><div class='add'>+	rc = swim3_add_device(mdev, floppy_count);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Now create the queue if not there yet */</div><div class='add'>+	if (swim3_queue == NULL) {</div><div class='add'>+		/* If we failed, there isn't much we can do as the driver is still</div><div class='add'>+		 * too dumb to remove the device, just bail out</div><div class='add'>+		 */</div><div class='add'>+		if (register_blkdev(FLOPPY_MAJOR, "fd"))</div><div class='add'>+			return 0;</div><div class='add'>+		swim3_queue = blk_init_queue(do_fd_request, &amp;swim3_lock);</div><div class='add'>+		if (swim3_queue == NULL) {</div><div class='add'>+			unregister_blkdev(FLOPPY_MAJOR, "fd");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now register that disk. Same comment about failure handling */</div><div class='add'>+	i = floppy_count++;</div><div class='add'>+	disk = disks[i] = alloc_disk(1);</div><div class='add'>+	if (disk == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	disk-&gt;major = FLOPPY_MAJOR;</div><div class='add'>+	disk-&gt;first_minor = i;</div><div class='add'>+	disk-&gt;fops = &amp;floppy_fops;</div><div class='add'>+	disk-&gt;private_data = &amp;floppy_states[i];</div><div class='add'>+	disk-&gt;queue = swim3_queue;</div><div class='add'>+	disk-&gt;flags |= GENHD_FL_REMOVABLE;</div><div class='add'>+	sprintf(disk-&gt;disk_name, "fd%d", i);</div><div class='add'>+	set_capacity(disk, 2880);</div><div class='add'>+	add_disk(disk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id swim3_match[] =</div><div class='add'>+{</div><div class='add'>+	{</div><div class='add'>+	.name		= "swim3",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.compatible	= "ohare-swim3"</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	.compatible	= "swim3"</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct macio_driver swim3_driver =</div><div class='add'>+{</div><div class='add'>+	.name 		= "swim3",</div><div class='add'>+	.match_table	= swim3_match,</div><div class='add'>+	.probe		= swim3_attach,</div><div class='add'>+#if 0</div><div class='add'>+	.suspend	= swim3_suspend,</div><div class='add'>+	.resume		= swim3_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int swim3_init(void)</div><div class='add'>+{</div><div class='add'>+	macio_register_driver(&amp;swim3_driver);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c<br/>index 2ae08b343b93..c6beee18a07c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/sx8.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/sx8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/sx8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/sx8.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='hunk'>@@ -1510,7 +1509,6 @@ static int carm_init_disks(struct carm_host *host)</div><div class='ctx'> 		port-&gt;disk = disk;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, DRV_NAME "/%u",</div><div class='ctx'> 			(unsigned int) (host-&gt;id * CARM_MAX_PORTS) + i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, DRV_NAME "/%u_%u", host-&gt;id, i);</div><div class='ctx'> 		disk-&gt;major = host-&gt;major;</div><div class='ctx'> 		disk-&gt;first_minor = i * CARM_MINORS_PER_MAJOR;</div><div class='ctx'> 		disk-&gt;fops = &amp;carm_bd_ops;</div><div class='hunk'>@@ -1672,15 +1670,13 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (host-&gt;flags &amp; FL_DYN_MAJOR)</div><div class='ctx'> 		host-&gt;major = rc;</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir(DRV_NAME);</div><div class='del'>-</div><div class='ctx'> 	rc = carm_init_disks(host);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out_blkdev_disks;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(pdev-&gt;irq, carm_interrupt, SA_SHIRQ, DRV_NAME, host);</div><div class='add'>+	rc = request_irq(pdev-&gt;irq, carm_interrupt, IRQF_SHARED, DRV_NAME, host);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='hunk'>@@ -1694,9 +1690,10 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	DPRINTK("waiting for probe_comp\n");</div><div class='ctx'> 	wait_for_completion(&amp;host-&gt;probe_comp);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",</div><div class='add'>+	printk(KERN_INFO "%s: pci %s, ports %d, io %llx, irq %u, major %d\n",</div><div class='ctx'> 	       host-&gt;name, pci_name(pdev), (int) CARM_MAX_PORTS,</div><div class='del'>-	       pci_resource_start(pdev, 0), pdev-&gt;irq, host-&gt;major);</div><div class='add'>+	       (unsigned long long)pci_resource_start(pdev, 0),</div><div class='add'>+		   pdev-&gt;irq, host-&gt;major);</div><div class='ctx'> </div><div class='ctx'> 	carm_host_id++;</div><div class='ctx'> 	pci_set_drvdata(pdev, host);</div><div class='hunk'>@@ -1738,7 +1735,6 @@ static void carm_remove_one (struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	free_irq(pdev-&gt;irq, host);</div><div class='ctx'> 	carm_free_disks(host);</div><div class='del'>-	devfs_remove(DRV_NAME);</div><div class='ctx'> 	unregister_blkdev(host-&gt;major, host-&gt;name);</div><div class='ctx'> 	if (host-&gt;major == 160)</div><div class='ctx'> 		clear_bit(0, &amp;carm_major_alloc);</div><div class='head'>diff --git a/drivers/block/ub.c b/drivers/block/ub.c<br/>index c688c25992e4..d62b49fbf10c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/ub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/ub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/ub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/ub.c</a></div><div class='hunk'>@@ -10,17 +10,13 @@</div><div class='ctx'>  * TODO (sorted by decreasing priority)</div><div class='ctx'>  *  -- set readonly flag for CDs, set removable flag for CF readers</div><div class='ctx'>  *  -- do inquiry and verify we got a disk and not a tape (for LUN mismatch)</div><div class='del'>- *  -- special case some senses, e.g. 3a/0 -&gt; no media present, reduce retries</div><div class='ctx'>  *  -- verify the 13 conditions and do bulk resets</div><div class='del'>- *  -- kill last_pipe and simply do two-state clearing on both pipes</div><div class='ctx'>  *  -- highmem</div><div class='ctx'>  *  -- move top_sense and work_bcs into separate allocations (if they survive)</div><div class='ctx'>  *     for cache purists and esoteric architectures.</div><div class='ctx'>  *  -- Allocate structure for LUN 0 before the first ub_sync_tur, avoid NULL. ?</div><div class='ctx'>  *  -- prune comments, they are too volumnous</div><div class='del'>- *  -- Exterminate P3 printks</div><div class='ctx'>  *  -- Resove XXX's</div><div class='del'>- *  -- Redo "benh's retries", perhaps have spin-up code to handle them. V:D=?</div><div class='ctx'>  *  -- CLEAR, CLR2STS, CLRRS seem to be ripe for refactoring.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -28,12 +24,10 @@</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/usb_usual.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "ub"</div><div class='del'>-#define DEVFS_NAME DRV_NAME</div><div class='ctx'> </div><div class='ctx'> #define UB_MAJOR 180</div><div class='ctx'> </div><div class='hunk'>@@ -180,7 +174,6 @@ struct ub_dev;</div><div class='ctx'> #define UB_DIR_ILLEGAL2	2</div><div class='ctx'> #define UB_DIR_WRITE	3</div><div class='ctx'> </div><div class='del'>-/* P3 */</div><div class='ctx'> #define UB_DIR_CHAR(c)  (((c)==UB_DIR_WRITE)? 'w': \</div><div class='ctx'> 			 (((c)==UB_DIR_READ)? 'r': 'n'))</div><div class='ctx'> </div><div class='hunk'>@@ -669,8 +662,9 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)</div><div class='ctx'> 	 */</div><div class='ctx'> 	n_elem = blk_rq_map_sg(lun-&gt;disk-&gt;queue, rq, &amp;urq-&gt;sgv[0]);</div><div class='ctx'> 	if (n_elem &lt; 0) {</div><div class='add'>+		/* Impossible, because blk_rq_map_sg should not hit ENOMEM. */</div><div class='ctx'> 		printk(KERN_INFO "%s: failed request map (%d)\n",</div><div class='del'>-		    lun-&gt;name, n_elem); /* P3 */</div><div class='add'>+		    lun-&gt;name, n_elem);</div><div class='ctx'> 		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (n_elem &gt; UB_MAX_REQ_SG) {	/* Paranoia */</div><div class='hunk'>@@ -824,7 +818,9 @@ static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,</div><div class='ctx'> 	if (urq-&gt;current_try &gt;= 3)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	urq-&gt;current_try++;</div><div class='del'>-	/* P3 */ printk("%s: dir %c len/act %d/%d "</div><div class='add'>+</div><div class='add'>+	/* Remove this if anyone complains of flooding. */</div><div class='add'>+	printk(KERN_DEBUG "%s: dir %c len/act %d/%d "</div><div class='ctx'> 	    "[sense %x %02x %02x] retry %d\n",</div><div class='ctx'> 	    sc-&gt;name, UB_DIR_CHAR(cmd-&gt;dir), cmd-&gt;len, cmd-&gt;act_len,</div><div class='ctx'> 	    cmd-&gt;key, cmd-&gt;asc, cmd-&gt;ascq, urq-&gt;current_try);</div><div class='hunk'>@@ -1241,8 +1237,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)</div><div class='ctx'> 			 * to check. But it's not all right if the device</div><div class='ctx'> 			 * counts disagree with our counts.</div><div class='ctx'> 			 */</div><div class='del'>-			/* P3 */ printk("%s: resid %d len %d act %d\n",</div><div class='del'>-			    sc-&gt;name, len, cmd-&gt;len, cmd-&gt;act_len);</div><div class='ctx'> 			goto Bad_End;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1253,7 +1247,6 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)</div><div class='ctx'> 			ub_state_sense(sc, cmd);</div><div class='ctx'> 			return;</div><div class='ctx'> 		case US_BULK_STAT_PHASE:</div><div class='del'>-			/* P3 */ printk("%s: status PHASE\n", sc-&gt;name);</div><div class='ctx'> 			goto Bad_End;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_INFO "%s: unknown CSW status 0x%x\n",</div><div class='hunk'>@@ -1568,16 +1561,14 @@ static void ub_reset_task(void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;sc-&gt;poison)) {</div><div class='del'>-		printk(KERN_NOTICE "%s: Not resetting disconnected device\n",</div><div class='del'>-		    sc-&gt;name); /* P3 This floods. Remove soon. XXX */</div><div class='add'>+		;</div><div class='ctx'> 	} else if ((sc-&gt;reset &amp; 1) == 0) {</div><div class='ctx'> 		ub_sync_reset(sc);</div><div class='ctx'> 		msleep(700);	/* usb-storage sleeps 6s (!) */</div><div class='ctx'> 		ub_probe_clear_stall(sc, sc-&gt;recv_bulk_pipe);</div><div class='ctx'> 		ub_probe_clear_stall(sc, sc-&gt;send_bulk_pipe);</div><div class='ctx'> 	} else if (sc-&gt;dev-&gt;actconfig-&gt;desc.bNumInterfaces != 1) {</div><div class='del'>-		printk(KERN_NOTICE "%s: Not resetting multi-interface device\n",</div><div class='del'>-		    sc-&gt;name); /* P3 This floods. Remove soon. XXX */</div><div class='add'>+		;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if ((lkr = usb_lock_device_for_reset(sc-&gt;dev, sc-&gt;intf)) &lt; 0) {</div><div class='ctx'> 			printk(KERN_NOTICE</div><div class='hunk'>@@ -1651,15 +1642,11 @@ static void ub_revalidate(struct ub_dev *sc, struct ub_lun *lun)</div><div class='ctx'> static int ub_bd_open(struct inode *inode, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = inode-&gt;i_bdev-&gt;bd_disk;</div><div class='del'>-	struct ub_lun *lun;</div><div class='del'>-	struct ub_dev *sc;</div><div class='add'>+	struct ub_lun *lun = disk-&gt;private_data;</div><div class='add'>+	struct ub_dev *sc = lun-&gt;udev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if ((lun = disk-&gt;private_data) == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	sc = lun-&gt;udev;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;ub_lock, flags);</div><div class='ctx'> 	if (atomic_read(&amp;sc-&gt;poison)) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ub_lock, flags);</div><div class='hunk'>@@ -1823,10 +1810,8 @@ static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun)</div><div class='ctx'> 	rc = ub_submit_scsi(sc, cmd);</div><div class='ctx'> 	spin_unlock_irqrestore(sc-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (rc != 0) {</div><div class='del'>-		printk("ub: testing ready: submit error (%d)\n", rc); /* P3 */</div><div class='add'>+	if (rc != 0)</div><div class='ctx'> 		goto err_submit;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;compl);</div><div class='ctx'> </div><div class='hunk'>@@ -1884,20 +1869,16 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,</div><div class='ctx'> 	rc = ub_submit_scsi(sc, cmd);</div><div class='ctx'> 	spin_unlock_irqrestore(sc-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (rc != 0) {</div><div class='del'>-		printk("ub: reading capacity: submit error (%d)\n", rc); /* P3 */</div><div class='add'>+	if (rc != 0)</div><div class='ctx'> 		goto err_submit;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;compl);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;error != 0) {</div><div class='del'>-		printk("ub: reading capacity: error %d\n", cmd-&gt;error); /* P3 */</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_read;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cmd-&gt;act_len != 8) {</div><div class='del'>-		printk("ub: reading capacity: size %d\n", cmd-&gt;act_len); /* P3 */</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_read;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1911,7 +1892,6 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,</div><div class='ctx'> 	case 2048:	shift = 2;	break;</div><div class='ctx'> 	case 4096:	shift = 3;	break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk("ub: Bad sector size %u\n", bsize); /* P3 */</div><div class='ctx'> 		rc = -EDOM;</div><div class='ctx'> 		goto err_inv_bsize;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2023,17 +2003,8 @@ static int ub_sync_getmaxlun(struct ub_dev *sc)</div><div class='ctx'> 	sc-&gt;work_urb.error_count = 0;</div><div class='ctx'> 	sc-&gt;work_urb.status = 0;</div><div class='ctx'> </div><div class='del'>-	if ((rc = usb_submit_urb(&amp;sc-&gt;work_urb, GFP_KERNEL)) != 0) {</div><div class='del'>-		if (rc == -EPIPE) {</div><div class='del'>-			printk("%s: Stall submitting GetMaxLUN, using 1 LUN\n",</div><div class='del'>-			     sc-&gt;name); /* P3 */</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_NOTICE</div><div class='del'>-			     "%s: Unable to submit GetMaxLUN (%d)\n",</div><div class='del'>-			     sc-&gt;name, rc);</div><div class='del'>-		}</div><div class='add'>+	if ((rc = usb_submit_urb(&amp;sc-&gt;work_urb, GFP_KERNEL)) != 0)</div><div class='ctx'> 		goto err_submit;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;timer);</div><div class='ctx'> 	timer.function = ub_probe_timeout;</div><div class='hunk'>@@ -2046,21 +2017,10 @@ static int ub_sync_getmaxlun(struct ub_dev *sc)</div><div class='ctx'> 	del_timer_sync(&amp;timer);</div><div class='ctx'> 	usb_kill_urb(&amp;sc-&gt;work_urb);</div><div class='ctx'> </div><div class='del'>-	if ((rc = sc-&gt;work_urb.status) &lt; 0) {</div><div class='del'>-		if (rc == -EPIPE) {</div><div class='del'>-			printk("%s: Stall at GetMaxLUN, using 1 LUN\n",</div><div class='del'>-			     sc-&gt;name); /* P3 */</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_NOTICE</div><div class='del'>-			     "%s: Error at GetMaxLUN (%d)\n",</div><div class='del'>-			     sc-&gt;name, rc);</div><div class='del'>-		}</div><div class='add'>+	if ((rc = sc-&gt;work_urb.status) &lt; 0)</div><div class='ctx'> 		goto err_io;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;work_urb.actual_length != 1) {</div><div class='del'>-		printk("%s: GetMaxLUN returned %d bytes\n", sc-&gt;name,</div><div class='del'>-		    sc-&gt;work_urb.actual_length); /* P3 */</div><div class='ctx'> 		nluns = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if ((nluns = *p) == 55) {</div><div class='hunk'>@@ -2071,8 +2031,6 @@ static int ub_sync_getmaxlun(struct ub_dev *sc)</div><div class='ctx'> 			if (nluns &gt; UB_MAX_LUNS)</div><div class='ctx'> 				nluns = UB_MAX_LUNS;</div><div class='ctx'> 		}</div><div class='del'>-		printk("%s: GetMaxLUN returned %d, using %d LUNs\n", sc-&gt;name,</div><div class='del'>-		    *p, nluns); /* P3 */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(p);</div><div class='hunk'>@@ -2270,7 +2228,7 @@ static int ub_probe(struct usb_interface *intf,</div><div class='ctx'> 	 * has to succeed, so we clear checks with an additional one here.</div><div class='ctx'> 	 * In any case it's not our business how revaliadation is implemented.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {	/* Retries for benh's key */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {  /* Retries for the schwag key from KS'04 */</div><div class='ctx'> 		if ((rc = ub_sync_tur(sc, NULL)) &lt;= 0) break;</div><div class='ctx'> 		if (rc != 0x6) break;</div><div class='ctx'> 		msleep(10);</div><div class='hunk'>@@ -2318,7 +2276,6 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)</div><div class='ctx'> 		goto err_id;</div><div class='ctx'> </div><div class='ctx'> 	lun-&gt;udev = sc;</div><div class='del'>-	list_add(&amp;lun-&gt;link, &amp;sc-&gt;luns);</div><div class='ctx'> </div><div class='ctx'> 	snprintf(lun-&gt;name, 16, DRV_NAME "%c(%d.%d.%d)",</div><div class='ctx'> 	    lun-&gt;id + 'a', sc-&gt;dev-&gt;bus-&gt;busnum, sc-&gt;dev-&gt;devnum, lun-&gt;num);</div><div class='hunk'>@@ -2331,9 +2288,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)</div><div class='ctx'> 	if ((disk = alloc_disk(UB_PARTS_PER_LUN)) == NULL)</div><div class='ctx'> 		goto err_diskalloc;</div><div class='ctx'> </div><div class='del'>-	lun-&gt;disk = disk;</div><div class='ctx'> 	sprintf(disk-&gt;disk_name, DRV_NAME "%c", lun-&gt;id + 'a');</div><div class='del'>-	sprintf(disk-&gt;devfs_name, DEVFS_NAME "/%c", lun-&gt;id + 'a');</div><div class='ctx'> 	disk-&gt;major = UB_MAJOR;</div><div class='ctx'> 	disk-&gt;first_minor = lun-&gt;id * UB_PARTS_PER_LUN;</div><div class='ctx'> 	disk-&gt;fops = &amp;ub_bd_fops;</div><div class='hunk'>@@ -2353,7 +2308,9 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)</div><div class='ctx'> 	blk_queue_max_sectors(q, UB_MAX_SECTORS);</div><div class='ctx'> 	blk_queue_hardsect_size(q, lun-&gt;capacity.bsize);</div><div class='ctx'> </div><div class='add'>+	lun-&gt;disk = disk;</div><div class='ctx'> 	q-&gt;queuedata = lun;</div><div class='add'>+	list_add(&amp;lun-&gt;link, &amp;sc-&gt;luns);</div><div class='ctx'> </div><div class='ctx'> 	set_capacity(disk, lun-&gt;capacity.nsec);</div><div class='ctx'> 	if (lun-&gt;removable)</div><div class='hunk'>@@ -2366,7 +2323,6 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)</div><div class='ctx'> err_blkqinit:</div><div class='ctx'> 	put_disk(disk);</div><div class='ctx'> err_diskalloc:</div><div class='del'>-	list_del(&amp;lun-&gt;link);</div><div class='ctx'> 	ub_id_put(lun-&gt;id);</div><div class='ctx'> err_id:</div><div class='ctx'> 	kfree(lun);</div><div class='hunk'>@@ -2379,7 +2335,6 @@ static void ub_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	struct ub_dev *sc = usb_get_intfdata(intf);</div><div class='ctx'> 	struct list_head *p;</div><div class='ctx'> 	struct ub_lun *lun;</div><div class='del'>-	struct gendisk *disk;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2435,9 +2390,7 @@ static void ub_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each (p, &amp;sc-&gt;luns) {</div><div class='ctx'> 		lun = list_entry(p, struct ub_lun, link);</div><div class='del'>-		disk = lun-&gt;disk;</div><div class='del'>-		if (disk-&gt;flags &amp; GENHD_FL_UP)</div><div class='del'>-			del_gendisk(disk);</div><div class='add'>+		del_gendisk(lun-&gt;disk);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * I wish I could do:</div><div class='ctx'> 		 *    set_bit(QUEUE_FLAG_DEAD, &amp;q-&gt;queue_flags);</div><div class='hunk'>@@ -2489,7 +2442,6 @@ static int __init ub_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)</div><div class='ctx'> 		goto err_regblkdev;</div><div class='del'>-	devfs_mk_dir(DEVFS_NAME);</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = usb_register(&amp;ub_driver)) != 0)</div><div class='ctx'> 		goto err_register;</div><div class='hunk'>@@ -2498,7 +2450,6 @@ static int __init ub_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='del'>-	devfs_remove(DEVFS_NAME);</div><div class='ctx'> 	unregister_blkdev(UB_MAJOR, DRV_NAME);</div><div class='ctx'> err_regblkdev:</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -2508,7 +2459,6 @@ static void __exit ub_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	usb_deregister(&amp;ub_driver);</div><div class='ctx'> </div><div class='del'>-	devfs_remove(DEVFS_NAME);</div><div class='ctx'> 	unregister_blkdev(UB_MAJOR, DRV_NAME);</div><div class='ctx'> 	usb_usual_clear_present(USB_US_TYPE_UB);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/block/umem.c b/drivers/block/umem.c<br/>index f7d4c65a7b8c..5d8925bd9045 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/umem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/umem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/umem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/umem.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> //#define DEBUG /* uncomment if you want debugging info (pr_debug) */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='hunk'>@@ -1041,7 +1040,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 	card-&gt;win_size = data;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, mm_interrupt, SA_SHIRQ, "pci-umem", card)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) {</div><div class='ctx'> 		printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card-&gt;card_number);</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -1192,7 +1191,6 @@ static int __init mm_init(void)</div><div class='ctx'> 	for (i = 0; i &lt; num_cards; i++) {</div><div class='ctx'> 		struct gendisk *disk = mm_gendisk[i];</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "umem%c", 'a'+i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "umem/card%d", i);</div><div class='ctx'> 		spin_lock_init(&amp;cards[i].lock);</div><div class='ctx'> 		disk-&gt;major = major_nr;</div><div class='ctx'> 		disk-&gt;first_minor  = i &lt;&lt; MM_SHIFT;</div><div class='head'>diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c<br/>index f63e07bd9f9c..ec5a1b90a0a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/viodasd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/viodasd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/viodasd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/viodasd.c</a></div><div class='hunk'>@@ -59,7 +59,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  * numbers 0-255 we get a maximum of 32 disks.</div><div class='ctx'>  */</div><div class='ctx'> #define VIOD_GENHD_NAME		"iseries/vd"</div><div class='del'>-#define VIOD_GENHD_DEVFS_NAME	"iseries/disc"</div><div class='ctx'> </div><div class='ctx'> #define VIOD_VERS		"1.64"</div><div class='ctx'> </div><div class='hunk'>@@ -523,8 +522,6 @@ retry:</div><div class='ctx'> 	else</div><div class='ctx'> 		snprintf(g-&gt;disk_name, sizeof(g-&gt;disk_name),</div><div class='ctx'> 				VIOD_GENHD_NAME "%c", 'a' + (dev_no % 26));</div><div class='del'>-	snprintf(g-&gt;devfs_name, sizeof(g-&gt;devfs_name),</div><div class='del'>-			"%s%d", VIOD_GENHD_DEVFS_NAME, dev_no);</div><div class='ctx'> 	g-&gt;fops = &amp;viodasd_fops;</div><div class='ctx'> 	g-&gt;queue = q;</div><div class='ctx'> 	g-&gt;private_data = d;</div><div class='hunk'>@@ -747,7 +744,7 @@ static int viodasd_remove(struct vio_dev *vdev)</div><div class='ctx'>  * support.</div><div class='ctx'>  */</div><div class='ctx'> static struct vio_device_id viodasd_device_table[] __devinitdata = {</div><div class='del'>-	{ "viodasd", "" },</div><div class='add'>+	{ "block", "IBM,iSeries-viodasd" },</div><div class='ctx'> 	{ "", "" }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(vio, viodasd_device_table);</div><div class='head'>diff --git a/drivers/block/xd.c b/drivers/block/xd.c<br/>index cbce7c5e9445..e828e4cbd3e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/xd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/xd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/xd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/xd.c</a></div><div class='hunk'>@@ -215,7 +215,6 @@ static int __init xd_init(void)</div><div class='ctx'> 		disk-&gt;major = XT_DISK_MAJOR;</div><div class='ctx'> 		disk-&gt;first_minor = i&lt;&lt;6;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "xd%c", i+'a');</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "xd/target%d", i);</div><div class='ctx'> 		disk-&gt;fops = &amp;xd_fops;</div><div class='ctx'> 		disk-&gt;private_data = p;</div><div class='ctx'> 		disk-&gt;queue = xd_queue;</div><div class='head'>diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c<br/>index bb5e8d665a2a..82ddbdd7bd4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/block/z2ram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/block/z2ram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/block/z2ram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/block/z2ram.c</a></div><div class='hunk'>@@ -354,7 +354,6 @@ z2_init(void)</div><div class='ctx'>     z2ram_gendisk-&gt;first_minor = 0;</div><div class='ctx'>     z2ram_gendisk-&gt;fops = &amp;z2_fops;</div><div class='ctx'>     sprintf(z2ram_gendisk-&gt;disk_name, "z2ram");</div><div class='del'>-    strcpy(z2ram_gendisk-&gt;devfs_name, z2ram_gendisk-&gt;disk_name);</div><div class='ctx'> </div><div class='ctx'>     z2ram_gendisk-&gt;queue = z2_queue;</div><div class='ctx'>     add_disk(z2ram_gendisk);</div><div class='head'>diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c<br/>index 3e7a067cc087..13ba729cdd57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bcm203x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bcm203x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bcm203x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/bcm203x.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -235,6 +234,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	data-&gt;fw_data = kmalloc(firmware-&gt;size, GFP_KERNEL);</div><div class='ctx'> 	if (!data-&gt;fw_data) {</div><div class='ctx'> 		BT_ERR("Can't allocate memory for firmware image");</div><div class='add'>+		release_firmware(firmware);</div><div class='ctx'> 		usb_free_urb(data-&gt;urb);</div><div class='ctx'> 		kfree(data-&gt;buffer);</div><div class='ctx'> 		kfree(data);</div><div class='head'>diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c<br/>index 8947c8837dac..23f96213f4ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bfusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bfusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bfusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/bfusb.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c<br/>index 473a13b22b29..8eebf9ca3786 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bluecard_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bluecard_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bluecard_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/bluecard_cs.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -740,6 +739,7 @@ static int bluecard_open(bluecard_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;type = HCI_PCCARD;</div><div class='ctx'> 	hdev-&gt;driver_data = info;</div><div class='add'>+	SET_HCIDEV_DEV(hdev, &amp;info-&gt;p_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;open     = bluecard_hci_open;</div><div class='ctx'> 	hdev-&gt;close    = bluecard_hci_close;</div><div class='head'>diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c<br/>index 9446960ac742..e0231dc2cb1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bpa10x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bpa10x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bpa10x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/bpa10x.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c<br/>index b94ac2f9f7ba..df7bb016df49 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/bt3c_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/bt3c_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/bt3c_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/bt3c_cs.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -583,6 +582,7 @@ static int bt3c_open(bt3c_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;type = HCI_PCCARD;</div><div class='ctx'> 	hdev-&gt;driver_data = info;</div><div class='add'>+	SET_HCIDEV_DEV(hdev, &amp;info-&gt;p_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;open     = bt3c_hci_open;</div><div class='ctx'> 	hdev-&gt;close    = bt3c_hci_close;</div><div class='head'>diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c<br/>index 9ce4c93467e5..746ccca97f6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/btuart_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/btuart_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/btuart_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/btuart_cs.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -503,6 +502,7 @@ static int btuart_open(btuart_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;type = HCI_PCCARD;</div><div class='ctx'> 	hdev-&gt;driver_data = info;</div><div class='add'>+	SET_HCIDEV_DEV(hdev, &amp;info-&gt;p_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;open     = btuart_hci_open;</div><div class='ctx'> 	hdev-&gt;close    = btuart_hci_close;</div><div class='head'>diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c<br/>index a71a240611e0..0e99def8a1e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/dtl1_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/dtl1_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/dtl1_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/dtl1_cs.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -423,6 +422,9 @@ static int dtl1_hci_send_frame(struct sk_buff *skb)</div><div class='ctx'> 	nsh.len = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	s = bt_skb_alloc(NSHL + skb-&gt;len + 1, GFP_ATOMIC);</div><div class='add'>+	if (!s)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	skb_reserve(s, NSHL);</div><div class='ctx'> 	memcpy(skb_put(s, skb-&gt;len), skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 	if (skb-&gt;len &amp; 0x0001)</div><div class='hunk'>@@ -482,6 +484,7 @@ static int dtl1_open(dtl1_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;type = HCI_PCCARD;</div><div class='ctx'> 	hdev-&gt;driver_data = info;</div><div class='add'>+	SET_HCIDEV_DEV(hdev, &amp;info-&gt;p_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;open     = dtl1_hci_open;</div><div class='ctx'> 	hdev-&gt;close    = dtl1_hci_close;</div><div class='head'>diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c<br/>index 7bd4ef904115..d0cface535fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_bcsp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_bcsp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_bcsp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/hci_bcsp.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c<br/>index 4804d474dc87..ad62abbbb739 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_h4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_h4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_h4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/hci_h4.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c<br/>index 613673b12fa6..93ba25b7ea32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_ldisc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_ldisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_ldisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/hci_ldisc.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -192,7 +191,7 @@ static int hci_uart_flush(struct hci_dev *hdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Flush any pending characters in the driver and discipline. */</div><div class='ctx'> 	tty_ldisc_flush(tty);</div><div class='del'>-	if (tty-&gt;driver-&gt;flush_buffer)</div><div class='add'>+	if (tty-&gt;driver &amp;&amp; tty-&gt;driver-&gt;flush_buffer)</div><div class='ctx'> 		tty-&gt;driver-&gt;flush_buffer(tty);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(HCI_UART_PROTO_SET, &amp;hu-&gt;flags))</div><div class='hunk'>@@ -291,7 +290,7 @@ static int hci_uart_tty_open(struct tty_struct *tty)</div><div class='ctx'> 	if (tty-&gt;ldisc.flush_buffer)</div><div class='ctx'> 		tty-&gt;ldisc.flush_buffer(tty);</div><div class='ctx'> </div><div class='del'>-	if (tty-&gt;driver-&gt;flush_buffer)</div><div class='add'>+	if (tty-&gt;driver &amp;&amp; tty-&gt;driver-&gt;flush_buffer)</div><div class='ctx'> 		tty-&gt;driver-&gt;flush_buffer(tty);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c<br/>index 92382e823285..6a0c2230f82f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/hci_usb.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -123,6 +122,9 @@ static struct usb_device_id blacklist_ids[] = {</div><div class='ctx'> 	/* RTX Telecom based adapter with buggy SCO support */</div><div class='ctx'> 	{ USB_DEVICE(0x0400, 0x0807), .driver_info = HCI_BROKEN_ISOC },</div><div class='ctx'> </div><div class='add'>+	/* Belkin F8T012 */</div><div class='add'>+	{ USB_DEVICE(0x050d, 0x0012), .driver_info = HCI_WRONG_SCO_MTU },</div><div class='add'>+</div><div class='ctx'> 	/* Digianswer devices */</div><div class='ctx'> 	{ USB_DEVICE(0x08fd, 0x0001), .driver_info = HCI_DIGIANSWER },</div><div class='ctx'> 	{ USB_DEVICE(0x08fd, 0x0002), .driver_info = HCI_IGNORE },</div><div class='hunk'>@@ -130,6 +132,9 @@ static struct usb_device_id blacklist_ids[] = {</div><div class='ctx'> 	/* CSR BlueCore Bluetooth Sniffer */</div><div class='ctx'> 	{ USB_DEVICE(0x0a12, 0x0002), .driver_info = HCI_SNIFFER },</div><div class='ctx'> </div><div class='add'>+	/* Frontline ComProbe Bluetooth Sniffer */</div><div class='add'>+	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = HCI_SNIFFER },</div><div class='add'>+</div><div class='ctx'> 	{ }	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -985,6 +990,9 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	if (reset || id-&gt;driver_info &amp; HCI_RESET)</div><div class='ctx'> 		set_bit(HCI_QUIRK_RESET_ON_INIT, &amp;hdev-&gt;quirks);</div><div class='ctx'> </div><div class='add'>+	if (id-&gt;driver_info &amp; HCI_WRONG_SCO_MTU)</div><div class='add'>+		set_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &amp;hdev-&gt;quirks);</div><div class='add'>+</div><div class='ctx'> 	if (id-&gt;driver_info &amp; HCI_SNIFFER) {</div><div class='ctx'> 		if (le16_to_cpu(udev-&gt;descriptor.bcdDevice) &gt; 0x997)</div><div class='ctx'> 			set_bit(HCI_QUIRK_RAW_DEVICE, &amp;hdev-&gt;quirks);</div><div class='hunk'>@@ -1043,10 +1051,81 @@ static void hci_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	hci_free_dev(hdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hci_usb_suspend(struct usb_interface *intf, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	struct hci_usb *husb = usb_get_intfdata(intf);</div><div class='add'>+	struct list_head killed;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!husb || intf == husb-&gt;isoc_iface)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hci_suspend_dev(husb-&gt;hdev);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;killed);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		struct _urb_queue *q = &amp;husb-&gt;pending_q[i];</div><div class='add'>+		struct _urb *_urb, *_tmp;</div><div class='add'>+</div><div class='add'>+		while ((_urb = _urb_dequeue(q))) {</div><div class='add'>+			/* reset queue since _urb_dequeue sets it to NULL */</div><div class='add'>+			_urb-&gt;queue = q;</div><div class='add'>+			usb_kill_urb(&amp;_urb-&gt;urb);</div><div class='add'>+			list_add(&amp;_urb-&gt;list, &amp;killed);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(_urb, _tmp, &amp;killed, list) {</div><div class='add'>+			list_move_tail(&amp;_urb-&gt;list, &amp;q-&gt;head);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hci_usb_resume(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct hci_usb *husb = usb_get_intfdata(intf);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	if (!husb || intf == husb-&gt;isoc_iface)</div><div class='add'>+		return 0;</div><div class='add'>+	</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		struct _urb_queue *q = &amp;husb-&gt;pending_q[i];</div><div class='add'>+		struct _urb *_urb;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(_urb, &amp;q-&gt;head, list) {</div><div class='add'>+			err = usb_submit_urb(&amp;_urb-&gt;urb, GFP_ATOMIC);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hci_resume_dev(husb-&gt;hdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct usb_driver hci_usb_driver = {</div><div class='ctx'> 	.name		= "hci_usb",</div><div class='ctx'> 	.probe		= hci_usb_probe,</div><div class='ctx'> 	.disconnect	= hci_usb_disconnect,</div><div class='add'>+	.suspend	= hci_usb_suspend,</div><div class='add'>+	.resume		= hci_usb_resume,</div><div class='ctx'> 	.id_table	= bluetooth_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h<br/>index 37100a6ea1a8..963fc55cdc85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_usb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/hci_usb.h</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> #define HCI_SNIFFER		0x10</div><div class='ctx'> #define HCI_BCM92035		0x20</div><div class='ctx'> #define HCI_BROKEN_ISOC		0x40</div><div class='add'>+#define HCI_WRONG_SCO_MTU	0x80</div><div class='ctx'> </div><div class='ctx'> #define HCI_MAX_IFACE_NUM	3</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c<br/>index 85738223ff0c..aac67a3a6019 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_vhci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/bluetooth/hci_vhci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/bluetooth/hci_vhci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/bluetooth/hci_vhci.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -278,7 +277,6 @@ static int vhci_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;type = HCI_VHCI;</div><div class='ctx'> 	hdev-&gt;driver_data = vhci;</div><div class='del'>-	SET_HCIDEV_DEV(hdev, vhci_miscdev.dev);</div><div class='ctx'> </div><div class='ctx'> 	hdev-&gt;open     = vhci_open_dev;</div><div class='ctx'> 	hdev-&gt;close    = vhci_close_dev;</div><div class='head'>diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c<br/>index ec004897b634..ec469497c10f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/aztcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/aztcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/aztcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/aztcd.c</a></div><div class='hunk'>@@ -1918,7 +1918,6 @@ static int __init aztcd_init(void)</div><div class='ctx'> 	azt_disk-&gt;first_minor = 0;</div><div class='ctx'> 	azt_disk-&gt;fops = &amp;azt_fops;</div><div class='ctx'> 	sprintf(azt_disk-&gt;disk_name, "aztcd");</div><div class='del'>-	sprintf(azt_disk-&gt;devfs_name, "aztcd");</div><div class='ctx'> 	azt_disk-&gt;queue = azt_queue;</div><div class='ctx'> 	add_disk(azt_disk);</div><div class='ctx'> 	azt_invalidate_buffers();</div><div class='head'>diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c<br/>index a59876a0bfa1..d239cf8b20bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/cdrom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/cdrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/cdrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/cdrom.c</a></div><div class='hunk'>@@ -263,7 +263,6 @@</div><div class='ctx'> /* #define ERRLOGMASK (CD_WARNING|CD_OPEN|CD_COUNT_TRACKS|CD_CLOSE) */</div><div class='ctx'> /* #define ERRLOGMASK (CD_WARNING|CD_REG_UNREG|CD_DO_IOCTL|CD_OPEN|CD_CLOSE|CD_COUNT_TRACKS) */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='hunk'>@@ -1009,9 +1008,9 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)</div><div class='ctx'> 		if (fp-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='ctx'> 			ret = -EROFS;</div><div class='ctx'> 			if (cdrom_open_write(cdi))</div><div class='del'>-				goto err;</div><div class='add'>+				goto err_release;</div><div class='ctx'> 			if (!CDROM_CAN(CDC_RAM))</div><div class='del'>-				goto err;</div><div class='add'>+				goto err_release;</div><div class='ctx'> 			ret = 0;</div><div class='ctx'> 			cdi-&gt;media_written = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1026,6 +1025,8 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)</div><div class='ctx'> 	    not be mounting, but opening with O_NONBLOCK */</div><div class='ctx'> 	check_disk_change(ip-&gt;i_bdev);</div><div class='ctx'> 	return 0;</div><div class='add'>+err_release:</div><div class='add'>+	cdi-&gt;ops-&gt;release(cdi);</div><div class='ctx'> err:</div><div class='ctx'> 	cdi-&gt;use_count--;</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1836,7 +1837,7 @@ static int dvd_read_bca(struct cdrom_device_info *cdi, dvd_struct *s)</div><div class='ctx'> 	init_cdrom_command(&amp;cgc, buf, sizeof(buf), CGC_DATA_READ);</div><div class='ctx'> 	cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE;</div><div class='ctx'> 	cgc.cmd[7] = s-&gt;type;</div><div class='del'>-	cgc.cmd[9] = cgc.buflen = 0xff;</div><div class='add'>+	cgc.cmd[9] = cgc.buflen &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = cdo-&gt;generic_packet(cdi, &amp;cgc)))</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c<br/>index 72ffd64e8b1e..37bdb0163f0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/cdu31a.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/cdu31a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/cdu31a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/cdu31a.c</a></div><div class='hunk'>@@ -161,7 +161,6 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -3142,7 +3141,7 @@ int __init cdu31a_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (cdu31a_irq &gt; 0) {</div><div class='ctx'> 		if (request_irq</div><div class='del'>-		    (cdu31a_irq, cdu31a_interrupt, SA_INTERRUPT,</div><div class='add'>+		    (cdu31a_irq, cdu31a_interrupt, IRQF_DISABLED,</div><div class='ctx'> 		     "cdu31a", NULL)) {</div><div class='ctx'> 			printk(KERN_WARNING PFX "Unable to grab IRQ%d for "</div><div class='ctx'> 					"the CDU31A driver\n", cdu31a_irq);</div><div class='head'>diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c<br/>index f43a988dd413..9b05ddd23141 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/cm206.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/cm206.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/cm206.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/cm206.c</a></div><div class='hunk'>@@ -187,7 +187,6 @@ History:</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -915,7 +914,7 @@ static void seek(int lba)</div><div class='ctx'> 	cd-&gt;dsb = wait_dsb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-uch bcdbin(unsigned char bcd)</div><div class='add'>+static uch bcdbin(unsigned char bcd)</div><div class='ctx'> {				/* stolen from mcd.c! */</div><div class='ctx'> 	return (bcd &gt;&gt; 4) * 10 + (bcd &amp; 0xf);</div><div class='ctx'> }</div><div class='hunk'>@@ -1533,7 +1532,7 @@ static void __init parse_options(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __cm206_init(void)</div><div class='add'>+static int __init __cm206_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	parse_options();</div><div class='ctx'> #if !defined(AUTO_PROBE_MODULE)</div><div class='hunk'>@@ -1594,8 +1593,3 @@ __setup("cm206=", cm206_setup);</div><div class='ctx'> #endif				/* !MODULE */</div><div class='ctx'> MODULE_ALIAS_BLOCKDEV_MAJOR(CM206_CDROM_MAJOR);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -pipe -fno-strength-reduce -m486 -DMODULE -DMODVERSIONS -include /usr/src/linux/include/linux/modversions.h  -c -o cm206.o cm206.c"</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c<br/>index ad5464ab99bc..b6ee50a2916d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/gscd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/gscd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/gscd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/gscd.c</a></div><div class='hunk'>@@ -955,7 +955,6 @@ static int __init gscd_init(void)</div><div class='ctx'> 	gscd_disk-&gt;first_minor = 0;</div><div class='ctx'> 	gscd_disk-&gt;fops = &amp;gscd_fops;</div><div class='ctx'> 	sprintf(gscd_disk-&gt;disk_name, "gscd");</div><div class='del'>-	sprintf(gscd_disk-&gt;devfs_name, "gscd");</div><div class='ctx'> </div><div class='ctx'> 	if (register_blkdev(MAJOR_NR, "gscd")) {</div><div class='ctx'> 		ret = -EIO;</div><div class='head'>diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c<br/>index a0b580c22d80..dcd1ab684f3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/mcdx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/mcdx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/mcdx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/mcdx.c</a></div><div class='hunk'>@@ -74,7 +74,6 @@ static const char *mcdx_c_version</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #define MAJOR_NR MITSUMI_X_CDROM_MAJOR</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mcdx.h"</div><div class='ctx'> </div><div class='hunk'>@@ -1006,7 +1005,7 @@ static int mcdx_talk(struct s_drive_stuff *stuffp,</div><div class='ctx'> </div><div class='ctx'> /* MODULE STUFF ***********************************************************/</div><div class='ctx'> </div><div class='del'>-int __mcdx_init(void)</div><div class='add'>+static int __init __mcdx_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int drives = 0;</div><div class='hunk'>@@ -1194,7 +1193,7 @@ static int __init mcdx_init_drive(int drive)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xtrace(INIT, "init() subscribe irq and i/o\n");</div><div class='del'>-	if (request_irq(stuffp-&gt;irq, mcdx_intr, SA_INTERRUPT, "mcdx", stuffp)) {</div><div class='add'>+	if (request_irq(stuffp-&gt;irq, mcdx_intr, IRQF_DISABLED, "mcdx", stuffp)) {</div><div class='ctx'> 		release_region(stuffp-&gt;wreg_data, MCDX_IO_SIZE);</div><div class='ctx'> 		xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n",</div><div class='ctx'> 		      MCDX, stuffp-&gt;wreg_data, stuffp-&gt;irq, stuffp-&gt;irq);</div><div class='head'>diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c<br/>index 0b0eab4f40fa..25032d7edc55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/optcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/optcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/optcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/optcd.c</a></div><div class='hunk'>@@ -2033,7 +2033,6 @@ static int __init optcd_init(void)</div><div class='ctx'> 	optcd_disk-&gt;first_minor = 0;</div><div class='ctx'> 	optcd_disk-&gt;fops = &amp;opt_fops;</div><div class='ctx'> 	sprintf(optcd_disk-&gt;disk_name, "optcd");</div><div class='del'>-	sprintf(optcd_disk-&gt;devfs_name, "optcd");</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(optcd_port, 4, "optcd")) {</div><div class='ctx'> 		printk(KERN_ERR "optcd: conflict, I/O port 0x%x already used\n",</div><div class='head'>diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c<br/>index 05c9e865ecaf..ba50e5a712f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/sbpcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/sbpcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/sbpcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/sbpcd.c</a></div><div class='hunk'>@@ -371,7 +371,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -382,7 +381,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "sbpcd.h"</div><div class='ctx'> </div><div class='ctx'> #define MAJOR_NR MATSUSHITA_CDROM_MAJOR</div><div class='hunk'>@@ -5808,8 +5806,6 @@ int __init sbpcd_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("sbp");</div><div class='del'>-</div><div class='ctx'> 	for (j=0;j&lt;NR_SBPCD;j++)</div><div class='ctx'> 	{</div><div class='ctx'> 		struct cdrom_device_info * sbpcd_infop;</div><div class='hunk'>@@ -5871,7 +5867,6 @@ int __init sbpcd_init(void)</div><div class='ctx'> 		disk-&gt;fops = &amp;sbpcd_bdops;</div><div class='ctx'> 		strcpy(disk-&gt;disk_name, sbpcd_infop-&gt;name);</div><div class='ctx'> 		disk-&gt;flags = GENHD_FL_CD;</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "sbp/c0t%d", p-&gt;drv_id);</div><div class='ctx'> 		p-&gt;disk = disk;</div><div class='ctx'> 		if (register_cdrom(sbpcd_infop))</div><div class='ctx'> 		{</div><div class='hunk'>@@ -5906,7 +5901,6 @@ static void sbpcd_exit(void)</div><div class='ctx'> 		if (D_S[j].drv_id==-1) continue;</div><div class='ctx'> 		del_gendisk(D_S[j].disk);</div><div class='ctx'> 		put_disk(D_S[j].disk);</div><div class='del'>-		devfs_remove("sbp/c0t%d", j);</div><div class='ctx'> 		vfree(D_S[j].sbp_buf);</div><div class='ctx'> 		if (D_S[j].sbp_audsiz&gt;0)</div><div class='ctx'> 			vfree(D_S[j].aud_buf);</div><div class='hunk'>@@ -5917,7 +5911,6 @@ static void sbpcd_exit(void)</div><div class='ctx'> 		}</div><div class='ctx'> 		vfree(D_S[j].sbpcd_infop);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_remove("sbp");</div><div class='ctx'> 	msg(DBG_INF, "%s module released.\n", major_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c<br/>index 74b1cadbf161..bf5aef4e555b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/sjcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/sjcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/sjcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/sjcd.c</a></div><div class='hunk'>@@ -1695,7 +1695,6 @@ static int __init sjcd_init(void)</div><div class='ctx'> 	sjcd_disk-&gt;first_minor = 0,</div><div class='ctx'> 	sjcd_disk-&gt;fops = &amp;sjcd_fops,</div><div class='ctx'> 	sprintf(sjcd_disk-&gt;disk_name, "sjcd");</div><div class='del'>-	sprintf(sjcd_disk-&gt;devfs_name, "sjcd");</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(sjcd_base, 4,"sjcd")) {</div><div class='ctx'> 		printk</div><div class='head'>diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c<br/>index e65659926432..30ab56258a92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/sonycd535.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/sonycd535.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/sonycd535.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/sonycd535.c</a></div><div class='hunk'>@@ -1527,7 +1527,7 @@ static int __init sony535_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sony535_irq_used &gt; 0) {</div><div class='ctx'> 	    if (request_irq(sony535_irq_used, cdu535_interrupt,</div><div class='del'>-						SA_INTERRUPT, CDU535_HANDLE, NULL)) {</div><div class='add'>+						IRQF_DISABLED, CDU535_HANDLE, NULL)) {</div><div class='ctx'> 			printk("Unable to grab IRQ%d for the " CDU535_MESSAGE_NAME</div><div class='ctx'> 					" driver; polling instead.\n", sony535_irq_used);</div><div class='ctx'> 			sony535_irq_used = 0;</div><div class='hunk'>@@ -1589,7 +1589,6 @@ static int __init sony535_init(void)</div><div class='ctx'> 	cdu_disk-&gt;first_minor = 0;</div><div class='ctx'> 	cdu_disk-&gt;fops = &amp;cdu_fops;</div><div class='ctx'> 	sprintf(cdu_disk-&gt;disk_name, "cdu");</div><div class='del'>-	sprintf(cdu_disk-&gt;devfs_name, "cdu535");</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(sony535_cd_base_io, 4, CDU535_HANDLE)) {</div><div class='ctx'> 		printk(KERN_WARNING"sonycd535: Unable to request region 0x%x\n",</div><div class='head'>diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c<br/>index c0f817ba7adb..54ca931e19ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cdrom/viocd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cdrom/viocd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cdrom/viocd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cdrom/viocd.c</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> #include &lt;asm/iseries/vio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VIOCD_DEVICE			"iseries/vcd"</div><div class='del'>-#define VIOCD_DEVICE_DEVFS		"iseries/vcd"</div><div class='ctx'> </div><div class='ctx'> #define VIOCD_VERS "1.06"</div><div class='ctx'> </div><div class='hunk'>@@ -688,8 +687,6 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	gendisk-&gt;first_minor = deviceno;</div><div class='ctx'> 	strncpy(gendisk-&gt;disk_name, c-&gt;name,</div><div class='ctx'> 			sizeof(gendisk-&gt;disk_name));</div><div class='del'>-	snprintf(gendisk-&gt;devfs_name, sizeof(gendisk-&gt;devfs_name),</div><div class='del'>-			VIOCD_DEVICE_DEVFS "%d", deviceno);</div><div class='ctx'> 	blk_queue_max_hw_segments(q, 1);</div><div class='ctx'> 	blk_queue_max_phys_segments(q, 1);</div><div class='ctx'> 	blk_queue_max_sectors(q, 4096 / 512);</div><div class='hunk'>@@ -731,7 +728,7 @@ static int viocd_remove(struct vio_dev *vdev)</div><div class='ctx'>  * support.</div><div class='ctx'>  */</div><div class='ctx'> static struct vio_device_id viocd_device_table[] __devinitdata = {</div><div class='del'>-	{ "viocd", "" },</div><div class='add'>+	{ "block", "IBM,iSeries-viocd" },</div><div class='ctx'> 	{ "", "" }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(vio, viocd_device_table);</div><div class='head'>diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig<br/>index 78d928f9d9f1..c40e487d9f5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/Kconfig</a></div><div class='hunk'>@@ -62,6 +62,23 @@ config HW_CONSOLE</div><div class='ctx'> 	depends on VT &amp;&amp; !S390 &amp;&amp; !UML</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config VT_HW_CONSOLE_BINDING</div><div class='add'>+       bool "Support for binding and unbinding console drivers"</div><div class='add'>+       depends on HW_CONSOLE</div><div class='add'>+       default n</div><div class='add'>+       ---help---</div><div class='add'>+         The virtual terminal is the device that interacts with the physical</div><div class='add'>+         terminal through console drivers. On these systems, at least one</div><div class='add'>+         console driver is loaded. In other configurations, additional console</div><div class='add'>+         drivers may be enabled, such as the framebuffer console. If more than</div><div class='add'>+         1 console driver is enabled, setting this to 'y' will allow you to</div><div class='add'>+         select the console driver that will serve as the backend for the</div><div class='add'>+         virtual terminals.</div><div class='add'>+</div><div class='add'>+	 See &lt;file:Documentation/console/console.txt&gt; for more</div><div class='add'>+	 information. For framebuffer console users, please refer to</div><div class='add'>+	 &lt;file:Documentation/fb/fbcon.txt&gt;.</div><div class='add'>+</div><div class='ctx'> config SERIAL_NONSTANDARD</div><div class='ctx'> 	bool "Non-standard serial port support"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -670,20 +687,7 @@ config NWFLASH</div><div class='ctx'> </div><div class='ctx'> 	  If you're not sure, say N.</div><div class='ctx'> </div><div class='del'>-config HW_RANDOM</div><div class='del'>-	tristate "Intel/AMD/VIA HW Random Number Generator support"</div><div class='del'>-	depends on (X86 || IA64) &amp;&amp; PCI</div><div class='del'>-	---help---</div><div class='del'>-	  This driver provides kernel-side support for the Random Number</div><div class='del'>-	  Generator hardware found on Intel i8xx-based motherboards,</div><div class='del'>-	  AMD 76x-based motherboards, and Via Nehemiah CPUs.</div><div class='del'>-</div><div class='del'>-	  Provides a character driver, used to read() entropy data.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called hw_random.</div><div class='del'>-</div><div class='del'>-	  If unsure, say N.</div><div class='add'>+source "drivers/char/hw_random/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config NVRAM</div><div class='ctx'> 	tristate "/dev/nvram support"</div><div class='hunk'>@@ -865,6 +869,7 @@ config SONYPI</div><div class='ctx'> config TANBAC_TB0219</div><div class='ctx'> 	tristate "TANBAC TB0219 base board support"</div><div class='ctx'> 	depends TANBAC_TB022X</div><div class='add'>+	select GPIO_VR41XX</div><div class='ctx'> </div><div class='ctx'> menu "Ftape, the floppy tape device driver"</div><div class='ctx'> </div><div class='hunk'>@@ -934,12 +939,36 @@ config MWAVE</div><div class='ctx'> config SCx200_GPIO</div><div class='ctx'> 	tristate "NatSemi SCx200 GPIO Support"</div><div class='ctx'> 	depends on SCx200</div><div class='add'>+	select NSC_GPIO</div><div class='ctx'> 	help</div><div class='ctx'> 	  Give userspace access to the GPIO pins on the National</div><div class='ctx'> 	  Semiconductor SCx200 processors.</div><div class='ctx'> </div><div class='ctx'> 	  If compiled as a module, it will be called scx200_gpio.</div><div class='ctx'> </div><div class='add'>+config PC8736x_GPIO</div><div class='add'>+	tristate "NatSemi PC8736x GPIO Support"</div><div class='add'>+	depends on X86</div><div class='add'>+	default SCx200_GPIO	# mostly N</div><div class='add'>+	select NSC_GPIO		# needed for support routines</div><div class='add'>+	help</div><div class='add'>+	  Give userspace access to the GPIO pins on the National</div><div class='add'>+	  Semiconductor PC-8736x (x=[03456]) SuperIO chip.  The chip</div><div class='add'>+	  has multiple functional units, inc several managed by</div><div class='add'>+	  hwmon/pc87360 driver.  Tested with PC-87366</div><div class='add'>+</div><div class='add'>+	  If compiled as a module, it will be called pc8736x_gpio.</div><div class='add'>+</div><div class='add'>+config NSC_GPIO</div><div class='add'>+	tristate "NatSemi Base GPIO Support"</div><div class='add'>+	depends on X86_32</div><div class='add'>+	# selected by SCx200_GPIO and PC8736x_GPIO</div><div class='add'>+	# what about 2 selectors differing: m != y</div><div class='add'>+	help</div><div class='add'>+	  Common support used (and needed) by scx200_gpio and</div><div class='add'>+	  pc8736x_gpio drivers.  If those drivers are built as</div><div class='add'>+	  modules, this one will be too, named nsc_gpio</div><div class='add'>+</div><div class='ctx'> config CS5535_GPIO</div><div class='ctx'> 	tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"</div><div class='ctx'> 	depends on X86_32</div><div class='head'>diff --git a/drivers/char/Makefile b/drivers/char/Makefile<br/>index f5b01c6d498e..6e0f4469d8bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/Makefile</a></div><div class='hunk'>@@ -41,9 +41,9 @@ obj-$(CONFIG_N_HDLC)		+= n_hdlc.o</div><div class='ctx'> obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o</div><div class='ctx'> obj-$(CONFIG_SX)		+= sx.o generic_serial.o</div><div class='ctx'> obj-$(CONFIG_RIO)		+= rio/ generic_serial.o</div><div class='del'>-obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o</div><div class='ctx'> obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o</div><div class='ctx'> obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o</div><div class='add'>+obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o</div><div class='ctx'> obj-$(CONFIG_RAW_DRIVER)	+= raw.o</div><div class='ctx'> obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o</div><div class='ctx'> obj-$(CONFIG_MMTIMER)		+= mmtimer.o</div><div class='hunk'>@@ -75,13 +75,15 @@ endif</div><div class='ctx'> obj-$(CONFIG_TOSHIBA)		+= toshiba.o</div><div class='ctx'> obj-$(CONFIG_I8K)		+= i8k.o</div><div class='ctx'> obj-$(CONFIG_DS1620)		+= ds1620.o</div><div class='del'>-obj-$(CONFIG_HW_RANDOM)		+= hw_random.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM)		+= hw_random/</div><div class='ctx'> obj-$(CONFIG_FTAPE)		+= ftape/</div><div class='ctx'> obj-$(CONFIG_COBALT_LCD)	+= lcd.o</div><div class='ctx'> obj-$(CONFIG_PPDEV)		+= ppdev.o</div><div class='ctx'> obj-$(CONFIG_NWBUTTON)		+= nwbutton.o</div><div class='ctx'> obj-$(CONFIG_NWFLASH)		+= nwflash.o</div><div class='ctx'> obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio.o</div><div class='add'>+obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o</div><div class='add'>+obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o</div><div class='ctx'> obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o</div><div class='ctx'> obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o</div><div class='ctx'> obj-$(CONFIG_TANBAC_TB0219)	+= tb0219.o</div><div class='head'>diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig<br/>index 7c88c060a9e6..22f8cf218cc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> config AGP</div><div class='del'>-	tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU</div><div class='add'>+	tristate "/dev/agpgart (AGP Support)"</div><div class='ctx'> 	depends on ALPHA || IA64 || PPC || X86</div><div class='del'>-	default y if GART_IOMMU</div><div class='add'>+	depends on PCI</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  AGP (Accelerated Graphics Port) is a bus system mainly used to</div><div class='ctx'> 	  connect graphics cards to the rest of the system.</div><div class='hunk'>@@ -56,9 +56,9 @@ config AGP_AMD</div><div class='ctx'> 	  X on AMD Irongate, 761, and 762 chipsets.</div><div class='ctx'> </div><div class='ctx'> config AGP_AMD64</div><div class='del'>-	tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU</div><div class='add'>+	tristate "AMD Opteron/Athlon64 on-CPU GART support" if !IOMMU</div><div class='ctx'> 	depends on AGP &amp;&amp; X86</div><div class='del'>-	default y if GART_IOMMU</div><div class='add'>+	default y if IOMMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option gives you AGP support for the GLX component of</div><div class='ctx'> 	  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.</div><div class='head'>diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c<br/>index 2b5838e64751..b4e00a343da9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/alpha-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/alpha-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/alpha-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/alpha-agp.c</a></div><div class='hunk'>@@ -46,12 +46,6 @@ struct vm_operations_struct alpha_core_agp_vm_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int alpha_core_agp_nop(void)</div><div class='del'>-{</div><div class='del'>-	/* just return success */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int alpha_core_agp_fetch_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	return alpha_core_agp_sizes[0].size;</div><div class='hunk'>@@ -120,6 +114,11 @@ static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int alpha_core_agp_create_free_gatt_table(struct agp_bridge_data *a)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct agp_bridge_driver alpha_core_agp_driver = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.aperture_sizes		= alpha_core_agp_sizes,</div><div class='hunk'>@@ -135,8 +134,8 @@ struct agp_bridge_driver alpha_core_agp_driver = {</div><div class='ctx'> 	.tlb_flush		= alpha_core_agp_tlbflush,</div><div class='ctx'> 	.mask_memory		= agp_generic_mask_memory,</div><div class='ctx'> 	.cache_flush		= global_cache_flush,</div><div class='del'>-	.create_gatt_table	= alpha_core_agp_nop,</div><div class='del'>-	.free_gatt_table	= alpha_core_agp_nop,</div><div class='add'>+	.create_gatt_table	= alpha_core_agp_create_free_gatt_table,</div><div class='add'>+	.free_gatt_table	= alpha_core_agp_create_free_gatt_table,</div><div class='ctx'> 	.insert_memory		= alpha_core_agp_insert_memory,</div><div class='ctx'> 	.remove_memory		= alpha_core_agp_remove_memory,</div><div class='ctx'> 	.alloc_by_type		= agp_generic_alloc_by_type,</div><div class='head'>diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c<br/>index 1f776651ac64..51d0d562d01e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/amd-k7-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/amd-k7-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/amd-k7-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/amd-k7-agp.c</a></div><div class='hunk'>@@ -118,7 +118,7 @@ static int amd_create_gatt_pages(int nr_tables)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Since we don't need contigious memory we just try</div><div class='add'>+/* Since we don't need contiguous memory we just try</div><div class='ctx'>  * to get the gatt table once</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c<br/>index ac3c33a2e37d..8cd52984cda5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/amd64-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/amd64-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/amd64-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/amd64-agp.c</a></div><div class='hunk'>@@ -8,18 +8,15 @@</div><div class='ctx'>  * work is done in the northbridge(s).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/agp_backend.h&gt;</div><div class='ctx'> #include &lt;linux/mmzone.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;		/* PAGE_SIZE */</div><div class='add'>+#include &lt;asm/k8.h&gt;</div><div class='ctx'> #include "agp.h"</div><div class='ctx'> </div><div class='del'>-/* Will need to be increased if AMD64 ever goes &gt;8-way. */</div><div class='del'>-#define MAX_HAMMER_GARTS   8</div><div class='del'>-</div><div class='ctx'> /* PTE bits. */</div><div class='ctx'> #define GPTE_VALID	1</div><div class='ctx'> #define GPTE_COHERENT	2</div><div class='hunk'>@@ -53,28 +50,12 @@</div><div class='ctx'> #define ULI_X86_64_HTT_FEA_REG		0x50</div><div class='ctx'> #define ULI_X86_64_ENU_SCR_REG		0x54</div><div class='ctx'> </div><div class='del'>-static int nr_garts;</div><div class='del'>-static struct pci_dev * hammers[MAX_HAMMER_GARTS];</div><div class='del'>-</div><div class='ctx'> static struct resource *aperture_resource;</div><div class='ctx'> static int __initdata agp_try_unsupported = 1;</div><div class='ctx'> </div><div class='del'>-#define for_each_nb() for(gart_iterator=0;gart_iterator&lt;nr_garts;gart_iterator++)</div><div class='del'>-</div><div class='del'>-static void flush_amd64_tlb(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u32 tmp;</div><div class='del'>-</div><div class='del'>-	pci_read_config_dword (dev, AMD64_GARTCACHECTL, &amp;tmp);</div><div class='del'>-	tmp |= INVGART;</div><div class='del'>-	pci_write_config_dword (dev, AMD64_GARTCACHECTL, tmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void amd64_tlbflush(struct agp_memory *temp)</div><div class='ctx'> {</div><div class='del'>-	int gart_iterator;</div><div class='del'>-	for_each_nb()</div><div class='del'>-		flush_amd64_tlb(hammers[gart_iterator]);</div><div class='add'>+	k8_flush_garts();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)</div><div class='hunk'>@@ -153,7 +134,7 @@ static int amd64_fetch_size(void)</div><div class='ctx'> 	u32 temp;</div><div class='ctx'> 	struct aper_size_info_32 *values;</div><div class='ctx'> </div><div class='del'>-	dev = hammers[0];</div><div class='add'>+	dev = k8_northbridges[0];</div><div class='ctx'> 	if (dev==NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -201,9 +182,6 @@ static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table)</div><div class='ctx'> 	tmp &amp;= ~(DISGARTCPU | DISGARTIO);</div><div class='ctx'> 	pci_write_config_dword(hammer, AMD64_GARTAPERTURECTL, tmp);</div><div class='ctx'> </div><div class='del'>-	/* keep CPU's coherent. */</div><div class='del'>-	flush_amd64_tlb (hammer);</div><div class='del'>-</div><div class='ctx'> 	return aper_base;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -222,13 +200,14 @@ static struct aper_size_info_32 amd_8151_sizes[7] =</div><div class='ctx'> static int amd_8151_configure(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long gatt_bus = virt_to_gart(agp_bridge-&gt;gatt_table_real);</div><div class='del'>-	int gart_iterator;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure AGP regs in each x86-64 host bridge. */</div><div class='del'>-	for_each_nb() {</div><div class='add'>+        for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='ctx'> 		agp_bridge-&gt;gart_bus_addr =</div><div class='del'>-				amd64_configure(hammers[gart_iterator],gatt_bus);</div><div class='add'>+				amd64_configure(k8_northbridges[i], gatt_bus);</div><div class='ctx'> 	}</div><div class='add'>+	k8_flush_garts();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,12 +215,13 @@ static int amd_8151_configure(void)</div><div class='ctx'> static void amd64_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp;</div><div class='del'>-	int gart_iterator;</div><div class='del'>-	for_each_nb() {</div><div class='add'>+	int i;</div><div class='add'>+        for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='add'>+		struct pci_dev *dev = k8_northbridges[i];</div><div class='ctx'> 		/* disable gart translation */</div><div class='del'>-		pci_read_config_dword (hammers[gart_iterator], AMD64_GARTAPERTURECTL, &amp;tmp);</div><div class='add'>+		pci_read_config_dword (dev, AMD64_GARTAPERTURECTL, &amp;tmp);</div><div class='ctx'> 		tmp &amp;= ~AMD64_GARTEN;</div><div class='del'>-		pci_write_config_dword (hammers[gart_iterator], AMD64_GARTAPERTURECTL, tmp);</div><div class='add'>+		pci_write_config_dword (dev, AMD64_GARTAPERTURECTL, tmp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -311,7 +291,7 @@ static int __devinit aperture_valid(u64 aper, u32 size)</div><div class='ctx'> /*</div><div class='ctx'>  * W*s centric BIOS sometimes only set up the aperture in the AGP</div><div class='ctx'>  * bridge, not the northbridge. On AMD64 this is handled early</div><div class='del'>- * in aperture.c, but when GART_IOMMU is not enabled or we run</div><div class='add'>+ * in aperture.c, but when IOMMU is not enabled or we run</div><div class='ctx'>  * on a 32bit kernel this needs to be redone.</div><div class='ctx'>  * Unfortunately it is impossible to fix the aperture here because it's too late</div><div class='ctx'>  * to allocate that much memory. But at least error out cleanly instead of</div><div class='hunk'>@@ -361,17 +341,15 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,</div><div class='ctx'> </div><div class='ctx'> static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *loop_dev = NULL;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	/* cache pci_devs of northbridges. */</div><div class='del'>-	while ((loop_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x1103, loop_dev))</div><div class='del'>-			!= NULL) {</div><div class='del'>-		if (i == MAX_HAMMER_GARTS) {</div><div class='del'>-			printk(KERN_ERR PFX "Too many northbridges for AGP\n");</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		if (fix_northbridge(loop_dev, pdev, cap_ptr) &lt; 0) {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (cache_k8_northbridges() &lt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	for (i = 0; i &lt; num_k8_northbridges; i++) {</div><div class='add'>+		struct pci_dev *dev = k8_northbridges[i];</div><div class='add'>+		if (fix_northbridge(dev, pdev, cap_ptr) &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR PFX "No usable aperture found.\n");</div><div class='ctx'> #ifdef __x86_64__</div><div class='ctx'> 			/* should port this to i386 */</div><div class='hunk'>@@ -379,10 +357,8 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)</div><div class='ctx'> #endif</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='del'>-		hammers[i++] = loop_dev;</div><div class='ctx'> 	}</div><div class='del'>-		nr_garts = i;</div><div class='del'>-	return i == 0 ? -1 : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Handle AMD 8151 quirks */</div><div class='hunk'>@@ -450,7 +426,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* shadow x86-64 registers into ULi registers */</div><div class='del'>-	pci_read_config_dword (hammers[0], AMD64_GARTAPERTUREBASE, &amp;httfea);</div><div class='add'>+	pci_read_config_dword (k8_northbridges[0], AMD64_GARTAPERTUREBASE, &amp;httfea);</div><div class='ctx'> </div><div class='ctx'> 	/* if x86-64 aperture base is beyond 4G, exit here */</div><div class='ctx'> 	if ((httfea &amp; 0x7fff) &gt;&gt; (32 - 25))</div><div class='hunk'>@@ -513,7 +489,7 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev)</div><div class='ctx'> 	pci_write_config_dword(dev1, NVIDIA_X86_64_1_APSIZE, tmp);</div><div class='ctx'> </div><div class='ctx'> 	/* shadow x86-64 registers into NVIDIA registers */</div><div class='del'>-	pci_read_config_dword (hammers[0], AMD64_GARTAPERTUREBASE, &amp;apbase);</div><div class='add'>+	pci_read_config_dword (k8_northbridges[0], AMD64_GARTAPERTUREBASE, &amp;apbase);</div><div class='ctx'> </div><div class='ctx'> 	/* if x86-64 aperture base is beyond 4G, exit here */</div><div class='ctx'> 	if ( (apbase &amp; 0x7fff) &gt;&gt; (32 - 25) ) {</div><div class='hunk'>@@ -754,14 +730,10 @@ static struct pci_driver agp_amd64_pci_driver = {</div><div class='ctx'> int __init agp_amd64_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	static struct pci_device_id amd64nb[] = {</div><div class='del'>-		{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },</div><div class='del'>-		{ },</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	if (agp_off)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (pci_register_driver(&amp;agp_amd64_pci_driver) &gt; 0) {</div><div class='add'>+	if (pci_register_driver(&amp;agp_amd64_pci_driver) &lt; 0) {</div><div class='ctx'> 		struct pci_dev *dev;</div><div class='ctx'> 		if (!agp_try_unsupported &amp;&amp; !agp_try_unsupported_boot) {</div><div class='ctx'> 			printk(KERN_INFO PFX "No supported AGP bridge found.\n");</div><div class='hunk'>@@ -774,7 +746,7 @@ int __init agp_amd64_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* First check that we have at least one AMD64 NB */</div><div class='del'>-		if (!pci_dev_present(amd64nb))</div><div class='add'>+		if (!pci_dev_present(k8_nb_ids))</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 		/* Look for any AGP bridge */</div><div class='hunk'>@@ -802,7 +774,7 @@ static void __exit agp_amd64_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> /* On AMD64 the PCI driver needs to initialize this driver early</div><div class='ctx'>    for the IOMMU, so it has to be called via a backdoor. */</div><div class='del'>-#ifndef CONFIG_GART_IOMMU</div><div class='add'>+#ifndef CONFIG_IOMMU</div><div class='ctx'> module_init(agp_amd64_init);</div><div class='ctx'> module_exit(agp_amd64_cleanup);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c<br/>index 06fd10ba0c5e..f244c6682738 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/ati-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/ati-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/ati-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/ati-agp.c</a></div><div class='hunk'>@@ -41,7 +41,6 @@ static struct gatt_mask ati_generic_masks[] =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> typedef struct _ati_page_map {</div><div class='ctx'> 	unsigned long *real;</div><div class='ctx'> 	unsigned long __iomem *remapped;</div><div class='hunk'>@@ -141,7 +140,8 @@ static int ati_create_gatt_pages(int nr_tables)</div><div class='ctx'> 	ati_generic_private.num_tables = nr_tables;</div><div class='ctx'> 	ati_generic_private.gatt_pages = tables;</div><div class='ctx'> </div><div class='del'>-	if (retval != 0) ati_free_gatt_pages();</div><div class='add'>+	if (retval != 0)</div><div class='add'>+		ati_free_gatt_pages();</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -219,16 +219,16 @@ static int ati_configure(void)</div><div class='ctx'> 	ati_generic_private.registers = (volatile u8 __iomem *) ioremap(temp, 4096);</div><div class='ctx'> </div><div class='ctx'> 	if (is_r200())</div><div class='del'>-       	pci_write_config_dword(agp_bridge-&gt;dev, ATI_RS100_IG_AGPMODE, 0x20000);</div><div class='add'>+		pci_write_config_dword(agp_bridge-&gt;dev, ATI_RS100_IG_AGPMODE, 0x20000);</div><div class='ctx'> 	else</div><div class='ctx'> 		pci_write_config_dword(agp_bridge-&gt;dev, ATI_RS300_IG_AGPMODE, 0x20000);</div><div class='ctx'> </div><div class='ctx'> 	/* address to map too */</div><div class='del'>-        /*</div><div class='add'>+	/*</div><div class='ctx'> 	pci_read_config_dword(agp_bridge.dev, AGP_APBASE, &amp;temp);</div><div class='ctx'> 	agp_bridge.gart_bus_addr = (temp &amp; PCI_BASE_ADDRESS_MEM_MASK);</div><div class='ctx'> 	printk(KERN_INFO PFX "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr);</div><div class='del'>-        */</div><div class='add'>+	*/</div><div class='ctx'> 	writel(0x60000, ati_generic_private.registers+ATI_GART_FEATURE_ID);</div><div class='ctx'> 	readl(ati_generic_private.registers+ATI_GART_FEATURE_ID);	/* PCI Posting.*/</div><div class='ctx'> </div><div class='hunk'>@@ -245,23 +245,25 @@ static int ati_configure(void)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static int agp_ati_resume(struct pci_dev *dev)</div><div class='add'>+static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	pci_restore_state(dev);</div><div class='add'>+	pci_save_state(dev);</div><div class='add'>+	pci_set_power_state(dev, 3);</div><div class='ctx'> </div><div class='del'>-	return ati_configure();</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)</div><div class='add'>+static int agp_ati_resume(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	pci_save_state(dev);</div><div class='add'>+	pci_set_power_state(dev, 0);</div><div class='add'>+	pci_restore_state(dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ati_configure();</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *Since we don't need contigious memory we just try</div><div class='add'>+ *Since we don't need contiguous memory we just try</div><div class='ctx'>  * to get the gatt table once</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -321,9 +323,9 @@ static int ati_remove_memory(struct agp_memory * mem, off_t pg_start,</div><div class='ctx'> 	unsigned long __iomem *cur_gatt;</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='del'>-	if (type != 0 || mem-&gt;type != 0) {</div><div class='add'>+	if (type != 0 || mem-&gt;type != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	for (i = pg_start; i &lt; (mem-&gt;page_count + pg_start); i++) {</div><div class='ctx'> 		addr = (i * PAGE_SIZE) + agp_bridge-&gt;gart_bus_addr;</div><div class='ctx'> 		cur_gatt = GET_GATT(addr);</div><div class='hunk'>@@ -502,9 +504,8 @@ found:</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;dev = pdev;</div><div class='ctx'> 	bridge-&gt;capndx = cap_ptr;</div><div class='del'>-	</div><div class='del'>-	bridge-&gt;driver = &amp;ati_generic_bridge;</div><div class='ctx'> </div><div class='add'>+	bridge-&gt;driver = &amp;ati_generic_bridge;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO PFX "Detected Ati %s chipset\n",</div><div class='ctx'> 			devs[j].chipset_name);</div><div class='hunk'>@@ -546,8 +547,8 @@ static struct pci_driver agp_ati_pci_driver = {</div><div class='ctx'> 	.probe		= agp_ati_probe,</div><div class='ctx'> 	.remove		= agp_ati_remove,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-	.resume		= agp_ati_resume,</div><div class='ctx'> 	.suspend	= agp_ati_suspend,</div><div class='add'>+	.resume		= agp_ati_resume,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c<br/>index 86a966b65236..b788b0a3bbf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/efficeon-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/efficeon-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/efficeon-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/efficeon-agp.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ static int efficeon_free_gatt_table(struct agp_bridge_data *bridge)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Since we don't need contigious memory we just try</div><div class='add'>+ * Since we don't need contiguous memory we just try</div><div class='ctx'>  * to get the gatt table once</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c<br/>index ffcf15c30e90..d9c5a9142ad1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/frontend.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/frontend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/frontend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/frontend.c</a></div><div class='hunk'>@@ -1059,7 +1059,7 @@ ioctl_out:</div><div class='ctx'> 	return ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations agp_fops =</div><div class='add'>+static const struct file_operations agp_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c<br/>index 4e1891e2c035..cc5ea347a8a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/generic.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * TODO:</div><div class='ctx'>  * - Allocate more than order 0 pages to avoid too much linear map splitting.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -809,12 +808,10 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)</div><div class='ctx'> 				case U32_APER_SIZE:</div><div class='ctx'> 					bridge-&gt;current_size = A_IDX32(bridge);</div><div class='ctx'> 					break;</div><div class='del'>-					/* This case will never really happen. */</div><div class='add'>+				/* These cases will never really happen. */</div><div class='ctx'> 				case FIXED_APER_SIZE:</div><div class='ctx'> 				case LVL2_APER_SIZE:</div><div class='ctx'> 				default:</div><div class='del'>-					bridge-&gt;current_size =</div><div class='del'>-					    bridge-&gt;current_size;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 				temp = bridge-&gt;current_size;</div><div class='head'>diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c<br/>index 8c4c6ef748ec..907fb66ec4a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/hp-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/hp-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/hp-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/hp-agp.c</a></div><div class='hunk'>@@ -497,7 +497,7 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret)</div><div class='ctx'> 			info = buffer.pointer;</div><div class='ctx'> 			info-&gt;hardware_id.value[sizeof(info-&gt;hardware_id)-1] = '\0';</div><div class='ctx'> 			match = (strcmp(info-&gt;hardware_id.value, "HWP0001") == 0);</div><div class='del'>-			ACPI_MEM_FREE(info);</div><div class='add'>+			kfree(info);</div><div class='ctx'> 			if (match) {</div><div class='ctx'> 				status = hp_acpi_csr_space(handle, &amp;sba_hpa, &amp;length);</div><div class='ctx'> 				if (ACPI_SUCCESS(status))</div><div class='head'>diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c<br/>index bddcae54b16d..61ac3809f997 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/intel-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/intel-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/intel-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/intel-agp.c</a></div><div class='hunk'>@@ -736,7 +736,7 @@ static int intel_i915_remove_entries(struct agp_memory *mem,off_t pg_start,</div><div class='ctx'> static int intel_i915_fetch_size(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct aper_size_info_fixed *values;</div><div class='del'>-	u32 temp, offset = 0;</div><div class='add'>+	u32 temp, offset;</div><div class='ctx'> </div><div class='ctx'> #define I915_256MB_ADDRESS_MASK (1&lt;&lt;27)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c<br/>index 4c67135c12d8..df7f37b2739a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/nvidia-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/nvidia-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/nvidia-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/nvidia-agp.c</a></div><div class='hunk'>@@ -376,6 +376,29 @@ static void __devexit agp_nvidia_remove(struct pci_dev *pdev)</div><div class='ctx'> 	agp_put_bridge(bridge);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int agp_nvidia_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	pci_save_state (pdev);</div><div class='add'>+	pci_set_power_state (pdev, 3);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int agp_nvidia_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	/* set power state 0 and restore PCI space */</div><div class='add'>+	pci_set_power_state (pdev, 0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	/* reconfigure AGP hardware again */</div><div class='add'>+	nvidia_configure();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct pci_device_id agp_nvidia_pci_table[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 	.class		= (PCI_CLASS_BRIDGE_HOST &lt;&lt; 8),</div><div class='hunk'>@@ -403,6 +426,10 @@ static struct pci_driver agp_nvidia_pci_driver = {</div><div class='ctx'> 	.id_table	= agp_nvidia_pci_table,</div><div class='ctx'> 	.probe		= agp_nvidia_probe,</div><div class='ctx'> 	.remove		= agp_nvidia_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= agp_nvidia_suspend,</div><div class='add'>+	.resume		= agp_nvidia_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init agp_nvidia_init(void)</div><div class='head'>diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c<br/>index cfa7922cb431..d73be4c2db8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/sgi-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/sgi-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/sgi-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/sgi-agp.c</a></div><div class='hunk'>@@ -329,9 +329,8 @@ static int __devinit agp_sgi_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __devexit agp_sgi_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	if (sgi_tioca_agp_bridges)</div><div class='del'>-		kfree(sgi_tioca_agp_bridges);</div><div class='del'>-	sgi_tioca_agp_bridges=NULL;</div><div class='add'>+	kfree(sgi_tioca_agp_bridges);</div><div class='add'>+	sgi_tioca_agp_bridges = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(agp_sgi_init);</div><div class='head'>diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c<br/>index 9846defbddb4..1de1b12043bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/agp/uninorth-agp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/agp/uninorth-agp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/agp/uninorth-agp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/agp/uninorth-agp.c</a></div><div class='hunk'>@@ -329,7 +329,7 @@ static int agp_uninorth_suspend(struct pci_dev *pdev)</div><div class='ctx'> 	/* turn off AGP on the bridge */</div><div class='ctx'> 	agp = pci_find_capability(pdev, PCI_CAP_ID_AGP);</div><div class='ctx'> 	pci_read_config_dword(pdev, agp + PCI_AGP_COMMAND, &amp;cmd);</div><div class='del'>-	bridge-&gt;dev_private_data = (void *)cmd;</div><div class='add'>+	bridge-&gt;dev_private_data = (void *)(long)cmd;</div><div class='ctx'> 	if (cmd &amp; PCI_AGP_COMMAND_AGP) {</div><div class='ctx'> 		printk("uninorth-agp: disabling AGP on bridge %s\n",</div><div class='ctx'> 				pci_name(pdev));</div><div class='hunk'>@@ -351,7 +351,7 @@ static int agp_uninorth_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (bridge == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	command = (u32)bridge-&gt;dev_private_data;</div><div class='add'>+	command = (long)bridge-&gt;dev_private_data;</div><div class='ctx'> 	bridge-&gt;dev_private_data = NULL;</div><div class='ctx'> 	if (!(command &amp; PCI_AGP_COMMAND_AGP))</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c<br/>index 6602b3156df5..9d6713a93ed7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/amiserial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/amiserial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/amiserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/amiserial.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * 		ever possible.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef SERIAL_PARANOIA_CHECK</div><div class='hunk'>@@ -2052,7 +2051,7 @@ static int __init rs_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* set ISRs, and then disable the rx interrupts */</div><div class='ctx'> 	request_irq(IRQ_AMIGA_TBE, ser_tx_int, 0, "serial TX", state);</div><div class='del'>-	request_irq(IRQ_AMIGA_RBF, ser_rx_int, SA_INTERRUPT, "serial RX", state);</div><div class='add'>+	request_irq(IRQ_AMIGA_RBF, ser_rx_int, IRQF_DISABLED, "serial RX", state);</div><div class='ctx'> </div><div class='ctx'> 	/* turn off Rx and Tx interrupts */</div><div class='ctx'> 	custom.intena = IF_RBF | IF_TBE;</div><div class='head'>diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c<br/>index a370e7a0bad5..10a389dafd60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/applicom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/applicom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/applicom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/applicom.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ static int ac_ioctl(struct inode *, struct file *, unsigned int,</div><div class='ctx'> 		    unsigned long);</div><div class='ctx'> static irqreturn_t ac_interrupt(int, void *, struct pt_regs *);</div><div class='ctx'> </div><div class='del'>-static struct file_operations ac_fops = {</div><div class='add'>+static const struct file_operations ac_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.read = ac_read,</div><div class='hunk'>@@ -166,11 +166,7 @@ static int ac_register_board(unsigned long physloc, void __iomem *loc,</div><div class='ctx'> 	return boardno + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='del'>-#define applicom_init init_module</div><div class='del'>-</div><div class='del'>-void cleanup_module(void)</div><div class='add'>+static void __exit applicom_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -188,9 +184,7 @@ void cleanup_module(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif				/* MODULE */</div><div class='del'>-</div><div class='del'>-int __init applicom_init(void)</div><div class='add'>+static int __init applicom_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, numisa = 0;</div><div class='ctx'> 	struct pci_dev *dev = NULL;</div><div class='hunk'>@@ -215,13 +209,16 @@ int __init applicom_init(void)</div><div class='ctx'> 		RamIO = ioremap(dev-&gt;resource[0].start, LEN_RAM_IO);</div><div class='ctx'> </div><div class='ctx'> 		if (!RamIO) {</div><div class='del'>-			printk(KERN_INFO "ac.o: Failed to ioremap PCI memory space at 0x%lx\n", dev-&gt;resource[0].start);</div><div class='add'>+			printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "</div><div class='add'>+				"space at 0x%llx\n",</div><div class='add'>+				(unsigned long long)dev-&gt;resource[0].start);</div><div class='ctx'> 			pci_disable_device(dev);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		printk(KERN_INFO "Applicom %s found at mem 0x%lx, irq %d\n",</div><div class='del'>-		       applicom_pci_devnames[dev-&gt;device-1], dev-&gt;resource[0].start, </div><div class='add'>+		printk(KERN_INFO "Applicom %s found at mem 0x%llx, irq %d\n",</div><div class='add'>+		       applicom_pci_devnames[dev-&gt;device-1],</div><div class='add'>+			   (unsigned long long)dev-&gt;resource[0].start,</div><div class='ctx'> 		       dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 		boardno = ac_register_board(dev-&gt;resource[0].start, RamIO,0);</div><div class='hunk'>@@ -232,7 +229,7 @@ int __init applicom_init(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (request_irq(dev-&gt;irq, &amp;ac_interrupt, SA_SHIRQ, "Applicom PCI", &amp;dummy)) {</div><div class='add'>+		if (request_irq(dev-&gt;irq, &amp;ac_interrupt, IRQF_SHARED, "Applicom PCI", &amp;dummy)) {</div><div class='ctx'> 			printk(KERN_INFO "Could not allocate IRQ %d for PCI Applicom device.\n", dev-&gt;irq);</div><div class='ctx'> 			iounmap(RamIO);</div><div class='ctx'> 			pci_disable_device(dev);</div><div class='hunk'>@@ -279,7 +276,7 @@ int __init applicom_init(void)</div><div class='ctx'> 		printk(KERN_NOTICE "Applicom ISA card found at mem 0x%lx, irq %d\n", mem + (LEN_RAM_IO*i), irq);</div><div class='ctx'> </div><div class='ctx'> 		if (!numisa) {</div><div class='del'>-			if (request_irq(irq, &amp;ac_interrupt, SA_SHIRQ, "Applicom ISA", &amp;dummy)) {</div><div class='add'>+			if (request_irq(irq, &amp;ac_interrupt, IRQF_SHARED, "Applicom ISA", &amp;dummy)) {</div><div class='ctx'> 				printk(KERN_WARNING "Could not allocate IRQ %d for ISA Applicom device.\n", irq);</div><div class='ctx'> 				iounmap(RamIO);</div><div class='ctx'> 				apbs[boardno - 1].RamIO = NULL;</div><div class='hunk'>@@ -355,10 +352,9 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+module_init(applicom_init);</div><div class='add'>+module_exit(applicom_exit);</div><div class='ctx'> </div><div class='del'>-#ifndef MODULE</div><div class='del'>-__initcall(applicom_init);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static ssize_t ac_write(struct file *file, const char __user *buf, size_t count, loff_t * ppos)</div><div class='ctx'> {</div><div class='hunk'>@@ -851,28 +847,3 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init applicom_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	int ints[4];</div><div class='del'>-</div><div class='del'>-	(void) get_options(str, 4, ints);</div><div class='del'>-</div><div class='del'>-	if (ints[0] &gt; 2) {</div><div class='del'>-		printk(KERN_WARNING "Too many arguments to 'applicom=', expected mem,irq only.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ints[0] &lt; 2) {</div><div class='del'>-		printk(KERN_INFO"applicom numargs: %d\n", ints[0]);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mem = ints[1];</div><div class='del'>-	irq = ints[2];</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("applicom=", applicom_setup);</div><div class='del'>-</div><div class='del'>-#endif				/* MODULE */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c<br/>index c85a4fa60da7..04a12027a740 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/consolemap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/consolemap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/consolemap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/consolemap.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * Fix bug in inverse translation. Stanislav Voronyi &lt;stas@cnti.uanet.kharkov.ua&gt;, Dec 1998</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c<br/>index 46d66037b917..8ce3f34cfc22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/cs5535_gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/cs5535_gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/cs5535_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/cs5535_gpio.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ static int cs5535_gpio_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return nonseekable_open(inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations cs5535_gpio_fops = {</div><div class='add'>+static const struct file_operations cs5535_gpio_fops = {</div><div class='ctx'> 	.owner	= THIS_MODULE,</div><div class='ctx'> 	.write	= cs5535_gpio_write,</div><div class='ctx'> 	.read	= cs5535_gpio_read,</div><div class='head'>diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c<br/>index cc7acf877dc0..c1c67281750d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/cyclades.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/cyclades.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/cyclades.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/cyclades.c</a></div><div class='hunk'>@@ -633,7 +633,6 @@ static char rcsid[] =</div><div class='ctx'> /*</div><div class='ctx'>  * Include section </div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -2833,9 +2832,8 @@ cy_write(struct tty_struct * tty, const unsigned char *buf, int count)</div><div class='ctx'>         return 0;</div><div class='ctx'>     }</div><div class='ctx'>         </div><div class='del'>-    if (!tty || !info-&gt;xmit_buf || !tmp_buf){</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='add'>+    if (!info-&gt;xmit_buf || !tmp_buf)</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>     CY_LOCK(info, flags);</div><div class='ctx'>     while (1) {</div><div class='hunk'>@@ -2884,7 +2882,7 @@ cy_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'>     if (serial_paranoia_check(info, tty-&gt;name, "cy_put_char"))</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='del'>-    if (!tty || !info-&gt;xmit_buf)</div><div class='add'>+    if (!info-&gt;xmit_buf)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     CY_LOCK(info, flags);</div><div class='hunk'>@@ -4614,7 +4612,7 @@ cy_detect_isa(void)</div><div class='ctx'> </div><div class='ctx'>                 /* allocate IRQ */</div><div class='ctx'>                 if(request_irq(cy_isa_irq, cyy_interrupt,</div><div class='del'>-				   SA_INTERRUPT, "Cyclom-Y", &amp;cy_card[j]))</div><div class='add'>+				   IRQF_DISABLED, "Cyclom-Y", &amp;cy_card[j]))</div><div class='ctx'>                 {</div><div class='ctx'>                         printk("Cyclom-Y/ISA found at 0x%lx ",</div><div class='ctx'>                                 (unsigned long) cy_isa_address);</div><div class='hunk'>@@ -4787,7 +4785,7 @@ cy_detect_pci(void)</div><div class='ctx'> </div><div class='ctx'>                 /* allocate IRQ */</div><div class='ctx'>                 if(request_irq(cy_pci_irq, cyy_interrupt,</div><div class='del'>-		        SA_SHIRQ, "Cyclom-Y", &amp;cy_card[j]))</div><div class='add'>+		        IRQF_SHARED, "Cyclom-Y", &amp;cy_card[j]))</div><div class='ctx'>                 {</div><div class='ctx'>                         printk("Cyclom-Y/PCI found at 0x%lx ",</div><div class='ctx'> 			    (ulong) cy_pci_phys2);</div><div class='hunk'>@@ -4967,7 +4965,7 @@ cy_detect_pci(void)</div><div class='ctx'>                 /* allocate IRQ only if board has an IRQ */</div><div class='ctx'> 		if( (cy_pci_irq != 0) &amp;&amp; (cy_pci_irq != 255) ) {</div><div class='ctx'> 		    if(request_irq(cy_pci_irq, cyz_interrupt,</div><div class='del'>-			SA_SHIRQ, "Cyclades-Z", &amp;cy_card[j]))</div><div class='add'>+			IRQF_SHARED, "Cyclades-Z", &amp;cy_card[j]))</div><div class='ctx'> 		    {</div><div class='ctx'>                         printk("Cyclom-8Zo/PCI found at 0x%lx ",</div><div class='ctx'> 			    (ulong) cy_pci_phys2);</div><div class='hunk'>@@ -5061,7 +5059,7 @@ cy_detect_pci(void)</div><div class='ctx'>                 /* allocate IRQ only if board has an IRQ */</div><div class='ctx'> 		if( (cy_pci_irq != 0) &amp;&amp; (cy_pci_irq != 255) ) {</div><div class='ctx'> 		    if(request_irq(cy_pci_irq, cyz_interrupt,</div><div class='del'>-			SA_SHIRQ, "Cyclades-Z", &amp;cy_card[j]))</div><div class='add'>+			IRQF_SHARED, "Cyclades-Z", &amp;cy_card[j]))</div><div class='ctx'> 		    {</div><div class='ctx'>                         printk("Cyclom-Ze/PCI found at 0x%lx ",</div><div class='ctx'> 			    (ulong) cy_pci_phys2);</div><div class='hunk'>@@ -5251,7 +5249,6 @@ cy_init(void)</div><div class='ctx'>     cy_serial_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'>     cy_serial_driver-&gt;driver_name = "cyclades";</div><div class='ctx'>     cy_serial_driver-&gt;name = "ttyC";</div><div class='del'>-    cy_serial_driver-&gt;devfs_name = "tts/C";</div><div class='ctx'>     cy_serial_driver-&gt;major = CYCLADES_MAJOR;</div><div class='ctx'>     cy_serial_driver-&gt;minor_start = 0;</div><div class='ctx'>     cy_serial_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='head'>diff --git a/drivers/char/decserial.c b/drivers/char/decserial.c<br/>index aa1440934e95..85f404e25c73 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/decserial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/decserial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/decserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/decserial.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *      console device I strongly recommend to use only one.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/dec/machtype.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h<br/>index 9da0ddb892b5..5642ac43e0f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm.h</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(__linux__)</div><div class='ctx'> #if defined(__KERNEL__)</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;asm/ioctl.h&gt;		/* For _IO* macros */</div><div class='ctx'> #define DRM_IOCTL_NR(n)		_IOC_NR(n)</div><div class='head'>diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h<br/>index cb76e5ca9a23..d2a56182bc35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drmP.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drmP.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drmP.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drmP.h</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * can build the DRM (part of PI DRI). 4/21/2000 S + B */</div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='ctx'> #endif				/* __alpha__ */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='head'>diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c<br/>index 611a1173091d..ebdb7182c4fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm_irq.c</a></div><div class='hunk'>@@ -130,7 +130,7 @@ static int drm_irq_install(drm_device_t * dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Install handler */</div><div class='ctx'> 	if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))</div><div class='del'>-		sh_flags = SA_SHIRQ;</div><div class='add'>+		sh_flags = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(dev-&gt;irq, dev-&gt;driver-&gt;irq_handler,</div><div class='ctx'> 			  sh_flags, dev-&gt;devname, dev);</div><div class='head'>diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c<br/>index 7e3318e1d1c6..5681cae1d404 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_memory.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_memory.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm_memory.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  * OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h<br/>index 714d9aedcff5..f1b97aff10cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_memory.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_memory.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_memory.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm_memory.h</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  * OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='head'>diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h<br/>index 6543b9a14c42..74581af806e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_memory_debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_memory_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_memory_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm_memory_debug.h</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> </div><div class='ctx'> typedef struct drm_mem_stats {</div><div class='hunk'>@@ -43,7 +42,7 @@ typedef struct drm_mem_stats {</div><div class='ctx'> 	unsigned long bytes_freed;</div><div class='ctx'> } drm_mem_stats_t;</div><div class='ctx'> </div><div class='del'>-static spinlock_t drm_mem_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(drm_mem_lock);</div><div class='ctx'> static unsigned long drm_ram_available = 0;	/* In pages */</div><div class='ctx'> static unsigned long drm_ram_used = 0;</div><div class='ctx'> static drm_mem_stats_t drm_mem_stats[] =</div><div class='head'>diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c<br/>index ce81bf248200..06ef7ddbe67d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_scatter.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_scatter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_scatter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm_scatter.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c<br/>index 0b9f98a7eb10..51ad98c685c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/drm_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/drm_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/drm_sysfs.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c<br/>index c13f9abb41e9..dd45111a4854 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/ffb_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/ffb_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/ffb_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/ffb_drv.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 2000 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "ffb.h"</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c<br/>index dfe6ad2b6a6e..fabb9a817966 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/i810_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i810_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/i810_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/i810_drv.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *    Gareth Hughes &lt;gareth@valinux.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> #include "i810_drm.h"</div><div class='head'>diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c<br/>index 722658188f5f..389597e4a623 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/i830_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i830_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/i830_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/i830_drv.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *    Keith Whitwell &lt;keith@tungstengraphics.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> #include "i830_drm.h"</div><div class='head'>diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c<br/>index 9f4b8ce4c05e..a94233bdbc0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/i915_dma.c</a></div><div class='hunk'>@@ -758,7 +758,9 @@ drm_ioctl_desc_t i915_ioctls[] = {</div><div class='ctx'> 	[DRM_IOCTL_NR(DRM_I915_FREE)] = {i915_mem_free, DRM_AUTH},</div><div class='ctx'> 	[DRM_IOCTL_NR(DRM_I915_INIT_HEAP)] = {i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},</div><div class='ctx'> 	[DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, DRM_AUTH},</div><div class='del'>-	[DRM_IOCTL_NR(DRM_I915_DESTROY_HEAP)] = { i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }</div><div class='add'>+	[DRM_IOCTL_NR(DRM_I915_DESTROY_HEAP)] = { i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY },</div><div class='add'>+	[DRM_IOCTL_NR(DRM_I915_SET_VBLANK_PIPE)] = { i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY },</div><div class='add'>+	[DRM_IOCTL_NR(DRM_I915_GET_VBLANK_PIPE)] = { i915_vblank_pipe_get, DRM_AUTH },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);</div><div class='head'>diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h<br/>index 4cb3da578330..5aa3e0e3bb45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_drm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_drm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_drm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/i915_drm.h</a></div><div class='hunk'>@@ -124,6 +124,8 @@ typedef struct _drm_i915_sarea {</div><div class='ctx'> #define DRM_I915_INIT_HEAP	0x0a</div><div class='ctx'> #define DRM_I915_CMDBUFFER	0x0b</div><div class='ctx'> #define DRM_I915_DESTROY_HEAP	0x0c</div><div class='add'>+#define DRM_I915_SET_VBLANK_PIPE	0x0d</div><div class='add'>+#define DRM_I915_GET_VBLANK_PIPE	0x0e</div><div class='ctx'> </div><div class='ctx'> #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)</div><div class='ctx'> #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)</div><div class='hunk'>@@ -138,6 +140,8 @@ typedef struct _drm_i915_sarea {</div><div class='ctx'> #define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)</div><div class='ctx'> #define DRM_IOCTL_I915_CMDBUFFER	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)</div><div class='ctx'> #define DRM_IOCTL_I915_DESTROY_HEAP	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)</div><div class='add'>+#define DRM_IOCTL_I915_SET_VBLANK_PIPE	DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)</div><div class='add'>+#define DRM_IOCTL_I915_GET_VBLANK_PIPE	DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)</div><div class='ctx'> </div><div class='ctx'> /* Allow drivers to submit batchbuffers directly to hardware, relying</div><div class='ctx'>  * on the security mechanisms provided by hardware.</div><div class='hunk'>@@ -224,4 +228,13 @@ typedef struct drm_i915_mem_destroy_heap {</div><div class='ctx'> 	int region;</div><div class='ctx'> } drm_i915_mem_destroy_heap_t;</div><div class='ctx'> </div><div class='add'>+/* Allow X server to configure which pipes to monitor for vblank signals</div><div class='add'>+ */</div><div class='add'>+#define	DRM_I915_VBLANK_PIPE_A	1</div><div class='add'>+#define	DRM_I915_VBLANK_PIPE_B	2</div><div class='add'>+</div><div class='add'>+typedef struct drm_i915_vblank_pipe {</div><div class='add'>+	int pipe;</div><div class='add'>+} drm_i915_vblank_pipe_t;</div><div class='add'>+</div><div class='ctx'> #endif				/* _I915_DRM_H_ */</div><div class='head'>diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h<br/>index 7a65666899e4..2d565031c002 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_drv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_drv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/i915_drv.h</a></div><div class='hunk'>@@ -45,9 +45,10 @@</div><div class='ctx'>  * 1.2: Add Power Management</div><div class='ctx'>  * 1.3: Add vblank support</div><div class='ctx'>  * 1.4: Fix cmdbuffer path, add heap destroy</div><div class='add'>+ * 1.5: Add vblank pipe configuration</div><div class='ctx'>  */</div><div class='ctx'> #define DRIVER_MAJOR		1</div><div class='del'>-#define DRIVER_MINOR		4</div><div class='add'>+#define DRIVER_MINOR		5</div><div class='ctx'> #define DRIVER_PATCHLEVEL	0</div><div class='ctx'> </div><div class='ctx'> typedef struct _drm_i915_ring_buffer {</div><div class='hunk'>@@ -96,6 +97,7 @@ typedef struct drm_i915_private {</div><div class='ctx'> 	int allow_batchbuffer;</div><div class='ctx'> 	struct mem_block *agp_heap;</div><div class='ctx'> 	unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;</div><div class='add'>+	int vblank_pipe;</div><div class='ctx'> } drm_i915_private_t;</div><div class='ctx'> </div><div class='ctx'> extern drm_ioctl_desc_t i915_ioctls[];</div><div class='hunk'>@@ -119,6 +121,8 @@ extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);</div><div class='ctx'> extern void i915_driver_irq_preinstall(drm_device_t * dev);</div><div class='ctx'> extern void i915_driver_irq_postinstall(drm_device_t * dev);</div><div class='ctx'> extern void i915_driver_irq_uninstall(drm_device_t * dev);</div><div class='add'>+extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS);</div><div class='add'>+extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS);</div><div class='ctx'> </div><div class='ctx'> /* i915_mem.c */</div><div class='ctx'> extern int i915_mem_alloc(DRM_IOCTL_ARGS);</div><div class='head'>diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c<br/>index a752afd86ab8..cd96cfa430db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_irq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/i915_irq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/i915_irq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/i915_irq.c</a></div><div class='hunk'>@@ -44,7 +44,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 	u16 temp;</div><div class='ctx'> </div><div class='ctx'> 	temp = I915_READ16(I915REG_INT_IDENTITY_R);</div><div class='del'>-	temp &amp;= (USER_INT_FLAG | VSYNC_PIPEA_FLAG);</div><div class='add'>+</div><div class='add'>+	temp &amp;= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);</div><div class='ctx'> </div><div class='ctx'> 	DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +59,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)</div><div class='ctx'> 	if (temp &amp; USER_INT_FLAG)</div><div class='ctx'> 		DRM_WAKEUP(&amp;dev_priv-&gt;irq_queue);</div><div class='ctx'> </div><div class='del'>-	if (temp &amp; VSYNC_PIPEA_FLAG) {</div><div class='add'>+	if (temp &amp; (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) {</div><div class='ctx'> 		atomic_inc(&amp;dev-&gt;vbl_received);</div><div class='ctx'> 		DRM_WAKEUP(&amp;dev-&gt;vbl_queue);</div><div class='ctx'> 		drm_vbl_send_signals(dev);</div><div class='hunk'>@@ -182,6 +183,68 @@ int i915_irq_wait(DRM_IOCTL_ARGS)</div><div class='ctx'> 	return i915_wait_irq(dev, irqwait.irq_seq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int i915_enable_interrupt (drm_device_t *dev)</div><div class='add'>+{</div><div class='add'>+	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='add'>+	u16 flag;</div><div class='add'>+</div><div class='add'>+	flag = 0;</div><div class='add'>+	if (dev_priv-&gt;vblank_pipe &amp; DRM_I915_VBLANK_PIPE_A)</div><div class='add'>+		flag |= VSYNC_PIPEA_FLAG;</div><div class='add'>+	if (dev_priv-&gt;vblank_pipe &amp; DRM_I915_VBLANK_PIPE_B)</div><div class='add'>+		flag |= VSYNC_PIPEB_FLAG;</div><div class='add'>+	if (dev_priv-&gt;vblank_pipe &amp; ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {</div><div class='add'>+		DRM_ERROR("%s called with invalid pipe 0x%x\n",</div><div class='add'>+			  __FUNCTION__, dev_priv-&gt;vblank_pipe);</div><div class='add'>+		return DRM_ERR(EINVAL);</div><div class='add'>+	}</div><div class='add'>+	I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set the vblank monitor pipe</div><div class='add'>+ */</div><div class='add'>+int i915_vblank_pipe_set(DRM_IOCTL_ARGS)</div><div class='add'>+{</div><div class='add'>+	DRM_DEVICE;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	drm_i915_vblank_pipe_t pipe;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv) {</div><div class='add'>+		DRM_ERROR("%s called with no initialization\n", __FUNCTION__);</div><div class='add'>+		return DRM_ERR(EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DRM_COPY_FROM_USER_IOCTL(pipe, (drm_i915_vblank_pipe_t __user *) data,</div><div class='add'>+				 sizeof(pipe));</div><div class='add'>+</div><div class='add'>+	dev_priv-&gt;vblank_pipe = pipe.pipe;</div><div class='add'>+	return i915_enable_interrupt (dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int i915_vblank_pipe_get(DRM_IOCTL_ARGS)</div><div class='add'>+{</div><div class='add'>+	DRM_DEVICE;</div><div class='add'>+	drm_i915_private_t *dev_priv = dev-&gt;dev_private;</div><div class='add'>+	drm_i915_vblank_pipe_t pipe;</div><div class='add'>+	u16 flag;</div><div class='add'>+</div><div class='add'>+	if (!dev_priv) {</div><div class='add'>+		DRM_ERROR("%s called with no initialization\n", __FUNCTION__);</div><div class='add'>+		return DRM_ERR(EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flag = I915_READ(I915REG_INT_ENABLE_R);</div><div class='add'>+	pipe.pipe = 0;</div><div class='add'>+	if (flag &amp; VSYNC_PIPEA_FLAG)</div><div class='add'>+		pipe.pipe |= DRM_I915_VBLANK_PIPE_A;</div><div class='add'>+	if (flag &amp; VSYNC_PIPEB_FLAG)</div><div class='add'>+		pipe.pipe |= DRM_I915_VBLANK_PIPE_B;</div><div class='add'>+	DRM_COPY_TO_USER_IOCTL((drm_i915_vblank_pipe_t __user *) data, pipe,</div><div class='add'>+				 sizeof(pipe));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* drm_dma.h hooks</div><div class='ctx'> */</div><div class='ctx'> void i915_driver_irq_preinstall(drm_device_t * dev)</div><div class='hunk'>@@ -197,7 +260,7 @@ void i915_driver_irq_postinstall(drm_device_t * dev)</div><div class='ctx'> {</div><div class='ctx'> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev-&gt;dev_private;</div><div class='ctx'> </div><div class='del'>-	I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | VSYNC_PIPEA_FLAG);</div><div class='add'>+	i915_enable_interrupt(dev);</div><div class='ctx'> 	DRM_INIT_WAITQUEUE(&amp;dev_priv-&gt;irq_queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c<br/>index 9f7ed0e0351b..e30f556b79f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/mga_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/mga_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/mga_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/mga_drv.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *    Gareth Hughes &lt;gareth@valinux.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> #include "mga_drm.h"</div><div class='head'>diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c<br/>index e20450ae220e..6108e7587e12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/r128_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/r128_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/r128_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/r128_drv.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *    Gareth Hughes &lt;gareth@valinux.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> #include "r128_drm.h"</div><div class='head'>diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c<br/>index 7f949c9c9691..5ad43ba7b5aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_cp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_cp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/radeon_cp.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> static int radeon_do_cleanup_cp(drm_device_t * dev);</div><div class='ctx'> </div><div class='ctx'> /* CP microcode (from ATI) */</div><div class='del'>-static u32 R200_cp_microcode[][2] = {</div><div class='add'>+static const u32 R200_cp_microcode[][2] = {</div><div class='ctx'> 	{0x21007000, 0000000000},</div><div class='ctx'> 	{0x20007000, 0000000000},</div><div class='ctx'> 	{0x000000ab, 0x00000004},</div><div class='hunk'>@@ -298,7 +298,7 @@ static u32 R200_cp_microcode[][2] = {</div><div class='ctx'> 	{0000000000, 0000000000},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 radeon_cp_microcode[][2] = {</div><div class='add'>+static const u32 radeon_cp_microcode[][2] = {</div><div class='ctx'> 	{0x21007000, 0000000000},</div><div class='ctx'> 	{0x20007000, 0000000000},</div><div class='ctx'> 	{0x000000b4, 0x00000004},</div><div class='hunk'>@@ -557,7 +557,7 @@ static u32 radeon_cp_microcode[][2] = {</div><div class='ctx'> 	{0000000000, 0000000000},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 R300_cp_microcode[][2] = {</div><div class='add'>+static const u32 R300_cp_microcode[][2] = {</div><div class='ctx'> 	{0x4200e000, 0000000000},</div><div class='ctx'> 	{0x4000e000, 0000000000},</div><div class='ctx'> 	{0x000000af, 0x00000008},</div><div class='head'>diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h<br/>index c8e279e89c2e..8d6350dd5360 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_drm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_drm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_drm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/radeon_drm.h</a></div><div class='hunk'>@@ -161,7 +161,8 @@</div><div class='ctx'> #define R200_EMIT_PP_TXCTLALL_3                     91</div><div class='ctx'> #define R200_EMIT_PP_TXCTLALL_4                     92</div><div class='ctx'> #define R200_EMIT_PP_TXCTLALL_5                     93</div><div class='del'>-#define RADEON_MAX_STATE_PACKETS                    94</div><div class='add'>+#define R200_EMIT_VAP_PVS_CNTL                      94</div><div class='add'>+#define RADEON_MAX_STATE_PACKETS                    95</div><div class='ctx'> </div><div class='ctx'> /* Commands understood by cmd_buffer ioctl.  More can be added but</div><div class='ctx'>  * obviously these can't be removed or changed:</div><div class='hunk'>@@ -176,6 +177,7 @@</div><div class='ctx'> #define RADEON_CMD_WAIT         8	/* emit hw wait commands -- note:</div><div class='ctx'> 					 *  doesn't make the cpu wait, just</div><div class='ctx'> 					 *  the graphics hardware */</div><div class='add'>+#define RADEON_CMD_VECLINEAR	9       /* another r200 stopgap */</div><div class='ctx'> </div><div class='ctx'> typedef union {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -192,6 +194,9 @@ typedef union {</div><div class='ctx'> 		unsigned char cmd_type, offset, stride, count;</div><div class='ctx'> 	} vectors;</div><div class='ctx'> 	struct {</div><div class='add'>+		unsigned char cmd_type, addr_lo, addr_hi, count;</div><div class='add'>+	} veclinear;</div><div class='add'>+	struct {</div><div class='ctx'> 		unsigned char cmd_type, buf_idx, pad0, pad1;</div><div class='ctx'> 	} dma;</div><div class='ctx'> 	struct {</div><div class='head'>diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c<br/>index b04ed1b562b9..eb985c2a31e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/radeon_drv.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  * OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "drm.h"</div><div class='ctx'> #include "radeon_drm.h"</div><div class='head'>diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h<br/>index 78345cee8f8e..e5a256f5429c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_drv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_drv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_drv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/radeon_drv.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME		"radeon"</div><div class='ctx'> #define DRIVER_DESC		"ATI Radeon"</div><div class='del'>-#define DRIVER_DATE		"20060225"</div><div class='add'>+#define DRIVER_DATE		"20060524"</div><div class='ctx'> </div><div class='ctx'> /* Interface history:</div><div class='ctx'>  *</div><div class='hunk'>@@ -93,9 +93,11 @@</div><div class='ctx'>  * 1.22- Add support for texture cache flushes (R300_TX_CNTL)</div><div class='ctx'>  * 1.23- Add new radeon memory map work from benh</div><div class='ctx'>  * 1.24- Add general-purpose packet for manipulating scratch registers (r300)</div><div class='add'>+ * 1.25- Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL,</div><div class='add'>+ *       new packet type)</div><div class='ctx'>  */</div><div class='ctx'> #define DRIVER_MAJOR		1</div><div class='del'>-#define DRIVER_MINOR		24</div><div class='add'>+#define DRIVER_MINOR		25</div><div class='ctx'> #define DRIVER_PATCHLEVEL	0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -884,6 +886,8 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp,</div><div class='ctx'> #define RADEON_PP_CUBIC_OFFSET_T1_0         0x1e00</div><div class='ctx'> #define RADEON_PP_CUBIC_OFFSET_T2_0         0x1e14</div><div class='ctx'> </div><div class='add'>+#define RADEON_SE_TCL_STATE_FLUSH           0x2284</div><div class='add'>+</div><div class='ctx'> #define SE_VAP_CNTL__TCL_ENA_MASK                          0x00000001</div><div class='ctx'> #define SE_VAP_CNTL__FORCE_W_TO_ONE_MASK                   0x00010000</div><div class='ctx'> #define SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT                 0x00000012</div><div class='hunk'>@@ -905,6 +909,8 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp,</div><div class='ctx'> #define R200_PP_AFS_0                     0x2f80</div><div class='ctx'> #define R200_PP_AFS_1                     0x2f00	/* same as txcblend_0 */</div><div class='ctx'> </div><div class='add'>+#define R200_VAP_PVS_CNTL_1               0x22D0</div><div class='add'>+</div><div class='ctx'> /* Constants */</div><div class='ctx'> #define RADEON_MAX_USEC_TIMEOUT		100000	/* 100 ms */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c<br/>index c5b8f774a599..5bb2234a9094 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_state.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/radeon_state.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/radeon_state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/radeon_state.c</a></div><div class='hunk'>@@ -249,6 +249,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *</div><div class='ctx'> 	case R200_EMIT_PP_TXCTLALL_3:</div><div class='ctx'> 	case R200_EMIT_PP_TXCTLALL_4:</div><div class='ctx'> 	case R200_EMIT_PP_TXCTLALL_5:</div><div class='add'>+	case R200_EMIT_VAP_PVS_CNTL:</div><div class='ctx'> 		/* These packets don't contain memory offsets */</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -626,6 +627,7 @@ static struct {</div><div class='ctx'> 	{R200_PP_TXFILTER_3, 8, "R200_PP_TXCTLALL_3"},</div><div class='ctx'> 	{R200_PP_TXFILTER_4, 8, "R200_PP_TXCTLALL_4"},</div><div class='ctx'> 	{R200_PP_TXFILTER_5, 8, "R200_PP_TXCTLALL_5"},</div><div class='add'>+	{R200_VAP_PVS_CNTL_1, 2, "R200_VAP_PVS_CNTL"},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ================================================================</div><div class='hunk'>@@ -2595,7 +2597,8 @@ static __inline__ int radeon_emit_vectors(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	int stride = header.vectors.stride;</div><div class='ctx'> 	RING_LOCALS;</div><div class='ctx'> </div><div class='del'>-	BEGIN_RING(3 + sz);</div><div class='add'>+	BEGIN_RING(5 + sz);</div><div class='add'>+	OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);</div><div class='ctx'> 	OUT_RING(CP_PACKET0(RADEON_SE_TCL_VECTOR_INDX_REG, 0));</div><div class='ctx'> 	OUT_RING(start | (stride &lt;&lt; RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT));</div><div class='ctx'> 	OUT_RING(CP_PACKET0_TABLE(RADEON_SE_TCL_VECTOR_DATA_REG, (sz - 1)));</div><div class='hunk'>@@ -2607,6 +2610,32 @@ static __inline__ int radeon_emit_vectors(drm_radeon_private_t *dev_priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static __inline__ int radeon_emit_veclinear(drm_radeon_private_t *dev_priv,</div><div class='add'>+					  drm_radeon_cmd_header_t header,</div><div class='add'>+					  drm_radeon_kcmd_buffer_t *cmdbuf)</div><div class='add'>+{</div><div class='add'>+	int sz = header.veclinear.count * 4;</div><div class='add'>+	int start = header.veclinear.addr_lo | (header.veclinear.addr_hi &lt;&lt; 8);</div><div class='add'>+	RING_LOCALS;</div><div class='add'>+</div><div class='add'>+        if (!sz)</div><div class='add'>+                return 0;</div><div class='add'>+        if (sz * 4 &gt; cmdbuf-&gt;bufsz)</div><div class='add'>+                return DRM_ERR(EINVAL);</div><div class='add'>+</div><div class='add'>+	BEGIN_RING(5 + sz);</div><div class='add'>+	OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);</div><div class='add'>+	OUT_RING(CP_PACKET0(RADEON_SE_TCL_VECTOR_INDX_REG, 0));</div><div class='add'>+	OUT_RING(start | (1 &lt;&lt; RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT));</div><div class='add'>+	OUT_RING(CP_PACKET0_TABLE(RADEON_SE_TCL_VECTOR_DATA_REG, (sz - 1)));</div><div class='add'>+	OUT_RING_TABLE(cmdbuf-&gt;buf, sz);</div><div class='add'>+	ADVANCE_RING();</div><div class='add'>+</div><div class='add'>+	cmdbuf-&gt;buf += sz * sizeof(int);</div><div class='add'>+	cmdbuf-&gt;bufsz -= sz * sizeof(int);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int radeon_emit_packet3(drm_device_t * dev,</div><div class='ctx'> 			       drm_file_t * filp_priv,</div><div class='ctx'> 			       drm_radeon_kcmd_buffer_t *cmdbuf)</div><div class='hunk'>@@ -2865,6 +2894,14 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='add'>+		case RADEON_CMD_VECLINEAR:</div><div class='add'>+			DRM_DEBUG("RADEON_CMD_VECLINEAR\n");</div><div class='add'>+			if (radeon_emit_veclinear(dev_priv, header, &amp;cmdbuf)) {</div><div class='add'>+				DRM_ERROR("radeon_emit_veclinear failed\n");</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			DRM_ERROR("bad cmd_type %d at %p\n",</div><div class='ctx'> 				  header.header.cmd_type,</div><div class='head'>diff --git a/drivers/char/drm/savage_drv.c b/drivers/char/drm/savage_drv.c<br/>index aa6c0d1a82f8..eee52aa92a7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/savage_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/savage_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/savage_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/savage_drv.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "savage_drm.h"</div><div class='ctx'> #include "savage_drv.h"</div><div class='head'>diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c<br/>index 6f6d7d613ede..5e9dc86f2956 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/sis_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/sis_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/sis_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/sis_drv.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "sis_drm.h"</div><div class='ctx'> #include "sis_drv.h"</div><div class='head'>diff --git a/drivers/char/drm/tdfx_drv.c b/drivers/char/drm/tdfx_drv.c<br/>index baa4416032a8..012ff2e356b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/tdfx_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/tdfx_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/tdfx_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/tdfx_drv.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *    Gareth Hughes &lt;gareth@valinux.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "tdfx_drv.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c<br/>index b7f17457b424..78a81a4a99c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/via_dmablit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/via_dmablit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/via_dmablit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/via_dmablit.c</a></div><div class='hunk'>@@ -557,7 +557,7 @@ via_init_dmablit(drm_device_t *dev)</div><div class='ctx'> 		blitq-&gt;num_outstanding = 0;</div><div class='ctx'> 		blitq-&gt;is_active = 0;</div><div class='ctx'> 		blitq-&gt;aborting = 0;</div><div class='del'>-		blitq-&gt;blit_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+		spin_lock_init(&amp;blitq-&gt;blit_lock);</div><div class='ctx'> 		for (j=0; j&lt;VIA_NUM_BLIT_SLOTS; ++j) {</div><div class='ctx'> 			DRM_INIT_WAITQUEUE(blitq-&gt;blit_queue + j);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/char/drm/via_drv.c b/drivers/char/drm/via_drv.c<br/>index 3f012255d315..b3d364d793d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/drm/via_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/drm/via_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/drm/via_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/drm/via_drv.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * DEALINGS IN THE SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "drmP.h"</div><div class='ctx'> #include "via_drm.h"</div><div class='ctx'> #include "via_drv.h"</div><div class='head'>diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c<br/>index d755cac14bc1..21c8229f5443 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ds1286.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ds1286.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ds1286.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ds1286.c</a></div><div class='hunk'>@@ -281,7 +281,7 @@ static unsigned int ds1286_poll(struct file *file, poll_table *wait)</div><div class='ctx'>  *	The various file operations we support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations ds1286_fops = {</div><div class='add'>+static const struct file_operations ds1286_fops = {</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= ds1286_read,</div><div class='ctx'> 	.poll		= ds1286_poll,</div><div class='head'>diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c<br/>index a75e8609be01..bcdb107aa967 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ds1302.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ds1302.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ds1302.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ds1302.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> *!</div><div class='ctx'> *!***************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -283,7 +282,7 @@ get_rtc_status(char *buf)</div><div class='ctx'> </div><div class='ctx'> /* The various file operations we support. */</div><div class='ctx'> </div><div class='del'>-static struct file_operations rtc_fops = {</div><div class='add'>+static const struct file_operations rtc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= rtc_ioctl,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c<br/>index 62cda25724e3..48cb8f0e8ebf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ds1620.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ds1620.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ds1620.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ds1620.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * linux/drivers/char/ds1620.c: Dallas Semiconductors DS1620</div><div class='ctx'>  *   thermometer driver (as used in the Rebel.com NetWinder)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -337,7 +336,7 @@ proc_therm_ds1620_read(char *buf, char **start, off_t offset,</div><div class='ctx'> static struct proc_dir_entry *proc_therm_ds1620;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct file_operations ds1620_fops = {</div><div class='add'>+static const struct file_operations ds1620_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= nonseekable_open,</div><div class='ctx'> 	.read		= ds1620_read,</div><div class='head'>diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c<br/>index e233cf280bc0..9b1bf60ffbe7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/dsp56k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/dsp56k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/dsp56k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/dsp56k.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -484,7 +483,7 @@ static int dsp56k_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations dsp56k_fops = {</div><div class='add'>+static const struct file_operations dsp56k_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= dsp56k_read,</div><div class='ctx'> 	.write		= dsp56k_write,</div><div class='hunk'>@@ -518,17 +517,9 @@ static int __init dsp56k_init_driver(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");</div><div class='ctx'> </div><div class='del'>-	err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),</div><div class='del'>-		      S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");</div><div class='del'>-	if(err)</div><div class='del'>-		goto out_class;</div><div class='del'>-</div><div class='ctx'> 	printk(banner);</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='del'>-out_class:</div><div class='del'>-	class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));</div><div class='del'>-	class_destroy(dsp56k_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(DSP56K_MAJOR, "dsp56k");</div><div class='ctx'> out:</div><div class='hunk'>@@ -541,7 +532,6 @@ static void __exit dsp56k_cleanup_driver(void)</div><div class='ctx'> 	class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));</div><div class='ctx'> 	class_destroy(dsp56k_class);</div><div class='ctx'> 	unregister_chrdev(DSP56K_MAJOR, "dsp56k");</div><div class='del'>-	devfs_remove("dsp56k");</div><div class='ctx'> }</div><div class='ctx'> module_exit(dsp56k_cleanup_driver);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c<br/>index 87dcaa237f07..5e82c3bad2e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/dtlk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/dtlk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/dtlk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/dtlk.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;		/* for __init, module_{init,exit} */</div><div class='ctx'> #include &lt;linux/poll.h&gt;		/* for POLLIN, etc. */</div><div class='ctx'> #include &lt;linux/dtlk.h&gt;		/* local header file for DoubleTalk values */</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef TRACING</div><div class='hunk'>@@ -95,7 +94,7 @@ static int dtlk_release(struct inode *, struct file *);</div><div class='ctx'> static int dtlk_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		      unsigned int cmd, unsigned long arg);</div><div class='ctx'> </div><div class='del'>-static struct file_operations dtlk_fops =</div><div class='add'>+static const struct file_operations dtlk_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= dtlk_read,</div><div class='hunk'>@@ -337,9 +336,6 @@ static int __init dtlk_init(void)</div><div class='ctx'> 	if (dtlk_dev_probe() == 0)</div><div class='ctx'> 		printk(", MAJOR %d\n", dtlk_major);</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(dtlk_major, DTLK_MINOR),</div><div class='del'>-		       S_IFCHR | S_IRUSR | S_IWUSR, "dtlk");</div><div class='del'>-</div><div class='ctx'> 	init_timer(&amp;dtlk_timer);</div><div class='ctx'> 	dtlk_timer.function = dtlk_timer_tick;</div><div class='ctx'> 	init_waitqueue_head(&amp;dtlk_process_list);</div><div class='hunk'>@@ -357,7 +353,6 @@ static void __exit dtlk_cleanup (void)</div><div class='ctx'> </div><div class='ctx'> 	dtlk_write_tts(DTLK_CLEAR);</div><div class='ctx'> 	unregister_chrdev(dtlk_major, "dtlk");</div><div class='del'>-	devfs_remove("dtlk");</div><div class='ctx'> 	release_region(dtlk_port_lpc, DTLK_IO_EXTENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ec3104_keyb.c b/drivers/char/ec3104_keyb.c<br/>index 4aed66968821..abac18b1871c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ec3104_keyb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ec3104_keyb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ec3104_keyb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ec3104_keyb.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  * (prumpf@tux.org).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c<br/>index 0090e7a4fcd3..004141d535a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/efirtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/efirtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/efirtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/efirtc.c</a></div><div class='hunk'>@@ -285,7 +285,7 @@ efi_rtc_close(struct inode *inode, struct file *file)</div><div class='ctx'>  *	The various file operations we support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations efi_rtc_fops = {</div><div class='add'>+static const struct file_operations efi_rtc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= efi_rtc_ioctl,</div><div class='ctx'> 	.open		= efi_rtc_open,</div><div class='head'>diff --git a/drivers/char/epca.c b/drivers/char/epca.c<br/>index 9cad8501d62c..86d290e9f307 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/epca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/epca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/epca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/epca.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> /* See README.epca for change history --DAT*/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -80,7 +79,7 @@ static int invalid_lilo_config;</div><div class='ctx'> /* The ISA boards do window flipping into the same spaces so its only sane</div><div class='ctx'>    with a single lock. It's still pretty efficient */</div><div class='ctx'> </div><div class='del'>-static spinlock_t epca_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(epca_lock);</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------------</div><div class='ctx'> 	MAXBOARDS is typically 12, but ISA and EISA cards are restricted to </div><div class='hunk'>@@ -1232,7 +1231,6 @@ static int __init pc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	pc_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	pc_driver-&gt;name = "ttyD"; </div><div class='del'>-	pc_driver-&gt;devfs_name = "tts/D";</div><div class='ctx'> 	pc_driver-&gt;major = DIGI_MAJOR; </div><div class='ctx'> 	pc_driver-&gt;minor_start = 0;</div><div class='ctx'> 	pc_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='head'>diff --git a/drivers/char/esp.c b/drivers/char/esp.c<br/>index 09dc4b01232c..afcd83d9984b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/esp.c</a></div><div class='hunk'>@@ -883,7 +883,7 @@ static int startup(struct esp_struct * info)</div><div class='ctx'> 	 * Allocate the IRQ</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(info-&gt;irq, rs_interrupt_single, SA_SHIRQ,</div><div class='add'>+	retval = request_irq(info-&gt;irq, rs_interrupt_single, IRQF_SHARED,</div><div class='ctx'> 			     "esp serial", info);</div><div class='ctx'> </div><div class='ctx'> 	if (retval) {</div><div class='hunk'>@@ -1212,7 +1212,7 @@ static void rs_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_put_char"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;xmit_buf)</div><div class='add'>+	if (!info-&gt;xmit_buf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;lock, flags);</div><div class='hunk'>@@ -1256,7 +1256,7 @@ static int rs_write(struct tty_struct * tty,</div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_write"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;xmit_buf)</div><div class='add'>+	if (!info-&gt;xmit_buf)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	    </div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -2449,7 +2449,6 @@ static int __init espserial_init(void)</div><div class='ctx'> 	</div><div class='ctx'> 	esp_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	esp_driver-&gt;name = "ttyP";</div><div class='del'>-	esp_driver-&gt;devfs_name = "tts/P";</div><div class='ctx'> 	esp_driver-&gt;major = ESP_IN_MAJOR;</div><div class='ctx'> 	esp_driver-&gt;minor_start = 0;</div><div class='ctx'> 	esp_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c<br/>index 093fdf98b19a..65c9d2ec60bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/fdc-io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/fdc-io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/fdc-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/fdc-io.c</a></div><div class='hunk'>@@ -1268,7 +1268,7 @@ static int fdc_grab_irq_and_dma(void)</div><div class='ctx'> 		/*  Get fast interrupt handler.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (request_irq(fdc.irq, ftape_interrupt,</div><div class='del'>-				SA_INTERRUPT, "ft", ftape_id)) {</div><div class='add'>+				IRQF_DISABLED, "ft", ftape_id)) {</div><div class='ctx'> 			TRACE_ABORT(-EIO, ft_t_bug,</div><div class='ctx'> 				    "Unable to grab IRQ%d for ftape driver",</div><div class='ctx'> 				    fdc.irq);</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape-calibr.c b/drivers/char/ftape/lowlevel/ftape-calibr.c<br/>index 956b2586e138..8e50bfd35a52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-calibr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-calibr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-calibr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape-calibr.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *      functions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape-ctl.c b/drivers/char/ftape/lowlevel/ftape-ctl.c<br/>index 32e043911790..5d7c1ce92d59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-ctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-ctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-ctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape-ctl.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *      QIC-40/80/3010/3020 floppy-tape driver "ftape" for Linux.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape-init.c b/drivers/char/ftape/lowlevel/ftape-init.c<br/>index b54260d457c2..4998132a81d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape-init.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *      for the QIC-40/80/3010/3020 floppy-tape driver for Linux.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape-proc.c b/drivers/char/ftape/lowlevel/ftape-proc.c<br/>index c66251e997ed..e805b15e0a12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape-proc.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *	Old code removed, switched to dynamic proc entry.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_PROC_FS) &amp;&amp; defined(CONFIG_FT_PROC_FS)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape-setup.c b/drivers/char/ftape/lowlevel/ftape-setup.c<br/>index 280a1a55d87e..678340acd0b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-setup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-setup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-setup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape-setup.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *      "ftape" for Linux.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape-tracing.h b/drivers/char/ftape/lowlevel/ftape-tracing.h<br/>index fa7cd20ee66c..2950810c7085 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-tracing.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape-tracing.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape-tracing.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape-tracing.h</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *      QIC-40/80/3010/3020 floppy-tape driver "ftape" for Linux.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/char/ftape/lowlevel/ftape_syms.c b/drivers/char/ftape/lowlevel/ftape_syms.c<br/>index 5dc3a380c9bf..8e0dc4a07ca6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape_syms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/lowlevel/ftape_syms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/lowlevel/ftape_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/lowlevel/ftape_syms.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *      exports to its high level clients</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ftape.h&gt;</div><div class='head'>diff --git a/drivers/char/ftape/zftape/zftape-ctl.c b/drivers/char/ftape/zftape/zftape-ctl.c<br/>index 6c7874e5c199..22ba0f5d00cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/zftape/zftape-ctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/zftape/zftape-ctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/zftape/zftape-ctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/zftape/zftape-ctl.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *      for the QIC-40/80/3010/3020 floppy-tape driver for Linux.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/char/ftape/zftape/zftape-ctl.h b/drivers/char/ftape/zftape/zftape-ctl.h<br/>index 414159891990..8e6f2d7ac74e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/zftape/zftape-ctl.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/zftape/zftape-ctl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/zftape/zftape-ctl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/zftape/zftape-ctl.h</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *      for the QIC-40/80 floppy-tape driver for Linux.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/mtio.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c<br/>index 821357ce7e0e..164a1aa77a2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ftape/zftape/zftape-init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ftape/zftape/zftape-init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ftape/zftape/zftape-init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ftape/zftape/zftape-init.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *      to the ftape floppy tape driver for Linux</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -33,7 +32,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/zftape.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -88,7 +86,7 @@ static ssize_t zft_read (struct file *fp, char __user *buff,</div><div class='ctx'> static ssize_t zft_write(struct file *fp, const char __user *buff,</div><div class='ctx'> 			 size_t req_len, loff_t *ppos);</div><div class='ctx'> </div><div class='del'>-static struct file_operations zft_cdev =</div><div class='add'>+static const struct file_operations zft_cdev =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= zft_read,</div><div class='hunk'>@@ -332,29 +330,11 @@ KERN_INFO</div><div class='ctx'> 	zft_class = class_create(THIS_MODULE, "zft");</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);</div><div class='del'>-		devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				"qft%i", i);</div><div class='ctx'> 		class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);</div><div class='del'>-		devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				"nqft%i", i);</div><div class='ctx'> 		class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);</div><div class='del'>-		devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				"zqft%i", i);</div><div class='ctx'> 		class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);</div><div class='del'>-		devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				"nzqft%i", i);</div><div class='ctx'> 		class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);</div><div class='del'>-		devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				"rawqft%i", i);</div><div class='ctx'> 		class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);</div><div class='del'>-		devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-				"nrawqft%i", i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZFT_COMPRESSOR</div><div class='hunk'>@@ -380,17 +360,11 @@ static void zft_exit(void)</div><div class='ctx'> 		TRACE(ft_t_info, "successful");</div><div class='ctx'> 	}</div><div class='ctx'>         for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		devfs_remove("qft%i", i);</div><div class='ctx'> 		class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i));</div><div class='del'>-		devfs_remove("nqft%i", i);</div><div class='ctx'> 		class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4));</div><div class='del'>-		devfs_remove("zqft%i", i);</div><div class='ctx'> 		class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16));</div><div class='del'>-		devfs_remove("nzqft%i", i);</div><div class='ctx'> 		class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20));</div><div class='del'>-		devfs_remove("rawqft%i", i);</div><div class='ctx'> 		class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32));</div><div class='del'>-		devfs_remove("nrawqft%i", i);</div><div class='ctx'> 		class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36));</div><div class='ctx'> 	}</div><div class='ctx'> 	class_destroy(zft_class);</div><div class='head'>diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c<br/>index 588fca542a98..817dc409ac20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/genrtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/genrtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/genrtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/genrtc.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> #define RTC_VERSION	"1.07"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='hunk'>@@ -483,7 +482,7 @@ static inline int gen_rtc_proc_init(void) { return 0; }</div><div class='ctx'>  *	The various file operations we support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations gen_rtc_fops = {</div><div class='add'>+static const struct file_operations gen_rtc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> #ifdef CONFIG_GEN_RTC_X</div><div class='ctx'> 	.read		= gen_rtc_read,</div><div class='head'>diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c<br/>index ac626418b329..d69f2ad9a67d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hangcheck-timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hangcheck-timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hangcheck-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hangcheck-timer.c</a></div><div class='hunk'>@@ -117,12 +117,12 @@ __setup("hcheck_reboot", hangcheck_parse_reboot);</div><div class='ctx'> __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);</div><div class='ctx'> #endif /* not MODULE */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_X86) || defined(CONFIG_S390)</div><div class='add'>+#if defined(CONFIG_X86_64) || defined(CONFIG_S390)</div><div class='ctx'> # define HAVE_MONOTONIC</div><div class='ctx'> # define TIMER_FREQ 1000000000ULL</div><div class='ctx'> #elif defined(CONFIG_IA64)</div><div class='ctx'> # define TIMER_FREQ ((unsigned long long)local_cpu_data-&gt;itc_freq)</div><div class='del'>-#elif defined(CONFIG_PPC64)</div><div class='add'>+#else</div><div class='ctx'> # define TIMER_FREQ (HZ*loops_per_jiffy)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c<br/>index ef140ebde117..8afba339f05a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hpet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hpet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hpet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hpet.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -396,7 +395,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)</div><div class='ctx'> </div><div class='ctx'> 		sprintf(devp-&gt;hd_name, "hpet%d", (int)(devp - hpetp-&gt;hp_dev));</div><div class='ctx'> 		irq_flags = devp-&gt;hd_flags &amp; HPET_SHARED_IRQ</div><div class='del'>-						? SA_SHIRQ : SA_INTERRUPT;</div><div class='add'>+						? IRQF_SHARED : IRQF_DISABLED;</div><div class='ctx'> 		if (request_irq(irq, hpet_interrupt, irq_flags,</div><div class='ctx'> 				devp-&gt;hd_name, (void *)devp)) {</div><div class='ctx'> 			printk(KERN_ERR "hpet: IRQ %d is not free\n", irq);</div><div class='hunk'>@@ -554,7 +553,7 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations hpet_fops = {</div><div class='add'>+static const struct file_operations hpet_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.read = hpet_read,</div><div class='hunk'>@@ -925,11 +924,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)</div><div class='ctx'> 	status = acpi_resource_to_address64(res, &amp;addr);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_SUCCESS(status)) {</div><div class='del'>-		unsigned long size;</div><div class='del'>-</div><div class='del'>-		size = addr.maximum - addr.minimum + 1;</div><div class='ctx'> 		hdp-&gt;hd_phys_address = addr.minimum;</div><div class='del'>-		hdp-&gt;hd_address = ioremap(addr.minimum, size);</div><div class='add'>+		hdp-&gt;hd_address = ioremap(addr.minimum, addr.address_length);</div><div class='ctx'> </div><div class='ctx'> 		if (hpet_is_known(hdp)) {</div><div class='ctx'> 			printk(KERN_DEBUG "%s: 0x%lx is busy\n",</div><div class='head'>diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c<br/>index 2b6a56b2bf35..ca2f538e549e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvc_console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvc_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvc_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hvc_console.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -347,7 +346,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;hp-&gt;lock, flags);</div><div class='ctx'> 	/* check error, fallback to non-irq */</div><div class='ctx'> 	if (irq != NO_IRQ)</div><div class='del'>-		rc = request_irq(irq, hvc_handle_interrupt, SA_INTERRUPT, "hvc_console", hp);</div><div class='add'>+		rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED, "hvc_console", hp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the request_irq() fails and we return an error.  The tty layer</div><div class='hunk'>@@ -553,7 +552,6 @@ static int hvc_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> #define HVC_POLL_READ	0x00000001</div><div class='ctx'> #define HVC_POLL_WRITE	0x00000002</div><div class='del'>-#define HVC_POLL_QUICK	0x00000004</div><div class='ctx'> </div><div class='ctx'> static int hvc_poll(struct hvc_struct *hp)</div><div class='ctx'> {</div><div class='hunk'>@@ -568,6 +566,7 @@ static int hvc_poll(struct hvc_struct *hp)</div><div class='ctx'> 	/* Push pending writes */</div><div class='ctx'> 	if (hp-&gt;n_outbuf &gt; 0)</div><div class='ctx'> 		hvc_push(hp);</div><div class='add'>+</div><div class='ctx'> 	/* Reschedule us if still some write pending */</div><div class='ctx'> 	if (hp-&gt;n_outbuf &gt; 0)</div><div class='ctx'> 		poll_mask |= HVC_POLL_WRITE;</div><div class='hunk'>@@ -680,7 +679,7 @@ int khvcd(void *unused)</div><div class='ctx'> 			poll_mask |= HVC_POLL_READ;</div><div class='ctx'> 		if (hvc_kicked)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (poll_mask &amp; HVC_POLL_QUICK) {</div><div class='add'>+		if (poll_mask &amp; HVC_POLL_WRITE) {</div><div class='ctx'> 			yield();</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -820,7 +819,6 @@ int __init hvc_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	drv-&gt;owner = THIS_MODULE;</div><div class='del'>-	drv-&gt;devfs_name = "hvc/";</div><div class='ctx'> 	drv-&gt;driver_name = "hvc";</div><div class='ctx'> 	drv-&gt;name = "hvc";</div><div class='ctx'> 	drv-&gt;major = HVC_MAJOR;</div><div class='head'>diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c<br/>index 83364ea63cba..57106e02fd2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvc_rtas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvc_rtas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvc_rtas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hvc_rtas.c</a></div><div class='hunk'>@@ -41,37 +41,28 @@</div><div class='ctx'> #define hvc_rtas_cookie 0x67781e15</div><div class='ctx'> struct hvc_struct *hvc_rtas_dev;</div><div class='ctx'> </div><div class='del'>-#define RTASCONS_PUT_ATTEMPTS  16</div><div class='del'>-</div><div class='ctx'> static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE;</div><div class='ctx'> static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE;</div><div class='del'>-static int rtascons_put_delay = 100;</div><div class='del'>-module_param_named(put_delay, rtascons_put_delay, int, 0644);</div><div class='ctx'> </div><div class='del'>-static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf, int count)</div><div class='add'>+static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf,</div><div class='add'>+		int count)</div><div class='ctx'> {</div><div class='del'>-	int done;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* if there is more than one character to be displayed, wait a bit */</div><div class='del'>-	for (done = 0; done &lt; count; done++) {</div><div class='del'>-		int result;</div><div class='del'>-		result = rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[done]);</div><div class='del'>-		if (result)</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[i]))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	/* the calling routine expects to receive the number of bytes sent */</div><div class='del'>-	return done;</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, c;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		int c, err;</div><div class='del'>-</div><div class='del'>-		err = rtas_call(rtascons_get_char_token, 0, 2, &amp;c);</div><div class='del'>-		if (err)</div><div class='add'>+		if (rtas_call(rtascons_get_char_token, 0, 2, &amp;c))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		buf[i] = c;</div><div class='hunk'>@@ -106,7 +97,9 @@ static int hvc_rtas_init(void)</div><div class='ctx'> 	hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &amp;hvc_rtas_get_put_ops);</div><div class='ctx'> 	if (IS_ERR(hp))</div><div class='ctx'> 		return PTR_ERR(hp);</div><div class='add'>+</div><div class='ctx'> 	hvc_rtas_dev = hp;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> module_init(hvc_rtas_init);</div><div class='hunk'>@@ -114,8 +107,8 @@ module_init(hvc_rtas_init);</div><div class='ctx'> /* This will tear down the tty portion of the driver */</div><div class='ctx'> static void __exit hvc_rtas_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* Really the fun isn't over until the worker thread breaks down and the</div><div class='del'>-	 * tty cleans up */</div><div class='add'>+	/* Really the fun isn't over until the worker thread breaks down and</div><div class='add'>+	 * the tty cleans up */</div><div class='ctx'> 	if (hvc_rtas_dev)</div><div class='ctx'> 		hvc_remove(hvc_rtas_dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -127,12 +120,14 @@ static int hvc_rtas_console_init(void)</div><div class='ctx'> 	rtascons_put_char_token = rtas_token("put-term-char");</div><div class='ctx'> 	if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	rtascons_get_char_token = rtas_token("get-term-char");</div><div class='ctx'> 	if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	hvc_instantiate(hvc_rtas_cookie, 0, &amp;hvc_rtas_get_put_ops );</div><div class='add'>+	hvc_instantiate(hvc_rtas_cookie, 0, &amp;hvc_rtas_get_put_ops);</div><div class='ctx'> 	add_preferred_console("hvc", 0, NULL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> console_initcall(hvc_rtas_console_init);</div><div class='head'>diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c<br/>index 8d97b3911293..4589ff302b07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvcs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvcs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hvcs.c</a></div><div class='hunk'>@@ -899,7 +899,7 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,</div><div class='ctx'> 	 * the conn was registered and now.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(rc = request_irq(irq, &amp;hvcs_handle_interrupt,</div><div class='del'>-				SA_INTERRUPT, "ibmhvcs", hvcsd))) {</div><div class='add'>+				IRQF_DISABLED, "ibmhvcs", hvcsd))) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * It is possible the vty-server was removed after the irq was</div><div class='ctx'> 		 * requested but before we have time to enable interrupts.</div><div class='hunk'>@@ -1320,11 +1320,12 @@ static struct tty_operations hvcs_ops = {</div><div class='ctx'> static int hvcs_alloc_index_list(int n)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+</div><div class='ctx'> 	hvcs_index_list = kmalloc(n * sizeof(hvcs_index_count),GFP_KERNEL);</div><div class='ctx'> 	if (!hvcs_index_list)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	hvcs_index_count = n;</div><div class='del'>-	for(i = 0; i &lt; hvcs_index_count; i++)</div><div class='add'>+	for (i = 0; i &lt; hvcs_index_count; i++)</div><div class='ctx'> 		hvcs_index_list[i] = -1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1332,11 +1333,9 @@ static int hvcs_alloc_index_list(int n)</div><div class='ctx'> static void hvcs_free_index_list(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Paranoia check to be thorough. */</div><div class='del'>-	if (hvcs_index_list) {</div><div class='del'>-		kfree(hvcs_index_list);</div><div class='del'>-		hvcs_index_list = NULL;</div><div class='del'>-		hvcs_index_count = 0;</div><div class='del'>-	}</div><div class='add'>+	kfree(hvcs_index_list);</div><div class='add'>+	hvcs_index_list = NULL;</div><div class='add'>+	hvcs_index_count = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init hvcs_module_init(void)</div><div class='hunk'>@@ -1364,7 +1363,6 @@ static int __init hvcs_module_init(void)</div><div class='ctx'> </div><div class='ctx'> 	hvcs_tty_driver-&gt;driver_name = hvcs_driver_name;</div><div class='ctx'> 	hvcs_tty_driver-&gt;name = hvcs_device_node;</div><div class='del'>-	hvcs_tty_driver-&gt;devfs_name = hvcs_device_node;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We'll let the system assign us a major number, indicated by leaving</div><div class='head'>diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c<br/>index a9522189fc9e..41db8060e8f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hvsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hvsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hvsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hvsi.c</a></div><div class='hunk'>@@ -1154,7 +1154,6 @@ static int __init hvsi_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	hvsi_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	hvsi_driver-&gt;devfs_name = "hvsi/";</div><div class='ctx'> 	hvsi_driver-&gt;driver_name = "hvsi";</div><div class='ctx'> 	hvsi_driver-&gt;name = "hvsi";</div><div class='ctx'> 	hvsi_driver-&gt;major = HVSI_MAJOR;</div><div class='hunk'>@@ -1169,7 +1168,7 @@ static int __init hvsi_init(void)</div><div class='ctx'> 		struct hvsi_struct *hp = &amp;hvsi_ports[i];</div><div class='ctx'> 		int ret = 1;</div><div class='ctx'> </div><div class='del'>-		ret = request_irq(hp-&gt;virq, hvsi_interrupt, SA_INTERRUPT, "hvsi", hp);</div><div class='add'>+		ret = request_irq(hp-&gt;virq, hvsi_interrupt, IRQF_DISABLED, "hvsi", hp);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n",</div><div class='ctx'> 				hp-&gt;virq, ret);</div><div class='hunk'>@@ -1179,7 +1178,7 @@ static int __init hvsi_init(void)</div><div class='ctx'> 	if (tty_register_driver(hvsi_driver))</div><div class='ctx'> 		panic("Couldn't register hvsi console driver\n");</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "HVSI: registered %i devices\n", hvsi_count);</div><div class='add'>+	printk(KERN_DEBUG "HVSI: registered %i devices\n", hvsi_count);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1300,13 +1299,12 @@ static int __init hvsi_console_init(void)</div><div class='ctx'> 		hp-&gt;inbuf_end = hp-&gt;inbuf;</div><div class='ctx'> 		hp-&gt;state = HVSI_CLOSED;</div><div class='ctx'> 		hp-&gt;vtermno = *vtermno;</div><div class='del'>-		hp-&gt;virq = virt_irq_create_mapping(irq[0]);</div><div class='add'>+		hp-&gt;virq = irq_create_mapping(NULL, irq[0]);</div><div class='ctx'> 		if (hp-&gt;virq == NO_IRQ) {</div><div class='ctx'> 			printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",</div><div class='del'>-				__FUNCTION__, hp-&gt;virq);</div><div class='add'>+				__FUNCTION__, irq[0]);</div><div class='ctx'> 			continue;</div><div class='del'>-		} else</div><div class='del'>-			hp-&gt;virq = irq_offset_up(hp-&gt;virq);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		hvsi_count++;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/hw_random.c b/drivers/char/hw_random.c<br/>deleted file mode 100644<br/>index 29dc87e59020..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/hw_random.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/hw_random.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,698 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-        Added support for the AMD Geode LX RNG</div><div class='del'>-	(c) Copyright 2004-2005 Advanced Micro Devices, Inc.</div><div class='del'>-</div><div class='del'>-	derived from</div><div class='del'>-</div><div class='del'>- 	Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='del'>-	(c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='del'>- </div><div class='del'>- 	derived from</div><div class='del'>- </div><div class='del'>-        Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='del'>-        (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='del'>-</div><div class='del'>- 	derived from</div><div class='del'>- </div><div class='del'>-	Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='del'>-	Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-	Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='del'>-</div><div class='del'>-	Please read Documentation/hw_random.txt for details on use.</div><div class='del'>-</div><div class='del'>-	----------------------------------------------------------</div><div class='del'>-	This software may be used and distributed according to the terms</div><div class='del'>-        of the GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __i386__</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='del'>-#include &lt;asm/cpufeature.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * core module and version information</div><div class='del'>- */</div><div class='del'>-#define RNG_VERSION "1.0.0"</div><div class='del'>-#define RNG_MODULE_NAME "hw_random"</div><div class='del'>-#define RNG_DRIVER_NAME   RNG_MODULE_NAME " hardware driver " RNG_VERSION</div><div class='del'>-#define PFX RNG_MODULE_NAME ": "</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * debugging macros</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* pr_debug() collapses to a no-op if DEBUG is not defined */</div><div class='del'>-#define DPRINTK(fmt, args...) pr_debug(PFX "%s: " fmt, __FUNCTION__ , ## args)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#undef RNG_NDEBUG        /* define to enable lightweight runtime checks */</div><div class='del'>-#ifdef RNG_NDEBUG</div><div class='del'>-#define assert(expr)							\</div><div class='del'>-		if(!(expr)) {						\</div><div class='del'>-		printk(KERN_DEBUG PFX "Assertion failed! %s,%s,%s,"	\</div><div class='del'>-		"line=%d\n", #expr, __FILE__, __FUNCTION__, __LINE__);	\</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-#define assert(expr)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define RNG_MISCDEV_MINOR		183 /* official */</div><div class='del'>-</div><div class='del'>-static int rng_dev_open (struct inode *inode, struct file *filp);</div><div class='del'>-static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,</div><div class='del'>-				loff_t * offp);</div><div class='del'>-</div><div class='del'>-static int __init intel_init (struct pci_dev *dev);</div><div class='del'>-static void intel_cleanup(void);</div><div class='del'>-static unsigned int intel_data_present (void);</div><div class='del'>-static u32 intel_data_read (void);</div><div class='del'>-</div><div class='del'>-static int __init amd_init (struct pci_dev *dev);</div><div class='del'>-static void amd_cleanup(void);</div><div class='del'>-static unsigned int amd_data_present (void);</div><div class='del'>-static u32 amd_data_read (void);</div><div class='del'>-</div><div class='del'>-#ifdef __i386__</div><div class='del'>-static int __init via_init(struct pci_dev *dev);</div><div class='del'>-static void via_cleanup(void);</div><div class='del'>-static unsigned int via_data_present (void);</div><div class='del'>-static u32 via_data_read (void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init geode_init(struct pci_dev *dev);</div><div class='del'>-static void geode_cleanup(void);</div><div class='del'>-static unsigned int geode_data_present (void);</div><div class='del'>-static u32 geode_data_read (void);</div><div class='del'>-</div><div class='del'>-struct rng_operations {</div><div class='del'>-	int (*init) (struct pci_dev *dev);</div><div class='del'>-	void (*cleanup) (void);</div><div class='del'>-	unsigned int (*data_present) (void);</div><div class='del'>-	u32 (*data_read) (void);</div><div class='del'>-	unsigned int n_bytes; /* number of bytes per -&gt;data_read */</div><div class='del'>-};</div><div class='del'>-static struct rng_operations *rng_ops;</div><div class='del'>-</div><div class='del'>-static struct file_operations rng_chrdev_ops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= rng_dev_open,</div><div class='del'>-	.read		= rng_dev_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct miscdevice rng_miscdev = {</div><div class='del'>-	RNG_MISCDEV_MINOR,</div><div class='del'>-	RNG_MODULE_NAME,</div><div class='del'>-	&amp;rng_chrdev_ops,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	rng_hw_none,</div><div class='del'>-	rng_hw_intel,</div><div class='del'>-	rng_hw_amd,</div><div class='del'>-#ifdef __i386__</div><div class='del'>-	rng_hw_via,</div><div class='del'>-#endif</div><div class='del'>-	rng_hw_geode,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct rng_operations rng_vendor_ops[] = {</div><div class='del'>-	/* rng_hw_none */</div><div class='del'>-	{ },</div><div class='del'>-</div><div class='del'>-	/* rng_hw_intel */</div><div class='del'>-	{ intel_init, intel_cleanup, intel_data_present,</div><div class='del'>-	  intel_data_read, 1 },</div><div class='del'>-</div><div class='del'>-	/* rng_hw_amd */</div><div class='del'>-	{ amd_init, amd_cleanup, amd_data_present, amd_data_read, 4 },</div><div class='del'>-</div><div class='del'>-#ifdef __i386__</div><div class='del'>-	/* rng_hw_via */</div><div class='del'>-	{ via_init, via_cleanup, via_data_present, via_data_read, 1 },</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* rng_hw_geode */</div><div class='del'>-	{ geode_init, geode_cleanup, geode_data_present, geode_data_read, 4 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Data for PCI driver interface</div><div class='del'>- *</div><div class='del'>- * This data only exists for exporting the supported</div><div class='del'>- * PCI ids via MODULE_DEVICE_TABLE.  We do not actually</div><div class='del'>- * register a pci_driver, because someone else might one day</div><div class='del'>- * want to register another driver on the same PCI id.</div><div class='del'>- */</div><div class='del'>-static struct pci_device_id rng_pci_tbl[] = {</div><div class='del'>-	{ 0x1022, 0x7443, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_amd },</div><div class='del'>-	{ 0x1022, 0x746b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_amd },</div><div class='del'>-</div><div class='del'>-	{ 0x8086, 0x2418, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_intel },</div><div class='del'>-	{ 0x8086, 0x2428, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_intel },</div><div class='del'>-	{ 0x8086, 0x2430, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_intel },</div><div class='del'>-	{ 0x8086, 0x2448, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_intel },</div><div class='del'>-	{ 0x8086, 0x244e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_intel },</div><div class='del'>-	{ 0x8086, 0x245e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_intel },</div><div class='del'>-</div><div class='del'>-	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES,</div><div class='del'>-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, rng_hw_geode },</div><div class='del'>-</div><div class='del'>-	{ 0, },	/* terminate list */</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE (pci, rng_pci_tbl);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- *</div><div class='del'>- * Intel RNG operations</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RNG registers (offsets from rng_mem)</div><div class='del'>- */</div><div class='del'>-#define INTEL_RNG_HW_STATUS			0</div><div class='del'>-#define         INTEL_RNG_PRESENT		0x40</div><div class='del'>-#define         INTEL_RNG_ENABLED		0x01</div><div class='del'>-#define INTEL_RNG_STATUS			1</div><div class='del'>-#define         INTEL_RNG_DATA_PRESENT		0x01</div><div class='del'>-#define INTEL_RNG_DATA				2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Magic address at which Intel PCI bridges locate the RNG</div><div class='del'>- */</div><div class='del'>-#define INTEL_RNG_ADDR				0xFFBC015F</div><div class='del'>-#define INTEL_RNG_ADDR_LEN			3</div><div class='del'>-</div><div class='del'>-/* token to our ioremap'd RNG register area */</div><div class='del'>-static void __iomem *rng_mem;</div><div class='del'>-</div><div class='del'>-static inline u8 intel_hwstatus (void)</div><div class='del'>-{</div><div class='del'>-	assert (rng_mem != NULL);</div><div class='del'>-	return readb (rng_mem + INTEL_RNG_HW_STATUS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 intel_hwstatus_set (u8 hw_status)</div><div class='del'>-{</div><div class='del'>-	assert (rng_mem != NULL);</div><div class='del'>-	writeb (hw_status, rng_mem + INTEL_RNG_HW_STATUS);</div><div class='del'>-	return intel_hwstatus ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int intel_data_present(void)</div><div class='del'>-{</div><div class='del'>-	assert (rng_mem != NULL);</div><div class='del'>-</div><div class='del'>-	return (readb (rng_mem + INTEL_RNG_STATUS) &amp; INTEL_RNG_DATA_PRESENT) ?</div><div class='del'>-		1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 intel_data_read(void)</div><div class='del'>-{</div><div class='del'>-	assert (rng_mem != NULL);</div><div class='del'>-</div><div class='del'>-	return readb (rng_mem + INTEL_RNG_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init intel_init (struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	u8 hw_status;</div><div class='del'>-</div><div class='del'>-	DPRINTK ("ENTER\n");</div><div class='del'>-</div><div class='del'>-	rng_mem = ioremap (INTEL_RNG_ADDR, INTEL_RNG_ADDR_LEN);</div><div class='del'>-	if (rng_mem == NULL) {</div><div class='del'>-		printk (KERN_ERR PFX "cannot ioremap RNG Memory\n");</div><div class='del'>-		rc = -EBUSY;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for Intel 82802 */</div><div class='del'>-	hw_status = intel_hwstatus ();</div><div class='del'>-	if ((hw_status &amp; INTEL_RNG_PRESENT) == 0) {</div><div class='del'>-		printk (KERN_ERR PFX "RNG not detected\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto err_out_free_map;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* turn RNG h/w on, if it's off */</div><div class='del'>-	if ((hw_status &amp; INTEL_RNG_ENABLED) == 0)</div><div class='del'>-		hw_status = intel_hwstatus_set (hw_status | INTEL_RNG_ENABLED);</div><div class='del'>-	if ((hw_status &amp; INTEL_RNG_ENABLED) == 0) {</div><div class='del'>-		printk (KERN_ERR PFX "cannot enable RNG, aborting\n");</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		goto err_out_free_map;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DPRINTK ("EXIT, returning 0\n");</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out_free_map:</div><div class='del'>-	iounmap (rng_mem);</div><div class='del'>-	rng_mem = NULL;</div><div class='del'>-err_out:</div><div class='del'>-	DPRINTK ("EXIT, returning %d\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void intel_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	u8 hw_status;</div><div class='del'>-</div><div class='del'>-	hw_status = intel_hwstatus ();</div><div class='del'>-	if (hw_status &amp; INTEL_RNG_ENABLED)</div><div class='del'>-		intel_hwstatus_set (hw_status &amp; ~INTEL_RNG_ENABLED);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_WARNING PFX "unusual: RNG already disabled\n");</div><div class='del'>-	iounmap(rng_mem);</div><div class='del'>-	rng_mem = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- *</div><div class='del'>- * AMD RNG operations</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static u32 pmbase;			/* PMxx I/O base */</div><div class='del'>-static struct pci_dev *amd_dev;</div><div class='del'>-</div><div class='del'>-static unsigned int amd_data_present (void)</div><div class='del'>-{</div><div class='del'>-      	return inl(pmbase + 0xF4) &amp; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static u32 amd_data_read (void)</div><div class='del'>-{</div><div class='del'>-	return inl(pmbase + 0xF0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init amd_init (struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	u8 rnen;</div><div class='del'>-</div><div class='del'>-	DPRINTK ("ENTER\n");</div><div class='del'>-</div><div class='del'>-	pci_read_config_dword(dev, 0x58, &amp;pmbase);</div><div class='del'>-</div><div class='del'>-	pmbase &amp;= 0x0000FF00;</div><div class='del'>-</div><div class='del'>-	if (pmbase == 0)</div><div class='del'>-	{</div><div class='del'>-		printk (KERN_ERR PFX "power management base not set\n");</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(dev, 0x40, &amp;rnen);</div><div class='del'>-	rnen |= (1 &lt;&lt; 7);	/* RNG on */</div><div class='del'>-	pci_write_config_byte(dev, 0x40, rnen);</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(dev, 0x41, &amp;rnen);</div><div class='del'>-	rnen |= (1 &lt;&lt; 7);	/* PMIO enable */</div><div class='del'>-	pci_write_config_byte(dev, 0x41, rnen);</div><div class='del'>-</div><div class='del'>-	pr_info( PFX "AMD768 system management I/O registers at 0x%X.\n",</div><div class='del'>-			pmbase);</div><div class='del'>-</div><div class='del'>-	amd_dev = dev;</div><div class='del'>-</div><div class='del'>-	DPRINTK ("EXIT, returning 0\n");</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	DPRINTK ("EXIT, returning %d\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void amd_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	u8 rnen;</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(amd_dev, 0x40, &amp;rnen);</div><div class='del'>-	rnen &amp;= ~(1 &lt;&lt; 7);	/* RNG off */</div><div class='del'>-	pci_write_config_byte(amd_dev, 0x40, rnen);</div><div class='del'>-</div><div class='del'>-	/* FIXME: twiddle pmio, also? */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef __i386__</div><div class='del'>-/***********************************************************************</div><div class='del'>- *</div><div class='del'>- * VIA RNG operations</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	VIA_STRFILT_CNT_SHIFT	= 16,</div><div class='del'>-	VIA_STRFILT_FAIL	= (1 &lt;&lt; 15),</div><div class='del'>-	VIA_STRFILT_ENABLE	= (1 &lt;&lt; 14),</div><div class='del'>-	VIA_RAWBITS_ENABLE	= (1 &lt;&lt; 13),</div><div class='del'>-	VIA_RNG_ENABLE		= (1 &lt;&lt; 6),</div><div class='del'>-	VIA_XSTORE_CNT_MASK	= 0x0F,</div><div class='del'>-</div><div class='del'>-	VIA_RNG_CHUNK_8		= 0x00,	/* 64 rand bits, 64 stored bits */</div><div class='del'>-	VIA_RNG_CHUNK_4		= 0x01,	/* 32 rand bits, 32 stored bits */</div><div class='del'>-	VIA_RNG_CHUNK_4_MASK	= 0xFFFFFFFF,</div><div class='del'>-	VIA_RNG_CHUNK_2		= 0x02,	/* 16 rand bits, 32 stored bits */</div><div class='del'>-	VIA_RNG_CHUNK_2_MASK	= 0xFFFF,</div><div class='del'>-	VIA_RNG_CHUNK_1		= 0x03,	/* 8 rand bits, 32 stored bits */</div><div class='del'>-	VIA_RNG_CHUNK_1_MASK	= 0xFF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 via_rng_datum;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Investigate using the 'rep' prefix to obtain 32 bits of random data</div><div class='del'>- * in one insn.  The upside is potentially better performance.  The</div><div class='del'>- * downside is that the instruction becomes no longer atomic.  Due to</div><div class='del'>- * this, just like familiar issues with /dev/random itself, the worst</div><div class='del'>- * case of a 'rep xstore' could potentially pause a cpu for an</div><div class='del'>- * unreasonably long time.  In practice, this condition would likely</div><div class='del'>- * only occur when the hardware is failing.  (or so we hope :))</div><div class='del'>- *</div><div class='del'>- * Another possible performance boost may come from simply buffering</div><div class='del'>- * until we have 4 bytes, thus returning a u32 at a time,</div><div class='del'>- * instead of the current u8-at-a-time.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline u32 xstore(u32 *addr, u32 edx_in)</div><div class='del'>-{</div><div class='del'>-	u32 eax_out;</div><div class='del'>-</div><div class='del'>-	asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */"</div><div class='del'>-		:"=m"(*addr), "=a"(eax_out)</div><div class='del'>-		:"D"(addr), "d"(edx_in));</div><div class='del'>-</div><div class='del'>-	return eax_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int via_data_present(void)</div><div class='del'>-{</div><div class='del'>-	u32 bytes_out;</div><div class='del'>-</div><div class='del'>-	/* We choose the recommended 1-byte-per-instruction RNG rate,</div><div class='del'>-	 * for greater randomness at the expense of speed.  Larger</div><div class='del'>-	 * values 2, 4, or 8 bytes-per-instruction yield greater</div><div class='del'>-	 * speed at lesser randomness.</div><div class='del'>-	 *</div><div class='del'>-	 * If you change this to another VIA_CHUNK_n, you must also</div><div class='del'>-	 * change the -&gt;n_bytes values in rng_vendor_ops[] tables.</div><div class='del'>-	 * VIA_CHUNK_8 requires further code changes.</div><div class='del'>-	 *</div><div class='del'>-	 * A copy of MSR_VIA_RNG is placed in eax_out when xstore</div><div class='del'>-	 * completes.</div><div class='del'>-	 */</div><div class='del'>-	via_rng_datum = 0; /* paranoia, not really necessary */</div><div class='del'>-	bytes_out = xstore(&amp;via_rng_datum, VIA_RNG_CHUNK_1) &amp; VIA_XSTORE_CNT_MASK;</div><div class='del'>-	if (bytes_out == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 via_data_read(void)</div><div class='del'>-{</div><div class='del'>-	return via_rng_datum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init via_init(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u32 lo, hi, old_lo;</div><div class='del'>-</div><div class='del'>-	/* Control the RNG via MSR.  Tread lightly and pay very close</div><div class='del'>-	 * close attention to values written, as the reserved fields</div><div class='del'>-	 * are documented to be "undefined and unpredictable"; but it</div><div class='del'>-	 * does not say to write them as zero, so I make a guess that</div><div class='del'>-	 * we restore the values we find in the register.</div><div class='del'>-	 */</div><div class='del'>-	rdmsr(MSR_VIA_RNG, lo, hi);</div><div class='del'>-</div><div class='del'>-	old_lo = lo;</div><div class='del'>-	lo &amp;= ~(0x7f &lt;&lt; VIA_STRFILT_CNT_SHIFT);</div><div class='del'>-	lo &amp;= ~VIA_XSTORE_CNT_MASK;</div><div class='del'>-	lo &amp;= ~(VIA_STRFILT_ENABLE | VIA_STRFILT_FAIL | VIA_RAWBITS_ENABLE);</div><div class='del'>-	lo |= VIA_RNG_ENABLE;</div><div class='del'>-</div><div class='del'>-	if (lo != old_lo)</div><div class='del'>-		wrmsr(MSR_VIA_RNG, lo, hi);</div><div class='del'>-</div><div class='del'>-	/* perhaps-unnecessary sanity check; remove after testing if</div><div class='del'>-	   unneeded */</div><div class='del'>-	rdmsr(MSR_VIA_RNG, lo, hi);</div><div class='del'>-	if ((lo &amp; VIA_RNG_ENABLE) == 0) {</div><div class='del'>-		printk(KERN_ERR PFX "cannot enable VIA C3 RNG, aborting\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void via_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	/* do nothing */</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- *</div><div class='del'>- * AMD Geode RNG operations</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void __iomem *geode_rng_base = NULL;</div><div class='del'>-</div><div class='del'>-#define GEODE_RNG_DATA_REG   0x50</div><div class='del'>-#define GEODE_RNG_STATUS_REG 0x54</div><div class='del'>-</div><div class='del'>-static u32 geode_data_read(void)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	assert(geode_rng_base != NULL);</div><div class='del'>-	val = readl(geode_rng_base + GEODE_RNG_DATA_REG);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int geode_data_present(void)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	assert(geode_rng_base != NULL);</div><div class='del'>-	val = readl(geode_rng_base + GEODE_RNG_STATUS_REG);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void geode_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	iounmap(geode_rng_base);</div><div class='del'>-  	geode_rng_base = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int geode_init(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long rng_base = pci_resource_start(dev, 0);</div><div class='del'>-</div><div class='del'>-	if (rng_base == 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	geode_rng_base = ioremap(rng_base, 0x58);</div><div class='del'>-</div><div class='del'>-	if (geode_rng_base == NULL) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot ioremap RNG memory\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***********************************************************************</div><div class='del'>- *</div><div class='del'>- * /dev/hwrandom character device handling (major 10, minor 183)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int rng_dev_open (struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	/* enforce read-only access to this chrdev */</div><div class='del'>-	if ((filp-&gt;f_mode &amp; FMODE_READ) == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (filp-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,</div><div class='del'>-				loff_t * offp)</div><div class='del'>-{</div><div class='del'>-	static DEFINE_SPINLOCK(rng_lock);</div><div class='del'>-	unsigned int have_data;</div><div class='del'>-	u32 data = 0;</div><div class='del'>-	ssize_t ret = 0;</div><div class='del'>-</div><div class='del'>-	while (size) {</div><div class='del'>-		spin_lock(&amp;rng_lock);</div><div class='del'>-</div><div class='del'>-		have_data = 0;</div><div class='del'>-		if (rng_ops-&gt;data_present()) {</div><div class='del'>-			data = rng_ops-&gt;data_read();</div><div class='del'>-			have_data = rng_ops-&gt;n_bytes;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock (&amp;rng_lock);</div><div class='del'>-</div><div class='del'>-		while (have_data &amp;&amp; size) {</div><div class='del'>-			if (put_user((u8)data, buf++)) {</div><div class='del'>-				ret = ret ? : -EFAULT;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			size--;</div><div class='del'>-			ret++;</div><div class='del'>-			have_data--;</div><div class='del'>-			data&gt;&gt;=8;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (filp-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-			return ret ? : -EAGAIN;</div><div class='del'>-</div><div class='del'>-		if(need_resched())</div><div class='del'>-			schedule_timeout_interruptible(1);</div><div class='del'>-		else</div><div class='del'>-			udelay(200);	/* FIXME: We could poll for 250uS ?? */</div><div class='del'>-</div><div class='del'>-		if (signal_pending (current))</div><div class='del'>-			return ret ? : -ERESTARTSYS;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * rng_init_one - look for and attempt to init a single RNG</div><div class='del'>- */</div><div class='del'>-static int __init rng_init_one (struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	DPRINTK ("ENTER\n");</div><div class='del'>-</div><div class='del'>-	assert(rng_ops != NULL);</div><div class='del'>-</div><div class='del'>-	rc = rng_ops-&gt;init(dev);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	rc = misc_register (&amp;rng_miscdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		printk (KERN_ERR PFX "misc device register failed\n");</div><div class='del'>-		goto err_out_cleanup_hw;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DPRINTK ("EXIT, returning 0\n");</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out_cleanup_hw:</div><div class='del'>-	rng_ops-&gt;cleanup();</div><div class='del'>-err_out:</div><div class='del'>-	DPRINTK ("EXIT, returning %d\n", rc);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("The Linux Kernel team");</div><div class='del'>-MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * rng_init - initialize RNG module</div><div class='del'>- */</div><div class='del'>-static int __init rng_init (void)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	struct pci_dev *pdev = NULL;</div><div class='del'>-	const struct pci_device_id *ent;</div><div class='del'>-</div><div class='del'>-	DPRINTK ("ENTER\n");</div><div class='del'>-</div><div class='del'>-	/* Probe for Intel, AMD, Geode RNGs */</div><div class='del'>-	for_each_pci_dev(pdev) {</div><div class='del'>-		ent = pci_match_id(rng_pci_tbl, pdev);</div><div class='del'>-		if (ent) {</div><div class='del'>-			rng_ops = &amp;rng_vendor_ops[ent-&gt;driver_data];</div><div class='del'>-			goto match;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef __i386__</div><div class='del'>-	/* Probe for VIA RNG */</div><div class='del'>-	if (cpu_has_xstore) {</div><div class='del'>-		rng_ops = &amp;rng_vendor_ops[rng_hw_via];</div><div class='del'>-		pdev = NULL;</div><div class='del'>-		goto match;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	DPRINTK ("EXIT, returning -ENODEV\n");</div><div class='del'>-	return -ENODEV;</div><div class='del'>-</div><div class='del'>-match:</div><div class='del'>-	rc = rng_init_one (pdev);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	pr_info( RNG_DRIVER_NAME " loaded\n");</div><div class='del'>-</div><div class='del'>-	DPRINTK ("EXIT, returning 0\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * rng_init - shutdown RNG module</div><div class='del'>- */</div><div class='del'>-static void __exit rng_cleanup (void)</div><div class='del'>-{</div><div class='del'>-	DPRINTK ("ENTER\n");</div><div class='del'>-</div><div class='del'>-	misc_deregister (&amp;rng_miscdev);</div><div class='del'>-</div><div class='del'>-	if (rng_ops-&gt;cleanup)</div><div class='del'>-		rng_ops-&gt;cleanup();</div><div class='del'>-</div><div class='del'>-	DPRINTK ("EXIT\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init (rng_init);</div><div class='del'>-module_exit (rng_cleanup);</div><div class='head'>diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig<br/>new file mode 100644<br/>index 000000000000..9f7635f75178<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+#</div><div class='add'>+# Hardware Random Number Generator (RNG) configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config HW_RANDOM</div><div class='add'>+	bool "Hardware Random Number Generator Core support"</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  Hardware Random Number Generator Core infrastructure.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HW_RANDOM_INTEL</div><div class='add'>+	tristate "Intel HW Random Number Generator support"</div><div class='add'>+	depends on HW_RANDOM &amp;&amp; (X86 || IA64) &amp;&amp; PCI</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This driver provides kernel-side support for the Random Number</div><div class='add'>+	  Generator hardware found on Intel i8xx-based motherboards.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called intel-rng.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HW_RANDOM_AMD</div><div class='add'>+	tristate "AMD HW Random Number Generator support"</div><div class='add'>+	depends on HW_RANDOM &amp;&amp; X86 &amp;&amp; PCI</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This driver provides kernel-side support for the Random Number</div><div class='add'>+	  Generator hardware found on AMD 76x-based motherboards.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called amd-rng.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HW_RANDOM_GEODE</div><div class='add'>+	tristate "AMD Geode HW Random Number Generator support"</div><div class='add'>+	depends on HW_RANDOM &amp;&amp; X86 &amp;&amp; PCI</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This driver provides kernel-side support for the Random Number</div><div class='add'>+	  Generator hardware found on the AMD Geode LX.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called geode-rng.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HW_RANDOM_VIA</div><div class='add'>+	tristate "VIA HW Random Number Generator support"</div><div class='add'>+	depends on HW_RANDOM &amp;&amp; X86_32</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This driver provides kernel-side support for the Random Number</div><div class='add'>+	  Generator hardware found on VIA based motherboards.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called via-rng.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HW_RANDOM_IXP4XX</div><div class='add'>+	tristate "Intel IXP4xx NPU HW Random Number Generator support"</div><div class='add'>+	depends on HW_RANDOM &amp;&amp; ARCH_IXP4XX</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This driver provides kernel-side support for the Random</div><div class='add'>+	  Number Generator hardware found on the Intel IXP4xx NPU.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called ixp4xx-rng.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+config HW_RANDOM_OMAP</div><div class='add'>+	tristate "OMAP Random Number Generator support"</div><div class='add'>+	depends on HW_RANDOM &amp;&amp; (ARCH_OMAP16XX || ARCH_OMAP24XX)</div><div class='add'>+	default y</div><div class='add'>+ 	---help---</div><div class='add'>+ 	  This driver provides kernel-side support for the Random Number</div><div class='add'>+	  Generator hardware found on OMAP16xx and OMAP24xx multimedia</div><div class='add'>+	  processors.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called omap-rng.</div><div class='add'>+</div><div class='add'>+ 	  If unsure, say Y.</div><div class='head'>diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile<br/>new file mode 100644<br/>index 000000000000..e263ae96f940<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for HW Random Number Generator (RNG) device drivers.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_HW_RANDOM) += core.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM_INTEL) += intel-rng.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM_AMD) += amd-rng.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM_GEODE) += geode-rng.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM_VIA) += via-rng.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM_IXP4XX) += ixp4xx-rng.o</div><div class='add'>+obj-$(CONFIG_HW_RANDOM_OMAP) += omap-rng.o</div><div class='head'>diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c<br/>new file mode 100644<br/>index 000000000000..71e4e0f3fd54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/amd-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/amd-rng.c</a></div><div class='hunk'>@@ -0,0 +1,152 @@</div><div class='add'>+/*</div><div class='add'>+ * RNG driver for AMD RNGs</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * with the majority of the code coming from:</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='add'>+ * (c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='add'>+ * (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='add'>+ * Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+ * Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PFX	KBUILD_MODNAME ": "</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Data for PCI driver interface</div><div class='add'>+ *</div><div class='add'>+ * This data only exists for exporting the supported</div><div class='add'>+ * PCI ids via MODULE_DEVICE_TABLE.  We do not actually</div><div class='add'>+ * register a pci_driver, because someone else might one day</div><div class='add'>+ * want to register another driver on the same PCI id.</div><div class='add'>+ */</div><div class='add'>+static const struct pci_device_id pci_tbl[] = {</div><div class='add'>+	{ 0x1022, 0x7443, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0x1022, 0x746b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0, },	/* terminate list */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pci_tbl);</div><div class='add'>+</div><div class='add'>+static struct pci_dev *amd_pdev;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int amd_rng_data_present(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	u32 pmbase = (u32)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+      	return !!(inl(pmbase + 0xF4) &amp; 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amd_rng_data_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	u32 pmbase = (u32)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	*data = inl(pmbase + 0xF0);</div><div class='add'>+</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amd_rng_init(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	u8 rnen;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(amd_pdev, 0x40, &amp;rnen);</div><div class='add'>+	rnen |= (1 &lt;&lt; 7);	/* RNG on */</div><div class='add'>+	pci_write_config_byte(amd_pdev, 0x40, rnen);</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(amd_pdev, 0x41, &amp;rnen);</div><div class='add'>+	rnen |= (1 &lt;&lt; 7);	/* PMIO enable */</div><div class='add'>+	pci_write_config_byte(amd_pdev, 0x41, rnen);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amd_rng_cleanup(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	u8 rnen;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(amd_pdev, 0x40, &amp;rnen);</div><div class='add'>+	rnen &amp;= ~(1 &lt;&lt; 7);	/* RNG off */</div><div class='add'>+	pci_write_config_byte(amd_pdev, 0x40, rnen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct hwrng amd_rng = {</div><div class='add'>+	.name		= "amd",</div><div class='add'>+	.init		= amd_rng_init,</div><div class='add'>+	.cleanup	= amd_rng_cleanup,</div><div class='add'>+	.data_present	= amd_rng_data_present,</div><div class='add'>+	.data_read	= amd_rng_data_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = -ENODEV;</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	const struct pci_device_id *ent;</div><div class='add'>+	u32 pmbase;</div><div class='add'>+</div><div class='add'>+	for_each_pci_dev(pdev) {</div><div class='add'>+		ent = pci_match_id(pci_tbl, pdev);</div><div class='add'>+		if (ent)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	/* Device not found. */</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+found:</div><div class='add'>+	err = pci_read_config_dword(pdev, 0x58, &amp;pmbase);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = -EIO;</div><div class='add'>+	pmbase &amp;= 0x0000FF00;</div><div class='add'>+	if (pmbase == 0)</div><div class='add'>+		goto out;</div><div class='add'>+	amd_rng.priv = (unsigned long)pmbase;</div><div class='add'>+	amd_pdev = pdev;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "AMD768 RNG detected\n");</div><div class='add'>+	err = hwrng_register(&amp;amd_rng);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "RNG registering failed (%d)\n",</div><div class='add'>+		       err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	hwrng_unregister(&amp;amd_rng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(mod_init);</div><div class='add'>+module_exit(mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("The Linux Kernel team");</div><div class='add'>+MODULE_DESCRIPTION("H/W RNG driver for AMD chipsets");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c<br/>new file mode 100644<br/>index 000000000000..154a81d328c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/core.c</a></div><div class='hunk'>@@ -0,0 +1,354 @@</div><div class='add'>+/*</div><div class='add'>+        Added support for the AMD Geode LX RNG</div><div class='add'>+	(c) Copyright 2004-2005 Advanced Micro Devices, Inc.</div><div class='add'>+</div><div class='add'>+	derived from</div><div class='add'>+</div><div class='add'>+ 	Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='add'>+	(c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='add'>+</div><div class='add'>+ 	derived from</div><div class='add'>+</div><div class='add'>+        Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='add'>+        (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='add'>+</div><div class='add'>+ 	derived from</div><div class='add'>+</div><div class='add'>+	Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='add'>+	Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+	Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='add'>+</div><div class='add'>+	Added generic RNG API</div><div class='add'>+	Copyright 2006 Michael Buesch &lt;mbuesch@freenet.de&gt;</div><div class='add'>+	Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+</div><div class='add'>+	Please read Documentation/hw_random.txt for details on use.</div><div class='add'>+</div><div class='add'>+	----------------------------------------------------------</div><div class='add'>+	This software may be used and distributed according to the terms</div><div class='add'>+        of the GNU General Public License, incorporated herein by reference.</div><div class='add'>+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define RNG_MODULE_NAME		"hw_random"</div><div class='add'>+#define PFX			RNG_MODULE_NAME ": "</div><div class='add'>+#define RNG_MISCDEV_MINOR	183 /* official */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct hwrng *current_rng;</div><div class='add'>+static LIST_HEAD(rng_list);</div><div class='add'>+static DEFINE_MUTEX(rng_mutex);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline int hwrng_init(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	if (!rng-&gt;init)</div><div class='add'>+		return 0;</div><div class='add'>+	return rng-&gt;init(rng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hwrng_cleanup(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	if (rng &amp;&amp; rng-&gt;cleanup)</div><div class='add'>+		rng-&gt;cleanup(rng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int hwrng_data_present(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	if (!rng-&gt;data_present)</div><div class='add'>+		return 1;</div><div class='add'>+	return rng-&gt;data_present(rng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int hwrng_data_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	return rng-&gt;data_read(rng, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int rng_dev_open(struct inode *inode, struct file *filp)</div><div class='add'>+{</div><div class='add'>+	/* enforce read-only access to this chrdev */</div><div class='add'>+	if ((filp-&gt;f_mode &amp; FMODE_READ) == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (filp-&gt;f_mode &amp; FMODE_WRITE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t rng_dev_read(struct file *filp, char __user *buf,</div><div class='add'>+			    size_t size, loff_t *offp)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+	int data_present;</div><div class='add'>+	int bytes_read;</div><div class='add'>+</div><div class='add'>+	while (size) {</div><div class='add'>+		err = -ERESTARTSYS;</div><div class='add'>+		if (mutex_lock_interruptible(&amp;rng_mutex))</div><div class='add'>+			goto out;</div><div class='add'>+		if (!current_rng) {</div><div class='add'>+			mutex_unlock(&amp;rng_mutex);</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (filp-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+			data_present = hwrng_data_present(current_rng);</div><div class='add'>+		} else {</div><div class='add'>+			/* Some RNG require some time between data_reads to gather</div><div class='add'>+			 * new entropy. Poll it.</div><div class='add'>+			 */</div><div class='add'>+			for (i = 0; i &lt; 20; i++) {</div><div class='add'>+				data_present = hwrng_data_present(current_rng);</div><div class='add'>+				if (data_present)</div><div class='add'>+					break;</div><div class='add'>+				udelay(10);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		bytes_read = 0;</div><div class='add'>+		if (data_present)</div><div class='add'>+			bytes_read = hwrng_data_read(current_rng, &amp;data);</div><div class='add'>+		mutex_unlock(&amp;rng_mutex);</div><div class='add'>+</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+		if (!bytes_read &amp;&amp; (filp-&gt;f_flags &amp; O_NONBLOCK))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		while (bytes_read &amp;&amp; size) {</div><div class='add'>+			if (put_user((u8)data, buf++))</div><div class='add'>+				goto out;</div><div class='add'>+			size--;</div><div class='add'>+			ret++;</div><div class='add'>+			bytes_read--;</div><div class='add'>+			data &gt;&gt;= 8;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (need_resched())</div><div class='add'>+			schedule_timeout_interruptible(1);</div><div class='add'>+		err = -ERESTARTSYS;</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret ? : err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct file_operations rng_chrdev_ops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.open		= rng_dev_open,</div><div class='add'>+	.read		= rng_dev_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct miscdevice rng_miscdev = {</div><div class='add'>+	.minor		= RNG_MISCDEV_MINOR,</div><div class='add'>+	.name		= RNG_MODULE_NAME,</div><div class='add'>+	.fops		= &amp;rng_chrdev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t hwrng_attr_current_store(struct class_device *class,</div><div class='add'>+					const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct hwrng *rng;</div><div class='add'>+</div><div class='add'>+	err = mutex_lock_interruptible(&amp;rng_mutex);</div><div class='add'>+	if (err)</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	list_for_each_entry(rng, &amp;rng_list, list) {</div><div class='add'>+		if (strcmp(rng-&gt;name, buf) == 0) {</div><div class='add'>+			if (rng == current_rng) {</div><div class='add'>+				err = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			err = hwrng_init(rng);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			hwrng_cleanup(current_rng);</div><div class='add'>+			current_rng = rng;</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;rng_mutex);</div><div class='add'>+</div><div class='add'>+	return err ? : len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hwrng_attr_current_show(struct class_device *class,</div><div class='add'>+				       char *buf)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+	const char *name = "none";</div><div class='add'>+</div><div class='add'>+	err = mutex_lock_interruptible(&amp;rng_mutex);</div><div class='add'>+	if (err)</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+	if (current_rng)</div><div class='add'>+		name = current_rng-&gt;name;</div><div class='add'>+	ret = snprintf(buf, PAGE_SIZE, "%s\n", name);</div><div class='add'>+	mutex_unlock(&amp;rng_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hwrng_attr_available_show(struct class_device *class,</div><div class='add'>+					 char *buf)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+	struct hwrng *rng;</div><div class='add'>+</div><div class='add'>+	err = mutex_lock_interruptible(&amp;rng_mutex);</div><div class='add'>+	if (err)</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+	buf[0] = '\0';</div><div class='add'>+	list_for_each_entry(rng, &amp;rng_list, list) {</div><div class='add'>+		strncat(buf, rng-&gt;name, PAGE_SIZE - ret - 1);</div><div class='add'>+		ret += strlen(rng-&gt;name);</div><div class='add'>+		strncat(buf, " ", PAGE_SIZE - ret - 1);</div><div class='add'>+		ret++;</div><div class='add'>+	}</div><div class='add'>+	strncat(buf, "\n", PAGE_SIZE - ret - 1);</div><div class='add'>+	ret++;</div><div class='add'>+	mutex_unlock(&amp;rng_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static CLASS_DEVICE_ATTR(rng_current, S_IRUGO | S_IWUSR,</div><div class='add'>+			 hwrng_attr_current_show,</div><div class='add'>+			 hwrng_attr_current_store);</div><div class='add'>+static CLASS_DEVICE_ATTR(rng_available, S_IRUGO,</div><div class='add'>+			 hwrng_attr_available_show,</div><div class='add'>+			 NULL);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void unregister_miscdev(void)</div><div class='add'>+{</div><div class='add'>+	class_device_remove_file(rng_miscdev.class,</div><div class='add'>+				 &amp;class_device_attr_rng_available);</div><div class='add'>+	class_device_remove_file(rng_miscdev.class,</div><div class='add'>+				 &amp;class_device_attr_rng_current);</div><div class='add'>+	misc_deregister(&amp;rng_miscdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int register_miscdev(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = misc_register(&amp;rng_miscdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+	err = class_device_create_file(rng_miscdev.class,</div><div class='add'>+				       &amp;class_device_attr_rng_current);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_misc_dereg;</div><div class='add'>+	err = class_device_create_file(rng_miscdev.class,</div><div class='add'>+				       &amp;class_device_attr_rng_available);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_remove_current;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_remove_current:</div><div class='add'>+	class_device_remove_file(rng_miscdev.class,</div><div class='add'>+				 &amp;class_device_attr_rng_current);</div><div class='add'>+err_misc_dereg:</div><div class='add'>+	misc_deregister(&amp;rng_miscdev);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hwrng_register(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	int must_register_misc;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	struct hwrng *old_rng, *tmp;</div><div class='add'>+</div><div class='add'>+	if (rng-&gt;name == NULL ||</div><div class='add'>+	    rng-&gt;data_read == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rng_mutex);</div><div class='add'>+</div><div class='add'>+	/* Must not register two RNGs with the same name. */</div><div class='add'>+	err = -EEXIST;</div><div class='add'>+	list_for_each_entry(tmp, &amp;rng_list, list) {</div><div class='add'>+		if (strcmp(tmp-&gt;name, rng-&gt;name) == 0)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	must_register_misc = (current_rng == NULL);</div><div class='add'>+	old_rng = current_rng;</div><div class='add'>+	if (!old_rng) {</div><div class='add'>+		err = hwrng_init(rng);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		current_rng = rng;</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+	if (must_register_misc) {</div><div class='add'>+		err = register_miscdev();</div><div class='add'>+		if (err) {</div><div class='add'>+			if (!old_rng) {</div><div class='add'>+				hwrng_cleanup(rng);</div><div class='add'>+				current_rng = NULL;</div><div class='add'>+			}</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	INIT_LIST_HEAD(&amp;rng-&gt;list);</div><div class='add'>+	list_add_tail(&amp;rng-&gt;list, &amp;rng_list);</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;rng_mutex);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hwrng_register);</div><div class='add'>+</div><div class='add'>+void hwrng_unregister(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rng_mutex);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;rng-&gt;list);</div><div class='add'>+	if (current_rng == rng) {</div><div class='add'>+		hwrng_cleanup(rng);</div><div class='add'>+		if (list_empty(&amp;rng_list)) {</div><div class='add'>+			current_rng = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			current_rng = list_entry(rng_list.prev, struct hwrng, list);</div><div class='add'>+			err = hwrng_init(current_rng);</div><div class='add'>+			if (err)</div><div class='add'>+				current_rng = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (list_empty(&amp;rng_list))</div><div class='add'>+		unregister_miscdev();</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;rng_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hwrng_unregister);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c<br/>new file mode 100644<br/>index 000000000000..be61f22ee7bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/geode-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/geode-rng.c</a></div><div class='hunk'>@@ -0,0 +1,128 @@</div><div class='add'>+/*</div><div class='add'>+ * RNG driver for AMD Geode RNGs</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * with the majority of the code coming from:</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='add'>+ * (c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='add'>+ * (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='add'>+ * Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+ * Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PFX	KBUILD_MODNAME ": "</div><div class='add'>+</div><div class='add'>+#define GEODE_RNG_DATA_REG   0x50</div><div class='add'>+#define GEODE_RNG_STATUS_REG 0x54</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Data for PCI driver interface</div><div class='add'>+ *</div><div class='add'>+ * This data only exists for exporting the supported</div><div class='add'>+ * PCI ids via MODULE_DEVICE_TABLE.  We do not actually</div><div class='add'>+ * register a pci_driver, because someone else might one day</div><div class='add'>+ * want to register another driver on the same PCI id.</div><div class='add'>+ */</div><div class='add'>+static const struct pci_device_id pci_tbl[] = {</div><div class='add'>+	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES,</div><div class='add'>+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0, },	/* terminate list */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pci_tbl);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int geode_rng_data_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	*data = readl(mem + GEODE_RNG_DATA_REG);</div><div class='add'>+</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int geode_rng_data_present(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return !!(readl(mem + GEODE_RNG_STATUS_REG));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct hwrng geode_rng = {</div><div class='add'>+	.name		= "geode",</div><div class='add'>+	.data_present	= geode_rng_data_present,</div><div class='add'>+	.data_read	= geode_rng_data_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = -ENODEV;</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	const struct pci_device_id *ent;</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+	unsigned long rng_base;</div><div class='add'>+</div><div class='add'>+	for_each_pci_dev(pdev) {</div><div class='add'>+		ent = pci_match_id(pci_tbl, pdev);</div><div class='add'>+		if (ent)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	/* Device not found. */</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+found:</div><div class='add'>+	rng_base = pci_resource_start(pdev, 0);</div><div class='add'>+	if (rng_base == 0)</div><div class='add'>+		goto out;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	mem = ioremap(rng_base, 0x58);</div><div class='add'>+	if (!mem)</div><div class='add'>+		goto out;</div><div class='add'>+	geode_rng.priv = (unsigned long)mem;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "AMD Geode RNG detected\n");</div><div class='add'>+	err = hwrng_register(&amp;geode_rng);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "RNG registering failed (%d)\n",</div><div class='add'>+		       err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)geode_rng.priv;</div><div class='add'>+</div><div class='add'>+	hwrng_unregister(&amp;geode_rng);</div><div class='add'>+	iounmap(mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(mod_init);</div><div class='add'>+module_exit(mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("H/W RNG driver for AMD Geode LX CPUs");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c<br/>new file mode 100644<br/>index 000000000000..6594bd5645f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/intel-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/intel-rng.c</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+/*</div><div class='add'>+ * RNG driver for Intel RNGs</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * with the majority of the code coming from:</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='add'>+ * (c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='add'>+ * (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='add'>+ * Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+ * Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PFX	KBUILD_MODNAME ": "</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RNG registers</div><div class='add'>+ */</div><div class='add'>+#define INTEL_RNG_HW_STATUS			0</div><div class='add'>+#define         INTEL_RNG_PRESENT		0x40</div><div class='add'>+#define         INTEL_RNG_ENABLED		0x01</div><div class='add'>+#define INTEL_RNG_STATUS			1</div><div class='add'>+#define         INTEL_RNG_DATA_PRESENT		0x01</div><div class='add'>+#define INTEL_RNG_DATA				2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Magic address at which Intel PCI bridges locate the RNG</div><div class='add'>+ */</div><div class='add'>+#define INTEL_RNG_ADDR				0xFFBC015F</div><div class='add'>+#define INTEL_RNG_ADDR_LEN			3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Data for PCI driver interface</div><div class='add'>+ *</div><div class='add'>+ * This data only exists for exporting the supported</div><div class='add'>+ * PCI ids via MODULE_DEVICE_TABLE.  We do not actually</div><div class='add'>+ * register a pci_driver, because someone else might one day</div><div class='add'>+ * want to register another driver on the same PCI id.</div><div class='add'>+ */</div><div class='add'>+static const struct pci_device_id pci_tbl[] = {</div><div class='add'>+	{ 0x8086, 0x2418, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0x8086, 0x2428, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0x8086, 0x2430, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0x8086, 0x2448, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0x8086, 0x244e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0x8086, 0x245e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },</div><div class='add'>+	{ 0, },	/* terminate list */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pci_tbl);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline u8 hwstatus_get(void __iomem *mem)</div><div class='add'>+{</div><div class='add'>+	return readb(mem + INTEL_RNG_HW_STATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 hwstatus_set(void __iomem *mem,</div><div class='add'>+			      u8 hw_status)</div><div class='add'>+{</div><div class='add'>+	writeb(hw_status, mem + INTEL_RNG_HW_STATUS);</div><div class='add'>+	return hwstatus_get(mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_rng_data_present(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return !!(readb(mem + INTEL_RNG_STATUS) &amp; INTEL_RNG_DATA_PRESENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_rng_data_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	*data = readb(mem + INTEL_RNG_DATA);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_rng_init(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)rng-&gt;priv;</div><div class='add'>+	u8 hw_status;</div><div class='add'>+	int err = -EIO;</div><div class='add'>+</div><div class='add'>+	hw_status = hwstatus_get(mem);</div><div class='add'>+	/* turn RNG h/w on, if it's off */</div><div class='add'>+	if ((hw_status &amp; INTEL_RNG_ENABLED) == 0)</div><div class='add'>+		hw_status = hwstatus_set(mem, hw_status | INTEL_RNG_ENABLED);</div><div class='add'>+	if ((hw_status &amp; INTEL_RNG_ENABLED) == 0) {</div><div class='add'>+		printk(KERN_ERR PFX "cannot enable RNG, aborting\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	err = 0;</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_rng_cleanup(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)rng-&gt;priv;</div><div class='add'>+	u8 hw_status;</div><div class='add'>+</div><div class='add'>+	hw_status = hwstatus_get(mem);</div><div class='add'>+	if (hw_status &amp; INTEL_RNG_ENABLED)</div><div class='add'>+		hwstatus_set(mem, hw_status &amp; ~INTEL_RNG_ENABLED);</div><div class='add'>+	else</div><div class='add'>+		printk(KERN_WARNING PFX "unusual: RNG already disabled\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct hwrng intel_rng = {</div><div class='add'>+	.name		= "intel",</div><div class='add'>+	.init		= intel_rng_init,</div><div class='add'>+	.cleanup	= intel_rng_cleanup,</div><div class='add'>+	.data_present	= intel_rng_data_present,</div><div class='add'>+	.data_read	= intel_rng_data_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = -ENODEV;</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+	u8 hw_status;</div><div class='add'>+</div><div class='add'>+	if (!pci_dev_present(pci_tbl))</div><div class='add'>+		goto out; /* Device not found. */</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	mem = ioremap(INTEL_RNG_ADDR, INTEL_RNG_ADDR_LEN);</div><div class='add'>+	if (!mem)</div><div class='add'>+		goto out;</div><div class='add'>+	intel_rng.priv = (unsigned long)mem;</div><div class='add'>+</div><div class='add'>+	/* Check for Intel 82802 */</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	hw_status = hwstatus_get(mem);</div><div class='add'>+	if ((hw_status &amp; INTEL_RNG_PRESENT) == 0)</div><div class='add'>+		goto err_unmap;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Intel 82802 RNG detected\n");</div><div class='add'>+	err = hwrng_register(&amp;intel_rng);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "RNG registering failed (%d)\n",</div><div class='add'>+		       err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_unmap:</div><div class='add'>+	iounmap(mem);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mem = (void __iomem *)intel_rng.priv;</div><div class='add'>+</div><div class='add'>+	hwrng_unregister(&amp;intel_rng);</div><div class='add'>+	iounmap(mem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(mod_init);</div><div class='add'>+module_exit(mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("H/W RNG driver for Intel chipsets");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c<br/>new file mode 100644<br/>index 000000000000..ef71022423c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/ixp4xx-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/ixp4xx-rng.c</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/char/rng/ixp4xx-rng.c</div><div class='add'>+ *</div><div class='add'>+ * RNG driver for Intel IXP4xx family of NPUs</div><div class='add'>+ *</div><div class='add'>+ * Author: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Fixes by Michael Buesch</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ixp4xx_rng_data_read(struct hwrng *rng, u32 *buffer)</div><div class='add'>+{</div><div class='add'>+	void __iomem * rng_base = (void __iomem *)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	*buffer = __raw_readl(rng_base);</div><div class='add'>+</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hwrng ixp4xx_rng_ops = {</div><div class='add'>+	.name		= "ixp4xx",</div><div class='add'>+	.data_read	= ixp4xx_rng_data_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ixp4xx_rng_init(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem * rng_base;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rng_base = ioremap(0x70002100, 4);</div><div class='add'>+	if (!rng_base)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ixp4xx_rng_ops.priv = (unsigned long)rng_base;</div><div class='add'>+	err = hwrng_register(&amp;ixp4xx_rng_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		iounmap(rng_base);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ixp4xx_rng_exit(void)</div><div class='add'>+{</div><div class='add'>+	void __iomem * rng_base = (void __iomem *)ixp4xx_rng_ops.priv;</div><div class='add'>+</div><div class='add'>+	hwrng_unregister(&amp;ixp4xx_rng_ops);</div><div class='add'>+	iounmap(rng_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(ixp4xx_rng_init);</div><div class='add'>+module_exit(ixp4xx_rng_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Deepak Saxena &lt;dsaxena@plexity.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver for IXP4xx");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c<br/>new file mode 100644<br/>index 000000000000..819516b35a79<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/omap-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/omap-rng.c</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+/*</div><div class='add'>+ * driver/char/hw_random/omap-rng.c</div><div class='add'>+ *</div><div class='add'>+ * RNG driver for TI OMAP CPU family</div><div class='add'>+ *</div><div class='add'>+ * Author: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Mostly based on original driver:</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 Nokia Corporation</div><div class='add'>+ * Author: Juha Yrj��&lt;juha.yrjola@nokia.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ *</div><div class='add'>+ * TODO:</div><div class='add'>+ *</div><div class='add'>+ * - Make status updated be interrupt driven so we don't poll</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware/clock.h&gt;</div><div class='add'>+</div><div class='add'>+#define RNG_OUT_REG		0x00		/* Output register */</div><div class='add'>+#define RNG_STAT_REG		0x04		/* Status register</div><div class='add'>+							[0] = STAT_BUSY */</div><div class='add'>+#define RNG_ALARM_REG		0x24		/* Alarm register</div><div class='add'>+							[7:0] = ALARM_COUNTER */</div><div class='add'>+#define RNG_CONFIG_REG		0x28		/* Configuration register</div><div class='add'>+							[11:6] = RESET_COUNT</div><div class='add'>+							[5:3]  = RING2_DELAY</div><div class='add'>+							[2:0]  = RING1_DELAY */</div><div class='add'>+#define RNG_REV_REG		0x3c		/* Revision register</div><div class='add'>+							[7:0] = REV_NB */</div><div class='add'>+#define RNG_MASK_REG		0x40		/* Mask and reset register</div><div class='add'>+							[2] = IT_EN</div><div class='add'>+							[1] = SOFTRESET</div><div class='add'>+							[0] = AUTOIDLE */</div><div class='add'>+#define RNG_SYSSTATUS		0x44		/* System status</div><div class='add'>+							[0] = RESETDONE */</div><div class='add'>+</div><div class='add'>+static void __iomem *rng_base;</div><div class='add'>+static struct clk *rng_ick;</div><div class='add'>+static struct device *rng_dev;</div><div class='add'>+</div><div class='add'>+static u32 omap_rng_read_reg(int reg)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(rng_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void omap_rng_write_reg(int reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	__raw_writel(val, rng_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* REVISIT: Does the status bit really work on 16xx? */</div><div class='add'>+static int omap_rng_data_present(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	return omap_rng_read_reg(RNG_STAT_REG) ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int omap_rng_data_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	*data = omap_rng_read_reg(RNG_OUT_REG);</div><div class='add'>+</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hwrng omap_rng_ops = {</div><div class='add'>+	.name		= "omap",</div><div class='add'>+	.data_present	= omap_rng_data_present,</div><div class='add'>+	.data_read	= omap_rng_data_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init omap_rng_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct resource *res, *mem;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A bit ugly, and it will never actually happen but there can</div><div class='add'>+	 * be only one RNG and this catches any bork</div><div class='add'>+	 */</div><div class='add'>+	BUG_ON(rng_dev);</div><div class='add'>+</div><div class='add'>+    	if (cpu_is_omap24xx()) {</div><div class='add'>+		rng_ick = clk_get(NULL, "rng_ick");</div><div class='add'>+		if (IS_ERR(rng_ick)) {</div><div class='add'>+			dev_err(dev, "Could not get rng_ick\n");</div><div class='add'>+			ret = PTR_ERR(rng_ick);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		else {</div><div class='add'>+			clk_use(rng_ick);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	mem = request_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1,</div><div class='add'>+				 pdev-&gt;name);</div><div class='add'>+	if (mem == NULL)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, mem);</div><div class='add'>+	rng_base = (u32 __iomem *)io_p2v(res-&gt;start);</div><div class='add'>+</div><div class='add'>+	ret = hwrng_register(&amp;omap_rng_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		release_resource(mem);</div><div class='add'>+		rng_base = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "OMAP Random Number Generator ver. %02x\n",</div><div class='add'>+		omap_rng_read_reg(RNG_REV_REG));</div><div class='add'>+	omap_rng_write_reg(RNG_MASK_REG, 0x1);</div><div class='add'>+</div><div class='add'>+	rng_dev = dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __exit omap_rng_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct resource *mem = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	hwrng_unregister(&amp;omap_rng_ops);</div><div class='add'>+</div><div class='add'>+	omap_rng_write_reg(RNG_MASK_REG, 0x0);</div><div class='add'>+</div><div class='add'>+	if (cpu_is_omap24xx()) {</div><div class='add'>+		clk_unuse(rng_ick);</div><div class='add'>+		clk_put(rng_ick);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_resource(mem);</div><div class='add'>+	rng_base = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int omap_rng_suspend(struct device *dev, pm_message_t message, u32 level)</div><div class='add'>+{</div><div class='add'>+	omap_rng_write_reg(RNG_MASK_REG, 0x0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int omap_rng_resume(struct device *dev, pm_message_t message, u32 level)</div><div class='add'>+{</div><div class='add'>+	omap_rng_write_reg(RNG_MASK_REG, 0x1);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define	omap_rng_suspend	NULL</div><div class='add'>+#define	omap_rng_resume		NULL</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct device_driver omap_rng_driver = {</div><div class='add'>+	.name		= "omap_rng",</div><div class='add'>+	.bus		= &amp;platform_bus_type,</div><div class='add'>+	.probe		= omap_rng_probe,</div><div class='add'>+	.remove		= __exit_p(omap_rng_remove),</div><div class='add'>+	.suspend	= omap_rng_suspend,</div><div class='add'>+	.resume		= omap_rng_resume</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init omap_rng_init(void)</div><div class='add'>+{</div><div class='add'>+	if (!cpu_is_omap16xx() &amp;&amp; !cpu_is_omap24xx())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return driver_register(&amp;omap_rng_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit omap_rng_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;omap_rng_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(omap_rng_init);</div><div class='add'>+module_exit(omap_rng_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Deepak Saxena (and others)");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c<br/>new file mode 100644<br/>index 000000000000..0e786b617bb8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/hw_random/via-rng.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/hw_random/via-rng.c</a></div><div class='hunk'>@@ -0,0 +1,183 @@</div><div class='add'>+/*</div><div class='add'>+ * RNG driver for VIA RNGs</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * with the majority of the code coming from:</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the Intel/AMD/VIA Random Number Generators (RNG)</div><div class='add'>+ * (c) Copyright 2003 Red Hat Inc &lt;jgarzik@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for the AMD 768 Random Number Generator (RNG)</div><div class='add'>+ * (c) Copyright 2001 Red Hat Inc &lt;alan@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * derived from</div><div class='add'>+ *</div><div class='add'>+ * Hardware driver for Intel i810 Random Number Generator (RNG)</div><div class='add'>+ * Copyright 2000,2001 Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+ * Copyright 2000,2001 Philipp Rumpf &lt;prumpf@mandrakesoft.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under  the terms of the GNU General Public</div><div class='add'>+ * License version 2. This program is licensed "as is" without any</div><div class='add'>+ * warranty of any kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define PFX	KBUILD_MODNAME ": "</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	VIA_STRFILT_CNT_SHIFT	= 16,</div><div class='add'>+	VIA_STRFILT_FAIL	= (1 &lt;&lt; 15),</div><div class='add'>+	VIA_STRFILT_ENABLE	= (1 &lt;&lt; 14),</div><div class='add'>+	VIA_RAWBITS_ENABLE	= (1 &lt;&lt; 13),</div><div class='add'>+	VIA_RNG_ENABLE		= (1 &lt;&lt; 6),</div><div class='add'>+	VIA_XSTORE_CNT_MASK	= 0x0F,</div><div class='add'>+</div><div class='add'>+	VIA_RNG_CHUNK_8		= 0x00,	/* 64 rand bits, 64 stored bits */</div><div class='add'>+	VIA_RNG_CHUNK_4		= 0x01,	/* 32 rand bits, 32 stored bits */</div><div class='add'>+	VIA_RNG_CHUNK_4_MASK	= 0xFFFFFFFF,</div><div class='add'>+	VIA_RNG_CHUNK_2		= 0x02,	/* 16 rand bits, 32 stored bits */</div><div class='add'>+	VIA_RNG_CHUNK_2_MASK	= 0xFFFF,</div><div class='add'>+	VIA_RNG_CHUNK_1		= 0x03,	/* 8 rand bits, 32 stored bits */</div><div class='add'>+	VIA_RNG_CHUNK_1_MASK	= 0xFF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Investigate using the 'rep' prefix to obtain 32 bits of random data</div><div class='add'>+ * in one insn.  The upside is potentially better performance.  The</div><div class='add'>+ * downside is that the instruction becomes no longer atomic.  Due to</div><div class='add'>+ * this, just like familiar issues with /dev/random itself, the worst</div><div class='add'>+ * case of a 'rep xstore' could potentially pause a cpu for an</div><div class='add'>+ * unreasonably long time.  In practice, this condition would likely</div><div class='add'>+ * only occur when the hardware is failing.  (or so we hope :))</div><div class='add'>+ *</div><div class='add'>+ * Another possible performance boost may come from simply buffering</div><div class='add'>+ * until we have 4 bytes, thus returning a u32 at a time,</div><div class='add'>+ * instead of the current u8-at-a-time.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u32 xstore(u32 *addr, u32 edx_in)</div><div class='add'>+{</div><div class='add'>+	u32 eax_out;</div><div class='add'>+</div><div class='add'>+	asm(".byte 0x0F,0xA7,0xC0 /* xstore %%edi (addr=%0) */"</div><div class='add'>+		:"=m"(*addr), "=a"(eax_out)</div><div class='add'>+		:"D"(addr), "d"(edx_in));</div><div class='add'>+</div><div class='add'>+	return eax_out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_rng_data_present(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	u32 bytes_out;</div><div class='add'>+	u32 *via_rng_datum = (u32 *)(&amp;rng-&gt;priv);</div><div class='add'>+</div><div class='add'>+	/* We choose the recommended 1-byte-per-instruction RNG rate,</div><div class='add'>+	 * for greater randomness at the expense of speed.  Larger</div><div class='add'>+	 * values 2, 4, or 8 bytes-per-instruction yield greater</div><div class='add'>+	 * speed at lesser randomness.</div><div class='add'>+	 *</div><div class='add'>+	 * If you change this to another VIA_CHUNK_n, you must also</div><div class='add'>+	 * change the -&gt;n_bytes values in rng_vendor_ops[] tables.</div><div class='add'>+	 * VIA_CHUNK_8 requires further code changes.</div><div class='add'>+	 *</div><div class='add'>+	 * A copy of MSR_VIA_RNG is placed in eax_out when xstore</div><div class='add'>+	 * completes.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	*via_rng_datum = 0; /* paranoia, not really necessary */</div><div class='add'>+	bytes_out = xstore(via_rng_datum, VIA_RNG_CHUNK_1);</div><div class='add'>+	bytes_out &amp;= VIA_XSTORE_CNT_MASK;</div><div class='add'>+	if (bytes_out == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_rng_data_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	u32 via_rng_datum = (u32)rng-&gt;priv;</div><div class='add'>+</div><div class='add'>+	*data = via_rng_datum;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_rng_init(struct hwrng *rng)</div><div class='add'>+{</div><div class='add'>+	u32 lo, hi, old_lo;</div><div class='add'>+</div><div class='add'>+	/* Control the RNG via MSR.  Tread lightly and pay very close</div><div class='add'>+	 * close attention to values written, as the reserved fields</div><div class='add'>+	 * are documented to be "undefined and unpredictable"; but it</div><div class='add'>+	 * does not say to write them as zero, so I make a guess that</div><div class='add'>+	 * we restore the values we find in the register.</div><div class='add'>+	 */</div><div class='add'>+	rdmsr(MSR_VIA_RNG, lo, hi);</div><div class='add'>+</div><div class='add'>+	old_lo = lo;</div><div class='add'>+	lo &amp;= ~(0x7f &lt;&lt; VIA_STRFILT_CNT_SHIFT);</div><div class='add'>+	lo &amp;= ~VIA_XSTORE_CNT_MASK;</div><div class='add'>+	lo &amp;= ~(VIA_STRFILT_ENABLE | VIA_STRFILT_FAIL | VIA_RAWBITS_ENABLE);</div><div class='add'>+	lo |= VIA_RNG_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (lo != old_lo)</div><div class='add'>+		wrmsr(MSR_VIA_RNG, lo, hi);</div><div class='add'>+</div><div class='add'>+	/* perhaps-unnecessary sanity check; remove after testing if</div><div class='add'>+	   unneeded */</div><div class='add'>+	rdmsr(MSR_VIA_RNG, lo, hi);</div><div class='add'>+	if ((lo &amp; VIA_RNG_ENABLE) == 0) {</div><div class='add'>+		printk(KERN_ERR PFX "cannot enable VIA C3 RNG, aborting\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct hwrng via_rng = {</div><div class='add'>+	.name		= "via",</div><div class='add'>+	.init		= via_rng_init,</div><div class='add'>+	.data_present	= via_rng_data_present,</div><div class='add'>+	.data_read	= via_rng_data_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!cpu_has_xstore)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	printk(KERN_INFO "VIA RNG detected\n");</div><div class='add'>+	err = hwrng_register(&amp;via_rng);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "RNG registering failed (%d)\n",</div><div class='add'>+		       err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	hwrng_unregister(&amp;via_rng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(mod_init);</div><div class='add'>+module_exit(mod_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("H/W RNG driver for VIA chipsets");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c<br/>index f3c3aaf4560e..353d9f3cf8d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/i8k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/i8k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/i8k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/i8k.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static int i8k_open_fs(struct inode *inode, struct file *file);</div><div class='ctx'> static int i8k_ioctl(struct inode *, struct file *, unsigned int,</div><div class='ctx'> 		     unsigned long);</div><div class='ctx'> </div><div class='del'>-static struct file_operations i8k_fops = {</div><div class='add'>+static const struct file_operations i8k_fops = {</div><div class='ctx'> 	.open		= i8k_open_fs,</div><div class='ctx'> 	.read		= seq_read,</div><div class='ctx'> 	.llseek		= seq_lseek,</div><div class='head'>diff --git a/drivers/char/ip2/i2ellis.h b/drivers/char/ip2/i2ellis.h<br/>index 510b026d7d26..5eabe47b0bc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ip2/i2ellis.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ip2/i2ellis.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ip2/i2ellis.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ip2/i2ellis.h</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> //----------------------</div><div class='ctx'> // Mandatory Includes:</div><div class='ctx'> //----------------------</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "ip2types.h"</div><div class='ctx'> #include "i2hw.h"       // The hardware definitions</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c<br/>index 03db1cb3fa95..7907ae88c2f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ip2/ip2main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ip2/ip2main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ip2/ip2main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ip2/ip2main.c</a></div><div class='hunk'>@@ -82,7 +82,6 @@</div><div class='ctx'> /************/</div><div class='ctx'> /* Includes */</div><div class='ctx'> /************/</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -91,7 +90,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -235,7 +233,7 @@ static void  *DevTableMem[IP2_MAX_BOARDS];</div><div class='ctx'> /* This is the driver descriptor for the ip2ipl device, which is used to</div><div class='ctx'>  * download the loadware to the boards.</div><div class='ctx'>  */</div><div class='del'>-static struct file_operations ip2_ipl = {</div><div class='add'>+static const struct file_operations ip2_ipl = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= ip2_ipl_read,</div><div class='ctx'> 	.write		= ip2_ipl_write,</div><div class='hunk'>@@ -305,7 +303,7 @@ static struct class *ip2_class;</div><div class='ctx'> </div><div class='ctx'> // Some functions to keep track of what irq's we have</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int</div><div class='ctx'> is_valid_irq(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	int *i = Valid_Irqs;</div><div class='hunk'>@@ -316,14 +314,14 @@ is_valid_irq(int irq)</div><div class='ctx'> 	return (*i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> mark_requested_irq( char irq )</div><div class='ctx'> {</div><div class='ctx'> 	rirqs[iindx++] = irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='del'>-static int __init</div><div class='add'>+static int</div><div class='ctx'> clear_requested_irq( char irq )</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -337,7 +335,7 @@ clear_requested_irq( char irq )</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int</div><div class='ctx'> have_requested_irq( char irq )</div><div class='ctx'> {</div><div class='ctx'> 	// array init to zeros so 0 irq will not be requested as a side effect</div><div class='hunk'>@@ -414,9 +412,7 @@ cleanup_module(void)</div><div class='ctx'> 			/* free io addresses and Tibet */</div><div class='ctx'> 			release_region( ip2config.addr[i], 8 );</div><div class='ctx'> 			class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));</div><div class='del'>-			devfs_remove("ip2/ipl%d", i);</div><div class='ctx'> 			class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1));</div><div class='del'>-			devfs_remove("ip2/stat%d", i);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Disable and remove interrupt handler. */</div><div class='ctx'> 		if ( (ip2config.irq[i] &gt; 0) &amp;&amp; have_requested_irq(ip2config.irq[i]) ) {	</div><div class='hunk'>@@ -425,7 +421,6 @@ cleanup_module(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	class_destroy(ip2_class);</div><div class='del'>-	devfs_remove("ip2");</div><div class='ctx'> 	if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) {</div><div class='ctx'> 		printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -496,8 +491,8 @@ static struct tty_operations ip2_ops = {</div><div class='ctx'> /* initialisation of the devices and driver structures, and registers itself  */</div><div class='ctx'> /* with the relevant kernel modules.                                          */</div><div class='ctx'> /******************************************************************************/</div><div class='del'>-/* SA_INTERRUPT- if set blocks all interrupts else only this line */</div><div class='del'>-/* SA_SHIRQ    - for shared irq PCI or maybe EISA only */</div><div class='add'>+/* IRQF_DISABLED - if set blocks all interrupts else only this line */</div><div class='add'>+/* IRQF_SHARED    - for shared irq PCI or maybe EISA only */</div><div class='ctx'> /* SA_RANDOM   - can be source for cert. random number generators */</div><div class='ctx'> #define IP2_SA_FLAGS	0</div><div class='ctx'> </div><div class='hunk'>@@ -675,7 +670,6 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)</div><div class='ctx'> </div><div class='ctx'> 	ip2_tty_driver-&gt;owner		    = THIS_MODULE;</div><div class='ctx'> 	ip2_tty_driver-&gt;name                 = "ttyF";</div><div class='del'>-	ip2_tty_driver-&gt;devfs_name	    = "tts/F";</div><div class='ctx'> 	ip2_tty_driver-&gt;driver_name          = pcDriver_name;</div><div class='ctx'> 	ip2_tty_driver-&gt;major                = IP2_TTY_MAJOR;</div><div class='ctx'> 	ip2_tty_driver-&gt;minor_start          = 0;</div><div class='hunk'>@@ -683,7 +677,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)</div><div class='ctx'> 	ip2_tty_driver-&gt;subtype              = SERIAL_TYPE_NORMAL;</div><div class='ctx'> 	ip2_tty_driver-&gt;init_termios         = tty_std_termios;</div><div class='ctx'> 	ip2_tty_driver-&gt;init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;</div><div class='del'>-	ip2_tty_driver-&gt;flags                = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	ip2_tty_driver-&gt;flags                = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	tty_set_operations(ip2_tty_driver, &amp;ip2_ops);</div><div class='ctx'> </div><div class='ctx'> 	ip2trace (ITRC_NO_PORT, ITRC_INIT, 3, 0 );</div><div class='hunk'>@@ -724,26 +718,9 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)</div><div class='ctx'> 				class_device_create(ip2_class, NULL,</div><div class='ctx'> 						MKDEV(IP2_IPL_MAJOR, 4 * i),</div><div class='ctx'> 						NULL, "ipl%d", i);</div><div class='del'>-				err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),</div><div class='del'>-						S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,</div><div class='del'>-						"ip2/ipl%d", i);</div><div class='del'>-				if (err) {</div><div class='del'>-					class_device_destroy(ip2_class,</div><div class='del'>-						MKDEV(IP2_IPL_MAJOR, 4 * i));</div><div class='del'>-					goto out_class;</div><div class='del'>-				}</div><div class='del'>-</div><div class='ctx'> 				class_device_create(ip2_class, NULL,</div><div class='ctx'> 						MKDEV(IP2_IPL_MAJOR, 4 * i + 1),</div><div class='ctx'> 						NULL, "stat%d", i);</div><div class='del'>-				err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),</div><div class='del'>-						S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,</div><div class='del'>-						"ip2/stat%d", i);</div><div class='del'>-				if (err) {</div><div class='del'>-					class_device_destroy(ip2_class,</div><div class='del'>-						MKDEV(IP2_IPL_MAJOR, 4 * i + 1));</div><div class='del'>-					goto out_class;</div><div class='del'>-				}</div><div class='ctx'> </div><div class='ctx'> 			    for ( box = 0; box &lt; ABS_MAX_BOXES; ++box )</div><div class='ctx'> 			    {</div><div class='hunk'>@@ -776,7 +753,7 @@ retry:</div><div class='ctx'> 				if (have_requested_irq(ip2config.irq[i]))</div><div class='ctx'> 					continue;</div><div class='ctx'> 				rc = request_irq( ip2config.irq[i], ip2_interrupt,</div><div class='del'>-					IP2_SA_FLAGS | (ip2config.type[i] == PCI ? SA_SHIRQ : 0),</div><div class='add'>+					IP2_SA_FLAGS | (ip2config.type[i] == PCI ? IRQF_SHARED : 0),</div><div class='ctx'> 					pcName, (void *)&amp;pcName);</div><div class='ctx'> 				if (rc) {</div><div class='ctx'> 					printk(KERN_ERR "IP2: an request_irq failed: error %d\n",rc);</div><div class='hunk'>@@ -818,7 +795,7 @@ EXPORT_SYMBOL(ip2_loadmain);</div><div class='ctx'> /* the board, the channel structures are initialized, and the board details   */</div><div class='ctx'> /* are reported on the console.                                               */</div><div class='ctx'> /******************************************************************************/</div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> ip2_init_board( int boardnum )</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -961,7 +938,7 @@ err_initialize:</div><div class='ctx'> /* EISA motherboard, or no valid board ID is selected it returns 0. Otherwise */</div><div class='ctx'> /* it returns the base address of the controller.                             */</div><div class='ctx'> /******************************************************************************/</div><div class='del'>-static unsigned short __init</div><div class='add'>+static unsigned short</div><div class='ctx'> find_eisa_board( int start_slot )</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -3209,3 +3186,10 @@ ip2trace (unsigned short pn, unsigned char cat, unsigned char label, unsigned lo</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static struct pci_device_id ip2main_pci_tbl[] __devinitdata = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_COMPUTONE, PCI_DEVICE_ID_COMPUTONE_IP2EX) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, ip2main_pci_tbl);</div><div class='head'>diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c<br/>index 3acdac3c967e..a48da02aad2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ip27-rtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ip27-rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ip27-rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ip27-rtc.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ static int rtc_release(struct inode *inode, struct file *file)</div><div class='ctx'>  *	The various file operations we support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations rtc_fops = {</div><div class='add'>+static const struct file_operations rtc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= rtc_ioctl,</div><div class='ctx'> 	.open		= rtc_open,</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c<br/>index e1c95374984c..68d7c61a864e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_devintf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_devintf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_devintf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ipmi/ipmi_devintf.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -40,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ipmi.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -767,7 +765,7 @@ static long compat_ipmi_ioctl(struct file *filep, unsigned int cmd,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct file_operations ipmi_fops = {</div><div class='add'>+static const struct file_operations ipmi_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= ipmi_ioctl,</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='hunk'>@@ -804,9 +802,6 @@ static void ipmi_new_smi(int if_num, struct device *device)</div><div class='ctx'> 	dev_t dev = MKDEV(ipmi_major, if_num);</div><div class='ctx'> 	struct ipmi_reg_list *entry;</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-		      "ipmidev/%d", if_num);</div><div class='del'>-</div><div class='ctx'> 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);</div><div class='ctx'> 	if (!entry) {</div><div class='ctx'> 		printk(KERN_ERR "ipmi_devintf: Unable to create the"</div><div class='hunk'>@@ -836,7 +831,6 @@ static void ipmi_smi_gone(int if_num)</div><div class='ctx'> 	}</div><div class='ctx'> 	class_device_destroy(ipmi_class, dev);</div><div class='ctx'> 	mutex_unlock(&amp;reg_list_mutex);</div><div class='del'>-	devfs_remove("ipmidev/%d", if_num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ipmi_smi_watcher smi_watcher =</div><div class='hunk'>@@ -872,8 +866,6 @@ static __init int init_ipmi_devintf(void)</div><div class='ctx'> 		ipmi_major = rv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir(DEVICE_NAME);</div><div class='del'>-</div><div class='ctx'> 	rv = ipmi_smi_watcher_register(&amp;smi_watcher);</div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		unregister_chrdev(ipmi_major, DEVICE_NAME);</div><div class='hunk'>@@ -898,7 +890,6 @@ static __exit void cleanup_ipmi(void)</div><div class='ctx'> 	mutex_unlock(&amp;reg_list_mutex);</div><div class='ctx'> 	class_destroy(ipmi_class);</div><div class='ctx'> 	ipmi_smi_watcher_unregister(&amp;smi_watcher);</div><div class='del'>-	devfs_remove(DEVICE_NAME);</div><div class='ctx'> 	unregister_chrdev(ipmi_major, DEVICE_NAME);</div><div class='ctx'> }</div><div class='ctx'> module_exit(cleanup_ipmi);</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c<br/>index 9f2f8fdec69a..0aa5d608fe6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_msghandler.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_msghandler.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_msghandler.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ipmi/ipmi_msghandler.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -57,8 +56,7 @@ static int ipmi_init_msghandler(void);</div><div class='ctx'> static int initialized = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-struct proc_dir_entry *proc_ipmi_root = NULL;</div><div class='del'>-EXPORT_SYMBOL(proc_ipmi_root);</div><div class='add'>+static struct proc_dir_entry *proc_ipmi_root = NULL;</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> #define MAX_EVENTS_IN_QUEUE	25</div><div class='hunk'>@@ -936,11 +934,8 @@ int ipmi_set_gets_events(ipmi_user_t user, int val)</div><div class='ctx'> </div><div class='ctx'> 	if (val) {</div><div class='ctx'> 		/* Deliver any queued events. */</div><div class='del'>-		list_for_each_entry_safe(msg, msg2, &amp;intf-&gt;waiting_events,</div><div class='del'>-					 link) {</div><div class='del'>-			list_del(&amp;msg-&gt;link);</div><div class='del'>-			list_add_tail(&amp;msg-&gt;link, &amp;msgs);</div><div class='del'>-		}</div><div class='add'>+		list_for_each_entry_safe(msg, msg2, &amp;intf-&gt;waiting_events, link)</div><div class='add'>+			list_move_tail(&amp;msg-&gt;link, &amp;msgs);</div><div class='ctx'> 		intf-&gt;waiting_events_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3677,7 +3672,7 @@ static void send_panic_events(char *str)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_IPMI_PANIC_EVENT */</div><div class='ctx'> </div><div class='del'>-static int has_paniced = 0;</div><div class='add'>+static int has_panicked = 0;</div><div class='ctx'> </div><div class='ctx'> static int panic_event(struct notifier_block *this,</div><div class='ctx'> 		       unsigned long         event,</div><div class='hunk'>@@ -3686,9 +3681,9 @@ static int panic_event(struct notifier_block *this,</div><div class='ctx'> 	int        i;</div><div class='ctx'> 	ipmi_smi_t intf;</div><div class='ctx'> </div><div class='del'>-	if (has_paniced)</div><div class='add'>+	if (has_panicked)</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='del'>-	has_paniced = 1;</div><div class='add'>+	has_panicked = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* For every registered interface, set it to run to completion. */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_IPMI_INTERFACES; i++) {</div><div class='hunk'>@@ -3742,11 +3737,8 @@ static int ipmi_init_msghandler(void)</div><div class='ctx'> 	proc_ipmi_root-&gt;owner = THIS_MODULE;</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;ipmi_timer);</div><div class='del'>-	ipmi_timer.data = 0;</div><div class='del'>-	ipmi_timer.function = ipmi_timeout;</div><div class='del'>-	ipmi_timer.expires = jiffies + IPMI_TIMEOUT_JIFFIES;</div><div class='del'>-	add_timer(&amp;ipmi_timer);</div><div class='add'>+	setup_timer(&amp;ipmi_timer, ipmi_timeout, 0);</div><div class='add'>+	mod_timer(&amp;ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);</div><div class='ctx'> </div><div class='ctx'> 	atomic_notifier_chain_register(&amp;panic_notifier_list, &amp;panic_block);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c<br/>index d0b5c08e7b4e..8d941db83457 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_poweroff.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_poweroff.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_poweroff.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ipmi/ipmi_poweroff.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c<br/>index 02a7dd7a8a55..f57eba0bf253 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_si_intf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_si_intf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ipmi/ipmi_si_intf.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  * and drives the real SMI state machine.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -55,23 +54,6 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#ifdef CONFIG_HIGH_RES_TIMERS</div><div class='del'>-#include &lt;linux/hrtime.h&gt;</div><div class='del'>-# if defined(schedule_next_int)</div><div class='del'>-/* Old high-res timer code, do translations. */</div><div class='del'>-#  define get_arch_cycles(a) quick_update_jiffies_sub(a)</div><div class='del'>-#  define arch_cycles_per_jiffy cycles_per_jiffies</div><div class='del'>-# endif</div><div class='del'>-static inline void add_usec_to_timer(struct timer_list *t, long v)</div><div class='del'>-{</div><div class='del'>-	t-&gt;arch_cycle_expires += nsec_to_arch_cycle(v * 1000);</div><div class='del'>-	while (t-&gt;arch_cycle_expires &gt;= arch_cycles_per_jiffy)</div><div class='del'>-	{</div><div class='del'>-		t-&gt;expires++;</div><div class='del'>-		t-&gt;arch_cycle_expires -= arch_cycles_per_jiffy;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/rcupdate.h&gt;</div><div class='ctx'> #include &lt;linux/ipmi_smi.h&gt;</div><div class='hunk'>@@ -243,8 +225,6 @@ static int register_xaction_notifier(struct notifier_block * nb)</div><div class='ctx'> 	return atomic_notifier_chain_register(&amp;xaction_notifier_list, nb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void si_restart_short_timer(struct smi_info *smi_info);</div><div class='del'>-</div><div class='ctx'> static void deliver_recv_msg(struct smi_info *smi_info,</div><div class='ctx'> 			     struct ipmi_smi_msg *msg)</div><div class='ctx'> {</div><div class='hunk'>@@ -768,7 +748,6 @@ static void sender(void                *send_info,</div><div class='ctx'> 	    &amp;&amp; (smi_info-&gt;curr_msg == NULL))</div><div class='ctx'> 	{</div><div class='ctx'> 		start_next_msg(smi_info);</div><div class='del'>-		si_restart_short_timer(smi_info);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;(smi_info-&gt;si_lock), flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -809,7 +788,7 @@ static int ipmi_thread(void *data)</div><div class='ctx'> 			/* do nothing */</div><div class='ctx'> 		}</div><div class='ctx'> 		else if (smi_result == SI_SM_CALL_WITH_DELAY)</div><div class='del'>-			udelay(1);</div><div class='add'>+			schedule();</div><div class='ctx'> 		else</div><div class='ctx'> 			schedule_timeout_interruptible(1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -833,37 +812,6 @@ static void request_events(void *send_info)</div><div class='ctx'> </div><div class='ctx'> static int initialized = 0;</div><div class='ctx'> </div><div class='del'>-/* Must be called with interrupts off and with the si_lock held. */</div><div class='del'>-static void si_restart_short_timer(struct smi_info *smi_info)</div><div class='del'>-{</div><div class='del'>-#if defined(CONFIG_HIGH_RES_TIMERS)</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned long jiffies_now;</div><div class='del'>-	unsigned long seq;</div><div class='del'>-</div><div class='del'>-	if (del_timer(&amp;(smi_info-&gt;si_timer))) {</div><div class='del'>-		/* If we don't delete the timer, then it will go off</div><div class='del'>-		   immediately, anyway.  So we only process if we</div><div class='del'>-		   actually delete the timer. */</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			seq = read_seqbegin_irqsave(&amp;xtime_lock, flags);</div><div class='del'>-			jiffies_now = jiffies;</div><div class='del'>-			smi_info-&gt;si_timer.expires = jiffies_now;</div><div class='del'>-			smi_info-&gt;si_timer.arch_cycle_expires</div><div class='del'>-				= get_arch_cycles(jiffies_now);</div><div class='del'>-		} while (read_seqretry_irqrestore(&amp;xtime_lock, seq, flags));</div><div class='del'>-</div><div class='del'>-		add_usec_to_timer(&amp;smi_info-&gt;si_timer, SI_SHORT_TIMEOUT_USEC);</div><div class='del'>-</div><div class='del'>-		add_timer(&amp;(smi_info-&gt;si_timer));</div><div class='del'>-		spin_lock_irqsave(&amp;smi_info-&gt;count_lock, flags);</div><div class='del'>-		smi_info-&gt;timeout_restarts++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;smi_info-&gt;count_lock, flags);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void smi_timeout(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct smi_info   *smi_info = (struct smi_info *) data;</div><div class='hunk'>@@ -904,31 +852,15 @@ static void smi_timeout(unsigned long data)</div><div class='ctx'> 	/* If the state machine asks for a short delay, then shorten</div><div class='ctx'>            the timer timeout. */</div><div class='ctx'> 	if (smi_result == SI_SM_CALL_WITH_DELAY) {</div><div class='del'>-#if defined(CONFIG_HIGH_RES_TIMERS)</div><div class='del'>-		unsigned long seq;</div><div class='del'>-#endif</div><div class='ctx'> 		spin_lock_irqsave(&amp;smi_info-&gt;count_lock, flags);</div><div class='ctx'> 		smi_info-&gt;short_timeouts++;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;smi_info-&gt;count_lock, flags);</div><div class='del'>-#if defined(CONFIG_HIGH_RES_TIMERS)</div><div class='del'>-		do {</div><div class='del'>-			seq = read_seqbegin_irqsave(&amp;xtime_lock, flags);</div><div class='del'>-			smi_info-&gt;si_timer.expires = jiffies;</div><div class='del'>-			smi_info-&gt;si_timer.arch_cycle_expires</div><div class='del'>-				= get_arch_cycles(smi_info-&gt;si_timer.expires);</div><div class='del'>-		} while (read_seqretry_irqrestore(&amp;xtime_lock, seq, flags));</div><div class='del'>-		add_usec_to_timer(&amp;smi_info-&gt;si_timer, SI_SHORT_TIMEOUT_USEC);</div><div class='del'>-#else</div><div class='ctx'> 		smi_info-&gt;si_timer.expires = jiffies + 1;</div><div class='del'>-#endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock_irqsave(&amp;smi_info-&gt;count_lock, flags);</div><div class='ctx'> 		smi_info-&gt;long_timeouts++;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;smi_info-&gt;count_lock, flags);</div><div class='ctx'> 		smi_info-&gt;si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;</div><div class='del'>-#if defined(CONFIG_HIGH_RES_TIMERS)</div><div class='del'>-		smi_info-&gt;si_timer.arch_cycle_expires = 0;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  do_add_timer:</div><div class='hunk'>@@ -1109,7 +1041,7 @@ static int std_irq_setup(struct smi_info *info)</div><div class='ctx'> 	if (info-&gt;si_type == SI_BT) {</div><div class='ctx'> 		rv = request_irq(info-&gt;irq,</div><div class='ctx'> 				 si_bt_irq_handler,</div><div class='del'>-				 SA_INTERRUPT,</div><div class='add'>+				 IRQF_DISABLED,</div><div class='ctx'> 				 DEVICE_NAME,</div><div class='ctx'> 				 info);</div><div class='ctx'> 		if (!rv)</div><div class='hunk'>@@ -1119,7 +1051,7 @@ static int std_irq_setup(struct smi_info *info)</div><div class='ctx'> 	} else</div><div class='ctx'> 		rv = request_irq(info-&gt;irq,</div><div class='ctx'> 				 si_irq_handler,</div><div class='del'>-				 SA_INTERRUPT,</div><div class='add'>+				 IRQF_DISABLED,</div><div class='ctx'> 				 DEVICE_NAME,</div><div class='ctx'> 				 info);</div><div class='ctx'> 	if (rv) {</div><div class='head'>diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c<br/>index 2d11ddd99e55..accaaf1a6b69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_watchdog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ipmi/ipmi_watchdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ipmi/ipmi_watchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ipmi/ipmi_watchdog.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/ipmi.h&gt;</div><div class='hunk'>@@ -212,24 +211,16 @@ static int set_param_str(const char *val, struct kernel_param *kp)</div><div class='ctx'> {</div><div class='ctx'> 	action_fn  fn = (action_fn) kp-&gt;arg;</div><div class='ctx'> 	int        rv = 0;</div><div class='del'>-	const char *end;</div><div class='del'>-	char       valcp[16];</div><div class='del'>-	int        len;</div><div class='del'>-</div><div class='del'>-	/* Truncate leading and trailing spaces. */</div><div class='del'>-	while (isspace(*val))</div><div class='del'>-		val++;</div><div class='del'>-	end = val + strlen(val) - 1;</div><div class='del'>-	while ((end &gt;= val) &amp;&amp; isspace(*end))</div><div class='del'>-		end--;</div><div class='del'>-	len = end - val + 1;</div><div class='del'>-	if (len &gt; sizeof(valcp) - 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	memcpy(valcp, val, len);</div><div class='del'>-	valcp[len] = '\0';</div><div class='add'>+	char       *dup, *s;</div><div class='add'>+</div><div class='add'>+	dup = kstrdup(val, GFP_KERNEL);</div><div class='add'>+	if (!dup)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	s = strstrip(dup);</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;register_sem);</div><div class='del'>-	rv = fn(valcp, NULL);</div><div class='add'>+	rv = fn(s, NULL);</div><div class='ctx'> 	if (rv)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> </div><div class='hunk'>@@ -239,6 +230,7 @@ static int set_param_str(const char *val, struct kernel_param *kp)</div><div class='ctx'> </div><div class='ctx'>  out_unlock:</div><div class='ctx'> 	up_read(&amp;register_sem);</div><div class='add'>+	kfree(dup);</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -815,7 +807,7 @@ static int ipmi_close(struct inode *ino, struct file *filep)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations ipmi_wdog_fops = {</div><div class='add'>+static const struct file_operations ipmi_wdog_fops = {</div><div class='ctx'> 	.owner   = THIS_MODULE,</div><div class='ctx'> 	.read    = ipmi_read,</div><div class='ctx'> 	.poll    = ipmi_poll,</div><div class='hunk'>@@ -956,9 +948,10 @@ static int wdog_reboot_handler(struct notifier_block *this,</div><div class='ctx'> 			/* Disable the WDT if we are shutting down. */</div><div class='ctx'> 			ipmi_watchdog_state = WDOG_TIMEOUT_NONE;</div><div class='ctx'> 			panic_halt_ipmi_set_timeout();</div><div class='del'>-		} else {</div><div class='add'>+		} else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) {</div><div class='ctx'> 			/* Set a long timer to let the reboot happens, but</div><div class='del'>-			   reboot if it hangs. */</div><div class='add'>+			   reboot if it hangs, but only if the watchdog</div><div class='add'>+			   timer was already running. */</div><div class='ctx'> 			timeout = 120;</div><div class='ctx'> 			pretimeout = 0;</div><div class='ctx'> 			ipmi_watchdog_state = WDOG_TIMEOUT_RESET;</div><div class='hunk'>@@ -980,16 +973,17 @@ static int wdog_panic_handler(struct notifier_block *this,</div><div class='ctx'> {</div><div class='ctx'> 	static int panic_event_handled = 0;</div><div class='ctx'> </div><div class='del'>-	/* On a panic, if we have a panic timeout, make sure that the thing</div><div class='del'>-	   reboots, even if it hangs during that panic. */</div><div class='del'>-	if (watchdog_user &amp;&amp; !panic_event_handled) {</div><div class='del'>-		/* Make sure the panic doesn't hang, and make sure we</div><div class='del'>-		   do this only once. */</div><div class='add'>+	/* On a panic, if we have a panic timeout, make sure to extend</div><div class='add'>+	   the watchdog timer to a reasonable value to complete the</div><div class='add'>+	   panic, if the watchdog timer is running.  Plus the</div><div class='add'>+	   pretimeout is meaningless at panic time. */</div><div class='add'>+	if (watchdog_user &amp;&amp; !panic_event_handled &amp;&amp;</div><div class='add'>+	    ipmi_watchdog_state != WDOG_TIMEOUT_NONE) {</div><div class='add'>+		/* Make sure we do this only once. */</div><div class='ctx'> 		panic_event_handled = 1;</div><div class='ctx'> 	    </div><div class='ctx'> 		timeout = 255;</div><div class='ctx'> 		pretimeout = 0;</div><div class='del'>-		ipmi_watchdog_state = WDOG_TIMEOUT_RESET;</div><div class='ctx'> 		panic_halt_ipmi_set_timeout();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c<br/>index e9ebabaf8cb0..913be23e0a24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/isicom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/isicom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/isicom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/isicom.c</a></div><div class='hunk'>@@ -245,7 +245,7 @@ static int lock_card(struct isi_board *card)</div><div class='ctx'> 	printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n",</div><div class='ctx'> 		card-&gt;base);</div><div class='ctx'> </div><div class='del'>-	return 0;	/* Failed to aquire the card! */</div><div class='add'>+	return 0;	/* Failed to acquire the card! */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lock_card_at_interrupt(struct isi_board *card)</div><div class='hunk'>@@ -262,7 +262,7 @@ static int lock_card_at_interrupt(struct isi_board *card)</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;card-&gt;card_lock, card-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Failing in interrupt is an acceptable event */</div><div class='del'>-	return 0;	/* Failed to aquire the card! */</div><div class='add'>+	return 0;	/* Failed to acquire the card! */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void unlock_card(struct isi_board *card)</div><div class='hunk'>@@ -1145,7 +1145,7 @@ static int isicom_write(struct tty_struct *tty,	const unsigned char *buf,</div><div class='ctx'> 	if (isicom_paranoia_check(port, tty-&gt;name, "isicom_write"))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !port-&gt;xmit_buf)</div><div class='add'>+	if (!port-&gt;xmit_buf)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;card_lock, flags);</div><div class='hunk'>@@ -1180,7 +1180,7 @@ static void isicom_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	if (isicom_paranoia_check(port, tty-&gt;name, "isicom_put_char"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !port-&gt;xmit_buf)</div><div class='add'>+	if (!port-&gt;xmit_buf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;card_lock, flags);</div><div class='hunk'>@@ -1581,7 +1581,6 @@ static int __devinit isicom_register_tty_driver(void)</div><div class='ctx'> </div><div class='ctx'> 	isicom_normal-&gt;owner			= THIS_MODULE;</div><div class='ctx'> 	isicom_normal-&gt;name 			= "ttyM";</div><div class='del'>-	isicom_normal-&gt;devfs_name	 	= "isicom/";</div><div class='ctx'> 	isicom_normal-&gt;major			= ISICOM_NMAJOR;</div><div class='ctx'> 	isicom_normal-&gt;minor_start		= 0;</div><div class='ctx'> 	isicom_normal-&gt;type			= TTY_DRIVER_TYPE_SERIAL;</div><div class='hunk'>@@ -1615,14 +1614,14 @@ static int __devinit isicom_register_isr(struct pci_dev *pdev,</div><div class='ctx'> 	const unsigned int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct isi_board *board = pci_get_drvdata(pdev);</div><div class='del'>-	unsigned long irqflags = SA_INTERRUPT;</div><div class='add'>+	unsigned long irqflags = IRQF_DISABLED;</div><div class='ctx'> 	int retval = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!board-&gt;base)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='ctx'> 	if (board-&gt;isa == NO)</div><div class='del'>-		irqflags |= SA_SHIRQ;</div><div class='add'>+		irqflags |= IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 	retval = request_irq(board-&gt;irq, isicom_interrupt, irqflags,</div><div class='ctx'> 		ISICOM_NAME, board);</div><div class='head'>diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c<br/>index ef20c1fc9c4c..84dfc4278139 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/istallion.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/istallion.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/istallion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/istallion.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -39,16 +38,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/eisa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -137,6 +134,10 @@ static stlconf_t	stli_brdconf[] = {</div><div class='ctx'> </div><div class='ctx'> static int	stli_nrbrds = ARRAY_SIZE(stli_brdconf);</div><div class='ctx'> </div><div class='add'>+/* stli_lock must NOT be taken holding brd_lock */</div><div class='add'>+static spinlock_t stli_lock;	/* TTY logic lock */</div><div class='add'>+static spinlock_t brd_lock;	/* Board logic lock */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	There is some experimental EISA board detection code in this driver.</div><div class='ctx'>  *	By default it is disabled, but for those that want to try it out,</div><div class='hunk'>@@ -173,14 +174,6 @@ static char	*stli_serialname = "ttyE";</div><div class='ctx'> </div><div class='ctx'> static struct tty_driver	*stli_serial;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	We will need to allocate a temporary write buffer for chars that</div><div class='del'>- *	come direct from user space. The problem is that a copy from user</div><div class='del'>- *	space might cause a page fault (typically on a system that is</div><div class='del'>- *	swapping!). All ports will share one buffer - since if the system</div><div class='del'>- *	is already swapping a shared buffer won't make things any worse.</div><div class='del'>- */</div><div class='del'>-static char			*stli_tmpwritebuf;</div><div class='ctx'> </div><div class='ctx'> #define	STLI_TXBUFSIZE		4096</div><div class='ctx'> </div><div class='hunk'>@@ -288,7 +281,6 @@ static char	*stli_brdnames[] = {</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='ctx'> /*</div><div class='ctx'>  *	Define some string labels for arguments passed from the module</div><div class='ctx'>  *	load line. These allow for easy board definitions, and easy</div><div class='hunk'>@@ -387,8 +379,6 @@ MODULE_PARM_DESC(board2, "Board 2 config -&gt; name[,ioaddr[,memaddr]");</div><div class='ctx'> module_param_array(board3, charp, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(board3, "Board 3 config -&gt; name[,ioaddr[,memaddr]");</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Set up a default memory address table for EISA board probing.</div><div class='ctx'>  *	The default addresses are all bellow 1Mbyte, which has to be the</div><div class='hunk'>@@ -419,7 +409,7 @@ static int	stli_eisamempsize = ARRAY_SIZE(stli_eisamemprobeaddrs);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id istallion_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECRA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECRA), },</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, istallion_pci_tbl);</div><div class='hunk'>@@ -649,14 +639,8 @@ static unsigned int	stli_baudrates[] = {</div><div class='ctx'>  *	Prototype all functions in this driver!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-static void	stli_argbrds(void);</div><div class='ctx'> static int	stli_parsebrd(stlconf_t *confp, char **argp);</div><div class='del'>-</div><div class='del'>-static unsigned long	stli_atol(char *str);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int		stli_init(void);</div><div class='add'>+static int	stli_init(void);</div><div class='ctx'> static int	stli_open(struct tty_struct *tty, struct file *filp);</div><div class='ctx'> static void	stli_close(struct tty_struct *tty, struct file *filp);</div><div class='ctx'> static int	stli_write(struct tty_struct *tty, const unsigned char *buf, int count);</div><div class='hunk'>@@ -682,7 +666,7 @@ static int	stli_startbrd(stlibrd_t *brdp);</div><div class='ctx'> static ssize_t	stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp);</div><div class='ctx'> static ssize_t	stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp);</div><div class='ctx'> static int	stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg);</div><div class='del'>-static void	stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp);</div><div class='add'>+static void	stli_brdpoll(stlibrd_t *brdp, cdkhdr_t __iomem *hdrp);</div><div class='ctx'> static void	stli_poll(unsigned long arg);</div><div class='ctx'> static int	stli_hostcmd(stlibrd_t *brdp, stliport_t *portp);</div><div class='ctx'> static int	stli_initopen(stlibrd_t *brdp, stliport_t *portp);</div><div class='hunk'>@@ -693,7 +677,8 @@ static void	stli_dohangup(void *arg);</div><div class='ctx'> static int	stli_setport(stliport_t *portp);</div><div class='ctx'> static int	stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback);</div><div class='ctx'> static void	stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback);</div><div class='del'>-static void	stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp);</div><div class='add'>+static void	__stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback);</div><div class='add'>+static void	stli_dodelaycmd(stliport_t *portp, cdkctrl_t __iomem *cp);</div><div class='ctx'> static void	stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tiosp);</div><div class='ctx'> static void	stli_mkasysigs(asysigs_t *sp, int dtr, int rts);</div><div class='ctx'> static long	stli_mktiocm(unsigned long sigvalue);</div><div class='hunk'>@@ -763,7 +748,7 @@ static int	stli_initpcibrd(int brdtype, struct pci_dev *devp);</div><div class='ctx'>  *	will give access to the shared memory on the Stallion intelligent</div><div class='ctx'>  *	board. This is also a very useful debugging tool.</div><div class='ctx'>  */</div><div class='del'>-static struct file_operations	stli_fsiomem = {</div><div class='add'>+static const struct file_operations	stli_fsiomem = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= stli_memread,</div><div class='ctx'> 	.write		= stli_memwrite,</div><div class='hunk'>@@ -791,26 +776,14 @@ static int	stli_timeron;</div><div class='ctx'> </div><div class='ctx'> static struct class *istallion_class;</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Loadable module initialization stuff.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int __init istallion_module_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("init_module()\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='ctx'> 	stli_init();</div><div class='del'>-	restore_flags(flags);</div><div class='del'>-</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -819,56 +792,43 @@ static void __exit istallion_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	stlibrd_t	*brdp;</div><div class='ctx'> 	stliport_t	*portp;</div><div class='del'>-	unsigned long	flags;</div><div class='ctx'> 	int		i, j;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("cleanup_module()\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_INFO "Unloading %s: version %s\n", stli_drvtitle,</div><div class='ctx'> 		stli_drvversion);</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Free up all allocated resources used by the ports. This includes</div><div class='del'>- *	memory and interrupts.</div><div class='del'>- */</div><div class='add'>+	/*</div><div class='add'>+	 *	Free up all allocated resources used by the ports. This includes</div><div class='add'>+	 *	memory and interrupts.</div><div class='add'>+	 */</div><div class='ctx'> 	if (stli_timeron) {</div><div class='ctx'> 		stli_timeron = 0;</div><div class='del'>-		del_timer(&amp;stli_timerlist);</div><div class='add'>+		del_timer_sync(&amp;stli_timerlist);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = tty_unregister_driver(stli_serial);</div><div class='ctx'> 	if (i) {</div><div class='ctx'> 		printk("STALLION: failed to un-register tty driver, "</div><div class='ctx'> 			"errno=%d\n", -i);</div><div class='del'>-		restore_flags(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	put_tty_driver(stli_serial);</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		devfs_remove("staliomem/%d", i);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, i));</div><div class='del'>-	}</div><div class='del'>-	devfs_remove("staliomem");</div><div class='ctx'> 	class_destroy(istallion_class);</div><div class='ctx'> 	if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))</div><div class='ctx'> 		printk("STALLION: failed to un-register serial memory device, "</div><div class='ctx'> 			"errno=%d\n", -i);</div><div class='ctx'> </div><div class='del'>-	kfree(stli_tmpwritebuf);</div><div class='ctx'> 	kfree(stli_txcookbuf);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; (i &lt; stli_nrbrds); i++) {</div><div class='del'>-		if ((brdp = stli_brds[i]) == (stlibrd_t *) NULL)</div><div class='add'>+		if ((brdp = stli_brds[i]) == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		for (j = 0; (j &lt; STL_MAXPORTS); j++) {</div><div class='ctx'> 			portp = brdp-&gt;ports[j];</div><div class='del'>-			if (portp != (stliport_t *) NULL) {</div><div class='del'>-				if (portp-&gt;tty != (struct tty_struct *) NULL)</div><div class='add'>+			if (portp != NULL) {</div><div class='add'>+				if (portp-&gt;tty != NULL)</div><div class='ctx'> 					tty_hangup(portp-&gt;tty);</div><div class='ctx'> 				kfree(portp);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -878,10 +838,8 @@ static void __exit istallion_module_exit(void)</div><div class='ctx'> 		if (brdp-&gt;iosize &gt; 0)</div><div class='ctx'> 			release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='ctx'> 		kfree(brdp);</div><div class='del'>-		stli_brds[i] = (stlibrd_t *) NULL;</div><div class='add'>+		stli_brds[i] = NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(istallion_module_init);</div><div class='hunk'>@@ -895,19 +853,15 @@ module_exit(istallion_module_exit);</div><div class='ctx'> </div><div class='ctx'> static void stli_argbrds(void)</div><div class='ctx'> {</div><div class='del'>-	stlconf_t	conf;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		i;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_argbrds()\n");</div><div class='del'>-#endif</div><div class='add'>+	stlconf_t conf;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = stli_nrbrds; i &lt; ARRAY_SIZE(stli_brdsp); i++) {</div><div class='ctx'> 		memset(&amp;conf, 0, sizeof(conf));</div><div class='ctx'> 		if (stli_parsebrd(&amp;conf, stli_brdsp[i]) == 0)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((brdp = stli_allocbrd()) == (stlibrd_t *) NULL)</div><div class='add'>+		if ((brdp = stli_allocbrd()) == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		stli_nrbrds = i + 1;</div><div class='ctx'> 		brdp-&gt;brdnr = i;</div><div class='hunk'>@@ -926,9 +880,9 @@ static void stli_argbrds(void)</div><div class='ctx'> </div><div class='ctx'> static unsigned long stli_atol(char *str)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	val;</div><div class='del'>-	int		base, c;</div><div class='del'>-	char		*sp;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	int base, c;</div><div class='add'>+	char *sp;</div><div class='ctx'> </div><div class='ctx'> 	val = 0;</div><div class='ctx'> 	sp = str;</div><div class='hunk'>@@ -962,15 +916,11 @@ static unsigned long stli_atol(char *str)</div><div class='ctx'> </div><div class='ctx'> static int stli_parsebrd(stlconf_t *confp, char **argp)</div><div class='ctx'> {</div><div class='del'>-	char	*sp;</div><div class='del'>-	int	i;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_parsebrd(confp=%x,argp=%x)\n", (int) confp, (int) argp);</div><div class='del'>-#endif</div><div class='add'>+	char *sp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if ((argp[0] == (char *) NULL) || (*argp[0] == 0))</div><div class='del'>-		return(0);</div><div class='add'>+	if (argp[0] == NULL || *argp[0] == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (sp = argp[0], i = 0; ((*sp != 0) &amp;&amp; (i &lt; 25)); sp++, i++)</div><div class='ctx'> 		*sp = TOLOWER(*sp);</div><div class='hunk'>@@ -985,47 +935,40 @@ static int stli_parsebrd(stlconf_t *confp, char **argp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	confp-&gt;brdtype = stli_brdstr[i].type;</div><div class='del'>-	if ((argp[1] != (char *) NULL) &amp;&amp; (*argp[1] != 0))</div><div class='add'>+	if (argp[1] != NULL &amp;&amp; *argp[1] != 0)</div><div class='ctx'> 		confp-&gt;ioaddr1 = stli_atol(argp[1]);</div><div class='del'>-	if ((argp[2] != (char *) NULL) &amp;&amp; (*argp[2] != 0))</div><div class='add'>+	if (argp[2] !=  NULL &amp;&amp; *argp[2] != 0)</div><div class='ctx'> 		confp-&gt;memaddr = stli_atol(argp[2]);</div><div class='ctx'> 	return(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	unsigned int	minordev;</div><div class='del'>-	int		brdnr, portnr, rc;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_open(tty=%x,filp=%x): device=%s\n", (int) tty,</div><div class='del'>-		(int) filp, tty-&gt;name);</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	unsigned int minordev;</div><div class='add'>+	int brdnr, portnr, rc;</div><div class='ctx'> </div><div class='ctx'> 	minordev = tty-&gt;index;</div><div class='ctx'> 	brdnr = MINOR2BRD(minordev);</div><div class='ctx'> 	if (brdnr &gt;= stli_nrbrds)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if ((brdp-&gt;state &amp; BST_STARTED) == 0)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	portnr = MINOR2PORT(minordev);</div><div class='ctx'> 	if ((portnr &lt; 0) || (portnr &gt; brdp-&gt;nrports))</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	portp = brdp-&gt;ports[portnr];</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (portp-&gt;devnr &lt; 1)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1037,8 +980,8 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	if (portp-&gt;flags &amp; ASYNC_CLOSING) {</div><div class='ctx'> 		interruptible_sleep_on(&amp;portp-&gt;close_wait);</div><div class='ctx'> 		if (portp-&gt;flags &amp; ASYNC_HUP_NOTIFY)</div><div class='del'>-			return(-EAGAIN);</div><div class='del'>-		return(-ERESTARTSYS);</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		return -ERESTARTSYS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1054,7 +997,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	wait_event_interruptible(portp-&gt;raw_wait,</div><div class='ctx'> 			!test_bit(ST_INITIALIZING, &amp;portp-&gt;state));</div><div class='ctx'> 	if (signal_pending(current))</div><div class='del'>-		return(-ERESTARTSYS);</div><div class='add'>+		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='ctx'> 	if ((portp-&gt;flags &amp; ASYNC_INITIALIZED) == 0) {</div><div class='ctx'> 		set_bit(ST_INITIALIZING, &amp;portp-&gt;state);</div><div class='hunk'>@@ -1065,7 +1008,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		clear_bit(ST_INITIALIZING, &amp;portp-&gt;state);</div><div class='ctx'> 		wake_up_interruptible(&amp;portp-&gt;raw_wait);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='del'>-			return(rc);</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1077,8 +1020,8 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	if (portp-&gt;flags &amp; ASYNC_CLOSING) {</div><div class='ctx'> 		interruptible_sleep_on(&amp;portp-&gt;close_wait);</div><div class='ctx'> 		if (portp-&gt;flags &amp; ASYNC_HUP_NOTIFY)</div><div class='del'>-			return(-EAGAIN);</div><div class='del'>-		return(-ERESTARTSYS);</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		return -ERESTARTSYS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1088,38 +1031,33 @@ static int stli_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  */</div><div class='ctx'> 	if (!(filp-&gt;f_flags &amp; O_NONBLOCK)) {</div><div class='ctx'> 		if ((rc = stli_waitcarrier(brdp, portp, filp)) != 0)</div><div class='del'>-			return(rc);</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	portp-&gt;flags |= ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_close(tty=%x,filp=%x)\n", (int) tty, (int) filp);</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;stli_lock, flags);</div><div class='ctx'> 	if (tty_hung_up_p(filp)) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((tty-&gt;count == 1) &amp;&amp; (portp-&gt;refcount != 1))</div><div class='ctx'> 		portp-&gt;refcount = 1;</div><div class='ctx'> 	if (portp-&gt;refcount-- &gt; 1) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1134,6 +1072,8 @@ static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	if (tty == stli_txcooktty)</div><div class='ctx'> 		stli_flushchars(tty);</div><div class='ctx'> 	tty-&gt;closing = 1;</div><div class='add'>+	spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (portp-&gt;closing_wait != ASYNC_CLOSING_WAIT_NONE)</div><div class='ctx'> 		tty_wait_until_sent(tty, portp-&gt;closing_wait);</div><div class='ctx'> </div><div class='hunk'>@@ -1157,7 +1097,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	stli_flushbuffer(tty);</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;closing = 0;</div><div class='del'>-	portp-&gt;tty = (struct tty_struct *) NULL;</div><div class='add'>+	portp-&gt;tty = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (portp-&gt;openwaitcnt) {</div><div class='ctx'> 		if (portp-&gt;close_delay)</div><div class='hunk'>@@ -1167,7 +1107,6 @@ static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;flags &amp;= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);</div><div class='ctx'> 	wake_up_interruptible(&amp;portp-&gt;close_wait);</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1182,45 +1121,41 @@ static void stli_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> static int stli_initopen(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> {</div><div class='del'>-	struct tty_struct	*tty;</div><div class='del'>-	asynotify_t		nt;</div><div class='del'>-	asyport_t		aport;</div><div class='del'>-	int			rc;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_initopen(brdp=%x,portp=%x)\n", (int) brdp, (int) portp);</div><div class='del'>-#endif</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+	asynotify_t nt;</div><div class='add'>+	asyport_t aport;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = stli_rawopen(brdp, portp, 0, 1)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;nt, 0, sizeof(asynotify_t));</div><div class='ctx'> 	nt.data = (DT_TXLOW | DT_TXEMPTY | DT_RXBUSY | DT_RXBREAK);</div><div class='ctx'> 	nt.signal = SG_DCD;</div><div class='ctx'> 	if ((rc = stli_cmdwait(brdp, portp, A_SETNOTIFY, &amp;nt,</div><div class='ctx'> 	    sizeof(asynotify_t), 0)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	tty = portp-&gt;tty;</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (tty == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	stli_mkasyport(portp, &amp;aport, tty-&gt;termios);</div><div class='ctx'> 	if ((rc = stli_cmdwait(brdp, portp, A_SETPORT, &amp;aport,</div><div class='ctx'> 	    sizeof(asyport_t), 0)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ST_GETSIGS, &amp;portp-&gt;state);</div><div class='ctx'> 	if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS, &amp;portp-&gt;asig,</div><div class='ctx'> 	    sizeof(asysigs_t), 1)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> 	if (test_and_clear_bit(ST_GETSIGS, &amp;portp-&gt;state))</div><div class='ctx'> 		portp-&gt;sigs = stli_mktiocm(portp-&gt;asig.sigvalue);</div><div class='ctx'> 	stli_mkasysigs(&amp;portp-&gt;asig, 1, 1);</div><div class='ctx'> 	if ((rc = stli_cmdwait(brdp, portp, A_SETSIGNALS, &amp;portp-&gt;asig,</div><div class='ctx'> 	    sizeof(asysigs_t), 0)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1234,22 +1169,15 @@ static int stli_initopen(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> </div><div class='ctx'> static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, int wait)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	volatile cdkctrl_t	*cp;</div><div class='del'>-	volatile unsigned char	*bits;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	int			rc;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_rawopen(brdp=%x,portp=%x,arg=%x,wait=%d)\n",</div><div class='del'>-		(int) brdp, (int) portp, (int) arg, wait);</div><div class='del'>-#endif</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	cdkctrl_t __iomem *cp;</div><div class='add'>+	unsigned char __iomem *bits;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Send a message to the slave to open this port.</div><div class='ctx'>  */</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Slave is already closing this port. This can happen if a hangup</div><div class='hunk'>@@ -1260,7 +1188,6 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i</div><div class='ctx'> 	wait_event_interruptible(portp-&gt;raw_wait,</div><div class='ctx'> 			!test_bit(ST_CLOSING, &amp;portp-&gt;state));</div><div class='ctx'> 	if (signal_pending(current)) {</div><div class='del'>-		restore_flags(flags);</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1269,19 +1196,20 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i</div><div class='ctx'>  *	memory. Once the message is in set the service bits to say that</div><div class='ctx'>  *	this port wants service.</div><div class='ctx'>  */</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	cp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;ctrl;</div><div class='del'>-	cp-&gt;openarg = arg;</div><div class='del'>-	cp-&gt;open = 1;</div><div class='del'>-	hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-	bits = ((volatile unsigned char *) hdrp) + brdp-&gt;slaveoffset +</div><div class='add'>+	cp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;ctrl;</div><div class='add'>+	writel(arg, &amp;cp-&gt;openarg);</div><div class='add'>+	writeb(1, &amp;cp-&gt;open);</div><div class='add'>+	hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+	bits = ((unsigned char __iomem *) hdrp) + brdp-&gt;slaveoffset +</div><div class='ctx'> 		portp-&gt;portidx;</div><div class='del'>-	*bits |= portp-&gt;portbit;</div><div class='add'>+	writeb(readb(bits) | portp-&gt;portbit, bits);</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='ctx'> </div><div class='ctx'> 	if (wait == 0) {</div><div class='del'>-		restore_flags(flags);</div><div class='del'>-		return(0);</div><div class='add'>+		spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1290,15 +1218,16 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i</div><div class='ctx'>  */</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> 	set_bit(ST_OPENING, &amp;portp-&gt;state);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	wait_event_interruptible(portp-&gt;raw_wait,</div><div class='ctx'> 			!test_bit(ST_OPENING, &amp;portp-&gt;state));</div><div class='ctx'> 	if (signal_pending(current))</div><div class='ctx'> 		rc = -ERESTARTSYS;</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> </div><div class='ctx'> 	if ((rc == 0) &amp;&amp; (portp-&gt;rc != 0))</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-	return(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1311,19 +1240,11 @@ static int stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i</div><div class='ctx'> </div><div class='ctx'> static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, int wait)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	volatile cdkctrl_t	*cp;</div><div class='del'>-	volatile unsigned char	*bits;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	int			rc;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_rawclose(brdp=%x,portp=%x,arg=%x,wait=%d)\n",</div><div class='del'>-		(int) brdp, (int) portp, (int) arg, wait);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	cdkctrl_t __iomem *cp;</div><div class='add'>+	unsigned char __iomem *bits;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Slave is already closing this port. This can happen if a hangup</div><div class='hunk'>@@ -1333,7 +1254,6 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,</div><div class='ctx'> 		wait_event_interruptible(portp-&gt;raw_wait,</div><div class='ctx'> 				!test_bit(ST_CLOSING, &amp;portp-&gt;state));</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='del'>-			restore_flags(flags);</div><div class='ctx'> 			return -ERESTARTSYS;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1341,21 +1261,22 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,</div><div class='ctx'> /*</div><div class='ctx'>  *	Write the close command into shared memory.</div><div class='ctx'>  */</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	cp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;ctrl;</div><div class='del'>-	cp-&gt;closearg = arg;</div><div class='del'>-	cp-&gt;close = 1;</div><div class='del'>-	hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-	bits = ((volatile unsigned char *) hdrp) + brdp-&gt;slaveoffset +</div><div class='add'>+	cp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;ctrl;</div><div class='add'>+	writel(arg, &amp;cp-&gt;closearg);</div><div class='add'>+	writeb(1, &amp;cp-&gt;close);</div><div class='add'>+	hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+	bits = ((unsigned char __iomem *) hdrp) + brdp-&gt;slaveoffset +</div><div class='ctx'> 		portp-&gt;portidx;</div><div class='del'>-	*bits |= portp-&gt;portbit;</div><div class='add'>+	writeb(readb(bits) |portp-&gt;portbit, bits);</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ST_CLOSING, &amp;portp-&gt;state);</div><div class='del'>-	if (wait == 0) {</div><div class='del'>-		restore_flags(flags);</div><div class='del'>-		return(0);</div><div class='del'>-	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (wait == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Slave is in action, so now we must wait for the open acknowledgment</div><div class='hunk'>@@ -1366,11 +1287,10 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,</div><div class='ctx'> 			!test_bit(ST_CLOSING, &amp;portp-&gt;state));</div><div class='ctx'> 	if (signal_pending(current))</div><div class='ctx'> 		rc = -ERESTARTSYS;</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> </div><div class='ctx'> 	if ((rc == 0) &amp;&amp; (portp-&gt;rc != 0))</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-	return(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1384,36 +1304,21 @@ static int stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg,</div><div class='ctx'> </div><div class='ctx'> static int stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_cmdwait(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,"</div><div class='del'>-		"copyback=%d)\n", (int) brdp, (int) portp, (int) cmd,</div><div class='del'>-		(int) arg, size, copyback);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='ctx'> 	wait_event_interruptible(portp-&gt;raw_wait,</div><div class='ctx'> 			!test_bit(ST_CMDING, &amp;portp-&gt;state));</div><div class='del'>-	if (signal_pending(current)) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+	if (signal_pending(current))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	stli_sendcmd(brdp, portp, cmd, arg, size, copyback);</div><div class='ctx'> </div><div class='ctx'> 	wait_event_interruptible(portp-&gt;raw_wait,</div><div class='ctx'> 			!test_bit(ST_CMDING, &amp;portp-&gt;state));</div><div class='del'>-	if (signal_pending(current)) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+	if (signal_pending(current))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='del'>-	}</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (portp-&gt;rc != 0)</div><div class='del'>-		return(-EIO);</div><div class='del'>-	return(0);</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1425,22 +1330,18 @@ static int stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, v</div><div class='ctx'> </div><div class='ctx'> static int stli_setport(stliport_t *portp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	asyport_t	aport;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_setport(portp=%x)\n", (int) portp);</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	asyport_t aport;</div><div class='ctx'> </div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if (portp-&gt;tty == (struct tty_struct *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) &amp;&amp; (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (portp-&gt;tty == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 &amp;&amp; portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	stli_mkasyport(portp, &amp;aport, portp-&gt;tty-&gt;termios);</div><div class='ctx'> 	return(stli_cmdwait(brdp, portp, A_SETPORT, &amp;aport, sizeof(asyport_t), 0));</div><div class='hunk'>@@ -1455,13 +1356,8 @@ static int stli_setport(stliport_t *portp)</div><div class='ctx'> </div><div class='ctx'> static int stli_waitcarrier(stlibrd_t *brdp, stliport_t *portp, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	int		rc, doclocal;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_waitcarrier(brdp=%x,portp=%x,filp=%x)\n",</div><div class='del'>-		(int) brdp, (int) portp, (int) filp);</div><div class='del'>-#endif</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc, doclocal;</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='ctx'> 	doclocal = 0;</div><div class='hunk'>@@ -1469,11 +1365,11 @@ static int stli_waitcarrier(stlibrd_t *brdp, stliport_t *portp, struct file *fil</div><div class='ctx'> 	if (portp-&gt;tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='ctx'> 		doclocal++;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;stli_lock, flags);</div><div class='ctx'> 	portp-&gt;openwaitcnt++;</div><div class='ctx'> 	if (! tty_hung_up_p(filp))</div><div class='ctx'> 		portp-&gt;refcount--;</div><div class='add'>+	spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		stli_mkasysigs(&amp;portp-&gt;asig, 1, 1);</div><div class='hunk'>@@ -1499,12 +1395,13 @@ static int stli_waitcarrier(stlibrd_t *brdp, stliport_t *portp, struct file *fil</div><div class='ctx'> 		interruptible_sleep_on(&amp;portp-&gt;open_wait);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;stli_lock, flags);</div><div class='ctx'> 	if (! tty_hung_up_p(filp))</div><div class='ctx'> 		portp-&gt;refcount++;</div><div class='ctx'> 	portp-&gt;openwaitcnt--;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1517,46 +1414,38 @@ static int stli_waitcarrier(stlibrd_t *brdp, stliport_t *portp, struct file *fil</div><div class='ctx'> </div><div class='ctx'> static int stli_write(struct tty_struct *tty, const unsigned char *buf, int count)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkasy_t	*ap;</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	volatile unsigned char	*bits;</div><div class='del'>-	unsigned char		*shbuf, *chbuf;</div><div class='del'>-	stliport_t		*portp;</div><div class='del'>-	stlibrd_t		*brdp;</div><div class='del'>-	unsigned int		len, stlen, head, tail, size;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_write(tty=%x,buf=%x,count=%d)\n",</div><div class='del'>-		(int) tty, (int) buf, count);</div><div class='del'>-#endif</div><div class='add'>+	cdkasy_t __iomem *ap;</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	unsigned char __iomem *bits;</div><div class='add'>+	unsigned char __iomem *shbuf;</div><div class='add'>+	unsigned char *chbuf;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned int len, stlen, head, tail, size;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((tty == (struct tty_struct *) NULL) ||</div><div class='del'>-	    (stli_tmpwritebuf == (char *) NULL))</div><div class='del'>-		return(0);</div><div class='ctx'> 	if (tty == stli_txcooktty)</div><div class='ctx'> 		stli_flushchars(tty);</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	chbuf = (unsigned char *) buf;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	All data is now local, shove as much as possible into shared memory.</div><div class='ctx'>  */</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	ap = (volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='del'>-	head = (unsigned int) ap-&gt;txq.head;</div><div class='del'>-	tail = (unsigned int) ap-&gt;txq.tail;</div><div class='del'>-	if (tail != ((unsigned int) ap-&gt;txq.tail))</div><div class='del'>-		tail = (unsigned int) ap-&gt;txq.tail;</div><div class='add'>+	ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='add'>+	head = (unsigned int) readw(&amp;ap-&gt;txq.head);</div><div class='add'>+	tail = (unsigned int) readw(&amp;ap-&gt;txq.tail);</div><div class='add'>+	if (tail != ((unsigned int) readw(&amp;ap-&gt;txq.tail)))</div><div class='add'>+		tail = (unsigned int) readw(&amp;ap-&gt;txq.tail);</div><div class='ctx'> 	size = portp-&gt;txsize;</div><div class='ctx'> 	if (head &gt;= tail) {</div><div class='ctx'> 		len = size - (head - tail) - 1;</div><div class='hunk'>@@ -1568,11 +1457,11 @@ static int stli_write(struct tty_struct *tty, const unsigned char *buf, int coun</div><div class='ctx'> </div><div class='ctx'> 	len = MIN(len, count);</div><div class='ctx'> 	count = 0;</div><div class='del'>-	shbuf = (char *) EBRDGETMEMPTR(brdp, portp-&gt;txoffset);</div><div class='add'>+	shbuf = (char __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;txoffset);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		stlen = MIN(len, stlen);</div><div class='del'>-		memcpy((shbuf + head), chbuf, stlen);</div><div class='add'>+		memcpy_toio(shbuf + head, chbuf, stlen);</div><div class='ctx'> 		chbuf += stlen;</div><div class='ctx'> 		len -= stlen;</div><div class='ctx'> 		count += stlen;</div><div class='hunk'>@@ -1583,20 +1472,19 @@ static int stli_write(struct tty_struct *tty, const unsigned char *buf, int coun</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ap = (volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='del'>-	ap-&gt;txq.head = head;</div><div class='add'>+	ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='add'>+	writew(head, &amp;ap-&gt;txq.head);</div><div class='ctx'> 	if (test_bit(ST_TXBUSY, &amp;portp-&gt;state)) {</div><div class='del'>-		if (ap-&gt;changed.data &amp; DT_TXEMPTY)</div><div class='del'>-			ap-&gt;changed.data &amp;= ~DT_TXEMPTY;</div><div class='add'>+		if (readl(&amp;ap-&gt;changed.data) &amp; DT_TXEMPTY)</div><div class='add'>+			writel(readl(&amp;ap-&gt;changed.data) &amp; ~DT_TXEMPTY, &amp;ap-&gt;changed.data);</div><div class='ctx'> 	}</div><div class='del'>-	hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-	bits = ((volatile unsigned char *) hdrp) + brdp-&gt;slaveoffset +</div><div class='add'>+	hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+	bits = ((unsigned char __iomem *) hdrp) + brdp-&gt;slaveoffset +</div><div class='ctx'> 		portp-&gt;portidx;</div><div class='del'>-	*bits |= portp-&gt;portbit;</div><div class='add'>+	writeb(readb(bits) | portp-&gt;portbit, bits);</div><div class='ctx'> 	set_bit(ST_TXBUSY, &amp;portp-&gt;state);</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='del'>-</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return(count);</div><div class='ctx'> }</div><div class='hunk'>@@ -1613,14 +1501,8 @@ static int stli_write(struct tty_struct *tty, const unsigned char *buf, int coun</div><div class='ctx'> </div><div class='ctx'> static void stli_putchar(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_putchar(tty=%x,ch=%x)\n", (int) tty, (int) ch);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	if (tty != stli_txcooktty) {</div><div class='del'>-		if (stli_txcooktty != (struct tty_struct *) NULL)</div><div class='add'>+		if (stli_txcooktty != NULL)</div><div class='ctx'> 			stli_flushchars(stli_txcooktty);</div><div class='ctx'> 		stli_txcooktty = tty;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1640,29 +1522,26 @@ static void stli_putchar(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> static void stli_flushchars(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	volatile unsigned char	*bits;</div><div class='del'>-	volatile cdkasy_t	*ap;</div><div class='del'>-	struct tty_struct	*cooktty;</div><div class='del'>-	stliport_t		*portp;</div><div class='del'>-	stlibrd_t		*brdp;</div><div class='del'>-	unsigned int		len, stlen, head, tail, size, count, cooksize;</div><div class='del'>-	unsigned char		*buf, *shbuf;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_flushchars(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	unsigned char __iomem *bits;</div><div class='add'>+	cdkasy_t __iomem *ap;</div><div class='add'>+	struct tty_struct *cooktty;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned int len, stlen, head, tail, size, count, cooksize;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	unsigned char __iomem *shbuf;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	cooksize = stli_txcooksize;</div><div class='ctx'> 	cooktty = stli_txcooktty;</div><div class='ctx'> 	stli_txcooksize = 0;</div><div class='ctx'> 	stli_txcookrealsize = 0;</div><div class='del'>-	stli_txcooktty = (struct tty_struct *) NULL;</div><div class='add'>+	stli_txcooktty = NULL;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='add'>+	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if (cooktty == (struct tty_struct *) NULL)</div><div class='add'>+	if (cooktty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (tty != cooktty)</div><div class='ctx'> 		tty = cooktty;</div><div class='hunk'>@@ -1670,23 +1549,22 @@ static void stli_flushchars(struct tty_struct *tty)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='ctx'> 		return;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='ctx'> </div><div class='del'>-	ap = (volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='del'>-	head = (unsigned int) ap-&gt;txq.head;</div><div class='del'>-	tail = (unsigned int) ap-&gt;txq.tail;</div><div class='del'>-	if (tail != ((unsigned int) ap-&gt;txq.tail))</div><div class='del'>-		tail = (unsigned int) ap-&gt;txq.tail;</div><div class='add'>+	ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='add'>+	head = (unsigned int) readw(&amp;ap-&gt;txq.head);</div><div class='add'>+	tail = (unsigned int) readw(&amp;ap-&gt;txq.tail);</div><div class='add'>+	if (tail != ((unsigned int) readw(&amp;ap-&gt;txq.tail)))</div><div class='add'>+		tail = (unsigned int) readw(&amp;ap-&gt;txq.tail);</div><div class='ctx'> 	size = portp-&gt;txsize;</div><div class='ctx'> 	if (head &gt;= tail) {</div><div class='ctx'> 		len = size - (head - tail) - 1;</div><div class='hunk'>@@ -1703,7 +1581,7 @@ static void stli_flushchars(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		stlen = MIN(len, stlen);</div><div class='del'>-		memcpy((shbuf + head), buf, stlen);</div><div class='add'>+		memcpy_toio(shbuf + head, buf, stlen);</div><div class='ctx'> 		buf += stlen;</div><div class='ctx'> 		len -= stlen;</div><div class='ctx'> 		count += stlen;</div><div class='hunk'>@@ -1714,73 +1592,66 @@ static void stli_flushchars(struct tty_struct *tty)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ap = (volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='del'>-	ap-&gt;txq.head = head;</div><div class='add'>+	ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='add'>+	writew(head, &amp;ap-&gt;txq.head);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ST_TXBUSY, &amp;portp-&gt;state)) {</div><div class='del'>-		if (ap-&gt;changed.data &amp; DT_TXEMPTY)</div><div class='del'>-			ap-&gt;changed.data &amp;= ~DT_TXEMPTY;</div><div class='add'>+		if (readl(&amp;ap-&gt;changed.data) &amp; DT_TXEMPTY)</div><div class='add'>+			writel(readl(&amp;ap-&gt;changed.data) &amp; ~DT_TXEMPTY, &amp;ap-&gt;changed.data);</div><div class='ctx'> 	}</div><div class='del'>-	hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-	bits = ((volatile unsigned char *) hdrp) + brdp-&gt;slaveoffset +</div><div class='add'>+	hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+	bits = ((unsigned char __iomem *) hdrp) + brdp-&gt;slaveoffset +</div><div class='ctx'> 		portp-&gt;portidx;</div><div class='del'>-	*bits |= portp-&gt;portbit;</div><div class='add'>+	writeb(readb(bits) | portp-&gt;portbit, bits);</div><div class='ctx'> 	set_bit(ST_TXBUSY, &amp;portp-&gt;state);</div><div class='ctx'> </div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static int stli_writeroom(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkasyrq_t	*rp;</div><div class='del'>-	stliport_t		*portp;</div><div class='del'>-	stlibrd_t		*brdp;</div><div class='del'>-	unsigned int		head, tail, len;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_writeroom(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='add'>+	cdkasyrq_t __iomem *rp;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned int head, tail, len;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return(0);</div><div class='ctx'> 	if (tty == stli_txcooktty) {</div><div class='ctx'> 		if (stli_txcookrealsize != 0) {</div><div class='ctx'> 			len = stli_txcookrealsize - stli_txcooksize;</div><div class='del'>-			return(len);</div><div class='add'>+			return len;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	rp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;txq;</div><div class='del'>-	head = (unsigned int) rp-&gt;head;</div><div class='del'>-	tail = (unsigned int) rp-&gt;tail;</div><div class='del'>-	if (tail != ((unsigned int) rp-&gt;tail))</div><div class='del'>-		tail = (unsigned int) rp-&gt;tail;</div><div class='add'>+	rp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;txq;</div><div class='add'>+	head = (unsigned int) readw(&amp;rp-&gt;head);</div><div class='add'>+	tail = (unsigned int) readw(&amp;rp-&gt;tail);</div><div class='add'>+	if (tail != ((unsigned int) readw(&amp;rp-&gt;tail)))</div><div class='add'>+		tail = (unsigned int) readw(&amp;rp-&gt;tail);</div><div class='ctx'> 	len = (head &gt;= tail) ? (portp-&gt;txsize - (head - tail)) : (tail - head);</div><div class='ctx'> 	len--;</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (tty == stli_txcooktty) {</div><div class='ctx'> 		stli_txcookrealsize = len;</div><div class='ctx'> 		len -= stli_txcooksize;</div><div class='ctx'> 	}</div><div class='del'>-	return(len);</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1795,44 +1666,37 @@ static int stli_writeroom(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static int stli_charsinbuffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkasyrq_t	*rp;</div><div class='del'>-	stliport_t		*portp;</div><div class='del'>-	stlibrd_t		*brdp;</div><div class='del'>-	unsigned int		head, tail, len;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_charsinbuffer(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='add'>+	cdkasyrq_t __iomem *rp;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned int head, tail, len;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return(0);</div><div class='ctx'> 	if (tty == stli_txcooktty)</div><div class='ctx'> 		stli_flushchars(tty);</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	rp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;txq;</div><div class='del'>-	head = (unsigned int) rp-&gt;head;</div><div class='del'>-	tail = (unsigned int) rp-&gt;tail;</div><div class='del'>-	if (tail != ((unsigned int) rp-&gt;tail))</div><div class='del'>-		tail = (unsigned int) rp-&gt;tail;</div><div class='add'>+	rp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;txq;</div><div class='add'>+	head = (unsigned int) readw(&amp;rp-&gt;head);</div><div class='add'>+	tail = (unsigned int) readw(&amp;rp-&gt;tail);</div><div class='add'>+	if (tail != ((unsigned int) readw(&amp;rp-&gt;tail)))</div><div class='add'>+		tail = (unsigned int) readw(&amp;rp-&gt;tail);</div><div class='ctx'> 	len = (head &gt;= tail) ? (head - tail) : (portp-&gt;txsize - (tail - head));</div><div class='ctx'> 	if ((len == 0) &amp;&amp; test_bit(ST_TXBUSY, &amp;portp-&gt;state))</div><div class='ctx'> 		len = 1;</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='del'>-	return(len);</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1843,12 +1707,8 @@ static int stli_charsinbuffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static int stli_getserial(stliport_t *portp, struct serial_struct __user *sp)</div><div class='ctx'> {</div><div class='del'>-	struct serial_struct	sio;</div><div class='del'>-	stlibrd_t		*brdp;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_getserial(portp=%x,sp=%x)\n", (int) portp, (int) sp);</div><div class='del'>-#endif</div><div class='add'>+	struct serial_struct sio;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;sio, 0, sizeof(struct serial_struct));</div><div class='ctx'> 	sio.type = PORT_UNKNOWN;</div><div class='hunk'>@@ -1863,7 +1723,7 @@ static int stli_getserial(stliport_t *portp, struct serial_struct __user *sp)</div><div class='ctx'> 	sio.hub6 = 0;</div><div class='ctx'> </div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp != (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp != NULL)</div><div class='ctx'> 		sio.port = brdp-&gt;iobase;</div><div class='ctx'> 		</div><div class='ctx'> 	return copy_to_user(sp, &amp;sio, sizeof(struct serial_struct)) ?</div><div class='hunk'>@@ -1880,12 +1740,8 @@ static int stli_getserial(stliport_t *portp, struct serial_struct __user *sp)</div><div class='ctx'> </div><div class='ctx'> static int stli_setserial(stliport_t *portp, struct serial_struct __user *sp)</div><div class='ctx'> {</div><div class='del'>-	struct serial_struct	sio;</div><div class='del'>-	int			rc;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_setserial(portp=%p,sp=%p)\n", portp, sp);</div><div class='del'>-#endif</div><div class='add'>+	struct serial_struct sio;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;sio, sp, sizeof(struct serial_struct)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -1894,7 +1750,7 @@ static int stli_setserial(stliport_t *portp, struct serial_struct __user *sp)</div><div class='ctx'> 		    (sio.close_delay != portp-&gt;close_delay) ||</div><div class='ctx'> 		    ((sio.flags &amp; ~ASYNC_USR_MASK) !=</div><div class='ctx'> 		    (portp-&gt;flags &amp; ~ASYNC_USR_MASK)))</div><div class='del'>-			return(-EPERM);</div><div class='add'>+			return -EPERM;</div><div class='ctx'> 	} </div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;flags = (portp-&gt;flags &amp; ~ASYNC_USR_MASK) |</div><div class='hunk'>@@ -1905,8 +1761,8 @@ static int stli_setserial(stliport_t *portp, struct serial_struct __user *sp)</div><div class='ctx'> 	portp-&gt;custom_divisor = sio.custom_divisor;</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = stli_setport(portp)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='del'>-	return(0);</div><div class='add'>+		return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1917,19 +1773,19 @@ static int stli_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	stlibrd_t *brdp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(0);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='add'>+		return 0;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return(-EIO);</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = stli_cmdwait(brdp, portp, A_GETSIGNALS,</div><div class='ctx'> 			       &amp;portp-&gt;asig, sizeof(asysigs_t), 1)) &lt; 0)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	return stli_mktiocm(portp-&gt;asig.sigvalue);</div><div class='ctx'> }</div><div class='hunk'>@@ -1941,15 +1797,15 @@ static int stli_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	stlibrd_t *brdp;</div><div class='ctx'> 	int rts = -1, dtr = -1;</div><div class='ctx'> </div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(0);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='add'>+		return 0;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return(-EIO);</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (set &amp; TIOCM_RTS)</div><div class='ctx'> 		rts = 1;</div><div class='hunk'>@@ -1968,32 +1824,25 @@ static int stli_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='ctx'> </div><div class='ctx'> static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	unsigned int	ival;</div><div class='del'>-	int		rc;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned int ival;</div><div class='add'>+	int rc;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_ioctl(tty=%x,file=%x,cmd=%x,arg=%x)\n",</div><div class='del'>-		(int) tty, (int) file, cmd, (int) arg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return(0);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='add'>+		return 0;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(0);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((cmd != TIOCGSERIAL) &amp;&amp; (cmd != TIOCSSERIAL) &amp;&amp;</div><div class='ctx'>  	    (cmd != COM_GETPORTSTATS) &amp;&amp; (cmd != COM_CLRPORTSTATS)) {</div><div class='ctx'> 		if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-			return(-EIO);</div><div class='add'>+			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = 0;</div><div class='hunk'>@@ -2040,7 +1889,7 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -2052,24 +1901,20 @@ static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm</div><div class='ctx'> </div><div class='ctx'> static void stli_settermios(struct tty_struct *tty, struct termios *old)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	struct termios	*tiosp;</div><div class='del'>-	asyport_t	aport;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_settermios(tty=%x,old=%x)\n", (int) tty, (int) old);</div><div class='del'>-#endif</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	struct termios *tiosp;</div><div class='add'>+	asyport_t aport;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='add'>+	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='ctx'> 		return;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tiosp = tty-&gt;termios;</div><div class='hunk'>@@ -2102,18 +1947,9 @@ static void stli_settermios(struct tty_struct *tty, struct termios *old)</div><div class='ctx'> </div><div class='ctx'> static void stli_throttle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_throttle(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='del'>-	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	stliport_t	*portp = tty-&gt;driver_data;</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-</div><div class='ctx'> 	set_bit(ST_RXSTOP, &amp;portp-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2127,88 +1963,30 @@ static void stli_throttle(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void stli_unthrottle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_unthrottle(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='del'>-	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	stliport_t	*portp = tty-&gt;driver_data;</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-</div><div class='ctx'> 	clear_bit(ST_RXSTOP, &amp;portp-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Stop the transmitter. Basically to do this we will just turn TX</div><div class='del'>- *	interrupts off.</div><div class='add'>+ *	Stop the transmitter.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void stli_stop(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	asyctrl_t	actrl;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_stop(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='del'>-	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return;</div><div class='del'>-	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(&amp;actrl, 0, sizeof(asyctrl_t));</div><div class='del'>-	actrl.txctrl = CT_STOPFLOW;</div><div class='del'>-#if 0</div><div class='del'>-	stli_cmdwait(brdp, portp, A_PORTCTRL, &amp;actrl, sizeof(asyctrl_t), 0);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Start the transmitter again. Just turn TX interrupts back on.</div><div class='add'>+ *	Start the transmitter again.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void stli_start(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	asyctrl_t	actrl;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_start(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='del'>-	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='del'>-		return;</div><div class='del'>-	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memset(&amp;actrl, 0, sizeof(asyctrl_t));</div><div class='del'>-	actrl.txctrl = CT_STARTFLOW;</div><div class='del'>-#if 0</div><div class='del'>-	stli_cmdwait(brdp, portp, A_PORTCTRL, &amp;actrl, sizeof(asyctrl_t), 0);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -2224,22 +2002,9 @@ static void stli_start(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void stli_dohangup(void *arg)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_dohangup(portp=%x)\n", (int) arg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: There's a module removal race here: tty_hangup</div><div class='del'>-	 * calls schedule_work which will call into this</div><div class='del'>-	 * driver later.</div><div class='del'>-	 */</div><div class='del'>-	portp = (stliport_t *) arg;</div><div class='del'>-	if (portp != (stliport_t *) NULL) {</div><div class='del'>-		if (portp-&gt;tty != (struct tty_struct *) NULL) {</div><div class='del'>-			tty_hangup(portp-&gt;tty);</div><div class='del'>-		}</div><div class='add'>+	stliport_t *portp = (stliport_t *) arg;</div><div class='add'>+	if (portp-&gt;tty != NULL) {</div><div class='add'>+		tty_hangup(portp-&gt;tty);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2254,31 +2019,25 @@ static void stli_dohangup(void *arg)</div><div class='ctx'> </div><div class='ctx'> static void stli_hangup(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_hangup(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='ctx'> 		return;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;flags &amp;= ~ASYNC_INITIALIZED;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='del'>-	if (! test_bit(ST_CLOSING, &amp;portp-&gt;state))</div><div class='add'>+	if (!test_bit(ST_CLOSING, &amp;portp-&gt;state))</div><div class='ctx'> 		stli_rawclose(brdp, portp, 0, 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;stli_lock, flags);</div><div class='ctx'> 	if (tty-&gt;termios-&gt;c_cflag &amp; HUPCL) {</div><div class='ctx'> 		stli_mkasysigs(&amp;portp-&gt;asig, 0, 0);</div><div class='ctx'> 		if (test_bit(ST_CMDING, &amp;portp-&gt;state)) {</div><div class='hunk'>@@ -2290,14 +2049,15 @@ static void stli_hangup(struct tty_struct *tty)</div><div class='ctx'> 				&amp;portp-&gt;asig, sizeof(asysigs_t), 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(ST_TXBUSY, &amp;portp-&gt;state);</div><div class='ctx'> 	clear_bit(ST_RXSTOP, &amp;portp-&gt;state);</div><div class='ctx'> 	set_bit(TTY_IO_ERROR, &amp;tty-&gt;flags);</div><div class='del'>-	portp-&gt;tty = (struct tty_struct *) NULL;</div><div class='add'>+	portp-&gt;tty = NULL;</div><div class='ctx'> 	portp-&gt;flags &amp;= ~ASYNC_NORMAL_ACTIVE;</div><div class='ctx'> 	portp-&gt;refcount = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;stli_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	wake_up_interruptible(&amp;portp-&gt;open_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2312,29 +2072,22 @@ static void stli_hangup(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void stli_flushbuffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	unsigned long	ftype, flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_flushbuffer(tty=%x)\n", (int) tty);</div><div class='del'>-#endif</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned long ftype, flags;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='ctx'> 		return;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	if (tty == stli_txcooktty) {</div><div class='del'>-		stli_txcooktty = (struct tty_struct *) NULL;</div><div class='add'>+		stli_txcooktty = NULL;</div><div class='ctx'> 		stli_txcooksize = 0;</div><div class='ctx'> 		stli_txcookrealsize = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2346,15 +2099,10 @@ static void stli_flushbuffer(struct tty_struct *tty)</div><div class='ctx'> 			ftype |= FLUSHRX;</div><div class='ctx'> 			clear_bit(ST_DOFLUSHRX, &amp;portp-&gt;state);</div><div class='ctx'> 		}</div><div class='del'>-		stli_sendcmd(brdp, portp, A_FLUSH, &amp;ftype,</div><div class='del'>-			sizeof(unsigned long), 0);</div><div class='add'>+		__stli_sendcmd(brdp, portp, A_FLUSH, &amp;ftype, sizeof(u32), 0);</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='del'>-</div><div class='del'>-	wake_up_interruptible(&amp;tty-&gt;write_wait);</div><div class='del'>-	if ((tty-&gt;flags &amp; (1 &lt;&lt; TTY_DO_WRITE_WAKEUP)) &amp;&amp;</div><div class='del'>-	    tty-&gt;ldisc.write_wakeup)</div><div class='del'>-		(tty-&gt;ldisc.write_wakeup)(tty);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+	tty_wakeup(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -2364,55 +2112,31 @@ static void stli_breakctl(struct tty_struct *tty, int state)</div><div class='ctx'> 	stlibrd_t	*brdp;</div><div class='ctx'> 	stliport_t	*portp;</div><div class='ctx'> 	long		arg;</div><div class='del'>-	/* long savestate, savetime; */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_breakctl(tty=%x,state=%d)\n", (int) tty, state);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='ctx'> 		return;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Due to a bug in the tty send_break() code we need to preserve</div><div class='del'>- *	the current process state and timeout...</div><div class='del'>-	savetime = current-&gt;timeout;</div><div class='del'>-	savestate = current-&gt;state;</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> 	arg = (state == -1) ? BREAKON : BREAKOFF;</div><div class='ctx'> 	stli_cmdwait(brdp, portp, A_BREAK, &amp;arg, sizeof(long), 0);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>-	current-&gt;timeout = savetime;</div><div class='del'>-	current-&gt;state = savestate;</div><div class='del'>- */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void stli_waituntilsent(struct tty_struct *tty, int timeout)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	unsigned long	tend;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_waituntilsent(tty=%x,timeout=%x)\n", (int) tty, timeout);</div><div class='del'>-#endif</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	unsigned long tend;</div><div class='ctx'> </div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='add'>+	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (timeout == 0)</div><div class='hunk'>@@ -2436,19 +2160,13 @@ static void stli_sendxchar(struct tty_struct *tty, char ch)</div><div class='ctx'> 	stliport_t	*portp;</div><div class='ctx'> 	asyctrl_t	actrl;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_sendxchar(tty=%x,ch=%x)\n", (int) tty, ch);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='add'>+	if (portp == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if ((portp-&gt;brdnr &lt; 0) || (portp-&gt;brdnr &gt;= stli_nrbrds))</div><div class='add'>+	if (portp-&gt;brdnr &lt; 0 || portp-&gt;brdnr &gt;= stli_nrbrds)</div><div class='ctx'> 		return;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+	if (brdp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;actrl, 0, sizeof(asyctrl_t));</div><div class='hunk'>@@ -2460,7 +2178,6 @@ static void stli_sendxchar(struct tty_struct *tty, char ch)</div><div class='ctx'> 		actrl.txctrl = CT_SENDCHR;</div><div class='ctx'> 		actrl.tximdch = ch;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	stli_cmdwait(brdp, portp, A_PORTCTRL, &amp;actrl, sizeof(asyctrl_t), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2476,17 +2193,17 @@ static void stli_sendxchar(struct tty_struct *tty, char ch)</div><div class='ctx'> </div><div class='ctx'> static int stli_portinfo(stlibrd_t *brdp, stliport_t *portp, int portnr, char *pos)</div><div class='ctx'> {</div><div class='del'>-	char	*sp, *uart;</div><div class='del'>-	int	rc, cnt;</div><div class='add'>+	char *sp, *uart;</div><div class='add'>+	int rc, cnt;</div><div class='ctx'> </div><div class='ctx'> 	rc = stli_portcmdstats(portp);</div><div class='ctx'> </div><div class='ctx'> 	uart = "UNKNOWN";</div><div class='ctx'> 	if (brdp-&gt;state &amp; BST_STARTED) {</div><div class='ctx'> 		switch (stli_comstats.hwid) {</div><div class='del'>-		case 0:		uart = "2681"; break;</div><div class='del'>-		case 1:		uart = "SC26198"; break;</div><div class='del'>-		default:	uart = "CD1400"; break;</div><div class='add'>+		case 0:	uart = "2681"; break;</div><div class='add'>+		case 1:	uart = "SC26198"; break;</div><div class='add'>+		default:uart = "CD1400"; break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2537,17 +2254,11 @@ static int stli_portinfo(stlibrd_t *brdp, stliport_t *portp, int portnr, char *p</div><div class='ctx'> </div><div class='ctx'> static int stli_readproc(char *page, char **start, off_t off, int count, int *eof, void *data)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	int		brdnr, portnr, totalport;</div><div class='del'>-	int		curoff, maxoff;</div><div class='del'>-	char		*pos;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_readproc(page=%x,start=%x,off=%x,count=%d,eof=%x,"</div><div class='del'>-		"data=%x\n", (int) page, (int) start, (int) off, count,</div><div class='del'>-		(int) eof, (int) data);</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	int brdnr, portnr, totalport;</div><div class='add'>+	int curoff, maxoff;</div><div class='add'>+	char *pos;</div><div class='ctx'> </div><div class='ctx'> 	pos = page;</div><div class='ctx'> 	totalport = 0;</div><div class='hunk'>@@ -2568,7 +2279,7 @@ static int stli_readproc(char *page, char **start, off_t off, int count, int *eo</div><div class='ctx'>  */</div><div class='ctx'> 	for (brdnr = 0; (brdnr &lt; stli_nrbrds); brdnr++) {</div><div class='ctx'> 		brdp = stli_brds[brdnr];</div><div class='del'>-		if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+		if (brdp == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (brdp-&gt;state == 0)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2583,7 +2294,7 @@ static int stli_readproc(char *page, char **start, off_t off, int count, int *eo</div><div class='ctx'> 		for (portnr = 0; (portnr &lt; brdp-&gt;nrports); portnr++,</div><div class='ctx'> 		    totalport++) {</div><div class='ctx'> 			portp = brdp-&gt;ports[portnr];</div><div class='del'>-			if (portp == (stliport_t *) NULL)</div><div class='add'>+			if (portp == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (off &gt;= (curoff += MAXLINE))</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -2610,49 +2321,54 @@ stli_readdone:</div><div class='ctx'>  *	a poll routine that does not have user context. Therefore you cannot</div><div class='ctx'>  *	copy back directly into user space, or to the kernel stack of a</div><div class='ctx'>  *	process. This routine does not sleep, so can be called from anywhere.</div><div class='add'>+ *</div><div class='add'>+ *	The caller must hold the brd_lock (see also stli_sendcmd the usual</div><div class='add'>+ *	entry point)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback)</div><div class='add'>+static void __stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	volatile cdkctrl_t	*cp;</div><div class='del'>-	volatile unsigned char	*bits;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_sendcmd(brdp=%x,portp=%x,cmd=%x,arg=%x,size=%d,"</div><div class='del'>-		"copyback=%d)\n", (int) brdp, (int) portp, (int) cmd,</div><div class='del'>-		(int) arg, size, copyback);</div><div class='del'>-#endif</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	cdkctrl_t __iomem *cp;</div><div class='add'>+	unsigned char __iomem *bits;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ST_CMDING, &amp;portp-&gt;state)) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: command already busy, cmd=%x!\n",</div><div class='ctx'> 				(int) cmd);</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	cp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;ctrl;</div><div class='add'>+	cp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;ctrl;</div><div class='ctx'> 	if (size &gt; 0) {</div><div class='del'>-		memcpy((void *) &amp;(cp-&gt;args[0]), arg, size);</div><div class='add'>+		memcpy_toio((void __iomem *) &amp;(cp-&gt;args[0]), arg, size);</div><div class='ctx'> 		if (copyback) {</div><div class='ctx'> 			portp-&gt;argp = arg;</div><div class='ctx'> 			portp-&gt;argsize = size;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	cp-&gt;status = 0;</div><div class='del'>-	cp-&gt;cmd = cmd;</div><div class='del'>-	hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-	bits = ((volatile unsigned char *) hdrp) + brdp-&gt;slaveoffset +</div><div class='add'>+	writel(0, &amp;cp-&gt;status);</div><div class='add'>+	writel(cmd, &amp;cp-&gt;cmd);</div><div class='add'>+	hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+	bits = ((unsigned char __iomem *) hdrp) + brdp-&gt;slaveoffset +</div><div class='ctx'> 		portp-&gt;portidx;</div><div class='del'>-	*bits |= portp-&gt;portbit;</div><div class='add'>+	writeb(readb(bits) | portp-&gt;portbit, bits);</div><div class='ctx'> 	set_bit(ST_CMDING, &amp;portp-&gt;state);</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback)</div><div class='add'>+{</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='add'>+	__stli_sendcmd(brdp, portp, cmd, arg, size, copyback);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -2667,28 +2383,23 @@ static void stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd,</div><div class='ctx'> </div><div class='ctx'> static void stli_read(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkasyrq_t	*rp;</div><div class='del'>-	volatile char		*shbuf;</div><div class='add'>+	cdkasyrq_t __iomem *rp;</div><div class='add'>+	char __iomem *shbuf;</div><div class='ctx'> 	struct tty_struct	*tty;</div><div class='del'>-	unsigned int		head, tail, size;</div><div class='del'>-	unsigned int		len, stlen;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_read(brdp=%x,portp=%d)\n",</div><div class='del'>-			(int) brdp, (int) portp);</div><div class='del'>-#endif</div><div class='add'>+	unsigned int head, tail, size;</div><div class='add'>+	unsigned int len, stlen;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ST_RXSTOP, &amp;portp-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> 	tty = portp-&gt;tty;</div><div class='del'>-	if (tty == (struct tty_struct *) NULL)</div><div class='add'>+	if (tty == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	rp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;rxq;</div><div class='del'>-	head = (unsigned int) rp-&gt;head;</div><div class='del'>-	if (head != ((unsigned int) rp-&gt;head))</div><div class='del'>-		head = (unsigned int) rp-&gt;head;</div><div class='del'>-	tail = (unsigned int) rp-&gt;tail;</div><div class='add'>+	rp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;rxq;</div><div class='add'>+	head = (unsigned int) readw(&amp;rp-&gt;head);</div><div class='add'>+	if (head != ((unsigned int) readw(&amp;rp-&gt;head)))</div><div class='add'>+		head = (unsigned int) readw(&amp;rp-&gt;head);</div><div class='add'>+	tail = (unsigned int) readw(&amp;rp-&gt;tail);</div><div class='ctx'> 	size = portp-&gt;rxsize;</div><div class='ctx'> 	if (head &gt;= tail) {</div><div class='ctx'> 		len = head - tail;</div><div class='hunk'>@@ -2699,12 +2410,15 @@ static void stli_read(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	len = tty_buffer_request_room(tty, len);</div><div class='del'>-	/* FIXME : iomap ? */</div><div class='del'>-	shbuf = (volatile char *) EBRDGETMEMPTR(brdp, portp-&gt;rxoffset);</div><div class='add'>+</div><div class='add'>+	shbuf = (char __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;rxoffset);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='add'>+		unsigned char *cptr;</div><div class='add'>+</div><div class='ctx'> 		stlen = MIN(len, stlen);</div><div class='del'>-		tty_insert_flip_string(tty, (char *)(shbuf + tail), stlen);</div><div class='add'>+		tty_prepare_flip_string(tty, &amp;cptr, stlen);</div><div class='add'>+		memcpy_fromio(cptr, shbuf + tail, stlen);</div><div class='ctx'> 		len -= stlen;</div><div class='ctx'> 		tail += stlen;</div><div class='ctx'> 		if (tail &gt;= size) {</div><div class='hunk'>@@ -2712,8 +2426,8 @@ static void stli_read(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> 			stlen = head;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rp = &amp;((volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;rxq;</div><div class='del'>-	rp-&gt;tail = tail;</div><div class='add'>+	rp = &amp;((cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr))-&gt;rxq;</div><div class='add'>+	writew(tail, &amp;rp-&gt;tail);</div><div class='ctx'> </div><div class='ctx'> 	if (head != tail)</div><div class='ctx'> 		set_bit(ST_RXING, &amp;portp-&gt;state);</div><div class='hunk'>@@ -2729,9 +2443,9 @@ static void stli_read(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'>  *	difficult to deal with them here.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp)</div><div class='add'>+static void stli_dodelaycmd(stliport_t *portp, cdkctrl_t __iomem *cp)</div><div class='ctx'> {</div><div class='del'>-	int	cmd;</div><div class='add'>+	int cmd;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ST_DOSIGS, &amp;portp-&gt;state)) {</div><div class='ctx'> 		if (test_bit(ST_DOFLUSHTX, &amp;portp-&gt;state) &amp;&amp;</div><div class='hunk'>@@ -2746,10 +2460,10 @@ static void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp)</div><div class='ctx'> 		clear_bit(ST_DOFLUSHTX, &amp;portp-&gt;state);</div><div class='ctx'> 		clear_bit(ST_DOFLUSHRX, &amp;portp-&gt;state);</div><div class='ctx'> 		clear_bit(ST_DOSIGS, &amp;portp-&gt;state);</div><div class='del'>-		memcpy((void *) &amp;(cp-&gt;args[0]), (void *) &amp;portp-&gt;asig,</div><div class='add'>+		memcpy_toio((void __iomem *) &amp;(cp-&gt;args[0]), (void *) &amp;portp-&gt;asig,</div><div class='ctx'> 			sizeof(asysigs_t));</div><div class='del'>-		cp-&gt;status = 0;</div><div class='del'>-		cp-&gt;cmd = cmd;</div><div class='add'>+		writel(0, &amp;cp-&gt;status);</div><div class='add'>+		writel(cmd, &amp;cp-&gt;cmd);</div><div class='ctx'> 		set_bit(ST_CMDING, &amp;portp-&gt;state);</div><div class='ctx'> 	} else if (test_bit(ST_DOFLUSHTX, &amp;portp-&gt;state) ||</div><div class='ctx'> 	    test_bit(ST_DOFLUSHRX, &amp;portp-&gt;state)) {</div><div class='hunk'>@@ -2757,9 +2471,9 @@ static void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp)</div><div class='ctx'> 		cmd |= ((test_bit(ST_DOFLUSHRX, &amp;portp-&gt;state)) ? FLUSHRX : 0);</div><div class='ctx'> 		clear_bit(ST_DOFLUSHTX, &amp;portp-&gt;state);</div><div class='ctx'> 		clear_bit(ST_DOFLUSHRX, &amp;portp-&gt;state);</div><div class='del'>-		memcpy((void *) &amp;(cp-&gt;args[0]), (void *) &amp;cmd, sizeof(int));</div><div class='del'>-		cp-&gt;status = 0;</div><div class='del'>-		cp-&gt;cmd = A_FLUSH;</div><div class='add'>+		memcpy_toio((void __iomem *) &amp;(cp-&gt;args[0]), (void *) &amp;cmd, sizeof(int));</div><div class='add'>+		writel(0, &amp;cp-&gt;status);</div><div class='add'>+		writel(A_FLUSH, &amp;cp-&gt;cmd);</div><div class='ctx'> 		set_bit(ST_CMDING, &amp;portp-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2779,30 +2493,25 @@ static void stli_dodelaycmd(stliport_t *portp, volatile cdkctrl_t *cp)</div><div class='ctx'> </div><div class='ctx'> static int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkasy_t	*ap;</div><div class='del'>-	volatile cdkctrl_t	*cp;</div><div class='del'>-	struct tty_struct	*tty;</div><div class='del'>-	asynotify_t		nt;</div><div class='del'>-	unsigned long		oldsigs;</div><div class='del'>-	int			rc, donerx;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_hostcmd(brdp=%x,channr=%d)\n",</div><div class='del'>-			(int) brdp, channr);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ap = (volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='add'>+	cdkasy_t __iomem *ap;</div><div class='add'>+	cdkctrl_t __iomem *cp;</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+	asynotify_t nt;</div><div class='add'>+	unsigned long oldsigs;</div><div class='add'>+	int rc, donerx;</div><div class='add'>+</div><div class='add'>+	ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='ctx'> 	cp = &amp;ap-&gt;ctrl;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Check if we are waiting for an open completion message.</div><div class='ctx'>  */</div><div class='ctx'> 	if (test_bit(ST_OPENING, &amp;portp-&gt;state)) {</div><div class='del'>-		rc = (int) cp-&gt;openarg;</div><div class='del'>-		if ((cp-&gt;open == 0) &amp;&amp; (rc != 0)) {</div><div class='add'>+		rc = readl(&amp;cp-&gt;openarg);</div><div class='add'>+		if (readb(&amp;cp-&gt;open) == 0 &amp;&amp; rc != 0) {</div><div class='ctx'> 			if (rc &gt; 0)</div><div class='ctx'> 				rc--;</div><div class='del'>-			cp-&gt;openarg = 0;</div><div class='add'>+			writel(0, &amp;cp-&gt;openarg);</div><div class='ctx'> 			portp-&gt;rc = rc;</div><div class='ctx'> 			clear_bit(ST_OPENING, &amp;portp-&gt;state);</div><div class='ctx'> 			wake_up_interruptible(&amp;portp-&gt;raw_wait);</div><div class='hunk'>@@ -2813,11 +2522,11 @@ static int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'>  *	Check if we are waiting for a close completion message.</div><div class='ctx'>  */</div><div class='ctx'> 	if (test_bit(ST_CLOSING, &amp;portp-&gt;state)) {</div><div class='del'>-		rc = (int) cp-&gt;closearg;</div><div class='del'>-		if ((cp-&gt;close == 0) &amp;&amp; (rc != 0)) {</div><div class='add'>+		rc = (int) readl(&amp;cp-&gt;closearg);</div><div class='add'>+		if (readb(&amp;cp-&gt;close) == 0 &amp;&amp; rc != 0) {</div><div class='ctx'> 			if (rc &gt; 0)</div><div class='ctx'> 				rc--;</div><div class='del'>-			cp-&gt;closearg = 0;</div><div class='add'>+			writel(0, &amp;cp-&gt;closearg);</div><div class='ctx'> 			portp-&gt;rc = rc;</div><div class='ctx'> 			clear_bit(ST_CLOSING, &amp;portp-&gt;state);</div><div class='ctx'> 			wake_up_interruptible(&amp;portp-&gt;raw_wait);</div><div class='hunk'>@@ -2829,16 +2538,16 @@ static int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'>  *	need to copy out the command results associated with this command.</div><div class='ctx'>  */</div><div class='ctx'> 	if (test_bit(ST_CMDING, &amp;portp-&gt;state)) {</div><div class='del'>-		rc = cp-&gt;status;</div><div class='del'>-		if ((cp-&gt;cmd == 0) &amp;&amp; (rc != 0)) {</div><div class='add'>+		rc = readl(&amp;cp-&gt;status);</div><div class='add'>+		if (readl(&amp;cp-&gt;cmd) == 0 &amp;&amp; rc != 0) {</div><div class='ctx'> 			if (rc &gt; 0)</div><div class='ctx'> 				rc--;</div><div class='del'>-			if (portp-&gt;argp != (void *) NULL) {</div><div class='del'>-				memcpy(portp-&gt;argp, (void *) &amp;(cp-&gt;args[0]),</div><div class='add'>+			if (portp-&gt;argp != NULL) {</div><div class='add'>+				memcpy_fromio(portp-&gt;argp, (void __iomem *) &amp;(cp-&gt;args[0]),</div><div class='ctx'> 					portp-&gt;argsize);</div><div class='del'>-				portp-&gt;argp = (void *) NULL;</div><div class='add'>+				portp-&gt;argp = NULL;</div><div class='ctx'> 			}</div><div class='del'>-			cp-&gt;status = 0;</div><div class='add'>+			writel(0, &amp;cp-&gt;status);</div><div class='ctx'> 			portp-&gt;rc = rc;</div><div class='ctx'> 			clear_bit(ST_CMDING, &amp;portp-&gt;state);</div><div class='ctx'> 			stli_dodelaycmd(portp, cp);</div><div class='hunk'>@@ -2877,18 +2586,15 @@ static int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'> 		if (nt.data &amp; DT_TXEMPTY)</div><div class='ctx'> 			clear_bit(ST_TXBUSY, &amp;portp-&gt;state);</div><div class='ctx'> 		if (nt.data &amp; (DT_TXEMPTY | DT_TXLOW)) {</div><div class='del'>-			if (tty != (struct tty_struct *) NULL) {</div><div class='del'>-				if ((tty-&gt;flags &amp; (1 &lt;&lt; TTY_DO_WRITE_WAKEUP)) &amp;&amp;</div><div class='del'>-				    tty-&gt;ldisc.write_wakeup) {</div><div class='del'>-					(tty-&gt;ldisc.write_wakeup)(tty);</div><div class='del'>-					EBRDENABLE(brdp);</div><div class='del'>-				}</div><div class='add'>+			if (tty != NULL) {</div><div class='add'>+				tty_wakeup(tty);</div><div class='add'>+				EBRDENABLE(brdp);</div><div class='ctx'> 				wake_up_interruptible(&amp;tty-&gt;write_wait);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((nt.data &amp; DT_RXBREAK) &amp;&amp; (portp-&gt;rxmarkmsk &amp; BRKINT)) {</div><div class='del'>-			if (tty != (struct tty_struct *) NULL) {</div><div class='add'>+			if (tty != NULL) {</div><div class='ctx'> 				tty_insert_flip_char(tty, 0, TTY_BREAK);</div><div class='ctx'> 				if (portp-&gt;flags &amp; ASYNC_SAK) {</div><div class='ctx'> 					do_SAK(tty);</div><div class='hunk'>@@ -2932,14 +2638,14 @@ static int stli_hostcmd(stlibrd_t *brdp, stliport_t *portp)</div><div class='ctx'>  *	at the cdk header structure.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp)</div><div class='add'>+static void stli_brdpoll(stlibrd_t *brdp, cdkhdr_t __iomem *hdrp)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='del'>-	unsigned char	hostbits[(STL_MAXCHANS / 8) + 1];</div><div class='del'>-	unsigned char	slavebits[(STL_MAXCHANS / 8) + 1];</div><div class='del'>-	unsigned char	*slavep;</div><div class='del'>-	int		bitpos, bitat, bitsize;</div><div class='del'>-	int 		channr, nrdevs, slavebitchange;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	unsigned char hostbits[(STL_MAXCHANS / 8) + 1];</div><div class='add'>+	unsigned char slavebits[(STL_MAXCHANS / 8) + 1];</div><div class='add'>+	unsigned char __iomem *slavep;</div><div class='add'>+	int bitpos, bitat, bitsize;</div><div class='add'>+	int channr, nrdevs, slavebitchange;</div><div class='ctx'> </div><div class='ctx'> 	bitsize = brdp-&gt;bitsize;</div><div class='ctx'> 	nrdevs = brdp-&gt;nrdevs;</div><div class='hunk'>@@ -2951,7 +2657,7 @@ static void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp)</div><div class='ctx'>  *	8 service bits at a time in the inner loop, so we can bypass</div><div class='ctx'>  *	the lot if none of them want service.</div><div class='ctx'>  */</div><div class='del'>-	memcpy(&amp;hostbits[0], (((unsigned char *) hdrp) + brdp-&gt;hostoffset),</div><div class='add'>+	memcpy_fromio(&amp;hostbits[0], (((unsigned char __iomem *) hdrp) + brdp-&gt;hostoffset),</div><div class='ctx'> 		bitsize);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;slavebits[0], 0, bitsize);</div><div class='hunk'>@@ -2978,11 +2684,11 @@ static void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp)</div><div class='ctx'>  *	service may initiate more slave requests.</div><div class='ctx'>  */</div><div class='ctx'> 	if (slavebitchange) {</div><div class='del'>-		hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-		slavep = ((unsigned char *) hdrp) + brdp-&gt;slaveoffset;</div><div class='add'>+		hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+		slavep = ((unsigned char __iomem *) hdrp) + brdp-&gt;slaveoffset;</div><div class='ctx'> 		for (bitpos = 0; (bitpos &lt; bitsize); bitpos++) {</div><div class='del'>-			if (slavebits[bitpos])</div><div class='del'>-				slavep[bitpos] &amp;= ~slavebits[bitpos];</div><div class='add'>+			if (readb(slavebits + bitpos))</div><div class='add'>+				writeb(readb(slavep + bitpos) &amp; ~slavebits[bitpos], slavebits + bitpos);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3000,9 +2706,9 @@ static void stli_brdpoll(stlibrd_t *brdp, volatile cdkhdr_t *hdrp)</div><div class='ctx'> </div><div class='ctx'> static void stli_poll(unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	stlibrd_t		*brdp;</div><div class='del'>-	int 			brdnr;</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int brdnr;</div><div class='ctx'> </div><div class='ctx'> 	stli_timerlist.expires = STLI_TIMEOUT;</div><div class='ctx'> 	add_timer(&amp;stli_timerlist);</div><div class='hunk'>@@ -3012,16 +2718,18 @@ static void stli_poll(unsigned long arg)</div><div class='ctx'>  */</div><div class='ctx'> 	for (brdnr = 0; (brdnr &lt; stli_nrbrds); brdnr++) {</div><div class='ctx'> 		brdp = stli_brds[brdnr];</div><div class='del'>-		if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+		if (brdp == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if ((brdp-&gt;state &amp; BST_STARTED) == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		spin_lock(&amp;brd_lock);</div><div class='ctx'> 		EBRDENABLE(brdp);</div><div class='del'>-		hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='del'>-		if (hdrp-&gt;hostreq)</div><div class='add'>+		hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+		if (readb(&amp;hdrp-&gt;hostreq))</div><div class='ctx'> 			stli_brdpoll(brdp, hdrp);</div><div class='ctx'> 		EBRDDISABLE(brdp);</div><div class='add'>+		spin_unlock(&amp;brd_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3034,11 +2742,6 @@ static void stli_poll(unsigned long arg)</div><div class='ctx'> </div><div class='ctx'> static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tiosp)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_mkasyport(portp=%x,pp=%x,tiosp=%d)\n",</div><div class='del'>-		(int) portp, (int) pp, (int) tiosp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	memset(pp, 0, sizeof(asyport_t));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3157,11 +2860,6 @@ static void stli_mkasyport(stliport_t *portp, asyport_t *pp, struct termios *tio</div><div class='ctx'> </div><div class='ctx'> static void stli_mkasysigs(asysigs_t *sp, int dtr, int rts)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_mkasysigs(sp=%x,dtr=%d,rts=%d)\n",</div><div class='del'>-			(int) sp, dtr, rts);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	memset(sp, 0, sizeof(asysigs_t));</div><div class='ctx'> 	if (dtr &gt;= 0) {</div><div class='ctx'> 		sp-&gt;signal |= SG_DTR;</div><div class='hunk'>@@ -3182,13 +2880,7 @@ static void stli_mkasysigs(asysigs_t *sp, int dtr, int rts)</div><div class='ctx'> </div><div class='ctx'> static long stli_mktiocm(unsigned long sigvalue)</div><div class='ctx'> {</div><div class='del'>-	long	tiocm;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_mktiocm(sigvalue=%x)\n", (int) sigvalue);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	tiocm = 0;</div><div class='add'>+	long	tiocm = 0;</div><div class='ctx'> 	tiocm |= ((sigvalue &amp; SG_DCD) ? TIOCM_CD : 0);</div><div class='ctx'> 	tiocm |= ((sigvalue &amp; SG_CTS) ? TIOCM_CTS : 0);</div><div class='ctx'> 	tiocm |= ((sigvalue &amp; SG_RI) ? TIOCM_RI : 0);</div><div class='hunk'>@@ -3210,10 +2902,6 @@ static int stli_initports(stlibrd_t *brdp)</div><div class='ctx'> 	stliport_t	*portp;</div><div class='ctx'> 	int		i, panelnr, panelport;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_initports(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	for (i = 0, panelnr = 0, panelport = 0; (i &lt; brdp-&gt;nrports); i++) {</div><div class='ctx'> 		portp = kzalloc(sizeof(stliport_t), GFP_KERNEL);</div><div class='ctx'> 		if (!portp) {</div><div class='hunk'>@@ -3240,7 +2928,7 @@ static int stli_initports(stlibrd_t *brdp)</div><div class='ctx'> 		brdp-&gt;ports[i] = portp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3253,10 +2941,6 @@ static void stli_ecpinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	memconf;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpinit(brdp=%d)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(ECP_ATSTOP, (brdp-&gt;iobase + ECP_ATCONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(ECP_ATDISABLE, (brdp-&gt;iobase + ECP_ATCONFR));</div><div class='hunk'>@@ -3270,9 +2954,6 @@ static void stli_ecpinit(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_ecpenable(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpenable(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb(ECP_ATENABLE, (brdp-&gt;iobase + ECP_ATCONFR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3280,9 +2961,6 @@ static void stli_ecpenable(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_ecpdisable(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpdisable(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb(ECP_ATDISABLE, (brdp-&gt;iobase + ECP_ATCONFR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3290,13 +2968,8 @@ static void stli_ecpdisable(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static char *stli_ecpgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> {	</div><div class='del'>-	void		*ptr;</div><div class='del'>-	unsigned char	val;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,</div><div class='del'>-		(int) offset);</div><div class='del'>-#endif</div><div class='add'>+	void *ptr;</div><div class='add'>+	unsigned char val;</div><div class='ctx'> </div><div class='ctx'> 	if (offset &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='hunk'>@@ -3316,10 +2989,6 @@ static char *stli_ecpgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> </div><div class='ctx'> static void stli_ecpreset(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpreset(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(ECP_ATSTOP, (brdp-&gt;iobase + ECP_ATCONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(ECP_ATDISABLE, (brdp-&gt;iobase + ECP_ATCONFR));</div><div class='hunk'>@@ -3330,9 +2999,6 @@ static void stli_ecpreset(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_ecpintr(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpintr(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb(0x1, brdp-&gt;iobase);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3346,10 +3012,6 @@ static void stli_ecpeiinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	memconf;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpeiinit(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(0x1, (brdp-&gt;iobase + ECP_EIBRDENAB));</div><div class='ctx'> 	outb(ECP_EISTOP, (brdp-&gt;iobase + ECP_EICONFR));</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -3383,11 +3045,6 @@ static char *stli_ecpeigetmemptr(stlibrd_t *brdp, unsigned long offset, int line</div><div class='ctx'> 	void		*ptr;</div><div class='ctx'> 	unsigned char	val;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecpeigetmemptr(brdp=%x,offset=%x,line=%d)\n",</div><div class='del'>-		(int) brdp, (int) offset, line);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (offset &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='ctx'> 				"range at line=%d(%d), brd=%d\n",</div><div class='hunk'>@@ -3437,8 +3094,8 @@ static void stli_ecpmcdisable(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static char *stli_ecpmcgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> {	</div><div class='del'>-	void		*ptr;</div><div class='del'>-	unsigned char	val;</div><div class='add'>+	void *ptr;</div><div class='add'>+	unsigned char val;</div><div class='ctx'> </div><div class='ctx'> 	if (offset &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='hunk'>@@ -3472,10 +3129,6 @@ static void stli_ecpmcreset(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_ecppciinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecppciinit(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(ECP_PCISTOP, (brdp-&gt;iobase + ECP_PCICONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(0, (brdp-&gt;iobase + ECP_PCICONFR));</div><div class='hunk'>@@ -3489,11 +3142,6 @@ static char *stli_ecppcigetmemptr(stlibrd_t *brdp, unsigned long offset, int lin</div><div class='ctx'> 	void		*ptr;</div><div class='ctx'> 	unsigned char	val;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_ecppcigetmemptr(brdp=%x,offset=%x,line=%d)\n",</div><div class='del'>-		(int) brdp, (int) offset, line);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (offset &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='ctx'> 				"range at line=%d(%d), board=%d\n",</div><div class='hunk'>@@ -3528,10 +3176,6 @@ static void stli_onbinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	memconf;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbinit(brdp=%d)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(ONB_ATSTOP, (brdp-&gt;iobase + ONB_ATCONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(ONB_ATDISABLE, (brdp-&gt;iobase + ONB_ATCONFR));</div><div class='hunk'>@@ -3547,9 +3191,6 @@ static void stli_onbinit(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_onbenable(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbenable(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb((brdp-&gt;enabval | ONB_ATENABLE), (brdp-&gt;iobase + ONB_ATCONFR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3557,9 +3198,6 @@ static void stli_onbenable(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_onbdisable(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbdisable(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb((brdp-&gt;enabval | ONB_ATDISABLE), (brdp-&gt;iobase + ONB_ATCONFR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3569,11 +3207,6 @@ static char *stli_onbgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> {	</div><div class='ctx'> 	void	*ptr;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,</div><div class='del'>-		(int) offset);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (offset &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='ctx'> 				"range at line=%d(%d), brd=%d\n",</div><div class='hunk'>@@ -3589,11 +3222,6 @@ static char *stli_onbgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> </div><div class='ctx'> static void stli_onbreset(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbreset(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(ONB_ATSTOP, (brdp-&gt;iobase + ONB_ATCONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(ONB_ATDISABLE, (brdp-&gt;iobase + ONB_ATCONFR));</div><div class='hunk'>@@ -3610,10 +3238,6 @@ static void stli_onbeinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long	memconf;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbeinit(brdp=%d)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(0x1, (brdp-&gt;iobase + ONB_EIBRDENAB));</div><div class='ctx'> 	outb(ONB_EISTOP, (brdp-&gt;iobase + ONB_EICONFR));</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -3632,9 +3256,6 @@ static void stli_onbeinit(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_onbeenable(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbeenable(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb(ONB_EIENABLE, (brdp-&gt;iobase + ONB_EICONFR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3642,9 +3263,6 @@ static void stli_onbeenable(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_onbedisable(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbedisable(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='ctx'> 	outb(ONB_EIDISABLE, (brdp-&gt;iobase + ONB_EICONFR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3652,13 +3270,8 @@ static void stli_onbedisable(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static char *stli_onbegetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> {	</div><div class='del'>-	void		*ptr;</div><div class='del'>-	unsigned char	val;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_onbegetmemptr(brdp=%x,offset=%x,line=%d)\n",</div><div class='del'>-		(int) brdp, (int) offset, line);</div><div class='del'>-#endif</div><div class='add'>+	void *ptr;</div><div class='add'>+	unsigned char val;</div><div class='ctx'> </div><div class='ctx'> 	if (offset &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='hunk'>@@ -3681,11 +3294,6 @@ static char *stli_onbegetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> </div><div class='ctx'> static void stli_onbereset(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_ERR "stli_onbereset(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(ONB_EISTOP, (brdp-&gt;iobase + ONB_EICONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(ONB_EIDISABLE, (brdp-&gt;iobase + ONB_EICONFR));</div><div class='hunk'>@@ -3700,11 +3308,6 @@ static void stli_onbereset(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_bbyinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_ERR "stli_bbyinit(brdp=%d)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(BBY_ATSTOP, (brdp-&gt;iobase + BBY_ATCONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(0, (brdp-&gt;iobase + BBY_ATCONFR));</div><div class='hunk'>@@ -3717,24 +3320,13 @@ static void stli_bbyinit(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static char *stli_bbygetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> {	</div><div class='del'>-	void		*ptr;</div><div class='del'>-	unsigned char	val;</div><div class='add'>+	void *ptr;</div><div class='add'>+	unsigned char val;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_ERR "stli_bbygetmemptr(brdp=%x,offset=%x)\n", (int) brdp,</div><div class='del'>-		(int) offset);</div><div class='del'>-#endif</div><div class='add'>+	BUG_ON(offset &gt; brdp-&gt;memsize);</div><div class='ctx'> </div><div class='del'>-	if (offset &gt; brdp-&gt;memsize) {</div><div class='del'>-		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='del'>-				"range at line=%d(%d), brd=%d\n",</div><div class='del'>-				(int) offset, line, __LINE__, brdp-&gt;brdnr);</div><div class='del'>-		ptr = NULL;</div><div class='del'>-		val = 0;</div><div class='del'>-	} else {</div><div class='del'>-		ptr = brdp-&gt;membase + (offset % BBY_PAGESIZE);</div><div class='del'>-		val = (unsigned char) (offset / BBY_PAGESIZE);</div><div class='del'>-	}</div><div class='add'>+	ptr = brdp-&gt;membase + (offset % BBY_PAGESIZE);</div><div class='add'>+	val = (unsigned char) (offset / BBY_PAGESIZE);</div><div class='ctx'> 	outb(val, (brdp-&gt;iobase + BBY_ATCONFR));</div><div class='ctx'> 	return(ptr);</div><div class='ctx'> }</div><div class='hunk'>@@ -3743,11 +3335,6 @@ static char *stli_bbygetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> </div><div class='ctx'> static void stli_bbyreset(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_bbyreset(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(BBY_ATSTOP, (brdp-&gt;iobase + BBY_ATCONFR));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	outb(0, (brdp-&gt;iobase + BBY_ATCONFR));</div><div class='hunk'>@@ -3762,11 +3349,6 @@ static void stli_bbyreset(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static void stli_stalinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_stalinit(brdp=%d)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	outb(0x1, brdp-&gt;iobase);</div><div class='ctx'> 	mdelay(1000);</div><div class='ctx'> }</div><div class='hunk'>@@ -3775,36 +3357,18 @@ static void stli_stalinit(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static char *stli_stalgetmemptr(stlibrd_t *brdp, unsigned long offset, int line)</div><div class='ctx'> {	</div><div class='del'>-	void	*ptr;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_stalgetmemptr(brdp=%x,offset=%x)\n", (int) brdp,</div><div class='del'>-		(int) offset);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (offset &gt; brdp-&gt;memsize) {</div><div class='del'>-		printk(KERN_ERR "STALLION: shared memory pointer=%x out of "</div><div class='del'>-				"range at line=%d(%d), brd=%d\n",</div><div class='del'>-				(int) offset, line, __LINE__, brdp-&gt;brdnr);</div><div class='del'>-		ptr = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		ptr = brdp-&gt;membase + (offset % STAL_PAGESIZE);</div><div class='del'>-	}</div><div class='del'>-	return(ptr);</div><div class='add'>+	BUG_ON(offset &gt; brdp-&gt;memsize);</div><div class='add'>+	return brdp-&gt;membase + (offset % STAL_PAGESIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> static void stli_stalreset(stlibrd_t *brdp)</div><div class='ctx'> {	</div><div class='del'>-	volatile unsigned long	*vecp;</div><div class='add'>+	u32 __iomem *vecp;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_stalreset(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	vecp = (volatile unsigned long *) (brdp-&gt;membase + 0x30);</div><div class='del'>-	*vecp = 0xffff0000;</div><div class='add'>+	vecp = (u32 __iomem *) (brdp-&gt;membase + 0x30);</div><div class='add'>+	writel(0xffff0000, vecp);</div><div class='ctx'> 	outb(0, brdp-&gt;iobase);</div><div class='ctx'> 	mdelay(1000);</div><div class='ctx'> }</div><div class='hunk'>@@ -3818,15 +3382,11 @@ static void stli_stalreset(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-	cdkecpsig_t	sig;</div><div class='del'>-	cdkecpsig_t	*sigsp;</div><div class='del'>-	unsigned int	status, nxtid;</div><div class='del'>-	char		*name;</div><div class='del'>-	int		panelnr, nrports;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_initecp(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='add'>+	cdkecpsig_t sig;</div><div class='add'>+	cdkecpsig_t __iomem *sigsp;</div><div class='add'>+	unsigned int status, nxtid;</div><div class='add'>+	char *name;</div><div class='add'>+	int panelnr, nrports;</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(brdp-&gt;iobase, brdp-&gt;iosize, "istallion"))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -3834,7 +3394,7 @@ static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'> 	if ((brdp-&gt;iobase == 0) || (brdp-&gt;memaddr == 0))</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;iosize = ECP_IOSIZE;</div><div class='hunk'>@@ -3903,7 +3463,7 @@ static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3915,10 +3475,10 @@ static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'> 	EBRDINIT(brdp);</div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;membase = ioremap(brdp-&gt;memaddr, brdp-&gt;memsize);</div><div class='del'>-	if (brdp-&gt;membase == (void *) NULL)</div><div class='add'>+	if (brdp-&gt;membase == NULL)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3927,23 +3487,14 @@ static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'>  *	this is, and what it is connected to it.</div><div class='ctx'>  */</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	sigsp = (cdkecpsig_t *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);</div><div class='add'>+	sigsp = (cdkecpsig_t __iomem *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);</div><div class='ctx'> 	memcpy(&amp;sig, sigsp, sizeof(cdkecpsig_t));</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): sig-&gt; magic=%x rom=%x panel=%x,%x,%x,%x,%x,%x,%x,%x\n",</div><div class='del'>-		__FILE__, __LINE__, (int) sig.magic, sig.romver, sig.panelid[0],</div><div class='del'>-		(int) sig.panelid[1], (int) sig.panelid[2],</div><div class='del'>-		(int) sig.panelid[3], (int) sig.panelid[4],</div><div class='del'>-		(int) sig.panelid[5], (int) sig.panelid[6],</div><div class='del'>-		(int) sig.panelid[7]);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (sig.magic != ECP_MAGIC)</div><div class='add'>+	if (sig.magic != cpu_to_le32(ECP_MAGIC))</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3967,7 +3518,7 @@ static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;state |= BST_FOUND;</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3979,20 +3530,16 @@ static int stli_initecp(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-	cdkonbsig_t	sig;</div><div class='del'>-	cdkonbsig_t	*sigsp;</div><div class='del'>-	char		*name;</div><div class='del'>-	int		i;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_initonb(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='add'>+	cdkonbsig_t sig;</div><div class='add'>+	cdkonbsig_t __iomem *sigsp;</div><div class='add'>+	char *name;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Do a basic sanity check on the IO and memory addresses.</div><div class='ctx'>  */</div><div class='del'>-	if ((brdp-&gt;iobase == 0) || (brdp-&gt;memaddr == 0))</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp-&gt;iobase == 0 || brdp-&gt;memaddr == 0)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;iosize = ONB_IOSIZE;</div><div class='ctx'> 	</div><div class='hunk'>@@ -4010,7 +3557,6 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> 	case BRD_ONBOARD2:</div><div class='ctx'> 	case BRD_ONBOARD2_32:</div><div class='ctx'> 	case BRD_ONBOARDRS:</div><div class='del'>-		brdp-&gt;membase = (void *) brdp-&gt;memaddr;</div><div class='ctx'> 		brdp-&gt;memsize = ONB_MEMSIZE;</div><div class='ctx'> 		brdp-&gt;pagesize = ONB_ATPAGESIZE;</div><div class='ctx'> 		brdp-&gt;init = stli_onbinit;</div><div class='hunk'>@@ -4028,7 +3574,6 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BRD_ONBOARDE:</div><div class='del'>-		brdp-&gt;membase = (void *) brdp-&gt;memaddr;</div><div class='ctx'> 		brdp-&gt;memsize = ONB_EIMEMSIZE;</div><div class='ctx'> 		brdp-&gt;pagesize = ONB_EIPAGESIZE;</div><div class='ctx'> 		brdp-&gt;init = stli_onbeinit;</div><div class='hunk'>@@ -4044,7 +3589,6 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> 	case BRD_BRUMBY4:</div><div class='ctx'> 	case BRD_BRUMBY8:</div><div class='ctx'> 	case BRD_BRUMBY16:</div><div class='del'>-		brdp-&gt;membase = (void *) brdp-&gt;memaddr;</div><div class='ctx'> 		brdp-&gt;memsize = BBY_MEMSIZE;</div><div class='ctx'> 		brdp-&gt;pagesize = BBY_PAGESIZE;</div><div class='ctx'> 		brdp-&gt;init = stli_bbyinit;</div><div class='hunk'>@@ -4058,7 +3602,6 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BRD_STALLION:</div><div class='del'>-		brdp-&gt;membase = (void *) brdp-&gt;memaddr;</div><div class='ctx'> 		brdp-&gt;memsize = STAL_MEMSIZE;</div><div class='ctx'> 		brdp-&gt;pagesize = STAL_PAGESIZE;</div><div class='ctx'> 		brdp-&gt;init = stli_stalinit;</div><div class='hunk'>@@ -4073,7 +3616,7 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4085,10 +3628,10 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> 	EBRDINIT(brdp);</div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;membase = ioremap(brdp-&gt;memaddr, brdp-&gt;memsize);</div><div class='del'>-	if (brdp-&gt;membase == (void *) NULL)</div><div class='add'>+	if (brdp-&gt;membase == NULL)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4097,21 +3640,17 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'>  *	this is, and how many ports.</div><div class='ctx'>  */</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	sigsp = (cdkonbsig_t *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);</div><div class='del'>-	memcpy(&amp;sig, sigsp, sizeof(cdkonbsig_t));</div><div class='add'>+	sigsp = (cdkonbsig_t __iomem *) EBRDGETMEMPTR(brdp, CDK_SIGADDR);</div><div class='add'>+	memcpy_fromio(&amp;sig, sigsp, sizeof(cdkonbsig_t));</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	printk("%s(%d): sig-&gt; magic=%x:%x:%x:%x romver=%x amask=%x:%x:%x\n",</div><div class='del'>-		__FILE__, __LINE__, sig.magic0, sig.magic1, sig.magic2,</div><div class='del'>-		sig.magic3, sig.romver, sig.amask0, sig.amask1, sig.amask2);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if ((sig.magic0 != ONB_MAGIC0) || (sig.magic1 != ONB_MAGIC1) ||</div><div class='del'>-	    (sig.magic2 != ONB_MAGIC2) || (sig.magic3 != ONB_MAGIC3))</div><div class='add'>+	if (sig.magic0 != cpu_to_le16(ONB_MAGIC0) ||</div><div class='add'>+	    sig.magic1 != cpu_to_le16(ONB_MAGIC1) ||</div><div class='add'>+	    sig.magic2 != cpu_to_le16(ONB_MAGIC2) ||</div><div class='add'>+	    sig.magic3 != cpu_to_le16(ONB_MAGIC3))</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(brdp-&gt;iobase, brdp-&gt;iosize);</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -4132,7 +3671,7 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;state |= BST_FOUND;</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4145,31 +3684,25 @@ static int stli_initonb(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static int stli_startbrd(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-	volatile cdkhdr_t	*hdrp;</div><div class='del'>-	volatile cdkmem_t	*memp;</div><div class='del'>-	volatile cdkasy_t	*ap;</div><div class='del'>-	unsigned long		flags;</div><div class='del'>-	stliport_t		*portp;</div><div class='del'>-	int			portnr, nrdevs, i, rc;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_startbrd(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	rc = 0;</div><div class='del'>-</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	cdkhdr_t __iomem *hdrp;</div><div class='add'>+	cdkmem_t __iomem *memp;</div><div class='add'>+	cdkasy_t __iomem *ap;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	stliport_t *portp;</div><div class='add'>+	int portnr, nrdevs, i, rc = 0;</div><div class='add'>+	u32 memoff;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	EBRDENABLE(brdp);</div><div class='del'>-	hdrp = (volatile cdkhdr_t *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='add'>+	hdrp = (cdkhdr_t __iomem *) EBRDGETMEMPTR(brdp, CDK_CDKADDR);</div><div class='ctx'> 	nrdevs = hdrp-&gt;nrdevs;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	printk("%s(%d): CDK version %d.%d.%d --&gt; "</div><div class='ctx'> 		"nrdevs=%d memp=%x hostp=%x slavep=%x\n",</div><div class='del'>-		 __FILE__, __LINE__, hdrp-&gt;ver_release, hdrp-&gt;ver_modification,</div><div class='del'>-		 hdrp-&gt;ver_fix, nrdevs, (int) hdrp-&gt;memp, (int) hdrp-&gt;hostp,</div><div class='del'>-		 (int) hdrp-&gt;slavep);</div><div class='add'>+		 __FILE__, __LINE__, readb(&amp;hdrp-&gt;ver_release), readb(&amp;hdrp-&gt;ver_modification),</div><div class='add'>+		 readb(&amp;hdrp-&gt;ver_fix), nrdevs, (int) readl(&amp;hdrp-&gt;memp), readl(&amp;hdrp-&gt;hostp),</div><div class='add'>+		 readl(&amp;hdrp-&gt;slavep));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (nrdevs &lt; (brdp-&gt;nrports + 1)) {</div><div class='hunk'>@@ -4181,14 +3714,14 @@ static int stli_startbrd(stlibrd_t *brdp)</div><div class='ctx'> 	brdp-&gt;hostoffset = hdrp-&gt;hostp - CDK_CDKADDR;</div><div class='ctx'> 	brdp-&gt;slaveoffset = hdrp-&gt;slavep - CDK_CDKADDR;</div><div class='ctx'> 	brdp-&gt;bitsize = (nrdevs + 7) / 8;</div><div class='del'>-	memp = (volatile cdkmem_t *) hdrp-&gt;memp;</div><div class='del'>-	if (((unsigned long) memp) &gt; brdp-&gt;memsize) {</div><div class='add'>+	memoff = readl(&amp;hdrp-&gt;memp);</div><div class='add'>+	if (memoff &gt; brdp-&gt;memsize) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: corrupted shared memory region?\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto stli_donestartup;</div><div class='ctx'> 	}</div><div class='del'>-	memp = (volatile cdkmem_t *) EBRDGETMEMPTR(brdp, (unsigned long) memp);</div><div class='del'>-	if (memp-&gt;dtype != TYP_ASYNCTRL) {</div><div class='add'>+	memp = (cdkmem_t __iomem *) EBRDGETMEMPTR(brdp, memoff);</div><div class='add'>+	if (readw(&amp;memp-&gt;dtype) != TYP_ASYNCTRL) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: no slave control device found\n");</div><div class='ctx'> 		goto stli_donestartup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4200,19 +3733,19 @@ static int stli_startbrd(stlibrd_t *brdp)</div><div class='ctx'>  *	change pages while reading memory map.</div><div class='ctx'>  */</div><div class='ctx'> 	for (i = 1, portnr = 0; (i &lt; nrdevs); i++, portnr++, memp++) {</div><div class='del'>-		if (memp-&gt;dtype != TYP_ASYNC)</div><div class='add'>+		if (readw(&amp;memp-&gt;dtype) != TYP_ASYNC)</div><div class='ctx'> 			break;</div><div class='ctx'> 		portp = brdp-&gt;ports[portnr];</div><div class='del'>-		if (portp == (stliport_t *) NULL)</div><div class='add'>+		if (portp == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 		portp-&gt;devnr = i;</div><div class='del'>-		portp-&gt;addr = memp-&gt;offset;</div><div class='add'>+		portp-&gt;addr = readl(&amp;memp-&gt;offset);</div><div class='ctx'> 		portp-&gt;reqbit = (unsigned char) (0x1 &lt;&lt; (i * 8 / nrdevs));</div><div class='ctx'> 		portp-&gt;portidx = (unsigned char) (i / 8);</div><div class='ctx'> 		portp-&gt;portbit = (unsigned char) (0x1 &lt;&lt; (i % 8));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hdrp-&gt;slavereq = 0xff;</div><div class='add'>+	writeb(0xff, &amp;hdrp-&gt;slavereq);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	For each port setup a local copy of the RX and TX buffer offsets</div><div class='hunk'>@@ -4221,22 +3754,22 @@ static int stli_startbrd(stlibrd_t *brdp)</div><div class='ctx'>  */</div><div class='ctx'> 	for (i = 1, portnr = 0; (i &lt; nrdevs); i++, portnr++) {</div><div class='ctx'> 		portp = brdp-&gt;ports[portnr];</div><div class='del'>-		if (portp == (stliport_t *) NULL)</div><div class='add'>+		if (portp == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (portp-&gt;addr == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		ap = (volatile cdkasy_t *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='del'>-		if (ap != (volatile cdkasy_t *) NULL) {</div><div class='del'>-			portp-&gt;rxsize = ap-&gt;rxq.size;</div><div class='del'>-			portp-&gt;txsize = ap-&gt;txq.size;</div><div class='del'>-			portp-&gt;rxoffset = ap-&gt;rxq.offset;</div><div class='del'>-			portp-&gt;txoffset = ap-&gt;txq.offset;</div><div class='add'>+		ap = (cdkasy_t __iomem *) EBRDGETMEMPTR(brdp, portp-&gt;addr);</div><div class='add'>+		if (ap != NULL) {</div><div class='add'>+			portp-&gt;rxsize = readw(&amp;ap-&gt;rxq.size);</div><div class='add'>+			portp-&gt;txsize = readw(&amp;ap-&gt;txq.size);</div><div class='add'>+			portp-&gt;rxoffset = readl(&amp;ap-&gt;rxq.offset);</div><div class='add'>+			portp-&gt;txoffset = readl(&amp;ap-&gt;txq.offset);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> stli_donestartup:</div><div class='ctx'> 	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (rc == 0)</div><div class='ctx'> 		brdp-&gt;state |= BST_STARTED;</div><div class='hunk'>@@ -4247,7 +3780,7 @@ stli_donestartup:</div><div class='ctx'> 		add_timer(&amp;stli_timerlist);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4258,10 +3791,6 @@ stli_donestartup:</div><div class='ctx'> </div><div class='ctx'> static int __init stli_brdinit(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_brdinit(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	stli_brds[brdp-&gt;brdnr] = brdp;</div><div class='ctx'> </div><div class='ctx'> 	switch (brdp-&gt;brdtype) {</div><div class='hunk'>@@ -4289,11 +3818,11 @@ static int __init stli_brdinit(stlibrd_t *brdp)</div><div class='ctx'> 	case BRD_ECHPCI:</div><div class='ctx'> 		printk(KERN_ERR "STALLION: %s board type not supported in "</div><div class='ctx'> 				"this driver\n", stli_brdnames[brdp-&gt;brdtype]);</div><div class='del'>-		return(ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR "STALLION: board=%d is unknown board "</div><div class='ctx'> 				"type=%d\n", brdp-&gt;brdnr, brdp-&gt;brdtype);</div><div class='del'>-		return(ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((brdp-&gt;state &amp; BST_FOUND) == 0) {</div><div class='hunk'>@@ -4301,7 +3830,7 @@ static int __init stli_brdinit(stlibrd_t *brdp)</div><div class='ctx'> 				"io=%x mem=%x\n",</div><div class='ctx'> 			stli_brdnames[brdp-&gt;brdtype], brdp-&gt;brdnr,</div><div class='ctx'> 			brdp-&gt;iobase, (int) brdp-&gt;memaddr);</div><div class='del'>-		return(ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stli_initports(brdp);</div><div class='hunk'>@@ -4309,7 +3838,7 @@ static int __init stli_brdinit(stlibrd_t *brdp)</div><div class='ctx'> 		"nrpanels=%d nrports=%d\n", stli_brdnames[brdp-&gt;brdtype],</div><div class='ctx'> 		brdp-&gt;brdnr, brdp-&gt;iobase, (int) brdp-&gt;memaddr,</div><div class='ctx'> 		brdp-&gt;nrpanels, brdp-&gt;nrports);</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4321,14 +3850,10 @@ static int __init stli_brdinit(stlibrd_t *brdp)</div><div class='ctx'> </div><div class='ctx'> static int stli_eisamemprobe(stlibrd_t *brdp)</div><div class='ctx'> {</div><div class='del'>-	cdkecpsig_t	ecpsig, *ecpsigp;</div><div class='del'>-	cdkonbsig_t	onbsig, *onbsigp;</div><div class='add'>+	cdkecpsig_t	ecpsig, __iomem *ecpsigp;</div><div class='add'>+	cdkonbsig_t	onbsig, __iomem *onbsigp;</div><div class='ctx'> 	int		i, foundit;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_eisamemprobe(brdp=%x)\n", (int) brdp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	First up we reset the board, to get it into a known state. There</div><div class='ctx'>  *	is only 2 board types here we need to worry about. Don;t use the</div><div class='hunk'>@@ -4352,7 +3877,7 @@ static int stli_eisamemprobe(stlibrd_t *brdp)</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 		stli_onbeenable(brdp);</div><div class='ctx'> 	} else {</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	foundit = 0;</div><div class='hunk'>@@ -4364,25 +3889,24 @@ static int stli_eisamemprobe(stlibrd_t *brdp)</div><div class='ctx'>  */</div><div class='ctx'> 	for (i = 0; (i &lt; stli_eisamempsize); i++) {</div><div class='ctx'> 		brdp-&gt;memaddr = stli_eisamemprobeaddrs[i];</div><div class='del'>-		brdp-&gt;membase = (void *) brdp-&gt;memaddr;</div><div class='ctx'> 		brdp-&gt;membase = ioremap(brdp-&gt;memaddr, brdp-&gt;memsize);</div><div class='del'>-		if (brdp-&gt;membase == (void *) NULL)</div><div class='add'>+		if (brdp-&gt;membase == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (brdp-&gt;brdtype == BRD_ECPE) {</div><div class='del'>-			ecpsigp = (cdkecpsig_t *) stli_ecpeigetmemptr(brdp,</div><div class='add'>+			ecpsigp = (cdkecpsig_t __iomem *) stli_ecpeigetmemptr(brdp,</div><div class='ctx'> 				CDK_SIGADDR, __LINE__);</div><div class='del'>-			memcpy(&amp;ecpsig, ecpsigp, sizeof(cdkecpsig_t));</div><div class='del'>-			if (ecpsig.magic == ECP_MAGIC)</div><div class='add'>+			memcpy_fromio(&amp;ecpsig, ecpsigp, sizeof(cdkecpsig_t));</div><div class='add'>+			if (ecpsig.magic == cpu_to_le32(ECP_MAGIC))</div><div class='ctx'> 				foundit = 1;</div><div class='ctx'> 		} else {</div><div class='del'>-			onbsigp = (cdkonbsig_t *) stli_onbegetmemptr(brdp,</div><div class='add'>+			onbsigp = (cdkonbsig_t __iomem *) stli_onbegetmemptr(brdp,</div><div class='ctx'> 				CDK_SIGADDR, __LINE__);</div><div class='del'>-			memcpy(&amp;onbsig, onbsigp, sizeof(cdkonbsig_t));</div><div class='del'>-			if ((onbsig.magic0 == ONB_MAGIC0) &amp;&amp;</div><div class='del'>-			    (onbsig.magic1 == ONB_MAGIC1) &amp;&amp;</div><div class='del'>-			    (onbsig.magic2 == ONB_MAGIC2) &amp;&amp;</div><div class='del'>-			    (onbsig.magic3 == ONB_MAGIC3))</div><div class='add'>+			memcpy_fromio(&amp;onbsig, onbsigp, sizeof(cdkonbsig_t));</div><div class='add'>+			if ((onbsig.magic0 == cpu_to_le16(ONB_MAGIC0)) &amp;&amp;</div><div class='add'>+			    (onbsig.magic1 == cpu_to_le16(ONB_MAGIC1)) &amp;&amp;</div><div class='add'>+			    (onbsig.magic2 == cpu_to_le16(ONB_MAGIC2)) &amp;&amp;</div><div class='add'>+			    (onbsig.magic3 == cpu_to_le16(ONB_MAGIC3)))</div><div class='ctx'> 				foundit = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -4406,9 +3930,9 @@ static int stli_eisamemprobe(stlibrd_t *brdp)</div><div class='ctx'> 		printk(KERN_ERR "STALLION: failed to probe shared memory "</div><div class='ctx'> 				"region for %s in EISA slot=%d\n",</div><div class='ctx'> 			stli_brdnames[brdp-&gt;brdtype], (brdp-&gt;iobase &gt;&gt; 12));</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int stli_getbrdnr(void)</div><div class='hunk'>@@ -4439,22 +3963,16 @@ static int stli_getbrdnr(void)</div><div class='ctx'> </div><div class='ctx'> static int stli_findeisabrds(void)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	unsigned int	iobase, eid;</div><div class='del'>-	int		i;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_findeisabrds()\n");</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	unsigned int iobase, eid;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Firstly check if this is an EISA system. Do this by probing for</div><div class='del'>- *	the system board EISA ID. If this is not an EISA system then</div><div class='add'>+ *	Firstly check if this is an EISA system.  If this is not an EISA system then</div><div class='ctx'>  *	don't bother going any further!</div><div class='ctx'>  */</div><div class='del'>-	outb(0xff, 0xc80);</div><div class='del'>-	if (inb(0xc80) == 0xff)</div><div class='del'>-		return(0);</div><div class='add'>+	if (EISA_bus)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Looks like an EISA system, so go searching for EISA boards.</div><div class='hunk'>@@ -4472,7 +3990,7 @@ static int stli_findeisabrds(void)</div><div class='ctx'>  */</div><div class='ctx'> 		for (i = 0; (i &lt; STL_MAXBRDS); i++) {</div><div class='ctx'> 			brdp = stli_brds[i];</div><div class='del'>-			if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+			if (brdp == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (brdp-&gt;iobase == iobase)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -4484,10 +4002,10 @@ static int stli_findeisabrds(void)</div><div class='ctx'>  *		We have found a Stallion board and it is not configured already.</div><div class='ctx'>  *		Allocate a board structure and initialize it.</div><div class='ctx'>  */</div><div class='del'>-		if ((brdp = stli_allocbrd()) == (stlibrd_t *) NULL)</div><div class='del'>-			return(-ENOMEM);</div><div class='add'>+		if ((brdp = stli_allocbrd()) == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		if ((brdp-&gt;brdnr = stli_getbrdnr()) &lt; 0)</div><div class='del'>-			return(-ENOMEM);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		eid = inb(iobase + 0xc82);</div><div class='ctx'> 		if (eid == ECP_EISAID)</div><div class='ctx'> 			brdp-&gt;brdtype = BRD_ECPE;</div><div class='hunk'>@@ -4502,7 +4020,7 @@ static int stli_findeisabrds(void)</div><div class='ctx'> 		stli_brdinit(brdp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4523,32 +4041,18 @@ static int stli_findeisabrds(void)</div><div class='ctx'> </div><div class='ctx'> static int stli_initpcibrd(int brdtype, struct pci_dev *devp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_initpcibrd(brdtype=%d,busnr=%x,devnr=%x)\n",</div><div class='del'>-		brdtype, dev-&gt;bus-&gt;number, dev-&gt;devfn);</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp;</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(devp))</div><div class='del'>-		return(-EIO);</div><div class='del'>-	if ((brdp = stli_allocbrd()) == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENOMEM);</div><div class='add'>+		return -EIO;</div><div class='add'>+	if ((brdp = stli_allocbrd()) == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	if ((brdp-&gt;brdnr = stli_getbrdnr()) &lt; 0) {</div><div class='ctx'> 		printk(KERN_INFO "STALLION: too many boards found, "</div><div class='ctx'> 			"maximum supported %d\n", STL_MAXBRDS);</div><div class='del'>-		return(0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	brdp-&gt;brdtype = brdtype;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "%s(%d): BAR[]=%lx,%lx,%lx,%lx\n", __FILE__, __LINE__,</div><div class='del'>-		pci_resource_start(devp, 0),</div><div class='del'>-		pci_resource_start(devp, 1),</div><div class='del'>-		pci_resource_start(devp, 2),</div><div class='del'>-		pci_resource_start(devp, 3));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	We have all resources from the board, so lets setup the actual</div><div class='ctx'>  *	board structure now.</div><div class='hunk'>@@ -4557,7 +4061,7 @@ static int stli_initpcibrd(int brdtype, struct pci_dev *devp)</div><div class='ctx'> 	brdp-&gt;memaddr = pci_resource_start(devp, 2);</div><div class='ctx'> 	stli_brdinit(brdp);</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4569,20 +4073,12 @@ static int stli_initpcibrd(int brdtype, struct pci_dev *devp)</div><div class='ctx'> </div><div class='ctx'> static int stli_findpcibrds(void)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev	*dev = NULL;</div><div class='del'>-	int		rc;</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("stli_findpcibrds()\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	while ((dev = pci_find_device(PCI_VENDOR_ID_STALLION,</div><div class='del'>-	    PCI_DEVICE_ID_ECRA, dev))) {</div><div class='del'>-		if ((rc = stli_initpcibrd(BRD_ECPPCI, dev)))</div><div class='del'>-			return(rc);</div><div class='add'>+	while ((dev = pci_get_device(PCI_VENDOR_ID_STALLION, PCI_DEVICE_ID_ECRA, dev))) {</div><div class='add'>+		stli_initpcibrd(BRD_ECPPCI, dev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -4595,17 +4091,16 @@ static int stli_findpcibrds(void)</div><div class='ctx'> </div><div class='ctx'> static stlibrd_t *stli_allocbrd(void)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='ctx'> </div><div class='ctx'> 	brdp = kzalloc(sizeof(stlibrd_t), GFP_KERNEL);</div><div class='ctx'> 	if (!brdp) {</div><div class='ctx'> 		printk(KERN_ERR "STALLION: failed to allocate memory "</div><div class='del'>-				"(size=%d)\n", sizeof(stlibrd_t));</div><div class='add'>+				"(size=%Zd)\n", sizeof(stlibrd_t));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	brdp-&gt;magic = STLI_BOARDMAGIC;</div><div class='del'>-	return(brdp);</div><div class='add'>+	return brdp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4617,13 +4112,9 @@ static stlibrd_t *stli_allocbrd(void)</div><div class='ctx'> </div><div class='ctx'> static int stli_initbrds(void)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp, *nxtbrdp;</div><div class='del'>-	stlconf_t	*confp;</div><div class='del'>-	int		i, j;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_initbrds()\n");</div><div class='del'>-#endif</div><div class='add'>+	stlibrd_t *brdp, *nxtbrdp;</div><div class='add'>+	stlconf_t *confp;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	if (stli_nrbrds &gt; STL_MAXBRDS) {</div><div class='ctx'> 		printk(KERN_INFO "STALLION: too many boards in configuration "</div><div class='hunk'>@@ -4638,11 +4129,9 @@ static int stli_initbrds(void)</div><div class='ctx'>  */</div><div class='ctx'> 	for (i = 0; (i &lt; stli_nrbrds); i++) {</div><div class='ctx'> 		confp = &amp;stli_brdconf[i];</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> 		stli_parsebrd(confp, stli_brdsp[i]);</div><div class='del'>-#endif</div><div class='del'>-		if ((brdp = stli_allocbrd()) == (stlibrd_t *) NULL)</div><div class='del'>-			return(-ENOMEM);</div><div class='add'>+		if ((brdp = stli_allocbrd()) == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		brdp-&gt;brdnr = i;</div><div class='ctx'> 		brdp-&gt;brdtype = confp-&gt;brdtype;</div><div class='ctx'> 		brdp-&gt;iobase = confp-&gt;ioaddr1;</div><div class='hunk'>@@ -4654,9 +4143,7 @@ static int stli_initbrds(void)</div><div class='ctx'>  *	Static configuration table done, so now use dynamic methods to</div><div class='ctx'>  *	see if any more boards should be configured.</div><div class='ctx'>  */</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> 	stli_argbrds();</div><div class='del'>-#endif</div><div class='ctx'> 	if (STLI_EISAPROBE)</div><div class='ctx'> 		stli_findeisabrds();</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -4672,11 +4159,11 @@ static int stli_initbrds(void)</div><div class='ctx'> 	if (stli_nrbrds &gt; 1) {</div><div class='ctx'> 		for (i = 0; (i &lt; stli_nrbrds); i++) {</div><div class='ctx'> 			brdp = stli_brds[i];</div><div class='del'>-			if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+			if (brdp == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			for (j = i + 1; (j &lt; stli_nrbrds); j++) {</div><div class='ctx'> 				nxtbrdp = stli_brds[j];</div><div class='del'>-				if (nxtbrdp == (stlibrd_t *) NULL)</div><div class='add'>+				if (nxtbrdp == NULL)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				if ((brdp-&gt;membase &gt;= nxtbrdp-&gt;membase) &amp;&amp;</div><div class='ctx'> 				    (brdp-&gt;membase &lt;= (nxtbrdp-&gt;membase +</div><div class='hunk'>@@ -4691,7 +4178,7 @@ static int stli_initbrds(void)</div><div class='ctx'> 	if (stli_shared == 0) {</div><div class='ctx'> 		for (i = 0; (i &lt; stli_nrbrds); i++) {</div><div class='ctx'> 			brdp = stli_brds[i];</div><div class='del'>-			if (brdp == (stlibrd_t *) NULL)</div><div class='add'>+			if (brdp == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (brdp-&gt;state &amp; BST_FOUND) {</div><div class='ctx'> 				EBRDENABLE(brdp);</div><div class='hunk'>@@ -4701,7 +4188,7 @@ static int stli_initbrds(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4714,48 +4201,55 @@ static int stli_initbrds(void)</div><div class='ctx'> </div><div class='ctx'> static ssize_t stli_memread(struct file *fp, char __user *buf, size_t count, loff_t *offp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	void		*memptr;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		brdnr, size, n;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_memread(fp=%x,buf=%x,count=%x,offp=%x)\n",</div><div class='del'>-			(int) fp, (int) buf, count, (int) offp);</div><div class='del'>-#endif</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	void *memptr;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int brdnr, size, n;</div><div class='add'>+	void *p;</div><div class='add'>+	loff_t off = *offp;</div><div class='ctx'> </div><div class='ctx'> 	brdnr = iminor(fp-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	if (brdnr &gt;= stli_nrbrds)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (brdp-&gt;state == 0)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if (fp-&gt;f_pos &gt;= brdp-&gt;memsize)</div><div class='del'>-		return(0);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (off &gt;= brdp-&gt;memsize || off + count &lt; off)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	size = MIN(count, (brdp-&gt;memsize - fp-&gt;f_pos));</div><div class='add'>+	size = MIN(count, (brdp-&gt;memsize - off));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Copy the data a page at a time</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	p = (void *)__get_free_page(GFP_KERNEL);</div><div class='add'>+	if(p == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='del'>-	EBRDENABLE(brdp);</div><div class='ctx'> 	while (size &gt; 0) {</div><div class='del'>-		memptr = (void *) EBRDGETMEMPTR(brdp, fp-&gt;f_pos);</div><div class='del'>-		n = MIN(size, (brdp-&gt;pagesize - (((unsigned long) fp-&gt;f_pos) % brdp-&gt;pagesize)));</div><div class='del'>-		if (copy_to_user(buf, memptr, n)) {</div><div class='add'>+		spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='add'>+		EBRDENABLE(brdp);</div><div class='add'>+		memptr = (void *) EBRDGETMEMPTR(brdp, off);</div><div class='add'>+		n = MIN(size, (brdp-&gt;pagesize - (((unsigned long) off) % brdp-&gt;pagesize)));</div><div class='add'>+		n = MIN(n, PAGE_SIZE);</div><div class='add'>+		memcpy_fromio(p, memptr, n);</div><div class='add'>+		EBRDDISABLE(brdp);</div><div class='add'>+		spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+		if (copy_to_user(buf, p, n)) {</div><div class='ctx'> 			count = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		fp-&gt;f_pos += n;</div><div class='add'>+		off += n;</div><div class='ctx'> 		buf += n;</div><div class='ctx'> 		size -= n;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='del'>-</div><div class='del'>-	return(count);</div><div class='add'>+	*offp = off;</div><div class='add'>+	free_page((unsigned long)p);</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4764,54 +4258,65 @@ out:</div><div class='ctx'>  *	Code to handle an "staliomem" write operation. This device is the </div><div class='ctx'>  *	contents of the board shared memory. It is used for down loading</div><div class='ctx'>  *	the slave image (and debugging :-)</div><div class='add'>+ *</div><div class='add'>+ *	FIXME: copy under lock</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static ssize_t stli_memwrite(struct file *fp, const char __user *buf, size_t count, loff_t *offp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	void		*memptr;</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	char		__user *chbuf;</div><div class='del'>-	int		brdnr, size, n;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_memwrite(fp=%x,buf=%x,count=%x,offp=%x)\n",</div><div class='del'>-			(int) fp, (int) buf, count, (int) offp);</div><div class='del'>-#endif</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	void *memptr;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	char __user *chbuf;</div><div class='add'>+	int brdnr, size, n;</div><div class='add'>+	void *p;</div><div class='add'>+	loff_t off = *offp;</div><div class='ctx'> </div><div class='ctx'> 	brdnr = iminor(fp-&gt;f_dentry-&gt;d_inode);</div><div class='add'>+</div><div class='ctx'> 	if (brdnr &gt;= stli_nrbrds)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (brdp-&gt;state == 0)</div><div class='del'>-		return(-ENODEV);</div><div class='del'>-	if (fp-&gt;f_pos &gt;= brdp-&gt;memsize)</div><div class='del'>-		return(0);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (off &gt;= brdp-&gt;memsize || off + count &lt; off)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	chbuf = (char __user *) buf;</div><div class='del'>-	size = MIN(count, (brdp-&gt;memsize - fp-&gt;f_pos));</div><div class='add'>+	size = MIN(count, (brdp-&gt;memsize - off));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 *	Copy the data a page at a time</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	p = (void *)__get_free_page(GFP_KERNEL);</div><div class='add'>+	if(p == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='del'>-	EBRDENABLE(brdp);</div><div class='ctx'> 	while (size &gt; 0) {</div><div class='del'>-		memptr = (void *) EBRDGETMEMPTR(brdp, fp-&gt;f_pos);</div><div class='del'>-		n = MIN(size, (brdp-&gt;pagesize - (((unsigned long) fp-&gt;f_pos) % brdp-&gt;pagesize)));</div><div class='del'>-		if (copy_from_user(memptr, chbuf, n)) {</div><div class='del'>-			count = -EFAULT;</div><div class='add'>+		n = MIN(size, (brdp-&gt;pagesize - (((unsigned long) off) % brdp-&gt;pagesize)));</div><div class='add'>+		n = MIN(n, PAGE_SIZE);</div><div class='add'>+		if (copy_from_user(p, chbuf, n)) {</div><div class='add'>+			if (count == 0)</div><div class='add'>+				count = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='del'>-		fp-&gt;f_pos += n;</div><div class='add'>+		spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='add'>+		EBRDENABLE(brdp);</div><div class='add'>+		memptr = (void *) EBRDGETMEMPTR(brdp, off);</div><div class='add'>+		memcpy_toio(memptr, p, n);</div><div class='add'>+		EBRDDISABLE(brdp);</div><div class='add'>+		spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='add'>+		off += n;</div><div class='ctx'> 		chbuf += n;</div><div class='ctx'> 		size -= n;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	EBRDDISABLE(brdp);</div><div class='del'>-	restore_flags(flags);</div><div class='del'>-</div><div class='del'>-	return(count);</div><div class='add'>+	free_page((unsigned long) p);</div><div class='add'>+	*offp = off;</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4822,16 +4327,16 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int stli_getbrdstats(combrd_t __user *bp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		i;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;stli_brdstats, bp, sizeof(combrd_t)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (stli_brdstats.brd &gt;= STL_MAXBRDS)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[stli_brdstats.brd];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;stli_brdstats, 0, sizeof(combrd_t));</div><div class='ctx'> 	stli_brdstats.brd = brdp-&gt;brdnr;</div><div class='hunk'>@@ -4850,7 +4355,7 @@ static int stli_getbrdstats(combrd_t __user *bp)</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(bp, &amp;stli_brdstats, sizeof(combrd_t)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4861,19 +4366,19 @@ static int stli_getbrdstats(combrd_t __user *bp)</div><div class='ctx'> </div><div class='ctx'> static stliport_t *stli_getport(int brdnr, int panelnr, int portnr)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		i;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if ((brdnr &lt; 0) || (brdnr &gt;= STL_MAXBRDS))</div><div class='del'>-		return((stliport_t *) NULL);</div><div class='add'>+	if (brdnr &lt; 0 || brdnr &gt;= STL_MAXBRDS)</div><div class='add'>+		return NULL;</div><div class='ctx'> 	brdp = stli_brds[brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return((stliport_t *) NULL);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return NULL;</div><div class='ctx'> 	for (i = 0; (i &lt; panelnr); i++)</div><div class='ctx'> 		portnr += brdp-&gt;panels[i];</div><div class='ctx'> 	if ((portnr &lt; 0) || (portnr &gt;= brdp-&gt;nrports))</div><div class='del'>-		return((stliport_t *) NULL);</div><div class='del'>-	return(brdp-&gt;ports[portnr]);</div><div class='add'>+		return NULL;</div><div class='add'>+	return brdp-&gt;ports[portnr];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4892,16 +4397,16 @@ static int stli_portcmdstats(stliport_t *portp)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;stli_comstats, 0, sizeof(comstats_t));</div><div class='ctx'> </div><div class='del'>-	if (portp == (stliport_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (portp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[portp-&gt;brdnr];</div><div class='del'>-	if (brdp == (stlibrd_t *) NULL)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+	if (brdp == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (brdp-&gt;state &amp; BST_STARTED) {</div><div class='ctx'> 		if ((rc = stli_cmdwait(brdp, portp, A_GETSTATS,</div><div class='ctx'> 		    &amp;stli_cdkstats, sizeof(asystats_t), 1)) &lt; 0)</div><div class='del'>-			return(rc);</div><div class='add'>+			return rc;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memset(&amp;stli_cdkstats, 0, sizeof(asystats_t));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4912,13 +4417,12 @@ static int stli_portcmdstats(stliport_t *portp)</div><div class='ctx'> 	stli_comstats.state = portp-&gt;state;</div><div class='ctx'> 	stli_comstats.flags = portp-&gt;flags;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='del'>-	if (portp-&gt;tty != (struct tty_struct *) NULL) {</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='add'>+	if (portp-&gt;tty != NULL) {</div><div class='ctx'> 		if (portp-&gt;tty-&gt;driver_data == portp) {</div><div class='ctx'> 			stli_comstats.ttystate = portp-&gt;tty-&gt;flags;</div><div class='del'>-			stli_comstats.rxbuffered = -1 /*portp-&gt;tty-&gt;flip.count*/;</div><div class='del'>-			if (portp-&gt;tty-&gt;termios != (struct termios *) NULL) {</div><div class='add'>+			stli_comstats.rxbuffered = -1;</div><div class='add'>+			if (portp-&gt;tty-&gt;termios != NULL) {</div><div class='ctx'> 				stli_comstats.cflags = portp-&gt;tty-&gt;termios-&gt;c_cflag;</div><div class='ctx'> 				stli_comstats.iflags = portp-&gt;tty-&gt;termios-&gt;c_iflag;</div><div class='ctx'> 				stli_comstats.oflags = portp-&gt;tty-&gt;termios-&gt;c_oflag;</div><div class='hunk'>@@ -4926,7 +4430,7 @@ static int stli_portcmdstats(stliport_t *portp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	stli_comstats.txtotal = stli_cdkstats.txchars;</div><div class='ctx'> 	stli_comstats.rxtotal = stli_cdkstats.rxchars + stli_cdkstats.ringover;</div><div class='hunk'>@@ -4948,7 +4452,7 @@ static int stli_portcmdstats(stliport_t *portp)</div><div class='ctx'> 	stli_comstats.hwid = stli_cdkstats.hwid;</div><div class='ctx'> 	stli_comstats.signals = stli_mktiocm(stli_cdkstats.signals);</div><div class='ctx'> </div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4961,8 +4465,8 @@ static int stli_portcmdstats(stliport_t *portp)</div><div class='ctx'> </div><div class='ctx'> static int stli_getportstats(stliport_t *portp, comstats_t __user *cp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		rc;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!portp) {</div><div class='ctx'> 		if (copy_from_user(&amp;stli_comstats, cp, sizeof(comstats_t)))</div><div class='hunk'>@@ -4992,8 +4496,8 @@ static int stli_getportstats(stliport_t *portp, comstats_t __user *cp)</div><div class='ctx'> </div><div class='ctx'> static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		rc;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!portp) {</div><div class='ctx'> 		if (copy_from_user(&amp;stli_comstats, cp, sizeof(comstats_t)))</div><div class='hunk'>@@ -5031,7 +4535,7 @@ static int stli_clrportstats(stliport_t *portp, comstats_t __user *cp)</div><div class='ctx'> </div><div class='ctx'> static int stli_getportstruct(stliport_t __user *arg)</div><div class='ctx'> {</div><div class='del'>-	stliport_t	*portp;</div><div class='add'>+	stliport_t *portp;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;stli_dummyport, arg, sizeof(stliport_t)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -5052,7 +4556,7 @@ static int stli_getportstruct(stliport_t __user *arg)</div><div class='ctx'> </div><div class='ctx'> static int stli_getbrdstruct(stlibrd_t __user *arg)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;stli_dummybrd, arg, sizeof(stlibrd_t)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -5076,15 +4580,10 @@ static int stli_getbrdstruct(stlibrd_t __user *arg)</div><div class='ctx'> </div><div class='ctx'> static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	stlibrd_t	*brdp;</div><div class='del'>-	int		brdnr, rc, done;</div><div class='add'>+	stlibrd_t *brdp;</div><div class='add'>+	int brdnr, rc, done;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(KERN_DEBUG "stli_memioctl(ip=%x,fp=%x,cmd=%x,arg=%x)\n",</div><div class='del'>-			(int) ip, (int) fp, cmd, (int) arg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	First up handle the board independent ioctls.</div><div class='ctx'>  */</div><div class='hunk'>@@ -5115,7 +4614,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (done)</div><div class='del'>-		return(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Now handle the board specific ioctls. These all depend on the</div><div class='hunk'>@@ -5123,12 +4622,12 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un</div><div class='ctx'>  */</div><div class='ctx'> 	brdnr = iminor(ip);</div><div class='ctx'> 	if (brdnr &gt;= STL_MAXBRDS)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	brdp = stli_brds[brdnr];</div><div class='ctx'> 	if (!brdp)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	if (brdp-&gt;state == 0)</div><div class='del'>-		return(-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case STL_BINTR:</div><div class='hunk'>@@ -5152,8 +4651,7 @@ static int stli_memioctl(struct inode *ip, struct file *fp, unsigned int cmd, un</div><div class='ctx'> 		rc = -ENOIOCTLCMD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return(rc);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tty_operations stli_ops = {</div><div class='hunk'>@@ -5182,11 +4680,14 @@ static struct tty_operations stli_ops = {</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-int __init stli_init(void)</div><div class='add'>+static int __init stli_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	printk(KERN_INFO "%s: version %s\n", stli_drvtitle, stli_drvversion);</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;stli_lock);</div><div class='add'>+	spin_lock_init(&amp;brd_lock);</div><div class='add'>+</div><div class='ctx'> 	stli_initbrds();</div><div class='ctx'> </div><div class='ctx'> 	stli_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);</div><div class='hunk'>@@ -5196,10 +4697,6 @@ int __init stli_init(void)</div><div class='ctx'> /*</div><div class='ctx'>  *	Allocate a temporary write buffer.</div><div class='ctx'>  */</div><div class='del'>-	stli_tmpwritebuf = kmalloc(STLI_TXBUFSIZE, GFP_KERNEL);</div><div class='del'>-	if (!stli_tmpwritebuf)</div><div class='del'>-		printk(KERN_ERR "STALLION: failed to allocate memory "</div><div class='del'>-				"(size=%d)\n", STLI_TXBUFSIZE);</div><div class='ctx'> 	stli_txcookbuf = kmalloc(STLI_TXBUFSIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!stli_txcookbuf)</div><div class='ctx'> 		printk(KERN_ERR "STALLION: failed to allocate memory "</div><div class='hunk'>@@ -5213,16 +4710,11 @@ int __init stli_init(void)</div><div class='ctx'> 		printk(KERN_ERR "STALLION: failed to register serial memory "</div><div class='ctx'> 				"device\n");</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("staliomem");</div><div class='ctx'> 	istallion_class = class_create(THIS_MODULE, "staliomem");</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),</div><div class='del'>-			       S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-			       "staliomem/%d", i);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		class_device_create(istallion_class, NULL,</div><div class='ctx'> 				MKDEV(STL_SIOMEMMAJOR, i),</div><div class='ctx'> 				NULL, "staliomem%d", i);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Set up the tty driver structure and register us as a driver.</div><div class='hunk'>@@ -5243,7 +4735,7 @@ int __init stli_init(void)</div><div class='ctx'> 		printk(KERN_ERR "STALLION: failed to register serial driver\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	return(0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='head'>diff --git a/drivers/char/ite_gpio.c b/drivers/char/ite_gpio.c<br/>index d1ed6ac950d1..cde562d70c4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ite_gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ite_gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ite_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ite_gpio.c</a></div><div class='hunk'>@@ -357,7 +357,7 @@ DEB(printk("interrupt 0x%x %d\n",ITE_GPAISR, i));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations ite_gpio_fops = {</div><div class='add'>+static const struct file_operations ite_gpio_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= ite_gpio_ioctl,</div><div class='ctx'> 	.open		= ite_gpio_open,</div><div class='hunk'>@@ -397,7 +397,7 @@ int __init ite_gpio_init(void)</div><div class='ctx'> 		init_waitqueue_head(&amp;ite_gpio_wait[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(ite_gpio_irq, ite_gpio_irq_handler, SA_SHIRQ, "gpio", 0) &lt; 0) {</div><div class='add'>+	if (request_irq(ite_gpio_irq, ite_gpio_irq_handler, IRQF_SHARED, "gpio", 0) &lt; 0) {</div><div class='ctx'> 		misc_deregister(&amp;ite_gpio_miscdev);</div><div class='ctx'> 		release_region(ite_gpio_base, 0x1c);</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c<br/>index 5755b7e5f187..056ebe84b81d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/keyboard.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/keyboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/keyboard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/keyboard.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * 21-08-02: Converted to input API, major cleanup. (Vojtech Pavlik)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='hunk'>@@ -39,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void kbd_disconnect(struct input_handle *handle);</div><div class='ctx'> extern void ctrl_alt_del(void);</div><div class='hunk'>@@ -150,6 +150,7 @@ unsigned char kbd_sysrq_xlate[KEY_MAX + 1] =</div><div class='ctx'>         "230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000" /* 0x50 - 0x5f */</div><div class='ctx'>         "\r\000/";                                      /* 0x60 - 0x6f */</div><div class='ctx'> static int sysrq_down;</div><div class='add'>+static int sysrq_alt_use;</div><div class='ctx'> #endif</div><div class='ctx'> static int sysrq_alt;</div><div class='ctx'> </div><div class='hunk'>@@ -672,7 +673,7 @@ static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag, struc</div><div class='ctx'>  */</div><div class='ctx'> static void k_dead(struct vc_data *vc, unsigned char value, char up_flag, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };</div><div class='add'>+	static const unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };</div><div class='ctx'> 	value = ret_diacr[value];</div><div class='ctx'> 	k_deadunicode(vc, value, up_flag, regs);</div><div class='ctx'> }</div><div class='hunk'>@@ -709,8 +710,8 @@ static void k_cur(struct vc_data *vc, unsigned char value, char up_flag, struct</div><div class='ctx'> </div><div class='ctx'> static void k_pad(struct vc_data *vc, unsigned char value, char up_flag, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	static const char *pad_chars = "0123456789+-*/\015,.?()#";</div><div class='del'>-	static const char *app_map = "pqrstuvwxylSRQMnnmPQS";</div><div class='add'>+	static const char pad_chars[] = "0123456789+-*/\015,.?()#";</div><div class='add'>+	static const char app_map[] = "pqrstuvwxylSRQMnnmPQS";</div><div class='ctx'> </div><div class='ctx'> 	if (up_flag)</div><div class='ctx'> 		return;		/* no action, if this is a key release */</div><div class='hunk'>@@ -1035,7 +1036,7 @@ static void kbd_refresh_leds(struct input_handle *handle)</div><div class='ctx'> #define HW_RAW(dev) (test_bit(EV_MSC, dev-&gt;evbit) &amp;&amp; test_bit(MSC_RAW, dev-&gt;mscbit) &amp;&amp;\</div><div class='ctx'> 			((dev)-&gt;id.bustype == BUS_I8042) &amp;&amp; ((dev)-&gt;id.vendor == 0x0001) &amp;&amp; ((dev)-&gt;id.product == 0x0001))</div><div class='ctx'> </div><div class='del'>-static unsigned short x86_keycodes[256] =</div><div class='add'>+static const unsigned short x86_keycodes[256] =</div><div class='ctx'> 	{ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,</div><div class='ctx'> 	 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,</div><div class='ctx'> 	 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,</div><div class='hunk'>@@ -1073,11 +1074,13 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode,</div><div class='ctx'> 			put_queue(vc, 0x1d | up_flag);</div><div class='ctx'> 			put_queue(vc, 0x45 | up_flag);</div><div class='ctx'> 			return 0;</div><div class='del'>-		case KEY_HANGUEL:</div><div class='del'>-			if (!up_flag) put_queue(vc, 0xf1);</div><div class='add'>+		case KEY_HANGEUL:</div><div class='add'>+			if (!up_flag)</div><div class='add'>+				put_queue(vc, 0xf2);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case KEY_HANJA:</div><div class='del'>-			if (!up_flag) put_queue(vc, 0xf2);</div><div class='add'>+			if (!up_flag)</div><div class='add'>+				put_queue(vc, 0xf1);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1142,7 +1145,7 @@ static void kbd_keycode(unsigned int keycode, int down,</div><div class='ctx'> 	kbd = kbd_table + fg_console;</div><div class='ctx'> </div><div class='ctx'> 	if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)</div><div class='del'>-		sysrq_alt = down;</div><div class='add'>+		sysrq_alt = down ? keycode : 0;</div><div class='ctx'> #ifdef CONFIG_SPARC</div><div class='ctx'> 	if (keycode == KEY_STOP)</div><div class='ctx'> 		sparc_l1_a_state = down;</div><div class='hunk'>@@ -1162,9 +1165,14 @@ static void kbd_keycode(unsigned int keycode, int down,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAGIC_SYSRQ	       /* Handle the SysRq Hack */</div><div class='ctx'> 	if (keycode == KEY_SYSRQ &amp;&amp; (sysrq_down || (down == 1 &amp;&amp; sysrq_alt))) {</div><div class='del'>-		sysrq_down = down;</div><div class='add'>+		if (!sysrq_down) {</div><div class='add'>+			sysrq_down = down;</div><div class='add'>+			sysrq_alt_use = sysrq_alt;</div><div class='add'>+		}</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+	if (sysrq_down &amp;&amp; !down &amp;&amp; keycode == sysrq_alt_use)</div><div class='add'>+		sysrq_down = 0;</div><div class='ctx'> 	if (sysrq_down &amp;&amp; down &amp;&amp; !rep) {</div><div class='ctx'> 		handle_sysrq(kbd_sysrq_xlate[keycode], regs, tty);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c<br/>index 29963d8be667..da601fd6c07a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/lcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/lcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/lcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/lcd.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #define RTC_IO_EXTENT	0x10	/*Only really two ports, but... */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -599,7 +598,7 @@ static ssize_t lcd_read(struct file *file, char *buf,</div><div class='ctx'>  *	The various file operations we support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations lcd_fops = {</div><div class='add'>+static const struct file_operations lcd_fops = {</div><div class='ctx'> 	.read = lcd_read,</div><div class='ctx'> 	.ioctl = lcd_ioctl,</div><div class='ctx'> 	.open = lcd_open,</div><div class='head'>diff --git a/drivers/char/lp.c b/drivers/char/lp.c<br/>index e57260525293..f875fda3b089 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/lp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/lp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/lp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/lp.c</a></div><div class='hunk'>@@ -114,13 +114,11 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -668,7 +666,7 @@ static int lp_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations lp_fops = {</div><div class='add'>+static const struct file_operations lp_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.write		= lp_write,</div><div class='ctx'> 	.ioctl		= lp_ioctl,</div><div class='hunk'>@@ -807,8 +805,6 @@ static int lp_register(int nr, struct parport *port)</div><div class='ctx'> </div><div class='ctx'> 	class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL,</div><div class='ctx'> 				"lp%d", nr);</div><div class='del'>-	devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO,</div><div class='del'>-			"printers/%d", nr);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port-&gt;name, </div><div class='ctx'> 	       (port-&gt;irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");</div><div class='hunk'>@@ -907,7 +903,6 @@ static int __init lp_init (void)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("printers");</div><div class='ctx'> 	lp_class = class_create(THIS_MODULE, "printer");</div><div class='ctx'> 	if (IS_ERR(lp_class)) {</div><div class='ctx'> 		err = PTR_ERR(lp_class);</div><div class='hunk'>@@ -933,7 +928,6 @@ static int __init lp_init (void)</div><div class='ctx'> out_class:</div><div class='ctx'> 	class_destroy(lp_class);</div><div class='ctx'> out_devfs:</div><div class='del'>-	devfs_remove("printers");</div><div class='ctx'> 	unregister_chrdev(LP_MAJOR, "lp");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -981,10 +975,8 @@ static void lp_cleanup_module (void)</div><div class='ctx'> 		if (lp_table[offset].dev == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		parport_unregister_device(lp_table[offset].dev);</div><div class='del'>-		devfs_remove("printers/%d", offset);</div><div class='ctx'> 		class_device_destroy(lp_class, MKDEV(LP_MAJOR, offset));</div><div class='ctx'> 	}</div><div class='del'>-	devfs_remove("printers");</div><div class='ctx'> 	class_destroy(lp_class);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c<br/>index c268ee04b2aa..0385650f6077 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mbcs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mbcs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mbcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/mbcs.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *	MOATB Core Services driver.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -593,7 +592,7 @@ static int mbcs_intr_alloc(struct cx_dev *dev)</div><div class='ctx'> 	getdma-&gt;intrHostDest = sn_irq-&gt;irq_xtalkaddr;</div><div class='ctx'> 	getdma-&gt;intrVector = sn_irq-&gt;irq_irq;</div><div class='ctx'> 	if (request_irq(sn_irq-&gt;irq_irq,</div><div class='del'>-			(void *)mbcs_completion_intr_handler, SA_SHIRQ,</div><div class='add'>+			(void *)mbcs_completion_intr_handler, IRQF_SHARED,</div><div class='ctx'> 			"MBCS get intr", (void *)soft)) {</div><div class='ctx'> 		tiocx_irq_free(soft-&gt;get_sn_irq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -609,7 +608,7 @@ static int mbcs_intr_alloc(struct cx_dev *dev)</div><div class='ctx'> 	putdma-&gt;intrHostDest = sn_irq-&gt;irq_xtalkaddr;</div><div class='ctx'> 	putdma-&gt;intrVector = sn_irq-&gt;irq_irq;</div><div class='ctx'> 	if (request_irq(sn_irq-&gt;irq_irq,</div><div class='del'>-			(void *)mbcs_completion_intr_handler, SA_SHIRQ,</div><div class='add'>+			(void *)mbcs_completion_intr_handler, IRQF_SHARED,</div><div class='ctx'> 			"MBCS put intr", (void *)soft)) {</div><div class='ctx'> 		tiocx_irq_free(soft-&gt;put_sn_irq);</div><div class='ctx'> 		free_irq(soft-&gt;get_sn_irq-&gt;irq_irq, soft);</div><div class='hunk'>@@ -629,7 +628,7 @@ static int mbcs_intr_alloc(struct cx_dev *dev)</div><div class='ctx'> 	algo-&gt;intrHostDest = sn_irq-&gt;irq_xtalkaddr;</div><div class='ctx'> 	algo-&gt;intrVector = sn_irq-&gt;irq_irq;</div><div class='ctx'> 	if (request_irq(sn_irq-&gt;irq_irq,</div><div class='del'>-			(void *)mbcs_completion_intr_handler, SA_SHIRQ,</div><div class='add'>+			(void *)mbcs_completion_intr_handler, IRQF_SHARED,</div><div class='ctx'> 			"MBCS algo intr", (void *)soft)) {</div><div class='ctx'> 		tiocx_irq_free(soft-&gt;algo_sn_irq);</div><div class='ctx'> 		free_irq(soft-&gt;put_sn_irq-&gt;irq_irq, soft);</div><div class='head'>diff --git a/drivers/char/mem.c b/drivers/char/mem.c<br/>index 1fa9fa157c12..917b20402664 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/mem.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  Shared /dev/zero mmaping support, Feb 2000, Kanoj Sarcar &lt;kanoj@sgi.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -20,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='hunk'>@@ -97,7 +95,7 @@ static inline int valid_phys_addr_range(unsigned long addr, size_t count)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int valid_mmap_phys_addr_range(unsigned long addr, size_t size)</div><div class='add'>+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -244,7 +242,7 @@ static int mmap_mem(struct file * file, struct vm_area_struct * vma)</div><div class='ctx'> {</div><div class='ctx'> 	size_t size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='ctx'> </div><div class='del'>-	if (!valid_mmap_phys_addr_range(vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT, size))</div><div class='add'>+	if (!valid_mmap_phys_addr_range(vma-&gt;vm_pgoff, size))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_page_prot = phys_mem_access_prot(file, vma-&gt;vm_pgoff,</div><div class='hunk'>@@ -778,7 +776,7 @@ static int open_port(struct inode * inode, struct file * filp)</div><div class='ctx'> #define open_kmem	open_mem</div><div class='ctx'> #define open_oldmem	open_mem</div><div class='ctx'> </div><div class='del'>-static struct file_operations mem_fops = {</div><div class='add'>+static const struct file_operations mem_fops = {</div><div class='ctx'> 	.llseek		= memory_lseek,</div><div class='ctx'> 	.read		= read_mem,</div><div class='ctx'> 	.write		= write_mem,</div><div class='hunk'>@@ -786,7 +784,7 @@ static struct file_operations mem_fops = {</div><div class='ctx'> 	.open		= open_mem,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations kmem_fops = {</div><div class='add'>+static const struct file_operations kmem_fops = {</div><div class='ctx'> 	.llseek		= memory_lseek,</div><div class='ctx'> 	.read		= read_kmem,</div><div class='ctx'> 	.write		= write_kmem,</div><div class='hunk'>@@ -794,7 +792,7 @@ static struct file_operations kmem_fops = {</div><div class='ctx'> 	.open		= open_kmem,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations null_fops = {</div><div class='add'>+static const struct file_operations null_fops = {</div><div class='ctx'> 	.llseek		= null_lseek,</div><div class='ctx'> 	.read		= read_null,</div><div class='ctx'> 	.write		= write_null,</div><div class='hunk'>@@ -802,7 +800,7 @@ static struct file_operations null_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_ISA) || !defined(__mc68000__)</div><div class='del'>-static struct file_operations port_fops = {</div><div class='add'>+static const struct file_operations port_fops = {</div><div class='ctx'> 	.llseek		= memory_lseek,</div><div class='ctx'> 	.read		= read_port,</div><div class='ctx'> 	.write		= write_port,</div><div class='hunk'>@@ -810,7 +808,7 @@ static struct file_operations port_fops = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct file_operations zero_fops = {</div><div class='add'>+static const struct file_operations zero_fops = {</div><div class='ctx'> 	.llseek		= zero_lseek,</div><div class='ctx'> 	.read		= read_zero,</div><div class='ctx'> 	.write		= write_zero,</div><div class='hunk'>@@ -821,14 +819,14 @@ static struct backing_dev_info zero_bdi = {</div><div class='ctx'> 	.capabilities	= BDI_CAP_MAP_COPY,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations full_fops = {</div><div class='add'>+static const struct file_operations full_fops = {</div><div class='ctx'> 	.llseek		= full_lseek,</div><div class='ctx'> 	.read		= read_full,</div><div class='ctx'> 	.write		= write_full,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CRASH_DUMP</div><div class='del'>-static struct file_operations oldmem_fops = {</div><div class='add'>+static const struct file_operations oldmem_fops = {</div><div class='ctx'> 	.read	= read_oldmem,</div><div class='ctx'> 	.open	= open_oldmem,</div><div class='ctx'> };</div><div class='hunk'>@@ -855,7 +853,7 @@ static ssize_t kmsg_write(struct file * file, const char __user * buf,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations kmsg_fops = {</div><div class='add'>+static const struct file_operations kmsg_fops = {</div><div class='ctx'> 	.write =	kmsg_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -905,7 +903,7 @@ static int memory_open(struct inode * inode, struct file * filp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations memory_fops = {</div><div class='add'>+static const struct file_operations memory_fops = {</div><div class='ctx'> 	.open		= memory_open,	/* just a selector for the real open */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -941,13 +939,10 @@ static int __init chr_dev_init(void)</div><div class='ctx'> 		printk("unable to get major %d for memory devs\n", MEM_MAJOR);</div><div class='ctx'> </div><div class='ctx'> 	mem_class = class_create(THIS_MODULE, "mem");</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(devlist); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(devlist); i++)</div><div class='ctx'> 		class_device_create(mem_class, NULL,</div><div class='ctx'> 					MKDEV(MEM_MAJOR, devlist[i].minor),</div><div class='ctx'> 					NULL, devlist[i].name);</div><div class='del'>-		devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor),</div><div class='del'>-				S_IFCHR | devlist[i].mode, devlist[i].name);</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/misc.c b/drivers/char/misc.c<br/>index 96eb2a709e21..62ebe09656e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/misc.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -44,7 +43,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -115,7 +113,7 @@ static int misc_seq_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return seq_open(file, &amp;misc_seq_ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations misc_proc_fops = {</div><div class='add'>+static const struct file_operations misc_proc_fops = {</div><div class='ctx'> 	.owner	 = THIS_MODULE,</div><div class='ctx'> 	.open    = misc_seq_open,</div><div class='ctx'> 	.read    = seq_read,</div><div class='hunk'>@@ -178,7 +176,7 @@ fail:</div><div class='ctx'>  */</div><div class='ctx'> static struct class *misc_class;</div><div class='ctx'> </div><div class='del'>-static struct file_operations misc_fops = {</div><div class='add'>+static const struct file_operations misc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open		= misc_open,</div><div class='ctx'> };</div><div class='hunk'>@@ -204,7 +202,7 @@ int misc_register(struct miscdevice * misc)</div><div class='ctx'> {</div><div class='ctx'> 	struct miscdevice *c;</div><div class='ctx'> 	dev_t dev;</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;misc_sem);</div><div class='ctx'> 	list_for_each_entry(c, &amp;misc_list, list) {</div><div class='hunk'>@@ -228,10 +226,6 @@ int misc_register(struct miscdevice * misc)</div><div class='ctx'> </div><div class='ctx'> 	if (misc-&gt;minor &lt; DYNAMIC_MINORS)</div><div class='ctx'> 		misc_minors[misc-&gt;minor &gt;&gt; 3] |= 1 &lt;&lt; (misc-&gt;minor &amp; 7);</div><div class='del'>-	if (misc-&gt;devfs_name[0] == '\0') {</div><div class='del'>-		snprintf(misc-&gt;devfs_name, sizeof(misc-&gt;devfs_name),</div><div class='del'>-				"misc/%s", misc-&gt;name);</div><div class='del'>-	}</div><div class='ctx'> 	dev = MKDEV(MISC_MAJOR, misc-&gt;minor);</div><div class='ctx'> </div><div class='ctx'> 	misc-&gt;class = class_device_create(misc_class, NULL, dev, misc-&gt;dev,</div><div class='hunk'>@@ -241,13 +235,6 @@ int misc_register(struct miscdevice * misc)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, </div><div class='del'>-			    misc-&gt;devfs_name);</div><div class='del'>-	if (err) {</div><div class='del'>-		class_device_destroy(misc_class, dev);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Add it to the front, so that later devices can "override"</div><div class='ctx'> 	 * earlier defaults</div><div class='hunk'>@@ -278,7 +265,6 @@ int misc_deregister(struct miscdevice * misc)</div><div class='ctx'> 	down(&amp;misc_sem);</div><div class='ctx'> 	list_del(&amp;misc-&gt;list);</div><div class='ctx'> 	class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc-&gt;minor));</div><div class='del'>-	devfs_remove(misc-&gt;devfs_name);</div><div class='ctx'> 	if (i &lt; DYNAMIC_MINORS &amp;&amp; i&gt;0) {</div><div class='ctx'> 		misc_minors[i&gt;&gt;3] &amp;= ~(1 &lt;&lt; (misc-&gt;minor &amp; 7));</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c<br/>index 1b05fa688996..1f0f2b6dae26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mmtimer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mmtimer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mmtimer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/mmtimer.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mmtimer.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/posix-timers.h&gt;</div><div class='hunk'>@@ -64,7 +63,7 @@ static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma);</div><div class='ctx'>  */</div><div class='ctx'> static unsigned long mmtimer_femtoperiod = 0;</div><div class='ctx'> </div><div class='del'>-static struct file_operations mmtimer_fops = {</div><div class='add'>+static const struct file_operations mmtimer_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.mmap =		mmtimer_mmap,</div><div class='ctx'> 	.ioctl =	mmtimer_ioctl,</div><div class='hunk'>@@ -329,7 +328,6 @@ static int mmtimer_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	if (PAGE_SIZE &gt; (1 &lt;&lt; 16))</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='del'>-	vma-&gt;vm_flags |= (VM_IO | VM_SHM | VM_LOCKED );</div><div class='ctx'> 	vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='ctx'> </div><div class='ctx'> 	mmtimer_addr = __pa(RTC_COUNTER_ADDR);</div><div class='hunk'>@@ -689,13 +687,12 @@ static int __init mmtimer_init(void)</div><div class='ctx'> 	mmtimer_femtoperiod = ((unsigned long)1E15 + sn_rtc_cycles_per_second /</div><div class='ctx'> 			       2) / sn_rtc_cycles_per_second;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(SGI_MMTIMER_VECTOR, mmtimer_interrupt, SA_PERCPU_IRQ, MMTIMER_NAME, NULL)) {</div><div class='add'>+	if (request_irq(SGI_MMTIMER_VECTOR, mmtimer_interrupt, IRQF_PERCPU, MMTIMER_NAME, NULL)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: unable to allocate interrupt.",</div><div class='ctx'> 			MMTIMER_NAME);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(mmtimer_miscdev.devfs_name, MMTIMER_NAME);</div><div class='ctx'> 	if (misc_register(&amp;mmtimer_miscdev)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: failed to register device\n",</div><div class='ctx'> 		       MMTIMER_NAME);</div><div class='head'>diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c<br/>index f43c2e04eadd..4ea7bd5f4f56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/moxa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/moxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/moxa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/moxa.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *      version         : 5.1</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -301,7 +300,7 @@ static struct tty_operations moxa_ops = {</div><div class='ctx'> 	.tiocmset = moxa_tiocmset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static spinlock_t moxa_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(moxa_lock);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> static int moxa_get_PCI_conf(struct pci_dev *p, int board_type, moxa_board_conf * board)</div><div class='hunk'>@@ -342,7 +341,6 @@ static int __init moxa_init(void)</div><div class='ctx'> 	init_MUTEX(&amp;moxaBuffSem);</div><div class='ctx'> 	moxaDriver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	moxaDriver-&gt;name = "ttyMX";</div><div class='del'>-	moxaDriver-&gt;devfs_name = "tts/a";</div><div class='ctx'> 	moxaDriver-&gt;major = ttymajor;</div><div class='ctx'> 	moxaDriver-&gt;minor_start = 0;</div><div class='ctx'> 	moxaDriver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='head'>diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c<br/>index d1fe05e83882..4e4865e90e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mwave/3780i.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mwave/3780i.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mwave/3780i.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/mwave/3780i.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> *	First release to the public</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c<br/>index d3ba2f860ef0..39a2e661ff55 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mwave/mwavedd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mwave/mwavedd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mwave/mwavedd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/mwave/mwavedd.c</a></div><div class='hunk'>@@ -454,7 +454,7 @@ static int register_serial_portandirq(unsigned int port, int irq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations mwave_fops = {</div><div class='add'>+static const struct file_operations mwave_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= mwave_read,</div><div class='ctx'> 	.write		= mwave_write,</div><div class='head'>diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c<br/>index 0fb2fb9fb024..556abd3e0d07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/mxser.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/mxser.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/mxser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/mxser.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>  *      This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *      it under the terms of the GNU General Public License as published by</div><div class='ctx'>  *      the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-*      (at your option) any later version.</div><div class='add'>+ *      (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  *      This program is distributed in the hope that it will be useful,</div><div class='ctx'>  *      but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/autoconf.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -71,8 +70,8 @@</div><div class='ctx'> #define	MXSERMAJOR	 174</div><div class='ctx'> #define	MXSERCUMAJOR	 175</div><div class='ctx'> </div><div class='del'>-#define	MXSER_EVENT_TXLOW	 1</div><div class='del'>-#define	MXSER_EVENT_HANGUP	 2</div><div class='add'>+#define	MXSER_EVENT_TXLOW	1</div><div class='add'>+#define	MXSER_EVENT_HANGUP	2</div><div class='ctx'> </div><div class='ctx'> #define MXSER_BOARDS		4	/* Max. boards */</div><div class='ctx'> #define MXSER_PORTS		32	/* Max. ports */</div><div class='hunk'>@@ -92,9 +91,10 @@</div><div class='ctx'> #define UART_MCR_AFE		0x20</div><div class='ctx'> #define UART_LSR_SPECIAL	0x1E</div><div class='ctx'> </div><div class='del'>-#define RELEVANT_IFLAG(iflag)	(iflag &amp; (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|IXON|IXOFF))</div><div class='add'>+#define RELEVANT_IFLAG(iflag)	(iflag &amp; (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|\</div><div class='add'>+					  IXON|IXOFF))</div><div class='ctx'> </div><div class='del'>-#define IRQ_T(info) ((info-&gt;flags &amp; ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)</div><div class='add'>+#define IRQ_T(info) ((info-&gt;flags &amp; ASYNC_SHARE_IRQ) ? IRQF_SHARED : IRQF_DISABLED)</div><div class='ctx'> </div><div class='ctx'> #define C168_ASIC_ID    1</div><div class='ctx'> #define C104_ASIC_ID    2</div><div class='hunk'>@@ -152,27 +152,27 @@ static char *mxser_brdname[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mxser_numports[] = {</div><div class='del'>-	8,			// C168-ISA</div><div class='del'>-	4,			// C104-ISA</div><div class='del'>-	4,			// CI104J</div><div class='del'>-	8,			// C168-PCI</div><div class='del'>-	4,			// C104-PCI</div><div class='del'>-	2,			// C102-ISA</div><div class='del'>-	2,			// CI132</div><div class='del'>-	4,			// CI134</div><div class='del'>-	2,			// CP132</div><div class='del'>-	4,			// CP114</div><div class='del'>-	4,			// CT114</div><div class='del'>-	2,			// CP102</div><div class='del'>-	4,			// CP104U</div><div class='del'>-	8,			// CP168U</div><div class='del'>-	2,			// CP132U</div><div class='del'>-	4,			// CP134U</div><div class='del'>-	4,			// CP104JU</div><div class='del'>-	8,			// RC7000</div><div class='del'>-	8,			// CP118U </div><div class='del'>-	2,			// CP102UL </div><div class='del'>-	2,			// CP102U</div><div class='add'>+	8,			/* C168-ISA */</div><div class='add'>+	4,			/* C104-ISA */</div><div class='add'>+	4,			/* CI104J */</div><div class='add'>+	8,			/* C168-PCI */</div><div class='add'>+	4,			/* C104-PCI */</div><div class='add'>+	2,			/* C102-ISA */</div><div class='add'>+	2,			/* CI132 */</div><div class='add'>+	4,			/* CI134 */</div><div class='add'>+	2,			/* CP132 */</div><div class='add'>+	4,			/* CP114 */</div><div class='add'>+	4,			/* CT114 */</div><div class='add'>+	2,			/* CP102 */</div><div class='add'>+	4,			/* CP104U */</div><div class='add'>+	8,			/* CP168U */</div><div class='add'>+	2,			/* CP132U */</div><div class='add'>+	4,			/* CP134U */</div><div class='add'>+	4,			/* CP104JU */</div><div class='add'>+	8,			/* RC7000 */</div><div class='add'>+	8,			/* CP118U */</div><div class='add'>+	2,			/* CP102UL */</div><div class='add'>+	2,			/* CP102U */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define UART_TYPE_NUM	2</div><div class='hunk'>@@ -182,7 +182,7 @@ static const unsigned int Gmoxa_uart_id[UART_TYPE_NUM] = {</div><div class='ctx'> 	MOXA_MUST_MU860_HWID</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-// This is only for PCI</div><div class='add'>+/* This is only for PCI */</div><div class='ctx'> #define UART_INFO_NUM	3</div><div class='ctx'> struct mxpciuart_info {</div><div class='ctx'> 	int type;</div><div class='hunk'>@@ -231,7 +231,7 @@ MODULE_DEVICE_TABLE(pci, mxser_pcibrds);</div><div class='ctx'> typedef struct _moxa_pci_info {</div><div class='ctx'> 	unsigned short busNum;</div><div class='ctx'> 	unsigned short devNum;</div><div class='del'>-	struct pci_dev *pdev;	// add by Victor Yu. 06-23-2003</div><div class='add'>+	struct pci_dev *pdev;	/* add by Victor Yu. 06-23-2003 */</div><div class='ctx'> } moxa_pci_info;</div><div class='ctx'> </div><div class='ctx'> static int ioaddr[MXSER_BOARDS] = { 0, 0, 0, 0 };</div><div class='hunk'>@@ -280,6 +280,7 @@ struct mxser_mon_ext {</div><div class='ctx'> 	int fifo[32];</div><div class='ctx'> 	int iftype[32];</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> struct mxser_hwconf {</div><div class='ctx'> 	int board_type;</div><div class='ctx'> 	int ports;</div><div class='hunk'>@@ -290,9 +291,9 @@ struct mxser_hwconf {</div><div class='ctx'> 	int ioaddr[MXSER_PORTS_PER_BOARD];</div><div class='ctx'> 	int baud_base[MXSER_PORTS_PER_BOARD];</div><div class='ctx'> 	moxa_pci_info pciInfo;</div><div class='del'>-	int IsMoxaMustChipFlag;	// add by Victor Yu. 08-30-2002</div><div class='del'>-	int MaxCanSetBaudRate[MXSER_PORTS_PER_BOARD];	// add by Victor Yu. 09-04-2002</div><div class='del'>-	int opmode_ioaddr[MXSER_PORTS_PER_BOARD];	// add by Victor Yu. 01-05-2004</div><div class='add'>+	int IsMoxaMustChipFlag;	/* add by Victor Yu. 08-30-2002 */</div><div class='add'>+	int MaxCanSetBaudRate[MXSER_PORTS_PER_BOARD];	/* add by Victor Yu. 09-04-2002 */</div><div class='add'>+	int opmode_ioaddr[MXSER_PORTS_PER_BOARD];	/* add by Victor Yu. 01-05-2004 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mxser_struct {</div><div class='hunk'>@@ -334,9 +335,9 @@ struct mxser_struct {</div><div class='ctx'> 	wait_queue_head_t delta_msr_wait;</div><div class='ctx'> 	struct async_icount icount;	/* kernel counters for the 4 input interrupts */</div><div class='ctx'> 	int timeout;</div><div class='del'>-	int IsMoxaMustChipFlag;	// add by Victor Yu. 08-30-2002</div><div class='del'>-	int MaxCanSetBaudRate;	// add by Victor Yu. 09-04-2002</div><div class='del'>-	int opmode_ioaddr;	// add by Victor Yu. 01-05-2004</div><div class='add'>+	int IsMoxaMustChipFlag;	/* add by Victor Yu. 08-30-2002 */</div><div class='add'>+	int MaxCanSetBaudRate;	/* add by Victor Yu. 09-04-2002 */</div><div class='add'>+	int opmode_ioaddr;	/* add by Victor Yu. 01-05-2004 */</div><div class='ctx'> 	unsigned char stop_rx;</div><div class='ctx'> 	unsigned char ldisc_stop_rx;</div><div class='ctx'> 	long realbaud;</div><div class='hunk'>@@ -345,7 +346,6 @@ struct mxser_struct {</div><div class='ctx'> 	spinlock_t slock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> struct mxser_mstatus {</div><div class='ctx'> 	tcflag_t cflag;</div><div class='ctx'> 	int cts;</div><div class='hunk'>@@ -358,7 +358,7 @@ static struct mxser_mstatus GMStatus[MXSER_PORTS];</div><div class='ctx'> </div><div class='ctx'> static int mxserBoardCAP[MXSER_BOARDS] = {</div><div class='ctx'> 	0, 0, 0, 0</div><div class='del'>-	    /*  0x180, 0x280, 0x200, 0x320   */</div><div class='add'>+	/*  0x180, 0x280, 0x200, 0x320 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct tty_driver *mxvar_sdriver;</div><div class='hunk'>@@ -386,7 +386,7 @@ static struct mxser_hwconf mxsercfg[MXSER_BOARDS];</div><div class='ctx'> static void mxser_getcfg(int board, struct mxser_hwconf *hwconf);</div><div class='ctx'> static int mxser_init(void);</div><div class='ctx'> </div><div class='del'>-//static void   mxser_poll(unsigned long);</div><div class='add'>+/* static void   mxser_poll(unsigned long); */</div><div class='ctx'> static int mxser_get_ISA_conf(int, struct mxser_hwconf *);</div><div class='ctx'> static int mxser_get_PCI_conf(int, int, int, struct mxser_hwconf *);</div><div class='ctx'> static void mxser_do_softint(void *);</div><div class='hunk'>@@ -440,18 +440,18 @@ static int CheckIsMoxaMust(int io)</div><div class='ctx'> 	SET_MOXA_MUST_XON1_VALUE(io, 0x11);</div><div class='ctx'> 	if ((hwid = inb(io + UART_MCR)) != 0) {</div><div class='ctx'> 		outb(oldmcr, io + UART_MCR);</div><div class='del'>-		return (MOXA_OTHER_UART);</div><div class='add'>+		return MOXA_OTHER_UART;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	GET_MOXA_MUST_HARDWARE_ID(io, &amp;hwid);</div><div class='ctx'> 	for (i = 0; i &lt; UART_TYPE_NUM; i++) {</div><div class='ctx'> 		if (hwid == Gmoxa_uart_id[i])</div><div class='del'>-			return (int) hwid;</div><div class='add'>+			return (int)hwid;</div><div class='ctx'> 	}</div><div class='ctx'> 	return MOXA_OTHER_UART;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// above is modified by Victor Yu. 08-15-2002</div><div class='add'>+/* above is modified by Victor Yu. 08-15-2002 */</div><div class='ctx'> </div><div class='ctx'> static struct tty_operations mxser_ops = {</div><div class='ctx'> 	.open = mxser_open,</div><div class='hunk'>@@ -504,7 +504,6 @@ static void __exit mxser_module_exit(void)</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_ERR "Couldn't unregister MOXA Smartio/Industio family serial driver\n");</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; MXSER_BOARDS; i++) {</div><div class='ctx'> 		struct pci_dev *pdev;</div><div class='ctx'> </div><div class='hunk'>@@ -513,7 +512,7 @@ static void __exit mxser_module_exit(void)</div><div class='ctx'> 		else {</div><div class='ctx'> 			pdev = mxsercfg[i].pciInfo.pdev;</div><div class='ctx'> 			free_irq(mxsercfg[i].irq, &amp;mxvar_table[i * MXSER_PORTS_PER_BOARD]);</div><div class='del'>-			if (pdev != NULL) {	//PCI</div><div class='add'>+			if (pdev != NULL) {	/* PCI */</div><div class='ctx'> 				release_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2));</div><div class='ctx'> 				release_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3));</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -524,7 +523,6 @@ static void __exit mxser_module_exit(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (verbose)</div><div class='ctx'> 		printk(KERN_DEBUG "Done.\n");</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void process_txrx_fifo(struct mxser_struct *info)</div><div class='hunk'>@@ -558,8 +556,10 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf)</div><div class='ctx'> 	n = board * MXSER_PORTS_PER_BOARD;</div><div class='ctx'> 	info = &amp;mxvar_table[n];</div><div class='ctx'> 	/*if (verbose) */  {</div><div class='del'>-		printk(KERN_DEBUG "        ttyM%d - ttyM%d ", n, n + hwconf-&gt;ports - 1);</div><div class='del'>-		printk(" max. baud rate = %d bps.\n", hwconf-&gt;MaxCanSetBaudRate[0]);</div><div class='add'>+		printk(KERN_DEBUG "        ttyM%d - ttyM%d ",</div><div class='add'>+			n, n + hwconf-&gt;ports - 1);</div><div class='add'>+		printk(" max. baud rate = %d bps.\n",</div><div class='add'>+			hwconf-&gt;MaxCanSetBaudRate[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hwconf-&gt;ports; i++, n++, info++) {</div><div class='hunk'>@@ -568,12 +568,12 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf)</div><div class='ctx'> 		info-&gt;irq = hwconf-&gt;irq;</div><div class='ctx'> 		info-&gt;vector = hwconf-&gt;vector;</div><div class='ctx'> 		info-&gt;vectormask = hwconf-&gt;vector_mask;</div><div class='del'>-		info-&gt;opmode_ioaddr = hwconf-&gt;opmode_ioaddr[i];	// add by Victor Yu. 01-05-2004</div><div class='add'>+		info-&gt;opmode_ioaddr = hwconf-&gt;opmode_ioaddr[i];	/* add by Victor Yu. 01-05-2004 */</div><div class='ctx'> 		info-&gt;stop_rx = 0;</div><div class='ctx'> 		info-&gt;ldisc_stop_rx = 0;</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;IsMoxaMustChipFlag = hwconf-&gt;IsMoxaMustChipFlag;</div><div class='del'>-		//Enhance mode enabled here</div><div class='add'>+		/* Enhance mode enabled here */</div><div class='ctx'> 		if (info-&gt;IsMoxaMustChipFlag != MOXA_OTHER_UART) {</div><div class='ctx'> 			ENABLE_MOXA_MUST_ENCHANCE_MODE(info-&gt;base);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -606,22 +606,25 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf)</div><div class='ctx'> </div><div class='ctx'> 	/* before set INT ISR, disable all int */</div><div class='ctx'> 	for (i = 0; i &lt; hwconf-&gt;ports; i++) {</div><div class='del'>-		outb(inb(hwconf-&gt;ioaddr[i] + UART_IER) &amp; 0xf0, hwconf-&gt;ioaddr[i] + UART_IER);</div><div class='add'>+		outb(inb(hwconf-&gt;ioaddr[i] + UART_IER) &amp; 0xf0,</div><div class='add'>+			hwconf-&gt;ioaddr[i] + UART_IER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	n = board * MXSER_PORTS_PER_BOARD;</div><div class='ctx'> 	info = &amp;mxvar_table[n];</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(hwconf-&gt;irq, mxser_interrupt, IRQ_T(info), "mxser", info);</div><div class='add'>+	retval = request_irq(hwconf-&gt;irq, mxser_interrupt, IRQ_T(info),</div><div class='add'>+				"mxser", info);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		printk(KERN_ERR "Board %d: %s", board, mxser_brdname[hwconf-&gt;board_type - 1]);</div><div class='del'>-		printk("  Request irq fail,IRQ (%d) may be conflit with another device.\n", info-&gt;irq);</div><div class='add'>+		printk(KERN_ERR "Board %d: %s",</div><div class='add'>+			board, mxser_brdname[hwconf-&gt;board_type - 1]);</div><div class='add'>+		printk("  Request irq failed, IRQ (%d) may conflict with"</div><div class='add'>+			" another device.\n", info-&gt;irq);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void mxser_getcfg(int board, struct mxser_hwconf *hwconf)</div><div class='ctx'> {</div><div class='ctx'> 	mxsercfg[board] = *hwconf;</div><div class='hunk'>@@ -631,26 +634,27 @@ static void mxser_getcfg(int board, struct mxser_hwconf *hwconf)</div><div class='ctx'> static int mxser_get_PCI_conf(int busnum, int devnum, int board_type, struct mxser_hwconf *hwconf)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='del'>-//      unsigned int    val;</div><div class='add'>+	/* unsigned int val; */</div><div class='ctx'> 	unsigned int ioaddress;</div><div class='ctx'> 	struct pci_dev *pdev = hwconf-&gt;pciInfo.pdev;</div><div class='ctx'> </div><div class='del'>-	//io address</div><div class='add'>+	/* io address */</div><div class='ctx'> 	hwconf-&gt;board_type = board_type;</div><div class='ctx'> 	hwconf-&gt;ports = mxser_numports[board_type - 1];</div><div class='ctx'> 	ioaddress = pci_resource_start(pdev, 2);</div><div class='del'>-	request_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2), "mxser(IO)");</div><div class='add'>+	request_region(pci_resource_start(pdev, 2), pci_resource_len(pdev, 2),</div><div class='add'>+			"mxser(IO)");</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; hwconf-&gt;ports; i++) {</div><div class='add'>+	for (i = 0; i &lt; hwconf-&gt;ports; i++)</div><div class='ctx'> 		hwconf-&gt;ioaddr[i] = ioaddress + 8 * i;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	//vector</div><div class='add'>+	/* vector */</div><div class='ctx'> 	ioaddress = pci_resource_start(pdev, 3);</div><div class='del'>-	request_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3), "mxser(vector)");</div><div class='add'>+	request_region(pci_resource_start(pdev, 3), pci_resource_len(pdev, 3),</div><div class='add'>+			"mxser(vector)");</div><div class='ctx'> 	hwconf-&gt;vector = ioaddress;</div><div class='ctx'> </div><div class='del'>-	//irq</div><div class='add'>+	/* irq */</div><div class='ctx'> 	hwconf-&gt;irq = hwconf-&gt;pciInfo.pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	hwconf-&gt;IsMoxaMustChipFlag = CheckIsMoxaMust(hwconf-&gt;ioaddr[0]);</div><div class='hunk'>@@ -663,7 +667,7 @@ static int mxser_get_PCI_conf(int busnum, int devnum, int board_type, struct mxs</div><div class='ctx'> 			if (Gpci_uart_info[j].type == hwconf-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 				hwconf-&gt;MaxCanSetBaudRate[i] = Gpci_uart_info[j].max_baud;</div><div class='ctx'> </div><div class='del'>-				//exception....CP-102</div><div class='add'>+				/* exception....CP-102 */</div><div class='ctx'> 				if (board_type == MXSER_BOARD_CP102)</div><div class='ctx'> 					hwconf-&gt;MaxCanSetBaudRate[i] = 921600;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -678,15 +682,15 @@ static int mxser_get_PCI_conf(int busnum, int devnum, int board_type, struct mxs</div><div class='ctx'> 			else</div><div class='ctx'> 				hwconf-&gt;opmode_ioaddr[i] = ioaddress + 0x0c;</div><div class='ctx'> 		}</div><div class='del'>-		outb(0, ioaddress + 4);	// default set to RS232 mode</div><div class='del'>-		outb(0, ioaddress + 0x0c);	//default set to RS232 mode</div><div class='add'>+		outb(0, ioaddress + 4);	/* default set to RS232 mode */</div><div class='add'>+		outb(0, ioaddress + 0x0c);	/* default set to RS232 mode */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; hwconf-&gt;ports; i++) {</div><div class='ctx'> 		hwconf-&gt;vector_mask |= (1 &lt;&lt; i);</div><div class='ctx'> 		hwconf-&gt;baud_base[i] = 921600;</div><div class='ctx'> 	}</div><div class='del'>-	return (0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -707,7 +711,8 @@ static int mxser_init(void)</div><div class='ctx'> 		mxsercfg[i].board_type = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "MOXA Smartio/Industio family driver version %s\n", MXSER_VERSION);</div><div class='add'>+	printk(KERN_INFO "MOXA Smartio/Industio family driver version %s\n",</div><div class='add'>+		MXSER_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the tty_driver structure */</div><div class='ctx'> 	memset(mxvar_sdriver, 0, sizeof(struct tty_driver));</div><div class='hunk'>@@ -719,7 +724,7 @@ static int mxser_init(void)</div><div class='ctx'> 	mxvar_sdriver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='ctx'> 	mxvar_sdriver-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='ctx'> 	mxvar_sdriver-&gt;init_termios = tty_std_termios;</div><div class='del'>-	mxvar_sdriver-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='add'>+	mxvar_sdriver-&gt;init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;</div><div class='ctx'> 	mxvar_sdriver-&gt;flags = TTY_DRIVER_REAL_RAW;</div><div class='ctx'> 	tty_set_operations(mxvar_sdriver, &amp;mxser_ops);</div><div class='ctx'> 	mxvar_sdriver-&gt;ttys = mxvar_tty;</div><div class='hunk'>@@ -739,23 +744,29 @@ static int mxser_init(void)</div><div class='ctx'> 	/* Start finding ISA boards here */</div><div class='ctx'> 	for (b = 0; b &lt; MXSER_BOARDS &amp;&amp; m &lt; MXSER_BOARDS; b++) {</div><div class='ctx'> 		int cap;</div><div class='add'>+</div><div class='ctx'> 		if (!(cap = mxserBoardCAP[b]))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		retval = mxser_get_ISA_conf(cap, &amp;hwconf);</div><div class='ctx'> </div><div class='ctx'> 		if (retval != 0)</div><div class='del'>-			printk(KERN_INFO "Found MOXA %s board (CAP=0x%x)\n", mxser_brdname[hwconf.board_type - 1], ioaddr[b]);</div><div class='add'>+			printk(KERN_INFO "Found MOXA %s board (CAP=0x%x)\n",</div><div class='add'>+				mxser_brdname[hwconf.board_type - 1], ioaddr[b]);</div><div class='ctx'> </div><div class='ctx'> 		if (retval &lt;= 0) {</div><div class='ctx'> 			if (retval == MXSER_ERR_IRQ)</div><div class='del'>-				printk(KERN_ERR "Invalid interrupt number,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid interrupt number, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> 			else if (retval == MXSER_ERR_IRQ_CONFLIT)</div><div class='del'>-				printk(KERN_ERR "Invalid interrupt number,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid interrupt number, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> 			else if (retval == MXSER_ERR_VECTOR)</div><div class='del'>-				printk(KERN_ERR "Invalid interrupt vector,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid interrupt vector, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> 			else if (retval == MXSER_ERR_IOADDR)</div><div class='del'>-				printk(KERN_ERR "Invalid I/O address,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid I/O address, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -765,35 +776,43 @@ static int mxser_init(void)</div><div class='ctx'> 		hwconf.pciInfo.pdev = NULL;</div><div class='ctx'> </div><div class='ctx'> 		mxser_getcfg(m, &amp;hwconf);</div><div class='del'>-		//init mxsercfg first, or mxsercfg data is not correct on ISR.</div><div class='del'>-		//mxser_initbrd will hook ISR.</div><div class='add'>+		/*</div><div class='add'>+		 * init mxsercfg first,</div><div class='add'>+		 * or mxsercfg data is not correct on ISR.</div><div class='add'>+		 */</div><div class='add'>+		/* mxser_initbrd will hook ISR. */</div><div class='ctx'> 		if (mxser_initbrd(m, &amp;hwconf) &lt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 		m++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Start finding ISA boards from module arg */</div><div class='ctx'> 	for (b = 0; b &lt; MXSER_BOARDS &amp;&amp; m &lt; MXSER_BOARDS; b++) {</div><div class='ctx'> 		int cap;</div><div class='add'>+</div><div class='ctx'> 		if (!(cap = ioaddr[b]))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		retval = mxser_get_ISA_conf(cap, &amp;hwconf);</div><div class='ctx'> </div><div class='ctx'> 		if (retval != 0)</div><div class='del'>-			printk(KERN_INFO "Found MOXA %s board (CAP=0x%x)\n", mxser_brdname[hwconf.board_type - 1], ioaddr[b]);</div><div class='add'>+			printk(KERN_INFO "Found MOXA %s board (CAP=0x%x)\n",</div><div class='add'>+				mxser_brdname[hwconf.board_type - 1], ioaddr[b]);</div><div class='ctx'> </div><div class='ctx'> 		if (retval &lt;= 0) {</div><div class='ctx'> 			if (retval == MXSER_ERR_IRQ)</div><div class='del'>-				printk(KERN_ERR "Invalid interrupt number,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid interrupt number, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> 			else if (retval == MXSER_ERR_IRQ_CONFLIT)</div><div class='del'>-				printk(KERN_ERR "Invalid interrupt number,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid interrupt number, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> 			else if (retval == MXSER_ERR_VECTOR)</div><div class='del'>-				printk(KERN_ERR "Invalid interrupt vector,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid interrupt vector, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> 			else if (retval == MXSER_ERR_IOADDR)</div><div class='del'>-				printk(KERN_ERR "Invalid I/O address,board not configured\n");</div><div class='add'>+				printk(KERN_ERR "Invalid I/O address, "</div><div class='add'>+					"board not configured\n");</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -803,8 +822,11 @@ static int mxser_init(void)</div><div class='ctx'> 		hwconf.pciInfo.pdev = NULL;</div><div class='ctx'> </div><div class='ctx'> 		mxser_getcfg(m, &amp;hwconf);</div><div class='del'>-		//init mxsercfg first, or mxsercfg data is not correct on ISR.</div><div class='del'>-		//mxser_initbrd will hook ISR.</div><div class='add'>+		/*</div><div class='add'>+		 * init mxsercfg first,</div><div class='add'>+		 * or mxsercfg data is not correct on ISR.</div><div class='add'>+		 */</div><div class='add'>+		/* mxser_initbrd will hook ISR. */</div><div class='ctx'> 		if (mxser_initbrd(m, &amp;hwconf) &lt; 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -817,7 +839,8 @@ static int mxser_init(void)</div><div class='ctx'> 	index = 0;</div><div class='ctx'> 	b = 0;</div><div class='ctx'> 	while (b &lt; n) {</div><div class='del'>-		pdev = pci_find_device(mxser_pcibrds[b].vendor, mxser_pcibrds[b].device, pdev);</div><div class='add'>+		pdev = pci_find_device(mxser_pcibrds[b].vendor,</div><div class='add'>+				mxser_pcibrds[b].device, pdev);</div><div class='ctx'> 			if (pdev == NULL) {</div><div class='ctx'> 			b++;</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -825,30 +848,48 @@ static int mxser_init(void)</div><div class='ctx'> 		hwconf.pciInfo.busNum = busnum = pdev-&gt;bus-&gt;number;</div><div class='ctx'> 		hwconf.pciInfo.devNum = devnum = PCI_SLOT(pdev-&gt;devfn) &lt;&lt; 3;</div><div class='ctx'> 		hwconf.pciInfo.pdev = pdev;</div><div class='del'>-		printk(KERN_INFO "Found MOXA %s board(BusNo=%d,DevNo=%d)\n", mxser_brdname[(int) (mxser_pcibrds[b].driver_data) - 1], busnum, devnum &gt;&gt; 3);</div><div class='add'>+		printk(KERN_INFO "Found MOXA %s board(BusNo=%d,DevNo=%d)\n",</div><div class='add'>+			mxser_brdname[(int) (mxser_pcibrds[b].driver_data) - 1],</div><div class='add'>+			busnum, devnum &gt;&gt; 3);</div><div class='ctx'> 		index++;</div><div class='del'>-		if (m &gt;= MXSER_BOARDS) {</div><div class='del'>-			printk(KERN_ERR "Too many Smartio/Industio family boards find (maximum %d),board not configured\n", MXSER_BOARDS);</div><div class='del'>-		} else {</div><div class='add'>+		if (m &gt;= MXSER_BOARDS)</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+				"Too many Smartio/Industio family boards find "</div><div class='add'>+				"(maximum %d), board not configured\n",</div><div class='add'>+				MXSER_BOARDS);</div><div class='add'>+		else {</div><div class='ctx'> 			if (pci_enable_device(pdev)) {</div><div class='del'>-				printk(KERN_ERR "Moxa SmartI/O PCI enable fail !\n");</div><div class='add'>+				printk(KERN_ERR "Moxa SmartI/O PCI enable "</div><div class='add'>+					"fail !\n");</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			retval = mxser_get_PCI_conf(busnum, devnum, (int) mxser_pcibrds[b].driver_data, &amp;hwconf);</div><div class='add'>+			retval = mxser_get_PCI_conf(busnum, devnum,</div><div class='add'>+					(int)mxser_pcibrds[b].driver_data,</div><div class='add'>+					&amp;hwconf);</div><div class='ctx'> 			if (retval &lt; 0) {</div><div class='ctx'> 				if (retval == MXSER_ERR_IRQ)</div><div class='del'>-					printk(KERN_ERR "Invalid interrupt number,board not configured\n");</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+						"Invalid interrupt number, "</div><div class='add'>+						"board not configured\n");</div><div class='ctx'> 				else if (retval == MXSER_ERR_IRQ_CONFLIT)</div><div class='del'>-					printk(KERN_ERR "Invalid interrupt number,board not configured\n");</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+						"Invalid interrupt number, "</div><div class='add'>+						"board not configured\n");</div><div class='ctx'> 				else if (retval == MXSER_ERR_VECTOR)</div><div class='del'>-					printk(KERN_ERR "Invalid interrupt vector,board not configured\n");</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+						"Invalid interrupt vector, "</div><div class='add'>+						"board not configured\n");</div><div class='ctx'> 				else if (retval == MXSER_ERR_IOADDR)</div><div class='del'>-					printk(KERN_ERR "Invalid I/O address,board not configured\n");</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+						"Invalid I/O address, "</div><div class='add'>+						"board not configured\n");</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			mxser_getcfg(m, &amp;hwconf);</div><div class='del'>-			//init mxsercfg first, or mxsercfg data is not correct on ISR.</div><div class='del'>-			//mxser_initbrd will hook ISR.</div><div class='add'>+			/* init mxsercfg first,</div><div class='add'>+			 * or mxsercfg data is not correct on ISR.</div><div class='add'>+			 */</div><div class='add'>+			/* mxser_initbrd will hook ISR. */</div><div class='ctx'> 			if (mxser_initbrd(m, &amp;hwconf) &lt; 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			m++;</div><div class='hunk'>@@ -858,7 +899,8 @@ static int mxser_init(void)</div><div class='ctx'> </div><div class='ctx'> 	retval = tty_register_driver(mxvar_sdriver);</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		printk(KERN_ERR "Couldn't install MOXA Smartio/Industio family driver !\n");</div><div class='add'>+		printk(KERN_ERR "Couldn't install MOXA Smartio/Industio family"</div><div class='add'>+				" driver !\n");</div><div class='ctx'> 		put_tty_driver(mxvar_sdriver);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; MXSER_BOARDS; i++) {</div><div class='hunk'>@@ -866,7 +908,7 @@ static int mxser_init(void)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			else {</div><div class='ctx'> 				free_irq(mxsercfg[i].irq, &amp;mxvar_table[i * MXSER_PORTS_PER_BOARD]);</div><div class='del'>-				//todo: release io, vector</div><div class='add'>+				/* todo: release io, vector */</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		return retval;</div><div class='hunk'>@@ -877,7 +919,7 @@ static int mxser_init(void)</div><div class='ctx'> </div><div class='ctx'> static void mxser_do_softint(void *private_)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) private_;</div><div class='add'>+	struct mxser_struct *info = private_;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='ctx'> </div><div class='ctx'> 	tty = info-&gt;tty;</div><div class='hunk'>@@ -926,7 +968,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	info = mxvar_table + line;</div><div class='ctx'> 	if (!info-&gt;base)</div><div class='del'>-		return (-ENODEV);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;driver_data = info;</div><div class='ctx'> 	info-&gt;tty = tty;</div><div class='hunk'>@@ -935,11 +977,11 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	 */</div><div class='ctx'> 	retval = mxser_startup(info);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		return (retval);</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	retval = mxser_block_til_ready(tty, filp, info);</div><div class='ctx'> 	if (retval)</div><div class='del'>-		return (retval);</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;count++;</div><div class='ctx'> </div><div class='hunk'>@@ -953,13 +995,13 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;session = current-&gt;signal-&gt;session;</div><div class='ctx'> 	info-&gt;pgrp = process_group(current);</div><div class='del'>-	clear_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	//status = mxser_get_msr(info-&gt;base, 0, info-&gt;port);</div><div class='del'>-	//mxser_check_modem_status(info, status);</div><div class='add'>+	/*</div><div class='add'>+	status = mxser_get_msr(info-&gt;base, 0, info-&gt;port);</div><div class='add'>+	mxser_check_modem_status(info, status);</div><div class='add'>+	*/</div><div class='ctx'> </div><div class='del'>-/* unmark here for very high baud rate (ex. 921600 bps) used</div><div class='del'>-*/</div><div class='add'>+/* unmark here for very high baud rate (ex. 921600 bps) used */</div><div class='ctx'> 	tty-&gt;low_latency = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -972,7 +1014,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  */</div><div class='ctx'> static void mxser_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -997,11 +1039,13 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		 * one, we've got real problems, since it means the</div><div class='ctx'> 		 * serial port won't be shutdown.</div><div class='ctx'> 		 */</div><div class='del'>-		printk(KERN_ERR "mxser_close: bad serial port count; tty-&gt;count is 1, " "info-&gt;count is %d\n", info-&gt;count);</div><div class='add'>+		printk(KERN_ERR "mxser_close: bad serial port count; "</div><div class='add'>+			"tty-&gt;count is 1, info-&gt;count is %d\n", info-&gt;count);</div><div class='ctx'> 		info-&gt;count = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (--info-&gt;count &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "mxser_close: bad serial port count for ttys%d: %d\n", info-&gt;port, info-&gt;count);</div><div class='add'>+		printk(KERN_ERR "mxser_close: bad serial port count for "</div><div class='add'>+			"ttys%d: %d\n", info-&gt;port, info-&gt;count);</div><div class='ctx'> 		info-&gt;count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;count) {</div><div class='hunk'>@@ -1056,7 +1100,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 		</div><div class='ctx'> 	ld = tty_ldisc_ref(tty);</div><div class='ctx'> 	if (ld) {</div><div class='del'>-		if(ld-&gt;flush_buffer)</div><div class='add'>+		if (ld-&gt;flush_buffer)</div><div class='ctx'> 			ld-&gt;flush_buffer(tty);</div><div class='ctx'> 		tty_ldisc_deref(ld);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1078,31 +1122,34 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count)</div><div class='ctx'> {</div><div class='ctx'> 	int c, total = 0;</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;xmit_buf)</div><div class='del'>-		return (0);</div><div class='add'>+	if (!info-&gt;xmit_buf)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		c = min_t(int, count, min(SERIAL_XMIT_SIZE - info-&gt;xmit_cnt - 1, SERIAL_XMIT_SIZE - info-&gt;xmit_head));</div><div class='add'>+		c = min_t(int, count, min(SERIAL_XMIT_SIZE - info-&gt;xmit_cnt - 1,</div><div class='add'>+					  SERIAL_XMIT_SIZE - info-&gt;xmit_head));</div><div class='ctx'> 		if (c &lt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(info-&gt;xmit_buf + info-&gt;xmit_head, buf, c);</div><div class='ctx'> 		spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='del'>-		info-&gt;xmit_head = (info-&gt;xmit_head + c) &amp; (SERIAL_XMIT_SIZE - 1);</div><div class='add'>+		info-&gt;xmit_head = (info-&gt;xmit_head + c) &amp;</div><div class='add'>+				  (SERIAL_XMIT_SIZE - 1);</div><div class='ctx'> 		info-&gt;xmit_cnt += c;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> </div><div class='ctx'> 		buf += c;</div><div class='ctx'> 		count -= c;</div><div class='ctx'> 		total += c;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;xmit_cnt &amp;&amp; !tty-&gt;stopped &amp;&amp; !(info-&gt;IER &amp; UART_IER_THRI)) {</div><div class='del'>-		if (!tty-&gt;hw_stopped || (info-&gt;type == PORT_16550A) || (info-&gt;IsMoxaMustChipFlag)) {</div><div class='add'>+		if (!tty-&gt;hw_stopped ||</div><div class='add'>+				(info-&gt;type == PORT_16550A) ||</div><div class='add'>+				(info-&gt;IsMoxaMustChipFlag)) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 			info-&gt;IER |= UART_IER_THRI;</div><div class='ctx'> 			outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='hunk'>@@ -1114,10 +1161,10 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou</div><div class='ctx'> </div><div class='ctx'> static void mxser_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;xmit_buf)</div><div class='add'>+	if (!info-&gt;xmit_buf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;xmit_cnt &gt;= SERIAL_XMIT_SIZE - 1)</div><div class='hunk'>@@ -1129,7 +1176,9 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	info-&gt;xmit_cnt++;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	if (!tty-&gt;stopped &amp;&amp; !(info-&gt;IER &amp; UART_IER_THRI)) {</div><div class='del'>-		if (!tty-&gt;hw_stopped || (info-&gt;type == PORT_16550A) || info-&gt;IsMoxaMustChipFlag) {</div><div class='add'>+		if (!tty-&gt;hw_stopped ||</div><div class='add'>+				(info-&gt;type == PORT_16550A) ||</div><div class='add'>+				info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 			info-&gt;IER |= UART_IER_THRI;</div><div class='ctx'> 			outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='hunk'>@@ -1141,10 +1190,16 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> static void mxser_flush_chars(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;xmit_cnt &lt;= 0 || tty-&gt;stopped || !info-&gt;xmit_buf || (tty-&gt;hw_stopped &amp;&amp; (info-&gt;type != PORT_16550A) &amp;&amp; (!info-&gt;IsMoxaMustChipFlag)))</div><div class='add'>+	if (info-&gt;xmit_cnt &lt;= 0 ||</div><div class='add'>+			tty-&gt;stopped ||</div><div class='add'>+			!info-&gt;xmit_buf ||</div><div class='add'>+			(tty-&gt;hw_stopped &amp;&amp;</div><div class='add'>+			 (info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='add'>+			 (!info-&gt;IsMoxaMustChipFlag)</div><div class='add'>+			))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='hunk'>@@ -1157,24 +1212,24 @@ static void mxser_flush_chars(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static int mxser_write_room(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = SERIAL_XMIT_SIZE - info-&gt;xmit_cnt - 1;</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		ret = 0;</div><div class='del'>-	return (ret);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxser_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	return info-&gt;xmit_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxser_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	char fcr;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1184,7 +1239,8 @@ static void mxser_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> 	/* below added by shinhay */</div><div class='ctx'> 	fcr = inb(info-&gt;base + UART_FCR);</div><div class='del'>-	outb((fcr | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info-&gt;base + UART_FCR);</div><div class='add'>+	outb((fcr | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT),</div><div class='add'>+		info-&gt;base + UART_FCR);</div><div class='ctx'> 	outb(fcr, info-&gt;base + UART_FCR);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='hunk'>@@ -1197,7 +1253,7 @@ static void mxser_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct async_icount cprev, cnow;	/* kernel counter temps */</div><div class='ctx'> 	struct serial_icounter_struct __user *p_cuser;</div><div class='hunk'>@@ -1206,9 +1262,9 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='ctx'> 	if (tty-&gt;index == MXSER_PORTS)</div><div class='del'>-		return (mxser_ioctl_special(cmd, argp));</div><div class='add'>+		return mxser_ioctl_special(cmd, argp);</div><div class='ctx'> </div><div class='del'>-	// following add by Victor Yu. 01-05-2004</div><div class='add'>+	/* following add by Victor Yu. 01-05-2004 */</div><div class='ctx'> 	if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) {</div><div class='ctx'> 		int opmode, p;</div><div class='ctx'> 		static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f };</div><div class='hunk'>@@ -1219,7 +1275,10 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 		if (cmd == MOXA_SET_OP_MODE) {</div><div class='ctx'> 			if (get_user(opmode, (int __user *) argp))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			if (opmode != RS232_MODE &amp;&amp; opmode != RS485_2WIRE_MODE &amp;&amp; opmode != RS422_MODE &amp;&amp; opmode != RS485_4WIRE_MODE)</div><div class='add'>+			if (opmode != RS232_MODE &amp;&amp;</div><div class='add'>+					opmode != RS485_2WIRE_MODE &amp;&amp;</div><div class='add'>+					opmode != RS422_MODE &amp;&amp;</div><div class='add'>+					opmode != RS485_4WIRE_MODE)</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			mask = ModeMask[p];</div><div class='ctx'> 			shiftbit = p * 2;</div><div class='hunk'>@@ -1236,36 +1295,36 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	// above add by Victor Yu. 01-05-2004</div><div class='add'>+	/* above add by Victor Yu. 01-05-2004 */</div><div class='ctx'> </div><div class='ctx'> 	if ((cmd != TIOCGSERIAL) &amp;&amp; (cmd != TIOCMIWAIT) &amp;&amp; (cmd != TIOCGICOUNT)) {</div><div class='ctx'> 		if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-			return (-EIO);</div><div class='add'>+			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case TCSBRK:		/* SVID version: non-zero arg --&gt; no break */</div><div class='ctx'> 		retval = tty_check_change(tty);</div><div class='ctx'> 		if (retval)</div><div class='del'>-			return (retval);</div><div class='add'>+			return retval;</div><div class='ctx'> 		tty_wait_until_sent(tty, 0);</div><div class='ctx'> 		if (!arg)</div><div class='ctx'> 			mxser_send_break(info, HZ / 4);	/* 1/4 second */</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case TCSBRKP:		/* support for POSIX tcsendbreak() */</div><div class='ctx'> 		retval = tty_check_change(tty);</div><div class='ctx'> 		if (retval)</div><div class='del'>-			return (retval);</div><div class='add'>+			return retval;</div><div class='ctx'> 		tty_wait_until_sent(tty, 0);</div><div class='ctx'> 		mxser_send_break(info, arg ? arg * (HZ / 10) : HZ / 4);</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case TIOCGSOFTCAR:</div><div class='del'>-		return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp);</div><div class='add'>+		return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp);</div><div class='ctx'> 	case TIOCSSOFTCAR:</div><div class='ctx'> 		if (get_user(templ, (unsigned long __user *) argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		arg = templ;</div><div class='ctx'> 		tty-&gt;termios-&gt;c_cflag = ((tty-&gt;termios-&gt;c_cflag &amp; ~CLOCAL) | (arg ? CLOCAL : 0));</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case TIOCGSERIAL:</div><div class='ctx'> 		return mxser_get_serial_info(info, argp);</div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='hunk'>@@ -1278,7 +1337,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 		 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)</div><div class='ctx'> 		 * Caller should use TIOCGICOUNT to see which one it was</div><div class='ctx'> 		 */</div><div class='del'>-	case TIOCMIWAIT:{</div><div class='add'>+	case TIOCMIWAIT: {</div><div class='ctx'> 			DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 			int ret;</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='hunk'>@@ -1292,7 +1351,14 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> </div><div class='ctx'> 				set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-				if (((arg &amp; TIOCM_RNG) &amp;&amp; (cnow.rng != cprev.rng)) || ((arg &amp; TIOCM_DSR) &amp;&amp; (cnow.dsr != cprev.dsr)) || ((arg &amp; TIOCM_CD) &amp;&amp; (cnow.dcd != cprev.dcd)) || ((arg &amp; TIOCM_CTS) &amp;&amp; (cnow.cts != cprev.cts))) {</div><div class='add'>+				if (((arg &amp; TIOCM_RNG) &amp;&amp;</div><div class='add'>+						(cnow.rng != cprev.rng)) ||</div><div class='add'>+						((arg &amp; TIOCM_DSR) &amp;&amp;</div><div class='add'>+						(cnow.dsr != cprev.dsr)) ||</div><div class='add'>+						((arg &amp; TIOCM_CD) &amp;&amp;</div><div class='add'>+						(cnow.dcd != cprev.dcd)) ||</div><div class='add'>+						((arg &amp; TIOCM_CTS) &amp;&amp;</div><div class='add'>+						(cnow.cts != cprev.cts))) {</div><div class='ctx'> 					ret = 0;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1338,21 +1404,18 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 		put_user(cnow.dsr, &amp;p_cuser-&gt;dsr);</div><div class='ctx'> 		put_user(cnow.rng, &amp;p_cuser-&gt;rng);</div><div class='ctx'> 		put_user(cnow.dcd, &amp;p_cuser-&gt;dcd);</div><div class='del'>-</div><div class='del'>-/* */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case MOXA_HighSpeedOn:</div><div class='del'>-		return put_user(info-&gt;baud_base != 115200 ? 1 : 0, (int __user *) argp);</div><div class='del'>-</div><div class='del'>-	case MOXA_SDS_RSTICOUNTER:{</div><div class='add'>+		return put_user(info-&gt;baud_base != 115200 ? 1 : 0, (int __user *)argp);</div><div class='add'>+	case MOXA_SDS_RSTICOUNTER: {</div><div class='ctx'> 			info-&gt;mon_data.rxcnt = 0;</div><div class='ctx'> 			info-&gt;mon_data.txcnt = 0;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-// (above) added by James.</div><div class='add'>+/* (above) added by James. */</div><div class='ctx'> 	case MOXA_ASPP_SETBAUD:{</div><div class='ctx'> 			long baud;</div><div class='del'>-			if (get_user(baud, (long __user *) argp))</div><div class='add'>+			if (get_user(baud, (long __user *)argp))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			mxser_set_baud(info, baud);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1377,9 +1440,10 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-	case MOXA_ASPP_MON:{</div><div class='add'>+	case MOXA_ASPP_MON: {</div><div class='ctx'> 			int mcr, status;</div><div class='del'>-//      info-&gt;mon_data.ser_param = tty-&gt;termios-&gt;c_cflag;</div><div class='add'>+</div><div class='add'>+			/* info-&gt;mon_data.ser_param = tty-&gt;termios-&gt;c_cflag; */</div><div class='ctx'> </div><div class='ctx'> 			status = mxser_get_msr(info-&gt;base, 1, info-&gt;port, info);</div><div class='ctx'> 			mxser_check_modem_status(info, status);</div><div class='hunk'>@@ -1400,25 +1464,25 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int c</div><div class='ctx'> 			else</div><div class='ctx'> 				info-&gt;mon_data.hold_reason &amp;= ~NPPI_NOTIFY_CTSHOLD;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-			if (copy_to_user(argp, &amp;info-&gt;mon_data, sizeof(struct mxser_mon)))</div><div class='add'>+			if (copy_to_user(argp, &amp;info-&gt;mon_data,</div><div class='add'>+					sizeof(struct mxser_mon)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	case MOXA_ASPP_LSTATUS:{</div><div class='del'>-			if (copy_to_user(argp, &amp;info-&gt;err_shadow, sizeof(unsigned char)))</div><div class='add'>+	case MOXA_ASPP_LSTATUS: {</div><div class='add'>+			if (copy_to_user(argp, &amp;info-&gt;err_shadow,</div><div class='add'>+					sizeof(unsigned char)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 			info-&gt;err_shadow = 0;</div><div class='ctx'> 			return 0;</div><div class='del'>-</div><div class='ctx'> 		}</div><div class='del'>-	case MOXA_SET_BAUD_METHOD:{</div><div class='add'>+	case MOXA_SET_BAUD_METHOD: {</div><div class='ctx'> 			int method;</div><div class='del'>-			if (get_user(method, (int __user *) argp))</div><div class='add'>+</div><div class='add'>+			if (get_user(method, (int __user *)argp))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			mxser_set_baud_method[info-&gt;port] = method;</div><div class='ctx'> 			if (copy_to_user(argp, &amp;method, sizeof(int)))</div><div class='hunk'>@@ -1442,7 +1506,8 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case MOXA_GET_CONF:</div><div class='del'>-		if (copy_to_user(argp, mxsercfg, sizeof(struct mxser_hwconf) * 4))</div><div class='add'>+		if (copy_to_user(argp, mxsercfg,</div><div class='add'>+				sizeof(struct mxser_hwconf) * 4))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case MOXA_GET_MAJOR:</div><div class='hunk'>@@ -1461,11 +1526,11 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> 			if (mxvar_table[i].base)</div><div class='ctx'> 				result |= (1 &lt;&lt; i);</div><div class='ctx'> 		}</div><div class='del'>-		return put_user(result, (unsigned long __user *) argp);</div><div class='add'>+		return put_user(result, (unsigned long __user *)argp);</div><div class='ctx'> 	case MOXA_GETDATACOUNT:</div><div class='ctx'> 		if (copy_to_user(argp, &amp;mxvar_log, sizeof(mxvar_log)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	case MOXA_GETMSTATUS:</div><div class='ctx'> 		for (i = 0; i &lt; MXSER_PORTS; i++) {</div><div class='ctx'> 			GMStatus[i].ri = 0;</div><div class='hunk'>@@ -1498,22 +1563,26 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> 			else</div><div class='ctx'> 				GMStatus[i].cts = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_to_user(argp, GMStatus, sizeof(struct mxser_mstatus) * MXSER_PORTS))</div><div class='add'>+		if (copy_to_user(argp, GMStatus,</div><div class='add'>+				sizeof(struct mxser_mstatus) * MXSER_PORTS))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='del'>-	case MOXA_ASPP_MON_EXT:{</div><div class='add'>+	case MOXA_ASPP_MON_EXT: {</div><div class='ctx'> 			int status;</div><div class='ctx'> 			int opmode, p;</div><div class='ctx'> 			int shiftbit;</div><div class='ctx'> 			unsigned cflag, iflag;</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; MXSER_PORTS; i++) {</div><div class='del'>-</div><div class='ctx'> 				if (!mxvar_table[i].base)</div><div class='ctx'> 					continue;</div><div class='ctx'> </div><div class='del'>-				status = mxser_get_msr(mxvar_table[i].base, 0, i, &amp;(mxvar_table[i]));</div><div class='del'>-//                      mxser_check_modem_status(&amp;mxvar_table[i], status);</div><div class='add'>+				status = mxser_get_msr(mxvar_table[i].base, 0,</div><div class='add'>+							i, &amp;(mxvar_table[i]));</div><div class='add'>+				/*</div><div class='add'>+				mxser_check_modem_status(&amp;mxvar_table[i],</div><div class='add'>+								status);</div><div class='add'>+				*/</div><div class='ctx'> 				if (status &amp; UART_MSR_TERI)</div><div class='ctx'> 					mxvar_table[i].icount.rng++;</div><div class='ctx'> 				if (status &amp; UART_MSR_DDSR)</div><div class='hunk'>@@ -1578,75 +1647,76 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void mxser_stoprx(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='del'>-	//unsigned long flags;</div><div class='del'>-</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='add'>+	/* unsigned long flags; */</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;ldisc_stop_rx = 1;</div><div class='ctx'> 	if (I_IXOFF(tty)) {</div><div class='del'>-</div><div class='del'>-		//MX_LOCK(&amp;info-&gt;slock);</div><div class='del'>-		// following add by Victor Yu. 09-02-2002</div><div class='add'>+		/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='add'>+		/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 		if (info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 			info-&gt;IER &amp;= ~MOXA_MUST_RECV_ISR;</div><div class='ctx'> 			outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 		} else {</div><div class='del'>-			// above add by Victor Yu. 09-02-2002</div><div class='del'>-</div><div class='add'>+			/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 			info-&gt;x_char = STOP_CHAR(tty);</div><div class='del'>-			//      outb(info-&gt;IER, 0); // mask by Victor Yu. 09-02-2002</div><div class='add'>+			/* mask by Victor Yu. 09-02-2002 */</div><div class='add'>+			/* outb(info-&gt;IER, 0); */</div><div class='ctx'> 			outb(0, info-&gt;base + UART_IER);</div><div class='ctx'> 			info-&gt;IER |= UART_IER_THRI;</div><div class='del'>-			outb(info-&gt;IER, info-&gt;base + UART_IER);	/* force Tx interrupt */</div><div class='del'>-		}		// add by Victor Yu. 09-02-2002</div><div class='del'>-		//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+			/* force Tx interrupt */</div><div class='add'>+			outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='add'>+		}		/* add by Victor Yu. 09-02-2002 */</div><div class='add'>+		/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) {</div><div class='del'>-		//MX_LOCK(&amp;info-&gt;slock);</div><div class='add'>+		/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 		info-&gt;MCR &amp;= ~UART_MCR_RTS;</div><div class='ctx'> 		outb(info-&gt;MCR, info-&gt;base + UART_MCR);</div><div class='del'>-		//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+		/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxser_startrx(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='del'>-	//unsigned long flags;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='add'>+	/* unsigned long flags; */</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;ldisc_stop_rx = 0;</div><div class='ctx'> 	if (I_IXOFF(tty)) {</div><div class='ctx'> 		if (info-&gt;x_char)</div><div class='ctx'> 			info-&gt;x_char = 0;</div><div class='ctx'> 		else {</div><div class='del'>-			//MX_LOCK(&amp;info-&gt;slock);</div><div class='add'>+			/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='ctx'> </div><div class='del'>-			// following add by Victor Yu. 09-02-2002</div><div class='add'>+			/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 			if (info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 				info-&gt;IER |= MOXA_MUST_RECV_ISR;</div><div class='ctx'> 				outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 			} else {</div><div class='del'>-				// above add by Victor Yu. 09-02-2002</div><div class='add'>+				/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> </div><div class='ctx'> 				info-&gt;x_char = START_CHAR(tty);</div><div class='del'>-				//          outb(info-&gt;IER, 0); // mask by Victor Yu. 09-02-2002</div><div class='del'>-				outb(0, info-&gt;base + UART_IER);	// add by Victor Yu. 09-02-2002</div><div class='del'>-				info-&gt;IER |= UART_IER_THRI;	/* force Tx interrupt */</div><div class='add'>+				/* mask by Victor Yu. 09-02-2002 */</div><div class='add'>+				/* outb(info-&gt;IER, 0); */</div><div class='add'>+				/* add by Victor Yu. 09-02-2002 */</div><div class='add'>+				outb(0, info-&gt;base + UART_IER);</div><div class='add'>+				/* force Tx interrupt */</div><div class='add'>+				info-&gt;IER |= UART_IER_THRI;</div><div class='ctx'> 				outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='del'>-			}	// add by Victor Yu. 09-02-2002</div><div class='del'>-			//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+			}	/* add by Victor Yu. 09-02-2002 */</div><div class='add'>+			/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) {</div><div class='del'>-		//MX_LOCK(&amp;info-&gt;slock);</div><div class='add'>+		/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 		info-&gt;MCR |= UART_MCR_RTS;</div><div class='ctx'> 		outb(info-&gt;MCR, info-&gt;base + UART_MCR);</div><div class='del'>-		//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+		/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1656,48 +1726,53 @@ static void mxser_startrx(struct tty_struct *tty)</div><div class='ctx'>  */</div><div class='ctx'> static void mxser_throttle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	//struct mxser_struct *info = (struct mxser_struct *)tty-&gt;driver_data;</div><div class='del'>-	//unsigned long flags;</div><div class='del'>-	//MX_LOCK(&amp;info-&gt;slock);</div><div class='add'>+	/* struct mxser_struct *info = tty-&gt;driver_data; */</div><div class='add'>+	/* unsigned long flags; */</div><div class='add'>+</div><div class='add'>+	/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 	mxser_stoprx(tty);</div><div class='del'>-	//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+	/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxser_unthrottle(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	//struct mxser_struct *info = (struct mxser_struct *)tty-&gt;driver_data;</div><div class='del'>-	//unsigned long flags;</div><div class='del'>-	//MX_LOCK(&amp;info-&gt;slock);</div><div class='add'>+	/* struct mxser_struct *info = tty-&gt;driver_data; */</div><div class='add'>+	/* unsigned long flags; */</div><div class='add'>+</div><div class='add'>+	/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 	mxser_startrx(tty);</div><div class='del'>-	//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+	/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((tty-&gt;termios-&gt;c_cflag != old_termios-&gt;c_cflag) || (RELEVANT_IFLAG(tty-&gt;termios-&gt;c_iflag) != RELEVANT_IFLAG(old_termios-&gt;c_iflag))) {</div><div class='add'>+	if ((tty-&gt;termios-&gt;c_cflag != old_termios-&gt;c_cflag) ||</div><div class='add'>+			(RELEVANT_IFLAG(tty-&gt;termios-&gt;c_iflag) != RELEVANT_IFLAG(old_termios-&gt;c_iflag))) {</div><div class='ctx'> </div><div class='ctx'> 		mxser_change_speed(info, old_termios);</div><div class='ctx'> </div><div class='del'>-		if ((old_termios-&gt;c_cflag &amp; CRTSCTS) &amp;&amp; !(tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS)) {</div><div class='add'>+		if ((old_termios-&gt;c_cflag &amp; CRTSCTS) &amp;&amp;</div><div class='add'>+				!(tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS)) {</div><div class='ctx'> 			tty-&gt;hw_stopped = 0;</div><div class='ctx'> 			mxser_start(tty);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /* Handle sw stopped */</div><div class='del'>-	if ((old_termios-&gt;c_iflag &amp; IXON) &amp;&amp; !(tty-&gt;termios-&gt;c_iflag &amp; IXON)) {</div><div class='add'>+	if ((old_termios-&gt;c_iflag &amp; IXON) &amp;&amp;</div><div class='add'>+			!(tty-&gt;termios-&gt;c_iflag &amp; IXON)) {</div><div class='ctx'> 		tty-&gt;stopped = 0;</div><div class='ctx'> </div><div class='del'>-		// following add by Victor Yu. 09-02-2002</div><div class='add'>+		/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 		if (info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 			spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 			DISABLE_MOXA_MUST_RX_SOFTWARE_FLOW_CONTROL(info-&gt;base);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 		}</div><div class='del'>-		// above add by Victor Yu. 09-02-2002</div><div class='add'>+		/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> </div><div class='ctx'> 		mxser_start(tty);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1711,7 +1786,7 @@ static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termio</div><div class='ctx'>  */</div><div class='ctx'> static void mxser_stop(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='hunk'>@@ -1724,7 +1799,7 @@ static void mxser_stop(struct tty_struct *tty)</div><div class='ctx'> </div><div class='ctx'> static void mxser_start(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='hunk'>@@ -1740,7 +1815,7 @@ static void mxser_start(struct tty_struct *tty)</div><div class='ctx'>  */</div><div class='ctx'> static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long orig_jiffies, char_time;</div><div class='ctx'> 	int lsr;</div><div class='ctx'> </div><div class='hunk'>@@ -1777,7 +1852,8 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)</div><div class='ctx'> 	if (!timeout || timeout &gt; 2 * info-&gt;timeout)</div><div class='ctx'> 		timeout = 2 * info-&gt;timeout;</div><div class='ctx'> #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT</div><div class='del'>-	printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...", timeout, char_time);</div><div class='add'>+	printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...",</div><div class='add'>+		timeout, char_time);</div><div class='ctx'> 	printk("jiff=%lu...", jiffies);</div><div class='ctx'> #endif</div><div class='ctx'> 	while (!((lsr = inb(info-&gt;base + UART_LSR)) &amp; UART_LSR_TEMT)) {</div><div class='hunk'>@@ -1803,7 +1879,7 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)</div><div class='ctx'>  */</div><div class='ctx'> void mxser_hangup(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	mxser_flush_buffer(tty);</div><div class='ctx'> 	mxser_shutdown(info);</div><div class='hunk'>@@ -1815,24 +1891,26 @@ void mxser_hangup(struct tty_struct *tty)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-// added by James 03-12-2004.</div><div class='add'>+/* added by James 03-12-2004. */</div><div class='ctx'> /*</div><div class='ctx'>  * mxser_rs_break() --- routine which turns the break handling on or off</div><div class='ctx'>  */</div><div class='ctx'> static void mxser_rs_break(struct tty_struct *tty, int break_state)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	if (break_state == -1)</div><div class='del'>-		outb(inb(info-&gt;base + UART_LCR) | UART_LCR_SBC, info-&gt;base + UART_LCR);</div><div class='add'>+		outb(inb(info-&gt;base + UART_LCR) | UART_LCR_SBC,</div><div class='add'>+			info-&gt;base + UART_LCR);</div><div class='ctx'> 	else</div><div class='del'>-		outb(inb(info-&gt;base + UART_LCR) &amp; ~UART_LCR_SBC, info-&gt;base + UART_LCR);</div><div class='add'>+		outb(inb(info-&gt;base + UART_LCR) &amp; ~UART_LCR_SBC,</div><div class='add'>+			info-&gt;base + UART_LCR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// (above) added by James.</div><div class='add'>+/* (above) added by James. */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1848,7 +1926,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	int handled = IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	port = NULL;</div><div class='del'>-	//spin_lock(&amp;gm_lock);</div><div class='add'>+	/* spin_lock(&amp;gm_lock); */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MXSER_BOARDS; i++) {</div><div class='ctx'> 		if (dev_id == &amp;(mxvar_table[i * MXSER_PORTS_PER_BOARD])) {</div><div class='hunk'>@@ -1857,29 +1935,25 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i == MXSER_BOARDS) {</div><div class='add'>+	if (i == MXSER_BOARDS)</div><div class='ctx'> 		goto irq_stop;</div><div class='del'>-	}</div><div class='del'>-	if (port == 0) {</div><div class='add'>+	if (port == 0)</div><div class='ctx'> 		goto irq_stop;</div><div class='del'>-	}</div><div class='ctx'> 	max = mxser_numports[mxsercfg[i].board_type - 1];</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		irqbits = inb(port-&gt;vector) &amp; port-&gt;vectormask;</div><div class='del'>-		if (irqbits == port-&gt;vectormask) {</div><div class='add'>+		if (irqbits == port-&gt;vectormask)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		handled = IRQ_HANDLED;</div><div class='ctx'> 		for (i = 0, bits = 1; i &lt; max; i++, irqbits |= bits, bits &lt;&lt;= 1) {</div><div class='del'>-			if (irqbits == port-&gt;vectormask) {</div><div class='add'>+			if (irqbits == port-&gt;vectormask)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='ctx'> 			if (bits &amp; irqbits)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			info = port + i;</div><div class='ctx'> </div><div class='del'>-			// following add by Victor Yu. 09-13-2002</div><div class='add'>+			/* following add by Victor Yu. 09-13-2002 */</div><div class='ctx'> 			iir = inb(info-&gt;base + UART_IIR);</div><div class='ctx'> 			if (iir &amp; UART_IIR_NO_INT)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1890,9 +1964,9 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 				inb(info-&gt;base + UART_MSR);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			// above add by Victor Yu. 09-13-2002</div><div class='add'>+			/* above add by Victor Yu. 09-13-2002 */</div><div class='ctx'> 			/*</div><div class='del'>-			   if ( info-&gt;tty-&gt;flip.count &lt; TTY_FLIPBUF_SIZE/4 ){</div><div class='add'>+			   if (info-&gt;tty-&gt;flip.count &lt; TTY_FLIPBUF_SIZE / 4) {</div><div class='ctx'> 			   info-&gt;IER |= MOXA_MUST_RECV_ISR;</div><div class='ctx'> 			   outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 			   }</div><div class='hunk'>@@ -1908,18 +1982,15 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 			   status = inb(info-&gt;base + UART_LSR) &amp; info-&gt;read_status_mask;</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='del'>-			// following add by Victor Yu. 09-02-2002</div><div class='add'>+			/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 			status = inb(info-&gt;base + UART_LSR);</div><div class='ctx'> </div><div class='del'>-			if (status &amp; UART_LSR_PE) {</div><div class='add'>+			if (status &amp; UART_LSR_PE)</div><div class='ctx'> 				info-&gt;err_shadow |= NPPI_NOTIFY_PARITY;</div><div class='del'>-			}</div><div class='del'>-			if (status &amp; UART_LSR_FE) {</div><div class='add'>+			if (status &amp; UART_LSR_FE)</div><div class='ctx'> 				info-&gt;err_shadow |= NPPI_NOTIFY_FRAMING;</div><div class='del'>-			}</div><div class='del'>-			if (status &amp; UART_LSR_OE) {</div><div class='add'>+			if (status &amp; UART_LSR_OE)</div><div class='ctx'> 				info-&gt;err_shadow |= NPPI_NOTIFY_HW_OVERRUN;</div><div class='del'>-			}</div><div class='ctx'> 			if (status &amp; UART_LSR_BI)</div><div class='ctx'> 				info-&gt;err_shadow |= NPPI_NOTIFY_BREAK;</div><div class='ctx'> </div><div class='hunk'>@@ -1930,11 +2001,14 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 				   continue;</div><div class='ctx'> 				   }</div><div class='ctx'> 				 */</div><div class='del'>-				if (iir == MOXA_MUST_IIR_GDA || iir == MOXA_MUST_IIR_RDA || iir == MOXA_MUST_IIR_RTO || iir == MOXA_MUST_IIR_LSR)</div><div class='add'>+				if (iir == MOXA_MUST_IIR_GDA ||</div><div class='add'>+						iir == MOXA_MUST_IIR_RDA ||</div><div class='add'>+						iir == MOXA_MUST_IIR_RTO ||</div><div class='add'>+						iir == MOXA_MUST_IIR_LSR)</div><div class='ctx'> 					mxser_receive_chars(info, &amp;status);</div><div class='ctx'> </div><div class='ctx'> 			} else {</div><div class='del'>-				// above add by Victor Yu. 09-02-2002</div><div class='add'>+				/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> </div><div class='ctx'> 				status &amp;= info-&gt;read_status_mask;</div><div class='ctx'> 				if (status &amp; UART_LSR_DR)</div><div class='hunk'>@@ -1944,13 +2018,13 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 			if (msr &amp; UART_MSR_ANY_DELTA) {</div><div class='ctx'> 				mxser_check_modem_status(info, msr);</div><div class='ctx'> 			}</div><div class='del'>-			// following add by Victor Yu. 09-13-2002</div><div class='add'>+			/* following add by Victor Yu. 09-13-2002 */</div><div class='ctx'> 			if (info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 				if ((iir == 0x02) &amp;&amp; (status &amp; UART_LSR_THRE)) {</div><div class='ctx'> 					mxser_transmit_chars(info);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='del'>-				// above add by Victor Yu. 09-13-2002</div><div class='add'>+				/* above add by Victor Yu. 09-13-2002 */</div><div class='ctx'> </div><div class='ctx'> 				if (status &amp; UART_LSR_THRE) {</div><div class='ctx'> /* 8-2-99 by William</div><div class='hunk'>@@ -1966,7 +2040,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       irq_stop:</div><div class='del'>-	//spin_unlock(&amp;gm_lock);</div><div class='add'>+	/* spin_unlock(&amp;gm_lock); */</div><div class='ctx'> 	return handled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1984,56 +2058,58 @@ static void mxser_receive_chars(struct mxser_struct *info, int *status)</div><div class='ctx'> </div><div class='ctx'> 	recv_room = tty-&gt;receive_room;</div><div class='ctx'> 	if ((recv_room == 0) &amp;&amp; (!info-&gt;ldisc_stop_rx)) {</div><div class='del'>-		//mxser_throttle(tty);</div><div class='add'>+		/* mxser_throttle(tty); */</div><div class='ctx'> 		mxser_stoprx(tty);</div><div class='del'>-		//return;</div><div class='add'>+		/* return; */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	// following add by Victor Yu. 09-02-2002</div><div class='add'>+	/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 	if (info-&gt;IsMoxaMustChipFlag != MOXA_OTHER_UART) {</div><div class='ctx'> </div><div class='ctx'> 		if (*status &amp; UART_LSR_SPECIAL) {</div><div class='ctx'> 			goto intr_old;</div><div class='ctx'> 		}</div><div class='del'>-		// following add by Victor Yu. 02-11-2004</div><div class='del'>-		if (info-&gt;IsMoxaMustChipFlag == MOXA_MUST_MU860_HWID &amp;&amp; (*status &amp; MOXA_MUST_LSR_RERR))</div><div class='add'>+		/* following add by Victor Yu. 02-11-2004 */</div><div class='add'>+		if (info-&gt;IsMoxaMustChipFlag == MOXA_MUST_MU860_HWID &amp;&amp;</div><div class='add'>+				(*status &amp; MOXA_MUST_LSR_RERR))</div><div class='ctx'> 			goto intr_old;</div><div class='del'>-		// above add by Victor Yu. 02-14-2004</div><div class='add'>+		/* above add by Victor Yu. 02-14-2004 */</div><div class='ctx'> 		if (*status &amp; MOXA_MUST_LSR_RERR)</div><div class='ctx'> 			goto intr_old;</div><div class='ctx'> </div><div class='ctx'> 		gdl = inb(info-&gt;base + MOXA_MUST_GDL_REGISTER);</div><div class='ctx'> </div><div class='del'>-		if (info-&gt;IsMoxaMustChipFlag == MOXA_MUST_MU150_HWID)	// add by Victor Yu. 02-11-2004</div><div class='add'>+		/* add by Victor Yu. 02-11-2004 */</div><div class='add'>+		if (info-&gt;IsMoxaMustChipFlag == MOXA_MUST_MU150_HWID)</div><div class='ctx'> 			gdl &amp;= MOXA_MUST_GDL_MASK;</div><div class='ctx'> 		if (gdl &gt;= recv_room) {</div><div class='ctx'> 			if (!info-&gt;ldisc_stop_rx) {</div><div class='del'>-				//mxser_throttle(tty);</div><div class='add'>+				/* mxser_throttle(tty); */</div><div class='ctx'> 				mxser_stoprx(tty);</div><div class='ctx'> 			}</div><div class='del'>-			//return;</div><div class='add'>+			/* return; */</div><div class='ctx'> 		}</div><div class='ctx'> 		while (gdl--) {</div><div class='ctx'> 			ch = inb(info-&gt;base + UART_RX);</div><div class='ctx'> 			tty_insert_flip_char(tty, ch, 0);</div><div class='ctx'> 			cnt++;</div><div class='ctx'> 			/*</div><div class='del'>-			   if((cnt&gt;=HI_WATER) &amp;&amp; (info-&gt;stop_rx==0)){</div><div class='add'>+			   if ((cnt &gt;= HI_WATER) &amp;&amp; (info-&gt;stop_rx == 0)) {</div><div class='ctx'> 			   mxser_stoprx(tty);</div><div class='del'>-			   info-&gt;stop_rx=1;</div><div class='add'>+			   info-&gt;stop_rx = 1;</div><div class='ctx'> 			   break;</div><div class='ctx'> 			   } */</div><div class='ctx'> 		}</div><div class='ctx'> 		goto end_intr;</div><div class='ctx'> 	}</div><div class='del'>-intr_old:</div><div class='del'>-	// above add by Victor Yu. 09-02-2002</div><div class='add'>+ intr_old:</div><div class='add'>+	/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		if (max-- &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		/*</div><div class='del'>-		   if((cnt&gt;=HI_WATER) &amp;&amp; (info-&gt;stop_rx==0)){</div><div class='add'>+		   if ((cnt &gt;= HI_WATER) &amp;&amp; (info-&gt;stop_rx == 0)) {</div><div class='ctx'> 		   mxser_stoprx(tty);</div><div class='ctx'> 		   info-&gt;stop_rx=1;</div><div class='ctx'> 		   break;</div><div class='hunk'>@@ -2041,11 +2117,11 @@ intr_old:</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		ch = inb(info-&gt;base + UART_RX);</div><div class='del'>-		// following add by Victor Yu. 09-02-2002</div><div class='add'>+		/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 		if (info-&gt;IsMoxaMustChipFlag &amp;&amp; (*status &amp; UART_LSR_OE) /*&amp;&amp; !(*status&amp;UART_LSR_DR) */ )</div><div class='ctx'> 			outb(0x23, info-&gt;base + UART_FCR);</div><div class='ctx'> 		*status &amp;= info-&gt;read_status_mask;</div><div class='del'>-		// above add by Victor Yu. 09-02-2002</div><div class='add'>+		/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 		if (*status &amp; info-&gt;ignore_status_mask) {</div><div class='ctx'> 			if (++ignored &gt; 100)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2080,7 +2156,7 @@ intr_old:</div><div class='ctx'> 			cnt++;</div><div class='ctx'> 			if (cnt &gt;= recv_room) {</div><div class='ctx'> 				if (!info-&gt;ldisc_stop_rx) {</div><div class='del'>-					//mxser_throttle(tty);</div><div class='add'>+					/* mxser_throttle(tty); */</div><div class='ctx'> 					mxser_stoprx(tty);</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2088,21 +2164,20 @@ intr_old:</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		// following add by Victor Yu. 09-02-2002</div><div class='add'>+		/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 		if (info-&gt;IsMoxaMustChipFlag)</div><div class='ctx'> 			break;</div><div class='del'>-		// above add by Victor Yu. 09-02-2002</div><div class='add'>+		/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> </div><div class='ctx'> 		/* mask by Victor Yu. 09-02-2002</div><div class='ctx'> 		 *status = inb(info-&gt;base + UART_LSR) &amp; info-&gt;read_status_mask;</div><div class='ctx'> 		 */</div><div class='del'>-		// following add by Victor Yu. 09-02-2002</div><div class='add'>+		/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 		*status = inb(info-&gt;base + UART_LSR);</div><div class='del'>-		// above add by Victor Yu. 09-02-2002</div><div class='add'>+		/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 	} while (*status &amp; UART_LSR_DR);</div><div class='ctx'> </div><div class='del'>-end_intr:		// add by Victor Yu. 09-02-2002</div><div class='del'>-</div><div class='add'>+end_intr:		/* add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 	mxvar_log.rxcnt[info-&gt;port] += cnt;</div><div class='ctx'> 	info-&gt;mon_data.rxcnt += cnt;</div><div class='ctx'> 	info-&gt;mon_data.up_rxcnt += cnt;</div><div class='hunk'>@@ -2137,7 +2212,10 @@ static void mxser_transmit_chars(struct mxser_struct *info)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((info-&gt;xmit_cnt &lt;= 0) || info-&gt;tty-&gt;stopped || (info-&gt;tty-&gt;hw_stopped &amp;&amp; (info-&gt;type != PORT_16550A) &amp;&amp; (!info-&gt;IsMoxaMustChipFlag))) {</div><div class='add'>+	if ((info-&gt;xmit_cnt &lt;= 0) || info-&gt;tty-&gt;stopped ||</div><div class='add'>+			(info-&gt;tty-&gt;hw_stopped &amp;&amp;</div><div class='add'>+			(info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='add'>+			(!info-&gt;IsMoxaMustChipFlag))) {</div><div class='ctx'> 		info-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='ctx'> 		outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='hunk'>@@ -2147,17 +2225,18 @@ static void mxser_transmit_chars(struct mxser_struct *info)</div><div class='ctx'> 	cnt = info-&gt;xmit_cnt;</div><div class='ctx'> 	count = info-&gt;xmit_fifo_size;</div><div class='ctx'> 	do {</div><div class='del'>-		outb(info-&gt;xmit_buf[info-&gt;xmit_tail++], info-&gt;base + UART_TX);</div><div class='add'>+		outb(info-&gt;xmit_buf[info-&gt;xmit_tail++],</div><div class='add'>+			info-&gt;base + UART_TX);</div><div class='ctx'> 		info-&gt;xmit_tail = info-&gt;xmit_tail &amp; (SERIAL_XMIT_SIZE - 1);</div><div class='ctx'> 		if (--info-&gt;xmit_cnt &lt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (--count &gt; 0);</div><div class='ctx'> 	mxvar_log.txcnt[info-&gt;port] += (cnt - info-&gt;xmit_cnt);</div><div class='ctx'> </div><div class='del'>-// added by James 03-12-2004.</div><div class='add'>+/* added by James 03-12-2004. */</div><div class='ctx'> 	info-&gt;mon_data.txcnt += (cnt - info-&gt;xmit_cnt);</div><div class='ctx'> 	info-&gt;mon_data.up_txcnt += (cnt - info-&gt;xmit_cnt);</div><div class='del'>-// (above) added by James.</div><div class='add'>+/* (above) added by James. */</div><div class='ctx'> </div><div class='ctx'> /* added by casper 1/11/2000 */</div><div class='ctx'> 	info-&gt;icount.tx += (cnt - info-&gt;xmit_cnt);</div><div class='hunk'>@@ -2188,7 +2267,6 @@ static void mxser_check_modem_status(struct mxser_struct *info, int status)</div><div class='ctx'> 	info-&gt;mon_data.modem_status = status;</div><div class='ctx'> 	wake_up_interruptible(&amp;info-&gt;delta_msr_wait);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if ((info-&gt;flags &amp; ASYNC_CHECK_CD) &amp;&amp; (status &amp; UART_MSR_DDCD)) {</div><div class='ctx'> 		if (status &amp; UART_MSR_DCD)</div><div class='ctx'> 			wake_up_interruptible(&amp;info-&gt;open_wait);</div><div class='hunk'>@@ -2200,7 +2278,8 @@ static void mxser_check_modem_status(struct mxser_struct *info, int status)</div><div class='ctx'> 			if (status &amp; UART_MSR_CTS) {</div><div class='ctx'> 				info-&gt;tty-&gt;hw_stopped = 0;</div><div class='ctx'> </div><div class='del'>-				if ((info-&gt;type != PORT_16550A) &amp;&amp; (!info-&gt;IsMoxaMustChipFlag)) {</div><div class='add'>+				if ((info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='add'>+						(!info-&gt;IsMoxaMustChipFlag)) {</div><div class='ctx'> 					info-&gt;IER |= UART_IER_THRI;</div><div class='ctx'> 					outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2209,7 +2288,8 @@ static void mxser_check_modem_status(struct mxser_struct *info, int status)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (!(status &amp; UART_MSR_CTS)) {</div><div class='ctx'> 				info-&gt;tty-&gt;hw_stopped = 1;</div><div class='del'>-				if ((info-&gt;type != PORT_16550A) &amp;&amp; (!info-&gt;IsMoxaMustChipFlag)) {</div><div class='add'>+				if ((info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='add'>+						(!info-&gt;IsMoxaMustChipFlag)) {</div><div class='ctx'> 					info-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='ctx'> 					outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2231,7 +2311,7 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, stru</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((filp-&gt;f_flags &amp; O_NONBLOCK) || (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))) {</div><div class='ctx'> 		info-&gt;flags |= ASYNC_NORMAL_ACTIVE;</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='hunk'>@@ -2254,7 +2334,8 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, stru</div><div class='ctx'> 	info-&gt;blocked_open++;</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='del'>-		outb(inb(info-&gt;base + UART_MCR) | UART_MCR_DTR | UART_MCR_RTS, info-&gt;base + UART_MCR);</div><div class='add'>+		outb(inb(info-&gt;base + UART_MCR) |</div><div class='add'>+			UART_MCR_DTR | UART_MCR_RTS, info-&gt;base + UART_MCR);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		if (tty_hung_up_p(filp) || !(info-&gt;flags &amp; ASYNC_INITIALIZED)) {</div><div class='hunk'>@@ -2264,7 +2345,9 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, stru</div><div class='ctx'> 				retval = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!(info-&gt;flags &amp; ASYNC_CLOSING) &amp;&amp; (do_clocal || (inb(info-&gt;base + UART_MSR) &amp; UART_MSR_DCD)))</div><div class='add'>+		if (!(info-&gt;flags &amp; ASYNC_CLOSING) &amp;&amp;</div><div class='add'>+				(do_clocal ||</div><div class='add'>+				(inb(info-&gt;base + UART_MSR) &amp; UART_MSR_DCD)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			retval = -ERESTARTSYS;</div><div class='hunk'>@@ -2278,27 +2361,26 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, stru</div><div class='ctx'> 		info-&gt;count++;</div><div class='ctx'> 	info-&gt;blocked_open--;</div><div class='ctx'> 	if (retval)</div><div class='del'>-		return (retval);</div><div class='add'>+		return retval;</div><div class='ctx'> 	info-&gt;flags |= ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	return (0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxser_startup(struct mxser_struct *info)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	unsigned long page;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	page = __get_free_page(GFP_KERNEL);</div><div class='ctx'> 	if (!page)</div><div class='del'>-		return (-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;flags &amp; ASYNC_INITIALIZED) {</div><div class='ctx'> 		free_page(page);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!info-&gt;base || !info-&gt;type) {</div><div class='hunk'>@@ -2306,7 +2388,7 @@ static int mxser_startup(struct mxser_struct *info)</div><div class='ctx'> 			set_bit(TTY_IO_ERROR, &amp;info-&gt;tty-&gt;flags);</div><div class='ctx'> 		free_page(page);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;xmit_buf)</div><div class='ctx'> 		free_page(page);</div><div class='hunk'>@@ -2318,9 +2400,12 @@ static int mxser_startup(struct mxser_struct *info)</div><div class='ctx'> 	 * (they will be reenabled in mxser_change_speed())</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (info-&gt;IsMoxaMustChipFlag)</div><div class='del'>-		outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT | MOXA_MUST_FCR_GDA_MODE_ENABLE), info-&gt;base + UART_FCR);</div><div class='add'>+		outb((UART_FCR_CLEAR_RCVR |</div><div class='add'>+			UART_FCR_CLEAR_XMIT |</div><div class='add'>+			MOXA_MUST_FCR_GDA_MODE_ENABLE), info-&gt;base + UART_FCR);</div><div class='ctx'> 	else</div><div class='del'>-		outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info-&gt;base + UART_FCR);</div><div class='add'>+		outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT),</div><div class='add'>+			info-&gt;base + UART_FCR);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * At this point there's no way the LSR could still be 0xFF;</div><div class='hunk'>@@ -2332,9 +2417,9 @@ static int mxser_startup(struct mxser_struct *info)</div><div class='ctx'> 		if (capable(CAP_SYS_ADMIN)) {</div><div class='ctx'> 			if (info-&gt;tty)</div><div class='ctx'> 				set_bit(TTY_IO_ERROR, &amp;info-&gt;tty-&gt;flags);</div><div class='del'>-			return (0);</div><div class='add'>+			return 0;</div><div class='ctx'> 		} else</div><div class='del'>-			return (-ENODEV);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2356,12 +2441,12 @@ static int mxser_startup(struct mxser_struct *info)</div><div class='ctx'> 	 * Finally, enable interrupts</div><div class='ctx'> 	 */</div><div class='ctx'> 	info-&gt;IER = UART_IER_MSI | UART_IER_RLSI | UART_IER_RDI;</div><div class='del'>-//      info-&gt;IER = UART_IER_RLSI | UART_IER_RDI;</div><div class='add'>+	/* info-&gt;IER = UART_IER_RLSI | UART_IER_RDI; */</div><div class='ctx'> </div><div class='del'>-	// following add by Victor Yu. 08-30-2002</div><div class='add'>+	/* following add by Victor Yu. 08-30-2002 */</div><div class='ctx'> 	if (info-&gt;IsMoxaMustChipFlag)</div><div class='ctx'> 		info-&gt;IER |= MOXA_MUST_IER_EGDAI;</div><div class='del'>-	// above add by Victor Yu. 08-30-2002</div><div class='add'>+	/* above add by Victor Yu. 08-30-2002 */</div><div class='ctx'> 	outb(info-&gt;IER, info-&gt;base + UART_IER);	/* enable interrupts */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2383,7 +2468,7 @@ static int mxser_startup(struct mxser_struct *info)</div><div class='ctx'> 	mxser_change_speed(info, NULL);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;flags |= ASYNC_INITIALIZED;</div><div class='del'>-	return (0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2421,12 +2506,15 @@ static void mxser_shutdown(struct mxser_struct *info)</div><div class='ctx'> 	outb(info-&gt;MCR, info-&gt;base + UART_MCR);</div><div class='ctx'> </div><div class='ctx'> 	/* clear Rx/Tx FIFO's */</div><div class='del'>-	// following add by Victor Yu. 08-30-2002</div><div class='add'>+	/* following add by Victor Yu. 08-30-2002 */</div><div class='ctx'> 	if (info-&gt;IsMoxaMustChipFlag)</div><div class='del'>-		outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT | MOXA_MUST_FCR_GDA_MODE_ENABLE), info-&gt;base + UART_FCR);</div><div class='add'>+		outb((UART_FCR_CLEAR_RCVR |</div><div class='add'>+			UART_FCR_CLEAR_XMIT |</div><div class='add'>+			MOXA_MUST_FCR_GDA_MODE_ENABLE), info-&gt;base + UART_FCR);</div><div class='ctx'> 	else</div><div class='del'>-		// above add by Victor Yu. 08-30-2002</div><div class='del'>-		outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT), info-&gt;base + UART_FCR);</div><div class='add'>+		/* above add by Victor Yu. 08-30-2002 */</div><div class='add'>+		outb((UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT),</div><div class='add'>+			info-&gt;base + UART_FCR);</div><div class='ctx'> </div><div class='ctx'> 	/* read data port to reset things */</div><div class='ctx'> 	(void) inb(info-&gt;base + UART_RX);</div><div class='hunk'>@@ -2436,11 +2524,10 @@ static void mxser_shutdown(struct mxser_struct *info)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;flags &amp;= ~ASYNC_INITIALIZED;</div><div class='ctx'> </div><div class='del'>-	// following add by Victor Yu. 09-23-2002</div><div class='del'>-	if (info-&gt;IsMoxaMustChipFlag) {</div><div class='add'>+	/* following add by Victor Yu. 09-23-2002 */</div><div class='add'>+	if (info-&gt;IsMoxaMustChipFlag)</div><div class='ctx'> 		SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(info-&gt;base);</div><div class='del'>-	}</div><div class='del'>-	// above add by Victor Yu. 09-23-2002</div><div class='add'>+	/* above add by Victor Yu. 09-23-2002 */</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -2457,14 +2544,12 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 	long baud;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (!info-&gt;tty || !info-&gt;tty-&gt;termios)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	cflag = info-&gt;tty-&gt;termios-&gt;c_cflag;</div><div class='ctx'> 	if (!(info-&gt;base))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifndef B921600</div><div class='ctx'> #define B921600 (B460800 +1)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2559,9 +2644,8 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 		cval |= 0x04;</div><div class='ctx'> 	if (cflag &amp; PARENB)</div><div class='ctx'> 		cval |= UART_LCR_PARITY;</div><div class='del'>-	if (!(cflag &amp; PARODD)) {</div><div class='add'>+	if (!(cflag &amp; PARODD))</div><div class='ctx'> 		cval |= UART_LCR_EPAR;</div><div class='del'>-	}</div><div class='ctx'> 	if (cflag &amp; CMSPAR)</div><div class='ctx'> 		cval |= UART_LCR_SPAR;</div><div class='ctx'> </div><div class='hunk'>@@ -2574,13 +2658,12 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 			fcr = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fcr = UART_FCR_ENABLE_FIFO;</div><div class='del'>-		// following add by Victor Yu. 08-30-2002</div><div class='add'>+		/* following add by Victor Yu. 08-30-2002 */</div><div class='ctx'> 		if (info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 			fcr |= MOXA_MUST_FCR_GDA_MODE_ENABLE;</div><div class='ctx'> 			SET_MOXA_MUST_FIFO_VALUE(info);</div><div class='ctx'> 		} else {</div><div class='del'>-			// above add by Victor Yu. 08-30-2002</div><div class='del'>-</div><div class='add'>+			/* above add by Victor Yu. 08-30-2002 */</div><div class='ctx'> 			switch (info-&gt;rx_trigger) {</div><div class='ctx'> 			case 1:</div><div class='ctx'> 				fcr |= UART_FCR_TRIGGER_1;</div><div class='hunk'>@@ -2606,22 +2689,24 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 		info-&gt;IER |= UART_IER_MSI;</div><div class='ctx'> 		if ((info-&gt;type == PORT_16550A) || (info-&gt;IsMoxaMustChipFlag)) {</div><div class='ctx'> 			info-&gt;MCR |= UART_MCR_AFE;</div><div class='del'>-			//status = mxser_get_msr(info-&gt;base, 0, info-&gt;port);</div><div class='del'>-/*	save_flags(flags);</div><div class='add'>+			/* status = mxser_get_msr(info-&gt;base, 0, info-&gt;port); */</div><div class='add'>+/*</div><div class='add'>+	save_flags(flags);</div><div class='ctx'> 	cli();</div><div class='ctx'> 	status = inb(baseaddr + UART_MSR);</div><div class='del'>-	restore_flags(flags);*/</div><div class='del'>-			//mxser_check_modem_status(info, status);</div><div class='add'>+	restore_flags(flags);</div><div class='add'>+*/</div><div class='add'>+			/* mxser_check_modem_status(info, status); */</div><div class='ctx'> 		} else {</div><div class='del'>-			//status = mxser_get_msr(info-&gt;base, 0, info-&gt;port);</div><div class='del'>-</div><div class='del'>-			//MX_LOCK(&amp;info-&gt;slock);</div><div class='add'>+			/* status = mxser_get_msr(info-&gt;base, 0, info-&gt;port); */</div><div class='add'>+			/* MX_LOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 			status = inb(info-&gt;base + UART_MSR);</div><div class='del'>-			//MX_UNLOCK(&amp;info-&gt;slock);</div><div class='add'>+			/* MX_UNLOCK(&amp;info-&gt;slock); */</div><div class='ctx'> 			if (info-&gt;tty-&gt;hw_stopped) {</div><div class='ctx'> 				if (status &amp; UART_MSR_CTS) {</div><div class='ctx'> 					info-&gt;tty-&gt;hw_stopped = 0;</div><div class='del'>-					if ((info-&gt;type != PORT_16550A) &amp;&amp; (!info-&gt;IsMoxaMustChipFlag)) {</div><div class='add'>+					if ((info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='add'>+							(!info-&gt;IsMoxaMustChipFlag)) {</div><div class='ctx'> 						info-&gt;IER |= UART_IER_THRI;</div><div class='ctx'> 						outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 					}</div><div class='hunk'>@@ -2630,7 +2715,8 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (!(status &amp; UART_MSR_CTS)) {</div><div class='ctx'> 					info-&gt;tty-&gt;hw_stopped = 1;</div><div class='del'>-					if ((info-&gt;type != PORT_16550A) &amp;&amp; (!info-&gt;IsMoxaMustChipFlag)) {</div><div class='add'>+					if ((info-&gt;type != PORT_16550A) &amp;&amp;</div><div class='add'>+							(!info-&gt;IsMoxaMustChipFlag)) {</div><div class='ctx'> 						info-&gt;IER &amp;= ~UART_IER_THRI;</div><div class='ctx'> 						outb(info-&gt;IER, info-&gt;base + UART_IER);</div><div class='ctx'> 					}</div><div class='hunk'>@@ -2668,11 +2754,17 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 		 * overruns too.  (For real raw support).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (I_IGNPAR(info-&gt;tty)) {</div><div class='del'>-			info-&gt;ignore_status_mask |= UART_LSR_OE | UART_LSR_PE | UART_LSR_FE;</div><div class='del'>-			info-&gt;read_status_mask |= UART_LSR_OE | UART_LSR_PE | UART_LSR_FE;</div><div class='add'>+			info-&gt;ignore_status_mask |=</div><div class='add'>+						UART_LSR_OE |</div><div class='add'>+						UART_LSR_PE |</div><div class='add'>+						UART_LSR_FE;</div><div class='add'>+			info-&gt;read_status_mask |=</div><div class='add'>+						UART_LSR_OE |</div><div class='add'>+						UART_LSR_PE |</div><div class='add'>+						UART_LSR_FE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	// following add by Victor Yu. 09-02-2002</div><div class='add'>+	/* following add by Victor Yu. 09-02-2002 */</div><div class='ctx'> 	if (info-&gt;IsMoxaMustChipFlag) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='ctx'> 		SET_MOXA_MUST_XON1_VALUE(info-&gt;base, START_CHAR(info-&gt;tty));</div><div class='hunk'>@@ -2698,7 +2790,7 @@ static int mxser_change_speed(struct mxser_struct *info, struct termios *old_ter</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	// above add by Victor Yu. 09-02-2002</div><div class='add'>+	/* above add by Victor Yu. 09-02-2002 */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	outb(fcr, info-&gt;base + UART_FCR);	/* set fcr */</div><div class='hunk'>@@ -2729,10 +2821,8 @@ static int mxser_set_baud(struct mxser_struct *info, long newspd)</div><div class='ctx'> 		quot = (2 * info-&gt;baud_base / 269);</div><div class='ctx'> 	} else if (newspd) {</div><div class='ctx'> 		quot = info-&gt;baud_base / newspd;</div><div class='del'>-</div><div class='ctx'> 		if (quot == 0)</div><div class='ctx'> 			quot = 1;</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		quot = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2765,8 +2855,6 @@ static int mxser_set_baud(struct mxser_struct *info, long newspd)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * ------------------------------------------------------------</div><div class='ctx'>  * friends of mxser_ioctl()</div><div class='hunk'>@@ -2777,7 +2865,7 @@ static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct</div><div class='ctx'> 	struct serial_struct tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (!retinfo)</div><div class='del'>-		return (-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	memset(&amp;tmp, 0, sizeof(tmp));</div><div class='ctx'> 	tmp.type = info-&gt;type;</div><div class='ctx'> 	tmp.line = info-&gt;port;</div><div class='hunk'>@@ -2791,7 +2879,7 @@ static int mxser_get_serial_info(struct mxser_struct *info, struct serial_struct</div><div class='ctx'> 	tmp.hub6 = 0;</div><div class='ctx'> 	if (copy_to_user(retinfo, &amp;tmp, sizeof(*retinfo)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	return (0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct __user *new_info)</div><div class='hunk'>@@ -2801,29 +2889,37 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!new_info || !info-&gt;base)</div><div class='del'>-		return (-EFAULT);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	if (copy_from_user(&amp;new_serial, new_info, sizeof(new_serial)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if ((new_serial.irq != info-&gt;irq) || (new_serial.port != info-&gt;base) || (new_serial.custom_divisor != info-&gt;custom_divisor) || (new_serial.baud_base != info-&gt;baud_base))</div><div class='del'>-		return (-EPERM);</div><div class='add'>+	if ((new_serial.irq != info-&gt;irq) ||</div><div class='add'>+			(new_serial.port != info-&gt;base) ||</div><div class='add'>+			(new_serial.custom_divisor != info-&gt;custom_divisor) ||</div><div class='add'>+			(new_serial.baud_base != info-&gt;baud_base))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	flags = info-&gt;flags &amp; ASYNC_SPD_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN)) {</div><div class='del'>-		if ((new_serial.baud_base != info-&gt;baud_base) || (new_serial.close_delay != info-&gt;close_delay) || ((new_serial.flags &amp; ~ASYNC_USR_MASK) != (info-&gt;flags &amp; ~ASYNC_USR_MASK)))</div><div class='del'>-			return (-EPERM);</div><div class='del'>-		info-&gt;flags = ((info-&gt;flags &amp; ~ASYNC_USR_MASK) | (new_serial.flags &amp; ASYNC_USR_MASK));</div><div class='add'>+		if ((new_serial.baud_base != info-&gt;baud_base) ||</div><div class='add'>+				(new_serial.close_delay != info-&gt;close_delay) ||</div><div class='add'>+				((new_serial.flags &amp; ~ASYNC_USR_MASK) != (info-&gt;flags &amp; ~ASYNC_USR_MASK)))</div><div class='add'>+			return -EPERM;</div><div class='add'>+		info-&gt;flags = ((info-&gt;flags &amp; ~ASYNC_USR_MASK) |</div><div class='add'>+				(new_serial.flags &amp; ASYNC_USR_MASK));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * OK, past this point, all the error checking has been done.</div><div class='ctx'> 		 * At this point, we start making changes.....</div><div class='ctx'> 		 */</div><div class='del'>-		info-&gt;flags = ((info-&gt;flags &amp; ~ASYNC_FLAGS) | (new_serial.flags &amp; ASYNC_FLAGS));</div><div class='add'>+		info-&gt;flags = ((info-&gt;flags &amp; ~ASYNC_FLAGS) |</div><div class='add'>+				(new_serial.flags &amp; ASYNC_FLAGS));</div><div class='ctx'> 		info-&gt;close_delay = new_serial.close_delay * HZ / 100;</div><div class='ctx'> 		info-&gt;closing_wait = new_serial.closing_wait * HZ / 100;</div><div class='del'>-		info-&gt;tty-&gt;low_latency = (info-&gt;flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='del'>-		info-&gt;tty-&gt;low_latency = 0;	//(info-&gt;flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='add'>+		info-&gt;tty-&gt;low_latency =</div><div class='add'>+				(info-&gt;flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='add'>+		info-&gt;tty-&gt;low_latency = 0;	/* (info-&gt;flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0; */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* added by casper, 3/17/2000, for mouse */</div><div class='hunk'>@@ -2831,7 +2927,6 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct</div><div class='ctx'> </div><div class='ctx'> 	process_txrx_fifo(info);</div><div class='ctx'> </div><div class='del'>-	/* */</div><div class='ctx'> 	if (info-&gt;flags &amp; ASYNC_INITIALIZED) {</div><div class='ctx'> 		if (flags != (info-&gt;flags &amp; ASYNC_SPD_MASK)) {</div><div class='ctx'> 			mxser_change_speed(info, NULL);</div><div class='hunk'>@@ -2839,7 +2934,7 @@ static int mxser_set_serial_info(struct mxser_struct *info, struct serial_struct</div><div class='ctx'> 	} else {</div><div class='ctx'> 		retval = mxser_startup(info);</div><div class='ctx'> 	}</div><div class='del'>-	return (retval);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2876,25 +2971,27 @@ static void mxser_send_break(struct mxser_struct *info, int duration)</div><div class='ctx'> 		return;</div><div class='ctx'> 	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='del'>-	outb(inb(info-&gt;base + UART_LCR) | UART_LCR_SBC, info-&gt;base + UART_LCR);</div><div class='add'>+	outb(inb(info-&gt;base + UART_LCR) | UART_LCR_SBC,</div><div class='add'>+		info-&gt;base + UART_LCR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	schedule_timeout(duration);</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;slock, flags);</div><div class='del'>-	outb(inb(info-&gt;base + UART_LCR) &amp; ~UART_LCR_SBC, info-&gt;base + UART_LCR);</div><div class='add'>+	outb(inb(info-&gt;base + UART_LCR) &amp; ~UART_LCR_SBC,</div><div class='add'>+		info-&gt;base + UART_LCR);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxser_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned char control, status;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (tty-&gt;index == MXSER_PORTS)</div><div class='del'>-		return (-ENOIOCTLCMD);</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='ctx'> 	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return (-EIO);</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	control = info-&gt;MCR;</div><div class='ctx'> </div><div class='hunk'>@@ -2904,12 +3001,16 @@ static int mxser_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 		mxser_check_modem_status(info, status);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;slock, flags);</div><div class='ctx'> 	return ((control &amp; UART_MCR_RTS) ? TIOCM_RTS : 0) |</div><div class='del'>-	    ((control &amp; UART_MCR_DTR) ? TIOCM_DTR : 0) | ((status &amp; UART_MSR_DCD) ? TIOCM_CAR : 0) | ((status &amp; UART_MSR_RI) ? TIOCM_RNG : 0) | ((status &amp; UART_MSR_DSR) ? TIOCM_DSR : 0) | ((status &amp; UART_MSR_CTS) ? TIOCM_CTS : 0);</div><div class='add'>+		    ((control &amp; UART_MCR_DTR) ? TIOCM_DTR : 0) |</div><div class='add'>+		    ((status &amp; UART_MSR_DCD) ? TIOCM_CAR : 0) |</div><div class='add'>+		    ((status &amp; UART_MSR_RI) ? TIOCM_RNG : 0) |</div><div class='add'>+		    ((status &amp; UART_MSR_DSR) ? TIOCM_DSR : 0) |</div><div class='add'>+		    ((status &amp; UART_MSR_CTS) ? TIOCM_CTS : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxser_tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear)</div><div class='ctx'> {</div><div class='del'>-	struct mxser_struct *info = (struct mxser_struct *) tty-&gt;driver_data;</div><div class='add'>+	struct mxser_struct *info = tty-&gt;driver_data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2968,38 +3069,36 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf)</div><div class='ctx'> 		hwconf-&gt;board_type = MXSER_BOARD_CI104J;</div><div class='ctx'> 		hwconf-&gt;ports = 4;</div><div class='ctx'> 	} else</div><div class='del'>-		return (0);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	irq = 0;</div><div class='ctx'> 	if (hwconf-&gt;ports == 2) {</div><div class='ctx'> 		irq = regs[9] &amp; 0xF000;</div><div class='ctx'> 		irq = irq | (irq &gt;&gt; 4);</div><div class='ctx'> 		if (irq != (regs[9] &amp; 0xFF00))</div><div class='del'>-			return (MXSER_ERR_IRQ_CONFLIT);</div><div class='add'>+			return MXSER_ERR_IRQ_CONFLIT;</div><div class='ctx'> 	} else if (hwconf-&gt;ports == 4) {</div><div class='ctx'> 		irq = regs[9] &amp; 0xF000;</div><div class='ctx'> 		irq = irq | (irq &gt;&gt; 4);</div><div class='ctx'> 		irq = irq | (irq &gt;&gt; 8);</div><div class='ctx'> 		if (irq != regs[9])</div><div class='del'>-			return (MXSER_ERR_IRQ_CONFLIT);</div><div class='add'>+			return MXSER_ERR_IRQ_CONFLIT;</div><div class='ctx'> 	} else if (hwconf-&gt;ports == 8) {</div><div class='ctx'> 		irq = regs[9] &amp; 0xF000;</div><div class='ctx'> 		irq = irq | (irq &gt;&gt; 4);</div><div class='ctx'> 		irq = irq | (irq &gt;&gt; 8);</div><div class='ctx'> 		if ((irq != regs[9]) || (irq != regs[10]))</div><div class='del'>-			return (MXSER_ERR_IRQ_CONFLIT);</div><div class='add'>+			return MXSER_ERR_IRQ_CONFLIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!irq) {</div><div class='del'>-		return (MXSER_ERR_IRQ);</div><div class='del'>-	}</div><div class='del'>-	hwconf-&gt;irq = ((int) (irq &amp; 0xF000) &gt;&gt; 12);</div><div class='add'>+	if (!irq)</div><div class='add'>+		return MXSER_ERR_IRQ;</div><div class='add'>+	hwconf-&gt;irq = ((int)(irq &amp; 0xF000) &gt;&gt; 12);</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 		hwconf-&gt;ioaddr[i] = (int) regs[i + 1] &amp; 0xFFF8;</div><div class='del'>-	if ((regs[12] &amp; 0x80) == 0) {</div><div class='del'>-		return (MXSER_ERR_VECTOR);</div><div class='del'>-	}</div><div class='del'>-	hwconf-&gt;vector = (int) regs[11];	/* interrupt vector */</div><div class='add'>+	if ((regs[12] &amp; 0x80) == 0)</div><div class='add'>+		return MXSER_ERR_VECTOR;</div><div class='add'>+	hwconf-&gt;vector = (int)regs[11];	/* interrupt vector */</div><div class='ctx'> 	if (id == 1)</div><div class='ctx'> 		hwconf-&gt;vector_mask = 0x00FF;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -3007,10 +3106,10 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf)</div><div class='ctx'> 	for (i = 7, bits = 0x0100; i &gt;= 0; i--, bits &lt;&lt;= 1) {</div><div class='ctx'> 		if (regs[12] &amp; bits) {</div><div class='ctx'> 			hwconf-&gt;baud_base[i] = 921600;</div><div class='del'>-			hwconf-&gt;MaxCanSetBaudRate[i] = 921600;	// add by Victor Yu. 09-04-2002</div><div class='add'>+			hwconf-&gt;MaxCanSetBaudRate[i] = 921600;	/* add by Victor Yu. 09-04-2002 */</div><div class='ctx'> 		} else {</div><div class='ctx'> 			hwconf-&gt;baud_base[i] = 115200;</div><div class='del'>-			hwconf-&gt;MaxCanSetBaudRate[i] = 115200;	// add by Victor Yu. 09-04-2002</div><div class='add'>+			hwconf-&gt;MaxCanSetBaudRate[i] = 115200;	/* add by Victor Yu. 09-04-2002 */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	scratch2 = inb(cap + UART_LCR) &amp; (~UART_LCR_DLAB);</div><div class='hunk'>@@ -3030,7 +3129,7 @@ static int mxser_get_ISA_conf(int cap, struct mxser_hwconf *hwconf)</div><div class='ctx'> 		hwconf-&gt;ports = 4;</div><div class='ctx'> 	request_region(hwconf-&gt;ioaddr[0], 8 * hwconf-&gt;ports, "mxser(IO)");</div><div class='ctx'> 	request_region(hwconf-&gt;vector, 1, "mxser(vector)");</div><div class='del'>-	return (hwconf-&gt;ports);</div><div class='add'>+	return hwconf-&gt;ports;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define CHIP_SK 	0x01	/* Serial Data Clock  in Eprom */</div><div class='hunk'>@@ -3053,7 +3152,7 @@ static int mxser_read_register(int port, unsigned short *regs)</div><div class='ctx'> </div><div class='ctx'> 	id = mxser_program_mode(port);</div><div class='ctx'> 	if (id &lt; 0)</div><div class='del'>-		return (id);</div><div class='add'>+		return id;</div><div class='ctx'> 	for (i = 0; i &lt; 14; i++) {</div><div class='ctx'> 		k = (i &amp; 0x3F) | 0x180;</div><div class='ctx'> 		for (j = 0x100; j &gt; 0; j &gt;&gt;= 1) {</div><div class='hunk'>@@ -3066,7 +3165,7 @@ static int mxser_read_register(int port, unsigned short *regs)</div><div class='ctx'> 				outb(CHIP_CS | CHIP_SK, port);	/* A? bit of read */</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		(void) inb(port);</div><div class='add'>+		(void)inb(port);</div><div class='ctx'> 		value = 0;</div><div class='ctx'> 		for (k = 0, j = 0x8000; k &lt; 16; k++, j &gt;&gt;= 1) {</div><div class='ctx'> 			outb(CHIP_CS, port);</div><div class='hunk'>@@ -3078,28 +3177,33 @@ static int mxser_read_register(int port, unsigned short *regs)</div><div class='ctx'> 		outb(0, port);</div><div class='ctx'> 	}</div><div class='ctx'> 	mxser_normal_mode(port);</div><div class='del'>-	return (id);</div><div class='add'>+	return id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mxser_program_mode(int port)</div><div class='ctx'> {</div><div class='ctx'> 	int id, i, j, n;</div><div class='del'>-	//unsigned long flags;</div><div class='add'>+	/* unsigned long flags; */</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;gm_lock);</div><div class='ctx'> 	outb(0, port);</div><div class='ctx'> 	outb(0, port);</div><div class='ctx'> 	outb(0, port);</div><div class='del'>-	(void) inb(port);</div><div class='del'>-	(void) inb(port);</div><div class='add'>+	(void)inb(port);</div><div class='add'>+	(void)inb(port);</div><div class='ctx'> 	outb(0, port);</div><div class='del'>-	(void) inb(port);</div><div class='del'>-	//restore_flags(flags);</div><div class='add'>+	(void)inb(port);</div><div class='add'>+	/* restore_flags(flags); */</div><div class='ctx'> 	spin_unlock(&amp;gm_lock);</div><div class='ctx'> </div><div class='ctx'> 	id = inb(port + 1) &amp; 0x1F;</div><div class='del'>-	if ((id != C168_ASIC_ID) &amp;&amp; (id != C104_ASIC_ID) &amp;&amp; (id != C102_ASIC_ID) &amp;&amp; (id != CI132_ASIC_ID) &amp;&amp; (id != CI134_ASIC_ID) &amp;&amp; (id != CI104J_ASIC_ID))</div><div class='del'>-		return (-1);</div><div class='add'>+	if ((id != C168_ASIC_ID) &amp;&amp;</div><div class='add'>+			(id != C104_ASIC_ID) &amp;&amp;</div><div class='add'>+			(id != C102_ASIC_ID) &amp;&amp;</div><div class='add'>+			(id != CI132_ASIC_ID) &amp;&amp;</div><div class='add'>+			(id != CI134_ASIC_ID) &amp;&amp;</div><div class='add'>+			(id != CI104J_ASIC_ID))</div><div class='add'>+		return -1;</div><div class='ctx'> 	for (i = 0, j = 0; i &lt; 4; i++) {</div><div class='ctx'> 		n = inb(port + 2);</div><div class='ctx'> 		if (n == 'M') {</div><div class='hunk'>@@ -3112,7 +3216,7 @@ static int mxser_program_mode(int port)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (j != 2)</div><div class='ctx'> 		id = -2;</div><div class='del'>-	return (id);</div><div class='add'>+	return id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mxser_normal_mode(int port)</div><div class='hunk'>@@ -3130,7 +3234,7 @@ static void mxser_normal_mode(int port)</div><div class='ctx'> 		if ((n &amp; 0x61) == 0x60)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if ((n &amp; 1) == 1)</div><div class='del'>-			(void) inb(port);</div><div class='add'>+			(void)inb(port);</div><div class='ctx'> 	}</div><div class='ctx'> 	outb(0x00, port + 4);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c<br/>index 9f54733f1623..337a87f86a3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/n_hdlc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/n_hdlc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/n_hdlc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/n_hdlc.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@</div><div class='ctx'> #define HDLC_MAGIC 0x239e</div><div class='ctx'> #define HDLC_VERSION "$Revision: 4.8 $"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c<br/>index c48de09d68f0..203dc2b661d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/n_r3964.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/n_r3964.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/n_r3964.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/n_r3964.c</a></div><div class='hunk'>@@ -951,7 +951,8 @@ static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,</div><div class='ctx'>    {</div><div class='ctx'> queue_the_message:</div><div class='ctx'> </div><div class='del'>-      pMsg = kmalloc(sizeof(struct r3964_message), GFP_KERNEL);</div><div class='add'>+      pMsg = kmalloc(sizeof(struct r3964_message),</div><div class='add'>+		     error_code?GFP_ATOMIC:GFP_KERNEL);</div><div class='ctx'>       TRACE_M("add_msg - kmalloc %p",pMsg);</div><div class='ctx'>       if(pMsg==NULL) {</div><div class='ctx'>          return;</div><div class='head'>diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c<br/>index ede365d05387..603b9ade5eb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/n_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/n_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/n_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/n_tty.c</a></div><div class='hunk'>@@ -1132,7 +1132,7 @@ static inline int input_available_p(struct tty_struct *tty, int amt)</div><div class='ctx'>  *	buffer, and once to drain the space from the (physical) beginning of</div><div class='ctx'>  *	the buffer to head pointer.</div><div class='ctx'>  *</div><div class='del'>- *	Called under the tty-&gt;atomic_read_lock sem and with TTY_DONT_FLIP set</div><div class='add'>+ *	Called under the tty-&gt;atomic_read_lock sem</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='hunk'>@@ -1271,7 +1271,6 @@ do_it_again:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(&amp;tty-&gt;read_wait, &amp;wait);</div><div class='del'>-	set_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='ctx'> 	while (nr) {</div><div class='ctx'> 		/* First test for status change. */</div><div class='ctx'> 		if (tty-&gt;packet &amp;&amp; tty-&gt;link-&gt;ctrl_status) {</div><div class='hunk'>@@ -1315,9 +1314,7 @@ do_it_again:</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			n_tty_set_room(tty);</div><div class='del'>-			clear_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='ctx'> 			timeout = schedule_timeout(timeout);</div><div class='del'>-			set_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		__set_current_state(TASK_RUNNING);</div><div class='hunk'>@@ -1384,15 +1381,16 @@ do_it_again:</div><div class='ctx'> 		 * longer than TTY_THRESHOLD_UNTHROTTLE in canonical mode,</div><div class='ctx'> 		 * we won't get any more characters.</div><div class='ctx'> 		 */</div><div class='del'>-		if (n_tty_chars_in_buffer(tty) &lt;= TTY_THRESHOLD_UNTHROTTLE)</div><div class='add'>+		if (n_tty_chars_in_buffer(tty) &lt;= TTY_THRESHOLD_UNTHROTTLE) {</div><div class='add'>+			n_tty_set_room(tty);</div><div class='ctx'> 			check_unthrottle(tty);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (b - buf &gt;= minimum)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (time)</div><div class='ctx'> 			timeout = time;</div><div class='ctx'> 	}</div><div class='del'>-	clear_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='ctx'> 	mutex_unlock(&amp;tty-&gt;atomic_read_lock);</div><div class='ctx'> 	remove_wait_queue(&amp;tty-&gt;read_wait, &amp;wait);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c<br/>new file mode 100644<br/>index 000000000000..7719bd75810b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/nsc_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/nsc_gpio.c</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+/* linux/drivers/char/nsc_gpio.c</div><div class='add'>+</div><div class='add'>+   National Semiconductor common GPIO device-file/VFS methods.</div><div class='add'>+   Allows a user space process to control the GPIO pins.</div><div class='add'>+</div><div class='add'>+   Copyright (c) 2001,2002 Christer Weinigel &lt;wingel@nano-system.com&gt;</div><div class='add'>+   Copyright (c) 2005      Jim Cromie &lt;jim.cromie@gmail.com&gt;</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/nsc_gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define NAME "nsc_gpio"</div><div class='add'>+</div><div class='add'>+void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)</div><div class='add'>+{</div><div class='add'>+	/* retrieve current config w/o changing it */</div><div class='add'>+	u32 config = amp-&gt;gpio_config(index, ~0, 0);</div><div class='add'>+</div><div class='add'>+	/* user requested via 'v' command, so its INFO */</div><div class='add'>+	dev_info(amp-&gt;dev, "io%02u: 0x%04x %s %s %s %s %s %s %s\tio:%d/%d\n",</div><div class='add'>+		 index, config,</div><div class='add'>+		 (config &amp; 1) ? "OE" : "TS",      /* output-enabled/tristate */</div><div class='add'>+		 (config &amp; 2) ? "PP" : "OD",      /* push pull / open drain */</div><div class='add'>+		 (config &amp; 4) ? "PUE" : "PUD",    /* pull up enabled/disabled */</div><div class='add'>+		 (config &amp; 8) ? "LOCKED" : "",    /* locked / unlocked */</div><div class='add'>+		 (config &amp; 16) ? "LEVEL" : "EDGE",/* level/edge input */</div><div class='add'>+		 (config &amp; 32) ? "HI" : "LO",     /* trigger on rise/fall edge */</div><div class='add'>+		 (config &amp; 64) ? "DEBOUNCE" : "", /* debounce */</div><div class='add'>+</div><div class='add'>+		 amp-&gt;gpio_get(index), amp-&gt;gpio_current(index));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t nsc_gpio_write(struct file *file, const char __user *data,</div><div class='add'>+		       size_t len, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	unsigned m = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='add'>+	struct nsc_gpio_ops *amp = file-&gt;private_data;</div><div class='add'>+	struct device *dev = amp-&gt;dev;</div><div class='add'>+	size_t i;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; ++i) {</div><div class='add'>+		char c;</div><div class='add'>+		if (get_user(c, data + i))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		switch (c) {</div><div class='add'>+		case '0':</div><div class='add'>+			amp-&gt;gpio_set(m, 0);</div><div class='add'>+			break;</div><div class='add'>+		case '1':</div><div class='add'>+			amp-&gt;gpio_set(m, 1);</div><div class='add'>+			break;</div><div class='add'>+		case 'O':</div><div class='add'>+			dev_dbg(dev, "GPIO%d output enabled\n", m);</div><div class='add'>+			amp-&gt;gpio_config(m, ~1, 1);</div><div class='add'>+			break;</div><div class='add'>+		case 'o':</div><div class='add'>+			dev_dbg(dev, "GPIO%d output disabled\n", m);</div><div class='add'>+			amp-&gt;gpio_config(m, ~1, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 'T':</div><div class='add'>+			dev_dbg(dev, "GPIO%d output is push pull\n", m);</div><div class='add'>+			amp-&gt;gpio_config(m, ~2, 2);</div><div class='add'>+			break;</div><div class='add'>+		case 't':</div><div class='add'>+			dev_dbg(dev, "GPIO%d output is open drain\n", m);</div><div class='add'>+			amp-&gt;gpio_config(m, ~2, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 'P':</div><div class='add'>+			dev_dbg(dev, "GPIO%d pull up enabled\n", m);</div><div class='add'>+			amp-&gt;gpio_config(m, ~4, 4);</div><div class='add'>+			break;</div><div class='add'>+		case 'p':</div><div class='add'>+			dev_dbg(dev, "GPIO%d pull up disabled\n", m);</div><div class='add'>+			amp-&gt;gpio_config(m, ~4, 0);</div><div class='add'>+			break;</div><div class='add'>+		case 'v':</div><div class='add'>+			/* View Current pin settings */</div><div class='add'>+			amp-&gt;gpio_dump(amp, m);</div><div class='add'>+			break;</div><div class='add'>+		case '\n':</div><div class='add'>+			/* end of settings string, do nothing */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(dev, "io%2d bad setting: chr&lt;0x%2x&gt;\n",</div><div class='add'>+				m, (int)c);</div><div class='add'>+			err++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		return -EINVAL;	/* full string handled, report error */</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t nsc_gpio_read(struct file *file, char __user * buf,</div><div class='add'>+		      size_t len, loff_t * ppos)</div><div class='add'>+{</div><div class='add'>+	unsigned m = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='add'>+	int value;</div><div class='add'>+	struct nsc_gpio_ops *amp = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	value = amp-&gt;gpio_get(m);</div><div class='add'>+	if (put_user(value ? '1' : '0', buf))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* common file-ops routines for both scx200_gpio and pc87360_gpio */</div><div class='add'>+EXPORT_SYMBOL(nsc_gpio_write);</div><div class='add'>+EXPORT_SYMBOL(nsc_gpio_read);</div><div class='add'>+EXPORT_SYMBOL(nsc_gpio_dump);</div><div class='add'>+</div><div class='add'>+static int __init nsc_gpio_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG NAME " initializing\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit nsc_gpio_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_DEBUG NAME " cleanup\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(nsc_gpio_init);</div><div class='add'>+module_exit(nsc_gpio_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jim Cromie &lt;jim.cromie@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("NatSemi GPIO Common Methods");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c<br/>index 3556ccd77570..a39f19c35a6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/nvram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nvram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/nvram.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> #define NVRAM_VERSION	"1.2"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/nvram.h&gt;</div><div class='hunk'>@@ -438,7 +437,7 @@ nvram_read_proc(char *buffer, char **start, off_t offset,</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='del'>-static struct file_operations nvram_fops = {</div><div class='add'>+static const struct file_operations nvram_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= nvram_llseek,</div><div class='ctx'> 	.read		= nvram_read,</div><div class='head'>diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c<br/>index 4083b781adbf..7c57ebfa8640 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/nwbutton.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nwbutton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/nwbutton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/nwbutton.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -184,7 +183,7 @@ static int button_read (struct file *filp, char __user *buffer,</div><div class='ctx'>  * attempts to perform these operations on the device.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations button_fops = {</div><div class='add'>+static const struct file_operations button_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= button_read,</div><div class='ctx'> };</div><div class='hunk'>@@ -224,7 +223,7 @@ static int __init nwbutton_init(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, SA_INTERRUPT,</div><div class='add'>+	if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED,</div><div class='ctx'> 			"nwbutton", NULL)) {</div><div class='ctx'> 		printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n",</div><div class='ctx'> 				IRQ_NETWINDER_BUTTON);</div><div class='head'>diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c<br/>index 8865387d3448..206cf6f50695 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/nwflash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/nwflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/nwflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/nwflash.c</a></div><div class='hunk'>@@ -642,7 +642,7 @@ static void kick_open(void)</div><div class='ctx'> 	udelay(25);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations flash_fops =</div><div class='add'>+static const struct file_operations flash_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= flash_llseek,</div><div class='head'>diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c<br/>new file mode 100644<br/>index 000000000000..645eb81cb5a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pc8736x_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/pc8736x_gpio.c</a></div><div class='hunk'>@@ -0,0 +1,358 @@</div><div class='add'>+/* linux/drivers/char/pc8736x_gpio.c</div><div class='add'>+</div><div class='add'>+   National Semiconductor PC8736x GPIO driver.  Allows a user space</div><div class='add'>+   process to play with the GPIO pins.</div><div class='add'>+</div><div class='add'>+   Copyright (c) 2005,2006 Jim Cromie &lt;jim.cromie@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+   adapted from linux/drivers/char/scx200_gpio.c</div><div class='add'>+   Copyright (c) 2001,2002 Christer Weinigel &lt;wingel@nano-system.com&gt;,</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/nsc_gpio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEVNAME "pc8736x_gpio"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jim Cromie &lt;jim.cromie@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("NatSemi/Winbond PC-8736x GPIO Pin Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int major;		/* default to dynamic major */</div><div class='add'>+module_param(major, int, 0);</div><div class='add'>+MODULE_PARM_DESC(major, "Major device number");</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(pc8736x_gpio_config_lock);</div><div class='add'>+static unsigned pc8736x_gpio_base;</div><div class='add'>+static u8 pc8736x_gpio_shadow[4];</div><div class='add'>+</div><div class='add'>+#define SIO_BASE1       0x2E	/* 1st command-reg to check */</div><div class='add'>+#define SIO_BASE2       0x4E	/* alt command-reg to check */</div><div class='add'>+</div><div class='add'>+#define SIO_SID		0x20	/* SuperI/O ID Register */</div><div class='add'>+#define SIO_SID_VALUE	0xe9	/* Expected value in SuperI/O ID Register */</div><div class='add'>+</div><div class='add'>+#define SIO_CF1		0x21	/* chip config, bit0 is chip enable */</div><div class='add'>+</div><div class='add'>+#define PC8736X_GPIO_RANGE	16 /* ioaddr range */</div><div class='add'>+#define PC8736X_GPIO_CT		32 /* minors matching 4 8 bit ports */</div><div class='add'>+</div><div class='add'>+#define SIO_UNIT_SEL	0x7	/* unit select reg */</div><div class='add'>+#define SIO_UNIT_ACT	0x30	/* unit enable */</div><div class='add'>+#define SIO_GPIO_UNIT	0x7	/* unit number of GPIO */</div><div class='add'>+#define SIO_VLM_UNIT	0x0D</div><div class='add'>+#define SIO_TMS_UNIT	0x0E</div><div class='add'>+</div><div class='add'>+/* config-space addrs to read/write each unit's runtime addr */</div><div class='add'>+#define SIO_BASE_HADDR		0x60</div><div class='add'>+#define SIO_BASE_LADDR		0x61</div><div class='add'>+</div><div class='add'>+/* GPIO config-space pin-control addresses */</div><div class='add'>+#define SIO_GPIO_PIN_SELECT	0xF0</div><div class='add'>+#define SIO_GPIO_PIN_CONFIG     0xF1</div><div class='add'>+#define SIO_GPIO_PIN_EVENT      0xF2</div><div class='add'>+</div><div class='add'>+static unsigned char superio_cmd = 0;</div><div class='add'>+static unsigned char selected_device = 0xFF;	/* bogus start val */</div><div class='add'>+</div><div class='add'>+/* GPIO port runtime access, functionality */</div><div class='add'>+static int port_offset[] = { 0, 4, 8, 10 };	/* non-uniform offsets ! */</div><div class='add'>+/* static int event_capable[] = { 1, 1, 0, 0 };   ports 2,3 are hobbled */</div><div class='add'>+</div><div class='add'>+#define PORT_OUT	0</div><div class='add'>+#define PORT_IN		1</div><div class='add'>+#define PORT_EVT_EN	2</div><div class='add'>+#define PORT_EVT_STST	3</div><div class='add'>+</div><div class='add'>+static struct platform_device *pdev;  /* use in dev_*() */</div><div class='add'>+</div><div class='add'>+static inline void superio_outb(int addr, int val)</div><div class='add'>+{</div><div class='add'>+	outb_p(addr, superio_cmd);</div><div class='add'>+	outb_p(val, superio_cmd + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int superio_inb(int addr)</div><div class='add'>+{</div><div class='add'>+	outb_p(addr, superio_cmd);</div><div class='add'>+	return inb_p(superio_cmd + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pc8736x_superio_present(void)</div><div class='add'>+{</div><div class='add'>+	/* try the 2 possible values, read a hardware reg to verify */</div><div class='add'>+	superio_cmd = SIO_BASE1;</div><div class='add'>+	if (superio_inb(SIO_SID) == SIO_SID_VALUE)</div><div class='add'>+		return superio_cmd;</div><div class='add'>+</div><div class='add'>+	superio_cmd = SIO_BASE2;</div><div class='add'>+	if (superio_inb(SIO_SID) == SIO_SID_VALUE)</div><div class='add'>+		return superio_cmd;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void device_select(unsigned devldn)</div><div class='add'>+{</div><div class='add'>+	superio_outb(SIO_UNIT_SEL, devldn);</div><div class='add'>+	selected_device = devldn;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void select_pin(unsigned iminor)</div><div class='add'>+{</div><div class='add'>+	/* select GPIO port/pin from device minor number */</div><div class='add'>+	device_select(SIO_GPIO_UNIT);</div><div class='add'>+	superio_outb(SIO_GPIO_PIN_SELECT,</div><div class='add'>+		     ((iminor &lt;&lt; 1) &amp; 0xF0) | (iminor &amp; 0x7));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 pc8736x_gpio_configure_fn(unsigned index, u32 mask, u32 bits,</div><div class='add'>+					    u32 func_slct)</div><div class='add'>+{</div><div class='add'>+	u32 config, new_config;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pc8736x_gpio_config_lock);</div><div class='add'>+</div><div class='add'>+	device_select(SIO_GPIO_UNIT);</div><div class='add'>+	select_pin(index);</div><div class='add'>+</div><div class='add'>+	/* read current config value */</div><div class='add'>+	config = superio_inb(func_slct);</div><div class='add'>+</div><div class='add'>+	/* set new config */</div><div class='add'>+	new_config = (config &amp; mask) | bits;</div><div class='add'>+	superio_outb(func_slct, new_config);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;pc8736x_gpio_config_lock);</div><div class='add'>+</div><div class='add'>+	return config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pc8736x_gpio_configure(unsigned index, u32 mask, u32 bits)</div><div class='add'>+{</div><div class='add'>+	return pc8736x_gpio_configure_fn(index, mask, bits,</div><div class='add'>+					 SIO_GPIO_PIN_CONFIG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pc8736x_gpio_get(unsigned minor)</div><div class='add'>+{</div><div class='add'>+	int port, bit, val;</div><div class='add'>+</div><div class='add'>+	port = minor &gt;&gt; 3;</div><div class='add'>+	bit = minor &amp; 7;</div><div class='add'>+	val = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_IN);</div><div class='add'>+	val &gt;&gt;= bit;</div><div class='add'>+	val &amp;= 1;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "_gpio_get(%d from %x bit %d) == val %d\n",</div><div class='add'>+		minor, pc8736x_gpio_base + port_offset[port] + PORT_IN, bit,</div><div class='add'>+		val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pc8736x_gpio_set(unsigned minor, int val)</div><div class='add'>+{</div><div class='add'>+	int port, bit, curval;</div><div class='add'>+</div><div class='add'>+	minor &amp;= 0x1f;</div><div class='add'>+	port = minor &gt;&gt; 3;</div><div class='add'>+	bit = minor &amp; 7;</div><div class='add'>+	curval = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_OUT);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "addr:%x cur:%x bit-pos:%d cur-bit:%x + new:%d -&gt; bit-new:%d\n",</div><div class='add'>+		pc8736x_gpio_base + port_offset[port] + PORT_OUT,</div><div class='add'>+		curval, bit, (curval &amp; ~(1 &lt;&lt; bit)), val, (val &lt;&lt; bit));</div><div class='add'>+</div><div class='add'>+	val = (curval &amp; ~(1 &lt;&lt; bit)) | (val &lt;&lt; bit);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "gpio_set(minor:%d port:%d bit:%d)"</div><div class='add'>+		" %2x -&gt; %2x\n", minor, port, bit, curval, val);</div><div class='add'>+</div><div class='add'>+	outb_p(val, pc8736x_gpio_base + port_offset[port] + PORT_OUT);</div><div class='add'>+</div><div class='add'>+	curval = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_OUT);</div><div class='add'>+	val = inb_p(pc8736x_gpio_base + port_offset[port] + PORT_IN);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "wrote %x, read: %x\n", curval, val);</div><div class='add'>+	pc8736x_gpio_shadow[port] = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pc8736x_gpio_set_high(unsigned index)</div><div class='add'>+{</div><div class='add'>+	pc8736x_gpio_set(index, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pc8736x_gpio_set_low(unsigned index)</div><div class='add'>+{</div><div class='add'>+	pc8736x_gpio_set(index, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pc8736x_gpio_current(unsigned minor)</div><div class='add'>+{</div><div class='add'>+	int port, bit;</div><div class='add'>+	minor &amp;= 0x1f;</div><div class='add'>+	port = minor &gt;&gt; 3;</div><div class='add'>+	bit = minor &amp; 7;</div><div class='add'>+	return ((pc8736x_gpio_shadow[port] &gt;&gt; bit) &amp; 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pc8736x_gpio_change(unsigned index)</div><div class='add'>+{</div><div class='add'>+	pc8736x_gpio_set(index, !pc8736x_gpio_current(index));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nsc_gpio_ops pc8736x_gpio_ops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.gpio_config	= pc8736x_gpio_configure,</div><div class='add'>+	.gpio_dump	= nsc_gpio_dump,</div><div class='add'>+	.gpio_get	= pc8736x_gpio_get,</div><div class='add'>+	.gpio_set	= pc8736x_gpio_set,</div><div class='add'>+	.gpio_change	= pc8736x_gpio_change,</div><div class='add'>+	.gpio_current	= pc8736x_gpio_current</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(pc8736x_gpio_ops);</div><div class='add'>+</div><div class='add'>+static int pc8736x_gpio_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	unsigned m = iminor(inode);</div><div class='add'>+	file-&gt;private_data = &amp;pc8736x_gpio_ops;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "open %d\n", m);</div><div class='add'>+</div><div class='add'>+	if (m &gt;= PC8736X_GPIO_CT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return nonseekable_open(inode, file);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations pc8736x_gpio_fileops = {</div><div class='add'>+	.owner	= THIS_MODULE,</div><div class='add'>+	.open	= pc8736x_gpio_open,</div><div class='add'>+	.write	= nsc_gpio_write,</div><div class='add'>+	.read	= nsc_gpio_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __init pc8736x_init_shadow(void)</div><div class='add'>+{</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	/* read the current values driven on the GPIO signals */</div><div class='add'>+	for (port = 0; port &lt; 4; ++port)</div><div class='add'>+		pc8736x_gpio_shadow[port]</div><div class='add'>+		    = inb_p(pc8736x_gpio_base + port_offset[port]</div><div class='add'>+			    + PORT_OUT);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cdev pc8736x_gpio_cdev;</div><div class='add'>+</div><div class='add'>+static int __init pc8736x_gpio_init(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	dev_t devid;</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_alloc(DEVNAME, 0);</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = platform_device_add(pdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto undo_platform_dev_alloc;</div><div class='add'>+	}</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "NatSemi pc8736x GPIO Driver Initializing\n");</div><div class='add'>+</div><div class='add'>+	if (!pc8736x_superio_present()) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no device found\n");</div><div class='add'>+		goto undo_platform_dev_add;</div><div class='add'>+	}</div><div class='add'>+	pc8736x_gpio_ops.dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Verify that chip and it's GPIO unit are both enabled.</div><div class='add'>+	   My BIOS does this, so I take minimum action here</div><div class='add'>+	 */</div><div class='add'>+	rc = superio_inb(SIO_CF1);</div><div class='add'>+	if (!(rc &amp; 0x01)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "device not enabled\n");</div><div class='add'>+		goto undo_platform_dev_add;</div><div class='add'>+	}</div><div class='add'>+	device_select(SIO_GPIO_UNIT);</div><div class='add'>+	if (!superio_inb(SIO_UNIT_ACT)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "GPIO unit not enabled\n");</div><div class='add'>+		goto undo_platform_dev_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read the GPIO unit base addr that chip responds to */</div><div class='add'>+	pc8736x_gpio_base = (superio_inb(SIO_BASE_HADDR) &lt;&lt; 8</div><div class='add'>+			     | superio_inb(SIO_BASE_LADDR));</div><div class='add'>+</div><div class='add'>+	if (!request_region(pc8736x_gpio_base, PC8736X_GPIO_RANGE, DEVNAME)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "GPIO ioport %x busy\n",</div><div class='add'>+			pc8736x_gpio_base);</div><div class='add'>+		goto undo_platform_dev_add;</div><div class='add'>+	}</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "GPIO ioport %x reserved\n", pc8736x_gpio_base);</div><div class='add'>+</div><div class='add'>+	if (major) {</div><div class='add'>+		devid = MKDEV(major, 0);</div><div class='add'>+		rc = register_chrdev_region(devid, PC8736X_GPIO_CT, DEVNAME);</div><div class='add'>+	} else {</div><div class='add'>+		rc = alloc_chrdev_region(&amp;devid, 0, PC8736X_GPIO_CT, DEVNAME);</div><div class='add'>+		major = MAJOR(devid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "register-chrdev failed: %d\n", rc);</div><div class='add'>+		goto undo_request_region;</div><div class='add'>+	}</div><div class='add'>+	if (!major) {</div><div class='add'>+		major = rc;</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "got dynamic major %d\n", major);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pc8736x_init_shadow();</div><div class='add'>+</div><div class='add'>+	/* ignore minor errs, and succeed */</div><div class='add'>+	cdev_init(&amp;pc8736x_gpio_cdev, &amp;pc8736x_gpio_fileops);</div><div class='add'>+	cdev_add(&amp;pc8736x_gpio_cdev, devid, PC8736X_GPIO_CT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+undo_request_region:</div><div class='add'>+	release_region(pc8736x_gpio_base, PC8736X_GPIO_RANGE);</div><div class='add'>+undo_platform_dev_add:</div><div class='add'>+	platform_device_del(pdev);</div><div class='add'>+undo_platform_dev_alloc:</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit pc8736x_gpio_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "cleanup\n");</div><div class='add'>+</div><div class='add'>+	cdev_del(&amp;pc8736x_gpio_cdev);</div><div class='add'>+	unregister_chrdev_region(MKDEV(major,0), PC8736X_GPIO_CT);</div><div class='add'>+	release_region(pc8736x_gpio_base, PC8736X_GPIO_RANGE);</div><div class='add'>+</div><div class='add'>+	platform_device_del(pdev);</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pc8736x_gpio_init);</div><div class='add'>+module_exit(pc8736x_gpio_cleanup);</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c<br/>index 128b2632512d..50d20aafeb18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/cm4000_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pcmcia/cm4000_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/cm4000_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/pcmcia/cm4000_cs.c</a></div><div class='hunk'>@@ -149,12 +149,7 @@ struct cm4000_dev {</div><div class='ctx'> #define	ZERO_DEV(dev)  						\</div><div class='ctx'> 	memset(&amp;dev-&gt;atr_csum,0,				\</div><div class='ctx'> 		sizeof(struct cm4000_dev) - 			\</div><div class='del'>-		/*link*/ sizeof(struct pcmcia_device) - 	\</div><div class='del'>-		/*node*/ sizeof(dev_node_t) - 			\</div><div class='del'>-		/*atr*/ MAX_ATR*sizeof(char) - 			\</div><div class='del'>-		/*rbuf*/ 512*sizeof(char) - 			\</div><div class='del'>-		/*sbuf*/ 512*sizeof(char) - 			\</div><div class='del'>-		/*queue*/ 4*sizeof(wait_queue_head_t))</div><div class='add'>+		offsetof(struct cm4000_dev, atr_csum))</div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_device *dev_table[CM4000_MAX_DEV];</div><div class='ctx'> static struct class *cmm_class;</div><div class='hunk'>@@ -1943,7 +1938,7 @@ static void cm4000_detach(struct pcmcia_device *link)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations cm4000_fops = {</div><div class='add'>+static const struct file_operations cm4000_fops = {</div><div class='ctx'> 	.owner	= THIS_MODULE,</div><div class='ctx'> 	.read	= cmm_read,</div><div class='ctx'> 	.write	= cmm_write,</div><div class='head'>diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c<br/>index 47a8465bf95b..55cf4be42976 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/cm4040_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pcmcia/cm4040_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/cm4040_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/pcmcia/cm4040_cs.c</a></div><div class='hunk'>@@ -688,7 +688,7 @@ static void reader_detach(struct pcmcia_device *link)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations reader_fops = {</div><div class='add'>+static const struct file_operations reader_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= cm4040_read,</div><div class='ctx'> 	.write		= cm4040_write,</div><div class='head'>diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c<br/>index 07213454c458..17bc8abd5df5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pcmcia/synclink_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pcmcia/synclink_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/pcmcia/synclink_cs.c</a></div><div class='hunk'>@@ -844,7 +844,7 @@ static int bh_action(MGSLPC_INFO *info)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bh_handler(void* Context)</div><div class='add'>+static void bh_handler(void* Context)</div><div class='ctx'> {</div><div class='ctx'> 	MGSLPC_INFO *info = (MGSLPC_INFO*)Context;</div><div class='ctx'> 	int action;</div><div class='hunk'>@@ -888,7 +888,7 @@ void bh_handler(void* Context)</div><div class='ctx'> 			__FILE__,__LINE__,info-&gt;device_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bh_transmit(MGSLPC_INFO *info)</div><div class='add'>+static void bh_transmit(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *tty = info-&gt;tty;</div><div class='ctx'> 	if (debug_level &gt;= DEBUG_LEVEL_BH)</div><div class='hunk'>@@ -900,7 +900,7 @@ void bh_transmit(MGSLPC_INFO *info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bh_status(MGSLPC_INFO *info)</div><div class='add'>+static void bh_status(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;ri_chkcount = 0;</div><div class='ctx'> 	info-&gt;dsr_chkcount = 0;</div><div class='hunk'>@@ -1582,7 +1582,7 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	if (mgslpc_paranoia_check(info, tty-&gt;name, "mgslpc_put_char"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;tx_buf)</div><div class='add'>+	if (!info-&gt;tx_buf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;lock,flags);</div><div class='hunk'>@@ -1649,7 +1649,7 @@ static int mgslpc_write(struct tty_struct * tty,</div><div class='ctx'> 			__FILE__,__LINE__,info-&gt;device_name,count);</div><div class='ctx'> 	</div><div class='ctx'> 	if (mgslpc_paranoia_check(info, tty-&gt;name, "mgslpc_write") ||</div><div class='del'>-	    !tty || !info-&gt;tx_buf)</div><div class='add'>+		!info-&gt;tx_buf)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;params.mode == MGSL_MODE_HDLC) {</div><div class='hunk'>@@ -2305,7 +2305,7 @@ static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'> 	return ioctl_common(info, cmd, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ioctl_common(MGSLPC_INFO *info, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int ioctl_common(MGSLPC_INFO *info, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct mgsl_icount cnow;	/* kernel counter temps */</div><div class='hunk'>@@ -2877,7 +2877,7 @@ done:</div><div class='ctx'> 	return ((count &lt; begin+len-off) ? count : begin+len-off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rx_alloc_buffers(MGSLPC_INFO *info)</div><div class='add'>+static int rx_alloc_buffers(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	/* each buffer has header and data */</div><div class='ctx'> 	info-&gt;rx_buf_size = sizeof(RXBUF) + info-&gt;max_frame_size;</div><div class='hunk'>@@ -2900,13 +2900,13 @@ int rx_alloc_buffers(MGSLPC_INFO *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rx_free_buffers(MGSLPC_INFO *info)</div><div class='add'>+static void rx_free_buffers(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(info-&gt;rx_buf);</div><div class='ctx'> 	info-&gt;rx_buf = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int claim_resources(MGSLPC_INFO *info)</div><div class='add'>+static int claim_resources(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (rx_alloc_buffers(info) &lt; 0 ) {</div><div class='ctx'> 		printk( "Cant allocate rx buffer %s\n", info-&gt;device_name);</div><div class='hunk'>@@ -2916,7 +2916,7 @@ int claim_resources(MGSLPC_INFO *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void release_resources(MGSLPC_INFO *info)</div><div class='add'>+static void release_resources(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (debug_level &gt;= DEBUG_LEVEL_INFO)</div><div class='ctx'> 		printk("release_resources(%s)\n", info-&gt;device_name);</div><div class='hunk'>@@ -2928,7 +2928,7 @@ void release_resources(MGSLPC_INFO *info)</div><div class='ctx'>  * 	</div><div class='ctx'>  * Arguments:		info	pointer to device instance data</div><div class='ctx'>  */</div><div class='del'>-void mgslpc_add_device(MGSLPC_INFO *info)</div><div class='add'>+static void mgslpc_add_device(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;next_device = NULL;</div><div class='ctx'> 	info-&gt;line = mgslpc_device_count;</div><div class='hunk'>@@ -2964,7 +2964,7 @@ void mgslpc_add_device(MGSLPC_INFO *info)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mgslpc_remove_device(MGSLPC_INFO *remove_info)</div><div class='add'>+static void mgslpc_remove_device(MGSLPC_INFO *remove_info)</div><div class='ctx'> {</div><div class='ctx'> 	MGSLPC_INFO *info = mgslpc_device_list;</div><div class='ctx'> 	MGSLPC_INFO *last = NULL;</div><div class='hunk'>@@ -3257,7 +3257,7 @@ static void loopback_enable(MGSLPC_INFO *info)</div><div class='ctx'> 	write_reg(info, CHA + MODE, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hdlc_mode(MGSLPC_INFO *info)</div><div class='add'>+static void hdlc_mode(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	unsigned char clkmode, clksubmode;</div><div class='hunk'>@@ -3497,7 +3497,7 @@ void hdlc_mode(MGSLPC_INFO *info)</div><div class='ctx'> 	rx_stop(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rx_stop(MGSLPC_INFO *info)</div><div class='add'>+static void rx_stop(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (debug_level &gt;= DEBUG_LEVEL_ISR)</div><div class='ctx'> 		printk("%s(%d):rx_stop(%s)\n",</div><div class='hunk'>@@ -3510,7 +3510,7 @@ void rx_stop(MGSLPC_INFO *info)</div><div class='ctx'> 	info-&gt;rx_overflow = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rx_start(MGSLPC_INFO *info)</div><div class='add'>+static void rx_start(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (debug_level &gt;= DEBUG_LEVEL_ISR)</div><div class='ctx'> 		printk("%s(%d):rx_start(%s)\n",</div><div class='hunk'>@@ -3526,7 +3526,7 @@ void rx_start(MGSLPC_INFO *info)</div><div class='ctx'> 	info-&gt;rx_enabled = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tx_start(MGSLPC_INFO *info)</div><div class='add'>+static void tx_start(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (debug_level &gt;= DEBUG_LEVEL_ISR)</div><div class='ctx'> 		printk("%s(%d):tx_start(%s)\n",</div><div class='hunk'>@@ -3564,7 +3564,7 @@ void tx_start(MGSLPC_INFO *info)</div><div class='ctx'> 		info-&gt;tx_enabled = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void tx_stop(MGSLPC_INFO *info)</div><div class='add'>+static void tx_stop(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (debug_level &gt;= DEBUG_LEVEL_ISR)</div><div class='ctx'> 		printk("%s(%d):tx_stop(%s)\n",</div><div class='hunk'>@@ -3578,7 +3578,7 @@ void tx_stop(MGSLPC_INFO *info)</div><div class='ctx'> </div><div class='ctx'> /* Reset the adapter to a known state and prepare it for further use.</div><div class='ctx'>  */</div><div class='del'>-void reset_device(MGSLPC_INFO *info)</div><div class='add'>+static void reset_device(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	/* power up both channels (set BIT7) */ </div><div class='ctx'> 	write_reg(info, CHA + CCR0, 0x80);</div><div class='hunk'>@@ -3628,7 +3628,7 @@ void reset_device(MGSLPC_INFO *info)</div><div class='ctx'> 	write_reg(info, IPC, 0x05);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void async_mode(MGSLPC_INFO *info)</div><div class='add'>+static void async_mode(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='hunk'>@@ -3799,7 +3799,7 @@ void async_mode(MGSLPC_INFO *info)</div><div class='ctx'> </div><div class='ctx'> /* Set the HDLC idle mode for the transmitter.</div><div class='ctx'>  */</div><div class='del'>-void tx_set_idle(MGSLPC_INFO *info)</div><div class='add'>+static void tx_set_idle(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	/* Note: ESCC2 only supports flags and one idle modes */ </div><div class='ctx'> 	if (info-&gt;idle_mode == HDLC_TXIDLE_FLAGS)</div><div class='hunk'>@@ -3810,7 +3810,7 @@ void tx_set_idle(MGSLPC_INFO *info)</div><div class='ctx'> </div><div class='ctx'> /* get state of the V24 status (input) signals.</div><div class='ctx'>  */</div><div class='del'>-void get_signals(MGSLPC_INFO *info)</div><div class='add'>+static void get_signals(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char status = 0;</div><div class='ctx'> 	</div><div class='hunk'>@@ -3832,7 +3832,7 @@ void get_signals(MGSLPC_INFO *info)</div><div class='ctx'> /* Set the state of DTR and RTS based on contents of</div><div class='ctx'>  * serial_signals member of device extension.</div><div class='ctx'>  */</div><div class='del'>-void set_signals(MGSLPC_INFO *info)</div><div class='add'>+static void set_signals(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='hunk'>@@ -3856,7 +3856,7 @@ void set_signals(MGSLPC_INFO *info)</div><div class='ctx'> 		set_reg_bits(info, CHA + PVR, PVR_DTR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rx_reset_buffers(MGSLPC_INFO *info)</div><div class='add'>+static void rx_reset_buffers(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	RXBUF *buf;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -3875,7 +3875,7 @@ void rx_reset_buffers(MGSLPC_INFO *info)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns 1 if frame returned, otherwise 0</div><div class='ctx'>  */</div><div class='del'>-int rx_get_frame(MGSLPC_INFO *info)</div><div class='add'>+static int rx_get_frame(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short status;</div><div class='ctx'> 	RXBUF *buf;</div><div class='hunk'>@@ -3961,7 +3961,7 @@ int rx_get_frame(MGSLPC_INFO *info)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-BOOLEAN register_test(MGSLPC_INFO *info)</div><div class='add'>+static BOOLEAN register_test(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned char patterns[] = </div><div class='ctx'> 	    { 0x00, 0xff, 0xaa, 0x55, 0x69, 0x96, 0x0f };</div><div class='hunk'>@@ -3987,7 +3987,7 @@ BOOLEAN register_test(MGSLPC_INFO *info)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-BOOLEAN irq_test(MGSLPC_INFO *info)</div><div class='add'>+static BOOLEAN irq_test(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long end_time;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -4022,7 +4022,7 @@ BOOLEAN irq_test(MGSLPC_INFO *info)</div><div class='ctx'> 	return info-&gt;irq_occurred ? TRUE : FALSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int adapter_test(MGSLPC_INFO *info)</div><div class='add'>+static int adapter_test(MGSLPC_INFO *info)</div><div class='ctx'> {</div><div class='ctx'> 	if (!register_test(info)) {</div><div class='ctx'> 		info-&gt;init_error = DiagStatus_AddressFailure;</div><div class='hunk'>@@ -4044,7 +4044,7 @@ int adapter_test(MGSLPC_INFO *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit)</div><div class='add'>+static void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int linecount;</div><div class='hunk'>@@ -4079,7 +4079,7 @@ void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit)</div><div class='ctx'> /* HDLC frame time out</div><div class='ctx'>  * update stats and do tx completion processing</div><div class='ctx'>  */</div><div class='del'>-void tx_timeout(unsigned long context)</div><div class='add'>+static void tx_timeout(unsigned long context)</div><div class='ctx'> {</div><div class='ctx'> 	MGSLPC_INFO *info = (MGSLPC_INFO*)context;</div><div class='ctx'> 	unsigned long flags;</div><div class='head'>diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c<br/>index bee6c47b45bd..520d2cf82bc0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/ppdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/ppdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/ppdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/ppdev.c</a></div><div class='hunk'>@@ -60,7 +60,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='hunk'>@@ -740,7 +739,7 @@ static unsigned int pp_poll (struct file * file, poll_table * wait)</div><div class='ctx'> </div><div class='ctx'> static struct class *ppdev_class;</div><div class='ctx'> </div><div class='del'>-static struct file_operations pp_fops = {</div><div class='add'>+static const struct file_operations pp_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= pp_read,</div><div class='hunk'>@@ -770,7 +769,7 @@ static struct parport_driver pp_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init ppdev_init (void)</div><div class='ctx'> {</div><div class='del'>-	int i, err = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (register_chrdev (PP_MAJOR, CHRDEV, &amp;pp_fops)) {</div><div class='ctx'> 		printk (KERN_WARNING CHRDEV ": unable to get major %d\n",</div><div class='hunk'>@@ -782,11 +781,6 @@ static int __init ppdev_init (void)</div><div class='ctx'> 		err = PTR_ERR(ppdev_class);</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_dir("parports");</div><div class='del'>-	for (i = 0; i &lt; PARPORT_MAX; i++) {</div><div class='del'>-		devfs_mk_cdev(MKDEV(PP_MAJOR, i),</div><div class='del'>-				S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);</div><div class='del'>-	}</div><div class='ctx'> 	if (parport_register_driver(&amp;pp_driver)) {</div><div class='ctx'> 		printk (KERN_WARNING CHRDEV ": unable to register with parport\n");</div><div class='ctx'> 		goto out_class;</div><div class='hunk'>@@ -796,9 +790,6 @@ static int __init ppdev_init (void)</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> out_class:</div><div class='del'>-	for (i = 0; i &lt; PARPORT_MAX; i++)</div><div class='del'>-		devfs_remove("parports/%d", i);</div><div class='del'>-	devfs_remove("parports");</div><div class='ctx'> 	class_destroy(ppdev_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(PP_MAJOR, CHRDEV);</div><div class='hunk'>@@ -808,12 +799,8 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void __exit ppdev_cleanup (void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	/* Clean up all parport stuff */</div><div class='del'>-	for (i = 0; i &lt; PARPORT_MAX; i++)</div><div class='del'>-		devfs_remove("parports/%d", i);</div><div class='ctx'> 	parport_unregister_driver(&amp;pp_driver);</div><div class='del'>-	devfs_remove("parports");</div><div class='ctx'> 	class_destroy(ppdev_class);</div><div class='ctx'> 	unregister_chrdev (PP_MAJOR, CHRDEV);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/pty.c b/drivers/char/pty.c<br/>index 9b5a2c0e7008..34dd4c38110e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/pty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/pty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/pty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/pty.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;	/* For EXPORT_SYMBOL */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -24,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -101,7 +99,7 @@ static void pty_unthrottle(struct tty_struct * tty)</div><div class='ctx'>  *</div><div class='ctx'>  * FIXME: Our pty_write method is called with our ldisc lock held but</div><div class='ctx'>  * not our partners. We can't just take the other one blindly without</div><div class='del'>- * risking deadlocks.  There is also the small matter of TTY_DONT_FLIP</div><div class='add'>+ * risking deadlocks.</div><div class='ctx'>  */</div><div class='ctx'> static int pty_write(struct tty_struct * tty, const unsigned char *buf, int count)</div><div class='ctx'> {</div><div class='hunk'>@@ -265,7 +263,6 @@ static void __init legacy_pty_init(void)</div><div class='ctx'> 	pty_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	pty_driver-&gt;driver_name = "pty_master";</div><div class='ctx'> 	pty_driver-&gt;name = "pty";</div><div class='del'>-	pty_driver-&gt;devfs_name = "pty/m";</div><div class='ctx'> 	pty_driver-&gt;major = PTY_MASTER_MAJOR;</div><div class='ctx'> 	pty_driver-&gt;minor_start = 0;</div><div class='ctx'> 	pty_driver-&gt;type = TTY_DRIVER_TYPE_PTY;</div><div class='hunk'>@@ -283,7 +280,6 @@ static void __init legacy_pty_init(void)</div><div class='ctx'> 	pty_slave_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	pty_slave_driver-&gt;driver_name = "pty_slave";</div><div class='ctx'> 	pty_slave_driver-&gt;name = "ttyp";</div><div class='del'>-	pty_slave_driver-&gt;devfs_name = "pty/s";</div><div class='ctx'> 	pty_slave_driver-&gt;major = PTY_SLAVE_MAJOR;</div><div class='ctx'> 	pty_slave_driver-&gt;minor_start = 0;</div><div class='ctx'> 	pty_slave_driver-&gt;type = TTY_DRIVER_TYPE_PTY;</div><div class='hunk'>@@ -351,7 +347,6 @@ static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> </div><div class='ctx'> static void __init unix98_pty_init(void)</div><div class='ctx'> {</div><div class='del'>-	devfs_mk_dir("pts");</div><div class='ctx'> 	ptm_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);</div><div class='ctx'> 	if (!ptm_driver)</div><div class='ctx'> 		panic("Couldn't allocate Unix98 ptm driver");</div><div class='hunk'>@@ -372,7 +367,7 @@ static void __init unix98_pty_init(void)</div><div class='ctx'> 	ptm_driver-&gt;init_termios.c_cflag = B38400 | CS8 | CREAD;</div><div class='ctx'> 	ptm_driver-&gt;init_termios.c_lflag = 0;</div><div class='ctx'> 	ptm_driver-&gt;flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |</div><div class='del'>-		TTY_DRIVER_NO_DEVFS | TTY_DRIVER_DEVPTS_MEM;</div><div class='add'>+		TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;</div><div class='ctx'> 	ptm_driver-&gt;other = pts_driver;</div><div class='ctx'> 	tty_set_operations(ptm_driver, &amp;pty_ops);</div><div class='ctx'> 	ptm_driver-&gt;ioctl = pty_unix98_ioctl;</div><div class='hunk'>@@ -387,7 +382,7 @@ static void __init unix98_pty_init(void)</div><div class='ctx'> 	pts_driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	pts_driver-&gt;init_termios.c_cflag = B38400 | CS8 | CREAD;</div><div class='ctx'> 	pts_driver-&gt;flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW |</div><div class='del'>-		TTY_DRIVER_NO_DEVFS | TTY_DRIVER_DEVPTS_MEM;</div><div class='add'>+		TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM;</div><div class='ctx'> 	pts_driver-&gt;other = ptm_driver;</div><div class='ctx'> 	tty_set_operations(pts_driver, &amp;pty_ops);</div><div class='ctx'> 	</div><div class='head'>diff --git a/drivers/char/qtronix.c b/drivers/char/qtronix.c<br/>index 601d09baf9d7..9d134e98d2a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/qtronix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/qtronix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/qtronix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/qtronix.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * NOTE:  </div><div class='hunk'>@@ -145,7 +144,7 @@ void __init init_qtronix_990P_kbd(void)</div><div class='ctx'> 	cir_port_init(cir);</div><div class='ctx'> </div><div class='ctx'> 	retval = request_irq(IT8172_CIR0_IRQ, kbd_int_handler, </div><div class='del'>-			(unsigned long )(SA_INTERRUPT|SA_SHIRQ), </div><div class='add'>+			(unsigned long )(IRQF_DISABLED|IRQF_SHARED),</div><div class='ctx'> 			(const char *)"Qtronix IR Keyboard", (void *)cir);</div><div class='ctx'> </div><div class='ctx'> 	if (retval) {</div><div class='head'>diff --git a/drivers/char/random.c b/drivers/char/random.c<br/>index 58f3512c52e1..4c3a5ca9d8f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/random.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/random.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/random.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/random.c</a></div><div class='hunk'>@@ -224,7 +224,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -417,7 +416,7 @@ static struct entropy_store input_pool = {</div><div class='ctx'> 	.poolinfo = &amp;poolinfo_table[0],</div><div class='ctx'> 	.name = "input",</div><div class='ctx'> 	.limit = 1,</div><div class='del'>-	.lock = SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(&amp;input_pool.lock),</div><div class='ctx'> 	.pool = input_pool_data</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -426,7 +425,7 @@ static struct entropy_store blocking_pool = {</div><div class='ctx'> 	.name = "blocking",</div><div class='ctx'> 	.limit = 1,</div><div class='ctx'> 	.pull = &amp;input_pool,</div><div class='del'>-	.lock = SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(&amp;blocking_pool.lock),</div><div class='ctx'> 	.pool = blocking_pool_data</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +433,7 @@ static struct entropy_store nonblocking_pool = {</div><div class='ctx'> 	.poolinfo = &amp;poolinfo_table[1],</div><div class='ctx'> 	.name = "nonblocking",</div><div class='ctx'> 	.pull = &amp;input_pool,</div><div class='del'>-	.lock = SPIN_LOCK_UNLOCKED,</div><div class='add'>+	.lock = __SPIN_LOCK_UNLOCKED(&amp;nonblocking_pool.lock),</div><div class='ctx'> 	.pool = nonblocking_pool_data</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/raw.c b/drivers/char/raw.c<br/>index 15a7b4086524..579868af4a54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/raw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/raw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/raw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/raw.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -31,7 +30,7 @@ struct raw_device_data {</div><div class='ctx'> static struct class *raw_class;</div><div class='ctx'> static struct raw_device_data raw_devices[MAX_RAW_MINORS];</div><div class='ctx'> static DEFINE_MUTEX(raw_mutex);</div><div class='del'>-static struct file_operations raw_ctl_fops;	     /* forward declaration */</div><div class='add'>+static const struct file_operations raw_ctl_fops; /* forward declaration */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Open/close code for raw IO.</div><div class='hunk'>@@ -262,7 +261,7 @@ static ssize_t raw_file_aio_write(struct kiocb *iocb, const char __user *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations raw_fops = {</div><div class='add'>+static const struct file_operations raw_fops = {</div><div class='ctx'> 	.read	=	generic_file_read,</div><div class='ctx'> 	.aio_read = 	generic_file_aio_read,</div><div class='ctx'> 	.write	=	raw_file_write,</div><div class='hunk'>@@ -275,7 +274,7 @@ static struct file_operations raw_fops = {</div><div class='ctx'> 	.owner	=	THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations raw_ctl_fops = {</div><div class='add'>+static const struct file_operations raw_ctl_fops = {</div><div class='ctx'> 	.ioctl	=	raw_ctl_ioctl,</div><div class='ctx'> 	.open	=	raw_open,</div><div class='ctx'> 	.owner	=	THIS_MODULE,</div><div class='hunk'>@@ -288,7 +287,6 @@ static struct cdev raw_cdev = {</div><div class='ctx'> </div><div class='ctx'> static int __init raw_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	dev_t dev = MKDEV(RAW_MAJOR, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (register_chrdev_region(dev, MAX_RAW_MINORS, "raw"))</div><div class='hunk'>@@ -310,13 +308,6 @@ static int __init raw_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(RAW_MAJOR, 0),</div><div class='del'>-		      S_IFCHR | S_IRUGO | S_IWUGO,</div><div class='del'>-		      "raw/rawctl");</div><div class='del'>-	for (i = 1; i &lt; MAX_RAW_MINORS; i++)</div><div class='del'>-		devfs_mk_cdev(MKDEV(RAW_MAJOR, i),</div><div class='del'>-			      S_IFCHR | S_IRUGO | S_IWUGO,</div><div class='del'>-			      "raw/raw%d", i);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -326,12 +317,6 @@ error:</div><div class='ctx'> </div><div class='ctx'> static void __exit raw_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; MAX_RAW_MINORS; i++)</div><div class='del'>-		devfs_remove("raw/raw%d", i);</div><div class='del'>-	devfs_remove("raw/rawctl");</div><div class='del'>-	devfs_remove("raw");</div><div class='ctx'> 	class_device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));</div><div class='ctx'> 	class_destroy(raw_class);</div><div class='ctx'> 	cdev_del(&amp;raw_cdev);</div><div class='head'>diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h<br/>index 5818a8aa46e0..6e63f8b2c479 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/daemon.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/daemon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/daemon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/daemon.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@ struct Error {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct DownLoad {</div><div class='del'>-	char *DataP;</div><div class='add'>+	char __user *DataP;</div><div class='ctx'> 	unsigned int Count;</div><div class='ctx'> 	unsigned int ProductCode;</div><div class='ctx'> };</div><div class='hunk'>@@ -83,18 +83,18 @@ struct PortSetup {</div><div class='ctx'> struct LpbReq {</div><div class='ctx'> 	unsigned int Host;</div><div class='ctx'> 	unsigned int Link;</div><div class='del'>-	struct LPB *LpbP;</div><div class='add'>+	struct LPB __user *LpbP;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct RupReq {</div><div class='ctx'> 	unsigned int HostNum;</div><div class='ctx'> 	unsigned int RupNum;</div><div class='del'>-	struct RUP *RupP;</div><div class='add'>+	struct RUP __user *RupP;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct PortReq {</div><div class='ctx'> 	unsigned int SysPort;</div><div class='del'>-	struct Port *PortP;</div><div class='add'>+	struct Port __user *PortP;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct StreamInfo {</div><div class='hunk'>@@ -105,12 +105,12 @@ struct StreamInfo {</div><div class='ctx'> </div><div class='ctx'> struct HostReq {</div><div class='ctx'> 	unsigned int HostNum;</div><div class='del'>-	struct Host *HostP;</div><div class='add'>+	struct Host __user *HostP;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct HostDpRam {</div><div class='ctx'> 	unsigned int HostNum;</div><div class='del'>-	struct DpRam *DpRamP;</div><div class='add'>+	struct DpRam __user *DpRamP;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct DebugCtrl {</div><div class='head'>diff --git a/drivers/char/rio/func.h b/drivers/char/rio/func.h<br/>index e64fe9912394..6b039186856d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/func.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/func.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/func.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/func.h</a></div><div class='hunk'>@@ -46,7 +46,7 @@ int RIOBootCodeRTA(struct rio_info *, struct DownLoad *);</div><div class='ctx'> int RIOBootCodeHOST(struct rio_info *, struct DownLoad *);</div><div class='ctx'> int RIOBootCodeUNKNOWN(struct rio_info *, struct DownLoad *);</div><div class='ctx'> void msec_timeout(struct Host *);</div><div class='del'>-int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT *);</div><div class='add'>+int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *);</div><div class='ctx'> int RIOBootOk(struct rio_info *, struct Host *, unsigned long);</div><div class='ctx'> int RIORtaBound(struct rio_info *, unsigned int);</div><div class='ctx'> void rio_fill_host_slot(int, int, unsigned int, struct Host *);</div><div class='hunk'>@@ -55,8 +55,8 @@ void rio_fill_host_slot(int, int, unsigned int, struct Host *);</div><div class='ctx'> int RIOFoadRta(struct Host *, struct Map *);</div><div class='ctx'> int RIOZombieRta(struct Host *, struct Map *);</div><div class='ctx'> int RIOCommandRta(struct rio_info *, unsigned long, int (*func) (struct Host *, struct Map *));</div><div class='del'>-int RIOIdentifyRta(struct rio_info *, void *);</div><div class='del'>-int RIOKillNeighbour(struct rio_info *, void *);</div><div class='add'>+int RIOIdentifyRta(struct rio_info *, void __user *);</div><div class='add'>+int RIOKillNeighbour(struct rio_info *, void __user *);</div><div class='ctx'> int RIOSuspendBootRta(struct Host *, int, int);</div><div class='ctx'> int RIOFoadWakeup(struct rio_info *);</div><div class='ctx'> struct CmdBlk *RIOGetCmdBlk(void);</div><div class='hunk'>@@ -68,7 +68,8 @@ int RIORFlushEnable(unsigned long, struct CmdBlk *);</div><div class='ctx'> int RIOUnUse(unsigned long, struct CmdBlk *);</div><div class='ctx'> </div><div class='ctx'> /* rioctrl.c */</div><div class='del'>-int riocontrol(struct rio_info *, dev_t, int, caddr_t, int);</div><div class='add'>+int riocontrol(struct rio_info *, dev_t, int, unsigned long, int);</div><div class='add'>+</div><div class='ctx'> int RIOPreemptiveCmd(struct rio_info *, struct Port *, unsigned char);</div><div class='ctx'> </div><div class='ctx'> /* rioinit.c */</div><div class='hunk'>@@ -77,13 +78,13 @@ void RIOInitHosts(struct rio_info *, struct RioHostInfo *);</div><div class='ctx'> void RIOISAinit(struct rio_info *, int);</div><div class='ctx'> int RIODoAT(struct rio_info *, int, int);</div><div class='ctx'> caddr_t RIOCheckForATCard(int);</div><div class='del'>-int RIOAssignAT(struct rio_info *, int, caddr_t, int);</div><div class='del'>-int RIOBoardTest(unsigned long, caddr_t, unsigned char, int);</div><div class='add'>+int RIOAssignAT(struct rio_info *, int, void __iomem *, int);</div><div class='add'>+int RIOBoardTest(unsigned long, void __iomem *, unsigned char, int);</div><div class='ctx'> void RIOAllocDataStructs(struct rio_info *);</div><div class='ctx'> void RIOSetupDataStructs(struct rio_info *);</div><div class='ctx'> int RIODefaultName(struct rio_info *, struct Host *, unsigned int);</div><div class='ctx'> struct rioVersion *RIOVersid(void);</div><div class='del'>-void RIOHostReset(unsigned int, struct DpRam *, unsigned int);</div><div class='add'>+void RIOHostReset(unsigned int, struct DpRam __iomem *, unsigned int);</div><div class='ctx'> </div><div class='ctx'> /* riointr.c */</div><div class='ctx'> void RIOTxEnable(char *);</div><div class='hunk'>@@ -95,14 +96,14 @@ int RIOParam(struct Port *, int, int, int);</div><div class='ctx'> int RIODelay(struct Port *PortP, int);</div><div class='ctx'> int RIODelay_ni(struct Port *PortP, int);</div><div class='ctx'> void ms_timeout(struct Port *);</div><div class='del'>-int can_add_transmit(struct PKT **, struct Port *);</div><div class='add'>+int can_add_transmit(struct PKT __iomem **, struct Port *);</div><div class='ctx'> void add_transmit(struct Port *);</div><div class='del'>-void put_free_end(struct Host *, struct PKT *);</div><div class='del'>-int can_remove_receive(struct PKT **, struct Port *);</div><div class='add'>+void put_free_end(struct Host *, struct PKT __iomem *);</div><div class='add'>+int can_remove_receive(struct PKT __iomem **, struct Port *);</div><div class='ctx'> void remove_receive(struct Port *);</div><div class='ctx'> </div><div class='ctx'> /* rioroute.c */</div><div class='del'>-int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT *);</div><div class='add'>+int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *);</div><div class='ctx'> void RIOFixPhbs(struct rio_info *, struct Host *, unsigned int);</div><div class='ctx'> unsigned int GetUnitType(unsigned int);</div><div class='ctx'> int RIOSetChange(struct rio_info *);</div><div class='hunk'>@@ -139,7 +140,7 @@ int rio_isr_thread(char *);</div><div class='ctx'> struct rio_info *rio_info_store(int cmd, struct rio_info *p);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void rio_copy_to_card(void *to, void *from, int len);</div><div class='add'>+extern void rio_copy_to_card(void *from, void __iomem *to, int len);</div><div class='ctx'> extern int rio_minor(struct tty_struct *tty);</div><div class='ctx'> extern int rio_ismodem(struct tty_struct *tty);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h<br/>index 179cdbea712b..ee2ddea7a63a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/host.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/host.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/host.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/host.h</a></div><div class='hunk'>@@ -48,8 +48,8 @@ struct Host {</div><div class='ctx'> 	unsigned char Ivec;		/* POLLED or ivec number */</div><div class='ctx'> 	unsigned char Mode;		/* Control stuff */</div><div class='ctx'> 	unsigned char Slot;		/* Slot */</div><div class='del'>-	caddr_t Caddr;			/* KV address of DPRAM */</div><div class='del'>-	struct DpRam *CardP;		/* KV address of DPRAM, with overlay */</div><div class='add'>+	void  __iomem *Caddr;		/* KV address of DPRAM */</div><div class='add'>+	struct DpRam __iomem *CardP;	/* KV address of DPRAM, with overlay */</div><div class='ctx'> 	unsigned long PaddrP;		/* Phys. address of DPRAM */</div><div class='ctx'> 	char Name[MAX_NAME_LEN];	/* The name of the host */</div><div class='ctx'> 	unsigned int UniqueNum;		/* host unique number */</div><div class='hunk'>@@ -57,7 +57,7 @@ struct Host {</div><div class='ctx'> 	unsigned int WorkToBeDone;	/* set to true each interrupt */</div><div class='ctx'> 	unsigned int InIntr;		/* Being serviced? */</div><div class='ctx'> 	unsigned int IntSrvDone;	/* host's interrupt has been serviced */</div><div class='del'>-	void (*Copy) (void *, void *, int);	/* copy func */</div><div class='add'>+	void (*Copy) (void *, void __iomem *, int);	/* copy func */</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 **               I M P O R T A N T !</div><div class='hunk'>@@ -83,11 +83,11 @@ struct Host {</div><div class='ctx'> </div><div class='ctx'> 	struct Top Topology[LINKS_PER_UNIT];	/* one per link */</div><div class='ctx'> 	struct Map Mapping[MAX_RUP];		/* Mappings for host */</div><div class='del'>-	struct PHB *PhbP;			/* Pointer to the PHB array */</div><div class='del'>-	unsigned short *PhbNumP;		/* Ptr to Number of PHB's */</div><div class='del'>-	struct LPB *LinkStrP;			/* Link Structure Array */</div><div class='del'>-	struct RUP *RupP;			/* Sixteen real rups here */</div><div class='del'>-	struct PARM_MAP *ParmMapP;		/* points to the parmmap */</div><div class='add'>+	struct PHB __iomem *PhbP;		/* Pointer to the PHB array */</div><div class='add'>+	unsigned short __iomem *PhbNumP;	/* Ptr to Number of PHB's */</div><div class='add'>+	struct LPB __iomem *LinkStrP;		/* Link Structure Array */</div><div class='add'>+	struct RUP __iomem *RupP;		/* Sixteen real rups here */</div><div class='add'>+	struct PARM_MAP __iomem *ParmMapP;	/* points to the parmmap */</div><div class='ctx'> 	unsigned int ExtraUnits[MAX_EXTRA_UNITS];	/* unknown things */</div><div class='ctx'> 	unsigned int NumExtraBooted;		/* how many of the above */</div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/char/rio/port.h b/drivers/char/rio/port.h<br/>index 9b5fa3eb0402..49cf6d15ee54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/port.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/port.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/port.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/port.h</a></div><div class='hunk'>@@ -40,7 +40,7 @@ struct Port {</div><div class='ctx'> 	struct gs_port gs;</div><div class='ctx'> 	int PortNum;			/* RIO port no., 0-511 */</div><div class='ctx'> 	struct Host *HostP;</div><div class='del'>-	caddr_t Caddr;</div><div class='add'>+	void __iomem *Caddr;</div><div class='ctx'> 	unsigned short HostPort;	/* Port number on host card */</div><div class='ctx'> 	unsigned char RupNum;		/* Number of RUP for port */</div><div class='ctx'> 	unsigned char ID2;		/* Second ID of RTA for port */</div><div class='hunk'>@@ -92,13 +92,13 @@ struct Port {</div><div class='ctx'> #define RIO_RTSFLOW	0x0400		/* RIO's own RTSFLOW flag */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	struct PHB *PhbP;		/* pointer to PHB for port */</div><div class='del'>-	u16 *TxAdd;			/* Add packets here */</div><div class='del'>-	u16 *TxStart;			/* Start of add array */</div><div class='del'>-	u16 *TxEnd;			/* End of add array */</div><div class='del'>-	u16 *RxRemove;			/* Remove packets here */</div><div class='del'>-	u16 *RxStart;			/* Start of remove array */</div><div class='del'>-	u16 *RxEnd;			/* End of remove array */</div><div class='add'>+	struct PHB __iomem *PhbP;	/* pointer to PHB for port */</div><div class='add'>+	u16 __iomem *TxAdd;		/* Add packets here */</div><div class='add'>+	u16 __iomem *TxStart;		/* Start of add array */</div><div class='add'>+	u16 __iomem *TxEnd;		/* End of add array */</div><div class='add'>+	u16 __iomem *RxRemove;		/* Remove packets here */</div><div class='add'>+	u16 __iomem *RxStart;		/* Start of remove array */</div><div class='add'>+	u16 __iomem *RxEnd;		/* End of remove array */</div><div class='ctx'> 	unsigned int RtaUniqueNum;	/* Unique number of RTA */</div><div class='ctx'> 	unsigned short PortState;	/* status of port */</div><div class='ctx'> 	unsigned short ModemState;	/* status of modem lines */</div><div class='head'>diff --git a/drivers/char/rio/rio.h b/drivers/char/rio/rio.h<br/>index b4c91871ba28..1bf36223a4e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rio.h</a></div><div class='hunk'>@@ -129,8 +129,8 @@</div><div class='ctx'> **	RIO_OBJ takes hostp-&gt;Caddr and a UNIX pointer to an object and</div><div class='ctx'> **	returns the offset into the DP RAM area.</div><div class='ctx'> */</div><div class='del'>-#define	RIO_PTR(C,O) (((unsigned char *)(C))+(0xFFFF&amp;(O)))</div><div class='del'>-#define	RIO_OFF(C,O) ((long)(O)-(long)(C))</div><div class='add'>+#define	RIO_PTR(C,O) (((unsigned char __iomem *)(C))+(0xFFFF&amp;(O)))</div><div class='add'>+#define	RIO_OFF(C,O) ((unsigned char __iomem *)(O)-(unsigned char __iomem *)(C))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> **	How to convert from various different device number formats:</div><div class='head'>diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c<br/>index 78dd856534ce..3fa80aaf4527 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rio_linux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rio_linux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rio_linux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rio_linux.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  * */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -244,7 +243,7 @@ static struct real_driver rio_real_driver = {</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations rio_fw_fops = {</div><div class='add'>+static const struct file_operations rio_fw_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.ioctl = rio_fw_ioctl,</div><div class='ctx'> };</div><div class='hunk'>@@ -333,9 +332,9 @@ int RIODelay_ni(struct Port *PortP, int njiffies)</div><div class='ctx'> 	return !RIO_FAIL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void rio_copy_to_card(void *to, void *from, int len)</div><div class='add'>+void rio_copy_to_card(void *from, void __iomem *to, int len)</div><div class='ctx'> {</div><div class='del'>-	rio_memcpy_toio(NULL, to, from, len);</div><div class='add'>+	rio_copy_toio(to, from, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rio_minor(struct tty_struct *tty)</div><div class='hunk'>@@ -573,7 +572,7 @@ static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd</div><div class='ctx'> 	func_enter();</div><div class='ctx'> </div><div class='ctx'> 	/* The "dev" argument isn't used. */</div><div class='del'>-	rc = riocontrol(p, 0, cmd, (void *) arg, capable(CAP_SYS_ADMIN));</div><div class='add'>+	rc = riocontrol(p, 0, cmd, arg, capable(CAP_SYS_ADMIN));</div><div class='ctx'> </div><div class='ctx'> 	func_exit();</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -583,6 +582,7 @@ extern int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command,</div><div class='ctx'> </div><div class='ctx'> static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct Port *PortP;</div><div class='ctx'> 	int ival;</div><div class='hunk'>@@ -594,14 +594,14 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case TIOCSSOFTCAR:</div><div class='del'>-		if ((rc = get_user(ival, (unsigned int *) arg)) == 0) {</div><div class='add'>+		if ((rc = get_user(ival, (unsigned __user *) argp)) == 0) {</div><div class='ctx'> 			tty-&gt;termios-&gt;c_cflag = (tty-&gt;termios-&gt;c_cflag &amp; ~CLOCAL) | (ival ? CLOCAL : 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TIOCGSERIAL:</div><div class='ctx'> 		rc = -EFAULT;</div><div class='del'>-		if (access_ok(VERIFY_WRITE, (void *) arg, sizeof(struct serial_struct)))</div><div class='del'>-			rc = gs_getserial(&amp;PortP-&gt;gs, (struct serial_struct *) arg);</div><div class='add'>+		if (access_ok(VERIFY_WRITE, argp, sizeof(struct serial_struct)))</div><div class='add'>+			rc = gs_getserial(&amp;PortP-&gt;gs, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCSBRK:</div><div class='ctx'> 		if (PortP-&gt;State &amp; RIO_DELETED) {</div><div class='hunk'>@@ -631,8 +631,8 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TIOCSSERIAL:</div><div class='ctx'> 		rc = -EFAULT;</div><div class='del'>-		if (access_ok(VERIFY_READ, (void *) arg, sizeof(struct serial_struct)))</div><div class='del'>-			rc = gs_setserial(&amp;PortP-&gt;gs, (struct serial_struct *) arg);</div><div class='add'>+		if (access_ok(VERIFY_READ, argp, sizeof(struct serial_struct)))</div><div class='add'>+			rc = gs_setserial(&amp;PortP-&gt;gs, argp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		rc = -ENOIOCTLCMD;</div><div class='hunk'>@@ -919,7 +919,7 @@ static void __exit rio_release_drivers(void)</div><div class='ctx'> static void fix_rio_pci(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long hwbase;</div><div class='del'>-	unsigned char *rebase;</div><div class='add'>+	unsigned char __iomem *rebase;</div><div class='ctx'> 	unsigned int t;</div><div class='ctx'> </div><div class='ctx'> #define CNTRL_REG_OFFSET        0x50</div><div class='hunk'>@@ -999,7 +999,7 @@ static int __init rio_init(void)</div><div class='ctx'> 		if (((1 &lt;&lt; hp-&gt;Ivec) &amp; rio_irqmask) == 0)</div><div class='ctx'> 			hp-&gt;Ivec = 0;</div><div class='ctx'> 		hp-&gt;Caddr = ioremap(p-&gt;RIOHosts[p-&gt;RIONumHosts].PaddrP, RIO_WINDOW_LEN);</div><div class='del'>-		hp-&gt;CardP = (struct DpRam *) hp-&gt;Caddr;</div><div class='add'>+		hp-&gt;CardP = (struct DpRam __iomem *) hp-&gt;Caddr;</div><div class='ctx'> 		hp-&gt;Type = RIO_PCI;</div><div class='ctx'> 		hp-&gt;Copy = rio_copy_to_card;</div><div class='ctx'> 		hp-&gt;Mode = RIO_PCI_BOOT_FROM_RAM;</div><div class='hunk'>@@ -1021,7 +1021,7 @@ static int __init rio_init(void)</div><div class='ctx'> 			p-&gt;RIONumHosts++;</div><div class='ctx'> 			found++;</div><div class='ctx'> 		} else {</div><div class='del'>-			iounmap((char *) (p-&gt;RIOHosts[p-&gt;RIONumHosts].Caddr));</div><div class='add'>+			iounmap(p-&gt;RIOHosts[p-&gt;RIONumHosts].Caddr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1047,7 +1047,7 @@ static int __init rio_init(void)</div><div class='ctx'> 			hp-&gt;Ivec = 0;</div><div class='ctx'> 		hp-&gt;Ivec |= 0x8000;	/* Mark as non-sharable */</div><div class='ctx'> 		hp-&gt;Caddr = ioremap(p-&gt;RIOHosts[p-&gt;RIONumHosts].PaddrP, RIO_WINDOW_LEN);</div><div class='del'>-		hp-&gt;CardP = (struct DpRam *) hp-&gt;Caddr;</div><div class='add'>+		hp-&gt;CardP = (struct DpRam __iomem *) hp-&gt;Caddr;</div><div class='ctx'> 		hp-&gt;Type = RIO_PCI;</div><div class='ctx'> 		hp-&gt;Copy = rio_copy_to_card;</div><div class='ctx'> 		hp-&gt;Mode = RIO_PCI_BOOT_FROM_RAM;</div><div class='hunk'>@@ -1070,7 +1070,7 @@ static int __init rio_init(void)</div><div class='ctx'> 			p-&gt;RIONumHosts++;</div><div class='ctx'> 			found++;</div><div class='ctx'> 		} else {</div><div class='del'>-			iounmap((char *) (p-&gt;RIOHosts[p-&gt;RIONumHosts].Caddr));</div><div class='add'>+			iounmap(p-&gt;RIOHosts[p-&gt;RIONumHosts].Caddr);</div><div class='ctx'> 		}</div><div class='ctx'> #else</div><div class='ctx'> 		printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n");</div><div class='hunk'>@@ -1085,7 +1085,7 @@ static int __init rio_init(void)</div><div class='ctx'> 		/* There was something about the IRQs of these cards. 'Forget what.--REW */</div><div class='ctx'> 		hp-&gt;Ivec = 0;</div><div class='ctx'> 		hp-&gt;Caddr = ioremap(p-&gt;RIOHosts[p-&gt;RIONumHosts].PaddrP, RIO_WINDOW_LEN);</div><div class='del'>-		hp-&gt;CardP = (struct DpRam *) hp-&gt;Caddr;</div><div class='add'>+		hp-&gt;CardP = (struct DpRam __iomem *) hp-&gt;Caddr;</div><div class='ctx'> 		hp-&gt;Type = RIO_AT;</div><div class='ctx'> 		hp-&gt;Copy = rio_copy_to_card;	/* AT card PCI???? - PVDL</div><div class='ctx'>                                          * -- YES! this is now a normal copy. Only the</div><div class='hunk'>@@ -1111,7 +1111,7 @@ static int __init rio_init(void)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (!okboard)</div><div class='del'>-				iounmap((char *) (hp-&gt;Caddr));</div><div class='add'>+				iounmap(hp-&gt;Caddr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1119,7 +1119,7 @@ static int __init rio_init(void)</div><div class='ctx'> 	for (i = 0; i &lt; p-&gt;RIONumHosts; i++) {</div><div class='ctx'> 		hp = &amp;p-&gt;RIOHosts[i];</div><div class='ctx'> 		if (hp-&gt;Ivec) {</div><div class='del'>-			int mode = SA_SHIRQ;</div><div class='add'>+			int mode = IRQF_SHARED;</div><div class='ctx'> 			if (hp-&gt;Ivec &amp; 0x8000) {</div><div class='ctx'> 				mode = 0;</div><div class='ctx'> 				hp-&gt;Ivec &amp;= 0x7fff;</div><div class='head'>diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h<br/>index 4ce77fb1fae5..dc3f005614a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rio_linux.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rio_linux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rio_linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rio_linux.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  Version 1.0 -- July, 1999. </div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define RIO_NBOARDS        4</div><div class='ctx'> #define RIO_PORTSPERBOARD 128</div><div class='hunk'>@@ -131,9 +130,9 @@ struct vpd_prom {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RIO_OLDPCI</div><div class='del'>-static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n)</div><div class='add'>+static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *dest, void *source, int n)</div><div class='ctx'> {</div><div class='del'>-	char *dst = dest;</div><div class='add'>+	char __iomem *dst = dest;</div><div class='ctx'> 	char *src = source;</div><div class='ctx'> </div><div class='ctx'> 	while (n--) {</div><div class='hunk'>@@ -144,11 +143,22 @@ static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n</div><div class='ctx'> 	return dest;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void __iomem *rio_copy_toio(void __iomem *dest, void *source, int n)</div><div class='add'>+{</div><div class='add'>+	char __iomem *dst = dest;</div><div class='add'>+	char *src = source;</div><div class='add'>+</div><div class='add'>+	while (n--)</div><div class='add'>+		writeb(*src++, dst++);</div><div class='ctx'> </div><div class='del'>-static inline void *rio_memcpy_fromio(void *dest, void *source, int n)</div><div class='add'>+	return dest;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n)</div><div class='ctx'> {</div><div class='ctx'> 	char *dst = dest;</div><div class='del'>-	char *src = source;</div><div class='add'>+	char __iomem *src = source;</div><div class='ctx'> </div><div class='ctx'> 	while (n--)</div><div class='ctx'> 		*dst++ = readb(src++);</div><div class='hunk'>@@ -158,6 +168,7 @@ static inline void *rio_memcpy_fromio(void *dest, void *source, int n)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> #define rio_memcpy_toio(dummy,dest,source,n)   memcpy_toio(dest, source, n)</div><div class='add'>+#define rio_copy_toio   		       memcpy_toio</div><div class='ctx'> #define rio_memcpy_fromio                      memcpy_fromio</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c<br/>index 290143addd34..eca2b95343e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rioboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rioboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rioboot.c</a></div><div class='hunk'>@@ -71,7 +71,7 @@</div><div class='ctx'> #include "cmdblk.h"</div><div class='ctx'> #include "route.h"</div><div class='ctx'> </div><div class='del'>-static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd *PktCmdP);</div><div class='add'>+static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd __iomem *PktCmdP);</div><div class='ctx'> </div><div class='ctx'> static const unsigned char RIOAtVec2Ctrl[] = {</div><div class='ctx'> 	/* 0 */ INTERRUPT_DISABLE,</div><div class='hunk'>@@ -204,13 +204,13 @@ void rio_start_card_running(struct Host *HostP)</div><div class='ctx'> int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> {</div><div class='ctx'> 	struct Host *HostP;</div><div class='del'>-	u8 *Cad;</div><div class='del'>-	PARM_MAP *ParmMapP;</div><div class='add'>+	u8 __iomem *Cad;</div><div class='add'>+	PARM_MAP __iomem *ParmMapP;</div><div class='ctx'> 	int RupN;</div><div class='ctx'> 	int PortN;</div><div class='ctx'> 	unsigned int host;</div><div class='del'>-	u8 *StartP;</div><div class='del'>-	u8 *DestP;</div><div class='add'>+	u8 __iomem *StartP;</div><div class='add'>+	u8 __iomem *DestP;</div><div class='ctx'> 	int wait_count;</div><div class='ctx'> 	u16 OldParmMap;</div><div class='ctx'> 	u16 offset;		/* It is very important that this is a u16 */</div><div class='hunk'>@@ -262,7 +262,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 		 ** Ensure that the host really is stopped.</div><div class='ctx'> 		 ** Disable it's external bus &amp; twang its reset line.</div><div class='ctx'> 		 */</div><div class='del'>-		RIOHostReset(HostP-&gt;Type, (struct DpRam *) HostP-&gt;CardP, HostP-&gt;Slot);</div><div class='add'>+		RIOHostReset(HostP-&gt;Type, HostP-&gt;CardP, HostP-&gt;Slot);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** Copy the data directly from user space to the SRAM.</div><div class='hunk'>@@ -280,7 +280,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 			func_exit();</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(rbp-&gt;DataP, DownCode, rbp-&gt;Count)) {</div><div class='add'>+		if (copy_from_user(DownCode, rbp-&gt;DataP, rbp-&gt;Count)) {</div><div class='ctx'> 			kfree(DownCode);</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			func_exit();</div><div class='hunk'>@@ -366,7 +366,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 		 ** a short branch to 0x7FF8, where a long branch is coded.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		DestP = (u8 *) &amp;Cad[0x7FF8];	/* &lt;&lt;&lt;---- READ THE ABOVE COMMENTS */</div><div class='add'>+		DestP = &amp;Cad[0x7FF8];	/* &lt;&lt;&lt;---- READ THE ABOVE COMMENTS */</div><div class='ctx'> </div><div class='ctx'> #define	NFIX(N)	(0x60 | (N))	/* .O  = (~(.O + N))&lt;&lt;4 */</div><div class='ctx'> #define	PFIX(N)	(0x20 | (N))	/* .O  =   (.O + N)&lt;&lt;4  */</div><div class='hunk'>@@ -438,7 +438,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail\n");</div><div class='ctx'> 			HostP-&gt;Flags &amp;= ~RUN_STATE;</div><div class='ctx'> 			HostP-&gt;Flags |= RC_STUFFED;</div><div class='del'>-			RIOHostReset( HostP-&gt;Type, (struct DpRam *)HostP-&gt;CardP, HostP-&gt;Slot );</div><div class='add'>+			RIOHostReset( HostP-&gt;Type, HostP-&gt;CardP, HostP-&gt;Slot );</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -453,9 +453,9 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** Grab a 32 bit pointer to the parmmap structure</div><div class='ctx'> 		 */</div><div class='del'>-		ParmMapP = (PARM_MAP *) RIO_PTR(Cad, readw(&amp;HostP-&gt;__ParmMapR));</div><div class='add'>+		ParmMapP = (PARM_MAP __iomem *) RIO_PTR(Cad, readw(&amp;HostP-&gt;__ParmMapR));</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP);</div><div class='del'>-		ParmMapP = (PARM_MAP *) ((unsigned long) Cad + readw(&amp;HostP-&gt;__ParmMapR));</div><div class='add'>+		ParmMapP = (PARM_MAP __iomem *)(Cad + readw(&amp;HostP-&gt;__ParmMapR));</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -468,7 +468,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_BOOT, "Links = 0x%x\n", readw(&amp;ParmMapP-&gt;links));</div><div class='ctx'> 			HostP-&gt;Flags &amp;= ~RUN_STATE;</div><div class='ctx'> 			HostP-&gt;Flags |= RC_STUFFED;</div><div class='del'>-			RIOHostReset( HostP-&gt;Type, (struct DpRam *)HostP-&gt;CardP, HostP-&gt;Slot );</div><div class='add'>+			RIOHostReset( HostP-&gt;Type, HostP-&gt;CardP, HostP-&gt;Slot );</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -491,7 +491,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_BOOT, "Timedout waiting for init_done\n");</div><div class='ctx'> 			HostP-&gt;Flags &amp;= ~RUN_STATE;</div><div class='ctx'> 			HostP-&gt;Flags |= RC_STUFFED;</div><div class='del'>-			RIOHostReset( HostP-&gt;Type, (struct DpRam *)HostP-&gt;CardP, HostP-&gt;Slot );</div><div class='add'>+			RIOHostReset( HostP-&gt;Type, HostP-&gt;CardP, HostP-&gt;Slot );</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -512,10 +512,10 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 		 ** 32 bit pointers for the driver in ioremap space.</div><div class='ctx'> 		 */</div><div class='ctx'> 		HostP-&gt;ParmMapP = ParmMapP;</div><div class='del'>-		HostP-&gt;PhbP = (struct PHB *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;phb_ptr));</div><div class='del'>-		HostP-&gt;RupP = (struct RUP *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;rups));</div><div class='del'>-		HostP-&gt;PhbNumP = (unsigned short *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;phb_num_ptr));</div><div class='del'>-		HostP-&gt;LinkStrP = (struct LPB *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;link_str_ptr));</div><div class='add'>+		HostP-&gt;PhbP = (struct PHB __iomem *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;phb_ptr));</div><div class='add'>+		HostP-&gt;RupP = (struct RUP __iomem *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;rups));</div><div class='add'>+		HostP-&gt;PhbNumP = (unsigned short __iomem *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;phb_num_ptr));</div><div class='add'>+		HostP-&gt;LinkStrP = (struct LPB __iomem *) RIO_PTR(Cad, readw(&amp;ParmMapP-&gt;link_str_ptr));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** point the UnixRups at the real Rups</div><div class='hunk'>@@ -540,7 +540,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> 		for (PortN = p-&gt;RIOFirstPortsMapped; PortN &lt; p-&gt;RIOLastPortsMapped + PORTS_PER_RTA; PortN++) {</div><div class='ctx'> 			if (p-&gt;RIOPortp[PortN]-&gt;HostP == HostP) {</div><div class='ctx'> 				struct Port *PortP = p-&gt;RIOPortp[PortN];</div><div class='del'>-				struct PHB *PhbP;</div><div class='add'>+				struct PHB __iomem *PhbP;</div><div class='ctx'> 				/* int oldspl; */</div><div class='ctx'> </div><div class='ctx'> 				if (!PortP-&gt;Mapped)</div><div class='hunk'>@@ -551,12 +551,12 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'> </div><div class='ctx'> 				PortP-&gt;PhbP = PhbP;</div><div class='ctx'> </div><div class='del'>-				PortP-&gt;TxAdd = (u16 *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;tx_add));</div><div class='del'>-				PortP-&gt;TxStart = (u16 *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;tx_start));</div><div class='del'>-				PortP-&gt;TxEnd = (u16 *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;tx_end));</div><div class='del'>-				PortP-&gt;RxRemove = (u16 *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;rx_remove));</div><div class='del'>-				PortP-&gt;RxStart = (u16 *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;rx_start));</div><div class='del'>-				PortP-&gt;RxEnd = (u16 *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;rx_end));</div><div class='add'>+				PortP-&gt;TxAdd = (u16 __iomem *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;tx_add));</div><div class='add'>+				PortP-&gt;TxStart = (u16 __iomem *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;tx_start));</div><div class='add'>+				PortP-&gt;TxEnd = (u16 __iomem *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;tx_end));</div><div class='add'>+				PortP-&gt;RxRemove = (u16 __iomem *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;rx_remove));</div><div class='add'>+				PortP-&gt;RxStart = (u16 __iomem *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;rx_start));</div><div class='add'>+				PortP-&gt;RxEnd = (u16 __iomem *) RIO_PTR(Cad, readw(&amp;PhbP-&gt;rx_end));</div><div class='ctx'> </div><div class='ctx'> 				rio_spin_unlock_irqrestore(&amp;PortP-&gt;portSem, flags);</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -601,9 +601,9 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)</div><div class='ctx'>  *	return 1. If we havent, then return 0.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT *PacketP)</div><div class='add'>+int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT __iomem *PacketP)</div><div class='ctx'> {</div><div class='del'>-	struct PktCmd *PktCmdP = (struct PktCmd *) PacketP-&gt;data;</div><div class='add'>+	struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *) PacketP-&gt;data;</div><div class='ctx'> 	struct PktCmd_M *PktReplyP;</div><div class='ctx'> 	struct CmdBlk *CmdBlkP;</div><div class='ctx'> 	unsigned int sequence;</div><div class='hunk'>@@ -722,7 +722,7 @@ int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct</div><div class='ctx'>  *	RtaUniq is the booted RTA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd *PktCmdP)</div><div class='add'>+static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd __iomem *PktCmdP)</div><div class='ctx'> {</div><div class='ctx'> 	struct Map *MapP = NULL;</div><div class='ctx'> 	struct Map *MapP2 = NULL;</div><div class='head'>diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c<br/>index e6d2b14b5e65..4df6ab2206a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/riocmd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riocmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/riocmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/riocmd.c</a></div><div class='hunk'>@@ -180,7 +180,7 @@ int RIOCommandRta(struct rio_info *p, unsigned long RtaUnique, int (*func) (stru</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int RIOIdentifyRta(struct rio_info *p, void * arg)</div><div class='add'>+int RIOIdentifyRta(struct rio_info *p, void __user * arg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int Host;</div><div class='ctx'> </div><div class='hunk'>@@ -245,7 +245,7 @@ int RIOIdentifyRta(struct rio_info *p, void * arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int RIOKillNeighbour(struct rio_info *p, void * arg)</div><div class='add'>+int RIOKillNeighbour(struct rio_info *p, void __user * arg)</div><div class='ctx'> {</div><div class='ctx'> 	uint Host;</div><div class='ctx'> 	uint ID;</div><div class='hunk'>@@ -370,9 +370,9 @@ int RIOFoadWakeup(struct rio_info *p)</div><div class='ctx'> /*</div><div class='ctx'> ** Incoming command on the COMMAND_RUP to be processed.</div><div class='ctx'> */</div><div class='del'>-static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struct PKT * PacketP)</div><div class='add'>+static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struct PKT __iomem *PacketP)</div><div class='ctx'> {</div><div class='del'>-	struct PktCmd *PktCmdP = (struct PktCmd *) PacketP-&gt;data;</div><div class='add'>+	struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *)PacketP-&gt;data;</div><div class='ctx'> 	struct Port *PortP;</div><div class='ctx'> 	struct UnixRup *UnixRupP;</div><div class='ctx'> 	unsigned short SysPort;</div><div class='hunk'>@@ -407,12 +407,12 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc</div><div class='ctx'> 		} else</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CMD, "CONTROL information: This is the RUP for link ``%c'' of host ``%s''\n", ('A' + Rup - MAX_RUP), HostP-&gt;Name);</div><div class='ctx'> </div><div class='del'>-		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Destination 0x%x:0x%x\n", PacketP-&gt;dest_unit, PacketP-&gt;dest_port);</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Source	  0x%x:0x%x\n", PacketP-&gt;src_unit, PacketP-&gt;src_port);</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Length	  0x%x (%d)\n", PacketP-&gt;len, PacketP-&gt;len);</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Control	 0x%x (%d)\n", PacketP-&gt;control, PacketP-&gt;control);</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Check	   0x%x (%d)\n", PacketP-&gt;csum, PacketP-&gt;csum);</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", PktCmdP-&gt;PhbNum, PktCmdP-&gt;Command);</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Destination 0x%x:0x%x\n", readb(&amp;PacketP-&gt;dest_unit), readb(&amp;PacketP-&gt;dest_port));</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Source	  0x%x:0x%x\n", readb(&amp;PacketP-&gt;src_unit), readb(&amp;PacketP-&gt;src_port));</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Length	  0x%x (%d)\n", readb(&amp;PacketP-&gt;len), readb(&amp;PacketP-&gt;len));</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Control	 0x%x (%d)\n", readb(&amp;PacketP-&gt;control), readb(&amp;PacketP-&gt;control));</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CMD, "PACKET information: Check	   0x%x (%d)\n", readw(&amp;PacketP-&gt;csum), readw(&amp;PacketP-&gt;csum));</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", readb(&amp;PktCmdP-&gt;PhbNum), readb(&amp;PktCmdP-&gt;Command));</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	PortP = p-&gt;RIOPortp[SysPort];</div><div class='hunk'>@@ -601,7 +601,7 @@ int RIOQueueCmdBlk(struct Host *HostP, uint Rup, struct CmdBlk *CmdBlkP)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** Whammy! blat that pack!</div><div class='ctx'> 		 */</div><div class='del'>-		HostP-&gt;Copy((caddr_t) &amp; CmdBlkP-&gt;Packet, RIO_PTR(HostP-&gt;Caddr, UnixRupP-&gt;RupP-&gt;txpkt), sizeof(struct PKT));</div><div class='add'>+		HostP-&gt;Copy(&amp;CmdBlkP-&gt;Packet, RIO_PTR(HostP-&gt;Caddr, readw(&amp;UnixRupP-&gt;RupP-&gt;txpkt)), sizeof(struct PKT));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** place command packet on the pending position.</div><div class='hunk'>@@ -655,7 +655,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP)</div><div class='ctx'> {</div><div class='ctx'> 	struct CmdBlk *CmdBlkP;</div><div class='ctx'> 	struct UnixRup *UnixRupP;</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	unsigned short Rup;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -676,7 +676,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP)</div><div class='ctx'> 		if (readw(&amp;UnixRupP-&gt;RupP-&gt;rxcontrol) != RX_RUP_INACTIVE) {</div><div class='ctx'> 			int FreeMe;</div><div class='ctx'> </div><div class='del'>-			PacketP = (struct PKT *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;UnixRupP-&gt;RupP-&gt;rxpkt));</div><div class='add'>+			PacketP = (struct PKT __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;UnixRupP-&gt;RupP-&gt;rxpkt));</div><div class='ctx'> </div><div class='ctx'> 			switch (readb(&amp;PacketP-&gt;dest_port)) {</div><div class='ctx'> 			case BOOT_RUP:</div><div class='hunk'>@@ -694,9 +694,9 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP)</div><div class='ctx'> 				 */</div><div class='ctx'> 				rio_spin_unlock_irqrestore(&amp;UnixRupP-&gt;RupLock, flags);</div><div class='ctx'> 				FreeMe = RIOCommandRup(p, Rup, HostP, PacketP);</div><div class='del'>-				if (PacketP-&gt;data[5] == MEMDUMP) {</div><div class='del'>-					rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", *(unsigned short *) &amp; (PacketP-&gt;data[6]));</div><div class='del'>-					HostP-&gt;Copy((caddr_t) &amp; (PacketP-&gt;data[8]), (caddr_t) p-&gt;RIOMemDump, 32);</div><div class='add'>+				if (readb(&amp;PacketP-&gt;data[5]) == MEMDUMP) {</div><div class='add'>+					rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", readw(&amp;(PacketP-&gt;data[6])));</div><div class='add'>+					rio_memcpy_fromio(p-&gt;RIOMemDump, &amp;(PacketP-&gt;data[8]), 32);</div><div class='ctx'> 				}</div><div class='ctx'> 				rio_spin_lock_irqsave(&amp;UnixRupP-&gt;RupLock, flags);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -782,7 +782,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP)</div><div class='ctx'> 				/*</div><div class='ctx'> 				 ** Whammy! blat that pack!</div><div class='ctx'> 				 */</div><div class='del'>-				HostP-&gt;Copy((caddr_t) &amp; CmdBlkP-&gt;Packet, RIO_PTR(HostP-&gt;Caddr, UnixRupP-&gt;RupP-&gt;txpkt), sizeof(struct PKT));</div><div class='add'>+				HostP-&gt;Copy(&amp;CmdBlkP-&gt;Packet, RIO_PTR(HostP-&gt;Caddr, readw(&amp;UnixRupP-&gt;RupP-&gt;txpkt)), sizeof(struct PKT));</div><div class='ctx'> </div><div class='ctx'> 				/*</div><div class='ctx'> 				 ** remove the command from the rup command queue...</div><div class='hunk'>@@ -824,7 +824,7 @@ int RIOWFlushMark(unsigned long iPortP, struct CmdBlk *CmdBlkP)</div><div class='ctx'> int RIORFlushEnable(unsigned long iPortP, struct CmdBlk *CmdBlkP)</div><div class='ctx'> {</div><div class='ctx'> 	struct Port *PortP = (struct Port *) iPortP;</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	rio_spin_lock_irqsave(&amp;PortP-&gt;portSem, flags);</div><div class='head'>diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c<br/>index 75b2557c37ec..052e8120a471 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rioctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rioctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rioctrl.c</a></div><div class='hunk'>@@ -80,7 +80,7 @@ static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c	1.3";</div><div class='ctx'> static struct LpbReq LpbReq;</div><div class='ctx'> static struct RupReq RupReq;</div><div class='ctx'> static struct PortReq PortReq;</div><div class='del'>-static struct HostReq HostReq;</div><div class='add'>+static struct HostReq HostReq;	/* oh really?  global?  and no locking? */</div><div class='ctx'> static struct HostDpRam HostDpRam;</div><div class='ctx'> static struct DebugCtrl DebugCtrl;</div><div class='ctx'> static struct Map MapEnt;</div><div class='hunk'>@@ -126,12 +126,19 @@ static int</div><div class='ctx'> </div><div class='ctx'> #define drv_makedev(maj, min) ((((uint) maj &amp; 0xff) &lt;&lt; 8) | ((uint) min &amp; 0xff))</div><div class='ctx'> </div><div class='del'>-int riocontrol(p, dev, cmd, arg, su)</div><div class='del'>-struct rio_info *p;</div><div class='del'>-dev_t dev;</div><div class='del'>-int cmd;</div><div class='del'>-caddr_t arg;</div><div class='del'>-int su;</div><div class='add'>+static int copy_from_io(void __user *to, void __iomem *from, size_t size)</div><div class='add'>+{</div><div class='add'>+	void *buf = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	int res = -ENOMEM;</div><div class='add'>+	if (buf) {</div><div class='add'>+		rio_memcpy_fromio(buf, from, size);</div><div class='add'>+		res = copy_to_user(to, buf, size);</div><div class='add'>+		kfree(buf);</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int riocontrol(struct rio_info *p, dev_t dev, int cmd, unsigned long arg, int su)</div><div class='ctx'> {</div><div class='ctx'> 	uint Host;		/* leave me unsigned! */</div><div class='ctx'> 	uint port;		/* and me! */</div><div class='hunk'>@@ -139,9 +146,10 @@ int su;</div><div class='ctx'> 	ushort loop;</div><div class='ctx'> 	int Entry;</div><div class='ctx'> 	struct Port *PortP;</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='ctx'> 	func_enter();</div><div class='ctx'> </div><div class='hunk'>@@ -149,7 +157,7 @@ int su;</div><div class='ctx'> 	Host = 0;</div><div class='ctx'> 	PortP = NULL;</div><div class='ctx'> </div><div class='del'>-	rio_dprintk(RIO_DEBUG_CTRL, "control ioctl cmd: 0x%x arg: %p\n", cmd, arg);</div><div class='add'>+	rio_dprintk(RIO_DEBUG_CTRL, "control ioctl cmd: 0x%x arg: %p\n", cmd, argp);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -160,11 +168,11 @@ int su;</div><div class='ctx'> 		 ** otherwise just the specified host card will be changed.</div><div class='ctx'> 		 */</div><div class='ctx'> 	case RIO_SET_TIMER:</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_TIMER to %ldms\n", (unsigned long)arg);</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_TIMER to %ldms\n", arg);</div><div class='ctx'> 		{</div><div class='ctx'> 			int host, value;</div><div class='del'>-			host = ((unsigned long) arg &gt;&gt; 16) &amp; 0x0000FFFF;</div><div class='del'>-			value = (unsigned long) arg &amp; 0x0000ffff;</div><div class='add'>+			host = (arg &gt;&gt; 16) &amp; 0x0000FFFF;</div><div class='add'>+			value = arg &amp; 0x0000ffff;</div><div class='ctx'> 			if (host == -1) {</div><div class='ctx'> 				for (host = 0; host &lt; p-&gt;RIONumHosts; host++) {</div><div class='ctx'> 					if (p-&gt;RIOHosts[host].Flags == RC_RUNNING) {</div><div class='hunk'>@@ -183,26 +191,26 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_FOAD_RTA:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_FOAD_RTA\n");</div><div class='del'>-		return RIOCommandRta(p, (unsigned long)arg, RIOFoadRta);</div><div class='add'>+		return RIOCommandRta(p, arg, RIOFoadRta);</div><div class='ctx'> </div><div class='ctx'> 	case RIO_ZOMBIE_RTA:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_ZOMBIE_RTA\n");</div><div class='del'>-		return RIOCommandRta(p, (unsigned long)arg, RIOZombieRta);</div><div class='add'>+		return RIOCommandRta(p, arg, RIOZombieRta);</div><div class='ctx'> </div><div class='ctx'> 	case RIO_IDENTIFY_RTA:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_IDENTIFY_RTA\n");</div><div class='del'>-		return RIOIdentifyRta(p, arg);</div><div class='add'>+		return RIOIdentifyRta(p, argp);</div><div class='ctx'> </div><div class='ctx'> 	case RIO_KILL_NEIGHBOUR:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_KILL_NEIGHBOUR\n");</div><div class='del'>-		return RIOKillNeighbour(p, arg);</div><div class='add'>+		return RIOKillNeighbour(p, argp);</div><div class='ctx'> </div><div class='ctx'> 	case SPECIAL_RUP_CMD:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct CmdBlk *CmdBlkP;</div><div class='ctx'> </div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD\n");</div><div class='del'>-			if (copy_from_user(&amp;SpecialRupCmd, arg, sizeof(SpecialRupCmd))) {</div><div class='add'>+			if (copy_from_user(&amp;SpecialRupCmd, argp, sizeof(SpecialRupCmd))) {</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD copy failed\n");</div><div class='ctx'> 				p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 				return -EFAULT;</div><div class='hunk'>@@ -239,7 +247,7 @@ int su;</div><div class='ctx'> 		if ((retval = RIOApel(p)) != 0)</div><div class='ctx'> 			return retval;</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(arg, p-&gt;RIOConnectTable, TOTAL_MAP_ENTRIES * sizeof(struct Map))) {</div><div class='add'>+		if (copy_to_user(argp, p-&gt;RIOConnectTable, TOTAL_MAP_ENTRIES * sizeof(struct Map))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_TABLE copy failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -284,7 +292,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;p-&gt;RIOConnectTable[0], arg, TOTAL_MAP_ENTRIES * sizeof(struct Map))) {</div><div class='add'>+		if (copy_from_user(&amp;p-&gt;RIOConnectTable[0], argp, TOTAL_MAP_ENTRIES * sizeof(struct Map))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_TABLE copy failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -330,7 +338,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_to_user(arg, p-&gt;RIOBindTab, (sizeof(ulong) * MAX_RTA_BINDINGS))) {</div><div class='add'>+		if (copy_to_user(argp, p-&gt;RIOBindTab, (sizeof(ulong) * MAX_RTA_BINDINGS))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_BINDINGS copy failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -349,7 +357,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;p-&gt;RIOBindTab[0], arg, (sizeof(ulong) * MAX_RTA_BINDINGS))) {</div><div class='add'>+		if (copy_from_user(&amp;p-&gt;RIOBindTab[0], argp, (sizeof(ulong) * MAX_RTA_BINDINGS))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_BINDINGS copy failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -373,12 +381,12 @@ int su;</div><div class='ctx'> 			for (Entry = 0; Entry &lt; MAX_RTA_BINDINGS; Entry++) {</div><div class='ctx'> 				if ((EmptySlot == -1) &amp;&amp; (p-&gt;RIOBindTab[Entry] == 0L))</div><div class='ctx'> 					EmptySlot = Entry;</div><div class='del'>-				else if (p-&gt;RIOBindTab[Entry] == (long)arg) {</div><div class='add'>+				else if (p-&gt;RIOBindTab[Entry] == arg) {</div><div class='ctx'> 					/*</div><div class='ctx'> 					 ** Already exists - delete</div><div class='ctx'> 					 */</div><div class='ctx'> 					p-&gt;RIOBindTab[Entry] = 0L;</div><div class='del'>-					rio_dprintk(RIO_DEBUG_CTRL, "Removing Rta %ld from p-&gt;RIOBindTab\n", (unsigned long)arg);</div><div class='add'>+					rio_dprintk(RIO_DEBUG_CTRL, "Removing Rta %ld from p-&gt;RIOBindTab\n", arg);</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -386,10 +394,10 @@ int su;</div><div class='ctx'> 			 ** Dosen't exist - add</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (EmptySlot != -1) {</div><div class='del'>-				p-&gt;RIOBindTab[EmptySlot] = (unsigned long)arg;</div><div class='del'>-				rio_dprintk(RIO_DEBUG_CTRL, "Adding Rta %lx to p-&gt;RIOBindTab\n", (unsigned long) arg);</div><div class='add'>+				p-&gt;RIOBindTab[EmptySlot] = arg;</div><div class='add'>+				rio_dprintk(RIO_DEBUG_CTRL, "Adding Rta %lx to p-&gt;RIOBindTab\n", arg);</div><div class='ctx'> 			} else {</div><div class='del'>-				rio_dprintk(RIO_DEBUG_CTRL, "p-&gt;RIOBindTab full! - Rta %lx not added\n", (unsigned long) arg);</div><div class='add'>+				rio_dprintk(RIO_DEBUG_CTRL, "p-&gt;RIOBindTab full! - Rta %lx not added\n", arg);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -397,7 +405,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_RESUME:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME\n");</div><div class='del'>-		port = (unsigned long) arg;</div><div class='add'>+		port = arg;</div><div class='ctx'> 		if ((port &lt; 0) || (port &gt; 511)) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Bad port number %d\n", port);</div><div class='ctx'> 			p-&gt;RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;</div><div class='hunk'>@@ -433,7 +441,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;MapEnt, arg, sizeof(MapEnt))) {</div><div class='add'>+		if (copy_from_user(&amp;MapEnt, argp, sizeof(MapEnt))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -447,7 +455,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;MapEnt, arg, sizeof(MapEnt))) {</div><div class='add'>+		if (copy_from_user(&amp;MapEnt, argp, sizeof(MapEnt))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -461,7 +469,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;MapEnt, arg, sizeof(MapEnt))) {</div><div class='add'>+		if (copy_from_user(&amp;MapEnt, argp, sizeof(MapEnt))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "Copy from data space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -469,14 +477,14 @@ int su;</div><div class='ctx'> 		return RIODeleteRta(p, &amp;MapEnt);</div><div class='ctx'> </div><div class='ctx'> 	case RIO_QUICK_CHECK:</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;RIORtaDisCons, sizeof(unsigned int))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;RIORtaDisCons, sizeof(unsigned int))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_LAST_ERROR:</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;RIOError, sizeof(struct Error)))</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;RIOError, sizeof(struct Error)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -485,7 +493,7 @@ int su;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_GET_MODTYPE:</div><div class='del'>-		if (copy_from_user(&amp;port, arg, sizeof(unsigned int))) {</div><div class='add'>+		if (copy_from_user(&amp;port, argp, sizeof(unsigned int))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -505,7 +513,7 @@ int su;</div><div class='ctx'> 		 ** Return module type of port</div><div class='ctx'> 		 */</div><div class='ctx'> 		port = PortP-&gt;HostP-&gt;UnixRups[PortP-&gt;RupNum].ModTypes;</div><div class='del'>-		if (copy_to_user(arg, &amp;port, sizeof(unsigned int))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;port, sizeof(unsigned int))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -521,7 +529,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_SETUP_PORTS:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Setup ports\n");</div><div class='del'>-		if (copy_from_user(&amp;PortSetup, arg, sizeof(PortSetup))) {</div><div class='add'>+		if (copy_from_user(&amp;PortSetup, argp, sizeof(PortSetup))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "EFAULT");</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -551,7 +559,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_GET_PORT_SETUP:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Get port setup\n");</div><div class='del'>-		if (copy_from_user(&amp;PortSetup, arg, sizeof(PortSetup))) {</div><div class='add'>+		if (copy_from_user(&amp;PortSetup, argp, sizeof(PortSetup))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -572,7 +580,7 @@ int su;</div><div class='ctx'> 		PortSetup.XpOn[MAX_XP_CTRL_LEN - 1] = '\0';</div><div class='ctx'> 		PortSetup.XpOff[MAX_XP_CTRL_LEN - 1] = '\0';</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(arg, &amp;PortSetup, sizeof(PortSetup))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;PortSetup, sizeof(PortSetup))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -580,7 +588,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_GET_PORT_PARAMS:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Get port params\n");</div><div class='del'>-		if (copy_from_user(&amp;PortParams, arg, sizeof(struct PortParams))) {</div><div class='add'>+		if (copy_from_user(&amp;PortParams, argp, sizeof(struct PortParams))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -593,7 +601,7 @@ int su;</div><div class='ctx'> 		PortParams.State = PortP-&gt;State;</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortParams.Port);</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(arg, &amp;PortParams, sizeof(struct PortParams))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;PortParams, sizeof(struct PortParams))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -601,7 +609,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_GET_PORT_TTY:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Get port tty\n");</div><div class='del'>-		if (copy_from_user(&amp;PortTty, arg, sizeof(struct PortTty))) {</div><div class='add'>+		if (copy_from_user(&amp;PortTty, argp, sizeof(struct PortTty))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -612,14 +620,14 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortTty.port);</div><div class='ctx'> 		PortP = (p-&gt;RIOPortp[PortTty.port]);</div><div class='del'>-		if (copy_to_user(arg, &amp;PortTty, sizeof(struct PortTty))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;PortTty, sizeof(struct PortTty))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_SET_PORT_TTY:</div><div class='del'>-		if (copy_from_user(&amp;PortTty, arg, sizeof(struct PortTty))) {</div><div class='add'>+		if (copy_from_user(&amp;PortTty, argp, sizeof(struct PortTty))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -634,7 +642,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_SET_PORT_PARAMS:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Set port params\n");</div><div class='del'>-		if (copy_from_user(&amp;PortParams, arg, sizeof(PortParams))) {</div><div class='add'>+		if (copy_from_user(&amp;PortParams, argp, sizeof(PortParams))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -650,7 +658,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_GET_PORT_STATS:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_PORT_STATS\n");</div><div class='del'>-		if (copy_from_user(&amp;portStats, arg, sizeof(struct portStats))) {</div><div class='add'>+		if (copy_from_user(&amp;portStats, argp, sizeof(struct portStats))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -665,14 +673,14 @@ int su;</div><div class='ctx'> 		portStats.opens = PortP-&gt;opens;</div><div class='ctx'> 		portStats.closes = PortP-&gt;closes;</div><div class='ctx'> 		portStats.ioctls = PortP-&gt;ioctls;</div><div class='del'>-		if (copy_to_user(arg, &amp;portStats, sizeof(struct portStats))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;portStats, sizeof(struct portStats))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_RESET_PORT_STATS:</div><div class='del'>-		port = (unsigned long) arg;</div><div class='add'>+		port = arg;</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESET_PORT_STATS\n");</div><div class='ctx'> 		if (port &gt;= RIO_PORTS) {</div><div class='ctx'> 			p-&gt;RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;</div><div class='hunk'>@@ -690,7 +698,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_GATHER_PORT_STATS:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_GATHER_PORT_STATS\n");</div><div class='del'>-		if (copy_from_user(&amp;portStats, arg, sizeof(struct portStats))) {</div><div class='add'>+		if (copy_from_user(&amp;portStats, argp, sizeof(struct portStats))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -706,7 +714,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_READ_CONFIG:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_CONFIG\n");</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;RIOConf, sizeof(struct Conf))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;RIOConf, sizeof(struct Conf))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -718,7 +726,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;p-&gt;RIOConf, arg, sizeof(struct Conf))) {</div><div class='add'>+		if (copy_from_user(&amp;p-&gt;RIOConf, argp, sizeof(struct Conf))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -746,7 +754,7 @@ int su;</div><div class='ctx'> 	case RIO_SETDEBUG:</div><div class='ctx'> 	case RIO_GETDEBUG:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_SETDEBUG/RIO_GETDEBUG\n");</div><div class='del'>-		if (copy_from_user(&amp;DebugCtrl, arg, sizeof(DebugCtrl))) {</div><div class='add'>+		if (copy_from_user(&amp;DebugCtrl, argp, sizeof(DebugCtrl))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -763,7 +771,7 @@ int su;</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "Get global debug 0x%x wait 0x%x\n", p-&gt;rio_debug, p-&gt;RIODebugWait);</div><div class='ctx'> 				DebugCtrl.Debug = p-&gt;rio_debug;</div><div class='ctx'> 				DebugCtrl.Wait = p-&gt;RIODebugWait;</div><div class='del'>-				if (copy_to_user(arg, &amp;DebugCtrl, sizeof(DebugCtrl))) {</div><div class='add'>+				if (copy_to_user(argp, &amp;DebugCtrl, sizeof(DebugCtrl))) {</div><div class='ctx'> 					rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET/GET DEBUG: bad port number %d\n", DebugCtrl.SysPort);</div><div class='ctx'> 					p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 					return -EFAULT;</div><div class='hunk'>@@ -785,7 +793,7 @@ int su;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG 0x%x\n", p-&gt;RIOPortp[DebugCtrl.SysPort]-&gt;Debug);</div><div class='ctx'> 			DebugCtrl.Debug = p-&gt;RIOPortp[DebugCtrl.SysPort]-&gt;Debug;</div><div class='del'>-			if (copy_to_user(arg, &amp;DebugCtrl, sizeof(DebugCtrl))) {</div><div class='add'>+			if (copy_to_user(argp, &amp;DebugCtrl, sizeof(DebugCtrl))) {</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG: Bad copy to user space\n");</div><div class='ctx'> 				p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 				return -EFAULT;</div><div class='hunk'>@@ -800,7 +808,7 @@ int su;</div><div class='ctx'> 		 ** textual null terminated string.</div><div class='ctx'> 		 */</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID\n");</div><div class='del'>-		if (copy_to_user(arg, RIOVersid(), sizeof(struct rioVersion))) {</div><div class='add'>+		if (copy_to_user(argp, RIOVersid(), sizeof(struct rioVersion))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID: Bad copy to user space (host=%d)\n", Host);</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -813,7 +821,7 @@ int su;</div><div class='ctx'> 		 ** at init time.</div><div class='ctx'> 		 */</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS\n");</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;RIONumHosts, sizeof(p-&gt;RIONumHosts))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;RIONumHosts, sizeof(p-&gt;RIONumHosts))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS: Bad copy to user space\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -824,7 +832,7 @@ int su;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** Kill host. This may not be in the final version...</div><div class='ctx'> 		 */</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD %ld\n", (unsigned long) arg);</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD %ld\n", arg);</div><div class='ctx'> 		if (!su) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD: Not super user\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='hunk'>@@ -858,7 +866,7 @@ int su;</div><div class='ctx'> 			p-&gt;RIOError.Error = NOT_SUPER_USER;</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(&amp;DownLoad, arg, sizeof(DownLoad))) {</div><div class='add'>+		if (copy_from_user(&amp;DownLoad, argp, sizeof(DownLoad))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD: Copy in from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -888,7 +896,7 @@ int su;</div><div class='ctx'> 		{</div><div class='ctx'> 			unsigned int host;</div><div class='ctx'> </div><div class='del'>-			if (copy_from_user(&amp;host, arg, sizeof(host))) {</div><div class='add'>+			if (copy_from_user(&amp;host, argp, sizeof(host))) {</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n");</div><div class='ctx'> 				p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 				return -EFAULT;</div><div class='hunk'>@@ -897,7 +905,7 @@ int su;</div><div class='ctx'> 			 ** Fetch the parmmap</div><div class='ctx'> 			 */</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS\n");</div><div class='del'>-			if (copy_to_user(arg, p-&gt;RIOHosts[host].ParmMapP, sizeof(PARM_MAP))) {</div><div class='add'>+			if (copy_from_io(argp, p-&gt;RIOHosts[host].ParmMapP, sizeof(PARM_MAP))) {</div><div class='ctx'> 				p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS: Copy out to user space failed\n");</div><div class='ctx'> 				return -EFAULT;</div><div class='hunk'>@@ -907,7 +915,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_HOST_REQ:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ\n");</div><div class='del'>-		if (copy_from_user(&amp;HostReq, arg, sizeof(HostReq))) {</div><div class='add'>+		if (copy_from_user(&amp;HostReq, argp, sizeof(HostReq))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -928,7 +936,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_HOST_DPRAM:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Request for DPRAM\n");</div><div class='del'>-		if (copy_from_user(&amp;HostDpRam, arg, sizeof(HostDpRam))) {</div><div class='add'>+		if (copy_from_user(&amp;HostDpRam, argp, sizeof(HostDpRam))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Copy in from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -945,13 +953,13 @@ int su;</div><div class='ctx'> 			/* It's hardware like this that really gets on my tits. */</div><div class='ctx'> 			static unsigned char copy[sizeof(struct DpRam)];</div><div class='ctx'> 			for (off = 0; off &lt; sizeof(struct DpRam); off++)</div><div class='del'>-				copy[off] = readb(&amp;p-&gt;RIOHosts[HostDpRam.HostNum].Caddr[off]);</div><div class='add'>+				copy[off] = readb(p-&gt;RIOHosts[HostDpRam.HostNum].Caddr + off);</div><div class='ctx'> 			if (copy_to_user(HostDpRam.DpRamP, copy, sizeof(struct DpRam))) {</div><div class='ctx'> 				p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Bad copy to user space\n");</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='del'>-		} else if (copy_to_user(HostDpRam.DpRamP, p-&gt;RIOHosts[HostDpRam.HostNum].Caddr, sizeof(struct DpRam))) {</div><div class='add'>+		} else if (copy_from_io(HostDpRam.DpRamP, p-&gt;RIOHosts[HostDpRam.HostNum].Caddr, sizeof(struct DpRam))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Bad copy to user space\n");</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -960,13 +968,13 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_SET_BUSY:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY\n");</div><div class='del'>-		if ((unsigned long) arg &gt; 511) {</div><div class='del'>-			rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY: Bad port number %ld\n", (unsigned long) arg);</div><div class='add'>+		if (arg &gt; 511) {</div><div class='add'>+			rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY: Bad port number %ld\n", arg);</div><div class='ctx'> 			p-&gt;RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		rio_spin_lock_irqsave(&amp;PortP-&gt;portSem, flags);</div><div class='del'>-		p-&gt;RIOPortp[(unsigned long) arg]-&gt;State |= RIO_BUSY;</div><div class='add'>+		p-&gt;RIOPortp[arg]-&gt;State |= RIO_BUSY;</div><div class='ctx'> 		rio_spin_unlock_irqrestore(&amp;PortP-&gt;portSem, flags);</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -976,7 +984,7 @@ int su;</div><div class='ctx'> 		 ** (probably for debug reasons)</div><div class='ctx'> 		 */</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT\n");</div><div class='del'>-		if (copy_from_user(&amp;PortReq, arg, sizeof(PortReq))) {</div><div class='add'>+		if (copy_from_user(&amp;PortReq, argp, sizeof(PortReq))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT: Copy in from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1001,7 +1009,7 @@ int su;</div><div class='ctx'> 		 ** (probably for debug reasons)</div><div class='ctx'> 		 */</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP\n");</div><div class='del'>-		if (copy_from_user(&amp;RupReq, arg, sizeof(RupReq))) {</div><div class='add'>+		if (copy_from_user(&amp;RupReq, argp, sizeof(RupReq))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Copy in from user space failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1025,7 +1033,7 @@ int su;</div><div class='ctx'> 		}</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Request for rup %d from host %d\n", RupReq.RupNum, RupReq.HostNum);</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(HostP-&gt;UnixRups[RupReq.RupNum].RupP, RupReq.RupP, sizeof(struct RUP))) {</div><div class='add'>+		if (copy_from_io(RupReq.RupP, HostP-&gt;UnixRups[RupReq.RupNum].RupP, sizeof(struct RUP))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Bad copy to user space\n");</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1038,7 +1046,7 @@ int su;</div><div class='ctx'> 		 ** (probably for debug reasons)</div><div class='ctx'> 		 */</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB\n");</div><div class='del'>-		if (copy_from_user(&amp;LpbReq, arg, sizeof(LpbReq))) {</div><div class='add'>+		if (copy_from_user(&amp;LpbReq, argp, sizeof(LpbReq))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Bad copy from user space\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1062,7 +1070,7 @@ int su;</div><div class='ctx'> 		}</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Request for lpb %d from host %d\n", LpbReq.Link, LpbReq.Host);</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(LpbReq.LpbP, &amp;HostP-&gt;LinkStrP[LpbReq.Link], sizeof(struct LPB))) {</div><div class='add'>+		if (copy_from_io(LpbReq.LpbP, &amp;HostP-&gt;LinkStrP[LpbReq.Link], sizeof(struct LPB))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Bad copy to user space\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1136,7 +1144,7 @@ int su;</div><div class='ctx'> 	case RIO_MAP_B110_TO_110:</div><div class='ctx'> 	case RIO_MAP_B110_TO_115200:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping\n");</div><div class='del'>-		port = (unsigned long) arg;</div><div class='add'>+		port = arg;</div><div class='ctx'> 		if (port &lt; 0 || port &gt; 511) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping: Bad port number %d\n", port);</div><div class='ctx'> 			p-&gt;RIOError.Error = PORT_NUMBER_OUT_OF_RANGE;</div><div class='hunk'>@@ -1166,7 +1174,7 @@ int su;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_SEND_PACKET:</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET\n");</div><div class='del'>-		if (copy_from_user(&amp;SendPack, arg, sizeof(SendPack))) {</div><div class='add'>+		if (copy_from_user(&amp;SendPack, argp, sizeof(SendPack))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET: Bad copy from user space\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1210,7 +1218,7 @@ int su;</div><div class='ctx'> 		return su ? 0 : -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_WHAT_MESG:</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;RIONoMessage, sizeof(p-&gt;RIONoMessage))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;RIONoMessage, sizeof(p-&gt;RIONoMessage))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_WHAT_MESG: Bad copy to user space\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1218,7 +1226,7 @@ int su;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_MEM_DUMP:</div><div class='del'>-		if (copy_from_user(&amp;SubCmd, arg, sizeof(struct SubCmdStruct))) {</div><div class='add'>+		if (copy_from_user(&amp;SubCmd, argp, sizeof(struct SubCmdStruct))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1248,7 +1256,7 @@ int su;</div><div class='ctx'> 			PortP-&gt;State |= RIO_BUSY;</div><div class='ctx'> </div><div class='ctx'> 		rio_spin_unlock_irqrestore(&amp;PortP-&gt;portSem, flags);</div><div class='del'>-		if (copy_to_user(arg, p-&gt;RIOMemDump, MEMDUMP_SIZE)) {</div><div class='add'>+		if (copy_to_user(argp, p-&gt;RIOMemDump, MEMDUMP_SIZE)) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_MEM_DUMP copy failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1256,30 +1264,30 @@ int su;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_TICK:</div><div class='del'>-		if ((unsigned long) arg &gt;= p-&gt;RIONumHosts)</div><div class='add'>+		if (arg &gt;= p-&gt;RIONumHosts)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CTRL, "Set interrupt for host %ld\n", (unsigned long) arg);</div><div class='del'>-		writeb(0xFF, &amp;p-&gt;RIOHosts[(unsigned long) arg].SetInt);</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CTRL, "Set interrupt for host %ld\n", arg);</div><div class='add'>+		writeb(0xFF, &amp;p-&gt;RIOHosts[arg].SetInt);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_TOCK:</div><div class='del'>-		if ((unsigned long) arg &gt;= p-&gt;RIONumHosts)</div><div class='add'>+		if (arg &gt;= p-&gt;RIONumHosts)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		rio_dprintk(RIO_DEBUG_CTRL, "Clear interrupt for host %ld\n", (unsigned long) arg);</div><div class='del'>-		writeb(0xFF, &amp;p-&gt;RIOHosts[(unsigned long) arg].ResetInt);</div><div class='add'>+		rio_dprintk(RIO_DEBUG_CTRL, "Clear interrupt for host %ld\n", arg);</div><div class='add'>+		writeb(0xFF, &amp;p-&gt;RIOHosts[arg].ResetInt);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_READ_CHECK:</div><div class='ctx'> 		/* Check reads for pkts with data[0] the same */</div><div class='ctx'> 		p-&gt;RIOReadCheck = !p-&gt;RIOReadCheck;</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;RIOReadCheck, sizeof(unsigned int))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;RIOReadCheck, sizeof(unsigned int))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case RIO_READ_REGISTER:</div><div class='del'>-		if (copy_from_user(&amp;SubCmd, arg, sizeof(struct SubCmdStruct))) {</div><div class='add'>+		if (copy_from_user(&amp;SubCmd, argp, sizeof(struct SubCmdStruct))) {</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYIN_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1314,7 +1322,7 @@ int su;</div><div class='ctx'> 			PortP-&gt;State |= RIO_BUSY;</div><div class='ctx'> </div><div class='ctx'> 		rio_spin_unlock_irqrestore(&amp;PortP-&gt;portSem, flags);</div><div class='del'>-		if (copy_to_user(arg, &amp;p-&gt;CdRegister, sizeof(unsigned int))) {</div><div class='add'>+		if (copy_to_user(argp, &amp;p-&gt;CdRegister, sizeof(unsigned int))) {</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_REGISTER copy failed\n");</div><div class='ctx'> 			p-&gt;RIOError.Error = COPYOUT_FAILED;</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -1327,10 +1335,10 @@ int su;</div><div class='ctx'> 		 */</div><div class='ctx'> 	case RIO_MAKE_DEV:</div><div class='ctx'> 		{</div><div class='del'>-			unsigned int port = (unsigned long) arg &amp; RIO_MODEM_MASK;</div><div class='add'>+			unsigned int port = arg &amp; RIO_MODEM_MASK;</div><div class='ctx'> 			unsigned int ret;</div><div class='ctx'> </div><div class='del'>-			switch ((unsigned long) arg &amp; RIO_DEV_MASK) {</div><div class='add'>+			switch (arg &amp; RIO_DEV_MASK) {</div><div class='ctx'> 			case RIO_DEV_DIRECT:</div><div class='ctx'> 				ret = drv_makedev(MAJOR(dev), port);</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_CTRL, "Makedev direct 0x%x is 0x%x\n", port, ret);</div><div class='hunk'>@@ -1358,7 +1366,7 @@ int su;</div><div class='ctx'> 			int mino;</div><div class='ctx'> 			unsigned long ret;</div><div class='ctx'> </div><div class='del'>-			dv = (dev_t) ((unsigned long) arg);</div><div class='add'>+			dv = (dev_t) (arg);</div><div class='ctx'> 			mino = RIO_UNMODEM(dv);</div><div class='ctx'> </div><div class='ctx'> 			if (RIO_ISMODEM(dv)) {</div><div class='head'>diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c<br/>index 24d2992154cc..99f3df02b61c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rioinit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioinit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rioinit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rioinit.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> static char *_rioinit_c_sccs_ = "@(#)rioinit.c	1.3";</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -79,7 +78,7 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c	1.3";</div><div class='ctx'> </div><div class='ctx'> int RIOPCIinit(struct rio_info *p, int Mode);</div><div class='ctx'> </div><div class='del'>-static int RIOScrub(int, u8 *, int);</div><div class='add'>+static int RIOScrub(int, u8 __iomem *, int);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -92,10 +91,10 @@ static int RIOScrub(int, u8 *, int);</div><div class='ctx'> ** bits &gt; 0 indicates 16 bit operation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-int RIOAssignAT(struct rio_info *p, int	Base, caddr_t	virtAddr, int mode)</div><div class='add'>+int RIOAssignAT(struct rio_info *p, int	Base, void __iomem *virtAddr, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	int		bits;</div><div class='del'>-	struct DpRam *cardp = (struct DpRam *)virtAddr;</div><div class='add'>+	struct DpRam __iomem *cardp = (struct DpRam __iomem *)virtAddr;</div><div class='ctx'> </div><div class='ctx'> 	if ((Base &lt; ONE_MEG) || (mode &amp; BYTE_ACCESS_MODE))</div><div class='ctx'> 		bits = BYTE_OPERATION;</div><div class='hunk'>@@ -107,7 +106,7 @@ int RIOAssignAT(struct rio_info *p, int	Base, caddr_t	virtAddr, int mode)</div><div class='ctx'> 	** transient stuff.</div><div class='ctx'> 	*/</div><div class='ctx'> 	p-&gt;RIOHosts[p-&gt;RIONumHosts].Caddr	= virtAddr;</div><div class='del'>-	p-&gt;RIOHosts[p-&gt;RIONumHosts].CardP	= (struct DpRam *)virtAddr;</div><div class='add'>+	p-&gt;RIOHosts[p-&gt;RIONumHosts].CardP	= virtAddr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	** Revision 01 AT host cards don't support WORD operations,</div><div class='hunk'>@@ -151,10 +150,10 @@ static	u8	val[] = {</div><div class='ctx'> ** RAM test a board. </div><div class='ctx'> ** Nothing too complicated, just enough to check it out.</div><div class='ctx'> */</div><div class='del'>-int RIOBoardTest(unsigned long paddr, caddr_t	caddr, unsigned char type, int slot)</div><div class='add'>+int RIOBoardTest(unsigned long paddr, void __iomem *caddr, unsigned char type, int slot)</div><div class='ctx'> {</div><div class='del'>-	struct DpRam *DpRam = (struct DpRam *)caddr;</div><div class='del'>-	char *ram[4];</div><div class='add'>+	struct DpRam __iomem *DpRam = caddr;</div><div class='add'>+	void __iomem *ram[4];</div><div class='ctx'> 	int  size[4];</div><div class='ctx'> 	int  op, bank;</div><div class='ctx'> 	int  nbanks;</div><div class='hunk'>@@ -179,12 +178,12 @@ int RIOBoardTest(unsigned long paddr, caddr_t	caddr, unsigned char type, int slo</div><div class='ctx'> 	size[2] = DP_SRAM3_SIZE;</div><div class='ctx'> 	size[3] = DP_SCRATCH_SIZE;</div><div class='ctx'> </div><div class='del'>-	ram[0] = (char *)&amp;DpRam-&gt;DpSram1[0];</div><div class='del'>-	ram[1] = (char *)&amp;DpRam-&gt;DpSram2[0];</div><div class='del'>-	ram[2] = (char *)&amp;DpRam-&gt;DpSram3[0];</div><div class='add'>+	ram[0] = DpRam-&gt;DpSram1;</div><div class='add'>+	ram[1] = DpRam-&gt;DpSram2;</div><div class='add'>+	ram[2] = DpRam-&gt;DpSram3;</div><div class='ctx'> 	nbanks = (type == RIO_PCI) ? 3 : 4;</div><div class='ctx'> 	if (nbanks == 4)</div><div class='del'>-		ram[3] = (char *)&amp;DpRam-&gt;DpScratch[0];</div><div class='add'>+		ram[3] = DpRam-&gt;DpScratch;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (nbanks == 3) {</div><div class='hunk'>@@ -202,7 +201,7 @@ int RIOBoardTest(unsigned long paddr, caddr_t	caddr, unsigned char type, int slo</div><div class='ctx'> 	*/</div><div class='ctx'> 	for (op=0; op&lt;TEST_END; op++) {</div><div class='ctx'> 		for (bank=0; bank&lt;nbanks; bank++) {</div><div class='del'>-			if (RIOScrub(op, (u8 *)ram[bank], size[bank]) == RIO_FAIL) {</div><div class='add'>+			if (RIOScrub(op, ram[bank], size[bank]) == RIO_FAIL) {</div><div class='ctx'> 				rio_dprintk (RIO_DEBUG_INIT, "RIO-init: RIOScrub band %d, op %d failed\n", </div><div class='ctx'> 							bank, op);</div><div class='ctx'> 				return RIO_FAIL;</div><div class='hunk'>@@ -227,7 +226,7 @@ int RIOBoardTest(unsigned long paddr, caddr_t	caddr, unsigned char type, int slo</div><div class='ctx'> ** to check that the data from the previous phase was retained.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static int RIOScrub(int op, u8 *ram, int size)</div><div class='add'>+static int RIOScrub(int op, u8 __iomem *ram, int size)</div><div class='ctx'> {</div><div class='ctx'> 	int off;</div><div class='ctx'> 	unsigned char	oldbyte;</div><div class='hunk'>@@ -393,7 +392,7 @@ struct rioVersion *RIOVersid(void)</div><div class='ctx'>     return &amp;stVersion;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void RIOHostReset(unsigned int Type, struct DpRam *DpRamP, unsigned int Slot)</div><div class='add'>+void RIOHostReset(unsigned int Type, struct DpRam __iomem *DpRamP, unsigned int Slot)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	** Reset the Tpu</div><div class='head'>diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c<br/>index 97f0fa550652..0bd09040a5c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/riointr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riointr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/riointr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/riointr.c</a></div><div class='hunk'>@@ -102,7 +102,7 @@ void RIOTxEnable(char *en)</div><div class='ctx'> 	struct rio_info *p;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='ctx'> 	int c;</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	PortP = (struct Port *) en;</div><div class='hunk'>@@ -144,7 +144,7 @@ void RIOTxEnable(char *en)</div><div class='ctx'> 		if (c == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		rio_memcpy_toio(PortP-&gt;HostP-&gt;Caddr, (caddr_t) PacketP-&gt;data, PortP-&gt;gs.xmit_buf + PortP-&gt;gs.xmit_tail, c);</div><div class='add'>+		rio_memcpy_toio(PortP-&gt;HostP-&gt;Caddr, PacketP-&gt;data, PortP-&gt;gs.xmit_buf + PortP-&gt;gs.xmit_tail, c);</div><div class='ctx'> 		/*    udelay (1); */</div><div class='ctx'> </div><div class='ctx'> 		writeb(c, &amp;(PacketP-&gt;len));</div><div class='hunk'>@@ -219,7 +219,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From)</div><div class='ctx'> 		for (port = p-&gt;RIOFirstPortsBooted; port &lt; p-&gt;RIOLastPortsBooted + PORTS_PER_RTA; port++) {</div><div class='ctx'> 			struct Port *PortP = p-&gt;RIOPortp[port];</div><div class='ctx'> 			struct tty_struct *ttyP;</div><div class='del'>-			struct PKT *PacketP;</div><div class='add'>+			struct PKT __iomem *PacketP;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 ** not mapped in - most of the RIOPortp[] information</div><div class='hunk'>@@ -298,7 +298,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From)</div><div class='ctx'> 		for (port = p-&gt;RIOFirstPortsBooted; port &lt; p-&gt;RIOLastPortsBooted + PORTS_PER_RTA; port++) {</div><div class='ctx'> 			struct Port *PortP = p-&gt;RIOPortp[port];</div><div class='ctx'> 			struct tty_struct *ttyP;</div><div class='del'>-			struct PKT *PacketP;</div><div class='add'>+			struct PKT __iomem *PacketP;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 ** not mapped in - most of the RIOPortp[] information</div><div class='hunk'>@@ -427,13 +427,13 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From)</div><div class='ctx'> </div><div class='ctx'> 				while (PortP-&gt;WflushFlag &amp;&amp; can_add_transmit(&amp;PacketP, PortP) &amp;&amp; (PortP-&gt;InUse == NOT_INUSE)) {</div><div class='ctx'> 					int p;</div><div class='del'>-					struct PktCmd *PktCmdP;</div><div class='add'>+					struct PktCmd __iomem *PktCmdP;</div><div class='ctx'> </div><div class='ctx'> 					rio_dprintk(RIO_DEBUG_INTR, "Add WFLUSH marker to data queue\n");</div><div class='ctx'> 					/*</div><div class='ctx'> 					 ** make it look just like a WFLUSH command</div><div class='ctx'> 					 */</div><div class='del'>-					PktCmdP = (struct PktCmd *) &amp;PacketP-&gt;data[0];</div><div class='add'>+					PktCmdP = (struct PktCmd __iomem *) &amp;PacketP-&gt;data[0];</div><div class='ctx'> </div><div class='ctx'> 					writeb(WFLUSH, &amp;PktCmdP-&gt;Command);</div><div class='ctx'> </div><div class='hunk'>@@ -525,9 +525,9 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *TtyP;</div><div class='ctx'> 	unsigned short transCount;</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	register unsigned int DataCnt;</div><div class='del'>-	unsigned char *ptr;</div><div class='add'>+	unsigned char __iomem *ptr;</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> 	int copied = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -546,7 +546,7 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP)</div><div class='ctx'> 	 ** run out of space it will be set to the offset of the</div><div class='ctx'> 	 ** next byte to copy from the packet data area. The packet</div><div class='ctx'> 	 ** length field is decremented by the number of bytes that</div><div class='del'>-	 ** we succesfully removed from the packet. When this reaches</div><div class='add'>+	 ** we successfully removed from the packet. When this reaches</div><div class='ctx'> 	 ** zero, we reset the offset pointer to be zero, and free</div><div class='ctx'> 	 ** the packet from the front of the queue.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -585,19 +585,19 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 ** check that it is not a command!</div><div class='ctx'> 			 */</div><div class='del'>-			if (PacketP-&gt;len &amp; PKT_CMD_BIT) {</div><div class='add'>+			if (readb(&amp;PacketP-&gt;len) &amp; PKT_CMD_BIT) {</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_INTR, "RIO: unexpected command packet received on PHB\n");</div><div class='ctx'> 				/*      rio_dprint(RIO_DEBUG_INTR, (" sysport   = %d\n", p-&gt;RIOPortp-&gt;PortNum)); */</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " dest_unit = %d\n", PacketP-&gt;dest_unit);</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " dest_port = %d\n", PacketP-&gt;dest_port);</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " src_unit  = %d\n", PacketP-&gt;src_unit);</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " src_port  = %d\n", PacketP-&gt;src_port);</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " len	   = %d\n", PacketP-&gt;len);</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " control   = %d\n", PacketP-&gt;control);</div><div class='del'>-				rio_dprintk(RIO_DEBUG_INTR, " csum	   = %d\n", PacketP-&gt;csum);</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " dest_unit = %d\n", readb(&amp;PacketP-&gt;dest_unit));</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " dest_port = %d\n", readb(&amp;PacketP-&gt;dest_port));</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " src_unit  = %d\n", readb(&amp;PacketP-&gt;src_unit));</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " src_port  = %d\n", readb(&amp;PacketP-&gt;src_port));</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " len	   = %d\n", readb(&amp;PacketP-&gt;len));</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " control   = %d\n", readb(&amp;PacketP-&gt;control));</div><div class='add'>+				rio_dprintk(RIO_DEBUG_INTR, " csum	   = %d\n", readw(&amp;PacketP-&gt;csum));</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_INTR, "	 data bytes: ");</div><div class='ctx'> 				for (DataCnt = 0; DataCnt &lt; PKT_MAX_DATA_LEN; DataCnt++)</div><div class='del'>-					rio_dprintk(RIO_DEBUG_INTR, "%d\n", PacketP-&gt;data[DataCnt]);</div><div class='add'>+					rio_dprintk(RIO_DEBUG_INTR, "%d\n", readb(&amp;PacketP-&gt;data[DataCnt]));</div><div class='ctx'> 				remove_receive(PortP);</div><div class='ctx'> 				put_free_end(PortP-&gt;HostP, PacketP);</div><div class='ctx'> 				continue;	/* with next packet */</div><div class='hunk'>@@ -618,24 +618,24 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP)</div><div class='ctx'> 			 ** and available space.</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='del'>-			transCount = tty_buffer_request_room(TtyP, PacketP-&gt;len &amp; PKT_LEN_MASK);</div><div class='add'>+			transCount = tty_buffer_request_room(TtyP, readb(&amp;PacketP-&gt;len) &amp; PKT_LEN_MASK);</div><div class='ctx'> 			rio_dprintk(RIO_DEBUG_REC, "port %d: Copy %d bytes\n", PortP-&gt;PortNum, transCount);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 ** To use the following 'kkprintfs' for debugging - change the '#undef'</div><div class='ctx'> 			 ** to '#define', (this is the only place ___DEBUG_IT___ occurs in the</div><div class='ctx'> 			 ** driver).</div><div class='ctx'> 			 */</div><div class='del'>-			ptr = (unsigned char *) PacketP-&gt;data + PortP-&gt;RxDataStart;</div><div class='add'>+			ptr = (unsigned char __iomem *) PacketP-&gt;data + PortP-&gt;RxDataStart;</div><div class='ctx'> </div><div class='ctx'> 			tty_prepare_flip_string(TtyP, &amp;buf, transCount);</div><div class='ctx'> 			rio_memcpy_fromio(buf, ptr, transCount);</div><div class='ctx'> 			PortP-&gt;RxDataStart += transCount;</div><div class='del'>-			PacketP-&gt;len -= transCount;</div><div class='add'>+			writeb(readb(&amp;PacketP-&gt;len)-transCount, &amp;PacketP-&gt;len);</div><div class='ctx'> 			copied += transCount;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-			if (PacketP-&gt;len == 0) {</div><div class='add'>+			if (readb(&amp;PacketP-&gt;len) == 0) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 ** If we have emptied the packet, then we can</div><div class='ctx'> 				 ** free it, and reset the start pointer for</div><div class='head'>diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c<br/>index d2e8092cdb29..1066d9760704 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rioparam.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioparam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rioparam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rioparam.c</a></div><div class='hunk'>@@ -154,8 +154,8 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct *TtyP;</div><div class='ctx'> 	int retval;</div><div class='del'>-	struct phb_param *phb_param_ptr;</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct phb_param __iomem *phb_param_ptr;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	int res;</div><div class='ctx'> 	u8 Cor1 = 0, Cor2 = 0, Cor4 = 0, Cor5 = 0;</div><div class='ctx'> 	u8 TxXon = 0, TxXoff = 0, RxXon = 0, RxXoff = 0;</div><div class='hunk'>@@ -235,7 +235,7 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)</div><div class='ctx'> 	rio_dprintk(RIO_DEBUG_PARAM, "can_add_transmit() returns %x\n", res);</div><div class='ctx'> 	rio_dprintk(RIO_DEBUG_PARAM, "Packet is %p\n", PacketP);</div><div class='ctx'> </div><div class='del'>-	phb_param_ptr = (struct phb_param *) PacketP-&gt;data;</div><div class='add'>+	phb_param_ptr = (struct phb_param __iomem *) PacketP-&gt;data;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	switch (TtyP-&gt;termios-&gt;c_cflag &amp; CSIZE) {</div><div class='hunk'>@@ -580,11 +580,11 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)</div><div class='ctx'> ** We can add another packet to a transmit queue if the packet pointer pointed</div><div class='ctx'> ** to by the TxAdd pointer has PKT_IN_USE clear in its address.</div><div class='ctx'> */</div><div class='del'>-int can_add_transmit(struct PKT **PktP, struct Port *PortP)</div><div class='add'>+int can_add_transmit(struct PKT __iomem **PktP, struct Port *PortP)</div><div class='ctx'> {</div><div class='del'>-	struct PKT *tp;</div><div class='add'>+	struct PKT __iomem *tp;</div><div class='ctx'> </div><div class='del'>-	*PktP = tp = (struct PKT *) RIO_PTR(PortP-&gt;Caddr, readw(PortP-&gt;TxAdd));</div><div class='add'>+	*PktP = tp = (struct PKT __iomem *) RIO_PTR(PortP-&gt;Caddr, readw(PortP-&gt;TxAdd));</div><div class='ctx'> </div><div class='ctx'> 	return !((unsigned long) tp &amp; PKT_IN_USE);</div><div class='ctx'> }</div><div class='hunk'>@@ -608,9 +608,9 @@ void add_transmit(struct Port *PortP)</div><div class='ctx'>  * Put a packet onto the end of the</div><div class='ctx'>  * free list</div><div class='ctx'>  ****************************************/</div><div class='del'>-void put_free_end(struct Host *HostP, struct PKT *PktP)</div><div class='add'>+void put_free_end(struct Host *HostP, struct PKT __iomem *PktP)</div><div class='ctx'> {</div><div class='del'>-	struct rio_free_list *tmp_pointer;</div><div class='add'>+	struct rio_free_list __iomem *tmp_pointer;</div><div class='ctx'> 	unsigned short old_end, new_end;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -625,15 +625,15 @@ void put_free_end(struct Host *HostP, struct PKT *PktP)</div><div class='ctx'> </div><div class='ctx'> 	if ((old_end = readw(&amp;HostP-&gt;ParmMapP-&gt;free_list_end)) != TPNULL) {</div><div class='ctx'> 		new_end = RIO_OFF(HostP-&gt;Caddr, PktP);</div><div class='del'>-		tmp_pointer = (struct rio_free_list *) RIO_PTR(HostP-&gt;Caddr, old_end);</div><div class='add'>+		tmp_pointer = (struct rio_free_list __iomem *) RIO_PTR(HostP-&gt;Caddr, old_end);</div><div class='ctx'> 		writew(new_end, &amp;tmp_pointer-&gt;next);</div><div class='del'>-		writew(old_end, &amp;((struct rio_free_list *) PktP)-&gt;prev);</div><div class='del'>-		writew(TPNULL, &amp;((struct rio_free_list *) PktP)-&gt;next);</div><div class='add'>+		writew(old_end, &amp;((struct rio_free_list __iomem *) PktP)-&gt;prev);</div><div class='add'>+		writew(TPNULL, &amp;((struct rio_free_list __iomem *) PktP)-&gt;next);</div><div class='ctx'> 		writew(new_end, &amp;HostP-&gt;ParmMapP-&gt;free_list_end);</div><div class='ctx'> 	} else {		/* First packet on the free list this should never happen! */</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_PFE, "put_free_end(): This should never happen\n");</div><div class='ctx'> 		writew(RIO_OFF(HostP-&gt;Caddr, PktP), &amp;HostP-&gt;ParmMapP-&gt;free_list_end);</div><div class='del'>-		tmp_pointer = (struct rio_free_list *) PktP;</div><div class='add'>+		tmp_pointer = (struct rio_free_list __iomem *) PktP;</div><div class='ctx'> 		writew(TPNULL, &amp;tmp_pointer-&gt;prev);</div><div class='ctx'> 		writew(TPNULL, &amp;tmp_pointer-&gt;next);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -647,10 +647,10 @@ void put_free_end(struct Host *HostP, struct PKT *PktP)</div><div class='ctx'> ** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear,</div><div class='ctx'> ** then can_remove_receive() returns 0.</div><div class='ctx'> */</div><div class='del'>-int can_remove_receive(struct PKT **PktP, struct Port *PortP)</div><div class='add'>+int can_remove_receive(struct PKT __iomem **PktP, struct Port *PortP)</div><div class='ctx'> {</div><div class='ctx'> 	if (readw(PortP-&gt;RxRemove) &amp; PKT_IN_USE) {</div><div class='del'>-		*PktP = (struct PKT *) RIO_PTR(PortP-&gt;Caddr, readw(PortP-&gt;RxRemove) &amp; ~PKT_IN_USE);</div><div class='add'>+		*PktP = (struct PKT __iomem *) RIO_PTR(PortP-&gt;Caddr, readw(PortP-&gt;RxRemove) &amp; ~PKT_IN_USE);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c<br/>index 357085337942..a99f3d9d7d65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/rioroute.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/rioroute.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/rioroute.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/rioroute.c</a></div><div class='hunk'>@@ -86,9 +86,9 @@ static void RIOConCon(struct rio_info *, struct Host *, unsigned int, unsigned i</div><div class='ctx'> ** Incoming on the ROUTE_RUP</div><div class='ctx'> ** I wrote this while I was tired. Forgive me.</div><div class='ctx'> */</div><div class='del'>-int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT * PacketP)</div><div class='add'>+int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT __iomem * PacketP)</div><div class='ctx'> {</div><div class='del'>-	struct PktCmd *PktCmdP = (struct PktCmd *) PacketP-&gt;data;</div><div class='add'>+	struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *) PacketP-&gt;data;</div><div class='ctx'> 	struct PktCmd_M *PktReplyP;</div><div class='ctx'> 	struct CmdBlk *CmdBlkP;</div><div class='ctx'> 	struct Port *PortP;</div><div class='hunk'>@@ -307,7 +307,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct</div><div class='ctx'> 	if (!RIOBootOk(p, HostP, RtaUniq)) {</div><div class='ctx'> 		rio_dprintk(RIO_DEBUG_ROUTE, "RTA %x tried to get an ID, but does not belong - FOAD it!\n", RtaUniq);</div><div class='ctx'> 		PktReplyP-&gt;Command = ROUTE_FOAD;</div><div class='del'>-		HostP-&gt;Copy("RT_FOAD", PktReplyP-&gt;CommandText, 7);</div><div class='add'>+		memcpy(PktReplyP-&gt;CommandText, "RT_FOAD", 7);</div><div class='ctx'> 		RIOQueueCmdBlk(HostP, Rup, CmdBlkP);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,7 +341,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct</div><div class='ctx'> 					HostP-&gt;Mapping[ThisUnit].Flags |= MSG_DONE;</div><div class='ctx'> 				}</div><div class='ctx'> 				PktReplyP-&gt;Command = ROUTE_FOAD;</div><div class='del'>-				HostP-&gt;Copy("RT_FOAD", PktReplyP-&gt;CommandText, 7);</div><div class='add'>+				memcpy(PktReplyP-&gt;CommandText, "RT_FOAD", 7);</div><div class='ctx'> 				RIOQueueCmdBlk(HostP, Rup, CmdBlkP);</div><div class='ctx'> 				return 1;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -367,7 +367,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct</div><div class='ctx'> 				PktReplyP-&gt;IDNum2 = ROUTE_NO_ID;</div><div class='ctx'> 				rio_dprintk(RIO_DEBUG_ROUTE, "RTA '%s' has been allocated ID %d\n", HostP-&gt;Mapping[ThisUnit].Name, PktReplyP-&gt;IDNum);</div><div class='ctx'> 			}</div><div class='del'>-			HostP-&gt;Copy("RT_ALLOCAT", PktReplyP-&gt;CommandText, 10);</div><div class='add'>+			memcpy(PktReplyP-&gt;CommandText, "RT_ALLOCAT", 10);</div><div class='ctx'> </div><div class='ctx'> 			RIOQueueCmdBlk(HostP, Rup, CmdBlkP);</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +469,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		PktReplyP-&gt;Command = ROUTE_FOAD;</div><div class='del'>-		HostP-&gt;Copy("RT_FOAD", PktReplyP-&gt;CommandText, 7);</div><div class='add'>+		memcpy(PktReplyP-&gt;CommandText, "RT_FOAD", 7);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 ** we did boot it (as an extra), and there may now be a table</div><div class='hunk'>@@ -489,7 +489,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		PktReplyP-&gt;Command = ROUTE_USED;</div><div class='del'>-		HostP-&gt;Copy("RT_USED", PktReplyP-&gt;CommandText, 7);</div><div class='add'>+		memcpy(PktReplyP-&gt;CommandText, "RT_USED", 7);</div><div class='ctx'> 	}</div><div class='ctx'> 	RIOQueueCmdBlk(HostP, Rup, CmdBlkP);</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -517,8 +517,8 @@ void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit)</div><div class='ctx'> </div><div class='ctx'> 		for (port = 0; port &lt; PORTS_PER_RTA; port++, PortN++) {</div><div class='ctx'> 			unsigned short dest_port = port + 8;</div><div class='del'>-			u16 *TxPktP;</div><div class='del'>-			struct PKT *Pkt;</div><div class='add'>+			u16 __iomem *TxPktP;</div><div class='add'>+			struct PKT __iomem *Pkt;</div><div class='ctx'> </div><div class='ctx'> 			PortP = p-&gt;RIOPortp[PortN];</div><div class='ctx'> </div><div class='hunk'>@@ -555,12 +555,12 @@ void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit)</div><div class='ctx'> 				 ** card. This needs to be translated into a 32 bit pointer</div><div class='ctx'> 				 ** so it can be accessed from the driver.</div><div class='ctx'> 				 */</div><div class='del'>-				Pkt = (struct PKT *) RIO_PTR(HostP-&gt;Caddr, readw(TxPktP));</div><div class='add'>+				Pkt = (struct PKT __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(TxPktP));</div><div class='ctx'> </div><div class='ctx'> 				/*</div><div class='ctx'> 				 ** If the packet is used, reset it.</div><div class='ctx'> 				 */</div><div class='del'>-				Pkt = (struct PKT *) ((unsigned long) Pkt &amp; ~PKT_IN_USE);</div><div class='add'>+				Pkt = (struct PKT __iomem *) ((unsigned long) Pkt &amp; ~PKT_IN_USE);</div><div class='ctx'> 				writeb(dest_unit, &amp;Pkt-&gt;dest_unit);</div><div class='ctx'> 				writeb(dest_port, &amp;Pkt-&gt;dest_port);</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c<br/>index d3abe0d37d64..7e988357326e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/riotable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riotable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/riotable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/riotable.c</a></div><div class='hunk'>@@ -534,8 +534,8 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP)</div><div class='ctx'> 						if (PortP-&gt;SecondBlock) {</div><div class='ctx'> 							u16 dest_unit = HostMapP-&gt;ID;</div><div class='ctx'> 							u16 dest_port = port - SysPort;</div><div class='del'>-							u16 *TxPktP;</div><div class='del'>-							struct PKT *Pkt;</div><div class='add'>+							u16 __iomem *TxPktP;</div><div class='add'>+							struct PKT __iomem *Pkt;</div><div class='ctx'> </div><div class='ctx'> 							for (TxPktP = PortP-&gt;TxStart; TxPktP &lt;= PortP-&gt;TxEnd; TxPktP++) {</div><div class='ctx'> 								/*</div><div class='hunk'>@@ -545,12 +545,12 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP)</div><div class='ctx'> 								 ** a 32 bit pointer so it can be</div><div class='ctx'> 								 ** accessed from the driver.</div><div class='ctx'> 								 */</div><div class='del'>-								Pkt = (struct PKT *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;*TxPktP));</div><div class='del'>-								rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", *TxPktP, Pkt-&gt;dest_unit, Pkt-&gt;dest_port, dest_unit, dest_port);</div><div class='add'>+								Pkt = (struct PKT __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;*TxPktP));</div><div class='add'>+								rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", readw(TxPktP), readb(&amp;Pkt-&gt;dest_unit), readb(&amp;Pkt-&gt;dest_port), dest_unit, dest_port);</div><div class='ctx'> 								writew(dest_unit, &amp;Pkt-&gt;dest_unit);</div><div class='ctx'> 								writew(dest_port, &amp;Pkt-&gt;dest_port);</div><div class='ctx'> 							}</div><div class='del'>-							rio_dprintk(RIO_DEBUG_TABLE, "Port %d phb destination: Old %x:%x New %x:%x\n", port, PortP-&gt;PhbP-&gt;destination &amp; 0xff, (PortP-&gt;PhbP-&gt;destination &gt;&gt; 8) &amp; 0xff, dest_unit, dest_port);</div><div class='add'>+							rio_dprintk(RIO_DEBUG_TABLE, "Port %d phb destination: Old %x:%x New %x:%x\n", port, readb(&amp;PortP-&gt;PhbP-&gt;destination) &amp; 0xff, (readb(&amp;PortP-&gt;PhbP-&gt;destination) &gt;&gt; 8) &amp; 0xff, dest_unit, dest_port);</div><div class='ctx'> 							writew(dest_unit + (dest_port &lt;&lt; 8), &amp;PortP-&gt;PhbP-&gt;destination);</div><div class='ctx'> 						}</div><div class='ctx'> 						rio_spin_unlock_irqrestore(&amp;PortP-&gt;portSem, sem_flags);</div><div class='hunk'>@@ -781,13 +781,13 @@ int RIOReMapPorts(struct rio_info *p, struct Host *HostP, struct Map *HostMapP)</div><div class='ctx'> 		 ** unless the host has been booted</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((HostP-&gt;Flags &amp; RUN_STATE) == RC_RUNNING) {</div><div class='del'>-			struct PHB *PhbP = PortP-&gt;PhbP = &amp;HostP-&gt;PhbP[HostPort];</div><div class='del'>-			PortP-&gt;TxAdd = (u16 *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;tx_add));</div><div class='del'>-			PortP-&gt;TxStart = (u16 *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;tx_start));</div><div class='del'>-			PortP-&gt;TxEnd = (u16 *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;tx_end));</div><div class='del'>-			PortP-&gt;RxRemove = (u16 *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;rx_remove));</div><div class='del'>-			PortP-&gt;RxStart = (u16 *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;rx_start));</div><div class='del'>-			PortP-&gt;RxEnd = (u16 *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;rx_end));</div><div class='add'>+			struct PHB __iomem *PhbP = PortP-&gt;PhbP = &amp;HostP-&gt;PhbP[HostPort];</div><div class='add'>+			PortP-&gt;TxAdd = (u16 __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;tx_add));</div><div class='add'>+			PortP-&gt;TxStart = (u16 __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;tx_start));</div><div class='add'>+			PortP-&gt;TxEnd = (u16 __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;tx_end));</div><div class='add'>+			PortP-&gt;RxRemove = (u16 __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;rx_remove));</div><div class='add'>+			PortP-&gt;RxStart = (u16 __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;rx_start));</div><div class='add'>+			PortP-&gt;RxEnd = (u16 __iomem *) RIO_PTR(HostP-&gt;Caddr, readw(&amp;PhbP-&gt;rx_end));</div><div class='ctx'> 		} else</div><div class='ctx'> 			PortP-&gt;PhbP = NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c<br/>index 204267613c9c..a4f0b1e3e7fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/riotty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/riotty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/riotty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/riotty.c</a></div><div class='hunk'>@@ -576,7 +576,7 @@ static void RIOClearUp(struct Port *PortP)</div><div class='ctx'> */</div><div class='ctx'> int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg)</div><div class='ctx'> {</div><div class='del'>-	struct PKT *PacketP;</div><div class='add'>+	struct PKT __iomem *PacketP;</div><div class='ctx'> 	int retries = 20;	/* at 10 per second -&gt; 2 seconds */</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/rio/unixrup.h b/drivers/char/rio/unixrup.h<br/>index 4306e01dbf01..46bd532f7746 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rio/unixrup.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rio/unixrup.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rio/unixrup.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rio/unixrup.h</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static char *_unixrup_h_sccs_ = "@(#)unixrup.h	1.2";</div><div class='ctx'> struct UnixRup {</div><div class='ctx'> 	struct CmdBlk *CmdsWaitingP;	/* Commands waiting to be done */</div><div class='ctx'> 	struct CmdBlk *CmdPendingP;	/* The command currently being sent */</div><div class='del'>-	struct RUP *RupP;	/* the Rup to send it to */</div><div class='add'>+	struct RUP __iomem *RupP;	/* the Rup to send it to */</div><div class='ctx'> 	unsigned int Id;		/* Id number */</div><div class='ctx'> 	unsigned int BaseSysPort;	/* SysPort of first tty on this RTA */</div><div class='ctx'> 	unsigned int ModTypes;		/* Modules on this RTA */</div><div class='head'>diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c<br/>index 657c0d88f48c..f1c94f771af5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/riscom8.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/riscom8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/riscom8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/riscom8.c</a></div><div class='hunk'>@@ -625,7 +625,7 @@ static inline int rc_setup_board(struct riscom_board * bp)</div><div class='ctx'> 	if (bp-&gt;flags &amp; RC_BOARD_ACTIVE) </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	</div><div class='del'>-	error = request_irq(bp-&gt;irq, rc_interrupt, SA_INTERRUPT,</div><div class='add'>+	error = request_irq(bp-&gt;irq, rc_interrupt, IRQF_DISABLED,</div><div class='ctx'> 			    "RISCom/8", NULL);</div><div class='ctx'> 	if (error) </div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -1634,7 +1634,6 @@ static inline int rc_init_drivers(void)</div><div class='ctx'> 	memset(IRQ_to_board, 0, sizeof(IRQ_to_board));</div><div class='ctx'> 	riscom_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	riscom_driver-&gt;name = "ttyL";</div><div class='del'>-	riscom_driver-&gt;devfs_name = "tts/L";</div><div class='ctx'> 	riscom_driver-&gt;major = RISCOM8_NORMAL_MAJOR;</div><div class='ctx'> 	riscom_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='ctx'> 	riscom_driver-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='head'>diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c<br/>index 7edc6a4dbdc4..0ac131881322 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rocket.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rocket.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rocket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rocket.c</a></div><div class='hunk'>@@ -324,35 +324,15 @@ static void rp_do_receive(struct r_port *info,</div><div class='ctx'> 			  CHANNEL_t * cp, unsigned int ChanStatus)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int CharNStat;</div><div class='del'>-	int ToRecv, wRecv, space = 0, count;</div><div class='del'>-	unsigned char *cbuf, *chead;</div><div class='del'>-	char *fbuf, *fhead;</div><div class='del'>-	struct tty_ldisc *ld;</div><div class='del'>-</div><div class='del'>-	ld = tty_ldisc_ref(tty);</div><div class='add'>+	int ToRecv, wRecv, space;</div><div class='add'>+	unsigned char *cbuf;</div><div class='ctx'> </div><div class='ctx'> 	ToRecv = sGetRxCnt(cp);</div><div class='del'>-	space = tty-&gt;receive_room;</div><div class='del'>-	if (space &gt; 2 * TTY_FLIPBUF_SIZE)</div><div class='del'>-		space = 2 * TTY_FLIPBUF_SIZE;</div><div class='del'>-	count = 0;</div><div class='ctx'> #ifdef ROCKET_DEBUG_INTR</div><div class='del'>-	printk(KERN_INFO "rp_do_receive(%d, %d)...", ToRecv, space);</div><div class='add'>+	printk(KERN_INFO "rp_do_receive(%d)...", ToRecv);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * determine how many we can actually read in.  If we can't</div><div class='del'>-	 * read any in then we have a software overrun condition.</div><div class='del'>-	 */</div><div class='del'>-	if (ToRecv &gt; space)</div><div class='del'>-		ToRecv = space;</div><div class='del'>-</div><div class='del'>-	ToRecv = tty_prepare_flip_string_flags(tty, &amp;chead, &amp;fhead, ToRecv);</div><div class='del'>-	if (ToRecv &lt;= 0)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	cbuf = chead;</div><div class='del'>-	fbuf = fhead;</div><div class='add'>+	if (ToRecv == 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if status indicates there are errored characters in the</div><div class='hunk'>@@ -380,6 +360,8 @@ static void rp_do_receive(struct r_port *info,</div><div class='ctx'> 		       info-&gt;read_status_mask);</div><div class='ctx'> #endif</div><div class='ctx'> 		while (ToRecv) {</div><div class='add'>+			char flag;</div><div class='add'>+</div><div class='ctx'> 			CharNStat = sInW(sGetTxRxDataIO(cp));</div><div class='ctx'> #ifdef ROCKET_DEBUG_RECEIVE</div><div class='ctx'> 			printk(KERN_INFO "%x...", CharNStat);</div><div class='hunk'>@@ -392,17 +374,16 @@ static void rp_do_receive(struct r_port *info,</div><div class='ctx'> 			}</div><div class='ctx'> 			CharNStat &amp;= info-&gt;read_status_mask;</div><div class='ctx'> 			if (CharNStat &amp; STMBREAKH)</div><div class='del'>-				*fbuf++ = TTY_BREAK;</div><div class='add'>+				flag = TTY_BREAK;</div><div class='ctx'> 			else if (CharNStat &amp; STMPARITYH)</div><div class='del'>-				*fbuf++ = TTY_PARITY;</div><div class='add'>+				flag = TTY_PARITY;</div><div class='ctx'> 			else if (CharNStat &amp; STMFRAMEH)</div><div class='del'>-				*fbuf++ = TTY_FRAME;</div><div class='add'>+				flag = TTY_FRAME;</div><div class='ctx'> 			else if (CharNStat &amp; STMRCVROVRH)</div><div class='del'>-				*fbuf++ = TTY_OVERRUN;</div><div class='add'>+				flag = TTY_OVERRUN;</div><div class='ctx'> 			else</div><div class='del'>-				*fbuf++ = TTY_NORMAL;</div><div class='del'>-			*cbuf++ = CharNStat &amp; 0xff;</div><div class='del'>-			count++;</div><div class='add'>+				flag = TTY_NORMAL;</div><div class='add'>+			tty_insert_flip_char(tty, CharNStat &amp; 0xff, flag);</div><div class='ctx'> 			ToRecv--;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -422,20 +403,23 @@ static void rp_do_receive(struct r_port *info,</div><div class='ctx'> 		 * characters at time by doing repeated word IO</div><div class='ctx'> 		 * transfer.</div><div class='ctx'> 		 */</div><div class='add'>+		space = tty_prepare_flip_string(tty, &amp;cbuf, ToRecv);</div><div class='add'>+		if (space &lt; ToRecv) {</div><div class='add'>+#ifdef ROCKET_DEBUG_RECEIVE</div><div class='add'>+			printk(KERN_INFO "rp_do_receive:insufficient space ToRecv=%d space=%d\n", ToRecv, space);</div><div class='add'>+#endif</div><div class='add'>+			if (space &lt;= 0)</div><div class='add'>+				return;</div><div class='add'>+			ToRecv = space;</div><div class='add'>+		}</div><div class='ctx'> 		wRecv = ToRecv &gt;&gt; 1;</div><div class='ctx'> 		if (wRecv)</div><div class='ctx'> 			sInStrW(sGetTxRxDataIO(cp), (unsigned short *) cbuf, wRecv);</div><div class='ctx'> 		if (ToRecv &amp; 1)</div><div class='ctx'> 			cbuf[ToRecv - 1] = sInB(sGetTxRxDataIO(cp));</div><div class='del'>-		memset(fbuf, TTY_NORMAL, ToRecv);</div><div class='del'>-		cbuf += ToRecv;</div><div class='del'>-		fbuf += ToRecv;</div><div class='del'>-		count += ToRecv;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*  Push the data up to the tty layer */</div><div class='del'>-	ld-&gt;receive_buf(tty, chead, fhead, count);</div><div class='del'>-done:</div><div class='del'>-	tty_ldisc_deref(ld);</div><div class='add'>+	tty_flip_buffer_push(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2442,8 +2426,7 @@ static int __init rp_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	rocket_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	rocket_driver-&gt;flags = TTY_DRIVER_NO_DEVFS;</div><div class='del'>-	rocket_driver-&gt;devfs_name = "tts/R";</div><div class='add'>+	rocket_driver-&gt;flags = TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	rocket_driver-&gt;name = "ttyR";</div><div class='ctx'> 	rocket_driver-&gt;driver_name = "Comtrol RocketPort";</div><div class='ctx'> 	rocket_driver-&gt;major = TTY_ROCKET_MAJOR;</div><div class='hunk'>@@ -2454,7 +2437,7 @@ static int __init rp_init(void)</div><div class='ctx'> 	rocket_driver-&gt;init_termios.c_cflag =</div><div class='ctx'> 	    B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='ctx'> #ifdef ROCKET_SOFT_FLOW</div><div class='del'>-	rocket_driver-&gt;flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	rocket_driver-&gt;flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> #endif</div><div class='ctx'> 	tty_set_operations(rocket_driver, &amp;rocket_ops);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c<br/>index 7cac6d05d723..6e6a7c7a7eff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/rtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/rtc.c</a></div><div class='hunk'>@@ -46,13 +46,12 @@</div><div class='ctx'>  *      1.11a   Daniele Bellucci: Audit create_proc_read_entry in rtc_init</div><div class='ctx'>  *	1.12	Venkatesh Pallipadi: Hooks for emulating rtc on HPET base-timer</div><div class='ctx'>  *		CONFIG_HPET_EMULATE_RTC</div><div class='add'>+ *	1.12a	Maciej W. Rozycki: Handle memory-mapped chips properly.</div><div class='ctx'>  *	1.12ac	Alan Cox: Allow read access to the day of week register</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define RTC_VERSION		"1.12ac"</div><div class='ctx'> </div><div class='del'>-#define RTC_IO_EXTENT	0x8</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Note that *all* calls to CMOS_READ and CMOS_WRITE are done with</div><div class='ctx'>  *	interrupts disabled. Due to the index-port/data-port (0x70/0x71)</div><div class='hunk'>@@ -61,7 +60,6 @@</div><div class='ctx'>  *	this driver.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -221,7 +219,7 @@ static inline unsigned char rtc_is_updating(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef RTC_IRQ</div><div class='ctx'> /*</div><div class='del'>- *	A very tiny interrupt handler. It runs with SA_INTERRUPT set,</div><div class='add'>+ *	A very tiny interrupt handler. It runs with IRQF_DISABLED set,</div><div class='ctx'>  *	but there is possibility of conflicting with the set_rtc_mmss()</div><div class='ctx'>  *	call (the rtc irq and the timer irq can easily run at the same</div><div class='ctx'>  *	time in two different CPUs). So we need to serialize</div><div class='hunk'>@@ -338,7 +336,15 @@ static ssize_t rtc_read(struct file *file, char __user *buf,</div><div class='ctx'> 	if (rtc_has_irq == 0)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (count &lt; sizeof(unsigned))</div><div class='add'>+	/*</div><div class='add'>+	 * Historically this function used to assume that sizeof(unsigned long)</div><div class='add'>+	 * is the same in userspace and kernelspace.  This lead to problems</div><div class='add'>+	 * for configurations with multiple ABIs such a the MIPS o32 and 64</div><div class='add'>+	 * ABIs supported on the same kernel.  So now we support read of both</div><div class='add'>+	 * 4 and 8 bytes and assume that's the sizeof(unsigned long) in the</div><div class='add'>+	 * userspace ABI.</div><div class='add'>+	 */</div><div class='add'>+	if (count != sizeof(unsigned int) &amp;&amp; count !=  sizeof(unsigned long))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(&amp;rtc_wait, &amp;wait);</div><div class='hunk'>@@ -369,10 +375,12 @@ static ssize_t rtc_read(struct file *file, char __user *buf,</div><div class='ctx'> 		schedule();</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='del'>-	if (count &lt; sizeof(unsigned long))</div><div class='del'>-		retval = put_user(data, (unsigned int __user *)buf) ?: sizeof(int); </div><div class='add'>+	if (count == sizeof(unsigned int))</div><div class='add'>+		retval = put_user(data, (unsigned int __user *)buf) ?: sizeof(int);</div><div class='ctx'> 	else</div><div class='ctx'> 		retval = put_user(data, (unsigned long __user *)buf) ?: sizeof(long);</div><div class='add'>+	if (!retval)</div><div class='add'>+		retval = count;</div><div class='ctx'>  out:</div><div class='ctx'> 	current-&gt;state = TASK_RUNNING;</div><div class='ctx'> 	remove_wait_queue(&amp;rtc_wait, &amp;wait);</div><div class='hunk'>@@ -878,7 +886,7 @@ int rtc_control(rtc_task_t *task, unsigned int cmd, unsigned long arg)</div><div class='ctx'>  *	The various file operations we support.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations rtc_fops = {</div><div class='add'>+static const struct file_operations rtc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= rtc_read,</div><div class='hunk'>@@ -897,7 +905,7 @@ static struct miscdevice rtc_dev = {</div><div class='ctx'> 	.fops		= &amp;rtc_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations rtc_proc_fops = {</div><div class='add'>+static const struct file_operations rtc_proc_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.open = rtc_proc_open,</div><div class='ctx'> 	.read  = seq_read,</div><div class='hunk'>@@ -924,11 +932,14 @@ static int __init rtc_init(void)</div><div class='ctx'> 	struct sparc_isa_device *isa_dev;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='add'>+#ifndef __sparc__</div><div class='add'>+	void *r;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef __sparc__</div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if(strcmp(edev-&gt;prom_name, "rtc") == 0) {</div><div class='add'>+			if(strcmp(edev-&gt;prom_node-&gt;name, "rtc") == 0) {</div><div class='ctx'> 				rtc_port = edev-&gt;resource[0].start;</div><div class='ctx'> 				rtc_irq = edev-&gt;irqs[0];</div><div class='ctx'> 				goto found;</div><div class='hunk'>@@ -938,7 +949,7 @@ static int __init rtc_init(void)</div><div class='ctx'> #ifdef __sparc_v9__</div><div class='ctx'> 	for_each_isa(isa_br) {</div><div class='ctx'> 		for_each_isadev(isa_dev, isa_br) {</div><div class='del'>-			if (strcmp(isa_dev-&gt;prom_name, "rtc") == 0) {</div><div class='add'>+			if (strcmp(isa_dev-&gt;prom_node-&gt;name, "rtc") == 0) {</div><div class='ctx'> 				rtc_port = isa_dev-&gt;resource.start;</div><div class='ctx'> 				rtc_irq = isa_dev-&gt;irq;</div><div class='ctx'> 				goto found;</div><div class='hunk'>@@ -959,18 +970,19 @@ found:</div><div class='ctx'> 	 * XXX Interrupt pin #7 in Espresso is shared between RTC and</div><div class='ctx'> 	 * PCI Slot 2 INTA# (and some INTx# in Slot 1).</div><div class='ctx'> 	 */</div><div class='del'>-	if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&amp;rtc_port)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Standard way for sparc to print irq's is to use</div><div class='del'>-		 * __irq_itoa(). I think for EBus it's ok to use %d.</div><div class='del'>-		 */</div><div class='add'>+	if (request_irq(rtc_irq, rtc_interrupt, IRQF_SHARED, "rtc", (void *)&amp;rtc_port)) {</div><div class='ctx'> 		printk(KERN_ERR "rtc: cannot register IRQ %d\n", rtc_irq);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> no_irq:</div><div class='ctx'> #else</div><div class='del'>-	if (!request_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc")) {</div><div class='del'>-		printk(KERN_ERR "rtc: I/O port %d is not free.\n", RTC_PORT (0));</div><div class='add'>+	if (RTC_IOMAPPED)</div><div class='add'>+		r = request_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc");</div><div class='add'>+	else</div><div class='add'>+		r = request_mem_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc");</div><div class='add'>+	if (!r) {</div><div class='add'>+		printk(KERN_ERR "rtc: I/O resource %lx is not free.\n",</div><div class='add'>+		       (long)(RTC_PORT(0)));</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -981,10 +993,13 @@ no_irq:</div><div class='ctx'> 		rtc_int_handler_ptr = rtc_interrupt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(request_irq(RTC_IRQ, rtc_int_handler_ptr, SA_INTERRUPT, "rtc", NULL)) {</div><div class='add'>+	if(request_irq(RTC_IRQ, rtc_int_handler_ptr, IRQF_DISABLED, "rtc", NULL)) {</div><div class='ctx'> 		/* Yeah right, seeing as irq 8 doesn't even hit the bus. */</div><div class='ctx'> 		printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ);</div><div class='del'>-		release_region(RTC_PORT(0), RTC_IO_EXTENT);</div><div class='add'>+		if (RTC_IOMAPPED)</div><div class='add'>+			release_region(RTC_PORT(0), RTC_IO_EXTENT);</div><div class='add'>+		else</div><div class='add'>+			release_mem_region(RTC_PORT(0), RTC_IO_EXTENT);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	hpet_rtc_timer_init();</div><div class='hunk'>@@ -1084,7 +1099,10 @@ static void __exit rtc_exit (void)</div><div class='ctx'> 	if (rtc_has_irq)</div><div class='ctx'> 		free_irq (rtc_irq, &amp;rtc_port);</div><div class='ctx'> #else</div><div class='del'>-	release_region (RTC_PORT (0), RTC_IO_EXTENT);</div><div class='add'>+	if (RTC_IOMAPPED)</div><div class='add'>+		release_region(RTC_PORT(0), RTC_IO_EXTENT);</div><div class='add'>+	else</div><div class='add'>+		release_mem_region(RTC_PORT(0), RTC_IO_EXTENT);</div><div class='ctx'> #ifdef RTC_IRQ</div><div class='ctx'> 	if (rtc_has_irq)</div><div class='ctx'> 		free_irq (RTC_IRQ, NULL);</div><div class='hunk'>@@ -1227,7 +1245,7 @@ static int rtc_proc_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> void rtc_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='ctx'> {</div><div class='del'>-	unsigned long uip_watchdog = jiffies;</div><div class='add'>+	unsigned long uip_watchdog = jiffies, flags;</div><div class='ctx'> 	unsigned char ctrl;</div><div class='ctx'> #ifdef CONFIG_MACH_DECSTATION</div><div class='ctx'> 	unsigned int real_year;</div><div class='hunk'>@@ -1254,7 +1272,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='ctx'> 	 * RTC has RTC_DAY_OF_WEEK, we should usually ignore it, as it is</div><div class='ctx'> 	 * only updated by the RTC when initially set to a non-zero value.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irq(&amp;rtc_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;rtc_lock, flags);</div><div class='ctx'> 	rtc_tm-&gt;tm_sec = CMOS_READ(RTC_SECONDS);</div><div class='ctx'> 	rtc_tm-&gt;tm_min = CMOS_READ(RTC_MINUTES);</div><div class='ctx'> 	rtc_tm-&gt;tm_hour = CMOS_READ(RTC_HOURS);</div><div class='hunk'>@@ -1268,7 +1286,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)</div><div class='ctx'> 	real_year = CMOS_READ(RTC_DEC_YEAR);</div><div class='ctx'> #endif</div><div class='ctx'> 	ctrl = CMOS_READ(RTC_CONTROL);</div><div class='del'>-	spin_unlock_irq(&amp;rtc_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!(ctrl &amp; RTC_DM_BINARY) || RTC_ALWAYS_BCD)</div><div class='ctx'> 	{</div><div class='head'>diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c<br/>index b0038b19b505..5458ef1634e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/s3c2410-rtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/s3c2410-rtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/s3c2410-rtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/s3c2410-rtc.c</a></div><div class='hunk'>@@ -341,13 +341,13 @@ static int s3c2410_rtc_open(void)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(s3c2410_rtc_alarmno, s3c2410_rtc_alarmirq,</div><div class='del'>-			  SA_INTERRUPT,  "s3c2410-rtc alarm", NULL);</div><div class='add'>+			  IRQF_DISABLED,  "s3c2410-rtc alarm", NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk(KERN_ERR "IRQ%d already in use\n", s3c2410_rtc_alarmno);</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(s3c2410_rtc_tickno, s3c2410_rtc_tickirq,</div><div class='del'>-			  SA_INTERRUPT,  "s3c2410-rtc tick", NULL);</div><div class='add'>+			  IRQF_DISABLED,  "s3c2410-rtc tick", NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "IRQ%d already in use\n", s3c2410_rtc_tickno);</div><div class='head'>diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c<br/>index 664a6e97eb1a..b956c7babd18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/scx200_gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/scx200_gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/scx200_gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/scx200_gpio.c</a></div><div class='hunk'>@@ -1,96 +1,57 @@</div><div class='del'>-/* linux/drivers/char/scx200_gpio.c </div><div class='add'>+/* linux/drivers/char/scx200_gpio.c</div><div class='ctx'> </div><div class='ctx'>    National Semiconductor SCx200 GPIO driver.  Allows a user space</div><div class='ctx'>    process to play with the GPIO pins.</div><div class='ctx'> </div><div class='ctx'>    Copyright (c) 2001,2002 Christer Weinigel &lt;wingel@nano-system.com&gt; */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/scx200_gpio.h&gt;</div><div class='add'>+#include &lt;linux/nsc_gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRVNAME "scx200_gpio"</div><div class='ctx'> </div><div class='del'>-#define NAME "scx200_gpio"</div><div class='add'>+static struct platform_device *pdev;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Christer Weinigel &lt;wingel@nano-system.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("NatSemi SCx200 GPIO Pin Driver");</div><div class='add'>+MODULE_DESCRIPTION("NatSemi/AMD SCx200 GPIO Pin Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int major = 0;		/* default to dynamic major */</div><div class='ctx'> module_param(major, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(major, "Major device number");</div><div class='ctx'> </div><div class='del'>-static ssize_t scx200_gpio_write(struct file *file, const char __user *data, </div><div class='del'>-				 size_t len, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	unsigned m = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='del'>-	size_t i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; ++i) {</div><div class='del'>-		char c;</div><div class='del'>-		if (get_user(c, data+i))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		switch (c)</div><div class='del'>-		{</div><div class='del'>-		case '0': </div><div class='del'>-			scx200_gpio_set(m, 0); </div><div class='del'>-			break;</div><div class='del'>-		case '1': </div><div class='del'>-			scx200_gpio_set(m, 1); </div><div class='del'>-			break;</div><div class='del'>-		case 'O':</div><div class='del'>-			printk(KERN_INFO NAME ": GPIO%d output enabled\n", m);</div><div class='del'>-			scx200_gpio_configure(m, ~1, 1);</div><div class='del'>-			break;</div><div class='del'>-		case 'o':</div><div class='del'>-			printk(KERN_INFO NAME ": GPIO%d output disabled\n", m);</div><div class='del'>-			scx200_gpio_configure(m, ~1, 0);</div><div class='del'>-			break;</div><div class='del'>-		case 'T':</div><div class='del'>-			printk(KERN_INFO NAME ": GPIO%d output is push pull\n", m);</div><div class='del'>-			scx200_gpio_configure(m, ~2, 2);</div><div class='del'>-			break;</div><div class='del'>-		case 't':</div><div class='del'>-			printk(KERN_INFO NAME ": GPIO%d output is open drain\n", m);</div><div class='del'>-			scx200_gpio_configure(m, ~2, 0);</div><div class='del'>-			break;</div><div class='del'>-		case 'P':</div><div class='del'>-			printk(KERN_INFO NAME ": GPIO%d pull up enabled\n", m);</div><div class='del'>-			scx200_gpio_configure(m, ~4, 4);</div><div class='del'>-			break;</div><div class='del'>-		case 'p':</div><div class='del'>-			printk(KERN_INFO NAME ": GPIO%d pull up disabled\n", m);</div><div class='del'>-			scx200_gpio_configure(m, ~4, 0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='add'>+#define MAX_PINS 32		/* 64 later, when known ok */</div><div class='ctx'> </div><div class='del'>-static ssize_t scx200_gpio_read(struct file *file, char __user *buf,</div><div class='del'>-				size_t len, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	unsigned m = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	value = scx200_gpio_get(m);</div><div class='del'>-	if (put_user(value ? '1' : '0', buf))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='add'>+struct nsc_gpio_ops scx200_gpio_ops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.gpio_config	= scx200_gpio_configure,</div><div class='add'>+	.gpio_dump	= nsc_gpio_dump,</div><div class='add'>+	.gpio_get	= scx200_gpio_get,</div><div class='add'>+	.gpio_set	= scx200_gpio_set,</div><div class='add'>+	.gpio_change	= scx200_gpio_change,</div><div class='add'>+	.gpio_current	= scx200_gpio_current</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(scx200_gpio_ops);</div><div class='ctx'> </div><div class='ctx'> static int scx200_gpio_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned m = iminor(inode);</div><div class='del'>-	if (m &gt; 63)</div><div class='add'>+	file-&gt;private_data = &amp;scx200_gpio_ops;</div><div class='add'>+</div><div class='add'>+	if (m &gt;= MAX_PINS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return nonseekable_open(inode, file);</div><div class='ctx'> }</div><div class='hunk'>@@ -100,50 +61,71 @@ static int scx200_gpio_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct file_operations scx200_gpio_fops = {</div><div class='add'>+static const struct file_operations scx200_gpio_fileops = {</div><div class='ctx'> 	.owner   = THIS_MODULE,</div><div class='del'>-	.write   = scx200_gpio_write,</div><div class='del'>-	.read    = scx200_gpio_read,</div><div class='add'>+	.write   = nsc_gpio_write,</div><div class='add'>+	.read    = nsc_gpio_read,</div><div class='ctx'> 	.open    = scx200_gpio_open,</div><div class='ctx'> 	.release = scx200_gpio_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cdev scx200_gpio_cdev;  /* use 1 cdev for all pins */</div><div class='add'>+</div><div class='ctx'> static int __init scx200_gpio_init(void)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG NAME ": NatSemi SCx200 GPIO Driver\n");</div><div class='add'>+	int rc;</div><div class='add'>+	dev_t devid;</div><div class='ctx'> </div><div class='ctx'> 	if (!scx200_gpio_present()) {</div><div class='del'>-		printk(KERN_ERR NAME ": no SCx200 gpio pins available\n");</div><div class='add'>+		printk(KERN_ERR DRVNAME ": no SCx200 gpio present\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = register_chrdev(major, NAME, &amp;scx200_gpio_fops);</div><div class='del'>-	if (r &lt; 0) {</div><div class='del'>-		printk(KERN_ERR NAME ": unable to register character device\n");</div><div class='del'>-		return r;</div><div class='add'>+	/* support dev_dbg() with pdev-&gt;dev */</div><div class='add'>+	pdev = platform_device_alloc(DRVNAME, 0);</div><div class='add'>+	if (!pdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = platform_device_add(pdev);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto undo_malloc;</div><div class='add'>+</div><div class='add'>+	/* nsc_gpio uses dev_dbg(), so needs this */</div><div class='add'>+	scx200_gpio_ops.dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (major) {</div><div class='add'>+		devid = MKDEV(major, 0);</div><div class='add'>+		rc = register_chrdev_region(devid, MAX_PINS, "scx200_gpio");</div><div class='add'>+	} else {</div><div class='add'>+		rc = alloc_chrdev_region(&amp;devid, 0, MAX_PINS, "scx200_gpio");</div><div class='add'>+		major = MAJOR(devid);</div><div class='ctx'> 	}</div><div class='del'>-	if (!major) {</div><div class='del'>-		major = r;</div><div class='del'>-		printk(KERN_DEBUG NAME ": got dynamic major %d\n", major);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "SCx200 chrdev_region err: %d\n", rc);</div><div class='add'>+		goto undo_platform_device_add;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	cdev_init(&amp;scx200_gpio_cdev, &amp;scx200_gpio_fileops);</div><div class='add'>+	cdev_add(&amp;scx200_gpio_cdev, devid, MAX_PINS);</div><div class='add'>+</div><div class='add'>+	return 0; /* succeed */</div><div class='add'>+</div><div class='add'>+undo_platform_device_add:</div><div class='add'>+	platform_device_del(pdev);</div><div class='add'>+undo_malloc:</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit scx200_gpio_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	unregister_chrdev(major, NAME);</div><div class='add'>+	cdev_del(&amp;scx200_gpio_cdev);</div><div class='add'>+	/* cdev_put(&amp;scx200_gpio_cdev); */</div><div class='add'>+</div><div class='add'>+	unregister_chrdev_region(MKDEV(major, 0), MAX_PINS);</div><div class='add'>+	platform_device_unregister(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(scx200_gpio_init);</div><div class='ctx'> module_exit(scx200_gpio_cleanup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    Local variables:</div><div class='del'>-        compile-command: "make -k -C ../.. SUBDIRS=drivers/char modules"</div><div class='del'>-        c-basic-offset: 8</div><div class='del'>-    End:</div><div class='del'>-*/</div><div class='head'>diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c<br/>index 037c940ac71b..21a710cb4bba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/serial167.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/serial167.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/serial167.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/serial167.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * - replace bottom half handler with task queue handler</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -2235,7 +2234,6 @@ scrn[1] = '\0';</div><div class='ctx'>     /* Initialize the tty_driver structure */</div><div class='ctx'>     </div><div class='ctx'>     cy_serial_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-    cy_serial_driver-&gt;devfs_name = "tts/";</div><div class='ctx'>     cy_serial_driver-&gt;name = "ttyS";</div><div class='ctx'>     cy_serial_driver-&gt;major = TTY_MAJOR;</div><div class='ctx'>     cy_serial_driver-&gt;minor_start = 64;</div><div class='head'>diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c<br/>index 56c8243cdb73..afc6eda602f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/snsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/snsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/snsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/snsc.c</a></div><div class='hunk'>@@ -105,7 +105,7 @@ scdrv_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* hook this subchannel up to the system controller interrupt */</div><div class='ctx'> 	rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,</div><div class='del'>-			 SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+			 IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 			 SYSCTL_BASENAME, sd);</div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		ia64_sn_irtr_close(sd-&gt;sd_nasid, sd-&gt;sd_subch);</div><div class='hunk'>@@ -347,7 +347,7 @@ scdrv_poll(struct file *file, struct poll_table_struct *wait)</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations scdrv_fops = {</div><div class='add'>+static const struct file_operations scdrv_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.read =		scdrv_read,</div><div class='ctx'> 	.write =	scdrv_write,</div><div class='head'>diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c<br/>index e234d50e142a..d12d4f629cec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/snsc_event.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/snsc_event.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/snsc_event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/snsc_event.c</a></div><div class='hunk'>@@ -220,20 +220,7 @@ scdrv_dispatch_event(char *event, int len)</div><div class='ctx'> 			       " Sending SIGPWR to init...\n");</div><div class='ctx'> </div><div class='ctx'> 		/* give a SIGPWR signal to init proc */</div><div class='del'>-</div><div class='del'>-		/* first find init's task */</div><div class='del'>-		read_lock(&amp;tasklist_lock);</div><div class='del'>-		for_each_process(p) {</div><div class='del'>-			if (p-&gt;pid == 1)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (p) {</div><div class='del'>-			force_sig(SIGPWR, p);</div><div class='del'>-		} else {</div><div class='del'>-			printk(KERN_ERR "Failed to signal init!\n");</div><div class='del'>-			snsc_shutting_down = 0; /* so can try again (?) */</div><div class='del'>-		}</div><div class='del'>-		read_unlock(&amp;tasklist_lock);</div><div class='add'>+		kill_proc(1, SIGPWR, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* print to system log */</div><div class='ctx'> 		printk("%s|$(0x%x)%s\n", severity, esp_code, desc);</div><div class='hunk'>@@ -310,7 +297,7 @@ scdrv_event_init(struct sysctl_data_s *scd)</div><div class='ctx'> </div><div class='ctx'> 	/* hook event subchannel up to the system controller interrupt */</div><div class='ctx'> 	rv = request_irq(SGI_UART_VECTOR, scdrv_event_interrupt,</div><div class='del'>-			 SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+			 IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 			 "system controller events", event_sd);</div><div class='ctx'> 	if (rv) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: irq request failed (%d)\n",</div><div class='head'>diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c<br/>index a90f5d97df35..d4e434d694b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/sonypi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/sonypi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/sonypi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/sonypi.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -512,7 +511,7 @@ static struct sonypi_device {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> static struct acpi_device *sonypi_acpi_device;</div><div class='del'>-static int acpi_enabled;</div><div class='add'>+static int acpi_driver_registered;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int sonypi_ec_write(u8 addr, u8 value)</div><div class='hunk'>@@ -869,7 +868,7 @@ found:</div><div class='ctx'> 		sonypi_report_input_event(event);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-	if (acpi_enabled)</div><div class='add'>+	if (sonypi_acpi_device)</div><div class='ctx'> 		acpi_bus_generate_event(sonypi_acpi_device, 1, event);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1107,7 +1106,7 @@ static int sonypi_misc_ioctl(struct inode *ip, struct file *fp,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations sonypi_misc_fops = {</div><div class='add'>+static const struct file_operations sonypi_misc_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= sonypi_misc_read,</div><div class='ctx'> 	.poll		= sonypi_misc_poll,</div><div class='hunk'>@@ -1283,7 +1282,7 @@ static int __devinit sonypi_setup_irq(struct sonypi_device *dev,</div><div class='ctx'> 	while (irq_list-&gt;irq) {</div><div class='ctx'> </div><div class='ctx'> 		if (!request_irq(irq_list-&gt;irq, sonypi_irq,</div><div class='del'>-				 SA_SHIRQ, "sonypi", sonypi_irq)) {</div><div class='add'>+				 IRQF_SHARED, "sonypi", sonypi_irq)) {</div><div class='ctx'> 			dev-&gt;irq = irq_list-&gt;irq;</div><div class='ctx'> 			dev-&gt;bits = irq_list-&gt;bits;</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1551,8 +1550,8 @@ static int __init sonypi_init(void)</div><div class='ctx'> 		goto err_free_device;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-	if (acpi_bus_register_driver(&amp;sonypi_acpi_driver) &gt; 0)</div><div class='del'>-		acpi_enabled = 1;</div><div class='add'>+	if (acpi_bus_register_driver(&amp;sonypi_acpi_driver) &gt;= 0)</div><div class='add'>+		acpi_driver_registered = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1567,7 +1566,7 @@ static int __init sonypi_init(void)</div><div class='ctx'> static void __exit sonypi_exit(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-	if (acpi_enabled)</div><div class='add'>+	if (acpi_driver_registered)</div><div class='ctx'> 		acpi_bus_unregister_driver(&amp;sonypi_acpi_driver);</div><div class='ctx'> #endif</div><div class='ctx'> 	platform_device_unregister(sonypi_platform_device);</div><div class='head'>diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c<br/>index 5343e9fc6ab7..a1d303f9a33d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/specialix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/specialix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/specialix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/specialix.c</a></div><div class='hunk'>@@ -75,7 +75,6 @@</div><div class='ctx'>  * Documentation/specialix.txt</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -1016,9 +1015,9 @@ static inline int sx_setup_board(struct specialix_board * bp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; SX_BOARD_IS_PCI)</div><div class='del'>-		error = request_irq(bp-&gt;irq, sx_interrupt, SA_INTERRUPT | SA_SHIRQ, "specialix IO8+", bp);</div><div class='add'>+		error = request_irq(bp-&gt;irq, sx_interrupt, IRQF_DISABLED | IRQF_SHARED, "specialix IO8+", bp);</div><div class='ctx'> 	else</div><div class='del'>-		error = request_irq(bp-&gt;irq, sx_interrupt, SA_INTERRUPT, "specialix IO8+", bp);</div><div class='add'>+		error = request_irq(bp-&gt;irq, sx_interrupt, IRQF_DISABLED, "specialix IO8+", bp);</div><div class='ctx'> </div><div class='ctx'> 	if (error)</div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -1683,7 +1682,7 @@ static int sx_write(struct tty_struct * tty,</div><div class='ctx'> </div><div class='ctx'> 	bp = port_Board(port);</div><div class='ctx'> </div><div class='del'>-	if (!tty || !port-&gt;xmit_buf || !tmp_buf) {</div><div class='add'>+	if (!port-&gt;xmit_buf || !tmp_buf) {</div><div class='ctx'> 		func_exit();</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1733,7 +1732,7 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port-&gt;xmit_buf);</div><div class='del'>-	if (!tty || !port-&gt;xmit_buf) {</div><div class='add'>+	if (!port-&gt;xmit_buf) {</div><div class='ctx'> 		func_exit();</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2477,7 +2476,7 @@ static int __init specialix_init(void)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SX_NBOARD; i++)</div><div class='del'>-		sx_board[i].lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+		spin_lock_init(&amp;sx_board[i].lock);</div><div class='ctx'> </div><div class='ctx'> 	if (sx_init_drivers()) {</div><div class='ctx'> 		func_exit();</div><div class='hunk'>@@ -2585,6 +2584,12 @@ static void __exit specialix_exit_module(void)</div><div class='ctx'> 	func_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct pci_device_id specialx_pci_tbl[] __devinitdata = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_IO8) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, specialx_pci_tbl);</div><div class='add'>+</div><div class='ctx'> module_init(specialix_init_module);</div><div class='ctx'> module_exit(specialix_exit_module);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c<br/>index a9c5a7230f89..3beb2203d24b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/stallion.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/stallion.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/stallion.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/stallion.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -40,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -141,15 +139,6 @@ static char	*stl_drvversion = "5.6.0";</div><div class='ctx'> static struct tty_driver	*stl_serial;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	We will need to allocate a temporary write buffer for chars that</div><div class='del'>- *	come direct from user space. The problem is that a copy from user</div><div class='del'>- *	space might cause a page fault (typically on a system that is</div><div class='del'>- *	swapping!). All ports will share one buffer - since if the system</div><div class='del'>- *	is already swapping a shared buffer won't make things any worse.</div><div class='del'>- */</div><div class='del'>-static char			*stl_tmpwritebuf;</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *	Define a local default termios struct. All ports will be created</div><div class='ctx'>  *	with this termios initially. Basically all it defines is a raw port</div><div class='ctx'>  *	at 9600, 8 data bits, 1 stop bit.</div><div class='hunk'>@@ -363,6 +352,14 @@ static unsigned char	stl_vecmap[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ *	Lock ordering is that you may not take stallion_lock holding</div><div class='add'>+ *	brd_lock.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static spinlock_t brd_lock; 		/* Guard the board mapping */</div><div class='add'>+static spinlock_t stallion_lock;	/* Guard the tty driver */</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *	Set up enable and disable macros for the ECH boards. They require</div><div class='ctx'>  *	the secondary io address space to be activated and deactivated.</div><div class='ctx'>  *	This way all ECH boards can share their secondary io region.</div><div class='hunk'>@@ -710,7 +707,7 @@ static unsigned int	sc26198_baudtable[] = {</div><div class='ctx'>  *	Define the driver info for a user level control device. Used mainly</div><div class='ctx'>  *	to get at port stats - only not using the port device itself.</div><div class='ctx'>  */</div><div class='del'>-static struct file_operations	stl_fsiomem = {</div><div class='add'>+static const struct file_operations	stl_fsiomem = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= stl_memioctl,</div><div class='ctx'> };</div><div class='hunk'>@@ -725,17 +722,7 @@ static struct class *stallion_class;</div><div class='ctx'> </div><div class='ctx'> static int __init stallion_module_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("init_module()\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='ctx'> 	stl_init();</div><div class='del'>-	restore_flags(flags);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -746,7 +733,6 @@ static void __exit stallion_module_exit(void)</div><div class='ctx'> 	stlbrd_t	*brdp;</div><div class='ctx'> 	stlpanel_t	*panelp;</div><div class='ctx'> 	stlport_t	*portp;</div><div class='del'>-	unsigned long	flags;</div><div class='ctx'> 	int		i, j, k;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='hunk'>@@ -756,9 +742,6 @@ static void __exit stallion_module_exit(void)</div><div class='ctx'> 	printk(KERN_INFO "Unloading %s: version %s\n", stl_drvtitle,</div><div class='ctx'> 		stl_drvversion);</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Free up all allocated resources used by the ports. This includes</div><div class='ctx'>  *	memory and interrupts. As part of this process we will also do</div><div class='hunk'>@@ -770,21 +753,15 @@ static void __exit stallion_module_exit(void)</div><div class='ctx'> 	if (i) {</div><div class='ctx'> 		printk("STALLION: failed to un-register tty driver, "</div><div class='ctx'> 			"errno=%d\n", -i);</div><div class='del'>-		restore_flags(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		devfs_remove("staliomem/%d", i);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));</div><div class='del'>-	}</div><div class='del'>-	devfs_remove("staliomem");</div><div class='ctx'> 	if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))</div><div class='ctx'> 		printk("STALLION: failed to un-register serial memory device, "</div><div class='ctx'> 			"errno=%d\n", -i);</div><div class='ctx'> 	class_destroy(stallion_class);</div><div class='ctx'> </div><div class='del'>-	kfree(stl_tmpwritebuf);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; (i &lt; stl_nrbrds); i++) {</div><div class='ctx'> 		if ((brdp = stl_brds[i]) == (stlbrd_t *) NULL)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -814,8 +791,6 @@ static void __exit stallion_module_exit(void)</div><div class='ctx'> 		kfree(brdp);</div><div class='ctx'> 		stl_brds[i] = (stlbrd_t *) NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(stallion_module_init);</div><div class='hunk'>@@ -948,7 +923,7 @@ static stlbrd_t *stl_allocbrd(void)</div><div class='ctx'> </div><div class='ctx'> 	brdp = kzalloc(sizeof(stlbrd_t), GFP_KERNEL);</div><div class='ctx'> 	if (!brdp) {</div><div class='del'>-		printk("STALLION: failed to allocate memory (size=%d)\n",</div><div class='add'>+		printk("STALLION: failed to allocate memory (size=%Zd)\n",</div><div class='ctx'> 			sizeof(stlbrd_t));</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1066,16 +1041,17 @@ static int stl_waitcarrier(stlport_t *portp, struct file *filp)</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> 	doclocal = 0;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;stallion_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (portp-&gt;tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='ctx'> 		doclocal++;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='ctx'> 	portp-&gt;openwaitcnt++;</div><div class='ctx'> 	if (! tty_hung_up_p(filp))</div><div class='ctx'> 		portp-&gt;refcount--;</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='add'>+		/* Takes brd_lock internally */</div><div class='ctx'> 		stl_setsignals(portp, 1, 1);</div><div class='ctx'> 		if (tty_hung_up_p(filp) ||</div><div class='ctx'> 		    ((portp-&gt;flags &amp; ASYNC_INITIALIZED) == 0)) {</div><div class='hunk'>@@ -1093,13 +1069,14 @@ static int stl_waitcarrier(stlport_t *portp, struct file *filp)</div><div class='ctx'> 			rc = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		/* FIXME */</div><div class='ctx'> 		interruptible_sleep_on(&amp;portp-&gt;open_wait);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (! tty_hung_up_p(filp))</div><div class='ctx'> 		portp-&gt;refcount++;</div><div class='ctx'> 	portp-&gt;openwaitcnt--;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1119,16 +1096,15 @@ static void stl_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	if (portp == (stlport_t *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;stallion_lock, flags);</div><div class='ctx'> 	if (tty_hung_up_p(filp)) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((tty-&gt;count == 1) &amp;&amp; (portp-&gt;refcount != 1))</div><div class='ctx'> 		portp-&gt;refcount = 1;</div><div class='ctx'> 	if (portp-&gt;refcount-- &gt; 1) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1142,11 +1118,18 @@ static void stl_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'>  *	(The sc26198 has no "end-of-data" interrupt only empty FIFO)</div><div class='ctx'>  */</div><div class='ctx'> 	tty-&gt;closing = 1;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (portp-&gt;closing_wait != ASYNC_CLOSING_WAIT_NONE)</div><div class='ctx'> 		tty_wait_until_sent(tty, portp-&gt;closing_wait);</div><div class='ctx'> 	stl_waituntilsent(tty, (HZ / 2));</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;stallion_lock, flags);</div><div class='ctx'> 	portp-&gt;flags &amp;= ~ASYNC_INITIALIZED;</div><div class='add'>+	spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	stl_disableintrs(portp);</div><div class='ctx'> 	if (tty-&gt;termios-&gt;c_cflag &amp; HUPCL)</div><div class='ctx'> 		stl_setsignals(portp, 0, 0);</div><div class='hunk'>@@ -1173,7 +1156,6 @@ static void stl_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	portp-&gt;flags &amp;= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);</div><div class='ctx'> 	wake_up_interruptible(&amp;portp-&gt;close_wait);</div><div class='del'>-	restore_flags(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1195,9 +1177,6 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count</div><div class='ctx'> 		(int) tty, (int) buf, count);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((tty == (struct tty_struct *) NULL) ||</div><div class='del'>-	    (stl_tmpwritebuf == (char *) NULL))</div><div class='del'>-		return 0;</div><div class='ctx'> 	portp = tty-&gt;driver_data;</div><div class='ctx'> 	if (portp == (stlport_t *) NULL)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1302,11 +1281,6 @@ static void stl_flushchars(struct tty_struct *tty)</div><div class='ctx'> 	if (portp-&gt;tx.buf == (char *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	if (tty-&gt;stopped || tty-&gt;hw_stopped ||</div><div class='del'>-	    (portp-&gt;tx.head == portp-&gt;tx.tail))</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='ctx'> 	stl_startrxtx(portp, -1, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1977,12 +1951,14 @@ static int stl_eiointr(stlbrd_t *brdp)</div><div class='ctx'> 	unsigned int	iobase;</div><div class='ctx'> 	int		handled = 0;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;brd_lock);</div><div class='ctx'> 	panelp = brdp-&gt;panels[0];</div><div class='ctx'> 	iobase = panelp-&gt;iobase;</div><div class='ctx'> 	while (inb(brdp-&gt;iostatus) &amp; EIO_INTRPEND) {</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 		(* panelp-&gt;isr)(panelp, iobase);</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;brd_lock);</div><div class='ctx'> 	return handled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2168,7 +2144,7 @@ static int __init stl_initports(stlbrd_t *brdp, stlpanel_t *panelp)</div><div class='ctx'> 		portp = kzalloc(sizeof(stlport_t), GFP_KERNEL);</div><div class='ctx'> 		if (!portp) {</div><div class='ctx'> 			printk("STALLION: failed to allocate memory "</div><div class='del'>-				"(size=%d)\n", sizeof(stlport_t));</div><div class='add'>+				"(size=%Zd)\n", sizeof(stlport_t));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2304,7 +2280,7 @@ static inline int stl_initeio(stlbrd_t *brdp)</div><div class='ctx'> 	panelp = kzalloc(sizeof(stlpanel_t), GFP_KERNEL);</div><div class='ctx'> 	if (!panelp) {</div><div class='ctx'> 		printk(KERN_WARNING "STALLION: failed to allocate memory "</div><div class='del'>-			"(size=%d)\n", sizeof(stlpanel_t));</div><div class='add'>+			"(size=%Zd)\n", sizeof(stlpanel_t));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2326,7 +2302,7 @@ static inline int stl_initeio(stlbrd_t *brdp)</div><div class='ctx'> 	brdp-&gt;nrpanels = 1;</div><div class='ctx'> 	brdp-&gt;state |= BRD_FOUND;</div><div class='ctx'> 	brdp-&gt;hwid = status;</div><div class='del'>-	if (request_irq(brdp-&gt;irq, stl_intr, SA_SHIRQ, name, brdp) != 0) {</div><div class='add'>+	if (request_irq(brdp-&gt;irq, stl_intr, IRQF_SHARED, name, brdp) != 0) {</div><div class='ctx'> 		printk("STALLION: failed to register interrupt "</div><div class='ctx'> 		    "routine for %s irq=%d\n", name, brdp-&gt;irq);</div><div class='ctx'> 		rc = -ENODEV;</div><div class='hunk'>@@ -2478,7 +2454,7 @@ static inline int stl_initech(stlbrd_t *brdp)</div><div class='ctx'> 		panelp = kzalloc(sizeof(stlpanel_t), GFP_KERNEL);</div><div class='ctx'> 		if (!panelp) {</div><div class='ctx'> 			printk("STALLION: failed to allocate memory "</div><div class='del'>-				"(size=%d)\n", sizeof(stlpanel_t));</div><div class='add'>+				"(size=%Zd)\n", sizeof(stlpanel_t));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		panelp-&gt;magic = STL_PANELMAGIC;</div><div class='hunk'>@@ -2536,7 +2512,7 @@ static inline int stl_initech(stlbrd_t *brdp)</div><div class='ctx'> 		outb((brdp-&gt;ioctrlval | ECH_BRDDISABLE), brdp-&gt;ioctrl);</div><div class='ctx'> </div><div class='ctx'> 	brdp-&gt;state |= BRD_FOUND;</div><div class='del'>-	if (request_irq(brdp-&gt;irq, stl_intr, SA_SHIRQ, name, brdp) != 0) {</div><div class='add'>+	if (request_irq(brdp-&gt;irq, stl_intr, IRQF_SHARED, name, brdp) != 0) {</div><div class='ctx'> 		printk("STALLION: failed to register interrupt "</div><div class='ctx'> 		    "routine for %s irq=%d\n", name, brdp-&gt;irq);</div><div class='ctx'> 		i = -ENODEV;</div><div class='hunk'>@@ -2879,8 +2855,7 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp)</div><div class='ctx'> 	portp-&gt;stats.lflags = 0;</div><div class='ctx'> 	portp-&gt;stats.rxbuffered = 0;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;stallion_lock, flags);</div><div class='ctx'> 	if (portp-&gt;tty != (struct tty_struct *) NULL) {</div><div class='ctx'> 		if (portp-&gt;tty-&gt;driver_data == portp) {</div><div class='ctx'> 			portp-&gt;stats.ttystate = portp-&gt;tty-&gt;flags;</div><div class='hunk'>@@ -2894,7 +2869,7 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;stallion_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	head = portp-&gt;tx.head;</div><div class='ctx'> 	tail = portp-&gt;tx.tail;</div><div class='hunk'>@@ -3049,6 +3024,9 @@ static int __init stl_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;stallion_lock);</div><div class='add'>+	spin_lock_init(&amp;brd_lock);</div><div class='add'>+</div><div class='ctx'> 	stl_initbrds();</div><div class='ctx'> </div><div class='ctx'> 	stl_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);</div><div class='hunk'>@@ -3056,35 +3034,21 @@ static int __init stl_init(void)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Allocate a temporary write buffer.</div><div class='del'>- */</div><div class='del'>-	stl_tmpwritebuf = kmalloc(STL_TXBUFSIZE, GFP_KERNEL);</div><div class='del'>-	if (!stl_tmpwritebuf)</div><div class='del'>-		printk("STALLION: failed to allocate memory (size=%d)\n",</div><div class='del'>-			STL_TXBUFSIZE);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *	Set up a character driver for per board stuff. This is mainly used</div><div class='ctx'>  *	to do stats ioctls on the ports.</div><div class='ctx'>  */</div><div class='ctx'> 	if (register_chrdev(STL_SIOMEMMAJOR, "staliomem", &amp;stl_fsiomem))</div><div class='ctx'> 		printk("STALLION: failed to register serial board device\n");</div><div class='del'>-	devfs_mk_dir("staliomem");</div><div class='ctx'> </div><div class='ctx'> 	stallion_class = class_create(THIS_MODULE, "staliomem");</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),</div><div class='del'>-				S_IFCHR|S_IRUSR|S_IWUSR,</div><div class='del'>-				"staliomem/%d", i);</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		class_device_create(stallion_class, NULL,</div><div class='ctx'> 				    MKDEV(STL_SIOMEMMAJOR, i), NULL,</div><div class='ctx'> 				    "staliomem%d", i);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	stl_serial-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	stl_serial-&gt;driver_name = stl_drvname;</div><div class='ctx'> 	stl_serial-&gt;name = "ttyE";</div><div class='del'>-	stl_serial-&gt;devfs_name = "tts/E";</div><div class='ctx'> 	stl_serial-&gt;major = STL_SERIALMAJOR;</div><div class='ctx'> 	stl_serial-&gt;minor_start = 0;</div><div class='ctx'> 	stl_serial-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='hunk'>@@ -3147,11 +3111,13 @@ static int stl_cd1400panelinit(stlbrd_t *brdp, stlpanel_t *panelp)</div><div class='ctx'> 	unsigned int	gfrcr;</div><div class='ctx'> 	int		chipmask, i, j;</div><div class='ctx'> 	int		nrchips, uartaddr, ioaddr;</div><div class='add'>+	unsigned long   flags;</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("stl_panelinit(brdp=%x,panelp=%x)\n", (int) brdp, (int) panelp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(panelp-&gt;brdnr, panelp-&gt;pagenr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3189,6 +3155,7 @@ static int stl_cd1400panelinit(stlbrd_t *brdp, stlpanel_t *panelp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BRDDISABLE(panelp-&gt;brdnr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> 	return chipmask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3200,6 +3167,7 @@ static int stl_cd1400panelinit(stlbrd_t *brdp, stlpanel_t *panelp)</div><div class='ctx'> </div><div class='ctx'> static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *portp)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("stl_cd1400portinit(brdp=%x,panelp=%x,portp=%x)\n",</div><div class='ctx'> 		(int) brdp, (int) panelp, (int) portp);</div><div class='hunk'>@@ -3209,6 +3177,7 @@ static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *po</div><div class='ctx'> 	    (portp == (stlport_t *) NULL))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	portp-&gt;ioaddr = panelp-&gt;iobase + (((brdp-&gt;brdtype == BRD_ECHPCI) ||</div><div class='ctx'> 		(portp-&gt;portnr &lt; 8)) ? 0 : EREG_BANKSIZE);</div><div class='ctx'> 	portp-&gt;uartaddr = (portp-&gt;portnr &amp; 0x04) &lt;&lt; 5;</div><div class='hunk'>@@ -3219,6 +3188,7 @@ static void stl_cd1400portinit(stlbrd_t *brdp, stlpanel_t *panelp, stlport_t *po</div><div class='ctx'> 	stl_cd1400setreg(portp, LIVR, (portp-&gt;portnr &lt;&lt; 3));</div><div class='ctx'> 	portp-&gt;hwid = stl_cd1400getreg(portp, GFRCR);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3428,8 +3398,7 @@ static void stl_cd1400setport(stlport_t *portp, struct termios *tiosp)</div><div class='ctx'> 		tiosp-&gt;c_cc[VSTART], tiosp-&gt;c_cc[VSTOP]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x3));</div><div class='ctx'> 	srer = stl_cd1400getreg(portp, SRER);</div><div class='hunk'>@@ -3466,7 +3435,7 @@ static void stl_cd1400setport(stlport_t *portp, struct termios *tiosp)</div><div class='ctx'> 		portp-&gt;sigs &amp;= ~TIOCM_CD;</div><div class='ctx'> 	stl_cd1400setreg(portp, SRER, ((srer &amp; ~sreroff) | sreron));</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3492,8 +3461,7 @@ static void stl_cd1400setsignals(stlport_t *portp, int dtr, int rts)</div><div class='ctx'> 	if (rts &gt; 0)</div><div class='ctx'> 		msvr2 = MSVR2_RTS;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	if (rts &gt;= 0)</div><div class='hunk'>@@ -3501,7 +3469,7 @@ static void stl_cd1400setsignals(stlport_t *portp, int dtr, int rts)</div><div class='ctx'> 	if (dtr &gt;= 0)</div><div class='ctx'> 		stl_cd1400setreg(portp, MSVR1, msvr1);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3520,14 +3488,13 @@ static int stl_cd1400getsignals(stlport_t *portp)</div><div class='ctx'> 	printk("stl_cd1400getsignals(portp=%x)\n", (int) portp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	msvr1 = stl_cd1400getreg(portp, MSVR1);</div><div class='ctx'> 	msvr2 = stl_cd1400getreg(portp, MSVR2);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	sigs = 0;</div><div class='ctx'> 	sigs |= (msvr1 &amp; MSVR1_DCD) ? TIOCM_CD : 0;</div><div class='hunk'>@@ -3569,15 +3536,14 @@ static void stl_cd1400enablerxtx(stlport_t *portp, int rx, int tx)</div><div class='ctx'> 	else if (rx &gt; 0)</div><div class='ctx'> 		ccr |= CCR_RXENABLE;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	stl_cd1400ccrwait(portp);</div><div class='ctx'> 	stl_cd1400setreg(portp, CCR, ccr);</div><div class='ctx'> 	stl_cd1400ccrwait(portp);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3609,8 +3575,7 @@ static void stl_cd1400startrxtx(stlport_t *portp, int rx, int tx)</div><div class='ctx'> 	else if (rx &gt; 0)</div><div class='ctx'> 		sreron |= SRER_RXDATA;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	stl_cd1400setreg(portp, SRER,</div><div class='hunk'>@@ -3618,7 +3583,7 @@ static void stl_cd1400startrxtx(stlport_t *portp, int rx, int tx)</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	if (tx &gt; 0)</div><div class='ctx'> 		set_bit(ASYI_TXBUSY, &amp;portp-&gt;istate);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3634,13 +3599,12 @@ static void stl_cd1400disableintrs(stlport_t *portp)</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	printk("stl_cd1400disableintrs(portp=%x)\n", (int) portp);</div><div class='ctx'> #endif</div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	stl_cd1400setreg(portp, SRER, 0);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3653,8 +3617,7 @@ static void stl_cd1400sendbreak(stlport_t *portp, int len)</div><div class='ctx'> 	printk("stl_cd1400sendbreak(portp=%x,len=%d)\n", (int) portp, len);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	stl_cd1400setreg(portp, SRER,</div><div class='hunk'>@@ -3664,7 +3627,7 @@ static void stl_cd1400sendbreak(stlport_t *portp, int len)</div><div class='ctx'> 	portp-&gt;brklen = len;</div><div class='ctx'> 	if (len == 1)</div><div class='ctx'> 		portp-&gt;stats.txbreaks++;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3688,8 +3651,7 @@ static void stl_cd1400flowctrl(stlport_t *portp, int state)</div><div class='ctx'> 	if (tty == (struct tty_struct *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> </div><div class='hunk'>@@ -3729,7 +3691,7 @@ static void stl_cd1400flowctrl(stlport_t *portp, int state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3753,8 +3715,7 @@ static void stl_cd1400sendflow(stlport_t *portp, int state)</div><div class='ctx'> 	if (tty == (struct tty_struct *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	if (state) {</div><div class='hunk'>@@ -3769,7 +3730,7 @@ static void stl_cd1400sendflow(stlport_t *portp, int state)</div><div class='ctx'> 		stl_cd1400ccrwait(portp);</div><div class='ctx'> 	}</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3785,8 +3746,7 @@ static void stl_cd1400flush(stlport_t *portp)</div><div class='ctx'> 	if (portp == (stlport_t *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_cd1400setreg(portp, CAR, (portp-&gt;portnr &amp; 0x03));</div><div class='ctx'> 	stl_cd1400ccrwait(portp);</div><div class='hunk'>@@ -3794,7 +3754,7 @@ static void stl_cd1400flush(stlport_t *portp)</div><div class='ctx'> 	stl_cd1400ccrwait(portp);</div><div class='ctx'> 	portp-&gt;tx.tail = portp-&gt;tx.head;</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -3833,6 +3793,7 @@ static void stl_cd1400eiointr(stlpanel_t *panelp, unsigned int iobase)</div><div class='ctx'> 		(int) panelp, iobase);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;brd_lock);</div><div class='ctx'> 	outb(SVRR, iobase);</div><div class='ctx'> 	svrtype = inb(iobase + EREG_DATA);</div><div class='ctx'> 	if (panelp-&gt;nrports &gt; 4) {</div><div class='hunk'>@@ -3846,6 +3807,8 @@ static void stl_cd1400eiointr(stlpanel_t *panelp, unsigned int iobase)</div><div class='ctx'> 		stl_cd1400txisr(panelp, iobase);</div><div class='ctx'> 	else if (svrtype &amp; SVRR_MDM)</div><div class='ctx'> 		stl_cd1400mdmisr(panelp, iobase);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;brd_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4433,8 +4396,7 @@ static void stl_sc26198setport(stlport_t *portp, struct termios *tiosp)</div><div class='ctx'> 		tiosp-&gt;c_cc[VSTART], tiosp-&gt;c_cc[VSTOP]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_sc26198setreg(portp, IMR, 0);</div><div class='ctx'> 	stl_sc26198updatereg(portp, MR0, mr0);</div><div class='hunk'>@@ -4461,7 +4423,7 @@ static void stl_sc26198setport(stlport_t *portp, struct termios *tiosp)</div><div class='ctx'> 	portp-&gt;imr = (portp-&gt;imr &amp; ~imroff) | imron;</div><div class='ctx'> 	stl_sc26198setreg(portp, IMR, portp-&gt;imr);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4491,13 +4453,12 @@ static void stl_sc26198setsignals(stlport_t *portp, int dtr, int rts)</div><div class='ctx'> 	else if (rts &gt; 0)</div><div class='ctx'> 		iopioron |= IPR_RTS;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_sc26198setreg(portp, IOPIOR,</div><div class='ctx'> 		((stl_sc26198getreg(portp, IOPIOR) &amp; ~iopioroff) | iopioron));</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4516,12 +4477,11 @@ static int stl_sc26198getsignals(stlport_t *portp)</div><div class='ctx'> 	printk("stl_sc26198getsignals(portp=%x)\n", (int) portp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	ipr = stl_sc26198getreg(portp, IPR);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	sigs = 0;</div><div class='ctx'> 	sigs |= (ipr &amp; IPR_DCD) ? 0 : TIOCM_CD;</div><div class='hunk'>@@ -4558,13 +4518,12 @@ static void stl_sc26198enablerxtx(stlport_t *portp, int rx, int tx)</div><div class='ctx'> 	else if (rx &gt; 0)</div><div class='ctx'> 		ccr |= CR_RXENABLE;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_sc26198setreg(portp, SCCR, ccr);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	portp-&gt;crenable = ccr;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4593,15 +4552,14 @@ static void stl_sc26198startrxtx(stlport_t *portp, int rx, int tx)</div><div class='ctx'> 	else if (rx &gt; 0)</div><div class='ctx'> 		imr |= IR_RXRDY | IR_RXBREAK | IR_RXWATCHDOG;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_sc26198setreg(portp, IMR, imr);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	portp-&gt;imr = imr;</div><div class='ctx'> 	if (tx &gt; 0)</div><div class='ctx'> 		set_bit(ASYI_TXBUSY, &amp;portp-&gt;istate);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4618,13 +4576,12 @@ static void stl_sc26198disableintrs(stlport_t *portp)</div><div class='ctx'> 	printk("stl_sc26198disableintrs(portp=%x)\n", (int) portp);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	portp-&gt;imr = 0;</div><div class='ctx'> 	stl_sc26198setreg(portp, IMR, 0);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4637,8 +4594,7 @@ static void stl_sc26198sendbreak(stlport_t *portp, int len)</div><div class='ctx'> 	printk("stl_sc26198sendbreak(portp=%x,len=%d)\n", (int) portp, len);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	if (len == 1) {</div><div class='ctx'> 		stl_sc26198setreg(portp, SCCR, CR_TXSTARTBREAK);</div><div class='hunk'>@@ -4647,7 +4603,7 @@ static void stl_sc26198sendbreak(stlport_t *portp, int len)</div><div class='ctx'> 		stl_sc26198setreg(portp, SCCR, CR_TXSTOPBREAK);</div><div class='ctx'> 	}</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4672,8 +4628,7 @@ static void stl_sc26198flowctrl(stlport_t *portp, int state)</div><div class='ctx'> 	if (tty == (struct tty_struct *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> </div><div class='ctx'> 	if (state) {</div><div class='hunk'>@@ -4719,7 +4674,7 @@ static void stl_sc26198flowctrl(stlport_t *portp, int state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4744,8 +4699,7 @@ static void stl_sc26198sendflow(stlport_t *portp, int state)</div><div class='ctx'> 	if (tty == (struct tty_struct *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	if (state) {</div><div class='ctx'> 		mr0 = stl_sc26198getreg(portp, MR0);</div><div class='hunk'>@@ -4765,7 +4719,7 @@ static void stl_sc26198sendflow(stlport_t *portp, int state)</div><div class='ctx'> 		stl_sc26198setreg(portp, MR0, mr0);</div><div class='ctx'> 	}</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4781,14 +4735,13 @@ static void stl_sc26198flush(stlport_t *portp)</div><div class='ctx'> 	if (portp == (stlport_t *) NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	stl_sc26198setreg(portp, SCCR, CR_TXRESET);</div><div class='ctx'> 	stl_sc26198setreg(portp, SCCR, portp-&gt;crenable);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='ctx'> 	portp-&gt;tx.tail = portp-&gt;tx.head;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -4815,12 +4768,11 @@ static int stl_sc26198datastate(stlport_t *portp)</div><div class='ctx'> 	if (test_bit(ASYI_TXBUSY, &amp;portp-&gt;istate))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;brd_lock, flags);</div><div class='ctx'> 	BRDENABLE(portp-&gt;brdnr, portp-&gt;pagenr);</div><div class='ctx'> 	sr = stl_sc26198getreg(portp, SR);</div><div class='ctx'> 	BRDDISABLE(portp-&gt;brdnr);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;brd_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return (sr &amp; SR_TXEMPTY) ? 0 : 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -4878,6 +4830,8 @@ static void stl_sc26198intr(stlpanel_t *panelp, unsigned int iobase)</div><div class='ctx'> 	stlport_t	*portp;</div><div class='ctx'> 	unsigned int	iack;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;brd_lock);</div><div class='add'>+</div><div class='ctx'> /* </div><div class='ctx'>  *	Work around bug in sc26198 chip... Cannot have A6 address</div><div class='ctx'>  *	line of UART high, else iack will be returned as 0.</div><div class='hunk'>@@ -4893,6 +4847,8 @@ static void stl_sc26198intr(stlpanel_t *panelp, unsigned int iobase)</div><div class='ctx'> 		stl_sc26198txisr(portp);</div><div class='ctx'> 	else</div><div class='ctx'> 		stl_sc26198otherisr(portp, iack);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;brd_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='head'>diff --git a/drivers/char/sx.c b/drivers/char/sx.c<br/>index 3b4747230270..e1cd2bc4b1e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/sx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/sx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/sx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/sx.c</a></div><div class='hunk'>@@ -410,7 +410,7 @@ static struct real_driver sx_real_driver = {</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations sx_fw_fops = {</div><div class='add'>+static const struct file_operations sx_fw_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= sx_fw_ioctl,</div><div class='ctx'> };</div><div class='hunk'>@@ -1993,7 +1993,7 @@ static int sx_init_board (struct sx_board *board)</div><div class='ctx'> 		if(board-&gt;irq &gt; 0) {</div><div class='ctx'> 			/* fixed irq, probably PCI */</div><div class='ctx'> 			if(sx_irqmask &amp; (1 &lt;&lt; board-&gt;irq)) { /* may we use this irq? */</div><div class='del'>-				if(request_irq(board-&gt;irq, sx_interrupt, SA_SHIRQ | SA_INTERRUPT, "sx", board)) {</div><div class='add'>+				if(request_irq(board-&gt;irq, sx_interrupt, IRQF_SHARED | IRQF_DISABLED, "sx", board)) {</div><div class='ctx'> 					printk(KERN_ERR "sx: Cannot allocate irq %d.\n", board-&gt;irq);</div><div class='ctx'> 					board-&gt;irq = 0;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2005,7 +2005,7 @@ static int sx_init_board (struct sx_board *board)</div><div class='ctx'> 			int irqmask = sx_irqmask &amp; (IS_SX_BOARD(board) ? SX_ISA_IRQ_MASK : SI2_ISA_IRQ_MASK);</div><div class='ctx'> 			for(irqnr = 15; irqnr &gt; 0; irqnr--)</div><div class='ctx'> 				if(irqmask &amp; (1 &lt;&lt; irqnr))</div><div class='del'>-					if(! request_irq(irqnr, sx_interrupt, SA_SHIRQ | SA_INTERRUPT, "sx", board))</div><div class='add'>+					if(! request_irq(irqnr, sx_interrupt, IRQF_SHARED | IRQF_DISABLED, "sx", board))</div><div class='ctx'> 						break;</div><div class='ctx'> 			if(! irqnr)</div><div class='ctx'> 				printk(KERN_ERR "sx: Cannot allocate IRQ.\n");</div><div class='hunk'>@@ -2320,7 +2320,7 @@ static int sx_init_portstructs (int nboards, int nports)</div><div class='ctx'> #ifdef NEW_WRITE_LOCKING</div><div class='ctx'> 			port-&gt;gs.port_write_mutex = MUTEX;</div><div class='ctx'> #endif</div><div class='del'>-			port-&gt;gs.driver_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+			spin_lock_init(&amp;port-&gt;gs.driver_lock);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Initializing wait queue</div><div class='ctx'> 			 */</div><div class='head'>diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c<br/>index fee2aca3f6a5..df782dd1098c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/synclink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/synclink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/synclink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/synclink.c</a></div><div class='hunk'>@@ -8150,7 +8150,7 @@ static int __devinit synclink_init_one (struct pci_dev *dev,</div><div class='ctx'> 				</div><div class='ctx'> 	info-&gt;bus_type = MGSL_BUS_TYPE_PCI;</div><div class='ctx'> 	info-&gt;io_addr_size = 8;</div><div class='del'>-	info-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	info-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;device == 0x0210) {</div><div class='ctx'> 		/* Version 1 PCI9030 based universal PCI adapter */</div><div class='head'>diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c<br/>index b4d1f4eea435..e829594195c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/synclink_gt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/synclink_gt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/synclink_gt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/synclink_gt.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> //#define DBGRBUF(info) dump_rbufs(info)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -101,6 +100,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id pci_table[] = {</div><div class='ctx'> 	{PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='add'>+	{PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT2_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='ctx'> 	{PCI_VENDOR_ID_MICROGATE, SYNCLINK_GT4_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='ctx'> 	{PCI_VENDOR_ID_MICROGATE, SYNCLINK_AC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='ctx'> 	{0,}, /* terminate list */</div><div class='hunk'>@@ -870,7 +870,7 @@ static int write(struct tty_struct *tty,</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	DBGINFO(("%s write count=%d\n", info-&gt;device_name, count));</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;tx_buf)</div><div class='add'>+	if (!info-&gt;tx_buf)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; info-&gt;max_frame_size) {</div><div class='hunk'>@@ -924,7 +924,7 @@ static void put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	if (sanity_check(info, tty-&gt;name, "put_char"))</div><div class='ctx'> 		return;</div><div class='ctx'> 	DBGINFO(("%s put_char(%d)\n", info-&gt;device_name, ch));</div><div class='del'>-	if (!tty || !info-&gt;tx_buf)</div><div class='add'>+	if (!info-&gt;tx_buf)</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;lock,flags);</div><div class='ctx'> 	if (!info-&gt;tx_active &amp;&amp; (info-&gt;tx_count &lt; info-&gt;max_frame_size))</div><div class='hunk'>@@ -2515,7 +2515,8 @@ static int set_txidle(struct slgt_info *info, int idle_mode)</div><div class='ctx'> 	DBGINFO(("%s set_txidle(%d)\n", info-&gt;device_name, idle_mode));</div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;lock,flags);</div><div class='ctx'> 	info-&gt;idle_mode = idle_mode;</div><div class='del'>-	tx_set_idle(info);</div><div class='add'>+	if (info-&gt;params.mode != MGSL_MODE_ASYNC)</div><div class='add'>+		tx_set_idle(info);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;lock,flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3076,7 +3077,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,</div><div class='ctx'> </div><div class='ctx'> static int alloc_tmp_rbuf(struct slgt_info *info)</div><div class='ctx'> {</div><div class='del'>-	info-&gt;tmp_rbuf = kmalloc(info-&gt;max_frame_size, GFP_KERNEL);</div><div class='add'>+	info-&gt;tmp_rbuf = kmalloc(info-&gt;max_frame_size + 5, GFP_KERNEL);</div><div class='ctx'> 	if (info-&gt;tmp_rbuf == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3276,6 +3277,9 @@ static void add_device(struct slgt_info *info)</div><div class='ctx'> 	case SYNCLINK_GT_DEVICE_ID:</div><div class='ctx'> 		devstr = "GT";</div><div class='ctx'> 		break;</div><div class='add'>+	case SYNCLINK_GT2_DEVICE_ID:</div><div class='add'>+		devstr = "GT2";</div><div class='add'>+		break;</div><div class='ctx'> 	case SYNCLINK_GT4_DEVICE_ID:</div><div class='ctx'> 		devstr = "GT4";</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -3339,7 +3343,7 @@ static struct slgt_info *alloc_dev(int adapter_num, int port_num, struct pci_dev</div><div class='ctx'> 		info-&gt;phys_reg_addr = pci_resource_start(pdev,0);</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;bus_type = MGSL_BUS_TYPE_PCI;</div><div class='del'>-		info-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+		info-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;init_error = -1; /* assume error, set to 0 on successful init */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3353,7 +3357,9 @@ static void device_init(int adapter_num, struct pci_dev *pdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int port_count = 1;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;device == SYNCLINK_GT4_DEVICE_ID)</div><div class='add'>+	if (pdev-&gt;device == SYNCLINK_GT2_DEVICE_ID)</div><div class='add'>+		port_count = 2;</div><div class='add'>+	else if (pdev-&gt;device == SYNCLINK_GT4_DEVICE_ID)</div><div class='ctx'> 		port_count = 4;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate device instances for all ports */</div><div class='hunk'>@@ -3940,8 +3946,6 @@ static void async_mode(struct slgt_info *info)</div><div class='ctx'> </div><div class='ctx'> 	msc_set_vcr(info);</div><div class='ctx'> </div><div class='del'>-	tx_set_idle(info);</div><div class='del'>-</div><div class='ctx'> 	/* SCR (serial control)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * 15  1=tx req on FIFO half empty</div><div class='hunk'>@@ -4012,7 +4016,7 @@ static void hdlc_mode(struct slgt_info *info)</div><div class='ctx'> 	case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: val |= BIT12 + BIT11 + BIT10; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (info-&gt;params.crc_type)</div><div class='add'>+	switch (info-&gt;params.crc_type &amp; HDLC_CRC_MASK)</div><div class='ctx'> 	{</div><div class='ctx'> 	case HDLC_CRC_16_CCITT: val |= BIT9; break;</div><div class='ctx'> 	case HDLC_CRC_32_CCITT: val |= BIT9 + BIT8; break;</div><div class='hunk'>@@ -4073,7 +4077,7 @@ static void hdlc_mode(struct slgt_info *info)</div><div class='ctx'> 	case HDLC_ENCODING_DIFF_BIPHASE_LEVEL: val |= BIT12 + BIT11 + BIT10; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (info-&gt;params.crc_type)</div><div class='add'>+	switch (info-&gt;params.crc_type &amp; HDLC_CRC_MASK)</div><div class='ctx'> 	{</div><div class='ctx'> 	case HDLC_CRC_16_CCITT: val |= BIT9; break;</div><div class='ctx'> 	case HDLC_CRC_32_CCITT: val |= BIT9 + BIT8; break;</div><div class='hunk'>@@ -4175,17 +4179,38 @@ static void hdlc_mode(struct slgt_info *info)</div><div class='ctx'>  */</div><div class='ctx'> static void tx_set_idle(struct slgt_info *info)</div><div class='ctx'> {</div><div class='del'>-	unsigned char val = 0xff;</div><div class='add'>+	unsigned char val;</div><div class='add'>+	unsigned short tcr;</div><div class='ctx'> </div><div class='del'>-	switch(info-&gt;idle_mode)</div><div class='del'>-	{</div><div class='del'>-	case HDLC_TXIDLE_FLAGS:          val = 0x7e; break;</div><div class='del'>-	case HDLC_TXIDLE_ALT_ZEROS_ONES: val = 0xaa; break;</div><div class='del'>-	case HDLC_TXIDLE_ZEROS:          val = 0x00; break;</div><div class='del'>-	case HDLC_TXIDLE_ONES:           val = 0xff; break;</div><div class='del'>-	case HDLC_TXIDLE_ALT_MARK_SPACE: val = 0xaa; break;</div><div class='del'>-	case HDLC_TXIDLE_SPACE:          val = 0x00; break;</div><div class='del'>-	case HDLC_TXIDLE_MARK:           val = 0xff; break;</div><div class='add'>+	/* if preamble enabled (tcr[6] == 1) then tx idle size = 8 bits</div><div class='add'>+	 * else tcr[5:4] = tx idle size: 00 = 8 bits, 01 = 16 bits</div><div class='add'>+	 */</div><div class='add'>+	tcr = rd_reg16(info, TCR);</div><div class='add'>+	if (info-&gt;idle_mode &amp; HDLC_TXIDLE_CUSTOM_16) {</div><div class='add'>+		/* disable preamble, set idle size to 16 bits */</div><div class='add'>+		tcr = (tcr &amp; ~(BIT6 + BIT5)) | BIT4;</div><div class='add'>+		/* MSB of 16 bit idle specified in tx preamble register (TPR) */</div><div class='add'>+		wr_reg8(info, TPR, (unsigned char)((info-&gt;idle_mode &gt;&gt; 8) &amp; 0xff));</div><div class='add'>+	} else if (!(tcr &amp; BIT6)) {</div><div class='add'>+		/* preamble is disabled, set idle size to 8 bits */</div><div class='add'>+		tcr &amp;= ~(BIT5 + BIT4);</div><div class='add'>+	}</div><div class='add'>+	wr_reg16(info, TCR, tcr);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;idle_mode &amp; (HDLC_TXIDLE_CUSTOM_8 | HDLC_TXIDLE_CUSTOM_16)) {</div><div class='add'>+		/* LSB of custom tx idle specified in tx idle register */</div><div class='add'>+		val = (unsigned char)(info-&gt;idle_mode &amp; 0xff);</div><div class='add'>+	} else {</div><div class='add'>+		/* standard 8 bit idle patterns */</div><div class='add'>+		switch(info-&gt;idle_mode)</div><div class='add'>+		{</div><div class='add'>+		case HDLC_TXIDLE_FLAGS:          val = 0x7e; break;</div><div class='add'>+		case HDLC_TXIDLE_ALT_ZEROS_ONES:</div><div class='add'>+		case HDLC_TXIDLE_ALT_MARK_SPACE: val = 0xaa; break;</div><div class='add'>+		case HDLC_TXIDLE_ZEROS:</div><div class='add'>+		case HDLC_TXIDLE_SPACE:          val = 0x00; break;</div><div class='add'>+		default:                         val = 0xff;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wr_reg8(info, TIR, val);</div><div class='hunk'>@@ -4313,6 +4338,12 @@ static int rx_get_frame(struct slgt_info *info)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct tty_struct *tty = info-&gt;tty;</div><div class='ctx'> 	unsigned char addr_field = 0xff;</div><div class='add'>+	unsigned int crc_size = 0;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;params.crc_type &amp; HDLC_CRC_MASK) {</div><div class='add'>+	case HDLC_CRC_16_CCITT: crc_size = 2; break;</div><div class='add'>+	case HDLC_CRC_32_CCITT: crc_size = 4; break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> check_again:</div><div class='ctx'> </div><div class='hunk'>@@ -4357,7 +4388,7 @@ check_again:</div><div class='ctx'> 	status = desc_status(info-&gt;rbufs[end]);</div><div class='ctx'> </div><div class='ctx'> 	/* ignore CRC bit if not using CRC (bit is undefined) */</div><div class='del'>-	if (info-&gt;params.crc_type == HDLC_CRC_NONE)</div><div class='add'>+	if ((info-&gt;params.crc_type &amp; HDLC_CRC_MASK) == HDLC_CRC_NONE)</div><div class='ctx'> 		status &amp;= ~BIT1;</div><div class='ctx'> </div><div class='ctx'> 	if (framesize == 0 ||</div><div class='hunk'>@@ -4366,34 +4397,34 @@ check_again:</div><div class='ctx'> 		goto check_again;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (framesize &lt; 2 || status &amp; (BIT1+BIT0)) {</div><div class='del'>-		if (framesize &lt; 2 || (status &amp; BIT0))</div><div class='del'>-			info-&gt;icount.rxshort++;</div><div class='del'>-		else</div><div class='del'>-			info-&gt;icount.rxcrc++;</div><div class='add'>+	if (framesize &lt; (2 + crc_size) || status &amp; BIT0) {</div><div class='add'>+		info-&gt;icount.rxshort++;</div><div class='ctx'> 		framesize = 0;</div><div class='add'>+	} else if (status &amp; BIT1) {</div><div class='add'>+		info-&gt;icount.rxcrc++;</div><div class='add'>+		if (!(info-&gt;params.crc_type &amp; HDLC_CRC_RETURN_EX))</div><div class='add'>+			framesize = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HDLC</div><div class='del'>-		{</div><div class='del'>-			struct net_device_stats *stats = hdlc_stats(info-&gt;netdev);</div><div class='del'>-			stats-&gt;rx_errors++;</div><div class='del'>-			stats-&gt;rx_frame_errors++;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		/* adjust frame size for CRC, if any */</div><div class='del'>-		if (info-&gt;params.crc_type == HDLC_CRC_16_CCITT)</div><div class='del'>-			framesize -= 2;</div><div class='del'>-		else if (info-&gt;params.crc_type == HDLC_CRC_32_CCITT)</div><div class='del'>-			framesize -= 4;</div><div class='add'>+	if (framesize == 0) {</div><div class='add'>+		struct net_device_stats *stats = hdlc_stats(info-&gt;netdev);</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		stats-&gt;rx_frame_errors++;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	DBGBH(("%s rx frame status=%04X size=%d\n",</div><div class='ctx'> 		info-&gt;device_name, status, framesize));</div><div class='ctx'> 	DBGDATA(info, info-&gt;rbufs[start].buf, min_t(int, framesize, DMABUFSIZE), "rx");</div><div class='ctx'> </div><div class='ctx'> 	if (framesize) {</div><div class='del'>-		if (framesize &gt; info-&gt;max_frame_size)</div><div class='add'>+		if (!(info-&gt;params.crc_type &amp; HDLC_CRC_RETURN_EX)) {</div><div class='add'>+			framesize -= crc_size;</div><div class='add'>+			crc_size = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (framesize &gt; info-&gt;max_frame_size + crc_size)</div><div class='ctx'> 			info-&gt;icount.rxlong++;</div><div class='ctx'> 		else {</div><div class='ctx'> 			/* copy dma buffer(s) to contiguous temp buffer */</div><div class='hunk'>@@ -4413,6 +4444,11 @@ check_again:</div><div class='ctx'> 					i = 0;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			if (info-&gt;params.crc_type &amp; HDLC_CRC_RETURN_EX) {</div><div class='add'>+				*p = (status &amp; BIT1) ? RX_CRC_ERROR : RX_OK;</div><div class='add'>+				framesize++;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_HDLC</div><div class='ctx'> 			if (info-&gt;netcount)</div><div class='ctx'> 				hdlcdev_rx(info,info-&gt;tmp_rbuf, framesize);</div><div class='hunk'>@@ -4671,13 +4707,13 @@ static int loopback_test(struct slgt_info *info)</div><div class='ctx'> static int adapter_test(struct slgt_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	DBGINFO(("testing %s\n", info-&gt;device_name));</div><div class='del'>-	if ((info-&gt;init_error = register_test(info)) &lt; 0) {</div><div class='add'>+	if (register_test(info) &lt; 0) {</div><div class='ctx'> 		printk("register test failure %s addr=%08X\n",</div><div class='ctx'> 			info-&gt;device_name, info-&gt;phys_reg_addr);</div><div class='del'>-	} else if ((info-&gt;init_error = irq_test(info)) &lt; 0) {</div><div class='add'>+	} else if (irq_test(info) &lt; 0) {</div><div class='ctx'> 		printk("IRQ test failure %s IRQ=%d\n",</div><div class='ctx'> 			info-&gt;device_name, info-&gt;irq_level);</div><div class='del'>-	} else if ((info-&gt;init_error = loopback_test(info)) &lt; 0) {</div><div class='add'>+	} else if (loopback_test(info) &lt; 0) {</div><div class='ctx'> 		printk("loopback test failure %s\n", info-&gt;device_name);</div><div class='ctx'> 	}</div><div class='ctx'> 	return info-&gt;init_error;</div><div class='head'>diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c<br/>index 858740131115..1e443a233f51 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/synclinkmp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/synclinkmp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/synclinkmp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/synclinkmp.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MAX_DEVICES 12</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -988,7 +987,7 @@ static int write(struct tty_struct *tty,</div><div class='ctx'> 	if (sanity_check(info, tty-&gt;name, "write"))</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;tx_buf)</div><div class='add'>+	if (!info-&gt;tx_buf)</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;params.mode == MGSL_MODE_HDLC) {</div><div class='hunk'>@@ -1067,7 +1066,7 @@ static void put_char(struct tty_struct *tty, unsigned char ch)</div><div class='ctx'> 	if (sanity_check(info, tty-&gt;name, "put_char"))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!tty || !info-&gt;tx_buf)</div><div class='add'>+	if (!info-&gt;tx_buf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;info-&gt;lock,flags);</div><div class='hunk'>@@ -3836,7 +3835,7 @@ static SLMP_INFO *alloc_dev(int adapter_num, int port_num, struct pci_dev *pdev)</div><div class='ctx'> 		info-&gt;phys_statctrl_base &amp;= ~(PAGE_SIZE-1);</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;bus_type = MGSL_BUS_TYPE_PCI;</div><div class='del'>-		info-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+		info-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 		init_timer(&amp;info-&gt;tx_timer);</div><div class='ctx'> 		info-&gt;tx_timer.data = (unsigned long)info;</div><div class='head'>diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c<br/>index 35082dc12eae..ee3ca8f1768e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/sysrq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/sysrq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/sysrq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/sysrq.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *	based upon discusions in irc://irc.openprojects.net/#kernelnewbies</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -148,12 +147,13 @@ static struct sysrq_key_op sysrq_mountro_op = {</div><div class='ctx'> 	.enable_mask	= SYSRQ_ENABLE_REMOUNT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_MUTEXES</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='ctx'> static void sysrq_handle_showlocks(int key, struct pt_regs *pt_regs,</div><div class='ctx'> 				struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	mutex_debug_show_all_locks();</div><div class='add'>+	debug_show_all_locks();</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static struct sysrq_key_op sysrq_showlocks_op = {</div><div class='ctx'> 	.handler	= sysrq_handle_showlocks,</div><div class='ctx'> 	.help_msg	= "show-all-locks(D)",</div><div class='head'>diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c<br/>index a80c83210872..bb1bad4c18f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tb0219.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tb0219.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tb0219.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tb0219.c</a></div><div class='hunk'>@@ -255,7 +255,7 @@ static int tanbac_tb0219_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations tb0219_fops = {</div><div class='add'>+static const struct file_operations tb0219_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= tanbac_tb0219_read,</div><div class='ctx'> 	.write		= tanbac_tb0219_write,</div><div class='head'>diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c<br/>index 079db5a935a1..d30dc09dbbc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tipar.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tipar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tipar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tipar.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef DEBUG				/* change to #define to get debugging</div><div class='ctx'> 					 * output - for pr_debug() */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -56,7 +55,6 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;	/* DevFs support */</div><div class='ctx'> #include &lt;linux/parport.h&gt;		/* Our code depend on parport */</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +381,7 @@ tipar_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> /* ----- kernel module registering ------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static struct file_operations tipar_fops = {</div><div class='add'>+static const struct file_operations tipar_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.read = tipar_read,</div><div class='hunk'>@@ -443,12 +441,6 @@ tipar_register(int nr, struct parport *port)</div><div class='ctx'> </div><div class='ctx'> 	class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR,</div><div class='ctx'> 			TIPAR_MINOR + nr), NULL, "par%d", nr);</div><div class='del'>-	/* Use devfs, tree: /dev/ticables/par/[0..2] */</div><div class='del'>-	err = devfs_mk_cdev(MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr),</div><div class='del'>-			S_IFCHR | S_IRUGO | S_IWUGO,</div><div class='del'>-			"ticables/par/%d", nr);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_class;</div><div class='ctx'> </div><div class='ctx'> 	/* Display informations */</div><div class='ctx'> 	pr_info("tipar%d: using %s (%s)\n", nr, port-&gt;name, (port-&gt;irq ==</div><div class='hunk'>@@ -460,11 +452,7 @@ tipar_register(int nr, struct parport *port)</div><div class='ctx'> 		pr_info("tipar%d: link cable not found\n", nr);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	goto out;</div><div class='ctx'> </div><div class='del'>-out_class:</div><div class='del'>-	class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr));</div><div class='del'>-	class_destroy(tipar_class);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -507,9 +495,6 @@ tipar_init_module(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Use devfs with tree: /dev/ticables/par/[0..2] */</div><div class='del'>-	devfs_mk_dir("ticables/par");</div><div class='del'>-</div><div class='ctx'> 	tipar_class = class_create(THIS_MODULE, "ticables");</div><div class='ctx'> 	if (IS_ERR(tipar_class)) {</div><div class='ctx'> 		err = PTR_ERR(tipar_class);</div><div class='hunk'>@@ -528,7 +513,6 @@ out_class:</div><div class='ctx'> 	class_destroy(tipar_class);</div><div class='ctx'> </div><div class='ctx'> out_chrdev:</div><div class='del'>-	devfs_remove("ticables/par");</div><div class='ctx'> 	unregister_chrdev(TIPAR_MAJOR, "tipar");</div><div class='ctx'> out:</div><div class='ctx'> 	return err;	</div><div class='hunk'>@@ -549,10 +533,8 @@ tipar_cleanup_module(void)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		parport_unregister_device(table[i].dev);</div><div class='ctx'> 		class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, i));</div><div class='del'>-		devfs_remove("ticables/par/%d", i);</div><div class='ctx'> 	}</div><div class='ctx'> 	class_destroy(tipar_class);</div><div class='del'>-	devfs_remove("ticables/par");</div><div class='ctx'> </div><div class='ctx'> 	pr_info("tipar: module unloaded\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c<br/>index f58ad7f68267..d2c5ba4e83b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tlclk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tlclk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tlclk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tlclk.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * MPCBL0010 ATCA computer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -209,7 +208,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	/* This device is wired through the FPGA IO space of the ATCA blade</div><div class='ctx'> 	 * we can't share this IRQ */</div><div class='ctx'> 	result = request_irq(telclk_interrupt, &amp;tlclk_interrupt,</div><div class='del'>-			     SA_INTERRUPT, "telco_clock", tlclk_interrupt);</div><div class='add'>+			     IRQF_DISABLED, "telco_clock", tlclk_interrupt);</div><div class='ctx'> 	if (result == -EBUSY) {</div><div class='ctx'> 		printk(KERN_ERR "tlclk: Interrupt can't be reserved.\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -248,7 +247,7 @@ static ssize_t tlclk_write(struct file *filp, const char __user *buf, size_t cou</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations tlclk_fops = {</div><div class='add'>+static const struct file_operations tlclk_fops = {</div><div class='ctx'> 	.read = tlclk_read,</div><div class='ctx'> 	.write = tlclk_write,</div><div class='ctx'> 	.open = tlclk_open,</div><div class='hunk'>@@ -343,7 +342,7 @@ static ssize_t store_received_ref_clk3b(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	val = (unsigned char)tmp;</div><div class='ctx'> 	spin_lock_irqsave(&amp;event_lock, flags);</div><div class='del'>-	SET_PORT_BITS(TLCLK_REG1, 0xef, val &lt;&lt; 1);</div><div class='add'>+	SET_PORT_BITS(TLCLK_REG1, 0xdf, val &lt;&lt; 1);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;event_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return strnlen(buf, count);</div><div class='head'>diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c<br/>index e2fb234dee40..dd36fd04a842 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/toshiba.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/toshiba.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/toshiba.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/toshiba.c</a></div><div class='hunk'>@@ -92,7 +92,7 @@ static int tosh_ioctl(struct inode *, struct file *, unsigned int,</div><div class='ctx'> 	unsigned long);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations tosh_fops = {</div><div class='add'>+static const struct file_operations tosh_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.ioctl		= tosh_ioctl,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c<br/>index 6889e7db3aff..a082a2e34252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tpm/tpm.c</a></div><div class='hunk'>@@ -1141,6 +1141,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend</div><div class='ctx'> 		put_device(dev);</div><div class='ctx'> 		clear_bit(chip-&gt;dev_num, dev_mask);</div><div class='ctx'> 		kfree(chip);</div><div class='add'>+		kfree(devname);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c<br/>index 58a258cec153..ad8ffe49256f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_atmel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_atmel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_atmel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tpm/tpm_atmel.c</a></div><div class='hunk'>@@ -116,7 +116,7 @@ static u8 tpm_atml_status(struct tpm_chip *chip)</div><div class='ctx'> 	return ioread8(chip-&gt;vendor.iobase + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations atmel_ops = {</div><div class='add'>+static const struct file_operations atmel_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.open = tpm_open,</div><div class='head'>diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c<br/>index adfff21beb21..1353b5a6bae8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_infineon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_infineon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_infineon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tpm/tpm_infineon.c</a></div><div class='hunk'>@@ -338,7 +338,7 @@ static struct attribute *inf_attrs[] = {</div><div class='ctx'> </div><div class='ctx'> static struct attribute_group inf_attr_grp = {.attrs = inf_attrs };</div><div class='ctx'> </div><div class='del'>-static struct file_operations inf_ops = {</div><div class='add'>+static const struct file_operations inf_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.open = tpm_open,</div><div class='head'>diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c<br/>index 4c8bc06c7d95..26287aace87d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_nsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_nsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_nsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tpm/tpm_nsc.c</a></div><div class='hunk'>@@ -226,7 +226,7 @@ static u8 tpm_nsc_status(struct tpm_chip *chip)</div><div class='ctx'> 	return inb(chip-&gt;vendor.base + NSC_STATUS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations nsc_ops = {</div><div class='add'>+static const struct file_operations nsc_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.open = tpm_open,</div><div class='head'>diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c<br/>index 8ea70625f7ea..ee7ac6f43c65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_tis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tpm/tpm_tis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tpm/tpm_tis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tpm/tpm_tis.c</a></div><div class='hunk'>@@ -330,7 +330,7 @@ out_err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations tis_ops = {</div><div class='add'>+static const struct file_operations tis_ops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.open = tpm_open,</div><div class='hunk'>@@ -424,6 +424,7 @@ static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	iowrite32(interrupt,</div><div class='ctx'> 		  chip-&gt;vendor.iobase +</div><div class='ctx'> 		  TPM_INT_STATUS(chip-&gt;vendor.locality));</div><div class='add'>+	ioread32(chip-&gt;vendor.iobase + TPM_INT_STATUS(chip-&gt;vendor.locality));</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -431,23 +432,19 @@ static int interrupts = 1;</div><div class='ctx'> module_param(interrupts, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(interrupts, "Enable interrupts");</div><div class='ctx'> </div><div class='del'>-static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,</div><div class='del'>-				      const struct pnp_device_id *pnp_id)</div><div class='add'>+static int tpm_tis_init(struct device *dev, resource_size_t start,</div><div class='add'>+			resource_size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 vendor, intfcaps, intmask;</div><div class='ctx'> 	int rc, i;</div><div class='del'>-	unsigned long start, len;</div><div class='ctx'> 	struct tpm_chip *chip;</div><div class='ctx'> </div><div class='del'>-	start = pnp_mem_start(pnp_dev, 0);</div><div class='del'>-	len = pnp_mem_len(pnp_dev, 0);</div><div class='del'>-</div><div class='ctx'> 	if (!start)</div><div class='ctx'> 		start = TIS_MEM_BASE;</div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		len = TIS_MEM_LEN;</div><div class='ctx'> </div><div class='del'>-	if (!(chip = tpm_register_hardware(&amp;pnp_dev-&gt;dev, &amp;tpm_tis)))</div><div class='add'>+	if (!(chip = tpm_register_hardware(dev, &amp;tpm_tis)))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;vendor.iobase = ioremap(start, len);</div><div class='hunk'>@@ -464,7 +461,7 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,</div><div class='ctx'> 	chip-&gt;vendor.timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT);</div><div class='ctx'> 	chip-&gt;vendor.timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pnp_dev-&gt;dev,</div><div class='add'>+	dev_info(dev,</div><div class='ctx'> 		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",</div><div class='ctx'> 		 vendor &gt;&gt; 16, ioread8(chip-&gt;vendor.iobase + TPM_RID(0)));</div><div class='ctx'> </div><div class='hunk'>@@ -472,26 +469,26 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,</div><div class='ctx'> 	intfcaps =</div><div class='ctx'> 	    ioread32(chip-&gt;vendor.iobase +</div><div class='ctx'> 		     TPM_INTF_CAPS(chip-&gt;vendor.locality));</div><div class='del'>-	dev_dbg(&amp;pnp_dev-&gt;dev, "TPM interface capabilities (0x%x):\n",</div><div class='add'>+	dev_dbg(dev, "TPM interface capabilities (0x%x):\n",</div><div class='ctx'> 		intfcaps);</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_BURST_COUNT_STATIC)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tBurst Count Static\n");</div><div class='add'>+		dev_dbg(dev, "\tBurst Count Static\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_CMD_READY_INT)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tCommand Ready Int Support\n");</div><div class='add'>+		dev_dbg(dev, "\tCommand Ready Int Support\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_INT_EDGE_FALLING)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tInterrupt Edge Falling\n");</div><div class='add'>+		dev_dbg(dev, "\tInterrupt Edge Falling\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_INT_EDGE_RISING)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tInterrupt Edge Rising\n");</div><div class='add'>+		dev_dbg(dev, "\tInterrupt Edge Rising\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_INT_LEVEL_LOW)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tInterrupt Level Low\n");</div><div class='add'>+		dev_dbg(dev, "\tInterrupt Level Low\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_INT_LEVEL_HIGH)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tInterrupt Level High\n");</div><div class='add'>+		dev_dbg(dev, "\tInterrupt Level High\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_LOCALITY_CHANGE_INT)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tLocality Change Int Support\n");</div><div class='add'>+		dev_dbg(dev, "\tLocality Change Int Support\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_STS_VALID_INT)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tSts Valid Int Support\n");</div><div class='add'>+		dev_dbg(dev, "\tSts Valid Int Support\n");</div><div class='ctx'> 	if (intfcaps &amp; TPM_INTF_DATA_AVAIL_INT)</div><div class='del'>-		dev_dbg(&amp;pnp_dev-&gt;dev, "\tData Avail Int Support\n");</div><div class='add'>+		dev_dbg(dev, "\tData Avail Int Support\n");</div><div class='ctx'> </div><div class='ctx'> 	if (request_locality(chip, 0) != 0) {</div><div class='ctx'> 		rc = -ENODEV;</div><div class='hunk'>@@ -522,7 +519,7 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,</div><div class='ctx'> 			iowrite8(i, chip-&gt;vendor.iobase +</div><div class='ctx'> 				    TPM_INT_VECTOR(chip-&gt;vendor.locality));</div><div class='ctx'> 			if (request_irq</div><div class='del'>-			    (i, tis_int_probe, SA_SHIRQ,</div><div class='add'>+			    (i, tis_int_probe, IRQF_SHARED,</div><div class='ctx'> 			     chip-&gt;vendor.miscdev.name, chip) != 0) {</div><div class='ctx'> 				dev_info(chip-&gt;dev,</div><div class='ctx'> 					 "Unable to request irq: %d for probe\n",</div><div class='hunk'>@@ -557,7 +554,7 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,</div><div class='ctx'> 			 chip-&gt;vendor.iobase +</div><div class='ctx'> 			 TPM_INT_VECTOR(chip-&gt;vendor.locality));</div><div class='ctx'> 		if (request_irq</div><div class='del'>-		    (chip-&gt;vendor.irq, tis_int_handler, SA_SHIRQ,</div><div class='add'>+		    (chip-&gt;vendor.irq, tis_int_handler, IRQF_SHARED,</div><div class='ctx'> 		     chip-&gt;vendor.miscdev.name, chip) != 0) {</div><div class='ctx'> 			dev_info(chip-&gt;dev,</div><div class='ctx'> 				 "Unable to request irq: %d for use\n",</div><div class='hunk'>@@ -594,6 +591,16 @@ out_err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,</div><div class='add'>+				      const struct pnp_device_id *pnp_id)</div><div class='add'>+{</div><div class='add'>+	resource_size_t start, len;</div><div class='add'>+	start = pnp_mem_start(pnp_dev, 0);</div><div class='add'>+	len = pnp_mem_len(pnp_dev, 0);</div><div class='add'>+</div><div class='add'>+	return tpm_tis_init(&amp;pnp_dev-&gt;dev, start, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)</div><div class='ctx'> {</div><div class='ctx'> 	return tpm_pm_suspend(&amp;dev-&gt;dev, msg);</div><div class='hunk'>@@ -628,8 +635,36 @@ module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,</div><div class='ctx'> 		    sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);</div><div class='ctx'> MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");</div><div class='ctx'> </div><div class='add'>+static struct device_driver tis_drv = {</div><div class='add'>+	.name = "tpm_tis",</div><div class='add'>+	.bus = &amp;platform_bus_type,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.suspend = tpm_pm_suspend,</div><div class='add'>+	.resume = tpm_pm_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device *pdev;</div><div class='add'>+</div><div class='add'>+static int force;</div><div class='add'>+module_param(force, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry");</div><div class='ctx'> static int __init init_tis(void)</div><div class='ctx'> {</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (force) {</div><div class='add'>+		rc = driver_register(&amp;tis_drv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+		if (IS_ERR(pdev=platform_device_register_simple("tpm_tis", -1, NULL, 0)))</div><div class='add'>+			return PTR_ERR(pdev);</div><div class='add'>+		if((rc=tpm_tis_init(&amp;pdev-&gt;dev, 0, 0)) != 0) {</div><div class='add'>+			platform_device_unregister(pdev);</div><div class='add'>+			driver_unregister(&amp;tis_drv);</div><div class='add'>+		}</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return pnp_register_driver(&amp;tis_pnp_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -654,7 +689,11 @@ static void __exit cleanup_tis(void)</div><div class='ctx'> 		tpm_remove_hardware(chip-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;tis_lock);</div><div class='del'>-	pnp_unregister_driver(&amp;tis_pnp_driver);</div><div class='add'>+	if (force) {</div><div class='add'>+		platform_device_unregister(pdev);</div><div class='add'>+		driver_unregister(&amp;tis_drv);</div><div class='add'>+	} else</div><div class='add'>+		pnp_unregister_driver(&amp;tis_pnp_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(init_tis);</div><div class='head'>diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c<br/>index a88b94a82b14..bfdb90242a90 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/tty_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/tty_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/tty_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/tty_io.c</a></div><div class='hunk'>@@ -65,7 +65,6 @@</div><div class='ctx'>  * alloc_tty_struct() always uses kmalloc() -- Andrew Morton &lt;andrewm@uow.edu.eu&gt; 17Mar01</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -102,7 +101,6 @@</div><div class='ctx'> #include &lt;linux/kbd_kern.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include &lt;linux/selection.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +265,6 @@ static struct tty_buffer *tty_buffer_alloc(size_t size)</div><div class='ctx'> 	p-&gt;used = 0;</div><div class='ctx'> 	p-&gt;size = size;</div><div class='ctx'> 	p-&gt;next = NULL;</div><div class='del'>-	p-&gt;active = 0;</div><div class='ctx'> 	p-&gt;commit = 0;</div><div class='ctx'> 	p-&gt;read = 0;</div><div class='ctx'> 	p-&gt;char_buf_ptr = (char *)(p-&gt;data);</div><div class='hunk'>@@ -327,10 +324,9 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size)</div><div class='ctx'> 	/* OPTIMISATION: We could keep a per tty "zero" sized buffer to</div><div class='ctx'> 	   remove this conditional if its worth it. This would be invisible</div><div class='ctx'> 	   to the callers */</div><div class='del'>-	if ((b = tty-&gt;buf.tail) != NULL) {</div><div class='add'>+	if ((b = tty-&gt;buf.tail) != NULL)</div><div class='ctx'> 		left = b-&gt;size - b-&gt;used;</div><div class='del'>-		b-&gt;active = 1;</div><div class='del'>-	} else</div><div class='add'>+	else</div><div class='ctx'> 		left = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (left &lt; size) {</div><div class='hunk'>@@ -338,12 +334,10 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size)</div><div class='ctx'> 		if ((n = tty_buffer_find(tty, size)) != NULL) {</div><div class='ctx'> 			if (b != NULL) {</div><div class='ctx'> 				b-&gt;next = n;</div><div class='del'>-				b-&gt;active = 0;</div><div class='ctx'> 				b-&gt;commit = b-&gt;used;</div><div class='ctx'> 			} else</div><div class='ctx'> 				tty-&gt;buf.head = n;</div><div class='ctx'> 			tty-&gt;buf.tail = n;</div><div class='del'>-			n-&gt;active = 1;</div><div class='ctx'> 		} else</div><div class='ctx'> 			size = left;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -404,10 +398,8 @@ void tty_schedule_flip(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	if (tty-&gt;buf.tail != NULL) {</div><div class='del'>-		tty-&gt;buf.tail-&gt;active = 0;</div><div class='add'>+	if (tty-&gt;buf.tail != NULL)</div><div class='ctx'> 		tty-&gt;buf.tail-&gt;commit = tty-&gt;buf.tail-&gt;used;</div><div class='del'>-	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='ctx'> 	schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -784,11 +776,8 @@ restart:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(TTY_LDISC, &amp;tty-&gt;flags);</div><div class='del'>-	clear_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='del'>-	if (o_tty) {</div><div class='add'>+	if (o_tty)</div><div class='ctx'> 		clear_bit(TTY_LDISC, &amp;o_tty-&gt;flags);</div><div class='del'>-		clear_bit(TTY_DONT_FLIP, &amp;o_tty-&gt;flags);</div><div class='del'>-	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tty_ldisc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -923,7 +912,7 @@ static int hung_up_tty_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 	return cmd == TIOCSPGRP ? -ENOTTY : -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations tty_fops = {</div><div class='add'>+static const struct file_operations tty_fops = {</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= tty_read,</div><div class='ctx'> 	.write		= tty_write,</div><div class='hunk'>@@ -935,7 +924,7 @@ static struct file_operations tty_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UNIX98_PTYS</div><div class='del'>-static struct file_operations ptmx_fops = {</div><div class='add'>+static const struct file_operations ptmx_fops = {</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= tty_read,</div><div class='ctx'> 	.write		= tty_write,</div><div class='hunk'>@@ -947,7 +936,7 @@ static struct file_operations ptmx_fops = {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct file_operations console_fops = {</div><div class='add'>+static const struct file_operations console_fops = {</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= tty_read,</div><div class='ctx'> 	.write		= redirected_tty_write,</div><div class='hunk'>@@ -958,7 +947,7 @@ static struct file_operations console_fops = {</div><div class='ctx'> 	.fasync		= tty_fasync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations hung_up_tty_fops = {</div><div class='add'>+static const struct file_operations hung_up_tty_fops = {</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= hung_up_tty_read,</div><div class='ctx'> 	.write		= hung_up_tty_write,</div><div class='hunk'>@@ -1955,7 +1944,6 @@ static void release_dev(struct file * filp)</div><div class='ctx'> 	 * race with the set_ldisc code path.</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_bit(TTY_LDISC, &amp;tty-&gt;flags);</div><div class='del'>-	clear_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags);</div><div class='ctx'> 	cancel_delayed_work(&amp;tty-&gt;buf.work);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2348,7 +2336,7 @@ static int fionbio(struct file *file, int __user *p)</div><div class='ctx'> </div><div class='ctx'> static int tiocsctty(struct tty_struct *tty, int arg)</div><div class='ctx'> {</div><div class='del'>-	task_t *p;</div><div class='add'>+	struct task_struct *p;</div><div class='ctx'> </div><div class='ctx'> 	if (current-&gt;signal-&gt;leader &amp;&amp;</div><div class='ctx'> 	    (current-&gt;signal-&gt;session == tty-&gt;session))</div><div class='hunk'>@@ -2621,10 +2609,9 @@ int tty_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 			tty-&gt;driver-&gt;break_ctl(tty, 0);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case TCSBRK:   /* SVID version: non-zero arg --&gt; no break */</div><div class='del'>-			/*</div><div class='del'>-			 * XXX is the above comment correct, or the</div><div class='del'>-			 * code below correct?  Is this ioctl used at</div><div class='del'>-			 * all by anyone?</div><div class='add'>+			/* non-zero arg means wait for all output data</div><div class='add'>+			 * to be sent (performed above) but don't send break.</div><div class='add'>+			 * This is used by the tcdrain() termios function.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!arg)</div><div class='ctx'> 				return send_break(tty, 250);</div><div class='hunk'>@@ -2776,8 +2763,7 @@ static void flush_to_ldisc(void *private_)</div><div class='ctx'> 	struct tty_struct *tty = (struct tty_struct *) private_;</div><div class='ctx'> 	unsigned long 	flags;</div><div class='ctx'> 	struct tty_ldisc *disc;</div><div class='del'>-	struct tty_buffer *tbuf;</div><div class='del'>-	int count;</div><div class='add'>+	struct tty_buffer *tbuf, *head;</div><div class='ctx'> 	char *char_buf;</div><div class='ctx'> 	unsigned char *flag_buf;</div><div class='ctx'> </div><div class='hunk'>@@ -2785,32 +2771,37 @@ static void flush_to_ldisc(void *private_)</div><div class='ctx'> 	if (disc == NULL)	/*  !TTY_LDISC */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Do it after the next timer tick:</div><div class='del'>-		 */</div><div class='del'>-		schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	while((tbuf = tty-&gt;buf.head) != NULL) {</div><div class='del'>-		while ((count = tbuf-&gt;commit - tbuf-&gt;read) != 0) {</div><div class='del'>-			char_buf = tbuf-&gt;char_buf_ptr + tbuf-&gt;read;</div><div class='del'>-			flag_buf = tbuf-&gt;flag_buf_ptr + tbuf-&gt;read;</div><div class='del'>-			tbuf-&gt;read += count;</div><div class='add'>+	head = tty-&gt;buf.head;</div><div class='add'>+	if (head != NULL) {</div><div class='add'>+		tty-&gt;buf.head = NULL;</div><div class='add'>+		for (;;) {</div><div class='add'>+			int count = head-&gt;commit - head-&gt;read;</div><div class='add'>+			if (!count) {</div><div class='add'>+				if (head-&gt;next == NULL)</div><div class='add'>+					break;</div><div class='add'>+				tbuf = head;</div><div class='add'>+				head = head-&gt;next;</div><div class='add'>+				tty_buffer_free(tty, tbuf);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (!tty-&gt;receive_room) {</div><div class='add'>+				schedule_delayed_work(&amp;tty-&gt;buf.work, 1);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (count &gt; tty-&gt;receive_room)</div><div class='add'>+				count = tty-&gt;receive_room;</div><div class='add'>+			char_buf = head-&gt;char_buf_ptr + head-&gt;read;</div><div class='add'>+			flag_buf = head-&gt;flag_buf_ptr + head-&gt;read;</div><div class='add'>+			head-&gt;read += count;</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='ctx'> 			disc-&gt;receive_buf(tty, char_buf, flag_buf, count);</div><div class='ctx'> 			spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='ctx'> 		}</div><div class='del'>-		if (tbuf-&gt;active)</div><div class='del'>-			break;</div><div class='del'>-		tty-&gt;buf.head = tbuf-&gt;next;</div><div class='del'>-		if (tty-&gt;buf.head == NULL)</div><div class='del'>-			tty-&gt;buf.tail = NULL;</div><div class='del'>-		tty_buffer_free(tty, tbuf);</div><div class='add'>+		tty-&gt;buf.head = head;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-out:</div><div class='add'>+</div><div class='ctx'> 	tty_ldisc_deref(disc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2903,10 +2894,8 @@ void tty_flip_buffer_push(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	spin_lock_irqsave(&amp;tty-&gt;buf.lock, flags);</div><div class='del'>-	if (tty-&gt;buf.tail != NULL) {</div><div class='del'>-		tty-&gt;buf.tail-&gt;active = 0;</div><div class='add'>+	if (tty-&gt;buf.tail != NULL)</div><div class='ctx'> 		tty-&gt;buf.tail-&gt;commit = tty-&gt;buf.tail-&gt;used;</div><div class='del'>-	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tty-&gt;buf.lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (tty-&gt;low_latency)</div><div class='hunk'>@@ -2961,12 +2950,14 @@ static struct class *tty_class;</div><div class='ctx'>  *	This field is optional, if there is no known struct device for this</div><div class='ctx'>  *	tty device it can be set to NULL safely.</div><div class='ctx'>  *</div><div class='add'>+ * Returns a pointer to the class device (or ERR_PTR(-EFOO) on error).</div><div class='add'>+ *</div><div class='ctx'>  * This call is required to be made to register an individual tty device if</div><div class='del'>- * the tty driver's flags have the TTY_DRIVER_NO_DEVFS bit set.  If that</div><div class='del'>- * bit is not set, this function should not be called.</div><div class='add'>+ * the tty driver's flags have the TTY_DRIVER_DYNAMIC_DEV bit set.  If that</div><div class='add'>+ * bit is not set, this function should not be called by a tty driver.</div><div class='ctx'>  */</div><div class='del'>-void tty_register_device(struct tty_driver *driver, unsigned index,</div><div class='del'>-			 struct device *device)</div><div class='add'>+struct class_device *tty_register_device(struct tty_driver *driver,</div><div class='add'>+					 unsigned index, struct device *device)</div><div class='ctx'> {</div><div class='ctx'> 	char name[64];</div><div class='ctx'> 	dev_t dev = MKDEV(driver-&gt;major, driver-&gt;minor_start) + index;</div><div class='hunk'>@@ -2974,17 +2965,15 @@ void tty_register_device(struct tty_driver *driver, unsigned index,</div><div class='ctx'> 	if (index &gt;= driver-&gt;num) {</div><div class='ctx'> 		printk(KERN_ERR "Attempt to register invalid tty line number "</div><div class='ctx'> 		       " (%d).\n", index);</div><div class='del'>-		return;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-			"%s%d", driver-&gt;devfs_name, index + driver-&gt;name_base);</div><div class='del'>-</div><div class='ctx'> 	if (driver-&gt;type == TTY_DRIVER_TYPE_PTY)</div><div class='ctx'> 		pty_line_name(driver, index, name);</div><div class='ctx'> 	else</div><div class='ctx'> 		tty_line_name(driver, index, name);</div><div class='del'>-	class_device_create(tty_class, NULL, dev, device, "%s", name);</div><div class='add'>+</div><div class='add'>+	return class_device_create(tty_class, NULL, dev, device, "%s", name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2997,7 +2986,6 @@ void tty_register_device(struct tty_driver *driver, unsigned index,</div><div class='ctx'>  */</div><div class='ctx'> void tty_unregister_device(struct tty_driver *driver, unsigned index)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove("%s%d", driver-&gt;devfs_name, index + driver-&gt;name_base);</div><div class='ctx'> 	class_device_destroy(tty_class, MKDEV(driver-&gt;major, driver-&gt;minor_start) + index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3119,7 +3107,7 @@ int tty_register_driver(struct tty_driver *driver)</div><div class='ctx'> 	</div><div class='ctx'> 	list_add(&amp;driver-&gt;tty_drivers, &amp;tty_drivers);</div><div class='ctx'> 	</div><div class='del'>-	if ( !(driver-&gt;flags &amp; TTY_DRIVER_NO_DEVFS) ) {</div><div class='add'>+	if ( !(driver-&gt;flags &amp; TTY_DRIVER_DYNAMIC_DEV) ) {</div><div class='ctx'> 		for(i = 0; i &lt; driver-&gt;num; i++)</div><div class='ctx'> 		    tty_register_device(driver, i, NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3162,7 +3150,7 @@ int tty_unregister_driver(struct tty_driver *driver)</div><div class='ctx'> 			driver-&gt;termios_locked[i] = NULL;</div><div class='ctx'> 			kfree(tp);</div><div class='ctx'> 		}</div><div class='del'>-		if (!(driver-&gt;flags &amp; TTY_DRIVER_NO_DEVFS))</div><div class='add'>+		if (!(driver-&gt;flags &amp; TTY_DRIVER_DYNAMIC_DEV))</div><div class='ctx'> 			tty_unregister_device(driver, i);</div><div class='ctx'> 	}</div><div class='ctx'> 	p = driver-&gt;ttys;</div><div class='hunk'>@@ -3238,14 +3226,12 @@ static int __init tty_init(void)</div><div class='ctx'> 	if (cdev_add(&amp;tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||</div><div class='ctx'> 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") &lt; 0)</div><div class='ctx'> 		panic("Couldn't register /dev/tty driver\n");</div><div class='del'>-	devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");</div><div class='ctx'> 	class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");</div><div class='ctx'> </div><div class='ctx'> 	cdev_init(&amp;console_cdev, &amp;console_fops);</div><div class='ctx'> 	if (cdev_add(&amp;console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||</div><div class='ctx'> 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") &lt; 0)</div><div class='ctx'> 		panic("Couldn't register /dev/console driver\n");</div><div class='del'>-	devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console");</div><div class='ctx'> 	class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_UNIX98_PTYS</div><div class='hunk'>@@ -3253,7 +3239,6 @@ static int __init tty_init(void)</div><div class='ctx'> 	if (cdev_add(&amp;ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||</div><div class='ctx'> 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") &lt; 0)</div><div class='ctx'> 		panic("Couldn't register /dev/ptmx driver\n");</div><div class='del'>-	devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx");</div><div class='ctx'> 	class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -3262,7 +3247,6 @@ static int __init tty_init(void)</div><div class='ctx'> 	if (cdev_add(&amp;vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||</div><div class='ctx'> 	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") &lt; 0)</div><div class='ctx'> 		panic("Couldn't register /dev/tty0 driver\n");</div><div class='del'>-	devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0");</div><div class='ctx'> 	class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");</div><div class='ctx'> </div><div class='ctx'> 	vty_init();</div><div class='head'>diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c<br/>index 3c1dafaa3441..a9247b5213d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vc_screen.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vc_screen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vc_screen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/vc_screen.c</a></div><div class='hunk'>@@ -21,12 +21,10 @@</div><div class='ctx'>  *	 - making it shorter - scr_readw are macros which expand in PRETTY long code</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -467,7 +465,7 @@ vcs_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations vcs_fops = {</div><div class='add'>+static const struct file_operations vcs_fops = {</div><div class='ctx'> 	.llseek		= vcs_lseek,</div><div class='ctx'> 	.read		= vcs_read,</div><div class='ctx'> 	.write		= vcs_write,</div><div class='hunk'>@@ -478,12 +476,6 @@ static struct class *vc_class;</div><div class='ctx'> </div><div class='ctx'> void vcs_make_devfs(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	devfs_mk_cdev(MKDEV(VCS_MAJOR, tty-&gt;index + 1),</div><div class='del'>-			S_IFCHR|S_IRUSR|S_IWUSR,</div><div class='del'>-			"vcc/%u", tty-&gt;index + 1);</div><div class='del'>-	devfs_mk_cdev(MKDEV(VCS_MAJOR, tty-&gt;index + 129),</div><div class='del'>-			S_IFCHR|S_IRUSR|S_IWUSR,</div><div class='del'>-			"vcc/a%u", tty-&gt;index + 1);</div><div class='ctx'> 	class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty-&gt;index + 1),</div><div class='ctx'> 			NULL, "vcs%u", tty-&gt;index + 1);</div><div class='ctx'> 	class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty-&gt;index + 129),</div><div class='hunk'>@@ -491,8 +483,6 @@ void vcs_make_devfs(struct tty_struct *tty)</div><div class='ctx'> }</div><div class='ctx'> void vcs_remove_devfs(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove("vcc/%u", tty-&gt;index + 1);</div><div class='del'>-	devfs_remove("vcc/a%u", tty-&gt;index + 1);</div><div class='ctx'> 	class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty-&gt;index + 1));</div><div class='ctx'> 	class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty-&gt;index + 129));</div><div class='ctx'> }</div><div class='hunk'>@@ -503,8 +493,6 @@ int __init vcs_init(void)</div><div class='ctx'> 		panic("unable to get major %d for vcs device", VCS_MAJOR);</div><div class='ctx'> 	vc_class = class_create(THIS_MODULE, "vc");</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(VCS_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/0");</div><div class='del'>-	devfs_mk_cdev(MKDEV(VCS_MAJOR, 128), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/a0");</div><div class='ctx'> 	class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");</div><div class='ctx'> 	class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c<br/>index 4e5360388748..766f7864c6c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/viocons.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/viocons.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/viocons.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/viocons.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software Foundation,</div><div class='ctx'>  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -1152,7 +1151,6 @@ static int __init viocons_init2(void)</div><div class='ctx'> 	viotty_driver = alloc_tty_driver(VTTY_PORTS);</div><div class='ctx'> 	viotty_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	viotty_driver-&gt;driver_name = "vioconsole";</div><div class='del'>-	viotty_driver-&gt;devfs_name = "vcs/";</div><div class='ctx'> 	viotty_driver-&gt;name = "tty";</div><div class='ctx'> 	viotty_driver-&gt;name_base = 1;</div><div class='ctx'> 	viotty_driver-&gt;major = TTY_MAJOR;</div><div class='head'>diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c<br/>index 60aabdb4a046..b72b2049aaae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/viotape.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/viotape.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/viotape.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/viotape.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * the OS/400 partition.  The format of the messages is defined in</div><div class='ctx'>  * iseries/vio.h</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -43,7 +42,6 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -246,7 +244,6 @@ static struct device *tape_device[VIOTAPE_MAX_TAPE];</div><div class='ctx'>  */</div><div class='ctx'> static struct {</div><div class='ctx'> 	unsigned char	cur_part;</div><div class='del'>-	int		dev_handle;</div><div class='ctx'> 	unsigned char	part_stat_rwi[MAX_PARTITIONS];</div><div class='ctx'> } state[VIOTAPE_MAX_TAPE];</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +292,7 @@ static int proc_viotape_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return single_open(file, proc_viotape_show, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations proc_viotape_operations = {</div><div class='add'>+static const struct file_operations proc_viotape_operations = {</div><div class='ctx'> 	.open		= proc_viotape_open,</div><div class='ctx'> 	.read		= seq_read,</div><div class='ctx'> 	.llseek		= seq_lseek,</div><div class='hunk'>@@ -959,12 +956,7 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 			"iseries!vt%d", i);</div><div class='ctx'> 	class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),</div><div class='ctx'> 			NULL, "iseries!nvt%d", i);</div><div class='del'>-	devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-			"iseries/vt%d", i);</div><div class='del'>-	devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80),</div><div class='del'>-			S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i);</div><div class='ctx'> 	sprintf(tapename, "iseries/vt%d", i);</div><div class='del'>-	state[i].dev_handle = devfs_register_tape(tapename);</div><div class='ctx'> 	printk(VIOTAPE_KERN_INFO "tape %s is iSeries "</div><div class='ctx'> 			"resource %10.10s type %4.4s, model %3.3s\n",</div><div class='ctx'> 			tapename, viotape_unitinfo[i].rsrcname,</div><div class='hunk'>@@ -976,9 +968,6 @@ static int viotape_remove(struct vio_dev *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i = vdev-&gt;unit_address;</div><div class='ctx'> </div><div class='del'>-	devfs_remove("iseries/nvt%d", i);</div><div class='del'>-	devfs_remove("iseries/vt%d", i);</div><div class='del'>-	devfs_unregister_tape(state[i].dev_handle);</div><div class='ctx'> 	class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80));</div><div class='ctx'> 	class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -989,7 +978,7 @@ static int viotape_remove(struct vio_dev *vdev)</div><div class='ctx'>  * support.</div><div class='ctx'>  */</div><div class='ctx'> static struct vio_device_id viotape_device_table[] __devinitdata = {</div><div class='del'>-	{ "viotape", "" },</div><div class='add'>+	{ "byte", "IBM,iSeries-viotape" },</div><div class='ctx'> 	{ "", "" }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(vio, viotape_device_table);</div><div class='head'>diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c<br/>index fd00822ac145..bfe5ea948f6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vme_scc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vme_scc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vme_scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/vme_scc.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -147,7 +146,6 @@ static int scc_init_drivers(void)</div><div class='ctx'> 	scc_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	scc_driver-&gt;driver_name = "scc";</div><div class='ctx'> 	scc_driver-&gt;name = "ttyS";</div><div class='del'>-	scc_driver-&gt;devfs_name = "tts/";</div><div class='ctx'> 	scc_driver-&gt;major = TTY_MAJOR;</div><div class='ctx'> 	scc_driver-&gt;minor_start = SCC_MINOR_BASE;</div><div class='ctx'> 	scc_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='hunk'>@@ -205,13 +203,13 @@ static int mvme147_scc_init(void)</div><div class='ctx'> 	port-&gt;datap = port-&gt;ctrlp + 1;</div><div class='ctx'> 	port-&gt;port_a = &amp;scc_ports[0];</div><div class='ctx'> 	port-&gt;port_b = &amp;scc_ports[1];</div><div class='del'>-	request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCA_TX, scc_tx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A TX", port);</div><div class='del'>-	request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCA_STAT, scc_stat_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A status", port);</div><div class='del'>-	request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCA_RX, scc_rx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A RX", port);</div><div class='del'>-	request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCA_SPCOND, scc_spcond_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A special cond", port);</div><div class='ctx'> 	{</div><div class='ctx'> 		SCC_ACCESS_INIT(port);</div><div class='hunk'>@@ -232,13 +230,13 @@ static int mvme147_scc_init(void)</div><div class='ctx'> 	port-&gt;datap = port-&gt;ctrlp + 1;</div><div class='ctx'> 	port-&gt;port_a = &amp;scc_ports[0];</div><div class='ctx'> 	port-&gt;port_b = &amp;scc_ports[1];</div><div class='del'>-	request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCB_TX, scc_tx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B TX", port);</div><div class='del'>-	request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCB_STAT, scc_stat_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B status", port);</div><div class='del'>-	request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCB_RX, scc_rx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B RX", port);</div><div class='del'>-	request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME147_IRQ_SCCB_SPCOND, scc_spcond_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B special cond", port);</div><div class='ctx'> 	{</div><div class='ctx'> 		SCC_ACCESS_INIT(port);</div><div class='hunk'>@@ -275,13 +273,13 @@ static int mvme162_scc_init(void)</div><div class='ctx'> 	port-&gt;datap = port-&gt;ctrlp + 2;</div><div class='ctx'> 	port-&gt;port_a = &amp;scc_ports[0];</div><div class='ctx'> 	port-&gt;port_b = &amp;scc_ports[1];</div><div class='del'>-	request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCA_TX, scc_tx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A TX", port);</div><div class='del'>-	request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCA_STAT, scc_stat_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A status", port);</div><div class='del'>-	request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCA_RX, scc_rx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A RX", port);</div><div class='del'>-	request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCA_SPCOND, scc_spcond_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A special cond", port);</div><div class='ctx'> 	{</div><div class='ctx'> 		SCC_ACCESS_INIT(port);</div><div class='hunk'>@@ -302,13 +300,13 @@ static int mvme162_scc_init(void)</div><div class='ctx'> 	port-&gt;datap = port-&gt;ctrlp + 2;</div><div class='ctx'> 	port-&gt;port_a = &amp;scc_ports[0];</div><div class='ctx'> 	port-&gt;port_b = &amp;scc_ports[1];</div><div class='del'>-	request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCB_TX, scc_tx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B TX", port);</div><div class='del'>-	request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCB_STAT, scc_stat_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B status", port);</div><div class='del'>-	request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCB_RX, scc_rx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B RX", port);</div><div class='del'>-	request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(MVME162_IRQ_SCCB_SPCOND, scc_spcond_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B special cond", port);</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -343,13 +341,13 @@ static int bvme6000_scc_init(void)</div><div class='ctx'> 	port-&gt;datap = port-&gt;ctrlp + 4;</div><div class='ctx'> 	port-&gt;port_a = &amp;scc_ports[0];</div><div class='ctx'> 	port-&gt;port_b = &amp;scc_ports[1];</div><div class='del'>-	request_irq(BVME_IRQ_SCCA_TX, scc_tx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCA_TX, scc_tx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A TX", port);</div><div class='del'>-	request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCA_STAT, scc_stat_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A status", port);</div><div class='del'>-	request_irq(BVME_IRQ_SCCA_RX, scc_rx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCA_RX, scc_rx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A RX", port);</div><div class='del'>-	request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCA_SPCOND, scc_spcond_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-A special cond", port);</div><div class='ctx'> 	{</div><div class='ctx'> 		SCC_ACCESS_INIT(port);</div><div class='hunk'>@@ -370,13 +368,13 @@ static int bvme6000_scc_init(void)</div><div class='ctx'> 	port-&gt;datap = port-&gt;ctrlp + 4;</div><div class='ctx'> 	port-&gt;port_a = &amp;scc_ports[0];</div><div class='ctx'> 	port-&gt;port_b = &amp;scc_ports[1];</div><div class='del'>-	request_irq(BVME_IRQ_SCCB_TX, scc_tx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCB_TX, scc_tx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B TX", port);</div><div class='del'>-	request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCB_STAT, scc_stat_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B status", port);</div><div class='del'>-	request_irq(BVME_IRQ_SCCB_RX, scc_rx_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCB_RX, scc_rx_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B RX", port);</div><div class='del'>-	request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int, SA_INTERRUPT,</div><div class='add'>+	request_irq(BVME_IRQ_SCCB_SPCOND, scc_spcond_int, IRQF_DISABLED,</div><div class='ctx'> 		            "SCC-B special cond", port);</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='head'>diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c<br/>index 05e6e814d86f..8116a47b80f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vr41xx_giu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vr41xx_giu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vr41xx_giu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/vr41xx_giu.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/cpu.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/vr41xx/giu.h&gt;</div><div class='add'>+#include &lt;asm/vr41xx/irq.h&gt;</div><div class='ctx'> #include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;");</div><div class='hunk'>@@ -605,7 +606,7 @@ static int gpio_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations gpio_fops = {</div><div class='add'>+static const struct file_operations gpio_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.read		= gpio_read,</div><div class='ctx'> 	.write		= gpio_write,</div><div class='hunk'>@@ -689,9 +690,9 @@ static int __devinit giu_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = GIU_IRQ_BASE; i &lt;= GIU_IRQ_LAST; i++) {</div><div class='ctx'> 		if (i &lt; GIU_IRQ(GIUINT_HIGH_OFFSET))</div><div class='del'>-			irq_desc[i].handler = &amp;giuint_low_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;giuint_low_irq_type;</div><div class='ctx'> 		else</div><div class='del'>-			irq_desc[i].handler = &amp;giuint_high_irq_type;</div><div class='add'>+			irq_desc[i].chip = &amp;giuint_high_irq_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return cascade_irq(GIUINT_IRQ, giu_get_irq);</div><div class='head'>diff --git a/drivers/char/vt.c b/drivers/char/vt.c<br/>index 6c94879e0b99..da7e66a2a38b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/vt.c</a></div><div class='hunk'>@@ -79,7 +79,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include &lt;linux/selection.h&gt;</div><div class='ctx'> #include &lt;linux/tiocl.h&gt;</div><div class='hunk'>@@ -87,7 +86,6 @@</div><div class='ctx'> #include &lt;linux/consolemap.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='hunk'>@@ -98,7 +96,22 @@</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#define MAX_NR_CON_DRIVER 16</div><div class='ctx'> </div><div class='add'>+#define CON_DRIVER_FLAG_MODULE 1</div><div class='add'>+#define CON_DRIVER_FLAG_INIT 2</div><div class='add'>+</div><div class='add'>+struct con_driver {</div><div class='add'>+	const struct consw *con;</div><div class='add'>+	const char *desc;</div><div class='add'>+	struct class_device *class_dev;</div><div class='add'>+	int node;</div><div class='add'>+	int first;</div><div class='add'>+	int last;</div><div class='add'>+	int flag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct con_driver registered_con_driver[MAX_NR_CON_DRIVER];</div><div class='ctx'> const struct consw *conswitchp;</div><div class='ctx'> </div><div class='ctx'> /* A bitmap for codes &lt;32. A bit of 1 indicates that the code</div><div class='hunk'>@@ -873,6 +886,7 @@ void vc_disallocate(unsigned int currcons)</div><div class='ctx'> 	if (vc_cons_allocated(currcons)) {</div><div class='ctx'> 		struct vc_data *vc = vc_cons[currcons].d;</div><div class='ctx'> 		vc-&gt;vc_sw-&gt;con_deinit(vc);</div><div class='add'>+		module_put(vc-&gt;vc_sw-&gt;owner);</div><div class='ctx'> 		if (vc-&gt;vc_kmalloced)</div><div class='ctx'> 			kfree(vc-&gt;vc_screenbuf);</div><div class='ctx'> 		if (currcons &gt;= MIN_NR_CONSOLES)</div><div class='hunk'>@@ -2557,7 +2571,7 @@ static int __init con_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	const char *display_desc = NULL;</div><div class='ctx'> 	struct vc_data *vc;</div><div class='del'>-	unsigned int currcons = 0;</div><div class='add'>+	unsigned int currcons = 0, i;</div><div class='ctx'> </div><div class='ctx'> 	acquire_console_sem();</div><div class='ctx'> </div><div class='hunk'>@@ -2569,6 +2583,22 @@ static int __init con_init(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		struct con_driver *con_driver = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con_driver-&gt;con == NULL) {</div><div class='add'>+			con_driver-&gt;con = conswitchp;</div><div class='add'>+			con_driver-&gt;desc = display_desc;</div><div class='add'>+			con_driver-&gt;flag = CON_DRIVER_FLAG_INIT;</div><div class='add'>+			con_driver-&gt;first = 0;</div><div class='add'>+			con_driver-&gt;last = MAX_NR_CONSOLES - 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CONSOLES; i++)</div><div class='add'>+		con_driver_map[i] = conswitchp;</div><div class='add'>+</div><div class='ctx'> 	init_timer(&amp;console_timer);</div><div class='ctx'> 	console_timer.function = blank_screen_t;</div><div class='ctx'> 	if (blankinterval) {</div><div class='hunk'>@@ -2632,7 +2662,6 @@ int __init vty_init(void)</div><div class='ctx'> 	if (!console_driver)</div><div class='ctx'> 		panic("Couldn't allocate console driver\n");</div><div class='ctx'> 	console_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	console_driver-&gt;devfs_name = "vc/";</div><div class='ctx'> 	console_driver-&gt;name = "tty";</div><div class='ctx'> 	console_driver-&gt;name_base = 1;</div><div class='ctx'> 	console_driver-&gt;major = TTY_MAJOR;</div><div class='hunk'>@@ -2656,38 +2685,53 @@ int __init vty_init(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef VT_SINGLE_DRIVER</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	If we support more console drivers, this function is used</div><div class='del'>- *	when a driver wants to take over some existing consoles</div><div class='del'>- *	and become default driver for newly opened ones.</div><div class='del'>- */</div><div class='add'>+static struct class *vtconsole_class;</div><div class='ctx'> </div><div class='del'>-int take_over_console(const struct consw *csw, int first, int last, int deflt)</div><div class='add'>+static int bind_con_driver(const struct consw *csw, int first, int last,</div><div class='add'>+			   int deflt)</div><div class='ctx'> {</div><div class='del'>-	int i, j = -1;</div><div class='del'>-	const char *desc;</div><div class='del'>-	struct module *owner;</div><div class='add'>+	struct module *owner = csw-&gt;owner;</div><div class='add'>+	const char *desc = NULL;</div><div class='add'>+	struct con_driver *con_driver;</div><div class='add'>+	int i, j = -1, k = -1, retval = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	owner = csw-&gt;owner;</div><div class='ctx'> 	if (!try_module_get(owner))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	acquire_console_sem();</div><div class='ctx'> </div><div class='del'>-	desc = csw-&gt;con_startup();</div><div class='del'>-	if (!desc) {</div><div class='del'>-		release_console_sem();</div><div class='del'>-		module_put(owner);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	/* check if driver is registered */</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		con_driver = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con_driver-&gt;con == csw) {</div><div class='add'>+			desc = con_driver-&gt;desc;</div><div class='add'>+			retval = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!(con_driver-&gt;flag &amp; CON_DRIVER_FLAG_INIT)) {</div><div class='add'>+		csw-&gt;con_startup();</div><div class='add'>+		con_driver-&gt;flag |= CON_DRIVER_FLAG_INIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (deflt) {</div><div class='ctx'> 		if (conswitchp)</div><div class='ctx'> 			module_put(conswitchp-&gt;owner);</div><div class='add'>+</div><div class='ctx'> 		__module_get(owner);</div><div class='ctx'> 		conswitchp = csw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	first = max(first, con_driver-&gt;first);</div><div class='add'>+	last = min(last, con_driver-&gt;last);</div><div class='add'>+</div><div class='ctx'> 	for (i = first; i &lt;= last; i++) {</div><div class='ctx'> 		int old_was_color;</div><div class='ctx'> 		struct vc_data *vc = vc_cons[i].d;</div><div class='hunk'>@@ -2701,15 +2745,17 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		j = i;</div><div class='del'>-		if (CON_IS_VISIBLE(vc))</div><div class='add'>+</div><div class='add'>+		if (CON_IS_VISIBLE(vc)) {</div><div class='add'>+			k = i;</div><div class='ctx'> 			save_screen(vc);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		old_was_color = vc-&gt;vc_can_do_color;</div><div class='ctx'> 		vc-&gt;vc_sw-&gt;con_deinit(vc);</div><div class='ctx'> 		vc-&gt;vc_origin = (unsigned long)vc-&gt;vc_screenbuf;</div><div class='del'>-		vc-&gt;vc_visible_origin = vc-&gt;vc_origin;</div><div class='del'>-		vc-&gt;vc_scr_end = vc-&gt;vc_origin + vc-&gt;vc_screenbuf_size;</div><div class='del'>-		vc-&gt;vc_pos = vc-&gt;vc_origin + vc-&gt;vc_size_row * vc-&gt;vc_y + 2 * vc-&gt;vc_x;</div><div class='ctx'> 		visual_init(vc, i, 0);</div><div class='add'>+		set_origin(vc);</div><div class='ctx'> 		update_attr(vc);</div><div class='ctx'> </div><div class='ctx'> 		/* If the console changed between mono &lt;-&gt; color, then</div><div class='hunk'>@@ -2718,36 +2764,506 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (old_was_color != vc-&gt;vc_can_do_color)</div><div class='ctx'> 			clear_buffer_attributes(vc);</div><div class='del'>-</div><div class='del'>-		if (CON_IS_VISIBLE(vc))</div><div class='del'>-			update_screen(vc);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	printk("Console: switching ");</div><div class='ctx'> 	if (!deflt)</div><div class='ctx'> 		printk("consoles %d-%d ", first+1, last+1);</div><div class='del'>-	if (j &gt;= 0)</div><div class='add'>+	if (j &gt;= 0) {</div><div class='add'>+		struct vc_data *vc = vc_cons[j].d;</div><div class='add'>+</div><div class='ctx'> 		printk("to %s %s %dx%d\n",</div><div class='del'>-		       vc_cons[j].d-&gt;vc_can_do_color ? "colour" : "mono",</div><div class='del'>-		       desc, vc_cons[j].d-&gt;vc_cols, vc_cons[j].d-&gt;vc_rows);</div><div class='del'>-	else</div><div class='add'>+		       vc-&gt;vc_can_do_color ? "colour" : "mono",</div><div class='add'>+		       desc, vc-&gt;vc_cols, vc-&gt;vc_rows);</div><div class='add'>+</div><div class='add'>+		if (k &gt;= 0) {</div><div class='add'>+			vc = vc_cons[k].d;</div><div class='add'>+			update_screen(vc);</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='ctx'> 		printk("to %s\n", desc);</div><div class='ctx'> </div><div class='add'>+	retval = 0;</div><div class='add'>+err:</div><div class='ctx'> 	release_console_sem();</div><div class='add'>+	module_put(owner);</div><div class='add'>+	return retval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VT_HW_CONSOLE_BINDING</div><div class='add'>+static int con_is_graphics(const struct consw *csw, int first, int last)</div><div class='add'>+{</div><div class='add'>+	int i, retval = 0;</div><div class='ctx'> </div><div class='add'>+	for (i = first; i &lt;= last; i++) {</div><div class='add'>+		struct vc_data *vc = vc_cons[i].d;</div><div class='add'>+</div><div class='add'>+		if (vc &amp;&amp; vc-&gt;vc_mode == KD_GRAPHICS) {</div><div class='add'>+			retval = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int unbind_con_driver(const struct consw *csw, int first, int last,</div><div class='add'>+			     int deflt)</div><div class='add'>+{</div><div class='add'>+	struct module *owner = csw-&gt;owner;</div><div class='add'>+	const struct consw *defcsw = NULL;</div><div class='add'>+	struct con_driver *con_driver = NULL, *con_back = NULL;</div><div class='add'>+	int i, retval = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(owner))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+</div><div class='add'>+	/* check if driver is registered and if it is unbindable */</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		con_driver = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con_driver-&gt;con == csw &amp;&amp;</div><div class='add'>+		    con_driver-&gt;flag &amp; CON_DRIVER_FLAG_MODULE) {</div><div class='add'>+			retval = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		release_console_sem();</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* check if backup driver exists */</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		con_back = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con_back-&gt;con &amp;&amp;</div><div class='add'>+		    !(con_back-&gt;flag &amp; CON_DRIVER_FLAG_MODULE)) {</div><div class='add'>+			defcsw = con_back-&gt;con;</div><div class='add'>+			retval = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retval) {</div><div class='add'>+		release_console_sem();</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!con_is_bound(csw)) {</div><div class='add'>+		release_console_sem();</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	first = max(first, con_driver-&gt;first);</div><div class='add'>+	last = min(last, con_driver-&gt;last);</div><div class='add'>+</div><div class='add'>+	for (i = first; i &lt;= last; i++) {</div><div class='add'>+		if (con_driver_map[i] == csw) {</div><div class='add'>+			module_put(csw-&gt;owner);</div><div class='add'>+			con_driver_map[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!con_is_bound(defcsw)) {</div><div class='add'>+		const struct consw *defconsw = conswitchp;</div><div class='add'>+</div><div class='add'>+		defcsw-&gt;con_startup();</div><div class='add'>+		con_back-&gt;flag |= CON_DRIVER_FLAG_INIT;</div><div class='add'>+		/*</div><div class='add'>+		 * vgacon may change the default driver to point</div><div class='add'>+		 * to dummycon, we restore it here...</div><div class='add'>+		 */</div><div class='add'>+		conswitchp = defconsw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!con_is_bound(csw))</div><div class='add'>+		con_driver-&gt;flag &amp;= ~CON_DRIVER_FLAG_INIT;</div><div class='add'>+</div><div class='add'>+	release_console_sem();</div><div class='add'>+	/* ignore return value, binding should not fail */</div><div class='add'>+	bind_con_driver(defcsw, first, last, deflt);</div><div class='add'>+err:</div><div class='ctx'> 	module_put(owner);</div><div class='add'>+	return retval;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vt_bind(struct con_driver *con)</div><div class='add'>+{</div><div class='add'>+	const struct consw *defcsw = NULL, *csw = NULL;</div><div class='add'>+	int i, more = 1, first = -1, last = -1, deflt = 0;</div><div class='add'>+</div><div class='add'>+ 	if (!con-&gt;con || !(con-&gt;flag &amp; CON_DRIVER_FLAG_MODULE) ||</div><div class='add'>+	    con_is_graphics(con-&gt;con, con-&gt;first, con-&gt;last))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	csw = con-&gt;con;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		struct con_driver *con = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con-&gt;con &amp;&amp; !(con-&gt;flag &amp; CON_DRIVER_FLAG_MODULE)) {</div><div class='add'>+			defcsw = con-&gt;con;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!defcsw)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	while (more) {</div><div class='add'>+		more = 0;</div><div class='add'>+</div><div class='add'>+		for (i = con-&gt;first; i &lt;= con-&gt;last; i++) {</div><div class='add'>+			if (con_driver_map[i] == defcsw) {</div><div class='add'>+				if (first == -1)</div><div class='add'>+					first = i;</div><div class='add'>+				last = i;</div><div class='add'>+				more = 1;</div><div class='add'>+			} else if (first != -1)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (first == 0 &amp;&amp; last == MAX_NR_CONSOLES -1)</div><div class='add'>+			deflt = 1;</div><div class='add'>+</div><div class='add'>+		if (first != -1)</div><div class='add'>+			bind_con_driver(csw, first, last, deflt);</div><div class='add'>+</div><div class='add'>+		first = -1;</div><div class='add'>+		last = -1;</div><div class='add'>+		deflt = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void give_up_console(const struct consw *csw)</div><div class='add'>+static int vt_unbind(struct con_driver *con)</div><div class='add'>+{</div><div class='add'>+	const struct consw *csw = NULL;</div><div class='add'>+	int i, more = 1, first = -1, last = -1, deflt = 0;</div><div class='add'>+</div><div class='add'>+ 	if (!con-&gt;con || !(con-&gt;flag &amp; CON_DRIVER_FLAG_MODULE) ||</div><div class='add'>+	    con_is_graphics(con-&gt;con, con-&gt;first, con-&gt;last))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	csw = con-&gt;con;</div><div class='add'>+</div><div class='add'>+	while (more) {</div><div class='add'>+		more = 0;</div><div class='add'>+</div><div class='add'>+		for (i = con-&gt;first; i &lt;= con-&gt;last; i++) {</div><div class='add'>+			if (con_driver_map[i] == csw) {</div><div class='add'>+				if (first == -1)</div><div class='add'>+					first = i;</div><div class='add'>+				last = i;</div><div class='add'>+				more = 1;</div><div class='add'>+			} else if (first != -1)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (first == 0 &amp;&amp; last == MAX_NR_CONSOLES -1)</div><div class='add'>+			deflt = 1;</div><div class='add'>+</div><div class='add'>+		if (first != -1)</div><div class='add'>+			unbind_con_driver(csw, first, last, deflt);</div><div class='add'>+</div><div class='add'>+		first = -1;</div><div class='add'>+		last = -1;</div><div class='add'>+		deflt = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int vt_bind(struct con_driver *con)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline int vt_unbind(struct con_driver *con)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_VT_HW_CONSOLE_BINDING */</div><div class='add'>+</div><div class='add'>+static ssize_t store_bind(struct class_device *class_device,</div><div class='add'>+			  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct con_driver *con = class_get_devdata(class_device);</div><div class='add'>+	int bind = simple_strtoul(buf, NULL, 0);</div><div class='add'>+</div><div class='add'>+	if (bind)</div><div class='add'>+		vt_bind(con);</div><div class='add'>+	else</div><div class='add'>+		vt_unbind(con);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bind(struct class_device *class_device, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct con_driver *con = class_get_devdata(class_device);</div><div class='add'>+	int bind = con_is_bound(con-&gt;con);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%i\n", bind);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_name(struct class_device *class_device, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct con_driver *con = class_get_devdata(class_device);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%s %s\n",</div><div class='add'>+			(con-&gt;flag &amp; CON_DRIVER_FLAG_MODULE) ? "(M)" : "(S)",</div><div class='add'>+			 con-&gt;desc);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct class_device_attribute class_device_attrs[] = {</div><div class='add'>+	__ATTR(bind, S_IRUGO|S_IWUSR, show_bind, store_bind),</div><div class='add'>+	__ATTR(name, S_IRUGO, show_name, NULL),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vtconsole_init_class_device(struct con_driver *con)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	class_set_devdata(con-&gt;class_dev, con);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(class_device_attrs); i++)</div><div class='add'>+		class_device_create_file(con-&gt;class_dev,</div><div class='add'>+					 &amp;class_device_attrs[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vtconsole_deinit_class_device(struct con_driver *con)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; MAX_NR_CONSOLES; i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(class_device_attrs); i++)</div><div class='add'>+		class_device_remove_file(con-&gt;class_dev,</div><div class='add'>+					 &amp;class_device_attrs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * con_is_bound - checks if driver is bound to the console</div><div class='add'>+ * @csw: console driver</div><div class='add'>+ *</div><div class='add'>+ * RETURNS: zero if unbound, nonzero if bound</div><div class='add'>+ *</div><div class='add'>+ * Drivers can call this and if zero, they should release</div><div class='add'>+ * all resources allocated on con_startup()</div><div class='add'>+ */</div><div class='add'>+int con_is_bound(const struct consw *csw)</div><div class='add'>+{</div><div class='add'>+	int i, bound = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='ctx'> 		if (con_driver_map[i] == csw) {</div><div class='del'>-			module_put(csw-&gt;owner);</div><div class='del'>-			con_driver_map[i] = NULL;</div><div class='add'>+			bound = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bound;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(con_is_bound);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * register_con_driver - register console driver to console layer</div><div class='add'>+ * @csw: console driver</div><div class='add'>+ * @first: the first console to take over, minimum value is 0</div><div class='add'>+ * @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: This function registers a console driver which can later</div><div class='add'>+ * bind to a range of consoles specified by @first and @last. It will</div><div class='add'>+ * also initialize the console driver by calling con_startup().</div><div class='add'>+ */</div><div class='add'>+int register_con_driver(const struct consw *csw, int first, int last)</div><div class='add'>+{</div><div class='add'>+	struct module *owner = csw-&gt;owner;</div><div class='add'>+	struct con_driver *con_driver;</div><div class='add'>+	const char *desc;</div><div class='add'>+	int i, retval = 0;</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(owner))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		con_driver = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		/* already registered */</div><div class='add'>+		if (con_driver-&gt;con == csw)</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	desc = csw-&gt;con_startup();</div><div class='add'>+</div><div class='add'>+	if (!desc)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	retval = -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		con_driver = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con_driver-&gt;con == NULL) {</div><div class='add'>+			con_driver-&gt;con = csw;</div><div class='add'>+			con_driver-&gt;desc = desc;</div><div class='add'>+			con_driver-&gt;node = i;</div><div class='add'>+			con_driver-&gt;flag = CON_DRIVER_FLAG_MODULE |</div><div class='add'>+			                   CON_DRIVER_FLAG_INIT;</div><div class='add'>+			con_driver-&gt;first = first;</div><div class='add'>+			con_driver-&gt;last = last;</div><div class='add'>+			retval = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	con_driver-&gt;class_dev = class_device_create(vtconsole_class, NULL,</div><div class='add'>+						    MKDEV(0, con_driver-&gt;node),</div><div class='add'>+						    NULL, "vtcon%i",</div><div class='add'>+						    con_driver-&gt;node);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(con_driver-&gt;class_dev)) {</div><div class='add'>+		printk(KERN_WARNING "Unable to create class_device for %s; "</div><div class='add'>+		       "errno = %ld\n", con_driver-&gt;desc,</div><div class='add'>+		       PTR_ERR(con_driver-&gt;class_dev));</div><div class='add'>+		con_driver-&gt;class_dev = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		vtconsole_init_class_device(con_driver);</div><div class='add'>+	}</div><div class='add'>+err:</div><div class='add'>+	release_console_sem();</div><div class='add'>+	module_put(owner);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(register_con_driver);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * unregister_con_driver - unregister console driver from console layer</div><div class='add'>+ * @csw: console driver</div><div class='add'>+ *</div><div class='add'>+ * DESCRIPTION: All drivers that registers to the console layer must</div><div class='add'>+ * call this function upon exit, or if the console driver is in a state</div><div class='add'>+ * where it won't be able to handle console services, such as the</div><div class='add'>+ * framebuffer console without loaded framebuffer drivers.</div><div class='add'>+ *</div><div class='add'>+ * The driver must unbind first prior to unregistration.</div><div class='add'>+ */</div><div class='add'>+int unregister_con_driver(const struct consw *csw)</div><div class='add'>+{</div><div class='add'>+	int i, retval = -ENODEV;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+</div><div class='add'>+	/* cannot unregister a bound driver */</div><div class='add'>+	if (con_is_bound(csw))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		struct con_driver *con_driver = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con_driver-&gt;con == csw &amp;&amp;</div><div class='add'>+		    con_driver-&gt;flag &amp; CON_DRIVER_FLAG_MODULE) {</div><div class='add'>+			vtconsole_deinit_class_device(con_driver);</div><div class='add'>+			class_device_destroy(vtconsole_class,</div><div class='add'>+					     MKDEV(0, con_driver-&gt;node));</div><div class='add'>+			con_driver-&gt;con = NULL;</div><div class='add'>+			con_driver-&gt;desc = NULL;</div><div class='add'>+			con_driver-&gt;class_dev = NULL;</div><div class='add'>+			con_driver-&gt;node = 0;</div><div class='add'>+			con_driver-&gt;flag = 0;</div><div class='add'>+			con_driver-&gt;first = 0;</div><div class='add'>+			con_driver-&gt;last = 0;</div><div class='add'>+			retval = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+err:</div><div class='add'>+	release_console_sem();</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(unregister_con_driver);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	If we support more console drivers, this function is used</div><div class='add'>+ *	when a driver wants to take over some existing consoles</div><div class='add'>+ *	and become default driver for newly opened ones.</div><div class='add'>+ *</div><div class='add'>+ *      take_over_console is basically a register followed by unbind</div><div class='add'>+ */</div><div class='add'>+int take_over_console(const struct consw *csw, int first, int last, int deflt)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_con_driver(csw, first, last);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		bind_con_driver(csw, first, last, deflt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * give_up_console is a wrapper to unregister_con_driver. It will only</div><div class='add'>+ * work if driver is fully unbound.</div><div class='add'>+ */</div><div class='add'>+void give_up_console(const struct consw *csw)</div><div class='add'>+{</div><div class='add'>+	unregister_con_driver(csw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init vtconsole_class_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	vtconsole_class = class_create(THIS_MODULE, "vtconsole");</div><div class='add'>+	if (IS_ERR(vtconsole_class)) {</div><div class='add'>+		printk(KERN_WARNING "Unable to create vt console class; "</div><div class='add'>+		       "errno = %ld\n", PTR_ERR(vtconsole_class));</div><div class='add'>+		vtconsole_class = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add system drivers to sysfs */</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CON_DRIVER; i++) {</div><div class='add'>+		struct con_driver *con = &amp;registered_con_driver[i];</div><div class='add'>+</div><div class='add'>+		if (con-&gt;con &amp;&amp; !con-&gt;class_dev) {</div><div class='add'>+			con-&gt;class_dev =</div><div class='add'>+				class_device_create(vtconsole_class, NULL,</div><div class='add'>+						    MKDEV(0, con-&gt;node), NULL,</div><div class='add'>+						    "vtcon%i", con-&gt;node);</div><div class='add'>+</div><div class='add'>+			if (IS_ERR(con-&gt;class_dev)) {</div><div class='add'>+				printk(KERN_WARNING "Unable to create "</div><div class='add'>+				       "class_device for %s; errno = %ld\n",</div><div class='add'>+				       con-&gt;desc, PTR_ERR(con-&gt;class_dev));</div><div class='add'>+				con-&gt;class_dev = NULL;</div><div class='add'>+			} else {</div><div class='add'>+				vtconsole_init_class_device(con);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+postcore_initcall(vtconsole_class_init);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c<br/>index 24011e7c81ff..eccffaf26faa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/vt_ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/vt_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/vt_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/vt_ioctl.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  Check put/get_user, cleanups - acme@conectiva.com.br - Jun 2001</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/char/watchdog/acquirewdt.c b/drivers/char/watchdog/acquirewdt.c<br/>index 7289f4af93d0..c77fe3cf2852 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/acquirewdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/acquirewdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/acquirewdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/acquirewdt.c</a></div><div class='hunk'>@@ -231,7 +231,7 @@ static int acq_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations acq_fops = {</div><div class='add'>+static const struct file_operations acq_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= acq_write,</div><div class='head'>diff --git a/drivers/char/watchdog/advantechwdt.c b/drivers/char/watchdog/advantechwdt.c<br/>index 194a3fd36b91..8069be445edc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/advantechwdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/advantechwdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/advantechwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/advantechwdt.c</a></div><div class='hunk'>@@ -227,7 +227,7 @@ advwdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations advwdt_fops = {</div><div class='add'>+static const struct file_operations advwdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= advwdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/char/watchdog/alim1535_wdt.c<br/>index 8338ca300e2e..c5c94e4c9495 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/alim1535_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/alim1535_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/alim1535_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/alim1535_wdt.c</a></div><div class='hunk'>@@ -362,7 +362,7 @@ static int __init ali_find_watchdog(void)</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations ali_fops = {</div><div class='add'>+static const struct file_operations ali_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek =	no_llseek,</div><div class='ctx'> 	.write =	ali_write,</div><div class='head'>diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c<br/>index c05ac188a4d7..ffd7684f999b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/alim7101_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/alim7101_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/alim7101_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/alim7101_wdt.c</a></div><div class='hunk'>@@ -281,7 +281,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops = {</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='ctx'> 	.owner=		THIS_MODULE,</div><div class='ctx'> 	.llseek=	no_llseek,</div><div class='ctx'> 	.write=		fop_write,</div><div class='head'>diff --git a/drivers/char/watchdog/at91_wdt.c b/drivers/char/watchdog/at91_wdt.c<br/>index ac83bc4b019a..cc266715ea32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/at91_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/at91_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/at91_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/at91_wdt.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -17,14 +16,15 @@</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/watchdog.h&gt;</div><div class='ctx'> #include &lt;asm/bitops.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define WDT_DEFAULT_TIME	5	/* 5 seconds */</div><div class='del'>-#define WDT_MAX_TIME		256	/* 256 seconds */</div><div class='add'>+#define WDT_DEFAULT_TIME	5	/* seconds */</div><div class='add'>+#define WDT_MAX_TIME		256	/* seconds */</div><div class='ctx'> </div><div class='ctx'> static int wdt_time = WDT_DEFAULT_TIME;</div><div class='ctx'> static int nowayout = WATCHDOG_NOWAYOUT;</div><div class='hunk'>@@ -32,8 +32,10 @@ static int nowayout = WATCHDOG_NOWAYOUT;</div><div class='ctx'> module_param(wdt_time, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="__MODULE_STRING(WDT_DEFAULT_TIME) ")");</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_WATCHDOG_NOWAYOUT</div><div class='ctx'> module_param(nowayout, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static unsigned long at91wdt_busy;</div><div class='hunk'>@@ -138,7 +140,7 @@ static int at91_wdt_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case WDIOC_SETTIMEOUT:</div><div class='ctx'> 			if (get_user(new_value, p))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 			if (at91_wdt_settimeout(new_value))</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +183,7 @@ static ssize_t at91_wdt_write(struct file *file, const char *data, size_t len, l</div><div class='ctx'> </div><div class='ctx'> /* ......................................................................... */</div><div class='ctx'> </div><div class='del'>-static struct file_operations at91wdt_fops = {</div><div class='add'>+static const struct file_operations at91wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.ioctl		= at91_wdt_ioctl,</div><div class='hunk'>@@ -196,27 +198,84 @@ static struct miscdevice at91wdt_miscdev = {</div><div class='ctx'> 	.fops		= &amp;at91wdt_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init at91_wdt_init(void)</div><div class='add'>+static int __init at91wdt_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	/* Check that the heartbeat value is within range; if not reset to the default */</div><div class='del'>-	if (at91_wdt_settimeout(wdt_time)) {</div><div class='del'>-		at91_wdt_settimeout(WDT_DEFAULT_TIME);</div><div class='del'>-		printk(KERN_INFO "at91_wdt: wdt_time value must be 1 &lt;= wdt_time &lt;= 256, using %d\n", wdt_time);</div><div class='del'>-	}</div><div class='add'>+	if (at91wdt_miscdev.dev)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	at91wdt_miscdev.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	res = misc_register(&amp;at91wdt_miscdev);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='del'>-	printk("AT91 Watchdog Timer enabled (%d seconds, nowayout=%d)\n", wdt_time, nowayout);</div><div class='add'>+	printk("AT91 Watchdog Timer enabled (%d seconds%s)\n", wdt_time, nowayout ? ", nowayout" : "");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __exit at91wdt_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = misc_deregister(&amp;at91wdt_miscdev);</div><div class='add'>+	if (!res)</div><div class='add'>+		at91wdt_miscdev.dev = NULL;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at91wdt_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	at91_wdt_stop();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int at91wdt_suspend(struct platform_device *pdev, pm_message_t message)</div><div class='add'>+{</div><div class='add'>+	at91_wdt_stop();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at91wdt_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	if (at91wdt_busy)</div><div class='add'>+		at91_wdt_start();</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define at91wdt_suspend NULL</div><div class='add'>+#define at91wdt_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver at91wdt_driver = {</div><div class='add'>+	.probe		= at91wdt_probe,</div><div class='add'>+	.remove		= __exit_p(at91wdt_remove),</div><div class='add'>+	.shutdown	= at91wdt_shutdown,</div><div class='add'>+	.suspend	= at91wdt_suspend,</div><div class='add'>+	.resume		= at91wdt_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "at91_wdt",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at91_wdt_init(void)</div><div class='add'>+{</div><div class='add'>+	/* Check that the heartbeat value is within range; if not reset to the default */</div><div class='add'>+	if (at91_wdt_settimeout(wdt_time)) {</div><div class='add'>+		at91_wdt_settimeout(WDT_DEFAULT_TIME);</div><div class='add'>+		pr_info("at91_wdt: wdt_time value must be 1 &lt;= wdt_time &lt;= 256, using %d\n", wdt_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return platform_driver_register(&amp;at91wdt_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __exit at91_wdt_exit(void)</div><div class='ctx'> {</div><div class='del'>-	misc_deregister(&amp;at91wdt_miscdev);</div><div class='add'>+	platform_driver_unregister(&amp;at91wdt_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(at91_wdt_init);</div><div class='head'>diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c<br/>index b6640606b44d..e3cefc538b40 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/booke_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/booke_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/booke_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/booke_wdt.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -146,7 +145,7 @@ static int booke_wdt_open (struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations booke_wdt_fops = {</div><div class='add'>+static const struct file_operations booke_wdt_fops = {</div><div class='ctx'>   .owner = THIS_MODULE,</div><div class='ctx'>   .llseek = no_llseek,</div><div class='ctx'>   .write = booke_wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c<br/>index 3e8410b5a65e..04c7e49918db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/cpu5wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/cpu5wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/cpu5wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/cpu5wdt.c</a></div><div class='hunk'>@@ -198,7 +198,7 @@ static ssize_t cpu5wdt_write(struct file *file, const char __user *buf, size_t c</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations cpu5wdt_fops = {</div><div class='add'>+static const struct file_operations cpu5wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.ioctl		= cpu5wdt_ioctl,</div><div class='head'>diff --git a/drivers/char/watchdog/ep93xx_wdt.c b/drivers/char/watchdog/ep93xx_wdt.c<br/>index 9021dbb78299..77c8a955ae9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ep93xx_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ep93xx_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ep93xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/ep93xx_wdt.c</a></div><div class='hunk'>@@ -187,7 +187,7 @@ static int ep93xx_wdt_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations ep93xx_wdt_fops = {</div><div class='add'>+static const struct file_operations ep93xx_wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.write		= ep93xx_wdt_write,</div><div class='ctx'> 	.ioctl		= ep93xx_wdt_ioctl,</div><div class='head'>diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c<br/>index 25c2f2575611..62dbccb2f6df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/eurotechwdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/eurotechwdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/eurotechwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/eurotechwdt.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'>  * 	Added Matt Domsch's nowayout module option.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -357,7 +356,7 @@ static int eurwdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations eurwdt_fops = {</div><div class='add'>+static const struct file_operations eurwdt_fops = {</div><div class='ctx'> 	.owner	= THIS_MODULE,</div><div class='ctx'> 	.llseek	= no_llseek,</div><div class='ctx'> 	.write	= eurwdt_write,</div><div class='hunk'>@@ -421,7 +420,7 @@ static int __init eurwdt_init(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, eurwdt_interrupt, SA_INTERRUPT, "eurwdt", NULL);</div><div class='add'>+	ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL);</div><div class='ctx'> 	if(ret) {</div><div class='ctx'> 		printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);</div><div class='ctx'> 		goto outmisc;</div><div class='head'>diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c<br/>index 93785f13242e..870539eabbf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/i6300esb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/i6300esb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/i6300esb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/i6300esb.c</a></div><div class='hunk'>@@ -337,7 +337,7 @@ static int esb_notify_sys (struct notifier_block *this, unsigned long code, void</div><div class='ctx'>  *      Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations esb_fops = {</div><div class='add'>+static const struct file_operations esb_fops = {</div><div class='ctx'>         .owner =        THIS_MODULE,</div><div class='ctx'>         .llseek =       no_llseek,</div><div class='ctx'>         .write =        esb_write,</div><div class='head'>diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c<br/>index fa2ba9ebe42a..8385dd36eefe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/i8xx_tco.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/i8xx_tco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/i8xx_tco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/i8xx_tco.c</a></div><div class='hunk'>@@ -205,6 +205,23 @@ static int tco_timer_set_heartbeat (int t)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tco_timer_get_timeleft (int *time_left)</div><div class='add'>+{</div><div class='add'>+	unsigned char val;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tco_lock);</div><div class='add'>+</div><div class='add'>+	/* read the TCO Timer */</div><div class='add'>+	val = inb (TCO1_RLD);</div><div class='add'>+	val &amp;= 0x3f;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;tco_lock);</div><div class='add'>+</div><div class='add'>+	*time_left = (int)((val * 6) / 10);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	/dev/watchdog handling</div><div class='ctx'>  */</div><div class='hunk'>@@ -272,6 +289,7 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	int new_options, retval = -EINVAL;</div><div class='ctx'> 	int new_heartbeat;</div><div class='add'>+	int time_left;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int __user *p = argp;</div><div class='ctx'> 	static struct watchdog_info ident = {</div><div class='hunk'>@@ -320,7 +338,7 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 			if (tco_timer_set_heartbeat(new_heartbeat))</div><div class='del'>-			    return -EINVAL;</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			tco_timer_keepalive ();</div><div class='ctx'> 			/* Fall */</div><div class='hunk'>@@ -329,6 +347,14 @@ static int i8xx_tco_ioctl (struct inode *inode, struct file *file,</div><div class='ctx'> 		case WDIOC_GETTIMEOUT:</div><div class='ctx'> 			return put_user(heartbeat, p);</div><div class='ctx'> </div><div class='add'>+		case WDIOC_GETTIMELEFT:</div><div class='add'>+		{</div><div class='add'>+			if (tco_timer_get_timeleft(&amp;time_left))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			return put_user(time_left, p);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -352,7 +378,7 @@ static int i8xx_tco_notify_sys (struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations i8xx_tco_fops = {</div><div class='add'>+static const struct file_operations i8xx_tco_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek =	no_llseek,</div><div class='ctx'> 	.write =	i8xx_tco_write,</div><div class='head'>diff --git a/drivers/char/watchdog/ib700wdt.c b/drivers/char/watchdog/ib700wdt.c<br/>index cf60329eec85..fd95f7327798 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ib700wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ib700wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ib700wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/ib700wdt.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -256,7 +255,7 @@ ibwdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations ibwdt_fops = {</div><div class='add'>+static const struct file_operations ibwdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= ibwdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c<br/>index 294c474ae485..26ceee7a4df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ibmasr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ibmasr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ibmasr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/ibmasr.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * of the GNU Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -323,7 +322,7 @@ static int asr_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations asr_fops = {</div><div class='add'>+static const struct file_operations asr_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek	=	no_llseek,</div><div class='ctx'> 	.write =	asr_write,</div><div class='head'>diff --git a/drivers/char/watchdog/indydog.c b/drivers/char/watchdog/indydog.c<br/>index b4b94daba67e..dacc1c20a310 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/indydog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/indydog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/indydog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/indydog.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -155,7 +154,7 @@ static int indydog_notify_sys(struct notifier_block *this, unsigned long code, v</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations indydog_fops = {</div><div class='add'>+static const struct file_operations indydog_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= indydog_write,</div><div class='head'>diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c<br/>index 0cfb9b9c4a4b..692908819e26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ixp2000_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ixp2000_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ixp2000_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/ixp2000_wdt.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -169,7 +168,7 @@ ixp2000_wdt_release(struct inode *inode, struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations ixp2000_wdt_fops =</div><div class='add'>+static const struct file_operations ixp2000_wdt_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c<br/>index 3800835ca8f3..9db5cf2c38c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ixp4xx_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/ixp4xx_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/ixp4xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/ixp4xx_wdt.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -163,7 +162,7 @@ ixp4xx_wdt_release(struct inode *inode, struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations ixp4xx_wdt_fops =</div><div class='add'>+static const struct file_operations ixp4xx_wdt_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c<br/>index a9a20aad61e7..23734e07fb22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/machzwd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/machzwd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/machzwd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/machzwd.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *      Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -389,7 +388,7 @@ static int zf_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations zf_fops = {</div><div class='add'>+static const struct file_operations zf_fops = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.llseek         = no_llseek,</div><div class='ctx'> 	.write          = zf_write,</div><div class='head'>diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c<br/>index d8dede575402..ae943324d251 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mixcomwd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mixcomwd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mixcomwd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/mixcomwd.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -191,7 +190,7 @@ static int mixcomwd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations mixcomwd_fops=</div><div class='add'>+static const struct file_operations mixcomwd_fops=</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/char/watchdog/mpc83xx_wdt.c<br/>index 5d6f5061603a..a480903ee1a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mpc83xx_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mpc83xx_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mpc83xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/mpc83xx_wdt.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -130,7 +129,7 @@ static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations mpc83xx_wdt_fops = {</div><div class='add'>+static const struct file_operations mpc83xx_wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= mpc83xx_wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/char/watchdog/mpc8xx_wdt.c<br/>index b2fc71e20850..35dd9e6e1140 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mpc8xx_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mpc8xx_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mpc8xx_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/mpc8xx_wdt.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -133,7 +132,7 @@ static int mpc8xx_wdt_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations mpc8xx_wdt_fops = {</div><div class='add'>+static const struct file_operations mpc8xx_wdt_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.write = mpc8xx_wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c<br/>index 2c2c51773200..54b3c56ead0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mpcore_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mpcore_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mpcore_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/mpcore_wdt.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/watchdog.h&gt;</div><div class='hunk'>@@ -298,7 +297,7 @@ static void mpcore_wdt_shutdown(struct platform_device *dev)</div><div class='ctx'> /*</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='del'>-static struct file_operations mpcore_wdt_fops = {</div><div class='add'>+static const struct file_operations mpcore_wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= mpcore_wdt_write,</div><div class='hunk'>@@ -356,7 +355,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)</div><div class='ctx'> 		goto err_misc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(wdt-&gt;irq, mpcore_wdt_fire, SA_INTERRUPT, "mpcore_wdt", wdt);</div><div class='add'>+	ret = request_irq(wdt-&gt;irq, mpcore_wdt_fire, IRQF_DISABLED, "mpcore_wdt", wdt);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_printk(KERN_ERR, _dev, "cannot register IRQ%d for watchdog\n", wdt-&gt;irq);</div><div class='ctx'> 		goto err_irq;</div><div class='head'>diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c<br/>index f1b9cf89f153..5c8fab345b40 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mv64x60_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/mv64x60_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/mv64x60_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/mv64x60_wdt.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -167,7 +166,7 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations mv64x60_wdt_fops = {</div><div class='add'>+static const struct file_operations mv64x60_wdt_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.write = mv64x60_wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c<br/>index 6d44ca68312d..cd7d1b6a5d9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/pcwd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/pcwd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/pcwd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/pcwd.c</a></div><div class='hunk'>@@ -740,7 +740,7 @@ static int pcwd_notify_sys(struct notifier_block *this, unsigned long code, void</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations pcwd_fops = {</div><div class='add'>+static const struct file_operations pcwd_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= pcwd_write,</div><div class='hunk'>@@ -755,7 +755,7 @@ static struct miscdevice pcwd_miscdev = {</div><div class='ctx'> 	.fops =		&amp;pcwd_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations pcwd_temp_fops = {</div><div class='add'>+static const struct file_operations pcwd_temp_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= pcwd_temp_read,</div><div class='head'>diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c<br/>index 2451edbefece..c7cfd6dbfe1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/pcwd_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/pcwd_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/pcwd_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/pcwd_pci.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	A bells and whistles driver is available from: </div><div class='add'>+ *	A bells and whistles driver is available from:</div><div class='ctx'>  *	http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/</div><div class='ctx'>  *</div><div class='ctx'>  *	More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/</div><div class='hunk'>@@ -390,6 +390,24 @@ static int pcipcwd_get_temperature(int *temperature)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pcipcwd_get_timeleft(int *time_left)</div><div class='add'>+{</div><div class='add'>+	int msb;</div><div class='add'>+	int lsb;</div><div class='add'>+</div><div class='add'>+	/* Read the time that's left before rebooting */</div><div class='add'>+	/* Note: if the board is not yet armed then we will read 0xFFFF */</div><div class='add'>+	send_command(CMD_READ_WATCHDOG_TIMEOUT, &amp;msb, &amp;lsb);</div><div class='add'>+</div><div class='add'>+	*time_left = (msb &lt;&lt; 8) + lsb;</div><div class='add'>+</div><div class='add'>+	if (debug &gt;= VERBOSE)</div><div class='add'>+		printk(KERN_DEBUG PFX "Time left before next reboot: %d\n",</div><div class='add'>+		       *time_left);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	/dev/watchdog handling</div><div class='ctx'>  */</div><div class='hunk'>@@ -512,6 +530,16 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case WDIOC_GETTIMEOUT:</div><div class='ctx'> 			return put_user(heartbeat, p);</div><div class='ctx'> </div><div class='add'>+		case WDIOC_GETTIMELEFT:</div><div class='add'>+		{</div><div class='add'>+			int time_left;</div><div class='add'>+</div><div class='add'>+			if (pcipcwd_get_timeleft(&amp;time_left))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			return put_user(time_left, p);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -597,7 +625,7 @@ static int pcipcwd_notify_sys(struct notifier_block *this, unsigned long code, v</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations pcipcwd_fops = {</div><div class='add'>+static const struct file_operations pcipcwd_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek =	no_llseek,</div><div class='ctx'> 	.write =	pcipcwd_write,</div><div class='hunk'>@@ -612,7 +640,7 @@ static struct miscdevice pcipcwd_miscdev = {</div><div class='ctx'> 	.fops =		&amp;pcipcwd_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations pcipcwd_temp_fops = {</div><div class='add'>+static const struct file_operations pcipcwd_temp_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek =	no_llseek,</div><div class='ctx'> 	.read =		pcipcwd_temp_read,</div><div class='head'>diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c<br/>index 3fdfda9324fa..b7ae73dcdd08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/pcwd_usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/pcwd_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/pcwd_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/pcwd_usb.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *	http://www.berkprod.com/ or http://www.pcwatchdog.com/</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -317,6 +316,19 @@ static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, int *temp</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd, int *time_left)</div><div class='add'>+{</div><div class='add'>+	unsigned char msb, lsb;</div><div class='add'>+</div><div class='add'>+	/* Read the time that's left before rebooting */</div><div class='add'>+	/* Note: if the board is not yet armed then we will read 0xFFFF */</div><div class='add'>+	usb_pcwd_send_command(usb_pcwd, CMD_READ_WATCHDOG_TIMEOUT, &amp;msb, &amp;lsb);</div><div class='add'>+</div><div class='add'>+	*time_left = (msb &lt;&lt; 8) + lsb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	/dev/watchdog handling</div><div class='ctx'>  */</div><div class='hunk'>@@ -422,6 +434,16 @@ static int usb_pcwd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case WDIOC_GETTIMEOUT:</div><div class='ctx'> 			return put_user(heartbeat, p);</div><div class='ctx'> </div><div class='add'>+		case WDIOC_GETTIMELEFT:</div><div class='add'>+		{</div><div class='add'>+			int time_left;</div><div class='add'>+</div><div class='add'>+			if (usb_pcwd_get_timeleft(usb_pcwd_device, &amp;time_left))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			return put_user(time_left, p);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -501,7 +523,7 @@ static int usb_pcwd_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations usb_pcwd_fops = {</div><div class='add'>+static const struct file_operations usb_pcwd_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek =	no_llseek,</div><div class='ctx'> 	.write =	usb_pcwd_write,</div><div class='hunk'>@@ -516,7 +538,7 @@ static struct miscdevice usb_pcwd_miscdev = {</div><div class='ctx'> 	.fops =		&amp;usb_pcwd_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations usb_pcwd_temperature_fops = {</div><div class='add'>+static const struct file_operations usb_pcwd_temperature_fops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.llseek =	no_llseek,</div><div class='ctx'> 	.read =		usb_pcwd_temperature_read,</div><div class='head'>diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c<br/>index 1ea04e9b2b0b..be978e8ed754 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/s3c2410_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/s3c2410_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/s3c2410_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/s3c2410_wdt.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -320,7 +319,7 @@ static int s3c2410wdt_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> /* kernel interface */</div><div class='ctx'> </div><div class='del'>-static struct file_operations s3c2410wdt_fops = {</div><div class='add'>+static const struct file_operations s3c2410wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= s3c2410wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c<br/>index 522a9370db94..1fc16d995788 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sa1100_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sa1100_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sa1100_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/sa1100_wdt.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *      27/11/2000 Initial release</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -136,7 +135,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations sa1100dog_fops =</div><div class='add'>+static const struct file_operations sa1100dog_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c<br/>index ed0bd55fbfc1..4663c2fd53cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sbc60xxwdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sbc60xxwdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sbc60xxwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/sbc60xxwdt.c</a></div><div class='hunk'>@@ -282,7 +282,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops = {</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= fop_write,</div><div class='head'>diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c<br/>index c6cbf808d8c2..1035be5b5019 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sbc8360.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sbc8360.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sbc8360.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/sbc8360.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -306,7 +305,7 @@ static int sbc8360_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations sbc8360_fops = {</div><div class='add'>+static const struct file_operations sbc8360_fops = {</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.llseek = no_llseek,</div><div class='ctx'> 	.write = sbc8360_write,</div><div class='head'>diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/char/watchdog/sbc_epx_c3.c<br/>index 837b1ec3ffe3..bfc475dabe6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sbc_epx_c3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sbc_epx_c3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sbc_epx_c3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/sbc_epx_c3.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -155,7 +154,7 @@ static int epx_c3_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations epx_c3_fops = {</div><div class='add'>+static const struct file_operations epx_c3_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= epx_c3_write,</div><div class='head'>diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c<br/>index 20b88f9b7be2..7c3cf293a5af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sc1200wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sc1200wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sc1200wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/sc1200wdt.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -293,7 +292,7 @@ static struct notifier_block sc1200wdt_notifier =</div><div class='ctx'> 	.notifier_call =	sc1200wdt_notify_sys,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations sc1200wdt_fops =</div><div class='add'>+static const struct file_operations sc1200wdt_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c<br/>index 4ee9974ad8cb..2c7c9db71be8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sc520_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/sc520_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/sc520_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/sc520_wdt.c</a></div><div class='hunk'>@@ -336,7 +336,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops = {</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= fop_write,</div><div class='head'>diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c<br/>index b4a102a2d7e3..c561299a5537 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/scx200_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/scx200_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/scx200_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/scx200_wdt.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>    of any nature resulting due to the use of this software. This</div><div class='ctx'>    software is provided AS-IS with no warranties. */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -195,7 +194,7 @@ static int scx200_wdt_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations scx200_wdt_fops = {</div><div class='add'>+static const struct file_operations scx200_wdt_fops = {</div><div class='ctx'> 	.owner	 = THIS_MODULE,</div><div class='ctx'> 	.llseek	 = no_llseek,</div><div class='ctx'> 	.write   = scx200_wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/shwdt.c b/drivers/char/watchdog/shwdt.c<br/>index 1f4cab55b2ef..1355038f1044 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/shwdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/shwdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/shwdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/shwdt.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *     Added expect close support, made emulated timeout runtime changeable</div><div class='ctx'>  *     general cleanups, add some ioctls</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -345,7 +344,7 @@ static int sh_wdt_notify_sys(struct notifier_block *this,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations sh_wdt_fops = {</div><div class='add'>+static const struct file_operations sh_wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= sh_wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c<br/>index a91edaf3a350..ef8da517545a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/softdog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/softdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/softdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/softdog.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='hunk'>@@ -244,7 +243,7 @@ static int softdog_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations softdog_fops = {</div><div class='add'>+static const struct file_operations softdog_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= softdog_write,</div><div class='head'>diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c<br/>index d15ca9a3986f..13f16d41c2fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/w83627hf_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/w83627hf_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/w83627hf_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/w83627hf_wdt.c</a></div><div class='hunk'>@@ -274,7 +274,7 @@ wdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops = {</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= wdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/char/watchdog/w83877f_wdt.c<br/>index 52a8bd0a5988..ccf6c0915945 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/w83877f_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/w83877f_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/w83877f_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/w83877f_wdt.c</a></div><div class='hunk'>@@ -299,7 +299,7 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops = {</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= fop_write,</div><div class='head'>diff --git a/drivers/char/watchdog/w83977f_wdt.c b/drivers/char/watchdog/w83977f_wdt.c<br/>index a7ff64c8921f..98f4e17db70a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/w83977f_wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/w83977f_wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/w83977f_wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/w83977f_wdt.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -450,7 +449,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops=</div><div class='add'>+static const struct file_operations wdt_fops=</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/wafer5823wdt.c b/drivers/char/watchdog/wafer5823wdt.c<br/>index 7cf6c9bbf486..2bb6a9d6ad28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wafer5823wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wafer5823wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wafer5823wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wafer5823wdt.c</a></div><div class='hunk'>@@ -222,7 +222,7 @@ static int wafwdt_notify_sys(struct notifier_block *this, unsigned long code, vo</div><div class='ctx'>  *	Kernel Interfaces</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct file_operations wafwdt_fops = {</div><div class='add'>+static const struct file_operations wafwdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= wafwdt_write,</div><div class='head'>diff --git a/drivers/char/watchdog/wd501p.h b/drivers/char/watchdog/wd501p.h<br/>index 84e60eb74337..a4504f40394d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wd501p.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wd501p.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wd501p.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wd501p.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define WDT_COUNT0		(io+0)</div><div class='ctx'> #define WDT_COUNT1		(io+1)</div><div class='head'>diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c<br/>index dacfe31caccf..5c38cdf41731 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdrtas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdrtas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdrtas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wdrtas.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -521,7 +520,7 @@ wdrtas_reboot(struct notifier_block *this, unsigned long code, void *ptr)</div><div class='ctx'> </div><div class='ctx'> /*** initialization stuff */</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdrtas_fops = {</div><div class='add'>+static const struct file_operations wdrtas_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= wdrtas_write,</div><div class='hunk'>@@ -536,7 +535,7 @@ static struct miscdevice wdrtas_miscdev = {</div><div class='ctx'> 	.fops =		&amp;wdrtas_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdrtas_temp_fops = {</div><div class='add'>+static const struct file_operations wdrtas_temp_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= wdrtas_temp_read,</div><div class='head'>diff --git a/drivers/char/watchdog/wdt.c b/drivers/char/watchdog/wdt.c<br/>index ec7e401228ee..70be81e39a61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wdt.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *		Matt Domsch	:	Added nowayout module option</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -495,7 +494,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt_fops = {</div><div class='add'>+static const struct file_operations wdt_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= wdt_write,</div><div class='hunk'>@@ -511,7 +510,7 @@ static struct miscdevice wdt_miscdev = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_WDT_501</div><div class='del'>-static struct file_operations wdt_temp_fops = {</div><div class='add'>+static const struct file_operations wdt_temp_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= wdt_temp_read,</div><div class='hunk'>@@ -581,7 +580,7 @@ static int __init wdt_init(void)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, wdt_interrupt, SA_INTERRUPT, "wdt501p", NULL);</div><div class='add'>+	ret = request_irq(irq, wdt_interrupt, IRQF_DISABLED, "wdt501p", NULL);</div><div class='ctx'> 	if(ret) {</div><div class='ctx'> 		printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);</div><div class='ctx'> 		goto outreg;</div><div class='head'>diff --git a/drivers/char/watchdog/wdt285.c b/drivers/char/watchdog/wdt285.c<br/>index 52825a1f1779..6555fb844f23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt285.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt285.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wdt285.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ watchdog_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations watchdog_fops = {</div><div class='add'>+static const struct file_operations watchdog_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= watchdog_write,</div><div class='head'>diff --git a/drivers/char/watchdog/wdt977.c b/drivers/char/watchdog/wdt977.c<br/>index 3843900e94c4..a0935bc775f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt977.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt977.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt977.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wdt977.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -419,7 +418,7 @@ static int wdt977_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct file_operations wdt977_fops=</div><div class='add'>+static const struct file_operations wdt977_fops=</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='head'>diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c<br/>index 4b3311993d48..5918ca2c9c35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/char/watchdog/wdt_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/char/watchdog/wdt_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/char/watchdog/wdt_pci.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  *		Matt Domsch	:	nowayout module option</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -544,7 +543,7 @@ static int wdtpci_notify_sys(struct notifier_block *this, unsigned long code,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct file_operations wdtpci_fops = {</div><div class='add'>+static const struct file_operations wdtpci_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= wdtpci_write,</div><div class='hunk'>@@ -560,7 +559,7 @@ static struct miscdevice wdtpci_miscdev = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_WDT_501_PCI</div><div class='del'>-static struct file_operations wdtpci_temp_fops = {</div><div class='add'>+static const struct file_operations wdtpci_temp_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= wdtpci_temp_read,</div><div class='hunk'>@@ -618,7 +617,7 @@ static int __devinit wdtpci_init_one (struct pci_dev *dev,</div><div class='ctx'> 		goto out_pci;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq (irq, wdtpci_interrupt, SA_INTERRUPT | SA_SHIRQ,</div><div class='add'>+	if (request_irq (irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'> 			 "wdt_pci", &amp;wdtpci_miscdev)) {</div><div class='ctx'> 		printk (KERN_ERR PFX "IRQ %d is not free\n", irq);</div><div class='ctx'> 		goto out_reg;</div><div class='head'>diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile<br/>new file mode 100644<br/>index 000000000000..a52225470225<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clocksource/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/clocksource/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_X86_CYCLONE_TIMER)	+= cyclone.o</div><div class='add'>+obj-$(CONFIG_X86_PM_TIMER)	+= acpi_pm.o</div><div class='add'>+obj-$(CONFIG_SCx200HR_TIMER)	+= scx200_hrt.o</div><div class='head'>diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c<br/>new file mode 100644<br/>index 000000000000..7ad3be8c0f49<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clocksource/acpi_pm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/clocksource/acpi_pm.c</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/clocksource/acpi_pm.c</div><div class='add'>+ *</div><div class='add'>+ * This file contains the ACPI PM based clocksource.</div><div class='add'>+ *</div><div class='add'>+ * This code was largely moved from the i386 timer_pm.c file</div><div class='add'>+ * which was (C) Dominik Brodowski &lt;linux@brodo.de&gt; 2003</div><div class='add'>+ * and contained the following comments:</div><div class='add'>+ *</div><div class='add'>+ * Driver to use the Power Management Timer (PMTMR) available in some</div><div class='add'>+ * southbridges as primary timing source for the Linux kernel.</div><div class='add'>+ *</div><div class='add'>+ * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c,</div><div class='add'>+ * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4.</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the GPL v2.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+/* Number of PMTMR ticks expected during calibration run */</div><div class='add'>+#define PMTMR_TICKS_PER_SEC 3579545</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The I/O port the PMTMR resides at.</div><div class='add'>+ * The location is detected during setup_arch(),</div><div class='add'>+ * in arch/i386/acpi/boot.c</div><div class='add'>+ */</div><div class='add'>+u32 pmtmr_ioport __read_mostly;</div><div class='add'>+</div><div class='add'>+#define ACPI_PM_MASK CLOCKSOURCE_MASK(24) /* limit it to 24 bits */</div><div class='add'>+</div><div class='add'>+static inline u32 read_pmtmr(void)</div><div class='add'>+{</div><div class='add'>+	/* mask the output to 24 bits */</div><div class='add'>+	return inl(pmtmr_ioport) &amp; ACPI_PM_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static cycle_t acpi_pm_read_verified(void)</div><div class='add'>+{</div><div class='add'>+	u32 v1 = 0, v2 = 0, v3 = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * It has been reported that because of various broken</div><div class='add'>+	 * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM clock</div><div class='add'>+	 * source is not latched, you must read it multiple</div><div class='add'>+	 * times to ensure a safe value is read:</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		v1 = read_pmtmr();</div><div class='add'>+		v2 = read_pmtmr();</div><div class='add'>+		v3 = read_pmtmr();</div><div class='add'>+	} while ((v1 &gt; v2 &amp;&amp; v1 &lt; v3) || (v2 &gt; v3 &amp;&amp; v2 &lt; v1)</div><div class='add'>+			|| (v3 &gt; v1 &amp;&amp; v3 &lt; v2));</div><div class='add'>+</div><div class='add'>+	return (cycle_t)v2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static cycle_t acpi_pm_read(void)</div><div class='add'>+{</div><div class='add'>+	return (cycle_t)read_pmtmr();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource clocksource_acpi_pm = {</div><div class='add'>+	.name		= "acpi_pm",</div><div class='add'>+	.rating		= 200,</div><div class='add'>+	.read		= acpi_pm_read,</div><div class='add'>+	.mask		= (cycle_t)ACPI_PM_MASK,</div><div class='add'>+	.mult		= 0, /*to be caluclated*/</div><div class='add'>+	.shift		= 22,</div><div class='add'>+	.is_continuous	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static int acpi_pm_good;</div><div class='add'>+static int __init acpi_pm_good_setup(char *__str)</div><div class='add'>+{</div><div class='add'>+       acpi_pm_good = 1;</div><div class='add'>+       return 1;</div><div class='add'>+}</div><div class='add'>+__setup("acpi_pm_good", acpi_pm_good_setup);</div><div class='add'>+</div><div class='add'>+static inline void acpi_pm_need_workaround(void)</div><div class='add'>+{</div><div class='add'>+	clocksource_acpi_pm.read = acpi_pm_read_verified;</div><div class='add'>+	clocksource_acpi_pm.rating = 110;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PIIX4 Errata:</div><div class='add'>+ *</div><div class='add'>+ * The power management timer may return improper results when read.</div><div class='add'>+ * Although the timer value settles properly after incrementing,</div><div class='add'>+ * while incrementing there is a 3 ns window every 69.8 ns where the</div><div class='add'>+ * timer value is indeterminate (a 4.2% chance that the data will be</div><div class='add'>+ * incorrect when read). As a result, the ACPI free running count up</div><div class='add'>+ * timer specification is violated due to erroneous reads.</div><div class='add'>+ */</div><div class='add'>+static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u8 rev;</div><div class='add'>+</div><div class='add'>+	if (acpi_pm_good)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(dev, PCI_REVISION_ID, &amp;rev);</div><div class='add'>+	/* the bug has been fixed in PIIX4M */</div><div class='add'>+	if (rev &lt; 3) {</div><div class='add'>+		printk(KERN_WARNING "* Found PM-Timer Bug on the chipset."</div><div class='add'>+		       " Due to workarounds for a bug,\n"</div><div class='add'>+		       "* this clock source is slow. Consider trying"</div><div class='add'>+		       " other clock sources\n");</div><div class='add'>+</div><div class='add'>+		acpi_pm_need_workaround();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,</div><div class='add'>+			acpi_pm_check_blacklist);</div><div class='add'>+</div><div class='add'>+static void __devinit acpi_pm_check_graylist(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (acpi_pm_good)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	printk(KERN_WARNING "* The chipset may have PM-Timer Bug. Due to"</div><div class='add'>+	       " workarounds for a bug,\n"</div><div class='add'>+	       "* this clock source is slow. If you are sure your timer"</div><div class='add'>+	       " does not have\n"</div><div class='add'>+	       "* this bug, please use \"acpi_pm_good\" to disable the"</div><div class='add'>+	       " workaround\n");</div><div class='add'>+</div><div class='add'>+	acpi_pm_need_workaround();</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,</div><div class='add'>+			acpi_pm_check_graylist);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init init_acpi_pm_clocksource(void)</div><div class='add'>+{</div><div class='add'>+	u32 value1, value2;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (!pmtmr_ioport)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	clocksource_acpi_pm.mult = clocksource_hz2mult(PMTMR_TICKS_PER_SEC,</div><div class='add'>+						clocksource_acpi_pm.shift);</div><div class='add'>+</div><div class='add'>+	/* "verify" this timing source: */</div><div class='add'>+	value1 = read_pmtmr();</div><div class='add'>+	for (i = 0; i &lt; 10000; i++) {</div><div class='add'>+		value2 = read_pmtmr();</div><div class='add'>+		if (value2 == value1)</div><div class='add'>+			continue;</div><div class='add'>+		if (value2 &gt; value1)</div><div class='add'>+			goto pm_good;</div><div class='add'>+		if ((value2 &lt; value1) &amp;&amp; ((value2) &lt; 0xFFF))</div><div class='add'>+			goto pm_good;</div><div class='add'>+		printk(KERN_INFO "PM-Timer had inconsistent results:"</div><div class='add'>+			" 0x%#x, 0x%#x - aborting.\n", value1, value2);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "PM-Timer had no reasonable result:"</div><div class='add'>+			" 0x%#x - aborting.\n", value1);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+</div><div class='add'>+pm_good:</div><div class='add'>+	return clocksource_register(&amp;clocksource_acpi_pm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_acpi_pm_clocksource);</div><div class='head'>diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c<br/>new file mode 100644<br/>index 000000000000..bf4d3d50d1c4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clocksource/cyclone.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/clocksource/cyclone.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/timex.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mach_timer.h"</div><div class='add'>+</div><div class='add'>+#define CYCLONE_CBAR_ADDR	0xFEB00CD0	/* base address ptr */</div><div class='add'>+#define CYCLONE_PMCC_OFFSET	0x51A0		/* offset to control register */</div><div class='add'>+#define CYCLONE_MPCS_OFFSET	0x51A8		/* offset to select register */</div><div class='add'>+#define CYCLONE_MPMC_OFFSET	0x51D0		/* offset to count register */</div><div class='add'>+#define CYCLONE_TIMER_FREQ	99780000	/* 100Mhz, but not really */</div><div class='add'>+#define CYCLONE_TIMER_MASK	CLOCKSOURCE_MASK(32) /* 32 bit mask */</div><div class='add'>+</div><div class='add'>+int use_cyclone = 0;</div><div class='add'>+static void __iomem *cyclone_ptr;</div><div class='add'>+</div><div class='add'>+static cycle_t read_cyclone(void)</div><div class='add'>+{</div><div class='add'>+	return (cycle_t)readl(cyclone_ptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct clocksource clocksource_cyclone = {</div><div class='add'>+	.name		= "cyclone",</div><div class='add'>+	.rating		= 250,</div><div class='add'>+	.read		= read_cyclone,</div><div class='add'>+	.mask		= CYCLONE_TIMER_MASK,</div><div class='add'>+	.mult		= 10,</div><div class='add'>+	.shift		= 0,</div><div class='add'>+	.is_continuous	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_cyclone_clocksource(void)</div><div class='add'>+{</div><div class='add'>+	unsigned long base;	/* saved value from CBAR */</div><div class='add'>+	unsigned long offset;</div><div class='add'>+	u32 __iomem* volatile cyclone_timer;	/* Cyclone MPMC0 register */</div><div class='add'>+	u32 __iomem* reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* make sure we're on a summit box: */</div><div class='add'>+	if (!use_cyclone)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n");</div><div class='add'>+</div><div class='add'>+	/* find base address: */</div><div class='add'>+	offset = CYCLONE_CBAR_ADDR;</div><div class='add'>+	reg = ioremap_nocache(offset, sizeof(reg));</div><div class='add'>+	if (!reg) {</div><div class='add'>+		printk(KERN_ERR "Summit chipset: Could not find valid CBAR register.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	/* even on 64bit systems, this is only 32bits: */</div><div class='add'>+	base = readl(reg);</div><div class='add'>+	if (!base) {</div><div class='add'>+		printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	iounmap(reg);</div><div class='add'>+</div><div class='add'>+	/* setup PMCC: */</div><div class='add'>+	offset = base + CYCLONE_PMCC_OFFSET;</div><div class='add'>+	reg = ioremap_nocache(offset, sizeof(reg));</div><div class='add'>+	if (!reg) {</div><div class='add'>+		printk(KERN_ERR "Summit chipset: Could not find valid PMCC register.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	writel(0x00000001,reg);</div><div class='add'>+	iounmap(reg);</div><div class='add'>+</div><div class='add'>+	/* setup MPCS: */</div><div class='add'>+	offset = base + CYCLONE_MPCS_OFFSET;</div><div class='add'>+	reg = ioremap_nocache(offset, sizeof(reg));</div><div class='add'>+	if (!reg) {</div><div class='add'>+		printk(KERN_ERR "Summit chipset: Could not find valid MPCS register.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	writel(0x00000001,reg);</div><div class='add'>+	iounmap(reg);</div><div class='add'>+</div><div class='add'>+	/* map in cyclone_timer: */</div><div class='add'>+	offset = base + CYCLONE_MPMC_OFFSET;</div><div class='add'>+	cyclone_timer = ioremap_nocache(offset, sizeof(u64));</div><div class='add'>+	if (!cyclone_timer) {</div><div class='add'>+		printk(KERN_ERR "Summit chipset: Could not find valid MPMC register.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* quick test to make sure its ticking: */</div><div class='add'>+	for (i = 0; i &lt; 3; i++){</div><div class='add'>+		u32 old = readl(cyclone_timer);</div><div class='add'>+		int stall = 100;</div><div class='add'>+</div><div class='add'>+		while (stall--)</div><div class='add'>+			barrier();</div><div class='add'>+</div><div class='add'>+		if (readl(cyclone_timer) == old) {</div><div class='add'>+			printk(KERN_ERR "Summit chipset: Counter not counting! DISABLED\n");</div><div class='add'>+			iounmap(cyclone_timer);</div><div class='add'>+			cyclone_timer = NULL;</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cyclone_ptr = cyclone_timer;</div><div class='add'>+</div><div class='add'>+	/* sort out mult/shift values: */</div><div class='add'>+	clocksource_cyclone.shift = 22;</div><div class='add'>+	clocksource_cyclone.mult = clocksource_hz2mult(CYCLONE_TIMER_FREQ,</div><div class='add'>+						clocksource_cyclone.shift);</div><div class='add'>+</div><div class='add'>+	return clocksource_register(&amp;clocksource_cyclone);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_cyclone_clocksource);</div><div class='head'>diff --git a/drivers/clocksource/scx200_hrt.c b/drivers/clocksource/scx200_hrt.c<br/>new file mode 100644<br/>index 000000000000..d418b8297211<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/clocksource/scx200_hrt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/clocksource/scx200_hrt.c</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2006 Jim Cromie</div><div class='add'>+ *</div><div class='add'>+ * This is a clocksource driver for the Geode SCx200's 1 or 27 MHz</div><div class='add'>+ * high-resolution timer.  The Geode SC-1100 (at least) has a buggy</div><div class='add'>+ * time stamp counter (TSC), which loses time unless 'idle=poll' is</div><div class='add'>+ * given as a boot-arg. In its absence, the Generic Timekeeping code</div><div class='add'>+ * will detect and de-rate the bad TSC, allowing this timer to take</div><div class='add'>+ * over timekeeping duties.</div><div class='add'>+ *</div><div class='add'>+ * Based on work by John Stultz, and Ted Phelps (in a 2.6.12-rc6 patch)</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2 of the</div><div class='add'>+ * License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/scx200.h&gt;</div><div class='add'>+</div><div class='add'>+#define NAME "scx200_hrt"</div><div class='add'>+</div><div class='add'>+static int mhz27;</div><div class='add'>+module_param(mhz27, int, 0);	/* load time only */</div><div class='add'>+MODULE_PARM_DESC(mhz27, "count at 27.0 MHz (default is 1.0 MHz)");</div><div class='add'>+</div><div class='add'>+static int ppm;</div><div class='add'>+module_param(ppm, int, 0);	/* load time only */</div><div class='add'>+MODULE_PARM_DESC(ppm, "+-adjust to actual XO freq (ppm)");</div><div class='add'>+</div><div class='add'>+/* HiRes Timer configuration register address */</div><div class='add'>+#define SCx200_TMCNFG_OFFSET (SCx200_TIMER_OFFSET + 5)</div><div class='add'>+</div><div class='add'>+/* and config settings */</div><div class='add'>+#define HR_TMEN (1 &lt;&lt; 0)	/* timer interrupt enable */</div><div class='add'>+#define HR_TMCLKSEL (1 &lt;&lt; 1)	/* 1|0 counts at 27|1 MHz */</div><div class='add'>+#define HR_TM27MPD (1 &lt;&lt; 2)	/* 1 turns off input clock (power-down) */</div><div class='add'>+</div><div class='add'>+/* The base timer frequency, * 27 if selected */</div><div class='add'>+#define HRT_FREQ   1000000</div><div class='add'>+</div><div class='add'>+static cycle_t read_hrt(void)</div><div class='add'>+{</div><div class='add'>+	/* Read the timer value */</div><div class='add'>+	return (cycle_t) inl(scx200_cb_base + SCx200_TIMER_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HRT_SHIFT_1	22</div><div class='add'>+#define HRT_SHIFT_27	26</div><div class='add'>+</div><div class='add'>+static struct clocksource cs_hrt = {</div><div class='add'>+	.name		= "scx200_hrt",</div><div class='add'>+	.rating		= 250,</div><div class='add'>+	.read		= read_hrt,</div><div class='add'>+	.mask		= CLOCKSOURCE_MASK(32),</div><div class='add'>+	.is_continuous	= 1,</div><div class='add'>+	/* mult, shift are set based on mhz27 flag */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_hrt_clocksource(void)</div><div class='add'>+{</div><div class='add'>+	/* Make sure scx200 has initializedd the configuration block */</div><div class='add'>+	if (!scx200_cb_present())</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Reserve the timer's ISA io-region for ourselves */</div><div class='add'>+	if (!request_region(scx200_cb_base + SCx200_TIMER_OFFSET,</div><div class='add'>+			    SCx200_TIMER_SIZE,</div><div class='add'>+			    "NatSemi SCx200 High-Resolution Timer")) {</div><div class='add'>+		printk(KERN_WARNING NAME ": unable to lock timer region\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write timer config */</div><div class='add'>+	outb(HR_TMEN | (mhz27) ? HR_TMCLKSEL : 0,</div><div class='add'>+	     scx200_cb_base + SCx200_TMCNFG_OFFSET);</div><div class='add'>+</div><div class='add'>+	if (mhz27) {</div><div class='add'>+		cs_hrt.shift = HRT_SHIFT_27;</div><div class='add'>+		cs_hrt.mult = clocksource_hz2mult((HRT_FREQ + ppm) * 27,</div><div class='add'>+						  cs_hrt.shift);</div><div class='add'>+	} else {</div><div class='add'>+		cs_hrt.shift = HRT_SHIFT_1;</div><div class='add'>+		cs_hrt.mult = clocksource_hz2mult(HRT_FREQ + ppm,</div><div class='add'>+						  cs_hrt.shift);</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "enabling scx200 high-res timer (%s MHz +%d ppm)\n",</div><div class='add'>+		mhz27 ? "27":"1", ppm);</div><div class='add'>+</div><div class='add'>+	return clocksource_register(&amp;cs_hrt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_hrt_clocksource);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jim Cromie &lt;jim.cromie@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("clocksource on SCx200 HiRes Timer");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c<br/>index 4b4d7db1ff7b..498aa37bca22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/connector/cn_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/connector/cn_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/connector/cn_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/connector/cn_proc.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ktime.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/connector.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/cn_proc.h&gt;</div><div class='head'>diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c<br/>index 9f2f00d82917..05f8ce2cfb4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/connector/cn_queue.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/connector/cn_queue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/connector/cn_queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/connector/cn_queue.c</a></div><div class='hunk'>@@ -127,7 +127,7 @@ void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id)</div><div class='ctx'> </div><div class='ctx'> 	if (found) {</div><div class='ctx'> 		cn_queue_free_callback(cbq);</div><div class='del'>-		atomic_dec_and_test(&amp;dev-&gt;refcnt);</div><div class='add'>+		atomic_dec(&amp;dev-&gt;refcnt);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c<br/>index 35897079a78d..b49bacfd8de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/connector/connector.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/connector/connector.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/connector/connector.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/connector/connector.c</a></div><div class='hunk'>@@ -121,6 +121,7 @@ nlmsg_failure:</div><div class='ctx'> 	kfree_skb(skb);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn_netlink_send);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Callback helper - queues work and setup destructor for given data.</div><div class='hunk'>@@ -308,6 +309,9 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct cn_dev *dev = &amp;cdev;</div><div class='ctx'> </div><div class='add'>+	if (!cn_already_initialized)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='ctx'> 	err = cn_queue_add_callback(dev-&gt;cbdev, name, id, callback);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -316,6 +320,7 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn_add_callback);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Callback remove routing - removes callback</div><div class='hunk'>@@ -332,6 +337,7 @@ void cn_del_callback(struct cb_id *id)</div><div class='ctx'> 	cn_queue_del_callback(dev-&gt;cbdev, id);</div><div class='ctx'> 	cn_notify(id, 1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn_del_callback);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Checks two connector's control messages to be the same.</div><div class='hunk'>@@ -435,7 +441,7 @@ static void cn_callback(void *data)</div><div class='ctx'> 	mutex_unlock(&amp;notify_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init cn_init(void)</div><div class='add'>+static int __devinit cn_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cn_dev *dev = &amp;cdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -456,21 +462,22 @@ static int __init cn_init(void)</div><div class='ctx'> 			sock_release(dev-&gt;nls-&gt;sk_socket);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	</div><div class='add'>+	cn_already_initialized = 1;</div><div class='ctx'> </div><div class='ctx'> 	err = cn_add_callback(&amp;dev-&gt;id, "connector", &amp;cn_callback);</div><div class='ctx'> 	if (err) {</div><div class='add'>+		cn_already_initialized = 0;</div><div class='ctx'> 		cn_queue_free_dev(dev-&gt;cbdev);</div><div class='ctx'> 		if (dev-&gt;nls-&gt;sk_socket)</div><div class='ctx'> 			sock_release(dev-&gt;nls-&gt;sk_socket);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cn_already_initialized = 1;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit cn_fini(void)</div><div class='add'>+static void __devexit cn_fini(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct cn_dev *dev = &amp;cdev;</div><div class='ctx'> </div><div class='hunk'>@@ -482,9 +489,5 @@ static void __exit cn_fini(void)</div><div class='ctx'> 		sock_release(dev-&gt;nls-&gt;sk_socket);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(cn_init);</div><div class='add'>+subsys_initcall(cn_init);</div><div class='ctx'> module_exit(cn_fini);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(cn_add_callback);</div><div class='del'>-EXPORT_SYMBOL_GPL(cn_del_callback);</div><div class='del'>-EXPORT_SYMBOL_GPL(cn_netlink_send);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c<br/>index 29b2fa5534ae..8d328186f774 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cpufreq/cpufreq.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -257,7 +256,7 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)</div><div class='ctx'> 		if (!(cpufreq_driver-&gt;flags &amp; CPUFREQ_CONST_LOOPS)) {</div><div class='ctx'> 			if ((policy) &amp;&amp; (policy-&gt;cpu == freqs-&gt;cpu) &amp;&amp;</div><div class='ctx'> 			    (policy-&gt;cur) &amp;&amp; (policy-&gt;cur != freqs-&gt;old)) {</div><div class='del'>-				dprintk(KERN_WARNING "Warning: CPU frequency is"</div><div class='add'>+				dprintk("Warning: CPU frequency is"</div><div class='ctx'> 					" %u, cpufreq assumed %u kHz.\n",</div><div class='ctx'> 					freqs-&gt;old, policy-&gt;cur);</div><div class='ctx'> 				freqs-&gt;old = policy-&gt;cur;</div><div class='hunk'>@@ -424,6 +423,8 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy,</div><div class='ctx'> 	if (cpufreq_parse_governor(str_governor, &amp;new_policy.policy, &amp;new_policy.governor))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	lock_cpu_hotplug();</div><div class='add'>+</div><div class='ctx'> 	/* Do not use cpufreq_set_policy here or the user_policy.max</div><div class='ctx'> 	   will be wrongly overridden */</div><div class='ctx'> 	mutex_lock(&amp;policy-&gt;lock);</div><div class='hunk'>@@ -433,6 +434,8 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy,</div><div class='ctx'> 	policy-&gt;user_policy.governor = policy-&gt;governor;</div><div class='ctx'> 	mutex_unlock(&amp;policy-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	unlock_cpu_hotplug();</div><div class='add'>+</div><div class='ctx'> 	return ret ? ret : count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -874,7 +877,7 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, unsigne</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_freqs freqs;</div><div class='ctx'> </div><div class='del'>-	dprintk(KERN_WARNING "Warning: CPU frequency out of sync: cpufreq and timing "</div><div class='add'>+	dprintk("Warning: CPU frequency out of sync: cpufreq and timing "</div><div class='ctx'> 	       "core thinks of %u, is %u kHz.\n", old_freq, new_freq);</div><div class='ctx'> </div><div class='ctx'> 	freqs.cpu = cpu;</div><div class='hunk'>@@ -1006,7 +1009,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg)</div><div class='ctx'> 		struct cpufreq_freqs freqs;</div><div class='ctx'> </div><div class='ctx'> 		if (!(cpufreq_driver-&gt;flags &amp; CPUFREQ_PM_NO_WARN))</div><div class='del'>-			dprintk(KERN_DEBUG "Warning: CPU frequency is %u, "</div><div class='add'>+			dprintk("Warning: CPU frequency is %u, "</div><div class='ctx'> 			       "cpufreq assumed %u kHz.\n",</div><div class='ctx'> 			       cur_freq, cpu_policy-&gt;cur);</div><div class='ctx'> </div><div class='hunk'>@@ -1087,7 +1090,7 @@ static int cpufreq_resume(struct sys_device * sysdev)</div><div class='ctx'> 			struct cpufreq_freqs freqs;</div><div class='ctx'> </div><div class='ctx'> 			if (!(cpufreq_driver-&gt;flags &amp; CPUFREQ_PM_NO_WARN))</div><div class='del'>-				dprintk(KERN_WARNING "Warning: CPU frequency"</div><div class='add'>+				dprintk("Warning: CPU frequency"</div><div class='ctx'> 				       "is %u, cpufreq assumed %u kHz.\n",</div><div class='ctx'> 				       cur_freq, cpu_policy-&gt;cur);</div><div class='ctx'> </div><div class='hunk'>@@ -1497,6 +1500,7 @@ int cpufreq_update_policy(unsigned int cpu)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cpufreq_update_policy);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_HOTPLUG_CPU</div><div class='ctx'> static int cpufreq_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 					unsigned long action, void *hcpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -1532,10 +1536,11 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,</div><div class='ctx'> 	return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct notifier_block cpufreq_cpu_notifier =</div><div class='add'>+static struct notifier_block __cpuinitdata cpufreq_cpu_notifier =</div><div class='ctx'> {</div><div class='ctx'>     .notifier_call = cpufreq_cpu_callback,</div><div class='ctx'> };</div><div class='add'>+#endif /* CONFIG_HOTPLUG_CPU */</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *               REGISTER / UNREGISTER CPUFREQ DRIVER                *</div><div class='hunk'>@@ -1596,7 +1601,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		register_cpu_notifier(&amp;cpufreq_cpu_notifier);</div><div class='add'>+		register_hotcpu_notifier(&amp;cpufreq_cpu_notifier);</div><div class='ctx'> 		dprintk("driver %s up and running\n", driver_data-&gt;name);</div><div class='ctx'> 		cpufreq_debug_enable_ratelimit();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1628,7 +1633,7 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)</div><div class='ctx'> 	dprintk("unregistering driver %s\n", driver-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	sysdev_driver_unregister(&amp;cpu_sysdev_class, &amp;cpufreq_sysdev_driver);</div><div class='del'>-	unregister_cpu_notifier(&amp;cpufreq_cpu_notifier);</div><div class='add'>+	unregister_hotcpu_notifier(&amp;cpufreq_cpu_notifier);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;cpufreq_driver_lock, flags);</div><div class='ctx'> 	cpufreq_driver = NULL;</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c<br/>index e07a35487bde..b3ebc8f01975 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_conservative.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_conservative.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_conservative.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cpufreq/cpufreq_conservative.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='hunk'>@@ -72,6 +73,14 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);</div><div class='ctx'> </div><div class='ctx'> static unsigned int dbs_enable;	/* number of CPUs using this policy */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * DEADLOCK ALERT! There is a ordering requirement between cpu_hotplug</div><div class='add'>+ * lock and dbs_mutex. cpu_hotplug lock should always be held before</div><div class='add'>+ * dbs_mutex. If any function that can potentially take cpu_hotplug lock</div><div class='add'>+ * (like __cpufreq_driver_target()) is being called with dbs_mutex taken, then</div><div class='add'>+ * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock</div><div class='add'>+ * is recursive for the same process. -Venki</div><div class='add'>+ */</div><div class='ctx'> static DEFINE_MUTEX 	(dbs_mutex);</div><div class='ctx'> static DECLARE_WORK	(dbs_work, do_dbs_timer, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -414,12 +423,14 @@ static void dbs_check_cpu(int cpu)</div><div class='ctx'> static void do_dbs_timer(void *data)</div><div class='ctx'> { </div><div class='ctx'> 	int i;</div><div class='add'>+	lock_cpu_hotplug();</div><div class='ctx'> 	mutex_lock(&amp;dbs_mutex);</div><div class='ctx'> 	for_each_online_cpu(i)</div><div class='ctx'> 		dbs_check_cpu(i);</div><div class='ctx'> 	schedule_delayed_work(&amp;dbs_work, </div><div class='ctx'> 			usecs_to_jiffies(dbs_tuners_ins.sampling_rate));</div><div class='ctx'> 	mutex_unlock(&amp;dbs_mutex);</div><div class='add'>+	unlock_cpu_hotplug();</div><div class='ctx'> } </div><div class='ctx'> </div><div class='ctx'> static inline void dbs_timer_init(void)</div><div class='hunk'>@@ -514,6 +525,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPUFREQ_GOV_LIMITS:</div><div class='add'>+		lock_cpu_hotplug();</div><div class='ctx'> 		mutex_lock(&amp;dbs_mutex);</div><div class='ctx'> 		if (policy-&gt;max &lt; this_dbs_info-&gt;cur_policy-&gt;cur)</div><div class='ctx'> 			__cpufreq_driver_target(</div><div class='hunk'>@@ -524,6 +536,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 					this_dbs_info-&gt;cur_policy,</div><div class='ctx'> 				       	policy-&gt;min, CPUFREQ_RELATION_L);</div><div class='ctx'> 		mutex_unlock(&amp;dbs_mutex);</div><div class='add'>+		unlock_cpu_hotplug();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c<br/>index 3e6ffcaa5af4..87299924e735 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_ondemand.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_ondemand.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_ondemand.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cpufreq/cpufreq_ondemand.c</a></div><div class='hunk'>@@ -12,21 +12,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/sysfs.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/cpu.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='del'>-#include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -55,47 +45,55 @@ static unsigned int def_sampling_rate;</div><div class='ctx'> #define MIN_SAMPLING_RATE			(def_sampling_rate / MIN_SAMPLING_RATE_RATIO)</div><div class='ctx'> #define MAX_SAMPLING_RATE			(500 * def_sampling_rate)</div><div class='ctx'> #define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER	(1000)</div><div class='del'>-#define DEF_SAMPLING_DOWN_FACTOR		(1)</div><div class='del'>-#define MAX_SAMPLING_DOWN_FACTOR		(10)</div><div class='ctx'> #define TRANSITION_LATENCY_LIMIT		(10 * 1000)</div><div class='ctx'> </div><div class='ctx'> static void do_dbs_timer(void *data);</div><div class='ctx'> </div><div class='ctx'> struct cpu_dbs_info_s {</div><div class='add'>+	cputime64_t prev_cpu_idle;</div><div class='add'>+	cputime64_t prev_cpu_wall;</div><div class='ctx'> 	struct cpufreq_policy *cur_policy;</div><div class='del'>-	unsigned int prev_cpu_idle_up;</div><div class='del'>-	unsigned int prev_cpu_idle_down;</div><div class='add'>+ 	struct work_struct work;</div><div class='ctx'> 	unsigned int enable;</div><div class='ctx'> };</div><div class='ctx'> static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);</div><div class='ctx'> </div><div class='ctx'> static unsigned int dbs_enable;	/* number of CPUs using this policy */</div><div class='ctx'> </div><div class='del'>-static DEFINE_MUTEX (dbs_mutex);</div><div class='del'>-static DECLARE_WORK	(dbs_work, do_dbs_timer, NULL);</div><div class='add'>+/*</div><div class='add'>+ * DEADLOCK ALERT! There is a ordering requirement between cpu_hotplug</div><div class='add'>+ * lock and dbs_mutex. cpu_hotplug lock should always be held before</div><div class='add'>+ * dbs_mutex. If any function that can potentially take cpu_hotplug lock</div><div class='add'>+ * (like __cpufreq_driver_target()) is being called with dbs_mutex taken, then</div><div class='add'>+ * cpu_hotplug lock should be taken before that. Note that cpu_hotplug lock</div><div class='add'>+ * is recursive for the same process. -Venki</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(dbs_mutex);</div><div class='ctx'> </div><div class='del'>-static struct workqueue_struct *dbs_workq;</div><div class='add'>+static struct workqueue_struct	*kondemand_wq;</div><div class='ctx'> </div><div class='ctx'> struct dbs_tuners {</div><div class='ctx'> 	unsigned int sampling_rate;</div><div class='del'>-	unsigned int sampling_down_factor;</div><div class='ctx'> 	unsigned int up_threshold;</div><div class='ctx'> 	unsigned int ignore_nice;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dbs_tuners dbs_tuners_ins = {</div><div class='ctx'> 	.up_threshold = DEF_FREQUENCY_UP_THRESHOLD,</div><div class='del'>-	.sampling_down_factor = DEF_SAMPLING_DOWN_FACTOR,</div><div class='ctx'> 	.ignore_nice = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_cpu_idle_time(unsigned int cpu)</div><div class='add'>+static inline cputime64_t get_cpu_idle_time(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	return	kstat_cpu(cpu).cpustat.idle +</div><div class='del'>-		kstat_cpu(cpu).cpustat.iowait +</div><div class='del'>-		( dbs_tuners_ins.ignore_nice ?</div><div class='del'>-		  kstat_cpu(cpu).cpustat.nice :</div><div class='del'>-		  0);</div><div class='add'>+	cputime64_t retval;</div><div class='add'>+</div><div class='add'>+	retval = cputime64_add(kstat_cpu(cpu).cpustat.idle,</div><div class='add'>+			kstat_cpu(cpu).cpustat.iowait);</div><div class='add'>+</div><div class='add'>+	if (dbs_tuners_ins.ignore_nice)</div><div class='add'>+		retval = cputime64_add(retval, kstat_cpu(cpu).cpustat.nice);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /************************** sysfs interface ************************/</div><div class='hunk'>@@ -124,35 +122,15 @@ static ssize_t show_##file_name						\</div><div class='ctx'> 	return sprintf(buf, "%u\n", dbs_tuners_ins.object);		\</div><div class='ctx'> }</div><div class='ctx'> show_one(sampling_rate, sampling_rate);</div><div class='del'>-show_one(sampling_down_factor, sampling_down_factor);</div><div class='ctx'> show_one(up_threshold, up_threshold);</div><div class='ctx'> show_one(ignore_nice_load, ignore_nice);</div><div class='ctx'> </div><div class='del'>-static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,</div><div class='del'>-		const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	unsigned int input;</div><div class='del'>-	int ret;</div><div class='del'>-	ret = sscanf (buf, "%u", &amp;input);</div><div class='del'>-	if (ret != 1 )</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (input &gt; MAX_SAMPLING_DOWN_FACTOR || input &lt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dbs_mutex);</div><div class='del'>-	dbs_tuners_ins.sampling_down_factor = input;</div><div class='del'>-	mutex_unlock(&amp;dbs_mutex);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t store_sampling_rate(struct cpufreq_policy *unused,</div><div class='ctx'> 		const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int input;</div><div class='ctx'> 	int ret;</div><div class='del'>-	ret = sscanf (buf, "%u", &amp;input);</div><div class='add'>+	ret = sscanf(buf, "%u", &amp;input);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dbs_mutex);</div><div class='ctx'> 	if (ret != 1 || input &gt; MAX_SAMPLING_RATE || input &lt; MIN_SAMPLING_RATE) {</div><div class='hunk'>@@ -171,7 +149,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int input;</div><div class='ctx'> 	int ret;</div><div class='del'>-	ret = sscanf (buf, "%u", &amp;input);</div><div class='add'>+	ret = sscanf(buf, "%u", &amp;input);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dbs_mutex);</div><div class='ctx'> 	if (ret != 1 || input &gt; MAX_FREQUENCY_UP_THRESHOLD ||</div><div class='hunk'>@@ -194,7 +172,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,</div><div class='ctx'> </div><div class='ctx'> 	unsigned int j;</div><div class='ctx'> </div><div class='del'>-	ret = sscanf (buf, "%u", &amp;input);</div><div class='add'>+	ret = sscanf(buf, "%u", &amp;input);</div><div class='ctx'> 	if ( ret != 1 )</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -208,12 +186,12 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,</div><div class='ctx'> 	}</div><div class='ctx'> 	dbs_tuners_ins.ignore_nice = input;</div><div class='ctx'> </div><div class='del'>-	/* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */</div><div class='add'>+	/* we need to re-evaluate prev_cpu_idle */</div><div class='ctx'> 	for_each_online_cpu(j) {</div><div class='del'>-		struct cpu_dbs_info_s *j_dbs_info;</div><div class='del'>-		j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='del'>-		j_dbs_info-&gt;prev_cpu_idle_up = get_cpu_idle_time(j);</div><div class='del'>-		j_dbs_info-&gt;prev_cpu_idle_down = j_dbs_info-&gt;prev_cpu_idle_up;</div><div class='add'>+		struct cpu_dbs_info_s *dbs_info;</div><div class='add'>+		dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='add'>+		dbs_info-&gt;prev_cpu_idle = get_cpu_idle_time(j);</div><div class='add'>+		dbs_info-&gt;prev_cpu_wall = get_jiffies_64();</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;dbs_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +203,6 @@ static struct freq_attr _name = \</div><div class='ctx'> __ATTR(_name, 0644, show_##_name, store_##_name)</div><div class='ctx'> </div><div class='ctx'> define_one_rw(sampling_rate);</div><div class='del'>-define_one_rw(sampling_down_factor);</div><div class='ctx'> define_one_rw(up_threshold);</div><div class='ctx'> define_one_rw(ignore_nice_load);</div><div class='ctx'> </div><div class='hunk'>@@ -233,7 +210,6 @@ static struct attribute * dbs_attributes[] = {</div><div class='ctx'> 	&amp;sampling_rate_max.attr,</div><div class='ctx'> 	&amp;sampling_rate_min.attr,</div><div class='ctx'> 	&amp;sampling_rate.attr,</div><div class='del'>-	&amp;sampling_down_factor.attr,</div><div class='ctx'> 	&amp;up_threshold.attr,</div><div class='ctx'> 	&amp;ignore_nice_load.attr,</div><div class='ctx'> 	NULL</div><div class='hunk'>@@ -246,26 +222,27 @@ static struct attribute_group dbs_attr_group = {</div><div class='ctx'> </div><div class='ctx'> /************************** sysfs end ************************/</div><div class='ctx'> </div><div class='del'>-static void dbs_check_cpu(int cpu)</div><div class='add'>+static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)</div><div class='ctx'> {</div><div class='del'>-	unsigned int idle_ticks, up_idle_ticks, total_ticks;</div><div class='del'>-	unsigned int freq_next;</div><div class='del'>-	unsigned int freq_down_sampling_rate;</div><div class='del'>-	static int down_skip[NR_CPUS];</div><div class='del'>-	struct cpu_dbs_info_s *this_dbs_info;</div><div class='add'>+	unsigned int idle_ticks, total_ticks;</div><div class='add'>+	unsigned int load;</div><div class='add'>+	cputime64_t cur_jiffies;</div><div class='ctx'> </div><div class='ctx'> 	struct cpufreq_policy *policy;</div><div class='ctx'> 	unsigned int j;</div><div class='ctx'> </div><div class='del'>-	this_dbs_info = &amp;per_cpu(cpu_dbs_info, cpu);</div><div class='ctx'> 	if (!this_dbs_info-&gt;enable)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	policy = this_dbs_info-&gt;cur_policy;</div><div class='add'>+	cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());</div><div class='add'>+	total_ticks = (unsigned int) cputime64_sub(cur_jiffies,</div><div class='add'>+			this_dbs_info-&gt;prev_cpu_wall);</div><div class='add'>+	this_dbs_info-&gt;prev_cpu_wall = cur_jiffies;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Every sampling_rate, we check, if current idle time is less</div><div class='ctx'> 	 * than 20% (default), then we try to increase frequency</div><div class='del'>-	 * Every sampling_rate*sampling_down_factor, we look for a the lowest</div><div class='add'>+	 * Every sampling_rate, we look for a the lowest</div><div class='ctx'> 	 * frequency which can sustain the load while keeping idle time over</div><div class='ctx'> 	 * 30%. If such a frequency exist, we try to decrease to this frequency.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -274,36 +251,26 @@ static void dbs_check_cpu(int cpu)</div><div class='ctx'> 	 * 5% (default) of current frequency</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* Check for frequency increase */</div><div class='add'>+	/* Get Idle Time */</div><div class='ctx'> 	idle_ticks = UINT_MAX;</div><div class='ctx'> 	for_each_cpu_mask(j, policy-&gt;cpus) {</div><div class='del'>-		unsigned int tmp_idle_ticks, total_idle_ticks;</div><div class='add'>+		cputime64_t total_idle_ticks;</div><div class='add'>+		unsigned int tmp_idle_ticks;</div><div class='ctx'> 		struct cpu_dbs_info_s *j_dbs_info;</div><div class='ctx'> </div><div class='ctx'> 		j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='ctx'> 		total_idle_ticks = get_cpu_idle_time(j);</div><div class='del'>-		tmp_idle_ticks = total_idle_ticks -</div><div class='del'>-			j_dbs_info-&gt;prev_cpu_idle_up;</div><div class='del'>-		j_dbs_info-&gt;prev_cpu_idle_up = total_idle_ticks;</div><div class='add'>+		tmp_idle_ticks = (unsigned int) cputime64_sub(total_idle_ticks,</div><div class='add'>+				j_dbs_info-&gt;prev_cpu_idle);</div><div class='add'>+		j_dbs_info-&gt;prev_cpu_idle = total_idle_ticks;</div><div class='ctx'> </div><div class='ctx'> 		if (tmp_idle_ticks &lt; idle_ticks)</div><div class='ctx'> 			idle_ticks = tmp_idle_ticks;</div><div class='ctx'> 	}</div><div class='add'>+	load = (100 * (total_ticks - idle_ticks)) / total_ticks;</div><div class='ctx'> </div><div class='del'>-	/* Scale idle ticks by 100 and compare with up and down ticks */</div><div class='del'>-	idle_ticks *= 100;</div><div class='del'>-	up_idle_ticks = (100 - dbs_tuners_ins.up_threshold) *</div><div class='del'>-			usecs_to_jiffies(dbs_tuners_ins.sampling_rate);</div><div class='del'>-</div><div class='del'>-	if (idle_ticks &lt; up_idle_ticks) {</div><div class='del'>-		down_skip[cpu] = 0;</div><div class='del'>-		for_each_cpu_mask(j, policy-&gt;cpus) {</div><div class='del'>-			struct cpu_dbs_info_s *j_dbs_info;</div><div class='del'>-</div><div class='del'>-			j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='del'>-			j_dbs_info-&gt;prev_cpu_idle_down =</div><div class='del'>-					j_dbs_info-&gt;prev_cpu_idle_up;</div><div class='del'>-		}</div><div class='add'>+	/* Check for frequency increase */</div><div class='add'>+	if (load &gt; dbs_tuners_ins.up_threshold) {</div><div class='ctx'> 		/* if we are already at full speed then break out early */</div><div class='ctx'> 		if (policy-&gt;cur == policy-&gt;max)</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -314,81 +281,49 @@ static void dbs_check_cpu(int cpu)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for frequency decrease */</div><div class='del'>-	down_skip[cpu]++;</div><div class='del'>-	if (down_skip[cpu] &lt; dbs_tuners_ins.sampling_down_factor)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	idle_ticks = UINT_MAX;</div><div class='del'>-	for_each_cpu_mask(j, policy-&gt;cpus) {</div><div class='del'>-		unsigned int tmp_idle_ticks, total_idle_ticks;</div><div class='del'>-		struct cpu_dbs_info_s *j_dbs_info;</div><div class='del'>-</div><div class='del'>-		j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='del'>-		/* Check for frequency decrease */</div><div class='del'>-		total_idle_ticks = j_dbs_info-&gt;prev_cpu_idle_up;</div><div class='del'>-		tmp_idle_ticks = total_idle_ticks -</div><div class='del'>-			j_dbs_info-&gt;prev_cpu_idle_down;</div><div class='del'>-		j_dbs_info-&gt;prev_cpu_idle_down = total_idle_ticks;</div><div class='del'>-</div><div class='del'>-		if (tmp_idle_ticks &lt; idle_ticks)</div><div class='del'>-			idle_ticks = tmp_idle_ticks;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_skip[cpu] = 0;</div><div class='ctx'> 	/* if we cannot reduce the frequency anymore, break out early */</div><div class='ctx'> 	if (policy-&gt;cur == policy-&gt;min)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* Compute how many ticks there are between two measurements */</div><div class='del'>-	freq_down_sampling_rate = dbs_tuners_ins.sampling_rate *</div><div class='del'>-		dbs_tuners_ins.sampling_down_factor;</div><div class='del'>-	total_ticks = usecs_to_jiffies(freq_down_sampling_rate);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The optimal frequency is the frequency that is the lowest that</div><div class='ctx'> 	 * can support the current CPU usage without triggering the up</div><div class='ctx'> 	 * policy. To be safe, we focus 10 points under the threshold.</div><div class='ctx'> 	 */</div><div class='del'>-	freq_next = ((total_ticks - idle_ticks) * 100) / total_ticks;</div><div class='del'>-	freq_next = (freq_next * policy-&gt;cur) /</div><div class='add'>+	if (load &lt; (dbs_tuners_ins.up_threshold - 10)) {</div><div class='add'>+		unsigned int freq_next;</div><div class='add'>+		freq_next = (policy-&gt;cur * load) /</div><div class='ctx'> 			(dbs_tuners_ins.up_threshold - 10);</div><div class='ctx'> </div><div class='del'>-	if (freq_next &lt; policy-&gt;min)</div><div class='del'>-		freq_next = policy-&gt;min;</div><div class='del'>-</div><div class='del'>-	if (freq_next &lt;= ((policy-&gt;cur * 95) / 100))</div><div class='ctx'> 		__cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_L);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void do_dbs_timer(void *data)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	mutex_lock(&amp;dbs_mutex);</div><div class='del'>-	for_each_online_cpu(i)</div><div class='del'>-		dbs_check_cpu(i);</div><div class='del'>-	queue_delayed_work(dbs_workq, &amp;dbs_work,</div><div class='del'>-			   usecs_to_jiffies(dbs_tuners_ins.sampling_rate));</div><div class='del'>-	mutex_unlock(&amp;dbs_mutex);</div><div class='add'>+	unsigned int cpu = smp_processor_id();</div><div class='add'>+	struct cpu_dbs_info_s *dbs_info = &amp;per_cpu(cpu_dbs_info, cpu);</div><div class='add'>+</div><div class='add'>+	dbs_check_cpu(dbs_info);</div><div class='add'>+	queue_delayed_work_on(cpu, kondemand_wq, &amp;dbs_info-&gt;work,</div><div class='add'>+			usecs_to_jiffies(dbs_tuners_ins.sampling_rate));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void dbs_timer_init(void)</div><div class='add'>+static inline void dbs_timer_init(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	INIT_WORK(&amp;dbs_work, do_dbs_timer, NULL);</div><div class='del'>-	if (!dbs_workq)</div><div class='del'>-		dbs_workq = create_singlethread_workqueue("ondemand");</div><div class='del'>-	if (!dbs_workq) {</div><div class='del'>-		printk(KERN_ERR "ondemand: Cannot initialize kernel thread\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	queue_delayed_work(dbs_workq, &amp;dbs_work,</div><div class='del'>-			   usecs_to_jiffies(dbs_tuners_ins.sampling_rate));</div><div class='add'>+	struct cpu_dbs_info_s *dbs_info = &amp;per_cpu(cpu_dbs_info, cpu);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;dbs_info-&gt;work, do_dbs_timer, 0);</div><div class='add'>+	queue_delayed_work_on(cpu, kondemand_wq, &amp;dbs_info-&gt;work,</div><div class='add'>+			usecs_to_jiffies(dbs_tuners_ins.sampling_rate));</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void dbs_timer_exit(void)</div><div class='add'>+static inline void dbs_timer_exit(unsigned int cpu)</div><div class='ctx'> {</div><div class='del'>-	if (dbs_workq)</div><div class='del'>-		cancel_rearming_delayed_workqueue(dbs_workq, &amp;dbs_work);</div><div class='add'>+	struct cpu_dbs_info_s *dbs_info = &amp;per_cpu(cpu_dbs_info, cpu);</div><div class='add'>+</div><div class='add'>+	cancel_rearming_delayed_workqueue(kondemand_wq, &amp;dbs_info-&gt;work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='hunk'>@@ -402,8 +337,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case CPUFREQ_GOV_START:</div><div class='del'>-		if ((!cpu_online(cpu)) ||</div><div class='del'>-		    (!policy-&gt;cur))</div><div class='add'>+		if ((!cpu_online(cpu)) || (!policy-&gt;cur))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (policy-&gt;cpuinfo.transition_latency &gt;</div><div class='hunk'>@@ -416,18 +350,26 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;dbs_mutex);</div><div class='add'>+		dbs_enable++;</div><div class='add'>+		if (dbs_enable == 1) {</div><div class='add'>+			kondemand_wq = create_workqueue("kondemand");</div><div class='add'>+			if (!kondemand_wq) {</div><div class='add'>+				printk(KERN_ERR "Creation of kondemand failed\n");</div><div class='add'>+				dbs_enable--;</div><div class='add'>+				mutex_unlock(&amp;dbs_mutex);</div><div class='add'>+				return -ENOSPC;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		for_each_cpu_mask(j, policy-&gt;cpus) {</div><div class='ctx'> 			struct cpu_dbs_info_s *j_dbs_info;</div><div class='ctx'> 			j_dbs_info = &amp;per_cpu(cpu_dbs_info, j);</div><div class='ctx'> 			j_dbs_info-&gt;cur_policy = policy;</div><div class='ctx'> </div><div class='del'>-			j_dbs_info-&gt;prev_cpu_idle_up = get_cpu_idle_time(j);</div><div class='del'>-			j_dbs_info-&gt;prev_cpu_idle_down</div><div class='del'>-				= j_dbs_info-&gt;prev_cpu_idle_up;</div><div class='add'>+			j_dbs_info-&gt;prev_cpu_idle = get_cpu_idle_time(j);</div><div class='add'>+			j_dbs_info-&gt;prev_cpu_wall = get_jiffies_64();</div><div class='ctx'> 		}</div><div class='ctx'> 		this_dbs_info-&gt;enable = 1;</div><div class='ctx'> 		sysfs_create_group(&amp;policy-&gt;kobj, &amp;dbs_attr_group);</div><div class='del'>-		dbs_enable++;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Start the timerschedule work, when this governor</div><div class='ctx'> 		 * is used for first time</div><div class='hunk'>@@ -446,48 +388,47 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,</div><div class='ctx'> 				def_sampling_rate = MIN_STAT_SAMPLING_RATE;</div><div class='ctx'> </div><div class='ctx'> 			dbs_tuners_ins.sampling_rate = def_sampling_rate;</div><div class='del'>-			dbs_timer_init();</div><div class='ctx'> 		}</div><div class='add'>+		dbs_timer_init(policy-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 		mutex_unlock(&amp;dbs_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPUFREQ_GOV_STOP:</div><div class='ctx'> 		mutex_lock(&amp;dbs_mutex);</div><div class='add'>+		dbs_timer_exit(policy-&gt;cpu);</div><div class='ctx'> 		this_dbs_info-&gt;enable = 0;</div><div class='ctx'> 		sysfs_remove_group(&amp;policy-&gt;kobj, &amp;dbs_attr_group);</div><div class='ctx'> 		dbs_enable--;</div><div class='del'>-		/*</div><div class='del'>-		 * Stop the timerschedule work, when this governor</div><div class='del'>-		 * is used for first time</div><div class='del'>-		 */</div><div class='ctx'> 		if (dbs_enable == 0)</div><div class='del'>-			dbs_timer_exit();</div><div class='add'>+			destroy_workqueue(kondemand_wq);</div><div class='ctx'> </div><div class='ctx'> 		mutex_unlock(&amp;dbs_mutex);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CPUFREQ_GOV_LIMITS:</div><div class='add'>+		lock_cpu_hotplug();</div><div class='ctx'> 		mutex_lock(&amp;dbs_mutex);</div><div class='ctx'> 		if (policy-&gt;max &lt; this_dbs_info-&gt;cur_policy-&gt;cur)</div><div class='del'>-			__cpufreq_driver_target(</div><div class='del'>-					this_dbs_info-&gt;cur_policy,</div><div class='del'>-					policy-&gt;max, CPUFREQ_RELATION_H);</div><div class='add'>+			__cpufreq_driver_target(this_dbs_info-&gt;cur_policy,</div><div class='add'>+			                        policy-&gt;max,</div><div class='add'>+			                        CPUFREQ_RELATION_H);</div><div class='ctx'> 		else if (policy-&gt;min &gt; this_dbs_info-&gt;cur_policy-&gt;cur)</div><div class='del'>-			__cpufreq_driver_target(</div><div class='del'>-					this_dbs_info-&gt;cur_policy,</div><div class='del'>-					policy-&gt;min, CPUFREQ_RELATION_L);</div><div class='add'>+			__cpufreq_driver_target(this_dbs_info-&gt;cur_policy,</div><div class='add'>+			                        policy-&gt;min,</div><div class='add'>+			                        CPUFREQ_RELATION_L);</div><div class='ctx'> 		mutex_unlock(&amp;dbs_mutex);</div><div class='add'>+		unlock_cpu_hotplug();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cpufreq_governor cpufreq_gov_dbs = {</div><div class='del'>-	.name		= "ondemand",</div><div class='del'>-	.governor	= cpufreq_governor_dbs,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='add'>+	.name = "ondemand",</div><div class='add'>+	.governor = cpufreq_governor_dbs,</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init cpufreq_gov_dbs_init(void)</div><div class='hunk'>@@ -497,21 +438,15 @@ static int __init cpufreq_gov_dbs_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit cpufreq_gov_dbs_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* Make sure that the scheduled work is indeed not running.</div><div class='del'>-	   Assumes the timer has been cancelled first. */</div><div class='del'>-	if (dbs_workq) {</div><div class='del'>-		flush_workqueue(dbs_workq);</div><div class='del'>-		destroy_workqueue(dbs_workq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	cpufreq_unregister_governor(&amp;cpufreq_gov_dbs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR ("Venkatesh Pallipadi &lt;venkatesh.pallipadi@intel.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION ("'cpufreq_ondemand' - A dynamic cpufreq governor for "</div><div class='del'>-		"Low Latency Frequency Transition capable processors");</div><div class='del'>-MODULE_LICENSE ("GPL");</div><div class='add'>+MODULE_AUTHOR("Venkatesh Pallipadi &lt;venkatesh.pallipadi@intel.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Alexey Starikovskiy &lt;alexey.y.starikovskiy@intel.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("'cpufreq_ondemand' - A dynamic cpufreq governor for "</div><div class='add'>+                   "Low Latency Frequency Transition capable processors");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(cpufreq_gov_dbs_init);</div><div class='ctx'> module_exit(cpufreq_gov_dbs_exit);</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c<br/>index 9694b6ed3268..25eee5394201 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_stats.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_stats.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cpufreq/cpufreq_stats.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/cpu.h&gt;</div><div class='hunk'>@@ -74,7 +73,7 @@ static ssize_t</div><div class='ctx'> show_total_trans(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpufreq_stats *stat = cpufreq_stats_table[policy-&gt;cpu];</div><div class='del'>-	if(!stat)</div><div class='add'>+	if (!stat)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return sprintf(buf, "%d\n",</div><div class='ctx'> 			cpufreq_stats_table[stat-&gt;cpu]-&gt;total_trans);</div><div class='hunk'>@@ -86,7 +85,7 @@ show_time_in_state(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> 	ssize_t len = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct cpufreq_stats *stat = cpufreq_stats_table[policy-&gt;cpu];</div><div class='del'>-	if(!stat)</div><div class='add'>+	if (!stat)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	cpufreq_stats_update(stat-&gt;cpu);</div><div class='ctx'> 	for (i = 0; i &lt; stat-&gt;state_num; i++) {</div><div class='hunk'>@@ -104,7 +103,7 @@ show_trans_table(struct cpufreq_policy *policy, char *buf)</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	struct cpufreq_stats *stat = cpufreq_stats_table[policy-&gt;cpu];</div><div class='del'>-	if(!stat)</div><div class='add'>+	if (!stat)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	cpufreq_stats_update(stat-&gt;cpu);</div><div class='ctx'> 	len += snprintf(buf + len, PAGE_SIZE - len, "   From  :    To\n");</div><div class='hunk'>@@ -350,7 +349,7 @@ __init cpufreq_stats_init(void)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	register_cpu_notifier(&amp;cpufreq_stat_cpu_notifier);</div><div class='add'>+	register_hotcpu_notifier(&amp;cpufreq_stat_cpu_notifier);</div><div class='ctx'> 	lock_cpu_hotplug();</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='ctx'> 		cpufreq_stat_cpu_callback(&amp;cpufreq_stat_cpu_notifier, CPU_ONLINE,</div><div class='hunk'>@@ -368,7 +367,7 @@ __exit cpufreq_stats_exit(void)</div><div class='ctx'> 			CPUFREQ_POLICY_NOTIFIER);</div><div class='ctx'> 	cpufreq_unregister_notifier(&amp;notifier_trans_block,</div><div class='ctx'> 			CPUFREQ_TRANSITION_NOTIFIER);</div><div class='del'>-	unregister_cpu_notifier(&amp;cpufreq_stat_cpu_notifier);</div><div class='add'>+	unregister_hotcpu_notifier(&amp;cpufreq_stat_cpu_notifier);</div><div class='ctx'> 	lock_cpu_hotplug();</div><div class='ctx'> 	for_each_online_cpu(cpu) {</div><div class='ctx'> 		cpufreq_stat_cpu_callback(&amp;cpufreq_stat_cpu_notifier, CPU_DEAD,</div><div class='head'>diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c<br/>index 071ee4f1bbf2..44ae5e5b94cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_userspace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/cpufreq_userspace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/cpufreq_userspace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cpufreq/cpufreq_userspace.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='head'>diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c<br/>index a4818ce88919..551f4ccf87fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/cpufreq/freq_table.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/cpufreq/freq_table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/cpufreq/freq_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/cpufreq/freq_table.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int min_freq = ~0;</div><div class='ctx'> 	unsigned int max_freq = 0;</div><div class='del'>-	unsigned int i = 0;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {</div><div class='ctx'> 		unsigned int freq = table[i].frequency;</div><div class='hunk'>@@ -51,7 +51,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,</div><div class='ctx'> 				   struct cpufreq_frequency_table *table)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int next_larger = ~0;</div><div class='del'>-	unsigned int i = 0;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("request for verification of policy (%u - %u kHz) for cpu %u\n", policy-&gt;min, policy-&gt;max, policy-&gt;cpu);</div><div class='hunk'>@@ -91,20 +91,24 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,</div><div class='ctx'> 				   unsigned int relation,</div><div class='ctx'> 				   unsigned int *index)</div><div class='ctx'> {</div><div class='del'>-	struct cpufreq_frequency_table optimal = { .index = ~0, };</div><div class='del'>-	struct cpufreq_frequency_table suboptimal = { .index = ~0, };</div><div class='add'>+	struct cpufreq_frequency_table optimal = {</div><div class='add'>+		.index = ~0,</div><div class='add'>+		.frequency = 0,</div><div class='add'>+	};</div><div class='add'>+	struct cpufreq_frequency_table suboptimal = {</div><div class='add'>+		.index = ~0,</div><div class='add'>+		.frequency = 0,</div><div class='add'>+	};</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("request for target %u kHz (relation: %u) for cpu %u\n", target_freq, relation, policy-&gt;cpu);</div><div class='ctx'> </div><div class='ctx'> 	switch (relation) {</div><div class='ctx'> 	case CPUFREQ_RELATION_H:</div><div class='del'>-		optimal.frequency = 0;</div><div class='ctx'> 		suboptimal.frequency = ~0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CPUFREQ_RELATION_L:</div><div class='ctx'> 		optimal.frequency = ~0;</div><div class='del'>-		suboptimal.frequency = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c<br/>index 5158a9db4bc5..b643d71298a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/crypto/padlock-aes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/crypto/padlock-aes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/crypto/padlock-aes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/crypto/padlock-aes.c</a></div><div class='hunk'>@@ -59,16 +59,20 @@</div><div class='ctx'> #define AES_EXTENDED_KEY_SIZE	64	/* in uint32_t units */</div><div class='ctx'> #define AES_EXTENDED_KEY_SIZE_B	(AES_EXTENDED_KEY_SIZE * sizeof(uint32_t))</div><div class='ctx'> </div><div class='add'>+/* Whenever making any changes to the following</div><div class='add'>+ * structure *make sure* you keep E, d_data</div><div class='add'>+ * and cword aligned on 16 Bytes boundaries!!! */</div><div class='ctx'> struct aes_ctx {</div><div class='del'>-	uint32_t e_data[AES_EXTENDED_KEY_SIZE];</div><div class='del'>-	uint32_t d_data[AES_EXTENDED_KEY_SIZE];</div><div class='ctx'> 	struct {</div><div class='ctx'> 		struct cword encrypt;</div><div class='ctx'> 		struct cword decrypt;</div><div class='ctx'> 	} cword;</div><div class='del'>-	uint32_t *E;</div><div class='del'>-	uint32_t *D;</div><div class='add'>+	u32 *D;</div><div class='ctx'> 	int key_length;</div><div class='add'>+	u32 E[AES_EXTENDED_KEY_SIZE]</div><div class='add'>+		__attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));</div><div class='add'>+	u32 d_data[AES_EXTENDED_KEY_SIZE]</div><div class='add'>+		__attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ====== Key management routines ====== */</div><div class='hunk'>@@ -282,19 +286,20 @@ aes_hw_extkey_available(uint8_t key_len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct aes_ctx *aes_ctx(void *ctx)</div><div class='add'>+static inline struct aes_ctx *aes_ctx(struct crypto_tfm *tfm)</div><div class='ctx'> {</div><div class='add'>+	unsigned long addr = (unsigned long)crypto_tfm_ctx(tfm);</div><div class='ctx'> 	unsigned long align = PADLOCK_ALIGNMENT;</div><div class='ctx'> </div><div class='ctx'> 	if (align &lt;= crypto_tfm_ctx_alignment())</div><div class='ctx'> 		align = 1;</div><div class='del'>-	return (struct aes_ctx *)ALIGN((unsigned long)ctx, align);</div><div class='add'>+	return (struct aes_ctx *)ALIGN(addr, align);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-aes_set_key(void *ctx_arg, const uint8_t *in_key, unsigned int key_len, uint32_t *flags)</div><div class='add'>+static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,</div><div class='add'>+		       unsigned int key_len, u32 *flags)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(ctx_arg);</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(tfm);</div><div class='ctx'> 	const __le32 *key = (const __le32 *)in_key;</div><div class='ctx'> 	uint32_t i, t, u, v, w;</div><div class='ctx'> 	uint32_t P[AES_EXTENDED_KEY_SIZE];</div><div class='hunk'>@@ -312,8 +317,7 @@ aes_set_key(void *ctx_arg, const uint8_t *in_key, unsigned int key_len, uint32_t</div><div class='ctx'> 	 * itself we must supply the plain key for both encryption</div><div class='ctx'> 	 * and decryption.</div><div class='ctx'> 	 */</div><div class='del'>-	ctx-&gt;E = ctx-&gt;e_data;</div><div class='del'>-	ctx-&gt;D = ctx-&gt;e_data;</div><div class='add'>+	ctx-&gt;D = ctx-&gt;E;</div><div class='ctx'> </div><div class='ctx'> 	E_KEY[0] = le32_to_cpu(key[0]);</div><div class='ctx'> 	E_KEY[1] = le32_to_cpu(key[1]);</div><div class='hunk'>@@ -414,24 +418,22 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,</div><div class='ctx'> 	return iv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-aes_encrypt(void *ctx_arg, uint8_t *out, const uint8_t *in)</div><div class='add'>+static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(ctx_arg);</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(tfm);</div><div class='ctx'> 	padlock_xcrypt_ecb(in, out, ctx-&gt;E, &amp;ctx-&gt;cword.encrypt, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-aes_decrypt(void *ctx_arg, uint8_t *out, const uint8_t *in)</div><div class='add'>+static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(ctx_arg);</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(tfm);</div><div class='ctx'> 	padlock_xcrypt_ecb(in, out, ctx-&gt;D, &amp;ctx-&gt;cword.decrypt, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int aes_encrypt_ecb(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> 				    const u8 *in, unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc-&gt;tfm));</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	padlock_xcrypt_ecb(in, out, ctx-&gt;E, &amp;ctx-&gt;cword.encrypt,</div><div class='ctx'> 			   nbytes / AES_BLOCK_SIZE);</div><div class='ctx'> 	return nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='hunk'>@@ -440,7 +442,7 @@ static unsigned int aes_encrypt_ecb(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> static unsigned int aes_decrypt_ecb(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> 				    const u8 *in, unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc-&gt;tfm));</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	padlock_xcrypt_ecb(in, out, ctx-&gt;D, &amp;ctx-&gt;cword.decrypt,</div><div class='ctx'> 			   nbytes / AES_BLOCK_SIZE);</div><div class='ctx'> 	return nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='hunk'>@@ -449,7 +451,7 @@ static unsigned int aes_decrypt_ecb(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> static unsigned int aes_encrypt_cbc(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> 				    const u8 *in, unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc-&gt;tfm));</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	u8 *iv;</div><div class='ctx'> </div><div class='ctx'> 	iv = padlock_xcrypt_cbc(in, out, ctx-&gt;E, desc-&gt;info,</div><div class='hunk'>@@ -462,7 +464,7 @@ static unsigned int aes_encrypt_cbc(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> static unsigned int aes_decrypt_cbc(const struct cipher_desc *desc, u8 *out,</div><div class='ctx'> 				    const u8 *in, unsigned int nbytes)</div><div class='ctx'> {</div><div class='del'>-	struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc-&gt;tfm));</div><div class='add'>+	struct aes_ctx *ctx = aes_ctx(desc-&gt;tfm);</div><div class='ctx'> 	padlock_xcrypt_cbc(in, out, ctx-&gt;D, desc-&gt;info, &amp;ctx-&gt;cword.decrypt,</div><div class='ctx'> 			   nbytes / AES_BLOCK_SIZE);</div><div class='ctx'> 	return nbytes &amp; ~(AES_BLOCK_SIZE - 1);</div><div class='head'>diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig<br/>new file mode 100644<br/>index 000000000000..30d021d1a07c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+#</div><div class='add'>+# DMA engine configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+menu "DMA Engine support"</div><div class='add'>+</div><div class='add'>+config DMA_ENGINE</div><div class='add'>+	bool "Support for DMA engines"</div><div class='add'>+	---help---</div><div class='add'>+	  DMA engines offload copy operations from the CPU to dedicated</div><div class='add'>+	  hardware, allowing the copies to happen asynchronously.</div><div class='add'>+</div><div class='add'>+comment "DMA Clients"</div><div class='add'>+</div><div class='add'>+config NET_DMA</div><div class='add'>+	bool "Network: TCP receive copy offload"</div><div class='add'>+	depends on DMA_ENGINE &amp;&amp; NET</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  This enables the use of DMA engines in the network stack to</div><div class='add'>+	  offload receive copy-to-user operations, freeing CPU cycles.</div><div class='add'>+	  Since this is the main user of the DMA engine, it should be enabled;</div><div class='add'>+	  say Y here.</div><div class='add'>+</div><div class='add'>+comment "DMA Devices"</div><div class='add'>+</div><div class='add'>+config INTEL_IOATDMA</div><div class='add'>+	tristate "Intel I/OAT DMA support"</div><div class='add'>+	depends on DMA_ENGINE &amp;&amp; PCI</div><div class='add'>+	default m</div><div class='add'>+	---help---</div><div class='add'>+	  Enable support for the Intel(R) I/OAT DMA engine.</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile<br/>new file mode 100644<br/>index 000000000000..bdcfdbdb1aec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_DMA_ENGINE) += dmaengine.o</div><div class='add'>+obj-$(CONFIG_NET_DMA) += iovlock.o</div><div class='add'>+obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o</div><div class='head'>diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c<br/>new file mode 100644<br/>index 000000000000..15278044295c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/dmaengine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/dmaengine.c</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This code implements the DMA subsystem. It provides a HW-neutral interface</div><div class='add'>+ * for other kernel code to use asynchronous memory copy capabilities,</div><div class='add'>+ * if present, and allows different HW DMA drivers to register as providing</div><div class='add'>+ * this capability.</div><div class='add'>+ *</div><div class='add'>+ * Due to the fact we are accelerating what is already a relatively fast</div><div class='add'>+ * operation, the code goes to great lengths to avoid additional overhead,</div><div class='add'>+ * such as locking.</div><div class='add'>+ *</div><div class='add'>+ * LOCKING:</div><div class='add'>+ *</div><div class='add'>+ * The subsystem keeps two global lists, dma_device_list and dma_client_list.</div><div class='add'>+ * Both of these are protected by a mutex, dma_list_mutex.</div><div class='add'>+ *</div><div class='add'>+ * Each device has a channels list, which runs unlocked but is never modified</div><div class='add'>+ * once the device is registered, it's just setup by the driver.</div><div class='add'>+ *</div><div class='add'>+ * Each client has a channels list, it's only modified under the client-&gt;lock</div><div class='add'>+ * and in an RCU callback, so it's safe to read under rcu_read_lock().</div><div class='add'>+ *</div><div class='add'>+ * Each device has a kref, which is initialized to 1 when the device is</div><div class='add'>+ * registered. A kref_put is done for each class_device registered.  When the</div><div class='add'>+ * class_device is released, the coresponding kref_put is done in the release</div><div class='add'>+ * method. Every time one of the device's channels is allocated to a client,</div><div class='add'>+ * a kref_get occurs.  When the channel is freed, the coresponding kref_put</div><div class='add'>+ * happens. The device's release function does a completion, so</div><div class='add'>+ * unregister_device does a remove event, class_device_unregister, a kref_put</div><div class='add'>+ * for the first reference, then waits on the completion for all other</div><div class='add'>+ * references to finish.</div><div class='add'>+ *</div><div class='add'>+ * Each channel has an open-coded implementation of Rusty Russell's "bigref,"</div><div class='add'>+ * with a kref and a per_cpu local_t.  A single reference is set when on an</div><div class='add'>+ * ADDED event, and removed with a REMOVE event.  Net DMA client takes an</div><div class='add'>+ * extra reference per outstanding transaction.  The relase function does a</div><div class='add'>+ * kref_put on the device. -ChrisL</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/percpu.h&gt;</div><div class='add'>+#include &lt;linux/rcupdate.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(dma_list_mutex);</div><div class='add'>+static LIST_HEAD(dma_device_list);</div><div class='add'>+static LIST_HEAD(dma_client_list);</div><div class='add'>+</div><div class='add'>+/* --- sysfs implementation --- */</div><div class='add'>+</div><div class='add'>+static ssize_t show_memcpy_count(struct class_device *cd, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = container_of(cd, struct dma_chan, class_dev);</div><div class='add'>+	unsigned long count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		count += per_cpu_ptr(chan-&gt;local, i)-&gt;memcpy_count;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%lu\n", count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bytes_transferred(struct class_device *cd, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = container_of(cd, struct dma_chan, class_dev);</div><div class='add'>+	unsigned long count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		count += per_cpu_ptr(chan-&gt;local, i)-&gt;bytes_transferred;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%lu\n", count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_in_use(struct class_device *cd, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = container_of(cd, struct dma_chan, class_dev);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", (chan-&gt;client ? 1 : 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct class_device_attribute dma_class_attrs[] = {</div><div class='add'>+	__ATTR(memcpy_count, S_IRUGO, show_memcpy_count, NULL),</div><div class='add'>+	__ATTR(bytes_transferred, S_IRUGO, show_bytes_transferred, NULL),</div><div class='add'>+	__ATTR(in_use, S_IRUGO, show_in_use, NULL),</div><div class='add'>+	__ATTR_NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dma_async_device_cleanup(struct kref *kref);</div><div class='add'>+</div><div class='add'>+static void dma_class_dev_release(struct class_device *cd)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = container_of(cd, struct dma_chan, class_dev);</div><div class='add'>+	kref_put(&amp;chan-&gt;device-&gt;refcount, dma_async_device_cleanup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct class dma_devclass = {</div><div class='add'>+	.name            = "dma",</div><div class='add'>+	.class_dev_attrs = dma_class_attrs,</div><div class='add'>+	.release = dma_class_dev_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* --- client and device registration --- */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_client_chan_alloc - try to allocate a channel to a client</div><div class='add'>+ * @client: &amp;dma_client</div><div class='add'>+ *</div><div class='add'>+ * Called with dma_list_mutex held.</div><div class='add'>+ */</div><div class='add'>+static struct dma_chan *dma_client_chan_alloc(struct dma_client *client)</div><div class='add'>+{</div><div class='add'>+	struct dma_device *device;</div><div class='add'>+	struct dma_chan *chan;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int desc;	/* allocated descriptor count */</div><div class='add'>+</div><div class='add'>+	/* Find a channel, any DMA engine will do */</div><div class='add'>+	list_for_each_entry(device, &amp;dma_device_list, global_node) {</div><div class='add'>+		list_for_each_entry(chan, &amp;device-&gt;channels, device_node) {</div><div class='add'>+			if (chan-&gt;client)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			desc = chan-&gt;device-&gt;device_alloc_chan_resources(chan);</div><div class='add'>+			if (desc &gt;= 0) {</div><div class='add'>+				kref_get(&amp;device-&gt;refcount);</div><div class='add'>+				kref_init(&amp;chan-&gt;refcount);</div><div class='add'>+				chan-&gt;slow_ref = 0;</div><div class='add'>+				INIT_RCU_HEAD(&amp;chan-&gt;rcu);</div><div class='add'>+				chan-&gt;client = client;</div><div class='add'>+				spin_lock_irqsave(&amp;client-&gt;lock, flags);</div><div class='add'>+				list_add_tail_rcu(&amp;chan-&gt;client_node,</div><div class='add'>+				                  &amp;client-&gt;channels);</div><div class='add'>+				spin_unlock_irqrestore(&amp;client-&gt;lock, flags);</div><div class='add'>+				return chan;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_chan_cleanup - release a DMA channel's resources</div><div class='add'>+ * @kref: kernel reference structure that contains the DMA channel device</div><div class='add'>+ */</div><div class='add'>+void dma_chan_cleanup(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = container_of(kref, struct dma_chan, refcount);</div><div class='add'>+	chan-&gt;device-&gt;device_free_chan_resources(chan);</div><div class='add'>+	chan-&gt;client = NULL;</div><div class='add'>+	kref_put(&amp;chan-&gt;device-&gt;refcount, dma_async_device_cleanup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dma_chan_free_rcu(struct rcu_head *rcu)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan = container_of(rcu, struct dma_chan, rcu);</div><div class='add'>+	int bias = 0x7FFFFFFF;</div><div class='add'>+	int i;</div><div class='add'>+	for_each_possible_cpu(i)</div><div class='add'>+		bias -= local_read(&amp;per_cpu_ptr(chan-&gt;local, i)-&gt;refcount);</div><div class='add'>+	atomic_sub(bias, &amp;chan-&gt;refcount.refcount);</div><div class='add'>+	kref_put(&amp;chan-&gt;refcount, dma_chan_cleanup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dma_client_chan_free(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	atomic_add(0x7FFFFFFF, &amp;chan-&gt;refcount.refcount);</div><div class='add'>+	chan-&gt;slow_ref = 1;</div><div class='add'>+	call_rcu(&amp;chan-&gt;rcu, dma_chan_free_rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_chans_rebalance - reallocate channels to clients</div><div class='add'>+ *</div><div class='add'>+ * When the number of DMA channel in the system changes,</div><div class='add'>+ * channels need to be rebalanced among clients.</div><div class='add'>+ */</div><div class='add'>+static void dma_chans_rebalance(void)</div><div class='add'>+{</div><div class='add'>+	struct dma_client *client;</div><div class='add'>+	struct dma_chan *chan;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dma_list_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(client, &amp;dma_client_list, global_node) {</div><div class='add'>+		while (client-&gt;chans_desired &gt; client-&gt;chan_count) {</div><div class='add'>+			chan = dma_client_chan_alloc(client);</div><div class='add'>+			if (!chan)</div><div class='add'>+				break;</div><div class='add'>+			client-&gt;chan_count++;</div><div class='add'>+			client-&gt;event_callback(client,</div><div class='add'>+	                                       chan,</div><div class='add'>+	                                       DMA_RESOURCE_ADDED);</div><div class='add'>+		}</div><div class='add'>+		while (client-&gt;chans_desired &lt; client-&gt;chan_count) {</div><div class='add'>+			spin_lock_irqsave(&amp;client-&gt;lock, flags);</div><div class='add'>+			chan = list_entry(client-&gt;channels.next,</div><div class='add'>+			                  struct dma_chan,</div><div class='add'>+			                  client_node);</div><div class='add'>+			list_del_rcu(&amp;chan-&gt;client_node);</div><div class='add'>+			spin_unlock_irqrestore(&amp;client-&gt;lock, flags);</div><div class='add'>+			client-&gt;chan_count--;</div><div class='add'>+			client-&gt;event_callback(client,</div><div class='add'>+			                       chan,</div><div class='add'>+			                       DMA_RESOURCE_REMOVED);</div><div class='add'>+			dma_client_chan_free(chan);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dma_list_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_async_client_register - allocate and register a &amp;dma_client</div><div class='add'>+ * @event_callback: callback for notification of channel addition/removal</div><div class='add'>+ */</div><div class='add'>+struct dma_client *dma_async_client_register(dma_event_callback event_callback)</div><div class='add'>+{</div><div class='add'>+	struct dma_client *client;</div><div class='add'>+</div><div class='add'>+	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='add'>+	if (!client)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;client-&gt;channels);</div><div class='add'>+	spin_lock_init(&amp;client-&gt;lock);</div><div class='add'>+	client-&gt;chans_desired = 0;</div><div class='add'>+	client-&gt;chan_count = 0;</div><div class='add'>+	client-&gt;event_callback = event_callback;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dma_list_mutex);</div><div class='add'>+	list_add_tail(&amp;client-&gt;global_node, &amp;dma_client_list);</div><div class='add'>+	mutex_unlock(&amp;dma_list_mutex);</div><div class='add'>+</div><div class='add'>+	return client;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_async_client_unregister - unregister a client and free the &amp;dma_client</div><div class='add'>+ * @client: &amp;dma_client to free</div><div class='add'>+ *</div><div class='add'>+ * Force frees any allocated DMA channels, frees the &amp;dma_client memory</div><div class='add'>+ */</div><div class='add'>+void dma_async_client_unregister(struct dma_client *client)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan;</div><div class='add'>+</div><div class='add'>+	if (!client)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_for_each_entry_rcu(chan, &amp;client-&gt;channels, client_node)</div><div class='add'>+		dma_client_chan_free(chan);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dma_list_mutex);</div><div class='add'>+	list_del(&amp;client-&gt;global_node);</div><div class='add'>+	mutex_unlock(&amp;dma_list_mutex);</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+	dma_chans_rebalance();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_async_client_chan_request - request DMA channels</div><div class='add'>+ * @client: &amp;dma_client</div><div class='add'>+ * @number: count of DMA channels requested</div><div class='add'>+ *</div><div class='add'>+ * Clients call dma_async_client_chan_request() to specify how many</div><div class='add'>+ * DMA channels they need, 0 to free all currently allocated.</div><div class='add'>+ * The resulting allocations/frees are indicated to the client via the</div><div class='add'>+ * event callback.</div><div class='add'>+ */</div><div class='add'>+void dma_async_client_chan_request(struct dma_client *client,</div><div class='add'>+			unsigned int number)</div><div class='add'>+{</div><div class='add'>+	client-&gt;chans_desired = number;</div><div class='add'>+	dma_chans_rebalance();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_async_device_register - registers DMA devices found</div><div class='add'>+ * @device: &amp;dma_device</div><div class='add'>+ */</div><div class='add'>+int dma_async_device_register(struct dma_device *device)</div><div class='add'>+{</div><div class='add'>+	static int id;</div><div class='add'>+	int chancnt = 0;</div><div class='add'>+	struct dma_chan* chan;</div><div class='add'>+</div><div class='add'>+	if (!device)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;device-&gt;done);</div><div class='add'>+	kref_init(&amp;device-&gt;refcount);</div><div class='add'>+	device-&gt;dev_id = id++;</div><div class='add'>+</div><div class='add'>+	/* represent channels in sysfs. Probably want devs too */</div><div class='add'>+	list_for_each_entry(chan, &amp;device-&gt;channels, device_node) {</div><div class='add'>+		chan-&gt;local = alloc_percpu(typeof(*chan-&gt;local));</div><div class='add'>+		if (chan-&gt;local == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		chan-&gt;chan_id = chancnt++;</div><div class='add'>+		chan-&gt;class_dev.class = &amp;dma_devclass;</div><div class='add'>+		chan-&gt;class_dev.dev = NULL;</div><div class='add'>+		snprintf(chan-&gt;class_dev.class_id, BUS_ID_SIZE, "dma%dchan%d",</div><div class='add'>+		         device-&gt;dev_id, chan-&gt;chan_id);</div><div class='add'>+</div><div class='add'>+		kref_get(&amp;device-&gt;refcount);</div><div class='add'>+		class_device_register(&amp;chan-&gt;class_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dma_list_mutex);</div><div class='add'>+	list_add_tail(&amp;device-&gt;global_node, &amp;dma_device_list);</div><div class='add'>+	mutex_unlock(&amp;dma_list_mutex);</div><div class='add'>+</div><div class='add'>+	dma_chans_rebalance();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_async_device_cleanup - function called when all references are released</div><div class='add'>+ * @kref: kernel reference object</div><div class='add'>+ */</div><div class='add'>+static void dma_async_device_cleanup(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct dma_device *device;</div><div class='add'>+</div><div class='add'>+	device = container_of(kref, struct dma_device, refcount);</div><div class='add'>+	complete(&amp;device-&gt;done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dma_async_device_unregister - unregisters DMA devices</div><div class='add'>+ * @device: &amp;dma_device</div><div class='add'>+ */</div><div class='add'>+void dma_async_device_unregister(struct dma_device *device)</div><div class='add'>+{</div><div class='add'>+	struct dma_chan *chan;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dma_list_mutex);</div><div class='add'>+	list_del(&amp;device-&gt;global_node);</div><div class='add'>+	mutex_unlock(&amp;dma_list_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(chan, &amp;device-&gt;channels, device_node) {</div><div class='add'>+		if (chan-&gt;client) {</div><div class='add'>+			spin_lock_irqsave(&amp;chan-&gt;client-&gt;lock, flags);</div><div class='add'>+			list_del(&amp;chan-&gt;client_node);</div><div class='add'>+			chan-&gt;client-&gt;chan_count--;</div><div class='add'>+			spin_unlock_irqrestore(&amp;chan-&gt;client-&gt;lock, flags);</div><div class='add'>+			chan-&gt;client-&gt;event_callback(chan-&gt;client,</div><div class='add'>+			                             chan,</div><div class='add'>+			                             DMA_RESOURCE_REMOVED);</div><div class='add'>+			dma_client_chan_free(chan);</div><div class='add'>+		}</div><div class='add'>+		class_device_unregister(&amp;chan-&gt;class_dev);</div><div class='add'>+	}</div><div class='add'>+	dma_chans_rebalance();</div><div class='add'>+</div><div class='add'>+	kref_put(&amp;device-&gt;refcount, dma_async_device_cleanup);</div><div class='add'>+	wait_for_completion(&amp;device-&gt;done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init dma_bus_init(void)</div><div class='add'>+{</div><div class='add'>+	mutex_init(&amp;dma_list_mutex);</div><div class='add'>+	return class_register(&amp;dma_devclass);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(dma_bus_init);</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(dma_async_client_register);</div><div class='add'>+EXPORT_SYMBOL(dma_async_client_unregister);</div><div class='add'>+EXPORT_SYMBOL(dma_async_client_chan_request);</div><div class='add'>+EXPORT_SYMBOL(dma_async_memcpy_buf_to_buf);</div><div class='add'>+EXPORT_SYMBOL(dma_async_memcpy_buf_to_pg);</div><div class='add'>+EXPORT_SYMBOL(dma_async_memcpy_pg_to_pg);</div><div class='add'>+EXPORT_SYMBOL(dma_async_memcpy_complete);</div><div class='add'>+EXPORT_SYMBOL(dma_async_memcpy_issue_pending);</div><div class='add'>+EXPORT_SYMBOL(dma_async_device_register);</div><div class='add'>+EXPORT_SYMBOL(dma_async_device_unregister);</div><div class='add'>+EXPORT_SYMBOL(dma_chan_cleanup);</div><div class='head'>diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c<br/>new file mode 100644<br/>index 000000000000..78bf46d917b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ioatdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/ioatdma.c</a></div><div class='hunk'>@@ -0,0 +1,841 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This driver supports an Intel I/OAT DMA engine, which does asynchronous</div><div class='add'>+ * copy operations.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include "ioatdma.h"</div><div class='add'>+#include "ioatdma_io.h"</div><div class='add'>+#include "ioatdma_registers.h"</div><div class='add'>+#include "ioatdma_hw.h"</div><div class='add'>+</div><div class='add'>+#define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common)</div><div class='add'>+#define to_ioat_device(dev) container_of(dev, struct ioat_device, common)</div><div class='add'>+#define to_ioat_desc(lh) container_of(lh, struct ioat_desc_sw, node)</div><div class='add'>+</div><div class='add'>+/* internal functions */</div><div class='add'>+static int __devinit ioat_probe(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='add'>+static void __devexit ioat_remove(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+static int enumerate_dma_channels(struct ioat_device *device)</div><div class='add'>+{</div><div class='add'>+	u8 xfercap_scale;</div><div class='add'>+	u32 xfercap;</div><div class='add'>+	int i;</div><div class='add'>+	struct ioat_dma_chan *ioat_chan;</div><div class='add'>+</div><div class='add'>+	device-&gt;common.chancnt = ioatdma_read8(device, IOAT_CHANCNT_OFFSET);</div><div class='add'>+	xfercap_scale = ioatdma_read8(device, IOAT_XFERCAP_OFFSET);</div><div class='add'>+	xfercap = (xfercap_scale == 0 ? -1 : (1UL &lt;&lt; xfercap_scale));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; device-&gt;common.chancnt; i++) {</div><div class='add'>+		ioat_chan = kzalloc(sizeof(*ioat_chan), GFP_KERNEL);</div><div class='add'>+		if (!ioat_chan) {</div><div class='add'>+			device-&gt;common.chancnt = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ioat_chan-&gt;device = device;</div><div class='add'>+		ioat_chan-&gt;reg_base = device-&gt;reg_base + (0x80 * (i + 1));</div><div class='add'>+		ioat_chan-&gt;xfercap = xfercap;</div><div class='add'>+		spin_lock_init(&amp;ioat_chan-&gt;cleanup_lock);</div><div class='add'>+		spin_lock_init(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+		INIT_LIST_HEAD(&amp;ioat_chan-&gt;free_desc);</div><div class='add'>+		INIT_LIST_HEAD(&amp;ioat_chan-&gt;used_desc);</div><div class='add'>+		/* This should be made common somewhere in dmaengine.c */</div><div class='add'>+		ioat_chan-&gt;common.device = &amp;device-&gt;common;</div><div class='add'>+		ioat_chan-&gt;common.client = NULL;</div><div class='add'>+		list_add_tail(&amp;ioat_chan-&gt;common.device_node,</div><div class='add'>+		              &amp;device-&gt;common.channels);</div><div class='add'>+	}</div><div class='add'>+	return device-&gt;common.chancnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ioat_desc_sw *ioat_dma_alloc_descriptor(</div><div class='add'>+	struct ioat_dma_chan *ioat_chan,</div><div class='add'>+	int flags)</div><div class='add'>+{</div><div class='add'>+	struct ioat_dma_descriptor *desc;</div><div class='add'>+	struct ioat_desc_sw *desc_sw;</div><div class='add'>+	struct ioat_device *ioat_device;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+</div><div class='add'>+	ioat_device = to_ioat_device(ioat_chan-&gt;common.device);</div><div class='add'>+	desc = pci_pool_alloc(ioat_device-&gt;dma_pool, flags, &amp;phys);</div><div class='add'>+	if (unlikely(!desc))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	desc_sw = kzalloc(sizeof(*desc_sw), flags);</div><div class='add'>+	if (unlikely(!desc_sw)) {</div><div class='add'>+		pci_pool_free(ioat_device-&gt;dma_pool, desc, phys);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(desc, 0, sizeof(*desc));</div><div class='add'>+	desc_sw-&gt;hw = desc;</div><div class='add'>+	desc_sw-&gt;phys = phys;</div><div class='add'>+</div><div class='add'>+	return desc_sw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define INITIAL_IOAT_DESC_COUNT 128</div><div class='add'>+</div><div class='add'>+static void ioat_start_null_desc(struct ioat_dma_chan *ioat_chan);</div><div class='add'>+</div><div class='add'>+/* returns the actual number of allocated descriptors */</div><div class='add'>+static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+	struct ioat_desc_sw *desc = NULL;</div><div class='add'>+	u16 chanctrl;</div><div class='add'>+	u32 chanerr;</div><div class='add'>+	int i;</div><div class='add'>+	LIST_HEAD(tmp_list);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In-use bit automatically set by reading chanctrl</div><div class='add'>+	 * If 0, we got it, if 1, someone else did</div><div class='add'>+	 */</div><div class='add'>+	chanctrl = ioatdma_chan_read16(ioat_chan, IOAT_CHANCTRL_OFFSET);</div><div class='add'>+	if (chanctrl &amp; IOAT_CHANCTRL_CHANNEL_IN_USE)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+        /* Setup register to interrupt and write completion status on error */</div><div class='add'>+	chanctrl = IOAT_CHANCTRL_CHANNEL_IN_USE |</div><div class='add'>+		IOAT_CHANCTRL_ERR_INT_EN |</div><div class='add'>+		IOAT_CHANCTRL_ANY_ERR_ABORT_EN |</div><div class='add'>+		IOAT_CHANCTRL_ERR_COMPLETION_EN;</div><div class='add'>+        ioatdma_chan_write16(ioat_chan, IOAT_CHANCTRL_OFFSET, chanctrl);</div><div class='add'>+</div><div class='add'>+	chanerr = ioatdma_chan_read32(ioat_chan, IOAT_CHANERR_OFFSET);</div><div class='add'>+	if (chanerr) {</div><div class='add'>+		printk("IOAT: CHANERR = %x, clearing\n", chanerr);</div><div class='add'>+		ioatdma_chan_write32(ioat_chan, IOAT_CHANERR_OFFSET, chanerr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate descriptors */</div><div class='add'>+	for (i = 0; i &lt; INITIAL_IOAT_DESC_COUNT; i++) {</div><div class='add'>+		desc = ioat_dma_alloc_descriptor(ioat_chan, GFP_KERNEL);</div><div class='add'>+		if (!desc) {</div><div class='add'>+			printk(KERN_ERR "IOAT: Only %d initial descriptors\n", i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;desc-&gt;node, &amp;tmp_list);</div><div class='add'>+	}</div><div class='add'>+	spin_lock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+	list_splice(&amp;tmp_list, &amp;ioat_chan-&gt;free_desc);</div><div class='add'>+	spin_unlock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+	/* allocate a completion writeback area */</div><div class='add'>+	/* doing 2 32bit writes to mmio since 1 64b write doesn't work */</div><div class='add'>+	ioat_chan-&gt;completion_virt =</div><div class='add'>+		pci_pool_alloc(ioat_chan-&gt;device-&gt;completion_pool,</div><div class='add'>+		               GFP_KERNEL,</div><div class='add'>+		               &amp;ioat_chan-&gt;completion_addr);</div><div class='add'>+	memset(ioat_chan-&gt;completion_virt, 0,</div><div class='add'>+	       sizeof(*ioat_chan-&gt;completion_virt));</div><div class='add'>+	ioatdma_chan_write32(ioat_chan, IOAT_CHANCMP_OFFSET_LOW,</div><div class='add'>+	               ((u64) ioat_chan-&gt;completion_addr) &amp; 0x00000000FFFFFFFF);</div><div class='add'>+	ioatdma_chan_write32(ioat_chan, IOAT_CHANCMP_OFFSET_HIGH,</div><div class='add'>+	               ((u64) ioat_chan-&gt;completion_addr) &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	ioat_start_null_desc(ioat_chan);</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan);</div><div class='add'>+</div><div class='add'>+static void ioat_dma_free_chan_resources(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+	struct ioat_device *ioat_device = to_ioat_device(chan-&gt;device);</div><div class='add'>+	struct ioat_desc_sw *desc, *_desc;</div><div class='add'>+	u16 chanctrl;</div><div class='add'>+	int in_use_descs = 0;</div><div class='add'>+</div><div class='add'>+	ioat_dma_memcpy_cleanup(ioat_chan);</div><div class='add'>+</div><div class='add'>+	ioatdma_chan_write8(ioat_chan, IOAT_CHANCMD_OFFSET, IOAT_CHANCMD_RESET);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+	list_for_each_entry_safe(desc, _desc, &amp;ioat_chan-&gt;used_desc, node) {</div><div class='add'>+		in_use_descs++;</div><div class='add'>+		list_del(&amp;desc-&gt;node);</div><div class='add'>+		pci_pool_free(ioat_device-&gt;dma_pool, desc-&gt;hw, desc-&gt;phys);</div><div class='add'>+		kfree(desc);</div><div class='add'>+	}</div><div class='add'>+	list_for_each_entry_safe(desc, _desc, &amp;ioat_chan-&gt;free_desc, node) {</div><div class='add'>+		list_del(&amp;desc-&gt;node);</div><div class='add'>+		pci_pool_free(ioat_device-&gt;dma_pool, desc-&gt;hw, desc-&gt;phys);</div><div class='add'>+		kfree(desc);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+	pci_pool_free(ioat_device-&gt;completion_pool,</div><div class='add'>+	              ioat_chan-&gt;completion_virt,</div><div class='add'>+	              ioat_chan-&gt;completion_addr);</div><div class='add'>+</div><div class='add'>+	/* one is ok since we left it on there on purpose */</div><div class='add'>+	if (in_use_descs &gt; 1)</div><div class='add'>+		printk(KERN_ERR "IOAT: Freeing %d in use descriptors!\n",</div><div class='add'>+			in_use_descs - 1);</div><div class='add'>+</div><div class='add'>+	ioat_chan-&gt;last_completion = ioat_chan-&gt;completion_addr = 0;</div><div class='add'>+</div><div class='add'>+	/* Tell hw the chan is free */</div><div class='add'>+	chanctrl = ioatdma_chan_read16(ioat_chan, IOAT_CHANCTRL_OFFSET);</div><div class='add'>+	chanctrl &amp;= ~IOAT_CHANCTRL_CHANNEL_IN_USE;</div><div class='add'>+	ioatdma_chan_write16(ioat_chan, IOAT_CHANCTRL_OFFSET, chanctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * do_ioat_dma_memcpy - actual function that initiates a IOAT DMA transaction</div><div class='add'>+ * @ioat_chan: IOAT DMA channel handle</div><div class='add'>+ * @dest: DMA destination address</div><div class='add'>+ * @src: DMA source address</div><div class='add'>+ * @len: transaction length in bytes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static dma_cookie_t do_ioat_dma_memcpy(struct ioat_dma_chan *ioat_chan,</div><div class='add'>+                                       dma_addr_t dest,</div><div class='add'>+                                       dma_addr_t src,</div><div class='add'>+                                       size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ioat_desc_sw *first;</div><div class='add'>+	struct ioat_desc_sw *prev;</div><div class='add'>+	struct ioat_desc_sw *new;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+	LIST_HEAD(new_chain);</div><div class='add'>+	u32 copy;</div><div class='add'>+	size_t orig_len;</div><div class='add'>+	dma_addr_t orig_src, orig_dst;</div><div class='add'>+	unsigned int desc_count = 0;</div><div class='add'>+	unsigned int append = 0;</div><div class='add'>+</div><div class='add'>+	if (!ioat_chan || !dest || !src)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return ioat_chan-&gt;common.cookie;</div><div class='add'>+</div><div class='add'>+	orig_len = len;</div><div class='add'>+	orig_src = src;</div><div class='add'>+	orig_dst = dest;</div><div class='add'>+</div><div class='add'>+	first = NULL;</div><div class='add'>+	prev = NULL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+	while (len) {</div><div class='add'>+		if (!list_empty(&amp;ioat_chan-&gt;free_desc)) {</div><div class='add'>+			new = to_ioat_desc(ioat_chan-&gt;free_desc.next);</div><div class='add'>+			list_del(&amp;new-&gt;node);</div><div class='add'>+		} else {</div><div class='add'>+			/* try to get another desc */</div><div class='add'>+			new = ioat_dma_alloc_descriptor(ioat_chan, GFP_ATOMIC);</div><div class='add'>+			/* will this ever happen? */</div><div class='add'>+			/* TODO add upper limit on these */</div><div class='add'>+			BUG_ON(!new);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		copy = min((u32) len, ioat_chan-&gt;xfercap);</div><div class='add'>+</div><div class='add'>+		new-&gt;hw-&gt;size = copy;</div><div class='add'>+		new-&gt;hw-&gt;ctl = 0;</div><div class='add'>+		new-&gt;hw-&gt;src_addr = src;</div><div class='add'>+		new-&gt;hw-&gt;dst_addr = dest;</div><div class='add'>+		new-&gt;cookie = 0;</div><div class='add'>+</div><div class='add'>+		/* chain together the physical address list for the HW */</div><div class='add'>+		if (!first)</div><div class='add'>+			first = new;</div><div class='add'>+		else</div><div class='add'>+			prev-&gt;hw-&gt;next = (u64) new-&gt;phys;</div><div class='add'>+</div><div class='add'>+		prev = new;</div><div class='add'>+</div><div class='add'>+		len  -= copy;</div><div class='add'>+		dest += copy;</div><div class='add'>+		src  += copy;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;new-&gt;node, &amp;new_chain);</div><div class='add'>+		desc_count++;</div><div class='add'>+	}</div><div class='add'>+	new-&gt;hw-&gt;ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS;</div><div class='add'>+	new-&gt;hw-&gt;next = 0;</div><div class='add'>+</div><div class='add'>+	/* cookie incr and addition to used_list must be atomic */</div><div class='add'>+</div><div class='add'>+	cookie = ioat_chan-&gt;common.cookie;</div><div class='add'>+	cookie++;</div><div class='add'>+	if (cookie &lt; 0)</div><div class='add'>+		cookie = 1;</div><div class='add'>+	ioat_chan-&gt;common.cookie = new-&gt;cookie = cookie;</div><div class='add'>+</div><div class='add'>+	pci_unmap_addr_set(new, src, orig_src);</div><div class='add'>+	pci_unmap_addr_set(new, dst, orig_dst);</div><div class='add'>+	pci_unmap_len_set(new, src_len, orig_len);</div><div class='add'>+	pci_unmap_len_set(new, dst_len, orig_len);</div><div class='add'>+</div><div class='add'>+	/* write address into NextDescriptor field of last desc in chain */</div><div class='add'>+	to_ioat_desc(ioat_chan-&gt;used_desc.prev)-&gt;hw-&gt;next = first-&gt;phys;</div><div class='add'>+	list_splice_init(&amp;new_chain, ioat_chan-&gt;used_desc.prev);</div><div class='add'>+</div><div class='add'>+	ioat_chan-&gt;pending += desc_count;</div><div class='add'>+	if (ioat_chan-&gt;pending &gt;= 20) {</div><div class='add'>+		append = 1;</div><div class='add'>+		ioat_chan-&gt;pending = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+	if (append)</div><div class='add'>+		ioatdma_chan_write8(ioat_chan,</div><div class='add'>+		                    IOAT_CHANCMD_OFFSET,</div><div class='add'>+		                    IOAT_CHANCMD_APPEND);</div><div class='add'>+	return cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioat_dma_memcpy_buf_to_buf - wrapper that takes src &amp; dest bufs</div><div class='add'>+ * @chan: IOAT DMA channel handle</div><div class='add'>+ * @dest: DMA destination address</div><div class='add'>+ * @src: DMA source address</div><div class='add'>+ * @len: transaction length in bytes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static dma_cookie_t ioat_dma_memcpy_buf_to_buf(struct dma_chan *chan,</div><div class='add'>+                                               void *dest,</div><div class='add'>+                                               void *src,</div><div class='add'>+                                               size_t len)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dest_addr;</div><div class='add'>+	dma_addr_t src_addr;</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+</div><div class='add'>+	dest_addr = pci_map_single(ioat_chan-&gt;device-&gt;pdev,</div><div class='add'>+		dest, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+	src_addr = pci_map_single(ioat_chan-&gt;device-&gt;pdev,</div><div class='add'>+		src, len, PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	return do_ioat_dma_memcpy(ioat_chan, dest_addr, src_addr, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioat_dma_memcpy_buf_to_pg - wrapper, copying from a buf to a page</div><div class='add'>+ * @chan: IOAT DMA channel handle</div><div class='add'>+ * @page: pointer to the page to copy to</div><div class='add'>+ * @offset: offset into that page</div><div class='add'>+ * @src: DMA source address</div><div class='add'>+ * @len: transaction length in bytes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static dma_cookie_t ioat_dma_memcpy_buf_to_pg(struct dma_chan *chan,</div><div class='add'>+                                              struct page *page,</div><div class='add'>+                                              unsigned int offset,</div><div class='add'>+                                              void *src,</div><div class='add'>+                                              size_t len)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dest_addr;</div><div class='add'>+	dma_addr_t src_addr;</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+</div><div class='add'>+	dest_addr = pci_map_page(ioat_chan-&gt;device-&gt;pdev,</div><div class='add'>+		page, offset, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+	src_addr = pci_map_single(ioat_chan-&gt;device-&gt;pdev,</div><div class='add'>+		src, len, PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	return do_ioat_dma_memcpy(ioat_chan, dest_addr, src_addr, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioat_dma_memcpy_pg_to_pg - wrapper, copying between two pages</div><div class='add'>+ * @chan: IOAT DMA channel handle</div><div class='add'>+ * @dest_pg: pointer to the page to copy to</div><div class='add'>+ * @dest_off: offset into that page</div><div class='add'>+ * @src_pg: pointer to the page to copy from</div><div class='add'>+ * @src_off: offset into that page</div><div class='add'>+ * @len: transaction length in bytes. This is guaranteed not to make a copy</div><div class='add'>+ *	 across a page boundary.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static dma_cookie_t ioat_dma_memcpy_pg_to_pg(struct dma_chan *chan,</div><div class='add'>+                                             struct page *dest_pg,</div><div class='add'>+                                             unsigned int dest_off,</div><div class='add'>+                                             struct page *src_pg,</div><div class='add'>+                                             unsigned int src_off,</div><div class='add'>+                                             size_t len)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dest_addr;</div><div class='add'>+	dma_addr_t src_addr;</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+</div><div class='add'>+	dest_addr = pci_map_page(ioat_chan-&gt;device-&gt;pdev,</div><div class='add'>+		dest_pg, dest_off, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+	src_addr = pci_map_page(ioat_chan-&gt;device-&gt;pdev,</div><div class='add'>+		src_pg, src_off, len, PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	return do_ioat_dma_memcpy(ioat_chan, dest_addr, src_addr, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioat_dma_memcpy_issue_pending - push potentially unrecognized appended descriptors to hw</div><div class='add'>+ * @chan: DMA channel handle</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void ioat_dma_memcpy_issue_pending(struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+</div><div class='add'>+	if (ioat_chan-&gt;pending != 0) {</div><div class='add'>+		ioat_chan-&gt;pending = 0;</div><div class='add'>+		ioatdma_chan_write8(ioat_chan,</div><div class='add'>+		                    IOAT_CHANCMD_OFFSET,</div><div class='add'>+		                    IOAT_CHANCMD_APPEND);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	unsigned long phys_complete;</div><div class='add'>+	struct ioat_desc_sw *desc, *_desc;</div><div class='add'>+	dma_cookie_t cookie = 0;</div><div class='add'>+</div><div class='add'>+	prefetch(chan-&gt;completion_virt);</div><div class='add'>+</div><div class='add'>+	if (!spin_trylock(&amp;chan-&gt;cleanup_lock))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* The completion writeback can happen at any time,</div><div class='add'>+	   so reads by the driver need to be atomic operations</div><div class='add'>+	   The descriptor physical addresses are limited to 32-bits</div><div class='add'>+	   when the CPU can only do a 32-bit mov */</div><div class='add'>+</div><div class='add'>+#if (BITS_PER_LONG == 64)</div><div class='add'>+	phys_complete =</div><div class='add'>+	chan-&gt;completion_virt-&gt;full &amp; IOAT_CHANSTS_COMPLETED_DESCRIPTOR_ADDR;</div><div class='add'>+#else</div><div class='add'>+	phys_complete = chan-&gt;completion_virt-&gt;low &amp; IOAT_LOW_COMPLETION_MASK;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if ((chan-&gt;completion_virt-&gt;full &amp; IOAT_CHANSTS_DMA_TRANSFER_STATUS) ==</div><div class='add'>+		IOAT_CHANSTS_DMA_TRANSFER_STATUS_HALTED) {</div><div class='add'>+		printk("IOAT: Channel halted, chanerr = %x\n",</div><div class='add'>+			ioatdma_chan_read32(chan, IOAT_CHANERR_OFFSET));</div><div class='add'>+</div><div class='add'>+		/* TODO do something to salvage the situation */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phys_complete == chan-&gt;last_completion) {</div><div class='add'>+		spin_unlock(&amp;chan-&gt;cleanup_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;chan-&gt;desc_lock);</div><div class='add'>+	list_for_each_entry_safe(desc, _desc, &amp;chan-&gt;used_desc, node) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Incoming DMA requests may use multiple descriptors, due to</div><div class='add'>+		 * exceeding xfercap, perhaps. If so, only the last one will</div><div class='add'>+		 * have a cookie, and require unmapping.</div><div class='add'>+		 */</div><div class='add'>+		if (desc-&gt;cookie) {</div><div class='add'>+			cookie = desc-&gt;cookie;</div><div class='add'>+</div><div class='add'>+			/* yes we are unmapping both _page and _single alloc'd</div><div class='add'>+			   regions with unmap_page. Is this *really* that bad?</div><div class='add'>+			*/</div><div class='add'>+			pci_unmap_page(chan-&gt;device-&gt;pdev,</div><div class='add'>+					pci_unmap_addr(desc, dst),</div><div class='add'>+					pci_unmap_len(desc, dst_len),</div><div class='add'>+					PCI_DMA_FROMDEVICE);</div><div class='add'>+			pci_unmap_page(chan-&gt;device-&gt;pdev,</div><div class='add'>+					pci_unmap_addr(desc, src),</div><div class='add'>+					pci_unmap_len(desc, src_len),</div><div class='add'>+					PCI_DMA_TODEVICE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;phys != phys_complete) {</div><div class='add'>+			/* a completed entry, but not the last, so cleanup */</div><div class='add'>+			list_del(&amp;desc-&gt;node);</div><div class='add'>+			list_add_tail(&amp;desc-&gt;node, &amp;chan-&gt;free_desc);</div><div class='add'>+		} else {</div><div class='add'>+			/* last used desc. Do not remove, so we can append from</div><div class='add'>+			   it, but don't look at it next time, either */</div><div class='add'>+			desc-&gt;cookie = 0;</div><div class='add'>+</div><div class='add'>+			/* TODO check status bits? */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+	chan-&gt;last_completion = phys_complete;</div><div class='add'>+	if (cookie != 0)</div><div class='add'>+		chan-&gt;completed_cookie = cookie;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;chan-&gt;cleanup_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ioat_dma_is_complete - poll the status of a IOAT DMA transaction</div><div class='add'>+ * @chan: IOAT DMA channel handle</div><div class='add'>+ * @cookie: DMA transaction identifier</div><div class='add'>+ * @done: if not %NULL, updated with last completed transaction</div><div class='add'>+ * @used: if not %NULL, updated with last used transaction</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static enum dma_status ioat_dma_is_complete(struct dma_chan *chan,</div><div class='add'>+                                            dma_cookie_t cookie,</div><div class='add'>+                                            dma_cookie_t *done,</div><div class='add'>+                                            dma_cookie_t *used)</div><div class='add'>+{</div><div class='add'>+	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);</div><div class='add'>+	dma_cookie_t last_used;</div><div class='add'>+	dma_cookie_t last_complete;</div><div class='add'>+	enum dma_status ret;</div><div class='add'>+</div><div class='add'>+	last_used = chan-&gt;cookie;</div><div class='add'>+	last_complete = ioat_chan-&gt;completed_cookie;</div><div class='add'>+</div><div class='add'>+	if (done)</div><div class='add'>+		*done= last_complete;</div><div class='add'>+	if (used)</div><div class='add'>+		*used = last_used;</div><div class='add'>+</div><div class='add'>+	ret = dma_async_is_complete(cookie, last_complete, last_used);</div><div class='add'>+	if (ret == DMA_SUCCESS)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ioat_dma_memcpy_cleanup(ioat_chan);</div><div class='add'>+</div><div class='add'>+	last_used = chan-&gt;cookie;</div><div class='add'>+	last_complete = ioat_chan-&gt;completed_cookie;</div><div class='add'>+</div><div class='add'>+	if (done)</div><div class='add'>+		*done= last_complete;</div><div class='add'>+	if (used)</div><div class='add'>+		*used = last_used;</div><div class='add'>+</div><div class='add'>+	return dma_async_is_complete(cookie, last_complete, last_used);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PCI API */</div><div class='add'>+</div><div class='add'>+static struct pci_device_id ioat_pci_tbl[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT) },</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver ioat_pci_drv = {</div><div class='add'>+	.name 	= "ioatdma",</div><div class='add'>+	.id_table = ioat_pci_tbl,</div><div class='add'>+	.probe	= ioat_probe,</div><div class='add'>+	.remove	= __devexit_p(ioat_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t ioat_do_interrupt(int irq, void *data, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct ioat_device *instance = data;</div><div class='add'>+	unsigned long attnstatus;</div><div class='add'>+	u8 intrctrl;</div><div class='add'>+</div><div class='add'>+	intrctrl = ioatdma_read8(instance, IOAT_INTRCTRL_OFFSET);</div><div class='add'>+</div><div class='add'>+	if (!(intrctrl &amp; IOAT_INTRCTRL_MASTER_INT_EN))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (!(intrctrl &amp; IOAT_INTRCTRL_INT_STATUS)) {</div><div class='add'>+		ioatdma_write8(instance, IOAT_INTRCTRL_OFFSET, intrctrl);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attnstatus = ioatdma_read32(instance, IOAT_ATTNSTATUS_OFFSET);</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "ioatdma error: interrupt! status %lx\n", attnstatus);</div><div class='add'>+</div><div class='add'>+	ioatdma_write8(instance, IOAT_INTRCTRL_OFFSET, intrctrl);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ioat_start_null_desc(struct ioat_dma_chan *ioat_chan)</div><div class='add'>+{</div><div class='add'>+	struct ioat_desc_sw *desc;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;ioat_chan-&gt;free_desc)) {</div><div class='add'>+		desc = to_ioat_desc(ioat_chan-&gt;free_desc.next);</div><div class='add'>+		list_del(&amp;desc-&gt;node);</div><div class='add'>+	} else {</div><div class='add'>+		/* try to get another desc */</div><div class='add'>+		spin_unlock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+		desc = ioat_dma_alloc_descriptor(ioat_chan, GFP_KERNEL);</div><div class='add'>+		spin_lock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+		/* will this ever happen? */</div><div class='add'>+		BUG_ON(!desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;hw-&gt;ctl = IOAT_DMA_DESCRIPTOR_NUL;</div><div class='add'>+	desc-&gt;hw-&gt;next = 0;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;desc-&gt;node, &amp;ioat_chan-&gt;used_desc);</div><div class='add'>+	spin_unlock_bh(&amp;ioat_chan-&gt;desc_lock);</div><div class='add'>+</div><div class='add'>+#if (BITS_PER_LONG == 64)</div><div class='add'>+	ioatdma_chan_write64(ioat_chan, IOAT_CHAINADDR_OFFSET, desc-&gt;phys);</div><div class='add'>+#else</div><div class='add'>+	ioatdma_chan_write32(ioat_chan,</div><div class='add'>+	                     IOAT_CHAINADDR_OFFSET_LOW,</div><div class='add'>+	                     (u32) desc-&gt;phys);</div><div class='add'>+	ioatdma_chan_write32(ioat_chan, IOAT_CHAINADDR_OFFSET_HIGH, 0);</div><div class='add'>+#endif</div><div class='add'>+	ioatdma_chan_write8(ioat_chan, IOAT_CHANCMD_OFFSET, IOAT_CHANCMD_START);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform a IOAT transaction to verify the HW works.</div><div class='add'>+ */</div><div class='add'>+#define IOAT_TEST_SIZE 2000</div><div class='add'>+</div><div class='add'>+static int ioat_self_test(struct ioat_device *device)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 *src;</div><div class='add'>+	u8 *dest;</div><div class='add'>+	struct dma_chan *dma_chan;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, SLAB_KERNEL);</div><div class='add'>+	if (!src)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dest = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, SLAB_KERNEL);</div><div class='add'>+	if (!dest) {</div><div class='add'>+		kfree(src);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fill in src buffer */</div><div class='add'>+	for (i = 0; i &lt; IOAT_TEST_SIZE; i++)</div><div class='add'>+		src[i] = (u8)i;</div><div class='add'>+</div><div class='add'>+	/* Start copy, using first DMA channel */</div><div class='add'>+	dma_chan = container_of(device-&gt;common.channels.next,</div><div class='add'>+	                        struct dma_chan,</div><div class='add'>+	                        device_node);</div><div class='add'>+	if (ioat_dma_alloc_chan_resources(dma_chan) &lt; 1) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cookie = ioat_dma_memcpy_buf_to_buf(dma_chan, dest, src, IOAT_TEST_SIZE);</div><div class='add'>+	ioat_dma_memcpy_issue_pending(dma_chan);</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	if (ioat_dma_is_complete(dma_chan, cookie, NULL, NULL) != DMA_SUCCESS) {</div><div class='add'>+		printk(KERN_ERR "ioatdma: Self-test copy timed out, disabling\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto free_resources;</div><div class='add'>+	}</div><div class='add'>+	if (memcmp(src, dest, IOAT_TEST_SIZE)) {</div><div class='add'>+		printk(KERN_ERR "ioatdma: Self-test copy failed compare, disabling\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto free_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+free_resources:</div><div class='add'>+	ioat_dma_free_chan_resources(dma_chan);</div><div class='add'>+out:</div><div class='add'>+	kfree(src);</div><div class='add'>+	kfree(dest);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit ioat_probe(struct pci_dev *pdev,</div><div class='add'>+                                const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	unsigned long mmio_start, mmio_len;</div><div class='add'>+	void *reg_base;</div><div class='add'>+	struct ioat_device *device;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_enable_device;</div><div class='add'>+</div><div class='add'>+	err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+	if (err)</div><div class='add'>+		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_set_dma_mask;</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, ioat_pci_drv.name);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_request_regions;</div><div class='add'>+</div><div class='add'>+	mmio_start = pci_resource_start(pdev, 0);</div><div class='add'>+	mmio_len = pci_resource_len(pdev, 0);</div><div class='add'>+</div><div class='add'>+	reg_base = ioremap(mmio_start, mmio_len);</div><div class='add'>+	if (!reg_base) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device = kzalloc(sizeof(*device), GFP_KERNEL);</div><div class='add'>+	if (!device) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_kzalloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DMA coherent memory pool for DMA descriptor allocations */</div><div class='add'>+	device-&gt;dma_pool = pci_pool_create("dma_desc_pool", pdev,</div><div class='add'>+		sizeof(struct ioat_dma_descriptor), 64, 0);</div><div class='add'>+	if (!device-&gt;dma_pool) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_dma_pool;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device-&gt;completion_pool = pci_pool_create("completion_pool", pdev, sizeof(u64), SMP_CACHE_BYTES, SMP_CACHE_BYTES);</div><div class='add'>+	if (!device-&gt;completion_pool) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_completion_pool;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device-&gt;pdev = pdev;</div><div class='add'>+	pci_set_drvdata(pdev, device);</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+	if (pci_enable_msi(pdev) == 0) {</div><div class='add'>+		device-&gt;msi = 1;</div><div class='add'>+	} else {</div><div class='add'>+		device-&gt;msi = 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	err = request_irq(pdev-&gt;irq, &amp;ioat_do_interrupt, IRQF_SHARED, "ioat",</div><div class='add'>+		device);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_irq;</div><div class='add'>+</div><div class='add'>+	device-&gt;reg_base = reg_base;</div><div class='add'>+</div><div class='add'>+	ioatdma_write8(device, IOAT_INTRCTRL_OFFSET, IOAT_INTRCTRL_MASTER_INT_EN);</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;device-&gt;common.channels);</div><div class='add'>+	enumerate_dma_channels(device);</div><div class='add'>+</div><div class='add'>+	device-&gt;common.device_alloc_chan_resources = ioat_dma_alloc_chan_resources;</div><div class='add'>+	device-&gt;common.device_free_chan_resources = ioat_dma_free_chan_resources;</div><div class='add'>+	device-&gt;common.device_memcpy_buf_to_buf = ioat_dma_memcpy_buf_to_buf;</div><div class='add'>+	device-&gt;common.device_memcpy_buf_to_pg = ioat_dma_memcpy_buf_to_pg;</div><div class='add'>+	device-&gt;common.device_memcpy_pg_to_pg = ioat_dma_memcpy_pg_to_pg;</div><div class='add'>+	device-&gt;common.device_memcpy_complete = ioat_dma_is_complete;</div><div class='add'>+	device-&gt;common.device_memcpy_issue_pending = ioat_dma_memcpy_issue_pending;</div><div class='add'>+	printk(KERN_INFO "Intel(R) I/OAT DMA Engine found, %d channels\n",</div><div class='add'>+		device-&gt;common.chancnt);</div><div class='add'>+</div><div class='add'>+	err = ioat_self_test(device);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_self_test;</div><div class='add'>+</div><div class='add'>+	dma_async_device_register(&amp;device-&gt;common);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_self_test:</div><div class='add'>+err_irq:</div><div class='add'>+	pci_pool_destroy(device-&gt;completion_pool);</div><div class='add'>+err_completion_pool:</div><div class='add'>+	pci_pool_destroy(device-&gt;dma_pool);</div><div class='add'>+err_dma_pool:</div><div class='add'>+	kfree(device);</div><div class='add'>+err_kzalloc:</div><div class='add'>+	iounmap(reg_base);</div><div class='add'>+err_ioremap:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_request_regions:</div><div class='add'>+err_set_dma_mask:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+err_enable_device:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit ioat_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ioat_device *device;</div><div class='add'>+	struct dma_chan *chan, *_chan;</div><div class='add'>+	struct ioat_dma_chan *ioat_chan;</div><div class='add'>+</div><div class='add'>+	device = pci_get_drvdata(pdev);</div><div class='add'>+	dma_async_device_unregister(&amp;device-&gt;common);</div><div class='add'>+</div><div class='add'>+	free_irq(device-&gt;pdev-&gt;irq, device);</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+	if (device-&gt;msi)</div><div class='add'>+		pci_disable_msi(device-&gt;pdev);</div><div class='add'>+#endif</div><div class='add'>+	pci_pool_destroy(device-&gt;dma_pool);</div><div class='add'>+	pci_pool_destroy(device-&gt;completion_pool);</div><div class='add'>+	iounmap(device-&gt;reg_base);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	list_for_each_entry_safe(chan, _chan, &amp;device-&gt;common.channels, device_node) {</div><div class='add'>+		ioat_chan = to_ioat_chan(chan);</div><div class='add'>+		list_del(&amp;chan-&gt;device_node);</div><div class='add'>+		kfree(ioat_chan);</div><div class='add'>+	}</div><div class='add'>+	kfree(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MODULE API */</div><div class='add'>+MODULE_VERSION("1.7");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Intel Corporation");</div><div class='add'>+</div><div class='add'>+static int __init ioat_init_module(void)</div><div class='add'>+{</div><div class='add'>+	/* it's currently unsafe to unload this module */</div><div class='add'>+	/* if forced, worst case is that rmmod hangs */</div><div class='add'>+	__unsafe(THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	return pci_module_init(&amp;ioat_pci_drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ioat_init_module);</div><div class='add'>+</div><div class='add'>+static void __exit ioat_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;ioat_pci_drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(ioat_exit_module);</div><div class='head'>diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h<br/>new file mode 100644<br/>index 000000000000..a5d3b3644160<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ioatdma.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/ioatdma.h</a></div><div class='hunk'>@@ -0,0 +1,125 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+#ifndef IOATDMA_H</div><div class='add'>+#define IOATDMA_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include "ioatdma_hw.h"</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='add'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+</div><div class='add'>+#define IOAT_LOW_COMPLETION_MASK	0xffffffc0</div><div class='add'>+</div><div class='add'>+extern struct list_head dma_device_list;</div><div class='add'>+extern struct list_head dma_client_list;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ioat_device - internal representation of a IOAT device</div><div class='add'>+ * @pdev: PCI-Express device</div><div class='add'>+ * @reg_base: MMIO register space base address</div><div class='add'>+ * @dma_pool: for allocating DMA descriptors</div><div class='add'>+ * @common: embedded struct dma_device</div><div class='add'>+ * @msi: Message Signaled Interrupt number</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ioat_device {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	void *reg_base;</div><div class='add'>+	struct pci_pool *dma_pool;</div><div class='add'>+	struct pci_pool *completion_pool;</div><div class='add'>+</div><div class='add'>+	struct dma_device common;</div><div class='add'>+	u8 msi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ioat_dma_chan - internal representation of a DMA channel</div><div class='add'>+ * @device:</div><div class='add'>+ * @reg_base:</div><div class='add'>+ * @sw_in_use:</div><div class='add'>+ * @completion:</div><div class='add'>+ * @completion_low:</div><div class='add'>+ * @completion_high:</div><div class='add'>+ * @completed_cookie: last cookie seen completed on cleanup</div><div class='add'>+ * @cookie: value of last cookie given to client</div><div class='add'>+ * @last_completion:</div><div class='add'>+ * @xfercap:</div><div class='add'>+ * @desc_lock:</div><div class='add'>+ * @free_desc:</div><div class='add'>+ * @used_desc:</div><div class='add'>+ * @resource:</div><div class='add'>+ * @device_node:</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ioat_dma_chan {</div><div class='add'>+</div><div class='add'>+	void *reg_base;</div><div class='add'>+</div><div class='add'>+	dma_cookie_t completed_cookie;</div><div class='add'>+	unsigned long last_completion;</div><div class='add'>+</div><div class='add'>+	u32 xfercap;	/* XFERCAP register value expanded out */</div><div class='add'>+</div><div class='add'>+	spinlock_t cleanup_lock;</div><div class='add'>+	spinlock_t desc_lock;</div><div class='add'>+	struct list_head free_desc;</div><div class='add'>+	struct list_head used_desc;</div><div class='add'>+</div><div class='add'>+	int pending;</div><div class='add'>+</div><div class='add'>+	struct ioat_device *device;</div><div class='add'>+	struct dma_chan common;</div><div class='add'>+</div><div class='add'>+	dma_addr_t completion_addr;</div><div class='add'>+	union {</div><div class='add'>+		u64 full; /* HW completion writeback */</div><div class='add'>+		struct {</div><div class='add'>+			u32 low;</div><div class='add'>+			u32 high;</div><div class='add'>+		};</div><div class='add'>+	} *completion_virt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* wrapper around hardware descriptor format + additional software fields */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ioat_desc_sw - wrapper around hardware descriptor</div><div class='add'>+ * @hw: hardware DMA descriptor</div><div class='add'>+ * @node:</div><div class='add'>+ * @cookie:</div><div class='add'>+ * @phys:</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ioat_desc_sw {</div><div class='add'>+	struct ioat_dma_descriptor *hw;</div><div class='add'>+	struct list_head node;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+	dma_addr_t phys;</div><div class='add'>+	DECLARE_PCI_UNMAP_ADDR(src)</div><div class='add'>+	DECLARE_PCI_UNMAP_LEN(src_len)</div><div class='add'>+	DECLARE_PCI_UNMAP_ADDR(dst)</div><div class='add'>+	DECLARE_PCI_UNMAP_LEN(dst_len)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* IOATDMA_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/dma/ioatdma_hw.h b/drivers/dma/ioatdma_hw.h<br/>new file mode 100644<br/>index 000000000000..4d7a12880be3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ioatdma_hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/ioatdma_hw.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+#ifndef _IOAT_HW_H_</div><div class='add'>+#define _IOAT_HW_H_</div><div class='add'>+</div><div class='add'>+/* PCI Configuration Space Values */</div><div class='add'>+#define IOAT_PCI_VID			0x8086</div><div class='add'>+#define IOAT_PCI_DID			0x1A38</div><div class='add'>+#define IOAT_PCI_RID			0x00</div><div class='add'>+#define IOAT_PCI_SVID			0x8086</div><div class='add'>+#define IOAT_PCI_SID			0x8086</div><div class='add'>+#define IOAT_VER			0x12	/* Version 1.2 */</div><div class='add'>+</div><div class='add'>+struct ioat_dma_descriptor {</div><div class='add'>+	uint32_t	size;</div><div class='add'>+	uint32_t	ctl;</div><div class='add'>+	uint64_t	src_addr;</div><div class='add'>+	uint64_t	dst_addr;</div><div class='add'>+	uint64_t	next;</div><div class='add'>+	uint64_t	rsv1;</div><div class='add'>+	uint64_t	rsv2;</div><div class='add'>+	uint64_t	user1;</div><div class='add'>+	uint64_t	user2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_CTL_INT_GN	0x00000001</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_CTL_SRC_SN	0x00000002</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_CTL_DST_SN	0x00000004</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_CTL_CP_STS	0x00000008</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_CTL_FRAME	0x00000010</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_NUL		0x00000020</div><div class='add'>+#define IOAT_DMA_DESCRIPTOR_OPCODE	0xFF000000</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/dma/ioatdma_io.h b/drivers/dma/ioatdma_io.h<br/>new file mode 100644<br/>index 000000000000..c0b4bf66c920<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ioatdma_io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/ioatdma_io.h</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+#ifndef IOATDMA_IO_H</div><div class='add'>+#define IOATDMA_IO_H</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * device and per-channel MMIO register read and write functions</div><div class='add'>+ * this is a lot of anoying inline functions, but it's typesafe</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline u8 ioatdma_read8(struct ioat_device *device,</div><div class='add'>+                               unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readb(device-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 ioatdma_read16(struct ioat_device *device,</div><div class='add'>+                                 unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readw(device-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ioatdma_read32(struct ioat_device *device,</div><div class='add'>+                                 unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readl(device-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_write8(struct ioat_device *device,</div><div class='add'>+                                  unsigned int offset, u8 value)</div><div class='add'>+{</div><div class='add'>+	writeb(value, device-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_write16(struct ioat_device *device,</div><div class='add'>+                                   unsigned int offset, u16 value)</div><div class='add'>+{</div><div class='add'>+	writew(value, device-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_write32(struct ioat_device *device,</div><div class='add'>+                                   unsigned int offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, device-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 ioatdma_chan_read8(struct ioat_dma_chan *chan,</div><div class='add'>+                                    unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readb(chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 ioatdma_chan_read16(struct ioat_dma_chan *chan,</div><div class='add'>+                                      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readw(chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 ioatdma_chan_read32(struct ioat_dma_chan *chan,</div><div class='add'>+                                      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readl(chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_chan_write8(struct ioat_dma_chan *chan,</div><div class='add'>+                                       unsigned int offset, u8 value)</div><div class='add'>+{</div><div class='add'>+	writeb(value, chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_chan_write16(struct ioat_dma_chan *chan,</div><div class='add'>+                                        unsigned int offset, u16 value)</div><div class='add'>+{</div><div class='add'>+	writew(value, chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_chan_write32(struct ioat_dma_chan *chan,</div><div class='add'>+                                        unsigned int offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if (BITS_PER_LONG == 64)</div><div class='add'>+static inline u64 ioatdma_chan_read64(struct ioat_dma_chan *chan,</div><div class='add'>+                                      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readq(chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ioatdma_chan_write64(struct ioat_dma_chan *chan,</div><div class='add'>+                                        unsigned int offset, u64 value)</div><div class='add'>+{</div><div class='add'>+	writeq(value, chan-&gt;reg_base + offset);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* IOATDMA_IO_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/dma/ioatdma_registers.h b/drivers/dma/ioatdma_registers.h<br/>new file mode 100644<br/>index 000000000000..a30c7349075a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/ioatdma_registers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/ioatdma_registers.h</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+#ifndef _IOAT_REGISTERS_H_</div><div class='add'>+#define _IOAT_REGISTERS_H_</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* MMIO Device Registers */</div><div class='add'>+#define IOAT_CHANCNT_OFFSET			0x00	/*  8-bit */</div><div class='add'>+</div><div class='add'>+#define IOAT_XFERCAP_OFFSET			0x01	/*  8-bit */</div><div class='add'>+#define IOAT_XFERCAP_4KB			12</div><div class='add'>+#define IOAT_XFERCAP_8KB			13</div><div class='add'>+#define IOAT_XFERCAP_16KB			14</div><div class='add'>+#define IOAT_XFERCAP_32KB			15</div><div class='add'>+#define IOAT_XFERCAP_32GB			0</div><div class='add'>+</div><div class='add'>+#define IOAT_GENCTRL_OFFSET			0x02	/*  8-bit */</div><div class='add'>+#define IOAT_GENCTRL_DEBUG_EN			0x01</div><div class='add'>+</div><div class='add'>+#define IOAT_INTRCTRL_OFFSET			0x03	/*  8-bit */</div><div class='add'>+#define IOAT_INTRCTRL_MASTER_INT_EN		0x01	/* Master Interrupt Enable */</div><div class='add'>+#define IOAT_INTRCTRL_INT_STATUS		0x02	/* ATTNSTATUS -or- Channel Int */</div><div class='add'>+#define IOAT_INTRCTRL_INT			0x04	/* INT_STATUS -and- MASTER_INT_EN */</div><div class='add'>+</div><div class='add'>+#define IOAT_ATTNSTATUS_OFFSET			0x04	/* Each bit is a channel */</div><div class='add'>+</div><div class='add'>+#define IOAT_VER_OFFSET				0x08	/*  8-bit */</div><div class='add'>+#define IOAT_VER_MAJOR_MASK			0xF0</div><div class='add'>+#define IOAT_VER_MINOR_MASK			0x0F</div><div class='add'>+#define GET_IOAT_VER_MAJOR(x)			((x) &amp; IOAT_VER_MAJOR_MASK)</div><div class='add'>+#define GET_IOAT_VER_MINOR(x)			((x) &amp; IOAT_VER_MINOR_MASK)</div><div class='add'>+</div><div class='add'>+#define IOAT_PERPORTOFFSET_OFFSET		0x0A	/* 16-bit */</div><div class='add'>+</div><div class='add'>+#define IOAT_INTRDELAY_OFFSET			0x0C	/* 16-bit */</div><div class='add'>+#define IOAT_INTRDELAY_INT_DELAY_MASK		0x3FFF	/* Interrupt Delay Time */</div><div class='add'>+#define IOAT_INTRDELAY_COALESE_SUPPORT		0x8000	/* Interrupt Coalesing Supported */</div><div class='add'>+</div><div class='add'>+#define IOAT_DEVICE_STATUS_OFFSET		0x0E	/* 16-bit */</div><div class='add'>+#define IOAT_DEVICE_STATUS_DEGRADED_MODE	0x0001</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define IOAT_CHANNEL_MMIO_SIZE			0x80	/* Each Channel MMIO space is this size */</div><div class='add'>+</div><div class='add'>+/* DMA Channel Registers */</div><div class='add'>+#define IOAT_CHANCTRL_OFFSET			0x00	/* 16-bit Channel Control Register */</div><div class='add'>+#define IOAT_CHANCTRL_CHANNEL_PRIORITY_MASK	0xF000</div><div class='add'>+#define IOAT_CHANCTRL_CHANNEL_IN_USE		0x0100</div><div class='add'>+#define IOAT_CHANCTRL_DESCRIPTOR_ADDR_SNOOP_CONTROL	0x0020</div><div class='add'>+#define IOAT_CHANCTRL_ERR_INT_EN		0x0010</div><div class='add'>+#define IOAT_CHANCTRL_ANY_ERR_ABORT_EN		0x0008</div><div class='add'>+#define IOAT_CHANCTRL_ERR_COMPLETION_EN		0x0004</div><div class='add'>+#define IOAT_CHANCTRL_INT_DISABLE		0x0001</div><div class='add'>+</div><div class='add'>+#define IOAT_DMA_COMP_OFFSET			0x02	/* 16-bit DMA channel compatability */</div><div class='add'>+#define IOAT_DMA_COMP_V1			0x0001	/* Compatability with DMA version 1 */</div><div class='add'>+</div><div class='add'>+#define IOAT_CHANSTS_OFFSET			0x04	/* 64-bit Channel Status Register */</div><div class='add'>+#define IOAT_CHANSTS_OFFSET_LOW			0x04</div><div class='add'>+#define IOAT_CHANSTS_OFFSET_HIGH		0x08</div><div class='add'>+#define IOAT_CHANSTS_COMPLETED_DESCRIPTOR_ADDR	0xFFFFFFFFFFFFFFC0UL</div><div class='add'>+#define IOAT_CHANSTS_SOFT_ERR			0x0000000000000010</div><div class='add'>+#define IOAT_CHANSTS_DMA_TRANSFER_STATUS	0x0000000000000007</div><div class='add'>+#define IOAT_CHANSTS_DMA_TRANSFER_STATUS_ACTIVE	0x0</div><div class='add'>+#define IOAT_CHANSTS_DMA_TRANSFER_STATUS_DONE	0x1</div><div class='add'>+#define IOAT_CHANSTS_DMA_TRANSFER_STATUS_SUSPENDED	0x2</div><div class='add'>+#define IOAT_CHANSTS_DMA_TRANSFER_STATUS_HALTED	0x3</div><div class='add'>+</div><div class='add'>+#define IOAT_CHAINADDR_OFFSET			0x0C	/* 64-bit Descriptor Chain Address Register */</div><div class='add'>+#define IOAT_CHAINADDR_OFFSET_LOW		0x0C</div><div class='add'>+#define IOAT_CHAINADDR_OFFSET_HIGH		0x10</div><div class='add'>+</div><div class='add'>+#define IOAT_CHANCMD_OFFSET			0x14	/*  8-bit DMA Channel Command Register */</div><div class='add'>+#define IOAT_CHANCMD_RESET			0x20</div><div class='add'>+#define IOAT_CHANCMD_RESUME			0x10</div><div class='add'>+#define IOAT_CHANCMD_ABORT			0x08</div><div class='add'>+#define IOAT_CHANCMD_SUSPEND			0x04</div><div class='add'>+#define IOAT_CHANCMD_APPEND			0x02</div><div class='add'>+#define IOAT_CHANCMD_START			0x01</div><div class='add'>+</div><div class='add'>+#define IOAT_CHANCMP_OFFSET			0x18	/* 64-bit Channel Completion Address Register */</div><div class='add'>+#define IOAT_CHANCMP_OFFSET_LOW			0x18</div><div class='add'>+#define IOAT_CHANCMP_OFFSET_HIGH		0x1C</div><div class='add'>+</div><div class='add'>+#define IOAT_CDAR_OFFSET			0x20	/* 64-bit Current Descriptor Address Register */</div><div class='add'>+#define IOAT_CDAR_OFFSET_LOW			0x20</div><div class='add'>+#define IOAT_CDAR_OFFSET_HIGH			0x24</div><div class='add'>+</div><div class='add'>+#define IOAT_CHANERR_OFFSET			0x28	/* 32-bit Channel Error Register */</div><div class='add'>+#define IOAT_CHANERR_DMA_TRANSFER_SRC_ADDR_ERR	0x0001</div><div class='add'>+#define IOAT_CHANERR_DMA_TRANSFER_DEST_ADDR_ERR	0x0002</div><div class='add'>+#define IOAT_CHANERR_NEXT_DESCRIPTOR_ADDR_ERR	0x0004</div><div class='add'>+#define IOAT_CHANERR_NEXT_DESCRIPTOR_ALIGNMENT_ERR	0x0008</div><div class='add'>+#define IOAT_CHANERR_CHAIN_ADDR_VALUE_ERR	0x0010</div><div class='add'>+#define IOAT_CHANERR_CHANCMD_ERR		0x0020</div><div class='add'>+#define IOAT_CHANERR_CHIPSET_UNCORRECTABLE_DATA_INTEGRITY_ERR	0x0040</div><div class='add'>+#define IOAT_CHANERR_DMA_UNCORRECTABLE_DATA_INTEGRITY_ERR	0x0080</div><div class='add'>+#define IOAT_CHANERR_READ_DATA_ERR		0x0100</div><div class='add'>+#define IOAT_CHANERR_WRITE_DATA_ERR		0x0200</div><div class='add'>+#define IOAT_CHANERR_DESCRIPTOR_CONTROL_ERR	0x0400</div><div class='add'>+#define IOAT_CHANERR_DESCRIPTOR_LENGTH_ERR	0x0800</div><div class='add'>+#define IOAT_CHANERR_COMPLETION_ADDR_ERR	0x1000</div><div class='add'>+#define IOAT_CHANERR_INT_CONFIGURATION_ERR	0x2000</div><div class='add'>+#define IOAT_CHANERR_SOFT_ERR			0x4000</div><div class='add'>+</div><div class='add'>+#define IOAT_CHANERR_MASK_OFFSET		0x2C	/* 32-bit Channel Error Register */</div><div class='add'>+</div><div class='add'>+#endif /* _IOAT_REGISTERS_H_ */</div><div class='head'>diff --git a/drivers/dma/iovlock.c b/drivers/dma/iovlock.c<br/>new file mode 100644<br/>index 000000000000..d637555a833b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/dma/iovlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/dma/iovlock.c</a></div><div class='hunk'>@@ -0,0 +1,301 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright(c) 2004 - 2006 Intel Corporation. All rights reserved.</div><div class='add'>+ * Portions based on net/core/datagram.c and copyrighted by their authors.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ * Software Foundation; either version 2 of the License, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='add'>+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='add'>+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along with</div><div class='add'>+ * this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='add'>+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ * The full GNU General Public License is included in this distribution in the</div><div class='add'>+ * file called COPYING.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This code allows the net stack to make use of a DMA engine for</div><div class='add'>+ * skb to iovec copies.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt; /* for memcpy_toiovec */</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+static int num_pages_spanned(struct iovec *iov)</div><div class='add'>+{</div><div class='add'>+	return</div><div class='add'>+	((PAGE_ALIGN((unsigned long)iov-&gt;iov_base + iov-&gt;iov_len) -</div><div class='add'>+	((unsigned long)iov-&gt;iov_base &amp; PAGE_MASK)) &gt;&gt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pin down all the iovec pages needed for len bytes.</div><div class='add'>+ * Return a struct dma_pinned_list to keep track of pages pinned down.</div><div class='add'>+ *</div><div class='add'>+ * We are allocating a single chunk of memory, and then carving it up into</div><div class='add'>+ * 3 sections, the latter 2 whose size depends on the number of iovecs and the</div><div class='add'>+ * total number of pages, respectively.</div><div class='add'>+ */</div><div class='add'>+struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct dma_pinned_list *local_list;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+	int nr_iovecs = 0;</div><div class='add'>+	int iovec_len_used = 0;</div><div class='add'>+	int iovec_pages_used = 0;</div><div class='add'>+	long err;</div><div class='add'>+</div><div class='add'>+	/* don't pin down non-user-based iovecs */</div><div class='add'>+	if (segment_eq(get_fs(), KERNEL_DS))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* determine how many iovecs/pages there are, up front */</div><div class='add'>+	do {</div><div class='add'>+		iovec_len_used += iov[nr_iovecs].iov_len;</div><div class='add'>+		iovec_pages_used += num_pages_spanned(&amp;iov[nr_iovecs]);</div><div class='add'>+		nr_iovecs++;</div><div class='add'>+	} while (iovec_len_used &lt; len);</div><div class='add'>+</div><div class='add'>+	/* single kmalloc for pinned list, page_list[], and the page arrays */</div><div class='add'>+	local_list = kmalloc(sizeof(*local_list)</div><div class='add'>+		+ (nr_iovecs * sizeof (struct dma_page_list))</div><div class='add'>+		+ (iovec_pages_used * sizeof (struct page*)), GFP_KERNEL);</div><div class='add'>+	if (!local_list) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* list of pages starts right after the page list array */</div><div class='add'>+	pages = (struct page **) &amp;local_list-&gt;page_list[nr_iovecs];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_iovecs; i++) {</div><div class='add'>+		struct dma_page_list *page_list = &amp;local_list-&gt;page_list[i];</div><div class='add'>+</div><div class='add'>+		len -= iov[i].iov_len;</div><div class='add'>+</div><div class='add'>+		if (!access_ok(VERIFY_WRITE, iov[i].iov_base, iov[i].iov_len)) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto unpin;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		page_list-&gt;nr_pages = num_pages_spanned(&amp;iov[i]);</div><div class='add'>+		page_list-&gt;base_address = iov[i].iov_base;</div><div class='add'>+</div><div class='add'>+		page_list-&gt;pages = pages;</div><div class='add'>+		pages += page_list-&gt;nr_pages;</div><div class='add'>+</div><div class='add'>+		/* pin pages down */</div><div class='add'>+		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		ret = get_user_pages(</div><div class='add'>+			current,</div><div class='add'>+			current-&gt;mm,</div><div class='add'>+			(unsigned long) iov[i].iov_base,</div><div class='add'>+			page_list-&gt;nr_pages,</div><div class='add'>+			1,	/* write */</div><div class='add'>+			0,	/* force */</div><div class='add'>+			page_list-&gt;pages,</div><div class='add'>+			NULL);</div><div class='add'>+		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+</div><div class='add'>+		if (ret != page_list-&gt;nr_pages) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto unpin;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		local_list-&gt;nr_iovecs = i + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return local_list;</div><div class='add'>+</div><div class='add'>+unpin:</div><div class='add'>+	dma_unpin_iovec_pages(local_list);</div><div class='add'>+out:</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dma_unpin_iovec_pages(struct dma_pinned_list *pinned_list)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!pinned_list)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pinned_list-&gt;nr_iovecs; i++) {</div><div class='add'>+		struct dma_page_list *page_list = &amp;pinned_list-&gt;page_list[i];</div><div class='add'>+		for (j = 0; j &lt; page_list-&gt;nr_pages; j++) {</div><div class='add'>+			set_page_dirty_lock(page_list-&gt;pages[j]);</div><div class='add'>+			page_cache_release(page_list-&gt;pages[j]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(pinned_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_cookie_t dma_memcpy_to_kernel_iovec(struct dma_chan *chan, struct</div><div class='add'>+	iovec *iov, unsigned char *kdata, size_t len)</div><div class='add'>+{</div><div class='add'>+	dma_cookie_t dma_cookie = 0;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		if (iov-&gt;iov_len) {</div><div class='add'>+			int copy = min_t(unsigned int, iov-&gt;iov_len, len);</div><div class='add'>+			dma_cookie = dma_async_memcpy_buf_to_buf(</div><div class='add'>+					chan,</div><div class='add'>+					iov-&gt;iov_base,</div><div class='add'>+					kdata,</div><div class='add'>+					copy);</div><div class='add'>+			kdata += copy;</div><div class='add'>+			len -= copy;</div><div class='add'>+			iov-&gt;iov_len -= copy;</div><div class='add'>+			iov-&gt;iov_base += copy;</div><div class='add'>+		}</div><div class='add'>+		iov++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dma_cookie;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We have already pinned down the pages we will be using in the iovecs.</div><div class='add'>+ * Each entry in iov array has corresponding entry in pinned_list-&gt;page_list.</div><div class='add'>+ * Using array indexing to keep iov[] and page_list[] in sync.</div><div class='add'>+ * Initial elements in iov array's iov-&gt;iov_len will be 0 if already copied into</div><div class='add'>+ *   by another call.</div><div class='add'>+ * iov array length remaining guaranteed to be bigger than len.</div><div class='add'>+ */</div><div class='add'>+dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,</div><div class='add'>+	struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len)</div><div class='add'>+{</div><div class='add'>+	int iov_byte_offset;</div><div class='add'>+	int copy;</div><div class='add'>+	dma_cookie_t dma_cookie = 0;</div><div class='add'>+	int iovec_idx;</div><div class='add'>+	int page_idx;</div><div class='add'>+</div><div class='add'>+	if (!chan)</div><div class='add'>+		return memcpy_toiovec(iov, kdata, len);</div><div class='add'>+</div><div class='add'>+	/* -&gt; kernel copies (e.g. smbfs) */</div><div class='add'>+	if (!pinned_list)</div><div class='add'>+		return dma_memcpy_to_kernel_iovec(chan, iov, kdata, len);</div><div class='add'>+</div><div class='add'>+	iovec_idx = 0;</div><div class='add'>+	while (iovec_idx &lt; pinned_list-&gt;nr_iovecs) {</div><div class='add'>+		struct dma_page_list *page_list;</div><div class='add'>+</div><div class='add'>+		/* skip already used-up iovecs */</div><div class='add'>+		while (!iov[iovec_idx].iov_len)</div><div class='add'>+			iovec_idx++;</div><div class='add'>+</div><div class='add'>+		page_list = &amp;pinned_list-&gt;page_list[iovec_idx];</div><div class='add'>+</div><div class='add'>+		iov_byte_offset = ((unsigned long)iov[iovec_idx].iov_base &amp; ~PAGE_MASK);</div><div class='add'>+		page_idx = (((unsigned long)iov[iovec_idx].iov_base &amp; PAGE_MASK)</div><div class='add'>+			 - ((unsigned long)page_list-&gt;base_address &amp; PAGE_MASK)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+		/* break up copies to not cross page boundary */</div><div class='add'>+		while (iov[iovec_idx].iov_len) {</div><div class='add'>+			copy = min_t(int, PAGE_SIZE - iov_byte_offset, len);</div><div class='add'>+			copy = min_t(int, copy, iov[iovec_idx].iov_len);</div><div class='add'>+</div><div class='add'>+			dma_cookie = dma_async_memcpy_buf_to_pg(chan,</div><div class='add'>+					page_list-&gt;pages[page_idx],</div><div class='add'>+					iov_byte_offset,</div><div class='add'>+					kdata,</div><div class='add'>+					copy);</div><div class='add'>+</div><div class='add'>+			len -= copy;</div><div class='add'>+			iov[iovec_idx].iov_len -= copy;</div><div class='add'>+			iov[iovec_idx].iov_base += copy;</div><div class='add'>+</div><div class='add'>+			if (!len)</div><div class='add'>+				return dma_cookie;</div><div class='add'>+</div><div class='add'>+			kdata += copy;</div><div class='add'>+			iov_byte_offset = 0;</div><div class='add'>+			page_idx++;</div><div class='add'>+		}</div><div class='add'>+		iovec_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* really bad if we ever run out of iovecs */</div><div class='add'>+	BUG();</div><div class='add'>+	return -EFAULT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,</div><div class='add'>+	struct dma_pinned_list *pinned_list, struct page *page,</div><div class='add'>+	unsigned int offset, size_t len)</div><div class='add'>+{</div><div class='add'>+	int iov_byte_offset;</div><div class='add'>+	int copy;</div><div class='add'>+	dma_cookie_t dma_cookie = 0;</div><div class='add'>+	int iovec_idx;</div><div class='add'>+	int page_idx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* this needs as-yet-unimplemented buf-to-buff, so punt. */</div><div class='add'>+	/* TODO: use dma for this */</div><div class='add'>+	if (!chan || !pinned_list) {</div><div class='add'>+		u8 *vaddr = kmap(page);</div><div class='add'>+		err = memcpy_toiovec(iov, vaddr + offset, len);</div><div class='add'>+		kunmap(page);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iovec_idx = 0;</div><div class='add'>+	while (iovec_idx &lt; pinned_list-&gt;nr_iovecs) {</div><div class='add'>+		struct dma_page_list *page_list;</div><div class='add'>+</div><div class='add'>+		/* skip already used-up iovecs */</div><div class='add'>+		while (!iov[iovec_idx].iov_len)</div><div class='add'>+			iovec_idx++;</div><div class='add'>+</div><div class='add'>+		page_list = &amp;pinned_list-&gt;page_list[iovec_idx];</div><div class='add'>+</div><div class='add'>+		iov_byte_offset = ((unsigned long)iov[iovec_idx].iov_base &amp; ~PAGE_MASK);</div><div class='add'>+		page_idx = (((unsigned long)iov[iovec_idx].iov_base &amp; PAGE_MASK)</div><div class='add'>+			 - ((unsigned long)page_list-&gt;base_address &amp; PAGE_MASK)) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+		/* break up copies to not cross page boundary */</div><div class='add'>+		while (iov[iovec_idx].iov_len) {</div><div class='add'>+			copy = min_t(int, PAGE_SIZE - iov_byte_offset, len);</div><div class='add'>+			copy = min_t(int, copy, iov[iovec_idx].iov_len);</div><div class='add'>+</div><div class='add'>+			dma_cookie = dma_async_memcpy_pg_to_pg(chan,</div><div class='add'>+					page_list-&gt;pages[page_idx],</div><div class='add'>+					iov_byte_offset,</div><div class='add'>+					page,</div><div class='add'>+					offset,</div><div class='add'>+					copy);</div><div class='add'>+</div><div class='add'>+			len -= copy;</div><div class='add'>+			iov[iovec_idx].iov_len -= copy;</div><div class='add'>+			iov[iovec_idx].iov_base += copy;</div><div class='add'>+</div><div class='add'>+			if (!len)</div><div class='add'>+				return dma_cookie;</div><div class='add'>+</div><div class='add'>+			offset += copy;</div><div class='add'>+			iov_byte_offset = 0;</div><div class='add'>+			page_idx++;</div><div class='add'>+		}</div><div class='add'>+		iovec_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* really bad if we ever run out of iovecs */</div><div class='add'>+	BUG();</div><div class='add'>+	return -EFAULT;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c<br/>index 53423ad6d4a3..f79f6b587bfa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/amd76x_edac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/amd76x_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/amd76x_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/amd76x_edac.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -20,6 +19,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='add'>+#define AMD76X_REVISION	" Ver: 2.0.1 "  __DATE__</div><div class='add'>+#define EDAC_MOD_STR	"amd76x_edac"</div><div class='add'>+</div><div class='ctx'> #define amd76x_printk(level, fmt, arg...) \</div><div class='ctx'> 	edac_printk(level, "amd76x", fmt, ##arg)</div><div class='ctx'> </div><div class='hunk'>@@ -102,15 +104,18 @@ static const struct amd76x_dev_info amd76x_devs[] = {</div><div class='ctx'> static void amd76x_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		struct amd76x_error_info *info)</div><div class='ctx'> {</div><div class='del'>-	pci_read_config_dword(mci-&gt;pdev, AMD76X_ECC_MODE_STATUS,</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	pdev = to_pci_dev(mci-&gt;dev);</div><div class='add'>+	pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS,</div><div class='ctx'> 				&amp;info-&gt;ecc_mode_status);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;ecc_mode_status &amp; BIT(8))</div><div class='del'>-		pci_write_bits32(mci-&gt;pdev, AMD76X_ECC_MODE_STATUS,</div><div class='add'>+		pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,</div><div class='ctx'> 				(u32) BIT(8), (u32) BIT(8));</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;ecc_mode_status &amp; BIT(9))</div><div class='del'>-		pci_write_bits32(mci-&gt;pdev, AMD76X_ECC_MODE_STATUS,</div><div class='add'>+		pci_write_bits32(pdev, AMD76X_ECC_MODE_STATUS,</div><div class='ctx'> 				(u32) BIT(9), (u32) BIT(9));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +181,38 @@ static void amd76x_check(struct mem_ctl_info *mci)</div><div class='ctx'> 	amd76x_process_error_info(mci, &amp;info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void amd76x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,</div><div class='add'>+		enum edac_type edac_mode)</div><div class='add'>+{</div><div class='add'>+	struct csrow_info *csrow;</div><div class='add'>+	u32 mba, mba_base, mba_mask, dms;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='add'>+		csrow = &amp;mci-&gt;csrows[index];</div><div class='add'>+</div><div class='add'>+		/* find the DRAM Chip Select Base address and mask */</div><div class='add'>+		pci_read_config_dword(pdev,</div><div class='add'>+				      AMD76X_MEM_BASE_ADDR + (index * 4),</div><div class='add'>+				      &amp;mba);</div><div class='add'>+</div><div class='add'>+		if (!(mba &amp; BIT(0)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mba_base = mba &amp; 0xff800000UL;</div><div class='add'>+		mba_mask = ((mba &amp; 0xff80) &lt;&lt; 16) | 0x7fffffUL;</div><div class='add'>+		pci_read_config_dword(pdev, AMD76X_DRAM_MODE_STATUS, &amp;dms);</div><div class='add'>+		csrow-&gt;first_page = mba_base &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		csrow-&gt;nr_pages = (mba_mask + 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		csrow-&gt;last_page = csrow-&gt;first_page + csrow-&gt;nr_pages - 1;</div><div class='add'>+		csrow-&gt;page_mask = mba_mask &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		csrow-&gt;grain = csrow-&gt;nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='add'>+		csrow-&gt;mtype = MEM_RDDR;</div><div class='add'>+		csrow-&gt;dtype = ((dms &gt;&gt; index) &amp; 0x1) ? DEV_X4 : DEV_UNKNOWN;</div><div class='add'>+		csrow-&gt;edac_mode = edac_mode;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	amd76x_probe1	-	Perform set up for detected device</div><div class='ctx'>  *	@pdev; PCI device detected</div><div class='hunk'>@@ -187,15 +224,13 @@ static void amd76x_check(struct mem_ctl_info *mci)</div><div class='ctx'>  */</div><div class='ctx'> static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> {</div><div class='del'>-	int rc = -ENODEV;</div><div class='del'>-	int index;</div><div class='del'>-	struct mem_ctl_info *mci = NULL;</div><div class='del'>-	enum edac_type ems_modes[] = {</div><div class='add'>+	static const enum edac_type ems_modes[] = {</div><div class='ctx'> 		EDAC_NONE,</div><div class='ctx'> 		EDAC_EC,</div><div class='ctx'> 		EDAC_SECDED,</div><div class='ctx'> 		EDAC_SECDED</div><div class='ctx'> 	};</div><div class='add'>+	struct mem_ctl_info *mci = NULL;</div><div class='ctx'> 	u32 ems;</div><div class='ctx'> 	u32 ems_mode;</div><div class='ctx'> 	struct amd76x_error_info discard;</div><div class='hunk'>@@ -206,53 +241,28 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS);</div><div class='ctx'> </div><div class='ctx'> 	if (mci == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s(): mci = %p\n", __func__, mci);</div><div class='del'>-	mci-&gt;pdev = pdev;</div><div class='add'>+	mci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	mci-&gt;mtype_cap = MEM_FLAG_RDDR;</div><div class='ctx'> 	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;</div><div class='ctx'> 	mci-&gt;edac_cap = ems_mode ?</div><div class='ctx'> 			(EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;</div><div class='ctx'> 	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='del'>-	mci-&gt;mod_ver = "$Revision: 1.4.2.5 $";</div><div class='add'>+	mci-&gt;mod_ver = AMD76X_REVISION;</div><div class='ctx'> 	mci-&gt;ctl_name = amd76x_devs[dev_idx].ctl_name;</div><div class='ctx'> 	mci-&gt;edac_check = amd76x_check;</div><div class='ctx'> 	mci-&gt;ctl_page_to_phys = NULL;</div><div class='ctx'> </div><div class='del'>-	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='del'>-		struct csrow_info *csrow = &amp;mci-&gt;csrows[index];</div><div class='del'>-		u32 mba;</div><div class='del'>-		u32 mba_base;</div><div class='del'>-		u32 mba_mask;</div><div class='del'>-		u32 dms;</div><div class='del'>-</div><div class='del'>-		/* find the DRAM Chip Select Base address and mask */</div><div class='del'>-		pci_read_config_dword(mci-&gt;pdev,</div><div class='del'>-				AMD76X_MEM_BASE_ADDR + (index * 4), &amp;mba);</div><div class='del'>-</div><div class='del'>-		if (!(mba &amp; BIT(0)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mba_base = mba &amp; 0xff800000UL;</div><div class='del'>-		mba_mask = ((mba &amp; 0xff80) &lt;&lt; 16) | 0x7fffffUL;</div><div class='del'>-		pci_read_config_dword(mci-&gt;pdev, AMD76X_DRAM_MODE_STATUS,</div><div class='del'>-				&amp;dms);</div><div class='del'>-		csrow-&gt;first_page = mba_base &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		csrow-&gt;nr_pages = (mba_mask + 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		csrow-&gt;last_page = csrow-&gt;first_page + csrow-&gt;nr_pages - 1;</div><div class='del'>-		csrow-&gt;page_mask = mba_mask &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		csrow-&gt;grain = csrow-&gt;nr_pages &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		csrow-&gt;mtype = MEM_RDDR;</div><div class='del'>-		csrow-&gt;dtype = ((dms &gt;&gt; index) &amp; 0x1) ? DEV_X4 : DEV_UNKNOWN;</div><div class='del'>-		csrow-&gt;edac_mode = ems_modes[ems_mode];</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	amd76x_init_csrows(mci, pdev, ems_modes[ems_mode]);</div><div class='ctx'> 	amd76x_get_error_info(mci, &amp;discard);  /* clear counters */</div><div class='ctx'> </div><div class='del'>-	if (edac_mc_add_mc(mci)) {</div><div class='add'>+	/* Here we assume that we will never see multiple instances of this</div><div class='add'>+	 * type of memory controller.  The ID is therefore hardcoded to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (edac_mc_add_mc(mci,0)) {</div><div class='ctx'> 		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -262,9 +272,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	if (mci != NULL)</div><div class='del'>-		edac_mc_free(mci);</div><div class='del'>-	return rc;</div><div class='add'>+	edac_mc_free(mci);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns count (&gt;= 0), or negative on error */</div><div class='hunk'>@@ -291,7 +300,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((mci = edac_mc_del_mc(pdev)) == NULL)</div><div class='add'>+	if ((mci = edac_mc_del_mc(&amp;pdev-&gt;dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	edac_mc_free(mci);</div><div class='head'>diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c<br/>index fce31936e6d7..c82bc0ed7f14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/e752x_edac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/e752x_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/e752x_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/e752x_edac.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -25,6 +24,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='add'>+#define E752X_REVISION	" Ver: 2.0.1 " __DATE__</div><div class='add'>+#define EDAC_MOD_STR	"e752x_edac"</div><div class='add'>+</div><div class='ctx'> static int force_function_unhide;</div><div class='ctx'> </div><div class='ctx'> #define e752x_printk(level, fmt, arg...) \</div><div class='hunk'>@@ -763,22 +765,174 @@ static void e752x_check(struct mem_ctl_info *mci)</div><div class='ctx'> 	e752x_process_error_info(mci, &amp;info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int e752x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+/* Return 1 if dual channel mode is active.  Else return 0. */</div><div class='add'>+static inline int dual_channel_active(u16 ddrcsr)</div><div class='add'>+{</div><div class='add'>+	return (((ddrcsr &gt;&gt; 12) &amp; 3) == 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void e752x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,</div><div class='add'>+		u16 ddrcsr)</div><div class='add'>+{</div><div class='add'>+	struct csrow_info *csrow;</div><div class='add'>+	unsigned long last_cumul_size;</div><div class='add'>+	int index, mem_dev, drc_chan;</div><div class='add'>+	int drc_drbg;  /* DRB granularity 0=64mb, 1=128mb */</div><div class='add'>+	int drc_ddim;  /* DRAM Data Integrity Mode 0=none, 2=edac */</div><div class='add'>+	u8 value;</div><div class='add'>+	u32 dra, drc, cumul_size;</div><div class='add'>+</div><div class='add'>+	pci_read_config_dword(pdev, E752X_DRA, &amp;dra);</div><div class='add'>+	pci_read_config_dword(pdev, E752X_DRC, &amp;drc);</div><div class='add'>+	drc_chan = dual_channel_active(ddrcsr);</div><div class='add'>+	drc_drbg = drc_chan + 1;  /* 128 in dual mode, 64 in single */</div><div class='add'>+	drc_ddim = (drc &gt;&gt; 20) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	/* The dram row boundary (DRB) reg values are boundary address for</div><div class='add'>+	 * each DRAM row with a granularity of 64 or 128MB (single/dual</div><div class='add'>+	 * channel operation).  DRB regs are cumulative; therefore DRB7 will</div><div class='add'>+	 * contain the total memory contained in all eight rows.</div><div class='add'>+	 */</div><div class='add'>+	for (last_cumul_size = index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='add'>+		/* mem_dev 0=x8, 1=x4 */</div><div class='add'>+		mem_dev = (dra &gt;&gt; (index * 4 + 2)) &amp; 0x3;</div><div class='add'>+		csrow = &amp;mci-&gt;csrows[index];</div><div class='add'>+</div><div class='add'>+		mem_dev = (mem_dev == 2);</div><div class='add'>+		pci_read_config_byte(pdev, E752X_DRB + index, &amp;value);</div><div class='add'>+		/* convert a 128 or 64 MiB DRB to a page size. */</div><div class='add'>+		cumul_size = value &lt;&lt; (25 + drc_drbg - PAGE_SHIFT);</div><div class='add'>+		debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,</div><div class='add'>+			cumul_size);</div><div class='add'>+		if (cumul_size == last_cumul_size)</div><div class='add'>+			continue;	/* not populated */</div><div class='add'>+</div><div class='add'>+		csrow-&gt;first_page = last_cumul_size;</div><div class='add'>+		csrow-&gt;last_page = cumul_size - 1;</div><div class='add'>+		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='add'>+		last_cumul_size = cumul_size;</div><div class='add'>+		csrow-&gt;grain = 1 &lt;&lt; 12;	/* 4KiB - resolution of CELOG */</div><div class='add'>+		csrow-&gt;mtype = MEM_RDDR;	/* only one type supported */</div><div class='add'>+		csrow-&gt;dtype = mem_dev ? DEV_X4 : DEV_X8;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * if single channel or x8 devices then SECDED</div><div class='add'>+		 * if dual channel and x4 then S4ECD4ED</div><div class='add'>+		 */</div><div class='add'>+		if (drc_ddim) {</div><div class='add'>+			if (drc_chan &amp;&amp; mem_dev) {</div><div class='add'>+				csrow-&gt;edac_mode = EDAC_S4ECD4ED;</div><div class='add'>+				mci-&gt;edac_cap |= EDAC_FLAG_S4ECD4ED;</div><div class='add'>+			} else {</div><div class='add'>+				csrow-&gt;edac_mode = EDAC_SECDED;</div><div class='add'>+				mci-&gt;edac_cap |= EDAC_FLAG_SECDED;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			csrow-&gt;edac_mode = EDAC_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void e752x_init_mem_map_table(struct pci_dev *pdev,</div><div class='add'>+		struct e752x_pvt *pvt)</div><div class='ctx'> {</div><div class='del'>-	int rc = -ENODEV;</div><div class='ctx'> 	int index;</div><div class='add'>+	u8 value, last, row, stat8;</div><div class='add'>+</div><div class='add'>+	last = 0;</div><div class='add'>+	row = 0;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; 8; index += 2) {</div><div class='add'>+		pci_read_config_byte(pdev, E752X_DRB + index, &amp;value);</div><div class='add'>+		/* test if there is a dimm in this slot */</div><div class='add'>+		if (value == last) {</div><div class='add'>+			/* no dimm in the slot, so flag it as empty */</div><div class='add'>+			pvt-&gt;map[index] = 0xff;</div><div class='add'>+			pvt-&gt;map[index + 1] = 0xff;</div><div class='add'>+		} else {        /* there is a dimm in the slot */</div><div class='add'>+			pvt-&gt;map[index] = row;</div><div class='add'>+			row++;</div><div class='add'>+			last = value;</div><div class='add'>+			/* test the next value to see if the dimm is double</div><div class='add'>+			 * sided</div><div class='add'>+			 */</div><div class='add'>+			pci_read_config_byte(pdev, E752X_DRB + index + 1,</div><div class='add'>+					     &amp;value);</div><div class='add'>+			pvt-&gt;map[index + 1] = (value == last) ?</div><div class='add'>+			    0xff :      /* the dimm is single sided,</div><div class='add'>+					   so flag as empty */</div><div class='add'>+			    row;        /* this is a double sided dimm</div><div class='add'>+					   to save the next row # */</div><div class='add'>+			row++;</div><div class='add'>+			last = value;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set the map type.  1 = normal, 0 = reversed */</div><div class='add'>+	pci_read_config_byte(pdev, E752X_DRM, &amp;stat8);</div><div class='add'>+	pvt-&gt;map_type = ((stat8 &amp; 0x0f) &gt; ((stat8 &gt;&gt; 4) &amp; 0x0f));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return 0 on success or 1 on failure. */</div><div class='add'>+static int e752x_get_devs(struct pci_dev *pdev, int dev_idx,</div><div class='add'>+		struct e752x_pvt *pvt)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+</div><div class='add'>+	pvt-&gt;bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,</div><div class='add'>+					pvt-&gt;dev_info-&gt;err_dev,</div><div class='add'>+					pvt-&gt;bridge_ck);</div><div class='add'>+</div><div class='add'>+	if (pvt-&gt;bridge_ck == NULL)</div><div class='add'>+		pvt-&gt;bridge_ck = pci_scan_single_device(pdev-&gt;bus,</div><div class='add'>+							PCI_DEVFN(0, 1));</div><div class='add'>+</div><div class='add'>+	if (pvt-&gt;bridge_ck == NULL) {</div><div class='add'>+		e752x_printk(KERN_ERR, "error reporting device not found:"</div><div class='add'>+		       "vendor %x device 0x%x (broken BIOS?)\n",</div><div class='add'>+		       PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = pci_get_device(PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].ctl_dev,</div><div class='add'>+			     NULL);</div><div class='add'>+</div><div class='add'>+	if (dev == NULL)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	pvt-&gt;dev_d0f0 = dev;</div><div class='add'>+	pvt-&gt;dev_d0f1 = pci_dev_get(pvt-&gt;bridge_ck);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	pci_dev_put(pvt-&gt;bridge_ck);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void e752x_init_error_reporting_regs(struct e752x_pvt *pvt)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+</div><div class='add'>+	dev = pvt-&gt;dev_d0f1;</div><div class='add'>+	/* Turn off error disable &amp; SMI in case the BIOS turned it on */</div><div class='add'>+	pci_write_config_byte(dev, E752X_HI_ERRMASK, 0x00);</div><div class='add'>+	pci_write_config_byte(dev, E752X_HI_SMICMD, 0x00);</div><div class='add'>+	pci_write_config_word(dev, E752X_SYSBUS_ERRMASK, 0x00);</div><div class='add'>+	pci_write_config_word(dev, E752X_SYSBUS_SMICMD, 0x00);</div><div class='add'>+	pci_write_config_byte(dev, E752X_BUF_ERRMASK, 0x00);</div><div class='add'>+	pci_write_config_byte(dev, E752X_BUF_SMICMD, 0x00);</div><div class='add'>+	pci_write_config_byte(dev, E752X_DRAM_ERRMASK, 0x00);</div><div class='add'>+	pci_write_config_byte(dev, E752X_DRAM_SMICMD, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int e752x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+{</div><div class='ctx'> 	u16 pci_data;</div><div class='ctx'> 	u8 stat8;</div><div class='del'>-	struct mem_ctl_info *mci = NULL;</div><div class='del'>-	struct e752x_pvt *pvt = NULL;</div><div class='add'>+	struct mem_ctl_info *mci;</div><div class='add'>+	struct e752x_pvt *pvt;</div><div class='ctx'> 	u16 ddrcsr;</div><div class='del'>-	u32 drc;</div><div class='ctx'> 	int drc_chan;	/* Number of channels 0=1chan,1=2chan */</div><div class='del'>-	int drc_drbg;	/* DRB granularity 0=64mb, 1=128mb */</div><div class='del'>-	int drc_ddim;	/* DRAM Data Integrity Mode 0=none,2=edac */</div><div class='del'>-	u32 dra;</div><div class='del'>-	unsigned long last_cumul_size;</div><div class='del'>-	struct pci_dev *dev = NULL;</div><div class='ctx'> 	struct e752x_error_info discard;</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s(): mci\n", __func__);</div><div class='hunk'>@@ -792,25 +946,20 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	if (!force_function_unhide &amp;&amp; !(stat8 &amp; (1 &lt;&lt; 5))) {</div><div class='ctx'> 		printk(KERN_INFO "Contact your BIOS vendor to see if the "</div><div class='ctx'> 			"E752x error registers can be safely un-hidden\n");</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	stat8 |= (1 &lt;&lt; 5);</div><div class='ctx'> 	pci_write_config_byte(pdev, E752X_DEVPRES1, stat8);</div><div class='ctx'> </div><div class='del'>-	/* need to find out the number of channels */</div><div class='del'>-	pci_read_config_dword(pdev, E752X_DRC, &amp;drc);</div><div class='ctx'> 	pci_read_config_word(pdev, E752X_DDRCSR, &amp;ddrcsr);</div><div class='ctx'> 	/* FIXME: should check &gt;&gt;12 or 0xf, true for all? */</div><div class='ctx'> 	/* Dual channel = 1, Single channel = 0 */</div><div class='del'>-	drc_chan = (((ddrcsr &gt;&gt; 12) &amp; 3) == 3);</div><div class='del'>-	drc_drbg = drc_chan + 1;	/* 128 in dual mode, 64 in single */</div><div class='del'>-	drc_ddim = (drc &gt;&gt; 20) &amp; 0x3;</div><div class='add'>+	drc_chan = dual_channel_active(ddrcsr);</div><div class='ctx'> </div><div class='ctx'> 	mci = edac_mc_alloc(sizeof(*pvt), E752X_NR_CSROWS, drc_chan + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (mci == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	debugf3("%s(): init mci\n", __func__);</div><div class='hunk'>@@ -819,159 +968,54 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	    EDAC_FLAG_S4ECD4ED;</div><div class='ctx'> 	/* FIXME - what if different memory types are in different csrows? */</div><div class='ctx'> 	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='del'>-	mci-&gt;mod_ver = "$Revision: 1.5.2.11 $";</div><div class='del'>-	mci-&gt;pdev = pdev;</div><div class='add'>+	mci-&gt;mod_ver = E752X_REVISION;</div><div class='add'>+	mci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	debugf3("%s(): init pvt\n", __func__);</div><div class='ctx'> 	pvt = (struct e752x_pvt *) mci-&gt;pvt_info;</div><div class='ctx'> 	pvt-&gt;dev_info = &amp;e752x_devs[dev_idx];</div><div class='del'>-	pvt-&gt;bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,</div><div class='del'>-					pvt-&gt;dev_info-&gt;err_dev,</div><div class='del'>-					pvt-&gt;bridge_ck);</div><div class='del'>-</div><div class='del'>-	if (pvt-&gt;bridge_ck == NULL)</div><div class='del'>-		pvt-&gt;bridge_ck = pci_scan_single_device(pdev-&gt;bus,</div><div class='del'>-					PCI_DEVFN(0, 1));</div><div class='add'>+	pvt-&gt;mc_symmetric = ((ddrcsr &amp; 0x10) != 0);</div><div class='ctx'> </div><div class='del'>-	if (pvt-&gt;bridge_ck == NULL) {</div><div class='del'>-		e752x_printk(KERN_ERR, "error reporting device not found:"</div><div class='del'>-			"vendor %x device 0x%x (broken BIOS?)\n",</div><div class='del'>-			PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].err_dev);</div><div class='del'>-		goto fail;</div><div class='add'>+	if (e752x_get_devs(pdev, dev_idx, pvt)) {</div><div class='add'>+		edac_mc_free(mci);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pvt-&gt;mc_symmetric = ((ddrcsr &amp; 0x10) != 0);</div><div class='ctx'> 	debugf3("%s(): more mci init\n", __func__);</div><div class='ctx'> 	mci-&gt;ctl_name = pvt-&gt;dev_info-&gt;ctl_name;</div><div class='ctx'> 	mci-&gt;edac_check = e752x_check;</div><div class='ctx'> 	mci-&gt;ctl_page_to_phys = ctl_page_to_phys;</div><div class='ctx'> </div><div class='del'>-	/* find out the device types */</div><div class='del'>-	pci_read_config_dword(pdev, E752X_DRA, &amp;dra);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The dram row boundary (DRB) reg values are boundary address for</div><div class='del'>-	 * each DRAM row with a granularity of 64 or 128MB (single/dual</div><div class='del'>-	 * channel operation).  DRB regs are cumulative; therefore DRB7 will</div><div class='del'>-	 * contain the total memory contained in all eight rows.</div><div class='del'>-	 */</div><div class='del'>-	for (last_cumul_size = index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='del'>-		u8 value;</div><div class='del'>-		u32 cumul_size;</div><div class='del'>-</div><div class='del'>-		/* mem_dev 0=x8, 1=x4 */</div><div class='del'>-		int mem_dev = (dra &gt;&gt; (index * 4 + 2)) &amp; 0x3;</div><div class='del'>-		struct csrow_info *csrow = &amp;mci-&gt;csrows[index];</div><div class='del'>-</div><div class='del'>-		mem_dev = (mem_dev == 2);</div><div class='del'>-		pci_read_config_byte(mci-&gt;pdev, E752X_DRB + index, &amp;value);</div><div class='del'>-		/* convert a 128 or 64 MiB DRB to a page size. */</div><div class='del'>-		cumul_size = value &lt;&lt; (25 + drc_drbg - PAGE_SHIFT);</div><div class='del'>-		debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,</div><div class='del'>-			cumul_size);</div><div class='del'>-</div><div class='del'>-		if (cumul_size == last_cumul_size)</div><div class='del'>-			continue; /* not populated */</div><div class='del'>-</div><div class='del'>-		csrow-&gt;first_page = last_cumul_size;</div><div class='del'>-		csrow-&gt;last_page = cumul_size - 1;</div><div class='del'>-		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='del'>-		last_cumul_size = cumul_size;</div><div class='del'>-		csrow-&gt;grain = 1 &lt;&lt; 12;  /* 4KiB - resolution of CELOG */</div><div class='del'>-		csrow-&gt;mtype = MEM_RDDR;  /* only one type supported */</div><div class='del'>-		csrow-&gt;dtype = mem_dev ? DEV_X4 : DEV_X8;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * if single channel or x8 devices then SECDED</div><div class='del'>-		 * if dual channel and x4 then S4ECD4ED</div><div class='del'>-		 */</div><div class='del'>-		if (drc_ddim) {</div><div class='del'>-			if (drc_chan &amp;&amp; mem_dev) {</div><div class='del'>-				csrow-&gt;edac_mode = EDAC_S4ECD4ED;</div><div class='del'>-				mci-&gt;edac_cap |= EDAC_FLAG_S4ECD4ED;</div><div class='del'>-			} else {</div><div class='del'>-				csrow-&gt;edac_mode = EDAC_SECDED;</div><div class='del'>-				mci-&gt;edac_cap |= EDAC_FLAG_SECDED;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			csrow-&gt;edac_mode = EDAC_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fill in the memory map table */</div><div class='del'>-	{</div><div class='del'>-		u8 value;</div><div class='del'>-		u8 last = 0;</div><div class='del'>-		u8 row = 0;</div><div class='del'>-</div><div class='del'>-		for (index = 0; index &lt; 8; index += 2) {</div><div class='del'>-			pci_read_config_byte(mci-&gt;pdev, E752X_DRB + index,</div><div class='del'>-					&amp;value);</div><div class='del'>-</div><div class='del'>-			/* test if there is a dimm in this slot */</div><div class='del'>-			if (value == last) {</div><div class='del'>-				/* no dimm in the slot, so flag it as empty */</div><div class='del'>-				pvt-&gt;map[index] = 0xff;</div><div class='del'>-				pvt-&gt;map[index + 1] = 0xff;</div><div class='del'>-			} else { /* there is a dimm in the slot */</div><div class='del'>-				pvt-&gt;map[index] = row;</div><div class='del'>-				row++;</div><div class='del'>-				last = value;</div><div class='del'>-				/* test the next value to see if the dimm is</div><div class='del'>-				   double sided */</div><div class='del'>-				pci_read_config_byte(mci-&gt;pdev,</div><div class='del'>-						E752X_DRB + index + 1,</div><div class='del'>-						&amp;value);</div><div class='del'>-				pvt-&gt;map[index + 1] = (value == last) ?</div><div class='del'>-					0xff :	/* the dimm is single sided,</div><div class='del'>-						 * so flag as empty</div><div class='del'>-						 */</div><div class='del'>-					row;	/* this is a double sided dimm</div><div class='del'>-						 * to save the next row #</div><div class='del'>-						 */</div><div class='del'>-				row++;</div><div class='del'>-				last = value;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	e752x_init_csrows(mci, pdev, ddrcsr);</div><div class='add'>+	e752x_init_mem_map_table(pdev, pvt);</div><div class='ctx'> </div><div class='ctx'> 	/* set the map type.  1 = normal, 0 = reversed */</div><div class='del'>-	pci_read_config_byte(mci-&gt;pdev, E752X_DRM, &amp;stat8);</div><div class='add'>+	pci_read_config_byte(pdev, E752X_DRM, &amp;stat8);</div><div class='ctx'> 	pvt-&gt;map_type = ((stat8 &amp; 0x0f) &gt; ((stat8 &gt;&gt; 4) &amp; 0x0f));</div><div class='ctx'> </div><div class='ctx'> 	mci-&gt;edac_cap |= EDAC_FLAG_NONE;</div><div class='ctx'> 	debugf3("%s(): tolm, remapbase, remaplimit\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* load the top of low memory, remap base, and remap limit vars */</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, E752X_TOLM, &amp;pci_data);</div><div class='add'>+	pci_read_config_word(pdev, E752X_TOLM, &amp;pci_data);</div><div class='ctx'> 	pvt-&gt;tolm = ((u32) pci_data) &lt;&lt; 4;</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, E752X_REMAPBASE, &amp;pci_data);</div><div class='add'>+	pci_read_config_word(pdev, E752X_REMAPBASE, &amp;pci_data);</div><div class='ctx'> 	pvt-&gt;remapbase = ((u32) pci_data) &lt;&lt; 14;</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, E752X_REMAPLIMIT, &amp;pci_data);</div><div class='add'>+	pci_read_config_word(pdev, E752X_REMAPLIMIT, &amp;pci_data);</div><div class='ctx'> 	pvt-&gt;remaplimit = ((u32) pci_data) &lt;&lt; 14;</div><div class='ctx'> 	e752x_printk(KERN_INFO,</div><div class='ctx'> 		"tolm = %x, remapbase = %x, remaplimit = %x\n", pvt-&gt;tolm,</div><div class='ctx'> 		pvt-&gt;remapbase, pvt-&gt;remaplimit);</div><div class='ctx'> </div><div class='del'>-	if (edac_mc_add_mc(mci)) {</div><div class='add'>+	/* Here we assume that we will never see multiple instances of this</div><div class='add'>+	 * type of memory controller.  The ID is therefore hardcoded to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (edac_mc_add_mc(mci,0)) {</div><div class='ctx'> 		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = pci_get_device(PCI_VENDOR_ID_INTEL, e752x_devs[dev_idx].ctl_dev,</div><div class='del'>-			NULL);</div><div class='del'>-	pvt-&gt;dev_d0f0 = dev;</div><div class='del'>-	/* find the error reporting device and clear errors */</div><div class='del'>-	dev = pvt-&gt;dev_d0f1 = pci_dev_get(pvt-&gt;bridge_ck);</div><div class='del'>-	/* Turn off error disable &amp; SMI in case the BIOS turned it on */</div><div class='del'>-	pci_write_config_byte(dev, E752X_HI_ERRMASK, 0x00);</div><div class='del'>-	pci_write_config_byte(dev, E752X_HI_SMICMD, 0x00);</div><div class='del'>-	pci_write_config_word(dev, E752X_SYSBUS_ERRMASK, 0x00);</div><div class='del'>-	pci_write_config_word(dev, E752X_SYSBUS_SMICMD, 0x00);</div><div class='del'>-	pci_write_config_byte(dev, E752X_BUF_ERRMASK, 0x00);</div><div class='del'>-	pci_write_config_byte(dev, E752X_BUF_SMICMD, 0x00);</div><div class='del'>-	pci_write_config_byte(dev, E752X_DRAM_ERRMASK, 0x00);</div><div class='del'>-	pci_write_config_byte(dev, E752X_DRAM_SMICMD, 0x00);</div><div class='del'>-</div><div class='add'>+	e752x_init_error_reporting_regs(pvt);</div><div class='ctx'> 	e752x_get_error_info(mci, &amp;discard); /* clear other MCH errors */</div><div class='ctx'> </div><div class='ctx'> 	/* get this far and it's successful */</div><div class='hunk'>@@ -979,20 +1023,12 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	if (mci) {</div><div class='del'>-		if (pvt-&gt;dev_d0f0)</div><div class='del'>-			pci_dev_put(pvt-&gt;dev_d0f0);</div><div class='del'>-</div><div class='del'>-		if (pvt-&gt;dev_d0f1)</div><div class='del'>-			pci_dev_put(pvt-&gt;dev_d0f1);</div><div class='del'>-</div><div class='del'>-		if (pvt-&gt;bridge_ck)</div><div class='del'>-			pci_dev_put(pvt-&gt;bridge_ck);</div><div class='del'>-</div><div class='del'>-		edac_mc_free(mci);</div><div class='del'>-	}</div><div class='add'>+	pci_dev_put(pvt-&gt;dev_d0f0);</div><div class='add'>+	pci_dev_put(pvt-&gt;dev_d0f1);</div><div class='add'>+	pci_dev_put(pvt-&gt;bridge_ck);</div><div class='add'>+	edac_mc_free(mci);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns count (&gt;= 0), or negative on error */</div><div class='hunk'>@@ -1015,7 +1051,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((mci = edac_mc_del_mc(pdev)) == NULL)</div><div class='add'>+	if ((mci = edac_mc_del_mc(&amp;pdev-&gt;dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pvt = (struct e752x_pvt *) mci-&gt;pvt_info;</div><div class='head'>diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c<br/>index a9518d3e4be4..310d91b41c96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/e7xxx_edac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/e7xxx_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/e7xxx_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/e7xxx_edac.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -30,6 +29,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='add'>+#define	E7XXX_REVISION " Ver: 2.0.1 " __DATE__</div><div class='add'>+#define	EDAC_MOD_STR	"e7xxx_edac"</div><div class='add'>+</div><div class='ctx'> #define e7xxx_printk(level, fmt, arg...) \</div><div class='ctx'> 	edac_printk(level, "e7xxx", fmt, ##arg)</div><div class='ctx'> </div><div class='hunk'>@@ -333,99 +335,61 @@ static void e7xxx_check(struct mem_ctl_info *mci)</div><div class='ctx'> 	e7xxx_process_error_info(mci, &amp;info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+/* Return 1 if dual channel mode is active.  Else return 0. */</div><div class='add'>+static inline int dual_channel_active(u32 drc, int dev_idx)</div><div class='ctx'> {</div><div class='del'>-	int rc = -ENODEV;</div><div class='del'>-	int index;</div><div class='del'>-	u16 pci_data;</div><div class='del'>-	struct mem_ctl_info *mci = NULL;</div><div class='del'>-	struct e7xxx_pvt *pvt = NULL;</div><div class='del'>-	u32 drc;</div><div class='del'>-	int drc_chan = 1;	/* Number of channels 0=1chan,1=2chan */</div><div class='del'>-	int drc_drbg = 1;	/* DRB granularity 0=32mb,1=64mb */</div><div class='del'>-	int drc_ddim;		/* DRAM Data Integrity Mode 0=none,2=edac */</div><div class='del'>-	u32 dra;</div><div class='del'>-	unsigned long last_cumul_size;</div><div class='del'>-	struct e7xxx_error_info discard;</div><div class='del'>-</div><div class='del'>-	debugf0("%s(): mci\n", __func__);</div><div class='add'>+	return (dev_idx == E7501) ? ((drc &gt;&gt; 22) &amp; 0x1) : 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* need to find out the number of channels */</div><div class='del'>-	pci_read_config_dword(pdev, E7XXX_DRC, &amp;drc);</div><div class='ctx'> </div><div class='add'>+/* Return DRB granularity (0=32mb, 1=64mb). */</div><div class='add'>+static inline int drb_granularity(u32 drc, int dev_idx)</div><div class='add'>+{</div><div class='ctx'> 	/* only e7501 can be single channel */</div><div class='del'>-	if (dev_idx == E7501) {</div><div class='del'>-		drc_chan = ((drc &gt;&gt; 22) &amp; 0x1);</div><div class='del'>-		drc_drbg = (drc &gt;&gt; 18) &amp; 0x3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	drc_ddim = (drc &gt;&gt; 20) &amp; 0x3;</div><div class='del'>-	mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1);</div><div class='del'>-</div><div class='del'>-	if (mci == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	debugf3("%s(): init mci\n", __func__);</div><div class='del'>-	mci-&gt;mtype_cap = MEM_FLAG_RDDR;</div><div class='del'>-	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |</div><div class='del'>-			EDAC_FLAG_S4ECD4ED;</div><div class='del'>-	/* FIXME - what if different memory types are in different csrows? */</div><div class='del'>-	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='del'>-	mci-&gt;mod_ver = "$Revision: 1.5.2.9 $";</div><div class='del'>-	mci-&gt;pdev = pdev;</div><div class='add'>+	return (dev_idx == E7501) ? ((drc &gt;&gt; 18) &amp; 0x3) : 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	debugf3("%s(): init pvt\n", __func__);</div><div class='del'>-	pvt = (struct e7xxx_pvt *) mci-&gt;pvt_info;</div><div class='del'>-	pvt-&gt;dev_info = &amp;e7xxx_devs[dev_idx];</div><div class='del'>-	pvt-&gt;bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,</div><div class='del'>-					pvt-&gt;dev_info-&gt;err_dev,</div><div class='del'>-					pvt-&gt;bridge_ck);</div><div class='ctx'> </div><div class='del'>-	if (!pvt-&gt;bridge_ck) {</div><div class='del'>-		e7xxx_printk(KERN_ERR, "error reporting device not found:"</div><div class='del'>-			"vendor %x device 0x%x (broken BIOS?)\n",</div><div class='del'>-			PCI_VENDOR_ID_INTEL, e7xxx_devs[dev_idx].err_dev);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	debugf3("%s(): more mci init\n", __func__);</div><div class='del'>-	mci-&gt;ctl_name = pvt-&gt;dev_info-&gt;ctl_name;</div><div class='del'>-	mci-&gt;edac_check = e7xxx_check;</div><div class='del'>-	mci-&gt;ctl_page_to_phys = ctl_page_to_phys;</div><div class='add'>+static void e7xxx_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,</div><div class='add'>+		int dev_idx, u32 drc)</div><div class='add'>+{</div><div class='add'>+	unsigned long last_cumul_size;</div><div class='add'>+	int index;</div><div class='add'>+	u8 value;</div><div class='add'>+	u32 dra, cumul_size;</div><div class='add'>+	int drc_chan, drc_drbg, drc_ddim, mem_dev;</div><div class='add'>+	struct csrow_info *csrow;</div><div class='ctx'> </div><div class='del'>-	/* find out the device types */</div><div class='ctx'> 	pci_read_config_dword(pdev, E7XXX_DRA, &amp;dra);</div><div class='add'>+	drc_chan = dual_channel_active(drc, dev_idx);</div><div class='add'>+	drc_drbg = drb_granularity(drc, dev_idx);</div><div class='add'>+	drc_ddim = (drc &gt;&gt; 20) &amp; 0x3;</div><div class='add'>+	last_cumul_size = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The dram row boundary (DRB) reg values are boundary address</div><div class='add'>+	/* The dram row boundary (DRB) reg values are boundary address</div><div class='ctx'> 	 * for each DRAM row with a granularity of 32 or 64MB (single/dual</div><div class='ctx'> 	 * channel operation).  DRB regs are cumulative; therefore DRB7 will</div><div class='ctx'> 	 * contain the total memory contained in all eight rows.</div><div class='ctx'> 	 */</div><div class='del'>-	for (last_cumul_size = index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='del'>-		u8 value;</div><div class='del'>-		u32 cumul_size;</div><div class='add'>+	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='ctx'> 		/* mem_dev 0=x8, 1=x4 */</div><div class='del'>-		int mem_dev = (dra &gt;&gt; (index * 4 + 3)) &amp; 0x1;</div><div class='del'>-		struct csrow_info *csrow = &amp;mci-&gt;csrows[index];</div><div class='add'>+		mem_dev = (dra &gt;&gt; (index * 4 + 3)) &amp; 0x1;</div><div class='add'>+		csrow = &amp;mci-&gt;csrows[index];</div><div class='ctx'> </div><div class='del'>-		pci_read_config_byte(mci-&gt;pdev, E7XXX_DRB + index, &amp;value);</div><div class='add'>+		pci_read_config_byte(pdev, E7XXX_DRB + index, &amp;value);</div><div class='ctx'> 		/* convert a 64 or 32 MiB DRB to a page size. */</div><div class='ctx'> 		cumul_size = value &lt;&lt; (25 + drc_drbg - PAGE_SHIFT);</div><div class='ctx'> 		debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,</div><div class='ctx'> 			cumul_size);</div><div class='del'>-</div><div class='ctx'> 		if (cumul_size == last_cumul_size)</div><div class='del'>-			continue;  /* not populated */</div><div class='add'>+			continue;	/* not populated */</div><div class='ctx'> </div><div class='ctx'> 		csrow-&gt;first_page = last_cumul_size;</div><div class='ctx'> 		csrow-&gt;last_page = cumul_size - 1;</div><div class='ctx'> 		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='ctx'> 		last_cumul_size = cumul_size;</div><div class='del'>-		csrow-&gt;grain = 1 &lt;&lt; 12;  /* 4KiB - resolution of CELOG */</div><div class='del'>-		csrow-&gt;mtype = MEM_RDDR;  /* only one type supported */</div><div class='add'>+		csrow-&gt;grain = 1 &lt;&lt; 12;	/* 4KiB - resolution of CELOG */</div><div class='add'>+		csrow-&gt;mtype = MEM_RDDR;	/* only one type supported */</div><div class='ctx'> 		csrow-&gt;dtype = mem_dev ? DEV_X4 : DEV_X8;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -443,16 +407,61 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 		} else</div><div class='ctx'> 			csrow-&gt;edac_mode = EDAC_NONE;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mci-&gt;edac_cap |= EDAC_FLAG_NONE;</div><div class='add'>+static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+{</div><div class='add'>+	u16 pci_data;</div><div class='add'>+	struct mem_ctl_info *mci = NULL;</div><div class='add'>+	struct e7xxx_pvt *pvt = NULL;</div><div class='add'>+	u32 drc;</div><div class='add'>+	int drc_chan;</div><div class='add'>+	struct e7xxx_error_info discard;</div><div class='add'>+</div><div class='add'>+	debugf0("%s(): mci\n", __func__);</div><div class='add'>+	pci_read_config_dword(pdev, E7XXX_DRC, &amp;drc);</div><div class='add'>+</div><div class='add'>+	drc_chan = dual_channel_active(drc, dev_idx);</div><div class='add'>+	mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1);</div><div class='add'>+</div><div class='add'>+	if (mci == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	debugf3("%s(): init mci\n", __func__);</div><div class='add'>+	mci-&gt;mtype_cap = MEM_FLAG_RDDR;</div><div class='add'>+	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |</div><div class='add'>+			EDAC_FLAG_S4ECD4ED;</div><div class='add'>+	/* FIXME - what if different memory types are in different csrows? */</div><div class='add'>+	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='add'>+	mci-&gt;mod_ver = E7XXX_REVISION;</div><div class='add'>+	mci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	debugf3("%s(): init pvt\n", __func__);</div><div class='add'>+	pvt = (struct e7xxx_pvt *) mci-&gt;pvt_info;</div><div class='add'>+	pvt-&gt;dev_info = &amp;e7xxx_devs[dev_idx];</div><div class='add'>+	pvt-&gt;bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,</div><div class='add'>+					pvt-&gt;dev_info-&gt;err_dev,</div><div class='add'>+					pvt-&gt;bridge_ck);</div><div class='ctx'> </div><div class='add'>+	if (!pvt-&gt;bridge_ck) {</div><div class='add'>+		e7xxx_printk(KERN_ERR, "error reporting device not found:"</div><div class='add'>+			"vendor %x device 0x%x (broken BIOS?)\n",</div><div class='add'>+			PCI_VENDOR_ID_INTEL, e7xxx_devs[dev_idx].err_dev);</div><div class='add'>+		goto fail0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debugf3("%s(): more mci init\n", __func__);</div><div class='add'>+	mci-&gt;ctl_name = pvt-&gt;dev_info-&gt;ctl_name;</div><div class='add'>+	mci-&gt;edac_check = e7xxx_check;</div><div class='add'>+	mci-&gt;ctl_page_to_phys = ctl_page_to_phys;</div><div class='add'>+	e7xxx_init_csrows(mci, pdev, dev_idx, drc);</div><div class='add'>+	mci-&gt;edac_cap |= EDAC_FLAG_NONE;</div><div class='ctx'> 	debugf3("%s(): tolm, remapbase, remaplimit\n", __func__);</div><div class='ctx'> 	/* load the top of low memory, remap base, and remap limit vars */</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, E7XXX_TOLM, &amp;pci_data);</div><div class='add'>+	pci_read_config_word(pdev, E7XXX_TOLM, &amp;pci_data);</div><div class='ctx'> 	pvt-&gt;tolm = ((u32) pci_data) &lt;&lt; 4;</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, E7XXX_REMAPBASE, &amp;pci_data);</div><div class='add'>+	pci_read_config_word(pdev, E7XXX_REMAPBASE, &amp;pci_data);</div><div class='ctx'> 	pvt-&gt;remapbase = ((u32) pci_data) &lt;&lt; 14;</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, E7XXX_REMAPLIMIT, &amp;pci_data);</div><div class='add'>+	pci_read_config_word(pdev, E7XXX_REMAPLIMIT, &amp;pci_data);</div><div class='ctx'> 	pvt-&gt;remaplimit = ((u32) pci_data) &lt;&lt; 14;</div><div class='ctx'> 	e7xxx_printk(KERN_INFO,</div><div class='ctx'> 		"tolm = %x, remapbase = %x, remaplimit = %x\n", pvt-&gt;tolm,</div><div class='hunk'>@@ -461,23 +470,25 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	/* clear any pending errors, or initial state bits */</div><div class='ctx'> 	e7xxx_get_error_info(mci, &amp;discard);</div><div class='ctx'> </div><div class='del'>-	if (edac_mc_add_mc(mci) != 0) {</div><div class='add'>+	/* Here we assume that we will never see multiple instances of this</div><div class='add'>+	 * type of memory controller.  The ID is therefore hardcoded to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (edac_mc_add_mc(mci,0)) {</div><div class='ctx'> 		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='del'>-		goto fail;</div><div class='add'>+		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get this far and it's successful */</div><div class='ctx'> 	debugf3("%s(): success\n", __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-fail:</div><div class='del'>-	if (mci != NULL) {</div><div class='del'>-		if(pvt != NULL &amp;&amp; pvt-&gt;bridge_ck)</div><div class='del'>-			pci_dev_put(pvt-&gt;bridge_ck);</div><div class='del'>-		edac_mc_free(mci);</div><div class='del'>-	}</div><div class='add'>+fail1:</div><div class='add'>+	pci_dev_put(pvt-&gt;bridge_ck);</div><div class='add'>+</div><div class='add'>+fail0:</div><div class='add'>+	edac_mc_free(mci);</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns count (&gt;= 0), or negative on error */</div><div class='hunk'>@@ -498,7 +509,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((mci = edac_mc_del_mc(pdev)) == NULL)</div><div class='add'>+	if ((mci = edac_mc_del_mc(&amp;pdev-&gt;dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pvt = (struct e7xxx_pvt *) mci-&gt;pvt_info;</div><div class='head'>diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c<br/>index ea06e3a4dc35..4bde30bb3be7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/edac_mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/edac_mc.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * edac_mc kernel module</div><div class='del'>- * (C) 2005 Linux Networx (http://lnxi.com)</div><div class='add'>+ * (C) 2005, 2006 Linux Networx (http://lnxi.com)</div><div class='ctx'>  * This file may be distributed under the terms of the</div><div class='ctx'>  * GNU General Public License.</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -34,13 +33,8 @@</div><div class='ctx'> #include &lt;asm/edac.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='del'>-#define EDAC_MC_VERSION "Ver: 2.0.0 " __DATE__</div><div class='add'>+#define EDAC_MC_VERSION "Ver: 2.0.1 " __DATE__</div><div class='ctx'> </div><div class='del'>-/* For now, disable the EDAC sysfs code.  The sysfs interface that EDAC</div><div class='del'>- * presents to user space needs more thought, and is likely to change</div><div class='del'>- * substantially.</div><div class='del'>- */</div><div class='del'>-#define DISABLE_EDAC_SYSFS</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_EDAC_DEBUG</div><div class='ctx'> /* Values of 0 to 4 will generate output */</div><div class='hunk'>@@ -54,35 +48,23 @@ static int log_ce = 1;</div><div class='ctx'> static int panic_on_ue;</div><div class='ctx'> static int poll_msec = 1000;</div><div class='ctx'> </div><div class='del'>-static int check_pci_parity = 0;	/* default YES check PCI parity */</div><div class='del'>-static int panic_on_pci_parity;		/* default no panic on PCI Parity */</div><div class='del'>-static atomic_t pci_parity_count = ATOMIC_INIT(0);</div><div class='del'>-</div><div class='ctx'> /* lock to memory controller's control array */</div><div class='ctx'> static DECLARE_MUTEX(mem_ctls_mutex);</div><div class='ctx'> static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);</div><div class='ctx'> </div><div class='ctx'> static struct task_struct *edac_thread;</div><div class='ctx'> </div><div class='del'>-/* Structure of the whitelist and blacklist arrays */</div><div class='del'>-struct edac_pci_device_list {</div><div class='del'>-	unsigned int  vendor;		/* Vendor ID */</div><div class='del'>-	unsigned int  device;		/* Deviice ID */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MAX_LISTED_PCI_DEVICES		32</div><div class='del'>-</div><div class='del'>-/* List of PCI devices (vendor-id:device-id) that should be skipped */</div><div class='del'>-static struct edac_pci_device_list pci_blacklist[MAX_LISTED_PCI_DEVICES];</div><div class='del'>-static int pci_blacklist_count;</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+static int check_pci_parity = 0;	/* default YES check PCI parity */</div><div class='add'>+static int panic_on_pci_parity;		/* default no panic on PCI Parity */</div><div class='add'>+static atomic_t pci_parity_count = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='del'>-/* List of PCI devices (vendor-id:device-id) that should be scanned */</div><div class='del'>-static struct edac_pci_device_list pci_whitelist[MAX_LISTED_PCI_DEVICES];</div><div class='del'>-static int pci_whitelist_count ;</div><div class='add'>+static struct kobject edac_pci_kobj; /* /sys/devices/system/edac/pci */</div><div class='add'>+static struct completion edac_pci_kobj_complete;</div><div class='add'>+#endif	/* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> /*  START sysfs data and methods */</div><div class='ctx'> </div><div class='del'>-#ifndef DISABLE_EDAC_SYSFS</div><div class='ctx'> </div><div class='ctx'> static const char *mem_types[] = {</div><div class='ctx'> 	[MEM_EMPTY] = "Empty",</div><div class='hunk'>@@ -127,35 +109,24 @@ static struct sysdev_class edac_class = {</div><div class='ctx'> 	set_kset_name("edac"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* sysfs objects:</div><div class='add'>+/* sysfs object:</div><div class='ctx'>  *	/sys/devices/system/edac/mc</div><div class='del'>- *	/sys/devices/system/edac/pci</div><div class='ctx'>  */</div><div class='ctx'> static struct kobject edac_memctrl_kobj;</div><div class='del'>-static struct kobject edac_pci_kobj;</div><div class='ctx'> </div><div class='ctx'> /* We use these to wait for the reference counts on edac_memctrl_kobj and</div><div class='ctx'>  * edac_pci_kobj to reach 0.</div><div class='ctx'>  */</div><div class='ctx'> static struct completion edac_memctrl_kobj_complete;</div><div class='del'>-static struct completion edac_pci_kobj_complete;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * /sys/devices/system/edac/mc;</div><div class='ctx'>  *	data structures and methods</div><div class='ctx'>  */</div><div class='del'>-#if 0</div><div class='del'>-static ssize_t memctrl_string_show(void *ptr, char *buffer)</div><div class='del'>-{</div><div class='del'>-	char *value = (char*) ptr;</div><div class='del'>-	return sprintf(buffer, "%s\n", value);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static ssize_t memctrl_int_show(void *ptr, char *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int *value = (int*) ptr;</div><div class='del'>-	return sprintf(buffer, "%d\n", *value);</div><div class='add'>+	return sprintf(buffer, "%u\n", *value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t memctrl_int_store(void *ptr, const char *buffer, size_t count)</div><div class='hunk'>@@ -221,11 +192,6 @@ struct memctrl_dev_attribute attr_##_name = {			\</div><div class='ctx'> 	.store  = _store,					\</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* cwrow&lt;id&gt; attribute f*/</div><div class='del'>-#if 0</div><div class='del'>-MEMCTRL_STRING_ATTR(mc_version,EDAC_MC_VERSION,S_IRUGO,memctrl_string_show,NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* csrow&lt;id&gt; control files */</div><div class='ctx'> MEMCTRL_ATTR(panic_on_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);</div><div class='ctx'> MEMCTRL_ATTR(log_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);</div><div class='hunk'>@@ -254,8 +220,6 @@ static struct kobj_type ktype_memctrl = {</div><div class='ctx'> 	.default_attrs = (struct attribute **) memctrl_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='del'>-</div><div class='ctx'> /* Initialize the main sysfs entries for edac:</div><div class='ctx'>  *   /sys/devices/system/edac</div><div class='ctx'>  *</div><div class='hunk'>@@ -265,11 +229,6 @@ static struct kobj_type ktype_memctrl = {</div><div class='ctx'>  *         !0 FAILURE</div><div class='ctx'>  */</div><div class='ctx'> static int edac_sysfs_memctrl_setup(void)</div><div class='del'>-#ifdef DISABLE_EDAC_SYSFS</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='ctx'> {</div><div class='ctx'> 	int err=0;</div><div class='ctx'> </div><div class='hunk'>@@ -301,7 +260,6 @@ static int edac_sysfs_memctrl_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * MC teardown:</div><div class='hunk'>@@ -309,7 +267,6 @@ static int edac_sysfs_memctrl_setup(void)</div><div class='ctx'>  */</div><div class='ctx'> static void edac_sysfs_memctrl_teardown(void)</div><div class='ctx'> {</div><div class='del'>-#ifndef DISABLE_EDAC_SYSFS</div><div class='ctx'> 	debugf0("MC: " __FILE__ ": %s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Unregister the MC's kobject and wait for reference count to reach</div><div class='hunk'>@@ -321,142 +278,9 @@ static void edac_sysfs_memctrl_teardown(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Unregister the 'edac' object */</div><div class='ctx'> 	sysdev_class_unregister(&amp;edac_class);</div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef DISABLE_EDAC_SYSFS</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * /sys/devices/system/edac/pci;</div><div class='del'>- * 	data structures and methods</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct list_control {</div><div class='del'>-	struct edac_pci_device_list *list;</div><div class='del'>-	int *count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Output the list as:  vendor_id:device:id&lt;,vendor_id:device_id&gt; */</div><div class='del'>-static ssize_t edac_pci_list_string_show(void *ptr, char *buffer)</div><div class='del'>-{</div><div class='del'>-	struct list_control *listctl;</div><div class='del'>-	struct edac_pci_device_list *list;</div><div class='del'>-	char *p = buffer;</div><div class='del'>-	int len=0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	listctl = ptr;</div><div class='del'>-	list = listctl-&gt;list;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; *(listctl-&gt;count); i++, list++ ) {</div><div class='del'>-		if (len &gt; 0)</div><div class='del'>-			len += snprintf(p + len, (PAGE_SIZE-len), ",");</div><div class='del'>-</div><div class='del'>-		len += snprintf(p + len,</div><div class='del'>-				(PAGE_SIZE-len),</div><div class='del'>-				"%x:%x",</div><div class='del'>-				list-&gt;vendor,list-&gt;device);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len += snprintf(p + len,(PAGE_SIZE-len), "\n");</div><div class='del'>-	return (ssize_t) len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *</div><div class='del'>- * Scan string from **s to **e looking for one 'vendor:device' tuple</div><div class='del'>- * where each field is a hex value</div><div class='del'>- *</div><div class='del'>- * return 0 if an entry is NOT found</div><div class='del'>- * return 1 if an entry is found</div><div class='del'>- *	fill in *vendor_id and *device_id with values found</div><div class='del'>- *</div><div class='del'>- * In both cases, make sure *s has been moved forward toward *e</div><div class='del'>- */</div><div class='del'>-static int parse_one_device(const char **s,const char **e,</div><div class='del'>-	unsigned int *vendor_id, unsigned int *device_id)</div><div class='del'>-{</div><div class='del'>-	const char *runner, *p;</div><div class='del'>-</div><div class='del'>-	/* if null byte, we are done */</div><div class='del'>-	if (!**s) {</div><div class='del'>-		(*s)++;  /* keep *s moving */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* skip over newlines &amp; whitespace */</div><div class='del'>-	if ((**s == '\n') || isspace(**s)) {</div><div class='del'>-		(*s)++;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!isxdigit(**s)) {</div><div class='del'>-		(*s)++;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* parse vendor_id */</div><div class='del'>-	runner = *s;</div><div class='del'>-</div><div class='del'>-	while (runner &lt; *e) {</div><div class='del'>-		/* scan for vendor:device delimiter */</div><div class='del'>-		if (*runner == ':') {</div><div class='del'>-			*vendor_id = simple_strtol((char*) *s, (char**) &amp;p, 16);</div><div class='del'>-			runner = p + 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		runner++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!isxdigit(*runner)) {</div><div class='del'>-		*s = ++runner;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* parse device_id */</div><div class='del'>-	if (runner &lt; *e) {</div><div class='del'>-		*device_id = simple_strtol((char*)runner, (char**)&amp;p, 16);</div><div class='del'>-		runner = p;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*s = runner;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,</div><div class='del'>-		size_t count)</div><div class='del'>-{</div><div class='del'>-	struct list_control *listctl;</div><div class='del'>-	struct edac_pci_device_list *list;</div><div class='del'>-	unsigned int vendor_id, device_id;</div><div class='del'>-	const char *s, *e;</div><div class='del'>-	int *index;</div><div class='del'>-</div><div class='del'>-	s = (char*)buffer;</div><div class='del'>-	e = s + count;</div><div class='del'>-	listctl = ptr;</div><div class='del'>-	list = listctl-&gt;list;</div><div class='del'>-	index = listctl-&gt;count;</div><div class='del'>-	*index = 0;</div><div class='del'>-</div><div class='del'>-	while (*index &lt; MAX_LISTED_PCI_DEVICES) {</div><div class='del'>-		if (parse_one_device(&amp;s,&amp;e,&amp;vendor_id,&amp;device_id)) {</div><div class='del'>-			list[ *index ].vendor = vendor_id;</div><div class='del'>-			list[ *index ].device = device_id;</div><div class='del'>-			(*index)++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* check for all data consume */</div><div class='del'>-		if (s &gt;= e)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='ctx'> static ssize_t edac_pci_int_show(void *ptr, char *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int *value = ptr;</div><div class='hunk'>@@ -524,31 +348,6 @@ struct edac_pci_dev_attribute edac_pci_attr_##_name = {		\</div><div class='ctx'> 	.store  = _store,					\</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-static struct list_control pci_whitelist_control = {</div><div class='del'>-	.list = pci_whitelist,</div><div class='del'>-	.count = &amp;pci_whitelist_count</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct list_control pci_blacklist_control = {</div><div class='del'>-	.list = pci_blacklist,</div><div class='del'>-	.count = &amp;pci_blacklist_count</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* whitelist attribute */</div><div class='del'>-EDAC_PCI_STRING_ATTR(pci_parity_whitelist,</div><div class='del'>-	&amp;pci_whitelist_control,</div><div class='del'>-	S_IRUGO|S_IWUSR,</div><div class='del'>-	edac_pci_list_string_show,</div><div class='del'>-	edac_pci_list_string_store);</div><div class='del'>-</div><div class='del'>-EDAC_PCI_STRING_ATTR(pci_parity_blacklist,</div><div class='del'>-	&amp;pci_blacklist_control,</div><div class='del'>-	S_IRUGO|S_IWUSR,</div><div class='del'>-	edac_pci_list_string_show,</div><div class='del'>-	edac_pci_list_string_store);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* PCI Parity control files */</div><div class='ctx'> EDAC_PCI_ATTR(check_pci_parity, S_IRUGO|S_IWUSR, edac_pci_int_show,</div><div class='ctx'> 	edac_pci_int_store);</div><div class='hunk'>@@ -577,18 +376,11 @@ static struct kobj_type ktype_edac_pci = {</div><div class='ctx'> 	.default_attrs = (struct attribute **) edac_pci_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * edac_sysfs_pci_setup()</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static int edac_sysfs_pci_setup(void)</div><div class='del'>-#ifdef DISABLE_EDAC_SYSFS</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -612,146 +404,291 @@ static int edac_sysfs_pci_setup(void)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='ctx'> </div><div class='ctx'> static void edac_sysfs_pci_teardown(void)</div><div class='ctx'> {</div><div class='del'>-#ifndef DISABLE_EDAC_SYSFS</div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> 	init_completion(&amp;edac_pci_kobj_complete);</div><div class='ctx'> 	kobject_unregister(&amp;edac_pci_kobj);</div><div class='ctx'> 	wait_for_completion(&amp;edac_pci_kobj_complete);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef DISABLE_EDAC_SYSFS</div><div class='ctx'> </div><div class='del'>-/* EDAC sysfs CSROW data structures and methods */</div><div class='del'>-</div><div class='del'>-/* Set of more detailed csrow&lt;id&gt; attribute show/store functions */</div><div class='del'>-static ssize_t csrow_ch0_dimm_label_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)</div><div class='ctx'> {</div><div class='del'>-	ssize_t size = 0;</div><div class='add'>+	int where;</div><div class='add'>+	u16 status;</div><div class='add'>+</div><div class='add'>+	where = secondary ? PCI_SEC_STATUS : PCI_STATUS;</div><div class='add'>+	pci_read_config_word(dev, where, &amp;status);</div><div class='add'>+</div><div class='add'>+	/* If we get back 0xFFFF then we must suspect that the card has been</div><div class='add'>+	 * pulled but the Linux PCI layer has not yet finished cleaning up.</div><div class='add'>+	 * We don't want to report on such devices</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (status == 0xFFFF) {</div><div class='add'>+		u32 sanity;</div><div class='add'>+</div><div class='add'>+		pci_read_config_dword(dev, 0, &amp;sanity);</div><div class='ctx'> </div><div class='del'>-	if (csrow-&gt;nr_channels &gt; 0) {</div><div class='del'>-		size = snprintf(data, EDAC_MC_LABEL_LEN,"%s\n",</div><div class='del'>-			csrow-&gt;channels[0].label);</div><div class='add'>+		if (sanity == 0xFFFFFFFF)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='add'>+	status &amp;= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR |</div><div class='add'>+		PCI_STATUS_PARITY;</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='add'>+		/* reset only the bits we are interested in */</div><div class='add'>+		pci_write_config_word(dev, where, status);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ch1_dimm_label_show(struct csrow_info *csrow, char *data)</div><div class='add'>+typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev);</div><div class='add'>+</div><div class='add'>+/* Clear any PCI parity errors logged by this device. */</div><div class='add'>+static void edac_pci_dev_parity_clear(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	ssize_t size = 0;</div><div class='add'>+	u8 header_type;</div><div class='ctx'> </div><div class='del'>-	if (csrow-&gt;nr_channels &gt; 0) {</div><div class='del'>-		size = snprintf(data, EDAC_MC_LABEL_LEN, "%s\n",</div><div class='del'>-			csrow-&gt;channels[1].label);</div><div class='del'>-	}</div><div class='add'>+	get_pci_parity_status(dev, 0);</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='add'>+	/* read the device TYPE, looking for bridges */</div><div class='add'>+	pci_read_config_byte(dev, PCI_HEADER_TYPE, &amp;header_type);</div><div class='add'>+</div><div class='add'>+	if ((header_type &amp; 0x7F) == PCI_HEADER_TYPE_BRIDGE)</div><div class='add'>+		get_pci_parity_status(dev, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ch0_dimm_label_store(struct csrow_info *csrow,</div><div class='del'>-		const char *data, size_t size)</div><div class='add'>+/*</div><div class='add'>+ *  PCI Parity polling</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void edac_pci_dev_parity_test(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	ssize_t max_size = 0;</div><div class='add'>+	u16 status;</div><div class='add'>+	u8  header_type;</div><div class='add'>+</div><div class='add'>+	/* read the STATUS register on this device</div><div class='add'>+	 */</div><div class='add'>+	status = get_pci_parity_status(dev, 0);</div><div class='add'>+</div><div class='add'>+	debugf2("PCI STATUS= 0x%04x %s\n", status, dev-&gt;dev.bus_id );</div><div class='add'>+</div><div class='add'>+	/* check the status reg for errors */</div><div class='add'>+	if (status) {</div><div class='add'>+		if (status &amp; (PCI_STATUS_SIG_SYSTEM_ERROR))</div><div class='add'>+			edac_printk(KERN_CRIT, EDAC_PCI,</div><div class='add'>+				"Signaled System Error on %s\n",</div><div class='add'>+				pci_name(dev));</div><div class='add'>+</div><div class='add'>+		if (status &amp; (PCI_STATUS_PARITY)) {</div><div class='add'>+			edac_printk(KERN_CRIT, EDAC_PCI,</div><div class='add'>+				"Master Data Parity Error on %s\n",</div><div class='add'>+				pci_name(dev));</div><div class='add'>+</div><div class='add'>+			atomic_inc(&amp;pci_parity_count);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; (PCI_STATUS_DETECTED_PARITY)) {</div><div class='add'>+			edac_printk(KERN_CRIT, EDAC_PCI,</div><div class='add'>+				"Detected Parity Error on %s\n",</div><div class='add'>+				pci_name(dev));</div><div class='ctx'> </div><div class='del'>-	if (csrow-&gt;nr_channels &gt; 0) {</div><div class='del'>-		max_size = min((ssize_t)size,(ssize_t)EDAC_MC_LABEL_LEN-1);</div><div class='del'>-		strncpy(csrow-&gt;channels[0].label, data, max_size);</div><div class='del'>-		csrow-&gt;channels[0].label[max_size] = '\0';</div><div class='add'>+			atomic_inc(&amp;pci_parity_count);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='add'>+	/* read the device TYPE, looking for bridges */</div><div class='add'>+	pci_read_config_byte(dev, PCI_HEADER_TYPE, &amp;header_type);</div><div class='add'>+</div><div class='add'>+	debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev-&gt;dev.bus_id );</div><div class='add'>+</div><div class='add'>+	if ((header_type &amp; 0x7F) == PCI_HEADER_TYPE_BRIDGE) {</div><div class='add'>+		/* On bridges, need to examine secondary status register  */</div><div class='add'>+		status = get_pci_parity_status(dev, 1);</div><div class='add'>+</div><div class='add'>+		debugf2("PCI SEC_STATUS= 0x%04x %s\n",</div><div class='add'>+				status, dev-&gt;dev.bus_id );</div><div class='add'>+</div><div class='add'>+		/* check the secondary status reg for errors */</div><div class='add'>+		if (status) {</div><div class='add'>+			if (status &amp; (PCI_STATUS_SIG_SYSTEM_ERROR))</div><div class='add'>+				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "</div><div class='add'>+					"Signaled System Error on %s\n",</div><div class='add'>+					pci_name(dev));</div><div class='add'>+</div><div class='add'>+			if (status &amp; (PCI_STATUS_PARITY)) {</div><div class='add'>+				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "</div><div class='add'>+					"Master Data Parity Error on "</div><div class='add'>+					"%s\n", pci_name(dev));</div><div class='add'>+</div><div class='add'>+				atomic_inc(&amp;pci_parity_count);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (status &amp; (PCI_STATUS_DETECTED_PARITY)) {</div><div class='add'>+				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "</div><div class='add'>+					"Detected Parity Error on %s\n",</div><div class='add'>+					pci_name(dev));</div><div class='add'>+</div><div class='add'>+				atomic_inc(&amp;pci_parity_count);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ch1_dimm_label_store(struct csrow_info *csrow,</div><div class='del'>-		const char *data, size_t size)</div><div class='add'>+/*</div><div class='add'>+ * pci_dev parity list iterator</div><div class='add'>+ *	Scan the PCI device list for one iteration, looking for SERRORs</div><div class='add'>+ *	Master Parity ERRORS or Parity ERRORs on primary or secondary devices</div><div class='add'>+ */</div><div class='add'>+static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn)</div><div class='ctx'> {</div><div class='del'>-	ssize_t max_size = 0;</div><div class='add'>+	struct pci_dev *dev = NULL;</div><div class='ctx'> </div><div class='del'>-	if (csrow-&gt;nr_channels &gt; 1) {</div><div class='del'>-		max_size = min((ssize_t)size,(ssize_t)EDAC_MC_LABEL_LEN-1);</div><div class='del'>-		strncpy(csrow-&gt;channels[1].label, data, max_size);</div><div class='del'>-		csrow-&gt;channels[1].label[max_size] = '\0';</div><div class='add'>+	/* request for kernel access to the next PCI device, if any,</div><div class='add'>+	 * and while we are looking at it have its reference count</div><div class='add'>+	 * bumped until we are done with it</div><div class='add'>+	 */</div><div class='add'>+	while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {</div><div class='add'>+		fn(dev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return max_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ue_count_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static void do_pci_parity_check(void)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(data,"%u\n", csrow-&gt;ue_count);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int before_count;</div><div class='add'>+</div><div class='add'>+	debugf3("%s()\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (!check_pci_parity)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	before_count = atomic_read(&amp;pci_parity_count);</div><div class='add'>+</div><div class='add'>+	/* scan all PCI devices looking for a Parity Error on devices and</div><div class='add'>+	 * bridges</div><div class='add'>+	 */</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	edac_pci_dev_parity_iterator(edac_pci_dev_parity_test);</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	/* Only if operator has selected panic on PCI Error */</div><div class='add'>+	if (panic_on_pci_parity) {</div><div class='add'>+		/* If the count is different 'after' from 'before' */</div><div class='add'>+		if (before_count != atomic_read(&amp;pci_parity_count))</div><div class='add'>+			panic("EDAC: PCI Parity Error");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ce_count_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static inline void clear_pci_parity_errors(void)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(data,"%u\n", csrow-&gt;ce_count);</div><div class='add'>+	/* Clear any PCI bus parity errors that devices initially have logged</div><div class='add'>+	 * in their registers.</div><div class='add'>+	 */</div><div class='add'>+	edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ch0_ce_count_show(struct csrow_info *csrow, char *data)</div><div class='del'>-{</div><div class='del'>-	ssize_t size = 0;</div><div class='add'>+#else	/* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-	if (csrow-&gt;nr_channels &gt; 0) {</div><div class='del'>-		size = sprintf(data,"%u\n", csrow-&gt;channels[0].ce_count);</div><div class='del'>-	}</div><div class='add'>+/* pre-process these away */</div><div class='add'>+#define	do_pci_parity_check()</div><div class='add'>+#define	clear_pci_parity_errors()</div><div class='add'>+#define	edac_sysfs_pci_teardown()</div><div class='add'>+#define	edac_sysfs_pci_setup()	(0)</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='add'>+#endif	/* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_ch1_ce_count_show(struct csrow_info *csrow, char *data)</div><div class='del'>-{</div><div class='del'>-	ssize_t size = 0;</div><div class='add'>+/* EDAC sysfs CSROW data structures and methods</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-	if (csrow-&gt;nr_channels &gt; 1) {</div><div class='del'>-		size = sprintf(data,"%u\n", csrow-&gt;channels[1].ce_count);</div><div class='del'>-	}</div><div class='add'>+/* Set of more default csrow&lt;id&gt; attribute show/store functions */</div><div class='add'>+static ssize_t csrow_ue_count_show(struct csrow_info *csrow, char *data, int private)</div><div class='add'>+{</div><div class='add'>+	return sprintf(data,"%u\n", csrow-&gt;ue_count);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return size;</div><div class='add'>+static ssize_t csrow_ce_count_show(struct csrow_info *csrow, char *data, int private)</div><div class='add'>+{</div><div class='add'>+	return sprintf(data,"%u\n", csrow-&gt;ce_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_size_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static ssize_t csrow_size_show(struct csrow_info *csrow, char *data, int private)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(data,"%u\n", PAGES_TO_MiB(csrow-&gt;nr_pages));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_mem_type_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static ssize_t csrow_mem_type_show(struct csrow_info *csrow, char *data, int private)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(data,"%s\n", mem_types[csrow-&gt;mtype]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_dev_type_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static ssize_t csrow_dev_type_show(struct csrow_info *csrow, char *data, int private)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(data,"%s\n", dev_types[csrow-&gt;dtype]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data)</div><div class='add'>+static ssize_t csrow_edac_mode_show(struct csrow_info *csrow, char *data, int private)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(data,"%s\n", edac_caps[csrow-&gt;edac_mode]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* show/store functions for DIMM Label attributes */</div><div class='add'>+static ssize_t channel_dimm_label_show(struct csrow_info *csrow,</div><div class='add'>+		char *data, int channel)</div><div class='add'>+{</div><div class='add'>+	return snprintf(data, EDAC_MC_LABEL_LEN,"%s",</div><div class='add'>+			csrow-&gt;channels[channel].label);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t channel_dimm_label_store(struct csrow_info *csrow,</div><div class='add'>+				const char *data,</div><div class='add'>+				size_t count,</div><div class='add'>+				int channel)</div><div class='add'>+{</div><div class='add'>+	ssize_t max_size = 0;</div><div class='add'>+</div><div class='add'>+	max_size = min((ssize_t)count,(ssize_t)EDAC_MC_LABEL_LEN-1);</div><div class='add'>+	strncpy(csrow-&gt;channels[channel].label, data, max_size);</div><div class='add'>+	csrow-&gt;channels[channel].label[max_size] = '\0';</div><div class='add'>+</div><div class='add'>+	return max_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* show function for dynamic chX_ce_count attribute */</div><div class='add'>+static ssize_t channel_ce_count_show(struct csrow_info *csrow,</div><div class='add'>+				char *data,</div><div class='add'>+				int channel)</div><div class='add'>+{</div><div class='add'>+	return sprintf(data, "%u\n", csrow-&gt;channels[channel].ce_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* csrow specific attribute structure */</div><div class='ctx'> struct csrowdev_attribute {</div><div class='ctx'> 	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(struct csrow_info *,char *);</div><div class='del'>-	ssize_t (*store)(struct csrow_info *, const char *,size_t);</div><div class='add'>+	ssize_t (*show)(struct csrow_info *,char *,int);</div><div class='add'>+	ssize_t (*store)(struct csrow_info *, const char *,size_t,int);</div><div class='add'>+	int    private;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_csrow(k) container_of(k, struct csrow_info, kobj)</div><div class='ctx'> #define to_csrowdev_attr(a) container_of(a, struct csrowdev_attribute, attr)</div><div class='ctx'> </div><div class='del'>-/* Set of show/store higher level functions for csrow objects */</div><div class='del'>-static ssize_t csrowdev_show(struct kobject *kobj, struct attribute *attr,</div><div class='del'>-		char *buffer)</div><div class='add'>+/* Set of show/store higher level functions for default csrow attributes */</div><div class='add'>+static ssize_t csrowdev_show(struct kobject *kobj,</div><div class='add'>+			struct attribute *attr,</div><div class='add'>+			char *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct csrow_info *csrow = to_csrow(kobj);</div><div class='ctx'> 	struct csrowdev_attribute *csrowdev_attr = to_csrowdev_attr(attr);</div><div class='ctx'> </div><div class='ctx'> 	if (csrowdev_attr-&gt;show)</div><div class='del'>-		return csrowdev_attr-&gt;show(csrow, buffer);</div><div class='del'>-</div><div class='add'>+		return csrowdev_attr-&gt;show(csrow,</div><div class='add'>+					buffer,</div><div class='add'>+					csrowdev_attr-&gt;private);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -762,8 +699,10 @@ static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 	struct csrowdev_attribute * csrowdev_attr = to_csrowdev_attr(attr);</div><div class='ctx'> </div><div class='ctx'> 	if (csrowdev_attr-&gt;store)</div><div class='del'>-		return csrowdev_attr-&gt;store(csrow, buffer, count);</div><div class='del'>-</div><div class='add'>+		return csrowdev_attr-&gt;store(csrow,</div><div class='add'>+					buffer,</div><div class='add'>+					count,</div><div class='add'>+					csrowdev_attr-&gt;private);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -772,69 +711,157 @@ static struct sysfs_ops csrowfs_ops = {</div><div class='ctx'> 	.store  = csrowdev_store</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CSROWDEV_ATTR(_name,_mode,_show,_store)			\</div><div class='add'>+#define CSROWDEV_ATTR(_name,_mode,_show,_store,_private)	\</div><div class='ctx'> struct csrowdev_attribute attr_##_name = {			\</div><div class='ctx'> 	.attr = {.name = __stringify(_name), .mode = _mode },	\</div><div class='ctx'> 	.show   = _show,					\</div><div class='ctx'> 	.store  = _store,					\</div><div class='add'>+	.private = _private,					\</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* cwrow&lt;id&gt;/attribute files */</div><div class='del'>-CSROWDEV_ATTR(size_mb,S_IRUGO,csrow_size_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(dev_type,S_IRUGO,csrow_dev_type_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(mem_type,S_IRUGO,csrow_mem_type_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(edac_mode,S_IRUGO,csrow_edac_mode_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(ue_count,S_IRUGO,csrow_ue_count_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(ce_count,S_IRUGO,csrow_ce_count_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(ch0_ce_count,S_IRUGO,csrow_ch0_ce_count_show,NULL);</div><div class='del'>-CSROWDEV_ATTR(ch1_ce_count,S_IRUGO,csrow_ch1_ce_count_show,NULL);</div><div class='del'>-</div><div class='del'>-/* control/attribute files */</div><div class='del'>-CSROWDEV_ATTR(ch0_dimm_label,S_IRUGO|S_IWUSR,</div><div class='del'>-		csrow_ch0_dimm_label_show,</div><div class='del'>-		csrow_ch0_dimm_label_store);</div><div class='del'>-CSROWDEV_ATTR(ch1_dimm_label,S_IRUGO|S_IWUSR,</div><div class='del'>-		csrow_ch1_dimm_label_show,</div><div class='del'>-		csrow_ch1_dimm_label_store);</div><div class='add'>+/* default cwrow&lt;id&gt;/attribute files */</div><div class='add'>+CSROWDEV_ATTR(size_mb,S_IRUGO,csrow_size_show,NULL,0);</div><div class='add'>+CSROWDEV_ATTR(dev_type,S_IRUGO,csrow_dev_type_show,NULL,0);</div><div class='add'>+CSROWDEV_ATTR(mem_type,S_IRUGO,csrow_mem_type_show,NULL,0);</div><div class='add'>+CSROWDEV_ATTR(edac_mode,S_IRUGO,csrow_edac_mode_show,NULL,0);</div><div class='add'>+CSROWDEV_ATTR(ue_count,S_IRUGO,csrow_ue_count_show,NULL,0);</div><div class='add'>+CSROWDEV_ATTR(ce_count,S_IRUGO,csrow_ce_count_show,NULL,0);</div><div class='ctx'> </div><div class='del'>-/* Attributes of the CSROW&lt;id&gt; object */</div><div class='del'>-static struct csrowdev_attribute *csrow_attr[] = {</div><div class='add'>+/* default attributes of the CSROW&lt;id&gt; object */</div><div class='add'>+static struct csrowdev_attribute *default_csrow_attr[] = {</div><div class='ctx'> 	&amp;attr_dev_type,</div><div class='ctx'> 	&amp;attr_mem_type,</div><div class='ctx'> 	&amp;attr_edac_mode,</div><div class='ctx'> 	&amp;attr_size_mb,</div><div class='ctx'> 	&amp;attr_ue_count,</div><div class='ctx'> 	&amp;attr_ce_count,</div><div class='del'>-	&amp;attr_ch0_ce_count,</div><div class='del'>-	&amp;attr_ch1_ce_count,</div><div class='del'>-	&amp;attr_ch0_dimm_label,</div><div class='del'>-	&amp;attr_ch1_dimm_label,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* No memory to release */</div><div class='add'>+</div><div class='add'>+/* possible dynamic channel DIMM Label attribute files */</div><div class='add'>+CSROWDEV_ATTR(ch0_dimm_label,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_dimm_label_show,</div><div class='add'>+		channel_dimm_label_store,</div><div class='add'>+		0 );</div><div class='add'>+CSROWDEV_ATTR(ch1_dimm_label,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_dimm_label_show,</div><div class='add'>+		channel_dimm_label_store,</div><div class='add'>+		1 );</div><div class='add'>+CSROWDEV_ATTR(ch2_dimm_label,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_dimm_label_show,</div><div class='add'>+		channel_dimm_label_store,</div><div class='add'>+		2 );</div><div class='add'>+CSROWDEV_ATTR(ch3_dimm_label,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_dimm_label_show,</div><div class='add'>+		channel_dimm_label_store,</div><div class='add'>+		3 );</div><div class='add'>+CSROWDEV_ATTR(ch4_dimm_label,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_dimm_label_show,</div><div class='add'>+		channel_dimm_label_store,</div><div class='add'>+		4 );</div><div class='add'>+CSROWDEV_ATTR(ch5_dimm_label,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_dimm_label_show,</div><div class='add'>+		channel_dimm_label_store,</div><div class='add'>+		5 );</div><div class='add'>+</div><div class='add'>+/* Total possible dynamic DIMM Label attribute file table */</div><div class='add'>+static struct csrowdev_attribute *dynamic_csrow_dimm_attr[] = {</div><div class='add'>+		&amp;attr_ch0_dimm_label,</div><div class='add'>+		&amp;attr_ch1_dimm_label,</div><div class='add'>+		&amp;attr_ch2_dimm_label,</div><div class='add'>+		&amp;attr_ch3_dimm_label,</div><div class='add'>+		&amp;attr_ch4_dimm_label,</div><div class='add'>+		&amp;attr_ch5_dimm_label</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* possible dynamic channel ce_count attribute files */</div><div class='add'>+CSROWDEV_ATTR(ch0_ce_count,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_ce_count_show,</div><div class='add'>+		NULL,</div><div class='add'>+		0 );</div><div class='add'>+CSROWDEV_ATTR(ch1_ce_count,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_ce_count_show,</div><div class='add'>+		NULL,</div><div class='add'>+		1 );</div><div class='add'>+CSROWDEV_ATTR(ch2_ce_count,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_ce_count_show,</div><div class='add'>+		NULL,</div><div class='add'>+		2 );</div><div class='add'>+CSROWDEV_ATTR(ch3_ce_count,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_ce_count_show,</div><div class='add'>+		NULL,</div><div class='add'>+		3 );</div><div class='add'>+CSROWDEV_ATTR(ch4_ce_count,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_ce_count_show,</div><div class='add'>+		NULL,</div><div class='add'>+		4 );</div><div class='add'>+CSROWDEV_ATTR(ch5_ce_count,S_IRUGO|S_IWUSR,</div><div class='add'>+		channel_ce_count_show,</div><div class='add'>+		NULL,</div><div class='add'>+		5 );</div><div class='add'>+</div><div class='add'>+/* Total possible dynamic ce_count attribute file table */</div><div class='add'>+static struct csrowdev_attribute *dynamic_csrow_ce_count_attr[] = {</div><div class='add'>+		&amp;attr_ch0_ce_count,</div><div class='add'>+		&amp;attr_ch1_ce_count,</div><div class='add'>+		&amp;attr_ch2_ce_count,</div><div class='add'>+		&amp;attr_ch3_ce_count,</div><div class='add'>+		&amp;attr_ch4_ce_count,</div><div class='add'>+		&amp;attr_ch5_ce_count</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define EDAC_NR_CHANNELS	6</div><div class='add'>+</div><div class='add'>+/* Create dynamic CHANNEL files, indexed by 'chan',  under specifed CSROW */</div><div class='add'>+static int edac_create_channel_files(struct kobject *kobj, int chan)</div><div class='add'>+{</div><div class='add'>+	int err=-ENODEV;</div><div class='add'>+</div><div class='add'>+	if (chan &gt;= EDAC_NR_CHANNELS)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* create the DIMM label attribute file */</div><div class='add'>+	err = sysfs_create_file(kobj,</div><div class='add'>+			(struct attribute *) dynamic_csrow_dimm_attr[chan]);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		/* create the CE Count attribute file */</div><div class='add'>+		err = sysfs_create_file(kobj,</div><div class='add'>+			(struct attribute *) dynamic_csrow_ce_count_attr[chan]);</div><div class='add'>+	} else {</div><div class='add'>+		debugf1("%s()  dimm labels and ce_count files created", __func__);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No memory to release for this kobj */</div><div class='ctx'> static void edac_csrow_instance_release(struct kobject *kobj)</div><div class='ctx'> {</div><div class='ctx'> 	struct csrow_info *cs;</div><div class='ctx'> </div><div class='del'>-	debugf1("%s()\n", __func__);</div><div class='ctx'> 	cs = container_of(kobj, struct csrow_info, kobj);</div><div class='ctx'> 	complete(&amp;cs-&gt;kobj_complete);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* the kobj_type instance for a CSROW */</div><div class='ctx'> static struct kobj_type ktype_csrow = {</div><div class='ctx'> 	.release = edac_csrow_instance_release,</div><div class='ctx'> 	.sysfs_ops = &amp;csrowfs_ops,</div><div class='del'>-	.default_attrs = (struct attribute **) csrow_attr,</div><div class='add'>+	.default_attrs = (struct attribute **) default_csrow_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Create a CSROW object under specifed edac_mc_device */</div><div class='del'>-static int edac_create_csrow_object(struct kobject *edac_mci_kobj,</div><div class='del'>-		struct csrow_info *csrow, int index)</div><div class='add'>+static int edac_create_csrow_object(</div><div class='add'>+		struct kobject *edac_mci_kobj,</div><div class='add'>+		struct csrow_info *csrow,</div><div class='add'>+		int index)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	int chan;</div><div class='ctx'> </div><div class='del'>-	debugf0("%s()\n", __func__);</div><div class='ctx'> 	memset(&amp;csrow-&gt;kobj, 0, sizeof(csrow-&gt;kobj));</div><div class='ctx'> </div><div class='ctx'> 	/* generate ..../edac/mc/mc&lt;id&gt;/csrow&lt;index&gt;   */</div><div class='hunk'>@@ -844,21 +871,27 @@ static int edac_create_csrow_object(struct kobject *edac_mci_kobj,</div><div class='ctx'> </div><div class='ctx'> 	/* name this instance of csrow&lt;id&gt; */</div><div class='ctx'> 	err = kobject_set_name(&amp;csrow-&gt;kobj,"csrow%d",index);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_exit;</div><div class='ctx'> </div><div class='add'>+	/* Instanstiate the csrow object */</div><div class='add'>+	err = kobject_register(&amp;csrow-&gt;kobj);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		/* Instanstiate the csrow object */</div><div class='del'>-		err = kobject_register(&amp;csrow-&gt;kobj);</div><div class='del'>-</div><div class='del'>-		if (err)</div><div class='del'>-			debugf0("Failed to register CSROW%d\n",index);</div><div class='del'>-		else</div><div class='del'>-			debugf0("Registered CSROW%d\n",index);</div><div class='add'>+		/* Create the dyanmic attribute files on this csrow,</div><div class='add'>+		 * namely, the DIMM labels and the channel ce_count</div><div class='add'>+		 */</div><div class='add'>+		for (chan = 0; chan &lt; csrow-&gt;nr_channels; chan++) {</div><div class='add'>+			err = edac_create_channel_files(&amp;csrow-&gt;kobj,chan);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+error_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* sysfs data structures and methods for the MCI kobjects */</div><div class='add'>+/* default sysfs methods and data structures for the main MCI kobject */</div><div class='ctx'> </div><div class='ctx'> static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,</div><div class='ctx'> 		const char *data, size_t count)</div><div class='hunk'>@@ -884,6 +917,7 @@ static ssize_t mci_reset_counters_store(struct mem_ctl_info *mci,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* default attribute files for the MCI object */</div><div class='ctx'> static ssize_t mci_ue_count_show(struct mem_ctl_info *mci, char *data)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(data,"%d\n", mci-&gt;ue_count);</div><div class='hunk'>@@ -909,71 +943,11 @@ static ssize_t mci_seconds_show(struct mem_ctl_info *mci, char *data)</div><div class='ctx'> 	return sprintf(data,"%ld\n", (jiffies - mci-&gt;start_time) / HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t mci_mod_name_show(struct mem_ctl_info *mci, char *data)</div><div class='del'>-{</div><div class='del'>-	return sprintf(data,"%s %s\n", mci-&gt;mod_name, mci-&gt;mod_ver);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t mci_ctl_name_show(struct mem_ctl_info *mci, char *data)</div><div class='ctx'> {</div><div class='ctx'> 	return sprintf(data,"%s\n", mci-&gt;ctl_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mci_output_edac_cap(char *buf, unsigned long edac_cap)</div><div class='del'>-{</div><div class='del'>-	char *p = buf;</div><div class='del'>-	int bit_idx;</div><div class='del'>-</div><div class='del'>-	for (bit_idx = 0; bit_idx &lt; 8 * sizeof(edac_cap); bit_idx++) {</div><div class='del'>-		if ((edac_cap &gt;&gt; bit_idx) &amp; 0x1)</div><div class='del'>-			p += sprintf(p, "%s ", edac_caps[bit_idx]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return p - buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t mci_edac_capability_show(struct mem_ctl_info *mci, char *data)</div><div class='del'>-{</div><div class='del'>-	char *p = data;</div><div class='del'>-</div><div class='del'>-	p += mci_output_edac_cap(p,mci-&gt;edac_ctl_cap);</div><div class='del'>-	p += sprintf(p, "\n");</div><div class='del'>-	return p - data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t mci_edac_current_capability_show(struct mem_ctl_info *mci,</div><div class='del'>-		char *data)</div><div class='del'>-{</div><div class='del'>-	char *p = data;</div><div class='del'>-</div><div class='del'>-	p += mci_output_edac_cap(p,mci-&gt;edac_cap);</div><div class='del'>-	p += sprintf(p, "\n");</div><div class='del'>-	return p - data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mci_output_mtype_cap(char *buf, unsigned long mtype_cap)</div><div class='del'>-{</div><div class='del'>-	char *p = buf;</div><div class='del'>-	int bit_idx;</div><div class='del'>-</div><div class='del'>-	for (bit_idx = 0; bit_idx &lt; 8 * sizeof(mtype_cap); bit_idx++) {</div><div class='del'>-		if ((mtype_cap &gt;&gt; bit_idx) &amp; 0x1)</div><div class='del'>-			p += sprintf(p, "%s ", mem_types[bit_idx]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return p - buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t mci_supported_mem_type_show(struct mem_ctl_info *mci,</div><div class='del'>-		char *data)</div><div class='del'>-{</div><div class='del'>-	char *p = data;</div><div class='del'>-</div><div class='del'>-	p += mci_output_mtype_cap(p,mci-&gt;mtype_cap);</div><div class='del'>-	p += sprintf(p, "\n");</div><div class='del'>-	return p - data;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data)</div><div class='ctx'> {</div><div class='ctx'> 	int total_pages, csrow_idx;</div><div class='hunk'>@@ -1000,6 +974,7 @@ struct mcidev_attribute {</div><div class='ctx'> #define to_mci(k) container_of(k, struct mem_ctl_info, edac_mci_kobj)</div><div class='ctx'> #define to_mcidev_attr(a) container_of(a, struct mcidev_attribute, attr)</div><div class='ctx'> </div><div class='add'>+/* MCI show/store functions for top most object */</div><div class='ctx'> static ssize_t mcidev_show(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> 		char *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -1036,31 +1011,21 @@ struct mcidev_attribute mci_attr_##_name = {			\</div><div class='ctx'> 	.store  = _store,					\</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Control file */</div><div class='add'>+/* default Control file */</div><div class='ctx'> MCIDEV_ATTR(reset_counters,S_IWUSR,NULL,mci_reset_counters_store);</div><div class='ctx'> </div><div class='del'>-/* Attribute files */</div><div class='add'>+/* default Attribute files */</div><div class='ctx'> MCIDEV_ATTR(mc_name,S_IRUGO,mci_ctl_name_show,NULL);</div><div class='del'>-MCIDEV_ATTR(module_name,S_IRUGO,mci_mod_name_show,NULL);</div><div class='del'>-MCIDEV_ATTR(edac_capability,S_IRUGO,mci_edac_capability_show,NULL);</div><div class='ctx'> MCIDEV_ATTR(size_mb,S_IRUGO,mci_size_mb_show,NULL);</div><div class='ctx'> MCIDEV_ATTR(seconds_since_reset,S_IRUGO,mci_seconds_show,NULL);</div><div class='ctx'> MCIDEV_ATTR(ue_noinfo_count,S_IRUGO,mci_ue_noinfo_show,NULL);</div><div class='ctx'> MCIDEV_ATTR(ce_noinfo_count,S_IRUGO,mci_ce_noinfo_show,NULL);</div><div class='ctx'> MCIDEV_ATTR(ue_count,S_IRUGO,mci_ue_count_show,NULL);</div><div class='ctx'> MCIDEV_ATTR(ce_count,S_IRUGO,mci_ce_count_show,NULL);</div><div class='del'>-MCIDEV_ATTR(edac_current_capability,S_IRUGO,</div><div class='del'>-	mci_edac_current_capability_show,NULL);</div><div class='del'>-MCIDEV_ATTR(supported_mem_type,S_IRUGO,</div><div class='del'>-	mci_supported_mem_type_show,NULL);</div><div class='ctx'> </div><div class='ctx'> static struct mcidev_attribute *mci_attr[] = {</div><div class='ctx'> 	&amp;mci_attr_reset_counters,</div><div class='del'>-	&amp;mci_attr_module_name,</div><div class='ctx'> 	&amp;mci_attr_mc_name,</div><div class='del'>-	&amp;mci_attr_edac_capability,</div><div class='del'>-	&amp;mci_attr_edac_current_capability,</div><div class='del'>-	&amp;mci_attr_supported_mem_type,</div><div class='ctx'> 	&amp;mci_attr_size_mb,</div><div class='ctx'> 	&amp;mci_attr_seconds_since_reset,</div><div class='ctx'> 	&amp;mci_attr_ue_noinfo_count,</div><div class='hunk'>@@ -1088,7 +1053,6 @@ static struct kobj_type ktype_mci = {</div><div class='ctx'> 	.default_attrs = (struct attribute **) mci_attr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='ctx'> </div><div class='ctx'> #define EDAC_DEVICE_SYMLINK	"device"</div><div class='ctx'> </div><div class='hunk'>@@ -1101,11 +1065,6 @@ static struct kobj_type ktype_mci = {</div><div class='ctx'>  *	!0	Failure</div><div class='ctx'>  */</div><div class='ctx'> static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='del'>-#ifdef DISABLE_EDAC_SYSFS</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1117,7 +1076,6 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='ctx'> </div><div class='ctx'> 	/* set the name of the mc&lt;id&gt; object */</div><div class='ctx'> 	err = kobject_set_name(edac_mci_kobj,"mc%d",mci-&gt;mc_idx);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,14 +1085,12 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='ctx'> </div><div class='ctx'> 	/* register the mc&lt;id&gt; kobject */</div><div class='ctx'> 	err = kobject_register(edac_mci_kobj);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* create a symlink for the device */</div><div class='del'>-	err = sysfs_create_link(edac_mci_kobj, &amp;mci-&gt;pdev-&gt;dev.kobj,</div><div class='add'>+	err = sysfs_create_link(edac_mci_kobj, &amp;mci-&gt;dev-&gt;kobj,</div><div class='ctx'> 				EDAC_DEVICE_SYMLINK);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto fail0;</div><div class='ctx'> </div><div class='hunk'>@@ -1147,7 +1103,6 @@ static int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='ctx'> 		/* Only expose populated CSROWs */</div><div class='ctx'> 		if (csrow-&gt;nr_pages &gt; 0) {</div><div class='ctx'> 			err = edac_create_csrow_object(edac_mci_kobj,csrow,i);</div><div class='del'>-</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				goto fail1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1171,14 +1126,12 @@ fail0:</div><div class='ctx'> 	wait_for_completion(&amp;mci-&gt;kobj_complete);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * remove a Memory Controller instance</div><div class='ctx'>  */</div><div class='ctx'> static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='ctx'> {</div><div class='del'>-#ifndef DISABLE_EDAC_SYSFS</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='hunk'>@@ -1196,7 +1149,6 @@ static void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)</div><div class='ctx'> 	init_completion(&amp;mci-&gt;kobj_complete);</div><div class='ctx'> 	kobject_unregister(&amp;mci-&gt;edac_mci_kobj);</div><div class='ctx'> 	wait_for_completion(&amp;mci-&gt;kobj_complete);</div><div class='del'>-#endif  /* DISABLE_EDAC_SYSFS */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* END OF sysfs data and methods */</div><div class='hunk'>@@ -1238,7 +1190,7 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci)</div><div class='ctx'> 	debugf4("\tmci-&gt;edac_check = %p\n", mci-&gt;edac_check);</div><div class='ctx'> 	debugf3("\tmci-&gt;nr_csrows = %d, csrows = %p\n",</div><div class='ctx'> 		mci-&gt;nr_csrows, mci-&gt;csrows);</div><div class='del'>-	debugf3("\tpdev = %p\n", mci-&gt;pdev);</div><div class='add'>+	debugf3("\tdev = %p\n", mci-&gt;dev);</div><div class='ctx'> 	debugf3("\tmod_name:ctl_name = %s:%s\n",</div><div class='ctx'> 		mci-&gt;mod_name, mci-&gt;ctl_name);</div><div class='ctx'> 	debugf3("\tpvt_info = %p\n\n", mci-&gt;pvt_info);</div><div class='hunk'>@@ -1363,7 +1315,7 @@ void edac_mc_free(struct mem_ctl_info *mci)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(edac_mc_free);</div><div class='ctx'> </div><div class='del'>-static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev)</div><div class='add'>+static struct mem_ctl_info *find_mci_by_dev(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_ctl_info *mci;</div><div class='ctx'> 	struct list_head *item;</div><div class='hunk'>@@ -1373,54 +1325,53 @@ static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev)</div><div class='ctx'> 	list_for_each(item, &amp;mc_devices) {</div><div class='ctx'> 		mci = list_entry(item, struct mem_ctl_info, link);</div><div class='ctx'> </div><div class='del'>-		if (mci-&gt;pdev == pdev)</div><div class='add'>+		if (mci-&gt;dev == dev)</div><div class='ctx'> 			return mci;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int add_mc_to_global_list(struct mem_ctl_info *mci)</div><div class='add'>+/* Return 0 on success, 1 on failure.</div><div class='add'>+ * Before calling this function, caller must</div><div class='add'>+ * assign a unique value to mci-&gt;mc_idx.</div><div class='add'>+ */</div><div class='add'>+static int add_mc_to_global_list (struct mem_ctl_info *mci)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *item, *insert_before;</div><div class='ctx'> 	struct mem_ctl_info *p;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;mc_devices)) {</div><div class='del'>-		mci-&gt;mc_idx = 0;</div><div class='del'>-		insert_before = &amp;mc_devices;</div><div class='del'>-	} else {</div><div class='del'>-		if (find_mci_by_pdev(mci-&gt;pdev)) {</div><div class='del'>-			edac_printk(KERN_WARNING, EDAC_MC,</div><div class='del'>-				"%s (%s) %s %s already assigned %d\n",</div><div class='del'>-				mci-&gt;pdev-&gt;dev.bus_id,</div><div class='del'>-				pci_name(mci-&gt;pdev), mci-&gt;mod_name,</div><div class='del'>-				mci-&gt;ctl_name, mci-&gt;mc_idx);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='add'>+	insert_before = &amp;mc_devices;</div><div class='ctx'> </div><div class='del'>-		insert_before = NULL;</div><div class='del'>-		i = 0;</div><div class='add'>+	if (unlikely((p = find_mci_by_dev(mci-&gt;dev)) != NULL))</div><div class='add'>+		goto fail0;</div><div class='ctx'> </div><div class='del'>-		list_for_each(item, &amp;mc_devices) {</div><div class='del'>-			p = list_entry(item, struct mem_ctl_info, link);</div><div class='add'>+	list_for_each(item, &amp;mc_devices) {</div><div class='add'>+		p = list_entry(item, struct mem_ctl_info, link);</div><div class='ctx'> </div><div class='del'>-			if (p-&gt;mc_idx != i) {</div><div class='del'>-				insert_before = item;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+		if (p-&gt;mc_idx &gt;= mci-&gt;mc_idx) {</div><div class='add'>+			if (unlikely(p-&gt;mc_idx == mci-&gt;mc_idx))</div><div class='add'>+				goto fail1;</div><div class='ctx'> </div><div class='del'>-			i++;</div><div class='add'>+			insert_before = item;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		mci-&gt;mc_idx = i;</div><div class='del'>-</div><div class='del'>-		if (insert_before == NULL)</div><div class='del'>-			insert_before = &amp;mc_devices;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail_rcu(&amp;mci-&gt;link, insert_before);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+fail0:</div><div class='add'>+	edac_printk(KERN_WARNING, EDAC_MC,</div><div class='add'>+		    "%s (%s) %s %s already assigned %d\n", p-&gt;dev-&gt;bus_id,</div><div class='add'>+		    dev_name(p-&gt;dev), p-&gt;mod_name, p-&gt;ctl_name, p-&gt;mc_idx);</div><div class='add'>+	return 1;</div><div class='add'>+</div><div class='add'>+fail1:</div><div class='add'>+	edac_printk(KERN_WARNING, EDAC_MC,</div><div class='add'>+		    "bug in low-level driver: attempt to assign\n"</div><div class='add'>+		    "    duplicate mc_idx %d in %s()\n", p-&gt;mc_idx, __func__);</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void complete_mc_list_del(struct rcu_head *head)</div><div class='hunk'>@@ -1444,6 +1395,7 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci)</div><div class='ctx'>  * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and</div><div class='ctx'>  *                 create sysfs entries associated with mci structure</div><div class='ctx'>  * @mci: pointer to the mci structure to be added to the list</div><div class='add'>+ * @mc_idx: A unique numeric identifier to be assigned to the 'mci' structure.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:</div><div class='ctx'>  *	0	Success</div><div class='hunk'>@@ -1451,9 +1403,10 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* FIXME - should a warning be printed if no error detection? correction? */</div><div class='del'>-int edac_mc_add_mc(struct mem_ctl_info *mci)</div><div class='add'>+int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)</div><div class='ctx'> {</div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='add'>+	mci-&gt;mc_idx = mc_idx;</div><div class='ctx'> #ifdef CONFIG_EDAC_DEBUG</div><div class='ctx'> 	if (edac_debug_level &gt;= 3)</div><div class='ctx'> 		edac_mc_dump_mci(mci);</div><div class='hunk'>@@ -1486,8 +1439,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'> 	/* Report action taken */</div><div class='del'>-	edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: PCI %s\n",</div><div class='del'>-		mci-&gt;mod_name, mci-&gt;ctl_name, pci_name(mci-&gt;pdev));</div><div class='add'>+	edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n",</div><div class='add'>+		mci-&gt;mod_name, mci-&gt;ctl_name, dev_name(mci-&gt;dev));</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;mem_ctls_mutex);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1504,18 +1457,18 @@ EXPORT_SYMBOL_GPL(edac_mc_add_mc);</div><div class='ctx'> /**</div><div class='ctx'>  * edac_mc_del_mc: Remove sysfs entries for specified mci structure and</div><div class='ctx'>  *                 remove mci structure from global list</div><div class='del'>- * @pdev: Pointer to 'struct pci_dev' representing mci structure to remove.</div><div class='add'>+ * @pdev: Pointer to 'struct device' representing mci structure to remove.</div><div class='ctx'>  *</div><div class='ctx'>  * Return pointer to removed mci structure, or NULL if device not found.</div><div class='ctx'>  */</div><div class='del'>-struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev)</div><div class='add'>+struct mem_ctl_info * edac_mc_del_mc(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mem_ctl_info *mci;</div><div class='ctx'> </div><div class='ctx'> 	debugf0("MC: %s()\n", __func__);</div><div class='ctx'> 	down(&amp;mem_ctls_mutex);</div><div class='ctx'> </div><div class='del'>-	if ((mci = find_mci_by_pdev(pdev)) == NULL) {</div><div class='add'>+	if ((mci = find_mci_by_dev(dev)) == NULL) {</div><div class='ctx'> 		up(&amp;mem_ctls_mutex);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1524,8 +1477,8 @@ struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev)</div><div class='ctx'> 	del_mc_from_global_list(mci);</div><div class='ctx'> 	up(&amp;mem_ctls_mutex);</div><div class='ctx'> 	edac_printk(KERN_INFO, EDAC_MC,</div><div class='del'>-		"Removed device %d for %s %s: PCI %s\n", mci-&gt;mc_idx,</div><div class='del'>-		mci-&gt;mod_name, mci-&gt;ctl_name, pci_name(mci-&gt;pdev));</div><div class='add'>+		"Removed device %d for %s %s: DEV %s\n", mci-&gt;mc_idx,</div><div class='add'>+		mci-&gt;mod_name, mci-&gt;ctl_name, dev_name(mci-&gt;dev));</div><div class='ctx'> 	return mci;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(edac_mc_del_mc);</div><div class='hunk'>@@ -1739,244 +1692,6 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-</div><div class='del'>-static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)</div><div class='del'>-{</div><div class='del'>-	int where;</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	where = secondary ? PCI_SEC_STATUS : PCI_STATUS;</div><div class='del'>-	pci_read_config_word(dev, where, &amp;status);</div><div class='del'>-</div><div class='del'>-	/* If we get back 0xFFFF then we must suspect that the card has been</div><div class='del'>-	 * pulled but the Linux PCI layer has not yet finished cleaning up.</div><div class='del'>-	 * We don't want to report on such devices</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (status == 0xFFFF) {</div><div class='del'>-		u32 sanity;</div><div class='del'>-</div><div class='del'>-		pci_read_config_dword(dev, 0, &amp;sanity);</div><div class='del'>-</div><div class='del'>-		if (sanity == 0xFFFFFFFF)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status &amp;= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR |</div><div class='del'>-		PCI_STATUS_PARITY;</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		/* reset only the bits we are interested in */</div><div class='del'>-		pci_write_config_word(dev, where, status);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev);</div><div class='del'>-</div><div class='del'>-/* Clear any PCI parity errors logged by this device. */</div><div class='del'>-static void edac_pci_dev_parity_clear(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u8 header_type;</div><div class='del'>-</div><div class='del'>-	get_pci_parity_status(dev, 0);</div><div class='del'>-</div><div class='del'>-	/* read the device TYPE, looking for bridges */</div><div class='del'>-	pci_read_config_byte(dev, PCI_HEADER_TYPE, &amp;header_type);</div><div class='del'>-</div><div class='del'>-	if ((header_type &amp; 0x7F) == PCI_HEADER_TYPE_BRIDGE)</div><div class='del'>-		get_pci_parity_status(dev, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  PCI Parity polling</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void edac_pci_dev_parity_test(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	u16 status;</div><div class='del'>-	u8  header_type;</div><div class='del'>-</div><div class='del'>-	/* read the STATUS register on this device</div><div class='del'>-	 */</div><div class='del'>-	status = get_pci_parity_status(dev, 0);</div><div class='del'>-</div><div class='del'>-	debugf2("PCI STATUS= 0x%04x %s\n", status, dev-&gt;dev.bus_id );</div><div class='del'>-</div><div class='del'>-	/* check the status reg for errors */</div><div class='del'>-	if (status) {</div><div class='del'>-		if (status &amp; (PCI_STATUS_SIG_SYSTEM_ERROR))</div><div class='del'>-			edac_printk(KERN_CRIT, EDAC_PCI,</div><div class='del'>-				"Signaled System Error on %s\n",</div><div class='del'>-				pci_name(dev));</div><div class='del'>-</div><div class='del'>-		if (status &amp; (PCI_STATUS_PARITY)) {</div><div class='del'>-			edac_printk(KERN_CRIT, EDAC_PCI,</div><div class='del'>-				"Master Data Parity Error on %s\n",</div><div class='del'>-				pci_name(dev));</div><div class='del'>-</div><div class='del'>-			atomic_inc(&amp;pci_parity_count);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (status &amp; (PCI_STATUS_DETECTED_PARITY)) {</div><div class='del'>-			edac_printk(KERN_CRIT, EDAC_PCI,</div><div class='del'>-				"Detected Parity Error on %s\n",</div><div class='del'>-				pci_name(dev));</div><div class='del'>-</div><div class='del'>-			atomic_inc(&amp;pci_parity_count);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read the device TYPE, looking for bridges */</div><div class='del'>-	pci_read_config_byte(dev, PCI_HEADER_TYPE, &amp;header_type);</div><div class='del'>-</div><div class='del'>-	debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev-&gt;dev.bus_id );</div><div class='del'>-</div><div class='del'>-	if ((header_type &amp; 0x7F) == PCI_HEADER_TYPE_BRIDGE) {</div><div class='del'>-		/* On bridges, need to examine secondary status register  */</div><div class='del'>-		status = get_pci_parity_status(dev, 1);</div><div class='del'>-</div><div class='del'>-		debugf2("PCI SEC_STATUS= 0x%04x %s\n",</div><div class='del'>-				status, dev-&gt;dev.bus_id );</div><div class='del'>-</div><div class='del'>-		/* check the secondary status reg for errors */</div><div class='del'>-		if (status) {</div><div class='del'>-			if (status &amp; (PCI_STATUS_SIG_SYSTEM_ERROR))</div><div class='del'>-				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "</div><div class='del'>-					"Signaled System Error on %s\n",</div><div class='del'>-					pci_name(dev));</div><div class='del'>-</div><div class='del'>-			if (status &amp; (PCI_STATUS_PARITY)) {</div><div class='del'>-				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "</div><div class='del'>-					"Master Data Parity Error on "</div><div class='del'>-					"%s\n", pci_name(dev));</div><div class='del'>-</div><div class='del'>-				atomic_inc(&amp;pci_parity_count);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (status &amp; (PCI_STATUS_DETECTED_PARITY)) {</div><div class='del'>-				edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "</div><div class='del'>-					"Detected Parity Error on %s\n",</div><div class='del'>-					pci_name(dev));</div><div class='del'>-</div><div class='del'>-				atomic_inc(&amp;pci_parity_count);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * check_dev_on_list: Scan for a PCI device on a white/black list</div><div class='del'>- * @list:	an EDAC  &amp;edac_pci_device_list  white/black list pointer</div><div class='del'>- * @free_index:	index of next free entry on the list</div><div class='del'>- * @pci_dev:	PCI Device pointer</div><div class='del'>- *</div><div class='del'>- * see if list contains the device.</div><div class='del'>- *</div><div class='del'>- * Returns:  	0 not found</div><div class='del'>- *		1 found on list</div><div class='del'>- */</div><div class='del'>-static int check_dev_on_list(struct edac_pci_device_list *list,</div><div class='del'>-		int free_index, struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int rc = 0;     /* Assume not found */</div><div class='del'>-	unsigned short vendor=dev-&gt;vendor;</div><div class='del'>-	unsigned short device=dev-&gt;device;</div><div class='del'>-</div><div class='del'>-	/* Scan the list, looking for a vendor/device match */</div><div class='del'>-	for (i = 0; i &lt; free_index; i++, list++ ) {</div><div class='del'>-		if ((list-&gt;vendor == vendor ) &amp;&amp; (list-&gt;device == device )) {</div><div class='del'>-			rc = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pci_dev parity list iterator</div><div class='del'>- *	Scan the PCI device list for one iteration, looking for SERRORs</div><div class='del'>- *	Master Parity ERRORS or Parity ERRORs on primary or secondary devices</div><div class='del'>- */</div><div class='del'>-static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *dev = NULL;</div><div class='del'>-</div><div class='del'>-	/* request for kernel access to the next PCI device, if any,</div><div class='del'>-	 * and while we are looking at it have its reference count</div><div class='del'>-	 * bumped until we are done with it</div><div class='del'>-	 */</div><div class='del'>-	while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {</div><div class='del'>-		/* if whitelist exists then it has priority, so only scan</div><div class='del'>-		 * those devices on the whitelist</div><div class='del'>-		 */</div><div class='del'>-		if (pci_whitelist_count &gt; 0 ) {</div><div class='del'>-			if (check_dev_on_list(pci_whitelist,</div><div class='del'>-					pci_whitelist_count, dev))</div><div class='del'>-				fn(dev);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * if no whitelist, then check if this devices is</div><div class='del'>-			 * blacklisted</div><div class='del'>-			 */</div><div class='del'>-			if (!check_dev_on_list(pci_blacklist,</div><div class='del'>-					pci_blacklist_count, dev))</div><div class='del'>-				fn(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void do_pci_parity_check(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int before_count;</div><div class='del'>-</div><div class='del'>-	debugf3("%s()\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (!check_pci_parity)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	before_count = atomic_read(&amp;pci_parity_count);</div><div class='del'>-</div><div class='del'>-	/* scan all PCI devices looking for a Parity Error on devices and</div><div class='del'>-	 * bridges</div><div class='del'>-	 */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	edac_pci_dev_parity_iterator(edac_pci_dev_parity_test);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-</div><div class='del'>-	/* Only if operator has selected panic on PCI Error */</div><div class='del'>-	if (panic_on_pci_parity) {</div><div class='del'>-		/* If the count is different 'after' from 'before' */</div><div class='del'>-		if (before_count != atomic_read(&amp;pci_parity_count))</div><div class='del'>-			panic("EDAC: PCI Parity Error");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void clear_pci_parity_errors(void)</div><div class='del'>-{</div><div class='del'>-	/* Clear any PCI bus parity errors that devices initially have logged</div><div class='del'>-	 * in their registers.</div><div class='del'>-	 */</div><div class='del'>-	edac_pci_dev_parity_iterator(edac_pci_dev_parity_clear);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else  /* CONFIG_PCI */</div><div class='del'>-</div><div class='del'>-static inline void do_pci_parity_check(void)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void clear_pci_parity_errors(void)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif  /* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Iterate over all MC instances and check for ECC, et al, errors</div><div class='hunk'>@@ -2096,10 +1811,12 @@ MODULE_DESCRIPTION("Core library routines for MC reporting");</div><div class='ctx'> </div><div class='ctx'> module_param(panic_on_ue, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(panic_on_ue, "Panic on uncorrected error: 0=off 1=on");</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='ctx'> module_param(check_pci_parity, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(check_pci_parity, "Check for PCI bus parity errors: 0=off 1=on");</div><div class='ctx'> module_param(panic_on_pci_parity, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(panic_on_pci_parity, "Panic on PCI Bus Parity error: 0=off 1=on");</div><div class='add'>+#endif</div><div class='ctx'> module_param(log_ue, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(log_ue, "Log uncorrectable error to console: 0=off 1=on");</div><div class='ctx'> module_param(log_ce, int, 0644);</div><div class='head'>diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h<br/>index 8d9e83909b9c..bf6ab8a8d5ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/edac_mc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/edac_mc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/edac_mc.h</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #ifndef _EDAC_MC_H_</div><div class='ctx'> #define _EDAC_MC_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -79,15 +78,17 @@ extern int edac_debug_level;</div><div class='ctx'> </div><div class='ctx'> #endif  /* !CONFIG_EDAC_DEBUG */</div><div class='ctx'> </div><div class='del'>-#define edac_xstr(s) edac_str(s)</div><div class='del'>-#define edac_str(s) #s</div><div class='del'>-#define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME)</div><div class='del'>-</div><div class='ctx'> #define BIT(x) (1 &lt;&lt; (x))</div><div class='ctx'> </div><div class='ctx'> #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \</div><div class='ctx'> 	PCI_DEVICE_ID_ ## vend ## _ ## dev</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_X86) &amp;&amp; defined(CONFIG_PCI)</div><div class='add'>+#define dev_name(dev) pci_name(to_pci_dev(dev))</div><div class='add'>+#else</div><div class='add'>+#define dev_name(dev) to_platform_device(dev)-&gt;name</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* memory devices */</div><div class='ctx'> enum dev_type {</div><div class='ctx'> 	DEV_UNKNOWN = 0,</div><div class='hunk'>@@ -327,10 +328,10 @@ struct mem_ctl_info {</div><div class='ctx'> 	struct csrow_info *csrows;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * FIXME - what about controllers on other busses? - IDs must be</div><div class='del'>-	 * unique.  pdev pointer should be sufficiently unique, but</div><div class='add'>+	 * unique.  dev pointer should be sufficiently unique, but</div><div class='ctx'> 	 * BUS:SLOT.FUNC numbers may not be unique.</div><div class='ctx'> 	 */</div><div class='del'>-	struct pci_dev *pdev;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	const char *mod_name;</div><div class='ctx'> 	const char *mod_ver;</div><div class='ctx'> 	const char *ctl_name;</div><div class='hunk'>@@ -353,6 +354,8 @@ struct mem_ctl_info {</div><div class='ctx'> 	struct completion kobj_complete;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+</div><div class='ctx'> /* write all or some bits in a byte-register*/</div><div class='ctx'> static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value,</div><div class='ctx'> 		u8 mask)</div><div class='hunk'>@@ -401,14 +404,16 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset,</div><div class='ctx'> 	pci_write_config_dword(pdev, offset, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_PCI */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_EDAC_DEBUG</div><div class='ctx'> void edac_mc_dump_channel(struct channel_info *chan);</div><div class='ctx'> void edac_mc_dump_mci(struct mem_ctl_info *mci);</div><div class='ctx'> void edac_mc_dump_csrow(struct csrow_info *csrow);</div><div class='ctx'> #endif  /* CONFIG_EDAC_DEBUG */</div><div class='ctx'> </div><div class='del'>-extern int edac_mc_add_mc(struct mem_ctl_info *mci);</div><div class='del'>-extern struct mem_ctl_info * edac_mc_del_mc(struct pci_dev *pdev);</div><div class='add'>+extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx);</div><div class='add'>+extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev);</div><div class='ctx'> extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,</div><div class='ctx'> 					unsigned long page);</div><div class='ctx'> extern void edac_mc_scrub_block(unsigned long page, unsigned long offset,</div><div class='head'>diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c<br/>index fd342163cf97..e4bb298e613f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/i82860_edac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/i82860_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/i82860_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/i82860_edac.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * by Thayne Harbaugh of Linux Networx. (http://lnxi.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -17,6 +16,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='add'>+#define  I82860_REVISION " Ver: 2.0.1 " __DATE__</div><div class='add'>+#define EDAC_MOD_STR	"i82860_edac"</div><div class='add'>+</div><div class='ctx'> #define i82860_printk(level, fmt, arg...) \</div><div class='ctx'> 	edac_printk(level, "i82860", fmt, ##arg)</div><div class='ctx'> </div><div class='hunk'>@@ -63,17 +65,21 @@ static struct pci_dev *mci_pdev = NULL;	/* init dev: in case that AGP code</div><div class='ctx'> static void i82860_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		struct i82860_error_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	pdev = to_pci_dev(mci-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a mess because there is no atomic way to read all the</div><div class='ctx'> 	 * registers at once and the registers can transition from CE being</div><div class='ctx'> 	 * overwritten by UE.</div><div class='ctx'> 	 */</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, I82860_ERRSTS, &amp;info-&gt;errsts);</div><div class='del'>-	pci_read_config_dword(mci-&gt;pdev, I82860_EAP, &amp;info-&gt;eap);</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, I82860_DERRCTL_STS, &amp;info-&gt;derrsyn);</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, I82860_ERRSTS, &amp;info-&gt;errsts2);</div><div class='add'>+	pci_read_config_word(pdev, I82860_ERRSTS, &amp;info-&gt;errsts);</div><div class='add'>+	pci_read_config_dword(pdev, I82860_EAP, &amp;info-&gt;eap);</div><div class='add'>+	pci_read_config_word(pdev, I82860_DERRCTL_STS, &amp;info-&gt;derrsyn);</div><div class='add'>+	pci_read_config_word(pdev, I82860_ERRSTS, &amp;info-&gt;errsts2);</div><div class='ctx'> </div><div class='del'>-	pci_write_bits16(mci-&gt;pdev, I82860_ERRSTS, 0x0003, 0x0003);</div><div class='add'>+	pci_write_bits16(pdev, I82860_ERRSTS, 0x0003, 0x0003);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the error is the same for both reads then the first set of reads</div><div class='hunk'>@@ -84,8 +90,8 @@ static void i82860_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if ((info-&gt;errsts ^ info-&gt;errsts2) &amp; 0x0003) {</div><div class='del'>-		pci_read_config_dword(mci-&gt;pdev, I82860_EAP, &amp;info-&gt;eap);</div><div class='del'>-		pci_read_config_word(mci-&gt;pdev, I82860_DERRCTL_STS,</div><div class='add'>+		pci_read_config_dword(pdev, I82860_EAP, &amp;info-&gt;eap);</div><div class='add'>+		pci_read_config_word(pdev, I82860_DERRCTL_STS,</div><div class='ctx'> 				&amp;info-&gt;derrsyn);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -127,15 +133,50 @@ static void i82860_check(struct mem_ctl_info *mci)</div><div class='ctx'> 	i82860_process_error_info(mci, &amp;info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int i82860_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	int rc = -ENODEV;</div><div class='del'>-	int index;</div><div class='del'>-	struct mem_ctl_info *mci = NULL;</div><div class='ctx'> 	unsigned long last_cumul_size;</div><div class='del'>-	struct i82860_error_info discard;</div><div class='add'>+	u16 mchcfg_ddim;  /* DRAM Data Integrity Mode 0=none, 2=edac */</div><div class='add'>+	u16 value;</div><div class='add'>+	u32 cumul_size;</div><div class='add'>+	struct csrow_info *csrow;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, I82860_MCHCFG, &amp;mchcfg_ddim);</div><div class='add'>+	mchcfg_ddim = mchcfg_ddim &amp; 0x180;</div><div class='add'>+	last_cumul_size = 0;</div><div class='add'>+</div><div class='add'>+	/* The group row boundary (GRA) reg values are boundary address</div><div class='add'>+	 * for each DRAM row with a granularity of 16MB.  GRA regs are</div><div class='add'>+	 * cumulative; therefore GRA15 will contain the total memory contained</div><div class='add'>+	 * in all eight rows.</div><div class='add'>+	 */</div><div class='add'>+	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='add'>+		csrow = &amp;mci-&gt;csrows[index];</div><div class='add'>+		pci_read_config_word(pdev, I82860_GBA + index * 2, &amp;value);</div><div class='add'>+		cumul_size = (value &amp; I82860_GBA_MASK) &lt;&lt;</div><div class='add'>+		    (I82860_GBA_SHIFT - PAGE_SHIFT);</div><div class='add'>+		debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,</div><div class='add'>+			cumul_size);</div><div class='ctx'> </div><div class='del'>-	u16 mchcfg_ddim;	/* DRAM Data Integrity Mode 0=none,2=edac */</div><div class='add'>+		if (cumul_size == last_cumul_size)</div><div class='add'>+			continue;	/* not populated */</div><div class='add'>+</div><div class='add'>+		csrow-&gt;first_page = last_cumul_size;</div><div class='add'>+		csrow-&gt;last_page = cumul_size - 1;</div><div class='add'>+		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='add'>+		last_cumul_size = cumul_size;</div><div class='add'>+		csrow-&gt;grain = 1 &lt;&lt; 12;	/* I82860_EAP has 4KiB reolution */</div><div class='add'>+		csrow-&gt;mtype = MEM_RMBS;</div><div class='add'>+		csrow-&gt;dtype = DEV_UNKNOWN;</div><div class='add'>+		csrow-&gt;edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i82860_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+{</div><div class='add'>+	struct mem_ctl_info *mci;</div><div class='add'>+	struct i82860_error_info discard;</div><div class='ctx'> </div><div class='ctx'> 	/* RDRAM has channels but these don't map onto the abstractions that</div><div class='ctx'> 	   edac uses.</div><div class='hunk'>@@ -151,67 +192,35 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	debugf3("%s(): init mci\n", __func__);</div><div class='del'>-	mci-&gt;pdev = pdev;</div><div class='add'>+	mci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	mci-&gt;mtype_cap = MEM_FLAG_DDR;</div><div class='del'>-</div><div class='ctx'> 	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;</div><div class='ctx'> 	/* I"m not sure about this but I think that all RDRAM is SECDED */</div><div class='ctx'> 	mci-&gt;edac_cap = EDAC_FLAG_SECDED;</div><div class='del'>-	/* adjust FLAGS */</div><div class='del'>-</div><div class='ctx'> 	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='del'>-	mci-&gt;mod_ver = "$Revision: 1.1.2.6 $";</div><div class='add'>+	mci-&gt;mod_ver = I82860_REVISION;</div><div class='ctx'> 	mci-&gt;ctl_name = i82860_devs[dev_idx].ctl_name;</div><div class='ctx'> 	mci-&gt;edac_check = i82860_check;</div><div class='ctx'> 	mci-&gt;ctl_page_to_phys = NULL;</div><div class='add'>+	i82860_init_csrows(mci, pdev);</div><div class='add'>+	i82860_get_error_info(mci, &amp;discard);  /* clear counters */</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, I82860_MCHCFG, &amp;mchcfg_ddim);</div><div class='del'>-	mchcfg_ddim = mchcfg_ddim &amp; 0x180;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The group row boundary (GRA) reg values are boundary address</div><div class='del'>-	 * for each DRAM row with a granularity of 16MB.  GRA regs are</div><div class='del'>-	 * cumulative; therefore GRA15 will contain the total memory contained</div><div class='del'>-	 * in all eight rows.</div><div class='add'>+	/* Here we assume that we will never see multiple instances of this</div><div class='add'>+	 * type of memory controller.  The ID is therefore hardcoded to 0.</div><div class='ctx'> 	 */</div><div class='del'>-	for (last_cumul_size = index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='del'>-		u16 value;</div><div class='del'>-		u32 cumul_size;</div><div class='del'>-		struct csrow_info *csrow = &amp;mci-&gt;csrows[index];</div><div class='del'>-</div><div class='del'>-		pci_read_config_word(mci-&gt;pdev, I82860_GBA + index * 2,</div><div class='del'>-				&amp;value);</div><div class='del'>-</div><div class='del'>-		cumul_size = (value &amp; I82860_GBA_MASK) &lt;&lt;</div><div class='del'>-		    (I82860_GBA_SHIFT - PAGE_SHIFT);</div><div class='del'>-		debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,</div><div class='del'>-			cumul_size);</div><div class='del'>-</div><div class='del'>-		if (cumul_size == last_cumul_size)</div><div class='del'>-			continue;	/* not populated */</div><div class='del'>-</div><div class='del'>-		csrow-&gt;first_page = last_cumul_size;</div><div class='del'>-		csrow-&gt;last_page = cumul_size - 1;</div><div class='del'>-		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='del'>-		last_cumul_size = cumul_size;</div><div class='del'>-		csrow-&gt;grain = 1 &lt;&lt; 12;  /* I82860_EAP has 4KiB reolution */</div><div class='del'>-		csrow-&gt;mtype = MEM_RMBS;</div><div class='del'>-		csrow-&gt;dtype = DEV_UNKNOWN;</div><div class='del'>-		csrow-&gt;edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE;</div><div class='add'>+	if (edac_mc_add_mc(mci,0)) {</div><div class='add'>+		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i82860_get_error_info(mci, &amp;discard);  /* clear counters */</div><div class='add'>+	/* get this far and it's successful */</div><div class='add'>+	debugf3("%s(): success\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (edac_mc_add_mc(mci)) {</div><div class='del'>-		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='del'>-		edac_mc_free(mci);</div><div class='del'>-	} else {</div><div class='del'>-		/* get this far and it's successful */</div><div class='del'>-		debugf3("%s(): success\n", __func__);</div><div class='del'>-		rc = 0;</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+fail:</div><div class='add'>+	edac_mc_free(mci);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns count (&gt;= 0), or negative on error */</div><div class='hunk'>@@ -240,7 +249,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((mci = edac_mc_del_mc(pdev)) == NULL)</div><div class='add'>+	if ((mci = edac_mc_del_mc(&amp;pdev-&gt;dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	edac_mc_free(mci);</div><div class='head'>diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c<br/>index 0aec92698f17..161fe09a6d38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/i82875p_edac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/i82875p_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/i82875p_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/i82875p_edac.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Note: E7210 appears same as D82875P - zhenyu.z.wang at intel.com</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -21,6 +20,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='add'>+#define I82875P_REVISION	" Ver: 2.0.1 " __DATE__</div><div class='add'>+#define EDAC_MOD_STR		"i82875p_edac"</div><div class='add'>+</div><div class='ctx'> #define i82875p_printk(level, fmt, arg...) \</div><div class='ctx'> 	edac_printk(level, "i82875p", fmt, ##arg)</div><div class='ctx'> </div><div class='hunk'>@@ -185,18 +187,22 @@ static int i82875p_registered = 1;</div><div class='ctx'> static void i82875p_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		struct i82875p_error_info *info)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	pdev = to_pci_dev(mci-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is a mess because there is no atomic way to read all the</div><div class='ctx'> 	 * registers at once and the registers can transition from CE being</div><div class='ctx'> 	 * overwritten by UE.</div><div class='ctx'> 	 */</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, I82875P_ERRSTS, &amp;info-&gt;errsts);</div><div class='del'>-	pci_read_config_dword(mci-&gt;pdev, I82875P_EAP, &amp;info-&gt;eap);</div><div class='del'>-	pci_read_config_byte(mci-&gt;pdev, I82875P_DES, &amp;info-&gt;des);</div><div class='del'>-	pci_read_config_byte(mci-&gt;pdev, I82875P_DERRSYN, &amp;info-&gt;derrsyn);</div><div class='del'>-	pci_read_config_word(mci-&gt;pdev, I82875P_ERRSTS, &amp;info-&gt;errsts2);</div><div class='add'>+	pci_read_config_word(pdev, I82875P_ERRSTS, &amp;info-&gt;errsts);</div><div class='add'>+	pci_read_config_dword(pdev, I82875P_EAP, &amp;info-&gt;eap);</div><div class='add'>+	pci_read_config_byte(pdev, I82875P_DES, &amp;info-&gt;des);</div><div class='add'>+	pci_read_config_byte(pdev, I82875P_DERRSYN, &amp;info-&gt;derrsyn);</div><div class='add'>+	pci_read_config_word(pdev, I82875P_ERRSTS, &amp;info-&gt;errsts2);</div><div class='ctx'> </div><div class='del'>-	pci_write_bits16(mci-&gt;pdev, I82875P_ERRSTS, 0x0081, 0x0081);</div><div class='add'>+	pci_write_bits16(pdev, I82875P_ERRSTS, 0x0081, 0x0081);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the error is the same then we can for both reads then</div><div class='hunk'>@@ -208,9 +214,9 @@ static void i82875p_get_error_info(struct mem_ctl_info *mci,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if ((info-&gt;errsts ^ info-&gt;errsts2) &amp; 0x0081) {</div><div class='del'>-		pci_read_config_dword(mci-&gt;pdev, I82875P_EAP, &amp;info-&gt;eap);</div><div class='del'>-		pci_read_config_byte(mci-&gt;pdev, I82875P_DES, &amp;info-&gt;des);</div><div class='del'>-		pci_read_config_byte(mci-&gt;pdev, I82875P_DERRSYN,</div><div class='add'>+		pci_read_config_dword(pdev, I82875P_EAP, &amp;info-&gt;eap);</div><div class='add'>+		pci_read_config_byte(pdev, I82875P_DES, &amp;info-&gt;des);</div><div class='add'>+		pci_read_config_byte(pdev, I82875P_DERRSYN,</div><div class='ctx'> 				&amp;info-&gt;derrsyn);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -259,116 +265,109 @@ static void i82875p_check(struct mem_ctl_info *mci)</div><div class='ctx'> extern int pci_proc_attach_device(struct pci_dev *);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+/* Return 0 on success or 1 on failure. */</div><div class='add'>+static int i82875p_setup_overfl_dev(struct pci_dev *pdev,</div><div class='add'>+		struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window)</div><div class='ctx'> {</div><div class='del'>-	int rc = -ENODEV;</div><div class='del'>-	int index;</div><div class='del'>-	struct mem_ctl_info *mci = NULL;</div><div class='del'>-	struct i82875p_pvt *pvt = NULL;</div><div class='del'>-	unsigned long last_cumul_size;</div><div class='del'>-	struct pci_dev *ovrfl_pdev;</div><div class='del'>-	void __iomem *ovrfl_window = NULL;</div><div class='del'>-	u32 drc;</div><div class='del'>-	u32 drc_chan;		/* Number of channels 0=1chan,1=2chan */</div><div class='del'>-	u32 nr_chans;</div><div class='del'>-	u32 drc_ddim;		/* DRAM Data Integrity Mode 0=none,2=edac */</div><div class='del'>-	struct i82875p_error_info discard;</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	void __iomem *window;</div><div class='ctx'> </div><div class='del'>-	debugf0("%s()\n", __func__);</div><div class='del'>-	ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);</div><div class='add'>+	*ovrfl_pdev = NULL;</div><div class='add'>+	*ovrfl_window = NULL;</div><div class='add'>+	dev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);</div><div class='ctx'> </div><div class='del'>-	if (!ovrfl_pdev) {</div><div class='del'>-		/*</div><div class='del'>-		 * Intel tells BIOS developers to hide device 6 which</div><div class='add'>+	if (dev == NULL) {</div><div class='add'>+		/* Intel tells BIOS developers to hide device 6 which</div><div class='ctx'> 		 * configures the overflow device access containing</div><div class='ctx'> 		 * the DRBs - this is where we expose device 6.</div><div class='ctx'> 		 * http://www.x86-secret.com/articles/tweak/pat/patsecrets-2.htm</div><div class='ctx'> 		 */</div><div class='ctx'> 		pci_write_bits8(pdev, 0xf4, 0x2, 0x2);</div><div class='del'>-		ovrfl_pdev =</div><div class='del'>-			pci_scan_single_device(pdev-&gt;bus, PCI_DEVFN(6, 0));</div><div class='add'>+		dev = pci_scan_single_device(pdev-&gt;bus, PCI_DEVFN(6, 0));</div><div class='ctx'> </div><div class='del'>-		if (!ovrfl_pdev)</div><div class='del'>-			return -ENODEV;</div><div class='add'>+		if (dev == NULL)</div><div class='add'>+			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	*ovrfl_pdev = dev;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-	if (!ovrfl_pdev-&gt;procent &amp;&amp; pci_proc_attach_device(ovrfl_pdev)) {</div><div class='del'>-		i82875p_printk(KERN_ERR,</div><div class='del'>-			"%s(): Failed to attach overflow device\n", __func__);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if ((dev-&gt;procent == NULL) &amp;&amp; pci_proc_attach_device(dev)) {</div><div class='add'>+		i82875p_printk(KERN_ERR, "%s(): Failed to attach overflow "</div><div class='add'>+			       "device\n", __func__);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-				/* CONFIG_PROC_FS */</div><div class='del'>-	if (pci_enable_device(ovrfl_pdev)) {</div><div class='del'>-		i82875p_printk(KERN_ERR,</div><div class='del'>-			"%s(): Failed to enable overflow device\n", __func__);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+#endif  /* CONFIG_PROC_FS */</div><div class='add'>+	if (pci_enable_device(dev)) {</div><div class='add'>+		i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "</div><div class='add'>+			       "device\n", __func__);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pci_request_regions(ovrfl_pdev, pci_name(ovrfl_pdev))) {</div><div class='add'>+	if (pci_request_regions(dev, pci_name(dev))) {</div><div class='ctx'> #ifdef CORRECT_BIOS</div><div class='ctx'> 		goto fail0;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* cache is irrelevant for PCI bus reads/writes */</div><div class='del'>-	ovrfl_window = ioremap_nocache(pci_resource_start(ovrfl_pdev, 0),</div><div class='del'>-				pci_resource_len(ovrfl_pdev, 0));</div><div class='add'>+	window = ioremap_nocache(pci_resource_start(dev, 0),</div><div class='add'>+				 pci_resource_len(dev, 0));</div><div class='ctx'> </div><div class='del'>-	if (!ovrfl_window) {</div><div class='add'>+	if (window == NULL) {</div><div class='ctx'> 		i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n",</div><div class='del'>-			__func__);</div><div class='add'>+			       __func__);</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* need to find out the number of channels */</div><div class='del'>-	drc = readl(ovrfl_window + I82875P_DRC);</div><div class='del'>-	drc_chan = ((drc &gt;&gt; 21) &amp; 0x1);</div><div class='del'>-	nr_chans = drc_chan + 1;</div><div class='add'>+	*ovrfl_window = window;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-	drc_ddim = (drc &gt;&gt; 18) &amp; 0x1;</div><div class='del'>-	mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),</div><div class='del'>-				nr_chans);</div><div class='add'>+fail1:</div><div class='add'>+	pci_release_regions(dev);</div><div class='ctx'> </div><div class='del'>-	if (!mci) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail2;</div><div class='del'>-	}</div><div class='add'>+#ifdef CORRECT_BIOS</div><div class='add'>+fail0:</div><div class='add'>+	pci_disable_device(dev);</div><div class='add'>+#endif</div><div class='add'>+	/* NOTE: the ovrfl proc entry and pci_dev are intentionally left */</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	debugf3("%s(): init mci\n", __func__);</div><div class='del'>-	mci-&gt;pdev = pdev;</div><div class='del'>-	mci-&gt;mtype_cap = MEM_FLAG_DDR;</div><div class='del'>-	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;</div><div class='del'>-	mci-&gt;edac_cap = EDAC_FLAG_UNKNOWN;</div><div class='del'>-	/* adjust FLAGS */</div><div class='ctx'> </div><div class='del'>-	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='del'>-	mci-&gt;mod_ver = "$Revision: 1.5.2.11 $";</div><div class='del'>-	mci-&gt;ctl_name = i82875p_devs[dev_idx].ctl_name;</div><div class='del'>-	mci-&gt;edac_check = i82875p_check;</div><div class='del'>-	mci-&gt;ctl_page_to_phys = NULL;</div><div class='del'>-	debugf3("%s(): init pvt\n", __func__);</div><div class='del'>-	pvt = (struct i82875p_pvt *) mci-&gt;pvt_info;</div><div class='del'>-	pvt-&gt;ovrfl_pdev = ovrfl_pdev;</div><div class='del'>-	pvt-&gt;ovrfl_window = ovrfl_window;</div><div class='add'>+/* Return 1 if dual channel mode is active.  Else return 0. */</div><div class='add'>+static inline int dual_channel_active(u32 drc)</div><div class='add'>+{</div><div class='add'>+	return (drc &gt;&gt; 21) &amp; 0x1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The dram row boundary (DRB) reg values are boundary address</div><div class='add'>+</div><div class='add'>+static void i82875p_init_csrows(struct mem_ctl_info *mci,</div><div class='add'>+		struct pci_dev *pdev, void __iomem *ovrfl_window, u32 drc)</div><div class='add'>+{</div><div class='add'>+	struct csrow_info *csrow;</div><div class='add'>+	unsigned long last_cumul_size;</div><div class='add'>+	u8 value;</div><div class='add'>+	u32 drc_ddim;  /* DRAM Data Integrity Mode 0=none,2=edac */</div><div class='add'>+	u32 cumul_size;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	drc_ddim = (drc &gt;&gt; 18) &amp; 0x1;</div><div class='add'>+	last_cumul_size = 0;</div><div class='add'>+</div><div class='add'>+	/* The dram row boundary (DRB) reg values are boundary address</div><div class='ctx'> 	 * for each DRAM row with a granularity of 32 or 64MB (single/dual</div><div class='ctx'> 	 * channel operation).  DRB regs are cumulative; therefore DRB7 will</div><div class='ctx'> 	 * contain the total memory contained in all eight rows.</div><div class='ctx'> 	 */</div><div class='del'>-	for (last_cumul_size = index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='del'>-		u8 value;</div><div class='del'>-		u32 cumul_size;</div><div class='del'>-		struct csrow_info *csrow = &amp;mci-&gt;csrows[index];</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='add'>+		csrow = &amp;mci-&gt;csrows[index];</div><div class='ctx'> </div><div class='ctx'> 		value = readb(ovrfl_window + I82875P_DRB + index);</div><div class='ctx'> 		cumul_size = value &lt;&lt; (I82875P_DRB_SHIFT - PAGE_SHIFT);</div><div class='ctx'> 		debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,</div><div class='ctx'> 			cumul_size);</div><div class='del'>-</div><div class='ctx'> 		if (cumul_size == last_cumul_size)</div><div class='ctx'> 			continue;	/* not populated */</div><div class='ctx'> </div><div class='hunk'>@@ -376,35 +375,75 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 		csrow-&gt;last_page = cumul_size - 1;</div><div class='ctx'> 		csrow-&gt;nr_pages = cumul_size - last_cumul_size;</div><div class='ctx'> 		last_cumul_size = cumul_size;</div><div class='del'>-		csrow-&gt;grain = 1 &lt;&lt; 12;  /* I82875P_EAP has 4KiB reolution */</div><div class='add'>+		csrow-&gt;grain = 1 &lt;&lt; 12;	/* I82875P_EAP has 4KiB reolution */</div><div class='ctx'> 		csrow-&gt;mtype = MEM_DDR;</div><div class='ctx'> 		csrow-&gt;dtype = DEV_UNKNOWN;</div><div class='ctx'> 		csrow-&gt;edac_mode = drc_ddim ? EDAC_SECDED : EDAC_NONE;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+{</div><div class='add'>+	int rc = -ENODEV;</div><div class='add'>+	struct mem_ctl_info *mci;</div><div class='add'>+	struct i82875p_pvt *pvt;</div><div class='add'>+	struct pci_dev *ovrfl_pdev;</div><div class='add'>+	void __iomem *ovrfl_window;</div><div class='add'>+	u32 drc;</div><div class='add'>+	u32 nr_chans;</div><div class='add'>+	struct i82875p_error_info discard;</div><div class='add'>+</div><div class='add'>+	debugf0("%s()\n", __func__);</div><div class='add'>+	ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);</div><div class='add'>+</div><div class='add'>+	if (i82875p_setup_overfl_dev(pdev, &amp;ovrfl_pdev, &amp;ovrfl_window))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	drc = readl(ovrfl_window + I82875P_DRC);</div><div class='add'>+	nr_chans = dual_channel_active(drc) + 1;</div><div class='add'>+	mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),</div><div class='add'>+				nr_chans);</div><div class='add'>+</div><div class='add'>+	if (!mci) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto fail0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	debugf3("%s(): init mci\n", __func__);</div><div class='add'>+	mci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	mci-&gt;mtype_cap = MEM_FLAG_DDR;</div><div class='add'>+	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;</div><div class='add'>+	mci-&gt;edac_cap = EDAC_FLAG_UNKNOWN;</div><div class='add'>+	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='add'>+	mci-&gt;mod_ver = I82875P_REVISION;</div><div class='add'>+	mci-&gt;ctl_name = i82875p_devs[dev_idx].ctl_name;</div><div class='add'>+	mci-&gt;edac_check = i82875p_check;</div><div class='add'>+	mci-&gt;ctl_page_to_phys = NULL;</div><div class='add'>+	debugf3("%s(): init pvt\n", __func__);</div><div class='add'>+	pvt = (struct i82875p_pvt *) mci-&gt;pvt_info;</div><div class='add'>+	pvt-&gt;ovrfl_pdev = ovrfl_pdev;</div><div class='add'>+	pvt-&gt;ovrfl_window = ovrfl_window;</div><div class='add'>+	i82875p_init_csrows(mci, pdev, ovrfl_window, drc);</div><div class='ctx'> 	i82875p_get_error_info(mci, &amp;discard);  /* clear counters */</div><div class='ctx'> </div><div class='del'>-	if (edac_mc_add_mc(mci)) {</div><div class='add'>+	/* Here we assume that we will never see multiple instances of this</div><div class='add'>+	 * type of memory controller.  The ID is therefore hardcoded to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (edac_mc_add_mc(mci,0)) {</div><div class='ctx'> 		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='del'>-		goto fail3;</div><div class='add'>+		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get this far and it's successful */</div><div class='ctx'> 	debugf3("%s(): success\n", __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-fail3:</div><div class='add'>+fail1:</div><div class='ctx'> 	edac_mc_free(mci);</div><div class='ctx'> </div><div class='del'>-fail2:</div><div class='add'>+fail0:</div><div class='ctx'> 	iounmap(ovrfl_window);</div><div class='del'>-</div><div class='del'>-fail1:</div><div class='ctx'> 	pci_release_regions(ovrfl_pdev);</div><div class='ctx'> </div><div class='del'>-#ifdef CORRECT_BIOS</div><div class='del'>-fail0:</div><div class='del'>-#endif</div><div class='ctx'> 	pci_disable_device(ovrfl_pdev);</div><div class='ctx'> 	/* NOTE: the ovrfl proc entry and pci_dev are intentionally left */</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -437,7 +476,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((mci = edac_mc_del_mc(pdev)) == NULL)</div><div class='add'>+	if ((mci = edac_mc_del_mc(&amp;pdev-&gt;dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pvt = (struct i82875p_pvt *) mci-&gt;pvt_info;</div><div class='head'>diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c<br/>index 2c29fafe67c7..a49cf0a39398 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/edac/r82600_edac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/edac/r82600_edac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/edac/r82600_edac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/edac/r82600_edac.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * references to this document given in []</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -23,6 +22,9 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "edac_mc.h"</div><div class='ctx'> </div><div class='add'>+#define R82600_REVISION	" Ver: 2.0.1 " __DATE__</div><div class='add'>+#define EDAC_MOD_STR	"r82600_edac"</div><div class='add'>+</div><div class='ctx'> #define r82600_printk(level, fmt, arg...) \</div><div class='ctx'> 	edac_printk(level, "r82600", fmt, ##arg)</div><div class='ctx'> </div><div class='hunk'>@@ -134,17 +136,20 @@ static unsigned int disable_hardware_scrub = 0;</div><div class='ctx'> static void r82600_get_error_info (struct mem_ctl_info *mci,</div><div class='ctx'> 		struct r82600_error_info *info)</div><div class='ctx'> {</div><div class='del'>-	pci_read_config_dword(mci-&gt;pdev, R82600_EAP, &amp;info-&gt;eapr);</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	pdev = to_pci_dev(mci-&gt;dev);</div><div class='add'>+	pci_read_config_dword(pdev, R82600_EAP, &amp;info-&gt;eapr);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;eapr &amp; BIT(0))</div><div class='ctx'> 		/* Clear error to allow next error to be reported [p.62] */</div><div class='del'>-		pci_write_bits32(mci-&gt;pdev, R82600_EAP,</div><div class='add'>+		pci_write_bits32(pdev, R82600_EAP,</div><div class='ctx'> 				((u32) BIT(0) &amp; (u32) BIT(1)),</div><div class='ctx'> 				((u32) BIT(0) &amp; (u32) BIT(1)));</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;eapr &amp; BIT(1))</div><div class='ctx'> 		/* Clear error to allow next error to be reported [p.62] */</div><div class='del'>-		pci_write_bits32(mci-&gt;pdev, R82600_EAP,</div><div class='add'>+		pci_write_bits32(pdev, R82600_EAP,</div><div class='ctx'> 				((u32) BIT(0) &amp; (u32) BIT(1)),</div><div class='ctx'> 				((u32) BIT(0) &amp; (u32) BIT(1)));</div><div class='ctx'> }</div><div class='hunk'>@@ -200,25 +205,72 @@ static void r82600_check(struct mem_ctl_info *mci)</div><div class='ctx'> 	r82600_process_error_info(mci, &amp;info, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int r82600_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+static inline int ecc_enabled(u8 dramcr)</div><div class='add'>+{</div><div class='add'>+	return dramcr &amp; BIT(5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void r82600_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,</div><div class='add'>+		u8 dramcr)</div><div class='ctx'> {</div><div class='del'>-	int rc = -ENODEV;</div><div class='add'>+	struct csrow_info *csrow;</div><div class='ctx'> 	int index;</div><div class='del'>-	struct mem_ctl_info *mci = NULL;</div><div class='add'>+	u8 drbar;  /* SDRAM Row Boundry Address Register */</div><div class='add'>+	u32 row_high_limit, row_high_limit_last;</div><div class='add'>+	u32 reg_sdram, ecc_on, row_base;</div><div class='add'>+</div><div class='add'>+	ecc_on = ecc_enabled(dramcr);</div><div class='add'>+	reg_sdram = dramcr &amp; BIT(4);</div><div class='add'>+	row_high_limit_last = 0;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='add'>+		csrow = &amp;mci-&gt;csrows[index];</div><div class='add'>+</div><div class='add'>+		/* find the DRAM Chip Select Base address and mask */</div><div class='add'>+		pci_read_config_byte(pdev, R82600_DRBA + index, &amp;drbar);</div><div class='add'>+</div><div class='add'>+		debugf1("%s() Row=%d DRBA = %#0x\n", __func__, index, drbar);</div><div class='add'>+</div><div class='add'>+		row_high_limit = ((u32) drbar &lt;&lt; 24);</div><div class='add'>+/*		row_high_limit = ((u32)drbar &lt;&lt; 24) | 0xffffffUL; */</div><div class='add'>+</div><div class='add'>+		debugf1("%s() Row=%d, Boundry Address=%#0x, Last = %#0x\n",</div><div class='add'>+			__func__, index, row_high_limit, row_high_limit_last);</div><div class='add'>+</div><div class='add'>+		/* Empty row [p.57] */</div><div class='add'>+		if (row_high_limit == row_high_limit_last)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		row_base = row_high_limit_last;</div><div class='add'>+</div><div class='add'>+		csrow-&gt;first_page = row_base &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		csrow-&gt;last_page = (row_high_limit &gt;&gt; PAGE_SHIFT) - 1;</div><div class='add'>+		csrow-&gt;nr_pages = csrow-&gt;last_page - csrow-&gt;first_page + 1;</div><div class='add'>+		/* Error address is top 19 bits - so granularity is      *</div><div class='add'>+		 * 14 bits                                               */</div><div class='add'>+		csrow-&gt;grain = 1 &lt;&lt; 14;</div><div class='add'>+		csrow-&gt;mtype = reg_sdram ? MEM_RDDR : MEM_DDR;</div><div class='add'>+		/* FIXME - check that this is unknowable with this chipset */</div><div class='add'>+		csrow-&gt;dtype = DEV_UNKNOWN;</div><div class='add'>+</div><div class='add'>+		/* Mode is global on 82600 */</div><div class='add'>+		csrow-&gt;edac_mode = ecc_on ? EDAC_SECDED : EDAC_NONE;</div><div class='add'>+		row_high_limit_last = row_high_limit;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int r82600_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='add'>+{</div><div class='add'>+	struct mem_ctl_info *mci;</div><div class='ctx'> 	u8 dramcr;</div><div class='del'>-	u32 ecc_on;</div><div class='del'>-	u32 reg_sdram;</div><div class='ctx'> 	u32 eapr;</div><div class='ctx'> 	u32 scrub_disabled;</div><div class='ctx'> 	u32 sdram_refresh_rate;</div><div class='del'>-	u32 row_high_limit_last = 0;</div><div class='ctx'> 	struct r82600_error_info discard;</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> 	pci_read_config_byte(pdev, R82600_DRAMC, &amp;dramcr);</div><div class='ctx'> 	pci_read_config_dword(pdev, R82600_EAP, &amp;eapr);</div><div class='del'>-	ecc_on = dramcr &amp; BIT(5);</div><div class='del'>-	reg_sdram = dramcr &amp; BIT(4);</div><div class='ctx'> 	scrub_disabled = eapr &amp; BIT(31);</div><div class='ctx'> 	sdram_refresh_rate = dramcr &amp; (BIT(0) | BIT(1));</div><div class='ctx'> 	debugf2("%s(): sdram refresh rate = %#0x\n", __func__,</div><div class='hunk'>@@ -226,13 +278,11 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	debugf2("%s(): DRAMC register = %#0x\n", __func__, dramcr);</div><div class='ctx'> 	mci = edac_mc_alloc(0, R82600_NR_CSROWS, R82600_NR_CHANS);</div><div class='ctx'> </div><div class='del'>-	if (mci == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	if (mci == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s(): mci = %p\n", __func__, mci);</div><div class='del'>-	mci-&gt;pdev = pdev;</div><div class='add'>+	mci-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	mci-&gt;mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;</div><div class='ctx'> 	mci-&gt;edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;</div><div class='ctx'> 	/* FIXME try to work out if the chip leads have been used for COM2</div><div class='hunk'>@@ -245,7 +295,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	 * is possible.                                               */</div><div class='ctx'> 	mci-&gt;edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;</div><div class='ctx'> </div><div class='del'>-	if (ecc_on) {</div><div class='add'>+	if (ecc_enabled(dramcr)) {</div><div class='ctx'> 		if (scrub_disabled)</div><div class='ctx'> 			debugf3("%s(): mci = %p - Scrubbing disabled! EAP: "</div><div class='ctx'> 				"%#0x\n", __func__, mci, eapr);</div><div class='hunk'>@@ -253,53 +303,17 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 		mci-&gt;edac_cap = EDAC_FLAG_NONE;</div><div class='ctx'> </div><div class='ctx'> 	mci-&gt;mod_name = EDAC_MOD_STR;</div><div class='del'>-	mci-&gt;mod_ver = "$Revision: 1.1.2.6 $";</div><div class='add'>+	mci-&gt;mod_ver = R82600_REVISION;</div><div class='ctx'> 	mci-&gt;ctl_name = "R82600";</div><div class='ctx'> 	mci-&gt;edac_check = r82600_check;</div><div class='ctx'> 	mci-&gt;ctl_page_to_phys = NULL;</div><div class='del'>-</div><div class='del'>-	for (index = 0; index &lt; mci-&gt;nr_csrows; index++) {</div><div class='del'>-		struct csrow_info *csrow = &amp;mci-&gt;csrows[index];</div><div class='del'>-		u8 drbar;	/* sDram Row Boundry Address Register */</div><div class='del'>-		u32 row_high_limit;</div><div class='del'>-		u32 row_base;</div><div class='del'>-</div><div class='del'>-		/* find the DRAM Chip Select Base address and mask */</div><div class='del'>-		pci_read_config_byte(mci-&gt;pdev, R82600_DRBA + index, &amp;drbar);</div><div class='del'>-</div><div class='del'>-		debugf1("MC%d: %s() Row=%d DRBA = %#0x\n", mci-&gt;mc_idx,</div><div class='del'>-			__func__, index, drbar);</div><div class='del'>-</div><div class='del'>-		row_high_limit = ((u32) drbar &lt;&lt; 24);</div><div class='del'>-/*		row_high_limit = ((u32)drbar &lt;&lt; 24) | 0xffffffUL; */</div><div class='del'>-</div><div class='del'>-		debugf1("MC%d: %s() Row=%d, Boundry Address=%#0x, Last = "</div><div class='del'>-			"%#0x \n", mci-&gt;mc_idx, __func__, index,</div><div class='del'>-			row_high_limit, row_high_limit_last);</div><div class='del'>-</div><div class='del'>-		/* Empty row [p.57] */</div><div class='del'>-		if (row_high_limit == row_high_limit_last)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		row_base = row_high_limit_last;</div><div class='del'>-		csrow-&gt;first_page = row_base &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		csrow-&gt;last_page = (row_high_limit &gt;&gt; PAGE_SHIFT) - 1;</div><div class='del'>-		csrow-&gt;nr_pages = csrow-&gt;last_page - csrow-&gt;first_page + 1;</div><div class='del'>-		/* Error address is top 19 bits - so granularity is      *</div><div class='del'>-		 * 14 bits                                               */</div><div class='del'>-		csrow-&gt;grain = 1 &lt;&lt; 14;</div><div class='del'>-		csrow-&gt;mtype = reg_sdram ? MEM_RDDR : MEM_DDR;</div><div class='del'>-		/* FIXME - check that this is unknowable with this chipset */</div><div class='del'>-		csrow-&gt;dtype = DEV_UNKNOWN;</div><div class='del'>-</div><div class='del'>-		/* Mode is global on 82600 */</div><div class='del'>-		csrow-&gt;edac_mode = ecc_on ? EDAC_SECDED : EDAC_NONE;</div><div class='del'>-		row_high_limit_last = row_high_limit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	r82600_init_csrows(mci, pdev, dramcr);</div><div class='ctx'> 	r82600_get_error_info(mci, &amp;discard);  /* clear counters */</div><div class='ctx'> </div><div class='del'>-	if (edac_mc_add_mc(mci)) {</div><div class='add'>+	/* Here we assume that we will never see multiple instances of this</div><div class='add'>+	 * type of memory controller.  The ID is therefore hardcoded to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (edac_mc_add_mc(mci,0)) {</div><div class='ctx'> 		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -309,17 +323,15 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)</div><div class='ctx'> 	if (disable_hardware_scrub) {</div><div class='ctx'> 		debugf3("%s(): Disabling Hardware Scrub (scrub on error)\n",</div><div class='ctx'> 			__func__);</div><div class='del'>-		pci_write_bits32(mci-&gt;pdev, R82600_EAP, BIT(31), BIT(31));</div><div class='add'>+		pci_write_bits32(pdev, R82600_EAP, BIT(31), BIT(31));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	debugf3("%s(): success\n", __func__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='del'>-	if (mci)</div><div class='del'>-		edac_mc_free(mci);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	edac_mc_free(mci);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns count (&gt;= 0), or negative on error */</div><div class='hunk'>@@ -338,7 +350,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	debugf0("%s()\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if ((mci = edac_mc_del_mc(pdev)) == NULL)</div><div class='add'>+	if ((mci = edac_mc_del_mc(&amp;pdev-&gt;dev)) == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	edac_mc_free(mci);</div><div class='head'>diff --git a/drivers/eisa/virtual_root.c b/drivers/eisa/virtual_root.c<br/>index 0f97a0cb0ff4..9b4fcac03ad5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/eisa/virtual_root.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/eisa/virtual_root.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/eisa/virtual_root.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/eisa/virtual_root.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * This code is released under the GPL version 2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/eisa.h&gt;</div><div class='head'>diff --git a/drivers/fc4/fc_syms.c b/drivers/fc4/fc_syms.c<br/>index ed85dfcef69a..8700a8076d04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/fc4/fc_syms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/fc4/fc_syms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/fc4/fc_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/fc4/fc_syms.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * We should not even be trying to compile this if we are not doing</div><div class='ctx'>  * a module.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='head'>diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c<br/>index ec1f94738c59..3b07e0ca81cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/fc4/soc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/fc4/soc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/fc4/soc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/fc4/soc.c</a></div><div class='hunk'>@@ -637,13 +637,13 @@ static inline void soc_init(struct sbus_dev *sdev, int no)</div><div class='ctx'> 	</div><div class='ctx'> 	irq = sdev-&gt;irqs[0];</div><div class='ctx'> </div><div class='del'>-	if (request_irq (irq, soc_intr, SA_SHIRQ, "SOC", (void *)s)) {</div><div class='add'>+	if (request_irq (irq, soc_intr, IRQF_SHARED, "SOC", (void *)s)) {</div><div class='ctx'> 		soc_printk ("Cannot order irq %d to go\n", irq);</div><div class='ctx'> 		socs = s-&gt;next;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	SOD(("SOC uses IRQ%s\n", __irq_itoa(irq)))</div><div class='add'>+	SOD(("SOC uses IRQ %d\n", irq))</div><div class='ctx'> 	</div><div class='ctx'> 	s-&gt;port[0].fc.irq = irq;</div><div class='ctx'> 	s-&gt;port[1].fc.irq = irq;</div><div class='head'>diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c<br/>index 922e9613b2cf..2b75edc5859d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/fc4/socal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/fc4/socal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/fc4/socal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/fc4/socal.c</a></div><div class='hunk'>@@ -761,13 +761,13 @@ static inline void socal_init(struct sbus_dev *sdev, int no)</div><div class='ctx'> 	</div><div class='ctx'> 	irq = sdev-&gt;irqs[0];</div><div class='ctx'> </div><div class='del'>-	if (request_irq (irq, socal_intr, SA_SHIRQ, "SOCAL", (void *)s)) {</div><div class='add'>+	if (request_irq (irq, socal_intr, IRQF_SHARED, "SOCAL", (void *)s)) {</div><div class='ctx'> 		socal_printk ("Cannot order irq %d to go\n", irq);</div><div class='ctx'> 		socals = s-&gt;next;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	SOD(("SOCAL uses IRQ %s\n", __irq_itoa(irq)))</div><div class='add'>+	SOD(("SOCAL uses IRQ %d\n", irq))</div><div class='ctx'> 	</div><div class='ctx'> 	s-&gt;port[0].fc.irq = irq;</div><div class='ctx'> 	s-&gt;port[1].fc.irq = irq;</div><div class='head'>diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig<br/>index 1e371a510dd2..731c3d5da0dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/firmware/Kconfig</a></div><div class='hunk'>@@ -6,8 +6,7 @@</div><div class='ctx'> menu "Firmware Drivers"</div><div class='ctx'> </div><div class='ctx'> config EDD</div><div class='del'>-	tristate "BIOS Enhanced Disk Drive calls determine boot disk (EXPERIMENTAL)"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='add'>+	tristate "BIOS Enhanced Disk Drive calls determine boot disk"</div><div class='ctx'> 	depends on !IA64</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y or M here if you want to enable BIOS Enhanced Disk Drive</div><div class='head'>diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c<br/>index fdb8b042e64d..23b086685453 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/dell_rbu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/dell_rbu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/dell_rbu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/firmware/dell_rbu.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>  * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c<br/>index 948bd7e1445a..b9e3886d9e16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/dmi_scan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/dmi_scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/dmi_scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/firmware/dmi_scan.c</a></div><div class='hunk'>@@ -255,10 +255,15 @@ void __init dmi_scan_machine(void)</div><div class='ctx'> /**</div><div class='ctx'>  *	dmi_check_system - check system DMI data</div><div class='ctx'>  *	@list: array of dmi_system_id structures to match against</div><div class='add'>+ *		All non-null elements of the list must match</div><div class='add'>+ *		their slot's (field index's) data (i.e., each</div><div class='add'>+ *		list string must be a substring of the specified</div><div class='add'>+ *		DMI slot's string data) to be considered a</div><div class='add'>+ *		successful match.</div><div class='ctx'>  *</div><div class='ctx'>  *	Walk the blacklist table running matching functions until someone</div><div class='ctx'>  *	returns non zero or we hit the end. Callback function is called for</div><div class='del'>- *	each successfull match. Returns the number of matches.</div><div class='add'>+ *	each successful match. Returns the number of matches.</div><div class='ctx'>  */</div><div class='ctx'> int dmi_check_system(struct dmi_system_id *list)</div><div class='ctx'> {</div><div class='hunk'>@@ -287,7 +292,7 @@ EXPORT_SYMBOL(dmi_check_system);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	dmi_get_system_info - return DMI data value</div><div class='del'>- *	@field: data index (see enum dmi_filed)</div><div class='add'>+ *	@field: data index (see enum dmi_field)</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns one DMI data value, can be used to perform</div><div class='ctx'>  *	complex DMI data checks.</div><div class='hunk'>@@ -301,13 +306,13 @@ EXPORT_SYMBOL(dmi_get_system_info);</div><div class='ctx'> /**</div><div class='ctx'>  *	dmi_find_device - find onboard device by type/name</div><div class='ctx'>  *	@type: device type or %DMI_DEV_TYPE_ANY to match all device types</div><div class='del'>- *	@desc: device name string or %NULL to match all</div><div class='add'>+ *	@name: device name string or %NULL to match all</div><div class='ctx'>  *	@from: previous device found in search, or %NULL for new search.</div><div class='ctx'>  *</div><div class='ctx'>  *	Iterates through the list of known onboard devices. If a device is</div><div class='ctx'>  *	found with a matching @vendor and @device, a pointer to its device</div><div class='ctx'>  *	structure is returned.  Otherwise, %NULL is returned.</div><div class='del'>- *	A new search is initiated by passing %NULL to the @from argument.</div><div class='add'>+ *	A new search is initiated by passing %NULL as the @from argument.</div><div class='ctx'>  *	If @from is not %NULL, searches continue from next device.</div><div class='ctx'>  */</div><div class='ctx'> struct dmi_device * dmi_find_device(int type, const char *name,</div><div class='head'>diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c<br/>index 9b7e4d52ffd4..8ebce1c03ad7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/efivars.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/efivars.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/efivars.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/firmware/efivars.c</a></div><div class='hunk'>@@ -66,7 +66,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c<br/>index c37baf9448bc..c2ad72fefd9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/firmware/pcdp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/firmware/pcdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/firmware/pcdp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/firmware/pcdp.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='head'>diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig<br/>index 99cdc612d2c6..0e31a0c496e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/Kconfig</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> #</div><div class='del'>-# I2C Sensor chip drivers configuration</div><div class='add'>+# Hardware monitoring chip drivers configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menu "Hardware Monitoring support"</div><div class='hunk'>@@ -16,6 +16,10 @@ config HWMON</div><div class='ctx'> 	  should say Y here and also to the specific driver(s) for your</div><div class='ctx'> 	  sensors chip(s) below.</div><div class='ctx'> </div><div class='add'>+	  To find out which specific driver(s) you need, use the</div><div class='add'>+	  sensors-detect script from the lm_sensors package.  Read</div><div class='add'>+	  &lt;file:Documentation/hwmon/userspace-tools&gt; for details.</div><div class='add'>+</div><div class='ctx'> 	  This support can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called hwmon.</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +27,18 @@ config HWMON_VID</div><div class='ctx'> 	tristate</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='add'>+config SENSORS_ABITUGURU</div><div class='add'>+	tristate "Abit uGuru"</div><div class='add'>+	depends on HWMON &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the Abit uGuru chips</div><div class='add'>+	  sensor part. The voltage and frequency control parts of the Abit</div><div class='add'>+	  uGuru are not supported. The Abit uGuru chip can be found on Abit</div><div class='add'>+	  uGuru featuring motherboards (most modern Abit motherboards).</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called abituguru.</div><div class='add'>+</div><div class='ctx'> config SENSORS_ADM1021</div><div class='ctx'> 	tristate "Analog Devices ADM1021 and compatibles"</div><div class='ctx'> 	depends on HWMON &amp;&amp; I2C</div><div class='hunk'>@@ -188,6 +204,16 @@ config SENSORS_LM63</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called lm63.</div><div class='ctx'> </div><div class='add'>+config SENSORS_LM70</div><div class='add'>+	tristate "National Semiconductor LM70"</div><div class='add'>+	depends on HWMON &amp;&amp; SPI_MASTER &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the National Semiconductor</div><div class='add'>+	  LM70 digital temperature sensor chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called lm70.</div><div class='add'>+</div><div class='ctx'> config SENSORS_LM75</div><div class='ctx'> 	tristate "National Semiconductor LM75 and compatibles"</div><div class='ctx'> 	depends on HWMON &amp;&amp; I2C</div><div class='hunk'>@@ -236,11 +262,11 @@ config SENSORS_LM80</div><div class='ctx'> 	  will be called lm80.</div><div class='ctx'> </div><div class='ctx'> config SENSORS_LM83</div><div class='del'>-	tristate "National Semiconductor LM83"</div><div class='add'>+	tristate "National Semiconductor LM83 and compatibles"</div><div class='ctx'> 	depends on HWMON &amp;&amp; I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for National Semiconductor</div><div class='del'>-	  LM83 sensor chips.</div><div class='add'>+	  LM82 and LM83 sensor chips.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called lm83.</div><div class='hunk'>@@ -333,11 +359,32 @@ config SENSORS_SMSC47M1</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for the integrated fan</div><div class='ctx'> 	  monitoring and control capabilities of the SMSC LPC47B27x,</div><div class='del'>-	  LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x and LPC47M192 chips.</div><div class='add'>+	  LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x, LPC47M192 and</div><div class='add'>+	  LPC47M997 chips.</div><div class='add'>+</div><div class='add'>+	  The temperature and voltage sensor features of the LPC47M192</div><div class='add'>+	  and LPC47M997 are supported by another driver, select also</div><div class='add'>+	  "SMSC LPC47M192 and compatibles" below for those.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called smsc47m1.</div><div class='ctx'> </div><div class='add'>+config SENSORS_SMSC47M192</div><div class='add'>+	tristate "SMSC LPC47M192 and compatibles"</div><div class='add'>+	depends on HWMON &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select HWMON_VID</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the temperature and</div><div class='add'>+	  voltage sensors of the SMSC LPC47M192 and LPC47M997 chips.</div><div class='add'>+</div><div class='add'>+	  The fan monitoring and control capabilities of these chips</div><div class='add'>+	  are supported by another driver, select</div><div class='add'>+	  "SMSC LPC47M10x and compatibles" above. You need both drivers</div><div class='add'>+	  if you want fan control and voltage/temperature sensor support.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called smsc47m192.</div><div class='add'>+</div><div class='ctx'> config SENSORS_SMSC47B397</div><div class='ctx'> 	tristate "SMSC LPC47B397-NC"</div><div class='ctx'> 	depends on HWMON &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -385,6 +432,16 @@ config SENSORS_W83781D</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called w83781d.</div><div class='ctx'> </div><div class='add'>+config SENSORS_W83791D</div><div class='add'>+	tristate "Winbond W83791D"</div><div class='add'>+	depends on HWMON &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select HWMON_VID</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the Winbond W83791D chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called w83791d.</div><div class='add'>+</div><div class='ctx'> config SENSORS_W83792D</div><div class='ctx'> 	tristate "Winbond W83792D"</div><div class='ctx'> 	depends on HWMON &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='head'>diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile<br/>index fbdb8d911a72..31415843a91a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/Makefile</a></div><div class='hunk'>@@ -10,7 +10,9 @@ obj-$(CONFIG_SENSORS_ASB100)	+= asb100.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_W83627HF)	+= w83627hf.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_W83792D)	+= w83792d.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_W83781D)	+= w83781d.o</div><div class='add'>+obj-$(CONFIG_SENSORS_W83791D)	+= w83791d.o</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_SENSORS_ABITUGURU)	+= abituguru.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1021)	+= adm1021.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1025)	+= adm1025.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_ADM1026)	+= adm1026.o</div><div class='hunk'>@@ -26,6 +28,7 @@ obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_IT87)	+= it87.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM63)	+= lm63.o</div><div class='add'>+obj-$(CONFIG_SENSORS_LM70)	+= lm70.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM75)	+= lm75.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM77)	+= lm77.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_LM78)	+= lm78.o</div><div class='hunk'>@@ -40,6 +43,7 @@ obj-$(CONFIG_SENSORS_PC87360)	+= pc87360.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_SMSC47M1)	+= smsc47m1.o</div><div class='add'>+obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_VT8231)	+= vt8231.o</div><div class='ctx'> obj-$(CONFIG_SENSORS_W83627EHF)	+= w83627ehf.o</div><div class='head'>diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c<br/>new file mode 100644<br/>index 000000000000..cc15c4f2e9ec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/abituguru.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/abituguru.c</a></div><div class='hunk'>@@ -0,0 +1,1432 @@</div><div class='add'>+/*</div><div class='add'>+    abituguru.c Copyright (c) 2005-2006 Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*/</div><div class='add'>+/*</div><div class='add'>+    This driver supports the sensor part of the custom Abit uGuru chip found</div><div class='add'>+    on Abit uGuru motherboards. Note: because of lack of specs the CPU / RAM /</div><div class='add'>+    etc voltage &amp; frequency control is not supported!</div><div class='add'>+*/</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+/* Banks */</div><div class='add'>+#define ABIT_UGURU_ALARM_BANK			0x20 /* 1x 3 bytes */</div><div class='add'>+#define ABIT_UGURU_SENSOR_BANK1			0x21 /* 16x volt and temp */</div><div class='add'>+#define ABIT_UGURU_FAN_PWM			0x24 /* 3x 5 bytes */</div><div class='add'>+#define ABIT_UGURU_SENSOR_BANK2			0x26 /* fans */</div><div class='add'>+/* max nr of sensors in bank1, a bank1 sensor can be in, temp or nc */</div><div class='add'>+#define ABIT_UGURU_MAX_BANK1_SENSORS		16</div><div class='add'>+/* Warning if you increase one of the 2 MAX defines below to 10 or higher you</div><div class='add'>+   should adjust the belonging _NAMES_LENGTH macro for the 2 digit number! */</div><div class='add'>+/* max nr of sensors in bank2, currently mb's with max 6 fans are known */</div><div class='add'>+#define ABIT_UGURU_MAX_BANK2_SENSORS		6</div><div class='add'>+/* max nr of pwm outputs, currently mb's with max 5 pwm outputs are known */</div><div class='add'>+#define ABIT_UGURU_MAX_PWMS			5</div><div class='add'>+/* uGuru sensor bank 1 flags */			     /* Alarm if: */</div><div class='add'>+#define ABIT_UGURU_TEMP_HIGH_ALARM_ENABLE	0x01 /*  temp over warn */</div><div class='add'>+#define ABIT_UGURU_VOLT_HIGH_ALARM_ENABLE	0x02 /*  volt over max */</div><div class='add'>+#define ABIT_UGURU_VOLT_LOW_ALARM_ENABLE	0x04 /*  volt under min */</div><div class='add'>+#define ABIT_UGURU_TEMP_HIGH_ALARM_FLAG		0x10 /* temp is over warn */</div><div class='add'>+#define ABIT_UGURU_VOLT_HIGH_ALARM_FLAG		0x20 /* volt is over max */</div><div class='add'>+#define ABIT_UGURU_VOLT_LOW_ALARM_FLAG		0x40 /* volt is under min */</div><div class='add'>+/* uGuru sensor bank 2 flags */			     /* Alarm if: */</div><div class='add'>+#define ABIT_UGURU_FAN_LOW_ALARM_ENABLE		0x01 /*   fan under min */</div><div class='add'>+/* uGuru sensor bank common flags */</div><div class='add'>+#define ABIT_UGURU_BEEP_ENABLE			0x08 /* beep if alarm */</div><div class='add'>+#define ABIT_UGURU_SHUTDOWN_ENABLE		0x80 /* shutdown if alarm */</div><div class='add'>+/* uGuru fan PWM (speed control) flags */</div><div class='add'>+#define ABIT_UGURU_FAN_PWM_ENABLE		0x80 /* enable speed control */</div><div class='add'>+/* Values used for conversion */</div><div class='add'>+#define ABIT_UGURU_FAN_MAX			15300 /* RPM */</div><div class='add'>+/* Bank1 sensor types */</div><div class='add'>+#define ABIT_UGURU_IN_SENSOR			0</div><div class='add'>+#define ABIT_UGURU_TEMP_SENSOR			1</div><div class='add'>+#define ABIT_UGURU_NC				2</div><div class='add'>+/* Timeouts / Retries, if these turn out to need a lot of fiddling we could</div><div class='add'>+   convert them to params. */</div><div class='add'>+/* 250 was determined by trial and error, 200 works most of the time, but not</div><div class='add'>+   always. I assume this is cpu-speed independent, since the ISA-bus and not</div><div class='add'>+   the CPU should be the bottleneck. Note that 250 sometimes is still not</div><div class='add'>+   enough (only reported on AN7 mb) this is handled by a higher layer. */</div><div class='add'>+#define ABIT_UGURU_WAIT_TIMEOUT			250</div><div class='add'>+/* Normally all expected status in abituguru_ready, are reported after the</div><div class='add'>+   first read, but sometimes not and we need to poll, 5 polls was not enough</div><div class='add'>+   50 sofar is. */</div><div class='add'>+#define ABIT_UGURU_READY_TIMEOUT		50</div><div class='add'>+/* Maximum 3 retries on timedout reads/writes, delay 200 ms before retrying */</div><div class='add'>+#define ABIT_UGURU_MAX_RETRIES			3</div><div class='add'>+#define ABIT_UGURU_RETRY_DELAY			(HZ/5)</div><div class='add'>+/* Maximum 2 timeouts in abituguru_update_device, iow 3 in a row is an error */</div><div class='add'>+#define ABIT_UGURU_MAX_TIMEOUTS			2</div><div class='add'>+/* utility macros */</div><div class='add'>+#define ABIT_UGURU_NAME				"abituguru"</div><div class='add'>+#define ABIT_UGURU_DEBUG(level, format, arg...)				\</div><div class='add'>+	if (level &lt;= verbose)						\</div><div class='add'>+		printk(KERN_DEBUG ABIT_UGURU_NAME ": "	format , ## arg)</div><div class='add'>+/* Macros to help calculate the sysfs_names array length */</div><div class='add'>+/* sum of strlen of: in??_input\0, in??_{min,max}\0, in??_{min,max}_alarm\0,</div><div class='add'>+   in??_{min,max}_alarm_enable\0, in??_beep\0, in??_shutdown\0 */</div><div class='add'>+#define ABITUGURU_IN_NAMES_LENGTH	(11 + 2 * 9 + 2 * 15 + 2 * 22 + 10 + 14)</div><div class='add'>+/* sum of strlen of: temp??_input\0, temp??_max\0, temp??_crit\0,</div><div class='add'>+   temp??_alarm\0, temp??_alarm_enable\0, temp??_beep\0, temp??_shutdown\0 */</div><div class='add'>+#define ABITUGURU_TEMP_NAMES_LENGTH	(13 + 11 + 12 + 13 + 20 + 12 + 16)</div><div class='add'>+/* sum of strlen of: fan?_input\0, fan?_min\0, fan?_alarm\0,</div><div class='add'>+   fan?_alarm_enable\0, fan?_beep\0, fan?_shutdown\0 */</div><div class='add'>+#define ABITUGURU_FAN_NAMES_LENGTH	(11 + 9 + 11 + 18 + 10 + 14)</div><div class='add'>+/* sum of strlen of: pwm?_enable\0, pwm?_auto_channels_temp\0,</div><div class='add'>+   pwm?_auto_point{1,2}_pwm\0, pwm?_auto_point{1,2}_temp\0 */</div><div class='add'>+#define ABITUGURU_PWM_NAMES_LENGTH	(12 + 24 + 2 * 21 + 2 * 22)</div><div class='add'>+/* IN_NAMES_LENGTH &gt; TEMP_NAMES_LENGTH so assume all bank1 sensors are in */</div><div class='add'>+#define ABITUGURU_SYSFS_NAMES_LENGTH	( \</div><div class='add'>+	ABIT_UGURU_MAX_BANK1_SENSORS * ABITUGURU_IN_NAMES_LENGTH + \</div><div class='add'>+	ABIT_UGURU_MAX_BANK2_SENSORS * ABITUGURU_FAN_NAMES_LENGTH + \</div><div class='add'>+	ABIT_UGURU_MAX_PWMS * ABITUGURU_PWM_NAMES_LENGTH)</div><div class='add'>+</div><div class='add'>+/* All the macros below are named identical to the oguru and oguru2 programs</div><div class='add'>+   reverse engineered by Olle Sandberg, hence the names might not be 100%</div><div class='add'>+   logical. I could come up with better names, but I prefer keeping the names</div><div class='add'>+   identical so that this driver can be compared with his work more easily. */</div><div class='add'>+/* Two i/o-ports are used by uGuru */</div><div class='add'>+#define ABIT_UGURU_BASE				0x00E0</div><div class='add'>+/* Used to tell uGuru what to read and to read the actual data */</div><div class='add'>+#define ABIT_UGURU_CMD				0x00</div><div class='add'>+/* Mostly used to check if uGuru is busy */</div><div class='add'>+#define ABIT_UGURU_DATA				0x04</div><div class='add'>+#define ABIT_UGURU_REGION_LENGTH		5</div><div class='add'>+/* uGuru status' */</div><div class='add'>+#define ABIT_UGURU_STATUS_WRITE			0x00 /* Ready to be written */</div><div class='add'>+#define ABIT_UGURU_STATUS_READ			0x01 /* Ready to be read */</div><div class='add'>+#define ABIT_UGURU_STATUS_INPUT			0x08 /* More input */</div><div class='add'>+#define ABIT_UGURU_STATUS_READY			0x09 /* Ready to be written */</div><div class='add'>+</div><div class='add'>+/* Constants */</div><div class='add'>+/* in (Volt) sensors go up to 3494 mV, temp to 255000 millidegrees Celsius */</div><div class='add'>+static const int abituguru_bank1_max_value[2] = { 3494, 255000 };</div><div class='add'>+/* Min / Max allowed values for sensor2 (fan) alarm threshold, these values</div><div class='add'>+   correspond to 300-3000 RPM */</div><div class='add'>+static const u8 abituguru_bank2_min_threshold = 5;</div><div class='add'>+static const u8 abituguru_bank2_max_threshold = 50;</div><div class='add'>+/* Register 0 is a bitfield, 1 and 2 are pwm settings (255 = 100%), 3 and 4</div><div class='add'>+   are temperature trip points. */</div><div class='add'>+static const int abituguru_pwm_settings_multiplier[5] = { 0, 1, 1, 1000, 1000 };</div><div class='add'>+/* Min / Max allowed values for pwm_settings. Note: pwm1 (CPU fan) is a</div><div class='add'>+   special case the minium allowed pwm% setting for this is 30% (77) on</div><div class='add'>+   some MB's this special case is handled in the code! */</div><div class='add'>+static const u8 abituguru_pwm_min[5] = { 0, 170, 170, 25, 25 };</div><div class='add'>+static const u8 abituguru_pwm_max[5] = { 0, 255, 255, 75, 75 };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Insmod parameters */</div><div class='add'>+static int force;</div><div class='add'>+module_param(force, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(force, "Set to one to force detection.");</div><div class='add'>+static int bank1_types[ABIT_UGURU_MAX_BANK1_SENSORS] = { -1, -1, -1, -1, -1,</div><div class='add'>+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };</div><div class='add'>+module_param_array(bank1_types, int, NULL, 0);</div><div class='add'>+MODULE_PARM_DESC(bank1_types, "Bank1 sensortype autodetection override:\n"</div><div class='add'>+	"   -1 autodetect\n"</div><div class='add'>+	"    0 volt sensor\n"</div><div class='add'>+	"    1 temp sensor\n"</div><div class='add'>+	"    2 not connected");</div><div class='add'>+static int fan_sensors;</div><div class='add'>+module_param(fan_sensors, int, 0);</div><div class='add'>+MODULE_PARM_DESC(fan_sensors, "Number of fan sensors on the uGuru "</div><div class='add'>+	"(0 = autodetect)");</div><div class='add'>+static int pwms;</div><div class='add'>+module_param(pwms, int, 0);</div><div class='add'>+MODULE_PARM_DESC(pwms, "Number of PWMs on the uGuru "</div><div class='add'>+	"(0 = autodetect)");</div><div class='add'>+</div><div class='add'>+/* Default verbose is 2, since this driver is still in the testing phase */</div><div class='add'>+static int verbose = 2;</div><div class='add'>+module_param(verbose, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(verbose, "How verbose should the driver be? (0-3):\n"</div><div class='add'>+	"   0 normal output\n"</div><div class='add'>+	"   1 + verbose error reporting\n"</div><div class='add'>+	"   2 + sensors type probing info\n"</div><div class='add'>+	"   3 + retryable error reporting");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* For the Abit uGuru, we need to keep some data in memory.</div><div class='add'>+   The structure is dynamically allocated, at the same time when a new</div><div class='add'>+   abituguru device is allocated. */</div><div class='add'>+struct abituguru_data {</div><div class='add'>+	struct class_device *class_dev; /* hwmon registered device */</div><div class='add'>+	struct mutex update_lock;	/* protect access to data and uGuru */</div><div class='add'>+	unsigned long last_updated;	/* In jiffies */</div><div class='add'>+	unsigned short addr;		/* uguru base address */</div><div class='add'>+	char uguru_ready;		/* is the uguru in ready state? */</div><div class='add'>+	unsigned char update_timeouts;	/* number of update timeouts since last</div><div class='add'>+					   successful update */</div><div class='add'>+</div><div class='add'>+	/* The sysfs attr and their names are generated automatically, for bank1</div><div class='add'>+	   we cannot use a predefined array because we don't know beforehand</div><div class='add'>+	   of a sensor is a volt or a temp sensor, for bank2 and the pwms its</div><div class='add'>+	   easier todo things the same way.  For in sensors we have 9 (temp 7)</div><div class='add'>+	   sysfs entries per sensor, for bank2 and pwms 6. */</div><div class='add'>+	struct sensor_device_attribute_2 sysfs_attr[</div><div class='add'>+		ABIT_UGURU_MAX_BANK1_SENSORS * 9 +</div><div class='add'>+		ABIT_UGURU_MAX_BANK2_SENSORS * 6 + ABIT_UGURU_MAX_PWMS * 6];</div><div class='add'>+	/* Buffer to store the dynamically generated sysfs names */</div><div class='add'>+	char sysfs_names[ABITUGURU_SYSFS_NAMES_LENGTH];</div><div class='add'>+</div><div class='add'>+	/* Bank 1 data */</div><div class='add'>+	/* number of and addresses of [0] in, [1] temp sensors */</div><div class='add'>+	u8 bank1_sensors[2];</div><div class='add'>+	u8 bank1_address[2][ABIT_UGURU_MAX_BANK1_SENSORS];</div><div class='add'>+	u8 bank1_value[ABIT_UGURU_MAX_BANK1_SENSORS];</div><div class='add'>+	/* This array holds 3 entries per sensor for the bank 1 sensor settings</div><div class='add'>+	   (flags, min, max for voltage / flags, warn, shutdown for temp). */</div><div class='add'>+	u8 bank1_settings[ABIT_UGURU_MAX_BANK1_SENSORS][3];</div><div class='add'>+	/* Maximum value for each sensor used for scaling in mV/millidegrees</div><div class='add'>+	   Celsius. */</div><div class='add'>+	int bank1_max_value[ABIT_UGURU_MAX_BANK1_SENSORS];</div><div class='add'>+</div><div class='add'>+	/* Bank 2 data, ABIT_UGURU_MAX_BANK2_SENSORS entries for bank2 */</div><div class='add'>+	u8 bank2_sensors; /* actual number of bank2 sensors found */</div><div class='add'>+	u8 bank2_value[ABIT_UGURU_MAX_BANK2_SENSORS];</div><div class='add'>+	u8 bank2_settings[ABIT_UGURU_MAX_BANK2_SENSORS][2]; /* flags, min */</div><div class='add'>+</div><div class='add'>+	/* Alarms 2 bytes for bank1, 1 byte for bank2 */</div><div class='add'>+	u8 alarms[3];</div><div class='add'>+</div><div class='add'>+	/* Fan PWM (speed control) 5 bytes per PWM */</div><div class='add'>+	u8 pwms; /* actual number of pwms found */</div><div class='add'>+	u8 pwm_settings[ABIT_UGURU_MAX_PWMS][5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* wait till the uguru is in the specified state */</div><div class='add'>+static int abituguru_wait(struct abituguru_data *data, u8 state)</div><div class='add'>+{</div><div class='add'>+	int timeout = ABIT_UGURU_WAIT_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	while (inb_p(data-&gt;addr + ABIT_UGURU_DATA) != state) {</div><div class='add'>+		timeout--;</div><div class='add'>+		if (timeout == 0)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Put the uguru in ready for input state */</div><div class='add'>+static int abituguru_ready(struct abituguru_data *data)</div><div class='add'>+{</div><div class='add'>+	int timeout = ABIT_UGURU_READY_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;uguru_ready)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Reset? / Prepare for next read/write cycle */</div><div class='add'>+	outb(0x00, data-&gt;addr + ABIT_UGURU_DATA);</div><div class='add'>+</div><div class='add'>+	/* Wait till the uguru is ready */</div><div class='add'>+	if (abituguru_wait(data, ABIT_UGURU_STATUS_READY)) {</div><div class='add'>+		ABIT_UGURU_DEBUG(1,</div><div class='add'>+			"timeout exceeded waiting for ready state\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cmd port MUST be read now and should contain 0xAC */</div><div class='add'>+	while (inb_p(data-&gt;addr + ABIT_UGURU_CMD) != 0xAC) {</div><div class='add'>+		timeout--;</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			ABIT_UGURU_DEBUG(1,</div><div class='add'>+			   "CMD reg does not hold 0xAC after ready command\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* After this the ABIT_UGURU_DATA port should contain</div><div class='add'>+	   ABIT_UGURU_STATUS_INPUT */</div><div class='add'>+	timeout = ABIT_UGURU_READY_TIMEOUT;</div><div class='add'>+	while (inb_p(data-&gt;addr + ABIT_UGURU_DATA) != ABIT_UGURU_STATUS_INPUT) {</div><div class='add'>+		timeout--;</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			ABIT_UGURU_DEBUG(1,</div><div class='add'>+				"state != more input after ready command\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;uguru_ready = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send the bank and then sensor address to the uGuru for the next read/write</div><div class='add'>+   cycle. This function gets called as the first part of a read/write by</div><div class='add'>+   abituguru_read and abituguru_write. This function should never be</div><div class='add'>+   called by any other function. */</div><div class='add'>+static int abituguru_send_address(struct abituguru_data *data,</div><div class='add'>+	u8 bank_addr, u8 sensor_addr, int retries)</div><div class='add'>+{</div><div class='add'>+	/* assume the caller does error handling itself if it has not requested</div><div class='add'>+	   any retries, and thus be quiet. */</div><div class='add'>+	int report_errors = retries;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		/* Make sure the uguru is ready and then send the bank address,</div><div class='add'>+		   after this the uguru is no longer "ready". */</div><div class='add'>+		if (abituguru_ready(data) != 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		outb(bank_addr, data-&gt;addr + ABIT_UGURU_DATA);</div><div class='add'>+		data-&gt;uguru_ready = 0;</div><div class='add'>+</div><div class='add'>+		/* Wait till the uguru is ABIT_UGURU_STATUS_INPUT state again</div><div class='add'>+		   and send the sensor addr */</div><div class='add'>+		if (abituguru_wait(data, ABIT_UGURU_STATUS_INPUT)) {</div><div class='add'>+			if (retries) {</div><div class='add'>+				ABIT_UGURU_DEBUG(3, "timeout exceeded "</div><div class='add'>+					"waiting for more input state, %d "</div><div class='add'>+					"tries remaining\n", retries);</div><div class='add'>+				set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+				schedule_timeout(ABIT_UGURU_RETRY_DELAY);</div><div class='add'>+				retries--;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (report_errors)</div><div class='add'>+				ABIT_UGURU_DEBUG(1, "timeout exceeded "</div><div class='add'>+					"waiting for more input state "</div><div class='add'>+					"(bank: %d)\n", (int)bank_addr);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		outb(sensor_addr, data-&gt;addr + ABIT_UGURU_CMD);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read count bytes from sensor sensor_addr in bank bank_addr and store the</div><div class='add'>+   result in buf, retry the send address part of the read retries times. */</div><div class='add'>+static int abituguru_read(struct abituguru_data *data,</div><div class='add'>+	u8 bank_addr, u8 sensor_addr, u8 *buf, int count, int retries)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Send the address */</div><div class='add'>+	i = abituguru_send_address(data, bank_addr, sensor_addr, retries);</div><div class='add'>+	if (i)</div><div class='add'>+		return i;</div><div class='add'>+</div><div class='add'>+	/* And read the data */</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (abituguru_wait(data, ABIT_UGURU_STATUS_READ)) {</div><div class='add'>+			ABIT_UGURU_DEBUG(1, "timeout exceeded waiting for "</div><div class='add'>+				"read state (bank: %d, sensor: %d)\n",</div><div class='add'>+				(int)bank_addr, (int)sensor_addr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		buf[i] = inb(data-&gt;addr + ABIT_UGURU_CMD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Last put the chip back in ready state */</div><div class='add'>+	abituguru_ready(data);</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write count bytes from buf to sensor sensor_addr in bank bank_addr, the send</div><div class='add'>+   address part of the write is always retried ABIT_UGURU_MAX_RETRIES times. */</div><div class='add'>+static int abituguru_write(struct abituguru_data *data,</div><div class='add'>+	u8 bank_addr, u8 sensor_addr, u8 *buf, int count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Send the address */</div><div class='add'>+	i = abituguru_send_address(data, bank_addr, sensor_addr,</div><div class='add'>+		ABIT_UGURU_MAX_RETRIES);</div><div class='add'>+	if (i)</div><div class='add'>+		return i;</div><div class='add'>+</div><div class='add'>+	/* And write the data */</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if (abituguru_wait(data, ABIT_UGURU_STATUS_WRITE)) {</div><div class='add'>+			ABIT_UGURU_DEBUG(1, "timeout exceeded waiting for "</div><div class='add'>+				"write state (bank: %d, sensor: %d)\n",</div><div class='add'>+				(int)bank_addr, (int)sensor_addr);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		outb(buf[i], data-&gt;addr + ABIT_UGURU_CMD);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we need to wait till the chip is ready to be read again,</div><div class='add'>+	   don't ask why */</div><div class='add'>+	if (abituguru_wait(data, ABIT_UGURU_STATUS_READ)) {</div><div class='add'>+		ABIT_UGURU_DEBUG(1, "timeout exceeded waiting for read state "</div><div class='add'>+			"after write (bank: %d, sensor: %d)\n", (int)bank_addr,</div><div class='add'>+			(int)sensor_addr);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cmd port MUST be read now and should contain 0xAC */</div><div class='add'>+	if (inb_p(data-&gt;addr + ABIT_UGURU_CMD) != 0xAC) {</div><div class='add'>+		ABIT_UGURU_DEBUG(1, "CMD reg does not hold 0xAC after write "</div><div class='add'>+			"(bank: %d, sensor: %d)\n", (int)bank_addr,</div><div class='add'>+			(int)sensor_addr);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Last put the chip back in ready state */</div><div class='add'>+	abituguru_ready(data);</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Detect sensor type. Temp and Volt sensors are enabled with</div><div class='add'>+   different masks and will ignore enable masks not meant for them.</div><div class='add'>+   This enables us to test what kind of sensor we're dealing with.</div><div class='add'>+   By setting the alarm thresholds so that we will always get an</div><div class='add'>+   alarm for sensor type X and then enabling the sensor as sensor type</div><div class='add'>+   X, if we then get an alarm it is a sensor of type X. */</div><div class='add'>+static int __devinit</div><div class='add'>+abituguru_detect_bank1_sensor_type(struct abituguru_data *data,</div><div class='add'>+				   u8 sensor_addr)</div><div class='add'>+{</div><div class='add'>+	u8 val, buf[3];</div><div class='add'>+	int ret = ABIT_UGURU_NC;</div><div class='add'>+</div><div class='add'>+	/* If overriden by the user return the user selected type */</div><div class='add'>+	if (bank1_types[sensor_addr] &gt;= ABIT_UGURU_IN_SENSOR &amp;&amp;</div><div class='add'>+			bank1_types[sensor_addr] &lt;= ABIT_UGURU_NC) {</div><div class='add'>+		ABIT_UGURU_DEBUG(2, "assuming sensor type %d for bank1 sensor "</div><div class='add'>+			"%d because of \"bank1_types\" module param\n",</div><div class='add'>+			bank1_types[sensor_addr], (int)sensor_addr);</div><div class='add'>+		return bank1_types[sensor_addr];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First read the sensor and the current settings */</div><div class='add'>+	if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK1, sensor_addr, &amp;val,</div><div class='add'>+			1, ABIT_UGURU_MAX_RETRIES) != 1)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Test val is sane / usable for sensor type detection. */</div><div class='add'>+	if ((val &lt; 10u) || (val &gt; 240u)) {</div><div class='add'>+		printk(KERN_WARNING ABIT_UGURU_NAME</div><div class='add'>+			": bank1-sensor: %d reading (%d) too close to limits, "</div><div class='add'>+			"unable to determine sensor type, skipping sensor\n",</div><div class='add'>+			(int)sensor_addr, (int)val);</div><div class='add'>+		/* assume no sensor is there for sensors for which we can't</div><div class='add'>+		   determine the sensor type because their reading is too close</div><div class='add'>+		   to their limits, this usually means no sensor is there. */</div><div class='add'>+		return ABIT_UGURU_NC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ABIT_UGURU_DEBUG(2, "testing bank1 sensor %d\n", (int)sensor_addr);</div><div class='add'>+	/* Volt sensor test, enable volt low alarm, set min value ridicously</div><div class='add'>+	   high. If its a volt sensor this should always give us an alarm. */</div><div class='add'>+	buf[0] = ABIT_UGURU_VOLT_LOW_ALARM_ENABLE;</div><div class='add'>+	buf[1] = 245;</div><div class='add'>+	buf[2] = 250;</div><div class='add'>+	if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK1 + 2, sensor_addr,</div><div class='add'>+			buf, 3) != 3)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	/* Now we need 20 ms to give the uguru time to read the sensors</div><div class='add'>+	   and raise a voltage alarm */</div><div class='add'>+	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+	schedule_timeout(HZ/50);</div><div class='add'>+	/* Check for alarm and check the alarm is a volt low alarm. */</div><div class='add'>+	if (abituguru_read(data, ABIT_UGURU_ALARM_BANK, 0, buf, 3,</div><div class='add'>+			ABIT_UGURU_MAX_RETRIES) != 3)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (buf[sensor_addr/8] &amp; (0x01 &lt;&lt; (sensor_addr % 8))) {</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK1 + 1,</div><div class='add'>+				sensor_addr, buf, 3,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 3)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		if (buf[0] &amp; ABIT_UGURU_VOLT_LOW_ALARM_FLAG) {</div><div class='add'>+			/* Restore original settings */</div><div class='add'>+			if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK1 + 2,</div><div class='add'>+					sensor_addr,</div><div class='add'>+					data-&gt;bank1_settings[sensor_addr],</div><div class='add'>+					3) != 3)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  found volt sensor\n");</div><div class='add'>+			return ABIT_UGURU_IN_SENSOR;</div><div class='add'>+		} else</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  alarm raised during volt "</div><div class='add'>+				"sensor test, but volt low flag not set\n");</div><div class='add'>+	} else</div><div class='add'>+		ABIT_UGURU_DEBUG(2, "  alarm not raised during volt sensor "</div><div class='add'>+			"test\n");</div><div class='add'>+</div><div class='add'>+	/* Temp sensor test, enable sensor as a temp sensor, set beep value</div><div class='add'>+	   ridicously low (but not too low, otherwise uguru ignores it).</div><div class='add'>+	   If its a temp sensor this should always give us an alarm. */</div><div class='add'>+	buf[0] = ABIT_UGURU_TEMP_HIGH_ALARM_ENABLE;</div><div class='add'>+	buf[1] = 5;</div><div class='add'>+	buf[2] = 10;</div><div class='add'>+	if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK1 + 2, sensor_addr,</div><div class='add'>+			buf, 3) != 3)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	/* Now we need 50 ms to give the uguru time to read the sensors</div><div class='add'>+	   and raise a temp alarm */</div><div class='add'>+	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+	schedule_timeout(HZ/20);</div><div class='add'>+	/* Check for alarm and check the alarm is a temp high alarm. */</div><div class='add'>+	if (abituguru_read(data, ABIT_UGURU_ALARM_BANK, 0, buf, 3,</div><div class='add'>+			ABIT_UGURU_MAX_RETRIES) != 3)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (buf[sensor_addr/8] &amp; (0x01 &lt;&lt; (sensor_addr % 8))) {</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK1 + 1,</div><div class='add'>+				sensor_addr, buf, 3,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 3)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		if (buf[0] &amp; ABIT_UGURU_TEMP_HIGH_ALARM_FLAG) {</div><div class='add'>+			ret = ABIT_UGURU_TEMP_SENSOR;</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  found temp sensor\n");</div><div class='add'>+		} else</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  alarm raised during temp "</div><div class='add'>+				"sensor test, but temp high flag not set\n");</div><div class='add'>+	} else</div><div class='add'>+		ABIT_UGURU_DEBUG(2, "  alarm not raised during temp sensor "</div><div class='add'>+			"test\n");</div><div class='add'>+</div><div class='add'>+	/* Restore original settings */</div><div class='add'>+	if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK1 + 2, sensor_addr,</div><div class='add'>+			data-&gt;bank1_settings[sensor_addr], 3) != 3)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These functions try to find out how many sensors there are in bank2 and how</div><div class='add'>+   many pwms there are. The purpose of this is to make sure that we don't give</div><div class='add'>+   the user the possibility to change settings for non-existent sensors / pwm.</div><div class='add'>+   The uGuru will happily read / write whatever memory happens to be after the</div><div class='add'>+   memory storing the PWM settings when reading/writing to a PWM which is not</div><div class='add'>+   there. Notice even if we detect a PWM which doesn't exist we normally won't</div><div class='add'>+   write to it, unless the user tries to change the settings.</div><div class='add'>+</div><div class='add'>+   Although the uGuru allows reading (settings) from non existing bank2</div><div class='add'>+   sensors, my version of the uGuru does seem to stop writing to them, the</div><div class='add'>+   write function above aborts in this case with:</div><div class='add'>+   "CMD reg does not hold 0xAC after write"</div><div class='add'>+</div><div class='add'>+   Notice these 2 tests are non destructive iow read-only tests, otherwise</div><div class='add'>+   they would defeat their purpose. Although for the bank2_sensors detection a</div><div class='add'>+   read/write test would be feasible because of the reaction above, I've</div><div class='add'>+   however opted to stay on the safe side. */</div><div class='add'>+static void __devinit</div><div class='add'>+abituguru_detect_no_bank2_sensors(struct abituguru_data *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (fan_sensors &gt; 0 &amp;&amp; fan_sensors &lt;= ABIT_UGURU_MAX_BANK2_SENSORS) {</div><div class='add'>+		data-&gt;bank2_sensors = fan_sensors;</div><div class='add'>+		ABIT_UGURU_DEBUG(2, "assuming %d fan sensors because of "</div><div class='add'>+			"\"fan_sensors\" module param\n",</div><div class='add'>+			(int)data-&gt;bank2_sensors);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ABIT_UGURU_DEBUG(2, "detecting number of fan sensors\n");</div><div class='add'>+	for (i = 0; i &lt; ABIT_UGURU_MAX_BANK2_SENSORS; i++) {</div><div class='add'>+		/* 0x89 are the known used bits:</div><div class='add'>+		   -0x80 enable shutdown</div><div class='add'>+		   -0x08 enable beep</div><div class='add'>+		   -0x01 enable alarm</div><div class='add'>+		   All other bits should be 0, but on some motherboards</div><div class='add'>+		   0x40 (bit 6) is also high for some of the fans?? */</div><div class='add'>+		if (data-&gt;bank2_settings[i][0] &amp; ~0xC9) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  bank2 sensor %d does not seem "</div><div class='add'>+				"to be a fan sensor: settings[0] = %02X\n",</div><div class='add'>+				i, (unsigned int)data-&gt;bank2_settings[i][0]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* check if the threshold is within the allowed range */</div><div class='add'>+		if (data-&gt;bank2_settings[i][1] &lt;</div><div class='add'>+				abituguru_bank2_min_threshold) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  bank2 sensor %d does not seem "</div><div class='add'>+				"to be a fan sensor: the threshold (%d) is "</div><div class='add'>+				"below the minimum (%d)\n", i,</div><div class='add'>+				(int)data-&gt;bank2_settings[i][1],</div><div class='add'>+				(int)abituguru_bank2_min_threshold);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (data-&gt;bank2_settings[i][1] &gt;</div><div class='add'>+				abituguru_bank2_max_threshold) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  bank2 sensor %d does not seem "</div><div class='add'>+				"to be a fan sensor: the threshold (%d) is "</div><div class='add'>+				"above the maximum (%d)\n", i,</div><div class='add'>+				(int)data-&gt;bank2_settings[i][1],</div><div class='add'>+				(int)abituguru_bank2_max_threshold);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;bank2_sensors = i;</div><div class='add'>+	ABIT_UGURU_DEBUG(2, " found: %d fan sensors\n",</div><div class='add'>+		(int)data-&gt;bank2_sensors);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit</div><div class='add'>+abituguru_detect_no_pwms(struct abituguru_data *data)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (pwms &gt; 0 &amp;&amp; pwms &lt;= ABIT_UGURU_MAX_PWMS) {</div><div class='add'>+		data-&gt;pwms = pwms;</div><div class='add'>+		ABIT_UGURU_DEBUG(2, "assuming %d PWM outputs because of "</div><div class='add'>+			"\"pwms\" module param\n", (int)data-&gt;pwms);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ABIT_UGURU_DEBUG(2, "detecting number of PWM outputs\n");</div><div class='add'>+	for (i = 0; i &lt; ABIT_UGURU_MAX_PWMS; i++) {</div><div class='add'>+		/* 0x80 is the enable bit and the low</div><div class='add'>+		   nibble is which temp sensor to use,</div><div class='add'>+		   the other bits should be 0 */</div><div class='add'>+		if (data-&gt;pwm_settings[i][0] &amp; ~0x8F) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  pwm channel %d does not seem "</div><div class='add'>+				"to be a pwm channel: settings[0] = %02X\n",</div><div class='add'>+				i, (unsigned int)data-&gt;pwm_settings[i][0]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* the low nibble must correspond to one of the temp sensors</div><div class='add'>+		   we've found */</div><div class='add'>+		for (j = 0; j &lt; data-&gt;bank1_sensors[ABIT_UGURU_TEMP_SENSOR];</div><div class='add'>+				j++) {</div><div class='add'>+			if (data-&gt;bank1_address[ABIT_UGURU_TEMP_SENSOR][j] ==</div><div class='add'>+					(data-&gt;pwm_settings[i][0] &amp; 0x0F))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (j == data-&gt;bank1_sensors[ABIT_UGURU_TEMP_SENSOR]) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  pwm channel %d does not seem "</div><div class='add'>+				"to be a pwm channel: %d is not a valid temp "</div><div class='add'>+				"sensor address\n", i,</div><div class='add'>+				data-&gt;pwm_settings[i][0] &amp; 0x0F);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* check if all other settings are within the allowed range */</div><div class='add'>+		for (j = 1; j &lt; 5; j++) {</div><div class='add'>+			u8 min;</div><div class='add'>+			/* special case pwm1 min pwm% */</div><div class='add'>+			if ((i == 0) &amp;&amp; ((j == 1) || (j == 2)))</div><div class='add'>+				min = 77;</div><div class='add'>+			else</div><div class='add'>+				min = abituguru_pwm_min[j];</div><div class='add'>+			if (data-&gt;pwm_settings[i][j] &lt; min) {</div><div class='add'>+				ABIT_UGURU_DEBUG(2, "  pwm channel %d does "</div><div class='add'>+					"not seem to be a pwm channel: "</div><div class='add'>+					"setting %d (%d) is below the minimum "</div><div class='add'>+					"value (%d)\n", i, j,</div><div class='add'>+					(int)data-&gt;pwm_settings[i][j],</div><div class='add'>+					(int)min);</div><div class='add'>+				goto abituguru_detect_no_pwms_exit;</div><div class='add'>+			}</div><div class='add'>+			if (data-&gt;pwm_settings[i][j] &gt; abituguru_pwm_max[j]) {</div><div class='add'>+				ABIT_UGURU_DEBUG(2, "  pwm channel %d does "</div><div class='add'>+					"not seem to be a pwm channel: "</div><div class='add'>+					"setting %d (%d) is above the maximum "</div><div class='add'>+					"value (%d)\n", i, j,</div><div class='add'>+					(int)data-&gt;pwm_settings[i][j],</div><div class='add'>+					(int)abituguru_pwm_max[j]);</div><div class='add'>+				goto abituguru_detect_no_pwms_exit;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* check that min temp &lt; max temp and min pwm &lt; max pwm */</div><div class='add'>+		if (data-&gt;pwm_settings[i][1] &gt;= data-&gt;pwm_settings[i][2]) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  pwm channel %d does not seem "</div><div class='add'>+				"to be a pwm channel: min pwm (%d) &gt;= "</div><div class='add'>+				"max pwm (%d)\n", i,</div><div class='add'>+				(int)data-&gt;pwm_settings[i][1],</div><div class='add'>+				(int)data-&gt;pwm_settings[i][2]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (data-&gt;pwm_settings[i][3] &gt;= data-&gt;pwm_settings[i][4]) {</div><div class='add'>+			ABIT_UGURU_DEBUG(2, "  pwm channel %d does not seem "</div><div class='add'>+				"to be a pwm channel: min temp (%d) &gt;= "</div><div class='add'>+				"max temp (%d)\n", i,</div><div class='add'>+				(int)data-&gt;pwm_settings[i][3],</div><div class='add'>+				(int)data-&gt;pwm_settings[i][4]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+abituguru_detect_no_pwms_exit:</div><div class='add'>+	data-&gt;pwms = i;</div><div class='add'>+	ABIT_UGURU_DEBUG(2, " found: %d PWM outputs\n", (int)data-&gt;pwms);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Following are the sysfs callback functions. These functions expect:</div><div class='add'>+   sensor_device_attribute_2-&gt;index:   sensor address/offset in the bank</div><div class='add'>+   sensor_device_attribute_2-&gt;nr:      register offset, bitmask or NA. */</div><div class='add'>+static struct abituguru_data *abituguru_update_device(struct device *dev);</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank1_value(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = abituguru_update_device(dev);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return sprintf(buf, "%d\n", (data-&gt;bank1_value[attr-&gt;index] *</div><div class='add'>+		data-&gt;bank1_max_value[attr-&gt;index] + 128) / 255);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank1_setting(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	return sprintf(buf, "%d\n",</div><div class='add'>+		(data-&gt;bank1_settings[attr-&gt;index][attr-&gt;nr] *</div><div class='add'>+		data-&gt;bank1_max_value[attr-&gt;index] + 128) / 255);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank2_value(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = abituguru_update_device(dev);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return sprintf(buf, "%d\n", (data-&gt;bank2_value[attr-&gt;index] *</div><div class='add'>+		ABIT_UGURU_FAN_MAX + 128) / 255);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank2_setting(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	return sprintf(buf, "%d\n",</div><div class='add'>+		(data-&gt;bank2_settings[attr-&gt;index][attr-&gt;nr] *</div><div class='add'>+		ABIT_UGURU_FAN_MAX + 128) / 255);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_bank1_setting(struct device *dev, struct device_attribute</div><div class='add'>+	*devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	u8 val = (simple_strtoul(buf, NULL, 10) * 255 +</div><div class='add'>+		data-&gt;bank1_max_value[attr-&gt;index]/2) /</div><div class='add'>+		data-&gt;bank1_max_value[attr-&gt;index];</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	if (data-&gt;bank1_settings[attr-&gt;index][attr-&gt;nr] != val) {</div><div class='add'>+		u8 orig_val = data-&gt;bank1_settings[attr-&gt;index][attr-&gt;nr];</div><div class='add'>+		data-&gt;bank1_settings[attr-&gt;index][attr-&gt;nr] = val;</div><div class='add'>+		if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK1 + 2,</div><div class='add'>+				attr-&gt;index, data-&gt;bank1_settings[attr-&gt;index],</div><div class='add'>+				3) &lt;= attr-&gt;nr) {</div><div class='add'>+			data-&gt;bank1_settings[attr-&gt;index][attr-&gt;nr] = orig_val;</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_bank2_setting(struct device *dev, struct device_attribute</div><div class='add'>+	*devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	u8 val = (simple_strtoul(buf, NULL, 10)*255 + ABIT_UGURU_FAN_MAX/2) /</div><div class='add'>+		ABIT_UGURU_FAN_MAX;</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+</div><div class='add'>+	/* this check can be done before taking the lock */</div><div class='add'>+	if ((val &lt; abituguru_bank2_min_threshold) ||</div><div class='add'>+			(val &gt; abituguru_bank2_max_threshold))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	if (data-&gt;bank2_settings[attr-&gt;index][attr-&gt;nr] != val) {</div><div class='add'>+		u8 orig_val = data-&gt;bank2_settings[attr-&gt;index][attr-&gt;nr];</div><div class='add'>+		data-&gt;bank2_settings[attr-&gt;index][attr-&gt;nr] = val;</div><div class='add'>+		if (abituguru_write(data, ABIT_UGURU_SENSOR_BANK2 + 2,</div><div class='add'>+				attr-&gt;index, data-&gt;bank2_settings[attr-&gt;index],</div><div class='add'>+				2) &lt;= attr-&gt;nr) {</div><div class='add'>+			data-&gt;bank2_settings[attr-&gt;index][attr-&gt;nr] = orig_val;</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank1_alarm(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = abituguru_update_device(dev);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EIO;</div><div class='add'>+	/* See if the alarm bit for this sensor is set, and if the</div><div class='add'>+	   alarm matches the type of alarm we're looking for (for volt</div><div class='add'>+	   it can be either low or high). The type is stored in a few</div><div class='add'>+	   readonly bits in the settings part of the relevant sensor.</div><div class='add'>+	   The bitmask of the type is passed to us in attr-&gt;nr. */</div><div class='add'>+	if ((data-&gt;alarms[attr-&gt;index / 8] &amp; (0x01 &lt;&lt; (attr-&gt;index % 8))) &amp;&amp;</div><div class='add'>+			(data-&gt;bank1_settings[attr-&gt;index][0] &amp; attr-&gt;nr))</div><div class='add'>+		return sprintf(buf, "1\n");</div><div class='add'>+	else</div><div class='add'>+		return sprintf(buf, "0\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank2_alarm(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = abituguru_update_device(dev);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (data-&gt;alarms[2] &amp; (0x01 &lt;&lt; attr-&gt;index))</div><div class='add'>+		return sprintf(buf, "1\n");</div><div class='add'>+	else</div><div class='add'>+		return sprintf(buf, "0\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank1_mask(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	if (data-&gt;bank1_settings[attr-&gt;index][0] &amp; attr-&gt;nr)</div><div class='add'>+		return sprintf(buf, "1\n");</div><div class='add'>+	else</div><div class='add'>+		return sprintf(buf, "0\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bank2_mask(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	if (data-&gt;bank2_settings[attr-&gt;index][0] &amp; attr-&gt;nr)</div><div class='add'>+		return sprintf(buf, "1\n");</div><div class='add'>+	else</div><div class='add'>+		return sprintf(buf, "0\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_bank1_mask(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	int mask = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+	u8 orig_val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	orig_val = data-&gt;bank1_settings[attr-&gt;index][0];</div><div class='add'>+</div><div class='add'>+	if (mask)</div><div class='add'>+		data-&gt;bank1_settings[attr-&gt;index][0] |= attr-&gt;nr;</div><div class='add'>+	else</div><div class='add'>+		data-&gt;bank1_settings[attr-&gt;index][0] &amp;= ~attr-&gt;nr;</div><div class='add'>+</div><div class='add'>+	if ((data-&gt;bank1_settings[attr-&gt;index][0] != orig_val) &amp;&amp;</div><div class='add'>+			(abituguru_write(data,</div><div class='add'>+			ABIT_UGURU_SENSOR_BANK1 + 2, attr-&gt;index,</div><div class='add'>+			data-&gt;bank1_settings[attr-&gt;index], 3) &lt; 1)) {</div><div class='add'>+		data-&gt;bank1_settings[attr-&gt;index][0] = orig_val;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_bank2_mask(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	int mask = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+	u8 orig_val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	orig_val = data-&gt;bank2_settings[attr-&gt;index][0];</div><div class='add'>+</div><div class='add'>+	if (mask)</div><div class='add'>+		data-&gt;bank2_settings[attr-&gt;index][0] |= attr-&gt;nr;</div><div class='add'>+	else</div><div class='add'>+		data-&gt;bank2_settings[attr-&gt;index][0] &amp;= ~attr-&gt;nr;</div><div class='add'>+</div><div class='add'>+	if ((data-&gt;bank2_settings[attr-&gt;index][0] != orig_val) &amp;&amp;</div><div class='add'>+			(abituguru_write(data,</div><div class='add'>+			ABIT_UGURU_SENSOR_BANK2 + 2, attr-&gt;index,</div><div class='add'>+			data-&gt;bank2_settings[attr-&gt;index], 2) &lt; 1)) {</div><div class='add'>+		data-&gt;bank2_settings[attr-&gt;index][0] = orig_val;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fan PWM (speed control) */</div><div class='add'>+static ssize_t show_pwm_setting(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr] *</div><div class='add'>+		abituguru_pwm_settings_multiplier[attr-&gt;nr]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_pwm_setting(struct device *dev, struct device_attribute</div><div class='add'>+	*devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	u8 min, val = (simple_strtoul(buf, NULL, 10) +</div><div class='add'>+		abituguru_pwm_settings_multiplier[attr-&gt;nr]/2) /</div><div class='add'>+		abituguru_pwm_settings_multiplier[attr-&gt;nr];</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+</div><div class='add'>+	/* special case pwm1 min pwm% */</div><div class='add'>+	if ((attr-&gt;index == 0) &amp;&amp; ((attr-&gt;nr == 1) || (attr-&gt;nr == 2)))</div><div class='add'>+		min = 77;</div><div class='add'>+	else</div><div class='add'>+		min = abituguru_pwm_min[attr-&gt;nr];</div><div class='add'>+</div><div class='add'>+	/* this check can be done before taking the lock */</div><div class='add'>+	if ((val &lt; min) || (val &gt; abituguru_pwm_max[attr-&gt;nr]))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	/* this check needs to be done after taking the lock */</div><div class='add'>+	if ((attr-&gt;nr &amp; 1) &amp;&amp;</div><div class='add'>+			(val &gt;= data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr + 1]))</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else if (!(attr-&gt;nr &amp; 1) &amp;&amp;</div><div class='add'>+			(val &lt;= data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr - 1]))</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	else if (data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr] != val) {</div><div class='add'>+		u8 orig_val = data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr];</div><div class='add'>+		data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr] = val;</div><div class='add'>+		if (abituguru_write(data, ABIT_UGURU_FAN_PWM + 1,</div><div class='add'>+				attr-&gt;index, data-&gt;pwm_settings[attr-&gt;index],</div><div class='add'>+				5) &lt;= attr-&gt;nr) {</div><div class='add'>+			data-&gt;pwm_settings[attr-&gt;index][attr-&gt;nr] =</div><div class='add'>+				orig_val;</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_pwm_sensor(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	int i;</div><div class='add'>+	/* We need to walk to the temp sensor addresses to find what</div><div class='add'>+	   the userspace id of the configured temp sensor is. */</div><div class='add'>+	for (i = 0; i &lt; data-&gt;bank1_sensors[ABIT_UGURU_TEMP_SENSOR]; i++)</div><div class='add'>+		if (data-&gt;bank1_address[ABIT_UGURU_TEMP_SENSOR][i] ==</div><div class='add'>+				(data-&gt;pwm_settings[attr-&gt;index][0] &amp; 0x0F))</div><div class='add'>+			return sprintf(buf, "%d\n", i+1);</div><div class='add'>+</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_pwm_sensor(struct device *dev, struct device_attribute</div><div class='add'>+	*devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10) - 1;</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	if (val &lt; data-&gt;bank1_sensors[ABIT_UGURU_TEMP_SENSOR]) {</div><div class='add'>+		u8 orig_val = data-&gt;pwm_settings[attr-&gt;index][0];</div><div class='add'>+		u8 address = data-&gt;bank1_address[ABIT_UGURU_TEMP_SENSOR][val];</div><div class='add'>+		data-&gt;pwm_settings[attr-&gt;index][0] &amp;= 0xF0;</div><div class='add'>+		data-&gt;pwm_settings[attr-&gt;index][0] |= address;</div><div class='add'>+		if (data-&gt;pwm_settings[attr-&gt;index][0] != orig_val) {</div><div class='add'>+			if (abituguru_write(data, ABIT_UGURU_FAN_PWM + 1,</div><div class='add'>+					attr-&gt;index,</div><div class='add'>+					data-&gt;pwm_settings[attr-&gt;index],</div><div class='add'>+					5) &lt; 1) {</div><div class='add'>+				data-&gt;pwm_settings[attr-&gt;index][0] = orig_val;</div><div class='add'>+				ret = -EIO;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_pwm_enable(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	int res = 0;</div><div class='add'>+	if (data-&gt;pwm_settings[attr-&gt;index][0] &amp; ABIT_UGURU_FAN_PWM_ENABLE)</div><div class='add'>+		res = 2;</div><div class='add'>+	return sprintf(buf, "%d\n", res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_pwm_enable(struct device *dev, struct device_attribute</div><div class='add'>+	*devattr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	u8 orig_val, user_val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	ssize_t ret = count;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	orig_val = data-&gt;pwm_settings[attr-&gt;index][0];</div><div class='add'>+	switch (user_val) {</div><div class='add'>+		case 0:</div><div class='add'>+			data-&gt;pwm_settings[attr-&gt;index][0] &amp;=</div><div class='add'>+				~ABIT_UGURU_FAN_PWM_ENABLE;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			data-&gt;pwm_settings[attr-&gt;index][0] |=</div><div class='add'>+				ABIT_UGURU_FAN_PWM_ENABLE;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if ((data-&gt;pwm_settings[attr-&gt;index][0] != orig_val) &amp;&amp;</div><div class='add'>+			(abituguru_write(data, ABIT_UGURU_FAN_PWM + 1,</div><div class='add'>+			attr-&gt;index, data-&gt;pwm_settings[attr-&gt;index],</div><div class='add'>+			5) &lt; 1)) {</div><div class='add'>+		data-&gt;pwm_settings[attr-&gt;index][0] = orig_val;</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_name(struct device *dev,</div><div class='add'>+	struct device_attribute *devattr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sprintf(buf, "%s\n", ABIT_UGURU_NAME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sysfs attr templates, the real entries are generated automatically. */</div><div class='add'>+static const</div><div class='add'>+struct sensor_device_attribute_2 abituguru_sysfs_bank1_templ[2][9] = {</div><div class='add'>+	{</div><div class='add'>+	SENSOR_ATTR_2(in%d_input, 0444, show_bank1_value, NULL, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_min, 0644, show_bank1_setting,</div><div class='add'>+		store_bank1_setting, 1, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_min_alarm, 0444, show_bank1_alarm, NULL,</div><div class='add'>+		ABIT_UGURU_VOLT_LOW_ALARM_FLAG, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_max, 0644, show_bank1_setting,</div><div class='add'>+		store_bank1_setting, 2, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_max_alarm, 0444, show_bank1_alarm, NULL,</div><div class='add'>+		ABIT_UGURU_VOLT_HIGH_ALARM_FLAG, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_beep, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_BEEP_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_shutdown, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_SHUTDOWN_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_min_alarm_enable, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_VOLT_LOW_ALARM_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(in%d_max_alarm_enable, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_VOLT_HIGH_ALARM_ENABLE, 0),</div><div class='add'>+	}, {</div><div class='add'>+	SENSOR_ATTR_2(temp%d_input, 0444, show_bank1_value, NULL, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp%d_alarm, 0444, show_bank1_alarm, NULL,</div><div class='add'>+		ABIT_UGURU_TEMP_HIGH_ALARM_FLAG, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp%d_max, 0644, show_bank1_setting,</div><div class='add'>+		store_bank1_setting, 1, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp%d_crit, 0644, show_bank1_setting,</div><div class='add'>+		store_bank1_setting, 2, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp%d_beep, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_BEEP_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp%d_shutdown, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_SHUTDOWN_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp%d_alarm_enable, 0644, show_bank1_mask,</div><div class='add'>+		store_bank1_mask, ABIT_UGURU_TEMP_HIGH_ALARM_ENABLE, 0),</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sensor_device_attribute_2 abituguru_sysfs_fan_templ[6] = {</div><div class='add'>+	SENSOR_ATTR_2(fan%d_input, 0444, show_bank2_value, NULL, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(fan%d_alarm, 0444, show_bank2_alarm, NULL, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(fan%d_min, 0644, show_bank2_setting,</div><div class='add'>+		store_bank2_setting, 1, 0),</div><div class='add'>+	SENSOR_ATTR_2(fan%d_beep, 0644, show_bank2_mask,</div><div class='add'>+		store_bank2_mask, ABIT_UGURU_BEEP_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(fan%d_shutdown, 0644, show_bank2_mask,</div><div class='add'>+		store_bank2_mask, ABIT_UGURU_SHUTDOWN_ENABLE, 0),</div><div class='add'>+	SENSOR_ATTR_2(fan%d_alarm_enable, 0644, show_bank2_mask,</div><div class='add'>+		store_bank2_mask, ABIT_UGURU_FAN_LOW_ALARM_ENABLE, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sensor_device_attribute_2 abituguru_sysfs_pwm_templ[6] = {</div><div class='add'>+	SENSOR_ATTR_2(pwm%d_enable, 0644, show_pwm_enable,</div><div class='add'>+		store_pwm_enable, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(pwm%d_auto_channels_temp, 0644, show_pwm_sensor,</div><div class='add'>+		store_pwm_sensor, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(pwm%d_auto_point1_pwm, 0644, show_pwm_setting,</div><div class='add'>+		store_pwm_setting, 1, 0),</div><div class='add'>+	SENSOR_ATTR_2(pwm%d_auto_point2_pwm, 0644, show_pwm_setting,</div><div class='add'>+		store_pwm_setting, 2, 0),</div><div class='add'>+	SENSOR_ATTR_2(pwm%d_auto_point1_temp, 0644, show_pwm_setting,</div><div class='add'>+		store_pwm_setting, 3, 0),</div><div class='add'>+	SENSOR_ATTR_2(pwm%d_auto_point2_temp, 0644, show_pwm_setting,</div><div class='add'>+		store_pwm_setting, 4, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute_2 abituguru_sysfs_attr[] = {</div><div class='add'>+	SENSOR_ATTR_2(name, 0444, show_name, NULL, 0, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit abituguru_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct abituguru_data *data;</div><div class='add'>+	int i, j, used, sysfs_names_free, sysfs_attr_i, res = -ENODEV;</div><div class='add'>+	char *sysfs_filename;</div><div class='add'>+</div><div class='add'>+	/* El weirdo probe order, to keep the sysfs order identical to the</div><div class='add'>+	   BIOS and window-appliction listing order. */</div><div class='add'>+	const u8 probe_order[ABIT_UGURU_MAX_BANK1_SENSORS] = {</div><div class='add'>+		0x00, 0x01, 0x03, 0x04, 0x0A, 0x08, 0x0E, 0x02,</div><div class='add'>+		0x09, 0x06, 0x05, 0x0B, 0x0F, 0x0D, 0x07, 0x0C };</div><div class='add'>+</div><div class='add'>+	if (!(data = kzalloc(sizeof(struct abituguru_data), GFP_KERNEL)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	data-&gt;addr = platform_get_resource(pdev, IORESOURCE_IO, 0)-&gt;start;</div><div class='add'>+	mutex_init(&amp;data-&gt;update_lock);</div><div class='add'>+	platform_set_drvdata(pdev, data);</div><div class='add'>+</div><div class='add'>+	/* See if the uGuru is ready */</div><div class='add'>+	if (inb_p(data-&gt;addr + ABIT_UGURU_DATA) == ABIT_UGURU_STATUS_INPUT)</div><div class='add'>+		data-&gt;uguru_ready = 1;</div><div class='add'>+</div><div class='add'>+	/* Completely read the uGuru this has 2 purposes:</div><div class='add'>+	   - testread / see if one really is there.</div><div class='add'>+	   - make an in memory copy of all the uguru settings for future use. */</div><div class='add'>+	if (abituguru_read(data, ABIT_UGURU_ALARM_BANK, 0,</div><div class='add'>+			data-&gt;alarms, 3, ABIT_UGURU_MAX_RETRIES) != 3)</div><div class='add'>+		goto abituguru_probe_error;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ABIT_UGURU_MAX_BANK1_SENSORS; i++) {</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK1, i,</div><div class='add'>+				&amp;data-&gt;bank1_value[i], 1,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 1)</div><div class='add'>+			goto abituguru_probe_error;</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK1+1, i,</div><div class='add'>+				data-&gt;bank1_settings[i], 3,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 3)</div><div class='add'>+			goto abituguru_probe_error;</div><div class='add'>+	}</div><div class='add'>+	/* Note: We don't know how many bank2 sensors / pwms there really are,</div><div class='add'>+	   but in order to "detect" this we need to read the maximum amount</div><div class='add'>+	   anyways. If we read sensors/pwms not there we'll just read crap</div><div class='add'>+	   this can't hurt. We need the detection because we don't want</div><div class='add'>+	   unwanted writes, which will hurt! */</div><div class='add'>+	for (i = 0; i &lt; ABIT_UGURU_MAX_BANK2_SENSORS; i++) {</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK2, i,</div><div class='add'>+				&amp;data-&gt;bank2_value[i], 1,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 1)</div><div class='add'>+			goto abituguru_probe_error;</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_SENSOR_BANK2+1, i,</div><div class='add'>+				data-&gt;bank2_settings[i], 2,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 2)</div><div class='add'>+			goto abituguru_probe_error;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ABIT_UGURU_MAX_PWMS; i++) {</div><div class='add'>+		if (abituguru_read(data, ABIT_UGURU_FAN_PWM, i,</div><div class='add'>+				data-&gt;pwm_settings[i], 5,</div><div class='add'>+				ABIT_UGURU_MAX_RETRIES) != 5)</div><div class='add'>+			goto abituguru_probe_error;</div><div class='add'>+	}</div><div class='add'>+	data-&gt;last_updated = jiffies;</div><div class='add'>+</div><div class='add'>+	/* Detect sensor types and fill the sysfs attr for bank1 */</div><div class='add'>+	sysfs_attr_i = 0;</div><div class='add'>+	sysfs_filename = data-&gt;sysfs_names;</div><div class='add'>+	sysfs_names_free = ABITUGURU_SYSFS_NAMES_LENGTH;</div><div class='add'>+	for (i = 0; i &lt; ABIT_UGURU_MAX_BANK1_SENSORS; i++) {</div><div class='add'>+		res = abituguru_detect_bank1_sensor_type(data, probe_order[i]);</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			goto abituguru_probe_error;</div><div class='add'>+		if (res == ABIT_UGURU_NC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* res 1 (temp) sensors have 7 sysfs entries, 0 (in) 9 */</div><div class='add'>+		for (j = 0; j &lt; (res ? 7 : 9); j++) {</div><div class='add'>+			used = snprintf(sysfs_filename, sysfs_names_free,</div><div class='add'>+				abituguru_sysfs_bank1_templ[res][j].dev_attr.</div><div class='add'>+				attr.name, data-&gt;bank1_sensors[res] + res)</div><div class='add'>+				+ 1;</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i] =</div><div class='add'>+				abituguru_sysfs_bank1_templ[res][j];</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i].dev_attr.attr.name =</div><div class='add'>+				sysfs_filename;</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i].index = probe_order[i];</div><div class='add'>+			sysfs_filename += used;</div><div class='add'>+			sysfs_names_free -= used;</div><div class='add'>+			sysfs_attr_i++;</div><div class='add'>+		}</div><div class='add'>+		data-&gt;bank1_max_value[probe_order[i]] =</div><div class='add'>+			abituguru_bank1_max_value[res];</div><div class='add'>+		data-&gt;bank1_address[res][data-&gt;bank1_sensors[res]] =</div><div class='add'>+			probe_order[i];</div><div class='add'>+		data-&gt;bank1_sensors[res]++;</div><div class='add'>+	}</div><div class='add'>+	/* Detect number of sensors and fill the sysfs attr for bank2 (fans) */</div><div class='add'>+	abituguru_detect_no_bank2_sensors(data);</div><div class='add'>+	for (i = 0; i &lt; data-&gt;bank2_sensors; i++) {</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(abituguru_sysfs_fan_templ); j++) {</div><div class='add'>+			used = snprintf(sysfs_filename, sysfs_names_free,</div><div class='add'>+				abituguru_sysfs_fan_templ[j].dev_attr.attr.name,</div><div class='add'>+				i + 1) + 1;</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i] =</div><div class='add'>+				abituguru_sysfs_fan_templ[j];</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i].dev_attr.attr.name =</div><div class='add'>+				sysfs_filename;</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i].index = i;</div><div class='add'>+			sysfs_filename += used;</div><div class='add'>+			sysfs_names_free -= used;</div><div class='add'>+			sysfs_attr_i++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Detect number of sensors and fill the sysfs attr for pwms */</div><div class='add'>+	abituguru_detect_no_pwms(data);</div><div class='add'>+	for (i = 0; i &lt; data-&gt;pwms; i++) {</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(abituguru_sysfs_pwm_templ); j++) {</div><div class='add'>+			used = snprintf(sysfs_filename, sysfs_names_free,</div><div class='add'>+				abituguru_sysfs_pwm_templ[j].dev_attr.attr.name,</div><div class='add'>+				i + 1) + 1;</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i] =</div><div class='add'>+				abituguru_sysfs_pwm_templ[j];</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i].dev_attr.attr.name =</div><div class='add'>+				sysfs_filename;</div><div class='add'>+			data-&gt;sysfs_attr[sysfs_attr_i].index = i;</div><div class='add'>+			sysfs_filename += used;</div><div class='add'>+			sysfs_names_free -= used;</div><div class='add'>+			sysfs_attr_i++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Fail safe check, this should never happen! */</div><div class='add'>+	if (sysfs_names_free &lt; 0) {</div><div class='add'>+		printk(KERN_ERR ABIT_UGURU_NAME ": Fatal error ran out of "</div><div class='add'>+		       "space for sysfs attr names. This should never "</div><div class='add'>+		       "happen please report to the abituguru maintainer "</div><div class='add'>+		       "(see MAINTAINERS)\n");</div><div class='add'>+		res = -ENAMETOOLONG;</div><div class='add'>+		goto abituguru_probe_error;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO ABIT_UGURU_NAME ": found Abit uGuru\n");</div><div class='add'>+</div><div class='add'>+	/* Register sysfs hooks */</div><div class='add'>+	data-&gt;class_dev = hwmon_device_register(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(data-&gt;class_dev)) {</div><div class='add'>+		res = PTR_ERR(data-&gt;class_dev);</div><div class='add'>+		goto abituguru_probe_error;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; sysfs_attr_i; i++)</div><div class='add'>+		device_create_file(&amp;pdev-&gt;dev, &amp;data-&gt;sysfs_attr[i].dev_attr);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(abituguru_sysfs_attr); i++)</div><div class='add'>+		device_create_file(&amp;pdev-&gt;dev,</div><div class='add'>+			&amp;abituguru_sysfs_attr[i].dev_attr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abituguru_probe_error:</div><div class='add'>+	kfree(data);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit abituguru_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct abituguru_data *data = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	hwmon_device_unregister(data-&gt;class_dev);</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct abituguru_data *abituguru_update_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+	struct abituguru_data *data = dev_get_drvdata(dev);</div><div class='add'>+	/* fake a complete successful read if no update necessary. */</div><div class='add'>+	char success = 1;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	if (time_after(jiffies, data-&gt;last_updated + HZ)) {</div><div class='add'>+		success = 0;</div><div class='add'>+		if ((err = abituguru_read(data, ABIT_UGURU_ALARM_BANK, 0,</div><div class='add'>+				data-&gt;alarms, 3, 0)) != 3)</div><div class='add'>+			goto LEAVE_UPDATE;</div><div class='add'>+		for (i = 0; i &lt; ABIT_UGURU_MAX_BANK1_SENSORS; i++) {</div><div class='add'>+			if ((err = abituguru_read(data,</div><div class='add'>+					ABIT_UGURU_SENSOR_BANK1, i,</div><div class='add'>+					&amp;data-&gt;bank1_value[i], 1, 0)) != 1)</div><div class='add'>+				goto LEAVE_UPDATE;</div><div class='add'>+			if ((err = abituguru_read(data,</div><div class='add'>+					ABIT_UGURU_SENSOR_BANK1 + 1, i,</div><div class='add'>+					data-&gt;bank1_settings[i], 3, 0)) != 3)</div><div class='add'>+				goto LEAVE_UPDATE;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; data-&gt;bank2_sensors; i++)</div><div class='add'>+			if ((err = abituguru_read(data,</div><div class='add'>+					ABIT_UGURU_SENSOR_BANK2, i,</div><div class='add'>+					&amp;data-&gt;bank2_value[i], 1, 0)) != 1)</div><div class='add'>+				goto LEAVE_UPDATE;</div><div class='add'>+		/* success! */</div><div class='add'>+		success = 1;</div><div class='add'>+		data-&gt;update_timeouts = 0;</div><div class='add'>+LEAVE_UPDATE:</div><div class='add'>+		/* handle timeout condition */</div><div class='add'>+		if (err == -EBUSY) {</div><div class='add'>+			/* No overflow please */</div><div class='add'>+			if (data-&gt;update_timeouts &lt; 255u)</div><div class='add'>+				data-&gt;update_timeouts++;</div><div class='add'>+			if (data-&gt;update_timeouts &lt;= ABIT_UGURU_MAX_TIMEOUTS) {</div><div class='add'>+				ABIT_UGURU_DEBUG(3, "timeout exceeded, will "</div><div class='add'>+					"try again next update\n");</div><div class='add'>+				/* Just a timeout, fake a successful read */</div><div class='add'>+				success = 1;</div><div class='add'>+			} else</div><div class='add'>+				ABIT_UGURU_DEBUG(1, "timeout exceeded %d "</div><div class='add'>+					"times waiting for more input state\n",</div><div class='add'>+					(int)data-&gt;update_timeouts);</div><div class='add'>+		}</div><div class='add'>+		/* On success set last_updated */</div><div class='add'>+		if (success)</div><div class='add'>+			data-&gt;last_updated = jiffies;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	if (success)</div><div class='add'>+		return data;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver abituguru_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= ABIT_UGURU_NAME,</div><div class='add'>+	},</div><div class='add'>+	.probe	= abituguru_probe,</div><div class='add'>+	.remove	= __devexit_p(abituguru_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init abituguru_detect(void)</div><div class='add'>+{</div><div class='add'>+	/* See if there is an uguru there. After a reboot uGuru will hold 0x00</div><div class='add'>+	   at DATA and 0xAC, when this driver has already been loaded once</div><div class='add'>+	   DATA will hold 0x08. For most uGuru's CMD will hold 0xAC in either</div><div class='add'>+	   scenario but some will hold 0x00.</div><div class='add'>+	   Some uGuru's initally hold 0x09 at DATA and will only hold 0x08</div><div class='add'>+	   after reading CMD first, so CMD must be read first! */</div><div class='add'>+	u8 cmd_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_CMD);</div><div class='add'>+	u8 data_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_DATA);</div><div class='add'>+	if (((data_val == 0x00) || (data_val == 0x08)) &amp;&amp;</div><div class='add'>+	    ((cmd_val == 0x00) || (cmd_val == 0xAC)))</div><div class='add'>+		return ABIT_UGURU_BASE;</div><div class='add'>+</div><div class='add'>+	ABIT_UGURU_DEBUG(2, "no Abit uGuru found, data = 0x%02X, cmd = "</div><div class='add'>+		"0x%02X\n", (unsigned int)data_val, (unsigned int)cmd_val);</div><div class='add'>+</div><div class='add'>+	if (force) {</div><div class='add'>+		printk(KERN_INFO ABIT_UGURU_NAME ": Assuming Abit uGuru is "</div><div class='add'>+				"present because of \"force\" parameter\n");</div><div class='add'>+		return ABIT_UGURU_BASE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No uGuru found */</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_device *abituguru_pdev;</div><div class='add'>+</div><div class='add'>+static int __init abituguru_init(void)</div><div class='add'>+{</div><div class='add'>+	int address, err;</div><div class='add'>+	struct resource res = { .flags = IORESOURCE_IO };</div><div class='add'>+</div><div class='add'>+	address = abituguru_detect();</div><div class='add'>+	if (address &lt; 0)</div><div class='add'>+		return address;</div><div class='add'>+</div><div class='add'>+	err = platform_driver_register(&amp;abituguru_driver);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	abituguru_pdev = platform_device_alloc(ABIT_UGURU_NAME, address);</div><div class='add'>+	if (!abituguru_pdev) {</div><div class='add'>+		printk(KERN_ERR ABIT_UGURU_NAME</div><div class='add'>+			": Device allocation failed\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit_driver_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res.start = address;</div><div class='add'>+	res.end = address + ABIT_UGURU_REGION_LENGTH - 1;</div><div class='add'>+	res.name = ABIT_UGURU_NAME;</div><div class='add'>+</div><div class='add'>+	err = platform_device_add_resources(abituguru_pdev, &amp;res, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR ABIT_UGURU_NAME</div><div class='add'>+			": Device resource addition failed (%d)\n", err);</div><div class='add'>+		goto exit_device_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = platform_device_add(abituguru_pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR ABIT_UGURU_NAME</div><div class='add'>+			": Device addition failed (%d)\n", err);</div><div class='add'>+		goto exit_device_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_device_put:</div><div class='add'>+	platform_device_put(abituguru_pdev);</div><div class='add'>+exit_driver_unregister:</div><div class='add'>+	platform_driver_unregister(&amp;abituguru_driver);</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit abituguru_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_unregister(abituguru_pdev);</div><div class='add'>+	platform_driver_unregister(&amp;abituguru_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Hans de Goede &lt;j.w.r.degoede@hhs.nl&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Abit uGuru Sensor device");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+module_init(abituguru_init);</div><div class='add'>+module_exit(abituguru_exit);</div><div class='head'>diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c<br/>index 65b2709f750c..facc1ccb8338 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/asb100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/asb100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/asb100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/asb100.c</a></div><div class='hunk'>@@ -341,7 +341,7 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t set_fan_div(struct device *dev, const char *buf,</div><div class='ctx'> 				size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c<br/>index 885465df6e6a..fd72440faf76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/f71805f.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/f71805f.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/f71805f.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/f71805f.c</a></div><div class='hunk'>@@ -99,10 +99,6 @@ superio_exit(int base)</div><div class='ctx'> #define ADDR_REG_OFFSET		0</div><div class='ctx'> #define DATA_REG_OFFSET		1</div><div class='ctx'> </div><div class='del'>-static struct resource f71805f_resource __initdata = {</div><div class='del'>-	.flags	= IORESOURCE_IO,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Registers</div><div class='ctx'>  */</div><div class='hunk'>@@ -782,6 +778,11 @@ static struct platform_driver f71805f_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init f71805f_device_add(unsigned short address)</div><div class='ctx'> {</div><div class='add'>+	struct resource res = {</div><div class='add'>+		.start	= address,</div><div class='add'>+		.end	= address + REGION_LENGTH - 1,</div><div class='add'>+		.flags	= IORESOURCE_IO,</div><div class='add'>+	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	pdev = platform_device_alloc(DRVNAME, address);</div><div class='hunk'>@@ -791,10 +792,8 @@ static int __init f71805f_device_add(unsigned short address)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	f71805f_resource.start = address;</div><div class='del'>-	f71805f_resource.end = address + REGION_LENGTH - 1;</div><div class='del'>-	f71805f_resource.name = pdev-&gt;name;</div><div class='del'>-	err = platform_device_add_resources(pdev, &amp;f71805f_resource, 1);</div><div class='add'>+	res.name = pdev-&gt;name;</div><div class='add'>+	err = platform_device_add_resources(pdev, &amp;res, 1);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR DRVNAME ": Device resource addition failed "</div><div class='ctx'> 		       "(%d)\n", err);</div><div class='head'>diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c<br/>index 1659f6c41458..42b632889dd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/hdaps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/hdaps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/hdaps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/hdaps.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #define HDAPS_PORT_STATE	0x1611	/* device state */</div><div class='ctx'> #define HDAPS_PORT_YPOS		0x1612	/* y-axis position */</div><div class='ctx'> #define	HDAPS_PORT_XPOS		0x1614	/* x-axis position */</div><div class='del'>-#define HDAPS_PORT_TEMP1	0x1616	/* device temperature, in celcius */</div><div class='add'>+#define HDAPS_PORT_TEMP1	0x1616	/* device temperature, in Celsius */</div><div class='ctx'> #define HDAPS_PORT_YVAR		0x1617	/* y-axis variance (what is this?) */</div><div class='ctx'> #define HDAPS_PORT_XVAR		0x1619	/* x-axis variance (what is this?) */</div><div class='ctx'> #define HDAPS_PORT_TEMP2	0x161b	/* device temperature (again?) */</div><div class='hunk'>@@ -522,13 +522,15 @@ static int __init hdaps_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Note that DMI_MATCH(...,"ThinkPad T42") will match "ThinkPad T42p" */</div><div class='add'>+	/* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match</div><div class='add'>+	  "ThinkPad T42p", so the order of the entries matters */</div><div class='ctx'> 	struct dmi_system_id hdaps_whitelist[] = {</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_INVERT("ThinkPad R50p"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R50"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R51"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad R52"),</div><div class='add'>+		HDAPS_DMI_MATCH_NORMAL("ThinkPad H"),	 /* R52 (1846AQG) */</div><div class='ctx'> 		HDAPS_DMI_MATCH_INVERT("ThinkPad T41p"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad T41"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_INVERT("ThinkPad T42p"),</div><div class='hunk'>@@ -536,9 +538,9 @@ static int __init hdaps_init(void)</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad T43"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_LENOVO("ThinkPad T60p"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X40"),</div><div class='del'>-		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41 Tablet"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_NORMAL("ThinkPad X41"),</div><div class='ctx'> 		HDAPS_DMI_MATCH_LENOVO("ThinkPad X60"),</div><div class='add'>+		HDAPS_DMI_MATCH_NORMAL("ThinkPad Z60m"),</div><div class='ctx'> 		{ .ident = NULL }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c<br/>index a74a44f16f51..9d67320e6840 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/hwmon-vid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/hwmon-vid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/hwmon-vid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/hwmon-vid.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-vid.h&gt;</div><div class='hunk'>@@ -58,11 +57,20 @@</div><div class='ctx'>     doesn't seem to be any named specification for these. The conversion</div><div class='ctx'>     tables are detailed directly in the various Pentium M datasheets:</div><div class='ctx'>     http://www.intel.com/design/intarch/pentiumm/docs_pentiumm.htm</div><div class='add'>+</div><div class='add'>+    The 14 specification corresponds to Intel Core series. There</div><div class='add'>+    doesn't seem to be any named specification for these. The conversion</div><div class='add'>+    tables are detailed directly in the various Pentium Core datasheets:</div><div class='add'>+    http://www.intel.com/design/mobile/datashts/309221.htm</div><div class='add'>+</div><div class='add'>+    The 110 (VRM 11) specification corresponds to Intel Conroe based series.</div><div class='add'>+    http://www.intel.com/design/processor/applnots/313214.htm</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /* vrm is the VRM/VRD document version multiplied by 10.</div><div class='del'>-   val is the 4-, 5- or 6-bit VID code.</div><div class='del'>-   Returned value is in mV to avoid floating point in the kernel. */</div><div class='add'>+   val is the 4-bit or more VID code.</div><div class='add'>+   Returned value is in mV to avoid floating point in the kernel.</div><div class='add'>+   Some VID have some bits in uV scale, this is rounded to mV */</div><div class='ctx'> int vid_from_reg(int val, u8 vrm)</div><div class='ctx'> {</div><div class='ctx'> 	int vid;</div><div class='hunk'>@@ -70,26 +78,36 @@ int vid_from_reg(int val, u8 vrm)</div><div class='ctx'> 	switch(vrm) {</div><div class='ctx'> </div><div class='ctx'> 	case 100:               /* VRD 10.0 */</div><div class='add'>+		/* compute in uV, round to mV */</div><div class='add'>+		val &amp;= 0x3f;</div><div class='ctx'> 		if((val &amp; 0x1f) == 0x1f)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if((val &amp; 0x1f) &lt;= 0x09 || val == 0x0a)</div><div class='del'>-			vid = 10875 - (val &amp; 0x1f) * 250;</div><div class='add'>+			vid = 1087500 - (val &amp; 0x1f) * 25000;</div><div class='ctx'> 		else</div><div class='del'>-			vid = 18625 - (val &amp; 0x1f) * 250;</div><div class='add'>+			vid = 1862500 - (val &amp; 0x1f) * 25000;</div><div class='ctx'> 		if(val &amp; 0x20)</div><div class='del'>-			vid -= 125;</div><div class='del'>-		vid /= 10;      /* only return 3 dec. places for now */</div><div class='del'>-		return vid;</div><div class='add'>+			vid -= 12500;</div><div class='add'>+		return((vid + 500) / 1000);</div><div class='ctx'> </div><div class='add'>+	case 110:		/* Intel Conroe */</div><div class='add'>+				/* compute in uV, round to mV */</div><div class='add'>+		val &amp;= 0xff;</div><div class='add'>+		if(((val &amp; 0x7e) == 0xfe) || (!(val &amp; 0x7e)))</div><div class='add'>+			return 0;</div><div class='add'>+		return((1600000 - (val - 2) * 6250 + 500) / 1000);</div><div class='ctx'> 	case 24:                /* Opteron processor */</div><div class='add'>+		val &amp;= 0x1f;</div><div class='ctx'> 		return(val == 0x1f ? 0 : 1550 - val * 25);</div><div class='ctx'> </div><div class='ctx'> 	case 91:		/* VRM 9.1 */</div><div class='ctx'> 	case 90:		/* VRM 9.0 */</div><div class='add'>+		val &amp;= 0x1f;</div><div class='ctx'> 		return(val == 0x1f ? 0 :</div><div class='ctx'> 		                       1850 - val * 25);</div><div class='ctx'> </div><div class='ctx'> 	case 85:		/* VRM 8.5 */</div><div class='add'>+		val &amp;= 0x1f;</div><div class='ctx'> 		return((val &amp; 0x10  ? 25 : 0) +</div><div class='ctx'> 		       ((val &amp; 0x0f) &gt; 0x04 ? 2050 : 1250) -</div><div class='ctx'> 		       ((val &amp; 0x0f) * 50));</div><div class='hunk'>@@ -98,14 +116,21 @@ int vid_from_reg(int val, u8 vrm)</div><div class='ctx'> 		val &amp;= 0x0f;</div><div class='ctx'> 				/* fall through */</div><div class='ctx'> 	case 82:		/* VRM 8.2 */</div><div class='add'>+		val &amp;= 0x1f;</div><div class='ctx'> 		return(val == 0x1f ? 0 :</div><div class='ctx'> 		       val &amp; 0x10  ? 5100 - (val) * 100 :</div><div class='ctx'> 		                     2050 - (val) * 50);</div><div class='ctx'> 	case 17:		/* Intel IMVP-II */</div><div class='add'>+		val &amp;= 0x1f;</div><div class='ctx'> 		return(val &amp; 0x10 ? 975 - (val &amp; 0xF) * 25 :</div><div class='ctx'> 				    1750 - val * 50);</div><div class='ctx'> 	case 13:</div><div class='del'>-		return(1708 - (val &amp; 0x3f) * 16);</div><div class='add'>+		val &amp;= 0x3f;</div><div class='add'>+		return(1708 - val * 16);</div><div class='add'>+	case 14:		/* Intel Core */</div><div class='add'>+				/* compute in uV, round to mV */</div><div class='add'>+		val &amp;= 0x7f;</div><div class='add'>+		return(val &gt; 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000);</div><div class='ctx'> 	default:		/* report 0 for unknown */</div><div class='ctx'> 		printk(KERN_INFO "hwmon-vid: requested unknown VRM version\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -138,6 +163,8 @@ static struct vrm_model vrm_models[] = {</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13},		/* Pentium M (130 nm) */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},		/* Tualatin */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13},		/* Pentium M (90 nm) */</div><div class='add'>+	{X86_VENDOR_INTEL, 0x6, 0xE, ANY, 14},		/* Intel Core (65 nm) */</div><div class='add'>+	{X86_VENDOR_INTEL, 0x6, 0xF, ANY, 110},		/* Intel Conroe */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x6, ANY, ANY, 82},		/* any P6 */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0x7, ANY, ANY, 0},		/* Itanium */</div><div class='ctx'> 	{X86_VENDOR_INTEL, 0xF, 0x0, ANY, 90},		/* P4 */</div><div class='head'>diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c<br/>new file mode 100644<br/>index 000000000000..6ba84731b9cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm70.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/lm70.c</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+/*</div><div class='add'>+ * lm70.c</div><div class='add'>+ *</div><div class='add'>+ * The LM70 is a temperature sensor chip from National Semiconductor (NS).</div><div class='add'>+ * Copyright (C) 2006 Kaiwan N Billimoria &lt;kaiwan@designergraphix.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * The LM70 communicates with a host processor via an SPI/Microwire Bus</div><div class='add'>+ * interface. The complete datasheet is available at National's website</div><div class='add'>+ * here:</div><div class='add'>+ * http://www.national.com/pf/LM/LM70.html</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRVNAME		"lm70"</div><div class='add'>+</div><div class='add'>+struct lm70 {</div><div class='add'>+	struct class_device *cdev;</div><div class='add'>+	struct semaphore sem;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sysfs hook function */</div><div class='add'>+static ssize_t lm70_sense_temp(struct device *dev,</div><div class='add'>+		struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	int status, val;</div><div class='add'>+	u8 rxbuf[2];</div><div class='add'>+	s16 raw=0;</div><div class='add'>+	struct lm70 *p_lm70 = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (down_interruptible(&amp;p_lm70-&gt;sem))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * spi_read() requires a DMA-safe buffer; so we use</div><div class='add'>+	 * spi_write_then_read(), transmitting 0 bytes.</div><div class='add'>+	 */</div><div class='add'>+	status = spi_write_then_read(spi, NULL, 0, &amp;rxbuf[0], 2);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		"spi_write_then_read failed with status %d\n", status);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(dev, "rxbuf[1] : 0x%x rxbuf[0] : 0x%x\n", rxbuf[1], rxbuf[0]);</div><div class='add'>+</div><div class='add'>+	raw = (rxbuf[1] &lt;&lt; 8) + rxbuf[0];</div><div class='add'>+	dev_dbg(dev, "raw=0x%x\n", raw);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The "raw" temperature read into rxbuf[] is a 16-bit signed 2's</div><div class='add'>+	 * complement value. Only the MSB 11 bits (1 sign + 10 temperature</div><div class='add'>+	 * bits) are meaningful; the LSB 5 bits are to be discarded.</div><div class='add'>+	 * See the datasheet.</div><div class='add'>+	 *</div><div class='add'>+	 * Further, each bit represents 0.25 degrees Celsius; so, multiply</div><div class='add'>+	 * by 0.25. Also multiply by 1000 to represent in millidegrees</div><div class='add'>+	 * Celsius.</div><div class='add'>+	 * So it's equivalent to multiplying by 0.25 * 1000 = 250.</div><div class='add'>+	 */</div><div class='add'>+	val = ((int)raw/32) * 250;</div><div class='add'>+	status = sprintf(buf, "%+d\n", val); /* millidegrees Celsius */</div><div class='add'>+out:</div><div class='add'>+	up(&amp;p_lm70-&gt;sem);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(temp1_input, S_IRUGO, lm70_sense_temp, NULL);</div><div class='add'>+</div><div class='add'>+/*----------------------------------------------------------------------*/</div><div class='add'>+</div><div class='add'>+static int __devinit lm70_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct lm70 *p_lm70;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	p_lm70 = kzalloc(sizeof *p_lm70, GFP_KERNEL);</div><div class='add'>+	if (!p_lm70)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	init_MUTEX(&amp;p_lm70-&gt;sem);</div><div class='add'>+</div><div class='add'>+	/* sysfs hook */</div><div class='add'>+	p_lm70-&gt;cdev = hwmon_device_register(&amp;spi-&gt;dev);</div><div class='add'>+	if (IS_ERR(p_lm70-&gt;cdev)) {</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "hwmon_device_register failed.\n");</div><div class='add'>+		status = PTR_ERR(p_lm70-&gt;cdev);</div><div class='add'>+		goto out_dev_reg_failed;</div><div class='add'>+	}</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, p_lm70);</div><div class='add'>+</div><div class='add'>+	if ((status = device_create_file(&amp;spi-&gt;dev, &amp;dev_attr_temp1_input))) {</div><div class='add'>+		dev_dbg(&amp;spi-&gt;dev, "device_create_file failure.\n");</div><div class='add'>+		goto out_dev_create_file_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_dev_create_file_failed:</div><div class='add'>+	hwmon_device_unregister(p_lm70-&gt;cdev);</div><div class='add'>+out_dev_reg_failed:</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	kfree(p_lm70);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __exit lm70_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct lm70 *p_lm70 = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	device_remove_file(&amp;spi-&gt;dev, &amp;dev_attr_temp1_input);</div><div class='add'>+	hwmon_device_unregister(p_lm70-&gt;cdev);</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	kfree(p_lm70);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver lm70_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "lm70",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	= lm70_probe,</div><div class='add'>+	.remove	= __devexit_p(lm70_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init init_lm70(void)</div><div class='add'>+{</div><div class='add'>+	return spi_register_driver(&amp;lm70_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cleanup_lm70(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;lm70_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(init_lm70);</div><div class='add'>+module_exit(cleanup_lm70);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Kaiwan N Billimoria");</div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor LM70 Linux driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c<br/>index 94be3d797e61..a6ce7abf8602 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm78.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm78.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm78.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/lm78.c</a></div><div class='hunk'>@@ -358,7 +358,7 @@ static ssize_t show_fan_div(struct device *dev, char *buf, int nr)</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t set_fan_div(struct device *dev, const char *buf,</div><div class='ctx'> 	size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c<br/>index f72120d08c4c..b4ccdfc01203 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm80.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm80.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm80.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/lm80.c</a></div><div class='hunk'>@@ -253,7 +253,7 @@ set_fan(min2, fan_min[1], LM80_REG_FAN_MIN(2), fan_div[1]);</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t set_fan_div(struct device *dev, const char *buf,</div><div class='ctx'> 	size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c<br/>index aac4ec2bf694..2137d7879df6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm83.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm83.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm83.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/lm83.c</a></div><div class='hunk'>@@ -12,6 +12,10 @@</div><div class='ctx'>  * Since the datasheet omits to give the chip stepping code, I give it</div><div class='ctx'>  * here: 0x03 (at register 0xff).</div><div class='ctx'>  *</div><div class='add'>+ * Also supports the LM82 temp sensor, which is basically a stripped down</div><div class='add'>+ * model of the LM83.  Datasheet is here:</div><div class='add'>+ * http://www.national.com/pf/LM/LM82.html</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation; either version 2 of the License, or</div><div class='hunk'>@@ -52,7 +56,7 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,</div><div class='ctx'>  * Insmod parameters</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-I2C_CLIENT_INSMOD_1(lm83);</div><div class='add'>+I2C_CLIENT_INSMOD_2(lm83, lm82);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The LM83 registers</div><div class='hunk'>@@ -283,6 +287,9 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 		if (man_id == 0x01) { /* National Semiconductor */</div><div class='ctx'> 			if (chip_id == 0x03) {</div><div class='ctx'> 				kind = lm83;</div><div class='add'>+			} else</div><div class='add'>+			if (chip_id == 0x01) {</div><div class='add'>+				kind = lm82;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -296,6 +303,9 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> </div><div class='ctx'> 	if (kind == lm83) {</div><div class='ctx'> 		name = "lm83";</div><div class='add'>+	} else</div><div class='add'>+	if (kind == lm82) {</div><div class='add'>+		name = "lm82";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We can fill in the remaining client fields */</div><div class='hunk'>@@ -319,32 +329,46 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 		goto exit_detach;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The LM82 can only monitor one external diode which is</div><div class='add'>+	 * at the same register as the LM83 temp3 entry - so we</div><div class='add'>+	 * declare 1 and 3 common, and then 2 and 4 only for the LM83.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 			   &amp;sensor_dev_attr_temp1_input.dev_attr);</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev,</div><div class='del'>-			   &amp;sensor_dev_attr_temp2_input.dev_attr);</div><div class='del'>-	device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 			   &amp;sensor_dev_attr_temp3_input.dev_attr);</div><div class='del'>-	device_create_file(&amp;new_client-&gt;dev,</div><div class='del'>-			   &amp;sensor_dev_attr_temp4_input.dev_attr);</div><div class='add'>+</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 			   &amp;sensor_dev_attr_temp1_max.dev_attr);</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev,</div><div class='del'>-			   &amp;sensor_dev_attr_temp2_max.dev_attr);</div><div class='del'>-	device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 			   &amp;sensor_dev_attr_temp3_max.dev_attr);</div><div class='del'>-	device_create_file(&amp;new_client-&gt;dev,</div><div class='del'>-			   &amp;sensor_dev_attr_temp4_max.dev_attr);</div><div class='add'>+</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 			   &amp;sensor_dev_attr_temp1_crit.dev_attr);</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev,</div><div class='del'>-			   &amp;sensor_dev_attr_temp2_crit.dev_attr);</div><div class='del'>-	device_create_file(&amp;new_client-&gt;dev,</div><div class='ctx'> 			   &amp;sensor_dev_attr_temp3_crit.dev_attr);</div><div class='del'>-	device_create_file(&amp;new_client-&gt;dev,</div><div class='del'>-			   &amp;sensor_dev_attr_temp4_crit.dev_attr);</div><div class='add'>+</div><div class='ctx'> 	device_create_file(&amp;new_client-&gt;dev, &amp;dev_attr_alarms);</div><div class='ctx'> </div><div class='add'>+	if (kind == lm83) {</div><div class='add'>+		device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_temp2_input.dev_attr);</div><div class='add'>+		device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_temp4_input.dev_attr);</div><div class='add'>+</div><div class='add'>+		device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_temp2_max.dev_attr);</div><div class='add'>+		device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_temp4_max.dev_attr);</div><div class='add'>+</div><div class='add'>+		device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_temp2_crit.dev_attr);</div><div class='add'>+		device_create_file(&amp;new_client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_temp4_crit.dev_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> exit_detach:</div><div class='head'>diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c<br/>index e229daf666de..e6c1b638c971 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/lm87.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/lm87.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/lm87.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/lm87.c</a></div><div class='hunk'>@@ -421,7 +421,7 @@ static void set_fan_min(struct device *dev, const char *buf, int nr)</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan clock divider.  This follows the principle</div><div class='del'>-   of least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   of least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divider changed. */</div><div class='ctx'> static ssize_t set_fan_div(struct device *dev, const char *buf,</div><div class='ctx'> 		size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c<br/>index 6f3fda73f70c..063f71c5f07e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/sis5595.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/sis5595.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/sis5595.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/sis5595.c</a></div><div class='hunk'>@@ -380,7 +380,7 @@ static ssize_t show_fan_div(struct device *dev, char *buf, int nr)</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t set_fan_div(struct device *dev, const char *buf,</div><div class='ctx'> 	size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c<br/>index 7732aec54594..825e8f72698f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/smsc47m1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/smsc47m1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/smsc47m1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/smsc47m1.c</a></div><div class='hunk'>@@ -207,7 +207,7 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan clock divider.  This follows the principle</div><div class='del'>-   of least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   of least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divider changed. */</div><div class='ctx'> static ssize_t set_fan_div(struct device *dev, const char *buf,</div><div class='ctx'> 		size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c<br/>new file mode 100644<br/>index 000000000000..bdc4570acf9a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/smsc47m192.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/smsc47m192.c</a></div><div class='hunk'>@@ -0,0 +1,648 @@</div><div class='add'>+/*</div><div class='add'>+    smsc47m192.c - Support for hardware monitoring block of</div><div class='add'>+                   SMSC LPC47M192 and LPC47M997 Super I/O chips</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2006  Hartmut Rick &lt;linux@rick.claranet.de&gt;</div><div class='add'>+</div><div class='add'>+    Derived from lm78.c and other chip drivers.</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-vid.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+</div><div class='add'>+/* Addresses to scan */</div><div class='add'>+static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+/* Insmod parameters */</div><div class='add'>+I2C_CLIENT_INSMOD_1(smsc47m192);</div><div class='add'>+</div><div class='add'>+/* SMSC47M192 registers */</div><div class='add'>+#define SMSC47M192_REG_IN(nr)		((nr)&lt;6 ? (0x20 + (nr)) : \</div><div class='add'>+					(0x50 + (nr) - 6))</div><div class='add'>+#define SMSC47M192_REG_IN_MAX(nr)	((nr)&lt;6 ? (0x2b + (nr) * 2) : \</div><div class='add'>+					(0x54 + (((nr) - 6) * 2)))</div><div class='add'>+#define SMSC47M192_REG_IN_MIN(nr)	((nr)&lt;6 ? (0x2c + (nr) * 2) : \</div><div class='add'>+					(0x55 + (((nr) - 6) * 2)))</div><div class='add'>+static u8 SMSC47M192_REG_TEMP[3] =	{ 0x27, 0x26, 0x52 };</div><div class='add'>+static u8 SMSC47M192_REG_TEMP_MAX[3] =	{ 0x39, 0x37, 0x58 };</div><div class='add'>+static u8 SMSC47M192_REG_TEMP_MIN[3] =	{ 0x3A, 0x38, 0x59 };</div><div class='add'>+#define SMSC47M192_REG_TEMP_OFFSET(nr)	((nr)==2 ? 0x1e : 0x1f)</div><div class='add'>+#define SMSC47M192_REG_ALARM1		0x41</div><div class='add'>+#define SMSC47M192_REG_ALARM2		0x42</div><div class='add'>+#define SMSC47M192_REG_VID		0x47</div><div class='add'>+#define SMSC47M192_REG_VID4		0x49</div><div class='add'>+#define SMSC47M192_REG_CONFIG		0x40</div><div class='add'>+#define SMSC47M192_REG_SFR		0x4f</div><div class='add'>+#define SMSC47M192_REG_COMPANY_ID	0x3e</div><div class='add'>+#define SMSC47M192_REG_VERSION		0x3f</div><div class='add'>+</div><div class='add'>+/* generalised scaling with integer rounding */</div><div class='add'>+static inline int SCALE(long val, int mul, int div)</div><div class='add'>+{</div><div class='add'>+	if (val &lt; 0)</div><div class='add'>+		return (val * mul - div / 2) / div;</div><div class='add'>+	else</div><div class='add'>+		return (val * mul + div / 2) / div;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Conversions */</div><div class='add'>+</div><div class='add'>+/* smsc47m192 internally scales voltage measurements */</div><div class='add'>+static const u16 nom_mv[] = { 2500, 2250, 3300, 5000, 12000, 3300, 1500, 1800 };</div><div class='add'>+</div><div class='add'>+static inline unsigned int IN_FROM_REG(u8 reg, int n)</div><div class='add'>+{</div><div class='add'>+	return SCALE(reg, nom_mv[n], 192);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 IN_TO_REG(unsigned long val, int n)</div><div class='add'>+{</div><div class='add'>+	return SENSORS_LIMIT(SCALE(val, 192, nom_mv[n]), 0, 255);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TEMP: 0.001 degC units (-128C to +127C)</div><div class='add'>+   REG: 1C/bit, two's complement */</div><div class='add'>+static inline s8 TEMP_TO_REG(int val)</div><div class='add'>+{</div><div class='add'>+	return SENSORS_LIMIT(SCALE(val, 1, 1000), -128000, 127000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int TEMP_FROM_REG(s8 val)</div><div class='add'>+{</div><div class='add'>+	return val * 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct smsc47m192_data {</div><div class='add'>+	struct i2c_client client;</div><div class='add'>+	struct class_device *class_dev;</div><div class='add'>+	struct semaphore update_lock;</div><div class='add'>+	char valid;		/* !=0 if following fields are valid */</div><div class='add'>+	unsigned long last_updated;	/* In jiffies */</div><div class='add'>+</div><div class='add'>+	u8 in[8];		/* Register value */</div><div class='add'>+	u8 in_max[8];		/* Register value */</div><div class='add'>+	u8 in_min[8];		/* Register value */</div><div class='add'>+	s8 temp[3];		/* Register value */</div><div class='add'>+	s8 temp_max[3];		/* Register value */</div><div class='add'>+	s8 temp_min[3];		/* Register value */</div><div class='add'>+	s8 temp_offset[3];	/* Register value */</div><div class='add'>+	u16 alarms;		/* Register encoding, combined */</div><div class='add'>+	u8 vid;			/* Register encoding, combined */</div><div class='add'>+	u8 vrm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int smsc47m192_attach_adapter(struct i2c_adapter *adapter);</div><div class='add'>+static int smsc47m192_detect(struct i2c_adapter *adapter, int address,</div><div class='add'>+		int kind);</div><div class='add'>+static int smsc47m192_detach_client(struct i2c_client *client);</div><div class='add'>+static struct smsc47m192_data *smsc47m192_update_device(struct device *dev);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver smsc47m192_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "smsc47m192",</div><div class='add'>+	},</div><div class='add'>+	.attach_adapter	= smsc47m192_attach_adapter,</div><div class='add'>+	.detach_client	= smsc47m192_detach_client,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Voltages */</div><div class='add'>+static ssize_t show_in(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in[nr], nr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_min[nr], nr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", IN_FROM_REG(data-&gt;in_max[nr], nr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	down(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;in_min[nr] = IN_TO_REG(val, nr);</div><div class='add'>+	i2c_smbus_write_byte_data(client, SMSC47M192_REG_IN_MIN(nr),</div><div class='add'>+							data-&gt;in_min[nr]);</div><div class='add'>+	up(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	down(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;in_max[nr] = IN_TO_REG(val, nr);</div><div class='add'>+	i2c_smbus_write_byte_data(client, SMSC47M192_REG_IN_MAX(nr),</div><div class='add'>+							data-&gt;in_max[nr]);</div><div class='add'>+	up(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define show_in_offset(offset)					\</div><div class='add'>+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,		\</div><div class='add'>+		show_in, NULL, offset);				\</div><div class='add'>+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,	\</div><div class='add'>+		show_in_min, set_in_min, offset);		\</div><div class='add'>+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,	\</div><div class='add'>+		show_in_max, set_in_max, offset);</div><div class='add'>+</div><div class='add'>+show_in_offset(0)</div><div class='add'>+show_in_offset(1)</div><div class='add'>+show_in_offset(2)</div><div class='add'>+show_in_offset(3)</div><div class='add'>+show_in_offset(4)</div><div class='add'>+show_in_offset(5)</div><div class='add'>+show_in_offset(6)</div><div class='add'>+show_in_offset(7)</div><div class='add'>+</div><div class='add'>+/* Temperatures */</div><div class='add'>+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_min[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_max[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	down(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp_min[nr] = TEMP_TO_REG(val);</div><div class='add'>+	i2c_smbus_write_byte_data(client, SMSC47M192_REG_TEMP_MIN[nr],</div><div class='add'>+						data-&gt;temp_min[nr]);</div><div class='add'>+	up(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	down(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp_max[nr] = TEMP_TO_REG(val);</div><div class='add'>+	i2c_smbus_write_byte_data(client, SMSC47M192_REG_TEMP_MAX[nr],</div><div class='add'>+						data-&gt;temp_max[nr]);</div><div class='add'>+	up(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_temp_offset(struct device *dev, struct device_attribute</div><div class='add'>+		*attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP_FROM_REG(data-&gt;temp_offset[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_temp_offset(struct device *dev, struct device_attribute</div><div class='add'>+		*attr, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	u8 sfr = i2c_smbus_read_byte_data(client, SMSC47M192_REG_SFR);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	down(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp_offset[nr] = TEMP_TO_REG(val);</div><div class='add'>+	if (nr&gt;1)</div><div class='add'>+		i2c_smbus_write_byte_data(client,</div><div class='add'>+			SMSC47M192_REG_TEMP_OFFSET(nr), data-&gt;temp_offset[nr]);</div><div class='add'>+	else if (data-&gt;temp_offset[nr] != 0) {</div><div class='add'>+		/* offset[0] and offset[1] share the same register,</div><div class='add'>+			SFR bit 4 activates offset[0] */</div><div class='add'>+		i2c_smbus_write_byte_data(client, SMSC47M192_REG_SFR,</div><div class='add'>+					(sfr &amp; 0xef) | (nr==0 ? 0x10 : 0));</div><div class='add'>+		data-&gt;temp_offset[1-nr] = 0;</div><div class='add'>+		i2c_smbus_write_byte_data(client,</div><div class='add'>+			SMSC47M192_REG_TEMP_OFFSET(nr), data-&gt;temp_offset[nr]);</div><div class='add'>+	} else if ((sfr &amp; 0x10) == (nr==0 ? 0x10 : 0))</div><div class='add'>+		i2c_smbus_write_byte_data(client,</div><div class='add'>+					SMSC47M192_REG_TEMP_OFFSET(nr), 0);</div><div class='add'>+	up(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define show_temp_index(index)						\</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp##index##_input, S_IRUGO,			\</div><div class='add'>+		show_temp, NULL, index-1);				\</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp##index##_min, S_IRUGO | S_IWUSR,		\</div><div class='add'>+		show_temp_min, set_temp_min, index-1);			\</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp##index##_max, S_IRUGO | S_IWUSR,		\</div><div class='add'>+		show_temp_max, set_temp_max, index-1);			\</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp##index##_offset, S_IRUGO | S_IWUSR,	\</div><div class='add'>+		show_temp_offset, set_temp_offset, index-1);</div><div class='add'>+</div><div class='add'>+show_temp_index(1)</div><div class='add'>+show_temp_index(2)</div><div class='add'>+show_temp_index(3)</div><div class='add'>+</div><div class='add'>+/* VID */</div><div class='add'>+static ssize_t show_vid(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", vid_from_reg(data-&gt;vid, data-&gt;vrm));</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;vrm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	data-&gt;vrm = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);</div><div class='add'>+</div><div class='add'>+/* Alarms */</div><div class='add'>+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct smsc47m192_data *data = smsc47m192_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%u\n", (data-&gt;alarms &amp; nr) ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 0x0010);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 0x0020);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0x0040);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 0x4000);</div><div class='add'>+static SENSOR_DEVICE_ATTR(temp3_input_fault, S_IRUGO, show_alarm, NULL, 0x8000);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0x0001);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0x0002);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 0x0004);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 0x0008);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 0x0100);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 0x0200);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 0x0400);</div><div class='add'>+static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 0x0800);</div><div class='add'>+</div><div class='add'>+/* This function is called when:</div><div class='add'>+    * smsc47m192_driver is inserted (when this module is loaded), for each</div><div class='add'>+      available adapter</div><div class='add'>+    * when a new adapter is inserted (and smsc47m192_driver is still present) */</div><div class='add'>+static int smsc47m192_attach_adapter(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON))</div><div class='add'>+		return 0;</div><div class='add'>+	return i2c_probe(adapter, &amp;addr_data, smsc47m192_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smsc47m192_init_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 config = i2c_smbus_read_byte_data(client, SMSC47M192_REG_CONFIG);</div><div class='add'>+	u8 sfr = i2c_smbus_read_byte_data(client, SMSC47M192_REG_SFR);</div><div class='add'>+</div><div class='add'>+	/* select cycle mode (pause 1 sec between updates) */</div><div class='add'>+	i2c_smbus_write_byte_data(client, SMSC47M192_REG_SFR,</div><div class='add'>+						(sfr &amp; 0xfd) | 0x02);</div><div class='add'>+	if (!(config &amp; 0x01)) {</div><div class='add'>+		/* initialize alarm limits */</div><div class='add'>+		for (i=0; i&lt;8; i++) {</div><div class='add'>+			i2c_smbus_write_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_IN_MIN(i), 0);</div><div class='add'>+			i2c_smbus_write_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_IN_MAX(i), 0xff);</div><div class='add'>+		}</div><div class='add'>+		for (i=0; i&lt;3; i++) {</div><div class='add'>+			i2c_smbus_write_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_TEMP_MIN[i], 0x80);</div><div class='add'>+			i2c_smbus_write_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_TEMP_MAX[i], 0x7f);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* start monitoring */</div><div class='add'>+		i2c_smbus_write_byte_data(client, SMSC47M192_REG_CONFIG,</div><div class='add'>+						(config &amp; 0xf7) | 0x01);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function is called by i2c_probe */</div><div class='add'>+static int smsc47m192_detect(struct i2c_adapter *adapter, int address,</div><div class='add'>+		int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct smsc47m192_data *data;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int version, config;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (!(data = kzalloc(sizeof(struct smsc47m192_data), GFP_KERNEL))) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	client = &amp;data-&gt;client;</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	client-&gt;addr = address;</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;driver = &amp;smsc47m192_driver;</div><div class='add'>+</div><div class='add'>+	if (kind == 0)</div><div class='add'>+		kind = smsc47m192;</div><div class='add'>+</div><div class='add'>+	/* Detection criteria from sensors_detect script */</div><div class='add'>+	if (kind &lt; 0) {</div><div class='add'>+		if (i2c_smbus_read_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_COMPANY_ID) == 0x55</div><div class='add'>+		 &amp;&amp; ((version = i2c_smbus_read_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_VERSION)) &amp; 0xf0) == 0x20</div><div class='add'>+		 &amp;&amp; (i2c_smbus_read_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_VID) &amp; 0x70) == 0x00</div><div class='add'>+		 &amp;&amp; (i2c_smbus_read_byte_data(client,</div><div class='add'>+				SMSC47M192_REG_VID4) &amp; 0xfe) == 0x80) {</div><div class='add'>+			dev_info(&amp;adapter-&gt;dev,</div><div class='add'>+				 "found SMSC47M192 or SMSC47M997, "</div><div class='add'>+				 "version 2, stepping A%d\n", version &amp; 0x0f);</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(&amp;adapter-&gt;dev,</div><div class='add'>+				"SMSC47M192 detection failed at 0x%02x\n",</div><div class='add'>+				address);</div><div class='add'>+			goto exit_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fill in the remaining client fields and put into the global list */</div><div class='add'>+	strlcpy(client-&gt;name, "smsc47m192", I2C_NAME_SIZE);</div><div class='add'>+	data-&gt;vrm = vid_which_vrm();</div><div class='add'>+	init_MUTEX(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	/* Tell the I2C layer a new client has arrived */</div><div class='add'>+	if ((err = i2c_attach_client(client)))</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	/* Initialize the SMSC47M192 chip */</div><div class='add'>+	smsc47m192_init_client(client);</div><div class='add'>+</div><div class='add'>+	/* Register sysfs hooks */</div><div class='add'>+	data-&gt;class_dev = hwmon_device_register(&amp;client-&gt;dev);</div><div class='add'>+	if (IS_ERR(data-&gt;class_dev)) {</div><div class='add'>+		err = PTR_ERR(data-&gt;class_dev);</div><div class='add'>+		goto exit_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in0_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in0_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in0_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in0_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in1_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in1_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in1_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in1_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in2_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in2_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in2_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in2_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in3_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in3_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in3_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in3_alarm.dev_attr);</div><div class='add'>+</div><div class='add'>+	/* Pin 110 is either in4 (+12V) or VID4 */</div><div class='add'>+	config = i2c_smbus_read_byte_data(client, SMSC47M192_REG_CONFIG);</div><div class='add'>+	if (!(config &amp; 0x20)) {</div><div class='add'>+		device_create_file(&amp;client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_in4_input.dev_attr);</div><div class='add'>+		device_create_file(&amp;client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_in4_min.dev_attr);</div><div class='add'>+		device_create_file(&amp;client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_in4_max.dev_attr);</div><div class='add'>+		device_create_file(&amp;client-&gt;dev,</div><div class='add'>+				   &amp;sensor_dev_attr_in4_alarm.dev_attr);</div><div class='add'>+	}</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in5_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in5_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in5_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in5_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in6_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in6_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in6_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in6_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in7_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in7_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in7_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_in7_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp1_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp1_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp1_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev,</div><div class='add'>+			   &amp;sensor_dev_attr_temp1_offset.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp1_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp2_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp2_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp2_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev,</div><div class='add'>+			   &amp;sensor_dev_attr_temp2_offset.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp2_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev,</div><div class='add'>+			   &amp;sensor_dev_attr_temp2_input_fault.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp3_input.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp3_max.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp3_min.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev,</div><div class='add'>+			   &amp;sensor_dev_attr_temp3_offset.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;sensor_dev_attr_temp3_alarm.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev,</div><div class='add'>+			   &amp;sensor_dev_attr_temp3_input_fault.dev_attr);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;dev_attr_cpu0_vid);</div><div class='add'>+	device_create_file(&amp;client-&gt;dev, &amp;dev_attr_vrm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_detach:</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+exit_free:</div><div class='add'>+	kfree(data);</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smsc47m192_detach_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hwmon_device_unregister(data-&gt;class_dev);</div><div class='add'>+</div><div class='add'>+	if ((err = i2c_detach_client(client)))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct smsc47m192_data *smsc47m192_update_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct smsc47m192_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int i, config;</div><div class='add'>+</div><div class='add'>+	down(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, data-&gt;last_updated + HZ + HZ / 2)</div><div class='add'>+	 || !data-&gt;valid) {</div><div class='add'>+		u8 sfr = i2c_smbus_read_byte_data(client, SMSC47M192_REG_SFR);</div><div class='add'>+</div><div class='add'>+		dev_dbg(&amp;client-&gt;dev, "Starting smsc47m192 update\n");</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt;= 7; i++) {</div><div class='add'>+			data-&gt;in[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_IN(i));</div><div class='add'>+			data-&gt;in_min[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_IN_MIN(i));</div><div class='add'>+			data-&gt;in_max[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_IN_MAX(i));</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			data-&gt;temp[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_TEMP[i]);</div><div class='add'>+			data-&gt;temp_max[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_TEMP_MAX[i]);</div><div class='add'>+			data-&gt;temp_min[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_TEMP_MIN[i]);</div><div class='add'>+		}</div><div class='add'>+		for (i = 1; i &lt; 3; i++)</div><div class='add'>+			data-&gt;temp_offset[i] = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_TEMP_OFFSET(i));</div><div class='add'>+		/* first offset is temp_offset[0] if SFR bit 4 is set,</div><div class='add'>+					temp_offset[1] otherwise */</div><div class='add'>+		if (sfr &amp; 0x10) {</div><div class='add'>+			data-&gt;temp_offset[0] = data-&gt;temp_offset[1];</div><div class='add'>+			data-&gt;temp_offset[1] = 0;</div><div class='add'>+		} else</div><div class='add'>+			data-&gt;temp_offset[0] = 0;</div><div class='add'>+</div><div class='add'>+		data-&gt;vid = i2c_smbus_read_byte_data(client, SMSC47M192_REG_VID)</div><div class='add'>+			    &amp; 0x0f;</div><div class='add'>+		config = i2c_smbus_read_byte_data(client,</div><div class='add'>+						  SMSC47M192_REG_CONFIG);</div><div class='add'>+		if (config &amp; 0x20)</div><div class='add'>+			data-&gt;vid |= (i2c_smbus_read_byte_data(client,</div><div class='add'>+					SMSC47M192_REG_VID4) &amp; 0x01) &lt;&lt; 4;</div><div class='add'>+		data-&gt;alarms = i2c_smbus_read_byte_data(client,</div><div class='add'>+						SMSC47M192_REG_ALARM1) |</div><div class='add'>+			       (i2c_smbus_read_byte_data(client,</div><div class='add'>+		       				SMSC47M192_REG_ALARM2) &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+		data-&gt;last_updated = jiffies;</div><div class='add'>+		data-&gt;valid = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init smsc47m192_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;smsc47m192_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit smsc47m192_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;smsc47m192_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Hartmut Rick &lt;linux@rick.claranet.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("SMSC47M192 driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+module_init(smsc47m192_init);</div><div class='add'>+module_exit(smsc47m192_exit);</div><div class='head'>diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c<br/>index b6bd5685fd38..40301bc6ce18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627ehf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83627ehf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627ehf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/w83627ehf.c</a></div><div class='hunk'>@@ -30,10 +30,7 @@</div><div class='ctx'>     Supports the following chips:</div><div class='ctx'> </div><div class='ctx'>     Chip        #vin    #fan    #pwm    #temp   chip_id man_id</div><div class='del'>-    w83627ehf   -       5       -       3       0x88    0x5ca3</div><div class='del'>-</div><div class='del'>-    This is a preliminary version of the driver, only supporting the</div><div class='del'>-    fan and temperature inputs. The chip does much more than that.</div><div class='add'>+    w83627ehf   10      5       -       3       0x88    0x5ca3</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -121,6 +118,14 @@ superio_exit(void)</div><div class='ctx'> static const u16 W83627EHF_REG_FAN[] = { 0x28, 0x29, 0x2a, 0x3f, 0x553 };</div><div class='ctx'> static const u16 W83627EHF_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d, 0x3e, 0x55c };</div><div class='ctx'> </div><div class='add'>+/* The W83627EHF registers for nr=7,8,9 are in bank 5 */</div><div class='add'>+#define W83627EHF_REG_IN_MAX(nr)	((nr &lt; 7) ? (0x2b + (nr) * 2) : \</div><div class='add'>+					 (0x554 + (((nr) - 7) * 2)))</div><div class='add'>+#define W83627EHF_REG_IN_MIN(nr)	((nr &lt; 7) ? (0x2c + (nr) * 2) : \</div><div class='add'>+					 (0x555 + (((nr) - 7) * 2)))</div><div class='add'>+#define W83627EHF_REG_IN(nr)		((nr &lt; 7) ? (0x20 + (nr)) : \</div><div class='add'>+					 (0x550 + (nr) - 7))</div><div class='add'>+</div><div class='ctx'> #define W83627EHF_REG_TEMP1		0x27</div><div class='ctx'> #define W83627EHF_REG_TEMP1_HYST	0x3a</div><div class='ctx'> #define W83627EHF_REG_TEMP1_OVER	0x39</div><div class='hunk'>@@ -136,6 +141,10 @@ static const u16 W83627EHF_REG_TEMP_CONFIG[] = { 0x152, 0x252 };</div><div class='ctx'> #define W83627EHF_REG_DIODE		0x59</div><div class='ctx'> #define W83627EHF_REG_SMI_OVT		0x4C</div><div class='ctx'> </div><div class='add'>+#define W83627EHF_REG_ALARM1		0x459</div><div class='add'>+#define W83627EHF_REG_ALARM2		0x45A</div><div class='add'>+#define W83627EHF_REG_ALARM3		0x45B</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Conversions</div><div class='ctx'>  */</div><div class='hunk'>@@ -172,6 +181,20 @@ temp1_to_reg(int temp)</div><div class='ctx'> 	return (temp + 500) / 1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Some of analog inputs have internal scaling (2x), 8mV is ADC LSB */</div><div class='add'>+</div><div class='add'>+static u8 scale_in[10] = { 8, 8, 16, 16, 8, 8, 8, 16, 16, 8 };</div><div class='add'>+</div><div class='add'>+static inline long in_from_reg(u8 reg, u8 nr)</div><div class='add'>+{</div><div class='add'>+	return reg * scale_in[nr];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 in_to_reg(u32 val, u8 nr)</div><div class='add'>+{</div><div class='add'>+	return SENSORS_LIMIT(((val + (scale_in[nr] / 2)) / scale_in[nr]), 0, 255);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Data structures and manipulation thereof</div><div class='ctx'>  */</div><div class='hunk'>@@ -186,6 +209,9 @@ struct w83627ehf_data {</div><div class='ctx'> 	unsigned long last_updated;	/* In jiffies */</div><div class='ctx'> </div><div class='ctx'> 	/* Register values */</div><div class='add'>+	u8 in[10];		/* Register value */</div><div class='add'>+	u8 in_max[10];		/* Register value */</div><div class='add'>+	u8 in_min[10];		/* Register value */</div><div class='ctx'> 	u8 fan[5];</div><div class='ctx'> 	u8 fan_min[5];</div><div class='ctx'> 	u8 fan_div[5];</div><div class='hunk'>@@ -196,6 +222,7 @@ struct w83627ehf_data {</div><div class='ctx'> 	s16 temp[2];</div><div class='ctx'> 	s16 temp_max[2];</div><div class='ctx'> 	s16 temp_max_hyst[2];</div><div class='add'>+	u32 alarms;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline int is_word_sized(u16 reg)</div><div class='hunk'>@@ -349,6 +376,16 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)</div><div class='ctx'> 			data-&gt;fan_div[3] |= (i &gt;&gt; 5) &amp; 0x04;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Measured voltages and limits */</div><div class='add'>+		for (i = 0; i &lt; 10; i++) {</div><div class='add'>+			data-&gt;in[i] = w83627ehf_read_value(client,</div><div class='add'>+				      W83627EHF_REG_IN(i));</div><div class='add'>+			data-&gt;in_min[i] = w83627ehf_read_value(client,</div><div class='add'>+					  W83627EHF_REG_IN_MIN(i));</div><div class='add'>+			data-&gt;in_max[i] = w83627ehf_read_value(client,</div><div class='add'>+					  W83627EHF_REG_IN_MAX(i));</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Measured fan speeds and limits */</div><div class='ctx'> 		for (i = 0; i &lt; 5; i++) {</div><div class='ctx'> 			if (!(data-&gt;has_fan &amp; (1 &lt;&lt; i)))</div><div class='hunk'>@@ -395,6 +432,13 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)</div><div class='ctx'> 						 W83627EHF_REG_TEMP_HYST[i]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		data-&gt;alarms = w83627ehf_read_value(client,</div><div class='add'>+					W83627EHF_REG_ALARM1) |</div><div class='add'>+			       (w83627ehf_read_value(client,</div><div class='add'>+					W83627EHF_REG_ALARM2) &lt;&lt; 8) |</div><div class='add'>+			       (w83627ehf_read_value(client,</div><div class='add'>+					W83627EHF_REG_ALARM3) &lt;&lt; 16);</div><div class='add'>+</div><div class='ctx'> 		data-&gt;last_updated = jiffies;</div><div class='ctx'> 		data-&gt;valid = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -406,6 +450,109 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)</div><div class='ctx'> /*</div><div class='ctx'>  * Sysfs callback functions</div><div class='ctx'>  */</div><div class='add'>+#define show_in_reg(reg) \</div><div class='add'>+static ssize_t \</div><div class='add'>+show_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='add'>+	   char *buf) \</div><div class='add'>+{ \</div><div class='add'>+	struct w83627ehf_data *data = w83627ehf_update_device(dev); \</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \</div><div class='add'>+	int nr = sensor_attr-&gt;index; \</div><div class='add'>+	return sprintf(buf, "%ld\n", in_from_reg(data-&gt;reg[nr], nr)); \</div><div class='add'>+}</div><div class='add'>+show_in_reg(in)</div><div class='add'>+show_in_reg(in_min)</div><div class='add'>+show_in_reg(in_max)</div><div class='add'>+</div><div class='add'>+#define store_in_reg(REG, reg) \</div><div class='add'>+static ssize_t \</div><div class='add'>+store_in_##reg (struct device *dev, struct device_attribute *attr, \</div><div class='add'>+			const char *buf, size_t count) \</div><div class='add'>+{ \</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev); \</div><div class='add'>+	struct w83627ehf_data *data = i2c_get_clientdata(client); \</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \</div><div class='add'>+	int nr = sensor_attr-&gt;index; \</div><div class='add'>+	u32 val = simple_strtoul(buf, NULL, 10); \</div><div class='add'>+ \</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='add'>+	data-&gt;in_##reg[nr] = in_to_reg(val, nr); \</div><div class='add'>+	w83627ehf_write_value(client, W83627EHF_REG_IN_##REG(nr), \</div><div class='add'>+			      data-&gt;in_##reg[nr]); \</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock); \</div><div class='add'>+	return count; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+store_in_reg(MIN, min)</div><div class='add'>+store_in_reg(MAX, max)</div><div class='add'>+</div><div class='add'>+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83627ehf_data *data = w83627ehf_update_device(dev);</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	return sprintf(buf, "%u\n", (data-&gt;alarms &gt;&gt; nr) &amp; 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_input[] = {</div><div class='add'>+	SENSOR_ATTR(in0_input, S_IRUGO, show_in, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(in1_input, S_IRUGO, show_in, NULL, 1),</div><div class='add'>+	SENSOR_ATTR(in2_input, S_IRUGO, show_in, NULL, 2),</div><div class='add'>+	SENSOR_ATTR(in3_input, S_IRUGO, show_in, NULL, 3),</div><div class='add'>+	SENSOR_ATTR(in4_input, S_IRUGO, show_in, NULL, 4),</div><div class='add'>+	SENSOR_ATTR(in5_input, S_IRUGO, show_in, NULL, 5),</div><div class='add'>+	SENSOR_ATTR(in6_input, S_IRUGO, show_in, NULL, 6),</div><div class='add'>+	SENSOR_ATTR(in7_input, S_IRUGO, show_in, NULL, 7),</div><div class='add'>+	SENSOR_ATTR(in8_input, S_IRUGO, show_in, NULL, 8),</div><div class='add'>+	SENSOR_ATTR(in9_input, S_IRUGO, show_in, NULL, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_alarm[] = {</div><div class='add'>+	SENSOR_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1),</div><div class='add'>+	SENSOR_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2),</div><div class='add'>+	SENSOR_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3),</div><div class='add'>+	SENSOR_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8),</div><div class='add'>+	SENSOR_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 21),</div><div class='add'>+	SENSOR_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 20),</div><div class='add'>+	SENSOR_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 16),</div><div class='add'>+	SENSOR_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 17),</div><div class='add'>+	SENSOR_ATTR(in9_alarm, S_IRUGO, show_alarm, NULL, 19),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_min[] = {</div><div class='add'>+       SENSOR_ATTR(in0_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 0),</div><div class='add'>+       SENSOR_ATTR(in1_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 1),</div><div class='add'>+       SENSOR_ATTR(in2_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 2),</div><div class='add'>+       SENSOR_ATTR(in3_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 3),</div><div class='add'>+       SENSOR_ATTR(in4_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 4),</div><div class='add'>+       SENSOR_ATTR(in5_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 5),</div><div class='add'>+       SENSOR_ATTR(in6_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 6),</div><div class='add'>+       SENSOR_ATTR(in7_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 7),</div><div class='add'>+       SENSOR_ATTR(in8_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 8),</div><div class='add'>+       SENSOR_ATTR(in9_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_max[] = {</div><div class='add'>+       SENSOR_ATTR(in0_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 0),</div><div class='add'>+       SENSOR_ATTR(in1_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 1),</div><div class='add'>+       SENSOR_ATTR(in2_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 2),</div><div class='add'>+       SENSOR_ATTR(in3_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 3),</div><div class='add'>+       SENSOR_ATTR(in4_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 4),</div><div class='add'>+       SENSOR_ATTR(in5_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 5),</div><div class='add'>+       SENSOR_ATTR(in6_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 6),</div><div class='add'>+       SENSOR_ATTR(in7_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 7),</div><div class='add'>+       SENSOR_ATTR(in8_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 8),</div><div class='add'>+       SENSOR_ATTR(in9_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void device_create_file_in(struct device *dev, int i)</div><div class='add'>+{</div><div class='add'>+	device_create_file(dev, &amp;sda_in_input[i].dev_attr);</div><div class='add'>+	device_create_file(dev, &amp;sda_in_alarm[i].dev_attr);</div><div class='add'>+	device_create_file(dev, &amp;sda_in_min[i].dev_attr);</div><div class='add'>+	device_create_file(dev, &amp;sda_in_max[i].dev_attr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #define show_fan_reg(reg) \</div><div class='ctx'> static ssize_t \</div><div class='hunk'>@@ -505,6 +652,14 @@ static struct sensor_device_attribute sda_fan_input[] = {</div><div class='ctx'> 	SENSOR_ATTR(fan5_input, S_IRUGO, show_fan, NULL, 4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct sensor_device_attribute sda_fan_alarm[] = {</div><div class='add'>+	SENSOR_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6),</div><div class='add'>+	SENSOR_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7),</div><div class='add'>+	SENSOR_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 11),</div><div class='add'>+	SENSOR_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 10),</div><div class='add'>+	SENSOR_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 23),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct sensor_device_attribute sda_fan_min[] = {</div><div class='ctx'> 	SENSOR_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan_min,</div><div class='ctx'> 		    store_fan_min, 0),</div><div class='hunk'>@@ -529,6 +684,7 @@ static struct sensor_device_attribute sda_fan_div[] = {</div><div class='ctx'> static void device_create_file_fan(struct device *dev, int i)</div><div class='ctx'> {</div><div class='ctx'> 	device_create_file(dev, &amp;sda_fan_input[i].dev_attr);</div><div class='add'>+	device_create_file(dev, &amp;sda_fan_alarm[i].dev_attr);</div><div class='ctx'> 	device_create_file(dev, &amp;sda_fan_div[i].dev_attr);</div><div class='ctx'> 	device_create_file(dev, &amp;sda_fan_min[i].dev_attr);</div><div class='ctx'> }</div><div class='hunk'>@@ -616,6 +772,9 @@ static struct sensor_device_attribute sda_temp[] = {</div><div class='ctx'> 		    store_temp_max_hyst, 0),</div><div class='ctx'> 	SENSOR_ATTR(temp3_max_hyst, S_IRUGO | S_IWUSR, show_temp_max_hyst,</div><div class='ctx'> 		    store_temp_max_hyst, 1),</div><div class='add'>+	SENSOR_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4),</div><div class='add'>+	SENSOR_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5),</div><div class='add'>+	SENSOR_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -705,6 +864,9 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)</div><div class='ctx'> 		goto exit_detach;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; 10; i++)</div><div class='add'>+		device_create_file_in(dev, i);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 5; i++) {</div><div class='ctx'> 		if (data-&gt;has_fan &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			device_create_file_fan(dev, i);</div><div class='head'>diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c<br/>index 71fb7f1af8f5..79368d53c363 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627hf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83627hf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83627hf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/w83627hf.c</a></div><div class='hunk'>@@ -781,7 +781,7 @@ show_fan_div_reg(struct device *dev, char *buf, int nr)</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t</div><div class='ctx'> store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c<br/>index e4c700356c44..7be469ed0f8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83781d.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83781d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83781d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/w83781d.c</a></div><div class='hunk'>@@ -630,7 +630,7 @@ show_fan_div_reg(struct device *dev, char *buf, int nr)</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t</div><div class='ctx'> store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)</div><div class='head'>diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c<br/>new file mode 100644<br/>index 000000000000..eec43abd57fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83791d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/w83791d.c</a></div><div class='hunk'>@@ -0,0 +1,1255 @@</div><div class='add'>+/*</div><div class='add'>+    w83791d.c - Part of lm_sensors, Linux kernel modules for hardware</div><div class='add'>+                monitoring</div><div class='add'>+</div><div class='add'>+    Copyright (C) 2006 Charles Spirakis &lt;bezaur@gmail.com&gt;</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    Supports following chips:</div><div class='add'>+</div><div class='add'>+    Chip	#vin	#fanin	#pwm	#temp	wchipid	vendid	i2c	ISA</div><div class='add'>+    w83791d	10	5	3	3	0x71	0x5ca3	yes	no</div><div class='add'>+</div><div class='add'>+    The w83791d chip appears to be part way between the 83781d and the</div><div class='add'>+    83792d. Thus, this file is derived from both the w83792d.c and</div><div class='add'>+    w83781d.c files, but its output is more along the lines of the</div><div class='add'>+    83781d (which means there are no changes to the user-mode sensors</div><div class='add'>+    program which treats the 83791d as an 83781d).</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-vid.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#define NUMBER_OF_VIN		10</div><div class='add'>+#define NUMBER_OF_FANIN		5</div><div class='add'>+#define NUMBER_OF_TEMPIN	3</div><div class='add'>+</div><div class='add'>+/* Addresses to scan */</div><div class='add'>+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+/* Insmod parameters */</div><div class='add'>+I2C_CLIENT_INSMOD_1(w83791d);</div><div class='add'>+I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "</div><div class='add'>+			"{bus, clientaddr, subclientaddr1, subclientaddr2}");</div><div class='add'>+</div><div class='add'>+static int reset;</div><div class='add'>+module_param(reset, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(reset, "Set to one to force a hardware chip reset");</div><div class='add'>+</div><div class='add'>+static int init;</div><div class='add'>+module_param(init, bool, 0);</div><div class='add'>+MODULE_PARM_DESC(init, "Set to one to force extra software initialization");</div><div class='add'>+</div><div class='add'>+/* The W83791D registers */</div><div class='add'>+static const u8 W83791D_REG_IN[NUMBER_OF_VIN] = {</div><div class='add'>+	0x20,			/* VCOREA in DataSheet */</div><div class='add'>+	0x21,			/* VINR0 in DataSheet */</div><div class='add'>+	0x22,			/* +3.3VIN in DataSheet */</div><div class='add'>+	0x23,			/* VDD5V in DataSheet */</div><div class='add'>+	0x24,			/* +12VIN in DataSheet */</div><div class='add'>+	0x25,			/* -12VIN in DataSheet */</div><div class='add'>+	0x26,			/* -5VIN in DataSheet */</div><div class='add'>+	0xB0,			/* 5VSB in DataSheet */</div><div class='add'>+	0xB1,			/* VBAT in DataSheet */</div><div class='add'>+	0xB2			/* VINR1 in DataSheet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_IN_MAX[NUMBER_OF_VIN] = {</div><div class='add'>+	0x2B,			/* VCOREA High Limit in DataSheet */</div><div class='add'>+	0x2D,			/* VINR0 High Limit in DataSheet */</div><div class='add'>+	0x2F,			/* +3.3VIN High Limit in DataSheet */</div><div class='add'>+	0x31,			/* VDD5V High Limit in DataSheet */</div><div class='add'>+	0x33,			/* +12VIN High Limit in DataSheet */</div><div class='add'>+	0x35,			/* -12VIN High Limit in DataSheet */</div><div class='add'>+	0x37,			/* -5VIN High Limit in DataSheet */</div><div class='add'>+	0xB4,			/* 5VSB High Limit in DataSheet */</div><div class='add'>+	0xB6,			/* VBAT High Limit in DataSheet */</div><div class='add'>+	0xB8			/* VINR1 High Limit in DataSheet */</div><div class='add'>+};</div><div class='add'>+static const u8 W83791D_REG_IN_MIN[NUMBER_OF_VIN] = {</div><div class='add'>+	0x2C,			/* VCOREA Low Limit in DataSheet */</div><div class='add'>+	0x2E,			/* VINR0 Low Limit in DataSheet */</div><div class='add'>+	0x30,			/* +3.3VIN Low Limit in DataSheet */</div><div class='add'>+	0x32,			/* VDD5V Low Limit in DataSheet */</div><div class='add'>+	0x34,			/* +12VIN Low Limit in DataSheet */</div><div class='add'>+	0x36,			/* -12VIN Low Limit in DataSheet */</div><div class='add'>+	0x38,			/* -5VIN Low Limit in DataSheet */</div><div class='add'>+	0xB5,			/* 5VSB Low Limit in DataSheet */</div><div class='add'>+	0xB7,			/* VBAT Low Limit in DataSheet */</div><div class='add'>+	0xB9			/* VINR1 Low Limit in DataSheet */</div><div class='add'>+};</div><div class='add'>+static const u8 W83791D_REG_FAN[NUMBER_OF_FANIN] = {</div><div class='add'>+	0x28,			/* FAN 1 Count in DataSheet */</div><div class='add'>+	0x29,			/* FAN 2 Count in DataSheet */</div><div class='add'>+	0x2A,			/* FAN 3 Count in DataSheet */</div><div class='add'>+	0xBA,			/* FAN 4 Count in DataSheet */</div><div class='add'>+	0xBB,			/* FAN 5 Count in DataSheet */</div><div class='add'>+};</div><div class='add'>+static const u8 W83791D_REG_FAN_MIN[NUMBER_OF_FANIN] = {</div><div class='add'>+	0x3B,			/* FAN 1 Count Low Limit in DataSheet */</div><div class='add'>+	0x3C,			/* FAN 2 Count Low Limit in DataSheet */</div><div class='add'>+	0x3D,			/* FAN 3 Count Low Limit in DataSheet */</div><div class='add'>+	0xBC,			/* FAN 4 Count Low Limit in DataSheet */</div><div class='add'>+	0xBD,			/* FAN 5 Count Low Limit in DataSheet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_FAN_CFG[2] = {</div><div class='add'>+	0x84,			/* FAN 1/2 configuration */</div><div class='add'>+	0x95,			/* FAN 3 configuration */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_FAN_DIV[3] = {</div><div class='add'>+	0x47,			/* contains FAN1 and FAN2 Divisor */</div><div class='add'>+	0x4b,			/* contains FAN3 Divisor */</div><div class='add'>+	0x5C,			/* contains FAN4 and FAN5 Divisor */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define W83791D_REG_BANK		0x4E</div><div class='add'>+#define W83791D_REG_TEMP2_CONFIG	0xC2</div><div class='add'>+#define W83791D_REG_TEMP3_CONFIG	0xCA</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_TEMP1[3] = {</div><div class='add'>+	0x27,			/* TEMP 1 in DataSheet */</div><div class='add'>+	0x39,			/* TEMP 1 Over in DataSheet */</div><div class='add'>+	0x3A,			/* TEMP 1 Hyst in DataSheet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_TEMP_ADD[2][6] = {</div><div class='add'>+	{0xC0,			/* TEMP 2 in DataSheet */</div><div class='add'>+	 0xC1,			/* TEMP 2(0.5 deg) in DataSheet */</div><div class='add'>+	 0xC5,			/* TEMP 2 Over High part in DataSheet */</div><div class='add'>+	 0xC6,			/* TEMP 2 Over Low part in DataSheet */</div><div class='add'>+	 0xC3,			/* TEMP 2 Thyst High part in DataSheet */</div><div class='add'>+	 0xC4},			/* TEMP 2 Thyst Low part in DataSheet */</div><div class='add'>+	{0xC8,			/* TEMP 3 in DataSheet */</div><div class='add'>+	 0xC9,			/* TEMP 3(0.5 deg) in DataSheet */</div><div class='add'>+	 0xCD,			/* TEMP 3 Over High part in DataSheet */</div><div class='add'>+	 0xCE,			/* TEMP 3 Over Low part in DataSheet */</div><div class='add'>+	 0xCB,			/* TEMP 3 Thyst High part in DataSheet */</div><div class='add'>+	 0xCC}			/* TEMP 3 Thyst Low part in DataSheet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define W83791D_REG_BEEP_CONFIG		0x4D</div><div class='add'>+</div><div class='add'>+static const u8 W83791D_REG_BEEP_CTRL[3] = {</div><div class='add'>+	0x56,			/* BEEP Control Register 1 */</div><div class='add'>+	0x57,			/* BEEP Control Register 2 */</div><div class='add'>+	0xA3,			/* BEEP Control Register 3 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define W83791D_REG_CONFIG		0x40</div><div class='add'>+#define W83791D_REG_VID_FANDIV		0x47</div><div class='add'>+#define W83791D_REG_DID_VID4		0x49</div><div class='add'>+#define W83791D_REG_WCHIPID		0x58</div><div class='add'>+#define W83791D_REG_CHIPMAN		0x4F</div><div class='add'>+#define W83791D_REG_PIN			0x4B</div><div class='add'>+#define W83791D_REG_I2C_SUBADDR		0x4A</div><div class='add'>+</div><div class='add'>+#define W83791D_REG_ALARM1 0xA9	/* realtime status register1 */</div><div class='add'>+#define W83791D_REG_ALARM2 0xAA	/* realtime status register2 */</div><div class='add'>+#define W83791D_REG_ALARM3 0xAB	/* realtime status register3 */</div><div class='add'>+</div><div class='add'>+#define W83791D_REG_VBAT		0x5D</div><div class='add'>+#define W83791D_REG_I2C_ADDR		0x48</div><div class='add'>+</div><div class='add'>+/* The SMBus locks itself. The Winbond W83791D has a bank select register</div><div class='add'>+   (index 0x4e), but the driver only accesses registers in bank 0. Since</div><div class='add'>+   we don't switch banks, we don't need any special code to handle</div><div class='add'>+   locking access between bank switches */</div><div class='add'>+static inline int w83791d_read(struct i2c_client *client, u8 reg)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_read_byte_data(client, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int w83791d_write(struct i2c_client *client, u8 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_write_byte_data(client, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The analog voltage inputs have 16mV LSB. Since the sysfs output is</div><div class='add'>+   in mV as would be measured on the chip input pin, need to just</div><div class='add'>+   multiply/divide by 16 to translate from/to register values. */</div><div class='add'>+#define IN_TO_REG(val)		(SENSORS_LIMIT((((val) + 8) / 16), 0, 255))</div><div class='add'>+#define IN_FROM_REG(val)	((val) * 16)</div><div class='add'>+</div><div class='add'>+static u8 fan_to_reg(long rpm, int div)</div><div class='add'>+{</div><div class='add'>+	if (rpm == 0)</div><div class='add'>+		return 255;</div><div class='add'>+	rpm = SENSORS_LIMIT(rpm, 1, 1000000);</div><div class='add'>+	return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FAN_FROM_REG(val,div)	((val) == 0   ? -1 : \</div><div class='add'>+				((val) == 255 ? 0 : \</div><div class='add'>+					1350000 / ((val) * (div))))</div><div class='add'>+</div><div class='add'>+/* for temp1 which is 8-bit resolution, LSB = 1 degree Celsius */</div><div class='add'>+#define TEMP1_FROM_REG(val)	((val) * 1000)</div><div class='add'>+#define TEMP1_TO_REG(val)	((val) &lt;= -128000 ? -128 : \</div><div class='add'>+				 (val) &gt;= 127000 ? 127 : \</div><div class='add'>+				 (val) &lt; 0 ? ((val) - 500) / 1000 : \</div><div class='add'>+				 ((val) + 500) / 1000)</div><div class='add'>+</div><div class='add'>+/* for temp2 and temp3 which are 9-bit resolution, LSB = 0.5 degree Celsius</div><div class='add'>+   Assumes the top 8 bits are the integral amount and the bottom 8 bits</div><div class='add'>+   are the fractional amount. Since we only have 0.5 degree resolution,</div><div class='add'>+   the bottom 7 bits will always be zero */</div><div class='add'>+#define TEMP23_FROM_REG(val)	((val) / 128 * 500)</div><div class='add'>+#define TEMP23_TO_REG(val)	((val) &lt;= -128000 ? 0x8000 : \</div><div class='add'>+				 (val) &gt;= 127500 ? 0x7F80 : \</div><div class='add'>+				 (val) &lt; 0 ? ((val) - 250) / 500 * 128 : \</div><div class='add'>+				 ((val) + 250) / 500 * 128)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define BEEP_MASK_TO_REG(val)		((val) &amp; 0xffffff)</div><div class='add'>+#define BEEP_MASK_FROM_REG(val)		((val) &amp; 0xffffff)</div><div class='add'>+</div><div class='add'>+#define DIV_FROM_REG(val)		(1 &lt;&lt; (val))</div><div class='add'>+</div><div class='add'>+static u8 div_to_reg(int nr, long val)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int max;</div><div class='add'>+</div><div class='add'>+	/* first three fan's divisor max out at 8, rest max out at 128 */</div><div class='add'>+	max = (nr &lt; 3) ? 8 : 128;</div><div class='add'>+	val = SENSORS_LIMIT(val, 1, max) &gt;&gt; 1;</div><div class='add'>+	for (i = 0; i &lt; 7; i++) {</div><div class='add'>+		if (val == 0)</div><div class='add'>+			break;</div><div class='add'>+		val &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+	return (u8) i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct w83791d_data {</div><div class='add'>+	struct i2c_client client;</div><div class='add'>+	struct class_device *class_dev;</div><div class='add'>+	struct mutex update_lock;</div><div class='add'>+</div><div class='add'>+	char valid;			/* !=0 if following fields are valid */</div><div class='add'>+	unsigned long last_updated;	/* In jiffies */</div><div class='add'>+</div><div class='add'>+	/* array of 2 pointers to subclients */</div><div class='add'>+	struct i2c_client *lm75[2];</div><div class='add'>+</div><div class='add'>+	/* volts */</div><div class='add'>+	u8 in[NUMBER_OF_VIN];		/* Register value */</div><div class='add'>+	u8 in_max[NUMBER_OF_VIN];	/* Register value */</div><div class='add'>+	u8 in_min[NUMBER_OF_VIN];	/* Register value */</div><div class='add'>+</div><div class='add'>+	/* fans */</div><div class='add'>+	u8 fan[NUMBER_OF_FANIN];	/* Register value */</div><div class='add'>+	u8 fan_min[NUMBER_OF_FANIN];	/* Register value */</div><div class='add'>+	u8 fan_div[NUMBER_OF_FANIN];	/* Register encoding, shifted right */</div><div class='add'>+</div><div class='add'>+	/* Temperature sensors */</div><div class='add'>+</div><div class='add'>+	s8 temp1[3];		/* current, over, thyst */</div><div class='add'>+	s16 temp_add[2][3];	/* fixed point value. Top 8 bits are the</div><div class='add'>+				   integral part, bottom 8 bits are the</div><div class='add'>+				   fractional part. We only use the top</div><div class='add'>+				   9 bits as the resolution is only</div><div class='add'>+				   to the 0.5 degree C...</div><div class='add'>+				   two sensors with three values</div><div class='add'>+				   (cur, over, hyst)  */</div><div class='add'>+</div><div class='add'>+	/* Misc */</div><div class='add'>+	u32 alarms;		/* realtime status register encoding,combined */</div><div class='add'>+	u8 beep_enable;		/* Global beep enable */</div><div class='add'>+	u32 beep_mask;		/* Mask off specific beeps */</div><div class='add'>+	u8 vid;			/* Register encoding, combined */</div><div class='add'>+	u8 vrm;			/* hwmon-vid */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int w83791d_attach_adapter(struct i2c_adapter *adapter);</div><div class='add'>+static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind);</div><div class='add'>+static int w83791d_detach_client(struct i2c_client *client);</div><div class='add'>+</div><div class='add'>+static int w83791d_read(struct i2c_client *client, u8 register);</div><div class='add'>+static int w83791d_write(struct i2c_client *client, u8 register, u8 value);</div><div class='add'>+static struct w83791d_data *w83791d_update_device(struct device *dev);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void w83791d_print_debug(struct w83791d_data *data, struct device *dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void w83791d_init_client(struct i2c_client *client);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver w83791d_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "w83791d",</div><div class='add'>+	},</div><div class='add'>+	.attach_adapter = w83791d_attach_adapter,</div><div class='add'>+	.detach_client = w83791d_detach_client,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* following are the sysfs callback functions */</div><div class='add'>+#define show_in_reg(reg) \</div><div class='add'>+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='add'>+			char *buf) \</div><div class='add'>+{ \</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = \</div><div class='add'>+						to_sensor_dev_attr(attr); \</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev); \</div><div class='add'>+	int nr = sensor_attr-&gt;index; \</div><div class='add'>+	return sprintf(buf,"%d\n", IN_FROM_REG(data-&gt;reg[nr])); \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+show_in_reg(in);</div><div class='add'>+show_in_reg(in_min);</div><div class='add'>+show_in_reg(in_max);</div><div class='add'>+</div><div class='add'>+#define store_in_reg(REG, reg) \</div><div class='add'>+static ssize_t store_in_##reg(struct device *dev, \</div><div class='add'>+				struct device_attribute *attr, \</div><div class='add'>+				const char *buf, size_t count) \</div><div class='add'>+{ \</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = \</div><div class='add'>+						to_sensor_dev_attr(attr); \</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev); \</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client); \</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10); \</div><div class='add'>+	int nr = sensor_attr-&gt;index; \</div><div class='add'>+	 \</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='add'>+	data-&gt;in_##reg[nr] = IN_TO_REG(val); \</div><div class='add'>+	w83791d_write(client, W83791D_REG_IN_##REG[nr], data-&gt;in_##reg[nr]); \</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock); \</div><div class='add'>+	 \</div><div class='add'>+	return count; \</div><div class='add'>+}</div><div class='add'>+store_in_reg(MIN, min);</div><div class='add'>+store_in_reg(MAX, max);</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_input[] = {</div><div class='add'>+	SENSOR_ATTR(in0_input, S_IRUGO, show_in, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(in1_input, S_IRUGO, show_in, NULL, 1),</div><div class='add'>+	SENSOR_ATTR(in2_input, S_IRUGO, show_in, NULL, 2),</div><div class='add'>+	SENSOR_ATTR(in3_input, S_IRUGO, show_in, NULL, 3),</div><div class='add'>+	SENSOR_ATTR(in4_input, S_IRUGO, show_in, NULL, 4),</div><div class='add'>+	SENSOR_ATTR(in5_input, S_IRUGO, show_in, NULL, 5),</div><div class='add'>+	SENSOR_ATTR(in6_input, S_IRUGO, show_in, NULL, 6),</div><div class='add'>+	SENSOR_ATTR(in7_input, S_IRUGO, show_in, NULL, 7),</div><div class='add'>+	SENSOR_ATTR(in8_input, S_IRUGO, show_in, NULL, 8),</div><div class='add'>+	SENSOR_ATTR(in9_input, S_IRUGO, show_in, NULL, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_min[] = {</div><div class='add'>+	SENSOR_ATTR(in0_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 0),</div><div class='add'>+	SENSOR_ATTR(in1_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 1),</div><div class='add'>+	SENSOR_ATTR(in2_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 2),</div><div class='add'>+	SENSOR_ATTR(in3_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 3),</div><div class='add'>+	SENSOR_ATTR(in4_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 4),</div><div class='add'>+	SENSOR_ATTR(in5_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 5),</div><div class='add'>+	SENSOR_ATTR(in6_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 6),</div><div class='add'>+	SENSOR_ATTR(in7_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 7),</div><div class='add'>+	SENSOR_ATTR(in8_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 8),</div><div class='add'>+	SENSOR_ATTR(in9_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_in_max[] = {</div><div class='add'>+	SENSOR_ATTR(in0_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 0),</div><div class='add'>+	SENSOR_ATTR(in1_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 1),</div><div class='add'>+	SENSOR_ATTR(in2_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 2),</div><div class='add'>+	SENSOR_ATTR(in3_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 3),</div><div class='add'>+	SENSOR_ATTR(in4_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 4),</div><div class='add'>+	SENSOR_ATTR(in5_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 5),</div><div class='add'>+	SENSOR_ATTR(in6_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 6),</div><div class='add'>+	SENSOR_ATTR(in7_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 7),</div><div class='add'>+	SENSOR_ATTR(in8_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 8),</div><div class='add'>+	SENSOR_ATTR(in9_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 9),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define show_fan_reg(reg) \</div><div class='add'>+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \</div><div class='add'>+				char *buf) \</div><div class='add'>+{ \</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = \</div><div class='add'>+						to_sensor_dev_attr(attr); \</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev); \</div><div class='add'>+	int nr = sensor_attr-&gt;index; \</div><div class='add'>+	return sprintf(buf,"%d\n", \</div><div class='add'>+		FAN_FROM_REG(data-&gt;reg[nr], DIV_FROM_REG(data-&gt;fan_div[nr]))); \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+show_fan_reg(fan);</div><div class='add'>+show_fan_reg(fan_min);</div><div class='add'>+</div><div class='add'>+static ssize_t store_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;fan_min[nr] = fan_to_reg(val, DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='add'>+	w83791d_write(client, W83791D_REG_FAN_MIN[nr], data-&gt;fan_min[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%u\n", DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note: we save and restore the fan minimum here, because its value is</div><div class='add'>+   determined in part by the fan divisor.  This follows the principle of</div><div class='add'>+   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   because the divisor changed. */</div><div class='add'>+static ssize_t store_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='add'>+	unsigned long min;</div><div class='add'>+	u8 tmp_fan_div;</div><div class='add'>+	u8 fan_div_reg;</div><div class='add'>+	int indx = 0;</div><div class='add'>+	u8 keep_mask = 0;</div><div class='add'>+	u8 new_shift = 0;</div><div class='add'>+</div><div class='add'>+	/* Save fan_min */</div><div class='add'>+	min = FAN_FROM_REG(data-&gt;fan_min[nr], DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;fan_div[nr] = div_to_reg(nr, simple_strtoul(buf, NULL, 10));</div><div class='add'>+</div><div class='add'>+	switch (nr) {</div><div class='add'>+	case 0:</div><div class='add'>+		indx = 0;</div><div class='add'>+		keep_mask = 0xcf;</div><div class='add'>+		new_shift = 4;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		indx = 0;</div><div class='add'>+		keep_mask = 0x3f;</div><div class='add'>+		new_shift = 6;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		indx = 1;</div><div class='add'>+		keep_mask = 0x3f;</div><div class='add'>+		new_shift = 6;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		indx = 2;</div><div class='add'>+		keep_mask = 0xf8;</div><div class='add'>+		new_shift = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		indx = 2;</div><div class='add'>+		keep_mask = 0x8f;</div><div class='add'>+		new_shift = 4;</div><div class='add'>+		break;</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(dev, "store_fan_div: Unexpected nr seen: %d\n", nr);</div><div class='add'>+		count = -EINVAL;</div><div class='add'>+		goto err_exit;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fan_div_reg = w83791d_read(client, W83791D_REG_FAN_DIV[indx])</div><div class='add'>+			&amp; keep_mask;</div><div class='add'>+	tmp_fan_div = (data-&gt;fan_div[nr] &lt;&lt; new_shift) &amp; ~keep_mask;</div><div class='add'>+</div><div class='add'>+	w83791d_write(client, W83791D_REG_FAN_DIV[indx],</div><div class='add'>+				fan_div_reg | tmp_fan_div);</div><div class='add'>+</div><div class='add'>+	/* Restore fan_min */</div><div class='add'>+	data-&gt;fan_min[nr] = fan_to_reg(min, DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='add'>+	w83791d_write(client, W83791D_REG_FAN_MIN[nr], data-&gt;fan_min[nr]);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+err_exit:</div><div class='add'>+#endif</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_fan_input[] = {</div><div class='add'>+	SENSOR_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0),</div><div class='add'>+	SENSOR_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1),</div><div class='add'>+	SENSOR_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2),</div><div class='add'>+	SENSOR_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 3),</div><div class='add'>+	SENSOR_ATTR(fan5_input, S_IRUGO, show_fan, NULL, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_fan_min[] = {</div><div class='add'>+	SENSOR_ATTR(fan1_min, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_min, store_fan_min, 0),</div><div class='add'>+	SENSOR_ATTR(fan2_min, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_min, store_fan_min, 1),</div><div class='add'>+	SENSOR_ATTR(fan3_min, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_min, store_fan_min, 2),</div><div class='add'>+	SENSOR_ATTR(fan4_min, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_min, store_fan_min, 3),</div><div class='add'>+	SENSOR_ATTR(fan5_min, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_min, store_fan_min, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_fan_div[] = {</div><div class='add'>+	SENSOR_ATTR(fan1_div, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_div, store_fan_div, 0),</div><div class='add'>+	SENSOR_ATTR(fan2_div, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_div, store_fan_div, 1),</div><div class='add'>+	SENSOR_ATTR(fan3_div, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_div, store_fan_div, 2),</div><div class='add'>+	SENSOR_ATTR(fan4_div, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_div, store_fan_div, 3),</div><div class='add'>+	SENSOR_ATTR(fan5_div, S_IWUSR | S_IRUGO,</div><div class='add'>+			show_fan_div, store_fan_div, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* read/write the temperature1, includes measured value and limits */</div><div class='add'>+static ssize_t show_temp1(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP1_FROM_REG(data-&gt;temp1[attr-&gt;index]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_temp1(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	int nr = attr-&gt;index;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp1[nr] = TEMP1_TO_REG(val);</div><div class='add'>+	w83791d_write(client, W83791D_REG_TEMP1[nr], data-&gt;temp1[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read/write temperature2-3, includes measured value and limits */</div><div class='add'>+static ssize_t show_temp23(struct device *dev, struct device_attribute *devattr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	int nr = attr-&gt;nr;</div><div class='add'>+	int index = attr-&gt;index;</div><div class='add'>+	return sprintf(buf, "%d\n", TEMP23_FROM_REG(data-&gt;temp_add[nr][index]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_temp23(struct device *dev,</div><div class='add'>+				struct device_attribute *devattr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	int nr = attr-&gt;nr;</div><div class='add'>+	int index = attr-&gt;index;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;temp_add[nr][index] = TEMP23_TO_REG(val);</div><div class='add'>+	w83791d_write(client, W83791D_REG_TEMP_ADD[nr][index * 2],</div><div class='add'>+				data-&gt;temp_add[nr][index] &gt;&gt; 8);</div><div class='add'>+	w83791d_write(client, W83791D_REG_TEMP_ADD[nr][index * 2 + 1],</div><div class='add'>+				data-&gt;temp_add[nr][index] &amp; 0x80);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute_2 sda_temp_input[] = {</div><div class='add'>+	SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp1, NULL, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp23, NULL, 0, 0),</div><div class='add'>+	SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp23, NULL, 1, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute_2 sda_temp_max[] = {</div><div class='add'>+	SENSOR_ATTR_2(temp1_max, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_temp1, store_temp1, 0, 1),</div><div class='add'>+	SENSOR_ATTR_2(temp2_max, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_temp23, store_temp23, 0, 1),</div><div class='add'>+	SENSOR_ATTR_2(temp3_max, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_temp23, store_temp23, 1, 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute_2 sda_temp_max_hyst[] = {</div><div class='add'>+	SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_temp1, store_temp1, 0, 2),</div><div class='add'>+	SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_temp23, store_temp23, 0, 2),</div><div class='add'>+	SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_temp23, store_temp23, 1, 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* get reatime status of all sensors items: voltage, temp, fan */</div><div class='add'>+static ssize_t show_alarms_reg(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%u\n", data-&gt;alarms);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);</div><div class='add'>+</div><div class='add'>+/* Beep control */</div><div class='add'>+</div><div class='add'>+#define GLOBAL_BEEP_ENABLE_SHIFT	15</div><div class='add'>+#define GLOBAL_BEEP_ENABLE_MASK		(1 &lt;&lt; GLOBAL_BEEP_ENABLE_SHIFT)</div><div class='add'>+</div><div class='add'>+static ssize_t show_beep_enable(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;beep_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_beep_mask(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", BEEP_MASK_FROM_REG(data-&gt;beep_mask));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t store_beep_mask(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	/* The beep_enable state overrides any enabling request from</div><div class='add'>+	   the masks */</div><div class='add'>+	data-&gt;beep_mask = BEEP_MASK_TO_REG(val) &amp; ~GLOBAL_BEEP_ENABLE_MASK;</div><div class='add'>+	data-&gt;beep_mask |= (data-&gt;beep_enable &lt;&lt; GLOBAL_BEEP_ENABLE_SHIFT);</div><div class='add'>+</div><div class='add'>+	val = data-&gt;beep_mask;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		w83791d_write(client, W83791D_REG_BEEP_CTRL[i], (val &amp; 0xff));</div><div class='add'>+		val &gt;&gt;= 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_beep_enable(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	long val = simple_strtol(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	data-&gt;beep_enable = val ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Keep the full mask value in sync with the current enable */</div><div class='add'>+	data-&gt;beep_mask &amp;= ~GLOBAL_BEEP_ENABLE_MASK;</div><div class='add'>+	data-&gt;beep_mask |= (data-&gt;beep_enable &lt;&lt; GLOBAL_BEEP_ENABLE_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* The global control is in the second beep control register</div><div class='add'>+	   so only need to update that register */</div><div class='add'>+	val = (data-&gt;beep_mask &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	w83791d_write(client, W83791D_REG_BEEP_CTRL[1], val);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sensor_device_attribute sda_beep_ctrl[] = {</div><div class='add'>+	SENSOR_ATTR(beep_enable, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_beep_enable, store_beep_enable, 0),</div><div class='add'>+	SENSOR_ATTR(beep_mask, S_IRUGO | S_IWUSR,</div><div class='add'>+			show_beep_mask, store_beep_mask, 1)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* cpu voltage regulation information */</div><div class='add'>+static ssize_t show_vid_reg(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", vid_from_reg(data-&gt;vid, data-&gt;vrm));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t show_vrm_reg(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = w83791d_update_device(dev);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;vrm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_vrm_reg(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	unsigned long val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	/* No lock needed as vrm is internal to the driver</div><div class='add'>+	   (not read from a chip register) and so is not</div><div class='add'>+	   updated in w83791d_update_device() */</div><div class='add'>+	data-&gt;vrm = val;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);</div><div class='add'>+</div><div class='add'>+/* This function is called when:</div><div class='add'>+     * w83791d_driver is inserted (when this module is loaded), for each</div><div class='add'>+       available adapter</div><div class='add'>+     * when a new adapter is inserted (and w83791d_driver is still present) */</div><div class='add'>+static int w83791d_attach_adapter(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (!(adapter-&gt;class &amp; I2C_CLASS_HWMON))</div><div class='add'>+		return 0;</div><div class='add'>+	return i2c_probe(adapter, &amp;addr_data, w83791d_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int w83791d_create_subclient(struct i2c_adapter *adapter,</div><div class='add'>+				struct i2c_client *client, int addr,</div><div class='add'>+				struct i2c_client **sub_cli)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct i2c_client *sub_client;</div><div class='add'>+</div><div class='add'>+	(*sub_cli) = sub_client =</div><div class='add'>+			kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (!(sub_client)) {</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	sub_client-&gt;addr = 0x48 + addr;</div><div class='add'>+	i2c_set_clientdata(sub_client, NULL);</div><div class='add'>+	sub_client-&gt;adapter = adapter;</div><div class='add'>+	sub_client-&gt;driver = &amp;w83791d_driver;</div><div class='add'>+	strlcpy(sub_client-&gt;name, "w83791d subclient", I2C_NAME_SIZE);</div><div class='add'>+	if ((err = i2c_attach_client(sub_client))) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "subclient registration "</div><div class='add'>+			"at address 0x%x failed\n", sub_client-&gt;addr);</div><div class='add'>+		kfree(sub_client);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int w83791d_detect_subclients(struct i2c_adapter *adapter, int address,</div><div class='add'>+				int kind, struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int i, id, err;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	id = i2c_adapter_id(adapter);</div><div class='add'>+	if (force_subclients[0] == id &amp;&amp; force_subclients[1] == address) {</div><div class='add'>+		for (i = 2; i &lt;= 3; i++) {</div><div class='add'>+			if (force_subclients[i] &lt; 0x48 ||</div><div class='add'>+			    force_subclients[i] &gt; 0x4f) {</div><div class='add'>+				dev_err(&amp;client-&gt;dev,</div><div class='add'>+					"invalid subclient "</div><div class='add'>+					"address %d; must be 0x48-0x4f\n",</div><div class='add'>+					force_subclients[i]);</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto error_sc_0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		w83791d_write(client, W83791D_REG_I2C_SUBADDR,</div><div class='add'>+					(force_subclients[2] &amp; 0x07) |</div><div class='add'>+					((force_subclients[3] &amp; 0x07) &lt;&lt; 4));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = w83791d_read(client, W83791D_REG_I2C_SUBADDR);</div><div class='add'>+	if (!(val &amp; 0x08)) {</div><div class='add'>+		err = w83791d_create_subclient(adapter, client,</div><div class='add'>+						val &amp; 0x7, &amp;data-&gt;lm75[0]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error_sc_0;</div><div class='add'>+	}</div><div class='add'>+	if (!(val &amp; 0x80)) {</div><div class='add'>+		if ((data-&gt;lm75[0] != NULL) &amp;&amp;</div><div class='add'>+				((val &amp; 0x7) == ((val &gt;&gt; 4) &amp; 0x7))) {</div><div class='add'>+			dev_err(&amp;client-&gt;dev,</div><div class='add'>+				"duplicate addresses 0x%x, "</div><div class='add'>+				"use force_subclient\n",</div><div class='add'>+				data-&gt;lm75[0]-&gt;addr);</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto error_sc_1;</div><div class='add'>+		}</div><div class='add'>+		err = w83791d_create_subclient(adapter, client,</div><div class='add'>+					(val &gt;&gt; 4) &amp; 0x7, &amp;data-&gt;lm75[1]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error_sc_1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+/* Undo inits in case of errors */</div><div class='add'>+</div><div class='add'>+error_sc_1:</div><div class='add'>+	if (data-&gt;lm75[0] != NULL) {</div><div class='add'>+		i2c_detach_client(data-&gt;lm75[0]);</div><div class='add'>+		kfree(data-&gt;lm75[0]);</div><div class='add'>+	}</div><div class='add'>+error_sc_0:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct w83791d_data *data;</div><div class='add'>+	int i, val1, val2;</div><div class='add'>+	int err = 0;</div><div class='add'>+	const char *client_name = "";</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {</div><div class='add'>+		goto error0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* OK. For now, we presume we have a valid client. We now create the</div><div class='add'>+	   client structure, even though we cannot fill it completely yet.</div><div class='add'>+	   But it allows us to access w83791d_{read,write}_value. */</div><div class='add'>+	if (!(data = kzalloc(sizeof(struct w83791d_data), GFP_KERNEL))) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	client = &amp;data-&gt;client;</div><div class='add'>+	dev = &amp;client-&gt;dev;</div><div class='add'>+	i2c_set_clientdata(client, data);</div><div class='add'>+	client-&gt;addr = address;</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;driver = &amp;w83791d_driver;</div><div class='add'>+	mutex_init(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	/* Now, we do the remaining detection. */</div><div class='add'>+</div><div class='add'>+	/* The w83791d may be stuck in some other bank than bank 0. This may</div><div class='add'>+	   make reading other information impossible. Specify a force=...</div><div class='add'>+	   parameter, and the Winbond will be reset to the right bank. */</div><div class='add'>+	if (kind &lt; 0) {</div><div class='add'>+		if (w83791d_read(client, W83791D_REG_CONFIG) &amp; 0x80) {</div><div class='add'>+			dev_dbg(dev, "Detection failed at step 1\n");</div><div class='add'>+			goto error1;</div><div class='add'>+		}</div><div class='add'>+		val1 = w83791d_read(client, W83791D_REG_BANK);</div><div class='add'>+		val2 = w83791d_read(client, W83791D_REG_CHIPMAN);</div><div class='add'>+		/* Check for Winbond ID if in bank 0 */</div><div class='add'>+		if (!(val1 &amp; 0x07)) {</div><div class='add'>+			/* yes it is Bank0 */</div><div class='add'>+			if (((!(val1 &amp; 0x80)) &amp;&amp; (val2 != 0xa3)) ||</div><div class='add'>+			    ((val1 &amp; 0x80) &amp;&amp; (val2 != 0x5c))) {</div><div class='add'>+				dev_dbg(dev, "Detection failed at step 2\n");</div><div class='add'>+				goto error1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* If Winbond chip, address of chip and W83791D_REG_I2C_ADDR</div><div class='add'>+		   should match */</div><div class='add'>+		if (w83791d_read(client, W83791D_REG_I2C_ADDR) != address) {</div><div class='add'>+			dev_dbg(dev, "Detection failed at step 3\n");</div><div class='add'>+			goto error1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We either have a force parameter or we have reason to</div><div class='add'>+	   believe it is a Winbond chip. Either way, we want bank 0 and</div><div class='add'>+	   Vendor ID high byte */</div><div class='add'>+	val1 = w83791d_read(client, W83791D_REG_BANK) &amp; 0x78;</div><div class='add'>+	w83791d_write(client, W83791D_REG_BANK, val1 | 0x80);</div><div class='add'>+</div><div class='add'>+	/* Verify it is a Winbond w83791d */</div><div class='add'>+	if (kind &lt;= 0) {</div><div class='add'>+		/* get vendor ID */</div><div class='add'>+		val2 = w83791d_read(client, W83791D_REG_CHIPMAN);</div><div class='add'>+		if (val2 != 0x5c) {	/* the vendor is NOT Winbond */</div><div class='add'>+			dev_dbg(dev, "Detection failed at step 4\n");</div><div class='add'>+			goto error1;</div><div class='add'>+		}</div><div class='add'>+		val1 = w83791d_read(client, W83791D_REG_WCHIPID);</div><div class='add'>+		if (val1 == 0x71) {</div><div class='add'>+			kind = w83791d;</div><div class='add'>+		} else {</div><div class='add'>+			if (kind == 0)</div><div class='add'>+				dev_warn(dev,</div><div class='add'>+					"w83791d: Ignoring 'force' parameter "</div><div class='add'>+					"for unknown chip at adapter %d, "</div><div class='add'>+					"address 0x%02x\n",</div><div class='add'>+					i2c_adapter_id(adapter), address);</div><div class='add'>+			goto error1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (kind == w83791d) {</div><div class='add'>+		client_name = "w83791d";</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(dev, "w83791d: Internal error: unknown kind (%d)?!?",</div><div class='add'>+			kind);</div><div class='add'>+		goto error1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	val1 = w83791d_read(client, W83791D_REG_DID_VID4);</div><div class='add'>+	dev_dbg(dev, "Device ID version: %d.%d (0x%02x)\n",</div><div class='add'>+			(val1 &gt;&gt; 5) &amp; 0x07, (val1 &gt;&gt; 1) &amp; 0x0f, val1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Fill in the remaining client fields and put into the global list */</div><div class='add'>+	strlcpy(client-&gt;name, client_name, I2C_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Tell the I2C layer a new client has arrived */</div><div class='add'>+	if ((err = i2c_attach_client(client)))</div><div class='add'>+		goto error1;</div><div class='add'>+</div><div class='add'>+	if ((err = w83791d_detect_subclients(adapter, address, kind, client)))</div><div class='add'>+		goto error2;</div><div class='add'>+</div><div class='add'>+	/* Initialize the chip */</div><div class='add'>+	w83791d_init_client(client);</div><div class='add'>+</div><div class='add'>+	/* If the fan_div is changed, make sure there is a rational</div><div class='add'>+	   fan_min in place */</div><div class='add'>+	for (i = 0; i &lt; NUMBER_OF_FANIN; i++) {</div><div class='add'>+		data-&gt;fan_min[i] = w83791d_read(client, W83791D_REG_FAN_MIN[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register sysfs hooks */</div><div class='add'>+	data-&gt;class_dev = hwmon_device_register(dev);</div><div class='add'>+	if (IS_ERR(data-&gt;class_dev)) {</div><div class='add'>+		err = PTR_ERR(data-&gt;class_dev);</div><div class='add'>+		goto error3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUMBER_OF_VIN; i++) {</div><div class='add'>+		device_create_file(dev, &amp;sda_in_input[i].dev_attr);</div><div class='add'>+		device_create_file(dev, &amp;sda_in_min[i].dev_attr);</div><div class='add'>+		device_create_file(dev, &amp;sda_in_max[i].dev_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUMBER_OF_FANIN; i++) {</div><div class='add'>+		device_create_file(dev, &amp;sda_fan_input[i].dev_attr);</div><div class='add'>+		device_create_file(dev, &amp;sda_fan_div[i].dev_attr);</div><div class='add'>+		device_create_file(dev, &amp;sda_fan_min[i].dev_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUMBER_OF_TEMPIN; i++) {</div><div class='add'>+		device_create_file(dev, &amp;sda_temp_input[i].dev_attr);</div><div class='add'>+		device_create_file(dev, &amp;sda_temp_max[i].dev_attr);</div><div class='add'>+		device_create_file(dev, &amp;sda_temp_max_hyst[i].dev_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_create_file(dev, &amp;dev_attr_alarms);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sda_beep_ctrl); i++) {</div><div class='add'>+		device_create_file(dev, &amp;sda_beep_ctrl[i].dev_attr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_create_file(dev, &amp;dev_attr_cpu0_vid);</div><div class='add'>+	device_create_file(dev, &amp;dev_attr_vrm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error3:</div><div class='add'>+	if (data-&gt;lm75[0] != NULL) {</div><div class='add'>+		i2c_detach_client(data-&gt;lm75[0]);</div><div class='add'>+		kfree(data-&gt;lm75[0]);</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;lm75[1] != NULL) {</div><div class='add'>+		i2c_detach_client(data-&gt;lm75[1]);</div><div class='add'>+		kfree(data-&gt;lm75[1]);</div><div class='add'>+	}</div><div class='add'>+error2:</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+error1:</div><div class='add'>+	kfree(data);</div><div class='add'>+error0:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int w83791d_detach_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* main client */</div><div class='add'>+	if (data)</div><div class='add'>+		hwmon_device_unregister(data-&gt;class_dev);</div><div class='add'>+</div><div class='add'>+	if ((err = i2c_detach_client(client)))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* main client */</div><div class='add'>+	if (data)</div><div class='add'>+		kfree(data);</div><div class='add'>+	/* subclient */</div><div class='add'>+	else</div><div class='add'>+		kfree(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void w83791d_init_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	u8 tmp;</div><div class='add'>+	u8 old_beep;</div><div class='add'>+</div><div class='add'>+	/* The difference between reset and init is that reset</div><div class='add'>+	   does a hard reset of the chip via index 0x40, bit 7,</div><div class='add'>+	   but init simply forces certain registers to have "sane"</div><div class='add'>+	   values. The hope is that the BIOS has done the right</div><div class='add'>+	   thing (which is why the default is reset=0, init=0),</div><div class='add'>+	   but if not, reset is the hard hammer and init</div><div class='add'>+	   is the soft mallet both of which are trying to whack</div><div class='add'>+	   things into place...</div><div class='add'>+	   NOTE: The data sheet makes a distinction between</div><div class='add'>+	   "power on defaults" and "reset by MR". As far as I can tell,</div><div class='add'>+	   the hard reset puts everything into a power-on state so I'm</div><div class='add'>+	   not sure what "reset by MR" means or how it can happen.</div><div class='add'>+	   */</div><div class='add'>+	if (reset || init) {</div><div class='add'>+		/* keep some BIOS settings when we... */</div><div class='add'>+		old_beep = w83791d_read(client, W83791D_REG_BEEP_CONFIG);</div><div class='add'>+</div><div class='add'>+		if (reset) {</div><div class='add'>+			/* ... reset the chip and ... */</div><div class='add'>+			w83791d_write(client, W83791D_REG_CONFIG, 0x80);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* ... disable power-on abnormal beep */</div><div class='add'>+		w83791d_write(client, W83791D_REG_BEEP_CONFIG, old_beep | 0x80);</div><div class='add'>+</div><div class='add'>+		/* disable the global beep (not done by hard reset) */</div><div class='add'>+		tmp = w83791d_read(client, W83791D_REG_BEEP_CTRL[1]);</div><div class='add'>+		w83791d_write(client, W83791D_REG_BEEP_CTRL[1], tmp &amp; 0xef);</div><div class='add'>+</div><div class='add'>+		if (init) {</div><div class='add'>+			/* Make sure monitoring is turned on for add-ons */</div><div class='add'>+			tmp = w83791d_read(client, W83791D_REG_TEMP2_CONFIG);</div><div class='add'>+			if (tmp &amp; 1) {</div><div class='add'>+				w83791d_write(client, W83791D_REG_TEMP2_CONFIG,</div><div class='add'>+					tmp &amp; 0xfe);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tmp = w83791d_read(client, W83791D_REG_TEMP3_CONFIG);</div><div class='add'>+			if (tmp &amp; 1) {</div><div class='add'>+				w83791d_write(client, W83791D_REG_TEMP3_CONFIG,</div><div class='add'>+					tmp &amp; 0xfe);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Start monitoring */</div><div class='add'>+			tmp = w83791d_read(client, W83791D_REG_CONFIG) &amp; 0xf7;</div><div class='add'>+			w83791d_write(client, W83791D_REG_CONFIG, tmp | 0x01);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;vrm = vid_which_vrm();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct w83791d_data *w83791d_update_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	struct w83791d_data *data = i2c_get_clientdata(client);</div><div class='add'>+	int i, j;</div><div class='add'>+	u8 reg_array_tmp[3];</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, data-&gt;last_updated + (HZ * 3))</div><div class='add'>+			|| !data-&gt;valid) {</div><div class='add'>+		dev_dbg(dev, "Starting w83791d device update\n");</div><div class='add'>+</div><div class='add'>+		/* Update the voltages measured value and limits */</div><div class='add'>+		for (i = 0; i &lt; NUMBER_OF_VIN; i++) {</div><div class='add'>+			data-&gt;in[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_IN[i]);</div><div class='add'>+			data-&gt;in_max[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_IN_MAX[i]);</div><div class='add'>+			data-&gt;in_min[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_IN_MIN[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update the fan counts and limits */</div><div class='add'>+		for (i = 0; i &lt; NUMBER_OF_FANIN; i++) {</div><div class='add'>+			/* Update the Fan measured value and limits */</div><div class='add'>+			data-&gt;fan[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_FAN[i]);</div><div class='add'>+			data-&gt;fan_min[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_FAN_MIN[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update the fan divisor */</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			reg_array_tmp[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_FAN_DIV[i]);</div><div class='add'>+		}</div><div class='add'>+		data-&gt;fan_div[0] = (reg_array_tmp[0] &gt;&gt; 4) &amp; 0x03;</div><div class='add'>+		data-&gt;fan_div[1] = (reg_array_tmp[0] &gt;&gt; 6) &amp; 0x03;</div><div class='add'>+		data-&gt;fan_div[2] = (reg_array_tmp[1] &gt;&gt; 6) &amp; 0x03;</div><div class='add'>+		data-&gt;fan_div[3] = reg_array_tmp[2] &amp; 0x07;</div><div class='add'>+		data-&gt;fan_div[4] = (reg_array_tmp[2] &gt;&gt; 4) &amp; 0x07;</div><div class='add'>+</div><div class='add'>+		/* Update the first temperature sensor */</div><div class='add'>+		for (i = 0; i &lt; 3; i++) {</div><div class='add'>+			data-&gt;temp1[i] = w83791d_read(client,</div><div class='add'>+						W83791D_REG_TEMP1[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update the rest of the temperature sensors */</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			for (j = 0; j &lt; 3; j++) {</div><div class='add'>+				data-&gt;temp_add[i][j] =</div><div class='add'>+					(w83791d_read(client,</div><div class='add'>+					W83791D_REG_TEMP_ADD[i][j * 2]) &lt;&lt; 8) |</div><div class='add'>+					w83791d_read(client,</div><div class='add'>+					W83791D_REG_TEMP_ADD[i][j * 2 + 1]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Update the realtime status */</div><div class='add'>+		data-&gt;alarms =</div><div class='add'>+			w83791d_read(client, W83791D_REG_ALARM1) +</div><div class='add'>+			(w83791d_read(client, W83791D_REG_ALARM2) &lt;&lt; 8) +</div><div class='add'>+			(w83791d_read(client, W83791D_REG_ALARM3) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+		/* Update the beep configuration information */</div><div class='add'>+		data-&gt;beep_mask =</div><div class='add'>+			w83791d_read(client, W83791D_REG_BEEP_CTRL[0]) +</div><div class='add'>+			(w83791d_read(client, W83791D_REG_BEEP_CTRL[1]) &lt;&lt; 8) +</div><div class='add'>+			(w83791d_read(client, W83791D_REG_BEEP_CTRL[2]) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+		data-&gt;beep_enable =</div><div class='add'>+			(data-&gt;beep_mask &gt;&gt; GLOBAL_BEEP_ENABLE_SHIFT) &amp; 0x01;</div><div class='add'>+</div><div class='add'>+		/* Update the cpu voltage information */</div><div class='add'>+		i = w83791d_read(client, W83791D_REG_VID_FANDIV);</div><div class='add'>+		data-&gt;vid = i &amp; 0x0f;</div><div class='add'>+		data-&gt;vid |= (w83791d_read(client, W83791D_REG_DID_VID4) &amp; 0x01)</div><div class='add'>+				&lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+		data-&gt;last_updated = jiffies;</div><div class='add'>+		data-&gt;valid = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	w83791d_print_debug(data, dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void w83791d_print_debug(struct w83791d_data *data, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	int i = 0, j = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "======Start of w83791d debug values======\n");</div><div class='add'>+	dev_dbg(dev, "%d set of Voltages: ===&gt;\n", NUMBER_OF_VIN);</div><div class='add'>+	for (i = 0; i &lt; NUMBER_OF_VIN; i++) {</div><div class='add'>+		dev_dbg(dev, "vin[%d] is:     0x%02x\n", i, data-&gt;in[i]);</div><div class='add'>+		dev_dbg(dev, "vin[%d] min is: 0x%02x\n", i, data-&gt;in_min[i]);</div><div class='add'>+		dev_dbg(dev, "vin[%d] max is: 0x%02x\n", i, data-&gt;in_max[i]);</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(dev, "%d set of Fan Counts/Divisors: ===&gt;\n", NUMBER_OF_FANIN);</div><div class='add'>+	for (i = 0; i &lt; NUMBER_OF_FANIN; i++) {</div><div class='add'>+		dev_dbg(dev, "fan[%d] is:     0x%02x\n", i, data-&gt;fan[i]);</div><div class='add'>+		dev_dbg(dev, "fan[%d] min is: 0x%02x\n", i, data-&gt;fan_min[i]);</div><div class='add'>+		dev_dbg(dev, "fan_div[%d] is: 0x%02x\n", i, data-&gt;fan_div[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* temperature math is signed, but only print out the</div><div class='add'>+	   bits that matter */</div><div class='add'>+	dev_dbg(dev, "%d set of Temperatures: ===&gt;\n", NUMBER_OF_TEMPIN);</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		dev_dbg(dev, "temp1[%d] is: 0x%02x\n", i, (u8) data-&gt;temp1[i]);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		for (j = 0; j &lt; 3; j++) {</div><div class='add'>+			dev_dbg(dev, "temp_add[%d][%d] is: 0x%04x\n", i, j,</div><div class='add'>+				(u16) data-&gt;temp_add[i][j]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Misc Information: ===&gt;\n");</div><div class='add'>+	dev_dbg(dev, "alarm is:     0x%08x\n", data-&gt;alarms);</div><div class='add'>+	dev_dbg(dev, "beep_mask is: 0x%08x\n", data-&gt;beep_mask);</div><div class='add'>+	dev_dbg(dev, "beep_enable is: %d\n", data-&gt;beep_enable);</div><div class='add'>+	dev_dbg(dev, "vid is: 0x%02x\n", data-&gt;vid);</div><div class='add'>+	dev_dbg(dev, "vrm is: 0x%02x\n", data-&gt;vrm);</div><div class='add'>+	dev_dbg(dev, "=======End of w83791d debug values========\n");</div><div class='add'>+	dev_dbg(dev, "\n");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init sensors_w83791d_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;w83791d_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sensors_w83791d_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;w83791d_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Charles Spirakis &lt;bezaur@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("W83791D driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+module_init(sensors_w83791d_init);</div><div class='add'>+module_exit(sensors_w83791d_exit);</div><div class='head'>diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c<br/>index 958602e28412..7576ec9426a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/hwmon/w83792d.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/hwmon/w83792d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/hwmon/w83792d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/hwmon/w83792d.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>     w83792d	9	7	7	3	0x7a	0x5ca3	yes	no</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -250,8 +249,6 @@ FAN_TO_REG(long rpm, int div)</div><div class='ctx'> 			: (val)) / 1000, 0, 0xff))</div><div class='ctx'> #define TEMP_ADD_TO_REG_LOW(val)	((val%1000) ? 0x80 : 0x00)</div><div class='ctx'> </div><div class='del'>-#define PWM_FROM_REG(val)		(val)</div><div class='del'>-#define PWM_TO_REG(val)			(SENSORS_LIMIT((val),0,255))</div><div class='ctx'> #define DIV_FROM_REG(val)		(1 &lt;&lt; (val))</div><div class='ctx'> </div><div class='ctx'> static inline u8</div><div class='hunk'>@@ -291,7 +288,6 @@ struct w83792d_data {</div><div class='ctx'> 	u8 pwm[7];		/* We only consider the first 3 set of pwm,</div><div class='ctx'> 				   although 792 chip has 7 set of pwm. */</div><div class='ctx'> 	u8 pwmenable[3];</div><div class='del'>-	u8 pwm_mode[7];		/* indicates PWM or DC mode: 1-&gt;PWM; 0-&gt;DC */</div><div class='ctx'> 	u32 alarms;		/* realtime status register encoding,combined */</div><div class='ctx'> 	u8 chassis;		/* Chassis status */</div><div class='ctx'> 	u8 chassis_clear;	/* CLR_CHS, clear chassis intrusion detection */</div><div class='hunk'>@@ -375,8 +371,10 @@ static ssize_t store_in_##reg (struct device *dev, \</div><div class='ctx'> 	u32 val; \</div><div class='ctx'> 	 \</div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10); \</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock); \</div><div class='ctx'> 	data-&gt;in_##reg[nr] = SENSORS_LIMIT(IN_TO_REG(nr, val)/4, 0, 255); \</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_IN_##REG[nr], data-&gt;in_##reg[nr]); \</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock); \</div><div class='ctx'> 	 \</div><div class='ctx'> 	return count; \</div><div class='ctx'> }</div><div class='hunk'>@@ -443,9 +441,11 @@ store_fan_min(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_FAN_MIN[nr],</div><div class='ctx'> 				data-&gt;fan_min[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -462,7 +462,7 @@ show_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> /* Note: we save and restore the fan minimum here, because its value is</div><div class='ctx'>    determined in part by the fan divisor.  This follows the principle of</div><div class='del'>-   least suprise; the user doesn't expect the fan minimum to change just</div><div class='add'>+   least surprise; the user doesn't expect the fan minimum to change just</div><div class='ctx'>    because the divisor changed. */</div><div class='ctx'> static ssize_t</div><div class='ctx'> store_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='hunk'>@@ -478,6 +478,7 @@ store_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 tmp_fan_div;</div><div class='ctx'> </div><div class='ctx'> 	/* Save fan_min */</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	min = FAN_FROM_REG(data-&gt;fan_min[nr],</div><div class='ctx'> 			   DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> </div><div class='hunk'>@@ -493,6 +494,7 @@ store_fan_div(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	/* Restore fan_min */</div><div class='ctx'> 	data-&gt;fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data-&gt;fan_div[nr]));</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_FAN_MIN[nr], data-&gt;fan_min[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -547,10 +549,11 @@ static ssize_t store_temp1(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	s32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtol(buf, NULL, 10);</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp1[nr] = TEMP1_TO_REG(val);</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_TEMP1[nr],</div><div class='ctx'> 		data-&gt;temp1[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -580,13 +583,14 @@ static ssize_t store_temp23(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	s32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtol(buf, NULL, 10);</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;temp_add[nr][index] = TEMP_ADD_TO_REG_HIGH(val);</div><div class='ctx'> 	data-&gt;temp_add[nr][index+1] = TEMP_ADD_TO_REG_LOW(val);</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index],</div><div class='ctx'> 		data-&gt;temp_add[nr][index]);</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index+1],</div><div class='ctx'> 		data-&gt;temp_add[nr][index+1]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -627,7 +631,7 @@ show_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct w83792d_data *data = w83792d_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%ld\n", (long) PWM_FROM_REG(data-&gt;pwm[nr-1]));</div><div class='add'>+	return sprintf(buf, "%d\n", (data-&gt;pwm[nr] &amp; 0x0f) &lt;&lt; 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -659,14 +663,16 @@ store_pwm(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='del'>-	int nr = sensor_attr-&gt;index - 1;</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct w83792d_data *data = i2c_get_clientdata(client);</div><div class='del'>-	u32 val;</div><div class='add'>+	u8 val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 0, 255) &gt;&gt; 4;</div><div class='ctx'> </div><div class='del'>-	val = simple_strtoul(buf, NULL, 10);</div><div class='del'>-	data-&gt;pwm[nr] = PWM_TO_REG(val);</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	val |= w83792d_read_value(client, W83792D_REG_PWM[nr]) &amp; 0xf0;</div><div class='add'>+	data-&gt;pwm[nr] = val;</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_PWM[nr], data-&gt;pwm[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -683,6 +689,10 @@ store_pwmenable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 fan_cfg_tmp, cfg1_tmp, cfg2_tmp, cfg3_tmp, cfg4_tmp;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	if (val &lt; 1 || val &gt; 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	switch (val) {</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		data-&gt;pwmenable[nr] = 0; /* manual mode */</div><div class='hunk'>@@ -693,8 +703,6 @@ store_pwmenable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		data-&gt;pwmenable[nr] = 1; /* thermal cruise/Smart Fan I */</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	cfg1_tmp = data-&gt;pwmenable[0];</div><div class='ctx'> 	cfg2_tmp = (data-&gt;pwmenable[1]) &lt;&lt; 2;</div><div class='hunk'>@@ -702,14 +710,15 @@ store_pwmenable(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	cfg4_tmp = w83792d_read_value(client,W83792D_REG_FAN_CFG) &amp; 0xc0;</div><div class='ctx'> 	fan_cfg_tmp = ((cfg4_tmp | cfg3_tmp) | cfg2_tmp) | cfg1_tmp;</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_FAN_CFG, fan_cfg_tmp);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sensor_device_attribute sda_pwm[] = {</div><div class='del'>-	SENSOR_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 1),</div><div class='del'>-	SENSOR_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 2),</div><div class='del'>-	SENSOR_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 3),</div><div class='add'>+	SENSOR_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 0),</div><div class='add'>+	SENSOR_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 1),</div><div class='add'>+	SENSOR_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 2),</div><div class='ctx'> };</div><div class='ctx'> static struct sensor_device_attribute sda_pwm_enable[] = {</div><div class='ctx'> 	SENSOR_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,</div><div class='hunk'>@@ -728,7 +737,7 @@ show_pwm_mode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='ctx'> 	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct w83792d_data *data = w83792d_update_device(dev);</div><div class='del'>-	return sprintf(buf, "%d\n", data-&gt;pwm_mode[nr-1]);</div><div class='add'>+	return sprintf(buf, "%d\n", data-&gt;pwm[nr] &gt;&gt; 7);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='hunk'>@@ -736,29 +745,35 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);</div><div class='del'>-	int nr = sensor_attr-&gt;index - 1;</div><div class='add'>+	int nr = sensor_attr-&gt;index;</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct w83792d_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	u32 val;</div><div class='del'>-	u8 pwm_mode_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='del'>-	data-&gt;pwm_mode[nr] = SENSORS_LIMIT(val, 0, 1);</div><div class='del'>-	pwm_mode_mask = w83792d_read_value(client,</div><div class='del'>-		W83792D_REG_PWM[nr]) &amp; 0x7f;</div><div class='del'>-	w83792d_write_value(client, W83792D_REG_PWM[nr],</div><div class='del'>-		((data-&gt;pwm_mode[nr]) &lt;&lt; 7) | pwm_mode_mask);</div><div class='add'>+	if (val != 0 &amp;&amp; val != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='add'>+	data-&gt;pwm[nr] = w83792d_read_value(client, W83792D_REG_PWM[nr]);</div><div class='add'>+	if (val) {			/* PWM mode */</div><div class='add'>+		data-&gt;pwm[nr] |= 0x80;</div><div class='add'>+	} else {			/* DC mode */</div><div class='add'>+		data-&gt;pwm[nr] &amp;= 0x7f;</div><div class='add'>+	}</div><div class='add'>+	w83792d_write_value(client, W83792D_REG_PWM[nr], data-&gt;pwm[nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct sensor_device_attribute sda_pwm_mode[] = {</div><div class='ctx'> 	SENSOR_ATTR(pwm1_mode, S_IWUSR | S_IRUGO,</div><div class='del'>-		    show_pwm_mode, store_pwm_mode, 1),</div><div class='add'>+		    show_pwm_mode, store_pwm_mode, 0),</div><div class='ctx'> 	SENSOR_ATTR(pwm2_mode, S_IWUSR | S_IRUGO,</div><div class='del'>-		    show_pwm_mode, store_pwm_mode, 2),</div><div class='add'>+		    show_pwm_mode, store_pwm_mode, 1),</div><div class='ctx'> 	SENSOR_ATTR(pwm3_mode, S_IWUSR | S_IRUGO,</div><div class='del'>-		    show_pwm_mode, store_pwm_mode, 3),</div><div class='add'>+		    show_pwm_mode, store_pwm_mode, 2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -789,12 +804,13 @@ store_chassis_clear(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 temp1 = 0, temp2 = 0;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;chassis_clear = SENSORS_LIMIT(val, 0 ,1);</div><div class='ctx'> 	temp1 = ((data-&gt;chassis_clear) &lt;&lt; 7) &amp; 0x80;</div><div class='ctx'> 	temp2 = w83792d_read_value(client,</div><div class='ctx'> 		W83792D_REG_CHASSIS_CLR) &amp; 0x7f;</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_CHASSIS_CLR, temp1 | temp2);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -827,10 +843,12 @@ store_thermal_cruise(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='ctx'> 	target_tmp = val;</div><div class='ctx'> 	target_tmp = target_tmp &amp; 0x7f;</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	target_mask = w83792d_read_value(client, W83792D_REG_THERMAL[nr]) &amp; 0x80;</div><div class='ctx'> 	data-&gt;thermal_cruise[nr] = SENSORS_LIMIT(target_tmp, 0, 255);</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_THERMAL[nr],</div><div class='ctx'> 		(data-&gt;thermal_cruise[nr]) | target_mask);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -867,6 +885,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 tol_tmp, tol_mask;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	tol_mask = w83792d_read_value(client,</div><div class='ctx'> 		W83792D_REG_TOLERANCE[nr]) &amp; ((nr == 1) ? 0x0f : 0xf0);</div><div class='ctx'> 	tol_tmp = SENSORS_LIMIT(val, 0, 15);</div><div class='hunk'>@@ -877,6 +896,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	}</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_TOLERANCE[nr],</div><div class='ctx'> 		tol_mask | tol_tmp);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -915,11 +935,13 @@ store_sf2_point(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 mask_tmp = 0;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;sf2_points[index][nr] = SENSORS_LIMIT(val, 0, 127);</div><div class='ctx'> 	mask_tmp = w83792d_read_value(client,</div><div class='ctx'> 					W83792D_REG_POINTS[index][nr]) &amp; 0x80;</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_POINTS[index][nr],</div><div class='ctx'> 		mask_tmp|data-&gt;sf2_points[index][nr]);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -979,6 +1001,7 @@ store_sf2_level(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	u8 mask_tmp=0, level_tmp=0;</div><div class='ctx'> </div><div class='ctx'> 	val = simple_strtoul(buf, NULL, 10);</div><div class='add'>+	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> 	data-&gt;sf2_levels[index][nr] = SENSORS_LIMIT((val * 15) / 100, 0, 15);</div><div class='ctx'> 	mask_tmp = w83792d_read_value(client, W83792D_REG_LEVELS[index][nr])</div><div class='ctx'> 		&amp; ((nr==3) ? 0xf0 : 0x0f);</div><div class='hunk'>@@ -988,6 +1011,7 @@ store_sf2_level(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		level_tmp = data-&gt;sf2_levels[index][nr] &lt;&lt; 4;</div><div class='ctx'> 	}</div><div class='ctx'> 	w83792d_write_value(client, W83792D_REG_LEVELS[index][nr], level_tmp | mask_tmp);</div><div class='add'>+	mutex_unlock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -1373,7 +1397,7 @@ static struct w83792d_data *w83792d_update_device(struct device *dev)</div><div class='ctx'> 	struct i2c_client *client = to_i2c_client(dev);</div><div class='ctx'> 	struct w83792d_data *data = i2c_get_clientdata(client);</div><div class='ctx'> 	int i, j;</div><div class='del'>-	u8 reg_array_tmp[4], pwm_array_tmp[7], reg_tmp;</div><div class='add'>+	u8 reg_array_tmp[4], reg_tmp;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;data-&gt;update_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1402,10 +1426,8 @@ static struct w83792d_data *w83792d_update_device(struct device *dev)</div><div class='ctx'> 			data-&gt;fan_min[i] = w83792d_read_value(client,</div><div class='ctx'> 						W83792D_REG_FAN_MIN[i]);</div><div class='ctx'> 			/* Update the PWM/DC Value and PWM/DC flag */</div><div class='del'>-			pwm_array_tmp[i] = w83792d_read_value(client,</div><div class='add'>+			data-&gt;pwm[i] = w83792d_read_value(client,</div><div class='ctx'> 						W83792D_REG_PWM[i]);</div><div class='del'>-			data-&gt;pwm[i] = pwm_array_tmp[i] &amp; 0x0f;</div><div class='del'>-			data-&gt;pwm_mode[i] = pwm_array_tmp[i] &gt;&gt; 7;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		reg_tmp = w83792d_read_value(client, W83792D_REG_FAN_CFG);</div><div class='hunk'>@@ -1513,7 +1535,6 @@ static void w83792d_print_debug(struct w83792d_data *data, struct device *dev)</div><div class='ctx'> 		dev_dbg(dev, "fan[%d] is: 0x%x\n", i, data-&gt;fan[i]);</div><div class='ctx'> 		dev_dbg(dev, "fan[%d] min is: 0x%x\n", i, data-&gt;fan_min[i]);</div><div class='ctx'> 		dev_dbg(dev, "pwm[%d]     is: 0x%x\n", i, data-&gt;pwm[i]);</div><div class='del'>-		dev_dbg(dev, "pwm_mode[%d] is: 0x%x\n", i, data-&gt;pwm_mode[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_dbg(dev, "3 set of Temperatures: =====&gt;\n");</div><div class='ctx'> 	for (i=0; i&lt;3; i++) {</div><div class='head'>diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c<br/>index df05df1a0ef6..ab230c033f99 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-bit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-bit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-bit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/algos/i2c-algo-bit.c</a></div><div class='hunk'>@@ -372,7 +372,6 @@ static inline int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	while (count &gt; 0) {</div><div class='ctx'> 		inval = i2c_inb(i2c_adap);</div><div class='del'>-/*printk("%#02x ",inval); if ( ! (count % 16) ) printk("\n"); */</div><div class='ctx'> 		if (inval&gt;=0) {</div><div class='ctx'> 			*temp = inval;</div><div class='ctx'> 			rdcount++;</div><div class='hunk'>@@ -544,8 +543,7 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)</div><div class='ctx'> 	adap-&gt;timeout = 100;	/* default values, should	*/</div><div class='ctx'> 	adap-&gt;retries = 3;	/* be replaced by defines	*/</div><div class='ctx'> </div><div class='del'>-	i2c_add_adapter(adap);</div><div class='del'>-	return 0;</div><div class='add'>+	return i2c_add_adapter(adap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c<br/>index 2db7bfc85225..70d8eefb5efc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-ite.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-ite.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-ite.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/algos/i2c-algo-ite.c</a></div><div class='hunk'>@@ -742,10 +742,8 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)</div><div class='ctx'> 	adap-&gt;retries = 3;		/* be replaced by defines	*/</div><div class='ctx'> 	adap-&gt;flags = 0;</div><div class='ctx'> </div><div class='del'>-	i2c_add_adapter(adap);</div><div class='ctx'> 	iic_init(iic_adap);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return i2c_add_adapter(adap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c<br/>index 82946acab4c7..b88a6fcf7bd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-pca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-pca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-pca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/algos/i2c-algo-pca.c</a></div><div class='hunk'>@@ -374,10 +374,10 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)</div><div class='ctx'> 	adap-&gt;timeout = 100;		/* default values, should	*/</div><div class='ctx'> 	adap-&gt;retries = 3;		/* be replaced by defines	*/</div><div class='ctx'> </div><div class='del'>-	rval = pca_init(pca_adap);</div><div class='add'>+	if ((rval = pca_init(pca_adap)))</div><div class='add'>+		return rval;</div><div class='ctx'> </div><div class='del'>-	if (!rval)</div><div class='del'>-		i2c_add_adapter(adap);</div><div class='add'>+	rval = i2c_add_adapter(adap);</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c<br/>index 6e498df1f717..5b24930adb5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-pcf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-pcf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-pcf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/algos/i2c-algo-pcf.c</a></div><div class='hunk'>@@ -479,9 +479,11 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)</div><div class='ctx'> 	adap-&gt;timeout = 100;		/* default values, should	*/</div><div class='ctx'> 	adap-&gt;retries = 3;		/* be replaced by defines	*/</div><div class='ctx'> </div><div class='del'>-	rval = pcf_init_8584(pcf_adap);</div><div class='del'>-	if (!rval)</div><div class='del'>-		i2c_add_adapter(adap);</div><div class='add'>+	if ((rval = pcf_init_8584(pcf_adap)))</div><div class='add'>+		return rval;</div><div class='add'>+</div><div class='add'>+	rval = i2c_add_adapter(adap);</div><div class='add'>+</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c<br/>index 3df3f09995c2..32d41c6fac0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-sibyte.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/algos/i2c-algo-sibyte.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/algos/i2c-algo-sibyte.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/algos/i2c-algo-sibyte.c</a></div><div class='hunk'>@@ -173,9 +173,7 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)</div><div class='ctx'> 		printk("\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	i2c_add_adapter(i2c_adap);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return i2c_add_adapter(i2c_adap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig<br/>index d6d44946a283..884320e70403 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/Kconfig</a></div><div class='hunk'>@@ -163,7 +163,7 @@ config I2C_PXA_SLAVE</div><div class='ctx'> 	  I2C bus.</div><div class='ctx'> </div><div class='ctx'> config I2C_PIIX4</div><div class='del'>-	tristate "Intel PIIX4"</div><div class='add'>+	tristate "Intel PIIX4 and compatible (ATI/Serverworks/Broadcom/SMSC)"</div><div class='ctx'> 	depends on I2C &amp;&amp; PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes to this option, support will be included for the Intel</div><div class='hunk'>@@ -172,6 +172,9 @@ config I2C_PIIX4</div><div class='ctx'> 	  of Broadcom):</div><div class='ctx'> 	    Intel PIIX4</div><div class='ctx'> 	    Intel 440MX</div><div class='add'>+	    ATI IXP200</div><div class='add'>+	    ATI IXP300</div><div class='add'>+	    ATI IXP400</div><div class='ctx'> 	    Serverworks OSB4</div><div class='ctx'> 	    Serverworks CSB5</div><div class='ctx'> 	    Serverworks CSB6</div><div class='hunk'>@@ -252,12 +255,12 @@ config I2C_POWERMAC</div><div class='ctx'> 	  will be called i2c-powermac.</div><div class='ctx'> </div><div class='ctx'> config I2C_MPC</div><div class='del'>-	tristate "MPC107/824x/85xx/52xx"</div><div class='add'>+	tristate "MPC107/824x/85xx/52xx/86xx"</div><div class='ctx'> 	depends on I2C &amp;&amp; PPC32</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes to this option, support will be included for the</div><div class='ctx'> 	  built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and</div><div class='del'>-	  MPC85xx family processors. The driver may also work on 52xx</div><div class='add'>+	  MPC85xx/MPC8641 family processors. The driver may also work on 52xx</div><div class='ctx'> 	  family processors, though interrupts are known not to work.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='hunk'>@@ -273,6 +276,17 @@ config I2C_NFORCE2</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called i2c-nforce2.</div><div class='ctx'> </div><div class='add'>+config I2C_OCORES</div><div class='add'>+	tristate "OpenCores I2C Controller"</div><div class='add'>+	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  If you say yes to this option, support will be included for the</div><div class='add'>+	  OpenCores I2C controller. For details see</div><div class='add'>+	  http://www.opencores.org/projects.cgi/web/i2c/overview</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module.  If so, the module</div><div class='add'>+	  will be called i2c-ocores.</div><div class='add'>+</div><div class='ctx'> config I2C_PARPORT</div><div class='ctx'> 	tristate "Parallel port adapter"</div><div class='ctx'> 	depends on I2C &amp;&amp; PARPORT</div><div class='hunk'>@@ -500,6 +514,7 @@ config I2C_PCA_ISA</div><div class='ctx'> 	tristate "PCA9564 on an ISA bus"</div><div class='ctx'> 	depends on I2C</div><div class='ctx'> 	select I2C_ALGOPCA</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports ISA boards using the Philips PCA 9564</div><div class='ctx'> 	  Parallel bus to I2C bus controller</div><div class='hunk'>@@ -507,6 +522,11 @@ config I2C_PCA_ISA</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called i2c-pca-isa.</div><div class='ctx'> </div><div class='add'>+	  This device is almost undetectable and using this driver on a</div><div class='add'>+	  system which doesn't have this device will result in long</div><div class='add'>+	  delays when I2C/SMBus chip drivers are loaded (e.g. at boot</div><div class='add'>+	  time).  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config I2C_MV64XXX</div><div class='ctx'> 	tristate "Marvell mv64xxx I2C Controller"</div><div class='ctx'> 	depends on I2C &amp;&amp; MV64X60 &amp;&amp; EXPERIMENTAL</div><div class='head'>diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile<br/>index b44831dff683..ac56df53155b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/Makefile</a></div><div class='hunk'>@@ -23,6 +23,7 @@ obj-$(CONFIG_I2C_POWERMAC)	+= i2c-powermac.o</div><div class='ctx'> obj-$(CONFIG_I2C_MPC)		+= i2c-mpc.o</div><div class='ctx'> obj-$(CONFIG_I2C_MV64XXX)	+= i2c-mv64xxx.o</div><div class='ctx'> obj-$(CONFIG_I2C_NFORCE2)	+= i2c-nforce2.o</div><div class='add'>+obj-$(CONFIG_I2C_OCORES)	+= i2c-ocores.o</div><div class='ctx'> obj-$(CONFIG_I2C_PARPORT)	+= i2c-parport.o</div><div class='ctx'> obj-$(CONFIG_I2C_PARPORT_LIGHT)	+= i2c-parport-light.o</div><div class='ctx'> obj-$(CONFIG_I2C_PCA_ISA)	+= i2c-pca-isa.o</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c<br/>index dfca74933625..7be1d0a3e8f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-i801.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-i801.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-i801.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-i801.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>-    i801.c - Part of lm_sensors, Linux kernel modules for hardware</div><div class='add'>+    i2c-i801.c - Part of lm_sensors, Linux kernel modules for hardware</div><div class='ctx'>               monitoring</div><div class='ctx'>     Copyright (c) 1998 - 2002  Frodo Looijaard &lt;frodol@dds.nl&gt;,</div><div class='ctx'>     Philip Edelbrock &lt;phil@netroedge.com&gt;, and Mark D. Studebaker</div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'>     This driver supports several versions of Intel's I/O Controller Hubs (ICH).</div><div class='ctx'>     For SMBus support, they are similar to the PIIX4 and are part</div><div class='ctx'>     of Intel's '810' and other chipsets.</div><div class='del'>-    See the doc/busses/i2c-i801 file for details.</div><div class='add'>+    See the file Documentation/i2c/busses/i2c-i801 for details.</div><div class='ctx'>     I2C Block Read and Process Call are not supported.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -66,9 +66,8 @@</div><div class='ctx'> #define SMBAUXCTL	(13 + i801_smba)	/* ICH4 only */</div><div class='ctx'> </div><div class='ctx'> /* PCI Address Constants */</div><div class='del'>-#define SMBBA		0x020</div><div class='add'>+#define SMBBAR		4</div><div class='ctx'> #define SMBHSTCFG	0x040</div><div class='del'>-#define SMBREV		0x008</div><div class='ctx'> </div><div class='ctx'> /* Host configuration bits for SMBHSTCFG */</div><div class='ctx'> #define SMBHSTCFG_HST_EN	1</div><div class='hunk'>@@ -92,92 +91,16 @@</div><div class='ctx'> #define I801_START		0x40</div><div class='ctx'> #define I801_PEC_EN		0x80	/* ICH4 only */</div><div class='ctx'> </div><div class='del'>-/* insmod parameters */</div><div class='del'>-</div><div class='del'>-/* If force_addr is set to anything different from 0, we forcibly enable</div><div class='del'>-   the I801 at the given address. VERY DANGEROUS! */</div><div class='del'>-static u16 force_addr;</div><div class='del'>-module_param(force_addr, ushort, 0);</div><div class='del'>-MODULE_PARM_DESC(force_addr,</div><div class='del'>-		 "Forcibly enable the I801 at the given address. "</div><div class='del'>-		 "EXTREMELY DANGEROUS!");</div><div class='ctx'> </div><div class='ctx'> static int i801_transaction(void);</div><div class='ctx'> static int i801_block_transaction(union i2c_smbus_data *data, char read_write,</div><div class='ctx'> 				  int command, int hwpec);</div><div class='ctx'> </div><div class='del'>-static unsigned short i801_smba;</div><div class='add'>+static unsigned long i801_smba;</div><div class='ctx'> static struct pci_driver i801_driver;</div><div class='ctx'> static struct pci_dev *I801_dev;</div><div class='ctx'> static int isich4;</div><div class='ctx'> </div><div class='del'>-static int i801_setup(struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int error_return = 0;</div><div class='del'>-	unsigned char temp;</div><div class='del'>-</div><div class='del'>-	/* Note: we keep on searching until we have found 'function 3' */</div><div class='del'>-	if(PCI_FUNC(dev-&gt;devfn) != 3)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	I801_dev = dev;</div><div class='del'>-	if ((dev-&gt;device == PCI_DEVICE_ID_INTEL_82801DB_3) ||</div><div class='del'>-	    (dev-&gt;device == PCI_DEVICE_ID_INTEL_82801EB_3) ||</div><div class='del'>-	    (dev-&gt;device == PCI_DEVICE_ID_INTEL_ESB_4))</div><div class='del'>-		isich4 = 1;</div><div class='del'>-	else</div><div class='del'>-		isich4 = 0;</div><div class='del'>-</div><div class='del'>-	/* Determine the address of the SMBus areas */</div><div class='del'>-	if (force_addr) {</div><div class='del'>-		i801_smba = force_addr &amp; 0xfff0;</div><div class='del'>-	} else {</div><div class='del'>-		pci_read_config_word(I801_dev, SMBBA, &amp;i801_smba);</div><div class='del'>-		i801_smba &amp;= 0xfff0;</div><div class='del'>-		if(i801_smba == 0) {</div><div class='del'>-			dev_err(&amp;dev-&gt;dev, "SMB base address uninitialized "</div><div class='del'>-				"- upgrade BIOS or use force_addr=0xaddr\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!request_region(i801_smba, (isich4 ? 16 : 8), i801_driver.name)) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "I801_smb region 0x%x already in use!\n",</div><div class='del'>-			i801_smba);</div><div class='del'>-		error_return = -EBUSY;</div><div class='del'>-		goto END;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(I801_dev, SMBHSTCFG, &amp;temp);</div><div class='del'>-	temp &amp;= ~SMBHSTCFG_I2C_EN;	/* SMBus timing */</div><div class='del'>-	pci_write_config_byte(I801_dev, SMBHSTCFG, temp);</div><div class='del'>-</div><div class='del'>-	/* If force_addr is set, we program the new address here. Just to make</div><div class='del'>-	   sure, we disable the device first. */</div><div class='del'>-	if (force_addr) {</div><div class='del'>-		pci_write_config_byte(I801_dev, SMBHSTCFG, temp &amp; 0xfe);</div><div class='del'>-		pci_write_config_word(I801_dev, SMBBA, i801_smba);</div><div class='del'>-		pci_write_config_byte(I801_dev, SMBHSTCFG, temp | 0x01);</div><div class='del'>-		dev_warn(&amp;dev-&gt;dev, "WARNING: I801 SMBus interface set to "</div><div class='del'>-			"new address %04x!\n", i801_smba);</div><div class='del'>-	} else if ((temp &amp; 1) == 0) {</div><div class='del'>-		pci_write_config_byte(I801_dev, SMBHSTCFG, temp | 1);</div><div class='del'>-		dev_warn(&amp;dev-&gt;dev, "enabling SMBus device\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (temp &amp; 0x02)</div><div class='del'>-		dev_dbg(&amp;dev-&gt;dev, "I801 using Interrupt SMI# for SMBus.\n");</div><div class='del'>-	else</div><div class='del'>-		dev_dbg(&amp;dev-&gt;dev, "I801 using PCI Interrupt for SMBus.\n");</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(I801_dev, SMBREV, &amp;temp);</div><div class='del'>-	dev_dbg(&amp;dev-&gt;dev, "SMBREV = 0x%X\n", temp);</div><div class='del'>-	dev_dbg(&amp;dev-&gt;dev, "I801_smba = 0x%X\n", i801_smba);</div><div class='del'>-</div><div class='del'>-END:</div><div class='del'>-	return error_return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int i801_transaction(void)</div><div class='ctx'> {</div><div class='ctx'> 	int temp;</div><div class='hunk'>@@ -334,8 +257,8 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,</div><div class='ctx'> 		/* We will always wait for a fraction of a second! */</div><div class='ctx'> 		timeout = 0;</div><div class='ctx'> 		do {</div><div class='del'>-			temp = inb_p(SMBHSTSTS);</div><div class='ctx'> 			msleep(1);</div><div class='add'>+			temp = inb_p(SMBHSTSTS);</div><div class='ctx'> 		}</div><div class='ctx'> 		    while ((!(temp &amp; 0x80))</div><div class='ctx'> 			   &amp;&amp; (timeout++ &lt; MAX_TIMEOUT));</div><div class='hunk'>@@ -393,8 +316,8 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,</div><div class='ctx'> 		/* wait for INTR bit as advised by Intel */</div><div class='ctx'> 		timeout = 0;</div><div class='ctx'> 		do {</div><div class='del'>-			temp = inb_p(SMBHSTSTS);</div><div class='ctx'> 			msleep(1);</div><div class='add'>+			temp = inb_p(SMBHSTSTS);</div><div class='ctx'> 		} while ((!(temp &amp; 0x02))</div><div class='ctx'> 			   &amp;&amp; (timeout++ &lt; MAX_TIMEOUT));</div><div class='ctx'> </div><div class='hunk'>@@ -541,25 +464,80 @@ MODULE_DEVICE_TABLE (pci, i801_ids);</div><div class='ctx'> </div><div class='ctx'> static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='add'>+	unsigned char temp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	I801_dev = dev;</div><div class='add'>+	if ((dev-&gt;device == PCI_DEVICE_ID_INTEL_82801DB_3) ||</div><div class='add'>+	    (dev-&gt;device == PCI_DEVICE_ID_INTEL_82801EB_3) ||</div><div class='add'>+	    (dev-&gt;device == PCI_DEVICE_ID_INTEL_ESB_4))</div><div class='add'>+		isich4 = 1;</div><div class='add'>+	else</div><div class='add'>+		isich4 = 0;</div><div class='ctx'> </div><div class='del'>-	if (i801_setup(dev)) {</div><div class='del'>-		dev_warn(&amp;dev-&gt;dev,</div><div class='del'>-			"I801 not detected, module not inserted.\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	err = pci_enable_device(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to enable SMBus PCI device (%d)\n",</div><div class='add'>+			err);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Determine the address of the SMBus area */</div><div class='add'>+	i801_smba = pci_resource_start(dev, SMBBAR);</div><div class='add'>+	if (!i801_smba) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "SMBus base address uninitialized, "</div><div class='add'>+			"upgrade BIOS\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_request_region(dev, SMBBAR, i801_driver.name);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to request SMBus region "</div><div class='add'>+			"0x%lx-0x%Lx\n", i801_smba,</div><div class='add'>+			(unsigned long long)pci_resource_end(dev, SMBBAR));</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(I801_dev, SMBHSTCFG, &amp;temp);</div><div class='add'>+	temp &amp;= ~SMBHSTCFG_I2C_EN;	/* SMBus timing */</div><div class='add'>+	if (!(temp &amp; SMBHSTCFG_HST_EN)) {</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "Enabling SMBus device\n");</div><div class='add'>+		temp |= SMBHSTCFG_HST_EN;</div><div class='add'>+	}</div><div class='add'>+	pci_write_config_byte(I801_dev, SMBHSTCFG, temp);</div><div class='add'>+</div><div class='add'>+	if (temp &amp; SMBHSTCFG_SMB_SMI_EN)</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "SMBus using interrupt SMI#\n");</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(&amp;dev-&gt;dev, "SMBus using PCI Interrupt\n");</div><div class='add'>+</div><div class='ctx'> 	/* set up the driverfs linkage to our parent device */</div><div class='ctx'> 	i801_adapter.dev.parent = &amp;dev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(i801_adapter.name, I2C_NAME_SIZE,</div><div class='del'>-		"SMBus I801 adapter at %04x", i801_smba);</div><div class='del'>-	return i2c_add_adapter(&amp;i801_adapter);</div><div class='add'>+		"SMBus I801 adapter at %04lx", i801_smba);</div><div class='add'>+	err = i2c_add_adapter(&amp;i801_adapter);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to add SMBus adapter\n");</div><div class='add'>+		goto exit_release;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_release:</div><div class='add'>+	pci_release_region(dev, SMBBAR);</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devexit i801_remove(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	i2c_del_adapter(&amp;i801_adapter);</div><div class='del'>-	release_region(i801_smba, (isich4 ? 16 : 8));</div><div class='add'>+	pci_release_region(dev, SMBBAR);</div><div class='add'>+	/*</div><div class='add'>+	 * do not call pci_disable_device(dev) since it can cause hard hangs on</div><div class='add'>+	 * some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010)</div><div class='add'>+	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver i801_driver = {</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c<br/>index 87fae937e666..0599bbd65d93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ibm_iic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-ibm_iic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ibm_iic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-ibm_iic.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c<br/>index d00a02fc23e4..48c56939c861 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-iop3xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-iop3xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-iop3xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-iop3xx.c</a></div><div class='hunk'>@@ -21,12 +21,14 @@</div><div class='ctx'>  * - Make it work with IXP46x chips</div><div class='ctx'>  * - Cleanup function names, coding style, etc</div><div class='ctx'>  *</div><div class='add'>+ * - writing to slave address causes latchup on iop331.</div><div class='add'>+ *	fix: driver refuses to address self.</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='ctx'>  * the Free Software Foundation, version 2.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -74,12 +76,6 @@ iop3xx_i2c_reset(struct i2c_algo_iop3xx_data *iop3xx_adap)</div><div class='ctx'> } </div><div class='ctx'> </div><div class='ctx'> static void </div><div class='del'>-iop3xx_i2c_set_slave_addr(struct i2c_algo_iop3xx_data *iop3xx_adap)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(MYSAR, iop3xx_adap-&gt;ioaddr + SAR_OFFSET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='ctx'> iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cr = IOP3XX_ICR_GCD | IOP3XX_ICR_SCLEN | IOP3XX_ICR_UE;</div><div class='hunk'>@@ -249,6 +245,13 @@ iop3xx_i2c_send_target_addr(struct i2c_algo_iop3xx_data *iop3xx_adap,</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	/* avoid writing to my slave address (hangs on 80331),</div><div class='add'>+	 * forbidden in Intel developer manual</div><div class='add'>+	 */</div><div class='add'>+	if (msg-&gt;addr == MYSAR) {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	__raw_writel(iic_cook_addr(msg), iop3xx_adap-&gt;ioaddr + DBR_OFFSET);</div><div class='ctx'> 	</div><div class='ctx'> 	cr &amp;= ~(IOP3XX_ICR_MSTOP | IOP3XX_ICR_NACK);</div><div class='hunk'>@@ -499,7 +502,6 @@ iop3xx_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 	spin_lock_init(&amp;adapter_data-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	iop3xx_i2c_reset(adapter_data);</div><div class='del'>-	iop3xx_i2c_set_slave_addr(adapter_data);</div><div class='ctx'> 	iop3xx_i2c_enable(adapter_data);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, new_adapter);</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h<br/>index e46ebaea7b1e..8485861f6a36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-iop3xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-iop3xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-iop3xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-iop3xx.h</a></div><div class='hunk'>@@ -80,7 +80,7 @@</div><div class='ctx'> #define IOP3XX_GPOD_I2C0	0x00c0	/* clear these bits to enable ch0 */</div><div class='ctx'> #define IOP3XX_GPOD_I2C1	0x0030	/* clear these bits to enable ch1 */</div><div class='ctx'> </div><div class='del'>-#define MYSAR			0x02	/* SWAG a suitable slave address */</div><div class='add'>+#define MYSAR			0	/* default slave address */</div><div class='ctx'> </div><div class='ctx'> #define I2C_ERR			321</div><div class='ctx'> #define I2C_ERR_BERR		(I2C_ERR+0)</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c<br/>index 2721e4c8184a..377ab40944b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-mpc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-mpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-mpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-mpc.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * warranty of any kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -319,7 +318,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (i2c-&gt;irq != 0)</div><div class='ctx'> 		if ((result = request_irq(i2c-&gt;irq, mpc_i2c_isr,</div><div class='del'>-					  SA_SHIRQ, "i2c-mpc", i2c)) &lt; 0) {</div><div class='add'>+					  IRQF_SHARED, "i2c-mpc", i2c)) &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR</div><div class='ctx'> 			       "i2c-mpc - failed to attach interrupt\n");</div><div class='ctx'> 			goto fail_irq;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c<br/>index 2d80eb26f688..604b49e22df1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-nforce2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-nforce2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-nforce2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-nforce2.c</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'>     nForce3 250Gb MCP		00E4</div><div class='ctx'>     nForce4 MCP			0052</div><div class='ctx'>     nForce4 MCP-04		0034</div><div class='add'>+    nForce4 MCP51		0264</div><div class='add'>+    nForce4 MCP55		0368</div><div class='ctx'> </div><div class='ctx'>     This driver supports the 2 SMBuses that are included in the MCP of the</div><div class='ctx'>     nForce2/3/4 chipsets.</div><div class='hunk'>@@ -64,6 +66,7 @@ struct nforce2_smbus {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * nVidia nForce2 SMBus control register definitions</div><div class='add'>+ * (Newer incarnations use standard BARs 4 and 5 instead)</div><div class='ctx'>  */</div><div class='ctx'> #define NFORCE_PCI_SMB1	0x50</div><div class='ctx'> #define NFORCE_PCI_SMB2	0x54</div><div class='hunk'>@@ -259,6 +262,8 @@ static struct pci_device_id nforce2_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS) },</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -266,19 +271,29 @@ static struct pci_device_id nforce2_ids[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE (pci, nforce2_ids);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit nforce2_probe_smb (struct pci_dev *dev, int reg,</div><div class='del'>-	struct nforce2_smbus *smbus, char *name)</div><div class='add'>+static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,</div><div class='add'>+	int alt_reg, struct nforce2_smbus *smbus, const char *name)</div><div class='ctx'> {</div><div class='del'>-	u16 iobase;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if (pci_read_config_word(dev, reg, &amp;iobase) != PCIBIOS_SUCCESSFUL) {</div><div class='del'>-		dev_err(&amp;smbus-&gt;adapter.dev, "Error reading PCI config for %s\n", name);</div><div class='del'>-		return -1;</div><div class='add'>+	smbus-&gt;base = pci_resource_start(dev, bar);</div><div class='add'>+	if (smbus-&gt;base) {</div><div class='add'>+		smbus-&gt;size = pci_resource_len(dev, bar);</div><div class='add'>+	} else {</div><div class='add'>+		/* Older incarnations of the device used non-standard BARs */</div><div class='add'>+		u16 iobase;</div><div class='add'>+</div><div class='add'>+		if (pci_read_config_word(dev, alt_reg, &amp;iobase)</div><div class='add'>+		    != PCIBIOS_SUCCESSFUL) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "Error reading PCI config for %s\n",</div><div class='add'>+				name);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		smbus-&gt;base = iobase &amp; PCI_BASE_ADDRESS_IO_MASK;</div><div class='add'>+		smbus-&gt;size = 8;</div><div class='ctx'> 	}</div><div class='del'>-	smbus-&gt;dev  = dev;</div><div class='del'>-	smbus-&gt;base = iobase &amp; 0xfffc;</div><div class='del'>-	smbus-&gt;size = 8;</div><div class='add'>+	smbus-&gt;dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(smbus-&gt;base, smbus-&gt;size, nforce2_driver.name)) {</div><div class='ctx'> 		dev_err(&amp;smbus-&gt;adapter.dev, "Error requesting region %02x .. %02X for %s\n",</div><div class='hunk'>@@ -313,12 +328,13 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_</div><div class='ctx'> 	pci_set_drvdata(dev, smbuses);</div><div class='ctx'> </div><div class='ctx'> 	/* SMBus adapter 1 */</div><div class='del'>-	res1 = nforce2_probe_smb (dev, NFORCE_PCI_SMB1, &amp;smbuses[0], "SMB1");</div><div class='add'>+	res1 = nforce2_probe_smb(dev, 4, NFORCE_PCI_SMB1, &amp;smbuses[0], "SMB1");</div><div class='ctx'> 	if (res1 &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "Error probing SMB1.\n");</div><div class='ctx'> 		smbuses[0].base = 0;	/* to have a check value */</div><div class='ctx'> 	}</div><div class='del'>-	res2 = nforce2_probe_smb (dev, NFORCE_PCI_SMB2, &amp;smbuses[1], "SMB2");</div><div class='add'>+	/* SMBus adapter 2 */</div><div class='add'>+	res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &amp;smbuses[1], "SMB2");</div><div class='ctx'> 	if (res2 &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "Error probing SMB2.\n");</div><div class='ctx'> 		smbuses[1].base = 0;	/* to have a check value */</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c<br/>new file mode 100644<br/>index 000000000000..592824087c49<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-ocores.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-ocores.c</a></div><div class='hunk'>@@ -0,0 +1,341 @@</div><div class='add'>+/*</div><div class='add'>+ * i2c-ocores.c: I2C bus driver for OpenCores I2C controller</div><div class='add'>+ * (http://www.opencores.org/projects.cgi/web/i2c/overview).</div><div class='add'>+ *</div><div class='add'>+ * Peter Korsgaard &lt;jacmet@sunsite.dk&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2.  This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/i2c-ocores.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+struct ocores_i2c {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int regstep;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	struct i2c_adapter adap;</div><div class='add'>+	struct i2c_msg *msg;</div><div class='add'>+	int pos;</div><div class='add'>+	int nmsgs;</div><div class='add'>+	int state; /* see STATE_ */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* registers */</div><div class='add'>+#define OCI2C_PRELOW		0</div><div class='add'>+#define OCI2C_PREHIGH		1</div><div class='add'>+#define OCI2C_CONTROL		2</div><div class='add'>+#define OCI2C_DATA		3</div><div class='add'>+#define OCI2C_CMD		4 /* write only */</div><div class='add'>+#define OCI2C_STATUS		4 /* read only, same address as OCI2C_CMD */</div><div class='add'>+</div><div class='add'>+#define OCI2C_CTRL_IEN		0x40</div><div class='add'>+#define OCI2C_CTRL_EN		0x80</div><div class='add'>+</div><div class='add'>+#define OCI2C_CMD_START		0x91</div><div class='add'>+#define OCI2C_CMD_STOP		0x41</div><div class='add'>+#define OCI2C_CMD_READ		0x21</div><div class='add'>+#define OCI2C_CMD_WRITE		0x11</div><div class='add'>+#define OCI2C_CMD_READ_ACK	0x21</div><div class='add'>+#define OCI2C_CMD_READ_NACK	0x29</div><div class='add'>+#define OCI2C_CMD_IACK		0x01</div><div class='add'>+</div><div class='add'>+#define OCI2C_STAT_IF		0x01</div><div class='add'>+#define OCI2C_STAT_TIP		0x02</div><div class='add'>+#define OCI2C_STAT_ARBLOST	0x20</div><div class='add'>+#define OCI2C_STAT_BUSY		0x40</div><div class='add'>+#define OCI2C_STAT_NACK		0x80</div><div class='add'>+</div><div class='add'>+#define STATE_DONE		0</div><div class='add'>+#define STATE_START		1</div><div class='add'>+#define STATE_WRITE		2</div><div class='add'>+#define STATE_READ		3</div><div class='add'>+#define STATE_ERROR		4</div><div class='add'>+</div><div class='add'>+static inline void oc_setreg(struct ocores_i2c *i2c, int reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	iowrite8(value, i2c-&gt;base + reg * i2c-&gt;regstep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 oc_getreg(struct ocores_i2c *i2c, int reg)</div><div class='add'>+{</div><div class='add'>+	return ioread8(i2c-&gt;base + reg * i2c-&gt;regstep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocores_process(struct ocores_i2c *i2c)</div><div class='add'>+{</div><div class='add'>+	struct i2c_msg *msg = i2c-&gt;msg;</div><div class='add'>+	u8 stat = oc_getreg(i2c, OCI2C_STATUS);</div><div class='add'>+</div><div class='add'>+	if ((i2c-&gt;state == STATE_DONE) || (i2c-&gt;state == STATE_ERROR)) {</div><div class='add'>+		/* stop has been sent */</div><div class='add'>+		oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK);</div><div class='add'>+		wake_up(&amp;i2c-&gt;wait);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* error? */</div><div class='add'>+	if (stat &amp; OCI2C_STAT_ARBLOST) {</div><div class='add'>+		i2c-&gt;state = STATE_ERROR;</div><div class='add'>+		oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_STOP);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((i2c-&gt;state == STATE_START) || (i2c-&gt;state == STATE_WRITE)) {</div><div class='add'>+		i2c-&gt;state =</div><div class='add'>+			(msg-&gt;flags &amp; I2C_M_RD) ? STATE_READ : STATE_WRITE;</div><div class='add'>+</div><div class='add'>+		if (stat &amp; OCI2C_STAT_NACK) {</div><div class='add'>+			i2c-&gt;state = STATE_ERROR;</div><div class='add'>+			oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_STOP);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		msg-&gt;buf[i2c-&gt;pos++] = oc_getreg(i2c, OCI2C_DATA);</div><div class='add'>+</div><div class='add'>+	/* end of msg? */</div><div class='add'>+	if (i2c-&gt;pos == msg-&gt;len) {</div><div class='add'>+		i2c-&gt;nmsgs--;</div><div class='add'>+		i2c-&gt;msg++;</div><div class='add'>+		i2c-&gt;pos = 0;</div><div class='add'>+		msg = i2c-&gt;msg;</div><div class='add'>+</div><div class='add'>+		if (i2c-&gt;nmsgs) {	/* end? */</div><div class='add'>+			/* send start? */</div><div class='add'>+			if (!(msg-&gt;flags &amp; I2C_M_NOSTART)) {</div><div class='add'>+				u8 addr = (msg-&gt;addr &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+				if (msg-&gt;flags &amp; I2C_M_RD)</div><div class='add'>+					addr |= 1;</div><div class='add'>+</div><div class='add'>+				i2c-&gt;state = STATE_START;</div><div class='add'>+</div><div class='add'>+				oc_setreg(i2c, OCI2C_DATA, addr);</div><div class='add'>+				oc_setreg(i2c, OCI2C_CMD,  OCI2C_CMD_START);</div><div class='add'>+				return;</div><div class='add'>+			} else</div><div class='add'>+				i2c-&gt;state = (msg-&gt;flags &amp; I2C_M_RD)</div><div class='add'>+					? STATE_READ : STATE_WRITE;</div><div class='add'>+		} else {</div><div class='add'>+			i2c-&gt;state = STATE_DONE;</div><div class='add'>+			oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_STOP);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i2c-&gt;state == STATE_READ) {</div><div class='add'>+		oc_setreg(i2c, OCI2C_CMD, i2c-&gt;pos == (msg-&gt;len-1) ?</div><div class='add'>+			  OCI2C_CMD_READ_NACK : OCI2C_CMD_READ_ACK);</div><div class='add'>+	} else {</div><div class='add'>+		oc_setreg(i2c, OCI2C_DATA, msg-&gt;buf[i2c-&gt;pos++]);</div><div class='add'>+		oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_WRITE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ocores_isr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct ocores_i2c *i2c = dev_id;</div><div class='add'>+</div><div class='add'>+	ocores_process(i2c);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ocores_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)</div><div class='add'>+{</div><div class='add'>+	struct ocores_i2c *i2c = i2c_get_adapdata(adap);</div><div class='add'>+</div><div class='add'>+	i2c-&gt;msg = msgs;</div><div class='add'>+	i2c-&gt;pos = 0;</div><div class='add'>+	i2c-&gt;nmsgs = num;</div><div class='add'>+	i2c-&gt;state = STATE_START;</div><div class='add'>+</div><div class='add'>+	oc_setreg(i2c, OCI2C_DATA,</div><div class='add'>+			(i2c-&gt;msg-&gt;addr &lt;&lt; 1) |</div><div class='add'>+			((i2c-&gt;msg-&gt;flags &amp; I2C_M_RD) ? 1:0));</div><div class='add'>+</div><div class='add'>+	oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_START);</div><div class='add'>+</div><div class='add'>+	if (wait_event_timeout(i2c-&gt;wait, (i2c-&gt;state == STATE_ERROR) ||</div><div class='add'>+			       (i2c-&gt;state == STATE_DONE), HZ))</div><div class='add'>+		return (i2c-&gt;state == STATE_DONE) ? num : -EIO;</div><div class='add'>+	else</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocores_init(struct ocores_i2c *i2c,</div><div class='add'>+			struct ocores_i2c_platform_data *pdata)</div><div class='add'>+{</div><div class='add'>+	int prescale;</div><div class='add'>+	u8 ctrl = oc_getreg(i2c, OCI2C_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* make sure the device is disabled */</div><div class='add'>+	oc_setreg(i2c, OCI2C_CONTROL, ctrl &amp; ~(OCI2C_CTRL_EN|OCI2C_CTRL_IEN));</div><div class='add'>+</div><div class='add'>+	prescale = (pdata-&gt;clock_khz / (5*100)) - 1;</div><div class='add'>+	oc_setreg(i2c, OCI2C_PRELOW, prescale &amp; 0xff);</div><div class='add'>+	oc_setreg(i2c, OCI2C_PREHIGH, prescale &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	/* Init the device */</div><div class='add'>+	oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_IACK);</div><div class='add'>+	oc_setreg(i2c, OCI2C_CONTROL, ctrl | OCI2C_CTRL_IEN | OCI2C_CTRL_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static u32 ocores_func(struct i2c_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm ocores_algorithm = {</div><div class='add'>+	.master_xfer	= ocores_xfer,</div><div class='add'>+	.functionality	= ocores_func,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_adapter ocores_adapter = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "i2c-ocores",</div><div class='add'>+	.class		= I2C_CLASS_HWMON,</div><div class='add'>+	.algo		= &amp;ocores_algorithm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __devinit ocores_i2c_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ocores_i2c *i2c;</div><div class='add'>+	struct ocores_i2c_platform_data *pdata;</div><div class='add'>+	struct resource *res, *res2;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (!res2)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	pdata = (struct ocores_i2c_platform_data*) pdev-&gt;dev.platform_data;</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);</div><div class='add'>+	if (!i2c)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1,</div><div class='add'>+				pdev-&gt;name)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Memory region busy\n");</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto request_mem_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c-&gt;base = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (!i2c-&gt;base) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to map registers\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto map_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c-&gt;regstep = pdata-&gt;regstep;</div><div class='add'>+	ocores_init(i2c, pdata);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;i2c-&gt;wait);</div><div class='add'>+	ret = request_irq(res2-&gt;start, ocores_isr, 0, pdev-&gt;name, i2c);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot claim IRQ\n");</div><div class='add'>+		goto request_irq_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hook up driver to tree */</div><div class='add'>+	platform_set_drvdata(pdev, i2c);</div><div class='add'>+	i2c-&gt;adap = ocores_adapter;</div><div class='add'>+	i2c_set_adapdata(&amp;i2c-&gt;adap, i2c);</div><div class='add'>+	i2c-&gt;adap.dev.parent = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* add i2c adapter to i2c tree */</div><div class='add'>+	ret = i2c_add_adapter(&amp;i2c-&gt;adap);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to add adapter\n");</div><div class='add'>+		goto add_adapter_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+add_adapter_failed:</div><div class='add'>+	free_irq(res2-&gt;start, i2c);</div><div class='add'>+request_irq_failed:</div><div class='add'>+	iounmap(i2c-&gt;base);</div><div class='add'>+map_failed:</div><div class='add'>+	release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+request_mem_failed:</div><div class='add'>+	kfree(i2c);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ocores_i2c_remove(struct platform_device* pdev)</div><div class='add'>+{</div><div class='add'>+	struct ocores_i2c *i2c = platform_get_drvdata(pdev);</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	/* disable i2c logic */</div><div class='add'>+	oc_setreg(i2c, OCI2C_CONTROL, oc_getreg(i2c, OCI2C_CONTROL)</div><div class='add'>+		  &amp; ~(OCI2C_CTRL_EN|OCI2C_CTRL_IEN));</div><div class='add'>+</div><div class='add'>+	/* remove adapter &amp; data */</div><div class='add'>+	i2c_del_adapter(&amp;i2c-&gt;adap);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+	if (res)</div><div class='add'>+		free_irq(res-&gt;start, i2c);</div><div class='add'>+</div><div class='add'>+	iounmap(i2c-&gt;base);</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (res)</div><div class='add'>+		release_mem_region(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+</div><div class='add'>+	kfree(i2c);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ocores_i2c_driver = {</div><div class='add'>+	.probe  = ocores_i2c_probe,</div><div class='add'>+	.remove = __devexit_p(ocores_i2c_remove),</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name = "ocores-i2c",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ocores_i2c_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ocores_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ocores_i2c_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;ocores_i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ocores_i2c_init);</div><div class='add'>+module_exit(ocores_i2c_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Peter Korsgaard &lt;jacmet@sunsite.dk&gt;");</div><div class='add'>+MODULE_DESCRIPTION("OpenCores I2C bus driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c<br/>index d9c7c00e71f9..8f2f65b793b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-piix4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-piix4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-piix4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-piix4.c</a></div><div class='hunk'>@@ -102,13 +102,6 @@ MODULE_PARM_DESC(force_addr,</div><div class='ctx'> 		 "Forcibly enable the PIIX4 at the given address. "</div><div class='ctx'> 		 "EXTREMELY DANGEROUS!");</div><div class='ctx'> </div><div class='del'>-/* If fix_hstcfg is set to anything different from 0, we reset one of the</div><div class='del'>-   registers to be a valid value. */</div><div class='del'>-static int fix_hstcfg;</div><div class='del'>-module_param (fix_hstcfg, int, 0);</div><div class='del'>-MODULE_PARM_DESC(fix_hstcfg,</div><div class='del'>-		"Fix config register. Needed on some boards (Force CPCI735).");</div><div class='del'>-</div><div class='ctx'> static int piix4_transaction(void);</div><div class='ctx'> </div><div class='ctx'> static unsigned short piix4_smba;</div><div class='hunk'>@@ -137,7 +130,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,</div><div class='ctx'> 	/* Don't access SMBus on IBM systems which get corrupted eeproms */</div><div class='ctx'> 	if (dmi_check_system(piix4_dmi_table) &amp;&amp;</div><div class='ctx'> 			PIIX4_dev-&gt;vendor == PCI_VENDOR_ID_INTEL) {</div><div class='del'>-		dev_err(&amp;PIIX4_dev-&gt;dev, "IBM Laptop detected; this module "</div><div class='add'>+		dev_err(&amp;PIIX4_dev-&gt;dev, "IBM system detected; this module "</div><div class='ctx'> 			"may corrupt your serial eeprom! Refusing to load "</div><div class='ctx'> 			"module!\n");</div><div class='ctx'> 		return -EPERM;</div><div class='hunk'>@@ -166,22 +159,6 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_byte(PIIX4_dev, SMBHSTCFG, &amp;temp);</div><div class='ctx'> </div><div class='del'>-	/* Some BIOS will set up the chipset incorrectly and leave a register</div><div class='del'>-	   in an undefined state (causing I2C to act very strangely). */</div><div class='del'>-	if (temp &amp; 0x02) {</div><div class='del'>-		if (fix_hstcfg) {</div><div class='del'>-			dev_info(&amp;PIIX4_dev-&gt;dev, "Working around buggy BIOS "</div><div class='del'>-					"(I2C)\n");</div><div class='del'>-			temp &amp;= 0xfd;</div><div class='del'>-			pci_write_config_byte(PIIX4_dev, SMBHSTCFG, temp);</div><div class='del'>-		} else {</div><div class='del'>-			dev_info(&amp;PIIX4_dev-&gt;dev, "Unusual config register "</div><div class='del'>-					"value\n");</div><div class='del'>-			dev_info(&amp;PIIX4_dev-&gt;dev, "Try using fix_hstcfg=1 if "</div><div class='del'>-					"you experience problems\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>- </div><div class='ctx'> 	/* If force_addr is set, we program the new address here. Just to make</div><div class='ctx'> 	   sure, we disable the PIIX4 first. */</div><div class='ctx'> 	if (force_addr) {</div><div class='hunk'>@@ -214,7 +191,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((temp &amp; 0x0E) == 8)</div><div class='add'>+	if (((temp &amp; 0x0E) == 8) || ((temp &amp; 0x0E) == 2))</div><div class='ctx'> 		dev_dbg(&amp;PIIX4_dev-&gt;dev, "Using Interrupt 9 for SMBus.\n");</div><div class='ctx'> 	else if ((temp &amp; 0x0E) == 0)</div><div class='ctx'> 		dev_dbg(&amp;PIIX4_dev-&gt;dev, "Using Interrupt SMI# for SMBus.\n");</div><div class='hunk'>@@ -413,6 +390,12 @@ static struct i2c_adapter piix4_adapter = {</div><div class='ctx'> static struct pci_device_id piix4_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3),</div><div class='ctx'> 	  .driver_data = 3 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_SMBUS),</div><div class='add'>+	  .driver_data = 0 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SMBUS),</div><div class='add'>+	  .driver_data = 0 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),</div><div class='add'>+	  .driver_data = 0 },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),</div><div class='ctx'> 	  .driver_data = 0 },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5),</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c<br/>index df786eb55295..53bb43593863 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-powermac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-powermac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-powermac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-powermac.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -149,8 +148,6 @@ static int i2c_powermac_master_xfer(	struct i2c_adapter *adap,</div><div class='ctx'> 	int			read;</div><div class='ctx'> 	int			addrdir;</div><div class='ctx'> </div><div class='del'>-	if (num != 1)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (msgs-&gt;flags &amp; I2C_M_TEN)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	read = (msgs-&gt;flags &amp; I2C_M_RD) != 0;</div><div class='hunk'>@@ -167,7 +164,7 @@ static int i2c_powermac_master_xfer(	struct i2c_adapter *adap,</div><div class='ctx'> 	rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs-&gt;buf, msgs-&gt;len);</div><div class='ctx'>  bail:</div><div class='ctx'> 	pmac_i2c_close(bus);</div><div class='del'>-	return rc &lt; 0 ? rc : msgs-&gt;len;</div><div class='add'>+	return rc &lt; 0 ? rc : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 i2c_powermac_func(struct i2c_adapter * adapter)</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c<br/>index 5155010b455e..ee114b48face 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pxa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-pxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-pxa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-pxa.c</a></div><div class='hunk'>@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct platform_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	pxa_set_cken(CKEN14_I2C, 1);</div><div class='del'>-	ret = request_irq(IRQ_I2C, i2c_pxa_handler, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(IRQ_I2C, i2c_pxa_handler, IRQF_DISABLED,</div><div class='ctx'> 			  "pxa2xx-i2c", i2c);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c<br/>index f7d40f8e5f5c..5d2950e91fc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-s3c2410.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/i2c-s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/i2c-s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/i2c-s3c2410.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -829,7 +828,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(res-&gt;start, s3c24xx_i2c_irq, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(res-&gt;start, s3c24xx_i2c_irq, IRQF_DISABLED,</div><div class='ctx'> 			  pdev-&gt;name, i2c);</div><div class='ctx'> </div><div class='ctx'> 	if (ret != 0) {</div><div class='head'>diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c<br/>index 766cc969c4d0..ced309ff056f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/scx200_acb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/scx200_acb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/scx200_acb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/scx200_acb.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/msr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/scx200.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -85,6 +84,10 @@ struct scx200_acb_iface {</div><div class='ctx'> 	u8 *ptr;</div><div class='ctx'> 	char needs_reset;</div><div class='ctx'> 	unsigned len;</div><div class='add'>+</div><div class='add'>+	/* PCI device info */</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	int bar;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Register Definitions */</div><div class='hunk'>@@ -181,21 +184,21 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case state_read:</div><div class='del'>-		/* Set ACK if receiving the last byte */</div><div class='del'>-		if (iface-&gt;len == 1)</div><div class='add'>+		/* Set ACK if _next_ byte will be the last one */</div><div class='add'>+		if (iface-&gt;len == 2)</div><div class='ctx'> 			outb(inb(ACBCTL1) | ACBCTL1_ACK, ACBCTL1);</div><div class='ctx'> 		else</div><div class='ctx'> 			outb(inb(ACBCTL1) &amp; ~ACBCTL1_ACK, ACBCTL1);</div><div class='ctx'> </div><div class='del'>-		*iface-&gt;ptr++ = inb(ACBSDA);</div><div class='del'>-		--iface-&gt;len;</div><div class='del'>-</div><div class='del'>-		if (iface-&gt;len == 0) {</div><div class='add'>+		if (iface-&gt;len == 1) {</div><div class='ctx'> 			iface-&gt;result = 0;</div><div class='ctx'> 			iface-&gt;state = state_idle;</div><div class='ctx'> 			outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		*iface-&gt;ptr++ = inb(ACBSDA);</div><div class='add'>+		--iface-&gt;len;</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case state_write:</div><div class='hunk'>@@ -304,8 +307,12 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,</div><div class='ctx'> 		buffer = (u8 *)&amp;cur_word;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case I2C_SMBUS_BLOCK_DATA:</div><div class='add'>+	case I2C_SMBUS_I2C_BLOCK_DATA:</div><div class='add'>+		if (rw == I2C_SMBUS_READ)</div><div class='add'>+			data-&gt;block[0] = I2C_SMBUS_BLOCK_MAX; /* For now */</div><div class='ctx'> 		len = data-&gt;block[0];</div><div class='add'>+		if (len == 0 || len &gt; I2C_SMBUS_BLOCK_MAX)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		buffer = &amp;data-&gt;block[1];</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +376,7 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |</div><div class='ctx'> 	       I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |</div><div class='del'>-	       I2C_FUNC_SMBUS_BLOCK_DATA;</div><div class='add'>+	       I2C_FUNC_SMBUS_I2C_BLOCK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* For now, we only handle combined mode (smbus) */</div><div class='hunk'>@@ -381,7 +388,7 @@ static struct i2c_algorithm scx200_acb_algorithm = {</div><div class='ctx'> static struct scx200_acb_iface *scx200_acb_list;</div><div class='ctx'> static DECLARE_MUTEX(scx200_acb_list_mutex);</div><div class='ctx'> </div><div class='del'>-static int scx200_acb_probe(struct scx200_acb_iface *iface)</div><div class='add'>+static __init int scx200_acb_probe(struct scx200_acb_iface *iface)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='hunk'>@@ -417,17 +424,16 @@ static int scx200_acb_probe(struct scx200_acb_iface *iface)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int  __init scx200_acb_create(const char *text, int base, int index)</div><div class='add'>+static __init struct scx200_acb_iface *scx200_create_iface(const char *text,</div><div class='add'>+		int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct scx200_acb_iface *iface;</div><div class='ctx'> 	struct i2c_adapter *adapter;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	iface = kzalloc(sizeof(*iface), GFP_KERNEL);</div><div class='ctx'> 	if (!iface) {</div><div class='ctx'> 		printk(KERN_ERR NAME ": can't allocate memory\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto errout;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	adapter = &amp;iface-&gt;adapter;</div><div class='hunk'>@@ -440,26 +446,27 @@ static int  __init scx200_acb_create(const char *text, int base, int index)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;iface-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	if (!request_region(base, 8, adapter-&gt;name)) {</div><div class='del'>-		printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n",</div><div class='del'>-			base, base + 8-1);</div><div class='del'>-		rc = -EBUSY;</div><div class='del'>-		goto errout_free;</div><div class='del'>-	}</div><div class='del'>-	iface-&gt;base = base;</div><div class='add'>+	return iface;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init scx200_acb_create(struct scx200_acb_iface *iface)</div><div class='add'>+{</div><div class='add'>+	struct i2c_adapter *adapter;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	adapter = &amp;iface-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	rc = scx200_acb_probe(iface);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_WARNING NAME ": probe failed\n");</div><div class='del'>-		goto errout_release;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	scx200_acb_reset(iface);</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_add_adapter(adapter) &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR NAME ": failed to register\n");</div><div class='del'>-		rc = -ENODEV;</div><div class='del'>-		goto errout_release;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;scx200_acb_list_mutex);</div><div class='hunk'>@@ -468,64 +475,148 @@ static int  __init scx200_acb_create(const char *text, int base, int index)</div><div class='ctx'> 	up(&amp;scx200_acb_list_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int scx200_create_pci(const char *text, struct pci_dev *pdev,</div><div class='add'>+		int bar)</div><div class='add'>+{</div><div class='add'>+	struct scx200_acb_iface *iface;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	iface = scx200_create_iface(text, 0);</div><div class='add'>+</div><div class='add'>+	if (iface == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	iface-&gt;pdev = pdev;</div><div class='add'>+	iface-&gt;bar = bar;</div><div class='add'>+</div><div class='add'>+	pci_enable_device_bars(iface-&gt;pdev, 1 &lt;&lt; iface-&gt;bar);</div><div class='add'>+</div><div class='add'>+	rc = pci_request_region(iface-&gt;pdev, iface-&gt;bar, iface-&gt;adapter.name);</div><div class='add'>+</div><div class='add'>+	if (rc != 0) {</div><div class='add'>+		printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n",</div><div class='add'>+				iface-&gt;bar);</div><div class='add'>+		goto errout_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iface-&gt;base = pci_resource_start(iface-&gt;pdev, iface-&gt;bar);</div><div class='add'>+	rc = scx200_acb_create(iface);</div><div class='ctx'> </div><div class='del'>- errout_release:</div><div class='del'>-	release_region(iface-&gt;base, 8);</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pci_release_region(iface-&gt;pdev, iface-&gt;bar);</div><div class='add'>+	pci_dev_put(iface-&gt;pdev);</div><div class='ctx'>  errout_free:</div><div class='ctx'> 	kfree(iface);</div><div class='del'>- errout:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id scx200[] = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='add'>+static int __init scx200_create_isa(const char *text, unsigned long base,</div><div class='add'>+		int index)</div><div class='add'>+{</div><div class='add'>+	struct scx200_acb_iface *iface;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	iface = scx200_create_iface(text, index);</div><div class='add'>+</div><div class='add'>+	if (iface == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (request_region(base, 8, iface-&gt;adapter.name) == 0) {</div><div class='add'>+		printk(KERN_ERR NAME ": can't allocate io 0x%lx-0x%lx\n",</div><div class='add'>+		       base, base + 8 - 1);</div><div class='add'>+		rc = -EBUSY;</div><div class='add'>+		goto errout_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iface-&gt;base = base;</div><div class='add'>+	rc = scx200_acb_create(iface);</div><div class='add'>+</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	release_region(base, 8);</div><div class='add'>+ errout_free:</div><div class='add'>+	kfree(iface);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id divil_pci[] = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },</div><div class='del'>-	{ } /* NULL entry */</div><div class='add'>+/* Driver data is an index into the scx200_data array that indicates</div><div class='add'>+ * the name and the BAR where the I/O address resource is located.  ISA</div><div class='add'>+ * devices are flagged with a bar value of -1 */</div><div class='add'>+</div><div class='add'>+static struct pci_device_id scx200_pci[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE),</div><div class='add'>+	  .driver_data = 0 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE),</div><div class='add'>+	  .driver_data = 0 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA),</div><div class='add'>+	  .driver_data = 1 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA),</div><div class='add'>+	  .driver_data = 2 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MSR_LBAR_SMB		0x5140000B</div><div class='add'>+static struct {</div><div class='add'>+	const char *name;</div><div class='add'>+	int bar;</div><div class='add'>+} scx200_data[] = {</div><div class='add'>+	{ "SCx200", -1 },</div><div class='add'>+	{ "CS5535",  0 },</div><div class='add'>+	{ "CS5536",  0 }</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static __init int scx200_add_cs553x(void)</div><div class='add'>+static __init int scx200_scan_pci(void)</div><div class='ctx'> {</div><div class='del'>-	u32	low, hi;</div><div class='del'>-	u32	smb_base;</div><div class='del'>-</div><div class='del'>-	/* Grab &amp; reserve the SMB I/O range */</div><div class='del'>-	rdmsr(MSR_LBAR_SMB, low, hi);</div><div class='add'>+	int data, dev;</div><div class='add'>+	int rc = -ENODEV;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	for(dev = 0; dev &lt; ARRAY_SIZE(scx200_pci); dev++) {</div><div class='add'>+		pdev = pci_get_device(scx200_pci[dev].vendor,</div><div class='add'>+				scx200_pci[dev].device, NULL);</div><div class='add'>+</div><div class='add'>+		if (pdev == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		data = scx200_pci[dev].driver_data;</div><div class='add'>+</div><div class='add'>+		/* if .bar is greater or equal to zero, this is a</div><div class='add'>+		 * PCI device - otherwise, we assume</div><div class='add'>+		   that the ports are ISA based</div><div class='add'>+		*/</div><div class='add'>+</div><div class='add'>+		if (scx200_data[data].bar &gt;= 0)</div><div class='add'>+			rc = scx200_create_pci(scx200_data[data].name, pdev,</div><div class='add'>+					scx200_data[data].bar);</div><div class='add'>+		else {</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; MAX_DEVICES; ++i) {</div><div class='add'>+				if (base[i] == 0)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				rc = scx200_create_isa(scx200_data[data].name,</div><div class='add'>+						base[i],</div><div class='add'>+						i);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* Check the IO mask and whether SMB is enabled */</div><div class='del'>-	if (hi != 0x0000F001) {</div><div class='del'>-		printk(KERN_WARNING NAME ": SMBus not enabled\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* SMBus IO size is 8 bytes */</div><div class='del'>-	smb_base = low &amp; 0x0000FFF8;</div><div class='del'>-</div><div class='del'>-	return scx200_acb_create("CS5535", smb_base, 0);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init scx200_acb_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	int	rc = -ENODEV;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug(NAME ": NatSemi SCx200 ACCESS.bus Driver\n");</div><div class='ctx'> </div><div class='del'>-	/* Verify that this really is a SCx200 processor */</div><div class='del'>-	if (pci_dev_present(scx200)) {</div><div class='del'>-		for (i = 0; i &lt; MAX_DEVICES; ++i) {</div><div class='del'>-			if (base[i] &gt; 0)</div><div class='del'>-				rc = scx200_acb_create("SCx200", base[i], i);</div><div class='del'>-		}</div><div class='del'>-	} else if (pci_dev_present(divil_pci))</div><div class='del'>-		rc = scx200_add_cs553x();</div><div class='add'>+	rc = scx200_scan_pci();</div><div class='ctx'> </div><div class='ctx'> 	/* If at least one bus was created, init must succeed */</div><div class='ctx'> 	if (scx200_acb_list)</div><div class='hunk'>@@ -543,7 +634,14 @@ static void __exit scx200_acb_cleanup(void)</div><div class='ctx'> 		up(&amp;scx200_acb_list_mutex);</div><div class='ctx'> </div><div class='ctx'> 		i2c_del_adapter(&amp;iface-&gt;adapter);</div><div class='del'>-		release_region(iface-&gt;base, 8);</div><div class='add'>+</div><div class='add'>+		if (iface-&gt;pdev) {</div><div class='add'>+			pci_release_region(iface-&gt;pdev, iface-&gt;bar);</div><div class='add'>+			pci_dev_put(iface-&gt;pdev);</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+			release_region(iface-&gt;base, 8);</div><div class='add'>+</div><div class='ctx'> 		kfree(iface);</div><div class='ctx'> 		down(&amp;scx200_acb_list_mutex);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c<br/>index 27fbfecc414f..cb3ef5ac99fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/busses/scx200_i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/busses/scx200_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/busses/scx200_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/busses/scx200_i2c.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig<br/>index 7aa5c38f0855..87ee3ce58618 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/chips/Kconfig</a></div><div class='hunk'>@@ -39,6 +39,7 @@ config SENSORS_EEPROM</div><div class='ctx'> config SENSORS_PCF8574</div><div class='ctx'> 	tristate "Philips PCF8574 and PCF8574A"</div><div class='ctx'> 	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for Philips PCF8574 and </div><div class='ctx'> 	  PCF8574A chips.</div><div class='hunk'>@@ -46,6 +47,9 @@ config SENSORS_PCF8574</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called pcf8574.</div><div class='ctx'> </div><div class='add'>+	  These devices are hard to detect and rarely found on mainstream</div><div class='add'>+	  hardware.  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config SENSORS_PCA9539</div><div class='ctx'> 	tristate "Philips PCA9539 16-bit I/O port"</div><div class='ctx'> 	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -59,12 +63,16 @@ config SENSORS_PCA9539</div><div class='ctx'> config SENSORS_PCF8591</div><div class='ctx'> 	tristate "Philips PCF8591"</div><div class='ctx'> 	depends on I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	default n</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you say yes here you get support for Philips PCF8591 chips.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called pcf8591.</div><div class='ctx'> </div><div class='add'>+	  These devices are hard to detect and rarely found on mainstream</div><div class='add'>+	  hardware.  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config ISP1301_OMAP</div><div class='ctx'> 	tristate "Philips ISP1301 with OMAP OTG"</div><div class='ctx'> 	depends on I2C &amp;&amp; ARCH_OMAP_OTG</div><div class='head'>diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c<br/>index e6f1ab7b913c..f92505b94c61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/isp1301_omap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/isp1301_omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/isp1301_omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/chips/isp1301_omap.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #undef	DEBUG</div><div class='ctx'> #undef	VERBOSE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -909,7 +908,7 @@ static int otg_bind(struct isp1301 *isp)</div><div class='ctx'> </div><div class='ctx'> 	if (otg_dev)</div><div class='ctx'> 		status = request_irq(otg_dev-&gt;resource[1].start, omap_otg_irq,</div><div class='del'>-				SA_INTERRUPT, DRIVER_NAME, isp);</div><div class='add'>+				IRQF_DISABLED, DRIVER_NAME, isp);</div><div class='ctx'> 	else</div><div class='ctx'> 		status = -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -1579,7 +1578,7 @@ fail1:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = request_irq(isp-&gt;irq, isp1301_irq,</div><div class='del'>-			SA_SAMPLE_RANDOM, DRIVER_NAME, isp);</div><div class='add'>+			IRQF_SAMPLE_RANDOM, DRIVER_NAME, isp);</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		dev_dbg(&amp;i2c-&gt;dev, "can't get IRQ %d, err %d\n",</div><div class='ctx'> 				isp-&gt;irq, status);</div><div class='head'>diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c<br/>index 99ab4ec34390..2dd0a34d9472 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/m41t00.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/m41t00.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/m41t00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/chips/m41t00.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='ctx'> /*</div><div class='del'>- * drivers/i2c/chips/m41t00.c</div><div class='del'>- *</div><div class='del'>- * I2C client/driver for the ST M41T00 Real-Time Clock chip.</div><div class='add'>+ * I2C client/driver for the ST M41T00 family of i2c rtc chips.</div><div class='ctx'>  *</div><div class='ctx'>  * Author: Mark A. Greer &lt;mgreer@mvista.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * 2005 (c) MontaVista Software, Inc. This file is licensed under</div><div class='add'>+ * 2005, 2006 (c) MontaVista Software, Inc. This file is licensed under</div><div class='ctx'>  * the terms of the GNU General Public License version 2. This program</div><div class='ctx'>  * is licensed "as is" without any warranty of any kind, whether express</div><div class='ctx'>  * or implied.</div><div class='hunk'>@@ -13,9 +11,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * This i2c client/driver wedges between the drivers/char/genrtc.c RTC</div><div class='ctx'>  * interface and the SMBus interface of the i2c subsystem.</div><div class='del'>- * It would be more efficient to use i2c msgs/i2c_transfer directly but, as</div><div class='del'>- * recommened in .../Documentation/i2c/writing-clients section</div><div class='del'>- * "Sending and receiving", using SMBus level communication is preferred.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -24,56 +19,110 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bcd.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/m41t00.h&gt;</div><div class='ctx'> #include &lt;asm/time.h&gt;</div><div class='ctx'> #include &lt;asm/rtc.h&gt;</div><div class='ctx'> </div><div class='del'>-#define	M41T00_DRV_NAME		"m41t00"</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(m41t00_mutex);</div><div class='del'>-</div><div class='ctx'> static struct i2c_driver m41t00_driver;</div><div class='ctx'> static struct i2c_client *save_client;</div><div class='ctx'> </div><div class='ctx'> static unsigned short ignore[] = { I2C_CLIENT_END };</div><div class='del'>-static unsigned short normal_addr[] = { 0x68, I2C_CLIENT_END };</div><div class='add'>+static unsigned short normal_addr[] = { I2C_CLIENT_END, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_client_address_data addr_data = {</div><div class='del'>-	.normal_i2c		= normal_addr,</div><div class='del'>-	.probe			= ignore,</div><div class='del'>-	.ignore			= ignore,</div><div class='add'>+	.normal_i2c	= normal_addr,</div><div class='add'>+	.probe		= ignore,</div><div class='add'>+	.ignore		= ignore,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m41t00_chip_info {</div><div class='add'>+	u8	type;</div><div class='add'>+	char	*name;</div><div class='add'>+	u8	read_limit;</div><div class='add'>+	u8	sec;		/* Offsets for chip regs */</div><div class='add'>+	u8	min;</div><div class='add'>+	u8	hour;</div><div class='add'>+	u8	day;</div><div class='add'>+	u8	mon;</div><div class='add'>+	u8	year;</div><div class='add'>+	u8	alarm_mon;</div><div class='add'>+	u8	alarm_hour;</div><div class='add'>+	u8	sqw;</div><div class='add'>+	u8	sqw_freq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct m41t00_chip_info m41t00_chip_info_tbl[] = {</div><div class='add'>+	{</div><div class='add'>+		.type		= M41T00_TYPE_M41T00,</div><div class='add'>+		.name		= "m41t00",</div><div class='add'>+		.read_limit	= 5,</div><div class='add'>+		.sec		= 0,</div><div class='add'>+		.min		= 1,</div><div class='add'>+		.hour		= 2,</div><div class='add'>+		.day		= 4,</div><div class='add'>+		.mon		= 5,</div><div class='add'>+		.year		= 6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type		= M41T00_TYPE_M41T81,</div><div class='add'>+		.name		= "m41t81",</div><div class='add'>+		.read_limit	= 1,</div><div class='add'>+		.sec		= 1,</div><div class='add'>+		.min		= 2,</div><div class='add'>+		.hour		= 3,</div><div class='add'>+		.day		= 5,</div><div class='add'>+		.mon		= 6,</div><div class='add'>+		.year		= 7,</div><div class='add'>+		.alarm_mon	= 0xa,</div><div class='add'>+		.alarm_hour	= 0xc,</div><div class='add'>+		.sqw		= 0x13,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.type		= M41T00_TYPE_M41T85,</div><div class='add'>+		.name		= "m41t85",</div><div class='add'>+		.read_limit	= 1,</div><div class='add'>+		.sec		= 1,</div><div class='add'>+		.min		= 2,</div><div class='add'>+		.hour		= 3,</div><div class='add'>+		.day		= 5,</div><div class='add'>+		.mon		= 6,</div><div class='add'>+		.year		= 7,</div><div class='add'>+		.alarm_mon	= 0xa,</div><div class='add'>+		.alarm_hour	= 0xc,</div><div class='add'>+		.sqw		= 0x13,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+static struct m41t00_chip_info *m41t00_chip;</div><div class='add'>+</div><div class='ctx'> ulong</div><div class='ctx'> m41t00_get_rtc_time(void)</div><div class='ctx'> {</div><div class='del'>-	s32	sec, min, hour, day, mon, year;</div><div class='del'>-	s32	sec1, min1, hour1, day1, mon1, year1;</div><div class='del'>-	ulong	limit = 10;</div><div class='add'>+	s32 sec, min, hour, day, mon, year;</div><div class='add'>+	s32 sec1, min1, hour1, day1, mon1, year1;</div><div class='add'>+	u8 reads = 0;</div><div class='add'>+	u8 buf[8], msgbuf[1] = { 0 }; /* offset into rtc's regs */</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr	= save_client-&gt;addr,</div><div class='add'>+			.flags	= 0,</div><div class='add'>+			.len	= 1,</div><div class='add'>+			.buf	= msgbuf,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.addr	= save_client-&gt;addr,</div><div class='add'>+			.flags	= I2C_M_RD,</div><div class='add'>+			.len	= 8,</div><div class='add'>+			.buf	= buf,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	sec = min = hour = day = mon = year = 0;</div><div class='del'>-	sec1 = min1 = hour1 = day1 = mon1 = year1 = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;m41t00_mutex);</div><div class='ctx'> 	do {</div><div class='del'>-		if (((sec = i2c_smbus_read_byte_data(save_client, 0)) &gt;= 0)</div><div class='del'>-			&amp;&amp; ((min = i2c_smbus_read_byte_data(save_client, 1))</div><div class='del'>-				&gt;= 0)</div><div class='del'>-			&amp;&amp; ((hour = i2c_smbus_read_byte_data(save_client, 2))</div><div class='del'>-				&gt;= 0)</div><div class='del'>-			&amp;&amp; ((day = i2c_smbus_read_byte_data(save_client, 4))</div><div class='del'>-				&gt;= 0)</div><div class='del'>-			&amp;&amp; ((mon = i2c_smbus_read_byte_data(save_client, 5))</div><div class='del'>-				&gt;= 0)</div><div class='del'>-			&amp;&amp; ((year = i2c_smbus_read_byte_data(save_client, 6))</div><div class='del'>-				&gt;= 0)</div><div class='del'>-			&amp;&amp; ((sec == sec1) &amp;&amp; (min == min1) &amp;&amp; (hour == hour1)</div><div class='del'>-				&amp;&amp; (day == day1) &amp;&amp; (mon == mon1)</div><div class='del'>-				&amp;&amp; (year == year1)))</div><div class='del'>-</div><div class='del'>-				break;</div><div class='add'>+		if (i2c_transfer(save_client-&gt;adapter, msgs, 2) &lt; 0)</div><div class='add'>+			goto read_err;</div><div class='ctx'> </div><div class='ctx'> 		sec1 = sec;</div><div class='ctx'> 		min1 = min;</div><div class='hunk'>@@ -81,69 +130,88 @@ m41t00_get_rtc_time(void)</div><div class='ctx'> 		day1 = day;</div><div class='ctx'> 		mon1 = mon;</div><div class='ctx'> 		year1 = year;</div><div class='del'>-	} while (--limit &gt; 0);</div><div class='del'>-	mutex_unlock(&amp;m41t00_mutex);</div><div class='del'>-</div><div class='del'>-	if (limit == 0) {</div><div class='del'>-		dev_warn(&amp;save_client-&gt;dev,</div><div class='del'>-			"m41t00: can't read rtc chip\n");</div><div class='del'>-		sec = min = hour = day = mon = year = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sec &amp;= 0x7f;</div><div class='del'>-	min &amp;= 0x7f;</div><div class='del'>-	hour &amp;= 0x3f;</div><div class='del'>-	day &amp;= 0x3f;</div><div class='del'>-	mon &amp;= 0x1f;</div><div class='del'>-	year &amp;= 0xff;</div><div class='ctx'> </div><div class='del'>-	BCD_TO_BIN(sec);</div><div class='del'>-	BCD_TO_BIN(min);</div><div class='del'>-	BCD_TO_BIN(hour);</div><div class='del'>-	BCD_TO_BIN(day);</div><div class='del'>-	BCD_TO_BIN(mon);</div><div class='del'>-	BCD_TO_BIN(year);</div><div class='add'>+		sec = buf[m41t00_chip-&gt;sec] &amp; 0x7f;</div><div class='add'>+		min = buf[m41t00_chip-&gt;min] &amp; 0x7f;</div><div class='add'>+		hour = buf[m41t00_chip-&gt;hour] &amp; 0x3f;</div><div class='add'>+		day = buf[m41t00_chip-&gt;day] &amp; 0x3f;</div><div class='add'>+		mon = buf[m41t00_chip-&gt;mon] &amp; 0x1f;</div><div class='add'>+		year = buf[m41t00_chip-&gt;year];</div><div class='add'>+	} while ((++reads &lt; m41t00_chip-&gt;read_limit) &amp;&amp; ((sec != sec1)</div><div class='add'>+			|| (min != min1) || (hour != hour1) || (day != day1)</div><div class='add'>+			|| (mon != mon1) || (year != year1)));</div><div class='add'>+</div><div class='add'>+	if ((m41t00_chip-&gt;read_limit &gt; 1) &amp;&amp; ((sec != sec1) || (min != min1)</div><div class='add'>+			|| (hour != hour1) || (day != day1) || (mon != mon1)</div><div class='add'>+			|| (year != year1)))</div><div class='add'>+		goto read_err;</div><div class='add'>+</div><div class='add'>+	sec = BCD2BIN(sec);</div><div class='add'>+	min = BCD2BIN(min);</div><div class='add'>+	hour = BCD2BIN(hour);</div><div class='add'>+	day = BCD2BIN(day);</div><div class='add'>+	mon = BCD2BIN(mon);</div><div class='add'>+	year = BCD2BIN(year);</div><div class='ctx'> </div><div class='ctx'> 	year += 1900;</div><div class='ctx'> 	if (year &lt; 1970)</div><div class='ctx'> 		year += 100;</div><div class='ctx'> </div><div class='ctx'> 	return mktime(year, mon, day, hour, min, sec);</div><div class='add'>+</div><div class='add'>+read_err:</div><div class='add'>+	dev_err(&amp;save_client-&gt;dev, "m41t00_get_rtc_time: Read error\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m41t00_get_rtc_time);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> m41t00_set(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_time	tm;</div><div class='del'>-	ulong	nowtime = *(ulong *)arg;</div><div class='add'>+	int nowtime = *(int *)arg;</div><div class='add'>+	s32 sec, min, hour, day, mon, year;</div><div class='add'>+	u8 wbuf[9], *buf = &amp;wbuf[1], msgbuf[1] = { 0 };</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{</div><div class='add'>+			.addr	= save_client-&gt;addr,</div><div class='add'>+			.flags	= 0,</div><div class='add'>+			.len	= 1,</div><div class='add'>+			.buf	= msgbuf,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.addr	= save_client-&gt;addr,</div><div class='add'>+			.flags	= I2C_M_RD,</div><div class='add'>+			.len	= 8,</div><div class='add'>+			.buf	= buf,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	to_tm(nowtime, &amp;tm);</div><div class='ctx'> 	tm.tm_year = (tm.tm_year - 1900) % 100;</div><div class='ctx'> </div><div class='del'>-	BIN_TO_BCD(tm.tm_sec);</div><div class='del'>-	BIN_TO_BCD(tm.tm_min);</div><div class='del'>-	BIN_TO_BCD(tm.tm_hour);</div><div class='del'>-	BIN_TO_BCD(tm.tm_mon);</div><div class='del'>-	BIN_TO_BCD(tm.tm_mday);</div><div class='del'>-	BIN_TO_BCD(tm.tm_year);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;m41t00_mutex);</div><div class='del'>-	if ((i2c_smbus_write_byte_data(save_client, 0, tm.tm_sec &amp; 0x7f) &lt; 0)</div><div class='del'>-		|| (i2c_smbus_write_byte_data(save_client, 1, tm.tm_min &amp; 0x7f)</div><div class='del'>-			&lt; 0)</div><div class='del'>-		|| (i2c_smbus_write_byte_data(save_client, 2, tm.tm_hour &amp; 0x3f)</div><div class='del'>-			&lt; 0)</div><div class='del'>-		|| (i2c_smbus_write_byte_data(save_client, 4, tm.tm_mday &amp; 0x3f)</div><div class='del'>-			&lt; 0)</div><div class='del'>-		|| (i2c_smbus_write_byte_data(save_client, 5, tm.tm_mon &amp; 0x1f)</div><div class='del'>-			&lt; 0)</div><div class='del'>-		|| (i2c_smbus_write_byte_data(save_client, 6, tm.tm_year &amp; 0xff)</div><div class='del'>-			&lt; 0))</div><div class='del'>-</div><div class='del'>-		dev_warn(&amp;save_client-&gt;dev,"m41t00: can't write to rtc chip\n");</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;m41t00_mutex);</div><div class='del'>-	return;</div><div class='add'>+	sec = BIN2BCD(tm.tm_sec);</div><div class='add'>+	min = BIN2BCD(tm.tm_min);</div><div class='add'>+	hour = BIN2BCD(tm.tm_hour);</div><div class='add'>+	day = BIN2BCD(tm.tm_mday);</div><div class='add'>+	mon = BIN2BCD(tm.tm_mon);</div><div class='add'>+	year = BIN2BCD(tm.tm_year);</div><div class='add'>+</div><div class='add'>+	/* Read reg values into buf[0..7]/wbuf[1..8] */</div><div class='add'>+	if (i2c_transfer(save_client-&gt;adapter, msgs, 2) &lt; 0) {</div><div class='add'>+		dev_err(&amp;save_client-&gt;dev, "m41t00_set: Read error\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wbuf[0] = 0; /* offset into rtc's regs */</div><div class='add'>+	buf[m41t00_chip-&gt;sec] = (buf[m41t00_chip-&gt;sec] &amp; ~0x7f) | (sec &amp; 0x7f);</div><div class='add'>+	buf[m41t00_chip-&gt;min] = (buf[m41t00_chip-&gt;min] &amp; ~0x7f) | (min &amp; 0x7f);</div><div class='add'>+	buf[m41t00_chip-&gt;hour] = (buf[m41t00_chip-&gt;hour] &amp; ~0x3f) | (hour&amp; 0x3f);</div><div class='add'>+	buf[m41t00_chip-&gt;day] = (buf[m41t00_chip-&gt;day] &amp; ~0x3f) | (day &amp; 0x3f);</div><div class='add'>+	buf[m41t00_chip-&gt;mon] = (buf[m41t00_chip-&gt;mon] &amp; ~0x1f) | (mon &amp; 0x1f);</div><div class='add'>+</div><div class='add'>+	if (i2c_master_send(save_client, wbuf, 9) &lt; 0)</div><div class='add'>+		dev_err(&amp;save_client-&gt;dev, "m41t00_set: Write error\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ulong new_time;</div><div class='hunk'>@@ -162,6 +230,48 @@ m41t00_set_rtc_time(ulong nowtime)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m41t00_set_rtc_time);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ *	platform_data Driver Interface</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************</div><div class='add'>+ */</div><div class='add'>+static int __init</div><div class='add'>+m41t00_platform_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct m41t00_platform_data *pdata;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (pdev &amp;&amp; (pdata = pdev-&gt;dev.platform_data)) {</div><div class='add'>+		normal_addr[0] = pdata-&gt;i2c_addr;</div><div class='add'>+</div><div class='add'>+		for (i=0; i&lt;ARRAY_SIZE(m41t00_chip_info_tbl); i++)</div><div class='add'>+			if (m41t00_chip_info_tbl[i].type == pdata-&gt;type) {</div><div class='add'>+				m41t00_chip = &amp;m41t00_chip_info_tbl[i];</div><div class='add'>+				m41t00_chip-&gt;sqw_freq = pdata-&gt;sqw_freq;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __exit</div><div class='add'>+m41t00_platform_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver m41t00_platform_driver = {</div><div class='add'>+	.probe  = m41t00_platform_probe,</div><div class='add'>+	.remove = m41t00_platform_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name  = M41T00_DRV_NAME,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *****************************************************************************</div><div class='hunk'>@@ -176,23 +286,71 @@ m41t00_probe(struct i2c_adapter *adap, int addr, int kind)</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (!i2c_check_functionality(adap, I2C_FUNC_I2C</div><div class='add'>+			| I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='ctx'> 	if (!client)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	strncpy(client-&gt;name, M41T00_DRV_NAME, I2C_NAME_SIZE);</div><div class='add'>+	strlcpy(client-&gt;name, m41t00_chip-&gt;name, I2C_NAME_SIZE);</div><div class='ctx'> 	client-&gt;addr = addr;</div><div class='ctx'> 	client-&gt;adapter = adap;</div><div class='ctx'> 	client-&gt;driver = &amp;m41t00_driver;</div><div class='ctx'> </div><div class='del'>-	if ((rc = i2c_attach_client(client)) != 0) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		return rc;</div><div class='add'>+	if ((rc = i2c_attach_client(client)))</div><div class='add'>+		goto attach_err;</div><div class='add'>+</div><div class='add'>+	if (m41t00_chip-&gt;type != M41T00_TYPE_M41T00) {</div><div class='add'>+		/* If asked, disable SQW, set SQW frequency &amp; re-enable */</div><div class='add'>+		if (m41t00_chip-&gt;sqw_freq)</div><div class='add'>+			if (((rc = i2c_smbus_read_byte_data(client,</div><div class='add'>+					m41t00_chip-&gt;alarm_mon)) &lt; 0)</div><div class='add'>+			 || ((rc = i2c_smbus_write_byte_data(client,</div><div class='add'>+					m41t00_chip-&gt;alarm_mon, rc &amp; ~0x40)) &lt;0)</div><div class='add'>+			 || ((rc = i2c_smbus_write_byte_data(client,</div><div class='add'>+					m41t00_chip-&gt;sqw,</div><div class='add'>+					m41t00_chip-&gt;sqw_freq)) &lt; 0)</div><div class='add'>+			 || ((rc = i2c_smbus_write_byte_data(client,</div><div class='add'>+					m41t00_chip-&gt;alarm_mon, rc | 0x40)) &lt;0))</div><div class='add'>+				goto sqw_err;</div><div class='add'>+</div><div class='add'>+		/* Make sure HT (Halt Update) bit is cleared */</div><div class='add'>+		if ((rc = i2c_smbus_read_byte_data(client,</div><div class='add'>+				m41t00_chip-&gt;alarm_hour)) &lt; 0)</div><div class='add'>+			goto ht_err;</div><div class='add'>+</div><div class='add'>+		if (rc &amp; 0x40)</div><div class='add'>+			if ((rc = i2c_smbus_write_byte_data(client,</div><div class='add'>+					m41t00_chip-&gt;alarm_hour, rc &amp; ~0x40))&lt;0)</div><div class='add'>+				goto ht_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	m41t00_wq = create_singlethread_workqueue("m41t00");</div><div class='add'>+	/* Make sure ST (stop) bit is cleared */</div><div class='add'>+	if ((rc = i2c_smbus_read_byte_data(client, m41t00_chip-&gt;sec)) &lt; 0)</div><div class='add'>+		goto st_err;</div><div class='add'>+</div><div class='add'>+	if (rc &amp; 0x80)</div><div class='add'>+		if ((rc = i2c_smbus_write_byte_data(client, m41t00_chip-&gt;sec,</div><div class='add'>+				rc &amp; ~0x80)) &lt; 0)</div><div class='add'>+			goto st_err;</div><div class='add'>+</div><div class='add'>+	m41t00_wq = create_singlethread_workqueue(m41t00_chip-&gt;name);</div><div class='ctx'> 	save_client = client;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+st_err:</div><div class='add'>+	dev_err(&amp;client-&gt;dev, "m41t00_probe: Can't clear ST bit\n");</div><div class='add'>+	goto attach_err;</div><div class='add'>+ht_err:</div><div class='add'>+	dev_err(&amp;client-&gt;dev, "m41t00_probe: Can't clear HT bit\n");</div><div class='add'>+	goto attach_err;</div><div class='add'>+sqw_err:</div><div class='add'>+	dev_err(&amp;client-&gt;dev, "m41t00_probe: Can't set SQW Frequency\n");</div><div class='add'>+attach_err:</div><div class='add'>+	kfree(client);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -204,7 +362,7 @@ m41t00_attach(struct i2c_adapter *adap)</div><div class='ctx'> static int</div><div class='ctx'> m41t00_detach(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	int	rc;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = i2c_detach_client(client)) == 0) {</div><div class='ctx'> 		kfree(client);</div><div class='hunk'>@@ -225,14 +383,18 @@ static struct i2c_driver m41t00_driver = {</div><div class='ctx'> static int __init</div><div class='ctx'> m41t00_init(void)</div><div class='ctx'> {</div><div class='del'>-	return i2c_add_driver(&amp;m41t00_driver);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!(rc = platform_driver_register(&amp;m41t00_platform_driver)))</div><div class='add'>+		rc = i2c_add_driver(&amp;m41t00_driver);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit</div><div class='ctx'> m41t00_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	i2c_del_driver(&amp;m41t00_driver);</div><div class='del'>-	return;</div><div class='add'>+	platform_driver_unregister(&amp;m41t00_platform_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(m41t00_init);</div><div class='head'>diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c<br/>index 54b6e6a4beed..cb22280cdd27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/pca9539.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/pca9539.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/pca9539.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/chips/pca9539.c</a></div><div class='hunk'>@@ -134,11 +134,13 @@ static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 	new_client-&gt;driver = &amp;pca9539_driver;</div><div class='ctx'> 	new_client-&gt;flags = 0;</div><div class='ctx'> </div><div class='del'>-	/* Detection: the pca9539 only has 8 registers (0-7).</div><div class='del'>-	   A read of 7 should succeed, but a read of 8 should fail. */</div><div class='del'>-	if ((i2c_smbus_read_byte_data(new_client, 7) &lt; 0) ||</div><div class='del'>-	    (i2c_smbus_read_byte_data(new_client, 8) &gt;= 0))</div><div class='del'>-		goto exit_kfree;</div><div class='add'>+	if (kind &lt; 0) {</div><div class='add'>+		/* Detection: the pca9539 only has 8 registers (0-7).</div><div class='add'>+		   A read of 7 should succeed, but a read of 8 should fail. */</div><div class='add'>+		if ((i2c_smbus_read_byte_data(new_client, 7) &lt; 0) ||</div><div class='add'>+		    (i2c_smbus_read_byte_data(new_client, 8) &gt;= 0))</div><div class='add'>+			goto exit_kfree;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(new_client-&gt;name, "pca9539", I2C_NAME_SIZE);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c<br/>index 179b1e022d80..e7e27049fbfa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/chips/tps65010.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/chips/tps65010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/chips/tps65010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/chips/tps65010.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -522,14 +521,14 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_ARM</div><div class='del'>-	irqflags = SA_SAMPLE_RANDOM | SA_TRIGGER_LOW;</div><div class='add'>+	irqflags = IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_LOW;</div><div class='ctx'> 	if (machine_is_omap_h2()) {</div><div class='ctx'> 		tps-&gt;model = TPS65010;</div><div class='ctx'> 		omap_cfg_reg(W4_GPIO58);</div><div class='ctx'> 		tps-&gt;irq = OMAP_GPIO_IRQ(58);</div><div class='ctx'> 		omap_request_gpio(58);</div><div class='ctx'> 		omap_set_gpio_direction(58, 1);</div><div class='del'>-		irqflags |= SA_TRIGGER_FALLING;</div><div class='add'>+		irqflags |= IRQF_TRIGGER_FALLING;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (machine_is_omap_osk()) {</div><div class='ctx'> 		tps-&gt;model = TPS65010;</div><div class='hunk'>@@ -537,7 +536,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)</div><div class='ctx'> 		tps-&gt;irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));</div><div class='ctx'> 		omap_request_gpio(OMAP_MPUIO(1));</div><div class='ctx'> 		omap_set_gpio_direction(OMAP_MPUIO(1), 1);</div><div class='del'>-		irqflags |= SA_TRIGGER_FALLING;</div><div class='add'>+		irqflags |= IRQF_TRIGGER_FALLING;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (machine_is_omap_h3()) {</div><div class='ctx'> 		tps-&gt;model = TPS65013;</div><div class='hunk'>@@ -545,7 +544,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)</div><div class='ctx'> 		// FIXME set up this board's IRQ ...</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	irqflags = SA_SAMPLE_RANDOM;</div><div class='add'>+	irqflags = IRQF_SAMPLE_RANDOM;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (tps-&gt;irq &gt; 0) {</div><div class='head'>diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c<br/>index 45e2cdf54736..9cb277d6aa48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/i2c-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/i2c-core.c</a></div><div class='hunk'>@@ -756,9 +756,9 @@ int i2c_probe(struct i2c_adapter *adapter,</div><div class='ctx'> 					"parameter for adapter %d, "</div><div class='ctx'> 					"addr 0x%02x\n", adap_id,</div><div class='ctx'> 					address_data-&gt;ignore[j + 1]);</div><div class='add'>+				ignore = 1;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-			ignore = 1;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ignore)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -916,7 +916,7 @@ s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,</div><div class='del'>-			       u8 length, u8 *values)</div><div class='add'>+			       u8 length, const u8 *values)</div><div class='ctx'> {</div><div class='ctx'> 	union i2c_smbus_data data;</div><div class='ctx'> </div><div class='hunk'>@@ -944,7 +944,7 @@ s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *val</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command,</div><div class='del'>-				   u8 length, u8 *values)</div><div class='add'>+				   u8 length, const u8 *values)</div><div class='ctx'> {</div><div class='ctx'> 	union i2c_smbus_data data;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c<br/>index ed7eed388bae..58ccddd5c237 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-dev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/i2c/i2c-dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/i2c/i2c-dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/i2c/i2c-dev.c</a></div><div class='hunk'>@@ -426,10 +426,7 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 	/* register this i2c device with the driver core */</div><div class='ctx'> 	i2c_dev-&gt;adap = adap;</div><div class='del'>-	if (adap-&gt;dev.parent == &amp;platform_bus)</div><div class='del'>-		dev = &amp;adap-&gt;dev;</div><div class='del'>-	else</div><div class='del'>-		dev = adap-&gt;dev.parent;</div><div class='add'>+	dev = &amp;adap-&gt;dev;</div><div class='ctx'> 	i2c_dev-&gt;class_dev = class_device_create(i2c_dev_class, NULL,</div><div class='ctx'> 						 MKDEV(I2C_MAJOR, i2c_dev-&gt;minor),</div><div class='ctx'> 						 dev, "i2c-%d", i2c_dev-&gt;minor);</div><div class='head'>diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig<br/>index d633081fa4c5..d1266fe2d1ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/Kconfig</a></div><div class='hunk'>@@ -774,11 +774,18 @@ config BLK_DEV_IDEDMA_PMAC</div><div class='ctx'> 	  performance.</div><div class='ctx'> </div><div class='ctx'> config BLK_DEV_IDE_PMAC_BLINK</div><div class='del'>-	bool "Blink laptop LED on drive activity"</div><div class='add'>+	bool "Blink laptop LED on drive activity (DEPRECATED)"</div><div class='ctx'> 	depends on BLK_DEV_IDE_PMAC &amp;&amp; ADB_PMU</div><div class='add'>+	select ADB_PMU_LED</div><div class='add'>+	select LEDS_TRIGGERS</div><div class='add'>+	select LEDS_TRIGGER_IDE_DISK</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option enables the use of the sleep LED as a hard drive</div><div class='ctx'> 	  activity LED.</div><div class='add'>+	  This option is deprecated, it only selects ADB_PMU_LED and</div><div class='add'>+	  LEDS_TRIGGER_IDE_DISK and changes the code in the new led class</div><div class='add'>+	  device to default to the ide-disk trigger (which should be set</div><div class='add'>+	  from userspace via sysfs).</div><div class='ctx'> </div><div class='ctx'> config BLK_DEV_IDE_SWARM</div><div class='ctx'> 	tristate "IDE for Sibyte evaluation boards"</div><div class='head'>diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c<br/>index 308897e57e4d..8a1c27f28692 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/arm/icside.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/arm/icside.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/arm/icside.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/arm/icside.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Please note that this platform does not support 32-bit IDE IO.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c<br/>index cd15e6260510..5797e0b5a132 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/cris/ide-cris.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/cris/ide-cris.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/cris/ide-cris.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/cris/ide-cris.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef REALLY_SLOW_IO           /* most systems can safely undef this */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='head'>diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c<br/>index fb91cb8bf2d2..15955996a1f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/h8300/ide-h8300.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/h8300/ide-h8300.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/h8300/ide-h8300.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/h8300/ide-h8300.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='head'>diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c<br/>index b4a41d6d0714..654d4cd09847 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-cd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-cd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-cd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-cd.c</a></div><div class='hunk'>@@ -301,7 +301,6 @@</div><div class='ctx'>  </div><div class='ctx'> #define IDECD_VERSION "4.61"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -395,7 +394,8 @@ static int cdrom_log_sense(ide_drive_t *drive, struct request *rq,</div><div class='ctx'> 			 * we cannot reliably check if drive can auto-close</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (rq-&gt;cmd[0] == GPCMD_START_STOP_UNIT &amp;&amp; sense-&gt;asc == 0x24)</div><div class='del'>-				log = 0;</div><div class='add'>+				break;</div><div class='add'>+			log = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case UNIT_ATTENTION:</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -417,6 +417,11 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,</div><div class='ctx'> 			      struct request *failed_command,</div><div class='ctx'> 			      struct request_sense *sense)</div><div class='ctx'> {</div><div class='add'>+	unsigned long sector;</div><div class='add'>+	unsigned long bio_sectors;</div><div class='add'>+	unsigned long valid;</div><div class='add'>+	struct cdrom_info *info = drive-&gt;driver_data;</div><div class='add'>+</div><div class='ctx'> 	if (!cdrom_log_sense(drive, failed_command, sense))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -429,6 +434,37 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,</div><div class='ctx'> 		if (sense-&gt;sense_key == 0x05 &amp;&amp; sense-&gt;asc == 0x24)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='add'>+ 	if (sense-&gt;error_code == 0x70) {	/* Current Error */</div><div class='add'>+ 		switch(sense-&gt;sense_key) {</div><div class='add'>+		case MEDIUM_ERROR:</div><div class='add'>+		case VOLUME_OVERFLOW:</div><div class='add'>+		case ILLEGAL_REQUEST:</div><div class='add'>+			if (!sense-&gt;valid)</div><div class='add'>+				break;</div><div class='add'>+			if (failed_command == NULL ||</div><div class='add'>+					!blk_fs_request(failed_command))</div><div class='add'>+				break;</div><div class='add'>+			sector = (sense-&gt;information[0] &lt;&lt; 24) |</div><div class='add'>+				 (sense-&gt;information[1] &lt;&lt; 16) |</div><div class='add'>+				 (sense-&gt;information[2] &lt;&lt;  8) |</div><div class='add'>+				 (sense-&gt;information[3]);</div><div class='add'>+</div><div class='add'>+			bio_sectors = bio_sectors(failed_command-&gt;bio);</div><div class='add'>+			if (bio_sectors &lt; 4)</div><div class='add'>+				bio_sectors = 4;</div><div class='add'>+			if (drive-&gt;queue-&gt;hardsect_size == 2048)</div><div class='add'>+				sector &lt;&lt;= 2;	/* Device sector size is 2K */</div><div class='add'>+			sector &amp;= ~(bio_sectors -1);</div><div class='add'>+			valid = (sector - failed_command-&gt;sector) &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+			if (valid &lt; 0)</div><div class='add'>+				valid = 0;</div><div class='add'>+			if (sector &lt; get_capacity(info-&gt;disk) &amp;&amp;</div><div class='add'>+				drive-&gt;probed_capacity - sector &lt; 4 * 75) {</div><div class='add'>+				set_capacity(info-&gt;disk, sector);</div><div class='add'>+			}</div><div class='add'>+ 		}</div><div class='add'>+ 	}</div><div class='ctx'> #if VERBOSE_IDE_CD_ERRORS</div><div class='ctx'> 	{</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -609,17 +645,23 @@ static void cdrom_end_request (ide_drive_t *drive, int uptodate)</div><div class='ctx'> 				sense = failed-&gt;sense;</div><div class='ctx'> 				failed-&gt;sense_len = rq-&gt;sense_len;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='add'>+			cdrom_analyze_sense_data(drive, failed, sense);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * now end failed request</div><div class='ctx'> 			 */</div><div class='del'>-			spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='del'>-			end_that_request_chunk(failed, 0, failed-&gt;data_len);</div><div class='del'>-			end_that_request_last(failed, 0);</div><div class='del'>-			spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cdrom_analyze_sense_data(drive, failed, sense);</div><div class='add'>+			if (blk_fs_request(failed)) {</div><div class='add'>+				if (ide_end_dequeued_request(drive, failed, 0,</div><div class='add'>+						failed-&gt;hard_nr_sectors))</div><div class='add'>+					BUG();</div><div class='add'>+			} else {</div><div class='add'>+				spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+				end_that_request_chunk(failed, 0,</div><div class='add'>+							failed-&gt;data_len);</div><div class='add'>+				end_that_request_last(failed, 0);</div><div class='add'>+				spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			cdrom_analyze_sense_data(drive, NULL, sense);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!rq-&gt;current_nr_sectors &amp;&amp; blk_fs_request(rq))</div><div class='hunk'>@@ -633,6 +675,13 @@ static void cdrom_end_request (ide_drive_t *drive, int uptodate)</div><div class='ctx'> 	ide_end_request(drive, uptodate, nsectors);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 stat)</div><div class='add'>+{</div><div class='add'>+	if (stat &amp; 0x80)</div><div class='add'>+		return;</div><div class='add'>+	ide_dump_status(drive, msg, stat);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Returns 0 if the request should be continued.</div><div class='ctx'>    Returns 1 if the request was ended. */</div><div class='ctx'> static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='hunk'>@@ -761,16 +810,16 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 			   sense_key == DATA_PROTECT) {</div><div class='ctx'> 			/* No point in retrying after an illegal</div><div class='ctx'> 			   request or data protect error.*/</div><div class='del'>-			ide_dump_status (drive, "command error", stat);</div><div class='add'>+			ide_dump_status_no_sense (drive, "command error", stat);</div><div class='ctx'> 			do_end_request = 1;</div><div class='ctx'> 		} else if (sense_key == MEDIUM_ERROR) {</div><div class='ctx'> 			/* No point in re-trying a zillion times on a bad </div><div class='ctx'> 			 * sector...  If we got here the error is not correctable */</div><div class='del'>-			ide_dump_status (drive, "media error (bad sector)", stat);</div><div class='add'>+			ide_dump_status_no_sense (drive, "media error (bad sector)", stat);</div><div class='ctx'> 			do_end_request = 1;</div><div class='ctx'> 		} else if (sense_key == BLANK_CHECK) {</div><div class='ctx'> 			/* Disk appears blank ?? */</div><div class='del'>-			ide_dump_status (drive, "media error (blank)", stat);</div><div class='add'>+			ide_dump_status_no_sense (drive, "media error (blank)", stat);</div><div class='ctx'> 			do_end_request = 1;</div><div class='ctx'> 		} else if ((err &amp; ~ABRT_ERR) != 0) {</div><div class='ctx'> 			/* Go to the default handler</div><div class='hunk'>@@ -782,13 +831,27 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)</div><div class='ctx'> 			do_end_request = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (do_end_request)</div><div class='del'>-			cdrom_end_request(drive, 0);</div><div class='del'>-</div><div class='del'>-		/* If we got a CHECK_CONDITION status,</div><div class='del'>-		   queue a request sense command. */</div><div class='del'>-		if ((stat &amp; ERR_STAT) != 0)</div><div class='del'>-			cdrom_queue_request_sense(drive, NULL, NULL);</div><div class='add'>+		/* End a request through request sense analysis when we have</div><div class='add'>+		   sense data. We need this in order to perform end of media</div><div class='add'>+		   processing */</div><div class='add'>+</div><div class='add'>+		if (do_end_request) {</div><div class='add'>+			if (stat &amp; ERR_STAT) {</div><div class='add'>+				unsigned long flags;</div><div class='add'>+				spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+				blkdev_dequeue_request(rq);</div><div class='add'>+				HWGROUP(drive)-&gt;rq = NULL;</div><div class='add'>+				spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+</div><div class='add'>+				cdrom_queue_request_sense(drive, rq-&gt;sense, rq);</div><div class='add'>+			} else</div><div class='add'>+				cdrom_end_request(drive, 0);</div><div class='add'>+		} else {</div><div class='add'>+			/* If we got a CHECK_CONDITION status,</div><div class='add'>+			   queue a request sense command. */</div><div class='add'>+			if (stat &amp; ERR_STAT)</div><div class='add'>+				cdrom_queue_request_sense(drive, NULL, NULL);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		blk_dump_rq_flags(rq, "ide-cd: bad rq");</div><div class='ctx'> 		cdrom_end_request(drive, 0);</div><div class='hunk'>@@ -1451,9 +1514,12 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)</div><div class='ctx'> 	} else {</div><div class='ctx'> confused:</div><div class='ctx'> 		printk (KERN_ERR "%s: cdrom_pc_intr: The drive "</div><div class='del'>-			"appears confused (ireason = 0x%02x)\n",</div><div class='add'>+			"appears confused (ireason = 0x%02x). "</div><div class='add'>+			"Trying to recover by ending request.\n",</div><div class='ctx'> 			drive-&gt;name, ireason);</div><div class='ctx'> 		rq-&gt;flags |= REQ_FAILED;</div><div class='add'>+		cdrom_end_request(drive, 0);</div><div class='add'>+		return ide_stopped;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now we wait for another interrupt. */</div><div class='hunk'>@@ -1488,8 +1554,7 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)</div><div class='add'>+static int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='ctx'> 	struct request_sense sense;</div><div class='ctx'> 	int retries = 10;</div><div class='hunk'>@@ -1722,8 +1787,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> </div><div class='ctx'> 	ide_set_handler(drive, cdrom_newpc_intr, rq-&gt;timeout, NULL);</div><div class='ctx'> 	return ide_started;</div><div class='hunk'>@@ -2218,6 +2282,9 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 		toc-&gt;capacity = 0x1fffff;</div><div class='ctx'> </div><div class='ctx'> 	set_capacity(info-&gt;disk, toc-&gt;capacity * sectors_per_frame);</div><div class='add'>+	/* Save a private copy of te TOC capacity for error handling */</div><div class='add'>+	drive-&gt;probed_capacity = toc-&gt;capacity * sectors_per_frame;</div><div class='add'>+</div><div class='ctx'> 	blk_queue_hardsect_size(drive-&gt;queue,</div><div class='ctx'> 				sectors_per_frame &lt;&lt; SECTOR_BITS);</div><div class='ctx'> </div><div class='hunk'>@@ -2340,6 +2407,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)</div><div class='ctx'> 	if (!stat &amp;&amp; (last_written &gt; toc-&gt;capacity)) {</div><div class='ctx'> 		toc-&gt;capacity = last_written;</div><div class='ctx'> 		set_capacity(info-&gt;disk, toc-&gt;capacity * sectors_per_frame);</div><div class='add'>+		drive-&gt;probed_capacity = toc-&gt;capacity * sectors_per_frame;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Remember that we've read this stuff. */</div><div class='hunk'>@@ -2696,14 +2764,11 @@ int ide_cdrom_drive_status (struct cdrom_device_info *cdi, int slot_nr)</div><div class='ctx'> 	 * any other way to detect this...</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sense.sense_key == NOT_READY) {</div><div class='del'>-		if (sense.asc == 0x3a) {</div><div class='del'>-			if (sense.ascq == 1)</div><div class='del'>-				return CDS_NO_DISC;</div><div class='del'>-			else if (sense.ascq == 0 || sense.ascq == 2)</div><div class='del'>-				return CDS_TRAY_OPEN;</div><div class='del'>-		}</div><div class='add'>+		if (sense.asc == 0x3a &amp;&amp; sense.ascq == 1)</div><div class='add'>+			return CDS_NO_DISC;</div><div class='add'>+		else</div><div class='add'>+			return CDS_TRAY_OPEN;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return CDS_DRIVE_NOT_READY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3461,8 +3526,6 @@ static int ide_cd_probe(ide_drive_t *drive)</div><div class='ctx'> 	drive-&gt;driver_data = info;</div><div class='ctx'> </div><div class='ctx'> 	g-&gt;minors = 1;</div><div class='del'>-	snprintf(g-&gt;devfs_name, sizeof(g-&gt;devfs_name),</div><div class='del'>-			"%s/cd", drive-&gt;devfs_name);</div><div class='ctx'> 	g-&gt;driverfs_dev = &amp;drive-&gt;gendev;</div><div class='ctx'> 	g-&gt;flags = GENHD_FL_CD | GENHD_FL_REMOVABLE;</div><div class='ctx'> 	if (ide_cdrom_setup(drive)) {</div><div class='head'>diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c<br/>index a5017de72da5..f712e4cfd9dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-disk.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-disk.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-disk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-disk.c</a></div><div class='hunk'>@@ -37,7 +37,7 @@</div><div class='ctx'>  * Version 1.15		convert all calls to ide_raw_taskfile</div><div class='ctx'>  *				since args will return register content.</div><div class='ctx'>  * Version 1.16		added suspend-resume-checkpower</div><div class='del'>- * Version 1.17		do flush on standy, do flush on ATA &lt; ATA6</div><div class='add'>+ * Version 1.17		do flush on standby, do flush on ATA &lt; ATA6</div><div class='ctx'>  *			fix wcache setup.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> </div><div class='ctx'> //#define DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -1018,7 +1017,6 @@ static void ide_disk_release(struct kref *kref)</div><div class='ctx'> 	struct gendisk *g = idkp-&gt;disk;</div><div class='ctx'> </div><div class='ctx'> 	drive-&gt;driver_data = NULL;</div><div class='del'>-	drive-&gt;devfs_name[0] = '\0';</div><div class='ctx'> 	g-&gt;private_data = NULL;</div><div class='ctx'> 	put_disk(g);</div><div class='ctx'> 	kfree(idkp);</div><div class='hunk'>@@ -1222,7 +1220,6 @@ static int ide_disk_probe(ide_drive_t *drive)</div><div class='ctx'> 		drive-&gt;attach = 1;</div><div class='ctx'> </div><div class='ctx'> 	g-&gt;minors = 1 &lt;&lt; PARTN_BITS;</div><div class='del'>-	strcpy(g-&gt;devfs_name, drive-&gt;devfs_name);</div><div class='ctx'> 	g-&gt;driverfs_dev = &amp;drive-&gt;gendev;</div><div class='ctx'> 	g-&gt;flags = drive-&gt;removable ? GENHD_FL_REMOVABLE : 0;</div><div class='ctx'> 	set_capacity(g, idedisk_capacity(drive));</div><div class='head'>diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c<br/>index c481be8b807f..98918fb6b2ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-dma.c</a></div><div class='hunk'>@@ -74,7 +74,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -206,8 +205,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 	ide_hwif_t *hwif = HWIF(drive);</div><div class='ctx'> 	struct scatterlist *sg = hwif-&gt;sg_table;</div><div class='ctx'> </div><div class='del'>-	if ((rq-&gt;flags &amp; REQ_DRIVE_TASKFILE) &amp;&amp; rq-&gt;nr_sectors &gt; 256)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON((rq-&gt;flags &amp; REQ_DRIVE_TASKFILE) &amp;&amp; rq-&gt;nr_sectors &gt; 256);</div><div class='ctx'> </div><div class='ctx'> 	ide_map_sg(drive, rq);</div><div class='ctx'> </div><div class='hunk'>@@ -947,8 +945,7 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='del'>-	if (!(hwif-&gt;dma_master))</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(!hwif-&gt;dma_master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ide_setup_dma);</div><div class='head'>diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c<br/>index a53e3ce4a142..adbe9f76a505 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-floppy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-floppy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-floppy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-floppy.c</a></div><div class='hunk'>@@ -82,7 +82,6 @@</div><div class='ctx'> </div><div class='ctx'> #define IDEFLOPPY_VERSION "0.99.newide"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -839,7 +838,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)</div><div class='ctx'> 			"transferred\n", pc-&gt;actually_transferred);</div><div class='ctx'> 		clear_bit(PC_DMA_IN_PROGRESS, &amp;pc-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		local_irq_enable();</div><div class='add'>+		local_irq_enable_in_hardirq();</div><div class='ctx'> </div><div class='ctx'> 		if (status.b.check || test_bit(PC_DMA_ERROR, &amp;pc-&gt;flags)) {</div><div class='ctx'> 			/* Error detected */</div><div class='hunk'>@@ -898,8 +897,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)</div><div class='ctx'> 					"to send us more data than expected "</div><div class='ctx'> 					"- discarding data\n");</div><div class='ctx'> 				idefloppy_discard_data(drive,bcount.all);</div><div class='del'>-				if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-					BUG();</div><div class='add'>+				BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 				ide_set_handler(drive,</div><div class='ctx'> 						&amp;idefloppy_pc_intr,</div><div class='ctx'> 						IDEFLOPPY_WAIT_CMD,</div><div class='hunk'>@@ -932,8 +930,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)</div><div class='ctx'> 	pc-&gt;actually_transferred += bcount.all;</div><div class='ctx'> 	pc-&gt;current_position += bcount.all;</div><div class='ctx'> </div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 	ide_set_handler(drive, &amp;idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);		/* And set the interrupt handler again */</div><div class='ctx'> 	return ide_started;</div><div class='ctx'> }</div><div class='hunk'>@@ -960,8 +957,7 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive)</div><div class='ctx'> 				"issuing a packet command\n");</div><div class='ctx'> 		return ide_do_reset(drive);</div><div class='ctx'> 	}</div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 	/* Set the interrupt routine */</div><div class='ctx'> 	ide_set_handler(drive, &amp;idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);</div><div class='ctx'> 	/* Send the actual packet */</div><div class='hunk'>@@ -1017,8 +1013,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive)</div><div class='ctx'> 	 * 40 and 50msec work well. idefloppy_pc_intr will not be actually</div><div class='ctx'> 	 * used until after the packet is moved in about 50 msec.</div><div class='ctx'> 	 */</div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 	ide_set_handler(drive, </div><div class='ctx'> 	  &amp;idefloppy_pc_intr, 		/* service routine for packet command */</div><div class='ctx'> 	  floppy-&gt;ticks,		/* wait this long before "failing" */</div><div class='hunk'>@@ -1288,7 +1283,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request</div><div class='ctx'> </div><div class='ctx'> 	debug_log(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",</div><div class='ctx'> 			rq-&gt;rq_status,</div><div class='del'>-			rq-&gt;rq_disk ? rq-&gt;rq_disk-&gt;disk_name ? "?",</div><div class='add'>+			rq-&gt;rq_disk ? rq-&gt;rq_disk-&gt;disk_name : "?",</div><div class='ctx'> 			rq-&gt;flags, rq-&gt;errors);</div><div class='ctx'> 	debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, "</div><div class='ctx'> 			"current_nr_sectors: %d\n", (long)rq-&gt;sector,</div><div class='hunk'>@@ -2180,7 +2175,6 @@ static int ide_floppy_probe(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	g-&gt;minors = 1 &lt;&lt; PARTN_BITS;</div><div class='ctx'> 	g-&gt;driverfs_dev = &amp;drive-&gt;gendev;</div><div class='del'>-	strcpy(g-&gt;devfs_name, drive-&gt;devfs_name);</div><div class='ctx'> 	g-&gt;flags = drive-&gt;removable ? GENHD_FL_REMOVABLE : 0;</div><div class='ctx'> 	g-&gt;fops = &amp;idefloppy_ops;</div><div class='ctx'> 	drive-&gt;attach = 1;</div><div class='head'>diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c<br/>index c01615dec202..fb6795236e76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-io.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -142,38 +141,41 @@ enum {</div><div class='ctx'> </div><div class='ctx'> static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 stat, u8 error)</div><div class='ctx'> {</div><div class='add'>+	struct request_pm_state *pm = rq-&gt;end_io_data;</div><div class='add'>+</div><div class='ctx'> 	if (drive-&gt;media != ide_disk)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	switch (rq-&gt;pm-&gt;pm_step) {</div><div class='add'>+	switch (pm-&gt;pm_step) {</div><div class='ctx'> 	case ide_pm_flush_cache:	/* Suspend step 1 (flush cache) complete */</div><div class='del'>-		if (rq-&gt;pm-&gt;pm_state == PM_EVENT_FREEZE)</div><div class='del'>-			rq-&gt;pm-&gt;pm_step = ide_pm_state_completed;</div><div class='add'>+		if (pm-&gt;pm_state == PM_EVENT_FREEZE)</div><div class='add'>+			pm-&gt;pm_step = ide_pm_state_completed;</div><div class='ctx'> 		else</div><div class='del'>-			rq-&gt;pm-&gt;pm_step = idedisk_pm_standby;</div><div class='add'>+			pm-&gt;pm_step = idedisk_pm_standby;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case idedisk_pm_standby:	/* Suspend step 2 (standby) complete */</div><div class='del'>-		rq-&gt;pm-&gt;pm_step = ide_pm_state_completed;</div><div class='add'>+		pm-&gt;pm_step = ide_pm_state_completed;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case idedisk_pm_idle:		/* Resume step 1 (idle) complete */</div><div class='del'>-		rq-&gt;pm-&gt;pm_step = ide_pm_restore_dma;</div><div class='add'>+		pm-&gt;pm_step = ide_pm_restore_dma;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *rq)</div><div class='ctx'> {</div><div class='add'>+	struct request_pm_state *pm = rq-&gt;end_io_data;</div><div class='ctx'> 	ide_task_t *args = rq-&gt;special;</div><div class='ctx'> </div><div class='ctx'> 	memset(args, 0, sizeof(*args));</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;media != ide_disk) {</div><div class='ctx'> 		/* skip idedisk_pm_idle for ATAPI devices */</div><div class='del'>-		if (rq-&gt;pm-&gt;pm_step == idedisk_pm_idle)</div><div class='del'>-			rq-&gt;pm-&gt;pm_step = ide_pm_restore_dma;</div><div class='add'>+		if (pm-&gt;pm_step == idedisk_pm_idle)</div><div class='add'>+			pm-&gt;pm_step = ide_pm_restore_dma;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (rq-&gt;pm-&gt;pm_step) {</div><div class='add'>+	switch (pm-&gt;pm_step) {</div><div class='ctx'> 	case ide_pm_flush_cache:	/* Suspend step 1 (flush cache) */</div><div class='ctx'> 		if (drive-&gt;media != ide_disk)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -215,11 +217,68 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *</div><div class='ctx'> 		drive-&gt;hwif-&gt;ide_dma_check(drive);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	rq-&gt;pm-&gt;pm_step = ide_pm_state_completed;</div><div class='add'>+	pm-&gt;pm_step = ide_pm_state_completed;</div><div class='ctx'> 	return ide_stopped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	ide_end_dequeued_request	-	complete an IDE I/O</div><div class='add'>+ *	@drive: IDE device for the I/O</div><div class='add'>+ *	@uptodate:</div><div class='add'>+ *	@nr_sectors: number of sectors completed</div><div class='add'>+ *</div><div class='add'>+ *	Complete an I/O that is no longer on the request queue. This</div><div class='add'>+ *	typically occurs when we pull the request and issue a REQUEST_SENSE.</div><div class='add'>+ *	We must still finish the old request but we must not tamper with the</div><div class='add'>+ *	queue in the meantime.</div><div class='add'>+ *</div><div class='add'>+ *	NOTE: This path does not handle barrier, but barrier is not supported</div><div class='add'>+ *	on ide-cd anyway.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,</div><div class='add'>+			     int uptodate, int nr_sectors)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!(rq-&gt;flags &amp; REQ_STARTED));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if failfast is set on a request, override number of sectors and</div><div class='add'>+	 * complete the whole request right now</div><div class='add'>+	 */</div><div class='add'>+	if (blk_noretry_request(rq) &amp;&amp; end_io_error(uptodate))</div><div class='add'>+		nr_sectors = rq-&gt;hard_nr_sectors;</div><div class='add'>+</div><div class='add'>+	if (!blk_fs_request(rq) &amp;&amp; end_io_error(uptodate) &amp;&amp; !rq-&gt;errors)</div><div class='add'>+		rq-&gt;errors = -EIO;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * decide whether to reenable DMA -- 3 is a random magic for now,</div><div class='add'>+	 * if we DMA timeout more than 3 times, just stay in PIO</div><div class='add'>+	 */</div><div class='add'>+	if (drive-&gt;state == DMA_PIO_RETRY &amp;&amp; drive-&gt;retry_pio &lt;= 3) {</div><div class='add'>+		drive-&gt;state = 0;</div><div class='add'>+		HWGROUP(drive)-&gt;hwif-&gt;ide_dma_on(drive);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!end_that_request_first(rq, uptodate, nr_sectors)) {</div><div class='add'>+		add_disk_randomness(rq-&gt;rq_disk);</div><div class='add'>+		if (blk_rq_tagged(rq))</div><div class='add'>+			blk_queue_end_tag(drive-&gt;queue, rq);</div><div class='add'>+		end_that_request_last(rq, uptodate);</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(ide_end_dequeued_request);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	ide_complete_pm_request - end the current Power Management request</div><div class='ctx'>  *	@drive: target drive</div><div class='ctx'>  *	@rq: request</div><div class='hunk'>@@ -362,12 +421,13 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (blk_pm_request(rq)) {</div><div class='add'>+		struct request_pm_state *pm = rq-&gt;end_io_data;</div><div class='ctx'> #ifdef DEBUG_PM</div><div class='ctx'> 		printk("%s: complete_power_step(step: %d, stat: %x, err: %x)\n",</div><div class='ctx'> 			drive-&gt;name, rq-&gt;pm-&gt;pm_step, stat, err);</div><div class='ctx'> #endif</div><div class='ctx'> 		ide_complete_power_step(drive, rq, stat, err);</div><div class='del'>-		if (rq-&gt;pm-&gt;pm_step == ide_pm_state_completed)</div><div class='add'>+		if (pm-&gt;pm_step == ide_pm_state_completed)</div><div class='ctx'> 			ide_complete_pm_request(drive, rq);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -444,7 +504,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((stat &amp; DRQ_STAT) &amp;&amp; rq_data_dir(rq) == READ)</div><div class='add'>+	if ((stat &amp; DRQ_STAT) &amp;&amp; rq_data_dir(rq) == READ &amp;&amp; hwif-&gt;err_stops_fifo == 0)</div><div class='ctx'> 		try_to_flush_leftover_data(drive);</div><div class='ctx'> </div><div class='ctx'> 	if (hwif-&gt;INB(IDE_STATUS_REG) &amp; (BUSY_STAT|DRQ_STAT))</div><div class='hunk'>@@ -633,7 +693,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)</div><div class='ctx'> 	u8 stat = hwif-&gt;INB(IDE_STATUS_REG);</div><div class='ctx'> 	int retries = 10;</div><div class='ctx'> </div><div class='del'>-	local_irq_enable();</div><div class='add'>+	local_irq_enable_in_hardirq();</div><div class='ctx'> 	if ((stat &amp; DRQ_STAT) &amp;&amp; args &amp;&amp; args[3]) {</div><div class='ctx'> 		u8 io_32bit = drive-&gt;io_32bit;</div><div class='ctx'> 		drive-&gt;io_32bit = 0;</div><div class='hunk'>@@ -871,6 +931,39 @@ done:</div><div class='ctx'>  	return ide_stopped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)</div><div class='add'>+{</div><div class='add'>+	struct request_pm_state *pm = rq-&gt;end_io_data;</div><div class='add'>+</div><div class='add'>+	if (blk_pm_suspend_request(rq) &amp;&amp;</div><div class='add'>+	    pm-&gt;pm_step == ide_pm_state_start_suspend)</div><div class='add'>+		/* Mark drive blocked when starting the suspend sequence. */</div><div class='add'>+		drive-&gt;blocked = 1;</div><div class='add'>+	else if (blk_pm_resume_request(rq) &amp;&amp;</div><div class='add'>+		 pm-&gt;pm_step == ide_pm_state_start_resume) {</div><div class='add'>+		/* </div><div class='add'>+		 * The first thing we do on wakeup is to wait for BSY bit to</div><div class='add'>+		 * go away (with a looong timeout) as a drive on this hwif may</div><div class='add'>+		 * just be POSTing itself.</div><div class='add'>+		 * We do that before even selecting as the "other" device on</div><div class='add'>+		 * the bus may be broken enough to walk on our toes at this</div><div class='add'>+		 * point.</div><div class='add'>+		 */</div><div class='add'>+		int rc;</div><div class='add'>+#ifdef DEBUG_PM</div><div class='add'>+		printk("%s: Wakeup request inited, waiting for !BSY...\n", drive-&gt;name);</div><div class='add'>+#endif</div><div class='add'>+		rc = ide_wait_not_busy(HWIF(drive), 35000);</div><div class='add'>+		if (rc)</div><div class='add'>+			printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive-&gt;name);</div><div class='add'>+		SELECT_DRIVE(drive);</div><div class='add'>+		HWIF(drive)-&gt;OUTB(8, HWIF(drive)-&gt;io_ports[IDE_CONTROL_OFFSET]);</div><div class='add'>+		rc = ide_wait_not_busy(HWIF(drive), 100000);</div><div class='add'>+		if (rc)</div><div class='add'>+			printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive-&gt;name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	start_request	-	start of I/O and command issuing for IDE</div><div class='ctx'>  *</div><div class='hunk'>@@ -909,33 +1002,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 	if (block == 0 &amp;&amp; drive-&gt;remap_0_to_1 == 1)</div><div class='ctx'> 		block = 1;  /* redirect MBR access to EZ-Drive partn table */</div><div class='ctx'> </div><div class='del'>-	if (blk_pm_suspend_request(rq) &amp;&amp;</div><div class='del'>-	    rq-&gt;pm-&gt;pm_step == ide_pm_state_start_suspend)</div><div class='del'>-		/* Mark drive blocked when starting the suspend sequence. */</div><div class='del'>-		drive-&gt;blocked = 1;</div><div class='del'>-	else if (blk_pm_resume_request(rq) &amp;&amp;</div><div class='del'>-		 rq-&gt;pm-&gt;pm_step == ide_pm_state_start_resume) {</div><div class='del'>-		/* </div><div class='del'>-		 * The first thing we do on wakeup is to wait for BSY bit to</div><div class='del'>-		 * go away (with a looong timeout) as a drive on this hwif may</div><div class='del'>-		 * just be POSTing itself.</div><div class='del'>-		 * We do that before even selecting as the "other" device on</div><div class='del'>-		 * the bus may be broken enough to walk on our toes at this</div><div class='del'>-		 * point.</div><div class='del'>-		 */</div><div class='del'>-		int rc;</div><div class='del'>-#ifdef DEBUG_PM</div><div class='del'>-		printk("%s: Wakeup request inited, waiting for !BSY...\n", drive-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		rc = ide_wait_not_busy(HWIF(drive), 35000);</div><div class='del'>-		if (rc)</div><div class='del'>-			printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive-&gt;name);</div><div class='del'>-		SELECT_DRIVE(drive);</div><div class='del'>-		HWIF(drive)-&gt;OUTB(8, HWIF(drive)-&gt;io_ports[IDE_CONTROL_OFFSET]);</div><div class='del'>-		rc = ide_wait_not_busy(HWIF(drive), 10000);</div><div class='del'>-		if (rc)</div><div class='del'>-			printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive-&gt;name);</div><div class='del'>-	}</div><div class='add'>+	if (blk_pm_request(rq))</div><div class='add'>+		ide_check_pm_state(drive, rq);</div><div class='ctx'> </div><div class='ctx'> 	SELECT_DRIVE(drive);</div><div class='ctx'> 	if (ide_wait_stat(&amp;startstop, drive, drive-&gt;ready_stat, BUSY_STAT|DRQ_STAT, WAIT_READY)) {</div><div class='hunk'>@@ -950,13 +1018,14 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)</div><div class='ctx'> 		else if (rq-&gt;flags &amp; REQ_DRIVE_TASKFILE)</div><div class='ctx'> 			return execute_drive_cmd(drive, rq);</div><div class='ctx'> 		else if (blk_pm_request(rq)) {</div><div class='add'>+			struct request_pm_state *pm = rq-&gt;end_io_data;</div><div class='ctx'> #ifdef DEBUG_PM</div><div class='ctx'> 			printk("%s: start_power_step(step: %d)\n",</div><div class='ctx'> 				drive-&gt;name, rq-&gt;pm-&gt;pm_step);</div><div class='ctx'> #endif</div><div class='ctx'> 			startstop = ide_start_power_step(drive, rq);</div><div class='ctx'> 			if (startstop == ide_stopped &amp;&amp;</div><div class='del'>-			    rq-&gt;pm-&gt;pm_step == ide_pm_state_completed)</div><div class='add'>+			    pm-&gt;pm_step == ide_pm_state_completed)</div><div class='ctx'> 				ide_complete_pm_request(drive, rq);</div><div class='ctx'> 			return startstop;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1217,7 +1286,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)</div><div class='ctx'> 		if (masked_irq != IDE_NO_IRQ &amp;&amp; hwif-&gt;irq != masked_irq)</div><div class='ctx'> 			disable_irq_nosync(hwif-&gt;irq);</div><div class='ctx'> 		spin_unlock(&amp;ide_lock);</div><div class='del'>-		local_irq_enable();</div><div class='add'>+		local_irq_enable_in_hardirq();</div><div class='ctx'> 			/* allow other IRQs while we start this request */</div><div class='ctx'> 		startstop = start_request(drive, rq);</div><div class='ctx'> 		spin_lock_irq(&amp;ide_lock);</div><div class='hunk'>@@ -1562,7 +1631,7 @@ irqreturn_t ide_intr (int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	spin_unlock(&amp;ide_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (drive-&gt;unmask)</div><div class='del'>-		local_irq_enable();</div><div class='add'>+		local_irq_enable_in_hardirq();</div><div class='ctx'> 	/* service this interrupt, may set handler for next interrupt */</div><div class='ctx'> 	startstop = handler(drive);</div><div class='ctx'> 	spin_lock_irq(&amp;ide_lock);</div><div class='hunk'>@@ -1595,7 +1664,7 @@ irqreturn_t ide_intr (int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>  *	Initialize a request before we fill it in and send it down to</div><div class='ctx'>  *	ide_do_drive_cmd. Commands must be set up by this function. Right</div><div class='ctx'>  *	now it doesn't do a lot, but if that changes abusers will have a</div><div class='del'>- *	nasty suprise.</div><div class='add'>+ *	nasty surprise.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ide_init_drive_cmd (struct request *rq)</div><div class='hunk'>@@ -1636,7 +1705,7 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	ide_hwgroup_t *hwgroup = HWGROUP(drive);</div><div class='del'>-	DECLARE_COMPLETION(wait);</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(wait);</div><div class='ctx'> 	int where = ELEVATOR_INSERT_BACK, err;</div><div class='ctx'> 	int must_wait = (action == ide_wait || action == ide_head_wait);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c<br/>index b72dde70840a..657165297dc7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-iops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-iops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-iops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-iops.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -597,6 +596,10 @@ u8 eighty_ninty_three (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	if(HWIF(drive)-&gt;udma_four == 0)</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check for SATA but only if we are ATA5 or higher */</div><div class='add'>+	if (drive-&gt;id-&gt;hw_config == 0 &amp;&amp; (drive-&gt;id-&gt;major_rev_num &amp; 0x7FE0))</div><div class='add'>+		return 1;</div><div class='ctx'> 	if (!(drive-&gt;id-&gt;hw_config &amp; 0x6000))</div><div class='ctx'> 		return 0;</div><div class='ctx'> #ifndef CONFIG_IDEDMA_IVB</div><div class='hunk'>@@ -939,8 +942,7 @@ void ide_execute_command(ide_drive_t *drive, task_ioreg_t cmd, ide_handler_t *ha</div><div class='ctx'> 	</div><div class='ctx'> 	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='ctx'> 	</div><div class='del'>-	if(hwgroup-&gt;handler)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(hwgroup-&gt;handler);</div><div class='ctx'> 	hwgroup-&gt;handler	= handler;</div><div class='ctx'> 	hwgroup-&gt;expiry		= expiry;</div><div class='ctx'> 	hwgroup-&gt;timer.expires	= jiffies + timeout;</div><div class='hunk'>@@ -981,8 +983,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)</div><div class='ctx'> 		printk("%s: ATAPI reset complete\n", drive-&gt;name);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (time_before(jiffies, hwgroup-&gt;poll_timeout)) {</div><div class='del'>-			if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-				BUG();</div><div class='add'>+			BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 			ide_set_handler(drive, &amp;atapi_reset_pollfunc, HZ/20, NULL);</div><div class='ctx'> 			/* continue polling */</div><div class='ctx'> 			return ide_started;</div><div class='hunk'>@@ -1021,8 +1022,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> 	if (!OK_STAT(tmp = hwif-&gt;INB(IDE_STATUS_REG), 0, BUSY_STAT)) {</div><div class='ctx'> 		if (time_before(jiffies, hwgroup-&gt;poll_timeout)) {</div><div class='del'>-			if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-				BUG();</div><div class='add'>+			BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 			ide_set_handler(drive, &amp;reset_pollfunc, HZ/20, NULL);</div><div class='ctx'> 			/* continue polling */</div><div class='ctx'> 			return ide_started;</div><div class='hunk'>@@ -1138,8 +1138,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)</div><div class='ctx'> 	hwgroup = HWGROUP(drive);</div><div class='ctx'> </div><div class='ctx'> 	/* We must not reset with running handlers */</div><div class='del'>-	if(hwgroup-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(hwgroup-&gt;handler != NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* For an ATAPI device, first try an ATAPI SRST. */</div><div class='ctx'> 	if (drive-&gt;media != ide_disk &amp;&amp; !do_not_try_atapi) {</div><div class='head'>diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c<br/>index 41d46dbe6c24..1feff23487d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-lib.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-lib.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -164,8 +163,7 @@ u8 ide_rate_filter (u8 mode, u8 speed)</div><div class='ctx'> //	printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);</div><div class='ctx'> </div><div class='ctx'> 	/* So that we remember to update this if new modes appear */</div><div class='del'>-	if (mode &gt; 4)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(mode &gt; 4);</div><div class='ctx'> 	return min(speed, speed_max[mode]);</div><div class='ctx'> #else /* !CONFIG_BLK_DEV_IDEDMA */</div><div class='ctx'> 	return min(speed, (u8)XFER_PIO_4);</div><div class='hunk'>@@ -486,7 +484,7 @@ static u8 ide_dump_ata_status(ide_drive_t *drive, const char *msg, u8 stat)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u8 err = 0;</div><div class='ctx'> </div><div class='del'>-	local_irq_set(flags);</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	printk("%s: %s: status=0x%02x { ", drive-&gt;name, msg, stat);</div><div class='ctx'> 	if (stat &amp; BUSY_STAT)</div><div class='ctx'> 		printk("Busy ");</div><div class='hunk'>@@ -568,7 +566,7 @@ static u8 ide_dump_atapi_status(ide_drive_t *drive, const char *msg, u8 stat)</div><div class='ctx'> </div><div class='ctx'> 	status.all = stat;</div><div class='ctx'> 	error.all = 0;</div><div class='del'>-	local_irq_set(flags);</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	printk("%s: %s: status=0x%02x { ", drive-&gt;name, msg, stat);</div><div class='ctx'> 	if (status.b.bsy)</div><div class='ctx'> 		printk("Busy ");</div><div class='head'>diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c<br/>index 1b7b4c531bc2..9cadf0106c6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-probe.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef REALLY_SLOW_IO		/* most systems can safely undef this */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -47,7 +46,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -1006,7 +1004,7 @@ static int ide_init_queue(ide_drive_t *drive)</div><div class='ctx'>  * and irq serialization situations.  This is somewhat complex because</div><div class='ctx'>  * it handles static as well as dynamic (PCMCIA) IDE interfaces.</div><div class='ctx'>  *</div><div class='del'>- * The SA_INTERRUPT in sa_flags means ide_intr() is always entered with</div><div class='add'>+ * The IRQF_DISABLED in sa_flags means ide_intr() is always entered with</div><div class='ctx'>  * interrupts completely disabled.  This can be bad for interrupt latency,</div><div class='ctx'>  * but anything else has led to problems on some machines.  We re-enable</div><div class='ctx'>  * interrupts as much as we can safely do in most places.</div><div class='hunk'>@@ -1092,15 +1090,15 @@ static int init_irq (ide_hwif_t *hwif)</div><div class='ctx'> 	 * Allocate the irq, if not already obtained for another hwif</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!match || match-&gt;irq != hwif-&gt;irq) {</div><div class='del'>-		int sa = SA_INTERRUPT;</div><div class='add'>+		int sa = IRQF_DISABLED;</div><div class='ctx'> #if defined(__mc68000__) || defined(CONFIG_APUS)</div><div class='del'>-		sa = SA_SHIRQ;</div><div class='add'>+		sa = IRQF_SHARED;</div><div class='ctx'> #endif /* __mc68000__ || CONFIG_APUS */</div><div class='ctx'> </div><div class='ctx'> 		if (IDE_CHIPSET_IS_PCI(hwif-&gt;chipset)) {</div><div class='del'>-			sa = SA_SHIRQ;</div><div class='add'>+			sa = IRQF_SHARED;</div><div class='ctx'> #ifndef CONFIG_IDEPCI_SHARE_IRQ</div><div class='del'>-			sa |= SA_INTERRUPT;</div><div class='add'>+			sa |= IRQF_DISABLED;</div><div class='ctx'> #endif /* CONFIG_IDEPCI_SHARE_IRQ */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1138,16 +1136,11 @@ static int init_irq (ide_hwif_t *hwif)</div><div class='ctx'> 		spin_unlock_irq(&amp;ide_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if !defined(__mc68000__) &amp;&amp; !defined(CONFIG_APUS) &amp;&amp; !defined(__sparc__)</div><div class='add'>+#if !defined(__mc68000__) &amp;&amp; !defined(CONFIG_APUS)</div><div class='ctx'> 	printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif-&gt;name,</div><div class='ctx'> 		hwif-&gt;io_ports[IDE_DATA_OFFSET],</div><div class='ctx'> 		hwif-&gt;io_ports[IDE_DATA_OFFSET]+7,</div><div class='ctx'> 		hwif-&gt;io_ports[IDE_CONTROL_OFFSET], hwif-&gt;irq);</div><div class='del'>-#elif defined(__sparc__)</div><div class='del'>-	printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %s", hwif-&gt;name,</div><div class='del'>-		hwif-&gt;io_ports[IDE_DATA_OFFSET],</div><div class='del'>-		hwif-&gt;io_ports[IDE_DATA_OFFSET]+7,</div><div class='del'>-		hwif-&gt;io_ports[IDE_CONTROL_OFFSET], __irq_itoa(hwif-&gt;irq));</div><div class='ctx'> #else</div><div class='ctx'> 	printk("%s at 0x%08lx on irq %d", hwif-&gt;name,</div><div class='ctx'> 		hwif-&gt;io_ports[IDE_DATA_OFFSET], hwif-&gt;irq);</div><div class='hunk'>@@ -1284,10 +1277,6 @@ static void drive_release_dev (struct device *dev)</div><div class='ctx'> 	ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;ide_lock);</div><div class='del'>-	if (drive-&gt;devfs_name[0] != '\0') {</div><div class='del'>-		devfs_remove(drive-&gt;devfs_name);</div><div class='del'>-		drive-&gt;devfs_name[0] = '\0';</div><div class='del'>-	}</div><div class='ctx'> 	ide_remove_drive_from_hwgroup(drive);</div><div class='ctx'> 	kfree(drive-&gt;id);</div><div class='ctx'> 	drive-&gt;id = NULL;</div><div class='hunk'>@@ -1321,12 +1310,6 @@ static void init_gendisk (ide_hwif_t *hwif)</div><div class='ctx'> 		drive-&gt;gendev.bus = &amp;ide_bus_type;</div><div class='ctx'> 		drive-&gt;gendev.driver_data = drive;</div><div class='ctx'> 		drive-&gt;gendev.release = drive_release_dev;</div><div class='del'>-		if (drive-&gt;present) {</div><div class='del'>-			sprintf(drive-&gt;devfs_name, "ide/host%d/bus%d/target%d/lun%d",</div><div class='del'>-				(hwif-&gt;channel &amp;&amp; hwif-&gt;mate) ?</div><div class='del'>-				hwif-&gt;mate-&gt;index : hwif-&gt;index,</div><div class='del'>-				hwif-&gt;channel, unit, drive-&gt;lun);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	blk_register_region(MKDEV(hwif-&gt;major, 0), MAX_DRIVES &lt;&lt; PARTN_BITS,</div><div class='ctx'> 			THIS_MODULE, ata_probe, ata_lock, hwif);</div><div class='head'>diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c<br/>index 84665e2ba3c8..c12f1b71e934 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-proc.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c<br/>index f04791a58df0..7067ab997927 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-tape.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-tape.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-tape.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-tape.c</a></div><div class='hunk'>@@ -424,7 +424,6 @@</div><div class='ctx'> </div><div class='ctx'> #define IDETAPE_VERSION "1.19"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -435,7 +434,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -2646,21 +2644,23 @@ static idetape_stage_t *idetape_kmalloc_stage (idetape_tape_t *tape)</div><div class='ctx'> 	return __idetape_kmalloc_stage(tape, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t *stage, const char __user *buf, int n)</div><div class='add'>+static int idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t *stage, const char __user *buf, int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct idetape_bh *bh = tape-&gt;bh;</div><div class='ctx'> 	int count;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (n) {</div><div class='ctx'> #if IDETAPE_DEBUG_BUGS</div><div class='ctx'> 		if (bh == NULL) {</div><div class='ctx'> 			printk(KERN_ERR "ide-tape: bh == NULL in "</div><div class='ctx'> 				"idetape_copy_stage_from_user\n");</div><div class='del'>-			return;</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> #endif /* IDETAPE_DEBUG_BUGS */</div><div class='ctx'> 		count = min((unsigned int)(bh-&gt;b_size - atomic_read(&amp;bh-&gt;b_count)), (unsigned int)n);</div><div class='del'>-		copy_from_user(bh-&gt;b_data + atomic_read(&amp;bh-&gt;b_count), buf, count);</div><div class='add'>+		if (copy_from_user(bh-&gt;b_data + atomic_read(&amp;bh-&gt;b_count), buf, count))</div><div class='add'>+			ret = 1;</div><div class='ctx'> 		n -= count;</div><div class='ctx'> 		atomic_add(count, &amp;bh-&gt;b_count);</div><div class='ctx'> 		buf += count;</div><div class='hunk'>@@ -2671,23 +2671,26 @@ static void idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	tape-&gt;bh = bh;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void idetape_copy_stage_to_user (idetape_tape_t *tape, char __user *buf, idetape_stage_t *stage, int n)</div><div class='add'>+static int idetape_copy_stage_to_user (idetape_tape_t *tape, char __user *buf, idetape_stage_t *stage, int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct idetape_bh *bh = tape-&gt;bh;</div><div class='ctx'> 	int count;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (n) {</div><div class='ctx'> #if IDETAPE_DEBUG_BUGS</div><div class='ctx'> 		if (bh == NULL) {</div><div class='ctx'> 			printk(KERN_ERR "ide-tape: bh == NULL in "</div><div class='ctx'> 				"idetape_copy_stage_to_user\n");</div><div class='del'>-			return;</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> #endif /* IDETAPE_DEBUG_BUGS */</div><div class='ctx'> 		count = min(tape-&gt;b_count, n);</div><div class='del'>-		copy_to_user(buf, tape-&gt;b_data, count);</div><div class='add'>+		if  (copy_to_user(buf, tape-&gt;b_data, count))</div><div class='add'>+			ret = 1;</div><div class='ctx'> 		n -= count;</div><div class='ctx'> 		tape-&gt;b_data += count;</div><div class='ctx'> 		tape-&gt;b_count -= count;</div><div class='hunk'>@@ -2700,6 +2703,7 @@ static void idetape_copy_stage_to_user (idetape_tape_t *tape, char __user *buf,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void idetape_init_merge_stage (idetape_tape_t *tape)</div><div class='hunk'>@@ -3719,6 +3723,7 @@ static ssize_t idetape_chrdev_read (struct file *file, char __user *buf,</div><div class='ctx'> 	struct ide_tape_obj *tape = ide_tape_f(file);</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='ctx'> 	ssize_t bytes_read,temp, actually_read = 0, rc;</div><div class='add'>+	ssize_t ret = 0;</div><div class='ctx'> </div><div class='ctx'> #if IDETAPE_DEBUG_LOG</div><div class='ctx'> 	if (tape-&gt;debug_level &gt;= 3)</div><div class='hunk'>@@ -3737,7 +3742,8 @@ static ssize_t idetape_chrdev_read (struct file *file, char __user *buf,</div><div class='ctx'> 		return (0);</div><div class='ctx'> 	if (tape-&gt;merge_stage_size) {</div><div class='ctx'> 		actually_read = min((unsigned int)(tape-&gt;merge_stage_size), (unsigned int)count);</div><div class='del'>-		idetape_copy_stage_to_user(tape, buf, tape-&gt;merge_stage, actually_read);</div><div class='add'>+		if (idetape_copy_stage_to_user(tape, buf, tape-&gt;merge_stage, actually_read))</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 		buf += actually_read;</div><div class='ctx'> 		tape-&gt;merge_stage_size -= actually_read;</div><div class='ctx'> 		count -= actually_read;</div><div class='hunk'>@@ -3746,7 +3752,8 @@ static ssize_t idetape_chrdev_read (struct file *file, char __user *buf,</div><div class='ctx'> 		bytes_read = idetape_add_chrdev_read_request(drive, tape-&gt;capabilities.ctl);</div><div class='ctx'> 		if (bytes_read &lt;= 0)</div><div class='ctx'> 			goto finish;</div><div class='del'>-		idetape_copy_stage_to_user(tape, buf, tape-&gt;merge_stage, bytes_read);</div><div class='add'>+		if (idetape_copy_stage_to_user(tape, buf, tape-&gt;merge_stage, bytes_read))</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 		buf += bytes_read;</div><div class='ctx'> 		count -= bytes_read;</div><div class='ctx'> 		actually_read += bytes_read;</div><div class='hunk'>@@ -3756,7 +3763,8 @@ static ssize_t idetape_chrdev_read (struct file *file, char __user *buf,</div><div class='ctx'> 		if (bytes_read &lt;= 0)</div><div class='ctx'> 			goto finish;</div><div class='ctx'> 		temp = min((unsigned long)count, (unsigned long)bytes_read);</div><div class='del'>-		idetape_copy_stage_to_user(tape, buf, tape-&gt;merge_stage, temp);</div><div class='add'>+		if (idetape_copy_stage_to_user(tape, buf, tape-&gt;merge_stage, temp))</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 		actually_read += temp;</div><div class='ctx'> 		tape-&gt;merge_stage_size = bytes_read-temp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3769,7 +3777,8 @@ finish:</div><div class='ctx'> 		idetape_space_over_filemarks(drive, MTFSF, 1);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return actually_read;</div><div class='add'>+</div><div class='add'>+	return (ret) ? ret : actually_read;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,</div><div class='hunk'>@@ -3777,7 +3786,8 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct ide_tape_obj *tape = ide_tape_f(file);</div><div class='ctx'> 	ide_drive_t *drive = tape-&gt;drive;</div><div class='del'>-	ssize_t retval, actually_written = 0;</div><div class='add'>+	ssize_t actually_written = 0;</div><div class='add'>+	ssize_t ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* The drive is write protected. */</div><div class='ctx'> 	if (tape-&gt;write_prot)</div><div class='hunk'>@@ -3813,7 +3823,7 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,</div><div class='ctx'> 		 *	some drives (Seagate STT3401A) will return an error.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (drive-&gt;dsc_overlap) {</div><div class='del'>-			retval = idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 0, tape-&gt;merge_stage-&gt;bh);</div><div class='add'>+			ssize_t retval = idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 0, tape-&gt;merge_stage-&gt;bh);</div><div class='ctx'> 			if (retval &lt; 0) {</div><div class='ctx'> 				__idetape_kfree_stage(tape-&gt;merge_stage);</div><div class='ctx'> 				tape-&gt;merge_stage = NULL;</div><div class='hunk'>@@ -3834,12 +3844,14 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,</div><div class='ctx'> 		}</div><div class='ctx'> #endif /* IDETAPE_DEBUG_BUGS */</div><div class='ctx'> 		actually_written = min((unsigned int)(tape-&gt;stage_size - tape-&gt;merge_stage_size), (unsigned int)count);</div><div class='del'>-		idetape_copy_stage_from_user(tape, tape-&gt;merge_stage, buf, actually_written);</div><div class='add'>+		if (idetape_copy_stage_from_user(tape, tape-&gt;merge_stage, buf, actually_written))</div><div class='add'>+				ret = -EFAULT;</div><div class='ctx'> 		buf += actually_written;</div><div class='ctx'> 		tape-&gt;merge_stage_size += actually_written;</div><div class='ctx'> 		count -= actually_written;</div><div class='ctx'> </div><div class='ctx'> 		if (tape-&gt;merge_stage_size == tape-&gt;stage_size) {</div><div class='add'>+			ssize_t retval;</div><div class='ctx'> 			tape-&gt;merge_stage_size = 0;</div><div class='ctx'> 			retval = idetape_add_chrdev_write_request(drive, tape-&gt;capabilities.ctl);</div><div class='ctx'> 			if (retval &lt;= 0)</div><div class='hunk'>@@ -3847,7 +3859,9 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	while (count &gt;= tape-&gt;stage_size) {</div><div class='del'>-		idetape_copy_stage_from_user(tape, tape-&gt;merge_stage, buf, tape-&gt;stage_size);</div><div class='add'>+		ssize_t retval;</div><div class='add'>+		if (idetape_copy_stage_from_user(tape, tape-&gt;merge_stage, buf, tape-&gt;stage_size))</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 		buf += tape-&gt;stage_size;</div><div class='ctx'> 		count -= tape-&gt;stage_size;</div><div class='ctx'> 		retval = idetape_add_chrdev_write_request(drive, tape-&gt;capabilities.ctl);</div><div class='hunk'>@@ -3857,10 +3871,11 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (count) {</div><div class='ctx'> 		actually_written += count;</div><div class='del'>-		idetape_copy_stage_from_user(tape, tape-&gt;merge_stage, buf, count);</div><div class='add'>+		if (idetape_copy_stage_from_user(tape, tape-&gt;merge_stage, buf, count))</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 		tape-&gt;merge_stage_size += count;</div><div class='ctx'> 	}</div><div class='del'>-	return (actually_written);</div><div class='add'>+	return (ret) ? ret : actually_written;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int idetape_write_filemark (ide_drive_t *drive)</div><div class='hunk'>@@ -4709,9 +4724,6 @@ static void ide_tape_release(struct kref *kref)</div><div class='ctx'> 			MKDEV(IDETAPE_MAJOR, tape-&gt;minor));</div><div class='ctx'> 	class_device_destroy(idetape_sysfs_class,</div><div class='ctx'> 			MKDEV(IDETAPE_MAJOR, tape-&gt;minor + 128));</div><div class='del'>-	devfs_remove("%s/mt", drive-&gt;devfs_name);</div><div class='del'>-	devfs_remove("%s/mtn", drive-&gt;devfs_name);</div><div class='del'>-	devfs_unregister_tape(g-&gt;number);</div><div class='ctx'> 	idetape_devs[tape-&gt;minor] = NULL;</div><div class='ctx'> 	g-&gt;private_data = NULL;</div><div class='ctx'> 	put_disk(g);</div><div class='hunk'>@@ -4885,14 +4897,6 @@ static int ide_tape_probe(ide_drive_t *drive)</div><div class='ctx'> 	class_device_create(idetape_sysfs_class, NULL,</div><div class='ctx'> 			MKDEV(IDETAPE_MAJOR, minor + 128), &amp;drive-&gt;gendev, "n%s", tape-&gt;name);</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(HWIF(drive)-&gt;major, minor),</div><div class='del'>-			S_IFCHR | S_IRUGO | S_IWUGO,</div><div class='del'>-			"%s/mt", drive-&gt;devfs_name);</div><div class='del'>-	devfs_mk_cdev(MKDEV(HWIF(drive)-&gt;major, minor + 128),</div><div class='del'>-			S_IFCHR | S_IRUGO | S_IWUGO,</div><div class='del'>-			"%s/mtn", drive-&gt;devfs_name);</div><div class='del'>-</div><div class='del'>-	g-&gt;number = devfs_register_tape(drive-&gt;devfs_name);</div><div class='ctx'> 	g-&gt;fops = &amp;idetape_block_ops;</div><div class='ctx'> 	ide_register_region(g);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c<br/>index 9233b8109a0f..97a9244312fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-taskfile.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-taskfile.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-taskfile.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-taskfile.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *	request.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -196,8 +195,7 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive)</div><div class='ctx'> 	if (stat &amp; (ERR_STAT|DRQ_STAT))</div><div class='ctx'> 		return ide_error(drive, "set_geometry_intr", stat);</div><div class='ctx'> </div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 	ide_set_handler(drive, &amp;set_geometry_intr, WAIT_WORSTCASE, NULL);</div><div class='ctx'> 	return ide_started;</div><div class='ctx'> }</div><div class='hunk'>@@ -224,7 +222,7 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive)</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	u8 stat;</div><div class='ctx'> </div><div class='del'>-	local_irq_enable();</div><div class='add'>+	local_irq_enable_in_hardirq();</div><div class='ctx'> 	if (!OK_STAT(stat = hwif-&gt;INB(IDE_STATUS_REG),READY_STAT,BAD_STAT)) {</div><div class='ctx'> 		return ide_error(drive, "task_no_data_intr", stat);</div><div class='ctx'> 		/* calls ide_end_drive_cmd */</div><div class='head'>diff --git a/drivers/ide/ide-timing.h b/drivers/ide/ide-timing.h<br/>index 2fcfac6e967a..c0864b1e9228 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide-timing.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide-timing.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide-timing.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide-timing.h</a></div><div class='hunk'>@@ -220,6 +220,12 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Copy the timing from the table.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	*t = *s;</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * If the drive is an EIDE drive, it can tell us it needs extended</div><div class='ctx'>  * PIO/MWDMA cycle timing.</div><div class='ctx'>  */</div><div class='hunk'>@@ -247,7 +253,7 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing</div><div class='ctx'>  * Convert the timing to bus clock counts.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-	ide_timing_quantize(s, t, T, UT);</div><div class='add'>+	ide_timing_quantize(t, t, T, UT);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Even in DMA/UDMA modes we still use PIO access for IDENTIFY, S.M.A.R.T</div><div class='head'>diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c<br/>index 3fdab563fec2..05fbd9298db7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ide.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ide.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ide.c</a></div><div class='hunk'>@@ -130,7 +130,6 @@</div><div class='ctx'> </div><div class='ctx'> #define _IDE_C			/* Tell ide.h it's really us */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -147,7 +146,6 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='hunk'>@@ -592,13 +590,8 @@ void ide_unregister(unsigned int index)</div><div class='ctx'> 		goto abort;</div><div class='ctx'> 	for (unit = 0; unit &lt; MAX_DRIVES; ++unit) {</div><div class='ctx'> 		drive = &amp;hwif-&gt;drives[unit];</div><div class='del'>-		if (!drive-&gt;present) {</div><div class='del'>-			if (drive-&gt;devfs_name[0] != '\0') {</div><div class='del'>-				devfs_remove(drive-&gt;devfs_name);</div><div class='del'>-				drive-&gt;devfs_name[0] = '\0';</div><div class='del'>-			}</div><div class='add'>+		if (!drive-&gt;present)</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='ctx'> 		spin_unlock_irq(&amp;ide_lock);</div><div class='ctx'> 		device_unregister(&amp;drive-&gt;gendev);</div><div class='ctx'> 		wait_for_completion(&amp;drive-&gt;gendev_rel_comp);</div><div class='hunk'>@@ -726,6 +719,7 @@ void ide_setup_ports (	hw_regs_t *hw,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	memset(hw, 0, sizeof(hw_regs_t));</div><div class='ctx'> 	for (i = 0; i &lt; IDE_NR_PORTS; i++) {</div><div class='ctx'> 		if (offsets[i] == -1) {</div><div class='ctx'> 			switch(i) {</div><div class='hunk'>@@ -1225,7 +1219,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)</div><div class='ctx'> 	memset(&amp;args, 0, sizeof(args));</div><div class='ctx'> 	rq.flags = REQ_PM_SUSPEND;</div><div class='ctx'> 	rq.special = &amp;args;</div><div class='del'>-	rq.pm = &amp;rqpm;</div><div class='add'>+	rq.end_io_data = &amp;rqpm;</div><div class='ctx'> 	rqpm.pm_step = ide_pm_state_start_suspend;</div><div class='ctx'> 	rqpm.pm_state = state.event;</div><div class='ctx'> </div><div class='hunk'>@@ -1244,7 +1238,7 @@ static int generic_ide_resume(struct device *dev)</div><div class='ctx'> 	memset(&amp;args, 0, sizeof(args));</div><div class='ctx'> 	rq.flags = REQ_PM_RESUME;</div><div class='ctx'> 	rq.special = &amp;args;</div><div class='del'>-	rq.pm = &amp;rqpm;</div><div class='add'>+	rq.end_io_data = &amp;rqpm;</div><div class='ctx'> 	rqpm.pm_step = ide_pm_state_start_resume;</div><div class='ctx'> 	rqpm.pm_state = PM_EVENT_ON;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,8 +1360,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device</div><div class='ctx'> </div><div class='ctx'> 			ide_abort(drive, "drive reset");</div><div class='ctx'> </div><div class='del'>-			if(HWGROUP(drive)-&gt;handler)</div><div class='del'>-				BUG();</div><div class='add'>+			BUG_ON(HWGROUP(drive)-&gt;handler);</div><div class='ctx'> 				</div><div class='ctx'> 			/* Ensure nothing gets queued after we</div><div class='ctx'> 			   drop the lock. Reset will clear the busy */</div><div class='hunk'>@@ -1996,7 +1989,6 @@ EXPORT_SYMBOL_GPL(ide_bus_type);</div><div class='ctx'> static int __init ide_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "Uniform Multi-Platform E-IDE driver " REVISION "\n");</div><div class='del'>-	devfs_mk_dir("ide");</div><div class='ctx'> 	system_bus_speed = ide_system_bus_speed();</div><div class='ctx'> </div><div class='ctx'> 	bus_register(&amp;ide_bus_type);</div><div class='hunk'>@@ -2074,7 +2066,6 @@ void cleanup_module (void)</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> 	proc_ide_destroy();</div><div class='ctx'> #endif</div><div class='del'>-	devfs_remove("ide");</div><div class='ctx'> </div><div class='ctx'> 	bus_unregister(&amp;ide_bus_type);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c<br/>index fb88711812e6..9c544467cb74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/ali14xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/ali14xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/ali14xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/ali14xx.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #undef REALLY_SLOW_IO           /* most systems can safely undef this */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c<br/>index 20eb5b872ca9..3b1d33baaa2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/dtc2278.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/dtc2278.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/dtc2278.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/dtc2278.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #undef REALLY_SLOW_IO           /* most systems can safely undef this */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c<br/>index 3fac3e9ec47d..64d42619ab06 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/gayle.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/gayle.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/gayle.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/gayle.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c<br/>index 6439dec66881..aebecd8f51cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/hd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/hd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/hd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/hd.c</a></div><div class='hunk'>@@ -691,7 +691,7 @@ static struct block_device_operations hd_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This is the hard disk IRQ description. The SA_INTERRUPT in sa_flags</div><div class='add'>+ * This is the hard disk IRQ description. The IRQF_DISABLED in sa_flags</div><div class='ctx'>  * means we run the IRQ-handler with interrupts disabled:  this is bad for</div><div class='ctx'>  * interrupt latency, but anything else has led to problems on some</div><div class='ctx'>  * machines.</div><div class='hunk'>@@ -806,7 +806,7 @@ static int __init hd_init(void)</div><div class='ctx'> 			p-&gt;cyl, p-&gt;head, p-&gt;sect);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(HD_IRQ, hd_interrupt, SA_INTERRUPT, "hd", NULL)) {</div><div class='add'>+	if (request_irq(HD_IRQ, hd_interrupt, IRQF_DISABLED, "hd", NULL)) {</div><div class='ctx'> 		printk("hd: unable to get IRQ%d for the hard disk driver\n",</div><div class='ctx'> 			HD_IRQ);</div><div class='ctx'> 		goto out1;</div><div class='head'>diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c<br/>index a77fb249d5cf..c48e87e512d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/ht6560b.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/ht6560b.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/ht6560b.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/ht6560b.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #undef REALLY_SLOW_IO		/* most systems can safely undef this */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c<br/>index 90cac609d9cf..d655da749144 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/macide.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/macide.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/macide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/macide.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c<br/>index 2a78b792f7fb..434a94faa3b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/q40ide.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/q40ide.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/q40ide.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/q40ide.c</a></div><div class='hunk'>@@ -80,6 +80,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	memset(hw, 0, sizeof(hw_regs_t));</div><div class='ctx'> 	for (i = 0; i &lt; IDE_NR_PORTS; i++) {</div><div class='ctx'> 		/* BIG FAT WARNING: </div><div class='ctx'> 		   assumption: only DATA port is ever used in 16 bit mode */</div><div class='head'>diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c<br/>index 563fab0098be..d3c3bc2640e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/qd65xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/qd65xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/qd65xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/qd65xx.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #undef REALLY_SLOW_IO		/* most systems can safely undef this */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c<br/>index cdbdb2ff9f15..6e2c58c5f6a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/legacy/umc8672.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/legacy/umc8672.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/legacy/umc8672.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/legacy/umc8672.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #define REALLY_SLOW_IO		/* some systems can safely undef this */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c<br/>index c743e68c33aa..a7c725f8bf64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/aec62xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/aec62xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/aec62xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/aec62xx.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -22,7 +21,7 @@ struct chipset_bus_clock_list_entry {</div><div class='ctx'> 	u8 ultra_settings;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct chipset_bus_clock_list_entry aec6xxx_33_base [] = {</div><div class='add'>+static const struct chipset_bus_clock_list_entry aec6xxx_33_base [] = {</div><div class='ctx'> 	{	XFER_UDMA_6,	0x31,	0x07	},</div><div class='ctx'> 	{	XFER_UDMA_5,	0x31,	0x06	},</div><div class='ctx'> 	{	XFER_UDMA_4,	0x31,	0x05	},</div><div class='hunk'>@@ -42,7 +41,7 @@ static struct chipset_bus_clock_list_entry aec6xxx_33_base [] = {</div><div class='ctx'> 	{	0,		0x00,	0x00	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct chipset_bus_clock_list_entry aec6xxx_34_base [] = {</div><div class='add'>+static const struct chipset_bus_clock_list_entry aec6xxx_34_base [] = {</div><div class='ctx'> 	{	XFER_UDMA_6,	0x41,	0x06	},</div><div class='ctx'> 	{	XFER_UDMA_5,	0x41,	0x05	},</div><div class='ctx'> 	{	XFER_UDMA_4,	0x41,	0x04	},</div><div class='hunk'>@@ -254,7 +253,8 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;resource[PCI_ROM_RESOURCE].start) {</div><div class='ctx'> 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev-&gt;resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);</div><div class='del'>-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='add'>+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,</div><div class='add'>+			(unsigned long)dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bus_speed &lt;= 33)</div><div class='hunk'>@@ -425,12 +425,12 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi</div><div class='ctx'> 	return d-&gt;init_setup(dev, d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id aec62xx_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP850UF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='del'>-	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },</div><div class='del'>-	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860R,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },</div><div class='del'>-	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },</div><div class='del'>-	{ PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865R,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },</div><div class='add'>+static const struct pci_device_id aec62xx_pci_tbl[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP850UF), 0 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860), 1 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860R), 2 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865), 3 },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP865R), 4 },</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, aec62xx_pci_tbl);</div><div class='head'>diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c<br/>index 8b24b4f2a839..351dab2fcacf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/alim15x3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/alim15x3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/alim15x3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/alim15x3.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c<br/>index b22ee5462318..2b0ea8b6608d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/amd74xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/amd74xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/amd74xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/amd74xx.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -74,6 +73,8 @@ static struct amd_ide_chip {</div><div class='ctx'> 	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,	0x50, AMD_UDMA_133 },</div><div class='ctx'> 	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,	0x50, AMD_UDMA_133 },</div><div class='ctx'> 	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	0x50, AMD_UDMA_133 },</div><div class='add'>+	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	0x50, AMD_UDMA_133 },</div><div class='add'>+	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,	0x50, AMD_UDMA_133 },</div><div class='ctx'> 	{ PCI_DEVICE_ID_AMD_CS5536_IDE,			0x40, AMD_UDMA_100 },</div><div class='ctx'> 	{ 0 }</div><div class='ctx'> };</div><div class='hunk'>@@ -488,7 +489,9 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {</div><div class='ctx'> 	/* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"),</div><div class='ctx'> 	/* 15 */ DECLARE_NV_DEV("NFORCE-MCP51"),</div><div class='ctx'> 	/* 16 */ DECLARE_NV_DEV("NFORCE-MCP55"),</div><div class='del'>-	/* 17 */ DECLARE_AMD_DEV("AMD5536"),</div><div class='add'>+	/* 17 */ DECLARE_NV_DEV("NFORCE-MCP61"),</div><div class='add'>+	/* 18 */ DECLARE_NV_DEV("NFORCE-MCP65"),</div><div class='add'>+	/* 19 */ DECLARE_AMD_DEV("AMD5536"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='hunk'>@@ -525,7 +528,9 @@ static struct pci_device_id amd74xx_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },</div><div class='ctx'> 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },</div><div class='ctx'> 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },</div><div class='del'>-	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },</div><div class='add'>+	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19 },</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);</div><div class='head'>diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c<br/>index 900efd1da587..a574de5f0835 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/atiixp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/atiixp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/atiixp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/atiixp.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c<br/>index 11d035f1983d..61b5f9c0b2f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cmd640.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cmd640.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cmd640.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/cmd640.c</a></div><div class='hunk'>@@ -103,7 +103,6 @@</div><div class='ctx'> </div><div class='ctx'> //#define CMD640_DUMP_REGS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c<br/>index 3d9c7afc8695..20c32716bbc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cmd64x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cmd64x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cmd64x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/cmd64x.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * Copyright (C) 1999-2002	Andre Hedrick &lt;andre@linux-ide.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -190,14 +189,6 @@ static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count)</div><div class='ctx'> #endif	/* defined(DISPLAY_CMD64X_TIMINGS) &amp;&amp; defined(CONFIG_PROC_FS) */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Registers and masks for easy access by drive index:</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-static u8 prefetch_regs[4]  = {CNTRL, CNTRL, ARTTIM23, ARTTIM23};</div><div class='del'>-static u8 prefetch_masks[4] = {CNTRL_DIS_RA0, CNTRL_DIS_RA1, ARTTIM23_DIS_RA2, ARTTIM23_DIS_RA3};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This routine writes the prepared setup/active/recovery counts</div><div class='ctx'>  * for a drive into the cmd646 chipset registers to active them.</div><div class='ctx'>  */</div><div class='hunk'>@@ -606,13 +597,6 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha</div><div class='ctx'> 	pci_read_config_dword(dev, PCI_CLASS_REVISION, &amp;class_rev);</div><div class='ctx'> 	class_rev &amp;= 0xff;</div><div class='ctx'> </div><div class='del'>-#ifdef __i386__</div><div class='del'>-	if (dev-&gt;resource[PCI_ROM_RESOURCE].start) {</div><div class='del'>-		pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev-&gt;resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);</div><div class='del'>-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	switch(dev-&gt;device) {</div><div class='ctx'> 		case PCI_DEVICE_ID_CMD_643:</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c<br/>index ea3c52cc8ac1..079f7c86726b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5520.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cs5520.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5520.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/cs5520.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c<br/>index 09269e574b3e..380bb28c7c54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5530.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cs5530.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5530.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/cs5530.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *	CS5530 documentation available from National Semiconductor.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c<br/>index 6eb305197f3c..5c5aec28e671 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5535.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cs5535.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cs5535.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/cs5535.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *  CS5535 documentation available from AMD</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ide.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c<br/>index 9f41ecd56338..120929fbe7a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/cy82c693.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/cy82c693.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/cy82c693.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/cy82c693.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c<br/>index f82e82109728..2f962cfa3f7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/generic.c</a></div><div class='hunk'>@@ -212,6 +212,9 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi</div><div class='ctx'> 	    (!(PCI_FUNC(dev-&gt;devfn) &amp; 1)))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;vendor == PCI_VENDOR_ID_JMICRON &amp;&amp; PCI_FUNC(dev-&gt;devfn) != 1)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	pci_read_config_word(dev, PCI_COMMAND, &amp;command);</div><div class='ctx'> 	if (!(command &amp; PCI_COMMAND_IO)) {</div><div class='ctx'> 		printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d-&gt;name);</div><div class='hunk'>@@ -239,6 +242,11 @@ static struct pci_device_id generic_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},</div><div class='ctx'> 	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13},</div><div class='ctx'> 	{ PCI_VENDOR_ID_NETCELL,PCI_DEVICE_ID_REVOLUTION,          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14},</div><div class='add'>+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15},</div><div class='add'>+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16},</div><div class='add'>+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17},</div><div class='add'>+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18},</div><div class='add'>+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19},</div><div class='ctx'> 	/* Must come last. If you add entries adjust this table appropriately and the init_one code */</div><div class='ctx'> 	{ PCI_ANY_ID,		PCI_ANY_ID,			   PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE &lt;&lt; 8, 0xFFFFFF00UL, 0},</div><div class='ctx'> 	{ 0, },</div><div class='head'>diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c<br/>index be334da7a754..b46cb042290a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/hpt34x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/hpt34x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/hpt34x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/hpt34x.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * Non-bootable card or HPT343 :: pcicmd == 0x05</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -176,7 +175,7 @@ static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev, const cha</div><div class='ctx'> 			pci_write_config_dword(dev, PCI_ROM_ADDRESS,</div><div class='ctx'> 				dev-&gt;resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);</div><div class='ctx'> 			printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",</div><div class='del'>-				dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='add'>+				(unsigned long)dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='ctx'> 		}</div><div class='ctx'> 		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c<br/>index 940bdd4c5784..e993a51f250e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/hpt366.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/hpt366.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/hpt366.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/hpt366.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c<br/>index 93462926b9d5..0fc89fafad65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/it8172.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/it8172.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/it8172.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/it8172.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c<br/>index 38f41b377ff6..3cb04424d351 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/it821x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/it821x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/it821x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/it821x.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@</div><div class='ctx'>  *	-	Move to libata once it grows up</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -651,6 +650,8 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)</div><div class='ctx'> 	}</div><div class='ctx'> 	ide_set_hwifdata(hwif, idev);</div><div class='ctx'> </div><div class='add'>+	hwif-&gt;atapi_dma = 1;</div><div class='add'>+</div><div class='ctx'> 	pci_read_config_byte(hwif-&gt;pci_dev, 0x50, &amp;conf);</div><div class='ctx'> 	if(conf &amp; 1) {</div><div class='ctx'> 		idev-&gt;smart = 1;</div><div class='head'>diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c<br/>index fcd5142f5cfe..d95714bcee4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/ns87415.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/ns87415.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/ns87415.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/ns87415.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Inspired by an earlier effort from David S. Miller &lt;davem@redhat.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c<br/>index acd63173199b..6c097e80b4df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_new.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/pdc202xx_new.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_new.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/pdc202xx_new.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *  Released under terms of General Public License</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -313,8 +312,8 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha</div><div class='ctx'> 	if (dev-&gt;resource[PCI_ROM_RESOURCE].start) {</div><div class='ctx'> 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,</div><div class='ctx'> 			dev-&gt;resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);</div><div class='del'>-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",</div><div class='del'>-			name, dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='add'>+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,</div><div class='add'>+			(unsigned long)dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PMAC</div><div class='hunk'>@@ -338,6 +337,8 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;ultra_mask = 0x7f;</div><div class='ctx'> 	hwif-&gt;mwdma_mask = 0x07;</div><div class='ctx'> </div><div class='add'>+	hwif-&gt;err_stops_fifo = 1;</div><div class='add'>+</div><div class='ctx'> 	hwif-&gt;ide_dma_check = &amp;pdcnew_config_drive_xfer_rate;</div><div class='ctx'> 	hwif-&gt;ide_dma_lostirq = &amp;pdcnew_ide_dma_lostirq;</div><div class='ctx'> 	hwif-&gt;ide_dma_timeout = &amp;pdcnew_ide_dma_timeout;</div><div class='head'>diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c<br/>index 7ce5bf783688..b46022a11bef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_old.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/pdc202xx_old.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/pdc202xx_old.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/pdc202xx_old.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *  Released under terms of General Public License</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -101,31 +100,6 @@ static const char *pdc_quirk_drives[] = {</div><div class='ctx'> #define	MC1		0x02	/* DMA"C" timing */</div><div class='ctx'> #define	MC0		0x01	/* DMA"C" timing */</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	unsigned long bibma  = pci_resource_start(dev, 4);</div><div class='del'>-	u8 hi = 0, lo = 0;</div><div class='del'>-</div><div class='del'>-	u8 sc1c	= inb_p((u16)bibma + 0x1c); </div><div class='del'>-	u8 sc1e	= inb_p((u16)bibma + 0x1e);</div><div class='del'>-	u8 sc1f	= inb_p((u16)bibma + 0x1f);</div><div class='del'>-</div><div class='del'>-	p += sprintf(p, "Host Mode                            : %s\n",</div><div class='del'>-		(sc1f &amp; 0x08) ? "Tri-Stated" : "Normal");</div><div class='del'>-	p += sprintf(p, "Bus Clocking                         : %s\n",</div><div class='del'>-		((sc1f &amp; 0xC0) == 0xC0) ? "100 External" :</div><div class='del'>-		((sc1f &amp; 0x80) == 0x80) ? "66 External" :</div><div class='del'>-		((sc1f &amp; 0x40) == 0x40) ? "33 External" : "33 PCI Internal");</div><div class='del'>-	p += sprintf(p, "IO pad select                        : %s mA\n",</div><div class='del'>-		((sc1c &amp; 0x03) == 0x03) ? "10" :</div><div class='del'>-		((sc1c &amp; 0x02) == 0x02) ? "8" :</div><div class='del'>-		((sc1c &amp; 0x01) == 0x01) ? "6" :</div><div class='del'>-		((sc1c &amp; 0x00) == 0x00) ? "4" : "??");</div><div class='del'>-	hi = sc1e &gt;&gt; 4;</div><div class='del'>-	lo = sc1e &amp; 0xf;</div><div class='del'>-	p += sprintf(p, "Status Polling Period                : %d\n", hi);</div><div class='del'>-	p += sprintf(p, "Interrupt Check Status Polling Delay : %d\n", lo);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static u8 pdc202xx_ratemask (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mode;</div><div class='hunk'>@@ -370,7 +344,6 @@ chipset_is_set:</div><div class='ctx'> 	if (!(speed)) {</div><div class='ctx'> 		/* restore original pci-config space */</div><div class='ctx'> 		pci_write_config_dword(dev, drive_pci, drive_conf);</div><div class='del'>-		hwif-&gt;tuneproc(drive, 5);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -415,8 +388,6 @@ static void pdc202xx_old_ide_dma_start(ide_drive_t *drive)</div><div class='ctx'> 	if (drive-&gt;addressing == 1) {</div><div class='ctx'> 		struct request *rq	= HWGROUP(drive)-&gt;rq;</div><div class='ctx'> 		ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-//		struct pci_dev *dev	= hwif-&gt;pci_dev;</div><div class='del'>-//		unsgned long high_16	= pci_resource_start(dev, 4);</div><div class='ctx'> 		unsigned long high_16   = hwif-&gt;dma_master;</div><div class='ctx'> 		unsigned long atapi_reg	= high_16 + (hwif-&gt;channel ? 0x24 : 0x20);</div><div class='ctx'> 		u32 word_count	= 0;</div><div class='hunk'>@@ -436,7 +407,6 @@ static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	if (drive-&gt;addressing == 1) {</div><div class='ctx'> 		ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-//		unsigned long high_16	= pci_resource_start(hwif-&gt;pci_dev, 4);</div><div class='ctx'> 		unsigned long high_16	= hwif-&gt;dma_master;</div><div class='ctx'> 		unsigned long atapi_reg	= high_16 + (hwif-&gt;channel ? 0x24 : 0x20);</div><div class='ctx'> 		u8 clock		= 0;</div><div class='hunk'>@@ -453,8 +423,6 @@ static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)</div><div class='ctx'> static int pdc202xx_old_ide_dma_test_irq(ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-//	struct pci_dev *dev	= hwif-&gt;pci_dev;</div><div class='del'>-//	unsigned long high_16	= pci_resource_start(dev, 4);</div><div class='ctx'> 	unsigned long high_16	= hwif-&gt;dma_master;</div><div class='ctx'> 	u8 dma_stat		= hwif-&gt;INB(hwif-&gt;dma_status);</div><div class='ctx'> 	u8 sc1d			= hwif-&gt;INB((high_16 + 0x001d));</div><div class='hunk'>@@ -492,12 +460,7 @@ static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)</div><div class='ctx'> </div><div class='ctx'> static void pdc202xx_reset_host (ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA</div><div class='del'>-//	unsigned long high_16	= hwif-&gt;dma_base - (8*(hwif-&gt;channel));</div><div class='ctx'> 	unsigned long high_16	= hwif-&gt;dma_master;</div><div class='del'>-#else /* !CONFIG_BLK_DEV_IDEDMA */</div><div class='del'>-	unsigned long high_16	= pci_resource_start(hwif-&gt;pci_dev, 4);</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA */</div><div class='ctx'> 	u8 udma_speed_flag	= hwif-&gt;INB(high_16|0x001f);</div><div class='ctx'> </div><div class='ctx'> 	hwif-&gt;OUTB((udma_speed_flag | 0x10), (high_16|0x001f));</div><div class='hunk'>@@ -516,98 +479,20 @@ static void pdc202xx_reset (ide_drive_t *drive)</div><div class='ctx'> 	</div><div class='ctx'> 	pdc202xx_reset_host(hwif);</div><div class='ctx'> 	pdc202xx_reset_host(mate);</div><div class='del'>-#if 0</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Have to kick all the drives again :-/</div><div class='del'>-	 * What a pain in the ACE!</div><div class='del'>-	 */</div><div class='del'>-	if (hwif-&gt;present) {</div><div class='del'>-		u16 hunit = 0;</div><div class='del'>-		for (hunit = 0; hunit &lt; MAX_DRIVES; ++hunit) {</div><div class='del'>-			ide_drive_t *hdrive = &amp;hwif-&gt;drives[hunit];</div><div class='del'>-			if (hdrive-&gt;present) {</div><div class='del'>-				if (hwif-&gt;ide_dma_check)</div><div class='del'>-					hwif-&gt;ide_dma_check(hdrive);</div><div class='del'>-				else</div><div class='del'>-					hwif-&gt;tuneproc(hdrive, 5);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (mate-&gt;present) {</div><div class='del'>-		u16 munit = 0;</div><div class='del'>-		for (munit = 0; munit &lt; MAX_DRIVES; ++munit) {</div><div class='del'>-			ide_drive_t *mdrive = &amp;mate-&gt;drives[munit];</div><div class='del'>-			if (mdrive-&gt;present) {</div><div class='del'>-				if (mate-&gt;ide_dma_check) </div><div class='del'>-					mate-&gt;ide_dma_check(mdrive);</div><div class='del'>-				else</div><div class='del'>-					mate-&gt;tuneproc(mdrive, 5);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='ctx'> 	hwif-&gt;tuneproc(drive, 5);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Since SUN Cobalt is attempting to do this operation, I should disclose</div><div class='del'>- * this has been a long time ago Thu Jul 27 16:40:57 2000 was the patch date</div><div class='del'>- * HOTSWAP ATA Infrastructure.</div><div class='del'>- */</div><div class='del'>-static int pdc202xx_tristate (ide_drive_t * drive, int state)</div><div class='del'>-{</div><div class='del'>-	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-//	unsigned long high_16	= hwif-&gt;dma_base - (8*(hwif-&gt;channel));</div><div class='del'>-	unsigned long high_16	= hwif-&gt;dma_master;</div><div class='del'>-	u8 sc1f			= hwif-&gt;INB(high_16|0x001f);</div><div class='del'>-</div><div class='del'>-	if (!hwif)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-//	hwif-&gt;bus_state = state;</div><div class='del'>-</div><div class='del'>-	if (state) {</div><div class='del'>-		hwif-&gt;OUTB(sc1f | 0x08, (high_16|0x001f));</div><div class='del'>-	} else {</div><div class='del'>-		hwif-&gt;OUTB(sc1f &amp; ~0x08, (high_16|0x001f));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev, const char *name)</div><div class='add'>+static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,</div><div class='add'>+							const char *name)</div><div class='ctx'> {</div><div class='add'>+	/* This doesn't appear needed */</div><div class='ctx'> 	if (dev-&gt;resource[PCI_ROM_RESOURCE].start) {</div><div class='ctx'> 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,</div><div class='ctx'> 			dev-&gt;resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);</div><div class='del'>-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",</div><div class='del'>-			name, dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='add'>+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,</div><div class='add'>+			(unsigned long)dev-&gt;resource[PCI_ROM_RESOURCE].start);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * software reset -  this is required because the bios</div><div class='del'>-	 * will set UDMA timing on if the hdd supports it. The</div><div class='del'>-	 * user may want to turn udma off. A bug in the pdc20262</div><div class='del'>-	 * is that it cannot handle a downgrade in timing from</div><div class='del'>-	 * UDMA to DMA. Disk accesses after issuing a set</div><div class='del'>-	 * feature command will result in errors. A software</div><div class='del'>-	 * reset leaves the timing registers intact,</div><div class='del'>-	 * but resets the drives.</div><div class='del'>-	 */</div><div class='del'>-#if 0</div><div class='del'>-	if ((dev-&gt;device == PCI_DEVICE_ID_PROMISE_20267) ||</div><div class='del'>-	    (dev-&gt;device == PCI_DEVICE_ID_PROMISE_20265) ||</div><div class='del'>-	    (dev-&gt;device == PCI_DEVICE_ID_PROMISE_20263) ||</div><div class='del'>-	    (dev-&gt;device == PCI_DEVICE_ID_PROMISE_20262)) {</div><div class='del'>-		unsigned long high_16	= pci_resource_start(dev, 4);</div><div class='del'>-		byte udma_speed_flag	= inb(high_16 + 0x001f);</div><div class='del'>-		outb(udma_speed_flag | 0x10, high_16 + 0x001f);</div><div class='del'>-		mdelay(100);</div><div class='del'>-		outb(udma_speed_flag &amp; ~0x10, high_16 + 0x001f);</div><div class='del'>-		mdelay(2000);	/* 2 seconds ?! */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='ctx'> 	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -624,10 +509,8 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;tuneproc  = &amp;config_chipset_for_pio;</div><div class='ctx'> 	hwif-&gt;quirkproc = &amp;pdc202xx_quirkproc;</div><div class='ctx'> </div><div class='del'>-	if (hwif-&gt;pci_dev-&gt;device != PCI_DEVICE_ID_PROMISE_20246) {</div><div class='del'>-		hwif-&gt;busproc   = &amp;pdc202xx_tristate;</div><div class='add'>+	if (hwif-&gt;pci_dev-&gt;device != PCI_DEVICE_ID_PROMISE_20246)</div><div class='ctx'> 		hwif-&gt;resetproc = &amp;pdc202xx_reset;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	hwif-&gt;speedproc = &amp;pdc202xx_tune_chipset;</div><div class='ctx'> </div><div class='hunk'>@@ -637,6 +520,8 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;mwdma_mask = 0x07;</div><div class='ctx'> 	hwif-&gt;swdma_mask = 0x07;</div><div class='ctx'> </div><div class='add'>+	hwif-&gt;err_stops_fifo = 1;</div><div class='add'>+</div><div class='ctx'> 	hwif-&gt;ide_dma_check = &amp;pdc202xx_config_drive_xfer_rate;</div><div class='ctx'> 	hwif-&gt;ide_dma_lostirq = &amp;pdc202xx_ide_dma_lostirq;</div><div class='ctx'> 	hwif-&gt;ide_dma_timeout = &amp;pdc202xx_ide_dma_timeout;</div><div class='hunk'>@@ -725,19 +610,6 @@ static int __devinit init_setup_pdc202ata4(struct pci_dev *dev,</div><div class='ctx'> 				"mirror fixed.\n", d-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-        if (dev-&gt;device == PCI_DEVICE_ID_PROMISE_20262)</div><div class='del'>-        if (e-&gt;reg &amp;&amp; (pci_read_config_byte(dev, e-&gt;reg, &amp;tmp) ||</div><div class='del'>-             (tmp &amp; e-&gt;mask) != e-&gt;val))</div><div class='del'>-</div><div class='del'>-        if (d-&gt;enablebits[0].reg != d-&gt;enablebits[1].reg) {</div><div class='del'>-                d-&gt;enablebits[0].reg    = d-&gt;enablebits[1].reg;</div><div class='del'>-                d-&gt;enablebits[0].mask   = d-&gt;enablebits[1].mask;</div><div class='del'>-                d-&gt;enablebits[0].val    = d-&gt;enablebits[1].val;</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return ide_setup_pci_device(dev, d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -752,22 +624,6 @@ static int __devinit init_setup_pdc20265(struct pci_dev *dev,</div><div class='ctx'> 			"attached to I2O RAID controller.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-        {</div><div class='del'>-                u8 pri = 0, sec = 0;</div><div class='del'>-</div><div class='del'>-        if (e-&gt;reg &amp;&amp; (pci_read_config_byte(dev, e-&gt;reg, &amp;tmp) ||</div><div class='del'>-             (tmp &amp; e-&gt;mask) != e-&gt;val))</div><div class='del'>-</div><div class='del'>-        if (d-&gt;enablebits[0].reg != d-&gt;enablebits[1].reg) {</div><div class='del'>-                d-&gt;enablebits[0].reg    = d-&gt;enablebits[1].reg;</div><div class='del'>-                d-&gt;enablebits[0].mask   = d-&gt;enablebits[1].mask;</div><div class='del'>-                d-&gt;enablebits[0].val    = d-&gt;enablebits[1].val;</div><div class='del'>-        }</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return ide_setup_pci_device(dev, d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c<br/>index e9b83e1a3028..50332ddd5ddb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/piix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/piix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/piix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/piix.c</a></div><div class='hunk'>@@ -90,7 +90,6 @@</div><div class='ctx'>  *	ICH3	errata #18	- Don't use native mode</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -222,6 +221,8 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u16 master_data;</div><div class='ctx'> 	u8 slave_data;</div><div class='add'>+	static DEFINE_SPINLOCK(tune_lock);</div><div class='add'>+</div><div class='ctx'> 				 /* ISP  RTC */</div><div class='ctx'> 	u8 timings[][2]	= { { 0, 0 },</div><div class='ctx'> 			    { 0, 0 },</div><div class='hunk'>@@ -230,7 +231,13 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio)</div><div class='ctx'> 			    { 2, 3 }, };</div><div class='ctx'> </div><div class='ctx'> 	pio = ide_get_best_pio_mode(drive, pio, 5, NULL);</div><div class='del'>-	spin_lock_irqsave(&amp;ide_lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Master vs slave is synchronized above us but the slave register is</div><div class='add'>+	 * shared by the two hwifs so the corner case of two slave timeouts in</div><div class='add'>+	 * parallel must be locked.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;tune_lock, flags);</div><div class='ctx'> 	pci_read_config_word(dev, master_port, &amp;master_data);</div><div class='ctx'> 	if (is_slave) {</div><div class='ctx'> 		master_data = master_data | 0x4000;</div><div class='hunk'>@@ -250,7 +257,7 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio)</div><div class='ctx'> 	pci_write_config_word(dev, master_port, master_data);</div><div class='ctx'> 	if (is_slave)</div><div class='ctx'> 		pci_write_config_byte(dev, slave_port, slave_data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ide_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tune_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c<br/>index 24e21b2838c1..fc2b5496b6d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/sc1200.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sc1200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/sc1200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/sc1200.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *	Available from National Semiconductor</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -395,7 +394,6 @@ static int sc1200_resume (struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t	*hwif = NULL;</div><div class='ctx'> </div><div class='del'>-printk("SC1200: resume\n");</div><div class='ctx'> 	pci_set_power_state(dev, PCI_D0);	// bring chip back from sleep state</div><div class='ctx'> 	dev-&gt;current_state = PM_EVENT_ON;</div><div class='ctx'> 	pci_enable_device(dev);</div><div class='hunk'>@@ -405,7 +403,6 @@ printk("SC1200: resume\n");</div><div class='ctx'> 	while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {</div><div class='ctx'> 		unsigned int		basereg, r, d, format;</div><div class='ctx'> 		sc1200_saved_state_t	*ss = (sc1200_saved_state_t *)hwif-&gt;config_data;</div><div class='del'>-printk("%s: SC1200: resume\n", hwif-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		//</div><div class='ctx'> 		// Restore timing registers:  this may be unnecessary if BIOS also does it</div><div class='hunk'>@@ -493,7 +490,7 @@ static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_devic</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id sc1200_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE), 0},</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);</div><div class='head'>diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c<br/>index 0d3073f4eab4..03677bff0d72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/serverworks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/serverworks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/serverworks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/serverworks.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -123,11 +122,11 @@ static u8 svwks_csb_check (struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)</div><div class='ctx'> {</div><div class='del'>-	u8 udma_modes[]		= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };</div><div class='del'>-	u8 dma_modes[]		= { 0x77, 0x21, 0x20 };</div><div class='del'>-	u8 pio_modes[]		= { 0x5d, 0x47, 0x34, 0x22, 0x20 };</div><div class='del'>-	u8 drive_pci[]		= { 0x41, 0x40, 0x43, 0x42 };</div><div class='del'>-	u8 drive_pci2[]		= { 0x45, 0x44, 0x47, 0x46 };</div><div class='add'>+	static const u8 udma_modes[]		= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };</div><div class='add'>+	static const u8 dma_modes[]		= { 0x77, 0x21, 0x20 };</div><div class='add'>+	static const u8 pio_modes[]		= { 0x5d, 0x47, 0x34, 0x22, 0x20 };</div><div class='add'>+	static const u8 drive_pci[]		= { 0x41, 0x40, 0x43, 0x42 };</div><div class='add'>+	static const u8 drive_pci2[]		= { 0x45, 0x44, 0x47, 0x46 };</div><div class='ctx'> </div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> 	struct pci_dev *dev	= hwif-&gt;pci_dev;</div><div class='hunk'>@@ -392,16 +391,6 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha</div><div class='ctx'> 			}</div><div class='ctx'> 			outb_p(0x06, 0x0c00);</div><div class='ctx'> 			dev-&gt;irq = inb_p(0x0c01);</div><div class='del'>-#if 0</div><div class='del'>-			printk("%s: device class (0x%04x)\n",</div><div class='del'>-				name, dev-&gt;class);</div><div class='del'>-			if ((dev-&gt;class &gt;&gt; 8) != PCI_CLASS_STORAGE_IDE) {</div><div class='del'>-				dev-&gt;class &amp;= ~0x000F0F00;</div><div class='del'>-		//		dev-&gt;class |= ~0x00000400;</div><div class='del'>-				dev-&gt;class |= ~0x00010100;</div><div class='del'>-				/**/</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct pci_dev * findev = NULL;</div><div class='ctx'> 			u8 reg41 = 0;</div><div class='hunk'>@@ -452,7 +441,7 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha</div><div class='ctx'> 		pci_write_config_byte(dev, 0x5A, btr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (dev-&gt;irq) ? dev-&gt;irq : 0;</div><div class='add'>+	return dev-&gt;irq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int __devinit ata66_svwks_svwks (ide_hwif_t *hwif)</div><div class='hunk'>@@ -500,11 +489,6 @@ static unsigned int __devinit ata66_svwks (ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *dev = hwif-&gt;pci_dev;</div><div class='ctx'> </div><div class='del'>-	/* Per Specified Design by OEM, and ASIC Architect */</div><div class='del'>-	if ((dev-&gt;device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||</div><div class='del'>-	    (dev-&gt;device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2))</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	/* Server Works */</div><div class='ctx'> 	if (dev-&gt;subsystem_vendor == PCI_VENDOR_ID_SERVERWORKS)</div><div class='ctx'> 		return ata66_svwks_svwks (hwif);</div><div class='hunk'>@@ -517,10 +501,14 @@ static unsigned int __devinit ata66_svwks (ide_hwif_t *hwif)</div><div class='ctx'> 	if (dev-&gt;subsystem_vendor == PCI_VENDOR_ID_SUN)</div><div class='ctx'> 		return ata66_svwks_cobalt (hwif);</div><div class='ctx'> </div><div class='add'>+	/* Per Specified Design by OEM, and ASIC Architect */</div><div class='add'>+	if ((dev-&gt;device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||</div><div class='add'>+	    (dev-&gt;device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#undef CAN_SW_DMA</div><div class='ctx'> static void __devinit init_hwif_svwks (ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='ctx'> 	u8 dma_stat = 0;</div><div class='hunk'>@@ -537,9 +525,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)</div><div class='ctx'> 		hwif-&gt;ultra_mask = 0x3f;</div><div class='ctx'> </div><div class='ctx'> 	hwif-&gt;mwdma_mask = 0x07;</div><div class='del'>-#ifdef CAN_SW_DMA</div><div class='del'>-	hwif-&gt;swdma_mask = 0x07;</div><div class='del'>-#endif /* CAN_SW_DMA */</div><div class='ctx'> </div><div class='ctx'> 	hwif-&gt;autodma = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -562,8 +547,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;drives[1].autodma = (dma_stat &amp; 0x40);</div><div class='ctx'> 	hwif-&gt;drives[0].autotune = (!(dma_stat &amp; 0x20));</div><div class='ctx'> 	hwif-&gt;drives[1].autotune = (!(dma_stat &amp; 0x40));</div><div class='del'>-//	hwif-&gt;drives[0].autodma = hwif-&gt;autodma;</div><div class='del'>-//	hwif-&gt;drives[1].autodma = hwif-&gt;autodma;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -593,11 +576,6 @@ static int __devinit init_setup_csb6 (struct pci_dev *dev, ide_pci_device_t *d)</div><div class='ctx'> 		if (dev-&gt;resource[0].start == 0x01f1)</div><div class='ctx'> 			d-&gt;bootable = ON_BOARD;</div><div class='ctx'> 	}</div><div class='del'>-#if 0</div><div class='del'>-	if ((IDE_PCI_DEVID_EQ(d-&gt;devid, DEVID_CSB6) &amp;&amp;</div><div class='del'>-             (!(PCI_FUNC(dev-&gt;devfn) &amp; 1)))</div><div class='del'>-		d-&gt;autodma = AUTODMA;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	d-&gt;channels = ((dev-&gt;device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ||</div><div class='ctx'> 			dev-&gt;device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2) &amp;&amp;</div><div class='hunk'>@@ -671,11 +649,11 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id svwks_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},</div><div class='del'>-	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},</div><div class='del'>-	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},</div><div class='del'>-	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 1},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE), 2},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2), 3},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE), 4},</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);</div><div class='head'>diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c<br/>index 27c9eb989a9a..e125032bb403 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/sgiioc4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sgiioc4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/sgiioc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/sgiioc4.c</a></div><div class='hunk'>@@ -723,6 +723,12 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {</div><div class='ctx'> int</div><div class='ctx'> ioc4_ide_attach_one(struct ioc4_driver_data *idd)</div><div class='ctx'> {</div><div class='add'>+	/* PCI-RT does not bring out IDE connection.</div><div class='add'>+	 * Do not attach to this particular IOC4.</div><div class='add'>+	 */</div><div class='add'>+	if (idd-&gt;idd_variant == IOC4_VARIANT_PCI_RT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return pci_init_sgiioc4(idd-&gt;idd_pdev,</div><div class='ctx'> 				&amp;sgiioc4_chipsets[idd-&gt;idd_pci_id-&gt;driver_data]);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c<br/>index f1ca154dd52c..25ceb4a39ed2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/siimage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/siimage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/siimage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/siimage.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *	if neccessary</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -38,9 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#undef SIIMAGE_VIRTUAL_DMAPIO</div><div class='del'>-#undef SIIMAGE_LARGE_DMA</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	pdev_is_sata		-	check if device is SATA</div><div class='ctx'>  *	@pdev:	PCI device to check</div><div class='hunk'>@@ -461,36 +457,6 @@ static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-/**</div><div class='del'>- *	siimage_mmio_ide_dma_count	-	DMA bytes done</div><div class='del'>- *	@drive</div><div class='del'>- *</div><div class='del'>- *	If we are doing VDMA the CMD680 requires a little bit</div><div class='del'>- *	of more careful handling and we have to read the counts</div><div class='del'>- *	off ourselves. For non VDMA life is normal.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int siimage_mmio_ide_dma_count (ide_drive_t *drive)</div><div class='del'>-{</div><div class='del'>-#ifdef SIIMAGE_VIRTUAL_DMAPIO</div><div class='del'>-	struct request *rq	= HWGROUP(drive)-&gt;rq;</div><div class='del'>-	ide_hwif_t *hwif	= HWIF(drive);</div><div class='del'>-	u32 count		= (rq-&gt;nr_sectors * SECTOR_SIZE);</div><div class='del'>-	u32 rcount		= 0;</div><div class='del'>-	unsigned long addr	= siimage_selreg(hwif, 0x1C);</div><div class='del'>-</div><div class='del'>-	hwif-&gt;OUTL(count, addr);</div><div class='del'>-	rcount = hwif-&gt;INL(addr);</div><div class='del'>-</div><div class='del'>-	printk("\n%s: count = %d, rcount = %d, nr_sectors = %lu\n",</div><div class='del'>-		drive-&gt;name, count, rcount, rq-&gt;nr_sectors);</div><div class='del'>-</div><div class='del'>-#endif /* SIIMAGE_VIRTUAL_DMAPIO */</div><div class='del'>-	return __ide_dma_count(drive);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	siimage_mmio_ide_dma_test_irq	-	check we caused an IRQ</div><div class='ctx'>  *	@drive: drive we are testing</div><div class='hunk'>@@ -512,12 +478,10 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)</div><div class='ctx'> 			u32 sata_error = hwif-&gt;INL(SATA_ERROR_REG);</div><div class='ctx'> 			hwif-&gt;OUTL(sata_error, SATA_ERROR_REG);</div><div class='ctx'> 			watchdog = (sata_error &amp; 0x00680000) ? 1 : 0;</div><div class='del'>-#if 1</div><div class='ctx'> 			printk(KERN_WARNING "%s: sata_error = 0x%08x, "</div><div class='ctx'> 				"watchdog = %d, %s\n",</div><div class='ctx'> 				drive-&gt;name, sata_error, watchdog,</div><div class='ctx'> 				__FUNCTION__);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='ctx'> 			watchdog = (ext_stat &amp; 0x8000) ? 1 : 0;</div><div class='hunk'>@@ -863,7 +827,7 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev, const ch</div><div class='ctx'>  *	time.</div><div class='ctx'>  *</div><div class='ctx'>  *	The hardware supports buffered taskfiles and also some rather nice</div><div class='del'>- *	extended PRD tables. Unfortunately right now we don't.</div><div class='add'>+ *	extended PRD tables. For better SI3112 support use the libata driver</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)</div><div class='hunk'>@@ -900,9 +864,6 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)</div><div class='ctx'> 	 *	so we can't currently use it sanely since we want to</div><div class='ctx'> 	 *	use LBA48 mode.</div><div class='ctx'> 	 */	</div><div class='del'>-//	base += 0x10;</div><div class='del'>-//	hwif-&gt;no_lba48 = 1;</div><div class='del'>-</div><div class='ctx'> 	hw.io_ports[IDE_DATA_OFFSET]	= base;</div><div class='ctx'> 	hw.io_ports[IDE_ERROR_OFFSET]	= base + 1;</div><div class='ctx'> 	hw.io_ports[IDE_NSECTOR_OFFSET]	= base + 2;</div><div class='hunk'>@@ -936,15 +897,8 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'>        	base = (unsigned long) addr;</div><div class='ctx'> </div><div class='del'>-#ifdef SIIMAGE_LARGE_DMA</div><div class='del'>-/* Watch the brackets - even Ken and Dennis get some language design wrong */</div><div class='del'>-	hwif-&gt;dma_base			= base + (ch ? 0x18 : 0x10);</div><div class='del'>-	hwif-&gt;dma_base2			= base + (ch ? 0x08 : 0x00);</div><div class='del'>-	hwif-&gt;dma_prdtable		= hwif-&gt;dma_base2 + 4;</div><div class='del'>-#else /* ! SIIMAGE_LARGE_DMA */</div><div class='ctx'> 	hwif-&gt;dma_base			= base + (ch ? 0x08 : 0x00);</div><div class='ctx'> 	hwif-&gt;dma_base2			= base + (ch ? 0x18 : 0x10);</div><div class='del'>-#endif /* SIIMAGE_LARGE_DMA */</div><div class='ctx'> 	hwif-&gt;mmio			= 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1052,9 +1006,16 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;reset_poll = &amp;siimage_reset_poll;</div><div class='ctx'> 	hwif-&gt;pre_reset = &amp;siimage_pre_reset;</div><div class='ctx'> </div><div class='del'>-	if(is_sata(hwif))</div><div class='add'>+	if(is_sata(hwif)) {</div><div class='add'>+		static int first = 1;</div><div class='add'>+</div><div class='ctx'> 		hwif-&gt;busproc   = &amp;siimage_busproc;</div><div class='ctx'> </div><div class='add'>+		if (first) {</div><div class='add'>+			printk(KERN_INFO "siimage: For full SATA support you should use the libata sata_sil module.\n");</div><div class='add'>+			first = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (!hwif-&gt;dma_base) {</div><div class='ctx'> 		hwif-&gt;drives[0].autotune = 1;</div><div class='ctx'> 		hwif-&gt;drives[1].autotune = 1;</div><div class='hunk'>@@ -1121,10 +1082,10 @@ static int __devinit siimage_init_one(struct pci_dev *dev, const struct pci_devi</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id siimage_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_680,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_680), 0},</div><div class='ctx'> #ifdef CONFIG_BLK_DEV_IDE_SATA</div><div class='del'>-	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},</div><div class='del'>-	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_1210SA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3112), 1},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_1210SA), 2},</div><div class='ctx'> #endif</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c<br/>index 8e9d87701ce2..8a6c23ac8cc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/sis5513.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sis5513.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/sis5513.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/sis5513.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * 962/963.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c<br/>index 8a5c7b286b2b..0b4b60498515 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/sl82c105.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/sl82c105.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/sl82c105.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/sl82c105.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *  -- Benjamin Herrenschmidt (01/11/03) benh@kernel.crashing.org</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -447,7 +446,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)</div><div class='ctx'> 		printk("    %s: Winbond 553 bridge revision %d, BM-DMA disabled\n",</div><div class='ctx'> 		       hwif-&gt;name, rev);</div><div class='ctx'> 	} else {</div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA</div><div class='ctx'> 		dma_state |= 0x60;</div><div class='ctx'> </div><div class='ctx'> 		hwif-&gt;atapi_dma = 1;</div><div class='hunk'>@@ -468,7 +466,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)</div><div class='ctx'> </div><div class='ctx'> 		if (hwif-&gt;mate)</div><div class='ctx'> 			hwif-&gt;serialized = hwif-&gt;mate-&gt;serialized = 1;</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA */</div><div class='ctx'> 	}</div><div class='ctx'> 	hwif-&gt;OUTB(dma_state, hwif-&gt;dma_base + 2);</div><div class='ctx'> }</div><div class='hunk'>@@ -489,7 +486,7 @@ static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_dev</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id sl82c105_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105), 0},</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);</div><div class='head'>diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c<br/>index 5112c726633b..4a1853af3bbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/slc90e66.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/slc90e66.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/slc90e66.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/slc90e66.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -72,7 +71,8 @@ static void slc90e66_tune_drive (ide_drive_t *drive, u8 pio)</div><div class='ctx'> 	u16 master_data;</div><div class='ctx'> 	u8 slave_data;</div><div class='ctx'> 				 /* ISP  RTC */</div><div class='del'>-	u8 timings[][2]	= { { 0, 0 },</div><div class='add'>+	static const u8 timings[][2]= {</div><div class='add'>+				    { 0, 0 },</div><div class='ctx'> 				    { 0, 0 },</div><div class='ctx'> 				    { 1, 0 },</div><div class='ctx'> 				    { 2, 1 },</div><div class='hunk'>@@ -119,7 +119,6 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)</div><div class='ctx'> 	pci_read_config_word(dev, 0x4a, &amp;reg4a);</div><div class='ctx'> </div><div class='ctx'> 	switch(speed) {</div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA</div><div class='ctx'> 		case XFER_UDMA_4:	u_speed = 4 &lt;&lt; (drive-&gt;dn * 4); break;</div><div class='ctx'> 		case XFER_UDMA_3:	u_speed = 3 &lt;&lt; (drive-&gt;dn * 4); break;</div><div class='ctx'> 		case XFER_UDMA_2:	u_speed = 2 &lt;&lt; (drive-&gt;dn * 4); break;</div><div class='hunk'>@@ -128,7 +127,6 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)</div><div class='ctx'> 		case XFER_MW_DMA_2:</div><div class='ctx'> 		case XFER_MW_DMA_1:</div><div class='ctx'> 		case XFER_SW_DMA_2:	break;</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA */</div><div class='ctx'> 		case XFER_PIO_4:</div><div class='ctx'> 		case XFER_PIO_3:</div><div class='ctx'> 		case XFER_PIO_2:</div><div class='hunk'>@@ -156,7 +154,6 @@ static int slc90e66_tune_chipset (ide_drive_t *drive, u8 xferspeed)</div><div class='ctx'> 	return (ide_config_drive_speed(drive, speed));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA</div><div class='ctx'> static int slc90e66_config_drive_for_dma (ide_drive_t *drive)</div><div class='ctx'> {</div><div class='ctx'> 	u8 speed = ide_dma_speed(drive, slc90e66_ratemask(drive));</div><div class='hunk'>@@ -194,7 +191,6 @@ fast_ata_pio:</div><div class='ctx'> 	/* IORDY not supported */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDEDMA */</div><div class='ctx'> </div><div class='ctx'> static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)</div><div class='ctx'> {</div><div class='hunk'>@@ -222,7 +218,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)</div><div class='ctx'> 	hwif-&gt;mwdma_mask = 0x07;</div><div class='ctx'> 	hwif-&gt;swdma_mask = 0x07;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDEDMA </div><div class='ctx'> 	if (!(hwif-&gt;udma_four))</div><div class='ctx'> 		/* bit[0(1)]: 0:80, 1:40 */</div><div class='ctx'> 		hwif-&gt;udma_four = (reg47 &amp; mask) ? 0 : 1;</div><div class='hunk'>@@ -232,7 +227,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)</div><div class='ctx'> 		hwif-&gt;autodma = 1;</div><div class='ctx'> 	hwif-&gt;drives[0].autodma = hwif-&gt;autodma;</div><div class='ctx'> 	hwif-&gt;drives[1].autodma = hwif-&gt;autodma;</div><div class='del'>-#endif /* !CONFIG_BLK_DEV_IDEDMA */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ide_pci_device_t slc90e66_chipset __devinitdata = {</div><div class='hunk'>@@ -250,7 +244,7 @@ static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_dev</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id slc90e66_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1), 0},</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, slc90e66_pci_tbl);</div><div class='head'>diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c<br/>index f96b56838f33..56d84931d6de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/triflex.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/triflex.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/triflex.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/triflex.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *	Not publically available.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c<br/>index c26c8ca90dd4..2a282529bfc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/trm290.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/trm290.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/trm290.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/trm290.c</a></div><div class='hunk'>@@ -128,7 +128,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -183,8 +182,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)</div><div class='ctx'> {</div><div class='ctx'> 	ide_hwif_t *hwif	= HWIF(drive);</div><div class='ctx'> </div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)	/* paranoia check */</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);	/* paranoia check */</div><div class='ctx'> 	ide_set_handler(drive, &amp;ide_dma_intr, WAIT_CMD, NULL);</div><div class='ctx'> 	/* issue cmd to drive */</div><div class='ctx'> 	hwif-&gt;OUTB(command, IDE_COMMAND_REG);</div><div class='head'>diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c<br/>index 3e677c4f8c28..afdaee3c15c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/pci/via82cxxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/pci/via82cxxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/pci/via82cxxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/pci/via82cxxx.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c<br/>index b80c6135ae93..0ac9da3a7378 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ppc/mpc8xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ppc/mpc8xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ppc/mpc8xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ppc/mpc8xx.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *	by Mathew Locke &lt;mattl@mvista.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c<br/>index ffca8b63ee79..ebf961f1718d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/ppc/pmac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/ppc/pmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/ppc/pmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/ppc/pmac.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * big table</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -421,107 +420,6 @@ static void pmac_ide_kauai_selectproc(ide_drive_t *drive);</div><div class='ctx'> #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Below is the code for blinking the laptop LED along with hard</div><div class='del'>- * disk activity.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK</div><div class='del'>-</div><div class='del'>-/* Set to 50ms minimum led-on time (also used to limit frequency</div><div class='del'>- * of requests sent to the PMU</div><div class='del'>- */</div><div class='del'>-#define PMU_HD_BLINK_TIME	(HZ/50)</div><div class='del'>-</div><div class='del'>-static struct adb_request pmu_blink_on, pmu_blink_off;</div><div class='del'>-static spinlock_t pmu_blink_lock;</div><div class='del'>-static unsigned long pmu_blink_stoptime;</div><div class='del'>-static int pmu_blink_ledstate;</div><div class='del'>-static struct timer_list pmu_blink_timer;</div><div class='del'>-static int pmu_ide_blink_enabled;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pmu_hd_blink_timeout(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irqsave(&amp;pmu_blink_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* We may have been triggered again in a racy way, check</div><div class='del'>-	 * that we really want to switch it off</div><div class='del'>-	 */</div><div class='del'>-	if (time_after(pmu_blink_stoptime, jiffies))</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	/* Previous req. not complete, try 100ms more */</div><div class='del'>-	if (pmu_blink_off.complete == 0)</div><div class='del'>-		mod_timer(&amp;pmu_blink_timer, jiffies + PMU_HD_BLINK_TIME);</div><div class='del'>-	else if (pmu_blink_ledstate) {</div><div class='del'>-		pmu_request(&amp;pmu_blink_off, NULL, 4, 0xee, 4, 0, 0);</div><div class='del'>-		pmu_blink_ledstate = 0;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	spin_unlock_irqrestore(&amp;pmu_blink_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pmu_hd_kick_blink(void *data, int rw)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	pmu_blink_stoptime = jiffies + PMU_HD_BLINK_TIME;</div><div class='del'>-	wmb();</div><div class='del'>-	mod_timer(&amp;pmu_blink_timer, pmu_blink_stoptime);</div><div class='del'>-	/* Fast path when LED is already ON */</div><div class='del'>-	if (pmu_blink_ledstate == 1)</div><div class='del'>-		return;</div><div class='del'>-	spin_lock_irqsave(&amp;pmu_blink_lock, flags);</div><div class='del'>-	if (pmu_blink_on.complete &amp;&amp; !pmu_blink_ledstate) {</div><div class='del'>-		pmu_request(&amp;pmu_blink_on, NULL, 4, 0xee, 4, 0, 1);</div><div class='del'>-		pmu_blink_ledstate = 1;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;pmu_blink_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pmu_hd_blink_init(void)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dt;</div><div class='del'>-	const char *model;</div><div class='del'>-</div><div class='del'>-	/* Currently, I only enable this feature on KeyLargo based laptops,</div><div class='del'>-	 * older laptops may support it (at least heathrow/paddington) but</div><div class='del'>-	 * I don't feel like loading those venerable old machines with so</div><div class='del'>-	 * much additional interrupt &amp; PMU activity...</div><div class='del'>-	 */</div><div class='del'>-	if (pmu_get_model() != PMU_KEYLARGO_BASED)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	dt = of_find_node_by_path("/");</div><div class='del'>-	if (dt == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	model = (const char *)get_property(dt, "model", NULL);</div><div class='del'>-	if (model == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &amp;&amp;</div><div class='del'>-	    strncmp(model, "iBook", strlen("iBook")) != 0) {</div><div class='del'>-		of_node_put(dt);</div><div class='del'>-	    	return 0;</div><div class='del'>-	}</div><div class='del'>-	of_node_put(dt);</div><div class='del'>-</div><div class='del'>-	pmu_blink_on.complete = 1;</div><div class='del'>-	pmu_blink_off.complete = 1;</div><div class='del'>-	spin_lock_init(&amp;pmu_blink_lock);</div><div class='del'>-	init_timer(&amp;pmu_blink_timer);</div><div class='del'>-	pmu_blink_timer.function = pmu_hd_blink_timeout;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDE_PMAC_BLINK */</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * N.B. this can't be an initfunc, because the media-bay task can</div><div class='ctx'>  * call ide_[un]register at any time.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1192,23 +1090,6 @@ pmac_ide_do_suspend(ide_hwif_t *hwif)</div><div class='ctx'> 	pmif-&gt;timings[0] = 0;</div><div class='ctx'> 	pmif-&gt;timings[1] = 0;</div><div class='ctx'> 	</div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK</div><div class='del'>-	/* Note: This code will be called for every hwif, thus we'll</div><div class='del'>-	 * try several time to stop the LED blinker timer,  but that</div><div class='del'>-	 * should be harmless</div><div class='del'>-	 */</div><div class='del'>-	if (pmu_ide_blink_enabled) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		/* Make sure we don't hit the PMU blink */</div><div class='del'>-		spin_lock_irqsave(&amp;pmu_blink_lock, flags);</div><div class='del'>-		if (pmu_blink_ledstate)</div><div class='del'>-			del_timer(&amp;pmu_blink_timer);</div><div class='del'>-		pmu_blink_ledstate = 0;</div><div class='del'>-		spin_unlock_irqrestore(&amp;pmu_blink_lock, flags);</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_BLK_DEV_IDE_PMAC_BLINK */</div><div class='del'>-</div><div class='ctx'> 	disable_irq(pmif-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* The media bay will handle itself just fine */</div><div class='hunk'>@@ -1376,13 +1257,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)</div><div class='ctx'> 		hwif-&gt;selectproc = pmac_ide_selectproc;</div><div class='ctx'> 	hwif-&gt;speedproc = pmac_ide_tune_chipset;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK</div><div class='del'>-	pmu_ide_blink_enabled = pmu_hd_blink_init();</div><div class='del'>-</div><div class='del'>-	if (pmu_ide_blink_enabled)</div><div class='del'>-		hwif-&gt;led_act = pmu_hd_kick_blink;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_INFO "ide%d: Found Apple %s controller, bus ID %d%s, irq %d\n",</div><div class='ctx'> 	       hwif-&gt;index, model_name[pmif-&gt;kind], pmif-&gt;aapl_bus_id,</div><div class='ctx'> 	       pmif-&gt;mediabay ? " (mediabay)" : "", hwif-&gt;irq);</div><div class='head'>diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c<br/>index 462ed3006c30..eb0945284acc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ide/setup-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ide/setup-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ide/setup-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ide/setup-pci.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *  configuration of all PCI IDE interfaces present in a system.  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -694,13 +693,8 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (noisy)</div><div class='del'>-#ifdef __sparc__</div><div class='del'>-			printk(KERN_INFO "%s: 100%% native mode on irq %s\n",</div><div class='del'>-			       d-&gt;name, __irq_itoa(pciirq));</div><div class='del'>-#else</div><div class='ctx'> 			printk(KERN_INFO "%s: 100%% native mode on irq %d\n",</div><div class='ctx'> 				d-&gt;name, pciirq);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: silent failure can happen */</div><div class='head'>diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig<br/>index 39142e2f804b..186737539cf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/Kconfig</a></div><div class='hunk'>@@ -128,8 +128,17 @@ config IEEE1394_SBP2</div><div class='ctx'> 	  1394 bus.  SBP-2 devices include harddrives and DVD devices.</div><div class='ctx'> </div><div class='ctx'> config IEEE1394_SBP2_PHYS_DMA</div><div class='del'>-	bool "Enable Phys DMA support for SBP2 (Debug)"</div><div class='del'>-	depends on IEEE1394 &amp;&amp; IEEE1394_SBP2</div><div class='add'>+	bool "Enable replacement for physical DMA in SBP2"</div><div class='add'>+	depends on IEEE1394 &amp;&amp; IEEE1394_SBP2 &amp;&amp; EXPERIMENTAL &amp;&amp; (X86_32 || PPC_32)</div><div class='add'>+	help</div><div class='add'>+	  This builds sbp2 for use with non-OHCI host adapters which do not</div><div class='add'>+	  support physical DMA or for when ohci1394 is run with phys_dma=0.</div><div class='add'>+	  Physical DMA is data movement without assistence of the drivers'</div><div class='add'>+	  interrupt handlers.  This option includes the interrupt handlers</div><div class='add'>+	  that are required in absence of this hardware feature.</div><div class='add'>+</div><div class='add'>+	  This option is buggy and currently broken on some architectures.</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config IEEE1394_ETH1394</div><div class='ctx'> 	tristate "Ethernet over 1394"</div><div class='head'>diff --git a/drivers/ieee1394/config_roms.c b/drivers/ieee1394/config_roms.c<br/>index 1017fd717248..e2de6fa0c9fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/config_roms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/config_roms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/config_roms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/config_roms.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * directory of the kernel sources for details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "csr1212.h"</div><div class='head'>diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c<br/>index 15773544234b..586f71e7346a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/csr1212.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/csr1212.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/csr1212.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/csr1212.c</a></div><div class='hunk'>@@ -779,7 +779,7 @@ static int csr1212_append_new_cache(struct csr1212_csr *csr, size_t romsize)</div><div class='ctx'> 	romsize = (romsize + (csr-&gt;max_rom - 1)) &amp; ~(csr-&gt;max_rom - 1);</div><div class='ctx'> </div><div class='ctx'> 	csr_addr = csr-&gt;ops-&gt;allocate_addr_range(romsize, csr-&gt;max_rom, csr-&gt;private);</div><div class='del'>-	if (csr_addr == ~0ULL) {</div><div class='add'>+	if (csr_addr == CSR1212_INVALID_ADDR_SPACE) {</div><div class='ctx'> 		return CSR1212_ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (csr_addr &lt; CSR1212_REGISTER_SPACE_BASE) {</div><div class='head'>diff --git a/drivers/ieee1394/csr1212.h b/drivers/ieee1394/csr1212.h<br/>index cecd5871f2de..17ddd72dee4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/csr1212.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/csr1212.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/csr1212.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/csr1212.h</a></div><div class='hunk'>@@ -192,6 +192,7 @@</div><div class='ctx'> </div><div class='ctx'> #define  CSR1212_EXTENDED_ROM_SIZE		(0x10000 * sizeof(u_int32_t))</div><div class='ctx'> </div><div class='add'>+#define  CSR1212_INVALID_ADDR_SPACE		-1</div><div class='ctx'> </div><div class='ctx'> /* Config ROM image structures */</div><div class='ctx'> struct csr1212_bus_info_block_img {</div><div class='head'>diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c<br/>index 9fb2769d9abc..ca5167de707d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/dma.c</a></div><div class='hunk'>@@ -145,12 +145,12 @@ void dma_region_free(struct dma_region *dma)</div><div class='ctx'> /* find the scatterlist index and remaining offset corresponding to a</div><div class='ctx'>    given offset from the beginning of the buffer */</div><div class='ctx'> static inline int dma_region_find(struct dma_region *dma, unsigned long offset,</div><div class='del'>-				  unsigned long *rem)</div><div class='add'>+				  unsigned int start, unsigned long *rem)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long off = offset;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dma-&gt;n_dma_pages; i++) {</div><div class='add'>+	for (i = start; i &lt; dma-&gt;n_dma_pages; i++) {</div><div class='ctx'> 		if (off &lt; sg_dma_len(&amp;dma-&gt;sglist[i])) {</div><div class='ctx'> 			*rem = off;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -170,7 +170,7 @@ dma_addr_t dma_region_offset_to_bus(struct dma_region * dma,</div><div class='ctx'> 	unsigned long rem = 0;</div><div class='ctx'> </div><div class='ctx'> 	struct scatterlist *sg =</div><div class='del'>-	    &amp;dma-&gt;sglist[dma_region_find(dma, offset, &amp;rem)];</div><div class='add'>+	    &amp;dma-&gt;sglist[dma_region_find(dma, offset, 0, &amp;rem)];</div><div class='ctx'> 	return sg_dma_address(sg) + rem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -178,13 +178,13 @@ void dma_region_sync_for_cpu(struct dma_region *dma, unsigned long offset,</div><div class='ctx'> 			     unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	int first, last;</div><div class='del'>-	unsigned long rem;</div><div class='add'>+	unsigned long rem = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		len = 1;</div><div class='ctx'> </div><div class='del'>-	first = dma_region_find(dma, offset, &amp;rem);</div><div class='del'>-	last = dma_region_find(dma, offset + len - 1, &amp;rem);</div><div class='add'>+	first = dma_region_find(dma, offset, 0, &amp;rem);</div><div class='add'>+	last = dma_region_find(dma, rem + len - 1, first, &amp;rem);</div><div class='ctx'> </div><div class='ctx'> 	pci_dma_sync_sg_for_cpu(dma-&gt;dev, &amp;dma-&gt;sglist[first], last - first + 1,</div><div class='ctx'> 				dma-&gt;direction);</div><div class='hunk'>@@ -194,13 +194,13 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset,</div><div class='ctx'> 				unsigned long len)</div><div class='ctx'> {</div><div class='ctx'> 	int first, last;</div><div class='del'>-	unsigned long rem;</div><div class='add'>+	unsigned long rem = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!len)</div><div class='ctx'> 		len = 1;</div><div class='ctx'> </div><div class='del'>-	first = dma_region_find(dma, offset, &amp;rem);</div><div class='del'>-	last = dma_region_find(dma, offset + len - 1, &amp;rem);</div><div class='add'>+	first = dma_region_find(dma, offset, 0, &amp;rem);</div><div class='add'>+	last = dma_region_find(dma, rem + len - 1, first, &amp;rem);</div><div class='ctx'> </div><div class='ctx'> 	pci_dma_sync_sg_for_device(dma-&gt;dev, &amp;dma-&gt;sglist[first],</div><div class='ctx'> 				   last - first + 1, dma-&gt;direction);</div><div class='head'>diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c<br/>index 85c2d4ca0def..87532dd43374 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/dv1394.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/dv1394.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/dv1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/dv1394.c</a></div><div class='hunk'>@@ -83,7 +83,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c<br/>index 30fa0d43a43a..2d5b57be98c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/eth1394.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/eth1394.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/eth1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/eth1394.c</a></div><div class='hunk'>@@ -367,7 +367,7 @@ static int eth1394_probe(struct device *dev)</div><div class='ctx'> 	spin_lock_init(&amp;node_info-&gt;pdg.lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;node_info-&gt;pdg.list);</div><div class='ctx'> 	node_info-&gt;pdg.sz = 0;</div><div class='del'>-	node_info-&gt;fifo = ETHER1394_INVALID_ADDR;</div><div class='add'>+	node_info-&gt;fifo = CSR1212_INVALID_ADDR_SPACE;</div><div class='ctx'> </div><div class='ctx'> 	ud-&gt;device.driver_data = node_info;</div><div class='ctx'> 	new_node-&gt;ud = ud;</div><div class='hunk'>@@ -502,10 +502,8 @@ static void ether1394_reset_priv (struct net_device *dev, int set_mtu)</div><div class='ctx'> </div><div class='ctx'> 	/* Determine speed limit */</div><div class='ctx'> 	for (i = 0; i &lt; host-&gt;node_count; i++)</div><div class='del'>-		if (max_speed &gt; host-&gt;speed_map[NODEID_TO_NODE(host-&gt;node_id) *</div><div class='del'>-						64 + i])</div><div class='del'>-			max_speed = host-&gt;speed_map[NODEID_TO_NODE(host-&gt;node_id) *</div><div class='del'>-						    64 + i];</div><div class='add'>+		if (max_speed &gt; host-&gt;speed[i])</div><div class='add'>+			max_speed = host-&gt;speed[i];</div><div class='ctx'> 	priv-&gt;bc_sspd = max_speed;</div><div class='ctx'> </div><div class='ctx'> 	/* We'll use our maxpayload as the default mtu */</div><div class='hunk'>@@ -568,13 +566,11 @@ static void ether1394_add_host (struct hpsb_host *host)</div><div class='ctx'> 	if (!(host-&gt;config_roms &amp; HPSB_CONFIG_ROM_ENTRY_IP1394))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	fifo_addr = hpsb_allocate_and_register_addrspace(&amp;eth1394_highlevel,</div><div class='del'>-							 host,</div><div class='del'>-							 &amp;addr_ops,</div><div class='del'>-							 ETHER1394_REGION_ADDR_LEN,</div><div class='del'>-							 ETHER1394_REGION_ADDR_LEN,</div><div class='del'>-							 -1, -1);</div><div class='del'>-	if (fifo_addr == ~0ULL)</div><div class='add'>+	fifo_addr = hpsb_allocate_and_register_addrspace(</div><div class='add'>+			&amp;eth1394_highlevel, host, &amp;addr_ops,</div><div class='add'>+			ETHER1394_REGION_ADDR_LEN, ETHER1394_REGION_ADDR_LEN,</div><div class='add'>+			CSR1212_INVALID_ADDR_SPACE, CSR1212_INVALID_ADDR_SPACE);</div><div class='add'>+	if (fifo_addr == CSR1212_INVALID_ADDR_SPACE)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* We should really have our own alloc_hpsbdev() function in</div><div class='hunk'>@@ -774,7 +770,7 @@ static int ether1394_rebuild_header(struct sk_buff *skb)</div><div class='ctx'> 	default:</div><div class='ctx'> 		ETH1394_PRINT(KERN_DEBUG, dev-&gt;name,</div><div class='ctx'> 			      "unable to resolve type %04x addresses.\n",</div><div class='del'>-			      eth-&gt;h_proto);</div><div class='add'>+			      ntohs(eth-&gt;h_proto));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -796,9 +792,8 @@ static int ether1394_header_cache(struct neighbour *neigh, struct hh_cache *hh)</div><div class='ctx'> 						      (16 - ETH1394_HLEN));</div><div class='ctx'> 	struct net_device *dev = neigh-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (type == __constant_htons(ETH_P_802_3)) {</div><div class='add'>+	if (type == htons(ETH_P_802_3))</div><div class='ctx'> 		return -1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	eth-&gt;h_proto = type;</div><div class='ctx'> 	memcpy(eth-&gt;h_dest, neigh-&gt;ha, dev-&gt;addr_len);</div><div class='hunk'>@@ -887,7 +882,7 @@ static inline u16 ether1394_parse_encap(struct sk_buff *skb,</div><div class='ctx'> 	/* If this is an ARP packet, convert it. First, we want to make</div><div class='ctx'> 	 * use of some of the fields, since they tell us a little bit</div><div class='ctx'> 	 * about the sending machine.  */</div><div class='del'>-	if (ether_type == __constant_htons (ETH_P_ARP)) {</div><div class='add'>+	if (ether_type == htons(ETH_P_ARP)) {</div><div class='ctx'> 		struct eth1394_arp *arp1394 = (struct eth1394_arp*)skb-&gt;data;</div><div class='ctx'> 		struct arphdr *arp = (struct arphdr *)skb-&gt;data;</div><div class='ctx'> 		unsigned char *arp_ptr = (unsigned char *)(arp + 1);</div><div class='hunk'>@@ -935,7 +930,7 @@ static inline u16 ether1394_parse_encap(struct sk_buff *skb,</div><div class='ctx'> 		*(u32*)arp_ptr = arp1394-&gt;sip;	/* move sender IP addr */</div><div class='ctx'> 		arp_ptr += arp-&gt;ar_pln;		/* skip over sender IP addr */</div><div class='ctx'> </div><div class='del'>-		if (arp-&gt;ar_op == 1)</div><div class='add'>+		if (arp-&gt;ar_op == htons(ARPOP_REQUEST))</div><div class='ctx'> 			/* just set ARP req target unique ID to 0 */</div><div class='ctx'> 			*((u64*)arp_ptr) = 0;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -943,8 +938,8 @@ static inline u16 ether1394_parse_encap(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now add the ethernet header. */</div><div class='del'>-	if (dev-&gt;hard_header (skb, dev, __constant_ntohs (ether_type),</div><div class='del'>-			      &amp;dest_hw, NULL, skb-&gt;len) &gt;= 0)</div><div class='add'>+	if (dev-&gt;hard_header(skb, dev, ntohs(ether_type), &amp;dest_hw, NULL,</div><div class='add'>+			     skb-&gt;len) &gt;= 0)</div><div class='ctx'> 		ret = ether1394_type_trans(skb, dev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1079,8 +1074,7 @@ static inline int update_partial_datagram(struct list_head *pdgl, struct list_he</div><div class='ctx'> </div><div class='ctx'> 	/* Move list entry to beginnig of list so that oldest partial</div><div class='ctx'> 	 * datagrams percolate to the end of the list */</div><div class='del'>-	list_del(lh);</div><div class='del'>-	list_add(lh, pdgl);</div><div class='add'>+	list_move(lh, pdgl);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1395,7 +1389,7 @@ static inline void ether1394_arp_to_1394arp(struct sk_buff *skb,</div><div class='ctx'> /* We need to encapsulate the standard header with our own. We use the</div><div class='ctx'>  * ethernet header's proto for our own. */</div><div class='ctx'> static inline unsigned int ether1394_encapsulate_prep(unsigned int max_payload,</div><div class='del'>-						      int proto,</div><div class='add'>+						      __be16 proto,</div><div class='ctx'> 						      union eth1394_hdr *hdr,</div><div class='ctx'> 						      u16 dg_size, u16 dgl)</div><div class='ctx'> {</div><div class='hunk'>@@ -1514,8 +1508,8 @@ static inline void ether1394_prep_gasp_packet(struct hpsb_packet *p,</div><div class='ctx'> 	p-&gt;data = ((quadlet_t*)skb-&gt;data) - 2;</div><div class='ctx'> 	p-&gt;data[0] = cpu_to_be32((priv-&gt;host-&gt;node_id &lt;&lt; 16) |</div><div class='ctx'> 				 ETHER1394_GASP_SPECIFIER_ID_HI);</div><div class='del'>-	p-&gt;data[1] = __constant_cpu_to_be32((ETHER1394_GASP_SPECIFIER_ID_LO &lt;&lt; 24) |</div><div class='del'>-					    ETHER1394_GASP_VERSION);</div><div class='add'>+	p-&gt;data[1] = cpu_to_be32((ETHER1394_GASP_SPECIFIER_ID_LO &lt;&lt; 24) |</div><div class='add'>+				 ETHER1394_GASP_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	/* Setting the node id to ALL_NODES (not LOCAL_BUS | ALL_NODES)</div><div class='ctx'> 	 * prevents hpsb_send_packet() from setting the speed to an arbitrary</div><div class='hunk'>@@ -1626,7 +1620,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;</div><div class='ctx'> 	struct eth1394hdr *eth;</div><div class='ctx'> 	struct eth1394_priv *priv = netdev_priv(dev);</div><div class='del'>-	int proto;</div><div class='add'>+	__be16 proto;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	nodeid_t dest_node;</div><div class='ctx'> 	eth1394_tx_type tx_type;</div><div class='hunk'>@@ -1670,9 +1664,9 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Set the transmission type for the packet.  ARP packets and IP</div><div class='ctx'> 	 * broadcast packets are sent via GASP. */</div><div class='ctx'> 	if (memcmp(eth-&gt;h_dest, dev-&gt;broadcast, ETH1394_ALEN) == 0 ||</div><div class='del'>-	    proto == __constant_htons(ETH_P_ARP) ||</div><div class='del'>-	    (proto == __constant_htons(ETH_P_IP) &amp;&amp;</div><div class='del'>-	     IN_MULTICAST(__constant_ntohl(skb-&gt;nh.iph-&gt;daddr)))) {</div><div class='add'>+	    proto == htons(ETH_P_ARP) ||</div><div class='add'>+	    (proto == htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+	     IN_MULTICAST(ntohl(skb-&gt;nh.iph-&gt;daddr)))) {</div><div class='ctx'> 		tx_type = ETH1394_GASP;</div><div class='ctx'> 		dest_node = LOCAL_BUS | ALL_NODES;</div><div class='ctx'> 		max_payload = priv-&gt;bc_maxpayload - ETHER1394_GASP_OVERHEAD;</div><div class='hunk'>@@ -1688,7 +1682,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='ctx'> 		node_info = (struct eth1394_node_info*)node-&gt;ud-&gt;device.driver_data;</div><div class='del'>-		if (node_info-&gt;fifo == ETHER1394_INVALID_ADDR) {</div><div class='add'>+		if (node_info-&gt;fifo == CSR1212_INVALID_ADDR_SPACE) {</div><div class='ctx'> 			ret = -EAGAIN;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1704,7 +1698,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If this is an ARP packet, convert it */</div><div class='del'>-	if (proto == __constant_htons (ETH_P_ARP))</div><div class='add'>+	if (proto == htons(ETH_P_ARP))</div><div class='ctx'> 		ether1394_arp_to_1394arp (skb, dev);</div><div class='ctx'> </div><div class='ctx'> 	ptask-&gt;hdr.words.word1 = 0;</div><div class='head'>diff --git a/drivers/ieee1394/eth1394.h b/drivers/ieee1394/eth1394.h<br/>index a77213cfc483..c45cbff9138d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/eth1394.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/eth1394.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/eth1394.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/eth1394.h</a></div><div class='hunk'>@@ -32,8 +32,6 @@</div><div class='ctx'>  * S3200 (per Table 16-3 of IEEE 1394b-2002). */</div><div class='ctx'> #define ETHER1394_REGION_ADDR_LEN	4096</div><div class='ctx'> </div><div class='del'>-#define ETHER1394_INVALID_ADDR		~0ULL</div><div class='del'>-</div><div class='ctx'> /* GASP identifier numbers for IPv4 over IEEE 1394 */</div><div class='ctx'> #define ETHER1394_GASP_SPECIFIER_ID	0x00005E</div><div class='ctx'> #define ETHER1394_GASP_SPECIFIER_ID_HI	((ETHER1394_GASP_SPECIFIER_ID &gt;&gt; 8) &amp; 0xffff)</div><div class='head'>diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c<br/>index 491e6032bdec..694da82d820b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/highlevel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/highlevel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/highlevel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/highlevel.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -53,7 +52,7 @@ static struct hpsb_address_serve dummy_zero_addr, dummy_max_addr;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,</div><div class='del'>-					      struct hpsb_host *host)</div><div class='add'>+					    struct hpsb_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_host_info *hi = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -68,24 +67,18 @@ static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;hl-&gt;host_info_lock);</div><div class='del'>-</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Returns a per host/driver data structure that was previously stored by</div><div class='ctx'>  * hpsb_create_hostinfo. */</div><div class='ctx'> void *hpsb_get_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_host_info *hi = hl_get_hostinfo(hl, host);</div><div class='ctx'> </div><div class='del'>-	if (hi)</div><div class='del'>-		return hi-&gt;data;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='add'>+	return hi ? hi-&gt;data : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* If size is zero, then the return here is only valid for error checking */</div><div class='ctx'> void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> 			   size_t data_size)</div><div class='hunk'>@@ -96,8 +89,8 @@ void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> </div><div class='ctx'> 	hi = hl_get_hostinfo(hl, host);</div><div class='ctx'> 	if (hi) {</div><div class='del'>-		HPSB_ERR("%s called hpsb_create_hostinfo when hostinfo already exists",</div><div class='del'>-			 hl-&gt;name);</div><div class='add'>+		HPSB_ERR("%s called hpsb_create_hostinfo when hostinfo already"</div><div class='add'>+			 " exists", hl-&gt;name);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -120,7 +113,6 @@ void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> 		      void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -132,16 +124,14 @@ int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> 			hi-&gt;data = data;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else</div><div class='del'>-			HPSB_ERR("%s called hpsb_set_hostinfo when hostinfo already has data",</div><div class='del'>-				 hl-&gt;name);</div><div class='add'>+			HPSB_ERR("%s called hpsb_set_hostinfo when hostinfo "</div><div class='add'>+				 "already has data", hl-&gt;name);</div><div class='ctx'> 	} else</div><div class='ctx'> 		HPSB_ERR("%s called hpsb_set_hostinfo when no hostinfo exists",</div><div class='ctx'> 			 hl-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_host_info *hi;</div><div class='hunk'>@@ -154,23 +144,20 @@ void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host)</div><div class='ctx'> 		write_unlock_irqrestore(&amp;hl-&gt;host_info_lock, flags);</div><div class='ctx'> 		kfree(hi);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, unsigned long key)</div><div class='add'>+void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='add'>+			   unsigned long key)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_host_info *hi;</div><div class='ctx'> </div><div class='ctx'> 	hi = hl_get_hostinfo(hl, host);</div><div class='ctx'> 	if (hi)</div><div class='ctx'> 		hi-&gt;key = key;</div><div class='del'>-</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key)</div><div class='ctx'> {</div><div class='ctx'> 	struct hl_host_info *hi;</div><div class='hunk'>@@ -187,46 +174,41 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock(&amp;hl-&gt;host_info_lock);</div><div class='del'>-</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int highlevel_for_each_host_reg(struct hpsb_host *host, void *__data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpsb_highlevel *hl = __data;</div><div class='ctx'> </div><div class='ctx'> 	hl-&gt;add_host(host);</div><div class='ctx'> </div><div class='del'>-        if (host-&gt;update_config_rom) {</div><div class='del'>-		if (hpsb_update_config_rom_image(host) &lt; 0) {</div><div class='del'>-			HPSB_ERR("Failed to generate Configuration ROM image for host "</div><div class='del'>-				 "%s-%d", hl-&gt;name, host-&gt;id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (host-&gt;update_config_rom &amp;&amp; hpsb_update_config_rom_image(host) &lt; 0)</div><div class='add'>+		HPSB_ERR("Failed to generate Configuration ROM image for host "</div><div class='add'>+			 "%s-%d", hl-&gt;name, host-&gt;id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hpsb_register_highlevel(struct hpsb_highlevel *hl)</div><div class='ctx'> {</div><div class='del'>-        INIT_LIST_HEAD(&amp;hl-&gt;addr_list);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;hl-&gt;addr_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;hl-&gt;host_info_list);</div><div class='ctx'> </div><div class='ctx'> 	rwlock_init(&amp;hl-&gt;host_info_lock);</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;hl_drivers_sem);</div><div class='del'>-        list_add_tail(&amp;hl-&gt;hl_list, &amp;hl_drivers);</div><div class='add'>+	list_add_tail(&amp;hl-&gt;hl_list, &amp;hl_drivers);</div><div class='ctx'> 	up_write(&amp;hl_drivers_sem);</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;hl_irqs_lock);</div><div class='add'>+	write_lock_irqsave(&amp;hl_irqs_lock, flags);</div><div class='ctx'> 	list_add_tail(&amp;hl-&gt;irq_list, &amp;hl_irqs);</div><div class='del'>-	write_unlock(&amp;hl_irqs_lock);</div><div class='add'>+	write_unlock_irqrestore(&amp;hl_irqs_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (hl-&gt;add_host)</div><div class='ctx'> 		nodemgr_for_each_host(hl, highlevel_for_each_host_reg);</div><div class='del'>-</div><div class='del'>-        return;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __delete_addr(struct hpsb_address_serve *as)</div><div class='hunk'>@@ -236,7 +218,8 @@ static void __delete_addr(struct hpsb_address_serve *as)</div><div class='ctx'> 	kfree(as);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __unregister_host(struct hpsb_highlevel *hl, struct hpsb_host *host, int update_cr)</div><div class='add'>+static void __unregister_host(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='add'>+			      int update_cr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct list_head *lh, *next;</div><div class='hunk'>@@ -251,7 +234,6 @@ static void __unregister_host(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> 	write_lock_irqsave(&amp;addr_space_lock, flags);</div><div class='ctx'> 	list_for_each_safe (lh, next, &amp;hl-&gt;addr_list) {</div><div class='ctx'> 		as = list_entry(lh, struct hpsb_address_serve, hl_list);</div><div class='del'>-</div><div class='ctx'> 		if (as-&gt;host == host)</div><div class='ctx'> 			__delete_addr(as);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -259,15 +241,12 @@ static void __unregister_host(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> </div><div class='ctx'> 	/* Now update the config-rom to reflect anything removed by the</div><div class='ctx'> 	 * highlevel driver. */</div><div class='del'>-	if (update_cr &amp;&amp; host-&gt;update_config_rom) {</div><div class='del'>-		if (hpsb_update_config_rom_image(host) &lt; 0) {</div><div class='del'>-			HPSB_ERR("Failed to generate Configuration ROM image for host "</div><div class='del'>-				 "%s-%d", hl-&gt;name, host-&gt;id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (update_cr &amp;&amp; host-&gt;update_config_rom &amp;&amp;</div><div class='add'>+	    hpsb_update_config_rom_image(host) &lt; 0)</div><div class='add'>+		HPSB_ERR("Failed to generate Configuration ROM image for host "</div><div class='add'>+			 "%s-%d", hl-&gt;name, host-&gt;id);</div><div class='ctx'> </div><div class='del'>-	/* And finally, remove all the host info associated between these</div><div class='del'>-	 * two. */</div><div class='add'>+	/* Finally remove all the host info associated between these two. */</div><div class='ctx'> 	hpsb_destroy_hostinfo(hl, host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,18 +255,19 @@ static int highlevel_for_each_host_unreg(struct hpsb_host *host, void *__data)</div><div class='ctx'> 	struct hpsb_highlevel *hl = __data;</div><div class='ctx'> </div><div class='ctx'> 	__unregister_host(hl, host, 1);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)</div><div class='ctx'> {</div><div class='del'>-	write_lock(&amp;hl_irqs_lock);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	write_lock_irqsave(&amp;hl_irqs_lock, flags);</div><div class='ctx'> 	list_del(&amp;hl-&gt;irq_list);</div><div class='del'>-	write_unlock(&amp;hl_irqs_lock);</div><div class='add'>+	write_unlock_irqrestore(&amp;hl_irqs_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;hl_drivers_sem);</div><div class='del'>-        list_del(&amp;hl-&gt;hl_list);</div><div class='add'>+	list_del(&amp;hl-&gt;hl_list);</div><div class='ctx'> 	up_write(&amp;hl_drivers_sem);</div><div class='ctx'> </div><div class='ctx'> 	nodemgr_for_each_host(hl, highlevel_for_each_host_unreg);</div><div class='hunk'>@@ -301,7 +281,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,</div><div class='ctx'> {</div><div class='ctx'> 	struct hpsb_address_serve *as, *a1, *a2;</div><div class='ctx'> 	struct list_head *entry;</div><div class='del'>-	u64 retval = ~0ULL;</div><div class='add'>+	u64 retval = CSR1212_INVALID_ADDR_SPACE;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u64 align_mask = ~(alignment - 1);</div><div class='ctx'> </div><div class='hunk'>@@ -312,14 +292,19 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (start == ~0ULL &amp;&amp; end == ~0ULL) {</div><div class='del'>-		start = CSR1212_ALL_SPACE_BASE + 0xffff00000000ULL;  /* ohci1394.c limit */</div><div class='del'>-		end = CSR1212_ALL_SPACE_END;</div><div class='add'>+	/* default range,</div><div class='add'>+	 * avoids controller's posted write area (see OHCI 1.1 clause 1.5) */</div><div class='add'>+	if (start == CSR1212_INVALID_ADDR_SPACE &amp;&amp;</div><div class='add'>+	    end   == CSR1212_INVALID_ADDR_SPACE) {</div><div class='add'>+		start = host-&gt;middle_addr_space;</div><div class='add'>+		end   = CSR1212_ALL_SPACE_END;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (((start|end) &amp; ~align_mask) || (start &gt;= end) || (end &gt; 0x1000000000000ULL)) {</div><div class='del'>-		HPSB_ERR("%s called with invalid addresses (start = %012Lx    end = %012Lx)",</div><div class='del'>-			 __FUNCTION__, (unsigned long long)start, (unsigned long long)end);</div><div class='add'>+	if (((start|end) &amp; ~align_mask) || (start &gt;= end) ||</div><div class='add'>+	    (end &gt; CSR1212_ALL_SPACE_END)) {</div><div class='add'>+		HPSB_ERR("%s called with invalid addresses "</div><div class='add'>+			 "(start = %012Lx  end = %012Lx)", __FUNCTION__,</div><div class='add'>+			 (unsigned long long)start,(unsigned long long)end);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -333,20 +318,21 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,</div><div class='ctx'> 	as-&gt;host = host;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_irqsave(&amp;addr_space_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	list_for_each(entry, &amp;host-&gt;addr_space) {</div><div class='ctx'> 		u64 a1sa, a1ea;</div><div class='ctx'> 		u64 a2sa, a2ea;</div><div class='ctx'> </div><div class='ctx'> 		a1 = list_entry(entry, struct hpsb_address_serve, host_list);</div><div class='del'>-		a2 = list_entry(entry-&gt;next, struct hpsb_address_serve, host_list);</div><div class='add'>+		a2 = list_entry(entry-&gt;next, struct hpsb_address_serve,</div><div class='add'>+				host_list);</div><div class='ctx'> </div><div class='ctx'> 		a1sa = a1-&gt;start &amp; align_mask;</div><div class='ctx'> 		a1ea = (a1-&gt;end + alignment -1) &amp; align_mask;</div><div class='ctx'> 		a2sa = a2-&gt;start &amp; align_mask;</div><div class='ctx'> 		a2ea = (a2-&gt;end + alignment -1) &amp; align_mask;</div><div class='ctx'> </div><div class='del'>-		if ((a2sa - a1ea &gt;= size) &amp;&amp; (a2sa - start &gt;= size) &amp;&amp; (a2sa &gt; start)) {</div><div class='add'>+		if ((a2sa - a1ea &gt;= size) &amp;&amp; (a2sa - start &gt;= size) &amp;&amp;</div><div class='add'>+		    (a2sa &gt; start)) {</div><div class='ctx'> 			as-&gt;start = max(start, a1ea);</div><div class='ctx'> 			as-&gt;end = as-&gt;start + size;</div><div class='ctx'> 			list_add(&amp;as-&gt;host_list, entry);</div><div class='hunk'>@@ -355,47 +341,45 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	write_unlock_irqrestore(&amp;addr_space_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (retval == ~0ULL) {</div><div class='add'>+	if (retval == CSR1212_INVALID_ADDR_SPACE)</div><div class='ctx'> 		kfree(as);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='del'>-                            struct hpsb_address_ops *ops, u64 start, u64 end)</div><div class='add'>+			    struct hpsb_address_ops *ops, u64 start, u64 end)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_address_serve *as;</div><div class='add'>+	struct hpsb_address_serve *as;</div><div class='ctx'> 	struct list_head *lh;</div><div class='del'>-        int retval = 0;</div><div class='del'>-        unsigned long flags;</div><div class='add'>+	int retval = 0;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-        if (((start|end) &amp; 3) || (start &gt;= end) || (end &gt; 0x1000000000000ULL)) {</div><div class='del'>-                HPSB_ERR("%s called with invalid addresses", __FUNCTION__);</div><div class='del'>-                return 0;</div><div class='del'>-        }</div><div class='add'>+	if (((start|end) &amp; 3) || (start &gt;= end) ||</div><div class='add'>+	    (end &gt; CSR1212_ALL_SPACE_END)) {</div><div class='add'>+		HPSB_ERR("%s called with invalid addresses", __FUNCTION__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	as = kmalloc(sizeof(*as), GFP_ATOMIC);</div><div class='ctx'> 	if (!as)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-        INIT_LIST_HEAD(&amp;as-&gt;host_list);</div><div class='del'>-        INIT_LIST_HEAD(&amp;as-&gt;hl_list);</div><div class='del'>-        as-&gt;op = ops;</div><div class='del'>-        as-&gt;start = start;</div><div class='del'>-        as-&gt;end = end;</div><div class='add'>+	INIT_LIST_HEAD(&amp;as-&gt;host_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;as-&gt;hl_list);</div><div class='add'>+	as-&gt;op = ops;</div><div class='add'>+	as-&gt;start = start;</div><div class='add'>+	as-&gt;end = end;</div><div class='ctx'> 	as-&gt;host = host;</div><div class='ctx'> </div><div class='ctx'> 	write_lock_irqsave(&amp;addr_space_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	list_for_each(lh, &amp;host-&gt;addr_space) {</div><div class='ctx'> 		struct hpsb_address_serve *as_this =</div><div class='ctx'> 			list_entry(lh, struct hpsb_address_serve, host_list);</div><div class='ctx'> 		struct hpsb_address_serve *as_next =</div><div class='del'>-			list_entry(lh-&gt;next, struct hpsb_address_serve, host_list);</div><div class='add'>+			list_entry(lh-&gt;next, struct hpsb_address_serve,</div><div class='add'>+				   host_list);</div><div class='ctx'> </div><div class='ctx'> 		if (as_this-&gt;end &gt; as-&gt;start)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -411,60 +395,51 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='ctx'> </div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		kfree(as);</div><div class='del'>-</div><div class='del'>-        return retval;</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hpsb_unregister_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='del'>-                              u64 start)</div><div class='add'>+			      u64 start)</div><div class='ctx'> {</div><div class='del'>-        int retval = 0;</div><div class='del'>-        struct hpsb_address_serve *as;</div><div class='del'>-        struct list_head *lh, *next;</div><div class='del'>-        unsigned long flags;</div><div class='del'>-</div><div class='del'>-        write_lock_irqsave(&amp;addr_space_lock, flags);</div><div class='add'>+	int retval = 0;</div><div class='add'>+	struct hpsb_address_serve *as;</div><div class='add'>+	struct list_head *lh, *next;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	write_lock_irqsave(&amp;addr_space_lock, flags);</div><div class='ctx'> 	list_for_each_safe (lh, next, &amp;hl-&gt;addr_list) {</div><div class='del'>-                as = list_entry(lh, struct hpsb_address_serve, hl_list);</div><div class='del'>-                if (as-&gt;start == start &amp;&amp; as-&gt;host == host) {</div><div class='add'>+		as = list_entry(lh, struct hpsb_address_serve, hl_list);</div><div class='add'>+		if (as-&gt;start == start &amp;&amp; as-&gt;host == host) {</div><div class='ctx'> 			__delete_addr(as);</div><div class='del'>-                        retval = 1;</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        write_unlock_irqrestore(&amp;addr_space_lock, flags);</div><div class='del'>-</div><div class='del'>-        return retval;</div><div class='add'>+			retval = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	write_unlock_irqrestore(&amp;addr_space_lock, flags);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hpsb_listen_channel(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='del'>-                         unsigned int channel)</div><div class='add'>+			unsigned int channel)</div><div class='ctx'> {</div><div class='del'>-        if (channel &gt; 63) {</div><div class='del'>-                HPSB_ERR("%s called with invalid channel", __FUNCTION__);</div><div class='del'>-                return -EINVAL;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (host-&gt;iso_listen_count[channel]++ == 0) {</div><div class='del'>-                return host-&gt;driver-&gt;devctl(host, ISO_LISTEN_CHANNEL, channel);</div><div class='del'>-        }</div><div class='del'>-</div><div class='add'>+	if (channel &gt; 63) {</div><div class='add'>+		HPSB_ERR("%s called with invalid channel", __FUNCTION__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (host-&gt;iso_listen_count[channel]++ == 0)</div><div class='add'>+		return host-&gt;driver-&gt;devctl(host, ISO_LISTEN_CHANNEL, channel);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hpsb_unlisten_channel(struct hpsb_highlevel *hl, struct hpsb_host *host,</div><div class='del'>-                           unsigned int channel)</div><div class='add'>+			   unsigned int channel)</div><div class='ctx'> {</div><div class='del'>-        if (channel &gt; 63) {</div><div class='del'>-                HPSB_ERR("%s called with invalid channel", __FUNCTION__);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (--host-&gt;iso_listen_count[channel] == 0) {</div><div class='del'>-                host-&gt;driver-&gt;devctl(host, ISO_UNLISTEN_CHANNEL, channel);</div><div class='del'>-        }</div><div class='add'>+	if (channel &gt; 63) {</div><div class='add'>+		HPSB_ERR("%s called with invalid channel", __FUNCTION__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (--host-&gt;iso_listen_count[channel] == 0)</div><div class='add'>+		host-&gt;driver-&gt;devctl(host, ISO_UNLISTEN_CHANNEL, channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void init_hpsb_highlevel(struct hpsb_host *host)</div><div class='hunk'>@@ -485,26 +460,24 @@ static void init_hpsb_highlevel(struct hpsb_host *host)</div><div class='ctx'> </div><div class='ctx'> void highlevel_add_host(struct hpsb_host *host)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_highlevel *hl;</div><div class='add'>+	struct hpsb_highlevel *hl;</div><div class='ctx'> </div><div class='ctx'> 	init_hpsb_highlevel(host);</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;hl_drivers_sem);</div><div class='del'>-        list_for_each_entry(hl, &amp;hl_drivers, hl_list) {</div><div class='add'>+	list_for_each_entry(hl, &amp;hl_drivers, hl_list) {</div><div class='ctx'> 		if (hl-&gt;add_host)</div><div class='ctx'> 			hl-&gt;add_host(host);</div><div class='del'>-        }</div><div class='del'>-	up_read(&amp;hl_drivers_sem);</div><div class='del'>-	if (host-&gt;update_config_rom) {</div><div class='del'>-		if (hpsb_update_config_rom_image(host) &lt; 0)</div><div class='del'>-			HPSB_ERR("Failed to generate Configuration ROM image for "</div><div class='del'>-				 "host %s-%d", hl-&gt;name, host-&gt;id);</div><div class='ctx'> 	}</div><div class='add'>+	up_read(&amp;hl_drivers_sem);</div><div class='add'>+	if (host-&gt;update_config_rom &amp;&amp; hpsb_update_config_rom_image(host) &lt; 0)</div><div class='add'>+		HPSB_ERR("Failed to generate Configuration ROM image for host "</div><div class='add'>+			 "%s-%d", hl-&gt;name, host-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void highlevel_remove_host(struct hpsb_host *host)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_highlevel *hl;</div><div class='add'>+	struct hpsb_highlevel *hl;</div><div class='ctx'> </div><div class='ctx'> 	down_read(&amp;hl_drivers_sem);</div><div class='ctx'> 	list_for_each_entry(hl, &amp;hl_drivers, hl_list)</div><div class='hunk'>@@ -514,184 +487,169 @@ void highlevel_remove_host(struct hpsb_host *host)</div><div class='ctx'> </div><div class='ctx'> void highlevel_host_reset(struct hpsb_host *host)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_highlevel *hl;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct hpsb_highlevel *hl;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;hl_irqs_lock);</div><div class='add'>+	read_lock_irqsave(&amp;hl_irqs_lock, flags);</div><div class='ctx'> 	list_for_each_entry(hl, &amp;hl_irqs, irq_list) {</div><div class='del'>-                if (hl-&gt;host_reset)</div><div class='del'>-                        hl-&gt;host_reset(host);</div><div class='del'>-        }</div><div class='del'>-	read_unlock(&amp;hl_irqs_lock);</div><div class='add'>+		if (hl-&gt;host_reset)</div><div class='add'>+			hl-&gt;host_reset(host);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_irqrestore(&amp;hl_irqs_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void highlevel_iso_receive(struct hpsb_host *host, void *data, size_t length)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_highlevel *hl;</div><div class='del'>-        int channel = (((quadlet_t *)data)[0] &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct hpsb_highlevel *hl;</div><div class='add'>+	int channel = (((quadlet_t *)data)[0] &gt;&gt; 8) &amp; 0x3f;</div><div class='ctx'> </div><div class='del'>-        read_lock(&amp;hl_irqs_lock);</div><div class='add'>+	read_lock_irqsave(&amp;hl_irqs_lock, flags);</div><div class='ctx'> 	list_for_each_entry(hl, &amp;hl_irqs, irq_list) {</div><div class='del'>-                if (hl-&gt;iso_receive)</div><div class='del'>-                        hl-&gt;iso_receive(host, channel, data, length);</div><div class='del'>-        }</div><div class='del'>-        read_unlock(&amp;hl_irqs_lock);</div><div class='add'>+		if (hl-&gt;iso_receive)</div><div class='add'>+			hl-&gt;iso_receive(host, channel, data, length);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_irqrestore(&amp;hl_irqs_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,</div><div class='ctx'> 			   void *data, size_t length)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_highlevel *hl;</div><div class='del'>-        int cts = ((quadlet_t *)data)[0] &gt;&gt; 4;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct hpsb_highlevel *hl;</div><div class='add'>+	int cts = ((quadlet_t *)data)[0] &gt;&gt; 4;</div><div class='ctx'> </div><div class='del'>-        read_lock(&amp;hl_irqs_lock);</div><div class='add'>+	read_lock_irqsave(&amp;hl_irqs_lock, flags);</div><div class='ctx'> 	list_for_each_entry(hl, &amp;hl_irqs, irq_list) {</div><div class='del'>-                if (hl-&gt;fcp_request)</div><div class='del'>-                        hl-&gt;fcp_request(host, nodeid, direction, cts, data,</div><div class='add'>+		if (hl-&gt;fcp_request)</div><div class='add'>+			hl-&gt;fcp_request(host, nodeid, direction, cts, data,</div><div class='ctx'> 					length);</div><div class='del'>-        }</div><div class='del'>-        read_unlock(&amp;hl_irqs_lock);</div><div class='add'>+	}</div><div class='add'>+	read_unlock_irqrestore(&amp;hl_irqs_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int highlevel_read(struct hpsb_host *host, int nodeid, void *data,</div><div class='del'>-                   u64 addr, unsigned int length, u16 flags)</div><div class='add'>+int highlevel_read(struct hpsb_host *host, int nodeid, void *data, u64 addr,</div><div class='add'>+		   unsigned int length, u16 flags)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_address_serve *as;</div><div class='del'>-        unsigned int partlength;</div><div class='del'>-        int rcode = RCODE_ADDRESS_ERROR;</div><div class='del'>-</div><div class='del'>-        read_lock(&amp;addr_space_lock);</div><div class='add'>+	struct hpsb_address_serve *as;</div><div class='add'>+	unsigned int partlength;</div><div class='add'>+	int rcode = RCODE_ADDRESS_ERROR;</div><div class='ctx'> </div><div class='add'>+	read_lock(&amp;addr_space_lock);</div><div class='ctx'> 	list_for_each_entry(as, &amp;host-&gt;addr_space, host_list) {</div><div class='ctx'> 		if (as-&gt;start &gt; addr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-                if (as-&gt;end &gt; addr) {</div><div class='del'>-                        partlength = min(as-&gt;end - addr, (u64) length);</div><div class='add'>+		if (as-&gt;end &gt; addr) {</div><div class='add'>+			partlength = min(as-&gt;end - addr, (u64) length);</div><div class='ctx'> </div><div class='del'>-                        if (as-&gt;op-&gt;read) {</div><div class='del'>-                                rcode = as-&gt;op-&gt;read(host, nodeid, data,</div><div class='add'>+			if (as-&gt;op-&gt;read)</div><div class='add'>+				rcode = as-&gt;op-&gt;read(host, nodeid, data,</div><div class='ctx'> 						     addr, partlength, flags);</div><div class='del'>-                        } else {</div><div class='del'>-                                rcode = RCODE_TYPE_ERROR;</div><div class='del'>-                        }</div><div class='add'>+			else</div><div class='add'>+				rcode = RCODE_TYPE_ERROR;</div><div class='ctx'> </div><div class='ctx'> 			data += partlength;</div><div class='del'>-                        length -= partlength;</div><div class='del'>-                        addr += partlength;</div><div class='del'>-</div><div class='del'>-                        if ((rcode != RCODE_COMPLETE) || !length) {</div><div class='del'>-                                break;</div><div class='del'>-                        }</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        read_unlock(&amp;addr_space_lock);</div><div class='add'>+			length -= partlength;</div><div class='add'>+			addr += partlength;</div><div class='ctx'> </div><div class='del'>-        if (length &amp;&amp; (rcode == RCODE_COMPLETE)) {</div><div class='del'>-                rcode = RCODE_ADDRESS_ERROR;</div><div class='del'>-        }</div><div class='add'>+			if ((rcode != RCODE_COMPLETE) || !length)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;addr_space_lock);</div><div class='ctx'> </div><div class='del'>-        return rcode;</div><div class='add'>+	if (length &amp;&amp; (rcode == RCODE_COMPLETE))</div><div class='add'>+		rcode = RCODE_ADDRESS_ERROR;</div><div class='add'>+	return rcode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int highlevel_write(struct hpsb_host *host, int nodeid, int destid,</div><div class='del'>-		    void *data, u64 addr, unsigned int length, u16 flags)</div><div class='add'>+int highlevel_write(struct hpsb_host *host, int nodeid, int destid, void *data,</div><div class='add'>+		    u64 addr, unsigned int length, u16 flags)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_address_serve *as;</div><div class='del'>-        unsigned int partlength;</div><div class='del'>-        int rcode = RCODE_ADDRESS_ERROR;</div><div class='del'>-</div><div class='del'>-        read_lock(&amp;addr_space_lock);</div><div class='add'>+	struct hpsb_address_serve *as;</div><div class='add'>+	unsigned int partlength;</div><div class='add'>+	int rcode = RCODE_ADDRESS_ERROR;</div><div class='ctx'> </div><div class='add'>+	read_lock(&amp;addr_space_lock);</div><div class='ctx'> 	list_for_each_entry(as, &amp;host-&gt;addr_space, host_list) {</div><div class='ctx'> 		if (as-&gt;start &gt; addr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-                if (as-&gt;end &gt; addr) {</div><div class='del'>-                        partlength = min(as-&gt;end - addr, (u64) length);</div><div class='add'>+		if (as-&gt;end &gt; addr) {</div><div class='add'>+			partlength = min(as-&gt;end - addr, (u64) length);</div><div class='ctx'> </div><div class='del'>-                        if (as-&gt;op-&gt;write) {</div><div class='del'>-                                rcode = as-&gt;op-&gt;write(host, nodeid, destid,</div><div class='del'>-						      data, addr, partlength, flags);</div><div class='del'>-                        } else {</div><div class='del'>-                                rcode = RCODE_TYPE_ERROR;</div><div class='del'>-                        }</div><div class='add'>+			if (as-&gt;op-&gt;write)</div><div class='add'>+				rcode = as-&gt;op-&gt;write(host, nodeid, destid,</div><div class='add'>+						      data, addr, partlength,</div><div class='add'>+						      flags);</div><div class='add'>+			else</div><div class='add'>+				rcode = RCODE_TYPE_ERROR;</div><div class='ctx'> </div><div class='ctx'> 			data += partlength;</div><div class='del'>-                        length -= partlength;</div><div class='del'>-                        addr += partlength;</div><div class='del'>-</div><div class='del'>-                        if ((rcode != RCODE_COMPLETE) || !length) {</div><div class='del'>-                                break;</div><div class='del'>-                        }</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        read_unlock(&amp;addr_space_lock);</div><div class='add'>+			length -= partlength;</div><div class='add'>+			addr += partlength;</div><div class='ctx'> </div><div class='del'>-        if (length &amp;&amp; (rcode == RCODE_COMPLETE)) {</div><div class='del'>-                rcode = RCODE_ADDRESS_ERROR;</div><div class='del'>-        }</div><div class='add'>+			if ((rcode != RCODE_COMPLETE) || !length)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;addr_space_lock);</div><div class='ctx'> </div><div class='del'>-        return rcode;</div><div class='add'>+	if (length &amp;&amp; (rcode == RCODE_COMPLETE))</div><div class='add'>+		rcode = RCODE_ADDRESS_ERROR;</div><div class='add'>+	return rcode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> int highlevel_lock(struct hpsb_host *host, int nodeid, quadlet_t *store,</div><div class='del'>-                   u64 addr, quadlet_t data, quadlet_t arg, int ext_tcode, u16 flags)</div><div class='add'>+		   u64 addr, quadlet_t data, quadlet_t arg, int ext_tcode,</div><div class='add'>+		   u16 flags)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_address_serve *as;</div><div class='del'>-        int rcode = RCODE_ADDRESS_ERROR;</div><div class='del'>-</div><div class='del'>-        read_lock(&amp;addr_space_lock);</div><div class='add'>+	struct hpsb_address_serve *as;</div><div class='add'>+	int rcode = RCODE_ADDRESS_ERROR;</div><div class='ctx'> </div><div class='add'>+	read_lock(&amp;addr_space_lock);</div><div class='ctx'> 	list_for_each_entry(as, &amp;host-&gt;addr_space, host_list) {</div><div class='ctx'> 		if (as-&gt;start &gt; addr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-                if (as-&gt;end &gt; addr) {</div><div class='del'>-                        if (as-&gt;op-&gt;lock) {</div><div class='del'>-                                rcode = as-&gt;op-&gt;lock(host, nodeid, store, addr,</div><div class='del'>-                                                     data, arg, ext_tcode, flags);</div><div class='del'>-                        } else {</div><div class='del'>-                                rcode = RCODE_TYPE_ERROR;</div><div class='del'>-                        }</div><div class='del'>-</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        read_unlock(&amp;addr_space_lock);</div><div class='del'>-</div><div class='del'>-        return rcode;</div><div class='add'>+		if (as-&gt;end &gt; addr) {</div><div class='add'>+			if (as-&gt;op-&gt;lock)</div><div class='add'>+				rcode = as-&gt;op-&gt;lock(host, nodeid, store, addr,</div><div class='add'>+						     data, arg, ext_tcode,</div><div class='add'>+						     flags);</div><div class='add'>+			else</div><div class='add'>+				rcode = RCODE_TYPE_ERROR;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;addr_space_lock);</div><div class='add'>+	return rcode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int highlevel_lock64(struct hpsb_host *host, int nodeid, octlet_t *store,</div><div class='del'>-                     u64 addr, octlet_t data, octlet_t arg, int ext_tcode, u16 flags)</div><div class='add'>+		     u64 addr, octlet_t data, octlet_t arg, int ext_tcode,</div><div class='add'>+		     u16 flags)</div><div class='ctx'> {</div><div class='del'>-        struct hpsb_address_serve *as;</div><div class='del'>-        int rcode = RCODE_ADDRESS_ERROR;</div><div class='add'>+	struct hpsb_address_serve *as;</div><div class='add'>+	int rcode = RCODE_ADDRESS_ERROR;</div><div class='ctx'> </div><div class='del'>-        read_lock(&amp;addr_space_lock);</div><div class='add'>+	read_lock(&amp;addr_space_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(as, &amp;host-&gt;addr_space, host_list) {</div><div class='ctx'> 		if (as-&gt;start &gt; addr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-                if (as-&gt;end &gt; addr) {</div><div class='del'>-                        if (as-&gt;op-&gt;lock64) {</div><div class='del'>-                                rcode = as-&gt;op-&gt;lock64(host, nodeid, store,</div><div class='del'>-                                                       addr, data, arg,</div><div class='del'>-                                                       ext_tcode, flags);</div><div class='del'>-                        } else {</div><div class='del'>-                                rcode = RCODE_TYPE_ERROR;</div><div class='del'>-                        }</div><div class='del'>-</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        read_unlock(&amp;addr_space_lock);</div><div class='del'>-</div><div class='del'>-        return rcode;</div><div class='add'>+		if (as-&gt;end &gt; addr) {</div><div class='add'>+			if (as-&gt;op-&gt;lock64)</div><div class='add'>+				rcode = as-&gt;op-&gt;lock64(host, nodeid, store,</div><div class='add'>+						       addr, data, arg,</div><div class='add'>+						       ext_tcode, flags);</div><div class='add'>+			else</div><div class='add'>+				rcode = RCODE_TYPE_ERROR;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	read_unlock(&amp;addr_space_lock);</div><div class='add'>+	return rcode;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c<br/>index ba09741fc826..4feead4a35c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/hosts.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/hosts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/hosts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/hosts.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * directory of the kernel sources for details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -19,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "csr1212.h"</div><div class='ctx'> #include "ieee1394.h"</div><div class='hunk'>@@ -102,10 +102,18 @@ static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)</div><div class='ctx'>  * driver specific parts, enable the controller and make it available</div><div class='ctx'>  * to the general subsystem using hpsb_add_host().</div><div class='ctx'>  *</div><div class='del'>- * Return Value: a pointer to the &amp;hpsb_host if succesful, %NULL if</div><div class='add'>+ * Return Value: a pointer to the &amp;hpsb_host if successful, %NULL if</div><div class='ctx'>  * no memory was available.</div><div class='ctx'>  */</div><div class='del'>-static DECLARE_MUTEX(host_num_alloc);</div><div class='add'>+static DEFINE_MUTEX(host_num_alloc);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The pending_packet_queue is special in that it's processed</div><div class='add'>+ * from hardirq context too (such as hpsb_bus_reset()). Hence</div><div class='add'>+ * split the lock class from the usual networking skb-head</div><div class='add'>+ * lock class by using a separate key for it:</div><div class='add'>+ */</div><div class='add'>+static struct lock_class_key pending_packet_queue_key;</div><div class='ctx'> </div><div class='ctx'> struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,</div><div class='ctx'> 				  struct device *dev)</div><div class='hunk'>@@ -128,6 +136,8 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,</div><div class='ctx'> 	h-&gt;driver = drv;</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;h-&gt;pending_packet_queue);</div><div class='add'>+	lockdep_set_class(&amp;h-&gt;pending_packet_queue.lock,</div><div class='add'>+			   &amp;pending_packet_queue_key);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;h-&gt;addr_space);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 2; i &lt; 16; i++)</div><div class='hunk'>@@ -148,7 +158,7 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,</div><div class='ctx'> 	h-&gt;topology_map = h-&gt;csr.topology_map + 3;</div><div class='ctx'> 	h-&gt;speed_map = (u8 *)(h-&gt;csr.speed_map + 2);</div><div class='ctx'> </div><div class='del'>-	down(&amp;host_num_alloc);</div><div class='add'>+	mutex_lock(&amp;host_num_alloc);</div><div class='ctx'> </div><div class='ctx'> 	while (nodemgr_for_each_host(&amp;hostnum, alloc_hostnum_cb))</div><div class='ctx'> 		hostnum++;</div><div class='hunk'>@@ -167,7 +177,7 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,</div><div class='ctx'> 	class_device_register(&amp;h-&gt;class_dev);</div><div class='ctx'> 	get_device(&amp;h-&gt;device);</div><div class='ctx'> </div><div class='del'>-	up(&amp;host_num_alloc);</div><div class='add'>+	mutex_unlock(&amp;host_num_alloc);</div><div class='ctx'> </div><div class='ctx'> 	return h;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h<br/>index 07d188ca8495..9ad4b2463077 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/hosts.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/hosts.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/hosts.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/hosts.h</a></div><div class='hunk'>@@ -30,13 +30,14 @@ struct hpsb_host {</div><div class='ctx'> </div><div class='ctx'> 	unsigned char iso_listen_count[64];</div><div class='ctx'> </div><div class='del'>-	int node_count; /* number of identified nodes on this bus */</div><div class='del'>-	int selfid_count; /* total number of SelfIDs received */</div><div class='del'>-	int nodes_active; /* number of nodes that are actually active */</div><div class='add'>+	int node_count;      /* number of identified nodes on this bus */</div><div class='add'>+	int selfid_count;    /* total number of SelfIDs received */</div><div class='add'>+	int nodes_active;    /* number of nodes with active link layer */</div><div class='add'>+	u8 speed[ALL_NODES]; /* speed between each node and local node */</div><div class='ctx'> </div><div class='del'>-	nodeid_t node_id; /* node ID of this host */</div><div class='del'>-	nodeid_t irm_id; /* ID of this bus' isochronous resource manager */</div><div class='del'>-	nodeid_t busmgr_id; /* ID of this bus' bus manager */</div><div class='add'>+	nodeid_t node_id;    /* node ID of this host */</div><div class='add'>+	nodeid_t irm_id;     /* ID of this bus' isochronous resource manager */</div><div class='add'>+	nodeid_t busmgr_id;  /* ID of this bus' bus manager */</div><div class='ctx'> </div><div class='ctx'> 	/* this nodes state */</div><div class='ctx'> 	unsigned in_bus_reset:1;</div><div class='hunk'>@@ -55,7 +56,7 @@ struct hpsb_host {</div><div class='ctx'> 	struct csr_control csr;</div><div class='ctx'> </div><div class='ctx'> 	/* Per node tlabel pool allocation */</div><div class='del'>-	struct hpsb_tlabel_pool tpool[64];</div><div class='add'>+	struct hpsb_tlabel_pool tpool[ALL_NODES];</div><div class='ctx'> </div><div class='ctx'> 	struct hpsb_host_driver *driver;</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +73,8 @@ struct hpsb_host {</div><div class='ctx'> 	unsigned int config_roms;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head addr_space;</div><div class='add'>+	u64 low_addr_space;	/* upper bound of physical DMA area */</div><div class='add'>+	u64 middle_addr_space;	/* upper bound of posted write area */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c<br/>index be6854e25ad4..f43739c5cab2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/ieee1394_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ieee1394_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/ieee1394_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/ieee1394_core.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -33,6 +32,7 @@</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='hunk'>@@ -285,9 +285,9 @@ static int check_selfids(struct hpsb_host *host)</div><div class='ctx'> </div><div class='ctx'> static void build_speed_map(struct hpsb_host *host, int nodecount)</div><div class='ctx'> {</div><div class='del'>-	u8 speedcap[nodecount];</div><div class='ctx'> 	u8 cldcnt[nodecount];</div><div class='ctx'> 	u8 *map = host-&gt;speed_map;</div><div class='add'>+	u8 *speedcap = host-&gt;speed;</div><div class='ctx'> 	struct selfid *sid;</div><div class='ctx'> 	struct ext_selfid *esid;</div><div class='ctx'> 	int i, j, n;</div><div class='hunk'>@@ -354,6 +354,11 @@ static void build_speed_map(struct hpsb_host *host, int nodecount)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* assume maximum speed for 1394b PHYs, nodemgr will correct it */</div><div class='add'>+	for (n = 0; n &lt; nodecount; n++)</div><div class='add'>+		if (speedcap[n] == 3)</div><div class='add'>+			speedcap[n] = IEEE1394_SPEED_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -554,11 +559,10 @@ int hpsb_send_packet(struct hpsb_packet *packet)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (packet-&gt;type == hpsb_async &amp;&amp; packet-&gt;node_id != ALL_NODES) {</div><div class='add'>+	if (packet-&gt;type == hpsb_async &amp;&amp;</div><div class='add'>+	    NODEID_TO_NODE(packet-&gt;node_id) != ALL_NODES)</div><div class='ctx'> 		packet-&gt;speed_code =</div><div class='del'>-			host-&gt;speed_map[NODEID_TO_NODE(host-&gt;node_id) * 64</div><div class='del'>-				       + NODEID_TO_NODE(packet-&gt;node_id)];</div><div class='del'>-	}</div><div class='add'>+			host-&gt;speed[NODEID_TO_NODE(packet-&gt;node_id)];</div><div class='ctx'> </div><div class='ctx'> 	dump_packet("send packet", packet-&gt;header, packet-&gt;header_size, packet-&gt;speed_code);</div><div class='ctx'> </div><div class='hunk'>@@ -997,11 +1001,8 @@ void abort_timedouts(unsigned long __opaque)</div><div class='ctx'>  * packets that have a "complete" function are sent here. This way, the</div><div class='ctx'>  * completion is run out of kernel context, and doesn't block the rest of</div><div class='ctx'>  * the stack. */</div><div class='del'>-static int khpsbpkt_pid = -1, khpsbpkt_kill;</div><div class='del'>-static DECLARE_COMPLETION(khpsbpkt_complete);</div><div class='add'>+static struct task_struct *khpsbpkt_thread;</div><div class='ctx'> static struct sk_buff_head hpsbpkt_queue;</div><div class='del'>-static DECLARE_MUTEX_LOCKED(khpsbpkt_sig);</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static void queue_packet_complete(struct hpsb_packet *packet)</div><div class='ctx'> {</div><div class='hunk'>@@ -1011,9 +1012,7 @@ static void queue_packet_complete(struct hpsb_packet *packet)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (packet-&gt;complete_routine != NULL) {</div><div class='ctx'> 		skb_queue_tail(&amp;hpsbpkt_queue, packet-&gt;skb);</div><div class='del'>-</div><div class='del'>-		/* Signal the kernel thread to handle this */</div><div class='del'>-		up(&amp;khpsbpkt_sig);</div><div class='add'>+		wake_up_process(khpsbpkt_thread);</div><div class='ctx'> 	}</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -1025,19 +1024,9 @@ static int hpsbpkt_thread(void *__hi)</div><div class='ctx'> 	void (*complete_routine)(void*);</div><div class='ctx'> 	void *complete_data;</div><div class='ctx'> </div><div class='del'>-	daemonize("khpsbpkt");</div><div class='del'>-</div><div class='ctx'> 	current-&gt;flags |= PF_NOFREEZE;</div><div class='ctx'> </div><div class='del'>-	while (1) {</div><div class='del'>-		if (down_interruptible(&amp;khpsbpkt_sig)) {</div><div class='del'>-			printk("khpsbpkt: received unexpected signal?!\n" );</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (khpsbpkt_kill)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='add'>+	while (!kthread_should_stop()) {</div><div class='ctx'> 		while ((skb = skb_dequeue(&amp;hpsbpkt_queue)) != NULL) {</div><div class='ctx'> 			packet = (struct hpsb_packet *)skb-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -1048,9 +1037,13 @@ static int hpsbpkt_thread(void *__hi)</div><div class='ctx'> </div><div class='ctx'> 			complete_routine(complete_data);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	complete_and_exit(&amp;khpsbpkt_complete, 0);</div><div class='add'>+		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+		if (!skb_peek(&amp;hpsbpkt_queue))</div><div class='add'>+			schedule();</div><div class='add'>+		__set_current_state(TASK_RUNNING);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init ieee1394_init(void)</div><div class='hunk'>@@ -1065,10 +1058,10 @@ static int __init ieee1394_init(void)</div><div class='ctx'> 		HPSB_ERR("Some features may not be available\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	khpsbpkt_pid = kernel_thread(hpsbpkt_thread, NULL, CLONE_KERNEL);</div><div class='del'>-	if (khpsbpkt_pid &lt; 0) {</div><div class='add'>+	khpsbpkt_thread = kthread_run(hpsbpkt_thread, NULL, "khpsbpkt");</div><div class='add'>+	if (IS_ERR(khpsbpkt_thread)) {</div><div class='ctx'> 		HPSB_ERR("Failed to start hpsbpkt thread!\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='add'>+		ret = PTR_ERR(khpsbpkt_thread);</div><div class='ctx'> 		goto exit_cleanup_config_roms;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1148,10 +1141,7 @@ release_all_bus:</div><div class='ctx'> release_chrdev:</div><div class='ctx'> 	unregister_chrdev_region(IEEE1394_CORE_DEV, 256);</div><div class='ctx'> exit_release_kernel_thread:</div><div class='del'>-	if (khpsbpkt_pid &gt;= 0) {</div><div class='del'>-		kill_proc(khpsbpkt_pid, SIGTERM, 1);</div><div class='del'>-		wait_for_completion(&amp;khpsbpkt_complete);</div><div class='del'>-	}</div><div class='add'>+	kthread_stop(khpsbpkt_thread);</div><div class='ctx'> exit_cleanup_config_roms:</div><div class='ctx'> 	hpsb_cleanup_config_roms();</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1172,12 +1162,7 @@ static void __exit ieee1394_cleanup(void)</div><div class='ctx'> 		bus_remove_file(&amp;ieee1394_bus_type, fw_bus_attrs[i]);</div><div class='ctx'> 	bus_unregister(&amp;ieee1394_bus_type);</div><div class='ctx'> </div><div class='del'>-	if (khpsbpkt_pid &gt;= 0) {</div><div class='del'>-		khpsbpkt_kill = 1;</div><div class='del'>-		mb();</div><div class='del'>-		up(&amp;khpsbpkt_sig);</div><div class='del'>-		wait_for_completion(&amp;khpsbpkt_complete);</div><div class='del'>-	}</div><div class='add'>+	kthread_stop(khpsbpkt_thread);</div><div class='ctx'> </div><div class='ctx'> 	hpsb_cleanup_config_roms();</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h<br/>index e7b55e895f50..0ecbf335c64f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/ieee1394_core.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ieee1394_core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/ieee1394_core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/ieee1394_core.h</a></div><div class='hunk'>@@ -139,7 +139,7 @@ int hpsb_bus_reset(struct hpsb_host *host);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Hand over received selfid packet to the core.  Complement check (second</div><div class='del'>- * quadlet is complement of first) is expected to be done and succesful.</div><div class='add'>+ * quadlet is complement of first) is expected to be done and successful.</div><div class='ctx'>  */</div><div class='ctx'> void hpsb_selfid_received(struct hpsb_host *host, quadlet_t sid);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c<br/>index 3fe2f6c4a253..a114b91d606d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/ieee1394_transactions.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ieee1394_transactions.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/ieee1394_transactions.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/ieee1394_transactions.c</a></div><div class='hunk'>@@ -136,8 +136,11 @@ int hpsb_get_tlabel(struct hpsb_packet *packet)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct hpsb_tlabel_pool *tp;</div><div class='add'>+	int n = NODEID_TO_NODE(packet-&gt;node_id);</div><div class='ctx'> </div><div class='del'>-	tp = &amp;packet-&gt;host-&gt;tpool[packet-&gt;node_id &amp; NODE_MASK];</div><div class='add'>+	if (unlikely(n == ALL_NODES))</div><div class='add'>+		return 0;</div><div class='add'>+	tp = &amp;packet-&gt;host-&gt;tpool[n];</div><div class='ctx'> </div><div class='ctx'> 	if (irqs_disabled() || in_atomic()) {</div><div class='ctx'> 		if (down_trylock(&amp;tp-&gt;count))</div><div class='hunk'>@@ -175,8 +178,11 @@ void hpsb_free_tlabel(struct hpsb_packet *packet)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct hpsb_tlabel_pool *tp;</div><div class='add'>+	int n = NODEID_TO_NODE(packet-&gt;node_id);</div><div class='ctx'> </div><div class='del'>-	tp = &amp;packet-&gt;host-&gt;tpool[packet-&gt;node_id &amp; NODE_MASK];</div><div class='add'>+	if (unlikely(n == ALL_NODES))</div><div class='add'>+		return;</div><div class='add'>+	tp = &amp;packet-&gt;host-&gt;tpool[n];</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(packet-&gt;tlabel &gt; 63 || packet-&gt;tlabel &lt; 0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c<br/>index 082c7fd239f5..d541b508a159 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/nodemgr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/nodemgr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/nodemgr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/nodemgr.c</a></div><div class='hunk'>@@ -8,8 +8,8 @@</div><div class='ctx'>  * directory of the kernel sources for details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='hunk'>@@ -38,6 +38,7 @@ struct nodemgr_csr_info {</div><div class='ctx'> 	struct hpsb_host *host;</div><div class='ctx'> 	nodeid_t nodeid;</div><div class='ctx'> 	unsigned int generation;</div><div class='add'>+	unsigned int speed_unverified:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -57,23 +58,75 @@ static char *nodemgr_find_oui_name(int oui)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Correct the speed map entry.  This is necessary</div><div class='add'>+ *  - for nodes with link speed &lt; phy speed,</div><div class='add'>+ *  - for 1394b nodes with negotiated phy port speed &lt; IEEE1394_SPEED_MAX.</div><div class='add'>+ * A possible speed is determined by trial and error, using quadlet reads.</div><div class='add'>+ */</div><div class='add'>+static int nodemgr_check_speed(struct nodemgr_csr_info *ci, u64 addr,</div><div class='add'>+			       quadlet_t *buffer)</div><div class='add'>+{</div><div class='add'>+	quadlet_t q;</div><div class='add'>+	u8 i, *speed, old_speed, good_speed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	speed = ci-&gt;host-&gt;speed + NODEID_TO_NODE(ci-&gt;nodeid);</div><div class='add'>+	old_speed = *speed;</div><div class='add'>+	good_speed = IEEE1394_SPEED_MAX + 1;</div><div class='add'>+</div><div class='add'>+	/* Try every speed from S100 to old_speed.</div><div class='add'>+	 * If we did it the other way around, a too low speed could be caught</div><div class='add'>+	 * if the retry succeeded for some other reason, e.g. because the link</div><div class='add'>+	 * just finished its initialization. */</div><div class='add'>+	for (i = IEEE1394_SPEED_100; i &lt;= old_speed; i++) {</div><div class='add'>+		*speed = i;</div><div class='add'>+		ret = hpsb_read(ci-&gt;host, ci-&gt;nodeid, ci-&gt;generation, addr,</div><div class='add'>+				&amp;q, sizeof(quadlet_t));</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+		*buffer = q;</div><div class='add'>+		good_speed = i;</div><div class='add'>+	}</div><div class='add'>+	if (good_speed &lt;= IEEE1394_SPEED_MAX) {</div><div class='add'>+		HPSB_DEBUG("Speed probe of node " NODE_BUS_FMT " yields %s",</div><div class='add'>+			   NODE_BUS_ARGS(ci-&gt;host, ci-&gt;nodeid),</div><div class='add'>+			   hpsb_speedto_str[good_speed]);</div><div class='add'>+		*speed = good_speed;</div><div class='add'>+		ci-&gt;speed_unverified = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	*speed = old_speed;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,</div><div class='ctx'>                             void *buffer, void *__ci)</div><div class='ctx'> {</div><div class='ctx'> 	struct nodemgr_csr_info *ci = (struct nodemgr_csr_info*)__ci;</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; ; i++) {</div><div class='ctx'> 		ret = hpsb_read(ci-&gt;host, ci-&gt;nodeid, ci-&gt;generation, addr,</div><div class='ctx'> 				buffer, length);</div><div class='del'>-		if (!ret || i == 3)</div><div class='add'>+		if (!ret) {</div><div class='add'>+			ci-&gt;speed_unverified = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* Give up after 3rd failure. */</div><div class='add'>+		if (i == 3)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		/* The ieee1394_core guessed the node's speed capability from</div><div class='add'>+		 * the self ID.  Check whether a lower speed works. */</div><div class='add'>+		if (ci-&gt;speed_unverified &amp;&amp; length == sizeof(quadlet_t)) {</div><div class='add'>+			ret = nodemgr_check_speed(ci, addr, buffer);</div><div class='add'>+			if (!ret)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 		if (msleep_interruptible(334))</div><div class='ctx'> 			return -EINTR;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -281,10 +334,12 @@ static ssize_t fw_show_ne_bus_options(struct device *dev, struct device_attribut</div><div class='ctx'> static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL);</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* tlabels_free, tlabels_allocations, tlabels_mask are read non-atomically</div><div class='add'>+ * here, therefore displayed values may be occasionally wrong. */</div><div class='ctx'> static ssize_t fw_show_ne_tlabels_free(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct node_entry *ne = container_of(dev, struct node_entry, device);</div><div class='del'>-	return sprintf(buf, "%d\n", atomic_read(&amp;ne-&gt;tpool-&gt;count.count) + 1);</div><div class='add'>+	return sprintf(buf, "%d\n", 64 - bitmap_weight(ne-&gt;tpool-&gt;pool, 64));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -1204,6 +1259,8 @@ static void nodemgr_node_scan_one(struct host_info *hi,</div><div class='ctx'> 	ci-&gt;host = host;</div><div class='ctx'> 	ci-&gt;nodeid = nodeid;</div><div class='ctx'> 	ci-&gt;generation = generation;</div><div class='add'>+	ci-&gt;speed_unverified =</div><div class='add'>+		host-&gt;speed[NODEID_TO_NODE(nodeid)] &gt; IEEE1394_SPEED_100;</div><div class='ctx'> </div><div class='ctx'> 	/* We need to detect when the ConfigROM's generation has changed,</div><div class='ctx'> 	 * so we only update the node's info when it needs to be.  */</div><div class='head'>diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c<br/>index 11f13778f139..d4bad6704bbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/ohci1394.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ohci1394.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/ohci1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/ohci1394.c</a></div><div class='hunk'>@@ -82,7 +82,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -163,7 +162,7 @@ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci-&gt;host-&gt;id ,</div><div class='ctx'> </div><div class='ctx'> /* Module Parameters */</div><div class='ctx'> static int phys_dma = 1;</div><div class='del'>-module_param(phys_dma, int, 0644);</div><div class='add'>+module_param(phys_dma, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(phys_dma, "Enable physical dma (default = 1).");</div><div class='ctx'> </div><div class='ctx'> static void dma_trm_tasklet(unsigned long data);</div><div class='hunk'>@@ -553,7 +552,8 @@ static void ohci_initialize(struct ti_ohci *ohci)</div><div class='ctx'> 	 * register content.</div><div class='ctx'> 	 * To actually enable physical responses is the job of our interrupt</div><div class='ctx'> 	 * handler which programs the physical request filter. */</div><div class='del'>-	reg_write(ohci, OHCI1394_PhyUpperBound, 0x01000000);</div><div class='add'>+	reg_write(ohci, OHCI1394_PhyUpperBound,</div><div class='add'>+		  OHCI1394_PHYS_UPPER_BOUND_PROGRAMMED &gt;&gt; 16);</div><div class='ctx'> </div><div class='ctx'> 	DBGMSG("physUpperBoundOffset=%08x",</div><div class='ctx'> 	       reg_read(ohci, OHCI1394_PhyUpperBound));</div><div class='hunk'>@@ -580,23 +580,20 @@ static void ohci_initialize(struct ti_ohci *ohci)</div><div class='ctx'> 		  OHCI1394_isochRx |</div><div class='ctx'> 		  OHCI1394_isochTx |</div><div class='ctx'> 		  OHCI1394_postedWriteErr |</div><div class='add'>+		  OHCI1394_cycleTooLong |</div><div class='ctx'> 		  OHCI1394_cycleInconsistent);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable link */</div><div class='ctx'> 	reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_linkEnable);</div><div class='ctx'> </div><div class='ctx'> 	buf = reg_read(ohci, OHCI1394_Version);</div><div class='del'>-#ifndef __sparc__</div><div class='ctx'> 	sprintf (irq_buf, "%d", ohci-&gt;dev-&gt;irq);</div><div class='del'>-#else</div><div class='del'>-	sprintf (irq_buf, "%s", __irq_itoa(ohci-&gt;dev-&gt;irq));</div><div class='del'>-#endif</div><div class='ctx'> 	PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s]  "</div><div class='del'>-	      "MMIO=[%lx-%lx]  Max Packet=[%d]  IR/IT contexts=[%d/%d]",</div><div class='add'>+	      "MMIO=[%llx-%llx]  Max Packet=[%d]  IR/IT contexts=[%d/%d]",</div><div class='ctx'> 	      ((((buf) &gt;&gt; 16) &amp; 0xf) + (((buf) &gt;&gt; 20) &amp; 0xf) * 10),</div><div class='ctx'> 	      ((((buf) &gt;&gt; 4) &amp; 0xf) + ((buf) &amp; 0xf) * 10), irq_buf,</div><div class='del'>-	      pci_resource_start(ohci-&gt;dev, 0),</div><div class='del'>-	      pci_resource_start(ohci-&gt;dev, 0) + OHCI1394_REGISTER_SIZE - 1,</div><div class='add'>+	      (unsigned long long)pci_resource_start(ohci-&gt;dev, 0),</div><div class='add'>+	      (unsigned long long)pci_resource_start(ohci-&gt;dev, 0) + OHCI1394_REGISTER_SIZE - 1,</div><div class='ctx'> 	      ohci-&gt;max_packet_size,</div><div class='ctx'> 	      ohci-&gt;nb_iso_rcv_ctx, ohci-&gt;nb_iso_xmit_ctx);</div><div class='ctx'> </div><div class='hunk'>@@ -2386,6 +2383,15 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,</div><div class='ctx'> 		PRINT(KERN_ERR, "physical posted write error");</div><div class='ctx'> 		/* no recovery strategy yet, had to involve protocol drivers */</div><div class='ctx'> 	}</div><div class='add'>+	if (event &amp; OHCI1394_cycleTooLong) {</div><div class='add'>+		if(printk_ratelimit())</div><div class='add'>+			PRINT(KERN_WARNING, "isochronous cycle too long");</div><div class='add'>+		else</div><div class='add'>+			DBGMSG("OHCI1394_cycleTooLong");</div><div class='add'>+		reg_write(ohci, OHCI1394_LinkControlSet,</div><div class='add'>+			  OHCI1394_LinkControl_CycleMaster);</div><div class='add'>+		event &amp;= ~OHCI1394_cycleTooLong;</div><div class='add'>+	}</div><div class='ctx'> 	if (event &amp; OHCI1394_cycleInconsistent) {</div><div class='ctx'> 		/* We subscribe to the cycleInconsistent event only to</div><div class='ctx'> 		 * clear the corresponding event bit... otherwise,</div><div class='hunk'>@@ -3210,7 +3216,7 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct hpsb_host *host;</div><div class='ctx'> 	struct ti_ohci *ohci;	/* shortcut to currently handled device */</div><div class='del'>-	unsigned long ohci_base;</div><div class='add'>+	resource_size_t ohci_base;</div><div class='ctx'> </div><div class='ctx'>         if (pci_enable_device(dev))</div><div class='ctx'> 		FAIL(-ENXIO, "Failed to enable OHCI hardware");</div><div class='hunk'>@@ -3263,15 +3269,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	 * clearly says it's 2kb, so this shouldn't be a problem. */</div><div class='ctx'> 	ohci_base = pci_resource_start(dev, 0);</div><div class='ctx'> 	if (pci_resource_len(dev, 0) &lt; OHCI1394_REGISTER_SIZE)</div><div class='del'>-		PRINT(KERN_WARNING, "PCI resource length of %lx too small!",</div><div class='del'>-		      pci_resource_len(dev, 0));</div><div class='add'>+		PRINT(KERN_WARNING, "PCI resource length of 0x%llx too small!",</div><div class='add'>+		      (unsigned long long)pci_resource_len(dev, 0));</div><div class='ctx'> </div><div class='ctx'> 	/* Seems PCMCIA handles this internally. Not sure why. Seems</div><div class='ctx'> 	 * pretty bogus to force a driver to special case this.  */</div><div class='ctx'> #ifndef PCMCIA</div><div class='ctx'> 	if (!request_mem_region (ohci_base, OHCI1394_REGISTER_SIZE, OHCI1394_DRIVER_NAME))</div><div class='del'>-		FAIL(-ENOMEM, "MMIO resource (0x%lx - 0x%lx) unavailable",</div><div class='del'>-		     ohci_base, ohci_base + OHCI1394_REGISTER_SIZE);</div><div class='add'>+		FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable",</div><div class='add'>+			(unsigned long long)ohci_base,</div><div class='add'>+			(unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE);</div><div class='ctx'> #endif</div><div class='ctx'> 	ohci-&gt;init_state = OHCI_INIT_HAVE_MEM_REGION;</div><div class='ctx'> </div><div class='hunk'>@@ -3385,12 +3392,12 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	spin_lock_init(&amp;ohci-&gt;event_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * interrupts are disabled, all right, but... due to SA_SHIRQ we</div><div class='add'>+	 * interrupts are disabled, all right, but... due to IRQF_SHARED we</div><div class='ctx'> 	 * might get called anyway.  We'll see no event, of course, but</div><div class='ctx'> 	 * we need to get to that "no event", so enough should be initialized</div><div class='ctx'> 	 * by that point.</div><div class='ctx'> 	 */</div><div class='del'>-	if (request_irq(dev-&gt;irq, ohci_irq_handler, SA_SHIRQ,</div><div class='add'>+	if (request_irq(dev-&gt;irq, ohci_irq_handler, IRQF_SHARED,</div><div class='ctx'> 			 OHCI1394_DRIVER_NAME, ohci))</div><div class='ctx'> 		FAIL(-ENOMEM, "Failed to allocate shared interrupt %d", dev-&gt;irq);</div><div class='ctx'> </div><div class='hunk'>@@ -3404,6 +3411,14 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	host-&gt;csr.max_rec = (reg_read(ohci, OHCI1394_BusOptions) &gt;&gt; 12) &amp; 0xf;</div><div class='ctx'> 	host-&gt;csr.lnk_spd = reg_read(ohci, OHCI1394_BusOptions) &amp; 0x7;</div><div class='ctx'> </div><div class='add'>+	if (phys_dma) {</div><div class='add'>+		host-&gt;low_addr_space =</div><div class='add'>+			(u64) reg_read(ohci, OHCI1394_PhyUpperBound) &lt;&lt; 16;</div><div class='add'>+		if (!host-&gt;low_addr_space)</div><div class='add'>+			host-&gt;low_addr_space = OHCI1394_PHYS_UPPER_BOUND_FIXED;</div><div class='add'>+	}</div><div class='add'>+	host-&gt;middle_addr_space = OHCI1394_MIDDLE_ADDRESS_SPACE;</div><div class='add'>+</div><div class='ctx'> 	/* Tell the highlevel this host is ready */</div><div class='ctx'> 	if (hpsb_add_host(host))</div><div class='ctx'> 		FAIL(-ENOMEM, "Failed to register host with highlevel");</div><div class='hunk'>@@ -3462,24 +3477,13 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE:</div><div class='ctx'> 		/* The ohci_soft_reset() stops all DMA contexts, so we</div><div class='ctx'> 		 * dont need to do this.  */</div><div class='del'>-		/* Free AR dma */</div><div class='ctx'> 		free_dma_rcv_ctx(&amp;ohci-&gt;ar_req_context);</div><div class='ctx'> 		free_dma_rcv_ctx(&amp;ohci-&gt;ar_resp_context);</div><div class='del'>-</div><div class='del'>-		/* Free AT dma */</div><div class='ctx'> 		free_dma_trm_ctx(&amp;ohci-&gt;at_req_context);</div><div class='ctx'> 		free_dma_trm_ctx(&amp;ohci-&gt;at_resp_context);</div><div class='del'>-</div><div class='del'>-		/* Free IR dma */</div><div class='ctx'> 		free_dma_rcv_ctx(&amp;ohci-&gt;ir_legacy_context);</div><div class='del'>-</div><div class='del'>-		/* Free IT dma */</div><div class='ctx'> 		free_dma_trm_ctx(&amp;ohci-&gt;it_legacy_context);</div><div class='ctx'> </div><div class='del'>-		/* Free IR legacy dma */</div><div class='del'>-		free_dma_rcv_ctx(&amp;ohci-&gt;ir_legacy_context);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	case OHCI_INIT_HAVE_SELFID_BUFFER:</div><div class='ctx'> 		pci_free_consistent(ohci-&gt;dev, OHCI1394_SI_DMA_BUF_SIZE,</div><div class='ctx'> 				    ohci-&gt;selfid_buf_cpu,</div><div class='hunk'>@@ -3539,6 +3543,7 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_PPC_PMAC */</div><div class='ctx'> </div><div class='add'>+	pci_restore_state(pdev);</div><div class='ctx'> 	pci_enable_device(pdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3558,6 +3563,8 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h<br/>index 7df0962144e3..fa05f113f7f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/ohci1394.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/ohci1394.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/ohci1394.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/ohci1394.h</a></div><div class='hunk'>@@ -443,6 +443,16 @@ static inline u32 reg_read(const struct ti_ohci *ohci, int offset)</div><div class='ctx'> </div><div class='ctx'> #define OHCI1394_TCODE_PHY               0xE</div><div class='ctx'> </div><div class='add'>+/* Node offset map (phys DMA area, posted write area).</div><div class='add'>+ * The value of OHCI1394_PHYS_UPPER_BOUND_PROGRAMMED may be modified but must</div><div class='add'>+ * be lower than OHCI1394_MIDDLE_ADDRESS_SPACE.</div><div class='add'>+ * OHCI1394_PHYS_UPPER_BOUND_FIXED and OHCI1394_MIDDLE_ADDRESS_SPACE are</div><div class='add'>+ * constants given by the OHCI spec.</div><div class='add'>+ */</div><div class='add'>+#define OHCI1394_PHYS_UPPER_BOUND_FIXED		0x000100000000ULL /* 4 GB */</div><div class='add'>+#define OHCI1394_PHYS_UPPER_BOUND_PROGRAMMED	0x010000000000ULL /* 1 TB */</div><div class='add'>+#define OHCI1394_MIDDLE_ADDRESS_SPACE		0xffff00000000ULL</div><div class='add'>+</div><div class='ctx'> void ohci1394_init_iso_tasklet(struct ohci1394_iso_tasklet *tasklet,</div><div class='ctx'> 			       int type,</div><div class='ctx'> 			       void (*func)(unsigned long),</div><div class='head'>diff --git a/drivers/ieee1394/oui2c.sh b/drivers/ieee1394/oui2c.sh<br/>index d50dc7a2d087..b9d0e8f10abb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/oui2c.sh?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/oui2c.sh</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/oui2c.sh?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/oui2c.sh</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'> cat &lt;&lt;EOF</div><div class='ctx'> /* Generated file for OUI database */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IEEE1394_OUI_DB</div><div class='ctx'> struct oui_list_struct {</div><div class='head'>diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c<br/>index e2edc41e1b6f..e6f41238f5e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/pcilynx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/pcilynx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/pcilynx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/pcilynx.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *        Enhancements in async and iso send code</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -1252,13 +1251,9 @@ static int __devinit add_card(struct pci_dev *dev,</div><div class='ctx'>         /* Fix buggy cards with autoboot pin not tied low: */</div><div class='ctx'>         reg_write(lynx, DMA0_CHAN_CTRL, 0);</div><div class='ctx'> </div><div class='del'>-#ifndef __sparc__</div><div class='ctx'> 	sprintf (irq_buf, "%d", dev-&gt;irq);</div><div class='del'>-#else</div><div class='del'>-	sprintf (irq_buf, "%s", __irq_itoa(dev-&gt;irq));</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-        if (!request_irq(dev-&gt;irq, lynx_irq_handler, SA_SHIRQ,</div><div class='add'>+        if (!request_irq(dev-&gt;irq, lynx_irq_handler, IRQF_SHARED,</div><div class='ctx'>                          PCILYNX_DRIVER_NAME, lynx)) {</div><div class='ctx'>                 PRINT(KERN_INFO, lynx-&gt;id, "allocated interrupt %s", irq_buf);</div><div class='ctx'>                 lynx-&gt;state = have_intr;</div><div class='head'>diff --git a/drivers/ieee1394/pcilynx.h b/drivers/ieee1394/pcilynx.h<br/>index d631aa8383ad..ec27321f6724 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/pcilynx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/pcilynx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/pcilynx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/pcilynx.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef __PCILYNX_H__</div><div class='ctx'> #define __PCILYNX_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PCILYNX_DRIVER_NAME      "pcilynx"</div><div class='ctx'> #define PCILYNX_MAJOR            177</div><div class='head'>diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c<br/>index f7de546f2ed6..571ea68c0cf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/raw1394.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/raw1394.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/raw1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/raw1394.c</a></div><div class='hunk'>@@ -132,8 +132,7 @@ static void free_pending_request(struct pending_request *req)</div><div class='ctx'> static void __queue_complete_req(struct pending_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_info *fi = req-&gt;file_info;</div><div class='del'>-	list_del(&amp;req-&gt;list);</div><div class='del'>-	list_add_tail(&amp;req-&gt;list, &amp;fi-&gt;req_complete);</div><div class='add'>+	list_move_tail(&amp;req-&gt;list, &amp;fi-&gt;req_complete);</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;fi-&gt;complete_sem);</div><div class='ctx'> 	wake_up_interruptible(&amp;fi-&gt;poll_wait_complete);</div><div class='hunk'>@@ -408,34 +407,34 @@ static void fcp_request(struct hpsb_host *host, int nodeid, int direction,</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> struct compat_raw1394_req {</div><div class='del'>-        __u32 type;</div><div class='del'>-        __s32 error;</div><div class='del'>-        __u32 misc;</div><div class='add'>+	__u32 type;</div><div class='add'>+	__s32 error;</div><div class='add'>+	__u32 misc;</div><div class='ctx'> </div><div class='del'>-        __u32 generation;</div><div class='del'>-        __u32 length;</div><div class='add'>+	__u32 generation;</div><div class='add'>+	__u32 length;</div><div class='ctx'> </div><div class='del'>-        __u64 address;</div><div class='add'>+	__u64 address;</div><div class='ctx'> </div><div class='del'>-        __u64 tag;</div><div class='add'>+	__u64 tag;</div><div class='ctx'> </div><div class='del'>-        __u64 sendb;</div><div class='del'>-        __u64 recvb;</div><div class='del'>-}  __attribute__((packed));</div><div class='add'>+	__u64 sendb;</div><div class='add'>+	__u64 recvb;</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> static const char __user *raw1394_compat_write(const char __user *buf)</div><div class='ctx'> {</div><div class='del'>-	struct compat_raw1394_req __user *cr = (typeof(cr)) buf; </div><div class='add'>+	struct compat_raw1394_req __user *cr = (typeof(cr)) buf;</div><div class='ctx'> 	struct raw1394_request __user *r;</div><div class='ctx'> 	r = compat_alloc_user_space(sizeof(struct raw1394_request));</div><div class='ctx'> </div><div class='ctx'> #define C(x) __copy_in_user(&amp;r-&gt;x, &amp;cr-&gt;x, sizeof(r-&gt;x))</div><div class='ctx'> </div><div class='ctx'> 	if (copy_in_user(r, cr, sizeof(struct compat_raw1394_req)) ||</div><div class='del'>-		C(address) ||</div><div class='del'>-		C(tag) ||</div><div class='del'>-		C(sendb) ||</div><div class='del'>-		C(recvb))</div><div class='add'>+	    C(address) ||</div><div class='add'>+	    C(tag) ||</div><div class='add'>+	    C(sendb) ||</div><div class='add'>+	    C(recvb))</div><div class='ctx'> 		return ERR_PTR(-EFAULT);</div><div class='ctx'> 	return (const char __user *)r;</div><div class='ctx'> }</div><div class='hunk'>@@ -443,11 +442,11 @@ static const char __user *raw1394_compat_write(const char __user *buf)</div><div class='ctx'> </div><div class='ctx'> #define P(x) __put_user(r-&gt;x, &amp;cr-&gt;x)</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> raw1394_compat_read(const char __user *buf, struct raw1394_request *r)</div><div class='ctx'> {</div><div class='del'>-	struct compat_raw1394_req __user *cr = (typeof(cr)) r; </div><div class='del'>-	if (!access_ok(VERIFY_WRITE,cr,sizeof(struct compat_raw1394_req)) ||</div><div class='add'>+	struct compat_raw1394_req __user *cr = (typeof(cr)) r;</div><div class='add'>+	if (!access_ok(VERIFY_WRITE, cr, sizeof(struct compat_raw1394_req)) ||</div><div class='ctx'> 	    P(type) ||</div><div class='ctx'> 	    P(error) ||</div><div class='ctx'> 	    P(misc) ||</div><div class='hunk'>@@ -512,18 +511,17 @@ static ssize_t raw1394_read(struct file *file, char __user * buffer,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	if (count == sizeof(struct compat_raw1394_req) &amp;&amp; </div><div class='del'>-   		sizeof(struct compat_raw1394_req) != </div><div class='del'>-			sizeof(struct raw1394_request)) { </div><div class='add'>+	if (count == sizeof(struct compat_raw1394_req) &amp;&amp;</div><div class='add'>+   	    sizeof(struct compat_raw1394_req) !=</div><div class='add'>+			sizeof(struct raw1394_request)) {</div><div class='ctx'> 		ret = raw1394_compat_read(buffer, &amp;req-&gt;req);</div><div class='del'>-</div><div class='del'>-	} else	</div><div class='add'>+	} else</div><div class='ctx'> #endif</div><div class='ctx'> 	{</div><div class='ctx'> 		if (copy_to_user(buffer, &amp;req-&gt;req, sizeof(req-&gt;req))) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 			goto out;</div><div class='del'>-		}		</div><div class='add'>+		}</div><div class='ctx'> 		ret = (ssize_t) sizeof(struct raw1394_request);</div><div class='ctx'> 	}</div><div class='ctx'>       out:</div><div class='hunk'>@@ -2348,7 +2346,6 @@ static int state_connected(struct file_info *fi, struct pending_request *req)</div><div class='ctx'> 	return handle_async_request(fi, req, node);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static ssize_t raw1394_write(struct file *file, const char __user * buffer,</div><div class='ctx'> 			     size_t count, loff_t * offset_is_ignored)</div><div class='ctx'> {</div><div class='hunk'>@@ -2357,9 +2354,9 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,</div><div class='ctx'> 	ssize_t retval = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-	if (count == sizeof(struct compat_raw1394_req) &amp;&amp; </div><div class='del'>-   		sizeof(struct compat_raw1394_req) != </div><div class='del'>-			sizeof(struct raw1394_request)) { </div><div class='add'>+	if (count == sizeof(struct compat_raw1394_req) &amp;&amp;</div><div class='add'>+   	    sizeof(struct compat_raw1394_req) !=</div><div class='add'>+			sizeof(struct raw1394_request)) {</div><div class='ctx'> 		buffer = raw1394_compat_write(buffer);</div><div class='ctx'> 		if (IS_ERR(buffer))</div><div class='ctx'> 			return PTR_ERR(buffer);</div><div class='head'>diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c<br/>index 8a23fb54c693..aaa74f293aaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/sbp2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/sbp2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/sbp2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/sbp2.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  *	  but the code needs additional debugging.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -127,10 +126,12 @@ MODULE_PARM_DESC(max_sectors, "Change max sectors per I/O supported (default = "</div><div class='ctx'>  * talking to a single sbp2 device at the same time (filesystem coherency,</div><div class='ctx'>  * etc.). If you're running an sbp2 device that supports multiple logins,</div><div class='ctx'>  * and you're either running read-only filesystems or some sort of special</div><div class='del'>- * filesystem supporting multiple hosts (one such filesystem is OpenGFS,</div><div class='del'>- * see opengfs.sourceforge.net for more info), then set exclusive_login</div><div class='del'>- * to zero. Note: The Oxsemi OXFW911 sbp2 chipset supports up to four</div><div class='del'>- * concurrent logins.</div><div class='add'>+ * filesystem supporting multiple hosts, e.g. OpenGFS, Oracle Cluster</div><div class='add'>+ * File System, or Lustre, then set exclusive_login to zero.</div><div class='add'>+ *</div><div class='add'>+ * So far only bridges from Oxford Semiconductor are known to support</div><div class='add'>+ * concurrent logins. Depending on firmware, four or two concurrent logins</div><div class='add'>+ * are possible on OXFW911 and newer Oxsemi bridges.</div><div class='ctx'>  */</div><div class='ctx'> static int exclusive_login = 1;</div><div class='ctx'> module_param(exclusive_login, int, 0644);</div><div class='hunk'>@@ -306,8 +307,9 @@ static const struct {</div><div class='ctx'> 	u32 model_id;</div><div class='ctx'> 	unsigned workarounds;</div><div class='ctx'> } sbp2_workarounds_table[] = {</div><div class='del'>-	/* TSB42AA9 */ {</div><div class='add'>+	/* DViCO Momobay CX-1 with TSB42AA9 bridge */ {</div><div class='ctx'> 		.firmware_revision	= 0x002800,</div><div class='add'>+		.model_id		= 0x001010,</div><div class='ctx'> 		.workarounds		= SBP2_WORKAROUND_INQUIRY_36 |</div><div class='ctx'> 					  SBP2_WORKAROUND_MODE_SENSE_8,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -791,12 +793,12 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud</div><div class='ctx'> 	scsi_id-&gt;ud = ud;</div><div class='ctx'> 	scsi_id-&gt;speed_code = IEEE1394_SPEED_100;</div><div class='ctx'> 	scsi_id-&gt;max_payload_size = sbp2_speedto_max_payload[IEEE1394_SPEED_100];</div><div class='add'>+	scsi_id-&gt;status_fifo_addr = CSR1212_INVALID_ADDR_SPACE;</div><div class='ctx'> 	atomic_set(&amp;scsi_id-&gt;sbp2_login_complete, 0);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;scsi_id-&gt;sbp2_command_orb_inuse);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;scsi_id-&gt;sbp2_command_orb_completed);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;scsi_id-&gt;scsi_list);</div><div class='ctx'> 	spin_lock_init(&amp;scsi_id-&gt;sbp2_command_orb_lock);</div><div class='del'>-	scsi_id-&gt;sbp2_lun = 0;</div><div class='ctx'> </div><div class='ctx'> 	ud-&gt;device.driver_data = scsi_id;</div><div class='ctx'> </div><div class='hunk'>@@ -844,8 +846,8 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud</div><div class='ctx'> 	scsi_id-&gt;status_fifo_addr = hpsb_allocate_and_register_addrspace(</div><div class='ctx'> 			&amp;sbp2_highlevel, ud-&gt;ne-&gt;host, &amp;sbp2_ops,</div><div class='ctx'> 			sizeof(struct sbp2_status_block), sizeof(quadlet_t),</div><div class='del'>-			0x010000000000ULL, CSR1212_ALL_SPACE_END);</div><div class='del'>-	if (!scsi_id-&gt;status_fifo_addr) {</div><div class='add'>+			ud-&gt;ne-&gt;host-&gt;low_addr_space, CSR1212_ALL_SPACE_END);</div><div class='add'>+	if (scsi_id-&gt;status_fifo_addr == CSR1212_INVALID_ADDR_SPACE) {</div><div class='ctx'> 		SBP2_ERR("failed to allocate status FIFO address range");</div><div class='ctx'> 		goto failed_alloc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1087,9 +1089,9 @@ static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id)</div><div class='ctx'> 		SBP2_DMA_FREE("single query logins data");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (scsi_id-&gt;status_fifo_addr)</div><div class='add'>+	if (scsi_id-&gt;status_fifo_addr != CSR1212_INVALID_ADDR_SPACE)</div><div class='ctx'> 		hpsb_unregister_addrspace(&amp;sbp2_highlevel, hi-&gt;host,</div><div class='del'>-			scsi_id-&gt;status_fifo_addr);</div><div class='add'>+					  scsi_id-&gt;status_fifo_addr);</div><div class='ctx'> </div><div class='ctx'> 	scsi_id-&gt;ud-&gt;device.driver_data = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1213,13 +1215,11 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id)</div><div class='ctx'> 	SBP2_DEBUG("length_max_logins = %x",</div><div class='ctx'> 		   (unsigned int)scsi_id-&gt;query_logins_response-&gt;length_max_logins);</div><div class='ctx'> </div><div class='del'>-	SBP2_DEBUG("Query logins to SBP-2 device successful");</div><div class='del'>-</div><div class='ctx'> 	max_logins = RESPONSE_GET_MAX_LOGINS(scsi_id-&gt;query_logins_response-&gt;length_max_logins);</div><div class='del'>-	SBP2_DEBUG("Maximum concurrent logins supported: %d", max_logins);</div><div class='add'>+	SBP2_INFO("Maximum concurrent logins supported: %d", max_logins);</div><div class='ctx'> </div><div class='ctx'> 	active_logins = RESPONSE_GET_ACTIVE_LOGINS(scsi_id-&gt;query_logins_response-&gt;length_max_logins);</div><div class='del'>-	SBP2_DEBUG("Number of active logins: %d", active_logins);</div><div class='add'>+	SBP2_INFO("Number of active logins: %d", active_logins);</div><div class='ctx'> </div><div class='ctx'> 	if (active_logins &gt;= max_logins) {</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -1648,6 +1648,8 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define SBP2_PAYLOAD_TO_BYTES(p) (1 &lt;&lt; ((p) + 2))</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function is called in order to determine the max speed and packet</div><div class='ctx'>  * size we can use in our ORBs. Note, that we (the driver and host) only</div><div class='hunk'>@@ -1660,13 +1662,12 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,</div><div class='ctx'> static int sbp2_max_speed_and_size(struct scsi_id_instance_data *scsi_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbp2scsi_host_info *hi = scsi_id-&gt;hi;</div><div class='add'>+	u8 payload;</div><div class='ctx'> </div><div class='ctx'> 	SBP2_DEBUG_ENTER();</div><div class='ctx'> </div><div class='del'>-	/* Initial setting comes from the hosts speed map */</div><div class='ctx'> 	scsi_id-&gt;speed_code =</div><div class='del'>-	    hi-&gt;host-&gt;speed_map[NODEID_TO_NODE(hi-&gt;host-&gt;node_id) * 64 +</div><div class='del'>-				NODEID_TO_NODE(scsi_id-&gt;ne-&gt;nodeid)];</div><div class='add'>+	    hi-&gt;host-&gt;speed[NODEID_TO_NODE(scsi_id-&gt;ne-&gt;nodeid)];</div><div class='ctx'> </div><div class='ctx'> 	/* Bump down our speed if the user requested it */</div><div class='ctx'> 	if (scsi_id-&gt;speed_code &gt; max_speed) {</div><div class='hunk'>@@ -1677,15 +1678,22 @@ static int sbp2_max_speed_and_size(struct scsi_id_instance_data *scsi_id)</div><div class='ctx'> </div><div class='ctx'> 	/* Payload size is the lesser of what our speed supports and what</div><div class='ctx'> 	 * our host supports.  */</div><div class='del'>-	scsi_id-&gt;max_payload_size =</div><div class='del'>-	    min(sbp2_speedto_max_payload[scsi_id-&gt;speed_code],</div><div class='del'>-		(u8) (hi-&gt;host-&gt;csr.max_rec - 1));</div><div class='add'>+	payload = min(sbp2_speedto_max_payload[scsi_id-&gt;speed_code],</div><div class='add'>+		      (u8) (hi-&gt;host-&gt;csr.max_rec - 1));</div><div class='add'>+</div><div class='add'>+	/* If physical DMA is off, work around limitation in ohci1394:</div><div class='add'>+	 * packet size must not exceed PAGE_SIZE */</div><div class='add'>+	if (scsi_id-&gt;ne-&gt;host-&gt;low_addr_space &lt; (1ULL &lt;&lt; 32))</div><div class='add'>+		while (SBP2_PAYLOAD_TO_BYTES(payload) + 24 &gt; PAGE_SIZE &amp;&amp;</div><div class='add'>+		       payload)</div><div class='add'>+			payload--;</div><div class='ctx'> </div><div class='ctx'> 	HPSB_DEBUG("Node " NODE_BUS_FMT ": Max speed [%s] - Max payload [%u]",</div><div class='ctx'> 		   NODE_BUS_ARGS(hi-&gt;host, scsi_id-&gt;ne-&gt;nodeid),</div><div class='ctx'> 		   hpsb_speedto_str[scsi_id-&gt;speed_code],</div><div class='del'>-		   1 &lt;&lt; ((u32) scsi_id-&gt;max_payload_size + 2));</div><div class='add'>+		   SBP2_PAYLOAD_TO_BYTES(payload));</div><div class='ctx'> </div><div class='add'>+	scsi_id-&gt;max_payload_size = payload;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2113,33 +2121,6 @@ static unsigned int sbp2_status_to_sense_data(unchar *sbp2_status, unchar *sense</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function is called after a command is completed, in order to do any necessary SBP-2</div><div class='del'>- * response data translations for the SCSI stack</div><div class='del'>- */</div><div class='del'>-static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,</div><div class='del'>-				     struct scsi_cmnd *SCpnt)</div><div class='del'>-{</div><div class='del'>-	u8 *scsi_buf = SCpnt-&gt;request_buffer;</div><div class='del'>-</div><div class='del'>-	SBP2_DEBUG_ENTER();</div><div class='del'>-</div><div class='del'>-	if (SCpnt-&gt;cmnd[0] == INQUIRY &amp;&amp; (SCpnt-&gt;cmnd[1] &amp; 3) == 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure data length is ok. Minimum length is 36 bytes</div><div class='del'>-		 */</div><div class='del'>-		if (scsi_buf[4] == 0) {</div><div class='del'>-			scsi_buf[4] = 36 - 5;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Fix ansi revision and response data format</div><div class='del'>-		 */</div><div class='del'>-		scsi_buf[2] |= 2;</div><div class='del'>-		scsi_buf[3] = (scsi_buf[3] &amp; 0xf0) | 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * This function deals with status writes from the SBP-2 device</div><div class='ctx'>  */</div><div class='ctx'> static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int destid,</div><div class='hunk'>@@ -2478,13 +2459,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Take care of any sbp2 response data mucking here (RBC stuff, etc.)</div><div class='del'>-	 */</div><div class='del'>-	if (SCpnt-&gt;result == DID_OK &lt;&lt; 16) {</div><div class='del'>-		sbp2_check_sbp2_response(scsi_id, SCpnt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * If a bus reset is in progress and there was an error, complete</div><div class='ctx'> 	 * the command as busy so that it will get retried.</div><div class='ctx'> 	 */</div><div class='head'>diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h<br/>index f4ccc9d0fba4..b22ce1aa8fe4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/sbp2.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/sbp2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/sbp2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/sbp2.h</a></div><div class='hunk'>@@ -52,7 +52,7 @@ struct sbp2_command_orb {</div><div class='ctx'> 	u32 data_descriptor_lo;</div><div class='ctx'> 	u32 misc;</div><div class='ctx'> 	u8 cdb[12];</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> #define SBP2_LOGIN_REQUEST		0x0</div><div class='ctx'> #define SBP2_QUERY_LOGINS_REQUEST	0x1</div><div class='hunk'>@@ -80,7 +80,7 @@ struct sbp2_login_orb {</div><div class='ctx'> 	u32 passwd_resp_lengths;</div><div class='ctx'> 	u32 status_fifo_hi;</div><div class='ctx'> 	u32 status_fifo_lo;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> #define RESPONSE_GET_LOGIN_ID(value)            (value &amp; 0xffff)</div><div class='ctx'> #define RESPONSE_GET_LENGTH(value)              ((value &gt;&gt; 16) &amp; 0xffff)</div><div class='hunk'>@@ -91,7 +91,7 @@ struct sbp2_login_response {</div><div class='ctx'> 	u32 command_block_agent_hi;</div><div class='ctx'> 	u32 command_block_agent_lo;</div><div class='ctx'> 	u32 reconnect_hold;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> #define ORB_SET_LOGIN_ID(value)                 (value &amp; 0xffff)</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +106,7 @@ struct sbp2_query_logins_orb {</div><div class='ctx'> 	u32 reserved_resp_length;</div><div class='ctx'> 	u32 status_fifo_hi;</div><div class='ctx'> 	u32 status_fifo_lo;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> #define RESPONSE_GET_MAX_LOGINS(value)          (value &amp; 0xffff)</div><div class='ctx'> #define RESPONSE_GET_ACTIVE_LOGINS(value)       ((RESPONSE_GET_LENGTH(value) - 4) / 12)</div><div class='hunk'>@@ -116,7 +116,7 @@ struct sbp2_query_logins_response {</div><div class='ctx'> 	u32 misc_IDs;</div><div class='ctx'> 	u32 initiator_misc_hi;</div><div class='ctx'> 	u32 initiator_misc_lo;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> struct sbp2_reconnect_orb {</div><div class='ctx'> 	u32 reserved1;</div><div class='hunk'>@@ -127,7 +127,7 @@ struct sbp2_reconnect_orb {</div><div class='ctx'> 	u32 reserved5;</div><div class='ctx'> 	u32 status_fifo_hi;</div><div class='ctx'> 	u32 status_fifo_lo;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> struct sbp2_logout_orb {</div><div class='ctx'> 	u32 reserved1;</div><div class='hunk'>@@ -138,7 +138,7 @@ struct sbp2_logout_orb {</div><div class='ctx'> 	u32 reserved5;</div><div class='ctx'> 	u32 status_fifo_hi;</div><div class='ctx'> 	u32 status_fifo_lo;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> #define PAGE_TABLE_SET_SEGMENT_BASE_HI(value)   (value &amp; 0xffff)</div><div class='ctx'> #define PAGE_TABLE_SET_SEGMENT_LENGTH(value)    ((value &amp; 0xffff) &lt;&lt; 16)</div><div class='hunk'>@@ -146,7 +146,7 @@ struct sbp2_logout_orb {</div><div class='ctx'> struct sbp2_unrestricted_page_table {</div><div class='ctx'> 	u32 length_segment_base_hi;</div><div class='ctx'> 	u32 segment_base_lo;</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> #define RESP_STATUS_REQUEST_COMPLETE		0x0</div><div class='ctx'> #define RESP_STATUS_TRANSPORT_FAILURE		0x1</div><div class='hunk'>@@ -191,7 +191,7 @@ struct sbp2_status_block {</div><div class='ctx'> 	u32 ORB_offset_hi_misc;</div><div class='ctx'> 	u32 ORB_offset_lo;</div><div class='ctx'> 	u8 command_set_dependent[24];</div><div class='del'>-};</div><div class='add'>+} __attribute__((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Miscellaneous SBP2 related config rom defines</div><div class='hunk'>@@ -395,9 +395,8 @@ static int sbp2_link_orb_command(struct scsi_id_instance_data *scsi_id,</div><div class='ctx'> static int sbp2_send_command(struct scsi_id_instance_data *scsi_id,</div><div class='ctx'> 			     struct scsi_cmnd *SCpnt,</div><div class='ctx'> 			     void (*done)(struct scsi_cmnd *));</div><div class='del'>-static unsigned int sbp2_status_to_sense_data(unchar *sbp2_status, unchar *sense_data);</div><div class='del'>-static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,</div><div class='del'>-				     struct scsi_cmnd *SCpnt);</div><div class='add'>+static unsigned int sbp2_status_to_sense_data(unchar *sbp2_status,</div><div class='add'>+					      unchar *sense_data);</div><div class='ctx'> static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,</div><div class='ctx'> 				      struct unit_directory *ud);</div><div class='ctx'> static int sbp2_set_busy_timeout(struct scsi_id_instance_data *scsi_id);</div><div class='head'>diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c<br/>index 4e3bd62c458d..c6e3f02bc6d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/ieee1394/video1394.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/ieee1394/video1394.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/ieee1394/video1394.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/ieee1394/video1394.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * ENOTTY for unsupported ioctl request</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -331,7 +330,7 @@ alloc_dma_iso_ctx(struct ti_ohci *ohci, int type, int num_desc,</div><div class='ctx'> </div><div class='ctx'>         spin_lock_init(&amp;d-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	PRINT(KERN_INFO, ohci-&gt;host-&gt;id, "Iso %s DMA: %d buffers "</div><div class='add'>+	DBGMSG(ohci-&gt;host-&gt;id, "Iso %s DMA: %d buffers "</div><div class='ctx'> 	      "of size %d allocated for a frame size %d, each with %d prgs",</div><div class='ctx'> 	      (type == OHCI_ISO_RECEIVE) ? "receive" : "transmit",</div><div class='ctx'> 	      d-&gt;num_desc - 1, d-&gt;buf_size, d-&gt;frame_size, d-&gt;nb_cmd);</div><div class='hunk'>@@ -759,7 +758,7 @@ static int __video1394_ioctl(struct file *file,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mask = (u64)0x1&lt;&lt;v.channel;</div><div class='ctx'> 		}</div><div class='del'>-		PRINT(KERN_INFO, ohci-&gt;host-&gt;id, "mask: %08X%08X usage: %08X%08X\n",</div><div class='add'>+		DBGMSG(ohci-&gt;host-&gt;id, "mask: %08X%08X usage: %08X%08X\n",</div><div class='ctx'> 			(u32)(mask&gt;&gt;32),(u32)(mask&amp;0xffffffff),</div><div class='ctx'> 			(u32)(ohci-&gt;ISO_channel_usage&gt;&gt;32),</div><div class='ctx'> 			(u32)(ohci-&gt;ISO_channel_usage&amp;0xffffffff));</div><div class='hunk'>@@ -805,7 +804,7 @@ static int __video1394_ioctl(struct file *file,</div><div class='ctx'> 			v.buf_size = d-&gt;buf_size;</div><div class='ctx'> 			list_add_tail(&amp;d-&gt;link, &amp;ctx-&gt;context_list);</div><div class='ctx'> </div><div class='del'>-			PRINT(KERN_INFO, ohci-&gt;host-&gt;id,</div><div class='add'>+			DBGMSG(ohci-&gt;host-&gt;id,</div><div class='ctx'> 			      "iso context %d listen on channel %d",</div><div class='ctx'> 			      d-&gt;ctx, v.channel);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -828,7 +827,7 @@ static int __video1394_ioctl(struct file *file,</div><div class='ctx'> </div><div class='ctx'> 			list_add_tail(&amp;d-&gt;link, &amp;ctx-&gt;context_list);</div><div class='ctx'> </div><div class='del'>-			PRINT(KERN_INFO, ohci-&gt;host-&gt;id,</div><div class='add'>+			DBGMSG(ohci-&gt;host-&gt;id,</div><div class='ctx'> 			      "Iso context %d talk on channel %d", d-&gt;ctx,</div><div class='ctx'> 			      v.channel);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -873,7 +872,7 @@ static int __video1394_ioctl(struct file *file,</div><div class='ctx'> 			d = find_ctx(&amp;ctx-&gt;context_list, OHCI_ISO_TRANSMIT, channel);</div><div class='ctx'> </div><div class='ctx'> 		if (d == NULL) return -ESRCH;</div><div class='del'>-		PRINT(KERN_INFO, ohci-&gt;host-&gt;id, "Iso context %d "</div><div class='add'>+		DBGMSG(ohci-&gt;host-&gt;id, "Iso context %d "</div><div class='ctx'> 		      "stop talking on channel %d", d-&gt;ctx, channel);</div><div class='ctx'> 		free_dma_iso_ctx(d);</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +934,7 @@ static int __video1394_ioctl(struct file *file,</div><div class='ctx'> 		else {</div><div class='ctx'> 			/* Wake up dma context if necessary */</div><div class='ctx'> 			if (!(reg_read(ohci, d-&gt;ctrlSet) &amp; 0x400)) {</div><div class='del'>-				PRINT(KERN_INFO, ohci-&gt;host-&gt;id,</div><div class='add'>+				DBGMSG(ohci-&gt;host-&gt;id,</div><div class='ctx'> 				      "Waking up iso dma ctx=%d", d-&gt;ctx);</div><div class='ctx'> 				reg_write(ohci, d-&gt;ctrlSet, 0x1000);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1106,7 +1105,7 @@ static int __video1394_ioctl(struct file *file,</div><div class='ctx'> 		else {</div><div class='ctx'> 			/* Wake up dma context if necessary */</div><div class='ctx'> 			if (!(reg_read(ohci, d-&gt;ctrlSet) &amp; 0x400)) {</div><div class='del'>-				PRINT(KERN_INFO, ohci-&gt;host-&gt;id,</div><div class='add'>+				DBGMSG(ohci-&gt;host-&gt;id,</div><div class='ctx'> 				      "Waking up iso transmit dma ctx=%d",</div><div class='ctx'> 				      d-&gt;ctx);</div><div class='ctx'> 				put_timestamp(ohci, d, d-&gt;last_buffer);</div><div class='hunk'>@@ -1232,7 +1231,7 @@ static int video1394_release(struct inode *inode, struct file *file)</div><div class='ctx'> 			      "is not being used", d-&gt;channel);</div><div class='ctx'> 		else</div><div class='ctx'> 			ohci-&gt;ISO_channel_usage &amp;= ~mask;</div><div class='del'>-		PRINT(KERN_INFO, ohci-&gt;host-&gt;id, "On release: Iso %s context "</div><div class='add'>+		DBGMSG(ohci-&gt;host-&gt;id, "On release: Iso %s context "</div><div class='ctx'> 		      "%d stop listening on channel %d",</div><div class='ctx'> 		      d-&gt;type == OHCI_ISO_RECEIVE ? "receive" : "transmit",</div><div class='ctx'> 		      d-&gt;ctx, d-&gt;channel);</div><div class='head'>diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig<br/>index afc612b8577d..69a53d476b5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/Kconfig</a></div><div class='hunk'>@@ -29,6 +29,11 @@ config INFINIBAND_USER_ACCESS</div><div class='ctx'> 	  libibverbs, libibcm and a hardware driver library from</div><div class='ctx'> 	  &lt;http://www.openib.org&gt;.</div><div class='ctx'> </div><div class='add'>+config INFINIBAND_ADDR_TRANS</div><div class='add'>+	bool</div><div class='add'>+	depends on INFINIBAND &amp;&amp; INET</div><div class='add'>+	default y</div><div class='add'>+</div><div class='ctx'> source "drivers/infiniband/hw/mthca/Kconfig"</div><div class='ctx'> source "drivers/infiniband/hw/ipath/Kconfig"</div><div class='ctx'> </div><div class='hunk'>@@ -36,4 +41,6 @@ source "drivers/infiniband/ulp/ipoib/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/infiniband/ulp/srp/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/infiniband/ulp/iser/Kconfig"</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile<br/>index eea27322a22d..c7ff58c1d0e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/Makefile</a></div><div class='hunk'>@@ -3,3 +3,4 @@ obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/</div><div class='ctx'> obj-$(CONFIG_IPATH_CORE)		+= hw/ipath/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/</div><div class='add'>+obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/</div><div class='head'>diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile<br/>index ec3353f24b27..68e73ec2d1f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/Makefile</a></div><div class='hunk'>@@ -1,5 +1,7 @@</div><div class='add'>+infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= ib_addr.o rdma_cm.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_INFINIBAND) +=		ib_core.o ib_mad.o ib_sa.o \</div><div class='del'>-					ib_cm.o</div><div class='add'>+					ib_cm.o $(infiniband-y)</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_USER_MAD) +=	ib_umad.o</div><div class='ctx'> obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=	ib_uverbs.o ib_ucm.o</div><div class='ctx'> </div><div class='hunk'>@@ -12,8 +14,13 @@ ib_sa-y :=			sa_query.o</div><div class='ctx'> </div><div class='ctx'> ib_cm-y :=			cm.o</div><div class='ctx'> </div><div class='add'>+rdma_cm-y :=			cma.o</div><div class='add'>+</div><div class='add'>+ib_addr-y :=			addr.o</div><div class='add'>+</div><div class='ctx'> ib_umad-y :=			user_mad.o</div><div class='ctx'> </div><div class='ctx'> ib_ucm-y :=			ucm.o</div><div class='ctx'> </div><div class='del'>-ib_uverbs-y :=			uverbs_main.o uverbs_cmd.o uverbs_mem.o</div><div class='add'>+ib_uverbs-y :=			uverbs_main.o uverbs_cmd.o uverbs_mem.o \</div><div class='add'>+				uverbs_marshall.o</div><div class='head'>diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c<br/>new file mode 100644<br/>index 000000000000..d294bbc42f09<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/addr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/addr.c</a></div><div class='hunk'>@@ -0,0 +1,367 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2005 Voltaire Inc.  All rights reserved.</div><div class='add'>+ * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005 Intel Corporation.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This Software is licensed under one of the following licenses:</div><div class='add'>+ *</div><div class='add'>+ * 1) under the terms of the "Common Public License 1.0" a copy of which is</div><div class='add'>+ *    available from the Open Source Initiative, see</div><div class='add'>+ *    http://www.opensource.org/licenses/cpl.php.</div><div class='add'>+ *</div><div class='add'>+ * 2) under the terms of the "The BSD License" a copy of which is</div><div class='add'>+ *    available from the Open Source Initiative, see</div><div class='add'>+ *    http://www.opensource.org/licenses/bsd-license.php.</div><div class='add'>+ *</div><div class='add'>+ * 3) under the terms of the "GNU General Public License (GPL) Version 2" a</div><div class='add'>+ *    copy of which is available from the Open Source Initiative, see</div><div class='add'>+ *    http://www.opensource.org/licenses/gpl-license.php.</div><div class='add'>+ *</div><div class='add'>+ * Licensee has the right to choose one of the above licenses.</div><div class='add'>+ *</div><div class='add'>+ * Redistributions of source code must retain the above copyright</div><div class='add'>+ * notice and one of the license notices.</div><div class='add'>+ *</div><div class='add'>+ * Redistributions in binary form must reproduce both the above copyright</div><div class='add'>+ * notice, one of the license notices in the documentation</div><div class='add'>+ * and/or other materials provided with the distribution.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;net/arp.h&gt;</div><div class='add'>+#include &lt;net/neighbour.h&gt;</div><div class='add'>+#include &lt;net/route.h&gt;</div><div class='add'>+#include &lt;rdma/ib_addr.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sean Hefty");</div><div class='add'>+MODULE_DESCRIPTION("IB Address Translation");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+</div><div class='add'>+struct addr_req {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sockaddr src_addr;</div><div class='add'>+	struct sockaddr dst_addr;</div><div class='add'>+	struct rdma_dev_addr *addr;</div><div class='add'>+	void *context;</div><div class='add'>+	void (*callback)(int status, struct sockaddr *src_addr,</div><div class='add'>+			 struct rdma_dev_addr *addr, void *context);</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	int status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void process_req(void *data);</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(lock);</div><div class='add'>+static LIST_HEAD(req_list);</div><div class='add'>+static DECLARE_WORK(work, process_req, NULL);</div><div class='add'>+static struct workqueue_struct *addr_wq;</div><div class='add'>+</div><div class='add'>+static int copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,</div><div class='add'>+		     unsigned char *dst_dev_addr)</div><div class='add'>+{</div><div class='add'>+	switch (dev-&gt;type) {</div><div class='add'>+	case ARPHRD_INFINIBAND:</div><div class='add'>+		dev_addr-&gt;dev_type = IB_NODE_CA;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(dev_addr-&gt;src_dev_addr, dev-&gt;dev_addr, MAX_ADDR_LEN);</div><div class='add'>+	memcpy(dev_addr-&gt;broadcast, dev-&gt;broadcast, MAX_ADDR_LEN);</div><div class='add'>+	if (dst_dev_addr)</div><div class='add'>+		memcpy(dev_addr-&gt;dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u32 ip = ((struct sockaddr_in *) addr)-&gt;sin_addr.s_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = ip_dev_find(ip);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	ret = copy_addr(dev_addr, dev, NULL);</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_translate_ip);</div><div class='add'>+</div><div class='add'>+static void set_timeout(unsigned long time)</div><div class='add'>+{</div><div class='add'>+	unsigned long delay;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;work);</div><div class='add'>+</div><div class='add'>+	delay = time - jiffies;</div><div class='add'>+	if ((long)delay &lt;= 0)</div><div class='add'>+		delay = 1;</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(addr_wq, &amp;work, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_req(struct addr_req *req)</div><div class='add'>+{</div><div class='add'>+	struct addr_req *temp_req;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_for_each_entry_reverse(temp_req, &amp;req_list, list) {</div><div class='add'>+		if (time_after(req-&gt;timeout, temp_req-&gt;timeout))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;req-&gt;list, &amp;temp_req-&gt;list);</div><div class='add'>+</div><div class='add'>+	if (req_list.next == &amp;req-&gt;list)</div><div class='add'>+		set_timeout(req-&gt;timeout);</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void addr_send_arp(struct sockaddr_in *dst_in)</div><div class='add'>+{</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	struct flowi fl;</div><div class='add'>+	u32 dst_ip = dst_in-&gt;sin_addr.s_addr;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fl, 0, sizeof fl);</div><div class='add'>+	fl.nl_u.ip4_u.daddr = dst_ip;</div><div class='add'>+	if (ip_route_output_key(&amp;rt, &amp;fl))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	arp_send(ARPOP_REQUEST, ETH_P_ARP, rt-&gt;rt_gateway, rt-&gt;idev-&gt;dev,</div><div class='add'>+		 rt-&gt;rt_src, NULL, rt-&gt;idev-&gt;dev-&gt;dev_addr, NULL);</div><div class='add'>+	ip_rt_put(rt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int addr_resolve_remote(struct sockaddr_in *src_in,</div><div class='add'>+			       struct sockaddr_in *dst_in,</div><div class='add'>+			       struct rdma_dev_addr *addr)</div><div class='add'>+{</div><div class='add'>+	u32 src_ip = src_in-&gt;sin_addr.s_addr;</div><div class='add'>+	u32 dst_ip = dst_in-&gt;sin_addr.s_addr;</div><div class='add'>+	struct flowi fl;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	struct neighbour *neigh;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fl, 0, sizeof fl);</div><div class='add'>+	fl.nl_u.ip4_u.daddr = dst_ip;</div><div class='add'>+	fl.nl_u.ip4_u.saddr = src_ip;</div><div class='add'>+	ret = ip_route_output_key(&amp;rt, &amp;fl);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* If the device does ARP internally, return 'done' */</div><div class='add'>+	if (rt-&gt;idev-&gt;dev-&gt;flags &amp; IFF_NOARP) {</div><div class='add'>+		copy_addr(addr, rt-&gt;idev-&gt;dev, NULL);</div><div class='add'>+		goto put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	neigh = neigh_lookup(&amp;arp_tbl, &amp;rt-&gt;rt_gateway, rt-&gt;idev-&gt;dev);</div><div class='add'>+	if (!neigh) {</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+		goto put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(neigh-&gt;nud_state &amp; NUD_VALID)) {</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+		goto release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!src_ip) {</div><div class='add'>+		src_in-&gt;sin_family = dst_in-&gt;sin_family;</div><div class='add'>+		src_in-&gt;sin_addr.s_addr = rt-&gt;rt_src;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = copy_addr(addr, neigh-&gt;dev, neigh-&gt;ha);</div><div class='add'>+release:</div><div class='add'>+	neigh_release(neigh);</div><div class='add'>+put:</div><div class='add'>+	ip_rt_put(rt);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_req(void *data)</div><div class='add'>+{</div><div class='add'>+	struct addr_req *req, *temp_req;</div><div class='add'>+	struct sockaddr_in *src_in, *dst_in;</div><div class='add'>+	struct list_head done_list;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;done_list);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_for_each_entry_safe(req, temp_req, &amp;req_list, list) {</div><div class='add'>+		if (req-&gt;status) {</div><div class='add'>+			src_in = (struct sockaddr_in *) &amp;req-&gt;src_addr;</div><div class='add'>+			dst_in = (struct sockaddr_in *) &amp;req-&gt;dst_addr;</div><div class='add'>+			req-&gt;status = addr_resolve_remote(src_in, dst_in,</div><div class='add'>+							  req-&gt;addr);</div><div class='add'>+		}</div><div class='add'>+		if (req-&gt;status &amp;&amp; time_after(jiffies, req-&gt;timeout))</div><div class='add'>+			req-&gt;status = -ETIMEDOUT;</div><div class='add'>+		else if (req-&gt;status == -ENODATA)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		list_del(&amp;req-&gt;list);</div><div class='add'>+		list_add_tail(&amp;req-&gt;list, &amp;done_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;req_list)) {</div><div class='add'>+		req = list_entry(req_list.next, struct addr_req, list);</div><div class='add'>+		set_timeout(req-&gt;timeout);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(req, temp_req, &amp;done_list, list) {</div><div class='add'>+		list_del(&amp;req-&gt;list);</div><div class='add'>+		req-&gt;callback(req-&gt;status, &amp;req-&gt;src_addr, req-&gt;addr,</div><div class='add'>+			      req-&gt;context);</div><div class='add'>+		kfree(req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int addr_resolve_local(struct sockaddr_in *src_in,</div><div class='add'>+			      struct sockaddr_in *dst_in,</div><div class='add'>+			      struct rdma_dev_addr *addr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u32 src_ip = src_in-&gt;sin_addr.s_addr;</div><div class='add'>+	u32 dst_ip = dst_in-&gt;sin_addr.s_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = ip_dev_find(dst_ip);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	if (ZERONET(src_ip)) {</div><div class='add'>+		src_in-&gt;sin_family = dst_in-&gt;sin_family;</div><div class='add'>+		src_in-&gt;sin_addr.s_addr = dst_ip;</div><div class='add'>+		ret = copy_addr(addr, dev, dev-&gt;dev_addr);</div><div class='add'>+	} else if (LOOPBACK(src_ip)) {</div><div class='add'>+		ret = rdma_translate_ip((struct sockaddr *)dst_in, addr);</div><div class='add'>+		if (!ret)</div><div class='add'>+			memcpy(addr-&gt;dst_dev_addr, dev-&gt;dev_addr, MAX_ADDR_LEN);</div><div class='add'>+	} else {</div><div class='add'>+		ret = rdma_translate_ip((struct sockaddr *)src_in, addr);</div><div class='add'>+		if (!ret)</div><div class='add'>+			memcpy(addr-&gt;dst_dev_addr, dev-&gt;dev_addr, MAX_ADDR_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_put(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_resolve_ip(struct sockaddr *src_addr, struct sockaddr *dst_addr,</div><div class='add'>+		    struct rdma_dev_addr *addr, int timeout_ms,</div><div class='add'>+		    void (*callback)(int status, struct sockaddr *src_addr,</div><div class='add'>+				     struct rdma_dev_addr *addr, void *context),</div><div class='add'>+		    void *context)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in *src_in, *dst_in;</div><div class='add'>+	struct addr_req *req;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	req = kmalloc(sizeof *req, GFP_KERNEL);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(req, 0, sizeof *req);</div><div class='add'>+</div><div class='add'>+	if (src_addr)</div><div class='add'>+		memcpy(&amp;req-&gt;src_addr, src_addr, ip_addr_size(src_addr));</div><div class='add'>+	memcpy(&amp;req-&gt;dst_addr, dst_addr, ip_addr_size(dst_addr));</div><div class='add'>+	req-&gt;addr = addr;</div><div class='add'>+	req-&gt;callback = callback;</div><div class='add'>+	req-&gt;context = context;</div><div class='add'>+</div><div class='add'>+	src_in = (struct sockaddr_in *) &amp;req-&gt;src_addr;</div><div class='add'>+	dst_in = (struct sockaddr_in *) &amp;req-&gt;dst_addr;</div><div class='add'>+</div><div class='add'>+	req-&gt;status = addr_resolve_local(src_in, dst_in, addr);</div><div class='add'>+	if (req-&gt;status == -EADDRNOTAVAIL)</div><div class='add'>+		req-&gt;status = addr_resolve_remote(src_in, dst_in, addr);</div><div class='add'>+</div><div class='add'>+	switch (req-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		req-&gt;timeout = jiffies;</div><div class='add'>+		queue_req(req);</div><div class='add'>+		break;</div><div class='add'>+	case -ENODATA:</div><div class='add'>+		req-&gt;timeout = msecs_to_jiffies(timeout_ms) + jiffies;</div><div class='add'>+		queue_req(req);</div><div class='add'>+		addr_send_arp(dst_in);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = req-&gt;status;</div><div class='add'>+		kfree(req);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_resolve_ip);</div><div class='add'>+</div><div class='add'>+void rdma_addr_cancel(struct rdma_dev_addr *addr)</div><div class='add'>+{</div><div class='add'>+	struct addr_req *req, *temp_req;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_for_each_entry_safe(req, temp_req, &amp;req_list, list) {</div><div class='add'>+		if (req-&gt;addr == addr) {</div><div class='add'>+			req-&gt;status = -ECANCELED;</div><div class='add'>+			req-&gt;timeout = jiffies;</div><div class='add'>+			list_del(&amp;req-&gt;list);</div><div class='add'>+			list_add(&amp;req-&gt;list, &amp;req_list);</div><div class='add'>+			set_timeout(req-&gt;timeout);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_addr_cancel);</div><div class='add'>+</div><div class='add'>+static int addr_arp_recv(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			 struct packet_type *pkt, struct net_device *orig_dev)</div><div class='add'>+{</div><div class='add'>+	struct arphdr *arp_hdr;</div><div class='add'>+</div><div class='add'>+	arp_hdr = (struct arphdr *) skb-&gt;nh.raw;</div><div class='add'>+</div><div class='add'>+	if (arp_hdr-&gt;ar_op == htons(ARPOP_REQUEST) ||</div><div class='add'>+	    arp_hdr-&gt;ar_op == htons(ARPOP_REPLY))</div><div class='add'>+		set_timeout(jiffies);</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct packet_type addr_arp = {</div><div class='add'>+	.type           = __constant_htons(ETH_P_ARP),</div><div class='add'>+	.func           = addr_arp_recv,</div><div class='add'>+	.af_packet_priv = (void*) 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int addr_init(void)</div><div class='add'>+{</div><div class='add'>+	addr_wq = create_singlethread_workqueue("ib_addr_wq");</div><div class='add'>+	if (!addr_wq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev_add_pack(&amp;addr_arp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void addr_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	dev_remove_pack(&amp;addr_arp);</div><div class='add'>+	destroy_workqueue(addr_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(addr_init);</div><div class='add'>+module_exit(addr_cleanup);</div><div class='head'>diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c<br/>index 50364c0b090c..e05ca2cdc73f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/cache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/cache.c</a></div><div class='hunk'>@@ -191,6 +191,24 @@ int ib_find_cached_pkey(struct ib_device *device,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ib_find_cached_pkey);</div><div class='ctx'> </div><div class='add'>+int ib_get_cached_lmc(struct ib_device *device,</div><div class='add'>+		      u8                port_num,</div><div class='add'>+		      u8                *lmc)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (port_num &lt; start_port(device) || port_num &gt; end_port(device))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	read_lock_irqsave(&amp;device-&gt;cache.lock, flags);</div><div class='add'>+	*lmc = device-&gt;cache.lmc_cache[port_num - start_port(device)];</div><div class='add'>+	read_unlock_irqrestore(&amp;device-&gt;cache.lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ib_get_cached_lmc);</div><div class='add'>+</div><div class='ctx'> static void ib_cache_update(struct ib_device *device,</div><div class='ctx'> 			    u8                port)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,6 +269,8 @@ static void ib_cache_update(struct ib_device *device,</div><div class='ctx'> 	device-&gt;cache.pkey_cache[port - start_port(device)] = pkey_cache;</div><div class='ctx'> 	device-&gt;cache.gid_cache [port - start_port(device)] = gid_cache;</div><div class='ctx'> </div><div class='add'>+	device-&gt;cache.lmc_cache[port - start_port(device)] = tprops-&gt;lmc;</div><div class='add'>+</div><div class='ctx'> 	write_unlock_irq(&amp;device-&gt;cache.lock);</div><div class='ctx'> </div><div class='ctx'> 	kfree(old_pkey_cache);</div><div class='hunk'>@@ -305,7 +325,13 @@ static void ib_cache_setup_one(struct ib_device *device)</div><div class='ctx'> 		kmalloc(sizeof *device-&gt;cache.gid_cache *</div><div class='ctx'> 			(end_port(device) - start_port(device) + 1), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (!device-&gt;cache.pkey_cache || !device-&gt;cache.gid_cache) {</div><div class='add'>+	device-&gt;cache.lmc_cache = kmalloc(sizeof *device-&gt;cache.lmc_cache *</div><div class='add'>+					  (end_port(device) -</div><div class='add'>+					   start_port(device) + 1),</div><div class='add'>+					  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!device-&gt;cache.pkey_cache || !device-&gt;cache.gid_cache ||</div><div class='add'>+	    !device-&gt;cache.lmc_cache) {</div><div class='ctx'> 		printk(KERN_WARNING "Couldn't allocate cache "</div><div class='ctx'> 		       "for %s\n", device-&gt;name);</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -333,6 +359,7 @@ err_cache:</div><div class='ctx'> err:</div><div class='ctx'> 	kfree(device-&gt;cache.pkey_cache);</div><div class='ctx'> 	kfree(device-&gt;cache.gid_cache);</div><div class='add'>+	kfree(device-&gt;cache.lmc_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ib_cache_cleanup_one(struct ib_device *device)</div><div class='hunk'>@@ -349,6 +376,7 @@ static void ib_cache_cleanup_one(struct ib_device *device)</div><div class='ctx'> </div><div class='ctx'> 	kfree(device-&gt;cache.pkey_cache);</div><div class='ctx'> 	kfree(device-&gt;cache.gid_cache);</div><div class='add'>+	kfree(device-&gt;cache.lmc_cache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ib_client cache_client = {</div><div class='head'>diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c<br/>index 86fee43502cd..f85c97f7500a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/cm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/cm.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'>  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  *</div><div class='del'>- * $Id: cm.c 2821 2005-07-08 17:07:28Z sean.hefty $</div><div class='add'>+ * $Id: cm.c 4311 2005-12-05 18:42:01Z sean.hefty $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='hunk'>@@ -132,6 +132,7 @@ struct cm_id_private {</div><div class='ctx'> 	/* todo: use alternate port on send failure */</div><div class='ctx'> 	struct cm_av av;</div><div class='ctx'> 	struct cm_av alt_av;</div><div class='add'>+	struct ib_cm_compare_data *compare_data;</div><div class='ctx'> </div><div class='ctx'> 	void *private_data;</div><div class='ctx'> 	__be64 tid;</div><div class='hunk'>@@ -253,23 +254,13 @@ static void cm_set_private_data(struct cm_id_private *cm_id_priv,</div><div class='ctx'> 	cm_id_priv-&gt;private_data_len = private_data_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cm_set_ah_attr(struct ib_ah_attr *ah_attr, u8 port_num,</div><div class='del'>-			   u16 dlid, u8 sl, u16 src_path_bits)</div><div class='del'>-{</div><div class='del'>-	memset(ah_attr, 0, sizeof ah_attr);</div><div class='del'>-	ah_attr-&gt;dlid = dlid;</div><div class='del'>-	ah_attr-&gt;sl = sl;</div><div class='del'>-	ah_attr-&gt;src_path_bits = src_path_bits;</div><div class='del'>-	ah_attr-&gt;port_num = port_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cm_init_av_for_response(struct cm_port *port,</div><div class='del'>-				    struct ib_wc *wc, struct cm_av *av)</div><div class='add'>+static void cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,</div><div class='add'>+				    struct ib_grh *grh, struct cm_av *av)</div><div class='ctx'> {</div><div class='ctx'> 	av-&gt;port = port;</div><div class='ctx'> 	av-&gt;pkey_index = wc-&gt;pkey_index;</div><div class='del'>-	cm_set_ah_attr(&amp;av-&gt;ah_attr, port-&gt;port_num, wc-&gt;slid,</div><div class='del'>-		       wc-&gt;sl, wc-&gt;dlid_path_bits);</div><div class='add'>+	ib_init_ah_from_wc(port-&gt;cm_dev-&gt;device, port-&gt;port_num, wc,</div><div class='add'>+			   grh, &amp;av-&gt;ah_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)</div><div class='hunk'>@@ -299,9 +290,8 @@ static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	av-&gt;port = port;</div><div class='del'>-	cm_set_ah_attr(&amp;av-&gt;ah_attr, av-&gt;port-&gt;port_num,</div><div class='del'>-		       be16_to_cpu(path-&gt;dlid), path-&gt;sl,</div><div class='del'>-		       be16_to_cpu(path-&gt;slid) &amp; 0x7F);</div><div class='add'>+	ib_init_ah_from_path(cm_dev-&gt;device, port-&gt;port_num, path,</div><div class='add'>+			     &amp;av-&gt;ah_attr);</div><div class='ctx'> 	av-&gt;packet_life_time = path-&gt;packet_life_time;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -357,6 +347,41 @@ static struct cm_id_private * cm_acquire_id(__be32 local_id, __be32 remote_id)</div><div class='ctx'> 	return cm_id_priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cm_mask_copy(u8 *dst, u8 *src, u8 *mask)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; IB_CM_COMPARE_SIZE / sizeof(unsigned long); i++)</div><div class='add'>+		((unsigned long *) dst)[i] = ((unsigned long *) src)[i] &amp;</div><div class='add'>+					     ((unsigned long *) mask)[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm_compare_data(struct ib_cm_compare_data *src_data,</div><div class='add'>+			   struct ib_cm_compare_data *dst_data)</div><div class='add'>+{</div><div class='add'>+	u8 src[IB_CM_COMPARE_SIZE];</div><div class='add'>+	u8 dst[IB_CM_COMPARE_SIZE];</div><div class='add'>+</div><div class='add'>+	if (!src_data || !dst_data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cm_mask_copy(src, src_data-&gt;data, dst_data-&gt;mask);</div><div class='add'>+	cm_mask_copy(dst, dst_data-&gt;data, src_data-&gt;mask);</div><div class='add'>+	return memcmp(src, dst, IB_CM_COMPARE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm_compare_private_data(u8 *private_data,</div><div class='add'>+				   struct ib_cm_compare_data *dst_data)</div><div class='add'>+{</div><div class='add'>+	u8 src[IB_CM_COMPARE_SIZE];</div><div class='add'>+</div><div class='add'>+	if (!dst_data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cm_mask_copy(src, private_data, dst_data-&gt;mask);</div><div class='add'>+	return memcmp(src, dst_data-&gt;data, IB_CM_COMPARE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node **link = &amp;cm.listen_service_table.rb_node;</div><div class='hunk'>@@ -364,14 +389,18 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)</div><div class='ctx'> 	struct cm_id_private *cur_cm_id_priv;</div><div class='ctx'> 	__be64 service_id = cm_id_priv-&gt;id.service_id;</div><div class='ctx'> 	__be64 service_mask = cm_id_priv-&gt;id.service_mask;</div><div class='add'>+	int data_cmp;</div><div class='ctx'> </div><div class='ctx'> 	while (*link) {</div><div class='ctx'> 		parent = *link;</div><div class='ctx'> 		cur_cm_id_priv = rb_entry(parent, struct cm_id_private,</div><div class='ctx'> 					  service_node);</div><div class='add'>+		data_cmp = cm_compare_data(cm_id_priv-&gt;compare_data,</div><div class='add'>+					   cur_cm_id_priv-&gt;compare_data);</div><div class='ctx'> 		if ((cur_cm_id_priv-&gt;id.service_mask &amp; service_id) ==</div><div class='ctx'> 		    (service_mask &amp; cur_cm_id_priv-&gt;id.service_id) &amp;&amp;</div><div class='del'>-		    (cm_id_priv-&gt;id.device == cur_cm_id_priv-&gt;id.device))</div><div class='add'>+		    (cm_id_priv-&gt;id.device == cur_cm_id_priv-&gt;id.device) &amp;&amp;</div><div class='add'>+		    !data_cmp)</div><div class='ctx'> 			return cur_cm_id_priv;</div><div class='ctx'> </div><div class='ctx'> 		if (cm_id_priv-&gt;id.device &lt; cur_cm_id_priv-&gt;id.device)</div><div class='hunk'>@@ -380,6 +409,10 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)</div><div class='ctx'> 			link = &amp;(*link)-&gt;rb_right;</div><div class='ctx'> 		else if (service_id &lt; cur_cm_id_priv-&gt;id.service_id)</div><div class='ctx'> 			link = &amp;(*link)-&gt;rb_left;</div><div class='add'>+		else if (service_id &gt; cur_cm_id_priv-&gt;id.service_id)</div><div class='add'>+			link = &amp;(*link)-&gt;rb_right;</div><div class='add'>+		else if (data_cmp &lt; 0)</div><div class='add'>+			link = &amp;(*link)-&gt;rb_left;</div><div class='ctx'> 		else</div><div class='ctx'> 			link = &amp;(*link)-&gt;rb_right;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -389,16 +422,20 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cm_id_private * cm_find_listen(struct ib_device *device,</div><div class='del'>-					     __be64 service_id)</div><div class='add'>+					     __be64 service_id,</div><div class='add'>+					     u8 *private_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *node = cm.listen_service_table.rb_node;</div><div class='ctx'> 	struct cm_id_private *cm_id_priv;</div><div class='add'>+	int data_cmp;</div><div class='ctx'> </div><div class='ctx'> 	while (node) {</div><div class='ctx'> 		cm_id_priv = rb_entry(node, struct cm_id_private, service_node);</div><div class='add'>+		data_cmp = cm_compare_private_data(private_data,</div><div class='add'>+						   cm_id_priv-&gt;compare_data);</div><div class='ctx'> 		if ((cm_id_priv-&gt;id.service_mask &amp; service_id) ==</div><div class='ctx'> 		     cm_id_priv-&gt;id.service_id &amp;&amp;</div><div class='del'>-		    (cm_id_priv-&gt;id.device == device))</div><div class='add'>+		    (cm_id_priv-&gt;id.device == device) &amp;&amp; !data_cmp)</div><div class='ctx'> 			return cm_id_priv;</div><div class='ctx'> </div><div class='ctx'> 		if (device &lt; cm_id_priv-&gt;id.device)</div><div class='hunk'>@@ -407,6 +444,10 @@ static struct cm_id_private * cm_find_listen(struct ib_device *device,</div><div class='ctx'> 			node = node-&gt;rb_right;</div><div class='ctx'> 		else if (service_id &lt; cm_id_priv-&gt;id.service_id)</div><div class='ctx'> 			node = node-&gt;rb_left;</div><div class='add'>+		else if (service_id &gt; cm_id_priv-&gt;id.service_id)</div><div class='add'>+			node = node-&gt;rb_right;</div><div class='add'>+		else if (data_cmp &lt; 0)</div><div class='add'>+			node = node-&gt;rb_left;</div><div class='ctx'> 		else</div><div class='ctx'> 			node = node-&gt;rb_right;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -660,7 +701,7 @@ static void cm_reset_to_idle(struct cm_id_private *cm_id_priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ib_destroy_cm_id(struct ib_cm_id *cm_id)</div><div class='add'>+static void cm_destroy_id(struct ib_cm_id *cm_id, int err)</div><div class='ctx'> {</div><div class='ctx'> 	struct cm_id_private *cm_id_priv;</div><div class='ctx'> 	struct cm_work *work;</div><div class='hunk'>@@ -694,12 +735,22 @@ retest:</div><div class='ctx'> 			       sizeof cm_id_priv-&gt;av.port-&gt;cm_dev-&gt;ca_guid,</div><div class='ctx'> 			       NULL, 0);</div><div class='ctx'> 		break;</div><div class='add'>+	case IB_CM_REQ_RCVD:</div><div class='add'>+		if (err == -ENOMEM) {</div><div class='add'>+			/* Do not reject to allow future retries. */</div><div class='add'>+			cm_reset_to_idle(cm_id_priv);</div><div class='add'>+			spin_unlock_irqrestore(&amp;cm_id_priv-&gt;lock, flags);</div><div class='add'>+		} else {</div><div class='add'>+			spin_unlock_irqrestore(&amp;cm_id_priv-&gt;lock, flags);</div><div class='add'>+			ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED,</div><div class='add'>+				       NULL, 0, NULL, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case IB_CM_MRA_REQ_RCVD:</div><div class='ctx'> 	case IB_CM_REP_SENT:</div><div class='ctx'> 	case IB_CM_MRA_REP_RCVD:</div><div class='ctx'> 		ib_cancel_mad(cm_id_priv-&gt;av.port-&gt;mad_agent, cm_id_priv-&gt;msg);</div><div class='ctx'> 		/* Fall through */</div><div class='del'>-	case IB_CM_REQ_RCVD:</div><div class='ctx'> 	case IB_CM_MRA_REQ_SENT:</div><div class='ctx'> 	case IB_CM_REP_RCVD:</div><div class='ctx'> 	case IB_CM_MRA_REP_SENT:</div><div class='hunk'>@@ -730,15 +781,19 @@ retest:</div><div class='ctx'> 	wait_for_completion(&amp;cm_id_priv-&gt;comp);</div><div class='ctx'> 	while ((work = cm_dequeue_work(cm_id_priv)) != NULL)</div><div class='ctx'> 		cm_free_work(work);</div><div class='del'>-	if (cm_id_priv-&gt;private_data &amp;&amp; cm_id_priv-&gt;private_data_len)</div><div class='del'>-		kfree(cm_id_priv-&gt;private_data);</div><div class='add'>+	kfree(cm_id_priv-&gt;compare_data);</div><div class='add'>+	kfree(cm_id_priv-&gt;private_data);</div><div class='ctx'> 	kfree(cm_id_priv);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void ib_destroy_cm_id(struct ib_cm_id *cm_id)</div><div class='add'>+{</div><div class='add'>+	cm_destroy_id(cm_id, 0);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(ib_destroy_cm_id);</div><div class='ctx'> </div><div class='del'>-int ib_cm_listen(struct ib_cm_id *cm_id,</div><div class='del'>-		 __be64 service_id,</div><div class='del'>-		 __be64 service_mask)</div><div class='add'>+int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,</div><div class='add'>+		 struct ib_cm_compare_data *compare_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cm_id_private *cm_id_priv, *cur_cm_id_priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -752,7 +807,19 @@ int ib_cm_listen(struct ib_cm_id *cm_id,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);</div><div class='del'>-	BUG_ON(cm_id-&gt;state != IB_CM_IDLE);</div><div class='add'>+	if (cm_id-&gt;state != IB_CM_IDLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (compare_data) {</div><div class='add'>+		cm_id_priv-&gt;compare_data = kzalloc(sizeof *compare_data,</div><div class='add'>+						   GFP_KERNEL);</div><div class='add'>+		if (!cm_id_priv-&gt;compare_data)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		cm_mask_copy(cm_id_priv-&gt;compare_data-&gt;data,</div><div class='add'>+			     compare_data-&gt;data, compare_data-&gt;mask);</div><div class='add'>+		memcpy(cm_id_priv-&gt;compare_data-&gt;mask, compare_data-&gt;mask,</div><div class='add'>+		       IB_CM_COMPARE_SIZE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cm_id-&gt;state = IB_CM_LISTEN;</div><div class='ctx'> </div><div class='hunk'>@@ -769,6 +836,8 @@ int ib_cm_listen(struct ib_cm_id *cm_id,</div><div class='ctx'> </div><div class='ctx'> 	if (cur_cm_id_priv) {</div><div class='ctx'> 		cm_id-&gt;state = IB_CM_IDLE;</div><div class='add'>+		kfree(cm_id_priv-&gt;compare_data);</div><div class='add'>+		cm_id_priv-&gt;compare_data = NULL;</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1109,7 +1178,7 @@ static void cm_process_work(struct cm_id_private *cm_id_priv,</div><div class='ctx'> 	}</div><div class='ctx'> 	cm_deref_id(cm_id_priv);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		ib_destroy_cm_id(&amp;cm_id_priv-&gt;id);</div><div class='add'>+		cm_destroy_id(&amp;cm_id_priv-&gt;id, ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cm_format_mra(struct cm_mra_msg *mra_msg,</div><div class='hunk'>@@ -1241,7 +1310,8 @@ static struct cm_id_private * cm_match_req(struct cm_work *work,</div><div class='ctx'> </div><div class='ctx'> 	/* Find matching listen request. */</div><div class='ctx'> 	listen_cm_id_priv = cm_find_listen(cm_id_priv-&gt;id.device,</div><div class='del'>-					   req_msg-&gt;service_id);</div><div class='add'>+					   req_msg-&gt;service_id,</div><div class='add'>+					   req_msg-&gt;private_data);</div><div class='ctx'> 	if (!listen_cm_id_priv) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;cm.lock, flags);</div><div class='ctx'> 		cm_issue_rej(work-&gt;port, work-&gt;mad_recv_wc,</div><div class='hunk'>@@ -1276,6 +1346,7 @@ static int cm_req_handler(struct cm_work *work)</div><div class='ctx'> 	cm_id_priv = container_of(cm_id, struct cm_id_private, id);</div><div class='ctx'> 	cm_id_priv-&gt;id.remote_id = req_msg-&gt;local_comm_id;</div><div class='ctx'> 	cm_init_av_for_response(work-&gt;port, work-&gt;mad_recv_wc-&gt;wc,</div><div class='add'>+				work-&gt;mad_recv_wc-&gt;recv_buf.grh,</div><div class='ctx'> 				&amp;cm_id_priv-&gt;av);</div><div class='ctx'> 	cm_id_priv-&gt;timewait_info = cm_create_timewait_info(cm_id_priv-&gt;</div><div class='ctx'> 							    id.local_id);</div><div class='hunk'>@@ -2549,7 +2620,7 @@ static void cm_format_sidr_req(struct cm_sidr_req_msg *sidr_req_msg,</div><div class='ctx'> 	cm_format_mad_hdr(&amp;sidr_req_msg-&gt;hdr, CM_SIDR_REQ_ATTR_ID,</div><div class='ctx'> 			  cm_form_tid(cm_id_priv, CM_MSG_SEQUENCE_SIDR));</div><div class='ctx'> 	sidr_req_msg-&gt;request_id = cm_id_priv-&gt;id.local_id;</div><div class='del'>-	sidr_req_msg-&gt;pkey = cpu_to_be16(param-&gt;pkey);</div><div class='add'>+	sidr_req_msg-&gt;pkey = cpu_to_be16(param-&gt;path-&gt;pkey);</div><div class='ctx'> 	sidr_req_msg-&gt;service_id = param-&gt;service_id;</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;private_data &amp;&amp; param-&gt;private_data_len)</div><div class='hunk'>@@ -2641,6 +2712,7 @@ static int cm_sidr_req_handler(struct cm_work *work)</div><div class='ctx'> 	cm_id_priv-&gt;av.dgid.global.subnet_prefix = cpu_to_be64(wc-&gt;slid);</div><div class='ctx'> 	cm_id_priv-&gt;av.dgid.global.interface_id = 0;</div><div class='ctx'> 	cm_init_av_for_response(work-&gt;port, work-&gt;mad_recv_wc-&gt;wc,</div><div class='add'>+				work-&gt;mad_recv_wc-&gt;recv_buf.grh,</div><div class='ctx'> 				&amp;cm_id_priv-&gt;av);</div><div class='ctx'> 	cm_id_priv-&gt;id.remote_id = sidr_req_msg-&gt;request_id;</div><div class='ctx'> 	cm_id_priv-&gt;id.state = IB_CM_SIDR_REQ_RCVD;</div><div class='hunk'>@@ -2654,7 +2726,8 @@ static int cm_sidr_req_handler(struct cm_work *work)</div><div class='ctx'> 		goto out; /* Duplicate message. */</div><div class='ctx'> 	}</div><div class='ctx'> 	cur_cm_id_priv = cm_find_listen(cm_id-&gt;device,</div><div class='del'>-					sidr_req_msg-&gt;service_id);</div><div class='add'>+					sidr_req_msg-&gt;service_id,</div><div class='add'>+					sidr_req_msg-&gt;private_data);</div><div class='ctx'> 	if (!cur_cm_id_priv) {</div><div class='ctx'> 		rb_erase(&amp;cm_id_priv-&gt;sidr_id_node, &amp;cm.remote_sidr_table);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;cm.lock, flags);</div><div class='hunk'>@@ -3094,6 +3167,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (cm_id_priv-&gt;alt_av.ah_attr.dlid) {</div><div class='ctx'> 			*qp_attr_mask |= IB_QP_ALT_PATH;</div><div class='add'>+			qp_attr-&gt;alt_port_num = cm_id_priv-&gt;alt_av.port-&gt;port_num;</div><div class='ctx'> 			qp_attr-&gt;alt_ah_attr = cm_id_priv-&gt;alt_av.ah_attr;</div><div class='ctx'> 		}</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -3291,7 +3365,6 @@ error:</div><div class='ctx'> </div><div class='ctx'> static void __exit ib_cm_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	flush_workqueue(cm.wq);</div><div class='ctx'> 	destroy_workqueue(cm.wq);</div><div class='ctx'> 	ib_unregister_client(&amp;cm_client);</div><div class='ctx'> 	idr_destroy(&amp;cm.local_id_table);</div><div class='head'>diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c<br/>new file mode 100644<br/>index 000000000000..d6f99d5720fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/cma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/cma.c</a></div><div class='hunk'>@@ -0,0 +1,1929 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2005 Voltaire Inc.  All rights reserved.</div><div class='add'>+ * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This Software is licensed under one of the following licenses:</div><div class='add'>+ *</div><div class='add'>+ * 1) under the terms of the "Common Public License 1.0" a copy of which is</div><div class='add'>+ *    available from the Open Source Initiative, see</div><div class='add'>+ *    http://www.opensource.org/licenses/cpl.php.</div><div class='add'>+ *</div><div class='add'>+ * 2) under the terms of the "The BSD License" a copy of which is</div><div class='add'>+ *    available from the Open Source Initiative, see</div><div class='add'>+ *    http://www.opensource.org/licenses/bsd-license.php.</div><div class='add'>+ *</div><div class='add'>+ * 3) under the terms of the "GNU General Public License (GPL) Version 2" a</div><div class='add'>+ *    copy of which is available from the Open Source Initiative, see</div><div class='add'>+ *    http://www.opensource.org/licenses/gpl-license.php.</div><div class='add'>+ *</div><div class='add'>+ * Licensee has the right to choose one of the above licenses.</div><div class='add'>+ *</div><div class='add'>+ * Redistributions of source code must retain the above copyright</div><div class='add'>+ * notice and one of the license notices.</div><div class='add'>+ *</div><div class='add'>+ * Redistributions in binary form must reproduce both the above copyright</div><div class='add'>+ * notice, one of the license notices in the documentation</div><div class='add'>+ * and/or other materials provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;rdma/rdma_cm.h&gt;</div><div class='add'>+#include &lt;rdma/rdma_cm_ib.h&gt;</div><div class='add'>+#include &lt;rdma/ib_cache.h&gt;</div><div class='add'>+#include &lt;rdma/ib_cm.h&gt;</div><div class='add'>+#include &lt;rdma/ib_sa.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sean Hefty");</div><div class='add'>+MODULE_DESCRIPTION("Generic RDMA CM Agent");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+</div><div class='add'>+#define CMA_CM_RESPONSE_TIMEOUT 20</div><div class='add'>+#define CMA_MAX_CM_RETRIES 3</div><div class='add'>+</div><div class='add'>+static void cma_add_one(struct ib_device *device);</div><div class='add'>+static void cma_remove_one(struct ib_device *device);</div><div class='add'>+</div><div class='add'>+static struct ib_client cma_client = {</div><div class='add'>+	.name   = "cma",</div><div class='add'>+	.add    = cma_add_one,</div><div class='add'>+	.remove = cma_remove_one</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(dev_list);</div><div class='add'>+static LIST_HEAD(listen_any_list);</div><div class='add'>+static DEFINE_MUTEX(lock);</div><div class='add'>+static struct workqueue_struct *cma_wq;</div><div class='add'>+static DEFINE_IDR(sdp_ps);</div><div class='add'>+static DEFINE_IDR(tcp_ps);</div><div class='add'>+</div><div class='add'>+struct cma_device {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	struct ib_device	*device;</div><div class='add'>+	__be64			node_guid;</div><div class='add'>+	struct completion	comp;</div><div class='add'>+	atomic_t		refcount;</div><div class='add'>+	struct list_head	id_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cma_state {</div><div class='add'>+	CMA_IDLE,</div><div class='add'>+	CMA_ADDR_QUERY,</div><div class='add'>+	CMA_ADDR_RESOLVED,</div><div class='add'>+	CMA_ROUTE_QUERY,</div><div class='add'>+	CMA_ROUTE_RESOLVED,</div><div class='add'>+	CMA_CONNECT,</div><div class='add'>+	CMA_DISCONNECT,</div><div class='add'>+	CMA_ADDR_BOUND,</div><div class='add'>+	CMA_LISTEN,</div><div class='add'>+	CMA_DEVICE_REMOVAL,</div><div class='add'>+	CMA_DESTROYING</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rdma_bind_list {</div><div class='add'>+	struct idr		*ps;</div><div class='add'>+	struct hlist_head	owners;</div><div class='add'>+	unsigned short		port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device removal can occur at anytime, so we need extra handling to</div><div class='add'>+ * serialize notifying the user of device removal with other callbacks.</div><div class='add'>+ * We do this by disabling removal notification while a callback is in process,</div><div class='add'>+ * and reporting it after the callback completes.</div><div class='add'>+ */</div><div class='add'>+struct rdma_id_private {</div><div class='add'>+	struct rdma_cm_id	id;</div><div class='add'>+</div><div class='add'>+	struct rdma_bind_list	*bind_list;</div><div class='add'>+	struct hlist_node	node;</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	struct list_head	listen_list;</div><div class='add'>+	struct cma_device	*cma_dev;</div><div class='add'>+</div><div class='add'>+	enum cma_state		state;</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	struct completion	comp;</div><div class='add'>+	atomic_t		refcount;</div><div class='add'>+	wait_queue_head_t	wait_remove;</div><div class='add'>+	atomic_t		dev_remove;</div><div class='add'>+</div><div class='add'>+	int			backlog;</div><div class='add'>+	int			timeout_ms;</div><div class='add'>+	struct ib_sa_query	*query;</div><div class='add'>+	int			query_id;</div><div class='add'>+	union {</div><div class='add'>+		struct ib_cm_id	*ib;</div><div class='add'>+	} cm_id;</div><div class='add'>+</div><div class='add'>+	u32			seq_num;</div><div class='add'>+	u32			qp_num;</div><div class='add'>+	enum ib_qp_type		qp_type;</div><div class='add'>+	u8			srq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cma_work {</div><div class='add'>+	struct work_struct	work;</div><div class='add'>+	struct rdma_id_private	*id;</div><div class='add'>+	enum cma_state		old_state;</div><div class='add'>+	enum cma_state		new_state;</div><div class='add'>+	struct rdma_cm_event	event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union cma_ip_addr {</div><div class='add'>+	struct in6_addr ip6;</div><div class='add'>+	struct {</div><div class='add'>+		__u32 pad[3];</div><div class='add'>+		__u32 addr;</div><div class='add'>+	} ip4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cma_hdr {</div><div class='add'>+	u8 cma_version;</div><div class='add'>+	u8 ip_version;	/* IP version: 7:4 */</div><div class='add'>+	__u16 port;</div><div class='add'>+	union cma_ip_addr src_addr;</div><div class='add'>+	union cma_ip_addr dst_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sdp_hh {</div><div class='add'>+	u8 bsdh[16];</div><div class='add'>+	u8 sdp_version; /* Major version: 7:4 */</div><div class='add'>+	u8 ip_version;	/* IP version: 7:4 */</div><div class='add'>+	u8 sdp_specific1[10];</div><div class='add'>+	__u16 port;</div><div class='add'>+	__u16 sdp_specific2;</div><div class='add'>+	union cma_ip_addr src_addr;</div><div class='add'>+	union cma_ip_addr dst_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sdp_hah {</div><div class='add'>+	u8 bsdh[16];</div><div class='add'>+	u8 sdp_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CMA_VERSION 0x00</div><div class='add'>+#define SDP_MAJ_VERSION 0x2</div><div class='add'>+</div><div class='add'>+static int cma_comp(struct rdma_id_private *id_priv, enum cma_state comp)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;id_priv-&gt;lock, flags);</div><div class='add'>+	ret = (id_priv-&gt;state == comp);</div><div class='add'>+	spin_unlock_irqrestore(&amp;id_priv-&gt;lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_comp_exch(struct rdma_id_private *id_priv,</div><div class='add'>+			 enum cma_state comp, enum cma_state exch)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;id_priv-&gt;lock, flags);</div><div class='add'>+	if ((ret = (id_priv-&gt;state == comp)))</div><div class='add'>+		id_priv-&gt;state = exch;</div><div class='add'>+	spin_unlock_irqrestore(&amp;id_priv-&gt;lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum cma_state cma_exch(struct rdma_id_private *id_priv,</div><div class='add'>+			       enum cma_state exch)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	enum cma_state old;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;id_priv-&gt;lock, flags);</div><div class='add'>+	old = id_priv-&gt;state;</div><div class='add'>+	id_priv-&gt;state = exch;</div><div class='add'>+	spin_unlock_irqrestore(&amp;id_priv-&gt;lock, flags);</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 cma_get_ip_ver(struct cma_hdr *hdr)</div><div class='add'>+{</div><div class='add'>+	return hdr-&gt;ip_version &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cma_set_ip_ver(struct cma_hdr *hdr, u8 ip_ver)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;ip_version = (ip_ver &lt;&lt; 4) | (hdr-&gt;ip_version &amp; 0xF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 sdp_get_majv(u8 sdp_version)</div><div class='add'>+{</div><div class='add'>+	return sdp_version &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 sdp_get_ip_ver(struct sdp_hh *hh)</div><div class='add'>+{</div><div class='add'>+	return hh-&gt;ip_version &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sdp_set_ip_ver(struct sdp_hh *hh, u8 ip_ver)</div><div class='add'>+{</div><div class='add'>+	hh-&gt;ip_version = (ip_ver &lt;&lt; 4) | (hh-&gt;ip_version &amp; 0xF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_attach_to_dev(struct rdma_id_private *id_priv,</div><div class='add'>+			      struct cma_device *cma_dev)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;cma_dev-&gt;refcount);</div><div class='add'>+	id_priv-&gt;cma_dev = cma_dev;</div><div class='add'>+	id_priv-&gt;id.device = cma_dev-&gt;device;</div><div class='add'>+	list_add_tail(&amp;id_priv-&gt;list, &amp;cma_dev-&gt;id_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cma_deref_dev(struct cma_device *cma_dev)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;cma_dev-&gt;refcount))</div><div class='add'>+		complete(&amp;cma_dev-&gt;comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_detach_from_dev(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;id_priv-&gt;list);</div><div class='add'>+	cma_deref_dev(id_priv-&gt;cma_dev);</div><div class='add'>+	id_priv-&gt;cma_dev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_acquire_ib_dev(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct cma_device *cma_dev;</div><div class='add'>+	union ib_gid gid;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	ib_addr_get_sgid(&amp;id_priv-&gt;id.route.addr.dev_addr, &amp;gid),</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_for_each_entry(cma_dev, &amp;dev_list, list) {</div><div class='add'>+		ret = ib_find_cached_gid(cma_dev-&gt;device, &amp;gid,</div><div class='add'>+					 &amp;id_priv-&gt;id.port_num, NULL);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			cma_attach_to_dev(id_priv, cma_dev);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_acquire_dev(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	switch (id_priv-&gt;id.route.addr.dev_addr.dev_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		return cma_acquire_ib_dev(id_priv);</div><div class='add'>+	default:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_deref_id(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;id_priv-&gt;refcount))</div><div class='add'>+		complete(&amp;id_priv-&gt;comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_release_remove(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;id_priv-&gt;dev_remove))</div><div class='add'>+		wake_up(&amp;id_priv-&gt;wait_remove);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,</div><div class='add'>+				  void *context, enum rdma_port_space ps)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+</div><div class='add'>+	id_priv = kzalloc(sizeof *id_priv, GFP_KERNEL);</div><div class='add'>+	if (!id_priv)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	id_priv-&gt;state = CMA_IDLE;</div><div class='add'>+	id_priv-&gt;id.context = context;</div><div class='add'>+	id_priv-&gt;id.event_handler = event_handler;</div><div class='add'>+	id_priv-&gt;id.ps = ps;</div><div class='add'>+	spin_lock_init(&amp;id_priv-&gt;lock);</div><div class='add'>+	init_completion(&amp;id_priv-&gt;comp);</div><div class='add'>+	atomic_set(&amp;id_priv-&gt;refcount, 1);</div><div class='add'>+	init_waitqueue_head(&amp;id_priv-&gt;wait_remove);</div><div class='add'>+	atomic_set(&amp;id_priv-&gt;dev_remove, 0);</div><div class='add'>+	INIT_LIST_HEAD(&amp;id_priv-&gt;listen_list);</div><div class='add'>+	get_random_bytes(&amp;id_priv-&gt;seq_num, sizeof id_priv-&gt;seq_num);</div><div class='add'>+</div><div class='add'>+	return &amp;id_priv-&gt;id;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_create_id);</div><div class='add'>+</div><div class='add'>+static int cma_init_ib_qp(struct rdma_id_private *id_priv, struct ib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+	struct rdma_dev_addr *dev_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_addr = &amp;id_priv-&gt;id.route.addr.dev_addr;</div><div class='add'>+	ret = ib_find_cached_pkey(id_priv-&gt;id.device, id_priv-&gt;id.port_num,</div><div class='add'>+				  ib_addr_get_pkey(dev_addr),</div><div class='add'>+				  &amp;qp_attr.pkey_index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_INIT;</div><div class='add'>+	qp_attr.qp_access_flags = IB_ACCESS_LOCAL_WRITE;</div><div class='add'>+	qp_attr.port_num = id_priv-&gt;id.port_num;</div><div class='add'>+	return ib_modify_qp(qp, &amp;qp_attr, IB_QP_STATE | IB_QP_ACCESS_FLAGS |</div><div class='add'>+					  IB_QP_PKEY_INDEX | IB_QP_PORT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd,</div><div class='add'>+		   struct ib_qp_init_attr *qp_init_attr)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	struct ib_qp *qp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (id-&gt;device != pd-&gt;device)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	qp = ib_create_qp(pd, qp_init_attr);</div><div class='add'>+	if (IS_ERR(qp))</div><div class='add'>+		return PTR_ERR(qp);</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		ret = cma_init_ib_qp(id_priv, qp);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	id-&gt;qp = qp;</div><div class='add'>+	id_priv-&gt;qp_num = qp-&gt;qp_num;</div><div class='add'>+	id_priv-&gt;qp_type = qp-&gt;qp_type;</div><div class='add'>+	id_priv-&gt;srq = (qp-&gt;srq != NULL);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	ib_destroy_qp(qp);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_create_qp);</div><div class='add'>+</div><div class='add'>+void rdma_destroy_qp(struct rdma_cm_id *id)</div><div class='add'>+{</div><div class='add'>+	ib_destroy_qp(id-&gt;qp);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_destroy_qp);</div><div class='add'>+</div><div class='add'>+static int cma_modify_qp_rtr(struct rdma_cm_id *id)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+	int qp_attr_mask, ret;</div><div class='add'>+</div><div class='add'>+	if (!id-&gt;qp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Need to update QP attributes from default values. */</div><div class='add'>+	qp_attr.qp_state = IB_QPS_INIT;</div><div class='add'>+	ret = rdma_init_qp_attr(id, &amp;qp_attr, &amp;qp_attr_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ib_modify_qp(id-&gt;qp, &amp;qp_attr, qp_attr_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_RTR;</div><div class='add'>+	ret = rdma_init_qp_attr(id, &amp;qp_attr, &amp;qp_attr_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ib_modify_qp(id-&gt;qp, &amp;qp_attr, qp_attr_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_modify_qp_rts(struct rdma_cm_id *id)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+	int qp_attr_mask, ret;</div><div class='add'>+</div><div class='add'>+	if (!id-&gt;qp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_RTS;</div><div class='add'>+	ret = rdma_init_qp_attr(id, &amp;qp_attr, &amp;qp_attr_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ib_modify_qp(id-&gt;qp, &amp;qp_attr, qp_attr_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_modify_qp_err(struct rdma_cm_id *id)</div><div class='add'>+{</div><div class='add'>+	struct ib_qp_attr qp_attr;</div><div class='add'>+</div><div class='add'>+	if (!id-&gt;qp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	qp_attr.qp_state = IB_QPS_ERR;</div><div class='add'>+	return ib_modify_qp(id-&gt;qp, &amp;qp_attr, IB_QP_STATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,</div><div class='add'>+		       int *qp_attr_mask)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	switch (id_priv-&gt;id.device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		ret = ib_cm_init_qp_attr(id_priv-&gt;cm_id.ib, qp_attr,</div><div class='add'>+					 qp_attr_mask);</div><div class='add'>+		if (qp_attr-&gt;qp_state == IB_QPS_RTR)</div><div class='add'>+			qp_attr-&gt;rq_psn = id_priv-&gt;seq_num;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_init_qp_attr);</div><div class='add'>+</div><div class='add'>+static inline int cma_zero_addr(struct sockaddr *addr)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr *ip6;</div><div class='add'>+</div><div class='add'>+	if (addr-&gt;sa_family == AF_INET)</div><div class='add'>+		return ZERONET(((struct sockaddr_in *) addr)-&gt;sin_addr.s_addr);</div><div class='add'>+	else {</div><div class='add'>+		ip6 = &amp;((struct sockaddr_in6 *) addr)-&gt;sin6_addr;</div><div class='add'>+		return (ip6-&gt;s6_addr32[0] | ip6-&gt;s6_addr32[1] |</div><div class='add'>+			ip6-&gt;s6_addr32[2] | ip6-&gt;s6_addr32[3]) == 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cma_loopback_addr(struct sockaddr *addr)</div><div class='add'>+{</div><div class='add'>+	return LOOPBACK(((struct sockaddr_in *) addr)-&gt;sin_addr.s_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cma_any_addr(struct sockaddr *addr)</div><div class='add'>+{</div><div class='add'>+	return cma_zero_addr(addr) || cma_loopback_addr(addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cma_any_port(struct sockaddr *addr)</div><div class='add'>+{</div><div class='add'>+	return !((struct sockaddr_in *) addr)-&gt;sin_port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_get_net_info(void *hdr, enum rdma_port_space ps,</div><div class='add'>+			    u8 *ip_ver, __u16 *port,</div><div class='add'>+			    union cma_ip_addr **src, union cma_ip_addr **dst)</div><div class='add'>+{</div><div class='add'>+	switch (ps) {</div><div class='add'>+	case RDMA_PS_SDP:</div><div class='add'>+		if (sdp_get_majv(((struct sdp_hh *) hdr)-&gt;sdp_version) !=</div><div class='add'>+		    SDP_MAJ_VERSION)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		*ip_ver	= sdp_get_ip_ver(hdr);</div><div class='add'>+		*port	= ((struct sdp_hh *) hdr)-&gt;port;</div><div class='add'>+		*src	= &amp;((struct sdp_hh *) hdr)-&gt;src_addr;</div><div class='add'>+		*dst	= &amp;((struct sdp_hh *) hdr)-&gt;dst_addr;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (((struct cma_hdr *) hdr)-&gt;cma_version != CMA_VERSION)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		*ip_ver	= cma_get_ip_ver(hdr);</div><div class='add'>+		*port	= ((struct cma_hdr *) hdr)-&gt;port;</div><div class='add'>+		*src	= &amp;((struct cma_hdr *) hdr)-&gt;src_addr;</div><div class='add'>+		*dst	= &amp;((struct cma_hdr *) hdr)-&gt;dst_addr;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*ip_ver != 4 &amp;&amp; *ip_ver != 6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_save_net_info(struct rdma_addr *addr,</div><div class='add'>+			      struct rdma_addr *listen_addr,</div><div class='add'>+			      u8 ip_ver, __u16 port,</div><div class='add'>+			      union cma_ip_addr *src, union cma_ip_addr *dst)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in *listen4, *ip4;</div><div class='add'>+	struct sockaddr_in6 *listen6, *ip6;</div><div class='add'>+</div><div class='add'>+	switch (ip_ver) {</div><div class='add'>+	case 4:</div><div class='add'>+		listen4 = (struct sockaddr_in *) &amp;listen_addr-&gt;src_addr;</div><div class='add'>+		ip4 = (struct sockaddr_in *) &amp;addr-&gt;src_addr;</div><div class='add'>+		ip4-&gt;sin_family = listen4-&gt;sin_family;</div><div class='add'>+		ip4-&gt;sin_addr.s_addr = dst-&gt;ip4.addr;</div><div class='add'>+		ip4-&gt;sin_port = listen4-&gt;sin_port;</div><div class='add'>+</div><div class='add'>+		ip4 = (struct sockaddr_in *) &amp;addr-&gt;dst_addr;</div><div class='add'>+		ip4-&gt;sin_family = listen4-&gt;sin_family;</div><div class='add'>+		ip4-&gt;sin_addr.s_addr = src-&gt;ip4.addr;</div><div class='add'>+		ip4-&gt;sin_port = port;</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		listen6 = (struct sockaddr_in6 *) &amp;listen_addr-&gt;src_addr;</div><div class='add'>+		ip6 = (struct sockaddr_in6 *) &amp;addr-&gt;src_addr;</div><div class='add'>+		ip6-&gt;sin6_family = listen6-&gt;sin6_family;</div><div class='add'>+		ip6-&gt;sin6_addr = dst-&gt;ip6;</div><div class='add'>+		ip6-&gt;sin6_port = listen6-&gt;sin6_port;</div><div class='add'>+</div><div class='add'>+		ip6 = (struct sockaddr_in6 *) &amp;addr-&gt;dst_addr;</div><div class='add'>+		ip6-&gt;sin6_family = listen6-&gt;sin6_family;</div><div class='add'>+		ip6-&gt;sin6_addr = src-&gt;ip6;</div><div class='add'>+		ip6-&gt;sin6_port = port;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cma_user_data_offset(enum rdma_port_space ps)</div><div class='add'>+{</div><div class='add'>+	switch (ps) {</div><div class='add'>+	case RDMA_PS_SDP:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return sizeof(struct cma_hdr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_notify_user(struct rdma_id_private *id_priv,</div><div class='add'>+			   enum rdma_cm_event_type type, int status,</div><div class='add'>+			   void *data, u8 data_len)</div><div class='add'>+{</div><div class='add'>+	struct rdma_cm_event event;</div><div class='add'>+</div><div class='add'>+	event.event = type;</div><div class='add'>+	event.status = status;</div><div class='add'>+	event.private_data = data;</div><div class='add'>+	event.private_data_len = data_len;</div><div class='add'>+</div><div class='add'>+	return id_priv-&gt;id.event_handler(&amp;id_priv-&gt;id, &amp;event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_cancel_route(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	switch (id_priv-&gt;id.device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		if (id_priv-&gt;query)</div><div class='add'>+			ib_sa_cancel_query(id_priv-&gt;query_id, id_priv-&gt;query);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cma_internal_listen(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	return (id_priv-&gt;state == CMA_LISTEN) &amp;&amp; id_priv-&gt;cma_dev &amp;&amp;</div><div class='add'>+	       cma_any_addr(&amp;id_priv-&gt;id.route.addr.src_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_destroy_listen(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	cma_exch(id_priv, CMA_DESTROYING);</div><div class='add'>+</div><div class='add'>+	if (id_priv-&gt;cma_dev) {</div><div class='add'>+		switch (id_priv-&gt;id.device-&gt;node_type) {</div><div class='add'>+		case IB_NODE_CA:</div><div class='add'>+	 		if (id_priv-&gt;cm_id.ib &amp;&amp; !IS_ERR(id_priv-&gt;cm_id.ib))</div><div class='add'>+				ib_destroy_cm_id(id_priv-&gt;cm_id.ib);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cma_detach_from_dev(id_priv);</div><div class='add'>+	}</div><div class='add'>+	list_del(&amp;id_priv-&gt;listen_list);</div><div class='add'>+</div><div class='add'>+	cma_deref_id(id_priv);</div><div class='add'>+	wait_for_completion(&amp;id_priv-&gt;comp);</div><div class='add'>+</div><div class='add'>+	kfree(id_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_cancel_listens(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *dev_id_priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_del(&amp;id_priv-&gt;list);</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;id_priv-&gt;listen_list)) {</div><div class='add'>+		dev_id_priv = list_entry(id_priv-&gt;listen_list.next,</div><div class='add'>+					 struct rdma_id_private, listen_list);</div><div class='add'>+		cma_destroy_listen(dev_id_priv);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_cancel_operation(struct rdma_id_private *id_priv,</div><div class='add'>+				 enum cma_state state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case CMA_ADDR_QUERY:</div><div class='add'>+		rdma_addr_cancel(&amp;id_priv-&gt;id.route.addr.dev_addr);</div><div class='add'>+		break;</div><div class='add'>+	case CMA_ROUTE_QUERY:</div><div class='add'>+		cma_cancel_route(id_priv);</div><div class='add'>+		break;</div><div class='add'>+	case CMA_LISTEN:</div><div class='add'>+		if (cma_any_addr(&amp;id_priv-&gt;id.route.addr.src_addr) &amp;&amp;</div><div class='add'>+		    !id_priv-&gt;cma_dev)</div><div class='add'>+			cma_cancel_listens(id_priv);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_release_port(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct rdma_bind_list *bind_list = id_priv-&gt;bind_list;</div><div class='add'>+</div><div class='add'>+	if (!bind_list)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	hlist_del(&amp;id_priv-&gt;node);</div><div class='add'>+	if (hlist_empty(&amp;bind_list-&gt;owners)) {</div><div class='add'>+		idr_remove(bind_list-&gt;ps, bind_list-&gt;port);</div><div class='add'>+		kfree(bind_list);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rdma_destroy_id(struct rdma_cm_id *id)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	enum cma_state state;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	state = cma_exch(id_priv, CMA_DESTROYING);</div><div class='add'>+	cma_cancel_operation(id_priv, state);</div><div class='add'>+</div><div class='add'>+	if (id_priv-&gt;cma_dev) {</div><div class='add'>+		switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+		case IB_NODE_CA:</div><div class='add'>+	 		if (id_priv-&gt;cm_id.ib &amp;&amp; !IS_ERR(id_priv-&gt;cm_id.ib))</div><div class='add'>+				ib_destroy_cm_id(id_priv-&gt;cm_id.ib);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	  	mutex_lock(&amp;lock);</div><div class='add'>+		cma_detach_from_dev(id_priv);</div><div class='add'>+		mutex_unlock(&amp;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cma_release_port(id_priv);</div><div class='add'>+	cma_deref_id(id_priv);</div><div class='add'>+	wait_for_completion(&amp;id_priv-&gt;comp);</div><div class='add'>+</div><div class='add'>+	kfree(id_priv-&gt;id.route.path_rec);</div><div class='add'>+	kfree(id_priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_destroy_id);</div><div class='add'>+</div><div class='add'>+static int cma_rep_recv(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cma_modify_qp_rtr(&amp;id_priv-&gt;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	ret = cma_modify_qp_rts(&amp;id_priv-&gt;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	ret = ib_send_cm_rtu(id_priv-&gt;cm_id.ib, NULL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+reject:</div><div class='add'>+	cma_modify_qp_err(&amp;id_priv-&gt;id);</div><div class='add'>+	ib_send_cm_rej(id_priv-&gt;cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED,</div><div class='add'>+		       NULL, 0, NULL, 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_verify_rep(struct rdma_id_private *id_priv, void *data)</div><div class='add'>+{</div><div class='add'>+	if (id_priv-&gt;id.ps == RDMA_PS_SDP &amp;&amp;</div><div class='add'>+	    sdp_get_majv(((struct sdp_hah *) data)-&gt;sdp_version) !=</div><div class='add'>+	    SDP_MAJ_VERSION)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_rtu_recv(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cma_modify_qp_rts(&amp;id_priv-&gt;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+reject:</div><div class='add'>+	cma_modify_qp_err(&amp;id_priv-&gt;id);</div><div class='add'>+	ib_send_cm_rej(id_priv-&gt;cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED,</div><div class='add'>+		       NULL, 0, NULL, 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv = cm_id-&gt;context;</div><div class='add'>+	enum rdma_cm_event_type event;</div><div class='add'>+	u8 private_data_len = 0;</div><div class='add'>+	int ret = 0, status = 0;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;id_priv-&gt;dev_remove);</div><div class='add'>+	if (!cma_comp(id_priv, CMA_CONNECT))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	switch (ib_event-&gt;event) {</div><div class='add'>+	case IB_CM_REQ_ERROR:</div><div class='add'>+	case IB_CM_REP_ERROR:</div><div class='add'>+		event = RDMA_CM_EVENT_UNREACHABLE;</div><div class='add'>+		status = -ETIMEDOUT;</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_REP_RECEIVED:</div><div class='add'>+		status = cma_verify_rep(id_priv, ib_event-&gt;private_data);</div><div class='add'>+		if (status)</div><div class='add'>+			event = RDMA_CM_EVENT_CONNECT_ERROR;</div><div class='add'>+		else if (id_priv-&gt;id.qp &amp;&amp; id_priv-&gt;id.ps != RDMA_PS_SDP) {</div><div class='add'>+			status = cma_rep_recv(id_priv);</div><div class='add'>+			event = status ? RDMA_CM_EVENT_CONNECT_ERROR :</div><div class='add'>+					 RDMA_CM_EVENT_ESTABLISHED;</div><div class='add'>+		} else</div><div class='add'>+			event = RDMA_CM_EVENT_CONNECT_RESPONSE;</div><div class='add'>+		private_data_len = IB_CM_REP_PRIVATE_DATA_SIZE;</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_RTU_RECEIVED:</div><div class='add'>+		status = cma_rtu_recv(id_priv);</div><div class='add'>+		event = status ? RDMA_CM_EVENT_CONNECT_ERROR :</div><div class='add'>+				 RDMA_CM_EVENT_ESTABLISHED;</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_DREQ_ERROR:</div><div class='add'>+		status = -ETIMEDOUT; /* fall through */</div><div class='add'>+	case IB_CM_DREQ_RECEIVED:</div><div class='add'>+	case IB_CM_DREP_RECEIVED:</div><div class='add'>+		if (!cma_comp_exch(id_priv, CMA_CONNECT, CMA_DISCONNECT))</div><div class='add'>+			goto out;</div><div class='add'>+		event = RDMA_CM_EVENT_DISCONNECTED;</div><div class='add'>+		break;</div><div class='add'>+	case IB_CM_TIMEWAIT_EXIT:</div><div class='add'>+	case IB_CM_MRA_RECEIVED:</div><div class='add'>+		/* ignore event */</div><div class='add'>+		goto out;</div><div class='add'>+	case IB_CM_REJ_RECEIVED:</div><div class='add'>+		cma_modify_qp_err(&amp;id_priv-&gt;id);</div><div class='add'>+		status = ib_event-&gt;param.rej_rcvd.reason;</div><div class='add'>+		event = RDMA_CM_EVENT_REJECTED;</div><div class='add'>+		private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "RDMA CMA: unexpected IB CM event: %d",</div><div class='add'>+		       ib_event-&gt;event);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cma_notify_user(id_priv, event, status, ib_event-&gt;private_data,</div><div class='add'>+			      private_data_len);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Destroy the CM ID by returning a non-zero value. */</div><div class='add'>+		id_priv-&gt;cm_id.ib = NULL;</div><div class='add'>+		cma_exch(id_priv, CMA_DESTROYING);</div><div class='add'>+		cma_release_remove(id_priv);</div><div class='add'>+		rdma_destroy_id(&amp;id_priv-&gt;id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	cma_release_remove(id_priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rdma_id_private *cma_new_id(struct rdma_cm_id *listen_id,</div><div class='add'>+					  struct ib_cm_event *ib_event)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	struct rdma_cm_id *id;</div><div class='add'>+	struct rdma_route *rt;</div><div class='add'>+	union cma_ip_addr *src, *dst;</div><div class='add'>+	__u16 port;</div><div class='add'>+	u8 ip_ver;</div><div class='add'>+</div><div class='add'>+	id = rdma_create_id(listen_id-&gt;event_handler, listen_id-&gt;context,</div><div class='add'>+			    listen_id-&gt;ps);</div><div class='add'>+	if (IS_ERR(id))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	rt = &amp;id-&gt;route;</div><div class='add'>+	rt-&gt;num_paths = ib_event-&gt;param.req_rcvd.alternate_path ? 2 : 1;</div><div class='add'>+	rt-&gt;path_rec = kmalloc(sizeof *rt-&gt;path_rec * rt-&gt;num_paths, GFP_KERNEL);</div><div class='add'>+	if (!rt-&gt;path_rec)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (cma_get_net_info(ib_event-&gt;private_data, listen_id-&gt;ps,</div><div class='add'>+			     &amp;ip_ver, &amp;port, &amp;src, &amp;dst))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	cma_save_net_info(&amp;id-&gt;route.addr, &amp;listen_id-&gt;route.addr,</div><div class='add'>+			  ip_ver, port, src, dst);</div><div class='add'>+	rt-&gt;path_rec[0] = *ib_event-&gt;param.req_rcvd.primary_path;</div><div class='add'>+	if (rt-&gt;num_paths == 2)</div><div class='add'>+		rt-&gt;path_rec[1] = *ib_event-&gt;param.req_rcvd.alternate_path;</div><div class='add'>+</div><div class='add'>+	ib_addr_set_sgid(&amp;rt-&gt;addr.dev_addr, &amp;rt-&gt;path_rec[0].sgid);</div><div class='add'>+	ib_addr_set_dgid(&amp;rt-&gt;addr.dev_addr, &amp;rt-&gt;path_rec[0].dgid);</div><div class='add'>+	ib_addr_set_pkey(&amp;rt-&gt;addr.dev_addr, be16_to_cpu(rt-&gt;path_rec[0].pkey));</div><div class='add'>+	rt-&gt;addr.dev_addr.dev_type = IB_NODE_CA;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	id_priv-&gt;state = CMA_CONNECT;</div><div class='add'>+	return id_priv;</div><div class='add'>+err:</div><div class='add'>+	rdma_destroy_id(id);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *listen_id, *conn_id;</div><div class='add'>+	int offset, ret;</div><div class='add'>+</div><div class='add'>+	listen_id = cm_id-&gt;context;</div><div class='add'>+	atomic_inc(&amp;listen_id-&gt;dev_remove);</div><div class='add'>+	if (!cma_comp(listen_id, CMA_LISTEN)) {</div><div class='add'>+		ret = -ECONNABORTED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn_id = cma_new_id(&amp;listen_id-&gt;id, ib_event);</div><div class='add'>+	if (!conn_id) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;conn_id-&gt;dev_remove);</div><div class='add'>+	ret = cma_acquire_ib_dev(conn_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		cma_release_remove(conn_id);</div><div class='add'>+		rdma_destroy_id(&amp;conn_id-&gt;id);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn_id-&gt;cm_id.ib = cm_id;</div><div class='add'>+	cm_id-&gt;context = conn_id;</div><div class='add'>+	cm_id-&gt;cm_handler = cma_ib_handler;</div><div class='add'>+</div><div class='add'>+	offset = cma_user_data_offset(listen_id-&gt;id.ps);</div><div class='add'>+	ret = cma_notify_user(conn_id, RDMA_CM_EVENT_CONNECT_REQUEST, 0,</div><div class='add'>+			      ib_event-&gt;private_data + offset,</div><div class='add'>+			      IB_CM_REQ_PRIVATE_DATA_SIZE - offset);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Destroy the CM ID by returning a non-zero value. */</div><div class='add'>+		conn_id-&gt;cm_id.ib = NULL;</div><div class='add'>+		cma_exch(conn_id, CMA_DESTROYING);</div><div class='add'>+		cma_release_remove(conn_id);</div><div class='add'>+		rdma_destroy_id(&amp;conn_id-&gt;id);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	cma_release_remove(listen_id);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be64 cma_get_service_id(enum rdma_port_space ps, struct sockaddr *addr)</div><div class='add'>+{</div><div class='add'>+	return cpu_to_be64(((u64)ps &lt;&lt; 16) +</div><div class='add'>+	       be16_to_cpu(((struct sockaddr_in *) addr)-&gt;sin_port));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,</div><div class='add'>+				 struct ib_cm_compare_data *compare)</div><div class='add'>+{</div><div class='add'>+	struct cma_hdr *cma_data, *cma_mask;</div><div class='add'>+	struct sdp_hh *sdp_data, *sdp_mask;</div><div class='add'>+	__u32 ip4_addr;</div><div class='add'>+	struct in6_addr ip6_addr;</div><div class='add'>+</div><div class='add'>+	memset(compare, 0, sizeof *compare);</div><div class='add'>+	cma_data = (void *) compare-&gt;data;</div><div class='add'>+	cma_mask = (void *) compare-&gt;mask;</div><div class='add'>+	sdp_data = (void *) compare-&gt;data;</div><div class='add'>+	sdp_mask = (void *) compare-&gt;mask;</div><div class='add'>+</div><div class='add'>+	switch (addr-&gt;sa_family) {</div><div class='add'>+	case AF_INET:</div><div class='add'>+		ip4_addr = ((struct sockaddr_in *) addr)-&gt;sin_addr.s_addr;</div><div class='add'>+		if (ps == RDMA_PS_SDP) {</div><div class='add'>+			sdp_set_ip_ver(sdp_data, 4);</div><div class='add'>+			sdp_set_ip_ver(sdp_mask, 0xF);</div><div class='add'>+			sdp_data-&gt;dst_addr.ip4.addr = ip4_addr;</div><div class='add'>+			sdp_mask-&gt;dst_addr.ip4.addr = ~0;</div><div class='add'>+		} else {</div><div class='add'>+			cma_set_ip_ver(cma_data, 4);</div><div class='add'>+			cma_set_ip_ver(cma_mask, 0xF);</div><div class='add'>+			cma_data-&gt;dst_addr.ip4.addr = ip4_addr;</div><div class='add'>+			cma_mask-&gt;dst_addr.ip4.addr = ~0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		ip6_addr = ((struct sockaddr_in6 *) addr)-&gt;sin6_addr;</div><div class='add'>+		if (ps == RDMA_PS_SDP) {</div><div class='add'>+			sdp_set_ip_ver(sdp_data, 6);</div><div class='add'>+			sdp_set_ip_ver(sdp_mask, 0xF);</div><div class='add'>+			sdp_data-&gt;dst_addr.ip6 = ip6_addr;</div><div class='add'>+			memset(&amp;sdp_mask-&gt;dst_addr.ip6, 0xFF,</div><div class='add'>+			       sizeof sdp_mask-&gt;dst_addr.ip6);</div><div class='add'>+		} else {</div><div class='add'>+			cma_set_ip_ver(cma_data, 6);</div><div class='add'>+			cma_set_ip_ver(cma_mask, 0xF);</div><div class='add'>+			cma_data-&gt;dst_addr.ip6 = ip6_addr;</div><div class='add'>+			memset(&amp;cma_mask-&gt;dst_addr.ip6, 0xFF,</div><div class='add'>+			       sizeof cma_mask-&gt;dst_addr.ip6);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_ib_listen(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct ib_cm_compare_data compare_data;</div><div class='add'>+	struct sockaddr *addr;</div><div class='add'>+	__be64 svc_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv-&gt;cm_id.ib = ib_create_cm_id(id_priv-&gt;id.device, cma_req_handler,</div><div class='add'>+					    id_priv);</div><div class='add'>+	if (IS_ERR(id_priv-&gt;cm_id.ib))</div><div class='add'>+		return PTR_ERR(id_priv-&gt;cm_id.ib);</div><div class='add'>+</div><div class='add'>+	addr = &amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='add'>+	svc_id = cma_get_service_id(id_priv-&gt;id.ps, addr);</div><div class='add'>+	if (cma_any_addr(addr))</div><div class='add'>+		ret = ib_cm_listen(id_priv-&gt;cm_id.ib, svc_id, 0, NULL);</div><div class='add'>+	else {</div><div class='add'>+		cma_set_compare_data(id_priv-&gt;id.ps, addr, &amp;compare_data);</div><div class='add'>+		ret = ib_cm_listen(id_priv-&gt;cm_id.ib, svc_id, 0, &amp;compare_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		ib_destroy_cm_id(id_priv-&gt;cm_id.ib);</div><div class='add'>+		id_priv-&gt;cm_id.ib = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_listen_handler(struct rdma_cm_id *id,</div><div class='add'>+			      struct rdma_cm_event *event)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv = id-&gt;context;</div><div class='add'>+</div><div class='add'>+	id-&gt;context = id_priv-&gt;id.context;</div><div class='add'>+	id-&gt;event_handler = id_priv-&gt;id.event_handler;</div><div class='add'>+	return id_priv-&gt;id.event_handler(id, event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_listen_on_dev(struct rdma_id_private *id_priv,</div><div class='add'>+			      struct cma_device *cma_dev)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *dev_id_priv;</div><div class='add'>+	struct rdma_cm_id *id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id = rdma_create_id(cma_listen_handler, id_priv, id_priv-&gt;id.ps);</div><div class='add'>+	if (IS_ERR(id))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+</div><div class='add'>+	dev_id_priv-&gt;state = CMA_ADDR_BOUND;</div><div class='add'>+	memcpy(&amp;id-&gt;route.addr.src_addr, &amp;id_priv-&gt;id.route.addr.src_addr,</div><div class='add'>+	       ip_addr_size(&amp;id_priv-&gt;id.route.addr.src_addr));</div><div class='add'>+</div><div class='add'>+	cma_attach_to_dev(dev_id_priv, cma_dev);</div><div class='add'>+	list_add_tail(&amp;dev_id_priv-&gt;listen_list, &amp;id_priv-&gt;listen_list);</div><div class='add'>+</div><div class='add'>+	ret = rdma_listen(id, id_priv-&gt;backlog);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+err:</div><div class='add'>+	cma_destroy_listen(dev_id_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_listen_on_all(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct cma_device *cma_dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_add_tail(&amp;id_priv-&gt;list, &amp;listen_any_list);</div><div class='add'>+	list_for_each_entry(cma_dev, &amp;dev_list, list)</div><div class='add'>+		cma_listen_on_dev(id_priv, cma_dev);</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_bind_any(struct rdma_cm_id *id, sa_family_t af)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in addr_in;</div><div class='add'>+</div><div class='add'>+	memset(&amp;addr_in, 0, sizeof addr_in);</div><div class='add'>+	addr_in.sin_family = af;</div><div class='add'>+	return rdma_bind_addr(id, (struct sockaddr *) &amp;addr_in);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_listen(struct rdma_cm_id *id, int backlog)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (id_priv-&gt;state == CMA_IDLE) {</div><div class='add'>+		ret = cma_bind_any(id, AF_INET);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_LISTEN))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id_priv-&gt;backlog = backlog;</div><div class='add'>+	if (id-&gt;device) {</div><div class='add'>+		switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+		case IB_NODE_CA:</div><div class='add'>+			ret = cma_ib_listen(id_priv);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -ENOSYS;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		cma_listen_on_all(id_priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	id_priv-&gt;backlog = 0;</div><div class='add'>+	cma_comp_exch(id_priv, CMA_LISTEN, CMA_ADDR_BOUND);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_listen);</div><div class='add'>+</div><div class='add'>+static void cma_query_handler(int status, struct ib_sa_path_rec *path_rec,</div><div class='add'>+			      void *context)</div><div class='add'>+{</div><div class='add'>+	struct cma_work *work = context;</div><div class='add'>+	struct rdma_route *route;</div><div class='add'>+</div><div class='add'>+	route = &amp;work-&gt;id-&gt;id.route;</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		route-&gt;num_paths = 1;</div><div class='add'>+		*route-&gt;path_rec = *path_rec;</div><div class='add'>+	} else {</div><div class='add'>+		work-&gt;old_state = CMA_ROUTE_QUERY;</div><div class='add'>+		work-&gt;new_state = CMA_ADDR_RESOLVED;</div><div class='add'>+		work-&gt;event.event = RDMA_CM_EVENT_ROUTE_ERROR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(cma_wq, &amp;work-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,</div><div class='add'>+			      struct cma_work *work)</div><div class='add'>+{</div><div class='add'>+	struct rdma_dev_addr *addr = &amp;id_priv-&gt;id.route.addr.dev_addr;</div><div class='add'>+	struct ib_sa_path_rec path_rec;</div><div class='add'>+</div><div class='add'>+	memset(&amp;path_rec, 0, sizeof path_rec);</div><div class='add'>+	ib_addr_get_sgid(addr, &amp;path_rec.sgid);</div><div class='add'>+	ib_addr_get_dgid(addr, &amp;path_rec.dgid);</div><div class='add'>+	path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(addr));</div><div class='add'>+	path_rec.numb_path = 1;</div><div class='add'>+</div><div class='add'>+	id_priv-&gt;query_id = ib_sa_path_rec_get(id_priv-&gt;id.device,</div><div class='add'>+				id_priv-&gt;id.port_num, &amp;path_rec,</div><div class='add'>+				IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |</div><div class='add'>+				IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH,</div><div class='add'>+				timeout_ms, GFP_KERNEL,</div><div class='add'>+				cma_query_handler, work, &amp;id_priv-&gt;query);</div><div class='add'>+</div><div class='add'>+	return (id_priv-&gt;query_id &lt; 0) ? id_priv-&gt;query_id : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_work_handler(void *data)</div><div class='add'>+{</div><div class='add'>+	struct cma_work *work = data;</div><div class='add'>+	struct rdma_id_private *id_priv = work-&gt;id;</div><div class='add'>+	int destroy = 0;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;id_priv-&gt;dev_remove);</div><div class='add'>+	if (!cma_comp_exch(id_priv, work-&gt;old_state, work-&gt;new_state))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (id_priv-&gt;id.event_handler(&amp;id_priv-&gt;id, &amp;work-&gt;event)) {</div><div class='add'>+		cma_exch(id_priv, CMA_DESTROYING);</div><div class='add'>+		destroy = 1;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	cma_release_remove(id_priv);</div><div class='add'>+	cma_deref_id(id_priv);</div><div class='add'>+	if (destroy)</div><div class='add'>+		rdma_destroy_id(&amp;id_priv-&gt;id);</div><div class='add'>+	kfree(work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_resolve_ib_route(struct rdma_id_private *id_priv, int timeout_ms)</div><div class='add'>+{</div><div class='add'>+	struct rdma_route *route = &amp;id_priv-&gt;id.route;</div><div class='add'>+	struct cma_work *work;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	work = kzalloc(sizeof *work, GFP_KERNEL);</div><div class='add'>+	if (!work)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	work-&gt;id = id_priv;</div><div class='add'>+	INIT_WORK(&amp;work-&gt;work, cma_work_handler, work);</div><div class='add'>+	work-&gt;old_state = CMA_ROUTE_QUERY;</div><div class='add'>+	work-&gt;new_state = CMA_ROUTE_RESOLVED;</div><div class='add'>+	work-&gt;event.event = RDMA_CM_EVENT_ROUTE_RESOLVED;</div><div class='add'>+</div><div class='add'>+	route-&gt;path_rec = kmalloc(sizeof *route-&gt;path_rec, GFP_KERNEL);</div><div class='add'>+	if (!route-&gt;path_rec) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cma_query_ib_route(id_priv, timeout_ms, work);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err2:</div><div class='add'>+	kfree(route-&gt;path_rec);</div><div class='add'>+	route-&gt;path_rec = NULL;</div><div class='add'>+err1:</div><div class='add'>+	kfree(work);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_set_ib_paths(struct rdma_cm_id *id,</div><div class='add'>+		      struct ib_sa_path_rec *path_rec, int num_paths)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_RESOLVED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	id-&gt;route.path_rec = kmalloc(sizeof *path_rec * num_paths, GFP_KERNEL);</div><div class='add'>+	if (!id-&gt;route.path_rec) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(id-&gt;route.path_rec, path_rec, sizeof *path_rec * num_paths);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_ADDR_RESOLVED);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_set_ib_paths);</div><div class='add'>+</div><div class='add'>+int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_QUERY))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;id_priv-&gt;refcount);</div><div class='add'>+	switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		ret = cma_resolve_ib_route(id_priv, timeout_ms);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	cma_comp_exch(id_priv, CMA_ROUTE_QUERY, CMA_ADDR_RESOLVED);</div><div class='add'>+	cma_deref_id(id_priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_resolve_route);</div><div class='add'>+</div><div class='add'>+static int cma_bind_loopback(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct cma_device *cma_dev;</div><div class='add'>+	struct ib_port_attr port_attr;</div><div class='add'>+	union ib_gid gid;</div><div class='add'>+	u16 pkey;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 p;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_for_each_entry(cma_dev, &amp;dev_list, list)</div><div class='add'>+		for (p = 1; p &lt;= cma_dev-&gt;device-&gt;phys_port_cnt; ++p)</div><div class='add'>+			if (!ib_query_port (cma_dev-&gt;device, p, &amp;port_attr) &amp;&amp;</div><div class='add'>+			    port_attr.state == IB_PORT_ACTIVE)</div><div class='add'>+				goto port_found;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;dev_list)) {</div><div class='add'>+		p = 1;</div><div class='add'>+		cma_dev = list_entry(dev_list.next, struct cma_device, list);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+port_found:</div><div class='add'>+	ret = ib_get_cached_gid(cma_dev-&gt;device, p, 0, &amp;gid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = ib_get_cached_pkey(cma_dev-&gt;device, p, 0, &amp;pkey);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ib_addr_set_sgid(&amp;id_priv-&gt;id.route.addr.dev_addr, &amp;gid);</div><div class='add'>+	ib_addr_set_pkey(&amp;id_priv-&gt;id.route.addr.dev_addr, pkey);</div><div class='add'>+	id_priv-&gt;id.port_num = p;</div><div class='add'>+	cma_attach_to_dev(id_priv, cma_dev);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void addr_handler(int status, struct sockaddr *src_addr,</div><div class='add'>+			 struct rdma_dev_addr *dev_addr, void *context)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv = context;</div><div class='add'>+	enum rdma_cm_event_type event;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;id_priv-&gt;dev_remove);</div><div class='add'>+	if (!id_priv-&gt;cma_dev &amp;&amp; !status)</div><div class='add'>+		status = cma_acquire_dev(id_priv);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		if (!cma_comp_exch(id_priv, CMA_ADDR_QUERY, CMA_ADDR_BOUND))</div><div class='add'>+			goto out;</div><div class='add'>+		event = RDMA_CM_EVENT_ADDR_ERROR;</div><div class='add'>+	} else {</div><div class='add'>+		if (!cma_comp_exch(id_priv, CMA_ADDR_QUERY, CMA_ADDR_RESOLVED))</div><div class='add'>+			goto out;</div><div class='add'>+		memcpy(&amp;id_priv-&gt;id.route.addr.src_addr, src_addr,</div><div class='add'>+		       ip_addr_size(src_addr));</div><div class='add'>+		event = RDMA_CM_EVENT_ADDR_RESOLVED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cma_notify_user(id_priv, event, status, NULL, 0)) {</div><div class='add'>+		cma_exch(id_priv, CMA_DESTROYING);</div><div class='add'>+		cma_release_remove(id_priv);</div><div class='add'>+		cma_deref_id(id_priv);</div><div class='add'>+		rdma_destroy_id(&amp;id_priv-&gt;id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	cma_release_remove(id_priv);</div><div class='add'>+	cma_deref_id(id_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_resolve_loopback(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct cma_work *work;</div><div class='add'>+	struct sockaddr_in *src_in, *dst_in;</div><div class='add'>+	union ib_gid gid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	work = kzalloc(sizeof *work, GFP_KERNEL);</div><div class='add'>+	if (!work)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!id_priv-&gt;cma_dev) {</div><div class='add'>+		ret = cma_bind_loopback(id_priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ib_addr_get_sgid(&amp;id_priv-&gt;id.route.addr.dev_addr, &amp;gid);</div><div class='add'>+	ib_addr_set_dgid(&amp;id_priv-&gt;id.route.addr.dev_addr, &amp;gid);</div><div class='add'>+</div><div class='add'>+	if (cma_zero_addr(&amp;id_priv-&gt;id.route.addr.src_addr)) {</div><div class='add'>+		src_in = (struct sockaddr_in *)&amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='add'>+		dst_in = (struct sockaddr_in *)&amp;id_priv-&gt;id.route.addr.dst_addr;</div><div class='add'>+		src_in-&gt;sin_family = dst_in-&gt;sin_family;</div><div class='add'>+		src_in-&gt;sin_addr.s_addr = dst_in-&gt;sin_addr.s_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	work-&gt;id = id_priv;</div><div class='add'>+	INIT_WORK(&amp;work-&gt;work, cma_work_handler, work);</div><div class='add'>+	work-&gt;old_state = CMA_ADDR_QUERY;</div><div class='add'>+	work-&gt;new_state = CMA_ADDR_RESOLVED;</div><div class='add'>+	work-&gt;event.event = RDMA_CM_EVENT_ADDR_RESOLVED;</div><div class='add'>+	queue_work(cma_wq, &amp;work-&gt;work);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	kfree(work);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,</div><div class='add'>+			 struct sockaddr *dst_addr)</div><div class='add'>+{</div><div class='add'>+	if (src_addr &amp;&amp; src_addr-&gt;sa_family)</div><div class='add'>+		return rdma_bind_addr(id, src_addr);</div><div class='add'>+	else</div><div class='add'>+		return cma_bind_any(id, dst_addr-&gt;sa_family);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,</div><div class='add'>+		      struct sockaddr *dst_addr, int timeout_ms)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (id_priv-&gt;state == CMA_IDLE) {</div><div class='add'>+		ret = cma_bind_addr(id, src_addr, dst_addr);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_ADDR_QUERY))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;id_priv-&gt;refcount);</div><div class='add'>+	memcpy(&amp;id-&gt;route.addr.dst_addr, dst_addr, ip_addr_size(dst_addr));</div><div class='add'>+	if (cma_any_addr(dst_addr))</div><div class='add'>+		ret = cma_resolve_loopback(id_priv);</div><div class='add'>+	else</div><div class='add'>+		ret = rdma_resolve_ip(&amp;id-&gt;route.addr.src_addr, dst_addr,</div><div class='add'>+				      &amp;id-&gt;route.addr.dev_addr,</div><div class='add'>+				      timeout_ms, addr_handler, id_priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	cma_comp_exch(id_priv, CMA_ADDR_QUERY, CMA_ADDR_BOUND);</div><div class='add'>+	cma_deref_id(id_priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_resolve_addr);</div><div class='add'>+</div><div class='add'>+static void cma_bind_port(struct rdma_bind_list *bind_list,</div><div class='add'>+			  struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in *sin;</div><div class='add'>+</div><div class='add'>+	sin = (struct sockaddr_in *) &amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='add'>+	sin-&gt;sin_port = htons(bind_list-&gt;port);</div><div class='add'>+	id_priv-&gt;bind_list = bind_list;</div><div class='add'>+	hlist_add_head(&amp;id_priv-&gt;node, &amp;bind_list-&gt;owners);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_alloc_port(struct idr *ps, struct rdma_id_private *id_priv,</div><div class='add'>+			  unsigned short snum)</div><div class='add'>+{</div><div class='add'>+	struct rdma_bind_list *bind_list;</div><div class='add'>+	int port, start, ret;</div><div class='add'>+</div><div class='add'>+	bind_list = kzalloc(sizeof *bind_list, GFP_KERNEL);</div><div class='add'>+	if (!bind_list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	start = snum ? snum : sysctl_local_port_range[0];</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = idr_get_new_above(ps, bind_list, start, &amp;port);</div><div class='add'>+	} while ((ret == -EAGAIN) &amp;&amp; idr_pre_get(ps, GFP_KERNEL));</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if ((snum &amp;&amp; port != snum) ||</div><div class='add'>+	    (!snum &amp;&amp; port &gt; sysctl_local_port_range[1])) {</div><div class='add'>+		idr_remove(ps, port);</div><div class='add'>+		ret = -EADDRNOTAVAIL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bind_list-&gt;ps = ps;</div><div class='add'>+	bind_list-&gt;port = (unsigned short) port;</div><div class='add'>+	cma_bind_port(bind_list, id_priv);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	kfree(bind_list);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_use_port(struct idr *ps, struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *cur_id;</div><div class='add'>+	struct sockaddr_in *sin, *cur_sin;</div><div class='add'>+	struct rdma_bind_list *bind_list;</div><div class='add'>+	struct hlist_node *node;</div><div class='add'>+	unsigned short snum;</div><div class='add'>+</div><div class='add'>+	sin = (struct sockaddr_in *) &amp;id_priv-&gt;id.route.addr.src_addr;</div><div class='add'>+	snum = ntohs(sin-&gt;sin_port);</div><div class='add'>+	if (snum &lt; PROT_SOCK &amp;&amp; !capable(CAP_NET_BIND_SERVICE))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	bind_list = idr_find(ps, snum);</div><div class='add'>+	if (!bind_list)</div><div class='add'>+		return cma_alloc_port(ps, id_priv, snum);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We don't support binding to any address if anyone is bound to</div><div class='add'>+	 * a specific address on the same port.</div><div class='add'>+	 */</div><div class='add'>+	if (cma_any_addr(&amp;id_priv-&gt;id.route.addr.src_addr))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry(cur_id, node, &amp;bind_list-&gt;owners, node) {</div><div class='add'>+		if (cma_any_addr(&amp;cur_id-&gt;id.route.addr.src_addr))</div><div class='add'>+			return -EADDRNOTAVAIL;</div><div class='add'>+		</div><div class='add'>+		cur_sin = (struct sockaddr_in *) &amp;cur_id-&gt;id.route.addr.src_addr;</div><div class='add'>+		if (sin-&gt;sin_addr.s_addr == cur_sin-&gt;sin_addr.s_addr)</div><div class='add'>+			return -EADDRINUSE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cma_bind_port(bind_list, id_priv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_get_port(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	struct idr *ps;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (id_priv-&gt;id.ps) {</div><div class='add'>+	case RDMA_PS_SDP:</div><div class='add'>+		ps = &amp;sdp_ps;</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_PS_TCP:</div><div class='add'>+		ps = &amp;tcp_ps;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	if (cma_any_port(&amp;id_priv-&gt;id.route.addr.src_addr))</div><div class='add'>+		ret = cma_alloc_port(ps, id_priv, 0);</div><div class='add'>+	else</div><div class='add'>+		ret = cma_use_port(ps, id_priv);</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (addr-&gt;sa_family != AF_INET)</div><div class='add'>+		return -EAFNOSUPPORT;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp_exch(id_priv, CMA_IDLE, CMA_ADDR_BOUND))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cma_any_addr(addr)) {</div><div class='add'>+		ret = rdma_translate_ip(addr, &amp;id-&gt;route.addr.dev_addr);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = cma_acquire_dev(id_priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;id-&gt;route.addr.src_addr, addr, ip_addr_size(addr));</div><div class='add'>+	ret = cma_get_port(id_priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_IDLE);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_bind_addr);</div><div class='add'>+</div><div class='add'>+static int cma_format_hdr(void *hdr, enum rdma_port_space ps,</div><div class='add'>+			  struct rdma_route *route)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr_in *src4, *dst4;</div><div class='add'>+	struct cma_hdr *cma_hdr;</div><div class='add'>+	struct sdp_hh *sdp_hdr;</div><div class='add'>+</div><div class='add'>+	src4 = (struct sockaddr_in *) &amp;route-&gt;addr.src_addr;</div><div class='add'>+	dst4 = (struct sockaddr_in *) &amp;route-&gt;addr.dst_addr;</div><div class='add'>+</div><div class='add'>+	switch (ps) {</div><div class='add'>+	case RDMA_PS_SDP:</div><div class='add'>+		sdp_hdr = hdr;</div><div class='add'>+		if (sdp_get_majv(sdp_hdr-&gt;sdp_version) != SDP_MAJ_VERSION)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		sdp_set_ip_ver(sdp_hdr, 4);</div><div class='add'>+		sdp_hdr-&gt;src_addr.ip4.addr = src4-&gt;sin_addr.s_addr;</div><div class='add'>+		sdp_hdr-&gt;dst_addr.ip4.addr = dst4-&gt;sin_addr.s_addr;</div><div class='add'>+		sdp_hdr-&gt;port = src4-&gt;sin_port;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		cma_hdr = hdr;</div><div class='add'>+		cma_hdr-&gt;cma_version = CMA_VERSION;</div><div class='add'>+		cma_set_ip_ver(cma_hdr, 4);</div><div class='add'>+		cma_hdr-&gt;src_addr.ip4.addr = src4-&gt;sin_addr.s_addr;</div><div class='add'>+		cma_hdr-&gt;dst_addr.ip4.addr = dst4-&gt;sin_addr.s_addr;</div><div class='add'>+		cma_hdr-&gt;port = src4-&gt;sin_port;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_connect_ib(struct rdma_id_private *id_priv,</div><div class='add'>+			  struct rdma_conn_param *conn_param)</div><div class='add'>+{</div><div class='add'>+	struct ib_cm_req_param req;</div><div class='add'>+	struct rdma_route *route;</div><div class='add'>+	void *private_data;</div><div class='add'>+	int offset, ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;req, 0, sizeof req);</div><div class='add'>+	offset = cma_user_data_offset(id_priv-&gt;id.ps);</div><div class='add'>+	req.private_data_len = offset + conn_param-&gt;private_data_len;</div><div class='add'>+	private_data = kzalloc(req.private_data_len, GFP_ATOMIC);</div><div class='add'>+	if (!private_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (conn_param-&gt;private_data &amp;&amp; conn_param-&gt;private_data_len)</div><div class='add'>+		memcpy(private_data + offset, conn_param-&gt;private_data,</div><div class='add'>+		       conn_param-&gt;private_data_len);</div><div class='add'>+</div><div class='add'>+	id_priv-&gt;cm_id.ib = ib_create_cm_id(id_priv-&gt;id.device, cma_ib_handler,</div><div class='add'>+					    id_priv);</div><div class='add'>+	if (IS_ERR(id_priv-&gt;cm_id.ib)) {</div><div class='add'>+		ret = PTR_ERR(id_priv-&gt;cm_id.ib);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	route = &amp;id_priv-&gt;id.route;</div><div class='add'>+	ret = cma_format_hdr(private_data, id_priv-&gt;id.ps, route);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	req.private_data = private_data;</div><div class='add'>+</div><div class='add'>+	req.primary_path = &amp;route-&gt;path_rec[0];</div><div class='add'>+	if (route-&gt;num_paths == 2)</div><div class='add'>+		req.alternate_path = &amp;route-&gt;path_rec[1];</div><div class='add'>+</div><div class='add'>+	req.service_id = cma_get_service_id(id_priv-&gt;id.ps,</div><div class='add'>+					    &amp;route-&gt;addr.dst_addr);</div><div class='add'>+	req.qp_num = id_priv-&gt;qp_num;</div><div class='add'>+	req.qp_type = id_priv-&gt;qp_type;</div><div class='add'>+	req.starting_psn = id_priv-&gt;seq_num;</div><div class='add'>+	req.responder_resources = conn_param-&gt;responder_resources;</div><div class='add'>+	req.initiator_depth = conn_param-&gt;initiator_depth;</div><div class='add'>+	req.flow_control = conn_param-&gt;flow_control;</div><div class='add'>+	req.retry_count = conn_param-&gt;retry_count;</div><div class='add'>+	req.rnr_retry_count = conn_param-&gt;rnr_retry_count;</div><div class='add'>+	req.remote_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;</div><div class='add'>+	req.local_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;</div><div class='add'>+	req.max_cm_retries = CMA_MAX_CM_RETRIES;</div><div class='add'>+	req.srq = id_priv-&gt;srq ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	ret = ib_send_cm_req(id_priv-&gt;cm_id.ib, &amp;req);</div><div class='add'>+out:</div><div class='add'>+	kfree(private_data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_CONNECT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!id-&gt;qp) {</div><div class='add'>+		id_priv-&gt;qp_num = conn_param-&gt;qp_num;</div><div class='add'>+		id_priv-&gt;qp_type = conn_param-&gt;qp_type;</div><div class='add'>+		id_priv-&gt;srq = conn_param-&gt;srq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		ret = cma_connect_ib(id_priv, conn_param);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	cma_comp_exch(id_priv, CMA_CONNECT, CMA_ROUTE_RESOLVED);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_connect);</div><div class='add'>+</div><div class='add'>+static int cma_accept_ib(struct rdma_id_private *id_priv,</div><div class='add'>+			 struct rdma_conn_param *conn_param)</div><div class='add'>+{</div><div class='add'>+	struct ib_cm_rep_param rep;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cma_modify_qp_rtr(&amp;id_priv-&gt;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;rep, 0, sizeof rep);</div><div class='add'>+	rep.qp_num = id_priv-&gt;qp_num;</div><div class='add'>+	rep.starting_psn = id_priv-&gt;seq_num;</div><div class='add'>+	rep.private_data = conn_param-&gt;private_data;</div><div class='add'>+	rep.private_data_len = conn_param-&gt;private_data_len;</div><div class='add'>+	rep.responder_resources = conn_param-&gt;responder_resources;</div><div class='add'>+	rep.initiator_depth = conn_param-&gt;initiator_depth;</div><div class='add'>+	rep.target_ack_delay = CMA_CM_RESPONSE_TIMEOUT;</div><div class='add'>+	rep.failover_accepted = 0;</div><div class='add'>+	rep.flow_control = conn_param-&gt;flow_control;</div><div class='add'>+	rep.rnr_retry_count = conn_param-&gt;rnr_retry_count;</div><div class='add'>+	rep.srq = id_priv-&gt;srq ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	return ib_send_cm_rep(id_priv-&gt;cm_id.ib, &amp;rep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp(id_priv, CMA_CONNECT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!id-&gt;qp &amp;&amp; conn_param) {</div><div class='add'>+		id_priv-&gt;qp_num = conn_param-&gt;qp_num;</div><div class='add'>+		id_priv-&gt;qp_type = conn_param-&gt;qp_type;</div><div class='add'>+		id_priv-&gt;srq = conn_param-&gt;srq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		if (conn_param)</div><div class='add'>+			ret = cma_accept_ib(id_priv, conn_param);</div><div class='add'>+		else</div><div class='add'>+			ret = cma_rep_recv(id_priv);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+reject:</div><div class='add'>+	cma_modify_qp_err(id);</div><div class='add'>+	rdma_reject(id, NULL, 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_accept);</div><div class='add'>+</div><div class='add'>+int rdma_reject(struct rdma_cm_id *id, const void *private_data,</div><div class='add'>+		u8 private_data_len)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp(id_priv, CMA_CONNECT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		ret = ib_send_cm_rej(id_priv-&gt;cm_id.ib,</div><div class='add'>+				     IB_CM_REJ_CONSUMER_DEFINED, NULL, 0,</div><div class='add'>+				     private_data, private_data_len);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOSYS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_reject);</div><div class='add'>+</div><div class='add'>+int rdma_disconnect(struct rdma_cm_id *id)</div><div class='add'>+{</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	id_priv = container_of(id, struct rdma_id_private, id);</div><div class='add'>+	if (!cma_comp(id_priv, CMA_CONNECT) &amp;&amp;</div><div class='add'>+	    !cma_comp(id_priv, CMA_DISCONNECT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = cma_modify_qp_err(id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;device-&gt;node_type) {</div><div class='add'>+	case IB_NODE_CA:</div><div class='add'>+		/* Initiate or respond to a disconnect. */</div><div class='add'>+		if (ib_send_cm_dreq(id_priv-&gt;cm_id.ib, NULL, 0))</div><div class='add'>+			ib_send_cm_drep(id_priv-&gt;cm_id.ib, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rdma_disconnect);</div><div class='add'>+</div><div class='add'>+static void cma_add_one(struct ib_device *device)</div><div class='add'>+{</div><div class='add'>+	struct cma_device *cma_dev;</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+</div><div class='add'>+	cma_dev = kmalloc(sizeof *cma_dev, GFP_KERNEL);</div><div class='add'>+	if (!cma_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cma_dev-&gt;device = device;</div><div class='add'>+	cma_dev-&gt;node_guid = device-&gt;node_guid;</div><div class='add'>+	if (!cma_dev-&gt;node_guid)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;cma_dev-&gt;comp);</div><div class='add'>+	atomic_set(&amp;cma_dev-&gt;refcount, 1);</div><div class='add'>+	INIT_LIST_HEAD(&amp;cma_dev-&gt;id_list);</div><div class='add'>+	ib_set_client_data(device, &amp;cma_client, cma_dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_add_tail(&amp;cma_dev-&gt;list, &amp;dev_list);</div><div class='add'>+	list_for_each_entry(id_priv, &amp;listen_any_list, list)</div><div class='add'>+		cma_listen_on_dev(id_priv, cma_dev);</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+	return;</div><div class='add'>+err:</div><div class='add'>+	kfree(cma_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_remove_id_dev(struct rdma_id_private *id_priv)</div><div class='add'>+{</div><div class='add'>+	enum cma_state state;</div><div class='add'>+</div><div class='add'>+	/* Record that we want to remove the device */</div><div class='add'>+	state = cma_exch(id_priv, CMA_DEVICE_REMOVAL);</div><div class='add'>+	if (state == CMA_DESTROYING)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cma_cancel_operation(id_priv, state);</div><div class='add'>+	wait_event(id_priv-&gt;wait_remove, !atomic_read(&amp;id_priv-&gt;dev_remove));</div><div class='add'>+</div><div class='add'>+	/* Check for destruction from another callback. */</div><div class='add'>+	if (!cma_comp(id_priv, CMA_DEVICE_REMOVAL))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return cma_notify_user(id_priv, RDMA_CM_EVENT_DEVICE_REMOVAL,</div><div class='add'>+			       0, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_process_remove(struct cma_device *cma_dev)</div><div class='add'>+{</div><div class='add'>+	struct list_head remove_list;</div><div class='add'>+	struct rdma_id_private *id_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;remove_list);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	while (!list_empty(&amp;cma_dev-&gt;id_list)) {</div><div class='add'>+		id_priv = list_entry(cma_dev-&gt;id_list.next,</div><div class='add'>+				     struct rdma_id_private, list);</div><div class='add'>+</div><div class='add'>+		if (cma_internal_listen(id_priv)) {</div><div class='add'>+			cma_destroy_listen(id_priv);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del(&amp;id_priv-&gt;list);</div><div class='add'>+		list_add_tail(&amp;id_priv-&gt;list, &amp;remove_list);</div><div class='add'>+		atomic_inc(&amp;id_priv-&gt;refcount);</div><div class='add'>+		mutex_unlock(&amp;lock);</div><div class='add'>+</div><div class='add'>+		ret = cma_remove_id_dev(id_priv);</div><div class='add'>+		cma_deref_id(id_priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			rdma_destroy_id(&amp;id_priv-&gt;id);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;lock);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+</div><div class='add'>+	cma_deref_dev(cma_dev);</div><div class='add'>+	wait_for_completion(&amp;cma_dev-&gt;comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_remove_one(struct ib_device *device)</div><div class='add'>+{</div><div class='add'>+	struct cma_device *cma_dev;</div><div class='add'>+</div><div class='add'>+	cma_dev = ib_get_client_data(device, &amp;cma_client);</div><div class='add'>+	if (!cma_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;lock);</div><div class='add'>+	list_del(&amp;cma_dev-&gt;list);</div><div class='add'>+	mutex_unlock(&amp;lock);</div><div class='add'>+</div><div class='add'>+	cma_process_remove(cma_dev);</div><div class='add'>+	kfree(cma_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cma_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cma_wq = create_singlethread_workqueue("rdma_cm_wq");</div><div class='add'>+	if (!cma_wq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = ib_register_client(&amp;cma_client);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	destroy_workqueue(cma_wq);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cma_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	ib_unregister_client(&amp;cma_client);</div><div class='add'>+	destroy_workqueue(cma_wq);</div><div class='add'>+	idr_destroy(&amp;sdp_ps);</div><div class='add'>+	idr_destroy(&amp;tcp_ps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cma_init);</div><div class='add'>+module_exit(cma_cleanup);</div><div class='head'>diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c<br/>index 838bf54458d2..86a3b2d401db 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/fmr_pool.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/fmr_pool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/fmr_pool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/fmr_pool.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ enum {</div><div class='ctx'> /*</div><div class='ctx'>  * If an FMR is not in use, then the list member will point to either</div><div class='ctx'>  * its pool's free_list (if the FMR can be mapped again; that is,</div><div class='del'>- * remap_count &lt; IB_FMR_MAX_REMAPS) or its pool's dirty_list (if the</div><div class='add'>+ * remap_count &lt; pool-&gt;max_remaps) or its pool's dirty_list (if the</div><div class='ctx'>  * FMR needs to be unmapped before being remapped).  In either of</div><div class='ctx'>  * these cases it is a bug if the ref_count is not 0.  In other words,</div><div class='ctx'>  * if ref_count is &gt; 0, then the list member must not be linked into</div><div class='hunk'>@@ -84,6 +84,7 @@ struct ib_fmr_pool {</div><div class='ctx'> </div><div class='ctx'> 	int                       pool_size;</div><div class='ctx'> 	int                       max_pages;</div><div class='add'>+	int			  max_remaps;</div><div class='ctx'> 	int                       dirty_watermark;</div><div class='ctx'> 	int                       dirty_len;</div><div class='ctx'> 	struct list_head          free_list;</div><div class='hunk'>@@ -214,8 +215,10 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_device   *device;</div><div class='ctx'> 	struct ib_fmr_pool *pool;</div><div class='add'>+	struct ib_device_attr *attr;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int max_remaps;</div><div class='ctx'> </div><div class='ctx'> 	if (!params)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='hunk'>@@ -228,6 +231,26 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,</div><div class='ctx'> 		return ERR_PTR(-ENOSYS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	attr = kmalloc(sizeof *attr, GFP_KERNEL);</div><div class='add'>+	if (!attr) {</div><div class='add'>+		printk(KERN_WARNING "couldn't allocate device attr struct");</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ib_query_device(device, attr);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_WARNING "couldn't query device");</div><div class='add'>+		kfree(attr);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!attr-&gt;max_map_per_fmr)</div><div class='add'>+		max_remaps = IB_FMR_MAX_REMAPS;</div><div class='add'>+	else</div><div class='add'>+		max_remaps = attr-&gt;max_map_per_fmr;</div><div class='add'>+</div><div class='add'>+	kfree(attr);</div><div class='add'>+</div><div class='ctx'> 	pool = kmalloc(sizeof *pool, GFP_KERNEL);</div><div class='ctx'> 	if (!pool) {</div><div class='ctx'> 		printk(KERN_WARNING "couldn't allocate pool struct");</div><div class='hunk'>@@ -258,6 +281,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,</div><div class='ctx'> </div><div class='ctx'> 	pool-&gt;pool_size       = 0;</div><div class='ctx'> 	pool-&gt;max_pages       = params-&gt;max_pages_per_fmr;</div><div class='add'>+	pool-&gt;max_remaps      = max_remaps;</div><div class='ctx'> 	pool-&gt;dirty_watermark = params-&gt;dirty_watermark;</div><div class='ctx'> 	pool-&gt;dirty_len       = 0;</div><div class='ctx'> 	spin_lock_init(&amp;pool-&gt;pool_lock);</div><div class='hunk'>@@ -279,7 +303,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,</div><div class='ctx'> 		struct ib_pool_fmr *fmr;</div><div class='ctx'> 		struct ib_fmr_attr attr = {</div><div class='ctx'> 			.max_pages  = params-&gt;max_pages_per_fmr,</div><div class='del'>-			.max_maps   = IB_FMR_MAX_REMAPS,</div><div class='add'>+			.max_maps   = pool-&gt;max_remaps,</div><div class='ctx'> 			.page_shift = params-&gt;page_shift</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='hunk'>@@ -402,7 +426,7 @@ EXPORT_SYMBOL(ib_flush_fmr_pool);</div><div class='ctx'> struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,</div><div class='ctx'> 					 u64                *page_list,</div><div class='ctx'> 					 int                 list_len,</div><div class='del'>-					 u64                *io_virtual_address)</div><div class='add'>+					 u64                 io_virtual_address)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_fmr_pool *pool = pool_handle;</div><div class='ctx'> 	struct ib_pool_fmr *fmr;</div><div class='hunk'>@@ -416,7 +440,7 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,</div><div class='ctx'> 	fmr = ib_fmr_cache_lookup(pool,</div><div class='ctx'> 				  page_list,</div><div class='ctx'> 				  list_len,</div><div class='del'>-				  *io_virtual_address);</div><div class='add'>+				  io_virtual_address);</div><div class='ctx'> 	if (fmr) {</div><div class='ctx'> 		/* found in cache */</div><div class='ctx'> 		++fmr-&gt;ref_count;</div><div class='hunk'>@@ -440,7 +464,7 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pool-&gt;pool_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	result = ib_map_phys_fmr(fmr-&gt;fmr, page_list, list_len,</div><div class='del'>-				 *io_virtual_address);</div><div class='add'>+				 io_virtual_address);</div><div class='ctx'> </div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;pool-&gt;pool_lock, flags);</div><div class='hunk'>@@ -457,7 +481,7 @@ struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,</div><div class='ctx'> 	fmr-&gt;ref_count = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (pool-&gt;cache_bucket) {</div><div class='del'>-		fmr-&gt;io_virtual_address = *io_virtual_address;</div><div class='add'>+		fmr-&gt;io_virtual_address = io_virtual_address;</div><div class='ctx'> 		fmr-&gt;page_list_len      = list_len;</div><div class='ctx'> 		memcpy(fmr-&gt;page_list, page_list, list_len * sizeof(*page_list));</div><div class='ctx'> </div><div class='hunk'>@@ -489,7 +513,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)</div><div class='ctx'> </div><div class='ctx'> 	--fmr-&gt;ref_count;</div><div class='ctx'> 	if (!fmr-&gt;ref_count) {</div><div class='del'>-		if (fmr-&gt;remap_count &lt; IB_FMR_MAX_REMAPS) {</div><div class='add'>+		if (fmr-&gt;remap_count &lt; pool-&gt;max_remaps) {</div><div class='ctx'> 			list_add_tail(&amp;fmr-&gt;list, &amp;pool-&gt;free_list);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			list_add_tail(&amp;fmr-&gt;list, &amp;pool-&gt;dirty_list);</div><div class='head'>diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c<br/>index 5ad41a64314c..5ed4dab52a6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/mad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/mad.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'>  * $Id: mad.c 5596 2006-03-03 01:00:07Z sean.hefty $</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;rdma/ib_cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mad_priv.h"</div><div class='ctx'> #include "mad_rmpp.h"</div><div class='hunk'>@@ -45,8 +46,7 @@ MODULE_DESCRIPTION("kernel IB MAD API");</div><div class='ctx'> MODULE_AUTHOR("Hal Rosenstock");</div><div class='ctx'> MODULE_AUTHOR("Sean Hefty");</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-kmem_cache_t *ib_mad_cache;</div><div class='add'>+static kmem_cache_t *ib_mad_cache;</div><div class='ctx'> </div><div class='ctx'> static struct list_head ib_mad_port_list;</div><div class='ctx'> static u32 ib_mad_client_id = 0;</div><div class='hunk'>@@ -1673,20 +1673,21 @@ static inline int rcv_has_same_class(struct ib_mad_send_wr_private *wr,</div><div class='ctx'> 		rwc-&gt;recv_buf.mad-&gt;mad_hdr.mgmt_class;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int rcv_has_same_gid(struct ib_mad_send_wr_private *wr,</div><div class='add'>+static inline int rcv_has_same_gid(struct ib_mad_agent_private *mad_agent_priv,</div><div class='add'>+				   struct ib_mad_send_wr_private *wr,</div><div class='ctx'> 				   struct ib_mad_recv_wc *rwc )</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_ah_attr attr;</div><div class='ctx'> 	u8 send_resp, rcv_resp;</div><div class='add'>+	union ib_gid sgid;</div><div class='add'>+	struct ib_device *device = mad_agent_priv-&gt;agent.device;</div><div class='add'>+	u8 port_num = mad_agent_priv-&gt;agent.port_num;</div><div class='add'>+	u8 lmc;</div><div class='ctx'> </div><div class='ctx'> 	send_resp = ((struct ib_mad *)(wr-&gt;send_buf.mad))-&gt;</div><div class='ctx'> 		     mad_hdr.method &amp; IB_MGMT_METHOD_RESP;</div><div class='ctx'> 	rcv_resp = rwc-&gt;recv_buf.mad-&gt;mad_hdr.method &amp; IB_MGMT_METHOD_RESP;</div><div class='ctx'> </div><div class='del'>-	if (!send_resp &amp;&amp; rcv_resp)</div><div class='del'>-		/* is request/response. GID/LIDs are both local (same). */</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	if (send_resp == rcv_resp)</div><div class='ctx'> 		/* both requests, or both responses. GIDs different */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1695,48 +1696,78 @@ static inline int rcv_has_same_gid(struct ib_mad_send_wr_private *wr,</div><div class='ctx'> 		/* Assume not equal, to avoid false positives. */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!(attr.ah_flags &amp; IB_AH_GRH) &amp;&amp; !(rwc-&gt;wc-&gt;wc_flags &amp; IB_WC_GRH))</div><div class='del'>-		return attr.dlid == rwc-&gt;wc-&gt;slid;</div><div class='del'>-	else if ((attr.ah_flags &amp; IB_AH_GRH) &amp;&amp;</div><div class='del'>-		 (rwc-&gt;wc-&gt;wc_flags &amp; IB_WC_GRH))</div><div class='del'>-		return memcmp(attr.grh.dgid.raw,</div><div class='del'>-			      rwc-&gt;recv_buf.grh-&gt;sgid.raw, 16) == 0;</div><div class='del'>-	else</div><div class='add'>+	if (!!(attr.ah_flags &amp; IB_AH_GRH) !=</div><div class='add'>+	    !!(rwc-&gt;wc-&gt;wc_flags &amp; IB_WC_GRH))</div><div class='ctx'> 		/* one has GID, other does not.  Assume different */</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	if (!send_resp &amp;&amp; rcv_resp) {</div><div class='add'>+		/* is request/response. */</div><div class='add'>+		if (!(attr.ah_flags &amp; IB_AH_GRH)) {</div><div class='add'>+			if (ib_get_cached_lmc(device, port_num, &amp;lmc))</div><div class='add'>+				return 0;</div><div class='add'>+			return (!lmc || !((attr.src_path_bits ^</div><div class='add'>+					   rwc-&gt;wc-&gt;dlid_path_bits) &amp;</div><div class='add'>+					  ((1 &lt;&lt; lmc) - 1)));</div><div class='add'>+		} else {</div><div class='add'>+			if (ib_get_cached_gid(device, port_num,</div><div class='add'>+					      attr.grh.sgid_index, &amp;sgid))</div><div class='add'>+				return 0;</div><div class='add'>+			return !memcmp(sgid.raw, rwc-&gt;recv_buf.grh-&gt;dgid.raw,</div><div class='add'>+				       16);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(attr.ah_flags &amp; IB_AH_GRH))</div><div class='add'>+		return attr.dlid == rwc-&gt;wc-&gt;slid;</div><div class='add'>+	else</div><div class='add'>+		return !memcmp(attr.grh.dgid.raw, rwc-&gt;recv_buf.grh-&gt;sgid.raw,</div><div class='add'>+			       16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is_direct(u8 class)</div><div class='add'>+{</div><div class='add'>+	return (class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> struct ib_mad_send_wr_private*</div><div class='ctx'> ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv,</div><div class='del'>-		 struct ib_mad_recv_wc *mad_recv_wc)</div><div class='add'>+		 struct ib_mad_recv_wc *wc)</div><div class='ctx'> {</div><div class='del'>-	struct ib_mad_send_wr_private *mad_send_wr;</div><div class='add'>+	struct ib_mad_send_wr_private *wr;</div><div class='ctx'> 	struct ib_mad *mad;</div><div class='ctx'> </div><div class='del'>-	mad = (struct ib_mad *)mad_recv_wc-&gt;recv_buf.mad;</div><div class='add'>+	mad = (struct ib_mad *)wc-&gt;recv_buf.mad;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(mad_send_wr, &amp;mad_agent_priv-&gt;wait_list,</div><div class='del'>-			    agent_list) {</div><div class='del'>-		if ((mad_send_wr-&gt;tid == mad-&gt;mad_hdr.tid) &amp;&amp;</div><div class='del'>-		    rcv_has_same_class(mad_send_wr, mad_recv_wc) &amp;&amp;</div><div class='del'>-		    rcv_has_same_gid(mad_send_wr, mad_recv_wc))</div><div class='del'>-			return mad_send_wr;</div><div class='add'>+	list_for_each_entry(wr, &amp;mad_agent_priv-&gt;wait_list, agent_list) {</div><div class='add'>+		if ((wr-&gt;tid == mad-&gt;mad_hdr.tid) &amp;&amp;</div><div class='add'>+		    rcv_has_same_class(wr, wc) &amp;&amp;</div><div class='add'>+		    /*</div><div class='add'>+		     * Don't check GID for direct routed MADs.</div><div class='add'>+		     * These might have permissive LIDs.</div><div class='add'>+		     */</div><div class='add'>+		    (is_direct(wc-&gt;recv_buf.mad-&gt;mad_hdr.mgmt_class) ||</div><div class='add'>+		     rcv_has_same_gid(mad_agent_priv, wr, wc)))</div><div class='add'>+			return wr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It's possible to receive the response before we've</div><div class='ctx'> 	 * been notified that the send has completed</div><div class='ctx'> 	 */</div><div class='del'>-	list_for_each_entry(mad_send_wr, &amp;mad_agent_priv-&gt;send_list,</div><div class='del'>-			    agent_list) {</div><div class='del'>-		if (is_data_mad(mad_agent_priv, mad_send_wr-&gt;send_buf.mad) &amp;&amp;</div><div class='del'>-		    mad_send_wr-&gt;tid == mad-&gt;mad_hdr.tid &amp;&amp;</div><div class='del'>-		    mad_send_wr-&gt;timeout &amp;&amp;</div><div class='del'>-		    rcv_has_same_class(mad_send_wr, mad_recv_wc) &amp;&amp;</div><div class='del'>-		    rcv_has_same_gid(mad_send_wr, mad_recv_wc)) {</div><div class='add'>+	list_for_each_entry(wr, &amp;mad_agent_priv-&gt;send_list, agent_list) {</div><div class='add'>+		if (is_data_mad(mad_agent_priv, wr-&gt;send_buf.mad) &amp;&amp;</div><div class='add'>+		    wr-&gt;tid == mad-&gt;mad_hdr.tid &amp;&amp;</div><div class='add'>+		    wr-&gt;timeout &amp;&amp;</div><div class='add'>+		    rcv_has_same_class(wr, wc) &amp;&amp;</div><div class='add'>+		    /*</div><div class='add'>+		     * Don't check GID for direct routed MADs.</div><div class='add'>+		     * These might have permissive LIDs.</div><div class='add'>+		     */</div><div class='add'>+		    (is_direct(wc-&gt;recv_buf.mad-&gt;mad_hdr.mgmt_class) ||</div><div class='add'>+		     rcv_has_same_gid(mad_agent_priv, wr, wc)))</div><div class='ctx'> 			/* Verify request has not been canceled */</div><div class='del'>-			return (mad_send_wr-&gt;status == IB_WC_SUCCESS) ?</div><div class='del'>-				mad_send_wr : NULL;</div><div class='del'>-		}</div><div class='add'>+			return (wr-&gt;status == IB_WC_SUCCESS) ? wr : NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1744,11 +1775,9 @@ ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv,</div><div class='ctx'> void ib_mark_mad_done(struct ib_mad_send_wr_private *mad_send_wr)</div><div class='ctx'> {</div><div class='ctx'> 	mad_send_wr-&gt;timeout = 0;</div><div class='del'>-	if (mad_send_wr-&gt;refcount == 1) {</div><div class='del'>-		list_del(&amp;mad_send_wr-&gt;agent_list);</div><div class='del'>-		list_add_tail(&amp;mad_send_wr-&gt;agent_list,</div><div class='add'>+	if (mad_send_wr-&gt;refcount == 1)</div><div class='add'>+		list_move_tail(&amp;mad_send_wr-&gt;agent_list,</div><div class='ctx'> 			      &amp;mad_send_wr-&gt;mad_agent_priv-&gt;done_list);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv,</div><div class='hunk'>@@ -2067,8 +2096,7 @@ retry:</div><div class='ctx'> 		queued_send_wr = container_of(mad_list,</div><div class='ctx'> 					struct ib_mad_send_wr_private,</div><div class='ctx'> 					mad_list);</div><div class='del'>-		list_del(&amp;mad_list-&gt;list);</div><div class='del'>-		list_add_tail(&amp;mad_list-&gt;list, &amp;send_queue-&gt;list);</div><div class='add'>+		list_move_tail(&amp;mad_list-&gt;list, &amp;send_queue-&gt;list);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;send_queue-&gt;lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h<br/>index b4fa28d3160f..d147f3bad2ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad_priv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/mad_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad_priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/mad_priv.h</a></div><div class='hunk'>@@ -212,8 +212,6 @@ struct ib_mad_port_private {</div><div class='ctx'> 	struct ib_mad_qp_info qp_info[IB_MAD_QPS_CORE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern kmem_cache_t *ib_mad_cache;</div><div class='del'>-</div><div class='ctx'> int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr);</div><div class='ctx'> </div><div class='ctx'> struct ib_mad_send_wr_private *</div><div class='head'>diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c<br/>index d4704e054e30..ebcd5b181770 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad_rmpp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/mad_rmpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/mad_rmpp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/mad_rmpp.c</a></div><div class='hunk'>@@ -665,8 +665,7 @@ static void process_rmpp_ack(struct ib_mad_agent_private *agent,</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='ctx'> 		mad_send_wr-&gt;refcount++;</div><div class='del'>-		list_del(&amp;mad_send_wr-&gt;agent_list);</div><div class='del'>-		list_add_tail(&amp;mad_send_wr-&gt;agent_list,</div><div class='add'>+		list_move_tail(&amp;mad_send_wr-&gt;agent_list,</div><div class='ctx'> 			      &amp;mad_send_wr-&gt;mad_agent_priv-&gt;send_list);</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c<br/>index 501cc054cb3b..aeda484ffd82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/sa_query.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/sa_query.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/sa_query.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/sa_query.c</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;rdma/ib_pack.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_sa.h&gt;</div><div class='add'>+#include &lt;rdma/ib_cache.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Roland Dreier");</div><div class='ctx'> MODULE_DESCRIPTION("InfiniBand subnet administration query support");</div><div class='hunk'>@@ -441,6 +442,36 @@ void ib_sa_cancel_query(int id, struct ib_sa_query *query)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ib_sa_cancel_query);</div><div class='ctx'> </div><div class='add'>+int ib_init_ah_from_path(struct ib_device *device, u8 port_num,</div><div class='add'>+			 struct ib_sa_path_rec *rec, struct ib_ah_attr *ah_attr)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 gid_index;</div><div class='add'>+</div><div class='add'>+	memset(ah_attr, 0, sizeof *ah_attr);</div><div class='add'>+	ah_attr-&gt;dlid = be16_to_cpu(rec-&gt;dlid);</div><div class='add'>+	ah_attr-&gt;sl = rec-&gt;sl;</div><div class='add'>+	ah_attr-&gt;src_path_bits = be16_to_cpu(rec-&gt;slid) &amp; 0x7f;</div><div class='add'>+	ah_attr-&gt;port_num = port_num;</div><div class='add'>+</div><div class='add'>+	if (rec-&gt;hop_limit &gt; 1) {</div><div class='add'>+		ah_attr-&gt;ah_flags = IB_AH_GRH;</div><div class='add'>+		ah_attr-&gt;grh.dgid = rec-&gt;dgid;</div><div class='add'>+</div><div class='add'>+		ret = ib_find_cached_gid(device, &amp;rec-&gt;sgid, &amp;port_num,</div><div class='add'>+					 &amp;gid_index);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ah_attr-&gt;grh.sgid_index    = gid_index;</div><div class='add'>+		ah_attr-&gt;grh.flow_label    = be32_to_cpu(rec-&gt;flow_label);</div><div class='add'>+		ah_attr-&gt;grh.hop_limit     = rec-&gt;hop_limit;</div><div class='add'>+		ah_attr-&gt;grh.traffic_class = rec-&gt;traffic_class;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ib_init_ah_from_path);</div><div class='add'>+</div><div class='ctx'> static void init_mad(struct ib_sa_mad *mad, struct ib_mad_agent *agent)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -457,13 +488,13 @@ static void init_mad(struct ib_sa_mad *mad, struct ib_mad_agent *agent)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tid_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int send_mad(struct ib_sa_query *query, int timeout_ms)</div><div class='add'>+static int send_mad(struct ib_sa_query *query, int timeout_ms, gfp_t gfp_mask)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret, id;</div><div class='ctx'> </div><div class='ctx'> retry:</div><div class='del'>-	if (!idr_pre_get(&amp;query_idr, GFP_ATOMIC))</div><div class='add'>+	if (!idr_pre_get(&amp;query_idr, gfp_mask))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	spin_lock_irqsave(&amp;idr_lock, flags);</div><div class='ctx'> 	ret = idr_get_new(&amp;query_idr, query, &amp;id);</div><div class='hunk'>@@ -599,7 +630,7 @@ int ib_sa_path_rec_get(struct ib_device *device, u8 port_num,</div><div class='ctx'> </div><div class='ctx'> 	*sa_query = &amp;query-&gt;sa_query;</div><div class='ctx'> </div><div class='del'>-	ret = send_mad(&amp;query-&gt;sa_query, timeout_ms);</div><div class='add'>+	ret = send_mad(&amp;query-&gt;sa_query, timeout_ms, gfp_mask);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='hunk'>@@ -721,7 +752,7 @@ int ib_sa_service_rec_query(struct ib_device *device, u8 port_num, u8 method,</div><div class='ctx'> </div><div class='ctx'> 	*sa_query = &amp;query-&gt;sa_query;</div><div class='ctx'> </div><div class='del'>-	ret = send_mad(&amp;query-&gt;sa_query, timeout_ms);</div><div class='add'>+	ret = send_mad(&amp;query-&gt;sa_query, timeout_ms, gfp_mask);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +844,7 @@ int ib_sa_mcmember_rec_query(struct ib_device *device, u8 port_num,</div><div class='ctx'> </div><div class='ctx'> 	*sa_query = &amp;query-&gt;sa_query;</div><div class='ctx'> </div><div class='del'>-	ret = send_mad(&amp;query-&gt;sa_query, timeout_ms);</div><div class='add'>+	ret = send_mad(&amp;query-&gt;sa_query, timeout_ms, gfp_mask);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c<br/>index 9164a09b6ccd..c1c6fda9452c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/ucm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/ucm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/ucm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/ucm.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'>  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  *</div><div class='del'>- * $Id: ucm.c 2594 2005-06-13 19:46:02Z libor $</div><div class='add'>+ * $Id: ucm.c 4311 2005-12-05 18:42:01Z sean.hefty $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;rdma/ib_cm.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_user_cm.h&gt;</div><div class='add'>+#include &lt;rdma/ib_marshall.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Libor Michalek");</div><div class='ctx'> MODULE_DESCRIPTION("InfiniBand userspace Connection Manager access");</div><div class='hunk'>@@ -63,7 +64,7 @@ struct ib_ucm_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ib_ucm_file {</div><div class='del'>-	struct semaphore mutex;</div><div class='add'>+	struct mutex file_mutex;</div><div class='ctx'> 	struct file *filp;</div><div class='ctx'> 	struct ib_ucm_device *device;</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +153,7 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_ucm_event *uevent;</div><div class='ctx'> </div><div class='del'>-	down(&amp;ctx-&gt;file-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;ctx-&gt;file-&gt;file_mutex);</div><div class='ctx'> 	list_del(&amp;ctx-&gt;file_list);</div><div class='ctx'> 	while (!list_empty(&amp;ctx-&gt;events)) {</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +168,7 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx)</div><div class='ctx'> </div><div class='ctx'> 		kfree(uevent);</div><div class='ctx'> 	}</div><div class='del'>-	up(&amp;ctx-&gt;file-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;ctx-&gt;file-&gt;file_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ib_ucm_context *ib_ucm_ctx_alloc(struct ib_ucm_file *file)</div><div class='hunk'>@@ -205,36 +206,6 @@ error:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ib_ucm_event_path_get(struct ib_ucm_path_rec *upath,</div><div class='del'>-				  struct ib_sa_path_rec	 *kpath)</div><div class='del'>-{</div><div class='del'>-	if (!kpath || !upath)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	memcpy(upath-&gt;dgid, kpath-&gt;dgid.raw, sizeof *upath-&gt;dgid);</div><div class='del'>-	memcpy(upath-&gt;sgid, kpath-&gt;sgid.raw, sizeof *upath-&gt;sgid);</div><div class='del'>-</div><div class='del'>-	upath-&gt;dlid             = kpath-&gt;dlid;</div><div class='del'>-	upath-&gt;slid             = kpath-&gt;slid;</div><div class='del'>-	upath-&gt;raw_traffic      = kpath-&gt;raw_traffic;</div><div class='del'>-	upath-&gt;flow_label       = kpath-&gt;flow_label;</div><div class='del'>-	upath-&gt;hop_limit        = kpath-&gt;hop_limit;</div><div class='del'>-	upath-&gt;traffic_class    = kpath-&gt;traffic_class;</div><div class='del'>-	upath-&gt;reversible       = kpath-&gt;reversible;</div><div class='del'>-	upath-&gt;numb_path        = kpath-&gt;numb_path;</div><div class='del'>-	upath-&gt;pkey             = kpath-&gt;pkey;</div><div class='del'>-	upath-&gt;sl	        = kpath-&gt;sl;</div><div class='del'>-	upath-&gt;mtu_selector     = kpath-&gt;mtu_selector;</div><div class='del'>-	upath-&gt;mtu              = kpath-&gt;mtu;</div><div class='del'>-	upath-&gt;rate_selector    = kpath-&gt;rate_selector;</div><div class='del'>-	upath-&gt;rate             = kpath-&gt;rate;</div><div class='del'>-	upath-&gt;packet_life_time = kpath-&gt;packet_life_time;</div><div class='del'>-	upath-&gt;preference       = kpath-&gt;preference;</div><div class='del'>-</div><div class='del'>-	upath-&gt;packet_life_time_selector =</div><div class='del'>-		kpath-&gt;packet_life_time_selector;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ib_ucm_event_req_get(struct ib_ucm_req_event_resp *ureq,</div><div class='ctx'> 				 struct ib_cm_req_event_param *kreq)</div><div class='ctx'> {</div><div class='hunk'>@@ -253,8 +224,10 @@ static void ib_ucm_event_req_get(struct ib_ucm_req_event_resp *ureq,</div><div class='ctx'> 	ureq-&gt;srq                        = kreq-&gt;srq;</div><div class='ctx'> 	ureq-&gt;port			 = kreq-&gt;port;</div><div class='ctx'> </div><div class='del'>-	ib_ucm_event_path_get(&amp;ureq-&gt;primary_path, kreq-&gt;primary_path);</div><div class='del'>-	ib_ucm_event_path_get(&amp;ureq-&gt;alternate_path, kreq-&gt;alternate_path);</div><div class='add'>+	ib_copy_path_rec_to_user(&amp;ureq-&gt;primary_path, kreq-&gt;primary_path);</div><div class='add'>+	if (kreq-&gt;alternate_path)</div><div class='add'>+		ib_copy_path_rec_to_user(&amp;ureq-&gt;alternate_path,</div><div class='add'>+					 kreq-&gt;alternate_path);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ib_ucm_event_rep_get(struct ib_ucm_rep_event_resp *urep,</div><div class='hunk'>@@ -324,8 +297,8 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,</div><div class='ctx'> 		info	      = evt-&gt;param.rej_rcvd.ari;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IB_CM_LAP_RECEIVED:</div><div class='del'>-		ib_ucm_event_path_get(&amp;uvt-&gt;resp.u.lap_resp.path,</div><div class='del'>-				      evt-&gt;param.lap_rcvd.alternate_path);</div><div class='add'>+		ib_copy_path_rec_to_user(&amp;uvt-&gt;resp.u.lap_resp.path,</div><div class='add'>+					 evt-&gt;param.lap_rcvd.alternate_path);</div><div class='ctx'> 		uvt-&gt;data_len = IB_CM_LAP_PRIVATE_DATA_SIZE;</div><div class='ctx'> 		uvt-&gt;resp.present = IB_UCM_PRES_ALTERNATE;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -402,11 +375,11 @@ static int ib_ucm_event_handler(struct ib_cm_id *cm_id,</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto err2;</div><div class='ctx'> </div><div class='del'>-	down(&amp;ctx-&gt;file-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;ctx-&gt;file-&gt;file_mutex);</div><div class='ctx'> 	list_add_tail(&amp;uevent-&gt;file_list, &amp;ctx-&gt;file-&gt;events);</div><div class='ctx'> 	list_add_tail(&amp;uevent-&gt;ctx_list, &amp;ctx-&gt;events);</div><div class='ctx'> 	wake_up_interruptible(&amp;ctx-&gt;file-&gt;poll_wait);</div><div class='del'>-	up(&amp;ctx-&gt;file-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;ctx-&gt;file-&gt;file_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err2:</div><div class='hunk'>@@ -432,7 +405,7 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, inbuf, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	down(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	while (list_empty(&amp;file-&gt;events)) {</div><div class='ctx'> </div><div class='ctx'> 		if (file-&gt;filp-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='hunk'>@@ -447,9 +420,9 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,</div><div class='ctx'> </div><div class='ctx'> 		prepare_to_wait(&amp;file-&gt;poll_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> </div><div class='del'>-		up(&amp;file-&gt;mutex);</div><div class='add'>+		mutex_unlock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 		schedule();</div><div class='del'>-		down(&amp;file-&gt;mutex);</div><div class='add'>+		mutex_lock(&amp;file-&gt;file_mutex);</div><div class='ctx'> </div><div class='ctx'> 		finish_wait(&amp;file-&gt;poll_wait, &amp;wait);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -509,7 +482,7 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file,</div><div class='ctx'> 	kfree(uevent-&gt;info);</div><div class='ctx'> 	kfree(uevent);</div><div class='ctx'> done:</div><div class='del'>-	up(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -528,9 +501,9 @@ static ssize_t ib_ucm_create_id(struct ib_ucm_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, inbuf, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	down(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	ctx = ib_ucm_ctx_alloc(file);</div><div class='del'>-	up(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -637,65 +610,11 @@ static ssize_t ib_ucm_attr_id(struct ib_ucm_file *file,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ib_ucm_copy_ah_attr(struct ib_ucm_ah_attr *dest_attr,</div><div class='del'>-				struct ib_ah_attr *src_attr)</div><div class='del'>-{</div><div class='del'>-	memcpy(dest_attr-&gt;grh_dgid, src_attr-&gt;grh.dgid.raw,</div><div class='del'>-	       sizeof src_attr-&gt;grh.dgid);</div><div class='del'>-	dest_attr-&gt;grh_flow_label = src_attr-&gt;grh.flow_label;</div><div class='del'>-	dest_attr-&gt;grh_sgid_index = src_attr-&gt;grh.sgid_index;</div><div class='del'>-	dest_attr-&gt;grh_hop_limit = src_attr-&gt;grh.hop_limit;</div><div class='del'>-	dest_attr-&gt;grh_traffic_class = src_attr-&gt;grh.traffic_class;</div><div class='del'>-</div><div class='del'>-	dest_attr-&gt;dlid = src_attr-&gt;dlid;</div><div class='del'>-	dest_attr-&gt;sl = src_attr-&gt;sl;</div><div class='del'>-	dest_attr-&gt;src_path_bits = src_attr-&gt;src_path_bits;</div><div class='del'>-	dest_attr-&gt;static_rate = src_attr-&gt;static_rate;</div><div class='del'>-	dest_attr-&gt;is_global = (src_attr-&gt;ah_flags &amp; IB_AH_GRH);</div><div class='del'>-	dest_attr-&gt;port_num = src_attr-&gt;port_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ib_ucm_copy_qp_attr(struct ib_ucm_init_qp_attr_resp *dest_attr,</div><div class='del'>-				struct ib_qp_attr *src_attr)</div><div class='del'>-{</div><div class='del'>-	dest_attr-&gt;cur_qp_state = src_attr-&gt;cur_qp_state;</div><div class='del'>-	dest_attr-&gt;path_mtu = src_attr-&gt;path_mtu;</div><div class='del'>-	dest_attr-&gt;path_mig_state = src_attr-&gt;path_mig_state;</div><div class='del'>-	dest_attr-&gt;qkey = src_attr-&gt;qkey;</div><div class='del'>-	dest_attr-&gt;rq_psn = src_attr-&gt;rq_psn;</div><div class='del'>-	dest_attr-&gt;sq_psn = src_attr-&gt;sq_psn;</div><div class='del'>-	dest_attr-&gt;dest_qp_num = src_attr-&gt;dest_qp_num;</div><div class='del'>-	dest_attr-&gt;qp_access_flags = src_attr-&gt;qp_access_flags;</div><div class='del'>-</div><div class='del'>-	dest_attr-&gt;max_send_wr = src_attr-&gt;cap.max_send_wr;</div><div class='del'>-	dest_attr-&gt;max_recv_wr = src_attr-&gt;cap.max_recv_wr;</div><div class='del'>-	dest_attr-&gt;max_send_sge = src_attr-&gt;cap.max_send_sge;</div><div class='del'>-	dest_attr-&gt;max_recv_sge = src_attr-&gt;cap.max_recv_sge;</div><div class='del'>-	dest_attr-&gt;max_inline_data = src_attr-&gt;cap.max_inline_data;</div><div class='del'>-</div><div class='del'>-	ib_ucm_copy_ah_attr(&amp;dest_attr-&gt;ah_attr, &amp;src_attr-&gt;ah_attr);</div><div class='del'>-	ib_ucm_copy_ah_attr(&amp;dest_attr-&gt;alt_ah_attr, &amp;src_attr-&gt;alt_ah_attr);</div><div class='del'>-</div><div class='del'>-	dest_attr-&gt;pkey_index = src_attr-&gt;pkey_index;</div><div class='del'>-	dest_attr-&gt;alt_pkey_index = src_attr-&gt;alt_pkey_index;</div><div class='del'>-	dest_attr-&gt;en_sqd_async_notify = src_attr-&gt;en_sqd_async_notify;</div><div class='del'>-	dest_attr-&gt;sq_draining = src_attr-&gt;sq_draining;</div><div class='del'>-	dest_attr-&gt;max_rd_atomic = src_attr-&gt;max_rd_atomic;</div><div class='del'>-	dest_attr-&gt;max_dest_rd_atomic = src_attr-&gt;max_dest_rd_atomic;</div><div class='del'>-	dest_attr-&gt;min_rnr_timer = src_attr-&gt;min_rnr_timer;</div><div class='del'>-	dest_attr-&gt;port_num = src_attr-&gt;port_num;</div><div class='del'>-	dest_attr-&gt;timeout = src_attr-&gt;timeout;</div><div class='del'>-	dest_attr-&gt;retry_cnt = src_attr-&gt;retry_cnt;</div><div class='del'>-	dest_attr-&gt;rnr_retry = src_attr-&gt;rnr_retry;</div><div class='del'>-	dest_attr-&gt;alt_port_num = src_attr-&gt;alt_port_num;</div><div class='del'>-	dest_attr-&gt;alt_timeout = src_attr-&gt;alt_timeout;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t ib_ucm_init_qp_attr(struct ib_ucm_file *file,</div><div class='ctx'> 				   const char __user *inbuf,</div><div class='ctx'> 				   int in_len, int out_len)</div><div class='ctx'> {</div><div class='del'>-	struct ib_ucm_init_qp_attr_resp resp;</div><div class='add'>+	struct ib_uverbs_qp_attr resp;</div><div class='ctx'> 	struct ib_ucm_init_qp_attr cmd;</div><div class='ctx'> 	struct ib_ucm_context *ctx;</div><div class='ctx'> 	struct ib_qp_attr qp_attr;</div><div class='hunk'>@@ -718,7 +637,7 @@ static ssize_t ib_ucm_init_qp_attr(struct ib_ucm_file *file,</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	ib_ucm_copy_qp_attr(&amp;resp, &amp;qp_attr);</div><div class='add'>+	ib_copy_qp_attr_to_user(&amp;resp, &amp;qp_attr);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *)(unsigned long)cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof(resp)))</div><div class='hunk'>@@ -729,6 +648,17 @@ out:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ucm_validate_listen(__be64 service_id, __be64 service_mask)</div><div class='add'>+{</div><div class='add'>+	service_id &amp;= service_mask;</div><div class='add'>+</div><div class='add'>+	if (((service_id &amp; IB_CMA_SERVICE_ID_MASK) == IB_CMA_SERVICE_ID) ||</div><div class='add'>+	    ((service_id &amp; IB_SDP_SERVICE_ID_MASK) == IB_SDP_SERVICE_ID))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t ib_ucm_listen(struct ib_ucm_file *file,</div><div class='ctx'> 			     const char __user *inbuf,</div><div class='ctx'> 			     int in_len, int out_len)</div><div class='hunk'>@@ -744,7 +674,13 @@ static ssize_t ib_ucm_listen(struct ib_ucm_file *file,</div><div class='ctx'> 	if (IS_ERR(ctx))</div><div class='ctx'> 		return PTR_ERR(ctx);</div><div class='ctx'> </div><div class='del'>-	result = ib_cm_listen(ctx-&gt;cm_id, cmd.service_id, cmd.service_mask);</div><div class='add'>+	result = ucm_validate_listen(cmd.service_id, cmd.service_mask);</div><div class='add'>+	if (result)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	result = ib_cm_listen(ctx-&gt;cm_id, cmd.service_id, cmd.service_mask,</div><div class='add'>+			      NULL);</div><div class='add'>+out:</div><div class='ctx'> 	ib_ucm_ctx_put(ctx);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -793,7 +729,7 @@ static int ib_ucm_alloc_data(const void **dest, u64 src, u32 len)</div><div class='ctx'> </div><div class='ctx'> static int ib_ucm_path_get(struct ib_sa_path_rec **path, u64 src)</div><div class='ctx'> {</div><div class='del'>-	struct ib_ucm_path_rec ucm_path;</div><div class='add'>+	struct ib_user_path_rec upath;</div><div class='ctx'> 	struct ib_sa_path_rec  *sa_path;</div><div class='ctx'> </div><div class='ctx'> 	*path = NULL;</div><div class='hunk'>@@ -805,36 +741,14 @@ static int ib_ucm_path_get(struct ib_sa_path_rec **path, u64 src)</div><div class='ctx'> 	if (!sa_path)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;ucm_path, (void __user *)(unsigned long)src,</div><div class='del'>-			   sizeof(ucm_path))) {</div><div class='add'>+	if (copy_from_user(&amp;upath, (void __user *)(unsigned long)src,</div><div class='add'>+			   sizeof(upath))) {</div><div class='ctx'> </div><div class='ctx'> 		kfree(sa_path);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(sa_path-&gt;dgid.raw, ucm_path.dgid, sizeof sa_path-&gt;dgid);</div><div class='del'>-	memcpy(sa_path-&gt;sgid.raw, ucm_path.sgid, sizeof sa_path-&gt;sgid);</div><div class='del'>-</div><div class='del'>-	sa_path-&gt;dlid	          = ucm_path.dlid;</div><div class='del'>-	sa_path-&gt;slid	          = ucm_path.slid;</div><div class='del'>-	sa_path-&gt;raw_traffic      = ucm_path.raw_traffic;</div><div class='del'>-	sa_path-&gt;flow_label       = ucm_path.flow_label;</div><div class='del'>-	sa_path-&gt;hop_limit        = ucm_path.hop_limit;</div><div class='del'>-	sa_path-&gt;traffic_class    = ucm_path.traffic_class;</div><div class='del'>-	sa_path-&gt;reversible       = ucm_path.reversible;</div><div class='del'>-	sa_path-&gt;numb_path        = ucm_path.numb_path;</div><div class='del'>-	sa_path-&gt;pkey             = ucm_path.pkey;</div><div class='del'>-	sa_path-&gt;sl               = ucm_path.sl;</div><div class='del'>-	sa_path-&gt;mtu_selector     = ucm_path.mtu_selector;</div><div class='del'>-	sa_path-&gt;mtu              = ucm_path.mtu;</div><div class='del'>-	sa_path-&gt;rate_selector    = ucm_path.rate_selector;</div><div class='del'>-	sa_path-&gt;rate             = ucm_path.rate;</div><div class='del'>-	sa_path-&gt;packet_life_time = ucm_path.packet_life_time;</div><div class='del'>-	sa_path-&gt;preference       = ucm_path.preference;</div><div class='del'>-</div><div class='del'>-	sa_path-&gt;packet_life_time_selector =</div><div class='del'>-		ucm_path.packet_life_time_selector;</div><div class='del'>-</div><div class='add'>+	ib_copy_path_rec_from_user(sa_path, &amp;upath);</div><div class='ctx'> 	*path = sa_path;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1130,7 +1044,6 @@ static ssize_t ib_ucm_send_sidr_req(struct ib_ucm_file *file,</div><div class='ctx'> 	param.service_id       = cmd.sid;</div><div class='ctx'> 	param.timeout_ms       = cmd.timeout;</div><div class='ctx'> 	param.max_cm_retries   = cmd.max_cm_retries;</div><div class='del'>-	param.pkey             = cmd.pkey;</div><div class='ctx'> </div><div class='ctx'> 	ctx = ib_ucm_ctx_get(file, cmd.id);</div><div class='ctx'> 	if (!IS_ERR(ctx)) {</div><div class='hunk'>@@ -1263,7 +1176,7 @@ static int ib_ucm_open(struct inode *inode, struct file *filp)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;file-&gt;ctxs);</div><div class='ctx'> 	init_waitqueue_head(&amp;file-&gt;poll_wait);</div><div class='ctx'> </div><div class='del'>-	init_MUTEX(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_init(&amp;file-&gt;file_mutex);</div><div class='ctx'> </div><div class='ctx'> 	filp-&gt;private_data = file;</div><div class='ctx'> 	file-&gt;filp = filp;</div><div class='hunk'>@@ -1277,11 +1190,11 @@ static int ib_ucm_close(struct inode *inode, struct file *filp)</div><div class='ctx'> 	struct ib_ucm_file *file = filp-&gt;private_data;</div><div class='ctx'> 	struct ib_ucm_context *ctx;</div><div class='ctx'> </div><div class='del'>-	down(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	while (!list_empty(&amp;file-&gt;ctxs)) {</div><div class='ctx'> 		ctx = list_entry(file-&gt;ctxs.next,</div><div class='ctx'> 				 struct ib_ucm_context, file_list);</div><div class='del'>-		up(&amp;file-&gt;mutex);</div><div class='add'>+		mutex_unlock(&amp;file-&gt;file_mutex);</div><div class='ctx'> </div><div class='ctx'> 		mutex_lock(&amp;ctx_id_mutex);</div><div class='ctx'> 		idr_remove(&amp;ctx_id_table, ctx-&gt;id);</div><div class='hunk'>@@ -1291,9 +1204,9 @@ static int ib_ucm_close(struct inode *inode, struct file *filp)</div><div class='ctx'> 		ib_ucm_cleanup_events(ctx);</div><div class='ctx'> 		kfree(ctx);</div><div class='ctx'> </div><div class='del'>-		down(&amp;file-&gt;mutex);</div><div class='add'>+		mutex_lock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	}</div><div class='del'>-	up(&amp;file-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;file-&gt;file_mutex);</div><div class='ctx'> 	kfree(file);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h<br/>index 3372d67ff139..bb9bee56a824 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/uverbs.h</a></div><div class='hunk'>@@ -132,7 +132,7 @@ struct ib_ucq_object {</div><div class='ctx'> 	u32			async_events_reported;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct mutex ib_uverbs_idr_mutex;</div><div class='add'>+extern spinlock_t ib_uverbs_idr_lock;</div><div class='ctx'> extern struct idr ib_uverbs_pd_idr;</div><div class='ctx'> extern struct idr ib_uverbs_mr_idr;</div><div class='ctx'> extern struct idr ib_uverbs_mw_idr;</div><div class='hunk'>@@ -141,6 +141,8 @@ extern struct idr ib_uverbs_cq_idr;</div><div class='ctx'> extern struct idr ib_uverbs_qp_idr;</div><div class='ctx'> extern struct idr ib_uverbs_srq_idr;</div><div class='ctx'> </div><div class='add'>+void idr_remove_uobj(struct idr *idp, struct ib_uobject *uobj);</div><div class='add'>+</div><div class='ctx'> struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file,</div><div class='ctx'> 					int is_async, int *fd);</div><div class='ctx'> void ib_uverbs_release_event_file(struct kref *ref);</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c<br/>index 9f69bd48eb1b..bdf5d5098190 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_cmd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs_cmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_cmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/uverbs_cmd.c</a></div><div class='hunk'>@@ -50,6 +50,196 @@</div><div class='ctx'> 		(udata)-&gt;outlen = (olen);				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The ib_uobject locking scheme is as follows:</div><div class='add'>+ *</div><div class='add'>+ * - ib_uverbs_idr_lock protects the uverbs idrs themselves, so it</div><div class='add'>+ *   needs to be held during all idr operations.  When an object is</div><div class='add'>+ *   looked up, a reference must be taken on the object's kref before</div><div class='add'>+ *   dropping this lock.</div><div class='add'>+ *</div><div class='add'>+ * - Each object also has an rwsem.  This rwsem must be held for</div><div class='add'>+ *   reading while an operation that uses the object is performed.</div><div class='add'>+ *   For example, while registering an MR, the associated PD's</div><div class='add'>+ *   uobject.mutex must be held for reading.  The rwsem must be held</div><div class='add'>+ *   for writing while initializing or destroying an object.</div><div class='add'>+ *</div><div class='add'>+ * - In addition, each object has a "live" flag.  If this flag is not</div><div class='add'>+ *   set, then lookups of the object will fail even if it is found in</div><div class='add'>+ *   the idr.  This handles a reader that blocks and does not acquire</div><div class='add'>+ *   the rwsem until after the object is destroyed.  The destroy</div><div class='add'>+ *   operation will set the live flag to 0 and then drop the rwsem;</div><div class='add'>+ *   this will allow the reader to acquire the rwsem, see that the</div><div class='add'>+ *   live flag is 0, and then drop the rwsem and its reference to</div><div class='add'>+ *   object.  The underlying storage will not be freed until the last</div><div class='add'>+ *   reference to the object is dropped.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void init_uobj(struct ib_uobject *uobj, u64 user_handle,</div><div class='add'>+		      struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	uobj-&gt;user_handle = user_handle;</div><div class='add'>+	uobj-&gt;context     = context;</div><div class='add'>+	kref_init(&amp;uobj-&gt;ref);</div><div class='add'>+	init_rwsem(&amp;uobj-&gt;mutex);</div><div class='add'>+	uobj-&gt;live        = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_uobj(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	kfree(container_of(kref, struct ib_uobject, ref));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_uobj(struct ib_uobject *uobj)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;uobj-&gt;ref, release_uobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_uobj_read(struct ib_uobject *uobj)</div><div class='add'>+{</div><div class='add'>+	up_read(&amp;uobj-&gt;mutex);</div><div class='add'>+	put_uobj(uobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_uobj_write(struct ib_uobject *uobj)</div><div class='add'>+{</div><div class='add'>+	up_write(&amp;uobj-&gt;mutex);</div><div class='add'>+	put_uobj(uobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int idr_add_uobj(struct idr *idr, struct ib_uobject *uobj)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	if (!idr_pre_get(idr, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ib_uverbs_idr_lock);</div><div class='add'>+	ret = idr_get_new(idr, uobj, &amp;uobj-&gt;id);</div><div class='add'>+	spin_unlock(&amp;ib_uverbs_idr_lock);</div><div class='add'>+</div><div class='add'>+	if (ret == -EAGAIN)</div><div class='add'>+		goto retry;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void idr_remove_uobj(struct idr *idr, struct ib_uobject *uobj)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;ib_uverbs_idr_lock);</div><div class='add'>+	idr_remove(idr, uobj-&gt;id);</div><div class='add'>+	spin_unlock(&amp;ib_uverbs_idr_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_uobject *__idr_get_uobj(struct idr *idr, int id,</div><div class='add'>+					 struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	struct ib_uobject *uobj;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ib_uverbs_idr_lock);</div><div class='add'>+	uobj = idr_find(idr, id);</div><div class='add'>+	if (uobj)</div><div class='add'>+		kref_get(&amp;uobj-&gt;ref);</div><div class='add'>+	spin_unlock(&amp;ib_uverbs_idr_lock);</div><div class='add'>+</div><div class='add'>+	return uobj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_uobject *idr_read_uobj(struct idr *idr, int id,</div><div class='add'>+					struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	struct ib_uobject *uobj;</div><div class='add'>+</div><div class='add'>+	uobj = __idr_get_uobj(idr, id, context);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;uobj-&gt;mutex);</div><div class='add'>+	if (!uobj-&gt;live) {</div><div class='add'>+		put_uobj_read(uobj);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return uobj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_uobject *idr_write_uobj(struct idr *idr, int id,</div><div class='add'>+					 struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	struct ib_uobject *uobj;</div><div class='add'>+</div><div class='add'>+	uobj = __idr_get_uobj(idr, id, context);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;uobj-&gt;mutex);</div><div class='add'>+	if (!uobj-&gt;live) {</div><div class='add'>+		put_uobj_write(uobj);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return uobj;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *idr_read_obj(struct idr *idr, int id, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	struct ib_uobject *uobj;</div><div class='add'>+</div><div class='add'>+	uobj = idr_read_uobj(idr, id, context);</div><div class='add'>+	return uobj ? uobj-&gt;object : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_pd *idr_read_pd(int pd_handle, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	return idr_read_obj(&amp;ib_uverbs_pd_idr, pd_handle, context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_pd_read(struct ib_pd *pd)</div><div class='add'>+{</div><div class='add'>+	put_uobj_read(pd-&gt;uobject);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_cq *idr_read_cq(int cq_handle, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	return idr_read_obj(&amp;ib_uverbs_cq_idr, cq_handle, context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_cq_read(struct ib_cq *cq)</div><div class='add'>+{</div><div class='add'>+	put_uobj_read(cq-&gt;uobject);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_ah *idr_read_ah(int ah_handle, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	return idr_read_obj(&amp;ib_uverbs_ah_idr, ah_handle, context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_ah_read(struct ib_ah *ah)</div><div class='add'>+{</div><div class='add'>+	put_uobj_read(ah-&gt;uobject);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_qp *idr_read_qp(int qp_handle, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	return idr_read_obj(&amp;ib_uverbs_qp_idr, qp_handle, context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_qp_read(struct ib_qp *qp)</div><div class='add'>+{</div><div class='add'>+	put_uobj_read(qp-&gt;uobject);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ib_srq *idr_read_srq(int srq_handle, struct ib_ucontext *context)</div><div class='add'>+{</div><div class='add'>+	return idr_read_obj(&amp;ib_uverbs_srq_idr, srq_handle, context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void put_srq_read(struct ib_srq *srq)</div><div class='add'>+{</div><div class='add'>+	put_uobj_read(srq-&gt;uobject);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,</div><div class='ctx'> 			      const char __user *buf,</div><div class='ctx'> 			      int in_len, int out_len)</div><div class='hunk'>@@ -80,8 +270,10 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,</div><div class='ctx'> 		   in_len - sizeof cmd, out_len - sizeof resp);</div><div class='ctx'> </div><div class='ctx'> 	ucontext = ibdev-&gt;alloc_ucontext(ibdev, &amp;udata);</div><div class='del'>-	if (IS_ERR(ucontext))</div><div class='del'>-		return PTR_ERR(file-&gt;ucontext);</div><div class='add'>+	if (IS_ERR(ucontext)) {</div><div class='add'>+		ret = PTR_ERR(file-&gt;ucontext);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ucontext-&gt;device = ibdev;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ucontext-&gt;pd_list);</div><div class='hunk'>@@ -278,7 +470,8 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (!uobj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	uobj-&gt;context = file-&gt;ucontext;</div><div class='add'>+	init_uobj(uobj, 0, file-&gt;ucontext);</div><div class='add'>+	down_write(&amp;uobj-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	pd = file-&gt;device-&gt;ib_dev-&gt;alloc_pd(file-&gt;device-&gt;ib_dev,</div><div class='ctx'> 					    file-&gt;ucontext, &amp;udata);</div><div class='hunk'>@@ -291,20 +484,10 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,</div><div class='ctx'> 	pd-&gt;uobject = uobj;</div><div class='ctx'> 	atomic_set(&amp;pd-&gt;usecnt, 0);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	if (!idr_pre_get(&amp;ib_uverbs_pd_idr, GFP_KERNEL)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_up;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = idr_get_new(&amp;ib_uverbs_pd_idr, pd, &amp;uobj-&gt;id);</div><div class='del'>-</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		goto retry;</div><div class='add'>+	uobj-&gt;object = pd;</div><div class='add'>+	ret = idr_add_uobj(&amp;ib_uverbs_pd_idr, uobj);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err_idr;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;resp, 0, sizeof resp);</div><div class='ctx'> 	resp.pd_handle = uobj-&gt;id;</div><div class='hunk'>@@ -312,26 +495,27 @@ retry:</div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp)) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_idr;</div><div class='add'>+		goto err_copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='ctx'> 	list_add_tail(&amp;uobj-&gt;list, &amp;file-&gt;ucontext-&gt;pd_list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	uobj-&gt;live = 1;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;uobj-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return in_len;</div><div class='ctx'> </div><div class='del'>-err_idr:</div><div class='del'>-	idr_remove(&amp;ib_uverbs_pd_idr, uobj-&gt;id);</div><div class='add'>+err_copy:</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_pd_idr, uobj);</div><div class='ctx'> </div><div class='del'>-err_up:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+err_idr:</div><div class='ctx'> 	ib_dealloc_pd(pd);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	kfree(uobj);</div><div class='add'>+	put_uobj_write(uobj);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -340,37 +524,34 @@ ssize_t ib_uverbs_dealloc_pd(struct ib_uverbs_file *file,</div><div class='ctx'> 			     int in_len, int out_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_dealloc_pd cmd;</div><div class='del'>-	struct ib_pd               *pd;</div><div class='ctx'> 	struct ib_uobject          *uobj;</div><div class='del'>-	int                         ret = -EINVAL;</div><div class='add'>+	int                         ret;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_pd_idr, cmd.pd_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pd = idr_find(&amp;ib_uverbs_pd_idr, cmd.pd_handle);</div><div class='del'>-	if (!pd || pd-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	ret = ib_dealloc_pd(uobj-&gt;object);</div><div class='add'>+	if (!ret)</div><div class='add'>+		uobj-&gt;live = 0;</div><div class='ctx'> </div><div class='del'>-	uobj = pd-&gt;uobject;</div><div class='add'>+	put_uobj_write(uobj);</div><div class='ctx'> </div><div class='del'>-	ret = ib_dealloc_pd(pd);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ib_uverbs_pd_idr, cmd.pd_handle);</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_pd_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='ctx'> 	list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	put_uobj(uobj);</div><div class='ctx'> </div><div class='del'>-	return ret ? ret : in_len;</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -410,7 +591,8 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (!obj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	obj-&gt;uobject.context = file-&gt;ucontext;</div><div class='add'>+	init_uobj(&amp;obj-&gt;uobject, 0, file-&gt;ucontext);</div><div class='add'>+	down_write(&amp;obj-&gt;uobject.mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We ask for writable memory if any access flags other than</div><div class='hunk'>@@ -427,23 +609,14 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,</div><div class='ctx'> </div><div class='ctx'> 	obj-&gt;umem.virt_base = cmd.hca_va;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	pd = idr_find(&amp;ib_uverbs_pd_idr, cmd.pd_handle);</div><div class='del'>-	if (!pd || pd-&gt;uobject-&gt;context != file-&gt;ucontext) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto err_up;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pd-&gt;device-&gt;reg_user_mr) {</div><div class='del'>-		ret = -ENOSYS;</div><div class='del'>-		goto err_up;</div><div class='del'>-	}</div><div class='add'>+	pd = idr_read_pd(cmd.pd_handle, file-&gt;ucontext);</div><div class='add'>+	if (!pd)</div><div class='add'>+		goto err_release;</div><div class='ctx'> </div><div class='ctx'> 	mr = pd-&gt;device-&gt;reg_user_mr(pd, &amp;obj-&gt;umem, cmd.access_flags, &amp;udata);</div><div class='ctx'> 	if (IS_ERR(mr)) {</div><div class='ctx'> 		ret = PTR_ERR(mr);</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mr-&gt;device  = pd-&gt;device;</div><div class='hunk'>@@ -452,53 +625,48 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,</div><div class='ctx'> 	atomic_inc(&amp;pd-&gt;usecnt);</div><div class='ctx'> 	atomic_set(&amp;mr-&gt;usecnt, 0);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;resp, 0, sizeof resp);</div><div class='del'>-	resp.lkey = mr-&gt;lkey;</div><div class='del'>-	resp.rkey = mr-&gt;rkey;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	if (!idr_pre_get(&amp;ib_uverbs_mr_idr, GFP_KERNEL)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_unreg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = idr_get_new(&amp;ib_uverbs_mr_idr, mr, &amp;obj-&gt;uobject.id);</div><div class='del'>-</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		goto retry;</div><div class='add'>+	obj-&gt;uobject.object = mr;</div><div class='add'>+	ret = idr_add_uobj(&amp;ib_uverbs_mr_idr, &amp;obj-&gt;uobject);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_unreg;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;resp, 0, sizeof resp);</div><div class='add'>+	resp.lkey      = mr-&gt;lkey;</div><div class='add'>+	resp.rkey      = mr-&gt;rkey;</div><div class='ctx'> 	resp.mr_handle = obj-&gt;uobject.id;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp)) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_idr;</div><div class='add'>+		goto err_copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	put_pd_read(pd);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='ctx'> 	list_add_tail(&amp;obj-&gt;uobject.list, &amp;file-&gt;ucontext-&gt;mr_list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	obj-&gt;uobject.live = 1;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;obj-&gt;uobject.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return in_len;</div><div class='ctx'> </div><div class='del'>-err_idr:</div><div class='del'>-	idr_remove(&amp;ib_uverbs_mr_idr, obj-&gt;uobject.id);</div><div class='add'>+err_copy:</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_mr_idr, &amp;obj-&gt;uobject);</div><div class='ctx'> </div><div class='ctx'> err_unreg:</div><div class='ctx'> 	ib_dereg_mr(mr);</div><div class='del'>-	atomic_dec(&amp;pd-&gt;usecnt);</div><div class='ctx'> </div><div class='del'>-err_up:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+err_put:</div><div class='add'>+	put_pd_read(pd);</div><div class='ctx'> </div><div class='add'>+err_release:</div><div class='ctx'> 	ib_umem_release(file-&gt;device-&gt;ib_dev, &amp;obj-&gt;umem);</div><div class='ctx'> </div><div class='ctx'> err_free:</div><div class='del'>-	kfree(obj);</div><div class='add'>+	put_uobj_write(&amp;obj-&gt;uobject);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -508,37 +676,40 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_dereg_mr cmd;</div><div class='ctx'> 	struct ib_mr             *mr;</div><div class='add'>+	struct ib_uobject	 *uobj;</div><div class='ctx'> 	struct ib_umem_object    *memobj;</div><div class='ctx'> 	int                       ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	mr = idr_find(&amp;ib_uverbs_mr_idr, cmd.mr_handle);</div><div class='del'>-	if (!mr || mr-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_mr_idr, cmd.mr_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memobj = container_of(mr-&gt;uobject, struct ib_umem_object, uobject);</div><div class='add'>+	memobj = container_of(uobj, struct ib_umem_object, uobject);</div><div class='add'>+	mr     = uobj-&gt;object;</div><div class='ctx'> </div><div class='ctx'> 	ret = ib_dereg_mr(mr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		uobj-&gt;live = 0;</div><div class='add'>+</div><div class='add'>+	put_uobj_write(uobj);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ib_uverbs_mr_idr, cmd.mr_handle);</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_mr_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_del(&amp;memobj-&gt;uobject.list);</div><div class='add'>+	list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ib_umem_release(file-&gt;device-&gt;ib_dev, &amp;memobj-&gt;umem);</div><div class='del'>-	kfree(memobj);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	put_uobj(uobj);</div><div class='ctx'> </div><div class='del'>-	return ret ? ret : in_len;</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -577,7 +748,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 	struct ib_uverbs_create_cq      cmd;</div><div class='ctx'> 	struct ib_uverbs_create_cq_resp resp;</div><div class='ctx'> 	struct ib_udata                 udata;</div><div class='del'>-	struct ib_ucq_object           *uobj;</div><div class='add'>+	struct ib_ucq_object           *obj;</div><div class='ctx'> 	struct ib_uverbs_event_file    *ev_file = NULL;</div><div class='ctx'> 	struct ib_cq                   *cq;</div><div class='ctx'> 	int                             ret;</div><div class='hunk'>@@ -595,10 +766,13 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (cmd.comp_vector &gt;= file-&gt;device-&gt;num_comp_vectors)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	uobj = kmalloc(sizeof *uobj, GFP_KERNEL);</div><div class='del'>-	if (!uobj)</div><div class='add'>+	obj = kmalloc(sizeof *obj, GFP_KERNEL);</div><div class='add'>+	if (!obj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	init_uobj(&amp;obj-&gt;uobject, cmd.user_handle, file-&gt;ucontext);</div><div class='add'>+	down_write(&amp;obj-&gt;uobject.mutex);</div><div class='add'>+</div><div class='ctx'> 	if (cmd.comp_channel &gt;= 0) {</div><div class='ctx'> 		ev_file = ib_uverbs_lookup_comp_file(cmd.comp_channel);</div><div class='ctx'> 		if (!ev_file) {</div><div class='hunk'>@@ -607,72 +781,64 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uobj-&gt;uobject.user_handle   = cmd.user_handle;</div><div class='del'>-	uobj-&gt;uobject.context       = file-&gt;ucontext;</div><div class='del'>-	uobj-&gt;uverbs_file	    = file;</div><div class='del'>-	uobj-&gt;comp_events_reported  = 0;</div><div class='del'>-	uobj-&gt;async_events_reported = 0;</div><div class='del'>-	INIT_LIST_HEAD(&amp;uobj-&gt;comp_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;uobj-&gt;async_list);</div><div class='add'>+	obj-&gt;uverbs_file	   = file;</div><div class='add'>+	obj-&gt;comp_events_reported  = 0;</div><div class='add'>+	obj-&gt;async_events_reported = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;obj-&gt;comp_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;obj-&gt;async_list);</div><div class='ctx'> </div><div class='ctx'> 	cq = file-&gt;device-&gt;ib_dev-&gt;create_cq(file-&gt;device-&gt;ib_dev, cmd.cqe,</div><div class='ctx'> 					     file-&gt;ucontext, &amp;udata);</div><div class='ctx'> 	if (IS_ERR(cq)) {</div><div class='ctx'> 		ret = PTR_ERR(cq);</div><div class='del'>-		goto err;</div><div class='add'>+		goto err_file;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cq-&gt;device        = file-&gt;device-&gt;ib_dev;</div><div class='del'>-	cq-&gt;uobject       = &amp;uobj-&gt;uobject;</div><div class='add'>+	cq-&gt;uobject       = &amp;obj-&gt;uobject;</div><div class='ctx'> 	cq-&gt;comp_handler  = ib_uverbs_comp_handler;</div><div class='ctx'> 	cq-&gt;event_handler = ib_uverbs_cq_event_handler;</div><div class='ctx'> 	cq-&gt;cq_context    = ev_file;</div><div class='ctx'> 	atomic_set(&amp;cq-&gt;usecnt, 0);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	if (!idr_pre_get(&amp;ib_uverbs_cq_idr, GFP_KERNEL)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_up;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = idr_get_new(&amp;ib_uverbs_cq_idr, cq, &amp;uobj-&gt;uobject.id);</div><div class='del'>-</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		goto retry;</div><div class='add'>+	obj-&gt;uobject.object = cq;</div><div class='add'>+	ret = idr_add_uobj(&amp;ib_uverbs_cq_idr, &amp;obj-&gt;uobject);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err_free;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;resp, 0, sizeof resp);</div><div class='del'>-	resp.cq_handle = uobj-&gt;uobject.id;</div><div class='add'>+	resp.cq_handle = obj-&gt;uobject.id;</div><div class='ctx'> 	resp.cqe       = cq-&gt;cqe;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp)) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_idr;</div><div class='add'>+		goto err_copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_add_tail(&amp;uobj-&gt;uobject.list, &amp;file-&gt;ucontext-&gt;cq_list);</div><div class='add'>+	list_add_tail(&amp;obj-&gt;uobject.list, &amp;file-&gt;ucontext-&gt;cq_list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	obj-&gt;uobject.live = 1;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;obj-&gt;uobject.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return in_len;</div><div class='ctx'> </div><div class='del'>-err_idr:</div><div class='del'>-	idr_remove(&amp;ib_uverbs_cq_idr, uobj-&gt;uobject.id);</div><div class='add'>+err_copy:</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_cq_idr, &amp;obj-&gt;uobject);</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-err_up:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+err_free:</div><div class='ctx'> 	ib_destroy_cq(cq);</div><div class='ctx'> </div><div class='del'>-err:</div><div class='add'>+err_file:</div><div class='ctx'> 	if (ev_file)</div><div class='del'>-		ib_uverbs_release_ucq(file, ev_file, uobj);</div><div class='del'>-	kfree(uobj);</div><div class='add'>+		ib_uverbs_release_ucq(file, ev_file, obj);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	put_uobj_write(&amp;obj-&gt;uobject);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -693,11 +859,9 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 		   (unsigned long) cmd.response + sizeof resp,</div><div class='ctx'> 		   in_len - sizeof cmd, out_len - sizeof resp);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	cq = idr_find(&amp;ib_uverbs_cq_idr, cmd.cq_handle);</div><div class='del'>-	if (!cq || cq-&gt;uobject-&gt;context != file-&gt;ucontext || !cq-&gt;device-&gt;resize_cq)</div><div class='del'>-		goto out;</div><div class='add'>+	cq = idr_read_cq(cmd.cq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!cq)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = cq-&gt;device-&gt;resize_cq(cq, cmd.cqe, &amp;udata);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -711,7 +875,7 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	put_cq_read(cq);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -722,6 +886,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_poll_cq       cmd;</div><div class='ctx'> 	struct ib_uverbs_poll_cq_resp *resp;</div><div class='add'>+	struct ib_uobject	      *uobj;</div><div class='ctx'> 	struct ib_cq                  *cq;</div><div class='ctx'> 	struct ib_wc                  *wc;</div><div class='ctx'> 	int                            ret = 0;</div><div class='hunk'>@@ -742,15 +907,17 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 		goto out_wc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-	cq = idr_find(&amp;ib_uverbs_cq_idr, cmd.cq_handle);</div><div class='del'>-	if (!cq || cq-&gt;uobject-&gt;context != file-&gt;ucontext) {</div><div class='add'>+	uobj = idr_read_uobj(&amp;ib_uverbs_cq_idr, cmd.cq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	cq = uobj-&gt;object;</div><div class='ctx'> </div><div class='ctx'> 	resp-&gt;count = ib_poll_cq(cq, cmd.ne, wc);</div><div class='ctx'> </div><div class='add'>+	put_uobj_read(uobj);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; resp-&gt;count; i++) {</div><div class='ctx'> 		resp-&gt;wc[i].wr_id 	   = wc[i].wr_id;</div><div class='ctx'> 		resp-&gt;wc[i].status 	   = wc[i].status;</div><div class='hunk'>@@ -772,7 +939,6 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='ctx'> 	kfree(resp);</div><div class='ctx'> </div><div class='ctx'> out_wc:</div><div class='hunk'>@@ -785,22 +951,23 @@ ssize_t ib_uverbs_req_notify_cq(struct ib_uverbs_file *file,</div><div class='ctx'> 				int out_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_req_notify_cq cmd;</div><div class='add'>+	struct ib_uobject	      *uobj;</div><div class='ctx'> 	struct ib_cq                  *cq;</div><div class='del'>-	int                            ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-	cq = idr_find(&amp;ib_uverbs_cq_idr, cmd.cq_handle);</div><div class='del'>-	if (cq &amp;&amp; cq-&gt;uobject-&gt;context == file-&gt;ucontext) {</div><div class='del'>-		ib_req_notify_cq(cq, cmd.solicited_only ?</div><div class='del'>-					IB_CQ_SOLICITED : IB_CQ_NEXT_COMP);</div><div class='del'>-		ret = in_len;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	uobj = idr_read_uobj(&amp;ib_uverbs_cq_idr, cmd.cq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cq = uobj-&gt;object;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	ib_req_notify_cq(cq, cmd.solicited_only ?</div><div class='add'>+			 IB_CQ_SOLICITED : IB_CQ_NEXT_COMP);</div><div class='add'>+</div><div class='add'>+	put_uobj_read(uobj);</div><div class='add'>+</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -809,52 +976,50 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_destroy_cq      cmd;</div><div class='ctx'> 	struct ib_uverbs_destroy_cq_resp resp;</div><div class='add'>+	struct ib_uobject		*uobj;</div><div class='ctx'> 	struct ib_cq               	*cq;</div><div class='del'>-	struct ib_ucq_object        	*uobj;</div><div class='add'>+	struct ib_ucq_object        	*obj;</div><div class='ctx'> 	struct ib_uverbs_event_file	*ev_file;</div><div class='del'>-	u64				 user_handle;</div><div class='ctx'> 	int                        	 ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;resp, 0, sizeof resp);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_cq_idr, cmd.cq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cq      = uobj-&gt;object;</div><div class='add'>+	ev_file = cq-&gt;cq_context;</div><div class='add'>+	obj     = container_of(cq-&gt;uobject, struct ib_ucq_object, uobject);</div><div class='ctx'> </div><div class='del'>-	cq = idr_find(&amp;ib_uverbs_cq_idr, cmd.cq_handle);</div><div class='del'>-	if (!cq || cq-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	ret = ib_destroy_cq(cq);</div><div class='add'>+	if (!ret)</div><div class='add'>+		uobj-&gt;live = 0;</div><div class='ctx'> </div><div class='del'>-	user_handle = cq-&gt;uobject-&gt;user_handle;</div><div class='del'>-	uobj        = container_of(cq-&gt;uobject, struct ib_ucq_object, uobject);</div><div class='del'>-	ev_file     = cq-&gt;cq_context;</div><div class='add'>+	put_uobj_write(uobj);</div><div class='ctx'> </div><div class='del'>-	ret = ib_destroy_cq(cq);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ib_uverbs_cq_idr, cmd.cq_handle);</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_cq_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_del(&amp;uobj-&gt;uobject.list);</div><div class='add'>+	list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ib_uverbs_release_ucq(file, ev_file, uobj);</div><div class='add'>+	ib_uverbs_release_ucq(file, ev_file, obj);</div><div class='ctx'> </div><div class='del'>-	resp.comp_events_reported  = uobj-&gt;comp_events_reported;</div><div class='del'>-	resp.async_events_reported = uobj-&gt;async_events_reported;</div><div class='add'>+	memset(&amp;resp, 0, sizeof resp);</div><div class='add'>+	resp.comp_events_reported  = obj-&gt;comp_events_reported;</div><div class='add'>+	resp.async_events_reported = obj-&gt;async_events_reported;</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='add'>+	put_uobj(uobj);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp))</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return ret ? ret : in_len;</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -864,7 +1029,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 	struct ib_uverbs_create_qp      cmd;</div><div class='ctx'> 	struct ib_uverbs_create_qp_resp resp;</div><div class='ctx'> 	struct ib_udata                 udata;</div><div class='del'>-	struct ib_uqp_object           *uobj;</div><div class='add'>+	struct ib_uqp_object           *obj;</div><div class='ctx'> 	struct ib_pd                   *pd;</div><div class='ctx'> 	struct ib_cq                   *scq, *rcq;</div><div class='ctx'> 	struct ib_srq                  *srq;</div><div class='hunk'>@@ -882,23 +1047,21 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 		   (unsigned long) cmd.response + sizeof resp,</div><div class='ctx'> 		   in_len - sizeof cmd, out_len - sizeof resp);</div><div class='ctx'> </div><div class='del'>-	uobj = kmalloc(sizeof *uobj, GFP_KERNEL);</div><div class='del'>-	if (!uobj)</div><div class='add'>+	obj = kmalloc(sizeof *obj, GFP_KERNEL);</div><div class='add'>+	if (!obj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	init_uobj(&amp;obj-&gt;uevent.uobject, cmd.user_handle, file-&gt;ucontext);</div><div class='add'>+	down_write(&amp;obj-&gt;uevent.uobject.mutex);</div><div class='ctx'> </div><div class='del'>-	pd  = idr_find(&amp;ib_uverbs_pd_idr, cmd.pd_handle);</div><div class='del'>-	scq = idr_find(&amp;ib_uverbs_cq_idr, cmd.send_cq_handle);</div><div class='del'>-	rcq = idr_find(&amp;ib_uverbs_cq_idr, cmd.recv_cq_handle);</div><div class='del'>-	srq = cmd.is_srq ? idr_find(&amp;ib_uverbs_srq_idr, cmd.srq_handle) : NULL;</div><div class='add'>+	pd  = idr_read_pd(cmd.pd_handle, file-&gt;ucontext);</div><div class='add'>+	scq = idr_read_cq(cmd.send_cq_handle, file-&gt;ucontext);</div><div class='add'>+	rcq = idr_read_cq(cmd.recv_cq_handle, file-&gt;ucontext);</div><div class='add'>+	srq = cmd.is_srq ? idr_read_srq(cmd.srq_handle, file-&gt;ucontext) : NULL;</div><div class='ctx'> </div><div class='del'>-	if (!pd  || pd-&gt;uobject-&gt;context  != file-&gt;ucontext ||</div><div class='del'>-	    !scq || scq-&gt;uobject-&gt;context != file-&gt;ucontext ||</div><div class='del'>-	    !rcq || rcq-&gt;uobject-&gt;context != file-&gt;ucontext ||</div><div class='del'>-	    (cmd.is_srq &amp;&amp; (!srq || srq-&gt;uobject-&gt;context != file-&gt;ucontext))) {</div><div class='add'>+	if (!pd || !scq || !rcq || (cmd.is_srq &amp;&amp; !srq)) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr.event_handler = ib_uverbs_qp_event_handler;</div><div class='hunk'>@@ -915,16 +1078,14 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 	attr.cap.max_recv_sge    = cmd.max_recv_sge;</div><div class='ctx'> 	attr.cap.max_inline_data = cmd.max_inline_data;</div><div class='ctx'> </div><div class='del'>-	uobj-&gt;uevent.uobject.user_handle = cmd.user_handle;</div><div class='del'>-	uobj-&gt;uevent.uobject.context     = file-&gt;ucontext;</div><div class='del'>-	uobj-&gt;uevent.events_reported     = 0;</div><div class='del'>-	INIT_LIST_HEAD(&amp;uobj-&gt;uevent.event_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;uobj-&gt;mcast_list);</div><div class='add'>+	obj-&gt;uevent.events_reported     = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;obj-&gt;uevent.event_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;obj-&gt;mcast_list);</div><div class='ctx'> </div><div class='ctx'> 	qp = pd-&gt;device-&gt;create_qp(pd, &amp;attr, &amp;udata);</div><div class='ctx'> 	if (IS_ERR(qp)) {</div><div class='ctx'> 		ret = PTR_ERR(qp);</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qp-&gt;device     	  = pd-&gt;device;</div><div class='hunk'>@@ -932,7 +1093,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 	qp-&gt;send_cq    	  = attr.send_cq;</div><div class='ctx'> 	qp-&gt;recv_cq    	  = attr.recv_cq;</div><div class='ctx'> 	qp-&gt;srq	       	  = attr.srq;</div><div class='del'>-	qp-&gt;uobject       = &amp;uobj-&gt;uevent.uobject;</div><div class='add'>+	qp-&gt;uobject       = &amp;obj-&gt;uevent.uobject;</div><div class='ctx'> 	qp-&gt;event_handler = attr.event_handler;</div><div class='ctx'> 	qp-&gt;qp_context    = attr.qp_context;</div><div class='ctx'> 	qp-&gt;qp_type	  = attr.qp_type;</div><div class='hunk'>@@ -942,23 +1103,14 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (attr.srq)</div><div class='ctx'> 		atomic_inc(&amp;attr.srq-&gt;usecnt);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;resp, 0, sizeof resp);</div><div class='del'>-	resp.qpn = qp-&gt;qp_num;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	if (!idr_pre_get(&amp;ib_uverbs_qp_idr, GFP_KERNEL)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_destroy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = idr_get_new(&amp;ib_uverbs_qp_idr, qp, &amp;uobj-&gt;uevent.uobject.id);</div><div class='del'>-</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		goto retry;</div><div class='add'>+	obj-&gt;uevent.uobject.object = qp;</div><div class='add'>+	ret = idr_add_uobj(&amp;ib_uverbs_qp_idr, &amp;obj-&gt;uevent.uobject);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_destroy;</div><div class='ctx'> </div><div class='del'>-	resp.qp_handle       = uobj-&gt;uevent.uobject.id;</div><div class='add'>+	memset(&amp;resp, 0, sizeof resp);</div><div class='add'>+	resp.qpn             = qp-&gt;qp_num;</div><div class='add'>+	resp.qp_handle       = obj-&gt;uevent.uobject.id;</div><div class='ctx'> 	resp.max_recv_sge    = attr.cap.max_recv_sge;</div><div class='ctx'> 	resp.max_send_sge    = attr.cap.max_send_sge;</div><div class='ctx'> 	resp.max_recv_wr     = attr.cap.max_recv_wr;</div><div class='hunk'>@@ -968,32 +1120,42 @@ retry:</div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp)) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_idr;</div><div class='add'>+		goto err_copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	put_pd_read(pd);</div><div class='add'>+	put_cq_read(scq);</div><div class='add'>+	put_cq_read(rcq);</div><div class='add'>+	if (srq)</div><div class='add'>+		put_srq_read(srq);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_add_tail(&amp;uobj-&gt;uevent.uobject.list, &amp;file-&gt;ucontext-&gt;qp_list);</div><div class='add'>+	list_add_tail(&amp;obj-&gt;uevent.uobject.list, &amp;file-&gt;ucontext-&gt;qp_list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	obj-&gt;uevent.uobject.live = 1;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;obj-&gt;uevent.uobject.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return in_len;</div><div class='ctx'> </div><div class='del'>-err_idr:</div><div class='del'>-	idr_remove(&amp;ib_uverbs_qp_idr, uobj-&gt;uevent.uobject.id);</div><div class='add'>+err_copy:</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_qp_idr, &amp;obj-&gt;uevent.uobject);</div><div class='ctx'> </div><div class='ctx'> err_destroy:</div><div class='ctx'> 	ib_destroy_qp(qp);</div><div class='del'>-	atomic_dec(&amp;pd-&gt;usecnt);</div><div class='del'>-	atomic_dec(&amp;attr.send_cq-&gt;usecnt);</div><div class='del'>-	atomic_dec(&amp;attr.recv_cq-&gt;usecnt);</div><div class='del'>-	if (attr.srq)</div><div class='del'>-		atomic_dec(&amp;attr.srq-&gt;usecnt);</div><div class='del'>-</div><div class='del'>-err_up:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='add'>+err_put:</div><div class='add'>+	if (pd)</div><div class='add'>+		put_pd_read(pd);</div><div class='add'>+	if (scq)</div><div class='add'>+		put_cq_read(scq);</div><div class='add'>+	if (rcq)</div><div class='add'>+		put_cq_read(rcq);</div><div class='add'>+	if (srq)</div><div class='add'>+		put_srq_read(srq);</div><div class='add'>+</div><div class='add'>+	put_uobj_write(&amp;obj-&gt;uevent.uobject);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1018,15 +1180,15 @@ ssize_t ib_uverbs_query_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (qp &amp;&amp; qp-&gt;uobject-&gt;context == file-&gt;ucontext)</div><div class='del'>-		ret = ib_query_qp(qp, attr, cmd.attr_mask, init_attr);</div><div class='del'>-	else</div><div class='add'>+	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!qp) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	ret = ib_query_qp(qp, attr, cmd.attr_mask, init_attr);</div><div class='add'>+</div><div class='add'>+	put_qp_read(qp);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1113,10 +1275,8 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (!qp || qp-&gt;uobject-&gt;context != file-&gt;ucontext) {</div><div class='add'>+	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!qp) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1168,13 +1328,15 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file,</div><div class='ctx'> 	attr-&gt;alt_ah_attr.port_num 	    = cmd.alt_dest.port_num;</div><div class='ctx'> </div><div class='ctx'> 	ret = ib_modify_qp(qp, attr, cmd.attr_mask);</div><div class='add'>+</div><div class='add'>+	put_qp_read(qp);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = in_len;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='ctx'> 	kfree(attr);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1186,8 +1348,9 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_destroy_qp      cmd;</div><div class='ctx'> 	struct ib_uverbs_destroy_qp_resp resp;</div><div class='add'>+	struct ib_uobject		*uobj;</div><div class='ctx'> 	struct ib_qp               	*qp;</div><div class='del'>-	struct ib_uqp_object        	*uobj;</div><div class='add'>+	struct ib_uqp_object        	*obj;</div><div class='ctx'> 	int                        	 ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='hunk'>@@ -1195,43 +1358,43 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;resp, 0, sizeof resp);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (!qp || qp-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	uobj = container_of(qp-&gt;uobject, struct ib_uqp_object, uevent.uobject);</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_qp_idr, cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	qp  = uobj-&gt;object;</div><div class='add'>+	obj = container_of(uobj, struct ib_uqp_object, uevent.uobject);</div><div class='ctx'> </div><div class='del'>-	if (!list_empty(&amp;uobj-&gt;mcast_list)) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+	if (!list_empty(&amp;obj-&gt;mcast_list)) {</div><div class='add'>+		put_uobj_write(uobj);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ib_destroy_qp(qp);</div><div class='add'>+	if (!ret)</div><div class='add'>+		uobj-&gt;live = 0;</div><div class='add'>+</div><div class='add'>+	put_uobj_write(uobj);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_qp_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_del(&amp;uobj-&gt;uevent.uobject.list);</div><div class='add'>+	list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ib_uverbs_release_uevent(file, &amp;uobj-&gt;uevent);</div><div class='add'>+	ib_uverbs_release_uevent(file, &amp;obj-&gt;uevent);</div><div class='ctx'> </div><div class='del'>-	resp.events_reported = uobj-&gt;uevent.events_reported;</div><div class='add'>+	resp.events_reported = obj-&gt;uevent.events_reported;</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='add'>+	put_uobj(uobj);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp))</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	return ret ? ret : in_len;</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -1244,6 +1407,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 	struct ib_send_wr              *wr = NULL, *last, *next, *bad_wr;</div><div class='ctx'> 	struct ib_qp                   *qp;</div><div class='ctx'> 	int                             i, sg_ind;</div><div class='add'>+	int				is_ud;</div><div class='ctx'> 	ssize_t                         ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='hunk'>@@ -1260,12 +1424,11 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (!user_wr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (!qp || qp-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='add'>+	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!qp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	is_ud = qp-&gt;qp_type == IB_QPT_UD;</div><div class='ctx'> 	sg_ind = 0;</div><div class='ctx'> 	last = NULL;</div><div class='ctx'> 	for (i = 0; i &lt; cmd.wr_count; ++i) {</div><div class='hunk'>@@ -1273,12 +1436,12 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 				   buf + sizeof cmd + i * cmd.wqe_size,</div><div class='ctx'> 				   cmd.wqe_size)) {</div><div class='ctx'> 			ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_put;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (user_wr-&gt;num_sge + sg_ind &gt; cmd.sge_count) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_put;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		next = kmalloc(ALIGN(sizeof *next, sizeof (struct ib_sge)) +</div><div class='hunk'>@@ -1286,7 +1449,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 		if (!next) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_put;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!last)</div><div class='hunk'>@@ -1302,12 +1465,12 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 		next-&gt;send_flags = user_wr-&gt;send_flags;</div><div class='ctx'> 		next-&gt;imm_data   = (__be32 __force) user_wr-&gt;imm_data;</div><div class='ctx'> </div><div class='del'>-		if (qp-&gt;qp_type == IB_QPT_UD) {</div><div class='del'>-			next-&gt;wr.ud.ah = idr_find(&amp;ib_uverbs_ah_idr,</div><div class='del'>-						  user_wr-&gt;wr.ud.ah);</div><div class='add'>+		if (is_ud) {</div><div class='add'>+			next-&gt;wr.ud.ah = idr_read_ah(user_wr-&gt;wr.ud.ah,</div><div class='add'>+						     file-&gt;ucontext);</div><div class='ctx'> 			if (!next-&gt;wr.ud.ah) {</div><div class='ctx'> 				ret = -EINVAL;</div><div class='del'>-				goto out;</div><div class='add'>+				goto out_put;</div><div class='ctx'> 			}</div><div class='ctx'> 			next-&gt;wr.ud.remote_qpn  = user_wr-&gt;wr.ud.remote_qpn;</div><div class='ctx'> 			next-&gt;wr.ud.remote_qkey = user_wr-&gt;wr.ud.remote_qkey;</div><div class='hunk'>@@ -1344,7 +1507,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 					   sg_ind * sizeof (struct ib_sge),</div><div class='ctx'> 					   next-&gt;num_sge * sizeof (struct ib_sge))) {</div><div class='ctx'> 				ret = -EFAULT;</div><div class='del'>-				goto out;</div><div class='add'>+				goto out_put;</div><div class='ctx'> 			}</div><div class='ctx'> 			sg_ind += next-&gt;num_sge;</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -1364,15 +1527,18 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,</div><div class='ctx'> 			 &amp;resp, sizeof resp))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+out_put:</div><div class='add'>+	put_qp_read(qp);</div><div class='ctx'> </div><div class='ctx'> 	while (wr) {</div><div class='add'>+		if (is_ud &amp;&amp; wr-&gt;wr.ud.ah)</div><div class='add'>+			put_ah_read(wr-&gt;wr.ud.ah);</div><div class='ctx'> 		next = wr-&gt;next;</div><div class='ctx'> 		kfree(wr);</div><div class='ctx'> 		wr = next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	kfree(user_wr);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='hunk'>@@ -1482,14 +1648,15 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (IS_ERR(wr))</div><div class='ctx'> 		return PTR_ERR(wr);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (!qp || qp-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='add'>+	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!qp)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	resp.bad_wr = 0;</div><div class='ctx'> 	ret = qp-&gt;device-&gt;post_recv(qp, wr, &amp;bad_wr);</div><div class='add'>+</div><div class='add'>+	put_qp_read(qp);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		for (next = wr; next; next = next-&gt;next) {</div><div class='ctx'> 			++resp.bad_wr;</div><div class='hunk'>@@ -1503,8 +1670,6 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='ctx'> 	while (wr) {</div><div class='ctx'> 		next = wr-&gt;next;</div><div class='ctx'> 		kfree(wr);</div><div class='hunk'>@@ -1533,14 +1698,15 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (IS_ERR(wr))</div><div class='ctx'> 		return PTR_ERR(wr);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	srq = idr_find(&amp;ib_uverbs_srq_idr, cmd.srq_handle);</div><div class='del'>-	if (!srq || srq-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='add'>+	srq = idr_read_srq(cmd.srq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!srq)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	resp.bad_wr = 0;</div><div class='ctx'> 	ret = srq-&gt;device-&gt;post_srq_recv(srq, wr, &amp;bad_wr);</div><div class='add'>+</div><div class='add'>+	put_srq_read(srq);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		for (next = wr; next; next = next-&gt;next) {</div><div class='ctx'> 			++resp.bad_wr;</div><div class='hunk'>@@ -1554,8 +1720,6 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='ctx'> 	while (wr) {</div><div class='ctx'> 		next = wr-&gt;next;</div><div class='ctx'> 		kfree(wr);</div><div class='hunk'>@@ -1587,17 +1751,15 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (!uobj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	init_uobj(uobj, cmd.user_handle, file-&gt;ucontext);</div><div class='add'>+	down_write(&amp;uobj-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	pd = idr_find(&amp;ib_uverbs_pd_idr, cmd.pd_handle);</div><div class='del'>-	if (!pd || pd-&gt;uobject-&gt;context != file-&gt;ucontext) {</div><div class='add'>+	pd = idr_read_pd(cmd.pd_handle, file-&gt;ucontext);</div><div class='add'>+	if (!pd) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uobj-&gt;user_handle = cmd.user_handle;</div><div class='del'>-	uobj-&gt;context     = file-&gt;ucontext;</div><div class='del'>-</div><div class='ctx'> 	attr.dlid 	       = cmd.attr.dlid;</div><div class='ctx'> 	attr.sl 	       = cmd.attr.sl;</div><div class='ctx'> 	attr.src_path_bits     = cmd.attr.src_path_bits;</div><div class='hunk'>@@ -1613,21 +1775,13 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,</div><div class='ctx'> 	ah = ib_create_ah(pd, &amp;attr);</div><div class='ctx'> 	if (IS_ERR(ah)) {</div><div class='ctx'> 		ret = PTR_ERR(ah);</div><div class='del'>-		goto err_up;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ah-&gt;uobject = uobj;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	if (!idr_pre_get(&amp;ib_uverbs_ah_idr, GFP_KERNEL)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_destroy;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = idr_get_new(&amp;ib_uverbs_ah_idr, ah, &amp;uobj-&gt;id);</div><div class='add'>+	ah-&gt;uobject  = uobj;</div><div class='add'>+	uobj-&gt;object = ah;</div><div class='ctx'> </div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		goto retry;</div><div class='add'>+	ret = idr_add_uobj(&amp;ib_uverbs_ah_idr, uobj);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_destroy;</div><div class='ctx'> </div><div class='hunk'>@@ -1636,27 +1790,29 @@ retry:</div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp)) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_idr;</div><div class='add'>+		goto err_copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	put_pd_read(pd);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='ctx'> 	list_add_tail(&amp;uobj-&gt;list, &amp;file-&gt;ucontext-&gt;ah_list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	uobj-&gt;live = 1;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;uobj-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return in_len;</div><div class='ctx'> </div><div class='del'>-err_idr:</div><div class='del'>-	idr_remove(&amp;ib_uverbs_ah_idr, uobj-&gt;id);</div><div class='add'>+err_copy:</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_ah_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> err_destroy:</div><div class='ctx'> 	ib_destroy_ah(ah);</div><div class='ctx'> </div><div class='del'>-err_up:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	kfree(uobj);</div><div class='add'>+err:</div><div class='add'>+	put_uobj_write(uobj);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1666,35 +1822,34 @@ ssize_t ib_uverbs_destroy_ah(struct ib_uverbs_file *file,</div><div class='ctx'> 	struct ib_uverbs_destroy_ah cmd;</div><div class='ctx'> 	struct ib_ah		   *ah;</div><div class='ctx'> 	struct ib_uobject	   *uobj;</div><div class='del'>-	int			    ret = -EINVAL;</div><div class='add'>+	int			    ret;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_ah_idr, cmd.ah_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ah = uobj-&gt;object;</div><div class='ctx'> </div><div class='del'>-	ah = idr_find(&amp;ib_uverbs_ah_idr, cmd.ah_handle);</div><div class='del'>-	if (!ah || ah-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	ret = ib_destroy_ah(ah);</div><div class='add'>+	if (!ret)</div><div class='add'>+		uobj-&gt;live = 0;</div><div class='ctx'> </div><div class='del'>-	uobj = ah-&gt;uobject;</div><div class='add'>+	put_uobj_write(uobj);</div><div class='ctx'> </div><div class='del'>-	ret = ib_destroy_ah(ah);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ib_uverbs_ah_idr, cmd.ah_handle);</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_ah_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='ctx'> 	list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='add'>+	put_uobj(uobj);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	return ret ? ret : in_len;</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -1703,47 +1858,43 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_attach_mcast cmd;</div><div class='ctx'> 	struct ib_qp                 *qp;</div><div class='del'>-	struct ib_uqp_object         *uobj;</div><div class='add'>+	struct ib_uqp_object         *obj;</div><div class='ctx'> 	struct ib_uverbs_mcast_entry *mcast;</div><div class='del'>-	int                           ret = -EINVAL;</div><div class='add'>+	int                           ret;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (!qp || qp-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!qp)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	uobj = container_of(qp-&gt;uobject, struct ib_uqp_object, uevent.uobject);</div><div class='add'>+	obj = container_of(qp-&gt;uobject, struct ib_uqp_object, uevent.uobject);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(mcast, &amp;uobj-&gt;mcast_list, list)</div><div class='add'>+	list_for_each_entry(mcast, &amp;obj-&gt;mcast_list, list)</div><div class='ctx'> 		if (cmd.mlid == mcast-&gt;lid &amp;&amp;</div><div class='ctx'> 		    !memcmp(cmd.gid, mcast-&gt;gid.raw, sizeof mcast-&gt;gid.raw)) {</div><div class='ctx'> 			ret = 0;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_put;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	mcast = kmalloc(sizeof *mcast, GFP_KERNEL);</div><div class='ctx'> 	if (!mcast) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mcast-&gt;lid = cmd.mlid;</div><div class='ctx'> 	memcpy(mcast-&gt;gid.raw, cmd.gid, sizeof mcast-&gt;gid.raw);</div><div class='ctx'> </div><div class='ctx'> 	ret = ib_attach_mcast(qp, &amp;mcast-&gt;gid, cmd.mlid);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		uobj = container_of(qp-&gt;uobject, struct ib_uqp_object,</div><div class='del'>-				    uevent.uobject);</div><div class='del'>-		list_add_tail(&amp;mcast-&gt;list, &amp;uobj-&gt;mcast_list);</div><div class='del'>-	} else</div><div class='add'>+	if (!ret)</div><div class='add'>+		list_add_tail(&amp;mcast-&gt;list, &amp;obj-&gt;mcast_list);</div><div class='add'>+	else</div><div class='ctx'> 		kfree(mcast);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+out_put:</div><div class='add'>+	put_qp_read(qp);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -1753,7 +1904,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 			       int out_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_detach_mcast cmd;</div><div class='del'>-	struct ib_uqp_object         *uobj;</div><div class='add'>+	struct ib_uqp_object         *obj;</div><div class='ctx'> 	struct ib_qp                 *qp;</div><div class='ctx'> 	struct ib_uverbs_mcast_entry *mcast;</div><div class='ctx'> 	int                           ret = -EINVAL;</div><div class='hunk'>@@ -1761,19 +1912,17 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	qp = idr_find(&amp;ib_uverbs_qp_idr, cmd.qp_handle);</div><div class='del'>-	if (!qp || qp-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	qp = idr_read_qp(cmd.qp_handle, file-&gt;ucontext);</div><div class='add'>+	if (!qp)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ret = ib_detach_mcast(qp, (union ib_gid *) cmd.gid, cmd.mlid);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_put;</div><div class='ctx'> </div><div class='del'>-	uobj = container_of(qp-&gt;uobject, struct ib_uqp_object, uevent.uobject);</div><div class='add'>+	obj = container_of(qp-&gt;uobject, struct ib_uqp_object, uevent.uobject);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(mcast, &amp;uobj-&gt;mcast_list, list)</div><div class='add'>+	list_for_each_entry(mcast, &amp;obj-&gt;mcast_list, list)</div><div class='ctx'> 		if (cmd.mlid == mcast-&gt;lid &amp;&amp;</div><div class='ctx'> 		    !memcmp(cmd.gid, mcast-&gt;gid.raw, sizeof mcast-&gt;gid.raw)) {</div><div class='ctx'> 			list_del(&amp;mcast-&gt;list);</div><div class='hunk'>@@ -1781,8 +1930,8 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+out_put:</div><div class='add'>+	put_qp_read(qp);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -1794,7 +1943,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,</div><div class='ctx'> 	struct ib_uverbs_create_srq      cmd;</div><div class='ctx'> 	struct ib_uverbs_create_srq_resp resp;</div><div class='ctx'> 	struct ib_udata                  udata;</div><div class='del'>-	struct ib_uevent_object         *uobj;</div><div class='add'>+	struct ib_uevent_object         *obj;</div><div class='ctx'> 	struct ib_pd                    *pd;</div><div class='ctx'> 	struct ib_srq                   *srq;</div><div class='ctx'> 	struct ib_srq_init_attr          attr;</div><div class='hunk'>@@ -1810,17 +1959,17 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,</div><div class='ctx'> 		   (unsigned long) cmd.response + sizeof resp,</div><div class='ctx'> 		   in_len - sizeof cmd, out_len - sizeof resp);</div><div class='ctx'> </div><div class='del'>-	uobj = kmalloc(sizeof *uobj, GFP_KERNEL);</div><div class='del'>-	if (!uobj)</div><div class='add'>+	obj = kmalloc(sizeof *obj, GFP_KERNEL);</div><div class='add'>+	if (!obj)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	init_uobj(&amp;obj-&gt;uobject, cmd.user_handle, file-&gt;ucontext);</div><div class='add'>+	down_write(&amp;obj-&gt;uobject.mutex);</div><div class='ctx'> </div><div class='del'>-	pd  = idr_find(&amp;ib_uverbs_pd_idr, cmd.pd_handle);</div><div class='del'>-</div><div class='del'>-	if (!pd || pd-&gt;uobject-&gt;context != file-&gt;ucontext) {</div><div class='add'>+	pd  = idr_read_pd(cmd.pd_handle, file-&gt;ucontext);</div><div class='add'>+	if (!pd) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	attr.event_handler  = ib_uverbs_srq_event_handler;</div><div class='hunk'>@@ -1829,69 +1978,59 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,</div><div class='ctx'> 	attr.attr.max_sge   = cmd.max_sge;</div><div class='ctx'> 	attr.attr.srq_limit = cmd.srq_limit;</div><div class='ctx'> </div><div class='del'>-	uobj-&gt;uobject.user_handle = cmd.user_handle;</div><div class='del'>-	uobj-&gt;uobject.context     = file-&gt;ucontext;</div><div class='del'>-	uobj-&gt;events_reported     = 0;</div><div class='del'>-	INIT_LIST_HEAD(&amp;uobj-&gt;event_list);</div><div class='add'>+	obj-&gt;events_reported     = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;obj-&gt;event_list);</div><div class='ctx'> </div><div class='ctx'> 	srq = pd-&gt;device-&gt;create_srq(pd, &amp;attr, &amp;udata);</div><div class='ctx'> 	if (IS_ERR(srq)) {</div><div class='ctx'> 		ret = PTR_ERR(srq);</div><div class='del'>-		goto err_up;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	srq-&gt;device    	   = pd-&gt;device;</div><div class='ctx'> 	srq-&gt;pd        	   = pd;</div><div class='del'>-	srq-&gt;uobject       = &amp;uobj-&gt;uobject;</div><div class='add'>+	srq-&gt;uobject       = &amp;obj-&gt;uobject;</div><div class='ctx'> 	srq-&gt;event_handler = attr.event_handler;</div><div class='ctx'> 	srq-&gt;srq_context   = attr.srq_context;</div><div class='ctx'> 	atomic_inc(&amp;pd-&gt;usecnt);</div><div class='ctx'> 	atomic_set(&amp;srq-&gt;usecnt, 0);</div><div class='ctx'> </div><div class='del'>-	memset(&amp;resp, 0, sizeof resp);</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	if (!idr_pre_get(&amp;ib_uverbs_srq_idr, GFP_KERNEL)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_destroy;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = idr_get_new(&amp;ib_uverbs_srq_idr, srq, &amp;uobj-&gt;uobject.id);</div><div class='del'>-</div><div class='del'>-	if (ret == -EAGAIN)</div><div class='del'>-		goto retry;</div><div class='add'>+	obj-&gt;uobject.object = srq;</div><div class='add'>+	ret = idr_add_uobj(&amp;ib_uverbs_srq_idr, &amp;obj-&gt;uobject);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_destroy;</div><div class='ctx'> </div><div class='del'>-	resp.srq_handle = uobj-&gt;uobject.id;</div><div class='add'>+	memset(&amp;resp, 0, sizeof resp);</div><div class='add'>+	resp.srq_handle = obj-&gt;uobject.id;</div><div class='ctx'> 	resp.max_wr     = attr.attr.max_wr;</div><div class='ctx'> 	resp.max_sge    = attr.attr.max_sge;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp)) {</div><div class='ctx'> 		ret = -EFAULT;</div><div class='del'>-		goto err_idr;</div><div class='add'>+		goto err_copy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	put_pd_read(pd);</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_add_tail(&amp;uobj-&gt;uobject.list, &amp;file-&gt;ucontext-&gt;srq_list);</div><div class='add'>+	list_add_tail(&amp;obj-&gt;uobject.list, &amp;file-&gt;ucontext-&gt;srq_list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	obj-&gt;uobject.live = 1;</div><div class='add'>+</div><div class='add'>+	up_write(&amp;obj-&gt;uobject.mutex);</div><div class='ctx'> </div><div class='ctx'> 	return in_len;</div><div class='ctx'> </div><div class='del'>-err_idr:</div><div class='del'>-	idr_remove(&amp;ib_uverbs_srq_idr, uobj-&gt;uobject.id);</div><div class='add'>+err_copy:</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_srq_idr, &amp;obj-&gt;uobject);</div><div class='ctx'> </div><div class='ctx'> err_destroy:</div><div class='ctx'> 	ib_destroy_srq(srq);</div><div class='del'>-	atomic_dec(&amp;pd-&gt;usecnt);</div><div class='del'>-</div><div class='del'>-err_up:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='add'>+err:</div><div class='add'>+	put_uobj_write(&amp;obj-&gt;uobject);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1907,21 +2046,16 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	srq = idr_find(&amp;ib_uverbs_srq_idr, cmd.srq_handle);</div><div class='del'>-	if (!srq || srq-&gt;uobject-&gt;context != file-&gt;ucontext) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	srq = idr_read_srq(cmd.srq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!srq)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	attr.max_wr    = cmd.max_wr;</div><div class='ctx'> 	attr.srq_limit = cmd.srq_limit;</div><div class='ctx'> </div><div class='ctx'> 	ret = ib_modify_srq(srq, &amp;attr, cmd.attr_mask);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	put_srq_read(srq);</div><div class='ctx'> </div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='hunk'>@@ -1942,18 +2076,16 @@ ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	srq = idr_read_srq(cmd.srq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!srq)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	srq = idr_find(&amp;ib_uverbs_srq_idr, cmd.srq_handle);</div><div class='del'>-	if (srq &amp;&amp; srq-&gt;uobject-&gt;context == file-&gt;ucontext)</div><div class='del'>-		ret = ib_query_srq(srq, &amp;attr);</div><div class='del'>-	else</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	ret = ib_query_srq(srq, &amp;attr);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='add'>+	put_srq_read(srq);</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;resp, 0, sizeof resp);</div><div class='ctx'> </div><div class='hunk'>@@ -1963,10 +2095,9 @@ ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file,</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp))</div><div class='del'>-		ret = -EFAULT;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return ret ? ret : in_len;</div><div class='add'>+	return in_len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,</div><div class='hunk'>@@ -1975,45 +2106,45 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_uverbs_destroy_srq      cmd;</div><div class='ctx'> 	struct ib_uverbs_destroy_srq_resp resp;</div><div class='add'>+	struct ib_uobject		 *uobj;</div><div class='ctx'> 	struct ib_srq               	 *srq;</div><div class='del'>-	struct ib_uevent_object        	 *uobj;</div><div class='add'>+	struct ib_uevent_object        	 *obj;</div><div class='ctx'> 	int                         	  ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;cmd, buf, sizeof cmd))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='del'>-	memset(&amp;resp, 0, sizeof resp);</div><div class='add'>+	uobj = idr_write_uobj(&amp;ib_uverbs_srq_idr, cmd.srq_handle, file-&gt;ucontext);</div><div class='add'>+	if (!uobj)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	srq = uobj-&gt;object;</div><div class='add'>+	obj = container_of(uobj, struct ib_uevent_object, uobject);</div><div class='ctx'> </div><div class='del'>-	srq = idr_find(&amp;ib_uverbs_srq_idr, cmd.srq_handle);</div><div class='del'>-	if (!srq || srq-&gt;uobject-&gt;context != file-&gt;ucontext)</div><div class='del'>-		goto out;</div><div class='add'>+	ret = ib_destroy_srq(srq);</div><div class='add'>+	if (!ret)</div><div class='add'>+		uobj-&gt;live = 0;</div><div class='ctx'> </div><div class='del'>-	uobj = container_of(srq-&gt;uobject, struct ib_uevent_object, uobject);</div><div class='add'>+	put_uobj_write(uobj);</div><div class='ctx'> </div><div class='del'>-	ret = ib_destroy_srq(srq);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	idr_remove(&amp;ib_uverbs_srq_idr, cmd.srq_handle);</div><div class='add'>+	idr_remove_uobj(&amp;ib_uverbs_srq_idr, uobj);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;file-&gt;mutex);</div><div class='del'>-	list_del(&amp;uobj-&gt;uobject.list);</div><div class='add'>+	list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 	mutex_unlock(&amp;file-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	ib_uverbs_release_uevent(file, uobj);</div><div class='add'>+	ib_uverbs_release_uevent(file, obj);</div><div class='ctx'> </div><div class='del'>-	resp.events_reported = uobj-&gt;events_reported;</div><div class='add'>+	memset(&amp;resp, 0, sizeof resp);</div><div class='add'>+	resp.events_reported = obj-&gt;events_reported;</div><div class='ctx'> </div><div class='del'>-	kfree(uobj);</div><div class='add'>+	put_uobj(uobj);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user((void __user *) (unsigned long) cmd.response,</div><div class='ctx'> 			 &amp;resp, sizeof resp))</div><div class='ctx'> 		ret = -EFAULT;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='ctx'> 	return ret ? ret : in_len;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c<br/>index ff092a0a94da..e725cccc7cde 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/uverbs_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/uverbs_main.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> static struct class *uverbs_class;</div><div class='ctx'> </div><div class='del'>-DEFINE_MUTEX(ib_uverbs_idr_mutex);</div><div class='add'>+DEFINE_SPINLOCK(ib_uverbs_idr_lock);</div><div class='ctx'> DEFINE_IDR(ib_uverbs_pd_idr);</div><div class='ctx'> DEFINE_IDR(ib_uverbs_mr_idr);</div><div class='ctx'> DEFINE_IDR(ib_uverbs_mw_idr);</div><div class='hunk'>@@ -183,47 +183,45 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,</div><div class='ctx'> 	if (!context)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry_safe(uobj, tmp, &amp;context-&gt;ah_list, list) {</div><div class='del'>-		struct ib_ah *ah = idr_find(&amp;ib_uverbs_ah_idr, uobj-&gt;id);</div><div class='del'>-		idr_remove(&amp;ib_uverbs_ah_idr, uobj-&gt;id);</div><div class='add'>+		struct ib_ah *ah = uobj-&gt;object;</div><div class='add'>+</div><div class='add'>+		idr_remove_uobj(&amp;ib_uverbs_ah_idr, uobj);</div><div class='ctx'> 		ib_destroy_ah(ah);</div><div class='del'>-		list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 		kfree(uobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(uobj, tmp, &amp;context-&gt;qp_list, list) {</div><div class='del'>-		struct ib_qp *qp = idr_find(&amp;ib_uverbs_qp_idr, uobj-&gt;id);</div><div class='add'>+		struct ib_qp *qp = uobj-&gt;object;</div><div class='ctx'> 		struct ib_uqp_object *uqp =</div><div class='ctx'> 			container_of(uobj, struct ib_uqp_object, uevent.uobject);</div><div class='del'>-		idr_remove(&amp;ib_uverbs_qp_idr, uobj-&gt;id);</div><div class='add'>+</div><div class='add'>+		idr_remove_uobj(&amp;ib_uverbs_qp_idr, uobj);</div><div class='ctx'> 		ib_uverbs_detach_umcast(qp, uqp);</div><div class='ctx'> 		ib_destroy_qp(qp);</div><div class='del'>-		list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 		ib_uverbs_release_uevent(file, &amp;uqp-&gt;uevent);</div><div class='ctx'> 		kfree(uqp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(uobj, tmp, &amp;context-&gt;cq_list, list) {</div><div class='del'>-		struct ib_cq *cq = idr_find(&amp;ib_uverbs_cq_idr, uobj-&gt;id);</div><div class='add'>+		struct ib_cq *cq = uobj-&gt;object;</div><div class='ctx'> 		struct ib_uverbs_event_file *ev_file = cq-&gt;cq_context;</div><div class='ctx'> 		struct ib_ucq_object *ucq =</div><div class='ctx'> 			container_of(uobj, struct ib_ucq_object, uobject);</div><div class='del'>-		idr_remove(&amp;ib_uverbs_cq_idr, uobj-&gt;id);</div><div class='add'>+</div><div class='add'>+		idr_remove_uobj(&amp;ib_uverbs_cq_idr, uobj);</div><div class='ctx'> 		ib_destroy_cq(cq);</div><div class='del'>-		list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 		ib_uverbs_release_ucq(file, ev_file, ucq);</div><div class='ctx'> 		kfree(ucq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(uobj, tmp, &amp;context-&gt;srq_list, list) {</div><div class='del'>-		struct ib_srq *srq = idr_find(&amp;ib_uverbs_srq_idr, uobj-&gt;id);</div><div class='add'>+		struct ib_srq *srq = uobj-&gt;object;</div><div class='ctx'> 		struct ib_uevent_object *uevent =</div><div class='ctx'> 			container_of(uobj, struct ib_uevent_object, uobject);</div><div class='del'>-		idr_remove(&amp;ib_uverbs_srq_idr, uobj-&gt;id);</div><div class='add'>+</div><div class='add'>+		idr_remove_uobj(&amp;ib_uverbs_srq_idr, uobj);</div><div class='ctx'> 		ib_destroy_srq(srq);</div><div class='del'>-		list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 		ib_uverbs_release_uevent(file, uevent);</div><div class='ctx'> 		kfree(uevent);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -231,30 +229,27 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,</div><div class='ctx'> 	/* XXX Free MWs */</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(uobj, tmp, &amp;context-&gt;mr_list, list) {</div><div class='del'>-		struct ib_mr *mr = idr_find(&amp;ib_uverbs_mr_idr, uobj-&gt;id);</div><div class='add'>+		struct ib_mr *mr = uobj-&gt;object;</div><div class='ctx'> 		struct ib_device *mrdev = mr-&gt;device;</div><div class='ctx'> 		struct ib_umem_object *memobj;</div><div class='ctx'> </div><div class='del'>-		idr_remove(&amp;ib_uverbs_mr_idr, uobj-&gt;id);</div><div class='add'>+		idr_remove_uobj(&amp;ib_uverbs_mr_idr, uobj);</div><div class='ctx'> 		ib_dereg_mr(mr);</div><div class='ctx'> </div><div class='ctx'> 		memobj = container_of(uobj, struct ib_umem_object, uobject);</div><div class='ctx'> 		ib_umem_release_on_close(mrdev, &amp;memobj-&gt;umem);</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 		kfree(memobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(uobj, tmp, &amp;context-&gt;pd_list, list) {</div><div class='del'>-		struct ib_pd *pd = idr_find(&amp;ib_uverbs_pd_idr, uobj-&gt;id);</div><div class='del'>-		idr_remove(&amp;ib_uverbs_pd_idr, uobj-&gt;id);</div><div class='add'>+		struct ib_pd *pd = uobj-&gt;object;</div><div class='add'>+</div><div class='add'>+		idr_remove_uobj(&amp;ib_uverbs_pd_idr, uobj);</div><div class='ctx'> 		ib_dealloc_pd(pd);</div><div class='del'>-		list_del(&amp;uobj-&gt;list);</div><div class='ctx'> 		kfree(uobj);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ib_uverbs_idr_mutex);</div><div class='del'>-</div><div class='ctx'> 	return context-&gt;device-&gt;dealloc_ucontext(context);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -820,11 +815,12 @@ static void ib_uverbs_remove_one(struct ib_device *device)</div><div class='ctx'> 	kref_put(&amp;uverbs_dev-&gt;ref, ib_uverbs_release_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *uverbs_event_get_sb(struct file_system_type *fs_type, int flags,</div><div class='del'>-					       const char *dev_name, void *data)</div><div class='add'>+static int uverbs_event_get_sb(struct file_system_type *fs_type, int flags,</div><div class='add'>+			       const char *dev_name, void *data,</div><div class='add'>+			       struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	return get_sb_pseudo(fs_type, "infinibandevent:", NULL,</div><div class='del'>-			     INFINIBANDEVENTFS_MAGIC);</div><div class='add'>+			     INFINIBANDEVENTFS_MAGIC, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type uverbs_event_fs = {</div><div class='head'>diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c<br/>new file mode 100644<br/>index 000000000000..ce46b13ae02b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/uverbs_marshall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/uverbs_marshall.c</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2005 Intel Corporation.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions of source code must retain the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions in binary form must reproduce the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer in the documentation and/or other materials</div><div class='add'>+ *        provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;rdma/ib_marshall.h&gt;</div><div class='add'>+</div><div class='add'>+static void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,</div><div class='add'>+				    struct ib_ah_attr *src)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst-&gt;grh.dgid, src-&gt;grh.dgid.raw, sizeof src-&gt;grh.dgid);</div><div class='add'>+	dst-&gt;grh.flow_label        = src-&gt;grh.flow_label;</div><div class='add'>+	dst-&gt;grh.sgid_index        = src-&gt;grh.sgid_index;</div><div class='add'>+	dst-&gt;grh.hop_limit         = src-&gt;grh.hop_limit;</div><div class='add'>+	dst-&gt;grh.traffic_class     = src-&gt;grh.traffic_class;</div><div class='add'>+	dst-&gt;dlid 	    	   = src-&gt;dlid;</div><div class='add'>+	dst-&gt;sl   	    	   = src-&gt;sl;</div><div class='add'>+	dst-&gt;src_path_bits 	   = src-&gt;src_path_bits;</div><div class='add'>+	dst-&gt;static_rate   	   = src-&gt;static_rate;</div><div class='add'>+	dst-&gt;is_global             = src-&gt;ah_flags &amp; IB_AH_GRH ? 1 : 0;</div><div class='add'>+	dst-&gt;port_num 	    	   = src-&gt;port_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,</div><div class='add'>+			     struct ib_qp_attr *src)</div><div class='add'>+{</div><div class='add'>+	dst-&gt;cur_qp_state	= src-&gt;cur_qp_state;</div><div class='add'>+	dst-&gt;path_mtu		= src-&gt;path_mtu;</div><div class='add'>+	dst-&gt;path_mig_state	= src-&gt;path_mig_state;</div><div class='add'>+	dst-&gt;qkey		= src-&gt;qkey;</div><div class='add'>+	dst-&gt;rq_psn		= src-&gt;rq_psn;</div><div class='add'>+	dst-&gt;sq_psn		= src-&gt;sq_psn;</div><div class='add'>+	dst-&gt;dest_qp_num	= src-&gt;dest_qp_num;</div><div class='add'>+	dst-&gt;qp_access_flags	= src-&gt;qp_access_flags;</div><div class='add'>+</div><div class='add'>+	dst-&gt;max_send_wr	= src-&gt;cap.max_send_wr;</div><div class='add'>+	dst-&gt;max_recv_wr	= src-&gt;cap.max_recv_wr;</div><div class='add'>+	dst-&gt;max_send_sge	= src-&gt;cap.max_send_sge;</div><div class='add'>+	dst-&gt;max_recv_sge	= src-&gt;cap.max_recv_sge;</div><div class='add'>+	dst-&gt;max_inline_data	= src-&gt;cap.max_inline_data;</div><div class='add'>+</div><div class='add'>+	ib_copy_ah_attr_to_user(&amp;dst-&gt;ah_attr, &amp;src-&gt;ah_attr);</div><div class='add'>+	ib_copy_ah_attr_to_user(&amp;dst-&gt;alt_ah_attr, &amp;src-&gt;alt_ah_attr);</div><div class='add'>+</div><div class='add'>+	dst-&gt;pkey_index		= src-&gt;pkey_index;</div><div class='add'>+	dst-&gt;alt_pkey_index	= src-&gt;alt_pkey_index;</div><div class='add'>+	dst-&gt;en_sqd_async_notify = src-&gt;en_sqd_async_notify;</div><div class='add'>+	dst-&gt;sq_draining	= src-&gt;sq_draining;</div><div class='add'>+	dst-&gt;max_rd_atomic	= src-&gt;max_rd_atomic;</div><div class='add'>+	dst-&gt;max_dest_rd_atomic	= src-&gt;max_dest_rd_atomic;</div><div class='add'>+	dst-&gt;min_rnr_timer	= src-&gt;min_rnr_timer;</div><div class='add'>+	dst-&gt;port_num		= src-&gt;port_num;</div><div class='add'>+	dst-&gt;timeout		= src-&gt;timeout;</div><div class='add'>+	dst-&gt;retry_cnt		= src-&gt;retry_cnt;</div><div class='add'>+	dst-&gt;rnr_retry		= src-&gt;rnr_retry;</div><div class='add'>+	dst-&gt;alt_port_num	= src-&gt;alt_port_num;</div><div class='add'>+	dst-&gt;alt_timeout	= src-&gt;alt_timeout;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ib_copy_qp_attr_to_user);</div><div class='add'>+</div><div class='add'>+void ib_copy_path_rec_to_user(struct ib_user_path_rec *dst,</div><div class='add'>+			      struct ib_sa_path_rec *src)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst-&gt;dgid, src-&gt;dgid.raw, sizeof src-&gt;dgid);</div><div class='add'>+	memcpy(dst-&gt;sgid, src-&gt;sgid.raw, sizeof src-&gt;sgid);</div><div class='add'>+</div><div class='add'>+	dst-&gt;dlid		= src-&gt;dlid;</div><div class='add'>+	dst-&gt;slid		= src-&gt;slid;</div><div class='add'>+	dst-&gt;raw_traffic	= src-&gt;raw_traffic;</div><div class='add'>+	dst-&gt;flow_label		= src-&gt;flow_label;</div><div class='add'>+	dst-&gt;hop_limit		= src-&gt;hop_limit;</div><div class='add'>+	dst-&gt;traffic_class	= src-&gt;traffic_class;</div><div class='add'>+	dst-&gt;reversible		= src-&gt;reversible;</div><div class='add'>+	dst-&gt;numb_path		= src-&gt;numb_path;</div><div class='add'>+	dst-&gt;pkey		= src-&gt;pkey;</div><div class='add'>+	dst-&gt;sl			= src-&gt;sl;</div><div class='add'>+	dst-&gt;mtu_selector	= src-&gt;mtu_selector;</div><div class='add'>+	dst-&gt;mtu		= src-&gt;mtu;</div><div class='add'>+	dst-&gt;rate_selector	= src-&gt;rate_selector;</div><div class='add'>+	dst-&gt;rate		= src-&gt;rate;</div><div class='add'>+	dst-&gt;packet_life_time	= src-&gt;packet_life_time;</div><div class='add'>+	dst-&gt;preference		= src-&gt;preference;</div><div class='add'>+	dst-&gt;packet_life_time_selector = src-&gt;packet_life_time_selector;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ib_copy_path_rec_to_user);</div><div class='add'>+</div><div class='add'>+void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst,</div><div class='add'>+				struct ib_user_path_rec *src)</div><div class='add'>+{</div><div class='add'>+	memcpy(dst-&gt;dgid.raw, src-&gt;dgid, sizeof dst-&gt;dgid);</div><div class='add'>+	memcpy(dst-&gt;sgid.raw, src-&gt;sgid, sizeof dst-&gt;sgid);</div><div class='add'>+</div><div class='add'>+	dst-&gt;dlid		= src-&gt;dlid;</div><div class='add'>+	dst-&gt;slid		= src-&gt;slid;</div><div class='add'>+	dst-&gt;raw_traffic	= src-&gt;raw_traffic;</div><div class='add'>+	dst-&gt;flow_label		= src-&gt;flow_label;</div><div class='add'>+	dst-&gt;hop_limit		= src-&gt;hop_limit;</div><div class='add'>+	dst-&gt;traffic_class	= src-&gt;traffic_class;</div><div class='add'>+	dst-&gt;reversible		= src-&gt;reversible;</div><div class='add'>+	dst-&gt;numb_path		= src-&gt;numb_path;</div><div class='add'>+	dst-&gt;pkey		= src-&gt;pkey;</div><div class='add'>+	dst-&gt;sl			= src-&gt;sl;</div><div class='add'>+	dst-&gt;mtu_selector	= src-&gt;mtu_selector;</div><div class='add'>+	dst-&gt;mtu		= src-&gt;mtu;</div><div class='add'>+	dst-&gt;rate_selector	= src-&gt;rate_selector;</div><div class='add'>+	dst-&gt;rate		= src-&gt;rate;</div><div class='add'>+	dst-&gt;packet_life_time	= src-&gt;packet_life_time;</div><div class='add'>+	dst-&gt;preference		= src-&gt;preference;</div><div class='add'>+	dst-&gt;packet_life_time_selector = src-&gt;packet_life_time_selector;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ib_copy_path_rec_from_user);</div><div class='head'>diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c<br/>index b78e7dc69330..468999c38803 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/core/verbs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/core/verbs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/core/verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/core/verbs.c</a></div><div class='hunk'>@@ -125,35 +125,47 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ib_create_ah);</div><div class='ctx'> </div><div class='del'>-struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,</div><div class='del'>-				   struct ib_grh *grh, u8 port_num)</div><div class='add'>+int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,</div><div class='add'>+		       struct ib_grh *grh, struct ib_ah_attr *ah_attr)</div><div class='ctx'> {</div><div class='del'>-	struct ib_ah_attr ah_attr;</div><div class='ctx'> 	u32 flow_class;</div><div class='ctx'> 	u16 gid_index;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;ah_attr, 0, sizeof ah_attr);</div><div class='del'>-	ah_attr.dlid = wc-&gt;slid;</div><div class='del'>-	ah_attr.sl = wc-&gt;sl;</div><div class='del'>-	ah_attr.src_path_bits = wc-&gt;dlid_path_bits;</div><div class='del'>-	ah_attr.port_num = port_num;</div><div class='add'>+	memset(ah_attr, 0, sizeof *ah_attr);</div><div class='add'>+	ah_attr-&gt;dlid = wc-&gt;slid;</div><div class='add'>+	ah_attr-&gt;sl = wc-&gt;sl;</div><div class='add'>+	ah_attr-&gt;src_path_bits = wc-&gt;dlid_path_bits;</div><div class='add'>+	ah_attr-&gt;port_num = port_num;</div><div class='ctx'> </div><div class='ctx'> 	if (wc-&gt;wc_flags &amp; IB_WC_GRH) {</div><div class='del'>-		ah_attr.ah_flags = IB_AH_GRH;</div><div class='del'>-		ah_attr.grh.dgid = grh-&gt;sgid;</div><div class='add'>+		ah_attr-&gt;ah_flags = IB_AH_GRH;</div><div class='add'>+		ah_attr-&gt;grh.dgid = grh-&gt;sgid;</div><div class='ctx'> </div><div class='del'>-		ret = ib_find_cached_gid(pd-&gt;device, &amp;grh-&gt;dgid, &amp;port_num,</div><div class='add'>+		ret = ib_find_cached_gid(device, &amp;grh-&gt;dgid, &amp;port_num,</div><div class='ctx'> 					 &amp;gid_index);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ERR_PTR(ret);</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		ah_attr.grh.sgid_index = (u8) gid_index;</div><div class='add'>+		ah_attr-&gt;grh.sgid_index = (u8) gid_index;</div><div class='ctx'> 		flow_class = be32_to_cpu(grh-&gt;version_tclass_flow);</div><div class='del'>-		ah_attr.grh.flow_label = flow_class &amp; 0xFFFFF;</div><div class='del'>-		ah_attr.grh.traffic_class = (flow_class &gt;&gt; 20) &amp; 0xFF;</div><div class='del'>-		ah_attr.grh.hop_limit = grh-&gt;hop_limit;</div><div class='add'>+		ah_attr-&gt;grh.flow_label = flow_class &amp; 0xFFFFF;</div><div class='add'>+		ah_attr-&gt;grh.hop_limit = grh-&gt;hop_limit;</div><div class='add'>+		ah_attr-&gt;grh.traffic_class = (flow_class &gt;&gt; 20) &amp; 0xFF;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ib_init_ah_from_wc);</div><div class='add'>+</div><div class='add'>+struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,</div><div class='add'>+				   struct ib_grh *grh, u8 port_num)</div><div class='add'>+{</div><div class='add'>+	struct ib_ah_attr ah_attr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ib_init_ah_from_wc(pd-&gt;device, port_num, wc, grh, &amp;ah_attr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	return ib_create_ah(pd, &amp;ah_attr);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig<br/>index 9ea67c409b6d..1db9489f1e82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/Kconfig</a></div><div class='hunk'>@@ -1,16 +1,16 @@</div><div class='ctx'> config IPATH_CORE</div><div class='del'>-	tristate "PathScale InfiniPath Driver"</div><div class='add'>+	tristate "QLogic InfiniPath Driver"</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI_MSI &amp;&amp; NET</div><div class='ctx'> 	---help---</div><div class='del'>-	This is a low-level driver for PathScale InfiniPath host channel</div><div class='add'>+	This is a low-level driver for QLogic InfiniPath host channel</div><div class='ctx'> 	adapters (HCAs) based on the HT-400 and PE-800 chips.</div><div class='ctx'> </div><div class='ctx'> config INFINIBAND_IPATH</div><div class='del'>-	tristate "PathScale InfiniPath Verbs Driver"</div><div class='add'>+	tristate "QLogic InfiniPath Verbs Driver"</div><div class='ctx'> 	depends on IPATH_CORE &amp;&amp; INFINIBAND</div><div class='ctx'> 	---help---</div><div class='ctx'> 	This is a driver that provides InfiniBand verbs support for</div><div class='del'>-	PathScale InfiniPath host channel adapters (HCAs).  This</div><div class='add'>+	QLogic InfiniPath host channel adapters (HCAs).  This</div><div class='ctx'> 	allows these devices to be used with both kernel upper level</div><div class='ctx'> 	protocols such as IP-over-InfiniBand as well as with userspace</div><div class='ctx'> 	applications (in conjunction with InfiniBand userspace access).</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile<br/>index b4d084abfd22..b0bf72864130 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/Makefile</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-EXTRA_CFLAGS += -DIPATH_IDSTR='"PathScale kernel.org driver"' \</div><div class='add'>+EXTRA_CFLAGS += -DIPATH_IDSTR='"QLogic kernel.org driver"' \</div><div class='ctx'> 	-DIPATH_KERN_TYPE=0</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IPATH_CORE) += ipath_core.o</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_common.h b/drivers/infiniband/hw/ipath/ipath_common.h<br/>index 48a55247b832..062bd392e7e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_common.h</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -38,7 +39,8 @@</div><div class='ctx'>  * to communicate between kernel and user code.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* This is the IEEE-assigned OUI for PathScale, Inc. */</div><div class='add'>+</div><div class='add'>+/* This is the IEEE-assigned OUI for QLogic Inc. InfiniPath */</div><div class='ctx'> #define IPATH_SRC_OUI_1 0x00</div><div class='ctx'> #define IPATH_SRC_OUI_2 0x11</div><div class='ctx'> #define IPATH_SRC_OUI_3 0x75</div><div class='hunk'>@@ -96,8 +98,8 @@ struct infinipath_stats {</div><div class='ctx'> 	__u64 sps_hwerrs;</div><div class='ctx'> 	/* number of times IB link changed state unexpectedly */</div><div class='ctx'> 	__u64 sps_iblink;</div><div class='del'>-	/* no longer used; left for compatibility */</div><div class='del'>-	__u64 sps_unused3;</div><div class='add'>+	/* kernel receive interrupts that didn't read intstat */</div><div class='add'>+	__u64 sps_fastrcvint;</div><div class='ctx'> 	/* number of kernel (port0) packets received */</div><div class='ctx'> 	__u64 sps_port0pkts;</div><div class='ctx'> 	/* number of "ethernet" packets sent by driver */</div><div class='hunk'>@@ -121,8 +123,7 @@ struct infinipath_stats {</div><div class='ctx'> 	__u64 sps_ports;</div><div class='ctx'> 	/* list of pkeys (other than default) accepted (0 means not set) */</div><div class='ctx'> 	__u16 sps_pkeys[4];</div><div class='del'>-	/* lids for up to 4 infinipaths, indexed by infinipath # */</div><div class='del'>-	__u16 sps_lid[4];</div><div class='add'>+	__u16 sps_unused16[4]; /* available; maintaining compatible layout */</div><div class='ctx'> 	/* number of user ports per chip (not IB ports) */</div><div class='ctx'> 	__u32 sps_nports;</div><div class='ctx'> 	/* not our interrupt, or already handled */</div><div class='hunk'>@@ -140,10 +141,8 @@ struct infinipath_stats {</div><div class='ctx'> 	 * packets if ipath not configured, sma/mad, etc.)</div><div class='ctx'> 	 */</div><div class='ctx'> 	__u64 sps_krdrops;</div><div class='del'>-	/* mlids for up to 4 infinipaths, indexed by infinipath # */</div><div class='del'>-	__u16 sps_mlid[4];</div><div class='ctx'> 	/* pad for future growth */</div><div class='del'>-	__u64 __sps_pad[45];</div><div class='add'>+	__u64 __sps_pad[46];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -310,6 +309,9 @@ struct ipath_base_info {</div><div class='ctx'> 	__u32 spi_rcv_egrchunksize;</div><div class='ctx'> 	/* total size of mmap to cover full rcvegrbuffers */</div><div class='ctx'> 	__u32 spi_rcv_egrbuftotlen;</div><div class='add'>+	__u32 spi_filler_for_align;</div><div class='add'>+	/* address of readonly memory copy of the rcvhdrq tail register. */</div><div class='add'>+	__u64 spi_rcvhdr_tailaddr;</div><div class='ctx'> } __attribute__ ((aligned(8)));</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -342,9 +344,9 @@ struct ipath_base_info {</div><div class='ctx'> /*</div><div class='ctx'>  * Similarly, this is the kernel version going back to the user.  It's</div><div class='ctx'>  * slightly different, in that we want to tell if the driver was built as</div><div class='del'>- * part of a PathScale release, or from the driver from OpenIB, kernel.org,</div><div class='del'>- * or a standard distribution, for support reasons.  The high bit is 0 for</div><div class='del'>- * non-PathScale, and 1 for PathScale-built/supplied.</div><div class='add'>+ * part of a QLogic release, or from the driver from openfabrics.org,</div><div class='add'>+ * kernel.org, or a standard distribution, for support reasons.</div><div class='add'>+ * The high bit is 0 for non-QLogic and 1 for QLogic-built/supplied.</div><div class='ctx'>  *</div><div class='ctx'>  * It's returned by the driver to the user code during initialization in the</div><div class='ctx'>  * spi_sw_version field of ipath_base_info, so the user code can in turn</div><div class='hunk'>@@ -379,13 +381,7 @@ struct ipath_user_info {</div><div class='ctx'> 	 */</div><div class='ctx'> 	__u32 spu_rcvhdrsize;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * cache line aligned (64 byte) user address to</div><div class='del'>-	 * which the rcvhdrtail register will be written by infinipath</div><div class='del'>-	 * whenever it changes, so that no chip registers are read in</div><div class='del'>-	 * the performance path.</div><div class='del'>-	 */</div><div class='del'>-	__u64 spu_rcvhdraddr;</div><div class='add'>+	__u64 spu_unused; /* kept for compatible layout */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * address of struct base_info to write to</div><div class='hunk'>@@ -481,7 +477,7 @@ struct ipath_sma_pkt</div><div class='ctx'>  * Data layout in I2C flash (for GUID, etc.)</div><div class='ctx'>  * All fields are little-endian binary unless otherwise stated</div><div class='ctx'>  */</div><div class='del'>-#define IPATH_FLASH_VERSION 1</div><div class='add'>+#define IPATH_FLASH_VERSION 2</div><div class='ctx'> struct ipath_flash {</div><div class='ctx'> 	/* flash layout version (IPATH_FLASH_VERSION) */</div><div class='ctx'> 	__u8 if_fversion;</div><div class='hunk'>@@ -489,14 +485,14 @@ struct ipath_flash {</div><div class='ctx'> 	__u8 if_csum;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * valid length (in use, protected by if_csum), including</div><div class='del'>-	 * if_fversion and if_sum themselves)</div><div class='add'>+	 * if_fversion and if_csum themselves)</div><div class='ctx'> 	 */</div><div class='ctx'> 	__u8 if_length;</div><div class='ctx'> 	/* the GUID, in network order */</div><div class='ctx'> 	__u8 if_guid[8];</div><div class='ctx'> 	/* number of GUIDs to use, starting from if_guid */</div><div class='ctx'> 	__u8 if_numguid;</div><div class='del'>-	/* the board serial number, in ASCII */</div><div class='add'>+	/* the (last 10 characters of) board serial number, in ASCII */</div><div class='ctx'> 	char if_serial[12];</div><div class='ctx'> 	/* board mfg date (YYYYMMDD ASCII) */</div><div class='ctx'> 	char if_mfgdate[8];</div><div class='hunk'>@@ -508,8 +504,10 @@ struct ipath_flash {</div><div class='ctx'> 	__u8 if_powerhour[2];</div><div class='ctx'> 	/* ASCII free-form comment field */</div><div class='ctx'> 	char if_comment[32];</div><div class='del'>-	/* 78 bytes used, min flash size is 128 bytes */</div><div class='del'>-	__u8 if_future[50];</div><div class='add'>+	/* Backwards compatible prefix for longer QLogic Serial Numbers */</div><div class='add'>+	char if_sprefix[4];</div><div class='add'>+	/* 82 bytes used, min flash size is 128 bytes */</div><div class='add'>+	__u8 if_future[46];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -603,14 +601,118 @@ struct infinipath_counters {</div><div class='ctx'> #define INFINIPATH_KPF_INTR 0x1</div><div class='ctx'> </div><div class='ctx'> /* SendPIO per-buffer control */</div><div class='del'>-#define INFINIPATH_SP_LENGTHP1_MASK 0x3FF</div><div class='del'>-#define INFINIPATH_SP_LENGTHP1_SHIFT 0</div><div class='del'>-#define INFINIPATH_SP_INTR    0x80000000</div><div class='del'>-#define INFINIPATH_SP_TEST    0x40000000</div><div class='del'>-#define INFINIPATH_SP_TESTEBP 0x20000000</div><div class='add'>+#define INFINIPATH_SP_TEST    0x40</div><div class='add'>+#define INFINIPATH_SP_TESTEBP 0x20</div><div class='ctx'> </div><div class='ctx'> /* SendPIOAvail bits */</div><div class='ctx'> #define INFINIPATH_SENDPIOAVAIL_BUSY_SHIFT 1</div><div class='ctx'> #define INFINIPATH_SENDPIOAVAIL_CHECK_SHIFT 0</div><div class='ctx'> </div><div class='add'>+/* infinipath header format */</div><div class='add'>+struct ipath_header {</div><div class='add'>+	/*</div><div class='add'>+	 * Version - 4 bits, Port - 4 bits, TID - 10 bits and Offset -</div><div class='add'>+	 * 14 bits before ECO change ~28 Dec 03.  After that, Vers 4,</div><div class='add'>+	 * Port 3, TID 11, offset 14.</div><div class='add'>+	 */</div><div class='add'>+	__le32 ver_port_tid_offset;</div><div class='add'>+	__le16 chksum;</div><div class='add'>+	__le16 pkt_flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* infinipath user message header format.</div><div class='add'>+ * This structure contains the first 4 fields common to all protocols</div><div class='add'>+ * that employ infinipath.</div><div class='add'>+ */</div><div class='add'>+struct ipath_message_header {</div><div class='add'>+	__be16 lrh[4];</div><div class='add'>+	__be32 bth[3];</div><div class='add'>+	/* fields below this point are in host byte order */</div><div class='add'>+	struct ipath_header iph;</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* infinipath ethernet header format */</div><div class='add'>+struct ether_header {</div><div class='add'>+	__be16 lrh[4];</div><div class='add'>+	__be32 bth[3];</div><div class='add'>+	struct ipath_header iph;</div><div class='add'>+	__u8 sub_opcode;</div><div class='add'>+	__u8 cmd;</div><div class='add'>+	__be16 lid;</div><div class='add'>+	__u16 mac[3];</div><div class='add'>+	__u8 frag_num;</div><div class='add'>+	__u8 seq_num;</div><div class='add'>+	__le32 len;</div><div class='add'>+	/* MUST be of word size due to PIO write requirements */</div><div class='add'>+	__le32 csum;</div><div class='add'>+	__le16 csum_offset;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__u16 first_2_bytes;</div><div class='add'>+	__u8 unused[2];		/* currently unused */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* IB - LRH header consts */</div><div class='add'>+#define IPATH_LRH_GRH 0x0003	/* 1. word of IB LRH - next header: GRH */</div><div class='add'>+#define IPATH_LRH_BTH 0x0002	/* 1. word of IB LRH - next header: BTH */</div><div class='add'>+</div><div class='add'>+/* misc. */</div><div class='add'>+#define SIZE_OF_CRC 1</div><div class='add'>+</div><div class='add'>+#define IPATH_DEFAULT_P_KEY 0xFFFF</div><div class='add'>+#define IPATH_PERMISSIVE_LID 0xFFFF</div><div class='add'>+#define IPATH_AETH_CREDIT_SHIFT 24</div><div class='add'>+#define IPATH_AETH_CREDIT_MASK 0x1F</div><div class='add'>+#define IPATH_AETH_CREDIT_INVAL 0x1F</div><div class='add'>+#define IPATH_PSN_MASK 0xFFFFFF</div><div class='add'>+#define IPATH_MSN_MASK 0xFFFFFF</div><div class='add'>+#define IPATH_QPN_MASK 0xFFFFFF</div><div class='add'>+#define IPATH_MULTICAST_LID_BASE 0xC000</div><div class='add'>+#define IPATH_MULTICAST_QPN 0xFFFFFF</div><div class='add'>+</div><div class='add'>+/* Receive Header Queue: receive type (from infinipath) */</div><div class='add'>+#define RCVHQ_RCV_TYPE_EXPECTED  0</div><div class='add'>+#define RCVHQ_RCV_TYPE_EAGER     1</div><div class='add'>+#define RCVHQ_RCV_TYPE_NON_KD    2</div><div class='add'>+#define RCVHQ_RCV_TYPE_ERROR     3</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* sub OpCodes - ith4x  */</div><div class='add'>+#define IPATH_ITH4X_OPCODE_ENCAP 0x81</div><div class='add'>+#define IPATH_ITH4X_OPCODE_LID_ARP 0x82</div><div class='add'>+</div><div class='add'>+#define IPATH_HEADER_QUEUE_WORDS 9</div><div class='add'>+</div><div class='add'>+/* functions for extracting fields from rcvhdrq entries for the driver.</div><div class='add'>+ */</div><div class='add'>+static inline __u32 ipath_hdrget_err_flags(const __le32 * rbuf)</div><div class='add'>+{</div><div class='add'>+	return __le32_to_cpu(rbuf[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 ipath_hdrget_rcv_type(const __le32 * rbuf)</div><div class='add'>+{</div><div class='add'>+	return (__le32_to_cpu(rbuf[0]) &gt;&gt; INFINIPATH_RHF_RCVTYPE_SHIFT)</div><div class='add'>+	    &amp; INFINIPATH_RHF_RCVTYPE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 ipath_hdrget_length_in_bytes(const __le32 * rbuf)</div><div class='add'>+{</div><div class='add'>+	return ((__le32_to_cpu(rbuf[0]) &gt;&gt; INFINIPATH_RHF_LENGTH_SHIFT)</div><div class='add'>+		&amp; INFINIPATH_RHF_LENGTH_MASK) &lt;&lt; 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 ipath_hdrget_index(const __le32 * rbuf)</div><div class='add'>+{</div><div class='add'>+	return (__le32_to_cpu(rbuf[0]) &gt;&gt; INFINIPATH_RHF_EGRINDEX_SHIFT)</div><div class='add'>+	    &amp; INFINIPATH_RHF_EGRINDEX_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __u32 ipath_hdrget_ipath_ver(__le32 hdrword)</div><div class='add'>+{</div><div class='add'>+	return (__le32_to_cpu(hdrword) &gt;&gt; INFINIPATH_I_VERS_SHIFT)</div><div class='add'>+	    &amp; INFINIPATH_I_VERS_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif				/* _IPATH_COMMON_H */</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/infiniband/hw/ipath/ipath_cq.c<br/>index 7ece1135ddfe..3efee341c9bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_cq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_cq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_cq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_cq.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -157,10 +158,21 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,</div><div class='ctx'> 			      struct ib_ucontext *context,</div><div class='ctx'> 			      struct ib_udata *udata)</div><div class='ctx'> {</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibdev);</div><div class='ctx'> 	struct ipath_cq *cq;</div><div class='ctx'> 	struct ib_wc *wc;</div><div class='ctx'> 	struct ib_cq *ret;</div><div class='ctx'> </div><div class='add'>+	if (entries &gt; ib_ipath_max_cqes) {</div><div class='add'>+		ret = ERR_PTR(-EINVAL);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;n_cqs_allocated == ib_ipath_max_cqs) {</div><div class='add'>+		ret = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Need to use vmalloc() if we want to support large #s of</div><div class='ctx'> 	 * entries.</div><div class='hunk'>@@ -196,6 +208,8 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,</div><div class='ctx'> </div><div class='ctx'> 	ret = &amp;cq-&gt;ibcq;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;n_cqs_allocated++;</div><div class='add'>+</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -210,9 +224,11 @@ bail:</div><div class='ctx'>  */</div><div class='ctx'> int ipath_destroy_cq(struct ib_cq *ibcq)</div><div class='ctx'> {</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibcq-&gt;device);</div><div class='ctx'> 	struct ipath_cq *cq = to_icq(ibcq);</div><div class='ctx'> </div><div class='ctx'> 	tasklet_kill(&amp;cq-&gt;comptask);</div><div class='add'>+	dev-&gt;n_cqs_allocated--;</div><div class='ctx'> 	vfree(cq-&gt;queue);</div><div class='ctx'> 	kfree(cq);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_debug.h b/drivers/infiniband/hw/ipath/ipath_debug.h<br/>index 46762387f5f8..f415beda0d32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_debug.h</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c<br/>index 28ddceb260e8..147dd89e21c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_diag.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_diag.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_diag.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -43,10 +44,9 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "ipath_common.h"</div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='ctx'> #include "ipath_layer.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> int ipath_diag_inuse;</div><div class='ctx'> static int diag_set_link;</div><div class='hunk'>@@ -66,18 +66,20 @@ static struct file_operations diag_file_ops = {</div><div class='ctx'> 	.release = ipath_diag_release</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cdev *diag_cdev;</div><div class='del'>-static struct class_device *diag_class_dev;</div><div class='del'>-</div><div class='del'>-int ipath_diag_init(void)</div><div class='add'>+int ipath_diag_add(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='del'>-	return ipath_cdev_init(IPATH_DIAG_MINOR, "ipath_diag",</div><div class='del'>-			       &amp;diag_file_ops, &amp;diag_cdev, &amp;diag_class_dev);</div><div class='add'>+	char name[16];</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "ipath_diag%d", dd-&gt;ipath_unit);</div><div class='add'>+</div><div class='add'>+	return ipath_cdev_init(IPATH_DIAG_MINOR_BASE + dd-&gt;ipath_unit, name,</div><div class='add'>+			       &amp;diag_file_ops, &amp;dd-&gt;diag_cdev,</div><div class='add'>+			       &amp;dd-&gt;diag_class_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ipath_diag_cleanup(void)</div><div class='add'>+void ipath_diag_remove(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='del'>-	ipath_cdev_cleanup(&amp;diag_cdev, &amp;diag_class_dev);</div><div class='add'>+	ipath_cdev_cleanup(&amp;dd-&gt;diag_cdev, &amp;dd-&gt;diag_class_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -101,8 +103,7 @@ static int ipath_read_umem64(struct ipath_devdata *dd, void __user *uaddr,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* not very efficient, but it works for now */</div><div class='del'>-	if (reg_addr &lt; dd-&gt;ipath_kregbase ||</div><div class='del'>-	    reg_end &gt; dd-&gt;ipath_kregend) {</div><div class='add'>+	if (reg_addr &lt; dd-&gt;ipath_kregbase || reg_end &gt; dd-&gt;ipath_kregend) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -113,7 +114,7 @@ static int ipath_read_umem64(struct ipath_devdata *dd, void __user *uaddr,</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='ctx'> 		reg_addr++;</div><div class='del'>-		uaddr++;</div><div class='add'>+		uaddr += sizeof(u64);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> bail:</div><div class='hunk'>@@ -139,8 +140,7 @@ static int ipath_write_umem64(struct ipath_devdata *dd, void __iomem *caddr,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* not very efficient, but it works for now */</div><div class='del'>-	if (reg_addr &lt; dd-&gt;ipath_kregbase ||</div><div class='del'>-	    reg_end &gt; dd-&gt;ipath_kregend) {</div><div class='add'>+	if (reg_addr &lt; dd-&gt;ipath_kregbase || reg_end &gt; dd-&gt;ipath_kregend) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -153,7 +153,7 @@ static int ipath_write_umem64(struct ipath_devdata *dd, void __iomem *caddr,</div><div class='ctx'> 		writeq(data, reg_addr);</div><div class='ctx'> </div><div class='ctx'> 		reg_addr++;</div><div class='del'>-		uaddr++;</div><div class='add'>+		uaddr += sizeof(u64);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> bail:</div><div class='hunk'>@@ -191,7 +191,8 @@ static int ipath_read_umem32(struct ipath_devdata *dd, void __user *uaddr,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		reg_addr++;</div><div class='del'>-		uaddr++;</div><div class='add'>+		uaddr += sizeof(u32);</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> bail:</div><div class='hunk'>@@ -230,7 +231,7 @@ static int ipath_write_umem32(struct ipath_devdata *dd, void __iomem *caddr,</div><div class='ctx'> 		writel(data, reg_addr);</div><div class='ctx'> </div><div class='ctx'> 		reg_addr++;</div><div class='del'>-		uaddr++;</div><div class='add'>+		uaddr += sizeof(u32);</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> bail:</div><div class='hunk'>@@ -239,59 +240,45 @@ bail:</div><div class='ctx'> </div><div class='ctx'> static int ipath_diag_open(struct inode *in, struct file *fp)</div><div class='ctx'> {</div><div class='add'>+	int unit = iminor(in) - IPATH_DIAG_MINOR_BASE;</div><div class='ctx'> 	struct ipath_devdata *dd;</div><div class='del'>-	int unit = 0; /* XXX this is bogus */</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dd = ipath_lookup(unit);</div><div class='del'>-</div><div class='ctx'> 	mutex_lock(&amp;ipath_mutex);</div><div class='del'>-	spin_lock_irqsave(&amp;ipath_devs_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (ipath_diag_inuse) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(dd, &amp;ipath_dev_list, ipath_list) {</div><div class='del'>-		/*</div><div class='del'>-		 * we need at least one infinipath device to be present</div><div class='del'>-		 * (don't use INITTED, because we want to be able to open</div><div class='del'>-		 * even if device is in freeze mode, which cleared INITTED).</div><div class='del'>-		 * There is a small amount of risk to this, which is why we</div><div class='del'>-		 * also verify kregbase is set.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (!(dd-&gt;ipath_flags &amp; IPATH_PRESENT) ||</div><div class='del'>-		    !dd-&gt;ipath_kregbase)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ipath_diag_inuse = 1;</div><div class='del'>-		diag_set_link = 0;</div><div class='del'>-		ret = 0;</div><div class='add'>+	dd = ipath_lookup(unit);</div><div class='add'>+</div><div class='add'>+	if (dd == NULL || !(dd-&gt;ipath_flags &amp; IPATH_PRESENT) ||</div><div class='add'>+	    !dd-&gt;ipath_kregbase) {</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = -ENODEV;</div><div class='del'>-</div><div class='del'>-bail:</div><div class='del'>-	spin_unlock_irqrestore(&amp;ipath_devs_lock, flags);</div><div class='add'>+	fp-&gt;private_data = dd;</div><div class='add'>+	ipath_diag_inuse = 1;</div><div class='add'>+	diag_set_link = 0;</div><div class='add'>+	ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Only expose a way to reset the device if we</div><div class='ctx'> 	   make it into diag mode. */</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ipath_expose_reset(&amp;dd-&gt;pcidev-&gt;dev);</div><div class='add'>+	ipath_expose_reset(&amp;dd-&gt;pcidev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+bail:</div><div class='ctx'> 	mutex_unlock(&amp;ipath_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipath_diag_release(struct inode *i, struct file *f)</div><div class='add'>+static int ipath_diag_release(struct inode *in, struct file *fp)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;ipath_mutex);</div><div class='ctx'> 	ipath_diag_inuse = 0;</div><div class='add'>+	fp-&gt;private_data = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;ipath_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -299,17 +286,10 @@ static int ipath_diag_release(struct inode *i, struct file *f)</div><div class='ctx'> static ssize_t ipath_diag_read(struct file *fp, char __user *data,</div><div class='ctx'> 			       size_t count, loff_t *off)</div><div class='ctx'> {</div><div class='del'>-	int unit = 0; /* XXX provide for reads on other units some day */</div><div class='del'>-	struct ipath_devdata *dd;</div><div class='add'>+	struct ipath_devdata *dd = fp-&gt;private_data;</div><div class='ctx'> 	void __iomem *kreg_base;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	dd = ipath_lookup(unit);</div><div class='del'>-	if (!dd) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	kreg_base = dd-&gt;ipath_kregbase;</div><div class='ctx'> </div><div class='ctx'> 	if (count == 0)</div><div class='hunk'>@@ -328,23 +308,16 @@ static ssize_t ipath_diag_read(struct file *fp, char __user *data,</div><div class='ctx'> 		ret = count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t ipath_diag_write(struct file *fp, const char __user *data,</div><div class='ctx'> 				size_t count, loff_t *off)</div><div class='ctx'> {</div><div class='del'>-	int unit = 0; /* XXX this is bogus */</div><div class='del'>-	struct ipath_devdata *dd;</div><div class='add'>+	struct ipath_devdata *dd = fp-&gt;private_data;</div><div class='ctx'> 	void __iomem *kreg_base;</div><div class='ctx'> 	ssize_t ret;</div><div class='ctx'> </div><div class='del'>-	dd = ipath_lookup(unit);</div><div class='del'>-	if (!dd) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='ctx'> 	kreg_base = dd-&gt;ipath_kregbase;</div><div class='ctx'> </div><div class='ctx'> 	if (count == 0)</div><div class='hunk'>@@ -363,6 +336,5 @@ static ssize_t ipath_diag_write(struct file *fp, const char __user *data,</div><div class='ctx'> 		ret = count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c<br/>index dddcdae736ac..823131d58b34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_driver.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -38,8 +39,8 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='ctx'> #include "ipath_layer.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> static void ipath_update_pio_bufs(struct ipath_devdata *);</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +53,7 @@ const char *ipath_get_unit_name(int unit)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ipath_get_unit_name);</div><div class='ctx'> </div><div class='del'>-#define DRIVER_LOAD_MSG "PathScale " IPATH_DRV_NAME " loaded: "</div><div class='add'>+#define DRIVER_LOAD_MSG "QLogic " IPATH_DRV_NAME " loaded: "</div><div class='ctx'> #define PFX IPATH_DRV_NAME ": "</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -74,8 +75,8 @@ MODULE_PARM_DESC(debug, "mask for debug prints");</div><div class='ctx'> EXPORT_SYMBOL_GPL(ipath_debug);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("PathScale &lt;support@pathscale.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Pathscale InfiniPath driver");</div><div class='add'>+MODULE_AUTHOR("QLogic &lt;support@pathscale.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("QLogic InfiniPath driver");</div><div class='ctx'> </div><div class='ctx'> const char *ipath_ibcstatus_str[] = {</div><div class='ctx'> 	"Disabled",</div><div class='hunk'>@@ -130,14 +131,6 @@ static struct pci_driver ipath_driver = {</div><div class='ctx'> 	.id_table = ipath_pci_tbl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is where port 0's rcvhdrtail register is written back; we also</div><div class='del'>- * want nothing else sharing the cache line, so make it a cache line</div><div class='del'>- * in size.  Used for all units.</div><div class='del'>- */</div><div class='del'>-volatile __le64 *ipath_port0_rcvhdrtail;</div><div class='del'>-dma_addr_t ipath_port0_rcvhdrtail_dma;</div><div class='del'>-static int port0_rcvhdrtail_refs;</div><div class='ctx'> </div><div class='ctx'> static inline void read_bars(struct ipath_devdata *dd, struct pci_dev *dev,</div><div class='ctx'> 			     u32 *bar0, u32 *bar1)</div><div class='hunk'>@@ -170,14 +163,13 @@ static void ipath_free_devdata(struct pci_dev *pdev,</div><div class='ctx'> 		list_del(&amp;dd-&gt;ipath_list);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ipath_devs_lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(*dd), dd, dd-&gt;ipath_dma_addr);</div><div class='add'>+	vfree(dd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct ipath_devdata *dd;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!idr_pre_get(&amp;unit_table, GFP_KERNEL)) {</div><div class='hunk'>@@ -185,15 +177,12 @@ static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev)</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dd = dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(*dd), &amp;dma_addr,</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-</div><div class='add'>+	dd = vmalloc(sizeof(*dd));</div><div class='ctx'> 	if (!dd) {</div><div class='ctx'> 		dd = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	dd-&gt;ipath_dma_addr = dma_addr;</div><div class='add'>+	memset(dd, 0, sizeof(*dd));</div><div class='ctx'> 	dd-&gt;ipath_unit = -1;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ipath_devs_lock, flags);</div><div class='hunk'>@@ -271,47 +260,6 @@ int ipath_count_units(int *npresentp, int *nupp, u32 *maxportsp)</div><div class='ctx'> 	return nunits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int init_port0_rcvhdrtail(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ipath_mutex);</div><div class='del'>-</div><div class='del'>-	if (!ipath_port0_rcvhdrtail) {</div><div class='del'>-		ipath_port0_rcvhdrtail =</div><div class='del'>-			dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='del'>-					   IPATH_PORT0_RCVHDRTAIL_SIZE,</div><div class='del'>-					   &amp;ipath_port0_rcvhdrtail_dma,</div><div class='del'>-					   GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (!ipath_port0_rcvhdrtail) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto bail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	port0_rcvhdrtail_refs++;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-bail:</div><div class='del'>-	mutex_unlock(&amp;ipath_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cleanup_port0_rcvhdrtail(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;ipath_mutex);</div><div class='del'>-</div><div class='del'>-	if (!--port0_rcvhdrtail_refs) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, IPATH_PORT0_RCVHDRTAIL_SIZE,</div><div class='del'>-				  (void *) ipath_port0_rcvhdrtail,</div><div class='del'>-				  ipath_port0_rcvhdrtail_dma);</div><div class='del'>-		ipath_port0_rcvhdrtail = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;ipath_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * These next two routines are placeholders in case we don't have per-arch</div><div class='ctx'>  * code for controlling write combining.  If explicit control of write</div><div class='hunk'>@@ -336,20 +284,12 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	u32 bar0 = 0, bar1 = 0;</div><div class='ctx'> 	u8 rev;</div><div class='ctx'> </div><div class='del'>-	ret = init_port0_rcvhdrtail(pdev);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR IPATH_DRV_NAME</div><div class='del'>-		       ": Could not allocate port0_rcvhdrtail: error %d\n",</div><div class='del'>-		       -ret);</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	dd = ipath_alloc_devdata(pdev);</div><div class='ctx'> 	if (IS_ERR(dd)) {</div><div class='ctx'> 		ret = PTR_ERR(dd);</div><div class='ctx'> 		printk(KERN_ERR IPATH_DRV_NAME</div><div class='ctx'> 		       ": Could not allocate devdata: error %d\n", -ret);</div><div class='del'>-		goto bail_rcvhdrtail;</div><div class='add'>+		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ipath_cdbg(VERBOSE, "initializing unit #%u\n", dd-&gt;ipath_unit);</div><div class='hunk'>@@ -424,12 +364,29 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			dev_info(&amp;pdev-&gt;dev, "pci_set_dma_mask unit %u "</div><div class='del'>-				 "fails: %d\n", dd-&gt;ipath_unit, ret);</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+				"Unable to set DMA mask for unit %u: %d\n",</div><div class='add'>+				dd-&gt;ipath_unit, ret);</div><div class='ctx'> 			goto bail_regions;</div><div class='ctx'> 		}</div><div class='del'>-		else</div><div class='add'>+		else {</div><div class='ctx'> 			ipath_dbg("No 64bit DMA mask, used 32 bit mask\n");</div><div class='add'>+			ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+			if (ret)</div><div class='add'>+				dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+					"Unable to set DMA consistent mask "</div><div class='add'>+					"for unit %u: %d\n",</div><div class='add'>+					dd-&gt;ipath_unit, ret);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+				"Unable to set DMA consistent mask "</div><div class='add'>+				"for unit %u: %d\n",</div><div class='add'>+				dd-&gt;ipath_unit, ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='hunk'>@@ -452,7 +409,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		ipath_init_pe800_funcs(dd);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		ipath_dev_err(dd, "Found unknown PathScale deviceid 0x%x, "</div><div class='add'>+		ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "</div><div class='ctx'> 			      "failing\n", ent-&gt;device);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -460,10 +417,10 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	for (j = 0; j &lt; 6; j++) {</div><div class='ctx'> 		if (!pdev-&gt;resource[j].start)</div><div class='ctx'> 			continue;</div><div class='del'>-		ipath_cdbg(VERBOSE, "BAR %d start %lx, end %lx, len %lx\n",</div><div class='del'>-			   j, pdev-&gt;resource[j].start,</div><div class='del'>-			   pdev-&gt;resource[j].end,</div><div class='del'>-			   pci_resource_len(pdev, j));</div><div class='add'>+		ipath_cdbg(VERBOSE, "BAR %d start %llx, end %llx, len %llx\n",</div><div class='add'>+			   j, (unsigned long long)pdev-&gt;resource[j].start,</div><div class='add'>+			   (unsigned long long)pdev-&gt;resource[j].end,</div><div class='add'>+			   (unsigned long long)pci_resource_len(pdev, j));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!addr) {</div><div class='hunk'>@@ -495,23 +452,23 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		((void __iomem *)dd-&gt;ipath_kregbase + len);</div><div class='ctx'> 	dd-&gt;ipath_physaddr = addr;	/* used for io_remap, etc. */</div><div class='ctx'> 	/* for user mmap */</div><div class='del'>-	dd-&gt;ipath_kregvirt = (u64 __iomem *) phys_to_virt(addr);</div><div class='del'>-	ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p "</div><div class='del'>-		   "kregvirt %p\n", addr, dd-&gt;ipath_kregbase,</div><div class='del'>-		   dd-&gt;ipath_kregvirt);</div><div class='add'>+	ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p\n",</div><div class='add'>+		   addr, dd-&gt;ipath_kregbase);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * clear ipath_flags here instead of in ipath_init_chip as it is set</div><div class='ctx'> 	 * by ipath_setup_htconfig.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dd-&gt;ipath_flags = 0;</div><div class='add'>+	dd-&gt;ipath_lli_counter = 0;</div><div class='add'>+	dd-&gt;ipath_lli_errors = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dd-&gt;ipath_f_bus(dd, pdev))</div><div class='ctx'> 		ipath_dev_err(dd, "Failed to setup config space; "</div><div class='ctx'> 			      "continuing anyway\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * set up our interrupt handler; SA_SHIRQ probably not needed,</div><div class='add'>+	 * set up our interrupt handler; IRQF_SHARED probably not needed,</div><div class='ctx'> 	 * since MSI interrupts shouldn't be shared but won't  hurt for now.</div><div class='ctx'> 	 * check 0 irq after we return from chip-specific bus setup, since</div><div class='ctx'> 	 * that can affect this due to setup</div><div class='hunk'>@@ -520,7 +477,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		ipath_dev_err(dd, "irq is 0, BIOS error?  Interrupts won't "</div><div class='ctx'> 			      "work\n");</div><div class='ctx'> 	else {</div><div class='del'>-		ret = request_irq(pdev-&gt;irq, ipath_intr, SA_SHIRQ,</div><div class='add'>+		ret = request_irq(pdev-&gt;irq, ipath_intr, IRQF_SHARED,</div><div class='ctx'> 				  IPATH_DRV_NAME, dd);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			ipath_dev_err(dd, "Couldn't setup irq handler, "</div><div class='hunk'>@@ -545,6 +502,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	ipath_device_create_group(&amp;pdev-&gt;dev, dd);</div><div class='ctx'> 	ipathfs_add_device(dd);</div><div class='ctx'> 	ipath_user_add(dd);</div><div class='add'>+	ipath_diag_add(dd);</div><div class='ctx'> 	ipath_layer_add(dd);</div><div class='ctx'> </div><div class='ctx'> 	goto bail;</div><div class='hunk'>@@ -561,9 +519,6 @@ bail_disable:</div><div class='ctx'> bail_devdata:</div><div class='ctx'> 	ipath_free_devdata(pdev, dd);</div><div class='ctx'> </div><div class='del'>-bail_rcvhdrtail:</div><div class='del'>-	cleanup_port0_rcvhdrtail(pdev);</div><div class='del'>-</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -577,8 +532,9 @@ static void __devexit ipath_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dd = pci_get_drvdata(pdev);</div><div class='del'>-	ipath_layer_del(dd);</div><div class='del'>-	ipath_user_del(dd);</div><div class='add'>+	ipath_layer_remove(dd);</div><div class='add'>+	ipath_diag_remove(dd);</div><div class='add'>+	ipath_user_remove(dd);</div><div class='ctx'> 	ipathfs_remove_device(dd);</div><div class='ctx'> 	ipath_device_remove_group(&amp;pdev-&gt;dev, dd);</div><div class='ctx'> 	ipath_cdbg(VERBOSE, "Releasing pci memory regions, dd %p, "</div><div class='hunk'>@@ -594,7 +550,6 @@ static void __devexit ipath_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='ctx'> 	ipath_free_devdata(pdev, dd);</div><div class='del'>-	cleanup_port0_rcvhdrtail(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* general driver use */</div><div class='hunk'>@@ -868,7 +823,8 @@ static void ipath_rcv_layer(struct ipath_devdata *dd, u32 etail,</div><div class='ctx'> 	u8 pad, *bthbytes;</div><div class='ctx'> 	struct sk_buff *skb, *nskb;</div><div class='ctx'> </div><div class='del'>-	if (dd-&gt;ipath_port0_skbs &amp;&amp; hdr-&gt;sub_opcode == OPCODE_ENCAP) {</div><div class='add'>+	if (dd-&gt;ipath_port0_skbs &amp;&amp;</div><div class='add'>+			hdr-&gt;sub_opcode == IPATH_ITH4X_OPCODE_ENCAP) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Allocate a new sk_buff to replace the one we give</div><div class='ctx'> 		 * to the network stack.</div><div class='hunk'>@@ -899,7 +855,7 @@ static void ipath_rcv_layer(struct ipath_devdata *dd, u32 etail,</div><div class='ctx'> 		/* another ether packet received */</div><div class='ctx'> 		ipath_stats.sps_ether_rpkts++;</div><div class='ctx'> 	}</div><div class='del'>-	else if (hdr-&gt;sub_opcode == OPCODE_LID_ARP)</div><div class='add'>+	else if (hdr-&gt;sub_opcode == IPATH_ITH4X_OPCODE_LID_ARP)</div><div class='ctx'> 		__ipath_layer_rcv_lid(dd, hdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -916,8 +872,8 @@ void ipath_kreceive(struct ipath_devdata *dd)</div><div class='ctx'> 	const u32 rsize = dd-&gt;ipath_rcvhdrentsize;	/* words */</div><div class='ctx'> 	const u32 maxcnt = dd-&gt;ipath_rcvhdrcnt * rsize;	/* words */</div><div class='ctx'> 	u32 etail = -1, l, hdrqtail;</div><div class='del'>-	struct ips_message_header *hdr;</div><div class='del'>-	u32 eflags, i, etype, tlen, pkttot = 0;</div><div class='add'>+	struct ipath_message_header *hdr;</div><div class='add'>+	u32 eflags, i, etype, tlen, pkttot = 0, updegr=0, reloop=0;</div><div class='ctx'> 	static u64 totcalls;	/* stats, may eventually remove */</div><div class='ctx'> 	char emsg[128];</div><div class='ctx'> </div><div class='hunk'>@@ -931,24 +887,18 @@ void ipath_kreceive(struct ipath_devdata *dd)</div><div class='ctx'> 	if (test_and_set_bit(0, &amp;dd-&gt;ipath_rcv_pending))</div><div class='ctx'> 		goto bail;</div><div class='ctx'> </div><div class='del'>-	if (dd-&gt;ipath_port0head ==</div><div class='del'>-	    (u32)le64_to_cpu(*dd-&gt;ipath_hdrqtailptr))</div><div class='add'>+	l = dd-&gt;ipath_port0head;</div><div class='add'>+	hdrqtail = (u32) le64_to_cpu(*dd-&gt;ipath_hdrqtailptr);</div><div class='add'>+	if (l == hdrqtail)</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-gotmore:</div><div class='del'>-	/*</div><div class='del'>-	 * read only once at start.  If in flood situation, this helps</div><div class='del'>-	 * performance slightly.  If more arrive while we are processing,</div><div class='del'>-	 * we'll come back here and do them</div><div class='del'>-	 */</div><div class='del'>-	hdrqtail = (u32)le64_to_cpu(*dd-&gt;ipath_hdrqtailptr);</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = dd-&gt;ipath_port0head; l != hdrqtail; i++) {</div><div class='add'>+reloop:</div><div class='add'>+	for (i = 0; l != hdrqtail; i++) {</div><div class='ctx'> 		u32 qp;</div><div class='ctx'> 		u8 *bthbytes;</div><div class='ctx'> </div><div class='ctx'> 		rc = (u64 *) (dd-&gt;ipath_pd[0]-&gt;port_rcvhdrq + (l &lt;&lt; 2));</div><div class='del'>-		hdr = (struct ips_message_header *)&amp;rc[1];</div><div class='add'>+		hdr = (struct ipath_message_header *)&amp;rc[1];</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * could make a network order version of IPATH_KD_QP, and</div><div class='ctx'> 		 * do the obvious shift before masking to speed this up.</div><div class='hunk'>@@ -956,10 +906,10 @@ gotmore:</div><div class='ctx'> 		qp = ntohl(hdr-&gt;bth[1]) &amp; 0xffffff;</div><div class='ctx'> 		bthbytes = (u8 *) hdr-&gt;bth;</div><div class='ctx'> </div><div class='del'>-		eflags = ips_get_hdr_err_flags((__le32 *) rc);</div><div class='del'>-		etype = ips_get_rcv_type((__le32 *) rc);</div><div class='add'>+		eflags = ipath_hdrget_err_flags((__le32 *) rc);</div><div class='add'>+		etype = ipath_hdrget_rcv_type((__le32 *) rc);</div><div class='ctx'> 		/* total length */</div><div class='del'>-		tlen = ips_get_length_in_bytes((__le32 *) rc);</div><div class='add'>+		tlen = ipath_hdrget_length_in_bytes((__le32 *) rc);</div><div class='ctx'> 		ebuf = NULL;</div><div class='ctx'> 		if (etype != RCVHQ_RCV_TYPE_EXPECTED) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -969,7 +919,7 @@ gotmore:</div><div class='ctx'> 			 * set ebuf (so we try to copy data) unless the</div><div class='ctx'> 			 * length requires it.</div><div class='ctx'> 			 */</div><div class='del'>-			etail = ips_get_index((__le32 *) rc);</div><div class='add'>+			etail = ipath_hdrget_index((__le32 *) rc);</div><div class='ctx'> 			if (tlen &gt; sizeof(*hdr) ||</div><div class='ctx'> 			    etype == RCVHQ_RCV_TYPE_NON_KD)</div><div class='ctx'> 				ebuf = ipath_get_egrbuf(dd, etail, 0);</div><div class='hunk'>@@ -981,7 +931,7 @@ gotmore:</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (etype != RCVHQ_RCV_TYPE_NON_KD &amp;&amp; etype !=</div><div class='del'>-		    RCVHQ_RCV_TYPE_ERROR &amp;&amp; ips_get_ipath_ver(</div><div class='add'>+		    RCVHQ_RCV_TYPE_ERROR &amp;&amp; ipath_hdrget_ipath_ver(</div><div class='ctx'> 			    hdr-&gt;iph.ver_port_tid_offset) !=</div><div class='ctx'> 		    IPS_PROTO_VERSION) {</div><div class='ctx'> 			ipath_cdbg(PKT, "Bad InfiniPath protocol version "</div><div class='hunk'>@@ -994,7 +944,19 @@ gotmore:</div><div class='ctx'> 			ipath_cdbg(PKT, "RHFerrs %x hdrqtail=%x typ=%u "</div><div class='ctx'> 				   "tlen=%x opcode=%x egridx=%x: %s\n",</div><div class='ctx'> 				   eflags, l, etype, tlen, bthbytes[0],</div><div class='del'>-				   ips_get_index((__le32 *) rc), emsg);</div><div class='add'>+				   ipath_hdrget_index((__le32 *) rc), emsg);</div><div class='add'>+			/* Count local link integrity errors. */</div><div class='add'>+			if (eflags &amp; (INFINIPATH_RHF_H_ICRCERR |</div><div class='add'>+				      INFINIPATH_RHF_H_VCRCERR)) {</div><div class='add'>+				u8 n = (dd-&gt;ipath_ibcctrl &gt;&gt;</div><div class='add'>+					INFINIPATH_IBCC_PHYERRTHRESHOLD_SHIFT) &amp;</div><div class='add'>+					INFINIPATH_IBCC_PHYERRTHRESHOLD_MASK;</div><div class='add'>+</div><div class='add'>+				if (++dd-&gt;ipath_lli_counter &gt; n) {</div><div class='add'>+					dd-&gt;ipath_lli_counter = 0;</div><div class='add'>+					dd-&gt;ipath_lli_errors++;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		} else if (etype == RCVHQ_RCV_TYPE_NON_KD) {</div><div class='ctx'> 				int ret = __ipath_verbs_rcv(dd, rc + 1,</div><div class='ctx'> 							    ebuf, tlen);</div><div class='hunk'>@@ -1002,6 +964,9 @@ gotmore:</div><div class='ctx'> 					ipath_cdbg(VERBOSE,</div><div class='ctx'> 						   "received IB packet, "</div><div class='ctx'> 						   "not SMA (QP=%x)\n", qp);</div><div class='add'>+				if (dd-&gt;ipath_lli_counter)</div><div class='add'>+					dd-&gt;ipath_lli_counter--;</div><div class='add'>+</div><div class='ctx'> 		} else if (etype == RCVHQ_RCV_TYPE_EAGER) {</div><div class='ctx'> 			if (qp == IPATH_KD_QP &amp;&amp;</div><div class='ctx'> 			    bthbytes[0] == ipath_layer_rcv_opcode &amp;&amp;</div><div class='hunk'>@@ -1054,25 +1019,49 @@ gotmore:</div><div class='ctx'> 		l += rsize;</div><div class='ctx'> 		if (l &gt;= maxcnt)</div><div class='ctx'> 			l = 0;</div><div class='add'>+		if (etype != RCVHQ_RCV_TYPE_EXPECTED)</div><div class='add'>+		    updegr = 1;</div><div class='ctx'> 		/*</div><div class='del'>-		 * update for each packet, to help prevent overflows if we</div><div class='del'>-		 * have lots of packets.</div><div class='add'>+		 * update head regs on last packet, and every 16 packets.</div><div class='add'>+		 * Reduce bus traffic, while still trying to prevent</div><div class='add'>+		 * rcvhdrq overflows, for when the queue is nearly full</div><div class='ctx'> 		 */</div><div class='del'>-		(void)ipath_write_ureg(dd, ur_rcvhdrhead,</div><div class='del'>-				       dd-&gt;ipath_rhdrhead_intr_off | l, 0);</div><div class='del'>-		if (etype != RCVHQ_RCV_TYPE_EXPECTED)</div><div class='del'>-			(void)ipath_write_ureg(dd, ur_rcvegrindexhead,</div><div class='del'>-					       etail, 0);</div><div class='add'>+		if (l == hdrqtail || (i &amp;&amp; !(i&amp;0xf))) {</div><div class='add'>+			u64 lval;</div><div class='add'>+			if (l == hdrqtail) /* PE-800 interrupt only on last */</div><div class='add'>+				lval = dd-&gt;ipath_rhdrhead_intr_off | l;</div><div class='add'>+			else</div><div class='add'>+				lval = l;</div><div class='add'>+			(void)ipath_write_ureg(dd, ur_rcvhdrhead, lval, 0);</div><div class='add'>+			if (updegr) {</div><div class='add'>+				(void)ipath_write_ureg(dd, ur_rcvegrindexhead,</div><div class='add'>+						       etail, 0);</div><div class='add'>+				updegr = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dd-&gt;ipath_rhdrhead_intr_off &amp;&amp; !reloop) {</div><div class='add'>+		/* HT-400 workaround; we can have a race clearing chip</div><div class='add'>+		 * interrupt with another interrupt about to be delivered,</div><div class='add'>+		 * and can clear it before it is delivered on the GPIO</div><div class='add'>+		 * workaround.  By doing the extra check here for the</div><div class='add'>+		 * in-memory tail register updating while we were doing</div><div class='add'>+		 * earlier packets, we "almost" guarantee we have covered</div><div class='add'>+		 * that case.</div><div class='add'>+		 */</div><div class='add'>+		u32 hqtail = (u32)le64_to_cpu(*dd-&gt;ipath_hdrqtailptr);</div><div class='add'>+		if (hqtail != hdrqtail) {</div><div class='add'>+			hdrqtail = hqtail;</div><div class='add'>+			reloop = 1; /* loop 1 extra time at most */</div><div class='add'>+			goto reloop;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pkttot += i;</div><div class='ctx'> </div><div class='ctx'> 	dd-&gt;ipath_port0head = l;</div><div class='ctx'> </div><div class='del'>-	if (hdrqtail != (u32)le64_to_cpu(*dd-&gt;ipath_hdrqtailptr))</div><div class='del'>-		/* more arrived while we handled first batch */</div><div class='del'>-		goto gotmore;</div><div class='del'>-</div><div class='ctx'> 	if (pkttot &gt; ipath_stats.sps_maxpkts_call)</div><div class='ctx'> 		ipath_stats.sps_maxpkts_call = pkttot;</div><div class='ctx'> 	ipath_stats.sps_port0pkts += pkttot;</div><div class='hunk'>@@ -1369,26 +1358,20 @@ bail:</div><div class='ctx'>  * @dd: the infinipath device</div><div class='ctx'>  * @pd: the port data</div><div class='ctx'>  *</div><div class='del'>- * this *must* be physically contiguous memory, and for now,</div><div class='del'>- * that limits it to what kmalloc can do.</div><div class='add'>+ * this must be contiguous memory (from an i/o perspective), and must be</div><div class='add'>+ * DMA'able (which means for some systems, it will go through an IOMMU,</div><div class='add'>+ * or be forced into a low address range).</div><div class='ctx'>  */</div><div class='ctx'> int ipath_create_rcvhdrq(struct ipath_devdata *dd,</div><div class='ctx'> 			 struct ipath_portdata *pd)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0, amt;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	amt = ALIGN(dd-&gt;ipath_rcvhdrcnt * dd-&gt;ipath_rcvhdrentsize *</div><div class='del'>-		    sizeof(u32), PAGE_SIZE);</div><div class='ctx'> 	if (!pd-&gt;port_rcvhdrq) {</div><div class='del'>-		/*</div><div class='del'>-		 * not using REPEAT isn't viable; at 128KB, we can easily</div><div class='del'>-		 * fail this.  The problem with REPEAT is we can block here</div><div class='del'>-		 * "forever".  There isn't an inbetween, unfortunately.  We</div><div class='del'>-		 * could reduce the risk by never freeing the rcvhdrq except</div><div class='del'>-		 * at unload, but even then, the first time a port is used,</div><div class='del'>-		 * we could delay for some time...</div><div class='del'>-		 */</div><div class='add'>+		dma_addr_t phys_hdrqtail;</div><div class='ctx'> 		gfp_t gfp_flags = GFP_USER | __GFP_COMP;</div><div class='add'>+		int amt = ALIGN(dd-&gt;ipath_rcvhdrcnt * dd-&gt;ipath_rcvhdrentsize *</div><div class='add'>+				sizeof(u32), PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		pd-&gt;port_rcvhdrq = dma_alloc_coherent(</div><div class='ctx'> 			&amp;dd-&gt;pcidev-&gt;dev, amt, &amp;pd-&gt;port_rcvhdrq_phys,</div><div class='hunk'>@@ -1401,6 +1384,16 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd,</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='add'>+		pd-&gt;port_rcvhdrtail_kvaddr = dma_alloc_coherent(</div><div class='add'>+			&amp;dd-&gt;pcidev-&gt;dev, PAGE_SIZE, &amp;phys_hdrqtail, GFP_KERNEL);</div><div class='add'>+		if (!pd-&gt;port_rcvhdrtail_kvaddr) {</div><div class='add'>+			ipath_dev_err(dd, "attempt to allocate 1 page "</div><div class='add'>+				      "for port %u rcvhdrqtailaddr failed\n",</div><div class='add'>+				      pd-&gt;port_port);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+		pd-&gt;port_rcvhdrqtailaddr_phys = phys_hdrqtail;</div><div class='ctx'> </div><div class='ctx'> 		pd-&gt;port_rcvhdrq_size = amt;</div><div class='ctx'> </div><div class='hunk'>@@ -1410,20 +1403,28 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd,</div><div class='ctx'> 			   (unsigned long) pd-&gt;port_rcvhdrq_phys,</div><div class='ctx'> 			   (unsigned long) pd-&gt;port_rcvhdrq_size,</div><div class='ctx'> 			   pd-&gt;port_port);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * clear for security, sanity, and/or debugging, each</div><div class='del'>-		 * time we reuse</div><div class='del'>-		 */</div><div class='del'>-		memset(pd-&gt;port_rcvhdrq, 0, amt);</div><div class='add'>+</div><div class='add'>+		ipath_cdbg(VERBOSE, "port %d hdrtailaddr, %llx physical\n",</div><div class='add'>+			   pd-&gt;port_port,</div><div class='add'>+			   (unsigned long long) phys_hdrqtail);</div><div class='ctx'> 	}</div><div class='add'>+	else</div><div class='add'>+		ipath_cdbg(VERBOSE, "reuse port %d rcvhdrq @%p %llx phys; "</div><div class='add'>+			   "hdrtailaddr@%p %llx physical\n",</div><div class='add'>+			   pd-&gt;port_port, pd-&gt;port_rcvhdrq,</div><div class='add'>+			   pd-&gt;port_rcvhdrq_phys, pd-&gt;port_rcvhdrtail_kvaddr,</div><div class='add'>+			   (unsigned long long)pd-&gt;port_rcvhdrqtailaddr_phys);</div><div class='add'>+</div><div class='add'>+	/* clear for security and sanity on each use */</div><div class='add'>+	memset(pd-&gt;port_rcvhdrq, 0, pd-&gt;port_rcvhdrq_size);</div><div class='add'>+	memset((void *)pd-&gt;port_rcvhdrtail_kvaddr, 0, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * tell chip each time we init it, even if we are re-using previous</div><div class='del'>-	 * memory (we zero it at process close)</div><div class='add'>+	 * memory (we zero the register at process close)</div><div class='ctx'> 	 */</div><div class='del'>-	ipath_cdbg(VERBOSE, "writing port %d rcvhdraddr as %lx\n",</div><div class='del'>-		   pd-&gt;port_port, (unsigned long) pd-&gt;port_rcvhdrq_phys);</div><div class='add'>+	ipath_write_kreg_port(dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr,</div><div class='add'>+			      pd-&gt;port_port, pd-&gt;port_rcvhdrqtailaddr_phys);</div><div class='ctx'> 	ipath_write_kreg_port(dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdraddr,</div><div class='ctx'> 			      pd-&gt;port_port, pd-&gt;port_rcvhdrq_phys);</div><div class='ctx'> </div><div class='hunk'>@@ -1511,15 +1512,27 @@ void ipath_set_ib_lstate(struct ipath_devdata *dd, int which)</div><div class='ctx'> 		[INFINIPATH_IBCC_LINKCMD_ARMED] = "ARMED",</div><div class='ctx'> 		[INFINIPATH_IBCC_LINKCMD_ACTIVE] = "ACTIVE"</div><div class='ctx'> 	};</div><div class='add'>+	int linkcmd = (which &gt;&gt; INFINIPATH_IBCC_LINKCMD_SHIFT) &amp;</div><div class='add'>+			INFINIPATH_IBCC_LINKCMD_MASK;</div><div class='add'>+</div><div class='ctx'> 	ipath_cdbg(SMA, "Trying to move unit %u to %s, current ltstate "</div><div class='ctx'> 		   "is %s\n", dd-&gt;ipath_unit,</div><div class='del'>-		   what[(which &gt;&gt; INFINIPATH_IBCC_LINKCMD_SHIFT) &amp;</div><div class='del'>-			INFINIPATH_IBCC_LINKCMD_MASK],</div><div class='add'>+		   what[linkcmd],</div><div class='ctx'> 		   ipath_ibcstatus_str[</div><div class='ctx'> 			   (ipath_read_kreg64</div><div class='ctx'> 			    (dd, dd-&gt;ipath_kregs-&gt;kr_ibcstatus) &gt;&gt;</div><div class='ctx'> 			    INFINIPATH_IBCS_LINKTRAININGSTATE_SHIFT) &amp;</div><div class='ctx'> 			   INFINIPATH_IBCS_LINKTRAININGSTATE_MASK]);</div><div class='add'>+	/* flush all queued sends when going to DOWN or INIT, to be sure that</div><div class='add'>+	 * they don't block SMA and other MAD packets */</div><div class='add'>+	if (!linkcmd || linkcmd == INFINIPATH_IBCC_LINKCMD_INIT) {</div><div class='add'>+		ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_sendctrl,</div><div class='add'>+				 INFINIPATH_S_ABORT);</div><div class='add'>+		ipath_disarm_piobufs(dd, dd-&gt;ipath_lastport_piobuf,</div><div class='add'>+		                    (unsigned)(dd-&gt;ipath_piobcnt2k +</div><div class='add'>+				    dd-&gt;ipath_piobcnt4k) -</div><div class='add'>+				    dd-&gt;ipath_lastport_piobuf);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_ibcctrl,</div><div class='ctx'> 			 dd-&gt;ipath_ibcctrl | which);</div><div class='hunk'>@@ -1638,7 +1651,7 @@ void ipath_shutdown_device(struct ipath_devdata *dd)</div><div class='ctx'> 	/* disable IBC */</div><div class='ctx'> 	dd-&gt;ipath_control &amp;= ~INFINIPATH_C_LINKENABLE;</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_control,</div><div class='del'>-			 dd-&gt;ipath_control);</div><div class='add'>+			 dd-&gt;ipath_control | INFINIPATH_C_FREEZEMODE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * clear SerdesEnable and turn the leds off; do this here because</div><div class='hunk'>@@ -1667,60 +1680,54 @@ void ipath_shutdown_device(struct ipath_devdata *dd)</div><div class='ctx'> /**</div><div class='ctx'>  * ipath_free_pddata - free a port's allocated data</div><div class='ctx'>  * @dd: the infinipath device</div><div class='del'>- * @port: the port</div><div class='del'>- * @freehdrq: free the port data structure if true</div><div class='add'>+ * @pd: the portdata structure</div><div class='ctx'>  *</div><div class='del'>- * when closing, free up any allocated data for a port, if the</div><div class='del'>- * reference count goes to zero</div><div class='del'>- * Note: this also optionally frees the portdata itself!</div><div class='del'>- * Any changes here have to be matched up with the reinit case</div><div class='del'>- * of ipath_init_chip(), which calls this routine on reinit after reset.</div><div class='add'>+ * free up any allocated data for a port</div><div class='add'>+ * This should not touch anything that would affect a simultaneous</div><div class='add'>+ * re-allocation of port data, because it is called after ipath_mutex</div><div class='add'>+ * is released (and can be called from reinit as well).</div><div class='add'>+ * It should never change any chip state, or global driver state.</div><div class='add'>+ * (The only exception to global state is freeing the port0 port0_skbs.)</div><div class='ctx'>  */</div><div class='del'>-void ipath_free_pddata(struct ipath_devdata *dd, u32 port, int freehdrq)</div><div class='add'>+void ipath_free_pddata(struct ipath_devdata *dd, struct ipath_portdata *pd)</div><div class='ctx'> {</div><div class='del'>-	struct ipath_portdata *pd = dd-&gt;ipath_pd[port];</div><div class='del'>-</div><div class='ctx'> 	if (!pd)</div><div class='ctx'> 		return;</div><div class='del'>-	if (freehdrq)</div><div class='del'>-		/*</div><div class='del'>-		 * only clear and free portdata if we are going to also</div><div class='del'>-		 * release the hdrq, otherwise we leak the hdrq on each</div><div class='del'>-		 * open/close cycle</div><div class='del'>-		 */</div><div class='del'>-		dd-&gt;ipath_pd[port] = NULL;</div><div class='del'>-	if (freehdrq &amp;&amp; pd-&gt;port_rcvhdrq) {</div><div class='add'>+</div><div class='add'>+	if (pd-&gt;port_rcvhdrq) {</div><div class='ctx'> 		ipath_cdbg(VERBOSE, "free closed port %d rcvhdrq @ %p "</div><div class='ctx'> 			   "(size=%lu)\n", pd-&gt;port_port, pd-&gt;port_rcvhdrq,</div><div class='ctx'> 			   (unsigned long) pd-&gt;port_rcvhdrq_size);</div><div class='ctx'> 		dma_free_coherent(&amp;dd-&gt;pcidev-&gt;dev, pd-&gt;port_rcvhdrq_size,</div><div class='ctx'> 				  pd-&gt;port_rcvhdrq, pd-&gt;port_rcvhdrq_phys);</div><div class='ctx'> 		pd-&gt;port_rcvhdrq = NULL;</div><div class='add'>+		if (pd-&gt;port_rcvhdrtail_kvaddr) {</div><div class='add'>+			dma_free_coherent(&amp;dd-&gt;pcidev-&gt;dev, PAGE_SIZE,</div><div class='add'>+					 (void *)pd-&gt;port_rcvhdrtail_kvaddr,</div><div class='add'>+					 pd-&gt;port_rcvhdrqtailaddr_phys);</div><div class='add'>+			pd-&gt;port_rcvhdrtail_kvaddr = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (port &amp;&amp; pd-&gt;port_rcvegrbuf) {</div><div class='del'>-		/* always free this */</div><div class='del'>-		if (pd-&gt;port_rcvegrbuf) {</div><div class='del'>-			unsigned e;</div><div class='del'>-</div><div class='del'>-			for (e = 0; e &lt; pd-&gt;port_rcvegrbuf_chunks; e++) {</div><div class='del'>-				void *base = pd-&gt;port_rcvegrbuf[e];</div><div class='del'>-				size_t size = pd-&gt;port_rcvegrbuf_size;</div><div class='del'>-</div><div class='del'>-				ipath_cdbg(VERBOSE, "egrbuf free(%p, %lu), "</div><div class='del'>-					   "chunk %u/%u\n", base,</div><div class='del'>-					   (unsigned long) size,</div><div class='del'>-					   e, pd-&gt;port_rcvegrbuf_chunks);</div><div class='del'>-				dma_free_coherent(</div><div class='del'>-					&amp;dd-&gt;pcidev-&gt;dev, size, base,</div><div class='del'>-					pd-&gt;port_rcvegrbuf_phys[e]);</div><div class='del'>-			}</div><div class='del'>-			vfree(pd-&gt;port_rcvegrbuf);</div><div class='del'>-			pd-&gt;port_rcvegrbuf = NULL;</div><div class='del'>-			vfree(pd-&gt;port_rcvegrbuf_phys);</div><div class='del'>-			pd-&gt;port_rcvegrbuf_phys = NULL;</div><div class='add'>+	if (pd-&gt;port_port &amp;&amp; pd-&gt;port_rcvegrbuf) {</div><div class='add'>+		unsigned e;</div><div class='add'>+</div><div class='add'>+		for (e = 0; e &lt; pd-&gt;port_rcvegrbuf_chunks; e++) {</div><div class='add'>+			void *base = pd-&gt;port_rcvegrbuf[e];</div><div class='add'>+			size_t size = pd-&gt;port_rcvegrbuf_size;</div><div class='add'>+</div><div class='add'>+			ipath_cdbg(VERBOSE, "egrbuf free(%p, %lu), "</div><div class='add'>+				   "chunk %u/%u\n", base,</div><div class='add'>+				   (unsigned long) size,</div><div class='add'>+				   e, pd-&gt;port_rcvegrbuf_chunks);</div><div class='add'>+			dma_free_coherent(&amp;dd-&gt;pcidev-&gt;dev, size,</div><div class='add'>+				base, pd-&gt;port_rcvegrbuf_phys[e]);</div><div class='ctx'> 		}</div><div class='add'>+		vfree(pd-&gt;port_rcvegrbuf);</div><div class='add'>+		pd-&gt;port_rcvegrbuf = NULL;</div><div class='add'>+		vfree(pd-&gt;port_rcvegrbuf_phys);</div><div class='add'>+		pd-&gt;port_rcvegrbuf_phys = NULL;</div><div class='ctx'> 		pd-&gt;port_rcvegrbuf_chunks = 0;</div><div class='del'>-	} else if (port == 0 &amp;&amp; dd-&gt;ipath_port0_skbs) {</div><div class='add'>+	} else if (pd-&gt;port_port == 0 &amp;&amp; dd-&gt;ipath_port0_skbs) {</div><div class='ctx'> 		unsigned e;</div><div class='ctx'> 		struct sk_buff **skbs = dd-&gt;ipath_port0_skbs;</div><div class='ctx'> </div><div class='hunk'>@@ -1732,10 +1739,8 @@ void ipath_free_pddata(struct ipath_devdata *dd, u32 port, int freehdrq)</div><div class='ctx'> 				dev_kfree_skb(skbs[e]);</div><div class='ctx'> 		vfree(skbs);</div><div class='ctx'> 	}</div><div class='del'>-	if (freehdrq) {</div><div class='del'>-		kfree(pd-&gt;port_tid_pg_list);</div><div class='del'>-		kfree(pd);</div><div class='del'>-	}</div><div class='add'>+	kfree(pd-&gt;port_tid_pg_list);</div><div class='add'>+	kfree(pd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init infinipath_init(void)</div><div class='hunk'>@@ -1806,7 +1811,6 @@ static void cleanup_device(struct ipath_devdata *dd)</div><div class='ctx'> 			 * re-init</div><div class='ctx'> 			 */</div><div class='ctx'> 			dd-&gt;ipath_kregbase = NULL;</div><div class='del'>-			dd-&gt;ipath_kregvirt = NULL;</div><div class='ctx'> 			dd-&gt;ipath_uregbase = 0;</div><div class='ctx'> 			dd-&gt;ipath_sregbase = 0;</div><div class='ctx'> 			dd-&gt;ipath_cregbase = 0;</div><div class='hunk'>@@ -1821,6 +1825,12 @@ static void cleanup_device(struct ipath_devdata *dd)</div><div class='ctx'> 				  dd-&gt;ipath_pioavailregs_phys);</div><div class='ctx'> 		dd-&gt;ipath_pioavailregs_dma = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	if (dd-&gt;ipath_dummy_hdrq) {</div><div class='add'>+		dma_free_coherent(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='add'>+			dd-&gt;ipath_pd[0]-&gt;port_rcvhdrq_size,</div><div class='add'>+			dd-&gt;ipath_dummy_hdrq, dd-&gt;ipath_dummy_hdrq_phys);</div><div class='add'>+		dd-&gt;ipath_dummy_hdrq = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (dd-&gt;ipath_pageshadow) {</div><div class='ctx'> 		struct page **tmpp = dd-&gt;ipath_pageshadow;</div><div class='hunk'>@@ -1861,10 +1871,14 @@ static void cleanup_device(struct ipath_devdata *dd)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * free any resources still in use (usually just kernel ports)</div><div class='del'>-	 * at unload</div><div class='add'>+	 * at unload; we do for portcnt, not cfgports, because cfgports</div><div class='add'>+	 * could have changed while we were loaded.</div><div class='ctx'> 	 */</div><div class='del'>-	for (port = 0; port &lt; dd-&gt;ipath_cfgports; port++)</div><div class='del'>-		ipath_free_pddata(dd, port, 1);</div><div class='add'>+	for (port = 0; port &lt; dd-&gt;ipath_portcnt; port++) {</div><div class='add'>+		struct ipath_portdata *pd = dd-&gt;ipath_pd[port];</div><div class='add'>+		dd-&gt;ipath_pd[port] = NULL;</div><div class='add'>+		ipath_free_pddata(dd, pd);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(dd-&gt;ipath_pd);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * debuggability, in case some cleanup path tries to use it</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_eeprom.c b/drivers/infiniband/hw/ipath/ipath_eeprom.c<br/>index a2f1ceafcca9..3313356ab93a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_eeprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_eeprom.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -600,8 +601,31 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd)</div><div class='ctx'> 		guid = *(__be64 *) ifp-&gt;if_guid;</div><div class='ctx'> 	dd-&gt;ipath_guid = guid;</div><div class='ctx'> 	dd-&gt;ipath_nguid = ifp-&gt;if_numguid;</div><div class='del'>-	memcpy(dd-&gt;ipath_serial, ifp-&gt;if_serial,</div><div class='del'>-	       sizeof(ifp-&gt;if_serial));</div><div class='add'>+	/*</div><div class='add'>+	 * Things are slightly complicated by the desire to transparently</div><div class='add'>+	 * support both the Pathscale 10-digit serial number and the QLogic</div><div class='add'>+	 * 13-character version.</div><div class='add'>+	 */</div><div class='add'>+	if ((ifp-&gt;if_fversion &gt; 1) &amp;&amp; ifp-&gt;if_sprefix[0]</div><div class='add'>+		&amp;&amp; ((u8 *)ifp-&gt;if_sprefix)[0] != 0xFF) {</div><div class='add'>+		/* This board has a Serial-prefix, which is stored</div><div class='add'>+		 * elsewhere for backward-compatibility.</div><div class='add'>+		 */</div><div class='add'>+		char *snp = dd-&gt;ipath_serial;</div><div class='add'>+		int len;</div><div class='add'>+		memcpy(snp, ifp-&gt;if_sprefix, sizeof ifp-&gt;if_sprefix);</div><div class='add'>+		snp[sizeof ifp-&gt;if_sprefix] = '\0';</div><div class='add'>+		len = strlen(snp);</div><div class='add'>+		snp += len;</div><div class='add'>+		len = (sizeof dd-&gt;ipath_serial) - len;</div><div class='add'>+		if (len &gt; sizeof ifp-&gt;if_serial) {</div><div class='add'>+			len = sizeof ifp-&gt;if_serial;</div><div class='add'>+		}</div><div class='add'>+		memcpy(snp, ifp-&gt;if_serial, len);</div><div class='add'>+	} else</div><div class='add'>+		memcpy(dd-&gt;ipath_serial, ifp-&gt;if_serial,</div><div class='add'>+		       sizeof ifp-&gt;if_serial);</div><div class='add'>+</div><div class='ctx'> 	ipath_cdbg(VERBOSE, "Initted GUID to %llx from eeprom\n",</div><div class='ctx'> 		   (unsigned long long) be64_to_cpu(dd-&gt;ipath_guid));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c<br/>index ada267e41f6c..bbaa70e57db1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_file_ops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_file_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_file_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_file_ops.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -38,8 +39,8 @@</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='ctx'> #include "ipath_layer.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> static int ipath_open(struct inode *, struct file *);</div><div class='ctx'> static int ipath_close(struct inode *, struct file *);</div><div class='hunk'>@@ -122,6 +123,7 @@ static int ipath_get_base_info(struct ipath_portdata *pd,</div><div class='ctx'> 	 * on to yet another method of dealing with this</div><div class='ctx'> 	 */</div><div class='ctx'> 	kinfo-&gt;spi_rcvhdr_base = (u64) pd-&gt;port_rcvhdrq_phys;</div><div class='add'>+	kinfo-&gt;spi_rcvhdr_tailaddr = (u64)pd-&gt;port_rcvhdrqtailaddr_phys;</div><div class='ctx'> 	kinfo-&gt;spi_rcv_egrbufs = (u64) pd-&gt;port_rcvegr_phys;</div><div class='ctx'> 	kinfo-&gt;spi_pioavailaddr = (u64) dd-&gt;ipath_pioavailregs_phys;</div><div class='ctx'> 	kinfo-&gt;spi_status = (u64) kinfo-&gt;spi_pioavailaddr +</div><div class='hunk'>@@ -456,7 +458,7 @@ static int ipath_set_part_key(struct ipath_portdata *pd, u16 key)</div><div class='ctx'> 	u16 lkey = key &amp; 0x7FFF;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (lkey == (IPS_DEFAULT_P_KEY &amp; 0x7FFF)) {</div><div class='add'>+	if (lkey == (IPATH_DEFAULT_P_KEY &amp; 0x7FFF)) {</div><div class='ctx'> 		/* nothing to do; this key always valid */</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 		goto bail;</div><div class='hunk'>@@ -704,6 +706,15 @@ static int ipath_create_user_egr(struct ipath_portdata *pd)</div><div class='ctx'> 	unsigned e, egrcnt, alloced, egrperchunk, chunk, egrsize, egroff;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	int ret;</div><div class='add'>+	gfp_t gfp_flags;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * GFP_USER, but without GFP_FS, so buffer cache can be</div><div class='add'>+	 * coalesced (we hope); otherwise, even at order 4,</div><div class='add'>+	 * heavy filesystem activity makes these fail, and we can</div><div class='add'>+	 * use compound pages.</div><div class='add'>+	 */</div><div class='add'>+	gfp_flags = __GFP_WAIT | __GFP_IO | __GFP_COMP;</div><div class='ctx'> </div><div class='ctx'> 	egrcnt = dd-&gt;ipath_rcvegrcnt;</div><div class='ctx'> 	/* TID number offset for this port */</div><div class='hunk'>@@ -720,10 +731,8 @@ static int ipath_create_user_egr(struct ipath_portdata *pd)</div><div class='ctx'> 	 * memory pressure (creating large files and then copying them over</div><div class='ctx'> 	 * NFS while doing lots of MPI jobs), we hit some allocation</div><div class='ctx'> 	 * failures, even though we can sleep...  (2.6.10) Still get</div><div class='del'>-	 * failures at 64K.  32K is the lowest we can go without waiting</div><div class='del'>-	 * more memory again.  It seems likely that the coalescing in</div><div class='del'>-	 * free_pages, etc. still has issues (as it has had previously</div><div class='del'>-	 * during 2.6.x development).</div><div class='add'>+	 * failures at 64K.  32K is the lowest we can go without wasting</div><div class='add'>+	 * additional memory.</div><div class='ctx'> 	 */</div><div class='ctx'> 	size = 0x8000;</div><div class='ctx'> 	alloced = ALIGN(egrsize * egrcnt, size);</div><div class='hunk'>@@ -744,12 +753,6 @@ static int ipath_create_user_egr(struct ipath_portdata *pd)</div><div class='ctx'> 		goto bail_rcvegrbuf;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (e = 0; e &lt; pd-&gt;port_rcvegrbuf_chunks; e++) {</div><div class='del'>-		/*</div><div class='del'>-		 * GFP_USER, but without GFP_FS, so buffer cache can be</div><div class='del'>-		 * coalesced (we hope); otherwise, even at order 4,</div><div class='del'>-		 * heavy filesystem activity makes these fail</div><div class='del'>-		 */</div><div class='del'>-		gfp_t gfp_flags = __GFP_WAIT | __GFP_IO | __GFP_COMP;</div><div class='ctx'> </div><div class='ctx'> 		pd-&gt;port_rcvegrbuf[e] = dma_alloc_coherent(</div><div class='ctx'> 			&amp;dd-&gt;pcidev-&gt;dev, size, &amp;pd-&gt;port_rcvegrbuf_phys[e],</div><div class='hunk'>@@ -783,11 +786,12 @@ static int ipath_create_user_egr(struct ipath_portdata *pd)</div><div class='ctx'> </div><div class='ctx'> bail_rcvegrbuf_phys:</div><div class='ctx'> 	for (e = 0; e &lt; pd-&gt;port_rcvegrbuf_chunks &amp;&amp;</div><div class='del'>-		     pd-&gt;port_rcvegrbuf[e]; e++)</div><div class='add'>+		pd-&gt;port_rcvegrbuf[e]; e++) {</div><div class='ctx'> 		dma_free_coherent(&amp;dd-&gt;pcidev-&gt;dev, size,</div><div class='ctx'> 				  pd-&gt;port_rcvegrbuf[e],</div><div class='ctx'> 				  pd-&gt;port_rcvegrbuf_phys[e]);</div><div class='ctx'> </div><div class='add'>+	}</div><div class='ctx'> 	vfree(pd-&gt;port_rcvegrbuf_phys);</div><div class='ctx'> 	pd-&gt;port_rcvegrbuf_phys = NULL;</div><div class='ctx'> bail_rcvegrbuf:</div><div class='hunk'>@@ -802,10 +806,7 @@ static int ipath_do_user_init(struct ipath_portdata *pd,</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct ipath_devdata *dd = pd-&gt;port_dd;</div><div class='del'>-	u64 physaddr, uaddr, off, atmp;</div><div class='del'>-	struct page *pagep;</div><div class='ctx'> 	u32 head32;</div><div class='del'>-	u64 head;</div><div class='ctx'> </div><div class='ctx'> 	/* for now, if major version is different, bail */</div><div class='ctx'> 	if ((uinfo-&gt;spu_userversion &gt;&gt; 16) != IPATH_USER_SWMAJOR) {</div><div class='hunk'>@@ -830,54 +831,6 @@ static int ipath_do_user_init(struct ipath_portdata *pd,</div><div class='ctx'> </div><div class='ctx'> 	/* for now we do nothing with rcvhdrcnt: uinfo-&gt;spu_rcvhdrcnt */</div><div class='ctx'> </div><div class='del'>-	/* set up for the rcvhdr Q tail register writeback to user memory */</div><div class='del'>-	if (!uinfo-&gt;spu_rcvhdraddr ||</div><div class='del'>-	    !access_ok(VERIFY_WRITE, (u64 __user *) (unsigned long)</div><div class='del'>-		       uinfo-&gt;spu_rcvhdraddr, sizeof(u64))) {</div><div class='del'>-		ipath_dbg("Port %d rcvhdrtail addr %llx not valid\n",</div><div class='del'>-			  pd-&gt;port_port,</div><div class='del'>-			  (unsigned long long) uinfo-&gt;spu_rcvhdraddr);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	off = offset_in_page(uinfo-&gt;spu_rcvhdraddr);</div><div class='del'>-	uaddr = PAGE_MASK &amp; (unsigned long) uinfo-&gt;spu_rcvhdraddr;</div><div class='del'>-	ret = ipath_get_user_pages_nocopy(uaddr, &amp;pagep);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_info(&amp;dd-&gt;pcidev-&gt;dev, "Failed to lookup and lock "</div><div class='del'>-			 "address %llx for rcvhdrtail: errno %d\n",</div><div class='del'>-			 (unsigned long long) uinfo-&gt;spu_rcvhdraddr, -ret);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	ipath_stats.sps_pagelocks++;</div><div class='del'>-	pd-&gt;port_rcvhdrtail_uaddr = uaddr;</div><div class='del'>-	pd-&gt;port_rcvhdrtail_pagep = pagep;</div><div class='del'>-	pd-&gt;port_rcvhdrtail_kvaddr =</div><div class='del'>-		page_address(pagep);</div><div class='del'>-	pd-&gt;port_rcvhdrtail_kvaddr += off;</div><div class='del'>-	physaddr = page_to_phys(pagep) + off;</div><div class='del'>-	ipath_cdbg(VERBOSE, "port %d user addr %llx hdrtailaddr, %llx "</div><div class='del'>-		   "physical (off=%llx)\n",</div><div class='del'>-		   pd-&gt;port_port,</div><div class='del'>-		   (unsigned long long) uinfo-&gt;spu_rcvhdraddr,</div><div class='del'>-		   (unsigned long long) physaddr, (unsigned long long) off);</div><div class='del'>-	ipath_write_kreg_port(dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr,</div><div class='del'>-			      pd-&gt;port_port, physaddr);</div><div class='del'>-	atmp = ipath_read_kreg64_port(dd,</div><div class='del'>-				      dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr,</div><div class='del'>-				      pd-&gt;port_port);</div><div class='del'>-	if (physaddr != atmp) {</div><div class='del'>-		ipath_dev_err(dd,</div><div class='del'>-			      "Catastrophic software error, "</div><div class='del'>-			      "RcvHdrTailAddr%u written as %llx, "</div><div class='del'>-			      "read back as %llx\n", pd-&gt;port_port,</div><div class='del'>-			      (unsigned long long) physaddr,</div><div class='del'>-			      (unsigned long long) atmp);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* for right now, kernel piobufs are at end, so port 1 is at 0 */</div><div class='ctx'> 	pd-&gt;port_piobufs = dd-&gt;ipath_piobufbase +</div><div class='ctx'> 		dd-&gt;ipath_pbufsport * (pd-&gt;port_port -</div><div class='hunk'>@@ -896,26 +849,18 @@ static int ipath_do_user_init(struct ipath_portdata *pd,</div><div class='ctx'> 		ret = ipath_create_user_egr(pd);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto done;</div><div class='del'>-	/* enable receives now */</div><div class='del'>-	/* atomically set enable bit for this port */</div><div class='del'>-	set_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd-&gt;port_port,</div><div class='del'>-		&amp;dd-&gt;ipath_rcvctrl);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * set the head registers for this port to the current values</div><div class='add'>+	 * set the eager head register for this port to the current values</div><div class='ctx'> 	 * of the tail pointers, since we don't know if they were</div><div class='ctx'> 	 * updated on last use of the port.</div><div class='ctx'> 	 */</div><div class='del'>-	head32 = ipath_read_ureg32(dd, ur_rcvhdrtail, pd-&gt;port_port);</div><div class='del'>-	head = (u64) head32;</div><div class='del'>-	ipath_write_ureg(dd, ur_rcvhdrhead, head, pd-&gt;port_port);</div><div class='ctx'> 	head32 = ipath_read_ureg32(dd, ur_rcvegrindextail, pd-&gt;port_port);</div><div class='ctx'> 	ipath_write_ureg(dd, ur_rcvegrindexhead, head32, pd-&gt;port_port);</div><div class='ctx'> 	dd-&gt;ipath_lastegrheads[pd-&gt;port_port] = -1;</div><div class='ctx'> 	dd-&gt;ipath_lastrcvhdrqtails[pd-&gt;port_port] = -1;</div><div class='del'>-	ipath_cdbg(VERBOSE, "Wrote port%d head %llx, egrhead %x from "</div><div class='del'>-		   "tail regs\n", pd-&gt;port_port,</div><div class='del'>-		   (unsigned long long) head, head32);</div><div class='add'>+	ipath_cdbg(VERBOSE, "Wrote port%d egrhead %x from tail regs\n",</div><div class='add'>+		pd-&gt;port_port, head32);</div><div class='ctx'> 	pd-&gt;port_tidcursor = 0;	/* start at beginning after open */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * now enable the port; the tail registers will be written to memory</div><div class='hunk'>@@ -924,24 +869,76 @@ static int ipath_do_user_init(struct ipath_portdata *pd,</div><div class='ctx'> 	 * transition from 0 to 1, so clear it first, then set it as part of</div><div class='ctx'> 	 * enabling the port.  This will (very briefly) affect any other</div><div class='ctx'> 	 * open ports, but it shouldn't be long enough to be an issue.</div><div class='add'>+	 * We explictly set the in-memory copy to 0 beforehand, so we don't</div><div class='add'>+	 * have to wait to be sure the DMA update has happened.</div><div class='ctx'> 	 */</div><div class='add'>+	*pd-&gt;port_rcvhdrtail_kvaddr = 0ULL;</div><div class='add'>+	set_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd-&gt;port_port,</div><div class='add'>+		&amp;dd-&gt;ipath_rcvctrl);</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_rcvctrl,</div><div class='ctx'> 			 dd-&gt;ipath_rcvctrl &amp; ~INFINIPATH_R_TAILUPD);</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_rcvctrl,</div><div class='ctx'> 			 dd-&gt;ipath_rcvctrl);</div><div class='del'>-</div><div class='ctx'> done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* common code for the mappings on dma_alloc_coherent mem */</div><div class='add'>+static int ipath_mmap_mem(struct vm_area_struct *vma,</div><div class='add'>+			     struct ipath_portdata *pd, unsigned len,</div><div class='add'>+			     int write_ok, dma_addr_t addr, char *what)</div><div class='add'>+{</div><div class='add'>+	struct ipath_devdata *dd = pd-&gt;port_dd;</div><div class='add'>+	unsigned pfn = (unsigned long)addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; len) {</div><div class='add'>+		dev_info(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='add'>+		         "FAIL on %s: len %lx &gt; %x\n", what,</div><div class='add'>+			 vma-&gt;vm_end - vma-&gt;vm_start, len);</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!write_ok) {</div><div class='add'>+		if (vma-&gt;vm_flags &amp; VM_WRITE) {</div><div class='add'>+			dev_info(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='add'>+				 "%s must be mapped readonly\n", what);</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* don't allow them to later change with mprotect */</div><div class='add'>+		vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = remap_pfn_range(vma, vma-&gt;vm_start, pfn,</div><div class='add'>+			      len, vma-&gt;vm_page_prot);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_info(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='add'>+			 "%s port%u mmap of %lx, %x bytes r%c failed: %d\n",</div><div class='add'>+			 what, pd-&gt;port_port, (unsigned long)addr, len,</div><div class='add'>+			 write_ok?'w':'o', ret);</div><div class='add'>+	else</div><div class='add'>+		ipath_cdbg(VERBOSE, "%s port%u mmaped %lx, %x bytes r%c\n",</div><div class='add'>+			what, pd-&gt;port_port, (unsigned long)addr, len,</div><div class='add'>+			 write_ok?'w':'o');</div><div class='add'>+bail:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mmap_ureg(struct vm_area_struct *vma, struct ipath_devdata *dd,</div><div class='ctx'> 		     u64 ureg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long phys;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* it's the real hardware, so io_remap works */</div><div class='del'>-</div><div class='add'>+	/*</div><div class='add'>+	 * This is real hardware, so use io_remap.  This is the mechanism</div><div class='add'>+	 * for the user process to update the head registers for their port</div><div class='add'>+	 * in the chip.</div><div class='add'>+	 */</div><div class='ctx'> 	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; PAGE_SIZE) {</div><div class='ctx'> 		dev_info(&amp;dd-&gt;pcidev-&gt;dev, "FAIL mmap userreg: reqlen "</div><div class='ctx'> 			 "%lx &gt; PAGE\n", vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='hunk'>@@ -967,10 +964,11 @@ static int mmap_piobufs(struct vm_area_struct *vma,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * When we map the PIO buffers, we want to map them as writeonly, no</div><div class='del'>-	 * read possible.</div><div class='add'>+	 * When we map the PIO buffers in the chip, we want to map them as</div><div class='add'>+	 * writeonly, no read possible.   This prevents access to previous</div><div class='add'>+	 * process data, and catches users who might try to read the i/o</div><div class='add'>+	 * space due to a bug.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt;</div><div class='ctx'> 	    (dd-&gt;ipath_pbufsport * dd-&gt;ipath_palign)) {</div><div class='ctx'> 		dev_info(&amp;dd-&gt;pcidev-&gt;dev, "FAIL mmap piobufs: "</div><div class='hunk'>@@ -981,11 +979,10 @@ static int mmap_piobufs(struct vm_area_struct *vma,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	phys = dd-&gt;ipath_physaddr + pd-&gt;port_piobufs;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	 * Do *NOT* mark this as non-cached (PWT bit), or we don't get the</div><div class='add'>+	 * Don't mark this as non-cached, or we don't get the</div><div class='ctx'> 	 * write combining behavior we want on the PIO buffers!</div><div class='del'>-	 * vma-&gt;vm_page_prot =</div><div class='del'>-	 *        pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_READ) {</div><div class='hunk'>@@ -997,8 +994,7 @@ static int mmap_piobufs(struct vm_area_struct *vma,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* don't allow them to later change to readable with mprotect */</div><div class='del'>-</div><div class='del'>-	vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='add'>+	vma-&gt;vm_flags &amp;= ~VM_MAYREAD;</div><div class='ctx'> 	vma-&gt;vm_flags |= VM_DONTCOPY | VM_DONTEXPAND;</div><div class='ctx'> </div><div class='ctx'> 	ret = io_remap_pfn_range(vma, vma-&gt;vm_start, phys &gt;&gt; PAGE_SHIFT,</div><div class='hunk'>@@ -1017,11 +1013,6 @@ static int mmap_rcvegrbufs(struct vm_area_struct *vma,</div><div class='ctx'> 	dma_addr_t *phys;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!pd-&gt;port_rcvegrbuf) {</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	size = pd-&gt;port_rcvegrbuf_size;</div><div class='ctx'> 	total_size = pd-&gt;port_rcvegrbuf_chunks * size;</div><div class='ctx'> 	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; total_size) {</div><div class='hunk'>@@ -1039,13 +1030,12 @@ static int mmap_rcvegrbufs(struct vm_area_struct *vma,</div><div class='ctx'> 		ret = -EPERM;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='add'>+	/* don't allow them to later change to writeable with mprotect */</div><div class='add'>+	vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='ctx'> </div><div class='ctx'> 	start = vma-&gt;vm_start;</div><div class='ctx'> 	phys = pd-&gt;port_rcvegrbuf_phys;</div><div class='ctx'> </div><div class='del'>-	/* don't allow them to later change to writeable with mprotect */</div><div class='del'>-	vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; pd-&gt;port_rcvegrbuf_chunks; i++, start += size) {</div><div class='ctx'> 		ret = remap_pfn_range(vma, start, phys[i] &gt;&gt; PAGE_SHIFT,</div><div class='ctx'> 				      size, vma-&gt;vm_page_prot);</div><div class='hunk'>@@ -1058,78 +1048,6 @@ bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mmap_rcvhdrq(struct vm_area_struct *vma,</div><div class='del'>-			struct ipath_portdata *pd)</div><div class='del'>-{</div><div class='del'>-	struct ipath_devdata *dd = pd-&gt;port_dd;</div><div class='del'>-	size_t total_size;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * kmalloc'ed memory, physically contiguous; this is from</div><div class='del'>-	 * spi_rcvhdr_base; we allow user to map read-write so they can</div><div class='del'>-	 * write hdrq entries to allow protocol code to directly poll</div><div class='del'>-	 * whether a hdrq entry has been written.</div><div class='del'>-	 */</div><div class='del'>-	total_size = ALIGN(dd-&gt;ipath_rcvhdrcnt * dd-&gt;ipath_rcvhdrentsize *</div><div class='del'>-			   sizeof(u32), PAGE_SIZE);</div><div class='del'>-	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; total_size) {</div><div class='del'>-		dev_info(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='del'>-			 "FAIL on rcvhdrq: reqlen %lx &gt; actual %lx\n",</div><div class='del'>-			 vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='del'>-			 (unsigned long) total_size);</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='del'>-			      pd-&gt;port_rcvhdrq_phys &gt;&gt; PAGE_SHIFT,</div><div class='del'>-			      vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='del'>-			      vma-&gt;vm_page_prot);</div><div class='del'>-bail:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mmap_pioavailregs(struct vm_area_struct *vma,</div><div class='del'>-			     struct ipath_portdata *pd)</div><div class='del'>-{</div><div class='del'>-	struct ipath_devdata *dd = pd-&gt;port_dd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * when we map the PIO bufferavail registers, we want to map them as</div><div class='del'>-	 * readonly, no write possible.</div><div class='del'>-	 *</div><div class='del'>-	 * kmalloc'ed memory, physically contiguous, one page only, readonly</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if ((vma-&gt;vm_end - vma-&gt;vm_start) &gt; PAGE_SIZE) {</div><div class='del'>-		dev_info(&amp;dd-&gt;pcidev-&gt;dev, "FAIL on pioavailregs_dma: "</div><div class='del'>-			 "reqlen %lx &gt; actual %lx\n",</div><div class='del'>-			 vma-&gt;vm_end - vma-&gt;vm_start,</div><div class='del'>-			 (unsigned long) PAGE_SIZE);</div><div class='del'>-		ret = -EFAULT;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_WRITE) {</div><div class='del'>-		dev_info(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='del'>-			 "Can't map pioavailregs as writable (flags=%lx)\n",</div><div class='del'>-			 vma-&gt;vm_flags);</div><div class='del'>-		ret = -EPERM;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* don't allow them to later change with mprotect */</div><div class='del'>-	vma-&gt;vm_flags &amp;= ~VM_MAYWRITE;</div><div class='del'>-</div><div class='del'>-	ret = remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='del'>-			      dd-&gt;ipath_pioavailregs_phys &gt;&gt; PAGE_SHIFT,</div><div class='del'>-			      PAGE_SIZE, vma-&gt;vm_page_prot);</div><div class='del'>-bail:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * ipath_mmap - mmap various structures into user space</div><div class='ctx'>  * @fp: the file pointer</div><div class='hunk'>@@ -1149,6 +1067,7 @@ static int ipath_mmap(struct file *fp, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	pd = port_fp(fp);</div><div class='ctx'> 	dd = pd-&gt;port_dd;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is the ipath_do_user_init() code, mapping the shared buffers</div><div class='ctx'> 	 * into the user process. The address referred to by vm_pgoff is the</div><div class='hunk'>@@ -1158,28 +1077,59 @@ static int ipath_mmap(struct file *fp, struct vm_area_struct *vma)</div><div class='ctx'> 	pgaddr = vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * note that ureg does *NOT* have the kregvirt as part of it, to be</div><div class='del'>-	 * sure that for 32 bit programs, we don't end up trying to map a &gt;</div><div class='del'>-	 * 44 address.  Has to match ipath_get_base_info() code that sets</div><div class='del'>-	 * __spi_uregbase</div><div class='add'>+	 * Must fit in 40 bits for our hardware; some checked elsewhere,</div><div class='add'>+	 * but we'll be paranoid.  Check for 0 is mostly in case one of the</div><div class='add'>+	 * allocations failed, but user called mmap anyway.   We want to catch</div><div class='add'>+	 * that before it can match.</div><div class='ctx'> 	 */</div><div class='add'>+	if (!pgaddr || pgaddr &gt;= (1ULL&lt;&lt;40))  {</div><div class='add'>+		ipath_dev_err(dd, "Bad phys addr %llx, start %lx, end %lx\n",</div><div class='add'>+			(unsigned long long)pgaddr, vma-&gt;vm_start, vma-&gt;vm_end);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* just the offset of the port user registers, not physical addr */</div><div class='ctx'> 	ureg = dd-&gt;ipath_uregbase + dd-&gt;ipath_palign * pd-&gt;port_port;</div><div class='ctx'> </div><div class='ctx'> 	ipath_cdbg(MM, "ushare: pgaddr %llx vm_start=%lx, vmlen %lx\n",</div><div class='ctx'> 		   (unsigned long long) pgaddr, vma-&gt;vm_start,</div><div class='ctx'> 		   vma-&gt;vm_end - vma-&gt;vm_start);</div><div class='ctx'> </div><div class='del'>-	if (pgaddr == ureg)</div><div class='add'>+	if (vma-&gt;vm_start &amp; (PAGE_SIZE-1)) {</div><div class='add'>+		ipath_dev_err(dd,</div><div class='add'>+			"vm_start not aligned: %lx, end=%lx phys %lx\n",</div><div class='add'>+			vma-&gt;vm_start, vma-&gt;vm_end, (unsigned long)pgaddr);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	else if (pgaddr == ureg)</div><div class='ctx'> 		ret = mmap_ureg(vma, dd, ureg);</div><div class='ctx'> 	else if (pgaddr == pd-&gt;port_piobufs)</div><div class='ctx'> 		ret = mmap_piobufs(vma, dd, pd);</div><div class='ctx'> 	else if (pgaddr == (u64) pd-&gt;port_rcvegr_phys)</div><div class='ctx'> 		ret = mmap_rcvegrbufs(vma, pd);</div><div class='del'>-	else if (pgaddr == (u64) pd-&gt;port_rcvhdrq_phys)</div><div class='del'>-		ret = mmap_rcvhdrq(vma, pd);</div><div class='add'>+	else if (pgaddr == (u64) pd-&gt;port_rcvhdrq_phys) {</div><div class='add'>+		/*</div><div class='add'>+		 * The rcvhdrq itself; readonly except on HT-400 (so have</div><div class='add'>+		 * to allow writable mapping), multiple pages, contiguous</div><div class='add'>+		 * from an i/o perspective.</div><div class='add'>+		 */</div><div class='add'>+		unsigned total_size =</div><div class='add'>+			ALIGN(dd-&gt;ipath_rcvhdrcnt * dd-&gt;ipath_rcvhdrentsize</div><div class='add'>+			   * sizeof(u32), PAGE_SIZE);</div><div class='add'>+		ret = ipath_mmap_mem(vma, pd, total_size, 1,</div><div class='add'>+				     pd-&gt;port_rcvhdrq_phys,</div><div class='add'>+				     "rcvhdrq");</div><div class='add'>+	}</div><div class='add'>+	else if (pgaddr == (u64)pd-&gt;port_rcvhdrqtailaddr_phys)</div><div class='add'>+		/* in-memory copy of rcvhdrq tail register */</div><div class='add'>+		ret = ipath_mmap_mem(vma, pd, PAGE_SIZE, 0,</div><div class='add'>+				     pd-&gt;port_rcvhdrqtailaddr_phys,</div><div class='add'>+				     "rcvhdrq tail");</div><div class='ctx'> 	else if (pgaddr == dd-&gt;ipath_pioavailregs_phys)</div><div class='del'>-		ret = mmap_pioavailregs(vma, pd);</div><div class='add'>+		/* in-memory copy of pioavail registers */</div><div class='add'>+		ret = ipath_mmap_mem(vma, pd, PAGE_SIZE, 0,</div><div class='add'>+				     dd-&gt;ipath_pioavailregs_phys,</div><div class='add'>+				     "pioavail registers");</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1442,16 +1392,16 @@ done:</div><div class='ctx'> </div><div class='ctx'> static int ipath_open(struct inode *in, struct file *fp)</div><div class='ctx'> {</div><div class='del'>-	int ret, minor;</div><div class='add'>+	int ret, user_minor;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ipath_mutex);</div><div class='ctx'> </div><div class='del'>-	minor = iminor(in);</div><div class='add'>+	user_minor = iminor(in) - IPATH_USER_MINOR_BASE;</div><div class='ctx'> 	ipath_cdbg(VERBOSE, "open on dev %lx (minor %d)\n",</div><div class='del'>-		   (long)in-&gt;i_rdev, minor);</div><div class='add'>+		   (long)in-&gt;i_rdev, user_minor);</div><div class='ctx'> </div><div class='del'>-	if (minor)</div><div class='del'>-		ret = find_free_port(minor - 1, fp);</div><div class='add'>+	if (user_minor)</div><div class='add'>+		ret = find_free_port(user_minor - 1, fp);</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = find_best_unit(fp);</div><div class='ctx'> </div><div class='hunk'>@@ -1536,53 +1486,54 @@ static int ipath_close(struct inode *in, struct file *fp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dd-&gt;ipath_kregbase) {</div><div class='del'>-		if (pd-&gt;port_rcvhdrtail_uaddr) {</div><div class='del'>-			pd-&gt;port_rcvhdrtail_uaddr = 0;</div><div class='del'>-			pd-&gt;port_rcvhdrtail_kvaddr = NULL;</div><div class='del'>-			ipath_release_user_pages_on_close(</div><div class='del'>-				&amp;pd-&gt;port_rcvhdrtail_pagep, 1);</div><div class='del'>-			pd-&gt;port_rcvhdrtail_pagep = NULL;</div><div class='del'>-			ipath_stats.sps_pageunlocks++;</div><div class='del'>-		}</div><div class='del'>-		ipath_write_kreg_port(</div><div class='del'>-			dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr,</div><div class='del'>-			port, 0ULL);</div><div class='del'>-		ipath_write_kreg_port(</div><div class='del'>-			dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdraddr,</div><div class='del'>-			pd-&gt;port_port, 0);</div><div class='add'>+		int i;</div><div class='add'>+		/* atomically clear receive enable port. */</div><div class='add'>+		clear_bit(INFINIPATH_R_PORTENABLE_SHIFT + port,</div><div class='add'>+			  &amp;dd-&gt;ipath_rcvctrl);</div><div class='add'>+		ipath_write_kreg( dd, dd-&gt;ipath_kregs-&gt;kr_rcvctrl,</div><div class='add'>+			dd-&gt;ipath_rcvctrl);</div><div class='add'>+		/* and read back from chip to be sure that nothing</div><div class='add'>+		 * else is in flight when we do the rest */</div><div class='add'>+		(void)ipath_read_kreg64(dd, dd-&gt;ipath_kregs-&gt;kr_scratch);</div><div class='ctx'> </div><div class='ctx'> 		/* clean up the pkeys for this port user */</div><div class='ctx'> 		ipath_clean_part_key(pd, dd);</div><div class='ctx'> </div><div class='del'>-		if (port &lt; dd-&gt;ipath_cfgports) {</div><div class='del'>-			int i = dd-&gt;ipath_pbufsport * (port - 1);</div><div class='del'>-			ipath_disarm_piobufs(dd, i, dd-&gt;ipath_pbufsport);</div><div class='ctx'> </div><div class='del'>-			/* atomically clear receive enable port. */</div><div class='del'>-			clear_bit(INFINIPATH_R_PORTENABLE_SHIFT + port,</div><div class='del'>-				  &amp;dd-&gt;ipath_rcvctrl);</div><div class='del'>-			ipath_write_kreg(</div><div class='del'>-				dd,</div><div class='del'>-				dd-&gt;ipath_kregs-&gt;kr_rcvctrl,</div><div class='del'>-				dd-&gt;ipath_rcvctrl);</div><div class='del'>-</div><div class='del'>-			if (dd-&gt;ipath_pageshadow)</div><div class='del'>-				unlock_expected_tids(pd);</div><div class='del'>-			ipath_stats.sps_ports--;</div><div class='del'>-			ipath_cdbg(PROC, "%s[%u] closed port %u:%u\n",</div><div class='del'>-				   pd-&gt;port_comm, pd-&gt;port_pid,</div><div class='del'>-				   dd-&gt;ipath_unit, port);</div><div class='del'>-		}</div><div class='add'>+		/*</div><div class='add'>+		 * be paranoid, and never write 0's to these, just use an</div><div class='add'>+		 * unused part of the port 0 tail page.  Of course,</div><div class='add'>+		 * rcvhdraddr points to a large chunk of memory, so this</div><div class='add'>+		 * could still trash things, but at least it won't trash</div><div class='add'>+		 * page 0, and by disabling the port, it should stop "soon",</div><div class='add'>+		 * even if a packet or two is in already in flight after we</div><div class='add'>+		 * disabled the port.</div><div class='add'>+		 */</div><div class='add'>+		ipath_write_kreg_port(dd,</div><div class='add'>+		        dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr, port,</div><div class='add'>+			dd-&gt;ipath_dummy_hdrq_phys);</div><div class='add'>+		ipath_write_kreg_port(dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdraddr,</div><div class='add'>+			pd-&gt;port_port, dd-&gt;ipath_dummy_hdrq_phys);</div><div class='add'>+</div><div class='add'>+		i = dd-&gt;ipath_pbufsport * (port - 1);</div><div class='add'>+		ipath_disarm_piobufs(dd, i, dd-&gt;ipath_pbufsport);</div><div class='add'>+</div><div class='add'>+		if (dd-&gt;ipath_pageshadow)</div><div class='add'>+			unlock_expected_tids(pd);</div><div class='add'>+		ipath_stats.sps_ports--;</div><div class='add'>+		ipath_cdbg(PROC, "%s[%u] closed port %u:%u\n",</div><div class='add'>+			   pd-&gt;port_comm, pd-&gt;port_pid,</div><div class='add'>+			   dd-&gt;ipath_unit, port);</div><div class='add'>+</div><div class='add'>+		dd-&gt;ipath_f_clear_tids(dd, pd-&gt;port_port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pd-&gt;port_cnt = 0;</div><div class='ctx'> 	pd-&gt;port_pid = 0;</div><div class='ctx'> </div><div class='del'>-	dd-&gt;ipath_f_clear_tids(dd, pd-&gt;port_port);</div><div class='del'>-</div><div class='del'>-	ipath_free_pddata(dd, pd-&gt;port_port, 0);</div><div class='del'>-</div><div class='add'>+	dd-&gt;ipath_pd[pd-&gt;port_port] = NULL; /* before releasing mutex */</div><div class='ctx'> 	mutex_unlock(&amp;ipath_mutex);</div><div class='add'>+	ipath_free_pddata(dd, pd); /* after releasing the mutex */</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1859,19 +1810,12 @@ int ipath_user_add(struct ipath_devdata *dd)</div><div class='ctx'> 				      "error %d\n", -ret);</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='del'>-		ret = ipath_diag_init();</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			ipath_dev_err(dd, "Unable to set up diag support: "</div><div class='del'>-				      "error %d\n", -ret);</div><div class='del'>-			goto bail_sma;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		ret = init_cdev(0, "ipath", &amp;ipath_file_ops, &amp;wildcard_cdev,</div><div class='ctx'> 				&amp;wildcard_class_dev);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			ipath_dev_err(dd, "Could not create wildcard "</div><div class='ctx'> 				      "minor: error %d\n", -ret);</div><div class='del'>-			goto bail_diag;</div><div class='add'>+			goto bail_sma;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		atomic_set(&amp;user_setup, 1);</div><div class='hunk'>@@ -1880,31 +1824,28 @@ int ipath_user_add(struct ipath_devdata *dd)</div><div class='ctx'> 	snprintf(name, sizeof(name), "ipath%d", dd-&gt;ipath_unit);</div><div class='ctx'> </div><div class='ctx'> 	ret = init_cdev(dd-&gt;ipath_unit + 1, name, &amp;ipath_file_ops,</div><div class='del'>-			&amp;dd-&gt;cdev, &amp;dd-&gt;class_dev);</div><div class='add'>+			&amp;dd-&gt;user_cdev, &amp;dd-&gt;user_class_dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		ipath_dev_err(dd, "Could not create user minor %d, %s\n",</div><div class='ctx'> 			      dd-&gt;ipath_unit + 1, name);</div><div class='ctx'> </div><div class='ctx'> 	goto bail;</div><div class='ctx'> </div><div class='del'>-bail_diag:</div><div class='del'>-	ipath_diag_cleanup();</div><div class='ctx'> bail_sma:</div><div class='ctx'> 	user_cleanup();</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ipath_user_del(struct ipath_devdata *dd)</div><div class='add'>+void ipath_user_remove(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='del'>-	cleanup_cdev(&amp;dd-&gt;cdev, &amp;dd-&gt;class_dev);</div><div class='add'>+	cleanup_cdev(&amp;dd-&gt;user_cdev, &amp;dd-&gt;user_class_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_dec_return(&amp;user_count) == 0) {</div><div class='ctx'> 		if (atomic_read(&amp;user_setup) == 0)</div><div class='ctx'> 			goto bail;</div><div class='ctx'> </div><div class='ctx'> 		cleanup_cdev(&amp;wildcard_cdev, &amp;wildcard_class_dev);</div><div class='del'>-		ipath_diag_cleanup();</div><div class='ctx'> 		user_cleanup();</div><div class='ctx'> </div><div class='ctx'> 		atomic_set(&amp;user_setup, 0);</div><div class='hunk'>@@ -1912,3 +1853,4 @@ void ipath_user_del(struct ipath_devdata *dd)</div><div class='ctx'> bail:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c<br/>index e274120567e1..0936d8e8d704 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_fs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_fs.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -31,7 +32,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -542,13 +542,14 @@ bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *ipathfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-				        int flags, const char *dev_name,</div><div class='del'>-					void *data)</div><div class='add'>+static int ipathfs_get_sb(struct file_system_type *fs_type, int flags,</div><div class='add'>+			const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	ipath_super = get_sb_single(fs_type, flags, data,</div><div class='del'>-				    ipathfs_fill_super);</div><div class='del'>-	return ipath_super;</div><div class='add'>+	int ret = get_sb_single(fs_type, flags, data,</div><div class='add'>+				    ipathfs_fill_super, mnt);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ipath_super = mnt-&gt;mnt_sb;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ipathfs_kill_super(struct super_block *s)</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_ht400.c b/drivers/infiniband/hw/ipath/ipath_ht400.c<br/>index fac0a2b74de2..3db015da6e77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ht400.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_ht400.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ht400.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_ht400.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -1572,7 +1573,6 @@ void ipath_init_ht400_funcs(struct ipath_devdata *dd)</div><div class='ctx'> 	dd-&gt;ipath_f_reset = ipath_setup_ht_reset;</div><div class='ctx'> 	dd-&gt;ipath_f_get_boardname = ipath_ht_boardname;</div><div class='ctx'> 	dd-&gt;ipath_f_init_hwerrors = ipath_ht_init_hwerrors;</div><div class='del'>-	dd-&gt;ipath_f_init_hwerrors = ipath_ht_init_hwerrors;</div><div class='ctx'> 	dd-&gt;ipath_f_early_init = ipath_ht_early_init;</div><div class='ctx'> 	dd-&gt;ipath_f_handle_hwerrors = ipath_ht_handle_hwerrors;</div><div class='ctx'> 	dd-&gt;ipath_f_quiet_serdes = ipath_ht_quiet_serdes;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c<br/>index dc83250d26a6..414cdd1d80a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_init_chip.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_init_chip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_init_chip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_init_chip.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -35,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * min buffers we want to have per port, after driver</div><div class='hunk'>@@ -114,6 +115,7 @@ static int create_port0_egr(struct ipath_devdata *dd)</div><div class='ctx'> 				      "eager TID %u\n", e);</div><div class='ctx'> 			while (e != 0)</div><div class='ctx'> 				dev_kfree_skb(skbs[--e]);</div><div class='add'>+			vfree(skbs);</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -275,7 +277,7 @@ static int init_chip_first(struct ipath_devdata *dd,</div><div class='ctx'> 	pd-&gt;port_port = 0;</div><div class='ctx'> 	pd-&gt;port_cnt = 1;</div><div class='ctx'> 	/* The port 0 pkey table is used by the layer interface. */</div><div class='del'>-	pd-&gt;port_pkeys[0] = IPS_DEFAULT_P_KEY;</div><div class='add'>+	pd-&gt;port_pkeys[0] = IPATH_DEFAULT_P_KEY;</div><div class='ctx'> 	dd-&gt;ipath_rcvtidcnt =</div><div class='ctx'> 		ipath_read_kreg32(dd, dd-&gt;ipath_kregs-&gt;kr_rcvtidcnt);</div><div class='ctx'> 	dd-&gt;ipath_rcvtidbase =</div><div class='hunk'>@@ -409,17 +411,8 @@ static int init_pioavailregs(struct ipath_devdata *dd)</div><div class='ctx'> 	/* and its length */</div><div class='ctx'> 	dd-&gt;ipath_freezelen = L1_CACHE_BYTES - sizeof(dd-&gt;ipath_statusp[0]);</div><div class='ctx'> </div><div class='del'>-	if (dd-&gt;ipath_unit * 64 &gt; (IPATH_PORT0_RCVHDRTAIL_SIZE - 64)) {</div><div class='del'>-		ipath_dev_err(dd, "unit %u too large for port 0 "</div><div class='del'>-			      "rcvhdrtail buffer size\n", dd-&gt;ipath_unit);</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='add'>+	ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* so we can get current tail in ipath_kreceive(), per chip */</div><div class='del'>-	dd-&gt;ipath_hdrqtailptr = &amp;ipath_port0_rcvhdrtail[</div><div class='del'>-		dd-&gt;ipath_unit * (64 / sizeof(*ipath_port0_rcvhdrtail))];</div><div class='ctx'> done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -652,8 +645,9 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> 	u32 val32, kpiobufs;</div><div class='del'>-	u64 val, atmp;</div><div class='add'>+	u64 val;</div><div class='ctx'> 	struct ipath_portdata *pd = NULL; /* keep gcc4 happy */</div><div class='add'>+	gfp_t gfp_flags = GFP_USER | __GFP_COMP;</div><div class='ctx'> </div><div class='ctx'> 	ret = init_housekeeping(dd, &amp;pd, reinit);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -775,24 +769,6 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	val = ipath_port0_rcvhdrtail_dma + dd-&gt;ipath_unit * 64;</div><div class='del'>-</div><div class='del'>-	/* verify that the alignment requirement was met */</div><div class='del'>-	ipath_write_kreg_port(dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr,</div><div class='del'>-			      0, val);</div><div class='del'>-	atmp = ipath_read_kreg64_port(</div><div class='del'>-		dd, dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr, 0);</div><div class='del'>-	if (val != atmp) {</div><div class='del'>-		ipath_dev_err(dd, "Catastrophic software error, "</div><div class='del'>-			      "RcvHdrTailAddr0 written as %llx, "</div><div class='del'>-			      "read back as %llx from %x\n",</div><div class='del'>-			      (unsigned long long) val,</div><div class='del'>-			      (unsigned long long) atmp,</div><div class='del'>-			      dd-&gt;ipath_kregs-&gt;kr_rcvhdrtailaddr);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_rcvbthqp, IPATH_KD_QP);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -836,25 +812,45 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)</div><div class='ctx'> 	/* clear any interrups up to this point (ints still not enabled) */</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_intclear, -1LL);</div><div class='ctx'> </div><div class='del'>-	ipath_stats.sps_lid[dd-&gt;ipath_unit] = dd-&gt;ipath_lid;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set up the port 0 (kernel) rcvhdr q and egr TIDs.  If doing</div><div class='ctx'> 	 * re-init, the simplest way to handle this is to free</div><div class='ctx'> 	 * existing, and re-allocate.</div><div class='ctx'> 	 */</div><div class='del'>-	if (reinit)</div><div class='del'>-		ipath_free_pddata(dd, 0, 0);</div><div class='add'>+	if (reinit) {</div><div class='add'>+		struct ipath_portdata *pd = dd-&gt;ipath_pd[0];</div><div class='add'>+		dd-&gt;ipath_pd[0] = NULL;</div><div class='add'>+		ipath_free_pddata(dd, pd);</div><div class='add'>+	}</div><div class='ctx'> 	dd-&gt;ipath_f_tidtemplate(dd);</div><div class='ctx'> 	ret = ipath_create_rcvhdrq(dd, pd);</div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='add'>+		dd-&gt;ipath_hdrqtailptr =</div><div class='add'>+			(volatile __le64 *)pd-&gt;port_rcvhdrtail_kvaddr;</div><div class='ctx'> 		ret = create_port0_egr(dd);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		ipath_dev_err(dd, "failed to allocate port 0 (kernel) "</div><div class='ctx'> 			      "rcvhdrq and/or egr bufs\n");</div><div class='ctx'> 	else</div><div class='ctx'> 		enable_chip(dd, pd, reinit);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+	if (!ret &amp;&amp; !reinit) {</div><div class='add'>+	    /* used when we close a port, for DMA already in flight at close */</div><div class='add'>+		dd-&gt;ipath_dummy_hdrq = dma_alloc_coherent(</div><div class='add'>+			&amp;dd-&gt;pcidev-&gt;dev, pd-&gt;port_rcvhdrq_size,</div><div class='add'>+			&amp;dd-&gt;ipath_dummy_hdrq_phys,</div><div class='add'>+			gfp_flags);</div><div class='add'>+		if (!dd-&gt;ipath_dummy_hdrq ) {</div><div class='add'>+			dev_info(&amp;dd-&gt;pcidev-&gt;dev,</div><div class='add'>+				"Couldn't allocate 0x%lx bytes for dummy hdrq\n",</div><div class='add'>+				pd-&gt;port_rcvhdrq_size);</div><div class='add'>+			/* fallback to just 0'ing */</div><div class='add'>+			dd-&gt;ipath_dummy_hdrq_phys = 0UL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * cause retrigger of pending interrupts ignored during init,</div><div class='ctx'> 	 * even if we had errors</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c<br/>index 3e72a1fe3d73..280e732660a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_intr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_intr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_intr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_intr.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -33,9 +34,10 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='ctx'> #include "ipath_layer.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='add'>+/* These are all rcv-related errors which we want to count for stats */</div><div class='ctx'> #define E_SUM_PKTERRS \</div><div class='ctx'> 	(INFINIPATH_E_RHDRLEN | INFINIPATH_E_RBADTID | \</div><div class='ctx'> 	 INFINIPATH_E_RBADVERSION | INFINIPATH_E_RHDR | \</div><div class='hunk'>@@ -44,6 +46,7 @@</div><div class='ctx'> 	 INFINIPATH_E_RFORMATERR | INFINIPATH_E_RUNSUPVL | \</div><div class='ctx'> 	 INFINIPATH_E_RUNEXPCHAR | INFINIPATH_E_REBP)</div><div class='ctx'> </div><div class='add'>+/* These are all send-related errors which we want to count for stats */</div><div class='ctx'> #define E_SUM_ERRS \</div><div class='ctx'> 	(INFINIPATH_E_SPIOARMLAUNCH | INFINIPATH_E_SUNEXPERRPKTNUM | \</div><div class='ctx'> 	 INFINIPATH_E_SDROPPEDDATAPKT | INFINIPATH_E_SDROPPEDSMPPKT | \</div><div class='hunk'>@@ -51,6 +54,18 @@</div><div class='ctx'> 	 INFINIPATH_E_SMINPKTLEN | INFINIPATH_E_SPKTLEN | \</div><div class='ctx'> 	 INFINIPATH_E_INVALIDADDR)</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * these are errors that can occur when the link changes state while</div><div class='add'>+ * a packet is being sent or received.  This doesn't cover things</div><div class='add'>+ * like EBP or VCRC that can be the result of a sending having the</div><div class='add'>+ * link change state, so we receive a "known bad" packet.</div><div class='add'>+ */</div><div class='add'>+#define E_SUM_LINK_PKTERRS \</div><div class='add'>+	(INFINIPATH_E_SDROPPEDDATAPKT | INFINIPATH_E_SDROPPEDSMPPKT | \</div><div class='add'>+	 INFINIPATH_E_SMINPKTLEN | INFINIPATH_E_SPKTLEN | \</div><div class='add'>+	 INFINIPATH_E_RSHORTPKTLEN | INFINIPATH_E_RMINPKTLEN | \</div><div class='add'>+	 INFINIPATH_E_RUNEXPCHAR)</div><div class='add'>+</div><div class='ctx'> static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long sbuf[4];</div><div class='hunk'>@@ -100,9 +115,7 @@ static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> 		if (ipath_debug &amp; __IPATH_PKTDBG)</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> 	}</div><div class='del'>-	if ((errs &amp; (INFINIPATH_E_SDROPPEDDATAPKT |</div><div class='del'>-		     INFINIPATH_E_SDROPPEDSMPPKT |</div><div class='del'>-		     INFINIPATH_E_SMINPKTLEN)) &amp;&amp;</div><div class='add'>+	if ((errs &amp; E_SUM_LINK_PKTERRS) &amp;&amp;</div><div class='ctx'> 	    !(dd-&gt;ipath_flags &amp; IPATH_LINKACTIVE)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * This can happen when SMA is trying to bring the link</div><div class='hunk'>@@ -111,11 +124,9 @@ static u64 handle_e_sum_errs(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> 		 * valid.  We don't want to confuse people, so we just</div><div class='ctx'> 		 * don't print them, except at debug</div><div class='ctx'> 		 */</div><div class='del'>-		ipath_dbg("Ignoring pktsend errors %llx, because not "</div><div class='del'>-			  "yet active\n", (unsigned long long) errs);</div><div class='del'>-		ignore_this_time = INFINIPATH_E_SDROPPEDDATAPKT |</div><div class='del'>-			INFINIPATH_E_SDROPPEDSMPPKT |</div><div class='del'>-			INFINIPATH_E_SMINPKTLEN;</div><div class='add'>+		ipath_dbg("Ignoring packet errors %llx, because link not "</div><div class='add'>+			  "ACTIVE\n", (unsigned long long) errs);</div><div class='add'>+		ignore_this_time = errs &amp; E_SUM_LINK_PKTERRS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ignore_this_time;</div><div class='hunk'>@@ -156,7 +167,29 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,</div><div class='ctx'> 	 */</div><div class='ctx'> 	val = ipath_read_kreg64(dd, dd-&gt;ipath_kregs-&gt;kr_ibcstatus);</div><div class='ctx'> 	lstate = val &amp; IPATH_IBSTATE_MASK;</div><div class='del'>-	if (lstate == IPATH_IBSTATE_INIT || lstate == IPATH_IBSTATE_ARM ||</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this is confusing enough when it happens that I want to always put it</div><div class='add'>+	 * on the console and in the logs.  If it was a requested state change,</div><div class='add'>+	 * we'll have already cleared the flags, so we won't print this warning</div><div class='add'>+	 */</div><div class='add'>+	if ((lstate != IPATH_IBSTATE_ARM &amp;&amp; lstate != IPATH_IBSTATE_ACTIVE)</div><div class='add'>+		&amp;&amp; (dd-&gt;ipath_flags &amp; (IPATH_LINKARMED | IPATH_LINKACTIVE))) {</div><div class='add'>+		dev_info(&amp;dd-&gt;pcidev-&gt;dev, "Link state changed from %s to %s\n",</div><div class='add'>+				 (dd-&gt;ipath_flags &amp; IPATH_LINKARMED) ? "ARM" : "ACTIVE",</div><div class='add'>+				 ib_linkstate(lstate));</div><div class='add'>+		/*</div><div class='add'>+		 * Flush all queued sends when link went to DOWN or INIT,</div><div class='add'>+		 * to be sure that they don't block SMA and other MAD packets</div><div class='add'>+		 */</div><div class='add'>+		ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_sendctrl,</div><div class='add'>+				 INFINIPATH_S_ABORT);</div><div class='add'>+		ipath_disarm_piobufs(dd, dd-&gt;ipath_lastport_piobuf,</div><div class='add'>+							(unsigned)(dd-&gt;ipath_piobcnt2k +</div><div class='add'>+					dd-&gt;ipath_piobcnt4k) -</div><div class='add'>+					dd-&gt;ipath_lastport_piobuf);</div><div class='add'>+	}</div><div class='add'>+	else if (lstate == IPATH_IBSTATE_INIT || lstate == IPATH_IBSTATE_ARM ||</div><div class='ctx'> 	    lstate == IPATH_IBSTATE_ACTIVE) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * only print at SMA if there is a change, debug if not</div><div class='hunk'>@@ -229,6 +262,7 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,</div><div class='ctx'> 				     | IPATH_LINKACTIVE |</div><div class='ctx'> 				     IPATH_LINKARMED);</div><div class='ctx'> 		*dd-&gt;ipath_statusp &amp;= ~IPATH_STATUS_IB_READY;</div><div class='add'>+		dd-&gt;ipath_lli_counter = 0;</div><div class='ctx'> 		if (!noprint) {</div><div class='ctx'> 			if (((dd-&gt;ipath_lastibcstat &gt;&gt;</div><div class='ctx'> 			      INFINIPATH_IBCS_LINKSTATE_SHIFT) &amp;</div><div class='hunk'>@@ -350,7 +384,7 @@ static unsigned handle_frequent_errors(struct ipath_devdata *dd,</div><div class='ctx'> 	return supp_msgs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='add'>+static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> {</div><div class='ctx'> 	char msg[512];</div><div class='ctx'> 	u64 ignore_this_time = 0;</div><div class='hunk'>@@ -379,6 +413,19 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> </div><div class='ctx'> 	if (errs &amp; E_SUM_ERRS)</div><div class='ctx'> 		ignore_this_time = handle_e_sum_errs(dd, errs);</div><div class='add'>+	else if ((errs &amp; E_SUM_LINK_PKTERRS) &amp;&amp;</div><div class='add'>+	    !(dd-&gt;ipath_flags &amp; IPATH_LINKACTIVE)) {</div><div class='add'>+		/*</div><div class='add'>+		 * This can happen when SMA is trying to bring the link</div><div class='add'>+		 * up, but the IB link changes state at the "wrong" time.</div><div class='add'>+		 * The IB logic then complains that the packet isn't</div><div class='add'>+		 * valid.  We don't want to confuse people, so we just</div><div class='add'>+		 * don't print them, except at debug</div><div class='add'>+		 */</div><div class='add'>+		ipath_dbg("Ignoring packet errors %llx, because link not "</div><div class='add'>+			  "ACTIVE\n", (unsigned long long) errs);</div><div class='add'>+		ignore_this_time = errs &amp; E_SUM_LINK_PKTERRS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (supp_msgs == 250000) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -397,7 +444,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> 		if ((dd-&gt;ipath_maskederrs &amp; ~dd-&gt;ipath_ignorederrs) &amp;</div><div class='ctx'> 		    ~(INFINIPATH_E_RRCVEGRFULL | INFINIPATH_E_RRCVHDRFULL))</div><div class='ctx'> 			ipath_dev_err(dd, "Disabling error(s) %llx because "</div><div class='del'>-				      "occuring too frequently (%s)\n",</div><div class='add'>+				      "occurring too frequently (%s)\n",</div><div class='ctx'> 				      (unsigned long long)</div><div class='ctx'> 				      (dd-&gt;ipath_maskederrs &amp;</div><div class='ctx'> 				       ~dd-&gt;ipath_ignorederrs), msg);</div><div class='hunk'>@@ -434,7 +481,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> 			  INFINIPATH_E_IBSTATUSCHANGED);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!errs)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!noprint)</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -493,10 +540,10 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (hd == (tl + 1) ||</div><div class='ctx'> 			    (!hd &amp;&amp; tl == dd-&gt;ipath_hdrqlast)) {</div><div class='del'>-				dd-&gt;ipath_lastrcvhdrqtails[i] = tl;</div><div class='del'>-				pd-&gt;port_hdrqfull++;</div><div class='ctx'> 				if (i == 0)</div><div class='ctx'> 					chkerrpkts = 1;</div><div class='add'>+				dd-&gt;ipath_lastrcvhdrqtails[i] = tl;</div><div class='add'>+				pd-&gt;port_hdrqfull++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -558,9 +605,7 @@ static void handle_errors(struct ipath_devdata *dd, ipath_err_t errs)</div><div class='ctx'> 		wake_up_interruptible(&amp;ipath_sma_state_wait);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chkerrpkts)</div><div class='del'>-		/* process possible error packets in hdrq */</div><div class='del'>-		ipath_kreceive(dd);</div><div class='add'>+	return chkerrpkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* this is separate to allow for better optimization of ipath_intr() */</div><div class='hunk'>@@ -678,7 +723,12 @@ set:</div><div class='ctx'> 			 dd-&gt;ipath_sendctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void handle_rcv(struct ipath_devdata *dd, u32 istat)</div><div class='add'>+/*</div><div class='add'>+ * Handle receive interrupts for user ports; this means a user</div><div class='add'>+ * process was waiting for a packet to arrive, and didn't want</div><div class='add'>+ * to poll</div><div class='add'>+ */</div><div class='add'>+static void handle_urcv(struct ipath_devdata *dd, u32 istat)</div><div class='ctx'> {</div><div class='ctx'> 	u64 portr;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -688,22 +738,17 @@ static void handle_rcv(struct ipath_devdata *dd, u32 istat)</div><div class='ctx'> 		 infinipath_i_rcvavail_mask)</div><div class='ctx'> 		| ((istat &gt;&gt; INFINIPATH_I_RCVURG_SHIFT) &amp;</div><div class='ctx'> 		   infinipath_i_rcvurg_mask);</div><div class='del'>-	for (i = 0; i &lt; dd-&gt;ipath_cfgports; i++) {</div><div class='add'>+	for (i = 1; i &lt; dd-&gt;ipath_cfgports; i++) {</div><div class='ctx'> 		struct ipath_portdata *pd = dd-&gt;ipath_pd[i];</div><div class='del'>-		if (portr &amp; (1 &lt;&lt; i) &amp;&amp; pd &amp;&amp;</div><div class='del'>-		    pd-&gt;port_cnt) {</div><div class='del'>-			if (i == 0)</div><div class='del'>-				ipath_kreceive(dd);</div><div class='del'>-			else if (test_bit(IPATH_PORT_WAITING_RCV,</div><div class='del'>-					  &amp;pd-&gt;port_flag)) {</div><div class='del'>-				int rcbit;</div><div class='del'>-				clear_bit(IPATH_PORT_WAITING_RCV,</div><div class='del'>-					  &amp;pd-&gt;port_flag);</div><div class='del'>-				rcbit = i + INFINIPATH_R_INTRAVAIL_SHIFT;</div><div class='del'>-				clear_bit(1UL &lt;&lt; rcbit, &amp;dd-&gt;ipath_rcvctrl);</div><div class='del'>-				wake_up_interruptible(&amp;pd-&gt;port_wait);</div><div class='del'>-				rcvdint = 1;</div><div class='del'>-			}</div><div class='add'>+		if (portr &amp; (1 &lt;&lt; i) &amp;&amp; pd &amp;&amp; pd-&gt;port_cnt &amp;&amp;</div><div class='add'>+			test_bit(IPATH_PORT_WAITING_RCV, &amp;pd-&gt;port_flag)) {</div><div class='add'>+			int rcbit;</div><div class='add'>+			clear_bit(IPATH_PORT_WAITING_RCV,</div><div class='add'>+				  &amp;pd-&gt;port_flag);</div><div class='add'>+			rcbit = i + INFINIPATH_R_INTRAVAIL_SHIFT;</div><div class='add'>+			clear_bit(1UL &lt;&lt; rcbit, &amp;dd-&gt;ipath_rcvctrl);</div><div class='add'>+			wake_up_interruptible(&amp;pd-&gt;port_wait);</div><div class='add'>+			rcvdint = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rcvdint) {</div><div class='hunk'>@@ -719,16 +764,19 @@ static void handle_rcv(struct ipath_devdata *dd, u32 istat)</div><div class='ctx'> irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_devdata *dd = data;</div><div class='del'>-	u32 istat;</div><div class='add'>+	u32 istat, chk0rcv = 0;</div><div class='ctx'> 	ipath_err_t estat = 0;</div><div class='del'>-	static unsigned unexpected = 0;</div><div class='ctx'> 	irqreturn_t ret;</div><div class='add'>+	u32 oldhead, curtail;</div><div class='add'>+	static unsigned unexpected = 0;</div><div class='add'>+	static const u32 port0rbits = (1U&lt;&lt;INFINIPATH_I_RCVAVAIL_SHIFT) |</div><div class='add'>+		 (1U&lt;&lt;INFINIPATH_I_RCVURG_SHIFT);</div><div class='add'>+</div><div class='add'>+	ipath_stats.sps_ints++;</div><div class='ctx'> </div><div class='del'>-	if(!(dd-&gt;ipath_flags &amp; IPATH_PRESENT)) {</div><div class='del'>-		/* this is mostly so we don't try to touch the chip while</div><div class='del'>-		 * it is being reset */</div><div class='add'>+	if (!(dd-&gt;ipath_flags &amp; IPATH_PRESENT)) {</div><div class='ctx'> 		/*</div><div class='del'>-		 * This return value is perhaps odd, but we do not want the</div><div class='add'>+		 * This return value is not great, but we do not want the</div><div class='ctx'> 		 * interrupt core code to remove our interrupt handler</div><div class='ctx'> 		 * because we don't appear to be handling an interrupt</div><div class='ctx'> 		 * during a chip reset.</div><div class='hunk'>@@ -736,7 +784,51 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * this needs to be flags&amp;initted, not statusp, so we keep</div><div class='add'>+	 * taking interrupts even after link goes down, etc.</div><div class='add'>+	 * Also, we *must* clear the interrupt at some point, or we won't</div><div class='add'>+	 * take it again, which can be real bad for errors, etc...</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!(dd-&gt;ipath_flags &amp; IPATH_INITTED)) {</div><div class='add'>+		ipath_bad_intr(dd, &amp;unexpected);</div><div class='add'>+		ret = IRQ_NONE;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We try to avoid reading the interrupt status register, since</div><div class='add'>+	 * that's a PIO read, and stalls the processor for up to about</div><div class='add'>+	 * ~0.25 usec. The idea is that if we processed a port0 packet,</div><div class='add'>+	 * we blindly clear the  port 0 receive interrupt bits, and nothing</div><div class='add'>+	 * else, then return.  If other interrupts are pending, the chip</div><div class='add'>+	 * will re-interrupt us as soon as we write the intclear register.</div><div class='add'>+	 * We then won't process any more kernel packets (if not the 2nd</div><div class='add'>+	 * time, then the 3rd or 4th) and we'll then handle the other</div><div class='add'>+	 * interrupts.   We clear the interrupts first so that we don't</div><div class='add'>+	 * lose intr for later packets that arrive while we are processing.</div><div class='add'>+	 */</div><div class='add'>+	oldhead = dd-&gt;ipath_port0head;</div><div class='add'>+	curtail = (u32)le64_to_cpu(*dd-&gt;ipath_hdrqtailptr);</div><div class='add'>+	if (oldhead != curtail) {</div><div class='add'>+		if (dd-&gt;ipath_flags &amp; IPATH_GPIO_INTR) {</div><div class='add'>+			ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_gpio_clear,</div><div class='add'>+					 (u64) (1 &lt;&lt; 2));</div><div class='add'>+			istat = port0rbits | INFINIPATH_I_GPIO;</div><div class='add'>+		}</div><div class='add'>+		else</div><div class='add'>+			istat = port0rbits;</div><div class='add'>+		ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_intclear, istat);</div><div class='add'>+		ipath_kreceive(dd);</div><div class='add'>+		if (oldhead != dd-&gt;ipath_port0head) {</div><div class='add'>+			ipath_stats.sps_fastrcvint++;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	istat = ipath_read_kreg32(dd, dd-&gt;ipath_kregs-&gt;kr_intstatus);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(!istat)) {</div><div class='ctx'> 		ipath_stats.sps_nullintr++;</div><div class='ctx'> 		ret = IRQ_NONE; /* not our interrupt, or already handled */</div><div class='hunk'>@@ -749,31 +841,17 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ipath_stats.sps_ints++;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * this needs to be flags&amp;initted, not statusp, so we keep</div><div class='del'>-	 * taking interrupts even after link goes down, etc.</div><div class='del'>-	 * Also, we *must* clear the interrupt at some point, or we won't</div><div class='del'>-	 * take it again, which can be real bad for errors, etc...</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!(dd-&gt;ipath_flags &amp; IPATH_INITTED)) {</div><div class='del'>-		ipath_bad_intr(dd, &amp;unexpected);</div><div class='del'>-		ret = IRQ_NONE;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='ctx'> 	if (unexpected)</div><div class='ctx'> 		unexpected = 0;</div><div class='ctx'> </div><div class='del'>-	ipath_cdbg(VERBOSE, "intr stat=0x%x\n", istat);</div><div class='del'>-</div><div class='del'>-	if (istat &amp; ~infinipath_i_bitsextant)</div><div class='add'>+	if (unlikely(istat &amp; ~infinipath_i_bitsextant))</div><div class='ctx'> 		ipath_dev_err(dd,</div><div class='ctx'> 			      "interrupt with unknown interrupts %x set\n",</div><div class='ctx'> 			      istat &amp; (u32) ~ infinipath_i_bitsextant);</div><div class='add'>+	else</div><div class='add'>+		ipath_cdbg(VERBOSE, "intr stat=0x%x\n", istat);</div><div class='ctx'> </div><div class='del'>-	if (istat &amp; INFINIPATH_I_ERROR) {</div><div class='add'>+	if (unlikely(istat &amp; INFINIPATH_I_ERROR)) {</div><div class='ctx'> 		ipath_stats.sps_errints++;</div><div class='ctx'> 		estat = ipath_read_kreg64(dd,</div><div class='ctx'> 					  dd-&gt;ipath_kregs-&gt;kr_errorstatus);</div><div class='hunk'>@@ -788,10 +866,18 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 			ipath_dev_err(dd, "Read of error status failed "</div><div class='ctx'> 				      "(all bits set); ignoring\n");</div><div class='ctx'> 		else</div><div class='del'>-			handle_errors(dd, estat);</div><div class='add'>+			if (handle_errors(dd, estat))</div><div class='add'>+				/* force calling ipath_kreceive() */</div><div class='add'>+				chk0rcv = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (istat &amp; INFINIPATH_I_GPIO) {</div><div class='add'>+		/*</div><div class='add'>+		 * Packets are available in the port 0 rcv queue.</div><div class='add'>+		 * Eventually this needs to be generalized to check</div><div class='add'>+		 * IPATH_GPIO_INTR, and the specific GPIO bit, if</div><div class='add'>+		 * GPIO interrupts are used for anything else.</div><div class='add'>+		 */</div><div class='ctx'> 		if (unlikely(!(dd-&gt;ipath_flags &amp; IPATH_GPIO_INTR))) {</div><div class='ctx'> 			u32 gpiostatus;</div><div class='ctx'> 			gpiostatus = ipath_read_kreg32(</div><div class='hunk'>@@ -804,27 +890,39 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 		else {</div><div class='ctx'> 			/* Clear GPIO status bit 2 */</div><div class='ctx'> 			ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_gpio_clear,</div><div class='del'>-					 (u64) (1 &lt;&lt; 2));</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Packets are available in the port 0 rcv queue.</div><div class='del'>-			 * Eventually this needs to be generalized to check</div><div class='del'>-			 * IPATH_GPIO_INTR, and the specific GPIO bit, if</div><div class='del'>-			 * GPIO interrupts are used for anything else.</div><div class='del'>-			 */</div><div class='del'>-			ipath_kreceive(dd);</div><div class='add'>+					(u64) (1 &lt;&lt; 2));</div><div class='add'>+			chk0rcv = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	chk0rcv |= istat &amp; port0rbits;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * clear the ones we will deal with on this round</div><div class='del'>-	 * We clear it early, mostly for receive interrupts, so we</div><div class='del'>-	 * know the chip will have seen this by the time we process</div><div class='del'>-	 * the queue, and will re-interrupt if necessary.  The processor</div><div class='del'>-	 * itself won't take the interrupt again until we return.</div><div class='add'>+	 * Clear the interrupt bits we found set, unless they are receive</div><div class='add'>+	 * related, in which case we already cleared them above, and don't</div><div class='add'>+	 * want to clear them again, because we might lose an interrupt.</div><div class='add'>+	 * Clear it early, so we "know" know the chip will have seen this by</div><div class='add'>+	 * the time we process the queue, and will re-interrupt if necessary.</div><div class='add'>+	 * The processor itself won't take the interrupt again until we return.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_intclear, istat);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * handle port0 receive  before checking for pio buffers available,</div><div class='add'>+	 * since receives can overflow; piobuf waiters can afford a few</div><div class='add'>+	 * extra cycles, since they were waiting anyway, and user's waiting</div><div class='add'>+	 * for receive are at the bottom.</div><div class='add'>+	 */</div><div class='add'>+	if (chk0rcv) {</div><div class='add'>+		ipath_kreceive(dd);</div><div class='add'>+		istat &amp;= ~port0rbits;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (istat &amp; ((infinipath_i_rcvavail_mask &lt;&lt;</div><div class='add'>+		      INFINIPATH_I_RCVAVAIL_SHIFT)</div><div class='add'>+		     | (infinipath_i_rcvurg_mask &lt;&lt;</div><div class='add'>+			INFINIPATH_I_RCVURG_SHIFT)))</div><div class='add'>+		handle_urcv(dd, istat);</div><div class='add'>+</div><div class='ctx'> 	if (istat &amp; INFINIPATH_I_SPIOBUFAVAIL) {</div><div class='ctx'> 		clear_bit(IPATH_S_PIOINTBUFAVAIL, &amp;dd-&gt;ipath_sendctrl);</div><div class='ctx'> 		ipath_write_kreg(dd, dd-&gt;ipath_kregs-&gt;kr_sendctrl,</div><div class='hunk'>@@ -836,17 +934,7 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 		handle_layer_pioavail(dd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * we check for both transition from empty to non-empty, and urgent</div><div class='del'>-	 * packets (those with the interrupt bit set in the header)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (istat &amp; ((infinipath_i_rcvavail_mask &lt;&lt;</div><div class='del'>-		      INFINIPATH_I_RCVAVAIL_SHIFT)</div><div class='del'>-		     | (infinipath_i_rcvurg_mask &lt;&lt;</div><div class='del'>-			INFINIPATH_I_RCVURG_SHIFT)))</div><div class='del'>-		handle_rcv(dd, istat);</div><div class='del'>-</div><div class='add'>+done:</div><div class='ctx'> 	ret = IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h<br/>index 5d92d57b6f54..e9f374fb641e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_kernel.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_kernel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_kernel.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #ifndef _IPATH_KERNEL_H</div><div class='ctx'> #define _IPATH_KERNEL_H</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -61,9 +62,7 @@ struct ipath_portdata {</div><div class='ctx'> 	/* rcvhdrq base, needs mmap before useful */</div><div class='ctx'> 	void *port_rcvhdrq;</div><div class='ctx'> 	/* kernel virtual address where hdrqtail is updated */</div><div class='del'>-	u64 *port_rcvhdrtail_kvaddr;</div><div class='del'>-	/* page * used for uaddr */</div><div class='del'>-	struct page *port_rcvhdrtail_pagep;</div><div class='add'>+	volatile __le64 *port_rcvhdrtail_kvaddr;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * temp buffer for expected send setup, allocated at open, instead</div><div class='ctx'> 	 * of each setup call</div><div class='hunk'>@@ -78,11 +77,7 @@ struct ipath_portdata {</div><div class='ctx'> 	dma_addr_t port_rcvegr_phys;</div><div class='ctx'> 	/* mmap of hdrq, must fit in 44 bits */</div><div class='ctx'> 	dma_addr_t port_rcvhdrq_phys;</div><div class='del'>-	/*</div><div class='del'>-	 * the actual user address that we ipath_mlock'ed, so we can</div><div class='del'>-	 * ipath_munlock it at close</div><div class='del'>-	 */</div><div class='del'>-	unsigned long port_rcvhdrtail_uaddr;</div><div class='add'>+	dma_addr_t port_rcvhdrqtailaddr_phys;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * number of opens on this instance (0 or 1; ignoring forks, dup,</div><div class='ctx'> 	 * etc. for now)</div><div class='hunk'>@@ -158,16 +153,10 @@ struct ipath_devdata {</div><div class='ctx'> 	/* base of memory alloced for ipath_kregbase, for free */</div><div class='ctx'> 	u64 *ipath_kregalloc;</div><div class='ctx'> 	/*</div><div class='del'>-	 * version of kregbase that doesn't have high bits set (for 32 bit</div><div class='del'>-	 * programs, so mmap64 44 bit works)</div><div class='del'>-	 */</div><div class='del'>-	u64 __iomem *ipath_kregvirt;</div><div class='del'>-	/*</div><div class='ctx'> 	 * virtual address where port0 rcvhdrqtail updated for this unit.</div><div class='ctx'> 	 * only written to by the chip, not the driver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	volatile __le64 *ipath_hdrqtailptr;</div><div class='del'>-	dma_addr_t ipath_dma_addr;</div><div class='ctx'> 	/* ipath_cfgports pointers */</div><div class='ctx'> 	struct ipath_portdata **ipath_pd;</div><div class='ctx'> 	/* sk_buffs used by port 0 eager receive queue */</div><div class='hunk'>@@ -354,13 +343,17 @@ struct ipath_devdata {</div><div class='ctx'> 	char *ipath_freezemsg;</div><div class='ctx'> 	/* pci access data structure */</div><div class='ctx'> 	struct pci_dev *pcidev;</div><div class='del'>-	struct cdev *cdev;</div><div class='del'>-	struct class_device *class_dev;</div><div class='add'>+	struct cdev *user_cdev;</div><div class='add'>+	struct cdev *diag_cdev;</div><div class='add'>+	struct class_device *user_class_dev;</div><div class='add'>+	struct class_device *diag_class_dev;</div><div class='ctx'> 	/* timer used to prevent stats overflow, error throttling, etc. */</div><div class='ctx'> 	struct timer_list ipath_stats_timer;</div><div class='ctx'> 	/* check for stale messages in rcv queue */</div><div class='ctx'> 	/* only allow one intr at a time. */</div><div class='ctx'> 	unsigned long ipath_rcv_pending;</div><div class='add'>+	void *ipath_dummy_hdrq;	/* used after port close */</div><div class='add'>+	dma_addr_t ipath_dummy_hdrq_phys;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Shadow copies of registers; size indicates read access size.</div><div class='hunk'>@@ -500,8 +493,11 @@ struct ipath_devdata {</div><div class='ctx'> 	u16 ipath_lid;</div><div class='ctx'> 	/* list of pkeys programmed; 0 if not set */</div><div class='ctx'> 	u16 ipath_pkeys[4];</div><div class='del'>-	/* ASCII serial number, from flash */</div><div class='del'>-	u8 ipath_serial[12];</div><div class='add'>+	/*</div><div class='add'>+	 * ASCII serial number, from flash, large enough for original</div><div class='add'>+	 * all digit strings, and longer QLogic serial number format</div><div class='add'>+	 */</div><div class='add'>+	u8 ipath_serial[16];</div><div class='ctx'> 	/* human readable board version */</div><div class='ctx'> 	u8 ipath_boardversion[80];</div><div class='ctx'> 	/* chip major rev, from ipath_revision */</div><div class='hunk'>@@ -516,12 +512,12 @@ struct ipath_devdata {</div><div class='ctx'> 	u8 ipath_pci_cacheline;</div><div class='ctx'> 	/* LID mask control */</div><div class='ctx'> 	u8 ipath_lmc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern volatile __le64 *ipath_port0_rcvhdrtail;</div><div class='del'>-extern dma_addr_t ipath_port0_rcvhdrtail_dma;</div><div class='ctx'> </div><div class='del'>-#define IPATH_PORT0_RCVHDRTAIL_SIZE PAGE_SIZE</div><div class='add'>+	/* local link integrity counter */</div><div class='add'>+	u32 ipath_lli_counter;</div><div class='add'>+	/* local link integrity errors */</div><div class='add'>+	u32 ipath_lli_errors;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> extern struct list_head ipath_dev_list;</div><div class='ctx'> extern spinlock_t ipath_devs_lock;</div><div class='hunk'>@@ -537,7 +533,7 @@ extern int __ipath_verbs_piobufavail(struct ipath_devdata *);</div><div class='ctx'> extern int __ipath_verbs_rcv(struct ipath_devdata *, void *, void *, u32);</div><div class='ctx'> </div><div class='ctx'> void ipath_layer_add(struct ipath_devdata *);</div><div class='del'>-void ipath_layer_del(struct ipath_devdata *);</div><div class='add'>+void ipath_layer_remove(struct ipath_devdata *);</div><div class='ctx'> </div><div class='ctx'> int ipath_init_chip(struct ipath_devdata *, int);</div><div class='ctx'> int ipath_enable_wc(struct ipath_devdata *dd);</div><div class='hunk'>@@ -551,14 +547,14 @@ int ipath_cdev_init(int minor, char *name, struct file_operations *fops,</div><div class='ctx'> void ipath_cdev_cleanup(struct cdev **cdevp,</div><div class='ctx'> 			struct class_device **class_devp);</div><div class='ctx'> </div><div class='del'>-int ipath_diag_init(void);</div><div class='del'>-void ipath_diag_cleanup(void);</div><div class='add'>+int ipath_diag_add(struct ipath_devdata *);</div><div class='add'>+void ipath_diag_remove(struct ipath_devdata *);</div><div class='ctx'> void ipath_diag_bringup_link(struct ipath_devdata *);</div><div class='ctx'> </div><div class='ctx'> extern wait_queue_head_t ipath_sma_state_wait;</div><div class='ctx'> </div><div class='ctx'> int ipath_user_add(struct ipath_devdata *dd);</div><div class='del'>-void ipath_user_del(struct ipath_devdata *dd);</div><div class='add'>+void ipath_user_remove(struct ipath_devdata *dd);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *ipath_alloc_skb(struct ipath_devdata *dd, gfp_t);</div><div class='ctx'> </div><div class='hunk'>@@ -582,7 +578,7 @@ void ipath_disarm_piobufs(struct ipath_devdata *, unsigned first,</div><div class='ctx'> 			  unsigned cnt);</div><div class='ctx'> </div><div class='ctx'> int ipath_create_rcvhdrq(struct ipath_devdata *, struct ipath_portdata *);</div><div class='del'>-void ipath_free_pddata(struct ipath_devdata *, u32, int);</div><div class='add'>+void ipath_free_pddata(struct ipath_devdata *, struct ipath_portdata *);</div><div class='ctx'> </div><div class='ctx'> int ipath_parse_ushort(const char *str, unsigned short *valp);</div><div class='ctx'> </div><div class='hunk'>@@ -720,13 +716,8 @@ u64 ipath_read_kreg64_port(const struct ipath_devdata *, ipath_kreg,</div><div class='ctx'>  * @port: port number</div><div class='ctx'>  *</div><div class='ctx'>  * Return the contents of a register that is virtualized to be per port.</div><div class='del'>- * Prints a debug message and returns -1 on errors (not distinguishable from</div><div class='del'>- * valid contents at runtime; we may add a separate error variable at some</div><div class='del'>- * point).</div><div class='del'>- *</div><div class='del'>- * This is normally not used by the kernel, but may be for debugging, and</div><div class='del'>- * has a different implementation than user mode, which is why it's not in</div><div class='del'>- * _common.h.</div><div class='add'>+ * Returns -1 on errors (not distinguishable from valid contents at</div><div class='add'>+ * runtime; we may add a separate error variable at some point).</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 ipath_read_ureg32(const struct ipath_devdata *dd,</div><div class='ctx'> 				    ipath_ureg regno, int port)</div><div class='hunk'>@@ -842,9 +833,10 @@ extern struct mutex ipath_mutex;</div><div class='ctx'> </div><div class='ctx'> #define IPATH_DRV_NAME		"ipath_core"</div><div class='ctx'> #define IPATH_MAJOR		233</div><div class='add'>+#define IPATH_USER_MINOR_BASE	0</div><div class='ctx'> #define IPATH_SMA_MINOR		128</div><div class='del'>-#define IPATH_DIAG_MINOR	129</div><div class='del'>-#define IPATH_NMINORS		130</div><div class='add'>+#define IPATH_DIAG_MINOR_BASE	129</div><div class='add'>+#define IPATH_NMINORS		255</div><div class='ctx'> </div><div class='ctx'> #define ipath_dev_err(dd,fmt,...) \</div><div class='ctx'> 	do { \</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c<br/>index 5ae8761f9dd2..46773c673a1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_keys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_keys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_keys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_keys.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -120,6 +121,7 @@ int ipath_lkey_ok(struct ipath_lkey_table *rkt, struct ipath_sge *isge,</div><div class='ctx'> 		  struct ib_sge *sge, int acc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_mregion *mr;</div><div class='add'>+	unsigned n, m;</div><div class='ctx'> 	size_t off;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -151,20 +153,22 @@ int ipath_lkey_ok(struct ipath_lkey_table *rkt, struct ipath_sge *isge,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	off += mr-&gt;offset;</div><div class='del'>-	isge-&gt;mr = mr;</div><div class='del'>-	isge-&gt;m = 0;</div><div class='del'>-	isge-&gt;n = 0;</div><div class='del'>-	while (off &gt;= mr-&gt;map[isge-&gt;m]-&gt;segs[isge-&gt;n].length) {</div><div class='del'>-		off -= mr-&gt;map[isge-&gt;m]-&gt;segs[isge-&gt;n].length;</div><div class='del'>-		isge-&gt;n++;</div><div class='del'>-		if (isge-&gt;n &gt;= IPATH_SEGSZ) {</div><div class='del'>-			isge-&gt;m++;</div><div class='del'>-			isge-&gt;n = 0;</div><div class='add'>+	m = 0;</div><div class='add'>+	n = 0;</div><div class='add'>+	while (off &gt;= mr-&gt;map[m]-&gt;segs[n].length) {</div><div class='add'>+		off -= mr-&gt;map[m]-&gt;segs[n].length;</div><div class='add'>+		n++;</div><div class='add'>+		if (n &gt;= IPATH_SEGSZ) {</div><div class='add'>+			m++;</div><div class='add'>+			n = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	isge-&gt;vaddr = mr-&gt;map[isge-&gt;m]-&gt;segs[isge-&gt;n].vaddr + off;</div><div class='del'>-	isge-&gt;length = mr-&gt;map[isge-&gt;m]-&gt;segs[isge-&gt;n].length - off;</div><div class='add'>+	isge-&gt;mr = mr;</div><div class='add'>+	isge-&gt;vaddr = mr-&gt;map[m]-&gt;segs[n].vaddr + off;</div><div class='add'>+	isge-&gt;length = mr-&gt;map[m]-&gt;segs[n].length - off;</div><div class='ctx'> 	isge-&gt;sge_length = sge-&gt;length;</div><div class='add'>+	isge-&gt;m = m;</div><div class='add'>+	isge-&gt;n = n;</div><div class='ctx'> </div><div class='ctx'> 	ret = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -189,6 +193,7 @@ int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss,</div><div class='ctx'> 	struct ipath_lkey_table *rkt = &amp;dev-&gt;lk_table;</div><div class='ctx'> 	struct ipath_sge *sge = &amp;ss-&gt;sge;</div><div class='ctx'> 	struct ipath_mregion *mr;</div><div class='add'>+	unsigned n, m;</div><div class='ctx'> 	size_t off;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -206,20 +211,22 @@ int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	off += mr-&gt;offset;</div><div class='del'>-	sge-&gt;mr = mr;</div><div class='del'>-	sge-&gt;m = 0;</div><div class='del'>-	sge-&gt;n = 0;</div><div class='del'>-	while (off &gt;= mr-&gt;map[sge-&gt;m]-&gt;segs[sge-&gt;n].length) {</div><div class='del'>-		off -= mr-&gt;map[sge-&gt;m]-&gt;segs[sge-&gt;n].length;</div><div class='del'>-		sge-&gt;n++;</div><div class='del'>-		if (sge-&gt;n &gt;= IPATH_SEGSZ) {</div><div class='del'>-			sge-&gt;m++;</div><div class='del'>-			sge-&gt;n = 0;</div><div class='add'>+	m = 0;</div><div class='add'>+	n = 0;</div><div class='add'>+	while (off &gt;= mr-&gt;map[m]-&gt;segs[n].length) {</div><div class='add'>+		off -= mr-&gt;map[m]-&gt;segs[n].length;</div><div class='add'>+		n++;</div><div class='add'>+		if (n &gt;= IPATH_SEGSZ) {</div><div class='add'>+			m++;</div><div class='add'>+			n = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	sge-&gt;vaddr = mr-&gt;map[sge-&gt;m]-&gt;segs[sge-&gt;n].vaddr + off;</div><div class='del'>-	sge-&gt;length = mr-&gt;map[sge-&gt;m]-&gt;segs[sge-&gt;n].length - off;</div><div class='add'>+	sge-&gt;mr = mr;</div><div class='add'>+	sge-&gt;vaddr = mr-&gt;map[m]-&gt;segs[n].vaddr + off;</div><div class='add'>+	sge-&gt;length = mr-&gt;map[m]-&gt;segs[n].length - off;</div><div class='ctx'> 	sge-&gt;sge_length = len;</div><div class='add'>+	sge-&gt;m = m;</div><div class='add'>+	sge-&gt;n = n;</div><div class='ctx'> 	ss-&gt;sg_list = NULL;</div><div class='ctx'> 	ss-&gt;num_sge = 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_layer.c b/drivers/infiniband/hw/ipath/ipath_layer.c<br/>index 9ec4ac77b87f..b28c6f81c731 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_layer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_layer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_layer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_layer.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -40,8 +41,8 @@</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='ctx'> #include "ipath_layer.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /* Acquire before ipath_devs_lock. */</div><div class='ctx'> static DEFINE_MUTEX(ipath_layer_mutex);</div><div class='hunk'>@@ -299,9 +300,8 @@ bail:</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ipath_layer_set_mtu);</div><div class='ctx'> </div><div class='del'>-int ipath_set_sps_lid(struct ipath_devdata *dd, u32 arg, u8 lmc)</div><div class='add'>+int ipath_set_lid(struct ipath_devdata *dd, u32 arg, u8 lmc)</div><div class='ctx'> {</div><div class='del'>-	ipath_stats.sps_lid[dd-&gt;ipath_unit] = arg;</div><div class='ctx'> 	dd-&gt;ipath_lid = arg;</div><div class='ctx'> 	dd-&gt;ipath_lmc = lmc;</div><div class='ctx'> </div><div class='hunk'>@@ -315,7 +315,7 @@ int ipath_set_sps_lid(struct ipath_devdata *dd, u32 arg, u8 lmc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(ipath_set_sps_lid);</div><div class='add'>+EXPORT_SYMBOL_GPL(ipath_set_lid);</div><div class='ctx'> </div><div class='ctx'> int ipath_layer_set_guid(struct ipath_devdata *dd, __be64 guid)</div><div class='ctx'> {</div><div class='hunk'>@@ -340,18 +340,26 @@ u32 ipath_layer_get_nguid(struct ipath_devdata *dd)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ipath_layer_get_nguid);</div><div class='ctx'> </div><div class='del'>-int ipath_layer_query_device(struct ipath_devdata *dd, u32 * vendor,</div><div class='del'>-			     u32 * boardrev, u32 * majrev, u32 * minrev)</div><div class='add'>+u32 ipath_layer_get_majrev(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='del'>-	*vendor = dd-&gt;ipath_vendorid;</div><div class='del'>-	*boardrev = dd-&gt;ipath_boardrev;</div><div class='del'>-	*majrev = dd-&gt;ipath_majrev;</div><div class='del'>-	*minrev = dd-&gt;ipath_minrev;</div><div class='add'>+	return dd-&gt;ipath_majrev;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+EXPORT_SYMBOL_GPL(ipath_layer_get_majrev);</div><div class='add'>+</div><div class='add'>+u32 ipath_layer_get_minrev(struct ipath_devdata *dd)</div><div class='add'>+{</div><div class='add'>+	return dd-&gt;ipath_minrev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(ipath_layer_get_minrev);</div><div class='add'>+</div><div class='add'>+u32 ipath_layer_get_pcirev(struct ipath_devdata *dd)</div><div class='add'>+{</div><div class='add'>+	return dd-&gt;ipath_pcirev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(ipath_layer_query_device);</div><div class='add'>+EXPORT_SYMBOL_GPL(ipath_layer_get_pcirev);</div><div class='ctx'> </div><div class='ctx'> u32 ipath_layer_get_flags(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='hunk'>@@ -374,6 +382,13 @@ u16 ipath_layer_get_deviceid(struct ipath_devdata *dd)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ipath_layer_get_deviceid);</div><div class='ctx'> </div><div class='add'>+u32 ipath_layer_get_vendorid(struct ipath_devdata *dd)</div><div class='add'>+{</div><div class='add'>+	return dd-&gt;ipath_vendorid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(ipath_layer_get_vendorid);</div><div class='add'>+</div><div class='ctx'> u64 ipath_layer_get_lastibcstat(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='ctx'> 	return dd-&gt;ipath_lastibcstat;</div><div class='hunk'>@@ -403,7 +418,7 @@ void ipath_layer_add(struct ipath_devdata *dd)</div><div class='ctx'> 	mutex_unlock(&amp;ipath_layer_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ipath_layer_del(struct ipath_devdata *dd)</div><div class='add'>+void ipath_layer_remove(struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_lock(&amp;ipath_layer_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -607,7 +622,7 @@ int ipath_layer_open(struct ipath_devdata *dd, u32 * pktmax)</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ipath_setrcvhdrsize(dd, NUM_OF_EXTRA_WORDS_IN_HEADER_QUEUE);</div><div class='add'>+	ret = ipath_setrcvhdrsize(dd, IPATH_HEADER_QUEUE_WORDS);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto bail;</div><div class='hunk'>@@ -616,9 +631,9 @@ int ipath_layer_open(struct ipath_devdata *dd, u32 * pktmax)</div><div class='ctx'> </div><div class='ctx'> 	if (*dd-&gt;ipath_statusp &amp; IPATH_STATUS_IB_READY)</div><div class='ctx'> 		intval |= IPATH_LAYER_INT_IF_UP;</div><div class='del'>-	if (ipath_stats.sps_lid[dd-&gt;ipath_unit])</div><div class='add'>+	if (dd-&gt;ipath_lid)</div><div class='ctx'> 		intval |= IPATH_LAYER_INT_LID;</div><div class='del'>-	if (ipath_stats.sps_mlid[dd-&gt;ipath_unit])</div><div class='add'>+	if (dd-&gt;ipath_mlid)</div><div class='ctx'> 		intval |= IPATH_LAYER_INT_BCAST;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * do this on open, in case low level is already up and</div><div class='hunk'>@@ -884,7 +899,7 @@ static void copy_io(u32 __iomem *piobuf, struct ipath_sge_state *ss,</div><div class='ctx'> /**</div><div class='ctx'>  * ipath_verbs_send - send a packet from the verbs layer</div><div class='ctx'>  * @dd: the infinipath device</div><div class='del'>- * @hdrwords: the number of works in the header</div><div class='add'>+ * @hdrwords: the number of words in the header</div><div class='ctx'>  * @hdr: the packet header</div><div class='ctx'>  * @len: the length of the packet in bytes</div><div class='ctx'>  * @ss: the SGE to send</div><div class='hunk'>@@ -1016,19 +1031,22 @@ int ipath_layer_get_counters(struct ipath_devdata *dd,</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_ibsymbolerrcnt);</div><div class='ctx'> 	cntrs-&gt;link_error_recovery_counter =</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_iblinkerrrecovcnt);</div><div class='add'>+	/*</div><div class='add'>+	 * The link downed counter counts when the other side downs the</div><div class='add'>+	 * connection.  We add in the number of times we downed the link</div><div class='add'>+	 * due to local link integrity errors to compensate.</div><div class='add'>+	 */</div><div class='ctx'> 	cntrs-&gt;link_downed_counter =</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_iblinkdowncnt);</div><div class='ctx'> 	cntrs-&gt;port_rcv_errors =</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_rxdroppktcnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_rcvovflcnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_portovflcnt) +</div><div class='del'>-		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_errrcvflowctrlcnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_err_rlencnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_invalidrlencnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_erricrccnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_errvcrccnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_errlpcrccnt) +</div><div class='del'>-		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_errlinkcnt) +</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_badformatcnt);</div><div class='ctx'> 	cntrs-&gt;port_rcv_remphys_errors =</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_rcvebpcnt);</div><div class='hunk'>@@ -1042,6 +1060,8 @@ int ipath_layer_get_counters(struct ipath_devdata *dd,</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_pktsendcnt);</div><div class='ctx'> 	cntrs-&gt;port_rcv_packets =</div><div class='ctx'> 		ipath_snap_cntr(dd, dd-&gt;ipath_cregs-&gt;cr_pktrcvcnt);</div><div class='add'>+	cntrs-&gt;local_link_integrity_errors = dd-&gt;ipath_lli_errors;</div><div class='add'>+	cntrs-&gt;excessive_buffer_overrun_errors = 0; /* XXX */</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1086,10 +1106,10 @@ int ipath_layer_send_hdr(struct ipath_devdata *dd, struct ether_header *hdr)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	vlsllnh = *((__be16 *) hdr);</div><div class='del'>-	if (vlsllnh != htons(IPS_LRH_BTH)) {</div><div class='add'>+	if (vlsllnh != htons(IPATH_LRH_BTH)) {</div><div class='ctx'> 		ipath_dbg("Warning: lrh[0] wrong (%x, not %x); "</div><div class='ctx'> 			  "not sending\n", be16_to_cpu(vlsllnh),</div><div class='del'>-			  IPS_LRH_BTH);</div><div class='add'>+			  IPATH_LRH_BTH);</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_layer.h b/drivers/infiniband/hw/ipath/ipath_layer.h<br/>index 6fefd15bd2da..71485096fcac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_layer.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_layer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_layer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_layer.h</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -54,6 +55,8 @@ struct ipath_layer_counters {</div><div class='ctx'> 	u64 port_rcv_data;</div><div class='ctx'> 	u64 port_xmit_packets;</div><div class='ctx'> 	u64 port_rcv_packets;</div><div class='add'>+	u32 local_link_integrity_errors;</div><div class='add'>+	u32 excessive_buffer_overrun_errors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -126,7 +129,7 @@ u16 ipath_layer_get_bcast(struct ipath_devdata *dd);</div><div class='ctx'> u32 ipath_layer_get_cr_errpkey(struct ipath_devdata *dd);</div><div class='ctx'> int ipath_layer_set_linkstate(struct ipath_devdata *dd, u8 state);</div><div class='ctx'> int ipath_layer_set_mtu(struct ipath_devdata *, u16);</div><div class='del'>-int ipath_set_sps_lid(struct ipath_devdata *, u32, u8);</div><div class='add'>+int ipath_set_lid(struct ipath_devdata *, u32, u8);</div><div class='ctx'> int ipath_layer_send_hdr(struct ipath_devdata *dd,</div><div class='ctx'> 			 struct ether_header *hdr);</div><div class='ctx'> int ipath_verbs_send(struct ipath_devdata *dd, u32 hdrwords,</div><div class='hunk'>@@ -143,11 +146,13 @@ int ipath_layer_want_buffer(struct ipath_devdata *dd);</div><div class='ctx'> int ipath_layer_set_guid(struct ipath_devdata *, __be64 guid);</div><div class='ctx'> __be64 ipath_layer_get_guid(struct ipath_devdata *);</div><div class='ctx'> u32 ipath_layer_get_nguid(struct ipath_devdata *);</div><div class='del'>-int ipath_layer_query_device(struct ipath_devdata *, u32 * vendor,</div><div class='del'>-			     u32 * boardrev, u32 * majrev, u32 * minrev);</div><div class='add'>+u32 ipath_layer_get_majrev(struct ipath_devdata *);</div><div class='add'>+u32 ipath_layer_get_minrev(struct ipath_devdata *);</div><div class='add'>+u32 ipath_layer_get_pcirev(struct ipath_devdata *);</div><div class='ctx'> u32 ipath_layer_get_flags(struct ipath_devdata *dd);</div><div class='ctx'> struct device *ipath_layer_get_device(struct ipath_devdata *dd);</div><div class='ctx'> u16 ipath_layer_get_deviceid(struct ipath_devdata *dd);</div><div class='add'>+u32 ipath_layer_get_vendorid(struct ipath_devdata *);</div><div class='ctx'> u64 ipath_layer_get_lastibcstat(struct ipath_devdata *dd);</div><div class='ctx'> u32 ipath_layer_get_ibmtu(struct ipath_devdata *dd);</div><div class='ctx'> int ipath_layer_enable_timer(struct ipath_devdata *dd);</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c<br/>index f7f8391fe43f..d3402341b7d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_mad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_mad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_mad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_mad.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -34,7 +35,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='ctx'> #include "ipath_verbs.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> #define IB_SMP_UNSUP_VERSION	__constant_htons(0x0004)</div><div class='ctx'> #define IB_SMP_UNSUP_METHOD	__constant_htons(0x0008)</div><div class='hunk'>@@ -84,7 +85,7 @@ static int recv_subn_get_nodeinfo(struct ib_smp *smp,</div><div class='ctx'> {</div><div class='ctx'> 	struct nodeinfo *nip = (struct nodeinfo *)&amp;smp-&gt;data;</div><div class='ctx'> 	struct ipath_devdata *dd = to_idev(ibdev)-&gt;dd;</div><div class='del'>-	u32 vendor, boardid, majrev, minrev;</div><div class='add'>+	u32 vendor, majrev, minrev;</div><div class='ctx'> </div><div class='ctx'> 	if (smp-&gt;attr_mod)</div><div class='ctx'> 		smp-&gt;status |= IB_SMP_INVALID_FIELD;</div><div class='hunk'>@@ -104,9 +105,11 @@ static int recv_subn_get_nodeinfo(struct ib_smp *smp,</div><div class='ctx'> 	nip-&gt;port_guid = nip-&gt;sys_guid;</div><div class='ctx'> 	nip-&gt;partition_cap = cpu_to_be16(ipath_layer_get_npkeys(dd));</div><div class='ctx'> 	nip-&gt;device_id = cpu_to_be16(ipath_layer_get_deviceid(dd));</div><div class='del'>-	ipath_layer_query_device(dd, &amp;vendor, &amp;boardid, &amp;majrev, &amp;minrev);</div><div class='add'>+	majrev = ipath_layer_get_majrev(dd);</div><div class='add'>+	minrev = ipath_layer_get_minrev(dd);</div><div class='ctx'> 	nip-&gt;revision = cpu_to_be32((majrev &lt;&lt; 16) | minrev);</div><div class='ctx'> 	nip-&gt;local_port_num = port;</div><div class='add'>+	vendor = ipath_layer_get_vendorid(dd);</div><div class='ctx'> 	nip-&gt;vendor_id[0] = 0;</div><div class='ctx'> 	nip-&gt;vendor_id[1] = vendor &gt;&gt; 8;</div><div class='ctx'> 	nip-&gt;vendor_id[2] = vendor;</div><div class='hunk'>@@ -137,47 +140,11 @@ static int recv_subn_get_guidinfo(struct ib_smp *smp,</div><div class='ctx'> 	return reply(smp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct port_info {</div><div class='del'>-	__be64 mkey;</div><div class='del'>-	__be64 gid_prefix;</div><div class='del'>-	__be16 lid;</div><div class='del'>-	__be16 sm_lid;</div><div class='del'>-	__be32 cap_mask;</div><div class='del'>-	__be16 diag_code;</div><div class='del'>-	__be16 mkey_lease_period;</div><div class='del'>-	u8 local_port_num;</div><div class='del'>-	u8 link_width_enabled;</div><div class='del'>-	u8 link_width_supported;</div><div class='del'>-	u8 link_width_active;</div><div class='del'>-	u8 linkspeed_portstate;			/* 4 bits, 4 bits */</div><div class='del'>-	u8 portphysstate_linkdown;		/* 4 bits, 4 bits */</div><div class='del'>-	u8 mkeyprot_resv_lmc;			/* 2 bits, 3, 3 */</div><div class='del'>-	u8 linkspeedactive_enabled;		/* 4 bits, 4 bits */</div><div class='del'>-	u8 neighbormtu_mastersmsl;		/* 4 bits, 4 bits */</div><div class='del'>-	u8 vlcap_inittype;			/* 4 bits, 4 bits */</div><div class='del'>-	u8 vl_high_limit;</div><div class='del'>-	u8 vl_arb_high_cap;</div><div class='del'>-	u8 vl_arb_low_cap;</div><div class='del'>-	u8 inittypereply_mtucap;		/* 4 bits, 4 bits */</div><div class='del'>-	u8 vlstallcnt_hoqlife;			/* 3 bits, 5 bits */</div><div class='del'>-	u8 operationalvl_pei_peo_fpi_fpo;	/* 4 bits, 1, 1, 1, 1 */</div><div class='del'>-	__be16 mkey_violations;</div><div class='del'>-	__be16 pkey_violations;</div><div class='del'>-	__be16 qkey_violations;</div><div class='del'>-	u8 guid_cap;</div><div class='del'>-	u8 clientrereg_resv_subnetto;		/* 1 bit, 2 bits, 5 */</div><div class='del'>-	u8 resv_resptimevalue;			/* 3 bits, 5 bits */</div><div class='del'>-	u8 localphyerrors_overrunerrors;	/* 4 bits, 4 bits */</div><div class='del'>-	__be16 max_credit_hint;</div><div class='del'>-	u8 resv;</div><div class='del'>-	u8 link_roundtrip_latency[3];</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> static int recv_subn_get_portinfo(struct ib_smp *smp,</div><div class='ctx'> 				  struct ib_device *ibdev, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev;</div><div class='del'>-	struct port_info *pip = (struct port_info *)smp-&gt;data;</div><div class='add'>+	struct ib_port_info *pip = (struct ib_port_info *)smp-&gt;data;</div><div class='ctx'> 	u16 lid;</div><div class='ctx'> 	u8 ibcstat;</div><div class='ctx'> 	u8 mtu;</div><div class='hunk'>@@ -251,7 +218,7 @@ static int recv_subn_get_portinfo(struct ib_smp *smp,</div><div class='ctx'> 	/* P_KeyViolations are counted by hardware. */</div><div class='ctx'> 	pip-&gt;pkey_violations =</div><div class='ctx'> 		cpu_to_be16((ipath_layer_get_cr_errpkey(dev-&gt;dd) -</div><div class='del'>-			     dev-&gt;n_pkey_violations) &amp; 0xFFFF);</div><div class='add'>+			     dev-&gt;z_pkey_violations) &amp; 0xFFFF);</div><div class='ctx'> 	pip-&gt;qkey_violations = cpu_to_be16(dev-&gt;qkey_violations);</div><div class='ctx'> 	/* Only the hardware GUID is supported for now */</div><div class='ctx'> 	pip-&gt;guid_cap = 1;</div><div class='hunk'>@@ -312,7 +279,7 @@ static int recv_subn_set_guidinfo(struct ib_smp *smp,</div><div class='ctx'> static int recv_subn_set_portinfo(struct ib_smp *smp,</div><div class='ctx'> 				  struct ib_device *ibdev, u8 port)</div><div class='ctx'> {</div><div class='del'>-	struct port_info *pip = (struct port_info *)smp-&gt;data;</div><div class='add'>+	struct ib_port_info *pip = (struct ib_port_info *)smp-&gt;data;</div><div class='ctx'> 	struct ib_event event;</div><div class='ctx'> 	struct ipath_ibdev *dev;</div><div class='ctx'> 	u32 flags;</div><div class='hunk'>@@ -339,9 +306,9 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,</div><div class='ctx'> 	lid = be16_to_cpu(pip-&gt;lid);</div><div class='ctx'> 	if (lid != ipath_layer_get_lid(dev-&gt;dd)) {</div><div class='ctx'> 		/* Must be a valid unicast LID address. */</div><div class='del'>-		if (lid == 0 || lid &gt;= IPS_MULTICAST_LID_BASE)</div><div class='add'>+		if (lid == 0 || lid &gt;= IPATH_MULTICAST_LID_BASE)</div><div class='ctx'> 			goto err;</div><div class='del'>-		ipath_set_sps_lid(dev-&gt;dd, lid, pip-&gt;mkeyprot_resv_lmc &amp; 7);</div><div class='add'>+		ipath_set_lid(dev-&gt;dd, lid, pip-&gt;mkeyprot_resv_lmc &amp; 7);</div><div class='ctx'> 		event.event = IB_EVENT_LID_CHANGE;</div><div class='ctx'> 		ib_dispatch_event(&amp;event);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -349,7 +316,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,</div><div class='ctx'> 	smlid = be16_to_cpu(pip-&gt;sm_lid);</div><div class='ctx'> 	if (smlid != dev-&gt;sm_lid) {</div><div class='ctx'> 		/* Must be a valid unicast LID address. */</div><div class='del'>-		if (smlid == 0 || smlid &gt;= IPS_MULTICAST_LID_BASE)</div><div class='add'>+		if (smlid == 0 || smlid &gt;= IPATH_MULTICAST_LID_BASE)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		dev-&gt;sm_lid = smlid;</div><div class='ctx'> 		event.event = IB_EVENT_SM_CHANGE;</div><div class='hunk'>@@ -425,7 +392,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,</div><div class='ctx'> 	 * later.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pip-&gt;pkey_violations == 0)</div><div class='del'>-		dev-&gt;n_pkey_violations =</div><div class='add'>+		dev-&gt;z_pkey_violations =</div><div class='ctx'> 			ipath_layer_get_cr_errpkey(dev-&gt;dd);</div><div class='ctx'> </div><div class='ctx'> 	if (pip-&gt;qkey_violations == 0)</div><div class='hunk'>@@ -445,7 +412,7 @@ static int recv_subn_set_portinfo(struct ib_smp *smp,</div><div class='ctx'> </div><div class='ctx'> 	if (pip-&gt;clientrereg_resv_subnetto &amp; 0x80) {</div><div class='ctx'> 		clientrereg = 1;</div><div class='del'>-		event.event = IB_EVENT_LID_CHANGE;</div><div class='add'>+		event.event = IB_EVENT_CLIENT_REREGISTER;</div><div class='ctx'> 		ib_dispatch_event(&amp;event);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -646,6 +613,9 @@ struct ib_pma_portcounters {</div><div class='ctx'> #define IB_PMA_SEL_PORT_RCV_ERRORS		__constant_htons(0x0008)</div><div class='ctx'> #define IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS	__constant_htons(0x0010)</div><div class='ctx'> #define IB_PMA_SEL_PORT_XMIT_DISCARDS		__constant_htons(0x0040)</div><div class='add'>+#define IB_PMA_SEL_LOCAL_LINK_INTEGRITY_ERRORS	__constant_htons(0x0200)</div><div class='add'>+#define IB_PMA_SEL_EXCESSIVE_BUFFER_OVERRUNS	__constant_htons(0x0400)</div><div class='add'>+#define IB_PMA_SEL_PORT_VL15_DROPPED		__constant_htons(0x0800)</div><div class='ctx'> #define IB_PMA_SEL_PORT_XMIT_DATA		__constant_htons(0x1000)</div><div class='ctx'> #define IB_PMA_SEL_PORT_RCV_DATA		__constant_htons(0x2000)</div><div class='ctx'> #define IB_PMA_SEL_PORT_XMIT_PACKETS		__constant_htons(0x4000)</div><div class='hunk'>@@ -880,18 +850,22 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp,</div><div class='ctx'> 	ipath_layer_get_counters(dev-&gt;dd, &amp;cntrs);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust counters for any resets done. */</div><div class='del'>-	cntrs.symbol_error_counter -= dev-&gt;n_symbol_error_counter;</div><div class='add'>+	cntrs.symbol_error_counter -= dev-&gt;z_symbol_error_counter;</div><div class='ctx'> 	cntrs.link_error_recovery_counter -=</div><div class='del'>-		dev-&gt;n_link_error_recovery_counter;</div><div class='del'>-	cntrs.link_downed_counter -= dev-&gt;n_link_downed_counter;</div><div class='add'>+		dev-&gt;z_link_error_recovery_counter;</div><div class='add'>+	cntrs.link_downed_counter -= dev-&gt;z_link_downed_counter;</div><div class='ctx'> 	cntrs.port_rcv_errors += dev-&gt;rcv_errors;</div><div class='del'>-	cntrs.port_rcv_errors -= dev-&gt;n_port_rcv_errors;</div><div class='del'>-	cntrs.port_rcv_remphys_errors -= dev-&gt;n_port_rcv_remphys_errors;</div><div class='del'>-	cntrs.port_xmit_discards -= dev-&gt;n_port_xmit_discards;</div><div class='del'>-	cntrs.port_xmit_data -= dev-&gt;n_port_xmit_data;</div><div class='del'>-	cntrs.port_rcv_data -= dev-&gt;n_port_rcv_data;</div><div class='del'>-	cntrs.port_xmit_packets -= dev-&gt;n_port_xmit_packets;</div><div class='del'>-	cntrs.port_rcv_packets -= dev-&gt;n_port_rcv_packets;</div><div class='add'>+	cntrs.port_rcv_errors -= dev-&gt;z_port_rcv_errors;</div><div class='add'>+	cntrs.port_rcv_remphys_errors -= dev-&gt;z_port_rcv_remphys_errors;</div><div class='add'>+	cntrs.port_xmit_discards -= dev-&gt;z_port_xmit_discards;</div><div class='add'>+	cntrs.port_xmit_data -= dev-&gt;z_port_xmit_data;</div><div class='add'>+	cntrs.port_rcv_data -= dev-&gt;z_port_rcv_data;</div><div class='add'>+	cntrs.port_xmit_packets -= dev-&gt;z_port_xmit_packets;</div><div class='add'>+	cntrs.port_rcv_packets -= dev-&gt;z_port_rcv_packets;</div><div class='add'>+	cntrs.local_link_integrity_errors -=</div><div class='add'>+		dev-&gt;z_local_link_integrity_errors;</div><div class='add'>+	cntrs.excessive_buffer_overrun_errors -=</div><div class='add'>+		dev-&gt;z_excessive_buffer_overrun_errors;</div><div class='ctx'> </div><div class='ctx'> 	memset(pmp-&gt;data, 0, sizeof(pmp-&gt;data));</div><div class='ctx'> </div><div class='hunk'>@@ -929,6 +903,16 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp,</div><div class='ctx'> 	else</div><div class='ctx'> 		p-&gt;port_xmit_discards =</div><div class='ctx'> 			cpu_to_be16((u16)cntrs.port_xmit_discards);</div><div class='add'>+	if (cntrs.local_link_integrity_errors &gt; 0xFUL)</div><div class='add'>+		cntrs.local_link_integrity_errors = 0xFUL;</div><div class='add'>+	if (cntrs.excessive_buffer_overrun_errors &gt; 0xFUL)</div><div class='add'>+		cntrs.excessive_buffer_overrun_errors = 0xFUL;</div><div class='add'>+	p-&gt;lli_ebor_errors = (cntrs.local_link_integrity_errors &lt;&lt; 4) |</div><div class='add'>+		cntrs.excessive_buffer_overrun_errors;</div><div class='add'>+	if (dev-&gt;n_vl15_dropped &gt; 0xFFFFUL)</div><div class='add'>+		p-&gt;vl15_dropped = __constant_cpu_to_be16(0xFFFF);</div><div class='add'>+	else</div><div class='add'>+		p-&gt;vl15_dropped = cpu_to_be16((u16)dev-&gt;n_vl15_dropped);</div><div class='ctx'> 	if (cntrs.port_xmit_data &gt; 0xFFFFFFFFUL)</div><div class='ctx'> 		p-&gt;port_xmit_data = __constant_cpu_to_be32(0xFFFFFFFF);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -964,10 +948,10 @@ static int recv_pma_get_portcounters_ext(struct ib_perf *pmp,</div><div class='ctx'> 				      &amp;rpkts, &amp;xwait);</div><div class='ctx'> </div><div class='ctx'> 	/* Adjust counters for any resets done. */</div><div class='del'>-	swords -= dev-&gt;n_port_xmit_data;</div><div class='del'>-	rwords -= dev-&gt;n_port_rcv_data;</div><div class='del'>-	spkts -= dev-&gt;n_port_xmit_packets;</div><div class='del'>-	rpkts -= dev-&gt;n_port_rcv_packets;</div><div class='add'>+	swords -= dev-&gt;z_port_xmit_data;</div><div class='add'>+	rwords -= dev-&gt;z_port_rcv_data;</div><div class='add'>+	spkts -= dev-&gt;z_port_xmit_packets;</div><div class='add'>+	rpkts -= dev-&gt;z_port_rcv_packets;</div><div class='ctx'> </div><div class='ctx'> 	memset(pmp-&gt;data, 0, sizeof(pmp-&gt;data));</div><div class='ctx'> </div><div class='hunk'>@@ -1003,37 +987,48 @@ static int recv_pma_set_portcounters(struct ib_perf *pmp,</div><div class='ctx'> 	ipath_layer_get_counters(dev-&gt;dd, &amp;cntrs);</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_SYMBOL_ERROR)</div><div class='del'>-		dev-&gt;n_symbol_error_counter = cntrs.symbol_error_counter;</div><div class='add'>+		dev-&gt;z_symbol_error_counter = cntrs.symbol_error_counter;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_LINK_ERROR_RECOVERY)</div><div class='del'>-		dev-&gt;n_link_error_recovery_counter =</div><div class='add'>+		dev-&gt;z_link_error_recovery_counter =</div><div class='ctx'> 			cntrs.link_error_recovery_counter;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_LINK_DOWNED)</div><div class='del'>-		dev-&gt;n_link_downed_counter = cntrs.link_downed_counter;</div><div class='add'>+		dev-&gt;z_link_downed_counter = cntrs.link_downed_counter;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_RCV_ERRORS)</div><div class='del'>-		dev-&gt;n_port_rcv_errors =</div><div class='add'>+		dev-&gt;z_port_rcv_errors =</div><div class='ctx'> 			cntrs.port_rcv_errors + dev-&gt;rcv_errors;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS)</div><div class='del'>-		dev-&gt;n_port_rcv_remphys_errors =</div><div class='add'>+		dev-&gt;z_port_rcv_remphys_errors =</div><div class='ctx'> 			cntrs.port_rcv_remphys_errors;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_XMIT_DISCARDS)</div><div class='del'>-		dev-&gt;n_port_xmit_discards = cntrs.port_xmit_discards;</div><div class='add'>+		dev-&gt;z_port_xmit_discards = cntrs.port_xmit_discards;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;counter_select &amp; IB_PMA_SEL_LOCAL_LINK_INTEGRITY_ERRORS)</div><div class='add'>+		dev-&gt;z_local_link_integrity_errors =</div><div class='add'>+			cntrs.local_link_integrity_errors;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;counter_select &amp; IB_PMA_SEL_EXCESSIVE_BUFFER_OVERRUNS)</div><div class='add'>+		dev-&gt;z_excessive_buffer_overrun_errors =</div><div class='add'>+			cntrs.excessive_buffer_overrun_errors;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_VL15_DROPPED)</div><div class='add'>+		dev-&gt;n_vl15_dropped = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_XMIT_DATA)</div><div class='del'>-		dev-&gt;n_port_xmit_data = cntrs.port_xmit_data;</div><div class='add'>+		dev-&gt;z_port_xmit_data = cntrs.port_xmit_data;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_RCV_DATA)</div><div class='del'>-		dev-&gt;n_port_rcv_data = cntrs.port_rcv_data;</div><div class='add'>+		dev-&gt;z_port_rcv_data = cntrs.port_rcv_data;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_XMIT_PACKETS)</div><div class='del'>-		dev-&gt;n_port_xmit_packets = cntrs.port_xmit_packets;</div><div class='add'>+		dev-&gt;z_port_xmit_packets = cntrs.port_xmit_packets;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SEL_PORT_RCV_PACKETS)</div><div class='del'>-		dev-&gt;n_port_rcv_packets = cntrs.port_rcv_packets;</div><div class='add'>+		dev-&gt;z_port_rcv_packets = cntrs.port_rcv_packets;</div><div class='ctx'> </div><div class='ctx'> 	return recv_pma_get_portcounters(pmp, ibdev, port);</div><div class='ctx'> }</div><div class='hunk'>@@ -1050,16 +1045,16 @@ static int recv_pma_set_portcounters_ext(struct ib_perf *pmp,</div><div class='ctx'> 				      &amp;rpkts, &amp;xwait);</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SELX_PORT_XMIT_DATA)</div><div class='del'>-		dev-&gt;n_port_xmit_data = swords;</div><div class='add'>+		dev-&gt;z_port_xmit_data = swords;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SELX_PORT_RCV_DATA)</div><div class='del'>-		dev-&gt;n_port_rcv_data = rwords;</div><div class='add'>+		dev-&gt;z_port_rcv_data = rwords;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SELX_PORT_XMIT_PACKETS)</div><div class='del'>-		dev-&gt;n_port_xmit_packets = spkts;</div><div class='add'>+		dev-&gt;z_port_xmit_packets = spkts;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SELX_PORT_RCV_PACKETS)</div><div class='del'>-		dev-&gt;n_port_rcv_packets = rpkts;</div><div class='add'>+		dev-&gt;z_port_rcv_packets = rpkts;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;counter_select &amp; IB_PMA_SELX_PORT_UNI_XMIT_PACKETS)</div><div class='ctx'> 		dev-&gt;n_unicast_xmit = 0;</div><div class='hunk'>@@ -1308,32 +1303,8 @@ int ipath_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,</div><div class='ctx'> 		      struct ib_wc *in_wc, struct ib_grh *in_grh,</div><div class='ctx'> 		      struct ib_mad *in_mad, struct ib_mad *out_mad)</div><div class='ctx'> {</div><div class='del'>-	struct ipath_ibdev *dev = to_idev(ibdev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Snapshot current HW counters to "clear" them.</div><div class='del'>-	 * This should be done when the driver is loaded except that for</div><div class='del'>-	 * some reason we get a zillion errors when brining up the link.</div><div class='del'>-	 */</div><div class='del'>-	if (dev-&gt;rcv_errors == 0) {</div><div class='del'>-		struct ipath_layer_counters cntrs;</div><div class='del'>-</div><div class='del'>-		ipath_layer_get_counters(to_idev(ibdev)-&gt;dd, &amp;cntrs);</div><div class='del'>-		dev-&gt;rcv_errors++;</div><div class='del'>-		dev-&gt;n_symbol_error_counter = cntrs.symbol_error_counter;</div><div class='del'>-		dev-&gt;n_link_error_recovery_counter =</div><div class='del'>-			cntrs.link_error_recovery_counter;</div><div class='del'>-		dev-&gt;n_link_downed_counter = cntrs.link_downed_counter;</div><div class='del'>-		dev-&gt;n_port_rcv_errors = cntrs.port_rcv_errors + 1;</div><div class='del'>-		dev-&gt;n_port_rcv_remphys_errors =</div><div class='del'>-			cntrs.port_rcv_remphys_errors;</div><div class='del'>-		dev-&gt;n_port_xmit_discards = cntrs.port_xmit_discards;</div><div class='del'>-		dev-&gt;n_port_xmit_data = cntrs.port_xmit_data;</div><div class='del'>-		dev-&gt;n_port_rcv_data = cntrs.port_rcv_data;</div><div class='del'>-		dev-&gt;n_port_xmit_packets = cntrs.port_xmit_packets;</div><div class='del'>-		dev-&gt;n_port_rcv_packets = cntrs.port_rcv_packets;</div><div class='del'>-	}</div><div class='ctx'> 	switch (in_mad-&gt;mad_hdr.mgmt_class) {</div><div class='ctx'> 	case IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE:</div><div class='ctx'> 	case IB_MGMT_CLASS_SUBN_LID_ROUTED:</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/infiniband/hw/ipath/ipath_mr.c<br/>index 69ffec66d45d..4ac31a5da330 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_mr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_mr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_mr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_mr.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -169,6 +170,11 @@ struct ib_mr *ipath_reg_user_mr(struct ib_pd *pd, struct ib_umem *region,</div><div class='ctx'> 	int n, m, i;</div><div class='ctx'> 	struct ib_mr *ret;</div><div class='ctx'> </div><div class='add'>+	if (region-&gt;length == 0) {</div><div class='add'>+		ret = ERR_PTR(-EINVAL);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	n = 0;</div><div class='ctx'> 	list_for_each_entry(chunk, &amp;region-&gt;chunk_list, list)</div><div class='ctx'> 		n += chunk-&gt;nents;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_pe800.c b/drivers/infiniband/hw/ipath/ipath_pe800.c<br/>index 02e8c75b24f6..b83f66d8262c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_pe800.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_pe800.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_pe800.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_pe800.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -44,7 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This file contains all the chip-specific register information and</div><div class='del'>- * access functions for the PathScale PE800, the PCI-Express chip.</div><div class='add'>+ * access functions for the QLogic InfiniPath PE800, the PCI-Express chip.</div><div class='ctx'>  *</div><div class='ctx'>  * This lists the InfiniPath PE800 registers, in the actual chip layout.</div><div class='ctx'>  * This structure should never be directly accessed.</div><div class='hunk'>@@ -532,7 +533,7 @@ static int ipath_pe_boardname(struct ipath_devdata *dd, char *name,</div><div class='ctx'> 	if (n)</div><div class='ctx'> 		snprintf(name, namelen, "%s", n);</div><div class='ctx'> </div><div class='del'>-	if (dd-&gt;ipath_majrev != 4 || dd-&gt;ipath_minrev != 1) {</div><div class='add'>+	if (dd-&gt;ipath_majrev != 4 || !dd-&gt;ipath_minrev || dd-&gt;ipath_minrev&gt;2) {</div><div class='ctx'> 		ipath_dev_err(dd, "Unsupported PE-800 revision %u.%u!\n",</div><div class='ctx'> 			      dd-&gt;ipath_majrev, dd-&gt;ipath_minrev);</div><div class='ctx'> 		ret = 1;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c<br/>index 9f8855d970c8..83e557be591e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_qp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_qp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_qp.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -34,7 +35,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_verbs.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> #define BITS_PER_PAGE		(PAGE_SIZE*BITS_PER_BYTE)</div><div class='ctx'> #define BITS_PER_PAGE_MASK	(BITS_PER_PAGE-1)</div><div class='hunk'>@@ -332,10 +333,11 @@ static void ipath_reset_qp(struct ipath_qp *qp)</div><div class='ctx'> 	qp-&gt;remote_qpn = 0;</div><div class='ctx'> 	qp-&gt;qkey = 0;</div><div class='ctx'> 	qp-&gt;qp_access_flags = 0;</div><div class='add'>+	clear_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags);</div><div class='ctx'> 	qp-&gt;s_hdrwords = 0;</div><div class='ctx'> 	qp-&gt;s_psn = 0;</div><div class='ctx'> 	qp-&gt;r_psn = 0;</div><div class='del'>-	atomic_set(&amp;qp-&gt;msn, 0);</div><div class='add'>+	qp-&gt;r_msn = 0;</div><div class='ctx'> 	if (qp-&gt;ibqp.qp_type == IB_QPT_RC) {</div><div class='ctx'> 		qp-&gt;s_state = IB_OPCODE_RC_SEND_LAST;</div><div class='ctx'> 		qp-&gt;r_state = IB_OPCODE_RC_SEND_LAST;</div><div class='hunk'>@@ -344,7 +346,8 @@ static void ipath_reset_qp(struct ipath_qp *qp)</div><div class='ctx'> 		qp-&gt;r_state = IB_OPCODE_UC_SEND_LAST;</div><div class='ctx'> 	}</div><div class='ctx'> 	qp-&gt;s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE;</div><div class='del'>-	qp-&gt;s_nak_state = 0;</div><div class='add'>+	qp-&gt;r_ack_state = IB_OPCODE_RC_ACKNOWLEDGE;</div><div class='add'>+	qp-&gt;r_nak_state = 0;</div><div class='ctx'> 	qp-&gt;s_rnr_timeout = 0;</div><div class='ctx'> 	qp-&gt;s_head = 0;</div><div class='ctx'> 	qp-&gt;s_tail = 0;</div><div class='hunk'>@@ -362,10 +365,10 @@ static void ipath_reset_qp(struct ipath_qp *qp)</div><div class='ctx'>  * @qp: the QP to put into an error state</div><div class='ctx'>  *</div><div class='ctx'>  * Flushes both send and receive work queues.</div><div class='del'>- * QP r_rq.lock and s_lock should be held.</div><div class='add'>+ * QP s_lock should be held and interrupts disabled.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ipath_error_qp(struct ipath_qp *qp)</div><div class='add'>+void ipath_error_qp(struct ipath_qp *qp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='ctx'> 	struct ib_wc wc;</div><div class='hunk'>@@ -408,12 +411,14 @@ static void ipath_error_qp(struct ipath_qp *qp)</div><div class='ctx'> 	qp-&gt;s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE;</div><div class='ctx'> </div><div class='ctx'> 	wc.opcode = IB_WC_RECV;</div><div class='add'>+	spin_lock(&amp;qp-&gt;r_rq.lock);</div><div class='ctx'> 	while (qp-&gt;r_rq.tail != qp-&gt;r_rq.head) {</div><div class='ctx'> 		wc.wr_id = get_rwqe_ptr(&amp;qp-&gt;r_rq, qp-&gt;r_rq.tail)-&gt;wr_id;</div><div class='ctx'> 		if (++qp-&gt;r_rq.tail &gt;= qp-&gt;r_rq.size)</div><div class='ctx'> 			qp-&gt;r_rq.tail = 0;</div><div class='ctx'> 		ipath_cq_enter(to_icq(qp-&gt;ibqp.recv_cq), &amp;wc, 1);</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock(&amp;qp-&gt;r_rq.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -433,8 +438,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-	spin_lock(&amp;qp-&gt;s_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	cur_state = attr_mask &amp; IB_QP_CUR_STATE ?</div><div class='ctx'> 		attr-&gt;cur_qp_state : qp-&gt;state;</div><div class='hunk'>@@ -446,7 +450,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_AV)</div><div class='ctx'> 		if (attr-&gt;ah_attr.dlid == 0 ||</div><div class='del'>-		    attr-&gt;ah_attr.dlid &gt;= IPS_MULTICAST_LID_BASE)</div><div class='add'>+		    attr-&gt;ah_attr.dlid &gt;= IPATH_MULTICAST_LID_BASE)</div><div class='ctx'> 			goto inval;</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_PKEY_INDEX)</div><div class='hunk'>@@ -505,34 +509,19 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_MIN_RNR_TIMER)</div><div class='del'>-		qp-&gt;s_min_rnr_timer = attr-&gt;min_rnr_timer;</div><div class='add'>+		qp-&gt;r_min_rnr_timer = attr-&gt;min_rnr_timer;</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_QKEY)</div><div class='ctx'> 		qp-&gt;qkey = attr-&gt;qkey;</div><div class='ctx'> </div><div class='del'>-	if (attr_mask &amp; IB_QP_PKEY_INDEX)</div><div class='del'>-		qp-&gt;s_pkey_index = attr-&gt;pkey_index;</div><div class='del'>-</div><div class='ctx'> 	qp-&gt;state = new_state;</div><div class='del'>-	spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If QP1 changed to the RTS state, try to move to the link to INIT</div><div class='del'>-	 * even if it was ACTIVE so the SM will reinitialize the SMA's</div><div class='del'>-	 * state.</div><div class='del'>-	 */</div><div class='del'>-	if (qp-&gt;ibqp.qp_num == 1 &amp;&amp; new_state == IB_QPS_RTS) {</div><div class='del'>-		struct ipath_ibdev *dev = to_idev(ibqp-&gt;device);</div><div class='add'>+	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> </div><div class='del'>-		ipath_layer_set_linkstate(dev-&gt;dd, IPATH_IB_LINKDOWN);</div><div class='del'>-	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	goto bail;</div><div class='ctx'> </div><div class='ctx'> inval:</div><div class='del'>-	spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> 	ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='hunk'>@@ -566,7 +555,7 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'> 	attr-&gt;sq_draining = 0;</div><div class='ctx'> 	attr-&gt;max_rd_atomic = 1;</div><div class='ctx'> 	attr-&gt;max_dest_rd_atomic = 1;</div><div class='del'>-	attr-&gt;min_rnr_timer = qp-&gt;s_min_rnr_timer;</div><div class='add'>+	attr-&gt;min_rnr_timer = qp-&gt;r_min_rnr_timer;</div><div class='ctx'> 	attr-&gt;port_num = 1;</div><div class='ctx'> 	attr-&gt;timeout = 0;</div><div class='ctx'> 	attr-&gt;retry_cnt = qp-&gt;s_retry_cnt;</div><div class='hunk'>@@ -593,21 +582,17 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,</div><div class='ctx'>  * @qp: the queue pair to compute the AETH for</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the AETH.</div><div class='del'>- *</div><div class='del'>- * The QP s_lock should be held.</div><div class='ctx'>  */</div><div class='ctx'> __be32 ipath_compute_aeth(struct ipath_qp *qp)</div><div class='ctx'> {</div><div class='del'>-	u32 aeth = atomic_read(&amp;qp-&gt;msn) &amp; IPS_MSN_MASK;</div><div class='add'>+	u32 aeth = qp-&gt;r_msn &amp; IPATH_MSN_MASK;</div><div class='ctx'> </div><div class='del'>-	if (qp-&gt;s_nak_state) {</div><div class='del'>-		aeth |= qp-&gt;s_nak_state &lt;&lt; IPS_AETH_CREDIT_SHIFT;</div><div class='del'>-	} else if (qp-&gt;ibqp.srq) {</div><div class='add'>+	if (qp-&gt;ibqp.srq) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Shared receive queues don't generate credits.</div><div class='ctx'> 		 * Set the credit field to the invalid value.</div><div class='ctx'> 		 */</div><div class='del'>-		aeth |= IPS_AETH_CREDIT_INVAL &lt;&lt; IPS_AETH_CREDIT_SHIFT;</div><div class='add'>+		aeth |= IPATH_AETH_CREDIT_INVAL &lt;&lt; IPATH_AETH_CREDIT_SHIFT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 min, max, x;</div><div class='ctx'> 		u32 credits;</div><div class='hunk'>@@ -637,7 +622,7 @@ __be32 ipath_compute_aeth(struct ipath_qp *qp)</div><div class='ctx'> 			else</div><div class='ctx'> 				min = x;</div><div class='ctx'> 		}</div><div class='del'>-		aeth |= x &lt;&lt; IPS_AETH_CREDIT_SHIFT;</div><div class='add'>+		aeth |= x &lt;&lt; IPATH_AETH_CREDIT_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return cpu_to_be32(aeth);</div><div class='ctx'> }</div><div class='hunk'>@@ -663,12 +648,22 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,</div><div class='ctx'> 	size_t sz;</div><div class='ctx'> 	struct ib_qp *ret;</div><div class='ctx'> </div><div class='del'>-	if (init_attr-&gt;cap.max_send_sge &gt; 255 ||</div><div class='del'>-	    init_attr-&gt;cap.max_recv_sge &gt; 255) {</div><div class='add'>+	if (init_attr-&gt;cap.max_send_sge &gt; ib_ipath_max_sges ||</div><div class='add'>+	    init_attr-&gt;cap.max_recv_sge &gt; ib_ipath_max_sges ||</div><div class='add'>+	    init_attr-&gt;cap.max_send_wr &gt; ib_ipath_max_qp_wrs ||</div><div class='add'>+	    init_attr-&gt;cap.max_recv_wr &gt; ib_ipath_max_qp_wrs) {</div><div class='ctx'> 		ret = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (init_attr-&gt;cap.max_send_sge +</div><div class='add'>+	    init_attr-&gt;cap.max_recv_sge +</div><div class='add'>+	    init_attr-&gt;cap.max_send_wr +</div><div class='add'>+	    init_attr-&gt;cap.max_recv_wr == 0) {</div><div class='add'>+		ret = ERR_PTR(-EINVAL);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (init_attr-&gt;qp_type) {</div><div class='ctx'> 	case IB_QPT_UC:</div><div class='ctx'> 	case IB_QPT_RC:</div><div class='hunk'>@@ -686,18 +681,26 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,</div><div class='ctx'> 	case IB_QPT_GSI:</div><div class='ctx'> 		qp = kmalloc(sizeof(*qp), GFP_KERNEL);</div><div class='ctx'> 		if (!qp) {</div><div class='add'>+			vfree(swq);</div><div class='ctx'> 			ret = ERR_PTR(-ENOMEM);</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='del'>-		qp-&gt;r_rq.size = init_attr-&gt;cap.max_recv_wr + 1;</div><div class='del'>-		sz = sizeof(struct ipath_sge) *</div><div class='del'>-			init_attr-&gt;cap.max_recv_sge +</div><div class='del'>-			sizeof(struct ipath_rwqe);</div><div class='del'>-		qp-&gt;r_rq.wq = vmalloc(qp-&gt;r_rq.size * sz);</div><div class='del'>-		if (!qp-&gt;r_rq.wq) {</div><div class='del'>-			kfree(qp);</div><div class='del'>-			ret = ERR_PTR(-ENOMEM);</div><div class='del'>-			goto bail;</div><div class='add'>+		if (init_attr-&gt;srq) {</div><div class='add'>+			qp-&gt;r_rq.size = 0;</div><div class='add'>+			qp-&gt;r_rq.max_sge = 0;</div><div class='add'>+			qp-&gt;r_rq.wq = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			qp-&gt;r_rq.size = init_attr-&gt;cap.max_recv_wr + 1;</div><div class='add'>+			qp-&gt;r_rq.max_sge = init_attr-&gt;cap.max_recv_sge;</div><div class='add'>+			sz = (sizeof(struct ipath_sge) * qp-&gt;r_rq.max_sge) +</div><div class='add'>+				sizeof(struct ipath_rwqe);</div><div class='add'>+			qp-&gt;r_rq.wq = vmalloc(qp-&gt;r_rq.size * sz);</div><div class='add'>+			if (!qp-&gt;r_rq.wq) {</div><div class='add'>+				kfree(qp);</div><div class='add'>+				vfree(swq);</div><div class='add'>+				ret = ERR_PTR(-ENOMEM);</div><div class='add'>+				goto bail;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -708,9 +711,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,</div><div class='ctx'> 		spin_lock_init(&amp;qp-&gt;r_rq.lock);</div><div class='ctx'> 		atomic_set(&amp;qp-&gt;refcount, 0);</div><div class='ctx'> 		init_waitqueue_head(&amp;qp-&gt;wait);</div><div class='del'>-		tasklet_init(&amp;qp-&gt;s_task,</div><div class='del'>-			     init_attr-&gt;qp_type == IB_QPT_RC ?</div><div class='del'>-			     ipath_do_rc_send : ipath_do_uc_send,</div><div class='add'>+		tasklet_init(&amp;qp-&gt;s_task, ipath_do_ruc_send,</div><div class='ctx'> 			     (unsigned long)qp);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;qp-&gt;piowait);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;qp-&gt;timerwait);</div><div class='hunk'>@@ -718,7 +719,6 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,</div><div class='ctx'> 		qp-&gt;s_wq = swq;</div><div class='ctx'> 		qp-&gt;s_size = init_attr-&gt;cap.max_send_wr + 1;</div><div class='ctx'> 		qp-&gt;s_max_sge = init_attr-&gt;cap.max_send_sge;</div><div class='del'>-		qp-&gt;r_rq.max_sge = init_attr-&gt;cap.max_recv_sge;</div><div class='ctx'> 		qp-&gt;s_flags = init_attr-&gt;sq_sig_type == IB_SIGNAL_REQ_WR ?</div><div class='ctx'> 			1 &lt;&lt; IPATH_S_SIGNAL_REQ_WR : 0;</div><div class='ctx'> 		dev = to_idev(ibpd-&gt;device);</div><div class='hunk'>@@ -888,18 +888,18 @@ void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc)</div><div class='ctx'>  */</div><div class='ctx'> void ipath_get_credit(struct ipath_qp *qp, u32 aeth)</div><div class='ctx'> {</div><div class='del'>-	u32 credit = (aeth &gt;&gt; IPS_AETH_CREDIT_SHIFT) &amp; IPS_AETH_CREDIT_MASK;</div><div class='add'>+	u32 credit = (aeth &gt;&gt; IPATH_AETH_CREDIT_SHIFT) &amp; IPATH_AETH_CREDIT_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If the credit is invalid, we can send</div><div class='ctx'> 	 * as many packets as we like.  Otherwise, we have to</div><div class='ctx'> 	 * honor the credit field.</div><div class='ctx'> 	 */</div><div class='del'>-	if (credit == IPS_AETH_CREDIT_INVAL) {</div><div class='add'>+	if (credit == IPATH_AETH_CREDIT_INVAL)</div><div class='ctx'> 		qp-&gt;s_lsn = (u32) -1;</div><div class='del'>-	} else if (qp-&gt;s_lsn != (u32) -1) {</div><div class='add'>+	else if (qp-&gt;s_lsn != (u32) -1) {</div><div class='ctx'> 		/* Compute new LSN (i.e., MSN + credit) */</div><div class='del'>-		credit = (aeth + credit_table[credit]) &amp; IPS_MSN_MASK;</div><div class='add'>+		credit = (aeth + credit_table[credit]) &amp; IPATH_MSN_MASK;</div><div class='ctx'> 		if (ipath_cmp24(credit, qp-&gt;s_lsn) &gt; 0)</div><div class='ctx'> 			qp-&gt;s_lsn = credit;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c<br/>index 493b1821a934..774d1615ce2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_rc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_rc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_rc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_rc.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -31,7 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ipath_verbs.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /* cut down ridiculously long IB macro names */</div><div class='ctx'> #define OP(x) IB_OPCODE_RC_##x</div><div class='hunk'>@@ -41,14 +42,14 @@</div><div class='ctx'>  * @qp: the QP who's SGE we're restarting</div><div class='ctx'>  * @wqe: the work queue to initialize the QP's SGE from</div><div class='ctx'>  *</div><div class='del'>- * The QP s_lock should be held.</div><div class='add'>+ * The QP s_lock should be held and interrupts disabled.</div><div class='ctx'>  */</div><div class='ctx'> static void ipath_init_restart(struct ipath_qp *qp, struct ipath_swqe *wqe)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> </div><div class='del'>-	len = ((qp-&gt;s_psn - wqe-&gt;psn) &amp; IPS_PSN_MASK) *</div><div class='add'>+	len = ((qp-&gt;s_psn - wqe-&gt;psn) &amp; IPATH_PSN_MASK) *</div><div class='ctx'> 		ib_mtu_enum_to_int(qp-&gt;path_mtu);</div><div class='ctx'> 	qp-&gt;s_sge.sge = wqe-&gt;sg_list[0];</div><div class='ctx'> 	qp-&gt;s_sge.sg_list = wqe-&gt;sg_list + 1;</div><div class='hunk'>@@ -72,11 +73,10 @@ static void ipath_init_restart(struct ipath_qp *qp, struct ipath_swqe *wqe)</div><div class='ctx'>  * Return bth0 if constructed; otherwise, return 0.</div><div class='ctx'>  * Note the QP s_lock must be held.</div><div class='ctx'>  */</div><div class='del'>-static inline u32 ipath_make_rc_ack(struct ipath_qp *qp,</div><div class='del'>-				    struct ipath_other_headers *ohdr,</div><div class='del'>-				    u32 pmtu)</div><div class='add'>+u32 ipath_make_rc_ack(struct ipath_qp *qp,</div><div class='add'>+		      struct ipath_other_headers *ohdr,</div><div class='add'>+		      u32 pmtu)</div><div class='ctx'> {</div><div class='del'>-	struct ipath_sge_state *ss;</div><div class='ctx'> 	u32 hwords;</div><div class='ctx'> 	u32 len;</div><div class='ctx'> 	u32 bth0;</div><div class='hunk'>@@ -90,13 +90,12 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp,</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (qp-&gt;s_ack_state) {</div><div class='ctx'> 	case OP(RDMA_READ_REQUEST):</div><div class='del'>-		ss = &amp;qp-&gt;s_rdma_sge;</div><div class='add'>+		qp-&gt;s_cur_sge = &amp;qp-&gt;s_rdma_sge;</div><div class='ctx'> 		len = qp-&gt;s_rdma_len;</div><div class='ctx'> 		if (len &gt; pmtu) {</div><div class='ctx'> 			len = pmtu;</div><div class='ctx'> 			qp-&gt;s_ack_state = OP(RDMA_READ_RESPONSE_FIRST);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='add'>+		} else</div><div class='ctx'> 			qp-&gt;s_ack_state = OP(RDMA_READ_RESPONSE_ONLY);</div><div class='ctx'> 		qp-&gt;s_rdma_len -= len;</div><div class='ctx'> 		bth0 = qp-&gt;s_ack_state &lt;&lt; 24;</div><div class='hunk'>@@ -108,7 +107,7 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp,</div><div class='ctx'> 		qp-&gt;s_ack_state = OP(RDMA_READ_RESPONSE_MIDDLE);</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='ctx'> 	case OP(RDMA_READ_RESPONSE_MIDDLE):</div><div class='del'>-		ss = &amp;qp-&gt;s_rdma_sge;</div><div class='add'>+		qp-&gt;s_cur_sge = &amp;qp-&gt;s_rdma_sge;</div><div class='ctx'> 		len = qp-&gt;s_rdma_len;</div><div class='ctx'> 		if (len &gt; pmtu)</div><div class='ctx'> 			len = pmtu;</div><div class='hunk'>@@ -127,41 +126,50 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp,</div><div class='ctx'> 		 * We have to prevent new requests from changing</div><div class='ctx'> 		 * the r_sge state while a ipath_verbs_send()</div><div class='ctx'> 		 * is in progress.</div><div class='del'>-		 * Changing r_state allows the receiver</div><div class='del'>-		 * to continue processing new packets.</div><div class='del'>-		 * We do it here now instead of above so</div><div class='del'>-		 * that we are sure the packet was sent before</div><div class='del'>-		 * changing the state.</div><div class='ctx'> 		 */</div><div class='del'>-		qp-&gt;r_state = OP(RDMA_READ_RESPONSE_LAST);</div><div class='ctx'> 		qp-&gt;s_ack_state = OP(ACKNOWLEDGE);</div><div class='del'>-		return 0;</div><div class='add'>+		bth0 = 0;</div><div class='add'>+		goto bail;</div><div class='ctx'> </div><div class='ctx'> 	case OP(COMPARE_SWAP):</div><div class='ctx'> 	case OP(FETCH_ADD):</div><div class='del'>-		ss = NULL;</div><div class='add'>+		qp-&gt;s_cur_sge = NULL;</div><div class='ctx'> 		len = 0;</div><div class='del'>-		qp-&gt;r_state = OP(SEND_LAST);</div><div class='del'>-		qp-&gt;s_ack_state = OP(ACKNOWLEDGE);</div><div class='del'>-		bth0 = IB_OPCODE_ATOMIC_ACKNOWLEDGE &lt;&lt; 24;</div><div class='add'>+		/*</div><div class='add'>+		 * Set the s_ack_state so the receive interrupt handler</div><div class='add'>+		 * won't try to send an ACK (out of order) until this one</div><div class='add'>+		 * is actually sent.</div><div class='add'>+		 */</div><div class='add'>+		qp-&gt;s_ack_state = OP(RDMA_READ_RESPONSE_LAST);</div><div class='add'>+		bth0 = OP(ATOMIC_ACKNOWLEDGE) &lt;&lt; 24;</div><div class='ctx'> 		ohdr-&gt;u.at.aeth = ipath_compute_aeth(qp);</div><div class='del'>-		ohdr-&gt;u.at.atomic_ack_eth = cpu_to_be64(qp-&gt;s_ack_atomic);</div><div class='add'>+		ohdr-&gt;u.at.atomic_ack_eth = cpu_to_be64(qp-&gt;r_atomic_data);</div><div class='ctx'> 		hwords += sizeof(ohdr-&gt;u.at) / 4;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Send a regular ACK. */</div><div class='del'>-		ss = NULL;</div><div class='add'>+		qp-&gt;s_cur_sge = NULL;</div><div class='ctx'> 		len = 0;</div><div class='del'>-		qp-&gt;s_ack_state = OP(ACKNOWLEDGE);</div><div class='del'>-		bth0 = qp-&gt;s_ack_state &lt;&lt; 24;</div><div class='del'>-		ohdr-&gt;u.aeth = ipath_compute_aeth(qp);</div><div class='add'>+		/*</div><div class='add'>+		 * Set the s_ack_state so the receive interrupt handler</div><div class='add'>+		 * won't try to send an ACK (out of order) until this one</div><div class='add'>+		 * is actually sent.</div><div class='add'>+		 */</div><div class='add'>+		qp-&gt;s_ack_state = OP(RDMA_READ_RESPONSE_LAST);</div><div class='add'>+		bth0 = OP(ACKNOWLEDGE) &lt;&lt; 24;</div><div class='add'>+		if (qp-&gt;s_nak_state)</div><div class='add'>+			ohdr-&gt;u.aeth = cpu_to_be32((qp-&gt;r_msn &amp; IPATH_MSN_MASK) |</div><div class='add'>+						    (qp-&gt;s_nak_state &lt;&lt;</div><div class='add'>+						     IPATH_AETH_CREDIT_SHIFT));</div><div class='add'>+		else</div><div class='add'>+			ohdr-&gt;u.aeth = ipath_compute_aeth(qp);</div><div class='ctx'> 		hwords++;</div><div class='ctx'> 	}</div><div class='ctx'> 	qp-&gt;s_hdrwords = hwords;</div><div class='del'>-	qp-&gt;s_cur_sge = ss;</div><div class='ctx'> 	qp-&gt;s_cur_size = len;</div><div class='ctx'> </div><div class='add'>+bail:</div><div class='ctx'> 	return bth0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -174,11 +182,11 @@ static inline u32 ipath_make_rc_ack(struct ipath_qp *qp,</div><div class='ctx'>  * @bth2p: pointer to the BTH PSN word</div><div class='ctx'>  *</div><div class='ctx'>  * Return 1 if constructed; otherwise, return 0.</div><div class='del'>- * Note the QP s_lock must be held.</div><div class='add'>+ * Note the QP s_lock must be held and interrupts disabled.</div><div class='ctx'>  */</div><div class='del'>-static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='del'>-				    struct ipath_other_headers *ohdr,</div><div class='del'>-				    u32 pmtu, u32 *bth0p, u32 *bth2p)</div><div class='add'>+int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='add'>+		      struct ipath_other_headers *ohdr,</div><div class='add'>+		      u32 pmtu, u32 *bth0p, u32 *bth2p)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='ctx'> 	struct ipath_sge_state *ss;</div><div class='hunk'>@@ -257,7 +265,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case IB_WR_RDMA_WRITE:</div><div class='del'>-			if (newreq)</div><div class='add'>+			if (newreq &amp;&amp; qp-&gt;s_lsn != (u32) -1)</div><div class='ctx'> 				qp-&gt;s_lsn++;</div><div class='ctx'> 			/* FALLTHROUGH */</div><div class='ctx'> 		case IB_WR_RDMA_WRITE_WITH_IMM:</div><div class='hunk'>@@ -283,8 +291,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 			else {</div><div class='ctx'> 				qp-&gt;s_state =</div><div class='ctx'> 					OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE);</div><div class='del'>-				/* Immediate data comes</div><div class='del'>-				 * after RETH */</div><div class='add'>+				/* Immediate data comes after RETH */</div><div class='ctx'> 				ohdr-&gt;u.rc.imm_data = wqe-&gt;wr.imm_data;</div><div class='ctx'> 				hwords += 1;</div><div class='ctx'> 				if (wqe-&gt;wr.send_flags &amp; IB_SEND_SOLICITED)</div><div class='hunk'>@@ -304,7 +311,8 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 			qp-&gt;s_state = OP(RDMA_READ_REQUEST);</div><div class='ctx'> 			hwords += sizeof(ohdr-&gt;u.rc.reth) / 4;</div><div class='ctx'> 			if (newreq) {</div><div class='del'>-				qp-&gt;s_lsn++;</div><div class='add'>+				if (qp-&gt;s_lsn != (u32) -1)</div><div class='add'>+					qp-&gt;s_lsn++;</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * Adjust s_next_psn to count the</div><div class='ctx'> 				 * expected number of responses.</div><div class='hunk'>@@ -335,7 +343,8 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 				wqe-&gt;wr.wr.atomic.compare_add);</div><div class='ctx'> 			hwords += sizeof(struct ib_atomic_eth) / 4;</div><div class='ctx'> 			if (newreq) {</div><div class='del'>-				qp-&gt;s_lsn++;</div><div class='add'>+				if (qp-&gt;s_lsn != (u32) -1)</div><div class='add'>+					qp-&gt;s_lsn++;</div><div class='ctx'> 				wqe-&gt;lpsn = wqe-&gt;psn;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (++qp-&gt;s_cur == qp-&gt;s_size)</div><div class='hunk'>@@ -352,9 +361,14 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 			if (qp-&gt;s_tail &gt;= qp-&gt;s_size)</div><div class='ctx'> 				qp-&gt;s_tail = 0;</div><div class='ctx'> 		}</div><div class='del'>-		bth2 |= qp-&gt;s_psn++ &amp; IPS_PSN_MASK;</div><div class='add'>+		bth2 |= qp-&gt;s_psn++ &amp; IPATH_PSN_MASK;</div><div class='ctx'> 		if ((int)(qp-&gt;s_psn - qp-&gt;s_next_psn) &gt; 0)</div><div class='ctx'> 			qp-&gt;s_next_psn = qp-&gt;s_psn;</div><div class='add'>+		/*</div><div class='add'>+		 * Put the QP on the pending list so lost ACKs will cause</div><div class='add'>+		 * a retry.  More than one request can be pending so the</div><div class='add'>+		 * QP may already be on the dev-&gt;pending list.</div><div class='add'>+		 */</div><div class='ctx'> 		spin_lock(&amp;dev-&gt;pending_lock);</div><div class='ctx'> 		if (list_empty(&amp;qp-&gt;timerwait))</div><div class='ctx'> 			list_add_tail(&amp;qp-&gt;timerwait,</div><div class='hunk'>@@ -364,8 +378,8 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> </div><div class='ctx'> 	case OP(RDMA_READ_RESPONSE_FIRST):</div><div class='ctx'> 		/*</div><div class='del'>-		 * This case can only happen if a send is restarted.  See</div><div class='del'>-		 * ipath_restart_rc().</div><div class='add'>+		 * This case can only happen if a send is restarted.</div><div class='add'>+		 * See ipath_restart_rc().</div><div class='ctx'> 		 */</div><div class='ctx'> 		ipath_init_restart(qp, wqe);</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='hunk'>@@ -373,7 +387,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 		qp-&gt;s_state = OP(SEND_MIDDLE);</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='ctx'> 	case OP(SEND_MIDDLE):</div><div class='del'>-		bth2 = qp-&gt;s_psn++ &amp; IPS_PSN_MASK;</div><div class='add'>+		bth2 = qp-&gt;s_psn++ &amp; IPATH_PSN_MASK;</div><div class='ctx'> 		if ((int)(qp-&gt;s_psn - qp-&gt;s_next_psn) &gt; 0)</div><div class='ctx'> 			qp-&gt;s_next_psn = qp-&gt;s_psn;</div><div class='ctx'> 		ss = &amp;qp-&gt;s_sge;</div><div class='hunk'>@@ -415,7 +429,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 		qp-&gt;s_state = OP(RDMA_WRITE_MIDDLE);</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='ctx'> 	case OP(RDMA_WRITE_MIDDLE):</div><div class='del'>-		bth2 = qp-&gt;s_psn++ &amp; IPS_PSN_MASK;</div><div class='add'>+		bth2 = qp-&gt;s_psn++ &amp; IPATH_PSN_MASK;</div><div class='ctx'> 		if ((int)(qp-&gt;s_psn - qp-&gt;s_next_psn) &gt; 0)</div><div class='ctx'> 			qp-&gt;s_next_psn = qp-&gt;s_psn;</div><div class='ctx'> 		ss = &amp;qp-&gt;s_sge;</div><div class='hunk'>@@ -452,7 +466,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 		 * See ipath_restart_rc().</div><div class='ctx'> 		 */</div><div class='ctx'> 		ipath_init_restart(qp, wqe);</div><div class='del'>-		len = ((qp-&gt;s_psn - wqe-&gt;psn) &amp; IPS_PSN_MASK) * pmtu;</div><div class='add'>+		len = ((qp-&gt;s_psn - wqe-&gt;psn) &amp; IPATH_PSN_MASK) * pmtu;</div><div class='ctx'> 		ohdr-&gt;u.rc.reth.vaddr =</div><div class='ctx'> 			cpu_to_be64(wqe-&gt;wr.wr.rdma.remote_addr + len);</div><div class='ctx'> 		ohdr-&gt;u.rc.reth.rkey =</div><div class='hunk'>@@ -460,7 +474,7 @@ static inline int ipath_make_rc_req(struct ipath_qp *qp,</div><div class='ctx'> 		ohdr-&gt;u.rc.reth.length = cpu_to_be32(qp-&gt;s_len);</div><div class='ctx'> 		qp-&gt;s_state = OP(RDMA_READ_REQUEST);</div><div class='ctx'> 		hwords += sizeof(ohdr-&gt;u.rc.reth) / 4;</div><div class='del'>-		bth2 = qp-&gt;s_psn++ &amp; IPS_PSN_MASK;</div><div class='add'>+		bth2 = qp-&gt;s_psn++ &amp; IPATH_PSN_MASK;</div><div class='ctx'> 		if ((int)(qp-&gt;s_psn - qp-&gt;s_next_psn) &gt; 0)</div><div class='ctx'> 			qp-&gt;s_next_psn = qp-&gt;s_psn;</div><div class='ctx'> 		ss = NULL;</div><div class='hunk'>@@ -496,189 +510,169 @@ done:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ipath_make_rc_grh(struct ipath_qp *qp,</div><div class='del'>-				     struct ib_global_route *grh,</div><div class='del'>-				     u32 nwords)</div><div class='del'>-{</div><div class='del'>-	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='del'>-</div><div class='del'>-	/* GRH header size in 32-bit words. */</div><div class='del'>-	qp-&gt;s_hdrwords += 10;</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.version_tclass_flow =</div><div class='del'>-		cpu_to_be32((6 &lt;&lt; 28) |</div><div class='del'>-			    (grh-&gt;traffic_class &lt;&lt; 20) |</div><div class='del'>-			    grh-&gt;flow_label);</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.paylen =</div><div class='del'>-		cpu_to_be16(((qp-&gt;s_hdrwords - 12) + nwords +</div><div class='del'>-			     SIZE_OF_CRC) &lt;&lt; 2);</div><div class='del'>-	/* next_hdr is defined by C8-7 in ch. 8.4.1 */</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.next_hdr = 0x1B;</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.hop_limit = grh-&gt;hop_limit;</div><div class='del'>-	/* The SGID is 32-bit aligned. */</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.sgid.global.subnet_prefix = dev-&gt;gid_prefix;</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.sgid.global.interface_id =</div><div class='del'>-		ipath_layer_get_guid(dev-&gt;dd);</div><div class='del'>-	qp-&gt;s_hdr.u.l.grh.dgid = grh-&gt;dgid;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * ipath_do_rc_send - perform a send on an RC QP</div><div class='del'>- * @data: contains a pointer to the QP</div><div class='add'>+ * send_rc_ack - Construct an ACK packet and send it</div><div class='add'>+ * @qp: a pointer to the QP</div><div class='ctx'>  *</div><div class='del'>- * Process entries in the send work queue until credit or queue is</div><div class='del'>- * exhausted.  Only allow one CPU to send a packet per QP (tasklet).</div><div class='del'>- * Otherwise, after we drop the QP s_lock, two threads could send</div><div class='del'>- * packets out of order.</div><div class='add'>+ * This is called from ipath_rc_rcv() and only uses the receive</div><div class='add'>+ * side QP state.</div><div class='add'>+ * Note that RDMA reads are handled in the send side QP state and tasklet.</div><div class='ctx'>  */</div><div class='del'>-void ipath_do_rc_send(unsigned long data)</div><div class='add'>+static void send_rc_ack(struct ipath_qp *qp)</div><div class='ctx'> {</div><div class='del'>-	struct ipath_qp *qp = (struct ipath_qp *)data;</div><div class='ctx'> 	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u16 lrh0;</div><div class='del'>-	u32 nwords;</div><div class='del'>-	u32 extra_bytes;</div><div class='ctx'> 	u32 bth0;</div><div class='del'>-	u32 bth2;</div><div class='del'>-	u32 pmtu = ib_mtu_enum_to_int(qp-&gt;path_mtu);</div><div class='add'>+	u32 hwords;</div><div class='add'>+	struct ipath_ib_header hdr;</div><div class='ctx'> 	struct ipath_other_headers *ohdr;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags))</div><div class='del'>-		goto bail;</div><div class='del'>-</div><div class='del'>-	if (unlikely(qp-&gt;remote_ah_attr.dlid ==</div><div class='del'>-		     ipath_layer_get_lid(dev-&gt;dd))) {</div><div class='del'>-		struct ib_wc wc;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Pass in an uninitialized ib_wc to be consistent with</div><div class='del'>-		 * other places where ipath_ruc_loopback() is called.</div><div class='del'>-		 */</div><div class='del'>-		ipath_ruc_loopback(qp, &amp;wc);</div><div class='del'>-		goto clear;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ohdr = &amp;qp-&gt;s_hdr.u.oth;</div><div class='del'>-	if (qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)</div><div class='del'>-		ohdr = &amp;qp-&gt;s_hdr.u.l.oth;</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	/* Check for a constructed packet to be sent. */</div><div class='del'>-	if (qp-&gt;s_hdrwords != 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * If no PIO bufs are available, return.  An interrupt will</div><div class='del'>-		 * call ipath_ib_piobufavail() when one is available.</div><div class='del'>-		 */</div><div class='del'>-		_VERBS_INFO("h %u %p\n", qp-&gt;s_hdrwords, &amp;qp-&gt;s_hdr);</div><div class='del'>-		_VERBS_INFO("d %u %p %u %p %u %u %u %u\n", qp-&gt;s_cur_size,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;sg_list,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;num_sge,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;sge.vaddr,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;sge.sge_length,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;sge.length,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;sge.m,</div><div class='del'>-			    qp-&gt;s_cur_sge-&gt;sge.n);</div><div class='del'>-		if (ipath_verbs_send(dev-&gt;dd, qp-&gt;s_hdrwords,</div><div class='del'>-				     (u32 *) &amp;qp-&gt;s_hdr, qp-&gt;s_cur_size,</div><div class='del'>-				     qp-&gt;s_cur_sge)) {</div><div class='del'>-			ipath_no_bufs_available(qp, dev);</div><div class='del'>-			goto bail;</div><div class='del'>-		}</div><div class='del'>-		dev-&gt;n_unicast_xmit++;</div><div class='del'>-		/* Record that we sent the packet and s_hdr is empty. */</div><div class='del'>-		qp-&gt;s_hdrwords = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The lock is needed to synchronize between setting</div><div class='del'>-	 * qp-&gt;s_ack_state, resend timer, and post_send().</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Sending responses has higher priority over sending requests. */</div><div class='del'>-	if (qp-&gt;s_ack_state != OP(ACKNOWLEDGE) &amp;&amp;</div><div class='del'>-	    (bth0 = ipath_make_rc_ack(qp, ohdr, pmtu)) != 0)</div><div class='del'>-		bth2 = qp-&gt;s_ack_psn++ &amp; IPS_PSN_MASK;</div><div class='del'>-	else if (!ipath_make_rc_req(qp, ohdr, pmtu, &amp;bth0, &amp;bth2))</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* Construct the header. */</div><div class='del'>-	extra_bytes = (4 - qp-&gt;s_cur_size) &amp; 3;</div><div class='del'>-	nwords = (qp-&gt;s_cur_size + extra_bytes) &gt;&gt; 2;</div><div class='del'>-	lrh0 = IPS_LRH_BTH;</div><div class='add'>+	ohdr = &amp;hdr.u.oth;</div><div class='add'>+	lrh0 = IPATH_LRH_BTH;</div><div class='add'>+	/* header size in 32-bit words LRH+BTH+AETH = (8+12+4)/4. */</div><div class='add'>+	hwords = 6;</div><div class='ctx'> 	if (unlikely(qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)) {</div><div class='del'>-		ipath_make_rc_grh(qp, &amp;qp-&gt;remote_ah_attr.grh, nwords);</div><div class='del'>-		lrh0 = IPS_LRH_GRH;</div><div class='add'>+		hwords += ipath_make_grh(dev, &amp;hdr.u.l.grh,</div><div class='add'>+					 &amp;qp-&gt;remote_ah_attr.grh,</div><div class='add'>+					 hwords, 0);</div><div class='add'>+		ohdr = &amp;hdr.u.l.oth;</div><div class='add'>+		lrh0 = IPATH_LRH_GRH;</div><div class='ctx'> 	}</div><div class='add'>+	/* read pkey_index w/o lock (its atomic) */</div><div class='add'>+	bth0 = ipath_layer_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='add'>+	if (qp-&gt;r_nak_state)</div><div class='add'>+		ohdr-&gt;u.aeth = cpu_to_be32((qp-&gt;r_msn &amp; IPATH_MSN_MASK) |</div><div class='add'>+					    (qp-&gt;r_nak_state &lt;&lt;</div><div class='add'>+					     IPATH_AETH_CREDIT_SHIFT));</div><div class='add'>+	else</div><div class='add'>+		ohdr-&gt;u.aeth = ipath_compute_aeth(qp);</div><div class='add'>+	if (qp-&gt;r_ack_state &gt;= OP(COMPARE_SWAP)) {</div><div class='add'>+		bth0 |= OP(ATOMIC_ACKNOWLEDGE) &lt;&lt; 24;</div><div class='add'>+		ohdr-&gt;u.at.atomic_ack_eth = cpu_to_be64(qp-&gt;r_atomic_data);</div><div class='add'>+		hwords += sizeof(ohdr-&gt;u.at.atomic_ack_eth) / 4;</div><div class='add'>+	} else</div><div class='add'>+		bth0 |= OP(ACKNOWLEDGE) &lt;&lt; 24;</div><div class='ctx'> 	lrh0 |= qp-&gt;remote_ah_attr.sl &lt;&lt; 4;</div><div class='del'>-	qp-&gt;s_hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='del'>-	qp-&gt;s_hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='del'>-	qp-&gt;s_hdr.lrh[2] = cpu_to_be16(qp-&gt;s_hdrwords + nwords +</div><div class='del'>-				       SIZE_OF_CRC);</div><div class='del'>-	qp-&gt;s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev-&gt;dd));</div><div class='del'>-	bth0 |= ipath_layer_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='del'>-	bth0 |= extra_bytes &lt;&lt; 20;</div><div class='add'>+	hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='add'>+	hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='add'>+	hdr.lrh[2] = cpu_to_be16(hwords + SIZE_OF_CRC);</div><div class='add'>+	hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev-&gt;dd));</div><div class='ctx'> 	ohdr-&gt;bth[0] = cpu_to_be32(bth0);</div><div class='ctx'> 	ohdr-&gt;bth[1] = cpu_to_be32(qp-&gt;remote_qpn);</div><div class='del'>-	ohdr-&gt;bth[2] = cpu_to_be32(bth2);</div><div class='add'>+	ohdr-&gt;bth[2] = cpu_to_be32(qp-&gt;r_ack_psn &amp; IPATH_PSN_MASK);</div><div class='ctx'> </div><div class='del'>-	/* Check for more work to do. */</div><div class='del'>-	goto again;</div><div class='add'>+	/*</div><div class='add'>+	 * If we can send the ACK, clear the ACK state.</div><div class='add'>+	 */</div><div class='add'>+	if (ipath_verbs_send(dev-&gt;dd, hwords, (u32 *) &amp;hdr, 0, NULL) == 0) {</div><div class='add'>+		qp-&gt;r_ack_state = OP(ACKNOWLEDGE);</div><div class='add'>+		dev-&gt;n_unicast_xmit++;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * We are out of PIO buffers at the moment.</div><div class='add'>+		 * Pass responsibility for sending the ACK to the</div><div class='add'>+		 * send tasklet so that when a PIO buffer becomes</div><div class='add'>+		 * available, the ACK is sent ahead of other outgoing</div><div class='add'>+		 * packets.</div><div class='add'>+		 */</div><div class='add'>+		dev-&gt;n_rc_qacks++;</div><div class='add'>+		spin_lock_irq(&amp;qp-&gt;s_lock);</div><div class='add'>+		/* Don't coalesce if a RDMA read or atomic is pending. */</div><div class='add'>+		if (qp-&gt;s_ack_state == OP(ACKNOWLEDGE) ||</div><div class='add'>+		    qp-&gt;s_ack_state &lt; OP(RDMA_READ_REQUEST)) {</div><div class='add'>+			qp-&gt;s_ack_state = qp-&gt;r_ack_state;</div><div class='add'>+			qp-&gt;s_nak_state = qp-&gt;r_nak_state;</div><div class='add'>+			qp-&gt;s_ack_psn = qp-&gt;r_ack_psn;</div><div class='add'>+			qp-&gt;r_ack_state = OP(ACKNOWLEDGE);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irq(&amp;qp-&gt;s_lock);</div><div class='ctx'> </div><div class='del'>-done:</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-clear:</div><div class='del'>-	clear_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags);</div><div class='del'>-bail:</div><div class='del'>-	return;</div><div class='add'>+		/* Call ipath_do_rc_send() in another thread. */</div><div class='add'>+		tasklet_hi_schedule(&amp;qp-&gt;s_task);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void send_rc_ack(struct ipath_qp *qp)</div><div class='add'>+/**</div><div class='add'>+ * reset_psn - reset the QP state to send starting from PSN</div><div class='add'>+ * @qp: the QP</div><div class='add'>+ * @psn: the packet sequence number to restart at</div><div class='add'>+ *</div><div class='add'>+ * This is called from ipath_rc_rcv() to process an incoming RC ACK</div><div class='add'>+ * for the given QP.</div><div class='add'>+ * Called at interrupt level with the QP s_lock held.</div><div class='add'>+ */</div><div class='add'>+static void reset_psn(struct ipath_qp *qp, u32 psn)</div><div class='ctx'> {</div><div class='del'>-	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='del'>-	u16 lrh0;</div><div class='del'>-	u32 bth0;</div><div class='del'>-	struct ipath_other_headers *ohdr;</div><div class='add'>+	u32 n = qp-&gt;s_last;</div><div class='add'>+	struct ipath_swqe *wqe = get_swqe_ptr(qp, n);</div><div class='add'>+	u32 opcode;</div><div class='ctx'> </div><div class='del'>-	/* Construct the header. */</div><div class='del'>-	ohdr = &amp;qp-&gt;s_hdr.u.oth;</div><div class='del'>-	lrh0 = IPS_LRH_BTH;</div><div class='del'>-	/* header size in 32-bit words LRH+BTH+AETH = (8+12+4)/4. */</div><div class='del'>-	qp-&gt;s_hdrwords = 6;</div><div class='del'>-	if (unlikely(qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)) {</div><div class='del'>-		ipath_make_rc_grh(qp, &amp;qp-&gt;remote_ah_attr.grh, 0);</div><div class='del'>-		ohdr = &amp;qp-&gt;s_hdr.u.l.oth;</div><div class='del'>-		lrh0 = IPS_LRH_GRH;</div><div class='add'>+	qp-&gt;s_cur = n;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are starting the request from the beginning,</div><div class='add'>+	 * let the normal send code handle initialization.</div><div class='add'>+	 */</div><div class='add'>+	if (ipath_cmp24(psn, wqe-&gt;psn) &lt;= 0) {</div><div class='add'>+		qp-&gt;s_state = OP(SEND_LAST);</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='del'>-	bth0 = ipath_layer_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='del'>-	ohdr-&gt;u.aeth = ipath_compute_aeth(qp);</div><div class='del'>-	if (qp-&gt;s_ack_state &gt;= OP(COMPARE_SWAP)) {</div><div class='del'>-		bth0 |= IB_OPCODE_ATOMIC_ACKNOWLEDGE &lt;&lt; 24;</div><div class='del'>-		ohdr-&gt;u.at.atomic_ack_eth = cpu_to_be64(qp-&gt;s_ack_atomic);</div><div class='del'>-		qp-&gt;s_hdrwords += sizeof(ohdr-&gt;u.at.atomic_ack_eth) / 4;</div><div class='add'>+</div><div class='add'>+	/* Find the work request opcode corresponding to the given PSN. */</div><div class='add'>+	opcode = wqe-&gt;wr.opcode;</div><div class='add'>+	for (;;) {</div><div class='add'>+		int diff;</div><div class='add'>+</div><div class='add'>+		if (++n == qp-&gt;s_size)</div><div class='add'>+			n = 0;</div><div class='add'>+		if (n == qp-&gt;s_tail)</div><div class='add'>+			break;</div><div class='add'>+		wqe = get_swqe_ptr(qp, n);</div><div class='add'>+		diff = ipath_cmp24(psn, wqe-&gt;psn);</div><div class='add'>+		if (diff &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		qp-&gt;s_cur = n;</div><div class='add'>+		/*</div><div class='add'>+		 * If we are starting the request from the beginning,</div><div class='add'>+		 * let the normal send code handle initialization.</div><div class='add'>+		 */</div><div class='add'>+		if (diff == 0) {</div><div class='add'>+			qp-&gt;s_state = OP(SEND_LAST);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		opcode = wqe-&gt;wr.opcode;</div><div class='ctx'> 	}</div><div class='del'>-	else</div><div class='del'>-		bth0 |= OP(ACKNOWLEDGE) &lt;&lt; 24;</div><div class='del'>-	lrh0 |= qp-&gt;remote_ah_attr.sl &lt;&lt; 4;</div><div class='del'>-	qp-&gt;s_hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='del'>-	qp-&gt;s_hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='del'>-	qp-&gt;s_hdr.lrh[2] = cpu_to_be16(qp-&gt;s_hdrwords + SIZE_OF_CRC);</div><div class='del'>-	qp-&gt;s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev-&gt;dd));</div><div class='del'>-	ohdr-&gt;bth[0] = cpu_to_be32(bth0);</div><div class='del'>-	ohdr-&gt;bth[1] = cpu_to_be32(qp-&gt;remote_qpn);</div><div class='del'>-	ohdr-&gt;bth[2] = cpu_to_be32(qp-&gt;s_ack_psn &amp; IPS_PSN_MASK);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If we can send the ACK, clear the ACK state.</div><div class='add'>+	 * Set the state to restart in the middle of a request.</div><div class='add'>+	 * Don't change the s_sge, s_cur_sge, or s_cur_size.</div><div class='add'>+	 * See ipath_do_rc_send().</div><div class='ctx'> 	 */</div><div class='del'>-	if (ipath_verbs_send(dev-&gt;dd, qp-&gt;s_hdrwords, (u32 *) &amp;qp-&gt;s_hdr,</div><div class='del'>-			     0, NULL) == 0) {</div><div class='del'>-		qp-&gt;s_ack_state = OP(ACKNOWLEDGE);</div><div class='del'>-		dev-&gt;n_rc_qacks++;</div><div class='del'>-		dev-&gt;n_unicast_xmit++;</div><div class='add'>+	switch (opcode) {</div><div class='add'>+	case IB_WR_SEND:</div><div class='add'>+	case IB_WR_SEND_WITH_IMM:</div><div class='add'>+		qp-&gt;s_state = OP(RDMA_READ_RESPONSE_FIRST);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IB_WR_RDMA_WRITE:</div><div class='add'>+	case IB_WR_RDMA_WRITE_WITH_IMM:</div><div class='add'>+		qp-&gt;s_state = OP(RDMA_READ_RESPONSE_LAST);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case IB_WR_RDMA_READ:</div><div class='add'>+		qp-&gt;s_state = OP(RDMA_READ_RESPONSE_MIDDLE);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/*</div><div class='add'>+		 * This case shouldn't happen since its only</div><div class='add'>+		 * one PSN per req.</div><div class='add'>+		 */</div><div class='add'>+		qp-&gt;s_state = OP(SEND_LAST);</div><div class='ctx'> 	}</div><div class='add'>+done:</div><div class='add'>+	qp-&gt;s_psn = psn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -687,13 +681,12 @@ static void send_rc_ack(struct ipath_qp *qp)</div><div class='ctx'>  * @psn: packet sequence number for the request</div><div class='ctx'>  * @wc: the work completion request</div><div class='ctx'>  *</div><div class='del'>- * The QP s_lock should be held.</div><div class='add'>+ * The QP s_lock should be held and interrupts disabled.</div><div class='ctx'>  */</div><div class='ctx'> void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_swqe *wqe = get_swqe_ptr(qp, qp-&gt;s_last);</div><div class='ctx'> 	struct ipath_ibdev *dev;</div><div class='del'>-	u32 n;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there are no requests pending, we are done.</div><div class='hunk'>@@ -735,62 +728,7 @@ void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)</div><div class='ctx'> 	else</div><div class='ctx'> 		dev-&gt;n_rc_resends += (int)qp-&gt;s_psn - (int)psn;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If we are starting the request from the beginning, let the normal</div><div class='del'>-	 * send code handle initialization.</div><div class='del'>-	 */</div><div class='del'>-	qp-&gt;s_cur = qp-&gt;s_last;</div><div class='del'>-	if (ipath_cmp24(psn, wqe-&gt;psn) &lt;= 0) {</div><div class='del'>-		qp-&gt;s_state = OP(SEND_LAST);</div><div class='del'>-		qp-&gt;s_psn = wqe-&gt;psn;</div><div class='del'>-	} else {</div><div class='del'>-		n = qp-&gt;s_cur;</div><div class='del'>-		for (;;) {</div><div class='del'>-			if (++n == qp-&gt;s_size)</div><div class='del'>-				n = 0;</div><div class='del'>-			if (n == qp-&gt;s_tail) {</div><div class='del'>-				if (ipath_cmp24(psn, qp-&gt;s_next_psn) &gt;= 0) {</div><div class='del'>-					qp-&gt;s_cur = n;</div><div class='del'>-					wqe = get_swqe_ptr(qp, n);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			wqe = get_swqe_ptr(qp, n);</div><div class='del'>-			if (ipath_cmp24(psn, wqe-&gt;psn) &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-			qp-&gt;s_cur = n;</div><div class='del'>-		}</div><div class='del'>-		qp-&gt;s_psn = psn;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Reset the state to restart in the middle of a request.</div><div class='del'>-		 * Don't change the s_sge, s_cur_sge, or s_cur_size.</div><div class='del'>-		 * See ipath_do_rc_send().</div><div class='del'>-		 */</div><div class='del'>-		switch (wqe-&gt;wr.opcode) {</div><div class='del'>-		case IB_WR_SEND:</div><div class='del'>-		case IB_WR_SEND_WITH_IMM:</div><div class='del'>-			qp-&gt;s_state = OP(RDMA_READ_RESPONSE_FIRST);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IB_WR_RDMA_WRITE:</div><div class='del'>-		case IB_WR_RDMA_WRITE_WITH_IMM:</div><div class='del'>-			qp-&gt;s_state = OP(RDMA_READ_RESPONSE_LAST);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IB_WR_RDMA_READ:</div><div class='del'>-			qp-&gt;s_state =</div><div class='del'>-				OP(RDMA_READ_RESPONSE_MIDDLE);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			/*</div><div class='del'>-			 * This case shouldn't happen since its only</div><div class='del'>-			 * one PSN per req.</div><div class='del'>-			 */</div><div class='del'>-			qp-&gt;s_state = OP(SEND_LAST);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	reset_psn(qp, psn);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	tasklet_hi_schedule(&amp;qp-&gt;s_task);</div><div class='hunk'>@@ -800,76 +738,14 @@ bail:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * reset_psn - reset the QP state to send starting from PSN</div><div class='del'>- * @qp: the QP</div><div class='del'>- * @psn: the packet sequence number to restart at</div><div class='del'>- *</div><div class='del'>- * This is called from ipath_rc_rcv() to process an incoming RC ACK</div><div class='del'>- * for the given QP.</div><div class='del'>- * Called at interrupt level with the QP s_lock held.</div><div class='del'>- */</div><div class='del'>-static void reset_psn(struct ipath_qp *qp, u32 psn)</div><div class='del'>-{</div><div class='del'>-	struct ipath_swqe *wqe;</div><div class='del'>-	u32 n;</div><div class='del'>-</div><div class='del'>-	n = qp-&gt;s_cur;</div><div class='del'>-	wqe = get_swqe_ptr(qp, n);</div><div class='del'>-	for (;;) {</div><div class='del'>-		if (++n == qp-&gt;s_size)</div><div class='del'>-			n = 0;</div><div class='del'>-		if (n == qp-&gt;s_tail) {</div><div class='del'>-			if (ipath_cmp24(psn, qp-&gt;s_next_psn) &gt;= 0) {</div><div class='del'>-				qp-&gt;s_cur = n;</div><div class='del'>-				wqe = get_swqe_ptr(qp, n);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		wqe = get_swqe_ptr(qp, n);</div><div class='del'>-		if (ipath_cmp24(psn, wqe-&gt;psn) &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		qp-&gt;s_cur = n;</div><div class='del'>-	}</div><div class='del'>-	qp-&gt;s_psn = psn;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the state to restart in the middle of a</div><div class='del'>-	 * request.  Don't change the s_sge, s_cur_sge, or</div><div class='del'>-	 * s_cur_size.  See ipath_do_rc_send().</div><div class='del'>-	 */</div><div class='del'>-	switch (wqe-&gt;wr.opcode) {</div><div class='del'>-	case IB_WR_SEND:</div><div class='del'>-	case IB_WR_SEND_WITH_IMM:</div><div class='del'>-		qp-&gt;s_state = OP(RDMA_READ_RESPONSE_FIRST);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IB_WR_RDMA_WRITE:</div><div class='del'>-	case IB_WR_RDMA_WRITE_WITH_IMM:</div><div class='del'>-		qp-&gt;s_state = OP(RDMA_READ_RESPONSE_LAST);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IB_WR_RDMA_READ:</div><div class='del'>-		qp-&gt;s_state = OP(RDMA_READ_RESPONSE_MIDDLE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/*</div><div class='del'>-		 * This case shouldn't happen since its only</div><div class='del'>-		 * one PSN per req.</div><div class='del'>-		 */</div><div class='del'>-		qp-&gt;s_state = OP(SEND_LAST);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * do_rc_ack - process an incoming RC ACK</div><div class='ctx'>  * @qp: the QP the ACK came in on</div><div class='ctx'>  * @psn: the packet sequence number of the ACK</div><div class='ctx'>  * @opcode: the opcode of the request that resulted in the ACK</div><div class='ctx'>  *</div><div class='del'>- * This is called from ipath_rc_rcv() to process an incoming RC ACK</div><div class='add'>+ * This is called from ipath_rc_rcv_resp() to process an incoming RC ACK</div><div class='ctx'>  * for the given QP.</div><div class='del'>- * Called at interrupt level with the QP s_lock held.</div><div class='add'>+ * Called at interrupt level with the QP s_lock held and interrupts disabled.</div><div class='ctx'>  * Returns 1 if OK, 0 if current operation should be aborted (NAK).</div><div class='ctx'>  */</div><div class='ctx'> static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)</div><div class='hunk'>@@ -1006,26 +882,16 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)</div><div class='ctx'> 		if (qp-&gt;s_last == qp-&gt;s_tail)</div><div class='ctx'> 			goto bail;</div><div class='ctx'> </div><div class='del'>-		/* The last valid PSN seen is the previous request's. */</div><div class='del'>-		qp-&gt;s_last_psn = wqe-&gt;psn - 1;</div><div class='add'>+		/* The last valid PSN is the previous PSN. */</div><div class='add'>+		qp-&gt;s_last_psn = psn - 1;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;n_rc_resends += (int)qp-&gt;s_psn - (int)psn;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If we are starting the request from the beginning, let</div><div class='del'>-		 * the normal send code handle initialization.</div><div class='del'>-		 */</div><div class='del'>-		qp-&gt;s_cur = qp-&gt;s_last;</div><div class='del'>-		wqe = get_swqe_ptr(qp, qp-&gt;s_cur);</div><div class='del'>-		if (ipath_cmp24(psn, wqe-&gt;psn) &lt;= 0) {</div><div class='del'>-			qp-&gt;s_state = OP(SEND_LAST);</div><div class='del'>-			qp-&gt;s_psn = wqe-&gt;psn;</div><div class='del'>-		} else</div><div class='del'>-			reset_psn(qp, psn);</div><div class='add'>+		reset_psn(qp, psn);</div><div class='ctx'> </div><div class='ctx'> 		qp-&gt;s_rnr_timeout =</div><div class='del'>-			ib_ipath_rnr_table[(aeth &gt;&gt; IPS_AETH_CREDIT_SHIFT) &amp;</div><div class='del'>-					   IPS_AETH_CREDIT_MASK];</div><div class='add'>+			ib_ipath_rnr_table[(aeth &gt;&gt; IPATH_AETH_CREDIT_SHIFT) &amp;</div><div class='add'>+					   IPATH_AETH_CREDIT_MASK];</div><div class='ctx'> 		ipath_insert_rnr_queue(qp);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> </div><div class='hunk'>@@ -1033,8 +899,8 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode)</div><div class='ctx'> 		/* The last valid PSN seen is the previous request's. */</div><div class='ctx'> 		if (qp-&gt;s_last != qp-&gt;s_tail)</div><div class='ctx'> 			qp-&gt;s_last_psn = wqe-&gt;psn - 1;</div><div class='del'>-		switch ((aeth &gt;&gt; IPS_AETH_CREDIT_SHIFT) &amp;</div><div class='del'>-			IPS_AETH_CREDIT_MASK) {</div><div class='add'>+		switch ((aeth &gt;&gt; IPATH_AETH_CREDIT_SHIFT) &amp;</div><div class='add'>+			IPATH_AETH_CREDIT_MASK) {</div><div class='ctx'> 		case 0:	/* PSN sequence error */</div><div class='ctx'> 			dev-&gt;n_seq_naks++;</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1182,32 +1048,33 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,</div><div class='ctx'> 			goto ack_done;</div><div class='ctx'> 		}</div><div class='ctx'> 	rdma_read:</div><div class='del'>-	if (unlikely(qp-&gt;s_state != OP(RDMA_READ_REQUEST)))</div><div class='del'>-		goto ack_done;</div><div class='del'>-	if (unlikely(tlen != (hdrsize + pmtu + 4)))</div><div class='del'>-		goto ack_done;</div><div class='del'>-	if (unlikely(pmtu &gt;= qp-&gt;s_len))</div><div class='del'>-		goto ack_done;</div><div class='del'>-	/* We got a response so update the timeout. */</div><div class='del'>-	if (unlikely(qp-&gt;s_last == qp-&gt;s_tail ||</div><div class='del'>-		     get_swqe_ptr(qp, qp-&gt;s_last)-&gt;wr.opcode !=</div><div class='del'>-		     IB_WR_RDMA_READ))</div><div class='del'>-		goto ack_done;</div><div class='del'>-	spin_lock(&amp;dev-&gt;pending_lock);</div><div class='del'>-	if (qp-&gt;s_rnr_timeout == 0 &amp;&amp; !list_empty(&amp;qp-&gt;timerwait))</div><div class='del'>-		list_move_tail(&amp;qp-&gt;timerwait,</div><div class='del'>-			       &amp;dev-&gt;pending[dev-&gt;pending_index]);</div><div class='del'>-	spin_unlock(&amp;dev-&gt;pending_lock);</div><div class='del'>-	/*</div><div class='del'>-	 * Update the RDMA receive state but do the copy w/o holding the</div><div class='del'>-	 * locks and blocking interrupts.  XXX Yet another place that</div><div class='del'>-	 * affects relaxed RDMA order since we don't want s_sge modified.</div><div class='del'>-	 */</div><div class='del'>-	qp-&gt;s_len -= pmtu;</div><div class='del'>-	qp-&gt;s_last_psn = psn;</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-	ipath_copy_sge(&amp;qp-&gt;s_sge, data, pmtu);</div><div class='del'>-	goto bail;</div><div class='add'>+		if (unlikely(qp-&gt;s_state != OP(RDMA_READ_REQUEST)))</div><div class='add'>+			goto ack_done;</div><div class='add'>+		if (unlikely(tlen != (hdrsize + pmtu + 4)))</div><div class='add'>+			goto ack_done;</div><div class='add'>+		if (unlikely(pmtu &gt;= qp-&gt;s_len))</div><div class='add'>+			goto ack_done;</div><div class='add'>+		/* We got a response so update the timeout. */</div><div class='add'>+		if (unlikely(qp-&gt;s_last == qp-&gt;s_tail ||</div><div class='add'>+			     get_swqe_ptr(qp, qp-&gt;s_last)-&gt;wr.opcode !=</div><div class='add'>+			     IB_WR_RDMA_READ))</div><div class='add'>+			goto ack_done;</div><div class='add'>+		spin_lock(&amp;dev-&gt;pending_lock);</div><div class='add'>+		if (qp-&gt;s_rnr_timeout == 0 &amp;&amp; !list_empty(&amp;qp-&gt;timerwait))</div><div class='add'>+			list_move_tail(&amp;qp-&gt;timerwait,</div><div class='add'>+				       &amp;dev-&gt;pending[dev-&gt;pending_index]);</div><div class='add'>+		spin_unlock(&amp;dev-&gt;pending_lock);</div><div class='add'>+		/*</div><div class='add'>+		 * Update the RDMA receive state but do the copy w/o</div><div class='add'>+		 * holding the locks and blocking interrupts.</div><div class='add'>+		 * XXX Yet another place that affects relaxed RDMA order</div><div class='add'>+		 * since we don't want s_sge modified.</div><div class='add'>+		 */</div><div class='add'>+		qp-&gt;s_len -= pmtu;</div><div class='add'>+		qp-&gt;s_last_psn = psn;</div><div class='add'>+		spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='add'>+		ipath_copy_sge(&amp;qp-&gt;s_sge, data, pmtu);</div><div class='add'>+		goto bail;</div><div class='ctx'> </div><div class='ctx'> 	case OP(RDMA_READ_RESPONSE_LAST):</div><div class='ctx'> 		/* ACKs READ req. */</div><div class='hunk'>@@ -1230,18 +1097,12 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,</div><div class='ctx'> 		 * ICRC (4).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (unlikely(tlen &lt;= (hdrsize + pad + 8))) {</div><div class='del'>-			/*</div><div class='del'>-			 * XXX Need to generate an error CQ</div><div class='del'>-			 * entry.</div><div class='del'>-			 */</div><div class='add'>+			/* XXX Need to generate an error CQ entry. */</div><div class='ctx'> 			goto ack_done;</div><div class='ctx'> 		}</div><div class='ctx'> 		tlen -= hdrsize + pad + 8;</div><div class='ctx'> 		if (unlikely(tlen != qp-&gt;s_len)) {</div><div class='del'>-			/*</div><div class='del'>-			 * XXX Need to generate an error CQ</div><div class='del'>-			 * entry.</div><div class='del'>-			 */</div><div class='add'>+			/* XXX Need to generate an error CQ entry. */</div><div class='ctx'> 			goto ack_done;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!header_in_data)</div><div class='hunk'>@@ -1254,9 +1115,12 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,</div><div class='ctx'> 		if (do_rc_ack(qp, aeth, psn, OP(RDMA_READ_RESPONSE_LAST))) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Change the state so we contimue</div><div class='del'>-			 * processing new requests.</div><div class='add'>+			 * processing new requests and wake up the</div><div class='add'>+			 * tasklet if there are posted sends.</div><div class='ctx'> 			 */</div><div class='ctx'> 			qp-&gt;s_state = OP(SEND_LAST);</div><div class='add'>+			if (qp-&gt;s_tail != qp-&gt;s_head)</div><div class='add'>+				tasklet_hi_schedule(&amp;qp-&gt;s_task);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto ack_done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1302,18 +1166,16 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,</div><div class='ctx'> 		 * Don't queue the NAK if a RDMA read, atomic, or</div><div class='ctx'> 		 * NAK is pending though.</div><div class='ctx'> 		 */</div><div class='del'>-		spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-		if ((qp-&gt;s_ack_state &gt;= OP(RDMA_READ_REQUEST) &amp;&amp;</div><div class='del'>-		     qp-&gt;s_ack_state != IB_OPCODE_ACKNOWLEDGE) ||</div><div class='del'>-		    qp-&gt;s_nak_state != 0) {</div><div class='del'>-			spin_unlock(&amp;qp-&gt;s_lock);</div><div class='add'>+		if (qp-&gt;s_ack_state != OP(ACKNOWLEDGE) ||</div><div class='add'>+		    qp-&gt;r_nak_state != 0)</div><div class='ctx'> 			goto done;</div><div class='add'>+		if (qp-&gt;r_ack_state &lt; OP(COMPARE_SWAP)) {</div><div class='add'>+			qp-&gt;r_ack_state = OP(SEND_ONLY);</div><div class='add'>+			qp-&gt;r_nak_state = IB_NAK_PSN_ERROR;</div><div class='add'>+			/* Use the expected PSN. */</div><div class='add'>+			qp-&gt;r_ack_psn = qp-&gt;r_psn;</div><div class='ctx'> 		}</div><div class='del'>-		qp-&gt;s_ack_state = OP(SEND_ONLY);</div><div class='del'>-		qp-&gt;s_nak_state = IB_NAK_PSN_ERROR;</div><div class='del'>-		/* Use the expected PSN. */</div><div class='del'>-		qp-&gt;s_ack_psn = qp-&gt;r_psn;</div><div class='del'>-		goto resched;</div><div class='add'>+		goto send_ack;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1327,27 +1189,7 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,</div><div class='ctx'> 	 * send the earliest so that RDMA reads can be restarted at</div><div class='ctx'> 	 * the requester's expected PSN.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-	if (qp-&gt;s_ack_state != IB_OPCODE_ACKNOWLEDGE &amp;&amp;</div><div class='del'>-	    ipath_cmp24(psn, qp-&gt;s_ack_psn) &gt;= 0) {</div><div class='del'>-		if (qp-&gt;s_ack_state &lt; IB_OPCODE_RDMA_READ_REQUEST)</div><div class='del'>-			qp-&gt;s_ack_psn = psn;</div><div class='del'>-		spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	switch (opcode) {</div><div class='del'>-	case OP(RDMA_READ_REQUEST):</div><div class='del'>-		/*</div><div class='del'>-		 * We have to be careful to not change s_rdma_sge</div><div class='del'>-		 * while ipath_do_rc_send() is using it and not</div><div class='del'>-		 * holding the s_lock.</div><div class='del'>-		 */</div><div class='del'>-		if (qp-&gt;s_ack_state != OP(ACKNOWLEDGE) &amp;&amp;</div><div class='del'>-		    qp-&gt;s_ack_state &gt;= IB_OPCODE_RDMA_READ_REQUEST) {</div><div class='del'>-			spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-			dev-&gt;n_rdma_dup_busy++;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+	if (opcode == OP(RDMA_READ_REQUEST)) {</div><div class='ctx'> 		/* RETH comes after BTH */</div><div class='ctx'> 		if (!header_in_data)</div><div class='ctx'> 			reth = &amp;ohdr-&gt;u.rc.reth;</div><div class='hunk'>@@ -1355,6 +1197,22 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,</div><div class='ctx'> 			reth = (struct ib_reth *)data;</div><div class='ctx'> 			data += sizeof(*reth);</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * If we receive a duplicate RDMA request, it means the</div><div class='add'>+		 * requester saw a sequence error and needs to restart</div><div class='add'>+		 * from an earlier point.  We can abort the current</div><div class='add'>+		 * RDMA read send in that case.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irq(&amp;qp-&gt;s_lock);</div><div class='add'>+		if (qp-&gt;s_ack_state != OP(ACKNOWLEDGE) &amp;&amp;</div><div class='add'>+		    (qp-&gt;s_hdrwords || ipath_cmp24(psn, qp-&gt;s_ack_psn) &gt;= 0)) {</div><div class='add'>+			/*</div><div class='add'>+			 * We are already sending earlier requested data.</div><div class='add'>+			 * Don't abort it to send later out of sequence data.</div><div class='add'>+			 */</div><div class='add'>+			spin_unlock_irq(&amp;qp-&gt;s_lock);</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='ctx'> 		qp-&gt;s_rdma_len = be32_to_cpu(reth-&gt;length);</div><div class='ctx'> 		if (qp-&gt;s_rdma_len != 0) {</div><div class='ctx'> 			u32 rkey = be32_to_cpu(reth-&gt;rkey);</div><div class='hunk'>@@ -1368,8 +1226,10 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,</div><div class='ctx'> 			ok = ipath_rkey_ok(dev, &amp;qp-&gt;s_rdma_sge,</div><div class='ctx'> 					   qp-&gt;s_rdma_len, vaddr, rkey,</div><div class='ctx'> 					   IB_ACCESS_REMOTE_READ);</div><div class='del'>-			if (unlikely(!ok))</div><div class='add'>+			if (unlikely(!ok)) {</div><div class='add'>+				spin_unlock_irq(&amp;qp-&gt;s_lock);</div><div class='ctx'> 				goto done;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			qp-&gt;s_rdma_sge.sg_list = NULL;</div><div class='ctx'> 			qp-&gt;s_rdma_sge.num_sge = 0;</div><div class='hunk'>@@ -1378,25 +1238,44 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,</div><div class='ctx'> 			qp-&gt;s_rdma_sge.sge.length = 0;</div><div class='ctx'> 			qp-&gt;s_rdma_sge.sge.sge_length = 0;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='add'>+		qp-&gt;s_ack_state = opcode;</div><div class='add'>+		qp-&gt;s_ack_psn = psn;</div><div class='add'>+		spin_unlock_irq(&amp;qp-&gt;s_lock);</div><div class='add'>+		tasklet_hi_schedule(&amp;qp-&gt;s_task);</div><div class='add'>+		goto send_ack;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A pending RDMA read will ACK anything before it so</div><div class='add'>+	 * ignore earlier duplicate requests.</div><div class='add'>+	 */</div><div class='add'>+	if (qp-&gt;s_ack_state != OP(ACKNOWLEDGE))</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If an ACK is pending, don't replace the pending ACK</div><div class='add'>+	 * with an earlier one since the later one will ACK the earlier.</div><div class='add'>+	 * Also, if we already have a pending atomic, send it.</div><div class='add'>+	 */</div><div class='add'>+	if (qp-&gt;r_ack_state != OP(ACKNOWLEDGE) &amp;&amp;</div><div class='add'>+	    (ipath_cmp24(psn, qp-&gt;r_ack_psn) &lt;= 0 ||</div><div class='add'>+	     qp-&gt;r_ack_state &gt;= OP(COMPARE_SWAP)))</div><div class='add'>+		goto send_ack;</div><div class='add'>+	switch (opcode) {</div><div class='ctx'> 	case OP(COMPARE_SWAP):</div><div class='ctx'> 	case OP(FETCH_ADD):</div><div class='ctx'> 		/*</div><div class='del'>-		 * Check for the PSN of the last atomic operations</div><div class='add'>+		 * Check for the PSN of the last atomic operation</div><div class='ctx'> 		 * performed and resend the result if found.</div><div class='ctx'> 		 */</div><div class='del'>-		if ((psn &amp; IPS_PSN_MASK) != qp-&gt;r_atomic_psn) {</div><div class='del'>-			spin_unlock(&amp;qp-&gt;s_lock);</div><div class='add'>+		if ((psn &amp; IPATH_PSN_MASK) != qp-&gt;r_atomic_psn)</div><div class='ctx'> 			goto done;</div><div class='del'>-		}</div><div class='del'>-		qp-&gt;s_ack_atomic = qp-&gt;r_atomic_data;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	qp-&gt;s_ack_state = opcode;</div><div class='del'>-	qp-&gt;s_nak_state = 0;</div><div class='del'>-	qp-&gt;s_ack_psn = psn;</div><div class='del'>-resched:</div><div class='add'>+	qp-&gt;r_ack_state = opcode;</div><div class='add'>+	qp-&gt;r_nak_state = 0;</div><div class='add'>+	qp-&gt;r_ack_psn = psn;</div><div class='add'>+send_ack:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='hunk'>@@ -1424,7 +1303,6 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	u32 hdrsize;</div><div class='ctx'> 	u32 psn;</div><div class='ctx'> 	u32 pad;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct ib_wc wc;</div><div class='ctx'> 	u32 pmtu = ib_mtu_enum_to_int(qp-&gt;path_mtu);</div><div class='ctx'> 	int diff;</div><div class='hunk'>@@ -1453,11 +1331,6 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		} else</div><div class='ctx'> 			psn = be32_to_cpu(ohdr-&gt;bth[2]);</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * The opcode is in the low byte when its in network order</div><div class='del'>-	 * (top byte when in host order).</div><div class='del'>-	 */</div><div class='del'>-	opcode = be32_to_cpu(ohdr-&gt;bth[0]) &gt;&gt; 24;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Process responses (ACKs) before anything else.  Note that the</div><div class='hunk'>@@ -1465,22 +1338,21 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	 * queue rather than the expected receive packet sequence number.</div><div class='ctx'> 	 * In other words, this QP is the requester.</div><div class='ctx'> 	 */</div><div class='add'>+	opcode = be32_to_cpu(ohdr-&gt;bth[0]) &gt;&gt; 24;</div><div class='ctx'> 	if (opcode &gt;= OP(RDMA_READ_RESPONSE_FIRST) &amp;&amp;</div><div class='ctx'> 	    opcode &lt;= OP(ATOMIC_ACKNOWLEDGE)) {</div><div class='ctx'> 		ipath_rc_rcv_resp(dev, ohdr, data, tlen, qp, opcode, psn,</div><div class='ctx'> 				  hdrsize, pmtu, header_in_data);</div><div class='del'>-		goto bail;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* Compute 24 bits worth of difference. */</div><div class='ctx'> 	diff = ipath_cmp24(psn, qp-&gt;r_psn);</div><div class='ctx'> 	if (unlikely(diff)) {</div><div class='ctx'> 		if (ipath_rc_rcv_error(dev, ohdr, data, qp, opcode,</div><div class='ctx'> 				       psn, diff, header_in_data))</div><div class='ctx'> 			goto done;</div><div class='del'>-		goto resched;</div><div class='add'>+		goto send_ack;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for opcode sequence errors. */</div><div class='hunk'>@@ -1492,22 +1364,19 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		    opcode == OP(SEND_LAST_WITH_IMMEDIATE))</div><div class='ctx'> 			break;</div><div class='ctx'> 	nack_inv:</div><div class='del'>-	/*</div><div class='del'>-	 * A NAK will ACK earlier sends and RDMA writes.  Don't queue the</div><div class='del'>-	 * NAK if a RDMA read, atomic, or NAK is pending though.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-	if (qp-&gt;s_ack_state &gt;= OP(RDMA_READ_REQUEST) &amp;&amp;</div><div class='del'>-	    qp-&gt;s_ack_state != IB_OPCODE_ACKNOWLEDGE) {</div><div class='del'>-		spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	/* XXX Flush WQEs */</div><div class='del'>-	qp-&gt;state = IB_QPS_ERR;</div><div class='del'>-	qp-&gt;s_ack_state = OP(SEND_ONLY);</div><div class='del'>-	qp-&gt;s_nak_state = IB_NAK_INVALID_REQUEST;</div><div class='del'>-	qp-&gt;s_ack_psn = qp-&gt;r_psn;</div><div class='del'>-	goto resched;</div><div class='add'>+		/*</div><div class='add'>+		 * A NAK will ACK earlier sends and RDMA writes.</div><div class='add'>+		 * Don't queue the NAK if a RDMA read, atomic, or NAK</div><div class='add'>+		 * is pending though.</div><div class='add'>+		 */</div><div class='add'>+		if (qp-&gt;r_ack_state &gt;= OP(COMPARE_SWAP))</div><div class='add'>+			goto send_ack;</div><div class='add'>+		/* XXX Flush WQEs */</div><div class='add'>+		qp-&gt;state = IB_QPS_ERR;</div><div class='add'>+		qp-&gt;r_ack_state = OP(SEND_ONLY);</div><div class='add'>+		qp-&gt;r_nak_state = IB_NAK_INVALID_REQUEST;</div><div class='add'>+		qp-&gt;r_ack_psn = qp-&gt;r_psn;</div><div class='add'>+		goto send_ack;</div><div class='ctx'> </div><div class='ctx'> 	case OP(RDMA_WRITE_FIRST):</div><div class='ctx'> 	case OP(RDMA_WRITE_MIDDLE):</div><div class='hunk'>@@ -1517,20 +1386,6 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			break;</div><div class='ctx'> 		goto nack_inv;</div><div class='ctx'> </div><div class='del'>-	case OP(RDMA_READ_REQUEST):</div><div class='del'>-	case OP(COMPARE_SWAP):</div><div class='del'>-	case OP(FETCH_ADD):</div><div class='del'>-		/*</div><div class='del'>-		 * Drop all new requests until a response has been sent.  A</div><div class='del'>-		 * new request then ACKs the RDMA response we sent.  Relaxed</div><div class='del'>-		 * ordering would allow new requests to be processed but we</div><div class='del'>-		 * would need to keep a queue of rwqe's for all that are in</div><div class='del'>-		 * progress.  Note that we can't RNR NAK this request since</div><div class='del'>-		 * the RDMA READ or atomic response is already queued to be</div><div class='del'>-		 * sent (unless we implement a response send queue).</div><div class='del'>-		 */</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (opcode == OP(SEND_MIDDLE) ||</div><div class='ctx'> 		    opcode == OP(SEND_LAST) ||</div><div class='hunk'>@@ -1539,6 +1394,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		    opcode == OP(RDMA_WRITE_LAST) ||</div><div class='ctx'> 		    opcode == OP(RDMA_WRITE_LAST_WITH_IMMEDIATE))</div><div class='ctx'> 			goto nack_inv;</div><div class='add'>+		/*</div><div class='add'>+		 * Note that it is up to the requester to not send a new</div><div class='add'>+		 * RDMA read or atomic operation before receiving an ACK</div><div class='add'>+		 * for the previous operation.</div><div class='add'>+		 */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1555,17 +1415,12 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			 * Don't queue the NAK if a RDMA read or atomic</div><div class='ctx'> 			 * is pending though.</div><div class='ctx'> 			 */</div><div class='del'>-			spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-			if (qp-&gt;s_ack_state &gt;=</div><div class='del'>-			    OP(RDMA_READ_REQUEST) &amp;&amp;</div><div class='del'>-			    qp-&gt;s_ack_state != IB_OPCODE_ACKNOWLEDGE) {</div><div class='del'>-				spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			qp-&gt;s_ack_state = OP(SEND_ONLY);</div><div class='del'>-			qp-&gt;s_nak_state = IB_RNR_NAK | qp-&gt;s_min_rnr_timer;</div><div class='del'>-			qp-&gt;s_ack_psn = qp-&gt;r_psn;</div><div class='del'>-			goto resched;</div><div class='add'>+			if (qp-&gt;r_ack_state &gt;= OP(COMPARE_SWAP))</div><div class='add'>+				goto send_ack;</div><div class='add'>+			qp-&gt;r_ack_state = OP(SEND_ONLY);</div><div class='add'>+			qp-&gt;r_nak_state = IB_RNR_NAK | qp-&gt;r_min_rnr_timer;</div><div class='add'>+			qp-&gt;r_ack_psn = qp-&gt;r_psn;</div><div class='add'>+			goto send_ack;</div><div class='ctx'> 		}</div><div class='ctx'> 		qp-&gt;r_rcv_len = 0;</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='hunk'>@@ -1622,7 +1477,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		if (unlikely(wc.byte_len &gt; qp-&gt;r_len))</div><div class='ctx'> 			goto nack_inv;</div><div class='ctx'> 		ipath_copy_sge(&amp;qp-&gt;r_sge, data, tlen);</div><div class='del'>-		atomic_inc(&amp;qp-&gt;msn);</div><div class='add'>+		qp-&gt;r_msn++;</div><div class='ctx'> 		if (opcode == OP(RDMA_WRITE_LAST) ||</div><div class='ctx'> 		    opcode == OP(RDMA_WRITE_ONLY))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1666,29 +1521,8 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			ok = ipath_rkey_ok(dev, &amp;qp-&gt;r_sge,</div><div class='ctx'> 					   qp-&gt;r_len, vaddr, rkey,</div><div class='ctx'> 					   IB_ACCESS_REMOTE_WRITE);</div><div class='del'>-			if (unlikely(!ok)) {</div><div class='del'>-			nack_acc:</div><div class='del'>-				/*</div><div class='del'>-				 * A NAK will ACK earlier sends and RDMA</div><div class='del'>-				 * writes.  Don't queue the NAK if a RDMA</div><div class='del'>-				 * read, atomic, or NAK is pending though.</div><div class='del'>-				 */</div><div class='del'>-				spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-				if (qp-&gt;s_ack_state &gt;=</div><div class='del'>-				    OP(RDMA_READ_REQUEST) &amp;&amp;</div><div class='del'>-				    qp-&gt;s_ack_state !=</div><div class='del'>-				    IB_OPCODE_ACKNOWLEDGE) {</div><div class='del'>-					spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='del'>-				/* XXX Flush WQEs */</div><div class='del'>-				qp-&gt;state = IB_QPS_ERR;</div><div class='del'>-				qp-&gt;s_ack_state = OP(RDMA_WRITE_ONLY);</div><div class='del'>-				qp-&gt;s_nak_state =</div><div class='del'>-					IB_NAK_REMOTE_ACCESS_ERROR;</div><div class='del'>-				qp-&gt;s_ack_psn = qp-&gt;r_psn;</div><div class='del'>-				goto resched;</div><div class='del'>-			}</div><div class='add'>+			if (unlikely(!ok))</div><div class='add'>+				goto nack_acc;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			qp-&gt;r_sge.sg_list = NULL;</div><div class='ctx'> 			qp-&gt;r_sge.sge.mr = NULL;</div><div class='hunk'>@@ -1715,12 +1549,10 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			reth = (struct ib_reth *)data;</div><div class='ctx'> 			data += sizeof(*reth);</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-		if (qp-&gt;s_ack_state != OP(ACKNOWLEDGE) &amp;&amp;</div><div class='del'>-		    qp-&gt;s_ack_state &gt;= IB_OPCODE_RDMA_READ_REQUEST) {</div><div class='del'>-			spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='add'>+		if (unlikely(!(qp-&gt;qp_access_flags &amp;</div><div class='add'>+			       IB_ACCESS_REMOTE_READ)))</div><div class='add'>+			goto nack_acc;</div><div class='add'>+		spin_lock_irq(&amp;qp-&gt;s_lock);</div><div class='ctx'> 		qp-&gt;s_rdma_len = be32_to_cpu(reth-&gt;length);</div><div class='ctx'> 		if (qp-&gt;s_rdma_len != 0) {</div><div class='ctx'> 			u32 rkey = be32_to_cpu(reth-&gt;rkey);</div><div class='hunk'>@@ -1732,7 +1564,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 					   qp-&gt;s_rdma_len, vaddr, rkey,</div><div class='ctx'> 					   IB_ACCESS_REMOTE_READ);</div><div class='ctx'> 			if (unlikely(!ok)) {</div><div class='del'>-				spin_unlock(&amp;qp-&gt;s_lock);</div><div class='add'>+				spin_unlock_irq(&amp;qp-&gt;s_lock);</div><div class='ctx'> 				goto nack_acc;</div><div class='ctx'> 			}</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1749,21 +1581,25 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			qp-&gt;s_rdma_sge.sge.length = 0;</div><div class='ctx'> 			qp-&gt;s_rdma_sge.sge.sge_length = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(!(qp-&gt;qp_access_flags &amp;</div><div class='del'>-			       IB_ACCESS_REMOTE_READ)))</div><div class='del'>-			goto nack_acc;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We need to increment the MSN here instead of when we</div><div class='ctx'> 		 * finish sending the result since a duplicate request would</div><div class='ctx'> 		 * increment it more than once.</div><div class='ctx'> 		 */</div><div class='del'>-		atomic_inc(&amp;qp-&gt;msn);</div><div class='add'>+		qp-&gt;r_msn++;</div><div class='add'>+</div><div class='ctx'> 		qp-&gt;s_ack_state = opcode;</div><div class='del'>-		qp-&gt;s_nak_state = 0;</div><div class='ctx'> 		qp-&gt;s_ack_psn = psn;</div><div class='add'>+		spin_unlock_irq(&amp;qp-&gt;s_lock);</div><div class='add'>+</div><div class='ctx'> 		qp-&gt;r_psn++;</div><div class='ctx'> 		qp-&gt;r_state = opcode;</div><div class='del'>-		goto rdmadone;</div><div class='add'>+		qp-&gt;r_nak_state = 0;</div><div class='add'>+</div><div class='add'>+		/* Call ipath_do_rc_send() in another thread. */</div><div class='add'>+		tasklet_hi_schedule(&amp;qp-&gt;s_task);</div><div class='add'>+</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='ctx'> 	case OP(COMPARE_SWAP):</div><div class='ctx'> 	case OP(FETCH_ADD): {</div><div class='hunk'>@@ -1792,7 +1628,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			goto nack_acc;</div><div class='ctx'> 		/* Perform atomic OP and save result. */</div><div class='ctx'> 		sdata = be64_to_cpu(ateth-&gt;swap_data);</div><div class='del'>-		spin_lock(&amp;dev-&gt;pending_lock);</div><div class='add'>+		spin_lock_irq(&amp;dev-&gt;pending_lock);</div><div class='ctx'> 		qp-&gt;r_atomic_data = *(u64 *) qp-&gt;r_sge.sge.vaddr;</div><div class='ctx'> 		if (opcode == OP(FETCH_ADD))</div><div class='ctx'> 			*(u64 *) qp-&gt;r_sge.sge.vaddr =</div><div class='hunk'>@@ -1800,9 +1636,9 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		else if (qp-&gt;r_atomic_data ==</div><div class='ctx'> 			 be64_to_cpu(ateth-&gt;compare_data))</div><div class='ctx'> 			*(u64 *) qp-&gt;r_sge.sge.vaddr = sdata;</div><div class='del'>-		spin_unlock(&amp;dev-&gt;pending_lock);</div><div class='del'>-		atomic_inc(&amp;qp-&gt;msn);</div><div class='del'>-		qp-&gt;r_atomic_psn = psn &amp; IPS_PSN_MASK;</div><div class='add'>+		spin_unlock_irq(&amp;dev-&gt;pending_lock);</div><div class='add'>+		qp-&gt;r_msn++;</div><div class='add'>+		qp-&gt;r_atomic_psn = psn &amp; IPATH_PSN_MASK;</div><div class='ctx'> 		psn |= 1 &lt;&lt; 31;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1813,44 +1649,39 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	}</div><div class='ctx'> 	qp-&gt;r_psn++;</div><div class='ctx'> 	qp-&gt;r_state = opcode;</div><div class='add'>+	qp-&gt;r_nak_state = 0;</div><div class='ctx'> 	/* Send an ACK if requested or required. */</div><div class='ctx'> 	if (psn &amp; (1 &lt;&lt; 31)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Coalesce ACKs unless there is a RDMA READ or</div><div class='ctx'> 		 * ATOMIC pending.</div><div class='ctx'> 		 */</div><div class='del'>-		spin_lock(&amp;qp-&gt;s_lock);</div><div class='del'>-		if (qp-&gt;s_ack_state == OP(ACKNOWLEDGE) ||</div><div class='del'>-		    qp-&gt;s_ack_state &lt; IB_OPCODE_RDMA_READ_REQUEST) {</div><div class='del'>-			qp-&gt;s_ack_state = opcode;</div><div class='del'>-			qp-&gt;s_nak_state = 0;</div><div class='del'>-			qp-&gt;s_ack_psn = psn;</div><div class='del'>-			qp-&gt;s_ack_atomic = qp-&gt;r_atomic_data;</div><div class='del'>-			goto resched;</div><div class='add'>+		if (qp-&gt;r_ack_state &lt; OP(COMPARE_SWAP)) {</div><div class='add'>+			qp-&gt;r_ack_state = opcode;</div><div class='add'>+			qp-&gt;r_ack_psn = psn;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;qp-&gt;s_lock);</div><div class='add'>+		goto send_ack;</div><div class='ctx'> 	}</div><div class='del'>-done:</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-	goto bail;</div><div class='add'>+	goto done;</div><div class='ctx'> </div><div class='del'>-resched:</div><div class='add'>+nack_acc:</div><div class='ctx'> 	/*</div><div class='del'>-	 * Try to send ACK right away but not if ipath_do_rc_send() is</div><div class='del'>-	 * active.</div><div class='add'>+	 * A NAK will ACK earlier sends and RDMA writes.</div><div class='add'>+	 * Don't queue the NAK if a RDMA read, atomic, or NAK</div><div class='add'>+	 * is pending though.</div><div class='ctx'> 	 */</div><div class='del'>-	if (qp-&gt;s_hdrwords == 0 &amp;&amp;</div><div class='del'>-	    (qp-&gt;s_ack_state &lt; IB_OPCODE_RDMA_READ_REQUEST ||</div><div class='del'>-	     qp-&gt;s_ack_state &gt;= IB_OPCODE_COMPARE_SWAP))</div><div class='add'>+	if (qp-&gt;r_ack_state &lt; OP(COMPARE_SWAP)) {</div><div class='add'>+		/* XXX Flush WQEs */</div><div class='add'>+		qp-&gt;state = IB_QPS_ERR;</div><div class='add'>+		qp-&gt;r_ack_state = OP(RDMA_WRITE_ONLY);</div><div class='add'>+		qp-&gt;r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR;</div><div class='add'>+		qp-&gt;r_ack_psn = qp-&gt;r_psn;</div><div class='add'>+	}</div><div class='add'>+send_ack:</div><div class='add'>+	/* Send ACK right away unless the send tasklet has a pending ACK. */</div><div class='add'>+	if (qp-&gt;s_ack_state == OP(ACKNOWLEDGE))</div><div class='ctx'> 		send_rc_ack(qp);</div><div class='ctx'> </div><div class='del'>-rdmadone:</div><div class='del'>-	spin_unlock(&amp;qp-&gt;s_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Call ipath_do_rc_send() in another thread. */</div><div class='del'>-	tasklet_hi_schedule(&amp;qp-&gt;s_task);</div><div class='del'>-</div><div class='del'>-bail:</div><div class='add'>+done:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_registers.h b/drivers/infiniband/hw/ipath/ipath_registers.h<br/>index 402126eb79c9..89df8f5ea998 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_registers.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_registers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_registers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_registers.h</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c<br/>index d38f4f3cfd1d..772bc59fb85c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ruc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_ruc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ruc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_ruc.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -31,6 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ipath_verbs.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Convert the AETH RNR timeout code into the number of milliseconds.</div><div class='hunk'>@@ -111,20 +113,23 @@ void ipath_insert_rnr_queue(struct ipath_qp *qp)</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 if no RWQE is available, otherwise return 1.</div><div class='ctx'>  *</div><div class='del'>- * Called at interrupt level with the QP r_rq.lock held.</div><div class='add'>+ * Can be called from interrupt level.</div><div class='ctx'>  */</div><div class='ctx'> int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct ipath_rq *rq;</div><div class='ctx'> 	struct ipath_srq *srq;</div><div class='ctx'> 	struct ipath_rwqe *wqe;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!qp-&gt;ibqp.srq) {</div><div class='ctx'> 		rq = &amp;qp-&gt;r_rq;</div><div class='add'>+		spin_lock_irqsave(&amp;rq-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 		if (unlikely(rq-&gt;tail == rq-&gt;head)) {</div><div class='ctx'> 			ret = 0;</div><div class='del'>-			goto bail;</div><div class='add'>+			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		wqe = get_rwqe_ptr(rq, rq-&gt;tail);</div><div class='ctx'> 		qp-&gt;r_wr_id = wqe-&gt;wr_id;</div><div class='hunk'>@@ -136,17 +141,16 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (++rq-&gt;tail &gt;= rq-&gt;size)</div><div class='ctx'> 			rq-&gt;tail = 0;</div><div class='del'>-		ret = 1;</div><div class='del'>-		goto bail;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	srq = to_isrq(qp-&gt;ibqp.srq);</div><div class='ctx'> 	rq = &amp;srq-&gt;rq;</div><div class='del'>-	spin_lock(&amp;rq-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;rq-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(rq-&gt;tail == rq-&gt;head)) {</div><div class='del'>-		spin_unlock(&amp;rq-&gt;lock);</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		goto bail;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	wqe = get_rwqe_ptr(rq, rq-&gt;tail);</div><div class='ctx'> 	qp-&gt;r_wr_id = wqe-&gt;wr_id;</div><div class='hunk'>@@ -168,18 +172,18 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)</div><div class='ctx'> 			n = rq-&gt;head - rq-&gt;tail;</div><div class='ctx'> 		if (n &lt; srq-&gt;limit) {</div><div class='ctx'> 			srq-&gt;limit = 0;</div><div class='del'>-			spin_unlock(&amp;rq-&gt;lock);</div><div class='add'>+			spin_unlock_irqrestore(&amp;rq-&gt;lock, flags);</div><div class='ctx'> 			ev.device = qp-&gt;ibqp.device;</div><div class='ctx'> 			ev.element.srq = qp-&gt;ibqp.srq;</div><div class='ctx'> 			ev.event = IB_EVENT_SRQ_LIMIT_REACHED;</div><div class='ctx'> 			srq-&gt;ibsrq.event_handler(&amp;ev,</div><div class='ctx'> 						 srq-&gt;ibsrq.srq_context);</div><div class='del'>-		} else</div><div class='del'>-			spin_unlock(&amp;rq-&gt;lock);</div><div class='del'>-	} else</div><div class='del'>-		spin_unlock(&amp;rq-&gt;lock);</div><div class='del'>-	ret = 1;</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+done:</div><div class='add'>+	spin_unlock_irqrestore(&amp;rq-&gt;lock, flags);</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -187,7 +191,6 @@ bail:</div><div class='ctx'> /**</div><div class='ctx'>  * ipath_ruc_loopback - handle UC and RC lookback requests</div><div class='ctx'>  * @sqp: the loopback QP</div><div class='del'>- * @wc: the work completion entry</div><div class='ctx'>  *</div><div class='ctx'>  * This is called from ipath_do_uc_send() or ipath_do_rc_send() to</div><div class='ctx'>  * forward a WQE addressed to the same HCA.</div><div class='hunk'>@@ -196,13 +199,14 @@ bail:</div><div class='ctx'>  * receive interrupts since this is a connected protocol and all packets</div><div class='ctx'>  * will pass through here.</div><div class='ctx'>  */</div><div class='del'>-void ipath_ruc_loopback(struct ipath_qp *sqp, struct ib_wc *wc)</div><div class='add'>+static void ipath_ruc_loopback(struct ipath_qp *sqp)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev = to_idev(sqp-&gt;ibqp.device);</div><div class='ctx'> 	struct ipath_qp *qp;</div><div class='ctx'> 	struct ipath_swqe *wqe;</div><div class='ctx'> 	struct ipath_sge *sge;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	struct ib_wc wc;</div><div class='ctx'> 	u64 sdata;</div><div class='ctx'> </div><div class='ctx'> 	qp = ipath_lookup_qpn(&amp;dev-&gt;qp_table, sqp-&gt;remote_qpn);</div><div class='hunk'>@@ -233,8 +237,8 @@ again:</div><div class='ctx'> 	wqe = get_swqe_ptr(sqp, sqp-&gt;s_last);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;sqp-&gt;s_lock, flags);</div><div class='ctx'> </div><div class='del'>-	wc-&gt;wc_flags = 0;</div><div class='del'>-	wc-&gt;imm_data = 0;</div><div class='add'>+	wc.wc_flags = 0;</div><div class='add'>+	wc.imm_data = 0;</div><div class='ctx'> </div><div class='ctx'> 	sqp-&gt;s_sge.sge = wqe-&gt;sg_list[0];</div><div class='ctx'> 	sqp-&gt;s_sge.sg_list = wqe-&gt;sg_list + 1;</div><div class='hunk'>@@ -242,39 +246,34 @@ again:</div><div class='ctx'> 	sqp-&gt;s_len = wqe-&gt;length;</div><div class='ctx'> 	switch (wqe-&gt;wr.opcode) {</div><div class='ctx'> 	case IB_WR_SEND_WITH_IMM:</div><div class='del'>-		wc-&gt;wc_flags = IB_WC_WITH_IMM;</div><div class='del'>-		wc-&gt;imm_data = wqe-&gt;wr.imm_data;</div><div class='add'>+		wc.wc_flags = IB_WC_WITH_IMM;</div><div class='add'>+		wc.imm_data = wqe-&gt;wr.imm_data;</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='ctx'> 	case IB_WR_SEND:</div><div class='del'>-		spin_lock_irqsave(&amp;qp-&gt;r_rq.lock, flags);</div><div class='ctx'> 		if (!ipath_get_rwqe(qp, 0)) {</div><div class='ctx'> 		rnr_nak:</div><div class='del'>-			spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='ctx'> 			/* Handle RNR NAK */</div><div class='ctx'> 			if (qp-&gt;ibqp.qp_type == IB_QPT_UC)</div><div class='ctx'> 				goto send_comp;</div><div class='ctx'> 			if (sqp-&gt;s_rnr_retry == 0) {</div><div class='del'>-				wc-&gt;status = IB_WC_RNR_RETRY_EXC_ERR;</div><div class='add'>+				wc.status = IB_WC_RNR_RETRY_EXC_ERR;</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (sqp-&gt;s_rnr_retry_cnt &lt; 7)</div><div class='ctx'> 				sqp-&gt;s_rnr_retry--;</div><div class='ctx'> 			dev-&gt;n_rnr_naks++;</div><div class='ctx'> 			sqp-&gt;s_rnr_timeout =</div><div class='del'>-				ib_ipath_rnr_table[sqp-&gt;s_min_rnr_timer];</div><div class='add'>+				ib_ipath_rnr_table[sqp-&gt;r_min_rnr_timer];</div><div class='ctx'> 			ipath_insert_rnr_queue(sqp);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IB_WR_RDMA_WRITE_WITH_IMM:</div><div class='del'>-		wc-&gt;wc_flags = IB_WC_WITH_IMM;</div><div class='del'>-		wc-&gt;imm_data = wqe-&gt;wr.imm_data;</div><div class='del'>-		spin_lock_irqsave(&amp;qp-&gt;r_rq.lock, flags);</div><div class='add'>+		wc.wc_flags = IB_WC_WITH_IMM;</div><div class='add'>+		wc.imm_data = wqe-&gt;wr.imm_data;</div><div class='ctx'> 		if (!ipath_get_rwqe(qp, 1))</div><div class='ctx'> 			goto rnr_nak;</div><div class='del'>-		spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='ctx'> 	case IB_WR_RDMA_WRITE:</div><div class='ctx'> 		if (wqe-&gt;length == 0)</div><div class='hunk'>@@ -284,20 +283,20 @@ again:</div><div class='ctx'> 					    wqe-&gt;wr.wr.rdma.rkey,</div><div class='ctx'> 					    IB_ACCESS_REMOTE_WRITE))) {</div><div class='ctx'> 		acc_err:</div><div class='del'>-			wc-&gt;status = IB_WC_REM_ACCESS_ERR;</div><div class='add'>+			wc.status = IB_WC_REM_ACCESS_ERR;</div><div class='ctx'> 		err:</div><div class='del'>-			wc-&gt;wr_id = wqe-&gt;wr.wr_id;</div><div class='del'>-			wc-&gt;opcode = ib_ipath_wc_opcode[wqe-&gt;wr.opcode];</div><div class='del'>-			wc-&gt;vendor_err = 0;</div><div class='del'>-			wc-&gt;byte_len = 0;</div><div class='del'>-			wc-&gt;qp_num = sqp-&gt;ibqp.qp_num;</div><div class='del'>-			wc-&gt;src_qp = sqp-&gt;remote_qpn;</div><div class='del'>-			wc-&gt;pkey_index = 0;</div><div class='del'>-			wc-&gt;slid = sqp-&gt;remote_ah_attr.dlid;</div><div class='del'>-			wc-&gt;sl = sqp-&gt;remote_ah_attr.sl;</div><div class='del'>-			wc-&gt;dlid_path_bits = 0;</div><div class='del'>-			wc-&gt;port_num = 0;</div><div class='del'>-			ipath_sqerror_qp(sqp, wc);</div><div class='add'>+			wc.wr_id = wqe-&gt;wr.wr_id;</div><div class='add'>+			wc.opcode = ib_ipath_wc_opcode[wqe-&gt;wr.opcode];</div><div class='add'>+			wc.vendor_err = 0;</div><div class='add'>+			wc.byte_len = 0;</div><div class='add'>+			wc.qp_num = sqp-&gt;ibqp.qp_num;</div><div class='add'>+			wc.src_qp = sqp-&gt;remote_qpn;</div><div class='add'>+			wc.pkey_index = 0;</div><div class='add'>+			wc.slid = sqp-&gt;remote_ah_attr.dlid;</div><div class='add'>+			wc.sl = sqp-&gt;remote_ah_attr.sl;</div><div class='add'>+			wc.dlid_path_bits = 0;</div><div class='add'>+			wc.port_num = 0;</div><div class='add'>+			ipath_sqerror_qp(sqp, &amp;wc);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -373,22 +372,22 @@ again:</div><div class='ctx'> 		goto send_comp;</div><div class='ctx'> </div><div class='ctx'> 	if (wqe-&gt;wr.opcode == IB_WR_RDMA_WRITE_WITH_IMM)</div><div class='del'>-		wc-&gt;opcode = IB_WC_RECV_RDMA_WITH_IMM;</div><div class='add'>+		wc.opcode = IB_WC_RECV_RDMA_WITH_IMM;</div><div class='ctx'> 	else</div><div class='del'>-		wc-&gt;opcode = IB_WC_RECV;</div><div class='del'>-	wc-&gt;wr_id = qp-&gt;r_wr_id;</div><div class='del'>-	wc-&gt;status = IB_WC_SUCCESS;</div><div class='del'>-	wc-&gt;vendor_err = 0;</div><div class='del'>-	wc-&gt;byte_len = wqe-&gt;length;</div><div class='del'>-	wc-&gt;qp_num = qp-&gt;ibqp.qp_num;</div><div class='del'>-	wc-&gt;src_qp = qp-&gt;remote_qpn;</div><div class='add'>+		wc.opcode = IB_WC_RECV;</div><div class='add'>+	wc.wr_id = qp-&gt;r_wr_id;</div><div class='add'>+	wc.status = IB_WC_SUCCESS;</div><div class='add'>+	wc.vendor_err = 0;</div><div class='add'>+	wc.byte_len = wqe-&gt;length;</div><div class='add'>+	wc.qp_num = qp-&gt;ibqp.qp_num;</div><div class='add'>+	wc.src_qp = qp-&gt;remote_qpn;</div><div class='ctx'> 	/* XXX do we know which pkey matched? Only needed for GSI. */</div><div class='del'>-	wc-&gt;pkey_index = 0;</div><div class='del'>-	wc-&gt;slid = qp-&gt;remote_ah_attr.dlid;</div><div class='del'>-	wc-&gt;sl = qp-&gt;remote_ah_attr.sl;</div><div class='del'>-	wc-&gt;dlid_path_bits = 0;</div><div class='add'>+	wc.pkey_index = 0;</div><div class='add'>+	wc.slid = qp-&gt;remote_ah_attr.dlid;</div><div class='add'>+	wc.sl = qp-&gt;remote_ah_attr.sl;</div><div class='add'>+	wc.dlid_path_bits = 0;</div><div class='ctx'> 	/* Signal completion event if the solicited bit is set. */</div><div class='del'>-	ipath_cq_enter(to_icq(qp-&gt;ibqp.recv_cq), wc,</div><div class='add'>+	ipath_cq_enter(to_icq(qp-&gt;ibqp.recv_cq), &amp;wc,</div><div class='ctx'> 		       wqe-&gt;wr.send_flags &amp; IB_SEND_SOLICITED);</div><div class='ctx'> </div><div class='ctx'> send_comp:</div><div class='hunk'>@@ -396,19 +395,19 @@ send_comp:</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(IPATH_S_SIGNAL_REQ_WR, &amp;sqp-&gt;s_flags) ||</div><div class='ctx'> 	    (wqe-&gt;wr.send_flags &amp; IB_SEND_SIGNALED)) {</div><div class='del'>-		wc-&gt;wr_id = wqe-&gt;wr.wr_id;</div><div class='del'>-		wc-&gt;status = IB_WC_SUCCESS;</div><div class='del'>-		wc-&gt;opcode = ib_ipath_wc_opcode[wqe-&gt;wr.opcode];</div><div class='del'>-		wc-&gt;vendor_err = 0;</div><div class='del'>-		wc-&gt;byte_len = wqe-&gt;length;</div><div class='del'>-		wc-&gt;qp_num = sqp-&gt;ibqp.qp_num;</div><div class='del'>-		wc-&gt;src_qp = 0;</div><div class='del'>-		wc-&gt;pkey_index = 0;</div><div class='del'>-		wc-&gt;slid = 0;</div><div class='del'>-		wc-&gt;sl = 0;</div><div class='del'>-		wc-&gt;dlid_path_bits = 0;</div><div class='del'>-		wc-&gt;port_num = 0;</div><div class='del'>-		ipath_cq_enter(to_icq(sqp-&gt;ibqp.send_cq), wc, 0);</div><div class='add'>+		wc.wr_id = wqe-&gt;wr.wr_id;</div><div class='add'>+		wc.status = IB_WC_SUCCESS;</div><div class='add'>+		wc.opcode = ib_ipath_wc_opcode[wqe-&gt;wr.opcode];</div><div class='add'>+		wc.vendor_err = 0;</div><div class='add'>+		wc.byte_len = wqe-&gt;length;</div><div class='add'>+		wc.qp_num = sqp-&gt;ibqp.qp_num;</div><div class='add'>+		wc.src_qp = 0;</div><div class='add'>+		wc.pkey_index = 0;</div><div class='add'>+		wc.slid = 0;</div><div class='add'>+		wc.sl = 0;</div><div class='add'>+		wc.dlid_path_bits = 0;</div><div class='add'>+		wc.port_num = 0;</div><div class='add'>+		ipath_cq_enter(to_icq(sqp-&gt;ibqp.send_cq), &amp;wc, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update s_last now that we are finished with the SWQE */</div><div class='hunk'>@@ -454,11 +453,11 @@ void ipath_no_bufs_available(struct ipath_qp *qp, struct ipath_ibdev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ipath_post_rc_send - post RC and UC sends</div><div class='add'>+ * ipath_post_ruc_send - post RC and UC sends</div><div class='ctx'>  * @qp: the QP to post on</div><div class='ctx'>  * @wr: the work request to send</div><div class='ctx'>  */</div><div class='del'>-int ipath_post_rc_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='add'>+int ipath_post_ruc_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_swqe *wqe;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -533,13 +532,149 @@ int ipath_post_rc_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 	qp-&gt;s_head = next;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (qp-&gt;ibqp.qp_type == IB_QPT_UC)</div><div class='del'>-		ipath_do_uc_send((unsigned long) qp);</div><div class='del'>-	else</div><div class='del'>-		ipath_do_rc_send((unsigned long) qp);</div><div class='add'>+	ipath_do_ruc_send((unsigned long) qp);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ipath_make_grh - construct a GRH header</div><div class='add'>+ * @dev: a pointer to the ipath device</div><div class='add'>+ * @hdr: a pointer to the GRH header being constructed</div><div class='add'>+ * @grh: the global route address to send to</div><div class='add'>+ * @hwords: the number of 32 bit words of header being sent</div><div class='add'>+ * @nwords: the number of 32 bit words of data being sent</div><div class='add'>+ *</div><div class='add'>+ * Return the size of the header in 32 bit words.</div><div class='add'>+ */</div><div class='add'>+u32 ipath_make_grh(struct ipath_ibdev *dev, struct ib_grh *hdr,</div><div class='add'>+		   struct ib_global_route *grh, u32 hwords, u32 nwords)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;version_tclass_flow =</div><div class='add'>+		cpu_to_be32((6 &lt;&lt; 28) |</div><div class='add'>+			    (grh-&gt;traffic_class &lt;&lt; 20) |</div><div class='add'>+			    grh-&gt;flow_label);</div><div class='add'>+	hdr-&gt;paylen = cpu_to_be16((hwords - 2 + nwords + SIZE_OF_CRC) &lt;&lt; 2);</div><div class='add'>+	/* next_hdr is defined by C8-7 in ch. 8.4.1 */</div><div class='add'>+	hdr-&gt;next_hdr = 0x1B;</div><div class='add'>+	hdr-&gt;hop_limit = grh-&gt;hop_limit;</div><div class='add'>+	/* The SGID is 32-bit aligned. */</div><div class='add'>+	hdr-&gt;sgid.global.subnet_prefix = dev-&gt;gid_prefix;</div><div class='add'>+	hdr-&gt;sgid.global.interface_id = ipath_layer_get_guid(dev-&gt;dd);</div><div class='add'>+	hdr-&gt;dgid = grh-&gt;dgid;</div><div class='add'>+</div><div class='add'>+	/* GRH header size in 32-bit words. */</div><div class='add'>+	return sizeof(struct ib_grh) / sizeof(u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ipath_do_ruc_send - perform a send on an RC or UC QP</div><div class='add'>+ * @data: contains a pointer to the QP</div><div class='add'>+ *</div><div class='add'>+ * Process entries in the send work queue until credit or queue is</div><div class='add'>+ * exhausted.  Only allow one CPU to send a packet per QP (tasklet).</div><div class='add'>+ * Otherwise, after we drop the QP s_lock, two threads could send</div><div class='add'>+ * packets out of order.</div><div class='add'>+ */</div><div class='add'>+void ipath_do_ruc_send(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct ipath_qp *qp = (struct ipath_qp *)data;</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u16 lrh0;</div><div class='add'>+	u32 nwords;</div><div class='add'>+	u32 extra_bytes;</div><div class='add'>+	u32 bth0;</div><div class='add'>+	u32 bth2;</div><div class='add'>+	u32 pmtu = ib_mtu_enum_to_int(qp-&gt;path_mtu);</div><div class='add'>+	struct ipath_other_headers *ohdr;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags))</div><div class='add'>+		goto bail;</div><div class='add'>+</div><div class='add'>+	if (unlikely(qp-&gt;remote_ah_attr.dlid ==</div><div class='add'>+		     ipath_layer_get_lid(dev-&gt;dd))) {</div><div class='add'>+		ipath_ruc_loopback(qp);</div><div class='add'>+		goto clear;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ohdr = &amp;qp-&gt;s_hdr.u.oth;</div><div class='add'>+	if (qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)</div><div class='add'>+		ohdr = &amp;qp-&gt;s_hdr.u.l.oth;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	/* Check for a constructed packet to be sent. */</div><div class='add'>+	if (qp-&gt;s_hdrwords != 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * If no PIO bufs are available, return.  An interrupt will</div><div class='add'>+		 * call ipath_ib_piobufavail() when one is available.</div><div class='add'>+		 */</div><div class='add'>+		if (ipath_verbs_send(dev-&gt;dd, qp-&gt;s_hdrwords,</div><div class='add'>+				     (u32 *) &amp;qp-&gt;s_hdr, qp-&gt;s_cur_size,</div><div class='add'>+				     qp-&gt;s_cur_sge)) {</div><div class='add'>+			ipath_no_bufs_available(qp, dev);</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+		dev-&gt;n_unicast_xmit++;</div><div class='add'>+		/* Record that we sent the packet and s_hdr is empty. */</div><div class='add'>+		qp-&gt;s_hdrwords = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The lock is needed to synchronize between setting</div><div class='add'>+	 * qp-&gt;s_ack_state, resend timer, and post_send().</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Sending responses has higher priority over sending requests. */</div><div class='add'>+	if (qp-&gt;s_ack_state != IB_OPCODE_RC_ACKNOWLEDGE &amp;&amp;</div><div class='add'>+	    (bth0 = ipath_make_rc_ack(qp, ohdr, pmtu)) != 0)</div><div class='add'>+		bth2 = qp-&gt;s_ack_psn++ &amp; IPATH_PSN_MASK;</div><div class='add'>+	else if (!((qp-&gt;ibqp.qp_type == IB_QPT_RC) ?</div><div class='add'>+		   ipath_make_rc_req(qp, ohdr, pmtu, &amp;bth0, &amp;bth2) :</div><div class='add'>+		   ipath_make_uc_req(qp, ohdr, pmtu, &amp;bth0, &amp;bth2))) {</div><div class='add'>+		/*</div><div class='add'>+		 * Clear the busy bit before unlocking to avoid races with</div><div class='add'>+		 * adding new work queue items and then failing to process</div><div class='add'>+		 * them.</div><div class='add'>+		 */</div><div class='add'>+		clear_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags);</div><div class='add'>+		spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Construct the header. */</div><div class='add'>+	extra_bytes = (4 - qp-&gt;s_cur_size) &amp; 3;</div><div class='add'>+	nwords = (qp-&gt;s_cur_size + extra_bytes) &gt;&gt; 2;</div><div class='add'>+	lrh0 = IPATH_LRH_BTH;</div><div class='add'>+	if (unlikely(qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)) {</div><div class='add'>+		qp-&gt;s_hdrwords += ipath_make_grh(dev, &amp;qp-&gt;s_hdr.u.l.grh,</div><div class='add'>+						 &amp;qp-&gt;remote_ah_attr.grh,</div><div class='add'>+						 qp-&gt;s_hdrwords, nwords);</div><div class='add'>+		lrh0 = IPATH_LRH_GRH;</div><div class='add'>+	}</div><div class='add'>+	lrh0 |= qp-&gt;remote_ah_attr.sl &lt;&lt; 4;</div><div class='add'>+	qp-&gt;s_hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='add'>+	qp-&gt;s_hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='add'>+	qp-&gt;s_hdr.lrh[2] = cpu_to_be16(qp-&gt;s_hdrwords + nwords +</div><div class='add'>+				       SIZE_OF_CRC);</div><div class='add'>+	qp-&gt;s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev-&gt;dd));</div><div class='add'>+	bth0 |= ipath_layer_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='add'>+	bth0 |= extra_bytes &lt;&lt; 20;</div><div class='add'>+	ohdr-&gt;bth[0] = cpu_to_be32(bth0);</div><div class='add'>+	ohdr-&gt;bth[1] = cpu_to_be32(qp-&gt;remote_qpn);</div><div class='add'>+	ohdr-&gt;bth[2] = cpu_to_be32(bth2);</div><div class='add'>+</div><div class='add'>+	/* Check for more work to do. */</div><div class='add'>+	goto again;</div><div class='add'>+</div><div class='add'>+clear:</div><div class='add'>+	clear_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags);</div><div class='add'>+bail:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c<br/>index 01c4c6c56118..f760434660bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_srq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_srq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_srq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_srq.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -125,11 +126,23 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd,</div><div class='ctx'> 				struct ib_srq_init_attr *srq_init_attr,</div><div class='ctx'> 				struct ib_udata *udata)</div><div class='ctx'> {</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibpd-&gt;device);</div><div class='ctx'> 	struct ipath_srq *srq;</div><div class='ctx'> 	u32 sz;</div><div class='ctx'> 	struct ib_srq *ret;</div><div class='ctx'> </div><div class='del'>-	if (srq_init_attr-&gt;attr.max_sge &lt; 1) {</div><div class='add'>+	if (dev-&gt;n_srqs_allocated == ib_ipath_max_srqs) {</div><div class='add'>+		ret = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (srq_init_attr-&gt;attr.max_wr == 0) {</div><div class='add'>+		ret = ERR_PTR(-EINVAL);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((srq_init_attr-&gt;attr.max_sge &gt; ib_ipath_max_srq_sges) ||</div><div class='add'>+	    (srq_init_attr-&gt;attr.max_wr &gt; ib_ipath_max_srq_wrs)) {</div><div class='ctx'> 		ret = ERR_PTR(-EINVAL);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -164,6 +177,8 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd,</div><div class='ctx'> </div><div class='ctx'> 	ret = &amp;srq-&gt;ibsrq;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;n_srqs_allocated++;</div><div class='add'>+</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -181,24 +196,26 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (attr_mask &amp; IB_SRQ_LIMIT) {</div><div class='del'>-		spin_lock_irqsave(&amp;srq-&gt;rq.lock, flags);</div><div class='del'>-		srq-&gt;limit = attr-&gt;srq_limit;</div><div class='del'>-		spin_unlock_irqrestore(&amp;srq-&gt;rq.lock, flags);</div><div class='del'>-	}</div><div class='del'>-	if (attr_mask &amp; IB_SRQ_MAX_WR) {</div><div class='del'>-		u32 size = attr-&gt;max_wr + 1;</div><div class='del'>-		struct ipath_rwqe *wq, *p;</div><div class='del'>-		u32 n;</div><div class='del'>-		u32 sz;</div><div class='add'>+	if (attr_mask &amp; IB_SRQ_MAX_WR)</div><div class='add'>+		if ((attr-&gt;max_wr &gt; ib_ipath_max_srq_wrs) ||</div><div class='add'>+		    (attr-&gt;max_sge &gt; srq-&gt;rq.max_sge)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (attr-&gt;max_sge &lt; srq-&gt;rq.max_sge) {</div><div class='add'>+	if (attr_mask &amp; IB_SRQ_LIMIT)</div><div class='add'>+		if (attr-&gt;srq_limit &gt;= srq-&gt;rq.size) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+	if (attr_mask &amp; IB_SRQ_MAX_WR) {</div><div class='add'>+		struct ipath_rwqe *wq, *p;</div><div class='add'>+		u32 sz, size, n;</div><div class='add'>+</div><div class='ctx'> 		sz = sizeof(struct ipath_rwqe) +</div><div class='ctx'> 			attr-&gt;max_sge * sizeof(struct ipath_sge);</div><div class='add'>+		size = attr-&gt;max_wr + 1;</div><div class='ctx'> 		wq = vmalloc(size * sz);</div><div class='ctx'> 		if (!wq) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='hunk'>@@ -242,6 +259,11 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;srq-&gt;rq.lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (attr_mask &amp; IB_SRQ_LIMIT) {</div><div class='add'>+		spin_lock_irqsave(&amp;srq-&gt;rq.lock, flags);</div><div class='add'>+		srq-&gt;limit = attr-&gt;srq_limit;</div><div class='add'>+		spin_unlock_irqrestore(&amp;srq-&gt;rq.lock, flags);</div><div class='add'>+	}</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='hunk'>@@ -265,7 +287,9 @@ int ipath_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr)</div><div class='ctx'> int ipath_destroy_srq(struct ib_srq *ibsrq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_srq *srq = to_isrq(ibsrq);</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibsrq-&gt;device);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;n_srqs_allocated--;</div><div class='ctx'> 	vfree(srq-&gt;rq.wq);</div><div class='ctx'> 	kfree(srq);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_stats.c b/drivers/infiniband/hw/ipath/ipath_stats.c<br/>index fe209137ee74..70351b7e35c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_stats.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_stats.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_stats.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_stats.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -185,7 +186,6 @@ static void ipath_qcheck(struct ipath_devdata *dd)</div><div class='ctx'> 				   dd-&gt;ipath_port0head,</div><div class='ctx'> 				   (unsigned long long)</div><div class='ctx'> 				   ipath_stats.sps_port0pkts);</div><div class='del'>-			ipath_kreceive(dd);</div><div class='ctx'> 		}</div><div class='ctx'> 		dd-&gt;ipath_lastport0rcv_cnt = ipath_stats.sps_port0pkts;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/infiniband/hw/ipath/ipath_sysfs.c<br/>index f323791cc495..b98821d7801d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_sysfs.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -34,8 +35,8 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='del'>-#include "ips_common.h"</div><div class='ctx'> #include "ipath_layer.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ipath_parse_ushort - parse an unsigned short value in an arbitrary base</div><div class='hunk'>@@ -84,99 +85,6 @@ static ssize_t show_num_units(struct device_driver *dev, char *buf)</div><div class='ctx'> 			 ipath_count_units(NULL, NULL, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DRIVER_STAT(name, attr) \</div><div class='del'>-	static ssize_t show_stat_##name(struct device_driver *dev, \</div><div class='del'>-					char *buf) \</div><div class='del'>-	{ \</div><div class='del'>-		return scnprintf( \</div><div class='del'>-			buf, PAGE_SIZE, "%llu\n", \</div><div class='del'>-			(unsigned long long) ipath_stats.sps_ ##attr); \</div><div class='del'>-	} \</div><div class='del'>-	static DRIVER_ATTR(name, S_IRUGO, show_stat_##name, NULL)</div><div class='del'>-</div><div class='del'>-DRIVER_STAT(intrs, ints);</div><div class='del'>-DRIVER_STAT(err_intrs, errints);</div><div class='del'>-DRIVER_STAT(errs, errs);</div><div class='del'>-DRIVER_STAT(pkt_errs, pkterrs);</div><div class='del'>-DRIVER_STAT(crc_errs, crcerrs);</div><div class='del'>-DRIVER_STAT(hw_errs, hwerrs);</div><div class='del'>-DRIVER_STAT(ib_link, iblink);</div><div class='del'>-DRIVER_STAT(port0_pkts, port0pkts);</div><div class='del'>-DRIVER_STAT(ether_spkts, ether_spkts);</div><div class='del'>-DRIVER_STAT(ether_rpkts, ether_rpkts);</div><div class='del'>-DRIVER_STAT(sma_spkts, sma_spkts);</div><div class='del'>-DRIVER_STAT(sma_rpkts, sma_rpkts);</div><div class='del'>-DRIVER_STAT(hdrq_full, hdrqfull);</div><div class='del'>-DRIVER_STAT(etid_full, etidfull);</div><div class='del'>-DRIVER_STAT(no_piobufs, nopiobufs);</div><div class='del'>-DRIVER_STAT(ports, ports);</div><div class='del'>-DRIVER_STAT(pkey0, pkeys[0]);</div><div class='del'>-DRIVER_STAT(pkey1, pkeys[1]);</div><div class='del'>-DRIVER_STAT(pkey2, pkeys[2]);</div><div class='del'>-DRIVER_STAT(pkey3, pkeys[3]);</div><div class='del'>-/* XXX fix the following when dynamic table of devices used */</div><div class='del'>-DRIVER_STAT(lid0, lid[0]);</div><div class='del'>-DRIVER_STAT(lid1, lid[1]);</div><div class='del'>-DRIVER_STAT(lid2, lid[2]);</div><div class='del'>-DRIVER_STAT(lid3, lid[3]);</div><div class='del'>-</div><div class='del'>-DRIVER_STAT(nports, nports);</div><div class='del'>-DRIVER_STAT(null_intr, nullintr);</div><div class='del'>-DRIVER_STAT(max_pkts_call, maxpkts_call);</div><div class='del'>-DRIVER_STAT(avg_pkts_call, avgpkts_call);</div><div class='del'>-DRIVER_STAT(page_locks, pagelocks);</div><div class='del'>-DRIVER_STAT(page_unlocks, pageunlocks);</div><div class='del'>-DRIVER_STAT(krdrops, krdrops);</div><div class='del'>-/* XXX fix the following when dynamic table of devices used */</div><div class='del'>-DRIVER_STAT(mlid0, mlid[0]);</div><div class='del'>-DRIVER_STAT(mlid1, mlid[1]);</div><div class='del'>-DRIVER_STAT(mlid2, mlid[2]);</div><div class='del'>-DRIVER_STAT(mlid3, mlid[3]);</div><div class='del'>-</div><div class='del'>-static struct attribute *driver_stat_attributes[] = {</div><div class='del'>-	&amp;driver_attr_intrs.attr,</div><div class='del'>-	&amp;driver_attr_err_intrs.attr,</div><div class='del'>-	&amp;driver_attr_errs.attr,</div><div class='del'>-	&amp;driver_attr_pkt_errs.attr,</div><div class='del'>-	&amp;driver_attr_crc_errs.attr,</div><div class='del'>-	&amp;driver_attr_hw_errs.attr,</div><div class='del'>-	&amp;driver_attr_ib_link.attr,</div><div class='del'>-	&amp;driver_attr_port0_pkts.attr,</div><div class='del'>-	&amp;driver_attr_ether_spkts.attr,</div><div class='del'>-	&amp;driver_attr_ether_rpkts.attr,</div><div class='del'>-	&amp;driver_attr_sma_spkts.attr,</div><div class='del'>-	&amp;driver_attr_sma_rpkts.attr,</div><div class='del'>-	&amp;driver_attr_hdrq_full.attr,</div><div class='del'>-	&amp;driver_attr_etid_full.attr,</div><div class='del'>-	&amp;driver_attr_no_piobufs.attr,</div><div class='del'>-	&amp;driver_attr_ports.attr,</div><div class='del'>-	&amp;driver_attr_pkey0.attr,</div><div class='del'>-	&amp;driver_attr_pkey1.attr,</div><div class='del'>-	&amp;driver_attr_pkey2.attr,</div><div class='del'>-	&amp;driver_attr_pkey3.attr,</div><div class='del'>-	&amp;driver_attr_lid0.attr,</div><div class='del'>-	&amp;driver_attr_lid1.attr,</div><div class='del'>-	&amp;driver_attr_lid2.attr,</div><div class='del'>-	&amp;driver_attr_lid3.attr,</div><div class='del'>-	&amp;driver_attr_nports.attr,</div><div class='del'>-	&amp;driver_attr_null_intr.attr,</div><div class='del'>-	&amp;driver_attr_max_pkts_call.attr,</div><div class='del'>-	&amp;driver_attr_avg_pkts_call.attr,</div><div class='del'>-	&amp;driver_attr_page_locks.attr,</div><div class='del'>-	&amp;driver_attr_page_unlocks.attr,</div><div class='del'>-	&amp;driver_attr_krdrops.attr,</div><div class='del'>-	&amp;driver_attr_mlid0.attr,</div><div class='del'>-	&amp;driver_attr_mlid1.attr,</div><div class='del'>-	&amp;driver_attr_mlid2.attr,</div><div class='del'>-	&amp;driver_attr_mlid3.attr,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct attribute_group driver_stat_attr_group = {</div><div class='del'>-	.name = "stats",</div><div class='del'>-	.attrs = driver_stat_attributes</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static ssize_t show_status(struct device *dev,</div><div class='ctx'> 			   struct device_attribute *attr,</div><div class='ctx'> 			   char *buf)</div><div class='hunk'>@@ -272,23 +180,23 @@ static ssize_t store_lid(struct device *dev,</div><div class='ctx'> 			  size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_devdata *dd = dev_get_drvdata(dev);</div><div class='del'>-	u16 lid;</div><div class='add'>+	u16 lid = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ipath_parse_ushort(buf, &amp;lid);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto invalid;</div><div class='ctx'> </div><div class='del'>-	if (lid == 0 || lid &gt;= 0xc000) {</div><div class='add'>+	if (lid == 0 || lid &gt;= IPATH_MULTICAST_LID_BASE) {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto invalid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ipath_set_sps_lid(dd, lid, 0);</div><div class='add'>+	ipath_set_lid(dd, lid, 0);</div><div class='ctx'> </div><div class='ctx'> 	goto bail;</div><div class='ctx'> invalid:</div><div class='del'>-	ipath_dev_err(dd, "attempt to set invalid LID\n");</div><div class='add'>+	ipath_dev_err(dd, "attempt to set invalid LID 0x%x\n", lid);</div><div class='ctx'> bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -313,13 +221,12 @@ static ssize_t store_mlid(struct device *dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ipath_parse_ushort(buf, &amp;mlid);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret &lt; 0 || mlid &lt; IPATH_MULTICAST_LID_BASE)</div><div class='ctx'> 		goto invalid;</div><div class='ctx'> </div><div class='ctx'> 	unit = dd-&gt;ipath_unit;</div><div class='ctx'> </div><div class='ctx'> 	dd-&gt;ipath_mlid = mlid;</div><div class='del'>-	ipath_stats.sps_mlid[unit] = mlid;</div><div class='ctx'> 	ipath_layer_intr(dd, IPATH_LAYER_INT_BCAST);</div><div class='ctx'> </div><div class='ctx'> 	goto bail;</div><div class='hunk'>@@ -734,20 +641,12 @@ int ipath_driver_create_group(struct device_driver *drv)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = sysfs_create_group(&amp;drv-&gt;kobj, &amp;driver_attr_group);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto bail;</div><div class='ctx'> </div><div class='del'>-	ret = sysfs_create_group(&amp;drv-&gt;kobj, &amp;driver_stat_attr_group);</div><div class='del'>-	if (ret)</div><div class='del'>-		sysfs_remove_group(&amp;drv-&gt;kobj, &amp;driver_attr_group);</div><div class='del'>-</div><div class='del'>-bail:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipath_driver_remove_group(struct device_driver *drv)</div><div class='ctx'> {</div><div class='del'>-	sysfs_remove_group(&amp;drv-&gt;kobj, &amp;driver_stat_attr_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;drv-&gt;kobj, &amp;driver_attr_group);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/infiniband/hw/ipath/ipath_uc.c<br/>index 0d6dbc0a541e..c33abea2d5a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_uc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_uc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_uc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_uc.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -31,7 +32,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ipath_verbs.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /* cut down ridiculously long IB macro names */</div><div class='ctx'> #define OP(x) IB_OPCODE_UC_##x</div><div class='hunk'>@@ -61,90 +62,40 @@ static void complete_last_send(struct ipath_qp *qp, struct ipath_swqe *wqe,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * ipath_do_uc_send - do a send on a UC queue</div><div class='del'>- * @data: contains a pointer to the QP to send on</div><div class='add'>+ * ipath_make_uc_req - construct a request packet (SEND, RDMA write)</div><div class='add'>+ * @qp: a pointer to the QP</div><div class='add'>+ * @ohdr: a pointer to the IB header being constructed</div><div class='add'>+ * @pmtu: the path MTU</div><div class='add'>+ * @bth0p: pointer to the BTH opcode word</div><div class='add'>+ * @bth2p: pointer to the BTH PSN word</div><div class='ctx'>  *</div><div class='del'>- * Process entries in the send work queue until the queue is exhausted.</div><div class='del'>- * Only allow one CPU to send a packet per QP (tasklet).</div><div class='del'>- * Otherwise, after we drop the QP lock, two threads could send</div><div class='del'>- * packets out of order.</div><div class='del'>- * This is similar to ipath_do_rc_send() below except we don't have</div><div class='del'>- * timeouts or resends.</div><div class='add'>+ * Return 1 if constructed; otherwise, return 0.</div><div class='add'>+ * Note the QP s_lock must be held and interrupts disabled.</div><div class='ctx'>  */</div><div class='del'>-void ipath_do_uc_send(unsigned long data)</div><div class='add'>+int ipath_make_uc_req(struct ipath_qp *qp,</div><div class='add'>+		      struct ipath_other_headers *ohdr,</div><div class='add'>+		      u32 pmtu, u32 *bth0p, u32 *bth2p)</div><div class='ctx'> {</div><div class='del'>-	struct ipath_qp *qp = (struct ipath_qp *)data;</div><div class='del'>-	struct ipath_ibdev *dev = to_idev(qp-&gt;ibqp.device);</div><div class='ctx'> 	struct ipath_swqe *wqe;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 lrh0;</div><div class='ctx'> 	u32 hwords;</div><div class='del'>-	u32 nwords;</div><div class='del'>-	u32 extra_bytes;</div><div class='ctx'> 	u32 bth0;</div><div class='del'>-	u32 bth2;</div><div class='del'>-	u32 pmtu = ib_mtu_enum_to_int(qp-&gt;path_mtu);</div><div class='ctx'> 	u32 len;</div><div class='del'>-	struct ipath_other_headers *ohdr;</div><div class='ctx'> 	struct ib_wc wc;</div><div class='ctx'> </div><div class='del'>-	if (test_and_set_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags))</div><div class='del'>-		goto bail;</div><div class='del'>-</div><div class='del'>-	if (unlikely(qp-&gt;remote_ah_attr.dlid ==</div><div class='del'>-		     ipath_layer_get_lid(dev-&gt;dd))) {</div><div class='del'>-		/* Pass in an uninitialized ib_wc to save stack space. */</div><div class='del'>-		ipath_ruc_loopback(qp, &amp;wc);</div><div class='del'>-		clear_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags);</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ohdr = &amp;qp-&gt;s_hdr.u.oth;</div><div class='del'>-	if (qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)</div><div class='del'>-		ohdr = &amp;qp-&gt;s_hdr.u.l.oth;</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	/* Check for a constructed packet to be sent. */</div><div class='del'>-	if (qp-&gt;s_hdrwords != 0) {</div><div class='del'>-			/*</div><div class='del'>-			 * If no PIO bufs are available, return.</div><div class='del'>-			 * An interrupt will call ipath_ib_piobufavail()</div><div class='del'>-			 * when one is available.</div><div class='del'>-			 */</div><div class='del'>-			if (ipath_verbs_send(dev-&gt;dd, qp-&gt;s_hdrwords,</div><div class='del'>-					     (u32 *) &amp;qp-&gt;s_hdr,</div><div class='del'>-					     qp-&gt;s_cur_size,</div><div class='del'>-					     qp-&gt;s_cur_sge)) {</div><div class='del'>-				ipath_no_bufs_available(qp, dev);</div><div class='del'>-				goto bail;</div><div class='del'>-			}</div><div class='del'>-			dev-&gt;n_unicast_xmit++;</div><div class='del'>-		/* Record that we sent the packet and s_hdr is empty. */</div><div class='del'>-		qp-&gt;s_hdrwords = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lrh0 = IPS_LRH_BTH;</div><div class='del'>-	/* header size in 32-bit words LRH+BTH = (8+12)/4. */</div><div class='del'>-	hwords = 5;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The lock is needed to synchronize between</div><div class='del'>-	 * setting qp-&gt;s_ack_state and post_send().</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	if (!(ib_ipath_state_ops[qp-&gt;state] &amp; IPATH_PROCESS_SEND_OK))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='del'>-	bth0 = ipath_layer_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='add'>+	/* header size in 32-bit words LRH+BTH = (8+12)/4. */</div><div class='add'>+	hwords = 5;</div><div class='add'>+	bth0 = 0;</div><div class='ctx'> </div><div class='del'>-	/* Send a request. */</div><div class='add'>+	/* Get the next send request. */</div><div class='ctx'> 	wqe = get_swqe_ptr(qp, qp-&gt;s_last);</div><div class='ctx'> 	switch (qp-&gt;s_state) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='del'>-		 * Signal the completion of the last send (if there is</div><div class='del'>-		 * one).</div><div class='add'>+		 * Signal the completion of the last send</div><div class='add'>+		 * (if there is one).</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (qp-&gt;s_last != qp-&gt;s_tail)</div><div class='ctx'> 			complete_last_send(qp, wqe, &amp;wc);</div><div class='hunk'>@@ -257,61 +208,16 @@ again:</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	bth2 = qp-&gt;s_next_psn++ &amp; IPS_PSN_MASK;</div><div class='ctx'> 	qp-&gt;s_len -= len;</div><div class='del'>-	bth0 |= qp-&gt;s_state &lt;&lt; 24;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Construct the header. */</div><div class='del'>-	extra_bytes = (4 - len) &amp; 3;</div><div class='del'>-	nwords = (len + extra_bytes) &gt;&gt; 2;</div><div class='del'>-	if (unlikely(qp-&gt;remote_ah_attr.ah_flags &amp; IB_AH_GRH)) {</div><div class='del'>-		/* Header size in 32-bit words. */</div><div class='del'>-		hwords += 10;</div><div class='del'>-		lrh0 = IPS_LRH_GRH;</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.version_tclass_flow =</div><div class='del'>-			cpu_to_be32((6 &lt;&lt; 28) |</div><div class='del'>-				    (qp-&gt;remote_ah_attr.grh.traffic_class</div><div class='del'>-				     &lt;&lt; 20) |</div><div class='del'>-				    qp-&gt;remote_ah_attr.grh.flow_label);</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.paylen =</div><div class='del'>-			cpu_to_be16(((hwords - 12) + nwords +</div><div class='del'>-				     SIZE_OF_CRC) &lt;&lt; 2);</div><div class='del'>-		/* next_hdr is defined by C8-7 in ch. 8.4.1 */</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.next_hdr = 0x1B;</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.hop_limit =</div><div class='del'>-			qp-&gt;remote_ah_attr.grh.hop_limit;</div><div class='del'>-		/* The SGID is 32-bit aligned. */</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.sgid.global.subnet_prefix =</div><div class='del'>-			dev-&gt;gid_prefix;</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.sgid.global.interface_id =</div><div class='del'>-			ipath_layer_get_guid(dev-&gt;dd);</div><div class='del'>-		qp-&gt;s_hdr.u.l.grh.dgid = qp-&gt;remote_ah_attr.grh.dgid;</div><div class='del'>-	}</div><div class='ctx'> 	qp-&gt;s_hdrwords = hwords;</div><div class='ctx'> 	qp-&gt;s_cur_sge = &amp;qp-&gt;s_sge;</div><div class='ctx'> 	qp-&gt;s_cur_size = len;</div><div class='del'>-	lrh0 |= qp-&gt;remote_ah_attr.sl &lt;&lt; 4;</div><div class='del'>-	qp-&gt;s_hdr.lrh[0] = cpu_to_be16(lrh0);</div><div class='del'>-	/* DEST LID */</div><div class='del'>-	qp-&gt;s_hdr.lrh[1] = cpu_to_be16(qp-&gt;remote_ah_attr.dlid);</div><div class='del'>-	qp-&gt;s_hdr.lrh[2] = cpu_to_be16(hwords + nwords + SIZE_OF_CRC);</div><div class='del'>-	qp-&gt;s_hdr.lrh[3] = cpu_to_be16(ipath_layer_get_lid(dev-&gt;dd));</div><div class='del'>-	bth0 |= extra_bytes &lt;&lt; 20;</div><div class='del'>-	ohdr-&gt;bth[0] = cpu_to_be32(bth0);</div><div class='del'>-	ohdr-&gt;bth[1] = cpu_to_be32(qp-&gt;remote_qpn);</div><div class='del'>-	ohdr-&gt;bth[2] = cpu_to_be32(bth2);</div><div class='del'>-</div><div class='del'>-	/* Check for more work to do. */</div><div class='del'>-	goto again;</div><div class='add'>+	*bth0p = bth0 | (qp-&gt;s_state &lt;&lt; 24);</div><div class='add'>+	*bth2p = qp-&gt;s_next_psn++ &amp; IPATH_PSN_MASK;</div><div class='add'>+	return 1;</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;s_lock, flags);</div><div class='del'>-	clear_bit(IPATH_S_BUSY, &amp;qp-&gt;s_flags);</div><div class='del'>-</div><div class='del'>-bail:</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -335,7 +241,6 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	u32 hdrsize;</div><div class='ctx'> 	u32 psn;</div><div class='ctx'> 	u32 pad;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct ib_wc wc;</div><div class='ctx'> 	u32 pmtu = ib_mtu_enum_to_int(qp-&gt;path_mtu);</div><div class='ctx'> 	struct ib_reth *reth;</div><div class='hunk'>@@ -373,8 +278,6 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	wc.imm_data = 0;</div><div class='ctx'> 	wc.wc_flags = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* Compare the PSN verses the expected PSN. */</div><div class='ctx'> 	if (unlikely(ipath_cmp24(psn, qp-&gt;r_psn) != 0)) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -535,12 +438,13 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		if (qp-&gt;r_len != 0) {</div><div class='ctx'> 			u32 rkey = be32_to_cpu(reth-&gt;rkey);</div><div class='ctx'> 			u64 vaddr = be64_to_cpu(reth-&gt;vaddr);</div><div class='add'>+			int ok;</div><div class='ctx'> </div><div class='ctx'> 			/* Check rkey */</div><div class='del'>-			if (unlikely(!ipath_rkey_ok(</div><div class='del'>-					     dev, &amp;qp-&gt;r_sge, qp-&gt;r_len,</div><div class='del'>-					     vaddr, rkey,</div><div class='del'>-					     IB_ACCESS_REMOTE_WRITE))) {</div><div class='add'>+			ok = ipath_rkey_ok(dev, &amp;qp-&gt;r_sge, qp-&gt;r_len,</div><div class='add'>+					   vaddr, rkey,</div><div class='add'>+					   IB_ACCESS_REMOTE_WRITE);</div><div class='add'>+			if (unlikely(!ok)) {</div><div class='ctx'> 				dev-&gt;n_pkt_drops++;</div><div class='ctx'> 				goto done;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -558,8 +462,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (opcode == OP(RDMA_WRITE_ONLY))</div><div class='ctx'> 			goto rdma_last;</div><div class='del'>-		else if (opcode ==</div><div class='del'>-			 OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE))</div><div class='add'>+		else if (opcode == OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE))</div><div class='ctx'> 			goto rdma_last_imm;</div><div class='ctx'> 		/* FALLTHROUGH */</div><div class='ctx'> 	case OP(RDMA_WRITE_MIDDLE):</div><div class='hunk'>@@ -592,9 +495,9 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			dev-&gt;n_pkt_drops++;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='del'>-		if (qp-&gt;r_reuse_sge) {</div><div class='add'>+		if (qp-&gt;r_reuse_sge)</div><div class='ctx'> 			qp-&gt;r_reuse_sge = 0;</div><div class='del'>-		} else if (!ipath_get_rwqe(qp, 1)) {</div><div class='add'>+		else if (!ipath_get_rwqe(qp, 1)) {</div><div class='ctx'> 			dev-&gt;n_pkt_drops++;</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -631,15 +534,11 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Drop packet for unknown opcodes. */</div><div class='del'>-		spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='ctx'> 		dev-&gt;n_pkt_drops++;</div><div class='del'>-		goto bail;</div><div class='add'>+		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	qp-&gt;r_psn++;</div><div class='ctx'> 	qp-&gt;r_state = opcode;</div><div class='ctx'> done:</div><div class='del'>-	spin_unlock_irqrestore(&amp;qp-&gt;r_rq.lock, flags);</div><div class='del'>-</div><div class='del'>-bail:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c<br/>index e606daf83210..3466129af804 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ud.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_ud.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_ud.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_ud.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -33,7 +34,7 @@</div><div class='ctx'> #include &lt;rdma/ib_smi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ipath_verbs.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ipath_ud_loopback - handle send on loopback QPs</div><div class='hunk'>@@ -274,6 +275,11 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 		len += wr-&gt;sg_list[i].length;</div><div class='ctx'> 		ss.num_sge++;</div><div class='ctx'> 	}</div><div class='add'>+	/* Check for invalid packet size. */</div><div class='add'>+	if (len &gt; ipath_layer_get_ibmtu(dev-&gt;dd)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='ctx'> 	extra_bytes = (4 - len) &amp; 3;</div><div class='ctx'> 	nwords = (len + extra_bytes) &gt;&gt; 2;</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +289,8 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='del'>-	if (ah_attr-&gt;dlid &gt;= IPS_MULTICAST_LID_BASE) {</div><div class='del'>-		if (ah_attr-&gt;dlid != IPS_PERMISSIVE_LID)</div><div class='add'>+	if (ah_attr-&gt;dlid &gt;= IPATH_MULTICAST_LID_BASE) {</div><div class='add'>+		if (ah_attr-&gt;dlid != IPATH_PERMISSIVE_LID)</div><div class='ctx'> 			dev-&gt;n_multicast_xmit++;</div><div class='ctx'> 		else</div><div class='ctx'> 			dev-&gt;n_unicast_xmit++;</div><div class='hunk'>@@ -304,7 +310,7 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 	if (ah_attr-&gt;ah_flags &amp; IB_AH_GRH) {</div><div class='ctx'> 		/* Header size in 32-bit words. */</div><div class='ctx'> 		hwords = 17;</div><div class='del'>-		lrh0 = IPS_LRH_GRH;</div><div class='add'>+		lrh0 = IPATH_LRH_GRH;</div><div class='ctx'> 		ohdr = &amp;qp-&gt;s_hdr.u.l.oth;</div><div class='ctx'> 		qp-&gt;s_hdr.u.l.grh.version_tclass_flow =</div><div class='ctx'> 			cpu_to_be32((6 &lt;&lt; 28) |</div><div class='hunk'>@@ -330,7 +336,7 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Header size in 32-bit words. */</div><div class='ctx'> 		hwords = 7;</div><div class='del'>-		lrh0 = IPS_LRH_BTH;</div><div class='add'>+		lrh0 = IPATH_LRH_BTH;</div><div class='ctx'> 		ohdr = &amp;qp-&gt;s_hdr.u.oth;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (wr-&gt;opcode == IB_WR_SEND_WITH_IMM) {</div><div class='hunk'>@@ -361,18 +367,18 @@ int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr)</div><div class='ctx'> 	if (wr-&gt;send_flags &amp; IB_SEND_SOLICITED)</div><div class='ctx'> 		bth0 |= 1 &lt;&lt; 23;</div><div class='ctx'> 	bth0 |= extra_bytes &lt;&lt; 20;</div><div class='del'>-	bth0 |= qp-&gt;ibqp.qp_type == IB_QPT_SMI ? IPS_DEFAULT_P_KEY :</div><div class='add'>+	bth0 |= qp-&gt;ibqp.qp_type == IB_QPT_SMI ? IPATH_DEFAULT_P_KEY :</div><div class='ctx'> 		ipath_layer_get_pkey(dev-&gt;dd, qp-&gt;s_pkey_index);</div><div class='ctx'> 	ohdr-&gt;bth[0] = cpu_to_be32(bth0);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Use the multicast QP if the destination LID is a multicast LID.</div><div class='ctx'> 	 */</div><div class='del'>-	ohdr-&gt;bth[1] = ah_attr-&gt;dlid &gt;= IPS_MULTICAST_LID_BASE &amp;&amp;</div><div class='del'>-		ah_attr-&gt;dlid != IPS_PERMISSIVE_LID ?</div><div class='del'>-		__constant_cpu_to_be32(IPS_MULTICAST_QPN) :</div><div class='add'>+	ohdr-&gt;bth[1] = ah_attr-&gt;dlid &gt;= IPATH_MULTICAST_LID_BASE &amp;&amp;</div><div class='add'>+		ah_attr-&gt;dlid != IPATH_PERMISSIVE_LID ?</div><div class='add'>+		__constant_cpu_to_be32(IPATH_MULTICAST_QPN) :</div><div class='ctx'> 		cpu_to_be32(wr-&gt;wr.ud.remote_qpn);</div><div class='ctx'> 	/* XXX Could lose a PSN count but not worth locking */</div><div class='del'>-	ohdr-&gt;bth[2] = cpu_to_be32(qp-&gt;s_next_psn++ &amp; IPS_PSN_MASK);</div><div class='add'>+	ohdr-&gt;bth[2] = cpu_to_be32(qp-&gt;s_next_psn++ &amp; IPATH_PSN_MASK);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Qkeys with the high order bit set mean use the</div><div class='ctx'> 	 * qkey from the QP context instead of the WR (see 10.2.5).</div><div class='hunk'>@@ -463,7 +469,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 			src_qp = be32_to_cpu(ohdr-&gt;u.ud.deth[1]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	src_qp &amp;= IPS_QPN_MASK;</div><div class='add'>+	src_qp &amp;= IPATH_QPN_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that the permissive LID is only used on QP0</div><div class='hunk'>@@ -554,7 +560,16 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	spin_lock_irqsave(&amp;rq-&gt;lock, flags);</div><div class='ctx'> 	if (rq-&gt;tail == rq-&gt;head) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;rq-&gt;lock, flags);</div><div class='del'>-		dev-&gt;n_pkt_drops++;</div><div class='add'>+		/*</div><div class='add'>+		 * Count VL15 packets dropped due to no receive buffer.</div><div class='add'>+		 * Otherwise, count them as buffer overruns since usually,</div><div class='add'>+		 * the HW will be able to receive packets even if there are</div><div class='add'>+		 * no QPs with posted receive buffers.</div><div class='add'>+		 */</div><div class='add'>+		if (qp-&gt;ibqp.qp_num == 0)</div><div class='add'>+			dev-&gt;n_vl15_dropped++;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;rcv_errors++;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Silently drop packets which are too big. */</div><div class='hunk'>@@ -612,7 +627,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Save the LMC lower bits if the destination LID is a unicast LID.</div><div class='ctx'> 	 */</div><div class='del'>-	wc.dlid_path_bits = dlid &gt;= IPS_MULTICAST_LID_BASE ? 0 :</div><div class='add'>+	wc.dlid_path_bits = dlid &gt;= IPATH_MULTICAST_LID_BASE ? 0 :</div><div class='ctx'> 		dlid &amp; ((1 &lt;&lt; (dev-&gt;mkeyprot_resv_lmc &amp; 7)) - 1);</div><div class='ctx'> 	/* Signal completion event if the solicited bit is set. */</div><div class='ctx'> 	ipath_cq_enter(to_icq(qp-&gt;ibqp.recv_cq), &amp;wc,</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c<br/>index 2bb08afc86d0..e32fca9faf80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_user_pages.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_user_pages.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_user_pages.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_user_pages.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -57,17 +58,6 @@ static int __get_user_pages(unsigned long start_page, size_t num_pages,</div><div class='ctx'> 	size_t got;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	/*</div><div class='del'>-	 * XXX - causes MPI programs to fail, haven't had time to check</div><div class='del'>-	 * yet</div><div class='del'>-	 */</div><div class='del'>-	if (!capable(CAP_IPC_LOCK)) {</div><div class='del'>-		ret = -EPERM;</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	lock_limit = current-&gt;signal-&gt;rlim[RLIMIT_MEMLOCK].rlim_cur &gt;&gt;</div><div class='ctx'> 		PAGE_SHIFT;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c<br/>index 28fdbdaa789d..56ac336dd1ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_verbs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_verbs.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -36,7 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ipath_kernel.h"</div><div class='ctx'> #include "ipath_verbs.h"</div><div class='del'>-#include "ips_common.h"</div><div class='add'>+#include "ipath_common.h"</div><div class='ctx'> </div><div class='ctx'> /* Not static, because we don't want the compiler removing it */</div><div class='ctx'> const char ipath_verbs_version[] = "ipath_verbs " IPATH_IDSTR;</div><div class='hunk'>@@ -55,9 +56,62 @@ unsigned int ib_ipath_debug;	/* debug mask */</div><div class='ctx'> module_param_named(debug, ib_ipath_debug, uint, S_IWUSR | S_IRUGO);</div><div class='ctx'> MODULE_PARM_DESC(debug, "Verbs debug mask");</div><div class='ctx'> </div><div class='add'>+static unsigned int ib_ipath_max_pds = 0xFFFF;</div><div class='add'>+module_param_named(max_pds, ib_ipath_max_pds, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_pds,</div><div class='add'>+		 "Maximum number of protection domains to support");</div><div class='add'>+</div><div class='add'>+static unsigned int ib_ipath_max_ahs = 0xFFFF;</div><div class='add'>+module_param_named(max_ahs, ib_ipath_max_ahs, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_ahs, "Maximum number of address handles to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_cqes = 0x2FFFF;</div><div class='add'>+module_param_named(max_cqes, ib_ipath_max_cqes, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_cqes,</div><div class='add'>+		 "Maximum number of completion queue entries to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_cqs = 0x1FFFF;</div><div class='add'>+module_param_named(max_cqs, ib_ipath_max_cqs, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_cqs, "Maximum number of completion queues to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_qp_wrs = 0x3FFF;</div><div class='add'>+module_param_named(max_qp_wrs, ib_ipath_max_qp_wrs, uint,</div><div class='add'>+		   S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_qp_wrs, "Maximum number of QP WRs to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_sges = 0x60;</div><div class='add'>+module_param_named(max_sges, ib_ipath_max_sges, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_sges, "Maximum number of SGEs to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_mcast_grps = 16384;</div><div class='add'>+module_param_named(max_mcast_grps, ib_ipath_max_mcast_grps, uint,</div><div class='add'>+		   S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_mcast_grps,</div><div class='add'>+		 "Maximum number of multicast groups to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_mcast_qp_attached = 16;</div><div class='add'>+module_param_named(max_mcast_qp_attached, ib_ipath_max_mcast_qp_attached,</div><div class='add'>+		   uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_mcast_qp_attached,</div><div class='add'>+		 "Maximum number of attached QPs to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_srqs = 1024;</div><div class='add'>+module_param_named(max_srqs, ib_ipath_max_srqs, uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_srqs, "Maximum number of SRQs to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_srq_sges = 128;</div><div class='add'>+module_param_named(max_srq_sges, ib_ipath_max_srq_sges,</div><div class='add'>+		   uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_srq_sges, "Maximum number of SRQ SGEs to support");</div><div class='add'>+</div><div class='add'>+unsigned int ib_ipath_max_srq_wrs = 0x1FFFF;</div><div class='add'>+module_param_named(max_srq_wrs, ib_ipath_max_srq_wrs,</div><div class='add'>+		   uint, S_IWUSR | S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(max_srq_wrs, "Maximum number of SRQ WRs support");</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("PathScale &lt;support@pathscale.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Pathscale InfiniPath driver");</div><div class='add'>+MODULE_AUTHOR("QLogic &lt;support@pathscale.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("QLogic InfiniPath driver");</div><div class='ctx'> </div><div class='ctx'> const int ib_ipath_state_ops[IB_QPS_ERR + 1] = {</div><div class='ctx'> 	[IB_QPS_RESET] = 0,</div><div class='hunk'>@@ -193,7 +247,7 @@ static int ipath_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,</div><div class='ctx'> 		switch (qp-&gt;ibqp.qp_type) {</div><div class='ctx'> 		case IB_QPT_UC:</div><div class='ctx'> 		case IB_QPT_RC:</div><div class='del'>-			err = ipath_post_rc_send(qp, wr);</div><div class='add'>+			err = ipath_post_ruc_send(qp, wr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case IB_QPT_SMI:</div><div class='hunk'>@@ -375,7 +429,7 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen)</div><div class='ctx'> </div><div class='ctx'> 	/* Check for a valid destination LID (see ch. 7.11.1). */</div><div class='ctx'> 	lid = be16_to_cpu(hdr-&gt;lrh[1]);</div><div class='del'>-	if (lid &lt; IPS_MULTICAST_LID_BASE) {</div><div class='add'>+	if (lid &lt; IPATH_MULTICAST_LID_BASE) {</div><div class='ctx'> 		lid &amp;= ~((1 &lt;&lt; (dev-&gt;mkeyprot_resv_lmc &amp; 7)) - 1);</div><div class='ctx'> 		if (unlikely(lid != ipath_layer_get_lid(dev-&gt;dd))) {</div><div class='ctx'> 			dev-&gt;rcv_errors++;</div><div class='hunk'>@@ -385,9 +439,9 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen)</div><div class='ctx'> </div><div class='ctx'> 	/* Check for GRH */</div><div class='ctx'> 	lnh = be16_to_cpu(hdr-&gt;lrh[0]) &amp; 3;</div><div class='del'>-	if (lnh == IPS_LRH_BTH)</div><div class='add'>+	if (lnh == IPATH_LRH_BTH)</div><div class='ctx'> 		ohdr = &amp;hdr-&gt;u.oth;</div><div class='del'>-	else if (lnh == IPS_LRH_GRH)</div><div class='add'>+	else if (lnh == IPATH_LRH_GRH)</div><div class='ctx'> 		ohdr = &amp;hdr-&gt;u.l.oth;</div><div class='ctx'> 	else {</div><div class='ctx'> 		dev-&gt;rcv_errors++;</div><div class='hunk'>@@ -399,8 +453,8 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen)</div><div class='ctx'> 	dev-&gt;opstats[opcode].n_packets++;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the destination QP number. */</div><div class='del'>-	qp_num = be32_to_cpu(ohdr-&gt;bth[1]) &amp; IPS_QPN_MASK;</div><div class='del'>-	if (qp_num == IPS_MULTICAST_QPN) {</div><div class='add'>+	qp_num = be32_to_cpu(ohdr-&gt;bth[1]) &amp; IPATH_QPN_MASK;</div><div class='add'>+	if (qp_num == IPATH_MULTICAST_QPN) {</div><div class='ctx'> 		struct ipath_mcast *mcast;</div><div class='ctx'> 		struct ipath_mcast_qp *p;</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +465,7 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen)</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;n_multicast_rcv++;</div><div class='ctx'> 		list_for_each_entry_rcu(p, &amp;mcast-&gt;qp_list, list)</div><div class='del'>-			ipath_qp_rcv(dev, hdr, lnh == IPS_LRH_GRH, data,</div><div class='add'>+			ipath_qp_rcv(dev, hdr, lnh == IPATH_LRH_GRH, data,</div><div class='ctx'> 				     tlen, p-&gt;qp);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Notify ipath_multicast_detach() if it is waiting for us</div><div class='hunk'>@@ -423,7 +477,7 @@ static void ipath_ib_rcv(void *arg, void *rhdr, void *data, u32 tlen)</div><div class='ctx'> 		qp = ipath_lookup_qpn(&amp;dev-&gt;qp_table, qp_num);</div><div class='ctx'> 		if (qp) {</div><div class='ctx'> 			dev-&gt;n_unicast_rcv++;</div><div class='del'>-			ipath_qp_rcv(dev, hdr, lnh == IPS_LRH_GRH, data,</div><div class='add'>+			ipath_qp_rcv(dev, hdr, lnh == IPATH_LRH_GRH, data,</div><div class='ctx'> 				     tlen, qp);</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Notify ipath_destroy_qp() if it is waiting</div><div class='hunk'>@@ -567,40 +621,38 @@ static int ipath_query_device(struct ib_device *ibdev,</div><div class='ctx'> 			      struct ib_device_attr *props)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev = to_idev(ibdev);</div><div class='del'>-	u32 vendor, boardrev, majrev, minrev;</div><div class='ctx'> </div><div class='ctx'> 	memset(props, 0, sizeof(*props));</div><div class='ctx'> </div><div class='ctx'> 	props-&gt;device_cap_flags = IB_DEVICE_BAD_PKEY_CNTR |</div><div class='ctx'> 		IB_DEVICE_BAD_QKEY_CNTR | IB_DEVICE_SHUTDOWN_PORT |</div><div class='ctx'> 		IB_DEVICE_SYS_IMAGE_GUID;</div><div class='del'>-	ipath_layer_query_device(dev-&gt;dd, &amp;vendor, &amp;boardrev,</div><div class='del'>-				 &amp;majrev, &amp;minrev);</div><div class='del'>-	props-&gt;vendor_id = vendor;</div><div class='del'>-	props-&gt;vendor_part_id = boardrev;</div><div class='del'>-	props-&gt;hw_ver = boardrev &lt;&lt; 16 | majrev &lt;&lt; 8 | minrev;</div><div class='add'>+	props-&gt;vendor_id = ipath_layer_get_vendorid(dev-&gt;dd);</div><div class='add'>+	props-&gt;vendor_part_id = ipath_layer_get_deviceid(dev-&gt;dd);</div><div class='add'>+	props-&gt;hw_ver = ipath_layer_get_pcirev(dev-&gt;dd);</div><div class='ctx'> </div><div class='ctx'> 	props-&gt;sys_image_guid = dev-&gt;sys_image_guid;</div><div class='ctx'> </div><div class='ctx'> 	props-&gt;max_mr_size = ~0ull;</div><div class='del'>-	props-&gt;max_qp = 0xffff;</div><div class='del'>-	props-&gt;max_qp_wr = 0xffff;</div><div class='del'>-	props-&gt;max_sge = 255;</div><div class='del'>-	props-&gt;max_cq = 0xffff;</div><div class='del'>-	props-&gt;max_cqe = 0xffff;</div><div class='del'>-	props-&gt;max_mr = 0xffff;</div><div class='del'>-	props-&gt;max_pd = 0xffff;</div><div class='add'>+	props-&gt;max_qp = dev-&gt;qp_table.max;</div><div class='add'>+	props-&gt;max_qp_wr = ib_ipath_max_qp_wrs;</div><div class='add'>+	props-&gt;max_sge = ib_ipath_max_sges;</div><div class='add'>+	props-&gt;max_cq = ib_ipath_max_cqs;</div><div class='add'>+	props-&gt;max_ah = ib_ipath_max_ahs;</div><div class='add'>+	props-&gt;max_cqe = ib_ipath_max_cqes;</div><div class='add'>+	props-&gt;max_mr = dev-&gt;lk_table.max;</div><div class='add'>+	props-&gt;max_pd = ib_ipath_max_pds;</div><div class='ctx'> 	props-&gt;max_qp_rd_atom = 1;</div><div class='ctx'> 	props-&gt;max_qp_init_rd_atom = 1;</div><div class='ctx'> 	/* props-&gt;max_res_rd_atom */</div><div class='del'>-	props-&gt;max_srq = 0xffff;</div><div class='del'>-	props-&gt;max_srq_wr = 0xffff;</div><div class='del'>-	props-&gt;max_srq_sge = 255;</div><div class='add'>+	props-&gt;max_srq = ib_ipath_max_srqs;</div><div class='add'>+	props-&gt;max_srq_wr = ib_ipath_max_srq_wrs;</div><div class='add'>+	props-&gt;max_srq_sge = ib_ipath_max_srq_sges;</div><div class='ctx'> 	/* props-&gt;local_ca_ack_delay */</div><div class='ctx'> 	props-&gt;atomic_cap = IB_ATOMIC_HCA;</div><div class='ctx'> 	props-&gt;max_pkeys = ipath_layer_get_npkeys(dev-&gt;dd);</div><div class='del'>-	props-&gt;max_mcast_grp = 0xffff;</div><div class='del'>-	props-&gt;max_mcast_qp_attach = 0xffff;</div><div class='add'>+	props-&gt;max_mcast_grp = ib_ipath_max_mcast_grps;</div><div class='add'>+	props-&gt;max_mcast_qp_attach = ib_ipath_max_mcast_qp_attached;</div><div class='ctx'> 	props-&gt;max_total_mcast_qp_attach = props-&gt;max_mcast_qp_attach *</div><div class='ctx'> 		props-&gt;max_mcast_grp;</div><div class='ctx'> </div><div class='hunk'>@@ -643,10 +695,10 @@ static int ipath_query_port(struct ib_device *ibdev,</div><div class='ctx'> 		ipath_layer_get_lastibcstat(dev-&gt;dd) &amp; 0xf];</div><div class='ctx'> 	props-&gt;port_cap_flags = dev-&gt;port_cap_flags;</div><div class='ctx'> 	props-&gt;gid_tbl_len = 1;</div><div class='del'>-	props-&gt;max_msg_sz = 4096;</div><div class='add'>+	props-&gt;max_msg_sz = 0x80000000;</div><div class='ctx'> 	props-&gt;pkey_tbl_len = ipath_layer_get_npkeys(dev-&gt;dd);</div><div class='ctx'> 	props-&gt;bad_pkey_cntr = ipath_layer_get_cr_errpkey(dev-&gt;dd) -</div><div class='del'>-		dev-&gt;n_pkey_violations;</div><div class='add'>+		dev-&gt;z_pkey_violations;</div><div class='ctx'> 	props-&gt;qkey_viol_cntr = dev-&gt;qkey_violations;</div><div class='ctx'> 	props-&gt;active_width = IB_WIDTH_4X;</div><div class='ctx'> 	/* See rate_show() */</div><div class='hunk'>@@ -743,15 +795,30 @@ static struct ib_pd *ipath_alloc_pd(struct ib_device *ibdev,</div><div class='ctx'> 				    struct ib_ucontext *context,</div><div class='ctx'> 				    struct ib_udata *udata)</div><div class='ctx'> {</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibdev);</div><div class='ctx'> 	struct ipath_pd *pd;</div><div class='ctx'> 	struct ib_pd *ret;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * This is actually totally arbitrary.	Some correctness tests</div><div class='add'>+	 * assume there's a maximum number of PDs that can be allocated.</div><div class='add'>+	 * We don't actually have this limit, but we fail the test if</div><div class='add'>+	 * we allow allocations of more than we report for this value.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;n_pds_allocated == ib_ipath_max_pds) {</div><div class='add'>+		ret = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pd = kmalloc(sizeof *pd, GFP_KERNEL);</div><div class='ctx'> 	if (!pd) {</div><div class='ctx'> 		ret = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev-&gt;n_pds_allocated++;</div><div class='add'>+</div><div class='ctx'> 	/* ib_alloc_pd() will initialize pd-&gt;ibpd. */</div><div class='ctx'> 	pd-&gt;user = udata != NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -764,6 +831,9 @@ bail:</div><div class='ctx'> static int ipath_dealloc_pd(struct ib_pd *ibpd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_pd *pd = to_ipd(ibpd);</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibpd-&gt;device);</div><div class='add'>+</div><div class='add'>+	dev-&gt;n_pds_allocated--;</div><div class='ctx'> </div><div class='ctx'> 	kfree(pd);</div><div class='ctx'> </div><div class='hunk'>@@ -782,21 +852,40 @@ static struct ib_ah *ipath_create_ah(struct ib_pd *pd,</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ah *ah;</div><div class='ctx'> 	struct ib_ah *ret;</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(pd-&gt;device);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;n_ahs_allocated == ib_ipath_max_ahs) {</div><div class='add'>+		ret = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* A multicast address requires a GRH (see ch. 8.4.1). */</div><div class='del'>-	if (ah_attr-&gt;dlid &gt;= IPS_MULTICAST_LID_BASE &amp;&amp;</div><div class='del'>-	    ah_attr-&gt;dlid != IPS_PERMISSIVE_LID &amp;&amp;</div><div class='add'>+	if (ah_attr-&gt;dlid &gt;= IPATH_MULTICAST_LID_BASE &amp;&amp;</div><div class='add'>+	    ah_attr-&gt;dlid != IPATH_PERMISSIVE_LID &amp;&amp;</div><div class='ctx'> 	    !(ah_attr-&gt;ah_flags &amp; IB_AH_GRH)) {</div><div class='ctx'> 		ret = ERR_PTR(-EINVAL);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ah_attr-&gt;dlid == 0) {</div><div class='add'>+		ret = ERR_PTR(-EINVAL);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ah_attr-&gt;port_num &lt; 1 ||</div><div class='add'>+	    ah_attr-&gt;port_num &gt; pd-&gt;device-&gt;phys_port_cnt) {</div><div class='add'>+		ret = ERR_PTR(-EINVAL);</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ah = kmalloc(sizeof *ah, GFP_ATOMIC);</div><div class='ctx'> 	if (!ah) {</div><div class='ctx'> 		ret = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev-&gt;n_ahs_allocated++;</div><div class='add'>+</div><div class='ctx'> 	/* ib_create_ah() will initialize ah-&gt;ibah. */</div><div class='ctx'> 	ah-&gt;attr = *ah_attr;</div><div class='ctx'> </div><div class='hunk'>@@ -814,8 +903,11 @@ bail:</div><div class='ctx'>  */</div><div class='ctx'> static int ipath_destroy_ah(struct ib_ah *ibah)</div><div class='ctx'> {</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibah-&gt;device);</div><div class='ctx'> 	struct ipath_ah *ah = to_iah(ibah);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;n_ahs_allocated--;</div><div class='add'>+</div><div class='ctx'> 	kfree(ah);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -889,6 +981,7 @@ static int ipath_verbs_register_sysfs(struct ib_device *dev);</div><div class='ctx'>  */</div><div class='ctx'> static void *ipath_register_ib_device(int unit, struct ipath_devdata *dd)</div><div class='ctx'> {</div><div class='add'>+	struct ipath_layer_counters cntrs;</div><div class='ctx'> 	struct ipath_ibdev *idev;</div><div class='ctx'> 	struct ib_device *dev;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -939,6 +1032,25 @@ static void *ipath_register_ib_device(int unit, struct ipath_devdata *dd)</div><div class='ctx'> 	idev-&gt;pma_counter_select[5] = IB_PMA_PORT_XMIT_WAIT;</div><div class='ctx'> 	idev-&gt;link_width_enabled = 3;	/* 1x or 4x */</div><div class='ctx'> </div><div class='add'>+	/* Snapshot current HW counters to "clear" them. */</div><div class='add'>+	ipath_layer_get_counters(dd, &amp;cntrs);</div><div class='add'>+	idev-&gt;z_symbol_error_counter = cntrs.symbol_error_counter;</div><div class='add'>+	idev-&gt;z_link_error_recovery_counter =</div><div class='add'>+		cntrs.link_error_recovery_counter;</div><div class='add'>+	idev-&gt;z_link_downed_counter = cntrs.link_downed_counter;</div><div class='add'>+	idev-&gt;z_port_rcv_errors = cntrs.port_rcv_errors;</div><div class='add'>+	idev-&gt;z_port_rcv_remphys_errors =</div><div class='add'>+		cntrs.port_rcv_remphys_errors;</div><div class='add'>+	idev-&gt;z_port_xmit_discards = cntrs.port_xmit_discards;</div><div class='add'>+	idev-&gt;z_port_xmit_data = cntrs.port_xmit_data;</div><div class='add'>+	idev-&gt;z_port_rcv_data = cntrs.port_rcv_data;</div><div class='add'>+	idev-&gt;z_port_xmit_packets = cntrs.port_xmit_packets;</div><div class='add'>+	idev-&gt;z_port_rcv_packets = cntrs.port_rcv_packets;</div><div class='add'>+	idev-&gt;z_local_link_integrity_errors =</div><div class='add'>+		cntrs.local_link_integrity_errors;</div><div class='add'>+	idev-&gt;z_excessive_buffer_overrun_errors =</div><div class='add'>+		cntrs.excessive_buffer_overrun_errors;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The system image GUID is supposed to be the same for all</div><div class='ctx'> 	 * IB HCAs in a single system but since there can be other</div><div class='hunk'>@@ -1109,11 +1221,8 @@ static ssize_t show_rev(struct class_device *cdev, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_ibdev *dev =</div><div class='ctx'> 		container_of(cdev, struct ipath_ibdev, ibdev.class_dev);</div><div class='del'>-	int vendor, boardrev, majrev, minrev;</div><div class='ctx'> </div><div class='del'>-	ipath_layer_query_device(dev-&gt;dd, &amp;vendor, &amp;boardrev,</div><div class='del'>-				 &amp;majrev, &amp;minrev);</div><div class='del'>-	return sprintf(buf, "%d.%d\n", majrev, minrev);</div><div class='add'>+	return sprintf(buf, "%x\n", ipath_layer_get_pcirev(dev-&gt;dd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_hca(struct class_device *cdev, char *buf)</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h<br/>index 4f8d59300e9b..2df684727dc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_verbs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_verbs.h</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -148,6 +149,7 @@ struct ipath_mcast {</div><div class='ctx'> 	struct list_head qp_list;</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> 	atomic_t refcount;</div><div class='add'>+	int n_attached;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Memory region */</div><div class='hunk'>@@ -305,32 +307,34 @@ struct ipath_qp {</div><div class='ctx'> 	u32 s_next_psn;		/* PSN for next request */</div><div class='ctx'> 	u32 s_last_psn;		/* last response PSN processed */</div><div class='ctx'> 	u32 s_psn;		/* current packet sequence number */</div><div class='add'>+	u32 s_ack_psn;		/* PSN for RDMA_READ */</div><div class='ctx'> 	u32 s_rnr_timeout;	/* number of milliseconds for RNR timeout */</div><div class='del'>-	u32 s_ack_psn;		/* PSN for next ACK or RDMA_READ */</div><div class='del'>-	u64 s_ack_atomic;	/* data for atomic ACK */</div><div class='add'>+	u32 r_ack_psn;		/* PSN for next ACK or atomic ACK */</div><div class='ctx'> 	u64 r_wr_id;		/* ID for current receive WQE */</div><div class='ctx'> 	u64 r_atomic_data;	/* data for last atomic op */</div><div class='ctx'> 	u32 r_atomic_psn;	/* PSN of last atomic op */</div><div class='ctx'> 	u32 r_len;		/* total length of r_sge */</div><div class='ctx'> 	u32 r_rcv_len;		/* receive data len processed */</div><div class='ctx'> 	u32 r_psn;		/* expected rcv packet sequence number */</div><div class='add'>+	u32 r_msn;		/* message sequence number */</div><div class='ctx'> 	u8 state;		/* QP state */</div><div class='ctx'> 	u8 s_state;		/* opcode of last packet sent */</div><div class='ctx'> 	u8 s_ack_state;		/* opcode of packet to ACK */</div><div class='ctx'> 	u8 s_nak_state;		/* non-zero if NAK is pending */</div><div class='ctx'> 	u8 r_state;		/* opcode of last packet received */</div><div class='add'>+	u8 r_ack_state;		/* opcode of packet to ACK */</div><div class='add'>+	u8 r_nak_state;		/* non-zero if NAK is pending */</div><div class='add'>+	u8 r_min_rnr_timer;	/* retry timeout value for RNR NAKs */</div><div class='ctx'> 	u8 r_reuse_sge;		/* for UC receive errors */</div><div class='ctx'> 	u8 r_sge_inx;		/* current index into sg_list */</div><div class='del'>-	u8 s_max_sge;		/* size of s_wq-&gt;sg_list */</div><div class='ctx'> 	u8 qp_access_flags;</div><div class='add'>+	u8 s_max_sge;		/* size of s_wq-&gt;sg_list */</div><div class='ctx'> 	u8 s_retry_cnt;		/* number of times to retry */</div><div class='ctx'> 	u8 s_rnr_retry_cnt;</div><div class='del'>-	u8 s_min_rnr_timer;</div><div class='ctx'> 	u8 s_retry;		/* requester retry counter */</div><div class='ctx'> 	u8 s_rnr_retry;		/* requester RNR retry counter */</div><div class='ctx'> 	u8 s_pkey_index;	/* PKEY index to use */</div><div class='ctx'> 	enum ib_mtu path_mtu;</div><div class='del'>-	atomic_t msn;		/* message sequence number */</div><div class='ctx'> 	u32 remote_qpn;</div><div class='ctx'> 	u32 qkey;		/* QKEY for this QP (for UD or RD) */</div><div class='ctx'> 	u32 s_size;		/* send work queue size */</div><div class='hunk'>@@ -431,6 +435,11 @@ struct ipath_ibdev {</div><div class='ctx'> 	__be64 sys_image_guid;	/* in network order */</div><div class='ctx'> 	__be64 gid_prefix;	/* in network order */</div><div class='ctx'> 	__be64 mkey;</div><div class='add'>+	u32 n_pds_allocated;	/* number of PDs allocated for device */</div><div class='add'>+	u32 n_ahs_allocated;	/* number of AHs allocated for device */</div><div class='add'>+	u32 n_cqs_allocated;	/* number of CQs allocated for device */</div><div class='add'>+	u32 n_srqs_allocated;	/* number of SRQs allocated for device */</div><div class='add'>+	u32 n_mcast_grps_allocated; /* number of mcast groups allocated */</div><div class='ctx'> 	u64 ipath_sword;	/* total dwords sent (sample result) */</div><div class='ctx'> 	u64 ipath_rword;	/* total dwords received (sample result) */</div><div class='ctx'> 	u64 ipath_spkts;	/* total packets sent (sample result) */</div><div class='hunk'>@@ -442,17 +451,19 @@ struct ipath_ibdev {</div><div class='ctx'> 	u64 n_unicast_rcv;	/* total unicast packets received */</div><div class='ctx'> 	u64 n_multicast_xmit;	/* total multicast packets sent */</div><div class='ctx'> 	u64 n_multicast_rcv;	/* total multicast packets received */</div><div class='del'>-	u64 n_symbol_error_counter;	/* starting count for PMA */</div><div class='del'>-	u64 n_link_error_recovery_counter;	/* starting count for PMA */</div><div class='del'>-	u64 n_link_downed_counter;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_rcv_errors;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_rcv_remphys_errors;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_xmit_discards;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_xmit_data;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_rcv_data;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_xmit_packets;	/* starting count for PMA */</div><div class='del'>-	u64 n_port_rcv_packets;	/* starting count for PMA */</div><div class='del'>-	u32 n_pkey_violations;	/* starting count for PMA */</div><div class='add'>+	u64 z_symbol_error_counter;		/* starting count for PMA */</div><div class='add'>+	u64 z_link_error_recovery_counter;	/* starting count for PMA */</div><div class='add'>+	u64 z_link_downed_counter;		/* starting count for PMA */</div><div class='add'>+	u64 z_port_rcv_errors;			/* starting count for PMA */</div><div class='add'>+	u64 z_port_rcv_remphys_errors;		/* starting count for PMA */</div><div class='add'>+	u64 z_port_xmit_discards;		/* starting count for PMA */</div><div class='add'>+	u64 z_port_xmit_data;			/* starting count for PMA */</div><div class='add'>+	u64 z_port_rcv_data;			/* starting count for PMA */</div><div class='add'>+	u64 z_port_xmit_packets;		/* starting count for PMA */</div><div class='add'>+	u64 z_port_rcv_packets;			/* starting count for PMA */</div><div class='add'>+	u32 z_pkey_violations;			/* starting count for PMA */</div><div class='add'>+	u32 z_local_link_integrity_errors;	/* starting count for PMA */</div><div class='add'>+	u32 z_excessive_buffer_overrun_errors;	/* starting count for PMA */</div><div class='ctx'> 	u32 n_rc_resends;</div><div class='ctx'> 	u32 n_rc_acks;</div><div class='ctx'> 	u32 n_rc_qacks;</div><div class='hunk'>@@ -462,6 +473,7 @@ struct ipath_ibdev {</div><div class='ctx'> 	u32 n_other_naks;</div><div class='ctx'> 	u32 n_timeouts;</div><div class='ctx'> 	u32 n_pkt_drops;</div><div class='add'>+	u32 n_vl15_dropped;</div><div class='ctx'> 	u32 n_wqe_errs;</div><div class='ctx'> 	u32 n_rdma_dup_busy;</div><div class='ctx'> 	u32 n_piowait;</div><div class='hunk'>@@ -580,10 +592,6 @@ void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc);</div><div class='ctx'> </div><div class='ctx'> void ipath_get_credit(struct ipath_qp *qp, u32 aeth);</div><div class='ctx'> </div><div class='del'>-void ipath_do_rc_send(unsigned long data);</div><div class='del'>-</div><div class='del'>-void ipath_do_uc_send(unsigned long data);</div><div class='del'>-</div><div class='ctx'> void ipath_cq_enter(struct ipath_cq *cq, struct ib_wc *entry, int sig);</div><div class='ctx'> </div><div class='ctx'> int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss,</div><div class='hunk'>@@ -596,7 +604,7 @@ void ipath_copy_sge(struct ipath_sge_state *ss, void *data, u32 length);</div><div class='ctx'> </div><div class='ctx'> void ipath_skip_sge(struct ipath_sge_state *ss, u32 length);</div><div class='ctx'> </div><div class='del'>-int ipath_post_rc_send(struct ipath_qp *qp, struct ib_send_wr *wr);</div><div class='add'>+int ipath_post_ruc_send(struct ipath_qp *qp, struct ib_send_wr *wr);</div><div class='ctx'> </div><div class='ctx'> void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,</div><div class='ctx'> 		  int has_grh, void *data, u32 tlen, struct ipath_qp *qp);</div><div class='hunk'>@@ -678,7 +686,19 @@ void ipath_insert_rnr_queue(struct ipath_qp *qp);</div><div class='ctx'> </div><div class='ctx'> int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only);</div><div class='ctx'> </div><div class='del'>-void ipath_ruc_loopback(struct ipath_qp *sqp, struct ib_wc *wc);</div><div class='add'>+u32 ipath_make_grh(struct ipath_ibdev *dev, struct ib_grh *hdr,</div><div class='add'>+		   struct ib_global_route *grh, u32 hwords, u32 nwords);</div><div class='add'>+</div><div class='add'>+void ipath_do_ruc_send(unsigned long data);</div><div class='add'>+</div><div class='add'>+u32 ipath_make_rc_ack(struct ipath_qp *qp, struct ipath_other_headers *ohdr,</div><div class='add'>+		      u32 pmtu);</div><div class='add'>+</div><div class='add'>+int ipath_make_rc_req(struct ipath_qp *qp, struct ipath_other_headers *ohdr,</div><div class='add'>+		      u32 pmtu, u32 *bth0p, u32 *bth2p);</div><div class='add'>+</div><div class='add'>+int ipath_make_uc_req(struct ipath_qp *qp, struct ipath_other_headers *ohdr,</div><div class='add'>+		      u32 pmtu, u32 *bth0p, u32 *bth2p);</div><div class='ctx'> </div><div class='ctx'> extern const enum ib_wc_opcode ib_ipath_wc_opcode[];</div><div class='ctx'> </div><div class='hunk'>@@ -688,6 +708,24 @@ extern const int ib_ipath_state_ops[];</div><div class='ctx'> </div><div class='ctx'> extern unsigned int ib_ipath_lkey_table_size;</div><div class='ctx'> </div><div class='add'>+extern unsigned int ib_ipath_max_cqes;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_cqs;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_qp_wrs;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_sges;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_mcast_grps;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_mcast_qp_attached;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_srqs;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_srq_sges;</div><div class='add'>+</div><div class='add'>+extern unsigned int ib_ipath_max_srq_wrs;</div><div class='add'>+</div><div class='ctx'> extern const u32 ib_ipath_rnr_table[];</div><div class='ctx'> </div><div class='ctx'> #endif				/* IPATH_VERBS_H */</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c<br/>index 10b31d2c4f20..ee0e1d96d723 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_verbs_mcast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_verbs_mcast.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='hunk'>@@ -92,6 +93,7 @@ static struct ipath_mcast *ipath_mcast_alloc(union ib_gid *mgid)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;mcast-&gt;qp_list);</div><div class='ctx'> 	init_waitqueue_head(&amp;mcast-&gt;wait);</div><div class='ctx'> 	atomic_set(&amp;mcast-&gt;refcount, 0);</div><div class='add'>+	mcast-&gt;n_attached = 0;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='ctx'> 	return mcast;</div><div class='hunk'>@@ -157,7 +159,8 @@ bail:</div><div class='ctx'>  * the table but the QP was added.  Return ESRCH if the QP was already</div><div class='ctx'>  * attached and neither structure was added.</div><div class='ctx'>  */</div><div class='del'>-static int ipath_mcast_add(struct ipath_mcast *mcast,</div><div class='add'>+static int ipath_mcast_add(struct ipath_ibdev *dev,</div><div class='add'>+			   struct ipath_mcast *mcast,</div><div class='ctx'> 			   struct ipath_mcast_qp *mqp)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node **n = &amp;mcast_tree.rb_node;</div><div class='hunk'>@@ -188,34 +191,47 @@ static int ipath_mcast_add(struct ipath_mcast *mcast,</div><div class='ctx'> 		/* Search the QP list to see if this is already there. */</div><div class='ctx'> 		list_for_each_entry_rcu(p, &amp;tmcast-&gt;qp_list, list) {</div><div class='ctx'> 			if (p-&gt;qp == mqp-&gt;qp) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;mcast_lock, flags);</div><div class='ctx'> 				ret = ESRCH;</div><div class='ctx'> 				goto bail;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		if (tmcast-&gt;n_attached == ib_ipath_max_mcast_qp_attached) {</div><div class='add'>+			ret = ENOMEM;</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tmcast-&gt;n_attached++;</div><div class='add'>+</div><div class='ctx'> 		list_add_tail_rcu(&amp;mqp-&gt;list, &amp;tmcast-&gt;qp_list);</div><div class='del'>-		spin_unlock_irqrestore(&amp;mcast_lock, flags);</div><div class='ctx'> 		ret = EEXIST;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;n_mcast_grps_allocated == ib_ipath_max_mcast_grps) {</div><div class='add'>+		ret = ENOMEM;</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;n_mcast_grps_allocated++;</div><div class='add'>+</div><div class='ctx'> 	list_add_tail_rcu(&amp;mqp-&gt;list, &amp;mcast-&gt;qp_list);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;mcast-&gt;refcount);</div><div class='ctx'> 	rb_link_node(&amp;mcast-&gt;rb_node, pn, n);</div><div class='ctx'> 	rb_insert_color(&amp;mcast-&gt;rb_node, &amp;mcast_tree);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;mcast_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='ctx'> bail:</div><div class='add'>+	spin_unlock_irqrestore(&amp;mcast_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_qp *qp = to_iqp(ibqp);</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibqp-&gt;device);</div><div class='ctx'> 	struct ipath_mcast *mcast;</div><div class='ctx'> 	struct ipath_mcast_qp *mqp;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -235,7 +251,7 @@ int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto bail;</div><div class='ctx'> 	}</div><div class='del'>-	switch (ipath_mcast_add(mcast, mqp)) {</div><div class='add'>+	switch (ipath_mcast_add(dev, mcast, mqp)) {</div><div class='ctx'> 	case ESRCH:</div><div class='ctx'> 		/* Neither was used: can't attach the same QP twice. */</div><div class='ctx'> 		ipath_mcast_qp_free(mqp);</div><div class='hunk'>@@ -245,6 +261,12 @@ int ipath_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> 	case EEXIST:		/* The mcast wasn't used */</div><div class='ctx'> 		ipath_mcast_free(mcast);</div><div class='ctx'> 		break;</div><div class='add'>+	case ENOMEM:</div><div class='add'>+		/* Exceeded the maximum number of mcast groups. */</div><div class='add'>+		ipath_mcast_qp_free(mqp);</div><div class='add'>+		ipath_mcast_free(mcast);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto bail;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -258,6 +280,7 @@ bail:</div><div class='ctx'> int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipath_qp *qp = to_iqp(ibqp);</div><div class='add'>+	struct ipath_ibdev *dev = to_idev(ibqp-&gt;device);</div><div class='ctx'> 	struct ipath_mcast *mcast = NULL;</div><div class='ctx'> 	struct ipath_mcast_qp *p, *tmp;</div><div class='ctx'> 	struct rb_node *n;</div><div class='hunk'>@@ -272,7 +295,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (n == NULL) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;mcast_lock, flags);</div><div class='del'>-			ret = 0;</div><div class='add'>+			ret = -EINVAL;</div><div class='ctx'> 			goto bail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -296,6 +319,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> 		 * link until we are sure there are no list walkers.</div><div class='ctx'> 		 */</div><div class='ctx'> 		list_del_rcu(&amp;p-&gt;list);</div><div class='add'>+		mcast-&gt;n_attached--;</div><div class='ctx'> </div><div class='ctx'> 		/* If this was the last attached QP, remove the GID too. */</div><div class='ctx'> 		if (list_empty(&amp;mcast-&gt;qp_list)) {</div><div class='hunk'>@@ -319,6 +343,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)</div><div class='ctx'> 		atomic_dec(&amp;mcast-&gt;refcount);</div><div class='ctx'> 		wait_event(mcast-&gt;wait, !atomic_read(&amp;mcast-&gt;refcount));</div><div class='ctx'> 		ipath_mcast_free(mcast);</div><div class='add'>+		dev-&gt;n_mcast_grps_allocated--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c b/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c<br/>index adc5322f15c1..f8f9e2e8cbdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ipath_wc_x86_64.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/ipath_wc_x86_64.c</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/ips_common.h b/drivers/infiniband/hw/ipath/ips_common.h<br/>deleted file mode 100644<br/>index ab7cbbbfd03a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/ips_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/ips_common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,263 +0,0 @@</div><div class='del'>-#ifndef IPS_COMMON_H</div><div class='del'>-#define IPS_COMMON_H</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * OpenIB.org BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "ipath_common.h"</div><div class='del'>-</div><div class='del'>-struct ipath_header {</div><div class='del'>-	/*</div><div class='del'>-	 * Version - 4 bits, Port - 4 bits, TID - 10 bits and Offset -</div><div class='del'>-	 * 14 bits before ECO change ~28 Dec 03.  After that, Vers 4,</div><div class='del'>-	 * Port 3, TID 11, offset 14.</div><div class='del'>-	 */</div><div class='del'>-	__le32 ver_port_tid_offset;</div><div class='del'>-	__le16 chksum;</div><div class='del'>-	__le16 pkt_flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ips_message_header {</div><div class='del'>-	__be16 lrh[4];</div><div class='del'>-	__be32 bth[3];</div><div class='del'>-	/* fields below this point are in host byte order */</div><div class='del'>-	struct ipath_header iph;</div><div class='del'>-	__u8 sub_opcode;</div><div class='del'>-	__u8 flags;</div><div class='del'>-	__u16 src_rank;</div><div class='del'>-	/* 24 bits. The upper 8 bit is available for other use */</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			unsigned ack_seq_num:24;</div><div class='del'>-			unsigned port:4;</div><div class='del'>-			unsigned unused:4;</div><div class='del'>-		};</div><div class='del'>-		__u32 ack_seq_num_org;</div><div class='del'>-	};</div><div class='del'>-	__u8 expected_tid_session_id;</div><div class='del'>-	__u8 tinylen;		/* to aid MPI */</div><div class='del'>-	union {</div><div class='del'>-	    __u16 tag;		/* to aid MPI */</div><div class='del'>-	    __u16 mqhdr;	/* for PSM MQ */</div><div class='del'>-	};</div><div class='del'>-	union {</div><div class='del'>-		__u32 mpi[4];	/* to aid MPI */</div><div class='del'>-		__u32 data[4];</div><div class='del'>-		__u64 mq[2];	/* for PSM MQ */</div><div class='del'>-		struct {</div><div class='del'>-			__u16 mtu;</div><div class='del'>-			__u8 major_ver;</div><div class='del'>-			__u8 minor_ver;</div><div class='del'>-			__u32 not_used;	//free</div><div class='del'>-			__u32 run_id;</div><div class='del'>-			__u32 client_ver;</div><div class='del'>-		};</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ether_header {</div><div class='del'>-	__be16 lrh[4];</div><div class='del'>-	__be32 bth[3];</div><div class='del'>-	struct ipath_header iph;</div><div class='del'>-	__u8 sub_opcode;</div><div class='del'>-	__u8 cmd;</div><div class='del'>-	__be16 lid;</div><div class='del'>-	__u16 mac[3];</div><div class='del'>-	__u8 frag_num;</div><div class='del'>-	__u8 seq_num;</div><div class='del'>-	__le32 len;</div><div class='del'>-	/* MUST be of word size due to PIO write requirements */</div><div class='del'>-	__le32 csum;</div><div class='del'>-	__le16 csum_offset;</div><div class='del'>-	__le16 flags;</div><div class='del'>-	__u16 first_2_bytes;</div><div class='del'>-	__u8 unused[2];		/* currently unused */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The PIO buffer used for sending infinipath messages must only be written</div><div class='del'>- * in 32-bit words, all the data must be written, and no writes can occur</div><div class='del'>- * after the last word is written (which transfers "ownership" of the buffer</div><div class='del'>- * to the chip and triggers the message to be sent).</div><div class='del'>- * Since the Linux sk_buff structure can be recursive, non-aligned, and</div><div class='del'>- * any number of bytes in each segment, we use the following structure</div><div class='del'>- * to keep information about the overall state of the copy operation.</div><div class='del'>- * This is used to save the information needed to store the checksum</div><div class='del'>- * in the right place before sending the last word to the hardware and</div><div class='del'>- * to buffer the last 0-3 bytes of non-word sized segments.</div><div class='del'>- */</div><div class='del'>-struct copy_data_s {</div><div class='del'>-	struct ether_header *hdr;</div><div class='del'>-	/* addr of PIO buf to write csum to */</div><div class='del'>-	__u32 __iomem *csum_pio;</div><div class='del'>-	__u32 __iomem *to;	/* addr of PIO buf to write data to */</div><div class='del'>-	__u32 device;		/* which device to allocate PIO bufs from */</div><div class='del'>-	__s32 error;		/* set if there is an error. */</div><div class='del'>-	__s32 extra;		/* amount of data saved in u.buf below */</div><div class='del'>-	__u32 len;		/* total length to send in bytes */</div><div class='del'>-	__u32 flen;		/* frament length in words */</div><div class='del'>-	__u32 csum;		/* partial IP checksum */</div><div class='del'>-	__u32 pos;		/* position for partial checksum */</div><div class='del'>-	__u32 offset;		/* offset to where data currently starts */</div><div class='del'>-	__s32 checksum_calc;	/* set to 1 when csum has been calculated */</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	union {</div><div class='del'>-		__u32 w;</div><div class='del'>-		__u8 buf[4];</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* IB - LRH header consts */</div><div class='del'>-#define IPS_LRH_GRH 0x0003	/* 1. word of IB LRH - next header: GRH */</div><div class='del'>-#define IPS_LRH_BTH 0x0002	/* 1. word of IB LRH - next header: BTH */</div><div class='del'>-</div><div class='del'>-#define IPS_OFFSET  0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * defines the cut-off point between the header queue and eager/expected</div><div class='del'>- * TID queue</div><div class='del'>- */</div><div class='del'>-#define NUM_OF_EXTRA_WORDS_IN_HEADER_QUEUE \</div><div class='del'>-	((sizeof(struct ips_message_header) - \</div><div class='del'>-	  offsetof(struct ips_message_header, iph)) &gt;&gt; 2)</div><div class='del'>-</div><div class='del'>-/* OpCodes  */</div><div class='del'>-#define OPCODE_IPS 0xC0</div><div class='del'>-#define OPCODE_ITH4X 0xC1</div><div class='del'>-</div><div class='del'>-/* OpCode 30 is use by stand-alone test programs  */</div><div class='del'>-#define OPCODE_RAW_DATA 0xDE</div><div class='del'>-/* last OpCode (31) is reserved for test  */</div><div class='del'>-#define OPCODE_TEST 0xDF</div><div class='del'>-</div><div class='del'>-/* sub OpCodes - ips  */</div><div class='del'>-#define OPCODE_SEQ_DATA 0x01</div><div class='del'>-#define OPCODE_SEQ_CTRL 0x02</div><div class='del'>-</div><div class='del'>-#define OPCODE_SEQ_MQ_DATA 0x03</div><div class='del'>-#define OPCODE_SEQ_MQ_CTRL 0x04</div><div class='del'>-</div><div class='del'>-#define OPCODE_ACK 0x10</div><div class='del'>-#define OPCODE_NAK 0x11</div><div class='del'>-</div><div class='del'>-#define OPCODE_ERR_CHK 0x20</div><div class='del'>-#define OPCODE_ERR_CHK_PLS 0x21</div><div class='del'>-</div><div class='del'>-#define OPCODE_STARTUP 0x30</div><div class='del'>-#define OPCODE_STARTUP_ACK 0x31</div><div class='del'>-#define OPCODE_STARTUP_NAK 0x32</div><div class='del'>-</div><div class='del'>-#define OPCODE_STARTUP_EXT 0x34</div><div class='del'>-#define OPCODE_STARTUP_ACK_EXT 0x35</div><div class='del'>-#define OPCODE_STARTUP_NAK_EXT 0x36</div><div class='del'>-</div><div class='del'>-#define OPCODE_TIDS_RELEASE 0x40</div><div class='del'>-#define OPCODE_TIDS_RELEASE_CONFIRM 0x41</div><div class='del'>-</div><div class='del'>-#define OPCODE_CLOSE 0x50</div><div class='del'>-#define OPCODE_CLOSE_ACK 0x51</div><div class='del'>-/*</div><div class='del'>- * like OPCODE_CLOSE, but no complaint if other side has already closed.</div><div class='del'>- * Used when doing abort(), MPI_Abort(), etc.</div><div class='del'>- */</div><div class='del'>-#define OPCODE_ABORT 0x52</div><div class='del'>-</div><div class='del'>-/* sub OpCodes - ith4x  */</div><div class='del'>-#define OPCODE_ENCAP 0x81</div><div class='del'>-#define OPCODE_LID_ARP 0x82</div><div class='del'>-</div><div class='del'>-/* Receive Header Queue: receive type (from infinipath) */</div><div class='del'>-#define RCVHQ_RCV_TYPE_EXPECTED  0</div><div class='del'>-#define RCVHQ_RCV_TYPE_EAGER     1</div><div class='del'>-#define RCVHQ_RCV_TYPE_NON_KD    2</div><div class='del'>-#define RCVHQ_RCV_TYPE_ERROR     3</div><div class='del'>-</div><div class='del'>-/* misc. */</div><div class='del'>-#define SIZE_OF_CRC 1</div><div class='del'>-</div><div class='del'>-#define EAGER_TID_ID INFINIPATH_I_TID_MASK</div><div class='del'>-</div><div class='del'>-#define IPS_DEFAULT_P_KEY 0xFFFF</div><div class='del'>-</div><div class='del'>-#define IPS_PERMISSIVE_LID 0xFFFF</div><div class='del'>-#define IPS_MULTICAST_LID_BASE 0xC000</div><div class='del'>-</div><div class='del'>-#define IPS_AETH_CREDIT_SHIFT 24</div><div class='del'>-#define IPS_AETH_CREDIT_MASK 0x1F</div><div class='del'>-#define IPS_AETH_CREDIT_INVAL 0x1F</div><div class='del'>-</div><div class='del'>-#define IPS_PSN_MASK 0xFFFFFF</div><div class='del'>-#define IPS_MSN_MASK 0xFFFFFF</div><div class='del'>-#define IPS_QPN_MASK 0xFFFFFF</div><div class='del'>-#define IPS_MULTICAST_QPN 0xFFFFFF</div><div class='del'>-</div><div class='del'>-/* functions for extracting fields from rcvhdrq entries */</div><div class='del'>-static inline __u32 ips_get_hdr_err_flags(const __le32 * rbuf)</div><div class='del'>-{</div><div class='del'>-	return __le32_to_cpu(rbuf[1]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 ips_get_index(const __le32 * rbuf)</div><div class='del'>-{</div><div class='del'>-	return (__le32_to_cpu(rbuf[0]) &gt;&gt; INFINIPATH_RHF_EGRINDEX_SHIFT)</div><div class='del'>-	    &amp; INFINIPATH_RHF_EGRINDEX_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 ips_get_rcv_type(const __le32 * rbuf)</div><div class='del'>-{</div><div class='del'>-	return (__le32_to_cpu(rbuf[0]) &gt;&gt; INFINIPATH_RHF_RCVTYPE_SHIFT)</div><div class='del'>-	    &amp; INFINIPATH_RHF_RCVTYPE_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 ips_get_length_in_bytes(const __le32 * rbuf)</div><div class='del'>-{</div><div class='del'>-	return ((__le32_to_cpu(rbuf[0]) &gt;&gt; INFINIPATH_RHF_LENGTH_SHIFT)</div><div class='del'>-		&amp; INFINIPATH_RHF_LENGTH_MASK) &lt;&lt; 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *ips_get_first_protocol_header(const __u32 * rbuf)</div><div class='del'>-{</div><div class='del'>-	return (void *)&amp;rbuf[2];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct ips_message_header *ips_get_ips_header(const __u32 *</div><div class='del'>-							    rbuf)</div><div class='del'>-{</div><div class='del'>-	return (struct ips_message_header *)&amp;rbuf[2];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline __u32 ips_get_ipath_ver(__le32 hdrword)</div><div class='del'>-{</div><div class='del'>-	return (__le32_to_cpu(hdrword) &gt;&gt; INFINIPATH_I_VERS_SHIFT)</div><div class='del'>-	    &amp; INFINIPATH_I_VERS_MASK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif				/* IPS_COMMON_H */</div><div class='head'>diff --git a/drivers/infiniband/hw/ipath/verbs_debug.h b/drivers/infiniband/hw/ipath/verbs_debug.h<br/>index 40d693cf3f94..6186676f2a16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/verbs_debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/ipath/verbs_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/ipath/verbs_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/ipath/verbs_debug.h</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='ctx'> /*</div><div class='add'>+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.</div><div class='ctx'>  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This software is available to you under a choice of one of two</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c<br/>index b12aa03be251..e215041b2db9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_av.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_av.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_av.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_av.c</a></div><div class='hunk'>@@ -303,9 +303,10 @@ int mthca_ah_query(struct ib_ah *ibah, struct ib_ah_attr *attr)</div><div class='ctx'> 	memset(attr, 0, sizeof *attr);</div><div class='ctx'> 	attr-&gt;dlid          = be16_to_cpu(ah-&gt;av-&gt;dlid);</div><div class='ctx'> 	attr-&gt;sl            = be32_to_cpu(ah-&gt;av-&gt;sl_tclass_flowlabel) &gt;&gt; 28;</div><div class='del'>-	attr-&gt;static_rate   = ah-&gt;av-&gt;msg_sr &amp; 0x7;</div><div class='del'>-	attr-&gt;src_path_bits = ah-&gt;av-&gt;g_slid &amp; 0x7F;</div><div class='ctx'> 	attr-&gt;port_num      = be32_to_cpu(ah-&gt;av-&gt;port_pd) &gt;&gt; 24;</div><div class='add'>+	attr-&gt;static_rate   = mthca_rate_to_ib(dev, ah-&gt;av-&gt;msg_sr &amp; 0x7,</div><div class='add'>+					       attr-&gt;port_num);</div><div class='add'>+	attr-&gt;src_path_bits = ah-&gt;av-&gt;g_slid &amp; 0x7F;</div><div class='ctx'> 	attr-&gt;ah_flags      = mthca_ah_grh_present(ah) ? IB_AH_GRH : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (attr-&gt;ah_flags) {</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c<br/>index 798e13e14faf..d0f7731802c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_cmd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_cmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_cmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_cmd.c</a></div><div class='hunk'>@@ -174,7 +174,6 @@ enum {</div><div class='ctx'> </div><div class='ctx'> struct mthca_cmd_context {</div><div class='ctx'> 	struct completion done;</div><div class='del'>-	struct timer_list timer;</div><div class='ctx'> 	int               result;</div><div class='ctx'> 	int               next;</div><div class='ctx'> 	u64               out_param;</div><div class='hunk'>@@ -362,15 +361,6 @@ void mthca_cmd_event(struct mthca_dev *dev,</div><div class='ctx'> 	complete(&amp;context-&gt;done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void event_timeout(unsigned long context_ptr)</div><div class='del'>-{</div><div class='del'>-	struct mthca_cmd_context *context =</div><div class='del'>-		(struct mthca_cmd_context *) context_ptr;</div><div class='del'>-</div><div class='del'>-	context-&gt;result = -EBUSY;</div><div class='del'>-	complete(&amp;context-&gt;done);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mthca_cmd_wait(struct mthca_dev *dev,</div><div class='ctx'> 			  u64 in_param,</div><div class='ctx'> 			  u64 *out_param,</div><div class='hunk'>@@ -401,11 +391,10 @@ static int mthca_cmd_wait(struct mthca_dev *dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	context-&gt;timer.expires  = jiffies + timeout;</div><div class='del'>-	add_timer(&amp;context-&gt;timer);</div><div class='del'>-</div><div class='del'>-	wait_for_completion(&amp;context-&gt;done);</div><div class='del'>-	del_timer_sync(&amp;context-&gt;timer);</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;context-&gt;done, timeout)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = context-&gt;result;</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -535,10 +524,6 @@ int mthca_cmd_use_events(struct mthca_dev *dev)</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;cmd.max_cmds; ++i) {</div><div class='ctx'> 		dev-&gt;cmd.context[i].token = i;</div><div class='ctx'> 		dev-&gt;cmd.context[i].next = i + 1;</div><div class='del'>-		init_timer(&amp;dev-&gt;cmd.context[i].timer);</div><div class='del'>-		dev-&gt;cmd.context[i].timer.data     =</div><div class='del'>-			(unsigned long) &amp;dev-&gt;cmd.context[i];</div><div class='del'>-		dev-&gt;cmd.context[i].timer.function = event_timeout;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;cmd.context[dev-&gt;cmd.max_cmds - 1].next = -1;</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c<br/>index 205854e9c662..3e27a084257e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_cq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_cq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_cq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_cq.c</a></div><div class='hunk'>@@ -540,8 +540,17 @@ static inline int mthca_poll_one(struct mthca_dev *dev,</div><div class='ctx'> 		entry-&gt;wr_id = srq-&gt;wrid[wqe_index];</div><div class='ctx'> 		mthca_free_srq_wqe(srq, wqe);</div><div class='ctx'> 	} else {</div><div class='add'>+		s32 wqe;</div><div class='ctx'> 		wq = &amp;(*cur_qp)-&gt;rq;</div><div class='del'>-		wqe_index = be32_to_cpu(cqe-&gt;wqe) &gt;&gt; wq-&gt;wqe_shift;</div><div class='add'>+		wqe = be32_to_cpu(cqe-&gt;wqe);</div><div class='add'>+		wqe_index = wqe &gt;&gt; wq-&gt;wqe_shift;</div><div class='add'>+               /*</div><div class='add'>+		* WQE addr == base - 1 might be reported in receive completion</div><div class='add'>+		* with error instead of (rq size - 1) by Sinai FW 1.0.800 and</div><div class='add'>+		* Arbel FW 5.1.400.  This bug should be fixed in later FW revs.</div><div class='add'>+		*/</div><div class='add'>+		if (unlikely(wqe_index &lt; 0))</div><div class='add'>+			wqe_index = wq-&gt;max - 1;</div><div class='ctx'> 		entry-&gt;wr_id = (*cur_qp)-&gt;wrid[wqe_index];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -813,6 +822,7 @@ int mthca_init_cq(struct mthca_dev *dev, int nent,</div><div class='ctx'> 	spin_lock_init(&amp;cq-&gt;lock);</div><div class='ctx'> 	cq-&gt;refcount = 1;</div><div class='ctx'> 	init_waitqueue_head(&amp;cq-&gt;wait);</div><div class='add'>+	mutex_init(&amp;cq-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	memset(cq_context, 0, sizeof *cq_context);</div><div class='ctx'> 	cq_context-&gt;flags           = cpu_to_be32(MTHCA_CQ_STATUS_OK      |</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c<br/>index 99f109c3815d..a29b1b6d82b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_eq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_eq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_eq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_eq.c</a></div><div class='hunk'>@@ -695,10 +695,6 @@ static void mthca_unmap_reg(struct mthca_dev *dev, unsigned long offset,</div><div class='ctx'> </div><div class='ctx'> static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long mthca_base;</div><div class='del'>-</div><div class='del'>-	mthca_base = pci_resource_start(dev-&gt;pdev, 0);</div><div class='del'>-</div><div class='ctx'> 	if (mthca_is_memfree(dev)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We assume that the EQ arm and EQ set CI registers</div><div class='hunk'>@@ -904,7 +900,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev)</div><div class='ctx'> 				  mthca_is_memfree(dev) ?</div><div class='ctx'> 				  mthca_arbel_interrupt :</div><div class='ctx'> 				  mthca_tavor_interrupt,</div><div class='del'>-				  SA_SHIRQ, DRV_NAME, dev);</div><div class='add'>+				  IRQF_SHARED, DRV_NAME, dev);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_out_cmd;</div><div class='ctx'> 		dev-&gt;eq_table.have_irq = 1;</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c<br/>index 4730863ece9a..d9bc030bcccc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_mad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_mad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_mad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_mad.c</a></div><div class='hunk'>@@ -114,14 +114,22 @@ static void smp_snoop(struct ib_device *ibdev,</div><div class='ctx'> 	     mad-&gt;mad_hdr.mgmt_class  == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &amp;&amp;</div><div class='ctx'> 	    mad-&gt;mad_hdr.method     == IB_MGMT_METHOD_SET) {</div><div class='ctx'> 		if (mad-&gt;mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO) {</div><div class='add'>+			struct ib_port_info *pinfo =</div><div class='add'>+				(struct ib_port_info *) ((struct ib_smp *) mad)-&gt;data;</div><div class='add'>+</div><div class='ctx'> 			mthca_update_rate(to_mdev(ibdev), port_num);</div><div class='ctx'> 			update_sm_ah(to_mdev(ibdev), port_num,</div><div class='del'>-				     be16_to_cpup((__be16 *) (mad-&gt;data + 58)),</div><div class='del'>-				     (*(u8 *) (mad-&gt;data + 76)) &amp; 0xf);</div><div class='add'>+				     be16_to_cpu(pinfo-&gt;lid),</div><div class='add'>+				     pinfo-&gt;neighbormtu_mastersmsl &amp; 0xf);</div><div class='ctx'> </div><div class='ctx'> 			event.device           = ibdev;</div><div class='del'>-			event.event            = IB_EVENT_LID_CHANGE;</div><div class='ctx'> 			event.element.port_num = port_num;</div><div class='add'>+</div><div class='add'>+			if(pinfo-&gt;clientrereg_resv_subnetto &amp; 0x80)</div><div class='add'>+				event.event    = IB_EVENT_CLIENT_REREGISTER;</div><div class='add'>+			else</div><div class='add'>+				event.event    = IB_EVENT_LID_CHANGE;</div><div class='add'>+</div><div class='ctx'> 			ib_dispatch_event(&amp;event);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c<br/>index 9b9ff7bff357..557cde3a4563 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_main.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  * $Id: mthca_main.c 1396 2004-12-28 04:10:27Z roland $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -172,8 +171,9 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim</div><div class='ctx'> </div><div class='ctx'> 	if (dev_lim-&gt;uar_size &gt; pci_resource_len(mdev-&gt;pdev, 2)) {</div><div class='ctx'> 		mthca_err(mdev, "HCA reported UAR size of 0x%x bigger than "</div><div class='del'>-			  "PCI resource 2 size of 0x%lx, aborting.\n",</div><div class='del'>-			  dev_lim-&gt;uar_size, pci_resource_len(mdev-&gt;pdev, 2));</div><div class='add'>+			  "PCI resource 2 size of 0x%llx, aborting.\n",</div><div class='add'>+			  dev_lim-&gt;uar_size,</div><div class='add'>+			  (unsigned long long)pci_resource_len(mdev-&gt;pdev, 2));</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c<br/>index a2eae8a30167..230ae21db8fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_provider.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_provider.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_provider.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_provider.c</a></div><div class='hunk'>@@ -115,6 +115,16 @@ static int mthca_query_device(struct ib_device *ibdev,</div><div class='ctx'> 	props-&gt;max_mcast_qp_attach = MTHCA_QP_PER_MGM;</div><div class='ctx'> 	props-&gt;max_total_mcast_qp_attach = props-&gt;max_mcast_qp_attach *</div><div class='ctx'> 					   props-&gt;max_mcast_grp;</div><div class='add'>+	/*</div><div class='add'>+	 * If Sinai memory key optimization is being used, then only</div><div class='add'>+	 * the 8-bit key portion will change.  For other HCAs, the</div><div class='add'>+	 * unused index bits will also be used for FMR remapping.</div><div class='add'>+	 */</div><div class='add'>+	if (mdev-&gt;mthca_flags &amp; MTHCA_FLAG_SINAI_OPT)</div><div class='add'>+		props-&gt;max_map_per_fmr = 255;</div><div class='add'>+	else</div><div class='add'>+		props-&gt;max_map_per_fmr =</div><div class='add'>+			(1 &lt;&lt; (32 - long_log2(mdev-&gt;limits.num_mpts))) - 1;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'>  out:</div><div class='hunk'>@@ -783,18 +793,24 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda</div><div class='ctx'> 	if (entries &lt; 1 || entries &gt; dev-&gt;limits.max_cqes)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;cq-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	entries = roundup_pow_of_two(entries + 1);</div><div class='del'>-	if (entries == ibcq-&gt;cqe + 1)</div><div class='del'>-		return 0;</div><div class='add'>+	if (entries == ibcq-&gt;cqe + 1) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cq-&gt;is_kernel) {</div><div class='ctx'> 		ret = mthca_alloc_resize_buf(dev, cq, entries);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			goto out;</div><div class='ctx'> 		lkey = cq-&gt;resize_buf-&gt;buf.mr.ibmr.lkey;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (ib_copy_from_udata(&amp;ucmd, udata, sizeof ucmd))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (ib_copy_from_udata(&amp;ucmd, udata, sizeof ucmd)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		lkey = ucmd.lkey;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -811,7 +827,7 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda</div><div class='ctx'> 			cq-&gt;resize_buf = NULL;</div><div class='ctx'> 			spin_unlock_irq(&amp;cq-&gt;lock);</div><div class='ctx'> 		}</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cq-&gt;is_kernel) {</div><div class='hunk'>@@ -838,7 +854,10 @@ static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *uda</div><div class='ctx'> 	} else</div><div class='ctx'> 		ibcq-&gt;cqe = entries - 1;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;cq-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mthca_destroy_cq(struct ib_cq *cq)</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h<br/>index 179a8f610d0f..8de2887ba15c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_provider.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_provider.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_provider.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_provider.h</a></div><div class='hunk'>@@ -214,6 +214,7 @@ struct mthca_cq {</div><div class='ctx'> 	int			arm_sn;</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t	wait;</div><div class='add'>+	struct mutex		mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mthca_srq {</div><div class='hunk'>@@ -237,6 +238,7 @@ struct mthca_srq {</div><div class='ctx'> 	struct mthca_mr		mr;</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t	wait;</div><div class='add'>+	struct mutex		mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mthca_wq {</div><div class='hunk'>@@ -278,6 +280,7 @@ struct mthca_qp {</div><div class='ctx'> 	union mthca_buf	       queue;</div><div class='ctx'> </div><div class='ctx'> 	wait_queue_head_t      wait;</div><div class='add'>+	struct mutex	       mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mthca_sqp {</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c<br/>index 07c13be07a4a..cd8b6721ac9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_qp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_qp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_qp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_qp.c</a></div><div class='hunk'>@@ -222,9 +222,8 @@ static void *get_send_wqe(struct mthca_qp *qp, int n)</div><div class='ctx'> 			 (PAGE_SIZE - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mthca_wq_init(struct mthca_wq *wq)</div><div class='add'>+static void mthca_wq_reset(struct mthca_wq *wq)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_init(&amp;wq-&gt;lock);</div><div class='ctx'> 	wq-&gt;next_ind  = 0;</div><div class='ctx'> 	wq-&gt;last_comp = wq-&gt;max - 1;</div><div class='ctx'> 	wq-&gt;head      = 0;</div><div class='hunk'>@@ -534,7 +533,9 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 	struct mthca_qp_context *qp_context;</div><div class='ctx'> 	u32 sqd_event = 0;</div><div class='ctx'> 	u8 status;</div><div class='del'>-	int err;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;qp-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_CUR_STATE) {</div><div class='ctx'> 		cur_state = attr-&gt;cur_qp_state;</div><div class='hunk'>@@ -553,39 +554,41 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 			  "%d-&gt;%d with attr 0x%08x\n",</div><div class='ctx'> 			  qp-&gt;transport, cur_state, new_state,</div><div class='ctx'> 			  attr_mask);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((attr_mask &amp; IB_QP_PKEY_INDEX) &amp;&amp;</div><div class='ctx'> 	     attr-&gt;pkey_index &gt;= dev-&gt;limits.pkey_table_len) {</div><div class='ctx'> 		mthca_dbg(dev, "P_Key index (%u) too large. max is %d\n",</div><div class='ctx'> 			  attr-&gt;pkey_index, dev-&gt;limits.pkey_table_len-1);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((attr_mask &amp; IB_QP_PORT) &amp;&amp;</div><div class='ctx'> 	    (attr-&gt;port_num == 0 || attr-&gt;port_num &gt; dev-&gt;limits.num_ports)) {</div><div class='ctx'> 		mthca_dbg(dev, "Port number (%u) is invalid\n", attr-&gt;port_num);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_MAX_QP_RD_ATOMIC &amp;&amp;</div><div class='ctx'> 	    attr-&gt;max_rd_atomic &gt; dev-&gt;limits.max_qp_init_rdma) {</div><div class='ctx'> 		mthca_dbg(dev, "Max rdma_atomic as initiator %u too large (max is %d)\n",</div><div class='ctx'> 			  attr-&gt;max_rd_atomic, dev-&gt;limits.max_qp_init_rdma);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (attr_mask &amp; IB_QP_MAX_DEST_RD_ATOMIC &amp;&amp;</div><div class='ctx'> 	    attr-&gt;max_dest_rd_atomic &gt; 1 &lt;&lt; dev-&gt;qp_table.rdb_shift) {</div><div class='ctx'> 		mthca_dbg(dev, "Max rdma_atomic as responder %u too large (max %d)\n",</div><div class='ctx'> 			  attr-&gt;max_dest_rd_atomic, 1 &lt;&lt; dev-&gt;qp_table.rdb_shift);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);</div><div class='del'>-	if (IS_ERR(mailbox))</div><div class='del'>-		return PTR_ERR(mailbox);</div><div class='add'>+	if (IS_ERR(mailbox)) {</div><div class='add'>+		err = PTR_ERR(mailbox);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> 	qp_param = mailbox-&gt;buf;</div><div class='ctx'> 	qp_context = &amp;qp_param-&gt;context;</div><div class='ctx'> 	memset(qp_param, 0, sizeof *qp_param);</div><div class='hunk'>@@ -618,7 +621,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 		if (attr-&gt;path_mtu &lt; IB_MTU_256 || attr-&gt;path_mtu &gt; IB_MTU_2048) {</div><div class='ctx'> 			mthca_dbg(dev, "path MTU (%u) is invalid\n",</div><div class='ctx'> 				  attr-&gt;path_mtu);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			goto out_mailbox;</div><div class='ctx'> 		}</div><div class='ctx'> 		qp_context-&gt;mtu_msgmax = (attr-&gt;path_mtu &lt;&lt; 5) | 31;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -672,7 +675,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 	if (attr_mask &amp; IB_QP_AV) {</div><div class='ctx'> 		if (mthca_path_set(dev, &amp;attr-&gt;ah_attr, &amp;qp_context-&gt;pri_path,</div><div class='ctx'> 				   attr_mask &amp; IB_QP_PORT ? attr-&gt;port_num : qp-&gt;port))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			goto out_mailbox;</div><div class='ctx'> </div><div class='ctx'> 		qp_param-&gt;opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_PRIMARY_ADDR_PATH);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -686,18 +689,18 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 		if (attr-&gt;alt_pkey_index &gt;= dev-&gt;limits.pkey_table_len) {</div><div class='ctx'> 			mthca_dbg(dev, "Alternate P_Key index (%u) too large. max is %d\n",</div><div class='ctx'> 				  attr-&gt;alt_pkey_index, dev-&gt;limits.pkey_table_len-1);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			goto out_mailbox;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (attr-&gt;alt_port_num == 0 || attr-&gt;alt_port_num &gt; dev-&gt;limits.num_ports) {</div><div class='ctx'> 			mthca_dbg(dev, "Alternate port number (%u) is invalid\n",</div><div class='ctx'> 				attr-&gt;alt_port_num);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			goto out_mailbox;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mthca_path_set(dev, &amp;attr-&gt;alt_ah_attr, &amp;qp_context-&gt;alt_path,</div><div class='ctx'> 				   attr-&gt;alt_ah_attr.port_num))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			goto out_mailbox;</div><div class='ctx'> </div><div class='ctx'> 		qp_context-&gt;alt_path.port_pkey |= cpu_to_be32(attr-&gt;alt_pkey_index |</div><div class='ctx'> 							      attr-&gt;alt_port_num &lt;&lt; 24);</div><div class='hunk'>@@ -793,12 +796,12 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 	err = mthca_MODIFY_QP(dev, cur_state, new_state, qp-&gt;qpn, 0,</div><div class='ctx'> 			      mailbox, sqd_event, &amp;status);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_mailbox;</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		mthca_warn(dev, "modify QP %d-&gt;%d returned status %02x.\n",</div><div class='ctx'> 			   cur_state, new_state, status);</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_mailbox;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	qp-&gt;state = new_state;</div><div class='hunk'>@@ -841,10 +844,10 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 			mthca_cq_clean(dev, to_mcq(qp-&gt;ibqp.recv_cq), qp-&gt;qpn,</div><div class='ctx'> 				       qp-&gt;ibqp.srq ? to_msrq(qp-&gt;ibqp.srq) : NULL);</div><div class='ctx'> </div><div class='del'>-		mthca_wq_init(&amp;qp-&gt;sq);</div><div class='add'>+		mthca_wq_reset(&amp;qp-&gt;sq);</div><div class='ctx'> 		qp-&gt;sq.last = get_send_wqe(qp, qp-&gt;sq.max - 1);</div><div class='ctx'> </div><div class='del'>-		mthca_wq_init(&amp;qp-&gt;rq);</div><div class='add'>+		mthca_wq_reset(&amp;qp-&gt;rq);</div><div class='ctx'> 		qp-&gt;rq.last = get_recv_wqe(qp, qp-&gt;rq.max - 1);</div><div class='ctx'> </div><div class='ctx'> 		if (mthca_is_memfree(dev)) {</div><div class='hunk'>@@ -853,8 +856,11 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='add'>+out_mailbox:</div><div class='ctx'> 	mthca_free_mailbox(dev, mailbox);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;qp-&gt;mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1100,12 +1106,16 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	qp-&gt;refcount = 1;</div><div class='ctx'> 	init_waitqueue_head(&amp;qp-&gt;wait);</div><div class='add'>+	mutex_init(&amp;qp-&gt;mutex);</div><div class='ctx'> 	qp-&gt;state    	 = IB_QPS_RESET;</div><div class='ctx'> 	qp-&gt;atomic_rd_en = 0;</div><div class='ctx'> 	qp-&gt;resp_depth   = 0;</div><div class='ctx'> 	qp-&gt;sq_policy    = send_policy;</div><div class='del'>-	mthca_wq_init(&amp;qp-&gt;sq);</div><div class='del'>-	mthca_wq_init(&amp;qp-&gt;rq);</div><div class='add'>+	mthca_wq_reset(&amp;qp-&gt;sq);</div><div class='add'>+	mthca_wq_reset(&amp;qp-&gt;rq);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;qp-&gt;sq.lock);</div><div class='add'>+	spin_lock_init(&amp;qp-&gt;rq.lock);</div><div class='ctx'> </div><div class='ctx'> 	ret = mthca_map_memfree(dev, qp);</div><div class='ctx'> 	if (ret)</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_reset.c b/drivers/infiniband/hw/mthca/mthca_reset.c<br/>index df5e494a9d38..91934f2d9dba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_reset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_reset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_reset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_reset.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  * $Id: mthca_reset.c 1349 2004-12-16 21:09:43Z roland $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -49,6 +48,12 @@ int mthca_reset(struct mthca_dev *mdev)</div><div class='ctx'> 	u32 *hca_header    = NULL;</div><div class='ctx'> 	u32 *bridge_header = NULL;</div><div class='ctx'> 	struct pci_dev *bridge = NULL;</div><div class='add'>+	int bridge_pcix_cap = 0;</div><div class='add'>+	int hca_pcie_cap = 0;</div><div class='add'>+	int hca_pcix_cap = 0;</div><div class='add'>+</div><div class='add'>+	u16 devctl;</div><div class='add'>+	u16 linkctl;</div><div class='ctx'> </div><div class='ctx'> #define MTHCA_RESET_OFFSET 0xf0010</div><div class='ctx'> #define MTHCA_RESET_VALUE  swab32(1)</div><div class='hunk'>@@ -110,6 +115,9 @@ int mthca_reset(struct mthca_dev *mdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	hca_pcix_cap = pci_find_capability(mdev-&gt;pdev, PCI_CAP_ID_PCIX);</div><div class='add'>+	hca_pcie_cap = pci_find_capability(mdev-&gt;pdev, PCI_CAP_ID_EXP);</div><div class='add'>+</div><div class='ctx'> 	if (bridge) {</div><div class='ctx'> 		bridge_header = kmalloc(256, GFP_KERNEL);</div><div class='ctx'> 		if (!bridge_header) {</div><div class='hunk'>@@ -129,6 +137,13 @@ int mthca_reset(struct mthca_dev *mdev)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		bridge_pcix_cap = pci_find_capability(bridge, PCI_CAP_ID_PCIX);</div><div class='add'>+		if (!bridge_pcix_cap) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				mthca_err(mdev, "Couldn't locate HCA bridge "</div><div class='add'>+					  "PCI-X capability, aborting.\n");</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* actually hit reset */</div><div class='hunk'>@@ -178,6 +193,20 @@ int mthca_reset(struct mthca_dev *mdev)</div><div class='ctx'> good:</div><div class='ctx'> 	/* Now restore the PCI headers */</div><div class='ctx'> 	if (bridge) {</div><div class='add'>+		if (pci_write_config_dword(bridge, bridge_pcix_cap + 0x8,</div><div class='add'>+				 bridge_header[(bridge_pcix_cap + 0x8) / 4])) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			mthca_err(mdev, "Couldn't restore HCA bridge Upstream "</div><div class='add'>+				  "split transaction control, aborting.\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		if (pci_write_config_dword(bridge, bridge_pcix_cap + 0xc,</div><div class='add'>+				 bridge_header[(bridge_pcix_cap + 0xc) / 4])) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			mthca_err(mdev, "Couldn't restore HCA bridge Downstream "</div><div class='add'>+				  "split transaction control, aborting.\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Bridge control register is at 0x3e, so we'll</div><div class='ctx'> 		 * naturally restore it last in this loop.</div><div class='hunk'>@@ -203,6 +232,35 @@ good:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hca_pcix_cap) {</div><div class='add'>+		if (pci_write_config_dword(mdev-&gt;pdev, hca_pcix_cap,</div><div class='add'>+				 hca_header[hca_pcix_cap / 4])) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			mthca_err(mdev, "Couldn't restore HCA PCI-X "</div><div class='add'>+				  "command register, aborting.\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hca_pcie_cap) {</div><div class='add'>+		devctl = hca_header[(hca_pcie_cap + PCI_EXP_DEVCTL) / 4];</div><div class='add'>+		if (pci_write_config_word(mdev-&gt;pdev, hca_pcie_cap + PCI_EXP_DEVCTL,</div><div class='add'>+					   devctl)) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			mthca_err(mdev, "Couldn't restore HCA PCI Express "</div><div class='add'>+				  "Device Control register, aborting.\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		linkctl = hca_header[(hca_pcie_cap + PCI_EXP_LNKCTL) / 4];</div><div class='add'>+		if (pci_write_config_word(mdev-&gt;pdev, hca_pcie_cap + PCI_EXP_LNKCTL,</div><div class='add'>+					   linkctl)) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			mthca_err(mdev, "Couldn't restore HCA PCI Express "</div><div class='add'>+				  "Link control register, aborting.\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 16; ++i) {</div><div class='ctx'> 		if (i * 4 == PCI_COMMAND)</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c<br/>index b292fefa3b41..fab417c5cf43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_srq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/hw/mthca/mthca_srq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/hw/mthca/mthca_srq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/hw/mthca/mthca_srq.c</a></div><div class='hunk'>@@ -243,6 +243,7 @@ int mthca_alloc_srq(struct mthca_dev *dev, struct mthca_pd *pd,</div><div class='ctx'> 	spin_lock_init(&amp;srq-&gt;lock);</div><div class='ctx'> 	srq-&gt;refcount = 1;</div><div class='ctx'> 	init_waitqueue_head(&amp;srq-&gt;wait);</div><div class='add'>+	mutex_init(&amp;srq-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (mthca_is_memfree(dev))</div><div class='ctx'> 		mthca_arbel_init_srq_context(dev, pd, srq, mailbox-&gt;buf);</div><div class='hunk'>@@ -371,7 +372,11 @@ int mthca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,</div><div class='ctx'> 	if (attr_mask &amp; IB_SRQ_LIMIT) {</div><div class='ctx'> 		if (attr-&gt;srq_limit &gt; srq-&gt;max)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;srq-&gt;mutex);</div><div class='ctx'> 		ret = mthca_ARM_SRQ(dev, srq-&gt;srqn, attr-&gt;srq_limit, &amp;status);</div><div class='add'>+		mutex_unlock(&amp;srq-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		if (status)</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h<br/>index 12a1e0572ef2..3f89f5e19036 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/ipoib/ipoib.h</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kref.h&gt;</div><div class='ctx'> #include &lt;linux/if_infiniband.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -272,8 +271,7 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port);</div><div class='ctx'> void ipoib_dev_cleanup(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> void ipoib_mcast_join_task(void *dev_ptr);</div><div class='del'>-void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid,</div><div class='del'>-		      struct sk_buff *skb);</div><div class='add'>+void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> void ipoib_mcast_restart_task(void *dev_ptr);</div><div class='ctx'> int ipoib_mcast_start_thread(struct net_device *dev);</div><div class='hunk'>@@ -369,15 +367,26 @@ extern int ipoib_debug_level;</div><div class='ctx'> #endif /* CONFIG_INFINIBAND_IPOIB_DEBUG_DATA */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define IPOIB_GID_FMT		"%x:%x:%x:%x:%x:%x:%x:%x"</div><div class='del'>-</div><div class='del'>-#define IPOIB_GID_ARG(gid)	be16_to_cpup((__be16 *) ((gid).raw +  0)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw +  2)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw +  4)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw +  6)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw +  8)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw + 10)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw + 12)), \</div><div class='del'>-				be16_to_cpup((__be16 *) ((gid).raw + 14))</div><div class='add'>+#define IPOIB_GID_FMT		"%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x:" \</div><div class='add'>+				"%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x"</div><div class='add'>+</div><div class='add'>+#define IPOIB_GID_RAW_ARG(gid)	((u8 *)(gid))[0], \</div><div class='add'>+				((u8 *)(gid))[1], \</div><div class='add'>+				((u8 *)(gid))[2], \</div><div class='add'>+				((u8 *)(gid))[3], \</div><div class='add'>+				((u8 *)(gid))[4], \</div><div class='add'>+				((u8 *)(gid))[5], \</div><div class='add'>+				((u8 *)(gid))[6], \</div><div class='add'>+				((u8 *)(gid))[7], \</div><div class='add'>+				((u8 *)(gid))[8], \</div><div class='add'>+				((u8 *)(gid))[9], \</div><div class='add'>+				((u8 *)(gid))[10],\</div><div class='add'>+				((u8 *)(gid))[11],\</div><div class='add'>+				((u8 *)(gid))[12],\</div><div class='add'>+				((u8 *)(gid))[13],\</div><div class='add'>+				((u8 *)(gid))[14],\</div><div class='add'>+				((u8 *)(gid))[15]</div><div class='add'>+</div><div class='add'>+#define IPOIB_GID_ARG(gid)	IPOIB_GID_RAW_ARG((gid).raw)</div><div class='ctx'> </div><div class='ctx'> #endif /* _IPOIB_H */</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c<br/>index a54da42849ae..5033666b1481 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_ib.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_ib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/ipoib/ipoib_ib.c</a></div><div class='hunk'>@@ -84,15 +84,9 @@ void ipoib_free_ah(struct kref *kref)</div><div class='ctx'> </div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((int) priv-&gt;tx_tail - (int) ah-&gt;last_send &gt;= 0) {</div><div class='del'>-		ipoib_dbg(priv, "Freeing ah %p\n", ah-&gt;ah);</div><div class='del'>-		ib_destroy_ah(ah-&gt;ah);</div><div class='del'>-		kfree(ah);</div><div class='del'>-	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-		list_add_tail(&amp;ah-&gt;list, &amp;priv-&gt;dead_ahs);</div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-	}</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	list_add_tail(&amp;ah-&gt;list, &amp;priv-&gt;dead_ahs);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipoib_ib_post_receive(struct net_device *dev, int id)</div><div class='hunk'>@@ -275,6 +269,7 @@ static void ipoib_ib_handle_wc(struct net_device *dev,</div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 		++priv-&gt;tx_tail;</div><div class='ctx'> 		if (netif_queue_stopped(dev) &amp;&amp;</div><div class='add'>+		    test_bit(IPOIB_FLAG_ADMIN_UP, &amp;priv-&gt;flags) &amp;&amp;</div><div class='ctx'> 		    priv-&gt;tx_head - priv-&gt;tx_tail &lt;= ipoib_sendq_size &gt;&gt; 1)</div><div class='ctx'> 			netif_wake_queue(dev);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='hunk'>@@ -376,19 +371,16 @@ static void __ipoib_reap_ah(struct net_device *dev)</div><div class='ctx'> 	struct ipoib_ah *ah, *tah;</div><div class='ctx'> 	LIST_HEAD(remove_list);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='add'>+	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> 	list_for_each_entry_safe(ah, tah, &amp;priv-&gt;dead_ahs, list)</div><div class='ctx'> 		if ((int) priv-&gt;tx_tail - (int) ah-&gt;last_send &gt;= 0) {</div><div class='ctx'> 			list_del(&amp;ah-&gt;list);</div><div class='del'>-			list_add_tail(&amp;ah-&gt;list, &amp;remove_list);</div><div class='add'>+			ib_destroy_ah(ah-&gt;ah);</div><div class='add'>+			kfree(ah);</div><div class='ctx'> 		}</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='del'>-</div><div class='del'>-	list_for_each_entry_safe(ah, tah, &amp;remove_list, list) {</div><div class='del'>-		ipoib_dbg(priv, "Reaping ah %p\n", ah-&gt;ah);</div><div class='del'>-		ib_destroy_ah(ah-&gt;ah);</div><div class='del'>-		kfree(ah);</div><div class='del'>-	}</div><div class='add'>+	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ipoib_reap_ah(void *dev_ptr)</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c<br/>index cb078a7d0bf5..1c6ea1c682a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/ipoib/ipoib_main.c</a></div><div class='hunk'>@@ -185,8 +185,7 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipoib_path *__path_find(struct net_device *dev,</div><div class='del'>-				      union ib_gid *gid)</div><div class='add'>+static struct ipoib_path *__path_find(struct net_device *dev, void *gid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct rb_node *n = priv-&gt;path_tree.rb_node;</div><div class='hunk'>@@ -196,7 +195,7 @@ static struct ipoib_path *__path_find(struct net_device *dev,</div><div class='ctx'> 	while (n) {</div><div class='ctx'> 		path = rb_entry(n, struct ipoib_path, rb_node);</div><div class='ctx'> </div><div class='del'>-		ret = memcmp(gid-&gt;raw, path-&gt;pathrec.dgid.raw,</div><div class='add'>+		ret = memcmp(gid, path-&gt;pathrec.dgid.raw,</div><div class='ctx'> 			     sizeof (union ib_gid));</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0)</div><div class='hunk'>@@ -424,8 +423,7 @@ static void path_rec_completion(int status,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipoib_path *path_rec_create(struct net_device *dev,</div><div class='del'>-					  union ib_gid *gid)</div><div class='add'>+static struct ipoib_path *path_rec_create(struct net_device *dev, void *gid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_path *path;</div><div class='hunk'>@@ -440,7 +438,7 @@ static struct ipoib_path *path_rec_create(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;path-&gt;neigh_list);</div><div class='ctx'> </div><div class='del'>-	memcpy(path-&gt;pathrec.dgid.raw, gid-&gt;raw, sizeof (union ib_gid));</div><div class='add'>+	memcpy(path-&gt;pathrec.dgid.raw, gid, sizeof (union ib_gid));</div><div class='ctx'> 	path-&gt;pathrec.sgid      = priv-&gt;local_gid;</div><div class='ctx'> 	path-&gt;pathrec.pkey      = cpu_to_be16(priv-&gt;pkey);</div><div class='ctx'> 	path-&gt;pathrec.numb_path = 1;</div><div class='hunk'>@@ -498,10 +496,9 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	path = __path_find(dev, (union ib_gid *) (skb-&gt;dst-&gt;neighbour-&gt;ha + 4));</div><div class='add'>+	path = __path_find(dev, skb-&gt;dst-&gt;neighbour-&gt;ha + 4);</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		path = path_rec_create(dev,</div><div class='del'>-				       (union ib_gid *) (skb-&gt;dst-&gt;neighbour-&gt;ha + 4));</div><div class='add'>+		path = path_rec_create(dev, skb-&gt;dst-&gt;neighbour-&gt;ha + 4);</div><div class='ctx'> 		if (!path)</div><div class='ctx'> 			goto err_path;</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +548,7 @@ static void ipoib_path_lookup(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Add in the P_Key for multicasts */</div><div class='ctx'> 	skb-&gt;dst-&gt;neighbour-&gt;ha[8] = (priv-&gt;pkey &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	skb-&gt;dst-&gt;neighbour-&gt;ha[9] = priv-&gt;pkey &amp; 0xff;</div><div class='del'>-	ipoib_mcast_send(dev, (union ib_gid *) (skb-&gt;dst-&gt;neighbour-&gt;ha + 4), skb);</div><div class='add'>+	ipoib_mcast_send(dev, skb-&gt;dst-&gt;neighbour-&gt;ha + 4, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,</div><div class='hunk'>@@ -566,10 +563,9 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	path = __path_find(dev, (union ib_gid *) (phdr-&gt;hwaddr + 4));</div><div class='add'>+	path = __path_find(dev, phdr-&gt;hwaddr + 4);</div><div class='ctx'> 	if (!path) {</div><div class='del'>-		path = path_rec_create(dev,</div><div class='del'>-				       (union ib_gid *) (phdr-&gt;hwaddr + 4));</div><div class='add'>+		path = path_rec_create(dev, phdr-&gt;hwaddr + 4);</div><div class='ctx'> 		if (path) {</div><div class='ctx'> 			/* put pseudoheader back on for next time */</div><div class='ctx'> 			skb_push(skb, sizeof *phdr);</div><div class='hunk'>@@ -660,7 +656,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			phdr-&gt;hwaddr[8] = (priv-&gt;pkey &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 			phdr-&gt;hwaddr[9] = priv-&gt;pkey &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-			ipoib_mcast_send(dev, (union ib_gid *) (phdr-&gt;hwaddr + 4), skb);</div><div class='add'>+			ipoib_mcast_send(dev, phdr-&gt;hwaddr + 4, skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* unicast GID -- should be ARP or RARP reply */</div><div class='ctx'> </div><div class='hunk'>@@ -671,7 +667,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 					   skb-&gt;dst ? "neigh" : "dst",</div><div class='ctx'> 					   be16_to_cpup((__be16 *) skb-&gt;data),</div><div class='ctx'> 					   be32_to_cpup((__be32 *) phdr-&gt;hwaddr),</div><div class='del'>-					   IPOIB_GID_ARG(*(union ib_gid *) (phdr-&gt;hwaddr + 4)));</div><div class='add'>+					   IPOIB_GID_RAW_ARG(phdr-&gt;hwaddr + 4));</div><div class='ctx'> 				dev_kfree_skb_any(skb);</div><div class='ctx'> 				++priv-&gt;stats.tx_dropped;</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -754,7 +750,7 @@ static void ipoib_neigh_destructor(struct neighbour *n)</div><div class='ctx'> 	ipoib_dbg(priv,</div><div class='ctx'> 		  "neigh_destructor for %06x " IPOIB_GID_FMT "\n",</div><div class='ctx'> 		  be32_to_cpup((__be32 *) n-&gt;ha),</div><div class='del'>-		  IPOIB_GID_ARG(*((union ib_gid *) (n-&gt;ha + 4))));</div><div class='add'>+		  IPOIB_GID_RAW_ARG(n-&gt;ha + 4));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c<br/>index 1dae4b238252..ab40488182b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_multicast.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/ipoib/ipoib_multicast.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev,</div><div class='ctx'> 	return mcast;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, union ib_gid *mgid)</div><div class='add'>+static struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, void *mgid)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct rb_node *n = priv-&gt;multicast_tree.rb_node;</div><div class='hunk'>@@ -165,7 +165,7 @@ static struct ipoib_mcast *__ipoib_mcast_find(struct net_device *dev, union ib_g</div><div class='ctx'> </div><div class='ctx'> 		mcast = rb_entry(n, struct ipoib_mcast, rb_node);</div><div class='ctx'> </div><div class='del'>-		ret = memcmp(mgid-&gt;raw, mcast-&gt;mcmember.mgid.raw,</div><div class='add'>+		ret = memcmp(mgid, mcast-&gt;mcmember.mgid.raw,</div><div class='ctx'> 			     sizeof (union ib_gid));</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			n = n-&gt;rb_left;</div><div class='hunk'>@@ -694,8 +694,7 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid,</div><div class='del'>-		      struct sk_buff *skb)</div><div class='add'>+void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipoib_dev_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct ipoib_mcast *mcast;</div><div class='hunk'>@@ -718,7 +717,7 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid,</div><div class='ctx'> 	if (!mcast) {</div><div class='ctx'> 		/* Let's create a new send only group now */</div><div class='ctx'> 		ipoib_dbg_mcast(priv, "setting up send only multicast group for "</div><div class='del'>-				IPOIB_GID_FMT "\n", IPOIB_GID_ARG(*mgid));</div><div class='add'>+				IPOIB_GID_FMT "\n", IPOIB_GID_RAW_ARG(mgid));</div><div class='ctx'> </div><div class='ctx'> 		mcast = ipoib_mcast_alloc(dev, 0);</div><div class='ctx'> 		if (!mcast) {</div><div class='hunk'>@@ -730,7 +729,7 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		set_bit(IPOIB_MCAST_FLAG_SENDONLY, &amp;mcast-&gt;flags);</div><div class='del'>-		mcast-&gt;mcmember.mgid = *mgid;</div><div class='add'>+		memcpy(mcast-&gt;mcmember.mgid.raw, mgid, sizeof (union ib_gid));</div><div class='ctx'> 		__ipoib_mcast_add(dev, mcast);</div><div class='ctx'> 		list_add_tail(&amp;mcast-&gt;list, &amp;priv-&gt;multicast_list);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -821,7 +820,8 @@ void ipoib_mcast_restart_task(void *dev_ptr)</div><div class='ctx'> </div><div class='ctx'> 	ipoib_mcast_stop_thread(dev, 0);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;xmit_lock, flags);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	netif_tx_lock(dev);</div><div class='ctx'> 	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -864,8 +864,7 @@ void ipoib_mcast_restart_task(void *dev_ptr)</div><div class='ctx'> </div><div class='ctx'> 			if (mcast) {</div><div class='ctx'> 				/* Destroy the send only entry */</div><div class='del'>-				list_del(&amp;mcast-&gt;list);</div><div class='del'>-				list_add_tail(&amp;mcast-&gt;list, &amp;remove_list);</div><div class='add'>+				list_move_tail(&amp;mcast-&gt;list, &amp;remove_list);</div><div class='ctx'> </div><div class='ctx'> 				rb_replace_node(&amp;mcast-&gt;rb_node,</div><div class='ctx'> 						&amp;nmcast-&gt;rb_node,</div><div class='hunk'>@@ -890,13 +889,13 @@ void ipoib_mcast_restart_task(void *dev_ptr)</div><div class='ctx'> 			rb_erase(&amp;mcast-&gt;rb_node, &amp;priv-&gt;multicast_tree);</div><div class='ctx'> </div><div class='ctx'> 			/* Move to the remove list */</div><div class='del'>-			list_del(&amp;mcast-&gt;list);</div><div class='del'>-			list_add_tail(&amp;mcast-&gt;list, &amp;remove_list);</div><div class='add'>+			list_move_tail(&amp;mcast-&gt;list, &amp;remove_list);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;xmit_lock, flags);</div><div class='add'>+	netif_tx_unlock(dev);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 	/* We have to cancel outside of the spinlock */</div><div class='ctx'> 	list_for_each_entry_safe(mcast, tmcast, &amp;remove_list, list) {</div><div class='head'>diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c<br/>index 1d49d1643c59..7b717c648f72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_verbs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/ipoib/ipoib_verbs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/ipoib/ipoib_verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/ipoib/ipoib_verbs.c</a></div><div class='hunk'>@@ -255,7 +255,8 @@ void ipoib_event(struct ib_event_handler *handler,</div><div class='ctx'> 	    record-&gt;event == IB_EVENT_PKEY_CHANGE ||</div><div class='ctx'> 	    record-&gt;event == IB_EVENT_PORT_ACTIVE ||</div><div class='ctx'> 	    record-&gt;event == IB_EVENT_LID_CHANGE  ||</div><div class='del'>-	    record-&gt;event == IB_EVENT_SM_CHANGE) {</div><div class='add'>+	    record-&gt;event == IB_EVENT_SM_CHANGE   ||</div><div class='add'>+	    record-&gt;event == IB_EVENT_CLIENT_REREGISTER) {</div><div class='ctx'> 		ipoib_dbg(priv, "Port state change event\n");</div><div class='ctx'> 		queue_work(ipoib_workqueue, &amp;priv-&gt;flush_task);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig<br/>new file mode 100644<br/>index 000000000000..fead87d1eff9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+config INFINIBAND_ISER</div><div class='add'>+	tristate "ISCSI RDMA Protocol"</div><div class='add'>+	depends on INFINIBAND &amp;&amp; SCSI</div><div class='add'>+	select SCSI_ISCSI_ATTRS</div><div class='add'>+	---help---</div><div class='add'>+	  Support for the ISCSI RDMA Protocol over InfiniBand.  This</div><div class='add'>+	  allows you to access storage devices that speak ISER/ISCSI</div><div class='add'>+	  over InfiniBand.</div><div class='add'>+</div><div class='add'>+	  The ISER protocol is defined by IETF.</div><div class='add'>+	  See &lt;http://www.ietf.org/&gt;.</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/Makefile b/drivers/infiniband/ulp/iser/Makefile<br/>new file mode 100644<br/>index 000000000000..fe6cd15f2317<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+obj-$(CONFIG_INFINIBAND_ISER)	+= ib_iser.o</div><div class='add'>+</div><div class='add'>+ib_iser-y			:= iser_verbs.o iser_initiator.o iser_memory.o \</div><div class='add'>+				   iscsi_iser.o</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c<br/>new file mode 100644<br/>index 000000000000..34b0da5cfa0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iscsi_iser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/iscsi_iser.c</a></div><div class='hunk'>@@ -0,0 +1,685 @@</div><div class='add'>+/*</div><div class='add'>+ * iSCSI Initiator over iSER Data-Path</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Dmitry Yusupov</div><div class='add'>+ * Copyright (C) 2004 Alex Aizman</div><div class='add'>+ * Copyright (C) 2005 Mike Christie</div><div class='add'>+ * Copyright (c) 2005, 2006 Voltaire, Inc. All rights reserved.</div><div class='add'>+ * maintained by openib-general@openib.org</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions of source code must retain the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions in binary form must reproduce the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer in the documentation and/or other materials</div><div class='add'>+ *	  provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Credits:</div><div class='add'>+ *	Christoph Hellwig</div><div class='add'>+ *	FUJITA Tomonori</div><div class='add'>+ *	Arne Redlich</div><div class='add'>+ *	Zhenyu Wang</div><div class='add'>+ * Modified by:</div><div class='add'>+ *      Erez Zilber</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * $Id: iscsi_iser.c 6965 2006-05-07 11:36:20Z ogerlitz $</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/hardirq.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='add'>+#include &lt;linux/blkdev.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+#include &lt;linux/cdev.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/sock.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_device.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_eh.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_tcq.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+#include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_transport_iscsi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iscsi_iser.h"</div><div class='add'>+</div><div class='add'>+static unsigned int iscsi_max_lun = 512;</div><div class='add'>+module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);</div><div class='add'>+</div><div class='add'>+int iser_debug_level = 0;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("iSER (iSCSI Extensions for RDMA) Datamover "</div><div class='add'>+		   "v" DRV_VER " (" DRV_DATE ")");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_AUTHOR("Alex Nezhinsky, Dan Bar Dov, Or Gerlitz");</div><div class='add'>+</div><div class='add'>+module_param_named(debug_level, iser_debug_level, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug_level, "Enable debug tracing if &gt; 0 (default:disabled)");</div><div class='add'>+</div><div class='add'>+struct iser_global ig;</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+iscsi_iser_recv(struct iscsi_conn *conn,</div><div class='add'>+		struct iscsi_hdr *hdr, char *rx_data, int rx_data_len)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	uint32_t ret_itt;</div><div class='add'>+	int datalen;</div><div class='add'>+	int ahslen;</div><div class='add'>+</div><div class='add'>+	/* verify PDU length */</div><div class='add'>+	datalen = ntoh24(hdr-&gt;dlength);</div><div class='add'>+	if (datalen != rx_data_len) {</div><div class='add'>+		printk(KERN_ERR "iscsi_iser: datalen %d (hdr) != %d (IB) \n",</div><div class='add'>+		       datalen, rx_data_len);</div><div class='add'>+		rc = ISCSI_ERR_DATALEN;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read AHS */</div><div class='add'>+	ahslen = hdr-&gt;hlength * 4;</div><div class='add'>+</div><div class='add'>+	/* verify itt (itt encoding: age+cid+itt) */</div><div class='add'>+	rc = iscsi_verify_itt(conn, hdr, &amp;ret_itt);</div><div class='add'>+</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = iscsi_complete_pdu(conn, hdr, rx_data, rx_data_len);</div><div class='add'>+</div><div class='add'>+	if (rc &amp;&amp; rc != ISCSI_ERR_NO_SCSI_CMD)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+error:</div><div class='add'>+	iscsi_conn_failure(conn, rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_iser_cmd_init - Initialize iSCSI SCSI_READ or SCSI_WRITE commands</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+static void</div><div class='add'>+iscsi_iser_cmd_init(struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn     *iser_conn  = ctask-&gt;conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct scsi_cmnd  *sc = ctask-&gt;sc;</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;command_sent = 0;</div><div class='add'>+	iser_ctask-&gt;iser_conn    = iser_conn;</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='add'>+		BUG_ON(ctask-&gt;total_length == 0);</div><div class='add'>+		/* bytes to be sent via RDMA operations */</div><div class='add'>+		iser_ctask-&gt;rdma_data_count = ctask-&gt;total_length -</div><div class='add'>+					 ctask-&gt;imm_count -</div><div class='add'>+					 ctask-&gt;unsol_count;</div><div class='add'>+</div><div class='add'>+		debug_scsi("cmd [itt %x total %d imm %d unsol_data %d "</div><div class='add'>+			   "rdma_data %d]\n",</div><div class='add'>+			   ctask-&gt;itt, ctask-&gt;total_length, ctask-&gt;imm_count,</div><div class='add'>+			   ctask-&gt;unsol_count, iser_ctask-&gt;rdma_data_count);</div><div class='add'>+	} else</div><div class='add'>+		/* bytes to be sent via RDMA operations */</div><div class='add'>+		iser_ctask-&gt;rdma_data_count = ctask-&gt;total_length;</div><div class='add'>+</div><div class='add'>+	iser_ctask_rdma_init(iser_ctask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_mtask_xmit - xmit management(immediate) task</div><div class='add'>+ * @conn: iscsi connection</div><div class='add'>+ * @mtask: task management task</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *	The function can return -EAGAIN in which case caller must</div><div class='add'>+ *	call it again later, or recover. '0' return code means successful</div><div class='add'>+ *	xmit.</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_mtask_xmit(struct iscsi_conn *conn,</div><div class='add'>+		      struct iscsi_mgmt_task *mtask)</div><div class='add'>+{</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	debug_scsi("mtask deq [cid %d itt 0x%x]\n", conn-&gt;id, mtask-&gt;itt);</div><div class='add'>+</div><div class='add'>+	error = iser_send_control(conn, mtask);</div><div class='add'>+</div><div class='add'>+	/* since iser xmits control with zero copy, mtasks can not be recycled</div><div class='add'>+	 * right after sending them.</div><div class='add'>+	 * The recycling scheme is based on whether a response is expected</div><div class='add'>+	 * - if yes, the mtask is recycled at iscsi_complete_pdu</div><div class='add'>+	 * - if no,  the mtask is recycled at iser_snd_completion</div><div class='add'>+	 */</div><div class='add'>+	if (error &amp;&amp; error != -EAGAIN)</div><div class='add'>+		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_ctask_xmit_unsol_data(struct iscsi_conn *conn,</div><div class='add'>+				 struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_data  hdr;</div><div class='add'>+	int error = 0;</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	/* Send data-out PDUs while there's still unsolicited data to send */</div><div class='add'>+	while (ctask-&gt;unsol_count &gt; 0) {</div><div class='add'>+		iscsi_prep_unsolicit_data_pdu(ctask, &amp;hdr,</div><div class='add'>+					      iser_ctask-&gt;rdma_data_count);</div><div class='add'>+</div><div class='add'>+		debug_scsi("Sending data-out: itt 0x%x, data count %d\n",</div><div class='add'>+			   hdr.itt, ctask-&gt;data_count);</div><div class='add'>+</div><div class='add'>+		/* the buffer description has been passed with the command */</div><div class='add'>+		/* Send the command */</div><div class='add'>+		error = iser_send_data_out(conn, ctask, &amp;hdr);</div><div class='add'>+		if (error) {</div><div class='add'>+			ctask-&gt;unsol_datasn--;</div><div class='add'>+			goto iscsi_iser_ctask_xmit_unsol_data_exit;</div><div class='add'>+		}</div><div class='add'>+		ctask-&gt;unsol_count -= ctask-&gt;data_count;</div><div class='add'>+		debug_scsi("Need to send %d more as data-out PDUs\n",</div><div class='add'>+			   ctask-&gt;unsol_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+iscsi_iser_ctask_xmit_unsol_data_exit:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_ctask_xmit(struct iscsi_conn *conn,</div><div class='add'>+		      struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	debug_scsi("ctask deq [cid %d itt 0x%x]\n",</div><div class='add'>+		   conn-&gt;id, ctask-&gt;itt);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * serialize with TMF AbortTask</div><div class='add'>+	 */</div><div class='add'>+	if (ctask-&gt;mtask)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	/* Send the cmd PDU */</div><div class='add'>+	if (!iser_ctask-&gt;command_sent) {</div><div class='add'>+		error = iser_send_command(conn, ctask);</div><div class='add'>+		if (error)</div><div class='add'>+			goto iscsi_iser_ctask_xmit_exit;</div><div class='add'>+		iser_ctask-&gt;command_sent = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Send unsolicited data-out PDU(s) if necessary */</div><div class='add'>+	if (ctask-&gt;unsol_count)</div><div class='add'>+		error = iscsi_iser_ctask_xmit_unsol_data(conn, ctask);</div><div class='add'>+</div><div class='add'>+ iscsi_iser_ctask_xmit_exit:</div><div class='add'>+	if (error &amp;&amp; error != -EAGAIN)</div><div class='add'>+		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iscsi_iser_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	if (iser_ctask-&gt;status == ISER_TASK_STATUS_STARTED) {</div><div class='add'>+		iser_ctask-&gt;status = ISER_TASK_STATUS_COMPLETED;</div><div class='add'>+		iser_ctask_rdma_finalize(iser_ctask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iser_conn *</div><div class='add'>+iscsi_iser_ib_conn_lookup(__u64 ep_handle)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+	struct iser_conn *uib_conn = (struct iser_conn *)(unsigned long)ep_handle;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ig.connlist_mutex);</div><div class='add'>+	list_for_each_entry(ib_conn, &amp;ig.connlist, conn_list) {</div><div class='add'>+		if (ib_conn == uib_conn) {</div><div class='add'>+			mutex_unlock(&amp;ig.connlist_mutex);</div><div class='add'>+			return ib_conn;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ig.connlist_mutex);</div><div class='add'>+	iser_err("no conn exists for eph %llx\n",(unsigned long long)ep_handle);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct iscsi_cls_conn *</div><div class='add'>+iscsi_iser_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn;</div><div class='add'>+	struct iscsi_cls_conn *cls_conn;</div><div class='add'>+	struct iscsi_iser_conn *iser_conn;</div><div class='add'>+</div><div class='add'>+	cls_conn = iscsi_conn_setup(cls_session, conn_idx);</div><div class='add'>+	if (!cls_conn)</div><div class='add'>+		return NULL;</div><div class='add'>+	conn = cls_conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * due to issues with the login code re iser sematics</div><div class='add'>+	 * this not set in iscsi_conn_setup - FIXME</div><div class='add'>+	 */</div><div class='add'>+	conn-&gt;max_recv_dlength = 128;</div><div class='add'>+</div><div class='add'>+	iser_conn = kzalloc(sizeof(*iser_conn), GFP_KERNEL);</div><div class='add'>+	if (!iser_conn)</div><div class='add'>+		goto conn_alloc_fail;</div><div class='add'>+</div><div class='add'>+	/* currently this is the only field which need to be initiated */</div><div class='add'>+	rwlock_init(&amp;iser_conn-&gt;lock);</div><div class='add'>+</div><div class='add'>+	conn-&gt;dd_data = iser_conn;</div><div class='add'>+	iser_conn-&gt;iscsi_conn = conn;</div><div class='add'>+</div><div class='add'>+	return cls_conn;</div><div class='add'>+</div><div class='add'>+conn_alloc_fail:</div><div class='add'>+	iscsi_conn_teardown(cls_conn);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iscsi_iser_conn_destroy(struct iscsi_cls_conn *cls_conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	iscsi_conn_teardown(cls_conn);</div><div class='add'>+	kfree(iser_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_conn_bind(struct iscsi_cls_session *cls_session,</div><div class='add'>+		     struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,</div><div class='add'>+		     int is_leading)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_iser_conn *iser_conn;</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = iscsi_conn_bind(cls_session, cls_conn, is_leading);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	/* the transport ep handle comes from user space so it must be</div><div class='add'>+	 * verified against the global ib connections list */</div><div class='add'>+	ib_conn = iscsi_iser_ib_conn_lookup(transport_eph);</div><div class='add'>+	if (!ib_conn) {</div><div class='add'>+		iser_err("can't bind eph %llx\n",</div><div class='add'>+			 (unsigned long long)transport_eph);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* binds the iSER connection retrieved from the previously</div><div class='add'>+	 * connected ep_handle to the iSCSI layer connection. exchanges</div><div class='add'>+	 * connection pointers */</div><div class='add'>+	iser_err("binding iscsi conn %p to iser_conn %p\n",conn,ib_conn);</div><div class='add'>+	iser_conn = conn-&gt;dd_data;</div><div class='add'>+	ib_conn-&gt;iser_conn = iser_conn;</div><div class='add'>+	iser_conn-&gt;ib_conn  = ib_conn;</div><div class='add'>+</div><div class='add'>+	conn-&gt;recv_lock = &amp;iser_conn-&gt;lock;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_conn_start(struct iscsi_cls_conn *cls_conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = iscsi_conn_start(cls_conn);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return iser_conn_set_full_featured_mode(conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iscsi_iser_conn_terminate(struct iscsi_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iser_conn *ib_conn = iser_conn-&gt;ib_conn;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ib_conn);</div><div class='add'>+	/* starts conn teardown process, waits until all previously   *</div><div class='add'>+	 * posted buffers get flushed, deallocates all conn resources */</div><div class='add'>+	iser_conn_terminate(ib_conn);</div><div class='add'>+	iser_conn-&gt;ib_conn = NULL;</div><div class='add'>+	conn-&gt;recv_lock = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct iscsi_transport iscsi_iser_transport;</div><div class='add'>+</div><div class='add'>+static struct iscsi_cls_session *</div><div class='add'>+iscsi_iser_session_create(struct iscsi_transport *iscsit,</div><div class='add'>+			 struct scsi_transport_template *scsit,</div><div class='add'>+			  uint32_t initial_cmdsn, uint32_t *hostno)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cls_session *cls_session;</div><div class='add'>+	struct iscsi_session *session;</div><div class='add'>+	int i;</div><div class='add'>+	uint32_t hn;</div><div class='add'>+	struct iscsi_cmd_task  *ctask;</div><div class='add'>+	struct iscsi_mgmt_task *mtask;</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask;</div><div class='add'>+	struct iser_desc *desc;</div><div class='add'>+</div><div class='add'>+	cls_session = iscsi_session_setup(iscsit, scsit,</div><div class='add'>+					  sizeof(struct iscsi_iser_cmd_task),</div><div class='add'>+					  sizeof(struct iser_desc),</div><div class='add'>+					  initial_cmdsn, &amp;hn);</div><div class='add'>+	if (!cls_session)</div><div class='add'>+	return NULL;</div><div class='add'>+</div><div class='add'>+	*hostno = hn;</div><div class='add'>+	session = class_to_transport_session(cls_session);</div><div class='add'>+</div><div class='add'>+	/* libiscsi setup itts, data and pool so just set desc fields */</div><div class='add'>+	for (i = 0; i &lt; session-&gt;cmds_max; i++) {</div><div class='add'>+		ctask      = session-&gt;cmds[i];</div><div class='add'>+		iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+		ctask-&gt;hdr = (struct iscsi_cmd *)&amp;iser_ctask-&gt;desc.iscsi_header;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; session-&gt;mgmtpool_max; i++) {</div><div class='add'>+		mtask      = session-&gt;mgmt_cmds[i];</div><div class='add'>+		desc       = mtask-&gt;dd_data;</div><div class='add'>+		mtask-&gt;hdr = &amp;desc-&gt;iscsi_header;</div><div class='add'>+		desc-&gt;data = mtask-&gt;data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cls_session;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_set_param(struct iscsi_cls_conn *cls_conn,</div><div class='add'>+		     enum iscsi_param param, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	int value;</div><div class='add'>+</div><div class='add'>+	switch (param) {</div><div class='add'>+	case ISCSI_PARAM_MAX_RECV_DLENGTH:</div><div class='add'>+		/* TBD */</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_HDRDGST_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		if (value) {</div><div class='add'>+			printk(KERN_ERR "DataDigest wasn't negotiated to None");</div><div class='add'>+			return -EPROTO;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_DATADGST_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		if (value) {</div><div class='add'>+			printk(KERN_ERR "DataDigest wasn't negotiated to None");</div><div class='add'>+			return -EPROTO;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_IFMARKER_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		if (value) {</div><div class='add'>+			printk(KERN_ERR "IFMarker wasn't negotiated to No");</div><div class='add'>+			return -EPROTO;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_OFMARKER_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		if (value) {</div><div class='add'>+			printk(KERN_ERR "OFMarker wasn't negotiated to No");</div><div class='add'>+			return -EPROTO;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iscsi_iser_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	stats-&gt;txdata_octets = conn-&gt;txdata_octets;</div><div class='add'>+	stats-&gt;rxdata_octets = conn-&gt;rxdata_octets;</div><div class='add'>+	stats-&gt;scsicmd_pdus = conn-&gt;scsicmd_pdus_cnt;</div><div class='add'>+	stats-&gt;dataout_pdus = conn-&gt;dataout_pdus_cnt;</div><div class='add'>+	stats-&gt;scsirsp_pdus = conn-&gt;scsirsp_pdus_cnt;</div><div class='add'>+	stats-&gt;datain_pdus = conn-&gt;datain_pdus_cnt; /* always 0 */</div><div class='add'>+	stats-&gt;r2t_pdus = conn-&gt;r2t_pdus_cnt; /* always 0 */</div><div class='add'>+	stats-&gt;tmfcmd_pdus = conn-&gt;tmfcmd_pdus_cnt;</div><div class='add'>+	stats-&gt;tmfrsp_pdus = conn-&gt;tmfrsp_pdus_cnt;</div><div class='add'>+	stats-&gt;custom_length = 3;</div><div class='add'>+	strcpy(stats-&gt;custom[0].desc, "qp_tx_queue_full");</div><div class='add'>+	stats-&gt;custom[0].value = 0; /* TB iser_conn-&gt;qp_tx_queue_full; */</div><div class='add'>+	strcpy(stats-&gt;custom[1].desc, "fmr_map_not_avail");</div><div class='add'>+	stats-&gt;custom[1].value = 0; /* TB iser_conn-&gt;fmr_map_not_avail */;</div><div class='add'>+	strcpy(stats-&gt;custom[2].desc, "eh_abort_cnt");</div><div class='add'>+	stats-&gt;custom[2].value = conn-&gt;eh_abort_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_ep_connect(struct sockaddr *dst_addr, int non_blocking,</div><div class='add'>+		      __u64 *ep_handle)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+</div><div class='add'>+	err = iser_conn_init(&amp;ib_conn);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = iser_connect(ib_conn, NULL, (struct sockaddr_in *)dst_addr, non_blocking);</div><div class='add'>+	if (!err)</div><div class='add'>+		*ep_handle = (__u64)(unsigned long)ib_conn;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_iser_ep_poll(__u64 ep_handle, int timeout_ms)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn = iscsi_iser_ib_conn_lookup(ep_handle);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!ib_conn)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rc = wait_event_interruptible_timeout(ib_conn-&gt;wait,</div><div class='add'>+			     ib_conn-&gt;state == ISER_CONN_UP,</div><div class='add'>+			     msecs_to_jiffies(timeout_ms));</div><div class='add'>+</div><div class='add'>+	/* if conn establishment failed, return error code to iscsi */</div><div class='add'>+	if (!rc &amp;&amp;</div><div class='add'>+	    (ib_conn-&gt;state == ISER_CONN_TERMINATING ||</div><div class='add'>+	     ib_conn-&gt;state == ISER_CONN_DOWN))</div><div class='add'>+		rc = -1;</div><div class='add'>+</div><div class='add'>+	iser_err("ib conn %p rc = %d\n", ib_conn, rc);</div><div class='add'>+</div><div class='add'>+	if (rc &gt; 0)</div><div class='add'>+		return 1; /* success, this is the equivalent of POLLOUT */</div><div class='add'>+	else if (!rc)</div><div class='add'>+		return 0; /* timeout */</div><div class='add'>+	else</div><div class='add'>+		return rc; /* signal */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+iscsi_iser_ep_disconnect(__u64 ep_handle)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn = iscsi_iser_ib_conn_lookup(ep_handle);</div><div class='add'>+</div><div class='add'>+	if (!ib_conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	iser_err("ib conn %p state %d\n",ib_conn, ib_conn-&gt;state);</div><div class='add'>+</div><div class='add'>+	iser_conn_terminate(ib_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct scsi_host_template iscsi_iser_sht = {</div><div class='add'>+	.name                   = "iSCSI Initiator over iSER, v." DRV_VER,</div><div class='add'>+	.queuecommand           = iscsi_queuecommand,</div><div class='add'>+	.can_queue		= ISCSI_XMIT_CMDS_MAX - 1,</div><div class='add'>+	.sg_tablesize           = ISCSI_ISER_SG_TABLESIZE,</div><div class='add'>+	.cmd_per_lun            = ISCSI_MAX_CMD_PER_LUN,</div><div class='add'>+	.eh_abort_handler       = iscsi_eh_abort,</div><div class='add'>+	.eh_host_reset_handler	= iscsi_eh_host_reset,</div><div class='add'>+	.use_clustering         = DISABLE_CLUSTERING,</div><div class='add'>+	.proc_name              = "iscsi_iser",</div><div class='add'>+	.this_id                = -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct iscsi_transport iscsi_iser_transport = {</div><div class='add'>+	.owner                  = THIS_MODULE,</div><div class='add'>+	.name                   = "iser",</div><div class='add'>+	.caps                   = CAP_RECOVERY_L0 | CAP_MULTI_R2T,</div><div class='add'>+	.param_mask		= ISCSI_MAX_RECV_DLENGTH |</div><div class='add'>+				  ISCSI_MAX_XMIT_DLENGTH |</div><div class='add'>+				  ISCSI_HDRDGST_EN |</div><div class='add'>+				  ISCSI_DATADGST_EN |</div><div class='add'>+				  ISCSI_INITIAL_R2T_EN |</div><div class='add'>+				  ISCSI_MAX_R2T |</div><div class='add'>+				  ISCSI_IMM_DATA_EN |</div><div class='add'>+				  ISCSI_FIRST_BURST |</div><div class='add'>+				  ISCSI_MAX_BURST |</div><div class='add'>+				  ISCSI_PDU_INORDER_EN |</div><div class='add'>+				  ISCSI_DATASEQ_INORDER_EN |</div><div class='add'>+				  ISCSI_EXP_STATSN |</div><div class='add'>+				  ISCSI_PERSISTENT_PORT |</div><div class='add'>+				  ISCSI_PERSISTENT_ADDRESS |</div><div class='add'>+				  ISCSI_TARGET_NAME |</div><div class='add'>+				  ISCSI_TPGT,</div><div class='add'>+	.host_template          = &amp;iscsi_iser_sht,</div><div class='add'>+	.conndata_size		= sizeof(struct iscsi_conn),</div><div class='add'>+	.max_lun                = ISCSI_ISER_MAX_LUN,</div><div class='add'>+	.max_cmd_len            = ISCSI_ISER_MAX_CMD_LEN,</div><div class='add'>+	/* session management */</div><div class='add'>+	.create_session         = iscsi_iser_session_create,</div><div class='add'>+	.destroy_session        = iscsi_session_teardown,</div><div class='add'>+	/* connection management */</div><div class='add'>+	.create_conn            = iscsi_iser_conn_create,</div><div class='add'>+	.bind_conn              = iscsi_iser_conn_bind,</div><div class='add'>+	.destroy_conn           = iscsi_iser_conn_destroy,</div><div class='add'>+	.set_param              = iscsi_iser_set_param,</div><div class='add'>+	.get_conn_param		= iscsi_conn_get_param,</div><div class='add'>+	.get_session_param	= iscsi_session_get_param,</div><div class='add'>+	.start_conn             = iscsi_iser_conn_start,</div><div class='add'>+	.stop_conn              = iscsi_conn_stop,</div><div class='add'>+	/* these are called as part of conn recovery */</div><div class='add'>+	.suspend_conn_recv	= NULL, /* FIXME is/how this relvant to iser? */</div><div class='add'>+	.terminate_conn		= iscsi_iser_conn_terminate,</div><div class='add'>+	/* IO */</div><div class='add'>+	.send_pdu		= iscsi_conn_send_pdu,</div><div class='add'>+	.get_stats		= iscsi_iser_conn_get_stats,</div><div class='add'>+	.init_cmd_task		= iscsi_iser_cmd_init,</div><div class='add'>+	.xmit_cmd_task		= iscsi_iser_ctask_xmit,</div><div class='add'>+	.xmit_mgmt_task		= iscsi_iser_mtask_xmit,</div><div class='add'>+	.cleanup_cmd_task	= iscsi_iser_cleanup_ctask,</div><div class='add'>+	/* recovery */</div><div class='add'>+	.session_recovery_timedout = iscsi_session_recovery_timedout,</div><div class='add'>+</div><div class='add'>+	.ep_connect             = iscsi_iser_ep_connect,</div><div class='add'>+	.ep_poll                = iscsi_iser_ep_poll,</div><div class='add'>+	.ep_disconnect          = iscsi_iser_ep_disconnect</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init iser_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	iser_dbg("Starting iSER datamover...\n");</div><div class='add'>+</div><div class='add'>+	if (iscsi_max_lun &lt; 1) {</div><div class='add'>+		printk(KERN_ERR "Invalid max_lun value of %u\n", iscsi_max_lun);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iscsi_iser_transport.max_lun = iscsi_max_lun;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ig, 0, sizeof(struct iser_global));</div><div class='add'>+</div><div class='add'>+	ig.desc_cache = kmem_cache_create("iser_descriptors",</div><div class='add'>+					  sizeof (struct iser_desc),</div><div class='add'>+					  0, SLAB_HWCACHE_ALIGN,</div><div class='add'>+					  NULL, NULL);</div><div class='add'>+	if (ig.desc_cache == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* device init is called only after the first addr resolution */</div><div class='add'>+	mutex_init(&amp;ig.device_list_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ig.device_list);</div><div class='add'>+	mutex_init(&amp;ig.connlist_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ig.connlist);</div><div class='add'>+</div><div class='add'>+	if (!iscsi_register_transport(&amp;iscsi_iser_transport)) {</div><div class='add'>+		iser_err("iscsi_register_transport failed\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto register_transport_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+register_transport_failure:</div><div class='add'>+	kmem_cache_destroy(ig.desc_cache);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit iser_exit(void)</div><div class='add'>+{</div><div class='add'>+	iser_dbg("Removing iSER datamover...\n");</div><div class='add'>+	iscsi_unregister_transport(&amp;iscsi_iser_transport);</div><div class='add'>+	kmem_cache_destroy(ig.desc_cache);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(iser_init);</div><div class='add'>+module_exit(iser_exit);</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h<br/>new file mode 100644<br/>index 000000000000..3350ba690cfe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iscsi_iser.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/iscsi_iser.h</a></div><div class='hunk'>@@ -0,0 +1,354 @@</div><div class='add'>+/*</div><div class='add'>+ * iSER transport for the Open iSCSI Initiator &amp; iSER transport internals</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Dmitry Yusupov</div><div class='add'>+ * Copyright (C) 2004 Alex Aizman</div><div class='add'>+ * Copyright (C) 2005 Mike Christie</div><div class='add'>+ * based on code maintained by open-iscsi@googlegroups.com</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004, 2005, 2006 Voltaire, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions of source code must retain the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions in binary form must reproduce the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer in the documentation and/or other materials</div><div class='add'>+ *	  provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * $Id: iscsi_iser.h 7051 2006-05-10 12:29:11Z ogerlitz $</div><div class='add'>+ */</div><div class='add'>+#ifndef __ISCSI_ISER_H__</div><div class='add'>+#define __ISCSI_ISER_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;scsi/libiscsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_transport_iscsi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/mempool.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/in6.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;rdma/ib_verbs.h&gt;</div><div class='add'>+#include &lt;rdma/ib_fmr_pool.h&gt;</div><div class='add'>+#include &lt;rdma/rdma_cm.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"iser"</div><div class='add'>+#define PFX		DRV_NAME ": "</div><div class='add'>+#define DRV_VER		"0.1"</div><div class='add'>+#define DRV_DATE	"May 7th, 2006"</div><div class='add'>+</div><div class='add'>+#define iser_dbg(fmt, arg...)				\</div><div class='add'>+	do {						\</div><div class='add'>+		if (iser_debug_level &gt; 0)		\</div><div class='add'>+			printk(KERN_DEBUG PFX "%s:" fmt,\</div><div class='add'>+				__func__ , ## arg);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define iser_err(fmt, arg...)				\</div><div class='add'>+	do {						\</div><div class='add'>+		printk(KERN_ERR PFX "%s:" fmt,          \</div><div class='add'>+		       __func__ , ## arg);		\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+					/* support upto 512KB in one RDMA */</div><div class='add'>+#define ISCSI_ISER_SG_TABLESIZE         (0x80000 &gt;&gt; PAGE_SHIFT)</div><div class='add'>+#define ISCSI_ISER_MAX_LUN		256</div><div class='add'>+#define ISCSI_ISER_MAX_CMD_LEN		16</div><div class='add'>+</div><div class='add'>+/* QP settings */</div><div class='add'>+/* Maximal bounds on received asynchronous PDUs */</div><div class='add'>+#define ISER_MAX_RX_MISC_PDUS		4 /* NOOP_IN(2) , ASYNC_EVENT(2)   */</div><div class='add'>+</div><div class='add'>+#define ISER_MAX_TX_MISC_PDUS		6 /* NOOP_OUT(2), TEXT(1),         *</div><div class='add'>+					   * SCSI_TMFUNC(2), LOGOUT(1) */</div><div class='add'>+</div><div class='add'>+#define ISER_QP_MAX_RECV_DTOS		(ISCSI_XMIT_CMDS_MAX + \</div><div class='add'>+					ISER_MAX_RX_MISC_PDUS    +  \</div><div class='add'>+					ISER_MAX_TX_MISC_PDUS)</div><div class='add'>+</div><div class='add'>+/* the max TX (send) WR supported by the iSER QP is defined by                 *</div><div class='add'>+ * max_send_wr = T * (1 + D) + C ; D is how many inflight dataouts we expect   *</div><div class='add'>+ * to have at max for SCSI command. The tx posting &amp; completion handling code  *</div><div class='add'>+ * supports -EAGAIN scheme where tx is suspended till the QP has room for more *</div><div class='add'>+ * send WR. D=8 comes from 64K/8K                                              */</div><div class='add'>+</div><div class='add'>+#define ISER_INFLIGHT_DATAOUTS		8</div><div class='add'>+</div><div class='add'>+#define ISER_QP_MAX_REQ_DTOS		(ISCSI_XMIT_CMDS_MAX *    \</div><div class='add'>+					(1 + ISER_INFLIGHT_DATAOUTS) + \</div><div class='add'>+					ISER_MAX_TX_MISC_PDUS        + \</div><div class='add'>+					ISER_MAX_RX_MISC_PDUS)</div><div class='add'>+</div><div class='add'>+#define ISER_VER			0x10</div><div class='add'>+#define ISER_WSV			0x08</div><div class='add'>+#define ISER_RSV			0x04</div><div class='add'>+</div><div class='add'>+struct iser_hdr {</div><div class='add'>+	u8      flags;</div><div class='add'>+	u8      rsvd[3];</div><div class='add'>+	__be32  write_stag; /* write rkey */</div><div class='add'>+	__be64  write_va;</div><div class='add'>+	__be32  read_stag;  /* read rkey */</div><div class='add'>+	__be64  read_va;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Length of an object name string */</div><div class='add'>+#define ISER_OBJECT_NAME_SIZE		    64</div><div class='add'>+</div><div class='add'>+enum iser_ib_conn_state {</div><div class='add'>+	ISER_CONN_INIT,		   /* descriptor allocd, no conn          */</div><div class='add'>+	ISER_CONN_PENDING,	   /* in the process of being established */</div><div class='add'>+	ISER_CONN_UP,		   /* up and running                      */</div><div class='add'>+	ISER_CONN_TERMINATING,	   /* in the process of being terminated  */</div><div class='add'>+	ISER_CONN_DOWN,		   /* shut down                           */</div><div class='add'>+	ISER_CONN_STATES_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iser_task_status {</div><div class='add'>+	ISER_TASK_STATUS_INIT = 0,</div><div class='add'>+	ISER_TASK_STATUS_STARTED,</div><div class='add'>+	ISER_TASK_STATUS_COMPLETED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iser_data_dir {</div><div class='add'>+	ISER_DIR_IN = 0,	   /* to initiator */</div><div class='add'>+	ISER_DIR_OUT,		   /* from initiator */</div><div class='add'>+	ISER_DIRS_NUM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_data_buf {</div><div class='add'>+	void               *buf;      /* pointer to the sg list               */</div><div class='add'>+	unsigned int       size;      /* num entries of this sg               */</div><div class='add'>+	unsigned long      data_len;  /* total data len                       */</div><div class='add'>+	unsigned int       dma_nents; /* returned by dma_map_sg               */</div><div class='add'>+	char       	   *copy_buf; /* allocated copy buf for SGs unaligned *</div><div class='add'>+	                               * for rdma which are copied            */</div><div class='add'>+	struct scatterlist sg_single; /* SG-ified clone of a non SG SC or     *</div><div class='add'>+				       * unaligned SG                         */</div><div class='add'>+  };</div><div class='add'>+</div><div class='add'>+/* fwd declarations */</div><div class='add'>+struct iser_device;</div><div class='add'>+struct iscsi_iser_conn;</div><div class='add'>+struct iscsi_iser_cmd_task;</div><div class='add'>+</div><div class='add'>+struct iser_mem_reg {</div><div class='add'>+	u32  lkey;</div><div class='add'>+	u32  rkey;</div><div class='add'>+	u64  va;</div><div class='add'>+	u64  len;</div><div class='add'>+	void *mem_h;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_regd_buf {</div><div class='add'>+	struct iser_mem_reg     reg;        /* memory registration info        */</div><div class='add'>+	void                    *virt_addr;</div><div class='add'>+	struct iser_device      *device;    /* device-&gt;device for dma_unmap    */</div><div class='add'>+	dma_addr_t              dma_addr;   /* if non zero, addr for dma_unmap */</div><div class='add'>+	enum dma_data_direction direction;  /* direction for dma_unmap	       */</div><div class='add'>+	unsigned int            data_size;</div><div class='add'>+	atomic_t                ref_count;  /* refcount, freed when dec to 0   */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_REGD_BUF_VECTOR_LEN	2</div><div class='add'>+</div><div class='add'>+struct iser_dto {</div><div class='add'>+	struct iscsi_iser_cmd_task *ctask;</div><div class='add'>+	struct iscsi_iser_conn     *conn;</div><div class='add'>+	int                        notify_enable;</div><div class='add'>+</div><div class='add'>+	/* vector of registered buffers */</div><div class='add'>+	unsigned int               regd_vector_len;</div><div class='add'>+	struct iser_regd_buf       *regd[MAX_REGD_BUF_VECTOR_LEN];</div><div class='add'>+</div><div class='add'>+	/* offset into the registered buffer may be specified */</div><div class='add'>+	unsigned int               offset[MAX_REGD_BUF_VECTOR_LEN];</div><div class='add'>+</div><div class='add'>+	/* a smaller size may be specified, if 0, then full size is used */</div><div class='add'>+	unsigned int               used_sz[MAX_REGD_BUF_VECTOR_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum iser_desc_type {</div><div class='add'>+	ISCSI_RX,</div><div class='add'>+	ISCSI_TX_CONTROL ,</div><div class='add'>+	ISCSI_TX_SCSI_COMMAND,</div><div class='add'>+	ISCSI_TX_DATAOUT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_desc {</div><div class='add'>+	struct iser_hdr              iser_header;</div><div class='add'>+	struct iscsi_hdr             iscsi_header;</div><div class='add'>+	struct iser_regd_buf         hdr_regd_buf;</div><div class='add'>+	void                         *data;         /* used by RX &amp; TX_CONTROL */</div><div class='add'>+	struct iser_regd_buf         data_regd_buf; /* used by RX &amp; TX_CONTROL */</div><div class='add'>+	enum   iser_desc_type        type;</div><div class='add'>+	struct iser_dto              dto;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_device {</div><div class='add'>+	struct ib_device             *ib_device;</div><div class='add'>+	struct ib_pd	             *pd;</div><div class='add'>+	struct ib_cq	             *cq;</div><div class='add'>+	struct ib_mr	             *mr;</div><div class='add'>+	struct tasklet_struct	     cq_tasklet;</div><div class='add'>+	struct list_head             ig_list; /* entry in ig devices list */</div><div class='add'>+	int                          refcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_conn {</div><div class='add'>+	struct iscsi_iser_conn       *iser_conn; /* iser conn for upcalls  */</div><div class='add'>+	enum iser_ib_conn_state	     state;	    /* rdma connection state   */</div><div class='add'>+	spinlock_t		     lock;	    /* used for state changes  */</div><div class='add'>+	struct iser_device           *device;       /* device context          */</div><div class='add'>+	struct rdma_cm_id            *cma_id;       /* CMA ID		       */</div><div class='add'>+	struct ib_qp	             *qp;           /* QP 		       */</div><div class='add'>+	struct ib_fmr_pool           *fmr_pool;     /* pool of IB FMRs         */</div><div class='add'>+	int                          disc_evt_flag; /* disconn event delivered */</div><div class='add'>+	wait_queue_head_t	     wait;          /* waitq for conn/disconn  */</div><div class='add'>+	atomic_t                     post_recv_buf_count; /* posted rx count   */</div><div class='add'>+	atomic_t                     post_send_buf_count; /* posted tx count   */</div><div class='add'>+	struct work_struct           comperror_work; /* conn term sleepable ctx*/</div><div class='add'>+	char 			     name[ISER_OBJECT_NAME_SIZE];</div><div class='add'>+	struct iser_page_vec         *page_vec;     /* represents SG to fmr maps*</div><div class='add'>+						     * maps serialized as tx is*/</div><div class='add'>+	struct list_head	     conn_list;       /* entry in ig conn list */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iscsi_iser_conn {</div><div class='add'>+	struct iscsi_conn            *iscsi_conn;/* ptr to iscsi conn */</div><div class='add'>+	struct iser_conn             *ib_conn;   /* iSER IB conn      */</div><div class='add'>+</div><div class='add'>+	rwlock_t		     lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iscsi_iser_cmd_task {</div><div class='add'>+	struct iser_desc             desc;</div><div class='add'>+	struct iscsi_iser_conn	     *iser_conn;</div><div class='add'>+	int			     rdma_data_count;/* RDMA bytes           */</div><div class='add'>+	enum iser_task_status 	     status;</div><div class='add'>+	int                          command_sent;  /* set if command  sent  */</div><div class='add'>+	int                          dir[ISER_DIRS_NUM];      /* set if dir use*/</div><div class='add'>+	struct iser_regd_buf         rdma_regd[ISER_DIRS_NUM];/* regd rdma buf */</div><div class='add'>+	struct iser_data_buf         data[ISER_DIRS_NUM];     /* orig. data des*/</div><div class='add'>+	struct iser_data_buf         data_copy[ISER_DIRS_NUM];/* contig. copy  */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_page_vec {</div><div class='add'>+	u64 *pages;</div><div class='add'>+	int length;</div><div class='add'>+	int offset;</div><div class='add'>+	int data_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iser_global {</div><div class='add'>+	struct mutex      device_list_mutex;/*                   */</div><div class='add'>+	struct list_head  device_list;	     /* all iSER devices */</div><div class='add'>+	struct mutex      connlist_mutex;</div><div class='add'>+	struct list_head  connlist;		/* all iSER IB connections */</div><div class='add'>+</div><div class='add'>+	kmem_cache_t *desc_cache;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern struct iser_global ig;</div><div class='add'>+extern int iser_debug_level;</div><div class='add'>+</div><div class='add'>+/* allocate connection resources needed for rdma functionality */</div><div class='add'>+int iser_conn_set_full_featured_mode(struct iscsi_conn *conn);</div><div class='add'>+</div><div class='add'>+int iser_send_control(struct iscsi_conn      *conn,</div><div class='add'>+		      struct iscsi_mgmt_task *mtask);</div><div class='add'>+</div><div class='add'>+int iser_send_command(struct iscsi_conn      *conn,</div><div class='add'>+		      struct iscsi_cmd_task  *ctask);</div><div class='add'>+</div><div class='add'>+int iser_send_data_out(struct iscsi_conn     *conn,</div><div class='add'>+		       struct iscsi_cmd_task *ctask,</div><div class='add'>+		       struct iscsi_data          *hdr);</div><div class='add'>+</div><div class='add'>+void iscsi_iser_recv(struct iscsi_conn *conn,</div><div class='add'>+		     struct iscsi_hdr       *hdr,</div><div class='add'>+		     char                   *rx_data,</div><div class='add'>+		     int                    rx_data_len);</div><div class='add'>+</div><div class='add'>+int  iser_conn_init(struct iser_conn **ib_conn);</div><div class='add'>+</div><div class='add'>+void iser_conn_terminate(struct iser_conn *ib_conn);</div><div class='add'>+</div><div class='add'>+void iser_conn_release(struct iser_conn *ib_conn);</div><div class='add'>+</div><div class='add'>+void iser_rcv_completion(struct iser_desc *desc,</div><div class='add'>+			 unsigned long    dto_xfer_len);</div><div class='add'>+</div><div class='add'>+void iser_snd_completion(struct iser_desc *desc);</div><div class='add'>+</div><div class='add'>+void iser_ctask_rdma_init(struct iscsi_iser_cmd_task     *ctask);</div><div class='add'>+</div><div class='add'>+void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *ctask);</div><div class='add'>+</div><div class='add'>+void iser_dto_buffs_release(struct iser_dto *dto);</div><div class='add'>+</div><div class='add'>+int  iser_regd_buff_release(struct iser_regd_buf *regd_buf);</div><div class='add'>+</div><div class='add'>+void iser_reg_single(struct iser_device      *device,</div><div class='add'>+		     struct iser_regd_buf    *regd_buf,</div><div class='add'>+		     enum dma_data_direction direction);</div><div class='add'>+</div><div class='add'>+int  iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task    *ctask,</div><div class='add'>+				  enum iser_data_dir            cmd_dir);</div><div class='add'>+</div><div class='add'>+void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *ctask,</div><div class='add'>+				     enum iser_data_dir         cmd_dir);</div><div class='add'>+</div><div class='add'>+int  iser_reg_rdma_mem(struct iscsi_iser_cmd_task *ctask,</div><div class='add'>+		       enum   iser_data_dir        cmd_dir);</div><div class='add'>+</div><div class='add'>+int  iser_connect(struct iser_conn   *ib_conn,</div><div class='add'>+		  struct sockaddr_in *src_addr,</div><div class='add'>+		  struct sockaddr_in *dst_addr,</div><div class='add'>+		  int                non_blocking);</div><div class='add'>+</div><div class='add'>+int  iser_reg_page_vec(struct iser_conn     *ib_conn,</div><div class='add'>+		       struct iser_page_vec *page_vec,</div><div class='add'>+		       struct iser_mem_reg  *mem_reg);</div><div class='add'>+</div><div class='add'>+void iser_unreg_mem(struct iser_mem_reg *mem_reg);</div><div class='add'>+</div><div class='add'>+int  iser_post_recv(struct iser_desc *rx_desc);</div><div class='add'>+int  iser_post_send(struct iser_desc *tx_desc);</div><div class='add'>+</div><div class='add'>+int iser_conn_state_comp(struct iser_conn *ib_conn,</div><div class='add'>+			 enum iser_ib_conn_state comp);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c<br/>new file mode 100644<br/>index 000000000000..ccf56f6f7236<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iser_initiator.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/iser_initiator.c</a></div><div class='hunk'>@@ -0,0 +1,738 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004, 2005, 2006 Voltaire, Inc. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions of source code must retain the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions in binary form must reproduce the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer in the documentation and/or other materials</div><div class='add'>+ *	  provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * $Id: iser_initiator.c 6964 2006-05-07 11:11:43Z ogerlitz $</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iscsi_iser.h"</div><div class='add'>+</div><div class='add'>+/* Constant PDU lengths calculations */</div><div class='add'>+#define ISER_TOTAL_HEADERS_LEN  (sizeof (struct iser_hdr) + \</div><div class='add'>+				 sizeof (struct iscsi_hdr))</div><div class='add'>+</div><div class='add'>+/* iser_dto_add_regd_buff - increments the reference count for *</div><div class='add'>+ * the registered buffer &amp; adds it to the DTO object           */</div><div class='add'>+static void iser_dto_add_regd_buff(struct iser_dto *dto,</div><div class='add'>+				   struct iser_regd_buf *regd_buf,</div><div class='add'>+				   unsigned long use_offset,</div><div class='add'>+				   unsigned long use_size)</div><div class='add'>+{</div><div class='add'>+	int add_idx;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;regd_buf-&gt;ref_count);</div><div class='add'>+</div><div class='add'>+	add_idx = dto-&gt;regd_vector_len;</div><div class='add'>+	dto-&gt;regd[add_idx] = regd_buf;</div><div class='add'>+	dto-&gt;used_sz[add_idx] = use_size;</div><div class='add'>+	dto-&gt;offset[add_idx] = use_offset;</div><div class='add'>+</div><div class='add'>+	dto-&gt;regd_vector_len++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iser_dma_map_task_data(struct iscsi_iser_cmd_task *iser_ctask,</div><div class='add'>+				  struct iser_data_buf       *data,</div><div class='add'>+				  enum   iser_data_dir       iser_dir,</div><div class='add'>+				  enum   dma_data_direction  dma_dir)</div><div class='add'>+{</div><div class='add'>+	struct device *dma_device;</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;dir[iser_dir] = 1;</div><div class='add'>+	dma_device = iser_ctask-&gt;iser_conn-&gt;ib_conn-&gt;device-&gt;ib_device-&gt;dma_device;</div><div class='add'>+</div><div class='add'>+	data-&gt;dma_nents = dma_map_sg(dma_device, data-&gt;buf, data-&gt;size, dma_dir);</div><div class='add'>+	if (data-&gt;dma_nents == 0) {</div><div class='add'>+		iser_err("dma_map_sg failed!!!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_dma_unmap_task_data(struct iscsi_iser_cmd_task *iser_ctask)</div><div class='add'>+{</div><div class='add'>+	struct device  *dma_device;</div><div class='add'>+	struct iser_data_buf *data;</div><div class='add'>+</div><div class='add'>+	dma_device = iser_ctask-&gt;iser_conn-&gt;ib_conn-&gt;device-&gt;ib_device-&gt;dma_device;</div><div class='add'>+</div><div class='add'>+	if (iser_ctask-&gt;dir[ISER_DIR_IN]) {</div><div class='add'>+		data = &amp;iser_ctask-&gt;data[ISER_DIR_IN];</div><div class='add'>+		dma_unmap_sg(dma_device, data-&gt;buf, data-&gt;size, DMA_FROM_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iser_ctask-&gt;dir[ISER_DIR_OUT]) {</div><div class='add'>+		data = &amp;iser_ctask-&gt;data[ISER_DIR_OUT];</div><div class='add'>+		dma_unmap_sg(dma_device, data-&gt;buf, data-&gt;size, DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Register user buffer memory and initialize passive rdma</div><div class='add'>+ *  dto descriptor. Total data size is stored in</div><div class='add'>+ *  iser_ctask-&gt;data[ISER_DIR_IN].data_len</div><div class='add'>+ */</div><div class='add'>+static int iser_prepare_read_cmd(struct iscsi_cmd_task *ctask,</div><div class='add'>+				 unsigned int edtl)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iser_regd_buf *regd_buf;</div><div class='add'>+	int err;</div><div class='add'>+	struct iser_hdr *hdr = &amp;iser_ctask-&gt;desc.iser_header;</div><div class='add'>+	struct iser_data_buf *buf_in = &amp;iser_ctask-&gt;data[ISER_DIR_IN];</div><div class='add'>+</div><div class='add'>+	err = iser_dma_map_task_data(iser_ctask,</div><div class='add'>+				     buf_in,</div><div class='add'>+				     ISER_DIR_IN,</div><div class='add'>+				     DMA_FROM_DEVICE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (edtl &gt; iser_ctask-&gt;data[ISER_DIR_IN].data_len) {</div><div class='add'>+		iser_err("Total data length: %ld, less than EDTL: "</div><div class='add'>+			 "%d, in READ cmd BHS itt: %d, conn: 0x%p\n",</div><div class='add'>+			 iser_ctask-&gt;data[ISER_DIR_IN].data_len, edtl,</div><div class='add'>+			 ctask-&gt;itt, iser_ctask-&gt;iser_conn);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = iser_reg_rdma_mem(iser_ctask,ISER_DIR_IN);</div><div class='add'>+	if (err) {</div><div class='add'>+		iser_err("Failed to set up Data-IN RDMA\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	regd_buf = &amp;iser_ctask-&gt;rdma_regd[ISER_DIR_IN];</div><div class='add'>+</div><div class='add'>+	hdr-&gt;flags    |= ISER_RSV;</div><div class='add'>+	hdr-&gt;read_stag = cpu_to_be32(regd_buf-&gt;reg.rkey);</div><div class='add'>+	hdr-&gt;read_va   = cpu_to_be64(regd_buf-&gt;reg.va);</div><div class='add'>+</div><div class='add'>+	iser_dbg("Cmd itt:%d READ tags RKEY:%#.4X VA:%#llX\n",</div><div class='add'>+		 ctask-&gt;itt, regd_buf-&gt;reg.rkey,</div><div class='add'>+		 (unsigned long long)regd_buf-&gt;reg.va);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Register user buffer memory and initialize passive rdma</div><div class='add'>+ *  dto descriptor. Total data size is stored in</div><div class='add'>+ *  ctask-&gt;data[ISER_DIR_OUT].data_len</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+iser_prepare_write_cmd(struct iscsi_cmd_task *ctask,</div><div class='add'>+		       unsigned int imm_sz,</div><div class='add'>+		       unsigned int unsol_sz,</div><div class='add'>+		       unsigned int edtl)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iser_regd_buf *regd_buf;</div><div class='add'>+	int err;</div><div class='add'>+	struct iser_dto *send_dto = &amp;iser_ctask-&gt;desc.dto;</div><div class='add'>+	struct iser_hdr *hdr = &amp;iser_ctask-&gt;desc.iser_header;</div><div class='add'>+	struct iser_data_buf *buf_out = &amp;iser_ctask-&gt;data[ISER_DIR_OUT];</div><div class='add'>+</div><div class='add'>+	err = iser_dma_map_task_data(iser_ctask,</div><div class='add'>+				     buf_out,</div><div class='add'>+				     ISER_DIR_OUT,</div><div class='add'>+				     DMA_TO_DEVICE);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (edtl &gt; iser_ctask-&gt;data[ISER_DIR_OUT].data_len) {</div><div class='add'>+		iser_err("Total data length: %ld, less than EDTL: %d, "</div><div class='add'>+			 "in WRITE cmd BHS itt: %d, conn: 0x%p\n",</div><div class='add'>+			 iser_ctask-&gt;data[ISER_DIR_OUT].data_len,</div><div class='add'>+			 edtl, ctask-&gt;itt, ctask-&gt;conn);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = iser_reg_rdma_mem(iser_ctask,ISER_DIR_OUT);</div><div class='add'>+	if (err != 0) {</div><div class='add'>+		iser_err("Failed to register write cmd RDMA mem\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regd_buf = &amp;iser_ctask-&gt;rdma_regd[ISER_DIR_OUT];</div><div class='add'>+</div><div class='add'>+	if (unsol_sz &lt; edtl) {</div><div class='add'>+		hdr-&gt;flags     |= ISER_WSV;</div><div class='add'>+		hdr-&gt;write_stag = cpu_to_be32(regd_buf-&gt;reg.rkey);</div><div class='add'>+		hdr-&gt;write_va   = cpu_to_be64(regd_buf-&gt;reg.va + unsol_sz);</div><div class='add'>+</div><div class='add'>+		iser_dbg("Cmd itt:%d, WRITE tags, RKEY:%#.4X "</div><div class='add'>+			 "VA:%#llX + unsol:%d\n",</div><div class='add'>+			 ctask-&gt;itt, regd_buf-&gt;reg.rkey,</div><div class='add'>+			 (unsigned long long)regd_buf-&gt;reg.va, unsol_sz);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (imm_sz &gt; 0) {</div><div class='add'>+		iser_dbg("Cmd itt:%d, WRITE, adding imm.data sz: %d\n",</div><div class='add'>+			 ctask-&gt;itt, imm_sz);</div><div class='add'>+		iser_dto_add_regd_buff(send_dto,</div><div class='add'>+				       regd_buf,</div><div class='add'>+				       0,</div><div class='add'>+				       imm_sz);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_post_receive_control - allocates, initializes and posts receive DTO.</div><div class='add'>+ */</div><div class='add'>+static int iser_post_receive_control(struct iscsi_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iser_desc     *rx_desc;</div><div class='add'>+	struct iser_regd_buf *regd_hdr;</div><div class='add'>+	struct iser_regd_buf *regd_data;</div><div class='add'>+	struct iser_dto      *recv_dto = NULL;</div><div class='add'>+	struct iser_device  *device = iser_conn-&gt;ib_conn-&gt;device;</div><div class='add'>+	int rx_data_size, err = 0;</div><div class='add'>+</div><div class='add'>+	rx_desc = kmem_cache_alloc(ig.desc_cache, GFP_NOIO);</div><div class='add'>+	if (rx_desc == NULL) {</div><div class='add'>+		iser_err("Failed to alloc desc for post recv\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	rx_desc-&gt;type = ISCSI_RX;</div><div class='add'>+</div><div class='add'>+	/* for the login sequence we must support rx of upto 8K; login is done</div><div class='add'>+	 * after conn create/bind (connect) and conn stop/bind (reconnect),</div><div class='add'>+	 * what's common for both schemes is that the connection is not started</div><div class='add'>+	 */</div><div class='add'>+	if (conn-&gt;c_stage != ISCSI_CONN_STARTED)</div><div class='add'>+		rx_data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;</div><div class='add'>+	else /* FIXME till user space sets conn-&gt;max_recv_dlength correctly */</div><div class='add'>+		rx_data_size = 128;</div><div class='add'>+</div><div class='add'>+	rx_desc-&gt;data = kmalloc(rx_data_size, GFP_NOIO);</div><div class='add'>+	if (rx_desc-&gt;data == NULL) {</div><div class='add'>+		iser_err("Failed to alloc data buf for post recv\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto post_rx_kmalloc_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	recv_dto = &amp;rx_desc-&gt;dto;</div><div class='add'>+	recv_dto-&gt;conn          = iser_conn;</div><div class='add'>+	recv_dto-&gt;regd_vector_len = 0;</div><div class='add'>+</div><div class='add'>+	regd_hdr = &amp;rx_desc-&gt;hdr_regd_buf;</div><div class='add'>+	memset(regd_hdr, 0, sizeof(struct iser_regd_buf));</div><div class='add'>+	regd_hdr-&gt;device  = device;</div><div class='add'>+	regd_hdr-&gt;virt_addr  = rx_desc; /* == &amp;rx_desc-&gt;iser_header */</div><div class='add'>+	regd_hdr-&gt;data_size  = ISER_TOTAL_HEADERS_LEN;</div><div class='add'>+</div><div class='add'>+	iser_reg_single(device, regd_hdr, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	iser_dto_add_regd_buff(recv_dto, regd_hdr, 0, 0);</div><div class='add'>+</div><div class='add'>+	regd_data = &amp;rx_desc-&gt;data_regd_buf;</div><div class='add'>+	memset(regd_data, 0, sizeof(struct iser_regd_buf));</div><div class='add'>+	regd_data-&gt;device  = device;</div><div class='add'>+	regd_data-&gt;virt_addr  = rx_desc-&gt;data;</div><div class='add'>+	regd_data-&gt;data_size  = rx_data_size;</div><div class='add'>+</div><div class='add'>+	iser_reg_single(device, regd_data, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	iser_dto_add_regd_buff(recv_dto, regd_data, 0, 0);</div><div class='add'>+</div><div class='add'>+	err = iser_post_recv(rx_desc);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* iser_post_recv failed */</div><div class='add'>+	iser_dto_buffs_release(recv_dto);</div><div class='add'>+	kfree(rx_desc-&gt;data);</div><div class='add'>+post_rx_kmalloc_failure:</div><div class='add'>+	kmem_cache_free(ig.desc_cache, rx_desc);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* creates a new tx descriptor and adds header regd buffer */</div><div class='add'>+static void iser_create_send_desc(struct iscsi_iser_conn *iser_conn,</div><div class='add'>+				  struct iser_desc       *tx_desc)</div><div class='add'>+{</div><div class='add'>+	struct iser_regd_buf *regd_hdr = &amp;tx_desc-&gt;hdr_regd_buf;</div><div class='add'>+	struct iser_dto      *send_dto = &amp;tx_desc-&gt;dto;</div><div class='add'>+</div><div class='add'>+	memset(regd_hdr, 0, sizeof(struct iser_regd_buf));</div><div class='add'>+	regd_hdr-&gt;device  = iser_conn-&gt;ib_conn-&gt;device;</div><div class='add'>+	regd_hdr-&gt;virt_addr  = tx_desc; /* == &amp;tx_desc-&gt;iser_header */</div><div class='add'>+	regd_hdr-&gt;data_size  = ISER_TOTAL_HEADERS_LEN;</div><div class='add'>+</div><div class='add'>+	send_dto-&gt;conn          = iser_conn;</div><div class='add'>+	send_dto-&gt;notify_enable   = 1;</div><div class='add'>+	send_dto-&gt;regd_vector_len = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;tx_desc-&gt;iser_header, 0, sizeof(struct iser_hdr));</div><div class='add'>+	tx_desc-&gt;iser_header.flags = ISER_VER;</div><div class='add'>+</div><div class='add'>+	iser_dto_add_regd_buff(send_dto, regd_hdr, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  iser_conn_set_full_featured_mode - (iSER API)</div><div class='add'>+ */</div><div class='add'>+int iser_conn_set_full_featured_mode(struct iscsi_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+	/* no need to keep it in a var, we are after login so if this should</div><div class='add'>+	 * be negotiated, by now the result should be available here */</div><div class='add'>+	int initial_post_recv_bufs_num = ISER_MAX_RX_MISC_PDUS;</div><div class='add'>+</div><div class='add'>+	iser_dbg("Initially post: %d\n", initial_post_recv_bufs_num);</div><div class='add'>+</div><div class='add'>+	/* Check that there is no posted recv or send buffers left - */</div><div class='add'>+	/* they must be consumed during the login phase */</div><div class='add'>+	BUG_ON(atomic_read(&amp;iser_conn-&gt;ib_conn-&gt;post_recv_buf_count) != 0);</div><div class='add'>+	BUG_ON(atomic_read(&amp;iser_conn-&gt;ib_conn-&gt;post_send_buf_count) != 0);</div><div class='add'>+</div><div class='add'>+	/* Initial post receive buffers */</div><div class='add'>+	for (i = 0; i &lt; initial_post_recv_bufs_num; i++) {</div><div class='add'>+		if (iser_post_receive_control(conn) != 0) {</div><div class='add'>+			iser_err("Failed to post recv bufs at:%d conn:0x%p\n",</div><div class='add'>+				 i, conn);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	iser_dbg("Posted %d post recv bufs, conn:0x%p\n", i, conn);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iser_check_xmit(struct iscsi_conn *conn, void *task)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	write_lock_bh(conn-&gt;recv_lock);</div><div class='add'>+	if (atomic_read(&amp;iser_conn-&gt;ib_conn-&gt;post_send_buf_count) ==</div><div class='add'>+	    ISER_QP_MAX_REQ_DTOS) {</div><div class='add'>+		iser_dbg("%ld can't xmit task %p, suspending tx\n",jiffies,task);</div><div class='add'>+		set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+		rc = -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	write_unlock_bh(conn-&gt;recv_lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_send_command - send command PDU</div><div class='add'>+ */</div><div class='add'>+int iser_send_command(struct iscsi_conn     *conn,</div><div class='add'>+		      struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iser_dto *send_dto = NULL;</div><div class='add'>+	unsigned long edtl;</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct iser_data_buf *data_buf;</div><div class='add'>+</div><div class='add'>+	struct iscsi_cmd *hdr =  ctask-&gt;hdr;</div><div class='add'>+	struct scsi_cmnd *sc  =  ctask-&gt;sc;</div><div class='add'>+</div><div class='add'>+	if (!iser_conn_state_comp(iser_conn-&gt;ib_conn, ISER_CONN_UP)) {</div><div class='add'>+		iser_err("Failed to send, conn: 0x%p is not up\n", iser_conn-&gt;ib_conn);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	if (iser_check_xmit(conn, ctask))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	edtl = ntohl(hdr-&gt;data_length);</div><div class='add'>+</div><div class='add'>+	/* build the tx desc regd header and add it to the tx desc dto */</div><div class='add'>+	iser_ctask-&gt;desc.type = ISCSI_TX_SCSI_COMMAND;</div><div class='add'>+	send_dto = &amp;iser_ctask-&gt;desc.dto;</div><div class='add'>+	send_dto-&gt;ctask = iser_ctask;</div><div class='add'>+	iser_create_send_desc(iser_conn, &amp;iser_ctask-&gt;desc);</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;flags &amp; ISCSI_FLAG_CMD_READ)</div><div class='add'>+		data_buf = &amp;iser_ctask-&gt;data[ISER_DIR_IN];</div><div class='add'>+	else</div><div class='add'>+		data_buf = &amp;iser_ctask-&gt;data[ISER_DIR_OUT];</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;use_sg) { /* using a scatter list */</div><div class='add'>+		data_buf-&gt;buf  = sc-&gt;request_buffer;</div><div class='add'>+		data_buf-&gt;size = sc-&gt;use_sg;</div><div class='add'>+	} else if (sc-&gt;request_bufflen) {</div><div class='add'>+		/* using a single buffer - convert it into one entry SG */</div><div class='add'>+		sg_init_one(&amp;data_buf-&gt;sg_single,</div><div class='add'>+			    sc-&gt;request_buffer, sc-&gt;request_bufflen);</div><div class='add'>+		data_buf-&gt;buf   = &amp;data_buf-&gt;sg_single;</div><div class='add'>+		data_buf-&gt;size  = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data_buf-&gt;data_len = sc-&gt;request_bufflen;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;flags &amp; ISCSI_FLAG_CMD_READ) {</div><div class='add'>+		err = iser_prepare_read_cmd(ctask, edtl);</div><div class='add'>+		if (err)</div><div class='add'>+			goto send_command_error;</div><div class='add'>+	}</div><div class='add'>+	if (hdr-&gt;flags &amp; ISCSI_FLAG_CMD_WRITE) {</div><div class='add'>+		err = iser_prepare_write_cmd(ctask,</div><div class='add'>+					     ctask-&gt;imm_count,</div><div class='add'>+				             ctask-&gt;imm_count +</div><div class='add'>+					     ctask-&gt;unsol_count,</div><div class='add'>+					     edtl);</div><div class='add'>+		if (err)</div><div class='add'>+			goto send_command_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iser_reg_single(iser_conn-&gt;ib_conn-&gt;device,</div><div class='add'>+			send_dto-&gt;regd[0], DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (iser_post_receive_control(conn) != 0) {</div><div class='add'>+		iser_err("post_recv failed!\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto send_command_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;status = ISER_TASK_STATUS_STARTED;</div><div class='add'>+</div><div class='add'>+	err = iser_post_send(&amp;iser_ctask-&gt;desc);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+send_command_error:</div><div class='add'>+	iser_dto_buffs_release(send_dto);</div><div class='add'>+	iser_err("conn %p failed ctask-&gt;itt %d err %d\n",conn, ctask-&gt;itt, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_send_data_out - send data out PDU</div><div class='add'>+ */</div><div class='add'>+int iser_send_data_out(struct iscsi_conn     *conn,</div><div class='add'>+		       struct iscsi_cmd_task *ctask,</div><div class='add'>+		       struct iscsi_data *hdr)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iser_desc *tx_desc = NULL;</div><div class='add'>+	struct iser_dto *send_dto = NULL;</div><div class='add'>+	unsigned long buf_offset;</div><div class='add'>+	unsigned long data_seg_len;</div><div class='add'>+	unsigned int itt;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!iser_conn_state_comp(iser_conn-&gt;ib_conn, ISER_CONN_UP)) {</div><div class='add'>+		iser_err("Failed to send, conn: 0x%p is not up\n", iser_conn-&gt;ib_conn);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iser_check_xmit(conn, ctask))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	itt = ntohl(hdr-&gt;itt);</div><div class='add'>+	data_seg_len = ntoh24(hdr-&gt;dlength);</div><div class='add'>+	buf_offset   = ntohl(hdr-&gt;offset);</div><div class='add'>+</div><div class='add'>+	iser_dbg("%s itt %d dseg_len %d offset %d\n",</div><div class='add'>+		 __func__,(int)itt,(int)data_seg_len,(int)buf_offset);</div><div class='add'>+</div><div class='add'>+	tx_desc = kmem_cache_alloc(ig.desc_cache, GFP_NOIO);</div><div class='add'>+	if (tx_desc == NULL) {</div><div class='add'>+		iser_err("Failed to alloc desc for post dataout\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_desc-&gt;type = ISCSI_TX_DATAOUT;</div><div class='add'>+	memcpy(&amp;tx_desc-&gt;iscsi_header, hdr, sizeof(struct iscsi_hdr));</div><div class='add'>+</div><div class='add'>+	/* build the tx desc regd header and add it to the tx desc dto */</div><div class='add'>+	send_dto = &amp;tx_desc-&gt;dto;</div><div class='add'>+	send_dto-&gt;ctask = iser_ctask;</div><div class='add'>+	iser_create_send_desc(iser_conn, tx_desc);</div><div class='add'>+</div><div class='add'>+	iser_reg_single(iser_conn-&gt;ib_conn-&gt;device,</div><div class='add'>+			send_dto-&gt;regd[0], DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	/* all data was registered for RDMA, we can use the lkey */</div><div class='add'>+	iser_dto_add_regd_buff(send_dto,</div><div class='add'>+			       &amp;iser_ctask-&gt;rdma_regd[ISER_DIR_OUT],</div><div class='add'>+			       buf_offset,</div><div class='add'>+			       data_seg_len);</div><div class='add'>+</div><div class='add'>+	if (buf_offset + data_seg_len &gt; iser_ctask-&gt;data[ISER_DIR_OUT].data_len) {</div><div class='add'>+		iser_err("Offset:%ld &amp; DSL:%ld in Data-Out "</div><div class='add'>+			 "inconsistent with total len:%ld, itt:%d\n",</div><div class='add'>+			 buf_offset, data_seg_len,</div><div class='add'>+			 iser_ctask-&gt;data[ISER_DIR_OUT].data_len, itt);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto send_data_out_error;</div><div class='add'>+	}</div><div class='add'>+	iser_dbg("data-out itt: %d, offset: %ld, sz: %ld\n",</div><div class='add'>+		 itt, buf_offset, data_seg_len);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	err = iser_post_send(tx_desc);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+send_data_out_error:</div><div class='add'>+	iser_dto_buffs_release(send_dto);</div><div class='add'>+	kmem_cache_free(ig.desc_cache, tx_desc);</div><div class='add'>+	iser_err("conn %p failed err %d\n",conn, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iser_send_control(struct iscsi_conn *conn,</div><div class='add'>+		      struct iscsi_mgmt_task *mtask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iser_desc *mdesc = mtask-&gt;dd_data;</div><div class='add'>+	struct iser_dto *send_dto = NULL;</div><div class='add'>+	unsigned int itt;</div><div class='add'>+	unsigned long data_seg_len;</div><div class='add'>+	int err = 0;</div><div class='add'>+	unsigned char opcode;</div><div class='add'>+	struct iser_regd_buf *regd_buf;</div><div class='add'>+	struct iser_device *device;</div><div class='add'>+</div><div class='add'>+	if (!iser_conn_state_comp(iser_conn-&gt;ib_conn, ISER_CONN_UP)) {</div><div class='add'>+		iser_err("Failed to send, conn: 0x%p is not up\n", iser_conn-&gt;ib_conn);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iser_check_xmit(conn,mtask))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/* build the tx desc regd header and add it to the tx desc dto */</div><div class='add'>+	mdesc-&gt;type = ISCSI_TX_CONTROL;</div><div class='add'>+	send_dto = &amp;mdesc-&gt;dto;</div><div class='add'>+	send_dto-&gt;ctask = NULL;</div><div class='add'>+	iser_create_send_desc(iser_conn, mdesc);</div><div class='add'>+</div><div class='add'>+	device = iser_conn-&gt;ib_conn-&gt;device;</div><div class='add'>+</div><div class='add'>+	iser_reg_single(device, send_dto-&gt;regd[0], DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	itt = ntohl(mtask-&gt;hdr-&gt;itt);</div><div class='add'>+	opcode = mtask-&gt;hdr-&gt;opcode &amp; ISCSI_OPCODE_MASK;</div><div class='add'>+	data_seg_len = ntoh24(mtask-&gt;hdr-&gt;dlength);</div><div class='add'>+</div><div class='add'>+	if (data_seg_len &gt; 0) {</div><div class='add'>+		regd_buf = &amp;mdesc-&gt;data_regd_buf;</div><div class='add'>+		memset(regd_buf, 0, sizeof(struct iser_regd_buf));</div><div class='add'>+		regd_buf-&gt;device = device;</div><div class='add'>+		regd_buf-&gt;virt_addr = mtask-&gt;data;</div><div class='add'>+		regd_buf-&gt;data_size = mtask-&gt;data_count;</div><div class='add'>+		iser_reg_single(device, regd_buf,</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='add'>+		iser_dto_add_regd_buff(send_dto, regd_buf,</div><div class='add'>+				       0,</div><div class='add'>+				       data_seg_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iser_post_receive_control(conn) != 0) {</div><div class='add'>+		iser_err("post_rcv_buff failed!\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto send_control_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = iser_post_send(mdesc);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+send_control_error:</div><div class='add'>+	iser_dto_buffs_release(send_dto);</div><div class='add'>+	iser_err("conn %p failed err %d\n",conn, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_rcv_dto_completion - recv DTO completion</div><div class='add'>+ */</div><div class='add'>+void iser_rcv_completion(struct iser_desc *rx_desc,</div><div class='add'>+			 unsigned long dto_xfer_len)</div><div class='add'>+{</div><div class='add'>+	struct iser_dto        *dto = &amp;rx_desc-&gt;dto;</div><div class='add'>+	struct iscsi_iser_conn *conn = dto-&gt;conn;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;iscsi_conn-&gt;session;</div><div class='add'>+	struct iscsi_cmd_task *ctask;</div><div class='add'>+	struct iscsi_iser_cmd_task *iser_ctask;</div><div class='add'>+	struct iscsi_hdr *hdr;</div><div class='add'>+	char   *rx_data = NULL;</div><div class='add'>+	int     rx_data_len = 0;</div><div class='add'>+	unsigned int itt;</div><div class='add'>+	unsigned char opcode;</div><div class='add'>+</div><div class='add'>+	hdr = &amp;rx_desc-&gt;iscsi_header;</div><div class='add'>+</div><div class='add'>+	iser_dbg("op 0x%x itt 0x%x\n", hdr-&gt;opcode,hdr-&gt;itt);</div><div class='add'>+</div><div class='add'>+	if (dto_xfer_len &gt; ISER_TOTAL_HEADERS_LEN) { /* we have data */</div><div class='add'>+		rx_data_len = dto_xfer_len - ISER_TOTAL_HEADERS_LEN;</div><div class='add'>+		rx_data     = dto-&gt;regd[1]-&gt;virt_addr;</div><div class='add'>+		rx_data    += dto-&gt;offset[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opcode = hdr-&gt;opcode &amp; ISCSI_OPCODE_MASK;</div><div class='add'>+</div><div class='add'>+	if (opcode == ISCSI_OP_SCSI_CMD_RSP) {</div><div class='add'>+	        itt = hdr-&gt;itt &amp; ISCSI_ITT_MASK; /* mask out cid and age bits */</div><div class='add'>+		if (!(itt &lt; session-&gt;cmds_max))</div><div class='add'>+			iser_err("itt can't be matched to task!!!"</div><div class='add'>+				 "conn %p opcode %d cmds_max %d itt %d\n",</div><div class='add'>+				 conn-&gt;iscsi_conn,opcode,session-&gt;cmds_max,itt);</div><div class='add'>+		/* use the mapping given with the cmds array indexed by itt */</div><div class='add'>+		ctask = (struct iscsi_cmd_task *)session-&gt;cmds[itt];</div><div class='add'>+		iser_ctask = ctask-&gt;dd_data;</div><div class='add'>+		iser_dbg("itt %d ctask %p\n",itt,ctask);</div><div class='add'>+		iser_ctask-&gt;status = ISER_TASK_STATUS_COMPLETED;</div><div class='add'>+		iser_ctask_rdma_finalize(iser_ctask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iser_dto_buffs_release(dto);</div><div class='add'>+</div><div class='add'>+	iscsi_iser_recv(conn-&gt;iscsi_conn, hdr, rx_data, rx_data_len);</div><div class='add'>+</div><div class='add'>+	kfree(rx_desc-&gt;data);</div><div class='add'>+	kmem_cache_free(ig.desc_cache, rx_desc);</div><div class='add'>+</div><div class='add'>+	/* decrementing conn-&gt;post_recv_buf_count only --after-- freeing the   *</div><div class='add'>+	 * task eliminates the need to worry on tasks which are completed in   *</div><div class='add'>+	 * parallel to the execution of iser_conn_term. So the code that waits *</div><div class='add'>+	 * for the posted rx bufs refcount to become zero handles everything   */</div><div class='add'>+	atomic_dec(&amp;conn-&gt;ib_conn-&gt;post_recv_buf_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iser_snd_completion(struct iser_desc *tx_desc)</div><div class='add'>+{</div><div class='add'>+	struct iser_dto        *dto = &amp;tx_desc-&gt;dto;</div><div class='add'>+	struct iscsi_iser_conn *iser_conn = dto-&gt;conn;</div><div class='add'>+	struct iscsi_conn      *conn = iser_conn-&gt;iscsi_conn;</div><div class='add'>+	struct iscsi_mgmt_task *mtask;</div><div class='add'>+</div><div class='add'>+	iser_dbg("Initiator, Data sent dto=0x%p\n", dto);</div><div class='add'>+</div><div class='add'>+	iser_dto_buffs_release(dto);</div><div class='add'>+</div><div class='add'>+	if (tx_desc-&gt;type == ISCSI_TX_DATAOUT)</div><div class='add'>+		kmem_cache_free(ig.desc_cache, tx_desc);</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;iser_conn-&gt;ib_conn-&gt;post_send_buf_count);</div><div class='add'>+</div><div class='add'>+	write_lock(conn-&gt;recv_lock);</div><div class='add'>+	if (conn-&gt;suspend_tx) {</div><div class='add'>+		iser_dbg("%ld resuming tx\n",jiffies);</div><div class='add'>+		clear_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+		scsi_queue_work(conn-&gt;session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='add'>+	}</div><div class='add'>+	write_unlock(conn-&gt;recv_lock);</div><div class='add'>+</div><div class='add'>+	if (tx_desc-&gt;type == ISCSI_TX_CONTROL) {</div><div class='add'>+		/* this arithmetic is legal by libiscsi dd_data allocation */</div><div class='add'>+		mtask = (void *) ((long)(void *)tx_desc -</div><div class='add'>+				  sizeof(struct iscsi_mgmt_task));</div><div class='add'>+		if (mtask-&gt;hdr-&gt;itt == cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='add'>+			struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+</div><div class='add'>+			spin_lock(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+			list_del(&amp;mtask-&gt;running);</div><div class='add'>+			__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;mtask,</div><div class='add'>+				    sizeof(void*));</div><div class='add'>+			spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iser_ctask_rdma_init(struct iscsi_iser_cmd_task *iser_ctask)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	iser_ctask-&gt;status = ISER_TASK_STATUS_INIT;</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;dir[ISER_DIR_IN] = 0;</div><div class='add'>+	iser_ctask-&gt;dir[ISER_DIR_OUT] = 0;</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;data[ISER_DIR_IN].data_len  = 0;</div><div class='add'>+	iser_ctask-&gt;data[ISER_DIR_OUT].data_len = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;iser_ctask-&gt;rdma_regd[ISER_DIR_IN], 0,</div><div class='add'>+	       sizeof(struct iser_regd_buf));</div><div class='add'>+	memset(&amp;iser_ctask-&gt;rdma_regd[ISER_DIR_OUT], 0,</div><div class='add'>+	       sizeof(struct iser_regd_buf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask)</div><div class='add'>+{</div><div class='add'>+	int deferred;</div><div class='add'>+</div><div class='add'>+	/* if we were reading, copy back to unaligned sglist,</div><div class='add'>+	 * anyway dma_unmap and free the copy</div><div class='add'>+	 */</div><div class='add'>+	if (iser_ctask-&gt;data_copy[ISER_DIR_IN].copy_buf != NULL)</div><div class='add'>+		iser_finalize_rdma_unaligned_sg(iser_ctask, ISER_DIR_IN);</div><div class='add'>+	if (iser_ctask-&gt;data_copy[ISER_DIR_OUT].copy_buf != NULL)</div><div class='add'>+		iser_finalize_rdma_unaligned_sg(iser_ctask, ISER_DIR_OUT);</div><div class='add'>+</div><div class='add'>+	if (iser_ctask-&gt;dir[ISER_DIR_IN]) {</div><div class='add'>+		deferred = iser_regd_buff_release</div><div class='add'>+			(&amp;iser_ctask-&gt;rdma_regd[ISER_DIR_IN]);</div><div class='add'>+		if (deferred) {</div><div class='add'>+			iser_err("References remain for BUF-IN rdma reg\n");</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iser_ctask-&gt;dir[ISER_DIR_OUT]) {</div><div class='add'>+		deferred = iser_regd_buff_release</div><div class='add'>+			(&amp;iser_ctask-&gt;rdma_regd[ISER_DIR_OUT]);</div><div class='add'>+		if (deferred) {</div><div class='add'>+			iser_err("References remain for BUF-OUT rdma reg\n");</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iser_dma_unmap_task_data(iser_ctask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iser_dto_buffs_release(struct iser_dto *dto)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dto-&gt;regd_vector_len; i++)</div><div class='add'>+		iser_regd_buff_release(dto-&gt;regd[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c<br/>new file mode 100644<br/>index 000000000000..31950a522a1c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iser_memory.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/iser_memory.c</a></div><div class='hunk'>@@ -0,0 +1,401 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004, 2005, 2006 Voltaire, Inc. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions of source code must retain the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions in binary form must reproduce the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer in the documentation and/or other materials</div><div class='add'>+ *	  provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * $Id: iser_memory.c 6964 2006-05-07 11:11:43Z ogerlitz $</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/scatterlist.h&gt;</div><div class='add'>+#include &lt;linux/scatterlist.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iscsi_iser.h"</div><div class='add'>+</div><div class='add'>+#define ISER_KMALLOC_THRESHOLD 0x20000 /* 128K - kmalloc limit */</div><div class='add'>+/**</div><div class='add'>+ * Decrements the reference count for the</div><div class='add'>+ * registered buffer &amp; releases it</div><div class='add'>+ *</div><div class='add'>+ * returns 0 if released, 1 if deferred</div><div class='add'>+ */</div><div class='add'>+int iser_regd_buff_release(struct iser_regd_buf *regd_buf)</div><div class='add'>+{</div><div class='add'>+	struct device *dma_device;</div><div class='add'>+</div><div class='add'>+	if ((atomic_read(&amp;regd_buf-&gt;ref_count) == 0) ||</div><div class='add'>+	    atomic_dec_and_test(&amp;regd_buf-&gt;ref_count)) {</div><div class='add'>+		/* if we used the dma mr, unreg is just NOP */</div><div class='add'>+		if (regd_buf-&gt;reg.rkey != 0)</div><div class='add'>+			iser_unreg_mem(&amp;regd_buf-&gt;reg);</div><div class='add'>+</div><div class='add'>+		if (regd_buf-&gt;dma_addr) {</div><div class='add'>+			dma_device = regd_buf-&gt;device-&gt;ib_device-&gt;dma_device;</div><div class='add'>+			dma_unmap_single(dma_device,</div><div class='add'>+					 regd_buf-&gt;dma_addr,</div><div class='add'>+					 regd_buf-&gt;data_size,</div><div class='add'>+					 regd_buf-&gt;direction);</div><div class='add'>+		}</div><div class='add'>+		/* else this regd buf is associated with task which we */</div><div class='add'>+		/* dma_unmap_single/sg later */</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		iser_dbg("Release deferred, regd.buff: 0x%p\n", regd_buf);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_reg_single - fills registered buffer descriptor with</div><div class='add'>+ *		     registration information</div><div class='add'>+ */</div><div class='add'>+void iser_reg_single(struct iser_device *device,</div><div class='add'>+		     struct iser_regd_buf *regd_buf,</div><div class='add'>+		     enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	dma_addr  = dma_map_single(device-&gt;ib_device-&gt;dma_device,</div><div class='add'>+				   regd_buf-&gt;virt_addr,</div><div class='add'>+				   regd_buf-&gt;data_size, direction);</div><div class='add'>+	BUG_ON(dma_mapping_error(dma_addr));</div><div class='add'>+</div><div class='add'>+	regd_buf-&gt;reg.lkey = device-&gt;mr-&gt;lkey;</div><div class='add'>+	regd_buf-&gt;reg.rkey = 0; /* indicate there's no need to unreg */</div><div class='add'>+	regd_buf-&gt;reg.len  = regd_buf-&gt;data_size;</div><div class='add'>+	regd_buf-&gt;reg.va   = dma_addr;</div><div class='add'>+</div><div class='add'>+	regd_buf-&gt;dma_addr  = dma_addr;</div><div class='add'>+	regd_buf-&gt;direction = direction;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_start_rdma_unaligned_sg</div><div class='add'>+ */</div><div class='add'>+int iser_start_rdma_unaligned_sg(struct iscsi_iser_cmd_task  *iser_ctask,</div><div class='add'>+				 enum iser_data_dir cmd_dir)</div><div class='add'>+{</div><div class='add'>+	int dma_nents;</div><div class='add'>+	struct device *dma_device;</div><div class='add'>+	char *mem = NULL;</div><div class='add'>+	struct iser_data_buf *data = &amp;iser_ctask-&gt;data[cmd_dir];</div><div class='add'>+	unsigned long  cmd_data_len = data-&gt;data_len;</div><div class='add'>+</div><div class='add'>+	if (cmd_data_len &gt; ISER_KMALLOC_THRESHOLD)</div><div class='add'>+		mem = (void *)__get_free_pages(GFP_NOIO,</div><div class='add'>+		      long_log2(roundup_pow_of_two(cmd_data_len)) - PAGE_SHIFT);</div><div class='add'>+	else</div><div class='add'>+		mem = kmalloc(cmd_data_len, GFP_NOIO);</div><div class='add'>+</div><div class='add'>+	if (mem == NULL) {</div><div class='add'>+		iser_err("Failed to allocate mem size %d %d for copying sglist\n",</div><div class='add'>+			 data-&gt;size,(int)cmd_data_len);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd_dir == ISER_DIR_OUT) {</div><div class='add'>+		/* copy the unaligned sg the buffer which is used for RDMA */</div><div class='add'>+		struct scatterlist *sg = (struct scatterlist *)data-&gt;buf;</div><div class='add'>+		int i;</div><div class='add'>+		char *p, *from;</div><div class='add'>+</div><div class='add'>+		for (p = mem, i = 0; i &lt; data-&gt;size; i++) {</div><div class='add'>+			from = kmap_atomic(sg[i].page, KM_USER0);</div><div class='add'>+			memcpy(p,</div><div class='add'>+			       from + sg[i].offset,</div><div class='add'>+			       sg[i].length);</div><div class='add'>+			kunmap_atomic(from, KM_USER0);</div><div class='add'>+			p += sg[i].length;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sg_init_one(&amp;iser_ctask-&gt;data_copy[cmd_dir].sg_single, mem, cmd_data_len);</div><div class='add'>+	iser_ctask-&gt;data_copy[cmd_dir].buf  =</div><div class='add'>+		&amp;iser_ctask-&gt;data_copy[cmd_dir].sg_single;</div><div class='add'>+	iser_ctask-&gt;data_copy[cmd_dir].size = 1;</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;data_copy[cmd_dir].copy_buf  = mem;</div><div class='add'>+</div><div class='add'>+	dma_device = iser_ctask-&gt;iser_conn-&gt;ib_conn-&gt;device-&gt;ib_device-&gt;dma_device;</div><div class='add'>+</div><div class='add'>+	if (cmd_dir == ISER_DIR_OUT)</div><div class='add'>+		dma_nents = dma_map_sg(dma_device,</div><div class='add'>+				       &amp;iser_ctask-&gt;data_copy[cmd_dir].sg_single,</div><div class='add'>+				       1, DMA_TO_DEVICE);</div><div class='add'>+	else</div><div class='add'>+		dma_nents = dma_map_sg(dma_device,</div><div class='add'>+				       &amp;iser_ctask-&gt;data_copy[cmd_dir].sg_single,</div><div class='add'>+				       1, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	BUG_ON(dma_nents == 0);</div><div class='add'>+</div><div class='add'>+	iser_ctask-&gt;data_copy[cmd_dir].dma_nents = dma_nents;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_finalize_rdma_unaligned_sg</div><div class='add'>+ */</div><div class='add'>+void iser_finalize_rdma_unaligned_sg(struct iscsi_iser_cmd_task *iser_ctask,</div><div class='add'>+				     enum iser_data_dir         cmd_dir)</div><div class='add'>+{</div><div class='add'>+	struct device *dma_device;</div><div class='add'>+	struct iser_data_buf *mem_copy;</div><div class='add'>+	unsigned long  cmd_data_len;</div><div class='add'>+</div><div class='add'>+	dma_device = iser_ctask-&gt;iser_conn-&gt;ib_conn-&gt;device-&gt;ib_device-&gt;dma_device;</div><div class='add'>+	mem_copy   = &amp;iser_ctask-&gt;data_copy[cmd_dir];</div><div class='add'>+</div><div class='add'>+	if (cmd_dir == ISER_DIR_OUT)</div><div class='add'>+		dma_unmap_sg(dma_device, &amp;mem_copy-&gt;sg_single, 1,</div><div class='add'>+			     DMA_TO_DEVICE);</div><div class='add'>+	else</div><div class='add'>+		dma_unmap_sg(dma_device, &amp;mem_copy-&gt;sg_single, 1,</div><div class='add'>+			     DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (cmd_dir == ISER_DIR_IN) {</div><div class='add'>+		char *mem;</div><div class='add'>+		struct scatterlist *sg;</div><div class='add'>+		unsigned char *p, *to;</div><div class='add'>+		unsigned int sg_size;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		/* copy back read RDMA to unaligned sg */</div><div class='add'>+		mem	= mem_copy-&gt;copy_buf;</div><div class='add'>+</div><div class='add'>+		sg	= (struct scatterlist *)iser_ctask-&gt;data[ISER_DIR_IN].buf;</div><div class='add'>+		sg_size = iser_ctask-&gt;data[ISER_DIR_IN].size;</div><div class='add'>+</div><div class='add'>+		for (p = mem, i = 0; i &lt; sg_size; i++){</div><div class='add'>+			to = kmap_atomic(sg[i].page, KM_SOFTIRQ0);</div><div class='add'>+			memcpy(to + sg[i].offset,</div><div class='add'>+			       p,</div><div class='add'>+			       sg[i].length);</div><div class='add'>+			kunmap_atomic(to, KM_SOFTIRQ0);</div><div class='add'>+			p += sg[i].length;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd_data_len = iser_ctask-&gt;data[cmd_dir].data_len;</div><div class='add'>+</div><div class='add'>+	if (cmd_data_len &gt; ISER_KMALLOC_THRESHOLD)</div><div class='add'>+		free_pages((unsigned long)mem_copy-&gt;copy_buf,</div><div class='add'>+			   long_log2(roundup_pow_of_two(cmd_data_len)) - PAGE_SHIFT);</div><div class='add'>+	else</div><div class='add'>+		kfree(mem_copy-&gt;copy_buf);</div><div class='add'>+</div><div class='add'>+	mem_copy-&gt;copy_buf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_sg_to_page_vec - Translates scatterlist entries to physical addresses</div><div class='add'>+ * and returns the length of resulting physical address array (may be less than</div><div class='add'>+ * the original due to possible compaction).</div><div class='add'>+ *</div><div class='add'>+ * we build a "page vec" under the assumption that the SG meets the RDMA</div><div class='add'>+ * alignment requirements. Other then the first and last SG elements, all</div><div class='add'>+ * the "internal" elements can be compacted into a list whose elements are</div><div class='add'>+ * dma addresses of physical pages. The code supports also the weird case</div><div class='add'>+ * where --few fragments of the same page-- are present in the SG as</div><div class='add'>+ * consecutive elements. Also, it handles one entry SG.</div><div class='add'>+ */</div><div class='add'>+static int iser_sg_to_page_vec(struct iser_data_buf *data,</div><div class='add'>+			       struct iser_page_vec *page_vec)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg = (struct scatterlist *)data-&gt;buf;</div><div class='add'>+	dma_addr_t first_addr, last_addr, page;</div><div class='add'>+	int start_aligned, end_aligned;</div><div class='add'>+	unsigned int cur_page = 0;</div><div class='add'>+	unsigned long total_sz = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* compute the offset of first element */</div><div class='add'>+	page_vec-&gt;offset = (u64) sg[0].offset;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;dma_nents; i++) {</div><div class='add'>+		total_sz += sg_dma_len(&amp;sg[i]);</div><div class='add'>+</div><div class='add'>+		first_addr = sg_dma_address(&amp;sg[i]);</div><div class='add'>+		last_addr  = first_addr + sg_dma_len(&amp;sg[i]);</div><div class='add'>+</div><div class='add'>+		start_aligned = !(first_addr &amp; ~PAGE_MASK);</div><div class='add'>+		end_aligned   = !(last_addr  &amp; ~PAGE_MASK);</div><div class='add'>+</div><div class='add'>+		/* continue to collect page fragments till aligned or SG ends */</div><div class='add'>+		while (!end_aligned &amp;&amp; (i + 1 &lt; data-&gt;dma_nents)) {</div><div class='add'>+			i++;</div><div class='add'>+			total_sz += sg_dma_len(&amp;sg[i]);</div><div class='add'>+			last_addr = sg_dma_address(&amp;sg[i]) + sg_dma_len(&amp;sg[i]);</div><div class='add'>+			end_aligned = !(last_addr  &amp; ~PAGE_MASK);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		first_addr = first_addr &amp; PAGE_MASK;</div><div class='add'>+</div><div class='add'>+		for (page = first_addr; page &lt; last_addr; page += PAGE_SIZE)</div><div class='add'>+			page_vec-&gt;pages[cur_page++] = page;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	page_vec-&gt;data_size = total_sz;</div><div class='add'>+	iser_dbg("page_vec-&gt;data_size:%d cur_page %d\n", page_vec-&gt;data_size,cur_page);</div><div class='add'>+	return cur_page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MASK_4K			((1UL &lt;&lt; 12) - 1) /* 0xFFF */</div><div class='add'>+#define IS_4K_ALIGNED(addr)	((((unsigned long)addr) &amp; MASK_4K) == 0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_data_buf_aligned_len - Tries to determine the maximal correctly aligned</div><div class='add'>+ * for RDMA sub-list of a scatter-gather list of memory buffers, and  returns</div><div class='add'>+ * the number of entries which are aligned correctly. Supports the case where</div><div class='add'>+ * consecutive SG elements are actually fragments of the same physcial page.</div><div class='add'>+ */</div><div class='add'>+static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg;</div><div class='add'>+	dma_addr_t end_addr, next_addr;</div><div class='add'>+	int i, cnt;</div><div class='add'>+	unsigned int ret_len = 0;</div><div class='add'>+</div><div class='add'>+	sg = (struct scatterlist *)data-&gt;buf;</div><div class='add'>+</div><div class='add'>+	for (cnt = 0, i = 0; i &lt; data-&gt;dma_nents; i++, cnt++) {</div><div class='add'>+		/* iser_dbg("Checking sg iobuf [%d]: phys=0x%08lX "</div><div class='add'>+		   "offset: %ld sz: %ld\n", i,</div><div class='add'>+		   (unsigned long)page_to_phys(sg[i].page),</div><div class='add'>+		   (unsigned long)sg[i].offset,</div><div class='add'>+		   (unsigned long)sg[i].length); */</div><div class='add'>+		end_addr = sg_dma_address(&amp;sg[i]) +</div><div class='add'>+			   sg_dma_len(&amp;sg[i]);</div><div class='add'>+		/* iser_dbg("Checking sg iobuf end address "</div><div class='add'>+		       "0x%08lX\n", end_addr); */</div><div class='add'>+		if (i + 1 &lt; data-&gt;dma_nents) {</div><div class='add'>+			next_addr = sg_dma_address(&amp;sg[i+1]);</div><div class='add'>+			/* are i, i+1 fragments of the same page? */</div><div class='add'>+			if (end_addr == next_addr)</div><div class='add'>+				continue;</div><div class='add'>+			else if (!IS_4K_ALIGNED(end_addr)) {</div><div class='add'>+				ret_len = cnt + 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == data-&gt;dma_nents)</div><div class='add'>+		ret_len = cnt;	/* loop ended */</div><div class='add'>+	iser_dbg("Found %d aligned entries out of %d in sg:0x%p\n",</div><div class='add'>+		 ret_len, data-&gt;dma_nents, data);</div><div class='add'>+	return ret_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_data_buf_dump(struct iser_data_buf *data)</div><div class='add'>+{</div><div class='add'>+	struct scatterlist *sg = (struct scatterlist *)data-&gt;buf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data-&gt;size; i++)</div><div class='add'>+		iser_err("sg[%d] dma_addr:0x%lX page:0x%p "</div><div class='add'>+			 "off:%d sz:%d dma_len:%d\n",</div><div class='add'>+			 i, (unsigned long)sg_dma_address(&amp;sg[i]),</div><div class='add'>+			 sg[i].page, sg[i].offset,</div><div class='add'>+			 sg[i].length,sg_dma_len(&amp;sg[i]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_dump_page_vec(struct iser_page_vec *page_vec)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	iser_err("page vec length %d data size %d\n",</div><div class='add'>+		 page_vec-&gt;length, page_vec-&gt;data_size);</div><div class='add'>+	for (i = 0; i &lt; page_vec-&gt;length; i++)</div><div class='add'>+		iser_err("%d %lx\n",i,(unsigned long)page_vec-&gt;pages[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_page_vec_build(struct iser_data_buf *data,</div><div class='add'>+				struct iser_page_vec *page_vec)</div><div class='add'>+{</div><div class='add'>+	int page_vec_len = 0;</div><div class='add'>+</div><div class='add'>+	page_vec-&gt;length = 0;</div><div class='add'>+	page_vec-&gt;offset = 0;</div><div class='add'>+</div><div class='add'>+	iser_dbg("Translating sg sz: %d\n", data-&gt;dma_nents);</div><div class='add'>+	page_vec_len = iser_sg_to_page_vec(data,page_vec);</div><div class='add'>+	iser_dbg("sg len %d page_vec_len %d\n", data-&gt;dma_nents,page_vec_len);</div><div class='add'>+</div><div class='add'>+	page_vec-&gt;length = page_vec_len;</div><div class='add'>+</div><div class='add'>+	if (page_vec_len * PAGE_SIZE &lt; page_vec-&gt;data_size) {</div><div class='add'>+		iser_err("page_vec too short to hold this SG\n");</div><div class='add'>+		iser_data_buf_dump(data);</div><div class='add'>+		iser_dump_page_vec(page_vec);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_reg_rdma_mem - Registers memory intended for RDMA,</div><div class='add'>+ * obtaining rkey and va</div><div class='add'>+ *</div><div class='add'>+ * returns 0 on success, errno code on failure</div><div class='add'>+ */</div><div class='add'>+int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,</div><div class='add'>+		      enum   iser_data_dir        cmd_dir)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn     *ib_conn = iser_ctask-&gt;iser_conn-&gt;ib_conn;</div><div class='add'>+	struct iser_data_buf *mem = &amp;iser_ctask-&gt;data[cmd_dir];</div><div class='add'>+	struct iser_regd_buf *regd_buf;</div><div class='add'>+	int aligned_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	regd_buf = &amp;iser_ctask-&gt;rdma_regd[cmd_dir];</div><div class='add'>+</div><div class='add'>+	aligned_len = iser_data_buf_aligned_len(mem);</div><div class='add'>+	if (aligned_len != mem-&gt;size) {</div><div class='add'>+		iser_err("rdma alignment violation %d/%d aligned\n",</div><div class='add'>+			 aligned_len, mem-&gt;size);</div><div class='add'>+		iser_data_buf_dump(mem);</div><div class='add'>+		/* allocate copy buf, if we are writing, copy the */</div><div class='add'>+		/* unaligned scatterlist, dma map the copy        */</div><div class='add'>+		if (iser_start_rdma_unaligned_sg(iser_ctask, cmd_dir) != 0)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		mem = &amp;iser_ctask-&gt;data_copy[cmd_dir];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iser_page_vec_build(mem, ib_conn-&gt;page_vec);</div><div class='add'>+	err = iser_reg_page_vec(ib_conn, ib_conn-&gt;page_vec, &amp;regd_buf-&gt;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* take a reference on this regd buf such that it will not be released *</div><div class='add'>+	 * (eg in send dto completion) before we get the scsi response         */</div><div class='add'>+	atomic_inc(&amp;regd_buf-&gt;ref_count);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c<br/>new file mode 100644<br/>index 000000000000..72febf1f8ff8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/iser/iser_verbs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/iser/iser_verbs.c</a></div><div class='hunk'>@@ -0,0 +1,827 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2004, 2005, 2006 Voltaire, Inc. All rights reserved.</div><div class='add'>+ * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions of source code must retain the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *	- Redistributions in binary form must reproduce the above</div><div class='add'>+ *	  copyright notice, this list of conditions and the following</div><div class='add'>+ *	  disclaimer in the documentation and/or other materials</div><div class='add'>+ *	  provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * $Id: iser_verbs.c 7051 2006-05-10 12:29:11Z ogerlitz $</div><div class='add'>+ */</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include "iscsi_iser.h"</div><div class='add'>+</div><div class='add'>+#define ISCSI_ISER_MAX_CONN	8</div><div class='add'>+#define ISER_MAX_CQ_LEN		((ISER_QP_MAX_RECV_DTOS + \</div><div class='add'>+				ISER_QP_MAX_REQ_DTOS) *   \</div><div class='add'>+				 ISCSI_ISER_MAX_CONN)</div><div class='add'>+</div><div class='add'>+static void iser_cq_tasklet_fn(unsigned long data);</div><div class='add'>+static void iser_cq_callback(struct ib_cq *cq, void *cq_context);</div><div class='add'>+static void iser_comp_error_worker(void *data);</div><div class='add'>+</div><div class='add'>+static void iser_cq_event_callback(struct ib_event *cause, void *context)</div><div class='add'>+{</div><div class='add'>+	iser_err("got cq event %d \n", cause-&gt;event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_qp_event_callback(struct ib_event *cause, void *context)</div><div class='add'>+{</div><div class='add'>+	iser_err("got qp event %d\n",cause-&gt;event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_create_device_ib_res - creates Protection Domain (PD), Completion</div><div class='add'>+ * Queue (CQ), DMA Memory Region (DMA MR) with the device associated with</div><div class='add'>+ * the adapator.</div><div class='add'>+ *</div><div class='add'>+ * returns 0 on success, -1 on failure</div><div class='add'>+ */</div><div class='add'>+static int iser_create_device_ib_res(struct iser_device *device)</div><div class='add'>+{</div><div class='add'>+	device-&gt;pd = ib_alloc_pd(device-&gt;ib_device);</div><div class='add'>+	if (IS_ERR(device-&gt;pd))</div><div class='add'>+		goto pd_err;</div><div class='add'>+</div><div class='add'>+	device-&gt;cq = ib_create_cq(device-&gt;ib_device,</div><div class='add'>+				  iser_cq_callback,</div><div class='add'>+				  iser_cq_event_callback,</div><div class='add'>+				  (void *)device,</div><div class='add'>+				  ISER_MAX_CQ_LEN);</div><div class='add'>+	if (IS_ERR(device-&gt;cq))</div><div class='add'>+		goto cq_err;</div><div class='add'>+</div><div class='add'>+	if (ib_req_notify_cq(device-&gt;cq, IB_CQ_NEXT_COMP))</div><div class='add'>+		goto cq_arm_err;</div><div class='add'>+</div><div class='add'>+	tasklet_init(&amp;device-&gt;cq_tasklet,</div><div class='add'>+		     iser_cq_tasklet_fn,</div><div class='add'>+		     (unsigned long)device);</div><div class='add'>+</div><div class='add'>+	device-&gt;mr = ib_get_dma_mr(device-&gt;pd,</div><div class='add'>+				   IB_ACCESS_LOCAL_WRITE);</div><div class='add'>+	if (IS_ERR(device-&gt;mr))</div><div class='add'>+		goto dma_mr_err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+dma_mr_err:</div><div class='add'>+	tasklet_kill(&amp;device-&gt;cq_tasklet);</div><div class='add'>+cq_arm_err:</div><div class='add'>+	ib_destroy_cq(device-&gt;cq);</div><div class='add'>+cq_err:</div><div class='add'>+	ib_dealloc_pd(device-&gt;pd);</div><div class='add'>+pd_err:</div><div class='add'>+	iser_err("failed to allocate an IB resource\n");</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_free_device_ib_res - destory/dealloc/dereg the DMA MR,</div><div class='add'>+ * CQ and PD created with the device associated with the adapator.</div><div class='add'>+ */</div><div class='add'>+static void iser_free_device_ib_res(struct iser_device *device)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(device-&gt;mr == NULL);</div><div class='add'>+</div><div class='add'>+	tasklet_kill(&amp;device-&gt;cq_tasklet);</div><div class='add'>+</div><div class='add'>+	(void)ib_dereg_mr(device-&gt;mr);</div><div class='add'>+	(void)ib_destroy_cq(device-&gt;cq);</div><div class='add'>+	(void)ib_dealloc_pd(device-&gt;pd);</div><div class='add'>+</div><div class='add'>+	device-&gt;mr = NULL;</div><div class='add'>+	device-&gt;cq = NULL;</div><div class='add'>+	device-&gt;pd = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_create_ib_conn_res - Creates FMR pool and Queue-Pair (QP)</div><div class='add'>+ *</div><div class='add'>+ * returns 0 on success, -1 on failure</div><div class='add'>+ */</div><div class='add'>+static int iser_create_ib_conn_res(struct iser_conn *ib_conn)</div><div class='add'>+{</div><div class='add'>+	struct iser_device	*device;</div><div class='add'>+	struct ib_qp_init_attr	init_attr;</div><div class='add'>+	int			ret;</div><div class='add'>+	struct ib_fmr_pool_param params;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ib_conn-&gt;device == NULL);</div><div class='add'>+</div><div class='add'>+	device = ib_conn-&gt;device;</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;page_vec = kmalloc(sizeof(struct iser_page_vec) +</div><div class='add'>+				    (sizeof(u64) * (ISCSI_ISER_SG_TABLESIZE +1)),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!ib_conn-&gt;page_vec) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto alloc_err;</div><div class='add'>+	}</div><div class='add'>+	ib_conn-&gt;page_vec-&gt;pages = (u64 *) (ib_conn-&gt;page_vec + 1);</div><div class='add'>+</div><div class='add'>+	params.page_shift        = PAGE_SHIFT;</div><div class='add'>+	/* when the first/last SG element are not start/end *</div><div class='add'>+	 * page aligned, the map whould be of N+1 pages     */</div><div class='add'>+	params.max_pages_per_fmr = ISCSI_ISER_SG_TABLESIZE + 1;</div><div class='add'>+	/* make the pool size twice the max number of SCSI commands *</div><div class='add'>+	 * the ML is expected to queue, watermark for unmap at 50%  */</div><div class='add'>+	params.pool_size	 = ISCSI_XMIT_CMDS_MAX * 2;</div><div class='add'>+	params.dirty_watermark	 = ISCSI_XMIT_CMDS_MAX;</div><div class='add'>+	params.cache		 = 0;</div><div class='add'>+	params.flush_function	 = NULL;</div><div class='add'>+	params.access		 = (IB_ACCESS_LOCAL_WRITE  |</div><div class='add'>+				    IB_ACCESS_REMOTE_WRITE |</div><div class='add'>+				    IB_ACCESS_REMOTE_READ);</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;fmr_pool = ib_create_fmr_pool(device-&gt;pd, &amp;params);</div><div class='add'>+	if (IS_ERR(ib_conn-&gt;fmr_pool)) {</div><div class='add'>+		ret = PTR_ERR(ib_conn-&gt;fmr_pool);</div><div class='add'>+		goto fmr_pool_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;init_attr, 0, sizeof init_attr);</div><div class='add'>+</div><div class='add'>+	init_attr.event_handler = iser_qp_event_callback;</div><div class='add'>+	init_attr.qp_context	= (void *)ib_conn;</div><div class='add'>+	init_attr.send_cq	= device-&gt;cq;</div><div class='add'>+	init_attr.recv_cq	= device-&gt;cq;</div><div class='add'>+	init_attr.cap.max_send_wr  = ISER_QP_MAX_REQ_DTOS;</div><div class='add'>+	init_attr.cap.max_recv_wr  = ISER_QP_MAX_RECV_DTOS;</div><div class='add'>+	init_attr.cap.max_send_sge = MAX_REGD_BUF_VECTOR_LEN;</div><div class='add'>+	init_attr.cap.max_recv_sge = 2;</div><div class='add'>+	init_attr.sq_sig_type	= IB_SIGNAL_REQ_WR;</div><div class='add'>+	init_attr.qp_type	= IB_QPT_RC;</div><div class='add'>+</div><div class='add'>+	ret = rdma_create_qp(ib_conn-&gt;cma_id, device-&gt;pd, &amp;init_attr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto qp_err;</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;qp = ib_conn-&gt;cma_id-&gt;qp;</div><div class='add'>+	iser_err("setting conn %p cma_id %p: fmr_pool %p qp %p\n",</div><div class='add'>+		 ib_conn, ib_conn-&gt;cma_id,</div><div class='add'>+		 ib_conn-&gt;fmr_pool, ib_conn-&gt;cma_id-&gt;qp);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+qp_err:</div><div class='add'>+	(void)ib_destroy_fmr_pool(ib_conn-&gt;fmr_pool);</div><div class='add'>+fmr_pool_err:</div><div class='add'>+	kfree(ib_conn-&gt;page_vec);</div><div class='add'>+alloc_err:</div><div class='add'>+	iser_err("unable to alloc mem or create resource, err %d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * releases the FMR pool, QP and CMA ID objects, returns 0 on success,</div><div class='add'>+ * -1 on failure</div><div class='add'>+ */</div><div class='add'>+static int iser_free_ib_conn_res(struct iser_conn *ib_conn)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(ib_conn == NULL);</div><div class='add'>+</div><div class='add'>+	iser_err("freeing conn %p cma_id %p fmr pool %p qp %p\n",</div><div class='add'>+		 ib_conn, ib_conn-&gt;cma_id,</div><div class='add'>+		 ib_conn-&gt;fmr_pool, ib_conn-&gt;qp);</div><div class='add'>+</div><div class='add'>+	/* qp is created only once both addr &amp; route are resolved */</div><div class='add'>+	if (ib_conn-&gt;fmr_pool != NULL)</div><div class='add'>+		ib_destroy_fmr_pool(ib_conn-&gt;fmr_pool);</div><div class='add'>+</div><div class='add'>+	if (ib_conn-&gt;qp != NULL)</div><div class='add'>+		rdma_destroy_qp(ib_conn-&gt;cma_id);</div><div class='add'>+</div><div class='add'>+	if (ib_conn-&gt;cma_id != NULL)</div><div class='add'>+		rdma_destroy_id(ib_conn-&gt;cma_id);</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;fmr_pool = NULL;</div><div class='add'>+	ib_conn-&gt;qp	  = NULL;</div><div class='add'>+	ib_conn-&gt;cma_id   = NULL;</div><div class='add'>+	kfree(ib_conn-&gt;page_vec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * based on the resolved device node GUID see if there already allocated</div><div class='add'>+ * device for this device. If there's no such, create one.</div><div class='add'>+ */</div><div class='add'>+static</div><div class='add'>+struct iser_device *iser_device_find_by_ib_device(struct rdma_cm_id *cma_id)</div><div class='add'>+{</div><div class='add'>+	struct list_head    *p_list;</div><div class='add'>+	struct iser_device  *device = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ig.device_list_mutex);</div><div class='add'>+</div><div class='add'>+	p_list = ig.device_list.next;</div><div class='add'>+	while (p_list != &amp;ig.device_list) {</div><div class='add'>+		device = list_entry(p_list, struct iser_device, ig_list);</div><div class='add'>+		/* find if there's a match using the node GUID */</div><div class='add'>+		if (device-&gt;ib_device-&gt;node_guid == cma_id-&gt;device-&gt;node_guid)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (device == NULL) {</div><div class='add'>+		device = kzalloc(sizeof *device, GFP_KERNEL);</div><div class='add'>+		if (device == NULL)</div><div class='add'>+			goto out;</div><div class='add'>+		/* assign this device to the device */</div><div class='add'>+		device-&gt;ib_device = cma_id-&gt;device;</div><div class='add'>+		/* init the device and link it into ig device list */</div><div class='add'>+		if (iser_create_device_ib_res(device)) {</div><div class='add'>+			kfree(device);</div><div class='add'>+			device = NULL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		list_add(&amp;device-&gt;ig_list, &amp;ig.device_list);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	BUG_ON(device == NULL);</div><div class='add'>+	device-&gt;refcount++;</div><div class='add'>+	mutex_unlock(&amp;ig.device_list_mutex);</div><div class='add'>+	return device;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* if there's no demand for this device, release it */</div><div class='add'>+static void iser_device_try_release(struct iser_device *device)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;ig.device_list_mutex);</div><div class='add'>+	device-&gt;refcount--;</div><div class='add'>+	iser_err("device %p refcount %d\n",device,device-&gt;refcount);</div><div class='add'>+	if (!device-&gt;refcount) {</div><div class='add'>+		iser_free_device_ib_res(device);</div><div class='add'>+		list_del(&amp;device-&gt;ig_list);</div><div class='add'>+		kfree(device);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ig.device_list_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iser_conn_state_comp(struct iser_conn *ib_conn,</div><div class='add'>+			enum iser_ib_conn_state comp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ib_conn-&gt;lock);</div><div class='add'>+	ret = (ib_conn-&gt;state == comp);</div><div class='add'>+	spin_unlock_bh(&amp;ib_conn-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iser_conn_state_comp_exch(struct iser_conn *ib_conn,</div><div class='add'>+				     enum iser_ib_conn_state comp,</div><div class='add'>+				     enum iser_ib_conn_state exch)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ib_conn-&gt;lock);</div><div class='add'>+	if ((ret = (ib_conn-&gt;state == comp)))</div><div class='add'>+		ib_conn-&gt;state = exch;</div><div class='add'>+	spin_unlock_bh(&amp;ib_conn-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * triggers start of the disconnect procedures and wait for them to be done</div><div class='add'>+ */</div><div class='add'>+void iser_conn_terminate(struct iser_conn *ib_conn)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* change the ib conn state only if the conn is UP, however always call</div><div class='add'>+	 * rdma_disconnect since this is the only way to cause the CMA to change</div><div class='add'>+	 * the QP state to ERROR</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	iser_conn_state_comp_exch(ib_conn, ISER_CONN_UP, ISER_CONN_TERMINATING);</div><div class='add'>+	err = rdma_disconnect(ib_conn-&gt;cma_id);</div><div class='add'>+	if (err)</div><div class='add'>+		iser_err("Failed to disconnect, conn: 0x%p err %d\n",</div><div class='add'>+			 ib_conn,err);</div><div class='add'>+</div><div class='add'>+	wait_event_interruptible(ib_conn-&gt;wait,</div><div class='add'>+				 ib_conn-&gt;state == ISER_CONN_DOWN);</div><div class='add'>+</div><div class='add'>+	iser_conn_release(ib_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_connect_error(struct rdma_cm_id *cma_id)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+	ib_conn = (struct iser_conn *)cma_id-&gt;context;</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;state = ISER_CONN_DOWN;</div><div class='add'>+	wake_up_interruptible(&amp;ib_conn-&gt;wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_addr_handler(struct rdma_cm_id *cma_id)</div><div class='add'>+{</div><div class='add'>+	struct iser_device *device;</div><div class='add'>+	struct iser_conn   *ib_conn;</div><div class='add'>+	int    ret;</div><div class='add'>+</div><div class='add'>+	device = iser_device_find_by_ib_device(cma_id);</div><div class='add'>+	ib_conn = (struct iser_conn *)cma_id-&gt;context;</div><div class='add'>+	ib_conn-&gt;device = device;</div><div class='add'>+</div><div class='add'>+	ret = rdma_resolve_route(cma_id, 1000);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iser_err("resolve route failed: %d\n", ret);</div><div class='add'>+		iser_connect_error(cma_id);</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_route_handler(struct rdma_cm_id *cma_id)</div><div class='add'>+{</div><div class='add'>+	struct rdma_conn_param conn_param;</div><div class='add'>+	int    ret;</div><div class='add'>+</div><div class='add'>+	ret = iser_create_ib_conn_res((struct iser_conn *)cma_id-&gt;context);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	iser_dbg("path.mtu is %d setting it to %d\n",</div><div class='add'>+		 cma_id-&gt;route.path_rec-&gt;mtu, IB_MTU_1024);</div><div class='add'>+</div><div class='add'>+	/* we must set the MTU to 1024 as this is what the target is assuming */</div><div class='add'>+	if (cma_id-&gt;route.path_rec-&gt;mtu &gt; IB_MTU_1024)</div><div class='add'>+		cma_id-&gt;route.path_rec-&gt;mtu = IB_MTU_1024;</div><div class='add'>+</div><div class='add'>+	memset(&amp;conn_param, 0, sizeof conn_param);</div><div class='add'>+	conn_param.responder_resources = 4;</div><div class='add'>+	conn_param.initiator_depth     = 1;</div><div class='add'>+	conn_param.retry_count	       = 7;</div><div class='add'>+	conn_param.rnr_retry_count     = 6;</div><div class='add'>+</div><div class='add'>+	ret = rdma_connect(cma_id, &amp;conn_param);</div><div class='add'>+	if (ret) {</div><div class='add'>+		iser_err("failure connecting: %d\n", ret);</div><div class='add'>+		goto failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+failure:</div><div class='add'>+	iser_connect_error(cma_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_connected_handler(struct rdma_cm_id *cma_id)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+</div><div class='add'>+	ib_conn = (struct iser_conn *)cma_id-&gt;context;</div><div class='add'>+	ib_conn-&gt;state = ISER_CONN_UP;</div><div class='add'>+	wake_up_interruptible(&amp;ib_conn-&gt;wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_disconnected_handler(struct rdma_cm_id *cma_id)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+</div><div class='add'>+	ib_conn = (struct iser_conn *)cma_id-&gt;context;</div><div class='add'>+	ib_conn-&gt;disc_evt_flag = 1;</div><div class='add'>+</div><div class='add'>+	/* getting here when the state is UP means that the conn is being *</div><div class='add'>+	 * terminated asynchronously from the iSCSI layer's perspective.  */</div><div class='add'>+	if (iser_conn_state_comp_exch(ib_conn, ISER_CONN_UP,</div><div class='add'>+				      ISER_CONN_TERMINATING))</div><div class='add'>+		iscsi_conn_failure(ib_conn-&gt;iser_conn-&gt;iscsi_conn,</div><div class='add'>+				   ISCSI_ERR_CONN_FAILED);</div><div class='add'>+</div><div class='add'>+	/* Complete the termination process if no posts are pending */</div><div class='add'>+	if ((atomic_read(&amp;ib_conn-&gt;post_recv_buf_count) == 0) &amp;&amp;</div><div class='add'>+	    (atomic_read(&amp;ib_conn-&gt;post_send_buf_count) == 0)) {</div><div class='add'>+		ib_conn-&gt;state = ISER_CONN_DOWN;</div><div class='add'>+		wake_up_interruptible(&amp;ib_conn-&gt;wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iser_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	iser_err("event %d conn %p id %p\n",event-&gt;event,cma_id-&gt;context,cma_id);</div><div class='add'>+</div><div class='add'>+	switch (event-&gt;event) {</div><div class='add'>+	case RDMA_CM_EVENT_ADDR_RESOLVED:</div><div class='add'>+		iser_addr_handler(cma_id);</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_ROUTE_RESOLVED:</div><div class='add'>+		iser_route_handler(cma_id);</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_ESTABLISHED:</div><div class='add'>+		iser_connected_handler(cma_id);</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_ADDR_ERROR:</div><div class='add'>+	case RDMA_CM_EVENT_ROUTE_ERROR:</div><div class='add'>+	case RDMA_CM_EVENT_CONNECT_ERROR:</div><div class='add'>+	case RDMA_CM_EVENT_UNREACHABLE:</div><div class='add'>+	case RDMA_CM_EVENT_REJECTED:</div><div class='add'>+		iser_err("event: %d, error: %d\n", event-&gt;event, event-&gt;status);</div><div class='add'>+		iser_connect_error(cma_id);</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_DISCONNECTED:</div><div class='add'>+		iser_disconnected_handler(cma_id);</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_DEVICE_REMOVAL:</div><div class='add'>+		BUG();</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_CONNECT_RESPONSE:</div><div class='add'>+		BUG();</div><div class='add'>+		break;</div><div class='add'>+	case RDMA_CM_EVENT_CONNECT_REQUEST:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iser_conn_init(struct iser_conn **ibconn)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn;</div><div class='add'>+</div><div class='add'>+	ib_conn = kzalloc(sizeof *ib_conn, GFP_KERNEL);</div><div class='add'>+	if (!ib_conn) {</div><div class='add'>+		iser_err("can't alloc memory for struct iser_conn\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	ib_conn-&gt;state = ISER_CONN_INIT;</div><div class='add'>+	init_waitqueue_head(&amp;ib_conn-&gt;wait);</div><div class='add'>+	atomic_set(&amp;ib_conn-&gt;post_recv_buf_count, 0);</div><div class='add'>+	atomic_set(&amp;ib_conn-&gt;post_send_buf_count, 0);</div><div class='add'>+	INIT_WORK(&amp;ib_conn-&gt;comperror_work, iser_comp_error_worker,</div><div class='add'>+		  ib_conn);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ib_conn-&gt;conn_list);</div><div class='add'>+	spin_lock_init(&amp;ib_conn-&gt;lock);</div><div class='add'>+</div><div class='add'>+	*ibconn = ib_conn;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ /**</div><div class='add'>+ * starts the process of connecting to the target</div><div class='add'>+ * sleeps untill the connection is established or rejected</div><div class='add'>+ */</div><div class='add'>+int iser_connect(struct iser_conn   *ib_conn,</div><div class='add'>+		 struct sockaddr_in *src_addr,</div><div class='add'>+		 struct sockaddr_in *dst_addr,</div><div class='add'>+		 int                 non_blocking)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *src, *dst;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	sprintf(ib_conn-&gt;name,"%d.%d.%d.%d:%d",</div><div class='add'>+		NIPQUAD(dst_addr-&gt;sin_addr.s_addr), dst_addr-&gt;sin_port);</div><div class='add'>+</div><div class='add'>+	/* the device is known only --after-- address resolution */</div><div class='add'>+	ib_conn-&gt;device = NULL;</div><div class='add'>+</div><div class='add'>+	iser_err("connecting to: %d.%d.%d.%d, port 0x%x\n",</div><div class='add'>+		 NIPQUAD(dst_addr-&gt;sin_addr), dst_addr-&gt;sin_port);</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;state = ISER_CONN_PENDING;</div><div class='add'>+</div><div class='add'>+	ib_conn-&gt;cma_id = rdma_create_id(iser_cma_handler,</div><div class='add'>+					     (void *)ib_conn,</div><div class='add'>+					     RDMA_PS_TCP);</div><div class='add'>+	if (IS_ERR(ib_conn-&gt;cma_id)) {</div><div class='add'>+		err = PTR_ERR(ib_conn-&gt;cma_id);</div><div class='add'>+		iser_err("rdma_create_id failed: %d\n", err);</div><div class='add'>+		goto id_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	src = (struct sockaddr *)src_addr;</div><div class='add'>+	dst = (struct sockaddr *)dst_addr;</div><div class='add'>+	err = rdma_resolve_addr(ib_conn-&gt;cma_id, src, dst, 1000);</div><div class='add'>+	if (err) {</div><div class='add'>+		iser_err("rdma_resolve_addr failed: %d\n", err);</div><div class='add'>+		goto addr_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!non_blocking) {</div><div class='add'>+		wait_event_interruptible(ib_conn-&gt;wait,</div><div class='add'>+					 (ib_conn-&gt;state != ISER_CONN_PENDING));</div><div class='add'>+</div><div class='add'>+		if (ib_conn-&gt;state != ISER_CONN_UP) {</div><div class='add'>+			err =  -EIO;</div><div class='add'>+			goto connect_failure;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ig.connlist_mutex);</div><div class='add'>+	list_add(&amp;ib_conn-&gt;conn_list, &amp;ig.connlist);</div><div class='add'>+	mutex_unlock(&amp;ig.connlist_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+id_failure:</div><div class='add'>+	ib_conn-&gt;cma_id = NULL;</div><div class='add'>+addr_failure:</div><div class='add'>+	ib_conn-&gt;state = ISER_CONN_DOWN;</div><div class='add'>+connect_failure:</div><div class='add'>+	iser_conn_release(ib_conn);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Frees all conn objects and deallocs conn descriptor</div><div class='add'>+ */</div><div class='add'>+void iser_conn_release(struct iser_conn *ib_conn)</div><div class='add'>+{</div><div class='add'>+	struct iser_device  *device = ib_conn-&gt;device;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ib_conn-&gt;state != ISER_CONN_DOWN);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ig.connlist_mutex);</div><div class='add'>+	list_del(&amp;ib_conn-&gt;conn_list);</div><div class='add'>+	mutex_unlock(&amp;ig.connlist_mutex);</div><div class='add'>+</div><div class='add'>+	iser_free_ib_conn_res(ib_conn);</div><div class='add'>+	ib_conn-&gt;device = NULL;</div><div class='add'>+	/* on EVENT_ADDR_ERROR there's no device yet for this conn */</div><div class='add'>+	if (device != NULL)</div><div class='add'>+		iser_device_try_release(device);</div><div class='add'>+	kfree(ib_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_reg_page_vec - Register physical memory</div><div class='add'>+ *</div><div class='add'>+ * returns: 0 on success, errno code on failure</div><div class='add'>+ */</div><div class='add'>+int iser_reg_page_vec(struct iser_conn     *ib_conn,</div><div class='add'>+		      struct iser_page_vec *page_vec,</div><div class='add'>+		      struct iser_mem_reg  *mem_reg)</div><div class='add'>+{</div><div class='add'>+	struct ib_pool_fmr *mem;</div><div class='add'>+	u64		   io_addr;</div><div class='add'>+	u64		   *page_list;</div><div class='add'>+	int		   status;</div><div class='add'>+</div><div class='add'>+	page_list = page_vec-&gt;pages;</div><div class='add'>+	io_addr	  = page_list[0];</div><div class='add'>+</div><div class='add'>+	mem  = ib_fmr_pool_map_phys(ib_conn-&gt;fmr_pool,</div><div class='add'>+				    page_list,</div><div class='add'>+				    page_vec-&gt;length,</div><div class='add'>+				    io_addr);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(mem)) {</div><div class='add'>+		status = (int)PTR_ERR(mem);</div><div class='add'>+		iser_err("ib_fmr_pool_map_phys failed: %d\n", status);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mem_reg-&gt;lkey  = mem-&gt;fmr-&gt;lkey;</div><div class='add'>+	mem_reg-&gt;rkey  = mem-&gt;fmr-&gt;rkey;</div><div class='add'>+	mem_reg-&gt;len   = page_vec-&gt;length * PAGE_SIZE;</div><div class='add'>+	mem_reg-&gt;va    = io_addr;</div><div class='add'>+	mem_reg-&gt;mem_h = (void *)mem;</div><div class='add'>+</div><div class='add'>+	mem_reg-&gt;va   += page_vec-&gt;offset;</div><div class='add'>+	mem_reg-&gt;len   = page_vec-&gt;data_size;</div><div class='add'>+</div><div class='add'>+	iser_dbg("PHYSICAL Mem.register, [PHYS p_array: 0x%p, sz: %d, "</div><div class='add'>+		 "entry[0]: (0x%08lx,%ld)] -&gt; "</div><div class='add'>+		 "[lkey: 0x%08X mem_h: 0x%p va: 0x%08lX sz: %ld]\n",</div><div class='add'>+		 page_vec, page_vec-&gt;length,</div><div class='add'>+		 (unsigned long)page_vec-&gt;pages[0],</div><div class='add'>+		 (unsigned long)page_vec-&gt;data_size,</div><div class='add'>+		 (unsigned int)mem_reg-&gt;lkey, mem_reg-&gt;mem_h,</div><div class='add'>+		 (unsigned long)mem_reg-&gt;va, (unsigned long)mem_reg-&gt;len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Unregister (previosuly registered) memory.</div><div class='add'>+ */</div><div class='add'>+void iser_unreg_mem(struct iser_mem_reg *reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	iser_dbg("PHYSICAL Mem.Unregister mem_h %p\n",reg-&gt;mem_h);</div><div class='add'>+</div><div class='add'>+	ret = ib_fmr_pool_unmap((struct ib_pool_fmr *)reg-&gt;mem_h);</div><div class='add'>+	if (ret)</div><div class='add'>+		iser_err("ib_fmr_pool_unmap failed %d\n", ret);</div><div class='add'>+</div><div class='add'>+	reg-&gt;mem_h = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_dto_to_iov - builds IOV from a dto descriptor</div><div class='add'>+ */</div><div class='add'>+static void iser_dto_to_iov(struct iser_dto *dto, struct ib_sge *iov, int iov_len)</div><div class='add'>+{</div><div class='add'>+	int		     i;</div><div class='add'>+	struct ib_sge	     *sge;</div><div class='add'>+	struct iser_regd_buf *regd_buf;</div><div class='add'>+</div><div class='add'>+	if (dto-&gt;regd_vector_len &gt; iov_len) {</div><div class='add'>+		iser_err("iov size %d too small for posting dto of len %d\n",</div><div class='add'>+			 iov_len, dto-&gt;regd_vector_len);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dto-&gt;regd_vector_len; i++) {</div><div class='add'>+		sge	    = &amp;iov[i];</div><div class='add'>+		regd_buf  = dto-&gt;regd[i];</div><div class='add'>+</div><div class='add'>+		sge-&gt;addr   = regd_buf-&gt;reg.va;</div><div class='add'>+		sge-&gt;length = regd_buf-&gt;reg.len;</div><div class='add'>+		sge-&gt;lkey   = regd_buf-&gt;reg.lkey;</div><div class='add'>+</div><div class='add'>+		if (dto-&gt;used_sz[i] &gt; 0)  /* Adjust size */</div><div class='add'>+			sge-&gt;length = dto-&gt;used_sz[i];</div><div class='add'>+</div><div class='add'>+		/* offset and length should not exceed the regd buf length */</div><div class='add'>+		if (sge-&gt;length + dto-&gt;offset[i] &gt; regd_buf-&gt;reg.len) {</div><div class='add'>+			iser_err("Used len:%ld + offset:%d, exceed reg.buf.len:"</div><div class='add'>+				 "%ld in dto:0x%p [%d], va:0x%08lX\n",</div><div class='add'>+				 (unsigned long)sge-&gt;length, dto-&gt;offset[i],</div><div class='add'>+				 (unsigned long)regd_buf-&gt;reg.len, dto, i,</div><div class='add'>+				 (unsigned long)sge-&gt;addr);</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sge-&gt;addr += dto-&gt;offset[i]; /* Adjust offset */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_post_recv - Posts a receive buffer.</div><div class='add'>+ *</div><div class='add'>+ * returns 0 on success, -1 on failure</div><div class='add'>+ */</div><div class='add'>+int iser_post_recv(struct iser_desc *rx_desc)</div><div class='add'>+{</div><div class='add'>+	int		  ib_ret, ret_val = 0;</div><div class='add'>+	struct ib_recv_wr recv_wr, *recv_wr_failed;</div><div class='add'>+	struct ib_sge	  iov[2];</div><div class='add'>+	struct iser_conn  *ib_conn;</div><div class='add'>+	struct iser_dto   *recv_dto = &amp;rx_desc-&gt;dto;</div><div class='add'>+</div><div class='add'>+	/* Retrieve conn */</div><div class='add'>+	ib_conn = recv_dto-&gt;conn-&gt;ib_conn;</div><div class='add'>+</div><div class='add'>+	iser_dto_to_iov(recv_dto, iov, 2);</div><div class='add'>+</div><div class='add'>+	recv_wr.next	= NULL;</div><div class='add'>+	recv_wr.sg_list = iov;</div><div class='add'>+	recv_wr.num_sge = recv_dto-&gt;regd_vector_len;</div><div class='add'>+	recv_wr.wr_id	= (unsigned long)rx_desc;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ib_conn-&gt;post_recv_buf_count);</div><div class='add'>+	ib_ret	= ib_post_recv(ib_conn-&gt;qp, &amp;recv_wr, &amp;recv_wr_failed);</div><div class='add'>+	if (ib_ret) {</div><div class='add'>+		iser_err("ib_post_recv failed ret=%d\n", ib_ret);</div><div class='add'>+		atomic_dec(&amp;ib_conn-&gt;post_recv_buf_count);</div><div class='add'>+		ret_val = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iser_start_send - Initiate a Send DTO operation</div><div class='add'>+ *</div><div class='add'>+ * returns 0 on success, -1 on failure</div><div class='add'>+ */</div><div class='add'>+int iser_post_send(struct iser_desc *tx_desc)</div><div class='add'>+{</div><div class='add'>+	int		  ib_ret, ret_val = 0;</div><div class='add'>+	struct ib_send_wr send_wr, *send_wr_failed;</div><div class='add'>+	struct ib_sge	  iov[MAX_REGD_BUF_VECTOR_LEN];</div><div class='add'>+	struct iser_conn  *ib_conn;</div><div class='add'>+	struct iser_dto   *dto = &amp;tx_desc-&gt;dto;</div><div class='add'>+</div><div class='add'>+	ib_conn = dto-&gt;conn-&gt;ib_conn;</div><div class='add'>+</div><div class='add'>+	iser_dto_to_iov(dto, iov, MAX_REGD_BUF_VECTOR_LEN);</div><div class='add'>+</div><div class='add'>+	send_wr.next	   = NULL;</div><div class='add'>+	send_wr.wr_id	   = (unsigned long)tx_desc;</div><div class='add'>+	send_wr.sg_list	   = iov;</div><div class='add'>+	send_wr.num_sge	   = dto-&gt;regd_vector_len;</div><div class='add'>+	send_wr.opcode	   = IB_WR_SEND;</div><div class='add'>+	send_wr.send_flags = dto-&gt;notify_enable ? IB_SEND_SIGNALED : 0;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ib_conn-&gt;post_send_buf_count);</div><div class='add'>+</div><div class='add'>+	ib_ret = ib_post_send(ib_conn-&gt;qp, &amp;send_wr, &amp;send_wr_failed);</div><div class='add'>+	if (ib_ret) {</div><div class='add'>+		iser_err("Failed to start SEND DTO, dto: 0x%p, IOV len: %d\n",</div><div class='add'>+			 dto, dto-&gt;regd_vector_len);</div><div class='add'>+		iser_err("ib_post_send failed, ret:%d\n", ib_ret);</div><div class='add'>+		atomic_dec(&amp;ib_conn-&gt;post_send_buf_count);</div><div class='add'>+		ret_val = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_comp_error_worker(void *data)</div><div class='add'>+{</div><div class='add'>+	struct iser_conn *ib_conn = data;</div><div class='add'>+</div><div class='add'>+	/* getting here when the state is UP means that the conn is being *</div><div class='add'>+	 * terminated asynchronously from the iSCSI layer's perspective.  */</div><div class='add'>+	if (iser_conn_state_comp_exch(ib_conn, ISER_CONN_UP,</div><div class='add'>+				      ISER_CONN_TERMINATING))</div><div class='add'>+		iscsi_conn_failure(ib_conn-&gt;iser_conn-&gt;iscsi_conn,</div><div class='add'>+					ISCSI_ERR_CONN_FAILED);</div><div class='add'>+</div><div class='add'>+	/* complete the termination process if disconnect event was delivered *</div><div class='add'>+	 * note there are no more non completed posts to the QP               */</div><div class='add'>+	if (ib_conn-&gt;disc_evt_flag) {</div><div class='add'>+		ib_conn-&gt;state = ISER_CONN_DOWN;</div><div class='add'>+		wake_up_interruptible(&amp;ib_conn-&gt;wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_handle_comp_error(struct iser_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct iser_dto  *dto     = &amp;desc-&gt;dto;</div><div class='add'>+	struct iser_conn *ib_conn = dto-&gt;conn-&gt;ib_conn;</div><div class='add'>+</div><div class='add'>+	iser_dto_buffs_release(dto);</div><div class='add'>+</div><div class='add'>+	if (desc-&gt;type == ISCSI_RX) {</div><div class='add'>+		kfree(desc-&gt;data);</div><div class='add'>+		kmem_cache_free(ig.desc_cache, desc);</div><div class='add'>+		atomic_dec(&amp;ib_conn-&gt;post_recv_buf_count);</div><div class='add'>+	} else { /* type is TX control/command/dataout */</div><div class='add'>+		if (desc-&gt;type == ISCSI_TX_DATAOUT)</div><div class='add'>+			kmem_cache_free(ig.desc_cache, desc);</div><div class='add'>+		atomic_dec(&amp;ib_conn-&gt;post_send_buf_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;ib_conn-&gt;post_recv_buf_count) == 0 &amp;&amp;</div><div class='add'>+	    atomic_read(&amp;ib_conn-&gt;post_send_buf_count) == 0)</div><div class='add'>+		schedule_work(&amp;ib_conn-&gt;comperror_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_cq_tasklet_fn(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	 struct iser_device  *device = (struct iser_device *)data;</div><div class='add'>+	 struct ib_cq	     *cq = device-&gt;cq;</div><div class='add'>+	 struct ib_wc	     wc;</div><div class='add'>+	 struct iser_desc    *desc;</div><div class='add'>+	 unsigned long	     xfer_len;</div><div class='add'>+</div><div class='add'>+	while (ib_poll_cq(cq, 1, &amp;wc) == 1) {</div><div class='add'>+		desc	 = (struct iser_desc *) (unsigned long) wc.wr_id;</div><div class='add'>+		BUG_ON(desc == NULL);</div><div class='add'>+</div><div class='add'>+		if (wc.status == IB_WC_SUCCESS) {</div><div class='add'>+			if (desc-&gt;type == ISCSI_RX) {</div><div class='add'>+				xfer_len = (unsigned long)wc.byte_len;</div><div class='add'>+				iser_rcv_completion(desc, xfer_len);</div><div class='add'>+			} else /* type == ISCSI_TX_CONTROL/SCSI_CMD/DOUT */</div><div class='add'>+				iser_snd_completion(desc);</div><div class='add'>+		} else {</div><div class='add'>+			iser_err("comp w. error op %d status %d\n",desc-&gt;type,wc.status);</div><div class='add'>+			iser_handle_comp_error(desc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* #warning "it is assumed here that arming CQ only once its empty" *</div><div class='add'>+	 * " would not cause interrupts to be missed"                       */</div><div class='add'>+	ib_req_notify_cq(cq, IB_CQ_NEXT_COMP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iser_cq_callback(struct ib_cq *cq, void *cq_context)</div><div class='add'>+{</div><div class='add'>+	struct iser_device  *device = (struct iser_device *)cq_context;</div><div class='add'>+</div><div class='add'>+	tasklet_schedule(&amp;device-&gt;cq_tasklet);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c<br/>index 9cbdffa08dc2..8f472e7113b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srp/ib_srp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/srp/ib_srp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srp/ib_srp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/srp/ib_srp.c</a></div><div class='hunk'>@@ -62,6 +62,13 @@ MODULE_DESCRIPTION("InfiniBand SCSI RDMA Protocol initiator "</div><div class='ctx'> 		   "v" DRV_VERSION " (" DRV_RELDATE ")");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> </div><div class='add'>+static int srp_sg_tablesize = SRP_DEF_SG_TABLESIZE;</div><div class='add'>+static int srp_max_iu_len;</div><div class='add'>+</div><div class='add'>+module_param(srp_sg_tablesize, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(srp_sg_tablesize,</div><div class='add'>+		 "Max number of gather/scatter entries per I/O (default is 12)");</div><div class='add'>+</div><div class='ctx'> static int topspin_workarounds = 1;</div><div class='ctx'> </div><div class='ctx'> module_param(topspin_workarounds, int, 0444);</div><div class='hunk'>@@ -105,7 +112,8 @@ static struct srp_iu *srp_alloc_iu(struct srp_host *host, size_t size,</div><div class='ctx'> 	if (!iu-&gt;buf)</div><div class='ctx'> 		goto out_free_iu;</div><div class='ctx'> </div><div class='del'>-	iu-&gt;dma = dma_map_single(host-&gt;dev-&gt;dma_device, iu-&gt;buf, size, direction);</div><div class='add'>+	iu-&gt;dma = dma_map_single(host-&gt;dev-&gt;dev-&gt;dma_device,</div><div class='add'>+				 iu-&gt;buf, size, direction);</div><div class='ctx'> 	if (dma_mapping_error(iu-&gt;dma))</div><div class='ctx'> 		goto out_free_buf;</div><div class='ctx'> </div><div class='hunk'>@@ -127,7 +135,8 @@ static void srp_free_iu(struct srp_host *host, struct srp_iu *iu)</div><div class='ctx'> 	if (!iu)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(host-&gt;dev-&gt;dma_device, iu-&gt;dma, iu-&gt;size, iu-&gt;direction);</div><div class='add'>+	dma_unmap_single(host-&gt;dev-&gt;dev-&gt;dma_device,</div><div class='add'>+			 iu-&gt;dma, iu-&gt;size, iu-&gt;direction);</div><div class='ctx'> 	kfree(iu-&gt;buf);</div><div class='ctx'> 	kfree(iu);</div><div class='ctx'> }</div><div class='hunk'>@@ -147,7 +156,7 @@ static int srp_init_qp(struct srp_target_port *target,</div><div class='ctx'> 	if (!attr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = ib_find_cached_pkey(target-&gt;srp_host-&gt;dev,</div><div class='add'>+	ret = ib_find_cached_pkey(target-&gt;srp_host-&gt;dev-&gt;dev,</div><div class='ctx'> 				  target-&gt;srp_host-&gt;port,</div><div class='ctx'> 				  be16_to_cpu(target-&gt;path.pkey),</div><div class='ctx'> 				  &amp;attr-&gt;pkey_index);</div><div class='hunk'>@@ -179,7 +188,7 @@ static int srp_create_target_ib(struct srp_target_port *target)</div><div class='ctx'> 	if (!init_attr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	target-&gt;cq = ib_create_cq(target-&gt;srp_host-&gt;dev, srp_completion,</div><div class='add'>+	target-&gt;cq = ib_create_cq(target-&gt;srp_host-&gt;dev-&gt;dev, srp_completion,</div><div class='ctx'> 				  NULL, target, SRP_CQ_SIZE);</div><div class='ctx'> 	if (IS_ERR(target-&gt;cq)) {</div><div class='ctx'> 		ret = PTR_ERR(target-&gt;cq);</div><div class='hunk'>@@ -198,7 +207,7 @@ static int srp_create_target_ib(struct srp_target_port *target)</div><div class='ctx'> 	init_attr-&gt;send_cq             = target-&gt;cq;</div><div class='ctx'> 	init_attr-&gt;recv_cq             = target-&gt;cq;</div><div class='ctx'> </div><div class='del'>-	target-&gt;qp = ib_create_qp(target-&gt;srp_host-&gt;pd, init_attr);</div><div class='add'>+	target-&gt;qp = ib_create_qp(target-&gt;srp_host-&gt;dev-&gt;pd, init_attr);</div><div class='ctx'> 	if (IS_ERR(target-&gt;qp)) {</div><div class='ctx'> 		ret = PTR_ERR(target-&gt;qp);</div><div class='ctx'> 		ib_destroy_cq(target-&gt;cq);</div><div class='hunk'>@@ -250,7 +259,7 @@ static int srp_lookup_path(struct srp_target_port *target)</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;target-&gt;done);</div><div class='ctx'> </div><div class='del'>-	target-&gt;path_query_id = ib_sa_path_rec_get(target-&gt;srp_host-&gt;dev,</div><div class='add'>+	target-&gt;path_query_id = ib_sa_path_rec_get(target-&gt;srp_host-&gt;dev-&gt;dev,</div><div class='ctx'> 						   target-&gt;srp_host-&gt;port,</div><div class='ctx'> 						   &amp;target-&gt;path,</div><div class='ctx'> 						   IB_SA_PATH_REC_DGID		|</div><div class='hunk'>@@ -309,10 +318,32 @@ static int srp_send_req(struct srp_target_port *target)</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;priv.opcode     	= SRP_LOGIN_REQ;</div><div class='ctx'> 	req-&gt;priv.tag        	= 0;</div><div class='del'>-	req-&gt;priv.req_it_iu_len = cpu_to_be32(SRP_MAX_IU_LEN);</div><div class='add'>+	req-&gt;priv.req_it_iu_len = cpu_to_be32(srp_max_iu_len);</div><div class='ctx'> 	req-&gt;priv.req_buf_fmt 	= cpu_to_be16(SRP_BUF_FORMAT_DIRECT |</div><div class='ctx'> 					      SRP_BUF_FORMAT_INDIRECT);</div><div class='del'>-	memcpy(req-&gt;priv.initiator_port_id, target-&gt;srp_host-&gt;initiator_port_id, 16);</div><div class='add'>+	/*</div><div class='add'>+	 * In the published SRP specification (draft rev. 16a), the </div><div class='add'>+	 * port identifier format is 8 bytes of ID extension followed</div><div class='add'>+	 * by 8 bytes of GUID.  Older drafts put the two halves in the</div><div class='add'>+	 * opposite order, so that the GUID comes first.</div><div class='add'>+	 *</div><div class='add'>+	 * Targets conforming to these obsolete drafts can be</div><div class='add'>+	 * recognized by the I/O Class they report.</div><div class='add'>+	 */</div><div class='add'>+	if (target-&gt;io_class == SRP_REV10_IB_IO_CLASS) {</div><div class='add'>+		memcpy(req-&gt;priv.initiator_port_id,</div><div class='add'>+		       target-&gt;srp_host-&gt;initiator_port_id + 8, 8);</div><div class='add'>+		memcpy(req-&gt;priv.initiator_port_id + 8,</div><div class='add'>+		       target-&gt;srp_host-&gt;initiator_port_id, 8);</div><div class='add'>+		memcpy(req-&gt;priv.target_port_id,     &amp;target-&gt;ioc_guid, 8);</div><div class='add'>+		memcpy(req-&gt;priv.target_port_id + 8, &amp;target-&gt;id_ext, 8);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(req-&gt;priv.initiator_port_id,</div><div class='add'>+		       target-&gt;srp_host-&gt;initiator_port_id, 16);</div><div class='add'>+		memcpy(req-&gt;priv.target_port_id,     &amp;target-&gt;id_ext, 8);</div><div class='add'>+		memcpy(req-&gt;priv.target_port_id + 8, &amp;target-&gt;ioc_guid, 8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Topspin/Cisco SRP targets will reject our login unless we</div><div class='ctx'> 	 * zero out the first 8 bytes of our initiator port ID.  The</div><div class='hunk'>@@ -325,8 +356,6 @@ static int srp_send_req(struct srp_target_port *target)</div><div class='ctx'> 		       (unsigned long long) be64_to_cpu(target-&gt;ioc_guid));</div><div class='ctx'> 		memset(req-&gt;priv.initiator_port_id, 0, 8);</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(req-&gt;priv.target_port_id,     &amp;target-&gt;id_ext, 8);</div><div class='del'>-	memcpy(req-&gt;priv.target_port_id + 8, &amp;target-&gt;ioc_guid, 8);</div><div class='ctx'> </div><div class='ctx'> 	status = ib_send_cm_req(target-&gt;cm_id, &amp;req-&gt;param);</div><div class='ctx'> </div><div class='hunk'>@@ -359,9 +388,9 @@ static void srp_remove_work(void *target_ptr)</div><div class='ctx'> 	target-&gt;state = SRP_TARGET_REMOVED;</div><div class='ctx'> 	spin_unlock_irq(target-&gt;scsi_host-&gt;host_lock);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;target-&gt;srp_host-&gt;target_mutex);</div><div class='add'>+	spin_lock(&amp;target-&gt;srp_host-&gt;target_lock);</div><div class='ctx'> 	list_del(&amp;target-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;target-&gt;srp_host-&gt;target_mutex);</div><div class='add'>+	spin_unlock(&amp;target-&gt;srp_host-&gt;target_lock);</div><div class='ctx'> </div><div class='ctx'> 	scsi_remove_host(target-&gt;scsi_host);</div><div class='ctx'> 	ib_destroy_cm_id(target-&gt;cm_id);</div><div class='hunk'>@@ -421,6 +450,11 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,</div><div class='ctx'> 	     scmnd-&gt;sc_data_direction != DMA_FROM_DEVICE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	if (req-&gt;fmr) {</div><div class='add'>+		ib_fmr_pool_unmap(req-&gt;fmr);</div><div class='add'>+		req-&gt;fmr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This handling of non-SG commands can be killed when the</div><div class='ctx'> 	 * SCSI midlayer no longer generates non-SG commands.</div><div class='hunk'>@@ -433,18 +467,30 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,</div><div class='ctx'> 		scat  = &amp;req-&gt;fake_sg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_unmap_sg(target-&gt;srp_host-&gt;dev-&gt;dma_device, scat, nents,</div><div class='add'>+	dma_unmap_sg(target-&gt;srp_host-&gt;dev-&gt;dev-&gt;dma_device, scat, nents,</div><div class='ctx'> 		     scmnd-&gt;sc_data_direction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void srp_remove_req(struct srp_target_port *target, struct srp_request *req)</div><div class='add'>+{</div><div class='add'>+	srp_unmap_data(req-&gt;scmnd, target, req);</div><div class='add'>+	list_move_tail(&amp;req-&gt;list, &amp;target-&gt;free_reqs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void srp_reset_req(struct srp_target_port *target, struct srp_request *req)</div><div class='add'>+{</div><div class='add'>+	req-&gt;scmnd-&gt;result = DID_RESET &lt;&lt; 16;</div><div class='add'>+	req-&gt;scmnd-&gt;scsi_done(req-&gt;scmnd);</div><div class='add'>+	srp_remove_req(target, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int srp_reconnect_target(struct srp_target_port *target)</div><div class='ctx'> {</div><div class='ctx'> 	struct ib_cm_id *new_cm_id;</div><div class='ctx'> 	struct ib_qp_attr qp_attr;</div><div class='del'>-	struct srp_request *req;</div><div class='add'>+	struct srp_request *req, *tmp;</div><div class='ctx'> 	struct ib_wc wc;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(target-&gt;scsi_host-&gt;host_lock);</div><div class='ctx'> 	if (target-&gt;state != SRP_TARGET_LIVE) {</div><div class='hunk'>@@ -459,7 +505,7 @@ static int srp_reconnect_target(struct srp_target_port *target)</div><div class='ctx'> 	 * Now get a new local CM ID so that we avoid confusing the</div><div class='ctx'> 	 * target in case things are really fouled up.</div><div class='ctx'> 	 */</div><div class='del'>-	new_cm_id = ib_create_cm_id(target-&gt;srp_host-&gt;dev,</div><div class='add'>+	new_cm_id = ib_create_cm_id(target-&gt;srp_host-&gt;dev-&gt;dev,</div><div class='ctx'> 				    srp_cm_handler, target);</div><div class='ctx'> 	if (IS_ERR(new_cm_id)) {</div><div class='ctx'> 		ret = PTR_ERR(new_cm_id);</div><div class='hunk'>@@ -480,19 +526,12 @@ static int srp_reconnect_target(struct srp_target_port *target)</div><div class='ctx'> 	while (ib_poll_cq(target-&gt;cq, 1, &amp;wc) &gt; 0)</div><div class='ctx'> 		; /* nothing */</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(req, &amp;target-&gt;req_queue, list) {</div><div class='del'>-		req-&gt;scmnd-&gt;result = DID_RESET &lt;&lt; 16;</div><div class='del'>-		req-&gt;scmnd-&gt;scsi_done(req-&gt;scmnd);</div><div class='del'>-		srp_unmap_data(req-&gt;scmnd, target, req);</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry_safe(req, tmp, &amp;target-&gt;req_queue, list)</div><div class='add'>+		srp_reset_req(target, req);</div><div class='ctx'> </div><div class='ctx'> 	target-&gt;rx_head	 = 0;</div><div class='ctx'> 	target-&gt;tx_head	 = 0;</div><div class='ctx'> 	target-&gt;tx_tail  = 0;</div><div class='del'>-	INIT_LIST_HEAD(&amp;target-&gt;free_reqs);</div><div class='del'>-	INIT_LIST_HEAD(&amp;target-&gt;req_queue);</div><div class='del'>-	for (i = 0; i &lt; SRP_SQ_SIZE; ++i)</div><div class='del'>-		list_add_tail(&amp;target-&gt;req_ring[i].list, &amp;target-&gt;free_reqs);</div><div class='ctx'> </div><div class='ctx'> 	ret = srp_connect_target(target);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -528,14 +567,80 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int srp_map_fmr(struct srp_device *dev, struct scatterlist *scat,</div><div class='add'>+		       int sg_cnt, struct srp_request *req,</div><div class='add'>+		       struct srp_direct_buf *buf)</div><div class='add'>+{</div><div class='add'>+	u64 io_addr = 0;</div><div class='add'>+	u64 *dma_pages;</div><div class='add'>+	u32 len;</div><div class='add'>+	int page_cnt;</div><div class='add'>+	int i, j;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;fmr_pool)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	len = page_cnt = 0;</div><div class='add'>+	for (i = 0; i &lt; sg_cnt; ++i) {</div><div class='add'>+		if (sg_dma_address(&amp;scat[i]) &amp; ~dev-&gt;fmr_page_mask) {</div><div class='add'>+			if (i &gt; 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			else</div><div class='add'>+				++page_cnt;</div><div class='add'>+		}</div><div class='add'>+		if ((sg_dma_address(&amp;scat[i]) + sg_dma_len(&amp;scat[i])) &amp;</div><div class='add'>+		    ~dev-&gt;fmr_page_mask) {</div><div class='add'>+			if (i &lt; sg_cnt - 1)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			else</div><div class='add'>+				++page_cnt;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len += sg_dma_len(&amp;scat[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page_cnt += len &gt;&gt; dev-&gt;fmr_page_shift;</div><div class='add'>+	if (page_cnt &gt; SRP_FMR_SIZE)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dma_pages = kmalloc(sizeof (u64) * page_cnt, GFP_ATOMIC);</div><div class='add'>+	if (!dma_pages)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	page_cnt = 0;</div><div class='add'>+	for (i = 0; i &lt; sg_cnt; ++i)</div><div class='add'>+		for (j = 0; j &lt; sg_dma_len(&amp;scat[i]); j += dev-&gt;fmr_page_size)</div><div class='add'>+			dma_pages[page_cnt++] =</div><div class='add'>+				(sg_dma_address(&amp;scat[i]) &amp; dev-&gt;fmr_page_mask) + j;</div><div class='add'>+</div><div class='add'>+	req-&gt;fmr = ib_fmr_pool_map_phys(dev-&gt;fmr_pool,</div><div class='add'>+					dma_pages, page_cnt, io_addr);</div><div class='add'>+	if (IS_ERR(req-&gt;fmr)) {</div><div class='add'>+		ret = PTR_ERR(req-&gt;fmr);</div><div class='add'>+		req-&gt;fmr = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf-&gt;va  = cpu_to_be64(sg_dma_address(&amp;scat[0]) &amp; ~dev-&gt;fmr_page_mask);</div><div class='add'>+	buf-&gt;key = cpu_to_be32(req-&gt;fmr-&gt;fmr-&gt;rkey);</div><div class='add'>+	buf-&gt;len = cpu_to_be32(len);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(dma_pages);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,</div><div class='ctx'> 			struct srp_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist *scat;</div><div class='ctx'> 	struct srp_cmd *cmd = req-&gt;cmd-&gt;buf;</div><div class='ctx'> 	int len, nents, count;</div><div class='del'>-	int i;</div><div class='del'>-	u8 fmt;</div><div class='add'>+	u8 fmt = SRP_DATA_DESC_DIRECT;</div><div class='ctx'> </div><div class='ctx'> 	if (!scmnd-&gt;request_buffer || scmnd-&gt;sc_data_direction == DMA_NONE)</div><div class='ctx'> 		return sizeof (struct srp_cmd);</div><div class='hunk'>@@ -560,53 +665,63 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,</div><div class='ctx'> 		sg_init_one(scat, scmnd-&gt;request_buffer, scmnd-&gt;request_bufflen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = dma_map_sg(target-&gt;srp_host-&gt;dev-&gt;dma_device, scat, nents,</div><div class='del'>-			   scmnd-&gt;sc_data_direction);</div><div class='add'>+	count = dma_map_sg(target-&gt;srp_host-&gt;dev-&gt;dev-&gt;dma_device,</div><div class='add'>+			   scat, nents, scmnd-&gt;sc_data_direction);</div><div class='add'>+</div><div class='add'>+	fmt = SRP_DATA_DESC_DIRECT;</div><div class='add'>+	len = sizeof (struct srp_cmd) +	sizeof (struct srp_direct_buf);</div><div class='ctx'> </div><div class='ctx'> 	if (count == 1) {</div><div class='add'>+		/*</div><div class='add'>+		 * The midlayer only generated a single gather/scatter</div><div class='add'>+		 * entry, or DMA mapping coalesced everything to a</div><div class='add'>+		 * single entry.  So a direct descriptor along with</div><div class='add'>+		 * the DMA MR suffices.</div><div class='add'>+		 */</div><div class='ctx'> 		struct srp_direct_buf *buf = (void *) cmd-&gt;add_data;</div><div class='ctx'> </div><div class='del'>-		fmt = SRP_DATA_DESC_DIRECT;</div><div class='del'>-</div><div class='ctx'> 		buf-&gt;va  = cpu_to_be64(sg_dma_address(scat));</div><div class='del'>-		buf-&gt;key = cpu_to_be32(target-&gt;srp_host-&gt;mr-&gt;rkey);</div><div class='add'>+		buf-&gt;key = cpu_to_be32(target-&gt;srp_host-&gt;dev-&gt;mr-&gt;rkey);</div><div class='ctx'> 		buf-&gt;len = cpu_to_be32(sg_dma_len(scat));</div><div class='del'>-</div><div class='del'>-		len = sizeof (struct srp_cmd) +</div><div class='del'>-			sizeof (struct srp_direct_buf);</div><div class='del'>-	} else {</div><div class='add'>+	} else if (srp_map_fmr(target-&gt;srp_host-&gt;dev, scat, count, req,</div><div class='add'>+			       (void *) cmd-&gt;add_data)) {</div><div class='add'>+		/*</div><div class='add'>+		 * FMR mapping failed, and the scatterlist has more</div><div class='add'>+		 * than one entry.  Generate an indirect memory</div><div class='add'>+		 * descriptor.</div><div class='add'>+		 */</div><div class='ctx'> 		struct srp_indirect_buf *buf = (void *) cmd-&gt;add_data;</div><div class='ctx'> 		u32 datalen = 0;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='ctx'> 		fmt = SRP_DATA_DESC_INDIRECT;</div><div class='add'>+		len = sizeof (struct srp_cmd) +</div><div class='add'>+			sizeof (struct srp_indirect_buf) +</div><div class='add'>+			count * sizeof (struct srp_direct_buf);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; count; ++i) {</div><div class='add'>+			buf-&gt;desc_list[i].va  =</div><div class='add'>+				cpu_to_be64(sg_dma_address(&amp;scat[i]));</div><div class='add'>+			buf-&gt;desc_list[i].key =</div><div class='add'>+				cpu_to_be32(target-&gt;srp_host-&gt;dev-&gt;mr-&gt;rkey);</div><div class='add'>+			buf-&gt;desc_list[i].len =</div><div class='add'>+				cpu_to_be32(sg_dma_len(&amp;scat[i]));</div><div class='add'>+			datalen += sg_dma_len(&amp;scat[i]);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (scmnd-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='ctx'> 			cmd-&gt;data_out_desc_cnt = count;</div><div class='ctx'> 		else</div><div class='ctx'> 			cmd-&gt;data_in_desc_cnt = count;</div><div class='ctx'> </div><div class='del'>-		buf-&gt;table_desc.va  = cpu_to_be64(req-&gt;cmd-&gt;dma +</div><div class='del'>-						  sizeof *cmd +</div><div class='del'>-						  sizeof *buf);</div><div class='add'>+		buf-&gt;table_desc.va  =</div><div class='add'>+			cpu_to_be64(req-&gt;cmd-&gt;dma + sizeof *cmd + sizeof *buf);</div><div class='ctx'> 		buf-&gt;table_desc.key =</div><div class='del'>-			cpu_to_be32(target-&gt;srp_host-&gt;mr-&gt;rkey);</div><div class='add'>+			cpu_to_be32(target-&gt;srp_host-&gt;dev-&gt;mr-&gt;rkey);</div><div class='ctx'> 		buf-&gt;table_desc.len =</div><div class='ctx'> 			cpu_to_be32(count * sizeof (struct srp_direct_buf));</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; count; ++i) {</div><div class='del'>-			buf-&gt;desc_list[i].va  = cpu_to_be64(sg_dma_address(&amp;scat[i]));</div><div class='del'>-			buf-&gt;desc_list[i].key =</div><div class='del'>-				cpu_to_be32(target-&gt;srp_host-&gt;mr-&gt;rkey);</div><div class='del'>-			buf-&gt;desc_list[i].len = cpu_to_be32(sg_dma_len(&amp;scat[i]));</div><div class='del'>-</div><div class='del'>-			datalen += sg_dma_len(&amp;scat[i]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		buf-&gt;len = cpu_to_be32(datalen);</div><div class='del'>-</div><div class='del'>-		len = sizeof (struct srp_cmd) +</div><div class='del'>-			sizeof (struct srp_indirect_buf) +</div><div class='del'>-			count * sizeof (struct srp_direct_buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (scmnd-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='hunk'>@@ -617,12 +732,6 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void srp_remove_req(struct srp_target_port *target, struct srp_request *req)</div><div class='del'>-{</div><div class='del'>-	srp_unmap_data(req-&gt;scmnd, target, req);</div><div class='del'>-	list_move_tail(&amp;req-&gt;list, &amp;target-&gt;free_reqs);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)</div><div class='ctx'> {</div><div class='ctx'> 	struct srp_request *req;</div><div class='hunk'>@@ -689,7 +798,7 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)</div><div class='ctx'> </div><div class='ctx'> 	iu = target-&gt;rx_ring[wc-&gt;wr_id &amp; ~SRP_OP_RECV];</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_cpu(target-&gt;srp_host-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='add'>+	dma_sync_single_for_cpu(target-&gt;srp_host-&gt;dev-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='ctx'> 				target-&gt;max_ti_iu_len, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	opcode = *(u8 *) iu-&gt;buf;</div><div class='hunk'>@@ -726,7 +835,7 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_device(target-&gt;srp_host-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='add'>+	dma_sync_single_for_device(target-&gt;srp_host-&gt;dev-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='ctx'> 				   target-&gt;max_ti_iu_len, DMA_FROM_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +879,7 @@ static int __srp_post_recv(struct srp_target_port *target)</div><div class='ctx'> </div><div class='ctx'> 	list.addr   = iu-&gt;dma;</div><div class='ctx'> 	list.length = iu-&gt;size;</div><div class='del'>-	list.lkey   = target-&gt;srp_host-&gt;mr-&gt;lkey;</div><div class='add'>+	list.lkey   = target-&gt;srp_host-&gt;dev-&gt;mr-&gt;lkey;</div><div class='ctx'> </div><div class='ctx'> 	wr.next     = NULL;</div><div class='ctx'> 	wr.sg_list  = &amp;list;</div><div class='hunk'>@@ -805,12 +914,8 @@ static struct srp_iu *__srp_get_tx_iu(struct srp_target_port *target)</div><div class='ctx'> 	if (target-&gt;tx_head - target-&gt;tx_tail &gt;= SRP_SQ_SIZE)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(target-&gt;req_lim &lt; 1)) {</div><div class='del'>-		if (printk_ratelimit())</div><div class='del'>-			printk(KERN_DEBUG PFX "Target has req_lim %d\n",</div><div class='del'>-			       target-&gt;req_lim);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(target-&gt;req_lim &lt; 1))</div><div class='add'>+		++target-&gt;zero_req_lim;</div><div class='ctx'> </div><div class='ctx'> 	return target-&gt;tx_ring[target-&gt;tx_head &amp; SRP_SQ_SIZE];</div><div class='ctx'> }</div><div class='hunk'>@@ -828,7 +933,7 @@ static int __srp_post_send(struct srp_target_port *target,</div><div class='ctx'> </div><div class='ctx'> 	list.addr   = iu-&gt;dma;</div><div class='ctx'> 	list.length = len;</div><div class='del'>-	list.lkey   = target-&gt;srp_host-&gt;mr-&gt;lkey;</div><div class='add'>+	list.lkey   = target-&gt;srp_host-&gt;dev-&gt;mr-&gt;lkey;</div><div class='ctx'> </div><div class='ctx'> 	wr.next       = NULL;</div><div class='ctx'> 	wr.wr_id      = target-&gt;tx_head &amp; SRP_SQ_SIZE;</div><div class='hunk'>@@ -870,8 +975,8 @@ static int srp_queuecommand(struct scsi_cmnd *scmnd,</div><div class='ctx'> 	if (!iu)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_cpu(target-&gt;srp_host-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='del'>-				SRP_MAX_IU_LEN, DMA_TO_DEVICE);</div><div class='add'>+	dma_sync_single_for_cpu(target-&gt;srp_host-&gt;dev-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='add'>+				srp_max_iu_len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	req = list_entry(target-&gt;free_reqs.next, struct srp_request, list);</div><div class='ctx'> </div><div class='hunk'>@@ -903,8 +1008,8 @@ static int srp_queuecommand(struct scsi_cmnd *scmnd,</div><div class='ctx'> 		goto err_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_device(target-&gt;srp_host-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='del'>-				   SRP_MAX_IU_LEN, DMA_TO_DEVICE);</div><div class='add'>+	dma_sync_single_for_device(target-&gt;srp_host-&gt;dev-&gt;dev-&gt;dma_device, iu-&gt;dma,</div><div class='add'>+				   srp_max_iu_len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (__srp_post_send(target, iu, len)) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Send failed\n");</div><div class='hunk'>@@ -936,7 +1041,7 @@ static int srp_alloc_iu_bufs(struct srp_target_port *target)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SRP_SQ_SIZE + 1; ++i) {</div><div class='ctx'> 		target-&gt;tx_ring[i] = srp_alloc_iu(target-&gt;srp_host,</div><div class='del'>-						  SRP_MAX_IU_LEN,</div><div class='add'>+						  srp_max_iu_len,</div><div class='ctx'> 						  GFP_KERNEL, DMA_TO_DEVICE);</div><div class='ctx'> 		if (!target-&gt;tx_ring[i])</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -1107,11 +1212,10 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)</div><div class='ctx'> 		srp_cm_rej_handler(cm_id, event, target);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case IB_CM_MRA_RECEIVED:</div><div class='del'>-		printk(KERN_ERR PFX "MRA received\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case IB_CM_DREP_RECEIVED:</div><div class='add'>+	case IB_CM_DREQ_RECEIVED:</div><div class='add'>+		printk(KERN_WARNING PFX "DREQ received - connection closed\n");</div><div class='add'>+		if (ib_send_cm_drep(cm_id, NULL, 0))</div><div class='add'>+			printk(KERN_ERR PFX "Sending CM DREP failed\n");</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IB_CM_TIMEWAIT_EXIT:</div><div class='hunk'>@@ -1121,6 +1225,11 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)</div><div class='ctx'> 		target-&gt;status = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case IB_CM_MRA_RECEIVED:</div><div class='add'>+	case IB_CM_DREQ_ERROR:</div><div class='add'>+	case IB_CM_DREP_RECEIVED:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING PFX "Unhandled CM event %d\n", event-&gt;event);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1239,11 +1348,8 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)</div><div class='ctx'> 	spin_lock_irq(target-&gt;scsi_host-&gt;host_lock);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(req, tmp, &amp;target-&gt;req_queue, list)</div><div class='del'>-		if (req-&gt;scmnd-&gt;device == scmnd-&gt;device) {</div><div class='del'>-			req-&gt;scmnd-&gt;result = DID_RESET &lt;&lt; 16;</div><div class='del'>-			req-&gt;scmnd-&gt;scsi_done(req-&gt;scmnd);</div><div class='del'>-			srp_remove_req(target, req);</div><div class='del'>-		}</div><div class='add'>+		if (req-&gt;scmnd-&gt;device == scmnd-&gt;device)</div><div class='add'>+			srp_reset_req(target, req);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(target-&gt;scsi_host-&gt;host_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1329,11 +1435,23 @@ static ssize_t show_dgid(struct class_device *cdev, char *buf)</div><div class='ctx'> 		       be16_to_cpu(((__be16 *) target-&gt;path.dgid.raw)[7]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t show_zero_req_lim(struct class_device *cdev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct srp_target_port *target = host_to_target(class_to_shost(cdev));</div><div class='add'>+</div><div class='add'>+	if (target-&gt;state == SRP_TARGET_DEAD ||</div><div class='add'>+	    target-&gt;state == SRP_TARGET_REMOVED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d\n", target-&gt;zero_req_lim);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static CLASS_DEVICE_ATTR(id_ext,	S_IRUGO, show_id_ext,		NULL);</div><div class='ctx'> static CLASS_DEVICE_ATTR(ioc_guid,	S_IRUGO, show_ioc_guid,		NULL);</div><div class='ctx'> static CLASS_DEVICE_ATTR(service_id,	S_IRUGO, show_service_id,	NULL);</div><div class='ctx'> static CLASS_DEVICE_ATTR(pkey,		S_IRUGO, show_pkey,		NULL);</div><div class='ctx'> static CLASS_DEVICE_ATTR(dgid,		S_IRUGO, show_dgid,		NULL);</div><div class='add'>+static CLASS_DEVICE_ATTR(zero_req_lim,	S_IRUGO, show_zero_req_lim,	NULL);</div><div class='ctx'> </div><div class='ctx'> static struct class_device_attribute *srp_host_attrs[] = {</div><div class='ctx'> 	&amp;class_device_attr_id_ext,</div><div class='hunk'>@@ -1341,6 +1459,7 @@ static struct class_device_attribute *srp_host_attrs[] = {</div><div class='ctx'> 	&amp;class_device_attr_service_id,</div><div class='ctx'> 	&amp;class_device_attr_pkey,</div><div class='ctx'> 	&amp;class_device_attr_dgid,</div><div class='add'>+	&amp;class_device_attr_zero_req_lim,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1354,7 +1473,6 @@ static struct scsi_host_template srp_template = {</div><div class='ctx'> 	.eh_host_reset_handler		= srp_reset_host,</div><div class='ctx'> 	.can_queue			= SRP_SQ_SIZE,</div><div class='ctx'> 	.this_id			= -1,</div><div class='del'>-	.sg_tablesize			= SRP_MAX_INDIRECT,</div><div class='ctx'> 	.cmd_per_lun			= SRP_SQ_SIZE,</div><div class='ctx'> 	.use_clustering			= ENABLE_CLUSTERING,</div><div class='ctx'> 	.shost_attrs			= srp_host_attrs</div><div class='hunk'>@@ -1365,18 +1483,17 @@ static int srp_add_target(struct srp_host *host, struct srp_target_port *target)</div><div class='ctx'> 	sprintf(target-&gt;target_name, "SRP.T10:%016llX",</div><div class='ctx'> 		 (unsigned long long) be64_to_cpu(target-&gt;id_ext));</div><div class='ctx'> </div><div class='del'>-	if (scsi_add_host(target-&gt;scsi_host, host-&gt;dev-&gt;dma_device))</div><div class='add'>+	if (scsi_add_host(target-&gt;scsi_host, host-&gt;dev-&gt;dev-&gt;dma_device))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;host-&gt;target_mutex);</div><div class='add'>+	spin_lock(&amp;host-&gt;target_lock);</div><div class='ctx'> 	list_add_tail(&amp;target-&gt;list, &amp;host-&gt;target_list);</div><div class='del'>-	mutex_unlock(&amp;host-&gt;target_mutex);</div><div class='add'>+	spin_unlock(&amp;host-&gt;target_lock);</div><div class='ctx'> </div><div class='ctx'> 	target-&gt;state = SRP_TARGET_LIVE;</div><div class='ctx'> </div><div class='del'>-	/* XXX: are we supposed to have a definition of SCAN_WILD_CARD ?? */</div><div class='ctx'> 	scsi_scan_target(&amp;target-&gt;scsi_host-&gt;shost_gendev,</div><div class='del'>-			 0, target-&gt;scsi_id, ~0, 0);</div><div class='add'>+			 0, target-&gt;scsi_id, SCAN_WILD_CARD, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1410,6 +1527,8 @@ enum {</div><div class='ctx'> 	SRP_OPT_PKEY		= 1 &lt;&lt; 3,</div><div class='ctx'> 	SRP_OPT_SERVICE_ID	= 1 &lt;&lt; 4,</div><div class='ctx'> 	SRP_OPT_MAX_SECT	= 1 &lt;&lt; 5,</div><div class='add'>+	SRP_OPT_MAX_CMD_PER_LUN	= 1 &lt;&lt; 6,</div><div class='add'>+	SRP_OPT_IO_CLASS	= 1 &lt;&lt; 7,</div><div class='ctx'> 	SRP_OPT_ALL		= (SRP_OPT_ID_EXT	|</div><div class='ctx'> 				   SRP_OPT_IOC_GUID	|</div><div class='ctx'> 				   SRP_OPT_DGID		|</div><div class='hunk'>@@ -1418,13 +1537,15 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static match_table_t srp_opt_tokens = {</div><div class='del'>-	{ SRP_OPT_ID_EXT,	"id_ext=%s" 	},</div><div class='del'>-	{ SRP_OPT_IOC_GUID,	"ioc_guid=%s" 	},</div><div class='del'>-	{ SRP_OPT_DGID,		"dgid=%s" 	},</div><div class='del'>-	{ SRP_OPT_PKEY,		"pkey=%x" 	},</div><div class='del'>-	{ SRP_OPT_SERVICE_ID,	"service_id=%s" },</div><div class='del'>-	{ SRP_OPT_MAX_SECT,     "max_sect=%d" 	},</div><div class='del'>-	{ SRP_OPT_ERR,		NULL 		}</div><div class='add'>+	{ SRP_OPT_ID_EXT,		"id_ext=%s" 		},</div><div class='add'>+	{ SRP_OPT_IOC_GUID,		"ioc_guid=%s" 		},</div><div class='add'>+	{ SRP_OPT_DGID,			"dgid=%s" 		},</div><div class='add'>+	{ SRP_OPT_PKEY,			"pkey=%x" 		},</div><div class='add'>+	{ SRP_OPT_SERVICE_ID,		"service_id=%s"		},</div><div class='add'>+	{ SRP_OPT_MAX_SECT,		"max_sect=%d" 		},</div><div class='add'>+	{ SRP_OPT_MAX_CMD_PER_LUN,	"max_cmd_per_lun=%d" 	},</div><div class='add'>+	{ SRP_OPT_IO_CLASS,		"io_class=%x"		},</div><div class='add'>+	{ SRP_OPT_ERR,			NULL 			}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int srp_parse_options(const char *buf, struct srp_target_port *target)</div><div class='hunk'>@@ -1500,6 +1621,29 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)</div><div class='ctx'> 			target-&gt;scsi_host-&gt;max_sectors = token;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case SRP_OPT_MAX_CMD_PER_LUN:</div><div class='add'>+			if (match_int(args, &amp;token)) {</div><div class='add'>+				printk(KERN_WARNING PFX "bad max cmd_per_lun parameter '%s'\n", p);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			target-&gt;scsi_host-&gt;cmd_per_lun = min(token, SRP_SQ_SIZE);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SRP_OPT_IO_CLASS:</div><div class='add'>+			if (match_hex(args, &amp;token)) {</div><div class='add'>+				printk(KERN_WARNING PFX "bad  IO class parameter '%s' \n", p);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (token != SRP_REV10_IB_IO_CLASS &amp;&amp;</div><div class='add'>+			    token != SRP_REV16A_IB_IO_CLASS) {</div><div class='add'>+				printk(KERN_WARNING PFX "unknown IO class parameter value"</div><div class='add'>+				       " %x specified (use %x or %x).\n",</div><div class='add'>+				       token, SRP_REV10_IB_IO_CLASS, SRP_REV16A_IB_IO_CLASS);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			target-&gt;io_class = token;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_WARNING PFX "unknown parameter or missing value "</div><div class='ctx'> 			       "'%s' in target creation request\n", p);</div><div class='hunk'>@@ -1542,6 +1686,7 @@ static ssize_t srp_create_target(struct class_device *class_dev,</div><div class='ctx'> 	target = host_to_target(target_host);</div><div class='ctx'> 	memset(target, 0, sizeof *target);</div><div class='ctx'> </div><div class='add'>+	target-&gt;io_class   = SRP_REV16A_IB_IO_CLASS;</div><div class='ctx'> 	target-&gt;scsi_host  = target_host;</div><div class='ctx'> 	target-&gt;srp_host   = host;</div><div class='ctx'> </div><div class='hunk'>@@ -1558,7 +1703,7 @@ static ssize_t srp_create_target(struct class_device *class_dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	ib_get_cached_gid(host-&gt;dev, host-&gt;port, 0, &amp;target-&gt;path.sgid);</div><div class='add'>+	ib_get_cached_gid(host-&gt;dev-&gt;dev, host-&gt;port, 0, &amp;target-&gt;path.sgid);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG PFX "new target: id_ext %016llx ioc_guid %016llx pkey %04x "</div><div class='ctx'> 	       "service_id %016llx dgid %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",</div><div class='hunk'>@@ -1579,7 +1724,7 @@ static ssize_t srp_create_target(struct class_device *class_dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	target-&gt;cm_id = ib_create_cm_id(host-&gt;dev, srp_cm_handler, target);</div><div class='add'>+	target-&gt;cm_id = ib_create_cm_id(host-&gt;dev-&gt;dev, srp_cm_handler, target);</div><div class='ctx'> 	if (IS_ERR(target-&gt;cm_id)) {</div><div class='ctx'> 		ret = PTR_ERR(target-&gt;cm_id);</div><div class='ctx'> 		goto err_free;</div><div class='hunk'>@@ -1619,7 +1764,7 @@ static ssize_t show_ibdev(struct class_device *class_dev, char *buf)</div><div class='ctx'> 	struct srp_host *host =</div><div class='ctx'> 		container_of(class_dev, struct srp_host, class_dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s\n", host-&gt;dev-&gt;name);</div><div class='add'>+	return sprintf(buf, "%s\n", host-&gt;dev-&gt;dev-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static CLASS_DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);</div><div class='hunk'>@@ -1634,7 +1779,7 @@ static ssize_t show_port(struct class_device *class_dev, char *buf)</div><div class='ctx'> </div><div class='ctx'> static CLASS_DEVICE_ATTR(port, S_IRUGO, show_port, NULL);</div><div class='ctx'> </div><div class='del'>-static struct srp_host *srp_add_port(struct ib_device *device, u8 port)</div><div class='add'>+static struct srp_host *srp_add_port(struct srp_device *device, u8 port)</div><div class='ctx'> {</div><div class='ctx'> 	struct srp_host *host;</div><div class='ctx'> </div><div class='hunk'>@@ -1643,32 +1788,21 @@ static struct srp_host *srp_add_port(struct ib_device *device, u8 port)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;host-&gt;target_list);</div><div class='del'>-	mutex_init(&amp;host-&gt;target_mutex);</div><div class='add'>+	spin_lock_init(&amp;host-&gt;target_lock);</div><div class='ctx'> 	init_completion(&amp;host-&gt;released);</div><div class='ctx'> 	host-&gt;dev  = device;</div><div class='ctx'> 	host-&gt;port = port;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;initiator_port_id[7] = port;</div><div class='del'>-	memcpy(host-&gt;initiator_port_id + 8, &amp;device-&gt;node_guid, 8);</div><div class='del'>-</div><div class='del'>-	host-&gt;pd   = ib_alloc_pd(device);</div><div class='del'>-	if (IS_ERR(host-&gt;pd))</div><div class='del'>-		goto err_free;</div><div class='del'>-</div><div class='del'>-	host-&gt;mr   = ib_get_dma_mr(host-&gt;pd,</div><div class='del'>-				   IB_ACCESS_LOCAL_WRITE |</div><div class='del'>-				   IB_ACCESS_REMOTE_READ |</div><div class='del'>-				   IB_ACCESS_REMOTE_WRITE);</div><div class='del'>-	if (IS_ERR(host-&gt;mr))</div><div class='del'>-		goto err_pd;</div><div class='add'>+	memcpy(host-&gt;initiator_port_id + 8, &amp;device-&gt;dev-&gt;node_guid, 8);</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;class_dev.class = &amp;srp_class;</div><div class='del'>-	host-&gt;class_dev.dev   = device-&gt;dma_device;</div><div class='add'>+	host-&gt;class_dev.dev   = device-&gt;dev-&gt;dma_device;</div><div class='ctx'> 	snprintf(host-&gt;class_dev.class_id, BUS_ID_SIZE, "srp-%s-%d",</div><div class='del'>-		 device-&gt;name, port);</div><div class='add'>+		 device-&gt;dev-&gt;name, port);</div><div class='ctx'> </div><div class='ctx'> 	if (class_device_register(&amp;host-&gt;class_dev))</div><div class='del'>-		goto err_mr;</div><div class='add'>+		goto free_host;</div><div class='ctx'> 	if (class_device_create_file(&amp;host-&gt;class_dev, &amp;class_device_attr_add_target))</div><div class='ctx'> 		goto err_class;</div><div class='ctx'> 	if (class_device_create_file(&amp;host-&gt;class_dev, &amp;class_device_attr_ibdev))</div><div class='hunk'>@@ -1681,13 +1815,7 @@ static struct srp_host *srp_add_port(struct ib_device *device, u8 port)</div><div class='ctx'> err_class:</div><div class='ctx'> 	class_device_unregister(&amp;host-&gt;class_dev);</div><div class='ctx'> </div><div class='del'>-err_mr:</div><div class='del'>-	ib_dereg_mr(host-&gt;mr);</div><div class='del'>-</div><div class='del'>-err_pd:</div><div class='del'>-	ib_dealloc_pd(host-&gt;pd);</div><div class='del'>-</div><div class='del'>-err_free:</div><div class='add'>+free_host:</div><div class='ctx'> 	kfree(host);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -1695,15 +1823,62 @@ err_free:</div><div class='ctx'> </div><div class='ctx'> static void srp_add_one(struct ib_device *device)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *dev_list;</div><div class='add'>+	struct srp_device *srp_dev;</div><div class='add'>+	struct ib_device_attr *dev_attr;</div><div class='add'>+	struct ib_fmr_pool_param fmr_param;</div><div class='ctx'> 	struct srp_host *host;</div><div class='ctx'> 	int s, e, p;</div><div class='ctx'> </div><div class='del'>-	dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL);</div><div class='del'>-	if (!dev_list)</div><div class='add'>+	dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL);</div><div class='add'>+	if (!dev_attr)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(dev_list);</div><div class='add'>+	if (ib_query_device(device, dev_attr)) {</div><div class='add'>+		printk(KERN_WARNING PFX "Query device failed for %s\n",</div><div class='add'>+		       device-&gt;name);</div><div class='add'>+		goto free_attr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srp_dev = kmalloc(sizeof *srp_dev, GFP_KERNEL);</div><div class='add'>+	if (!srp_dev)</div><div class='add'>+		goto free_attr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Use the smallest page size supported by the HCA, down to a</div><div class='add'>+	 * minimum of 512 bytes (which is the smallest sector that a</div><div class='add'>+	 * SCSI command will ever carry).</div><div class='add'>+	 */</div><div class='add'>+	srp_dev-&gt;fmr_page_shift = max(9, ffs(dev_attr-&gt;page_size_cap) - 1);</div><div class='add'>+	srp_dev-&gt;fmr_page_size  = 1 &lt;&lt; srp_dev-&gt;fmr_page_shift;</div><div class='add'>+	srp_dev-&gt;fmr_page_mask  = ~((unsigned long) srp_dev-&gt;fmr_page_size - 1);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;srp_dev-&gt;dev_list);</div><div class='add'>+</div><div class='add'>+	srp_dev-&gt;dev = device;</div><div class='add'>+	srp_dev-&gt;pd  = ib_alloc_pd(device);</div><div class='add'>+	if (IS_ERR(srp_dev-&gt;pd))</div><div class='add'>+		goto free_dev;</div><div class='add'>+</div><div class='add'>+	srp_dev-&gt;mr = ib_get_dma_mr(srp_dev-&gt;pd,</div><div class='add'>+				    IB_ACCESS_LOCAL_WRITE |</div><div class='add'>+				    IB_ACCESS_REMOTE_READ |</div><div class='add'>+				    IB_ACCESS_REMOTE_WRITE);</div><div class='add'>+	if (IS_ERR(srp_dev-&gt;mr))</div><div class='add'>+		goto err_pd;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fmr_param, 0, sizeof fmr_param);</div><div class='add'>+	fmr_param.pool_size	    = SRP_FMR_POOL_SIZE;</div><div class='add'>+	fmr_param.dirty_watermark   = SRP_FMR_DIRTY_SIZE;</div><div class='add'>+	fmr_param.cache		    = 1;</div><div class='add'>+	fmr_param.max_pages_per_fmr = SRP_FMR_SIZE;</div><div class='add'>+	fmr_param.page_shift	    = srp_dev-&gt;fmr_page_shift;</div><div class='add'>+	fmr_param.access	    = (IB_ACCESS_LOCAL_WRITE |</div><div class='add'>+				       IB_ACCESS_REMOTE_WRITE |</div><div class='add'>+				       IB_ACCESS_REMOTE_READ);</div><div class='add'>+</div><div class='add'>+	srp_dev-&gt;fmr_pool = ib_create_fmr_pool(srp_dev-&gt;pd, &amp;fmr_param);</div><div class='add'>+	if (IS_ERR(srp_dev-&gt;fmr_pool))</div><div class='add'>+		srp_dev-&gt;fmr_pool = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (device-&gt;node_type == IB_NODE_SWITCH) {</div><div class='ctx'> 		s = 0;</div><div class='hunk'>@@ -1714,25 +1889,35 @@ static void srp_add_one(struct ib_device *device)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (p = s; p &lt;= e; ++p) {</div><div class='del'>-		host = srp_add_port(device, p);</div><div class='add'>+		host = srp_add_port(srp_dev, p);</div><div class='ctx'> 		if (host)</div><div class='del'>-			list_add_tail(&amp;host-&gt;list, dev_list);</div><div class='add'>+			list_add_tail(&amp;host-&gt;list, &amp;srp_dev-&gt;dev_list);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ib_set_client_data(device, &amp;srp_client, dev_list);</div><div class='add'>+	ib_set_client_data(device, &amp;srp_client, srp_dev);</div><div class='add'>+</div><div class='add'>+	goto free_attr;</div><div class='add'>+</div><div class='add'>+err_pd:</div><div class='add'>+	ib_dealloc_pd(srp_dev-&gt;pd);</div><div class='add'>+</div><div class='add'>+free_dev:</div><div class='add'>+	kfree(srp_dev);</div><div class='add'>+</div><div class='add'>+free_attr:</div><div class='add'>+	kfree(dev_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void srp_remove_one(struct ib_device *device)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *dev_list;</div><div class='add'>+	struct srp_device *srp_dev;</div><div class='ctx'> 	struct srp_host *host, *tmp_host;</div><div class='ctx'> 	LIST_HEAD(target_list);</div><div class='ctx'> 	struct srp_target_port *target, *tmp_target;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	dev_list = ib_get_client_data(device, &amp;srp_client);</div><div class='add'>+	srp_dev = ib_get_client_data(device, &amp;srp_client);</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(host, tmp_host, dev_list, list) {</div><div class='add'>+	list_for_each_entry_safe(host, tmp_host, &amp;srp_dev-&gt;dev_list, list) {</div><div class='ctx'> 		class_device_unregister(&amp;host-&gt;class_dev);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait for the sysfs entry to go away, so that no new</div><div class='hunk'>@@ -1744,15 +1929,13 @@ static void srp_remove_one(struct ib_device *device)</div><div class='ctx'> 		 * Mark all target ports as removed, so we stop queueing</div><div class='ctx'> 		 * commands and don't try to reconnect.</div><div class='ctx'> 		 */</div><div class='del'>-		mutex_lock(&amp;host-&gt;target_mutex);</div><div class='del'>-		list_for_each_entry_safe(target, tmp_target,</div><div class='del'>-					 &amp;host-&gt;target_list, list) {</div><div class='del'>-			spin_lock_irqsave(target-&gt;scsi_host-&gt;host_lock, flags);</div><div class='del'>-			if (target-&gt;state != SRP_TARGET_REMOVED)</div><div class='del'>-				target-&gt;state = SRP_TARGET_REMOVED;</div><div class='del'>-			spin_unlock_irqrestore(target-&gt;scsi_host-&gt;host_lock, flags);</div><div class='add'>+		spin_lock(&amp;host-&gt;target_lock);</div><div class='add'>+		list_for_each_entry(target, &amp;host-&gt;target_list, list) {</div><div class='add'>+			spin_lock_irq(target-&gt;scsi_host-&gt;host_lock);</div><div class='add'>+			target-&gt;state = SRP_TARGET_REMOVED;</div><div class='add'>+			spin_unlock_irq(target-&gt;scsi_host-&gt;host_lock);</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;host-&gt;target_mutex);</div><div class='add'>+		spin_unlock(&amp;host-&gt;target_lock);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait for any reconnection tasks that may have</div><div class='hunk'>@@ -1770,18 +1953,26 @@ static void srp_remove_one(struct ib_device *device)</div><div class='ctx'> 			scsi_host_put(target-&gt;scsi_host);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ib_dereg_mr(host-&gt;mr);</div><div class='del'>-		ib_dealloc_pd(host-&gt;pd);</div><div class='ctx'> 		kfree(host);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(dev_list);</div><div class='add'>+	if (srp_dev-&gt;fmr_pool)</div><div class='add'>+		ib_destroy_fmr_pool(srp_dev-&gt;fmr_pool);</div><div class='add'>+	ib_dereg_mr(srp_dev-&gt;mr);</div><div class='add'>+	ib_dealloc_pd(srp_dev-&gt;pd);</div><div class='add'>+</div><div class='add'>+	kfree(srp_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init srp_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	srp_template.sg_tablesize = srp_sg_tablesize;</div><div class='add'>+	srp_max_iu_len = (sizeof (struct srp_cmd) +</div><div class='add'>+			  sizeof (struct srp_indirect_buf) +</div><div class='add'>+			  srp_sg_tablesize * 16);</div><div class='add'>+</div><div class='ctx'> 	ret = class_register(&amp;srp_class);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR PFX "couldn't register class infiniband_srp\n");</div><div class='head'>diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h<br/>index c5cd43aae860..5b581fb8eb0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srp/ib_srp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/infiniband/ulp/srp/ib_srp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/infiniband/ulp/srp/ib_srp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/infiniband/ulp/srp/ib_srp.h</a></div><div class='hunk'>@@ -46,6 +46,7 @@</div><div class='ctx'> #include &lt;rdma/ib_verbs.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_sa.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_cm.h&gt;</div><div class='add'>+#include &lt;rdma/ib_fmr_pool.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	SRP_PATH_REC_TIMEOUT_MS	= 1000,</div><div class='hunk'>@@ -55,20 +56,21 @@ enum {</div><div class='ctx'> 	SRP_DLID_REDIRECT	= 2,</div><div class='ctx'> </div><div class='ctx'> 	SRP_MAX_LUN		= 512,</div><div class='del'>-	SRP_MAX_IU_LEN		= 256,</div><div class='add'>+	SRP_DEF_SG_TABLESIZE	= 12,</div><div class='ctx'> </div><div class='ctx'> 	SRP_RQ_SHIFT    	= 6,</div><div class='ctx'> 	SRP_RQ_SIZE		= 1 &lt;&lt; SRP_RQ_SHIFT,</div><div class='ctx'> 	SRP_SQ_SIZE		= SRP_RQ_SIZE - 1,</div><div class='ctx'> 	SRP_CQ_SIZE		= SRP_SQ_SIZE + SRP_RQ_SIZE,</div><div class='ctx'> </div><div class='del'>-	SRP_TAG_TSK_MGMT	= 1 &lt;&lt; (SRP_RQ_SHIFT + 1)</div><div class='add'>+	SRP_TAG_TSK_MGMT	= 1 &lt;&lt; (SRP_RQ_SHIFT + 1),</div><div class='add'>+</div><div class='add'>+	SRP_FMR_SIZE		= 256,</div><div class='add'>+	SRP_FMR_POOL_SIZE	= 1024,</div><div class='add'>+	SRP_FMR_DIRTY_SIZE	= SRP_FMR_POOL_SIZE / 4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define SRP_OP_RECV		(1 &lt;&lt; 31)</div><div class='del'>-#define SRP_MAX_INDIRECT	((SRP_MAX_IU_LEN -			\</div><div class='del'>-				  sizeof (struct srp_cmd) -		\</div><div class='del'>-				  sizeof (struct srp_indirect_buf)) / 16)</div><div class='ctx'> </div><div class='ctx'> enum srp_target_state {</div><div class='ctx'> 	SRP_TARGET_LIVE,</div><div class='hunk'>@@ -77,15 +79,24 @@ enum srp_target_state {</div><div class='ctx'> 	SRP_TARGET_REMOVED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct srp_host {</div><div class='del'>-	u8			initiator_port_id[16];</div><div class='add'>+struct srp_device {</div><div class='add'>+	struct list_head	dev_list;</div><div class='ctx'> 	struct ib_device       *dev;</div><div class='del'>-	u8                      port;</div><div class='ctx'> 	struct ib_pd	       *pd;</div><div class='ctx'> 	struct ib_mr	       *mr;</div><div class='add'>+	struct ib_fmr_pool     *fmr_pool;</div><div class='add'>+	int			fmr_page_shift;</div><div class='add'>+	int			fmr_page_size;</div><div class='add'>+	unsigned long		fmr_page_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct srp_host {</div><div class='add'>+	u8			initiator_port_id[16];</div><div class='add'>+	struct srp_device      *dev;</div><div class='add'>+	u8			port;</div><div class='ctx'> 	struct class_device	class_dev;</div><div class='ctx'> 	struct list_head	target_list;</div><div class='del'>-	struct mutex            target_mutex;</div><div class='add'>+	spinlock_t		target_lock;</div><div class='ctx'> 	struct completion	released;</div><div class='ctx'> 	struct list_head	list;</div><div class='ctx'> };</div><div class='hunk'>@@ -95,6 +106,7 @@ struct srp_request {</div><div class='ctx'> 	struct scsi_cmnd       *scmnd;</div><div class='ctx'> 	struct srp_iu	       *cmd;</div><div class='ctx'> 	struct srp_iu	       *tsk_mgmt;</div><div class='add'>+	struct ib_pool_fmr     *fmr;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fake scatterlist used when scmnd-&gt;use_sg==0.  Can be killed</div><div class='ctx'> 	 * when the SCSI midlayer no longer generates non-SG commands.</div><div class='hunk'>@@ -110,6 +122,7 @@ struct srp_target_port {</div><div class='ctx'> 	__be64			id_ext;</div><div class='ctx'> 	__be64			ioc_guid;</div><div class='ctx'> 	__be64			service_id;</div><div class='add'>+	u16			io_class;</div><div class='ctx'> 	struct srp_host	       *srp_host;</div><div class='ctx'> 	struct Scsi_Host       *scsi_host;</div><div class='ctx'> 	char			target_name[32];</div><div class='hunk'>@@ -126,6 +139,8 @@ struct srp_target_port {</div><div class='ctx'> 	int			max_ti_iu_len;</div><div class='ctx'> 	s32			req_lim;</div><div class='ctx'> </div><div class='add'>+	int			zero_req_lim;</div><div class='add'>+</div><div class='ctx'> 	unsigned		rx_head;</div><div class='ctx'> 	struct srp_iu	       *rx_ring[SRP_RQ_SIZE];</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c<br/>index ba325f16d077..a29d5ceb00cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/evdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/evdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/evdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/evdev.c</a></div><div class='hunk'>@@ -78,14 +78,19 @@ static int evdev_fasync(int fd, struct file *file, int on)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct evdev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	retval = fasync_helper(fd, file, on, &amp;list-&gt;fasync);</div><div class='add'>+</div><div class='ctx'> 	return retval &lt; 0 ? retval : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int evdev_flush(struct file * file)</div><div class='add'>+static int evdev_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct evdev_list *list = file-&gt;private_data;</div><div class='del'>-	if (!list-&gt;evdev-&gt;exist) return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!list-&gt;evdev-&gt;exist)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	return input_flush_device(&amp;list-&gt;evdev-&gt;handle, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -300,6 +305,7 @@ static ssize_t evdev_read(struct file * file, char __user * buffer, size_t count</div><div class='ctx'> static unsigned int evdev_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct evdev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	poll_wait(file, &amp;list-&gt;evdev-&gt;wait, wait);</div><div class='ctx'> 	return ((list-&gt;head == list-&gt;tail) ? 0 : (POLLIN | POLLRDNORM)) |</div><div class='ctx'> 		(list-&gt;evdev-&gt;exist ? 0 : (POLLHUP | POLLERR));</div><div class='head'>diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c<br/>index 462f8d300aae..9793ac36d17f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/gameport/emu10k1-gp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/gameport/emu10k1-gp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/gameport/emu10k1-gp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/gameport/emu10k1-gp.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c<br/>index 3e2d28f263e9..f68dbe6f7f04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/gameport/ns558.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/gameport/ns558.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/gameport/ns558.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/gameport/ns558.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='head'>diff --git a/drivers/input/input.c b/drivers/input/input.c<br/>index 3038c268917d..a90486f5e491 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/input.c</a></div><div class='hunk'>@@ -28,20 +28,6 @@ MODULE_AUTHOR("Vojtech Pavlik &lt;vojtech@suse.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Input core");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(input_allocate_device);</div><div class='del'>-EXPORT_SYMBOL(input_register_device);</div><div class='del'>-EXPORT_SYMBOL(input_unregister_device);</div><div class='del'>-EXPORT_SYMBOL(input_register_handler);</div><div class='del'>-EXPORT_SYMBOL(input_unregister_handler);</div><div class='del'>-EXPORT_SYMBOL(input_grab_device);</div><div class='del'>-EXPORT_SYMBOL(input_release_device);</div><div class='del'>-EXPORT_SYMBOL(input_open_device);</div><div class='del'>-EXPORT_SYMBOL(input_close_device);</div><div class='del'>-EXPORT_SYMBOL(input_accept_process);</div><div class='del'>-EXPORT_SYMBOL(input_flush_device);</div><div class='del'>-EXPORT_SYMBOL(input_event);</div><div class='del'>-EXPORT_SYMBOL_GPL(input_class);</div><div class='del'>-</div><div class='ctx'> #define INPUT_DEVICES	256</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(input_dev_list);</div><div class='hunk'>@@ -63,11 +49,13 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in</div><div class='ctx'> 		case EV_SYN:</div><div class='ctx'> 			switch (code) {</div><div class='ctx'> 				case SYN_CONFIG:</div><div class='del'>-					if (dev-&gt;event) dev-&gt;event(dev, type, code, value);</div><div class='add'>+					if (dev-&gt;event)</div><div class='add'>+						dev-&gt;event(dev, type, code, value);</div><div class='ctx'> 					break;</div><div class='ctx'> </div><div class='ctx'> 				case SYN_REPORT:</div><div class='del'>-					if (dev-&gt;sync) return;</div><div class='add'>+					if (dev-&gt;sync)</div><div class='add'>+						return;</div><div class='ctx'> 					dev-&gt;sync = 1;</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -136,7 +124,8 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in</div><div class='ctx'> 			if (code &gt; MSC_MAX || !test_bit(code, dev-&gt;mscbit))</div><div class='ctx'> 				return;</div><div class='ctx'> </div><div class='del'>-			if (dev-&gt;event) dev-&gt;event(dev, type, code, value);</div><div class='add'>+			if (dev-&gt;event)</div><div class='add'>+				dev-&gt;event(dev, type, code, value);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +135,9 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in</div><div class='ctx'> 				return;</div><div class='ctx'> </div><div class='ctx'> 			change_bit(code, dev-&gt;led);</div><div class='del'>-			if (dev-&gt;event) dev-&gt;event(dev, type, code, value);</div><div class='add'>+</div><div class='add'>+			if (dev-&gt;event)</div><div class='add'>+				dev-&gt;event(dev, type, code, value);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -158,21 +149,25 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in</div><div class='ctx'> 			if (!!test_bit(code, dev-&gt;snd) != !!value)</div><div class='ctx'> 				change_bit(code, dev-&gt;snd);</div><div class='ctx'> </div><div class='del'>-			if (dev-&gt;event) dev-&gt;event(dev, type, code, value);</div><div class='add'>+			if (dev-&gt;event)</div><div class='add'>+				dev-&gt;event(dev, type, code, value);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case EV_REP:</div><div class='ctx'> </div><div class='del'>-			if (code &gt; REP_MAX || value &lt; 0 || dev-&gt;rep[code] == value) return;</div><div class='add'>+			if (code &gt; REP_MAX || value &lt; 0 || dev-&gt;rep[code] == value)</div><div class='add'>+				return;</div><div class='ctx'> </div><div class='ctx'> 			dev-&gt;rep[code] = value;</div><div class='del'>-			if (dev-&gt;event) dev-&gt;event(dev, type, code, value);</div><div class='add'>+			if (dev-&gt;event)</div><div class='add'>+				dev-&gt;event(dev, type, code, value);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case EV_FF:</div><div class='del'>-			if (dev-&gt;event) dev-&gt;event(dev, type, code, value);</div><div class='add'>+			if (dev-&gt;event)</div><div class='add'>+				dev-&gt;event(dev, type, code, value);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -186,6 +181,7 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in</div><div class='ctx'> 			if (handle-&gt;open)</div><div class='ctx'> 				handle-&gt;handler-&gt;event(handle, type, code, value);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_event);</div><div class='ctx'> </div><div class='ctx'> static void input_repeat_key(unsigned long data)</div><div class='ctx'> {</div><div class='hunk'>@@ -208,6 +204,7 @@ int input_accept_process(struct input_handle *handle, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_accept_process);</div><div class='ctx'> </div><div class='ctx'> int input_grab_device(struct input_handle *handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -217,12 +214,14 @@ int input_grab_device(struct input_handle *handle)</div><div class='ctx'> 	handle-&gt;dev-&gt;grab = handle;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_grab_device);</div><div class='ctx'> </div><div class='ctx'> void input_release_device(struct input_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	if (handle-&gt;dev-&gt;grab == handle)</div><div class='ctx'> 		handle-&gt;dev-&gt;grab = NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_release_device);</div><div class='ctx'> </div><div class='ctx'> int input_open_device(struct input_handle *handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -245,6 +244,7 @@ int input_open_device(struct input_handle *handle)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_open_device);</div><div class='ctx'> </div><div class='ctx'> int input_flush_device(struct input_handle* handle, struct file* file)</div><div class='ctx'> {</div><div class='hunk'>@@ -253,6 +253,7 @@ int input_flush_device(struct input_handle* handle, struct file* file)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_flush_device);</div><div class='ctx'> </div><div class='ctx'> void input_close_device(struct input_handle *handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -268,6 +269,7 @@ void input_close_device(struct input_handle *handle)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_close_device);</div><div class='ctx'> </div><div class='ctx'> static void input_link_handle(struct input_handle *handle)</div><div class='ctx'> {</div><div class='hunk'>@@ -335,9 +337,11 @@ static inline void input_wakeup_procfs_readers(void)</div><div class='ctx'> static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	int state = input_devices_state;</div><div class='add'>+</div><div class='ctx'> 	poll_wait(file, &amp;input_devices_poll_wait, wait);</div><div class='ctx'> 	if (state != input_devices_state)</div><div class='ctx'> 		return POLLIN | POLLRDNORM;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -629,7 +633,7 @@ static ssize_t input_dev_show_modalias(struct class_device *dev, char *buf)</div><div class='ctx'> </div><div class='ctx'> 	len = input_print_modalias(buf, PAGE_SIZE, id, 1);</div><div class='ctx'> </div><div class='del'>-	return max_t(int, len, PAGE_SIZE);</div><div class='add'>+	return min_t(int, len, PAGE_SIZE);</div><div class='ctx'> }</div><div class='ctx'> static CLASS_DEVICE_ATTR(modalias, S_IRUGO, input_dev_show_modalias, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -862,6 +866,7 @@ struct class input_class = {</div><div class='ctx'> 	.release		= input_dev_release,</div><div class='ctx'> 	.uevent			= input_dev_uevent,</div><div class='ctx'> };</div><div class='add'>+EXPORT_SYMBOL_GPL(input_class);</div><div class='ctx'> </div><div class='ctx'> struct input_dev *input_allocate_device(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -872,12 +877,27 @@ struct input_dev *input_allocate_device(void)</div><div class='ctx'> 		dev-&gt;dynalloc = 1;</div><div class='ctx'> 		dev-&gt;cdev.class = &amp;input_class;</div><div class='ctx'> 		class_device_initialize(&amp;dev-&gt;cdev);</div><div class='add'>+		mutex_init(&amp;dev-&gt;mutex);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;dev-&gt;h_list);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;dev-&gt;node);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_allocate_device);</div><div class='add'>+</div><div class='add'>+void input_free_device(struct input_dev *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev) {</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+		dev-&gt;name = dev-&gt;phys = dev-&gt;uniq = NULL;</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+		input_put_device(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(input_free_device);</div><div class='ctx'> </div><div class='ctx'> int input_register_device(struct input_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -895,7 +915,6 @@ int input_register_device(struct input_dev *dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_init(&amp;dev-&gt;mutex);</div><div class='ctx'> 	set_bit(EV_SYN, dev-&gt;evbit);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -956,12 +975,14 @@ int input_register_device(struct input_dev *dev)</div><div class='ctx'>  fail1:	class_device_del(&amp;dev-&gt;cdev);</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_register_device);</div><div class='ctx'> </div><div class='ctx'> void input_unregister_device(struct input_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	struct list_head * node, * next;</div><div class='add'>+	struct list_head *node, *next;</div><div class='ctx'> </div><div class='del'>-	if (!dev) return;</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;dev-&gt;timer);</div><div class='ctx'> </div><div class='hunk'>@@ -977,10 +998,16 @@ void input_unregister_device(struct input_dev *dev)</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;cdev.kobj, &amp;input_dev_caps_attr_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;cdev.kobj, &amp;input_dev_id_attr_group);</div><div class='ctx'> 	sysfs_remove_group(&amp;dev-&gt;cdev.kobj, &amp;input_dev_attr_group);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	dev-&gt;name = dev-&gt;phys = dev-&gt;uniq = NULL;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='ctx'> 	class_device_unregister(&amp;dev-&gt;cdev);</div><div class='ctx'> </div><div class='ctx'> 	input_wakeup_procfs_readers();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_unregister_device);</div><div class='ctx'> </div><div class='ctx'> void input_register_handler(struct input_handler *handler)</div><div class='ctx'> {</div><div class='hunk'>@@ -988,7 +1015,8 @@ void input_register_handler(struct input_handler *handler)</div><div class='ctx'> 	struct input_handle *handle;</div><div class='ctx'> 	struct input_device_id *id;</div><div class='ctx'> </div><div class='del'>-	if (!handler) return;</div><div class='add'>+	if (!handler)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;handler-&gt;h_list);</div><div class='ctx'> </div><div class='hunk'>@@ -1005,10 +1033,11 @@ void input_register_handler(struct input_handler *handler)</div><div class='ctx'> </div><div class='ctx'> 	input_wakeup_procfs_readers();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_register_handler);</div><div class='ctx'> </div><div class='ctx'> void input_unregister_handler(struct input_handler *handler)</div><div class='ctx'> {</div><div class='del'>-	struct list_head * node, * next;</div><div class='add'>+	struct list_head *node, *next;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(node, next, &amp;handler-&gt;h_list) {</div><div class='ctx'> 		struct input_handle * handle = to_handle_h(node);</div><div class='hunk'>@@ -1024,6 +1053,7 @@ void input_unregister_handler(struct input_handler *handler)</div><div class='ctx'> </div><div class='ctx'> 	input_wakeup_procfs_readers();</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(input_unregister_handler);</div><div class='ctx'> </div><div class='ctx'> static int input_open_file(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c<br/>index 949bdcef8c2b..d67157513bf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joydev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joydev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joydev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joydev.c</a></div><div class='hunk'>@@ -81,10 +81,7 @@ static int joydev_correct(int value, struct js_corr *corr)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (value &lt; -32767) return -32767;</div><div class='del'>-	if (value &gt;  32767) return  32767;</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='add'>+	return value &lt; -32767 ? -32767 : (value &gt; 32767 ? 32767 : value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void joydev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)</div><div class='hunk'>@@ -96,7 +93,8 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> </div><div class='ctx'> 		case EV_KEY:</div><div class='del'>-			if (code &lt; BTN_MISC || value == 2) return;</div><div class='add'>+			if (code &lt; BTN_MISC || value == 2)</div><div class='add'>+				return;</div><div class='ctx'> 			event.type = JS_EVENT_BUTTON;</div><div class='ctx'> 			event.number = joydev-&gt;keymap[code - BTN_MISC];</div><div class='ctx'> 			event.value = value;</div><div class='hunk'>@@ -106,7 +104,8 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne</div><div class='ctx'> 			event.type = JS_EVENT_AXIS;</div><div class='ctx'> 			event.number = joydev-&gt;absmap[code];</div><div class='ctx'> 			event.value = joydev_correct(value, joydev-&gt;corr + event.number);</div><div class='del'>-			if (event.value == joydev-&gt;abs[event.number]) return;</div><div class='add'>+			if (event.value == joydev-&gt;abs[event.number])</div><div class='add'>+				return;</div><div class='ctx'> 			joydev-&gt;abs[event.number] = event.value;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -134,7 +133,9 @@ static int joydev_fasync(int fd, struct file *file, int on)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct joydev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	retval = fasync_helper(fd, file, on, &amp;list-&gt;fasync);</div><div class='add'>+</div><div class='ctx'> 	return retval &lt; 0 ? retval : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -222,12 +223,12 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo</div><div class='ctx'> 		return sizeof(struct JS_DATA_TYPE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (list-&gt;startup == joydev-&gt;nabs + joydev-&gt;nkey</div><div class='del'>-		&amp;&amp; list-&gt;head == list-&gt;tail &amp;&amp; (file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+	if (list-&gt;startup == joydev-&gt;nabs + joydev-&gt;nkey &amp;&amp;</div><div class='add'>+	    list-&gt;head == list-&gt;tail &amp;&amp; (file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	retval = wait_event_interruptible(list-&gt;joydev-&gt;wait,</div><div class='del'>-		 			  !list-&gt;joydev-&gt;exist ||</div><div class='add'>+					  !list-&gt;joydev-&gt;exist ||</div><div class='ctx'> 					  list-&gt;startup &lt; joydev-&gt;nabs + joydev-&gt;nkey ||</div><div class='ctx'> 					  list-&gt;head != list-&gt;tail);</div><div class='ctx'> </div><div class='hunk'>@@ -276,8 +277,9 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo</div><div class='ctx'> static unsigned int joydev_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct joydev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	poll_wait(file, &amp;list-&gt;joydev-&gt;wait, wait);</div><div class='del'>-	return ((list-&gt;head != list-&gt;tail || list-&gt;startup &lt; list-&gt;joydev-&gt;nabs + list-&gt;joydev-&gt;nkey) ? </div><div class='add'>+	return ((list-&gt;head != list-&gt;tail || list-&gt;startup &lt; list-&gt;joydev-&gt;nabs + list-&gt;joydev-&gt;nkey) ?</div><div class='ctx'> 		(POLLIN | POLLRDNORM) : 0) | (list-&gt;joydev-&gt;exist ? 0 : (POLLHUP | POLLERR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -291,20 +293,26 @@ static int joydev_ioctl_common(struct joydev *joydev, unsigned int cmd, void __u</div><div class='ctx'> 		case JS_SET_CAL:</div><div class='ctx'> 			return copy_from_user(&amp;joydev-&gt;glue.JS_CORR, argp,</div><div class='ctx'> 				sizeof(joydev-&gt;glue.JS_CORR)) ? -EFAULT : 0;</div><div class='add'>+</div><div class='ctx'> 		case JS_GET_CAL:</div><div class='ctx'> 			return copy_to_user(argp, &amp;joydev-&gt;glue.JS_CORR,</div><div class='ctx'> 				sizeof(joydev-&gt;glue.JS_CORR)) ? -EFAULT : 0;</div><div class='add'>+</div><div class='ctx'> 		case JS_SET_TIMEOUT:</div><div class='ctx'> 			return get_user(joydev-&gt;glue.JS_TIMEOUT, (s32 __user *) argp);</div><div class='add'>+</div><div class='ctx'> 		case JS_GET_TIMEOUT:</div><div class='ctx'> 			return put_user(joydev-&gt;glue.JS_TIMEOUT, (s32 __user *) argp);</div><div class='ctx'> </div><div class='ctx'> 		case JSIOCGVERSION:</div><div class='ctx'> 			return put_user(JS_VERSION, (__u32 __user *) argp);</div><div class='add'>+</div><div class='ctx'> 		case JSIOCGAXES:</div><div class='ctx'> 			return put_user(joydev-&gt;nabs, (__u8 __user *) argp);</div><div class='add'>+</div><div class='ctx'> 		case JSIOCGBUTTONS:</div><div class='ctx'> 			return put_user(joydev-&gt;nkey, (__u8 __user *) argp);</div><div class='add'>+</div><div class='ctx'> 		case JSIOCSCORR:</div><div class='ctx'> 			if (copy_from_user(joydev-&gt;corr, argp,</div><div class='ctx'> 				      sizeof(joydev-&gt;corr[0]) * joydev-&gt;nabs))</div><div class='hunk'>@@ -314,38 +322,49 @@ static int joydev_ioctl_common(struct joydev *joydev, unsigned int cmd, void __u</div><div class='ctx'> 			        joydev-&gt;abs[i] = joydev_correct(dev-&gt;abs[j], joydev-&gt;corr + i);</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='add'>+</div><div class='ctx'> 		case JSIOCGCORR:</div><div class='ctx'> 			return copy_to_user(argp, joydev-&gt;corr,</div><div class='ctx'> 						sizeof(joydev-&gt;corr[0]) * joydev-&gt;nabs) ? -EFAULT : 0;</div><div class='add'>+</div><div class='ctx'> 		case JSIOCSAXMAP:</div><div class='ctx'> 			if (copy_from_user(joydev-&gt;abspam, argp, sizeof(__u8) * (ABS_MAX + 1)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			for (i = 0; i &lt; joydev-&gt;nabs; i++) {</div><div class='del'>-				if (joydev-&gt;abspam[i] &gt; ABS_MAX) return -EINVAL;</div><div class='add'>+				if (joydev-&gt;abspam[i] &gt; ABS_MAX)</div><div class='add'>+					return -EINVAL;</div><div class='ctx'> 				joydev-&gt;absmap[joydev-&gt;abspam[i]] = i;</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='add'>+</div><div class='ctx'> 		case JSIOCGAXMAP:</div><div class='ctx'> 			return copy_to_user(argp, joydev-&gt;abspam,</div><div class='ctx'> 						sizeof(__u8) * (ABS_MAX + 1)) ? -EFAULT : 0;</div><div class='add'>+</div><div class='ctx'> 		case JSIOCSBTNMAP:</div><div class='ctx'> 			if (copy_from_user(joydev-&gt;keypam, argp, sizeof(__u16) * (KEY_MAX - BTN_MISC + 1)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			for (i = 0; i &lt; joydev-&gt;nkey; i++) {</div><div class='del'>-				if (joydev-&gt;keypam[i] &gt; KEY_MAX || joydev-&gt;keypam[i] &lt; BTN_MISC) return -EINVAL;</div><div class='add'>+				if (joydev-&gt;keypam[i] &gt; KEY_MAX || joydev-&gt;keypam[i] &lt; BTN_MISC)</div><div class='add'>+					return -EINVAL;</div><div class='ctx'> 				joydev-&gt;keymap[joydev-&gt;keypam[i] - BTN_MISC] = i;</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='add'>+</div><div class='ctx'> 		case JSIOCGBTNMAP:</div><div class='ctx'> 			return copy_to_user(argp, joydev-&gt;keypam,</div><div class='ctx'> 						sizeof(__u16) * (KEY_MAX - BTN_MISC + 1)) ? -EFAULT : 0;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			if ((cmd &amp; ~(_IOC_SIZEMASK &lt;&lt; _IOC_SIZESHIFT)) == JSIOCGNAME(0)) {</div><div class='ctx'> 				int len;</div><div class='del'>-				if (!dev-&gt;name) return 0;</div><div class='add'>+				if (!dev-&gt;name)</div><div class='add'>+					return 0;</div><div class='ctx'> 				len = strlen(dev-&gt;name) + 1;</div><div class='del'>-				if (len &gt; _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);</div><div class='del'>-				if (copy_to_user(argp, dev-&gt;name, len)) return -EFAULT;</div><div class='add'>+				if (len &gt; _IOC_SIZE(cmd))</div><div class='add'>+					len = _IOC_SIZE(cmd);</div><div class='add'>+				if (copy_to_user(argp, dev-&gt;name, len))</div><div class='add'>+					return -EFAULT;</div><div class='ctx'> 				return len;</div><div class='ctx'> 			}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -362,7 +381,9 @@ static long joydev_compat_ioctl(struct file *file, unsigned int cmd, unsigned lo</div><div class='ctx'> 	struct JS_DATA_SAVE_TYPE_32 ds32;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!joydev-&gt;exist) return -ENODEV;</div><div class='add'>+	if (!joydev-&gt;exist)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 	case JS_SET_TIMELIMIT:</div><div class='ctx'> 		err = get_user(tmp32, (s32 __user *) arg);</div><div class='hunk'>@@ -395,8 +416,7 @@ static long joydev_compat_ioctl(struct file *file, unsigned int cmd, unsigned lo</div><div class='ctx'> 		ds32.JS_SAVE       = joydev-&gt;glue.JS_SAVE;</div><div class='ctx'> 		ds32.JS_CORR       = joydev-&gt;glue.JS_CORR;</div><div class='ctx'> </div><div class='del'>-		err = copy_to_user(argp, &amp;ds32,</div><div class='del'>-					  sizeof(ds32)) ? -EFAULT : 0;</div><div class='add'>+		err = copy_to_user(argp, &amp;ds32, sizeof(ds32)) ? -EFAULT : 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -412,7 +432,8 @@ static int joydev_ioctl(struct inode *inode, struct file *file, unsigned int cmd</div><div class='ctx'> 	struct joydev *joydev = list-&gt;joydev;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='del'>-	if (!joydev-&gt;exist) return -ENODEV;</div><div class='add'>+	if (!joydev-&gt;exist)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 		case JS_SET_TIMELIMIT:</div><div class='hunk'>@@ -546,8 +567,8 @@ static struct input_device_id joydev_blacklist[] = {</div><div class='ctx'> 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,</div><div class='ctx'> 		.evbit = { BIT(EV_KEY) },</div><div class='ctx'> 		.keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },</div><div class='del'>-	}, 	/* Avoid itouchpads, touchscreens and tablets */</div><div class='del'>-	{ }, 	/* Terminating entry */</div><div class='add'>+	},	/* Avoid itouchpads, touchscreens and tablets */</div><div class='add'>+	{ }	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct input_device_id joydev_ids[] = {</div><div class='hunk'>@@ -566,7 +587,7 @@ static struct input_device_id joydev_ids[] = {</div><div class='ctx'> 		.evbit = { BIT(EV_ABS) },</div><div class='ctx'> 		.absbit = { BIT(ABS_THROTTLE) },</div><div class='ctx'> 	},</div><div class='del'>-	{ }, 	/* Terminating entry */</div><div class='add'>+	{ }	/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(input, joydev_ids);</div><div class='hunk'>@@ -579,7 +600,7 @@ static struct input_handler joydev_handler = {</div><div class='ctx'> 	.minor =	JOYDEV_MINOR_BASE,</div><div class='ctx'> 	.name =		"joydev",</div><div class='ctx'> 	.id_table =	joydev_ids,</div><div class='del'>-	.blacklist = 	joydev_blacklist,</div><div class='add'>+	.blacklist =	joydev_blacklist,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init joydev_init(void)</div><div class='head'>diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c<br/>index 4612d13ea756..b11a4bbc84c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/a3d.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/a3d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/a3d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/a3d.c</a></div><div class='hunk'>@@ -306,7 +306,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 	gameport_set_poll_handler(gameport, a3d_poll);</div><div class='ctx'> 	gameport_set_poll_interval(gameport, 20);</div><div class='ctx'> </div><div class='del'>-	sprintf(a3d-&gt;phys, "%s/input0", gameport-&gt;phys);</div><div class='add'>+	snprintf(a3d-&gt;phys, sizeof(a3d-&gt;phys), "%s/input0", gameport-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = a3d_names[a3d-&gt;mode];</div><div class='ctx'> 	input_dev-&gt;phys = a3d-&gt;phys;</div><div class='head'>diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c<br/>index 3121961e3e7c..e9a02db36ecc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/analog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/analog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/analog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/analog.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -408,21 +407,23 @@ static void analog_calibrate_timer(struct analog_port *port)</div><div class='ctx'> </div><div class='ctx'> static void analog_name(struct analog *analog)</div><div class='ctx'> {</div><div class='del'>-	sprintf(analog-&gt;name, "Analog %d-axis %d-button",</div><div class='del'>-		hweight8(analog-&gt;mask &amp; ANALOG_AXES_STD),</div><div class='del'>-		hweight8(analog-&gt;mask &amp; ANALOG_BTNS_STD) + !!(analog-&gt;mask &amp; ANALOG_BTNS_CHF) * 2 +</div><div class='del'>-		hweight16(analog-&gt;mask &amp; ANALOG_BTNS_GAMEPAD) + !!(analog-&gt;mask &amp; ANALOG_HBTN_CHF) * 4);</div><div class='add'>+	snprintf(analog-&gt;name, sizeof(analog-&gt;name), "Analog %d-axis %d-button",</div><div class='add'>+		 hweight8(analog-&gt;mask &amp; ANALOG_AXES_STD),</div><div class='add'>+		 hweight8(analog-&gt;mask &amp; ANALOG_BTNS_STD) + !!(analog-&gt;mask &amp; ANALOG_BTNS_CHF) * 2 +</div><div class='add'>+		 hweight16(analog-&gt;mask &amp; ANALOG_BTNS_GAMEPAD) + !!(analog-&gt;mask &amp; ANALOG_HBTN_CHF) * 4);</div><div class='ctx'> </div><div class='ctx'> 	if (analog-&gt;mask &amp; ANALOG_HATS_ALL)</div><div class='del'>-		sprintf(analog-&gt;name, "%s %d-hat",</div><div class='del'>-			analog-&gt;name, hweight16(analog-&gt;mask &amp; ANALOG_HATS_ALL));</div><div class='add'>+		snprintf(analog-&gt;name, sizeof(analog-&gt;name), "%s %d-hat",</div><div class='add'>+			 analog-&gt;name, hweight16(analog-&gt;mask &amp; ANALOG_HATS_ALL));</div><div class='ctx'> </div><div class='ctx'> 	if (analog-&gt;mask &amp; ANALOG_HAT_FCS)</div><div class='del'>-			strcat(analog-&gt;name, " FCS");</div><div class='add'>+		strlcat(analog-&gt;name, " FCS", sizeof(analog-&gt;name));</div><div class='ctx'> 	if (analog-&gt;mask &amp; ANALOG_ANY_CHF)</div><div class='del'>-			strcat(analog-&gt;name, (analog-&gt;mask &amp; ANALOG_SAITEK) ? " Saitek" : " CHF");</div><div class='add'>+		strlcat(analog-&gt;name, (analog-&gt;mask &amp; ANALOG_SAITEK) ? " Saitek" : " CHF",</div><div class='add'>+			sizeof(analog-&gt;name));</div><div class='ctx'> </div><div class='del'>-	strcat(analog-&gt;name, (analog-&gt;mask &amp; ANALOG_GAMEPAD) ? " gamepad": " joystick");</div><div class='add'>+	strlcat(analog-&gt;name, (analog-&gt;mask &amp; ANALOG_GAMEPAD) ? " gamepad": " joystick",</div><div class='add'>+		sizeof(analog-&gt;name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -435,7 +436,8 @@ static int analog_init_device(struct analog_port *port, struct analog *analog, i</div><div class='ctx'> 	int i, j, t, v, w, x, y, z;</div><div class='ctx'> </div><div class='ctx'> 	analog_name(analog);</div><div class='del'>-	sprintf(analog-&gt;phys, "%s/input%d", port-&gt;gameport-&gt;phys, index);</div><div class='add'>+	snprintf(analog-&gt;phys, sizeof(analog-&gt;phys),</div><div class='add'>+		 "%s/input%d", port-&gt;gameport-&gt;phys, index);</div><div class='ctx'> 	analog-&gt;buttons = (analog-&gt;mask &amp; ANALOG_GAMEPAD) ? analog_pad_btn : analog_joy_btn;</div><div class='ctx'> </div><div class='ctx'> 	analog-&gt;dev = input_dev = input_allocate_device();</div><div class='head'>diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c<br/>index 1909f7ef340c..d5e42eb88a20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/cobra.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/cobra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/cobra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/cobra.c</a></div><div class='hunk'>@@ -202,7 +202,8 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 			goto fail3;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sprintf(cobra-&gt;phys[i], "%s/input%d", gameport-&gt;phys, i);</div><div class='add'>+		snprintf(cobra-&gt;phys[i], sizeof(cobra-&gt;phys[i]),</div><div class='add'>+			 "%s/input%d", gameport-&gt;phys, i);</div><div class='ctx'> </div><div class='ctx'> 		input_dev-&gt;name = "Creative Labs Blaster GamePad Cobra";</div><div class='ctx'> 		input_dev-&gt;phys = cobra-&gt;phys[i];</div><div class='head'>diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c<br/>index e61894685cb1..5080e15c6d30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/db9.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/db9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/db9.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/db9.c</a></div><div class='hunk'>@@ -584,7 +584,7 @@ static struct db9 __init *db9_probe(int parport, int mode)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (db9_mode[mode].bidirectional &amp;&amp; !(pp-&gt;modes &amp; PARPORT_MODE_TRISTATE)) {</div><div class='add'>+	if (db9_mode-&gt;bidirectional &amp;&amp; !(pp-&gt;modes &amp; PARPORT_MODE_TRISTATE)) {</div><div class='ctx'> 		printk(KERN_ERR "db9.c: specified parport is not bidirectional\n");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_put_pp;</div><div class='hunk'>@@ -620,7 +620,8 @@ static struct db9 __init *db9_probe(int parport, int mode)</div><div class='ctx'> 			goto err_unreg_devs;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sprintf(db9-&gt;phys[i], "%s/input%d", db9-&gt;pd-&gt;port-&gt;name, i);</div><div class='add'>+		snprintf(db9-&gt;phys[i], sizeof(db9-&gt;phys[i]),</div><div class='add'>+			 "%s/input%d", db9-&gt;pd-&gt;port-&gt;name, i);</div><div class='ctx'> </div><div class='ctx'> 		input_dev-&gt;name = db9_mode-&gt;name;</div><div class='ctx'> 		input_dev-&gt;phys = db9-&gt;phys[i];</div><div class='head'>diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c<br/>index ecbdb6b9bbd6..fe12aa37393d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/gamecon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/gamecon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/gamecon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/gamecon.c</a></div><div class='hunk'>@@ -761,7 +761,8 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)</div><div class='ctx'> 		if (!pads[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sprintf(gc-&gt;phys[i], "%s/input%d", gc-&gt;pd-&gt;port-&gt;name, i);</div><div class='add'>+		snprintf(gc-&gt;phys[i], sizeof(gc-&gt;phys[i]),</div><div class='add'>+			 "%s/input%d", gc-&gt;pd-&gt;port-&gt;name, i);</div><div class='ctx'> 		err = gc_setup_pad(gc, i, pads[i]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_unreg_devs;</div><div class='head'>diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c<br/>index 8a3ad455eb38..e4a699f6ec87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/gf2k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/gf2k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/gf2k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/gf2k.c</a></div><div class='hunk'>@@ -298,7 +298,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 	gameport_set_poll_handler(gameport, gf2k_poll);</div><div class='ctx'> 	gameport_set_poll_interval(gameport, 20);</div><div class='ctx'> </div><div class='del'>-	sprintf(gf2k-&gt;phys, "%s/input0", gameport-&gt;phys);</div><div class='add'>+	snprintf(gf2k-&gt;phys, sizeof(gf2k-&gt;phys), "%s/input0", gameport-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	gf2k-&gt;length = gf2k_lens[gf2k-&gt;id];</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c<br/>index 20cb98ac2d79..17a90c436de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/grip.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/grip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/grip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/grip.c</a></div><div class='hunk'>@@ -354,7 +354,8 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 			goto fail3;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sprintf(grip-&gt;phys[i], "%s/input%d", gameport-&gt;phys, i);</div><div class='add'>+		snprintf(grip-&gt;phys[i], sizeof(grip-&gt;phys[i]),</div><div class='add'>+			 "%s/input%d", gameport-&gt;phys, i);</div><div class='ctx'> </div><div class='ctx'> 		input_dev-&gt;name = grip_name[grip-&gt;mode[i]];</div><div class='ctx'> 		input_dev-&gt;phys = grip-&gt;phys[i];</div><div class='head'>diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c<br/>index 6e2c721c26ba..840ed9b512b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/guillemot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/guillemot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/guillemot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/guillemot.c</a></div><div class='hunk'>@@ -222,7 +222,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *</div><div class='ctx'> 	gameport_set_poll_handler(gameport, guillemot_poll);</div><div class='ctx'> 	gameport_set_poll_interval(gameport, 20);</div><div class='ctx'> </div><div class='del'>-	sprintf(guillemot-&gt;phys, "%s/input0", gameport-&gt;phys);</div><div class='add'>+	snprintf(guillemot-&gt;phys, sizeof(guillemot-&gt;phys), "%s/input0", gameport-&gt;phys);</div><div class='ctx'> 	guillemot-&gt;type = guillemot_type + i;</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = guillemot_type[i].name;</div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce-ff.c b/drivers/input/joystick/iforce/iforce-ff.c<br/>index 2b8e8456c9fa..50c90765aee1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/iforce/iforce-ff.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/iforce/iforce-ff.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/iforce/iforce-ff.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/iforce/iforce-ff.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static int make_magnitude_modifier(struct iforce* iforce,</div><div class='ctx'> 			iforce-&gt;device_memory.start, iforce-&gt;device_memory.end, 2L,</div><div class='ctx'> 			NULL, NULL)) {</div><div class='ctx'> 			mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -80,7 +80,7 @@ static int make_period_modifier(struct iforce* iforce,</div><div class='ctx'> 			iforce-&gt;device_memory.start, iforce-&gt;device_memory.end, 2L,</div><div class='ctx'> 			NULL, NULL)) {</div><div class='ctx'> 			mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -120,7 +120,7 @@ static int make_envelope_modifier(struct iforce* iforce,</div><div class='ctx'> 			iforce-&gt;device_memory.start, iforce-&gt;device_memory.end, 2L,</div><div class='ctx'> 			NULL, NULL)) {</div><div class='ctx'> 			mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -157,7 +157,7 @@ static int make_condition_modifier(struct iforce* iforce,</div><div class='ctx'> 			iforce-&gt;device_memory.start, iforce-&gt;device_memory.end, 2L,</div><div class='ctx'> 			NULL, NULL)) {</div><div class='ctx'> 			mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			return -ENOSPC;</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;iforce-&gt;mem_mutex);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c<br/>index ab0a26b924ca..6d99e3c37884 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/iforce/iforce-main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/iforce/iforce-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/iforce/iforce-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/iforce/iforce-main.c</a></div><div class='hunk'>@@ -86,7 +86,7 @@ static struct iforce_device iforce_device[] = {</div><div class='ctx'> </div><div class='ctx'> static int iforce_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)</div><div class='ctx'> {</div><div class='del'>-	struct iforce* iforce = (struct iforce*)(dev-&gt;private);</div><div class='add'>+	struct iforce* iforce = dev-&gt;private;</div><div class='ctx'> 	unsigned char data[3];</div><div class='ctx'> </div><div class='ctx'> 	if (type != EV_FF)</div><div class='hunk'>@@ -138,7 +138,7 @@ static int iforce_input_event(struct input_dev *dev, unsigned int type, unsigned</div><div class='ctx'>  */</div><div class='ctx'> static int iforce_upload_effect(struct input_dev *dev, struct ff_effect *effect)</div><div class='ctx'> {</div><div class='del'>-	struct iforce* iforce = (struct iforce*)(dev-&gt;private);</div><div class='add'>+	struct iforce* iforce = dev-&gt;private;</div><div class='ctx'> 	int id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int is_update;</div><div class='hunk'>@@ -218,7 +218,7 @@ static int iforce_upload_effect(struct input_dev *dev, struct ff_effect *effect)</div><div class='ctx'>  */</div><div class='ctx'> static int iforce_erase_effect(struct input_dev *dev, int effect_id)</div><div class='ctx'> {</div><div class='del'>-	struct iforce* iforce = (struct iforce*)(dev-&gt;private);</div><div class='add'>+	struct iforce* iforce = dev-&gt;private;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct iforce_core_effect* core_effect;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h<br/>index 668f24535ba0..e9924d6f01b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/iforce/iforce.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/iforce/iforce.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/iforce/iforce.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/iforce/iforce.h</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/circ_buf.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c<br/>index c4ed01758226..bbfeb9c59b87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/interact.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/interact.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/interact.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/interact.c</a></div><div class='hunk'>@@ -251,7 +251,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d</div><div class='ctx'> 	gameport_set_poll_handler(gameport, interact_poll);</div><div class='ctx'> 	gameport_set_poll_interval(gameport, 20);</div><div class='ctx'> </div><div class='del'>-	sprintf(interact-&gt;phys, "%s/input0", gameport-&gt;phys);</div><div class='add'>+	snprintf(interact-&gt;phys, sizeof(interact-&gt;phys), "%s/input0", gameport-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	interact-&gt;type = i;</div><div class='ctx'> 	interact-&gt;length = interact_type[i].length;</div><div class='head'>diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c<br/>index ca3cc2319d6a..168b1061a03b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/magellan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/magellan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/magellan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/magellan.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	magellan-&gt;dev = input_dev;</div><div class='del'>-	sprintf(magellan-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(magellan-&gt;phys, sizeof(magellan-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "LogiCad3D Magellan / SpaceMouse";</div><div class='ctx'> 	input_dev-&gt;phys = magellan-&gt;phys;</div><div class='head'>diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c<br/>index 95c0de7964a0..e58b22c018e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/sidewinder.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/sidewinder.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/sidewinder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/sidewinder.c</a></div><div class='hunk'>@@ -541,7 +541,7 @@ static void sw_print_packet(char *name, int length, unsigned char *buf, char bit</div><div class='ctx'>  * Unfortunately I don't know how to do this for the other SW types.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void sw_3dp_id(unsigned char *buf, char *comment)</div><div class='add'>+static void sw_3dp_id(unsigned char *buf, char *comment, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char pnp[8], rev[9];</div><div class='hunk'>@@ -554,7 +554,7 @@ static void sw_3dp_id(unsigned char *buf, char *comment)</div><div class='ctx'> </div><div class='ctx'> 	pnp[7] = rev[8] = 0;</div><div class='ctx'> </div><div class='del'>-	sprintf(comment, " [PnP %d.%02d id %s rev %s]",</div><div class='add'>+	snprintf(comment, size, " [PnP %d.%02d id %s rev %s]",</div><div class='ctx'> 		(int) ((sw_get_bits(buf, 8, 6, 1) &lt;&lt; 6) |		/* Two 6-bit values */</div><div class='ctx'> 			sw_get_bits(buf, 16, 6, 1)) / 100,</div><div class='ctx'> 		(int) ((sw_get_bits(buf, 8, 6, 1) &lt;&lt; 6) |</div><div class='hunk'>@@ -695,7 +695,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 						sw-&gt;type = SW_ID_FFP;</div><div class='ctx'> 						sprintf(comment, " [AC %s]", sw_get_bits(idbuf,38,1,3) ? "off" : "on");</div><div class='ctx'> 					} else</div><div class='del'>-					sw-&gt;type = SW_ID_PP;</div><div class='add'>+						sw-&gt;type = SW_ID_PP;</div><div class='ctx'> 					break;</div><div class='ctx'> 				case 66:</div><div class='ctx'> 					sw-&gt;bits = 3;</div><div class='hunk'>@@ -703,7 +703,8 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 					sw-&gt;length = 22;</div><div class='ctx'> 				case 64:</div><div class='ctx'> 					sw-&gt;type = SW_ID_3DP;</div><div class='del'>-					if (j == 160) sw_3dp_id(idbuf, comment);</div><div class='add'>+					if (j == 160)</div><div class='add'>+						sw_3dp_id(idbuf, comment, sizeof(comment));</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -733,8 +734,10 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)</div><div class='ctx'> 	for (i = 0; i &lt; sw-&gt;number; i++) {</div><div class='ctx'> 		int bits, code;</div><div class='ctx'> </div><div class='del'>-		sprintf(sw-&gt;name, "Microsoft SideWinder %s", sw_name[sw-&gt;type]);</div><div class='del'>-		sprintf(sw-&gt;phys[i], "%s/input%d", gameport-&gt;phys, i);</div><div class='add'>+		snprintf(sw-&gt;name, sizeof(sw-&gt;name),</div><div class='add'>+			 "Microsoft SideWinder %s", sw_name[sw-&gt;type]);</div><div class='add'>+		snprintf(sw-&gt;phys[i], sizeof(sw-&gt;phys[i]),</div><div class='add'>+			 "%s/input%d", gameport-&gt;phys, i);</div><div class='ctx'> </div><div class='ctx'> 		sw-&gt;dev[i] = input_dev = input_allocate_device();</div><div class='ctx'> 		if (!input_dev) {</div><div class='head'>diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c<br/>index d6f8db8ec3fd..75eb5ca59992 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/spaceball.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/spaceball.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/spaceball.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/spaceball.c</a></div><div class='hunk'>@@ -220,7 +220,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	spaceball-&gt;dev = input_dev;</div><div class='del'>-	sprintf(spaceball-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(spaceball-&gt;phys, sizeof(spaceball-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = spaceball_names[id];</div><div class='ctx'> 	input_dev-&gt;phys = spaceball-&gt;phys;</div><div class='head'>diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c<br/>index 7c123a01c58e..3e2782e79834 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/spaceorb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/spaceorb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/spaceorb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/spaceorb.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	spaceorb-&gt;dev = input_dev;</div><div class='del'>-	sprintf(spaceorb-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(spaceorb-&gt;phys, sizeof(spaceorb-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "SpaceTec SpaceOrb 360 / Avenger";</div><div class='ctx'> 	input_dev-&gt;phys = spaceorb-&gt;phys;</div><div class='head'>diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c<br/>index 0a9ed1d30636..011ec4858e15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/stinger.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/stinger.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/stinger.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/stinger.c</a></div><div class='hunk'>@@ -148,7 +148,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	stinger-&gt;dev = input_dev;</div><div class='del'>-	sprintf(stinger-&gt;phys, "%s/serio0", serio-&gt;phys);</div><div class='add'>+	snprintf(stinger-&gt;phys, sizeof(stinger-&gt;phys), "%s/serio0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "Gravis Stinger";</div><div class='ctx'> 	input_dev-&gt;phys = stinger-&gt;phys;</div><div class='head'>diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c<br/>index 7f8b0093c5bc..076f237d9654 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/twidjoy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/twidjoy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/twidjoy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/twidjoy.c</a></div><div class='hunk'>@@ -199,7 +199,7 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	twidjoy-&gt;dev = input_dev;</div><div class='del'>-	sprintf(twidjoy-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(twidjoy-&gt;phys, sizeof(twidjoy-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "Handykey Twiddler";</div><div class='ctx'> 	input_dev-&gt;phys = twidjoy-&gt;phys;</div><div class='head'>diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c<br/>index 1849b176cf18..f9c1a03214eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/joystick/warrior.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/joystick/warrior.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/joystick/warrior.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/joystick/warrior.c</a></div><div class='hunk'>@@ -154,7 +154,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	warrior-&gt;dev = input_dev;</div><div class='del'>-	sprintf(warrior-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(warrior-&gt;phys, sizeof(warrior-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "Logitech WingMan Warrior";</div><div class='ctx'> 	input_dev-&gt;phys = warrior-&gt;phys;</div><div class='head'>diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c<br/>index 4c8fb1f8631f..f1f9db9d282c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/amikbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/amikbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/amikbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/amikbd.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/keyboard.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/amigaints.h&gt;</div><div class='ctx'> #include &lt;asm/amigahw.h&gt;</div><div class='hunk'>@@ -45,7 +46,7 @@ MODULE_AUTHOR("Vojtech Pavlik &lt;vojtech@ucw.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Amiga keyboard driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static unsigned char amikbd_keycode[0x78] = {</div><div class='add'>+static unsigned char amikbd_keycode[0x78] __initdata = {</div><div class='ctx'> 	[0]	 = KEY_GRAVE,</div><div class='ctx'> 	[1]	 = KEY_1,</div><div class='ctx'> 	[2]	 = KEY_2,</div><div class='hunk'>@@ -170,12 +171,9 @@ static irqreturn_t amikbd_interrupt(int irq, void *dummy, struct pt_regs *fp)</div><div class='ctx'> 	scancode &gt;&gt;= 1;</div><div class='ctx'> </div><div class='ctx'> 	if (scancode &lt; 0x78) {		/* scancodes &lt; 0x78 are keys */</div><div class='del'>-</div><div class='del'>-		scancode = amikbd_keycode[scancode];</div><div class='del'>-</div><div class='ctx'> 		input_regs(amikbd_dev, fp);</div><div class='ctx'> </div><div class='del'>-		if (scancode == KEY_CAPSLOCK) {	/* CapsLock is a toggle switch key on Amiga */</div><div class='add'>+		if (scancode == 98) {	/* CapsLock is a toggle switch key on Amiga */</div><div class='ctx'> 			input_report_key(amikbd_dev, scancode, 1);</div><div class='ctx'> 			input_report_key(amikbd_dev, scancode, 0);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -191,7 +189,7 @@ static irqreturn_t amikbd_interrupt(int irq, void *dummy, struct pt_regs *fp)</div><div class='ctx'> </div><div class='ctx'> static int __init amikbd_init(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	if (!AMIGAHW_PRESENT(AMI_KEYBOARD))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -214,14 +212,26 @@ static int __init amikbd_init(void)</div><div class='ctx'> 	amikbd_dev-&gt;id.version = 0x0100;</div><div class='ctx'> </div><div class='ctx'> 	amikbd_dev-&gt;evbit[0] = BIT(EV_KEY) | BIT(EV_REP);</div><div class='del'>-	amikbd_dev-&gt;keycode = amikbd_keycode;</div><div class='del'>-	amikbd_dev-&gt;keycodesize = sizeof(unsigned char);</div><div class='del'>-	amikbd_dev-&gt;keycodemax = ARRAY_SIZE(amikbd_keycode);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 0x78; i++)</div><div class='del'>-		if (amikbd_keycode[i])</div><div class='del'>-			set_bit(amikbd_keycode[i], amikbd_dev-&gt;keybit);</div><div class='del'>-</div><div class='add'>+		set_bit(i, amikbd_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_KEYMAPS; i++) {</div><div class='add'>+		static u_short temp_map[NR_KEYS] __initdata;</div><div class='add'>+		if (!key_maps[i])</div><div class='add'>+			continue;</div><div class='add'>+		memset(temp_map, 0, sizeof(temp_map));</div><div class='add'>+		for (j = 0; j &lt; 0x78; j++) {</div><div class='add'>+			if (!amikbd_keycode[j])</div><div class='add'>+				continue;</div><div class='add'>+			temp_map[j] = key_maps[i][amikbd_keycode[j]];</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; NR_KEYS; j++) {</div><div class='add'>+			if (!temp_map[j])</div><div class='add'>+				temp_map[j] = 0xf200;</div><div class='add'>+		}</div><div class='add'>+		memcpy(key_maps[i], temp_map, sizeof(temp_map));</div><div class='add'>+	}</div><div class='ctx'> 	ciaa.cra &amp;= ~0x41;	 /* serial data in, turn off TA */</div><div class='ctx'> 	request_irq(IRQ_AMIGA_CIAA_SP, amikbd_interrupt, 0, "amikbd", amikbd_interrupt);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c<br/>index fad04b66d268..ce1f10e8984b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/atkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/atkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/atkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/atkbd.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static int atkbd_softraw = 1;</div><div class='ctx'> module_param_named(softraw, atkbd_softraw, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(softraw, "Use software generated rawmode");</div><div class='ctx'> </div><div class='del'>-static int atkbd_scroll = 0;</div><div class='add'>+static int atkbd_scroll;</div><div class='ctx'> module_param_named(scroll, atkbd_scroll, bool, 0);</div><div class='ctx'> MODULE_PARM_DESC(scroll, "Enable scroll-wheel on MS Office and similar keyboards");</div><div class='ctx'> </div><div class='hunk'>@@ -150,8 +150,8 @@ static unsigned char atkbd_unxlate_table[128] = {</div><div class='ctx'> #define ATKBD_RET_EMUL0		0xe0</div><div class='ctx'> #define ATKBD_RET_EMUL1		0xe1</div><div class='ctx'> #define ATKBD_RET_RELEASE	0xf0</div><div class='del'>-#define ATKBD_RET_HANGUEL	0xf1</div><div class='del'>-#define ATKBD_RET_HANJA		0xf2</div><div class='add'>+#define ATKBD_RET_HANJA		0xf1</div><div class='add'>+#define ATKBD_RET_HANGEUL	0xf2</div><div class='ctx'> #define ATKBD_RET_ERR		0xff</div><div class='ctx'> </div><div class='ctx'> #define ATKBD_KEY_UNKNOWN	  0</div><div class='hunk'>@@ -170,6 +170,13 @@ static unsigned char atkbd_unxlate_table[128] = {</div><div class='ctx'> #define ATKBD_LED_EVENT_BIT	0</div><div class='ctx'> #define ATKBD_REP_EVENT_BIT	1</div><div class='ctx'> </div><div class='add'>+#define ATKBD_XL_ERR		0x01</div><div class='add'>+#define ATKBD_XL_BAT		0x02</div><div class='add'>+#define ATKBD_XL_ACK		0x04</div><div class='add'>+#define ATKBD_XL_NAK		0x08</div><div class='add'>+#define ATKBD_XL_HANGEUL	0x10</div><div class='add'>+#define ATKBD_XL_HANJA		0x20</div><div class='add'>+</div><div class='ctx'> static struct {</div><div class='ctx'> 	unsigned char keycode;</div><div class='ctx'> 	unsigned char set2;</div><div class='hunk'>@@ -211,8 +218,7 @@ struct atkbd {</div><div class='ctx'> 	unsigned char emul;</div><div class='ctx'> 	unsigned char resend;</div><div class='ctx'> 	unsigned char release;</div><div class='del'>-	unsigned char bat_xl;</div><div class='del'>-	unsigned char err_xl;</div><div class='add'>+	unsigned long xl_bit;</div><div class='ctx'> 	unsigned int last;</div><div class='ctx'> 	unsigned long time;</div><div class='ctx'> </div><div class='hunk'>@@ -245,17 +251,65 @@ ATKBD_DEFINE_ATTR(set);</div><div class='ctx'> ATKBD_DEFINE_ATTR(softrepeat);</div><div class='ctx'> ATKBD_DEFINE_ATTR(softraw);</div><div class='ctx'> </div><div class='add'>+static const unsigned int xl_table[] = {</div><div class='add'>+	ATKBD_RET_BAT, ATKBD_RET_ERR, ATKBD_RET_ACK,</div><div class='add'>+	ATKBD_RET_NAK, ATKBD_RET_HANJA, ATKBD_RET_HANGEUL,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void atkbd_report_key(struct input_dev *dev, struct pt_regs *regs, int code, int value)</div><div class='add'>+/*</div><div class='add'>+ * Checks if we should mangle the scancode to extract 'release' bit</div><div class='add'>+ * in translated mode.</div><div class='add'>+ */</div><div class='add'>+static int atkbd_need_xlate(unsigned long xl_bit, unsigned char code)</div><div class='ctx'> {</div><div class='del'>-	input_regs(dev, regs);</div><div class='del'>-	if (value == 3) {</div><div class='del'>-		input_report_key(dev, code, 1);</div><div class='del'>-		input_sync(dev);</div><div class='del'>-		input_report_key(dev, code, 0);</div><div class='del'>-	} else</div><div class='del'>-		input_event(dev, EV_KEY, code, value);</div><div class='del'>-	input_sync(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (code == ATKBD_RET_EMUL0 || code == ATKBD_RET_EMUL1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(xl_table); i++)</div><div class='add'>+		if (code == xl_table[i])</div><div class='add'>+			return test_bit(i, &amp;xl_bit);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculates new value of xl_bit so the driver can distinguish</div><div class='add'>+ * between make/break pair of scancodes for select keys and PS/2</div><div class='add'>+ * protocol responses.</div><div class='add'>+ */</div><div class='add'>+static void atkbd_calculate_xl_bit(struct atkbd *atkbd, unsigned char code)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(xl_table); i++) {</div><div class='add'>+		if (!((code ^ xl_table[i]) &amp; 0x7f)) {</div><div class='add'>+			if (code &amp; 0x80)</div><div class='add'>+				__clear_bit(i, &amp;atkbd-&gt;xl_bit);</div><div class='add'>+			else</div><div class='add'>+				__set_bit(i, &amp;atkbd-&gt;xl_bit);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Encode the scancode, 0xe0 prefix, and high bit into a single integer,</div><div class='add'>+ * keeping kernel 2.4 compatibility for set 2</div><div class='add'>+ */</div><div class='add'>+static unsigned int atkbd_compat_scancode(struct atkbd *atkbd, unsigned int code)</div><div class='add'>+{</div><div class='add'>+	if (atkbd-&gt;set == 3) {</div><div class='add'>+		if (atkbd-&gt;emul == 1)</div><div class='add'>+			code |= 0x100;</div><div class='add'>+        } else {</div><div class='add'>+		code = (code &amp; 0x7f) | ((code &amp; 0x80) &lt;&lt; 1);</div><div class='add'>+		if (atkbd-&gt;emul == 1)</div><div class='add'>+			code |= 0x80;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return code;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -267,9 +321,11 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,</div><div class='ctx'> 			unsigned int flags, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct atkbd *atkbd = serio_get_drvdata(serio);</div><div class='add'>+	struct input_dev *dev = atkbd-&gt;dev;</div><div class='ctx'> 	unsigned int code = data;</div><div class='del'>-	int scroll = 0, hscroll = 0, click = -1;</div><div class='add'>+	int scroll = 0, hscroll = 0, click = -1, add_release_event = 0;</div><div class='ctx'> 	int value;</div><div class='add'>+	unsigned char keycode;</div><div class='ctx'> </div><div class='ctx'> #ifdef ATKBD_DEBUG</div><div class='ctx'> 	printk(KERN_DEBUG "atkbd.c: Received %02x flags %02x\n", data, flags);</div><div class='hunk'>@@ -298,25 +354,17 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,</div><div class='ctx'> 	if (!atkbd-&gt;enabled)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	input_event(atkbd-&gt;dev, EV_MSC, MSC_RAW, code);</div><div class='add'>+	input_event(dev, EV_MSC, MSC_RAW, code);</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;translated) {</div><div class='ctx'> </div><div class='del'>-		if (atkbd-&gt;emul ||</div><div class='del'>-		    (code != ATKBD_RET_EMUL0 &amp;&amp; code != ATKBD_RET_EMUL1 &amp;&amp;</div><div class='del'>-		     code != ATKBD_RET_HANGUEL &amp;&amp; code != ATKBD_RET_HANJA &amp;&amp;</div><div class='del'>-		     (code != ATKBD_RET_ERR || atkbd-&gt;err_xl) &amp;&amp;</div><div class='del'>-	             (code != ATKBD_RET_BAT || atkbd-&gt;bat_xl))) {</div><div class='add'>+		if (atkbd-&gt;emul || atkbd_need_xlate(atkbd-&gt;xl_bit, code)) {</div><div class='ctx'> 			atkbd-&gt;release = code &gt;&gt; 7;</div><div class='ctx'> 			code &amp;= 0x7f;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!atkbd-&gt;emul) {</div><div class='del'>-		     if ((code &amp; 0x7f) == (ATKBD_RET_BAT &amp; 0x7f))</div><div class='del'>-			atkbd-&gt;bat_xl = !(data &gt;&gt; 7);</div><div class='del'>-		     if ((code &amp; 0x7f) == (ATKBD_RET_ERR &amp; 0x7f))</div><div class='del'>-			atkbd-&gt;err_xl = !(data &gt;&gt; 7);</div><div class='del'>-		}</div><div class='add'>+		if (!atkbd-&gt;emul)</div><div class='add'>+			atkbd_calculate_xl_bit(atkbd, data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (code) {</div><div class='hunk'>@@ -333,47 +381,48 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,</div><div class='ctx'> 		case ATKBD_RET_RELEASE:</div><div class='ctx'> 			atkbd-&gt;release = 1;</div><div class='ctx'> 			goto out;</div><div class='del'>-		case ATKBD_RET_HANGUEL:</div><div class='del'>-			atkbd_report_key(atkbd-&gt;dev, regs, KEY_HANGUEL, 3);</div><div class='add'>+		case ATKBD_RET_ACK:</div><div class='add'>+		case ATKBD_RET_NAK:</div><div class='add'>+			printk(KERN_WARNING "atkbd.c: Spurious %s on %s. "</div><div class='add'>+			       "Some program might be trying access hardware directly.\n",</div><div class='add'>+			       data == ATKBD_RET_ACK ? "ACK" : "NAK", serio-&gt;phys);</div><div class='ctx'> 			goto out;</div><div class='add'>+		case ATKBD_RET_HANGEUL:</div><div class='ctx'> 		case ATKBD_RET_HANJA:</div><div class='del'>-			atkbd_report_key(atkbd-&gt;dev, regs, KEY_HANJA, 3);</div><div class='del'>-			goto out;</div><div class='add'>+			/*</div><div class='add'>+			 * These keys do not report release and thus need to be</div><div class='add'>+			 * flagged properly</div><div class='add'>+			 */</div><div class='add'>+			add_release_event = 1;</div><div class='add'>+			break;</div><div class='ctx'> 		case ATKBD_RET_ERR:</div><div class='ctx'> 			printk(KERN_DEBUG "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio-&gt;phys);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (atkbd-&gt;set != 3)</div><div class='del'>-		code = (code &amp; 0x7f) | ((code &amp; 0x80) &lt;&lt; 1);</div><div class='del'>-	if (atkbd-&gt;emul) {</div><div class='del'>-		if (--atkbd-&gt;emul)</div><div class='del'>-			goto out;</div><div class='del'>-		code |= (atkbd-&gt;set != 3) ? 0x80 : 0x100;</div><div class='del'>-	}</div><div class='add'>+	code = atkbd_compat_scancode(atkbd, code);</div><div class='add'>+</div><div class='add'>+	if (atkbd-&gt;emul &amp;&amp; --atkbd-&gt;emul)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	if (atkbd-&gt;keycode[code] != ATKBD_KEY_NULL)</div><div class='del'>-		input_event(atkbd-&gt;dev, EV_MSC, MSC_SCAN, code);</div><div class='add'>+	keycode = atkbd-&gt;keycode[code];</div><div class='ctx'> </div><div class='del'>-	switch (atkbd-&gt;keycode[code]) {</div><div class='add'>+	if (keycode != ATKBD_KEY_NULL)</div><div class='add'>+		input_event(dev, EV_MSC, MSC_SCAN, code);</div><div class='add'>+</div><div class='add'>+	switch (keycode) {</div><div class='ctx'> 		case ATKBD_KEY_NULL:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATKBD_KEY_UNKNOWN:</div><div class='del'>-			if (data == ATKBD_RET_ACK || data == ATKBD_RET_NAK) {</div><div class='del'>-				printk(KERN_WARNING "atkbd.c: Spurious %s on %s. Some program, "</div><div class='del'>-				       "like XFree86, might be trying access hardware directly.\n",</div><div class='del'>-				       data == ATKBD_RET_ACK ? "ACK" : "NAK", serio-&gt;phys);</div><div class='del'>-			} else {</div><div class='del'>-				printk(KERN_WARNING "atkbd.c: Unknown key %s "</div><div class='del'>-				       "(%s set %d, code %#x on %s).\n",</div><div class='del'>-				       atkbd-&gt;release ? "released" : "pressed",</div><div class='del'>-				       atkbd-&gt;translated ? "translated" : "raw",</div><div class='del'>-				       atkbd-&gt;set, code, serio-&gt;phys);</div><div class='del'>-				printk(KERN_WARNING "atkbd.c: Use 'setkeycodes %s%02x &lt;keycode&gt;' "</div><div class='del'>-				       "to make it known.\n",</div><div class='del'>-				       code &amp; 0x80 ? "e0" : "", code &amp; 0x7f);</div><div class='del'>-			}</div><div class='del'>-			input_sync(atkbd-&gt;dev);</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "atkbd.c: Unknown key %s (%s set %d, code %#x on %s).\n",</div><div class='add'>+			       atkbd-&gt;release ? "released" : "pressed",</div><div class='add'>+			       atkbd-&gt;translated ? "translated" : "raw",</div><div class='add'>+			       atkbd-&gt;set, code, serio-&gt;phys);</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "atkbd.c: Use 'setkeycodes %s%02x &lt;keycode&gt;' to make it known.\n",</div><div class='add'>+			       code &amp; 0x80 ? "e0" : "", code &amp; 0x7f);</div><div class='add'>+			input_sync(dev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ATKBD_SCR_1:</div><div class='ctx'> 			scroll = 1 - atkbd-&gt;release * 2;</div><div class='hunk'>@@ -397,33 +446,35 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,</div><div class='ctx'> 			hscroll = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			value = atkbd-&gt;release ? 0 :</div><div class='del'>-				(1 + (!atkbd-&gt;softrepeat &amp;&amp; test_bit(atkbd-&gt;keycode[code], atkbd-&gt;dev-&gt;key)));</div><div class='del'>-</div><div class='del'>-			switch (value) {	/* Workaround Toshiba laptop multiple keypress */</div><div class='del'>-				case 0:</div><div class='del'>-					atkbd-&gt;last = 0;</div><div class='del'>-					break;</div><div class='del'>-				case 1:</div><div class='del'>-					atkbd-&gt;last = code;</div><div class='del'>-					atkbd-&gt;time = jiffies + msecs_to_jiffies(atkbd-&gt;dev-&gt;rep[REP_DELAY]) / 2;</div><div class='del'>-					break;</div><div class='del'>-				case 2:</div><div class='del'>-					if (!time_after(jiffies, atkbd-&gt;time) &amp;&amp; atkbd-&gt;last == code)</div><div class='del'>-						value = 1;</div><div class='del'>-					break;</div><div class='add'>+			if (atkbd-&gt;release) {</div><div class='add'>+				value = 0;</div><div class='add'>+				atkbd-&gt;last = 0;</div><div class='add'>+			} else if (!atkbd-&gt;softrepeat &amp;&amp; test_bit(keycode, dev-&gt;key)) {</div><div class='add'>+				/* Workaround Toshiba laptop multiple keypress */</div><div class='add'>+				value = time_before(jiffies, atkbd-&gt;time) &amp;&amp; atkbd-&gt;last == code ? 1 : 2;</div><div class='add'>+			} else {</div><div class='add'>+				value = 1;</div><div class='add'>+				atkbd-&gt;last = code;</div><div class='add'>+				atkbd-&gt;time = jiffies + msecs_to_jiffies(dev-&gt;rep[REP_DELAY]) / 2;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			atkbd_report_key(atkbd-&gt;dev, regs, atkbd-&gt;keycode[code], value);</div><div class='add'>+			input_regs(dev, regs);</div><div class='add'>+			input_event(dev, EV_KEY, keycode, value);</div><div class='add'>+			input_sync(dev);</div><div class='add'>+</div><div class='add'>+			if (value &amp;&amp; add_release_event) {</div><div class='add'>+				input_report_key(dev, keycode, 0);</div><div class='add'>+				input_sync(dev);</div><div class='add'>+			}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;scroll) {</div><div class='del'>-		input_regs(atkbd-&gt;dev, regs);</div><div class='add'>+		input_regs(dev, regs);</div><div class='ctx'> 		if (click != -1)</div><div class='del'>-			input_report_key(atkbd-&gt;dev, BTN_MIDDLE, click);</div><div class='del'>-		input_report_rel(atkbd-&gt;dev, REL_WHEEL, scroll);</div><div class='del'>-		input_report_rel(atkbd-&gt;dev, REL_HWHEEL, hscroll);</div><div class='del'>-		input_sync(atkbd-&gt;dev);</div><div class='add'>+			input_report_key(dev, BTN_MIDDLE, click);</div><div class='add'>+		input_report_rel(dev, REL_WHEEL, scroll);</div><div class='add'>+		input_report_rel(dev, REL_HWHEEL, hscroll);</div><div class='add'>+		input_sync(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atkbd-&gt;release = 0;</div><div class='hunk'>@@ -764,6 +815,9 @@ static void atkbd_set_keycode_table(struct atkbd *atkbd)</div><div class='ctx'> 			for (i = 0; i &lt; ARRAY_SIZE(atkbd_scroll_keys); i++)</div><div class='ctx'> 				atkbd-&gt;keycode[atkbd_scroll_keys[i].set2] = atkbd_scroll_keys[i].keycode;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	atkbd-&gt;keycode[atkbd_compat_scancode(atkbd, ATKBD_RET_HANGEUL)] = KEY_HANGUEL;</div><div class='add'>+	atkbd-&gt;keycode[atkbd_compat_scancode(atkbd, ATKBD_RET_HANJA)] = KEY_HANJA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -776,12 +830,15 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (atkbd-&gt;extra)</div><div class='del'>-		sprintf(atkbd-&gt;name, "AT Set 2 Extra keyboard");</div><div class='add'>+		snprintf(atkbd-&gt;name, sizeof(atkbd-&gt;name),</div><div class='add'>+			 "AT Set 2 Extra keyboard");</div><div class='ctx'> 	else</div><div class='del'>-		sprintf(atkbd-&gt;name, "AT %s Set %d keyboard",</div><div class='del'>-			atkbd-&gt;translated ? "Translated" : "Raw", atkbd-&gt;set);</div><div class='add'>+		snprintf(atkbd-&gt;name, sizeof(atkbd-&gt;name),</div><div class='add'>+			 "AT %s Set %d keyboard",</div><div class='add'>+			 atkbd-&gt;translated ? "Translated" : "Raw", atkbd-&gt;set);</div><div class='ctx'> </div><div class='del'>-	sprintf(atkbd-&gt;phys, "%s/input0", atkbd-&gt;ps2dev.serio-&gt;phys);</div><div class='add'>+	snprintf(atkbd-&gt;phys, sizeof(atkbd-&gt;phys),</div><div class='add'>+		 "%s/input0", atkbd-&gt;ps2dev.serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = atkbd-&gt;name;</div><div class='ctx'> 	input_dev-&gt;phys = atkbd-&gt;phys;</div><div class='head'>diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c<br/>index 1f0e720267d7..1e03153b9bca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/corgikbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/corgikbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/corgikbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/corgikbd.c</a></div><div class='hunk'>@@ -352,7 +352,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; CORGI_KEY_SENSE_NUM; i++) {</div><div class='ctx'> 		pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN);</div><div class='ctx'> 		if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt,</div><div class='del'>-				SA_INTERRUPT | SA_TRIGGER_RISING,</div><div class='add'>+				IRQF_DISABLED | IRQF_TRIGGER_RISING,</div><div class='ctx'> 				"corgikbd", corgikbd))</div><div class='ctx'> 			printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c<br/>index 33edd030aa75..d22c7c624296 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/hilkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/hilkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/hilkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/hilkbd.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c<br/>index 77c4d9669ad0..5174224cadb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/lkkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/lkkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/lkkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/lkkbd.c</a></div><div class='hunk'>@@ -384,18 +384,21 @@ lkkbd_detection_done (struct lkkbd *lk)</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (lk-&gt;id[4]) {</div><div class='ctx'> 		case 1:</div><div class='del'>-			sprintf (lk-&gt;name, "DEC LK201 keyboard");</div><div class='add'>+			strlcpy (lk-&gt;name, "DEC LK201 keyboard",</div><div class='add'>+				 sizeof (lk-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 			if (lk201_compose_is_alt)</div><div class='ctx'> 				lk-&gt;keycode[0xb1] = KEY_LEFTALT;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 2:</div><div class='del'>-			sprintf (lk-&gt;name, "DEC LK401 keyboard");</div><div class='add'>+			strlcpy (lk-&gt;name, "DEC LK401 keyboard",</div><div class='add'>+				 sizeof (lk-&gt;name));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			sprintf (lk-&gt;name, "Unknown DEC keyboard");</div><div class='add'>+			strlcpy (lk-&gt;name, "Unknown DEC keyboard",</div><div class='add'>+				 sizeof (lk-&gt;name));</div><div class='ctx'> 			printk (KERN_ERR "lkkbd: keyboard on %s is unknown, "</div><div class='ctx'> 					"please report to Jan-Benedict Glaw "</div><div class='ctx'> 					"&lt;jbglaw@lug-owl.de&gt;\n", lk-&gt;phys);</div><div class='head'>diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c<br/>index 2c510881874a..83906f80ba21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/locomokbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/locomokbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/locomokbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/locomokbd.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c<br/>index d10983c521e6..40a3f551247e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/newtonkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/newtonkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/newtonkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/newtonkbd.c</a></div><div class='hunk'>@@ -96,7 +96,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	nkbd-&gt;serio = serio;</div><div class='ctx'> 	nkbd-&gt;dev = input_dev;</div><div class='del'>-	sprintf(nkbd-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(nkbd-&gt;phys, sizeof(nkbd-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> 	memcpy(nkbd-&gt;keycode, nkbd_keycode, sizeof(nkbd-&gt;keycode));</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "Newton Keyboard";</div><div class='head'>diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c<br/>index c5d03fb77bcb..e385710233f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/spitzkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/spitzkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/spitzkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/spitzkbd.c</a></div><div class='hunk'>@@ -410,7 +410,7 @@ static int __init spitzkbd_probe(struct platform_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; SPITZ_KEY_SENSE_NUM; i++) {</div><div class='ctx'> 		pxa_gpio_mode(spitz_senses[i] | GPIO_IN);</div><div class='ctx'> 		if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt,</div><div class='del'>-				SA_INTERRUPT|SA_TRIGGER_RISING,</div><div class='add'>+				IRQF_DISABLED|IRQF_TRIGGER_RISING,</div><div class='ctx'> 				"Spitzkbd Sense", spitzkbd))</div><div class='ctx'> 			printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -425,19 +425,19 @@ static int __init spitzkbd_probe(struct platform_device *dev)</div><div class='ctx'> 	pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN);</div><div class='ctx'> </div><div class='ctx'> 	request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt,</div><div class='del'>-		    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		    "Spitzkbd Sync", spitzkbd);</div><div class='ctx'> 	request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt,</div><div class='del'>-		    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		    "Spitzkbd PwrOn", spitzkbd);</div><div class='ctx'> 	request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr,</div><div class='del'>-		    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		    "Spitzkbd SWA", spitzkbd);</div><div class='ctx'> 	request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,</div><div class='del'>-		    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		    "Spitzkbd SWB", spitzkbd);</div><div class='ctx'>  	request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,</div><div class='del'>-		    SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,</div><div class='add'>+		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,</div><div class='ctx'> 		    "Spitzkbd HP", spitzkbd);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "input: Spitz Keyboard Registered\n");</div><div class='head'>diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c<br/>index b15b6d8d4f83..9dbd7b85686d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/sunkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/sunkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/sunkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/sunkbd.c</a></div><div class='hunk'>@@ -263,7 +263,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sprintf(sunkbd-&gt;name, "Sun Type %d keyboard", sunkbd-&gt;type);</div><div class='add'>+	snprintf(sunkbd-&gt;name, sizeof(sunkbd-&gt;name), "Sun Type %d keyboard", sunkbd-&gt;type);</div><div class='ctx'> 	memcpy(sunkbd-&gt;keycode, sunkbd_keycode, sizeof(sunkbd-&gt;keycode));</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = sunkbd-&gt;name;</div><div class='head'>diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c<br/>index 4135e3e16c51..0821d53cf0c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/keyboard/xtkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/keyboard/xtkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/keyboard/xtkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/keyboard/xtkbd.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	xtkbd-&gt;serio = serio;</div><div class='ctx'> 	xtkbd-&gt;dev = input_dev;</div><div class='del'>-	sprintf(xtkbd-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(xtkbd-&gt;phys, sizeof(xtkbd-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> 	memcpy(xtkbd-&gt;keycode, xtkbd_keycode, sizeof(xtkbd-&gt;keycode));</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "XT Keyboard";</div><div class='head'>diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig<br/>index 4bad588d0e5d..a6dfc7455733 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/misc/Kconfig</a></div><div class='hunk'>@@ -26,7 +26,7 @@ config INPUT_PCSPKR</div><div class='ctx'> </div><div class='ctx'> config INPUT_SPARCSPKR</div><div class='ctx'> 	tristate "SPARC Speaker support"</div><div class='del'>-	depends on PCI &amp;&amp; SPARC</div><div class='add'>+	depends on PCI &amp;&amp; SPARC64</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want the standard Speaker on Sparc PCI systems</div><div class='ctx'> 	  to be used for bells and whistles.</div><div class='head'>diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c<br/>index 3a6ae85cd69c..805b636e73d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/ixp4xx-beeper.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/ixp4xx-beeper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/ixp4xx-beeper.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/misc/ixp4xx-beeper.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)</div><div class='ctx'> 	input_dev-&gt;event = ixp4xx_spkr_event;</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(IRQ_IXP4XX_TIMER2, &amp;ixp4xx_spkr_interrupt,</div><div class='del'>-			  SA_INTERRUPT | SA_TIMER, "ixp4xx-beeper", (void *) dev-&gt;id);</div><div class='add'>+			  IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev-&gt;id);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_free_device;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c<br/>index f0fd2c4740f1..106c94f33b93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/sparcspkr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/sparcspkr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/sparcspkr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/misc/sparcspkr.c</a></div><div class='hunk'>@@ -2,9 +2,8 @@</div><div class='ctx'>  *  Driver for PC-speaker like devices found on various Sparc systems.</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2002 Vojtech Pavlik</div><div class='del'>- *  Copyright (c) 2002 David S. Miller (davem@redhat.com)</div><div class='add'>+ *  Copyright (c) 2002, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -13,21 +12,23 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='ctx'> #include &lt;asm/isa.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Sparc Speaker beeper driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-const char *beep_name;</div><div class='del'>-static unsigned long beep_iobase;</div><div class='del'>-static int (*beep_event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);</div><div class='del'>-static DEFINE_SPINLOCK(beep_lock);</div><div class='add'>+struct sparcspkr_state {</div><div class='add'>+	const char		*name;</div><div class='add'>+	unsigned long		iobase;</div><div class='add'>+	int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	struct input_dev	*input_dev;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)</div><div class='ctx'> {</div><div class='add'>+	struct sparcspkr_state *state = dev_get_drvdata(dev-&gt;cdev.dev);</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -43,24 +44,24 @@ static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned in</div><div class='ctx'> 	if (value &gt; 20 &amp;&amp; value &lt; 32767)</div><div class='ctx'> 		count = 1193182 / value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;beep_lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;state-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* EBUS speaker only has on/off state, the frequency does not</div><div class='ctx'> 	 * appear to be programmable.</div><div class='ctx'> 	 */</div><div class='del'>-	if (beep_iobase &amp; 0x2UL)</div><div class='del'>-		outb(!!count, beep_iobase);</div><div class='add'>+	if (state-&gt;iobase &amp; 0x2UL)</div><div class='add'>+		outb(!!count, state-&gt;iobase);</div><div class='ctx'> 	else</div><div class='del'>-		outl(!!count, beep_iobase);</div><div class='add'>+		outl(!!count, state-&gt;iobase);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;beep_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;state-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='ctx'> static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)</div><div class='ctx'> {</div><div class='add'>+	struct sparcspkr_state *state = dev_get_drvdata(dev-&gt;cdev.dev);</div><div class='ctx'> 	unsigned int count = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -76,29 +77,29 @@ static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int</div><div class='ctx'> 	if (value &gt; 20 &amp;&amp; value &lt; 32767)</div><div class='ctx'> 		count = 1193182 / value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;beep_lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;state-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (count) {</div><div class='ctx'> 		/* enable counter 2 */</div><div class='del'>-		outb(inb(beep_iobase + 0x61) | 3, beep_iobase + 0x61);</div><div class='add'>+		outb(inb(state-&gt;iobase + 0x61) | 3, state-&gt;iobase + 0x61);</div><div class='ctx'> 		/* set command for counter 2, 2 byte write */</div><div class='del'>-		outb(0xB6, beep_iobase + 0x43);</div><div class='add'>+		outb(0xB6, state-&gt;iobase + 0x43);</div><div class='ctx'> 		/* select desired HZ */</div><div class='del'>-		outb(count &amp; 0xff, beep_iobase + 0x42);</div><div class='del'>-		outb((count &gt;&gt; 8) &amp; 0xff, beep_iobase + 0x42);</div><div class='add'>+		outb(count &amp; 0xff, state-&gt;iobase + 0x42);</div><div class='add'>+		outb((count &gt;&gt; 8) &amp; 0xff, state-&gt;iobase + 0x42);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* disable counter 2 */</div><div class='del'>-		outb(inb_p(beep_iobase + 0x61) &amp; 0xFC, beep_iobase + 0x61);</div><div class='add'>+		outb(inb_p(state-&gt;iobase + 0x61) &amp; 0xFC, state-&gt;iobase + 0x61);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;beep_lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;state-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int __devinit sparcspkr_probe(struct platform_device *dev)</div><div class='add'>+static int __devinit sparcspkr_probe(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct sparcspkr_state *state = dev_get_drvdata(dev);</div><div class='ctx'> 	struct input_dev *input_dev;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -106,18 +107,18 @@ static int __devinit sparcspkr_probe(struct platform_device *dev)</div><div class='ctx'> 	if (!input_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	input_dev-&gt;name = beep_name;</div><div class='add'>+	input_dev-&gt;name = state-&gt;name;</div><div class='ctx'> 	input_dev-&gt;phys = "sparc/input0";</div><div class='ctx'> 	input_dev-&gt;id.bustype = BUS_ISA;</div><div class='ctx'> 	input_dev-&gt;id.vendor = 0x001f;</div><div class='ctx'> 	input_dev-&gt;id.product = 0x0001;</div><div class='ctx'> 	input_dev-&gt;id.version = 0x0100;</div><div class='del'>-	input_dev-&gt;cdev.dev = &amp;dev-&gt;dev;</div><div class='add'>+	input_dev-&gt;cdev.dev = dev;</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;evbit[0] = BIT(EV_SND);</div><div class='ctx'> 	input_dev-&gt;sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);</div><div class='ctx'> </div><div class='del'>-	input_dev-&gt;event = beep_event;</div><div class='add'>+	input_dev-&gt;event = state-&gt;event;</div><div class='ctx'> </div><div class='ctx'> 	error = input_register_device(input_dev);</div><div class='ctx'> 	if (error) {</div><div class='hunk'>@@ -125,111 +126,137 @@ static int __devinit sparcspkr_probe(struct platform_device *dev)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(dev, input_dev);</div><div class='add'>+	state-&gt;input_dev = input_dev;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit sparcspkr_remove(struct platform_device *dev)</div><div class='add'>+static int __devexit sparcspkr_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct input_dev *input_dev = platform_get_drvdata(dev);</div><div class='add'>+	struct sparcspkr_state *state = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct input_dev *input_dev = state-&gt;input_dev;</div><div class='ctx'> </div><div class='del'>-	input_unregister_device(input_dev);</div><div class='del'>-	platform_set_drvdata(dev, NULL);</div><div class='ctx'> 	/* turn off the speaker */</div><div class='del'>-	beep_event(NULL, EV_SND, SND_BELL, 0);</div><div class='add'>+	state-&gt;event(input_dev, EV_SND, SND_BELL, 0);</div><div class='add'>+</div><div class='add'>+	input_unregister_device(input_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+	kfree(state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sparcspkr_shutdown(struct platform_device *dev)</div><div class='add'>+static int sparcspkr_shutdown(struct of_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct sparcspkr_state *state = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct input_dev *input_dev = state-&gt;input_dev;</div><div class='add'>+</div><div class='ctx'> 	/* turn off the speaker */</div><div class='del'>-	beep_event(NULL, EV_SND, SND_BELL, 0);</div><div class='add'>+	state-&gt;event(input_dev, EV_SND, SND_BELL, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit ebus_beep_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct linux_ebus_device *edev = to_ebus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct sparcspkr_state *state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='add'>+	if (!state)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	state-&gt;name = "Sparc EBUS Speaker";</div><div class='add'>+	state-&gt;iobase = edev-&gt;resource[0].start;</div><div class='add'>+	state-&gt;event = ebus_spkr_event;</div><div class='add'>+	spin_lock_init(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, state);</div><div class='add'>+</div><div class='add'>+	err = sparcspkr_probe(&amp;dev-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+		kfree(state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct platform_driver sparcspkr_platform_driver = {</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "sparcspkr",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='add'>+static struct of_device_id ebus_beep_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "beep",</div><div class='ctx'> 	},</div><div class='del'>-	.probe		= sparcspkr_probe,</div><div class='del'>-	.remove		= __devexit_p(sparcspkr_remove),</div><div class='del'>-	.shutdown	= sparcspkr_shutdown,</div><div class='add'>+	{},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device *sparcspkr_platform_device;</div><div class='add'>+static struct of_platform_driver ebus_beep_driver = {</div><div class='add'>+	.name		= "beep",</div><div class='add'>+	.match_table	= ebus_beep_match,</div><div class='add'>+	.probe		= ebus_beep_probe,</div><div class='add'>+	.remove		= sparcspkr_remove,</div><div class='add'>+	.shutdown	= sparcspkr_shutdown,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __init sparcspkr_drv_init(void)</div><div class='add'>+static int __devinit isa_beep_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	struct sparc_isa_device *idev = to_isa_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct sparcspkr_state *state;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	error = platform_driver_register(&amp;sparcspkr_platform_driver);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='add'>+	state = kzalloc(sizeof(*state), GFP_KERNEL);</div><div class='add'>+	if (!state)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	sparcspkr_platform_device = platform_device_alloc("sparcspkr", -1);</div><div class='del'>-	if (!sparcspkr_platform_device) {</div><div class='del'>-		error = -ENOMEM;</div><div class='del'>-		goto err_unregister_driver;</div><div class='del'>-	}</div><div class='add'>+	state-&gt;name = "Sparc ISA Speaker";</div><div class='add'>+	state-&gt;iobase = idev-&gt;resource.start;</div><div class='add'>+	state-&gt;event = isa_spkr_event;</div><div class='add'>+	spin_lock_init(&amp;state-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, state);</div><div class='ctx'> </div><div class='del'>-	error = platform_device_add(sparcspkr_platform_device);</div><div class='del'>-	if (error)</div><div class='del'>-		goto err_free_device;</div><div class='add'>+	err = sparcspkr_probe(&amp;dev-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+		kfree(state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>- err_free_device:</div><div class='del'>-	platform_device_put(sparcspkr_platform_device);</div><div class='del'>- err_unregister_driver:</div><div class='del'>-	platform_driver_unregister(&amp;sparcspkr_platform_driver);</div><div class='add'>+static struct of_device_id isa_beep_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "dma",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='add'>+static struct of_platform_driver isa_beep_driver = {</div><div class='add'>+	.name		= "beep",</div><div class='add'>+	.match_table	= isa_beep_match,</div><div class='add'>+	.probe		= isa_beep_probe,</div><div class='add'>+	.remove		= sparcspkr_remove,</div><div class='add'>+	.shutdown	= sparcspkr_shutdown,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int __init sparcspkr_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct linux_ebus_device *edev;</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	struct sparc_isa_bridge *isa_br;</div><div class='del'>-	struct sparc_isa_device *isa_dev;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "beep")) {</div><div class='del'>-				beep_name = "Sparc EBUS Speaker";</div><div class='del'>-				beep_event = ebus_spkr_event;</div><div class='del'>-				beep_iobase = edev-&gt;resource[0].start;</div><div class='del'>-				return sparcspkr_drv_init();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	for_each_isa(isa_br) {</div><div class='del'>-		for_each_isadev(isa_dev, isa_br) {</div><div class='del'>-			/* A hack, the beep device's base lives in</div><div class='del'>-			 * the DMA isa node.</div><div class='del'>-			 */</div><div class='del'>-			if (!strcmp(isa_dev-&gt;prom_name, "dma")) {</div><div class='del'>-				beep_name = "Sparc ISA Speaker";</div><div class='del'>-				beep_event = isa_spkr_event,</div><div class='del'>-				beep_iobase = isa_dev-&gt;resource.start;</div><div class='del'>-				return sparcspkr_drv_init();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	int err = of_register_driver(&amp;ebus_beep_driver, &amp;ebus_bus_type);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = of_register_driver(&amp;isa_beep_driver, &amp;isa_bus_type);</div><div class='add'>+		if (err)</div><div class='add'>+			of_unregister_driver(&amp;ebus_beep_driver);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	return -ENODEV;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sparcspkr_exit(void)</div><div class='ctx'> {</div><div class='del'>-	platform_device_unregister(sparcspkr_platform_device);</div><div class='del'>-	platform_driver_unregister(&amp;sparcspkr_platform_driver);</div><div class='add'>+	of_unregister_driver(&amp;ebus_beep_driver);</div><div class='add'>+	of_unregister_driver(&amp;isa_beep_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sparcspkr_init);</div><div class='head'>diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c<br/>index e4e5be111c96..ccf0faeee5c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/misc/wistron_btns.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/misc/wistron_btns.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/misc/wistron_btns.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/misc/wistron_btns.c</a></div><div class='hunk'>@@ -285,6 +285,15 @@ static struct key_entry keymap_fujitsu_n3510[] = {</div><div class='ctx'> 	{ KE_END, 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct key_entry keymap_wistron_ms2111[] = {</div><div class='add'>+	{ KE_KEY,  0x11, KEY_PROG1 },</div><div class='add'>+	{ KE_KEY,  0x12, KEY_PROG2 },</div><div class='add'>+	{ KE_KEY,  0x13, KEY_PROG3 },</div><div class='add'>+	{ KE_KEY,  0x31, KEY_MAIL },</div><div class='add'>+	{ KE_KEY,  0x36, KEY_WWW },</div><div class='add'>+	{ KE_END,  0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct key_entry keymap_wistron_ms2141[] = {</div><div class='ctx'> 	{ KE_KEY,  0x11, KEY_PROG1 },</div><div class='ctx'> 	{ KE_KEY,  0x12, KEY_PROG2 },</div><div class='hunk'>@@ -326,6 +335,7 @@ static struct key_entry keymap_aopen_1559as[] = {</div><div class='ctx'> 	{ KE_WIFI, 0x30, 0 },</div><div class='ctx'> 	{ KE_KEY,  0x31, KEY_MAIL },</div><div class='ctx'> 	{ KE_KEY,  0x36, KEY_WWW },</div><div class='add'>+	{ KE_END,  0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -388,6 +398,15 @@ static struct dmi_system_id dmi_ids[] = {</div><div class='ctx'> 		},</div><div class='ctx'> 		.driver_data = keymap_aopen_1559as</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.callback = dmi_matched,</div><div class='add'>+		.ident = "Medion MD 9783",</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "MD 9783"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = keymap_wistron_ms2111</div><div class='add'>+	},</div><div class='ctx'> 	{ NULL, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c<br/>index a0e2e797c6d5..070d75330afd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/alps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/alps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/alps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mouse/alps.c</a></div><div class='hunk'>@@ -470,7 +470,7 @@ int alps_init(struct psmouse *psmouse)</div><div class='ctx'> 		dev1-&gt;keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sprintf(priv-&gt;phys, "%s/input1", psmouse-&gt;ps2dev.serio-&gt;phys);</div><div class='add'>+	snprintf(priv-&gt;phys, sizeof(priv-&gt;phys), "%s/input1", psmouse-&gt;ps2dev.serio-&gt;phys);</div><div class='ctx'> 	dev2-&gt;phys = priv-&gt;phys;</div><div class='ctx'> 	dev2-&gt;name = (priv-&gt;i-&gt;flags &amp; ALPS_DUALPOINT) ? "DualPoint Stick" : "PS/2 Mouse";</div><div class='ctx'> 	dev2-&gt;id.bustype = BUS_I8042;</div><div class='head'>diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c<br/>index afc66f56df43..50f1fed10be4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/inport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/inport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/inport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mouse/inport.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c<br/>index 136321a2cfdb..8bc9f51ae6c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/psmouse-base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/psmouse-base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/psmouse-base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mouse/psmouse-base.c</a></div><div class='hunk'>@@ -150,9 +150,20 @@ static psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse, struct pt_reg</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 	if (psmouse-&gt;type == PSMOUSE_IMEX) {</div><div class='del'>-		input_report_rel(dev, REL_WHEEL, (int) (packet[3] &amp; 8) - (int) (packet[3] &amp; 7));</div><div class='del'>-		input_report_key(dev, BTN_SIDE, (packet[3] &gt;&gt; 4) &amp; 1);</div><div class='del'>-		input_report_key(dev, BTN_EXTRA, (packet[3] &gt;&gt; 5) &amp; 1);</div><div class='add'>+		switch (packet[3] &amp; 0xC0) {</div><div class='add'>+			case 0x80: /* vertical scroll on IntelliMouse Explorer 4.0 */</div><div class='add'>+				input_report_rel(dev, REL_WHEEL, (int) (packet[3] &amp; 32) - (int) (packet[3] &amp; 31));</div><div class='add'>+				break;</div><div class='add'>+			case 0x40: /* horizontal scroll on IntelliMouse Explorer 4.0 */</div><div class='add'>+				input_report_rel(dev, REL_HWHEEL, (int) (packet[3] &amp; 32) - (int) (packet[3] &amp; 31));</div><div class='add'>+				break;</div><div class='add'>+			case 0x00:</div><div class='add'>+			case 0xC0:</div><div class='add'>+				input_report_rel(dev, REL_WHEEL, (int) (packet[3] &amp; 8) - (int) (packet[3] &amp; 7));</div><div class='add'>+				input_report_key(dev, BTN_SIDE, (packet[3] &gt;&gt; 4) &amp; 1);</div><div class='add'>+				input_report_key(dev, BTN_EXTRA, (packet[3] &gt;&gt; 5) &amp; 1);</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -466,9 +477,25 @@ static int im_explorer_detect(struct psmouse *psmouse, int set_properties)</div><div class='ctx'> 	if (param[0] != 4)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+/* Magic to enable horizontal scrolling on IntelliMouse 4.0 */</div><div class='add'>+	param[0] = 200;</div><div class='add'>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);</div><div class='add'>+	param[0] =  80;</div><div class='add'>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);</div><div class='add'>+	param[0] =  40;</div><div class='add'>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);</div><div class='add'>+</div><div class='add'>+	param[0] = 200;</div><div class='add'>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);</div><div class='add'>+	param[0] = 200;</div><div class='add'>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);</div><div class='add'>+	param[0] =  60;</div><div class='add'>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);</div><div class='add'>+</div><div class='ctx'> 	if (set_properties) {</div><div class='ctx'> 		set_bit(BTN_MIDDLE, psmouse-&gt;dev-&gt;keybit);</div><div class='ctx'> 		set_bit(REL_WHEEL, psmouse-&gt;dev-&gt;relbit);</div><div class='add'>+		set_bit(REL_HWHEEL, psmouse-&gt;dev-&gt;relbit);</div><div class='ctx'> 		set_bit(BTN_SIDE, psmouse-&gt;dev-&gt;keybit);</div><div class='ctx'> 		set_bit(BTN_EXTRA, psmouse-&gt;dev-&gt;keybit);</div><div class='ctx'> </div><div class='hunk'>@@ -1057,8 +1084,8 @@ static int psmouse_switch_protocol(struct psmouse *psmouse, struct psmouse_proto</div><div class='ctx'> 	if (psmouse-&gt;resync_time &amp;&amp; psmouse-&gt;poll(psmouse))</div><div class='ctx'> 		psmouse-&gt;resync_time = 0;</div><div class='ctx'> </div><div class='del'>-	sprintf(psmouse-&gt;devname, "%s %s %s",</div><div class='del'>-		psmouse_protocol_by_type(psmouse-&gt;type)-&gt;name, psmouse-&gt;vendor, psmouse-&gt;name);</div><div class='add'>+	snprintf(psmouse-&gt;devname, sizeof(psmouse-&gt;devname), "%s %s %s",</div><div class='add'>+		 psmouse_protocol_by_type(psmouse-&gt;type)-&gt;name, psmouse-&gt;vendor, psmouse-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = psmouse-&gt;devname;</div><div class='ctx'> 	input_dev-&gt;phys = psmouse-&gt;phys;</div><div class='hunk'>@@ -1099,7 +1126,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 	ps2_init(&amp;psmouse-&gt;ps2dev, serio);</div><div class='ctx'> 	INIT_WORK(&amp;psmouse-&gt;resync_work, psmouse_resync, psmouse);</div><div class='ctx'> 	psmouse-&gt;dev = input_dev;</div><div class='del'>-	sprintf(psmouse-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(psmouse-&gt;phys, sizeof(psmouse-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c<br/>index 09b6ffdb7582..872b30bf7aad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/rpcmouse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/rpcmouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/rpcmouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mouse/rpcmouse.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static int __init rpcmouse_init(void)</div><div class='ctx'> 	rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX);</div><div class='ctx'> 	rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, SA_SHIRQ, "rpcmouse", rpcmouse_dev)) {</div><div class='add'>+	if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, IRQF_SHARED, "rpcmouse", rpcmouse_dev)) {</div><div class='ctx'> 		printk(KERN_ERR "rpcmouse: unable to allocate VSYNC interrupt\n");</div><div class='ctx'> 		input_free_device(rpcmouse_dev);</div><div class='ctx'> 		return -EBUSY;</div><div class='head'>diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c<br/>index 2f9a04ae725f..0023501a5b63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/sermouse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/sermouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/sermouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mouse/sermouse.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -254,7 +253,7 @@ static int sermouse_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	sermouse-&gt;dev = input_dev;</div><div class='del'>-	sprintf(sermouse-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(sermouse-&gt;phys, sizeof(sermouse-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> 	sermouse-&gt;type = serio-&gt;id.proto;</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = sermouse_protocols[sermouse-&gt;type];</div><div class='head'>diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c<br/>index 36e9442a16b2..47edcfd022ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mouse/vsxxxaa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mouse/vsxxxaa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mouse/vsxxxaa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mouse/vsxxxaa.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -153,22 +152,25 @@ vsxxxaa_detection_done (struct vsxxxaa *mouse)</div><div class='ctx'> {</div><div class='ctx'> 	switch (mouse-&gt;type) {</div><div class='ctx'> 		case 0x02:</div><div class='del'>-			sprintf (mouse-&gt;name, "DEC VSXXX-AA/-GA mouse");</div><div class='add'>+			strlcpy (mouse-&gt;name, "DEC VSXXX-AA/-GA mouse",</div><div class='add'>+				 sizeof (mouse-&gt;name));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 0x04:</div><div class='del'>-			sprintf (mouse-&gt;name, "DEC VSXXX-AB digitizer");</div><div class='add'>+			strlcpy (mouse-&gt;name, "DEC VSXXX-AB digitizer",</div><div class='add'>+				 sizeof (mouse-&gt;name));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			sprintf (mouse-&gt;name, "unknown DEC pointer device "</div><div class='del'>-					"(type = 0x%02x)", mouse-&gt;type);</div><div class='add'>+			snprintf (mouse-&gt;name, sizeof (mouse-&gt;name),</div><div class='add'>+				  "unknown DEC pointer device (type = 0x%02x)",</div><div class='add'>+				  mouse-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk (KERN_INFO "Found %s version 0x%02x from country 0x%02x "</div><div class='del'>-			"on port %s\n", mouse-&gt;name, mouse-&gt;version,</div><div class='del'>-			mouse-&gt;country, mouse-&gt;phys);</div><div class='add'>+	printk (KERN_INFO</div><div class='add'>+		"Found %s version 0x%02x from country 0x%02x on port %s\n",</div><div class='add'>+		mouse-&gt;name, mouse-&gt;version, mouse-&gt;country, mouse-&gt;phys);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -503,8 +505,9 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	mouse-&gt;dev = input_dev;</div><div class='ctx'> 	mouse-&gt;serio = serio;</div><div class='del'>-	sprintf (mouse-&gt;name, "DEC VSXXX-AA/-GA mouse or VSXXX-AB digitizer");</div><div class='del'>-	sprintf (mouse-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	strlcat (mouse-&gt;name, "DEC VSXXX-AA/-GA mouse or VSXXX-AB digitizer",</div><div class='add'>+		 sizeof (mouse-&gt;name));</div><div class='add'>+	snprintf (mouse-&gt;phys, sizeof (mouse-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = mouse-&gt;name;</div><div class='ctx'> 	input_dev-&gt;phys = mouse-&gt;phys;</div><div class='head'>diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c<br/>index b685a507955d..1f851acab30d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/mousedev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/mousedev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/mousedev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/mousedev.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -123,7 +122,9 @@ static void mousedev_touchpad_event(struct input_dev *dev, struct mousedev *mous</div><div class='ctx'> </div><div class='ctx'> 	if (mousedev-&gt;touch) {</div><div class='ctx'> 		size = dev-&gt;absmax[ABS_X] - dev-&gt;absmin[ABS_X];</div><div class='del'>-		if (size == 0) size = 256 * 2;</div><div class='add'>+		if (size == 0)</div><div class='add'>+			size = 256 * 2;</div><div class='add'>+</div><div class='ctx'> 		switch (code) {</div><div class='ctx'> 			case ABS_X:</div><div class='ctx'> 				fx(0) = value;</div><div class='hunk'>@@ -155,18 +156,24 @@ static void mousedev_abs_event(struct input_dev *dev, struct mousedev *mousedev,</div><div class='ctx'> 	switch (code) {</div><div class='ctx'> 		case ABS_X:</div><div class='ctx'> 			size = dev-&gt;absmax[ABS_X] - dev-&gt;absmin[ABS_X];</div><div class='del'>-			if (size == 0) size = xres ? : 1;</div><div class='del'>-			if (value &gt; dev-&gt;absmax[ABS_X]) value = dev-&gt;absmax[ABS_X];</div><div class='del'>-			if (value &lt; dev-&gt;absmin[ABS_X]) value = dev-&gt;absmin[ABS_X];</div><div class='add'>+			if (size == 0)</div><div class='add'>+				size = xres ? : 1;</div><div class='add'>+			if (value &gt; dev-&gt;absmax[ABS_X])</div><div class='add'>+				value = dev-&gt;absmax[ABS_X];</div><div class='add'>+			if (value &lt; dev-&gt;absmin[ABS_X])</div><div class='add'>+				value = dev-&gt;absmin[ABS_X];</div><div class='ctx'> 			mousedev-&gt;packet.x = ((value - dev-&gt;absmin[ABS_X]) * xres) / size;</div><div class='ctx'> 			mousedev-&gt;packet.abs_event = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ABS_Y:</div><div class='ctx'> 			size = dev-&gt;absmax[ABS_Y] - dev-&gt;absmin[ABS_Y];</div><div class='del'>-			if (size == 0) size = yres ? : 1;</div><div class='del'>-			if (value &gt; dev-&gt;absmax[ABS_Y]) value = dev-&gt;absmax[ABS_Y];</div><div class='del'>-			if (value &lt; dev-&gt;absmin[ABS_Y]) value = dev-&gt;absmin[ABS_Y];</div><div class='add'>+			if (size == 0)</div><div class='add'>+				size = yres ? : 1;</div><div class='add'>+			if (value &gt; dev-&gt;absmax[ABS_Y])</div><div class='add'>+				value = dev-&gt;absmax[ABS_Y];</div><div class='add'>+			if (value &lt; dev-&gt;absmin[ABS_Y])</div><div class='add'>+				value = dev-&gt;absmin[ABS_Y];</div><div class='ctx'> 			mousedev-&gt;packet.y = yres - ((value - dev-&gt;absmin[ABS_Y]) * yres) / size;</div><div class='ctx'> 			mousedev-&gt;packet.abs_event = 1;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -202,7 +209,7 @@ static void mousedev_key_event(struct mousedev *mousedev, unsigned int code, int</div><div class='ctx'> 		case BTN_SIDE:		index = 3; break;</div><div class='ctx'> 		case BTN_4:</div><div class='ctx'> 		case BTN_EXTRA:		index = 4; break;</div><div class='del'>-		default: 		return;</div><div class='add'>+		default:		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (value) {</div><div class='hunk'>@@ -285,10 +292,9 @@ static void mousedev_touchpad_touch(struct mousedev *mousedev, int value)</div><div class='ctx'> 		mousedev-&gt;touch = mousedev-&gt;pkt_count = 0;</div><div class='ctx'> 		mousedev-&gt;frac_dx = 0;</div><div class='ctx'> 		mousedev-&gt;frac_dy = 0;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		if (!mousedev-&gt;touch)</div><div class='del'>-			mousedev-&gt;touch = jiffies;</div><div class='add'>+</div><div class='add'>+	} else if (!mousedev-&gt;touch)</div><div class='add'>+		mousedev-&gt;touch = jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mousedev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)</div><div class='hunk'>@@ -327,7 +333,7 @@ static void mousedev_event(struct input_handle *handle, unsigned int type, unsig</div><div class='ctx'> 					mousedev-&gt;pkt_count++;</div><div class='ctx'> 					/* Input system eats duplicate events, but we need all of them</div><div class='ctx'> 					 * to do correct averaging so apply present one forward</div><div class='del'>-			 		 */</div><div class='add'>+					 */</div><div class='ctx'> 					fx(0) = fx(1);</div><div class='ctx'> 					fy(0) = fy(1);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -346,7 +352,9 @@ static int mousedev_fasync(int fd, struct file *file, int on)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	struct mousedev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	retval = fasync_helper(fd, file, on, &amp;list-&gt;fasync);</div><div class='add'>+</div><div class='ctx'> 	return retval &lt; 0 ? retval : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -507,14 +515,16 @@ static ssize_t mousedev_write(struct file * file, const char __user * buffer, si</div><div class='ctx'> 				list-&gt;imexseq = 0;</div><div class='ctx'> 				list-&gt;mode = MOUSEDEV_EMUL_EXPS;</div><div class='ctx'> 			}</div><div class='del'>-		} else list-&gt;imexseq = 0;</div><div class='add'>+		} else</div><div class='add'>+			list-&gt;imexseq = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (c == mousedev_imps_seq[list-&gt;impsseq]) {</div><div class='ctx'> 			if (++list-&gt;impsseq == MOUSEDEV_SEQ_LEN) {</div><div class='ctx'> 				list-&gt;impsseq = 0;</div><div class='ctx'> 				list-&gt;mode = MOUSEDEV_EMUL_IMPS;</div><div class='ctx'> 			}</div><div class='del'>-		} else list-&gt;impsseq = 0;</div><div class='add'>+		} else</div><div class='add'>+			list-&gt;impsseq = 0;</div><div class='ctx'> </div><div class='ctx'> 		list-&gt;ps2[0] = 0xfa;</div><div class='ctx'> </div><div class='hunk'>@@ -598,6 +608,7 @@ static ssize_t mousedev_read(struct file * file, char __user * buffer, size_t co</div><div class='ctx'> static unsigned int mousedev_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct mousedev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	poll_wait(file, &amp;list-&gt;mousedev-&gt;wait, wait);</div><div class='ctx'> 	return ((list-&gt;ready || list-&gt;buffer) ? (POLLIN | POLLRDNORM) : 0) |</div><div class='ctx'> 		(list-&gt;mousedev-&gt;exist ? 0 : (POLLHUP | POLLERR));</div><div class='head'>diff --git a/drivers/input/power.c b/drivers/input/power.c<br/>index 526e6070600c..51a519e24b6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/power.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c<br/>index 096b6a0b5cca..bc6e87add093 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/ct82c710.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/ct82c710.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/ct82c710.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/ct82c710.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='hunk'>@@ -189,7 +188,7 @@ static int __devinit ct82c710_probe(struct platform_device *dev)</div><div class='ctx'> 	strlcpy(ct82c710_port-&gt;name, "C&amp;T 82c710 mouse port",</div><div class='ctx'> 		sizeof(ct82c710_port-&gt;name));</div><div class='ctx'> 	snprintf(ct82c710_port-&gt;phys, sizeof(ct82c710_port-&gt;phys),</div><div class='del'>-		 "isa%04lx/serio0", CT82C710_DATA);</div><div class='add'>+		 "isa%16llx/serio0", (unsigned long long)CT82C710_DATA);</div><div class='ctx'> </div><div class='ctx'> 	serio_register_port(ct82c710_port);</div><div class='ctx'> </div><div class='hunk'>@@ -241,8 +240,8 @@ static int __init ct82c710_init(void)</div><div class='ctx'> </div><div class='ctx'> 	serio_register_port(ct82c710_port);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "serio: C&amp;T 82c710 mouse port at %#lx irq %d\n",</div><div class='del'>-		CT82C710_DATA, CT82C710_IRQ);</div><div class='add'>+	printk(KERN_INFO "serio: C&amp;T 82c710 mouse port at %#llx irq %d\n",</div><div class='add'>+		(unsigned long long)CT82C710_DATA, CT82C710_IRQ);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c<br/>index c0b1e4becad3..cde036a92168 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/gscps2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/gscps2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/gscps2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/gscps2.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *                 was usable/enabled ?)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='hunk'>@@ -371,7 +370,7 @@ static int __init gscps2_probe(struct parisc_device *dev)</div><div class='ctx'> 	serio-&gt;dev.parent	= &amp;dev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EBUSY;</div><div class='del'>-	if (request_irq(dev-&gt;irq, gscps2_interrupt, SA_SHIRQ, ps2port-&gt;port-&gt;name, ps2port))</div><div class='add'>+	if (request_irq(dev-&gt;irq, gscps2_interrupt, IRQF_SHARED, ps2port-&gt;port-&gt;name, ps2port))</div><div class='ctx'> 		goto fail_miserably;</div><div class='ctx'> </div><div class='ctx'> 	if (ps2port-&gt;id != GSC_ID_KEYBOARD &amp;&amp; ps2port-&gt;id != GSC_ID_MOUSE) {</div><div class='head'>diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h<br/>index ed9446f6d7e3..54adba2d8ed5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042-sparcio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/i8042-sparcio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042-sparcio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/i8042-sparcio.h</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='ctx'> #ifndef _I8042_SPARCIO_H</div><div class='ctx'> #define _I8042_SPARCIO_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#endif</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int i8042_kbd_irq = -1;</div><div class='ctx'> static int i8042_aux_irq = -1;</div><div class='hunk'>@@ -48,54 +45,83 @@ static inline void i8042_write_command(int val)</div><div class='ctx'> #define OBP_PS2MS_NAME1		"kdmouse"</div><div class='ctx'> #define OBP_PS2MS_NAME2		"mouse"</div><div class='ctx'> </div><div class='add'>+static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+</div><div class='add'>+	dp = dp-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		if (!strcmp(dp-&gt;name, OBP_PS2KBD_NAME1) ||</div><div class='add'>+		    !strcmp(dp-&gt;name, OBP_PS2KBD_NAME2)) {</div><div class='add'>+			struct of_device *kbd = of_find_device_by_node(dp);</div><div class='add'>+			unsigned int irq = kbd-&gt;irqs[0];</div><div class='add'>+			if (irq == 0xffffffff)</div><div class='add'>+				irq = op-&gt;irqs[0];</div><div class='add'>+			i8042_kbd_irq = irq;</div><div class='add'>+			kbd_iobase = of_ioremap(&amp;kbd-&gt;resource[0],</div><div class='add'>+						0, 8, "kbd");</div><div class='add'>+		} else if (!strcmp(dp-&gt;name, OBP_PS2MS_NAME1) ||</div><div class='add'>+			   !strcmp(dp-&gt;name, OBP_PS2MS_NAME2)) {</div><div class='add'>+			struct of_device *ms = of_find_device_by_node(dp);</div><div class='add'>+			unsigned int irq = ms-&gt;irqs[0];</div><div class='add'>+			if (irq == 0xffffffff)</div><div class='add'>+				irq = op-&gt;irqs[0];</div><div class='add'>+			i8042_aux_irq = irq;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit sparc_i8042_remove(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	of_iounmap(kbd_iobase, 8);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id sparc_i8042_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "8042",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, sparc_i8042_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver sparc_i8042_driver = {</div><div class='add'>+	.name		= "i8042",</div><div class='add'>+	.match_table	= sparc_i8042_match,</div><div class='add'>+	.probe		= sparc_i8042_probe,</div><div class='add'>+	.remove		= __devexit_p(sparc_i8042_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init i8042_platform_init(void)</div><div class='ctx'> {</div><div class='ctx'> #ifndef CONFIG_PCI</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> #else</div><div class='del'>-	char prop[128];</div><div class='del'>-	int len;</div><div class='add'>+	struct device_node *root = of_find_node_by_path("/");</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop));</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		printk("i8042: Cannot get name property of root OBP node.\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (strncmp(prop, "SUNW,JavaStation-1", len) == 0) {</div><div class='add'>+	if (!strcmp(root-&gt;name, "SUNW,JavaStation-1")) {</div><div class='ctx'> 		/* Hardcoded values for MrCoffee.  */</div><div class='ctx'> 		i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;</div><div class='ctx'> 		kbd_iobase = ioremap(0x71300060, 8);</div><div class='ctx'> 		if (!kbd_iobase)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 	} else {</div><div class='del'>-		struct linux_ebus *ebus;</div><div class='del'>-		struct linux_ebus_device *edev;</div><div class='del'>-		struct linux_ebus_child *child;</div><div class='del'>-</div><div class='del'>-		for_each_ebus(ebus) {</div><div class='del'>-			for_each_ebusdev(edev, ebus) {</div><div class='del'>-				if (!strcmp(edev-&gt;prom_name, "8042"))</div><div class='del'>-					goto edev_found;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	edev_found:</div><div class='del'>-		for_each_edevchild(edev, child) {</div><div class='del'>-			if (!strcmp(child-&gt;prom_name, OBP_PS2KBD_NAME1) ||</div><div class='del'>-			    !strcmp(child-&gt;prom_name, OBP_PS2KBD_NAME2)) {</div><div class='del'>-				i8042_kbd_irq = child-&gt;irqs[0];</div><div class='del'>-				kbd_iobase =</div><div class='del'>-					ioremap(child-&gt;resource[0].start, 8);</div><div class='del'>-			}</div><div class='del'>-			if (!strcmp(child-&gt;prom_name, OBP_PS2MS_NAME1) ||</div><div class='del'>-			    !strcmp(child-&gt;prom_name, OBP_PS2MS_NAME2))</div><div class='del'>-				i8042_aux_irq = child-&gt;irqs[0];</div><div class='del'>-		}</div><div class='add'>+		int err = of_register_driver(&amp;sparc_i8042_driver,</div><div class='add'>+					     &amp;of_bus_type);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		if (i8042_kbd_irq == -1 ||</div><div class='ctx'> 		    i8042_aux_irq == -1) {</div><div class='del'>-			printk("i8042: Error, 8042 device lacks both kbd and "</div><div class='del'>-			       "mouse nodes.\n");</div><div class='add'>+			if (kbd_iobase) {</div><div class='add'>+				of_iounmap(kbd_iobase, 8);</div><div class='add'>+				kbd_iobase = (void __iomem *) NULL;</div><div class='add'>+			}</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -109,7 +135,10 @@ static int __init i8042_platform_init(void)</div><div class='ctx'> static inline void i8042_platform_exit(void)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-	iounmap(kbd_iobase);</div><div class='add'>+	struct device_node *root = of_find_node_by_path("/");</div><div class='add'>+</div><div class='add'>+	if (strcmp(root-&gt;name, "SUNW,JavaStation-1"))</div><div class='add'>+		of_unregister_driver(&amp;sparc_i8042_driver);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c<br/>index a7d91d5356a5..06a3f25657dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/i8042.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/i8042.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serio.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -329,7 +328,7 @@ static int i8042_open(struct serio *serio)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(port-&gt;irq, i8042_interrupt,</div><div class='del'>-			SA_SHIRQ, "i8042", i8042_request_irq_cookie)) {</div><div class='add'>+			IRQF_SHARED, "i8042", i8042_request_irq_cookie)) {</div><div class='ctx'> 		printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", port-&gt;irq, port-&gt;name);</div><div class='ctx'> 		goto irq_fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -611,7 +610,7 @@ static int __devinit i8042_check_aux(void)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(i8042_ports[I8042_AUX_PORT_NO].irq, i8042_interrupt,</div><div class='del'>-			SA_SHIRQ, "i8042", &amp;i8042_check_aux_cookie))</div><div class='add'>+			IRQF_SHARED, "i8042", &amp;i8042_check_aux_cookie))</div><div class='ctx'>                 return -1;</div><div class='ctx'> 	free_irq(i8042_ports[I8042_AUX_PORT_NO].irq, &amp;i8042_check_aux_cookie);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h<br/>index cbbf3842da5b..af526ab9ec04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/i8042.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/i8042.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/i8042.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _I8042_H</div><div class='ctx'> #define _I8042_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 1999-2002 Vojtech Pavlik</div><div class='head'>diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c<br/>index 79c97f94bcbd..61a6f977846f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/libps2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/libps2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/libps2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/libps2.c</a></div><div class='hunk'>@@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ps2dev-&gt;cmd_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;ps2dev-&gt;cmd_mutex, SINGLE_DEPTH_NESTING);</div><div class='ctx'> </div><div class='ctx'> 	serio_pause_rx(ps2dev-&gt;serio);</div><div class='ctx'> 	ps2dev-&gt;flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0;</div><div class='head'>diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c<br/>index 1e139c5e59de..fb727c665253 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/pcips2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/pcips2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/pcips2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/pcips2.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int pcips2_open(struct serio *io)</div><div class='ctx'> 	outb(PS2_CTRL_ENABLE, ps2if-&gt;base);</div><div class='ctx'> 	pcips2_flush_input(ps2if);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(ps2if-&gt;dev-&gt;irq, pcips2_interrupt, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(ps2if-&gt;dev-&gt;irq, pcips2_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  "pcips2", ps2if);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		val = PS2_CTRL_ENABLE | PS2_CTRL_RXIRQ;</div><div class='head'>diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c<br/>index 5a2703b536dc..71a8eea816cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/serio/serio_raw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/serio/serio_raw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/serio/serio_raw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/serio/serio_raw.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='head'>diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c<br/>index 161afddd0f44..66e411badf70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ads7846.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/ads7846.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/ads7846.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/touchscreen/ads7846.c</a></div><div class='hunk'>@@ -773,8 +773,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	ts-&gt;last_msg = m;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(spi-&gt;irq, ads7846_irq,</div><div class='del'>-			SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,</div><div class='add'>+	if (request_irq(spi-&gt;irq, ads7846_irq, IRQF_TRIGGER_FALLING,</div><div class='ctx'> 			spi-&gt;dev.driver-&gt;name, ts)) {</div><div class='ctx'> 		dev_dbg(&amp;spi-&gt;dev, "irq %d busy?\n", spi-&gt;irq);</div><div class='ctx'> 		err = -EBUSY;</div><div class='head'>diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c<br/>index 5013703db0e6..9b66271d3ba8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/corgi_ts.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/corgi_ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/corgi_ts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/touchscreen/corgi_ts.c</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-//#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/sharpsl.h&gt;</div><div class='ctx'> #include &lt;asm/arch/hardware.h&gt;</div><div class='hunk'>@@ -318,7 +318,7 @@ static int __init corgits_probe(struct platform_device *pdev)</div><div class='ctx'> 	corgi_ssp_ads7846_putget((5u &lt;&lt; ADSCTRL_ADR_SH) | ADSCTRL_STS);</div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(corgi_ts-&gt;irq_gpio, ts_interrupt, SA_INTERRUPT, "ts", corgi_ts)) {</div><div class='add'>+	if (request_irq(corgi_ts-&gt;irq_gpio, ts_interrupt, IRQF_DISABLED, "ts", corgi_ts)) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c<br/>index 466da190ceec..b769b21973b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/gunze.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/gunze.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/gunze.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/touchscreen/gunze.c</a></div><div class='hunk'>@@ -129,7 +129,7 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	gunze-&gt;serio = serio;</div><div class='ctx'> 	gunze-&gt;dev = input_dev;</div><div class='del'>-	sprintf(gunze-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(gunze-&gt;phys, sizeof(serio-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;private = gunze;</div><div class='ctx'> 	input_dev-&gt;name = "Gunze AHL-51S TouchScreen";</div><div class='head'>diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c<br/>index a18d56bdafd9..e2b910018773 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/h3600_ts_input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/h3600_ts_input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/h3600_ts_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/touchscreen/h3600_ts_input.c</a></div><div class='hunk'>@@ -363,7 +363,7 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	ts-&gt;serio = serio;</div><div class='ctx'> 	ts-&gt;dev = input_dev;</div><div class='del'>-	sprintf(ts-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(ts-&gt;phys, sizeof(ts-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;name = "H3600 TouchScreen";</div><div class='ctx'> 	input_dev-&gt;phys = ts-&gt;phys;</div><div class='hunk'>@@ -399,16 +399,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> 	set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler,</div><div class='del'>-			SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,</div><div class='del'>-			"h3600_action", &amp;ts-&gt;dev)) {</div><div class='add'>+			IRQF_SHARED | IRQF_DISABLED, "h3600_action", &amp;ts-&gt;dev)) {</div><div class='ctx'> 		printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,</div><div class='del'>-			SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,</div><div class='del'>-			"h3600_suspend", &amp;ts-&gt;dev)) {</div><div class='add'>+			IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", &amp;ts-&gt;dev)) {</div><div class='ctx'> 		printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail3;</div><div class='head'>diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c<br/>index 957dd5a1b15e..fa97e0f79e7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/hp680_ts_input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/hp680_ts_input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/hp680_ts_input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/touchscreen/hp680_ts_input.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static int __init hp680_ts_init(void)</div><div class='ctx'> 	input_register_device(hp680_ts_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,</div><div class='del'>-			SA_INTERRUPT, MODNAME, 0) &lt; 0) {</div><div class='add'>+			IRQF_DISABLED, MODNAME, 0) &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",</div><div class='ctx'> 		       HP680_TS_IRQ);</div><div class='ctx'> 		input_unregister_device(hp680_ts_dev);</div><div class='head'>diff --git a/drivers/input/touchscreen/mtouch.c b/drivers/input/touchscreen/mtouch.c<br/>index 1d0d37eeef6e..8647a905df80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/mtouch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/touchscreen/mtouch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/touchscreen/mtouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/touchscreen/mtouch.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	mtouch-&gt;serio = serio;</div><div class='ctx'> 	mtouch-&gt;dev = input_dev;</div><div class='del'>-	sprintf(mtouch-&gt;phys, "%s/input0", serio-&gt;phys);</div><div class='add'>+	snprintf(mtouch-&gt;phys, sizeof(mtouch-&gt;phys), "%s/input0", serio-&gt;phys);</div><div class='ctx'> </div><div class='ctx'> 	input_dev-&gt;private = mtouch;</div><div class='ctx'> 	input_dev-&gt;name = "MicroTouch Serial TouchScreen";</div><div class='head'>diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c<br/>index d678d144bbf8..00e3929c6288 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/input/tsdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/input/tsdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/input/tsdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/input/tsdev.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@</div><div class='ctx'>  * e-mail - mail your message to &lt;jsimmons@infradead.org&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define TSDEV_MINOR_BASE 	128</div><div class='add'>+#define TSDEV_MINOR_BASE	128</div><div class='ctx'> #define TSDEV_MINORS		32</div><div class='ctx'> /* First 16 devices are h3600_ts compatible; second 16 are h3600_tsraw */</div><div class='ctx'> #define TSDEV_MINOR_MASK	15</div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -230,6 +229,7 @@ static ssize_t tsdev_read(struct file *file, char __user *buffer, size_t count,</div><div class='ctx'> static unsigned int tsdev_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct tsdev_list *list = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	poll_wait(file, &amp;list-&gt;tsdev-&gt;wait, wait);</div><div class='ctx'> 	return ((list-&gt;head == list-&gt;tail) ? 0 : (POLLIN | POLLRDNORM)) |</div><div class='ctx'> 		(list-&gt;tsdev-&gt;exist ? 0 : (POLLHUP | POLLERR));</div><div class='hunk'>@@ -248,11 +248,13 @@ static int tsdev_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				  sizeof (struct ts_calibration)))</div><div class='ctx'> 			retval = -EFAULT;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	case TS_SET_CAL:</div><div class='ctx'> 		if (copy_from_user (&amp;tsdev-&gt;cal, (void __user *)arg,</div><div class='ctx'> 				    sizeof (struct ts_calibration)))</div><div class='ctx'> 			retval = -EFAULT;</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		retval = -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -284,9 +286,11 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,</div><div class='ctx'> 		case ABS_X:</div><div class='ctx'> 			tsdev-&gt;x = value;</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		case ABS_Y:</div><div class='ctx'> 			tsdev-&gt;y = value;</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		case ABS_PRESSURE:</div><div class='ctx'> 			if (value &gt; handle-&gt;dev-&gt;absmax[ABS_PRESSURE])</div><div class='ctx'> 				value = handle-&gt;dev-&gt;absmax[ABS_PRESSURE];</div><div class='hunk'>@@ -307,6 +311,7 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,</div><div class='ctx'> 			else if (tsdev-&gt;x &gt; xres)</div><div class='ctx'> 				tsdev-&gt;x = xres;</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		case REL_Y:</div><div class='ctx'> 			tsdev-&gt;y += value;</div><div class='ctx'> 			if (tsdev-&gt;y &lt; 0)</div><div class='hunk'>@@ -323,6 +328,7 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,</div><div class='ctx'> 			case 0:</div><div class='ctx'> 				tsdev-&gt;pressure = 0;</div><div class='ctx'> 				break;</div><div class='add'>+</div><div class='ctx'> 			case 1:</div><div class='ctx'> 				if (!tsdev-&gt;pressure)</div><div class='ctx'> 					tsdev-&gt;pressure = 1;</div><div class='hunk'>@@ -370,9 +376,8 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,</div><div class='ctx'> 	struct class_device *cdev;</div><div class='ctx'> 	int minor, delta;</div><div class='ctx'> </div><div class='del'>-	for (minor = 0; minor &lt; TSDEV_MINORS/2 &amp;&amp; tsdev_table[minor];</div><div class='del'>-	     minor++);</div><div class='del'>-	if (minor &gt;= TSDEV_MINORS/2) {</div><div class='add'>+	for (minor = 0; minor &lt; TSDEV_MINORS / 2 &amp;&amp; tsdev_table[minor]; minor++);</div><div class='add'>+	if (minor &gt;= TSDEV_MINORS / 2) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 		       "tsdev: You have way too many touchscreens\n");</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -444,22 +449,22 @@ static struct input_device_id tsdev_ids[] = {</div><div class='ctx'> 	      .evbit	= { BIT(EV_KEY) | BIT(EV_REL) },</div><div class='ctx'> 	      .keybit	= { [LONG(BTN_LEFT)] = BIT(BTN_LEFT) },</div><div class='ctx'> 	      .relbit	= { BIT(REL_X) | BIT(REL_Y) },</div><div class='del'>-	 },/* A mouse like device, at least one button, two relative axes */</div><div class='add'>+	}, /* A mouse like device, at least one button, two relative axes */</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 	      .flags	= INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,</div><div class='ctx'> 	      .evbit	= { BIT(EV_KEY) | BIT(EV_ABS) },</div><div class='ctx'> 	      .keybit	= { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },</div><div class='ctx'> 	      .absbit	= { BIT(ABS_X) | BIT(ABS_Y) },</div><div class='del'>-	 },/* A tablet like device, at least touch detection, two absolute axes */</div><div class='add'>+	}, /* A tablet like device, at least touch detection, two absolute axes */</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 	      .flags	= INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,</div><div class='ctx'> 	      .evbit	= { BIT(EV_ABS) },</div><div class='ctx'> 	      .absbit	= { BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE) },</div><div class='del'>-	 },/* A tablet like device with several gradations of pressure */</div><div class='add'>+	}, /* A tablet like device with several gradations of pressure */</div><div class='ctx'> </div><div class='del'>-	{},/* Terminating entry */</div><div class='add'>+	{} /* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(input, tsdev_ids);</div><div class='head'>diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c<br/>index 173c899a1fb4..669f76393b5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/capi/capi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/capi/capi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/capi/capi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/capi/capi.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -39,7 +38,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/isdn/capiutil.h&gt;</div><div class='ctx'> #include &lt;linux/isdn/capicmd.h&gt;</div><div class='ctx'> #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)</div><div class='hunk'>@@ -87,6 +85,11 @@ struct capincci;</div><div class='ctx'> #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE</div><div class='ctx'> struct capiminor;</div><div class='ctx'> </div><div class='add'>+struct datahandle_queue {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	u16			datahandle;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct capiminor {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct capincci  *nccip;</div><div class='hunk'>@@ -109,12 +112,9 @@ struct capiminor {</div><div class='ctx'> 	int                 outbytes;</div><div class='ctx'> </div><div class='ctx'> 	/* transmit path */</div><div class='del'>-	struct datahandle_queue {</div><div class='del'>-		    struct datahandle_queue *next;</div><div class='del'>-		    u16                    datahandle;</div><div class='del'>-	} *ackqueue;</div><div class='add'>+	struct list_head ackqueue;</div><div class='ctx'> 	int nack;</div><div class='del'>-</div><div class='add'>+	spinlock_t ackqlock;</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */</div><div class='ctx'> </div><div class='hunk'>@@ -156,48 +156,54 @@ static LIST_HEAD(capiminor_list);</div><div class='ctx'> </div><div class='ctx'> static int capincci_add_ack(struct capiminor *mp, u16 datahandle)</div><div class='ctx'> {</div><div class='del'>-	struct datahandle_queue *n, **pp;</div><div class='add'>+	struct datahandle_queue *n;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	n = kmalloc(sizeof(*n), GFP_ATOMIC);</div><div class='del'>-	if (!n) {</div><div class='del'>-	   printk(KERN_ERR "capi: alloc datahandle failed\n");</div><div class='del'>-	   return -1;</div><div class='add'>+	if (unlikely(!n)) {</div><div class='add'>+		printk(KERN_ERR "capi: alloc datahandle failed\n");</div><div class='add'>+		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	n-&gt;next = NULL;</div><div class='ctx'> 	n-&gt;datahandle = datahandle;</div><div class='del'>-	for (pp = &amp;mp-&gt;ackqueue; *pp; pp = &amp;(*pp)-&gt;next) ;</div><div class='del'>-	*pp = n;</div><div class='add'>+	INIT_LIST_HEAD(&amp;n-&gt;list);</div><div class='add'>+	spin_lock_irqsave(&amp;mp-&gt;ackqlock, flags);</div><div class='add'>+	list_add_tail(&amp;n-&gt;list, &amp;mp-&gt;ackqueue);</div><div class='ctx'> 	mp-&gt;nack++;</div><div class='add'>+	spin_unlock_irqrestore(&amp;mp-&gt;ackqlock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int capiminor_del_ack(struct capiminor *mp, u16 datahandle)</div><div class='ctx'> {</div><div class='del'>-	struct datahandle_queue **pp, *p;</div><div class='add'>+	struct datahandle_queue *p, *tmp;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	for (pp = &amp;mp-&gt;ackqueue; *pp; pp = &amp;(*pp)-&gt;next) {</div><div class='del'>- 		if ((*pp)-&gt;datahandle == datahandle) {</div><div class='del'>-			p = *pp;</div><div class='del'>-			*pp = (*pp)-&gt;next;</div><div class='add'>+	spin_lock_irqsave(&amp;mp-&gt;ackqlock, flags);</div><div class='add'>+	list_for_each_entry_safe(p, tmp, &amp;mp-&gt;ackqueue, list) {</div><div class='add'>+ 		if (p-&gt;datahandle == datahandle) {</div><div class='add'>+			list_del(&amp;p-&gt;list);</div><div class='ctx'> 			kfree(p);</div><div class='ctx'> 			mp-&gt;nack--;</div><div class='add'>+			spin_unlock_irqrestore(&amp;mp-&gt;ackqlock, flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;mp-&gt;ackqlock, flags);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void capiminor_del_all_ack(struct capiminor *mp)</div><div class='ctx'> {</div><div class='del'>-	struct datahandle_queue **pp, *p;</div><div class='add'>+	struct datahandle_queue *p, *tmp;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	pp = &amp;mp-&gt;ackqueue;</div><div class='del'>-	while (*pp) {</div><div class='del'>-		p = *pp;</div><div class='del'>-		*pp = (*pp)-&gt;next;</div><div class='add'>+	spin_lock_irqsave(&amp;mp-&gt;ackqlock, flags);</div><div class='add'>+	list_for_each_entry_safe(p, tmp, &amp;mp-&gt;ackqueue, list) {</div><div class='add'>+		list_del(&amp;p-&gt;list);</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 		mp-&gt;nack--;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;mp-&gt;ackqlock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -220,6 +226,8 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)</div><div class='ctx'> 	mp-&gt;ncci = ncci;</div><div class='ctx'> 	mp-&gt;msgid = 0;</div><div class='ctx'> 	atomic_set(&amp;mp-&gt;ttyopencount,0);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mp-&gt;ackqueue);</div><div class='add'>+	spin_lock_init(&amp;mp-&gt;ackqlock);</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;mp-&gt;inqueue);</div><div class='ctx'> 	skb_queue_head_init(&amp;mp-&gt;outqueue);</div><div class='hunk'>@@ -1327,7 +1335,6 @@ static int capinc_tty_init(void)</div><div class='ctx'> </div><div class='ctx'> 	drv-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	drv-&gt;driver_name = "capi_nc";</div><div class='del'>-	drv-&gt;devfs_name = "capi/";</div><div class='ctx'> 	drv-&gt;name = "capi";</div><div class='ctx'> 	drv-&gt;major = capi_ttymajor;</div><div class='ctx'> 	drv-&gt;minor_start = 0;</div><div class='hunk'>@@ -1506,8 +1513,6 @@ static int __init capi_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");</div><div class='del'>-	devfs_mk_cdev(MKDEV(capi_major, 0), S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-			"isdn/capi20");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE</div><div class='ctx'> 	if (capinc_tty_init() &lt; 0) {</div><div class='hunk'>@@ -1542,7 +1547,6 @@ static void __exit capi_exit(void)</div><div class='ctx'> 	class_device_destroy(capi_class, MKDEV(capi_major, 0));</div><div class='ctx'> 	class_destroy(capi_class);</div><div class='ctx'> 	unregister_chrdev(capi_major, "capi20");</div><div class='del'>-	devfs_remove("isdn/capi20");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE</div><div class='ctx'> 	capinc_tty_exit();</div><div class='head'>diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c<br/>index 0a37aded4b54..9ea6bd0ddc35 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/capi/capifs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/capi/capifs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/capi/capifs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/capi/capifs.c</a></div><div class='hunk'>@@ -121,10 +121,10 @@ fail:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *capifs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int capifs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, capifs_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, capifs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type capifs_fs_type = {</div><div class='head'>diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c<br/>index e7cf6bc286a6..c1b21552fc03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/capi/capiutil.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/capi/capiutil.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/capi/capiutil.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/capi/capiutil.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/isdn/capiutil.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* from CAPI2.0 DDK AVM Berlin GmbH */</div><div class='head'>diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c<br/>index 1b37d86d5ee1..399b316111f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/divert/divert_procfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/divert/divert_procfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/divert/divert_procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/divert/divert_procfs.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='head'>diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c<br/>index f1a1f9a9b88e..1f5ebe9ee72c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/divert/isdn_divert.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/divert/isdn_divert.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/divert/isdn_divert.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/divert/isdn_divert.c</a></div><div class='hunk'>@@ -592,7 +592,7 @@ static int put_address(char *st, u_char *p, int len)</div><div class='ctx'> } /* put_address */</div><div class='ctx'> </div><div class='ctx'> /*************************************/</div><div class='del'>-/* report a succesfull interrogation */</div><div class='add'>+/* report a successful interrogation */</div><div class='ctx'> /*************************************/</div><div class='ctx'> static int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)</div><div class='ctx'> { char *src = ic-&gt;parm.dss1_io.data;</div><div class='head'>diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c<br/>index eb41aba3ddef..3845defd4901 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/bas-gigaset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/bas-gigaset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/bas-gigaset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/bas-gigaset.c</a></div><div class='hunk'>@@ -41,7 +41,6 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");</div><div class='ctx'> #define GIGASET_MINORS     1</div><div class='ctx'> #define GIGASET_MINOR      16</div><div class='ctx'> #define GIGASET_MODULENAME "bas_gigaset"</div><div class='del'>-#define GIGASET_DEVFSNAME  "gig/bas/"</div><div class='ctx'> #define GIGASET_DEVNAME    "ttyGB"</div><div class='ctx'> </div><div class='ctx'> /* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */</div><div class='hunk'>@@ -65,23 +64,22 @@ static struct usb_device_id gigaset_table [] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(usb, gigaset_table);</div><div class='ctx'> </div><div class='del'>-/*======================= local function prototypes =============================*/</div><div class='add'>+/*======================= local function prototypes ==========================*/</div><div class='ctx'> </div><div class='del'>-/* This function is called if a new device is connected to the USB port. It</div><div class='del'>- * checks whether this new device belongs to this driver.</div><div class='del'>- */</div><div class='add'>+/* function called if a new device belonging to this driver is connected */</div><div class='ctx'> static int gigaset_probe(struct usb_interface *interface,</div><div class='ctx'> 			 const struct usb_device_id *id);</div><div class='ctx'> </div><div class='ctx'> /* Function will be called if the device is unplugged */</div><div class='ctx'> static void gigaset_disconnect(struct usb_interface *interface);</div><div class='ctx'> </div><div class='del'>-static void read_ctrl_callback(struct urb *, struct pt_regs *);</div><div class='add'>+static int atread_submit(struct cardstate *, int);</div><div class='ctx'> static void stopurbs(struct bas_bc_state *);</div><div class='add'>+static int req_submit(struct bc_state *, int, int, int);</div><div class='ctx'> static int atwrite_submit(struct cardstate *, unsigned char *, int);</div><div class='ctx'> static int start_cbsend(struct cardstate *);</div><div class='ctx'> </div><div class='del'>-/*==============================================================================*/</div><div class='add'>+/*============================================================================*/</div><div class='ctx'> </div><div class='ctx'> struct bas_cardstate {</div><div class='ctx'> 	struct usb_device	*udev;		/* USB device pointer */</div><div class='hunk'>@@ -91,6 +89,7 @@ struct bas_cardstate {</div><div class='ctx'> 	struct urb		*urb_ctrl;	/* control pipe default URB */</div><div class='ctx'> 	struct usb_ctrlrequest	dr_ctrl;</div><div class='ctx'> 	struct timer_list	timer_ctrl;	/* control request timeout */</div><div class='add'>+	int			retry_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	struct timer_list	timer_atrdy;	/* AT command ready timeout */</div><div class='ctx'> 	struct urb		*urb_cmd_out;	/* for sending AT commands */</div><div class='hunk'>@@ -307,6 +306,7 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)</div><div class='ctx'>  * hang up any existing connection because of an unrecoverable error</div><div class='ctx'>  * This function may be called from any context and takes care of scheduling</div><div class='ctx'>  * the necessary actions for execution outside of interrupt context.</div><div class='add'>+ * cs-&gt;lock must not be held.</div><div class='ctx'>  * argument:</div><div class='ctx'>  *	B channel control structure</div><div class='ctx'>  */</div><div class='hunk'>@@ -325,14 +325,17 @@ static inline void error_hangup(struct bc_state *bcs)</div><div class='ctx'> </div><div class='ctx'> /* error_reset</div><div class='ctx'>  * reset Gigaset device because of an unrecoverable error</div><div class='del'>- * This function may be called from any context, and should take care of</div><div class='add'>+ * This function may be called from any context, and takes care of</div><div class='ctx'>  * scheduling the necessary actions for execution outside of interrupt context.</div><div class='del'>- * Right now, it just generates a kernel message calling for help.</div><div class='add'>+ * cs-&gt;lock must not be held.</div><div class='ctx'>  * argument:</div><div class='ctx'>  *	controller state structure</div><div class='ctx'>  */</div><div class='ctx'> static inline void error_reset(struct cardstate *cs)</div><div class='ctx'> {</div><div class='add'>+	/* close AT command channel to recover (ignore errors) */</div><div class='add'>+	req_submit(cs-&gt;bcs, HD_CLOSE_ATCHANNEL, 0, BAS_TIMEOUT);</div><div class='add'>+</div><div class='ctx'> 	//FIXME try to recover without bothering the user</div><div class='ctx'> 	dev_err(cs-&gt;dev,</div><div class='ctx'> 	    "unrecoverable error - please disconnect Gigaset base to reset\n");</div><div class='hunk'>@@ -403,14 +406,30 @@ static void cmd_in_timeout(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cardstate *cs = (struct cardstate *) data;</div><div class='ctx'> 	struct bas_cardstate *ucs = cs-&gt;hw.bas;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!ucs-&gt;rcvbuf_size) {</div><div class='ctx'> 		gig_dbg(DEBUG_USBREQ, "%s: no receive in progress", __func__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_err(cs-&gt;dev, "timeout reading AT response\n");</div><div class='del'>-	error_reset(cs);	//FIXME retry?</div><div class='add'>+	if (ucs-&gt;retry_cmd_in++ &lt; BAS_RETRY) {</div><div class='add'>+		dev_notice(cs-&gt;dev, "control read: timeout, retry %d\n",</div><div class='add'>+			   ucs-&gt;retry_cmd_in);</div><div class='add'>+		rc = atread_submit(cs, BAS_TIMEOUT);</div><div class='add'>+		if (rc &gt;= 0 || rc == -ENODEV)</div><div class='add'>+			/* resubmitted or disconnected */</div><div class='add'>+			/* - bypass regular exit block */</div><div class='add'>+			return;</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(cs-&gt;dev,</div><div class='add'>+			"control read: timeout, giving up after %d tries\n",</div><div class='add'>+			ucs-&gt;retry_cmd_in);</div><div class='add'>+	}</div><div class='add'>+	kfree(ucs-&gt;rcvbuf);</div><div class='add'>+	ucs-&gt;rcvbuf = NULL;</div><div class='add'>+	ucs-&gt;rcvbuf_size = 0;</div><div class='add'>+	error_reset(cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* set/clear bits in base connection state, return previous state</div><div class='hunk'>@@ -428,6 +447,96 @@ inline static int update_basstate(struct bas_cardstate *ucs,</div><div class='ctx'> 	return state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* read_ctrl_callback</div><div class='add'>+ * USB completion handler for control pipe input</div><div class='add'>+ * called by the USB subsystem in interrupt context</div><div class='add'>+ * parameter:</div><div class='add'>+ *	urb	USB request block</div><div class='add'>+ *		urb-&gt;context = inbuf structure for controller state</div><div class='add'>+ */</div><div class='add'>+static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct inbuf_t *inbuf = urb-&gt;context;</div><div class='add'>+	struct cardstate *cs = inbuf-&gt;cs;</div><div class='add'>+	struct bas_cardstate *ucs = cs-&gt;hw.bas;</div><div class='add'>+	int have_data = 0;</div><div class='add'>+	unsigned numbytes;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	update_basstate(ucs, 0, BS_ATRDPEND);</div><div class='add'>+</div><div class='add'>+	if (!ucs-&gt;rcvbuf_size) {</div><div class='add'>+		dev_warn(cs-&gt;dev, "%s: no receive in progress\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	del_timer(&amp;ucs-&gt;timer_cmd_in);</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:				/* normal completion */</div><div class='add'>+		numbytes = urb-&gt;actual_length;</div><div class='add'>+		if (unlikely(numbytes != ucs-&gt;rcvbuf_size)) {</div><div class='add'>+			dev_warn(cs-&gt;dev,</div><div class='add'>+			       "control read: received %d chars, expected %d\n",</div><div class='add'>+				 numbytes, ucs-&gt;rcvbuf_size);</div><div class='add'>+			if (numbytes &gt; ucs-&gt;rcvbuf_size)</div><div class='add'>+				numbytes = ucs-&gt;rcvbuf_size;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* copy received bytes to inbuf */</div><div class='add'>+		have_data = gigaset_fill_inbuf(inbuf, ucs-&gt;rcvbuf, numbytes);</div><div class='add'>+</div><div class='add'>+		if (unlikely(numbytes &lt; ucs-&gt;rcvbuf_size)) {</div><div class='add'>+			/* incomplete - resubmit for remaining bytes */</div><div class='add'>+			ucs-&gt;rcvbuf_size -= numbytes;</div><div class='add'>+			ucs-&gt;retry_cmd_in = 0;</div><div class='add'>+			rc = atread_submit(cs, BAS_TIMEOUT);</div><div class='add'>+			if (rc &gt;= 0 || rc == -ENODEV)</div><div class='add'>+				/* resubmitted or disconnected */</div><div class='add'>+				/* - bypass regular exit block */</div><div class='add'>+				return;</div><div class='add'>+			error_reset(cs);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:			/* cancelled */</div><div class='add'>+	case -ECONNRESET:		/* cancelled (async) */</div><div class='add'>+	case -EINPROGRESS:		/* pending */</div><div class='add'>+	case -ENODEV:			/* device removed */</div><div class='add'>+	case -ESHUTDOWN:		/* device shut down */</div><div class='add'>+		/* no action necessary */</div><div class='add'>+		gig_dbg(DEBUG_USBREQ, "%s: %s",</div><div class='add'>+			__func__, get_usb_statmsg(urb-&gt;status));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:			/* severe trouble */</div><div class='add'>+		dev_warn(cs-&gt;dev, "control read: %s\n",</div><div class='add'>+			 get_usb_statmsg(urb-&gt;status));</div><div class='add'>+		if (ucs-&gt;retry_cmd_in++ &lt; BAS_RETRY) {</div><div class='add'>+			dev_notice(cs-&gt;dev, "control read: retry %d\n",</div><div class='add'>+				   ucs-&gt;retry_cmd_in);</div><div class='add'>+			rc = atread_submit(cs, BAS_TIMEOUT);</div><div class='add'>+			if (rc &gt;= 0 || rc == -ENODEV)</div><div class='add'>+				/* resubmitted or disconnected */</div><div class='add'>+				/* - bypass regular exit block */</div><div class='add'>+				return;</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(cs-&gt;dev,</div><div class='add'>+				"control read: giving up after %d tries\n",</div><div class='add'>+				ucs-&gt;retry_cmd_in);</div><div class='add'>+		}</div><div class='add'>+		error_reset(cs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(ucs-&gt;rcvbuf);</div><div class='add'>+	ucs-&gt;rcvbuf = NULL;</div><div class='add'>+	ucs-&gt;rcvbuf_size = 0;</div><div class='add'>+	if (have_data) {</div><div class='add'>+		gig_dbg(DEBUG_INTR, "%s--&gt;BH", __func__);</div><div class='add'>+		gigaset_schedule_event(cs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* atread_submit</div><div class='ctx'>  * submit an HD_READ_ATMESSAGE command URB and optionally start a timeout</div><div class='ctx'>  * parameters:</div><div class='hunk'>@@ -466,7 +575,7 @@ static int atread_submit(struct cardstate *cs, int timeout)</div><div class='ctx'> 	if ((ret = usb_submit_urb(ucs-&gt;urb_cmd_in, SLAB_ATOMIC)) != 0) {</div><div class='ctx'> 		update_basstate(ucs, 0, BS_ATRDPEND);</div><div class='ctx'> 		dev_err(cs-&gt;dev, "could not submit HD_READ_ATMESSAGE: %s\n",</div><div class='del'>-			get_usb_statmsg(ret));</div><div class='add'>+			get_usb_rcmsg(ret));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -611,9 +720,12 @@ static void read_int_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 			kfree(ucs-&gt;rcvbuf);</div><div class='ctx'> 			ucs-&gt;rcvbuf = NULL;</div><div class='ctx'> 			ucs-&gt;rcvbuf_size = 0;</div><div class='del'>-			if (rc != -ENODEV)</div><div class='add'>+			if (rc != -ENODEV) {</div><div class='ctx'> 				//FIXME corrective action?</div><div class='add'>+				spin_unlock_irqrestore(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 				error_reset(cs);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -643,97 +755,6 @@ resubmit:</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* read_ctrl_callback</div><div class='del'>- * USB completion handler for control pipe input</div><div class='del'>- * called by the USB subsystem in interrupt context</div><div class='del'>- * parameter:</div><div class='del'>- *	urb	USB request block</div><div class='del'>- *		urb-&gt;context = inbuf structure for controller state</div><div class='del'>- */</div><div class='del'>-static void read_ctrl_callback(struct urb *urb, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	struct inbuf_t *inbuf = urb-&gt;context;</div><div class='del'>-	struct cardstate *cs = inbuf-&gt;cs;</div><div class='del'>-	struct bas_cardstate *ucs = cs-&gt;hw.bas;</div><div class='del'>-	int have_data = 0;</div><div class='del'>-	unsigned numbytes;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	update_basstate(ucs, 0, BS_ATRDPEND);</div><div class='del'>-</div><div class='del'>-	if (!ucs-&gt;rcvbuf_size) {</div><div class='del'>-		dev_warn(cs-&gt;dev, "%s: no receive in progress\n", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	del_timer(&amp;ucs-&gt;timer_cmd_in);</div><div class='del'>-</div><div class='del'>-	switch (urb-&gt;status) {</div><div class='del'>-	case 0:				/* normal completion */</div><div class='del'>-		numbytes = urb-&gt;actual_length;</div><div class='del'>-		if (unlikely(numbytes == 0)) {</div><div class='del'>-			dev_warn(cs-&gt;dev,</div><div class='del'>-				 "control read: empty block received\n");</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-		if (unlikely(numbytes != ucs-&gt;rcvbuf_size)) {</div><div class='del'>-			dev_warn(cs-&gt;dev,</div><div class='del'>-			       "control read: received %d chars, expected %d\n",</div><div class='del'>-				 numbytes, ucs-&gt;rcvbuf_size);</div><div class='del'>-			if (numbytes &gt; ucs-&gt;rcvbuf_size)</div><div class='del'>-				numbytes = ucs-&gt;rcvbuf_size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* copy received bytes to inbuf */</div><div class='del'>-		have_data = gigaset_fill_inbuf(inbuf, ucs-&gt;rcvbuf, numbytes);</div><div class='del'>-</div><div class='del'>-		if (unlikely(numbytes &lt; ucs-&gt;rcvbuf_size)) {</div><div class='del'>-			/* incomplete - resubmit for remaining bytes */</div><div class='del'>-			ucs-&gt;rcvbuf_size -= numbytes;</div><div class='del'>-			ucs-&gt;retry_cmd_in = 0;</div><div class='del'>-			goto retry;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case -ENOENT:			/* cancelled */</div><div class='del'>-	case -ECONNRESET:		/* cancelled (async) */</div><div class='del'>-	case -EINPROGRESS:		/* pending */</div><div class='del'>-	case -ENODEV:			/* device removed */</div><div class='del'>-	case -ESHUTDOWN:		/* device shut down */</div><div class='del'>-		/* no action necessary */</div><div class='del'>-		gig_dbg(DEBUG_USBREQ, "%s: %s",</div><div class='del'>-			__func__, get_usb_statmsg(urb-&gt;status));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:			/* severe trouble */</div><div class='del'>-		dev_warn(cs-&gt;dev, "control read: %s\n",</div><div class='del'>-			 get_usb_statmsg(urb-&gt;status));</div><div class='del'>-	retry:</div><div class='del'>-		if (ucs-&gt;retry_cmd_in++ &lt; BAS_RETRY) {</div><div class='del'>-			dev_notice(cs-&gt;dev, "control read: retry %d\n",</div><div class='del'>-				   ucs-&gt;retry_cmd_in);</div><div class='del'>-			rc = atread_submit(cs, BAS_TIMEOUT);</div><div class='del'>-			if (rc &gt;= 0 || rc == -ENODEV)</div><div class='del'>-				/* resubmitted or disconnected */</div><div class='del'>-				/* - bypass regular exit block */</div><div class='del'>-				return;</div><div class='del'>-		} else {</div><div class='del'>-			dev_err(cs-&gt;dev,</div><div class='del'>-				"control read: giving up after %d tries\n",</div><div class='del'>-				ucs-&gt;retry_cmd_in);</div><div class='del'>-		}</div><div class='del'>-		error_reset(cs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(ucs-&gt;rcvbuf);</div><div class='del'>-	ucs-&gt;rcvbuf = NULL;</div><div class='del'>-	ucs-&gt;rcvbuf_size = 0;</div><div class='del'>-	if (have_data) {</div><div class='del'>-		gig_dbg(DEBUG_INTR, "%s--&gt;BH", __func__);</div><div class='del'>-		gigaset_schedule_event(cs);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* read_iso_callback</div><div class='ctx'>  * USB completion handler for B channel isochronous input</div><div class='ctx'>  * called by the USB subsystem in interrupt context</div><div class='hunk'>@@ -1378,6 +1399,7 @@ static void req_timeout(unsigned long data)</div><div class='ctx'> 	case HD_CLOSE_B1CHANNEL:</div><div class='ctx'> 		dev_err(bcs-&gt;cs-&gt;dev, "timeout closing channel %d\n",</div><div class='ctx'> 			bcs-&gt;channel + 1);</div><div class='add'>+		error_reset(bcs-&gt;cs);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1396,22 +1418,61 @@ static void req_timeout(unsigned long data)</div><div class='ctx'> static void write_ctrl_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct bas_cardstate *ucs = urb-&gt;context;</div><div class='add'>+	int rc;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ucs-&gt;lock, flags);</div><div class='del'>-	if (urb-&gt;status &amp;&amp; ucs-&gt;pending) {</div><div class='del'>-		dev_err(&amp;ucs-&gt;interface-&gt;dev,</div><div class='del'>-			"control request 0x%02x failed: %s\n",</div><div class='del'>-			ucs-&gt;pending, get_usb_statmsg(urb-&gt;status));</div><div class='del'>-		del_timer(&amp;ucs-&gt;timer_ctrl);</div><div class='del'>-		ucs-&gt;pending = 0;</div><div class='del'>-	}</div><div class='del'>-	/* individual handling of specific request types */</div><div class='del'>-	switch (ucs-&gt;pending) {</div><div class='del'>-	case HD_DEVICE_INIT_ACK:		/* no reply expected */</div><div class='del'>-		ucs-&gt;pending = 0;</div><div class='add'>+	/* check status */</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:					/* normal completion */</div><div class='add'>+		spin_lock_irqsave(&amp;ucs-&gt;lock, flags);</div><div class='add'>+		switch (ucs-&gt;pending) {</div><div class='add'>+		case HD_DEVICE_INIT_ACK:	/* no reply expected */</div><div class='add'>+			del_timer(&amp;ucs-&gt;timer_ctrl);</div><div class='add'>+			ucs-&gt;pending = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ucs-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:			/* cancelled */</div><div class='add'>+	case -ECONNRESET:		/* cancelled (async) */</div><div class='add'>+	case -EINPROGRESS:		/* pending */</div><div class='add'>+	case -ENODEV:			/* device removed */</div><div class='add'>+	case -ESHUTDOWN:		/* device shut down */</div><div class='add'>+		/* ignore silently */</div><div class='add'>+		gig_dbg(DEBUG_USBREQ, "%s: %s",</div><div class='add'>+			__func__, get_usb_statmsg(urb-&gt;status));</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	default:				/* any failure */</div><div class='add'>+		if (++ucs-&gt;retry_ctrl &gt; BAS_RETRY) {</div><div class='add'>+			dev_err(&amp;ucs-&gt;interface-&gt;dev,</div><div class='add'>+				"control request 0x%02x failed: %s\n",</div><div class='add'>+				ucs-&gt;dr_ctrl.bRequest,</div><div class='add'>+				get_usb_statmsg(urb-&gt;status));</div><div class='add'>+			break;		/* give up */</div><div class='add'>+		}</div><div class='add'>+		dev_notice(&amp;ucs-&gt;interface-&gt;dev,</div><div class='add'>+			   "control request 0x%02x: %s, retry %d\n",</div><div class='add'>+			   ucs-&gt;dr_ctrl.bRequest, get_usb_statmsg(urb-&gt;status),</div><div class='add'>+			   ucs-&gt;retry_ctrl);</div><div class='add'>+		/* urb-&gt;dev is clobbered by USB subsystem */</div><div class='add'>+		urb-&gt;dev = ucs-&gt;udev;</div><div class='add'>+		rc = usb_submit_urb(urb, SLAB_ATOMIC);</div><div class='add'>+		if (unlikely(rc)) {</div><div class='add'>+			dev_err(&amp;ucs-&gt;interface-&gt;dev,</div><div class='add'>+				"could not resubmit request 0x%02x: %s\n",</div><div class='add'>+				ucs-&gt;dr_ctrl.bRequest, get_usb_rcmsg(rc));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* resubmitted */</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* failed, clear pending request */</div><div class='add'>+	spin_lock_irqsave(&amp;ucs-&gt;lock, flags);</div><div class='add'>+	del_timer(&amp;ucs-&gt;timer_ctrl);</div><div class='add'>+	ucs-&gt;pending = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;ucs-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1455,9 +1516,11 @@ static int req_submit(struct bc_state *bcs, int req, int val, int timeout)</div><div class='ctx'> 			     usb_sndctrlpipe(ucs-&gt;udev, 0),</div><div class='ctx'> 			     (unsigned char*) &amp;ucs-&gt;dr_ctrl, NULL, 0,</div><div class='ctx'> 			     write_ctrl_callback, ucs);</div><div class='del'>-	if ((ret = usb_submit_urb(ucs-&gt;urb_ctrl, SLAB_ATOMIC)) != 0) {</div><div class='add'>+	ucs-&gt;retry_ctrl = 0;</div><div class='add'>+	ret = usb_submit_urb(ucs-&gt;urb_ctrl, SLAB_ATOMIC);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='ctx'> 		dev_err(bcs-&gt;cs-&gt;dev, "could not submit request 0x%02x: %s\n",</div><div class='del'>-			req, get_usb_statmsg(ret));</div><div class='add'>+			req, get_usb_rcmsg(ret));</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ucs-&gt;lock, flags);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2285,8 +2348,7 @@ static int __init bas_gigaset_init(void)</div><div class='ctx'> 	/* allocate memory for our driver state and intialize it */</div><div class='ctx'> 	if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,</div><div class='ctx'> 				       GIGASET_MODULENAME, GIGASET_DEVNAME,</div><div class='del'>-				       GIGASET_DEVFSNAME, &amp;gigops,</div><div class='del'>-				       THIS_MODULE)) == NULL)</div><div class='add'>+				       &amp;gigops, THIS_MODULE)) == NULL)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for our device state and intialize it */</div><div class='head'>diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c<br/>index e55767b2ccd3..aca165d43aa0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/common.c</a></div><div class='hunk'>@@ -460,6 +460,9 @@ void gigaset_freecs(struct cardstate *cs)</div><div class='ctx'> </div><div class='ctx'> 	switch (cs-&gt;cs_init) {</div><div class='ctx'> 	default:</div><div class='add'>+		/* clear device sysfs */</div><div class='add'>+		gigaset_free_dev_sysfs(cs);</div><div class='add'>+</div><div class='ctx'> 		gigaset_if_free(cs);</div><div class='ctx'> </div><div class='ctx'> 		gig_dbg(DEBUG_INIT, "clearing hw");</div><div class='hunk'>@@ -699,6 +702,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,</div><div class='ctx'> 	cs-&gt;open_count = 0;</div><div class='ctx'> 	cs-&gt;dev = NULL;</div><div class='ctx'> 	cs-&gt;tty = NULL;</div><div class='add'>+	cs-&gt;class = NULL;</div><div class='ctx'> 	cs-&gt;cidmode = cidmode != 0;</div><div class='ctx'> </div><div class='ctx'> 	//if(onechannel) { //FIXME</div><div class='hunk'>@@ -760,6 +764,9 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,</div><div class='ctx'> </div><div class='ctx'> 	gigaset_if_init(cs);</div><div class='ctx'> </div><div class='add'>+	/* set up device sysfs */</div><div class='add'>+	gigaset_init_dev_sysfs(cs);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 	cs-&gt;running = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;cs-&gt;lock, flags);</div><div class='hunk'>@@ -902,9 +909,6 @@ int gigaset_start(struct cardstate *cs)</div><div class='ctx'> </div><div class='ctx'> 	wait_event(cs-&gt;waitqueue, !cs-&gt;waiting);</div><div class='ctx'> </div><div class='del'>-	/* set up device sysfs */</div><div class='del'>-	gigaset_init_dev_sysfs(cs);</div><div class='del'>-</div><div class='ctx'> 	mutex_unlock(&amp;cs-&gt;mutex);</div><div class='ctx'> 	return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -969,9 +973,6 @@ void gigaset_stop(struct cardstate *cs)</div><div class='ctx'> 		//FIXME</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* clear device sysfs */</div><div class='del'>-	gigaset_free_dev_sysfs(cs);</div><div class='del'>-</div><div class='ctx'> 	cleanup_cs(cs);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -980,7 +981,7 @@ exit:</div><div class='ctx'> EXPORT_SYMBOL_GPL(gigaset_stop);</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(drivers);</div><div class='del'>-static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(driver_lock);</div><div class='ctx'> </div><div class='ctx'> struct cardstate *gigaset_get_cs_by_id(int id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1091,14 +1092,12 @@ EXPORT_SYMBOL_GPL(gigaset_freedriver);</div><div class='ctx'>  *	minors		Number of minors this driver can handle</div><div class='ctx'>  *	procname	Name of the driver</div><div class='ctx'>  *	devname		Name of the device files (prefix without minor number)</div><div class='del'>- *	devfsname	Devfs name of the device files without %d</div><div class='ctx'>  * return value:</div><div class='ctx'>  *	Pointer to the gigaset_driver structure on success, NULL on failure.</div><div class='ctx'>  */</div><div class='ctx'> struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,</div><div class='ctx'> 					  const char *procname,</div><div class='ctx'> 					  const char *devname,</div><div class='del'>-					  const char *devfsname,</div><div class='ctx'> 					  const struct gigaset_ops *ops,</div><div class='ctx'> 					  struct module *owner)</div><div class='ctx'> {</div><div class='hunk'>@@ -1138,7 +1137,7 @@ struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,</div><div class='ctx'> 		drv-&gt;cs[i].minor_index = i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	gigaset_if_initdriver(drv, procname, devname, devfsname);</div><div class='add'>+	gigaset_if_initdriver(drv, procname, devname);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;driver_lock, flags);</div><div class='ctx'> 	list_add(&amp;drv-&gt;list, &amp;drivers);</div><div class='head'>diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c<br/>index 18e05c09b71c..44f02dbd1111 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/ev-layer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/ev-layer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/ev-layer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/ev-layer.c</a></div><div class='hunk'>@@ -1262,7 +1262,8 @@ static void do_action(int action, struct cardstate *cs,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACT_HUPMODEM:</div><div class='ctx'> 		/* send "+++" (hangup in unimodem mode) */</div><div class='del'>-		cs-&gt;ops-&gt;write_cmd(cs, "+++", 3, NULL);</div><div class='add'>+		if (cs-&gt;connected)</div><div class='add'>+			cs-&gt;ops-&gt;write_cmd(cs, "+++", 3, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACT_RING:</div><div class='ctx'> 		/* get fresh AT state structure for new CID */</div><div class='hunk'>@@ -1294,7 +1295,6 @@ static void do_action(int action, struct cardstate *cs,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACT_ICALL:</div><div class='ctx'> 		handle_icall(cs, bcs, p_at_state);</div><div class='del'>-		at_state = *p_at_state;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACT_FAILSDOWN:</div><div class='ctx'> 		dev_warn(cs-&gt;dev, "Could not shut down the device.\n");</div><div class='hunk'>@@ -1334,10 +1334,8 @@ static void do_action(int action, struct cardstate *cs,</div><div class='ctx'> 			 */</div><div class='ctx'> 			at_state-&gt;pending_commands |= PC_DLE0;</div><div class='ctx'> 			atomic_set(&amp;cs-&gt;commands_pending, 1);</div><div class='del'>-		} else {</div><div class='add'>+		} else</div><div class='ctx'> 			disconnect(p_at_state);</div><div class='del'>-			at_state = *p_at_state;</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACT_FAKEDLE0:</div><div class='ctx'> 		at_state-&gt;int_var[VAR_ZDLE] = 0;</div><div class='hunk'>@@ -1354,10 +1352,8 @@ static void do_action(int action, struct cardstate *cs,</div><div class='ctx'> 		at_state-&gt;cid = -1;</div><div class='ctx'> 		if (bcs &amp;&amp; cs-&gt;onechannel)</div><div class='ctx'> 			at_state-&gt;pending_commands |= PC_DLE0;</div><div class='del'>-		else {</div><div class='add'>+		else</div><div class='ctx'> 			disconnect(p_at_state);</div><div class='del'>-			at_state = *p_at_state;</div><div class='del'>-		}</div><div class='ctx'> 		schedule_init(cs, MS_RECOVER);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACT_FAILDLE0:</div><div class='hunk'>@@ -1410,7 +1406,6 @@ static void do_action(int action, struct cardstate *cs,</div><div class='ctx'> </div><div class='ctx'> 	case ACT_ABORTACCEPT:	/* hangup/error/timeout during ICALL processing */</div><div class='ctx'> 		disconnect(p_at_state);</div><div class='del'>-		at_state = *p_at_state;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACT_ABORTDIAL:	/* error/timeout during dial preparation */</div><div class='head'>diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h<br/>index 22b9693f7c0a..884bd72c1bf4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/gigaset.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/gigaset.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/gigaset.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/gigaset.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #ifndef GIGASET_H</div><div class='ctx'> #define GIGASET_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -445,6 +444,7 @@ struct cardstate {</div><div class='ctx'> 	struct gigaset_driver *driver;</div><div class='ctx'> 	unsigned minor_index;</div><div class='ctx'> 	struct device *dev;</div><div class='add'>+	struct class_device *class;</div><div class='ctx'> </div><div class='ctx'> 	const struct gigaset_ops *ops;</div><div class='ctx'> </div><div class='hunk'>@@ -768,7 +768,6 @@ void gigaset_block_channels(struct cardstate *cs);</div><div class='ctx'> struct gigaset_driver *gigaset_initdriver(unsigned minor, unsigned minors,</div><div class='ctx'> 					  const char *procname,</div><div class='ctx'> 					  const char *devname,</div><div class='del'>-					  const char *devfsname,</div><div class='ctx'> 					  const struct gigaset_ops *ops,</div><div class='ctx'> 					  struct module *owner);</div><div class='ctx'> </div><div class='hunk'>@@ -891,7 +890,7 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,</div><div class='ctx'> </div><div class='ctx'> /* initialize interface */</div><div class='ctx'> void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,</div><div class='del'>-			   const char *devname, const char *devfsname);</div><div class='add'>+			   const char *devname);</div><div class='ctx'> /* release interface */</div><div class='ctx'> void gigaset_if_freedriver(struct gigaset_driver *drv);</div><div class='ctx'> /* add minor */</div><div class='head'>diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c<br/>index 08e4c4eea14d..bd2e4267528e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/interface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/interface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/interface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/interface.c</a></div><div class='hunk'>@@ -625,7 +625,14 @@ void gigaset_if_init(struct cardstate *cs)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tasklet_init(&amp;cs-&gt;if_wake_tasklet, &amp;if_wake, (unsigned long) cs);</div><div class='del'>-	tty_register_device(drv-&gt;tty, cs-&gt;minor_index, NULL);</div><div class='add'>+	cs-&gt;class = tty_register_device(drv-&gt;tty, cs-&gt;minor_index, NULL);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(cs-&gt;class))</div><div class='add'>+		class_set_devdata(cs-&gt;class, cs);</div><div class='add'>+	else {</div><div class='add'>+		warn("could not register device to the tty subsystem");</div><div class='add'>+		cs-&gt;class = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void gigaset_if_free(struct cardstate *cs)</div><div class='hunk'>@@ -638,6 +645,7 @@ void gigaset_if_free(struct cardstate *cs)</div><div class='ctx'> </div><div class='ctx'> 	tasklet_disable(&amp;cs-&gt;if_wake_tasklet);</div><div class='ctx'> 	tasklet_kill(&amp;cs-&gt;if_wake_tasklet);</div><div class='add'>+	cs-&gt;class = NULL;</div><div class='ctx'> 	tty_unregister_device(drv-&gt;tty, cs-&gt;minor_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -665,10 +673,9 @@ EXPORT_SYMBOL_GPL(gigaset_if_receive);</div><div class='ctx'>  *	drv		Driver</div><div class='ctx'>  *	procname	Name of the driver (e.g. for /proc/tty/drivers)</div><div class='ctx'>  *	devname		Name of the device files (prefix without minor number)</div><div class='del'>- *	devfsname	Devfs name of the device files without %d</div><div class='ctx'>  */</div><div class='ctx'> void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,</div><div class='del'>-			   const char *devname, const char *devfsname)</div><div class='add'>+			   const char *devname)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned minors = drv-&gt;minors;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -684,7 +691,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,</div><div class='ctx'> 	tty-&gt;major =		GIG_MAJOR,</div><div class='ctx'> 	tty-&gt;type =		TTY_DRIVER_TYPE_SERIAL,</div><div class='ctx'> 	tty-&gt;subtype =		SERIAL_TYPE_NORMAL,</div><div class='del'>-	tty-&gt;flags =		TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,</div><div class='add'>+	tty-&gt;flags =		TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;driver_name =	procname;</div><div class='ctx'> 	tty-&gt;name =		devname;</div><div class='hunk'>@@ -692,7 +699,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,</div><div class='ctx'> 	tty-&gt;num =		drv-&gt;minors;</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;owner =		THIS_MODULE;</div><div class='del'>-	tty-&gt;devfs_name =	devfsname;</div><div class='ctx'> </div><div class='ctx'> 	tty-&gt;init_termios          = tty_std_termios; //FIXME</div><div class='ctx'> 	tty-&gt;init_termios.c_cflag  = B9600 | CS8 | CREAD | HUPCL | CLOCAL; //FIXME</div><div class='head'>diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c<br/>index d267a636b53c..9ae3a7f3e7b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/proc.c</a></div><div class='hunk'>@@ -16,12 +16,11 @@</div><div class='ctx'> #include "gigaset.h"</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> </div><div class='del'>-static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr,</div><div class='del'>-			    char *buf)</div><div class='add'>+static ssize_t show_cidmode(struct class_device *class, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct cardstate *cs = dev_get_drvdata(dev);</div><div class='add'>+	struct cardstate *cs = class_get_devdata(class);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 	ret = sprintf(buf, "%u\n", cs-&gt;cidmode);</div><div class='hunk'>@@ -30,10 +29,10 @@ static ssize_t show_cidmode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,</div><div class='add'>+static ssize_t set_cidmode(struct class_device *class,</div><div class='ctx'> 			   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct cardstate *cs = dev_get_drvdata(dev);</div><div class='add'>+	struct cardstate *cs = class_get_devdata(class);</div><div class='ctx'> 	long int value;</div><div class='ctx'> 	char *end;</div><div class='ctx'> </div><div class='hunk'>@@ -65,18 +64,24 @@ static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);</div><div class='add'>+static CLASS_DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);</div><div class='ctx'> </div><div class='ctx'> /* free sysfs for device */</div><div class='ctx'> void gigaset_free_dev_sysfs(struct cardstate *cs)</div><div class='ctx'> {</div><div class='add'>+	if (!cs-&gt;class)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	gig_dbg(DEBUG_INIT, "removing sysfs entries");</div><div class='del'>-	device_remove_file(cs-&gt;dev, &amp;dev_attr_cidmode);</div><div class='add'>+	class_device_remove_file(cs-&gt;class, &amp;class_device_attr_cidmode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialize sysfs for device */</div><div class='ctx'> void gigaset_init_dev_sysfs(struct cardstate *cs)</div><div class='ctx'> {</div><div class='add'>+	if (!cs-&gt;class)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	gig_dbg(DEBUG_INIT, "setting up sysfs");</div><div class='del'>-	device_create_file(cs-&gt;dev, &amp;dev_attr_cidmode);</div><div class='add'>+	class_device_create_file(cs-&gt;class, &amp;class_device_attr_cidmode);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c<br/>index d86ab68114b0..6e05d9d4a51a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/usb-gigaset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/gigaset/usb-gigaset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/gigaset/usb-gigaset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/gigaset/usb-gigaset.c</a></div><div class='hunk'>@@ -41,7 +41,6 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");</div><div class='ctx'> #define GIGASET_MINORS     1</div><div class='ctx'> #define GIGASET_MINOR      8</div><div class='ctx'> #define GIGASET_MODULENAME "usb_gigaset"</div><div class='del'>-#define GIGASET_DEVFSNAME  "gig/usb/"</div><div class='ctx'> #define GIGASET_DEVNAME    "ttyGU"</div><div class='ctx'> </div><div class='ctx'> #define IF_WRITEBUF 2000 //FIXME  // WAKEUP_CHARS: 256</div><div class='hunk'>@@ -896,8 +895,7 @@ static int __init usb_gigaset_init(void)</div><div class='ctx'> 	/* allocate memory for our driver state and intialize it */</div><div class='ctx'> 	if ((driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,</div><div class='ctx'> 				       GIGASET_MODULENAME, GIGASET_DEVNAME,</div><div class='del'>-				       GIGASET_DEVFSNAME, &amp;ops,</div><div class='del'>-				       THIS_MODULE)) == NULL)</div><div class='add'>+				       &amp;ops, THIS_MODULE)) == NULL)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate memory for our device state and intialize it */</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c<br/>index 4d64e5cbcdbf..a4beeb46c859 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/b1dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/avm/b1dma.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c<br/>index 5435a6cfb5e7..90e2e6643d19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/b1pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/avm/b1pci.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -98,7 +97,7 @@ static int b1pci_probe(struct capicardparams *p, struct pci_dev *pdev)</div><div class='ctx'> 	b1_reset(card-&gt;port);</div><div class='ctx'> 	b1_getrevision(card);</div><div class='ctx'> 	</div><div class='del'>-	retval = request_irq(card-&gt;irq, b1_interrupt, SA_SHIRQ, card-&gt;name, card);</div><div class='add'>+	retval = request_irq(card-&gt;irq, b1_interrupt, IRQF_SHARED, card-&gt;name, card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "b1pci: unable to get IRQ %d.\n", card-&gt;irq);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='hunk'>@@ -235,7 +234,7 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev)</div><div class='ctx'> 	b1dma_reset(card);</div><div class='ctx'> 	b1_getrevision(card);</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(card-&gt;irq, b1dma_interrupt, SA_SHIRQ, card-&gt;name, card);</div><div class='add'>+	retval = request_irq(card-&gt;irq, b1dma_interrupt, IRQF_SHARED, card-&gt;name, card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "b1pci: unable to get IRQ %d.\n",</div><div class='ctx'> 		       card-&gt;irq);</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c<br/>index 9746cc5ffff8..e479c0aef38d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1pcmcia.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/b1pcmcia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/b1pcmcia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/avm/b1pcmcia.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ static int b1pcmcia_add_card(unsigned int port, unsigned irq,</div><div class='ctx'> 	card-&gt;irq = irq;</div><div class='ctx'> 	card-&gt;cardtype = cardtype;</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(card-&gt;irq, b1_interrupt, 0, card-&gt;name, card);</div><div class='add'>+	retval = request_irq(card-&gt;irq, b1_interrupt, IRQF_SHARED, card-&gt;name, card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "b1pcmcia: unable to get IRQ %d.\n",</div><div class='ctx'> 		       card-&gt;irq);</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c<br/>index f7253b2136ea..6c3d5f5f1f4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/c4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/c4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/c4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/avm/c4.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -1173,7 +1172,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	c4_reset(card);</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(card-&gt;irq, c4_interrupt, SA_SHIRQ, card-&gt;name, card);</div><div class='add'>+	retval = request_irq(card-&gt;irq, c4_interrupt, IRQF_SHARED, card-&gt;name, card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "c4: unable to get IRQ %d.\n",card-&gt;irq);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='head'>diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c<br/>index 2ceec8e8419f..d1e253c94db4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/t1pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/avm/t1pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/avm/t1pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/avm/t1pci.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -104,7 +103,7 @@ static int t1pci_add_card(struct capicardparams *p, struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	b1dma_reset(card);</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(card-&gt;irq, b1dma_interrupt, SA_SHIRQ, card-&gt;name, card);</div><div class='add'>+	retval = request_irq(card-&gt;irq, b1dma_interrupt, IRQF_SHARED, card-&gt;name, card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "t1pci: unable to get IRQ %d.\n", card-&gt;irq);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c<br/>index 8fe4f3f09353..7a74ed35b1bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/capimain.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/capimain.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/capimain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/capimain.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c<br/>index 27204f4b111a..14298b8c835f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/diva_didd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/diva_didd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/diva_didd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/diva_didd.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c<br/>index 6146f7633be5..77155d9f399b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divamnt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divamnt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divamnt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/divamnt.c</a></div><div class='hunk'>@@ -10,14 +10,12 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform.h"</div><div class='hunk'>@@ -178,7 +176,6 @@ static struct file_operations divas_maint_fops = {</div><div class='ctx'> </div><div class='ctx'> static void divas_maint_unregister_chrdev(void)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove(DEVNAME);</div><div class='ctx'> 	unregister_chrdev(major, DEVNAME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +187,6 @@ static int DIVA_INIT_FUNCTION divas_maint_register_chrdev(void)</div><div class='ctx'> 		       DRIVERLNAME);</div><div class='ctx'> 		return (0);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);</div><div class='ctx'> </div><div class='ctx'> 	return (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c<br/>index df715b47e2b4..fff0d89c806b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divasi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divasi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divasi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/divasi.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -19,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "platform.h"</div><div class='hunk'>@@ -145,7 +143,6 @@ static struct file_operations divas_idi_fops = {</div><div class='ctx'> </div><div class='ctx'> static void divas_idi_unregister_chrdev(void)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove(DEVNAME);</div><div class='ctx'> 	unregister_chrdev(major, DEVNAME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +154,6 @@ static int DIVA_INIT_FUNCTION divas_idi_register_chrdev(void)</div><div class='ctx'> 		       DRIVERLNAME);</div><div class='ctx'> 		return (0);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);</div><div class='ctx'> </div><div class='ctx'> 	return (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c<br/>index c9b26e86d183..b7dadba13e82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divasmain.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divasmain.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divasmain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/divasmain.c</a></div><div class='hunk'>@@ -9,12 +9,10 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -488,7 +486,7 @@ void __inline__ outpp(void __iomem *addr, word p)</div><div class='ctx'> int diva_os_register_irq(void *context, byte irq, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int result = request_irq(irq, diva_os_irq_wrapper,</div><div class='del'>-				 SA_INTERRUPT | SA_SHIRQ, name, context);</div><div class='add'>+				 IRQF_DISABLED | IRQF_SHARED, name, context);</div><div class='ctx'> 	return (result);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -678,7 +676,6 @@ static struct file_operations divas_fops = {</div><div class='ctx'> </div><div class='ctx'> static void divas_unregister_chrdev(void)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove(DEVNAME);</div><div class='ctx'> 	unregister_chrdev(major, DEVNAME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -690,7 +687,6 @@ static int DIVA_INIT_FUNCTION divas_register_chrdev(void)</div><div class='ctx'> 		       DRIVERLNAME);</div><div class='ctx'> 		return (0);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);</div><div class='ctx'> </div><div class='ctx'> 	return (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c<br/>index c12efa6f8429..6a4373a4f1e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divasproc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/divasproc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/divasproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/divasproc.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h<br/>index 12b8ff29e976..a66836cf756c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/platform.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hardware/eicon/platform.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hardware/eicon/platform.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hardware/eicon/platform.h</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #define DIVA_BUILD "local"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c<br/>index a98c5e38bbbc..93ff941c48f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/asuscom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/asuscom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/asuscom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/asuscom.c</a></div><div class='hunk'>@@ -297,7 +297,7 @@ Asus_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef __ISAPNP__</div><div class='del'>-static struct isapnp_device_id asus_ids[] __initdata = {</div><div class='add'>+static struct isapnp_device_id asus_ids[] __devinitdata = {</div><div class='ctx'> 	{ ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688),</div><div class='ctx'> 	  ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), </div><div class='ctx'> 	  (unsigned long) "Asus1688 PnP" },</div><div class='hunk'>@@ -313,11 +313,11 @@ static struct isapnp_device_id asus_ids[] __initdata = {</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct isapnp_device_id *ipid __initdata = &amp;asus_ids[0];</div><div class='add'>+static struct isapnp_device_id *ipid __devinitdata = &amp;asus_ids[0];</div><div class='ctx'> static struct pnp_card *pnp_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_asuscom(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int bytecnt;</div><div class='head'>diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c<br/>index 9a8b02557ff9..729e906bdc61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/avm_a1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/avm_a1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/avm_a1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/avm_a1.c</a></div><div class='hunk'>@@ -178,7 +178,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_avm_a1(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	u_char val;</div><div class='head'>diff --git a/drivers/isdn/hisax/avm_a1p.c b/drivers/isdn/hisax/avm_a1p.c<br/>index d643bb32ad09..574e252dfa43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/avm_a1p.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/avm_a1p.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/avm_a1p.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/avm_a1p.c</a></div><div class='hunk'>@@ -255,7 +255,7 @@ setup_avm_a1_pcmcia(struct IsdnCard *card)</div><div class='ctx'> 	cs-&gt;BC_Write_Reg = &amp;WriteHSCX;</div><div class='ctx'> 	cs-&gt;BC_Send_Data = &amp;hscx_fill_fifo;</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;AVM_card_msg;</div><div class='del'>-	cs-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;avm_a1p_interrupt;</div><div class='ctx'> </div><div class='ctx'> 	ISACVersion(cs, "AVM A1 PCMCIA:");</div><div class='head'>diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c<br/>index 4abe5ff10e72..369afd3a3a4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/avm_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/avm_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/avm_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/avm_pci.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -640,7 +639,7 @@ clear_pending_hdlc_ints(struct IsdnCardState *cs)</div><div class='ctx'> }</div><div class='ctx'> #endif  /*  0  */</div><div class='ctx'> </div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> inithdlc(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	cs-&gt;bcs[0].BC_SetStack = setstack_hdlc;</div><div class='hunk'>@@ -728,13 +727,13 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-static struct pci_dev *dev_avm __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_avm __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef __ISAPNP__</div><div class='del'>-static struct pnp_card *pnp_avm_c __initdata = NULL;</div><div class='add'>+static struct pnp_card *pnp_avm_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_avm_pcipnp(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	u_int val, ver;</div><div class='hunk'>@@ -809,7 +808,7 @@ setup_avm_pcipnp(struct IsdnCard *card)</div><div class='ctx'> 		printk(KERN_WARNING "FritzPCI: No PCI card found\n");</div><div class='ctx'> 		return(0);</div><div class='ctx'> 	}</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> #else</div><div class='ctx'> 	printk(KERN_WARNING "FritzPCI: NO_PCI_BIOS\n");</div><div class='ctx'> 	return (0);</div><div class='head'>diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c<br/>index dcb308aeb50c..87a630128a6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/bkm_a4t.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/bkm_a4t.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/bkm_a4t.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/bkm_a4t.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -256,9 +255,9 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_a4t __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_a4t __devinitdata = NULL;</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_bkm_a4t(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='hunk'>@@ -336,7 +335,7 @@ setup_bkm_a4t(struct IsdnCard *card)</div><div class='ctx'> 	cs-&gt;BC_Send_Data = &amp;jade_fill_fifo;</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;BKM_card_msg;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;bkm_interrupt;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 	ISACVersion(cs, "Telekom A4T:");</div><div class='ctx'> 	/* Jade version */</div><div class='ctx'> 	JadeVersion(cs, "Telekom A4T:");</div><div class='head'>diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c<br/>index 5f21b82c8c8d..dae090a9a489 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/bkm_a8.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/bkm_a8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/bkm_a8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/bkm_a8.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -261,7 +260,7 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> sct_alloc_io(u_int adr, u_int len)</div><div class='ctx'> {</div><div class='ctx'> 	if (!request_region(adr, len, "scitel")) {</div><div class='hunk'>@@ -273,16 +272,16 @@ sct_alloc_io(u_int adr, u_int len)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_a8 __initdata = NULL;</div><div class='del'>-static u16  sub_vendor_id __initdata = 0;</div><div class='del'>-static u16  sub_sys_id __initdata = 0;</div><div class='del'>-static u_char pci_bus __initdata = 0;</div><div class='del'>-static u_char pci_device_fn __initdata = 0;</div><div class='del'>-static u_char pci_irq __initdata = 0;</div><div class='add'>+static struct pci_dev *dev_a8 __devinitdata = NULL;</div><div class='add'>+static u16  sub_vendor_id __devinitdata = 0;</div><div class='add'>+static u16  sub_sys_id __devinitdata = 0;</div><div class='add'>+static u_char pci_bus __devinitdata = 0;</div><div class='add'>+static u_char pci_device_fn __devinitdata = 0;</div><div class='add'>+static u_char pci_irq __devinitdata = 0;</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_sct_quadro(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -375,7 +374,7 @@ setup_sct_quadro(struct IsdnCard *card)</div><div class='ctx'> 	pci_ioaddr5 &amp;= PCI_BASE_ADDRESS_IO_MASK;</div><div class='ctx'> 	/* Take over */</div><div class='ctx'> 	cs-&gt;irq = pci_irq;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 	/* pci_ioaddr1 is unique to all subdevices */</div><div class='ctx'> 	/* pci_ioaddr2 is for the fourth subdevice only */</div><div class='ctx'> 	/* pci_ioaddr3 is for the third subdevice only */</div><div class='head'>diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c<br/>index 27332506f9f7..e10350360f2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/config.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -1876,7 +1875,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id hisax_pci_tbl[] __initdata = {</div><div class='add'>+static struct pci_device_id hisax_pci_tbl[] __devinitdata = {</div><div class='ctx'> #ifdef CONFIG_HISAX_FRITZPCI</div><div class='ctx'> 	{PCI_VENDOR_ID_AVM,      PCI_DEVICE_ID_AVM_A1,           PCI_ANY_ID, PCI_ANY_ID},</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c<br/>index b0ff1cc97d7c..e294fa3918f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/diva.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/diva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/diva.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/diva.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='ctx'> #include "hscx.h"</div><div class='hunk'>@@ -888,13 +887,13 @@ Diva_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_diva __initdata = NULL;</div><div class='del'>-static struct pci_dev *dev_diva_u __initdata = NULL;</div><div class='del'>-static struct pci_dev *dev_diva201 __initdata = NULL;</div><div class='del'>-static struct pci_dev *dev_diva202 __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_diva __devinitdata = NULL;</div><div class='add'>+static struct pci_dev *dev_diva_u __devinitdata = NULL;</div><div class='add'>+static struct pci_dev *dev_diva201 __devinitdata = NULL;</div><div class='add'>+static struct pci_dev *dev_diva202 __devinitdata = NULL;</div><div class='ctx'> </div><div class='ctx'> #ifdef __ISAPNP__</div><div class='del'>-static struct isapnp_device_id diva_ids[] __initdata = {</div><div class='add'>+static struct isapnp_device_id diva_ids[] __devinitdata = {</div><div class='ctx'> 	{ ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),</div><div class='ctx'> 	  ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), </div><div class='ctx'> 	  (unsigned long) "Diva picola" },</div><div class='hunk'>@@ -916,12 +915,12 @@ static struct isapnp_device_id diva_ids[] __initdata = {</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct isapnp_device_id *ipid __initdata = &amp;diva_ids[0];</div><div class='add'>+static struct isapnp_device_id *ipid __devinitdata = &amp;diva_ids[0];</div><div class='ctx'> static struct pnp_card *pnp_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_diva(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int bytecnt = 8;</div><div class='hunk'>@@ -1077,7 +1076,7 @@ setup_diva(struct IsdnCard *card)</div><div class='ctx'> 			printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n");</div><div class='ctx'> 			return(0);</div><div class='ctx'> 		}</div><div class='del'>-		cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> #else</div><div class='ctx'> 		printk(KERN_WARNING "Diva: cfgreg 0 and NO_PCI_BIOS\n");</div><div class='ctx'> 		printk(KERN_WARNING "Diva: unable to config DIVA PCI\n");</div><div class='head'>diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c<br/>index f8ca4b323331..3b3e318f6076 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/elsa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/elsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/elsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/elsa.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "arcofi.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -86,8 +85,8 @@ static const char *ITACVer[] =</div><div class='ctx'>  ***                                                                    ***/</div><div class='ctx'> </div><div class='ctx'> /* Config-Register (Read) */</div><div class='del'>-#define ELSA_TIMER_RUN       0x02	/* Bit 1 des Config-Reg     */</div><div class='del'>-#define ELSA_TIMER_RUN_PCC8  0x01	/* Bit 0 des Config-Reg  bei PCC */</div><div class='add'>+#define ELIRQF_TIMER_RUN       0x02	/* Bit 1 des Config-Reg     */</div><div class='add'>+#define ELIRQF_TIMER_RUN_PCC8  0x01	/* Bit 0 des Config-Reg  bei PCC */</div><div class='ctx'> #define ELSA_IRQ_IDX       0x38	/* Bit 3,4,5 des Config-Reg */</div><div class='ctx'> #define ELSA_IRQ_IDX_PCC8  0x30	/* Bit 4,5 des Config-Reg */</div><div class='ctx'> #define ELSA_IRQ_IDX_PC    0x0c	/* Bit 2,3 des Config-Reg */</div><div class='hunk'>@@ -103,7 +102,7 @@ static const char *ITACVer[] =</div><div class='ctx'> #define ELSA_S0_POWER_BAD    0x08	/* Bit 3 S0-Bus Spannung fehlt */</div><div class='ctx'> </div><div class='ctx'> /* Status Flags */</div><div class='del'>-#define ELSA_TIMER_AKTIV 1</div><div class='add'>+#define ELIRQF_TIMER_AKTIV 1</div><div class='ctx'> #define ELSA_BAD_PWR     2</div><div class='ctx'> #define ELSA_ASSIGN      4</div><div class='ctx'> </div><div class='hunk'>@@ -260,10 +259,10 @@ TimerRun(struct IsdnCardState *cs)</div><div class='ctx'> </div><div class='ctx'> 	v = bytein(cs-&gt;hw.elsa.cfg);</div><div class='ctx'> 	if ((cs-&gt;subtyp == ELSA_QS1000) || (cs-&gt;subtyp == ELSA_QS3000))</div><div class='del'>-		return (0 == (v &amp; ELSA_TIMER_RUN));</div><div class='add'>+		return (0 == (v &amp; ELIRQF_TIMER_RUN));</div><div class='ctx'> 	else if (cs-&gt;subtyp == ELSA_PCC8)</div><div class='del'>-		return (v &amp; ELSA_TIMER_RUN_PCC8);</div><div class='del'>-	return (v &amp; ELSA_TIMER_RUN);</div><div class='add'>+		return (v &amp; ELIRQF_TIMER_RUN_PCC8);</div><div class='add'>+	return (v &amp; ELIRQF_TIMER_RUN);</div><div class='ctx'> }</div><div class='ctx'> /*</div><div class='ctx'>  * fast interrupt HSCX stuff goes here</div><div class='hunk'>@@ -335,7 +334,7 @@ elsa_interrupt(int intno, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	writereg(cs-&gt;hw.elsa.ale, cs-&gt;hw.elsa.hscx, HSCX_MASK, 0xFF);</div><div class='ctx'> 	writereg(cs-&gt;hw.elsa.ale, cs-&gt;hw.elsa.hscx, HSCX_MASK + 0x40, 0xFF);</div><div class='ctx'> 	writereg(cs-&gt;hw.elsa.ale, cs-&gt;hw.elsa.isac, ISAC_MASK, 0xFF);</div><div class='del'>-	if (cs-&gt;hw.elsa.status &amp; ELSA_TIMER_AKTIV) {</div><div class='add'>+	if (cs-&gt;hw.elsa.status &amp; ELIRQF_TIMER_AKTIV) {</div><div class='ctx'> 		if (!TimerRun(cs)) {</div><div class='ctx'> 			/* Timer Restart */</div><div class='ctx'> 			byteout(cs-&gt;hw.elsa.timer, 0);</div><div class='hunk'>@@ -686,7 +685,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 				spin_lock_irqsave(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 				cs-&gt;hw.elsa.counter = 0;</div><div class='ctx'> 				cs-&gt;hw.elsa.ctrl_reg |= ELSA_ENA_TIMER_INT;</div><div class='del'>-				cs-&gt;hw.elsa.status |= ELSA_TIMER_AKTIV;</div><div class='add'>+				cs-&gt;hw.elsa.status |= ELIRQF_TIMER_AKTIV;</div><div class='ctx'> 				byteout(cs-&gt;hw.elsa.ctrl, cs-&gt;hw.elsa.ctrl_reg);</div><div class='ctx'> 				byteout(cs-&gt;hw.elsa.timer, 0);</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;cs-&gt;lock, flags);</div><div class='hunk'>@@ -694,7 +693,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 				spin_lock_irqsave(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 				cs-&gt;hw.elsa.ctrl_reg &amp;= ~ELSA_ENA_TIMER_INT;</div><div class='ctx'> 				byteout(cs-&gt;hw.elsa.ctrl, cs-&gt;hw.elsa.ctrl_reg);</div><div class='del'>-				cs-&gt;hw.elsa.status &amp;= ~ELSA_TIMER_AKTIV;</div><div class='add'>+				cs-&gt;hw.elsa.status &amp;= ~ELIRQF_TIMER_AKTIV;</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;cs-&gt;lock, flags);</div><div class='ctx'> 				printk(KERN_INFO "Elsa: %d timer tics in 110 msek\n",</div><div class='ctx'> 				       cs-&gt;hw.elsa.counter);</div><div class='hunk'>@@ -1013,7 +1012,7 @@ setup_elsa(struct IsdnCard *card)</div><div class='ctx'> 		cs-&gt;hw.elsa.timer = 0;</div><div class='ctx'> 		cs-&gt;hw.elsa.trig = 0;</div><div class='ctx'> 		cs-&gt;hw.elsa.ctrl = 0;</div><div class='del'>-		cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "Elsa: %s defined at %#lx IRQ %d\n",</div><div class='ctx'> 		       Elsa_Types[cs-&gt;subtyp],</div><div class='hunk'>@@ -1062,7 +1061,7 @@ setup_elsa(struct IsdnCard *card)</div><div class='ctx'> 		test_and_set_bit(HW_IPAC, &amp;cs-&gt;HW_Flags);</div><div class='ctx'> 		cs-&gt;hw.elsa.timer = 0;</div><div class='ctx'> 		cs-&gt;hw.elsa.trig  = 0;</div><div class='del'>-		cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "Elsa: %s defined at %#lx/0x%x IRQ %d\n",</div><div class='ctx'> 		       Elsa_Types[cs-&gt;subtyp],</div><div class='head'>diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c<br/>index 898ec0916195..0279fb323cb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/elsa_ser.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/elsa_ser.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/elsa_ser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/elsa_ser.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c<br/>index 3341cf155531..76c7d29d1b2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/enternow_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/enternow_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/enternow_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/enternow_pci.c</a></div><div class='hunk'>@@ -60,7 +60,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='ctx'> #include "isdnl1.h"</div><div class='hunk'>@@ -302,10 +301,10 @@ enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_netjet __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_netjet __devinitdata = NULL;</div><div class='ctx'> </div><div class='ctx'> /* called by config.c */</div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_enternow_pci(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int bytecnt;</div><div class='hunk'>@@ -406,7 +405,7 @@ setup_enternow_pci(struct IsdnCard *card)</div><div class='ctx'> 	cs-&gt;BC_Send_Data = &amp;netjet_fill_dma;</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;enpci_card_msg;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;enpci_interrupt;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'>         return (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c<br/>index 60b04c6d9e7d..fe2937267777 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/gazel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/gazel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/gazel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/gazel.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -485,7 +484,7 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n");</div><div class='hunk'>@@ -533,9 +532,9 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_tel __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_tel __devinitdata = NULL;</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> setup_gazelpci(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0;</div><div class='hunk'>@@ -593,7 +592,7 @@ setup_gazelpci(struct IsdnCardState *cs)</div><div class='ctx'> 	cs-&gt;hw.gazel.hscxfifo[0] = cs-&gt;hw.gazel.hscx[0];</div><div class='ctx'> 	cs-&gt;hw.gazel.hscxfifo[1] = cs-&gt;hw.gazel.hscx[1];</div><div class='ctx'> 	cs-&gt;irq = pci_irq;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 	switch (seekcard) {</div><div class='ctx'> 		case PCI_DEVICE_ID_PLX_R685:</div><div class='hunk'>@@ -622,7 +621,7 @@ setup_gazelpci(struct IsdnCardState *cs)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_gazel(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c<br/>index e3866b0a97fd..3a5ca8a68fc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc4s8s_l1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc4s8s_l1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc4s8s_l1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hfc4s8s_l1.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -1553,7 +1552,7 @@ setup_instance(hfc4s8s_hw * hw)</div><div class='ctx'> 	INIT_WORK(&amp;hw-&gt;tqueue, (void *) (void *) hfc4s8s_bh, hw);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq</div><div class='del'>-	    (hw-&gt;irq, hfc4s8s_interrupt, SA_SHIRQ, hw-&gt;card_name, hw)) {</div><div class='add'>+	    (hw-&gt;irq, hfc4s8s_interrupt, IRQF_SHARED, hw-&gt;card_name, hw)) {</div><div class='ctx'> 		printk(KERN_INFO</div><div class='ctx'> 		       "HFC-4S/8S: unable to alloc irq %d, card ignored\n",</div><div class='ctx'> 		       hw-&gt;irq);</div><div class='hunk'>@@ -1704,7 +1703,7 @@ hfc4s8s_module_init(void)</div><div class='ctx'> /* driver module exit :              */</div><div class='ctx'> /* release the HFC-4s/8s hardware    */</div><div class='ctx'> /*************************************/</div><div class='del'>-static void</div><div class='add'>+static void __exit</div><div class='ctx'> hfc4s8s_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;hfc4s8s_driver);</div><div class='head'>diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c<br/>index 637a261c9312..6360e8214720 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_2bds0.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_2bds0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_2bds0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hfc_2bds0.c</a></div><div class='hunk'>@@ -1015,7 +1015,7 @@ hfc_dbusy_timer(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __init</div><div class='add'>+static unsigned int</div><div class='ctx'> *init_send_hfcd(int cnt)</div><div class='ctx'> {</div><div class='ctx'> 	int i, *send;</div><div class='hunk'>@@ -1030,7 +1030,7 @@ static unsigned int __init</div><div class='ctx'> 	return(send);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> init2bds0(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	cs-&gt;setstack_d = setstack_hfcd;</div><div class='head'>diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c<br/>index c964539cc43e..d0520ad30677 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_2bs0.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_2bs0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_2bs0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hfc_2bs0.c</a></div><div class='hunk'>@@ -551,7 +551,7 @@ setstack_hfc(struct PStack *st, struct BCState *bcs)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> init_send(struct BCState *bcs)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -565,7 +565,7 @@ init_send(struct BCState *bcs)</div><div class='ctx'> 		bcs-&gt;hw.hfc.send[i] = 0x1fff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> inithfc(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	init_send(&amp;cs-&gt;bcs[0]);</div><div class='head'>diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c<br/>index 91d25acb5ede..1df60ca9481f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hfc_pci.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "hfc_pci.h"</div><div class='ctx'> #include "isdnl1.h"</div><div class='hunk'>@@ -1582,7 +1581,7 @@ hfcpci_bh(struct IsdnCardState *cs)</div><div class='ctx'> /********************************/</div><div class='ctx'> /* called for card init message */</div><div class='ctx'> /********************************/</div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> inithfcpci(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	cs-&gt;bcs[0].BC_SetStack = setstack_2b;</div><div class='hunk'>@@ -1639,11 +1638,11 @@ hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* this variable is used as card index when more than one cards are present */</div><div class='del'>-static struct pci_dev *dev_hfcpci __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_hfcpci __devinitdata = NULL;</div><div class='ctx'> </div><div class='ctx'> #endif				/* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_hfcpci(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	u_long flags;</div><div class='hunk'>@@ -1688,7 +1687,7 @@ setup_hfcpci(struct IsdnCard *card)</div><div class='ctx'> 				printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");</div><div class='ctx'> 				return (0);</div><div class='ctx'> 			}</div><div class='del'>-			cs-&gt;hw.hfcpci.pci_io = (char *) dev_hfcpci-&gt;resource[ 1].start;</div><div class='add'>+			cs-&gt;hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci-&gt;resource[1].start;</div><div class='ctx'> 			printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk(KERN_WARNING "HFC-PCI: No PCI card found\n");</div><div class='hunk'>@@ -1733,7 +1732,7 @@ setup_hfcpci(struct IsdnCard *card)</div><div class='ctx'> 		cs-&gt;BC_Read_Reg = NULL;</div><div class='ctx'> 		cs-&gt;BC_Write_Reg = NULL;</div><div class='ctx'> 		cs-&gt;irq_func = &amp;hfcpci_interrupt;</div><div class='del'>-		cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 		cs-&gt;hw.hfcpci.timer.function = (void *) hfcpci_Timer;</div><div class='ctx'> 		cs-&gt;hw.hfcpci.timer.data = (long) cs;</div><div class='ctx'> 		init_timer(&amp;cs-&gt;hw.hfcpci.timer);</div><div class='head'>diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c<br/>index 262c44127419..b5e571a52694 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfc_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfc_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hfc_usb.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel_stat.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c<br/>index 86ab1c13f6b1..4e7f472877e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfcscard.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hfcscard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hfcscard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hfcscard.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ hfcs_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef __ISAPNP__</div><div class='del'>-static struct isapnp_device_id hfc_ids[] __initdata = {</div><div class='add'>+static struct isapnp_device_id hfc_ids[] __devinitdata = {</div><div class='ctx'> 	{ ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),</div><div class='ctx'> 	  ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), </div><div class='ctx'> 	  (unsigned long) "Acer P10" },</div><div class='hunk'>@@ -164,11 +164,11 @@ static struct isapnp_device_id hfc_ids[] __initdata = {</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct isapnp_device_id *ipid __initdata = &amp;hfc_ids[0];</div><div class='add'>+static struct isapnp_device_id *ipid __devinitdata = &amp;hfc_ids[0];</div><div class='ctx'> static struct pnp_card *pnp_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_hfcs(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h<br/>index 11fe537e2f6f..75920aa0a3c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hisax.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hisax.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hisax.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hisax.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h<br/>index ba518a7a7fb7..ceafecdb1037 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hisax_debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hisax_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hisax_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hisax_debug.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifndef __HISAX_DEBUG_H__</div><div class='ctx'> #define __HISAX_DEBUG_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HISAX_DEBUG</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c<br/>index dbcca287ee2c..1d7cf3bd6aa3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hisax_fcpcipnp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/hisax_fcpcipnp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/hisax_fcpcipnp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/hisax_fcpcipnp.c</a></div><div class='hunk'>@@ -725,11 +725,11 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	switch (adapter-&gt;type) {</div><div class='ctx'> 	case AVM_FRITZ_PCIV2:</div><div class='del'>-		retval = request_irq(adapter-&gt;irq, fcpci2_irq, SA_SHIRQ, </div><div class='add'>+		retval = request_irq(adapter-&gt;irq, fcpci2_irq, IRQF_SHARED,</div><div class='ctx'> 				     "fcpcipnp", adapter);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AVM_FRITZ_PCI:</div><div class='del'>-		retval = request_irq(adapter-&gt;irq, fcpci_irq, SA_SHIRQ,</div><div class='add'>+		retval = request_irq(adapter-&gt;irq, fcpci_irq, IRQF_SHARED,</div><div class='ctx'> 				     "fcpcipnp", adapter);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AVM_FRITZ_PNP:</div><div class='head'>diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c<br/>index c615752b96aa..2cf7b665609e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/icc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/icc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/icc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/icc.c</a></div><div class='hunk'>@@ -24,10 +24,10 @@</div><div class='ctx'> #define DBUSY_TIMER_VALUE 80</div><div class='ctx'> #define ARCOFI_USE 0</div><div class='ctx'> </div><div class='del'>-static char *ICCVer[] __initdata =</div><div class='add'>+static char *ICCVer[] =</div><div class='ctx'> {"2070 A1/A3", "2070 B1", "2070 B2/B3", "2070 V2.4"};</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> ICCVersion(struct IsdnCardState *cs, char *s)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -613,7 +613,7 @@ dbusy_timer_handler(struct IsdnCardState *cs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> initicc(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	cs-&gt;setstack_d = setstack_icc;</div><div class='hunk'>@@ -646,7 +646,7 @@ initicc(struct IsdnCardState *cs)</div><div class='ctx'> 	ph_command(cs, ICC_CMD_DI);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> clear_pending_icc_ints(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int val, eval;</div><div class='head'>diff --git a/drivers/isdn/hisax/icc.h b/drivers/isdn/hisax/icc.h<br/>index b3bb3d5de532..e7f593967e43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/icc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/icc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/icc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/icc.h</a></div><div class='hunk'>@@ -65,7 +65,7 @@</div><div class='ctx'> #define ICC_IND_AIL    0xE</div><div class='ctx'> #define ICC_IND_DC     0xF</div><div class='ctx'> </div><div class='del'>-extern void __init ICCVersion(struct IsdnCardState *cs, char *s);</div><div class='add'>+extern void ICCVersion(struct IsdnCardState *cs, char *s);</div><div class='ctx'> extern void initicc(struct IsdnCardState *cs);</div><div class='ctx'> extern void icc_interrupt(struct IsdnCardState *cs, u_char val);</div><div class='ctx'> extern void clear_pending_icc_ints(struct IsdnCardState *cs);</div><div class='head'>diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c<br/>index 2e9afae1254a..00afd5538909 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/ipacx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/ipacx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/ipacx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/ipacx.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax_if.h"</div><div class='ctx'> #include "hisax.h"</div><div class='hunk'>@@ -39,8 +38,8 @@ static void dbusy_timer_handler(struct IsdnCardState *cs);</div><div class='ctx'> static void dch_empty_fifo(struct IsdnCardState *cs, int count);</div><div class='ctx'> static void dch_fill_fifo(struct IsdnCardState *cs);</div><div class='ctx'> static inline void dch_int(struct IsdnCardState *cs);</div><div class='del'>-static void __devinit dch_setstack(struct PStack *st, struct IsdnCardState *cs);</div><div class='del'>-static void __devinit dch_init(struct IsdnCardState *cs);</div><div class='add'>+static void dch_setstack(struct PStack *st, struct IsdnCardState *cs);</div><div class='add'>+static void dch_init(struct IsdnCardState *cs);</div><div class='ctx'> static void bch_l2l1(struct PStack *st, int pr, void *arg);</div><div class='ctx'> static void bch_empty_fifo(struct BCState *bcs, int count);</div><div class='ctx'> static void bch_fill_fifo(struct BCState *bcs);</div><div class='hunk'>@@ -49,8 +48,8 @@ static void bch_mode(struct BCState *bcs, int mode, int bc);</div><div class='ctx'> static void bch_close_state(struct BCState *bcs);</div><div class='ctx'> static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs);</div><div class='ctx'> static int bch_setstack(struct PStack *st, struct BCState *bcs);</div><div class='del'>-static void __devinit bch_init(struct IsdnCardState *cs, int hscx);</div><div class='del'>-static void __init clear_pending_ints(struct IsdnCardState *cs);</div><div class='add'>+static void bch_init(struct IsdnCardState *cs, int hscx);</div><div class='add'>+static void clear_pending_ints(struct IsdnCardState *cs);</div><div class='ctx'> </div><div class='ctx'> //----------------------------------------------------------</div><div class='ctx'> // Issue Layer 1 command to chip</div><div class='hunk'>@@ -409,7 +408,7 @@ dch_int(struct IsdnCardState *cs)</div><div class='ctx'> </div><div class='ctx'> //----------------------------------------------------------</div><div class='ctx'> //----------------------------------------------------------</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> dch_setstack(struct PStack *st, struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	st-&gt;l1.l1hw = dch_l2l1;</div><div class='hunk'>@@ -417,7 +416,7 @@ dch_setstack(struct PStack *st, struct IsdnCardState *cs)</div><div class='ctx'> </div><div class='ctx'> //----------------------------------------------------------</div><div class='ctx'> //----------------------------------------------------------</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> dch_init(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "HiSax: IPACX ISDN driver v0.1.0\n");</div><div class='hunk'>@@ -824,7 +823,7 @@ bch_setstack(struct PStack *st, struct BCState *bcs)</div><div class='ctx'> </div><div class='ctx'> //----------------------------------------------------------</div><div class='ctx'> //----------------------------------------------------------</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> bch_init(struct IsdnCardState *cs, int hscx)</div><div class='ctx'> {</div><div class='ctx'> 	cs-&gt;bcs[hscx].BC_SetStack   = bch_setstack;</div><div class='hunk'>@@ -862,7 +861,7 @@ interrupt_ipacx(struct IsdnCardState *cs)</div><div class='ctx'> //----------------------------------------------------------</div><div class='ctx'> // Clears chip interrupt status</div><div class='ctx'> //----------------------------------------------------------</div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> clear_pending_ints(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int ista;</div><div class='hunk'>@@ -884,7 +883,7 @@ clear_pending_ints(struct IsdnCardState *cs)</div><div class='ctx'> // Does chip configuration work</div><div class='ctx'> // Work to do depends on bit mask in part</div><div class='ctx'> //----------------------------------------------------------</div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> init_ipacx(struct IsdnCardState *cs, int part)</div><div class='ctx'> {</div><div class='ctx'> 	if (part &amp;1) {  // initialise chip</div><div class='head'>diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c<br/>index c9917cd2132b..281fa27d9f00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/isdnl3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/isdnl3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/isdnl3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/isdnl3.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isdnl3.h"</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> const char *l3_revision = "$Revision: 2.22.2.3 $";</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c<br/>index 33747afc984d..715a1a8cd694 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/isurf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/isurf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/isurf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/isurf.c</a></div><div class='hunk'>@@ -196,10 +196,10 @@ isurf_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef __ISAPNP__</div><div class='del'>-static struct pnp_card *pnp_c __initdata = NULL;</div><div class='add'>+static struct pnp_card *pnp_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_isurf(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int ver;</div><div class='head'>diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c<br/>index 908a7e144421..39717506c678 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/ix1_micro.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/ix1_micro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/ix1_micro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/ix1_micro.c</a></div><div class='hunk'>@@ -210,7 +210,7 @@ ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef __ISAPNP__</div><div class='del'>-static struct isapnp_device_id itk_ids[] __initdata = {</div><div class='add'>+static struct isapnp_device_id itk_ids[] __devinitdata = {</div><div class='ctx'> 	{ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),</div><div class='ctx'> 	  ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), </div><div class='ctx'> 	  (unsigned long) "ITK micro 2" },</div><div class='hunk'>@@ -220,12 +220,12 @@ static struct isapnp_device_id itk_ids[] __initdata = {</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct isapnp_device_id *ipid __initdata = &amp;itk_ids[0];</div><div class='add'>+static struct isapnp_device_id *ipid __devinitdata = &amp;itk_ids[0];</div><div class='ctx'> static struct pnp_card *pnp_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_ix1micro(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c<br/>index 2659fecc2674..43d61d1bc5b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/jade.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/jade.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/jade.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/jade.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int</div><div class='ctx'> JadeVersion(struct IsdnCardState *cs, char *s)</div><div class='ctx'> {</div><div class='ctx'>     int ver,i;</div><div class='hunk'>@@ -253,7 +253,7 @@ setstack_jade(struct PStack *st, struct BCState *bcs)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> clear_pending_jade_ints(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -279,7 +279,7 @@ clear_pending_jade_ints(struct IsdnCardState *cs)</div><div class='ctx'> 	cs-&gt;BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0xF8);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> initjade(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	cs-&gt;bcs[0].BC_SetStack = setstack_jade;</div><div class='head'>diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c<br/>index e96845cdd4f6..99feae8b9210 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/l3dss1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/l3dss1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/l3dss1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/l3dss1.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include "isdnl3.h"</div><div class='ctx'> #include "l3dss1.h"</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> extern char *HiSax_getrev(const char *revision);</div><div class='ctx'> static const char *dss1_revision = "$Revision: 2.32.2.3 $";</div><div class='head'>diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c<br/>index fe11f226b285..8c82519593a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/mic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/mic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/mic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/mic.c</a></div><div class='hunk'>@@ -189,7 +189,7 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_mic(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int bytecnt;</div><div class='head'>diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c<br/>index 47a47ef0968b..38f648f9b0ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/netjet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/netjet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/netjet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/netjet.c</a></div><div class='hunk'>@@ -909,7 +909,7 @@ setstack_tiger(struct PStack *st, struct BCState *bcs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'>  </div><div class='del'>-void __init</div><div class='add'>+void</div><div class='ctx'> inittiger(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(cs-&gt;bcs[0].hw.tiger.send = kmalloc(NETJET_DMA_TXSIZE * sizeof(unsigned int),</div><div class='head'>diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c<br/>index 68a2159cbd11..489022bdef7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/niccy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/niccy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/niccy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/niccy.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -233,12 +232,12 @@ niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *niccy_dev __initdata = NULL;</div><div class='add'>+static struct pci_dev *niccy_dev __devinitdata = NULL;</div><div class='ctx'> #ifdef __ISAPNP__</div><div class='ctx'> static struct pnp_card *pnp_c __devinitdata = NULL;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_niccy(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='hunk'>@@ -337,7 +336,7 @@ setup_niccy(struct IsdnCard *card)</div><div class='ctx'> 			printk(KERN_WARNING "Niccy: No PCI card found\n");</div><div class='ctx'> 			return(0);</div><div class='ctx'> 		}</div><div class='del'>-		cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 		cs-&gt;hw.niccy.isac = pci_ioaddr + ISAC_PCI_DATA;</div><div class='ctx'> 		cs-&gt;hw.niccy.isac_ale = pci_ioaddr + ISAC_PCI_ADDR;</div><div class='ctx'> 		cs-&gt;hw.niccy.hscx = pci_ioaddr + HSCX_PCI_DATA;</div><div class='head'>diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c<br/>index a7d3cd3f36fd..80025fd890f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/nj_s.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/nj_s.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/nj_s.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/nj_s.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='hunk'>@@ -149,9 +148,9 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_netjet __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_netjet __devinitdata = NULL;</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_netjet_s(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int bytecnt,cfg;</div><div class='hunk'>@@ -272,7 +271,7 @@ setup_netjet_s(struct IsdnCard *card)</div><div class='ctx'> 	setup_isac(cs);</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;NETjet_S_card_msg;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;netjet_s_interrupt;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 	ISACVersion(cs, "NETjet-S:");</div><div class='ctx'> 	return (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c<br/>index 1ae7cac98a87..37497162d539 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/nj_u.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/nj_u.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/nj_u.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/nj_u.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "icc.h"</div><div class='hunk'>@@ -129,9 +128,9 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_netjet __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_netjet __devinitdata = NULL;</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_netjet_u(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	int bytecnt;</div><div class='hunk'>@@ -238,7 +237,7 @@ setup_netjet_u(struct IsdnCard *card)</div><div class='ctx'> 	cs-&gt;BC_Send_Data = &amp;netjet_fill_dma;</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;NETjet_U_card_msg;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;netjet_u_interrupt;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 	ICCVersion(cs, "NETspider-U:");</div><div class='ctx'> 	return (1);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c<br/>index abecabf8c271..aacbf0d14b64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/q931.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/q931.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/q931.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/q931.c</a></div><div class='hunk'>@@ -1402,12 +1402,12 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir)</div><div class='ctx'> 			}</div><div class='ctx'> 			/* No, locate it in the table */</div><div class='ctx'> 			if (cset == 0) {</div><div class='del'>-				for (i = 0; i &lt; IESIZE; i++)</div><div class='add'>+				for (i = 0; i &lt; IESIZE_NI1; i++)</div><div class='ctx'> 					if (*buf == ielist_ni1[i].nr)</div><div class='ctx'> 						break;</div><div class='ctx'> </div><div class='ctx'> 				/* When not found, give appropriate msg */</div><div class='del'>-				if (i != IESIZE) {</div><div class='add'>+				if (i != IESIZE_NI1) {</div><div class='ctx'> 					dp += sprintf(dp, "  %s\n", ielist_ni1[i].descr);</div><div class='ctx'> 					dp += ielist_ni1[i].f(dp, buf);</div><div class='ctx'> 				} else</div><div class='head'>diff --git a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c<br/>index 7b63085ea6e5..e76042d323ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/s0box.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/s0box.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/s0box.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/s0box.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ S0Box_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_s0box(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c<br/>index 821776e1561a..d943d365890b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/saphir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/saphir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/saphir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/saphir.c</a></div><div class='hunk'>@@ -241,7 +241,7 @@ saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_saphir(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c<br/>index 8c044a6a7fe3..8d8e8a299892 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/sedlbauer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/sedlbauer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/sedlbauer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/sedlbauer.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='ctx'> #include "ipac.h"</div><div class='hunk'>@@ -633,7 +632,7 @@ setup_sedlbauer(struct IsdnCard *card)</div><div class='ctx'> 			printk(KERN_WARNING "Sedlbauer: No PCI card found\n");</div><div class='ctx'> 			return(0);</div><div class='ctx'> 		}</div><div class='del'>-		cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 		cs-&gt;hw.sedl.bus = SEDL_BUS_PCI;</div><div class='ctx'> 		sub_vendor_id = dev_sedl-&gt;subsystem_vendor;</div><div class='ctx'> 		sub_id = dev_sedl-&gt;subsystem_device;</div><div class='hunk'>@@ -810,7 +809,7 @@ ready:</div><div class='ctx'> 				cs-&gt;hw.sedl.hscx = cs-&gt;hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_HSCX;</div><div class='ctx'> 				cs-&gt;hw.sedl.reset_on = cs-&gt;hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET;</div><div class='ctx'> 				cs-&gt;hw.sedl.reset_off = cs-&gt;hw.sedl.cfg_reg + SEDL_HSCX_PCMCIA_RESET;</div><div class='del'>-				cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+				cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				cs-&gt;hw.sedl.adr = cs-&gt;hw.sedl.cfg_reg + SEDL_HSCX_ISA_ADR;</div><div class='ctx'> 				cs-&gt;hw.sedl.isac = cs-&gt;hw.sedl.cfg_reg + SEDL_HSCX_ISA_ISAC;</div><div class='head'>diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c<br/>index 9bb18f3f7829..f9c14a2970bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/sedlbauer_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/sedlbauer_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/sedlbauer_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/sedlbauer_cs.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ static int sedlbauer_probe(struct pcmcia_device *link)</div><div class='ctx'>     link-&gt;priv = local;</div><div class='ctx'> </div><div class='ctx'>     /* Interrupt setup */</div><div class='del'>-    link-&gt;irq.Attributes = IRQ_TYPE_EXCLUSIVE;</div><div class='add'>+    link-&gt;irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;</div><div class='ctx'>     link-&gt;irq.IRQInfo1 = IRQ_LEVEL_ID;</div><div class='ctx'>     link-&gt;irq.Handler = NULL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c<br/>index cdf35dc564c4..a49b694eb730 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/sportster.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/sportster.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/sportster.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/sportster.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ Sportster_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> get_io_range(struct IsdnCardState *cs)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, adr;</div><div class='hunk'>@@ -209,7 +209,7 @@ get_io_range(struct IsdnCardState *cs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_sportster(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h<br/>index 9ffaae7c657a..04416bad611d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/st5481.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/st5481.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/st5481.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/st5481.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #ifndef _ST5481_H_</div><div class='ctx'> #define _ST5481_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> // USB IDs, the Product Id is in the range 0x4810-0x481F</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c<br/>index 99cb0f3d59a1..2716aa5c60f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/st5481_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/st5481_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/st5481_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/st5481_init.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * clean up debug</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c<br/>index a2b1816af37a..e94dc6f5bd62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/teleint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/teleint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/teleint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/teleint.c</a></div><div class='hunk'>@@ -261,7 +261,7 @@ TeleInt_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_TeleInt(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='head'>diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c<br/>index 2b7df8f98233..f94af0930a17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/teles0.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/teles0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/teles0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/teles0.c</a></div><div class='hunk'>@@ -265,7 +265,7 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_teles0(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	u_char val;</div><div class='head'>diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c<br/>index a3eaf4d65707..5cb712437da4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/teles3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/teles3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/teles3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/teles3.c</a></div><div class='hunk'>@@ -369,6 +369,7 @@ setup_teles3(struct IsdnCard *card)</div><div class='ctx'> 			       cs-&gt;hw.teles3.hscx[1] + 96);</div><div class='ctx'> 			return (0);</div><div class='ctx'> 		}</div><div class='add'>+		cs-&gt;irq_flags |= IRQF_SHARED; /* cardbus can share */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (cs-&gt;hw.teles3.cfg_reg) {</div><div class='ctx'> 			if (cs-&gt;typ == ISDN_CTYPE_COMPAQ_ISA) {</div><div class='head'>diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c<br/>index e2bb4fd8e25e..dca446865f24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/telespci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/telespci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/telespci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/telespci.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "isac.h"</div><div class='ctx'> #include "hscx.h"</div><div class='hunk'>@@ -285,9 +284,9 @@ TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> 	return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_tel __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_tel __devinitdata = NULL;</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='add'>+int __devinit</div><div class='ctx'> setup_telespci(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='hunk'>@@ -311,8 +310,9 @@ setup_telespci(struct IsdnCard *card)</div><div class='ctx'> 		}</div><div class='ctx'> 		cs-&gt;hw.teles0.membase = ioremap(pci_resource_start(dev_tel, 0),</div><div class='ctx'> 			PAGE_SIZE);</div><div class='del'>-		printk(KERN_INFO "Found: Zoran, base-address: 0x%lx, irq: 0x%x\n",</div><div class='del'>-			pci_resource_start(dev_tel, 0), dev_tel-&gt;irq);</div><div class='add'>+		printk(KERN_INFO "Found: Zoran, base-address: 0x%llx, irq: 0x%x\n",</div><div class='add'>+			(unsigned long long)pci_resource_start(dev_tel, 0),</div><div class='add'>+			dev_tel-&gt;irq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_WARNING "TelesPCI: No PCI card found\n");</div><div class='ctx'> 		return(0);</div><div class='hunk'>@@ -347,7 +347,7 @@ setup_telespci(struct IsdnCard *card)</div><div class='ctx'> 	cs-&gt;BC_Send_Data = &amp;hscx_fill_fifo;</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;TelesPCI_card_msg;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;telespci_interrupt;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 	ISACVersion(cs, "TelesPCI:");</div><div class='ctx'> 	if (HscxVersion(cs, "TelesPCI:")) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='head'>diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c<br/>index 0352ee5f706c..0595293b8659 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/w6692.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hisax/w6692.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hisax/w6692.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hisax/w6692.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "hisax.h"</div><div class='ctx'> #include "w6692.h"</div><div class='hunk'>@@ -45,11 +44,11 @@ static const char *w6692_revision = "$Revision: 1.18.2.4 $";</div><div class='ctx'> </div><div class='ctx'> #define DBUSY_TIMER_VALUE 80</div><div class='ctx'> </div><div class='del'>-static char *W6692Ver[] __initdata =</div><div class='add'>+static char *W6692Ver[] =</div><div class='ctx'> {"W6692 V00", "W6692 V01", "W6692 V10",</div><div class='ctx'>  "W6692 V11"};</div><div class='ctx'> </div><div class='del'>-static void __init</div><div class='add'>+static void</div><div class='ctx'> W6692Version(struct IsdnCardState *cs, char *s)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -898,7 +897,7 @@ static void resetW6692(struct IsdnCardState *cs)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init initW6692(struct IsdnCardState *cs, int part)</div><div class='add'>+static void initW6692(struct IsdnCardState *cs, int part)</div><div class='ctx'> {</div><div class='ctx'> 	if (part &amp; 1) {</div><div class='ctx'> 		cs-&gt;setstack_d = setstack_W6692;</div><div class='hunk'>@@ -993,9 +992,9 @@ w6692_card_msg(struct IsdnCardState *cs, int mt, void *arg)</div><div class='ctx'> </div><div class='ctx'> static int id_idx ;</div><div class='ctx'> </div><div class='del'>-static struct pci_dev *dev_w6692 __initdata = NULL;</div><div class='add'>+static struct pci_dev *dev_w6692 __devinitdata = NULL;</div><div class='ctx'> </div><div class='del'>-int __init </div><div class='add'>+int __devinit</div><div class='ctx'> setup_w6692(struct IsdnCard *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct IsdnCardState *cs = card-&gt;cs;</div><div class='hunk'>@@ -1081,7 +1080,7 @@ setup_w6692(struct IsdnCard *card)</div><div class='ctx'> 	cs-&gt;BC_Send_Data = &amp;W6692B_fill_fifo;</div><div class='ctx'> 	cs-&gt;cardmsg = &amp;w6692_card_msg;</div><div class='ctx'> 	cs-&gt;irq_func = &amp;W6692_interrupt;</div><div class='del'>-	cs-&gt;irq_flags |= SA_SHIRQ;</div><div class='add'>+	cs-&gt;irq_flags |= IRQF_SHARED;</div><div class='ctx'> 	W6692Version(cs, "W6692:");</div><div class='ctx'> 	printk(KERN_INFO "W6692 ISTA=0x%X\n", ReadW6692(cs, W_ISTA));</div><div class='ctx'> 	printk(KERN_INFO "W6692 IMASK=0x%X\n", ReadW6692(cs, W_IMASK));</div><div class='head'>diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c<br/>index 48d134be9908..73afebdf80bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/boardergo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/boardergo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/boardergo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hysdn/boardergo.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -436,7 +435,7 @@ ergo_inithardware(hysdn_card * card)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ergo_stopcard(card);	/* disable interrupts */</div><div class='del'>-	if (request_irq(card-&gt;irq, ergo_interrupt, SA_SHIRQ, "HYSDN", card)) {</div><div class='add'>+	if (request_irq(card-&gt;irq, ergo_interrupt, IRQF_SHARED, "HYSDN", card)) {</div><div class='ctx'> 		ergo_releasehardware(card); /* return the acquired hardware */</div><div class='ctx'> 		return (-1);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h<br/>index 3a9b29b38bc4..461e831592dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_defs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/hysdn_defs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_defs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hysdn/hysdn_defs.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #ifndef HYSDN_DEFS_H</div><div class='ctx'> #define HYSDN_DEFS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/hysdn_if.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c<br/>index b75ac5af236a..b702ed27252b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/hysdn_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hysdn/hysdn_init.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='head'>diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c<br/>index 133032920ff8..1c0d54ac12ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_sched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/hysdn/hysdn_sched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/hysdn/hysdn_sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/hysdn/hysdn_sched.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c<br/>index 22759c01746a..c3d79eef9e32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/i4l/isdn_common.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='hunk'>@@ -340,6 +339,16 @@ isdn_command(isdn_ctrl *cmd)</div><div class='ctx'> 		printk(KERN_WARNING "isdn_command command(%x) driver -1\n", cmd-&gt;command);</div><div class='ctx'> 		return(1);</div><div class='ctx'> 	}</div><div class='add'>+	if (!dev-&gt;drv[cmd-&gt;driver]) {</div><div class='add'>+		printk(KERN_WARNING "isdn_command command(%x) dev-&gt;drv[%d] NULL\n",</div><div class='add'>+			cmd-&gt;command, cmd-&gt;driver);</div><div class='add'>+		return(1);</div><div class='add'>+	}</div><div class='add'>+	if (!dev-&gt;drv[cmd-&gt;driver]-&gt;interface) {</div><div class='add'>+		printk(KERN_WARNING "isdn_command command(%x) dev-&gt;drv[%d]-&gt;interface NULL\n",</div><div class='add'>+			cmd-&gt;command, cmd-&gt;driver);</div><div class='add'>+		return(1);</div><div class='add'>+	}</div><div class='ctx'> 	if (cmd-&gt;command == ISDN_CMD_SETL2) {</div><div class='ctx'> 		int idx = isdn_dc2minor(cmd-&gt;driver, cmd-&gt;arg &amp; 255);</div><div class='ctx'> 		unsigned long l2prot = (cmd-&gt;arg &gt;&gt; 8) &amp; 255;</div><div class='hunk'>@@ -933,7 +942,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)</div><div class='ctx'> 			count_put = count_pull;</div><div class='ctx'> 			if(count_put &gt; 1)</div><div class='ctx'> 				tty_insert_flip_string(tty, skb-&gt;data, count_put - 1);</div><div class='del'>-			last = skb-&gt;data[count_put] - 1;</div><div class='add'>+			last = skb-&gt;data[count_put - 1];</div><div class='ctx'> 			len -= count_put;</div><div class='ctx'> #ifdef CONFIG_ISDN_AUDIO</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1050,7 +1059,7 @@ isdn_info_update(void)</div><div class='ctx'> static ssize_t</div><div class='ctx'> isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)</div><div class='ctx'> {</div><div class='del'>-	uint minor = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	uint minor = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> 	int drvidx;</div><div class='ctx'> 	int chidx;</div><div class='hunk'>@@ -1154,7 +1163,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)</div><div class='ctx'> static ssize_t</div><div class='ctx'> isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)</div><div class='ctx'> {</div><div class='del'>-	uint minor = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	uint minor = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	int drvidx;</div><div class='ctx'> 	int chidx;</div><div class='ctx'> 	int retval;</div><div class='hunk'>@@ -1177,9 +1186,8 @@ isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		chidx = isdn_minor2chan(minor);</div><div class='del'>-		while (isdn_writebuf_stub(drvidx, chidx, buf, count) != count)</div><div class='add'>+		while ((retval = isdn_writebuf_stub(drvidx, chidx, buf, count)) == 0)</div><div class='ctx'> 			interruptible_sleep_on(&amp;dev-&gt;drv[drvidx]-&gt;snd_waitq[chidx]);</div><div class='del'>-		retval = count;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (minor &lt;= ISDN_MINOR_CTRLMAX) {</div><div class='hunk'>@@ -1217,7 +1225,7 @@ static unsigned int</div><div class='ctx'> isdn_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='del'>-	unsigned int minor = MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev);</div><div class='add'>+	unsigned int minor = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='ctx'> 	int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='hunk'>@@ -1258,7 +1266,7 @@ isdn_poll(struct file *file, poll_table * wait)</div><div class='ctx'> static int</div><div class='ctx'> isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)</div><div class='ctx'> {</div><div class='del'>-	uint minor = MINOR(inode-&gt;i_rdev);</div><div class='add'>+	uint minor = iminor(inode);</div><div class='ctx'> 	isdn_ctrl c;</div><div class='ctx'> 	int drvidx;</div><div class='ctx'> 	int chidx;</div><div class='hunk'>@@ -1709,7 +1717,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)</div><div class='ctx'> static int</div><div class='ctx'> isdn_open(struct inode *ino, struct file *filep)</div><div class='ctx'> {</div><div class='del'>-	uint minor = MINOR(ino-&gt;i_rdev);</div><div class='add'>+	uint minor = iminor(ino);</div><div class='ctx'> 	int drvidx;</div><div class='ctx'> 	int chidx;</div><div class='ctx'> 	int retval = -ENODEV;</div><div class='hunk'>@@ -1771,7 +1779,7 @@ isdn_open(struct inode *ino, struct file *filep)</div><div class='ctx'> static int</div><div class='ctx'> isdn_close(struct inode *ino, struct file *filep)</div><div class='ctx'> {</div><div class='del'>-	uint minor = MINOR(ino-&gt;i_rdev);</div><div class='add'>+	uint minor = iminor(ino);</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	if (minor == ISDN_MINOR_STATUS) {</div><div class='hunk'>@@ -1904,6 +1912,11 @@ isdn_free_channel(int di, int ch, int usage)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if ((di &lt; 0) || (ch &lt; 0)) {</div><div class='add'>+		printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n",</div><div class='add'>+			__FUNCTION__, di, ch);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	for (i = 0; i &lt; ISDN_MAX_CHANNELS; i++)</div><div class='ctx'> 		if (((!usage) || ((dev-&gt;usage[i] &amp; ISDN_USAGE_MASK) == usage)) &amp;&amp;</div><div class='ctx'> 		    (dev-&gt;drvmap[i] == di) &amp;&amp;</div><div class='hunk'>@@ -1919,7 +1932,8 @@ isdn_free_channel(int di, int ch, int usage)</div><div class='ctx'> 			dev-&gt;v110[i] = NULL;</div><div class='ctx'> // 20.10.99 JIM, try to reinitialize v110 !</div><div class='ctx'> 			isdn_info_update();</div><div class='del'>-			skb_queue_purge(&amp;dev-&gt;drv[di]-&gt;rpqueue[ch]);</div><div class='add'>+			if (dev-&gt;drv[di])</div><div class='add'>+				skb_queue_purge(&amp;dev-&gt;drv[di]-&gt;rpqueue[ch]);</div><div class='ctx'> 		}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1951,9 +1965,10 @@ isdn_writebuf_stub(int drvidx, int chan, const u_char __user * buf, int len)</div><div class='ctx'> 	struct sk_buff *skb = alloc_skb(hl + len, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb)</div><div class='del'>-		return 0;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	skb_reserve(skb, hl);</div><div class='del'>-	copy_from_user(skb_put(skb, len), buf, len);</div><div class='add'>+	if (copy_from_user(skb_put(skb, len), buf, len))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	ret = dev-&gt;drv[drvidx]-&gt;interface-&gt;writebuf_skb(drvidx, chan, 1, skb);</div><div class='ctx'> 	if (ret &lt;= 0)</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c<br/>index 96c115e13389..43da8ae1b2ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_net.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/i4l/isdn_net.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *           http://i4l.zabbadoz.net/i4l/cisco-hdlc.txt</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/isdn.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/dst.h&gt;</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c<br/>index 918742271c79..119412d6bd15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_ppp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_ppp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_ppp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/i4l/isdn_ppp.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/isdn.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/ppp-comp.h&gt;</div><div class='hunk'>@@ -668,7 +667,7 @@ isdn_ppp_poll(struct file *file, poll_table * wait)</div><div class='ctx'> </div><div class='ctx'> 	if (is-&gt;debug &amp; 0x2)</div><div class='ctx'> 		printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n",</div><div class='del'>-				MINOR(file-&gt;f_dentry-&gt;d_inode-&gt;i_rdev));</div><div class='add'>+				iminor(file-&gt;f_dentry-&gt;d_inode));</div><div class='ctx'> </div><div class='ctx'> 	/* just registers wait_queue hook. This doesn't really wait. */</div><div class='ctx'> 	poll_wait(file, &amp;is-&gt;wq, wait);</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c<br/>index 2ac90242d263..9ab66e8960d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/i4l/isdn_tty.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef ISDN_TTY_STAT_DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/isdn.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include "isdn_common.h"</div><div class='hunk'>@@ -82,7 +81,7 @@ isdn_tty_try_read(modem_info * info, struct sk_buff *skb)</div><div class='ctx'> 						int l = skb-&gt;len;</div><div class='ctx'> 						unsigned char *dp = skb-&gt;data;</div><div class='ctx'> 						while (--l) {</div><div class='del'>-							if (*skb-&gt;data == DLE)</div><div class='add'>+							if (*dp == DLE)</div><div class='ctx'> 								tty_insert_flip_char(tty, DLE, 0);</div><div class='ctx'> 							tty_insert_flip_char(tty, *dp++, 0);</div><div class='ctx'> 						}</div><div class='hunk'>@@ -1890,14 +1889,13 @@ isdn_tty_modem_init(void)</div><div class='ctx'> 	if (!m-&gt;tty_modem)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;name = "ttyI";</div><div class='del'>-	m-&gt;tty_modem-&gt;devfs_name = "isdn/ttyI";</div><div class='ctx'> 	m-&gt;tty_modem-&gt;major = ISDN_TTY_MAJOR;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;minor_start = 0;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-	m-&gt;tty_modem-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	m-&gt;tty_modem-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	m-&gt;tty_modem-&gt;driver_name = "isdn_tty";</div><div class='ctx'> 	tty_set_operations(m-&gt;tty_modem, &amp;modem_ops);</div><div class='ctx'> 	retval = tty_register_driver(m-&gt;tty_modem);</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_tty.h b/drivers/isdn/i4l/isdn_tty.h<br/>index 9f0fa9501f4d..692c74d6b749 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_tty.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_tty.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_tty.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/i4l/isdn_tty.h</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DLE 0x10</div><div class='ctx'> #define ETX 0x03</div><div class='head'>diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c<br/>index 743ac4077f35..8b3efc243161 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_x25iface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/i4l/isdn_x25iface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/i4l/isdn_x25iface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/i4l/isdn_x25iface.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb</div><div class='ctx'>  */</div><div class='ctx'> static int isdn_x25iface_connect_ind(struct concap_proto *cprot)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff * skb = dev_alloc_skb(1);</div><div class='add'>+	struct sk_buff * skb;</div><div class='ctx'> 	enum wan_states *state_p </div><div class='ctx'> 	  = &amp;( ( (ix25_pdata_t*) (cprot-&gt;proto_data) ) -&gt; state);</div><div class='ctx'> 	IX25DEBUG( "isdn_x25iface_connect_ind %s \n"</div><div class='hunk'>@@ -220,6 +220,8 @@ static int isdn_x25iface_connect_ind(struct concap_proto *cprot)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	*state_p = WAN_CONNECTED;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(1);</div><div class='ctx'> 	if( skb ){</div><div class='ctx'> 		*( skb_put(skb, 1) ) = 0x01;</div><div class='ctx'> 		skb-&gt;protocol = x25_type_trans(skb, cprot-&gt;net_dev);</div><div class='head'>diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c<br/>index a67d31af797a..fabbd461603e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/isdnloop/isdnloop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/isdnloop/isdnloop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/isdnloop/isdnloop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/isdnloop/isdnloop.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c<br/>index 62b7acfad8a4..a627e68023f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/sc/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/sc/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/sc/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/sc/init.c</a></div><div class='hunk'>@@ -342,7 +342,7 @@ static int __init sc_init(void)</div><div class='ctx'> 		 */</div><div class='ctx'> 		sc_adapter[cinst]-&gt;interrupt = irq[b];</div><div class='ctx'> 		if (request_irq(sc_adapter[cinst]-&gt;interrupt, interrupt_handler,</div><div class='del'>-				SA_INTERRUPT, interface-&gt;id, NULL))</div><div class='add'>+				IRQF_DISABLED, interface-&gt;id, NULL))</div><div class='ctx'> 		{</div><div class='ctx'> 			kfree(sc_adapter[cinst]-&gt;channel);</div><div class='ctx'> 			indicate_status(cinst, ISDN_STAT_UNLOAD, 0, NULL);	/* Fix me */</div><div class='head'>diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c<br/>index f4f71226a078..57c4ab96d136 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/isdn/sc/ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/isdn/sc/ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/isdn/sc/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/isdn/sc/ioctl.c</a></div><div class='hunk'>@@ -97,6 +97,7 @@ int sc_ioctl(int card, scs_ioctl *data)</div><div class='ctx'> </div><div class='ctx'> 	case SCIOCSTART:</div><div class='ctx'> 	{</div><div class='add'>+		kfree(rcvmsg);</div><div class='ctx'> 		pr_debug("%s: SCIOSTART: ioctl received\n",</div><div class='ctx'> 				sc_adapter[card]-&gt;devicename);</div><div class='ctx'> 		if(sc_adapter[card]-&gt;EngineUp) {</div><div class='head'>diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig<br/>index 626506234b76..9c39b98d5a5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/Kconfig</a></div><div class='hunk'>@@ -63,6 +63,19 @@ config LEDS_S3C24XX</div><div class='ctx'> 	  This option enables support for LEDs connected to GPIO lines</div><div class='ctx'> 	  on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.</div><div class='ctx'> </div><div class='add'>+config LEDS_AMS_DELTA</div><div class='add'>+	tristate "LED Support for the Amstrad Delta (E3)"</div><div class='add'>+	depends LEDS_CLASS &amp;&amp; MACH_AMS_DELTA</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the LEDs on Amstrad Delta (E3).</div><div class='add'>+</div><div class='add'>+config LEDS_NET48XX</div><div class='add'>+	tristate "LED Support for Soekris net48xx series Error LED"</div><div class='add'>+	depends on LEDS_CLASS &amp;&amp; SCx200_GPIO</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for the Soekris net4801 and net4826 error</div><div class='add'>+	  LED.</div><div class='add'>+</div><div class='ctx'> comment "LED Triggers"</div><div class='ctx'> </div><div class='ctx'> config LEDS_TRIGGERS</div><div class='hunk'>@@ -87,5 +100,14 @@ config LEDS_TRIGGER_IDE_DISK</div><div class='ctx'> 	  This allows LEDs to be controlled by IDE disk activity.</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config LEDS_TRIGGER_HEARTBEAT</div><div class='add'>+	tristate "LED Heartbeat Trigger"</div><div class='add'>+	depends LEDS_TRIGGERS</div><div class='add'>+	help</div><div class='add'>+	  This allows LEDs to be controlled by a CPU load average.</div><div class='add'>+	  The flash frequency is a hyperbolic function of the 1-minute</div><div class='add'>+	  load average.</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile<br/>index 40f042633bf5..6aa2aed7539d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/Makefile</a></div><div class='hunk'>@@ -11,7 +11,10 @@ obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o</div><div class='ctx'> obj-$(CONFIG_LEDS_IXP4XX)		+= leds-ixp4xx-gpio.o</div><div class='ctx'> obj-$(CONFIG_LEDS_TOSA)			+= leds-tosa.o</div><div class='ctx'> obj-$(CONFIG_LEDS_S3C24XX)		+= leds-s3c24xx.o</div><div class='add'>+obj-$(CONFIG_LEDS_AMS_DELTA)		+= leds-ams-delta.o</div><div class='add'>+obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o</div><div class='ctx'> </div><div class='ctx'> # LED Triggers</div><div class='ctx'> obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o</div><div class='ctx'> obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o</div><div class='add'>+obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o</div><div class='head'>diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c<br/>index c75d0ef1609c..d424b4452028 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/led-class.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/led-class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/led-class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/led-class.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c<br/>index fe6541326c71..9b015f9af351 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/led-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/led-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/led-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/led-core.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='ctx'> #include "leds.h"</div><div class='ctx'> </div><div class='del'>-rwlock_t leds_list_lock = RW_LOCK_UNLOCKED;</div><div class='add'>+DEFINE_RWLOCK(leds_list_lock);</div><div class='ctx'> LIST_HEAD(leds_list);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(leds_list);</div><div class='head'>diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c<br/>index 5e2cd8be1191..47f0ff196328 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/led-triggers.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/led-triggers.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/led-triggers.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/led-triggers.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -26,7 +25,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Nests outside led_cdev-&gt;trigger_lock</div><div class='ctx'>  */</div><div class='del'>-static rwlock_t triggers_list_lock = RW_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_RWLOCK(triggers_list_lock);</div><div class='ctx'> static LIST_HEAD(trigger_list);</div><div class='ctx'> </div><div class='ctx'> ssize_t led_trigger_store(struct class_device *dev, const char *buf,</div><div class='head'>diff --git a/drivers/leds/leds-ams-delta.c b/drivers/leds/leds-ams-delta.c<br/>new file mode 100644<br/>index 000000000000..e9f06116c4d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-ams-delta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-ams-delta.c</a></div><div class='hunk'>@@ -0,0 +1,162 @@</div><div class='add'>+/*</div><div class='add'>+ * LEDs driver for Amstrad Delta (E3)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Jonathan McDowell &lt;noodles@earth.li&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;asm/arch/board-ams-delta.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Our context</div><div class='add'>+ */</div><div class='add'>+struct ams_delta_led {</div><div class='add'>+	struct led_classdev	cdev;</div><div class='add'>+	u8			bitmask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ams_delta_led_set(struct led_classdev *led_cdev,</div><div class='add'>+		enum led_brightness value)</div><div class='add'>+{</div><div class='add'>+	struct ams_delta_led *led_dev =</div><div class='add'>+		container_of(led_cdev, struct ams_delta_led, cdev);</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		ams_delta_latch1_write(led_dev-&gt;bitmask, led_dev-&gt;bitmask);</div><div class='add'>+	else</div><div class='add'>+		ams_delta_latch1_write(led_dev-&gt;bitmask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ams_delta_led ams_delta_leds[] = {</div><div class='add'>+	{</div><div class='add'>+		.cdev		= {</div><div class='add'>+			.name		= "ams-delta:camera",</div><div class='add'>+			.brightness_set = ams_delta_led_set,</div><div class='add'>+		},</div><div class='add'>+		.bitmask	= AMS_DELTA_LATCH1_LED_CAMERA,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cdev		= {</div><div class='add'>+			.name		= "ams-delta:advert",</div><div class='add'>+			.brightness_set = ams_delta_led_set,</div><div class='add'>+		},</div><div class='add'>+		.bitmask	= AMS_DELTA_LATCH1_LED_ADVERT,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cdev		= {</div><div class='add'>+			.name		= "ams-delta:email",</div><div class='add'>+			.brightness_set = ams_delta_led_set,</div><div class='add'>+		},</div><div class='add'>+		.bitmask	= AMS_DELTA_LATCH1_LED_EMAIL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cdev		= {</div><div class='add'>+			.name		= "ams-delta:handsfree",</div><div class='add'>+			.brightness_set = ams_delta_led_set,</div><div class='add'>+		},</div><div class='add'>+		.bitmask	= AMS_DELTA_LATCH1_LED_HANDSFREE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cdev		= {</div><div class='add'>+			.name		= "ams-delta:voicemail",</div><div class='add'>+			.brightness_set = ams_delta_led_set,</div><div class='add'>+		},</div><div class='add'>+		.bitmask	= AMS_DELTA_LATCH1_LED_VOICEMAIL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cdev		= {</div><div class='add'>+			.name		= "ams-delta:voice",</div><div class='add'>+			.brightness_set = ams_delta_led_set,</div><div class='add'>+		},</div><div class='add'>+		.bitmask	= AMS_DELTA_LATCH1_LED_VOICE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int ams_delta_led_suspend(struct platform_device *dev,</div><div class='add'>+		pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ams_delta_leds); i++)</div><div class='add'>+		led_classdev_suspend(&amp;ams_delta_leds[i].cdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ams_delta_led_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ams_delta_leds); i++)</div><div class='add'>+		led_classdev_resume(&amp;ams_delta_leds[i].cdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define ams_delta_led_suspend NULL</div><div class='add'>+#define ams_delta_led_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int ams_delta_led_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = ret = 0; ret &gt;= 0 &amp;&amp; i &lt; ARRAY_SIZE(ams_delta_leds); i++) {</div><div class='add'>+		ret = led_classdev_register(&amp;pdev-&gt;dev,</div><div class='add'>+				&amp;ams_delta_leds[i].cdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; i &gt; 1) {</div><div class='add'>+		for (i = i - 2; i &gt;= 0; i--)</div><div class='add'>+			led_classdev_unregister(&amp;ams_delta_leds[i].cdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ams_delta_led_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = ARRAY_SIZE(ams_delta_leds) - 1; i &gt;= 0; i--)</div><div class='add'>+		led_classdev_unregister(&amp;ams_delta_leds[i].cdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ams_delta_led_driver = {</div><div class='add'>+	.probe		= ams_delta_led_probe,</div><div class='add'>+	.remove		= ams_delta_led_remove,</div><div class='add'>+	.suspend	= ams_delta_led_suspend,</div><div class='add'>+	.resume		= ams_delta_led_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name = "ams-delta-led",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ams_delta_led_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ams_delta_led_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ams_delta_led_exit(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_unregister(&amp;ams_delta_led_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ams_delta_led_init);</div><div class='add'>+module_exit(ams_delta_led_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jonathan McDowell &lt;noodles@earth.li&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Amstrad Delta LED driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c<br/>index bb7d84df0121..cf1dcd719a28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-corgi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-corgi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-corgi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-corgi.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/leds/leds-ixp4xx-gpio.c b/drivers/leds/leds-ixp4xx-gpio.c<br/>index 30ced150e4cf..7dcf0b92c460 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-ixp4xx-gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-ixp4xx-gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-ixp4xx-gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-ixp4xx-gpio.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c<br/>index 749a86c2adb6..3b87951aa555 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-locomo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-locomo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-locomo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-locomo.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -45,11 +44,13 @@ static void locomoled_brightness_set1(struct led_classdev *led_cdev,</div><div class='ctx'> </div><div class='ctx'> static struct led_classdev locomo_led0 = {</div><div class='ctx'> 	.name			= "locomo:amber",</div><div class='add'>+	.default_trigger	= "sharpsl-charge",</div><div class='ctx'> 	.brightness_set		= locomoled_brightness_set0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct led_classdev locomo_led1 = {</div><div class='ctx'> 	.name			= "locomo:green",</div><div class='add'>+	.default_trigger	= "nand-disk",</div><div class='ctx'> 	.brightness_set		= locomoled_brightness_set1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/leds/leds-net48xx.c b/drivers/leds/leds-net48xx.c<br/>new file mode 100644<br/>index 000000000000..713c4a8aa77d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-net48xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-net48xx.c</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+/*</div><div class='add'>+ * LEDs driver for Soekris net48xx</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Chris Boot &lt;bootc@bootc.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on leds-ams-delta.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/scx200_gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRVNAME "net48xx-led"</div><div class='add'>+#define NET48XX_ERROR_LED_GPIO	20</div><div class='add'>+</div><div class='add'>+static struct platform_device *pdev;</div><div class='add'>+</div><div class='add'>+static void net48xx_error_led_set(struct led_classdev *led_cdev,</div><div class='add'>+		enum led_brightness value)</div><div class='add'>+{</div><div class='add'>+	if (value)</div><div class='add'>+		scx200_gpio_set_high(NET48XX_ERROR_LED_GPIO);</div><div class='add'>+	else</div><div class='add'>+		scx200_gpio_set_low(NET48XX_ERROR_LED_GPIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev net48xx_error_led = {</div><div class='add'>+	.name		= "net48xx:error",</div><div class='add'>+	.brightness_set	= net48xx_error_led_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int net48xx_led_suspend(struct platform_device *dev,</div><div class='add'>+		pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	led_classdev_suspend(&amp;net48xx_error_led);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net48xx_led_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	led_classdev_resume(&amp;net48xx_error_led);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define net48xx_led_suspend NULL</div><div class='add'>+#define net48xx_led_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int net48xx_led_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return led_classdev_register(&amp;pdev-&gt;dev, &amp;net48xx_error_led);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int net48xx_led_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	led_classdev_unregister(&amp;net48xx_error_led);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver net48xx_led_driver = {</div><div class='add'>+	.probe		= net48xx_led_probe,</div><div class='add'>+	.remove		= net48xx_led_remove,</div><div class='add'>+	.suspend	= net48xx_led_suspend,</div><div class='add'>+	.resume		= net48xx_led_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name		= DRVNAME,</div><div class='add'>+		.owner		= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init net48xx_led_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!scx200_gpio_present()) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;net48xx_led_driver);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);</div><div class='add'>+	if (IS_ERR(pdev)) {</div><div class='add'>+		ret = PTR_ERR(pdev);</div><div class='add'>+		platform_driver_unregister(&amp;net48xx_led_driver);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit net48xx_led_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_device_unregister(pdev);</div><div class='add'>+	platform_driver_unregister(&amp;net48xx_led_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(net48xx_led_init);</div><div class='add'>+module_exit(net48xx_led_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Chris Boot &lt;bootc@bootc.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Soekris net48xx LED driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c<br/>index 650cf72dc675..fb1edc1c9edb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-s3c24xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-s3c24xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-s3c24xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-s3c24xx.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/leds/leds-spitz.c b/drivers/leds/leds-spitz.c<br/>index 65bbef4a5e09..126d09cc96ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-spitz.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-spitz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-spitz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-spitz.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/leds/leds-tosa.c b/drivers/leds/leds-tosa.c<br/>index c9e8cc1ec481..fb2416a38303 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/leds-tosa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/leds-tosa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/leds-tosa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/leds-tosa.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='head'>diff --git a/drivers/leds/ledtrig-heartbeat.c b/drivers/leds/ledtrig-heartbeat.c<br/>new file mode 100644<br/>index 000000000000..4bf8cec8b8c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/ledtrig-heartbeat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/ledtrig-heartbeat.c</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+/*</div><div class='add'>+ * LED Heartbeat Trigger</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on Richard Purdie's ledtrig-timer.c and some arch's</div><div class='add'>+ * CONFIG_HEARTBEAT code.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include "leds.h"</div><div class='add'>+</div><div class='add'>+struct heartbeat_trig_data {</div><div class='add'>+	unsigned int phase;</div><div class='add'>+	unsigned int period;</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void led_heartbeat_function(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct led_classdev *led_cdev = (struct led_classdev *) data;</div><div class='add'>+	struct heartbeat_trig_data *heartbeat_data = led_cdev-&gt;trigger_data;</div><div class='add'>+	unsigned long brightness = LED_OFF;</div><div class='add'>+	unsigned long delay = 0;</div><div class='add'>+</div><div class='add'>+	/* acts like an actual heart beat -- ie thump-thump-pause... */</div><div class='add'>+	switch (heartbeat_data-&gt;phase) {</div><div class='add'>+	case 0:</div><div class='add'>+		/*</div><div class='add'>+		 * The hyperbolic function below modifies the</div><div class='add'>+		 * heartbeat period length in dependency of the</div><div class='add'>+		 * current (1min) load. It goes through the points</div><div class='add'>+		 * f(0)=1260, f(1)=860, f(5)=510, f(inf)-&gt;300.</div><div class='add'>+		 */</div><div class='add'>+		heartbeat_data-&gt;period = 300 +</div><div class='add'>+			(6720 &lt;&lt; FSHIFT) / (5 * avenrun[0] + (7 &lt;&lt; FSHIFT));</div><div class='add'>+		heartbeat_data-&gt;period =</div><div class='add'>+			msecs_to_jiffies(heartbeat_data-&gt;period);</div><div class='add'>+		delay = msecs_to_jiffies(70);</div><div class='add'>+		heartbeat_data-&gt;phase++;</div><div class='add'>+		brightness = LED_FULL;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		delay = heartbeat_data-&gt;period / 4 - msecs_to_jiffies(70);</div><div class='add'>+		heartbeat_data-&gt;phase++;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		delay = msecs_to_jiffies(70);</div><div class='add'>+		heartbeat_data-&gt;phase++;</div><div class='add'>+		brightness = LED_FULL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		delay = heartbeat_data-&gt;period - heartbeat_data-&gt;period / 4 -</div><div class='add'>+			msecs_to_jiffies(70);</div><div class='add'>+		heartbeat_data-&gt;phase = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led_set_brightness(led_cdev, brightness);</div><div class='add'>+	mod_timer(&amp;heartbeat_data-&gt;timer, jiffies + delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void heartbeat_trig_activate(struct led_classdev *led_cdev)</div><div class='add'>+{</div><div class='add'>+	struct heartbeat_trig_data *heartbeat_data;</div><div class='add'>+</div><div class='add'>+	heartbeat_data = kzalloc(sizeof(*heartbeat_data), GFP_KERNEL);</div><div class='add'>+	if (!heartbeat_data)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	led_cdev-&gt;trigger_data = heartbeat_data;</div><div class='add'>+	setup_timer(&amp;heartbeat_data-&gt;timer,</div><div class='add'>+		    led_heartbeat_function, (unsigned long) led_cdev);</div><div class='add'>+	heartbeat_data-&gt;phase = 0;</div><div class='add'>+	led_heartbeat_function(heartbeat_data-&gt;timer.data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void heartbeat_trig_deactivate(struct led_classdev *led_cdev)</div><div class='add'>+{</div><div class='add'>+	struct heartbeat_trig_data *heartbeat_data = led_cdev-&gt;trigger_data;</div><div class='add'>+</div><div class='add'>+	if (heartbeat_data) {</div><div class='add'>+		del_timer_sync(&amp;heartbeat_data-&gt;timer);</div><div class='add'>+		kfree(heartbeat_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_trigger heartbeat_led_trigger = {</div><div class='add'>+	.name     = "heartbeat",</div><div class='add'>+	.activate = heartbeat_trig_activate,</div><div class='add'>+	.deactivate = heartbeat_trig_deactivate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init heartbeat_trig_init(void)</div><div class='add'>+{</div><div class='add'>+	return led_trigger_register(&amp;heartbeat_led_trigger);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit heartbeat_trig_exit(void)</div><div class='add'>+{</div><div class='add'>+	led_trigger_unregister(&amp;heartbeat_led_trigger);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(heartbeat_trig_init);</div><div class='add'>+module_exit(heartbeat_trig_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Heartbeat LED trigger");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c<br/>index fbf141ef46ec..179c2876b541 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/leds/ledtrig-timer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/leds/ledtrig-timer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/leds/ledtrig-timer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/leds/ledtrig-timer.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig<br/>index 12ad462737ba..f5fe7fb4b3ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/Kconfig</a></div><div class='hunk'>@@ -78,6 +78,18 @@ config ADB_PMU</div><div class='ctx'> 	  this device; you should do so if your machine is one of those</div><div class='ctx'> 	  mentioned above.</div><div class='ctx'> </div><div class='add'>+config ADB_PMU_LED</div><div class='add'>+	bool "Support for the Power/iBook front LED"</div><div class='add'>+	depends on ADB_PMU</div><div class='add'>+	select NEW_LEDS</div><div class='add'>+	select LEDS_CLASS</div><div class='add'>+	help</div><div class='add'>+	  Support the front LED on Power/iBooks as a generic LED that can</div><div class='add'>+	  be triggered by any of the supported triggers. To get the</div><div class='add'>+	  behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this</div><div class='add'>+	  and the ide-disk LED trigger and configure appropriately through</div><div class='add'>+	  sysfs.</div><div class='add'>+</div><div class='ctx'> config PMAC_SMU</div><div class='ctx'> 	bool "Support for SMU  based PowerMacs"</div><div class='ctx'> 	depends on PPC_PMAC64</div><div class='hunk'>@@ -99,17 +111,25 @@ config PMAC_MEDIABAY</div><div class='ctx'> 	  devices are not fully supported in the bay as I never had one to</div><div class='ctx'> 	  try with</div><div class='ctx'> </div><div class='del'>-# made a separate option since backlight may end up beeing used</div><div class='del'>-# on non-powerbook machines (but only on PMU based ones AFAIK)</div><div class='ctx'> config PMAC_BACKLIGHT</div><div class='ctx'> 	bool "Backlight control for LCD screens"</div><div class='del'>-	depends on ADB_PMU &amp;&amp; (BROKEN || !PPC64)</div><div class='add'>+	depends on ADB_PMU &amp;&amp; FB = y &amp;&amp; (BROKEN || !PPC64)</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable Macintosh specific extensions of the generic</div><div class='add'>+	  backlight code. With this enabled, the brightness keys on older</div><div class='add'>+	  PowerBooks will be enabled so you can change the screen brightness.</div><div class='add'>+	  Newer models should use an userspace daemon like pbbuttonsd.</div><div class='add'>+</div><div class='add'>+config PMAC_BACKLIGHT_LEGACY</div><div class='add'>+	bool "Provide legacy ioctl's on /dev/pmu for the backlight"</div><div class='add'>+	depends on PMAC_BACKLIGHT &amp;&amp; (BROKEN || !PPC64)</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here to build in code to manage the LCD backlight on a</div><div class='del'>-	  Macintosh PowerBook.  With this code, the backlight will be turned</div><div class='del'>-	  on and off appropriately on power-management and lid-open/lid-closed</div><div class='del'>-	  events; also, the PowerBook button device will be enabled so you can</div><div class='del'>-	  change the screen brightness.</div><div class='add'>+	  Say Y if you want to enable legacy ioctl's on /dev/pmu. This is for</div><div class='add'>+	  programs which use this old interface. New and updated programs</div><div class='add'>+	  should use the backlight classes in sysfs.</div><div class='ctx'> </div><div class='ctx'> config ADB_MACIO</div><div class='ctx'> 	bool "Include MacIO (CHRP) ADB driver"</div><div class='hunk'>@@ -171,6 +191,7 @@ config THERM_PM72</div><div class='ctx'> </div><div class='ctx'> config WINDFARM</div><div class='ctx'> 	tristate "New PowerMac thermal control infrastructure"</div><div class='add'>+	depends on PPC</div><div class='ctx'> </div><div class='ctx'> config WINDFARM_PM81</div><div class='ctx'> 	tristate "Support for thermal management on iMac G5"</div><div class='head'>diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile<br/>index 6081acdea404..b53d45f87b0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/Makefile</a></div><div class='hunk'>@@ -11,7 +11,9 @@ obj-$(CONFIG_MAC_EMUMOUSEBTN)	+= mac_hid.o</div><div class='ctx'> obj-$(CONFIG_INPUT_ADBHID)	+= adbhid.o</div><div class='ctx'> obj-$(CONFIG_ANSLCD)		+= ans-lcd.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ADB_PMU)		+= via-pmu.o</div><div class='add'>+obj-$(CONFIG_ADB_PMU)		+= via-pmu.o via-pmu-event.o</div><div class='add'>+obj-$(CONFIG_ADB_PMU_LED)	+= via-pmu-led.o</div><div class='add'>+obj-$(CONFIG_PMAC_BACKLIGHT)	+= via-pmu-backlight.o</div><div class='ctx'> obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o</div><div class='ctx'> obj-$(CONFIG_PMAC_APM_EMU)	+= apm_emu.o</div><div class='ctx'> obj-$(CONFIG_PMAC_SMU)		+= smu.o</div><div class='head'>diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c<br/>index 259fd8973ce9..360f93f6fcdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/adb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/adb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/adb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/adb.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * - move bus probe to a kernel thread</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -36,7 +35,6 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='hunk'>@@ -904,8 +902,6 @@ adbdev_init(void)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(ADB_MAJOR, 0), S_IFCHR | S_IRUSR | S_IWUSR, "adb");</div><div class='del'>-</div><div class='ctx'> 	adb_dev_class = class_create(THIS_MODULE, "adb");</div><div class='ctx'> 	if (IS_ERR(adb_dev_class))</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c<br/>index 394334ec5765..545be1ed6927 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/adbhid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/adbhid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/adbhid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/adbhid.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  * Move to syfs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -179,7 +178,7 @@ u8 adb_to_linux_keycodes[128] = {</div><div class='ctx'> 	/* 0x65 */ KEY_F9,		/*  67 */</div><div class='ctx'> 	/* 0x66 */ KEY_HANJA,		/* 123 */</div><div class='ctx'> 	/* 0x67 */ KEY_F11,		/*  87 */</div><div class='del'>-	/* 0x68 */ KEY_HANGUEL,		/* 122 */</div><div class='add'>+	/* 0x68 */ KEY_HANGEUL,		/* 122 */</div><div class='ctx'> 	/* 0x69 */ KEY_SYSRQ,		/*  99 */</div><div class='ctx'> 	/* 0x6a */ 0,</div><div class='ctx'> 	/* 0x6b */ KEY_SCROLLLOCK,	/*  70 */</div><div class='hunk'>@@ -503,9 +502,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto</div><div class='ctx'> 	case 0x1f: /* Powerbook button device */</div><div class='ctx'> 	  {</div><div class='ctx'> 		int down = (data[1] == (data[1] &amp; 0xf));</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-		int backlight = get_backlight_level();</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * XXX: Where is the contrast control for the passive?</div><div class='ctx'> 		 *  -- Cort</div><div class='hunk'>@@ -530,29 +527,17 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto</div><div class='ctx'> </div><div class='ctx'> 		case 0xa:	/* brightness decrease */</div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-			if (!disable_kernel_backlight) {</div><div class='del'>-				if (down &amp;&amp; backlight &gt;= 0) {</div><div class='del'>-					if (backlight &gt; BACKLIGHT_OFF)</div><div class='del'>-						set_backlight_level(backlight-1);</div><div class='del'>-					else</div><div class='del'>-						set_backlight_level(BACKLIGHT_OFF);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+			if (!disable_kernel_backlight &amp;&amp; down)</div><div class='add'>+				pmac_backlight_key_down();</div><div class='add'>+#endif</div><div class='ctx'> 			input_report_key(adbhid[id]-&gt;input, KEY_BRIGHTNESSDOWN, down);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 0x9:	/* brightness increase */</div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-			if (!disable_kernel_backlight) {</div><div class='del'>-				if (down &amp;&amp; backlight &gt;= 0) {</div><div class='del'>-					if (backlight &lt; BACKLIGHT_MAX)</div><div class='del'>-						set_backlight_level(backlight+1);</div><div class='del'>-					else </div><div class='del'>-						set_backlight_level(BACKLIGHT_MAX);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+			if (!disable_kernel_backlight &amp;&amp; down)</div><div class='add'>+				pmac_backlight_key_up();</div><div class='add'>+#endif</div><div class='ctx'> 			input_report_key(adbhid[id]-&gt;input, KEY_BRIGHTNESSUP, down);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/macintosh/apm_emu.c b/drivers/macintosh/apm_emu.c<br/>index e5a2bbf99399..1293876a2ebd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/apm_emu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/apm_emu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/apm_emu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/apm_emu.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c<br/>index a66636116f0b..6b129eef7987 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/mac_hid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/mac_hid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/mac_hid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/mac_hid.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * This file will soon be removed in favor of an uinput userspace tool.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c<br/>index 314fc0830d90..4b08852c35ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/macio-adb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/macio-adb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/macio-adb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/macio-adb.c</a></div><div class='hunk'>@@ -90,22 +90,12 @@ int macio_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *adbs;</div><div class='ctx'> 	struct resource r;</div><div class='add'>+	unsigned int irq;</div><div class='ctx'> </div><div class='ctx'> 	adbs = find_compatible_devices("adb", "chrp,adb0");</div><div class='ctx'> 	if (adbs == 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	{ int i = 0;</div><div class='del'>-</div><div class='del'>-	printk("macio_adb_init: node = %p, addrs =", adbs-&gt;node);</div><div class='del'>-	while(!of_address_to_resource(adbs, i, &amp;r))</div><div class='del'>-		printk(" %x(%x)", r.start, r.end - r.start);</div><div class='del'>-	printk(", intrs =");</div><div class='del'>-	for (i = 0; i &lt; adbs-&gt;n_intrs; ++i)</div><div class='del'>-		printk(" %x", adbs-&gt;intrs[i].line);</div><div class='del'>-	printk("\n"); }</div><div class='del'>-#endif</div><div class='ctx'> 	if (of_address_to_resource(adbs, 0, &amp;r))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	adb = ioremap(r.start, sizeof(struct adb_regs));</div><div class='hunk'>@@ -117,10 +107,9 @@ int macio_init(void)</div><div class='ctx'> 	out_8(&amp;adb-&gt;active_lo.r, 0xff);</div><div class='ctx'> 	out_8(&amp;adb-&gt;autopoll.r, APE);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(adbs-&gt;intrs[0].line, macio_adb_interrupt,</div><div class='del'>-			0, "ADB", (void *)0)) {</div><div class='del'>-		printk(KERN_ERR "ADB: can't get irq %d\n",</div><div class='del'>-		       adbs-&gt;intrs[0].line);</div><div class='add'>+	irq = irq_of_parse_and_map(adbs, 0);</div><div class='add'>+	if (request_irq(irq, macio_adb_interrupt, 0, "ADB", (void *)0)) {</div><div class='add'>+		printk(KERN_ERR "ADB: can't get irq %d\n", irq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> 	out_8(&amp;adb-&gt;intr_enb.r, DFB | TAG);</div><div class='head'>diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c<br/>index 431bd37225a1..82657bc86d19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/macio_asic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/macio_asic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/macio_asic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/macio_asic.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *    sub-devices.</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -281,75 +280,128 @@ static void macio_release_dev(struct device *dev)</div><div class='ctx'> static int macio_resource_quirks(struct device_node *np, struct resource *res,</div><div class='ctx'> 				 int index)</div><div class='ctx'> {</div><div class='del'>-	if (res-&gt;flags &amp; IORESOURCE_MEM) {</div><div class='del'>-		/* Grand Central has too large resource 0 on some machines */</div><div class='del'>-		if (index == 0 &amp;&amp; !strcmp(np-&gt;name, "gc"))</div><div class='del'>-			res-&gt;end = res-&gt;start + 0x1ffff;</div><div class='add'>+	/* Only quirks for memory resources for now */</div><div class='add'>+	if ((res-&gt;flags &amp; IORESOURCE_MEM) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Grand Central has too large resource 0 on some machines */</div><div class='add'>+	if (index == 0 &amp;&amp; !strcmp(np-&gt;name, "gc"))</div><div class='add'>+		res-&gt;end = res-&gt;start + 0x1ffff;</div><div class='ctx'> </div><div class='del'>-		/* Airport has bogus resource 2 */</div><div class='del'>-		if (index &gt;= 2 &amp;&amp; !strcmp(np-&gt;name, "radio"))</div><div class='del'>-			return 1;</div><div class='add'>+	/* Airport has bogus resource 2 */</div><div class='add'>+	if (index &gt;= 2 &amp;&amp; !strcmp(np-&gt;name, "radio"))</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PPC64</div><div class='del'>-		/* DBDMAs may have bogus sizes */</div><div class='del'>-		if ((res-&gt;start &amp; 0x0001f000) == 0x00008000)</div><div class='del'>-			res-&gt;end = res-&gt;start + 0xff;</div><div class='add'>+	/* DBDMAs may have bogus sizes */</div><div class='add'>+	if ((res-&gt;start &amp; 0x0001f000) == 0x00008000)</div><div class='add'>+		res-&gt;end = res-&gt;start + 0xff;</div><div class='ctx'> #endif /* CONFIG_PPC64 */</div><div class='ctx'> </div><div class='del'>-		/* ESCC parent eats child resources. We could have added a</div><div class='del'>-		 * level of hierarchy, but I don't really feel the need</div><div class='del'>-		 * for it</div><div class='del'>-		 */</div><div class='del'>-		if (!strcmp(np-&gt;name, "escc"))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* ESCC has bogus resources &gt;= 3 */</div><div class='del'>-		if (index &gt;= 3 &amp;&amp; !(strcmp(np-&gt;name, "ch-a") &amp;&amp;</div><div class='del'>-				    strcmp(np-&gt;name, "ch-b")))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* Media bay has too many resources, keep only first one */</div><div class='del'>-		if (index &gt; 0 &amp;&amp; !strcmp(np-&gt;name, "media-bay"))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* Some older IDE resources have bogus sizes */</div><div class='del'>-		if (!(strcmp(np-&gt;name, "IDE") &amp;&amp; strcmp(np-&gt;name, "ATA") &amp;&amp;</div><div class='del'>-		      strcmp(np-&gt;type, "ide") &amp;&amp; strcmp(np-&gt;type, "ata"))) {</div><div class='del'>-			if (index == 0 &amp;&amp; (res-&gt;end - res-&gt;start) &gt; 0xfff)</div><div class='del'>-				res-&gt;end = res-&gt;start + 0xfff;</div><div class='del'>-			if (index == 1 &amp;&amp; (res-&gt;end - res-&gt;start) &gt; 0xff)</div><div class='del'>-				res-&gt;end = res-&gt;start + 0xff;</div><div class='del'>-		}</div><div class='add'>+	/* ESCC parent eats child resources. We could have added a</div><div class='add'>+	 * level of hierarchy, but I don't really feel the need</div><div class='add'>+	 * for it</div><div class='add'>+	 */</div><div class='add'>+	if (!strcmp(np-&gt;name, "escc"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* ESCC has bogus resources &gt;= 3 */</div><div class='add'>+	if (index &gt;= 3 &amp;&amp; !(strcmp(np-&gt;name, "ch-a") &amp;&amp;</div><div class='add'>+			    strcmp(np-&gt;name, "ch-b")))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Media bay has too many resources, keep only first one */</div><div class='add'>+	if (index &gt; 0 &amp;&amp; !strcmp(np-&gt;name, "media-bay"))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Some older IDE resources have bogus sizes */</div><div class='add'>+	if (!(strcmp(np-&gt;name, "IDE") &amp;&amp; strcmp(np-&gt;name, "ATA") &amp;&amp;</div><div class='add'>+	      strcmp(np-&gt;type, "ide") &amp;&amp; strcmp(np-&gt;type, "ata"))) {</div><div class='add'>+		if (index == 0 &amp;&amp; (res-&gt;end - res-&gt;start) &gt; 0xfff)</div><div class='add'>+			res-&gt;end = res-&gt;start + 0xfff;</div><div class='add'>+		if (index == 1 &amp;&amp; (res-&gt;end - res-&gt;start) &gt; 0xff)</div><div class='add'>+			res-&gt;end = res-&gt;start + 0xff;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void macio_create_fixup_irq(struct macio_dev *dev, int index,</div><div class='add'>+				   unsigned int line)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq;</div><div class='ctx'> </div><div class='del'>-static void macio_setup_interrupts(struct macio_dev *dev)</div><div class='add'>+	irq = irq_create_mapping(NULL, line);</div><div class='add'>+	if (irq != NO_IRQ) {</div><div class='add'>+		dev-&gt;interrupt[index].start = irq;</div><div class='add'>+		dev-&gt;interrupt[index].flags = IORESOURCE_IRQ;</div><div class='add'>+		dev-&gt;interrupt[index].name = dev-&gt;ofdev.dev.bus_id;</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;n_interrupts &lt;= index)</div><div class='add'>+		dev-&gt;n_interrupts = index + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macio_add_missing_resources(struct macio_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = dev-&gt;ofdev.node;</div><div class='del'>-	int i,j;</div><div class='add'>+	unsigned int irq_base;</div><div class='add'>+</div><div class='add'>+	/* Gatwick has some missing interrupts on child nodes */</div><div class='add'>+	if (dev-&gt;bus-&gt;chip-&gt;type != macio_gatwick)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* For now, we use pre-parsed entries in the device-tree for</div><div class='del'>-	 * interrupt routing and addresses, but we should change that</div><div class='del'>-	 * to dynamically parsed entries and so get rid of most of the</div><div class='del'>-	 * clutter in struct device_node</div><div class='add'>+	/* irq_base is always 64 on gatwick. I have no cleaner way to get</div><div class='add'>+	 * that value from here at this point</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = j = 0; i &lt; np-&gt;n_intrs; i++) {</div><div class='add'>+	irq_base = 64;</div><div class='add'>+</div><div class='add'>+	/* Fix SCC */</div><div class='add'>+	if (strcmp(np-&gt;name, "ch-a") == 0) {</div><div class='add'>+		macio_create_fixup_irq(dev, 0, 15 + irq_base);</div><div class='add'>+		macio_create_fixup_irq(dev, 1,  4 + irq_base);</div><div class='add'>+		macio_create_fixup_irq(dev, 2,  5 + irq_base);</div><div class='add'>+		printk(KERN_INFO "macio: fixed SCC irqs on gatwick\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fix media-bay */</div><div class='add'>+	if (strcmp(np-&gt;name, "media-bay") == 0) {</div><div class='add'>+		macio_create_fixup_irq(dev, 0, 29 + irq_base);</div><div class='add'>+		printk(KERN_INFO "macio: fixed media-bay irq on gatwick\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fix left media bay childs */</div><div class='add'>+	if (dev-&gt;media_bay != NULL &amp;&amp; strcmp(np-&gt;name, "floppy") == 0) {</div><div class='add'>+		macio_create_fixup_irq(dev, 0, 19 + irq_base);</div><div class='add'>+		macio_create_fixup_irq(dev, 1,  1 + irq_base);</div><div class='add'>+		printk(KERN_INFO "macio: fixed left floppy irqs\n");</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;media_bay != NULL &amp;&amp; strcasecmp(np-&gt;name, "ata4") == 0) {</div><div class='add'>+		macio_create_fixup_irq(dev, 0, 14 + irq_base);</div><div class='add'>+		macio_create_fixup_irq(dev, 0,  3 + irq_base);</div><div class='add'>+		printk(KERN_INFO "macio: fixed left ide irqs\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macio_setup_interrupts(struct macio_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = dev-&gt;ofdev.node;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	int i = 0, j = 0;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='ctx'> 		struct resource *res = &amp;dev-&gt;interrupt[j];</div><div class='ctx'> </div><div class='ctx'> 		if (j &gt;= MACIO_DEV_COUNT_IRQS)</div><div class='ctx'> 			break;</div><div class='del'>-		res-&gt;start = np-&gt;intrs[i].line;</div><div class='del'>-		res-&gt;flags = IORESOURCE_IO;</div><div class='del'>-		if (np-&gt;intrs[j].sense)</div><div class='del'>-			res-&gt;flags |= IORESOURCE_IRQ_LOWLEVEL;</div><div class='del'>-		else</div><div class='del'>-			res-&gt;flags |= IORESOURCE_IRQ_HIGHEDGE;</div><div class='add'>+		irq = irq_of_parse_and_map(np, i++);</div><div class='add'>+		if (irq == NO_IRQ)</div><div class='add'>+			break;</div><div class='add'>+		res-&gt;start = irq;</div><div class='add'>+		res-&gt;flags = IORESOURCE_IRQ;</div><div class='ctx'> 		res-&gt;name = dev-&gt;ofdev.dev.bus_id;</div><div class='del'>-		if (macio_resource_quirks(np, res, i))</div><div class='add'>+		if (macio_resource_quirks(np, res, i - 1)) {</div><div class='ctx'> 			memset(res, 0, sizeof(struct resource));</div><div class='del'>-		else</div><div class='add'>+			continue;</div><div class='add'>+		} else</div><div class='ctx'> 			j++;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;n_interrupts = j;</div><div class='hunk'>@@ -428,10 +480,10 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	/* MacIO itself has a different reg, we use it's PCI base */</div><div class='ctx'> 	if (np == chip-&gt;of_node) {</div><div class='del'>-		sprintf(dev-&gt;ofdev.dev.bus_id, "%1d.%08lx:%.*s",</div><div class='add'>+		sprintf(dev-&gt;ofdev.dev.bus_id, "%1d.%08x:%.*s",</div><div class='ctx'> 			chip-&gt;lbus.index,</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-			pci_resource_start(chip-&gt;lbus.pdev, 0),</div><div class='add'>+			(unsigned int)pci_resource_start(chip-&gt;lbus.pdev, 0),</div><div class='ctx'> #else</div><div class='ctx'> 			0, /* NuBus may want to do something better here */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -446,6 +498,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,</div><div class='ctx'> 	/* Setup interrupts &amp; resources */</div><div class='ctx'> 	macio_setup_interrupts(dev);</div><div class='ctx'> 	macio_setup_resources(dev, parent_res);</div><div class='add'>+	macio_add_missing_resources(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Register with core */</div><div class='ctx'> 	if (of_device_register(&amp;dev-&gt;ofdev) != 0) {</div><div class='head'>diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c<br/>index 7f7d4eaca870..cae24a13526a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/macio_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/macio_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/macio_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/macio_sysfs.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;asm/macio.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c<br/>index 53c1c7909413..0acf2f7fd9d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/mediabay.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/mediabay.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/mediabay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/mediabay.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  as published by the Free Software Foundation; either version</div><div class='ctx'>  *  2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c<br/>index f4516ca7aa3a..00ef46898147 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/smu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/smu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/smu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/smu.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *    the userland interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -76,9 +75,11 @@ struct smu_device {</div><div class='ctx'> 	struct of_device	*of_dev;</div><div class='ctx'> 	int			doorbell;	/* doorbell gpio */</div><div class='ctx'> 	u32 __iomem		*db_buf;	/* doorbell buffer */</div><div class='del'>-	int			db_irq;</div><div class='add'>+	struct device_node	*db_node;</div><div class='add'>+	unsigned int		db_irq;</div><div class='ctx'> 	int			msg;</div><div class='del'>-	int			msg_irq;</div><div class='add'>+	struct device_node	*msg_node;</div><div class='add'>+	unsigned int		msg_irq;</div><div class='ctx'> 	struct smu_cmd_buf	*cmd_buf;	/* command buffer virtual */</div><div class='ctx'> 	u32			cmd_buf_abs;	/* command buffer absolute */</div><div class='ctx'> 	struct list_head	cmd_list;</div><div class='hunk'>@@ -94,6 +95,7 @@ struct smu_device {</div><div class='ctx'>  */</div><div class='ctx'> static struct smu_device	*smu;</div><div class='ctx'> static DEFINE_MUTEX(smu_part_access);</div><div class='add'>+static int smu_irq_inited;</div><div class='ctx'> </div><div class='ctx'> static void smu_i2c_retry(unsigned long data);</div><div class='ctx'> </div><div class='hunk'>@@ -258,6 +260,10 @@ int smu_queue_cmd(struct smu_cmd *cmd)</div><div class='ctx'> 		smu_start_cmd();</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;smu-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	/* Workaround for early calls when irq isn't available */</div><div class='add'>+	if (!smu_irq_inited || smu-&gt;db_irq == NO_IRQ)</div><div class='add'>+		smu_spinwait_cmd(cmd);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(smu_queue_cmd);</div><div class='hunk'>@@ -479,14 +485,15 @@ int __init smu_init (void)</div><div class='ctx'> 	smu-&gt;cmd_buf_abs = (u32)smu_cmdbuf_abs;</div><div class='ctx'> 	smu-&gt;cmd_buf = (struct smu_cmd_buf *)abs_to_virt(smu_cmdbuf_abs);</div><div class='ctx'> </div><div class='del'>-	np = of_find_node_by_name(NULL, "smu-doorbell");</div><div class='del'>-	if (np == NULL) {</div><div class='add'>+	smu-&gt;db_node = of_find_node_by_name(NULL, "smu-doorbell");</div><div class='add'>+	if (smu-&gt;db_node == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='del'>-	data = (u32 *)get_property(np, "reg", NULL);</div><div class='add'>+	data = (u32 *)get_property(smu-&gt;db_node, "reg", NULL);</div><div class='ctx'> 	if (data == NULL) {</div><div class='del'>-		of_node_put(np);</div><div class='add'>+		of_node_put(smu-&gt;db_node);</div><div class='add'>+		smu-&gt;db_node = NULL;</div><div class='ctx'> 		printk(KERN_ERR "SMU: Can't find doorbell GPIO address !\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -498,27 +505,21 @@ int __init smu_init (void)</div><div class='ctx'> 	smu-&gt;doorbell = *data;</div><div class='ctx'> 	if (smu-&gt;doorbell &lt; 0x50)</div><div class='ctx'> 		smu-&gt;doorbell += 0x50;</div><div class='del'>-	if (np-&gt;n_intrs &gt; 0)</div><div class='del'>-		smu-&gt;db_irq = np-&gt;intrs[0].line;</div><div class='del'>-</div><div class='del'>-	of_node_put(np);</div><div class='ctx'> </div><div class='ctx'> 	/* Now look for the smu-interrupt GPIO */</div><div class='ctx'> 	do {</div><div class='del'>-		np = of_find_node_by_name(NULL, "smu-interrupt");</div><div class='del'>-		if (np == NULL)</div><div class='add'>+		smu-&gt;msg_node = of_find_node_by_name(NULL, "smu-interrupt");</div><div class='add'>+		if (smu-&gt;msg_node == NULL)</div><div class='ctx'> 			break;</div><div class='del'>-		data = (u32 *)get_property(np, "reg", NULL);</div><div class='add'>+		data = (u32 *)get_property(smu-&gt;msg_node, "reg", NULL);</div><div class='ctx'> 		if (data == NULL) {</div><div class='del'>-			of_node_put(np);</div><div class='add'>+			of_node_put(smu-&gt;msg_node);</div><div class='add'>+			smu-&gt;msg_node = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		smu-&gt;msg = *data;</div><div class='ctx'> 		if (smu-&gt;msg &lt; 0x50)</div><div class='ctx'> 			smu-&gt;msg += 0x50;</div><div class='del'>-		if (np-&gt;n_intrs &gt; 0)</div><div class='del'>-			smu-&gt;msg_irq = np-&gt;intrs[0].line;</div><div class='del'>-		of_node_put(np);</div><div class='ctx'> 	} while(0);</div><div class='ctx'> </div><div class='ctx'> 	/* Doorbell buffer is currently hard-coded, I didn't find a proper</div><div class='hunk'>@@ -550,13 +551,26 @@ static int smu_late_init(void)</div><div class='ctx'> 	smu-&gt;i2c_timer.function = smu_i2c_retry;</div><div class='ctx'> 	smu-&gt;i2c_timer.data = (unsigned long)smu;</div><div class='ctx'> </div><div class='add'>+	if (smu-&gt;db_node) {</div><div class='add'>+		smu-&gt;db_irq = irq_of_parse_and_map(smu-&gt;db_node, 0);</div><div class='add'>+		if (smu-&gt;db_irq == NO_IRQ)</div><div class='add'>+			printk(KERN_ERR "smu: failed to map irq for node %s\n",</div><div class='add'>+			       smu-&gt;db_node-&gt;full_name);</div><div class='add'>+	}</div><div class='add'>+	if (smu-&gt;msg_node) {</div><div class='add'>+		smu-&gt;msg_irq = irq_of_parse_and_map(smu-&gt;msg_node, 0);</div><div class='add'>+		if (smu-&gt;msg_irq == NO_IRQ)</div><div class='add'>+			printk(KERN_ERR "smu: failed to map irq for node %s\n",</div><div class='add'>+			       smu-&gt;msg_node-&gt;full_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Try to request the interrupts</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (smu-&gt;db_irq != NO_IRQ) {</div><div class='ctx'> 		if (request_irq(smu-&gt;db_irq, smu_db_intr,</div><div class='del'>-				SA_SHIRQ, "SMU doorbell", smu) &lt; 0) {</div><div class='add'>+				IRQF_SHARED, "SMU doorbell", smu) &lt; 0) {</div><div class='ctx'> 			printk(KERN_WARNING "SMU: can't "</div><div class='ctx'> 			       "request interrupt %d\n",</div><div class='ctx'> 			       smu-&gt;db_irq);</div><div class='hunk'>@@ -566,7 +580,7 @@ static int smu_late_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (smu-&gt;msg_irq != NO_IRQ) {</div><div class='ctx'> 		if (request_irq(smu-&gt;msg_irq, smu_msg_intr,</div><div class='del'>-				SA_SHIRQ, "SMU message", smu) &lt; 0) {</div><div class='add'>+				IRQF_SHARED, "SMU message", smu) &lt; 0) {</div><div class='ctx'> 			printk(KERN_WARNING "SMU: can't "</div><div class='ctx'> 			       "request interrupt %d\n",</div><div class='ctx'> 			       smu-&gt;msg_irq);</div><div class='hunk'>@@ -574,6 +588,7 @@ static int smu_late_init(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	smu_irq_inited = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> /* This has to be before arch_initcall as the low i2c stuff relies on the</div><div class='hunk'>@@ -745,6 +760,11 @@ static void smu_i2c_low_completion(struct smu_cmd *scmd, void *misc)</div><div class='ctx'> 	if (fail &amp;&amp; --cmd-&gt;retries &gt; 0) {</div><div class='ctx'> 		DPRINTK("SMU: i2c failure, starting timer...\n");</div><div class='ctx'> 		BUG_ON(cmd != smu-&gt;cmd_i2c_cur);</div><div class='add'>+		if (!smu_irq_inited) {</div><div class='add'>+			mdelay(5);</div><div class='add'>+			smu_i2c_retry(0);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		mod_timer(&amp;smu-&gt;i2c_timer, jiffies + msecs_to_jiffies(5));</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c<br/>index 5282fec17075..7f86478bdd36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_adt746x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_adt746x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_adt746x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/therm_adt746x.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c<br/>index 231146f439dd..c1fe0b368f76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_pm72.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_pm72.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_pm72.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/therm_pm72.c</a></div><div class='hunk'>@@ -97,7 +97,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/therm_pm72.h b/drivers/macintosh/therm_pm72.h<br/>index c17e61f9c418..fc7e9b7ecaf2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_pm72.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_pm72.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_pm72.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/therm_pm72.h</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static char * critical_overtemp_path = "/sbin/critical_overtemp";</div><div class='ctx'>  * 0. This appear to be safe enough for this first version</div><div class='ctx'>  * of the driver, though I would accept any clean patch</div><div class='ctx'>  * doing a better use of the device-tree without turning the</div><div class='del'>- * while i2c registration mecanism into a racy mess</div><div class='add'>+ * while i2c registration mechanism into a racy mess</div><div class='ctx'>  *</div><div class='ctx'>  * Note: Xserve changed this. We have some bits on the K2 bus,</div><div class='ctx'>  * which I arbitrarily set to 0x200. Ultimately, we really want</div><div class='head'>diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c<br/>index 3d9dd2e166aa..c7d1c290cb0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_windtunnel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/therm_windtunnel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/therm_windtunnel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/therm_windtunnel.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *   </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c<br/>index 2d9d79150403..69d5452fd22f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/via-cuda.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-cuda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/via-cuda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/via-cuda.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Copyright (C) 1996 Paul Mackerras.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -35,13 +34,6 @@</div><div class='ctx'> static volatile unsigned char __iomem *via;</div><div class='ctx'> static DEFINE_SPINLOCK(cuda_lock);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MAC</div><div class='del'>-#define CUDA_IRQ IRQ_MAC_ADB</div><div class='del'>-#define eieio()</div><div class='del'>-#else</div><div class='del'>-#define CUDA_IRQ vias-&gt;intrs[0].line</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* VIA registers - spaced 0x200 bytes apart */</div><div class='ctx'> #define RS		0x200		/* skip between registers */</div><div class='ctx'> #define B		0		/* B-side data */</div><div class='hunk'>@@ -190,11 +182,24 @@ int __init find_via_cuda(void)</div><div class='ctx'> </div><div class='ctx'> static int __init via_cuda_start(void)</div><div class='ctx'> {</div><div class='add'>+    unsigned int irq;</div><div class='add'>+</div><div class='ctx'>     if (via == NULL)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> </div><div class='del'>-    if (request_irq(CUDA_IRQ, cuda_interrupt, 0, "ADB", cuda_interrupt)) {</div><div class='del'>-	printk(KERN_ERR "cuda_init: can't get irq %d\n", CUDA_IRQ);</div><div class='add'>+#ifdef CONFIG_MAC</div><div class='add'>+    irq = IRQ_MAC_ADB;</div><div class='add'>+#else /* CONFIG_MAC */</div><div class='add'>+    irq = irq_of_parse_and_map(vias, 0);</div><div class='add'>+    if (irq == NO_IRQ) {</div><div class='add'>+	printk(KERN_ERR "via-cuda: can't map interrupts for %s\n",</div><div class='add'>+	       vias-&gt;full_name);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+    }</div><div class='add'>+#endif /* CONFIG_MAP */</div><div class='add'>+</div><div class='add'>+    if (request_irq(irq, cuda_interrupt, 0, "ADB", cuda_interrupt)) {</div><div class='add'>+	printk(KERN_ERR "via-cuda: can't request irq %d\n", irq);</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c<br/>new file mode 100644<br/>index 000000000000..b42d05f2aaff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/via-pmu-backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/via-pmu-backlight.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+/*</div><div class='add'>+ * Backlight code for via-pmu</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1998 Paul Mackerras and Fabio Riccardi.</div><div class='add'>+ * Copyright (C) 2001-2002 Benjamin Herrenschmidt</div><div class='add'>+ * Copyright (C) 2006      Michael Hanselmann &lt;linux-kernel@hansmi.ch&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ptrace.h&gt;</div><div class='add'>+#include &lt;linux/adb.h&gt;</div><div class='add'>+#include &lt;linux/pmu.h&gt;</div><div class='add'>+#include &lt;asm/backlight.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_PMU_LEVEL 0xFF</div><div class='add'>+</div><div class='add'>+static struct device_node *vias;</div><div class='add'>+static struct backlight_properties pmu_backlight_data;</div><div class='add'>+</div><div class='add'>+static int pmu_backlight_get_level_brightness(struct fb_info *info,</div><div class='add'>+		int level)</div><div class='add'>+{</div><div class='add'>+	int pmulevel;</div><div class='add'>+</div><div class='add'>+	/* Get and convert the value */</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	pmulevel = info-&gt;bl_curve[level] * FB_BACKLIGHT_MAX / MAX_PMU_LEVEL;</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	if (pmulevel &lt; 0)</div><div class='add'>+		pmulevel = 0;</div><div class='add'>+	else if (pmulevel &gt; MAX_PMU_LEVEL)</div><div class='add'>+		pmulevel = MAX_PMU_LEVEL;</div><div class='add'>+</div><div class='add'>+	return pmulevel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmu_backlight_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	struct adb_request req;</div><div class='add'>+	int pmulevel, level = bd-&gt;props-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	if (vias == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		level = 0;</div><div class='add'>+</div><div class='add'>+	pmulevel = pmu_backlight_get_level_brightness(info, level);</div><div class='add'>+</div><div class='add'>+	pmu_request(&amp;req, NULL, 2, PMU_BACKLIGHT_BRIGHT, pmulevel);</div><div class='add'>+	pmu_wait_complete(&amp;req);</div><div class='add'>+</div><div class='add'>+	pmu_request(&amp;req, NULL, 2, PMU_POWER_CTRL,</div><div class='add'>+		PMU_POW_BACKLIGHT | (level &gt; 0 ? PMU_POW_ON : PMU_POW_OFF));</div><div class='add'>+	pmu_wait_complete(&amp;req);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pmu_backlight_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;props-&gt;brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties pmu_backlight_data = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.get_brightness	= pmu_backlight_get_brightness,</div><div class='add'>+	.update_status	= pmu_backlight_update_status,</div><div class='add'>+	.max_brightness	= (FB_BACKLIGHT_LEVELS - 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void __init pmu_backlight_init(struct device_node *in_vias)</div><div class='add'>+{</div><div class='add'>+	struct backlight_device *bd;</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	char name[10];</div><div class='add'>+	int level, autosave;</div><div class='add'>+</div><div class='add'>+	vias = in_vias;</div><div class='add'>+</div><div class='add'>+	/* Special case for the old PowerBook since I can't test on it */</div><div class='add'>+	autosave =</div><div class='add'>+		machine_is_compatible("AAPL,3400/2400") ||</div><div class='add'>+		machine_is_compatible("AAPL,3500");</div><div class='add'>+</div><div class='add'>+	if (!autosave &amp;&amp;</div><div class='add'>+	    !pmac_has_backlight_type("pmu") &amp;&amp;</div><div class='add'>+	    !machine_is_compatible("AAPL,PowerBook1998") &amp;&amp;</div><div class='add'>+	    !machine_is_compatible("PowerBook1,1"))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Actually, this is a hack, but I don't know of a better way</div><div class='add'>+	 * to get the first framebuffer device.</div><div class='add'>+	 */</div><div class='add'>+	info = registered_fb[0];</div><div class='add'>+	if (!info) {</div><div class='add'>+		printk("pmubl: No framebuffer found\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "pmubl%d", info-&gt;node);</div><div class='add'>+</div><div class='add'>+	bd = backlight_device_register(name, info, &amp;pmu_backlight_data);</div><div class='add'>+	if (IS_ERR(bd)) {</div><div class='add'>+		printk("pmubl: Backlight registration failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	info-&gt;bl_dev = bd;</div><div class='add'>+	fb_bl_default_curve(info, 0x7F, 0x46, 0x0E);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	level = pmu_backlight_data.max_brightness;</div><div class='add'>+</div><div class='add'>+	if (autosave) {</div><div class='add'>+		/* read autosaved value if available */</div><div class='add'>+		struct adb_request req;</div><div class='add'>+		pmu_request(&amp;req, NULL, 2, 0xd9, 0);</div><div class='add'>+		pmu_wait_complete(&amp;req);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+		level = pmac_backlight_curve_lookup(info,</div><div class='add'>+				(req.reply[0] &gt;&gt; 4) *</div><div class='add'>+				pmu_backlight_data.max_brightness / 15);</div><div class='add'>+		mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up(&amp;bd-&gt;sem);</div><div class='add'>+	bd-&gt;props-&gt;brightness = level;</div><div class='add'>+	bd-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props-&gt;update_status(bd);</div><div class='add'>+	down(&amp;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (!pmac_backlight)</div><div class='add'>+		pmac_backlight = bd;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+</div><div class='add'>+	printk("pmubl: Backlight initialized (%s)\n", name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/macintosh/via-pmu-event.c b/drivers/macintosh/via-pmu-event.c<br/>new file mode 100644<br/>index 000000000000..25cd56542328<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/via-pmu-event.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/via-pmu-event.c</a></div><div class='hunk'>@@ -0,0 +1,80 @@</div><div class='add'>+/*</div><div class='add'>+ * via-pmu event device for reporting some events that come through the PMU</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or</div><div class='add'>+ * NON INFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/adb.h&gt;</div><div class='add'>+#include &lt;linux/pmu.h&gt;</div><div class='add'>+#include "via-pmu-event.h"</div><div class='add'>+</div><div class='add'>+static struct input_dev *pmu_input_dev;</div><div class='add'>+</div><div class='add'>+static int __init via_pmu_event_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* do other models report button/lid status? */</div><div class='add'>+	if (pmu_get_model() != PMU_KEYLARGO_BASED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	pmu_input_dev = input_allocate_device();</div><div class='add'>+	if (!pmu_input_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pmu_input_dev-&gt;name = "PMU";</div><div class='add'>+	pmu_input_dev-&gt;id.bustype = BUS_HOST;</div><div class='add'>+	pmu_input_dev-&gt;id.vendor = 0x0001;</div><div class='add'>+	pmu_input_dev-&gt;id.product = 0x0001;</div><div class='add'>+	pmu_input_dev-&gt;id.version = 0x0100;</div><div class='add'>+</div><div class='add'>+	set_bit(EV_KEY, pmu_input_dev-&gt;evbit);</div><div class='add'>+	set_bit(EV_SW, pmu_input_dev-&gt;evbit);</div><div class='add'>+	set_bit(KEY_POWER, pmu_input_dev-&gt;keybit);</div><div class='add'>+	set_bit(SW_LID, pmu_input_dev-&gt;swbit);</div><div class='add'>+</div><div class='add'>+	err = input_register_device(pmu_input_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		input_free_device(pmu_input_dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void via_pmu_event(int key, int down)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (unlikely(!pmu_input_dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (key) {</div><div class='add'>+	case PMU_EVT_POWER:</div><div class='add'>+		input_report_key(pmu_input_dev, KEY_POWER, down);</div><div class='add'>+		break;</div><div class='add'>+	case PMU_EVT_LID:</div><div class='add'>+		input_report_switch(pmu_input_dev, SW_LID, down);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* no such key handled */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(pmu_input_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(via_pmu_event_init);</div><div class='head'>diff --git a/drivers/macintosh/via-pmu-event.h b/drivers/macintosh/via-pmu-event.h<br/>new file mode 100644<br/>index 000000000000..72c54de408e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/via-pmu-event.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/via-pmu-event.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+#ifndef __VIA_PMU_EVENT_H</div><div class='add'>+#define __VIA_PMU_EVENT_H</div><div class='add'>+</div><div class='add'>+#define PMU_EVT_POWER	0</div><div class='add'>+#define PMU_EVT_LID	1</div><div class='add'>+extern void via_pmu_event(int key, int down);</div><div class='add'>+</div><div class='add'>+#endif /* __VIA_PMU_EVENT_H */</div><div class='head'>diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c<br/>new file mode 100644<br/>index 000000000000..af8375ed0f5e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/via-pmu-led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/via-pmu-led.c</a></div><div class='hunk'>@@ -0,0 +1,144 @@</div><div class='add'>+/*</div><div class='add'>+ * via-pmu LED class device</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or</div><div class='add'>+ * NON INFRINGEMENT.  See the GNU General Public License for more</div><div class='add'>+ * details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/adb.h&gt;</div><div class='add'>+#include &lt;linux/pmu.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+</div><div class='add'>+static spinlock_t pmu_blink_lock;</div><div class='add'>+static struct adb_request pmu_blink_req;</div><div class='add'>+/* -1: no change, 0: request off, 1: request on */</div><div class='add'>+static int requested_change;</div><div class='add'>+static int sleeping;</div><div class='add'>+</div><div class='add'>+static void pmu_req_done(struct adb_request * req)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pmu_blink_lock, flags);</div><div class='add'>+	/* if someone requested a change in the meantime</div><div class='add'>+	 * (we only see the last one which is fine)</div><div class='add'>+	 * then apply it now */</div><div class='add'>+	if (requested_change != -1 &amp;&amp; !sleeping)</div><div class='add'>+		pmu_request(&amp;pmu_blink_req, NULL, 4, 0xee, 4, 0, requested_change);</div><div class='add'>+	/* reset requested change */</div><div class='add'>+	requested_change = -1;</div><div class='add'>+	spin_unlock_irqrestore(&amp;pmu_blink_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pmu_led_set(struct led_classdev *led_cdev,</div><div class='add'>+			enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pmu_blink_lock, flags);</div><div class='add'>+	switch (brightness) {</div><div class='add'>+	case LED_OFF:</div><div class='add'>+		requested_change = 0;</div><div class='add'>+		break;</div><div class='add'>+	case LED_FULL:</div><div class='add'>+		requested_change = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto out;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* if request isn't done, then don't do anything */</div><div class='add'>+	if (pmu_blink_req.complete &amp;&amp; !sleeping)</div><div class='add'>+		pmu_request(&amp;pmu_blink_req, NULL, 4, 0xee, 4, 0, requested_change);</div><div class='add'>+ out:</div><div class='add'>+ 	spin_unlock_irqrestore(&amp;pmu_blink_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct led_classdev pmu_led = {</div><div class='add'>+	.name = "pmu-front-led",</div><div class='add'>+#ifdef CONFIG_BLK_DEV_IDE_PMAC_BLINK</div><div class='add'>+	.default_trigger = "ide-disk",</div><div class='add'>+#endif</div><div class='add'>+	.brightness_set = pmu_led_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pmu_blink_lock, flags);</div><div class='add'>+</div><div class='add'>+	switch (when) {</div><div class='add'>+	case PBOOK_SLEEP_REQUEST:</div><div class='add'>+		sleeping = 1;</div><div class='add'>+		break;</div><div class='add'>+	case PBOOK_WAKE:</div><div class='add'>+		sleeping = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* do nothing */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pmu_blink_lock, flags);</div><div class='add'>+</div><div class='add'>+	return PBOOK_SLEEP_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pmu_sleep_notifier via_pmu_led_sleep_notif = {</div><div class='add'>+	.notifier_call = pmu_led_sleep_call,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init via_pmu_led_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dt;</div><div class='add'>+	const char *model;</div><div class='add'>+</div><div class='add'>+	/* only do this on keylargo based models */</div><div class='add'>+	if (pmu_get_model() != PMU_KEYLARGO_BASED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dt = of_find_node_by_path("/");</div><div class='add'>+	if (dt == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	model = (const char *)get_property(dt, "model", NULL);</div><div class='add'>+	if (model == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &amp;&amp;</div><div class='add'>+	    strncmp(model, "iBook", strlen("iBook")) != 0) {</div><div class='add'>+		of_node_put(dt);</div><div class='add'>+		/* ignore */</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	of_node_put(dt);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;pmu_blink_lock);</div><div class='add'>+	/* no outstanding req */</div><div class='add'>+	pmu_blink_req.complete = 1;</div><div class='add'>+	pmu_blink_req.done = pmu_req_done;</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	pmu_register_sleep_notifier(&amp;via_pmu_led_sleep_notif);</div><div class='add'>+#endif</div><div class='add'>+	return led_classdev_register(NULL, &amp;pmu_led);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+late_initcall(via_pmu_led_init);</div><div class='head'>diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c<br/>index 0b5ff553e39a..06ca80bfd6b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/via-pmu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/via-pmu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/via-pmu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/via-pmu.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -65,9 +64,7 @@</div><div class='ctx'> #include &lt;asm/backlight.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PPC32</div><div class='del'>-#include &lt;asm/open_pic.h&gt;</div><div class='del'>-#endif</div><div class='add'>+#include "via-pmu-event.h"</div><div class='ctx'> </div><div class='ctx'> /* Some compile options */</div><div class='ctx'> #undef SUSPEND_USES_PMU</div><div class='hunk'>@@ -144,14 +141,13 @@ static int data_index;</div><div class='ctx'> static int data_len;</div><div class='ctx'> static volatile int adb_int_pending;</div><div class='ctx'> static volatile int disable_poll;</div><div class='del'>-static struct adb_request bright_req_1, bright_req_2;</div><div class='ctx'> static struct device_node *vias;</div><div class='ctx'> static int pmu_kind = PMU_UNKNOWN;</div><div class='ctx'> static int pmu_fully_inited = 0;</div><div class='ctx'> static int pmu_has_adb;</div><div class='ctx'> static struct device_node *gpio_node;</div><div class='ctx'> static unsigned char __iomem *gpio_reg = NULL;</div><div class='del'>-static int gpio_irq = -1;</div><div class='add'>+static int gpio_irq = NO_IRQ;</div><div class='ctx'> static int gpio_irq_enabled = -1;</div><div class='ctx'> static volatile int pmu_suspended = 0;</div><div class='ctx'> static spinlock_t pmu_lock;</div><div class='hunk'>@@ -161,7 +157,7 @@ static int drop_interrupts;</div><div class='ctx'> #if defined(CONFIG_PM) &amp;&amp; defined(CONFIG_PPC32)</div><div class='ctx'> static int option_lid_wakeup = 1;</div><div class='ctx'> #endif /* CONFIG_PM &amp;&amp; CONFIG_PPC32 */</div><div class='del'>-#if (defined(CONFIG_PM)&amp;&amp;defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT)</div><div class='add'>+#if (defined(CONFIG_PM)&amp;&amp;defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)</div><div class='ctx'> static int sleep_in_progress;</div><div class='ctx'> #endif</div><div class='ctx'> static unsigned long async_req_locks;</div><div class='hunk'>@@ -208,10 +204,6 @@ static int proc_get_info(char *page, char **start, off_t off,</div><div class='ctx'> 			  int count, int *eof, void *data);</div><div class='ctx'> static int proc_get_irqstats(char *page, char **start, off_t off,</div><div class='ctx'> 			  int count, int *eof, void *data);</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static int pmu_set_backlight_level(int level, void* data);</div><div class='del'>-static int pmu_set_backlight_enable(int on, int level, void* data);</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='ctx'> static void pmu_pass_intr(unsigned char *data, int len);</div><div class='ctx'> static int proc_get_batt(char *page, char **start, off_t off,</div><div class='ctx'> 			int count, int *eof, void *data);</div><div class='hunk'>@@ -292,13 +284,6 @@ static char *pbook_type[] = {</div><div class='ctx'> 	"Core99"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static struct backlight_controller pmu_backlight_controller = {</div><div class='del'>-	pmu_set_backlight_enable,</div><div class='del'>-	pmu_set_backlight_level</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='ctx'> int __init find_via_pmu(void)</div><div class='ctx'> {</div><div class='ctx'> 	u64 taddr;</div><div class='hunk'>@@ -414,24 +399,21 @@ static int __init pmu_init(void)</div><div class='ctx'>  */</div><div class='ctx'> static int __init via_pmu_start(void)</div><div class='ctx'> {</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='ctx'> 	if (vias == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	bright_req_1.complete = 1;</div><div class='del'>-	bright_req_2.complete = 1;</div><div class='ctx'> 	batt_req.complete = 1;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_PPC_MERGE</div><div class='del'>-	if (pmu_kind == PMU_KEYLARGO_BASED)</div><div class='del'>-		openpic_set_irq_priority(vias-&gt;intrs[0].line,</div><div class='del'>-					 OPENPIC_PRIORITY_DEFAULT + 1);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (request_irq(vias-&gt;intrs[0].line, via_pmu_interrupt, 0, "VIA-PMU",</div><div class='del'>-			(void *)0)) {</div><div class='del'>-		printk(KERN_ERR "VIA-PMU: can't get irq %d\n",</div><div class='del'>-		       vias-&gt;intrs[0].line);</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+	irq = irq_of_parse_and_map(vias, 0);</div><div class='add'>+	if (irq == NO_IRQ) {</div><div class='add'>+		printk(KERN_ERR "via-pmu: can't map interruptn");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	if (request_irq(irq, via_pmu_interrupt, 0, "VIA-PMU", (void *)0)) {</div><div class='add'>+		printk(KERN_ERR "via-pmu: can't request irq %d\n", irq);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pmu_kind == PMU_KEYLARGO_BASED) {</div><div class='hunk'>@@ -439,10 +421,10 @@ static int __init via_pmu_start(void)</div><div class='ctx'> 		if (gpio_node == NULL)</div><div class='ctx'> 			gpio_node = of_find_node_by_name(NULL,</div><div class='ctx'> 							 "pmu-interrupt");</div><div class='del'>-		if (gpio_node &amp;&amp; gpio_node-&gt;n_intrs &gt; 0)</div><div class='del'>-			gpio_irq = gpio_node-&gt;intrs[0].line;</div><div class='add'>+		if (gpio_node)</div><div class='add'>+			gpio_irq = irq_of_parse_and_map(gpio_node, 0);</div><div class='ctx'> </div><div class='del'>-		if (gpio_irq != -1) {</div><div class='add'>+		if (gpio_irq != NO_IRQ) {</div><div class='ctx'> 			if (request_irq(gpio_irq, gpio1_interrupt, 0,</div><div class='ctx'> 					"GPIO1 ADB", (void *)0))</div><div class='ctx'> 				printk(KERN_ERR "pmu: can't get irq %d"</div><div class='hunk'>@@ -483,9 +465,9 @@ static int __init via_pmu_dev_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	/* Enable backlight */</div><div class='del'>-	register_backlight_controller(&amp;pmu_backlight_controller, NULL, "pmu");</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+	/* Initialize backlight */</div><div class='add'>+	pmu_backlight_init(vias);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC32</div><div class='ctx'>   	if (machine_is_compatible("AAPL,3400/2400") ||</div><div class='hunk'>@@ -1424,7 +1406,7 @@ next:</div><div class='ctx'> #ifdef CONFIG_INPUT_ADBHID</div><div class='ctx'> 			if (!disable_kernel_backlight)</div><div class='ctx'> #endif /* CONFIG_INPUT_ADBHID */</div><div class='del'>-				set_backlight_level(data[1] &gt;&gt; 4);</div><div class='add'>+				pmac_backlight_set_legacy_brightness(data[1] &gt;&gt; 4);</div><div class='ctx'> #endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Tick interrupt */</div><div class='hunk'>@@ -1441,6 +1423,12 @@ next:</div><div class='ctx'> 		if (pmu_battery_count)</div><div class='ctx'> 			query_battery_state();</div><div class='ctx'> 		pmu_pass_intr(data, len);</div><div class='add'>+		/* len == 6 is probably a bad check. But how do I</div><div class='add'>+		 * know what PMU versions send what events here? */</div><div class='add'>+		if (len == 6) {</div><div class='add'>+			via_pmu_event(PMU_EVT_POWER, !!(data[1]&amp;8));</div><div class='add'>+			via_pmu_event(PMU_EVT_LID, data[1]&amp;1);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 	       pmu_pass_intr(data, len);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1674,61 +1662,6 @@ gpio1_interrupt(int irq, void *arg, struct pt_regs *regs)</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static int backlight_to_bright[] = {</div><div class='del'>-	0x7f, 0x46, 0x42, 0x3e, 0x3a, 0x36, 0x32, 0x2e,</div><div class='del'>-	0x2a, 0x26, 0x22, 0x1e, 0x1a, 0x16, 0x12, 0x0e</div><div class='del'>-};</div><div class='del'>- </div><div class='del'>-static int</div><div class='del'>-pmu_set_backlight_enable(int on, int level, void* data)</div><div class='del'>-{</div><div class='del'>-	struct adb_request req;</div><div class='del'>-	</div><div class='del'>-	if (vias == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (on) {</div><div class='del'>-		pmu_request(&amp;req, NULL, 2, PMU_BACKLIGHT_BRIGHT,</div><div class='del'>-			    backlight_to_bright[level]);</div><div class='del'>-		pmu_wait_complete(&amp;req);</div><div class='del'>-	}</div><div class='del'>-	pmu_request(&amp;req, NULL, 2, PMU_POWER_CTRL,</div><div class='del'>-		    PMU_POW_BACKLIGHT | (on ? PMU_POW_ON : PMU_POW_OFF));</div><div class='del'>-       	pmu_wait_complete(&amp;req);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pmu_bright_complete(struct adb_request *req)</div><div class='del'>-{</div><div class='del'>-	if (req == &amp;bright_req_1)</div><div class='del'>-		clear_bit(1, &amp;async_req_locks);</div><div class='del'>-	if (req == &amp;bright_req_2)</div><div class='del'>-		clear_bit(2, &amp;async_req_locks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pmu_set_backlight_level(int level, void* data)</div><div class='del'>-{</div><div class='del'>-	if (vias == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (test_and_set_bit(1, &amp;async_req_locks))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	pmu_request(&amp;bright_req_1, pmu_bright_complete, 2, PMU_BACKLIGHT_BRIGHT,</div><div class='del'>-		backlight_to_bright[level]);</div><div class='del'>-	if (test_and_set_bit(2, &amp;async_req_locks))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	pmu_request(&amp;bright_req_2, pmu_bright_complete, 2, PMU_POWER_CTRL,</div><div class='del'>-		    PMU_POW_BACKLIGHT | (level &gt; BACKLIGHT_OFF ?</div><div class='del'>-					 PMU_POW_ON : PMU_POW_OFF));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> pmu_enable_irled(int on)</div><div class='ctx'> {</div><div class='hunk'>@@ -2145,9 +2078,8 @@ pmac_suspend_devices(void)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Wait for completion of async backlight requests */</div><div class='del'>-	while (!bright_req_1.complete || !bright_req_2.complete ||</div><div class='del'>-			!batt_req.complete)</div><div class='add'>+	/* Wait for completion of async requests */</div><div class='add'>+	while (!batt_req.complete)</div><div class='ctx'> 		pmu_poll();</div><div class='ctx'> </div><div class='ctx'> 	/* Giveup the lazy FPU &amp; vec so we don't have to back them</div><div class='hunk'>@@ -2268,7 +2200,7 @@ static int powerbook_sleep_grackle(void)</div><div class='ctx'>  		_set_L2CR(save_l2cr);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Restore userland MMU context */</div><div class='del'>-	set_context(current-&gt;active_mm-&gt;context, current-&gt;active_mm-&gt;pgd);</div><div class='add'>+	set_context(current-&gt;active_mm-&gt;context.id, current-&gt;active_mm-&gt;pgd);</div><div class='ctx'> </div><div class='ctx'> 	/* Power things up */</div><div class='ctx'> 	pmu_unlock();</div><div class='hunk'>@@ -2366,7 +2298,7 @@ powerbook_sleep_Core99(void)</div><div class='ctx'>  		_set_L3CR(save_l3cr);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Restore userland MMU context */</div><div class='del'>-	set_context(current-&gt;active_mm-&gt;context, current-&gt;active_mm-&gt;pgd);</div><div class='add'>+	set_context(current-&gt;active_mm-&gt;context.id, current-&gt;active_mm-&gt;pgd);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell PMU we are ready */</div><div class='ctx'> 	pmu_unlock();</div><div class='hunk'>@@ -2678,26 +2610,34 @@ pmu_ioctl(struct inode * inode, struct file *filp,</div><div class='ctx'> 			return put_user(1, argp);</div><div class='ctx'> #endif /* CONFIG_PM &amp;&amp; CONFIG_PPC32 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	/* Backlight should have its own device or go via</div><div class='del'>-	 * the fbdev</div><div class='del'>-	 */</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY</div><div class='add'>+	/* Compatibility ioctl's for backlight */</div><div class='ctx'> 	case PMU_IOC_GET_BACKLIGHT:</div><div class='add'>+	{</div><div class='add'>+		int brightness;</div><div class='add'>+</div><div class='ctx'> 		if (sleep_in_progress)</div><div class='ctx'> 			return -EBUSY;</div><div class='del'>-		error = get_backlight_level();</div><div class='del'>-		if (error &lt; 0)</div><div class='del'>-			return error;</div><div class='del'>-		return put_user(error, argp);</div><div class='add'>+</div><div class='add'>+		brightness = pmac_backlight_get_legacy_brightness();</div><div class='add'>+		if (brightness &lt; 0)</div><div class='add'>+			return brightness;</div><div class='add'>+		else</div><div class='add'>+			return put_user(brightness, argp);</div><div class='add'>+</div><div class='add'>+	}</div><div class='ctx'> 	case PMU_IOC_SET_BACKLIGHT:</div><div class='ctx'> 	{</div><div class='del'>-		__u32 value;</div><div class='add'>+		int brightness;</div><div class='add'>+</div><div class='ctx'> 		if (sleep_in_progress)</div><div class='ctx'> 			return -EBUSY;</div><div class='del'>-		error = get_user(value, argp);</div><div class='del'>-		if (!error)</div><div class='del'>-			error = set_backlight_level(value);</div><div class='del'>-		break;</div><div class='add'>+</div><div class='add'>+		error = get_user(brightness, argp);</div><div class='add'>+		if (error)</div><div class='add'>+			return error;</div><div class='add'>+</div><div class='add'>+		return pmac_backlight_set_legacy_brightness(brightness);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_INPUT_ADBHID</div><div class='ctx'> 	case PMU_IOC_GRAB_BACKLIGHT: {</div><div class='hunk'>@@ -2713,7 +2653,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_INPUT_ADBHID */</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+#endif /* CONFIG_PMAC_BACKLIGHT_LEGACY */</div><div class='ctx'> 	case PMU_IOC_GET_MODEL:</div><div class='ctx'> 	    	return put_user(pmu_kind, argp);</div><div class='ctx'> 	case PMU_IOC_HAS_ADB:</div><div class='head'>diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c<br/>index 81337cd16e80..900aade06198 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/macintosh/windfarm_cpufreq_clamp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/macintosh/windfarm_cpufreq_clamp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/macintosh/windfarm_cpufreq_clamp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/macintosh/windfarm_cpufreq_clamp.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig<br/>index ac25a48362ac..bf869ed03eed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/Kconfig</a></div><div class='hunk'>@@ -90,7 +90,7 @@ config MD_RAID10</div><div class='ctx'> 	depends on BLK_DEV_MD &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  RAID-10 provides a combination of striping (RAID-0) and</div><div class='del'>-	  mirroring (RAID-1) with easier configuration and more flexable</div><div class='add'>+	  mirroring (RAID-1) with easier configuration and more flexible</div><div class='ctx'> 	  layout.</div><div class='ctx'> 	  Unlike RAID-0, but like RAID-1, RAID-10 requires all devices to</div><div class='ctx'> 	  be the same size (or at least, only as much as the smallest device</div><div class='hunk'>@@ -104,8 +104,8 @@ config MD_RAID10</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='del'>-config MD_RAID5</div><div class='del'>-	tristate "RAID-4/RAID-5 mode"</div><div class='add'>+config MD_RAID456</div><div class='add'>+	tristate "RAID-4/RAID-5/RAID-6 mode"</div><div class='ctx'> 	depends on BLK_DEV_MD</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  A RAID-5 set of N drives with a capacity of C MB per drive provides</div><div class='hunk'>@@ -116,20 +116,28 @@ config MD_RAID5</div><div class='ctx'> 	  while a RAID-5 set distributes the parity across the drives in one</div><div class='ctx'> 	  of the available parity distribution methods.</div><div class='ctx'> </div><div class='add'>+	  A RAID-6 set of N drives with a capacity of C MB per drive</div><div class='add'>+	  provides the capacity of C * (N - 2) MB, and protects</div><div class='add'>+	  against a failure of any two drives. For a given sector</div><div class='add'>+	  (row) number, (N - 2) drives contain data sectors, and two</div><div class='add'>+	  drives contains two independent redundancy syndromes.  Like</div><div class='add'>+	  RAID-5, RAID-6 distributes the syndromes across the drives</div><div class='add'>+	  in one of the available parity distribution methods.</div><div class='add'>+</div><div class='ctx'> 	  Information about Software RAID on Linux is contained in the</div><div class='ctx'> 	  Software-RAID mini-HOWTO, available from</div><div class='ctx'> 	  &lt;http://www.tldp.org/docs.html#howto&gt;. There you will also</div><div class='ctx'> 	  learn where to get the supporting user space utilities raidtools.</div><div class='ctx'> </div><div class='del'>-	  If you want to use such a RAID-4/RAID-5 set, say Y.  To</div><div class='add'>+	  If you want to use such a RAID-4/RAID-5/RAID-6 set, say Y.  To</div><div class='ctx'> 	  compile this code as a module, choose M here: the module</div><div class='del'>-	  will be called raid5.</div><div class='add'>+	  will be called raid456.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config MD_RAID5_RESHAPE</div><div class='ctx'> 	bool "Support adding drives to a raid-5 array (experimental)"</div><div class='del'>-	depends on MD_RAID5 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on MD_RAID456 &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  A RAID-5 set can be expanded by adding extra drives. This</div><div class='ctx'> 	  requires "restriping" the array which means (almost) every</div><div class='hunk'>@@ -139,7 +147,7 @@ config MD_RAID5_RESHAPE</div><div class='ctx'> 	  is online.  However it is still EXPERIMENTAL code.  It should</div><div class='ctx'> 	  work, but please be sure that you have backups.</div><div class='ctx'> </div><div class='del'>-	  You will need mdadm verion 2.4.1 or later to use this</div><div class='add'>+	  You will need mdadm version 2.4.1 or later to use this</div><div class='ctx'> 	  feature safely.  During the early stage of reshape there is</div><div class='ctx'> 	  a critical section where live data is being over-written.  A</div><div class='ctx'> 	  crash during this time needs extra care for recovery.  The</div><div class='hunk'>@@ -154,28 +162,6 @@ config MD_RAID5_RESHAPE</div><div class='ctx'> 	  There should be enough spares already present to make the new</div><div class='ctx'> 	  array workable.</div><div class='ctx'> </div><div class='del'>-config MD_RAID6</div><div class='del'>-	tristate "RAID-6 mode"</div><div class='del'>-	depends on BLK_DEV_MD</div><div class='del'>-	---help---</div><div class='del'>-	  A RAID-6 set of N drives with a capacity of C MB per drive</div><div class='del'>-	  provides the capacity of C * (N - 2) MB, and protects</div><div class='del'>-	  against a failure of any two drives. For a given sector</div><div class='del'>-	  (row) number, (N - 2) drives contain data sectors, and two</div><div class='del'>-	  drives contains two independent redundancy syndromes.  Like</div><div class='del'>-	  RAID-5, RAID-6 distributes the syndromes across the drives</div><div class='del'>-	  in one of the available parity distribution methods.</div><div class='del'>-</div><div class='del'>-	  RAID-6 requires mdadm-1.5.0 or later, available at:</div><div class='del'>-</div><div class='del'>-	  ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/</div><div class='del'>-</div><div class='del'>-	  If you want to use such a RAID-6 set, say Y.  To compile</div><div class='del'>-	  this code as a module, choose M here: the module will be</div><div class='del'>-	  called raid6.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='ctx'> config MD_MULTIPATH</div><div class='ctx'> 	tristate "Multipath I/O support"</div><div class='ctx'> 	depends on BLK_DEV_MD</div><div class='hunk'>@@ -235,7 +221,7 @@ config DM_SNAPSHOT</div><div class='ctx'>        tristate "Snapshot target (EXPERIMENTAL)"</div><div class='ctx'>        depends on BLK_DEV_DM &amp;&amp; EXPERIMENTAL</div><div class='ctx'>        ---help---</div><div class='del'>-         Allow volume managers to take writeable snapshots of a device.</div><div class='add'>+         Allow volume managers to take writable snapshots of a device.</div><div class='ctx'> </div><div class='ctx'> config DM_MIRROR</div><div class='ctx'>        tristate "Mirror target (EXPERIMENTAL)"</div><div class='head'>diff --git a/drivers/md/Makefile b/drivers/md/Makefile<br/>index d3efedf6a6ad..34957a68d921 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/Makefile</a></div><div class='hunk'>@@ -8,7 +8,7 @@ dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o</div><div class='ctx'> dm-snapshot-objs := dm-snap.o dm-exception-store.o</div><div class='ctx'> dm-mirror-objs	:= dm-log.o dm-raid1.o</div><div class='ctx'> md-mod-objs     := md.o bitmap.o</div><div class='del'>-raid6-objs	:= raid6main.o raid6algos.o raid6recov.o raid6tables.o \</div><div class='add'>+raid456-objs	:= raid5.o raid6algos.o raid6recov.o raid6tables.o \</div><div class='ctx'> 		   raid6int1.o raid6int2.o raid6int4.o \</div><div class='ctx'> 		   raid6int8.o raid6int16.o raid6int32.o \</div><div class='ctx'> 		   raid6altivec1.o raid6altivec2.o raid6altivec4.o \</div><div class='hunk'>@@ -25,8 +25,7 @@ obj-$(CONFIG_MD_LINEAR)		+= linear.o</div><div class='ctx'> obj-$(CONFIG_MD_RAID0)		+= raid0.o</div><div class='ctx'> obj-$(CONFIG_MD_RAID1)		+= raid1.o</div><div class='ctx'> obj-$(CONFIG_MD_RAID10)		+= raid10.o</div><div class='del'>-obj-$(CONFIG_MD_RAID5)		+= raid5.o xor.o</div><div class='del'>-obj-$(CONFIG_MD_RAID6)		+= raid6.o xor.o</div><div class='add'>+obj-$(CONFIG_MD_RAID456)	+= raid456.o xor.o</div><div class='ctx'> obj-$(CONFIG_MD_MULTIPATH)	+= multipath.o</div><div class='ctx'> obj-$(CONFIG_MD_FAULTY)		+= faulty.o</div><div class='ctx'> obj-$(CONFIG_BLK_DEV_MD)	+= md-mod.o</div><div class='head'>diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c<br/>index f8ffaee20ff8..ecc56765d949 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/bitmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/bitmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/bitmap.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * additions, Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc.:</div><div class='ctx'>  * - added disk storage for bitmap</div><div class='ctx'>  * - changes to allow various bitmap chunk sizes</div><div class='del'>- * - added bitmap daemon (to asynchronously clear bitmap bits from disk)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -15,16 +14,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  * flush after percent set rather than just time based. (maybe both).</div><div class='ctx'>  * wait if count gets too high, wake when it drops to half.</div><div class='del'>- * allow bitmap to be mirrored with superblock (before or after...)</div><div class='del'>- * allow hot-add to re-instate a current device.</div><div class='del'>- * allow hot-add of bitmap after quiessing device</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -73,24 +68,6 @@ static inline char * bmname(struct bitmap *bitmap)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * test if the bitmap is active</div><div class='del'>- */</div><div class='del'>-int bitmap_active(struct bitmap *bitmap)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int res = 0;</div><div class='del'>-</div><div class='del'>-	if (!bitmap)</div><div class='del'>-		return res;</div><div class='del'>-	spin_lock_irqsave(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-	res = bitmap-&gt;flags &amp; BITMAP_ACTIVE;</div><div class='del'>-	spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define WRITE_POOL_SIZE 256</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * just a placeholder - calls kmalloc for bitmap pages</div><div class='ctx'>  */</div><div class='ctx'> static unsigned char *bitmap_alloc_page(struct bitmap *bitmap)</div><div class='hunk'>@@ -269,6 +246,8 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde</div><div class='ctx'> </div><div class='ctx'> 		if (sync_page_io(rdev-&gt;bdev, target, PAGE_SIZE, page, READ)) {</div><div class='ctx'> 			page-&gt;index = index;</div><div class='add'>+			attach_page_buffers(page, NULL); /* so that free_buffer will</div><div class='add'>+							  * quietly no-op */</div><div class='ctx'> 			return page;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -300,77 +279,132 @@ static int write_sb_page(mddev_t *mddev, long offset, struct page *page, int wai</div><div class='ctx'>  */</div><div class='ctx'> static int write_page(struct bitmap *bitmap, struct page *page, int wait)</div><div class='ctx'> {</div><div class='del'>-	int ret = -ENOMEM;</div><div class='add'>+	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	if (bitmap-&gt;file == NULL)</div><div class='ctx'> 		return write_sb_page(bitmap-&gt;mddev, bitmap-&gt;offset, page, wait);</div><div class='ctx'> </div><div class='del'>-	flush_dcache_page(page); /* make sure visible to anyone reading the file */</div><div class='add'>+	bh = page_buffers(page);</div><div class='ctx'> </div><div class='del'>-	if (wait)</div><div class='del'>-		lock_page(page);</div><div class='del'>-	else {</div><div class='del'>-		if (TestSetPageLocked(page))</div><div class='del'>-			return -EAGAIN; /* already locked */</div><div class='del'>-		if (PageWriteback(page)) {</div><div class='del'>-			unlock_page(page);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='add'>+	while (bh &amp;&amp; bh-&gt;b_blocknr) {</div><div class='add'>+		atomic_inc(&amp;bitmap-&gt;pending_writes);</div><div class='add'>+		set_buffer_locked(bh);</div><div class='add'>+		set_buffer_mapped(bh);</div><div class='add'>+		submit_bh(WRITE, bh);</div><div class='add'>+		bh = bh-&gt;b_this_page;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = page-&gt;mapping-&gt;a_ops-&gt;prepare_write(bitmap-&gt;file, page, 0, PAGE_SIZE);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = page-&gt;mapping-&gt;a_ops-&gt;commit_write(bitmap-&gt;file, page, 0,</div><div class='del'>-			PAGE_SIZE);</div><div class='del'>-	if (ret) {</div><div class='del'>-		unlock_page(page);</div><div class='del'>-		return ret;</div><div class='add'>+	if (wait) {</div><div class='add'>+		wait_event(bitmap-&gt;write_wait,</div><div class='add'>+			   atomic_read(&amp;bitmap-&gt;pending_writes)==0);</div><div class='add'>+		return (bitmap-&gt;flags &amp; BITMAP_WRITE_ERROR) ? -EIO : 0;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	set_page_dirty(page); /* force it to be written out */</div><div class='del'>-</div><div class='del'>-	if (!wait) {</div><div class='del'>-		/* add to list to be waited for by daemon */</div><div class='del'>-		struct page_list *item = mempool_alloc(bitmap-&gt;write_pool, GFP_NOIO);</div><div class='del'>-		item-&gt;page = page;</div><div class='del'>-		get_page(page);</div><div class='del'>-		spin_lock(&amp;bitmap-&gt;write_lock);</div><div class='del'>-		list_add(&amp;item-&gt;list, &amp;bitmap-&gt;complete_pages);</div><div class='del'>-		spin_unlock(&amp;bitmap-&gt;write_lock);</div><div class='del'>-		md_wakeup_thread(bitmap-&gt;writeback_daemon);</div><div class='add'>+static void end_bitmap_write(struct buffer_head *bh, int uptodate)</div><div class='add'>+{</div><div class='add'>+	struct bitmap *bitmap = bh-&gt;b_private;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!uptodate) {</div><div class='add'>+		spin_lock_irqsave(&amp;bitmap-&gt;lock, flags);</div><div class='add'>+		bitmap-&gt;flags |= BITMAP_WRITE_ERROR;</div><div class='add'>+		spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+	if (atomic_dec_and_test(&amp;bitmap-&gt;pending_writes))</div><div class='add'>+		wake_up(&amp;bitmap-&gt;write_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copied from buffer.c */</div><div class='add'>+static void</div><div class='add'>+__clear_page_buffers(struct page *page)</div><div class='add'>+{</div><div class='add'>+	ClearPagePrivate(page);</div><div class='add'>+	set_page_private(page, 0);</div><div class='add'>+	page_cache_release(page);</div><div class='add'>+}</div><div class='add'>+static void free_buffers(struct page *page)</div><div class='add'>+{</div><div class='add'>+	struct buffer_head *bh = page_buffers(page);</div><div class='add'>+</div><div class='add'>+	while (bh) {</div><div class='add'>+		struct buffer_head *next = bh-&gt;b_this_page;</div><div class='add'>+		free_buffer_head(bh);</div><div class='add'>+		bh = next;</div><div class='ctx'> 	}</div><div class='del'>-	return write_one_page(page, wait);</div><div class='add'>+	__clear_page_buffers(page);</div><div class='add'>+	put_page(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* read a page from a file, pinning it into cache, and return bytes_read */</div><div class='add'>+/* read a page from a file.</div><div class='add'>+ * We both read the page, and attach buffers to the page to record the</div><div class='add'>+ * address of each block (using bmap).  These addresses will be used</div><div class='add'>+ * to write the block later, completely bypassing the filesystem.</div><div class='add'>+ * This usage is similar to how swap files are handled, and allows us</div><div class='add'>+ * to write to a file with no concerns of memory allocation failing.</div><div class='add'>+ */</div><div class='ctx'> static struct page *read_page(struct file *file, unsigned long index,</div><div class='del'>-					unsigned long *bytes_read)</div><div class='add'>+			      struct bitmap *bitmap,</div><div class='add'>+			      unsigned long count)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct page *page = NULL;</div><div class='del'>-	loff_t isize = i_size_read(inode);</div><div class='del'>-	unsigned long end_index = isize &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+	struct buffer_head *bh;</div><div class='add'>+	sector_t block;</div><div class='ctx'> </div><div class='ctx'> 	PRINTK("read bitmap file (%dB @ %Lu)\n", (int)PAGE_SIZE,</div><div class='ctx'> 			(unsigned long long)index &lt;&lt; PAGE_SHIFT);</div><div class='ctx'> </div><div class='del'>-	page = read_cache_page(inode-&gt;i_mapping, index,</div><div class='del'>-			(filler_t *)inode-&gt;i_mapping-&gt;a_ops-&gt;readpage, file);</div><div class='add'>+	page = alloc_page(GFP_KERNEL);</div><div class='add'>+	if (!page)</div><div class='add'>+		page = ERR_PTR(-ENOMEM);</div><div class='ctx'> 	if (IS_ERR(page))</div><div class='ctx'> 		goto out;</div><div class='del'>-	wait_on_page_locked(page);</div><div class='del'>-	if (!PageUptodate(page) || PageError(page)) {</div><div class='add'>+</div><div class='add'>+	bh = alloc_page_buffers(page, 1&lt;&lt;inode-&gt;i_blkbits, 0);</div><div class='add'>+	if (!bh) {</div><div class='ctx'> 		put_page(page);</div><div class='del'>-		page = ERR_PTR(-EIO);</div><div class='add'>+		page = ERR_PTR(-ENOMEM);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	attach_page_buffers(page, bh);</div><div class='add'>+	block = index &lt;&lt; (PAGE_SHIFT - inode-&gt;i_blkbits);</div><div class='add'>+	while (bh) {</div><div class='add'>+		if (count == 0)</div><div class='add'>+			bh-&gt;b_blocknr = 0;</div><div class='add'>+		else {</div><div class='add'>+			bh-&gt;b_blocknr = bmap(inode, block);</div><div class='add'>+			if (bh-&gt;b_blocknr == 0) {</div><div class='add'>+				/* Cannot use this file! */</div><div class='add'>+				free_buffers(page);</div><div class='add'>+				page = ERR_PTR(-EINVAL);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			bh-&gt;b_bdev = inode-&gt;i_sb-&gt;s_bdev;</div><div class='add'>+			if (count &lt; (1&lt;&lt;inode-&gt;i_blkbits))</div><div class='add'>+				count = 0;</div><div class='add'>+			else</div><div class='add'>+				count -= (1&lt;&lt;inode-&gt;i_blkbits);</div><div class='add'>+</div><div class='add'>+			bh-&gt;b_end_io = end_bitmap_write;</div><div class='add'>+			bh-&gt;b_private = bitmap;</div><div class='add'>+			atomic_inc(&amp;bitmap-&gt;pending_writes);</div><div class='add'>+			set_buffer_locked(bh);</div><div class='add'>+			set_buffer_mapped(bh);</div><div class='add'>+			submit_bh(READ, bh);</div><div class='add'>+		}</div><div class='add'>+		block++;</div><div class='add'>+		bh = bh-&gt;b_this_page;</div><div class='add'>+	}</div><div class='add'>+	page-&gt;index = index;</div><div class='ctx'> </div><div class='del'>-	if (index &gt; end_index) /* we have read beyond EOF */</div><div class='del'>-		*bytes_read = 0;</div><div class='del'>-	else if (index == end_index) /* possible short read */</div><div class='del'>-		*bytes_read = isize &amp; ~PAGE_MASK;</div><div class='del'>-	else</div><div class='del'>-		*bytes_read = PAGE_SIZE; /* got a full page */</div><div class='add'>+	wait_event(bitmap-&gt;write_wait,</div><div class='add'>+		   atomic_read(&amp;bitmap-&gt;pending_writes)==0);</div><div class='add'>+	if (bitmap-&gt;flags &amp; BITMAP_WRITE_ERROR) {</div><div class='add'>+		free_buffers(page);</div><div class='add'>+		page = ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='ctx'> out:</div><div class='ctx'> 	if (IS_ERR(page))</div><div class='ctx'> 		printk(KERN_ALERT "md: bitmap read error: (%dB @ %Lu): %ld\n",</div><div class='hunk'>@@ -441,16 +475,14 @@ static int bitmap_read_sb(struct bitmap *bitmap)</div><div class='ctx'> 	char *reason = NULL;</div><div class='ctx'> 	bitmap_super_t *sb;</div><div class='ctx'> 	unsigned long chunksize, daemon_sleep, write_behind;</div><div class='del'>-	unsigned long bytes_read;</div><div class='ctx'> 	unsigned long long events;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* page 0 is the superblock, read it... */</div><div class='ctx'> 	if (bitmap-&gt;file)</div><div class='del'>-		bitmap-&gt;sb_page = read_page(bitmap-&gt;file, 0, &amp;bytes_read);</div><div class='add'>+		bitmap-&gt;sb_page = read_page(bitmap-&gt;file, 0, bitmap, PAGE_SIZE);</div><div class='ctx'> 	else {</div><div class='ctx'> 		bitmap-&gt;sb_page = read_sb_page(bitmap-&gt;mddev, bitmap-&gt;offset, 0);</div><div class='del'>-		bytes_read = PAGE_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (IS_ERR(bitmap-&gt;sb_page)) {</div><div class='ctx'> 		err = PTR_ERR(bitmap-&gt;sb_page);</div><div class='hunk'>@@ -460,13 +492,6 @@ static int bitmap_read_sb(struct bitmap *bitmap)</div><div class='ctx'> </div><div class='ctx'> 	sb = (bitmap_super_t *)kmap_atomic(bitmap-&gt;sb_page, KM_USER0);</div><div class='ctx'> </div><div class='del'>-	if (bytes_read &lt; sizeof(*sb)) { /* short read */</div><div class='del'>-		printk(KERN_INFO "%s: bitmap file superblock truncated\n",</div><div class='del'>-			bmname(bitmap));</div><div class='del'>-		err = -ENOSPC;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chunksize = le32_to_cpu(sb-&gt;chunksize);</div><div class='ctx'> 	daemon_sleep = le32_to_cpu(sb-&gt;daemon_sleep);</div><div class='ctx'> 	write_behind = le32_to_cpu(sb-&gt;write_behind);</div><div class='hunk'>@@ -550,7 +575,6 @@ static void bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	get_page(bitmap-&gt;sb_page);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> 	sb = (bitmap_super_t *)kmap_atomic(bitmap-&gt;sb_page, KM_USER0);</div><div class='ctx'> 	switch (op) {</div><div class='hunk'>@@ -561,7 +585,6 @@ static void bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,</div><div class='ctx'> 		default: BUG();</div><div class='ctx'> 	}</div><div class='ctx'> 	kunmap_atomic(sb, KM_USER0);</div><div class='del'>-	put_page(bitmap-&gt;sb_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -614,48 +637,17 @@ static void bitmap_file_unmap(struct bitmap *bitmap)</div><div class='ctx'> </div><div class='ctx'> 	while (pages--)</div><div class='ctx'> 		if (map[pages]-&gt;index != 0) /* 0 is sb_page, release it below */</div><div class='del'>-			put_page(map[pages]);</div><div class='add'>+			free_buffers(map[pages]);</div><div class='ctx'> 	kfree(map);</div><div class='ctx'> 	kfree(attr);</div><div class='ctx'> </div><div class='del'>-	safe_put_page(sb_page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bitmap_stop_daemon(struct bitmap *bitmap);</div><div class='del'>-</div><div class='del'>-/* dequeue the next item in a page list -- don't call from irq context */</div><div class='del'>-static struct page_list *dequeue_page(struct bitmap *bitmap)</div><div class='del'>-{</div><div class='del'>-	struct page_list *item = NULL;</div><div class='del'>-	struct list_head *head = &amp;bitmap-&gt;complete_pages;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;bitmap-&gt;write_lock);</div><div class='del'>-	if (list_empty(head))</div><div class='del'>-		goto out;</div><div class='del'>-	item = list_entry(head-&gt;prev, struct page_list, list);</div><div class='del'>-	list_del(head-&gt;prev);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock(&amp;bitmap-&gt;write_lock);</div><div class='del'>-	return item;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void drain_write_queues(struct bitmap *bitmap)</div><div class='del'>-{</div><div class='del'>-	struct page_list *item;</div><div class='del'>-</div><div class='del'>-	while ((item = dequeue_page(bitmap))) {</div><div class='del'>-		/* don't bother to wait */</div><div class='del'>-		put_page(item-&gt;page);</div><div class='del'>-		mempool_free(item, bitmap-&gt;write_pool);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	wake_up(&amp;bitmap-&gt;write_wait);</div><div class='add'>+	if (sb_page)</div><div class='add'>+		free_buffers(sb_page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bitmap_file_put(struct bitmap *bitmap)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *file;</div><div class='del'>-	struct inode *inode;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bitmap-&gt;lock, flags);</div><div class='hunk'>@@ -663,17 +655,14 @@ static void bitmap_file_put(struct bitmap *bitmap)</div><div class='ctx'> 	bitmap-&gt;file = NULL;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	bitmap_stop_daemon(bitmap);</div><div class='del'>-</div><div class='del'>-	drain_write_queues(bitmap);</div><div class='del'>-</div><div class='add'>+	if (file)</div><div class='add'>+		wait_event(bitmap-&gt;write_wait,</div><div class='add'>+			   atomic_read(&amp;bitmap-&gt;pending_writes)==0);</div><div class='ctx'> 	bitmap_file_unmap(bitmap);</div><div class='ctx'> </div><div class='ctx'> 	if (file) {</div><div class='del'>-		inode = file-&gt;f_mapping-&gt;host;</div><div class='del'>-		spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-		atomic_set(&amp;inode-&gt;i_writecount, 1); /* allow writes again */</div><div class='del'>-		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+		invalidate_inode_pages(inode-&gt;i_mapping);</div><div class='ctx'> 		fput(file);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -708,26 +697,27 @@ static void bitmap_file_kick(struct bitmap *bitmap)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum bitmap_page_attr {</div><div class='del'>-	BITMAP_PAGE_DIRTY = 1, // there are set bits that need to be synced</div><div class='del'>-	BITMAP_PAGE_CLEAN = 2, // there are bits that might need to be cleared</div><div class='del'>-	BITMAP_PAGE_NEEDWRITE=4, // there are cleared bits that need to be synced</div><div class='add'>+	BITMAP_PAGE_DIRTY = 0, // there are set bits that need to be synced</div><div class='add'>+	BITMAP_PAGE_CLEAN = 1, // there are bits that might need to be cleared</div><div class='add'>+	BITMAP_PAGE_NEEDWRITE=2, // there are cleared bits that need to be synced</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void set_page_attr(struct bitmap *bitmap, struct page *page,</div><div class='ctx'> 				enum bitmap_page_attr attr)</div><div class='ctx'> {</div><div class='del'>-	bitmap-&gt;filemap_attr[page-&gt;index] |= attr;</div><div class='add'>+	__set_bit((page-&gt;index&lt;&lt;2) + attr, bitmap-&gt;filemap_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void clear_page_attr(struct bitmap *bitmap, struct page *page,</div><div class='ctx'> 				enum bitmap_page_attr attr)</div><div class='ctx'> {</div><div class='del'>-	bitmap-&gt;filemap_attr[page-&gt;index] &amp;= ~attr;</div><div class='add'>+	__clear_bit((page-&gt;index&lt;&lt;2) + attr, bitmap-&gt;filemap_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned long get_page_attr(struct bitmap *bitmap, struct page *page)</div><div class='add'>+static inline unsigned long test_page_attr(struct bitmap *bitmap, struct page *page,</div><div class='add'>+					   enum bitmap_page_attr attr)</div><div class='ctx'> {</div><div class='del'>-	return bitmap-&gt;filemap_attr[page-&gt;index];</div><div class='add'>+	return test_bit((page-&gt;index&lt;&lt;2) + attr, bitmap-&gt;filemap_attr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -751,11 +741,6 @@ static void bitmap_file_set_bit(struct bitmap *bitmap, sector_t block)</div><div class='ctx'> 	page = filemap_get_page(bitmap, chunk);</div><div class='ctx'> 	bit = file_page_offset(chunk);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	/* make sure the page stays cached until it gets written out */</div><div class='del'>-	if (! (get_page_attr(bitmap, page) &amp; BITMAP_PAGE_DIRTY))</div><div class='del'>-		get_page(page);</div><div class='del'>-</div><div class='ctx'>  	/* set the bit */</div><div class='ctx'> 	kaddr = kmap_atomic(page, KM_USER0);</div><div class='ctx'> 	if (bitmap-&gt;flags &amp; BITMAP_HOSTENDIAN)</div><div class='hunk'>@@ -775,7 +760,8 @@ static void bitmap_file_set_bit(struct bitmap *bitmap, sector_t block)</div><div class='ctx'>  * sync the dirty pages of the bitmap file to disk */</div><div class='ctx'> int bitmap_unplug(struct bitmap *bitmap)</div><div class='ctx'> {</div><div class='del'>-	unsigned long i, attr, flags;</div><div class='add'>+	unsigned long i, flags;</div><div class='add'>+	int dirty, need_write;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	int wait = 0;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -792,35 +778,26 @@ int bitmap_unplug(struct bitmap *bitmap)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		page = bitmap-&gt;filemap[i];</div><div class='del'>-		attr = get_page_attr(bitmap, page);</div><div class='add'>+		dirty = test_page_attr(bitmap, page, BITMAP_PAGE_DIRTY);</div><div class='add'>+		need_write = test_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);</div><div class='ctx'> 		clear_page_attr(bitmap, page, BITMAP_PAGE_DIRTY);</div><div class='ctx'> 		clear_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);</div><div class='del'>-		if ((attr &amp; BITMAP_PAGE_DIRTY))</div><div class='add'>+		if (dirty)</div><div class='ctx'> 			wait = 1;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		if (attr &amp; (BITMAP_PAGE_DIRTY | BITMAP_PAGE_NEEDWRITE)) {</div><div class='add'>+		if (dirty | need_write)</div><div class='ctx'> 			err = write_page(bitmap, page, 0);</div><div class='del'>-			if (err == -EAGAIN) {</div><div class='del'>-				if (attr &amp; BITMAP_PAGE_DIRTY)</div><div class='del'>-					err = write_page(bitmap, page, 1);</div><div class='del'>-				else</div><div class='del'>-					err = 0;</div><div class='del'>-			}</div><div class='del'>-			if (err)</div><div class='del'>-				return 1;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (wait) { /* if any writes were performed, we need to wait on them */</div><div class='del'>-		if (bitmap-&gt;file) {</div><div class='del'>-			spin_lock_irq(&amp;bitmap-&gt;write_lock);</div><div class='del'>-			wait_event_lock_irq(bitmap-&gt;write_wait,</div><div class='del'>-					    list_empty(&amp;bitmap-&gt;complete_pages), bitmap-&gt;write_lock,</div><div class='del'>-					    wake_up_process(bitmap-&gt;writeback_daemon-&gt;tsk));</div><div class='del'>-			spin_unlock_irq(&amp;bitmap-&gt;write_lock);</div><div class='del'>-		} else</div><div class='add'>+		if (bitmap-&gt;file)</div><div class='add'>+			wait_event(bitmap-&gt;write_wait,</div><div class='add'>+				   atomic_read(&amp;bitmap-&gt;pending_writes)==0);</div><div class='add'>+		else</div><div class='ctx'> 			md_super_wait(bitmap-&gt;mddev);</div><div class='ctx'> 	}</div><div class='add'>+	if (bitmap-&gt;flags &amp; BITMAP_WRITE_ERROR)</div><div class='add'>+		bitmap_file_kick(bitmap);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -842,7 +819,7 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)</div><div class='ctx'> 	struct page *page = NULL, *oldpage = NULL;</div><div class='ctx'> 	unsigned long num_pages, bit_cnt = 0;</div><div class='ctx'> 	struct file *file;</div><div class='del'>-	unsigned long bytes, offset, dummy;</div><div class='add'>+	unsigned long bytes, offset;</div><div class='ctx'> 	int outofdate;</div><div class='ctx'> 	int ret = -ENOSPC;</div><div class='ctx'> 	void *paddr;</div><div class='hunk'>@@ -879,7 +856,12 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)</div><div class='ctx'> 	if (!bitmap-&gt;filemap)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	bitmap-&gt;filemap_attr = kzalloc(sizeof(long) * num_pages, GFP_KERNEL);</div><div class='add'>+	/* We need 4 bits per page, rounded up to a multiple of sizeof(unsigned long) */</div><div class='add'>+	bitmap-&gt;filemap_attr = kzalloc(</div><div class='add'>+		(((num_pages*4/8)+sizeof(unsigned long)-1)</div><div class='add'>+		 /sizeof(unsigned long))</div><div class='add'>+		*sizeof(unsigned long),</div><div class='add'>+		GFP_KERNEL);</div><div class='ctx'> 	if (!bitmap-&gt;filemap_attr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -890,7 +872,12 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)</div><div class='ctx'> 		index = file_page_index(i);</div><div class='ctx'> 		bit = file_page_offset(i);</div><div class='ctx'> 		if (index != oldindex) { /* this is a new page, read it in */</div><div class='add'>+			int count;</div><div class='ctx'> 			/* unmap the old page, we're done with it */</div><div class='add'>+			if (index == num_pages-1)</div><div class='add'>+				count = bytes - index * PAGE_SIZE;</div><div class='add'>+			else</div><div class='add'>+				count = PAGE_SIZE;</div><div class='ctx'> 			if (index == 0) {</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * if we're here then the superblock page</div><div class='hunk'>@@ -900,7 +887,7 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)</div><div class='ctx'> 				page = bitmap-&gt;sb_page;</div><div class='ctx'> 				offset = sizeof(bitmap_super_t);</div><div class='ctx'> 			} else if (file) {</div><div class='del'>-				page = read_page(file, index, &amp;dummy);</div><div class='add'>+				page = read_page(file, index, bitmap, count);</div><div class='ctx'> 				offset = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				page = read_sb_page(bitmap-&gt;mddev, bitmap-&gt;offset, index);</div><div class='hunk'>@@ -971,12 +958,11 @@ void bitmap_write_all(struct bitmap *bitmap)</div><div class='ctx'> 	/* We don't actually write all bitmap blocks here,</div><div class='ctx'> 	 * just flag them as needing to be written</div><div class='ctx'> 	 */</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	unsigned long chunks = bitmap-&gt;chunks;</div><div class='del'>-	unsigned long bytes = (chunks+7)/8 + sizeof(bitmap_super_t);</div><div class='del'>-	unsigned long num_pages = (bytes + PAGE_SIZE-1) / PAGE_SIZE;</div><div class='del'>-	while (num_pages--)</div><div class='del'>-		bitmap-&gt;filemap_attr[num_pages] |= BITMAP_PAGE_NEEDWRITE;</div><div class='add'>+	for (i=0; i &lt; bitmap-&gt;file_pages; i++)</div><div class='add'>+		set_page_attr(bitmap, bitmap-&gt;filemap[i],</div><div class='add'>+			      BITMAP_PAGE_NEEDWRITE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1007,7 +993,6 @@ int bitmap_daemon_work(struct bitmap *bitmap)</div><div class='ctx'> 	struct page *page = NULL, *lastpage = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int blocks;</div><div class='del'>-	int attr;</div><div class='ctx'> 	void *paddr;</div><div class='ctx'> </div><div class='ctx'> 	if (bitmap == NULL)</div><div class='hunk'>@@ -1029,43 +1014,34 @@ int bitmap_daemon_work(struct bitmap *bitmap)</div><div class='ctx'> </div><div class='ctx'> 		if (page != lastpage) {</div><div class='ctx'> 			/* skip this page unless it's marked as needing cleaning */</div><div class='del'>-			if (!((attr=get_page_attr(bitmap, page)) &amp; BITMAP_PAGE_CLEAN)) {</div><div class='del'>-				if (attr &amp; BITMAP_PAGE_NEEDWRITE) {</div><div class='del'>-					get_page(page);</div><div class='add'>+			if (!test_page_attr(bitmap, page, BITMAP_PAGE_CLEAN)) {</div><div class='add'>+				int need_write = test_page_attr(bitmap, page,</div><div class='add'>+								BITMAP_PAGE_NEEDWRITE);</div><div class='add'>+				if (need_write)</div><div class='ctx'> 					clear_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);</div><div class='del'>-				}</div><div class='add'>+</div><div class='ctx'> 				spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-				if (attr &amp; BITMAP_PAGE_NEEDWRITE) {</div><div class='add'>+				if (need_write) {</div><div class='ctx'> 					switch (write_page(bitmap, page, 0)) {</div><div class='del'>-					case -EAGAIN:</div><div class='del'>-						set_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);</div><div class='del'>-						break;</div><div class='ctx'> 					case 0:</div><div class='ctx'> 						break;</div><div class='ctx'> 					default:</div><div class='ctx'> 						bitmap_file_kick(bitmap);</div><div class='ctx'> 					}</div><div class='del'>-					put_page(page);</div><div class='ctx'> 				}</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* grab the new page, sync and release the old */</div><div class='del'>-			get_page(page);</div><div class='ctx'> 			if (lastpage != NULL) {</div><div class='del'>-				if (get_page_attr(bitmap, lastpage) &amp; BITMAP_PAGE_NEEDWRITE) {</div><div class='add'>+				if (test_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE)) {</div><div class='ctx'> 					clear_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);</div><div class='ctx'> 					spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> 					err = write_page(bitmap, lastpage, 0);</div><div class='del'>-					if (err == -EAGAIN) {</div><div class='del'>-						err = 0;</div><div class='del'>-						set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);</div><div class='del'>-					}</div><div class='ctx'> 				} else {</div><div class='ctx'> 					set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);</div><div class='ctx'> 					spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> 				}</div><div class='del'>-				put_page(lastpage);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					bitmap_file_kick(bitmap);</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -1107,131 +1083,19 @@ int bitmap_daemon_work(struct bitmap *bitmap)</div><div class='ctx'> 	/* now sync the final page */</div><div class='ctx'> 	if (lastpage != NULL) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-		if (get_page_attr(bitmap, lastpage) &amp;BITMAP_PAGE_NEEDWRITE) {</div><div class='add'>+		if (test_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE)) {</div><div class='ctx'> 			clear_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> 			err = write_page(bitmap, lastpage, 0);</div><div class='del'>-			if (err == -EAGAIN) {</div><div class='del'>-				set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);</div><div class='del'>-				err = 0;</div><div class='del'>-			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		put_page(lastpage);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void daemon_exit(struct bitmap *bitmap, mdk_thread_t **daemon)</div><div class='del'>-{</div><div class='del'>-	mdk_thread_t *dmn;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/* if no one is waiting on us, we'll free the md thread struct</div><div class='del'>-	 * and exit, otherwise we let the waiter clean things up */</div><div class='del'>-	spin_lock_irqsave(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-	if ((dmn = *daemon)) { /* no one is waiting, cleanup and exit */</div><div class='del'>-		*daemon = NULL;</div><div class='del'>-		spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-		kfree(dmn);</div><div class='del'>-		complete_and_exit(NULL, 0); /* do_exit not exported */</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bitmap_writeback_daemon(mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	struct bitmap *bitmap = mddev-&gt;bitmap;</div><div class='del'>-	struct page *page;</div><div class='del'>-	struct page_list *item;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (signal_pending(current)) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "%s: bitmap writeback daemon got signal, exiting...\n",</div><div class='del'>-		       bmname(bitmap));</div><div class='del'>-		err = -EINTR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (bitmap == NULL)</div><div class='del'>-		/* about to be stopped. */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	PRINTK("%s: bitmap writeback daemon woke up...\n", bmname(bitmap));</div><div class='del'>-	/* wait on bitmap page writebacks */</div><div class='del'>-	while ((item = dequeue_page(bitmap))) {</div><div class='del'>-		page = item-&gt;page;</div><div class='del'>-		mempool_free(item, bitmap-&gt;write_pool);</div><div class='del'>-		PRINTK("wait on page writeback: %p\n", page);</div><div class='del'>-		wait_on_page_writeback(page);</div><div class='del'>-		PRINTK("finished page writeback: %p\n", page);</div><div class='del'>-</div><div class='del'>-		err = PageError(page);</div><div class='del'>-		put_page(page);</div><div class='del'>-		if (err) {</div><div class='del'>-			printk(KERN_WARNING "%s: bitmap file writeback "</div><div class='del'>-			       "failed (page %lu): %d\n",</div><div class='del'>-			       bmname(bitmap), page-&gt;index, err);</div><div class='del'>-			bitmap_file_kick(bitmap);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>- out:</div><div class='del'>-	wake_up(&amp;bitmap-&gt;write_wait);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_INFO "%s: bitmap writeback daemon exiting (%d)\n",</div><div class='del'>-		       bmname(bitmap), err);</div><div class='del'>-		daemon_exit(bitmap, &amp;bitmap-&gt;writeback_daemon);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static mdk_thread_t *bitmap_start_daemon(struct bitmap *bitmap,</div><div class='del'>-				void (*func)(mddev_t *), char *name)</div><div class='del'>-{</div><div class='del'>-	mdk_thread_t *daemon;</div><div class='del'>-	char namebuf[32];</div><div class='del'>-</div><div class='del'>-#ifdef INJECT_FATAL_FAULT_2</div><div class='del'>-	daemon = NULL;</div><div class='del'>-#else</div><div class='del'>-	sprintf(namebuf, "%%s_%s", name);</div><div class='del'>-	daemon = md_register_thread(func, bitmap-&gt;mddev, namebuf);</div><div class='del'>-#endif</div><div class='del'>-	if (!daemon) {</div><div class='del'>-		printk(KERN_ERR "%s: failed to start bitmap daemon\n",</div><div class='del'>-			bmname(bitmap));</div><div class='del'>-		return ERR_PTR(-ECHILD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	md_wakeup_thread(daemon); /* start it running */</div><div class='del'>-</div><div class='del'>-	PRINTK("%s: %s daemon (pid %d) started...\n",</div><div class='del'>-		bmname(bitmap), name, daemon-&gt;tsk-&gt;pid);</div><div class='del'>-</div><div class='del'>-	return daemon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bitmap_stop_daemon(struct bitmap *bitmap)</div><div class='del'>-{</div><div class='del'>-	/* the daemon can't stop itself... it'll just exit instead... */</div><div class='del'>-	if (bitmap-&gt;writeback_daemon &amp;&amp; ! IS_ERR(bitmap-&gt;writeback_daemon) &amp;&amp;</div><div class='del'>-	    current-&gt;pid != bitmap-&gt;writeback_daemon-&gt;tsk-&gt;pid) {</div><div class='del'>-		mdk_thread_t *daemon;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-		daemon = bitmap-&gt;writeback_daemon;</div><div class='del'>-		bitmap-&gt;writeback_daemon = NULL;</div><div class='del'>-		spin_unlock_irqrestore(&amp;bitmap-&gt;lock, flags);</div><div class='del'>-		if (daemon &amp;&amp; ! IS_ERR(daemon))</div><div class='del'>-			md_unregister_thread(daemon); /* destroy the thread */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap,</div><div class='ctx'> 					    sector_t offset, int *blocks,</div><div class='ctx'> 					    int create)</div><div class='hunk'>@@ -1500,8 +1364,6 @@ static void bitmap_free(struct bitmap *bitmap)</div><div class='ctx'> </div><div class='ctx'> 	/* free all allocated memory */</div><div class='ctx'> </div><div class='del'>-	mempool_destroy(bitmap-&gt;write_pool);</div><div class='del'>-</div><div class='ctx'> 	if (bp) /* deallocate the page memory */</div><div class='ctx'> 		for (k = 0; k &lt; pages; k++)</div><div class='ctx'> 			if (bp[k].map &amp;&amp; !bp[k].hijacked)</div><div class='hunk'>@@ -1549,20 +1411,20 @@ int bitmap_create(mddev_t *mddev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bitmap-&gt;lock);</div><div class='del'>-	bitmap-&gt;mddev = mddev;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;bitmap-&gt;write_lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bitmap-&gt;complete_pages);</div><div class='add'>+	atomic_set(&amp;bitmap-&gt;pending_writes, 0);</div><div class='ctx'> 	init_waitqueue_head(&amp;bitmap-&gt;write_wait);</div><div class='del'>-	bitmap-&gt;write_pool = mempool_create_kmalloc_pool(WRITE_POOL_SIZE,</div><div class='del'>-						sizeof(struct page_list));</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-	if (!bitmap-&gt;write_pool)</div><div class='del'>-		goto error;</div><div class='add'>+</div><div class='add'>+	bitmap-&gt;mddev = mddev;</div><div class='ctx'> </div><div class='ctx'> 	bitmap-&gt;file = file;</div><div class='ctx'> 	bitmap-&gt;offset = mddev-&gt;bitmap_offset;</div><div class='del'>-	if (file) get_file(file);</div><div class='add'>+	if (file) {</div><div class='add'>+		get_file(file);</div><div class='add'>+		do_sync_file_range(file, 0, LLONG_MAX,</div><div class='add'>+				   SYNC_FILE_RANGE_WAIT_BEFORE |</div><div class='add'>+				   SYNC_FILE_RANGE_WRITE |</div><div class='add'>+				   SYNC_FILE_RANGE_WAIT_AFTER);</div><div class='add'>+	}</div><div class='ctx'> 	/* read superblock from bitmap file (this sets bitmap-&gt;chunksize) */</div><div class='ctx'> 	err = bitmap_read_sb(bitmap);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -1594,8 +1456,6 @@ int bitmap_create(mddev_t *mddev)</div><div class='ctx'> 	if (!bitmap-&gt;bp)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	bitmap-&gt;flags |= BITMAP_ACTIVE;</div><div class='del'>-</div><div class='ctx'> 	/* now that we have some pages available, initialize the in-memory</div><div class='ctx'> 	 * bitmap from the on-disk bitmap */</div><div class='ctx'> 	start = 0;</div><div class='hunk'>@@ -1613,15 +1473,6 @@ int bitmap_create(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 	mddev-&gt;bitmap = bitmap;</div><div class='ctx'> </div><div class='del'>-	if (file)</div><div class='del'>-		/* kick off the bitmap writeback daemon */</div><div class='del'>-		bitmap-&gt;writeback_daemon =</div><div class='del'>-			bitmap_start_daemon(bitmap,</div><div class='del'>-					    bitmap_writeback_daemon,</div><div class='del'>-					    "bitmap_wb");</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(bitmap-&gt;writeback_daemon))</div><div class='del'>-		return PTR_ERR(bitmap-&gt;writeback_daemon);</div><div class='ctx'> 	mddev-&gt;thread-&gt;timeout = bitmap-&gt;daemon_sleep * HZ;</div><div class='ctx'> </div><div class='ctx'> 	return bitmap_update_sb(bitmap);</div><div class='hunk'>@@ -1638,4 +1489,3 @@ EXPORT_SYMBOL(bitmap_start_sync);</div><div class='ctx'> EXPORT_SYMBOL(bitmap_end_sync);</div><div class='ctx'> EXPORT_SYMBOL(bitmap_unplug);</div><div class='ctx'> EXPORT_SYMBOL(bitmap_close_sync);</div><div class='del'>-EXPORT_SYMBOL(bitmap_daemon_work);</div><div class='head'>diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c<br/>index 61a590bb6241..6022ed12a795 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-crypt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-crypt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-crypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-crypt.c</a></div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "dm.h"</div><div class='ctx'> </div><div class='del'>-#define PFX	"crypt: "</div><div class='add'>+#define DM_MSG_PREFIX "crypt"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * per bio private data</div><div class='hunk'>@@ -125,19 +125,19 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,</div><div class='ctx'> 	u8 *salt;</div><div class='ctx'> </div><div class='ctx'> 	if (opts == NULL) {</div><div class='del'>-		ti-&gt;error = PFX "Digest algorithm missing for ESSIV mode";</div><div class='add'>+		ti-&gt;error = "Digest algorithm missing for ESSIV mode";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Hash the cipher key with the given hash algorithm */</div><div class='ctx'> 	hash_tfm = crypto_alloc_tfm(opts, CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='ctx'> 	if (hash_tfm == NULL) {</div><div class='del'>-		ti-&gt;error = PFX "Error initializing ESSIV hash";</div><div class='add'>+		ti-&gt;error = "Error initializing ESSIV hash";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (crypto_tfm_alg_type(hash_tfm) != CRYPTO_ALG_TYPE_DIGEST) {</div><div class='del'>-		ti-&gt;error = PFX "Expected digest algorithm for ESSIV hash";</div><div class='add'>+		ti-&gt;error = "Expected digest algorithm for ESSIV hash";</div><div class='ctx'> 		crypto_free_tfm(hash_tfm);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -145,7 +145,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,</div><div class='ctx'> 	saltsize = crypto_tfm_alg_digestsize(hash_tfm);</div><div class='ctx'> 	salt = kmalloc(saltsize, GFP_KERNEL);</div><div class='ctx'> 	if (salt == NULL) {</div><div class='del'>-		ti-&gt;error = PFX "Error kmallocing salt storage in ESSIV";</div><div class='add'>+		ti-&gt;error = "Error kmallocing salt storage in ESSIV";</div><div class='ctx'> 		crypto_free_tfm(hash_tfm);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -159,20 +159,20 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,</div><div class='ctx'> 	                             CRYPTO_TFM_MODE_ECB |</div><div class='ctx'> 	                             CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='ctx'> 	if (essiv_tfm == NULL) {</div><div class='del'>-		ti-&gt;error = PFX "Error allocating crypto tfm for ESSIV";</div><div class='add'>+		ti-&gt;error = "Error allocating crypto tfm for ESSIV";</div><div class='ctx'> 		kfree(salt);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (crypto_tfm_alg_blocksize(essiv_tfm)</div><div class='ctx'> 	    != crypto_tfm_alg_ivsize(cc-&gt;tfm)) {</div><div class='del'>-		ti-&gt;error = PFX "Block size of ESSIV cipher does "</div><div class='add'>+		ti-&gt;error = "Block size of ESSIV cipher does "</div><div class='ctx'> 			        "not match IV size of block cipher";</div><div class='ctx'> 		crypto_free_tfm(essiv_tfm);</div><div class='ctx'> 		kfree(salt);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (crypto_cipher_setkey(essiv_tfm, salt, saltsize) &lt; 0) {</div><div class='del'>-		ti-&gt;error = PFX "Failed to set key for ESSIV cipher";</div><div class='add'>+		ti-&gt;error = "Failed to set key for ESSIV cipher";</div><div class='ctx'> 		crypto_free_tfm(essiv_tfm);</div><div class='ctx'> 		kfree(salt);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -521,7 +521,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	unsigned long long tmpll;</div><div class='ctx'> </div><div class='ctx'> 	if (argc != 5) {</div><div class='del'>-		ti-&gt;error = PFX "Not enough arguments";</div><div class='add'>+		ti-&gt;error = "Not enough arguments";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -532,21 +532,21 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	ivmode = strsep(&amp;ivopts, ":");</div><div class='ctx'> </div><div class='ctx'> 	if (tmp)</div><div class='del'>-		DMWARN(PFX "Unexpected additional cipher options");</div><div class='add'>+		DMWARN("Unexpected additional cipher options");</div><div class='ctx'> </div><div class='ctx'> 	key_size = strlen(argv[1]) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	cc = kmalloc(sizeof(*cc) + key_size * sizeof(u8), GFP_KERNEL);</div><div class='ctx'> 	if (cc == NULL) {</div><div class='ctx'> 		ti-&gt;error =</div><div class='del'>-			PFX "Cannot allocate transparent encryption context";</div><div class='add'>+			"Cannot allocate transparent encryption context";</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cc-&gt;key_size = key_size;</div><div class='ctx'> 	if ((!key_size &amp;&amp; strcmp(argv[1], "-") != 0) ||</div><div class='ctx'> 	    (key_size &amp;&amp; crypt_decode_key(cc-&gt;key, argv[1], key_size) &lt; 0)) {</div><div class='del'>-		ti-&gt;error = PFX "Error decoding key";</div><div class='add'>+		ti-&gt;error = "Error decoding key";</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -562,22 +562,22 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	else if (strcmp(chainmode, "ecb") == 0)</div><div class='ctx'> 		crypto_flags = CRYPTO_TFM_MODE_ECB;</div><div class='ctx'> 	else {</div><div class='del'>-		ti-&gt;error = PFX "Unknown chaining mode";</div><div class='add'>+		ti-&gt;error = "Unknown chaining mode";</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (crypto_flags != CRYPTO_TFM_MODE_ECB &amp;&amp; !ivmode) {</div><div class='del'>-		ti-&gt;error = PFX "This chaining mode requires an IV mechanism";</div><div class='add'>+		ti-&gt;error = "This chaining mode requires an IV mechanism";</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tfm = crypto_alloc_tfm(cipher, crypto_flags | CRYPTO_TFM_REQ_MAY_SLEEP);</div><div class='ctx'> 	if (!tfm) {</div><div class='del'>-		ti-&gt;error = PFX "Error allocating crypto tfm";</div><div class='add'>+		ti-&gt;error = "Error allocating crypto tfm";</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER) {</div><div class='del'>-		ti-&gt;error = PFX "Expected cipher algorithm";</div><div class='add'>+		ti-&gt;error = "Expected cipher algorithm";</div><div class='ctx'> 		goto bad2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -595,7 +595,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	else if (strcmp(ivmode, "essiv") == 0)</div><div class='ctx'> 		cc-&gt;iv_gen_ops = &amp;crypt_iv_essiv_ops;</div><div class='ctx'> 	else {</div><div class='del'>-		ti-&gt;error = PFX "Invalid IV mode";</div><div class='add'>+		ti-&gt;error = "Invalid IV mode";</div><div class='ctx'> 		goto bad2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -610,7 +610,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	else {</div><div class='ctx'> 		cc-&gt;iv_size = 0;</div><div class='ctx'> 		if (cc-&gt;iv_gen_ops) {</div><div class='del'>-			DMWARN(PFX "Selected cipher does not support IVs");</div><div class='add'>+			DMWARN("Selected cipher does not support IVs");</div><div class='ctx'> 			if (cc-&gt;iv_gen_ops-&gt;dtr)</div><div class='ctx'> 				cc-&gt;iv_gen_ops-&gt;dtr(cc);</div><div class='ctx'> 			cc-&gt;iv_gen_ops = NULL;</div><div class='hunk'>@@ -619,36 +619,36 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	cc-&gt;io_pool = mempool_create_slab_pool(MIN_IOS, _crypt_io_pool);</div><div class='ctx'> 	if (!cc-&gt;io_pool) {</div><div class='del'>-		ti-&gt;error = PFX "Cannot allocate crypt io mempool";</div><div class='add'>+		ti-&gt;error = "Cannot allocate crypt io mempool";</div><div class='ctx'> 		goto bad3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cc-&gt;page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);</div><div class='ctx'> 	if (!cc-&gt;page_pool) {</div><div class='del'>-		ti-&gt;error = PFX "Cannot allocate page mempool";</div><div class='add'>+		ti-&gt;error = "Cannot allocate page mempool";</div><div class='ctx'> 		goto bad4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tfm-&gt;crt_cipher.cit_setkey(tfm, cc-&gt;key, key_size) &lt; 0) {</div><div class='del'>-		ti-&gt;error = PFX "Error setting key";</div><div class='add'>+		ti-&gt;error = "Error setting key";</div><div class='ctx'> 		goto bad5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(argv[2], "%llu", &amp;tmpll) != 1) {</div><div class='del'>-		ti-&gt;error = PFX "Invalid iv_offset sector";</div><div class='add'>+		ti-&gt;error = "Invalid iv_offset sector";</div><div class='ctx'> 		goto bad5;</div><div class='ctx'> 	}</div><div class='ctx'> 	cc-&gt;iv_offset = tmpll;</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(argv[4], "%llu", &amp;tmpll) != 1) {</div><div class='del'>-		ti-&gt;error = PFX "Invalid device sector";</div><div class='add'>+		ti-&gt;error = "Invalid device sector";</div><div class='ctx'> 		goto bad5;</div><div class='ctx'> 	}</div><div class='ctx'> 	cc-&gt;start = tmpll;</div><div class='ctx'> </div><div class='ctx'> 	if (dm_get_device(ti, argv[3], cc-&gt;start, ti-&gt;len,</div><div class='ctx'> 	                  dm_table_get_mode(ti-&gt;table), &amp;cc-&gt;dev)) {</div><div class='del'>-		ti-&gt;error = PFX "Device lookup failed";</div><div class='add'>+		ti-&gt;error = "Device lookup failed";</div><div class='ctx'> 		goto bad5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -657,7 +657,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 			*(ivopts - 1) = ':';</div><div class='ctx'> 		cc-&gt;iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);</div><div class='ctx'> 		if (!cc-&gt;iv_mode) {</div><div class='del'>-			ti-&gt;error = PFX "Error kmallocing iv_mode string";</div><div class='add'>+			ti-&gt;error = "Error kmallocing iv_mode string";</div><div class='ctx'> 			goto bad5;</div><div class='ctx'> 		}</div><div class='ctx'> 		strcpy(cc-&gt;iv_mode, ivmode);</div><div class='hunk'>@@ -918,13 +918,13 @@ static int __init dm_crypt_init(void)</div><div class='ctx'> 	_kcryptd_workqueue = create_workqueue("kcryptd");</div><div class='ctx'> 	if (!_kcryptd_workqueue) {</div><div class='ctx'> 		r = -ENOMEM;</div><div class='del'>-		DMERR(PFX "couldn't create kcryptd");</div><div class='add'>+		DMERR("couldn't create kcryptd");</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r = dm_register_target(&amp;crypt_target);</div><div class='ctx'> 	if (r &lt; 0) {</div><div class='del'>-		DMERR(PFX "register failed %d", r);</div><div class='add'>+		DMERR("register failed %d", r);</div><div class='ctx'> 		goto bad2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -942,7 +942,7 @@ static void __exit dm_crypt_exit(void)</div><div class='ctx'> 	int r = dm_unregister_target(&amp;crypt_target);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR(PFX "unregister failed %d", r);</div><div class='add'>+		DMERR("unregister failed %d", r);</div><div class='ctx'> </div><div class='ctx'> 	destroy_workqueue(_kcryptd_workqueue);</div><div class='ctx'> 	kmem_cache_destroy(_crypt_io_pool);</div><div class='head'>diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c<br/>index c7067674dcb7..2a374ccb30dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-emc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-emc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-emc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-emc.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "multipath emc"</div><div class='add'>+</div><div class='ctx'> struct emc_handler {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -66,7 +68,7 @@ static struct bio *get_failover_bio(struct path *path, unsigned data_size)</div><div class='ctx'> </div><div class='ctx'> 	bio = bio_alloc(GFP_ATOMIC, 1);</div><div class='ctx'> 	if (!bio) {</div><div class='del'>-		DMERR("dm-emc: get_failover_bio: bio_alloc() failed.");</div><div class='add'>+		DMERR("get_failover_bio: bio_alloc() failed.");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -78,13 +80,13 @@ static struct bio *get_failover_bio(struct path *path, unsigned data_size)</div><div class='ctx'> </div><div class='ctx'> 	page = alloc_page(GFP_ATOMIC);</div><div class='ctx'> 	if (!page) {</div><div class='del'>-		DMERR("dm-emc: get_failover_bio: alloc_page() failed.");</div><div class='add'>+		DMERR("get_failover_bio: alloc_page() failed.");</div><div class='ctx'> 		bio_put(bio);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bio_add_page(bio, page, data_size, 0) != data_size) {</div><div class='del'>-		DMERR("dm-emc: get_failover_bio: alloc_page() failed.");</div><div class='add'>+		DMERR("get_failover_bio: alloc_page() failed.");</div><div class='ctx'> 		__free_page(page);</div><div class='ctx'> 		bio_put(bio);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -103,7 +105,7 @@ static struct request *get_failover_req(struct emc_handler *h,</div><div class='ctx'> 	/* FIXME: Figure out why it fails with GFP_ATOMIC. */</div><div class='ctx'> 	rq = blk_get_request(q, WRITE, __GFP_WAIT);</div><div class='ctx'> 	if (!rq) {</div><div class='del'>-		DMERR("dm-emc: get_failover_req: blk_get_request failed");</div><div class='add'>+		DMERR("get_failover_req: blk_get_request failed");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -160,7 +162,7 @@ static struct request *emc_trespass_get(struct emc_handler *h,</div><div class='ctx'> </div><div class='ctx'> 	bio = get_failover_bio(path, data_size);</div><div class='ctx'> 	if (!bio) {</div><div class='del'>-		DMERR("dm-emc: emc_trespass_get: no bio");</div><div class='add'>+		DMERR("emc_trespass_get: no bio");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +175,7 @@ static struct request *emc_trespass_get(struct emc_handler *h,</div><div class='ctx'> 	/* get request for block layer packet command */</div><div class='ctx'> 	rq = get_failover_req(h, bio, path);</div><div class='ctx'> 	if (!rq) {</div><div class='del'>-		DMERR("dm-emc: emc_trespass_get: no rq");</div><div class='add'>+		DMERR("emc_trespass_get: no rq");</div><div class='ctx'> 		free_bio(bio);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,18 +202,18 @@ static void emc_pg_init(struct hw_handler *hwh, unsigned bypassed,</div><div class='ctx'> 	 * initial state passed into us and then get an update here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!q) {</div><div class='del'>-		DMINFO("dm-emc: emc_pg_init: no queue");</div><div class='add'>+		DMINFO("emc_pg_init: no queue");</div><div class='ctx'> 		goto fail_path;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: The request should be pre-allocated. */</div><div class='ctx'> 	rq = emc_trespass_get(hwh-&gt;context, path);</div><div class='ctx'> 	if (!rq) {</div><div class='del'>-		DMERR("dm-emc: emc_pg_init: no rq");</div><div class='add'>+		DMERR("emc_pg_init: no rq");</div><div class='ctx'> 		goto fail_path;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DMINFO("dm-emc: emc_pg_init: sending switch-over command");</div><div class='add'>+	DMINFO("emc_pg_init: sending switch-over command");</div><div class='ctx'> 	elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 1);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='hunk'>@@ -241,18 +243,18 @@ static int emc_create(struct hw_handler *hwh, unsigned argc, char **argv)</div><div class='ctx'> 		hr = 0;</div><div class='ctx'> 		short_trespass = 0;</div><div class='ctx'> 	} else if (argc != 2) {</div><div class='del'>-		DMWARN("dm-emc hwhandler: incorrect number of arguments");</div><div class='add'>+		DMWARN("incorrect number of arguments");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if ((sscanf(argv[0], "%u", &amp;short_trespass) != 1)</div><div class='ctx'> 			|| (short_trespass &gt; 1)) {</div><div class='del'>-			DMWARN("dm-emc: invalid trespass mode selected");</div><div class='add'>+			DMWARN("invalid trespass mode selected");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((sscanf(argv[1], "%u", &amp;hr) != 1)</div><div class='ctx'> 			|| (hr &gt; 1)) {</div><div class='del'>-			DMWARN("dm-emc: invalid honor reservation flag selected");</div><div class='add'>+			DMWARN("invalid honor reservation flag selected");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -264,14 +266,14 @@ static int emc_create(struct hw_handler *hwh, unsigned argc, char **argv)</div><div class='ctx'> 	hwh-&gt;context = h;</div><div class='ctx'> </div><div class='ctx'> 	if ((h-&gt;short_trespass = short_trespass))</div><div class='del'>-		DMWARN("dm-emc: short trespass command will be send");</div><div class='add'>+		DMWARN("short trespass command will be send");</div><div class='ctx'> 	else</div><div class='del'>-		DMWARN("dm-emc: long trespass command will be send");</div><div class='add'>+		DMWARN("long trespass command will be send");</div><div class='ctx'> </div><div class='ctx'> 	if ((h-&gt;hr = hr))</div><div class='del'>-		DMWARN("dm-emc: honor reservation bit will be set");</div><div class='add'>+		DMWARN("honor reservation bit will be set");</div><div class='ctx'> 	else</div><div class='del'>-		DMWARN("dm-emc: honor reservation bit will not be set (default)");</div><div class='add'>+		DMWARN("honor reservation bit will not be set (default)");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -336,9 +338,9 @@ static int __init dm_emc_init(void)</div><div class='ctx'> 	int r = dm_register_hw_handler(&amp;emc_hwh);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("emc: register failed %d", r);</div><div class='add'>+		DMERR("register failed %d", r);</div><div class='ctx'> </div><div class='del'>-	DMINFO("dm-emc version 0.0.3 loaded");</div><div class='add'>+	DMINFO("version 0.0.3 loaded");</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -348,7 +350,7 @@ static void __exit dm_emc_exit(void)</div><div class='ctx'> 	int r = dm_unregister_hw_handler(&amp;emc_hwh);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("emc: unregister failed %d", r);</div><div class='add'>+		DMERR("unregister failed %d", r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(dm_emc_init);</div><div class='head'>diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c<br/>index cc07bbebbb16..d12379b5cdb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-exception-store.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-exception-store.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-exception-store.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-exception-store.c</a></div><div class='hunk'>@@ -16,6 +16,8 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "snapshots"</div><div class='add'>+</div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='ctx'>  * Persistent snapshots, by persistent we mean that the snapshot</div><div class='ctx'>  * will survive a reboot.</div><div class='hunk'>@@ -91,7 +93,6 @@ struct pstore {</div><div class='ctx'> 	struct dm_snapshot *snap;	/* up pointer to my snapshot */</div><div class='ctx'> 	int version;</div><div class='ctx'> 	int valid;</div><div class='del'>-	uint32_t chunk_size;</div><div class='ctx'> 	uint32_t exceptions_per_area;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -133,7 +134,7 @@ static int alloc_area(struct pstore *ps)</div><div class='ctx'> 	int r = -ENOMEM;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> </div><div class='del'>-	len = ps-&gt;chunk_size &lt;&lt; SECTOR_SHIFT;</div><div class='add'>+	len = ps-&gt;snap-&gt;chunk_size &lt;&lt; SECTOR_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the chunk_size block of memory that will hold</div><div class='hunk'>@@ -160,8 +161,8 @@ static int chunk_io(struct pstore *ps, uint32_t chunk, int rw)</div><div class='ctx'> 	unsigned long bits;</div><div class='ctx'> </div><div class='ctx'> 	where.bdev = ps-&gt;snap-&gt;cow-&gt;bdev;</div><div class='del'>-	where.sector = ps-&gt;chunk_size * chunk;</div><div class='del'>-	where.count = ps-&gt;chunk_size;</div><div class='add'>+	where.sector = ps-&gt;snap-&gt;chunk_size * chunk;</div><div class='add'>+	where.count = ps-&gt;snap-&gt;chunk_size;</div><div class='ctx'> </div><div class='ctx'> 	return dm_io_sync_vm(1, &amp;where, rw, ps-&gt;area, &amp;bits);</div><div class='ctx'> }</div><div class='hunk'>@@ -188,7 +189,7 @@ static int area_io(struct pstore *ps, uint32_t area, int rw)</div><div class='ctx'> </div><div class='ctx'> static int zero_area(struct pstore *ps, uint32_t area)</div><div class='ctx'> {</div><div class='del'>-	memset(ps-&gt;area, 0, ps-&gt;chunk_size &lt;&lt; SECTOR_SHIFT);</div><div class='add'>+	memset(ps-&gt;area, 0, ps-&gt;snap-&gt;chunk_size &lt;&lt; SECTOR_SHIFT);</div><div class='ctx'> 	return area_io(ps, area, WRITE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -196,6 +197,7 @@ static int read_header(struct pstore *ps, int *new_snapshot)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct disk_header *dh;</div><div class='add'>+	chunk_t chunk_size;</div><div class='ctx'> </div><div class='ctx'> 	r = chunk_io(ps, 0, READ);</div><div class='ctx'> 	if (r)</div><div class='hunk'>@@ -210,8 +212,29 @@ static int read_header(struct pstore *ps, int *new_snapshot)</div><div class='ctx'> 		*new_snapshot = 0;</div><div class='ctx'> 		ps-&gt;valid = le32_to_cpu(dh-&gt;valid);</div><div class='ctx'> 		ps-&gt;version = le32_to_cpu(dh-&gt;version);</div><div class='del'>-		ps-&gt;chunk_size = le32_to_cpu(dh-&gt;chunk_size);</div><div class='del'>-</div><div class='add'>+		chunk_size = le32_to_cpu(dh-&gt;chunk_size);</div><div class='add'>+		if (ps-&gt;snap-&gt;chunk_size != chunk_size) {</div><div class='add'>+			DMWARN("chunk size %llu in device metadata overrides "</div><div class='add'>+			       "table chunk size of %llu.",</div><div class='add'>+			       (unsigned long long)chunk_size,</div><div class='add'>+			       (unsigned long long)ps-&gt;snap-&gt;chunk_size);</div><div class='add'>+</div><div class='add'>+			/* We had a bogus chunk_size. Fix stuff up. */</div><div class='add'>+			dm_io_put(sectors_to_pages(ps-&gt;snap-&gt;chunk_size));</div><div class='add'>+			free_area(ps);</div><div class='add'>+</div><div class='add'>+			ps-&gt;snap-&gt;chunk_size = chunk_size;</div><div class='add'>+			ps-&gt;snap-&gt;chunk_mask = chunk_size - 1;</div><div class='add'>+			ps-&gt;snap-&gt;chunk_shift = ffs(chunk_size) - 1;</div><div class='add'>+</div><div class='add'>+			r = alloc_area(ps);</div><div class='add'>+			if (r)</div><div class='add'>+				return r;</div><div class='add'>+</div><div class='add'>+			r = dm_io_get(sectors_to_pages(chunk_size));</div><div class='add'>+			if (r)</div><div class='add'>+				return r;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DMWARN("Invalid/corrupt snapshot");</div><div class='ctx'> 		r = -ENXIO;</div><div class='hunk'>@@ -224,13 +247,13 @@ static int write_header(struct pstore *ps)</div><div class='ctx'> {</div><div class='ctx'> 	struct disk_header *dh;</div><div class='ctx'> </div><div class='del'>-	memset(ps-&gt;area, 0, ps-&gt;chunk_size &lt;&lt; SECTOR_SHIFT);</div><div class='add'>+	memset(ps-&gt;area, 0, ps-&gt;snap-&gt;chunk_size &lt;&lt; SECTOR_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	dh = (struct disk_header *) ps-&gt;area;</div><div class='ctx'> 	dh-&gt;magic = cpu_to_le32(SNAP_MAGIC);</div><div class='ctx'> 	dh-&gt;valid = cpu_to_le32(ps-&gt;valid);</div><div class='ctx'> 	dh-&gt;version = cpu_to_le32(ps-&gt;version);</div><div class='del'>-	dh-&gt;chunk_size = cpu_to_le32(ps-&gt;chunk_size);</div><div class='add'>+	dh-&gt;chunk_size = cpu_to_le32(ps-&gt;snap-&gt;chunk_size);</div><div class='ctx'> </div><div class='ctx'> 	return chunk_io(ps, 0, WRITE);</div><div class='ctx'> }</div><div class='hunk'>@@ -365,7 +388,7 @@ static void persistent_destroy(struct exception_store *store)</div><div class='ctx'> {</div><div class='ctx'> 	struct pstore *ps = get_info(store);</div><div class='ctx'> </div><div class='del'>-	dm_io_put(sectors_to_pages(ps-&gt;chunk_size));</div><div class='add'>+	dm_io_put(sectors_to_pages(ps-&gt;snap-&gt;chunk_size));</div><div class='ctx'> 	vfree(ps-&gt;callbacks);</div><div class='ctx'> 	free_area(ps);</div><div class='ctx'> 	kfree(ps);</div><div class='hunk'>@@ -384,6 +407,16 @@ static int persistent_read_metadata(struct exception_store *store)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * Now we know correct chunk_size, complete the initialisation.</div><div class='add'>+	 */</div><div class='add'>+	ps-&gt;exceptions_per_area = (ps-&gt;snap-&gt;chunk_size &lt;&lt; SECTOR_SHIFT) /</div><div class='add'>+				  sizeof(struct disk_exception);</div><div class='add'>+	ps-&gt;callbacks = dm_vcalloc(ps-&gt;exceptions_per_area,</div><div class='add'>+			sizeof(*ps-&gt;callbacks));</div><div class='add'>+	if (!ps-&gt;callbacks)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Do we need to setup a new snapshot ?</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (new_snapshot) {</div><div class='hunk'>@@ -533,9 +566,6 @@ int dm_create_persistent(struct exception_store *store, uint32_t chunk_size)</div><div class='ctx'> 	ps-&gt;snap = store-&gt;snap;</div><div class='ctx'> 	ps-&gt;valid = 1;</div><div class='ctx'> 	ps-&gt;version = SNAPSHOT_DISK_VERSION;</div><div class='del'>-	ps-&gt;chunk_size = chunk_size;</div><div class='del'>-	ps-&gt;exceptions_per_area = (chunk_size &lt;&lt; SECTOR_SHIFT) /</div><div class='del'>-	    sizeof(struct disk_exception);</div><div class='ctx'> 	ps-&gt;next_free = 2;	/* skipping the header and first area */</div><div class='ctx'> 	ps-&gt;current_committed = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -543,18 +573,9 @@ int dm_create_persistent(struct exception_store *store, uint32_t chunk_size)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		goto bad;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Allocate space for all the callbacks.</div><div class='del'>-	 */</div><div class='ctx'> 	ps-&gt;callback_count = 0;</div><div class='ctx'> 	atomic_set(&amp;ps-&gt;pending_count, 0);</div><div class='del'>-	ps-&gt;callbacks = dm_vcalloc(ps-&gt;exceptions_per_area,</div><div class='del'>-				   sizeof(*ps-&gt;callbacks));</div><div class='del'>-</div><div class='del'>-	if (!ps-&gt;callbacks) {</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto bad;</div><div class='del'>-	}</div><div class='add'>+	ps-&gt;callbacks = NULL;</div><div class='ctx'> </div><div class='ctx'> 	store-&gt;destroy = persistent_destroy;</div><div class='ctx'> 	store-&gt;read_metadata = persistent_read_metadata;</div><div class='head'>diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c<br/>index 8edd6435414d..d13bb15a8a02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-ioctl.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2001, 2002 Sistina Software (UK) Limited.</div><div class='del'>- * Copyright (C) 2004 - 2005 Red Hat, Inc. All rights reserved.</div><div class='add'>+ * Copyright (C) 2004 - 2006 Red Hat, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is released under the GPL.</div><div class='ctx'>  */</div><div class='hunk'>@@ -13,12 +13,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/dm-ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "ioctl"</div><div class='ctx'> #define DM_DRIVER_EMAIL "dm-devel@redhat.com"</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='hunk'>@@ -48,7 +48,7 @@ struct vers_iter {</div><div class='ctx'> static struct list_head _name_buckets[NUM_BUCKETS];</div><div class='ctx'> static struct list_head _uuid_buckets[NUM_BUCKETS];</div><div class='ctx'> </div><div class='del'>-static void dm_hash_remove_all(void);</div><div class='add'>+static void dm_hash_remove_all(int keep_open_devices);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Guards access to both hash tables.</div><div class='hunk'>@@ -67,14 +67,12 @@ static int dm_hash_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	init_buckets(_name_buckets);</div><div class='ctx'> 	init_buckets(_uuid_buckets);</div><div class='del'>-	devfs_mk_dir(DM_DIR);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dm_hash_exit(void)</div><div class='ctx'> {</div><div class='del'>-	dm_hash_remove_all();</div><div class='del'>-	devfs_remove(DM_DIR);</div><div class='add'>+	dm_hash_remove_all(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='hunk'>@@ -102,8 +100,10 @@ static struct hash_cell *__get_name_cell(const char *str)</div><div class='ctx'> 	unsigned int h = hash_str(str);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry (hc, _name_buckets + h, name_list)</div><div class='del'>-		if (!strcmp(hc-&gt;name, str))</div><div class='add'>+		if (!strcmp(hc-&gt;name, str)) {</div><div class='add'>+			dm_get(hc-&gt;md);</div><div class='ctx'> 			return hc;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -114,8 +114,10 @@ static struct hash_cell *__get_uuid_cell(const char *str)</div><div class='ctx'> 	unsigned int h = hash_str(str);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry (hc, _uuid_buckets + h, uuid_list)</div><div class='del'>-		if (!strcmp(hc-&gt;uuid, str))</div><div class='add'>+		if (!strcmp(hc-&gt;uuid, str)) {</div><div class='add'>+			dm_get(hc-&gt;md);</div><div class='ctx'> 			return hc;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -167,31 +169,12 @@ static void free_cell(struct hash_cell *hc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * devfs stuff.</div><div class='del'>- */</div><div class='del'>-static int register_with_devfs(struct hash_cell *hc)</div><div class='del'>-{</div><div class='del'>-	struct gendisk *disk = dm_disk(hc-&gt;md);</div><div class='del'>-</div><div class='del'>-	devfs_mk_bdev(MKDEV(disk-&gt;major, disk-&gt;first_minor),</div><div class='del'>-		      S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP,</div><div class='del'>-		      DM_DIR "/%s", hc-&gt;name);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int unregister_with_devfs(struct hash_cell *hc)</div><div class='del'>-{</div><div class='del'>-	devfs_remove(DM_DIR"/%s", hc-&gt;name);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * The kdev_t and uuid of a device can never change once it is</div><div class='ctx'>  * initially inserted.</div><div class='ctx'>  */</div><div class='ctx'> static int dm_hash_insert(const char *name, const char *uuid, struct mapped_device *md)</div><div class='ctx'> {</div><div class='del'>-	struct hash_cell *cell;</div><div class='add'>+	struct hash_cell *cell, *hc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the new cells.</div><div class='hunk'>@@ -204,19 +187,23 @@ static int dm_hash_insert(const char *name, const char *uuid, struct mapped_devi</div><div class='ctx'> 	 * Insert the cell into both hash tables.</div><div class='ctx'> 	 */</div><div class='ctx'> 	down_write(&amp;_hash_lock);</div><div class='del'>-	if (__get_name_cell(name))</div><div class='add'>+	hc = __get_name_cell(name);</div><div class='add'>+	if (hc) {</div><div class='add'>+		dm_put(hc-&gt;md);</div><div class='ctx'> 		goto bad;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	list_add(&amp;cell-&gt;name_list, _name_buckets + hash_str(name));</div><div class='ctx'> </div><div class='ctx'> 	if (uuid) {</div><div class='del'>-		if (__get_uuid_cell(uuid)) {</div><div class='add'>+		hc = __get_uuid_cell(uuid);</div><div class='add'>+		if (hc) {</div><div class='ctx'> 			list_del(&amp;cell-&gt;name_list);</div><div class='add'>+			dm_put(hc-&gt;md);</div><div class='ctx'> 			goto bad;</div><div class='ctx'> 		}</div><div class='ctx'> 		list_add(&amp;cell-&gt;uuid_list, _uuid_buckets + hash_str(uuid));</div><div class='ctx'> 	}</div><div class='del'>-	register_with_devfs(cell);</div><div class='ctx'> 	dm_get(md);</div><div class='ctx'> 	dm_set_mdptr(md, cell);</div><div class='ctx'> 	up_write(&amp;_hash_lock);</div><div class='hunk'>@@ -236,7 +223,6 @@ static void __hash_remove(struct hash_cell *hc)</div><div class='ctx'> 	/* remove from the dev hash */</div><div class='ctx'> 	list_del(&amp;hc-&gt;uuid_list);</div><div class='ctx'> 	list_del(&amp;hc-&gt;name_list);</div><div class='del'>-	unregister_with_devfs(hc);</div><div class='ctx'> 	dm_set_mdptr(hc-&gt;md, NULL);</div><div class='ctx'> </div><div class='ctx'> 	table = dm_get_table(hc-&gt;md);</div><div class='hunk'>@@ -251,19 +237,41 @@ static void __hash_remove(struct hash_cell *hc)</div><div class='ctx'> 	free_cell(hc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dm_hash_remove_all(void)</div><div class='add'>+static void dm_hash_remove_all(int keep_open_devices)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, dev_skipped, dev_removed;</div><div class='ctx'> 	struct hash_cell *hc;</div><div class='ctx'> 	struct list_head *tmp, *n;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;_hash_lock);</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	dev_skipped = dev_removed = 0;</div><div class='ctx'> 	for (i = 0; i &lt; NUM_BUCKETS; i++) {</div><div class='ctx'> 		list_for_each_safe (tmp, n, _name_buckets + i) {</div><div class='ctx'> 			hc = list_entry(tmp, struct hash_cell, name_list);</div><div class='add'>+</div><div class='add'>+			if (keep_open_devices &amp;&amp;</div><div class='add'>+			    dm_lock_for_deletion(hc-&gt;md)) {</div><div class='add'>+				dev_skipped++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='ctx'> 			__hash_remove(hc);</div><div class='add'>+			dev_removed = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some mapped devices may be using other mapped devices, so if any</div><div class='add'>+	 * still exist, repeat until we make no further progress.</div><div class='add'>+	 */</div><div class='add'>+	if (dev_skipped) {</div><div class='add'>+		if (dev_removed)</div><div class='add'>+			goto retry;</div><div class='add'>+</div><div class='add'>+		DMWARN("remove_all left %d open device(s)", dev_skipped);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	up_write(&amp;_hash_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -289,6 +297,7 @@ static int dm_hash_rename(const char *old, const char *new)</div><div class='ctx'> 	if (hc) {</div><div class='ctx'> 		DMWARN("asked to rename to an already existing name %s -&gt; %s",</div><div class='ctx'> 		       old, new);</div><div class='add'>+		dm_put(hc-&gt;md);</div><div class='ctx'> 		up_write(&amp;_hash_lock);</div><div class='ctx'> 		kfree(new_name);</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -309,16 +318,11 @@ static int dm_hash_rename(const char *old, const char *new)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * rename and move the name cell.</div><div class='ctx'> 	 */</div><div class='del'>-	unregister_with_devfs(hc);</div><div class='del'>-</div><div class='ctx'> 	list_del(&amp;hc-&gt;name_list);</div><div class='ctx'> 	old_name = hc-&gt;name;</div><div class='ctx'> 	hc-&gt;name = new_name;</div><div class='ctx'> 	list_add(&amp;hc-&gt;name_list, _name_buckets + hash_str(new_name));</div><div class='ctx'> </div><div class='del'>-	/* rename the device node in devfs */</div><div class='del'>-	register_with_devfs(hc);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wake up any dm event waiters.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -328,6 +332,7 @@ static int dm_hash_rename(const char *old, const char *new)</div><div class='ctx'> 		dm_table_put(table);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dm_put(hc-&gt;md);</div><div class='ctx'> 	up_write(&amp;_hash_lock);</div><div class='ctx'> 	kfree(old_name);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -344,7 +349,7 @@ typedef int (*ioctl_fn)(struct dm_ioctl *param, size_t param_size);</div><div class='ctx'> </div><div class='ctx'> static int remove_all(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> {</div><div class='del'>-	dm_hash_remove_all();</div><div class='add'>+	dm_hash_remove_all(1);</div><div class='ctx'> 	param-&gt;data_size = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -524,7 +529,6 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct gendisk *disk = dm_disk(md);</div><div class='ctx'> 	struct dm_table *table;</div><div class='del'>-	struct block_device *bdev;</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;flags &amp;= ~(DM_SUSPEND_FLAG | DM_READONLY_FLAG |</div><div class='ctx'> 			  DM_ACTIVE_PRESENT_FLAG);</div><div class='hunk'>@@ -534,20 +538,12 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)</div><div class='ctx'> </div><div class='ctx'> 	param-&gt;dev = huge_encode_dev(MKDEV(disk-&gt;major, disk-&gt;first_minor));</div><div class='ctx'> </div><div class='del'>-	if (!(param-&gt;flags &amp; DM_SKIP_BDGET_FLAG)) {</div><div class='del'>-		bdev = bdget_disk(disk, 0);</div><div class='del'>-		if (!bdev)</div><div class='del'>-			return -ENXIO;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Yes, this will be out of date by the time it gets back</div><div class='del'>-		 * to userland, but it is still very useful for</div><div class='del'>-		 * debugging.</div><div class='del'>-		 */</div><div class='del'>-		param-&gt;open_count = bdev-&gt;bd_openers;</div><div class='del'>-		bdput(bdev);</div><div class='del'>-	} else</div><div class='del'>-		param-&gt;open_count = -1;</div><div class='add'>+	/*</div><div class='add'>+	 * Yes, this will be out of date by the time it gets back</div><div class='add'>+	 * to userland, but it is still very useful for</div><div class='add'>+	 * debugging.</div><div class='add'>+	 */</div><div class='add'>+	param-&gt;open_count = dm_open_count(md);</div><div class='ctx'> </div><div class='ctx'> 	if (disk-&gt;policy)</div><div class='ctx'> 		param-&gt;flags |= DM_READONLY_FLAG;</div><div class='hunk'>@@ -567,7 +563,7 @@ static int __dev_status(struct mapped_device *md, struct dm_ioctl *param)</div><div class='ctx'> </div><div class='ctx'> static int dev_create(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='add'>+	int r, m = DM_ANY_MINOR;</div><div class='ctx'> 	struct mapped_device *md;</div><div class='ctx'> </div><div class='ctx'> 	r = check_name(param-&gt;name);</div><div class='hunk'>@@ -575,10 +571,9 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;flags &amp; DM_PERSISTENT_DEV_FLAG)</div><div class='del'>-		r = dm_create_with_minor(MINOR(huge_decode_dev(param-&gt;dev)), &amp;md);</div><div class='del'>-	else</div><div class='del'>-		r = dm_create(&amp;md);</div><div class='add'>+		m = MINOR(huge_decode_dev(param-&gt;dev));</div><div class='ctx'> </div><div class='add'>+	r = dm_create(m, &amp;md);</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='hunk'>@@ -611,10 +606,8 @@ static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)</div><div class='ctx'> 		return __get_name_cell(param-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	md = dm_get_md(huge_decode_dev(param-&gt;dev));</div><div class='del'>-	if (md) {</div><div class='add'>+	if (md)</div><div class='ctx'> 		mdptr = dm_get_mdptr(md);</div><div class='del'>-		dm_put(md);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return mdptr;</div><div class='ctx'> }</div><div class='hunk'>@@ -628,7 +621,6 @@ static struct mapped_device *find_device(struct dm_ioctl *param)</div><div class='ctx'> 	hc = __find_device_hash_cell(param);</div><div class='ctx'> 	if (hc) {</div><div class='ctx'> 		md = hc-&gt;md;</div><div class='del'>-		dm_get(md);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Sneakily write in both the name and the uuid</div><div class='hunk'>@@ -653,6 +645,8 @@ static struct mapped_device *find_device(struct dm_ioctl *param)</div><div class='ctx'> static int dev_remove(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct hash_cell *hc;</div><div class='add'>+	struct mapped_device *md;</div><div class='add'>+	int r;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;_hash_lock);</div><div class='ctx'> 	hc = __find_device_hash_cell(param);</div><div class='hunk'>@@ -663,8 +657,22 @@ static int dev_remove(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	md = hc-&gt;md;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure the device is not open and nothing further can open it.</div><div class='add'>+	 */</div><div class='add'>+	r = dm_lock_for_deletion(md);</div><div class='add'>+	if (r) {</div><div class='add'>+		DMWARN("unable to remove open device %s", hc-&gt;name);</div><div class='add'>+		up_write(&amp;_hash_lock);</div><div class='add'>+		dm_put(md);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	__hash_remove(hc);</div><div class='ctx'> 	up_write(&amp;_hash_lock);</div><div class='add'>+	dm_put(md);</div><div class='ctx'> 	param-&gt;data_size = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -790,7 +798,6 @@ static int do_resume(struct dm_ioctl *param)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	md = hc-&gt;md;</div><div class='del'>-	dm_get(md);</div><div class='ctx'> </div><div class='ctx'> 	new_map = hc-&gt;new_map;</div><div class='ctx'> 	hc-&gt;new_map = NULL;</div><div class='hunk'>@@ -1078,6 +1085,7 @@ static int table_clear(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct hash_cell *hc;</div><div class='add'>+	struct mapped_device *md;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;_hash_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1096,7 +1104,9 @@ static int table_clear(struct dm_ioctl *param, size_t param_size)</div><div class='ctx'> 	param-&gt;flags &amp;= ~DM_INACTIVE_PRESENT_FLAG;</div><div class='ctx'> </div><div class='ctx'> 	r = __dev_status(hc-&gt;md, param);</div><div class='add'>+	md = hc-&gt;md;</div><div class='ctx'> 	up_write(&amp;_hash_lock);</div><div class='add'>+	dm_put(md);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1462,7 +1472,6 @@ static struct file_operations _ctl_fops = {</div><div class='ctx'> static struct miscdevice _dm_misc = {</div><div class='ctx'> 	.minor 		= MISC_DYNAMIC_MINOR,</div><div class='ctx'> 	.name  		= DM_NAME,</div><div class='del'>-	.devfs_name 	= "mapper/control",</div><div class='ctx'> 	.fops  		= &amp;_ctl_fops</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c<br/>index daf586c0898d..47b3c62bbdb8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-linear.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-linear.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-linear.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-linear.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "linear"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Linear: maps a linear range of a device.</div><div class='ctx'>  */</div><div class='hunk'>@@ -29,7 +31,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	unsigned long long tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (argc != 2) {</div><div class='del'>-		ti-&gt;error = "dm-linear: Invalid argument count";</div><div class='add'>+		ti-&gt;error = "Invalid argument count";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -111,7 +113,7 @@ int __init dm_linear_init(void)</div><div class='ctx'> 	int r = dm_register_target(&amp;linear_target);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("linear: register failed %d", r);</div><div class='add'>+		DMERR("register failed %d", r);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -121,5 +123,5 @@ void dm_linear_exit(void)</div><div class='ctx'> 	int r = dm_unregister_target(&amp;linear_target);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("linear: unregister failed %d", r);</div><div class='add'>+		DMERR("unregister failed %d", r);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c<br/>index d73779a42417..64b764bd02cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-log.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-log.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-log.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-log.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include "dm-log.h"</div><div class='ctx'> #include "dm-io.h"</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "mirror log"</div><div class='add'>+</div><div class='ctx'> static LIST_HEAD(_log_types);</div><div class='ctx'> static DEFINE_SPINLOCK(_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -155,8 +157,6 @@ struct log_c {</div><div class='ctx'> </div><div class='ctx'> 	struct io_region header_location;</div><div class='ctx'> 	struct log_header *disk_header;</div><div class='del'>-</div><div class='del'>-	struct io_region bits_location;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -241,43 +241,21 @@ static inline int write_header(struct log_c *log)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------</div><div class='del'>- * Bits IO</div><div class='del'>- *--------------------------------------------------------------*/</div><div class='del'>-static int read_bits(struct log_c *log)</div><div class='del'>-{</div><div class='del'>-	int r;</div><div class='del'>-	unsigned long ebits;</div><div class='del'>-</div><div class='del'>-	r = dm_io_sync_vm(1, &amp;log-&gt;bits_location, READ,</div><div class='del'>-			  log-&gt;clean_bits, &amp;ebits);</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_bits(struct log_c *log)</div><div class='del'>-{</div><div class='del'>-	unsigned long ebits;</div><div class='del'>-	return dm_io_sync_vm(1, &amp;log-&gt;bits_location, WRITE,</div><div class='del'>-			     log-&gt;clean_bits, &amp;ebits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*----------------------------------------------------------------</div><div class='ctx'>  * core log constructor/destructor</div><div class='ctx'>  *</div><div class='ctx'>  * argv contains region_size followed optionally by [no]sync</div><div class='ctx'>  *--------------------------------------------------------------*/</div><div class='ctx'> #define BYTE_SHIFT 3</div><div class='del'>-static int core_ctr(struct dirty_log *log, struct dm_target *ti,</div><div class='del'>-		    unsigned int argc, char **argv)</div><div class='add'>+static int create_log_context(struct dirty_log *log, struct dm_target *ti,</div><div class='add'>+			      unsigned int argc, char **argv,</div><div class='add'>+			      struct dm_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	enum sync sync = DEFAULTSYNC;</div><div class='ctx'> </div><div class='ctx'> 	struct log_c *lc;</div><div class='ctx'> 	uint32_t region_size;</div><div class='ctx'> 	unsigned int region_count;</div><div class='del'>-	size_t bitset_size;</div><div class='add'>+	size_t bitset_size, buf_size;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &lt; 1 || argc &gt; 2) {</div><div class='ctx'> 		DMWARN("wrong number of arguments to mirror log");</div><div class='hunk'>@@ -319,22 +297,53 @@ static int core_ctr(struct dirty_log *log, struct dm_target *ti,</div><div class='ctx'> 	 * Work out how many "unsigned long"s we need to hold the bitset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bitset_size = dm_round_up(region_count,</div><div class='del'>-				  sizeof(unsigned long) &lt;&lt; BYTE_SHIFT);</div><div class='add'>+				  sizeof(*lc-&gt;clean_bits) &lt;&lt; BYTE_SHIFT);</div><div class='ctx'> 	bitset_size &gt;&gt;= BYTE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	lc-&gt;bitset_uint32_count = bitset_size / 4;</div><div class='del'>-	lc-&gt;clean_bits = vmalloc(bitset_size);</div><div class='del'>-	if (!lc-&gt;clean_bits) {</div><div class='del'>-		DMWARN("couldn't allocate clean bitset");</div><div class='del'>-		kfree(lc);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	lc-&gt;bitset_uint32_count = bitset_size / sizeof(*lc-&gt;clean_bits);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Disk log?</div><div class='add'>+	 */</div><div class='add'>+	if (!dev) {</div><div class='add'>+		lc-&gt;clean_bits = vmalloc(bitset_size);</div><div class='add'>+		if (!lc-&gt;clean_bits) {</div><div class='add'>+			DMWARN("couldn't allocate clean bitset");</div><div class='add'>+			kfree(lc);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		lc-&gt;disk_header = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		lc-&gt;log_dev = dev;</div><div class='add'>+		lc-&gt;header_location.bdev = lc-&gt;log_dev-&gt;bdev;</div><div class='add'>+		lc-&gt;header_location.sector = 0;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Buffer holds both header and bitset.</div><div class='add'>+		 */</div><div class='add'>+		buf_size = dm_round_up((LOG_OFFSET &lt;&lt; SECTOR_SHIFT) +</div><div class='add'>+				       bitset_size, ti-&gt;limits.hardsect_size);</div><div class='add'>+		lc-&gt;header_location.count = buf_size &gt;&gt; SECTOR_SHIFT;</div><div class='add'>+</div><div class='add'>+		lc-&gt;disk_header = vmalloc(buf_size);</div><div class='add'>+		if (!lc-&gt;disk_header) {</div><div class='add'>+			DMWARN("couldn't allocate disk log buffer");</div><div class='add'>+			kfree(lc);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lc-&gt;clean_bits = (void *)lc-&gt;disk_header +</div><div class='add'>+				 (LOG_OFFSET &lt;&lt; SECTOR_SHIFT);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	memset(lc-&gt;clean_bits, -1, bitset_size);</div><div class='ctx'> </div><div class='ctx'> 	lc-&gt;sync_bits = vmalloc(bitset_size);</div><div class='ctx'> 	if (!lc-&gt;sync_bits) {</div><div class='ctx'> 		DMWARN("couldn't allocate sync bitset");</div><div class='del'>-		vfree(lc-&gt;clean_bits);</div><div class='add'>+		if (!dev)</div><div class='add'>+			vfree(lc-&gt;clean_bits);</div><div class='add'>+		vfree(lc-&gt;disk_header);</div><div class='ctx'> 		kfree(lc);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -345,25 +354,40 @@ static int core_ctr(struct dirty_log *log, struct dm_target *ti,</div><div class='ctx'> 	if (!lc-&gt;recovering_bits) {</div><div class='ctx'> 		DMWARN("couldn't allocate sync bitset");</div><div class='ctx'> 		vfree(lc-&gt;sync_bits);</div><div class='del'>-		vfree(lc-&gt;clean_bits);</div><div class='add'>+		if (!dev)</div><div class='add'>+			vfree(lc-&gt;clean_bits);</div><div class='add'>+		vfree(lc-&gt;disk_header);</div><div class='ctx'> 		kfree(lc);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(lc-&gt;recovering_bits, 0, bitset_size);</div><div class='ctx'> 	lc-&gt;sync_search = 0;</div><div class='ctx'> 	log-&gt;context = lc;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void core_dtr(struct dirty_log *log)</div><div class='add'>+static int core_ctr(struct dirty_log *log, struct dm_target *ti,</div><div class='add'>+		    unsigned int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+	return create_log_context(log, ti, argc, argv, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_log_context(struct log_c *lc)</div><div class='ctx'> {</div><div class='del'>-	struct log_c *lc = (struct log_c *) log-&gt;context;</div><div class='del'>-	vfree(lc-&gt;clean_bits);</div><div class='ctx'> 	vfree(lc-&gt;sync_bits);</div><div class='ctx'> 	vfree(lc-&gt;recovering_bits);</div><div class='ctx'> 	kfree(lc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void core_dtr(struct dirty_log *log)</div><div class='add'>+{</div><div class='add'>+	struct log_c *lc = (struct log_c *) log-&gt;context;</div><div class='add'>+</div><div class='add'>+	vfree(lc-&gt;clean_bits);</div><div class='add'>+	destroy_log_context(lc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*----------------------------------------------------------------</div><div class='ctx'>  * disk log constructor/destructor</div><div class='ctx'>  *</div><div class='hunk'>@@ -373,8 +397,6 @@ static int disk_ctr(struct dirty_log *log, struct dm_target *ti,</div><div class='ctx'> 		    unsigned int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='del'>-	size_t size;</div><div class='del'>-	struct log_c *lc;</div><div class='ctx'> 	struct dm_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &lt; 2 || argc &gt; 3) {</div><div class='hunk'>@@ -387,49 +409,22 @@ static int disk_ctr(struct dirty_log *log, struct dm_target *ti,</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	r = core_ctr(log, ti, argc - 1, argv + 1);</div><div class='add'>+	r = create_log_context(log, ti, argc - 1, argv + 1, dev);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dm_put_device(ti, dev);</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lc = (struct log_c *) log-&gt;context;</div><div class='del'>-	lc-&gt;log_dev = dev;</div><div class='del'>-</div><div class='del'>-	/* setup the disk header fields */</div><div class='del'>-	lc-&gt;header_location.bdev = lc-&gt;log_dev-&gt;bdev;</div><div class='del'>-	lc-&gt;header_location.sector = 0;</div><div class='del'>-	lc-&gt;header_location.count = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We can't read less than this amount, even though we'll</div><div class='del'>-	 * not be using most of this space.</div><div class='del'>-	 */</div><div class='del'>-	lc-&gt;disk_header = vmalloc(1 &lt;&lt; SECTOR_SHIFT);</div><div class='del'>-	if (!lc-&gt;disk_header)</div><div class='del'>-		goto bad;</div><div class='del'>-</div><div class='del'>-	/* setup the disk bitset fields */</div><div class='del'>-	lc-&gt;bits_location.bdev = lc-&gt;log_dev-&gt;bdev;</div><div class='del'>-	lc-&gt;bits_location.sector = LOG_OFFSET;</div><div class='del'>-</div><div class='del'>-	size = dm_round_up(lc-&gt;bitset_uint32_count * sizeof(uint32_t),</div><div class='del'>-			   1 &lt;&lt; SECTOR_SHIFT);</div><div class='del'>-	lc-&gt;bits_location.count = size &gt;&gt; SECTOR_SHIFT;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- bad:</div><div class='del'>-	dm_put_device(ti, lc-&gt;log_dev);</div><div class='del'>-	core_dtr(log);</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void disk_dtr(struct dirty_log *log)</div><div class='ctx'> {</div><div class='ctx'> 	struct log_c *lc = (struct log_c *) log-&gt;context;</div><div class='add'>+</div><div class='ctx'> 	dm_put_device(lc-&gt;ti, lc-&gt;log_dev);</div><div class='ctx'> 	vfree(lc-&gt;disk_header);</div><div class='del'>-	core_dtr(log);</div><div class='add'>+	destroy_log_context(lc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int count_bits32(uint32_t *addr, unsigned size)</div><div class='hunk'>@@ -454,12 +449,7 @@ static int disk_resume(struct dirty_log *log)</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		return r;</div><div class='ctx'> </div><div class='del'>-	/* read the bits */</div><div class='del'>-	r = read_bits(lc);</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='del'>-	/* set or clear any new bits */</div><div class='add'>+	/* set or clear any new bits -- device has grown */</div><div class='ctx'> 	if (lc-&gt;sync == NOSYNC)</div><div class='ctx'> 		for (i = lc-&gt;header.nr_regions; i &lt; lc-&gt;region_count; i++)</div><div class='ctx'> 			/* FIXME: amazingly inefficient */</div><div class='hunk'>@@ -469,15 +459,14 @@ static int disk_resume(struct dirty_log *log)</div><div class='ctx'> 			/* FIXME: amazingly inefficient */</div><div class='ctx'> 			log_clear_bit(lc, lc-&gt;clean_bits, i);</div><div class='ctx'> </div><div class='add'>+	/* clear any old bits -- device has shrunk */</div><div class='add'>+	for (i = lc-&gt;region_count; i % (sizeof(*lc-&gt;clean_bits) &lt;&lt; BYTE_SHIFT); i++)</div><div class='add'>+		log_clear_bit(lc, lc-&gt;clean_bits, i);</div><div class='add'>+</div><div class='ctx'> 	/* copy clean across to sync */</div><div class='ctx'> 	memcpy(lc-&gt;sync_bits, lc-&gt;clean_bits, size);</div><div class='ctx'> 	lc-&gt;sync_count = count_bits32(lc-&gt;clean_bits, lc-&gt;bitset_uint32_count);</div><div class='ctx'> </div><div class='del'>-	/* write the bits */</div><div class='del'>-	r = write_bits(lc);</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-</div><div class='ctx'> 	/* set the correct number of regions in the header */</div><div class='ctx'> 	lc-&gt;header.nr_regions = lc-&gt;region_count;</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +507,7 @@ static int disk_flush(struct dirty_log *log)</div><div class='ctx'> 	if (!lc-&gt;touched)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	r = write_bits(lc);</div><div class='add'>+	r = write_header(lc);</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		lc-&gt;touched = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c<br/>index 1816f30678ed..217615b33223 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-mpath.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-mpath.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-mpath.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-mpath.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "multipath"</div><div class='ctx'> #define MESG_STR(x) x, sizeof(x)</div><div class='ctx'> </div><div class='ctx'> /* Path properties */</div><div class='hunk'>@@ -446,8 +447,6 @@ struct param {</div><div class='ctx'> 	char *error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ESTR(s) ("dm-multipath: " s)</div><div class='del'>-</div><div class='ctx'> static int read_param(struct param *param, char *str, unsigned *v, char **error)</div><div class='ctx'> {</div><div class='ctx'> 	if (!str ||</div><div class='hunk'>@@ -495,12 +494,12 @@ static int parse_path_selector(struct arg_set *as, struct priority_group *pg,</div><div class='ctx'> 	unsigned ps_argc;</div><div class='ctx'> </div><div class='ctx'> 	static struct param _params[] = {</div><div class='del'>-		{0, 1024, ESTR("invalid number of path selector args")},</div><div class='add'>+		{0, 1024, "invalid number of path selector args"},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	pst = dm_get_path_selector(shift(as));</div><div class='ctx'> 	if (!pst) {</div><div class='del'>-		ti-&gt;error = ESTR("unknown path selector type");</div><div class='add'>+		ti-&gt;error = "unknown path selector type";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +510,7 @@ static int parse_path_selector(struct arg_set *as, struct priority_group *pg,</div><div class='ctx'> 	r = pst-&gt;create(&amp;pg-&gt;ps, ps_argc, as-&gt;argv);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dm_put_path_selector(pst);</div><div class='del'>-		ti-&gt;error = ESTR("path selector constructor failed");</div><div class='add'>+		ti-&gt;error = "path selector constructor failed";</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -529,7 +528,7 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,</div><div class='ctx'> </div><div class='ctx'> 	/* we need at least a path arg */</div><div class='ctx'> 	if (as-&gt;argc &lt; 1) {</div><div class='del'>-		ti-&gt;error = ESTR("no device given");</div><div class='add'>+		ti-&gt;error = "no device given";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -540,7 +539,7 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,</div><div class='ctx'> 	r = dm_get_device(ti, shift(as), ti-&gt;begin, ti-&gt;len,</div><div class='ctx'> 			  dm_table_get_mode(ti-&gt;table), &amp;p-&gt;path.dev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		ti-&gt;error = ESTR("error getting device");</div><div class='add'>+		ti-&gt;error = "error getting device";</div><div class='ctx'> 		goto bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -562,8 +561,8 @@ static struct priority_group *parse_priority_group(struct arg_set *as,</div><div class='ctx'> 						   struct dm_target *ti)</div><div class='ctx'> {</div><div class='ctx'> 	static struct param _params[] = {</div><div class='del'>-		{1, 1024, ESTR("invalid number of paths")},</div><div class='del'>-		{0, 1024, ESTR("invalid number of selector args")}</div><div class='add'>+		{1, 1024, "invalid number of paths"},</div><div class='add'>+		{0, 1024, "invalid number of selector args"}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -572,13 +571,13 @@ static struct priority_group *parse_priority_group(struct arg_set *as,</div><div class='ctx'> </div><div class='ctx'> 	if (as-&gt;argc &lt; 2) {</div><div class='ctx'> 		as-&gt;argc = 0;</div><div class='del'>-		ti-&gt;error = ESTR("not enough priority group aruments");</div><div class='add'>+		ti-&gt;error = "not enough priority group aruments";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pg = alloc_priority_group();</div><div class='ctx'> 	if (!pg) {</div><div class='del'>-		ti-&gt;error = ESTR("couldn't allocate priority group");</div><div class='add'>+		ti-&gt;error = "couldn't allocate priority group";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	pg-&gt;m = m;</div><div class='hunk'>@@ -633,7 +632,7 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m,</div><div class='ctx'> 	unsigned hw_argc;</div><div class='ctx'> </div><div class='ctx'> 	static struct param _params[] = {</div><div class='del'>-		{0, 1024, ESTR("invalid number of hardware handler args")},</div><div class='add'>+		{0, 1024, "invalid number of hardware handler args"},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	r = read_param(_params, shift(as), &amp;hw_argc, &amp;ti-&gt;error);</div><div class='hunk'>@@ -645,14 +644,14 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m,</div><div class='ctx'> </div><div class='ctx'> 	hwht = dm_get_hw_handler(shift(as));</div><div class='ctx'> 	if (!hwht) {</div><div class='del'>-		ti-&gt;error = ESTR("unknown hardware handler type");</div><div class='add'>+		ti-&gt;error = "unknown hardware handler type";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r = hwht-&gt;create(&amp;m-&gt;hw_handler, hw_argc - 1, as-&gt;argv);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		dm_put_hw_handler(hwht);</div><div class='del'>-		ti-&gt;error = ESTR("hardware handler constructor failed");</div><div class='add'>+		ti-&gt;error = "hardware handler constructor failed";</div><div class='ctx'> 		return r;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -669,7 +668,7 @@ static int parse_features(struct arg_set *as, struct multipath *m,</div><div class='ctx'> 	unsigned argc;</div><div class='ctx'> </div><div class='ctx'> 	static struct param _params[] = {</div><div class='del'>-		{0, 1, ESTR("invalid number of feature args")},</div><div class='add'>+		{0, 1, "invalid number of feature args"},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	r = read_param(_params, shift(as), &amp;argc, &amp;ti-&gt;error);</div><div class='hunk'>@@ -692,8 +691,8 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,</div><div class='ctx'> {</div><div class='ctx'> 	/* target parameters */</div><div class='ctx'> 	static struct param _params[] = {</div><div class='del'>-		{1, 1024, ESTR("invalid number of priority groups")},</div><div class='del'>-		{1, 1024, ESTR("invalid initial priority group number")},</div><div class='add'>+		{1, 1024, "invalid number of priority groups"},</div><div class='add'>+		{1, 1024, "invalid initial priority group number"},</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	int r;</div><div class='hunk'>@@ -707,7 +706,7 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,</div><div class='ctx'> </div><div class='ctx'> 	m = alloc_multipath();</div><div class='ctx'> 	if (!m) {</div><div class='del'>-		ti-&gt;error = ESTR("can't allocate multipath");</div><div class='add'>+		ti-&gt;error = "can't allocate multipath";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -746,7 +745,7 @@ static int multipath_ctr(struct dm_target *ti, unsigned int argc,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pg_count != m-&gt;nr_priority_groups) {</div><div class='del'>-		ti-&gt;error = ESTR("priority group count mismatch");</div><div class='add'>+		ti-&gt;error = "priority group count mismatch";</div><div class='ctx'> 		r = -EINVAL;</div><div class='ctx'> 		goto bad;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -807,7 +806,7 @@ static int fail_path(struct pgpath *pgpath)</div><div class='ctx'> 	if (!pgpath-&gt;path.is_active)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	DMWARN("dm-multipath: Failing path %s.", pgpath-&gt;path.dev-&gt;name);</div><div class='add'>+	DMWARN("Failing path %s.", pgpath-&gt;path.dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	pgpath-&gt;pg-&gt;ps.type-&gt;fail_path(&amp;pgpath-&gt;pg-&gt;ps, &amp;pgpath-&gt;path);</div><div class='ctx'> 	pgpath-&gt;path.is_active = 0;</div><div class='hunk'>@@ -1250,7 +1249,7 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv)</div><div class='ctx'> 	r = dm_get_device(ti, argv[1], ti-&gt;begin, ti-&gt;len,</div><div class='ctx'> 			  dm_table_get_mode(ti-&gt;table), &amp;dev);</div><div class='ctx'> 	if (r) {</div><div class='del'>-		DMWARN("dm-multipath message: error getting device %s",</div><div class='add'>+		DMWARN("message: error getting device %s",</div><div class='ctx'> 		       argv[1]);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1309,7 +1308,7 @@ static int __init dm_multipath_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DMINFO("dm-multipath version %u.%u.%u loaded",</div><div class='add'>+	DMINFO("version %u.%u.%u loaded",</div><div class='ctx'> 	       multipath_target.version[0], multipath_target.version[1],</div><div class='ctx'> 	       multipath_target.version[2]);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c<br/>index d12cf3e5e076..be48cedf986b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-raid1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-raid1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-raid1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-raid1.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "raid1"</div><div class='add'>+</div><div class='ctx'> static struct workqueue_struct *_kmirrord_wq;</div><div class='ctx'> static struct work_struct _kmirrord_work;</div><div class='ctx'> </div><div class='hunk'>@@ -106,12 +108,42 @@ struct region {</div><div class='ctx'> 	struct bio_list delayed_bios;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*-----------------------------------------------------------------</div><div class='add'>+ * Mirror set structures.</div><div class='add'>+ *---------------------------------------------------------------*/</div><div class='add'>+struct mirror {</div><div class='add'>+	atomic_t error_count;</div><div class='add'>+	struct dm_dev *dev;</div><div class='add'>+	sector_t offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mirror_set {</div><div class='add'>+	struct dm_target *ti;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct region_hash rh;</div><div class='add'>+	struct kcopyd_client *kcopyd_client;</div><div class='add'>+</div><div class='add'>+	spinlock_t lock;	/* protects the next two lists */</div><div class='add'>+	struct bio_list reads;</div><div class='add'>+	struct bio_list writes;</div><div class='add'>+</div><div class='add'>+	/* recovery */</div><div class='add'>+	region_t nr_regions;</div><div class='add'>+	int in_sync;</div><div class='add'>+</div><div class='add'>+	struct mirror *default_mirror;	/* Default mirror */</div><div class='add'>+</div><div class='add'>+	unsigned int nr_mirrors;</div><div class='add'>+	struct mirror mirror[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Conversion fns</div><div class='ctx'>  */</div><div class='ctx'> static inline region_t bio_to_region(struct region_hash *rh, struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-	return bio-&gt;bi_sector &gt;&gt; rh-&gt;region_shift;</div><div class='add'>+	return (bio-&gt;bi_sector - rh-&gt;ms-&gt;ti-&gt;begin) &gt;&gt; rh-&gt;region_shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline sector_t region_to_sector(struct region_hash *rh, region_t region)</div><div class='hunk'>@@ -458,11 +490,9 @@ static int __rh_recovery_prepare(struct region_hash *rh)</div><div class='ctx'> 	/* Already quiesced ? */</div><div class='ctx'> 	if (atomic_read(&amp;reg-&gt;pending))</div><div class='ctx'> 		list_del_init(&amp;reg-&gt;list);</div><div class='add'>+	else</div><div class='add'>+		list_move(&amp;reg-&gt;list, &amp;rh-&gt;quiesced_regions);</div><div class='ctx'> </div><div class='del'>-	else {</div><div class='del'>-		list_del_init(&amp;reg-&gt;list);</div><div class='del'>-		list_add(&amp;reg-&gt;list, &amp;rh-&gt;quiesced_regions);</div><div class='del'>-	}</div><div class='ctx'> 	spin_unlock_irq(&amp;rh-&gt;region_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -541,35 +571,6 @@ static void rh_start_recovery(struct region_hash *rh)</div><div class='ctx'> 	wake();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*-----------------------------------------------------------------</div><div class='del'>- * Mirror set structures.</div><div class='del'>- *---------------------------------------------------------------*/</div><div class='del'>-struct mirror {</div><div class='del'>-	atomic_t error_count;</div><div class='del'>-	struct dm_dev *dev;</div><div class='del'>-	sector_t offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mirror_set {</div><div class='del'>-	struct dm_target *ti;</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct region_hash rh;</div><div class='del'>-	struct kcopyd_client *kcopyd_client;</div><div class='del'>-</div><div class='del'>-	spinlock_t lock;	/* protects the next two lists */</div><div class='del'>-	struct bio_list reads;</div><div class='del'>-	struct bio_list writes;</div><div class='del'>-</div><div class='del'>-	/* recovery */</div><div class='del'>-	region_t nr_regions;</div><div class='del'>-	int in_sync;</div><div class='del'>-</div><div class='del'>-	struct mirror *default_mirror;	/* Default mirror */</div><div class='del'>-</div><div class='del'>-	unsigned int nr_mirrors;</div><div class='del'>-	struct mirror mirror[0];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Every mirror should look like this one.</div><div class='ctx'>  */</div><div class='hunk'>@@ -603,7 +604,7 @@ static void recovery_complete(int read_err, unsigned int write_err,</div><div class='ctx'> 	struct region *reg = (struct region *) context;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: better error handling */</div><div class='del'>-	rh_recovery_end(reg, read_err || write_err);</div><div class='add'>+	rh_recovery_end(reg, !(read_err || write_err));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int recover(struct mirror_set *ms, struct region *reg)</div><div class='hunk'>@@ -893,7 +894,7 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,</div><div class='ctx'> </div><div class='ctx'> 	ms = kmalloc(len, GFP_KERNEL);</div><div class='ctx'> 	if (!ms) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Cannot allocate mirror context";</div><div class='add'>+		ti-&gt;error = "Cannot allocate mirror context";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -907,7 +908,7 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,</div><div class='ctx'> 	ms-&gt;default_mirror = &amp;ms-&gt;mirror[DEFAULT_MIRROR];</div><div class='ctx'> </div><div class='ctx'> 	if (rh_init(&amp;ms-&gt;rh, ms, dl, region_size, ms-&gt;nr_regions)) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Error creating dirty region hash";</div><div class='add'>+		ti-&gt;error = "Error creating dirty region hash";</div><div class='ctx'> 		kfree(ms);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -937,14 +938,14 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,</div><div class='ctx'> 	unsigned long long offset;</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(argv[1], "%llu", &amp;offset) != 1) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Invalid offset";</div><div class='add'>+		ti-&gt;error = "Invalid offset";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dm_get_device(ti, argv[0], offset, ti-&gt;len,</div><div class='ctx'> 			  dm_table_get_mode(ti-&gt;table),</div><div class='ctx'> 			  &amp;ms-&gt;mirror[mirror].dev)) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Device lookup failure";</div><div class='add'>+		ti-&gt;error = "Device lookup failure";</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -981,30 +982,30 @@ static struct dirty_log *create_dirty_log(struct dm_target *ti,</div><div class='ctx'> 	struct dirty_log *dl;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &lt; 2) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Insufficient mirror log arguments";</div><div class='add'>+		ti-&gt;error = "Insufficient mirror log arguments";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sscanf(argv[1], "%u", &amp;param_count) != 1) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Invalid mirror log argument count";</div><div class='add'>+		ti-&gt;error = "Invalid mirror log argument count";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*args_used = 2 + param_count;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &lt; *args_used) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Insufficient mirror log arguments";</div><div class='add'>+		ti-&gt;error = "Insufficient mirror log arguments";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dl = dm_create_dirty_log(argv[0], ti, param_count, argv + 2);</div><div class='ctx'> 	if (!dl) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Error creating mirror dirty log";</div><div class='add'>+		ti-&gt;error = "Error creating mirror dirty log";</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!_check_region_size(ti, dl-&gt;type-&gt;get_region_size(dl))) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Invalid region size";</div><div class='add'>+		ti-&gt;error = "Invalid region size";</div><div class='ctx'> 		dm_destroy_dirty_log(dl);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1038,7 +1039,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 	if (!argc || sscanf(argv[0], "%u", &amp;nr_mirrors) != 1 ||</div><div class='ctx'> 	    nr_mirrors &lt; 2 || nr_mirrors &gt; KCOPYD_MAX_REGIONS + 1) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Invalid number of mirrors";</div><div class='add'>+		ti-&gt;error = "Invalid number of mirrors";</div><div class='ctx'> 		dm_destroy_dirty_log(dl);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1046,7 +1047,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	argv++, argc--;</div><div class='ctx'> </div><div class='ctx'> 	if (argc != nr_mirrors * 2) {</div><div class='del'>-		ti-&gt;error = "dm-mirror: Wrong number of mirror arguments";</div><div class='add'>+		ti-&gt;error = "Wrong number of mirror arguments";</div><div class='ctx'> 		dm_destroy_dirty_log(dl);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1115,7 +1116,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,</div><div class='ctx'> 	struct mirror *m;</div><div class='ctx'> 	struct mirror_set *ms = ti-&gt;private;</div><div class='ctx'> </div><div class='del'>-	map_context-&gt;ll = bio-&gt;bi_sector &gt;&gt; ms-&gt;rh.region_shift;</div><div class='add'>+	map_context-&gt;ll = bio_to_region(&amp;ms-&gt;rh, bio);</div><div class='ctx'> </div><div class='ctx'> 	if (rw == WRITE) {</div><div class='ctx'> 		queue_bio(ms, bio, rw);</div><div class='hunk'>@@ -1221,7 +1222,7 @@ static int mirror_status(struct dm_target *ti, status_type_t type,</div><div class='ctx'> </div><div class='ctx'> static struct target_type mirror_target = {</div><div class='ctx'> 	.name	 = "mirror",</div><div class='del'>-	.version = {1, 0, 1},</div><div class='add'>+	.version = {1, 0, 2},</div><div class='ctx'> 	.module	 = THIS_MODULE,</div><div class='ctx'> 	.ctr	 = mirror_ctr,</div><div class='ctx'> 	.dtr	 = mirror_dtr,</div><div class='head'>diff --git a/drivers/md/dm-round-robin.c b/drivers/md/dm-round-robin.c<br/>index d0024865a789..c5a16c550122 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-round-robin.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-round-robin.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-round-robin.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-round-robin.c</a></div><div class='hunk'>@@ -14,6 +14,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "multipath round-robin"</div><div class='add'>+</div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='ctx'>  * Path-handling code, paths are held in lists</div><div class='ctx'>  *---------------------------------------------------------------*/</div><div class='hunk'>@@ -191,9 +193,9 @@ static int __init dm_rr_init(void)</div><div class='ctx'> 	int r = dm_register_path_selector(&amp;rr_ps);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("round-robin: register failed %d", r);</div><div class='add'>+		DMERR("register failed %d", r);</div><div class='ctx'> </div><div class='del'>-	DMINFO("dm-round-robin version 1.0.0 loaded");</div><div class='add'>+	DMINFO("version 1.0.0 loaded");</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c<br/>index 08312b46463a..1d0fafda0f76 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-snap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-snap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-snap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-snap.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/device-mapper.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -23,6 +22,8 @@</div><div class='ctx'> #include "dm-bio-list.h"</div><div class='ctx'> #include "kcopyd.h"</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "snapshots"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The percentage increment we will wake up users at</div><div class='ctx'>  */</div><div class='hunk'>@@ -117,7 +118,7 @@ static int init_origin_hash(void)</div><div class='ctx'> 	_origins = kmalloc(ORIGIN_HASH_SIZE * sizeof(struct list_head),</div><div class='ctx'> 			   GFP_KERNEL);</div><div class='ctx'> 	if (!_origins) {</div><div class='del'>-		DMERR("Device mapper: Snapshot: unable to allocate memory");</div><div class='add'>+		DMERR("unable to allocate memory");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -412,7 +413,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	int blocksize;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &lt; 4) {</div><div class='del'>-		ti-&gt;error = "dm-snapshot: requires exactly 4 arguments";</div><div class='add'>+		ti-&gt;error = "requires exactly 4 arguments";</div><div class='ctx'> 		r = -EINVAL;</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -530,7 +531,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ti-&gt;private = s;</div><div class='del'>-	ti-&gt;split_io = chunk_size;</div><div class='add'>+	ti-&gt;split_io = s-&gt;chunk_size;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1128,7 @@ static int origin_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	struct dm_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (argc != 1) {</div><div class='del'>-		ti-&gt;error = "dm-origin: incorrect number of arguments";</div><div class='add'>+		ti-&gt;error = "origin: incorrect number of arguments";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1204,7 +1205,7 @@ static int origin_status(struct dm_target *ti, status_type_t type, char *result,</div><div class='ctx'> </div><div class='ctx'> static struct target_type origin_target = {</div><div class='ctx'> 	.name    = "snapshot-origin",</div><div class='del'>-	.version = {1, 1, 0},</div><div class='add'>+	.version = {1, 4, 0},</div><div class='ctx'> 	.module  = THIS_MODULE,</div><div class='ctx'> 	.ctr     = origin_ctr,</div><div class='ctx'> 	.dtr     = origin_dtr,</div><div class='hunk'>@@ -1215,7 +1216,7 @@ static struct target_type origin_target = {</div><div class='ctx'> </div><div class='ctx'> static struct target_type snapshot_target = {</div><div class='ctx'> 	.name    = "snapshot",</div><div class='del'>-	.version = {1, 1, 0},</div><div class='add'>+	.version = {1, 4, 0},</div><div class='ctx'> 	.module  = THIS_MODULE,</div><div class='ctx'> 	.ctr     = snapshot_ctr,</div><div class='ctx'> 	.dtr     = snapshot_dtr,</div><div class='hunk'>@@ -1236,7 +1237,7 @@ static int __init dm_snapshot_init(void)</div><div class='ctx'> </div><div class='ctx'> 	r = dm_register_target(&amp;origin_target);</div><div class='ctx'> 	if (r &lt; 0) {</div><div class='del'>-		DMERR("Device mapper: Origin: register failed %d\n", r);</div><div class='add'>+		DMERR("Origin target register failed %d", r);</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c<br/>index 08328a8f5a3c..6c29fcecd892 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-stripe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-stripe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-stripe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-stripe.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "striped"</div><div class='add'>+</div><div class='ctx'> struct stripe {</div><div class='ctx'> 	struct dm_dev *dev;</div><div class='ctx'> 	sector_t physical_start;</div><div class='hunk'>@@ -78,19 +80,19 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	if (argc &lt; 2) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Not enough arguments";</div><div class='add'>+		ti-&gt;error = "Not enough arguments";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stripes = simple_strtoul(argv[0], &amp;end, 10);</div><div class='ctx'> 	if (*end) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Invalid stripe count";</div><div class='add'>+		ti-&gt;error = "Invalid stripe count";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chunk_size = simple_strtoul(argv[1], &amp;end, 10);</div><div class='ctx'> 	if (*end) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Invalid chunk_size";</div><div class='add'>+		ti-&gt;error = "Invalid chunk_size";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -99,19 +101,19 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!chunk_size || (chunk_size &amp; (chunk_size - 1)) ||</div><div class='ctx'> 	    (chunk_size &lt; (PAGE_SIZE &gt;&gt; SECTOR_SHIFT))) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Invalid chunk size";</div><div class='add'>+		ti-&gt;error = "Invalid chunk size";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ti-&gt;len &amp; (chunk_size - 1)) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Target length not divisible by "</div><div class='add'>+		ti-&gt;error = "Target length not divisible by "</div><div class='ctx'> 		    "chunk size";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	width = ti-&gt;len;</div><div class='ctx'> 	if (sector_div(width, stripes)) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Target length not divisible by "</div><div class='add'>+		ti-&gt;error = "Target length not divisible by "</div><div class='ctx'> 		    "number of stripes";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -120,14 +122,14 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> 	 * Do we have enough arguments for that many stripes ?</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (argc != (2 + 2 * stripes)) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Not enough destinations "</div><div class='add'>+		ti-&gt;error = "Not enough destinations "</div><div class='ctx'> 			"specified";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sc = alloc_context(stripes);</div><div class='ctx'> 	if (!sc) {</div><div class='del'>-		ti-&gt;error = "dm-stripe: Memory allocation for striped context "</div><div class='add'>+		ti-&gt;error = "Memory allocation for striped context "</div><div class='ctx'> 		    "failed";</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -149,8 +151,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'> 		r = get_stripe(ti, sc, i, argv);</div><div class='ctx'> 		if (r &lt; 0) {</div><div class='del'>-			ti-&gt;error = "dm-stripe: Couldn't parse stripe "</div><div class='del'>-				"destination";</div><div class='add'>+			ti-&gt;error = "Couldn't parse stripe destination";</div><div class='ctx'> 			while (i--)</div><div class='ctx'> 				dm_put_device(ti, sc-&gt;stripe[i].dev);</div><div class='ctx'> 			kfree(sc);</div><div class='hunk'>@@ -227,7 +228,7 @@ int __init dm_stripe_init(void)</div><div class='ctx'> </div><div class='ctx'> 	r = dm_register_target(&amp;stripe_target);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMWARN("striped target registration failed");</div><div class='add'>+		DMWARN("target registration failed");</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -235,7 +236,7 @@ int __init dm_stripe_init(void)</div><div class='ctx'> void dm_stripe_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (dm_unregister_target(&amp;stripe_target))</div><div class='del'>-		DMWARN("striped target unregistration failed");</div><div class='add'>+		DMWARN("target unregistration failed");</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c<br/>index 8f56a54cf0ce..75fe9493e6af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-table.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-table.c</a></div><div class='hunk'>@@ -17,6 +17,8 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "table"</div><div class='add'>+</div><div class='ctx'> #define MAX_DEPTH 16</div><div class='ctx'> #define NODE_SIZE L1_CACHE_BYTES</div><div class='ctx'> #define KEYS_PER_NODE (NODE_SIZE / sizeof(sector_t))</div><div class='hunk'>@@ -237,6 +239,44 @@ int dm_table_create(struct dm_table **result, int mode,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dm_create_error_table(struct dm_table **result, struct mapped_device *md)</div><div class='add'>+{</div><div class='add'>+	struct dm_table *t;</div><div class='add'>+	sector_t dev_size = 1;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Find current size of device.</div><div class='add'>+	 * Default to 1 sector if inactive.</div><div class='add'>+	 */</div><div class='add'>+	t = dm_get_table(md);</div><div class='add'>+	if (t) {</div><div class='add'>+		dev_size = dm_table_get_size(t);</div><div class='add'>+		dm_table_put(t);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = dm_table_create(&amp;t, FMODE_READ, 1, md);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = dm_table_add_target(t, "error", 0, dev_size, NULL);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = dm_table_complete(t);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	*result = t;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (r)</div><div class='add'>+		dm_table_put(t);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dm_create_error_table);</div><div class='add'>+</div><div class='ctx'> static void free_devices(struct list_head *devices)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *tmp, *next;</div><div class='hunk'>@@ -590,6 +630,12 @@ int dm_split_args(int *argc, char ***argvp, char *input)</div><div class='ctx'> 	unsigned array_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	*argc = 0;</div><div class='add'>+</div><div class='add'>+	if (!input) {</div><div class='add'>+		*argvp = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	argv = realloc_argv(&amp;array_size, argv);</div><div class='ctx'> 	if (!argv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -671,15 +717,14 @@ int dm_table_add_target(struct dm_table *t, const char *type,</div><div class='ctx'> 	memset(tgt, 0, sizeof(*tgt));</div><div class='ctx'> </div><div class='ctx'> 	if (!len) {</div><div class='del'>-		tgt-&gt;error = "zero-length target";</div><div class='del'>-		DMERR("%s", tgt-&gt;error);</div><div class='add'>+		DMERR("%s: zero-length target", dm_device_name(t-&gt;md));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tgt-&gt;type = dm_get_target_type(type);</div><div class='ctx'> 	if (!tgt-&gt;type) {</div><div class='del'>-		tgt-&gt;error = "unknown target type";</div><div class='del'>-		DMERR("%s", tgt-&gt;error);</div><div class='add'>+		DMERR("%s: %s: unknown target type", dm_device_name(t-&gt;md),</div><div class='add'>+		      type);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -716,7 +761,7 @@ int dm_table_add_target(struct dm_table *t, const char *type,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  bad:</div><div class='del'>-	DMERR("%s", tgt-&gt;error);</div><div class='add'>+	DMERR("%s: %s: %s", dm_device_name(t-&gt;md), type, tgt-&gt;error);</div><div class='ctx'> 	dm_put_target_type(tgt-&gt;type);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -802,7 +847,7 @@ sector_t dm_table_get_size(struct dm_table *t)</div><div class='ctx'> </div><div class='ctx'> struct dm_target *dm_table_get_target(struct dm_table *t, unsigned int index)</div><div class='ctx'> {</div><div class='del'>-	if (index &gt; t-&gt;num_targets)</div><div class='add'>+	if (index &gt;= t-&gt;num_targets)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	return t-&gt;targets + index;</div><div class='head'>diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c<br/>index 64fd8e79ea4c..477a041a41cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-target.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-target.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-target.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-target.c</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "target"</div><div class='add'>+</div><div class='ctx'> struct tt_internal {</div><div class='ctx'> 	struct target_type tt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/md/dm-zero.c b/drivers/md/dm-zero.c<br/>index 51c0639b2487..ea569f7348d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm-zero.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm-zero.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm-zero.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm-zero.c</a></div><div class='hunk'>@@ -10,13 +10,15 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "zero"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Construct a dummy mapping that only returns zeros</div><div class='ctx'>  */</div><div class='ctx'> static int zero_ctr(struct dm_target *ti, unsigned int argc, char **argv)</div><div class='ctx'> {</div><div class='ctx'> 	if (argc != 0) {</div><div class='del'>-		ti-&gt;error = "dm-zero: No arguments required";</div><div class='add'>+		ti-&gt;error = "No arguments required";</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -60,7 +62,7 @@ static int __init dm_zero_init(void)</div><div class='ctx'> 	int r = dm_register_target(&amp;zero_target);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("zero: register failed %d", r);</div><div class='add'>+		DMERR("register failed %d", r);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='hunk'>@@ -70,7 +72,7 @@ static void __exit dm_zero_exit(void)</div><div class='ctx'> 	int r = dm_unregister_target(&amp;zero_target);</div><div class='ctx'> </div><div class='ctx'> 	if (r &lt; 0)</div><div class='del'>-		DMERR("zero: unregister failed %d", r);</div><div class='add'>+		DMERR("unregister failed %d", r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(dm_zero_init)</div><div class='head'>diff --git a/drivers/md/dm.c b/drivers/md/dm.c<br/>index 4d710b7a133b..c99bf9f01759 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2001, 2002 Sistina Software (UK) Limited.</div><div class='del'>- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.</div><div class='add'>+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is released under the GPL.</div><div class='ctx'>  */</div><div class='hunk'>@@ -21,11 +21,14 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/blktrace_api.h&gt;</div><div class='ctx'> </div><div class='add'>+#define DM_MSG_PREFIX "core"</div><div class='add'>+</div><div class='ctx'> static const char *_name = DM_NAME;</div><div class='ctx'> </div><div class='ctx'> static unsigned int major = 0;</div><div class='ctx'> static unsigned int _major = 0;</div><div class='ctx'> </div><div class='add'>+static DEFINE_SPINLOCK(_minor_lock);</div><div class='ctx'> /*</div><div class='ctx'>  * One of these is allocated per bio.</div><div class='ctx'>  */</div><div class='hunk'>@@ -49,23 +52,28 @@ struct target_io {</div><div class='ctx'> </div><div class='ctx'> union map_info *dm_get_mapinfo(struct bio *bio)</div><div class='ctx'> {</div><div class='del'>-        if (bio &amp;&amp; bio-&gt;bi_private)</div><div class='del'>-                return &amp;((struct target_io *)bio-&gt;bi_private)-&gt;info;</div><div class='del'>-        return NULL;</div><div class='add'>+	if (bio &amp;&amp; bio-&gt;bi_private)</div><div class='add'>+		return &amp;((struct target_io *)bio-&gt;bi_private)-&gt;info;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MINOR_ALLOCED ((void *)-1)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Bits for the md-&gt;flags field.</div><div class='ctx'>  */</div><div class='ctx'> #define DMF_BLOCK_IO 0</div><div class='ctx'> #define DMF_SUSPENDED 1</div><div class='ctx'> #define DMF_FROZEN 2</div><div class='add'>+#define DMF_FREEING 3</div><div class='add'>+#define DMF_DELETING 4</div><div class='ctx'> </div><div class='ctx'> struct mapped_device {</div><div class='ctx'> 	struct rw_semaphore io_lock;</div><div class='ctx'> 	struct semaphore suspend_lock;</div><div class='ctx'> 	rwlock_t map_lock;</div><div class='ctx'> 	atomic_t holders;</div><div class='add'>+	atomic_t open_count;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +167,7 @@ static void local_exit(void)</div><div class='ctx'> 	bioset_free(dm_set);</div><div class='ctx'> </div><div class='ctx'> 	if (unregister_blkdev(_major, _name) &lt; 0)</div><div class='del'>-		DMERR("devfs_unregister_blkdev failed");</div><div class='add'>+		DMERR("unregister_blkdev failed");</div><div class='ctx'> </div><div class='ctx'> 	_major = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -218,9 +226,25 @@ static int dm_blk_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct mapped_device *md;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='add'>+</div><div class='ctx'> 	md = inode-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+	if (!md)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (test_bit(DMF_FREEING, &amp;md-&gt;flags) ||</div><div class='add'>+	    test_bit(DMF_DELETING, &amp;md-&gt;flags)) {</div><div class='add'>+		md = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dm_get(md);</div><div class='del'>-	return 0;</div><div class='add'>+	atomic_inc(&amp;md-&gt;open_count);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='add'>+</div><div class='add'>+	return md ? 0 : -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dm_blk_close(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -228,10 +252,35 @@ static int dm_blk_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct mapped_device *md;</div><div class='ctx'> </div><div class='ctx'> 	md = inode-&gt;i_bdev-&gt;bd_disk-&gt;private_data;</div><div class='add'>+	atomic_dec(&amp;md-&gt;open_count);</div><div class='ctx'> 	dm_put(md);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int dm_open_count(struct mapped_device *md)</div><div class='add'>+{</div><div class='add'>+	return atomic_read(&amp;md-&gt;open_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Guarantees nothing is using the device before it's deleted.</div><div class='add'>+ */</div><div class='add'>+int dm_lock_for_deletion(struct mapped_device *md)</div><div class='add'>+{</div><div class='add'>+	int r = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='add'>+</div><div class='add'>+	if (dm_open_count(md))</div><div class='add'>+		r = -EBUSY;</div><div class='add'>+	else</div><div class='add'>+		set_bit(DMF_DELETING, &amp;md-&gt;flags);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='add'>+</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)</div><div class='ctx'> {</div><div class='ctx'> 	struct mapped_device *md = bdev-&gt;bd_disk-&gt;private_data;</div><div class='hunk'>@@ -456,8 +505,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,</div><div class='ctx'> 	if (r &gt; 0) {</div><div class='ctx'> 		/* the bio has been remapped so dispatch it */</div><div class='ctx'> </div><div class='del'>-		blk_add_trace_remap(bdev_get_queue(clone-&gt;bi_bdev), clone, </div><div class='del'>-				    tio-&gt;io-&gt;bio-&gt;bi_bdev-&gt;bd_dev, sector, </div><div class='add'>+		blk_add_trace_remap(bdev_get_queue(clone-&gt;bi_bdev), clone,</div><div class='add'>+				    tio-&gt;io-&gt;bio-&gt;bi_bdev-&gt;bd_dev, sector,</div><div class='ctx'> 				    clone-&gt;bi_sector);</div><div class='ctx'> </div><div class='ctx'> 		generic_make_request(clone);</div><div class='hunk'>@@ -744,43 +793,39 @@ static int dm_any_congested(void *congested_data, int bdi_bits)</div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='ctx'>  * An IDR is used to keep track of allocated minor numbers.</div><div class='ctx'>  *---------------------------------------------------------------*/</div><div class='del'>-static DEFINE_MUTEX(_minor_lock);</div><div class='ctx'> static DEFINE_IDR(_minor_idr);</div><div class='ctx'> </div><div class='del'>-static void free_minor(unsigned int minor)</div><div class='add'>+static void free_minor(int minor)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;_minor_lock);</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='ctx'> 	idr_remove(&amp;_minor_idr, minor);</div><div class='del'>-	mutex_unlock(&amp;_minor_lock);</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * See if the device with a specific minor # is free.</div><div class='ctx'>  */</div><div class='del'>-static int specific_minor(struct mapped_device *md, unsigned int minor)</div><div class='add'>+static int specific_minor(struct mapped_device *md, int minor)</div><div class='ctx'> {</div><div class='ctx'> 	int r, m;</div><div class='ctx'> </div><div class='ctx'> 	if (minor &gt;= (1 &lt;&lt; MINORBITS))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;_minor_lock);</div><div class='add'>+	r = idr_pre_get(&amp;_minor_idr, GFP_KERNEL);</div><div class='add'>+	if (!r)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (idr_find(&amp;_minor_idr, minor)) {</div><div class='ctx'> 		r = -EBUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = idr_pre_get(&amp;_minor_idr, GFP_KERNEL);</div><div class='del'>-	if (!r) {</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = idr_get_new_above(&amp;_minor_idr, md, minor, &amp;m);</div><div class='del'>-	if (r) {</div><div class='add'>+	r = idr_get_new_above(&amp;_minor_idr, MINOR_ALLOCED, minor, &amp;m);</div><div class='add'>+	if (r)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (m != minor) {</div><div class='ctx'> 		idr_remove(&amp;_minor_idr, m);</div><div class='hunk'>@@ -789,24 +834,21 @@ static int specific_minor(struct mapped_device *md, unsigned int minor)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;_minor_lock);</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int next_free_minor(struct mapped_device *md, unsigned int *minor)</div><div class='add'>+static int next_free_minor(struct mapped_device *md, int *minor)</div><div class='ctx'> {</div><div class='del'>-	int r;</div><div class='del'>-	unsigned int m;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;_minor_lock);</div><div class='add'>+	int r, m;</div><div class='ctx'> </div><div class='ctx'> 	r = idr_pre_get(&amp;_minor_idr, GFP_KERNEL);</div><div class='del'>-	if (!r) {</div><div class='del'>-		r = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (!r)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='ctx'> </div><div class='del'>-	r = idr_get_new(&amp;_minor_idr, md, &amp;m);</div><div class='add'>+	r = idr_get_new(&amp;_minor_idr, MINOR_ALLOCED, &amp;m);</div><div class='ctx'> 	if (r) {</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -820,7 +862,7 @@ static int next_free_minor(struct mapped_device *md, unsigned int *minor)</div><div class='ctx'> 	*minor = m;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;_minor_lock);</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -829,18 +871,25 @@ static struct block_device_operations dm_blk_dops;</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate and initialise a blank device with a given minor.</div><div class='ctx'>  */</div><div class='del'>-static struct mapped_device *alloc_dev(unsigned int minor, int persistent)</div><div class='add'>+static struct mapped_device *alloc_dev(int minor)</div><div class='ctx'> {</div><div class='ctx'> 	int r;</div><div class='ctx'> 	struct mapped_device *md = kmalloc(sizeof(*md), GFP_KERNEL);</div><div class='add'>+	void *old_md;</div><div class='ctx'> </div><div class='ctx'> 	if (!md) {</div><div class='ctx'> 		DMWARN("unable to allocate device, out of memory.");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!try_module_get(THIS_MODULE))</div><div class='add'>+		goto bad0;</div><div class='add'>+</div><div class='ctx'> 	/* get a minor number for the dev */</div><div class='del'>-	r = persistent ? specific_minor(md, minor) : next_free_minor(md, &amp;minor);</div><div class='add'>+	if (minor == DM_ANY_MINOR)</div><div class='add'>+		r = next_free_minor(md, &amp;minor);</div><div class='add'>+	else</div><div class='add'>+		r = specific_minor(md, minor);</div><div class='ctx'> 	if (r &lt; 0)</div><div class='ctx'> 		goto bad1;</div><div class='ctx'> </div><div class='hunk'>@@ -849,6 +898,7 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)</div><div class='ctx'> 	init_MUTEX(&amp;md-&gt;suspend_lock);</div><div class='ctx'> 	rwlock_init(&amp;md-&gt;map_lock);</div><div class='ctx'> 	atomic_set(&amp;md-&gt;holders, 1);</div><div class='add'>+	atomic_set(&amp;md-&gt;open_count, 0);</div><div class='ctx'> 	atomic_set(&amp;md-&gt;event_nr, 0);</div><div class='ctx'> </div><div class='ctx'> 	md-&gt;queue = blk_alloc_queue(GFP_KERNEL);</div><div class='hunk'>@@ -875,6 +925,10 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)</div><div class='ctx'> 	if (!md-&gt;disk)</div><div class='ctx'> 		goto bad4;</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;md-&gt;pending, 0);</div><div class='add'>+	init_waitqueue_head(&amp;md-&gt;wait);</div><div class='add'>+	init_waitqueue_head(&amp;md-&gt;eventq);</div><div class='add'>+</div><div class='ctx'> 	md-&gt;disk-&gt;major = _major;</div><div class='ctx'> 	md-&gt;disk-&gt;first_minor = minor;</div><div class='ctx'> 	md-&gt;disk-&gt;fops = &amp;dm_blk_dops;</div><div class='hunk'>@@ -884,9 +938,12 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)</div><div class='ctx'> 	add_disk(md-&gt;disk);</div><div class='ctx'> 	format_dev_t(md-&gt;name, MKDEV(_major, minor));</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;md-&gt;pending, 0);</div><div class='del'>-	init_waitqueue_head(&amp;md-&gt;wait);</div><div class='del'>-	init_waitqueue_head(&amp;md-&gt;eventq);</div><div class='add'>+	/* Populate the mapping, nobody knows we exist yet */</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='add'>+	old_md = idr_replace(&amp;_minor_idr, md, minor);</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='add'>+</div><div class='add'>+	BUG_ON(old_md != MINOR_ALLOCED);</div><div class='ctx'> </div><div class='ctx'> 	return md;</div><div class='ctx'> </div><div class='hunk'>@@ -898,13 +955,15 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)</div><div class='ctx'> 	blk_cleanup_queue(md-&gt;queue);</div><div class='ctx'> 	free_minor(minor);</div><div class='ctx'>  bad1:</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+ bad0:</div><div class='ctx'> 	kfree(md);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_dev(struct mapped_device *md)</div><div class='ctx'> {</div><div class='del'>-	unsigned int minor = md-&gt;disk-&gt;first_minor;</div><div class='add'>+	int minor = md-&gt;disk-&gt;first_minor;</div><div class='ctx'> </div><div class='ctx'> 	if (md-&gt;suspended_bdev) {</div><div class='ctx'> 		thaw_bdev(md-&gt;suspended_bdev, NULL);</div><div class='hunk'>@@ -914,8 +973,14 @@ static void free_dev(struct mapped_device *md)</div><div class='ctx'> 	mempool_destroy(md-&gt;io_pool);</div><div class='ctx'> 	del_gendisk(md-&gt;disk);</div><div class='ctx'> 	free_minor(minor);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='add'>+	md-&gt;disk-&gt;private_data = NULL;</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='add'>+</div><div class='ctx'> 	put_disk(md-&gt;disk);</div><div class='ctx'> 	blk_cleanup_queue(md-&gt;queue);</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='ctx'> 	kfree(md);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -984,12 +1049,11 @@ static void __unbind(struct mapped_device *md)</div><div class='ctx'> /*</div><div class='ctx'>  * Constructor for a new device.</div><div class='ctx'>  */</div><div class='del'>-static int create_aux(unsigned int minor, int persistent,</div><div class='del'>-		      struct mapped_device **result)</div><div class='add'>+int dm_create(int minor, struct mapped_device **result)</div><div class='ctx'> {</div><div class='ctx'> 	struct mapped_device *md;</div><div class='ctx'> </div><div class='del'>-	md = alloc_dev(minor, persistent);</div><div class='add'>+	md = alloc_dev(minor);</div><div class='ctx'> 	if (!md)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='hunk'>@@ -997,16 +1061,6 @@ static int create_aux(unsigned int minor, int persistent,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dm_create(struct mapped_device **result)</div><div class='del'>-{</div><div class='del'>-	return create_aux(0, 0, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int dm_create_with_minor(unsigned int minor, struct mapped_device **result)</div><div class='del'>-{</div><div class='del'>-	return create_aux(minor, 1, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct mapped_device *dm_find_md(dev_t dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mapped_device *md;</div><div class='hunk'>@@ -1015,13 +1069,18 @@ static struct mapped_device *dm_find_md(dev_t dev)</div><div class='ctx'> 	if (MAJOR(dev) != _major || minor &gt;= (1 &lt;&lt; MINORBITS))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;_minor_lock);</div><div class='add'>+	spin_lock(&amp;_minor_lock);</div><div class='ctx'> </div><div class='ctx'> 	md = idr_find(&amp;_minor_idr, minor);</div><div class='del'>-	if (!md || (dm_disk(md)-&gt;first_minor != minor))</div><div class='add'>+	if (md &amp;&amp; (md == MINOR_ALLOCED ||</div><div class='add'>+		   (dm_disk(md)-&gt;first_minor != minor) ||</div><div class='add'>+		   test_bit(DMF_FREEING, &amp;md-&gt;flags))) {</div><div class='ctx'> 		md = NULL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;_minor_lock);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;_minor_lock);</div><div class='ctx'> </div><div class='ctx'> 	return md;</div><div class='ctx'> }</div><div class='hunk'>@@ -1051,12 +1110,23 @@ void dm_get(struct mapped_device *md)</div><div class='ctx'> 	atomic_inc(&amp;md-&gt;holders);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const char *dm_device_name(struct mapped_device *md)</div><div class='add'>+{</div><div class='add'>+	return md-&gt;name;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(dm_device_name);</div><div class='add'>+</div><div class='ctx'> void dm_put(struct mapped_device *md)</div><div class='ctx'> {</div><div class='ctx'> 	struct dm_table *map;</div><div class='ctx'> </div><div class='del'>-	if (atomic_dec_and_test(&amp;md-&gt;holders)) {</div><div class='add'>+	BUG_ON(test_bit(DMF_FREEING, &amp;md-&gt;flags));</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_lock(&amp;md-&gt;holders, &amp;_minor_lock)) {</div><div class='ctx'> 		map = dm_get_table(md);</div><div class='add'>+		idr_replace(&amp;_minor_idr, MINOR_ALLOCED, dm_disk(md)-&gt;first_minor);</div><div class='add'>+		set_bit(DMF_FREEING, &amp;md-&gt;flags);</div><div class='add'>+		spin_unlock(&amp;_minor_lock);</div><div class='ctx'> 		if (!dm_suspended(md)) {</div><div class='ctx'> 			dm_table_presuspend_targets(map);</div><div class='ctx'> 			dm_table_postsuspend_targets(map);</div><div class='head'>diff --git a/drivers/md/dm.h b/drivers/md/dm.h<br/>index fd90bc8f9e45..3c03c0ecab7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/dm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/dm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/dm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/dm.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * Internal header file for device mapper</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001, 2002 Sistina Software</div><div class='del'>- * Copyright (C) 2004 Red Hat, Inc. All rights reserved.</div><div class='add'>+ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.</div><div class='ctx'>  *</div><div class='ctx'>  * This file is released under the LGPL.</div><div class='ctx'>  */</div><div class='hunk'>@@ -17,9 +17,10 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DM_NAME "device-mapper"</div><div class='del'>-#define DMWARN(f, x...) printk(KERN_WARNING DM_NAME ": " f "\n" , ## x)</div><div class='del'>-#define DMERR(f, x...) printk(KERN_ERR DM_NAME ": " f "\n" , ## x)</div><div class='del'>-#define DMINFO(f, x...) printk(KERN_INFO DM_NAME ": " f "\n" , ## x)</div><div class='add'>+</div><div class='add'>+#define DMERR(f, arg...) printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)</div><div class='add'>+#define DMWARN(f, arg...) printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)</div><div class='add'>+#define DMINFO(f, arg...) printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)</div><div class='ctx'> </div><div class='ctx'> #define DMEMIT(x...) sz += ((sz &gt;= maxlen) ? \</div><div class='ctx'> 			  0 : scnprintf(result + sz, maxlen - sz, x))</div><div class='hunk'>@@ -39,83 +40,16 @@ struct dm_dev {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dm_table;</div><div class='del'>-struct mapped_device;</div><div class='del'>-</div><div class='del'>-/*-----------------------------------------------------------------</div><div class='del'>- * Functions for manipulating a struct mapped_device.</div><div class='del'>- * Drop the reference with dm_put when you finish with the object.</div><div class='del'>- *---------------------------------------------------------------*/</div><div class='del'>-int dm_create(struct mapped_device **md);</div><div class='del'>-int dm_create_with_minor(unsigned int minor, struct mapped_device **md);</div><div class='del'>-void dm_set_mdptr(struct mapped_device *md, void *ptr);</div><div class='del'>-void *dm_get_mdptr(struct mapped_device *md);</div><div class='del'>-struct mapped_device *dm_get_md(dev_t dev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reference counting for md.</div><div class='del'>- */</div><div class='del'>-void dm_get(struct mapped_device *md);</div><div class='del'>-void dm_put(struct mapped_device *md);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A device can still be used while suspended, but I/O is deferred.</div><div class='del'>- */</div><div class='del'>-int dm_suspend(struct mapped_device *md, int with_lockfs);</div><div class='del'>-int dm_resume(struct mapped_device *md);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The device must be suspended before calling this method.</div><div class='del'>- */</div><div class='del'>-int dm_swap_table(struct mapped_device *md, struct dm_table *t);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Drop a reference on the table when you've finished with the</div><div class='del'>- * result.</div><div class='del'>- */</div><div class='del'>-struct dm_table *dm_get_table(struct mapped_device *md);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Event functions.</div><div class='del'>- */</div><div class='del'>-uint32_t dm_get_event_nr(struct mapped_device *md);</div><div class='del'>-int dm_wait_event(struct mapped_device *md, int event_nr);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Info functions.</div><div class='del'>- */</div><div class='del'>-struct gendisk *dm_disk(struct mapped_device *md);</div><div class='del'>-int dm_suspended(struct mapped_device *md);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Geometry functions.</div><div class='del'>- */</div><div class='del'>-int dm_get_geometry(struct mapped_device *md, struct hd_geometry *geo);</div><div class='del'>-int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo);</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='del'>- * Functions for manipulating a table.  Tables are also reference</div><div class='del'>- * counted.</div><div class='add'>+ * Internal table functions.</div><div class='ctx'>  *---------------------------------------------------------------*/</div><div class='del'>-int dm_table_create(struct dm_table **result, int mode,</div><div class='del'>-		    unsigned num_targets, struct mapped_device *md);</div><div class='del'>-</div><div class='del'>-void dm_table_get(struct dm_table *t);</div><div class='del'>-void dm_table_put(struct dm_table *t);</div><div class='del'>-</div><div class='del'>-int dm_table_add_target(struct dm_table *t, const char *type,</div><div class='del'>-			sector_t start,	sector_t len, char *params);</div><div class='del'>-int dm_table_complete(struct dm_table *t);</div><div class='ctx'> void dm_table_event_callback(struct dm_table *t,</div><div class='ctx'> 			     void (*fn)(void *), void *context);</div><div class='del'>-void dm_table_event(struct dm_table *t);</div><div class='del'>-sector_t dm_table_get_size(struct dm_table *t);</div><div class='ctx'> struct dm_target *dm_table_get_target(struct dm_table *t, unsigned int index);</div><div class='ctx'> struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector);</div><div class='ctx'> void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q);</div><div class='del'>-unsigned int dm_table_get_num_targets(struct dm_table *t);</div><div class='ctx'> struct list_head *dm_table_get_devices(struct dm_table *t);</div><div class='del'>-int dm_table_get_mode(struct dm_table *t);</div><div class='del'>-struct mapped_device *dm_table_get_md(struct dm_table *t);</div><div class='ctx'> void dm_table_presuspend_targets(struct dm_table *t);</div><div class='ctx'> void dm_table_postsuspend_targets(struct dm_table *t);</div><div class='ctx'> void dm_table_resume_targets(struct dm_table *t);</div><div class='hunk'>@@ -133,7 +67,6 @@ void dm_put_target_type(struct target_type *t);</div><div class='ctx'> int dm_target_iterate(void (*iter_func)(struct target_type *tt,</div><div class='ctx'> 					void *param), void *param);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*-----------------------------------------------------------------</div><div class='ctx'>  * Useful inlines.</div><div class='ctx'>  *---------------------------------------------------------------*/</div><div class='hunk'>@@ -191,5 +124,7 @@ void dm_stripe_exit(void);</div><div class='ctx'> </div><div class='ctx'> void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size);</div><div class='ctx'> union map_info *dm_get_mapinfo(struct bio *bio);</div><div class='add'>+int dm_open_count(struct mapped_device *md);</div><div class='add'>+int dm_lock_for_deletion(struct mapped_device *md);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c<br/>index 72480a48d88b..f1db6eff4857 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/kcopyd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/kcopyd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/kcopyd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/kcopyd.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -314,7 +313,7 @@ static void complete_io(unsigned long error, void *context)</div><div class='ctx'> </div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		if (job-&gt;rw == WRITE)</div><div class='del'>-			job-&gt;write_err &amp;= error;</div><div class='add'>+			job-&gt;write_err |= error;</div><div class='ctx'> 		else</div><div class='ctx'> 			job-&gt;read_err = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -460,7 +459,7 @@ static void segment_complete(int read_err,</div><div class='ctx'> 		job-&gt;read_err = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (write_err)</div><div class='del'>-		job-&gt;write_err &amp;= write_err;</div><div class='add'>+		job-&gt;write_err |= write_err;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Only dispatch more work if there hasn't been an error.</div><div class='head'>diff --git a/drivers/md/linear.c b/drivers/md/linear.c<br/>index 777585458c85..ff83c9b5979e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/linear.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/linear.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/linear.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/linear.c</a></div><div class='hunk'>@@ -111,7 +111,7 @@ static int linear_issue_flush(request_queue_t *q, struct gendisk *disk,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int linear_run (mddev_t *mddev)</div><div class='add'>+static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)</div><div class='ctx'> {</div><div class='ctx'> 	linear_conf_t *conf;</div><div class='ctx'> 	dev_info_t **table;</div><div class='hunk'>@@ -121,20 +121,21 @@ static int linear_run (mddev_t *mddev)</div><div class='ctx'> 	sector_t curr_offset;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> </div><div class='del'>-	conf = kzalloc (sizeof (*conf) + mddev-&gt;raid_disks*sizeof(dev_info_t),</div><div class='add'>+	conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t),</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!conf)</div><div class='del'>-		goto out;</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	mddev-&gt;private = conf;</div><div class='ctx'> </div><div class='ctx'> 	cnt = 0;</div><div class='del'>-	mddev-&gt;array_size = 0;</div><div class='add'>+	conf-&gt;array_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	ITERATE_RDEV(mddev,rdev,tmp) {</div><div class='ctx'> 		int j = rdev-&gt;raid_disk;</div><div class='ctx'> 		dev_info_t *disk = conf-&gt;disks + j;</div><div class='ctx'> </div><div class='del'>-		if (j &lt; 0 || j &gt; mddev-&gt;raid_disks || disk-&gt;rdev) {</div><div class='add'>+		if (j &lt; 0 || j &gt; raid_disks || disk-&gt;rdev) {</div><div class='ctx'> 			printk("linear: disk numbering problem. Aborting!\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -152,11 +153,11 @@ static int linear_run (mddev_t *mddev)</div><div class='ctx'> 			blk_queue_max_sectors(mddev-&gt;queue, PAGE_SIZE&gt;&gt;9);</div><div class='ctx'> </div><div class='ctx'> 		disk-&gt;size = rdev-&gt;size;</div><div class='del'>-		mddev-&gt;array_size += rdev-&gt;size;</div><div class='add'>+		conf-&gt;array_size += rdev-&gt;size;</div><div class='ctx'> </div><div class='ctx'> 		cnt++;</div><div class='ctx'> 	}</div><div class='del'>-	if (cnt != mddev-&gt;raid_disks) {</div><div class='add'>+	if (cnt != raid_disks) {</div><div class='ctx'> 		printk("linear: not enough drives present. Aborting!\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -200,7 +201,7 @@ static int linear_run (mddev_t *mddev)</div><div class='ctx'> 		unsigned round;</div><div class='ctx'> 		unsigned long base;</div><div class='ctx'> </div><div class='del'>-		sz = mddev-&gt;array_size &gt;&gt; conf-&gt;preshift;</div><div class='add'>+		sz = conf-&gt;array_size &gt;&gt; conf-&gt;preshift;</div><div class='ctx'> 		sz += 1; /* force round-up */</div><div class='ctx'> 		base = conf-&gt;hash_spacing &gt;&gt; conf-&gt;preshift;</div><div class='ctx'> 		round = sector_div(sz, base);</div><div class='hunk'>@@ -247,14 +248,56 @@ static int linear_run (mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(table - conf-&gt;hash_table &gt; nb_zone);</div><div class='ctx'> </div><div class='add'>+	return conf;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(conf);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int linear_run (mddev_t *mddev)</div><div class='add'>+{</div><div class='add'>+	linear_conf_t *conf;</div><div class='add'>+</div><div class='add'>+	conf = linear_conf(mddev, mddev-&gt;raid_disks);</div><div class='add'>+</div><div class='add'>+	if (!conf)</div><div class='add'>+		return 1;</div><div class='add'>+	mddev-&gt;private = conf;</div><div class='add'>+	mddev-&gt;array_size = conf-&gt;array_size;</div><div class='add'>+</div><div class='ctx'> 	blk_queue_merge_bvec(mddev-&gt;queue, linear_mergeable_bvec);</div><div class='ctx'> 	mddev-&gt;queue-&gt;unplug_fn = linear_unplug;</div><div class='ctx'> 	mddev-&gt;queue-&gt;issue_flush_fn = linear_issue_flush;</div><div class='ctx'> 	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	kfree(conf);</div><div class='del'>-	return 1;</div><div class='add'>+static int linear_add(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='add'>+{</div><div class='add'>+	/* Adding a drive to a linear array allows the array to grow.</div><div class='add'>+	 * It is permitted if the new drive has a matching superblock</div><div class='add'>+	 * already on it, with raid_disk equal to raid_disks.</div><div class='add'>+	 * It is achieved by creating a new linear_private_data structure</div><div class='add'>+	 * and swapping it in in-place of the current one.</div><div class='add'>+	 * The current one is never freed until the array is stopped.</div><div class='add'>+	 * This avoids races.</div><div class='add'>+	 */</div><div class='add'>+	linear_conf_t *newconf;</div><div class='add'>+</div><div class='add'>+	if (rdev-&gt;raid_disk != mddev-&gt;raid_disks)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	newconf = linear_conf(mddev,mddev-&gt;raid_disks+1);</div><div class='add'>+</div><div class='add'>+	if (!newconf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	newconf-&gt;prev = mddev_to_conf(mddev);</div><div class='add'>+	mddev-&gt;private = newconf;</div><div class='add'>+	mddev-&gt;raid_disks++;</div><div class='add'>+	mddev-&gt;array_size = newconf-&gt;array_size;</div><div class='add'>+	set_capacity(mddev-&gt;gendisk, mddev-&gt;array_size &lt;&lt; 1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int linear_stop (mddev_t *mddev)</div><div class='hunk'>@@ -262,8 +305,12 @@ static int linear_stop (mddev_t *mddev)</div><div class='ctx'> 	linear_conf_t *conf = mddev_to_conf(mddev);</div><div class='ctx'>   </div><div class='ctx'> 	blk_sync_queue(mddev-&gt;queue); /* the unplug fn references 'conf'*/</div><div class='del'>-	kfree(conf-&gt;hash_table);</div><div class='del'>-	kfree(conf);</div><div class='add'>+	do {</div><div class='add'>+		linear_conf_t *t = conf-&gt;prev;</div><div class='add'>+		kfree(conf-&gt;hash_table);</div><div class='add'>+		kfree(conf);</div><div class='add'>+		conf = t;</div><div class='add'>+	} while (conf);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -360,6 +407,7 @@ static struct mdk_personality linear_personality =</div><div class='ctx'> 	.run		= linear_run,</div><div class='ctx'> 	.stop		= linear_stop,</div><div class='ctx'> 	.status		= linear_status,</div><div class='add'>+	.hot_add_disk	= linear_add,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init linear_init (void)</div><div class='head'>diff --git a/drivers/md/md.c b/drivers/md/md.c<br/>index f19b874753a9..b6d16022a53e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/md.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/md.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/md.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/md.c</a></div><div class='hunk'>@@ -33,17 +33,16 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/raid/md.h&gt;</div><div class='ctx'> #include &lt;linux/raid/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt; /* for invalidate_bdev */</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +71,10 @@ static void autostart_arrays (int part);</div><div class='ctx'> static LIST_HEAD(pers_list);</div><div class='ctx'> static DEFINE_SPINLOCK(pers_lock);</div><div class='ctx'> </div><div class='add'>+static void md_print_devices(void);</div><div class='add'>+</div><div class='add'>+#define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); }</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit'</div><div class='ctx'>  * is 1000 KB/sec, so the extra system load does not show up that much.</div><div class='hunk'>@@ -107,7 +110,7 @@ static ctl_table raid_table[] = {</div><div class='ctx'> 		.procname	= "speed_limit_min",</div><div class='ctx'> 		.data		= &amp;sysctl_speed_limit_min,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='add'>+		.mode		= S_IRUGO|S_IWUSR,</div><div class='ctx'> 		.proc_handler	= &amp;proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='hunk'>@@ -115,7 +118,7 @@ static ctl_table raid_table[] = {</div><div class='ctx'> 		.procname	= "speed_limit_max",</div><div class='ctx'> 		.data		= &amp;sysctl_speed_limit_max,</div><div class='ctx'> 		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='add'>+		.mode		= S_IRUGO|S_IWUSR,</div><div class='ctx'> 		.proc_handler	= &amp;proc_dointvec,</div><div class='ctx'> 	},</div><div class='ctx'> 	{ .ctl_name = 0 }</div><div class='hunk'>@@ -126,7 +129,7 @@ static ctl_table raid_dir_table[] = {</div><div class='ctx'> 		.ctl_name	= DEV_RAID,</div><div class='ctx'> 		.procname	= "raid",</div><div class='ctx'> 		.maxlen		= 0,</div><div class='del'>-		.mode		= 0555,</div><div class='add'>+		.mode		= S_IRUGO|S_IXUGO,</div><div class='ctx'> 		.child		= raid_table,</div><div class='ctx'> 	},</div><div class='ctx'> 	{ .ctl_name = 0 }</div><div class='hunk'>@@ -170,7 +173,7 @@ EXPORT_SYMBOL_GPL(md_new_event);</div><div class='ctx'> /* Alternate version that can be called from interrupts</div><div class='ctx'>  * when calling sysfs_notify isn't needed.</div><div class='ctx'>  */</div><div class='del'>-void md_new_event_inintr(mddev_t *mddev)</div><div class='add'>+static void md_new_event_inintr(mddev_t *mddev)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;md_event_count);</div><div class='ctx'> 	wake_up(&amp;md_event_waiters);</div><div class='hunk'>@@ -732,6 +735,7 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	mdp_disk_t *desc;</div><div class='ctx'> 	mdp_super_t *sb = (mdp_super_t *)page_address(rdev-&gt;sb_page);</div><div class='add'>+	__u64 ev1 = md_event(sb);</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;raid_disk = -1;</div><div class='ctx'> 	rdev-&gt;flags = 0;</div><div class='hunk'>@@ -748,7 +752,7 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 		mddev-&gt;layout = sb-&gt;layout;</div><div class='ctx'> 		mddev-&gt;raid_disks = sb-&gt;raid_disks;</div><div class='ctx'> 		mddev-&gt;size = sb-&gt;size;</div><div class='del'>-		mddev-&gt;events = md_event(sb);</div><div class='add'>+		mddev-&gt;events = ev1;</div><div class='ctx'> 		mddev-&gt;bitmap_offset = 0;</div><div class='ctx'> 		mddev-&gt;default_bitmap_offset = MD_SB_BYTES &gt;&gt; 9;</div><div class='ctx'> </div><div class='hunk'>@@ -797,7 +801,6 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> </div><div class='ctx'> 	} else if (mddev-&gt;pers == NULL) {</div><div class='ctx'> 		/* Insist on good event counter while assembling */</div><div class='del'>-		__u64 ev1 = md_event(sb);</div><div class='ctx'> 		++ev1;</div><div class='ctx'> 		if (ev1 &lt; mddev-&gt;events) </div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -805,19 +808,21 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 		/* if adding to array with a bitmap, then we can accept an</div><div class='ctx'> 		 * older device ... but not too old.</div><div class='ctx'> 		 */</div><div class='del'>-		__u64 ev1 = md_event(sb);</div><div class='ctx'> 		if (ev1 &lt; mddev-&gt;bitmap-&gt;events_cleared)</div><div class='ctx'> 			return 0;</div><div class='del'>-	} else /* just a hot-add of a new device, leave raid_disk at -1 */</div><div class='del'>-		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (ev1 &lt; mddev-&gt;events)</div><div class='add'>+			/* just a hot-add of a new device, leave raid_disk at -1 */</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (mddev-&gt;level != LEVEL_MULTIPATH) {</div><div class='ctx'> 		desc = sb-&gt;disks + rdev-&gt;desc_nr;</div><div class='ctx'> </div><div class='ctx'> 		if (desc-&gt;state &amp; (1&lt;&lt;MD_DISK_FAULTY))</div><div class='ctx'> 			set_bit(Faulty, &amp;rdev-&gt;flags);</div><div class='del'>-		else if (desc-&gt;state &amp; (1&lt;&lt;MD_DISK_SYNC) &amp;&amp;</div><div class='del'>-			 desc-&gt;raid_disk &lt; mddev-&gt;raid_disks) {</div><div class='add'>+		else if (desc-&gt;state &amp; (1&lt;&lt;MD_DISK_SYNC) /* &amp;&amp;</div><div class='add'>+			    desc-&gt;raid_disk &lt; mddev-&gt;raid_disks */) {</div><div class='ctx'> 			set_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='ctx'> 			rdev-&gt;raid_disk = desc-&gt;raid_disk;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1057,6 +1062,11 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)</div><div class='ctx'> 	if (rdev-&gt;sb_size &amp; bmask)</div><div class='ctx'> 		rdev-&gt; sb_size = (rdev-&gt;sb_size | bmask)+1;</div><div class='ctx'> </div><div class='add'>+	if (sb-&gt;level == cpu_to_le32(LEVEL_MULTIPATH))</div><div class='add'>+		rdev-&gt;desc_nr = -1;</div><div class='add'>+	else</div><div class='add'>+		rdev-&gt;desc_nr = le32_to_cpu(sb-&gt;dev_number);</div><div class='add'>+</div><div class='ctx'> 	if (refdev == 0)</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -1100,6 +1110,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)</div><div class='ctx'> static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mdp_superblock_1 *sb = (struct mdp_superblock_1*)page_address(rdev-&gt;sb_page);</div><div class='add'>+	__u64 ev1 = le64_to_cpu(sb-&gt;events);</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;raid_disk = -1;</div><div class='ctx'> 	rdev-&gt;flags = 0;</div><div class='hunk'>@@ -1115,7 +1126,7 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 		mddev-&gt;layout = le32_to_cpu(sb-&gt;layout);</div><div class='ctx'> 		mddev-&gt;raid_disks = le32_to_cpu(sb-&gt;raid_disks);</div><div class='ctx'> 		mddev-&gt;size = le64_to_cpu(sb-&gt;size)/2;</div><div class='del'>-		mddev-&gt;events = le64_to_cpu(sb-&gt;events);</div><div class='add'>+		mddev-&gt;events = ev1;</div><div class='ctx'> 		mddev-&gt;bitmap_offset = 0;</div><div class='ctx'> 		mddev-&gt;default_bitmap_offset = 1024 &gt;&gt; 9;</div><div class='ctx'> 		</div><div class='hunk'>@@ -1149,7 +1160,6 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> </div><div class='ctx'> 	} else if (mddev-&gt;pers == NULL) {</div><div class='ctx'> 		/* Insist of good event counter while assembling */</div><div class='del'>-		__u64 ev1 = le64_to_cpu(sb-&gt;events);</div><div class='ctx'> 		++ev1;</div><div class='ctx'> 		if (ev1 &lt; mddev-&gt;events)</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1157,15 +1167,15 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 		/* If adding to array with a bitmap, then we can accept an</div><div class='ctx'> 		 * older device, but not too old.</div><div class='ctx'> 		 */</div><div class='del'>-		__u64 ev1 = le64_to_cpu(sb-&gt;events);</div><div class='ctx'> 		if (ev1 &lt; mddev-&gt;bitmap-&gt;events_cleared)</div><div class='ctx'> 			return 0;</div><div class='del'>-	} else /* just a hot-add of a new device, leave raid_disk at -1 */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='add'>+	} else {</div><div class='add'>+		if (ev1 &lt; mddev-&gt;events)</div><div class='add'>+			/* just a hot-add of a new device, leave raid_disk at -1 */</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='ctx'> 	if (mddev-&gt;level != LEVEL_MULTIPATH) {</div><div class='ctx'> 		int role;</div><div class='del'>-		rdev-&gt;desc_nr = le32_to_cpu(sb-&gt;dev_number);</div><div class='ctx'> 		role = le16_to_cpu(sb-&gt;dev_roles[rdev-&gt;desc_nr]);</div><div class='ctx'> 		switch(role) {</div><div class='ctx'> 		case 0xffff: /* spare */</div><div class='hunk'>@@ -1174,7 +1184,11 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 			set_bit(Faulty, &amp;rdev-&gt;flags);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			set_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='add'>+			if ((le32_to_cpu(sb-&gt;feature_map) &amp;</div><div class='add'>+			     MD_FEATURE_RECOVERY_OFFSET))</div><div class='add'>+				rdev-&gt;recovery_offset = le64_to_cpu(sb-&gt;recovery_offset);</div><div class='add'>+			else</div><div class='add'>+				set_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='ctx'> 			rdev-&gt;raid_disk = role;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1198,6 +1212,7 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;feature_map = 0;</div><div class='ctx'> 	sb-&gt;pad0 = 0;</div><div class='add'>+	sb-&gt;recovery_offset = cpu_to_le64(0);</div><div class='ctx'> 	memset(sb-&gt;pad1, 0, sizeof(sb-&gt;pad1));</div><div class='ctx'> 	memset(sb-&gt;pad2, 0, sizeof(sb-&gt;pad2));</div><div class='ctx'> 	memset(sb-&gt;pad3, 0, sizeof(sb-&gt;pad3));</div><div class='hunk'>@@ -1218,6 +1233,14 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 		sb-&gt;bitmap_offset = cpu_to_le32((__u32)mddev-&gt;bitmap_offset);</div><div class='ctx'> 		sb-&gt;feature_map = cpu_to_le32(MD_FEATURE_BITMAP_OFFSET);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+	    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+	    rdev-&gt;recovery_offset &gt; 0) {</div><div class='add'>+		sb-&gt;feature_map |= cpu_to_le32(MD_FEATURE_RECOVERY_OFFSET);</div><div class='add'>+		sb-&gt;recovery_offset = cpu_to_le64(rdev-&gt;recovery_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (mddev-&gt;reshape_position != MaxSector) {</div><div class='ctx'> 		sb-&gt;feature_map |= cpu_to_le32(MD_FEATURE_RESHAPE_ACTIVE);</div><div class='ctx'> 		sb-&gt;reshape_position = cpu_to_le64(mddev-&gt;reshape_position);</div><div class='hunk'>@@ -1242,11 +1265,12 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 			sb-&gt;dev_roles[i] = cpu_to_le16(0xfffe);</div><div class='ctx'> 		else if (test_bit(In_sync, &amp;rdev2-&gt;flags))</div><div class='ctx'> 			sb-&gt;dev_roles[i] = cpu_to_le16(rdev2-&gt;raid_disk);</div><div class='add'>+		else if (rdev2-&gt;raid_disk &gt;= 0 &amp;&amp; rdev2-&gt;recovery_offset &gt; 0)</div><div class='add'>+			sb-&gt;dev_roles[i] = cpu_to_le16(rdev2-&gt;raid_disk);</div><div class='ctx'> 		else</div><div class='ctx'> 			sb-&gt;dev_roles[i] = cpu_to_le16(0xffff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sb-&gt;recovery_offset = cpu_to_le64(0); /* not supported yet */</div><div class='ctx'> 	sb-&gt;sb_csum = calc_sb_1_csum(sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1384,7 +1408,7 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev)</div><div class='ctx'> 	struct block_device *bdev;</div><div class='ctx'> 	char b[BDEVNAME_SIZE];</div><div class='ctx'> </div><div class='del'>-	bdev = open_by_devnum(dev, FMODE_READ|FMODE_WRITE);</div><div class='add'>+	bdev = open_partition_by_devnum(dev, FMODE_READ|FMODE_WRITE);</div><div class='ctx'> 	if (IS_ERR(bdev)) {</div><div class='ctx'> 		printk(KERN_ERR "md: could not open %s.\n",</div><div class='ctx'> 			__bdevname(dev, b));</div><div class='hunk'>@@ -1394,7 +1418,7 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "md: could not bd_claim %s.\n",</div><div class='ctx'> 			bdevname(bdev, b));</div><div class='del'>-		blkdev_put(bdev);</div><div class='add'>+		blkdev_put_partition(bdev);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	rdev-&gt;bdev = bdev;</div><div class='hunk'>@@ -1408,7 +1432,7 @@ static void unlock_rdev(mdk_rdev_t *rdev)</div><div class='ctx'> 	if (!bdev)</div><div class='ctx'> 		MD_BUG();</div><div class='ctx'> 	bd_release(bdev);</div><div class='del'>-	blkdev_put(bdev);</div><div class='add'>+	blkdev_put_partition(bdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void md_autodetect_dev(dev_t dev);</div><div class='hunk'>@@ -1507,7 +1531,7 @@ static void print_rdev(mdk_rdev_t *rdev)</div><div class='ctx'> 		printk(KERN_INFO "md: no rdev superblock!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void md_print_devices(void)</div><div class='add'>+static void md_print_devices(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *tmp, *tmp2;</div><div class='ctx'> 	mdk_rdev_t *rdev;</div><div class='hunk'>@@ -1536,15 +1560,30 @@ void md_print_devices(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void sync_sbs(mddev_t * mddev)</div><div class='add'>+static void sync_sbs(mddev_t * mddev, int nospares)</div><div class='ctx'> {</div><div class='add'>+	/* Update each superblock (in-memory image), but</div><div class='add'>+	 * if we are allowed to, skip spares which already</div><div class='add'>+	 * have the right event counter, or have one earlier</div><div class='add'>+	 * (which would mean they aren't being marked as dirty</div><div class='add'>+	 * with the rest of the array)</div><div class='add'>+	 */</div><div class='ctx'> 	mdk_rdev_t *rdev;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> </div><div class='ctx'> 	ITERATE_RDEV(mddev,rdev,tmp) {</div><div class='del'>-		super_types[mddev-&gt;major_version].</div><div class='del'>-			sync_super(mddev, rdev);</div><div class='del'>-		rdev-&gt;sb_loaded = 1;</div><div class='add'>+		if (rdev-&gt;sb_events == mddev-&gt;events ||</div><div class='add'>+		    (nospares &amp;&amp;</div><div class='add'>+		     rdev-&gt;raid_disk &lt; 0 &amp;&amp;</div><div class='add'>+		     (rdev-&gt;sb_events&amp;1)==0 &amp;&amp;</div><div class='add'>+		     rdev-&gt;sb_events+1 == mddev-&gt;events)) {</div><div class='add'>+			/* Don't update this superblock */</div><div class='add'>+			rdev-&gt;sb_loaded = 2;</div><div class='add'>+		} else {</div><div class='add'>+			super_types[mddev-&gt;major_version].</div><div class='add'>+				sync_super(mddev, rdev);</div><div class='add'>+			rdev-&gt;sb_loaded = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1554,12 +1593,42 @@ void md_update_sb(mddev_t * mddev)</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> 	mdk_rdev_t *rdev;</div><div class='ctx'> 	int sync_req;</div><div class='add'>+	int nospares = 0;</div><div class='ctx'> </div><div class='ctx'> repeat:</div><div class='ctx'> 	spin_lock_irq(&amp;mddev-&gt;write_lock);</div><div class='ctx'> 	sync_req = mddev-&gt;in_sync;</div><div class='ctx'> 	mddev-&gt;utime = get_seconds();</div><div class='del'>-	mddev-&gt;events ++;</div><div class='add'>+	if (mddev-&gt;sb_dirty == 3)</div><div class='add'>+		/* just a clean&lt;-&gt; dirty transition, possibly leave spares alone,</div><div class='add'>+		 * though if events isn't the right even/odd, we will have to do</div><div class='add'>+		 * spares after all</div><div class='add'>+		 */</div><div class='add'>+		nospares = 1;</div><div class='add'>+</div><div class='add'>+	/* If this is just a dirty&lt;-&gt;clean transition, and the array is clean</div><div class='add'>+	 * and 'events' is odd, we can roll back to the previous clean state */</div><div class='add'>+	if (mddev-&gt;sb_dirty == 3</div><div class='add'>+	    &amp;&amp; (mddev-&gt;in_sync &amp;&amp; mddev-&gt;recovery_cp == MaxSector)</div><div class='add'>+	    &amp;&amp; (mddev-&gt;events &amp; 1))</div><div class='add'>+		mddev-&gt;events--;</div><div class='add'>+	else {</div><div class='add'>+		/* otherwise we have to go forward and ... */</div><div class='add'>+		mddev-&gt;events ++;</div><div class='add'>+		if (!mddev-&gt;in_sync || mddev-&gt;recovery_cp != MaxSector) { /* not clean */</div><div class='add'>+			/* .. if the array isn't clean, insist on an odd 'events' */</div><div class='add'>+			if ((mddev-&gt;events&amp;1)==0) {</div><div class='add'>+				mddev-&gt;events++;</div><div class='add'>+				nospares = 0;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* otherwise insist on an even 'events' (for clean states) */</div><div class='add'>+			if ((mddev-&gt;events&amp;1)) {</div><div class='add'>+				mddev-&gt;events++;</div><div class='add'>+				nospares = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!mddev-&gt;events) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1571,7 +1640,7 @@ repeat:</div><div class='ctx'> 		mddev-&gt;events --;</div><div class='ctx'> 	}</div><div class='ctx'> 	mddev-&gt;sb_dirty = 2;</div><div class='del'>-	sync_sbs(mddev);</div><div class='add'>+	sync_sbs(mddev, nospares);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * do not write anything to disk if using</div><div class='hunk'>@@ -1593,6 +1662,8 @@ repeat:</div><div class='ctx'> 	ITERATE_RDEV(mddev,rdev,tmp) {</div><div class='ctx'> 		char b[BDEVNAME_SIZE];</div><div class='ctx'> 		dprintk(KERN_INFO "md: ");</div><div class='add'>+		if (rdev-&gt;sb_loaded != 1)</div><div class='add'>+			continue; /* no noise on spare devices */</div><div class='ctx'> 		if (test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='ctx'> 			dprintk("(skipping faulty ");</div><div class='ctx'> </div><div class='hunk'>@@ -1604,6 +1675,7 @@ repeat:</div><div class='ctx'> 			dprintk(KERN_INFO "(write) %s's sb offset: %llu\n",</div><div class='ctx'> 				bdevname(rdev-&gt;bdev,b),</div><div class='ctx'> 				(unsigned long long)rdev-&gt;sb_offset);</div><div class='add'>+			rdev-&gt;sb_events = mddev-&gt;events;</div><div class='ctx'> </div><div class='ctx'> 		} else</div><div class='ctx'> 			dprintk(")\n");</div><div class='hunk'>@@ -1667,6 +1739,10 @@ state_show(mdk_rdev_t *rdev, char *page)</div><div class='ctx'> 		len += sprintf(page+len, "%sin_sync",sep);</div><div class='ctx'> 		sep = ",";</div><div class='ctx'> 	}</div><div class='add'>+	if (test_bit(WriteMostly, &amp;rdev-&gt;flags)) {</div><div class='add'>+		len += sprintf(page+len, "%swrite_mostly",sep);</div><div class='add'>+		sep = ",";</div><div class='add'>+	}</div><div class='ctx'> 	if (!test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='ctx'> 	    !test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 		len += sprintf(page+len, "%sspare", sep);</div><div class='hunk'>@@ -1675,8 +1751,40 @@ state_show(mdk_rdev_t *rdev, char *page)</div><div class='ctx'> 	return len+sprintf(page+len, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rdev_sysfs_entry</div><div class='del'>-rdev_state = __ATTR_RO(state);</div><div class='add'>+static ssize_t</div><div class='add'>+state_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	/* can write</div><div class='add'>+	 *  faulty  - simulates and error</div><div class='add'>+	 *  remove  - disconnects the device</div><div class='add'>+	 *  writemostly - sets write_mostly</div><div class='add'>+	 *  -writemostly - clears write_mostly</div><div class='add'>+	 */</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	if (cmd_match(buf, "faulty") &amp;&amp; rdev-&gt;mddev-&gt;pers) {</div><div class='add'>+		md_error(rdev-&gt;mddev, rdev);</div><div class='add'>+		err = 0;</div><div class='add'>+	} else if (cmd_match(buf, "remove")) {</div><div class='add'>+		if (rdev-&gt;raid_disk &gt;= 0)</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+		else {</div><div class='add'>+			mddev_t *mddev = rdev-&gt;mddev;</div><div class='add'>+			kick_rdev_from_array(rdev);</div><div class='add'>+			md_update_sb(mddev);</div><div class='add'>+			md_new_event(mddev);</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	} else if (cmd_match(buf, "writemostly")) {</div><div class='add'>+		set_bit(WriteMostly, &amp;rdev-&gt;flags);</div><div class='add'>+		err = 0;</div><div class='add'>+	} else if (cmd_match(buf, "-writemostly")) {</div><div class='add'>+		clear_bit(WriteMostly, &amp;rdev-&gt;flags);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	return err ? err : len;</div><div class='add'>+}</div><div class='add'>+static struct rdev_sysfs_entry rdev_state =</div><div class='add'>+__ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> super_show(mdk_rdev_t *rdev, char *page)</div><div class='hunk'>@@ -1707,7 +1815,7 @@ errors_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> static struct rdev_sysfs_entry rdev_errors =</div><div class='del'>-__ATTR(errors, 0644, errors_show, errors_store);</div><div class='add'>+__ATTR(errors, S_IRUGO|S_IWUSR, errors_show, errors_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> slot_show(mdk_rdev_t *rdev, char *page)</div><div class='hunk'>@@ -1741,7 +1849,7 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct rdev_sysfs_entry rdev_slot =</div><div class='del'>-__ATTR(slot, 0644, slot_show, slot_store);</div><div class='add'>+__ATTR(slot, S_IRUGO|S_IWUSR, slot_show, slot_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> offset_show(mdk_rdev_t *rdev, char *page)</div><div class='hunk'>@@ -1763,7 +1871,7 @@ offset_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rdev_sysfs_entry rdev_offset =</div><div class='del'>-__ATTR(offset, 0644, offset_show, offset_store);</div><div class='add'>+__ATTR(offset, S_IRUGO|S_IWUSR, offset_show, offset_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> rdev_size_show(mdk_rdev_t *rdev, char *page)</div><div class='hunk'>@@ -1787,7 +1895,7 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rdev_sysfs_entry rdev_size =</div><div class='del'>-__ATTR(size, 0644, rdev_size_show, rdev_size_store);</div><div class='add'>+__ATTR(size, S_IRUGO|S_IWUSR, rdev_size_show, rdev_size_store);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *rdev_default_attrs[] = {</div><div class='ctx'> 	&amp;rdev_state.attr,</div><div class='hunk'>@@ -1818,6 +1926,8 @@ rdev_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	if (!entry-&gt;store)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='ctx'> 	return entry-&gt;store(rdev, page, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1873,6 +1983,7 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi</div><div class='ctx'> 	rdev-&gt;desc_nr = -1;</div><div class='ctx'> 	rdev-&gt;flags = 0;</div><div class='ctx'> 	rdev-&gt;data_offset = 0;</div><div class='add'>+	rdev-&gt;sb_events = 0;</div><div class='ctx'> 	atomic_set(&amp;rdev-&gt;nr_pending, 0);</div><div class='ctx'> 	atomic_set(&amp;rdev-&gt;read_errors, 0);</div><div class='ctx'> 	atomic_set(&amp;rdev-&gt;corrected_errors, 0);</div><div class='hunk'>@@ -1978,6 +2089,54 @@ static void analyze_sbs(mddev_t * mddev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='add'>+safe_delay_show(mddev_t *mddev, char *page)</div><div class='add'>+{</div><div class='add'>+	int msec = (mddev-&gt;safemode_delay*1000)/HZ;</div><div class='add'>+	return sprintf(page, "%d.%03d\n", msec/1000, msec%1000);</div><div class='add'>+}</div><div class='add'>+static ssize_t</div><div class='add'>+safe_delay_store(mddev_t *mddev, const char *cbuf, size_t len)</div><div class='add'>+{</div><div class='add'>+	int scale=1;</div><div class='add'>+	int dot=0;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long msec;</div><div class='add'>+	char buf[30];</div><div class='add'>+	char *e;</div><div class='add'>+	/* remove a period, and count digits after it */</div><div class='add'>+	if (len &gt;= sizeof(buf))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	strlcpy(buf, cbuf, len);</div><div class='add'>+	buf[len] = 0;</div><div class='add'>+	for (i=0; i&lt;len; i++) {</div><div class='add'>+		if (dot) {</div><div class='add'>+			if (isdigit(buf[i])) {</div><div class='add'>+				buf[i-1] = buf[i];</div><div class='add'>+				scale *= 10;</div><div class='add'>+			}</div><div class='add'>+			buf[i] = 0;</div><div class='add'>+		} else if (buf[i] == '.') {</div><div class='add'>+			dot=1;</div><div class='add'>+			buf[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	msec = simple_strtoul(buf, &amp;e, 10);</div><div class='add'>+	if (e == buf || (*e &amp;&amp; *e != '\n'))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	msec = (msec * 1000) / scale;</div><div class='add'>+	if (msec == 0)</div><div class='add'>+		mddev-&gt;safemode_delay = 0;</div><div class='add'>+	else {</div><div class='add'>+		mddev-&gt;safemode_delay = (msec*HZ)/1000;</div><div class='add'>+		if (mddev-&gt;safemode_delay == 0)</div><div class='add'>+			mddev-&gt;safemode_delay = 1;</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static struct md_sysfs_entry md_safe_delay =</div><div class='add'>+__ATTR(safe_mode_delay, S_IRUGO|S_IWUSR,safe_delay_show, safe_delay_store);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='ctx'> level_show(mddev_t *mddev, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	struct mdk_personality *p = mddev-&gt;pers;</div><div class='hunk'>@@ -2010,7 +2169,33 @@ level_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct md_sysfs_entry md_level =</div><div class='del'>-__ATTR(level, 0644, level_show, level_store);</div><div class='add'>+__ATTR(level, S_IRUGO|S_IWUSR, level_show, level_store);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+layout_show(mddev_t *mddev, char *page)</div><div class='add'>+{</div><div class='add'>+	/* just a number, not meaningful for all levels */</div><div class='add'>+	return sprintf(page, "%d\n", mddev-&gt;layout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+layout_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	char *e;</div><div class='add'>+	unsigned long n = simple_strtoul(buf, &amp;e, 10);</div><div class='add'>+	if (mddev-&gt;pers)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (!*buf || (*e &amp;&amp; *e != '\n'))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mddev-&gt;layout = n;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static struct md_sysfs_entry md_layout =</div><div class='add'>+__ATTR(layout, S_IRUGO|S_IWUSR, layout_show, layout_store);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> raid_disks_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2040,7 +2225,7 @@ raid_disks_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> 	return rv ? rv : len;</div><div class='ctx'> }</div><div class='ctx'> static struct md_sysfs_entry md_raid_disks =</div><div class='del'>-__ATTR(raid_disks, 0644, raid_disks_show, raid_disks_store);</div><div class='add'>+__ATTR(raid_disks, S_IRUGO|S_IWUSR, raid_disks_show, raid_disks_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> chunk_size_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2064,7 +2249,202 @@ chunk_size_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> static struct md_sysfs_entry md_chunk_size =</div><div class='del'>-__ATTR(chunk_size, 0644, chunk_size_show, chunk_size_store);</div><div class='add'>+__ATTR(chunk_size, S_IRUGO|S_IWUSR, chunk_size_show, chunk_size_store);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+resync_start_show(mddev_t *mddev, char *page)</div><div class='add'>+{</div><div class='add'>+	return sprintf(page, "%llu\n", (unsigned long long)mddev-&gt;recovery_cp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+resync_start_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	/* can only set chunk_size if array is not yet active */</div><div class='add'>+	char *e;</div><div class='add'>+	unsigned long long n = simple_strtoull(buf, &amp;e, 10);</div><div class='add'>+</div><div class='add'>+	if (mddev-&gt;pers)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!*buf || (*e &amp;&amp; *e != '\n'))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mddev-&gt;recovery_cp = n;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static struct md_sysfs_entry md_resync_start =</div><div class='add'>+__ATTR(resync_start, S_IRUGO|S_IWUSR, resync_start_show, resync_start_store);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The array state can be:</div><div class='add'>+ *</div><div class='add'>+ * clear</div><div class='add'>+ *     No devices, no size, no level</div><div class='add'>+ *     Equivalent to STOP_ARRAY ioctl</div><div class='add'>+ * inactive</div><div class='add'>+ *     May have some settings, but array is not active</div><div class='add'>+ *        all IO results in error</div><div class='add'>+ *     When written, doesn't tear down array, but just stops it</div><div class='add'>+ * suspended (not supported yet)</div><div class='add'>+ *     All IO requests will block. The array can be reconfigured.</div><div class='add'>+ *     Writing this, if accepted, will block until array is quiessent</div><div class='add'>+ * readonly</div><div class='add'>+ *     no resync can happen.  no superblocks get written.</div><div class='add'>+ *     write requests fail</div><div class='add'>+ * read-auto</div><div class='add'>+ *     like readonly, but behaves like 'clean' on a write request.</div><div class='add'>+ *</div><div class='add'>+ * clean - no pending writes, but otherwise active.</div><div class='add'>+ *     When written to inactive array, starts without resync</div><div class='add'>+ *     If a write request arrives then</div><div class='add'>+ *       if metadata is known, mark 'dirty' and switch to 'active'.</div><div class='add'>+ *       if not known, block and switch to write-pending</div><div class='add'>+ *     If written to an active array that has pending writes, then fails.</div><div class='add'>+ * active</div><div class='add'>+ *     fully active: IO and resync can be happening.</div><div class='add'>+ *     When written to inactive array, starts with resync</div><div class='add'>+ *</div><div class='add'>+ * write-pending</div><div class='add'>+ *     clean, but writes are blocked waiting for 'active' to be written.</div><div class='add'>+ *</div><div class='add'>+ * active-idle</div><div class='add'>+ *     like active, but no writes have been seen for a while (100msec).</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+enum array_state { clear, inactive, suspended, readonly, read_auto, clean, active,</div><div class='add'>+		   write_pending, active_idle, bad_word};</div><div class='add'>+static char *array_states[] = {</div><div class='add'>+	"clear", "inactive", "suspended", "readonly", "read-auto", "clean", "active",</div><div class='add'>+	"write-pending", "active-idle", NULL };</div><div class='add'>+</div><div class='add'>+static int match_word(const char *word, char **list)</div><div class='add'>+{</div><div class='add'>+	int n;</div><div class='add'>+	for (n=0; list[n]; n++)</div><div class='add'>+		if (cmd_match(word, list[n]))</div><div class='add'>+			break;</div><div class='add'>+	return n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+array_state_show(mddev_t *mddev, char *page)</div><div class='add'>+{</div><div class='add'>+	enum array_state st = inactive;</div><div class='add'>+</div><div class='add'>+	if (mddev-&gt;pers)</div><div class='add'>+		switch(mddev-&gt;ro) {</div><div class='add'>+		case 1:</div><div class='add'>+			st = readonly;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			st = read_auto;</div><div class='add'>+			break;</div><div class='add'>+		case 0:</div><div class='add'>+			if (mddev-&gt;in_sync)</div><div class='add'>+				st = clean;</div><div class='add'>+			else if (mddev-&gt;safemode)</div><div class='add'>+				st = active_idle;</div><div class='add'>+			else</div><div class='add'>+				st = active;</div><div class='add'>+		}</div><div class='add'>+	else {</div><div class='add'>+		if (list_empty(&amp;mddev-&gt;disks) &amp;&amp;</div><div class='add'>+		    mddev-&gt;raid_disks == 0 &amp;&amp;</div><div class='add'>+		    mddev-&gt;size == 0)</div><div class='add'>+			st = clear;</div><div class='add'>+		else</div><div class='add'>+			st = inactive;</div><div class='add'>+	}</div><div class='add'>+	return sprintf(page, "%s\n", array_states[st]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_md_stop(mddev_t * mddev, int ro);</div><div class='add'>+static int do_md_run(mddev_t * mddev);</div><div class='add'>+static int restart_array(mddev_t *mddev);</div><div class='add'>+</div><div class='add'>+static ssize_t</div><div class='add'>+array_state_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+	enum array_state st = match_word(buf, array_states);</div><div class='add'>+	switch(st) {</div><div class='add'>+	case bad_word:</div><div class='add'>+		break;</div><div class='add'>+	case clear:</div><div class='add'>+		/* stopping an active array */</div><div class='add'>+		if (mddev-&gt;pers) {</div><div class='add'>+			if (atomic_read(&amp;mddev-&gt;active) &gt; 1)</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			err = do_md_stop(mddev, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case inactive:</div><div class='add'>+		/* stopping an active array */</div><div class='add'>+		if (mddev-&gt;pers) {</div><div class='add'>+			if (atomic_read(&amp;mddev-&gt;active) &gt; 1)</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			err = do_md_stop(mddev, 2);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case suspended:</div><div class='add'>+		break; /* not supported yet */</div><div class='add'>+	case readonly:</div><div class='add'>+		if (mddev-&gt;pers)</div><div class='add'>+			err = do_md_stop(mddev, 1);</div><div class='add'>+		else {</div><div class='add'>+			mddev-&gt;ro = 1;</div><div class='add'>+			err = do_md_run(mddev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case read_auto:</div><div class='add'>+		/* stopping an active array */</div><div class='add'>+		if (mddev-&gt;pers) {</div><div class='add'>+			err = do_md_stop(mddev, 1);</div><div class='add'>+			if (err == 0)</div><div class='add'>+				mddev-&gt;ro = 2; /* FIXME mark devices writable */</div><div class='add'>+		} else {</div><div class='add'>+			mddev-&gt;ro = 2;</div><div class='add'>+			err = do_md_run(mddev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case clean:</div><div class='add'>+		if (mddev-&gt;pers) {</div><div class='add'>+			restart_array(mddev);</div><div class='add'>+			spin_lock_irq(&amp;mddev-&gt;write_lock);</div><div class='add'>+			if (atomic_read(&amp;mddev-&gt;writes_pending) == 0) {</div><div class='add'>+				mddev-&gt;in_sync = 1;</div><div class='add'>+				mddev-&gt;sb_dirty = 1;</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irq(&amp;mddev-&gt;write_lock);</div><div class='add'>+		} else {</div><div class='add'>+			mddev-&gt;ro = 0;</div><div class='add'>+			mddev-&gt;recovery_cp = MaxSector;</div><div class='add'>+			err = do_md_run(mddev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case active:</div><div class='add'>+		if (mddev-&gt;pers) {</div><div class='add'>+			restart_array(mddev);</div><div class='add'>+			mddev-&gt;sb_dirty = 0;</div><div class='add'>+			wake_up(&amp;mddev-&gt;sb_wait);</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			mddev-&gt;ro = 0;</div><div class='add'>+			err = do_md_run(mddev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case write_pending:</div><div class='add'>+	case active_idle:</div><div class='add'>+		/* these cannot be set */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	else</div><div class='add'>+		return len;</div><div class='add'>+}</div><div class='add'>+static struct md_sysfs_entry md_array_state =</div><div class='add'>+__ATTR(array_state, S_IRUGO|S_IWUSR, array_state_show, array_state_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> null_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2124,7 +2504,7 @@ new_dev_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct md_sysfs_entry md_new_device =</div><div class='del'>-__ATTR(new_dev, 0200, null_show, new_dev_store);</div><div class='add'>+__ATTR(new_dev, S_IWUSR, null_show, new_dev_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> size_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2162,7 +2542,7 @@ size_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct md_sysfs_entry md_size =</div><div class='del'>-__ATTR(component_size, 0644, size_show, size_store);</div><div class='add'>+__ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Metdata version.</div><div class='hunk'>@@ -2210,7 +2590,7 @@ metadata_store(mddev_t *mddev, const char *buf, size_t len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct md_sysfs_entry md_metadata =</div><div class='del'>-__ATTR(metadata_version, 0644, metadata_show, metadata_store);</div><div class='add'>+__ATTR(metadata_version, S_IRUGO|S_IWUSR, metadata_show, metadata_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> action_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2278,12 +2658,11 @@ mismatch_cnt_show(mddev_t *mddev, char *page)</div><div class='ctx'> 		       (unsigned long long) mddev-&gt;resync_mismatches);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct md_sysfs_entry</div><div class='del'>-md_scan_mode = __ATTR(sync_action, S_IRUGO|S_IWUSR, action_show, action_store);</div><div class='add'>+static struct md_sysfs_entry md_scan_mode =</div><div class='add'>+__ATTR(sync_action, S_IRUGO|S_IWUSR, action_show, action_store);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct md_sysfs_entry</div><div class='del'>-md_mismatches = __ATTR_RO(mismatch_cnt);</div><div class='add'>+static struct md_sysfs_entry md_mismatches = __ATTR_RO(mismatch_cnt);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> sync_min_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2342,15 +2721,14 @@ static ssize_t</div><div class='ctx'> sync_speed_show(mddev_t *mddev, char *page)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long resync, dt, db;</div><div class='del'>-	resync = (mddev-&gt;curr_resync - atomic_read(&amp;mddev-&gt;recovery_active));</div><div class='add'>+	resync = (mddev-&gt;curr_mark_cnt - atomic_read(&amp;mddev-&gt;recovery_active));</div><div class='ctx'> 	dt = ((jiffies - mddev-&gt;resync_mark) / HZ);</div><div class='ctx'> 	if (!dt) dt++;</div><div class='ctx'> 	db = resync - (mddev-&gt;resync_mark_cnt);</div><div class='ctx'> 	return sprintf(page, "%ld\n", db/dt/2); /* K/sec */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct md_sysfs_entry</div><div class='del'>-md_sync_speed = __ATTR_RO(sync_speed);</div><div class='add'>+static struct md_sysfs_entry md_sync_speed = __ATTR_RO(sync_speed);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> sync_completed_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2366,8 +2744,7 @@ sync_completed_show(mddev_t *mddev, char *page)</div><div class='ctx'> 	return sprintf(page, "%lu / %lu\n", resync, max_blocks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct md_sysfs_entry</div><div class='del'>-md_sync_completed = __ATTR_RO(sync_completed);</div><div class='add'>+static struct md_sysfs_entry md_sync_completed = __ATTR_RO(sync_completed);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> suspend_lo_show(mddev_t *mddev, char *page)</div><div class='hunk'>@@ -2428,11 +2805,15 @@ __ATTR(suspend_hi, S_IRUGO|S_IWUSR, suspend_hi_show, suspend_hi_store);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *md_default_attrs[] = {</div><div class='ctx'> 	&amp;md_level.attr,</div><div class='add'>+	&amp;md_layout.attr,</div><div class='ctx'> 	&amp;md_raid_disks.attr,</div><div class='ctx'> 	&amp;md_chunk_size.attr,</div><div class='ctx'> 	&amp;md_size.attr,</div><div class='add'>+	&amp;md_resync_start.attr,</div><div class='ctx'> 	&amp;md_metadata.attr,</div><div class='ctx'> 	&amp;md_new_device.attr,</div><div class='add'>+	&amp;md_safe_delay.attr,</div><div class='add'>+	&amp;md_array_state.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2480,6 +2861,8 @@ md_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	if (!entry-&gt;store)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='ctx'> 	rv = mddev_lock(mddev);</div><div class='ctx'> 	if (!rv) {</div><div class='ctx'> 		rv = entry-&gt;store(mddev, page, length);</div><div class='hunk'>@@ -2532,13 +2915,10 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)</div><div class='ctx'> 	}</div><div class='ctx'> 	disk-&gt;major = MAJOR(dev);</div><div class='ctx'> 	disk-&gt;first_minor = unit &lt;&lt; shift;</div><div class='del'>-	if (partitioned) {</div><div class='add'>+	if (partitioned)</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "md_d%d", unit);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "md/d%d", unit);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "md%d", unit);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "md/%d", unit);</div><div class='del'>-	}</div><div class='ctx'> 	disk-&gt;fops = &amp;md_fops;</div><div class='ctx'> 	disk-&gt;private_data = mddev;</div><div class='ctx'> 	disk-&gt;queue = mddev-&gt;queue;</div><div class='hunk'>@@ -2553,8 +2933,6 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void md_wakeup_thread(mdk_thread_t *thread);</div><div class='del'>-</div><div class='ctx'> static void md_safemode_timeout(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	mddev_t *mddev = (mddev_t *) data;</div><div class='hunk'>@@ -2708,7 +3086,7 @@ static int do_md_run(mddev_t * mddev)</div><div class='ctx'> 	mddev-&gt;safemode = 0;</div><div class='ctx'> 	mddev-&gt;safemode_timer.function = md_safemode_timeout;</div><div class='ctx'> 	mddev-&gt;safemode_timer.data = (unsigned long) mddev;</div><div class='del'>-	mddev-&gt;safemode_delay = (20 * HZ)/1000 +1; /* 20 msec delay */</div><div class='add'>+	mddev-&gt;safemode_delay = (200 * HZ)/1000 +1; /* 200 msec delay */</div><div class='ctx'> 	mddev-&gt;in_sync = 1;</div><div class='ctx'> </div><div class='ctx'> 	ITERATE_RDEV(mddev,rdev,tmp)</div><div class='hunk'>@@ -2719,7 +3097,6 @@ static int do_md_run(mddev_t * mddev)</div><div class='ctx'> 		}</div><div class='ctx'> 	</div><div class='ctx'> 	set_bit(MD_RECOVERY_NEEDED, &amp;mddev-&gt;recovery);</div><div class='del'>-	md_wakeup_thread(mddev-&gt;thread);</div><div class='ctx'> 	</div><div class='ctx'> 	if (mddev-&gt;sb_dirty)</div><div class='ctx'> 		md_update_sb(mddev);</div><div class='hunk'>@@ -2736,6 +3113,37 @@ static int do_md_run(mddev_t * mddev)</div><div class='ctx'> 	mddev-&gt;queue-&gt;queuedata = mddev;</div><div class='ctx'> 	mddev-&gt;queue-&gt;make_request_fn = mddev-&gt;pers-&gt;make_request;</div><div class='ctx'> </div><div class='add'>+	/* If there is a partially-recovered drive we need to</div><div class='add'>+	 * start recovery here.  If we leave it to md_check_recovery,</div><div class='add'>+	 * it will remove the drives and not do the right thing</div><div class='add'>+	 */</div><div class='add'>+	if (mddev-&gt;degraded &amp;&amp; !mddev-&gt;sync_thread) {</div><div class='add'>+		struct list_head *rtmp;</div><div class='add'>+		int spares = 0;</div><div class='add'>+		ITERATE_RDEV(mddev,rdev,rtmp)</div><div class='add'>+			if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+			    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+			    !test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+				/* complete an interrupted recovery */</div><div class='add'>+				spares++;</div><div class='add'>+		if (spares &amp;&amp; mddev-&gt;pers-&gt;sync_request) {</div><div class='add'>+			mddev-&gt;recovery = 0;</div><div class='add'>+			set_bit(MD_RECOVERY_RUNNING, &amp;mddev-&gt;recovery);</div><div class='add'>+			mddev-&gt;sync_thread = md_register_thread(md_do_sync,</div><div class='add'>+								mddev,</div><div class='add'>+								"%s_resync");</div><div class='add'>+			if (!mddev-&gt;sync_thread) {</div><div class='add'>+				printk(KERN_ERR "%s: could not start resync"</div><div class='add'>+				       " thread...\n",</div><div class='add'>+				       mdname(mddev));</div><div class='add'>+				/* leave the spares where they are, it shouldn't hurt */</div><div class='add'>+				mddev-&gt;recovery = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	md_wakeup_thread(mddev-&gt;thread);</div><div class='add'>+	md_wakeup_thread(mddev-&gt;sync_thread); /* possibly kick off a reshape */</div><div class='add'>+</div><div class='ctx'> 	mddev-&gt;changed = 1;</div><div class='ctx'> 	md_new_event(mddev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2769,18 +3177,47 @@ static int restart_array(mddev_t *mddev)</div><div class='ctx'> 		 */</div><div class='ctx'> 		set_bit(MD_RECOVERY_NEEDED, &amp;mddev-&gt;recovery);</div><div class='ctx'> 		md_wakeup_thread(mddev-&gt;thread);</div><div class='add'>+		md_wakeup_thread(mddev-&gt;sync_thread);</div><div class='ctx'> 		err = 0;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "md: %s has no personality assigned.\n",</div><div class='del'>-			mdname(mddev));</div><div class='add'>+	} else</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_md_stop(mddev_t * mddev, int ro)</div><div class='add'>+/* similar to deny_write_access, but accounts for our holding a reference</div><div class='add'>+ * to the file ourselves */</div><div class='add'>+static int deny_bitmap_write_access(struct file * file)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (atomic_read(&amp;inode-&gt;i_writecount) &gt; 1) {</div><div class='add'>+		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+		return -ETXTBSY;</div><div class='add'>+	}</div><div class='add'>+	atomic_set(&amp;inode-&gt;i_writecount, -1);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void restore_bitmap_write_access(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	atomic_set(&amp;inode-&gt;i_writecount, 1);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mode:</div><div class='add'>+ *   0 - completely stop and dis-assemble array</div><div class='add'>+ *   1 - switch to readonly</div><div class='add'>+ *   2 - stop but do not disassemble array</div><div class='add'>+ */</div><div class='add'>+static int do_md_stop(mddev_t * mddev, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct gendisk *disk = mddev-&gt;gendisk;</div><div class='hunk'>@@ -2792,6 +3229,7 @@ static int do_md_stop(mddev_t * mddev, int ro)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (mddev-&gt;sync_thread) {</div><div class='add'>+			set_bit(MD_RECOVERY_FROZEN, &amp;mddev-&gt;recovery);</div><div class='ctx'> 			set_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery);</div><div class='ctx'> 			md_unregister_thread(mddev-&gt;sync_thread);</div><div class='ctx'> 			mddev-&gt;sync_thread = NULL;</div><div class='hunk'>@@ -2801,12 +3239,15 @@ static int do_md_stop(mddev_t * mddev, int ro)</div><div class='ctx'> </div><div class='ctx'> 		invalidate_partition(disk, 0);</div><div class='ctx'> </div><div class='del'>-		if (ro) {</div><div class='add'>+		switch(mode) {</div><div class='add'>+		case 1: /* readonly */</div><div class='ctx'> 			err  = -ENXIO;</div><div class='ctx'> 			if (mddev-&gt;ro==1)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			mddev-&gt;ro = 1;</div><div class='del'>-		} else {</div><div class='add'>+			break;</div><div class='add'>+		case 0: /* disassemble */</div><div class='add'>+		case 2: /* stop */</div><div class='ctx'> 			bitmap_flush(mddev);</div><div class='ctx'> 			md_super_wait(mddev);</div><div class='ctx'> 			if (mddev-&gt;ro)</div><div class='hunk'>@@ -2821,19 +3262,20 @@ static int do_md_stop(mddev_t * mddev, int ro)</div><div class='ctx'> 			if (mddev-&gt;ro)</div><div class='ctx'> 				mddev-&gt;ro = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (!mddev-&gt;in_sync) {</div><div class='add'>+		if (!mddev-&gt;in_sync || mddev-&gt;sb_dirty) {</div><div class='ctx'> 			/* mark array as shutdown cleanly */</div><div class='ctx'> 			mddev-&gt;in_sync = 1;</div><div class='ctx'> 			md_update_sb(mddev);</div><div class='ctx'> 		}</div><div class='del'>-		if (ro)</div><div class='add'>+		if (mode == 1)</div><div class='ctx'> 			set_disk_ro(disk, 1);</div><div class='add'>+		clear_bit(MD_RECOVERY_FROZEN, &amp;mddev-&gt;recovery);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Free resources if final stop</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ro) {</div><div class='add'>+	if (mode == 0) {</div><div class='ctx'> 		mdk_rdev_t *rdev;</div><div class='ctx'> 		struct list_head *tmp;</div><div class='ctx'> 		struct gendisk *disk;</div><div class='hunk'>@@ -2841,7 +3283,7 @@ static int do_md_stop(mddev_t * mddev, int ro)</div><div class='ctx'> </div><div class='ctx'> 		bitmap_destroy(mddev);</div><div class='ctx'> 		if (mddev-&gt;bitmap_file) {</div><div class='del'>-			atomic_set(&amp;mddev-&gt;bitmap_file-&gt;f_dentry-&gt;d_inode-&gt;i_writecount, 1);</div><div class='add'>+			restore_bitmap_write_access(mddev-&gt;bitmap_file);</div><div class='ctx'> 			fput(mddev-&gt;bitmap_file);</div><div class='ctx'> 			mddev-&gt;bitmap_file = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2857,11 +3299,15 @@ static int do_md_stop(mddev_t * mddev, int ro)</div><div class='ctx'> 		export_array(mddev);</div><div class='ctx'> </div><div class='ctx'> 		mddev-&gt;array_size = 0;</div><div class='add'>+		mddev-&gt;size = 0;</div><div class='add'>+		mddev-&gt;raid_disks = 0;</div><div class='add'>+		mddev-&gt;recovery_cp = 0;</div><div class='add'>+</div><div class='ctx'> 		disk = mddev-&gt;gendisk;</div><div class='ctx'> 		if (disk)</div><div class='ctx'> 			set_capacity(disk, 0);</div><div class='ctx'> 		mddev-&gt;changed = 1;</div><div class='del'>-	} else</div><div class='add'>+	} else if (mddev-&gt;pers)</div><div class='ctx'> 		printk(KERN_INFO "md: %s switched to read-only mode.\n",</div><div class='ctx'> 			mdname(mddev));</div><div class='ctx'> 	err = 0;</div><div class='hunk'>@@ -3264,6 +3710,17 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)</div><div class='ctx'> </div><div class='ctx'> 		rdev-&gt;raid_disk = -1;</div><div class='ctx'> 		err = bind_rdev_to_array(rdev, mddev);</div><div class='add'>+		if (!err &amp;&amp; !mddev-&gt;pers-&gt;hot_remove_disk) {</div><div class='add'>+			/* If there is hot_add_disk but no hot_remove_disk</div><div class='add'>+			 * then added disks for geometry changes,</div><div class='add'>+			 * and should be added immediately.</div><div class='add'>+			 */</div><div class='add'>+			super_types[mddev-&gt;major_version].</div><div class='add'>+				validate_super(mddev, rdev);</div><div class='add'>+			err = mddev-&gt;pers-&gt;hot_add_disk(mddev, rdev);</div><div class='add'>+			if (err)</div><div class='add'>+				unbind_rdev_from_array(rdev);</div><div class='add'>+		}</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			export_rdev(rdev);</div><div class='ctx'> </div><div class='hunk'>@@ -3434,23 +3891,6 @@ abort_export:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* similar to deny_write_access, but accounts for our holding a reference</div><div class='del'>- * to the file ourselves */</div><div class='del'>-static int deny_bitmap_write_access(struct file * file)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = file-&gt;f_mapping-&gt;host;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	if (atomic_read(&amp;inode-&gt;i_writecount) &gt; 1) {</div><div class='del'>-		spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-		return -ETXTBSY;</div><div class='del'>-	}</div><div class='del'>-	atomic_set(&amp;inode-&gt;i_writecount, -1);</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int set_bitmap_file(mddev_t *mddev, int fd)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -3491,12 +3931,17 @@ static int set_bitmap_file(mddev_t *mddev, int fd)</div><div class='ctx'> 		mddev-&gt;pers-&gt;quiesce(mddev, 1);</div><div class='ctx'> 		if (fd &gt;= 0)</div><div class='ctx'> 			err = bitmap_create(mddev);</div><div class='del'>-		if (fd &lt; 0 || err)</div><div class='add'>+		if (fd &lt; 0 || err) {</div><div class='ctx'> 			bitmap_destroy(mddev);</div><div class='add'>+			fd = -1; /* make sure to put the file */</div><div class='add'>+		}</div><div class='ctx'> 		mddev-&gt;pers-&gt;quiesce(mddev, 0);</div><div class='del'>-	} else if (fd &lt; 0) {</div><div class='del'>-		if (mddev-&gt;bitmap_file)</div><div class='add'>+	}</div><div class='add'>+	if (fd &lt; 0) {</div><div class='add'>+		if (mddev-&gt;bitmap_file) {</div><div class='add'>+			restore_bitmap_write_access(mddev-&gt;bitmap_file);</div><div class='ctx'> 			fput(mddev-&gt;bitmap_file);</div><div class='add'>+		}</div><div class='ctx'> 		mddev-&gt;bitmap_file = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3977,11 +4422,6 @@ static int md_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			goto done_unlock;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			if (_IOC_TYPE(cmd) == MD_MAJOR)</div><div class='del'>-				printk(KERN_WARNING "md: %s(pid %d) used"</div><div class='del'>-					" obsolete MD ioctl, upgrade your"</div><div class='del'>-					" software to use new ictls.\n",</div><div class='del'>-					current-&gt;comm, current-&gt;pid);</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto abort_unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4152,6 +4592,8 @@ void md_error(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 		__builtin_return_address(0),__builtin_return_address(1),</div><div class='ctx'> 		__builtin_return_address(2),__builtin_return_address(3));</div><div class='ctx'> */</div><div class='add'>+	if (!mddev-&gt;pers)</div><div class='add'>+		return;</div><div class='ctx'> 	if (!mddev-&gt;pers-&gt;error_handler)</div><div class='ctx'> 		return;</div><div class='ctx'> 	mddev-&gt;pers-&gt;error_handler(mddev,rdev);</div><div class='hunk'>@@ -4249,12 +4691,13 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	dt = ((jiffies - mddev-&gt;resync_mark) / HZ);</div><div class='ctx'> 	if (!dt) dt++;</div><div class='del'>-	db = resync - (mddev-&gt;resync_mark_cnt/2);</div><div class='del'>-	rt = (dt * ((unsigned long)(max_blocks-resync) / (db/100+1)))/100;</div><div class='add'>+	db = (mddev-&gt;curr_mark_cnt - atomic_read(&amp;mddev-&gt;recovery_active))</div><div class='add'>+		- mddev-&gt;resync_mark_cnt;</div><div class='add'>+	rt = (dt * ((unsigned long)(max_blocks-resync) / (db/2/100+1)))/100;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, " finish=%lu.%lumin", rt / 60, (rt % 60)/6);</div><div class='ctx'> </div><div class='del'>-	seq_printf(seq, " speed=%ldK/sec", db/dt);</div><div class='add'>+	seq_printf(seq, " speed=%ldK/sec", db/2/dt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void *md_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='hunk'>@@ -4586,7 +5029,7 @@ void md_write_start(mddev_t *mddev, struct bio *bi)</div><div class='ctx'> 		spin_lock_irq(&amp;mddev-&gt;write_lock);</div><div class='ctx'> 		if (mddev-&gt;in_sync) {</div><div class='ctx'> 			mddev-&gt;in_sync = 0;</div><div class='del'>-			mddev-&gt;sb_dirty = 1;</div><div class='add'>+			mddev-&gt;sb_dirty = 3;</div><div class='ctx'> 			md_wakeup_thread(mddev-&gt;thread);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irq(&amp;mddev-&gt;write_lock);</div><div class='hunk'>@@ -4599,7 +5042,7 @@ void md_write_end(mddev_t *mddev)</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;mddev-&gt;writes_pending)) {</div><div class='ctx'> 		if (mddev-&gt;safemode == 2)</div><div class='ctx'> 			md_wakeup_thread(mddev-&gt;thread);</div><div class='del'>-		else</div><div class='add'>+		else if (mddev-&gt;safemode_delay)</div><div class='ctx'> 			mod_timer(&amp;mddev-&gt;safemode_timer, jiffies + mddev-&gt;safemode_delay);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4620,10 +5063,14 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> 	sector_t last_check;</div><div class='ctx'> 	int skipped = 0;</div><div class='add'>+	struct list_head *rtmp;</div><div class='add'>+	mdk_rdev_t *rdev;</div><div class='ctx'> </div><div class='ctx'> 	/* just incase thread restarts... */</div><div class='ctx'> 	if (test_bit(MD_RECOVERY_DONE, &amp;mddev-&gt;recovery))</div><div class='ctx'> 		return;</div><div class='add'>+	if (mddev-&gt;ro) /* never try to sync a read-only array */</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* we overload curr_resync somewhat here.</div><div class='ctx'> 	 * 0 == not engaged in resync at all</div><div class='hunk'>@@ -4682,17 +5129,30 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (mddev-&gt;curr_resync &lt; 2);</div><div class='ctx'> </div><div class='add'>+	j = 0;</div><div class='ctx'> 	if (test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery)) {</div><div class='ctx'> 		/* resync follows the size requested by the personality,</div><div class='ctx'> 		 * which defaults to physical size, but can be virtual size</div><div class='ctx'> 		 */</div><div class='ctx'> 		max_sectors = mddev-&gt;resync_max_sectors;</div><div class='ctx'> 		mddev-&gt;resync_mismatches = 0;</div><div class='add'>+		/* we don't use the checkpoint if there's a bitmap */</div><div class='add'>+		if (!mddev-&gt;bitmap &amp;&amp;</div><div class='add'>+		    !test_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery))</div><div class='add'>+			j = mddev-&gt;recovery_cp;</div><div class='ctx'> 	} else if (test_bit(MD_RECOVERY_RESHAPE, &amp;mddev-&gt;recovery))</div><div class='ctx'> 		max_sectors = mddev-&gt;size &lt;&lt; 1;</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='ctx'> 		/* recovery follows the physical size of devices */</div><div class='ctx'> 		max_sectors = mddev-&gt;size &lt;&lt; 1;</div><div class='add'>+		j = MaxSector;</div><div class='add'>+		ITERATE_RDEV(mddev,rdev,rtmp)</div><div class='add'>+			if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+			    !test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+			    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+			    rdev-&gt;recovery_offset &lt; j)</div><div class='add'>+				j = rdev-&gt;recovery_offset;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "md: syncing RAID array %s\n", mdname(mddev));</div><div class='ctx'> 	printk(KERN_INFO "md: minimum _guaranteed_ reconstruction speed:"</div><div class='hunk'>@@ -4702,12 +5162,7 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> 	       speed_max(mddev));</div><div class='ctx'> </div><div class='ctx'> 	is_mddev_idle(mddev); /* this also initializes IO event counters */</div><div class='del'>-	/* we don't use the checkpoint if there's a bitmap */</div><div class='del'>-	if (test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery) &amp;&amp; !mddev-&gt;bitmap</div><div class='del'>-	    &amp;&amp; ! test_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery))</div><div class='del'>-		j = mddev-&gt;recovery_cp;</div><div class='del'>-	else</div><div class='del'>-		j = 0;</div><div class='add'>+</div><div class='ctx'> 	io_sectors = 0;</div><div class='ctx'> 	for (m = 0; m &lt; SYNC_MARKS; m++) {</div><div class='ctx'> 		mark[m] = jiffies;</div><div class='hunk'>@@ -4753,6 +5208,7 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 		j += sectors;</div><div class='ctx'> 		if (j&gt;1) mddev-&gt;curr_resync = j;</div><div class='add'>+		mddev-&gt;curr_mark_cnt = io_sectors;</div><div class='ctx'> 		if (last_check == 0)</div><div class='ctx'> 			/* this is the earliers that rebuilt will be</div><div class='ctx'> 			 * visible in /proc/mdstat</div><div class='hunk'>@@ -4828,15 +5284,28 @@ void md_do_sync(mddev_t *mddev)</div><div class='ctx'> 	if (!test_bit(MD_RECOVERY_ERR, &amp;mddev-&gt;recovery) &amp;&amp;</div><div class='ctx'> 	    test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery) &amp;&amp;</div><div class='ctx'> 	    !test_bit(MD_RECOVERY_CHECK, &amp;mddev-&gt;recovery) &amp;&amp;</div><div class='del'>-	    mddev-&gt;curr_resync &gt; 2 &amp;&amp;</div><div class='del'>-	    mddev-&gt;curr_resync &gt;= mddev-&gt;recovery_cp) {</div><div class='del'>-		if (test_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery)) {</div><div class='del'>-			printk(KERN_INFO </div><div class='del'>-				"md: checkpointing recovery of %s.\n",</div><div class='del'>-				mdname(mddev));</div><div class='del'>-			mddev-&gt;recovery_cp = mddev-&gt;curr_resync;</div><div class='del'>-		} else</div><div class='del'>-			mddev-&gt;recovery_cp = MaxSector;</div><div class='add'>+	    mddev-&gt;curr_resync &gt; 2) {</div><div class='add'>+		if (test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery)) {</div><div class='add'>+			if (test_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery)) {</div><div class='add'>+				if (mddev-&gt;curr_resync &gt;= mddev-&gt;recovery_cp) {</div><div class='add'>+					printk(KERN_INFO</div><div class='add'>+					       "md: checkpointing recovery of %s.\n",</div><div class='add'>+					       mdname(mddev));</div><div class='add'>+					mddev-&gt;recovery_cp = mddev-&gt;curr_resync;</div><div class='add'>+				}</div><div class='add'>+			} else</div><div class='add'>+				mddev-&gt;recovery_cp = MaxSector;</div><div class='add'>+		} else {</div><div class='add'>+			if (!test_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery))</div><div class='add'>+				mddev-&gt;curr_resync = MaxSector;</div><div class='add'>+			ITERATE_RDEV(mddev,rdev,rtmp)</div><div class='add'>+				if (rdev-&gt;raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+				    !test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+				    !test_bit(In_sync, &amp;rdev-&gt;flags) &amp;&amp;</div><div class='add'>+				    rdev-&gt;recovery_offset &lt; mddev-&gt;curr_resync)</div><div class='add'>+					rdev-&gt;recovery_offset = mddev-&gt;curr_resync;</div><div class='add'>+			mddev-&gt;sb_dirty = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  skip:</div><div class='hunk'>@@ -4908,7 +5377,7 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 		if (mddev-&gt;safemode &amp;&amp; !atomic_read(&amp;mddev-&gt;writes_pending) &amp;&amp;</div><div class='ctx'> 		    !mddev-&gt;in_sync &amp;&amp; mddev-&gt;recovery_cp == MaxSector) {</div><div class='ctx'> 			mddev-&gt;in_sync = 1;</div><div class='del'>-			mddev-&gt;sb_dirty = 1;</div><div class='add'>+			mddev-&gt;sb_dirty = 3;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (mddev-&gt;safemode == 1)</div><div class='ctx'> 			mddev-&gt;safemode = 0;</div><div class='hunk'>@@ -4957,6 +5426,8 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 		clear_bit(MD_RECOVERY_INTR, &amp;mddev-&gt;recovery);</div><div class='ctx'> 		clear_bit(MD_RECOVERY_DONE, &amp;mddev-&gt;recovery);</div><div class='ctx'> </div><div class='add'>+		if (test_bit(MD_RECOVERY_FROZEN, &amp;mddev-&gt;recovery))</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		/* no recovery is running.</div><div class='ctx'> 		 * remove any failed drives, then</div><div class='ctx'> 		 * add spares if possible.</div><div class='hunk'>@@ -4979,6 +5450,7 @@ void md_check_recovery(mddev_t *mddev)</div><div class='ctx'> 			ITERATE_RDEV(mddev,rdev,rtmp)</div><div class='ctx'> 				if (rdev-&gt;raid_disk &lt; 0</div><div class='ctx'> 				    &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='add'>+					rdev-&gt;recovery_offset = 0;</div><div class='ctx'> 					if (mddev-&gt;pers-&gt;hot_add_disk(mddev,rdev)) {</div><div class='ctx'> 						char nm[20];</div><div class='ctx'> 						sprintf(nm, "rd%d", rdev-&gt;raid_disk);</div><div class='hunk'>@@ -5071,8 +5543,6 @@ static void md_geninit(void)</div><div class='ctx'> </div><div class='ctx'> static int __init md_init(void)</div><div class='ctx'> {</div><div class='del'>-	int minor;</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_INFO "md: md driver %d.%d.%d MAX_MD_DEVS=%d,"</div><div class='ctx'> 			" MD_SB_DISKS=%d\n",</div><div class='ctx'> 			MD_MAJOR_VERSION, MD_MINOR_VERSION,</div><div class='hunk'>@@ -5086,23 +5556,11 @@ static int __init md_init(void)</div><div class='ctx'> 		unregister_blkdev(MAJOR_NR, "md");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_dir("md");</div><div class='ctx'> 	blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,</div><div class='ctx'> 				md_probe, NULL, NULL);</div><div class='ctx'> 	blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS&lt;&lt;MdpMinorShift, THIS_MODULE,</div><div class='ctx'> 			    md_probe, NULL, NULL);</div><div class='ctx'> </div><div class='del'>-	for (minor=0; minor &lt; MAX_MD_DEVS; ++minor)</div><div class='del'>-		devfs_mk_bdev(MKDEV(MAJOR_NR, minor),</div><div class='del'>-				S_IFBLK|S_IRUSR|S_IWUSR,</div><div class='del'>-				"md/%d", minor);</div><div class='del'>-</div><div class='del'>-	for (minor=0; minor &lt; MAX_MD_DEVS; ++minor)</div><div class='del'>-		devfs_mk_bdev(MKDEV(mdp_major, minor&lt;&lt;MdpMinorShift),</div><div class='del'>-			      S_IFBLK|S_IRUSR|S_IWUSR,</div><div class='del'>-			      "md/mdp%d", minor);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> 	register_reboot_notifier(&amp;md_notifier);</div><div class='ctx'> 	raid_table_header = register_sysctl_table(raid_root_table, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -5158,15 +5616,9 @@ static __exit void md_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	mddev_t *mddev;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='del'>-	int i;</div><div class='add'>+</div><div class='ctx'> 	blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS);</div><div class='ctx'> 	blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS &lt;&lt; MdpMinorShift);</div><div class='del'>-	for (i=0; i &lt; MAX_MD_DEVS; i++)</div><div class='del'>-		devfs_remove("md/%d", i);</div><div class='del'>-	for (i=0; i &lt; MAX_MD_DEVS; i++)</div><div class='del'>-		devfs_remove("md/d%d", i);</div><div class='del'>-</div><div class='del'>-	devfs_remove("md");</div><div class='ctx'> </div><div class='ctx'> 	unregister_blkdev(MAJOR_NR,"md");</div><div class='ctx'> 	unregister_blkdev(mdp_major, "mdp");</div><div class='hunk'>@@ -5203,8 +5655,8 @@ static int set_ro(const char *val, struct kernel_param *kp)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_param_call(start_ro, set_ro, get_ro, NULL, 0600);</div><div class='del'>-module_param(start_dirty_degraded, int, 0644);</div><div class='add'>+module_param_call(start_ro, set_ro, get_ro, NULL, S_IRUSR|S_IWUSR);</div><div class='add'>+module_param(start_dirty_degraded, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(register_md_personality);</div><div class='hunk'>@@ -5216,7 +5668,6 @@ EXPORT_SYMBOL(md_write_end);</div><div class='ctx'> EXPORT_SYMBOL(md_register_thread);</div><div class='ctx'> EXPORT_SYMBOL(md_unregister_thread);</div><div class='ctx'> EXPORT_SYMBOL(md_wakeup_thread);</div><div class='del'>-EXPORT_SYMBOL(md_print_devices);</div><div class='ctx'> EXPORT_SYMBOL(md_check_recovery);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("md");</div><div class='head'>diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c<br/>index 4070eff6f0f8..1efe22a2d041 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/raid1.c</a></div><div class='hunk'>@@ -374,26 +374,26 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int</div><div class='ctx'> 	 * already.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;r1_bio-&gt;remaining)) {</div><div class='del'>-		if (test_bit(R1BIO_BarrierRetry, &amp;r1_bio-&gt;state)) {</div><div class='add'>+		if (test_bit(R1BIO_BarrierRetry, &amp;r1_bio-&gt;state))</div><div class='ctx'> 			reschedule_retry(r1_bio);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-		/* it really is the end of this request */</div><div class='del'>-		if (test_bit(R1BIO_BehindIO, &amp;r1_bio-&gt;state)) {</div><div class='del'>-			/* free extra copy of the data pages */</div><div class='del'>-			int i = bio-&gt;bi_vcnt;</div><div class='del'>-			while (i--)</div><div class='del'>-				safe_put_page(bio-&gt;bi_io_vec[i].bv_page);</div><div class='add'>+		else {</div><div class='add'>+			/* it really is the end of this request */</div><div class='add'>+			if (test_bit(R1BIO_BehindIO, &amp;r1_bio-&gt;state)) {</div><div class='add'>+				/* free extra copy of the data pages */</div><div class='add'>+				int i = bio-&gt;bi_vcnt;</div><div class='add'>+				while (i--)</div><div class='add'>+					safe_put_page(bio-&gt;bi_io_vec[i].bv_page);</div><div class='add'>+			}</div><div class='add'>+			/* clear the bitmap if all writes complete successfully */</div><div class='add'>+			bitmap_endwrite(r1_bio-&gt;mddev-&gt;bitmap, r1_bio-&gt;sector,</div><div class='add'>+					r1_bio-&gt;sectors,</div><div class='add'>+					!test_bit(R1BIO_Degraded, &amp;r1_bio-&gt;state),</div><div class='add'>+					behind);</div><div class='add'>+			md_write_end(r1_bio-&gt;mddev);</div><div class='add'>+			raid_end_bio_io(r1_bio);</div><div class='ctx'> 		}</div><div class='del'>-		/* clear the bitmap if all writes complete successfully */</div><div class='del'>-		bitmap_endwrite(r1_bio-&gt;mddev-&gt;bitmap, r1_bio-&gt;sector,</div><div class='del'>-				r1_bio-&gt;sectors,</div><div class='del'>-				!test_bit(R1BIO_Degraded, &amp;r1_bio-&gt;state),</div><div class='del'>-				behind);</div><div class='del'>-		md_write_end(r1_bio-&gt;mddev);</div><div class='del'>-		raid_end_bio_io(r1_bio);</div><div class='ctx'> 	}</div><div class='del'>- out:</div><div class='add'>+</div><div class='ctx'> 	if (to_put)</div><div class='ctx'> 		bio_put(to_put);</div><div class='ctx'> </div><div class='hunk'>@@ -1145,7 +1145,7 @@ static int end_sync_write(struct bio *bio, unsigned int bytes_done, int error)</div><div class='ctx'> 		long sectors_to_go = r1_bio-&gt;sectors;</div><div class='ctx'> 		/* make sure these bits doesn't get cleared. */</div><div class='ctx'> 		do {</div><div class='del'>-			bitmap_end_sync(mddev-&gt;bitmap, r1_bio-&gt;sector,</div><div class='add'>+			bitmap_end_sync(mddev-&gt;bitmap, s,</div><div class='ctx'> 					&amp;sync_blocks, 1);</div><div class='ctx'> 			s += sync_blocks;</div><div class='ctx'> 			sectors_to_go -= sync_blocks;</div><div class='hunk'>@@ -1509,6 +1509,9 @@ static void raid1d(mddev_t *mddev)</div><div class='ctx'> 									 s&lt;&lt;9, conf-&gt;tmppage, READ) == 0)</div><div class='ctx'> 								/* Well, this device is dead */</div><div class='ctx'> 								md_error(mddev, rdev);</div><div class='add'>+							else</div><div class='add'>+								printk(KERN_INFO "raid1:%s: read error corrected (%d sectors at %llu on %s)\n",</div><div class='add'>+								       mdname(mddev), s, (unsigned long long)(sect + rdev-&gt;data_offset), bdevname(rdev-&gt;bdev, b));</div><div class='ctx'> 						}</div><div class='ctx'> 					}</div><div class='ctx'> 				} else {</div><div class='hunk'>@@ -1625,6 +1628,12 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i</div><div class='ctx'> 	/* before building a request, check if we can skip these blocks..</div><div class='ctx'> 	 * This call the bitmap_start_sync doesn't actually record anything</div><div class='ctx'> 	 */</div><div class='add'>+	if (mddev-&gt;bitmap == NULL &amp;&amp;</div><div class='add'>+	    mddev-&gt;recovery_cp == MaxSector &amp;&amp;</div><div class='add'>+	    conf-&gt;fullsync == 0) {</div><div class='add'>+		*skipped = 1;</div><div class='add'>+		return max_sector - sector_nr;</div><div class='add'>+	}</div><div class='ctx'> 	if (!bitmap_start_sync(mddev-&gt;bitmap, sector_nr, &amp;sync_blocks, 1) &amp;&amp;</div><div class='ctx'> 	    !conf-&gt;fullsync &amp;&amp; !test_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery)) {</div><div class='ctx'> 		/* We can skip this block, and probably several more */</div><div class='hunk'>@@ -1888,7 +1897,8 @@ static int run(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 		disk = conf-&gt;mirrors + i;</div><div class='ctx'> </div><div class='del'>-		if (!disk-&gt;rdev) {</div><div class='add'>+		if (!disk-&gt;rdev ||</div><div class='add'>+		    !test_bit(In_sync, &amp;disk-&gt;rdev-&gt;flags)) {</div><div class='ctx'> 			disk-&gt;head_position = 0;</div><div class='ctx'> 			mddev-&gt;degraded++;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c<br/>index 1440935414e6..016ddb831c9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid10.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/raid10.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'>  *    raid_disks</div><div class='ctx'>  *    near_copies (stored in low byte of layout)</div><div class='ctx'>  *    far_copies (stored in second byte of layout)</div><div class='add'>+ *    far_offset (stored in bit 16 of layout )</div><div class='ctx'>  *</div><div class='ctx'>  * The data to be stored is divided into chunks using chunksize.</div><div class='ctx'>  * Each device is divided into far_copies sections.</div><div class='hunk'>@@ -36,10 +37,14 @@</div><div class='ctx'>  * near_copies copies of each chunk is stored (each on a different drive).</div><div class='ctx'>  * The starting device for each section is offset near_copies from the starting</div><div class='ctx'>  * device of the previous section.</div><div class='del'>- * Thus there are (near_copies*far_copies) of each chunk, and each is on a different</div><div class='add'>+ * Thus they are (near_copies*far_copies) of each chunk, and each is on a different</div><div class='ctx'>  * drive.</div><div class='ctx'>  * near_copies and far_copies must be at least one, and their product is at most</div><div class='ctx'>  * raid_disks.</div><div class='add'>+ *</div><div class='add'>+ * If far_offset is true, then the far_copies are handled a bit differently.</div><div class='add'>+ * The copies are still in different stripes, but instead of be very far apart</div><div class='add'>+ * on disk, there are adjacent stripes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -357,8 +362,7 @@ static int raid10_end_write_request(struct bio *bio, unsigned int bytes_done, in</div><div class='ctx'>  * With this layout, and block is never stored twice on the one device.</div><div class='ctx'>  *</div><div class='ctx'>  * raid10_find_phys finds the sector offset of a given virtual sector</div><div class='del'>- * on each device that it is on. If a block isn't on a device,</div><div class='del'>- * that entry in the array is set to MaxSector.</div><div class='add'>+ * on each device that it is on.</div><div class='ctx'>  *</div><div class='ctx'>  * raid10_find_virt does the reverse mapping, from a device and a</div><div class='ctx'>  * sector offset to a virtual address</div><div class='hunk'>@@ -381,6 +385,8 @@ static void raid10_find_phys(conf_t *conf, r10bio_t *r10bio)</div><div class='ctx'> 	chunk *= conf-&gt;near_copies;</div><div class='ctx'> 	stripe = chunk;</div><div class='ctx'> 	dev = sector_div(stripe, conf-&gt;raid_disks);</div><div class='add'>+	if (conf-&gt;far_offset)</div><div class='add'>+		stripe *= conf-&gt;far_copies;</div><div class='ctx'> </div><div class='ctx'> 	sector += stripe &lt;&lt; conf-&gt;chunk_shift;</div><div class='ctx'> </div><div class='hunk'>@@ -414,16 +420,24 @@ static sector_t raid10_find_virt(conf_t *conf, sector_t sector, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	sector_t offset, chunk, vchunk;</div><div class='ctx'> </div><div class='del'>-	while (sector &gt; conf-&gt;stride) {</div><div class='del'>-		sector -= conf-&gt;stride;</div><div class='del'>-		if (dev &lt; conf-&gt;near_copies)</div><div class='del'>-			dev += conf-&gt;raid_disks - conf-&gt;near_copies;</div><div class='del'>-		else</div><div class='del'>-			dev -= conf-&gt;near_copies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	offset = sector &amp; conf-&gt;chunk_mask;</div><div class='del'>-	chunk = sector &gt;&gt; conf-&gt;chunk_shift;</div><div class='add'>+	if (conf-&gt;far_offset) {</div><div class='add'>+		int fc;</div><div class='add'>+		chunk = sector &gt;&gt; conf-&gt;chunk_shift;</div><div class='add'>+		fc = sector_div(chunk, conf-&gt;far_copies);</div><div class='add'>+		dev -= fc * conf-&gt;near_copies;</div><div class='add'>+		if (dev &lt; 0)</div><div class='add'>+			dev += conf-&gt;raid_disks;</div><div class='add'>+	} else {</div><div class='add'>+		while (sector &gt; conf-&gt;stride) {</div><div class='add'>+			sector -= conf-&gt;stride;</div><div class='add'>+			if (dev &lt; conf-&gt;near_copies)</div><div class='add'>+				dev += conf-&gt;raid_disks - conf-&gt;near_copies;</div><div class='add'>+			else</div><div class='add'>+				dev -= conf-&gt;near_copies;</div><div class='add'>+		}</div><div class='add'>+		chunk = sector &gt;&gt; conf-&gt;chunk_shift;</div><div class='add'>+	}</div><div class='ctx'> 	vchunk = chunk * conf-&gt;raid_disks + dev;</div><div class='ctx'> 	sector_div(vchunk, conf-&gt;near_copies);</div><div class='ctx'> 	return (vchunk &lt;&lt; conf-&gt;chunk_shift) + offset;</div><div class='hunk'>@@ -900,9 +914,12 @@ static void status(struct seq_file *seq, mddev_t *mddev)</div><div class='ctx'> 		seq_printf(seq, " %dK chunks", mddev-&gt;chunk_size/1024);</div><div class='ctx'> 	if (conf-&gt;near_copies &gt; 1)</div><div class='ctx'> 		seq_printf(seq, " %d near-copies", conf-&gt;near_copies);</div><div class='del'>-	if (conf-&gt;far_copies &gt; 1)</div><div class='del'>-		seq_printf(seq, " %d far-copies", conf-&gt;far_copies);</div><div class='del'>-</div><div class='add'>+	if (conf-&gt;far_copies &gt; 1) {</div><div class='add'>+		if (conf-&gt;far_offset)</div><div class='add'>+			seq_printf(seq, " %d offset-copies", conf-&gt;far_copies);</div><div class='add'>+		else</div><div class='add'>+			seq_printf(seq, " %d far-copies", conf-&gt;far_copies);</div><div class='add'>+	}</div><div class='ctx'> 	seq_printf(seq, " [%d/%d] [", conf-&gt;raid_disks,</div><div class='ctx'> 						conf-&gt;working_disks);</div><div class='ctx'> 	for (i = 0; i &lt; conf-&gt;raid_disks; i++)</div><div class='hunk'>@@ -1475,6 +1492,10 @@ static void raid10d(mddev_t *mddev)</div><div class='ctx'> 									 s&lt;&lt;9, conf-&gt;tmppage, READ) == 0)</div><div class='ctx'> 								/* Well, this device is dead */</div><div class='ctx'> 								md_error(mddev, rdev);</div><div class='add'>+							else</div><div class='add'>+								printk(KERN_INFO "raid10:%s: read error corrected (%d sectors at %llu on %s)\n",</div><div class='add'>+								       mdname(mddev), s, (unsigned long long)(sect+rdev-&gt;data_offset), bdevname(rdev-&gt;bdev, b));</div><div class='add'>+</div><div class='ctx'> 							rdev_dec_pending(rdev, mddev);</div><div class='ctx'> 							rcu_read_lock();</div><div class='ctx'> 						}</div><div class='hunk'>@@ -1915,7 +1936,7 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	mirror_info_t *disk;</div><div class='ctx'> 	mdk_rdev_t *rdev;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='del'>-	int nc, fc;</div><div class='add'>+	int nc, fc, fo;</div><div class='ctx'> 	sector_t stride, size;</div><div class='ctx'> </div><div class='ctx'> 	if (mddev-&gt;chunk_size == 0) {</div><div class='hunk'>@@ -1925,8 +1946,9 @@ static int run(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 	nc = mddev-&gt;layout &amp; 255;</div><div class='ctx'> 	fc = (mddev-&gt;layout &gt;&gt; 8) &amp; 255;</div><div class='add'>+	fo = mddev-&gt;layout &amp; (1&lt;&lt;16);</div><div class='ctx'> 	if ((nc*fc) &lt;2 || (nc*fc) &gt; mddev-&gt;raid_disks ||</div><div class='del'>-	    (mddev-&gt;layout &gt;&gt; 16)) {</div><div class='add'>+	    (mddev-&gt;layout &gt;&gt; 17)) {</div><div class='ctx'> 		printk(KERN_ERR "raid10: %s: unsupported raid10 layout: 0x%8x\n",</div><div class='ctx'> 		       mdname(mddev), mddev-&gt;layout);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1958,12 +1980,16 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	conf-&gt;near_copies = nc;</div><div class='ctx'> 	conf-&gt;far_copies = fc;</div><div class='ctx'> 	conf-&gt;copies = nc*fc;</div><div class='add'>+	conf-&gt;far_offset = fo;</div><div class='ctx'> 	conf-&gt;chunk_mask = (sector_t)(mddev-&gt;chunk_size&gt;&gt;9)-1;</div><div class='ctx'> 	conf-&gt;chunk_shift = ffz(~mddev-&gt;chunk_size) - 9;</div><div class='del'>-	stride = mddev-&gt;size &gt;&gt; (conf-&gt;chunk_shift-1);</div><div class='del'>-	sector_div(stride, fc);</div><div class='del'>-	conf-&gt;stride = stride &lt;&lt; conf-&gt;chunk_shift;</div><div class='del'>-</div><div class='add'>+	if (fo)</div><div class='add'>+		conf-&gt;stride = 1 &lt;&lt; conf-&gt;chunk_shift;</div><div class='add'>+	else {</div><div class='add'>+		stride = mddev-&gt;size &gt;&gt; (conf-&gt;chunk_shift-1);</div><div class='add'>+		sector_div(stride, fc);</div><div class='add'>+		conf-&gt;stride = stride &lt;&lt; conf-&gt;chunk_shift;</div><div class='add'>+	}</div><div class='ctx'> 	conf-&gt;r10bio_pool = mempool_create(NR_RAID10_BIOS, r10bio_pool_alloc,</div><div class='ctx'> 						r10bio_pool_free, conf);</div><div class='ctx'> 	if (!conf-&gt;r10bio_pool) {</div><div class='hunk'>@@ -2015,7 +2041,8 @@ static int run(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 		disk = conf-&gt;mirrors + i;</div><div class='ctx'> </div><div class='del'>-		if (!disk-&gt;rdev) {</div><div class='add'>+		if (!disk-&gt;rdev ||</div><div class='add'>+		    !test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='ctx'> 			disk-&gt;head_position = 0;</div><div class='ctx'> 			mddev-&gt;degraded++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2037,7 +2064,13 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ok, everything is just fine now</div><div class='ctx'> 	 */</div><div class='del'>-	size = conf-&gt;stride * conf-&gt;raid_disks;</div><div class='add'>+	if (conf-&gt;far_offset) {</div><div class='add'>+		size = mddev-&gt;size &gt;&gt; (conf-&gt;chunk_shift-1);</div><div class='add'>+		size *= conf-&gt;raid_disks;</div><div class='add'>+		size &lt;&lt;= conf-&gt;chunk_shift;</div><div class='add'>+		sector_div(size, conf-&gt;far_copies);</div><div class='add'>+	} else</div><div class='add'>+		size = conf-&gt;stride * conf-&gt;raid_disks;</div><div class='ctx'> 	sector_div(size, conf-&gt;near_copies);</div><div class='ctx'> 	mddev-&gt;array_size = size/2;</div><div class='ctx'> 	mddev-&gt;resync_max_sectors = size;</div><div class='hunk'>@@ -2050,7 +2083,7 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	 * maybe...</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='del'>-		int stripe = conf-&gt;raid_disks * mddev-&gt;chunk_size / PAGE_SIZE;</div><div class='add'>+		int stripe = conf-&gt;raid_disks * (mddev-&gt;chunk_size / PAGE_SIZE);</div><div class='ctx'> 		stripe /= conf-&gt;near_copies;</div><div class='ctx'> 		if (mddev-&gt;queue-&gt;backing_dev_info.ra_pages &lt; 2* stripe)</div><div class='ctx'> 			mddev-&gt;queue-&gt;backing_dev_info.ra_pages = 2* stripe;</div><div class='head'>diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c<br/>index 31843604049c..450066007160 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid5.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/raid5.c</a></div><div class='hunk'>@@ -2,8 +2,11 @@</div><div class='ctx'>  * raid5.c : Multiple Devices driver for Linux</div><div class='ctx'>  *	   Copyright (C) 1996, 1997 Ingo Molnar, Miguel de Icaza, Gadi Oxman</div><div class='ctx'>  *	   Copyright (C) 1999, 2000 Ingo Molnar</div><div class='add'>+ *	   Copyright (C) 2002, 2003 H. Peter Anvin</div><div class='ctx'>  *</div><div class='del'>- * RAID-5 management functions.</div><div class='add'>+ * RAID-4/5/6 management functions.</div><div class='add'>+ * Thanks to Penguin Computing for making the RAID-6 development possible</div><div class='add'>+ * by donating a test server!</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -15,15 +18,38 @@</div><div class='ctx'>  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * BITMAP UNPLUGGING:</div><div class='add'>+ *</div><div class='add'>+ * The sequencing for updating the bitmap reliably is a little</div><div class='add'>+ * subtle (and I got it wrong the first time) so it deserves some</div><div class='add'>+ * explanation.</div><div class='add'>+ *</div><div class='add'>+ * We group bitmap updates into batches.  Each batch has a number.</div><div class='add'>+ * We may write out several batches at once, but that isn't very important.</div><div class='add'>+ * conf-&gt;bm_write is the number of the last batch successfully written.</div><div class='add'>+ * conf-&gt;bm_flush is the number of the last batch that was closed to</div><div class='add'>+ *    new additions.</div><div class='add'>+ * When we discover that we will need to write to any block in a stripe</div><div class='add'>+ * (in add_stripe_bio) we update the in-memory bitmap and record in sh-&gt;bm_seq</div><div class='add'>+ * the number of the batch it will be in. This is bm_flush+1.</div><div class='add'>+ * When we are ready to do a write, if that batch hasn't been written yet,</div><div class='add'>+ *   we plug the array and queue the stripe for later.</div><div class='add'>+ * When an unplug happens, we increment bm_flush, thus closing the current</div><div class='add'>+ *   batch.</div><div class='add'>+ * When we notice that bm_flush &gt; bm_write, we write out all pending updates</div><div class='add'>+ * to the bitmap, and advance bm_write to where bm_flush was.</div><div class='add'>+ * This may occasionally write a bit out twice, but is sure never to</div><div class='add'>+ * miss any bits.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/raid/raid5.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='add'>+#include "raid6.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/raid/bitmap.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +94,16 @@</div><div class='ctx'> #define __inline__</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if !RAID6_USE_EMPTY_ZERO_PAGE</div><div class='add'>+/* In .bss so it's zeroed */</div><div class='add'>+const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline int raid6_next_disk(int disk, int raid_disks)</div><div class='add'>+{</div><div class='add'>+	disk++;</div><div class='add'>+	return (disk &lt; raid_disks) ? disk : 0;</div><div class='add'>+}</div><div class='ctx'> static void print_raid5_conf (raid5_conf_t *conf);</div><div class='ctx'> </div><div class='ctx'> static void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh)</div><div class='hunk'>@@ -76,12 +112,14 @@ static void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh)</div><div class='ctx'> 		BUG_ON(!list_empty(&amp;sh-&gt;lru));</div><div class='ctx'> 		BUG_ON(atomic_read(&amp;conf-&gt;active_stripes)==0);</div><div class='ctx'> 		if (test_bit(STRIPE_HANDLE, &amp;sh-&gt;state)) {</div><div class='del'>-			if (test_bit(STRIPE_DELAYED, &amp;sh-&gt;state))</div><div class='add'>+			if (test_bit(STRIPE_DELAYED, &amp;sh-&gt;state)) {</div><div class='ctx'> 				list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;delayed_list);</div><div class='del'>-			else if (test_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state) &amp;&amp;</div><div class='del'>-				 conf-&gt;seq_write == sh-&gt;bm_seq)</div><div class='add'>+				blk_plug_device(conf-&gt;mddev-&gt;queue);</div><div class='add'>+			} else if (test_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state) &amp;&amp;</div><div class='add'>+				   sh-&gt;bm_seq - conf-&gt;seq_write &gt; 0) {</div><div class='ctx'> 				list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;bitmap_list);</div><div class='del'>-			else {</div><div class='add'>+				blk_plug_device(conf-&gt;mddev-&gt;queue);</div><div class='add'>+			} else {</div><div class='ctx'> 				clear_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state);</div><div class='ctx'> 				list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;handle_list);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -104,7 +142,7 @@ static void release_stripe(struct stripe_head *sh)</div><div class='ctx'> {</div><div class='ctx'> 	raid5_conf_t *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='ctx'> 	__release_stripe(conf, sh);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='hunk'>@@ -117,7 +155,7 @@ static inline void remove_hash(struct stripe_head *sh)</div><div class='ctx'> 	hlist_del_init(&amp;sh-&gt;hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void insert_hash(raid5_conf_t *conf, struct stripe_head *sh)</div><div class='add'>+static inline void insert_hash(raid5_conf_t *conf, struct stripe_head *sh)</div><div class='ctx'> {</div><div class='ctx'> 	struct hlist_head *hp = stripe_hash(conf, sh-&gt;sector);</div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +228,7 @@ static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int</div><div class='ctx'> 		(unsigned long long)sh-&gt;sector);</div><div class='ctx'> </div><div class='ctx'> 	remove_hash(sh);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	sh-&gt;sector = sector;</div><div class='ctx'> 	sh-&gt;pd_idx = pd_idx;</div><div class='ctx'> 	sh-&gt;state = 0;</div><div class='hunk'>@@ -258,7 +296,7 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector</div><div class='ctx'> 						     &lt; (conf-&gt;max_nr_stripes *3/4)</div><div class='ctx'> 						     || !conf-&gt;inactive_blocked),</div><div class='ctx'> 						    conf-&gt;device_lock,</div><div class='del'>-						    unplug_slaves(conf-&gt;mddev)</div><div class='add'>+						    raid5_unplug_device(conf-&gt;mddev-&gt;queue)</div><div class='ctx'> 					);</div><div class='ctx'> 				conf-&gt;inactive_blocked = 0;</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -269,8 +307,10 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (!test_bit(STRIPE_HANDLE, &amp;sh-&gt;state))</div><div class='ctx'> 					atomic_inc(&amp;conf-&gt;active_stripes);</div><div class='del'>-				if (!list_empty(&amp;sh-&gt;lru))</div><div class='del'>-					list_del_init(&amp;sh-&gt;lru);</div><div class='add'>+				if (list_empty(&amp;sh-&gt;lru) &amp;&amp;</div><div class='add'>+				    !test_bit(STRIPE_EXPANDING, &amp;sh-&gt;state))</div><div class='add'>+					BUG();</div><div class='add'>+				list_del_init(&amp;sh-&gt;lru);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (sh == NULL);</div><div class='hunk'>@@ -321,10 +361,9 @@ static int grow_stripes(raid5_conf_t *conf, int num)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	conf-&gt;slab_cache = sc;</div><div class='ctx'> 	conf-&gt;pool_size = devs;</div><div class='del'>-	while (num--) {</div><div class='add'>+	while (num--)</div><div class='ctx'> 		if (!grow_one_stripe(conf))</div><div class='ctx'> 			return 1;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -484,6 +523,8 @@ static int raid5_end_read_request(struct bio * bi, unsigned int bytes_done,</div><div class='ctx'> 	raid5_conf_t *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	int disks = sh-&gt;disks, i;</div><div class='ctx'> 	int uptodate = test_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='add'>+	char b[BDEVNAME_SIZE];</div><div class='add'>+	mdk_rdev_t *rdev;</div><div class='ctx'> </div><div class='ctx'> 	if (bi-&gt;bi_size)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -531,25 +572,39 @@ static int raid5_end_read_request(struct bio * bi, unsigned int bytes_done,</div><div class='ctx'> 		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> #endif</div><div class='ctx'> 		if (test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='del'>-			printk(KERN_INFO "raid5: read error corrected!!\n");</div><div class='add'>+			rdev = conf-&gt;disks[i].rdev;</div><div class='add'>+			printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",</div><div class='add'>+			       mdname(conf-&gt;mddev), STRIPE_SECTORS,</div><div class='add'>+			       (unsigned long long)sh-&gt;sector + rdev-&gt;data_offset,</div><div class='add'>+			       bdevname(rdev-&gt;bdev, b));</div><div class='ctx'> 			clear_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 			clear_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (atomic_read(&amp;conf-&gt;disks[i].rdev-&gt;read_errors))</div><div class='ctx'> 			atomic_set(&amp;conf-&gt;disks[i].rdev-&gt;read_errors, 0);</div><div class='ctx'> 	} else {</div><div class='add'>+		const char *bdn = bdevname(conf-&gt;disks[i].rdev-&gt;bdev, b);</div><div class='ctx'> 		int retry = 0;</div><div class='add'>+		rdev = conf-&gt;disks[i].rdev;</div><div class='add'>+</div><div class='ctx'> 		clear_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-		atomic_inc(&amp;conf-&gt;disks[i].rdev-&gt;read_errors);</div><div class='add'>+		atomic_inc(&amp;rdev-&gt;read_errors);</div><div class='ctx'> 		if (conf-&gt;mddev-&gt;degraded)</div><div class='del'>-			printk(KERN_WARNING "raid5: read error not correctable.\n");</div><div class='add'>+			printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",</div><div class='add'>+			       mdname(conf-&gt;mddev),</div><div class='add'>+			       (unsigned long long)sh-&gt;sector + rdev-&gt;data_offset,</div><div class='add'>+			       bdn);</div><div class='ctx'> 		else if (test_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags))</div><div class='ctx'> 			/* Oh, no!!! */</div><div class='del'>-			printk(KERN_WARNING "raid5: read error NOT corrected!!\n");</div><div class='del'>-		else if (atomic_read(&amp;conf-&gt;disks[i].rdev-&gt;read_errors)</div><div class='add'>+			printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",</div><div class='add'>+			       mdname(conf-&gt;mddev),</div><div class='add'>+			       (unsigned long long)sh-&gt;sector + rdev-&gt;data_offset,</div><div class='add'>+			       bdn);</div><div class='add'>+		else if (atomic_read(&amp;rdev-&gt;read_errors)</div><div class='ctx'> 			 &gt; conf-&gt;max_nr_stripes)</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='del'>-			       "raid5: Too many read errors, failing device.\n");</div><div class='add'>+			       "raid5:%s: Too many read errors, failing device %s.\n",</div><div class='add'>+			       mdname(conf-&gt;mddev), bdn);</div><div class='ctx'> 		else</div><div class='ctx'> 			retry = 1;</div><div class='ctx'> 		if (retry)</div><div class='hunk'>@@ -557,7 +612,7 @@ static int raid5_end_read_request(struct bio * bi, unsigned int bytes_done,</div><div class='ctx'> 		else {</div><div class='ctx'> 			clear_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 			clear_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			md_error(conf-&gt;mddev, conf-&gt;disks[i].rdev);</div><div class='add'>+			md_error(conf-&gt;mddev, rdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rdev_dec_pending(conf-&gt;disks[i].rdev, conf-&gt;mddev);</div><div class='hunk'>@@ -631,8 +686,7 @@ static void raid5_build_block (struct stripe_head *sh, int i)</div><div class='ctx'> 	dev-&gt;req.bi_private = sh;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags = 0;</div><div class='del'>-	if (i != sh-&gt;pd_idx)</div><div class='del'>-		dev-&gt;sector = compute_blocknr(sh, i);</div><div class='add'>+	dev-&gt;sector = compute_blocknr(sh, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void error(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='hunk'>@@ -659,7 +713,7 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 			" Operation continuing on %d devices\n",</div><div class='ctx'> 			bdevname(rdev-&gt;bdev,b), conf-&gt;working_disks);</div><div class='ctx'> 	}</div><div class='del'>-}	</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Input: a 'big' sector number,</div><div class='hunk'>@@ -697,9 +751,12 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Select the parity disk based on the user selected algorithm.</div><div class='ctx'> 	 */</div><div class='del'>-	if (conf-&gt;level == 4)</div><div class='add'>+	switch(conf-&gt;level) {</div><div class='add'>+	case 4:</div><div class='ctx'> 		*pd_idx = data_disks;</div><div class='del'>-	else switch (conf-&gt;algorithm) {</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		switch (conf-&gt;algorithm) {</div><div class='ctx'> 		case ALGORITHM_LEFT_ASYMMETRIC:</div><div class='ctx'> 			*pd_idx = data_disks - stripe % raid_disks;</div><div class='ctx'> 			if (*dd_idx &gt;= *pd_idx)</div><div class='hunk'>@@ -721,6 +778,39 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_ERR "raid5: unsupported algorithm %d\n",</div><div class='ctx'> 				conf-&gt;algorithm);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+</div><div class='add'>+		/**** FIX THIS ****/</div><div class='add'>+		switch (conf-&gt;algorithm) {</div><div class='add'>+		case ALGORITHM_LEFT_ASYMMETRIC:</div><div class='add'>+			*pd_idx = raid_disks - 1 - (stripe % raid_disks);</div><div class='add'>+			if (*pd_idx == raid_disks-1)</div><div class='add'>+				(*dd_idx)++; 	/* Q D D D P */</div><div class='add'>+			else if (*dd_idx &gt;= *pd_idx)</div><div class='add'>+				(*dd_idx) += 2; /* D D P Q D */</div><div class='add'>+			break;</div><div class='add'>+		case ALGORITHM_RIGHT_ASYMMETRIC:</div><div class='add'>+			*pd_idx = stripe % raid_disks;</div><div class='add'>+			if (*pd_idx == raid_disks-1)</div><div class='add'>+				(*dd_idx)++; 	/* Q D D D P */</div><div class='add'>+			else if (*dd_idx &gt;= *pd_idx)</div><div class='add'>+				(*dd_idx) += 2; /* D D P Q D */</div><div class='add'>+			break;</div><div class='add'>+		case ALGORITHM_LEFT_SYMMETRIC:</div><div class='add'>+			*pd_idx = raid_disks - 1 - (stripe % raid_disks);</div><div class='add'>+			*dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;</div><div class='add'>+			break;</div><div class='add'>+		case ALGORITHM_RIGHT_SYMMETRIC:</div><div class='add'>+			*pd_idx = stripe % raid_disks;</div><div class='add'>+			*dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk (KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='add'>+				conf-&gt;algorithm);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -742,12 +832,17 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)</div><div class='ctx'> 	int chunk_number, dummy1, dummy2, dd_idx = i;</div><div class='ctx'> 	sector_t r_sector;</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	chunk_offset = sector_div(new_sector, sectors_per_chunk);</div><div class='ctx'> 	stripe = new_sector;</div><div class='ctx'> 	BUG_ON(new_sector != stripe);</div><div class='ctx'> </div><div class='del'>-	</div><div class='del'>-	switch (conf-&gt;algorithm) {</div><div class='add'>+	if (i == sh-&gt;pd_idx)</div><div class='add'>+		return 0;</div><div class='add'>+	switch(conf-&gt;level) {</div><div class='add'>+	case 4: break;</div><div class='add'>+	case 5:</div><div class='add'>+		switch (conf-&gt;algorithm) {</div><div class='ctx'> 		case ALGORITHM_LEFT_ASYMMETRIC:</div><div class='ctx'> 		case ALGORITHM_RIGHT_ASYMMETRIC:</div><div class='ctx'> 			if (i &gt; sh-&gt;pd_idx)</div><div class='hunk'>@@ -761,7 +856,37 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_ERR "raid5: unsupported algorithm %d\n",</div><div class='add'>+			       conf-&gt;algorithm);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		data_disks = raid_disks - 2;</div><div class='add'>+		if (i == raid6_next_disk(sh-&gt;pd_idx, raid_disks))</div><div class='add'>+			return 0; /* It is the Q disk */</div><div class='add'>+		switch (conf-&gt;algorithm) {</div><div class='add'>+		case ALGORITHM_LEFT_ASYMMETRIC:</div><div class='add'>+		case ALGORITHM_RIGHT_ASYMMETRIC:</div><div class='add'>+		  	if (sh-&gt;pd_idx == raid_disks-1)</div><div class='add'>+				i--; 	/* Q D D D P */</div><div class='add'>+			else if (i &gt; sh-&gt;pd_idx)</div><div class='add'>+				i -= 2; /* D D P Q D */</div><div class='add'>+			break;</div><div class='add'>+		case ALGORITHM_LEFT_SYMMETRIC:</div><div class='add'>+		case ALGORITHM_RIGHT_SYMMETRIC:</div><div class='add'>+			if (sh-&gt;pd_idx == raid_disks-1)</div><div class='add'>+				i--; /* Q D D D P */</div><div class='add'>+			else {</div><div class='add'>+				/* D D P Q D */</div><div class='add'>+				if (i &lt; sh-&gt;pd_idx)</div><div class='add'>+					i += raid_disks;</div><div class='add'>+				i -= (sh-&gt;pd_idx + 2);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk (KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='ctx'> 				conf-&gt;algorithm);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chunk_number = stripe * data_disks + i;</div><div class='hunk'>@@ -778,10 +903,11 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Copy data between a page in the stripe cache, and a bio.</div><div class='del'>- * There are no alignment or size guarantees between the page or the</div><div class='del'>- * bio except that there is some overlap.</div><div class='del'>- * All iovecs in the bio must be considered.</div><div class='add'>+ * Copy data between a page in the stripe cache, and one or more bion</div><div class='add'>+ * The page could align with the middle of the bio, or there could be</div><div class='add'>+ * several bion, each with several bio_vecs, which cover part of the page</div><div class='add'>+ * Multiple bion are linked together on bi_next.  There may be extras</div><div class='add'>+ * at the end of this list.  We ignore them.</div><div class='ctx'>  */</div><div class='ctx'> static void copy_data(int frombio, struct bio *bio,</div><div class='ctx'> 		     struct page *page,</div><div class='hunk'>@@ -810,7 +936,7 @@ static void copy_data(int frombio, struct bio *bio,</div><div class='ctx'> 		if (len &gt; 0 &amp;&amp; page_offset + len &gt; STRIPE_SIZE)</div><div class='ctx'> 			clen = STRIPE_SIZE - page_offset;</div><div class='ctx'> 		else clen = len;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		if (clen &gt; 0) {</div><div class='ctx'> 			char *ba = __bio_kmap_atomic(bio, i, KM_USER0);</div><div class='ctx'> 			if (frombio)</div><div class='hunk'>@@ -862,14 +988,14 @@ static void compute_block(struct stripe_head *sh, int dd_idx)</div><div class='ctx'> 	set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void compute_parity(struct stripe_head *sh, int method)</div><div class='add'>+static void compute_parity5(struct stripe_head *sh, int method)</div><div class='ctx'> {</div><div class='ctx'> 	raid5_conf_t *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	int i, pd_idx = sh-&gt;pd_idx, disks = sh-&gt;disks, count;</div><div class='ctx'> 	void *ptr[MAX_XOR_BLOCKS];</div><div class='ctx'> 	struct bio *chosen;</div><div class='ctx'> </div><div class='del'>-	PRINTK("compute_parity, stripe %llu, method %d\n",</div><div class='add'>+	PRINTK("compute_parity5, stripe %llu, method %d\n",</div><div class='ctx'> 		(unsigned long long)sh-&gt;sector, method);</div><div class='ctx'> </div><div class='ctx'> 	count = 1;</div><div class='hunk'>@@ -956,9 +1082,195 @@ static void compute_parity(struct stripe_head *sh, int method)</div><div class='ctx'> 		clear_bit(R5_UPTODATE, &amp;sh-&gt;dev[pd_idx].flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void compute_parity6(struct stripe_head *sh, int method)</div><div class='add'>+{</div><div class='add'>+	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='add'>+	int i, pd_idx = sh-&gt;pd_idx, qd_idx, d0_idx, disks = conf-&gt;raid_disks, count;</div><div class='add'>+	struct bio *chosen;</div><div class='add'>+	/**** FIX THIS: This could be very bad if disks is close to 256 ****/</div><div class='add'>+	void *ptrs[disks];</div><div class='add'>+</div><div class='add'>+	qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='add'>+	d0_idx = raid6_next_disk(qd_idx, disks);</div><div class='add'>+</div><div class='add'>+	PRINTK("compute_parity, stripe %llu, method %d\n",</div><div class='add'>+		(unsigned long long)sh-&gt;sector, method);</div><div class='add'>+</div><div class='add'>+	switch(method) {</div><div class='add'>+	case READ_MODIFY_WRITE:</div><div class='add'>+		BUG();		/* READ_MODIFY_WRITE N/A for RAID-6 */</div><div class='add'>+	case RECONSTRUCT_WRITE:</div><div class='add'>+		for (i= disks; i-- ;)</div><div class='add'>+			if ( i != pd_idx &amp;&amp; i != qd_idx &amp;&amp; sh-&gt;dev[i].towrite ) {</div><div class='add'>+				chosen = sh-&gt;dev[i].towrite;</div><div class='add'>+				sh-&gt;dev[i].towrite = NULL;</div><div class='add'>+</div><div class='add'>+				if (test_and_clear_bit(R5_Overlap, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+					wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='add'>+</div><div class='add'>+				if (sh-&gt;dev[i].written) BUG();</div><div class='add'>+				sh-&gt;dev[i].written = chosen;</div><div class='add'>+			}</div><div class='add'>+		break;</div><div class='add'>+	case CHECK_PARITY:</div><div class='add'>+		BUG();		/* Not implemented yet */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = disks; i--;)</div><div class='add'>+		if (sh-&gt;dev[i].written) {</div><div class='add'>+			sector_t sector = sh-&gt;dev[i].sector;</div><div class='add'>+			struct bio *wbi = sh-&gt;dev[i].written;</div><div class='add'>+			while (wbi &amp;&amp; wbi-&gt;bi_sector &lt; sector + STRIPE_SECTORS) {</div><div class='add'>+				copy_data(1, wbi, sh-&gt;dev[i].page, sector);</div><div class='add'>+				wbi = r5_next_bio(wbi, sector);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			set_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+			set_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+//	switch(method) {</div><div class='add'>+//	case RECONSTRUCT_WRITE:</div><div class='add'>+//	case CHECK_PARITY:</div><div class='add'>+//	case UPDATE_PARITY:</div><div class='add'>+		/* Note that unlike RAID-5, the ordering of the disks matters greatly. */</div><div class='add'>+		/* FIX: Is this ordering of drives even remotely optimal? */</div><div class='add'>+		count = 0;</div><div class='add'>+		i = d0_idx;</div><div class='add'>+		do {</div><div class='add'>+			ptrs[count++] = page_address(sh-&gt;dev[i].page);</div><div class='add'>+			if (count &lt;= disks-2 &amp;&amp; !test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+				printk("block %d/%d not uptodate on parity calc\n", i,count);</div><div class='add'>+			i = raid6_next_disk(i, disks);</div><div class='add'>+		} while ( i != d0_idx );</div><div class='add'>+//		break;</div><div class='add'>+//	}</div><div class='add'>+</div><div class='add'>+	raid6_call.gen_syndrome(disks, STRIPE_SIZE, ptrs);</div><div class='add'>+</div><div class='add'>+	switch(method) {</div><div class='add'>+	case RECONSTRUCT_WRITE:</div><div class='add'>+		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[pd_idx].flags);</div><div class='add'>+		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[qd_idx].flags);</div><div class='add'>+		set_bit(R5_LOCKED,   &amp;sh-&gt;dev[pd_idx].flags);</div><div class='add'>+		set_bit(R5_LOCKED,   &amp;sh-&gt;dev[qd_idx].flags);</div><div class='add'>+		break;</div><div class='add'>+	case UPDATE_PARITY:</div><div class='add'>+		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[pd_idx].flags);</div><div class='add'>+		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[qd_idx].flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Compute one missing block */</div><div class='add'>+static void compute_block_1(struct stripe_head *sh, int dd_idx, int nozero)</div><div class='add'>+{</div><div class='add'>+	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='add'>+	int i, count, disks = conf-&gt;raid_disks;</div><div class='add'>+	void *ptr[MAX_XOR_BLOCKS], *p;</div><div class='add'>+	int pd_idx = sh-&gt;pd_idx;</div><div class='add'>+	int qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='add'>+</div><div class='add'>+	PRINTK("compute_block_1, stripe %llu, idx %d\n",</div><div class='add'>+		(unsigned long long)sh-&gt;sector, dd_idx);</div><div class='add'>+</div><div class='add'>+	if ( dd_idx == qd_idx ) {</div><div class='add'>+		/* We're actually computing the Q drive */</div><div class='add'>+		compute_parity6(sh, UPDATE_PARITY);</div><div class='add'>+	} else {</div><div class='add'>+		ptr[0] = page_address(sh-&gt;dev[dd_idx].page);</div><div class='add'>+		if (!nozero) memset(ptr[0], 0, STRIPE_SIZE);</div><div class='add'>+		count = 1;</div><div class='add'>+		for (i = disks ; i--; ) {</div><div class='add'>+			if (i == dd_idx || i == qd_idx)</div><div class='add'>+				continue;</div><div class='add'>+			p = page_address(sh-&gt;dev[i].page);</div><div class='add'>+			if (test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+				ptr[count++] = p;</div><div class='add'>+			else</div><div class='add'>+				printk("compute_block() %d, stripe %llu, %d"</div><div class='add'>+				       " not present\n", dd_idx,</div><div class='add'>+				       (unsigned long long)sh-&gt;sector, i);</div><div class='add'>+</div><div class='add'>+			check_xor();</div><div class='add'>+		}</div><div class='add'>+		if (count != 1)</div><div class='add'>+			xor_block(count, STRIPE_SIZE, ptr);</div><div class='add'>+		if (!nozero) set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='add'>+		else clear_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compute two missing blocks */</div><div class='add'>+static void compute_block_2(struct stripe_head *sh, int dd_idx1, int dd_idx2)</div><div class='add'>+{</div><div class='add'>+	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='add'>+	int i, count, disks = conf-&gt;raid_disks;</div><div class='add'>+	int pd_idx = sh-&gt;pd_idx;</div><div class='add'>+	int qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='add'>+	int d0_idx = raid6_next_disk(qd_idx, disks);</div><div class='add'>+	int faila, failb;</div><div class='add'>+</div><div class='add'>+	/* faila and failb are disk numbers relative to d0_idx */</div><div class='add'>+	/* pd_idx become disks-2 and qd_idx become disks-1 */</div><div class='add'>+	faila = (dd_idx1 &lt; d0_idx) ? dd_idx1+(disks-d0_idx) : dd_idx1-d0_idx;</div><div class='add'>+	failb = (dd_idx2 &lt; d0_idx) ? dd_idx2+(disks-d0_idx) : dd_idx2-d0_idx;</div><div class='add'>+</div><div class='add'>+	BUG_ON(faila == failb);</div><div class='add'>+	if ( failb &lt; faila ) { int tmp = faila; faila = failb; failb = tmp; }</div><div class='add'>+</div><div class='add'>+	PRINTK("compute_block_2, stripe %llu, idx %d,%d (%d,%d)\n",</div><div class='add'>+	       (unsigned long long)sh-&gt;sector, dd_idx1, dd_idx2, faila, failb);</div><div class='add'>+</div><div class='add'>+	if ( failb == disks-1 ) {</div><div class='add'>+		/* Q disk is one of the missing disks */</div><div class='add'>+		if ( faila == disks-2 ) {</div><div class='add'>+			/* Missing P+Q, just recompute */</div><div class='add'>+			compute_parity6(sh, UPDATE_PARITY);</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			/* We're missing D+Q; recompute D from P */</div><div class='add'>+			compute_block_1(sh, (dd_idx1 == qd_idx) ? dd_idx2 : dd_idx1, 0);</div><div class='add'>+			compute_parity6(sh, UPDATE_PARITY); /* Is this necessary? */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We're missing D+P or D+D; build pointer table */</div><div class='add'>+	{</div><div class='add'>+		/**** FIX THIS: This could be very bad if disks is close to 256 ****/</div><div class='add'>+		void *ptrs[disks];</div><div class='add'>+</div><div class='add'>+		count = 0;</div><div class='add'>+		i = d0_idx;</div><div class='add'>+		do {</div><div class='add'>+			ptrs[count++] = page_address(sh-&gt;dev[i].page);</div><div class='add'>+			i = raid6_next_disk(i, disks);</div><div class='add'>+			if (i != dd_idx1 &amp;&amp; i != dd_idx2 &amp;&amp;</div><div class='add'>+			    !test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+				printk("compute_2 with missing block %d/%d\n", count, i);</div><div class='add'>+		} while ( i != d0_idx );</div><div class='add'>+</div><div class='add'>+		if ( failb == disks-2 ) {</div><div class='add'>+			/* We're missing D+P. */</div><div class='add'>+			raid6_datap_recov(disks, STRIPE_SIZE, faila, ptrs);</div><div class='add'>+		} else {</div><div class='add'>+			/* We're missing D+D. */</div><div class='add'>+			raid6_2data_recov(disks, STRIPE_SIZE, faila, failb, ptrs);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Both the above update both missing blocks */</div><div class='add'>+		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx1].flags);</div><div class='add'>+		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx2].flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Each stripe/dev can have one or more bion attached.</div><div class='del'>- * toread/towrite point to the first in a chain. </div><div class='add'>+ * toread/towrite point to the first in a chain.</div><div class='ctx'>  * The bi_next chain must be in order.</div><div class='ctx'>  */</div><div class='ctx'> static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, int forwrite)</div><div class='hunk'>@@ -1001,9 +1313,9 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in</div><div class='ctx'> 		(unsigned long long)sh-&gt;sector, dd_idx);</div><div class='ctx'> </div><div class='ctx'> 	if (conf-&gt;mddev-&gt;bitmap &amp;&amp; firstwrite) {</div><div class='del'>-		sh-&gt;bm_seq = conf-&gt;seq_write;</div><div class='ctx'> 		bitmap_startwrite(conf-&gt;mddev-&gt;bitmap, sh-&gt;sector,</div><div class='ctx'> 				  STRIPE_SECTORS, 0);</div><div class='add'>+		sh-&gt;bm_seq = conf-&gt;seq_flush+1;</div><div class='ctx'> 		set_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1031,6 +1343,13 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in</div><div class='ctx'> </div><div class='ctx'> static void end_reshape(raid5_conf_t *conf);</div><div class='ctx'> </div><div class='add'>+static int page_is_zero(struct page *p)</div><div class='add'>+{</div><div class='add'>+	char *a = page_address(p);</div><div class='add'>+	return ((*(u32*)a) == 0 &amp;&amp;</div><div class='add'>+		memcmp(a, a+4, STRIPE_SIZE-4)==0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int stripe_to_pdidx(sector_t stripe, raid5_conf_t *conf, int disks)</div><div class='ctx'> {</div><div class='ctx'> 	int sectors_per_chunk = conf-&gt;chunk_size &gt;&gt; 9;</div><div class='hunk'>@@ -1062,7 +1381,7 @@ static int stripe_to_pdidx(sector_t stripe, raid5_conf_t *conf, int disks)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-static void handle_stripe(struct stripe_head *sh)</div><div class='add'>+static void handle_stripe5(struct stripe_head *sh)</div><div class='ctx'> {</div><div class='ctx'> 	raid5_conf_t *conf = sh-&gt;raid_conf;</div><div class='ctx'> 	int disks = sh-&gt;disks;</div><div class='hunk'>@@ -1394,7 +1713,7 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 		if (locked == 0 &amp;&amp; (rcw == 0 ||rmw == 0) &amp;&amp;</div><div class='ctx'> 		    !test_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state)) {</div><div class='ctx'> 			PRINTK("Computing parity...\n");</div><div class='del'>-			compute_parity(sh, rcw==0 ? RECONSTRUCT_WRITE : READ_MODIFY_WRITE);</div><div class='add'>+			compute_parity5(sh, rcw==0 ? RECONSTRUCT_WRITE : READ_MODIFY_WRITE);</div><div class='ctx'> 			/* now every locked buffer is ready to be written */</div><div class='ctx'> 			for (i=disks; i--;)</div><div class='ctx'> 				if (test_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags)) {</div><div class='hunk'>@@ -1421,13 +1740,10 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 	    !test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='ctx'> 		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='ctx'> 		if (failed == 0) {</div><div class='del'>-			char *pagea;</div><div class='ctx'> 			BUG_ON(uptodate != disks);</div><div class='del'>-			compute_parity(sh, CHECK_PARITY);</div><div class='add'>+			compute_parity5(sh, CHECK_PARITY);</div><div class='ctx'> 			uptodate--;</div><div class='del'>-			pagea = page_address(sh-&gt;dev[sh-&gt;pd_idx].page);</div><div class='del'>-			if ((*(u32*)pagea) == 0 &amp;&amp;</div><div class='del'>-			    !memcmp(pagea, pagea+4, STRIPE_SIZE-4)) {</div><div class='add'>+			if (page_is_zero(sh-&gt;dev[sh-&gt;pd_idx].page)) {</div><div class='ctx'> 				/* parity is correct (on disc, not in buffer any more) */</div><div class='ctx'> 				set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -1487,7 +1803,7 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 		/* Need to write out all blocks after computing parity */</div><div class='ctx'> 		sh-&gt;disks = conf-&gt;raid_disks;</div><div class='ctx'> 		sh-&gt;pd_idx = stripe_to_pdidx(sh-&gt;sector, conf, conf-&gt;raid_disks);</div><div class='del'>-		compute_parity(sh, RECONSTRUCT_WRITE);</div><div class='add'>+		compute_parity5(sh, RECONSTRUCT_WRITE);</div><div class='ctx'> 		for (i= conf-&gt;raid_disks; i--;) {</div><div class='ctx'> 			set_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='ctx'> 			locked++;</div><div class='hunk'>@@ -1615,6 +1931,569 @@ static void handle_stripe(struct stripe_head *sh)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)</div><div class='add'>+{</div><div class='add'>+	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='add'>+	int disks = conf-&gt;raid_disks;</div><div class='add'>+	struct bio *return_bi= NULL;</div><div class='add'>+	struct bio *bi;</div><div class='add'>+	int i;</div><div class='add'>+	int syncing;</div><div class='add'>+	int locked=0, uptodate=0, to_read=0, to_write=0, failed=0, written=0;</div><div class='add'>+	int non_overwrite = 0;</div><div class='add'>+	int failed_num[2] = {0, 0};</div><div class='add'>+	struct r5dev *dev, *pdev, *qdev;</div><div class='add'>+	int pd_idx = sh-&gt;pd_idx;</div><div class='add'>+	int qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='add'>+	int p_failed, q_failed;</div><div class='add'>+</div><div class='add'>+	PRINTK("handling stripe %llu, state=%#lx cnt=%d, pd_idx=%d, qd_idx=%d\n",</div><div class='add'>+	       (unsigned long long)sh-&gt;sector, sh-&gt;state, atomic_read(&amp;sh-&gt;count),</div><div class='add'>+	       pd_idx, qd_idx);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sh-&gt;lock);</div><div class='add'>+	clear_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+	clear_bit(STRIPE_DELAYED, &amp;sh-&gt;state);</div><div class='add'>+</div><div class='add'>+	syncing = test_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='add'>+	/* Now to look around and see what can be done */</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i=disks; i--; ) {</div><div class='add'>+		mdk_rdev_t *rdev;</div><div class='add'>+		dev = &amp;sh-&gt;dev[i];</div><div class='add'>+		clear_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='add'>+</div><div class='add'>+		PRINTK("check %d: state 0x%lx read %p write %p written %p\n",</div><div class='add'>+			i, dev-&gt;flags, dev-&gt;toread, dev-&gt;towrite, dev-&gt;written);</div><div class='add'>+		/* maybe we can reply to a read */</div><div class='add'>+		if (test_bit(R5_UPTODATE, &amp;dev-&gt;flags) &amp;&amp; dev-&gt;toread) {</div><div class='add'>+			struct bio *rbi, *rbi2;</div><div class='add'>+			PRINTK("Return read for disc %d\n", i);</div><div class='add'>+			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+			rbi = dev-&gt;toread;</div><div class='add'>+			dev-&gt;toread = NULL;</div><div class='add'>+			if (test_and_clear_bit(R5_Overlap, &amp;dev-&gt;flags))</div><div class='add'>+				wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='add'>+			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+			while (rbi &amp;&amp; rbi-&gt;bi_sector &lt; dev-&gt;sector + STRIPE_SECTORS) {</div><div class='add'>+				copy_data(0, rbi, dev-&gt;page, dev-&gt;sector);</div><div class='add'>+				rbi2 = r5_next_bio(rbi, dev-&gt;sector);</div><div class='add'>+				spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+				if (--rbi-&gt;bi_phys_segments == 0) {</div><div class='add'>+					rbi-&gt;bi_next = return_bi;</div><div class='add'>+					return_bi = rbi;</div><div class='add'>+				}</div><div class='add'>+				spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+				rbi = rbi2;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* now count some things */</div><div class='add'>+		if (test_bit(R5_LOCKED, &amp;dev-&gt;flags)) locked++;</div><div class='add'>+		if (test_bit(R5_UPTODATE, &amp;dev-&gt;flags)) uptodate++;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;toread) to_read++;</div><div class='add'>+		if (dev-&gt;towrite) {</div><div class='add'>+			to_write++;</div><div class='add'>+			if (!test_bit(R5_OVERWRITE, &amp;dev-&gt;flags))</div><div class='add'>+				non_overwrite++;</div><div class='add'>+		}</div><div class='add'>+		if (dev-&gt;written) written++;</div><div class='add'>+		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='add'>+		if (!rdev || !test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='add'>+			/* The ReadError flag will just be confusing now */</div><div class='add'>+			clear_bit(R5_ReadError, &amp;dev-&gt;flags);</div><div class='add'>+			clear_bit(R5_ReWrite, &amp;dev-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+		if (!rdev || !test_bit(In_sync, &amp;rdev-&gt;flags)</div><div class='add'>+		    || test_bit(R5_ReadError, &amp;dev-&gt;flags)) {</div><div class='add'>+			if ( failed &lt; 2 )</div><div class='add'>+				failed_num[failed] = i;</div><div class='add'>+			failed++;</div><div class='add'>+		} else</div><div class='add'>+			set_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	PRINTK("locked=%d uptodate=%d to_read=%d"</div><div class='add'>+	       " to_write=%d failed=%d failed_num=%d,%d\n",</div><div class='add'>+	       locked, uptodate, to_read, to_write, failed,</div><div class='add'>+	       failed_num[0], failed_num[1]);</div><div class='add'>+	/* check if the array has lost &gt;2 devices and, if so, some requests might</div><div class='add'>+	 * need to be failed</div><div class='add'>+	 */</div><div class='add'>+	if (failed &gt; 2 &amp;&amp; to_read+to_write+written) {</div><div class='add'>+		for (i=disks; i--; ) {</div><div class='add'>+			int bitmap_end = 0;</div><div class='add'>+</div><div class='add'>+			if (test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='add'>+				mdk_rdev_t *rdev;</div><div class='add'>+				rcu_read_lock();</div><div class='add'>+				rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='add'>+				if (rdev &amp;&amp; test_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='add'>+					/* multiple read failures in one stripe */</div><div class='add'>+					md_error(conf-&gt;mddev, rdev);</div><div class='add'>+				rcu_read_unlock();</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+			/* fail all writes first */</div><div class='add'>+			bi = sh-&gt;dev[i].towrite;</div><div class='add'>+			sh-&gt;dev[i].towrite = NULL;</div><div class='add'>+			if (bi) { to_write--; bitmap_end = 1; }</div><div class='add'>+</div><div class='add'>+			if (test_and_clear_bit(R5_Overlap, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+				wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='add'>+</div><div class='add'>+			while (bi &amp;&amp; bi-&gt;bi_sector &lt; sh-&gt;dev[i].sector + STRIPE_SECTORS){</div><div class='add'>+				struct bio *nextbi = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='add'>+				clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='add'>+				if (--bi-&gt;bi_phys_segments == 0) {</div><div class='add'>+					md_write_end(conf-&gt;mddev);</div><div class='add'>+					bi-&gt;bi_next = return_bi;</div><div class='add'>+					return_bi = bi;</div><div class='add'>+				}</div><div class='add'>+				bi = nextbi;</div><div class='add'>+			}</div><div class='add'>+			/* and fail all 'written' */</div><div class='add'>+			bi = sh-&gt;dev[i].written;</div><div class='add'>+			sh-&gt;dev[i].written = NULL;</div><div class='add'>+			if (bi) bitmap_end = 1;</div><div class='add'>+			while (bi &amp;&amp; bi-&gt;bi_sector &lt; sh-&gt;dev[i].sector + STRIPE_SECTORS) {</div><div class='add'>+				struct bio *bi2 = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='add'>+				clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='add'>+				if (--bi-&gt;bi_phys_segments == 0) {</div><div class='add'>+					md_write_end(conf-&gt;mddev);</div><div class='add'>+					bi-&gt;bi_next = return_bi;</div><div class='add'>+					return_bi = bi;</div><div class='add'>+				}</div><div class='add'>+				bi = bi2;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* fail any reads if this device is non-operational */</div><div class='add'>+			if (!test_bit(R5_Insync, &amp;sh-&gt;dev[i].flags) ||</div><div class='add'>+			    test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='add'>+				bi = sh-&gt;dev[i].toread;</div><div class='add'>+				sh-&gt;dev[i].toread = NULL;</div><div class='add'>+				if (test_and_clear_bit(R5_Overlap, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+					wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='add'>+				if (bi) to_read--;</div><div class='add'>+				while (bi &amp;&amp; bi-&gt;bi_sector &lt; sh-&gt;dev[i].sector + STRIPE_SECTORS){</div><div class='add'>+					struct bio *nextbi = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='add'>+					clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='add'>+					if (--bi-&gt;bi_phys_segments == 0) {</div><div class='add'>+						bi-&gt;bi_next = return_bi;</div><div class='add'>+						return_bi = bi;</div><div class='add'>+					}</div><div class='add'>+					bi = nextbi;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+			if (bitmap_end)</div><div class='add'>+				bitmap_endwrite(conf-&gt;mddev-&gt;bitmap, sh-&gt;sector,</div><div class='add'>+						STRIPE_SECTORS, 0, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (failed &gt; 2 &amp;&amp; syncing) {</div><div class='add'>+		md_done_sync(conf-&gt;mddev, STRIPE_SECTORS,0);</div><div class='add'>+		clear_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='add'>+		syncing = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * might be able to return some write requests if the parity blocks</div><div class='add'>+	 * are safe, or on a failed drive</div><div class='add'>+	 */</div><div class='add'>+	pdev = &amp;sh-&gt;dev[pd_idx];</div><div class='add'>+	p_failed = (failed &gt;= 1 &amp;&amp; failed_num[0] == pd_idx)</div><div class='add'>+		|| (failed &gt;= 2 &amp;&amp; failed_num[1] == pd_idx);</div><div class='add'>+	qdev = &amp;sh-&gt;dev[qd_idx];</div><div class='add'>+	q_failed = (failed &gt;= 1 &amp;&amp; failed_num[0] == qd_idx)</div><div class='add'>+		|| (failed &gt;= 2 &amp;&amp; failed_num[1] == qd_idx);</div><div class='add'>+</div><div class='add'>+	if ( written &amp;&amp;</div><div class='add'>+	     ( p_failed || ((test_bit(R5_Insync, &amp;pdev-&gt;flags)</div><div class='add'>+			     &amp;&amp; !test_bit(R5_LOCKED, &amp;pdev-&gt;flags)</div><div class='add'>+			     &amp;&amp; test_bit(R5_UPTODATE, &amp;pdev-&gt;flags))) ) &amp;&amp;</div><div class='add'>+	     ( q_failed || ((test_bit(R5_Insync, &amp;qdev-&gt;flags)</div><div class='add'>+			     &amp;&amp; !test_bit(R5_LOCKED, &amp;qdev-&gt;flags)</div><div class='add'>+			     &amp;&amp; test_bit(R5_UPTODATE, &amp;qdev-&gt;flags))) ) ) {</div><div class='add'>+		/* any written block on an uptodate or failed drive can be</div><div class='add'>+		 * returned.  Note that if we 'wrote' to a failed drive,</div><div class='add'>+		 * it will be UPTODATE, but never LOCKED, so we don't need</div><div class='add'>+		 * to test 'failed' directly.</div><div class='add'>+		 */</div><div class='add'>+		for (i=disks; i--; )</div><div class='add'>+			if (sh-&gt;dev[i].written) {</div><div class='add'>+				dev = &amp;sh-&gt;dev[i];</div><div class='add'>+				if (!test_bit(R5_LOCKED, &amp;dev-&gt;flags) &amp;&amp;</div><div class='add'>+				    test_bit(R5_UPTODATE, &amp;dev-&gt;flags) ) {</div><div class='add'>+					/* We can return any write requests */</div><div class='add'>+					int bitmap_end = 0;</div><div class='add'>+					struct bio *wbi, *wbi2;</div><div class='add'>+					PRINTK("Return write for stripe %llu disc %d\n",</div><div class='add'>+					       (unsigned long long)sh-&gt;sector, i);</div><div class='add'>+					spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+					wbi = dev-&gt;written;</div><div class='add'>+					dev-&gt;written = NULL;</div><div class='add'>+					while (wbi &amp;&amp; wbi-&gt;bi_sector &lt; dev-&gt;sector + STRIPE_SECTORS) {</div><div class='add'>+						wbi2 = r5_next_bio(wbi, dev-&gt;sector);</div><div class='add'>+						if (--wbi-&gt;bi_phys_segments == 0) {</div><div class='add'>+							md_write_end(conf-&gt;mddev);</div><div class='add'>+							wbi-&gt;bi_next = return_bi;</div><div class='add'>+							return_bi = wbi;</div><div class='add'>+						}</div><div class='add'>+						wbi = wbi2;</div><div class='add'>+					}</div><div class='add'>+					if (dev-&gt;towrite == NULL)</div><div class='add'>+						bitmap_end = 1;</div><div class='add'>+					spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+					if (bitmap_end)</div><div class='add'>+						bitmap_endwrite(conf-&gt;mddev-&gt;bitmap, sh-&gt;sector,</div><div class='add'>+								STRIPE_SECTORS,</div><div class='add'>+								!test_bit(STRIPE_DEGRADED, &amp;sh-&gt;state), 0);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we might consider reading some blocks, either to check/generate</div><div class='add'>+	 * parity, or to satisfy requests</div><div class='add'>+	 * or to load a block that is being partially written.</div><div class='add'>+	 */</div><div class='add'>+	if (to_read || non_overwrite || (to_write &amp;&amp; failed) || (syncing &amp;&amp; (uptodate &lt; disks))) {</div><div class='add'>+		for (i=disks; i--;) {</div><div class='add'>+			dev = &amp;sh-&gt;dev[i];</div><div class='add'>+			if (!test_bit(R5_LOCKED, &amp;dev-&gt;flags) &amp;&amp; !test_bit(R5_UPTODATE, &amp;dev-&gt;flags) &amp;&amp;</div><div class='add'>+			    (dev-&gt;toread ||</div><div class='add'>+			     (dev-&gt;towrite &amp;&amp; !test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)) ||</div><div class='add'>+			     syncing ||</div><div class='add'>+			     (failed &gt;= 1 &amp;&amp; (sh-&gt;dev[failed_num[0]].toread || to_write)) ||</div><div class='add'>+			     (failed &gt;= 2 &amp;&amp; (sh-&gt;dev[failed_num[1]].toread || to_write))</div><div class='add'>+				    )</div><div class='add'>+				) {</div><div class='add'>+				/* we would like to get this block, possibly</div><div class='add'>+				 * by computing it, but we might not be able to</div><div class='add'>+				 */</div><div class='add'>+				if (uptodate == disks-1) {</div><div class='add'>+					PRINTK("Computing stripe %llu block %d\n",</div><div class='add'>+					       (unsigned long long)sh-&gt;sector, i);</div><div class='add'>+					compute_block_1(sh, i, 0);</div><div class='add'>+					uptodate++;</div><div class='add'>+				} else if ( uptodate == disks-2 &amp;&amp; failed &gt;= 2 ) {</div><div class='add'>+					/* Computing 2-failure is *very* expensive; only do it if failed &gt;= 2 */</div><div class='add'>+					int other;</div><div class='add'>+					for (other=disks; other--;) {</div><div class='add'>+						if ( other == i )</div><div class='add'>+							continue;</div><div class='add'>+						if ( !test_bit(R5_UPTODATE, &amp;sh-&gt;dev[other].flags) )</div><div class='add'>+							break;</div><div class='add'>+					}</div><div class='add'>+					BUG_ON(other &lt; 0);</div><div class='add'>+					PRINTK("Computing stripe %llu blocks %d,%d\n",</div><div class='add'>+					       (unsigned long long)sh-&gt;sector, i, other);</div><div class='add'>+					compute_block_2(sh, i, other);</div><div class='add'>+					uptodate += 2;</div><div class='add'>+				} else if (test_bit(R5_Insync, &amp;dev-&gt;flags)) {</div><div class='add'>+					set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+					set_bit(R5_Wantread, &amp;dev-&gt;flags);</div><div class='add'>+#if 0</div><div class='add'>+					/* if I am just reading this block and we don't have</div><div class='add'>+					   a failed drive, or any pending writes then sidestep the cache */</div><div class='add'>+					if (sh-&gt;bh_read[i] &amp;&amp; !sh-&gt;bh_read[i]-&gt;b_reqnext &amp;&amp;</div><div class='add'>+					    ! syncing &amp;&amp; !failed &amp;&amp; !to_write) {</div><div class='add'>+						sh-&gt;bh_cache[i]-&gt;b_page =  sh-&gt;bh_read[i]-&gt;b_page;</div><div class='add'>+						sh-&gt;bh_cache[i]-&gt;b_data =  sh-&gt;bh_read[i]-&gt;b_data;</div><div class='add'>+					}</div><div class='add'>+#endif</div><div class='add'>+					locked++;</div><div class='add'>+					PRINTK("Reading block %d (sync=%d)\n",</div><div class='add'>+						i, syncing);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* now to consider writing and what else, if anything should be read */</div><div class='add'>+	if (to_write) {</div><div class='add'>+		int rcw=0, must_compute=0;</div><div class='add'>+		for (i=disks ; i--;) {</div><div class='add'>+			dev = &amp;sh-&gt;dev[i];</div><div class='add'>+			/* Would I have to read this buffer for reconstruct_write */</div><div class='add'>+			if (!test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)</div><div class='add'>+			    &amp;&amp; i != pd_idx &amp;&amp; i != qd_idx</div><div class='add'>+			    &amp;&amp; (!test_bit(R5_LOCKED, &amp;dev-&gt;flags)</div><div class='add'>+#if 0</div><div class='add'>+				|| sh-&gt;bh_page[i] != bh-&gt;b_page</div><div class='add'>+#endif</div><div class='add'>+				    ) &amp;&amp;</div><div class='add'>+			    !test_bit(R5_UPTODATE, &amp;dev-&gt;flags)) {</div><div class='add'>+				if (test_bit(R5_Insync, &amp;dev-&gt;flags)) rcw++;</div><div class='add'>+				else {</div><div class='add'>+					PRINTK("raid6: must_compute: disk %d flags=%#lx\n", i, dev-&gt;flags);</div><div class='add'>+					must_compute++;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		PRINTK("for sector %llu, rcw=%d, must_compute=%d\n",</div><div class='add'>+		       (unsigned long long)sh-&gt;sector, rcw, must_compute);</div><div class='add'>+		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+</div><div class='add'>+		if (rcw &gt; 0)</div><div class='add'>+			/* want reconstruct write, but need to get some data */</div><div class='add'>+			for (i=disks; i--;) {</div><div class='add'>+				dev = &amp;sh-&gt;dev[i];</div><div class='add'>+				if (!test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)</div><div class='add'>+				    &amp;&amp; !(failed == 0 &amp;&amp; (i == pd_idx || i == qd_idx))</div><div class='add'>+				    &amp;&amp; !test_bit(R5_LOCKED, &amp;dev-&gt;flags) &amp;&amp; !test_bit(R5_UPTODATE, &amp;dev-&gt;flags) &amp;&amp;</div><div class='add'>+				    test_bit(R5_Insync, &amp;dev-&gt;flags)) {</div><div class='add'>+					if (test_bit(STRIPE_PREREAD_ACTIVE, &amp;sh-&gt;state))</div><div class='add'>+					{</div><div class='add'>+						PRINTK("Read_old stripe %llu block %d for Reconstruct\n",</div><div class='add'>+						       (unsigned long long)sh-&gt;sector, i);</div><div class='add'>+						set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+						set_bit(R5_Wantread, &amp;dev-&gt;flags);</div><div class='add'>+						locked++;</div><div class='add'>+					} else {</div><div class='add'>+						PRINTK("Request delayed stripe %llu block %d for Reconstruct\n",</div><div class='add'>+						       (unsigned long long)sh-&gt;sector, i);</div><div class='add'>+						set_bit(STRIPE_DELAYED, &amp;sh-&gt;state);</div><div class='add'>+						set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		/* now if nothing is locked, and if we have enough data, we can start a write request */</div><div class='add'>+		if (locked == 0 &amp;&amp; rcw == 0 &amp;&amp;</div><div class='add'>+		    !test_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state)) {</div><div class='add'>+			if ( must_compute &gt; 0 ) {</div><div class='add'>+				/* We have failed blocks and need to compute them */</div><div class='add'>+				switch ( failed ) {</div><div class='add'>+				case 0:	BUG();</div><div class='add'>+				case 1: compute_block_1(sh, failed_num[0], 0); break;</div><div class='add'>+				case 2: compute_block_2(sh, failed_num[0], failed_num[1]); break;</div><div class='add'>+				default: BUG();	/* This request should have been failed? */</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			PRINTK("Computing parity for stripe %llu\n", (unsigned long long)sh-&gt;sector);</div><div class='add'>+			compute_parity6(sh, RECONSTRUCT_WRITE);</div><div class='add'>+			/* now every locked buffer is ready to be written */</div><div class='add'>+			for (i=disks; i--;)</div><div class='add'>+				if (test_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags)) {</div><div class='add'>+					PRINTK("Writing stripe %llu block %d\n",</div><div class='add'>+					       (unsigned long long)sh-&gt;sector, i);</div><div class='add'>+					locked++;</div><div class='add'>+					set_bit(R5_Wantwrite, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+				}</div><div class='add'>+			/* after a RECONSTRUCT_WRITE, the stripe MUST be in-sync */</div><div class='add'>+			set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='add'>+</div><div class='add'>+			if (test_and_clear_bit(STRIPE_PREREAD_ACTIVE, &amp;sh-&gt;state)) {</div><div class='add'>+				atomic_dec(&amp;conf-&gt;preread_active_stripes);</div><div class='add'>+				if (atomic_read(&amp;conf-&gt;preread_active_stripes) &lt; IO_THRESHOLD)</div><div class='add'>+					md_wakeup_thread(conf-&gt;mddev-&gt;thread);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* maybe we need to check and possibly fix the parity for this stripe</div><div class='add'>+	 * Any reads will already have been scheduled, so we just see if enough data</div><div class='add'>+	 * is available</div><div class='add'>+	 */</div><div class='add'>+	if (syncing &amp;&amp; locked == 0 &amp;&amp; !test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='add'>+		int update_p = 0, update_q = 0;</div><div class='add'>+		struct r5dev *dev;</div><div class='add'>+</div><div class='add'>+		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+</div><div class='add'>+		BUG_ON(failed&gt;2);</div><div class='add'>+		BUG_ON(uptodate &lt; disks);</div><div class='add'>+		/* Want to check and possibly repair P and Q.</div><div class='add'>+		 * However there could be one 'failed' device, in which</div><div class='add'>+		 * case we can only check one of them, possibly using the</div><div class='add'>+		 * other to generate missing data</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* If !tmp_page, we cannot do the calculations,</div><div class='add'>+		 * but as we have set STRIPE_HANDLE, we will soon be called</div><div class='add'>+		 * by stripe_handle with a tmp_page - just wait until then.</div><div class='add'>+		 */</div><div class='add'>+		if (tmp_page) {</div><div class='add'>+			if (failed == q_failed) {</div><div class='add'>+				/* The only possible failed device holds 'Q', so it makes</div><div class='add'>+				 * sense to check P (If anything else were failed, we would</div><div class='add'>+				 * have used P to recreate it).</div><div class='add'>+				 */</div><div class='add'>+				compute_block_1(sh, pd_idx, 1);</div><div class='add'>+				if (!page_is_zero(sh-&gt;dev[pd_idx].page)) {</div><div class='add'>+					compute_block_1(sh,pd_idx,0);</div><div class='add'>+					update_p = 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (!q_failed &amp;&amp; failed &lt; 2) {</div><div class='add'>+				/* q is not failed, and we didn't use it to generate</div><div class='add'>+				 * anything, so it makes sense to check it</div><div class='add'>+				 */</div><div class='add'>+				memcpy(page_address(tmp_page),</div><div class='add'>+				       page_address(sh-&gt;dev[qd_idx].page),</div><div class='add'>+				       STRIPE_SIZE);</div><div class='add'>+				compute_parity6(sh, UPDATE_PARITY);</div><div class='add'>+				if (memcmp(page_address(tmp_page),</div><div class='add'>+					   page_address(sh-&gt;dev[qd_idx].page),</div><div class='add'>+					   STRIPE_SIZE)!= 0) {</div><div class='add'>+					clear_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='add'>+					update_q = 1;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (update_p || update_q) {</div><div class='add'>+				conf-&gt;mddev-&gt;resync_mismatches += STRIPE_SECTORS;</div><div class='add'>+				if (test_bit(MD_RECOVERY_CHECK, &amp;conf-&gt;mddev-&gt;recovery))</div><div class='add'>+					/* don't try to repair!! */</div><div class='add'>+					update_p = update_q = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* now write out any block on a failed drive,</div><div class='add'>+			 * or P or Q if they need it</div><div class='add'>+			 */</div><div class='add'>+</div><div class='add'>+			if (failed == 2) {</div><div class='add'>+				dev = &amp;sh-&gt;dev[failed_num[1]];</div><div class='add'>+				locked++;</div><div class='add'>+				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+			if (failed &gt;= 1) {</div><div class='add'>+				dev = &amp;sh-&gt;dev[failed_num[0]];</div><div class='add'>+				locked++;</div><div class='add'>+				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (update_p) {</div><div class='add'>+				dev = &amp;sh-&gt;dev[pd_idx];</div><div class='add'>+				locked ++;</div><div class='add'>+				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+			if (update_q) {</div><div class='add'>+				dev = &amp;sh-&gt;dev[qd_idx];</div><div class='add'>+				locked++;</div><div class='add'>+				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='add'>+			}</div><div class='add'>+			clear_bit(STRIPE_DEGRADED, &amp;sh-&gt;state);</div><div class='add'>+</div><div class='add'>+			set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (syncing &amp;&amp; locked == 0 &amp;&amp; test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='add'>+		md_done_sync(conf-&gt;mddev, STRIPE_SECTORS,1);</div><div class='add'>+		clear_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the failed drives are just a ReadError, then we might need</div><div class='add'>+	 * to progress the repair/check process</div><div class='add'>+	 */</div><div class='add'>+	if (failed &lt;= 2 &amp;&amp; ! conf-&gt;mddev-&gt;ro)</div><div class='add'>+		for (i=0; i&lt;failed;i++) {</div><div class='add'>+			dev = &amp;sh-&gt;dev[failed_num[i]];</div><div class='add'>+			if (test_bit(R5_ReadError, &amp;dev-&gt;flags)</div><div class='add'>+			    &amp;&amp; !test_bit(R5_LOCKED, &amp;dev-&gt;flags)</div><div class='add'>+			    &amp;&amp; test_bit(R5_UPTODATE, &amp;dev-&gt;flags)</div><div class='add'>+				) {</div><div class='add'>+				if (!test_bit(R5_ReWrite, &amp;dev-&gt;flags)) {</div><div class='add'>+					set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='add'>+					set_bit(R5_ReWrite, &amp;dev-&gt;flags);</div><div class='add'>+					set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+				} else {</div><div class='add'>+					/* let's read it back */</div><div class='add'>+					set_bit(R5_Wantread, &amp;dev-&gt;flags);</div><div class='add'>+					set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	spin_unlock(&amp;sh-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while ((bi=return_bi)) {</div><div class='add'>+		int bytes = bi-&gt;bi_size;</div><div class='add'>+</div><div class='add'>+		return_bi = bi-&gt;bi_next;</div><div class='add'>+		bi-&gt;bi_next = NULL;</div><div class='add'>+		bi-&gt;bi_size = 0;</div><div class='add'>+		bi-&gt;bi_end_io(bi, bytes, 0);</div><div class='add'>+	}</div><div class='add'>+	for (i=disks; i-- ;) {</div><div class='add'>+		int rw;</div><div class='add'>+		struct bio *bi;</div><div class='add'>+		mdk_rdev_t *rdev;</div><div class='add'>+		if (test_and_clear_bit(R5_Wantwrite, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+			rw = 1;</div><div class='add'>+		else if (test_and_clear_bit(R5_Wantread, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+			rw = 0;</div><div class='add'>+		else</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bi = &amp;sh-&gt;dev[i].req;</div><div class='add'>+</div><div class='add'>+		bi-&gt;bi_rw = rw;</div><div class='add'>+		if (rw)</div><div class='add'>+			bi-&gt;bi_end_io = raid5_end_write_request;</div><div class='add'>+		else</div><div class='add'>+			bi-&gt;bi_end_io = raid5_end_read_request;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='add'>+		if (rdev &amp;&amp; test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='add'>+			rdev = NULL;</div><div class='add'>+		if (rdev)</div><div class='add'>+			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (rdev) {</div><div class='add'>+			if (syncing)</div><div class='add'>+				md_sync_acct(rdev-&gt;bdev, STRIPE_SECTORS);</div><div class='add'>+</div><div class='add'>+			bi-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='add'>+			PRINTK("for %llu schedule op %ld on disc %d\n",</div><div class='add'>+				(unsigned long long)sh-&gt;sector, bi-&gt;bi_rw, i);</div><div class='add'>+			atomic_inc(&amp;sh-&gt;count);</div><div class='add'>+			bi-&gt;bi_sector = sh-&gt;sector + rdev-&gt;data_offset;</div><div class='add'>+			bi-&gt;bi_flags = 1 &lt;&lt; BIO_UPTODATE;</div><div class='add'>+			bi-&gt;bi_vcnt = 1;</div><div class='add'>+			bi-&gt;bi_max_vecs = 1;</div><div class='add'>+			bi-&gt;bi_idx = 0;</div><div class='add'>+			bi-&gt;bi_io_vec = &amp;sh-&gt;dev[i].vec;</div><div class='add'>+			bi-&gt;bi_io_vec[0].bv_len = STRIPE_SIZE;</div><div class='add'>+			bi-&gt;bi_io_vec[0].bv_offset = 0;</div><div class='add'>+			bi-&gt;bi_size = STRIPE_SIZE;</div><div class='add'>+			bi-&gt;bi_next = NULL;</div><div class='add'>+			if (rw == WRITE &amp;&amp;</div><div class='add'>+			    test_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags))</div><div class='add'>+				atomic_add(STRIPE_SECTORS, &amp;rdev-&gt;corrected_errors);</div><div class='add'>+			generic_make_request(bi);</div><div class='add'>+		} else {</div><div class='add'>+			if (rw == 1)</div><div class='add'>+				set_bit(STRIPE_DEGRADED, &amp;sh-&gt;state);</div><div class='add'>+			PRINTK("skip op %ld on disc %d for sector %llu\n",</div><div class='add'>+				bi-&gt;bi_rw, i, (unsigned long long)sh-&gt;sector);</div><div class='add'>+			clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='add'>+			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_stripe(struct stripe_head *sh, struct page *tmp_page)</div><div class='add'>+{</div><div class='add'>+	if (sh-&gt;raid_conf-&gt;level == 6)</div><div class='add'>+		handle_stripe6(sh, tmp_page);</div><div class='add'>+	else</div><div class='add'>+		handle_stripe5(sh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void raid5_activate_delayed(raid5_conf_t *conf)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_read(&amp;conf-&gt;preread_active_stripes) &lt; IO_THRESHOLD) {</div><div class='hunk'>@@ -1718,13 +2597,6 @@ static int raid5_issue_flush(request_queue_t *q, struct gendisk *disk,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void raid5_plug_device(raid5_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	blk_plug_device(conf-&gt;mddev-&gt;queue);</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int make_request(request_queue_t *q, struct bio * bi)</div><div class='ctx'> {</div><div class='ctx'> 	mddev_t *mddev = q-&gt;queuedata;</div><div class='hunk'>@@ -1753,7 +2625,7 @@ static int make_request(request_queue_t *q, struct bio * bi)</div><div class='ctx'> </div><div class='ctx'> 	for (;logical_sector &lt; last_sector; logical_sector += STRIPE_SECTORS) {</div><div class='ctx'> 		DEFINE_WAIT(w);</div><div class='del'>-		int disks;</div><div class='add'>+		int disks, data_disks;</div><div class='ctx'> </div><div class='ctx'> 	retry:</div><div class='ctx'> 		prepare_to_wait(&amp;conf-&gt;wait_for_overlap, &amp;w, TASK_UNINTERRUPTIBLE);</div><div class='hunk'>@@ -1781,7 +2653,9 @@ static int make_request(request_queue_t *q, struct bio * bi)</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 		}</div><div class='del'>- 		new_sector = raid5_compute_sector(logical_sector, disks, disks - 1,</div><div class='add'>+		data_disks = disks - conf-&gt;max_degraded;</div><div class='add'>+</div><div class='add'>+ 		new_sector = raid5_compute_sector(logical_sector, disks, data_disks,</div><div class='ctx'> 						  &amp;dd_idx, &amp;pd_idx, conf);</div><div class='ctx'> 		PRINTK("raid5: make_request, sector %llu logical %llu\n",</div><div class='ctx'> 			(unsigned long long)new_sector, </div><div class='hunk'>@@ -1832,8 +2706,7 @@ static int make_request(request_queue_t *q, struct bio * bi)</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 			finish_wait(&amp;conf-&gt;wait_for_overlap, &amp;w);</div><div class='del'>-			raid5_plug_device(conf);</div><div class='del'>-			handle_stripe(sh);</div><div class='add'>+			handle_stripe(sh, NULL);</div><div class='ctx'> 			release_stripe(sh);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* cannot get stripe for read-ahead, just give-up */</div><div class='hunk'>@@ -1849,7 +2722,7 @@ static int make_request(request_queue_t *q, struct bio * bi)</div><div class='ctx'> 	if (remaining == 0) {</div><div class='ctx'> 		int bytes = bi-&gt;bi_size;</div><div class='ctx'> </div><div class='del'>-		if ( bio_data_dir(bi) == WRITE )</div><div class='add'>+		if ( rw == WRITE )</div><div class='ctx'> 			md_write_end(mddev);</div><div class='ctx'> 		bi-&gt;bi_size = 0;</div><div class='ctx'> 		bi-&gt;bi_end_io(bi, bytes, 0);</div><div class='hunk'>@@ -1857,17 +2730,141 @@ static int make_request(request_queue_t *q, struct bio * bi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* FIXME go_faster isn't used */</div><div class='del'>-static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)</div><div class='add'>+static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped)</div><div class='ctx'> {</div><div class='add'>+	/* reshaping is quite different to recovery/resync so it is</div><div class='add'>+	 * handled quite separately ... here.</div><div class='add'>+	 *</div><div class='add'>+	 * On each call to sync_request, we gather one chunk worth of</div><div class='add'>+	 * destination stripes and flag them as expanding.</div><div class='add'>+	 * Then we find all the source stripes and request reads.</div><div class='add'>+	 * As the reads complete, handle_stripe will copy the data</div><div class='add'>+	 * into the destination stripe and release that stripe.</div><div class='add'>+	 */</div><div class='ctx'> 	raid5_conf_t *conf = (raid5_conf_t *) mddev-&gt;private;</div><div class='ctx'> 	struct stripe_head *sh;</div><div class='ctx'> 	int pd_idx;</div><div class='ctx'> 	sector_t first_sector, last_sector;</div><div class='add'>+	int raid_disks;</div><div class='add'>+	int data_disks;</div><div class='add'>+	int i;</div><div class='add'>+	int dd_idx;</div><div class='add'>+	sector_t writepos, safepos, gap;</div><div class='add'>+</div><div class='add'>+	if (sector_nr == 0 &amp;&amp;</div><div class='add'>+	    conf-&gt;expand_progress != 0) {</div><div class='add'>+		/* restarting in the middle, skip the initial sectors */</div><div class='add'>+		sector_nr = conf-&gt;expand_progress;</div><div class='add'>+		sector_div(sector_nr, conf-&gt;raid_disks-1);</div><div class='add'>+		*skipped = 1;</div><div class='add'>+		return sector_nr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we update the metadata when there is more than 3Meg</div><div class='add'>+	 * in the block range (that is rather arbitrary, should</div><div class='add'>+	 * probably be time based) or when the data about to be</div><div class='add'>+	 * copied would over-write the source of the data at</div><div class='add'>+	 * the front of the range.</div><div class='add'>+	 * i.e. one new_stripe forward from expand_progress new_maps</div><div class='add'>+	 * to after where expand_lo old_maps to</div><div class='add'>+	 */</div><div class='add'>+	writepos = conf-&gt;expand_progress +</div><div class='add'>+		conf-&gt;chunk_size/512*(conf-&gt;raid_disks-1);</div><div class='add'>+	sector_div(writepos, conf-&gt;raid_disks-1);</div><div class='add'>+	safepos = conf-&gt;expand_lo;</div><div class='add'>+	sector_div(safepos, conf-&gt;previous_raid_disks-1);</div><div class='add'>+	gap = conf-&gt;expand_progress - conf-&gt;expand_lo;</div><div class='add'>+</div><div class='add'>+	if (writepos &gt;= safepos ||</div><div class='add'>+	    gap &gt; (conf-&gt;raid_disks-1)*3000*2 /*3Meg*/) {</div><div class='add'>+		/* Cannot proceed until we've updated the superblock... */</div><div class='add'>+		wait_event(conf-&gt;wait_for_overlap,</div><div class='add'>+			   atomic_read(&amp;conf-&gt;reshape_stripes)==0);</div><div class='add'>+		mddev-&gt;reshape_position = conf-&gt;expand_progress;</div><div class='add'>+		mddev-&gt;sb_dirty = 1;</div><div class='add'>+		md_wakeup_thread(mddev-&gt;thread);</div><div class='add'>+		wait_event(mddev-&gt;sb_wait, mddev-&gt;sb_dirty == 0 ||</div><div class='add'>+			   kthread_should_stop());</div><div class='add'>+		spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+		conf-&gt;expand_lo = mddev-&gt;reshape_position;</div><div class='add'>+		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+		wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; conf-&gt;chunk_size/512; i+= STRIPE_SECTORS) {</div><div class='add'>+		int j;</div><div class='add'>+		int skipped = 0;</div><div class='add'>+		pd_idx = stripe_to_pdidx(sector_nr+i, conf, conf-&gt;raid_disks);</div><div class='add'>+		sh = get_active_stripe(conf, sector_nr+i,</div><div class='add'>+				       conf-&gt;raid_disks, pd_idx, 0);</div><div class='add'>+		set_bit(STRIPE_EXPANDING, &amp;sh-&gt;state);</div><div class='add'>+		atomic_inc(&amp;conf-&gt;reshape_stripes);</div><div class='add'>+		/* If any of this stripe is beyond the end of the old</div><div class='add'>+		 * array, then we need to zero those blocks</div><div class='add'>+		 */</div><div class='add'>+		for (j=sh-&gt;disks; j--;) {</div><div class='add'>+			sector_t s;</div><div class='add'>+			if (j == sh-&gt;pd_idx)</div><div class='add'>+				continue;</div><div class='add'>+			s = compute_blocknr(sh, j);</div><div class='add'>+			if (s &lt; (mddev-&gt;array_size&lt;&lt;1)) {</div><div class='add'>+				skipped = 1;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			memset(page_address(sh-&gt;dev[j].page), 0, STRIPE_SIZE);</div><div class='add'>+			set_bit(R5_Expanded, &amp;sh-&gt;dev[j].flags);</div><div class='add'>+			set_bit(R5_UPTODATE, &amp;sh-&gt;dev[j].flags);</div><div class='add'>+		}</div><div class='add'>+		if (!skipped) {</div><div class='add'>+			set_bit(STRIPE_EXPAND_READY, &amp;sh-&gt;state);</div><div class='add'>+			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+		}</div><div class='add'>+		release_stripe(sh);</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+	conf-&gt;expand_progress = (sector_nr + i)*(conf-&gt;raid_disks-1);</div><div class='add'>+	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='add'>+	/* Ok, those stripe are ready. We can start scheduling</div><div class='add'>+	 * reads on the source stripes.</div><div class='add'>+	 * The source stripes are determined by mapping the first and last</div><div class='add'>+	 * block on the destination stripes.</div><div class='add'>+	 */</div><div class='add'>+	raid_disks = conf-&gt;previous_raid_disks;</div><div class='add'>+	data_disks = raid_disks - 1;</div><div class='add'>+	first_sector =</div><div class='add'>+		raid5_compute_sector(sector_nr*(conf-&gt;raid_disks-1),</div><div class='add'>+				     raid_disks, data_disks,</div><div class='add'>+				     &amp;dd_idx, &amp;pd_idx, conf);</div><div class='add'>+	last_sector =</div><div class='add'>+		raid5_compute_sector((sector_nr+conf-&gt;chunk_size/512)</div><div class='add'>+				     *(conf-&gt;raid_disks-1) -1,</div><div class='add'>+				     raid_disks, data_disks,</div><div class='add'>+				     &amp;dd_idx, &amp;pd_idx, conf);</div><div class='add'>+	if (last_sector &gt;= (mddev-&gt;size&lt;&lt;1))</div><div class='add'>+		last_sector = (mddev-&gt;size&lt;&lt;1)-1;</div><div class='add'>+	while (first_sector &lt;= last_sector) {</div><div class='add'>+		pd_idx = stripe_to_pdidx(first_sector, conf, conf-&gt;previous_raid_disks);</div><div class='add'>+		sh = get_active_stripe(conf, first_sector,</div><div class='add'>+				       conf-&gt;previous_raid_disks, pd_idx, 0);</div><div class='add'>+		set_bit(STRIPE_EXPAND_SOURCE, &amp;sh-&gt;state);</div><div class='add'>+		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='add'>+		release_stripe(sh);</div><div class='add'>+		first_sector += STRIPE_SECTORS;</div><div class='add'>+	}</div><div class='add'>+	return conf-&gt;chunk_size&gt;&gt;9;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME go_faster isn't used */</div><div class='add'>+static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)</div><div class='add'>+{</div><div class='add'>+	raid5_conf_t *conf = (raid5_conf_t *) mddev-&gt;private;</div><div class='add'>+	struct stripe_head *sh;</div><div class='add'>+	int pd_idx;</div><div class='ctx'> 	int raid_disks = conf-&gt;raid_disks;</div><div class='del'>-	int data_disks = raid_disks-1;</div><div class='ctx'> 	sector_t max_sector = mddev-&gt;size &lt;&lt; 1;</div><div class='ctx'> 	int sync_blocks;</div><div class='add'>+	int still_degraded = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (sector_nr &gt;= max_sector) {</div><div class='ctx'> 		/* just being told to finish up .. nothing much to do */</div><div class='hunk'>@@ -1880,134 +2877,22 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i</div><div class='ctx'> 		if (mddev-&gt;curr_resync &lt; max_sector) /* aborted */</div><div class='ctx'> 			bitmap_end_sync(mddev-&gt;bitmap, mddev-&gt;curr_resync,</div><div class='ctx'> 					&amp;sync_blocks, 1);</div><div class='del'>-		else /* compelted sync */</div><div class='add'>+		else /* completed sync */</div><div class='ctx'> 			conf-&gt;fullsync = 0;</div><div class='ctx'> 		bitmap_close_sync(mddev-&gt;bitmap);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (test_bit(MD_RECOVERY_RESHAPE, &amp;mddev-&gt;recovery)) {</div><div class='del'>-		/* reshaping is quite different to recovery/resync so it is</div><div class='del'>-		 * handled quite separately ... here.</div><div class='del'>-		 *</div><div class='del'>-		 * On each call to sync_request, we gather one chunk worth of</div><div class='del'>-		 * destination stripes and flag them as expanding.</div><div class='del'>-		 * Then we find all the source stripes and request reads.</div><div class='del'>-		 * As the reads complete, handle_stripe will copy the data</div><div class='del'>-		 * into the destination stripe and release that stripe.</div><div class='del'>-		 */</div><div class='del'>-		int i;</div><div class='del'>-		int dd_idx;</div><div class='del'>-		sector_t writepos, safepos, gap;</div><div class='del'>-</div><div class='del'>-		if (sector_nr == 0 &amp;&amp;</div><div class='del'>-		    conf-&gt;expand_progress != 0) {</div><div class='del'>-			/* restarting in the middle, skip the initial sectors */</div><div class='del'>-			sector_nr = conf-&gt;expand_progress;</div><div class='del'>-			sector_div(sector_nr, conf-&gt;raid_disks-1);</div><div class='del'>-			*skipped = 1;</div><div class='del'>-			return sector_nr;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we update the metadata when there is more than 3Meg</div><div class='del'>-		 * in the block range (that is rather arbitrary, should</div><div class='del'>-		 * probably be time based) or when the data about to be</div><div class='del'>-		 * copied would over-write the source of the data at</div><div class='del'>-		 * the front of the range.</div><div class='del'>-		 * i.e. one new_stripe forward from expand_progress new_maps</div><div class='del'>-		 * to after where expand_lo old_maps to</div><div class='del'>-		 */</div><div class='del'>-		writepos = conf-&gt;expand_progress +</div><div class='del'>-			conf-&gt;chunk_size/512*(conf-&gt;raid_disks-1);</div><div class='del'>-		sector_div(writepos, conf-&gt;raid_disks-1);</div><div class='del'>-		safepos = conf-&gt;expand_lo;</div><div class='del'>-		sector_div(safepos, conf-&gt;previous_raid_disks-1);</div><div class='del'>-		gap = conf-&gt;expand_progress - conf-&gt;expand_lo;</div><div class='del'>-</div><div class='del'>-		if (writepos &gt;= safepos ||</div><div class='del'>-		    gap &gt; (conf-&gt;raid_disks-1)*3000*2 /*3Meg*/) {</div><div class='del'>-			/* Cannot proceed until we've updated the superblock... */</div><div class='del'>-			wait_event(conf-&gt;wait_for_overlap,</div><div class='del'>-				   atomic_read(&amp;conf-&gt;reshape_stripes)==0);</div><div class='del'>-			mddev-&gt;reshape_position = conf-&gt;expand_progress;</div><div class='del'>-			mddev-&gt;sb_dirty = 1;</div><div class='del'>-			md_wakeup_thread(mddev-&gt;thread);</div><div class='del'>-			wait_event(mddev-&gt;sb_wait, mddev-&gt;sb_dirty == 0 ||</div><div class='del'>-				   kthread_should_stop());</div><div class='del'>-			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			conf-&gt;expand_lo = mddev-&gt;reshape_position;</div><div class='del'>-			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i=0; i &lt; conf-&gt;chunk_size/512; i+= STRIPE_SECTORS) {</div><div class='del'>-			int j;</div><div class='del'>-			int skipped = 0;</div><div class='del'>-			pd_idx = stripe_to_pdidx(sector_nr+i, conf, conf-&gt;raid_disks);</div><div class='del'>-			sh = get_active_stripe(conf, sector_nr+i,</div><div class='del'>-					       conf-&gt;raid_disks, pd_idx, 0);</div><div class='del'>-			set_bit(STRIPE_EXPANDING, &amp;sh-&gt;state);</div><div class='del'>-			atomic_inc(&amp;conf-&gt;reshape_stripes);</div><div class='del'>-			/* If any of this stripe is beyond the end of the old</div><div class='del'>-			 * array, then we need to zero those blocks</div><div class='del'>-			 */</div><div class='del'>-			for (j=sh-&gt;disks; j--;) {</div><div class='del'>-				sector_t s;</div><div class='del'>-				if (j == sh-&gt;pd_idx)</div><div class='del'>-					continue;</div><div class='del'>-				s = compute_blocknr(sh, j);</div><div class='del'>-				if (s &lt; (mddev-&gt;array_size&lt;&lt;1)) {</div><div class='del'>-					skipped = 1;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				memset(page_address(sh-&gt;dev[j].page), 0, STRIPE_SIZE);</div><div class='del'>-				set_bit(R5_Expanded, &amp;sh-&gt;dev[j].flags);</div><div class='del'>-				set_bit(R5_UPTODATE, &amp;sh-&gt;dev[j].flags);</div><div class='del'>-			}</div><div class='del'>-			if (!skipped) {</div><div class='del'>-				set_bit(STRIPE_EXPAND_READY, &amp;sh-&gt;state);</div><div class='del'>-				set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-			}</div><div class='del'>-			release_stripe(sh);</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-		conf-&gt;expand_progress = (sector_nr + i)*(conf-&gt;raid_disks-1);</div><div class='del'>-		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-		/* Ok, those stripe are ready. We can start scheduling</div><div class='del'>-		 * reads on the source stripes.</div><div class='del'>-		 * The source stripes are determined by mapping the first and last</div><div class='del'>-		 * block on the destination stripes.</div><div class='del'>-		 */</div><div class='del'>-		raid_disks = conf-&gt;previous_raid_disks;</div><div class='del'>-		data_disks = raid_disks - 1;</div><div class='del'>-		first_sector =</div><div class='del'>-			raid5_compute_sector(sector_nr*(conf-&gt;raid_disks-1),</div><div class='del'>-					     raid_disks, data_disks,</div><div class='del'>-					     &amp;dd_idx, &amp;pd_idx, conf);</div><div class='del'>-		last_sector =</div><div class='del'>-			raid5_compute_sector((sector_nr+conf-&gt;chunk_size/512)</div><div class='del'>-					       *(conf-&gt;raid_disks-1) -1,</div><div class='del'>-					     raid_disks, data_disks,</div><div class='del'>-					     &amp;dd_idx, &amp;pd_idx, conf);</div><div class='del'>-		if (last_sector &gt;= (mddev-&gt;size&lt;&lt;1))</div><div class='del'>-			last_sector = (mddev-&gt;size&lt;&lt;1)-1;</div><div class='del'>-		while (first_sector &lt;= last_sector) {</div><div class='del'>-			pd_idx = stripe_to_pdidx(first_sector, conf, conf-&gt;previous_raid_disks);</div><div class='del'>-			sh = get_active_stripe(conf, first_sector,</div><div class='del'>-					       conf-&gt;previous_raid_disks, pd_idx, 0);</div><div class='del'>-			set_bit(STRIPE_EXPAND_SOURCE, &amp;sh-&gt;state);</div><div class='del'>-			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-			release_stripe(sh);</div><div class='del'>-			first_sector += STRIPE_SECTORS;</div><div class='del'>-		}</div><div class='del'>-		return conf-&gt;chunk_size&gt;&gt;9;</div><div class='del'>-	}</div><div class='del'>-	/* if there is 1 or more failed drives and we are trying</div><div class='add'>+	if (test_bit(MD_RECOVERY_RESHAPE, &amp;mddev-&gt;recovery))</div><div class='add'>+		return reshape_request(mddev, sector_nr, skipped);</div><div class='add'>+</div><div class='add'>+	/* if there is too many failed drives and we are trying</div><div class='ctx'> 	 * to resync, then assert that we are finished, because there is</div><div class='ctx'> 	 * nothing we can do.</div><div class='ctx'> 	 */</div><div class='del'>-	if (mddev-&gt;degraded &gt;= 1 &amp;&amp; test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery)) {</div><div class='add'>+	if (mddev-&gt;degraded &gt;= conf-&gt;max_degraded &amp;&amp;</div><div class='add'>+	    test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery)) {</div><div class='ctx'> 		sector_t rv = (mddev-&gt;size &lt;&lt; 1) - sector_nr;</div><div class='ctx'> 		*skipped = 1;</div><div class='ctx'> 		return rv;</div><div class='hunk'>@@ -2026,17 +2911,26 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i</div><div class='ctx'> 	if (sh == NULL) {</div><div class='ctx'> 		sh = get_active_stripe(conf, sector_nr, raid_disks, pd_idx, 0);</div><div class='ctx'> 		/* make sure we don't swamp the stripe cache if someone else</div><div class='del'>-		 * is trying to get access </div><div class='add'>+		 * is trying to get access</div><div class='ctx'> 		 */</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	}</div><div class='del'>-	bitmap_start_sync(mddev-&gt;bitmap, sector_nr, &amp;sync_blocks, 0);</div><div class='del'>-	spin_lock(&amp;sh-&gt;lock);	</div><div class='add'>+	/* Need to check if array will still be degraded after recovery/resync</div><div class='add'>+	 * We don't need to check the 'failed' flag as when that gets set,</div><div class='add'>+	 * recovery aborts.</div><div class='add'>+	 */</div><div class='add'>+	for (i=0; i&lt;mddev-&gt;raid_disks; i++)</div><div class='add'>+		if (conf-&gt;disks[i].rdev == NULL)</div><div class='add'>+			still_degraded = 1;</div><div class='add'>+</div><div class='add'>+	bitmap_start_sync(mddev-&gt;bitmap, sector_nr, &amp;sync_blocks, still_degraded);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sh-&gt;lock);</div><div class='ctx'> 	set_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='ctx'> 	clear_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='ctx'> 	spin_unlock(&amp;sh-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	handle_stripe(sh);</div><div class='add'>+	handle_stripe(sh, NULL);</div><div class='ctx'> 	release_stripe(sh);</div><div class='ctx'> </div><div class='ctx'> 	return STRIPE_SECTORS;</div><div class='hunk'>@@ -2064,7 +2958,7 @@ static void raid5d (mddev_t *mddev)</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct list_head *first;</div><div class='ctx'> </div><div class='del'>-		if (conf-&gt;seq_flush - conf-&gt;seq_write &gt; 0) {</div><div class='add'>+		if (conf-&gt;seq_flush != conf-&gt;seq_write) {</div><div class='ctx'> 			int seq = conf-&gt;seq_flush;</div><div class='ctx'> 			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 			bitmap_unplug(mddev-&gt;bitmap);</div><div class='hunk'>@@ -2091,7 +2985,7 @@ static void raid5d (mddev_t *mddev)</div><div class='ctx'> 		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 		</div><div class='ctx'> 		handled++;</div><div class='del'>-		handle_stripe(sh);</div><div class='add'>+		handle_stripe(sh, conf-&gt;spare_page);</div><div class='ctx'> 		release_stripe(sh);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='hunk'>@@ -2181,8 +3075,8 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	struct disk_info *disk;</div><div class='ctx'> 	struct list_head *tmp;</div><div class='ctx'> </div><div class='del'>-	if (mddev-&gt;level != 5 &amp;&amp; mddev-&gt;level != 4) {</div><div class='del'>-		printk(KERN_ERR "raid5: %s: raid level not set to 4/5 (%d)\n",</div><div class='add'>+	if (mddev-&gt;level != 5 &amp;&amp; mddev-&gt;level != 4 &amp;&amp; mddev-&gt;level != 6) {</div><div class='add'>+		printk(KERN_ERR "raid5: %s: raid level not set to 4/5/6 (%d)\n",</div><div class='ctx'> 		       mdname(mddev), mddev-&gt;level);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2251,6 +3145,11 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	if ((conf-&gt;stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL)) == NULL)</div><div class='ctx'> 		goto abort;</div><div class='ctx'> </div><div class='add'>+	if (mddev-&gt;level == 6) {</div><div class='add'>+		conf-&gt;spare_page = alloc_page(GFP_KERNEL);</div><div class='add'>+		if (!conf-&gt;spare_page)</div><div class='add'>+			goto abort;</div><div class='add'>+	}</div><div class='ctx'> 	spin_lock_init(&amp;conf-&gt;device_lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;conf-&gt;wait_for_stripe);</div><div class='ctx'> 	init_waitqueue_head(&amp;conf-&gt;wait_for_overlap);</div><div class='hunk'>@@ -2282,12 +3181,16 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * 0 for a fully functional array, 1 for a degraded array.</div><div class='add'>+	 * 0 for a fully functional array, 1 or 2 for a degraded array.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mddev-&gt;degraded = conf-&gt;failed_disks = conf-&gt;raid_disks - conf-&gt;working_disks;</div><div class='ctx'> 	conf-&gt;mddev = mddev;</div><div class='ctx'> 	conf-&gt;chunk_size = mddev-&gt;chunk_size;</div><div class='ctx'> 	conf-&gt;level = mddev-&gt;level;</div><div class='add'>+	if (conf-&gt;level == 6)</div><div class='add'>+		conf-&gt;max_degraded = 2;</div><div class='add'>+	else</div><div class='add'>+		conf-&gt;max_degraded = 1;</div><div class='ctx'> 	conf-&gt;algorithm = mddev-&gt;layout;</div><div class='ctx'> 	conf-&gt;max_nr_stripes = NR_STRIPES;</div><div class='ctx'> 	conf-&gt;expand_progress = mddev-&gt;reshape_position;</div><div class='hunk'>@@ -2296,6 +3199,11 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 	mddev-&gt;size &amp;= ~(mddev-&gt;chunk_size/1024 -1);</div><div class='ctx'> 	mddev-&gt;resync_max_sectors = mddev-&gt;size &lt;&lt; 1;</div><div class='ctx'> </div><div class='add'>+	if (conf-&gt;level == 6 &amp;&amp; conf-&gt;raid_disks &lt; 4) {</div><div class='add'>+		printk(KERN_ERR "raid6: not enough configured devices for %s (%d, minimum 4)\n",</div><div class='add'>+		       mdname(mddev), conf-&gt;raid_disks);</div><div class='add'>+		goto abort;</div><div class='add'>+	}</div><div class='ctx'> 	if (!conf-&gt;chunk_size || conf-&gt;chunk_size % 4) {</div><div class='ctx'> 		printk(KERN_ERR "raid5: invalid chunk size %d for %s\n",</div><div class='ctx'> 			conf-&gt;chunk_size, mdname(mddev));</div><div class='hunk'>@@ -2307,14 +3215,14 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 			conf-&gt;algorithm, mdname(mddev));</div><div class='ctx'> 		goto abort;</div><div class='ctx'> 	}</div><div class='del'>-	if (mddev-&gt;degraded &gt; 1) {</div><div class='add'>+	if (mddev-&gt;degraded &gt; conf-&gt;max_degraded) {</div><div class='ctx'> 		printk(KERN_ERR "raid5: not enough operational devices for %s"</div><div class='ctx'> 			" (%d/%d failed)\n",</div><div class='ctx'> 			mdname(mddev), conf-&gt;failed_disks, conf-&gt;raid_disks);</div><div class='ctx'> 		goto abort;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mddev-&gt;degraded == 1 &amp;&amp;</div><div class='add'>+	if (mddev-&gt;degraded &gt; 0 &amp;&amp;</div><div class='ctx'> 	    mddev-&gt;recovery_cp != MaxSector) {</div><div class='ctx'> 		if (mddev-&gt;ok_start_degraded)</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='hunk'>@@ -2373,17 +3281,15 @@ static int run(mddev_t *mddev)</div><div class='ctx'> 		set_bit(MD_RECOVERY_RUNNING, &amp;mddev-&gt;recovery);</div><div class='ctx'> 		mddev-&gt;sync_thread = md_register_thread(md_do_sync, mddev,</div><div class='ctx'> 							"%s_reshape");</div><div class='del'>-		/* FIXME if md_register_thread fails?? */</div><div class='del'>-		md_wakeup_thread(mddev-&gt;sync_thread);</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read-ahead size must cover two whole stripes, which is</div><div class='del'>-	 * 2 * (n-1) * chunksize where 'n' is the number of raid devices</div><div class='add'>+	 * 2 * (datadisks) * chunksize where 'n' is the number of raid devices</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='del'>-		int stripe = (mddev-&gt;raid_disks-1) * mddev-&gt;chunk_size</div><div class='del'>-			/ PAGE_SIZE;</div><div class='add'>+		int data_disks = conf-&gt;previous_raid_disks - conf-&gt;max_degraded;</div><div class='add'>+		int stripe = data_disks *</div><div class='add'>+			(mddev-&gt;chunk_size / PAGE_SIZE);</div><div class='ctx'> 		if (mddev-&gt;queue-&gt;backing_dev_info.ra_pages &lt; 2 * stripe)</div><div class='ctx'> 			mddev-&gt;queue-&gt;backing_dev_info.ra_pages = 2 * stripe;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2393,12 +3299,14 @@ static int run(mddev_t *mddev)</div><div class='ctx'> </div><div class='ctx'> 	mddev-&gt;queue-&gt;unplug_fn = raid5_unplug_device;</div><div class='ctx'> 	mddev-&gt;queue-&gt;issue_flush_fn = raid5_issue_flush;</div><div class='del'>-	mddev-&gt;array_size =  mddev-&gt;size * (conf-&gt;previous_raid_disks - 1);</div><div class='add'>+	mddev-&gt;array_size =  mddev-&gt;size * (conf-&gt;previous_raid_disks -</div><div class='add'>+					    conf-&gt;max_degraded);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> abort:</div><div class='ctx'> 	if (conf) {</div><div class='ctx'> 		print_raid5_conf(conf);</div><div class='add'>+		safe_put_page(conf-&gt;spare_page);</div><div class='ctx'> 		kfree(conf-&gt;disks);</div><div class='ctx'> 		kfree(conf-&gt;stripe_hashtbl);</div><div class='ctx'> 		kfree(conf);</div><div class='hunk'>@@ -2427,23 +3335,23 @@ static int stop(mddev_t *mddev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if RAID5_DEBUG</div><div class='del'>-static void print_sh (struct stripe_head *sh)</div><div class='add'>+static void print_sh (struct seq_file *seq, struct stripe_head *sh)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	printk("sh %llu, pd_idx %d, state %ld.\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector, sh-&gt;pd_idx, sh-&gt;state);</div><div class='del'>-	printk("sh %llu,  count %d.\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector, atomic_read(&amp;sh-&gt;count));</div><div class='del'>-	printk("sh %llu, ", (unsigned long long)sh-&gt;sector);</div><div class='add'>+	seq_printf(seq, "sh %llu, pd_idx %d, state %ld.\n",</div><div class='add'>+		   (unsigned long long)sh-&gt;sector, sh-&gt;pd_idx, sh-&gt;state);</div><div class='add'>+	seq_printf(seq, "sh %llu,  count %d.\n",</div><div class='add'>+		   (unsigned long long)sh-&gt;sector, atomic_read(&amp;sh-&gt;count));</div><div class='add'>+	seq_printf(seq, "sh %llu, ", (unsigned long long)sh-&gt;sector);</div><div class='ctx'> 	for (i = 0; i &lt; sh-&gt;disks; i++) {</div><div class='del'>-		printk("(cache%d: %p %ld) ", </div><div class='del'>-			i, sh-&gt;dev[i].page, sh-&gt;dev[i].flags);</div><div class='add'>+		seq_printf(seq, "(cache%d: %p %ld) ",</div><div class='add'>+			   i, sh-&gt;dev[i].page, sh-&gt;dev[i].flags);</div><div class='ctx'> 	}</div><div class='del'>-	printk("\n");</div><div class='add'>+	seq_printf(seq, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void printall (raid5_conf_t *conf)</div><div class='add'>+static void printall (struct seq_file *seq, raid5_conf_t *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct stripe_head *sh;</div><div class='ctx'> 	struct hlist_node *hn;</div><div class='hunk'>@@ -2454,7 +3362,7 @@ static void printall (raid5_conf_t *conf)</div><div class='ctx'> 		hlist_for_each_entry(sh, hn, &amp;conf-&gt;stripe_hashtbl[i], hash) {</div><div class='ctx'> 			if (sh-&gt;raid_conf != conf)</div><div class='ctx'> 				continue;</div><div class='del'>-			print_sh(sh);</div><div class='add'>+			print_sh(seq, sh);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='hunk'>@@ -2474,9 +3382,8 @@ static void status (struct seq_file *seq, mddev_t *mddev)</div><div class='ctx'> 			       test_bit(In_sync, &amp;conf-&gt;disks[i].rdev-&gt;flags) ? "U" : "_");</div><div class='ctx'> 	seq_printf (seq, "]");</div><div class='ctx'> #if RAID5_DEBUG</div><div class='del'>-#define D(x) \</div><div class='del'>-	seq_printf (seq, "&lt;"#x":%d&gt;", atomic_read(&amp;conf-&gt;x))</div><div class='del'>-	printall(conf);</div><div class='add'>+	seq_printf (seq, "\n");</div><div class='add'>+	printall(seq, conf);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2560,14 +3467,20 @@ static int raid5_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='ctx'> 	int disk;</div><div class='ctx'> 	struct disk_info *p;</div><div class='ctx'> </div><div class='del'>-	if (mddev-&gt;degraded &gt; 1)</div><div class='add'>+	if (mddev-&gt;degraded &gt; conf-&gt;max_degraded)</div><div class='ctx'> 		/* no point adding a device */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * find the disk ...</div><div class='add'>+	 * find the disk ... but prefer rdev-&gt;saved_raid_disk</div><div class='add'>+	 * if possible.</div><div class='ctx'> 	 */</div><div class='del'>-	for (disk=0; disk &lt; conf-&gt;raid_disks; disk++)</div><div class='add'>+	if (rdev-&gt;saved_raid_disk &gt;= 0 &amp;&amp;</div><div class='add'>+	    conf-&gt;disks[rdev-&gt;saved_raid_disk].rdev == NULL)</div><div class='add'>+		disk = rdev-&gt;saved_raid_disk;</div><div class='add'>+	else</div><div class='add'>+		disk = 0;</div><div class='add'>+	for ( ; disk &lt; conf-&gt;raid_disks; disk++)</div><div class='ctx'> 		if ((p=conf-&gt;disks + disk)-&gt;rdev == NULL) {</div><div class='ctx'> 			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='ctx'> 			rdev-&gt;raid_disk = disk;</div><div class='hunk'>@@ -2590,8 +3503,10 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors)</div><div class='ctx'> 	 * any io in the removed space completes, but it hardly seems</div><div class='ctx'> 	 * worth it.</div><div class='ctx'> 	 */</div><div class='add'>+	raid5_conf_t *conf = mddev_to_conf(mddev);</div><div class='add'>+</div><div class='ctx'> 	sectors &amp;= ~((sector_t)mddev-&gt;chunk_size/512 - 1);</div><div class='del'>-	mddev-&gt;array_size = (sectors * (mddev-&gt;raid_disks-1))&gt;&gt;1;</div><div class='add'>+	mddev-&gt;array_size = (sectors * (mddev-&gt;raid_disks-conf-&gt;max_degraded))&gt;&gt;1;</div><div class='ctx'> 	set_capacity(mddev-&gt;gendisk, mddev-&gt;array_size &lt;&lt; 1);</div><div class='ctx'> 	mddev-&gt;changed = 1;</div><div class='ctx'> 	if (sectors/2  &gt; mddev-&gt;size &amp;&amp; mddev-&gt;recovery_cp == MaxSector) {</div><div class='hunk'>@@ -2680,6 +3595,7 @@ static int raid5_start_reshape(mddev_t *mddev)</div><div class='ctx'> 				set_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='ctx'> 				conf-&gt;working_disks++;</div><div class='ctx'> 				added_devices++;</div><div class='add'>+				rdev-&gt;recovery_offset = 0;</div><div class='ctx'> 				sprintf(nm, "rd%d", rdev-&gt;raid_disk);</div><div class='ctx'> 				sysfs_create_link(&amp;mddev-&gt;kobj, &amp;rdev-&gt;kobj, nm);</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -2731,6 +3647,17 @@ static void end_reshape(raid5_conf_t *conf)</div><div class='ctx'> 		conf-&gt;expand_progress = MaxSector;</div><div class='ctx'> 		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='ctx'> 		conf-&gt;mddev-&gt;reshape_position = MaxSector;</div><div class='add'>+</div><div class='add'>+		/* read-ahead size must cover two whole stripes, which is</div><div class='add'>+		 * 2 * (datadisks) * chunksize where 'n' is the number of raid devices</div><div class='add'>+		 */</div><div class='add'>+		{</div><div class='add'>+			int data_disks = conf-&gt;previous_raid_disks - conf-&gt;max_degraded;</div><div class='add'>+			int stripe = data_disks *</div><div class='add'>+				(conf-&gt;mddev-&gt;chunk_size / PAGE_SIZE);</div><div class='add'>+			if (conf-&gt;mddev-&gt;queue-&gt;backing_dev_info.ra_pages &lt; 2 * stripe)</div><div class='add'>+				conf-&gt;mddev-&gt;queue-&gt;backing_dev_info.ra_pages = 2 * stripe;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2762,6 +3689,23 @@ static void raid5_quiesce(mddev_t *mddev, int state)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct mdk_personality raid6_personality =</div><div class='add'>+{</div><div class='add'>+	.name		= "raid6",</div><div class='add'>+	.level		= 6,</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.make_request	= make_request,</div><div class='add'>+	.run		= run,</div><div class='add'>+	.stop		= stop,</div><div class='add'>+	.status		= status,</div><div class='add'>+	.error_handler	= error,</div><div class='add'>+	.hot_add_disk	= raid5_add_disk,</div><div class='add'>+	.hot_remove_disk= raid5_remove_disk,</div><div class='add'>+	.spare_active	= raid5_spare_active,</div><div class='add'>+	.sync_request	= sync_request,</div><div class='add'>+	.resize		= raid5_resize,</div><div class='add'>+	.quiesce	= raid5_quiesce,</div><div class='add'>+};</div><div class='ctx'> static struct mdk_personality raid5_personality =</div><div class='ctx'> {</div><div class='ctx'> 	.name		= "raid5",</div><div class='hunk'>@@ -2804,6 +3748,12 @@ static struct mdk_personality raid4_personality =</div><div class='ctx'> </div><div class='ctx'> static int __init raid5_init(void)</div><div class='ctx'> {</div><div class='add'>+	int e;</div><div class='add'>+</div><div class='add'>+	e = raid6_select_algo();</div><div class='add'>+	if ( e )</div><div class='add'>+		return e;</div><div class='add'>+	register_md_personality(&amp;raid6_personality);</div><div class='ctx'> 	register_md_personality(&amp;raid5_personality);</div><div class='ctx'> 	register_md_personality(&amp;raid4_personality);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2811,6 +3761,7 @@ static int __init raid5_init(void)</div><div class='ctx'> </div><div class='ctx'> static void raid5_exit(void)</div><div class='ctx'> {</div><div class='add'>+	unregister_md_personality(&amp;raid6_personality);</div><div class='ctx'> 	unregister_md_personality(&amp;raid5_personality);</div><div class='ctx'> 	unregister_md_personality(&amp;raid4_personality);</div><div class='ctx'> }</div><div class='hunk'>@@ -2823,3 +3774,10 @@ MODULE_ALIAS("md-raid5");</div><div class='ctx'> MODULE_ALIAS("md-raid4");</div><div class='ctx'> MODULE_ALIAS("md-level-5");</div><div class='ctx'> MODULE_ALIAS("md-level-4");</div><div class='add'>+MODULE_ALIAS("md-personality-8"); /* RAID6 */</div><div class='add'>+MODULE_ALIAS("md-raid6");</div><div class='add'>+MODULE_ALIAS("md-level-6");</div><div class='add'>+</div><div class='add'>+/* This used to be two separate modules, they were: */</div><div class='add'>+MODULE_ALIAS("raid5");</div><div class='add'>+MODULE_ALIAS("raid6");</div><div class='head'>diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c<br/>index 51c63c0cf1c9..926576156578 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid6algos.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid6algos.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/md/raid6algos.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/md/raid6algos.c</a></div><div class='hunk'>@@ -139,15 +139,14 @@ int __init raid6_select_algo(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ( best )</div><div class='add'>+	if (best) {</div><div class='ctx'> 		printk("raid6: using algorithm %s (%ld MB/s)\n",</div><div class='ctx'> 		       best-&gt;name,</div><div class='ctx'> 		       (bestperf*HZ) &gt;&gt; (20-16+RAID6_TIME_JIFFIES_LG2));</div><div class='del'>-	else</div><div class='add'>+		raid6_call = *best;</div><div class='add'>+	} else</div><div class='ctx'> 		printk("raid6: Yikes!  No algorithm found!\n");</div><div class='ctx'> </div><div class='del'>-	raid6_call = *best;</div><div class='del'>-</div><div class='ctx'> 	free_pages((unsigned long)syndromes, 1);</div><div class='ctx'> </div><div class='ctx'> 	return best ? 0 : -EINVAL;</div><div class='head'>diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c<br/>deleted file mode 100644<br/>index bc69355e0100..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/md/raid6main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/md/raid6main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2427 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * raid6main.c : Multiple Devices driver for Linux</div><div class='del'>- *	   Copyright (C) 1996, 1997 Ingo Molnar, Miguel de Icaza, Gadi Oxman</div><div class='del'>- *	   Copyright (C) 1999, 2000 Ingo Molnar</div><div class='del'>- *	   Copyright (C) 2002, 2003 H. Peter Anvin</div><div class='del'>- *</div><div class='del'>- * RAID-6 management functions.  This code is derived from raid5.c.</div><div class='del'>- * Last merge from raid5.c bkcvs version 1.79 (kernel 2.6.1).</div><div class='del'>- *</div><div class='del'>- * Thanks to Penguin Computing for making the RAID-6 development possible</div><div class='del'>- * by donating a test server!</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * (for example /usr/src/linux/COPYING); if not, write to the Free</div><div class='del'>- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/highmem.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='del'>-#include "raid6.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/raid/bitmap.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stripe cache</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define NR_STRIPES		256</div><div class='del'>-#define STRIPE_SIZE		PAGE_SIZE</div><div class='del'>-#define STRIPE_SHIFT		(PAGE_SHIFT - 9)</div><div class='del'>-#define STRIPE_SECTORS		(STRIPE_SIZE&gt;&gt;9)</div><div class='del'>-#define	IO_THRESHOLD		1</div><div class='del'>-#define NR_HASH			(PAGE_SIZE / sizeof(struct hlist_head))</div><div class='del'>-#define HASH_MASK		(NR_HASH - 1)</div><div class='del'>-</div><div class='del'>-#define stripe_hash(conf, sect)	(&amp;((conf)-&gt;stripe_hashtbl[((sect) &gt;&gt; STRIPE_SHIFT) &amp; HASH_MASK]))</div><div class='del'>-</div><div class='del'>-/* bio's attached to a stripe+device for I/O are linked together in bi_sector</div><div class='del'>- * order without overlap.  There may be several bio's per stripe+device, and</div><div class='del'>- * a bio could span several devices.</div><div class='del'>- * When walking this list for a particular stripe+device, we must never proceed</div><div class='del'>- * beyond a bio that extends past this device, as the next bio might no longer</div><div class='del'>- * be valid.</div><div class='del'>- * This macro is used to determine the 'next' bio in the list, given the sector</div><div class='del'>- * of the current stripe+device</div><div class='del'>- */</div><div class='del'>-#define r5_next_bio(bio, sect) ( ( (bio)-&gt;bi_sector + ((bio)-&gt;bi_size&gt;&gt;9) &lt; sect + STRIPE_SECTORS) ? (bio)-&gt;bi_next : NULL)</div><div class='del'>-/*</div><div class='del'>- * The following can be used to debug the driver</div><div class='del'>- */</div><div class='del'>-#define RAID6_DEBUG	0	/* Extremely verbose printk */</div><div class='del'>-#define RAID6_PARANOIA	1	/* Check spinlocks */</div><div class='del'>-#define RAID6_DUMPSTATE 0	/* Include stripe cache state in /proc/mdstat */</div><div class='del'>-#if RAID6_PARANOIA &amp;&amp; defined(CONFIG_SMP)</div><div class='del'>-# define CHECK_DEVLOCK() assert_spin_locked(&amp;conf-&gt;device_lock)</div><div class='del'>-#else</div><div class='del'>-# define CHECK_DEVLOCK()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define PRINTK(x...) ((void)(RAID6_DEBUG &amp;&amp; printk(KERN_DEBUG x)))</div><div class='del'>-#if RAID6_DEBUG</div><div class='del'>-#undef inline</div><div class='del'>-#undef __inline__</div><div class='del'>-#define inline</div><div class='del'>-#define __inline__</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !RAID6_USE_EMPTY_ZERO_PAGE</div><div class='del'>-/* In .bss so it's zeroed */</div><div class='del'>-const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int raid6_next_disk(int disk, int raid_disks)</div><div class='del'>-{</div><div class='del'>-	disk++;</div><div class='del'>-	return (disk &lt; raid_disks) ? disk : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_raid6_conf (raid6_conf_t *conf);</div><div class='del'>-</div><div class='del'>-static void __release_stripe(raid6_conf_t *conf, struct stripe_head *sh)</div><div class='del'>-{</div><div class='del'>-	if (atomic_dec_and_test(&amp;sh-&gt;count)) {</div><div class='del'>-		BUG_ON(!list_empty(&amp;sh-&gt;lru));</div><div class='del'>-		BUG_ON(atomic_read(&amp;conf-&gt;active_stripes)==0);</div><div class='del'>-		if (test_bit(STRIPE_HANDLE, &amp;sh-&gt;state)) {</div><div class='del'>-			if (test_bit(STRIPE_DELAYED, &amp;sh-&gt;state))</div><div class='del'>-				list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;delayed_list);</div><div class='del'>-			else if (test_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state) &amp;&amp;</div><div class='del'>-				 conf-&gt;seq_write == sh-&gt;bm_seq)</div><div class='del'>-				list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;bitmap_list);</div><div class='del'>-			else {</div><div class='del'>-				clear_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state);</div><div class='del'>-				list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;handle_list);</div><div class='del'>-			}</div><div class='del'>-			md_wakeup_thread(conf-&gt;mddev-&gt;thread);</div><div class='del'>-		} else {</div><div class='del'>-			if (test_and_clear_bit(STRIPE_PREREAD_ACTIVE, &amp;sh-&gt;state)) {</div><div class='del'>-				atomic_dec(&amp;conf-&gt;preread_active_stripes);</div><div class='del'>-				if (atomic_read(&amp;conf-&gt;preread_active_stripes) &lt; IO_THRESHOLD)</div><div class='del'>-					md_wakeup_thread(conf-&gt;mddev-&gt;thread);</div><div class='del'>-			}</div><div class='del'>-			list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;inactive_list);</div><div class='del'>-			atomic_dec(&amp;conf-&gt;active_stripes);</div><div class='del'>-			if (!conf-&gt;inactive_blocked ||</div><div class='del'>-			    atomic_read(&amp;conf-&gt;active_stripes) &lt; (conf-&gt;max_nr_stripes*3/4))</div><div class='del'>-				wake_up(&amp;conf-&gt;wait_for_stripe);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-static void release_stripe(struct stripe_head *sh)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-	__release_stripe(conf, sh);</div><div class='del'>-	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void remove_hash(struct stripe_head *sh)</div><div class='del'>-{</div><div class='del'>-	PRINTK("remove_hash(), stripe %llu\n", (unsigned long long)sh-&gt;sector);</div><div class='del'>-</div><div class='del'>-	hlist_del_init(&amp;sh-&gt;hash);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void insert_hash(raid6_conf_t *conf, struct stripe_head *sh)</div><div class='del'>-{</div><div class='del'>-	struct hlist_head *hp = stripe_hash(conf, sh-&gt;sector);</div><div class='del'>-</div><div class='del'>-	PRINTK("insert_hash(), stripe %llu\n", (unsigned long long)sh-&gt;sector);</div><div class='del'>-</div><div class='del'>-	CHECK_DEVLOCK();</div><div class='del'>-	hlist_add_head(&amp;sh-&gt;hash, hp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* find an idle stripe, make sure it is unhashed, and return it. */</div><div class='del'>-static struct stripe_head *get_free_stripe(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh = NULL;</div><div class='del'>-	struct list_head *first;</div><div class='del'>-</div><div class='del'>-	CHECK_DEVLOCK();</div><div class='del'>-	if (list_empty(&amp;conf-&gt;inactive_list))</div><div class='del'>-		goto out;</div><div class='del'>-	first = conf-&gt;inactive_list.next;</div><div class='del'>-	sh = list_entry(first, struct stripe_head, lru);</div><div class='del'>-	list_del_init(first);</div><div class='del'>-	remove_hash(sh);</div><div class='del'>-	atomic_inc(&amp;conf-&gt;active_stripes);</div><div class='del'>-out:</div><div class='del'>-	return sh;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void shrink_buffers(struct stripe_head *sh, int num)</div><div class='del'>-{</div><div class='del'>-	struct page *p;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;num ; i++) {</div><div class='del'>-		p = sh-&gt;dev[i].page;</div><div class='del'>-		if (!p)</div><div class='del'>-			continue;</div><div class='del'>-		sh-&gt;dev[i].page = NULL;</div><div class='del'>-		put_page(p);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int grow_buffers(struct stripe_head *sh, int num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;num; i++) {</div><div class='del'>-		struct page *page;</div><div class='del'>-</div><div class='del'>-		if (!(page = alloc_page(GFP_KERNEL))) {</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		sh-&gt;dev[i].page = page;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid6_build_block (struct stripe_head *sh, int i);</div><div class='del'>-</div><div class='del'>-static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int disks = conf-&gt;raid_disks, i;</div><div class='del'>-</div><div class='del'>-	BUG_ON(atomic_read(&amp;sh-&gt;count) != 0);</div><div class='del'>-	BUG_ON(test_bit(STRIPE_HANDLE, &amp;sh-&gt;state));</div><div class='del'>-</div><div class='del'>-	CHECK_DEVLOCK();</div><div class='del'>-	PRINTK("init_stripe called, stripe %llu\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector);</div><div class='del'>-</div><div class='del'>-	remove_hash(sh);</div><div class='del'>-</div><div class='del'>-	sh-&gt;sector = sector;</div><div class='del'>-	sh-&gt;pd_idx = pd_idx;</div><div class='del'>-	sh-&gt;state = 0;</div><div class='del'>-</div><div class='del'>-	for (i=disks; i--; ) {</div><div class='del'>-		struct r5dev *dev = &amp;sh-&gt;dev[i];</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;toread || dev-&gt;towrite || dev-&gt;written ||</div><div class='del'>-		    test_bit(R5_LOCKED, &amp;dev-&gt;flags)) {</div><div class='del'>-			PRINTK("sector=%llx i=%d %p %p %p %d\n",</div><div class='del'>-			       (unsigned long long)sh-&gt;sector, i, dev-&gt;toread,</div><div class='del'>-			       dev-&gt;towrite, dev-&gt;written,</div><div class='del'>-			       test_bit(R5_LOCKED, &amp;dev-&gt;flags));</div><div class='del'>-			BUG();</div><div class='del'>-		}</div><div class='del'>-		dev-&gt;flags = 0;</div><div class='del'>-		raid6_build_block(sh, i);</div><div class='del'>-	}</div><div class='del'>-	insert_hash(conf, sh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct stripe_head *__find_stripe(raid6_conf_t *conf, sector_t sector)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	struct hlist_node *hn;</div><div class='del'>-</div><div class='del'>-	CHECK_DEVLOCK();</div><div class='del'>-	PRINTK("__find_stripe, sector %llu\n", (unsigned long long)sector);</div><div class='del'>-	hlist_for_each_entry (sh, hn,  stripe_hash(conf, sector), hash)</div><div class='del'>-		if (sh-&gt;sector == sector)</div><div class='del'>-			return sh;</div><div class='del'>-	PRINTK("__stripe %llu not in cache\n", (unsigned long long)sector);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unplug_slaves(mddev_t *mddev);</div><div class='del'>-</div><div class='del'>-static struct stripe_head *get_active_stripe(raid6_conf_t *conf, sector_t sector,</div><div class='del'>-					     int pd_idx, int noblock)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-</div><div class='del'>-	PRINTK("get_stripe, sector %llu\n", (unsigned long long)sector);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		wait_event_lock_irq(conf-&gt;wait_for_stripe,</div><div class='del'>-				    conf-&gt;quiesce == 0,</div><div class='del'>-				    conf-&gt;device_lock, /* nothing */);</div><div class='del'>-		sh = __find_stripe(conf, sector);</div><div class='del'>-		if (!sh) {</div><div class='del'>-			if (!conf-&gt;inactive_blocked)</div><div class='del'>-				sh = get_free_stripe(conf);</div><div class='del'>-			if (noblock &amp;&amp; sh == NULL)</div><div class='del'>-				break;</div><div class='del'>-			if (!sh) {</div><div class='del'>-				conf-&gt;inactive_blocked = 1;</div><div class='del'>-				wait_event_lock_irq(conf-&gt;wait_for_stripe,</div><div class='del'>-						    !list_empty(&amp;conf-&gt;inactive_list) &amp;&amp;</div><div class='del'>-						    (atomic_read(&amp;conf-&gt;active_stripes)</div><div class='del'>-						     &lt; (conf-&gt;max_nr_stripes *3/4)</div><div class='del'>-						     || !conf-&gt;inactive_blocked),</div><div class='del'>-						    conf-&gt;device_lock,</div><div class='del'>-						    unplug_slaves(conf-&gt;mddev);</div><div class='del'>-					);</div><div class='del'>-				conf-&gt;inactive_blocked = 0;</div><div class='del'>-			} else</div><div class='del'>-				init_stripe(sh, sector, pd_idx);</div><div class='del'>-		} else {</div><div class='del'>-			if (atomic_read(&amp;sh-&gt;count)) {</div><div class='del'>-				BUG_ON(!list_empty(&amp;sh-&gt;lru));</div><div class='del'>-			} else {</div><div class='del'>-				if (!test_bit(STRIPE_HANDLE, &amp;sh-&gt;state))</div><div class='del'>-					atomic_inc(&amp;conf-&gt;active_stripes);</div><div class='del'>-				BUG_ON(list_empty(&amp;sh-&gt;lru));</div><div class='del'>-				list_del_init(&amp;sh-&gt;lru);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (sh == NULL);</div><div class='del'>-</div><div class='del'>-	if (sh)</div><div class='del'>-		atomic_inc(&amp;sh-&gt;count);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	return sh;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int grow_one_stripe(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	sh = kmem_cache_alloc(conf-&gt;slab_cache, GFP_KERNEL);</div><div class='del'>-	if (!sh)</div><div class='del'>-		return 0;</div><div class='del'>-	memset(sh, 0, sizeof(*sh) + (conf-&gt;raid_disks-1)*sizeof(struct r5dev));</div><div class='del'>-	sh-&gt;raid_conf = conf;</div><div class='del'>-	spin_lock_init(&amp;sh-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (grow_buffers(sh, conf-&gt;raid_disks)) {</div><div class='del'>-		shrink_buffers(sh, conf-&gt;raid_disks);</div><div class='del'>-		kmem_cache_free(conf-&gt;slab_cache, sh);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* we just created an active stripe so... */</div><div class='del'>-	atomic_set(&amp;sh-&gt;count, 1);</div><div class='del'>-	atomic_inc(&amp;conf-&gt;active_stripes);</div><div class='del'>-	INIT_LIST_HEAD(&amp;sh-&gt;lru);</div><div class='del'>-	release_stripe(sh);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int grow_stripes(raid6_conf_t *conf, int num)</div><div class='del'>-{</div><div class='del'>-	kmem_cache_t *sc;</div><div class='del'>-	int devs = conf-&gt;raid_disks;</div><div class='del'>-</div><div class='del'>-	sprintf(conf-&gt;cache_name[0], "raid6/%s", mdname(conf-&gt;mddev));</div><div class='del'>-</div><div class='del'>-	sc = kmem_cache_create(conf-&gt;cache_name[0],</div><div class='del'>-			       sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),</div><div class='del'>-			       0, 0, NULL, NULL);</div><div class='del'>-	if (!sc)</div><div class='del'>-		return 1;</div><div class='del'>-	conf-&gt;slab_cache = sc;</div><div class='del'>-	while (num--)</div><div class='del'>-		if (!grow_one_stripe(conf))</div><div class='del'>-			return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int drop_one_stripe(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	sh = get_free_stripe(conf);</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	if (!sh)</div><div class='del'>-		return 0;</div><div class='del'>-	BUG_ON(atomic_read(&amp;sh-&gt;count));</div><div class='del'>-	shrink_buffers(sh, conf-&gt;raid_disks);</div><div class='del'>-	kmem_cache_free(conf-&gt;slab_cache, sh);</div><div class='del'>-	atomic_dec(&amp;conf-&gt;active_stripes);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void shrink_stripes(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	while (drop_one_stripe(conf))</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	if (conf-&gt;slab_cache)</div><div class='del'>-		kmem_cache_destroy(conf-&gt;slab_cache);</div><div class='del'>-	conf-&gt;slab_cache = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_end_read_request(struct bio * bi, unsigned int bytes_done,</div><div class='del'>-				  int error)</div><div class='del'>-{</div><div class='del'>- 	struct stripe_head *sh = bi-&gt;bi_private;</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int disks = conf-&gt;raid_disks, i;</div><div class='del'>-	int uptodate = test_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_size)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	for (i=0 ; i&lt;disks; i++)</div><div class='del'>-		if (bi == &amp;sh-&gt;dev[i].req)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	PRINTK("end_read_request %llu/%d, count: %d, uptodate %d.\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector, i, atomic_read(&amp;sh-&gt;count),</div><div class='del'>-		uptodate);</div><div class='del'>-	if (i == disks) {</div><div class='del'>-		BUG();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uptodate) {</div><div class='del'>-#if 0</div><div class='del'>-		struct bio *bio;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-		/* we can return a buffer if we bypassed the cache or</div><div class='del'>-		 * if the top buffer is not in highmem.  If there are</div><div class='del'>-		 * multiple buffers, leave the extra work to</div><div class='del'>-		 * handle_stripe</div><div class='del'>-		 */</div><div class='del'>-		buffer = sh-&gt;bh_read[i];</div><div class='del'>-		if (buffer &amp;&amp;</div><div class='del'>-		    (!PageHighMem(buffer-&gt;b_page)</div><div class='del'>-		     || buffer-&gt;b_page == bh-&gt;b_page )</div><div class='del'>-			) {</div><div class='del'>-			sh-&gt;bh_read[i] = buffer-&gt;b_reqnext;</div><div class='del'>-			buffer-&gt;b_reqnext = NULL;</div><div class='del'>-		} else</div><div class='del'>-			buffer = NULL;</div><div class='del'>-		spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-		if (sh-&gt;bh_page[i]==bh-&gt;b_page)</div><div class='del'>-			set_buffer_uptodate(bh);</div><div class='del'>-		if (buffer) {</div><div class='del'>-			if (buffer-&gt;b_page != bh-&gt;b_page)</div><div class='del'>-				memcpy(buffer-&gt;b_data, bh-&gt;b_data, bh-&gt;b_size);</div><div class='del'>-			buffer-&gt;b_end_io(buffer, 1);</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-#endif</div><div class='del'>-		if (test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='del'>-			printk(KERN_INFO "raid6: read error corrected!!\n");</div><div class='del'>-			clear_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			clear_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-		}</div><div class='del'>-		if (atomic_read(&amp;conf-&gt;disks[i].rdev-&gt;read_errors))</div><div class='del'>-			atomic_set(&amp;conf-&gt;disks[i].rdev-&gt;read_errors, 0);</div><div class='del'>-	} else {</div><div class='del'>-		int retry = 0;</div><div class='del'>-		clear_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-		atomic_inc(&amp;conf-&gt;disks[i].rdev-&gt;read_errors);</div><div class='del'>-		if (conf-&gt;mddev-&gt;degraded)</div><div class='del'>-			printk(KERN_WARNING "raid6: read error not correctable.\n");</div><div class='del'>-		else if (test_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-			/* Oh, no!!! */</div><div class='del'>-			printk(KERN_WARNING "raid6: read error NOT corrected!!\n");</div><div class='del'>-		else if (atomic_read(&amp;conf-&gt;disks[i].rdev-&gt;read_errors)</div><div class='del'>-			 &gt; conf-&gt;max_nr_stripes)</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "raid6: Too many read errors, failing device.\n");</div><div class='del'>-		else</div><div class='del'>-			retry = 1;</div><div class='del'>-		if (retry)</div><div class='del'>-			set_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-		else {</div><div class='del'>-			clear_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			clear_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			md_error(conf-&gt;mddev, conf-&gt;disks[i].rdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rdev_dec_pending(conf-&gt;disks[i].rdev, conf-&gt;mddev);</div><div class='del'>-#if 0</div><div class='del'>-	/* must restore b_page before unlocking buffer... */</div><div class='del'>-	if (sh-&gt;bh_page[i] != bh-&gt;b_page) {</div><div class='del'>-		bh-&gt;b_page = sh-&gt;bh_page[i];</div><div class='del'>-		bh-&gt;b_data = page_address(bh-&gt;b_page);</div><div class='del'>-		clear_buffer_uptodate(bh);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-	set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-	release_stripe(sh);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_end_write_request (struct bio *bi, unsigned int bytes_done,</div><div class='del'>-				    int error)</div><div class='del'>-{</div><div class='del'>- 	struct stripe_head *sh = bi-&gt;bi_private;</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int disks = conf-&gt;raid_disks, i;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int uptodate = test_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-</div><div class='del'>-	if (bi-&gt;bi_size)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	for (i=0 ; i&lt;disks; i++)</div><div class='del'>-		if (bi == &amp;sh-&gt;dev[i].req)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	PRINTK("end_write_request %llu/%d, count %d, uptodate: %d.\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector, i, atomic_read(&amp;sh-&gt;count),</div><div class='del'>-		uptodate);</div><div class='del'>-	if (i == disks) {</div><div class='del'>-		BUG();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-	if (!uptodate)</div><div class='del'>-		md_error(conf-&gt;mddev, conf-&gt;disks[i].rdev);</div><div class='del'>-</div><div class='del'>-	rdev_dec_pending(conf-&gt;disks[i].rdev, conf-&gt;mddev);</div><div class='del'>-</div><div class='del'>-	clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-	set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-	__release_stripe(conf, sh);</div><div class='del'>-	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static sector_t compute_blocknr(struct stripe_head *sh, int i);</div><div class='del'>-</div><div class='del'>-static void raid6_build_block (struct stripe_head *sh, int i)</div><div class='del'>-{</div><div class='del'>-	struct r5dev *dev = &amp;sh-&gt;dev[i];</div><div class='del'>-	int pd_idx = sh-&gt;pd_idx;</div><div class='del'>-	int qd_idx = raid6_next_disk(pd_idx, sh-&gt;raid_conf-&gt;raid_disks);</div><div class='del'>-</div><div class='del'>-	bio_init(&amp;dev-&gt;req);</div><div class='del'>-	dev-&gt;req.bi_io_vec = &amp;dev-&gt;vec;</div><div class='del'>-	dev-&gt;req.bi_vcnt++;</div><div class='del'>-	dev-&gt;req.bi_max_vecs++;</div><div class='del'>-	dev-&gt;vec.bv_page = dev-&gt;page;</div><div class='del'>-	dev-&gt;vec.bv_len = STRIPE_SIZE;</div><div class='del'>-	dev-&gt;vec.bv_offset = 0;</div><div class='del'>-</div><div class='del'>-	dev-&gt;req.bi_sector = sh-&gt;sector;</div><div class='del'>-	dev-&gt;req.bi_private = sh;</div><div class='del'>-</div><div class='del'>-	dev-&gt;flags = 0;</div><div class='del'>-	if (i != pd_idx &amp;&amp; i != qd_idx)</div><div class='del'>-		dev-&gt;sector = compute_blocknr(sh, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void error(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='del'>-{</div><div class='del'>-	char b[BDEVNAME_SIZE];</div><div class='del'>-	raid6_conf_t *conf = (raid6_conf_t *) mddev-&gt;private;</div><div class='del'>-	PRINTK("raid6: error called\n");</div><div class='del'>-</div><div class='del'>-	if (!test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='del'>-		mddev-&gt;sb_dirty = 1;</div><div class='del'>-		if (test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='del'>-			conf-&gt;working_disks--;</div><div class='del'>-			mddev-&gt;degraded++;</div><div class='del'>-			conf-&gt;failed_disks++;</div><div class='del'>-			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='del'>-			/*</div><div class='del'>-			 * if recovery was running, make sure it aborts.</div><div class='del'>-			 */</div><div class='del'>-			set_bit(MD_RECOVERY_ERR, &amp;mddev-&gt;recovery);</div><div class='del'>-		}</div><div class='del'>-		set_bit(Faulty, &amp;rdev-&gt;flags);</div><div class='del'>-		printk (KERN_ALERT</div><div class='del'>-			"raid6: Disk failure on %s, disabling device."</div><div class='del'>-			" Operation continuing on %d devices\n",</div><div class='del'>-			bdevname(rdev-&gt;bdev,b), conf-&gt;working_disks);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Input: a 'big' sector number,</div><div class='del'>- * Output: index of the data and parity disk, and the sector # in them.</div><div class='del'>- */</div><div class='del'>-static sector_t raid6_compute_sector(sector_t r_sector, unsigned int raid_disks,</div><div class='del'>-			unsigned int data_disks, unsigned int * dd_idx,</div><div class='del'>-			unsigned int * pd_idx, raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	long stripe;</div><div class='del'>-	unsigned long chunk_number;</div><div class='del'>-	unsigned int chunk_offset;</div><div class='del'>-	sector_t new_sector;</div><div class='del'>-	int sectors_per_chunk = conf-&gt;chunk_size &gt;&gt; 9;</div><div class='del'>-</div><div class='del'>-	/* First compute the information on this sector */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Compute the chunk number and the sector offset inside the chunk</div><div class='del'>-	 */</div><div class='del'>-	chunk_offset = sector_div(r_sector, sectors_per_chunk);</div><div class='del'>-	chunk_number = r_sector;</div><div class='del'>-	if ( r_sector != chunk_number ) {</div><div class='del'>-		printk(KERN_CRIT "raid6: ERROR: r_sector = %llu, chunk_number = %lu\n",</div><div class='del'>-		       (unsigned long long)r_sector, (unsigned long)chunk_number);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Compute the stripe number</div><div class='del'>-	 */</div><div class='del'>-	stripe = chunk_number / data_disks;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Compute the data disk and parity disk indexes inside the stripe</div><div class='del'>-	 */</div><div class='del'>-	*dd_idx = chunk_number % data_disks;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Select the parity disk based on the user selected algorithm.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/**** FIX THIS ****/</div><div class='del'>-	switch (conf-&gt;algorithm) {</div><div class='del'>-	case ALGORITHM_LEFT_ASYMMETRIC:</div><div class='del'>-		*pd_idx = raid_disks - 1 - (stripe % raid_disks);</div><div class='del'>-		if (*pd_idx == raid_disks-1)</div><div class='del'>-		  	(*dd_idx)++; 	/* Q D D D P */</div><div class='del'>-		else if (*dd_idx &gt;= *pd_idx)</div><div class='del'>-		  	(*dd_idx) += 2; /* D D P Q D */</div><div class='del'>-		break;</div><div class='del'>-	case ALGORITHM_RIGHT_ASYMMETRIC:</div><div class='del'>-		*pd_idx = stripe % raid_disks;</div><div class='del'>-		if (*pd_idx == raid_disks-1)</div><div class='del'>-		  	(*dd_idx)++; 	/* Q D D D P */</div><div class='del'>-		else if (*dd_idx &gt;= *pd_idx)</div><div class='del'>-		  	(*dd_idx) += 2; /* D D P Q D */</div><div class='del'>-		break;</div><div class='del'>-	case ALGORITHM_LEFT_SYMMETRIC:</div><div class='del'>-		*pd_idx = raid_disks - 1 - (stripe % raid_disks);</div><div class='del'>-		*dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;</div><div class='del'>-		break;</div><div class='del'>-	case ALGORITHM_RIGHT_SYMMETRIC:</div><div class='del'>-		*pd_idx = stripe % raid_disks;</div><div class='del'>-		*dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk (KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='del'>-			conf-&gt;algorithm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PRINTK("raid6: chunk_number = %lu, pd_idx = %u, dd_idx = %u\n",</div><div class='del'>-	       chunk_number, *pd_idx, *dd_idx);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Finally, compute the new sector number</div><div class='del'>-	 */</div><div class='del'>-	new_sector = (sector_t) stripe * sectors_per_chunk + chunk_offset;</div><div class='del'>-	return new_sector;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static sector_t compute_blocknr(struct stripe_head *sh, int i)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int raid_disks = conf-&gt;raid_disks, data_disks = raid_disks - 2;</div><div class='del'>-	sector_t new_sector = sh-&gt;sector, check;</div><div class='del'>-	int sectors_per_chunk = conf-&gt;chunk_size &gt;&gt; 9;</div><div class='del'>-	sector_t stripe;</div><div class='del'>-	int chunk_offset;</div><div class='del'>-	int chunk_number, dummy1, dummy2, dd_idx = i;</div><div class='del'>-	sector_t r_sector;</div><div class='del'>-	int i0 = i;</div><div class='del'>-</div><div class='del'>-	chunk_offset = sector_div(new_sector, sectors_per_chunk);</div><div class='del'>-	stripe = new_sector;</div><div class='del'>-	if ( new_sector != stripe ) {</div><div class='del'>-		printk(KERN_CRIT "raid6: ERROR: new_sector = %llu, stripe = %lu\n",</div><div class='del'>-		       (unsigned long long)new_sector, (unsigned long)stripe);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (conf-&gt;algorithm) {</div><div class='del'>-		case ALGORITHM_LEFT_ASYMMETRIC:</div><div class='del'>-		case ALGORITHM_RIGHT_ASYMMETRIC:</div><div class='del'>-		  	if (sh-&gt;pd_idx == raid_disks-1)</div><div class='del'>-				i--; 	/* Q D D D P */</div><div class='del'>-			else if (i &gt; sh-&gt;pd_idx)</div><div class='del'>-				i -= 2; /* D D P Q D */</div><div class='del'>-			break;</div><div class='del'>-		case ALGORITHM_LEFT_SYMMETRIC:</div><div class='del'>-		case ALGORITHM_RIGHT_SYMMETRIC:</div><div class='del'>-			if (sh-&gt;pd_idx == raid_disks-1)</div><div class='del'>-				i--; /* Q D D D P */</div><div class='del'>-			else {</div><div class='del'>-				/* D D P Q D */</div><div class='del'>-				if (i &lt; sh-&gt;pd_idx)</div><div class='del'>-					i += raid_disks;</div><div class='del'>-				i -= (sh-&gt;pd_idx + 2);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk (KERN_CRIT "raid6: unsupported algorithm %d\n",</div><div class='del'>-				conf-&gt;algorithm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PRINTK("raid6: compute_blocknr: pd_idx = %u, i0 = %u, i = %u\n", sh-&gt;pd_idx, i0, i);</div><div class='del'>-</div><div class='del'>-	chunk_number = stripe * data_disks + i;</div><div class='del'>-	r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset;</div><div class='del'>-</div><div class='del'>-	check = raid6_compute_sector (r_sector, raid_disks, data_disks, &amp;dummy1, &amp;dummy2, conf);</div><div class='del'>-	if (check != sh-&gt;sector || dummy1 != dd_idx || dummy2 != sh-&gt;pd_idx) {</div><div class='del'>-		printk(KERN_CRIT "raid6: compute_blocknr: map not correct\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return r_sector;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copy data between a page in the stripe cache, and one or more bion</div><div class='del'>- * The page could align with the middle of the bio, or there could be</div><div class='del'>- * several bion, each with several bio_vecs, which cover part of the page</div><div class='del'>- * Multiple bion are linked together on bi_next.  There may be extras</div><div class='del'>- * at the end of this list.  We ignore them.</div><div class='del'>- */</div><div class='del'>-static void copy_data(int frombio, struct bio *bio,</div><div class='del'>-		     struct page *page,</div><div class='del'>-		     sector_t sector)</div><div class='del'>-{</div><div class='del'>-	char *pa = page_address(page);</div><div class='del'>-	struct bio_vec *bvl;</div><div class='del'>-	int i;</div><div class='del'>-	int page_offset;</div><div class='del'>-</div><div class='del'>-	if (bio-&gt;bi_sector &gt;= sector)</div><div class='del'>-		page_offset = (signed)(bio-&gt;bi_sector - sector) * 512;</div><div class='del'>-	else</div><div class='del'>-		page_offset = (signed)(sector - bio-&gt;bi_sector) * -512;</div><div class='del'>-	bio_for_each_segment(bvl, bio, i) {</div><div class='del'>-		int len = bio_iovec_idx(bio,i)-&gt;bv_len;</div><div class='del'>-		int clen;</div><div class='del'>-		int b_offset = 0;</div><div class='del'>-</div><div class='del'>-		if (page_offset &lt; 0) {</div><div class='del'>-			b_offset = -page_offset;</div><div class='del'>-			page_offset += b_offset;</div><div class='del'>-			len -= b_offset;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (len &gt; 0 &amp;&amp; page_offset + len &gt; STRIPE_SIZE)</div><div class='del'>-			clen = STRIPE_SIZE - page_offset;</div><div class='del'>-		else clen = len;</div><div class='del'>-</div><div class='del'>-		if (clen &gt; 0) {</div><div class='del'>-			char *ba = __bio_kmap_atomic(bio, i, KM_USER0);</div><div class='del'>-			if (frombio)</div><div class='del'>-				memcpy(pa+page_offset, ba+b_offset, clen);</div><div class='del'>-			else</div><div class='del'>-				memcpy(ba+b_offset, pa+page_offset, clen);</div><div class='del'>-			__bio_kunmap_atomic(ba, KM_USER0);</div><div class='del'>-		}</div><div class='del'>-		if (clen &lt; len) /* hit end of page */</div><div class='del'>-			break;</div><div class='del'>-		page_offset +=  len;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define check_xor() 	do { 						\</div><div class='del'>-			   if (count == MAX_XOR_BLOCKS) {		\</div><div class='del'>-				xor_block(count, STRIPE_SIZE, ptr);	\</div><div class='del'>-				count = 1;				\</div><div class='del'>-			   }						\</div><div class='del'>-			} while(0)</div><div class='del'>-</div><div class='del'>-/* Compute P and Q syndromes */</div><div class='del'>-static void compute_parity(struct stripe_head *sh, int method)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int i, pd_idx = sh-&gt;pd_idx, qd_idx, d0_idx, disks = conf-&gt;raid_disks, count;</div><div class='del'>-	struct bio *chosen;</div><div class='del'>-	/**** FIX THIS: This could be very bad if disks is close to 256 ****/</div><div class='del'>-	void *ptrs[disks];</div><div class='del'>-</div><div class='del'>-	qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='del'>-	d0_idx = raid6_next_disk(qd_idx, disks);</div><div class='del'>-</div><div class='del'>-	PRINTK("compute_parity, stripe %llu, method %d\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector, method);</div><div class='del'>-</div><div class='del'>-	switch(method) {</div><div class='del'>-	case READ_MODIFY_WRITE:</div><div class='del'>-		BUG();		/* READ_MODIFY_WRITE N/A for RAID-6 */</div><div class='del'>-	case RECONSTRUCT_WRITE:</div><div class='del'>-		for (i= disks; i-- ;)</div><div class='del'>-			if ( i != pd_idx &amp;&amp; i != qd_idx &amp;&amp; sh-&gt;dev[i].towrite ) {</div><div class='del'>-				chosen = sh-&gt;dev[i].towrite;</div><div class='del'>-				sh-&gt;dev[i].towrite = NULL;</div><div class='del'>-</div><div class='del'>-				if (test_and_clear_bit(R5_Overlap, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-					wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='del'>-</div><div class='del'>-				BUG_ON(sh-&gt;dev[i].written);</div><div class='del'>-				sh-&gt;dev[i].written = chosen;</div><div class='del'>-			}</div><div class='del'>-		break;</div><div class='del'>-	case CHECK_PARITY:</div><div class='del'>-		BUG();		/* Not implemented yet */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = disks; i--;)</div><div class='del'>-		if (sh-&gt;dev[i].written) {</div><div class='del'>-			sector_t sector = sh-&gt;dev[i].sector;</div><div class='del'>-			struct bio *wbi = sh-&gt;dev[i].written;</div><div class='del'>-			while (wbi &amp;&amp; wbi-&gt;bi_sector &lt; sector + STRIPE_SECTORS) {</div><div class='del'>-				copy_data(1, wbi, sh-&gt;dev[i].page, sector);</div><div class='del'>-				wbi = r5_next_bio(wbi, sector);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			set_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			set_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-//	switch(method) {</div><div class='del'>-//	case RECONSTRUCT_WRITE:</div><div class='del'>-//	case CHECK_PARITY:</div><div class='del'>-//	case UPDATE_PARITY:</div><div class='del'>-		/* Note that unlike RAID-5, the ordering of the disks matters greatly. */</div><div class='del'>-		/* FIX: Is this ordering of drives even remotely optimal? */</div><div class='del'>-		count = 0;</div><div class='del'>-		i = d0_idx;</div><div class='del'>-		do {</div><div class='del'>-			ptrs[count++] = page_address(sh-&gt;dev[i].page);</div><div class='del'>-			if (count &lt;= disks-2 &amp;&amp; !test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-				printk("block %d/%d not uptodate on parity calc\n", i,count);</div><div class='del'>-			i = raid6_next_disk(i, disks);</div><div class='del'>-		} while ( i != d0_idx );</div><div class='del'>-//		break;</div><div class='del'>-//	}</div><div class='del'>-</div><div class='del'>-	raid6_call.gen_syndrome(disks, STRIPE_SIZE, ptrs);</div><div class='del'>-</div><div class='del'>-	switch(method) {</div><div class='del'>-	case RECONSTRUCT_WRITE:</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[pd_idx].flags);</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[qd_idx].flags);</div><div class='del'>-		set_bit(R5_LOCKED,   &amp;sh-&gt;dev[pd_idx].flags);</div><div class='del'>-		set_bit(R5_LOCKED,   &amp;sh-&gt;dev[qd_idx].flags);</div><div class='del'>-		break;</div><div class='del'>-	case UPDATE_PARITY:</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[pd_idx].flags);</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[qd_idx].flags);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compute one missing block */</div><div class='del'>-static void compute_block_1(struct stripe_head *sh, int dd_idx, int nozero)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int i, count, disks = conf-&gt;raid_disks;</div><div class='del'>-	void *ptr[MAX_XOR_BLOCKS], *p;</div><div class='del'>-	int pd_idx = sh-&gt;pd_idx;</div><div class='del'>-	int qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='del'>-</div><div class='del'>-	PRINTK("compute_block_1, stripe %llu, idx %d\n",</div><div class='del'>-		(unsigned long long)sh-&gt;sector, dd_idx);</div><div class='del'>-</div><div class='del'>-	if ( dd_idx == qd_idx ) {</div><div class='del'>-		/* We're actually computing the Q drive */</div><div class='del'>-		compute_parity(sh, UPDATE_PARITY);</div><div class='del'>-	} else {</div><div class='del'>-		ptr[0] = page_address(sh-&gt;dev[dd_idx].page);</div><div class='del'>-		if (!nozero) memset(ptr[0], 0, STRIPE_SIZE);</div><div class='del'>-		count = 1;</div><div class='del'>-		for (i = disks ; i--; ) {</div><div class='del'>-			if (i == dd_idx || i == qd_idx)</div><div class='del'>-				continue;</div><div class='del'>-			p = page_address(sh-&gt;dev[i].page);</div><div class='del'>-			if (test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-				ptr[count++] = p;</div><div class='del'>-			else</div><div class='del'>-				printk("compute_block() %d, stripe %llu, %d"</div><div class='del'>-				       " not present\n", dd_idx,</div><div class='del'>-				       (unsigned long long)sh-&gt;sector, i);</div><div class='del'>-</div><div class='del'>-			check_xor();</div><div class='del'>-		}</div><div class='del'>-		if (count != 1)</div><div class='del'>-			xor_block(count, STRIPE_SIZE, ptr);</div><div class='del'>-		if (!nozero) set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='del'>-		else clear_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compute two missing blocks */</div><div class='del'>-static void compute_block_2(struct stripe_head *sh, int dd_idx1, int dd_idx2)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int i, count, disks = conf-&gt;raid_disks;</div><div class='del'>-	int pd_idx = sh-&gt;pd_idx;</div><div class='del'>-	int qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='del'>-	int d0_idx = raid6_next_disk(qd_idx, disks);</div><div class='del'>-	int faila, failb;</div><div class='del'>-</div><div class='del'>-	/* faila and failb are disk numbers relative to d0_idx */</div><div class='del'>-	/* pd_idx become disks-2 and qd_idx become disks-1 */</div><div class='del'>-	faila = (dd_idx1 &lt; d0_idx) ? dd_idx1+(disks-d0_idx) : dd_idx1-d0_idx;</div><div class='del'>-	failb = (dd_idx2 &lt; d0_idx) ? dd_idx2+(disks-d0_idx) : dd_idx2-d0_idx;</div><div class='del'>-</div><div class='del'>-	BUG_ON(faila == failb);</div><div class='del'>-	if ( failb &lt; faila ) { int tmp = faila; faila = failb; failb = tmp; }</div><div class='del'>-</div><div class='del'>-	PRINTK("compute_block_2, stripe %llu, idx %d,%d (%d,%d)\n",</div><div class='del'>-	       (unsigned long long)sh-&gt;sector, dd_idx1, dd_idx2, faila, failb);</div><div class='del'>-</div><div class='del'>-	if ( failb == disks-1 ) {</div><div class='del'>-		/* Q disk is one of the missing disks */</div><div class='del'>-		if ( faila == disks-2 ) {</div><div class='del'>-			/* Missing P+Q, just recompute */</div><div class='del'>-			compute_parity(sh, UPDATE_PARITY);</div><div class='del'>-			return;</div><div class='del'>-		} else {</div><div class='del'>-			/* We're missing D+Q; recompute D from P */</div><div class='del'>-			compute_block_1(sh, (dd_idx1 == qd_idx) ? dd_idx2 : dd_idx1, 0);</div><div class='del'>-			compute_parity(sh, UPDATE_PARITY); /* Is this necessary? */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We're missing D+P or D+D; build pointer table */</div><div class='del'>-	{</div><div class='del'>-		/**** FIX THIS: This could be very bad if disks is close to 256 ****/</div><div class='del'>-		void *ptrs[disks];</div><div class='del'>-</div><div class='del'>-		count = 0;</div><div class='del'>-		i = d0_idx;</div><div class='del'>-		do {</div><div class='del'>-			ptrs[count++] = page_address(sh-&gt;dev[i].page);</div><div class='del'>-			i = raid6_next_disk(i, disks);</div><div class='del'>-			if (i != dd_idx1 &amp;&amp; i != dd_idx2 &amp;&amp;</div><div class='del'>-			    !test_bit(R5_UPTODATE, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-				printk("compute_2 with missing block %d/%d\n", count, i);</div><div class='del'>-		} while ( i != d0_idx );</div><div class='del'>-</div><div class='del'>-		if ( failb == disks-2 ) {</div><div class='del'>-			/* We're missing D+P. */</div><div class='del'>-			raid6_datap_recov(disks, STRIPE_SIZE, faila, ptrs);</div><div class='del'>-		} else {</div><div class='del'>-			/* We're missing D+D. */</div><div class='del'>-			raid6_2data_recov(disks, STRIPE_SIZE, faila, failb, ptrs);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Both the above update both missing blocks */</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx1].flags);</div><div class='del'>-		set_bit(R5_UPTODATE, &amp;sh-&gt;dev[dd_idx2].flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Each stripe/dev can have one or more bion attached.</div><div class='del'>- * toread/towrite point to the first in a chain.</div><div class='del'>- * The bi_next chain must be in order.</div><div class='del'>- */</div><div class='del'>-static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, int forwrite)</div><div class='del'>-{</div><div class='del'>-	struct bio **bip;</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int firstwrite=0;</div><div class='del'>-</div><div class='del'>-	PRINTK("adding bh b#%llu to stripe s#%llu\n",</div><div class='del'>-		(unsigned long long)bi-&gt;bi_sector,</div><div class='del'>-		(unsigned long long)sh-&gt;sector);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sh-&gt;lock);</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	if (forwrite) {</div><div class='del'>-		bip = &amp;sh-&gt;dev[dd_idx].towrite;</div><div class='del'>-		if (*bip == NULL &amp;&amp; sh-&gt;dev[dd_idx].written == NULL)</div><div class='del'>-			firstwrite = 1;</div><div class='del'>-	} else</div><div class='del'>-		bip = &amp;sh-&gt;dev[dd_idx].toread;</div><div class='del'>-	while (*bip &amp;&amp; (*bip)-&gt;bi_sector &lt; bi-&gt;bi_sector) {</div><div class='del'>-		if ((*bip)-&gt;bi_sector + ((*bip)-&gt;bi_size &gt;&gt; 9) &gt; bi-&gt;bi_sector)</div><div class='del'>-			goto overlap;</div><div class='del'>-		bip = &amp;(*bip)-&gt;bi_next;</div><div class='del'>-	}</div><div class='del'>-	if (*bip &amp;&amp; (*bip)-&gt;bi_sector &lt; bi-&gt;bi_sector + ((bi-&gt;bi_size)&gt;&gt;9))</div><div class='del'>-		goto overlap;</div><div class='del'>-</div><div class='del'>-	BUG_ON(*bip &amp;&amp; bi-&gt;bi_next &amp;&amp; (*bip) != bi-&gt;bi_next);</div><div class='del'>-	if (*bip)</div><div class='del'>-		bi-&gt;bi_next = *bip;</div><div class='del'>-	*bip = bi;</div><div class='del'>-	bi-&gt;bi_phys_segments ++;</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	spin_unlock(&amp;sh-&gt;lock);</div><div class='del'>-</div><div class='del'>-	PRINTK("added bi b#%llu to stripe s#%llu, disk %d.\n",</div><div class='del'>-		(unsigned long long)bi-&gt;bi_sector,</div><div class='del'>-		(unsigned long long)sh-&gt;sector, dd_idx);</div><div class='del'>-</div><div class='del'>-	if (conf-&gt;mddev-&gt;bitmap &amp;&amp; firstwrite) {</div><div class='del'>-		sh-&gt;bm_seq = conf-&gt;seq_write;</div><div class='del'>-		bitmap_startwrite(conf-&gt;mddev-&gt;bitmap, sh-&gt;sector,</div><div class='del'>-				  STRIPE_SECTORS, 0);</div><div class='del'>-		set_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (forwrite) {</div><div class='del'>-		/* check if page is covered */</div><div class='del'>-		sector_t sector = sh-&gt;dev[dd_idx].sector;</div><div class='del'>-		for (bi=sh-&gt;dev[dd_idx].towrite;</div><div class='del'>-		     sector &lt; sh-&gt;dev[dd_idx].sector + STRIPE_SECTORS &amp;&amp;</div><div class='del'>-			     bi &amp;&amp; bi-&gt;bi_sector &lt;= sector;</div><div class='del'>-		     bi = r5_next_bio(bi, sh-&gt;dev[dd_idx].sector)) {</div><div class='del'>-			if (bi-&gt;bi_sector + (bi-&gt;bi_size&gt;&gt;9) &gt;= sector)</div><div class='del'>-				sector = bi-&gt;bi_sector + (bi-&gt;bi_size&gt;&gt;9);</div><div class='del'>-		}</div><div class='del'>-		if (sector &gt;= sh-&gt;dev[dd_idx].sector + STRIPE_SECTORS)</div><div class='del'>-			set_bit(R5_OVERWRITE, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>- overlap:</div><div class='del'>-	set_bit(R5_Overlap, &amp;sh-&gt;dev[dd_idx].flags);</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	spin_unlock(&amp;sh-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int page_is_zero(struct page *p)</div><div class='del'>-{</div><div class='del'>-	char *a = page_address(p);</div><div class='del'>-	return ((*(u32*)a) == 0 &amp;&amp;</div><div class='del'>-		memcmp(a, a+4, STRIPE_SIZE-4)==0);</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * handle_stripe - do things to a stripe.</div><div class='del'>- *</div><div class='del'>- * We lock the stripe and then examine the state of various bits</div><div class='del'>- * to see what needs to be done.</div><div class='del'>- * Possible results:</div><div class='del'>- *    return some read request which now have data</div><div class='del'>- *    return some write requests which are safely on disc</div><div class='del'>- *    schedule a read on some buffers</div><div class='del'>- *    schedule a write of some buffers</div><div class='del'>- *    return confirmation of parity correctness</div><div class='del'>- *</div><div class='del'>- * Parity calculations are done inside the stripe lock</div><div class='del'>- * buffers are taken off read_list or write_list, and bh_cache buffers</div><div class='del'>- * get BH_Lock set before the stripe lock is released.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void handle_stripe(struct stripe_head *sh, struct page *tmp_page)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = sh-&gt;raid_conf;</div><div class='del'>-	int disks = conf-&gt;raid_disks;</div><div class='del'>-	struct bio *return_bi= NULL;</div><div class='del'>-	struct bio *bi;</div><div class='del'>-	int i;</div><div class='del'>-	int syncing;</div><div class='del'>-	int locked=0, uptodate=0, to_read=0, to_write=0, failed=0, written=0;</div><div class='del'>-	int non_overwrite = 0;</div><div class='del'>-	int failed_num[2] = {0, 0};</div><div class='del'>-	struct r5dev *dev, *pdev, *qdev;</div><div class='del'>-	int pd_idx = sh-&gt;pd_idx;</div><div class='del'>-	int qd_idx = raid6_next_disk(pd_idx, disks);</div><div class='del'>-	int p_failed, q_failed;</div><div class='del'>-</div><div class='del'>-	PRINTK("handling stripe %llu, state=%#lx cnt=%d, pd_idx=%d, qd_idx=%d\n",</div><div class='del'>-	       (unsigned long long)sh-&gt;sector, sh-&gt;state, atomic_read(&amp;sh-&gt;count),</div><div class='del'>-	       pd_idx, qd_idx);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sh-&gt;lock);</div><div class='del'>-	clear_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-	clear_bit(STRIPE_DELAYED, &amp;sh-&gt;state);</div><div class='del'>-</div><div class='del'>-	syncing = test_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='del'>-	/* Now to look around and see what can be done */</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for (i=disks; i--; ) {</div><div class='del'>-		mdk_rdev_t *rdev;</div><div class='del'>-		dev = &amp;sh-&gt;dev[i];</div><div class='del'>-		clear_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='del'>-</div><div class='del'>-		PRINTK("check %d: state 0x%lx read %p write %p written %p\n",</div><div class='del'>-			i, dev-&gt;flags, dev-&gt;toread, dev-&gt;towrite, dev-&gt;written);</div><div class='del'>-		/* maybe we can reply to a read */</div><div class='del'>-		if (test_bit(R5_UPTODATE, &amp;dev-&gt;flags) &amp;&amp; dev-&gt;toread) {</div><div class='del'>-			struct bio *rbi, *rbi2;</div><div class='del'>-			PRINTK("Return read for disc %d\n", i);</div><div class='del'>-			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			rbi = dev-&gt;toread;</div><div class='del'>-			dev-&gt;toread = NULL;</div><div class='del'>-			if (test_and_clear_bit(R5_Overlap, &amp;dev-&gt;flags))</div><div class='del'>-				wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='del'>-			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			while (rbi &amp;&amp; rbi-&gt;bi_sector &lt; dev-&gt;sector + STRIPE_SECTORS) {</div><div class='del'>-				copy_data(0, rbi, dev-&gt;page, dev-&gt;sector);</div><div class='del'>-				rbi2 = r5_next_bio(rbi, dev-&gt;sector);</div><div class='del'>-				spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-				if (--rbi-&gt;bi_phys_segments == 0) {</div><div class='del'>-					rbi-&gt;bi_next = return_bi;</div><div class='del'>-					return_bi = rbi;</div><div class='del'>-				}</div><div class='del'>-				spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-				rbi = rbi2;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* now count some things */</div><div class='del'>-		if (test_bit(R5_LOCKED, &amp;dev-&gt;flags)) locked++;</div><div class='del'>-		if (test_bit(R5_UPTODATE, &amp;dev-&gt;flags)) uptodate++;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;toread) to_read++;</div><div class='del'>-		if (dev-&gt;towrite) {</div><div class='del'>-			to_write++;</div><div class='del'>-			if (!test_bit(R5_OVERWRITE, &amp;dev-&gt;flags))</div><div class='del'>-				non_overwrite++;</div><div class='del'>-		}</div><div class='del'>-		if (dev-&gt;written) written++;</div><div class='del'>-		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-		if (!rdev || !test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='del'>-			/* The ReadError flag will just be confusing now */</div><div class='del'>-			clear_bit(R5_ReadError, &amp;dev-&gt;flags);</div><div class='del'>-			clear_bit(R5_ReWrite, &amp;dev-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-		if (!rdev || !test_bit(In_sync, &amp;rdev-&gt;flags)</div><div class='del'>-		    || test_bit(R5_ReadError, &amp;dev-&gt;flags)) {</div><div class='del'>-			if ( failed &lt; 2 )</div><div class='del'>-				failed_num[failed] = i;</div><div class='del'>-			failed++;</div><div class='del'>-		} else</div><div class='del'>-			set_bit(R5_Insync, &amp;dev-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	PRINTK("locked=%d uptodate=%d to_read=%d"</div><div class='del'>-	       " to_write=%d failed=%d failed_num=%d,%d\n",</div><div class='del'>-	       locked, uptodate, to_read, to_write, failed,</div><div class='del'>-	       failed_num[0], failed_num[1]);</div><div class='del'>-	/* check if the array has lost &gt;2 devices and, if so, some requests might</div><div class='del'>-	 * need to be failed</div><div class='del'>-	 */</div><div class='del'>-	if (failed &gt; 2 &amp;&amp; to_read+to_write+written) {</div><div class='del'>-		for (i=disks; i--; ) {</div><div class='del'>-			int bitmap_end = 0;</div><div class='del'>-</div><div class='del'>-			if (test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='del'>-				mdk_rdev_t *rdev;</div><div class='del'>-				rcu_read_lock();</div><div class='del'>-				rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-				if (rdev &amp;&amp; test_bit(In_sync, &amp;rdev-&gt;flags))</div><div class='del'>-					/* multiple read failures in one stripe */</div><div class='del'>-					md_error(conf-&gt;mddev, rdev);</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			/* fail all writes first */</div><div class='del'>-			bi = sh-&gt;dev[i].towrite;</div><div class='del'>-			sh-&gt;dev[i].towrite = NULL;</div><div class='del'>-			if (bi) { to_write--; bitmap_end = 1; }</div><div class='del'>-</div><div class='del'>-			if (test_and_clear_bit(R5_Overlap, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-				wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='del'>-</div><div class='del'>-			while (bi &amp;&amp; bi-&gt;bi_sector &lt; sh-&gt;dev[i].sector + STRIPE_SECTORS){</div><div class='del'>-				struct bio *nextbi = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='del'>-				clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-				if (--bi-&gt;bi_phys_segments == 0) {</div><div class='del'>-					md_write_end(conf-&gt;mddev);</div><div class='del'>-					bi-&gt;bi_next = return_bi;</div><div class='del'>-					return_bi = bi;</div><div class='del'>-				}</div><div class='del'>-				bi = nextbi;</div><div class='del'>-			}</div><div class='del'>-			/* and fail all 'written' */</div><div class='del'>-			bi = sh-&gt;dev[i].written;</div><div class='del'>-			sh-&gt;dev[i].written = NULL;</div><div class='del'>-			if (bi) bitmap_end = 1;</div><div class='del'>-			while (bi &amp;&amp; bi-&gt;bi_sector &lt; sh-&gt;dev[i].sector + STRIPE_SECTORS) {</div><div class='del'>-				struct bio *bi2 = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='del'>-				clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-				if (--bi-&gt;bi_phys_segments == 0) {</div><div class='del'>-					md_write_end(conf-&gt;mddev);</div><div class='del'>-					bi-&gt;bi_next = return_bi;</div><div class='del'>-					return_bi = bi;</div><div class='del'>-				}</div><div class='del'>-				bi = bi2;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* fail any reads if this device is non-operational */</div><div class='del'>-			if (!test_bit(R5_Insync, &amp;sh-&gt;dev[i].flags) ||</div><div class='del'>-			    test_bit(R5_ReadError, &amp;sh-&gt;dev[i].flags)) {</div><div class='del'>-				bi = sh-&gt;dev[i].toread;</div><div class='del'>-				sh-&gt;dev[i].toread = NULL;</div><div class='del'>-				if (test_and_clear_bit(R5_Overlap, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-					wake_up(&amp;conf-&gt;wait_for_overlap);</div><div class='del'>-				if (bi) to_read--;</div><div class='del'>-				while (bi &amp;&amp; bi-&gt;bi_sector &lt; sh-&gt;dev[i].sector + STRIPE_SECTORS){</div><div class='del'>-					struct bio *nextbi = r5_next_bio(bi, sh-&gt;dev[i].sector);</div><div class='del'>-					clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-					if (--bi-&gt;bi_phys_segments == 0) {</div><div class='del'>-						bi-&gt;bi_next = return_bi;</div><div class='del'>-						return_bi = bi;</div><div class='del'>-					}</div><div class='del'>-					bi = nextbi;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			if (bitmap_end)</div><div class='del'>-				bitmap_endwrite(conf-&gt;mddev-&gt;bitmap, sh-&gt;sector,</div><div class='del'>-						STRIPE_SECTORS, 0, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (failed &gt; 2 &amp;&amp; syncing) {</div><div class='del'>-		md_done_sync(conf-&gt;mddev, STRIPE_SECTORS,0);</div><div class='del'>-		clear_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='del'>-		syncing = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * might be able to return some write requests if the parity blocks</div><div class='del'>-	 * are safe, or on a failed drive</div><div class='del'>-	 */</div><div class='del'>-	pdev = &amp;sh-&gt;dev[pd_idx];</div><div class='del'>-	p_failed = (failed &gt;= 1 &amp;&amp; failed_num[0] == pd_idx)</div><div class='del'>-		|| (failed &gt;= 2 &amp;&amp; failed_num[1] == pd_idx);</div><div class='del'>-	qdev = &amp;sh-&gt;dev[qd_idx];</div><div class='del'>-	q_failed = (failed &gt;= 1 &amp;&amp; failed_num[0] == qd_idx)</div><div class='del'>-		|| (failed &gt;= 2 &amp;&amp; failed_num[1] == qd_idx);</div><div class='del'>-</div><div class='del'>-	if ( written &amp;&amp;</div><div class='del'>-	     ( p_failed || ((test_bit(R5_Insync, &amp;pdev-&gt;flags)</div><div class='del'>-			     &amp;&amp; !test_bit(R5_LOCKED, &amp;pdev-&gt;flags)</div><div class='del'>-			     &amp;&amp; test_bit(R5_UPTODATE, &amp;pdev-&gt;flags))) ) &amp;&amp;</div><div class='del'>-	     ( q_failed || ((test_bit(R5_Insync, &amp;qdev-&gt;flags)</div><div class='del'>-			     &amp;&amp; !test_bit(R5_LOCKED, &amp;qdev-&gt;flags)</div><div class='del'>-			     &amp;&amp; test_bit(R5_UPTODATE, &amp;qdev-&gt;flags))) ) ) {</div><div class='del'>-		/* any written block on an uptodate or failed drive can be</div><div class='del'>-		 * returned.  Note that if we 'wrote' to a failed drive,</div><div class='del'>-		 * it will be UPTODATE, but never LOCKED, so we don't need</div><div class='del'>-		 * to test 'failed' directly.</div><div class='del'>-		 */</div><div class='del'>-		for (i=disks; i--; )</div><div class='del'>-			if (sh-&gt;dev[i].written) {</div><div class='del'>-				dev = &amp;sh-&gt;dev[i];</div><div class='del'>-				if (!test_bit(R5_LOCKED, &amp;dev-&gt;flags) &amp;&amp;</div><div class='del'>-				    test_bit(R5_UPTODATE, &amp;dev-&gt;flags) ) {</div><div class='del'>-					/* We can return any write requests */</div><div class='del'>-					int bitmap_end = 0;</div><div class='del'>-					struct bio *wbi, *wbi2;</div><div class='del'>-					PRINTK("Return write for stripe %llu disc %d\n",</div><div class='del'>-					       (unsigned long long)sh-&gt;sector, i);</div><div class='del'>-					spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-					wbi = dev-&gt;written;</div><div class='del'>-					dev-&gt;written = NULL;</div><div class='del'>-					while (wbi &amp;&amp; wbi-&gt;bi_sector &lt; dev-&gt;sector + STRIPE_SECTORS) {</div><div class='del'>-						wbi2 = r5_next_bio(wbi, dev-&gt;sector);</div><div class='del'>-						if (--wbi-&gt;bi_phys_segments == 0) {</div><div class='del'>-							md_write_end(conf-&gt;mddev);</div><div class='del'>-							wbi-&gt;bi_next = return_bi;</div><div class='del'>-							return_bi = wbi;</div><div class='del'>-						}</div><div class='del'>-						wbi = wbi2;</div><div class='del'>-					}</div><div class='del'>-					if (dev-&gt;towrite == NULL)</div><div class='del'>-						bitmap_end = 1;</div><div class='del'>-					spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-					if (bitmap_end)</div><div class='del'>-						bitmap_endwrite(conf-&gt;mddev-&gt;bitmap, sh-&gt;sector,</div><div class='del'>-								STRIPE_SECTORS,</div><div class='del'>-								!test_bit(STRIPE_DEGRADED, &amp;sh-&gt;state), 0);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now we might consider reading some blocks, either to check/generate</div><div class='del'>-	 * parity, or to satisfy requests</div><div class='del'>-	 * or to load a block that is being partially written.</div><div class='del'>-	 */</div><div class='del'>-	if (to_read || non_overwrite || (to_write &amp;&amp; failed) || (syncing &amp;&amp; (uptodate &lt; disks))) {</div><div class='del'>-		for (i=disks; i--;) {</div><div class='del'>-			dev = &amp;sh-&gt;dev[i];</div><div class='del'>-			if (!test_bit(R5_LOCKED, &amp;dev-&gt;flags) &amp;&amp; !test_bit(R5_UPTODATE, &amp;dev-&gt;flags) &amp;&amp;</div><div class='del'>-			    (dev-&gt;toread ||</div><div class='del'>-			     (dev-&gt;towrite &amp;&amp; !test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)) ||</div><div class='del'>-			     syncing ||</div><div class='del'>-			     (failed &gt;= 1 &amp;&amp; (sh-&gt;dev[failed_num[0]].toread || to_write)) ||</div><div class='del'>-			     (failed &gt;= 2 &amp;&amp; (sh-&gt;dev[failed_num[1]].toread || to_write))</div><div class='del'>-				    )</div><div class='del'>-				) {</div><div class='del'>-				/* we would like to get this block, possibly</div><div class='del'>-				 * by computing it, but we might not be able to</div><div class='del'>-				 */</div><div class='del'>-				if (uptodate == disks-1) {</div><div class='del'>-					PRINTK("Computing stripe %llu block %d\n",</div><div class='del'>-					       (unsigned long long)sh-&gt;sector, i);</div><div class='del'>-					compute_block_1(sh, i, 0);</div><div class='del'>-					uptodate++;</div><div class='del'>-				} else if ( uptodate == disks-2 &amp;&amp; failed &gt;= 2 ) {</div><div class='del'>-					/* Computing 2-failure is *very* expensive; only do it if failed &gt;= 2 */</div><div class='del'>-					int other;</div><div class='del'>-					for (other=disks; other--;) {</div><div class='del'>-						if ( other == i )</div><div class='del'>-							continue;</div><div class='del'>-						if ( !test_bit(R5_UPTODATE, &amp;sh-&gt;dev[other].flags) )</div><div class='del'>-							break;</div><div class='del'>-					}</div><div class='del'>-					BUG_ON(other &lt; 0);</div><div class='del'>-					PRINTK("Computing stripe %llu blocks %d,%d\n",</div><div class='del'>-					       (unsigned long long)sh-&gt;sector, i, other);</div><div class='del'>-					compute_block_2(sh, i, other);</div><div class='del'>-					uptodate += 2;</div><div class='del'>-				} else if (test_bit(R5_Insync, &amp;dev-&gt;flags)) {</div><div class='del'>-					set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-					set_bit(R5_Wantread, &amp;dev-&gt;flags);</div><div class='del'>-#if 0</div><div class='del'>-					/* if I am just reading this block and we don't have</div><div class='del'>-					   a failed drive, or any pending writes then sidestep the cache */</div><div class='del'>-					if (sh-&gt;bh_read[i] &amp;&amp; !sh-&gt;bh_read[i]-&gt;b_reqnext &amp;&amp;</div><div class='del'>-					    ! syncing &amp;&amp; !failed &amp;&amp; !to_write) {</div><div class='del'>-						sh-&gt;bh_cache[i]-&gt;b_page =  sh-&gt;bh_read[i]-&gt;b_page;</div><div class='del'>-						sh-&gt;bh_cache[i]-&gt;b_data =  sh-&gt;bh_read[i]-&gt;b_data;</div><div class='del'>-					}</div><div class='del'>-#endif</div><div class='del'>-					locked++;</div><div class='del'>-					PRINTK("Reading block %d (sync=%d)\n",</div><div class='del'>-						i, syncing);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now to consider writing and what else, if anything should be read */</div><div class='del'>-	if (to_write) {</div><div class='del'>-		int rcw=0, must_compute=0;</div><div class='del'>-		for (i=disks ; i--;) {</div><div class='del'>-			dev = &amp;sh-&gt;dev[i];</div><div class='del'>-			/* Would I have to read this buffer for reconstruct_write */</div><div class='del'>-			if (!test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)</div><div class='del'>-			    &amp;&amp; i != pd_idx &amp;&amp; i != qd_idx</div><div class='del'>-			    &amp;&amp; (!test_bit(R5_LOCKED, &amp;dev-&gt;flags)</div><div class='del'>-#if 0</div><div class='del'>-				|| sh-&gt;bh_page[i] != bh-&gt;b_page</div><div class='del'>-#endif</div><div class='del'>-				    ) &amp;&amp;</div><div class='del'>-			    !test_bit(R5_UPTODATE, &amp;dev-&gt;flags)) {</div><div class='del'>-				if (test_bit(R5_Insync, &amp;dev-&gt;flags)) rcw++;</div><div class='del'>-				else {</div><div class='del'>-					PRINTK("raid6: must_compute: disk %d flags=%#lx\n", i, dev-&gt;flags);</div><div class='del'>-					must_compute++;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		PRINTK("for sector %llu, rcw=%d, must_compute=%d\n",</div><div class='del'>-		       (unsigned long long)sh-&gt;sector, rcw, must_compute);</div><div class='del'>-		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-</div><div class='del'>-		if (rcw &gt; 0)</div><div class='del'>-			/* want reconstruct write, but need to get some data */</div><div class='del'>-			for (i=disks; i--;) {</div><div class='del'>-				dev = &amp;sh-&gt;dev[i];</div><div class='del'>-				if (!test_bit(R5_OVERWRITE, &amp;dev-&gt;flags)</div><div class='del'>-				    &amp;&amp; !(failed == 0 &amp;&amp; (i == pd_idx || i == qd_idx))</div><div class='del'>-				    &amp;&amp; !test_bit(R5_LOCKED, &amp;dev-&gt;flags) &amp;&amp; !test_bit(R5_UPTODATE, &amp;dev-&gt;flags) &amp;&amp;</div><div class='del'>-				    test_bit(R5_Insync, &amp;dev-&gt;flags)) {</div><div class='del'>-					if (test_bit(STRIPE_PREREAD_ACTIVE, &amp;sh-&gt;state))</div><div class='del'>-					{</div><div class='del'>-						PRINTK("Read_old stripe %llu block %d for Reconstruct\n",</div><div class='del'>-						       (unsigned long long)sh-&gt;sector, i);</div><div class='del'>-						set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-						set_bit(R5_Wantread, &amp;dev-&gt;flags);</div><div class='del'>-						locked++;</div><div class='del'>-					} else {</div><div class='del'>-						PRINTK("Request delayed stripe %llu block %d for Reconstruct\n",</div><div class='del'>-						       (unsigned long long)sh-&gt;sector, i);</div><div class='del'>-						set_bit(STRIPE_DELAYED, &amp;sh-&gt;state);</div><div class='del'>-						set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		/* now if nothing is locked, and if we have enough data, we can start a write request */</div><div class='del'>-		if (locked == 0 &amp;&amp; rcw == 0 &amp;&amp;</div><div class='del'>-		    !test_bit(STRIPE_BIT_DELAY, &amp;sh-&gt;state)) {</div><div class='del'>-			if ( must_compute &gt; 0 ) {</div><div class='del'>-				/* We have failed blocks and need to compute them */</div><div class='del'>-				switch ( failed ) {</div><div class='del'>-				case 0:	BUG();</div><div class='del'>-				case 1: compute_block_1(sh, failed_num[0], 0); break;</div><div class='del'>-				case 2: compute_block_2(sh, failed_num[0], failed_num[1]); break;</div><div class='del'>-				default: BUG();	/* This request should have been failed? */</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			PRINTK("Computing parity for stripe %llu\n", (unsigned long long)sh-&gt;sector);</div><div class='del'>-			compute_parity(sh, RECONSTRUCT_WRITE);</div><div class='del'>-			/* now every locked buffer is ready to be written */</div><div class='del'>-			for (i=disks; i--;)</div><div class='del'>-				if (test_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags)) {</div><div class='del'>-					PRINTK("Writing stripe %llu block %d\n",</div><div class='del'>-					       (unsigned long long)sh-&gt;sector, i);</div><div class='del'>-					locked++;</div><div class='del'>-					set_bit(R5_Wantwrite, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-				}</div><div class='del'>-			/* after a RECONSTRUCT_WRITE, the stripe MUST be in-sync */</div><div class='del'>-			set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='del'>-</div><div class='del'>-			if (test_and_clear_bit(STRIPE_PREREAD_ACTIVE, &amp;sh-&gt;state)) {</div><div class='del'>-				atomic_dec(&amp;conf-&gt;preread_active_stripes);</div><div class='del'>-				if (atomic_read(&amp;conf-&gt;preread_active_stripes) &lt; IO_THRESHOLD)</div><div class='del'>-					md_wakeup_thread(conf-&gt;mddev-&gt;thread);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* maybe we need to check and possibly fix the parity for this stripe</div><div class='del'>-	 * Any reads will already have been scheduled, so we just see if enough data</div><div class='del'>-	 * is available</div><div class='del'>-	 */</div><div class='del'>-	if (syncing &amp;&amp; locked == 0 &amp;&amp; !test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='del'>-		int update_p = 0, update_q = 0;</div><div class='del'>-		struct r5dev *dev;</div><div class='del'>-</div><div class='del'>-		set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-</div><div class='del'>-		BUG_ON(failed&gt;2);</div><div class='del'>-		BUG_ON(uptodate &lt; disks);</div><div class='del'>-		/* Want to check and possibly repair P and Q.</div><div class='del'>-		 * However there could be one 'failed' device, in which</div><div class='del'>-		 * case we can only check one of them, possibly using the</div><div class='del'>-		 * other to generate missing data</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* If !tmp_page, we cannot do the calculations,</div><div class='del'>-		 * but as we have set STRIPE_HANDLE, we will soon be called</div><div class='del'>-		 * by stripe_handle with a tmp_page - just wait until then.</div><div class='del'>-		 */</div><div class='del'>-		if (tmp_page) {</div><div class='del'>-			if (failed == q_failed) {</div><div class='del'>-				/* The only possible failed device holds 'Q', so it makes</div><div class='del'>-				 * sense to check P (If anything else were failed, we would</div><div class='del'>-				 * have used P to recreate it).</div><div class='del'>-				 */</div><div class='del'>-				compute_block_1(sh, pd_idx, 1);</div><div class='del'>-				if (!page_is_zero(sh-&gt;dev[pd_idx].page)) {</div><div class='del'>-					compute_block_1(sh,pd_idx,0);</div><div class='del'>-					update_p = 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (!q_failed &amp;&amp; failed &lt; 2) {</div><div class='del'>-				/* q is not failed, and we didn't use it to generate</div><div class='del'>-				 * anything, so it makes sense to check it</div><div class='del'>-				 */</div><div class='del'>-				memcpy(page_address(tmp_page),</div><div class='del'>-				       page_address(sh-&gt;dev[qd_idx].page),</div><div class='del'>-				       STRIPE_SIZE);</div><div class='del'>-				compute_parity(sh, UPDATE_PARITY);</div><div class='del'>-				if (memcmp(page_address(tmp_page),</div><div class='del'>-					   page_address(sh-&gt;dev[qd_idx].page),</div><div class='del'>-					   STRIPE_SIZE)!= 0) {</div><div class='del'>-					clear_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='del'>-					update_q = 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (update_p || update_q) {</div><div class='del'>-				conf-&gt;mddev-&gt;resync_mismatches += STRIPE_SECTORS;</div><div class='del'>-				if (test_bit(MD_RECOVERY_CHECK, &amp;conf-&gt;mddev-&gt;recovery))</div><div class='del'>-					/* don't try to repair!! */</div><div class='del'>-					update_p = update_q = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* now write out any block on a failed drive,</div><div class='del'>-			 * or P or Q if they need it</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (failed == 2) {</div><div class='del'>-				dev = &amp;sh-&gt;dev[failed_num[1]];</div><div class='del'>-				locked++;</div><div class='del'>-				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-			if (failed &gt;= 1) {</div><div class='del'>-				dev = &amp;sh-&gt;dev[failed_num[0]];</div><div class='del'>-				locked++;</div><div class='del'>-				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (update_p) {</div><div class='del'>-				dev = &amp;sh-&gt;dev[pd_idx];</div><div class='del'>-				locked ++;</div><div class='del'>-				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-			if (update_q) {</div><div class='del'>-				dev = &amp;sh-&gt;dev[qd_idx];</div><div class='del'>-				locked++;</div><div class='del'>-				set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-				set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-			clear_bit(STRIPE_DEGRADED, &amp;sh-&gt;state);</div><div class='del'>-</div><div class='del'>-			set_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (syncing &amp;&amp; locked == 0 &amp;&amp; test_bit(STRIPE_INSYNC, &amp;sh-&gt;state)) {</div><div class='del'>-		md_done_sync(conf-&gt;mddev, STRIPE_SECTORS,1);</div><div class='del'>-		clear_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the failed drives are just a ReadError, then we might need</div><div class='del'>-	 * to progress the repair/check process</div><div class='del'>-	 */</div><div class='del'>-	if (failed &lt;= 2 &amp;&amp; ! conf-&gt;mddev-&gt;ro)</div><div class='del'>-		for (i=0; i&lt;failed;i++) {</div><div class='del'>-			dev = &amp;sh-&gt;dev[failed_num[i]];</div><div class='del'>-			if (test_bit(R5_ReadError, &amp;dev-&gt;flags)</div><div class='del'>-			    &amp;&amp; !test_bit(R5_LOCKED, &amp;dev-&gt;flags)</div><div class='del'>-			    &amp;&amp; test_bit(R5_UPTODATE, &amp;dev-&gt;flags)</div><div class='del'>-				) {</div><div class='del'>-				if (!test_bit(R5_ReWrite, &amp;dev-&gt;flags)) {</div><div class='del'>-					set_bit(R5_Wantwrite, &amp;dev-&gt;flags);</div><div class='del'>-					set_bit(R5_ReWrite, &amp;dev-&gt;flags);</div><div class='del'>-					set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-				} else {</div><div class='del'>-					/* let's read it back */</div><div class='del'>-					set_bit(R5_Wantread, &amp;dev-&gt;flags);</div><div class='del'>-					set_bit(R5_LOCKED, &amp;dev-&gt;flags);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	spin_unlock(&amp;sh-&gt;lock);</div><div class='del'>-</div><div class='del'>-	while ((bi=return_bi)) {</div><div class='del'>-		int bytes = bi-&gt;bi_size;</div><div class='del'>-</div><div class='del'>-		return_bi = bi-&gt;bi_next;</div><div class='del'>-		bi-&gt;bi_next = NULL;</div><div class='del'>-		bi-&gt;bi_size = 0;</div><div class='del'>-		bi-&gt;bi_end_io(bi, bytes, 0);</div><div class='del'>-	}</div><div class='del'>-	for (i=disks; i-- ;) {</div><div class='del'>-		int rw;</div><div class='del'>-		struct bio *bi;</div><div class='del'>-		mdk_rdev_t *rdev;</div><div class='del'>-		if (test_and_clear_bit(R5_Wantwrite, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-			rw = 1;</div><div class='del'>-		else if (test_and_clear_bit(R5_Wantread, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-			rw = 0;</div><div class='del'>-		else</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bi = &amp;sh-&gt;dev[i].req;</div><div class='del'>-</div><div class='del'>-		bi-&gt;bi_rw = rw;</div><div class='del'>-		if (rw)</div><div class='del'>-			bi-&gt;bi_end_io = raid6_end_write_request;</div><div class='del'>-		else</div><div class='del'>-			bi-&gt;bi_end_io = raid6_end_read_request;</div><div class='del'>-</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-		if (rdev &amp;&amp; test_bit(Faulty, &amp;rdev-&gt;flags))</div><div class='del'>-			rdev = NULL;</div><div class='del'>-		if (rdev)</div><div class='del'>-			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-		if (rdev) {</div><div class='del'>-			if (syncing)</div><div class='del'>-				md_sync_acct(rdev-&gt;bdev, STRIPE_SECTORS);</div><div class='del'>-</div><div class='del'>-			bi-&gt;bi_bdev = rdev-&gt;bdev;</div><div class='del'>-			PRINTK("for %llu schedule op %ld on disc %d\n",</div><div class='del'>-				(unsigned long long)sh-&gt;sector, bi-&gt;bi_rw, i);</div><div class='del'>-			atomic_inc(&amp;sh-&gt;count);</div><div class='del'>-			bi-&gt;bi_sector = sh-&gt;sector + rdev-&gt;data_offset;</div><div class='del'>-			bi-&gt;bi_flags = 1 &lt;&lt; BIO_UPTODATE;</div><div class='del'>-			bi-&gt;bi_vcnt = 1;</div><div class='del'>-			bi-&gt;bi_max_vecs = 1;</div><div class='del'>-			bi-&gt;bi_idx = 0;</div><div class='del'>-			bi-&gt;bi_io_vec = &amp;sh-&gt;dev[i].vec;</div><div class='del'>-			bi-&gt;bi_io_vec[0].bv_len = STRIPE_SIZE;</div><div class='del'>-			bi-&gt;bi_io_vec[0].bv_offset = 0;</div><div class='del'>-			bi-&gt;bi_size = STRIPE_SIZE;</div><div class='del'>-			bi-&gt;bi_next = NULL;</div><div class='del'>-			if (rw == WRITE &amp;&amp;</div><div class='del'>-			    test_bit(R5_ReWrite, &amp;sh-&gt;dev[i].flags))</div><div class='del'>-				atomic_add(STRIPE_SECTORS, &amp;rdev-&gt;corrected_errors);</div><div class='del'>-			generic_make_request(bi);</div><div class='del'>-		} else {</div><div class='del'>-			if (rw == 1)</div><div class='del'>-				set_bit(STRIPE_DEGRADED, &amp;sh-&gt;state);</div><div class='del'>-			PRINTK("skip op %ld on disc %d for sector %llu\n",</div><div class='del'>-				bi-&gt;bi_rw, i, (unsigned long long)sh-&gt;sector);</div><div class='del'>-			clear_bit(R5_LOCKED, &amp;sh-&gt;dev[i].flags);</div><div class='del'>-			set_bit(STRIPE_HANDLE, &amp;sh-&gt;state);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid6_activate_delayed(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	if (atomic_read(&amp;conf-&gt;preread_active_stripes) &lt; IO_THRESHOLD) {</div><div class='del'>-		while (!list_empty(&amp;conf-&gt;delayed_list)) {</div><div class='del'>-			struct list_head *l = conf-&gt;delayed_list.next;</div><div class='del'>-			struct stripe_head *sh;</div><div class='del'>-			sh = list_entry(l, struct stripe_head, lru);</div><div class='del'>-			list_del_init(l);</div><div class='del'>-			clear_bit(STRIPE_DELAYED, &amp;sh-&gt;state);</div><div class='del'>-			if (!test_and_set_bit(STRIPE_PREREAD_ACTIVE, &amp;sh-&gt;state))</div><div class='del'>-				atomic_inc(&amp;conf-&gt;preread_active_stripes);</div><div class='del'>-			list_add_tail(&amp;sh-&gt;lru, &amp;conf-&gt;handle_list);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void activate_bit_delay(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	/* device_lock is held */</div><div class='del'>-	struct list_head head;</div><div class='del'>-	list_add(&amp;head, &amp;conf-&gt;bitmap_list);</div><div class='del'>-	list_del_init(&amp;conf-&gt;bitmap_list);</div><div class='del'>-	while (!list_empty(&amp;head)) {</div><div class='del'>-		struct stripe_head *sh = list_entry(head.next, struct stripe_head, lru);</div><div class='del'>-		list_del_init(&amp;sh-&gt;lru);</div><div class='del'>-		atomic_inc(&amp;sh-&gt;count);</div><div class='del'>-		__release_stripe(conf, sh);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unplug_slaves(mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for (i=0; i&lt;mddev-&gt;raid_disks; i++) {</div><div class='del'>-		mdk_rdev_t *rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-		if (rdev &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags) &amp;&amp; atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			request_queue_t *r_queue = bdev_get_queue(rdev-&gt;bdev);</div><div class='del'>-</div><div class='del'>-			atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-			if (r_queue-&gt;unplug_fn)</div><div class='del'>-				r_queue-&gt;unplug_fn(r_queue);</div><div class='del'>-</div><div class='del'>-			rdev_dec_pending(rdev, mddev);</div><div class='del'>-			rcu_read_lock();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid6_unplug_device(request_queue_t *q)</div><div class='del'>-{</div><div class='del'>-	mddev_t *mddev = q-&gt;queuedata;</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (blk_remove_plug(q)) {</div><div class='del'>-		conf-&gt;seq_flush++;</div><div class='del'>-		raid6_activate_delayed(conf);</div><div class='del'>-	}</div><div class='del'>-	md_wakeup_thread(mddev-&gt;thread);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;conf-&gt;device_lock, flags);</div><div class='del'>-</div><div class='del'>-	unplug_slaves(mddev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_issue_flush(request_queue_t *q, struct gendisk *disk,</div><div class='del'>-			     sector_t *error_sector)</div><div class='del'>-{</div><div class='del'>-	mddev_t *mddev = q-&gt;queuedata;</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	for (i=0; i&lt;mddev-&gt;raid_disks &amp;&amp; ret == 0; i++) {</div><div class='del'>-		mdk_rdev_t *rdev = rcu_dereference(conf-&gt;disks[i].rdev);</div><div class='del'>-		if (rdev &amp;&amp; !test_bit(Faulty, &amp;rdev-&gt;flags)) {</div><div class='del'>-			struct block_device *bdev = rdev-&gt;bdev;</div><div class='del'>-			request_queue_t *r_queue = bdev_get_queue(bdev);</div><div class='del'>-</div><div class='del'>-			if (!r_queue-&gt;issue_flush_fn)</div><div class='del'>-				ret = -EOPNOTSUPP;</div><div class='del'>-			else {</div><div class='del'>-				atomic_inc(&amp;rdev-&gt;nr_pending);</div><div class='del'>-				rcu_read_unlock();</div><div class='del'>-				ret = r_queue-&gt;issue_flush_fn(r_queue, bdev-&gt;bd_disk,</div><div class='del'>-							      error_sector);</div><div class='del'>-				rdev_dec_pending(rdev, mddev);</div><div class='del'>-				rcu_read_lock();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void raid6_plug_device(raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	blk_plug_device(conf-&gt;mddev-&gt;queue);</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int make_request (request_queue_t *q, struct bio * bi)</div><div class='del'>-{</div><div class='del'>-	mddev_t *mddev = q-&gt;queuedata;</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	const unsigned int raid_disks = conf-&gt;raid_disks;</div><div class='del'>-	const unsigned int data_disks = raid_disks - 2;</div><div class='del'>-	unsigned int dd_idx, pd_idx;</div><div class='del'>-	sector_t new_sector;</div><div class='del'>-	sector_t logical_sector, last_sector;</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	const int rw = bio_data_dir(bi);</div><div class='del'>-</div><div class='del'>-	if (unlikely(bio_barrier(bi))) {</div><div class='del'>-		bio_endio(bi, bi-&gt;bi_size, -EOPNOTSUPP);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	md_write_start(mddev, bi);</div><div class='del'>-</div><div class='del'>-	disk_stat_inc(mddev-&gt;gendisk, ios[rw]);</div><div class='del'>-	disk_stat_add(mddev-&gt;gendisk, sectors[rw], bio_sectors(bi));</div><div class='del'>-</div><div class='del'>-	logical_sector = bi-&gt;bi_sector &amp; ~((sector_t)STRIPE_SECTORS-1);</div><div class='del'>-	last_sector = bi-&gt;bi_sector + (bi-&gt;bi_size&gt;&gt;9);</div><div class='del'>-</div><div class='del'>-	bi-&gt;bi_next = NULL;</div><div class='del'>-	bi-&gt;bi_phys_segments = 1;	/* over-loaded to count active stripes */</div><div class='del'>-</div><div class='del'>-	for (;logical_sector &lt; last_sector; logical_sector += STRIPE_SECTORS) {</div><div class='del'>-		DEFINE_WAIT(w);</div><div class='del'>-</div><div class='del'>-		new_sector = raid6_compute_sector(logical_sector,</div><div class='del'>-						  raid_disks, data_disks, &amp;dd_idx, &amp;pd_idx, conf);</div><div class='del'>-</div><div class='del'>-		PRINTK("raid6: make_request, sector %llu logical %llu\n",</div><div class='del'>-		       (unsigned long long)new_sector,</div><div class='del'>-		       (unsigned long long)logical_sector);</div><div class='del'>-</div><div class='del'>-	retry:</div><div class='del'>-		prepare_to_wait(&amp;conf-&gt;wait_for_overlap, &amp;w, TASK_UNINTERRUPTIBLE);</div><div class='del'>-		sh = get_active_stripe(conf, new_sector, pd_idx, (bi-&gt;bi_rw&amp;RWA_MASK));</div><div class='del'>-		if (sh) {</div><div class='del'>-			if (!add_stripe_bio(sh, bi, dd_idx, (bi-&gt;bi_rw&amp;RW_MASK))) {</div><div class='del'>-				/* Add failed due to overlap.  Flush everything</div><div class='del'>-				 * and wait a while</div><div class='del'>-				 */</div><div class='del'>-				raid6_unplug_device(mddev-&gt;queue);</div><div class='del'>-				release_stripe(sh);</div><div class='del'>-				schedule();</div><div class='del'>-				goto retry;</div><div class='del'>-			}</div><div class='del'>-			finish_wait(&amp;conf-&gt;wait_for_overlap, &amp;w);</div><div class='del'>-			raid6_plug_device(conf);</div><div class='del'>-			handle_stripe(sh, NULL);</div><div class='del'>-			release_stripe(sh);</div><div class='del'>-		} else {</div><div class='del'>-			/* cannot get stripe for read-ahead, just give-up */</div><div class='del'>-			clear_bit(BIO_UPTODATE, &amp;bi-&gt;bi_flags);</div><div class='del'>-			finish_wait(&amp;conf-&gt;wait_for_overlap, &amp;w);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	if (--bi-&gt;bi_phys_segments == 0) {</div><div class='del'>-		int bytes = bi-&gt;bi_size;</div><div class='del'>-</div><div class='del'>-		if (rw == WRITE )</div><div class='del'>-			md_write_end(mddev);</div><div class='del'>-		bi-&gt;bi_size = 0;</div><div class='del'>-		bi-&gt;bi_end_io(bi, bytes, 0);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME go_faster isn't used */</div><div class='del'>-static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = (raid6_conf_t *) mddev-&gt;private;</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	int sectors_per_chunk = conf-&gt;chunk_size &gt;&gt; 9;</div><div class='del'>-	sector_t x;</div><div class='del'>-	unsigned long stripe;</div><div class='del'>-	int chunk_offset;</div><div class='del'>-	int dd_idx, pd_idx;</div><div class='del'>-	sector_t first_sector;</div><div class='del'>-	int raid_disks = conf-&gt;raid_disks;</div><div class='del'>-	int data_disks = raid_disks - 2;</div><div class='del'>-	sector_t max_sector = mddev-&gt;size &lt;&lt; 1;</div><div class='del'>-	int sync_blocks;</div><div class='del'>-	int still_degraded = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (sector_nr &gt;= max_sector) {</div><div class='del'>-		/* just being told to finish up .. nothing much to do */</div><div class='del'>-		unplug_slaves(mddev);</div><div class='del'>-</div><div class='del'>-		if (mddev-&gt;curr_resync &lt; max_sector) /* aborted */</div><div class='del'>-			bitmap_end_sync(mddev-&gt;bitmap, mddev-&gt;curr_resync,</div><div class='del'>-					&amp;sync_blocks, 1);</div><div class='del'>-		else /* completed sync */</div><div class='del'>-			conf-&gt;fullsync = 0;</div><div class='del'>-		bitmap_close_sync(mddev-&gt;bitmap);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* if there are 2 or more failed drives and we are trying</div><div class='del'>-	 * to resync, then assert that we are finished, because there is</div><div class='del'>-	 * nothing we can do.</div><div class='del'>-	 */</div><div class='del'>-	if (mddev-&gt;degraded &gt;= 2 &amp;&amp; test_bit(MD_RECOVERY_SYNC, &amp;mddev-&gt;recovery)) {</div><div class='del'>-		sector_t rv = (mddev-&gt;size &lt;&lt; 1) - sector_nr;</div><div class='del'>-		*skipped = 1;</div><div class='del'>-		return rv;</div><div class='del'>-	}</div><div class='del'>-	if (!bitmap_start_sync(mddev-&gt;bitmap, sector_nr, &amp;sync_blocks, 1) &amp;&amp;</div><div class='del'>-	    !test_bit(MD_RECOVERY_REQUESTED, &amp;mddev-&gt;recovery) &amp;&amp;</div><div class='del'>-	    !conf-&gt;fullsync &amp;&amp; sync_blocks &gt;= STRIPE_SECTORS) {</div><div class='del'>-		/* we can skip this block, and probably more */</div><div class='del'>-		sync_blocks /= STRIPE_SECTORS;</div><div class='del'>-		*skipped = 1;</div><div class='del'>-		return sync_blocks * STRIPE_SECTORS; /* keep things rounded to whole stripes */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	x = sector_nr;</div><div class='del'>-	chunk_offset = sector_div(x, sectors_per_chunk);</div><div class='del'>-	stripe = x;</div><div class='del'>-	BUG_ON(x != stripe);</div><div class='del'>-</div><div class='del'>-	first_sector = raid6_compute_sector((sector_t)stripe*data_disks*sectors_per_chunk</div><div class='del'>-		+ chunk_offset, raid_disks, data_disks, &amp;dd_idx, &amp;pd_idx, conf);</div><div class='del'>-	sh = get_active_stripe(conf, sector_nr, pd_idx, 1);</div><div class='del'>-	if (sh == NULL) {</div><div class='del'>-		sh = get_active_stripe(conf, sector_nr, pd_idx, 0);</div><div class='del'>-		/* make sure we don't swamp the stripe cache if someone else</div><div class='del'>-		 * is trying to get access</div><div class='del'>-		 */</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='del'>-	}</div><div class='del'>-	/* Need to check if array will still be degraded after recovery/resync</div><div class='del'>-	 * We don't need to check the 'failed' flag as when that gets set,</div><div class='del'>-	 * recovery aborts.</div><div class='del'>-	 */</div><div class='del'>-	for (i=0; i&lt;mddev-&gt;raid_disks; i++)</div><div class='del'>-		if (conf-&gt;disks[i].rdev == NULL)</div><div class='del'>-			still_degraded = 1;</div><div class='del'>-</div><div class='del'>-	bitmap_start_sync(mddev-&gt;bitmap, sector_nr, &amp;sync_blocks, still_degraded);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sh-&gt;lock);</div><div class='del'>-	set_bit(STRIPE_SYNCING, &amp;sh-&gt;state);</div><div class='del'>-	clear_bit(STRIPE_INSYNC, &amp;sh-&gt;state);</div><div class='del'>-	spin_unlock(&amp;sh-&gt;lock);</div><div class='del'>-</div><div class='del'>-	handle_stripe(sh, NULL);</div><div class='del'>-	release_stripe(sh);</div><div class='del'>-</div><div class='del'>-	return STRIPE_SECTORS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is our raid6 kernel thread.</div><div class='del'>- *</div><div class='del'>- * We scan the hash table for stripes which can be handled now.</div><div class='del'>- * During the scan, completed stripes are saved for us by the interrupt</div><div class='del'>- * handler, so that they will not have to wait for our next wakeup.</div><div class='del'>- */</div><div class='del'>-static void raid6d (mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	int handled;</div><div class='del'>-</div><div class='del'>-	PRINTK("+++ raid6d active\n");</div><div class='del'>-</div><div class='del'>-	md_check_recovery(mddev);</div><div class='del'>-</div><div class='del'>-	handled = 0;</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	while (1) {</div><div class='del'>-		struct list_head *first;</div><div class='del'>-</div><div class='del'>-		if (conf-&gt;seq_flush - conf-&gt;seq_write &gt; 0) {</div><div class='del'>-			int seq = conf-&gt;seq_flush;</div><div class='del'>-			spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			bitmap_unplug(mddev-&gt;bitmap);</div><div class='del'>-			spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-			conf-&gt;seq_write = seq;</div><div class='del'>-			activate_bit_delay(conf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (list_empty(&amp;conf-&gt;handle_list) &amp;&amp;</div><div class='del'>-		    atomic_read(&amp;conf-&gt;preread_active_stripes) &lt; IO_THRESHOLD &amp;&amp;</div><div class='del'>-		    !blk_queue_plugged(mddev-&gt;queue) &amp;&amp;</div><div class='del'>-		    !list_empty(&amp;conf-&gt;delayed_list))</div><div class='del'>-			raid6_activate_delayed(conf);</div><div class='del'>-</div><div class='del'>-		if (list_empty(&amp;conf-&gt;handle_list))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		first = conf-&gt;handle_list.next;</div><div class='del'>-		sh = list_entry(first, struct stripe_head, lru);</div><div class='del'>-</div><div class='del'>-		list_del_init(first);</div><div class='del'>-		atomic_inc(&amp;sh-&gt;count);</div><div class='del'>-		BUG_ON(atomic_read(&amp;sh-&gt;count)!= 1);</div><div class='del'>-		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-</div><div class='del'>-		handled++;</div><div class='del'>-		handle_stripe(sh, conf-&gt;spare_page);</div><div class='del'>-		release_stripe(sh);</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	}</div><div class='del'>-	PRINTK("%d stripes handled\n", handled);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-</div><div class='del'>-	unplug_slaves(mddev);</div><div class='del'>-</div><div class='del'>-	PRINTK("--- raid6d inactive\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-raid6_show_stripe_cache_size(mddev_t *mddev, char *page)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	if (conf)</div><div class='del'>-		return sprintf(page, "%d\n", conf-&gt;max_nr_stripes);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-raid6_store_stripe_cache_size(mddev_t *mddev, const char *page, size_t len)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	char *end;</div><div class='del'>-	int new;</div><div class='del'>-	if (len &gt;= PAGE_SIZE)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!conf)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	new = simple_strtoul(page, &amp;end, 10);</div><div class='del'>-	if (!*page || (*end &amp;&amp; *end != '\n') )</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (new &lt;= 16 || new &gt; 32768)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	while (new &lt; conf-&gt;max_nr_stripes) {</div><div class='del'>-		if (drop_one_stripe(conf))</div><div class='del'>-			conf-&gt;max_nr_stripes--;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	while (new &gt; conf-&gt;max_nr_stripes) {</div><div class='del'>-		if (grow_one_stripe(conf))</div><div class='del'>-			conf-&gt;max_nr_stripes++;</div><div class='del'>-		else break;</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct md_sysfs_entry</div><div class='del'>-raid6_stripecache_size = __ATTR(stripe_cache_size, S_IRUGO | S_IWUSR,</div><div class='del'>-				raid6_show_stripe_cache_size,</div><div class='del'>-				raid6_store_stripe_cache_size);</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stripe_cache_active_show(mddev_t *mddev, char *page)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-	if (conf)</div><div class='del'>-		return sprintf(page, "%d\n", atomic_read(&amp;conf-&gt;active_stripes));</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct md_sysfs_entry</div><div class='del'>-raid6_stripecache_active = __ATTR_RO(stripe_cache_active);</div><div class='del'>-</div><div class='del'>-static struct attribute *raid6_attrs[] =  {</div><div class='del'>-	&amp;raid6_stripecache_size.attr,</div><div class='del'>-	&amp;raid6_stripecache_active.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-static struct attribute_group raid6_attrs_group = {</div><div class='del'>-	.name = NULL,</div><div class='del'>-	.attrs = raid6_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int run(mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf;</div><div class='del'>-	int raid_disk, memory;</div><div class='del'>-	mdk_rdev_t *rdev;</div><div class='del'>-	struct disk_info *disk;</div><div class='del'>-	struct list_head *tmp;</div><div class='del'>-</div><div class='del'>-	if (mddev-&gt;level != 6) {</div><div class='del'>-		PRINTK("raid6: %s: raid level not set to 6 (%d)\n", mdname(mddev), mddev-&gt;level);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mddev-&gt;private = kzalloc(sizeof (raid6_conf_t), GFP_KERNEL);</div><div class='del'>-	if ((conf = mddev-&gt;private) == NULL)</div><div class='del'>-		goto abort;</div><div class='del'>-	conf-&gt;disks = kzalloc(mddev-&gt;raid_disks * sizeof(struct disk_info),</div><div class='del'>-				 GFP_KERNEL);</div><div class='del'>-	if (!conf-&gt;disks)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	conf-&gt;mddev = mddev;</div><div class='del'>-</div><div class='del'>-	if ((conf-&gt;stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL)) == NULL)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	conf-&gt;spare_page = alloc_page(GFP_KERNEL);</div><div class='del'>-	if (!conf-&gt;spare_page)</div><div class='del'>-		goto abort;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;conf-&gt;device_lock);</div><div class='del'>-	init_waitqueue_head(&amp;conf-&gt;wait_for_stripe);</div><div class='del'>-	init_waitqueue_head(&amp;conf-&gt;wait_for_overlap);</div><div class='del'>-	INIT_LIST_HEAD(&amp;conf-&gt;handle_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;conf-&gt;delayed_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;conf-&gt;bitmap_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;conf-&gt;inactive_list);</div><div class='del'>-	atomic_set(&amp;conf-&gt;active_stripes, 0);</div><div class='del'>-	atomic_set(&amp;conf-&gt;preread_active_stripes, 0);</div><div class='del'>-</div><div class='del'>-	PRINTK("raid6: run(%s) called.\n", mdname(mddev));</div><div class='del'>-</div><div class='del'>-	ITERATE_RDEV(mddev,rdev,tmp) {</div><div class='del'>-		raid_disk = rdev-&gt;raid_disk;</div><div class='del'>-		if (raid_disk &gt;= mddev-&gt;raid_disks</div><div class='del'>-		    || raid_disk &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		disk = conf-&gt;disks + raid_disk;</div><div class='del'>-</div><div class='del'>-		disk-&gt;rdev = rdev;</div><div class='del'>-</div><div class='del'>-		if (test_bit(In_sync, &amp;rdev-&gt;flags)) {</div><div class='del'>-			char b[BDEVNAME_SIZE];</div><div class='del'>-			printk(KERN_INFO "raid6: device %s operational as raid"</div><div class='del'>-			       " disk %d\n", bdevname(rdev-&gt;bdev,b),</div><div class='del'>-			       raid_disk);</div><div class='del'>-			conf-&gt;working_disks++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conf-&gt;raid_disks = mddev-&gt;raid_disks;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 0 for a fully functional array, 1 or 2 for a degraded array.</div><div class='del'>-	 */</div><div class='del'>-	mddev-&gt;degraded = conf-&gt;failed_disks = conf-&gt;raid_disks - conf-&gt;working_disks;</div><div class='del'>-	conf-&gt;mddev = mddev;</div><div class='del'>-	conf-&gt;chunk_size = mddev-&gt;chunk_size;</div><div class='del'>-	conf-&gt;level = mddev-&gt;level;</div><div class='del'>-	conf-&gt;algorithm = mddev-&gt;layout;</div><div class='del'>-	conf-&gt;max_nr_stripes = NR_STRIPES;</div><div class='del'>-</div><div class='del'>-	/* device size must be a multiple of chunk size */</div><div class='del'>-	mddev-&gt;size &amp;= ~(mddev-&gt;chunk_size/1024 -1);</div><div class='del'>-	mddev-&gt;resync_max_sectors = mddev-&gt;size &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-	if (conf-&gt;raid_disks &lt; 4) {</div><div class='del'>-		printk(KERN_ERR "raid6: not enough configured devices for %s (%d, minimum 4)\n",</div><div class='del'>-		       mdname(mddev), conf-&gt;raid_disks);</div><div class='del'>-		goto abort;</div><div class='del'>-	}</div><div class='del'>-	if (!conf-&gt;chunk_size || conf-&gt;chunk_size % 4) {</div><div class='del'>-		printk(KERN_ERR "raid6: invalid chunk size %d for %s\n",</div><div class='del'>-		       conf-&gt;chunk_size, mdname(mddev));</div><div class='del'>-		goto abort;</div><div class='del'>-	}</div><div class='del'>-	if (conf-&gt;algorithm &gt; ALGORITHM_RIGHT_SYMMETRIC) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "raid6: unsupported parity algorithm %d for %s\n",</div><div class='del'>-		       conf-&gt;algorithm, mdname(mddev));</div><div class='del'>-		goto abort;</div><div class='del'>-	}</div><div class='del'>-	if (mddev-&gt;degraded &gt; 2) {</div><div class='del'>-		printk(KERN_ERR "raid6: not enough operational devices for %s"</div><div class='del'>-		       " (%d/%d failed)\n",</div><div class='del'>-		       mdname(mddev), conf-&gt;failed_disks, conf-&gt;raid_disks);</div><div class='del'>-		goto abort;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mddev-&gt;degraded &gt; 0 &amp;&amp;</div><div class='del'>-	    mddev-&gt;recovery_cp != MaxSector) {</div><div class='del'>-		if (mddev-&gt;ok_start_degraded)</div><div class='del'>-			printk(KERN_WARNING "raid6: starting dirty degraded array:%s"</div><div class='del'>-			       "- data corruption possible.\n",</div><div class='del'>-			       mdname(mddev));</div><div class='del'>-		else {</div><div class='del'>-			printk(KERN_ERR "raid6: cannot start dirty degraded array"</div><div class='del'>-			       " for %s\n", mdname(mddev));</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		mddev-&gt;thread = md_register_thread(raid6d, mddev, "%s_raid6");</div><div class='del'>-		if (!mddev-&gt;thread) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "raid6: couldn't allocate thread for %s\n",</div><div class='del'>-			       mdname(mddev));</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memory = conf-&gt;max_nr_stripes * (sizeof(struct stripe_head) +</div><div class='del'>-		 conf-&gt;raid_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024;</div><div class='del'>-	if (grow_stripes(conf, conf-&gt;max_nr_stripes)) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "raid6: couldn't allocate %dkB for buffers\n", memory);</div><div class='del'>-		shrink_stripes(conf);</div><div class='del'>-		md_unregister_thread(mddev-&gt;thread);</div><div class='del'>-		goto abort;</div><div class='del'>-	} else</div><div class='del'>-		printk(KERN_INFO "raid6: allocated %dkB for %s\n",</div><div class='del'>-		       memory, mdname(mddev));</div><div class='del'>-</div><div class='del'>-	if (mddev-&gt;degraded == 0)</div><div class='del'>-		printk(KERN_INFO "raid6: raid level %d set %s active with %d out of %d"</div><div class='del'>-		       " devices, algorithm %d\n", conf-&gt;level, mdname(mddev),</div><div class='del'>-		       mddev-&gt;raid_disks-mddev-&gt;degraded, mddev-&gt;raid_disks,</div><div class='del'>-		       conf-&gt;algorithm);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ALERT "raid6: raid level %d set %s active with %d"</div><div class='del'>-		       " out of %d devices, algorithm %d\n", conf-&gt;level,</div><div class='del'>-		       mdname(mddev), mddev-&gt;raid_disks - mddev-&gt;degraded,</div><div class='del'>-		       mddev-&gt;raid_disks, conf-&gt;algorithm);</div><div class='del'>-</div><div class='del'>-	print_raid6_conf(conf);</div><div class='del'>-</div><div class='del'>-	/* read-ahead size must cover two whole stripes, which is</div><div class='del'>-	 * 2 * (n-2) * chunksize where 'n' is the number of raid devices</div><div class='del'>-	 */</div><div class='del'>-	{</div><div class='del'>-		int stripe = (mddev-&gt;raid_disks-2) * mddev-&gt;chunk_size</div><div class='del'>-			/ PAGE_SIZE;</div><div class='del'>-		if (mddev-&gt;queue-&gt;backing_dev_info.ra_pages &lt; 2 * stripe)</div><div class='del'>-			mddev-&gt;queue-&gt;backing_dev_info.ra_pages = 2 * stripe;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ok, everything is just fine now */</div><div class='del'>-	sysfs_create_group(&amp;mddev-&gt;kobj, &amp;raid6_attrs_group);</div><div class='del'>-</div><div class='del'>-	mddev-&gt;array_size =  mddev-&gt;size * (mddev-&gt;raid_disks - 2);</div><div class='del'>-</div><div class='del'>-	mddev-&gt;queue-&gt;unplug_fn = raid6_unplug_device;</div><div class='del'>-	mddev-&gt;queue-&gt;issue_flush_fn = raid6_issue_flush;</div><div class='del'>-	return 0;</div><div class='del'>-abort:</div><div class='del'>-	if (conf) {</div><div class='del'>-		print_raid6_conf(conf);</div><div class='del'>-		safe_put_page(conf-&gt;spare_page);</div><div class='del'>-		kfree(conf-&gt;stripe_hashtbl);</div><div class='del'>-		kfree(conf-&gt;disks);</div><div class='del'>-		kfree(conf);</div><div class='del'>-	}</div><div class='del'>-	mddev-&gt;private = NULL;</div><div class='del'>-	printk(KERN_ALERT "raid6: failed to run raid set %s\n", mdname(mddev));</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int stop (mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = (raid6_conf_t *) mddev-&gt;private;</div><div class='del'>-</div><div class='del'>-	md_unregister_thread(mddev-&gt;thread);</div><div class='del'>-	mddev-&gt;thread = NULL;</div><div class='del'>-	shrink_stripes(conf);</div><div class='del'>-	kfree(conf-&gt;stripe_hashtbl);</div><div class='del'>-	blk_sync_queue(mddev-&gt;queue); /* the unplug fn references 'conf'*/</div><div class='del'>-	sysfs_remove_group(&amp;mddev-&gt;kobj, &amp;raid6_attrs_group);</div><div class='del'>-	kfree(conf);</div><div class='del'>-	mddev-&gt;private = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if RAID6_DUMPSTATE</div><div class='del'>-static void print_sh (struct seq_file *seq, struct stripe_head *sh)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	seq_printf(seq, "sh %llu, pd_idx %d, state %ld.\n",</div><div class='del'>-		   (unsigned long long)sh-&gt;sector, sh-&gt;pd_idx, sh-&gt;state);</div><div class='del'>-	seq_printf(seq, "sh %llu,  count %d.\n",</div><div class='del'>-		   (unsigned long long)sh-&gt;sector, atomic_read(&amp;sh-&gt;count));</div><div class='del'>-	seq_printf(seq, "sh %llu, ", (unsigned long long)sh-&gt;sector);</div><div class='del'>-	for (i = 0; i &lt; sh-&gt;raid_conf-&gt;raid_disks; i++) {</div><div class='del'>-		seq_printf(seq, "(cache%d: %p %ld) ",</div><div class='del'>-			   i, sh-&gt;dev[i].page, sh-&gt;dev[i].flags);</div><div class='del'>-	}</div><div class='del'>-	seq_printf(seq, "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void printall (struct seq_file *seq, raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	struct stripe_head *sh;</div><div class='del'>-	struct hlist_node *hn;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-	for (i = 0; i &lt; NR_HASH; i++) {</div><div class='del'>-		sh = conf-&gt;stripe_hashtbl[i];</div><div class='del'>-		hlist_for_each_entry(sh, hn, &amp;conf-&gt;stripe_hashtbl[i], hash) {</div><div class='del'>-			if (sh-&gt;raid_conf != conf)</div><div class='del'>-				continue;</div><div class='del'>-			print_sh(seq, sh);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void status (struct seq_file *seq, mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = (raid6_conf_t *) mddev-&gt;private;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	seq_printf (seq, " level %d, %dk chunk, algorithm %d", mddev-&gt;level, mddev-&gt;chunk_size &gt;&gt; 10, mddev-&gt;layout);</div><div class='del'>-	seq_printf (seq, " [%d/%d] [", conf-&gt;raid_disks, conf-&gt;working_disks);</div><div class='del'>-	for (i = 0; i &lt; conf-&gt;raid_disks; i++)</div><div class='del'>- 		seq_printf (seq, "%s",</div><div class='del'>-			    conf-&gt;disks[i].rdev &amp;&amp;</div><div class='del'>-			    test_bit(In_sync, &amp;conf-&gt;disks[i].rdev-&gt;flags) ? "U" : "_");</div><div class='del'>-	seq_printf (seq, "]");</div><div class='del'>-#if RAID6_DUMPSTATE</div><div class='del'>-	seq_printf (seq, "\n");</div><div class='del'>-	printall(seq, conf);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void print_raid6_conf (raid6_conf_t *conf)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct disk_info *tmp;</div><div class='del'>-</div><div class='del'>-	printk("RAID6 conf printout:\n");</div><div class='del'>-	if (!conf) {</div><div class='del'>-		printk("(conf==NULL)\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	printk(" --- rd:%d wd:%d fd:%d\n", conf-&gt;raid_disks,</div><div class='del'>-		 conf-&gt;working_disks, conf-&gt;failed_disks);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='del'>-		char b[BDEVNAME_SIZE];</div><div class='del'>-		tmp = conf-&gt;disks + i;</div><div class='del'>-		if (tmp-&gt;rdev)</div><div class='del'>-		printk(" disk %d, o:%d, dev:%s\n",</div><div class='del'>-			i, !test_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags),</div><div class='del'>-			bdevname(tmp-&gt;rdev-&gt;bdev,b));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_spare_active(mddev_t *mddev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	raid6_conf_t *conf = mddev-&gt;private;</div><div class='del'>-	struct disk_info *tmp;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; conf-&gt;raid_disks; i++) {</div><div class='del'>-		tmp = conf-&gt;disks + i;</div><div class='del'>-		if (tmp-&gt;rdev</div><div class='del'>-		    &amp;&amp; !test_bit(Faulty, &amp;tmp-&gt;rdev-&gt;flags)</div><div class='del'>-		    &amp;&amp; !test_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags)) {</div><div class='del'>-			mddev-&gt;degraded--;</div><div class='del'>-			conf-&gt;failed_disks--;</div><div class='del'>-			conf-&gt;working_disks++;</div><div class='del'>-			set_bit(In_sync, &amp;tmp-&gt;rdev-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	print_raid6_conf(conf);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_remove_disk(mddev_t *mddev, int number)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev-&gt;private;</div><div class='del'>-	int err = 0;</div><div class='del'>-	mdk_rdev_t *rdev;</div><div class='del'>-	struct disk_info *p = conf-&gt;disks + number;</div><div class='del'>-</div><div class='del'>-	print_raid6_conf(conf);</div><div class='del'>-	rdev = p-&gt;rdev;</div><div class='del'>-	if (rdev) {</div><div class='del'>-		if (test_bit(In_sync, &amp;rdev-&gt;flags) ||</div><div class='del'>-		    atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto abort;</div><div class='del'>-		}</div><div class='del'>-		p-&gt;rdev = NULL;</div><div class='del'>-		synchronize_rcu();</div><div class='del'>-		if (atomic_read(&amp;rdev-&gt;nr_pending)) {</div><div class='del'>-			/* lost the race, try later */</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			p-&gt;rdev = rdev;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-abort:</div><div class='del'>-</div><div class='del'>-	print_raid6_conf(conf);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev-&gt;private;</div><div class='del'>-	int found = 0;</div><div class='del'>-	int disk;</div><div class='del'>-	struct disk_info *p;</div><div class='del'>-</div><div class='del'>-	if (mddev-&gt;degraded &gt; 2)</div><div class='del'>-		/* no point adding a device */</div><div class='del'>-		return 0;</div><div class='del'>-	/*</div><div class='del'>-	 * find the disk ... but prefer rdev-&gt;saved_raid_disk</div><div class='del'>-	 * if possible.</div><div class='del'>-	 */</div><div class='del'>-	if (rdev-&gt;saved_raid_disk &gt;= 0 &amp;&amp;</div><div class='del'>-	    conf-&gt;disks[rdev-&gt;saved_raid_disk].rdev == NULL)</div><div class='del'>-		disk = rdev-&gt;saved_raid_disk;</div><div class='del'>-	else</div><div class='del'>-		disk = 0;</div><div class='del'>-	for ( ; disk &lt; mddev-&gt;raid_disks; disk++)</div><div class='del'>-		if ((p=conf-&gt;disks + disk)-&gt;rdev == NULL) {</div><div class='del'>-			clear_bit(In_sync, &amp;rdev-&gt;flags);</div><div class='del'>-			rdev-&gt;raid_disk = disk;</div><div class='del'>-			found = 1;</div><div class='del'>-			if (rdev-&gt;saved_raid_disk != disk)</div><div class='del'>-				conf-&gt;fullsync = 1;</div><div class='del'>-			rcu_assign_pointer(p-&gt;rdev, rdev);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	print_raid6_conf(conf);</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int raid6_resize(mddev_t *mddev, sector_t sectors)</div><div class='del'>-{</div><div class='del'>-	/* no resync is happening, and there is enough space</div><div class='del'>-	 * on all devices, so we can resize.</div><div class='del'>-	 * We need to make sure resync covers any new space.</div><div class='del'>-	 * If the array is shrinking we should possibly wait until</div><div class='del'>-	 * any io in the removed space completes, but it hardly seems</div><div class='del'>-	 * worth it.</div><div class='del'>-	 */</div><div class='del'>-	sectors &amp;= ~((sector_t)mddev-&gt;chunk_size/512 - 1);</div><div class='del'>-	mddev-&gt;array_size = (sectors * (mddev-&gt;raid_disks-2))&gt;&gt;1;</div><div class='del'>-	set_capacity(mddev-&gt;gendisk, mddev-&gt;array_size &lt;&lt; 1);</div><div class='del'>-	mddev-&gt;changed = 1;</div><div class='del'>-	if (sectors/2  &gt; mddev-&gt;size &amp;&amp; mddev-&gt;recovery_cp == MaxSector) {</div><div class='del'>-		mddev-&gt;recovery_cp = mddev-&gt;size &lt;&lt; 1;</div><div class='del'>-		set_bit(MD_RECOVERY_NEEDED, &amp;mddev-&gt;recovery);</div><div class='del'>-	}</div><div class='del'>-	mddev-&gt;size = sectors /2;</div><div class='del'>-	mddev-&gt;resync_max_sectors = sectors;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid6_quiesce(mddev_t *mddev, int state)</div><div class='del'>-{</div><div class='del'>-	raid6_conf_t *conf = mddev_to_conf(mddev);</div><div class='del'>-</div><div class='del'>-	switch(state) {</div><div class='del'>-	case 1: /* stop all writes */</div><div class='del'>-		spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-		conf-&gt;quiesce = 1;</div><div class='del'>-		wait_event_lock_irq(conf-&gt;wait_for_stripe,</div><div class='del'>-				    atomic_read(&amp;conf-&gt;active_stripes) == 0,</div><div class='del'>-				    conf-&gt;device_lock, /* nothing */);</div><div class='del'>-		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 0: /* re-enable writes */</div><div class='del'>-		spin_lock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-		conf-&gt;quiesce = 0;</div><div class='del'>-		wake_up(&amp;conf-&gt;wait_for_stripe);</div><div class='del'>-		spin_unlock_irq(&amp;conf-&gt;device_lock);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mdk_personality raid6_personality =</div><div class='del'>-{</div><div class='del'>-	.name		= "raid6",</div><div class='del'>-	.level		= 6,</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.make_request	= make_request,</div><div class='del'>-	.run		= run,</div><div class='del'>-	.stop		= stop,</div><div class='del'>-	.status		= status,</div><div class='del'>-	.error_handler	= error,</div><div class='del'>-	.hot_add_disk	= raid6_add_disk,</div><div class='del'>-	.hot_remove_disk= raid6_remove_disk,</div><div class='del'>-	.spare_active	= raid6_spare_active,</div><div class='del'>-	.sync_request	= sync_request,</div><div class='del'>-	.resize		= raid6_resize,</div><div class='del'>-	.quiesce	= raid6_quiesce,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init raid6_init(void)</div><div class='del'>-{</div><div class='del'>-	int e;</div><div class='del'>-</div><div class='del'>-	e = raid6_select_algo();</div><div class='del'>-	if ( e )</div><div class='del'>-		return e;</div><div class='del'>-</div><div class='del'>-	return register_md_personality(&amp;raid6_personality);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void raid6_exit (void)</div><div class='del'>-{</div><div class='del'>-	unregister_md_personality(&amp;raid6_personality);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(raid6_init);</div><div class='del'>-module_exit(raid6_exit);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_ALIAS("md-personality-8"); /* RAID6 */</div><div class='del'>-MODULE_ALIAS("md-raid6");</div><div class='del'>-MODULE_ALIAS("md-level-6");</div><div class='head'>diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig<br/>index 344d83aae3ec..ef52e6da01ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/Kconfig</a></div><div class='hunk'>@@ -25,7 +25,7 @@ config VIDEO_DEV</div><div class='ctx'> 	  module will be called videodev.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_V4L1</div><div class='del'>-	boolean "Enable Video For Linux API 1 (DEPRECATED)"</div><div class='add'>+	bool "Enable Video For Linux API 1 (DEPRECATED)"</div><div class='ctx'> 	depends on VIDEO_DEV</div><div class='ctx'> 	select VIDEO_V4L1_COMPAT</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -36,7 +36,7 @@ config VIDEO_V4L1</div><div class='ctx'> 	  If you are unsure as to whether this is required, answer Y.</div><div class='ctx'> </div><div class='ctx'> config VIDEO_V4L1_COMPAT</div><div class='del'>-	boolean "Enable Video For Linux API 1 compatible Layer"</div><div class='add'>+	bool "Enable Video For Linux API 1 compatible Layer"</div><div class='ctx'> 	depends on VIDEO_DEV</div><div class='ctx'> 	default y</div><div class='ctx'> 	---help---</div><div class='head'>diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile<br/>index 61b89617a967..8e7448230643 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> saa7146-objs    := saa7146_i2c.o saa7146_core.o</div><div class='del'>-saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o</div><div class='add'>+saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o</div><div class='ctx'> ir-common-objs  := ir-functions.o ir-keymaps.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o</div><div class='head'>diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c<br/>index 397cff8b345b..8eaa88fd8b9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/ir-functions.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/ir-functions.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/ir-functions.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/ir-functions.c</a></div><div class='hunk'>@@ -269,4 +269,3 @@ EXPORT_SYMBOL_GPL(ir_decode_pulsedistance);</div><div class='ctx'>  * c-basic-offset: 8</div><div class='ctx'>  * End:</div><div class='ctx'>  */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c<br/>index a294d5c2c73f..ca98d9478947 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/ir-keymaps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/ir-keymaps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/ir-keymaps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/ir-keymaps.c</a></div><div class='hunk'>@@ -618,7 +618,7 @@ IR_KEYTAB_TYPE ir_codes_em_terratec[IR_KEYTAB_SIZE] = {</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ir_codes_em_terratec);</div><div class='ctx'> </div><div class='del'>-IR_KEYTAB_TYPE ir_codes_em_pinnacle_usb[IR_KEYTAB_SIZE] = {</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_pinnacle_grey[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x3a ] = KEY_0,</div><div class='ctx'> 	[ 0x31 ] = KEY_1,</div><div class='ctx'> 	[ 0x32 ] = KEY_2,</div><div class='hunk'>@@ -670,7 +670,7 @@ IR_KEYTAB_TYPE ir_codes_em_pinnacle_usb[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x27 ] = KEY_RECORD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(ir_codes_em_pinnacle_usb);</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_pinnacle_grey);</div><div class='ctx'> </div><div class='ctx'> IR_KEYTAB_TYPE ir_codes_flyvideo[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x0f ] = KEY_0,</div><div class='hunk'>@@ -1263,34 +1263,51 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x0f ] = KEY_9,</div><div class='ctx'> </div><div class='ctx'> 	[ 0x00 ] = KEY_POWER,</div><div class='del'>-	[ 0x02 ] = KEY_TUNER,		/* TV/FM */</div><div class='del'>-	[ 0x1e ] = KEY_VIDEO,</div><div class='add'>+	[ 0x1b ] = KEY_AUDIO,           /* Audio Source */</div><div class='add'>+	[ 0x02 ] = KEY_TUNER,		/* TV/FM, not on Y0400052 */</div><div class='add'>+	[ 0x1e ] = KEY_VIDEO,           /* Video Source */</div><div class='add'>+	[ 0x16 ] = KEY_INFO,            /* Display information */</div><div class='ctx'> 	[ 0x04 ] = KEY_VOLUMEUP,</div><div class='ctx'> 	[ 0x08 ] = KEY_VOLUMEDOWN,</div><div class='ctx'> 	[ 0x0c ] = KEY_CHANNELUP,</div><div class='ctx'> 	[ 0x10 ] = KEY_CHANNELDOWN,</div><div class='ctx'> 	[ 0x03 ] = KEY_ZOOM,		/* fullscreen */</div><div class='del'>-	[ 0x1f ] = KEY_SUBTITLE,		/* closed caption/teletext */</div><div class='add'>+	[ 0x1f ] = KEY_TEXT,		/* closed caption/teletext */</div><div class='ctx'> 	[ 0x20 ] = KEY_SLEEP,</div><div class='add'>+	[ 0x29 ] = KEY_CLEAR,           /* boss key */</div><div class='ctx'> 	[ 0x14 ] = KEY_MUTE,</div><div class='ctx'> 	[ 0x2b ] = KEY_RED,</div><div class='ctx'> 	[ 0x2c ] = KEY_GREEN,</div><div class='ctx'> 	[ 0x2d ] = KEY_YELLOW,</div><div class='ctx'> 	[ 0x2e ] = KEY_BLUE,</div><div class='del'>-	[ 0x18 ] = KEY_KPPLUS,		/* fine tune + */</div><div class='del'>-	[ 0x19 ] = KEY_KPMINUS,		/* fine tune - */</div><div class='add'>+	[ 0x18 ] = KEY_KPPLUS,		/* fine tune + , not on Y040052 */</div><div class='add'>+	[ 0x19 ] = KEY_KPMINUS,		/* fine tune - , not on Y040052 */</div><div class='add'>+	[ 0x2a ] = KEY_MEDIA,           /* PIP (Picture in picture */</div><div class='ctx'> 	[ 0x21 ] = KEY_DOT,</div><div class='ctx'> 	[ 0x13 ] = KEY_ENTER,</div><div class='del'>-	[ 0x22 ] = KEY_BACK,</div><div class='add'>+	[ 0x11 ] = KEY_LAST,            /* Recall (last channel */</div><div class='add'>+	[ 0x22 ] = KEY_PREVIOUS,</div><div class='ctx'> 	[ 0x23 ] = KEY_PLAYPAUSE,</div><div class='ctx'> 	[ 0x24 ] = KEY_NEXT,</div><div class='add'>+	[ 0x25 ] = KEY_ARCHIVE,       /* Time Shifting */</div><div class='ctx'> 	[ 0x26 ] = KEY_STOP,</div><div class='del'>-	[ 0x27 ] = KEY_RECORD</div><div class='add'>+	[ 0x27 ] = KEY_RECORD,</div><div class='add'>+	[ 0x28 ] = KEY_SAVE,          /* Screenshot */</div><div class='add'>+	[ 0x2f ] = KEY_MENU,</div><div class='add'>+	[ 0x30 ] = KEY_CANCEL,</div><div class='add'>+	[ 0x31 ] = KEY_CHANNEL,       /* Channel Surf */</div><div class='add'>+	[ 0x32 ] = KEY_SUBTITLE,</div><div class='add'>+	[ 0x33 ] = KEY_LANGUAGE,</div><div class='add'>+	[ 0x34 ] = KEY_REWIND,</div><div class='add'>+	[ 0x35 ] = KEY_FASTFORWARD,</div><div class='add'>+	[ 0x36 ] = KEY_TV,</div><div class='add'>+	[ 0x37 ] = KEY_RADIO,         /* FM */</div><div class='add'>+	[ 0x38 ] = KEY_DVD</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ir_codes_winfast);</div><div class='ctx'> </div><div class='del'>-IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE] = {</div><div class='add'>+IR_KEYTAB_TYPE ir_codes_pinnacle_color[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x59 ] = KEY_MUTE,</div><div class='ctx'> 	[ 0x4a ] = KEY_POWER,</div><div class='ctx'> </div><div class='hunk'>@@ -1348,7 +1365,7 @@ IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE] = {</div><div class='ctx'> 	[ 0x0a ] = KEY_BACKSPACE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(ir_codes_pinnacle);</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_pinnacle_color);</div><div class='ctx'> </div><div class='ctx'> /* Hauppauge: the newer, gray remotes (seems there are multiple</div><div class='ctx'>  * slightly different versions), shipped with cx88+ivtv cards.</div><div class='hunk'>@@ -1413,3 +1430,46 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = {</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ir_codes_hauppauge_new);</div><div class='ctx'> </div><div class='add'>+IR_KEYTAB_TYPE ir_codes_npgtech[IR_KEYTAB_SIZE] = {</div><div class='add'>+	[ 0x1d ] = KEY_SWITCHVIDEOMODE, /* switch inputs */</div><div class='add'>+	[ 0x2a ] = KEY_FRONT,</div><div class='add'>+</div><div class='add'>+	[ 0x3e ] = KEY_1,</div><div class='add'>+	[ 0x02 ] = KEY_2,</div><div class='add'>+	[ 0x06 ] = KEY_3,</div><div class='add'>+	[ 0x0a ] = KEY_4,</div><div class='add'>+	[ 0x0e ] = KEY_5,</div><div class='add'>+	[ 0x12 ] = KEY_6,</div><div class='add'>+	[ 0x16 ] = KEY_7,</div><div class='add'>+	[ 0x1a ] = KEY_8,</div><div class='add'>+	[ 0x1e ] = KEY_9,</div><div class='add'>+	[ 0x3a ] = KEY_0,</div><div class='add'>+	[ 0x22 ] = KEY_NUMLOCK,         /* -/-- */</div><div class='add'>+	[ 0x20 ] = KEY_REFRESH,</div><div class='add'>+</div><div class='add'>+	[ 0x03 ] = KEY_BRIGHTNESSDOWN,</div><div class='add'>+	[ 0x28 ] = KEY_AUDIO,</div><div class='add'>+	[ 0x3c ] = KEY_UP,</div><div class='add'>+	[ 0x3f ] = KEY_LEFT,</div><div class='add'>+	[ 0x2e ] = KEY_MUTE,</div><div class='add'>+	[ 0x3b ] = KEY_RIGHT,</div><div class='add'>+	[ 0x00 ] = KEY_DOWN,</div><div class='add'>+	[ 0x07 ] = KEY_BRIGHTNESSUP,</div><div class='add'>+	[ 0x2c ] = KEY_TEXT,</div><div class='add'>+</div><div class='add'>+	[ 0x37 ] = KEY_RECORD,</div><div class='add'>+	[ 0x17 ] = KEY_PLAY,</div><div class='add'>+	[ 0x13 ] = KEY_PAUSE,</div><div class='add'>+	[ 0x26 ] = KEY_STOP,</div><div class='add'>+	[ 0x18 ] = KEY_FASTFORWARD,</div><div class='add'>+	[ 0x14 ] = KEY_REWIND,</div><div class='add'>+	[ 0x33 ] = KEY_ZOOM,</div><div class='add'>+	[ 0x32 ] = KEY_KEYBOARD,</div><div class='add'>+	[ 0x30 ] = KEY_GOTO,            /* Pointing arrow */</div><div class='add'>+	[ 0x36 ] = KEY_MACRO,           /* Maximize/Minimize (yellow) */</div><div class='add'>+	[ 0x0b ] = KEY_RADIO,</div><div class='add'>+	[ 0x10 ] = KEY_POWER,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(ir_codes_npgtech);</div><div class='head'>diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c<br/>index 8cdd4d265ffa..b88451e33c09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/saa7146_core.c</a></div><div class='hunk'>@@ -363,7 +363,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent</div><div class='ctx'> 	saa7146_write(dev, MC2, 0xf8000000);</div><div class='ctx'> </div><div class='ctx'> 	/* request an interrupt for the saa7146 */</div><div class='del'>-	err = request_irq(pci-&gt;irq, interrupt_hw, SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+	err = request_irq(pci-&gt;irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		ERR(("request_irq() failed.\n"));</div><div class='head'>diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c<br/>index 523ab3851c7b..0027acc5b8e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_fops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_fops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_fops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/saa7146_fops.c</a></div><div class='hunk'>@@ -501,6 +501,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_vv_init);</div><div class='ctx'> </div><div class='ctx'> int saa7146_vv_release(struct saa7146_dev* dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -515,6 +516,7 @@ int saa7146_vv_release(struct saa7146_dev* dev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_vv_release);</div><div class='ctx'> </div><div class='ctx'> int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,</div><div class='ctx'> 			    char *name, int type)</div><div class='hunk'>@@ -553,6 +555,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,</div><div class='ctx'> 	*vid = vfd;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_register_device);</div><div class='ctx'> </div><div class='ctx'> int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -571,6 +574,7 @@ int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_unregister_device);</div><div class='ctx'> </div><div class='ctx'> static int __init saa7146_vv_init_module(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c<br/>index 33bec8a6843b..d2905720eb74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_hlp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_hlp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_hlp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/saa7146_hlp.c</a></div><div class='hunk'>@@ -158,7 +158,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* the horizontal scaling increment controls the UV filter</div><div class='del'>-	   to reduce the bandwith to improve the display quality,</div><div class='add'>+	   to reduce the bandwidth to improve the display quality,</div><div class='ctx'> 	   so set it ... */</div><div class='ctx'> 	if ( xsci == 0x400)</div><div class='ctx'> 		pfuv = 0x00;</div><div class='hunk'>@@ -641,6 +641,7 @@ void saa7146_set_hps_source_and_sync(struct saa7146_dev *dev, int source, int sy</div><div class='ctx'> 	vv-&gt;current_hps_source = source;</div><div class='ctx'> 	vv-&gt;current_hps_sync = sync;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_set_hps_source_and_sync);</div><div class='ctx'> </div><div class='ctx'> int saa7146_enable_overlay(struct saa7146_fh *fh)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c<br/>index e7079d1bd537..8393d472d3b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_video.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/common/saa7146_video.c</a></div><div class='hunk'>@@ -318,6 +318,7 @@ int saa7146_start_preview(struct saa7146_fh *fh)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_start_preview);</div><div class='ctx'> </div><div class='ctx'> int saa7146_stop_preview(struct saa7146_fh *fh)</div><div class='ctx'> {</div><div class='hunk'>@@ -352,6 +353,7 @@ int saa7146_stop_preview(struct saa7146_fh *fh)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(saa7146_stop_preview);</div><div class='ctx'> </div><div class='ctx'> static int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/media/common/saa7146_vv_ksyms.c b/drivers/media/common/saa7146_vv_ksyms.c<br/>deleted file mode 100644<br/>index 62226eb4753b..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/common/saa7146_vv_ksyms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/common/saa7146_vv_ksyms.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;media/saa7146_vv.h&gt;</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_start_preview);</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_stop_preview);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_set_hps_source_and_sync);</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_register_device);</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_unregister_device);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_vv_init);</div><div class='del'>-EXPORT_SYMBOL_GPL(saa7146_vv_release);</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h<br/>index b3dd0603cd92..5a6c4fe249e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/b2c2/flexcop-common.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #ifndef __FLEXCOP_COMMON_H__</div><div class='ctx'> #define __FLEXCOP_COMMON_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c<br/>index 9c7f122826e0..3be87c72e37b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-fe-tuner.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-fe-tuner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-fe-tuner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/b2c2/flexcop-fe-tuner.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include "stv0297.h"</div><div class='ctx'> #include "mt312.h"</div><div class='ctx'> #include "lgdt330x.h"</div><div class='add'>+#include "lg_h06xf.h"</div><div class='ctx'> #include "dvb-pll.h"</div><div class='ctx'> </div><div class='ctx'> /* lnb control */</div><div class='hunk'>@@ -166,11 +167,12 @@ static int samsung_tbmu24112_set_symbol_rate(struct dvb_frontend* fe, u32 srate,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int samsung_tbmu24112_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)</div><div class='add'>+static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='add'>+	struct flexcop_device *fc = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	div = params-&gt;frequency / 125;</div><div class='ctx'> </div><div class='hunk'>@@ -181,8 +183,11 @@ static int samsung_tbmu24112_pll_set(struct dvb_frontend* fe, struct i2c_adapter</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;frequency &lt; 1500000) buf[3] |= 0x10;</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(&amp;fc-&gt;i2c_adap, &amp;msg, 1) != 1) {</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -241,7 +246,6 @@ static struct stv0299_config samsung_tbmu24112_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = samsung_tbmu24112_set_symbol_rate,</div><div class='del'>-	.pll_set = samsung_tbmu24112_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* dvb-t mt352 */</div><div class='hunk'>@@ -264,11 +268,14 @@ static int samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf)</div><div class='add'>+static int samsung_tdtc9251dh0_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	unsigned char bs = 0;</div><div class='ctx'> </div><div class='add'>+	if (buf_len &lt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	#define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */</div><div class='ctx'> 	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='hunk'>@@ -276,19 +283,18 @@ static int samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_front</div><div class='ctx'> 	if (params-&gt;frequency &gt;= 161000000 &amp;&amp; params-&gt;frequency &lt;= 439000000) bs = 0x0a;</div><div class='ctx'> 	if (params-&gt;frequency &gt;= 447000000 &amp;&amp; params-&gt;frequency &lt;= 863000000) bs = 0x08;</div><div class='ctx'> </div><div class='del'>-	pllbuf[0] = 0xc2; /* Note: non-linux standard PLL i2c address */</div><div class='add'>+	pllbuf[0] = 0x61;</div><div class='ctx'> 	pllbuf[1] = div &gt;&gt; 8;</div><div class='ctx'> 	pllbuf[2] = div &amp; 0xff;</div><div class='ctx'> 	pllbuf[3] = 0xcc;</div><div class='ctx'> 	pllbuf[4] = bs;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config samsung_tdtc9251dh0_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.demod_init    = samsung_tdtc9251dh0_demod_init,</div><div class='del'>-	.pll_set       = samsung_tdtc9251dh0_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)</div><div class='hunk'>@@ -297,56 +303,21 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir</div><div class='ctx'> 	return request_firmware(fw, name, fc-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lgdt3303_pll_set(struct dvb_frontend* fe,</div><div class='del'>-			    struct dvb_frontend_parameters* params)</div><div class='add'>+static int lgdt3303_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcop_device *fc = fe-&gt;dvb-&gt;priv;</div><div class='del'>-	u8 buf[4];</div><div class='del'>-	struct i2c_msg msg =</div><div class='del'>-		{ .addr = 0x61, .flags = 0, .buf = buf, .len = 4 };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dvb_pll_configure(&amp;dvb_pll_tdvs_tua6034,buf, params-&gt;frequency, 0);</div><div class='del'>-	dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",</div><div class='del'>-			__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);</div><div class='del'>-	if ((err = i2c_transfer(&amp;fc-&gt;i2c_adap, &amp;msg, 1)) != 1) {</div><div class='del'>-		printk(KERN_WARNING "lgdt3303: %s error "</div><div class='del'>-			   "(addr %02x &lt;- %02x, err = %i)\n",</div><div class='del'>-			   __FUNCTION__, buf[0], buf[1], err);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		else</div><div class='del'>-			return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf[0] = 0x86 | 0x18;</div><div class='del'>-	buf[1] = 0x50;</div><div class='del'>-	msg.len = 2;</div><div class='del'>-	if ((err = i2c_transfer(&amp;fc-&gt;i2c_adap, &amp;msg, 1)) != 1) {</div><div class='del'>-		printk(KERN_WARNING "lgdt3303: %s error "</div><div class='del'>-			   "(addr %02x &lt;- %02x, err = %i)\n",</div><div class='del'>-			   __FUNCTION__, buf[0], buf[1], err);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		else</div><div class='del'>-			return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return lg_h06xf_pll_set(fe, &amp;fc-&gt;i2c_adap, params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct lgdt330x_config air2pc_atsc_hd5000_config = {</div><div class='ctx'> 	.demod_address       = 0x59,</div><div class='ctx'> 	.demod_chip          = LGDT3303,</div><div class='ctx'> 	.serial_mpeg         = 0x04,</div><div class='del'>-	.pll_set             = lgdt3303_pll_set,</div><div class='ctx'> 	.clock_polarity_flip = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nxt200x_config samsung_tbmv_config = {</div><div class='ctx'> 	.demod_address    = 0x0a,</div><div class='del'>-	.pll_address      = 0xc2,</div><div class='del'>-	.pll_desc         = &amp;dvb_pll_samsung_tbmv,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct bcm3510_config air2pc_atsc_first_gen_config = {</div><div class='hunk'>@@ -354,7 +325,7 @@ static struct bcm3510_config air2pc_atsc_first_gen_config = {</div><div class='ctx'> 	.request_firmware = flexcop_fe_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int skystar23_samsung_tbdu18132_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -371,6 +342,8 @@ static int skystar23_samsung_tbdu18132_pll_set(struct dvb_frontend* fe, struct d</div><div class='ctx'> 	if (params-&gt;frequency &lt; 1550000)</div><div class='ctx'> 		buf[3] |= 0x02;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;fc-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -379,9 +352,52 @@ static int skystar23_samsung_tbdu18132_pll_set(struct dvb_frontend* fe, struct d</div><div class='ctx'> static struct mt312_config skystar23_samsung_tbdu18132_config = {</div><div class='ctx'> </div><div class='ctx'> 	.demod_address = 0x0e,</div><div class='del'>-	.pll_set = skystar23_samsung_tbdu18132_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,</div><div class='add'>+					       struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	struct flexcop_device *fc = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	u16 div;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+/*  62.5 kHz * 10 */</div><div class='add'>+#define REF_FREQ    625</div><div class='add'>+#define FREQ_OFFSET 36125</div><div class='add'>+</div><div class='add'>+	div = ((fep-&gt;frequency/1000 + FREQ_OFFSET ) * 10)  / REF_FREQ; // 4 MHz = 4000 KHz</div><div class='add'>+</div><div class='add'>+	buf[0] = (u8)( div &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+	buf[1] = (u8)        div &amp; 0xff;</div><div class='add'>+</div><div class='add'>+/* F(osc) = N * Reference Freq. (62.5 kHz)</div><div class='add'>+ * byte 2 :  0 N14 N13 N12 N11 N10 N9  N8</div><div class='add'>+ * byte 3 : N7 N6  N5  N4  N3  N2  N1  N0</div><div class='add'>+ * byte 4 : 1  *   *   AGD R3  R2  R1  R0</div><div class='add'>+ * byte 5 : C1 *   RE  RTS BS4 BS3 BS2 BS1</div><div class='add'>+ * AGD = 1, R3 R2 R1 R0 = 0 1 0 1 =&gt; byte 4 = 1**10101 = 0x95 */</div><div class='add'>+	buf[2] = 0x95;</div><div class='add'>+</div><div class='add'>+// Range(MHz)  C1 *  RE RTS BS4 BS3 BS2 BS1  Byte 5</div><div class='add'>+//  47 - 153   0  *  0   0   0   0   0   1   0x01</div><div class='add'>+// 153 - 430   0  *  0   0   0   0   1   0   0x02</div><div class='add'>+// 430 - 822   0  *  0   0   1   0   0   0   0x08</div><div class='add'>+// 822 - 862   1  *  0   0   1   0   0   0   0x88</div><div class='add'>+</div><div class='add'>+	     if (fep-&gt;frequency &lt;= 153000000) buf[3] = 0x01;</div><div class='add'>+	else if (fep-&gt;frequency &lt;= 430000000) buf[3] = 0x02;</div><div class='add'>+	else if (fep-&gt;frequency &lt;= 822000000) buf[3] = 0x08;</div><div class='add'>+	else buf[3] = 0x88;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep-&gt;frequency, buf[0],buf[1],buf[2],buf[3]);</div><div class='add'>+	ret = fc-&gt;i2c_request(fc,FC_WRITE,FC_I2C_PORT_TUNER,0x61,buf[0],&amp;buf[1],3);</div><div class='add'>+	deb_tuner("tuner write returned: %d\n",ret);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static u8 alps_tdee4_stv0297_inittab[] = {</div><div class='ctx'> 	0x80, 0x01,</div><div class='hunk'>@@ -490,7 +506,9 @@ int flexcop_frontend_init(struct flexcop_device *fc)</div><div class='ctx'> </div><div class='ctx'> 	/* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */</div><div class='ctx'> 	if ((fc-&gt;fe = stv0299_attach(&amp;samsung_tbmu24112_config, &amp;fc-&gt;i2c_adap)) != NULL) {</div><div class='del'>-		ops = fc-&gt;fe-&gt;ops;</div><div class='add'>+		ops = &amp;fc-&gt;fe-&gt;ops;</div><div class='add'>+</div><div class='add'>+		ops-&gt;tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;</div><div class='ctx'> </div><div class='ctx'> 		ops-&gt;set_voltage = flexcop_set_voltage;</div><div class='ctx'> </div><div class='hunk'>@@ -503,16 +521,19 @@ int flexcop_frontend_init(struct flexcop_device *fc)</div><div class='ctx'> 	/* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */</div><div class='ctx'> 	if ((fc-&gt;fe = mt352_attach(&amp;samsung_tdtc9251dh0_config, &amp;fc-&gt;i2c_adap)) != NULL ) {</div><div class='ctx'> 		fc-&gt;dev_type          = FC_AIR_DVB;</div><div class='add'>+		fc-&gt;fe-&gt;ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;</div><div class='ctx'> 		info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);</div><div class='ctx'> 	} else</div><div class='ctx'> 	/* try the air atsc 2nd generation (nxt2002) */</div><div class='ctx'> 	if ((fc-&gt;fe = nxt200x_attach(&amp;samsung_tbmv_config, &amp;fc-&gt;i2c_adap)) != NULL) {</div><div class='ctx'> 		fc-&gt;dev_type          = FC_AIR_ATSC2;</div><div class='add'>+		dvb_pll_attach(fc-&gt;fe, 0x61, &amp;fc-&gt;i2c_adap, &amp;dvb_pll_samsung_tbmv);</div><div class='ctx'> 		info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);</div><div class='ctx'> 	} else</div><div class='ctx'> 	/* try the air atsc 3nd generation (lgdt3303) */</div><div class='ctx'> 	if ((fc-&gt;fe = lgdt330x_attach(&amp;air2pc_atsc_hd5000_config, &amp;fc-&gt;i2c_adap)) != NULL) {</div><div class='ctx'> 		fc-&gt;dev_type          = FC_AIR_ATSC3;</div><div class='add'>+		fc-&gt;fe-&gt;ops.tuner_ops.set_params = lgdt3303_tuner_set_params;</div><div class='ctx'> 		info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);</div><div class='ctx'> 	} else</div><div class='ctx'> 	/* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */</div><div class='hunk'>@@ -523,11 +544,14 @@ int flexcop_frontend_init(struct flexcop_device *fc)</div><div class='ctx'> 	/* try the cable dvb (stv0297) */</div><div class='ctx'> 	if ((fc-&gt;fe = stv0297_attach(&amp;alps_tdee4_stv0297_config, &amp;fc-&gt;i2c_adap)) != NULL) {</div><div class='ctx'> 		fc-&gt;dev_type                        = FC_CABLE;</div><div class='add'>+		fc-&gt;fe-&gt;ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;</div><div class='ctx'> 		info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);</div><div class='ctx'> 	} else</div><div class='ctx'> 	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */</div><div class='ctx'> 	if ((fc-&gt;fe = vp310_mt312_attach(&amp;skystar23_samsung_tbdu18132_config, &amp;fc-&gt;i2c_adap)) != NULL) {</div><div class='del'>-		ops = fc-&gt;fe-&gt;ops;</div><div class='add'>+		ops = &amp;fc-&gt;fe-&gt;ops;</div><div class='add'>+</div><div class='add'>+		ops-&gt;tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params;</div><div class='ctx'> </div><div class='ctx'> 		ops-&gt;diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;</div><div class='ctx'> 		ops-&gt;diseqc_send_burst      = flexcop_diseqc_send_burst;</div><div class='hunk'>@@ -547,7 +571,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dvb_register_frontend(&amp;fc-&gt;dvb_adapter, fc-&gt;fe)) {</div><div class='ctx'> 			err("frontend registration failed!");</div><div class='del'>-			ops = fc-&gt;fe-&gt;ops;</div><div class='add'>+			ops = &amp;fc-&gt;fe-&gt;ops;</div><div class='ctx'> 			if (ops-&gt;release != NULL)</div><div class='ctx'> 				ops-&gt;release(fc-&gt;fe);</div><div class='ctx'> 			fc-&gt;fe = NULL;</div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c<br/>index 9bc40bdcc282..eb2e6432c8c2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/b2c2/flexcop-pci.c</a></div><div class='hunk'>@@ -242,19 +242,16 @@ static int flexcop_pci_dma_init(struct flexcop_pci *fc_pci)</div><div class='ctx'> 	if ((ret = flexcop_dma_allocate(fc_pci-&gt;pdev,&amp;fc_pci-&gt;dma[0],FC_DEFAULT_DMA1_BUFSIZE)) != 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if ((ret = flexcop_dma_allocate(fc_pci-&gt;pdev,&amp;fc_pci-&gt;dma[1],FC_DEFAULT_DMA2_BUFSIZE)) != 0)</div><div class='del'>-		goto dma1_free;</div><div class='add'>+	if ((ret = flexcop_dma_allocate(fc_pci-&gt;pdev,&amp;fc_pci-&gt;dma[1],FC_DEFAULT_DMA2_BUFSIZE)) != 0) {</div><div class='add'>+		flexcop_dma_free(&amp;fc_pci-&gt;dma[0]);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	flexcop_sram_set_dest(fc_pci-&gt;fc_dev,FC_SRAM_DEST_MEDIA | FC_SRAM_DEST_NET, FC_SRAM_DEST_TARGET_DMA1);</div><div class='ctx'> 	flexcop_sram_set_dest(fc_pci-&gt;fc_dev,FC_SRAM_DEST_CAO   | FC_SRAM_DEST_CAI, FC_SRAM_DEST_TARGET_DMA2);</div><div class='ctx'> </div><div class='ctx'> 	fc_pci-&gt;init_state |= FC_PCI_DMA_INIT;</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='del'>-dma1_free:</div><div class='del'>-	flexcop_dma_free(&amp;fc_pci-&gt;dma[0]);</div><div class='del'>-</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -297,13 +294,13 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)</div><div class='ctx'> 	pci_set_drvdata(fc_pci-&gt;pdev, fc_pci);</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = request_irq(fc_pci-&gt;pdev-&gt;irq, flexcop_pci_isr,</div><div class='del'>-					SA_SHIRQ, DRIVER_NAME, fc_pci)) != 0)</div><div class='add'>+					IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)</div><div class='ctx'> 		goto err_pci_iounmap;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;fc_pci-&gt;irq_lock);</div><div class='ctx'> </div><div class='ctx'> 	fc_pci-&gt;init_state |= FC_PCI_INIT;</div><div class='del'>-	goto success;</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='ctx'> err_pci_iounmap:</div><div class='ctx'> 	pci_iounmap(fc_pci-&gt;pdev, fc_pci-&gt;io_mem);</div><div class='hunk'>@@ -312,8 +309,6 @@ err_pci_release_regions:</div><div class='ctx'> 	pci_release_regions(fc_pci-&gt;pdev);</div><div class='ctx'> err_pci_disable_device:</div><div class='ctx'> 	pci_disable_device(fc_pci-&gt;pdev);</div><div class='del'>-</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -378,14 +373,14 @@ static int flexcop_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;fc_pci-&gt;irq_check_work, flexcop_pci_irq_check_work, fc_pci);</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='ctx'> err_fc_exit:</div><div class='ctx'> 	flexcop_device_exit(fc);</div><div class='ctx'> err_pci_exit:</div><div class='ctx'> 	flexcop_pci_exit(fc_pci);</div><div class='ctx'> err_kfree:</div><div class='ctx'> 	flexcop_device_kfree(fc);</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c<br/>index 06ec9fff0ec1..515954f96c9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop-usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/b2c2/flexcop-usb.c</a></div><div class='hunk'>@@ -433,11 +433,10 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)</div><div class='ctx'> 	flexcop_wan_set_speed(fc_usb-&gt;fc_dev,FC_WAN_SPEED_8MBITS);</div><div class='ctx'> 	flexcop_sram_ctrl(fc_usb-&gt;fc_dev,1,1,1);</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-	goto success;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> urb_error:</div><div class='ctx'> 	flexcop_usb_transfer_exit(fc_usb);</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -515,15 +514,14 @@ static int flexcop_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 		goto err_fc_exit;</div><div class='ctx'> </div><div class='ctx'> 	info("%s successfully initialized and connected.",DRIVER_NAME);</div><div class='del'>-	ret = 0;</div><div class='del'>-	goto success;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> err_fc_exit:</div><div class='ctx'> 	flexcop_device_exit(fc);</div><div class='ctx'> err_usb_exit:</div><div class='ctx'> 	flexcop_usb_exit(fc_usb);</div><div class='ctx'> err_kfree:</div><div class='ctx'> 	flexcop_device_kfree(fc);</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c<br/>index 56ba52470676..29ec4183118e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/b2c2/flexcop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/b2c2/flexcop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/b2c2/flexcop.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static int flexcop_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)</div><div class='ctx'> static int flexcop_dvb_init(struct flexcop_device *fc)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	if ((ret = dvb_register_adapter(&amp;fc-&gt;dvb_adapter,"FlexCop Digital TV device",fc-&gt;owner)) &lt; 0) {</div><div class='add'>+	if ((ret = dvb_register_adapter(&amp;fc-&gt;dvb_adapter,"FlexCop Digital TV device",fc-&gt;owner,fc-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		err("error registering DVB adapter");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -116,7 +116,7 @@ static int flexcop_dvb_init(struct flexcop_device *fc)</div><div class='ctx'> 	dvb_net_init(&amp;fc-&gt;dvb_adapter, &amp;fc-&gt;dvbnet, &amp;fc-&gt;demux.dmx);</div><div class='ctx'> </div><div class='ctx'> 	fc-&gt;init_state |= FC_STATE_DVB_INIT;</div><div class='del'>-	goto success;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> err_connect_frontend:</div><div class='ctx'> 	fc-&gt;demux.dmx.remove_frontend(&amp;fc-&gt;demux.dmx,&amp;fc-&gt;mem_frontend);</div><div class='hunk'>@@ -129,9 +129,6 @@ err_dmx_dev:</div><div class='ctx'> err_dmx:</div><div class='ctx'> 	dvb_unregister_adapter(&amp;fc-&gt;dvb_adapter);</div><div class='ctx'> 	return ret;</div><div class='del'>-</div><div class='del'>-success:</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void flexcop_dvb_exit(struct flexcop_device *fc)</div><div class='hunk'>@@ -279,11 +276,10 @@ int flexcop_device_initialize(struct flexcop_device *fc)</div><div class='ctx'> </div><div class='ctx'> 	flexcop_device_name(fc,"initialization of","complete");</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='del'>-	goto success;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> error:</div><div class='ctx'> 	flexcop_device_exit(fc);</div><div class='del'>-success:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(flexcop_device_initialize);</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c<br/>index 5500f8a0ffe2..755822ee6e9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/bt878.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/bt878.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/bt878.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/bt8xx/bt878.c</a></div><div class='hunk'>@@ -63,8 +63,6 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging, default is 0 (off).");</div><div class='ctx'> int bt878_num;</div><div class='ctx'> struct bt878 bt878[BT878_MAX];</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(bt878_debug);</div><div class='del'>-EXPORT_SYMBOL(bt878_verbose);</div><div class='ctx'> EXPORT_SYMBOL(bt878_num);</div><div class='ctx'> EXPORT_SYMBOL(bt878);</div><div class='ctx'> </div><div class='hunk'>@@ -393,7 +391,9 @@ static struct cards card_list[] __devinitdata = {</div><div class='ctx'> 	{ 0x07711461, BTTV_BOARD_AVDVBT_771,			"AVermedia AverTV DVB-T 771" },</div><div class='ctx'> 	{ 0xdb1018ac, BTTV_BOARD_DVICO_DVBT_LITE,		"DViCO FusionHDTV DVB-T Lite" },</div><div class='ctx'> 	{ 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,	"DViCO FusionHDTV 5 Lite" },</div><div class='del'>-	{ 0x20007063, BTTV_BOARD_PC_HDTV,			"pcHDTV HD-2000 TV"},</div><div class='add'>+	{ 0x20007063, BTTV_BOARD_PC_HDTV,			"pcHDTV HD-2000 TV" },</div><div class='add'>+	{ 0x00261822, BTTV_BOARD_TWINHAN_DST,			"DNTV Live! Mini" },</div><div class='add'>+</div><div class='ctx'> 	{ 0, -1, NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -417,6 +417,11 @@ static int __devinit bt878_probe(struct pci_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "bt878: Bt878 AUDIO function found (%d).\n",</div><div class='ctx'> 	       bt878_num);</div><div class='add'>+	if (bt878_num &gt;= BT878_MAX) {</div><div class='add'>+		printk(KERN_ERR "bt878: Too many devices inserted\n");</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto fail0;</div><div class='add'>+	}</div><div class='ctx'> 	if (pci_enable_device(dev))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +488,7 @@ static int __devinit bt878_probe(struct pci_dev *dev,</div><div class='ctx'> 	btwrite(0, BT848_INT_MASK);</div><div class='ctx'> </div><div class='ctx'> 	result = request_irq(bt-&gt;irq, bt878_irq,</div><div class='del'>-			     SA_SHIRQ | SA_INTERRUPT, "bt878",</div><div class='add'>+			     IRQF_SHARED | IRQF_DISABLED, "bt878",</div><div class='ctx'> 			     (void *) bt);</div><div class='ctx'> 	if (result == -EINVAL) {</div><div class='ctx'> 		printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c<br/>index 1cfa5e5035d8..d687a14ec0a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/bt8xx/dst.c</a></div><div class='hunk'>@@ -38,6 +38,10 @@ static unsigned int dst_addons;</div><div class='ctx'> module_param(dst_addons, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (No addons)");</div><div class='ctx'> </div><div class='add'>+static unsigned int dst_algo;</div><div class='add'>+module_param(dst_algo, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(dst_algo, "tuning algo: default is 0=(SW), 1=(HW)");</div><div class='add'>+</div><div class='ctx'> #define HAS_LOCK		1</div><div class='ctx'> #define ATTEMPT_TUNE		2</div><div class='ctx'> #define HAS_POWER		4</div><div class='hunk'>@@ -47,20 +51,24 @@ MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (No addons)");</div><div class='ctx'> #define DST_INFO		2</div><div class='ctx'> #define DST_DEBUG		3</div><div class='ctx'> </div><div class='del'>-#define dprintk(x, y, z, format, arg...) do {						\</div><div class='del'>-	if (z) {									\</div><div class='del'>-		if	((x &gt; DST_ERROR) &amp;&amp; (x &gt; y))					\</div><div class='del'>-			printk(KERN_ERR "%s: " format "\n", __FUNCTION__ , ##arg);	\</div><div class='del'>-		else if	((x &gt; DST_NOTICE) &amp;&amp; (x &gt; y))					\</div><div class='del'>-			printk(KERN_NOTICE "%s: " format "\n", __FUNCTION__ , ##arg);	\</div><div class='del'>-		else if ((x &gt; DST_INFO) &amp;&amp; (x &gt; y))					\</div><div class='del'>-			printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##arg);	\</div><div class='del'>-		else if ((x &gt; DST_DEBUG) &amp;&amp; (x &gt; y))					\</div><div class='del'>-			printk(KERN_DEBUG "%s: " format "\n", __FUNCTION__ , ##arg);	\</div><div class='del'>-	} else {									\</div><div class='del'>-		if (x &gt; y)								\</div><div class='del'>-			printk(format, ##arg);						\</div><div class='del'>-	}										\</div><div class='add'>+#define dprintk(x, y, z, format, arg...) do {				\</div><div class='add'>+	if (z) {							\</div><div class='add'>+		if	((x &gt; DST_ERROR) &amp;&amp; (x &gt; y))			\</div><div class='add'>+			printk(KERN_ERR "dst(%d) %s: " format "\n",	\</div><div class='add'>+				state-&gt;bt-&gt;nr, __func__ , ##arg);	\</div><div class='add'>+		else if	((x &gt; DST_NOTICE) &amp;&amp; (x &gt; y))			\</div><div class='add'>+			printk(KERN_NOTICE "dst(%d) %s: " format "\n",  \</div><div class='add'>+				state-&gt;bt-&gt;nr, __func__ , ##arg);	\</div><div class='add'>+		else if ((x &gt; DST_INFO) &amp;&amp; (x &gt; y))			\</div><div class='add'>+			printk(KERN_INFO "dst(%d) %s: " format "\n",	\</div><div class='add'>+				state-&gt;bt-&gt;nr, __func__ , ##arg);	\</div><div class='add'>+		else if ((x &gt; DST_DEBUG) &amp;&amp; (x &gt; y))			\</div><div class='add'>+			printk(KERN_DEBUG "dst(%d) %s: " format "\n",	\</div><div class='add'>+				state-&gt;bt-&gt;nr,  __func__ , ##arg);	\</div><div class='add'>+	} else {							\</div><div class='add'>+		if (x &gt; y)						\</div><div class='add'>+			printk(format, ##arg);				\</div><div class='add'>+	}								\</div><div class='ctx'> } while(0)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -110,7 +118,7 @@ int dst_gpio_inb(struct dst_state *state, u8 *result)</div><div class='ctx'> </div><div class='ctx'> 	*result = 0;</div><div class='ctx'> 	if ((err = bt878_device_control(state-&gt;bt, DST_IG_READ, &amp;rd_packet)) &lt; 0) {</div><div class='del'>-		dprintk(verbose, DST_ERROR, 1, "dst_gpio_inb error (err == %i)\n", err);</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "dst_gpio_inb error (err == %i)", err);</div><div class='ctx'> 		return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	*result = (u8) rd_packet.rd.value;</div><div class='hunk'>@@ -363,6 +371,17 @@ static int dst_set_freq(struct dst_state *state, u32 freq)</div><div class='ctx'> 		state-&gt;tx_tuna[2] = (freq &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 		state-&gt;tx_tuna[3] = (freq &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 		state-&gt;tx_tuna[4] = (u8) freq;</div><div class='add'>+	} else if (state-&gt;dst_type == DST_TYPE_IS_ATSC) {</div><div class='add'>+		freq = freq / 1000;</div><div class='add'>+		if (freq &lt; 51000 || freq &gt; 858000)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		state-&gt;tx_tuna[2] = (freq &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		state-&gt;tx_tuna[3] = (freq &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		state-&gt;tx_tuna[4] = (u8) freq;</div><div class='add'>+		state-&gt;tx_tuna[5] = 0x00;		/*	ATSC	*/</div><div class='add'>+		state-&gt;tx_tuna[6] = 0x00;</div><div class='add'>+		if (state-&gt;dst_hw_cap &amp; DST_TYPE_HAS_ANALOG)</div><div class='add'>+			state-&gt;tx_tuna[7] = 0x00;	/*	Digital	*/</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -447,29 +466,41 @@ static int dst_set_symbolrate(struct dst_state *state, u32 srate)</div><div class='ctx'> 	}</div><div class='ctx'> 	dprintk(verbose, DST_INFO, 1, "set symrate %u", srate);</div><div class='ctx'> 	srate /= 1000;</div><div class='del'>-	if (state-&gt;type_flags &amp; DST_TYPE_HAS_SYMDIV) {</div><div class='del'>-		sval = srate;</div><div class='del'>-		sval &lt;&lt;= 20;</div><div class='del'>-		do_div(sval, 88000);</div><div class='del'>-		symcalc = (u32) sval;</div><div class='del'>-		dprintk(verbose, DST_INFO, 1, "set symcalc %u", symcalc);</div><div class='del'>-		state-&gt;tx_tuna[5] = (u8) (symcalc &gt;&gt; 12);</div><div class='del'>-		state-&gt;tx_tuna[6] = (u8) (symcalc &gt;&gt; 4);</div><div class='del'>-		state-&gt;tx_tuna[7] = (u8) (symcalc &lt;&lt; 4);</div><div class='del'>-	} else {</div><div class='del'>-		state-&gt;tx_tuna[5] = (u8) (srate &gt;&gt; 16) &amp; 0x7f;</div><div class='del'>-		state-&gt;tx_tuna[6] = (u8) (srate &gt;&gt; 8);</div><div class='del'>-		state-&gt;tx_tuna[7] = (u8) srate;</div><div class='del'>-	}</div><div class='del'>-	state-&gt;tx_tuna[8] &amp;= ~0x20;</div><div class='del'>-	if (state-&gt;type_flags &amp; DST_TYPE_HAS_OBS_REGS) {</div><div class='del'>-		if (srate &gt; 8000)</div><div class='del'>-			state-&gt;tx_tuna[8] |= 0x20;</div><div class='add'>+	if (state-&gt;dst_type == DST_TYPE_IS_SAT) {</div><div class='add'>+		if (state-&gt;type_flags &amp; DST_TYPE_HAS_SYMDIV) {</div><div class='add'>+			sval = srate;</div><div class='add'>+			sval &lt;&lt;= 20;</div><div class='add'>+			do_div(sval, 88000);</div><div class='add'>+			symcalc = (u32) sval;</div><div class='add'>+			dprintk(verbose, DST_INFO, 1, "set symcalc %u", symcalc);</div><div class='add'>+			state-&gt;tx_tuna[5] = (u8) (symcalc &gt;&gt; 12);</div><div class='add'>+			state-&gt;tx_tuna[6] = (u8) (symcalc &gt;&gt; 4);</div><div class='add'>+			state-&gt;tx_tuna[7] = (u8) (symcalc &lt;&lt; 4);</div><div class='add'>+		} else {</div><div class='add'>+			state-&gt;tx_tuna[5] = (u8) (srate &gt;&gt; 16) &amp; 0x7f;</div><div class='add'>+			state-&gt;tx_tuna[6] = (u8) (srate &gt;&gt; 8);</div><div class='add'>+			state-&gt;tx_tuna[7] = (u8) srate;</div><div class='add'>+		}</div><div class='add'>+		state-&gt;tx_tuna[8] &amp;= ~0x20;</div><div class='add'>+		if (state-&gt;type_flags &amp; DST_TYPE_HAS_OBS_REGS) {</div><div class='add'>+			if (srate &gt; 8000)</div><div class='add'>+				state-&gt;tx_tuna[8] |= 0x20;</div><div class='add'>+		}</div><div class='add'>+	} else if (state-&gt;dst_type == DST_TYPE_IS_CABLE) {</div><div class='add'>+		dprintk(verbose, DST_DEBUG, 1, "%s", state-&gt;fw_name);</div><div class='add'>+		if (!strncmp(state-&gt;fw_name, "DCTNEW", 6)) {</div><div class='add'>+			state-&gt;tx_tuna[5] = (u8) (srate &gt;&gt; 8);</div><div class='add'>+			state-&gt;tx_tuna[6] = (u8) srate;</div><div class='add'>+			state-&gt;tx_tuna[7] = 0x00;</div><div class='add'>+		} else if (!strncmp(state-&gt;fw_name, "DCT-CI", 6)) {</div><div class='add'>+			state-&gt;tx_tuna[5] = 0x00;</div><div class='add'>+			state-&gt;tx_tuna[6] = (u8) (srate &gt;&gt; 8);</div><div class='add'>+			state-&gt;tx_tuna[7] = (u8) srate;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int dst_set_modulation(struct dst_state *state, fe_modulation_t modulation)</div><div class='ctx'> {</div><div class='ctx'> 	if (state-&gt;dst_type != DST_TYPE_IS_CABLE)</div><div class='hunk'>@@ -490,7 +521,10 @@ static int dst_set_modulation(struct dst_state *state, fe_modulation_t modulatio</div><div class='ctx'> 		state-&gt;tx_tuna[8] = 0x80;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QAM_256:</div><div class='del'>-		state-&gt;tx_tuna[8] = 0x00;</div><div class='add'>+		if (!strncmp(state-&gt;fw_name, "DCTNEW", 6))</div><div class='add'>+			state-&gt;tx_tuna[8] = 0xff;</div><div class='add'>+		else if (!strncmp(state-&gt;fw_name, "DCT-CI", 6))</div><div class='add'>+			state-&gt;tx_tuna[8] = 0x00;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case QPSK:</div><div class='ctx'> 	case QAM_AUTO:</div><div class='hunk'>@@ -523,13 +557,19 @@ u8 dst_check_sum(u8 *buf, u32 len)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dst_check_sum);</div><div class='ctx'> </div><div class='del'>-static void dst_type_flags_print(u32 type_flags)</div><div class='add'>+static void dst_type_flags_print(struct dst_state *state)</div><div class='ctx'> {</div><div class='add'>+	u32 type_flags = state-&gt;type_flags;</div><div class='add'>+</div><div class='ctx'> 	dprintk(verbose, DST_ERROR, 0, "DST type flags :");</div><div class='del'>-	if (type_flags &amp; DST_TYPE_HAS_NEWTUNE)</div><div class='del'>-		dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner", DST_TYPE_HAS_NEWTUNE);</div><div class='add'>+	if (type_flags &amp; DST_TYPE_HAS_TS188)</div><div class='add'>+		dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner", DST_TYPE_HAS_TS188);</div><div class='add'>+	if (type_flags &amp; DST_TYPE_HAS_NEWTUNE_2)</div><div class='add'>+		dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner 2", DST_TYPE_HAS_NEWTUNE_2);</div><div class='ctx'> 	if (type_flags &amp; DST_TYPE_HAS_TS204)</div><div class='ctx'> 		dprintk(verbose, DST_ERROR, 0, " 0x%x ts204", DST_TYPE_HAS_TS204);</div><div class='add'>+	if (type_flags &amp; DST_TYPE_HAS_VLF)</div><div class='add'>+		dprintk(verbose, DST_ERROR, 0, " 0x%x VLF", DST_TYPE_HAS_VLF);</div><div class='ctx'> 	if (type_flags &amp; DST_TYPE_HAS_SYMDIV)</div><div class='ctx'> 		dprintk(verbose, DST_ERROR, 0, " 0x%x symdiv", DST_TYPE_HAS_SYMDIV);</div><div class='ctx'> 	if (type_flags &amp; DST_TYPE_HAS_FW_1)</div><div class='hunk'>@@ -542,7 +582,7 @@ static void dst_type_flags_print(u32 type_flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int dst_type_print(u8 type)</div><div class='add'>+static int dst_type_print(struct dst_state *state, u8 type)</div><div class='ctx'> {</div><div class='ctx'> 	char *otype;</div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -558,6 +598,10 @@ static int dst_type_print(u8 type)</div><div class='ctx'> 		otype = "cable";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case DST_TYPE_IS_ATSC:</div><div class='add'>+		otype = "atsc";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk(verbose, DST_INFO, 1, "invalid dst type %d", type);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -567,6 +611,127 @@ static int dst_type_print(u8 type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct tuner_types tuner_list[] = {</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_L64724,</div><div class='add'>+		.tuner_name = "L 64724",</div><div class='add'>+		.board_name = "UNKNOWN",</div><div class='add'>+		.fw_name    = "UNKNOWN"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_STV0299,</div><div class='add'>+		.tuner_name = "STV 0299",</div><div class='add'>+		.board_name = "VP1020",</div><div class='add'>+		.fw_name    = "DST-MOT"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_STV0299,</div><div class='add'>+		.tuner_name = "STV 0299",</div><div class='add'>+		.board_name = "VP1020",</div><div class='add'>+		.fw_name    = "DST-03T"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_MB86A15,</div><div class='add'>+		.tuner_name = "MB 86A15",</div><div class='add'>+		.board_name = "VP1022",</div><div class='add'>+		.fw_name    = "DST-03T"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_MB86A15,</div><div class='add'>+		.tuner_name = "MB 86A15",</div><div class='add'>+		.board_name = "VP1025",</div><div class='add'>+		.fw_name    = "DST-03T"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_STV0299,</div><div class='add'>+		.tuner_name = "STV 0299",</div><div class='add'>+		.board_name = "VP1030",</div><div class='add'>+		.fw_name    = "DST-CI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_STV0299,</div><div class='add'>+		.tuner_name = "STV 0299",</div><div class='add'>+		.board_name = "VP1030",</div><div class='add'>+		.fw_name    = "DSTMCI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP2021",</div><div class='add'>+		.fw_name    = "DCTNEW"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP2030",</div><div class='add'>+		.fw_name    = "DCT-CI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP2031",</div><div class='add'>+		.fw_name    = "DCT-CI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP2040",</div><div class='add'>+		.fw_name    = "DCT-CI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP3020",</div><div class='add'>+		.fw_name    = "DTTFTA"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP3021",</div><div class='add'>+		.fw_name    = "DTTFTA"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_TDA10046,</div><div class='add'>+		.tuner_name = "TDA10046",</div><div class='add'>+		.board_name = "VP3040",</div><div class='add'>+		.fw_name    = "DTT-CI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_UNKNOWN,</div><div class='add'>+		.tuner_name = "UNKNOWN",</div><div class='add'>+		.board_name = "VP3051",</div><div class='add'>+		.fw_name    = "DTTNXT"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_NXT200x,</div><div class='add'>+		.tuner_name = "NXT200x",</div><div class='add'>+		.board_name = "VP3220",</div><div class='add'>+		.fw_name    = "ATSCDI"</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.tuner_type = TUNER_TYPE_NXT200x,</div><div class='add'>+		.tuner_name = "NXT200x",</div><div class='add'>+		.board_name = "VP3250",</div><div class='add'>+		.fw_name    = "ATSCAD"</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'> 	Known cards list</div><div class='ctx'> 	Satellite</div><div class='hunk'>@@ -608,7 +773,8 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.dst_type =  DST_TYPE_IS_SAT,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1 | DST_TYPE_HAS_OBS_REGS,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},	/*	obsolete	*/</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -616,15 +782,17 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.offset = 0,</div><div class='ctx'> 		.dst_type =  DST_TYPE_IS_SAT,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},	/*	obsolete	*/</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DST-030",</div><div class='ctx'> 		.offset =  0,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_SAT,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_1,</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},	/*	obsolete	*/</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -633,7 +801,8 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_SAT,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_2,</div><div class='ctx'> 		.dst_feature = DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4 | DST_TYPE_HAS_DISEQC5</div><div class='del'>-							 | DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO</div><div class='add'>+							 | DST_TYPE_HAS_MAC | DST_TYPE_HAS_MOTO,</div><div class='add'>+		.tuner_type = TUNER_TYPE_MULTI</div><div class='ctx'> 	 },</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -641,57 +810,63 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.offset =  0,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_SAT,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_SYMDIV | DST_TYPE_HAS_FW_1,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},	/*	obsolete	*/</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DST-CI",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_SAT,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,</div><div class='del'>-		.dst_feature = DST_TYPE_HAS_CA</div><div class='add'>+		.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_FW_1,</div><div class='add'>+		.dst_feature = DST_TYPE_HAS_CA,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},	/*	An OEM board	*/</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DSTMCI",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_SAT,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_INC_COUNT,</div><div class='add'>+		.type_flags = DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_INC_COUNT | DST_TYPE_HAS_VLF,</div><div class='ctx'> 		.dst_feature = DST_TYPE_HAS_CA | DST_TYPE_HAS_DISEQC3 | DST_TYPE_HAS_DISEQC4</div><div class='del'>-							| DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC</div><div class='add'>+							| DST_TYPE_HAS_MOTO | DST_TYPE_HAS_MAC,</div><div class='add'>+		.tuner_type = TUNER_TYPE_MULTI</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DSTFCI",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_SAT,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.type_flags = DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_1,</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},	/* unknown to vendor	*/</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DCT-CI",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_CABLE,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_1</div><div class='del'>-							| DST_TYPE_HAS_FW_2,</div><div class='del'>-		.dst_feature = DST_TYPE_HAS_CA</div><div class='add'>+		.type_flags = DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_FW_1	| DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_VLF,</div><div class='add'>+		.dst_feature = DST_TYPE_HAS_CA,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DCTNEW",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_CABLE,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_3 | DST_TYPE_HAS_FW_BUILD,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.type_flags = DST_TYPE_HAS_TS188 | DST_TYPE_HAS_FW_3 | DST_TYPE_HAS_FW_BUILD | DST_TYPE_HAS_MULTI_FE,</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "DTT-CI",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_TERR,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_TS204 | DST_TYPE_HAS_NEWTUNE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_MULTI_FE,</div><div class='del'>-		.dst_feature = DST_TYPE_HAS_CA</div><div class='add'>+		.type_flags = DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_VLF,</div><div class='add'>+		.dst_feature = DST_TYPE_HAS_CA,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -699,7 +874,8 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_TERR,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_FW_2,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -707,7 +883,8 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_TERR,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_FW_2,</div><div class='del'>-		.dst_feature = DST_TYPE_HAS_ANALOG</div><div class='add'>+		.dst_feature = DST_TYPE_HAS_ANALOG,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='hunk'>@@ -715,15 +892,17 @@ static struct dst_types dst_tlist[] = {</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_ATSC,</div><div class='ctx'> 		.type_flags = DST_TYPE_HAS_FW_2,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.dst_feature = 0,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 		.device_id = "ATSCAD",</div><div class='ctx'> 		.offset = 1,</div><div class='ctx'> 		.dst_type = DST_TYPE_IS_ATSC,</div><div class='del'>-		.type_flags = DST_TYPE_HAS_FW_2,</div><div class='del'>-		.dst_feature = 0</div><div class='add'>+		.type_flags = DST_TYPE_HAS_MULTI_FE | DST_TYPE_HAS_FW_2 | DST_TYPE_HAS_FW_BUILD,</div><div class='add'>+		.dst_feature = DST_TYPE_HAS_MAC | DST_TYPE_HAS_ANALOG,</div><div class='add'>+		.tuner_type = 0</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='ctx'> 	{ }</div><div class='hunk'>@@ -768,6 +947,9 @@ static int dst_fw_ver(struct dst_state *state)</div><div class='ctx'> </div><div class='ctx'> static int dst_card_type(struct dst_state *state)</div><div class='ctx'> {</div><div class='add'>+	int j;</div><div class='add'>+	struct tuner_types *p_tuner_list = NULL;</div><div class='add'>+</div><div class='ctx'> 	u8 get_type[] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='ctx'> 	get_type[7] = dst_check_sum(get_type, 7);</div><div class='ctx'> 	if (dst_command(state, get_type, 8) &lt; 0) {</div><div class='hunk'>@@ -775,9 +957,17 @@ static int dst_card_type(struct dst_state *state)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(&amp;state-&gt;card_info, '\0', 8);</div><div class='del'>-	memcpy(&amp;state-&gt;card_info, &amp;state-&gt;rxbuffer, 8);</div><div class='add'>+	memcpy(&amp;state-&gt;card_info, &amp;state-&gt;rxbuffer, 7);</div><div class='ctx'> 	dprintk(verbose, DST_ERROR, 1, "Device Model=[%s]", &amp;state-&gt;card_info[0]);</div><div class='ctx'> </div><div class='add'>+	for (j = 0, p_tuner_list = tuner_list; j &lt; ARRAY_SIZE(tuner_list); j++, p_tuner_list++) {</div><div class='add'>+		if (!strcmp(&amp;state-&gt;card_info[0], p_tuner_list-&gt;board_name)) {</div><div class='add'>+			state-&gt;tuner_type = p_tuner_list-&gt;tuner_type;</div><div class='add'>+			dprintk(verbose, DST_ERROR, 1, "DST has [%s] tuner, tuner type=[%d]",</div><div class='add'>+				p_tuner_list-&gt;tuner_name, p_tuner_list-&gt;tuner_type);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -790,12 +980,64 @@ static int dst_get_vendor(struct dst_state *state)</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(&amp;state-&gt;vendor, '\0', 8);</div><div class='del'>-	memcpy(&amp;state-&gt;vendor, &amp;state-&gt;rxbuffer, 8);</div><div class='add'>+	memcpy(&amp;state-&gt;vendor, &amp;state-&gt;rxbuffer, 7);</div><div class='ctx'> 	dprintk(verbose, DST_ERROR, 1, "Vendor=[%s]", &amp;state-&gt;vendor[0]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void debug_dst_buffer(struct dst_state *state)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (verbose &gt; 2) {</div><div class='add'>+		printk("%s: [", __func__);</div><div class='add'>+		for (i = 0; i &lt; 8; i++)</div><div class='add'>+			printk(" %02x", state-&gt;rxbuffer[i]);</div><div class='add'>+		printk("]\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dst_check_stv0299(struct dst_state *state)</div><div class='add'>+{</div><div class='add'>+	u8 check_stv0299[] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='add'>+	check_stv0299[7] = dst_check_sum(check_stv0299, 7);</div><div class='add'>+	if (dst_command(state, check_stv0299, 8) &lt; 0) {</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "Cmd=[0x04] failed");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	debug_dst_buffer(state);</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;check_stv0299, &amp;state-&gt;rxbuffer, 8)) {</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "Found a STV0299 NIM");</div><div class='add'>+		state-&gt;tuner_type = TUNER_TYPE_STV0299;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dst_check_mb86a15(struct dst_state *state)</div><div class='add'>+{</div><div class='add'>+	u8 check_mb86a15[] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+</div><div class='add'>+	check_mb86a15[7] = dst_check_sum(check_mb86a15, 7);</div><div class='add'>+	if (dst_command(state, check_mb86a15, 8) &lt; 0) {</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "Cmd=[0x10], failed");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	debug_dst_buffer(state);</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;check_mb86a15, &amp;state-&gt;rxbuffer, 8) &lt; 0) {</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "Found a MB86A15 NIM");</div><div class='add'>+		state-&gt;tuner_type = TUNER_TYPE_MB86A15;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dst_get_tuner_info(struct dst_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	u8 get_tuner_1[] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</div><div class='hunk'>@@ -803,60 +1045,59 @@ static int dst_get_tuner_info(struct dst_state *state)</div><div class='ctx'> </div><div class='ctx'> 	get_tuner_1[7] = dst_check_sum(get_tuner_1, 7);</div><div class='ctx'> 	get_tuner_2[7] = dst_check_sum(get_tuner_2, 7);</div><div class='add'>+	dprintk(verbose, DST_ERROR, 1, "DST TYpe = MULTI FE");</div><div class='ctx'> 	if (state-&gt;type_flags &amp; DST_TYPE_HAS_MULTI_FE) {</div><div class='del'>-		if (dst_command(state, get_tuner_2, 8) &lt; 0) {</div><div class='del'>-			dprintk(verbose, DST_INFO, 1, "Unsupported Command");</div><div class='del'>-			return -1;</div><div class='add'>+		if (dst_command(state, get_tuner_1, 8) &lt; 0) {</div><div class='add'>+			dprintk(verbose, DST_INFO, 1, "Cmd=[0x13], Unsupported");</div><div class='add'>+			goto force;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (dst_command(state, get_tuner_1, 8) &lt; 0) {</div><div class='del'>-			dprintk(verbose, DST_INFO, 1, "Unsupported Command");</div><div class='del'>-			return -1;</div><div class='add'>+		if (dst_command(state, get_tuner_2, 8) &lt; 0) {</div><div class='add'>+			dprintk(verbose, DST_INFO, 1, "Cmd=[0xb], Unsupported");</div><div class='add'>+			goto force;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(&amp;state-&gt;board_info, '\0', 8);</div><div class='ctx'> 	memcpy(&amp;state-&gt;board_info, &amp;state-&gt;rxbuffer, 8);</div><div class='ctx'> 	if (state-&gt;type_flags &amp; DST_TYPE_HAS_MULTI_FE) {</div><div class='del'>-		if (state-&gt;board_info[1] == 0x0b) {</div><div class='del'>-			if (state-&gt;type_flags &amp; DST_TYPE_HAS_TS204)</div><div class='del'>-				state-&gt;type_flags &amp;= ~DST_TYPE_HAS_TS204;</div><div class='del'>-			state-&gt;type_flags |= DST_TYPE_HAS_NEWTUNE;</div><div class='del'>-			dprintk(verbose, DST_INFO, 1, "DST type has TS=188");</div><div class='del'>-		} else {</div><div class='del'>-			if (state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE)</div><div class='del'>-				state-&gt;type_flags &amp;= ~DST_TYPE_HAS_NEWTUNE;</div><div class='del'>-			state-&gt;type_flags |= DST_TYPE_HAS_TS204;</div><div class='del'>-			dprintk(verbose, DST_INFO, 1, "DST type has TS=204");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (state-&gt;board_info[0] == 0xbc) {</div><div class='del'>-			if (state-&gt;type_flags &amp; DST_TYPE_HAS_TS204)</div><div class='del'>-				state-&gt;type_flags &amp;= ~DST_TYPE_HAS_TS204;</div><div class='del'>-			state-&gt;type_flags |= DST_TYPE_HAS_NEWTUNE;</div><div class='del'>-			dprintk(verbose, DST_INFO, 1, "DST type has TS=188, Daughterboard=[%d]", state-&gt;board_info[1]);</div><div class='del'>-</div><div class='del'>-		} else if (state-&gt;board_info[0] == 0xcc) {</div><div class='del'>-			if (state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE)</div><div class='del'>-				state-&gt;type_flags &amp;= ~DST_TYPE_HAS_NEWTUNE;</div><div class='del'>-			state-&gt;type_flags |= DST_TYPE_HAS_TS204;</div><div class='del'>-			dprintk(verbose, DST_INFO, 1, "DST type has TS=204 Daughterboard=[%d]", state-&gt;board_info[1]);</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "DST type has TS=188");</div><div class='add'>+	}</div><div class='add'>+	if (state-&gt;board_info[0] == 0xbc) {</div><div class='add'>+		if (state-&gt;type_flags != DST_TYPE_IS_ATSC)</div><div class='add'>+			state-&gt;type_flags |= DST_TYPE_HAS_TS188;</div><div class='add'>+		else</div><div class='add'>+			state-&gt;type_flags |= DST_TYPE_HAS_NEWTUNE_2;</div><div class='add'>+</div><div class='add'>+		if (state-&gt;board_info[1] == 0x01) {</div><div class='add'>+			state-&gt;dst_hw_cap |= DST_TYPE_HAS_DBOARD;</div><div class='add'>+			dprintk(verbose, DST_ERROR, 1, "DST has Daughterboard");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+force:</div><div class='add'>+	if (!strncmp(state-&gt;fw_name, "DCT-CI", 6)) {</div><div class='add'>+		state-&gt;type_flags |= DST_TYPE_HAS_TS204;</div><div class='add'>+		dprintk(verbose, DST_ERROR, 1, "Forcing [%s] to TS188", state-&gt;fw_name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dst_get_device_id(struct dst_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reply;</div><div class='ctx'> </div><div class='del'>-	int i;</div><div class='del'>-	struct dst_types *p_dst_type;</div><div class='add'>+	int i, j;</div><div class='add'>+	struct dst_types *p_dst_type = NULL;</div><div class='add'>+	struct tuner_types *p_tuner_list = NULL;</div><div class='add'>+</div><div class='ctx'> 	u8 use_dst_type = 0;</div><div class='ctx'> 	u32 use_type_flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	static u8 device_type[8] = {0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff};</div><div class='ctx'> </div><div class='add'>+	state-&gt;tuner_type = 0;</div><div class='ctx'> 	device_type[7] = dst_check_sum(device_type, 7);</div><div class='ctx'> </div><div class='ctx'> 	if (write_dst(state, device_type, FIXED_COMM))</div><div class='hunk'>@@ -888,8 +1129,34 @@ static int dst_get_device_id(struct dst_state *state)</div><div class='ctx'> </div><div class='ctx'> 			/*	Card capabilities	*/</div><div class='ctx'> 			state-&gt;dst_hw_cap = p_dst_type-&gt;dst_feature;</div><div class='del'>-			dprintk(verbose, DST_ERROR, 1, "Recognise [%s]\n", p_dst_type-&gt;device_id);</div><div class='del'>-</div><div class='add'>+			dprintk(verbose, DST_ERROR, 1, "Recognise [%s]", p_dst_type-&gt;device_id);</div><div class='add'>+			strncpy(&amp;state-&gt;fw_name[0], p_dst_type-&gt;device_id, 6);</div><div class='add'>+			/*	Multiple tuners		*/</div><div class='add'>+			if (p_dst_type-&gt;tuner_type &amp; TUNER_TYPE_MULTI) {</div><div class='add'>+				switch (use_dst_type) {</div><div class='add'>+				case DST_TYPE_IS_SAT:</div><div class='add'>+					/*	STV0299 check	*/</div><div class='add'>+					if (dst_check_stv0299(state) &lt; 0) {</div><div class='add'>+						dprintk(verbose, DST_ERROR, 1, "Unsupported");</div><div class='add'>+						state-&gt;tuner_type = TUNER_TYPE_MB86A15;</div><div class='add'>+					}</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				if (dst_check_mb86a15(state) &lt; 0)</div><div class='add'>+					dprintk(verbose, DST_ERROR, 1, "Unsupported");</div><div class='add'>+			/*	Single tuner		*/</div><div class='add'>+			} else {</div><div class='add'>+				state-&gt;tuner_type = p_dst_type-&gt;tuner_type;</div><div class='add'>+			}</div><div class='add'>+			for (j = 0, p_tuner_list = tuner_list; j &lt; ARRAY_SIZE(tuner_list); j++, p_tuner_list++) {</div><div class='add'>+				if (!(strncmp(p_dst_type-&gt;device_id, p_tuner_list-&gt;fw_name, 7)) &amp;&amp;</div><div class='add'>+					p_tuner_list-&gt;tuner_type == state-&gt;tuner_type) {</div><div class='add'>+					dprintk(verbose, DST_ERROR, 1, "[%s] has a [%s]",</div><div class='add'>+						p_dst_type-&gt;device_id, p_tuner_list-&gt;tuner_name);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -900,10 +1167,10 @@ static int dst_get_device_id(struct dst_state *state)</div><div class='ctx'> 		use_dst_type = DST_TYPE_IS_SAT;</div><div class='ctx'> 		use_type_flags = DST_TYPE_HAS_SYMDIV;</div><div class='ctx'> 	}</div><div class='del'>-	dst_type_print(use_dst_type);</div><div class='add'>+	dst_type_print(state, use_dst_type);</div><div class='ctx'> 	state-&gt;type_flags = use_type_flags;</div><div class='ctx'> 	state-&gt;dst_type = use_dst_type;</div><div class='del'>-	dst_type_flags_print(state-&gt;type_flags);</div><div class='add'>+	dst_type_flags_print(state);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -911,15 +1178,15 @@ static int dst_get_device_id(struct dst_state *state)</div><div class='ctx'> static int dst_probe(struct dst_state *state)</div><div class='ctx'> {</div><div class='ctx'> 	mutex_init(&amp;state-&gt;dst_mutex);</div><div class='del'>-	if ((rdc_8820_reset(state)) &lt; 0) {</div><div class='del'>-		dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if (dst_addons &amp; DST_TYPE_HAS_CA)</div><div class='add'>+	if (dst_addons &amp; DST_TYPE_HAS_CA) {</div><div class='add'>+		if ((rdc_8820_reset(state)) &lt; 0) {</div><div class='add'>+			dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed.");</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> 		msleep(4000);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		msleep(100);</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	if ((dst_comm_init(state)) &lt; 0) {</div><div class='ctx'> 		dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed.");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -931,7 +1198,6 @@ static int dst_probe(struct dst_state *state)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dst_get_mac(state) &lt; 0) {</div><div class='ctx'> 		dprintk(verbose, DST_INFO, 1, "MAC: Unsupported command");</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((state-&gt;type_flags &amp; DST_TYPE_HAS_MULTI_FE) || (state-&gt;type_flags &amp; DST_TYPE_HAS_FW_BUILD)) {</div><div class='ctx'> 		if (dst_get_tuner_info(state) &lt; 0)</div><div class='hunk'>@@ -1048,6 +1314,10 @@ static int dst_get_signal(struct dst_state *state)</div><div class='ctx'> 			state-&gt;decode_lock = (state-&gt;rxbuffer[1]) ? 1 : 0;</div><div class='ctx'> 			state-&gt;decode_strength = state-&gt;rxbuffer[4] &lt;&lt; 8;</div><div class='ctx'> 			state-&gt;decode_snr = state-&gt;rxbuffer[3] &lt;&lt; 8;</div><div class='add'>+		} else if (state-&gt;dst_type == DST_TYPE_IS_ATSC) {</div><div class='add'>+			state-&gt;decode_lock = (state-&gt;rxbuffer[6] == 0x00) ? 1 : 0;</div><div class='add'>+			state-&gt;decode_strength = state-&gt;rxbuffer[4] &lt;&lt; 8;</div><div class='add'>+			state-&gt;decode_snr = state-&gt;rxbuffer[2] &lt;&lt; 8 | state-&gt;rxbuffer[3];</div><div class='ctx'> 		}</div><div class='ctx'> 		state-&gt;cur_jiff = jiffies;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1078,8 +1348,9 @@ static int dst_get_tuna(struct dst_state *state)</div><div class='ctx'> 	state-&gt;diseq_flags &amp;= ~(HAS_LOCK);</div><div class='ctx'> 	if (!dst_wait_dst_ready(state, NO_DELAY))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE)</div><div class='del'>-		/* how to get variable length reply ???? */</div><div class='add'>+	if ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) &amp;&amp;</div><div class='add'>+		!(state-&gt;dst_type == DST_TYPE_IS_ATSC))</div><div class='add'>+</div><div class='ctx'> 		retval = read_dst(state, state-&gt;rx_tuna, 10);</div><div class='ctx'> 	else</div><div class='ctx'> 		retval = read_dst(state, &amp;state-&gt;rx_tuna[2], FIXED_COMM);</div><div class='hunk'>@@ -1087,7 +1358,10 @@ static int dst_get_tuna(struct dst_state *state)</div><div class='ctx'> 		dprintk(verbose, DST_DEBUG, 1, "read not successful");</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	if (state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE) {</div><div class='add'>+	if ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) &amp;&amp;</div><div class='add'>+		!(state-&gt;dst_type == DST_TYPE_IS_CABLE) &amp;&amp;</div><div class='add'>+		!(state-&gt;dst_type == DST_TYPE_IS_ATSC)) {</div><div class='add'>+</div><div class='ctx'> 		if (state-&gt;rx_tuna[9] != dst_check_sum(&amp;state-&gt;rx_tuna[0], 9)) {</div><div class='ctx'> 			dprintk(verbose, DST_INFO, 1, "checksum failure ? ");</div><div class='ctx'> 			return -EIO;</div><div class='hunk'>@@ -1133,7 +1407,10 @@ static int dst_write_tuna(struct dvb_frontend *fe)</div><div class='ctx'> 		dprintk(verbose, DST_DEBUG, 1, "DST Communication initialization failed.");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	if (state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE) {</div><div class='add'>+//	if (state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE) {</div><div class='add'>+	if ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) &amp;&amp;</div><div class='add'>+		(!(state-&gt;dst_type == DST_TYPE_IS_ATSC))) {</div><div class='add'>+</div><div class='ctx'> 		state-&gt;tx_tuna[9] = dst_check_sum(&amp;state-&gt;tx_tuna[0], 9);</div><div class='ctx'> 		retval = write_dst(state, &amp;state-&gt;tx_tuna[0], 10);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1189,9 +1466,12 @@ static int dst_set_diseqc(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;dst_type != DST_TYPE_IS_SAT)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (cmd-&gt;msg_len == 0 || cmd-&gt;msg_len &gt; 4)</div><div class='add'>+	if (cmd-&gt;msg_len &gt; 0 &amp;&amp; cmd-&gt;msg_len &lt; 5)</div><div class='add'>+		memcpy(&amp;paket[3], cmd-&gt;msg, cmd-&gt;msg_len);</div><div class='add'>+	else if (cmd-&gt;msg_len == 5 &amp;&amp; state-&gt;dst_hw_cap &amp; DST_TYPE_HAS_DISEQC5)</div><div class='add'>+		memcpy(&amp;paket[2], cmd-&gt;msg, cmd-&gt;msg_len);</div><div class='add'>+	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	memcpy(&amp;paket[3], cmd-&gt;msg, cmd-&gt;msg_len);</div><div class='ctx'> 	paket[7] = dst_check_sum(&amp;paket[0], 7);</div><div class='ctx'> 	dst_command(state, paket, 8);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1287,8 +1567,9 @@ static int dst_init(struct dvb_frontend *fe)</div><div class='ctx'> 	static u8 sat_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x55, 0xbd, 0x50, 0x00, 0x00 };</div><div class='ctx'> 	static u8 ter_tuna_188[] = { 0x09, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };</div><div class='ctx'> 	static u8 ter_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };</div><div class='del'>-	static u8 cab_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };</div><div class='ctx'> 	static u8 cab_tuna_188[] = { 0x09, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+	static u8 cab_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };</div><div class='add'>+	static u8 atsc_tuner[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;inversion = INVERSION_OFF;</div><div class='ctx'> 	state-&gt;voltage = SEC_VOLTAGE_13;</div><div class='hunk'>@@ -1298,11 +1579,13 @@ static int dst_init(struct dvb_frontend *fe)</div><div class='ctx'> 	state-&gt;bandwidth = BANDWIDTH_7_MHZ;</div><div class='ctx'> 	state-&gt;cur_jiff = jiffies;</div><div class='ctx'> 	if (state-&gt;dst_type == DST_TYPE_IS_SAT)</div><div class='del'>-		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE) ? sat_tuna_188 : sat_tuna_204), sizeof (sat_tuna_204));</div><div class='add'>+		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) ? sat_tuna_188 : sat_tuna_204), sizeof (sat_tuna_204));</div><div class='ctx'> 	else if (state-&gt;dst_type == DST_TYPE_IS_TERR)</div><div class='del'>-		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE) ? ter_tuna_188 : ter_tuna_204), sizeof (ter_tuna_204));</div><div class='add'>+		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) ? ter_tuna_188 : ter_tuna_204), sizeof (ter_tuna_204));</div><div class='ctx'> 	else if (state-&gt;dst_type == DST_TYPE_IS_CABLE)</div><div class='del'>-		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_NEWTUNE) ? cab_tuna_188 : cab_tuna_204), sizeof (cab_tuna_204));</div><div class='add'>+		memcpy(state-&gt;tx_tuna, ((state-&gt;type_flags &amp; DST_TYPE_HAS_VLF) ? cab_tuna_188 : cab_tuna_204), sizeof (cab_tuna_204));</div><div class='add'>+	else if (state-&gt;dst_type == DST_TYPE_IS_ATSC)</div><div class='add'>+		memcpy(state-&gt;tx_tuna, atsc_tuner, sizeof (atsc_tuner));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1341,7 +1624,36 @@ static int dst_read_snr(struct dvb_frontend *fe, u16 *snr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dst_set_frontend(struct dvb_frontend* fe,</div><div class='add'>+static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct dst_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (p != NULL) {</div><div class='add'>+		dst_set_freq(state, p-&gt;frequency);</div><div class='add'>+		dprintk(verbose, DST_DEBUG, 1, "Set Frequency=[%d]", p-&gt;frequency);</div><div class='add'>+</div><div class='add'>+		if (state-&gt;dst_type == DST_TYPE_IS_SAT) {</div><div class='add'>+			if (state-&gt;type_flags &amp; DST_TYPE_HAS_OBS_REGS)</div><div class='add'>+				dst_set_inversion(state, p-&gt;inversion);</div><div class='add'>+			dst_set_fec(state, p-&gt;u.qpsk.fec_inner);</div><div class='add'>+			dst_set_symbolrate(state, p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+			dst_set_polarization(state);</div><div class='add'>+			dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p-&gt;u.qpsk.symbol_rate);</div><div class='add'>+</div><div class='add'>+		} else if (state-&gt;dst_type == DST_TYPE_IS_TERR)</div><div class='add'>+			dst_set_bandwidth(state, p-&gt;u.ofdm.bandwidth);</div><div class='add'>+		else if (state-&gt;dst_type == DST_TYPE_IS_CABLE) {</div><div class='add'>+			dst_set_fec(state, p-&gt;u.qam.fec_inner);</div><div class='add'>+			dst_set_symbolrate(state, p-&gt;u.qam.symbol_rate);</div><div class='add'>+			dst_set_modulation(state, p-&gt;u.qam.modulation);</div><div class='add'>+		}</div><div class='add'>+		dst_write_tuna(fe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dst_tune_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 			    struct dvb_frontend_parameters* p,</div><div class='ctx'> 			    unsigned int mode_flags,</div><div class='ctx'> 			    int *delay,</div><div class='hunk'>@@ -1378,6 +1690,11 @@ static int dst_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dst_get_tuning_algo(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	return dst_algo;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dst_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct dst_state *state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -1408,6 +1725,7 @@ static void dst_release(struct dvb_frontend *fe)</div><div class='ctx'> static struct dvb_frontend_ops dst_dvbt_ops;</div><div class='ctx'> static struct dvb_frontend_ops dst_dvbs_ops;</div><div class='ctx'> static struct dvb_frontend_ops dst_dvbc_ops;</div><div class='add'>+static struct dvb_frontend_ops dst_atsc_ops;</div><div class='ctx'> </div><div class='ctx'> struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -1417,24 +1735,25 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* determine settings based on type */</div><div class='add'>+	/* create dvb_frontend */</div><div class='ctx'> 	switch (state-&gt;dst_type) {</div><div class='ctx'> 	case DST_TYPE_IS_TERR:</div><div class='del'>-		memcpy(&amp;state-&gt;ops, &amp;dst_dvbt_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+		memcpy(&amp;state-&gt;frontend.ops, &amp;dst_dvbt_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DST_TYPE_IS_CABLE:</div><div class='del'>-		memcpy(&amp;state-&gt;ops, &amp;dst_dvbc_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+		memcpy(&amp;state-&gt;frontend.ops, &amp;dst_dvbc_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DST_TYPE_IS_SAT:</div><div class='del'>-		memcpy(&amp;state-&gt;ops, &amp;dst_dvbs_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+		memcpy(&amp;state-&gt;frontend.ops, &amp;dst_dvbs_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+		break;</div><div class='add'>+	case DST_TYPE_IS_ATSC:</div><div class='add'>+		memcpy(&amp;state-&gt;frontend.ops, &amp;dst_atsc_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");</div><div class='ctx'> 		kfree(state);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	return state;				/*	Manu (DST is a card not a frontend)	*/</div><div class='hunk'>@@ -1455,8 +1774,10 @@ static struct dvb_frontend_ops dst_dvbt_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.release = dst_release,</div><div class='ctx'> 	.init = dst_init,</div><div class='del'>-	.tune = dst_set_frontend,</div><div class='add'>+	.tune = dst_tune_frontend,</div><div class='add'>+	.set_frontend = dst_set_frontend,</div><div class='ctx'> 	.get_frontend = dst_get_frontend,</div><div class='add'>+	.get_frontend_algo = dst_get_tuning_algo,</div><div class='ctx'> 	.read_status = dst_read_status,</div><div class='ctx'> 	.read_signal_strength = dst_read_signal_strength,</div><div class='ctx'> 	.read_snr = dst_read_snr,</div><div class='hunk'>@@ -1479,8 +1800,10 @@ static struct dvb_frontend_ops dst_dvbs_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.release = dst_release,</div><div class='ctx'> 	.init = dst_init,</div><div class='del'>-	.tune = dst_set_frontend,</div><div class='add'>+	.tune = dst_tune_frontend,</div><div class='add'>+	.set_frontend = dst_set_frontend,</div><div class='ctx'> 	.get_frontend = dst_get_frontend,</div><div class='add'>+	.get_frontend_algo = dst_get_tuning_algo,</div><div class='ctx'> 	.read_status = dst_read_status,</div><div class='ctx'> 	.read_signal_strength = dst_read_signal_strength,</div><div class='ctx'> 	.read_snr = dst_read_snr,</div><div class='hunk'>@@ -1506,13 +1829,38 @@ static struct dvb_frontend_ops dst_dvbc_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.release = dst_release,</div><div class='ctx'> 	.init = dst_init,</div><div class='del'>-	.tune = dst_set_frontend,</div><div class='add'>+	.tune = dst_tune_frontend,</div><div class='add'>+	.set_frontend = dst_set_frontend,</div><div class='add'>+	.get_frontend = dst_get_frontend,</div><div class='add'>+	.get_frontend_algo = dst_get_tuning_algo,</div><div class='add'>+	.read_status = dst_read_status,</div><div class='add'>+	.read_signal_strength = dst_read_signal_strength,</div><div class='add'>+	.read_snr = dst_read_snr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops dst_atsc_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		.name = "DST ATSC",</div><div class='add'>+		.type = FE_ATSC,</div><div class='add'>+		.frequency_stepsize = 62500,</div><div class='add'>+		.frequency_min = 510000000,</div><div class='add'>+		.frequency_max = 858000000,</div><div class='add'>+		.symbol_rate_min = 1000000,</div><div class='add'>+		.symbol_rate_max = 45000000,</div><div class='add'>+		.caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = dst_release,</div><div class='add'>+	.init = dst_init,</div><div class='add'>+	.tune = dst_tune_frontend,</div><div class='add'>+	.set_frontend = dst_set_frontend,</div><div class='ctx'> 	.get_frontend = dst_get_frontend,</div><div class='add'>+	.get_frontend_algo = dst_get_tuning_algo,</div><div class='ctx'> 	.read_status = dst_read_status,</div><div class='ctx'> 	.read_signal_strength = dst_read_signal_strength,</div><div class='ctx'> 	.read_snr = dst_read_snr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_DESCRIPTION("DST DVB-S/T/C Combo Frontend driver");</div><div class='add'>+MODULE_DESCRIPTION("DST DVB-S/T/C/ATSC Combo Frontend driver");</div><div class='ctx'> MODULE_AUTHOR("Jamie Honan, Manu Abraham");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c<br/>index f6b49a801eba..fa923b9b346e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst_ca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dst_ca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst_ca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/bt8xx/dst_ca.c</a></div><div class='hunk'>@@ -68,6 +68,13 @@ static int ca_set_pid(void)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void put_command_and_length(u8 *data, int command, int length)</div><div class='add'>+{</div><div class='add'>+	data[0] = (command &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	data[1] = (command &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	data[2] = command &amp; 0xff;</div><div class='add'>+	data[3] = length;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void put_checksum(u8 *check_string, int length)</div><div class='ctx'> {</div><div class='hunk'>@@ -124,15 +131,18 @@ static int dst_put_ci(struct dst_state *state, u8 *data, int len, u8 *ca_string,</div><div class='ctx'> 	u8 dst_ca_comm_err = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (dst_ca_comm_err &lt; RETRIES) {</div><div class='del'>-		dst_comm_init(state);</div><div class='ctx'> 		dprintk(verbose, DST_CA_NOTICE, 1, " Put Command");</div><div class='ctx'> 		if (dst_ci_command(state, data, ca_string, len, read)) {	// If error</div><div class='ctx'> 			dst_error_recovery(state);</div><div class='ctx'> 			dst_ca_comm_err++; // work required here.</div><div class='add'>+		} else {</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if(dst_ca_comm_err == RETRIES)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -140,6 +150,7 @@ static int dst_put_ci(struct dst_state *state, u8 *data, int len, u8 *ca_string,</div><div class='ctx'> </div><div class='ctx'> static int ca_get_app_info(struct dst_state *state)</div><div class='ctx'> {</div><div class='add'>+	int length, str_length;</div><div class='ctx'> 	static u8 command[8] = {0x07, 0x40, 0x01, 0x00, 0x01, 0x00, 0x00, 0xff};</div><div class='ctx'> </div><div class='ctx'> 	put_checksum(&amp;command[0], command[0]);</div><div class='hunk'>@@ -154,6 +165,68 @@ static int ca_get_app_info(struct dst_state *state)</div><div class='ctx'> 		(state-&gt;messages[10] &lt;&lt; 8) | state-&gt;messages[11], __FUNCTION__, (char *)(&amp;state-&gt;messages[12]));</div><div class='ctx'> 	dprintk(verbose, DST_CA_INFO, 1, " ==================================================================================================");</div><div class='ctx'> </div><div class='add'>+	// Transform dst message to correct application_info message</div><div class='add'>+	length = state-&gt;messages[5];</div><div class='add'>+	str_length = length - 6;</div><div class='add'>+	if (str_length &lt; 0) {</div><div class='add'>+		str_length = 0;</div><div class='add'>+		dprintk(verbose, DST_CA_ERROR, 1, "Invalid string length returned in ca_get_app_info(). Recovering.");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// First, the command and length fields</div><div class='add'>+	put_command_and_length(&amp;state-&gt;messages[0], CA_APP_INFO, length);</div><div class='add'>+</div><div class='add'>+	// Copy application_type, application_manufacturer and manufacturer_code</div><div class='add'>+	memcpy(&amp;state-&gt;messages[4], &amp;state-&gt;messages[7], 5);</div><div class='add'>+</div><div class='add'>+	// Set string length and copy string</div><div class='add'>+	state-&gt;messages[9] = str_length;</div><div class='add'>+	memcpy(&amp;state-&gt;messages[10], &amp;state-&gt;messages[12], str_length);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca_get_ca_info(struct dst_state *state)</div><div class='add'>+{</div><div class='add'>+	int srcPtr, dstPtr, i, num_ids;</div><div class='add'>+	static u8 slot_command[8] = {0x07, 0x40, 0x00, 0x00, 0x02, 0x00, 0x00, 0xff};</div><div class='add'>+	const int in_system_id_pos = 8, out_system_id_pos = 4, in_num_ids_pos = 7;</div><div class='add'>+</div><div class='add'>+	put_checksum(&amp;slot_command[0], slot_command[0]);</div><div class='add'>+	if ((dst_put_ci(state, slot_command, sizeof (slot_command), state-&gt;messages, GET_REPLY)) &lt; 0) {</div><div class='add'>+		dprintk(verbose, DST_CA_ERROR, 1, " --&gt;dst_put_ci FAILED !");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	dprintk(verbose, DST_CA_INFO, 1, " --&gt;dst_put_ci SUCCESS !");</div><div class='add'>+</div><div class='add'>+	// Print raw data</div><div class='add'>+	dprintk(verbose, DST_CA_INFO, 0, " DST data = [");</div><div class='add'>+	for (i = 0; i &lt; state-&gt;messages[0] + 1; i++) {</div><div class='add'>+		dprintk(verbose, DST_CA_INFO, 0, " 0x%02x", state-&gt;messages[i]);</div><div class='add'>+	}</div><div class='add'>+	dprintk(verbose, DST_CA_INFO, 0, "]\n");</div><div class='add'>+</div><div class='add'>+	// Set the command and length of the output</div><div class='add'>+	num_ids = state-&gt;messages[in_num_ids_pos];</div><div class='add'>+	if (num_ids &gt;= 100) {</div><div class='add'>+		num_ids = 100;</div><div class='add'>+		dprintk(verbose, DST_CA_ERROR, 1, "Invalid number of ids (&gt;100). Recovering.");</div><div class='add'>+	}</div><div class='add'>+	put_command_and_length(&amp;state-&gt;messages[0], CA_INFO, num_ids * 2);</div><div class='add'>+</div><div class='add'>+	dprintk(verbose, DST_CA_INFO, 0, " CA_INFO = [");</div><div class='add'>+	srcPtr = in_system_id_pos;</div><div class='add'>+	dstPtr = out_system_id_pos;</div><div class='add'>+	for(i = 0; i &lt; num_ids; i++) {</div><div class='add'>+		dprintk(verbose, DST_CA_INFO, 0, " 0x%02x%02x", state-&gt;messages[srcPtr + 0], state-&gt;messages[srcPtr + 1]);</div><div class='add'>+		// Append to output</div><div class='add'>+		state-&gt;messages[dstPtr + 0] = state-&gt;messages[srcPtr + 0];</div><div class='add'>+		state-&gt;messages[dstPtr + 1] = state-&gt;messages[srcPtr + 1];</div><div class='add'>+		srcPtr += 2;</div><div class='add'>+		dstPtr += 2;</div><div class='add'>+	}</div><div class='add'>+	dprintk(verbose, DST_CA_INFO, 0, "]\n");</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +247,7 @@ static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps,</div><div class='ctx'> </div><div class='ctx'> 	dprintk(verbose, DST_CA_INFO, 1, " Slot cap = [%d]", slot_cap[7]);</div><div class='ctx'> 	dprintk(verbose, DST_CA_INFO, 0, "===================================\n");</div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='add'>+	for (i = 0; i &lt; slot_cap[0] + 1; i++)</div><div class='ctx'> 		dprintk(verbose, DST_CA_INFO, 0, " %d", slot_cap[i]);</div><div class='ctx'> 	dprintk(verbose, DST_CA_INFO, 0, "\n");</div><div class='ctx'> </div><div class='hunk'>@@ -260,6 +333,11 @@ static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message,</div><div class='ctx'> 			if (copy_to_user(arg, p_ca_message, sizeof (struct ca_msg)) )</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			break;</div><div class='add'>+		case CA_INFO:</div><div class='add'>+			memcpy(p_ca_message-&gt;msg, state-&gt;messages, 128);</div><div class='add'>+			if (copy_to_user(arg, p_ca_message, sizeof (struct ca_msg)) )</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -302,7 +380,7 @@ static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 l</div><div class='ctx'> 		rdc_reset_state(state);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk(verbose, DST_CA_NOTICE, 1, " DST-CI Command succes.");</div><div class='add'>+	dprintk(verbose, DST_CA_NOTICE, 1, " DST-CI Command success.");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -340,6 +418,7 @@ static int debug_string(u8 *msg, u32 length, u32 offset)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static int ca_set_pmt(struct dst_state *state, struct ca_msg *p_ca_message, struct ca_msg *hw_buffer, u8 reply, u8 query)</div><div class='ctx'> {</div><div class='ctx'> 	u32 length = 0;</div><div class='hunk'>@@ -455,6 +534,16 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,</div><div class='ctx'> 			}</div><div class='ctx'> 			dprintk(verbose, DST_CA_INFO, 1, " --&gt;CA_APP_INFO_ENQUIRY Success !");</div><div class='ctx'> 			break;</div><div class='add'>+		case CA_INFO_ENQUIRY:</div><div class='add'>+			dprintk(verbose, DST_CA_INFO, 1, " Getting CA Information");</div><div class='add'>+</div><div class='add'>+			if ((ca_get_ca_info(state)) &lt; 0) {</div><div class='add'>+				dprintk(verbose, DST_CA_ERROR, 1, " --&gt;CA_INFO_ENQUIRY Failed !");</div><div class='add'>+				result = -1;</div><div class='add'>+				goto free_mem_and_exit;</div><div class='add'>+			}</div><div class='add'>+			dprintk(verbose, DST_CA_INFO, 1, " --&gt;CA_INFO_ENQUIRY Success !");</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> free_mem_and_exit:</div><div class='hunk'>@@ -473,18 +562,15 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd</div><div class='ctx'> 	void __user *arg = (void __user *)ioctl_arg;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	if ((p_ca_message = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {</div><div class='del'>-		dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if ((p_ca_slot_info = (struct ca_slot_info *) kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL)) == NULL) {</div><div class='add'>+	p_ca_message = kmalloc(sizeof (struct ca_msg), GFP_KERNEL);</div><div class='add'>+	p_ca_slot_info = kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL);</div><div class='add'>+	p_ca_caps = kmalloc(sizeof (struct ca_caps), GFP_KERNEL);</div><div class='add'>+	if (!p_ca_message || !p_ca_slot_info || !p_ca_caps) {</div><div class='ctx'> 		dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if ((p_ca_caps = (struct ca_caps *) kmalloc(sizeof (struct ca_caps), GFP_KERNEL)) == NULL) {</div><div class='del'>-		dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto free_mem_and_exit;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/*	We have now only the standard ioctl's, the driver is upposed to handle internals.	*/</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case CA_SEND_MSG:</div><div class='hunk'>@@ -582,7 +668,7 @@ static int dst_ca_release(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)</div><div class='ctx'> {</div><div class='del'>-	int bytes_read = 0;</div><div class='add'>+	ssize_t bytes_read = 0;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(verbose, DST_CA_DEBUG, 1, " Device read.");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h<br/>index 51d4e043716c..0677b047b3a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst_common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dst_common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dst_common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/bt8xx/dst_common.h</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #define DST_TYPE_IS_CABLE	2</div><div class='ctx'> #define DST_TYPE_IS_ATSC	3</div><div class='ctx'> </div><div class='del'>-#define DST_TYPE_HAS_NEWTUNE	1</div><div class='add'>+#define DST_TYPE_HAS_TS188	1</div><div class='ctx'> #define DST_TYPE_HAS_TS204	2</div><div class='ctx'> #define DST_TYPE_HAS_SYMDIV	4</div><div class='ctx'> #define DST_TYPE_HAS_FW_1	8</div><div class='hunk'>@@ -52,6 +52,9 @@</div><div class='ctx'> #define DST_TYPE_HAS_OBS_REGS	128</div><div class='ctx'> #define DST_TYPE_HAS_INC_COUNT	256</div><div class='ctx'> #define DST_TYPE_HAS_MULTI_FE	512</div><div class='add'>+#define DST_TYPE_HAS_NEWTUNE_2	1024</div><div class='add'>+#define DST_TYPE_HAS_DBOARD	2048</div><div class='add'>+#define DST_TYPE_HAS_VLF	4096</div><div class='ctx'> </div><div class='ctx'> /*	Card capability list	*/</div><div class='ctx'> </div><div class='hunk'>@@ -64,6 +67,20 @@</div><div class='ctx'> #define	DST_TYPE_HAS_ANALOG	64	/*	Analog inputs	*/</div><div class='ctx'> #define DST_TYPE_HAS_SESSION	128</div><div class='ctx'> </div><div class='add'>+#define TUNER_TYPE_MULTI	1</div><div class='add'>+#define TUNER_TYPE_UNKNOWN	2</div><div class='add'>+/*	DVB-S		*/</div><div class='add'>+#define TUNER_TYPE_L64724	4</div><div class='add'>+#define TUNER_TYPE_STV0299	8</div><div class='add'>+#define TUNER_TYPE_MB86A15	16</div><div class='add'>+</div><div class='add'>+/*	DVB-T		*/</div><div class='add'>+#define TUNER_TYPE_TDA10046	32</div><div class='add'>+</div><div class='add'>+/*	ATSC		*/</div><div class='add'>+#define TUNER_TYPE_NXT200x	64</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define RDC_8820_PIO_0_DISABLE	0</div><div class='ctx'> #define RDC_8820_PIO_0_ENABLE	1</div><div class='ctx'> #define RDC_8820_INT		2</div><div class='hunk'>@@ -84,8 +101,6 @@ struct dst_state {</div><div class='ctx'> </div><div class='ctx'> 	struct bt878* bt;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct dst_config* config;</div><div class='ctx'> </div><div class='hunk'>@@ -121,8 +136,17 @@ struct dst_state {</div><div class='ctx'> 	u8 card_info[8];</div><div class='ctx'> 	u8 vendor[8];</div><div class='ctx'> 	u8 board_info[8];</div><div class='del'>-</div><div class='add'>+	u32 tuner_type;</div><div class='add'>+	char *tuner_name;</div><div class='ctx'> 	struct mutex dst_mutex;</div><div class='add'>+	u8 fw_name[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tuner_types {</div><div class='add'>+	u32 tuner_type;</div><div class='add'>+	char *tuner_name;</div><div class='add'>+	char *board_name;</div><div class='add'>+	char *fw_name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dst_types {</div><div class='hunk'>@@ -131,6 +155,7 @@ struct dst_types {</div><div class='ctx'> 	u8 dst_type;</div><div class='ctx'> 	u32 type_flags;</div><div class='ctx'> 	u32 dst_feature;</div><div class='add'>+	u32 tuner_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dst_config</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c<br/>index ccc7b2eb4a2d..b715b972d2fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/bt8xx/dvb-bt8xx.c</a></div><div class='hunk'>@@ -147,12 +147,15 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf)</div><div class='add'>+static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	unsigned char bs = 0;</div><div class='ctx'> 	unsigned char cp = 0;</div><div class='ctx'> </div><div class='add'>+	if (buf_len &lt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;frequency &lt; 542000000)</div><div class='hunk'>@@ -169,22 +172,25 @@ static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, struct dvb_frontend_</div><div class='ctx'> 	else</div><div class='ctx'> 		bs = 0x08;</div><div class='ctx'> </div><div class='del'>-	pllbuf[0] = 0xc0; // Note: non-linux standard PLL i2c address</div><div class='add'>+	pllbuf[0] = 0x60;</div><div class='ctx'> 	pllbuf[1] = div &gt;&gt; 8;</div><div class='ctx'> 	pllbuf[2] = div &amp; 0xff;</div><div class='ctx'> 	pllbuf[3] = cp;</div><div class='ctx'> 	pllbuf[4] = bs;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config thomson_dtt7579_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.demod_init = thomson_dtt7579_demod_init,</div><div class='del'>-	.pll_set = thomson_dtt7579_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static struct zl10353_config thomson_dtt7579_zl10353_config = {</div><div class='add'>+	.demod_address = 0x0f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	u32 freq = params-&gt;frequency;</div><div class='ctx'> </div><div class='hunk'>@@ -237,7 +243,7 @@ static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pinnsat_pll_init(struct dvb_frontend* fe)</div><div class='add'>+static int pinnsat_tuner_init(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_bt8xx_card *card = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -247,7 +253,7 @@ static int pinnsat_pll_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pinnsat_pll_sleep(struct dvb_frontend* fe)</div><div class='add'>+static int pinnsat_tuner_sleep(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_bt8xx_card *card = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -258,12 +264,9 @@ static int pinnsat_pll_sleep(struct dvb_frontend* fe)</div><div class='ctx'> </div><div class='ctx'> static struct cx24110_config pctvsat_config = {</div><div class='ctx'> 	.demod_address = 0x55,</div><div class='del'>-	.pll_init = pinnsat_pll_init,</div><div class='del'>-	.pll_set = cx24108_pll_set,</div><div class='del'>-	.pll_sleep = pinnsat_pll_sleep,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 cfg, cpump, band_select;</div><div class='hunk'>@@ -297,6 +300,8 @@ static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_front</div><div class='ctx'> 	data[2] = ((div &gt;&gt; 10) &amp; 0x60) | cfg;</div><div class='ctx'> 	data[3] = (cpump &lt;&lt; 6) | band_select;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(card-&gt;i2c_adapter, &amp;msg, 1);</div><div class='ctx'> 	return (div * 166666 - 36000000);</div><div class='ctx'> }</div><div class='hunk'>@@ -310,7 +315,6 @@ static int microtune_mt7202dtf_request_firmware(struct dvb_frontend* fe, const s</div><div class='ctx'> </div><div class='ctx'> static struct sp887x_config microtune_mt7202dtf_config = {</div><div class='ctx'> 	.demod_address = 0x70,</div><div class='del'>-	.pll_set = microtune_mt7202dtf_pll_set,</div><div class='ctx'> 	.request_firmware = microtune_mt7202dtf_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -337,12 +341,14 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int advbt771_samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf)</div><div class='add'>+static int advbt771_samsung_tdtc9251dh0_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	unsigned char bs = 0;</div><div class='ctx'> 	unsigned char cp = 0;</div><div class='ctx'> </div><div class='add'>+	if (buf_len &lt; 5) return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='ctx'> 	if (params-&gt;frequency &lt; 150000000)</div><div class='hunk'>@@ -383,19 +389,18 @@ static int advbt771_samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct</div><div class='ctx'> 	else</div><div class='ctx'> 		bs = 0x08;</div><div class='ctx'> </div><div class='del'>-	pllbuf[0] = 0xc2; // Note: non-linux standard PLL i2c address</div><div class='add'>+	pllbuf[0] = 0x61;</div><div class='ctx'> 	pllbuf[1] = div &gt;&gt; 8;</div><div class='ctx'> 	pllbuf[2] = div &amp; 0xff;</div><div class='ctx'> 	pllbuf[3] = cp;</div><div class='ctx'> 	pllbuf[4] = bs;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config advbt771_samsung_tdtc9251dh0_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.demod_init = advbt771_samsung_tdtc9251dh0_demod_init,</div><div class='del'>-	.pll_set = advbt771_samsung_tdtc9251dh0_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dst_config dst_config = {</div><div class='hunk'>@@ -455,7 +460,7 @@ static struct or51211_config or51211_config = {</div><div class='ctx'> 	.sleep = or51211_sleep,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='hunk'>@@ -478,6 +483,8 @@ static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(card-&gt;i2c_adapter, &amp;msg, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -485,7 +492,6 @@ static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> static struct nxt6000_config vp3021_alps_tded4_config = {</div><div class='ctx'> 	.demod_address = 0x0a,</div><div class='ctx'> 	.clock_inversion = 1,</div><div class='del'>-	.pll_set = vp3021_alps_tded4_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int digitv_alps_tded4_demod_init(struct dvb_frontend* fe)</div><div class='hunk'>@@ -506,14 +512,17 @@ static int digitv_alps_tded4_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int digitv_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf)</div><div class='add'>+static int digitv_alps_tded4_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct dvb_ofdm_parameters *op = &amp;params-&gt;u.ofdm;</div><div class='ctx'> </div><div class='add'>+	if (buf_len &lt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	div = (((params-&gt;frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;</div><div class='ctx'> </div><div class='del'>-	pllbuf[0] = 0xc2;</div><div class='add'>+	pllbuf[0] = 0x61;</div><div class='ctx'> 	pllbuf[1] = (div &gt;&gt; 8) &amp; 0x7F;</div><div class='ctx'> 	pllbuf[2] = div &amp; 0xFF;</div><div class='ctx'> 	pllbuf[3] = 0x85;</div><div class='hunk'>@@ -530,7 +539,7 @@ static int digitv_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> 	if (op-&gt;bandwidth == 8)</div><div class='ctx'> 		pllbuf[4] |= 0x04;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void digitv_alps_tded4_reset(struct dvb_bt8xx_card *bt)</div><div class='hunk'>@@ -557,43 +566,18 @@ static void digitv_alps_tded4_reset(struct dvb_bt8xx_card *bt)</div><div class='ctx'> static struct mt352_config digitv_alps_tded4_config = {</div><div class='ctx'> 	.demod_address = 0x0a,</div><div class='ctx'> 	.demod_init = digitv_alps_tded4_demod_init,</div><div class='del'>-	.pll_set = digitv_alps_tded4_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int tdvs_tua6034_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe-&gt;dvb-&gt;priv;</div><div class='del'>-	u8 buf[4];</div><div class='del'>-	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dvb_pll_configure(&amp;dvb_pll_tdvs_tua6034, buf, params-&gt;frequency, 0);</div><div class='del'>-	dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",</div><div class='del'>-		__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);</div><div class='del'>-	if ((err = i2c_transfer(card-&gt;i2c_adapter, &amp;msg, 1)) != 1) {</div><div class='del'>-		printk(KERN_WARNING "dvb-bt8xx: %s error "</div><div class='del'>-			"(addr %02x &lt;- %02x, err = %i)\n",</div><div class='del'>-			__FUNCTION__, buf[0], buf[1], err);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		else</div><div class='del'>-			return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the Auxiliary Byte. */</div><div class='del'>-	buf[2] &amp;= ~0x20;</div><div class='del'>-	buf[2] |= 0x18;</div><div class='del'>-	buf[3] = 0x50;</div><div class='del'>-	i2c_transfer(card-&gt;i2c_adapter, &amp;msg, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return lg_h06xf_pll_set(fe, card-&gt;i2c_adapter, params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct lgdt330x_config tdvs_tua6034_config = {</div><div class='ctx'> 	.demod_address    = 0x0e,</div><div class='ctx'> 	.demod_chip       = LGDT3303,</div><div class='ctx'> 	.serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */</div><div class='del'>-	.pll_set          = tdvs_tua6034_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void lgdt330x_reset(struct dvb_bt8xx_card *bt)</div><div class='hunk'>@@ -617,17 +601,25 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 	switch(type) {</div><div class='ctx'> 	case BTTV_BOARD_DVICO_DVBT_LITE:</div><div class='ctx'> 		card-&gt;fe = mt352_attach(&amp;thomson_dtt7579_config, card-&gt;i2c_adapter);</div><div class='add'>+</div><div class='add'>+		if (card-&gt;fe == NULL)</div><div class='add'>+			card-&gt;fe = zl10353_attach(&amp;thomson_dtt7579_zl10353_config,</div><div class='add'>+						  card-&gt;i2c_adapter);</div><div class='add'>+</div><div class='ctx'> 		if (card-&gt;fe != NULL) {</div><div class='del'>-			card-&gt;fe-&gt;ops-&gt;info.frequency_min = 174000000;</div><div class='del'>-			card-&gt;fe-&gt;ops-&gt;info.frequency_max = 862000000;</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.calc_regs = thomson_dtt7579_tuner_calc_regs;</div><div class='add'>+			card-&gt;fe-&gt;ops.info.frequency_min = 174000000;</div><div class='add'>+			card-&gt;fe-&gt;ops.info.frequency_max = 862000000;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:</div><div class='ctx'> 		lgdt330x_reset(card);</div><div class='ctx'> 		card-&gt;fe = lgdt330x_attach(&amp;tdvs_tua6034_config, card-&gt;i2c_adapter);</div><div class='del'>-		if (card-&gt;fe != NULL)</div><div class='add'>+		if (card-&gt;fe != NULL) {</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.set_params = tdvs_tua6034_tuner_set_params;</div><div class='ctx'> 			dprintk ("dvb_bt8xx: lgdt330x detected\n");</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BTTV_BOARD_NEBULA_DIGITV:</div><div class='hunk'>@@ -640,6 +632,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 		digitv_alps_tded4_reset(card);</div><div class='ctx'> 		card-&gt;fe = nxt6000_attach(&amp;vp3021_alps_tded4_config, card-&gt;i2c_adapter);</div><div class='ctx'> 		if (card-&gt;fe != NULL) {</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.set_params = vp3021_alps_tded4_tuner_set_params;</div><div class='ctx'> 			dprintk ("dvb_bt8xx: an nxt6000 was detected on your digitv card\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -648,19 +641,25 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 		digitv_alps_tded4_reset(card);</div><div class='ctx'> 		card-&gt;fe = mt352_attach(&amp;digitv_alps_tded4_config, card-&gt;i2c_adapter);</div><div class='ctx'> </div><div class='del'>-		if (card-&gt;fe != NULL)</div><div class='add'>+		if (card-&gt;fe != NULL) {</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.calc_regs = digitv_alps_tded4_tuner_calc_regs;</div><div class='ctx'> 			dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n");</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BTTV_BOARD_AVDVBT_761:</div><div class='ctx'> 		card-&gt;fe = sp887x_attach(&amp;microtune_mt7202dtf_config, card-&gt;i2c_adapter);</div><div class='add'>+		if (card-&gt;fe) {</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.set_params = microtune_mt7202dtf_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BTTV_BOARD_AVDVBT_771:</div><div class='ctx'> 		card-&gt;fe = mt352_attach(&amp;advbt771_samsung_tdtc9251dh0_config, card-&gt;i2c_adapter);</div><div class='ctx'> 		if (card-&gt;fe != NULL) {</div><div class='del'>-			card-&gt;fe-&gt;ops-&gt;info.frequency_min = 174000000;</div><div class='del'>-			card-&gt;fe-&gt;ops-&gt;info.frequency_max = 862000000;</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.calc_regs = advbt771_samsung_tdtc9251dh0_tuner_calc_regs;</div><div class='add'>+			card-&gt;fe-&gt;ops.info.frequency_min = 174000000;</div><div class='add'>+			card-&gt;fe-&gt;ops.info.frequency_max = 862000000;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -687,6 +686,11 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> </div><div class='ctx'> 	case BTTV_BOARD_PINNACLESAT:</div><div class='ctx'> 		card-&gt;fe = cx24110_attach(&amp;pctvsat_config, card-&gt;i2c_adapter);</div><div class='add'>+		if (card-&gt;fe) {</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.init = pinnsat_tuner_init;</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.sleep = pinnsat_tuner_sleep;</div><div class='add'>+			card-&gt;fe-&gt;ops.tuner_ops.set_params = cx24108_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case BTTV_BOARD_PC_HDTV:</div><div class='hunk'>@@ -703,8 +707,8 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> 	else</div><div class='ctx'> 		if (dvb_register_frontend(&amp;card-&gt;dvb_adapter, card-&gt;fe)) {</div><div class='ctx'> 			printk("dvb-bt8xx: Frontend registration failed!\n");</div><div class='del'>-			if (card-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-				card-&gt;fe-&gt;ops-&gt;release(card-&gt;fe);</div><div class='add'>+			if (card-&gt;fe-&gt;ops.release)</div><div class='add'>+				card-&gt;fe-&gt;ops.release(card-&gt;fe);</div><div class='ctx'> 			card-&gt;fe = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> }</div><div class='hunk'>@@ -713,7 +717,7 @@ static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_register_adapter(&amp;card-&gt;dvb_adapter, card-&gt;card_name, THIS_MODULE)) &lt; 0) {</div><div class='add'>+	if ((result = dvb_register_adapter(&amp;card-&gt;dvb_adapter, card-&gt;card_name, THIS_MODULE, &amp;card-&gt;bt-&gt;dev-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		printk("dvb_bt8xx: dvb_register_adapter failed (errno = %d)\n", result);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h<br/>index 00dd9fa54c82..4745a9017a19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/bt8xx/dvb-bt8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/bt8xx/dvb-bt8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/bt8xx/dvb-bt8xx.h</a></div><div class='hunk'>@@ -37,6 +37,8 @@</div><div class='ctx'> #include "cx24110.h"</div><div class='ctx'> #include "or51211.h"</div><div class='ctx'> #include "lgdt330x.h"</div><div class='add'>+#include "lg_h06xf.h"</div><div class='add'>+#include "zl10353.h"</div><div class='ctx'> </div><div class='ctx'> struct dvb_bt8xx_card {</div><div class='ctx'> 	struct mutex lock;</div><div class='head'>diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig<br/>index 6018fcdba1e6..b5cdd57ec6f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/cinergyT2/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/cinergyT2/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/cinergyT2/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/cinergyT2/Kconfig</a></div><div class='hunk'>@@ -64,7 +64,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL</div><div class='ctx'> config DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE</div><div class='ctx'> 	bool "Register the onboard IR Remote Control Receiver as Input Device"</div><div class='ctx'> 	depends on DVB_CINERGYT2_TUNING</div><div class='del'>-	default "yes"</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enable this option if you want to use the onboard Infrared Remote</div><div class='ctx'> 	  Control Receiver as Linux-Input device.</div><div class='head'>diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c<br/>index 9325d039ea65..001c71b6be61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/cinergyT2/cinergyT2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/cinergyT2/cinergyT2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/cinergyT2/cinergyT2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/cinergyT2/cinergyT2.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -544,15 +543,19 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_device *dvbdev = file-&gt;private_data;</div><div class='ctx'> 	struct cinergyt2 *cinergyt2 = dvbdev-&gt;priv;</div><div class='add'>+       unsigned int mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cinergyt2-&gt;disconnect_pending || mutex_lock_interruptible(&amp;cinergyt2-&gt;sem))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> </div><div class='ctx'> 	poll_wait(file, &amp;cinergyt2-&gt;poll_wq, wait);</div><div class='ctx'> </div><div class='add'>+       if (cinergyt2-&gt;pending_fe_events != 0)</div><div class='add'>+		mask |= (POLLIN | POLLRDNORM | POLLPRI);</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;cinergyt2-&gt;sem);</div><div class='ctx'> </div><div class='del'>-	return (POLLIN | POLLRDNORM | POLLPRI);</div><div class='add'>+       return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -902,7 +905,7 @@ static int cinergyt2_probe (struct usb_interface *intf,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = dvb_register_adapter(&amp;cinergyt2-&gt;adapter, DRIVER_NAME, THIS_MODULE)) &lt; 0) {</div><div class='add'>+	if ((err = dvb_register_adapter(&amp;cinergyt2-&gt;adapter, DRIVER_NAME, THIS_MODULE, &amp;cinergyt2-&gt;udev-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		kfree(cinergyt2);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/Makefile b/drivers/media/dvb/dvb-core/Makefile<br/>index 7adb50c1e8eb..11054657fdb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/Makefile</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> # Makefile for the kernel DVB device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \</div><div class='del'>-		dvb_ca_en50221.o dvb_frontend.o \</div><div class='del'>-		dvb_net.o dvb_ringbuffer.o</div><div class='add'>+dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o 	\</div><div class='add'>+		dvb_ca_en50221.o dvb_frontend.o 		\</div><div class='add'>+		dvb_net.o dvb_ringbuffer.o dvb_math.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DVB_CORE) += dvb-core.o</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c<br/>index 04578df3f249..988499dfddf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dmxdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dmxdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dmxdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dmxdev.c</a></div><div class='hunk'>@@ -872,9 +872,6 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		mutex_unlock(&amp;dmxdevfilter-&gt;mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case DMX_GET_EVENT:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case DMX_GET_PES_PIDS:</div><div class='ctx'> 		if (!dmxdev-&gt;demux-&gt;get_pes_pids) {</div><div class='ctx'> 			ret = -EINVAL;</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c<br/>index 00347a750681..2a03bf53cb29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_ca_en50221.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_ca_en50221.c</a></div><div class='hunk'>@@ -1060,8 +1060,18 @@ static int dvb_ca_en50221_thread(void *data)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			case DVB_CA_SLOTSTATE_VALIDATE:</div><div class='del'>-				if (dvb_ca_en50221_parse_attributes(ca, slot)</div><div class='del'>-				    != 0) {</div><div class='add'>+				if (dvb_ca_en50221_parse_attributes(ca, slot) != 0) {</div><div class='add'>+					/* we need this extra check for annoying interfaces like the budget-av */</div><div class='add'>+					if ((!(ca-&gt;flags &amp; DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &amp;&amp;</div><div class='add'>+					    (ca-&gt;pub-&gt;poll_slot_status)) {</div><div class='add'>+						int status = ca-&gt;pub-&gt;poll_slot_status(ca-&gt;pub, slot, 0);</div><div class='add'>+						if (!(status &amp; DVB_CA_EN50221_POLL_CAM_PRESENT)) {</div><div class='add'>+							ca-&gt;slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;</div><div class='add'>+							dvb_ca_en50221_thread_update_delay(ca);</div><div class='add'>+							break;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+</div><div class='ctx'> 					printk("dvb_ca adapter %d: Invalid PC card inserted :(\n",</div><div class='ctx'> 					       ca-&gt;dvbdev-&gt;adapter-&gt;num);</div><div class='ctx'> 					ca-&gt;slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID;</div><div class='hunk'>@@ -1108,6 +1118,17 @@ static int dvb_ca_en50221_thread(void *data)</div><div class='ctx'> </div><div class='ctx'> 			case DVB_CA_SLOTSTATE_LINKINIT:</div><div class='ctx'> 				if (dvb_ca_en50221_link_init(ca, slot) != 0) {</div><div class='add'>+					/* we need this extra check for annoying interfaces like the budget-av */</div><div class='add'>+					if ((!(ca-&gt;flags &amp; DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &amp;&amp;</div><div class='add'>+					    (ca-&gt;pub-&gt;poll_slot_status)) {</div><div class='add'>+						int status = ca-&gt;pub-&gt;poll_slot_status(ca-&gt;pub, slot, 0);</div><div class='add'>+						if (!(status &amp; DVB_CA_EN50221_POLL_CAM_PRESENT)) {</div><div class='add'>+							ca-&gt;slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;</div><div class='add'>+							dvb_ca_en50221_thread_update_delay(ca);</div><div class='add'>+							break;</div><div class='add'>+						}</div><div class='add'>+					}</div><div class='add'>+</div><div class='ctx'> 					printk("dvb_ca adapter %d: DVB CAM link initialisation failed :(\n", ca-&gt;dvbdev-&gt;adapter-&gt;num);</div><div class='ctx'> 					ca-&gt;slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID;</div><div class='ctx'> 					dvb_ca_en50221_thread_update_delay(ca);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c<br/>index 83ec5e06c482..fcff5eab21a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_demux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_demux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_demux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_demux.c</a></div><div class='hunk'>@@ -473,7 +473,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)</div><div class='ctx'> 			goto bailout;</div><div class='ctx'> 		}</div><div class='ctx'> 		memcpy(&amp;demux-&gt;tsbuf[i], buf, j);</div><div class='del'>-		if ((demux-&gt;tsbuf[0] == 0x47) | (demux-&gt;tsbuf[0] == 0xB8)) {</div><div class='add'>+		if ((demux-&gt;tsbuf[0] == 0x47) || (demux-&gt;tsbuf[0] == 0xB8)) {</div><div class='ctx'> 			memcpy(tmppack, demux-&gt;tsbuf, 188);</div><div class='ctx'> 			if (tmppack[0] == 0xB8)</div><div class='ctx'> 				tmppack[0] = 0x47;</div><div class='hunk'>@@ -484,7 +484,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (p &lt; count) {</div><div class='del'>-		if ((buf[p] == 0x47) | (buf[p] == 0xB8)) {</div><div class='add'>+		if ((buf[p] == 0x47) || (buf[p] == 0xB8)) {</div><div class='ctx'> 			if (count - p &gt;= 204) {</div><div class='ctx'> 				memcpy(tmppack, &amp;buf[p], 188);</div><div class='ctx'> 				if (tmppack[0] == 0xB8)</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c<br/>index a051790161b0..59ac35ddd51e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_frontend.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_frontend.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ MODULE_PARM_DESC(dvb_force_auto_inversion, "0: normal (default), 1: INVERSION_AU</div><div class='ctx'> module_param(dvb_override_tune_delay, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(dvb_override_tune_delay, "0: normal (default), &gt;0 =&gt; delay in milliseconds to wait for lock after a tune attempt");</div><div class='ctx'> module_param(dvb_powerdown_on_sleep, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(dvb_powerdown_on_sleep, "0: do not power down, 1: turn LNB volatage off on sleep (default)");</div><div class='add'>+MODULE_PARM_DESC(dvb_powerdown_on_sleep, "0: do not power down, 1: turn LNB voltage off on sleep (default)");</div><div class='ctx'> </div><div class='ctx'> #define dprintk if (dvb_frontend_debug) printk</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +72,8 @@ MODULE_PARM_DESC(dvb_powerdown_on_sleep, "0: do not power down, 1: turn LNB vola</div><div class='ctx'> #define FESTATE_SEARCHING_FAST (FESTATE_TUNING_FAST | FESTATE_ZIGZAG_FAST)</div><div class='ctx'> #define FESTATE_SEARCHING_SLOW (FESTATE_TUNING_SLOW | FESTATE_ZIGZAG_SLOW)</div><div class='ctx'> #define FESTATE_LOSTLOCK (FESTATE_ZIGZAG_FAST | FESTATE_ZIGZAG_SLOW)</div><div class='add'>+</div><div class='add'>+#define FE_ALGO_HW		1</div><div class='ctx'> /*</div><div class='ctx'>  * FESTATE_IDLE. No tuning parameters have been supplied and the loop is idling.</div><div class='ctx'>  * FESTATE_RETUNE. Parameters have been supplied, but we have not yet performed the first tune.</div><div class='hunk'>@@ -151,8 +153,8 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)</div><div class='ctx'> 		sizeof (struct dvb_frontend_parameters));</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; FE_HAS_LOCK)</div><div class='del'>-		if (fe-&gt;ops-&gt;get_frontend)</div><div class='del'>-			fe-&gt;ops-&gt;get_frontend(fe, &amp;e-&gt;parameters);</div><div class='add'>+		if (fe-&gt;ops.get_frontend)</div><div class='add'>+			fe-&gt;ops.get_frontend(fe, &amp;e-&gt;parameters);</div><div class='ctx'> </div><div class='ctx'> 	events-&gt;eventw = wp;</div><div class='ctx'> </div><div class='hunk'>@@ -211,10 +213,15 @@ static void dvb_frontend_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk ("DVB: initialising frontend %i (%s)...\n",</div><div class='ctx'> 		 fe-&gt;dvb-&gt;num,</div><div class='del'>-		 fe-&gt;ops-&gt;info.name);</div><div class='del'>-</div><div class='del'>-	if (fe-&gt;ops-&gt;init)</div><div class='del'>-		fe-&gt;ops-&gt;init(fe);</div><div class='add'>+		 fe-&gt;ops.info.name);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.init)</div><div class='add'>+		fe-&gt;ops.init(fe);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.init) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.init(fe);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dvb_frontend_reinitialise(struct dvb_frontend *fe)</div><div class='hunk'>@@ -259,7 +266,7 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra</div><div class='ctx'> 	u32 original_frequency = fepriv-&gt;parameters.frequency;</div><div class='ctx'> </div><div class='ctx'> 	/* are we using autoinversion? */</div><div class='del'>-	autoinversion = ((!(fe-&gt;ops-&gt;info.caps &amp; FE_CAN_INVERSION_AUTO)) &amp;&amp;</div><div class='add'>+	autoinversion = ((!(fe-&gt;ops.info.caps &amp; FE_CAN_INVERSION_AUTO)) &amp;&amp;</div><div class='ctx'> 			 (fepriv-&gt;parameters.inversion == INVERSION_AUTO));</div><div class='ctx'> </div><div class='ctx'> 	/* setup parameters correctly */</div><div class='hunk'>@@ -329,8 +336,8 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra</div><div class='ctx'> 	fepriv-&gt;parameters.frequency += fepriv-&gt;lnb_drift;</div><div class='ctx'> 	if (autoinversion)</div><div class='ctx'> 		fepriv-&gt;parameters.inversion = fepriv-&gt;inversion;</div><div class='del'>-	if (fe-&gt;ops-&gt;set_frontend)</div><div class='del'>-		fe-&gt;ops-&gt;set_frontend(fe, &amp;fepriv-&gt;parameters);</div><div class='add'>+	if (fe-&gt;ops.set_frontend)</div><div class='add'>+		fe-&gt;ops.set_frontend(fe, &amp;fepriv-&gt;parameters);</div><div class='ctx'> </div><div class='ctx'> 	fepriv-&gt;parameters.frequency = original_frequency;</div><div class='ctx'> 	fepriv-&gt;parameters.inversion = original_inversion;</div><div class='hunk'>@@ -354,8 +361,8 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> 	/* in SCAN mode, we just set the frontend when asked and leave it alone */</div><div class='ctx'> 	if (fepriv-&gt;tune_mode_flags &amp; FE_TUNE_MODE_ONESHOT) {</div><div class='ctx'> 		if (fepriv-&gt;state &amp; FESTATE_RETUNE) {</div><div class='del'>-			if (fe-&gt;ops-&gt;set_frontend)</div><div class='del'>-				fe-&gt;ops-&gt;set_frontend(fe, &amp;fepriv-&gt;parameters);</div><div class='add'>+			if (fe-&gt;ops.set_frontend)</div><div class='add'>+				fe-&gt;ops.set_frontend(fe, &amp;fepriv-&gt;parameters);</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_TUNED;</div><div class='ctx'> 		}</div><div class='ctx'> 		fepriv-&gt;delay = 3*HZ;</div><div class='hunk'>@@ -367,8 +374,8 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> 	if (fepriv-&gt;state &amp; FESTATE_RETUNE) {</div><div class='ctx'> 		s = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (fe-&gt;ops-&gt;read_status)</div><div class='del'>-			fe-&gt;ops-&gt;read_status(fe, &amp;s);</div><div class='add'>+		if (fe-&gt;ops.read_status)</div><div class='add'>+			fe-&gt;ops.read_status(fe, &amp;s);</div><div class='ctx'> 		if (s != fepriv-&gt;status) {</div><div class='ctx'> 			dvb_frontend_add_event(fe, s);</div><div class='ctx'> 			fepriv-&gt;status = s;</div><div class='hunk'>@@ -381,7 +388,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> 		fepriv-&gt;state = FESTATE_TUNED;</div><div class='ctx'> </div><div class='ctx'> 		/* if we're tuned, then we have determined the correct inversion */</div><div class='del'>-		if ((!(fe-&gt;ops-&gt;info.caps &amp; FE_CAN_INVERSION_AUTO)) &amp;&amp;</div><div class='add'>+		if ((!(fe-&gt;ops.info.caps &amp; FE_CAN_INVERSION_AUTO)) &amp;&amp;</div><div class='ctx'> 		    (fepriv-&gt;parameters.inversion == INVERSION_AUTO)) {</div><div class='ctx'> 			fepriv-&gt;parameters.inversion = fepriv-&gt;inversion;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -405,7 +412,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)</div><div class='ctx'> 	/* don't actually do anything if we're in the LOSTLOCK state,</div><div class='ctx'> 	 * the frontend is set to FE_CAN_RECOVER, and the max_drift is 0 */</div><div class='ctx'> 	if ((fepriv-&gt;state &amp; FESTATE_LOSTLOCK) &amp;&amp;</div><div class='del'>-	    (fe-&gt;ops-&gt;info.caps &amp; FE_CAN_RECOVER) &amp;&amp; (fepriv-&gt;max_drift == 0)) {</div><div class='add'>+	    (fe-&gt;ops.info.caps &amp; FE_CAN_RECOVER) &amp;&amp; (fepriv-&gt;max_drift == 0)) {</div><div class='ctx'> 		dvb_frontend_swzigzag_update_delay(fepriv, s &amp; FE_HAS_LOCK);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -540,39 +547,46 @@ static int dvb_frontend_thread(void *data)</div><div class='ctx'> 		if (fepriv-&gt;reinitialise) {</div><div class='ctx'> 			dvb_frontend_init(fe);</div><div class='ctx'> 			if (fepriv-&gt;tone != -1) {</div><div class='del'>-				fe-&gt;ops-&gt;set_tone(fe, fepriv-&gt;tone);</div><div class='add'>+				fe-&gt;ops.set_tone(fe, fepriv-&gt;tone);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (fepriv-&gt;voltage != -1) {</div><div class='del'>-				fe-&gt;ops-&gt;set_voltage(fe, fepriv-&gt;voltage);</div><div class='add'>+				fe-&gt;ops.set_voltage(fe, fepriv-&gt;voltage);</div><div class='ctx'> 			}</div><div class='ctx'> 			fepriv-&gt;reinitialise = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* do an iteration of the tuning loop */</div><div class='del'>-		if (fe-&gt;ops-&gt;tune) {</div><div class='del'>-			/* have we been asked to retune? */</div><div class='del'>-			params = NULL;</div><div class='del'>-			if (fepriv-&gt;state &amp; FESTATE_RETUNE) {</div><div class='del'>-				params = &amp;fepriv-&gt;parameters;</div><div class='del'>-				fepriv-&gt;state = FESTATE_TUNED;</div><div class='del'>-			}</div><div class='add'>+		if (fe-&gt;ops.get_frontend_algo) {</div><div class='add'>+			if (fe-&gt;ops.get_frontend_algo(fe) == FE_ALGO_HW) {</div><div class='add'>+				/* have we been asked to retune? */</div><div class='add'>+				params = NULL;</div><div class='add'>+				if (fepriv-&gt;state &amp; FESTATE_RETUNE) {</div><div class='add'>+					params = &amp;fepriv-&gt;parameters;</div><div class='add'>+					fepriv-&gt;state = FESTATE_TUNED;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-			fe-&gt;ops-&gt;tune(fe, params, fepriv-&gt;tune_mode_flags, &amp;fepriv-&gt;delay, &amp;s);</div><div class='del'>-			if (s != fepriv-&gt;status) {</div><div class='del'>-				dvb_frontend_add_event(fe, s);</div><div class='del'>-				fepriv-&gt;status = s;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='add'>+				fe-&gt;ops.tune(fe, params, fepriv-&gt;tune_mode_flags, &amp;fepriv-&gt;delay, &amp;s);</div><div class='add'>+				if (s != fepriv-&gt;status) {</div><div class='add'>+					dvb_frontend_add_event(fe, s);</div><div class='add'>+					fepriv-&gt;status = s;</div><div class='add'>+				}</div><div class='add'>+			} else</div><div class='add'>+				dvb_frontend_swzigzag(fe);</div><div class='add'>+		} else</div><div class='ctx'> 			dvb_frontend_swzigzag(fe);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dvb_shutdown_timeout) {</div><div class='ctx'> 		if (dvb_powerdown_on_sleep)</div><div class='del'>-			if (fe-&gt;ops-&gt;set_voltage)</div><div class='del'>-				fe-&gt;ops-&gt;set_voltage(fe, SEC_VOLTAGE_OFF);</div><div class='del'>-		if (fe-&gt;ops-&gt;sleep)</div><div class='del'>-			fe-&gt;ops-&gt;sleep(fe);</div><div class='add'>+			if (fe-&gt;ops.set_voltage)</div><div class='add'>+				fe-&gt;ops.set_voltage(fe, SEC_VOLTAGE_OFF);</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.sleep) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.sleep(fe);</div><div class='add'>+			if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+				fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+		}</div><div class='add'>+		if (fe-&gt;ops.sleep)</div><div class='add'>+			fe-&gt;ops.sleep(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fepriv-&gt;thread_pid = 0;</div><div class='hunk'>@@ -724,7 +738,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case FE_GET_INFO: {</div><div class='ctx'> 		struct dvb_frontend_info* info = parg;</div><div class='del'>-		memcpy(info, &amp;fe-&gt;ops-&gt;info, sizeof(struct dvb_frontend_info));</div><div class='add'>+		memcpy(info, &amp;fe-&gt;ops.info, sizeof(struct dvb_frontend_info));</div><div class='ctx'> </div><div class='ctx'> 		/* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't</div><div class='ctx'> 		 * do it, it is done for it. */</div><div class='hunk'>@@ -744,58 +758,58 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (fe-&gt;ops-&gt;read_status)</div><div class='del'>-			err = fe-&gt;ops-&gt;read_status(fe, status);</div><div class='add'>+		if (fe-&gt;ops.read_status)</div><div class='add'>+			err = fe-&gt;ops.read_status(fe, status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case FE_READ_BER:</div><div class='del'>-		if (fe-&gt;ops-&gt;read_ber)</div><div class='del'>-			err = fe-&gt;ops-&gt;read_ber(fe, (__u32*) parg);</div><div class='add'>+		if (fe-&gt;ops.read_ber)</div><div class='add'>+			err = fe-&gt;ops.read_ber(fe, (__u32*) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_READ_SIGNAL_STRENGTH:</div><div class='del'>-		if (fe-&gt;ops-&gt;read_signal_strength)</div><div class='del'>-			err = fe-&gt;ops-&gt;read_signal_strength(fe, (__u16*) parg);</div><div class='add'>+		if (fe-&gt;ops.read_signal_strength)</div><div class='add'>+			err = fe-&gt;ops.read_signal_strength(fe, (__u16*) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_READ_SNR:</div><div class='del'>-		if (fe-&gt;ops-&gt;read_snr)</div><div class='del'>-			err = fe-&gt;ops-&gt;read_snr(fe, (__u16*) parg);</div><div class='add'>+		if (fe-&gt;ops.read_snr)</div><div class='add'>+			err = fe-&gt;ops.read_snr(fe, (__u16*) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_READ_UNCORRECTED_BLOCKS:</div><div class='del'>-		if (fe-&gt;ops-&gt;read_ucblocks)</div><div class='del'>-			err = fe-&gt;ops-&gt;read_ucblocks(fe, (__u32*) parg);</div><div class='add'>+		if (fe-&gt;ops.read_ucblocks)</div><div class='add'>+			err = fe-&gt;ops.read_ucblocks(fe, (__u32*) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	case FE_DISEQC_RESET_OVERLOAD:</div><div class='del'>-		if (fe-&gt;ops-&gt;diseqc_reset_overload) {</div><div class='del'>-			err = fe-&gt;ops-&gt;diseqc_reset_overload(fe);</div><div class='add'>+		if (fe-&gt;ops.diseqc_reset_overload) {</div><div class='add'>+			err = fe-&gt;ops.diseqc_reset_overload(fe);</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_DISEQC;</div><div class='ctx'> 			fepriv-&gt;status = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_DISEQC_SEND_MASTER_CMD:</div><div class='del'>-		if (fe-&gt;ops-&gt;diseqc_send_master_cmd) {</div><div class='del'>-			err = fe-&gt;ops-&gt;diseqc_send_master_cmd(fe, (struct dvb_diseqc_master_cmd*) parg);</div><div class='add'>+		if (fe-&gt;ops.diseqc_send_master_cmd) {</div><div class='add'>+			err = fe-&gt;ops.diseqc_send_master_cmd(fe, (struct dvb_diseqc_master_cmd*) parg);</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_DISEQC;</div><div class='ctx'> 			fepriv-&gt;status = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_DISEQC_SEND_BURST:</div><div class='del'>-		if (fe-&gt;ops-&gt;diseqc_send_burst) {</div><div class='del'>-			err = fe-&gt;ops-&gt;diseqc_send_burst(fe, (fe_sec_mini_cmd_t) parg);</div><div class='add'>+		if (fe-&gt;ops.diseqc_send_burst) {</div><div class='add'>+			err = fe-&gt;ops.diseqc_send_burst(fe, (fe_sec_mini_cmd_t) parg);</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_DISEQC;</div><div class='ctx'> 			fepriv-&gt;status = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_SET_TONE:</div><div class='del'>-		if (fe-&gt;ops-&gt;set_tone) {</div><div class='del'>-			err = fe-&gt;ops-&gt;set_tone(fe, (fe_sec_tone_mode_t) parg);</div><div class='add'>+		if (fe-&gt;ops.set_tone) {</div><div class='add'>+			err = fe-&gt;ops.set_tone(fe, (fe_sec_tone_mode_t) parg);</div><div class='ctx'> 			fepriv-&gt;tone = (fe_sec_tone_mode_t) parg;</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_DISEQC;</div><div class='ctx'> 			fepriv-&gt;status = 0;</div><div class='hunk'>@@ -803,8 +817,8 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_SET_VOLTAGE:</div><div class='del'>-		if (fe-&gt;ops-&gt;set_voltage) {</div><div class='del'>-			err = fe-&gt;ops-&gt;set_voltage(fe, (fe_sec_voltage_t) parg);</div><div class='add'>+		if (fe-&gt;ops.set_voltage) {</div><div class='add'>+			err = fe-&gt;ops.set_voltage(fe, (fe_sec_voltage_t) parg);</div><div class='ctx'> 			fepriv-&gt;voltage = (fe_sec_voltage_t) parg;</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_DISEQC;</div><div class='ctx'> 			fepriv-&gt;status = 0;</div><div class='hunk'>@@ -812,11 +826,11 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_DISHNETWORK_SEND_LEGACY_CMD:</div><div class='del'>-		if (fe-&gt;ops-&gt;dishnetwork_send_legacy_command) {</div><div class='del'>-			err = fe-&gt;ops-&gt;dishnetwork_send_legacy_command(fe, (unsigned long) parg);</div><div class='add'>+		if (fe-&gt;ops.dishnetwork_send_legacy_command) {</div><div class='add'>+			err = fe-&gt;ops.dishnetwork_send_legacy_command(fe, (unsigned long) parg);</div><div class='ctx'> 			fepriv-&gt;state = FESTATE_DISEQC;</div><div class='ctx'> 			fepriv-&gt;status = 0;</div><div class='del'>-		} else if (fe-&gt;ops-&gt;set_voltage) {</div><div class='add'>+		} else if (fe-&gt;ops.set_voltage) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * NOTE: This is a fallback condition.  Some frontends</div><div class='ctx'> 			 * (stv0299 for instance) take longer than 8msec to</div><div class='hunk'>@@ -846,7 +860,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			/* before sending a command, initialize by sending</div><div class='ctx'> 			 * a 32ms 18V to the switch</div><div class='ctx'> 			 */</div><div class='del'>-			fe-&gt;ops-&gt;set_voltage(fe, SEC_VOLTAGE_18);</div><div class='add'>+			fe-&gt;ops.set_voltage(fe, SEC_VOLTAGE_18);</div><div class='ctx'> 			dvb_frontend_sleep_until(&amp;nexttime, 32000);</div><div class='ctx'> </div><div class='ctx'> 			for (i = 0; i &lt; 9; i++) {</div><div class='hunk'>@@ -854,7 +868,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 					do_gettimeofday(&amp;tv[i + 1]);</div><div class='ctx'> 				if ((cmd &amp; 0x01) != last) {</div><div class='ctx'> 					/* set voltage to (last ? 13V : 18V) */</div><div class='del'>-					fe-&gt;ops-&gt;set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);</div><div class='add'>+					fe-&gt;ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);</div><div class='ctx'> 					last = (last) ? 0 : 1;</div><div class='ctx'> 				}</div><div class='ctx'> 				cmd = cmd &gt;&gt; 1;</div><div class='hunk'>@@ -874,13 +888,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_DISEQC_RECV_SLAVE_REPLY:</div><div class='del'>-		if (fe-&gt;ops-&gt;diseqc_recv_slave_reply)</div><div class='del'>-			err = fe-&gt;ops-&gt;diseqc_recv_slave_reply(fe, (struct dvb_diseqc_slave_reply*) parg);</div><div class='add'>+		if (fe-&gt;ops.diseqc_recv_slave_reply)</div><div class='add'>+			err = fe-&gt;ops.diseqc_recv_slave_reply(fe, (struct dvb_diseqc_slave_reply*) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_ENABLE_HIGH_LNB_VOLTAGE:</div><div class='del'>-		if (fe-&gt;ops-&gt;enable_high_lnb_voltage)</div><div class='del'>-			err = fe-&gt;ops-&gt;enable_high_lnb_voltage(fe, (long) parg);</div><div class='add'>+		if (fe-&gt;ops.enable_high_lnb_voltage)</div><div class='add'>+			err = fe-&gt;ops.enable_high_lnb_voltage(fe, (long) parg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_SET_FRONTEND: {</div><div class='hunk'>@@ -898,7 +912,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			fepriv-&gt;parameters.inversion = INVERSION_AUTO;</div><div class='ctx'> 			fetunesettings.parameters.inversion = INVERSION_AUTO;</div><div class='ctx'> 		}</div><div class='del'>-		if (fe-&gt;ops-&gt;info.type == FE_OFDM) {</div><div class='add'>+		if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='ctx'> 			/* without hierachical coding code_rate_LP is irrelevant,</div><div class='ctx'> 			 * so we tolerate the otherwise invalid FEC_NONE setting */</div><div class='ctx'> 			if (fepriv-&gt;parameters.u.ofdm.hierarchy_information == HIERARCHY_NONE &amp;&amp;</div><div class='hunk'>@@ -907,13 +921,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* get frontend-specific tuning settings */</div><div class='del'>-		if (fe-&gt;ops-&gt;get_tune_settings &amp;&amp; (fe-&gt;ops-&gt;get_tune_settings(fe, &amp;fetunesettings) == 0)) {</div><div class='add'>+		if (fe-&gt;ops.get_tune_settings &amp;&amp; (fe-&gt;ops.get_tune_settings(fe, &amp;fetunesettings) == 0)) {</div><div class='ctx'> 			fepriv-&gt;min_delay = (fetunesettings.min_delay_ms * HZ) / 1000;</div><div class='ctx'> 			fepriv-&gt;max_drift = fetunesettings.max_drift;</div><div class='ctx'> 			fepriv-&gt;step_size = fetunesettings.step_size;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* default values */</div><div class='del'>-			switch(fe-&gt;ops-&gt;info.type) {</div><div class='add'>+			switch(fe-&gt;ops.info.type) {</div><div class='ctx'> 			case FE_QPSK:</div><div class='ctx'> 				fepriv-&gt;min_delay = HZ/20;</div><div class='ctx'> 				fepriv-&gt;step_size = fepriv-&gt;parameters.u.qpsk.symbol_rate / 16000;</div><div class='hunk'>@@ -928,11 +942,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 			case FE_OFDM:</div><div class='ctx'> 				fepriv-&gt;min_delay = HZ/20;</div><div class='del'>-				fepriv-&gt;step_size = fe-&gt;ops-&gt;info.frequency_stepsize * 2;</div><div class='del'>-				fepriv-&gt;max_drift = (fe-&gt;ops-&gt;info.frequency_stepsize * 2) + 1;</div><div class='add'>+				fepriv-&gt;step_size = fe-&gt;ops.info.frequency_stepsize * 2;</div><div class='add'>+				fepriv-&gt;max_drift = (fe-&gt;ops.info.frequency_stepsize * 2) + 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case FE_ATSC:</div><div class='del'>-				printk("dvb-core: FE_ATSC not handled yet.\n");</div><div class='add'>+				fepriv-&gt;min_delay = HZ/20;</div><div class='add'>+				fepriv-&gt;step_size = 0;</div><div class='add'>+				fepriv-&gt;max_drift = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -952,14 +968,15 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_GET_FRONTEND:</div><div class='del'>-		if (fe-&gt;ops-&gt;get_frontend) {</div><div class='add'>+		if (fe-&gt;ops.get_frontend) {</div><div class='ctx'> 			memcpy (parg, &amp;fepriv-&gt;parameters, sizeof (struct dvb_frontend_parameters));</div><div class='del'>-			err = fe-&gt;ops-&gt;get_frontend(fe, (struct dvb_frontend_parameters*) parg);</div><div class='add'>+			err = fe-&gt;ops.get_frontend(fe, (struct dvb_frontend_parameters*) parg);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FE_SET_FRONTEND_TUNE_MODE:</div><div class='ctx'> 		fepriv-&gt;tune_mode_flags = (unsigned long) parg;</div><div class='add'>+		err = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1067,7 +1084,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb,</div><div class='ctx'> </div><div class='ctx'> 	printk ("DVB: registering frontend %i (%s)...\n",</div><div class='ctx'> 		fe-&gt;dvb-&gt;num,</div><div class='del'>-		fe-&gt;ops-&gt;info.name);</div><div class='add'>+		fe-&gt;ops.info.name);</div><div class='ctx'> </div><div class='ctx'> 	dvb_register_device (fe-&gt;dvb, &amp;fepriv-&gt;dvbdev, &amp;dvbdev_template,</div><div class='ctx'> 			     fe, DVB_DEVICE_FRONTEND);</div><div class='hunk'>@@ -1085,10 +1102,15 @@ int dvb_unregister_frontend(struct dvb_frontend* fe)</div><div class='ctx'> 	mutex_lock(&amp;frontend_mutex);</div><div class='ctx'> 	dvb_unregister_device (fepriv-&gt;dvbdev);</div><div class='ctx'> 	dvb_frontend_stop (fe);</div><div class='del'>-	if (fe-&gt;ops-&gt;release)</div><div class='del'>-		fe-&gt;ops-&gt;release(fe);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.release) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.release(fe);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+	if (fe-&gt;ops.release)</div><div class='add'>+		fe-&gt;ops.release(fe);</div><div class='ctx'> 	else</div><div class='del'>-		printk("dvb_frontend: Demodulator (%s) does not have a release callback!\n", fe-&gt;ops-&gt;info.name);</div><div class='add'>+		printk("dvb_frontend: Demodulator (%s) does not have a release callback!\n", fe-&gt;ops.info.name);</div><div class='ctx'> 	/* fe is invalid now */</div><div class='ctx'> 	kfree(fepriv);</div><div class='ctx'> 	mutex_unlock(&amp;frontend_mutex);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h<br/>index 5926a3b745c9..2887e2b862a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_frontend.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_frontend.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_frontend.h</a></div><div class='hunk'>@@ -49,6 +49,44 @@ struct dvb_frontend_tune_settings {</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend;</div><div class='ctx'> </div><div class='add'>+struct dvb_tuner_info {</div><div class='add'>+	char name[128];</div><div class='add'>+</div><div class='add'>+	u32 frequency_min;</div><div class='add'>+	u32 frequency_max;</div><div class='add'>+	u32 frequency_step;</div><div class='add'>+</div><div class='add'>+	u32 bandwidth_min;</div><div class='add'>+	u32 bandwidth_max;</div><div class='add'>+	u32 bandwidth_step;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dvb_tuner_ops {</div><div class='add'>+</div><div class='add'>+	struct dvb_tuner_info info;</div><div class='add'>+</div><div class='add'>+	int (*release)(struct dvb_frontend *fe);</div><div class='add'>+	int (*init)(struct dvb_frontend *fe);</div><div class='add'>+	int (*sleep)(struct dvb_frontend *fe);</div><div class='add'>+</div><div class='add'>+	/** This is for simple PLLs - set all parameters in one go. */</div><div class='add'>+	int (*set_params)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);</div><div class='add'>+</div><div class='add'>+	/** This is support for demods like the mt352 - fills out the supplied buffer with what to write. */</div><div class='add'>+	int (*calc_regs)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p, u8 *buf, int buf_len);</div><div class='add'>+</div><div class='add'>+	int (*get_frequency)(struct dvb_frontend *fe, u32 *frequency);</div><div class='add'>+	int (*get_bandwidth)(struct dvb_frontend *fe, u32 *bandwidth);</div><div class='add'>+</div><div class='add'>+#define TUNER_STATUS_LOCKED 1</div><div class='add'>+	int (*get_status)(struct dvb_frontend *fe, u32 *status);</div><div class='add'>+</div><div class='add'>+	/** These are provided seperately from set_params in order to facilitate silicon</div><div class='add'>+	 * tuners which require sophisticated tuning loops, controlling each parameter seperately. */</div><div class='add'>+	int (*set_frequency)(struct dvb_frontend *fe, u32 frequency);</div><div class='add'>+	int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dvb_frontend_ops {</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend_info info;</div><div class='hunk'>@@ -64,6 +102,8 @@ struct dvb_frontend_ops {</div><div class='ctx'> 		    unsigned int mode_flags,</div><div class='ctx'> 		    int *delay,</div><div class='ctx'> 		    fe_status_t *status);</div><div class='add'>+	/* get frontend tuning algorithm from the module */</div><div class='add'>+	int (*get_frontend_algo)(struct dvb_frontend *fe);</div><div class='ctx'> </div><div class='ctx'> 	/* these two are only used for the swzigzag code */</div><div class='ctx'> 	int (*set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='hunk'>@@ -86,6 +126,8 @@ struct dvb_frontend_ops {</div><div class='ctx'> 	int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);</div><div class='ctx'> 	int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);</div><div class='ctx'> 	int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);</div><div class='add'>+</div><div class='add'>+	struct dvb_tuner_ops tuner_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MAX_EVENT 8</div><div class='hunk'>@@ -100,9 +142,10 @@ struct dvb_fe_events {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend {</div><div class='del'>-	struct dvb_frontend_ops* ops;</div><div class='add'>+	struct dvb_frontend_ops ops;</div><div class='ctx'> 	struct dvb_adapter *dvb;</div><div class='ctx'> 	void* demodulator_priv;</div><div class='add'>+	void* tuner_priv;</div><div class='ctx'> 	void* frontend_priv;</div><div class='ctx'> 	void* misc_priv;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_math.c b/drivers/media/dvb/dvb-core/dvb_math.c<br/>new file mode 100644<br/>index 000000000000..beb7c93aa6cb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_math.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_math.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+/*</div><div class='add'>+ * dvb-math provides some complex fixed-point math</div><div class='add'>+ * operations shared between the dvb related stuff</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Christoph Pfister (christophpfister@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * This library is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU Lesser General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2.1 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU Lesser General Public</div><div class='add'>+ * License along with this library; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/bug.h&gt;</div><div class='add'>+#include "dvb_math.h"</div><div class='add'>+</div><div class='add'>+static const unsigned short logtable[256] = {</div><div class='add'>+	0x0000, 0x0171, 0x02e0, 0x044e, 0x05ba, 0x0725, 0x088e, 0x09f7,</div><div class='add'>+	0x0b5d, 0x0cc3, 0x0e27, 0x0f8a, 0x10eb, 0x124b, 0x13aa, 0x1508,</div><div class='add'>+	0x1664, 0x17bf, 0x1919, 0x1a71, 0x1bc8, 0x1d1e, 0x1e73, 0x1fc6,</div><div class='add'>+	0x2119, 0x226a, 0x23ba, 0x2508, 0x2656, 0x27a2, 0x28ed, 0x2a37,</div><div class='add'>+	0x2b80, 0x2cc8, 0x2e0f, 0x2f54, 0x3098, 0x31dc, 0x331e, 0x345f,</div><div class='add'>+	0x359f, 0x36de, 0x381b, 0x3958, 0x3a94, 0x3bce, 0x3d08, 0x3e41,</div><div class='add'>+	0x3f78, 0x40af, 0x41e4, 0x4319, 0x444c, 0x457f, 0x46b0, 0x47e1,</div><div class='add'>+	0x4910, 0x4a3f, 0x4b6c, 0x4c99, 0x4dc5, 0x4eef, 0x5019, 0x5142,</div><div class='add'>+	0x526a, 0x5391, 0x54b7, 0x55dc, 0x5700, 0x5824, 0x5946, 0x5a68,</div><div class='add'>+	0x5b89, 0x5ca8, 0x5dc7, 0x5ee5, 0x6003, 0x611f, 0x623a, 0x6355,</div><div class='add'>+	0x646f, 0x6588, 0x66a0, 0x67b7, 0x68ce, 0x69e4, 0x6af8, 0x6c0c,</div><div class='add'>+	0x6d20, 0x6e32, 0x6f44, 0x7055, 0x7165, 0x7274, 0x7383, 0x7490,</div><div class='add'>+	0x759d, 0x76aa, 0x77b5, 0x78c0, 0x79ca, 0x7ad3, 0x7bdb, 0x7ce3,</div><div class='add'>+	0x7dea, 0x7ef0, 0x7ff6, 0x80fb, 0x81ff, 0x8302, 0x8405, 0x8507,</div><div class='add'>+	0x8608, 0x8709, 0x8809, 0x8908, 0x8a06, 0x8b04, 0x8c01, 0x8cfe,</div><div class='add'>+	0x8dfa, 0x8ef5, 0x8fef, 0x90e9, 0x91e2, 0x92db, 0x93d2, 0x94ca,</div><div class='add'>+	0x95c0, 0x96b6, 0x97ab, 0x98a0, 0x9994, 0x9a87, 0x9b7a, 0x9c6c,</div><div class='add'>+	0x9d5e, 0x9e4f, 0x9f3f, 0xa02e, 0xa11e, 0xa20c, 0xa2fa, 0xa3e7,</div><div class='add'>+	0xa4d4, 0xa5c0, 0xa6ab, 0xa796, 0xa881, 0xa96a, 0xaa53, 0xab3c,</div><div class='add'>+	0xac24, 0xad0c, 0xadf2, 0xaed9, 0xafbe, 0xb0a4, 0xb188, 0xb26c,</div><div class='add'>+	0xb350, 0xb433, 0xb515, 0xb5f7, 0xb6d9, 0xb7ba, 0xb89a, 0xb97a,</div><div class='add'>+	0xba59, 0xbb38, 0xbc16, 0xbcf4, 0xbdd1, 0xbead, 0xbf8a, 0xc065,</div><div class='add'>+	0xc140, 0xc21b, 0xc2f5, 0xc3cf, 0xc4a8, 0xc580, 0xc658, 0xc730,</div><div class='add'>+	0xc807, 0xc8de, 0xc9b4, 0xca8a, 0xcb5f, 0xcc34, 0xcd08, 0xcddc,</div><div class='add'>+	0xceaf, 0xcf82, 0xd054, 0xd126, 0xd1f7, 0xd2c8, 0xd399, 0xd469,</div><div class='add'>+	0xd538, 0xd607, 0xd6d6, 0xd7a4, 0xd872, 0xd93f, 0xda0c, 0xdad9,</div><div class='add'>+	0xdba5, 0xdc70, 0xdd3b, 0xde06, 0xded0, 0xdf9a, 0xe063, 0xe12c,</div><div class='add'>+	0xe1f5, 0xe2bd, 0xe385, 0xe44c, 0xe513, 0xe5d9, 0xe69f, 0xe765,</div><div class='add'>+	0xe82a, 0xe8ef, 0xe9b3, 0xea77, 0xeb3b, 0xebfe, 0xecc1, 0xed83,</div><div class='add'>+	0xee45, 0xef06, 0xefc8, 0xf088, 0xf149, 0xf209, 0xf2c8, 0xf387,</div><div class='add'>+	0xf446, 0xf505, 0xf5c3, 0xf680, 0xf73e, 0xf7fb, 0xf8b7, 0xf973,</div><div class='add'>+	0xfa2f, 0xfaea, 0xfba5, 0xfc60, 0xfd1a, 0xfdd4, 0xfe8e, 0xff47</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+unsigned int intlog2(u32 value)</div><div class='add'>+{</div><div class='add'>+	/**</div><div class='add'>+	 *	returns: log2(value) * 2^24</div><div class='add'>+	 *	wrong result if value = 0 (log2(0) is undefined)</div><div class='add'>+	 */</div><div class='add'>+	unsigned int msb;</div><div class='add'>+	unsigned int logentry;</div><div class='add'>+	unsigned int significand;</div><div class='add'>+	unsigned int interpolation;</div><div class='add'>+</div><div class='add'>+	if (unlikely(value == 0)) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* first detect the msb (count begins at 0) */</div><div class='add'>+	msb = fls(value) - 1;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 *	now we use a logtable after the following method:</div><div class='add'>+	 *</div><div class='add'>+	 *	log2(2^x * y) * 2^24 = x * 2^24 + log2(y) * 2^24</div><div class='add'>+	 *	where x = msb and therefore 1 &lt;= y &lt; 2</div><div class='add'>+	 *	first y is determined by shifting the value left</div><div class='add'>+	 *	so that msb is bit 31</div><div class='add'>+	 *		0x00231f56 -&gt; 0x8C7D5800</div><div class='add'>+	 *	the result is y * 2^31 -&gt; "significand"</div><div class='add'>+	 *	then the highest 9 bits are used for a table lookup</div><div class='add'>+	 *	the highest bit is discarded because it's always set</div><div class='add'>+	 *	the highest nine bits in our example are 100011000</div><div class='add'>+	 *	so we would use the entry 0x18</div><div class='add'>+	 */</div><div class='add'>+	significand = value &lt;&lt; (31 - msb);</div><div class='add'>+	logentry = (significand &gt;&gt; 23) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 *	last step we do is interpolation because of the</div><div class='add'>+	 *	limitations of the log table the error is that part of</div><div class='add'>+	 *	the significand which isn't used for lookup then we</div><div class='add'>+	 *	compute the ratio between the error and the next table entry</div><div class='add'>+	 *	and interpolate it between the log table entry used and the</div><div class='add'>+	 *	next one the biggest error possible is 0x7fffff</div><div class='add'>+	 *	(in our example it's 0x7D5800)</div><div class='add'>+	 *	needed value for next table entry is 0x800000</div><div class='add'>+	 *	so the interpolation is</div><div class='add'>+	 *	(error / 0x800000) * (logtable_next - logtable_current)</div><div class='add'>+	 *	in the implementation the division is moved to the end for</div><div class='add'>+	 *	better accuracy there is also an overflow correction if</div><div class='add'>+	 *	logtable_next is 256</div><div class='add'>+	 */</div><div class='add'>+	interpolation = ((significand &amp; 0x7fffff) *</div><div class='add'>+			((logtable[(logentry + 1) &amp; 0xff] -</div><div class='add'>+			  logtable[logentry]) &amp; 0xffff)) &gt;&gt; 15;</div><div class='add'>+</div><div class='add'>+	/* now we return the result */</div><div class='add'>+	return ((msb &lt;&lt; 24) + (logtable[logentry] &lt;&lt; 8) + interpolation);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intlog2);</div><div class='add'>+</div><div class='add'>+unsigned int intlog10(u32 value)</div><div class='add'>+{</div><div class='add'>+	/**</div><div class='add'>+	 *	returns: log10(value) * 2^24</div><div class='add'>+	 *	wrong result if value = 0 (log10(0) is undefined)</div><div class='add'>+	 */</div><div class='add'>+	u64 log;</div><div class='add'>+</div><div class='add'>+	if (unlikely(value == 0)) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	log = intlog2(value);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 *	we use the following method:</div><div class='add'>+	 *	log10(x) = log2(x) * log10(2)</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return (log * 646456993) &gt;&gt; 31;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intlog10);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_math.h b/drivers/media/dvb/dvb-core/dvb_math.h<br/>new file mode 100644<br/>index 000000000000..aecc867e9404<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_math.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_math.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/*</div><div class='add'>+ * dvb-math provides some complex fixed-point math</div><div class='add'>+ * operations shared between the dvb related stuff</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Christoph Pfister (christophpfister@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * This library is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU Lesser General Public License as</div><div class='add'>+ * published by the Free Software Foundation; either version 2.1 of</div><div class='add'>+ * the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='add'>+ * GNU Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU Lesser General Public</div><div class='add'>+ * License along with this library; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __DVB_MATH_H</div><div class='add'>+#define __DVB_MATH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * computes log2 of a value; the result is shifted left by 24 bits</div><div class='add'>+ *</div><div class='add'>+ * to use rational values you can use the following method:</div><div class='add'>+ *   intlog2(value) = intlog2(value * 2^x) - x * 2^24</div><div class='add'>+ *</div><div class='add'>+ * example: intlog2(8) will give 3 &lt;&lt; 24 = 3 * 2^24</div><div class='add'>+ * example: intlog2(9) will give 3 &lt;&lt; 24 + ... = 3.16... * 2^24</div><div class='add'>+ * example: intlog2(1.5) = intlog2(3) - 2^24 = 0.584... * 2^24</div><div class='add'>+ *</div><div class='add'>+ * @param value The value (must be != 0)</div><div class='add'>+ * @return log2(value) * 2^24</div><div class='add'>+ */</div><div class='add'>+extern unsigned int intlog2(u32 value);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * computes log10 of a value; the result is shifted left by 24 bits</div><div class='add'>+ *</div><div class='add'>+ * to use rational values you can use the following method:</div><div class='add'>+ *   intlog10(value) = intlog10(value * 10^x) - x * 2^24</div><div class='add'>+ *</div><div class='add'>+ * example: intlog10(1000) will give 3 &lt;&lt; 24 = 3 * 2^24</div><div class='add'>+ *   due to the implementation intlog10(1000) might be not exactly 3 * 2^24</div><div class='add'>+ *</div><div class='add'>+ * look at intlog2 for similar examples</div><div class='add'>+ *</div><div class='add'>+ * @param value The value (must be != 0)</div><div class='add'>+ * @return log10(value) * 2^24</div><div class='add'>+ */</div><div class='add'>+extern unsigned int intlog10(u32 value);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c<br/>index 2f0f35811bf7..8859ab74f0fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_net.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvb_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvb_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvb_net.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  *                          Hilmar Linder &lt;hlinder@cosy.sbg.ac.at&gt;</div><div class='ctx'>  *                      and Wolfram Stering &lt;wstering@cosy.sbg.ac.at&gt;</div><div class='ctx'>  *</div><div class='del'>- * ULE Decaps according to draft-ietf-ipdvb-ule-03.txt.</div><div class='add'>+ * ULE Decaps according to RFC 4326.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='hunk'>@@ -42,6 +42,9 @@</div><div class='ctx'>  *                     Bugfixes and robustness improvements.</div><div class='ctx'>  *                     Filtering on dest MAC addresses, if present (D-Bit = 0)</div><div class='ctx'>  *                     ULE_DEBUG compile-time option.</div><div class='add'>+ * Apr 2006: cp v3:    Bugfixes and compliency with RFC 4326 (ULE) by</div><div class='add'>+ *                       Christian Praehauser &lt;cpraehaus@cosy.sbg.ac.at&gt;,</div><div class='add'>+ *                       Paris Lodron University of Salzburg.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -49,9 +52,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Unloading does not work for 2.6.9 kernels: a refcount doesn't go to zero.</div><div class='ctx'>  *</div><div class='del'>- * TS_FEED callback is called once for every single TS cell although it is</div><div class='del'>- * registered (in dvb_net_feed_start()) for 100 TS cells (used for dvb_net_ule()).</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -89,6 +89,9 @@ static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )</div><div class='ctx'> </div><div class='ctx'> #ifdef ULE_DEBUG</div><div class='ctx'> </div><div class='add'>+#define MAC_ADDR_PRINTFMT "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x"</div><div class='add'>+#define MAX_ADDR_PRINTFMT_ARGS(macap) (macap)[0],(macap)[1],(macap)[2],(macap)[3],(macap)[4],(macap)[5]</div><div class='add'>+</div><div class='ctx'> #define isprint(c)	((c &gt;= 'a' &amp;&amp; c &lt;= 'z') || (c &gt;= 'A' &amp;&amp; c &lt;= 'Z') || (c &gt;= '0' &amp;&amp; c &lt;= '9'))</div><div class='ctx'> </div><div class='ctx'> static void hexdump( const unsigned char *buf, unsigned short len )</div><div class='hunk'>@@ -214,6 +217,8 @@ static unsigned short dvb_net_eth_type_trans(struct sk_buff *skb,</div><div class='ctx'> #define ULE_TEST	0</div><div class='ctx'> #define ULE_BRIDGED	1</div><div class='ctx'> </div><div class='add'>+#define ULE_OPTEXTHDR_PADDING 0</div><div class='add'>+</div><div class='ctx'> static int ule_test_sndu( struct dvb_net_priv *p )</div><div class='ctx'> {</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -221,14 +226,28 @@ static int ule_test_sndu( struct dvb_net_priv *p )</div><div class='ctx'> </div><div class='ctx'> static int ule_bridged_sndu( struct dvb_net_priv *p )</div><div class='ctx'> {</div><div class='del'>-	/* BRIDGE SNDU handling sucks in draft-ietf-ipdvb-ule-03.txt.</div><div class='del'>-	 * This has to be the last extension header, otherwise it won't work.</div><div class='del'>-	 * Blame the authors!</div><div class='add'>+	struct ethhdr *hdr = (struct ethhdr*) p-&gt;ule_next_hdr;</div><div class='add'>+	if(ntohs(hdr-&gt;h_proto) &lt; 1536) {</div><div class='add'>+		int framelen = p-&gt;ule_sndu_len - ((p-&gt;ule_next_hdr+sizeof(struct ethhdr)) - p-&gt;ule_skb-&gt;data);</div><div class='add'>+		/* A frame Type &lt; 1536 for a bridged frame, introduces a LLC Length field. */</div><div class='add'>+		if(framelen != ntohs(hdr-&gt;h_proto)) {</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Note:</div><div class='add'>+	 * From RFC4326:</div><div class='add'>+	 *  "A bridged SNDU is a Mandatory Extension Header of Type 1.</div><div class='add'>+	 *   It must be the final (or only) extension header specified in the header chain of a SNDU."</div><div class='add'>+	 * The 'ule_bridged' flag will cause the extension header processing loop to terminate.</div><div class='ctx'> 	 */</div><div class='ctx'> 	p-&gt;ule_bridged = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ule_exthdr_padding(struct dvb_net_priv *p)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /** Handle ULE extension headers.</div><div class='ctx'>  *  Function is called after a successful CRC32 verification of an ULE SNDU to complete its decoding.</div><div class='hunk'>@@ -242,7 +261,8 @@ static int handle_one_ule_extension( struct dvb_net_priv *p )</div><div class='ctx'> 		{ [0] = ule_test_sndu, [1] = ule_bridged_sndu, [2] = NULL,  };</div><div class='ctx'> </div><div class='ctx'> 	/* Table of optional extension header handlers.  The header type is the index. */</div><div class='del'>-	static int (*ule_optional_ext_handlers[255])( struct dvb_net_priv *p ) = { NULL, };</div><div class='add'>+	static int (*ule_optional_ext_handlers[255])( struct dvb_net_priv *p ) =</div><div class='add'>+		{ [0] = ule_exthdr_padding, [1] = NULL, };</div><div class='ctx'> </div><div class='ctx'> 	int ext_len = 0;</div><div class='ctx'> 	unsigned char hlen = (p-&gt;ule_sndu_type &amp; 0x0700) &gt;&gt; 8;</div><div class='hunk'>@@ -253,25 +273,31 @@ static int handle_one_ule_extension( struct dvb_net_priv *p )</div><div class='ctx'> 		/* Mandatory extension header */</div><div class='ctx'> 		if (ule_mandatory_ext_handlers[htype]) {</div><div class='ctx'> 			ext_len = ule_mandatory_ext_handlers[htype]( p );</div><div class='del'>-			p-&gt;ule_next_hdr += ext_len;</div><div class='del'>-			if (! p-&gt;ule_bridged) {</div><div class='del'>-				p-&gt;ule_sndu_type = ntohs( *(unsigned short *)p-&gt;ule_next_hdr );</div><div class='del'>-				p-&gt;ule_next_hdr += 2;</div><div class='del'>-			} else {</div><div class='del'>-				p-&gt;ule_sndu_type = ntohs( *(unsigned short *)(p-&gt;ule_next_hdr + ((p-&gt;ule_dbit ? 2 : 3) * ETH_ALEN)) );</div><div class='del'>-				/* This assures the extension handling loop will terminate. */</div><div class='add'>+			if(ext_len &gt;= 0) {</div><div class='add'>+				p-&gt;ule_next_hdr += ext_len;</div><div class='add'>+				if (!p-&gt;ule_bridged) {</div><div class='add'>+					p-&gt;ule_sndu_type = ntohs(*(unsigned short *)p-&gt;ule_next_hdr);</div><div class='add'>+					p-&gt;ule_next_hdr += 2;</div><div class='add'>+				} else {</div><div class='add'>+					p-&gt;ule_sndu_type = ntohs(*(unsigned short *)(p-&gt;ule_next_hdr + ((p-&gt;ule_dbit ? 2 : 3) * ETH_ALEN)));</div><div class='add'>+					/* This assures the extension handling loop will terminate. */</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='add'>+			// else: extension handler failed or SNDU should be discarded</div><div class='ctx'> 		} else</div><div class='ctx'> 			ext_len = -1;	/* SNDU has to be discarded. */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Optional extension header.  Calculate the length. */</div><div class='del'>-		ext_len = hlen &lt;&lt; 2;</div><div class='add'>+		ext_len = hlen &lt;&lt; 1;</div><div class='ctx'> 		/* Process the optional extension header according to its type. */</div><div class='ctx'> 		if (ule_optional_ext_handlers[htype])</div><div class='ctx'> 			(void)ule_optional_ext_handlers[htype]( p );</div><div class='ctx'> 		p-&gt;ule_next_hdr += ext_len;</div><div class='del'>-		p-&gt;ule_sndu_type = ntohs( *(unsigned short *)p-&gt;ule_next_hdr );</div><div class='del'>-		p-&gt;ule_next_hdr += 2;</div><div class='add'>+		p-&gt;ule_sndu_type = ntohs( *(unsigned short *)(p-&gt;ule_next_hdr-2) );</div><div class='add'>+		/*</div><div class='add'>+		 * note: the length of the next header type is included in the</div><div class='add'>+		 * length of THIS optional extension header</div><div class='add'>+		 */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ext_len;</div><div class='hunk'>@@ -284,8 +310,14 @@ static int handle_ule_extensions( struct dvb_net_priv *p )</div><div class='ctx'> 	p-&gt;ule_next_hdr = p-&gt;ule_skb-&gt;data;</div><div class='ctx'> 	do {</div><div class='ctx'> 		l = handle_one_ule_extension( p );</div><div class='del'>-		if (l == -1) return -1;	/* Stop extension header processing and discard SNDU. */</div><div class='add'>+		if (l &lt; 0)</div><div class='add'>+			return l;	/* Stop extension header processing and discard SNDU. */</div><div class='ctx'> 		total_ext_len += l;</div><div class='add'>+#ifdef ULE_DEBUG</div><div class='add'>+		dprintk("handle_ule_extensions: ule_next_hdr=%p, ule_sndu_type=%i, "</div><div class='add'>+			"l=%i, total_ext_len=%i\n", p-&gt;ule_next_hdr,</div><div class='add'>+			(int) p-&gt;ule_sndu_type, l, total_ext_len);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	} while (p-&gt;ule_sndu_type &lt; 1536);</div><div class='ctx'> </div><div class='hunk'>@@ -355,8 +387,8 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 				if (priv-&gt;ule_skb) {</div><div class='ctx'> 					dev_kfree_skb( priv-&gt;ule_skb );</div><div class='ctx'> 					/* Prepare for next SNDU. */</div><div class='del'>-					((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_errors++;</div><div class='del'>-					((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_frame_errors++;</div><div class='add'>+					priv-&gt;stats.rx_errors++;</div><div class='add'>+					priv-&gt;stats.rx_frame_errors++;</div><div class='ctx'> 				}</div><div class='ctx'> 				reset_ule(priv);</div><div class='ctx'> 				priv-&gt;need_pusi = 1;</div><div class='hunk'>@@ -396,27 +428,25 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Check continuity counter. */</div><div class='ctx'> 		if (new_ts) {</div><div class='add'>+			/* Check continuity counter. */</div><div class='ctx'> 			if ((ts[3] &amp; 0x0F) == priv-&gt;tscc)</div><div class='ctx'> 				priv-&gt;tscc = (priv-&gt;tscc + 1) &amp; 0x0F;</div><div class='ctx'> 			else {</div><div class='ctx'> 				/* TS discontinuity handling: */</div><div class='ctx'> 				printk(KERN_WARNING "%lu: TS discontinuity: got %#x, "</div><div class='del'>-				       "exptected %#x.\n", priv-&gt;ts_count, ts[3] &amp; 0x0F, priv-&gt;tscc);</div><div class='add'>+				       "expected %#x.\n", priv-&gt;ts_count, ts[3] &amp; 0x0F, priv-&gt;tscc);</div><div class='ctx'> 				/* Drop partly decoded SNDU, reset state, resync on PUSI. */</div><div class='ctx'> 				if (priv-&gt;ule_skb) {</div><div class='ctx'> 					dev_kfree_skb( priv-&gt;ule_skb );</div><div class='ctx'> 					/* Prepare for next SNDU. */</div><div class='ctx'> 					// reset_ule(priv);  moved to below.</div><div class='del'>-					((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_errors++;</div><div class='del'>-					((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_frame_errors++;</div><div class='add'>+					priv-&gt;stats.rx_errors++;</div><div class='add'>+					priv-&gt;stats.rx_frame_errors++;</div><div class='ctx'> 				}</div><div class='ctx'> 				reset_ule(priv);</div><div class='ctx'> 				/* skip to next PUSI. */</div><div class='ctx'> 				priv-&gt;need_pusi = 1;</div><div class='del'>-				ts += TS_SZ;</div><div class='del'>-				priv-&gt;ts_count++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* If we still have an incomplete payload, but PUSI is</div><div class='hunk'>@@ -425,7 +455,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 			 * cells (continuity counter wrap). */</div><div class='ctx'> 			if (ts[1] &amp; TS_PUSI) {</div><div class='ctx'> 				if (! priv-&gt;need_pusi) {</div><div class='del'>-					if (*from_where &gt; 181) {</div><div class='add'>+					if (!(*from_where &lt; (ts_remain-1)) || *from_where != priv-&gt;ule_sndu_remain) {</div><div class='ctx'> 						/* Pointer field is invalid.  Drop this TS cell and any started ULE SNDU. */</div><div class='ctx'> 						printk(KERN_WARNING "%lu: Invalid pointer "</div><div class='ctx'> 						       "field: %u.\n", priv-&gt;ts_count, *from_where);</div><div class='hunk'>@@ -438,8 +468,6 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 						}</div><div class='ctx'> 						reset_ule(priv);</div><div class='ctx'> 						priv-&gt;need_pusi = 1;</div><div class='del'>-						ts += TS_SZ;</div><div class='del'>-						priv-&gt;ts_count++;</div><div class='ctx'> 						continue;</div><div class='ctx'> 					}</div><div class='ctx'> 					/* Skip pointer field (we're processing a</div><div class='hunk'>@@ -452,8 +480,8 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 				if (priv-&gt;ule_sndu_remain &gt; 183) {</div><div class='ctx'> 					/* Current SNDU lacks more data than there could be available in the</div><div class='ctx'> 					 * current TS cell. */</div><div class='del'>-					((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_errors++;</div><div class='del'>-					((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_length_errors++;</div><div class='add'>+					priv-&gt;stats.rx_errors++;</div><div class='add'>+					priv-&gt;stats.rx_length_errors++;</div><div class='ctx'> 					printk(KERN_WARNING "%lu: Expected %d more SNDU bytes, but "</div><div class='ctx'> 					       "got PUSI (pf %d, ts_remain %d).  Flushing incomplete payload.\n",</div><div class='ctx'> 					       priv-&gt;ts_count, priv-&gt;ule_sndu_remain, ts[4], ts_remain);</div><div class='hunk'>@@ -492,9 +520,11 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 				} else</div><div class='ctx'> 					priv-&gt;ule_dbit = 0;</div><div class='ctx'> </div><div class='del'>-				if (priv-&gt;ule_sndu_len &gt; 32763) {</div><div class='add'>+				if (priv-&gt;ule_sndu_len &lt; 5) {</div><div class='ctx'> 					printk(KERN_WARNING "%lu: Invalid ULE SNDU length %u. "</div><div class='ctx'> 					       "Resyncing.\n", priv-&gt;ts_count, priv-&gt;ule_sndu_len);</div><div class='add'>+					priv-&gt;stats.rx_errors++;</div><div class='add'>+					priv-&gt;stats.rx_length_errors++;</div><div class='ctx'> 					priv-&gt;ule_sndu_len = 0;</div><div class='ctx'> 					priv-&gt;need_pusi = 1;</div><div class='ctx'> 					new_ts = 1;</div><div class='hunk'>@@ -608,58 +638,103 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 				ule_dump = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-				((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_errors++;</div><div class='del'>-				((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_crc_errors++;</div><div class='add'>+				priv-&gt;stats.rx_errors++;</div><div class='add'>+				priv-&gt;stats.rx_crc_errors++;</div><div class='ctx'> 				dev_kfree_skb(priv-&gt;ule_skb);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* CRC32 verified OK. */</div><div class='add'>+				u8 dest_addr[ETH_ALEN];</div><div class='add'>+				static const u8 bc_addr[ETH_ALEN] =</div><div class='add'>+					{ [ 0 ... ETH_ALEN-1] = 0xff };</div><div class='add'>+</div><div class='add'>+				/* CRC32 was OK. Remove it from skb. */</div><div class='add'>+				priv-&gt;ule_skb-&gt;tail -= 4;</div><div class='add'>+				priv-&gt;ule_skb-&gt;len -= 4;</div><div class='add'>+</div><div class='add'>+				if (!priv-&gt;ule_dbit) {</div><div class='add'>+					/*</div><div class='add'>+					 * The destination MAC address is the</div><div class='add'>+					 * next data in the skb.  It comes</div><div class='add'>+					 * before any extension headers.</div><div class='add'>+					 *</div><div class='add'>+					 * Check if the payload of this SNDU</div><div class='add'>+					 * should be passed up the stack.</div><div class='add'>+					 */</div><div class='add'>+					register int drop = 0;</div><div class='add'>+					if (priv-&gt;rx_mode != RX_MODE_PROMISC) {</div><div class='add'>+						if (priv-&gt;ule_skb-&gt;data[0] &amp; 0x01) {</div><div class='add'>+							/* multicast or broadcast */</div><div class='add'>+							if (memcmp(priv-&gt;ule_skb-&gt;data, bc_addr, ETH_ALEN)) {</div><div class='add'>+								/* multicast */</div><div class='add'>+								if (priv-&gt;rx_mode == RX_MODE_MULTI) {</div><div class='add'>+									int i;</div><div class='add'>+									for(i = 0; i &lt; priv-&gt;multi_num &amp;&amp; memcmp(priv-&gt;ule_skb-&gt;data, priv-&gt;multi_macs[i], ETH_ALEN); i++)</div><div class='add'>+										;</div><div class='add'>+									if (i == priv-&gt;multi_num)</div><div class='add'>+										drop = 1;</div><div class='add'>+								} else if (priv-&gt;rx_mode != RX_MODE_ALL_MULTI)</div><div class='add'>+									drop = 1; /* no broadcast; */</div><div class='add'>+								/* else: all multicast mode: accept all multicast packets */</div><div class='add'>+							}</div><div class='add'>+							/* else: broadcast */</div><div class='add'>+						}</div><div class='add'>+						else if (memcmp(priv-&gt;ule_skb-&gt;data, dev-&gt;dev_addr, ETH_ALEN))</div><div class='add'>+							drop = 1;</div><div class='add'>+						/* else: destination address matches the MAC address of our receiver device */</div><div class='add'>+					}</div><div class='add'>+					/* else: promiscious mode; pass everything up the stack */</div><div class='add'>+</div><div class='add'>+					if (drop) {</div><div class='add'>+#ifdef ULE_DEBUG</div><div class='add'>+						dprintk("Dropping SNDU: MAC destination address does not match: dest addr: "MAC_ADDR_PRINTFMT", dev addr: "MAC_ADDR_PRINTFMT"\n",</div><div class='add'>+							MAX_ADDR_PRINTFMT_ARGS(priv-&gt;ule_skb-&gt;data), MAX_ADDR_PRINTFMT_ARGS(dev-&gt;dev_addr));</div><div class='add'>+#endif</div><div class='add'>+						dev_kfree_skb(priv-&gt;ule_skb);</div><div class='add'>+						goto sndu_done;</div><div class='add'>+					}</div><div class='add'>+					else</div><div class='add'>+					{</div><div class='add'>+						memcpy(dest_addr,  priv-&gt;ule_skb-&gt;data, ETH_ALEN);</div><div class='add'>+						skb_pull(priv-&gt;ule_skb, ETH_ALEN);</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='ctx'> 				/* Handle ULE Extension Headers. */</div><div class='ctx'> 				if (priv-&gt;ule_sndu_type &lt; 1536) {</div><div class='ctx'> 					/* There is an extension header.  Handle it accordingly. */</div><div class='del'>-					int l = handle_ule_extensions( priv );</div><div class='add'>+					int l = handle_ule_extensions(priv);</div><div class='ctx'> 					if (l &lt; 0) {</div><div class='ctx'> 						/* Mandatory extension header unknown or TEST SNDU.  Drop it. */</div><div class='ctx'> 						// printk( KERN_WARNING "Dropping SNDU, extension headers.\n" );</div><div class='del'>-						dev_kfree_skb( priv-&gt;ule_skb );</div><div class='add'>+						dev_kfree_skb(priv-&gt;ule_skb);</div><div class='ctx'> 						goto sndu_done;</div><div class='ctx'> 					}</div><div class='del'>-					skb_pull( priv-&gt;ule_skb, l );</div><div class='add'>+					skb_pull(priv-&gt;ule_skb, l);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				/* CRC32 was OK. Remove it from skb. */</div><div class='del'>-				priv-&gt;ule_skb-&gt;tail -= 4;</div><div class='del'>-				priv-&gt;ule_skb-&gt;len -= 4;</div><div class='del'>-</div><div class='del'>-				/* Filter on receiver's destination MAC address, if present. */</div><div class='del'>-				if (!priv-&gt;ule_dbit) {</div><div class='del'>-					/* The destination MAC address is the next data in the skb. */</div><div class='del'>-					if (memcmp( priv-&gt;ule_skb-&gt;data, dev-&gt;dev_addr, ETH_ALEN )) {</div><div class='del'>-						/* MAC addresses don't match.  Drop SNDU. */</div><div class='del'>-						// printk( KERN_WARNING "Dropping SNDU, MAC address.\n" );</div><div class='del'>-						dev_kfree_skb( priv-&gt;ule_skb );</div><div class='del'>-						goto sndu_done;</div><div class='del'>-					}</div><div class='del'>-					if (! priv-&gt;ule_bridged) {</div><div class='del'>-						skb_push( priv-&gt;ule_skb, ETH_ALEN + 2 );</div><div class='del'>-						ethh = (struct ethhdr *)priv-&gt;ule_skb-&gt;data;</div><div class='del'>-						memcpy( ethh-&gt;h_dest, ethh-&gt;h_source, ETH_ALEN );</div><div class='del'>-						memset( ethh-&gt;h_source, 0, ETH_ALEN );</div><div class='del'>-						ethh-&gt;h_proto = htons( priv-&gt;ule_sndu_type );</div><div class='del'>-					} else {</div><div class='del'>-						/* Skip the Receiver destination MAC address. */</div><div class='del'>-						skb_pull( priv-&gt;ule_skb, ETH_ALEN );</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (! priv-&gt;ule_bridged) {</div><div class='del'>-						skb_push( priv-&gt;ule_skb, ETH_HLEN );</div><div class='del'>-						ethh = (struct ethhdr *)priv-&gt;ule_skb-&gt;data;</div><div class='del'>-						memcpy( ethh-&gt;h_dest, dev-&gt;dev_addr, ETH_ALEN );</div><div class='del'>-						memset( ethh-&gt;h_source, 0, ETH_ALEN );</div><div class='del'>-						ethh-&gt;h_proto = htons( priv-&gt;ule_sndu_type );</div><div class='del'>-					} else {</div><div class='del'>-						/* skb is in correct state; nothing to do. */</div><div class='add'>+				/*</div><div class='add'>+				 * Construct/assure correct ethernet header.</div><div class='add'>+				 * Note: in bridged mode (priv-&gt;ule_bridged !=</div><div class='add'>+				 * 0) we already have the (original) ethernet</div><div class='add'>+				 * header at the start of the payload (after</div><div class='add'>+				 * optional dest. address and any extension</div><div class='add'>+				 * headers).</div><div class='add'>+				 */</div><div class='add'>+</div><div class='add'>+				if (!priv-&gt;ule_bridged) {</div><div class='add'>+					skb_push(priv-&gt;ule_skb, ETH_HLEN);</div><div class='add'>+					ethh = (struct ethhdr *)priv-&gt;ule_skb-&gt;data;</div><div class='add'>+					if (!priv-&gt;ule_dbit) {</div><div class='add'>+						 /* dest_addr buffer is only valid if priv-&gt;ule_dbit == 0 */</div><div class='add'>+						memcpy(ethh-&gt;h_dest, dest_addr, ETH_ALEN);</div><div class='add'>+						memset(ethh-&gt;h_source, 0, ETH_ALEN);</div><div class='ctx'> 					}</div><div class='add'>+					else /* zeroize source and dest */</div><div class='add'>+						memset( ethh, 0, ETH_ALEN*2 );</div><div class='add'>+</div><div class='add'>+					ethh-&gt;h_proto = htons(priv-&gt;ule_sndu_type);</div><div class='ctx'> 				}</div><div class='add'>+				/* else:  skb is in correct state; nothing to do. */</div><div class='ctx'> 				priv-&gt;ule_bridged = 0;</div><div class='ctx'> </div><div class='ctx'> 				/* Stuff into kernel's protocol stack. */</div><div class='hunk'>@@ -668,8 +743,8 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )</div><div class='ctx'> 				 * receive the packet anyhow. */</div><div class='ctx'> 				/* if (priv-&gt;ule_dbit &amp;&amp; skb-&gt;pkt_type == PACKET_OTHERHOST)</div><div class='ctx'> 					priv-&gt;ule_skb-&gt;pkt_type = PACKET_HOST; */</div><div class='del'>-				((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_packets++;</div><div class='del'>-				((struct dvb_net_priv *) dev-&gt;priv)-&gt;stats.rx_bytes += priv-&gt;ule_skb-&gt;len;</div><div class='add'>+				priv-&gt;stats.rx_packets++;</div><div class='add'>+				priv-&gt;stats.rx_bytes += priv-&gt;ule_skb-&gt;len;</div><div class='ctx'> 				netif_rx(priv-&gt;ule_skb);</div><div class='ctx'> 			}</div><div class='ctx'> 			sndu_done:</div><div class='hunk'>@@ -944,7 +1019,7 @@ static int dvb_net_feed_start(struct net_device *dev)</div><div class='ctx'> 		dprintk("%s: start filtering\n", __FUNCTION__);</div><div class='ctx'> 		priv-&gt;secfeed-&gt;start_filtering(priv-&gt;secfeed);</div><div class='ctx'> 	} else if (priv-&gt;feedtype == DVB_NET_FEEDTYPE_ULE) {</div><div class='del'>-		struct timespec timeout = { 0, 30000000 }; // 30 msec</div><div class='add'>+		struct timespec timeout = { 0, 10000000 }; // 10 msec</div><div class='ctx'> </div><div class='ctx'> 		/* we have payloads encapsulated in TS */</div><div class='ctx'> 		dprintk("%s: alloc tsfeed\n", __FUNCTION__);</div><div class='hunk'>@@ -956,10 +1031,13 @@ static int dvb_net_feed_start(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Set netdevice pointer for ts decaps callback. */</div><div class='ctx'> 		priv-&gt;tsfeed-&gt;priv = (void *)dev;</div><div class='del'>-		ret = priv-&gt;tsfeed-&gt;set(priv-&gt;tsfeed, priv-&gt;pid,</div><div class='del'>-					TS_PACKET, DMX_TS_PES_OTHER,</div><div class='add'>+		ret = priv-&gt;tsfeed-&gt;set(priv-&gt;tsfeed,</div><div class='add'>+					priv-&gt;pid, /* pid */</div><div class='add'>+					TS_PACKET, /* type */</div><div class='add'>+					DMX_TS_PES_OTHER, /* pes type */</div><div class='ctx'> 					32768,     /* circular buffer size */</div><div class='del'>-					timeout);</div><div class='add'>+					timeout    /* timeout */</div><div class='add'>+					);</div><div class='ctx'> </div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			printk("%s: could not set ts feed\n", dev-&gt;name);</div><div class='hunk'>@@ -1052,7 +1130,7 @@ static void wq_set_multicast_list (void *data)</div><div class='ctx'> </div><div class='ctx'> 	dvb_net_feed_stop(dev);</div><div class='ctx'> 	priv-&gt;rx_mode = RX_MODE_UNI;</div><div class='del'>-	spin_lock_bh(&amp;dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		dprintk("%s: promiscuous mode\n", dev-&gt;name);</div><div class='hunk'>@@ -1077,7 +1155,7 @@ static void wq_set_multicast_list (void *data)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_bh(&amp;dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> 	dvb_net_feed_start(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c<br/>index 3852430d0260..40774feb8953 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvbdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvbdev.c</a></div><div class='hunk'>@@ -231,12 +231,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dvbdev_register_lock);</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap-&gt;num, type, id)),</div><div class='del'>-			S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-			"dvb/adapter%d/%s%d", adap-&gt;num, dnames[type], id);</div><div class='del'>-</div><div class='ctx'> 	class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap-&gt;num, type, id)),</div><div class='del'>-			    NULL, "dvb%d.%s%d", adap-&gt;num, dnames[type], id);</div><div class='add'>+			    adap-&gt;device, "dvb%d.%s%d", adap-&gt;num, dnames[type], id);</div><div class='ctx'> </div><div class='ctx'> 	dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",</div><div class='ctx'> 		adap-&gt;num, dnames[type], id, nums2minor(adap-&gt;num, type, id),</div><div class='hunk'>@@ -252,9 +248,6 @@ void dvb_unregister_device(struct dvb_device *dvbdev)</div><div class='ctx'> 	if (!dvbdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	devfs_remove("dvb/adapter%d/%s%d", dvbdev-&gt;adapter-&gt;num,</div><div class='del'>-			dnames[dvbdev-&gt;type], dvbdev-&gt;id);</div><div class='del'>-</div><div class='ctx'> 	class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev-&gt;adapter-&gt;num,</div><div class='ctx'> 					dvbdev-&gt;type, dvbdev-&gt;id)));</div><div class='ctx'> </div><div class='hunk'>@@ -285,7 +278,7 @@ skip:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module)</div><div class='add'>+int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module, struct device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int num;</div><div class='ctx'> </div><div class='hunk'>@@ -302,10 +295,10 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu</div><div class='ctx'> </div><div class='ctx'> 	printk ("DVB: registering new adapter (%s).\n", name);</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("dvb/adapter%d", num);</div><div class='ctx'> 	adap-&gt;num = num;</div><div class='ctx'> 	adap-&gt;name = name;</div><div class='ctx'> 	adap-&gt;module = module;</div><div class='add'>+	adap-&gt;device = device;</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail (&amp;adap-&gt;list_head, &amp;dvb_adapter_list);</div><div class='ctx'> </div><div class='hunk'>@@ -318,8 +311,6 @@ EXPORT_SYMBOL(dvb_register_adapter);</div><div class='ctx'> </div><div class='ctx'> int dvb_unregister_adapter(struct dvb_adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove("dvb/adapter%d", adap-&gt;num);</div><div class='del'>-</div><div class='ctx'> 	if (mutex_lock_interruptible(&amp;dvbdev_register_lock))</div><div class='ctx'> 		return -ERESTARTSYS;</div><div class='ctx'> 	list_del (&amp;adap-&gt;list_head);</div><div class='hunk'>@@ -409,8 +400,6 @@ static int __init init_dvbdev(void)</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("dvb");</div><div class='del'>-</div><div class='ctx'> 	dvb_class = class_create(THIS_MODULE, "dvb");</div><div class='ctx'> 	if (IS_ERR(dvb_class)) {</div><div class='ctx'> 		retval = PTR_ERR(dvb_class);</div><div class='hunk'>@@ -427,7 +416,6 @@ error:</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_dvbdev(void)</div><div class='ctx'> {</div><div class='del'>-	devfs_remove("dvb");</div><div class='ctx'> 	class_destroy(dvb_class);</div><div class='ctx'> 	cdev_del(&amp;dvb_device_cdev);</div><div class='ctx'> 	unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h<br/>index 74ed5853f0fb..7a7f75fd168c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-core/dvbdev.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-core/dvbdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-core/dvbdev.h</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DVB_MAJOR 212</div><div class='hunk'>@@ -51,6 +50,8 @@ struct dvb_adapter {</div><div class='ctx'> 	u8 proposed_mac [6];</div><div class='ctx'> 	void* priv;</div><div class='ctx'> </div><div class='add'>+	struct device *device;</div><div class='add'>+</div><div class='ctx'> 	struct module *module;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +77,7 @@ struct dvb_device {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module);</div><div class='add'>+extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module, struct device *device);</div><div class='ctx'> extern int dvb_unregister_adapter (struct dvb_adapter *adap);</div><div class='ctx'> </div><div class='ctx'> extern int dvb_register_device (struct dvb_adapter *adap,</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig<br/>index e388fb1567d6..3bc6722a6443 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/Kconfig</a></div><div class='hunk'>@@ -88,6 +88,7 @@ config DVB_USB_CXUSB</div><div class='ctx'> 	select DVB_CX22702</div><div class='ctx'> 	select DVB_LGDT330X</div><div class='ctx'> 	select DVB_MT352</div><div class='add'>+	select DVB_ZL10353</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to support the Conexant USB2.0 hybrid reference design.</div><div class='ctx'> 	  Currently, only DVB and ATSC modes are supported, analog mode</div><div class='hunk'>@@ -130,6 +131,15 @@ config DVB_USB_VP702X</div><div class='ctx'> </div><div class='ctx'> 	  DVB-S USB2.0 receivers.</div><div class='ctx'> </div><div class='add'>+config DVB_USB_GP8PSK</div><div class='add'>+	tristate "GENPIX 8PSK-&gt;USB module support"</div><div class='add'>+	depends on DVB_USB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to support the</div><div class='add'>+	    GENPIX 8psk module</div><div class='add'>+</div><div class='add'>+	  DVB-S USB2.0 receivers.</div><div class='add'>+</div><div class='ctx'> config DVB_USB_NOVA_T_USB2</div><div class='ctx'> 	tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"</div><div class='ctx'> 	depends on DVB_USB</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile<br/>index 2dc9aad9681e..9643f56c7fe9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/Makefile</a></div><div class='hunk'>@@ -7,6 +7,9 @@ obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o</div><div class='ctx'> dvb-usb-vp702x-objs = vp702x.o vp702x-fe.o</div><div class='ctx'> obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o</div><div class='ctx'> </div><div class='add'>+dvb-usb-gp8psk-objs = gp8psk.o gp8psk-fe.o</div><div class='add'>+obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o</div><div class='add'>+</div><div class='ctx'> dvb-usb-dtt200u-objs = dtt200u.o dtt200u-fe.o</div><div class='ctx'> obj-$(CONFIG_DVB_USB_DTT200U) += dvb-usb-dtt200u.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c<br/>index 1f0d3e995c8d..ae23bdde42a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/cxusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/cxusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/cxusb.c</a></div><div class='hunk'>@@ -27,8 +27,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "cx22702.h"</div><div class='ctx'> #include "lgdt330x.h"</div><div class='add'>+#include "lg_h06xf.h"</div><div class='ctx'> #include "mt352.h"</div><div class='ctx'> #include "mt352_priv.h"</div><div class='add'>+#include "zl10353.h"</div><div class='ctx'> </div><div class='ctx'> /* debug */</div><div class='ctx'> int dvb_usb_cxusb_debug;</div><div class='hunk'>@@ -322,32 +324,37 @@ static int cxusb_mt352_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxusb_lgh064f_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+					  struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	struct dvb_usb_device *d = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	return lg_h06xf_pll_set(fe, &amp;d-&gt;i2c_adap, fep);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct cx22702_config cxusb_cx22702_config = {</div><div class='ctx'> 	.demod_address = 0x63,</div><div class='ctx'> </div><div class='ctx'> 	.output_mode = CX22702_PARALLEL_OUTPUT,</div><div class='del'>-</div><div class='del'>-	.pll_init = dvb_usb_pll_init_i2c,</div><div class='del'>-	.pll_set  = dvb_usb_pll_set_i2c,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct lgdt330x_config cxusb_lgdt3303_config = {</div><div class='ctx'> 	.demod_address = 0x0e,</div><div class='ctx'> 	.demod_chip    = LGDT3303,</div><div class='del'>-	.pll_set       = dvb_usb_pll_set_i2c,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config cxusb_dee1601_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.demod_init    = cxusb_dee1601_demod_init,</div><div class='del'>-	.pll_set       = dvb_usb_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mt352_config cxusb_mt352_config = {</div><div class='add'>+static struct zl10353_config cxusb_zl10353_dee1601_config = {</div><div class='add'>+	.demod_address = 0x0f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mt352_config cxusb_mt352_config = {</div><div class='ctx'> 	/* used in both lgz201 and th7579 */</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.demod_init    = cxusb_mt352_demod_init,</div><div class='del'>-	.pll_set       = dvb_usb_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Callbacks for DVB USB */</div><div class='hunk'>@@ -357,17 +364,10 @@ static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_device *d)</div><div class='ctx'> 	d-&gt;pll_addr = 0x61;</div><div class='ctx'> 	memcpy(d-&gt;pll_init, bpll, 4);</div><div class='ctx'> 	d-&gt;pll_desc = &amp;dvb_pll_fmd1216me;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int cxusb_lgh064f_tuner_attach(struct dvb_usb_device *d)</div><div class='del'>-{</div><div class='del'>-	u8 bpll[4] = { 0x00, 0x00, 0x18, 0x50 };</div><div class='del'>-	/* bpll[2] : unset bit 3, set bits 4&amp;5</div><div class='del'>-	   bpll[3] : 0x50 - digital, 0x20 - analog */</div><div class='del'>-	d-&gt;pll_addr = 0x61;</div><div class='del'>-	memcpy(d-&gt;pll_init, bpll, 4);</div><div class='del'>-	d-&gt;pll_desc = &amp;dvb_pll_tdvs_tua6034;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.init = dvb_usb_tuner_init_i2c;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -375,6 +375,7 @@ static int cxusb_dee1601_tuner_attach(struct dvb_usb_device *d)</div><div class='ctx'> {</div><div class='ctx'> 	d-&gt;pll_addr = 0x61;</div><div class='ctx'> 	d-&gt;pll_desc = &amp;dvb_pll_thomson_dtt7579;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -382,6 +383,7 @@ static int cxusb_lgz201_tuner_attach(struct dvb_usb_device *d)</div><div class='ctx'> {</div><div class='ctx'> 	d-&gt;pll_addr = 0x61;</div><div class='ctx'> 	d-&gt;pll_desc = &amp;dvb_pll_lg_z201;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -389,6 +391,13 @@ static int cxusb_dtt7579_tuner_attach(struct dvb_usb_device *d)</div><div class='ctx'> {</div><div class='ctx'> 	d-&gt;pll_addr = 0x60;</div><div class='ctx'> 	d-&gt;pll_desc = &amp;dvb_pll_thomson_dtt7579;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxusb_lgdt3303_tuner_attach(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.set_params = cxusb_lgh064f_tuner_set_params;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +448,8 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)</div><div class='ctx'> </div><div class='ctx'> 	cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);</div><div class='ctx'> </div><div class='del'>-	if ((d-&gt;fe = mt352_attach(&amp;cxusb_dee1601_config, &amp;d-&gt;i2c_adap)) != NULL)</div><div class='add'>+	if (((d-&gt;fe = mt352_attach(&amp;cxusb_dee1601_config, &amp;d-&gt;i2c_adap)) != NULL) ||</div><div class='add'>+	    ((d-&gt;fe = zl10353_attach(&amp;cxusb_zl10353_dee1601_config, &amp;d-&gt;i2c_adap)) != NULL))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='hunk'>@@ -555,7 +565,7 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = {</div><div class='ctx'> 	.streaming_ctrl   = cxusb_streaming_ctrl,</div><div class='ctx'> 	.power_ctrl       = cxusb_bluebird_power_ctrl,</div><div class='ctx'> 	.frontend_attach  = cxusb_lgdt3303_frontend_attach,</div><div class='del'>-	.tuner_attach     = cxusb_lgh064f_tuner_attach,</div><div class='add'>+	.tuner_attach     = cxusb_lgdt3303_tuner_attach,</div><div class='ctx'> </div><div class='ctx'> 	.i2c_algo         = &amp;cxusb_i2c_algo,</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c<br/>index 2d52b76671d3..abd75b4a350d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dibusb-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dibusb-common.c</a></div><div class='hunk'>@@ -173,11 +173,10 @@ int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)</div><div class='ctx'> 	struct dib3000_config demod_cfg;</div><div class='ctx'> 	struct dibusb_state *st = d-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	demod_cfg.pll_set = dvb_usb_pll_set_i2c;</div><div class='del'>-	demod_cfg.pll_init = dvb_usb_pll_init_i2c;</div><div class='del'>-</div><div class='ctx'> 	for (demod_cfg.demod_address = 0x8; demod_cfg.demod_address &lt; 0xd; demod_cfg.demod_address++)</div><div class='ctx'> 		if ((d-&gt;fe = dib3000mc_attach(&amp;demod_cfg,&amp;d-&gt;i2c_adap,&amp;st-&gt;ops)) != NULL) {</div><div class='add'>+			d-&gt;fe-&gt;ops.tuner_ops.init = dvb_usb_tuner_init_i2c;</div><div class='add'>+			d-&gt;fe-&gt;ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;</div><div class='ctx'> 			d-&gt;tuner_pass_ctrl = st-&gt;ops.tuner_pass_ctrl;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -190,6 +189,10 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)</div><div class='ctx'> {</div><div class='ctx'> 	d-&gt;pll_addr = 0x60;</div><div class='ctx'> 	d-&gt;pll_desc = &amp;dvb_pll_env57h1xd5;</div><div class='add'>+</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.init = dvb_usb_tuner_init_i2c;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c<br/>index dd5a13195886..f4c45f386ebc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-mb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dibusb-mb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dibusb-mb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dibusb-mb.c</a></div><div class='hunk'>@@ -20,11 +20,12 @@ static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_device *d)</div><div class='ctx'> 	struct dibusb_state *st = d-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	demod_cfg.demod_address = 0x8;</div><div class='del'>-	demod_cfg.pll_set = dvb_usb_pll_set_i2c;</div><div class='del'>-	demod_cfg.pll_init = dvb_usb_pll_init_i2c;</div><div class='ctx'> </div><div class='del'>-	if ((d-&gt;fe = dib3000mb_attach(&amp;demod_cfg,&amp;d-&gt;i2c_adap,&amp;st-&gt;ops)) == NULL)</div><div class='add'>+	if ((d-&gt;fe = dib3000mb_attach(&amp;demod_cfg,&amp;d-&gt;i2c_adap,&amp;st-&gt;ops)) == NULL) {</div><div class='add'>+		d-&gt;fe-&gt;ops.tuner_ops.init = dvb_usb_tuner_init_i2c;</div><div class='add'>+		d-&gt;fe-&gt;ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	d-&gt;tuner_pass_ctrl = st-&gt;ops.tuner_pass_ctrl;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c<br/>index 91136c00ce9d..c14d9efb48fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/digitv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/digitv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/digitv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/digitv.c</a></div><div class='hunk'>@@ -112,27 +112,30 @@ static int digitv_mt352_demod_init(struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config digitv_mt352_config = {</div><div class='ctx'> 	.demod_init = digitv_mt352_demod_init,</div><div class='del'>-	.pll_set = dvb_usb_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int digitv_nxt6000_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_device *d = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 b[5];</div><div class='del'>-	dvb_usb_pll_set(fe,fep,b);</div><div class='add'>+	dvb_usb_tuner_calc_regs(fe,fep,b, 5);</div><div class='ctx'> 	return digitv_ctrl_msg(d,USB_WRITE_TUNER,0,&amp;b[1],4,NULL,0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nxt6000_config digitv_nxt6000_config = {</div><div class='ctx'> 	.clock_inversion = 1,</div><div class='del'>-	.pll_set = digitv_nxt6000_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int digitv_frontend_attach(struct dvb_usb_device *d)</div><div class='ctx'> {</div><div class='del'>-	if ((d-&gt;fe = mt352_attach(&amp;digitv_mt352_config, &amp;d-&gt;i2c_adap)) != NULL ||</div><div class='del'>-		(d-&gt;fe = nxt6000_attach(&amp;digitv_nxt6000_config, &amp;d-&gt;i2c_adap)) != NULL)</div><div class='add'>+	if ((d-&gt;fe = mt352_attach(&amp;digitv_mt352_config, &amp;d-&gt;i2c_adap)) != NULL) {</div><div class='add'>+		d-&gt;fe-&gt;ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='add'>+	if ((d-&gt;fe = nxt6000_attach(&amp;digitv_nxt6000_config, &amp;d-&gt;i2c_adap)) != NULL) {</div><div class='add'>+		d-&gt;fe-&gt;ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c<br/>index cd21ddbfd054..17413adec7a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtt200u-fe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dtt200u-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dtt200u-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dtt200u-fe.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@ struct dtt200u_fe_state {</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend_parameters fep;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)</div><div class='hunk'>@@ -163,16 +162,13 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)</div><div class='ctx'> 	deb_info("attaching frontend dtt200u\n");</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;d = d;</div><div class='del'>-	memcpy(&amp;state-&gt;ops,&amp;dtt200u_fe_ops,sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops,&amp;dtt200u_fe_ops,sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='add'>+	return &amp;state-&gt;frontend;</div><div class='ctx'> error:</div><div class='ctx'> 	return NULL;</div><div class='del'>-success:</div><div class='del'>-	return &amp;state-&gt;frontend;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dtt200u_fe_ops = {</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c<br/>index 6fa92100248b..ec631708c394 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dvb-usb-dvb.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ int dvb_usb_dvb_init(struct dvb_usb_device *d)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = dvb_register_adapter(&amp;d-&gt;dvb_adap, d-&gt;desc-&gt;name,</div><div class='del'>-			d-&gt;owner)) &lt; 0) {</div><div class='add'>+			d-&gt;owner, &amp;d-&gt;udev-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		deb_info("dvb_register_adapter failed: error %d", ret);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -121,16 +121,15 @@ int dvb_usb_dvb_init(struct dvb_usb_device *d)</div><div class='ctx'> </div><div class='ctx'> 	dvb_net_init(&amp;d-&gt;dvb_adap, &amp;d-&gt;dvb_net, &amp;d-&gt;demux.dmx);</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='add'>+	d-&gt;state |= DVB_USB_STATE_DVB;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='ctx'> err_dmx_dev:</div><div class='ctx'> 	dvb_dmx_release(&amp;d-&gt;demux);</div><div class='ctx'> err_dmx:</div><div class='ctx'> 	dvb_unregister_adapter(&amp;d-&gt;dvb_adap);</div><div class='ctx'> err:</div><div class='ctx'> 	return ret;</div><div class='del'>-success:</div><div class='del'>-	d-&gt;state |= DVB_USB_STATE_DVB;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int dvb_usb_dvb_exit(struct dvb_usb_device *d)</div><div class='hunk'>@@ -184,13 +183,13 @@ int dvb_usb_fe_init(struct dvb_usb_device* d)</div><div class='ctx'> </div><div class='ctx'> 	/* re-assign sleep and wakeup functions */</div><div class='ctx'> 	if (d-&gt;fe != NULL) {</div><div class='del'>-		d-&gt;fe_init = d-&gt;fe-&gt;ops-&gt;init;   d-&gt;fe-&gt;ops-&gt;init  = dvb_usb_fe_wakeup;</div><div class='del'>-		d-&gt;fe_sleep = d-&gt;fe-&gt;ops-&gt;sleep; d-&gt;fe-&gt;ops-&gt;sleep = dvb_usb_fe_sleep;</div><div class='add'>+		d-&gt;fe_init = d-&gt;fe-&gt;ops.init;   d-&gt;fe-&gt;ops.init  = dvb_usb_fe_wakeup;</div><div class='add'>+		d-&gt;fe_sleep = d-&gt;fe-&gt;ops.sleep; d-&gt;fe-&gt;ops.sleep = dvb_usb_fe_sleep;</div><div class='ctx'> </div><div class='ctx'> 		if (dvb_register_frontend(&amp;d-&gt;dvb_adap, d-&gt;fe)) {</div><div class='ctx'> 			err("Frontend registration failed.");</div><div class='del'>-			if (d-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-				d-&gt;fe-&gt;ops-&gt;release(d-&gt;fe);</div><div class='add'>+			if (d-&gt;fe-&gt;ops.release)</div><div class='add'>+				d-&gt;fe-&gt;ops.release(d-&gt;fe);</div><div class='ctx'> 			d-&gt;fe = NULL;</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c<br/>index 9b254532af4d..6b611a725093 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dvb-usb-i2c.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dvb_usb_pll_init_i2c(struct dvb_frontend *fe)</div><div class='add'>+int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_device *d = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = d-&gt;pll_addr, .flags = 0, .buf = d-&gt;pll_init, .len = 4 };</div><div class='hunk'>@@ -63,6 +63,8 @@ int dvb_usb_pll_init_i2c(struct dvb_frontend *fe)</div><div class='ctx'> 	deb_pll("pll-buf: %x %x %x %x\n",d-&gt;pll_init[0],d-&gt;pll_init[1],</div><div class='ctx'> 			d-&gt;pll_init[2],d-&gt;pll_init[3]);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;d-&gt;i2c_adap, &amp;msg, 1) != 1) {</div><div class='ctx'> 		err("tuner i2c write failed for pll_init.");</div><div class='ctx'> 		ret = -EREMOTEIO;</div><div class='hunk'>@@ -73,38 +75,42 @@ int dvb_usb_pll_init_i2c(struct dvb_frontend *fe)</div><div class='ctx'> 		d-&gt;tuner_pass_ctrl(fe,0,d-&gt;pll_addr);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dvb_usb_pll_init_i2c);</div><div class='add'>+EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);</div><div class='ctx'> </div><div class='del'>-int dvb_usb_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 b[5])</div><div class='add'>+int dvb_usb_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 *b, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_device *d = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (buf_len != 5)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (d-&gt;pll_desc == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	deb_pll("pll addr: %x, freq: %d %p\n",d-&gt;pll_addr,fep-&gt;frequency,d-&gt;pll_desc);</div><div class='ctx'> </div><div class='del'>-	b[0] = d-&gt;pll_addr &lt;&lt; 1;</div><div class='add'>+	b[0] = d-&gt;pll_addr;</div><div class='ctx'> 	dvb_pll_configure(d-&gt;pll_desc,&amp;b[1],fep-&gt;frequency,fep-&gt;u.ofdm.bandwidth);</div><div class='ctx'> </div><div class='ctx'> 	deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return 5;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dvb_usb_pll_set);</div><div class='add'>+EXPORT_SYMBOL(dvb_usb_tuner_calc_regs);</div><div class='ctx'> </div><div class='del'>-int dvb_usb_pll_set_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='add'>+int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)</div><div class='ctx'> {</div><div class='ctx'> 	struct dvb_usb_device *d = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u8 b[5];</div><div class='ctx'> 	struct i2c_msg msg = { .addr = d-&gt;pll_addr, .flags = 0, .buf = &amp;b[1], .len = 4 };</div><div class='ctx'> </div><div class='del'>-	dvb_usb_pll_set(fe,fep,b);</div><div class='add'>+	dvb_usb_tuner_calc_regs(fe,fep,b,5);</div><div class='ctx'> </div><div class='ctx'> 	if (d-&gt;tuner_pass_ctrl)</div><div class='ctx'> 		d-&gt;tuner_pass_ctrl(fe,1,d-&gt;pll_addr);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;d-&gt;i2c_adap, &amp;msg, 1) != 1) {</div><div class='ctx'> 		err("tuner i2c write failed for pll_set.");</div><div class='ctx'> 		ret = -EREMOTEIO;</div><div class='hunk'>@@ -116,4 +122,4 @@ int dvb_usb_pll_set_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dvb_usb_pll_set_i2c);</div><div class='add'>+EXPORT_SYMBOL(dvb_usb_tuner_set_params_i2c);</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h<br/>index cb239049b098..95698918bc11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb-ids.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dvb-usb-ids.h</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #define USB_VID_VISIONPLUS					0x13d3</div><div class='ctx'> #define USB_VID_TWINHAN						0x1822</div><div class='ctx'> #define USB_VID_ULTIMA_ELECTRONIC			0x05d8</div><div class='add'>+#define USB_VID_GENPIX					0x09c0</div><div class='ctx'> </div><div class='ctx'> /* Product IDs */</div><div class='ctx'> #define USB_PID_ADSTECH_USB2_COLD			0xa333</div><div class='hunk'>@@ -104,5 +105,6 @@</div><div class='ctx'> #define USB_PID_KYE_DVB_T_WARM				0x701f</div><div class='ctx'> #define USB_PID_PCTV_200E					0x020e</div><div class='ctx'> #define USB_PID_PCTV_400E					0x020f</div><div class='del'>-</div><div class='add'>+#define USB_PID_GENPIX_8PSK_COLD				0x0200</div><div class='add'>+#define USB_PID_GENPIX_8PSK_WARM				0x0201</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h<br/>index fead958a57e3..97f8ea962438 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/dvb-usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/dvb-usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/dvb-usb.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #ifndef __DVB_USB_H__</div><div class='ctx'> #define __DVB_USB_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='hunk'>@@ -330,9 +329,9 @@ extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16);</div><div class='ctx'> extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *);</div><div class='ctx'> </div><div class='ctx'> /* commonly used pll init and set functions */</div><div class='del'>-extern int dvb_usb_pll_init_i2c(struct dvb_frontend *);</div><div class='del'>-extern int dvb_usb_pll_set(struct dvb_frontend *, struct dvb_frontend_parameters *, u8[]);</div><div class='del'>-extern int dvb_usb_pll_set_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);</div><div class='add'>+extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);</div><div class='add'>+extern int dvb_usb_tuner_calc_regs(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len);</div><div class='add'>+extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);</div><div class='ctx'> </div><div class='ctx'> /* commonly used firmware download types and function */</div><div class='ctx'> struct hexline {</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c<br/>new file mode 100644<br/>index 000000000000..6ccbdc9cd772<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/gp8psk-fe.c</a></div><div class='hunk'>@@ -0,0 +1,272 @@</div><div class='add'>+/* DVB USB compliant Linux driver for the</div><div class='add'>+ *  - GENPIX 8pks/qpsk USB2.0 DVB-S module</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Alan Nisota (alannisota@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * Thanks to GENPIX for the sample code used to implement this module.</div><div class='add'>+ *</div><div class='add'>+ * This module is based off the vp7045 and vp702x modules</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ *	under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ *	Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ * see Documentation/dvb/README.dvb-usb for more information</div><div class='add'>+ */</div><div class='add'>+#include "gp8psk.h"</div><div class='add'>+</div><div class='add'>+struct gp8psk_fe_state {</div><div class='add'>+	struct dvb_frontend fe;</div><div class='add'>+</div><div class='add'>+	struct dvb_usb_device *d;</div><div class='add'>+</div><div class='add'>+	u16 snr;</div><div class='add'>+</div><div class='add'>+	unsigned long next_snr_check;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_read_status(struct dvb_frontend* fe, fe_status_t *status)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *st = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 lock;</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_in_op(st-&gt;d, GET_SIGNAL_LOCK, 0, 0, &amp;lock,1))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (lock)</div><div class='add'>+		*status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER;</div><div class='add'>+	else</div><div class='add'>+		*status = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* not supported by this Frontend */</div><div class='add'>+static int gp8psk_fe_read_ber(struct dvb_frontend* fe, u32 *ber)</div><div class='add'>+{</div><div class='add'>+	(void) fe;</div><div class='add'>+	*ber = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* not supported by this Frontend */</div><div class='add'>+static int gp8psk_fe_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)</div><div class='add'>+{</div><div class='add'>+	(void) fe;</div><div class='add'>+	*unc = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_read_snr(struct dvb_frontend* fe, u16 *snr)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *st = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies,st-&gt;next_snr_check)) {</div><div class='add'>+		gp8psk_usb_in_op(st-&gt;d,GET_SIGNAL_STRENGTH,0,0,buf,2);</div><div class='add'>+		*snr = (int)(buf[1]) &lt;&lt; 8 | buf[0];</div><div class='add'>+		/* snr is reported in dBu*256 */</div><div class='add'>+		/* snr / 38.4 ~= 100% strength */</div><div class='add'>+		/* snr * 17 returns 100% strength as 65535 */</div><div class='add'>+		if (*snr &lt;= 3855)</div><div class='add'>+			*snr = (*snr&lt;&lt;4) + *snr; // snr * 17</div><div class='add'>+		else</div><div class='add'>+			*snr = 65535;</div><div class='add'>+		st-&gt;next_snr_check = jiffies + (10*HZ)/1000;</div><div class='add'>+	} else {</div><div class='add'>+		*snr = st-&gt;snr;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_read_signal_strength(struct dvb_frontend* fe, u16 *strength)</div><div class='add'>+{</div><div class='add'>+	return gp8psk_fe_read_snr(fe, strength);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)</div><div class='add'>+{</div><div class='add'>+	tune-&gt;min_delay_ms = 800;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_set_frontend(struct dvb_frontend* fe,</div><div class='add'>+				  struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 cmd[10];</div><div class='add'>+	u32 freq = fep-&gt;frequency * 1000;</div><div class='add'>+</div><div class='add'>+	cmd[4] = freq         &amp; 0xff;</div><div class='add'>+	cmd[5] = (freq &gt;&gt; 8)  &amp; 0xff;</div><div class='add'>+	cmd[6] = (freq &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	cmd[7] = (freq &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	switch(fe-&gt;ops.info.type) {</div><div class='add'>+	case FE_QPSK:</div><div class='add'>+		cmd[0] =  fep-&gt;u.qpsk.symbol_rate        &amp; 0xff;</div><div class='add'>+		cmd[1] = (fep-&gt;u.qpsk.symbol_rate &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		cmd[2] = (fep-&gt;u.qpsk.symbol_rate &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		cmd[3] = (fep-&gt;u.qpsk.symbol_rate &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		cmd[8] = ADV_MOD_DVB_QPSK;</div><div class='add'>+		cmd[9] = 0x03; /*ADV_MOD_FEC_XXX*/</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		// other modes are unsuported right now</div><div class='add'>+		cmd[0] = 0;</div><div class='add'>+		cmd[1] = 0;</div><div class='add'>+		cmd[2] = 0;</div><div class='add'>+		cmd[3] = 0;</div><div class='add'>+		cmd[8] = 0;</div><div class='add'>+		cmd[9] = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gp8psk_usb_out_op(state-&gt;d,TUNE_8PSK,0,0,cmd,10);</div><div class='add'>+</div><div class='add'>+	state-&gt;next_snr_check = jiffies;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_get_frontend(struct dvb_frontend* fe,</div><div class='add'>+				  struct dvb_frontend_parameters *fep)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_send_diseqc_msg (struct dvb_frontend* fe,</div><div class='add'>+				    struct dvb_diseqc_master_cmd *m)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *st = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	deb_fe("%s\n",__FUNCTION__);</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_out_op(st-&gt;d,SEND_DISEQC_COMMAND, m-&gt;msg[0], 0,</div><div class='add'>+			m-&gt;msg, m-&gt;msg_len)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_send_diseqc_burst (struct dvb_frontend* fe,</div><div class='add'>+				    fe_sec_mini_cmd_t burst)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *st = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 cmd;</div><div class='add'>+</div><div class='add'>+	deb_fe("%s\n",__FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* These commands are certainly wrong */</div><div class='add'>+	cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01;</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_out_op(st-&gt;d,SEND_DISEQC_COMMAND, cmd, 0,</div><div class='add'>+			&amp;cmd, 0)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_out_op(state-&gt;d,SET_22KHZ_TONE,</div><div class='add'>+		 (tone == SEC_TONE_ON), 0, NULL, 0)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_out_op(state-&gt;d,SET_LNB_VOLTAGE,</div><div class='add'>+			 voltage == SEC_VOLTAGE_18, 0, NULL, 0)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_fe_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long sw_cmd)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 cmd = sw_cmd &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_out_op(state-&gt;d,SET_DN_SWITCH, cmd, 0,</div><div class='add'>+			NULL, 0)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (gp8psk_usb_out_op(state-&gt;d,SET_LNB_VOLTAGE, !!(sw_cmd &amp; 0x80),</div><div class='add'>+			0, NULL, 0)) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gp8psk_fe_release(struct dvb_frontend* fe)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+	kfree(state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops gp8psk_fe_ops;</div><div class='add'>+</div><div class='add'>+struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	struct gp8psk_fe_state *s = kzalloc(sizeof(struct gp8psk_fe_state), GFP_KERNEL);</div><div class='add'>+	if (s == NULL)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	s-&gt;d = d;</div><div class='add'>+	memcpy(&amp;s-&gt;fe.ops, &amp;gp8psk_fe_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	s-&gt;fe.demodulator_priv = s;</div><div class='add'>+</div><div class='add'>+	goto success;</div><div class='add'>+error:</div><div class='add'>+	return NULL;</div><div class='add'>+success:</div><div class='add'>+	return &amp;s-&gt;fe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct dvb_frontend_ops gp8psk_fe_ops = {</div><div class='add'>+	.info = {</div><div class='add'>+		.name			= "Genpix 8psk-USB DVB-S",</div><div class='add'>+		.type			= FE_QPSK,</div><div class='add'>+		.frequency_min		= 950000,</div><div class='add'>+		.frequency_max		= 2150000,</div><div class='add'>+		.frequency_stepsize	= 100,</div><div class='add'>+		.symbol_rate_min        = 1000000,</div><div class='add'>+		.symbol_rate_max        = 45000000,</div><div class='add'>+		.symbol_rate_tolerance  = 500,  /* ppm */</div><div class='add'>+		.caps = FE_CAN_INVERSION_AUTO |</div><div class='add'>+				FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |</div><div class='add'>+				FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |</div><div class='add'>+				FE_CAN_QPSK</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.release = gp8psk_fe_release,</div><div class='add'>+</div><div class='add'>+	.init = NULL,</div><div class='add'>+	.sleep = NULL,</div><div class='add'>+</div><div class='add'>+	.set_frontend = gp8psk_fe_set_frontend,</div><div class='add'>+	.get_frontend = gp8psk_fe_get_frontend,</div><div class='add'>+	.get_tune_settings = gp8psk_fe_get_tune_settings,</div><div class='add'>+</div><div class='add'>+	.read_status = gp8psk_fe_read_status,</div><div class='add'>+	.read_ber = gp8psk_fe_read_ber,</div><div class='add'>+	.read_signal_strength = gp8psk_fe_read_signal_strength,</div><div class='add'>+	.read_snr = gp8psk_fe_read_snr,</div><div class='add'>+	.read_ucblocks = gp8psk_fe_read_unc_blocks,</div><div class='add'>+</div><div class='add'>+	.diseqc_send_master_cmd = gp8psk_fe_send_diseqc_msg,</div><div class='add'>+	.diseqc_send_burst = gp8psk_fe_send_diseqc_burst,</div><div class='add'>+	.set_tone = gp8psk_fe_set_tone,</div><div class='add'>+	.set_voltage = gp8psk_fe_set_voltage,</div><div class='add'>+	.dishnetwork_send_legacy_command = gp8psk_fe_send_legacy_dish_cmd,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c<br/>new file mode 100644<br/>index 000000000000..9a98f3fdae31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/gp8psk.c</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+/* DVB USB compliant Linux driver for the</div><div class='add'>+ *  - GENPIX 8pks/qpsk USB2.0 DVB-S module</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Alan Nisota (alannisota@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * Thanks to GENPIX for the sample code used to implement this module.</div><div class='add'>+ *</div><div class='add'>+ * This module is based off the vp7045 and vp702x modules</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ *	under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ *	Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ * see Documentation/dvb/README.dvb-usb for more information</div><div class='add'>+ */</div><div class='add'>+#include "gp8psk.h"</div><div class='add'>+</div><div class='add'>+/* debug */</div><div class='add'>+static char bcm4500_firmware[] = "dvb-usb-gp8psk-02.fw";</div><div class='add'>+int dvb_usb_gp8psk_debug;</div><div class='add'>+module_param_named(debug,dvb_usb_gp8psk_debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DVB_USB_DEBUG_STATUS);</div><div class='add'>+</div><div class='add'>+int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen)</div><div class='add'>+{</div><div class='add'>+	int ret = 0,try = 0;</div><div class='add'>+</div><div class='add'>+	if ((ret = mutex_lock_interruptible(&amp;d-&gt;usb_mutex)))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	while (ret &gt;= 0 &amp;&amp; ret != blen &amp;&amp; try &lt; 3) {</div><div class='add'>+		ret = usb_control_msg(d-&gt;udev,</div><div class='add'>+			usb_rcvctrlpipe(d-&gt;udev,0),</div><div class='add'>+			req,</div><div class='add'>+			USB_TYPE_VENDOR | USB_DIR_IN,</div><div class='add'>+			value,index,b,blen,</div><div class='add'>+			2000);</div><div class='add'>+		deb_info("reading number %d (ret: %d)\n",try,ret);</div><div class='add'>+		try++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0 || ret != blen) {</div><div class='add'>+		warn("usb in operation failed.");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	} else</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+	deb_xfer("in: req. %x, val: %x, ind: %x, buffer: ",req,value,index);</div><div class='add'>+	debug_dump(b,blen,deb_xfer);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;d-&gt;usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,</div><div class='add'>+			     u16 index, u8 *b, int blen)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	deb_xfer("out: req. %x, val: %x, ind: %x, buffer: ",req,value,index);</div><div class='add'>+	debug_dump(b,blen,deb_xfer);</div><div class='add'>+</div><div class='add'>+	if ((ret = mutex_lock_interruptible(&amp;d-&gt;usb_mutex)))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (usb_control_msg(d-&gt;udev,</div><div class='add'>+			usb_sndctrlpipe(d-&gt;udev,0),</div><div class='add'>+			req,</div><div class='add'>+			USB_TYPE_VENDOR | USB_DIR_OUT,</div><div class='add'>+			value,index,b,blen,</div><div class='add'>+			2000) != blen) {</div><div class='add'>+		warn("usb out operation failed.");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	} else</div><div class='add'>+		ret = 0;</div><div class='add'>+	mutex_unlock(&amp;d-&gt;usb_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	const struct firmware *fw = NULL;</div><div class='add'>+	u8 *ptr, *buf;</div><div class='add'>+	if ((ret = request_firmware(&amp;fw, bcm4500_firmware,</div><div class='add'>+					&amp;d-&gt;udev-&gt;dev)) != 0) {</div><div class='add'>+		err("did not find the bcm4500 firmware file. (%s) "</div><div class='add'>+			"Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)",</div><div class='add'>+			bcm4500_firmware,ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (gp8psk_usb_out_op(d, LOAD_BCM4500,1,0,NULL, 0))</div><div class='add'>+		goto out_rel_fw;</div><div class='add'>+</div><div class='add'>+	info("downloaidng bcm4500 firmware from file '%s'",bcm4500_firmware);</div><div class='add'>+</div><div class='add'>+	ptr = fw-&gt;data;</div><div class='add'>+	buf = kmalloc(512, GFP_KERNEL | GFP_DMA);</div><div class='add'>+</div><div class='add'>+	while (ptr[0] != 0xff) {</div><div class='add'>+		u16 buflen = ptr[0] + 4;</div><div class='add'>+		if (ptr + buflen &gt;= fw-&gt;data + fw-&gt;size) {</div><div class='add'>+			err("failed to load bcm4500 firmware.");</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		memcpy(buf, ptr, buflen);</div><div class='add'>+		if (dvb_usb_generic_write(d, buf, buflen)) {</div><div class='add'>+			err("failed to load bcm4500 firmware.");</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		ptr += buflen;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(buf);</div><div class='add'>+out_rel_fw:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)</div><div class='add'>+{</div><div class='add'>+	u8 status, buf;</div><div class='add'>+	if (onoff) {</div><div class='add'>+		gp8psk_usb_in_op(d, GET_8PSK_CONFIG,0,0,&amp;status,1);</div><div class='add'>+		if (! (status &amp; 0x01))  /* started */</div><div class='add'>+			if (gp8psk_usb_in_op(d, BOOT_8PSK, 1, 0, &amp;buf, 1))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (! (status &amp; 0x02)) /* BCM4500 firmware loaded */</div><div class='add'>+			if(gp8psk_load_bcm4500fw(d))</div><div class='add'>+				return EINVAL;</div><div class='add'>+</div><div class='add'>+		if (! (status &amp; 0x04)) /* LNB Power */</div><div class='add'>+			if (gp8psk_usb_in_op(d, START_INTERSIL, 1, 0,</div><div class='add'>+					&amp;buf, 1))</div><div class='add'>+				return EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Set DVB mode */</div><div class='add'>+		if(gp8psk_usb_out_op(d, SET_DVB_MODE, 1, 0, NULL, 0))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		gp8psk_usb_in_op(d, GET_8PSK_CONFIG,0,0,&amp;status,1);</div><div class='add'>+	} else {</div><div class='add'>+		/* Turn off LNB power */</div><div class='add'>+		if (gp8psk_usb_in_op(d, START_INTERSIL, 0, 0, &amp;buf, 1))</div><div class='add'>+			return EINVAL;</div><div class='add'>+		/* Turn off 8psk power */</div><div class='add'>+		if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &amp;buf, 1))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int gp8psk_streaming_ctrl(struct dvb_usb_device *d, int onoff)</div><div class='add'>+{</div><div class='add'>+	return gp8psk_usb_out_op(d, ARM_TRANSFER, onoff, 0 , NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gp8psk_frontend_attach(struct dvb_usb_device *d)</div><div class='add'>+{</div><div class='add'>+	d-&gt;fe = gp8psk_fe_attach(d);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_properties gp8psk_properties;</div><div class='add'>+</div><div class='add'>+static int gp8psk_usb_probe(struct usb_interface *intf,</div><div class='add'>+		const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	return dvb_usb_device_init(intf,&amp;gp8psk_properties,THIS_MODULE,NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_device_id gp8psk_usb_table [] = {</div><div class='add'>+	    { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_COLD) },</div><div class='add'>+	    { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_WARM) },</div><div class='add'>+	    { 0 },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, gp8psk_usb_table);</div><div class='add'>+</div><div class='add'>+static struct dvb_usb_properties gp8psk_properties = {</div><div class='add'>+	.caps = 0,</div><div class='add'>+</div><div class='add'>+	.usb_ctrl = CYPRESS_FX2,</div><div class='add'>+	.firmware = "dvb-usb-gp8psk-01.fw",</div><div class='add'>+</div><div class='add'>+	.streaming_ctrl   = gp8psk_streaming_ctrl,</div><div class='add'>+	.power_ctrl       = gp8psk_power_ctrl,</div><div class='add'>+	.frontend_attach  = gp8psk_frontend_attach,</div><div class='add'>+</div><div class='add'>+	.generic_bulk_ctrl_endpoint = 0x01,</div><div class='add'>+	/* parameter for the MPEG2-data transfer */</div><div class='add'>+	.urb = {</div><div class='add'>+		.type = DVB_USB_BULK,</div><div class='add'>+		.count = 7,</div><div class='add'>+		.endpoint = 0x82,</div><div class='add'>+		.u = {</div><div class='add'>+			.bulk = {</div><div class='add'>+				.buffersize = 8192,</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	.num_device_descs = 1,</div><div class='add'>+	.devices = {</div><div class='add'>+		{ .name = "Genpix 8PSK-USB DVB-S USB2.0 receiver",</div><div class='add'>+		  .cold_ids = { &amp;gp8psk_usb_table[0], NULL },</div><div class='add'>+		  .warm_ids = { &amp;gp8psk_usb_table[1], NULL },</div><div class='add'>+		},</div><div class='add'>+		{ 0 },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* usb specific object needed to register this driver with the usb subsystem */</div><div class='add'>+static struct usb_driver gp8psk_usb_driver = {</div><div class='add'>+	.name		= "dvb_usb_gp8psk",</div><div class='add'>+	.probe		= gp8psk_usb_probe,</div><div class='add'>+	.disconnect = dvb_usb_device_exit,</div><div class='add'>+	.id_table	= gp8psk_usb_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* module stuff */</div><div class='add'>+static int __init gp8psk_usb_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	if ((result = usb_register(&amp;gp8psk_usb_driver))) {</div><div class='add'>+		err("usb_register failed. (%d)",result);</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit gp8psk_usb_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* deregister this driver from the USB subsystem */</div><div class='add'>+	usb_deregister(&amp;gp8psk_usb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(gp8psk_usb_module_init);</div><div class='add'>+module_exit(gp8psk_usb_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Alan Nisota &lt;alannisota@gamil.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Genpix 8psk-USB DVB-S USB2.0");</div><div class='add'>+MODULE_VERSION("1.0");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/gp8psk.h b/drivers/media/dvb/dvb-usb/gp8psk.h<br/>new file mode 100644<br/>index 000000000000..3eba7061011c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/gp8psk.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/gp8psk.h</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+/* DVB USB compliant Linux driver for the</div><div class='add'>+ *  - GENPIX 8pks/qpsk USB2.0 DVB-S module</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Alan Nisota (alannisota@gmail.com)</div><div class='add'>+ *</div><div class='add'>+ * Thanks to GENPIX for the sample code used to implement this module.</div><div class='add'>+ *</div><div class='add'>+ * This module is based off the vp7045 and vp702x modules</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ *	under the terms of the GNU General Public License as published by the Free</div><div class='add'>+ *	Software Foundation, version 2.</div><div class='add'>+ *</div><div class='add'>+ * see Documentation/dvb/README.dvb-usb for more information</div><div class='add'>+ */</div><div class='add'>+#ifndef _DVB_USB_GP8PSK_H_</div><div class='add'>+#define _DVB_USB_GP8PSK_H_</div><div class='add'>+</div><div class='add'>+#define DVB_USB_LOG_PREFIX "gp8psk"</div><div class='add'>+#include "dvb-usb.h"</div><div class='add'>+</div><div class='add'>+extern int dvb_usb_gp8psk_debug;</div><div class='add'>+#define deb_info(args...) dprintk(dvb_usb_gp8psk_debug,0x01,args)</div><div class='add'>+#define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args)</div><div class='add'>+#define deb_rc(args...)   dprintk(dvb_usb_gp8psk_debug,0x04,args)</div><div class='add'>+#define deb_fe(args...)   dprintk(dvb_usb_gp8psk_debug,0x08,args)</div><div class='add'>+/* gp8psk commands */</div><div class='add'>+</div><div class='add'>+/* Twinhan Vendor requests */</div><div class='add'>+#define TH_COMMAND_IN                     0xC0</div><div class='add'>+#define TH_COMMAND_OUT                    0xC1</div><div class='add'>+</div><div class='add'>+/* command bytes */</div><div class='add'>+#define GET_8PSK_CONFIG                 0x80</div><div class='add'>+#define SET_8PSK_CONFIG                 0x81</div><div class='add'>+#define ARM_TRANSFER                    0x85</div><div class='add'>+#define TUNE_8PSK                       0x86</div><div class='add'>+#define GET_SIGNAL_STRENGTH             0x87</div><div class='add'>+#define LOAD_BCM4500                    0x88</div><div class='add'>+#define BOOT_8PSK                       0x89</div><div class='add'>+#define START_INTERSIL                  0x8A</div><div class='add'>+#define SET_LNB_VOLTAGE                 0x8B</div><div class='add'>+#define SET_22KHZ_TONE                  0x8C</div><div class='add'>+#define SEND_DISEQC_COMMAND             0x8D</div><div class='add'>+#define SET_DVB_MODE                    0x8E</div><div class='add'>+#define SET_DN_SWITCH                   0x8F</div><div class='add'>+#define GET_SIGNAL_LOCK                 0x90</div><div class='add'>+</div><div class='add'>+/* Satellite modulation modes */</div><div class='add'>+#define ADV_MOD_DVB_QPSK 0     /* DVB-S QPSK */</div><div class='add'>+#define ADV_MOD_TURBO_QPSK 1   /* Turbo QPSK */</div><div class='add'>+#define ADV_MOD_TURBO_8PSK 2   /* Turbo 8PSK (also used for Trellis 8PSK) */</div><div class='add'>+#define ADV_MOD_TURBO_16QAM 3  /* Turbo 16QAM (also used for Trellis 8PSK) */</div><div class='add'>+</div><div class='add'>+#define ADV_MOD_DCII_C_QPSK 4  /* Digicipher II Combo */</div><div class='add'>+#define ADV_MOD_DCII_I_QPSK 5  /* Digicipher II I-stream */</div><div class='add'>+#define ADV_MOD_DCII_Q_QPSK 6  /* Digicipher II Q-stream */</div><div class='add'>+#define ADV_MOD_DCII_C_OQPSK 7 /* Digicipher II offset QPSK */</div><div class='add'>+#define ADV_MOD_DSS_QPSK 8     /* DSS (DIRECTV) QPSK */</div><div class='add'>+#define ADV_MOD_DVB_BPSK 9     /* DVB-S BPSK */</div><div class='add'>+</div><div class='add'>+#define GET_USB_SPEED                     0x07</div><div class='add'>+ #define USB_SPEED_LOW                    0</div><div class='add'>+ #define USB_SPEED_FULL                   1</div><div class='add'>+ #define USB_SPEED_HIGH                   2</div><div class='add'>+</div><div class='add'>+#define RESET_FX2                         0x13</div><div class='add'>+</div><div class='add'>+#define FW_VERSION_READ                   0x0B</div><div class='add'>+#define VENDOR_STRING_READ                0x0C</div><div class='add'>+#define PRODUCT_STRING_READ               0x0D</div><div class='add'>+#define FW_BCD_VERSION_READ               0x14</div><div class='add'>+</div><div class='add'>+extern struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d);</div><div class='add'>+extern int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen);</div><div class='add'>+extern int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,</div><div class='add'>+			     u16 index, u8 *b, int blen);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c<br/>index 14f1911c79bb..97d74da0dad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/umt-010.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/umt-010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/umt-010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/umt-010.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d)</div><div class='ctx'> 	memset(&amp;umt_config,0,sizeof(struct mt352_config));</div><div class='ctx'> 	umt_config.demod_init = umt_mt352_demod_init;</div><div class='ctx'> 	umt_config.demod_address = 0xf;</div><div class='del'>-	umt_config.pll_set = dvb_usb_pll_set;</div><div class='ctx'> </div><div class='ctx'> 	d-&gt;fe = mt352_attach(&amp;umt_config, &amp;d-&gt;i2c_adap);</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +67,7 @@ static int umt_tuner_attach (struct dvb_usb_device *d)</div><div class='ctx'> {</div><div class='ctx'> 	d-&gt;pll_addr = 0x61;</div><div class='ctx'> 	d-&gt;pll_desc = &amp;dvb_pll_tua6034;</div><div class='add'>+	d-&gt;fe-&gt;ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c<br/>index 2a89f8c5da99..d4da494132ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp702x-fe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/vp702x-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp702x-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/vp702x-fe.c</a></div><div class='hunk'>@@ -287,17 +287,16 @@ struct dvb_frontend * vp702x_fe_attach(struct dvb_usb_device *d)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;d = d;</div><div class='del'>-	s-&gt;fe.ops = &amp;vp702x_fe_ops;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;s-&gt;fe.ops,&amp;vp702x_fe_ops,sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	s-&gt;fe.demodulator_priv = s;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;lnb_buf[1] = SET_LNB_POWER;</div><div class='ctx'> 	s-&gt;lnb_buf[3] = 0xff; /* 0=tone burst, 2=data burst, ff=off */</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='add'>+	return &amp;s-&gt;fe;</div><div class='ctx'> error:</div><div class='ctx'> 	return NULL;</div><div class='del'>-success:</div><div class='del'>-	return &amp;s-&gt;fe;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c<br/>index 9999336aeeb6..8452eef90322 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp7045-fe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/dvb-usb/vp7045-fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/dvb-usb/vp7045-fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/dvb-usb/vp7045-fe.c</a></div><div class='hunk'>@@ -23,8 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> struct vp7045_fe_state {</div><div class='ctx'> 	struct dvb_frontend fe;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	struct dvb_usb_device *d;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -151,15 +149,12 @@ struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;d = d;</div><div class='del'>-	memcpy(&amp;s-&gt;ops, &amp;vp7045_fe_ops, sizeof(struct dvb_frontend_ops));</div><div class='del'>-	s-&gt;fe.ops = &amp;s-&gt;ops;</div><div class='add'>+	memcpy(&amp;s-&gt;fe.ops, &amp;vp7045_fe_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	s-&gt;fe.demodulator_priv = s;</div><div class='ctx'> </div><div class='del'>-	goto success;</div><div class='add'>+	return &amp;s-&gt;fe;</div><div class='ctx'> error:</div><div class='ctx'> 	return NULL;</div><div class='del'>-success:</div><div class='del'>-	return &amp;s-&gt;fe;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig<br/>index 37d5e0af1683..0ef361f0309b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/Kconfig</a></div><div class='hunk'>@@ -157,7 +157,7 @@ config DVB_STV0297</div><div class='ctx'> 	help</div><div class='ctx'> 	  A DVB-C tuner module. Say Y when you want to support this frontend.</div><div class='ctx'> </div><div class='del'>-comment "ATSC (North American/Korean Terresterial DTV) frontends"</div><div class='add'>+comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"</div><div class='ctx'> 	depends on DVB_CORE</div><div class='ctx'> </div><div class='ctx'> config DVB_NXT200X</div><div class='hunk'>@@ -216,4 +216,20 @@ config DVB_LGDT330X</div><div class='ctx'> 	  An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want</div><div class='ctx'> 	  to support this frontend.</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+comment "Miscellaneous devices"</div><div class='add'>+	depends on DVB_CORE</div><div class='add'>+</div><div class='add'>+config DVB_LNBP21</div><div class='add'>+	tristate "LNBP21 SEC controller"</div><div class='add'>+	depends on DVB_CORE</div><div class='add'>+	help</div><div class='add'>+	  An SEC control chip.</div><div class='add'>+</div><div class='add'>+config DVB_ISL6421</div><div class='add'>+	tristate "ISL6421 SEC controller"</div><div class='add'>+	depends on DVB_CORE</div><div class='add'>+	help</div><div class='add'>+	  An SEC control chip.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile<br/>index d09b6071fbaf..5222245c7f59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/Makefile</a></div><div class='hunk'>@@ -31,3 +31,5 @@ obj-$(CONFIG_DVB_BCM3510) += bcm3510.o</div><div class='ctx'> obj-$(CONFIG_DVB_S5H1420) += s5h1420.o</div><div class='ctx'> obj-$(CONFIG_DVB_LGDT330X) += lgdt330x.o</div><div class='ctx'> obj-$(CONFIG_DVB_CX24123) += cx24123.o</div><div class='add'>+obj-$(CONFIG_DVB_LNBP21) += lnbp21.o</div><div class='add'>+obj-$(CONFIG_DVB_ISL6421) += isl6421.o</div><div class='head'>diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c<br/>index 1708a1d4893e..baeb311de893 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bcm3510.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/bcm3510.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bcm3510.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/bcm3510.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> struct bcm3510_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct bcm3510_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -791,10 +790,9 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;bcm3510_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;bcm3510_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;state-&gt;hab_mutex);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h<br/>index 78573b22ada9..d8f65738e5d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsbe1.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/bsbe1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsbe1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/bsbe1.h</a></div><div class='hunk'>@@ -89,12 +89,13 @@ static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 data[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='add'>+	struct i2c_adapter *i2c = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='ctx'> 	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -105,6 +106,8 @@ static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c,</div><div class='ctx'> 	data[2] = 0x80 | ((div &amp; 0x18000) &gt;&gt; 10) | 4;</div><div class='ctx'> 	data[3] = (params-&gt;frequency &gt; 1530000) ? 0xE0 : 0xE4;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	ret = i2c_transfer(i2c, &amp;msg, 1);</div><div class='ctx'> 	return (ret != 1) ? -EIO : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -117,7 +120,6 @@ static struct stv0299_config alps_bsbe1_config = {</div><div class='ctx'> 	.skip_reinit = 0,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = alps_bsbe1_set_symbol_rate,</div><div class='del'>-	.pll_set = alps_bsbe1_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb/frontends/bsru6.h<br/>index 2a5366ce79cc..e231cd84b3a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsru6.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/bsru6.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/bsru6.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/bsru6.h</a></div><div class='hunk'>@@ -101,11 +101,12 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsru6_pll_set(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters *params)</div><div class='add'>+static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='add'>+	struct i2c_adapter *i2c = fe-&gt;tuner_priv;</div><div class='ctx'> </div><div class='ctx'> 	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -119,6 +120,8 @@ static int alps_bsru6_pll_set(struct dvb_frontend *fe, struct i2c_adapter *i2c,</div><div class='ctx'> 	if (params-&gt;frequency &gt; 1530000)</div><div class='ctx'> 		buf[3] = 0xc0;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -134,7 +137,6 @@ static struct stv0299_config alps_bsru6_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = alps_bsru6_set_symbol_rate,</div><div class='del'>-	.pll_set = alps_bsru6_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c<br/>index 755f774f6b7d..13ad1bfae663 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22700.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx22700.c</a></div><div class='hunk'>@@ -34,8 +34,6 @@ struct cx22700_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	const struct cx22700_config* config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -136,6 +134,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;code_rate_LP &lt; FEC_1_2 || p-&gt;code_rate_LP &gt; FEC_7_8)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;code_rate_HP == FEC_4_5 || p-&gt;code_rate_LP == FEC_4_5)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -247,12 +246,6 @@ static int cx22700_init (struct dvb_frontend* fe)</div><div class='ctx'> </div><div class='ctx'> 	cx22700_writereg (state, 0x00, 0x01);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		cx22700_writereg (state, 0x0a, 0x00);  /* open i2c bus switch */</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		cx22700_writereg (state, 0x0a, 0x01);  /* close i2c bus switch */</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,9 +326,11 @@ static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	cx22700_writereg (state, 0x00, 0x02); /* XXX CHECKME: soft reset*/</div><div class='ctx'> 	cx22700_writereg (state, 0x00, 0x00);</div><div class='ctx'> </div><div class='del'>-	cx22700_writereg (state, 0x0a, 0x00);  /* open i2c bus switch */</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	cx22700_writereg (state, 0x0a, 0x01);  /* close i2c bus switch */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cx22700_set_inversion (state, p-&gt;inversion);</div><div class='ctx'> 	cx22700_set_tps (state, &amp;p-&gt;u.ofdm);</div><div class='ctx'> 	cx22700_writereg (state, 0x37, 0x01);  /* PAL loop filter off */</div><div class='hunk'>@@ -353,6 +348,17 @@ static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	return cx22700_get_tps (state, &amp;p-&gt;u.ofdm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cx22700_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct cx22700_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return cx22700_writereg(state, 0x0a, 0x00);</div><div class='add'>+	} else {</div><div class='add'>+		return cx22700_writereg(state, 0x0a, 0x01);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)</div><div class='ctx'> {</div><div class='ctx'> 	fesettings-&gt;min_delay_ms = 150;</div><div class='hunk'>@@ -381,13 +387,12 @@ struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;cx22700_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (cx22700_readreg(state, 0x07) &lt; 0) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx22700_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -413,6 +418,7 @@ static struct dvb_frontend_ops cx22700_ops = {</div><div class='ctx'> 	.release = cx22700_release,</div><div class='ctx'> </div><div class='ctx'> 	.init = cx22700_init,</div><div class='add'>+	.i2c_gate_ctrl = cx22700_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = cx22700_set_frontend,</div><div class='ctx'> 	.get_frontend = cx22700_get_frontend,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22700.h b/drivers/media/dvb/frontends/cx22700.h<br/>index c9145b45874b..dcd8979c1a15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22700.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22700.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22700.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx22700.h</a></div><div class='hunk'>@@ -29,10 +29,6 @@ struct cx22700_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* cx22700_attach(const struct cx22700_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c<br/>index 0fc899f81c5e..4106d46c957f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22702.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx22702.c</a></div><div class='hunk'>@@ -40,8 +40,6 @@ struct cx22702_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct cx22702_config* config;</div><div class='ctx'> </div><div class='hunk'>@@ -211,22 +209,10 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet</div><div class='ctx'> 	u8 val;</div><div class='ctx'> 	struct cx22702_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	/* set PLL */</div><div class='del'>-	cx22702_i2c_gate_ctrl(fe, 1);</div><div class='del'>-	if (state-&gt;config-&gt;pll_set) {</div><div class='del'>-		state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	} else if (state-&gt;config-&gt;pll_desc) {</div><div class='del'>-		u8 pllbuf[4];</div><div class='del'>-		struct i2c_msg msg = { .addr = state-&gt;config-&gt;pll_address,</div><div class='del'>-				       .buf = pllbuf, .len = 4 };</div><div class='del'>-		dvb_pll_configure(state-&gt;config-&gt;pll_desc, pllbuf,</div><div class='del'>-				  p-&gt;frequency,</div><div class='del'>-				  p-&gt;u.ofdm.bandwidth);</div><div class='del'>-		i2c_transfer(state-&gt;i2c, &amp;msg, 1);</div><div class='del'>-	} else {</div><div class='del'>-		BUG();</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='del'>-	cx22702_i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* set inversion */</div><div class='ctx'> 	cx22702_set_inversion (state, p-&gt;inversion);</div><div class='hunk'>@@ -358,10 +344,6 @@ static int cx22702_init (struct dvb_frontend* fe)</div><div class='ctx'> </div><div class='ctx'> 	cx22702_writereg (state, 0xf8, (state-&gt;config-&gt;output_mode &lt;&lt; 1) &amp; 0x02);</div><div class='ctx'> </div><div class='del'>-	/* init PLL */</div><div class='del'>-	if (state-&gt;config-&gt;pll_init)</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	cx22702_i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -495,7 +477,6 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;cx22702_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;prevUCBlocks = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='hunk'>@@ -503,7 +484,7 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx22702_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -530,6 +511,7 @@ static struct dvb_frontend_ops cx22702_ops = {</div><div class='ctx'> 	.release = cx22702_release,</div><div class='ctx'> </div><div class='ctx'> 	.init = cx22702_init,</div><div class='add'>+	.i2c_gate_ctrl = cx22702_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = cx22702_set_tps,</div><div class='ctx'> 	.get_frontend = cx22702_get_frontend,</div><div class='hunk'>@@ -540,7 +522,6 @@ static struct dvb_frontend_ops cx22702_ops = {</div><div class='ctx'> 	.read_signal_strength = cx22702_read_signal_strength,</div><div class='ctx'> 	.read_snr = cx22702_read_snr,</div><div class='ctx'> 	.read_ucblocks = cx22702_read_ucblocks,</div><div class='del'>-	.i2c_gate_ctrl = cx22702_i2c_gate_ctrl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_param(debug, int, 0644);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h<br/>index 5633976a58f1..7f2f241e5d44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx22702.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx22702.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx22702.h</a></div><div class='hunk'>@@ -39,13 +39,6 @@ struct cx22702_config</div><div class='ctx'> #define CX22702_PARALLEL_OUTPUT 0</div><div class='ctx'> #define CX22702_SERIAL_OUTPUT   1</div><div class='ctx'> 	u8 output_mode;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	u8 pll_address;</div><div class='del'>-	struct dvb_pll_desc *pll_desc;</div><div class='del'>-</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* cx22702_attach(const struct cx22702_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c<br/>index f3edf8b517dd..ce3c7398bac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24110.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx24110.c</a></div><div class='hunk'>@@ -36,8 +36,6 @@ struct cx24110_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	const struct cx24110_config* config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -250,7 +248,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)</div><div class='ctx'> 	static const u32 bands[]={5000000UL,15000000UL,90999000UL/2};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);</div><div class='add'>+	dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);</div><div class='ctx'> 	if (srate&gt;90999000UL/2)</div><div class='ctx'> 		srate=90999000UL/2;</div><div class='ctx'> 	if (srate&lt;500000)</div><div class='hunk'>@@ -366,17 +364,6 @@ static int cx24110_initfe(struct dvb_frontend* fe)</div><div class='ctx'> 		cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx24110_sleep(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct cx24110_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-</div><div class='del'>-	if (state-&gt;config-&gt;pll_sleep)</div><div class='del'>-		  return state-&gt;config-&gt;pll_sleep(fe);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -548,7 +535,12 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24110_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	cx24110_set_inversion (state, p-&gt;inversion);</div><div class='ctx'> 	cx24110_set_fec (state, p-&gt;u.qpsk.fec_inner);</div><div class='ctx'> 	cx24110_set_symbolrate (state, p-&gt;u.qpsk.symbol_rate);</div><div class='hunk'>@@ -612,7 +604,6 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;cx24110_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;lastber = 0;</div><div class='ctx'> 	state-&gt;lastbler = 0;</div><div class='ctx'> 	state-&gt;lastesn0 = 0;</div><div class='hunk'>@@ -622,7 +613,7 @@ struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,</div><div class='ctx'> 	if ((ret != 0x5a) &amp;&amp; (ret != 0x69)) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx24110_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -651,7 +642,6 @@ static struct dvb_frontend_ops cx24110_ops = {</div><div class='ctx'> 	.release = cx24110_release,</div><div class='ctx'> </div><div class='ctx'> 	.init = cx24110_initfe,</div><div class='del'>-	.sleep = cx24110_sleep,</div><div class='ctx'> 	.set_frontend = cx24110_set_frontend,</div><div class='ctx'> 	.get_frontend = cx24110_get_frontend,</div><div class='ctx'> 	.read_status = cx24110_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h<br/>index 609ac642b406..b354a64e0e74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24110.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24110.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24110.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx24110.h</a></div><div class='hunk'>@@ -31,11 +31,6 @@ struct cx24110_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='del'>-	int (*pll_sleep)(struct dvb_frontend* fe);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c<br/>index 691dc840dcc0..274a87b7a5d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24123.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx24123.c</a></div><div class='hunk'>@@ -41,14 +41,12 @@ static int debug;</div><div class='ctx'> struct cx24123_state</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct cx24123_config* config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='ctx'> 	u32 lastber;</div><div class='ctx'> 	u16 snr;</div><div class='del'>-	u8  lnbreg;</div><div class='ctx'> </div><div class='ctx'> 	/* Some PLL specifics for tuning */</div><div class='ctx'> 	u32 VCAarg;</div><div class='hunk'>@@ -249,29 +247,6 @@ static int cx24123_writereg(struct cx24123_state* state, int reg, int data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_writelnbreg(struct cx24123_state* state, int reg, int data)</div><div class='del'>-{</div><div class='del'>-	u8 buf[] = { reg, data };</div><div class='del'>-	/* fixme: put the intersil addr int the config */</div><div class='del'>-	struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = buf, .len = 2 };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (debug&gt;1)</div><div class='del'>-		printk("cx24123: %s:  writeln addr=0x08, reg 0x%02x, value 0x%02x\n",</div><div class='del'>-						__FUNCTION__,reg, data);</div><div class='del'>-</div><div class='del'>-	if ((err = i2c_transfer(state-&gt;i2c, &amp;msg, 1)) != 1) {</div><div class='del'>-		printk("%s: writelnbreg error (err == %i, reg == 0x%02x,"</div><div class='del'>-			 " data == 0x%02x)\n", __FUNCTION__, err, reg, data);</div><div class='del'>-		return -EREMOTEIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* cache the write, no way to read back */</div><div class='del'>-	state-&gt;lnbreg = data;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cx24123_readreg(struct cx24123_state* state, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -295,11 +270,6 @@ static int cx24123_readreg(struct cx24123_state* state, u8 reg)</div><div class='ctx'> 	return b1[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cx24123_readlnbreg(struct cx24123_state* state, u8 reg)</div><div class='del'>-{</div><div class='del'>-	return state-&gt;lnbreg;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cx24123_set_inversion(struct cx24123_state* state, fe_spectral_inversion_t inversion)</div><div class='ctx'> {</div><div class='ctx'> 	u8 nom_reg = cx24123_readreg(state, 0x0e);</div><div class='hunk'>@@ -458,8 +428,8 @@ static int cx24123_set_symbolrate(struct cx24123_state* state, u32 srate)</div><div class='ctx'> 	u8 pll_mult;</div><div class='ctx'> </div><div class='ctx'> 	/*  check if symbol rate is within limits */</div><div class='del'>-	if ((srate &gt; state-&gt;ops.info.symbol_rate_max) ||</div><div class='del'>-	    (srate &lt; state-&gt;ops.info.symbol_rate_min))</div><div class='add'>+	if ((srate &gt; state-&gt;frontend.ops.info.symbol_rate_max) ||</div><div class='add'>+	    (srate &lt; state-&gt;frontend.ops.info.symbol_rate_min))</div><div class='ctx'> 		return -EOPNOTSUPP;;</div><div class='ctx'> </div><div class='ctx'> 	/* choose the sampling rate high enough for the required operation,</div><div class='hunk'>@@ -687,13 +657,6 @@ static int cx24123_initfe(struct dvb_frontend* fe)</div><div class='ctx'> 	for (i = 0; i &lt; sizeof(cx24123_regdata) / sizeof(cx24123_regdata[0]); i++)</div><div class='ctx'> 		cx24123_writereg(state, cx24123_regdata[i].reg, cx24123_regdata[i].data);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init)</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='del'>-	/* Configure the LNB for 14V */</div><div class='del'>-	if (state-&gt;config-&gt;use_isl6421)</div><div class='del'>-		cx24123_writelnbreg(state, 0x0, 0x2a);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -702,50 +665,18 @@ static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='del'>-	switch (state-&gt;config-&gt;use_isl6421) {</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='add'>+	val = cx24123_readreg(state, 0x29) &amp; ~0x40;</div><div class='ctx'> </div><div class='del'>-		val = cx24123_readlnbreg(state, 0x0);</div><div class='del'>-</div><div class='del'>-		switch (voltage) {</div><div class='del'>-		case SEC_VOLTAGE_13:</div><div class='del'>-			dprintk("%s:  isl6421 voltage = 13V\n",__FUNCTION__);</div><div class='del'>-			return cx24123_writelnbreg(state, 0x0, val &amp; 0x32); /* V 13v */</div><div class='del'>-		case SEC_VOLTAGE_18:</div><div class='del'>-			dprintk("%s:  isl6421 voltage = 18V\n",__FUNCTION__);</div><div class='del'>-			return cx24123_writelnbreg(state, 0x0, val | 0x04); /* H 18v */</div><div class='del'>-		case SEC_VOLTAGE_OFF:</div><div class='del'>-			dprintk("%s:  isl5421 voltage off\n",__FUNCTION__);</div><div class='del'>-			return cx24123_writelnbreg(state, 0x0, val &amp; 0x30);</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='del'>-</div><div class='del'>-		val = cx24123_readreg(state, 0x29);</div><div class='del'>-</div><div class='del'>-		switch (voltage) {</div><div class='del'>-		case SEC_VOLTAGE_13:</div><div class='del'>-			dprintk("%s: setting voltage 13V\n", __FUNCTION__);</div><div class='del'>-			if (state-&gt;config-&gt;enable_lnb_voltage)</div><div class='del'>-				state-&gt;config-&gt;enable_lnb_voltage(fe, 1);</div><div class='del'>-			return cx24123_writereg(state, 0x29, val | 0x80);</div><div class='del'>-		case SEC_VOLTAGE_18:</div><div class='del'>-			dprintk("%s: setting voltage 18V\n", __FUNCTION__);</div><div class='del'>-			if (state-&gt;config-&gt;enable_lnb_voltage)</div><div class='del'>-				state-&gt;config-&gt;enable_lnb_voltage(fe, 1);</div><div class='del'>-			return cx24123_writereg(state, 0x29, val &amp; 0x7f);</div><div class='del'>-		case SEC_VOLTAGE_OFF:</div><div class='del'>-			dprintk("%s: setting voltage off\n", __FUNCTION__);</div><div class='del'>-			if (state-&gt;config-&gt;enable_lnb_voltage)</div><div class='del'>-				state-&gt;config-&gt;enable_lnb_voltage(fe, 0);</div><div class='del'>-			return 0;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		};</div><div class='del'>-	}</div><div class='add'>+	switch (voltage) {</div><div class='add'>+	case SEC_VOLTAGE_13:</div><div class='add'>+		dprintk("%s: setting voltage 13V\n", __FUNCTION__);</div><div class='add'>+		return cx24123_writereg(state, 0x29, val &amp; 0x7f);</div><div class='add'>+	case SEC_VOLTAGE_18:</div><div class='add'>+		dprintk("%s: setting voltage 18V\n", __FUNCTION__);</div><div class='add'>+		return cx24123_writereg(state, 0x29, val | 0x80);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -766,27 +697,20 @@ static void cx24123_wait_for_diseqc(struct cx24123_state *state)</div><div class='ctx'> static int cx24123_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int i, val;</div><div class='add'>+	int i, val, tone;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n",__FUNCTION__);</div><div class='ctx'> </div><div class='del'>-	/* check if continuous tone has been stopped */</div><div class='del'>-	if (state-&gt;config-&gt;use_isl6421)</div><div class='del'>-		val = cx24123_readlnbreg(state, 0x00) &amp; 0x10;</div><div class='del'>-	else</div><div class='del'>-		val = cx24123_readreg(state, 0x29) &amp; 0x10;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		printk("%s: ERROR: attempt to send diseqc command before tone is off\n", __FUNCTION__);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	/* stop continuous tone if enabled */</div><div class='add'>+	tone = cx24123_readreg(state, 0x29);</div><div class='add'>+	if (tone &amp; 0x10)</div><div class='add'>+		cx24123_writereg(state, 0x29, tone &amp; ~0x50);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for diseqc queue ready */</div><div class='ctx'> 	cx24123_wait_for_diseqc(state);</div><div class='ctx'> </div><div class='ctx'> 	/* select tone mode */</div><div class='del'>-	cx24123_writereg(state, 0x2a, cx24123_readreg(state, 0x2a) &amp; 0xf8);</div><div class='add'>+	cx24123_writereg(state, 0x2a, cx24123_readreg(state, 0x2a) &amp; 0xfb);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; cmd-&gt;msg_len; i++)</div><div class='ctx'> 		cx24123_writereg(state, 0x2C + i, cmd-&gt;msg[i]);</div><div class='hunk'>@@ -797,36 +721,33 @@ static int cx24123_send_diseqc_msg(struct dvb_frontend* fe, struct dvb_diseqc_ma</div><div class='ctx'> 	/* wait for diseqc message to finish sending */</div><div class='ctx'> 	cx24123_wait_for_diseqc(state);</div><div class='ctx'> </div><div class='add'>+	/* restart continuous tone if enabled */</div><div class='add'>+	if (tone &amp; 0x10) {</div><div class='add'>+		cx24123_writereg(state, 0x29, tone &amp; ~0x40);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cx24123_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='del'>-	int val;</div><div class='add'>+	int val, tone;</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s:\n", __FUNCTION__);</div><div class='ctx'> </div><div class='del'>-	/* check if continuous tone has been stoped */</div><div class='del'>-	if (state-&gt;config-&gt;use_isl6421)</div><div class='del'>-		val = cx24123_readlnbreg(state, 0x00) &amp; 0x10;</div><div class='del'>-	else</div><div class='del'>-		val = cx24123_readreg(state, 0x29) &amp; 0x10;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		printk("%s: ERROR: attempt to send diseqc command before tone is off\n", __FUNCTION__);</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	/* stop continuous tone if enabled */</div><div class='add'>+	tone = cx24123_readreg(state, 0x29);</div><div class='add'>+	if (tone &amp; 0x10)</div><div class='add'>+		cx24123_writereg(state, 0x29, tone &amp; ~0x50);</div><div class='ctx'> </div><div class='add'>+	/* wait for diseqc queue ready */</div><div class='ctx'> 	cx24123_wait_for_diseqc(state);</div><div class='ctx'> </div><div class='ctx'> 	/* select tone mode */</div><div class='del'>-	val = cx24123_readreg(state, 0x2a) &amp; 0xf8;</div><div class='del'>-	cx24123_writereg(state, 0x2a, val | 0x04);</div><div class='del'>-</div><div class='add'>+	cx24123_writereg(state, 0x2a, cx24123_readreg(state, 0x2a) | 0x4);</div><div class='add'>+	msleep(30);</div><div class='ctx'> 	val = cx24123_readreg(state, 0x29);</div><div class='del'>-</div><div class='ctx'> 	if (burst == SEC_MINI_A)</div><div class='ctx'> 		cx24123_writereg(state, 0x29, ((val &amp; 0x90) | 0x40 | 0x00));</div><div class='ctx'> 	else if (burst == SEC_MINI_B)</div><div class='hunk'>@@ -835,7 +756,12 @@ static int cx24123_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	cx24123_wait_for_diseqc(state);</div><div class='add'>+	cx24123_writereg(state, 0x2a, cx24123_readreg(state, 0x2a) &amp; 0xfb);</div><div class='ctx'> </div><div class='add'>+	/* restart continuous tone if enabled */</div><div class='add'>+	if (tone &amp; 0x10) {</div><div class='add'>+		cx24123_writereg(state, 0x29, tone &amp; ~0x40);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -976,38 +902,21 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)</div><div class='ctx'> 	struct cx24123_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='del'>-	switch (state-&gt;config-&gt;use_isl6421) {</div><div class='del'>-	case 1:</div><div class='del'>-</div><div class='del'>-		val = cx24123_readlnbreg(state, 0x0);</div><div class='del'>-</div><div class='del'>-		switch (tone) {</div><div class='del'>-		case SEC_TONE_ON:</div><div class='del'>-			dprintk("%s:  isl6421 sec tone on\n",__FUNCTION__);</div><div class='del'>-			return cx24123_writelnbreg(state, 0x0, val | 0x10);</div><div class='del'>-		case SEC_TONE_OFF:</div><div class='del'>-			dprintk("%s:  isl6421 sec tone off\n",__FUNCTION__);</div><div class='del'>-			return cx24123_writelnbreg(state, 0x0, val &amp; 0x2f);</div><div class='del'>-		default:</div><div class='del'>-			printk("%s: CASE reached default with tone=%d\n", __FUNCTION__, tone);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='add'>+	/* wait for diseqc queue ready */</div><div class='add'>+	cx24123_wait_for_diseqc(state);</div><div class='ctx'> </div><div class='del'>-		val = cx24123_readreg(state, 0x29);</div><div class='add'>+	val = cx24123_readreg(state, 0x29) &amp; ~0x40;</div><div class='ctx'> </div><div class='del'>-		switch (tone) {</div><div class='del'>-		case SEC_TONE_ON:</div><div class='del'>-			dprintk("%s: setting tone on\n", __FUNCTION__);</div><div class='del'>-			return cx24123_writereg(state, 0x29, val | 0x10);</div><div class='del'>-		case SEC_TONE_OFF:</div><div class='del'>-			dprintk("%s: setting tone off\n",__FUNCTION__);</div><div class='del'>-			return cx24123_writereg(state, 0x29, val &amp; 0xef);</div><div class='del'>-		default:</div><div class='del'>-			printk("%s: CASE reached default with tone=%d\n", __FUNCTION__, tone);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	switch (tone) {</div><div class='add'>+	case SEC_TONE_ON:</div><div class='add'>+		dprintk("%s: setting tone on\n", __FUNCTION__);</div><div class='add'>+		return cx24123_writereg(state, 0x29, val | 0x10);</div><div class='add'>+	case SEC_TONE_OFF:</div><div class='add'>+		dprintk("%s: setting tone off\n",__FUNCTION__);</div><div class='add'>+		return cx24123_writereg(state, 0x29, val &amp; 0xef);</div><div class='add'>+	default:</div><div class='add'>+		printk("%s: CASE reached default with tone=%d\n", __FUNCTION__, tone);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1040,10 +949,8 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;cx24123_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;lastber = 0;</div><div class='ctx'> 	state-&gt;snr = 0;</div><div class='del'>-	state-&gt;lnbreg = 0;</div><div class='ctx'> 	state-&gt;VCAarg = 0;</div><div class='ctx'> 	state-&gt;VGAarg = 0;</div><div class='ctx'> 	state-&gt;bandselectarg = 0;</div><div class='hunk'>@@ -1059,7 +966,7 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;cx24123_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb/frontends/cx24123.h<br/>index 0c922b5e9263..9606f825935c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/cx24123.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/cx24123.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/cx24123.h</a></div><div class='hunk'>@@ -28,21 +28,8 @@ struct cx24123_config</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	   cards like Hauppauge Nova-S Plus/Nova-SE2 use an Intersil ISL6421 chip</div><div class='del'>-	   for LNB control, while KWorld DVB-S 100 use the LNBDC and LNBTone bits</div><div class='del'>-	   from register 0x29 of the CX24123 demodulator</div><div class='del'>-	*/</div><div class='del'>-	int use_isl6421;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='del'>-</div><div class='ctx'> 	/* Need to set device param for start_dma */</div><div class='ctx'> 	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);</div><div class='del'>-</div><div class='del'>-	void (*enable_lnb_voltage)(struct dvb_frontend* fe, int on);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* cx24123_attach(const struct cx24123_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000-common.h b/drivers/media/dvb/frontends/dib3000-common.h<br/>index c31d6df15472..be1c0d3e1389 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000-common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000-common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000-common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dib3000-common.h</a></div><div class='hunk'>@@ -38,8 +38,6 @@</div><div class='ctx'> struct dib3000_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> /* configuration settings */</div><div class='ctx'> 	struct dib3000_config config;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h<br/>index 2d5475b5c063..ec927628d273 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dib3000.h</a></div><div class='hunk'>@@ -30,10 +30,6 @@ struct dib3000_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance and the i2c address of the PLL */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend *fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dib_fe_xfer_ops</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c<br/>index ae589adb1c0a..5302e11883a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000mb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dib3000mb.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -60,8 +59,9 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	fe_code_rate_t fe_cr = FEC_NONE;</div><div class='ctx'> 	int search_state, seq;</div><div class='ctx'> </div><div class='del'>-	if (tuner &amp;&amp; state-&gt;config.pll_set) {</div><div class='del'>-		state-&gt;config.pll_set(fe, fep);</div><div class='add'>+	if (tuner &amp;&amp; fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 		deb_setf("bandwidth: ");</div><div class='ctx'> 		switch (ofdm-&gt;bandwidth) {</div><div class='hunk'>@@ -386,9 +386,6 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)</div><div class='ctx'> </div><div class='ctx'> 	wr(DIB3000MB_REG_DATA_IN_DIVERSITY, DIB3000MB_DATA_DIVERSITY_IN_OFF);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config.pll_init)</div><div class='del'>-		state-&gt;config.pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -707,7 +704,6 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='ctx'> 	memcpy(&amp;state-&gt;config,config,sizeof(struct dib3000_config));</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;dib3000mb_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check for the correct demod */</div><div class='ctx'> 	if (rd(DIB3000_REG_MANUFACTOR_ID) != DIB3000_I2C_ID_DIBCOM)</div><div class='hunk'>@@ -717,7 +713,7 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;dib3000mb_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	/* set the xfer operations */</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c<br/>index 3b303dbb6156..98673474a140 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dib3000mc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dib3000mc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dib3000mc.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * see Documentation/dvb/README.dibusb for more information</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -462,8 +461,9 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	int search_state,auto_val;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='del'>-	if (tuner &amp;&amp; state-&gt;config.pll_set) { /* initial call from dvb */</div><div class='del'>-		state-&gt;config.pll_set(fe,fep);</div><div class='add'>+	if (tuner &amp;&amp; fe-&gt;ops.tuner_ops.set_params) { /* initial call from dvb */</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, fep);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> </div><div class='ctx'> 		state-&gt;last_tuned_freq = fep-&gt;frequency;</div><div class='ctx'> 	//	if (!scanboost) {</div><div class='hunk'>@@ -642,9 +642,6 @@ static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)</div><div class='ctx'> </div><div class='ctx'> 	set_or(DIB3000MC_REG_CLK_CFG_7,DIB3000MC_CLK_CFG_7_DIV_IN_OFF);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config.pll_init)</div><div class='del'>-		state-&gt;config.pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	deb_info("init end\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -839,7 +836,6 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='ctx'> 	memcpy(&amp;state-&gt;config,config,sizeof(struct dib3000_config));</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;dib3000mc_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check for the correct demod */</div><div class='ctx'> 	if (rd(DIB3000_REG_MANUFACTOR_ID) != DIB3000_I2C_ID_DIBCOM)</div><div class='hunk'>@@ -859,7 +855,7 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;dib3000mc_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	/* set the xfer operations */</div><div class='hunk'>@@ -876,6 +872,7 @@ error:</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(dib3000mc_attach);</div><div class='ctx'> </div><div class='ctx'> static struct dvb_frontend_ops dib3000mc_ops = {</div><div class='ctx'> </div><div class='hunk'>@@ -914,5 +911,3 @@ static struct dvb_frontend_ops dib3000mc_ops = {</div><div class='ctx'> MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(dib3000mc_attach);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c<br/>index 791706ec1da3..a189683454b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb-pll.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dvb-pll.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb-pll.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dvb-pll.c</a></div><div class='hunk'>@@ -227,10 +227,10 @@ struct dvb_pll_desc dvb_pll_tua6034 = {</div><div class='ctx'> EXPORT_SYMBOL(dvb_pll_tua6034);</div><div class='ctx'> </div><div class='ctx'> /* Infineon TUA6034</div><div class='del'>- * used in LG TDVS H061F and LG TDVS H062F</div><div class='add'>+ * used in LG TDVS-H061F, LG TDVS-H062F and LG TDVS-H064F</div><div class='ctx'>  */</div><div class='del'>-struct dvb_pll_desc dvb_pll_tdvs_tua6034 = {</div><div class='del'>-	.name  = "LG/Infineon TUA6034",</div><div class='add'>+struct dvb_pll_desc dvb_pll_lg_tdvs_h06xf = {</div><div class='add'>+	.name  = "LG TDVS-H06xF",</div><div class='ctx'> 	.min   =  54000000,</div><div class='ctx'> 	.max   = 863000000,</div><div class='ctx'> 	.count = 3,</div><div class='hunk'>@@ -240,7 +240,7 @@ struct dvb_pll_desc dvb_pll_tdvs_tua6034 = {</div><div class='ctx'> 		{  999999999, 44000000, 62500, 0xce, 0x04 },</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='del'>-EXPORT_SYMBOL(dvb_pll_tdvs_tua6034);</div><div class='add'>+EXPORT_SYMBOL(dvb_pll_lg_tdvs_h06xf);</div><div class='ctx'> </div><div class='ctx'> /* Philips FMD1216ME</div><div class='ctx'>  * used in Medion Hybrid PCMCIA card and USB Box</div><div class='hunk'>@@ -419,6 +419,19 @@ struct dvb_pll_desc dvb_pll_thomson_fe6600 = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(dvb_pll_thomson_fe6600);</div><div class='ctx'> </div><div class='add'>+struct dvb_pll_priv {</div><div class='add'>+	/* i2c details */</div><div class='add'>+	int pll_i2c_address;</div><div class='add'>+	struct i2c_adapter *i2c;</div><div class='add'>+</div><div class='add'>+	/* the PLL descriptor */</div><div class='add'>+	struct dvb_pll_desc *pll_desc;</div><div class='add'>+</div><div class='add'>+	/* cached frequency/bandwidth */</div><div class='add'>+	u32 frequency;</div><div class='add'>+	u32 bandwidth;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> /* code                                                        */</div><div class='ctx'> </div><div class='hunk'>@@ -443,7 +456,8 @@ int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,</div><div class='ctx'> 	if (debug)</div><div class='ctx'> 		printk("pll: %s: freq=%d bw=%d | i=%d/%d\n",</div><div class='ctx'> 		       desc-&gt;name, freq, bandwidth, i, desc-&gt;count);</div><div class='del'>-	BUG_ON(i == desc-&gt;count);</div><div class='add'>+	if (i == desc-&gt;count)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	div = (freq + desc-&gt;entries[i].offset) / desc-&gt;entries[i].stepsize;</div><div class='ctx'> 	buf[0] = div &gt;&gt; 8;</div><div class='hunk'>@@ -462,6 +476,163 @@ int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(dvb_pll_configure);</div><div class='ctx'> </div><div class='add'>+static int dvb_pll_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	if (fe-&gt;tuner_priv)</div><div class='add'>+		kfree(fe-&gt;tuner_priv);</div><div class='add'>+	fe-&gt;tuner_priv = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_pll_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	struct i2c_msg msg =</div><div class='add'>+		{ .addr = priv-&gt;pll_i2c_address, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='add'>+	int i;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;pll_desc-&gt;count; i++) {</div><div class='add'>+		if (priv-&gt;pll_desc-&gt;entries[i].limit == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == priv-&gt;pll_desc-&gt;count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	buf[1] = 0;</div><div class='add'>+	buf[2] = priv-&gt;pll_desc-&gt;entries[i].config;</div><div class='add'>+	buf[3] = priv-&gt;pll_desc-&gt;entries[i].cb;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if ((result = i2c_transfer(priv-&gt;i2c, &amp;msg, 1)) != 1) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_pll_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	struct i2c_msg msg =</div><div class='add'>+		{ .addr = priv-&gt;pll_i2c_address, .flags = 0, .buf = buf, .len = sizeof(buf) };</div><div class='add'>+	int result;</div><div class='add'>+	u32 div;</div><div class='add'>+	int i;</div><div class='add'>+	u32 bandwidth = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;i2c == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	// DVBT bandwidth only just now</div><div class='add'>+	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='add'>+		bandwidth = params-&gt;u.ofdm.bandwidth;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((result = dvb_pll_configure(priv-&gt;pll_desc, buf, params-&gt;frequency, bandwidth)) != 0)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if ((result = i2c_transfer(priv-&gt;i2c, &amp;msg, 1)) != 1) {</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// calculate the frequency we set it to</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;pll_desc-&gt;count; i++) {</div><div class='add'>+		if (params-&gt;frequency &gt; priv-&gt;pll_desc-&gt;entries[i].limit)</div><div class='add'>+			continue;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	div = (params-&gt;frequency + priv-&gt;pll_desc-&gt;entries[i].offset) / priv-&gt;pll_desc-&gt;entries[i].stepsize;</div><div class='add'>+	priv-&gt;frequency = (div * priv-&gt;pll_desc-&gt;entries[i].stepsize) - priv-&gt;pll_desc-&gt;entries[i].offset;</div><div class='add'>+	priv-&gt;bandwidth = bandwidth;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_pll_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *params, u8 *buf, int buf_len)</div><div class='add'>+{</div><div class='add'>+	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	int result;</div><div class='add'>+	u32 div;</div><div class='add'>+	int i;</div><div class='add'>+	u32 bandwidth = 0;</div><div class='add'>+</div><div class='add'>+	if (buf_len &lt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	// DVBT bandwidth only just now</div><div class='add'>+	if (fe-&gt;ops.info.type == FE_OFDM) {</div><div class='add'>+		bandwidth = params-&gt;u.ofdm.bandwidth;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((result = dvb_pll_configure(priv-&gt;pll_desc, buf+1, params-&gt;frequency, bandwidth)) != 0)</div><div class='add'>+		return result;</div><div class='add'>+	buf[0] = priv-&gt;pll_i2c_address;</div><div class='add'>+</div><div class='add'>+	// calculate the frequency we set it to</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;pll_desc-&gt;count; i++) {</div><div class='add'>+		if (params-&gt;frequency &gt; priv-&gt;pll_desc-&gt;entries[i].limit)</div><div class='add'>+			continue;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	div = (params-&gt;frequency + priv-&gt;pll_desc-&gt;entries[i].offset) / priv-&gt;pll_desc-&gt;entries[i].stepsize;</div><div class='add'>+	priv-&gt;frequency = (div * priv-&gt;pll_desc-&gt;entries[i].stepsize) - priv-&gt;pll_desc-&gt;entries[i].offset;</div><div class='add'>+	priv-&gt;bandwidth = bandwidth;</div><div class='add'>+</div><div class='add'>+	return 5;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_pll_get_frequency(struct dvb_frontend *fe, u32 *frequency)</div><div class='add'>+{</div><div class='add'>+	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	*frequency = priv-&gt;frequency;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dvb_pll_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)</div><div class='add'>+{</div><div class='add'>+	struct dvb_pll_priv *priv = fe-&gt;tuner_priv;</div><div class='add'>+	*bandwidth = priv-&gt;bandwidth;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dvb_tuner_ops dvb_pll_tuner_ops = {</div><div class='add'>+	.release = dvb_pll_release,</div><div class='add'>+	.sleep = dvb_pll_sleep,</div><div class='add'>+	.set_params = dvb_pll_set_params,</div><div class='add'>+	.calc_regs = dvb_pll_calc_regs,</div><div class='add'>+	.get_frequency = dvb_pll_get_frequency,</div><div class='add'>+	.get_bandwidth = dvb_pll_get_bandwidth,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc)</div><div class='add'>+{</div><div class='add'>+	struct dvb_pll_priv *priv = NULL;</div><div class='add'>+</div><div class='add'>+	priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL);</div><div class='add'>+	if (priv == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;pll_i2c_address = pll_addr;</div><div class='add'>+	priv-&gt;i2c = i2c;</div><div class='add'>+	priv-&gt;pll_desc = desc;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;fe-&gt;ops.tuner_ops, &amp;dvb_pll_tuner_ops, sizeof(struct dvb_tuner_ops));</div><div class='add'>+	strncpy(fe-&gt;ops.tuner_ops.info.name, desc-&gt;name, 128);</div><div class='add'>+	fe-&gt;ops.tuner_ops.info.frequency_min = desc-&gt;min;</div><div class='add'>+	fe-&gt;ops.tuner_ops.info.frequency_min = desc-&gt;max;</div><div class='add'>+</div><div class='add'>+	fe-&gt;tuner_priv = priv;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(dvb_pll_attach);</div><div class='add'>+</div><div class='ctx'> MODULE_DESCRIPTION("dvb pll library");</div><div class='ctx'> MODULE_AUTHOR("Gerd Knorr");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h<br/>index 2b8461784989..66361cd18807 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb-pll.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dvb-pll.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb-pll.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dvb-pll.h</a></div><div class='hunk'>@@ -5,6 +5,9 @@</div><div class='ctx'> #ifndef __DVB_PLL_H__</div><div class='ctx'> #define __DVB_PLL_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+</div><div class='ctx'> struct dvb_pll_desc {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	u32  min;</div><div class='hunk'>@@ -31,7 +34,7 @@ extern struct dvb_pll_desc dvb_pll_unknown_1;</div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_tua6010xs;</div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_env57h1xd5;</div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_tua6034;</div><div class='del'>-extern struct dvb_pll_desc dvb_pll_tdvs_tua6034;</div><div class='add'>+extern struct dvb_pll_desc dvb_pll_lg_tdvs_h06xf;</div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_tda665x;</div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_fmd1216me;</div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_tded4;</div><div class='hunk'>@@ -44,7 +47,18 @@ extern struct dvb_pll_desc dvb_pll_philips_td1316;</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_pll_desc dvb_pll_thomson_fe6600;</div><div class='ctx'> </div><div class='del'>-int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,</div><div class='add'>+extern int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,</div><div class='ctx'> 		      u32 freq, int bandwidth);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Attach a dvb-pll to the supplied frontend structure.</div><div class='add'>+ *</div><div class='add'>+ * @param fe Frontend to attach to.</div><div class='add'>+ * @param pll_addr i2c address of the PLL (if used).</div><div class='add'>+ * @param i2c i2c adapter to use (set to NULL if not used).</div><div class='add'>+ * @param desc dvb_pll_desc to use.</div><div class='add'>+ * @return 0 on success, nonzero on failure.</div><div class='add'>+ */</div><div class='add'>+extern int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c<br/>index 645946a992d9..6271b1e7f6ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb_dummy_fe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/dvb_dummy_fe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/dvb_dummy_fe.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct dvb_dummy_fe_state {</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,6 +76,11 @@ static int dvb_dummy_fe_get_frontend(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> </div><div class='ctx'> static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='add'>+	if (fe-&gt;ops-&gt;tuner_ops-&gt;set_params) {</div><div class='add'>+		fe-&gt;ops-&gt;tuner_ops-&gt;set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops-&gt;i2c_gate_ctrl) fe-&gt;ops-&gt;i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -116,11 +120,8 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void)</div><div class='ctx'> 	state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);</div><div class='ctx'> 	if (state == NULL) goto error;</div><div class='ctx'> </div><div class='del'>-	/* setup the state */</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));</div><div class='del'>-</div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -139,11 +140,8 @@ struct dvb_frontend* dvb_dummy_fe_qpsk_attach()</div><div class='ctx'> 	state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);</div><div class='ctx'> 	if (state == NULL) goto error;</div><div class='ctx'> </div><div class='del'>-	/* setup the state */</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));</div><div class='del'>-</div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -162,11 +160,8 @@ struct dvb_frontend* dvb_dummy_fe_qam_attach()</div><div class='ctx'> 	state = kmalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL);</div><div class='ctx'> 	if (state == NULL) goto error;</div><div class='ctx'> </div><div class='del'>-	/* setup the state */</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));</div><div class='del'>-</div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/isl6421.c b/drivers/media/dvb/frontends/isl6421.c<br/>new file mode 100644<br/>index 000000000000..58c34db31071<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/isl6421.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/isl6421.c</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+/*</div><div class='add'>+ * isl6421.h - driver for lnb supply and control ic ISL6421</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Andrew de Quincey</div><div class='add'>+ * Copyright (C) 2006 Oliver Endriss</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * the project's page is at http://www.linuxtv.org</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "isl6421.h"</div><div class='add'>+</div><div class='add'>+struct isl6421 {</div><div class='add'>+	u8			config;</div><div class='add'>+	u8			override_or;</div><div class='add'>+	u8			override_and;</div><div class='add'>+	struct i2c_adapter	*i2c;</div><div class='add'>+	u8			i2c_addr;</div><div class='add'>+	void			(*release_chain)(struct dvb_frontend* fe);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='add'>+{</div><div class='add'>+	struct isl6421 *isl6421 = (struct isl6421 *) fe-&gt;misc_priv;</div><div class='add'>+	struct i2c_msg msg = {	.addr = isl6421-&gt;i2c_addr, .flags = 0,</div><div class='add'>+				.buf = &amp;isl6421-&gt;config,</div><div class='add'>+				.len = sizeof(isl6421-&gt;config) };</div><div class='add'>+</div><div class='add'>+	isl6421-&gt;config &amp;= ~(ISL6421_VSEL1 | ISL6421_EN1);</div><div class='add'>+</div><div class='add'>+	switch(voltage) {</div><div class='add'>+	case SEC_VOLTAGE_OFF:</div><div class='add'>+		break;</div><div class='add'>+	case SEC_VOLTAGE_13:</div><div class='add'>+		isl6421-&gt;config |= ISL6421_EN1;</div><div class='add'>+		break;</div><div class='add'>+	case SEC_VOLTAGE_18:</div><div class='add'>+		isl6421-&gt;config |= (ISL6421_EN1 | ISL6421_VSEL1);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	isl6421-&gt;config |= isl6421-&gt;override_or;</div><div class='add'>+	isl6421-&gt;config &amp;= isl6421-&gt;override_and;</div><div class='add'>+</div><div class='add'>+	return (i2c_transfer(isl6421-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl6421_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)</div><div class='add'>+{</div><div class='add'>+	struct isl6421 *isl6421 = (struct isl6421 *) fe-&gt;misc_priv;</div><div class='add'>+	struct i2c_msg msg = {	.addr = isl6421-&gt;i2c_addr, .flags = 0,</div><div class='add'>+				.buf = &amp;isl6421-&gt;config,</div><div class='add'>+				.len = sizeof(isl6421-&gt;config) };</div><div class='add'>+</div><div class='add'>+	if (arg)</div><div class='add'>+		isl6421-&gt;config |= ISL6421_LLC1;</div><div class='add'>+	else</div><div class='add'>+		isl6421-&gt;config &amp;= ~ISL6421_LLC1;</div><div class='add'>+</div><div class='add'>+	isl6421-&gt;config |= isl6421-&gt;override_or;</div><div class='add'>+	isl6421-&gt;config &amp;= isl6421-&gt;override_and;</div><div class='add'>+</div><div class='add'>+	return (i2c_transfer(isl6421-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isl6421_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct isl6421 *isl6421 = (struct isl6421 *) fe-&gt;misc_priv;</div><div class='add'>+</div><div class='add'>+	/* power off */</div><div class='add'>+	isl6421_set_voltage(fe, SEC_VOLTAGE_OFF);</div><div class='add'>+</div><div class='add'>+	/* free data &amp; call next release routine */</div><div class='add'>+	fe-&gt;ops.release = isl6421-&gt;release_chain;</div><div class='add'>+	kfree(fe-&gt;misc_priv);</div><div class='add'>+	fe-&gt;misc_priv = NULL;</div><div class='add'>+	if (fe-&gt;ops.release)</div><div class='add'>+		fe-&gt;ops.release(fe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,</div><div class='add'>+		   u8 override_set, u8 override_clear)</div><div class='add'>+{</div><div class='add'>+	struct isl6421 *isl6421 = kmalloc(sizeof(struct isl6421), GFP_KERNEL);</div><div class='add'>+	if (!isl6421)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* default configuration */</div><div class='add'>+	isl6421-&gt;config = ISL6421_ISEL1;</div><div class='add'>+	isl6421-&gt;i2c = i2c;</div><div class='add'>+	isl6421-&gt;i2c_addr = i2c_addr;</div><div class='add'>+	fe-&gt;misc_priv = isl6421;</div><div class='add'>+</div><div class='add'>+	/* bits which should be forced to '1' */</div><div class='add'>+	isl6421-&gt;override_or = override_set;</div><div class='add'>+</div><div class='add'>+	/* bits which should be forced to '0' */</div><div class='add'>+	isl6421-&gt;override_and = ~override_clear;</div><div class='add'>+</div><div class='add'>+	/* detect if it is present or not */</div><div class='add'>+	if (isl6421_set_voltage(fe, SEC_VOLTAGE_OFF)) {</div><div class='add'>+		kfree(isl6421);</div><div class='add'>+		fe-&gt;misc_priv = NULL;</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* install release callback */</div><div class='add'>+	isl6421-&gt;release_chain = fe-&gt;ops.release;</div><div class='add'>+	fe-&gt;ops.release = isl6421_release;</div><div class='add'>+</div><div class='add'>+	/* override frontend ops */</div><div class='add'>+	fe-&gt;ops.set_voltage = isl6421_set_voltage;</div><div class='add'>+	fe-&gt;ops.enable_high_lnb_voltage = isl6421_enable_high_lnb_voltage;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(isl6421_attach);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Driver for lnb supply and control ic isl6421");</div><div class='add'>+MODULE_AUTHOR("Andrew de Quincey &amp; Oliver Endriss");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/isl6421.h b/drivers/media/dvb/frontends/isl6421.h<br/>new file mode 100644<br/>index 000000000000..675f80a19b99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/isl6421.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/isl6421.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/*</div><div class='add'>+ * isl6421.h - driver for lnb supply and control ic ISL6421</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Andrew de Quincey</div><div class='add'>+ * Copyright (C) 2006 Oliver Endriss</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * the project's page is at http://www.linuxtv.org</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ISL6421_H</div><div class='add'>+#define _ISL6421_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='add'>+</div><div class='add'>+/* system register bits */</div><div class='add'>+#define ISL6421_OLF1	0x01</div><div class='add'>+#define ISL6421_EN1	0x02</div><div class='add'>+#define ISL6421_VSEL1	0x04</div><div class='add'>+#define ISL6421_LLC1	0x08</div><div class='add'>+#define ISL6421_ENT1	0x10</div><div class='add'>+#define ISL6421_ISEL1	0x20</div><div class='add'>+#define ISL6421_DCL	0x40</div><div class='add'>+</div><div class='add'>+/* override_set and override_clear control which system register bits (above) to always set &amp; clear */</div><div class='add'>+extern int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,</div><div class='add'>+			  u8 override_set, u8 override_clear);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c<br/>index 1c7c91224472..f3bc82e44a28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/l64781.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/l64781.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/l64781.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/l64781.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> struct l64781_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct l64781_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -141,7 +140,10 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	u8 val0x06;</div><div class='ctx'> 	int bw = p-&gt;bandwidth - BANDWIDTH_8_MHZ;</div><div class='ctx'> </div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, param);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;inversion != INVERSION_ON &amp;&amp;</div><div class='ctx'> 	    param-&gt;inversion != INVERSION_OFF)</div><div class='hunk'>@@ -463,8 +465,6 @@ static int l64781_init(struct dvb_frontend* fe)</div><div class='ctx'> 	/* Everything is two's complement, soft bit and CSI_OUT too */</div><div class='ctx'> 	l64781_writereg (state, 0x1e, 0x09);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	/* delay a bit after first init attempt */</div><div class='ctx'> 	if (state-&gt;first) {</div><div class='ctx'> 		state-&gt;first = 0;</div><div class='hunk'>@@ -508,7 +508,6 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;l64781_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;first = 1;</div><div class='ctx'> </div><div class='ctx'> 	/**</div><div class='hunk'>@@ -554,7 +553,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;l64781_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb/frontends/l64781.h<br/>index 947f65f87465..83b8bc210274 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/l64781.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/l64781.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/l64781.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/l64781.h</a></div><div class='hunk'>@@ -29,10 +29,6 @@ struct l64781_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/lg_h06xf.h b/drivers/media/dvb/frontends/lg_h06xf.h<br/>new file mode 100644<br/>index 000000000000..754d51d11120<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lg_h06xf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/lg_h06xf.h</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/*</div><div class='add'>+ *  lg_h06xf.h - ATSC Tuner support for LG TDVS-H06xF</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LG_H06XF_H_</div><div class='add'>+#define _LG_H06XF_H_</div><div class='add'>+#include "dvb-pll.h"</div><div class='add'>+</div><div class='add'>+static int lg_h06xf_pll_set(struct dvb_frontend* fe, struct i2c_adapter* i2c_adap,</div><div class='add'>+		     struct dvb_frontend_parameters* params)</div><div class='add'>+{</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	struct i2c_msg msg = { .addr = 0x61, .flags = 0,</div><div class='add'>+			       .buf = buf, .len = sizeof(buf) };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dvb_pll_configure(&amp;dvb_pll_lg_tdvs_h06xf, buf, params-&gt;frequency, 0);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if ((err = i2c_transfer(i2c_adap, &amp;msg, 1)) != 1) {</div><div class='add'>+		printk(KERN_WARNING "lg_h06xf: %s error "</div><div class='add'>+			"(addr %02x &lt;- %02x, err = %i)\n",</div><div class='add'>+			__FUNCTION__, buf[0], buf[1], err);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		else</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the Auxiliary Byte. */</div><div class='add'>+	buf[0] = buf[2];</div><div class='add'>+	buf[0] &amp;= ~0x20;</div><div class='add'>+	buf[0] |= 0x18;</div><div class='add'>+	buf[1] = 0x50;</div><div class='add'>+	msg.len = 2;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if ((err = i2c_transfer(i2c_adap, &amp;msg, 1)) != 1) {</div><div class='add'>+		printk(KERN_WARNING "lg_h06xf: %s error "</div><div class='add'>+			"(addr %02x &lt;- %02x, err = %i)\n",</div><div class='add'>+			__FUNCTION__, buf[0], buf[1], err);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		else</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c<br/>index 4691ac54bc1d..9a354708bd20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt330x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lgdt330x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt330x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/lgdt330x.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'>  *   DViCO FusionHDTV 5 Lite</div><div class='ctx'>  *   DViCO FusionHDTV 5 USB Gold</div><div class='ctx'>  *   Air2PC/AirStar 2 ATSC 3rd generation (HD5000)</div><div class='add'>+ *   pcHDTV HD5500</div><div class='ctx'>  *</div><div class='ctx'>  * TODO:</div><div class='ctx'>  * signal strength always returns 0.</div><div class='hunk'>@@ -59,7 +60,6 @@ if (debug) printk(KERN_DEBUG "lgdt330x: " args); \</div><div class='ctx'> struct lgdt330x_state</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Configuration settings */</div><div class='ctx'> 	const struct lgdt330x_config* config;</div><div class='hunk'>@@ -216,7 +216,7 @@ static int lgdt330x_init(struct dvb_frontend* fe)</div><div class='ctx'> 		AGC_DELAY0, 0x07,</div><div class='ctx'> 		AGC_DELAY2, 0xfe,</div><div class='ctx'> 		/* Change the value of IAGCBW[15:8]</div><div class='del'>-		   of inner AGC loop filter bandwith */</div><div class='add'>+		   of inner AGC loop filter bandwidth */</div><div class='ctx'> 		AGC_LOOP_BANDWIDTH0, 0x08,</div><div class='ctx'> 		AGC_LOOP_BANDWIDTH1, 0x9a</div><div class='ctx'> 	};</div><div class='hunk'>@@ -399,8 +399,10 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Tune to the specified frequency */</div><div class='del'>-	if (state-&gt;config-&gt;pll_set)</div><div class='del'>-		state-&gt;config-&gt;pll_set(fe, param);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Keep track of the new frequency */</div><div class='ctx'> 	/* FIXME this is the wrong way to do this...           */</div><div class='hunk'>@@ -672,6 +674,7 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr)</div><div class='ctx'> </div><div class='ctx'> 	if (state-&gt;current_modulation == VSB_8) {</div><div class='ctx'> </div><div class='add'>+		i2c_read_demod_bytes(state, 0x6e, buf, 5);</div><div class='ctx'> 		/* Phase Tracker Mean-Square Error Register for VSB */</div><div class='ctx'> 		noise = ((buf[0] &amp; 7) &lt;&lt; 16) | (buf[3] &lt;&lt; 8) | buf[4];</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -721,16 +724,19 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,</div><div class='ctx'> 	/* Setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='add'>+</div><div class='add'>+	/* Create dvb_frontend */</div><div class='ctx'> 	switch (config-&gt;demod_chip) {</div><div class='ctx'> 	case LGDT3302:</div><div class='del'>-		memcpy(&amp;state-&gt;ops, &amp;lgdt3302_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+		memcpy(&amp;state-&gt;frontend.ops, &amp;lgdt3302_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LGDT3303:</div><div class='del'>-		memcpy(&amp;state-&gt;ops, &amp;lgdt3303_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+		memcpy(&amp;state-&gt;frontend.ops, &amp;lgdt3303_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify communication with demod chip */</div><div class='ctx'> 	if (i2c_read_demod_bytes(state, 2, buf, 1))</div><div class='hunk'>@@ -739,9 +745,6 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,</div><div class='ctx'> 	state-&gt;current_frequency = -1;</div><div class='ctx'> 	state-&gt;current_modulation = -1;</div><div class='ctx'> </div><div class='del'>-	/* Create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='del'>-	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lgdt330x.h b/drivers/media/dvb/frontends/lgdt330x.h<br/>index 2a6529cccf1a..bad903c6f0f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt330x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lgdt330x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lgdt330x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/lgdt330x.h</a></div><div class='hunk'>@@ -43,7 +43,6 @@ struct lgdt330x_config</div><div class='ctx'> </div><div class='ctx'> 	/* PLL interface */</div><div class='ctx'> 	int (*pll_rf_set) (struct dvb_frontend* fe, int index);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> </div><div class='ctx'> 	/* Need to set device param for start_dma */</div><div class='ctx'> 	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lnbp21.c b/drivers/media/dvb/frontends/lnbp21.c<br/>new file mode 100644<br/>index 000000000000..e933edc8dd29<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lnbp21.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/lnbp21.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+/*</div><div class='add'>+ * lnbp21.h - driver for lnb supply and control ic lnbp21</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Oliver Endriss</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * the project's page is at http://www.linuxtv.org</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dvb_frontend.h"</div><div class='add'>+#include "lnbp21.h"</div><div class='add'>+</div><div class='add'>+struct lnbp21 {</div><div class='add'>+	u8			config;</div><div class='add'>+	u8			override_or;</div><div class='add'>+	u8			override_and;</div><div class='add'>+	struct i2c_adapter	*i2c;</div><div class='add'>+	void			(*release_chain)(struct dvb_frontend* fe);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='add'>+{</div><div class='add'>+	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe-&gt;misc_priv;</div><div class='add'>+	struct i2c_msg msg = {	.addr = 0x08, .flags = 0,</div><div class='add'>+				.buf = &amp;lnbp21-&gt;config,</div><div class='add'>+				.len = sizeof(lnbp21-&gt;config) };</div><div class='add'>+</div><div class='add'>+	lnbp21-&gt;config &amp;= ~(LNBP21_VSEL | LNBP21_EN);</div><div class='add'>+</div><div class='add'>+	switch(voltage) {</div><div class='add'>+	case SEC_VOLTAGE_OFF:</div><div class='add'>+		break;</div><div class='add'>+	case SEC_VOLTAGE_13:</div><div class='add'>+		lnbp21-&gt;config |= LNBP21_EN;</div><div class='add'>+		break;</div><div class='add'>+	case SEC_VOLTAGE_18:</div><div class='add'>+		lnbp21-&gt;config |= (LNBP21_EN | LNBP21_VSEL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	lnbp21-&gt;config |= lnbp21-&gt;override_or;</div><div class='add'>+	lnbp21-&gt;config &amp;= lnbp21-&gt;override_and;</div><div class='add'>+</div><div class='add'>+	return (i2c_transfer(lnbp21-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)</div><div class='add'>+{</div><div class='add'>+	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe-&gt;misc_priv;</div><div class='add'>+	struct i2c_msg msg = {	.addr = 0x08, .flags = 0,</div><div class='add'>+				.buf = &amp;lnbp21-&gt;config,</div><div class='add'>+				.len = sizeof(lnbp21-&gt;config) };</div><div class='add'>+</div><div class='add'>+	if (arg)</div><div class='add'>+		lnbp21-&gt;config |= LNBP21_LLC;</div><div class='add'>+	else</div><div class='add'>+		lnbp21-&gt;config &amp;= ~LNBP21_LLC;</div><div class='add'>+</div><div class='add'>+	lnbp21-&gt;config |= lnbp21-&gt;override_or;</div><div class='add'>+	lnbp21-&gt;config &amp;= lnbp21-&gt;override_and;</div><div class='add'>+</div><div class='add'>+	return (i2c_transfer(lnbp21-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lnbp21_release(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe-&gt;misc_priv;</div><div class='add'>+</div><div class='add'>+	/* LNBP power off */</div><div class='add'>+	lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);</div><div class='add'>+</div><div class='add'>+	/* free data &amp; call next release routine */</div><div class='add'>+	fe-&gt;ops.release = lnbp21-&gt;release_chain;</div><div class='add'>+	kfree(fe-&gt;misc_priv);</div><div class='add'>+	fe-&gt;misc_priv = NULL;</div><div class='add'>+	if (fe-&gt;ops.release)</div><div class='add'>+		fe-&gt;ops.release(fe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)</div><div class='add'>+{</div><div class='add'>+	struct lnbp21 *lnbp21 = kmalloc(sizeof(struct lnbp21), GFP_KERNEL);</div><div class='add'>+	if (!lnbp21)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* default configuration */</div><div class='add'>+	lnbp21-&gt;config = LNBP21_ISEL;</div><div class='add'>+	lnbp21-&gt;i2c = i2c;</div><div class='add'>+	fe-&gt;misc_priv = lnbp21;</div><div class='add'>+</div><div class='add'>+	/* bits which should be forced to '1' */</div><div class='add'>+	lnbp21-&gt;override_or = override_set;</div><div class='add'>+</div><div class='add'>+	/* bits which should be forced to '0' */</div><div class='add'>+	lnbp21-&gt;override_and = ~override_clear;</div><div class='add'>+</div><div class='add'>+	/* detect if it is present or not */</div><div class='add'>+	if (lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF)) {</div><div class='add'>+		kfree(lnbp21);</div><div class='add'>+		fe-&gt;misc_priv = NULL;</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* install release callback */</div><div class='add'>+	lnbp21-&gt;release_chain = fe-&gt;ops.release;</div><div class='add'>+	fe-&gt;ops.release = lnbp21_release;</div><div class='add'>+</div><div class='add'>+	/* override frontend ops */</div><div class='add'>+	fe-&gt;ops.set_voltage = lnbp21_set_voltage;</div><div class='add'>+	fe-&gt;ops.enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(lnbp21_attach);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Driver for lnb supply and control ic lnbp21");</div><div class='add'>+MODULE_AUTHOR("Oliver Endriss");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/media/dvb/frontends/lnbp21.h b/drivers/media/dvb/frontends/lnbp21.h<br/>index 0dcbe61b61b1..047a4ab68c01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lnbp21.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/lnbp21.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/lnbp21.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/lnbp21.h</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #ifndef _LNBP21_H</div><div class='ctx'> #define _LNBP21_H</div><div class='ctx'> </div><div class='del'>-/* system register */</div><div class='add'>+/* system register bits */</div><div class='ctx'> #define LNBP21_OLF	0x01</div><div class='ctx'> #define LNBP21_OTF	0x02</div><div class='ctx'> #define LNBP21_EN	0x04</div><div class='hunk'>@@ -37,103 +37,9 @@</div><div class='ctx'> #define LNBP21_ISEL	0x40</div><div class='ctx'> #define LNBP21_PCL	0x80</div><div class='ctx'> </div><div class='del'>-struct lnbp21 {</div><div class='del'>-	u8			config;</div><div class='del'>-	u8			override_or;</div><div class='del'>-	u8			override_and;</div><div class='del'>-	struct i2c_adapter	*i2c;</div><div class='del'>-	void			(*release_chain)(struct dvb_frontend* fe);</div><div class='del'>-};</div><div class='add'>+#include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> </div><div class='del'>-static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='del'>-{</div><div class='del'>-	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe-&gt;misc_priv;</div><div class='del'>-	struct i2c_msg msg = {	.addr = 0x08, .flags = 0,</div><div class='del'>-				.buf = &amp;lnbp21-&gt;config,</div><div class='del'>-				.len = sizeof(lnbp21-&gt;config) };</div><div class='del'>-</div><div class='del'>-	lnbp21-&gt;config &amp;= ~(LNBP21_VSEL | LNBP21_EN);</div><div class='del'>-</div><div class='del'>-	switch(voltage) {</div><div class='del'>-	case SEC_VOLTAGE_OFF:</div><div class='del'>-		break;</div><div class='del'>-	case SEC_VOLTAGE_13:</div><div class='del'>-		lnbp21-&gt;config |= LNBP21_EN;</div><div class='del'>-		break;</div><div class='del'>-	case SEC_VOLTAGE_18:</div><div class='del'>-		lnbp21-&gt;config |= (LNBP21_EN | LNBP21_VSEL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	lnbp21-&gt;config |= lnbp21-&gt;override_or;</div><div class='del'>-	lnbp21-&gt;config &amp;= lnbp21-&gt;override_and;</div><div class='del'>-</div><div class='del'>-	return (i2c_transfer(lnbp21-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)</div><div class='del'>-{</div><div class='del'>-	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe-&gt;misc_priv;</div><div class='del'>-	struct i2c_msg msg = {	.addr = 0x08, .flags = 0,</div><div class='del'>-				.buf = &amp;lnbp21-&gt;config,</div><div class='del'>-				.len = sizeof(lnbp21-&gt;config) };</div><div class='del'>-</div><div class='del'>-	if (arg)</div><div class='del'>-		lnbp21-&gt;config |= LNBP21_LLC;</div><div class='del'>-	else</div><div class='del'>-		lnbp21-&gt;config &amp;= ~LNBP21_LLC;</div><div class='del'>-</div><div class='del'>-	lnbp21-&gt;config |= lnbp21-&gt;override_or;</div><div class='del'>-	lnbp21-&gt;config &amp;= lnbp21-&gt;override_and;</div><div class='del'>-</div><div class='del'>-	return (i2c_transfer(lnbp21-&gt;i2c, &amp;msg, 1) == 1) ? 0 : -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lnbp21_exit(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe-&gt;misc_priv;</div><div class='del'>-</div><div class='del'>-	/* LNBP power off */</div><div class='del'>-	lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);</div><div class='del'>-</div><div class='del'>-	/* free data &amp; call next release routine */</div><div class='del'>-	fe-&gt;ops-&gt;release = lnbp21-&gt;release_chain;</div><div class='del'>-	kfree(fe-&gt;misc_priv);</div><div class='del'>-	fe-&gt;misc_priv = NULL;</div><div class='del'>-	if (fe-&gt;ops-&gt;release)</div><div class='del'>-		fe-&gt;ops-&gt;release(fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lnbp21_init(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)</div><div class='del'>-{</div><div class='del'>-	struct lnbp21 *lnbp21 = kmalloc(sizeof(struct lnbp21), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!lnbp21)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* default configuration */</div><div class='del'>-	lnbp21-&gt;config = LNBP21_ISEL;</div><div class='del'>-</div><div class='del'>-	/* bits which should be forced to '1' */</div><div class='del'>-	lnbp21-&gt;override_or = override_set;</div><div class='del'>-</div><div class='del'>-	/* bits which should be forced to '0' */</div><div class='del'>-	lnbp21-&gt;override_and = ~override_clear;</div><div class='del'>-</div><div class='del'>-	/* install release callback */</div><div class='del'>-	lnbp21-&gt;release_chain = fe-&gt;ops-&gt;release;</div><div class='del'>-	fe-&gt;ops-&gt;release = lnbp21_exit;</div><div class='del'>-</div><div class='del'>-	/* override frontend ops */</div><div class='del'>-	fe-&gt;ops-&gt;set_voltage = lnbp21_set_voltage;</div><div class='del'>-	fe-&gt;ops-&gt;enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;</div><div class='del'>-</div><div class='del'>-	lnbp21-&gt;i2c = i2c;</div><div class='del'>-	fe-&gt;misc_priv = lnbp21;</div><div class='del'>-</div><div class='del'>-	return lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);</div><div class='del'>-}</div><div class='add'>+/* override_set and override_clear control which system register bits (above) to always set &amp; clear */</div><div class='add'>+extern int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c<br/>index d3aea83cf218..1ef821825641 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt312.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/mt312.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> </div><div class='ctx'> struct mt312_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct mt312_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -277,12 +276,6 @@ static int mt312_initfe(struct dvb_frontend* fe)</div><div class='ctx'> 	if ((ret = mt312_writereg(state, CS_SW_LIM, 0x69)) &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		mt312_writereg(state, GPP_CTRL, 0x40);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		mt312_writereg(state, GPP_CTRL, 0x00);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -477,16 +470,16 @@ static int mt312_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s: Freq %d\n", __FUNCTION__, p-&gt;frequency);</div><div class='ctx'> </div><div class='del'>-	if ((p-&gt;frequency &lt; fe-&gt;ops-&gt;info.frequency_min)</div><div class='del'>-	    || (p-&gt;frequency &gt; fe-&gt;ops-&gt;info.frequency_max))</div><div class='add'>+	if ((p-&gt;frequency &lt; fe-&gt;ops.info.frequency_min)</div><div class='add'>+	    || (p-&gt;frequency &gt; fe-&gt;ops.info.frequency_max))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((p-&gt;inversion &lt; INVERSION_OFF)</div><div class='ctx'> 	    || (p-&gt;inversion &gt; INVERSION_ON))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if ((p-&gt;u.qpsk.symbol_rate &lt; fe-&gt;ops-&gt;info.symbol_rate_min)</div><div class='del'>-	    || (p-&gt;u.qpsk.symbol_rate &gt; fe-&gt;ops-&gt;info.symbol_rate_max))</div><div class='add'>+	if ((p-&gt;u.qpsk.symbol_rate &lt; fe-&gt;ops.info.symbol_rate_min)</div><div class='add'>+	    || (p-&gt;u.qpsk.symbol_rate &gt; fe-&gt;ops.info.symbol_rate_max))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((p-&gt;u.qpsk.fec_inner &lt; FEC_NONE)</div><div class='hunk'>@@ -529,9 +522,10 @@ static int mt312_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt312_writereg(state, GPP_CTRL, 0x40);</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	mt312_writereg(state, GPP_CTRL, 0x00);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* sr = (u16)(sr * 256.0 / 1000000.0) */</div><div class='ctx'> 	sr = mt312_div(p-&gt;u.qpsk.symbol_rate * 4, 15625);</div><div class='hunk'>@@ -578,6 +572,17 @@ static int mt312_get_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mt312_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct mt312_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return mt312_writereg(state, GPP_CTRL, 0x40);</div><div class='add'>+	} else {</div><div class='add'>+		return mt312_writereg(state, GPP_CTRL, 0x00);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mt312_sleep(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt312_state *state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -633,6 +638,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = mt312_initfe,</div><div class='ctx'> 	.sleep = mt312_sleep,</div><div class='add'>+	.i2c_gate_ctrl = mt312_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = mt312_set_frontend,</div><div class='ctx'> 	.get_frontend = mt312_get_frontend,</div><div class='hunk'>@@ -663,19 +669,22 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;vp310_mt312_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (mt312_readreg(state, ID, &amp;state-&gt;id) &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	/* create dvb_frontend */</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;vp310_mt312_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+</div><div class='ctx'> 	switch (state-&gt;id) {</div><div class='ctx'> 	case ID_VP310:</div><div class='del'>-		strcpy(state-&gt;ops.info.name, "Zarlink VP310 DVB-S");</div><div class='add'>+		strcpy(state-&gt;frontend.ops.info.name, "Zarlink VP310 DVB-S");</div><div class='ctx'> 		state-&gt;frequency = 90;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ID_MT312:</div><div class='del'>-		strcpy(state-&gt;ops.info.name, "Zarlink MT312 DVB-S");</div><div class='add'>+		strcpy(state-&gt;frontend.ops.info.name, "Zarlink MT312 DVB-S");</div><div class='ctx'> 		state-&gt;frequency = 60;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -683,9 +692,6 @@ struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='del'>-	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h<br/>index 074d844f0139..666a1bd1c244 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt312.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt312.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt312.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/mt312.h</a></div><div class='hunk'>@@ -32,10 +32,6 @@ struct mt312_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c<br/>index aaaec909ddf8..5de7376c94ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt352.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt352.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt352.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/mt352.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'> struct mt352_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	struct mt352_config config;</div><div class='hunk'>@@ -286,16 +285,25 @@ static int mt352_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> 	mt352_calc_nominal_rate(state, op-&gt;bandwidth, buf+4);</div><div class='ctx'> 	mt352_calc_input_freq(state, buf+6);</div><div class='del'>-	state-&gt;config.pll_set(fe, param, buf+8);</div><div class='ctx'> </div><div class='del'>-	mt352_write(fe, buf, sizeof(buf));</div><div class='ctx'> 	if (state-&gt;config.no_tuner) {</div><div class='del'>-		/* start decoding */</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+			if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+				fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mt352_write(fe, buf, 8);</div><div class='ctx'> 		mt352_write(fe, fsm_go, 2);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* start tuning */</div><div class='del'>-		mt352_write(fe, tuner_go, 2);</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.calc_regs) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.calc_regs(fe, param, buf+8, 5);</div><div class='add'>+			buf[8] &lt;&lt;= 1;</div><div class='add'>+			mt352_write(fe, buf, sizeof(buf));</div><div class='add'>+			mt352_write(fe, tuner_go, 2);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -541,13 +549,12 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='ctx'> 	memcpy(&amp;state-&gt;config,config,sizeof(struct mt352_config));</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;mt352_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (mt352_read_register(state, CHIP_ID) != ID_MT352) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;mt352_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/mt352.h b/drivers/media/dvb/frontends/mt352.h<br/>index 03040cd595bb..9e7ff4b8fe5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt352.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/mt352.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/mt352.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/mt352.h</a></div><div class='hunk'>@@ -49,12 +49,6 @@ struct mt352_config</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise the demodulator and PLL. Cannot be NULL */</div><div class='ctx'> 	int (*demod_init)(struct dvb_frontend* fe);</div><div class='del'>-</div><div class='del'>-	/* PLL setup - fill out the supplied 5 byte buffer with your PLL settings.</div><div class='del'>-	 * byte0: Set to pll i2c address (nonlinux; left shifted by 1)</div><div class='del'>-	 * byte1-4: PLL configuration.</div><div class='del'>-	 */</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c<br/>index 9e3535394509..87c286ee6a00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt200x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt200x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt200x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/nxt200x.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'> struct nxt200x_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct nxt200x_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -333,17 +332,17 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)</div><div class='ctx'> </div><div class='ctx'> 	dprintk("%s\n", __FUNCTION__);</div><div class='ctx'> </div><div class='del'>-	dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[0], data[1], data[2], data[3]);</div><div class='add'>+	dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]);</div><div class='ctx'> </div><div class='ctx'> 	/* if NXT2004, write directly to tuner. if NXT2002, write through NXT chip.</div><div class='ctx'> 	 * direct write is required for Philips TUV1236D and ALPS TDHU2 */</div><div class='ctx'> 	switch (state-&gt;demod_chip) {</div><div class='ctx'> 		case NXT2004:</div><div class='del'>-			if (i2c_writebytes(state, state-&gt;config-&gt;pll_address, data, 4))</div><div class='add'>+			if (i2c_writebytes(state, data[0], data+1, 4))</div><div class='ctx'> 				printk(KERN_WARNING "nxt200x: error writing to tuner\n");</div><div class='ctx'> 			/* wait until we have a lock */</div><div class='ctx'> 			while (count &lt; 20) {</div><div class='del'>-				i2c_readbytes(state, state-&gt;config-&gt;pll_address, &amp;buf, 1);</div><div class='add'>+				i2c_readbytes(state, data[0], &amp;buf, 1);</div><div class='ctx'> 				if (buf &amp; 0x40)</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				msleep(100);</div><div class='hunk'>@@ -361,10 +360,10 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)</div><div class='ctx'> 			nxt200x_writebytes(state, 0x34, &amp;buf, 1);</div><div class='ctx'> </div><div class='ctx'> 			/* write actual tuner bytes */</div><div class='del'>-			nxt200x_writebytes(state, 0x36, data, 4);</div><div class='add'>+			nxt200x_writebytes(state, 0x36, data+1, 4);</div><div class='ctx'> </div><div class='ctx'> 			/* set tuner i2c address */</div><div class='del'>-			buf = state-&gt;config-&gt;pll_address;</div><div class='add'>+			buf = data[0] &lt;&lt; 1;</div><div class='ctx'> 			nxt200x_writebytes(state, 0x35, &amp;buf, 1);</div><div class='ctx'> </div><div class='ctx'> 			/* write UC Opmode to begin transfer */</div><div class='hunk'>@@ -534,7 +533,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 					     struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct nxt200x_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-	u8 buf[4];</div><div class='add'>+	u8 buf[5];</div><div class='ctx'> </div><div class='ctx'> 	/* stop the micro first */</div><div class='ctx'> 	nxt200x_microcontroller_stop(state);</div><div class='hunk'>@@ -548,7 +547,9 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get tuning information */</div><div class='del'>-	dvb_pll_configure(state-&gt;config-&gt;pll_desc, buf, p-&gt;frequency, 0);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.calc_regs) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.calc_regs(fe, p, buf, 5);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* set additional params */</div><div class='ctx'> 	switch (p-&gt;u.vsb.modulation) {</div><div class='hunk'>@@ -895,9 +896,9 @@ static int nxt2002_init(struct dvb_frontend* fe)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = nxt2002_load_firmware(fe, fw);</div><div class='add'>+	release_firmware(fw);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk("nxt2002: Writing firmware to device failed\n");</div><div class='del'>-		release_firmware(fw);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("nxt2002: Firmware upload complete\n");</div><div class='hunk'>@@ -959,9 +960,9 @@ static int nxt2004_init(struct dvb_frontend* fe)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = nxt2004_load_firmware(fe, fw);</div><div class='add'>+	release_firmware(fw);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk("nxt2004: Writing firmware to device failed\n");</div><div class='del'>-		release_firmware(fw);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("nxt2004: Firmware upload complete\n");</div><div class='hunk'>@@ -1159,7 +1160,6 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;nxt200x_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;initialised = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* read card id */</div><div class='hunk'>@@ -1198,7 +1198,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;nxt200x_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt200x.h b/drivers/media/dvb/frontends/nxt200x.h<br/>index 1d9d70bc37ef..34d61735845b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt200x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt200x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt200x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/nxt200x.h</a></div><div class='hunk'>@@ -38,10 +38,6 @@ struct nxt200x_config</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='del'>-	/* tuner information */</div><div class='del'>-	u8 pll_address;</div><div class='del'>-	struct dvb_pll_desc *pll_desc;</div><div class='del'>-</div><div class='ctx'> 	/* used to set pll input */</div><div class='ctx'> 	int (*set_pll_input)(u8* buf, int input);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c<br/>index a16eeba0020d..d313d7dcf386 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt6000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt6000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt6000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/nxt6000.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> struct nxt6000_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct nxt6000_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -207,12 +206,6 @@ static void nxt6000_setup(struct dvb_frontend* fe)</div><div class='ctx'> 		nxt6000_writereg(state, SUB_DIAG_MODE_SEL, 0);</div><div class='ctx'> </div><div class='ctx'> 	nxt6000_writereg(state, TS_FORMAT, 0);</div><div class='del'>-</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x01);	/* open i2c bus switch */</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x00);	/* close i2c bus switch */</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nxt6000_dump_status(struct nxt6000_state *state)</div><div class='hunk'>@@ -469,9 +462,10 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	struct nxt6000_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x01);	/* open i2c bus switch */</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, param);</div><div class='del'>-	nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x00);	/* close i2c bus switch */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((result = nxt6000_set_bandwidth(state, param-&gt;u.ofdm.bandwidth)) &lt; 0)</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -532,6 +526,17 @@ static int nxt6000_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_fron</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nxt6000_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct nxt6000_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x01);</div><div class='add'>+	} else {</div><div class='add'>+		return nxt6000_writereg(state, ENABLE_TUNER_IIC, 0x00);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dvb_frontend_ops nxt6000_ops;</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,</div><div class='hunk'>@@ -546,13 +551,12 @@ struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;nxt6000_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (nxt6000_readreg(state, OFDM_MSC_REV) != NXT6000ASICDEVICE) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;nxt6000_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -584,6 +588,7 @@ static struct dvb_frontend_ops nxt6000_ops = {</div><div class='ctx'> 	.release = nxt6000_release,</div><div class='ctx'> </div><div class='ctx'> 	.init = nxt6000_init,</div><div class='add'>+	.i2c_gate_ctrl = nxt6000_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.get_tune_settings = nxt6000_fe_get_tune_settings,</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/nxt6000.h b/drivers/media/dvb/frontends/nxt6000.h<br/>index b7d9bead3002..117031d11708 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt6000.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/nxt6000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/nxt6000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/nxt6000.h</a></div><div class='hunk'>@@ -31,10 +31,6 @@ struct nxt6000_config</div><div class='ctx'> </div><div class='ctx'> 	/* should clock inversion be used? */</div><div class='ctx'> 	u8 clock_inversion:1;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c<br/>index 80e0f28127b7..d20ab30c1e83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51132.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/or51132.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51132.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/or51132.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@ static int debug;</div><div class='ctx'> struct or51132_state</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Configuration settings */</div><div class='ctx'> 	const struct or51132_config* config;</div><div class='hunk'>@@ -106,9 +105,8 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> {</div><div class='ctx'> 	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	static u8 run_buf[] = {0x7F,0x01};</div><div class='del'>-	static u8 get_ver_buf[] = {0x04,0x00,0x30,0x00,0x00};</div><div class='del'>-	u8 rec_buf[14];</div><div class='del'>-	u8 cmd_buf[14];</div><div class='add'>+	u8 rec_buf[8];</div><div class='add'>+	u8 cmd_buf[3];</div><div class='ctx'> 	u32 firmwareAsize, firmwareBsize;</div><div class='ctx'> 	int i,ret;</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +155,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> 	cmd_buf[0] = 0x10;</div><div class='ctx'> 	cmd_buf[1] = 0x10;</div><div class='ctx'> 	cmd_buf[2] = 0x00;</div><div class='del'>-	cmd_buf[3] = 0x00;</div><div class='ctx'> 	msleep(20); /* 20ms */</div><div class='ctx'> 	if ((ret = i2c_writebytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 				 cmd_buf,3))) {</div><div class='hunk'>@@ -167,8 +164,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> </div><div class='ctx'> 	cmd_buf[0] = 0x04;</div><div class='ctx'> 	cmd_buf[1] = 0x17;</div><div class='del'>-	cmd_buf[2] = 0x00;</div><div class='del'>-	cmd_buf[3] = 0x00;</div><div class='ctx'> 	msleep(20); /* 20ms */</div><div class='ctx'> 	if ((ret = i2c_writebytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 				 cmd_buf,2))) {</div><div class='hunk'>@@ -178,8 +173,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> </div><div class='ctx'> 	cmd_buf[0] = 0x00;</div><div class='ctx'> 	cmd_buf[1] = 0x00;</div><div class='del'>-	cmd_buf[2] = 0x00;</div><div class='del'>-	cmd_buf[3] = 0x00;</div><div class='ctx'> 	msleep(20); /* 20ms */</div><div class='ctx'> 	if ((ret = i2c_writebytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 				 cmd_buf,2))) {</div><div class='hunk'>@@ -189,7 +182,11 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> </div><div class='ctx'> 	for(i=0;i&lt;4;i++) {</div><div class='ctx'> 		msleep(20); /* 20ms */</div><div class='del'>-		get_ver_buf[4] = i+1;</div><div class='add'>+		/* Once upon a time, this command might have had something</div><div class='add'>+		   to do with getting the firmware version, but it's</div><div class='add'>+		   not used anymore:</div><div class='add'>+		   {0x04,0x00,0x30,0x00,i+1} */</div><div class='add'>+		/* Read 8 bytes, two bytes at a time */</div><div class='ctx'> 		if ((ret = i2c_readbytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 					&amp;rec_buf[i*2],2))) {</div><div class='ctx'> 			printk(KERN_WARNING</div><div class='hunk'>@@ -208,7 +205,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> 	cmd_buf[0] = 0x10;</div><div class='ctx'> 	cmd_buf[1] = 0x00;</div><div class='ctx'> 	cmd_buf[2] = 0x00;</div><div class='del'>-	cmd_buf[3] = 0x00;</div><div class='ctx'> 	msleep(20); /* 20ms */</div><div class='ctx'> 	if ((ret = i2c_writebytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 				 cmd_buf,3))) {</div><div class='hunk'>@@ -243,7 +239,7 @@ static int or51132_sleep(struct dvb_frontend* fe)</div><div class='ctx'> static int or51132_setmode(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-	unsigned char cmd_buf[4];</div><div class='add'>+	unsigned char cmd_buf[3];</div><div class='ctx'> </div><div class='ctx'> 	dprintk("setmode %d\n",(int)state-&gt;current_modulation);</div><div class='ctx'> 	/* set operation mode in Receiver 1 register; */</div><div class='hunk'>@@ -263,7 +259,6 @@ static int or51132_setmode(struct dvb_frontend* fe)</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("setmode:Modulation set to unsupported value\n");</div><div class='ctx'> 	};</div><div class='del'>-	cmd_buf[3] = 0x00;</div><div class='ctx'> 	if (i2c_writebytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 			   cmd_buf,3)) {</div><div class='ctx'> 		printk(KERN_WARNING "or51132: set_mode error 1\n");</div><div class='hunk'>@@ -301,7 +296,6 @@ static int or51132_setmode(struct dvb_frontend* fe)</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk("setmode: Modulation set to unsupported value\n");</div><div class='ctx'> 	};</div><div class='del'>-	cmd_buf[3] = 0x00;</div><div class='ctx'> 	msleep(20); /* 20ms */</div><div class='ctx'> 	if (i2c_writebytes(state,state-&gt;config-&gt;demod_address,</div><div class='ctx'> 			   cmd_buf,3)) {</div><div class='hunk'>@@ -313,52 +307,65 @@ static int or51132_setmode(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Some modulations use the same firmware.  This classifies modulations</div><div class='add'>+   by the firmware they use. */</div><div class='add'>+#define MOD_FWCLASS_UNKNOWN	0</div><div class='add'>+#define MOD_FWCLASS_VSB		1</div><div class='add'>+#define MOD_FWCLASS_QAM		2</div><div class='add'>+static int modulation_fw_class(fe_modulation_t modulation)</div><div class='add'>+{</div><div class='add'>+	switch(modulation) {</div><div class='add'>+	case VSB_8:</div><div class='add'>+		return MOD_FWCLASS_VSB;</div><div class='add'>+	case QAM_AUTO:</div><div class='add'>+	case QAM_64:</div><div class='add'>+	case QAM_256:</div><div class='add'>+		return MOD_FWCLASS_QAM;</div><div class='add'>+	default:</div><div class='add'>+		return MOD_FWCLASS_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 				  struct dvb_frontend_parameters *param)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 buf[4];</div><div class='ctx'> 	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	const struct firmware *fw;</div><div class='del'>-</div><div class='del'>-	/* Change only if we are actually changing the modulation */</div><div class='del'>-	if (state-&gt;current_modulation != param-&gt;u.vsb.modulation) {</div><div class='del'>-		switch(param-&gt;u.vsb.modulation) {</div><div class='del'>-		case VSB_8:</div><div class='add'>+	const char *fwname;</div><div class='add'>+	int clock_mode;</div><div class='add'>+</div><div class='add'>+	/* Upload new firmware only if we need a different one */</div><div class='add'>+	if (modulation_fw_class(state-&gt;current_modulation) !=</div><div class='add'>+	    modulation_fw_class(param-&gt;u.vsb.modulation)) {</div><div class='add'>+		switch(modulation_fw_class(param-&gt;u.vsb.modulation)) {</div><div class='add'>+		case MOD_FWCLASS_VSB:</div><div class='ctx'> 			dprintk("set_parameters VSB MODE\n");</div><div class='del'>-			printk("or51132: Waiting for firmware upload(%s)...\n",</div><div class='del'>-			       OR51132_VSB_FIRMWARE);</div><div class='del'>-			ret = request_firmware(&amp;fw, OR51132_VSB_FIRMWARE,</div><div class='del'>-					       &amp;state-&gt;i2c-&gt;dev);</div><div class='del'>-			if (ret){</div><div class='del'>-				printk(KERN_WARNING "or51132: No firmware up"</div><div class='del'>-				       "loaded(timeout or file not found?)\n");</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='add'>+			fwname = OR51132_VSB_FIRMWARE;</div><div class='add'>+</div><div class='ctx'> 			/* Set non-punctured clock for VSB */</div><div class='del'>-			state-&gt;config-&gt;set_ts_params(fe, 0);</div><div class='add'>+			clock_mode = 0;</div><div class='ctx'> 			break;</div><div class='del'>-		case QAM_AUTO:</div><div class='del'>-		case QAM_64:</div><div class='del'>-		case QAM_256:</div><div class='add'>+		case MOD_FWCLASS_QAM:</div><div class='ctx'> 			dprintk("set_parameters QAM MODE\n");</div><div class='del'>-			printk("or51132: Waiting for firmware upload(%s)...\n",</div><div class='del'>-			       OR51132_QAM_FIRMWARE);</div><div class='del'>-			ret = request_firmware(&amp;fw, OR51132_QAM_FIRMWARE,</div><div class='del'>-					       &amp;state-&gt;i2c-&gt;dev);</div><div class='del'>-			if (ret){</div><div class='del'>-				printk(KERN_WARNING "or51132: No firmware up"</div><div class='del'>-				       "loaded(timeout or file not found?)\n");</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='add'>+			fwname = OR51132_QAM_FIRMWARE;</div><div class='add'>+</div><div class='ctx'> 			/* Set punctured clock for QAM */</div><div class='del'>-			state-&gt;config-&gt;set_ts_params(fe, 1);</div><div class='add'>+			clock_mode = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk("or51132:Modulation type(%d) UNSUPPORTED\n",</div><div class='add'>+			printk("or51132: Modulation type(%d) UNSUPPORTED\n",</div><div class='ctx'> 			       param-&gt;u.vsb.modulation);</div><div class='ctx'> 			return -1;</div><div class='del'>-		};</div><div class='add'>+		}</div><div class='add'>+		printk("or51132: Waiting for firmware upload(%s)...\n",</div><div class='add'>+		       fwname);</div><div class='add'>+		ret = request_firmware(&amp;fw, fwname, &amp;state-&gt;i2c-&gt;dev);</div><div class='add'>+		if (ret) {</div><div class='add'>+			printk(KERN_WARNING "or51132: No firmware up"</div><div class='add'>+			       "loaded(timeout or file not found?)\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='ctx'> 		ret = or51132_load_firmware(fe, fw);</div><div class='ctx'> 		release_firmware(fw);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -367,18 +374,18 @@ static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk("or51132: Firmware upload complete.\n");</div><div class='del'>-</div><div class='add'>+		state-&gt;config-&gt;set_ts_params(fe, clock_mode);</div><div class='add'>+	}</div><div class='add'>+	/* Change only if we are actually changing the modulation */</div><div class='add'>+	if (state-&gt;current_modulation != param-&gt;u.vsb.modulation) {</div><div class='ctx'> 		state-&gt;current_modulation = param-&gt;u.vsb.modulation;</div><div class='ctx'> 		or51132_setmode(fe);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dvb_pll_configure(state-&gt;config-&gt;pll_desc, buf,</div><div class='del'>-			  param-&gt;frequency, 0);</div><div class='del'>-	dprintk("set_parameters tuner bytes: 0x%02x 0x%02x "</div><div class='del'>-		"0x%02x 0x%02x\n",buf[0],buf[1],buf[2],buf[3]);</div><div class='del'>-	if (i2c_writebytes(state, state-&gt;config-&gt;pll_address ,buf, 4))</div><div class='del'>-		printk(KERN_WARNING "or51132: set_parameters error "</div><div class='del'>-		       "writing to tuner\n");</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set to current mode */</div><div class='ctx'> 	or51132_setmode(fe);</div><div class='hunk'>@@ -388,6 +395,44 @@ static int or51132_set_parameters(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int or51132_get_parameters(struct dvb_frontend* fe,</div><div class='add'>+				  struct dvb_frontend_parameters *param)</div><div class='add'>+{</div><div class='add'>+	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+	u8 buf[2];</div><div class='add'>+</div><div class='add'>+	/* Receiver Status */</div><div class='add'>+	buf[0]=0x04;</div><div class='add'>+	buf[1]=0x00;</div><div class='add'>+	msleep(30); /* 30ms */</div><div class='add'>+	if (i2c_writebytes(state,state-&gt;config-&gt;demod_address,buf,2)) {</div><div class='add'>+		printk(KERN_WARNING "or51132: get_parameters write error\n");</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+	msleep(30); /* 30ms */</div><div class='add'>+	if (i2c_readbytes(state,state-&gt;config-&gt;demod_address,buf,2)) {</div><div class='add'>+		printk(KERN_WARNING "or51132: get_parameters read error\n");</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+	switch(buf[0]) {</div><div class='add'>+		case 0x06: param-&gt;u.vsb.modulation = VSB_8; break;</div><div class='add'>+		case 0x43: param-&gt;u.vsb.modulation = QAM_64; break;</div><div class='add'>+		case 0x45: param-&gt;u.vsb.modulation = QAM_256; break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_WARNING "or51132: unknown status 0x%02x\n",</div><div class='add'>+			       buf[0]);</div><div class='add'>+			return -EREMOTEIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: Read frequency from frontend, take AFC into account */</div><div class='add'>+	param-&gt;frequency = state-&gt;current_frequency;</div><div class='add'>+</div><div class='add'>+	/* FIXME: How to read inversion setting? Receiver 6 register? */</div><div class='add'>+	param-&gt;inversion = INVERSION_AUTO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int or51132_read_status(struct dvb_frontend* fe, fe_status_t* status)</div><div class='ctx'> {</div><div class='ctx'> 	struct or51132_state* state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -572,12 +617,11 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,</div><div class='ctx'> 	/* Setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;or51132_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;current_frequency = -1;</div><div class='ctx'> 	state-&gt;current_modulation = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;or51132_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -590,7 +634,7 @@ static struct dvb_frontend_ops or51132_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.info = {</div><div class='ctx'> 		.name			= "Oren OR51132 VSB/QAM Frontend",</div><div class='del'>-		.type 			= FE_ATSC,</div><div class='add'>+		.type			= FE_ATSC,</div><div class='ctx'> 		.frequency_min		= 44000000,</div><div class='ctx'> 		.frequency_max		= 958000000,</div><div class='ctx'> 		.frequency_stepsize	= 166666,</div><div class='hunk'>@@ -606,6 +650,7 @@ static struct dvb_frontend_ops or51132_ops = {</div><div class='ctx'> 	.sleep = or51132_sleep,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = or51132_set_parameters,</div><div class='add'>+	.get_frontend = or51132_get_parameters,</div><div class='ctx'> 	.get_tune_settings = or51132_get_tune_settings,</div><div class='ctx'> </div><div class='ctx'> 	.read_status = or51132_read_status,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/or51132.h b/drivers/media/dvb/frontends/or51132.h<br/>index 622cdd18381b..89658883abf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51132.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/or51132.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51132.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/or51132.h</a></div><div class='hunk'>@@ -29,8 +29,6 @@ struct or51132_config</div><div class='ctx'> {</div><div class='ctx'> 	/* The demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-	u8 pll_address;</div><div class='del'>-	struct dvb_pll_desc *pll_desc;</div><div class='ctx'> </div><div class='ctx'> 	/* Need to set device param for start_dma */</div><div class='ctx'> 	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c<br/>index 7c3aed1f546b..2bf124b53689 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51211.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/or51211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/or51211.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/or51211.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@ static u8 cmd_buf[] = {0x04,0x01,0x50,0x80,0x06}; // ATSC</div><div class='ctx'> struct or51211_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Configuration settings */</div><div class='ctx'> 	const struct or51211_config* config;</div><div class='hunk'>@@ -438,10 +437,10 @@ static int or51211_init(struct dvb_frontend* fe)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = or51211_load_firmware(fe, fw);</div><div class='add'>+		release_firmware(fw);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			printk(KERN_WARNING "or51211: Writing firmware to "</div><div class='ctx'> 			       "device failed!\n");</div><div class='del'>-			release_firmware(fw);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_INFO "or51211: Firmware upload complete.\n");</div><div class='hunk'>@@ -585,12 +584,11 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,</div><div class='ctx'> 	/* Setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;or51211_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;initialized = 0;</div><div class='ctx'> 	state-&gt;current_frequency = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;or51211_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c<br/>index d69477596921..2c2c344c4c64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/s5h1420.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/s5h1420.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> </div><div class='ctx'> struct s5h1420_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct s5h1420_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -584,7 +583,6 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	struct s5h1420_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> 	int frequency_delta;</div><div class='ctx'> 	struct dvb_frontend_tune_settings fesettings;</div><div class='del'>-	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* check if we should do a fast-tune */</div><div class='ctx'> 	memcpy(&amp;fesettings.parameters, p, sizeof(struct dvb_frontend_parameters));</div><div class='hunk'>@@ -596,10 +594,17 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	    (state-&gt;fec_inner == p-&gt;u.qpsk.fec_inner) &amp;&amp;</div><div class='ctx'> 	    (state-&gt;symbol_rate == p-&gt;u.qpsk.symbol_rate)) {</div><div class='ctx'> </div><div class='del'>-		if (state-&gt;config-&gt;pll_set) {</div><div class='del'>-			s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);</div><div class='del'>-			state-&gt;config-&gt;pll_set(fe, p, &amp;tmp);</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+			if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+		}</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.get_frequency) {</div><div class='add'>+			u32 tmp;</div><div class='add'>+			fe-&gt;ops.tuner_ops.get_frequency(fe, &amp;tmp);</div><div class='add'>+			if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 			s5h1420_setfreqoffset(state, p-&gt;frequency - tmp);</div><div class='add'>+		} else {</div><div class='add'>+			s5h1420_setfreqoffset(state, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -646,9 +651,9 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,</div><div class='ctx'> 	s5h1420_writereg(state, 0x05, s5h1420_readreg(state, 0x05) | 1);</div><div class='ctx'> </div><div class='ctx'> 	/* set tuner PLL */</div><div class='del'>-	if (state-&gt;config-&gt;pll_set) {</div><div class='del'>-		s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);</div><div class='del'>-		state-&gt;config-&gt;pll_set(fe, p, &amp;tmp);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 		s5h1420_setfreqoffset(state, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -708,6 +713,17 @@ static int s5h1420_get_tune_settings(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int s5h1420_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct s5h1420_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);</div><div class='add'>+	} else {</div><div class='add'>+		return s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) &amp; 0xfe);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int s5h1420_init (struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct s5h1420_state* state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -717,13 +733,6 @@ static int s5h1420_init (struct dvb_frontend* fe)</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> 	s5h1420_reset(state);</div><div class='ctx'> </div><div class='del'>-	/* init PLL */</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) &amp; 0xfe);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -756,7 +765,6 @@ struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;s5h1420_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;postlocked = 0;</div><div class='ctx'> 	state-&gt;fclk = 88000000;</div><div class='ctx'> 	state-&gt;tunedfreq = 0;</div><div class='hunk'>@@ -769,7 +777,7 @@ struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;s5h1420_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -800,6 +808,7 @@ static struct dvb_frontend_ops s5h1420_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = s5h1420_init,</div><div class='ctx'> 	.sleep = s5h1420_sleep,</div><div class='add'>+	.i2c_gate_ctrl = s5h1420_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = s5h1420_set_frontend,</div><div class='ctx'> 	.get_frontend = s5h1420_get_frontend,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h<br/>index 73296f13c324..4e39015fa67e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/s5h1420.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/s5h1420.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/s5h1420.h</a></div><div class='hunk'>@@ -32,10 +32,6 @@ struct s5h1420_config</div><div class='ctx'> </div><div class='ctx'> 	/* does the inversion require inversion? */</div><div class='ctx'> 	u8 invert:1;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u32* freqout);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c<br/>index 73829e647e50..d98fd5c2e13e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp8870.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp8870.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp8870.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/sp8870.c</a></div><div class='hunk'>@@ -44,8 +44,6 @@ struct sp8870_state {</div><div class='ctx'> </div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	const struct sp8870_config* config;</div><div class='ctx'> </div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -262,9 +260,10 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	sp8870_microcontroller_stop(state);</div><div class='ctx'> </div><div class='ctx'> 	// set tuner parameters</div><div class='del'>-	sp8870_writereg(state, 0x206, 0x001);</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	sp8870_writereg(state, 0x206, 0x000);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	// sample rate correction bit [23..17]</div><div class='ctx'> 	sp8870_writereg(state, 0x0319, 0x000A);</div><div class='hunk'>@@ -319,7 +318,6 @@ static int sp8870_init (struct dvb_frontend* fe)</div><div class='ctx'> 	printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE);</div><div class='ctx'> 	if (state-&gt;config-&gt;request_firmware(fe, &amp;fw, SP8870_DEFAULT_FIRMWARE)) {</div><div class='ctx'> 		printk("sp8870: no firmware upload (timeout or file not found?)\n");</div><div class='del'>-		release_firmware(fw);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -328,6 +326,7 @@ static int sp8870_init (struct dvb_frontend* fe)</div><div class='ctx'> 		release_firmware(fw);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='add'>+	release_firmware(fw);</div><div class='ctx'> 	printk("sp8870: firmware upload complete\n");</div><div class='ctx'> </div><div class='ctx'> 	/* enable TS output and interface pins */</div><div class='hunk'>@@ -349,13 +348,6 @@ static int sp8870_init (struct dvb_frontend* fe)</div><div class='ctx'> 	sp8870_writereg(state, 0x0D00, 0x010);</div><div class='ctx'> 	sp8870_writereg(state, 0x0D01, 0x000);</div><div class='ctx'> </div><div class='del'>-	/* setup PLL */</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		sp8870_writereg(state, 0x206, 0x001);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		sp8870_writereg(state, 0x206, 0x000);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -541,6 +533,17 @@ static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sp8870_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct sp8870_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return sp8870_writereg(state, 0x206, 0x001);</div><div class='add'>+	} else {</div><div class='add'>+		return sp8870_writereg(state, 0x206, 0x000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sp8870_release(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct sp8870_state* state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -561,14 +564,13 @@ struct dvb_frontend* sp8870_attach(const struct sp8870_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;sp8870_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;initialised = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (sp8870_readreg(state, 0x0200) &lt; 0) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;sp8870_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -597,6 +599,7 @@ static struct dvb_frontend_ops sp8870_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = sp8870_init,</div><div class='ctx'> 	.sleep = sp8870_sleep,</div><div class='add'>+	.i2c_gate_ctrl = sp8870_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = sp8870_set_frontend,</div><div class='ctx'> 	.get_tune_settings = sp8870_get_tune_settings,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp8870.h b/drivers/media/dvb/frontends/sp8870.h<br/>index f3b555dbc960..93afbb969d6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp8870.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp8870.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp8870.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/sp8870.h</a></div><div class='hunk'>@@ -31,10 +31,6 @@ struct sp8870_config</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='del'>-</div><div class='ctx'> 	/* request firmware for device */</div><div class='ctx'> 	int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c<br/>index eb8a602198ca..5c2f8f4e0ae5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp887x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp887x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp887x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/sp887x.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> struct sp887x_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct sp887x_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -208,15 +207,6 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware</div><div class='ctx'> 	/* bit 0x010: enable data valid signal */</div><div class='ctx'> 	sp887x_writereg(state, 0xd00, 0x010);</div><div class='ctx'> 	sp887x_writereg(state, 0x0d1, 0x000);</div><div class='del'>-</div><div class='del'>-	/* setup the PLL */</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		sp887x_writereg(state, 0x206, 0x001);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		sp887x_writereg(state, 0x206, 0x000);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk ("done.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -362,9 +352,16 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,</div><div class='ctx'> 	sp887x_microcontroller_stop(state);</div><div class='ctx'> </div><div class='ctx'> 	/* setup the PLL */</div><div class='del'>-	sp887x_writereg(state, 0x206, 0x001);</div><div class='del'>-	actual_freq = state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	sp887x_writereg(state, 0x206, 0x000);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.get_frequency) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.get_frequency(fe, &amp;actual_freq);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	} else {</div><div class='add'>+		actual_freq = p-&gt;frequency;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* read status reg in order to clear &lt;pending irqs */</div><div class='ctx'> 	sp887x_readreg(state, 0x200);</div><div class='hunk'>@@ -486,6 +483,17 @@ static int sp887x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sp887x_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct sp887x_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return sp887x_writereg(state, 0x206, 0x001);</div><div class='add'>+	} else {</div><div class='add'>+		return sp887x_writereg(state, 0x206, 0x000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int sp887x_sleep(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct sp887x_state* state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -512,9 +520,9 @@ static int sp887x_init(struct dvb_frontend* fe)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = sp887x_initial_setup(fe, fw);</div><div class='add'>+		release_firmware(fw);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			printk("sp887x: writing firmware to device failed\n");</div><div class='del'>-			release_firmware(fw);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk("sp887x: firmware upload complete\n");</div><div class='hunk'>@@ -555,14 +563,13 @@ struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;sp887x_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;initialised = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (sp887x_readreg(state, 0x0200) &lt; 0) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;sp887x_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -589,6 +596,7 @@ static struct dvb_frontend_ops sp887x_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = sp887x_init,</div><div class='ctx'> 	.sleep = sp887x_sleep,</div><div class='add'>+	.i2c_gate_ctrl = sp887x_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = sp887x_setup_frontend_parameters,</div><div class='ctx'> 	.get_tune_settings = sp887x_get_tune_settings,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/sp887x.h b/drivers/media/dvb/frontends/sp887x.h<br/>index 6a05d8f8e8cc..c44b0ebdf1e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp887x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/sp887x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/sp887x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/sp887x.h</a></div><div class='hunk'>@@ -13,12 +13,6 @@ struct sp887x_config</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-</div><div class='del'>-	/* this should return the actual frequency tuned to */</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='del'>-</div><div class='ctx'> 	/* request firmware for device */</div><div class='ctx'> 	int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c<br/>index eb15676d374f..1ca64249010c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0297.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0297.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0297.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/stv0297.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> struct stv0297_state {</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct stv0297_config *config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -68,19 +67,25 @@ static int stv0297_readreg(struct stv0297_state *state, u8 reg)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u8 b0[] = { reg };</div><div class='ctx'> 	u8 b1[] = { 0 };</div><div class='del'>-	struct i2c_msg msg[] = { {.addr = state-&gt;config-&gt;demod_address,.flags = 0,.buf = b0,.len =</div><div class='del'>-				  1},</div><div class='del'>-	{.addr = state-&gt;config-&gt;demod_address,.flags = I2C_M_RD,.buf = b1,.len = 1}</div><div class='del'>-	};</div><div class='add'>+	struct i2c_msg msg[] = { {.addr = state-&gt;config-&gt;demod_address,.flags = 0,.buf = b0,.len = 1},</div><div class='add'>+				 {.addr = state-&gt;config-&gt;demod_address,.flags = I2C_M_RD,.buf = b1,.len = 1}</div><div class='add'>+			       };</div><div class='ctx'> </div><div class='ctx'> 	// this device needs a STOP between the register and data</div><div class='del'>-	if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[0], 1)) != 1) {</div><div class='del'>-		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[1], 1)) != 1) {</div><div class='del'>-		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret);</div><div class='del'>-		return -1;</div><div class='add'>+	if (state-&gt;config-&gt;stop_during_read) {</div><div class='add'>+		if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[0], 1)) != 1) {</div><div class='add'>+			dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[1], 1)) != 1) {</div><div class='add'>+			dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if ((ret = i2c_transfer(state-&gt;i2c, msg, 2)) != 2) {</div><div class='add'>+			dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return b1[0];</div><div class='hunk'>@@ -107,13 +112,20 @@ static int stv0297_readregs(struct stv0297_state *state, u8 reg1, u8 * b, u8 len</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	// this device needs a STOP between the register and data</div><div class='del'>-	if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[0], 1)) != 1) {</div><div class='del'>-		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[1], 1)) != 1) {</div><div class='del'>-		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret);</div><div class='del'>-		return -1;</div><div class='add'>+	if (state-&gt;config-&gt;stop_during_read) {</div><div class='add'>+		if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[0], 1)) != 1) {</div><div class='add'>+			dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+		if ((ret = i2c_transfer(state-&gt;i2c, &amp;msg[1], 1)) != 1) {</div><div class='add'>+			dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if ((ret = i2c_transfer(state-&gt;i2c, msg, 2)) != 2) {</div><div class='add'>+			dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -276,12 +288,14 @@ static int stv0297_set_inversion(struct stv0297_state *state, fe_spectral_invers</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int stv0297_enable_plli2c(struct dvb_frontend *fe)</div><div class='add'>+static int stv0297_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct stv0297_state *state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	stv0297_writereg(state, 0x87, 0x78);</div><div class='del'>-	stv0297_writereg(state, 0x86, 0xc8);</div><div class='add'>+	if (enable) {</div><div class='add'>+		stv0297_writereg(state, 0x87, 0x78);</div><div class='add'>+		stv0297_writereg(state, 0x86, 0xc8);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -296,9 +310,6 @@ static int stv0297_init(struct dvb_frontend *fe)</div><div class='ctx'> 		stv0297_writereg(state, state-&gt;config-&gt;inittab[i], state-&gt;config-&gt;inittab[i+1]);</div><div class='ctx'> 	msleep(200);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init)</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -389,7 +400,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	case QAM_32:</div><div class='ctx'> 	case QAM_64:</div><div class='ctx'> 		delay = 100;</div><div class='del'>-		sweeprate = 1500;</div><div class='add'>+		sweeprate = 1000;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case QAM_128:</div><div class='hunk'>@@ -421,7 +432,10 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stv0297_init(fe);</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear software interrupts */</div><div class='ctx'> 	stv0297_writereg(state, 0x82, 0x0);</div><div class='hunk'>@@ -634,7 +648,6 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;stv0297_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;base_freq = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='hunk'>@@ -642,7 +655,7 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;stv0297_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -668,6 +681,7 @@ static struct dvb_frontend_ops stv0297_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = stv0297_init,</div><div class='ctx'> 	.sleep = stv0297_sleep,</div><div class='add'>+	.i2c_gate_ctrl = stv0297_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = stv0297_set_frontend,</div><div class='ctx'> 	.get_frontend = stv0297_get_frontend,</div><div class='hunk'>@@ -684,4 +698,3 @@ MODULE_AUTHOR("Dennis Noermann and Andrew de Quincey");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(stv0297_attach);</div><div class='del'>-EXPORT_SYMBOL(stv0297_enable_plli2c);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0297.h b/drivers/media/dvb/frontends/stv0297.h<br/>index 9e53f019db71..1da5384fb985 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0297.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0297.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0297.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/stv0297.h</a></div><div class='hunk'>@@ -38,13 +38,11 @@ struct stv0297_config</div><div class='ctx'> 	/* does the "inversion" need inverted? */</div><div class='ctx'> 	u8 invert:1;</div><div class='ctx'> </div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='add'>+	/* set to 1 if the device requires an i2c STOP during reading */</div><div class='add'>+	u8 stop_during_read:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,</div><div class='ctx'> 					   struct i2c_adapter* i2c);</div><div class='del'>-extern int stv0297_enable_plli2c(struct dvb_frontend* fe);</div><div class='ctx'> </div><div class='ctx'> #endif // STV0297_H</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c<br/>index 5bcd00f792e6..96648a75440d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0299.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0299.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0299.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/stv0299.c</a></div><div class='hunk'>@@ -56,7 +56,6 @@</div><div class='ctx'> </div><div class='ctx'> struct stv0299_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct stv0299_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -131,13 +130,6 @@ static int stv0299_readregs (struct stv0299_state* state, u8 reg1, u8 *b, u8 len</div><div class='ctx'> 	return ret == 2 ? 0 : ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int stv0299_enable_plli2c (struct dvb_frontend* fe)</div><div class='del'>-{</div><div class='del'>-	struct stv0299_state* state = fe-&gt;demodulator_priv;</div><div class='del'>-</div><div class='del'>-	return stv0299_writeregI(state, 0x05, 0xb5);	/*  enable i2c repeater on stv0299  */</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int stv0299_set_FEC (struct stv0299_state* state, fe_code_rate_t fec)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk ("%s\n", __FUNCTION__);</div><div class='hunk'>@@ -457,12 +449,6 @@ static int stv0299_init (struct dvb_frontend* fe)</div><div class='ctx'> 	for (i=0; !(state-&gt;config-&gt;inittab[i] == 0xff &amp;&amp; state-&gt;config-&gt;inittab[i+1] == 0xff); i+=2)</div><div class='ctx'> 		stv0299_writeregI(state, state-&gt;config-&gt;inittab[i], state-&gt;config-&gt;inittab[i+1]);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		stv0299_writeregI(state, 0x05, 0xb5);	/*  enable i2c repeater on stv0299  */</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe, state-&gt;i2c);</div><div class='del'>-		stv0299_writeregI(state, 0x05, 0x35);	/*  disable i2c repeater on stv0299  */</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -560,9 +546,10 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> 	if (state-&gt;config-&gt;invert) invval = (~invval) &amp; 1;</div><div class='ctx'> 	stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) &amp; 0xfe) | invval);</div><div class='ctx'> </div><div class='del'>-	stv0299_writeregI(state, 0x05, 0xb5);	/*  enable i2c repeater on stv0299  */</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, state-&gt;i2c, p);</div><div class='del'>-	stv0299_writeregI(state, 0x05, 0x35);	/*  disable i2c repeater on stv0299  */</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	stv0299_set_FEC (state, p-&gt;u.qpsk.fec_inner);</div><div class='ctx'> 	stv0299_set_symbolrate (fe, p-&gt;u.qpsk.symbol_rate);</div><div class='hunk'>@@ -611,6 +598,19 @@ static int stv0299_sleep(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int stv0299_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct stv0299_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		stv0299_writeregI(state, 0x05, 0xb5);</div><div class='add'>+	} else {</div><div class='add'>+		stv0299_writeregI(state, 0x05, 0x35);</div><div class='add'>+	}</div><div class='add'>+	udelay(1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)</div><div class='ctx'> {</div><div class='ctx'> 	struct stv0299_state* state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -647,7 +647,6 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;stv0299_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;initialised = 0;</div><div class='ctx'> 	state-&gt;tuner_frequency = 0;</div><div class='ctx'> 	state-&gt;symbol_rate = 0;</div><div class='hunk'>@@ -664,7 +663,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,</div><div class='ctx'> 	if (id != 0xa1 &amp;&amp; id != 0x80) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;stv0299_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -695,6 +694,7 @@ static struct dvb_frontend_ops stv0299_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = stv0299_init,</div><div class='ctx'> 	.sleep = stv0299_sleep,</div><div class='add'>+	.i2c_gate_ctrl = stv0299_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = stv0299_set_frontend,</div><div class='ctx'> 	.get_frontend = stv0299_get_frontend,</div><div class='hunk'>@@ -721,9 +721,8 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("ST STV0299 DVB Demodulator driver");</div><div class='ctx'> MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, "</div><div class='del'>-	      "Andreas Oberritter, Andrew de Quincey, Kenneth Aafløy");</div><div class='add'>+	      "Andreas Oberritter, Andrew de Quincey, Kenneth Aafly");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(stv0299_enable_plli2c);</div><div class='ctx'> EXPORT_SYMBOL(stv0299_writereg);</div><div class='ctx'> EXPORT_SYMBOL(stv0299_attach);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h<br/>index 32c87b4c2f13..1504828e4232 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0299.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/stv0299.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/stv0299.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/stv0299.h</a></div><div class='hunk'>@@ -87,14 +87,9 @@ struct stv0299_config</div><div class='ctx'> </div><div class='ctx'> 	/* Set the symbol rate */</div><div class='ctx'> 	int (*set_symbol_rate)(struct dvb_frontend* fe, u32 srate, u32 ratio);</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend *fe, struct i2c_adapter *i2c);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters *params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data);</div><div class='del'>-extern int stv0299_enable_plli2c (struct dvb_frontend* fe);</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,</div><div class='ctx'> 					   struct i2c_adapter* i2c);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c<br/>index 21255cac9793..9cbd164aa281 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10021.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda10021.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10021.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/tda10021.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -36,7 +35,6 @@</div><div class='ctx'> </div><div class='ctx'> struct tda10021_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct tda10021_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -90,6 +88,14 @@ static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data)</div><div class='ctx'> 	return (ret != 1) ? -EREMOTEIO : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int tda10021_write_byte(struct dvb_frontend* fe, int reg, int data)</div><div class='add'>+{</div><div class='add'>+	struct tda10021_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	return tda10021_writereg(state, reg, data);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(tda10021_write_byte);</div><div class='add'>+</div><div class='ctx'> static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u8 b0 [] = { reg };</div><div class='hunk'>@@ -225,13 +231,6 @@ static int tda10021_init (struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> 	//Activate PLL</div><div class='ctx'> 	tda10021_writereg(state, 0x2a, tda10021_inittab[0x2a] &amp; 0xef);</div><div class='del'>-</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		lock_tuner(state);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		unlock_tuner(state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -259,9 +258,10 @@ static int tda10021_set_parameters (struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> 	//printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p-&gt;frequency,qam,p-&gt;u.qam.symbol_rate);</div><div class='ctx'> </div><div class='del'>-	lock_tuner(state);</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	unlock_tuner(state);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tda10021_set_symbolrate (state, p-&gt;u.qam.symbol_rate);</div><div class='ctx'> 	tda10021_writereg (state, 0x34, state-&gt;pwm);</div><div class='hunk'>@@ -376,6 +376,18 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tda10021_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct tda10021_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		lock_tuner(state);</div><div class='add'>+	} else {</div><div class='add'>+		unlock_tuner(state);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tda10021_sleep(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct tda10021_state* state = fe-&gt;demodulator_priv;</div><div class='hunk'>@@ -407,7 +419,6 @@ struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;tda10021_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;pwm = pwm;</div><div class='ctx'> 	state-&gt;reg0 = tda10021_inittab[0];</div><div class='ctx'> </div><div class='hunk'>@@ -415,7 +426,7 @@ struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,</div><div class='ctx'> 	if ((tda10021_readreg(state, 0x1a) &amp; 0xf0) != 0x70) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;tda10021_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -448,6 +459,7 @@ static struct dvb_frontend_ops tda10021_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = tda10021_init,</div><div class='ctx'> 	.sleep = tda10021_sleep,</div><div class='add'>+	.i2c_gate_ctrl = tda10021_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = tda10021_set_parameters,</div><div class='ctx'> 	.get_frontend = tda10021_get_frontend,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda10021.h b/drivers/media/dvb/frontends/tda10021.h<br/>index 53be939e8c55..b1df4259bee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10021.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda10021.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda10021.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/tda10021.h</a></div><div class='hunk'>@@ -30,13 +30,11 @@ struct tda10021_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* tda10021_attach(const struct tda10021_config* config,</div><div class='ctx'> 					    struct i2c_adapter* i2c, u8 pwm);</div><div class='ctx'> </div><div class='add'>+extern int tda10021_write_byte(struct dvb_frontend* fe, int reg, int data);</div><div class='add'>+</div><div class='ctx'> #endif // TDA10021_H</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c<br/>index b83dafa4e12c..59a2ed614fca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda1004x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda1004x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda1004x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/tda1004x.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@ enum tda1004x_demod {</div><div class='ctx'> </div><div class='ctx'> struct tda1004x_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	const struct tda1004x_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -600,13 +599,6 @@ static int tda10045_init(struct dvb_frontend* fe)</div><div class='ctx'> </div><div class='ctx'> 	tda1004x_write_mask(state, TDA1004X_CONFADC1, 0x10, 0); // wake up the ADC</div><div class='ctx'> </div><div class='del'>-	// Init the PLL</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		tda1004x_enable_tuner_i2c(state);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		tda1004x_disable_tuner_i2c(state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	// tda setup</div><div class='ctx'> 	tda1004x_write_mask(state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer</div><div class='ctx'> 	tda1004x_write_mask(state, TDA1004X_AUTO, 8, 0); // select HP stream</div><div class='hunk'>@@ -635,16 +627,6 @@ static int tda10046_init(struct dvb_frontend* fe)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	// Init the tuner PLL</div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		tda1004x_enable_tuner_i2c(state);</div><div class='del'>-		if (state-&gt;config-&gt;pll_init(fe)) {</div><div class='del'>-			printk(KERN_ERR "tda1004x: pll init failed\n");</div><div class='del'>-			return 	-EIO;</div><div class='del'>-		}</div><div class='del'>-		tda1004x_disable_tuner_i2c(state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	// tda setup</div><div class='ctx'> 	tda1004x_write_mask(state, TDA1004X_CONFC4, 0x20, 0); // disable DSP watchdog timer</div><div class='ctx'> 	tda1004x_write_byteI(state, TDA1004X_AUTO, 0x87);    // 100 ppm crystal, select HP stream</div><div class='hunk'>@@ -712,12 +694,10 @@ static int tda1004x_set_fe(struct dvb_frontend* fe,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// set frequency</div><div class='del'>-	tda1004x_enable_tuner_i2c(state);</div><div class='del'>-	if (state-&gt;config-&gt;pll_set(fe, fe_params)) {</div><div class='del'>-		printk(KERN_ERR "tda1004x: pll set failed\n");</div><div class='del'>-		return 	-EIO;</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, fe_params);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='ctx'> 	}</div><div class='del'>-	tda1004x_disable_tuner_i2c(state);</div><div class='ctx'> </div><div class='ctx'> 	// Hardcoded to use auto as much as possible on the TDA10045 as it</div><div class='ctx'> 	// is very unreliable if AUTO mode is _not_ used.</div><div class='hunk'>@@ -1183,16 +1163,6 @@ static int tda1004x_sleep(struct dvb_frontend* fe)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case TDA1004X_DEMOD_TDA10046:</div><div class='del'>-		if (state-&gt;config-&gt;pll_sleep != NULL) {</div><div class='del'>-			tda1004x_enable_tuner_i2c(state);</div><div class='del'>-			state-&gt;config-&gt;pll_sleep(fe);</div><div class='del'>-			if (state-&gt;config-&gt;if_freq != TDA10046_FREQ_052) {</div><div class='del'>-				/* special hack for Philips EUROPA Based boards:</div><div class='del'>-				 * keep the I2c bridge open for tuner access in analog mode</div><div class='del'>-				 */</div><div class='del'>-				tda1004x_disable_tuner_i2c(state);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		/* set outputs to tristate */</div><div class='ctx'> 		tda1004x_write_byteI(state, TDA10046H_CONF_TRISTATE1, 0xff);</div><div class='ctx'> 		tda1004x_write_mask(state, TDA1004X_CONFC4, 1, 1);</div><div class='hunk'>@@ -1202,6 +1172,17 @@ static int tda1004x_sleep(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tda1004x_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct tda1004x_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return tda1004x_enable_tuner_i2c(state);</div><div class='add'>+	} else {</div><div class='add'>+		return tda1004x_disable_tuner_i2c(state);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int tda1004x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)</div><div class='ctx'> {</div><div class='ctx'> 	fesettings-&gt;min_delay_ms = 800;</div><div class='hunk'>@@ -1235,6 +1216,7 @@ static struct dvb_frontend_ops tda10045_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = tda10045_init,</div><div class='ctx'> 	.sleep = tda1004x_sleep,</div><div class='add'>+	.i2c_gate_ctrl = tda1004x_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = tda1004x_set_fe,</div><div class='ctx'> 	.get_frontend = tda1004x_get_fe,</div><div class='hunk'>@@ -1260,7 +1242,6 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;tda10045_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;demod_type = TDA1004X_DEMOD_TDA10045;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='hunk'>@@ -1270,7 +1251,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;tda10045_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> }</div><div class='hunk'>@@ -1293,6 +1274,7 @@ static struct dvb_frontend_ops tda10046_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = tda10046_init,</div><div class='ctx'> 	.sleep = tda1004x_sleep,</div><div class='add'>+	.i2c_gate_ctrl = tda1004x_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = tda1004x_set_fe,</div><div class='ctx'> 	.get_frontend = tda1004x_get_fe,</div><div class='hunk'>@@ -1318,7 +1300,6 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;tda10046_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;demod_type = TDA1004X_DEMOD_TDA10046;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='hunk'>@@ -1328,7 +1309,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;tda10046_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h<br/>index cc0c4af64067..b877b23ed734 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda1004x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda1004x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda1004x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/tda1004x.h</a></div><div class='hunk'>@@ -66,11 +66,6 @@ struct tda1004x_config</div><div class='ctx'> 	/* AGC configuration */</div><div class='ctx'> 	enum tda10046_agc agc_config;</div><div class='ctx'> </div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	void (*pll_sleep)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='del'>-</div><div class='ctx'> 	/* request firmware for device */</div><div class='ctx'> 	/* set this to NULL if the card has a firmware EEPROM */</div><div class='ctx'> 	int (*request_firmware)(struct dvb_frontend* fe, const struct firmware **fw, char* name);</div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c<br/>index 91baa9cedd79..3aa45ebbac3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda8083.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda8083.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda8083.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/tda8083.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> struct tda8083_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct tda8083_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -293,7 +292,11 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> {</div><div class='ctx'> 	struct tda8083_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	tda8083_set_inversion (state, p-&gt;inversion);</div><div class='ctx'> 	tda8083_set_fec (state, p-&gt;u.qpsk.fec_inner);</div><div class='ctx'> 	tda8083_set_symbolrate (state, p-&gt;u.qpsk.symbol_rate);</div><div class='hunk'>@@ -334,8 +337,6 @@ static int tda8083_init(struct dvb_frontend* fe)</div><div class='ctx'> 	for (i=0; i&lt;44; i++)</div><div class='ctx'> 		tda8083_writereg (state, i, tda8083_init_tab[i]);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	tda8083_writereg (state, 0x00, 0x3c);</div><div class='ctx'> 	tda8083_writereg (state, 0x00, 0x04);</div><div class='ctx'> </div><div class='hunk'>@@ -395,13 +396,12 @@ struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;tda8083_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if ((tda8083_readreg(state, 0x00)) != 0x05) goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;tda8083_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/frontends/tda8083.h b/drivers/media/dvb/frontends/tda8083.h<br/>index 466663307bf1..e7a48f61ea2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda8083.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/tda8083.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/tda8083.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/tda8083.h</a></div><div class='hunk'>@@ -33,10 +33,6 @@ struct tda8083_config</div><div class='ctx'> {</div><div class='ctx'> 	/* the demodulator's i2c address */</div><div class='ctx'> 	u8 demod_address;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c<br/>index ad8647a3c85e..9b57576bfeb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1820.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/ves1820.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -35,7 +34,6 @@</div><div class='ctx'> </div><div class='ctx'> struct ves1820_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct ves1820_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -204,9 +202,6 @@ static int ves1820_init(struct dvb_frontend* fe)</div><div class='ctx'> </div><div class='ctx'> 	ves1820_writereg(state, 0x34, state-&gt;pwm);</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init)</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +218,11 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p</div><div class='ctx'> 	if (real_qam &lt; 0 || real_qam &gt; 4)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ves1820_set_symbolrate(state, p-&gt;u.qam.symbol_rate);</div><div class='ctx'> 	ves1820_writereg(state, 0x34, state-&gt;pwm);</div><div class='ctx'> </div><div class='hunk'>@@ -380,7 +379,6 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* setup the state */</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;ves1820_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;reg0 = ves1820_inittab[0];</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='hunk'>@@ -393,12 +391,12 @@ struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,</div><div class='ctx'> 	if (verbose)</div><div class='ctx'> 		printk("ves1820: pwm=0x%02x\n", state-&gt;pwm);</div><div class='ctx'> </div><div class='del'>-	state-&gt;ops.info.symbol_rate_min = (state-&gt;config-&gt;xin / 2) / 64;      /* SACLK/64 == (XIN/2)/64 */</div><div class='del'>-	state-&gt;ops.info.symbol_rate_max = (state-&gt;config-&gt;xin / 2) / 4;       /* SACLK/4 */</div><div class='del'>-</div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;ves1820_ops, sizeof(struct dvb_frontend_ops));</div><div class='add'>+	state-&gt;frontend.ops.info.symbol_rate_min = (state-&gt;config-&gt;xin / 2) / 64;      /* SACLK/64 == (XIN/2)/64 */</div><div class='add'>+	state-&gt;frontend.ops.info.symbol_rate_max = (state-&gt;config-&gt;xin / 2) / 4;       /* SACLK/4 */</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='add'>+</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ves1820.h b/drivers/media/dvb/frontends/ves1820.h<br/>index 355f130b1be8..520f09522fbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1820.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1820.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1820.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/ves1820.h</a></div><div class='hunk'>@@ -39,10 +39,6 @@ struct ves1820_config</div><div class='ctx'> </div><div class='ctx'> 	/* SELAGC control */</div><div class='ctx'> 	u8 selagc:1;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c<br/>index 821df8e839d0..54d7b07571b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1x93.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1x93.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1x93.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/ves1x93.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> struct ves1x93_state {</div><div class='ctx'> 	struct i2c_adapter* i2c;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct ves1x93_config* config;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='hunk'>@@ -278,12 +277,6 @@ static int ves1x93_init (struct dvb_frontend* fe)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;config-&gt;pll_init) {</div><div class='del'>-		ves1x93_writereg(state, 0x00, 0x11);</div><div class='del'>-		state-&gt;config-&gt;pll_init(fe);</div><div class='del'>-		ves1x93_writereg(state, 0x00, 0x01);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -395,9 +388,10 @@ static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par</div><div class='ctx'> {</div><div class='ctx'> 	struct ves1x93_state* state = fe-&gt;demodulator_priv;</div><div class='ctx'> </div><div class='del'>-	ves1x93_writereg(state, 0x00, 0x11);</div><div class='del'>-	state-&gt;config-&gt;pll_set(fe, p);</div><div class='del'>-	ves1x93_writereg(state, 0x00, 0x01);</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.set_params(fe, p);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+	}</div><div class='ctx'> 	ves1x93_set_inversion (state, p-&gt;inversion);</div><div class='ctx'> 	ves1x93_set_fec (state, p-&gt;u.qpsk.fec_inner);</div><div class='ctx'> 	ves1x93_set_symbolrate (state, p-&gt;u.qpsk.symbol_rate);</div><div class='hunk'>@@ -442,6 +436,17 @@ static void ves1x93_release(struct dvb_frontend* fe)</div><div class='ctx'> 	kfree(state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ves1x93_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)</div><div class='add'>+{</div><div class='add'>+	struct ves1x93_state* state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		return ves1x93_writereg(state, 0x00, 0x11);</div><div class='add'>+	} else {</div><div class='add'>+		return ves1x93_writereg(state, 0x00, 0x01);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dvb_frontend_ops ves1x93_ops;</div><div class='ctx'> </div><div class='ctx'> struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,</div><div class='hunk'>@@ -457,7 +462,6 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;ves1x93_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;inversion = INVERSION_OFF;</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there + identify it */</div><div class='hunk'>@@ -492,7 +496,7 @@ struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;ves1x93_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> </div><div class='hunk'>@@ -523,6 +527,7 @@ static struct dvb_frontend_ops ves1x93_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.init = ves1x93_init,</div><div class='ctx'> 	.sleep = ves1x93_sleep,</div><div class='add'>+	.i2c_gate_ctrl = ves1x93_i2c_gate_ctrl,</div><div class='ctx'> </div><div class='ctx'> 	.set_frontend = ves1x93_set_frontend,</div><div class='ctx'> 	.get_frontend = ves1x93_get_frontend,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/ves1x93.h b/drivers/media/dvb/frontends/ves1x93.h<br/>index 1627e37c57a4..ba88ae0855c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1x93.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/ves1x93.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/ves1x93.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/ves1x93.h</a></div><div class='hunk'>@@ -38,10 +38,6 @@ struct ves1x93_config</div><div class='ctx'> </div><div class='ctx'> 	/* should PWM be inverted? */</div><div class='ctx'> 	u8 invert_pwm:1;</div><div class='del'>-</div><div class='del'>-	/* PLL maintenance */</div><div class='del'>-	int (*pll_init)(struct dvb_frontend* fe);</div><div class='del'>-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,</div><div class='head'>diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c<br/>index d7d9f59d76d2..2b95e8b6cd39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10353.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/zl10353.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10353.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/zl10353.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> struct zl10353_state {</div><div class='ctx'> 	struct i2c_adapter *i2c;</div><div class='ctx'> 	struct dvb_frontend frontend;</div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	struct zl10353_config config;</div><div class='ctx'> };</div><div class='hunk'>@@ -126,6 +125,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 				  struct dvb_frontend_parameters *param)</div><div class='ctx'> {</div><div class='ctx'> 	struct zl10353_state *state = fe-&gt;demodulator_priv;</div><div class='add'>+</div><div class='ctx'> 	u8 pllbuf[6] = { 0x67 };</div><div class='ctx'> </div><div class='ctx'> 	/* These settings set "auto-everything" and start the FSM. */</div><div class='hunk'>@@ -142,7 +142,30 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,</div><div class='ctx'> 	zl10353_single_write(fe, 0x66, 0xE9);</div><div class='ctx'> 	zl10353_single_write(fe, 0x62, 0x0A);</div><div class='ctx'> </div><div class='del'>-	state-&gt;config.pll_set(fe, param, pllbuf + 1);</div><div class='add'>+	// if there is no attached secondary tuner, we call set_params to program</div><div class='add'>+	// a potential tuner attached somewhere else</div><div class='add'>+	if (state-&gt;config.no_tuner) {</div><div class='add'>+		if (fe-&gt;ops.tuner_ops.set_params) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params(fe, param);</div><div class='add'>+			if (fe-&gt;ops.i2c_gate_ctrl) fe-&gt;ops.i2c_gate_ctrl(fe, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// if pllbuf is defined, retrieve the settings</div><div class='add'>+	if (fe-&gt;ops.tuner_ops.calc_regs) {</div><div class='add'>+		fe-&gt;ops.tuner_ops.calc_regs(fe, param, pllbuf+1, 5);</div><div class='add'>+		pllbuf[1] &lt;&lt;= 1;</div><div class='add'>+	} else {</div><div class='add'>+		// fake pllbuf settings</div><div class='add'>+		pllbuf[1] = 0x61 &lt;&lt; 1;</div><div class='add'>+		pllbuf[2] = 0;</div><div class='add'>+		pllbuf[3] = 0;</div><div class='add'>+		pllbuf[3] = 0;</div><div class='add'>+		pllbuf[4] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// there is no call to _just_ start decoding, so we send the pllbuf anyway</div><div class='add'>+	// even if there isn't a PLL attached to the secondary bus</div><div class='ctx'> 	zl10353_write(fe, pllbuf, sizeof(pllbuf));</div><div class='ctx'> </div><div class='ctx'> 	zl10353_single_write(fe, 0x70, 0x01);</div><div class='hunk'>@@ -254,14 +277,13 @@ struct dvb_frontend *zl10353_attach(const struct zl10353_config *config,</div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;i2c = i2c;</div><div class='ctx'> 	memcpy(&amp;state-&gt;config, config, sizeof(struct zl10353_config));</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;zl10353_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* check if the demod is there */</div><div class='ctx'> 	if (zl10353_read_register(state, CHIP_ID) != ID_ZL10353)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;zl10353_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> </div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='head'>diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h<br/>index 5cc4ae718d8c..9770cb840cfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10353.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/frontends/zl10353.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/frontends/zl10353.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/frontends/zl10353.h</a></div><div class='hunk'>@@ -29,10 +29,8 @@ struct zl10353_config</div><div class='ctx'> 	/* demodulator's I2C address */</div><div class='ctx'> 	u8 demod_address;</div><div class='ctx'> </div><div class='del'>-	/* function which configures the PLL buffer (for secondary I2C</div><div class='del'>-	 * connected tuner) or tunes the PLL (for direct connected tuner) */</div><div class='del'>-	int (*pll_set)(struct dvb_frontend *fe,</div><div class='del'>-		       struct dvb_frontend_parameters *params, u8 *pllbuf);</div><div class='add'>+	/* set if no pll is connected to the secondary i2c bus */</div><div class='add'>+	int no_tuner;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,</div><div class='head'>diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c<br/>index 1c5316e209ef..2310b2bfed4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/pluto2/pluto2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/pluto2/pluto2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/pluto2/pluto2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/pluto2/pluto2.c</a></div><div class='hunk'>@@ -424,8 +424,8 @@ static inline u32 divide(u32 numerator, u32 denominator)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* LG Innotek TDTE-E001P (Infineon TUA6034) */</div><div class='del'>-static int lg_tdtpe001p_pll_set(struct dvb_frontend *fe,</div><div class='del'>-				struct dvb_frontend_parameters *p)</div><div class='add'>+static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+					 struct dvb_frontend_parameters *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct pluto *pluto = frontend_to_pluto(fe);</div><div class='ctx'> 	struct i2c_msg msg;</div><div class='hunk'>@@ -473,6 +473,8 @@ static int lg_tdtpe001p_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> 	msg.buf = buf;</div><div class='ctx'> 	msg.len = sizeof(buf);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	ret = i2c_transfer(&amp;pluto-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -497,8 +499,6 @@ static struct tda1004x_config pluto2_fe_config __devinitdata = {</div><div class='ctx'> 	.xtal_freq = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config = TDA10046_AGC_DEFAULT,</div><div class='ctx'> 	.if_freq = TDA10046_FREQ_3617,</div><div class='del'>-	.pll_set = lg_tdtpe001p_pll_set,</div><div class='del'>-	.pll_sleep = NULL,</div><div class='ctx'> 	.request_firmware = pluto2_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -511,11 +511,12 @@ static int __devinit frontend_init(struct pluto *pluto)</div><div class='ctx'> 		dev_err(&amp;pluto-&gt;pdev-&gt;dev, "could not attach frontend\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='add'>+	pluto-&gt;fe-&gt;ops.tuner_ops.set_params = lg_tdtpe001p_tuner_set_params;</div><div class='ctx'> </div><div class='ctx'> 	ret = dvb_register_frontend(&amp;pluto-&gt;dvb_adapter, pluto-&gt;fe);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		if (pluto-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-			pluto-&gt;fe-&gt;ops-&gt;release(pluto-&gt;fe);</div><div class='add'>+		if (pluto-&gt;fe-&gt;ops.release)</div><div class='add'>+			pluto-&gt;fe-&gt;ops.release(pluto-&gt;fe);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -615,7 +616,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, pluto);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(pdev-&gt;irq, pluto_irq, SA_SHIRQ, DRIVER_NAME, pluto);</div><div class='add'>+	ret = request_irq(pdev-&gt;irq, pluto_irq, IRQF_SHARED, DRIVER_NAME, pluto);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_pci_iounmap;</div><div class='ctx'> </div><div class='hunk'>@@ -647,7 +648,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_pluto_hw_exit;</div><div class='ctx'> </div><div class='ctx'> 	/* dvb */</div><div class='del'>-	ret = dvb_register_adapter(&amp;pluto-&gt;dvb_adapter, DRIVER_NAME, THIS_MODULE);</div><div class='add'>+	ret = dvb_register_adapter(&amp;pluto-&gt;dvb_adapter, DRIVER_NAME, THIS_MODULE, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_i2c_bit_del_bus;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig<br/>index b5ac7dfde52f..987881fa988c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/Kconfig</a></div><div class='hunk'>@@ -10,6 +10,7 @@ config DVB_AV7110</div><div class='ctx'> 	select DVB_SP8870</div><div class='ctx'> 	select DVB_STV0297</div><div class='ctx'> 	select DVB_L64781</div><div class='add'>+	select DVB_LNBP21</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for SAA7146 and AV7110 based DVB cards as produced</div><div class='ctx'> 	  by Fujitsu-Siemens, Technotrend, Hauppauge and others.</div><div class='hunk'>@@ -67,6 +68,7 @@ config DVB_BUDGET</div><div class='ctx'> 	select DVB_TDA8083</div><div class='ctx'> 	select DVB_TDA10021</div><div class='ctx'> 	select DVB_S5H1420</div><div class='add'>+	select DVB_LNBP21</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for simple SAA7146 based DVB cards</div><div class='ctx'> 	  (so called Budget- or Nova-PCI cards) without onboard</div><div class='hunk'>@@ -84,6 +86,7 @@ config DVB_BUDGET_CI</div><div class='ctx'> 	select DVB_STV0297</div><div class='ctx'> 	select DVB_STV0299</div><div class='ctx'> 	select DVB_TDA1004X</div><div class='add'>+	select DVB_LNBP21</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for simple SAA7146 based DVB cards</div><div class='ctx'> 	  (so called Budget- or Nova-PCI cards) without onboard</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile<br/>index a690730ac39d..aa85ecdc6c80 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/Makefile</a></div><div class='hunk'>@@ -15,9 +15,9 @@ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/</div><div class='ctx'> </div><div class='ctx'> hostprogs-y	:= fdump</div><div class='ctx'> </div><div class='del'>-ifdef CONFIG_DVB_AV7110_FIRMWARE</div><div class='del'>-$(obj)/av7110.o: $(obj)/fdump $(obj)/av7110_firm.h</div><div class='add'>+ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)</div><div class='add'>+$(obj)/av7110.o: $(obj)/av7110_firm.h</div><div class='ctx'> </div><div class='del'>-$(obj)/av7110_firm.h:</div><div class='add'>+$(obj)/av7110_firm.h: $(obj)/fdump</div><div class='ctx'> 	$(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c<br/>index d028245c8eed..500f15c10aaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/av7110.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -152,13 +151,9 @@ static void init_av7110_av(struct av7110 *av7110)</div><div class='ctx'> 	/* remaining inits according to card and frontend type */</div><div class='ctx'> 	av7110-&gt;analog_tuner_flags = 0;</div><div class='ctx'> 	av7110-&gt;current_input = 0;</div><div class='del'>-	if (dev-&gt;pci-&gt;subsystem_vendor == 0x13c2 &amp;&amp; dev-&gt;pci-&gt;subsystem_device == 0x000a) {</div><div class='del'>-		printk("dvb-ttpci: MSP3415 audio DAC @ card %d\n",</div><div class='del'>-			av7110-&gt;dvb_adapter.num);</div><div class='del'>-		av7110-&gt;adac_type = DVB_ADAC_MSP34x5;</div><div class='add'>+	if (dev-&gt;pci-&gt;subsystem_vendor == 0x13c2 &amp;&amp; dev-&gt;pci-&gt;subsystem_device == 0x000a)</div><div class='ctx'> 		av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 0); // SPDIF on</div><div class='del'>-	}</div><div class='del'>-	else if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {</div><div class='add'>+	if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {</div><div class='ctx'> 		printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",</div><div class='ctx'> 			av7110-&gt;dvb_adapter.num);</div><div class='ctx'> 		av7110-&gt;adac_type = DVB_ADAC_CRYSTAL;</div><div class='hunk'>@@ -1552,7 +1547,7 @@ static int get_firmware(struct av7110* av7110)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = (struct av7110*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 pwr = 0;</div><div class='hunk'>@@ -1575,6 +1570,8 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	// NOTE: since we're using a prescaler of 2, we set the</div><div class='ctx'> 	// divisor frequency to 62.5kHz and divide by 125 above</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1584,10 +1581,9 @@ static struct ves1x93_config alps_bsrv2_config = {</div><div class='ctx'> 	.demod_address = 0x08,</div><div class='ctx'> 	.xin = 90100000UL,</div><div class='ctx'> 	.invert_pwm = 0,</div><div class='del'>-	.pll_set = alps_bsrv2_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -1601,6 +1597,8 @@ static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	data[2] = 0x85 | ((div &gt;&gt; 10) &amp; 0x60);</div><div class='ctx'> 	data[3] = (params-&gt;frequency &lt; 174000000 ? 0x88 : params-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1611,14 +1609,12 @@ static struct ves1820_config alps_tdbe2_config = {</div><div class='ctx'> 	.xin = 57840000UL,</div><div class='ctx'> 	.invert = 1,</div><div class='ctx'> 	.selagc = VES1820_SELAGC_SIGNAMPERR,</div><div class='del'>-	.pll_set = alps_tdbe2_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int grundig_29504_451_pll_set(struct dvb_frontend* fe,</div><div class='del'>-				     struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -1631,6 +1627,8 @@ static int grundig_29504_451_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='ctx'> 	data[3] = 0x00;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1638,13 +1636,11 @@ static int grundig_29504_451_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> static struct tda8083_config grundig_29504_451_config = {</div><div class='ctx'> 	.demod_address = 0x68,</div><div class='del'>-	.pll_set = grundig_29504_451_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int philips_cd1516_pll_set(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters* params)</div><div class='add'>+static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -1659,6 +1655,8 @@ static int philips_cd1516_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='ctx'> 	data[3] = (f &lt; 174000000 ? 0xa1 : f &lt; 470000000 ? 0x92 : 0x34);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1669,12 +1667,11 @@ static struct ves1820_config philips_cd1516_config = {</div><div class='ctx'> 	.xin = 57840000UL,</div><div class='ctx'> 	.invert = 1,</div><div class='ctx'> 	.selagc = VES1820_SELAGC_SIGNAMPERR,</div><div class='del'>-	.pll_set = philips_cd1516_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int alps_tdlb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div, pwr;</div><div class='hunk'>@@ -1693,6 +1690,8 @@ static int alps_tdlb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	data[2] = 0x85;</div><div class='ctx'> 	data[3] = pwr &lt;&lt; 6;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1708,7 +1707,6 @@ static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct fir</div><div class='ctx'> static struct sp8870_config alps_tdlb7_config = {</div><div class='ctx'> </div><div class='ctx'> 	.demod_address = 0x71,</div><div class='del'>-	.pll_set = alps_tdlb7_pll_set,</div><div class='ctx'> 	.request_firmware = alps_tdlb7_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1806,7 +1804,7 @@ static u8 nexusca_stv0297_inittab[] = {</div><div class='ctx'> 	0xff, 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int nexusca_stv0297_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -1832,7 +1830,8 @@ static int nexusca_stv0297_pll_set(struct dvb_frontend* fe, struct dvb_frontend_</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	stv0297_enable_plli2c(fe);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1) {</div><div class='ctx'> 		printk("nexusca: pll transfer failed!\n");</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -1840,8 +1839,8 @@ static int nexusca_stv0297_pll_set(struct dvb_frontend* fe, struct dvb_frontend_</div><div class='ctx'> </div><div class='ctx'> 	// wait for PLL lock</div><div class='ctx'> 	for(i = 0; i &lt; 20; i++) {</div><div class='del'>-</div><div class='del'>-		stv0297_enable_plli2c(fe);</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 		if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;readmsg, 1) == 1)</div><div class='ctx'> 			if (data[0] &amp; 0x40) break;</div><div class='ctx'> 		msleep(10);</div><div class='hunk'>@@ -1855,12 +1854,12 @@ static struct stv0297_config nexusca_stv0297_config = {</div><div class='ctx'> 	.demod_address = 0x1C,</div><div class='ctx'> 	.inittab = nexusca_stv0297_inittab,</div><div class='ctx'> 	.invert = 1,</div><div class='del'>-	.pll_set = nexusca_stv0297_pll_set,</div><div class='add'>+	.stop_during_read = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int grundig_29504_401_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct av7110* av7110 = (struct av7110*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -1887,13 +1886,14 @@ static int grundig_29504_401_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> 	data[2] = ((div &gt;&gt; 10) &amp; 0x60) | cfg;</div><div class='ctx'> 	data[3] = (cpump &lt;&lt; 6) | band_select;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;av7110-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct l64781_config grundig_29504_401_config = {</div><div class='ctx'> 	.demod_address = 0x55,</div><div class='del'>-	.pll_set = grundig_29504_401_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2079,6 +2079,9 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 		case 0x0000: // Fujitsu/Siemens DVB-Cable (ves1820/Philips CD1516(??))</div><div class='ctx'> 			av7110-&gt;fe = ves1820_attach(&amp;philips_cd1516_config,</div><div class='ctx'> 						    &amp;av7110-&gt;i2c_adap, read_pwm(av7110));</div><div class='add'>+			if (av7110-&gt;fe) {</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = philips_cd1516_tuner_set_params;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2091,9 +2094,10 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 			// try the ALPS BSRV2 first of all</div><div class='ctx'> 			av7110-&gt;fe = ves1x93_attach(&amp;alps_bsrv2_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;set_tone = av7110_set_tone;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.set_tone = av7110_set_tone;</div><div class='ctx'> 				av7110-&gt;recover = dvb_s_recover;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2101,9 +2105,12 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 			// try the ALPS BSRU6 now</div><div class='ctx'> 			av7110-&gt;fe = stv0299_attach(&amp;alps_bsru6_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;set_tone = av7110_set_tone;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;</div><div class='add'>+				av7110-&gt;fe-&gt;tuner_priv = &amp;av7110-&gt;i2c_adap;</div><div class='add'>+</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.set_tone = av7110_set_tone;</div><div class='ctx'> 				av7110-&gt;recover = dvb_s_recover;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2111,9 +2118,10 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 			// Try the grundig 29504-451</div><div class='ctx'> 			av7110-&gt;fe = tda8083_attach(&amp;grundig_29504_451_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;set_tone = av7110_set_tone;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.set_tone = av7110_set_tone;</div><div class='ctx'> 				av7110-&gt;recover = dvb_s_recover;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2124,11 +2132,17 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 				/* Siemens DVB-C (full-length card) VES1820/Philips CD1516 */</div><div class='ctx'> 				av7110-&gt;fe = ves1820_attach(&amp;philips_cd1516_config, &amp;av7110-&gt;i2c_adap,</div><div class='ctx'> 							read_pwm(av7110));</div><div class='add'>+				if (av7110-&gt;fe) {</div><div class='add'>+					av7110-&gt;fe-&gt;ops.tuner_ops.set_params = philips_cd1516_tuner_set_params;</div><div class='add'>+				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			case 0x0003:</div><div class='ctx'> 				/* Hauppauge DVB-C 2.1 VES1820/ALPS TDBE2 */</div><div class='ctx'> 				av7110-&gt;fe = ves1820_attach(&amp;alps_tdbe2_config, &amp;av7110-&gt;i2c_adap,</div><div class='ctx'> 							read_pwm(av7110));</div><div class='add'>+				if (av7110-&gt;fe) {</div><div class='add'>+					av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;</div><div class='add'>+				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2137,20 +2151,27 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> </div><div class='ctx'> 			// ALPS TDLB7</div><div class='ctx'> 			av7110-&gt;fe = sp8870_attach(&amp;alps_tdlb7_config, &amp;av7110-&gt;i2c_adap);</div><div class='add'>+			if (av7110-&gt;fe) {</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_tdlb7_tuner_set_params;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 0x0002: // Hauppauge/TT DVB-C premium rev2.X</div><div class='ctx'> </div><div class='ctx'> 			av7110-&gt;fe = ves1820_attach(&amp;alps_tdbe2_config, &amp;av7110-&gt;i2c_adap, read_pwm(av7110));</div><div class='add'>+			if (av7110-&gt;fe) {</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 0x0004: // Galaxis DVB-S rev1.3</div><div class='ctx'> 			/* ALPS BSRV2 */</div><div class='ctx'> 			av7110-&gt;fe = ves1x93_attach(&amp;alps_bsrv2_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;set_tone = av7110_set_tone;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.set_tone = av7110_set_tone;</div><div class='ctx'> 				av7110-&gt;recover = dvb_s_recover;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2159,9 +2180,10 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 			/* Grundig 29504-451 */</div><div class='ctx'> 			av7110-&gt;fe = tda8083_attach(&amp;grundig_29504_451_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;set_tone = av7110_set_tone;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.diseqc_send_burst = av7110_diseqc_send_burst;</div><div class='add'>+				av7110-&gt;fe-&gt;ops.set_tone = av7110_set_tone;</div><div class='ctx'> 				av7110-&gt;recover = dvb_s_recover;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2169,12 +2191,17 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 		case 0x0008: // Hauppauge/TT DVB-T</div><div class='ctx'> </div><div class='ctx'> 			av7110-&gt;fe = l64781_attach(&amp;grundig_29504_401_config, &amp;av7110-&gt;i2c_adap);</div><div class='add'>+			if (av7110-&gt;fe) {</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case 0x000A: // Hauppauge/TT Nexus-CA rev1.X</div><div class='ctx'> </div><div class='ctx'> 			av7110-&gt;fe = stv0297_attach(&amp;nexusca_stv0297_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = nexusca_stv0297_tuner_set_params;</div><div class='add'>+</div><div class='ctx'> 				/* set TDA9819 into DVB mode */</div><div class='ctx'> 				saa7146_setgpio(av7110-&gt;dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)</div><div class='ctx'> 				saa7146_setgpio(av7110-&gt;dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)</div><div class='hunk'>@@ -2189,13 +2216,16 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 			/* ALPS BSBE1 */</div><div class='ctx'> 			av7110-&gt;fe = stv0299_attach(&amp;alps_bsbe1_config, &amp;av7110-&gt;i2c_adap);</div><div class='ctx'> 			if (av7110-&gt;fe) {</div><div class='del'>-				if (lnbp21_init(av7110-&gt;fe, &amp;av7110-&gt;i2c_adap, 0, 0)) {</div><div class='add'>+				av7110-&gt;fe-&gt;ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;</div><div class='add'>+				av7110-&gt;fe-&gt;tuner_priv = &amp;av7110-&gt;i2c_adap;</div><div class='add'>+</div><div class='add'>+				if (lnbp21_attach(av7110-&gt;fe, &amp;av7110-&gt;i2c_adap, 0, 0)) {</div><div class='ctx'> 					printk("dvb-ttpci: LNBP21 not found!\n");</div><div class='del'>-					if (av7110-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-						av7110-&gt;fe-&gt;ops-&gt;release(av7110-&gt;fe);</div><div class='add'>+					if (av7110-&gt;fe-&gt;ops.release)</div><div class='add'>+						av7110-&gt;fe-&gt;ops.release(av7110-&gt;fe);</div><div class='ctx'> 					av7110-&gt;fe = NULL;</div><div class='ctx'> 				} else {</div><div class='del'>-					av7110-&gt;fe-&gt;ops-&gt;dishnetwork_send_legacy_command = NULL;</div><div class='add'>+					av7110-&gt;fe-&gt;ops.dishnetwork_send_legacy_command = NULL;</div><div class='ctx'> 					av7110-&gt;recover = dvb_s_recover;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2212,21 +2242,21 @@ static int frontend_init(struct av7110 *av7110)</div><div class='ctx'> 		       av7110-&gt;dev-&gt;pci-&gt;subsystem_vendor,</div><div class='ctx'> 		       av7110-&gt;dev-&gt;pci-&gt;subsystem_device);</div><div class='ctx'> 	} else {</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;init, av7110-&gt;fe_init, av7110_fe_init);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;read_status, av7110-&gt;fe_read_status, av7110_fe_read_status);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;diseqc_reset_overload, av7110-&gt;fe_diseqc_reset_overload, av7110_fe_diseqc_reset_overload);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;diseqc_send_master_cmd, av7110-&gt;fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;diseqc_send_burst, av7110-&gt;fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;set_tone, av7110-&gt;fe_set_tone, av7110_fe_set_tone);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;set_voltage, av7110-&gt;fe_set_voltage, av7110_fe_set_voltage;)</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;dishnetwork_send_legacy_command, av7110-&gt;fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);</div><div class='del'>-		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops-&gt;set_frontend, av7110-&gt;fe_set_frontend, av7110_fe_set_frontend);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.init, av7110-&gt;fe_init, av7110_fe_init);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.read_status, av7110-&gt;fe_read_status, av7110_fe_read_status);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.diseqc_reset_overload, av7110-&gt;fe_diseqc_reset_overload, av7110_fe_diseqc_reset_overload);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.diseqc_send_master_cmd, av7110-&gt;fe_diseqc_send_master_cmd, av7110_fe_diseqc_send_master_cmd);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.diseqc_send_burst, av7110-&gt;fe_diseqc_send_burst, av7110_fe_diseqc_send_burst);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.set_tone, av7110-&gt;fe_set_tone, av7110_fe_set_tone);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.set_voltage, av7110-&gt;fe_set_voltage, av7110_fe_set_voltage;)</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.dishnetwork_send_legacy_command, av7110-&gt;fe_dishnetwork_send_legacy_command, av7110_fe_dishnetwork_send_legacy_command);</div><div class='add'>+		FE_FUNC_OVERRIDE(av7110-&gt;fe-&gt;ops.set_frontend, av7110-&gt;fe_set_frontend, av7110_fe_set_frontend);</div><div class='ctx'> </div><div class='ctx'> 		ret = dvb_register_frontend(&amp;av7110-&gt;dvb_adapter, av7110-&gt;fe);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			printk("av7110: Frontend registration failed!\n");</div><div class='del'>-			if (av7110-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-				av7110-&gt;fe-&gt;ops-&gt;release(av7110-&gt;fe);</div><div class='add'>+			if (av7110-&gt;fe-&gt;ops.release)</div><div class='add'>+				av7110-&gt;fe-&gt;ops.release(av7110-&gt;fe);</div><div class='ctx'> 			av7110-&gt;fe = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2413,7 +2443,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,</div><div class='ctx'> 		goto err_kfree_0;</div><div class='ctx'> </div><div class='ctx'> 	ret = dvb_register_adapter(&amp;av7110-&gt;dvb_adapter, av7110-&gt;card_name,</div><div class='del'>-				   THIS_MODULE);</div><div class='add'>+				   THIS_MODULE, &amp;dev-&gt;pci-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_put_firmware_1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h<br/>index 3e2e12124bae..9c79696da08a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/av7110.h</a></div><div class='hunk'>@@ -6,10 +6,6 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEVFS_FS</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/dvb/video.h&gt;</div><div class='ctx'> #include &lt;linux/dvb/audio.h&gt;</div><div class='ctx'> #include &lt;linux/dvb/dmx.h&gt;</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c<br/>index 2eff09f638d3..0f3a044aeb17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110_av.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110_av.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110_av.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/av7110_av.c</a></div><div class='hunk'>@@ -318,7 +318,17 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright)</div><div class='ctx'> 		msp_writereg(av7110, MSP_WR_DSP, 0x0000, val); /* loudspeaker */</div><div class='ctx'> 		msp_writereg(av7110, MSP_WR_DSP, 0x0006, val); /* headphonesr */</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	case DVB_ADAC_MSP34x5:</div><div class='add'>+		vol = (volleft &gt; volright) ? volleft : volright;</div><div class='add'>+		val = (vol * 0x73 / 255) &lt;&lt; 8;</div><div class='add'>+		if (vol &gt; 0)</div><div class='add'>+			balance = ((volright - volleft) * 127) / vol;</div><div class='add'>+		msp_writereg(av7110, MSP_WR_DSP, 0x0001, balance &lt;&lt; 8);</div><div class='add'>+		msp_writereg(av7110, MSP_WR_DSP, 0x0000, val); /* loudspeaker */</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1267,23 +1277,32 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		switch(av7110-&gt;audiostate.channel_select) {</div><div class='ctx'> 		case AUDIO_STEREO:</div><div class='ctx'> 			ret = audcom(av7110, AUDIO_CMD_STEREO);</div><div class='del'>-			if (!ret)</div><div class='add'>+			if (!ret) {</div><div class='ctx'> 				if (av7110-&gt;adac_type == DVB_ADAC_CRYSTAL)</div><div class='ctx'> 					i2c_writereg(av7110, 0x20, 0x02, 0x49);</div><div class='add'>+				else if (av7110-&gt;adac_type == DVB_ADAC_MSP34x5)</div><div class='add'>+					msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AUDIO_MONO_LEFT:</div><div class='ctx'> 			ret = audcom(av7110, AUDIO_CMD_MONO_L);</div><div class='del'>-			if (!ret)</div><div class='add'>+			if (!ret) {</div><div class='ctx'> 				if (av7110-&gt;adac_type == DVB_ADAC_CRYSTAL)</div><div class='ctx'> 					i2c_writereg(av7110, 0x20, 0x02, 0x4a);</div><div class='add'>+				else if (av7110-&gt;adac_type == DVB_ADAC_MSP34x5)</div><div class='add'>+					msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0200);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case AUDIO_MONO_RIGHT:</div><div class='ctx'> 			ret = audcom(av7110, AUDIO_CMD_MONO_R);</div><div class='del'>-			if (!ret)</div><div class='add'>+			if (!ret) {</div><div class='ctx'> 				if (av7110-&gt;adac_type == DVB_ADAC_CRYSTAL)</div><div class='ctx'> 					i2c_writereg(av7110, 0x20, 0x02, 0x45);</div><div class='add'>+				else if (av7110-&gt;adac_type == DVB_ADAC_MSP34x5)</div><div class='add'>+					msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0210);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c<br/>index 603a22e4bfe2..64055461559d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110_v4l.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/av7110_v4l.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/av7110_v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/av7110_v4l.c</a></div><div class='hunk'>@@ -42,7 +42,18 @@</div><div class='ctx'> int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	u8 msg[5] = { dev, reg &gt;&gt; 8, reg &amp; 0xff, val &gt;&gt; 8 , val &amp; 0xff };</div><div class='del'>-	struct i2c_msg msgs = { .flags = 0, .addr = 0x40, .len = 5, .buf = msg };</div><div class='add'>+	struct i2c_msg msgs = { .flags = 0, .len = 5, .buf = msg };</div><div class='add'>+</div><div class='add'>+	switch (av7110-&gt;adac_type) {</div><div class='add'>+	case DVB_ADAC_MSP34x0:</div><div class='add'>+		msgs.addr = 0x40;</div><div class='add'>+		break;</div><div class='add'>+	case DVB_ADAC_MSP34x5:</div><div class='add'>+		msgs.addr = 0x42;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msgs, 1) != 1) {</div><div class='ctx'> 		dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n",</div><div class='hunk'>@@ -57,10 +68,23 @@ static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)</div><div class='ctx'> 	u8 msg1[3] = { dev, reg &gt;&gt; 8, reg &amp; 0xff };</div><div class='ctx'> 	u8 msg2[2];</div><div class='ctx'> 	struct i2c_msg msgs[2] = {</div><div class='del'>-		{ .flags = 0,	     .addr = 0x40, .len = 3, .buf = msg1 },</div><div class='del'>-		{ .flags = I2C_M_RD, .addr = 0x40, .len = 2, .buf = msg2 }</div><div class='add'>+		{ .flags = 0	   , .len = 3, .buf = msg1 },</div><div class='add'>+		{ .flags = I2C_M_RD, .len = 2, .buf = msg2 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	switch (av7110-&gt;adac_type) {</div><div class='add'>+	case DVB_ADAC_MSP34x0:</div><div class='add'>+		msgs[0].addr = 0x40;</div><div class='add'>+		msgs[1].addr = 0x40;</div><div class='add'>+		break;</div><div class='add'>+	case DVB_ADAC_MSP34x5:</div><div class='add'>+		msgs[0].addr = 0x42;</div><div class='add'>+		msgs[1].addr = 0x42;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (i2c_transfer(&amp;av7110-&gt;i2c_adap, &amp;msgs[0], 2) != 2) {</div><div class='ctx'> 		dprintk(1, "dvb-ttpci: failed @ card %d, %u\n",</div><div class='ctx'> 		       av7110-&gt;dvb_adapter.num, reg);</div><div class='hunk'>@@ -678,17 +702,23 @@ int av7110_init_analog_module(struct av7110 *av7110)</div><div class='ctx'> {</div><div class='ctx'> 	u16 version1, version2;</div><div class='ctx'> </div><div class='del'>-	if (i2c_writereg(av7110, 0x80, 0x0, 0x80) != 1</div><div class='del'>-	    || i2c_writereg(av7110, 0x80, 0x0, 0) != 1)</div><div class='add'>+	if (i2c_writereg(av7110, 0x80, 0x0, 0x80) == 1 &amp;&amp;</div><div class='add'>+	    i2c_writereg(av7110, 0x80, 0x0, 0) == 1) {</div><div class='add'>+		printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",</div><div class='add'>+			av7110-&gt;dvb_adapter.num);</div><div class='add'>+		av7110-&gt;adac_type = DVB_ADAC_MSP34x0;</div><div class='add'>+	} else if (i2c_writereg(av7110, 0x84, 0x0, 0x80) == 1 &amp;&amp;</div><div class='add'>+		   i2c_writereg(av7110, 0x84, 0x0, 0) == 1) {</div><div class='add'>+		printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3415\n",</div><div class='add'>+			av7110-&gt;dvb_adapter.num);</div><div class='add'>+		av7110-&gt;adac_type = DVB_ADAC_MSP34x5;</div><div class='add'>+	} else</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",</div><div class='del'>-		av7110-&gt;dvb_adapter.num);</div><div class='del'>-	av7110-&gt;adac_type = DVB_ADAC_MSP34x0;</div><div class='ctx'> 	msleep(100); // the probing above resets the msp...</div><div class='ctx'> 	msp_readreg(av7110, MSP_RD_DSP, 0x001e, &amp;version1);</div><div class='ctx'> 	msp_readreg(av7110, MSP_RD_DSP, 0x001f, &amp;version2);</div><div class='del'>-	dprintk(1, "dvb-ttpci: @ card %d MSP3400 version 0x%04x 0x%04x\n",</div><div class='add'>+	dprintk(1, "dvb-ttpci: @ card %d MSP34xx version 0x%04x 0x%04x\n",</div><div class='ctx'> 		av7110-&gt;dvb_adapter.num, version1, version2);</div><div class='ctx'> 	msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);</div><div class='ctx'> 	msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone</div><div class='hunk'>@@ -697,7 +727,7 @@ int av7110_init_analog_module(struct av7110 *av7110)</div><div class='ctx'> 	msp_writereg(av7110, MSP_WR_DSP, 0x0004, 0x7f00); // loudspeaker volume</div><div class='ctx'> 	msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0220); // SCART 1 source</div><div class='ctx'> 	msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0x7f00); // SCART 1 volume</div><div class='del'>-	msp_writereg(av7110, MSP_WR_DSP, 0x000d, 0x4800); // prescale SCART</div><div class='add'>+	msp_writereg(av7110, MSP_WR_DSP, 0x000d, 0x1900); // prescale SCART</div><div class='ctx'> </div><div class='ctx'> 	if (i2c_writereg(av7110, 0x48, 0x01, 0x00)!=1) {</div><div class='ctx'> 		INFO(("saa7113 not accessible.\n"));</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c<br/>index 8a7cd7d505cf..5f111d407730 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-av.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-av.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-av.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/budget-av.c</a></div><div class='hunk'>@@ -50,6 +50,12 @@</div><div class='ctx'> </div><div class='ctx'> #define DEBICICAM		0x02420000</div><div class='ctx'> </div><div class='add'>+#define SLOTSTATUS_NONE         1</div><div class='add'>+#define SLOTSTATUS_PRESENT      2</div><div class='add'>+#define SLOTSTATUS_RESET        4</div><div class='add'>+#define SLOTSTATUS_READY        8</div><div class='add'>+#define SLOTSTATUS_OCCUPIED     (SLOTSTATUS_PRESENT|SLOTSTATUS_RESET|SLOTSTATUS_READY)</div><div class='add'>+</div><div class='ctx'> struct budget_av {</div><div class='ctx'> 	struct budget budget;</div><div class='ctx'> 	struct video_device *vd;</div><div class='hunk'>@@ -58,8 +64,15 @@ struct budget_av {</div><div class='ctx'> 	struct tasklet_struct ciintf_irq_tasklet;</div><div class='ctx'> 	int slot_status;</div><div class='ctx'> 	struct dvb_ca_en50221 ca;</div><div class='add'>+	u8 reinitialise_demod:1;</div><div class='add'>+	u8 tda10021_poclkp:1;</div><div class='add'>+	u8 tda10021_ts_enabled;</div><div class='add'>+	int (*tda10021_set_frontend)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ciintf_slot_shutdown(struct dvb_ca_en50221 *ca, int slot);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* GPIO Connections:</div><div class='ctx'>  * 0 - Vcc/Reset (Reset is controlled by capacitor). Resets the frontend *AS WELL*!</div><div class='ctx'>  * 1 - CI memory select 0=&gt;IO memory, 1=&gt;Attribute Memory</div><div class='hunk'>@@ -129,9 +142,10 @@ static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int ad</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	result = ttpci_budget_debiread(&amp;budget_av-&gt;budget, DEBICICAM, address &amp; 0xfff, 1, 0, 1);</div><div class='del'>-</div><div class='del'>-	if (result == -ETIMEDOUT)</div><div class='del'>-		budget_av-&gt;slot_status = 0;</div><div class='add'>+	if (result == -ETIMEDOUT) {</div><div class='add'>+		ciintf_slot_shutdown(ca, slot);</div><div class='add'>+		printk(KERN_INFO "budget-av: cam ejected 1\n");</div><div class='add'>+	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -147,9 +161,10 @@ static int ciintf_write_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int a</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	result = ttpci_budget_debiwrite(&amp;budget_av-&gt;budget, DEBICICAM, address &amp; 0xfff, 1, value, 0, 1);</div><div class='del'>-</div><div class='del'>-	if (result == -ETIMEDOUT)</div><div class='del'>-		budget_av-&gt;slot_status = 0;</div><div class='add'>+	if (result == -ETIMEDOUT) {</div><div class='add'>+		ciintf_slot_shutdown(ca, slot);</div><div class='add'>+		printk(KERN_INFO "budget-av: cam ejected 2\n");</div><div class='add'>+	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -165,9 +180,11 @@ static int ciintf_read_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 addre</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	result = ttpci_budget_debiread(&amp;budget_av-&gt;budget, DEBICICAM, address &amp; 3, 1, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (result == -ETIMEDOUT)</div><div class='del'>-		budget_av-&gt;slot_status = 0;</div><div class='add'>+	if ((result == -ETIMEDOUT) || ((result == 0xff) &amp;&amp; ((address &amp; 3) &lt; 2))) {</div><div class='add'>+		ciintf_slot_shutdown(ca, slot);</div><div class='add'>+		printk(KERN_INFO "budget-av: cam ejected 3\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -183,9 +200,10 @@ static int ciintf_write_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 addr</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	result = ttpci_budget_debiwrite(&amp;budget_av-&gt;budget, DEBICICAM, address &amp; 3, 1, value, 0, 0);</div><div class='del'>-</div><div class='del'>-	if (result == -ETIMEDOUT)</div><div class='del'>-		budget_av-&gt;slot_status = 0;</div><div class='add'>+	if (result == -ETIMEDOUT) {</div><div class='add'>+		ciintf_slot_shutdown(ca, slot);</div><div class='add'>+		printk(KERN_INFO "budget-av: cam ejected 5\n");</div><div class='add'>+	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,12 +211,12 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_av *budget_av = (struct budget_av *) ca-&gt;data;</div><div class='ctx'> 	struct saa7146_dev *saa = budget_av-&gt;budget.dev;</div><div class='del'>-	int timeout = 50; // 5 seconds (4.4.6 Ready)</div><div class='ctx'> </div><div class='ctx'> 	if (slot != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1, "ciintf_slot_reset\n");</div><div class='add'>+	budget_av-&gt;slot_status = SLOTSTATUS_RESET;</div><div class='ctx'> </div><div class='ctx'> 	saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */</div><div class='ctx'> </div><div class='hunk'>@@ -208,20 +226,17 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)</div><div class='ctx'> 	msleep(20); /* 20 ms Vcc settling time */</div><div class='ctx'> </div><div class='ctx'> 	saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTLO); /* enable card */</div><div class='add'>+	ttpci_budget_set_video_port(saa, BUDGET_VIDEO_PORTB);</div><div class='add'>+	msleep(20);</div><div class='ctx'> </div><div class='del'>-	/* This should have been based on pin 16 READY of the pcmcia port,</div><div class='del'>-	 * but AFAICS it is not routed to the saa7146 */</div><div class='del'>-	while (--timeout &gt; 0 &amp;&amp; ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)</div><div class='del'>-		msleep(100);</div><div class='del'>-</div><div class='del'>-	/* reinitialise the frontend */</div><div class='del'>-	dvb_frontend_reinitialise(budget_av-&gt;budget.dvb_frontend);</div><div class='add'>+	/* reinitialise the frontend if necessary */</div><div class='add'>+	if (budget_av-&gt;reinitialise_demod)</div><div class='add'>+		dvb_frontend_reinitialise(budget_av-&gt;budget.dvb_frontend);</div><div class='ctx'> </div><div class='del'>-	if (timeout &lt;= 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "budget-av: cam reset failed (timeout).\n");</div><div class='del'>-		saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */</div><div class='del'>-		return -ETIMEDOUT;</div><div class='add'>+	/* set tda10021 back to original clock configuration on reset */</div><div class='add'>+	if (budget_av-&gt;tda10021_poclkp) {</div><div class='add'>+		tda10021_write_byte(budget_av-&gt;budget.dvb_frontend, 0x12, 0xa0);</div><div class='add'>+		budget_av-&gt;tda10021_ts_enabled = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -238,7 +253,13 @@ static int ciintf_slot_shutdown(struct dvb_ca_en50221 *ca, int slot)</div><div class='ctx'> 	dprintk(1, "ciintf_slot_shutdown\n");</div><div class='ctx'> </div><div class='ctx'> 	ttpci_budget_set_video_port(saa, BUDGET_VIDEO_PORTB);</div><div class='del'>-	budget_av-&gt;slot_status = 0;</div><div class='add'>+	budget_av-&gt;slot_status = SLOTSTATUS_NONE;</div><div class='add'>+</div><div class='add'>+	/* set tda10021 back to original clock configuration when cam removed */</div><div class='add'>+	if (budget_av-&gt;tda10021_poclkp) {</div><div class='add'>+		tda10021_write_byte(budget_av-&gt;budget.dvb_frontend, 0x12, 0xa0);</div><div class='add'>+		budget_av-&gt;tda10021_ts_enabled = 0;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -253,6 +274,13 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)</div><div class='ctx'> 	dprintk(1, "ciintf_slot_ts_enable: %d\n", budget_av-&gt;slot_status);</div><div class='ctx'> </div><div class='ctx'> 	ttpci_budget_set_video_port(saa, BUDGET_VIDEO_PORTA);</div><div class='add'>+</div><div class='add'>+	/* tda10021 seems to need a different TS clock config when data is routed to the CAM */</div><div class='add'>+	if (budget_av-&gt;tda10021_poclkp) {</div><div class='add'>+		tda10021_write_byte(budget_av-&gt;budget.dvb_frontend, 0x12, 0xa1);</div><div class='add'>+		budget_av-&gt;tda10021_ts_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -260,50 +288,61 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_av *budget_av = (struct budget_av *) ca-&gt;data;</div><div class='ctx'> 	struct saa7146_dev *saa = budget_av-&gt;budget.dev;</div><div class='del'>-	int cam_present = 0;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (slot != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!budget_av-&gt;slot_status)</div><div class='del'>-	{</div><div class='del'>-		// first of all test the card detect line</div><div class='add'>+	/* test the card detect line - needs to be done carefully</div><div class='add'>+	 * since it never goes high for some CAMs on this interface (e.g. topuptv) */</div><div class='add'>+	if (budget_av-&gt;slot_status == SLOTSTATUS_NONE) {</div><div class='ctx'> 		saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);</div><div class='ctx'> 		udelay(1);</div><div class='del'>-		if (saa7146_read(saa, PSR) &amp; MASK_06)</div><div class='del'>-		{</div><div class='del'>-			cam_present = 1;</div><div class='add'>+		if (saa7146_read(saa, PSR) &amp; MASK_06) {</div><div class='add'>+			if (budget_av-&gt;slot_status == SLOTSTATUS_NONE) {</div><div class='add'>+				budget_av-&gt;slot_status = SLOTSTATUS_PRESENT;</div><div class='add'>+				printk(KERN_INFO "budget-av: cam inserted A\n");</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		// that is unreliable however, so try and read from IO memory</div><div class='del'>-		if (!cam_present)</div><div class='del'>-		{</div><div class='del'>-			saa7146_setgpio(budget_av-&gt;budget.dev, 1, SAA7146_GPIO_OUTLO);</div><div class='del'>-			if (ttpci_budget_debiread(&amp;budget_av-&gt;budget, DEBICICAM, 0, 1, 0, 1) != -ETIMEDOUT)</div><div class='del'>-			{</div><div class='del'>-				cam_present = 1;</div><div class='add'>+	/* We also try and read from IO memory to work round the above detection bug. If</div><div class='add'>+	 * there is no CAM, we will get a timeout. Only done if there is no cam</div><div class='add'>+	 * present, since this test actually breaks some cams :(</div><div class='add'>+	 *</div><div class='add'>+	 * if the CI interface is not open, we also do the above test since we</div><div class='add'>+	 * don't care if the cam has problems - we'll be resetting it on open() anyway */</div><div class='add'>+	if ((budget_av-&gt;slot_status == SLOTSTATUS_NONE) || (!open)) {</div><div class='add'>+		saa7146_setgpio(budget_av-&gt;budget.dev, 1, SAA7146_GPIO_OUTLO);</div><div class='add'>+		result = ttpci_budget_debiread(&amp;budget_av-&gt;budget, DEBICICAM, 0, 1, 0, 1);</div><div class='add'>+		if ((result &gt;= 0) &amp;&amp; (budget_av-&gt;slot_status == SLOTSTATUS_NONE)) {</div><div class='add'>+			budget_av-&gt;slot_status = SLOTSTATUS_PRESENT;</div><div class='add'>+			printk(KERN_INFO "budget-av: cam inserted B\n");</div><div class='add'>+		} else if (result &lt; 0) {</div><div class='add'>+			if (budget_av-&gt;slot_status != SLOTSTATUS_NONE) {</div><div class='add'>+				ciintf_slot_shutdown(ca, slot);</div><div class='add'>+				printk(KERN_INFO "budget-av: cam ejected 5\n");</div><div class='add'>+				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		// did we find something?</div><div class='del'>-		if (cam_present) {</div><div class='del'>-			printk(KERN_INFO "budget-av: cam inserted\n");</div><div class='del'>-			budget_av-&gt;slot_status = 1;</div><div class='del'>-		}</div><div class='del'>-	} else if (!open) {</div><div class='del'>-		saa7146_setgpio(budget_av-&gt;budget.dev, 1, SAA7146_GPIO_OUTLO);</div><div class='del'>-		if (ttpci_budget_debiread(&amp;budget_av-&gt;budget, DEBICICAM, 0, 1, 0, 1) == -ETIMEDOUT)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_INFO "budget-av: cam ejected\n");</div><div class='del'>-			saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */</div><div class='del'>-			budget_av-&gt;slot_status = 0;</div><div class='add'>+	/* read from attribute memory in reset/ready state to know when the CAM is ready */</div><div class='add'>+	if (budget_av-&gt;slot_status == SLOTSTATUS_RESET) {</div><div class='add'>+		result = ciintf_read_attribute_mem(ca, slot, 0);</div><div class='add'>+		if (result == 0x1d) {</div><div class='add'>+			budget_av-&gt;slot_status = SLOTSTATUS_READY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (budget_av-&gt;slot_status == 1)</div><div class='del'>-		return DVB_CA_EN50221_POLL_CAM_PRESENT | DVB_CA_EN50221_POLL_CAM_READY;</div><div class='del'>-</div><div class='add'>+	/* work out correct return code */</div><div class='add'>+	if (budget_av-&gt;slot_status != SLOTSTATUS_NONE) {</div><div class='add'>+		if (budget_av-&gt;slot_status &amp; SLOTSTATUS_READY) {</div><div class='add'>+			return DVB_CA_EN50221_POLL_CAM_PRESENT | DVB_CA_EN50221_POLL_CAM_READY;</div><div class='add'>+		}</div><div class='add'>+		return DVB_CA_EN50221_POLL_CAM_PRESENT;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,6 +372,8 @@ static int ciintf_init(struct budget_av *budget_av)</div><div class='ctx'> 	budget_av-&gt;ca.slot_ts_enable = ciintf_slot_ts_enable;</div><div class='ctx'> 	budget_av-&gt;ca.poll_slot_status = ciintf_poll_slot_status;</div><div class='ctx'> 	budget_av-&gt;ca.data = budget_av;</div><div class='add'>+	budget_av-&gt;budget.ci_present = 1;</div><div class='add'>+	budget_av-&gt;slot_status = SLOTSTATUS_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if ((result = dvb_ca_en50221_init(&amp;budget_av-&gt;budget.dvb_adapter,</div><div class='ctx'> 					  &amp;budget_av-&gt;ca, 0, 1)) != 0) {</div><div class='hunk'>@@ -341,7 +382,6 @@ static int ciintf_init(struct budget_av *budget_av)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "budget-av: ci interface initialised.\n");</div><div class='del'>-	budget_av-&gt;budget.ci_present = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -472,12 +512,12 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,</div><div class='del'>-					struct i2c_adapter *i2c,</div><div class='del'>-					struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+						 struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 buf[4];</div><div class='add'>+	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='ctx'> </div><div class='ctx'> 	if ((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='hunk'>@@ -501,7 +541,9 @@ static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> 	else if (params-&gt;frequency &lt; 2150000)</div><div class='ctx'> 		buf[3] |= 0xC0;</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -509,9 +551,8 @@ static int philips_su1278_ty_ci_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> #define MIN2(a,b) ((a) &lt; (b) ? (a) : (b))</div><div class='ctx'> #define MIN3(a,b,c) MIN2(MIN2(a,b),c)</div><div class='ctx'> </div><div class='del'>-static int philips_su1278sh2_tua6100_pll_set(struct dvb_frontend *fe,</div><div class='del'>-					struct i2c_adapter *i2c,</div><div class='del'>-					struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_su1278sh2_tua6100_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+						      struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reg0 [2] = { 0x00, 0x00 };</div><div class='ctx'> 	u8 reg1 [4] = { 0x01, 0x00, 0x00, 0x00 };</div><div class='hunk'>@@ -521,6 +562,7 @@ static int philips_su1278sh2_tua6100_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> 	int R, A, N, P, M;</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = NULL,.len = 0 };</div><div class='ctx'> 	int freq = params-&gt;frequency;</div><div class='add'>+	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	first_ZF = (freq) / 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -620,21 +662,25 @@ static int philips_su1278sh2_tua6100_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> 	reg0[1] |= 0x03;</div><div class='ctx'> </div><div class='ctx'> 	/* already enabled - do not reenable i2c repeater or TX fails */</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	msg.buf = reg0;</div><div class='ctx'> 	msg.len = sizeof(reg0);</div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	stv0299_enable_plli2c(fe);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	msg.buf = reg1;</div><div class='ctx'> 	msg.len = sizeof(reg1);</div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	stv0299_enable_plli2c(fe);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	msg.buf = reg2;</div><div class='ctx'> 	msg.len = sizeof(reg2);</div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -692,7 +738,6 @@ static struct stv0299_config typhoon_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP0,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,</div><div class='del'>-	.pll_set = philips_su1278_ty_ci_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -706,7 +751,6 @@ static struct stv0299_config cinergy_1200s_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP0,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,</div><div class='del'>-	.pll_set = philips_su1278_ty_ci_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct stv0299_config cinergy_1200s_1894_0010_config = {</div><div class='hunk'>@@ -719,10 +763,9 @@ static struct stv0299_config cinergy_1200s_1894_0010_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP0,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,</div><div class='del'>-	.pll_set = philips_su1278sh2_tua6100_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int philips_cu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='hunk'>@@ -738,6 +781,8 @@ static int philips_cu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_p</div><div class='ctx'> 	buf[3] = (params-&gt;frequency &lt; 150000000 ? 0x01 :</div><div class='ctx'> 		  params-&gt;frequency &lt; 445000000 ? 0x02 : 0x04);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -745,19 +790,20 @@ static int philips_cu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_p</div><div class='ctx'> </div><div class='ctx'> static struct tda10021_config philips_cu1216_config = {</div><div class='ctx'> 	.demod_address = 0x0c,</div><div class='del'>-	.pll_set = philips_cu1216_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_pll_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tu1216_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };</div><div class='ctx'> </div><div class='ctx'> 	// setup PLL configuration</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -765,7 +811,7 @@ static int philips_tu1216_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='hunk'>@@ -839,6 +885,8 @@ static int philips_tu1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_p</div><div class='ctx'> 	tuner_buf[2] = 0xca;</div><div class='ctx'> 	tuner_buf[3] = (cp &lt;&lt; 5) | (filter &lt;&lt; 3) | band;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -862,9 +910,6 @@ static struct tda1004x_config philips_tu1216_config = {</div><div class='ctx'> 	.xtal_freq = TDA10046_XTAL_4M,</div><div class='ctx'> 	.agc_config = TDA10046_AGC_DEFAULT,</div><div class='ctx'> 	.if_freq = TDA10046_FREQ_3617,</div><div class='del'>-	.pll_init = philips_tu1216_pll_init,</div><div class='del'>-	.pll_set = philips_tu1216_pll_set,</div><div class='del'>-	.pll_sleep = NULL,</div><div class='ctx'> 	.request_firmware = philips_tu1216_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -911,13 +956,13 @@ static u8 philips_sd1878_inittab[] = {</div><div class='ctx'> 	0xff, 0xff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int philips_sd1878_tda8261_pll_set(struct dvb_frontend *fe,</div><div class='del'>-		struct i2c_adapter *i2c,</div><div class='del'>-		struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_sd1878_tda8261_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+						   struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	u8              buf[4];</div><div class='ctx'> 	int             rc;</div><div class='ctx'> 	struct i2c_msg  tuner_msg = {.addr=0x60,.flags=0,.buf=buf,.len=sizeof(buf)};</div><div class='add'>+	struct budget *budget = (struct budget *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if((params-&gt;frequency &lt; 950000) || (params-&gt;frequency &gt; 2150000))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -926,7 +971,9 @@ static int philips_sd1878_tda8261_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> 			params-&gt;frequency, 0);</div><div class='ctx'> 	if(rc &lt; 0) return rc;</div><div class='ctx'> </div><div class='del'>-	if(i2c_transfer(i2c, &amp;tuner_msg, 1) != 1)</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if(i2c_transfer(&amp;budget-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'>     return 0;</div><div class='hunk'>@@ -969,7 +1016,7 @@ static int philips_sd1878_ci_set_symbol_rate(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> static struct stv0299_config philips_sd1878_config = {</div><div class='ctx'> 	.demod_address = 0x68,</div><div class='del'>-	.inittab = philips_sd1878_inittab,</div><div class='add'>+     .inittab = philips_sd1878_inittab,</div><div class='ctx'> 	.mclk = 88000000UL,</div><div class='ctx'> 	.invert = 0,</div><div class='ctx'> 	.skip_reinit = 0,</div><div class='hunk'>@@ -977,7 +1024,6 @@ static struct stv0299_config philips_sd1878_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP0,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = philips_sd1878_ci_set_symbol_rate,</div><div class='del'>-	.pll_set = philips_sd1878_tda8261_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 read_pwm(struct budget_av *budget_av)</div><div class='hunk'>@@ -1003,6 +1049,7 @@ static u8 read_pwm(struct budget_av *budget_av)</div><div class='ctx'> </div><div class='ctx'> #define SUBID_DVBS_TV_STAR	0x0014</div><div class='ctx'> #define SUBID_DVBS_TV_STAR_CI	0x0016</div><div class='add'>+#define SUBID_DVBS_EASYWATCH_1  0x001a</div><div class='ctx'> #define SUBID_DVBS_EASYWATCH	0x001e</div><div class='ctx'> #define SUBID_DVBC_KNC1		0x0020</div><div class='ctx'> #define SUBID_DVBC_KNC1_PLUS	0x0021</div><div class='hunk'>@@ -1012,17 +1059,36 @@ static u8 read_pwm(struct budget_av *budget_av)</div><div class='ctx'> #define SUBID_DVBT_KNC1		0x0030</div><div class='ctx'> #define SUBID_DVBT_CINERGY1200	0x1157</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int tda10021_set_frontend(struct dvb_frontend *fe,</div><div class='add'>+				 struct dvb_frontend_parameters *p)</div><div class='add'>+{</div><div class='add'>+	struct budget_av* budget_av = fe-&gt;dvb-&gt;priv;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	result = budget_av-&gt;tda10021_set_frontend(fe, p);</div><div class='add'>+	if (budget_av-&gt;tda10021_ts_enabled) {</div><div class='add'>+		tda10021_write_byte(budget_av-&gt;budget.dvb_frontend, 0x12, 0xa1);</div><div class='add'>+	} else {</div><div class='add'>+		tda10021_write_byte(budget_av-&gt;budget.dvb_frontend, 0x12, 0xa0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void frontend_init(struct budget_av *budget_av)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7146_dev * saa = budget_av-&gt;budget.dev;</div><div class='ctx'> 	struct dvb_frontend * fe = NULL;</div><div class='ctx'> </div><div class='add'>+	/* Enable / PowerON Frontend */</div><div class='add'>+	saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);</div><div class='add'>+</div><div class='add'>+	/* additional setup necessary for the PLUS cards */</div><div class='ctx'> 	switch (saa-&gt;pci-&gt;subsystem_device) {</div><div class='ctx'> 		case SUBID_DVBS_KNC1_PLUS:</div><div class='ctx'> 		case SUBID_DVBC_KNC1_PLUS:</div><div class='ctx'> 		case SUBID_DVBT_KNC1_PLUS:</div><div class='del'>-			// Enable / PowerON Frontend</div><div class='del'>-			saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);</div><div class='ctx'> 			saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTHI);</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1030,12 +1096,19 @@ static void frontend_init(struct budget_av *budget_av)</div><div class='ctx'> 	switch (saa-&gt;pci-&gt;subsystem_device) {</div><div class='ctx'> </div><div class='ctx'> 	case SUBID_DVBS_KNC1:</div><div class='add'>+	case SUBID_DVBS_EASYWATCH_1:</div><div class='ctx'> 		if (saa-&gt;pci-&gt;subsystem_vendor == 0x1894) {</div><div class='ctx'> 			fe = stv0299_attach(&amp;cinergy_1200s_1894_0010_config,</div><div class='ctx'> 					     &amp;budget_av-&gt;budget.i2c_adap);</div><div class='add'>+			if (fe) {</div><div class='add'>+				fe-&gt;ops.tuner_ops.set_params = philips_su1278sh2_tua6100_tuner_set_params;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fe = stv0299_attach(&amp;typhoon_config,</div><div class='ctx'> 					     &amp;budget_av-&gt;budget.i2c_adap);</div><div class='add'>+			if (fe) {</div><div class='add'>+				fe-&gt;ops.tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1045,41 +1118,62 @@ static void frontend_init(struct budget_av *budget_av)</div><div class='ctx'> 	case SUBID_DVBS_EASYWATCH:</div><div class='ctx'> 		fe = stv0299_attach(&amp;philips_sd1878_config,</div><div class='ctx'> 				&amp;budget_av-&gt;budget.i2c_adap);</div><div class='add'>+		if (fe) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params = philips_sd1878_tda8261_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SUBID_DVBS_KNC1_PLUS:</div><div class='ctx'> 	case SUBID_DVBS_TYPHOON:</div><div class='ctx'> 		fe = stv0299_attach(&amp;typhoon_config,</div><div class='ctx'> 				    &amp;budget_av-&gt;budget.i2c_adap);</div><div class='add'>+		if (fe) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SUBID_DVBS_CINERGY1200:</div><div class='ctx'> 		fe = stv0299_attach(&amp;cinergy_1200s_config,</div><div class='ctx'> 				    &amp;budget_av-&gt;budget.i2c_adap);</div><div class='add'>+		if (fe) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params = philips_su1278_ty_ci_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SUBID_DVBC_KNC1:</div><div class='del'>-	case SUBID_DVBC_KNC1_PLUS:</div><div class='add'>+		budget_av-&gt;reinitialise_demod = 1;</div><div class='ctx'> 		fe = tda10021_attach(&amp;philips_cu1216_config,</div><div class='ctx'> 				     &amp;budget_av-&gt;budget.i2c_adap,</div><div class='ctx'> 				     read_pwm(budget_av));</div><div class='add'>+		if (fe) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case SUBID_DVBT_KNC1:</div><div class='del'>-	case SUBID_DVBT_KNC1_PLUS:</div><div class='del'>-		fe = tda10046_attach(&amp;philips_tu1216_config,</div><div class='del'>-				     &amp;budget_av-&gt;budget.i2c_adap);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='add'>+	case SUBID_DVBC_KNC1_PLUS:</div><div class='ctx'> 	case SUBID_DVBC_CINERGY1200:</div><div class='add'>+		budget_av-&gt;reinitialise_demod = 1;</div><div class='ctx'> 		fe = tda10021_attach(&amp;philips_cu1216_config,</div><div class='ctx'> 				     &amp;budget_av-&gt;budget.i2c_adap,</div><div class='ctx'> 				     read_pwm(budget_av));</div><div class='add'>+		if (fe) {</div><div class='add'>+			budget_av-&gt;tda10021_poclkp = 1;</div><div class='add'>+			budget_av-&gt;tda10021_set_frontend = fe-&gt;ops.set_frontend;</div><div class='add'>+			fe-&gt;ops.set_frontend = tda10021_set_frontend;</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case SUBID_DVBT_KNC1:</div><div class='add'>+	case SUBID_DVBT_KNC1_PLUS:</div><div class='ctx'> 	case SUBID_DVBT_CINERGY1200:</div><div class='add'>+		budget_av-&gt;reinitialise_demod = 1;</div><div class='ctx'> 		fe = tda10046_attach(&amp;philips_tu1216_config,</div><div class='ctx'> 				     &amp;budget_av-&gt;budget.i2c_adap);</div><div class='add'>+		if (fe) {</div><div class='add'>+			fe-&gt;ops.tuner_ops.init = philips_tu1216_tuner_init;</div><div class='add'>+			fe-&gt;ops.tuner_ops.set_params = philips_tu1216_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1098,8 +1192,8 @@ static void frontend_init(struct budget_av *budget_av)</div><div class='ctx'> 	if (dvb_register_frontend(&amp;budget_av-&gt;budget.dvb_adapter,</div><div class='ctx'> 				  budget_av-&gt;budget.dvb_frontend)) {</div><div class='ctx'> 		printk(KERN_ERR "budget-av: Frontend registration failed!\n");</div><div class='del'>-		if (budget_av-&gt;budget.dvb_frontend-&gt;ops-&gt;release)</div><div class='del'>-			budget_av-&gt;budget.dvb_frontend-&gt;ops-&gt;release(budget_av-&gt;budget.dvb_frontend);</div><div class='add'>+		if (budget_av-&gt;budget.dvb_frontend-&gt;ops.release)</div><div class='add'>+			budget_av-&gt;budget.dvb_frontend-&gt;ops.release(budget_av-&gt;budget.dvb_frontend);</div><div class='ctx'> 		budget_av-&gt;budget.dvb_frontend = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1208,11 +1302,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio</div><div class='ctx'> </div><div class='ctx'> 	budget_av-&gt;budget.dvb_adapter.priv = budget_av;</div><div class='ctx'> 	frontend_init(budget_av);</div><div class='del'>-</div><div class='del'>-	if (!budget_av-&gt;has_saa7113) {</div><div class='del'>-		ciintf_init(budget_av);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	ciintf_init(budget_av);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1293,6 +1383,7 @@ MAKE_BUDGET_INFO(knc1c, "KNC1 DVB-C", BUDGET_KNC1C);</div><div class='ctx'> MAKE_BUDGET_INFO(knc1t, "KNC1 DVB-T", BUDGET_KNC1T);</div><div class='ctx'> MAKE_BUDGET_INFO(kncxs, "KNC TV STAR DVB-S", BUDGET_TVSTAR);</div><div class='ctx'> MAKE_BUDGET_INFO(satewpls, "Satelco EasyWatch DVB-S light", BUDGET_TVSTAR);</div><div class='add'>+MAKE_BUDGET_INFO(satewpls1, "Satelco EasyWatch DVB-S light", BUDGET_KNC1S);</div><div class='ctx'> MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);</div><div class='ctx'> MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP);</div><div class='ctx'> MAKE_BUDGET_INFO(knc1tp, "KNC1 DVB-T Plus", BUDGET_KNC1TP);</div><div class='hunk'>@@ -1309,6 +1400,7 @@ static struct pci_device_id pci_tbl[] = {</div><div class='ctx'> 	MAKE_EXTENSION_PCI(kncxs, 0x1894, 0x0014),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(kncxs, 0x1894, 0x0016),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(satewpls, 0x1894, 0x001e),</div><div class='add'>+	MAKE_EXTENSION_PCI(satewpls1, 0x1894, 0x001a),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021),</div><div class='ctx'> 	MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030),</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c<br/>index e64a609cf4ff..4b966eea3834 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-ci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-ci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-ci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/budget-ci.c</a></div><div class='hunk'>@@ -620,10 +620,10 @@ static int philips_su1278_tt_set_symbol_rate(struct dvb_frontend *fe, u32 srate,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_su1278_tt_pll_set(struct dvb_frontend *fe,</div><div class='del'>-				     struct i2c_adapter *i2c,</div><div class='del'>-				     struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+					   struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='add'>+	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='ctx'> 	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };</div><div class='hunk'>@@ -649,7 +649,9 @@ static int philips_su1278_tt_pll_set(struct dvb_frontend *fe,</div><div class='ctx'> 	else if (params-&gt;frequency &lt; 2150000)</div><div class='ctx'> 		buf[3] |= 0xC0;</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -665,12 +667,11 @@ static struct stv0299_config philips_su1278_tt_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='ctx'> 	.min_delay_ms = 50,</div><div class='ctx'> 	.set_symbol_rate = philips_su1278_tt_set_symbol_rate,</div><div class='del'>-	.pll_set = philips_su1278_tt_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int philips_tdm1316l_pll_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab };</div><div class='hunk'>@@ -679,6 +680,8 @@ static int philips_tdm1316l_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 			sizeof(td1316_init) };</div><div class='ctx'> </div><div class='ctx'> 	// setup PLL configuration</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -687,14 +690,18 @@ static int philips_tdm1316l_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 	tuner_msg.addr = 0x65;</div><div class='ctx'> 	tuner_msg.buf = disable_mc44BC374c;</div><div class='ctx'> 	tuner_msg.len = sizeof(disable_mc44BC374c);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;tuner_msg, 1) != 1) {</div><div class='add'>+		if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 		i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;tuner_msg, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tdm1316l_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='hunk'>@@ -770,6 +777,8 @@ static int philips_tdm1316l_pll_set(struct dvb_frontend *fe, struct dvb_frontend</div><div class='ctx'> 	tuner_buf[2] = 0xca;</div><div class='ctx'> 	tuner_buf[3] = (cp &lt;&lt; 5) | (filter &lt;&lt; 3) | band;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -793,13 +802,10 @@ static struct tda1004x_config philips_tdm1316l_config = {</div><div class='ctx'> 	.xtal_freq = TDA10046_XTAL_4M,</div><div class='ctx'> 	.agc_config = TDA10046_AGC_DEFAULT,</div><div class='ctx'> 	.if_freq = TDA10046_FREQ_3617,</div><div class='del'>-	.pll_init = philips_tdm1316l_pll_init,</div><div class='del'>-	.pll_set = philips_tdm1316l_pll_set,</div><div class='del'>-	.pll_sleep = NULL,</div><div class='ctx'> 	.request_firmware = philips_tdm1316l_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int dvbc_philips_tdm1316l_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_ci *budget_ci = (struct budget_ci *) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[5];</div><div class='hunk'>@@ -857,13 +863,15 @@ static int dvbc_philips_tdm1316l_pll_set(struct dvb_frontend *fe, struct dvb_fro</div><div class='ctx'> 	tuner_buf[3] = (cp &lt;&lt; 5) | (filter &lt;&lt; 3) | band;</div><div class='ctx'> 	tuner_buf[4] = 0x80;</div><div class='ctx'> </div><div class='del'>-	stv0297_enable_plli2c(fe);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	msleep(50);</div><div class='ctx'> </div><div class='del'>-	stv0297_enable_plli2c(fe);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;budget_ci-&gt;budget.i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -969,7 +977,7 @@ static struct stv0297_config dvbc_philips_tdm1316l_config = {</div><div class='ctx'> 	.demod_address = 0x1c,</div><div class='ctx'> 	.inittab = dvbc_philips_tdm1316l_inittab,</div><div class='ctx'> 	.invert = 0,</div><div class='del'>-	.pll_set = dvbc_philips_tdm1316l_pll_set,</div><div class='add'>+	.stop_during_read = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -982,6 +990,8 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		budget_ci-&gt;budget.dvb_frontend =</div><div class='ctx'> 			stv0299_attach(&amp;alps_bsru6_config, &amp;budget_ci-&gt;budget.i2c_adap);</div><div class='ctx'> 		if (budget_ci-&gt;budget.dvb_frontend) {</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;tuner_priv = &amp;budget_ci-&gt;budget.i2c_adap;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -990,6 +1000,7 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		budget_ci-&gt;budget.dvb_frontend =</div><div class='ctx'> 			stv0299_attach(&amp;philips_su1278_tt_config, &amp;budget_ci-&gt;budget.i2c_adap);</div><div class='ctx'> 		if (budget_ci-&gt;budget.dvb_frontend) {</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.set_params = philips_su1278_tt_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -999,6 +1010,7 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		budget_ci-&gt;budget.dvb_frontend =</div><div class='ctx'> 			stv0297_attach(&amp;dvbc_philips_tdm1316l_config, &amp;budget_ci-&gt;budget.i2c_adap);</div><div class='ctx'> 		if (budget_ci-&gt;budget.dvb_frontend) {</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.set_params = dvbc_philips_tdm1316l_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1008,6 +1020,8 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		budget_ci-&gt;budget.dvb_frontend =</div><div class='ctx'> 			tda10045_attach(&amp;philips_tdm1316l_config, &amp;budget_ci-&gt;budget.i2c_adap);</div><div class='ctx'> 		if (budget_ci-&gt;budget.dvb_frontend) {</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.init = philips_tdm1316l_tuner_init;</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1017,6 +1031,8 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		budget_ci-&gt;budget.dvb_frontend =</div><div class='ctx'> 			tda10046_attach(&amp;philips_tdm1316l_config, &amp;budget_ci-&gt;budget.i2c_adap);</div><div class='ctx'> 		if (budget_ci-&gt;budget.dvb_frontend) {</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.init = philips_tdm1316l_tuner_init;</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1024,11 +1040,14 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 	case 0x1017:		// TT S-1500 PCI</div><div class='ctx'> 		budget_ci-&gt;budget.dvb_frontend = stv0299_attach(&amp;alps_bsbe1_config, &amp;budget_ci-&gt;budget.i2c_adap);</div><div class='ctx'> 		if (budget_ci-&gt;budget.dvb_frontend) {</div><div class='del'>-			budget_ci-&gt;budget.dvb_frontend-&gt;ops-&gt;dishnetwork_send_legacy_command = NULL;</div><div class='del'>-			if (lnbp21_init(budget_ci-&gt;budget.dvb_frontend, &amp;budget_ci-&gt;budget.i2c_adap, LNBP21_LLC, 0)) {</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;tuner_priv = &amp;budget_ci-&gt;budget.i2c_adap;</div><div class='add'>+</div><div class='add'>+			budget_ci-&gt;budget.dvb_frontend-&gt;ops.dishnetwork_send_legacy_command = NULL;</div><div class='add'>+			if (lnbp21_attach(budget_ci-&gt;budget.dvb_frontend, &amp;budget_ci-&gt;budget.i2c_adap, LNBP21_LLC, 0)) {</div><div class='ctx'> 				printk("%s: No LNBP21 found!\n", __FUNCTION__);</div><div class='del'>-				if (budget_ci-&gt;budget.dvb_frontend-&gt;ops-&gt;release)</div><div class='del'>-					budget_ci-&gt;budget.dvb_frontend-&gt;ops-&gt;release(budget_ci-&gt;budget.dvb_frontend);</div><div class='add'>+				if (budget_ci-&gt;budget.dvb_frontend-&gt;ops.release)</div><div class='add'>+					budget_ci-&gt;budget.dvb_frontend-&gt;ops.release(budget_ci-&gt;budget.dvb_frontend);</div><div class='ctx'> 				budget_ci-&gt;budget.dvb_frontend = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1046,8 +1065,8 @@ static void frontend_init(struct budget_ci *budget_ci)</div><div class='ctx'> 		if (dvb_register_frontend</div><div class='ctx'> 		    (&amp;budget_ci-&gt;budget.dvb_adapter, budget_ci-&gt;budget.dvb_frontend)) {</div><div class='ctx'> 			printk("budget-ci: Frontend registration failed!\n");</div><div class='del'>-			if (budget_ci-&gt;budget.dvb_frontend-&gt;ops-&gt;release)</div><div class='del'>-				budget_ci-&gt;budget.dvb_frontend-&gt;ops-&gt;release(budget_ci-&gt;budget.dvb_frontend);</div><div class='add'>+			if (budget_ci-&gt;budget.dvb_frontend-&gt;ops.release)</div><div class='add'>+				budget_ci-&gt;budget.dvb_frontend-&gt;ops.release(budget_ci-&gt;budget.dvb_frontend);</div><div class='ctx'> 			budget_ci-&gt;budget.dvb_frontend = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c<br/>index ea2066d461fc..e4cf7775e07f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/budget-core.c</a></div><div class='hunk'>@@ -400,7 +400,9 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,</div><div class='ctx'> 		budget-&gt;dev-&gt;name, budget-&gt;buffer_width, budget-&gt;buffer_height);</div><div class='ctx'> 	printk("%s: dma buffer size %u\n", budget-&gt;dev-&gt;name, budget-&gt;buffer_size);</div><div class='ctx'> </div><div class='del'>-	dvb_register_adapter(&amp;budget-&gt;dvb_adapter, budget-&gt;card-&gt;name, owner);</div><div class='add'>+	if ((ret = dvb_register_adapter(&amp;budget-&gt;dvb_adapter, budget-&gt;card-&gt;name, owner, &amp;budget-&gt;dev-&gt;pci-&gt;dev)) &lt; 0) {</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* set dd1 stream a &amp; b */</div><div class='ctx'> 	saa7146_write(dev, DD1_STREAM_B, 0x00000000);</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c<br/>index 1b3aaac5e763..ee60ce90a400 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget-patch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget-patch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/budget-patch.c</a></div><div class='hunk'>@@ -258,7 +258,7 @@ static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_c</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_patch* budget = (struct budget_patch*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 pwr = 0;</div><div class='hunk'>@@ -281,7 +281,10 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	// NOTE: since we're using a prescaler of 2, we set the</div><div class='ctx'> 	// divisor frequency to 62.5kHz and divide by 125 above</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -289,10 +292,9 @@ static struct ves1x93_config alps_bsrv2_config = {</div><div class='ctx'> 	.demod_address = 0x08,</div><div class='ctx'> 	.xin = 90100000UL,</div><div class='ctx'> 	.invert_pwm = 0,</div><div class='del'>-	.pll_set = alps_bsrv2_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int grundig_29504_451_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget_patch* budget = (struct budget_patch*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -305,13 +307,15 @@ static int grundig_29504_451_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='ctx'> 	data[3] = 0x00;</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda8083_config grundig_29504_451_config = {</div><div class='ctx'> 	.demod_address = 0x68,</div><div class='del'>-	.pll_set = grundig_29504_451_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void frontend_init(struct budget_patch* budget)</div><div class='hunk'>@@ -323,27 +327,32 @@ static void frontend_init(struct budget_patch* budget)</div><div class='ctx'> 		// try the ALPS BSRV2 first of all</div><div class='ctx'> 		budget-&gt;dvb_frontend = ves1x93_attach(&amp;alps_bsrv2_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_burst = budget_patch_diseqc_send_burst;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_tone = budget_patch_set_tone;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_master_cmd = budget_patch_diseqc_send_master_cmd;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_burst = budget_patch_diseqc_send_burst;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_tone = budget_patch_set_tone;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		// try the ALPS BSRU6 now</div><div class='ctx'> 		budget-&gt;dvb_frontend = stv0299_attach(&amp;alps_bsru6_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_burst = budget_diseqc_send_burst;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_tone = budget_set_tone;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;tuner_priv = &amp;budget-&gt;i2c_adap;</div><div class='add'>+</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_burst = budget_diseqc_send_burst;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_tone = budget_set_tone;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		// Try the grundig 29504-451</div><div class='ctx'> 		budget-&gt;dvb_frontend = tda8083_attach(&amp;grundig_29504_451_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_burst = budget_diseqc_send_burst;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_tone = budget_set_tone;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_burst = budget_diseqc_send_burst;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_tone = budget_set_tone;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -358,8 +367,8 @@ static void frontend_init(struct budget_patch* budget)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dvb_register_frontend(&amp;budget-&gt;dvb_adapter, budget-&gt;dvb_frontend)) {</div><div class='ctx'> 			printk("budget-av: Frontend registration failed!\n");</div><div class='del'>-			if (budget-&gt;dvb_frontend-&gt;ops-&gt;release)</div><div class='del'>-				budget-&gt;dvb_frontend-&gt;ops-&gt;release(budget-&gt;dvb_frontend);</div><div class='add'>+			if (budget-&gt;dvb_frontend-&gt;ops.release)</div><div class='add'>+				budget-&gt;dvb_frontend-&gt;ops.release(budget-&gt;dvb_frontend);</div><div class='ctx'> 			budget-&gt;dvb_frontend = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c<br/>index c23c02d95641..35761f13c12b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttpci/budget.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttpci/budget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttpci/budget.c</a></div><div class='hunk'>@@ -186,7 +186,7 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 pwr = 0;</div><div class='hunk'>@@ -209,6 +209,8 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	// NOTE: since we're using a prescaler of 2, we set the</div><div class='ctx'> 	// divisor frequency to 62.5kHz and divide by 125 above</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,10 +220,9 @@ static struct ves1x93_config alps_bsrv2_config =</div><div class='ctx'> 	.demod_address = 0x08,</div><div class='ctx'> 	.xin = 90100000UL,</div><div class='ctx'> 	.invert_pwm = 0,</div><div class='del'>-	.pll_set = alps_bsrv2_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -235,6 +236,8 @@ static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	data[2] = 0x85 | ((div &gt;&gt; 10) &amp; 0x60);</div><div class='ctx'> 	data[3] = (params-&gt;frequency &lt; 174000000 ? 0x88 : params-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -244,10 +247,9 @@ static struct ves1820_config alps_tdbe2_config = {</div><div class='ctx'> 	.xin = 57840000UL,</div><div class='ctx'> 	.invert = 1,</div><div class='ctx'> 	.selagc = VES1820_SELAGC_SIGNAMPERR,</div><div class='del'>-	.pll_set = alps_tdbe2_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int grundig_29504_401_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -274,16 +276,17 @@ static int grundig_29504_401_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> 	data[2] = ((div &gt;&gt; 10) &amp; 0x60) | cfg;</div><div class='ctx'> 	data[3] = (cpump &lt;&lt; 6) | band_select;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct l64781_config grundig_29504_401_config = {</div><div class='ctx'> 	.demod_address = 0x55,</div><div class='del'>-	.pll_set = grundig_29504_401_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int grundig_29504_451_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -296,16 +299,17 @@ static int grundig_29504_451_pll_set(struct dvb_frontend* fe, struct dvb_fronten</div><div class='ctx'> 	data[2] = 0x8e;</div><div class='ctx'> 	data[3] = 0x00;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda8083_config grundig_29504_451_config = {</div><div class='ctx'> 	.demod_address = 0x68,</div><div class='del'>-	.pll_set = grundig_29504_451_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int s5h1420_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u32* freqout)</div><div class='add'>+static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct budget* budget = (struct budget*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -326,16 +330,16 @@ static int s5h1420_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete</div><div class='ctx'> 	else</div><div class='ctx'> 		data[3] = 0xc0;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;budget-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> </div><div class='del'>-	*freqout = div * 1000;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct s5h1420_config s5h1420_config = {</div><div class='ctx'> 	.demod_address = 0x53,</div><div class='ctx'> 	.invert = 1,</div><div class='del'>-	.pll_set = s5h1420_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 read_pwm(struct budget* budget)</div><div class='hunk'>@@ -359,18 +363,21 @@ static void frontend_init(struct budget *budget)</div><div class='ctx'> 		// try the ALPS BSRV2 first of all</div><div class='ctx'> 		budget-&gt;dvb_frontend = ves1x93_attach(&amp;alps_bsrv2_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_burst = budget_diseqc_send_burst;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_tone = budget_set_tone;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsrv2_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_burst = budget_diseqc_send_burst;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_tone = budget_set_tone;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		// try the ALPS BSRU6 now</div><div class='ctx'> 		budget-&gt;dvb_frontend = stv0299_attach(&amp;alps_bsru6_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;diseqc_send_burst = budget_diseqc_send_burst;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_tone = budget_set_tone;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;tuner_priv = &amp;budget-&gt;i2c_adap;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.diseqc_send_burst = budget_diseqc_send_burst;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_tone = budget_set_tone;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -378,35 +385,45 @@ static void frontend_init(struct budget *budget)</div><div class='ctx'> 	case 0x1004: // Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659))</div><div class='ctx'> </div><div class='ctx'> 		budget-&gt;dvb_frontend = ves1820_attach(&amp;alps_tdbe2_config, &amp;budget-&gt;i2c_adap, read_pwm(budget));</div><div class='del'>-		if (budget-&gt;dvb_frontend) break;</div><div class='add'>+		if (budget-&gt;dvb_frontend) {</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x1005: // Hauppauge/TT Nova-T budget (L64781/Grundig 29504-401(tsa5060))</div><div class='ctx'> </div><div class='ctx'> 		budget-&gt;dvb_frontend = l64781_attach(&amp;grundig_29504_401_config, &amp;budget-&gt;i2c_adap);</div><div class='del'>-		if (budget-&gt;dvb_frontend) break;</div><div class='add'>+		if (budget-&gt;dvb_frontend) {</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = grundig_29504_401_tuner_set_params;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x4f60: // Fujitsu Siemens Activy Budget-S PCI rev AL (stv0299/ALPS BSRU6(tsa5059))</div><div class='ctx'> 		budget-&gt;dvb_frontend = stv0299_attach(&amp;alps_bsru6_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_voltage = siemens_budget_set_voltage;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;dishnetwork_send_legacy_command = NULL;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;tuner_priv = &amp;budget-&gt;i2c_adap;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_voltage = siemens_budget_set_voltage;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.dishnetwork_send_legacy_command = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x4f61: // Fujitsu Siemens Activy Budget-S PCI rev GR (tda8083/Grundig 29504-451(tsa5522))</div><div class='ctx'> 		budget-&gt;dvb_frontend = tda8083_attach(&amp;grundig_29504_451_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;set_voltage = siemens_budget_set_voltage;</div><div class='del'>-			budget-&gt;dvb_frontend-&gt;ops-&gt;dishnetwork_send_legacy_command = NULL;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = grundig_29504_451_tuner_set_params;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.set_voltage = siemens_budget_set_voltage;</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.dishnetwork_send_legacy_command = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260))</div><div class='ctx'> 		budget-&gt;dvb_frontend = s5h1420_attach(&amp;s5h1420_config, &amp;budget-&gt;i2c_adap);</div><div class='ctx'> 		if (budget-&gt;dvb_frontend) {</div><div class='del'>-			if (lnbp21_init(budget-&gt;dvb_frontend, &amp;budget-&gt;i2c_adap, 0, 0)) {</div><div class='add'>+			budget-&gt;dvb_frontend-&gt;ops.tuner_ops.set_params = s5h1420_tuner_set_params;</div><div class='add'>+			if (lnbp21_attach(budget-&gt;dvb_frontend, &amp;budget-&gt;i2c_adap, 0, 0)) {</div><div class='ctx'> 				printk("%s: No LNBP21 found!\n", __FUNCTION__);</div><div class='ctx'> 				goto error_out;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -428,8 +445,8 @@ static void frontend_init(struct budget *budget)</div><div class='ctx'> </div><div class='ctx'> error_out:</div><div class='ctx'> 	printk("budget: Frontend registration failed!\n");</div><div class='del'>-	if (budget-&gt;dvb_frontend-&gt;ops-&gt;release)</div><div class='del'>-		budget-&gt;dvb_frontend-&gt;ops-&gt;release(budget-&gt;dvb_frontend);</div><div class='add'>+	if (budget-&gt;dvb_frontend-&gt;ops.release)</div><div class='add'>+		budget-&gt;dvb_frontend-&gt;ops.release(budget-&gt;dvb_frontend);</div><div class='ctx'> 	budget-&gt;dvb_frontend = NULL;</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig<br/>index 914587d52b57..92c7cdcf8981 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-budget/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-budget/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-budget/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttusb-budget/Kconfig</a></div><div class='hunk'>@@ -6,6 +6,8 @@ config DVB_TTUSB_BUDGET</div><div class='ctx'> 	select DVB_VES1820</div><div class='ctx'> 	select DVB_TDA8083</div><div class='ctx'> 	select DVB_STV0299</div><div class='add'>+	select DVB_STV0297</div><div class='add'>+	select DVB_LNBP21</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for external USB adapters designed by Technotrend and</div><div class='ctx'> 	  produced by Hauppauge, shipped under the brand name 'Nova-USB'.</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c<br/>index 6ceae38125c7..04cef3023457 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c</a></div><div class='hunk'>@@ -30,6 +30,8 @@</div><div class='ctx'> #include "tda1004x.h"</div><div class='ctx'> #include "stv0299.h"</div><div class='ctx'> #include "tda8083.h"</div><div class='add'>+#include "stv0297.h"</div><div class='add'>+#include "lnbp21.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dvb/frontend.h&gt;</div><div class='ctx'> #include &lt;linux/dvb/dmx.h&gt;</div><div class='hunk'>@@ -41,7 +43,7 @@</div><div class='ctx'>     is a bit braindead (no matching channel masks or no matching filter mask),</div><div class='ctx'>     we won't support this - yet. it doesn't event support negative filters,</div><div class='ctx'>     so the best way is maybe to keep TTUSB_HWSECTIONS undef'd and just</div><div class='del'>-    parse TS data. USB bandwith will be a problem when having large</div><div class='add'>+    parse TS data. USB bandwidth will be a problem when having large</div><div class='ctx'>     datastreams, especially for dvb-net, but hey, that's not my problem.</div><div class='ctx'> </div><div class='ctx'>   TTUSB_DISEQC, TTUSB_TONE:</div><div class='hunk'>@@ -124,10 +126,6 @@ struct ttusb {</div><div class='ctx'> </div><div class='ctx'> 	int revision;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	devfs_handle_t stc_devfs_handle;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	struct dvb_frontend* fe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -486,31 +484,6 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)</div><div class='del'>-{</div><div class='del'>-	struct  ttusb* ttusb = (struct ttusb*)  fe-&gt;dvb-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-	u8 data[1];</div><div class='del'>-	struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) };</div><div class='del'>-</div><div class='del'>-	switch(voltage) {</div><div class='del'>-	case SEC_VOLTAGE_OFF:</div><div class='del'>-		data[0] = 0x00;</div><div class='del'>-		break;</div><div class='del'>-	case SEC_VOLTAGE_13:</div><div class='del'>-		data[0] = 0x44;</div><div class='del'>-		break;</div><div class='del'>-	case SEC_VOLTAGE_18:</div><div class='del'>-		data[0] = 0x4c;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ret = i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;msg, 1);</div><div class='del'>-	return (ret != 1) ? -EIO : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ttusb_update_lnb(struct ttusb *ttusb)</div><div class='ctx'> {</div><div class='ctx'> 	u8 b[] = { 0xaa, ++ttusb-&gt;c, 0x16, 5, /*power: */ 1,</div><div class='hunk'>@@ -1048,7 +1021,7 @@ static u32 functionality(struct i2c_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int alps_tdmb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdmb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 data[4];</div><div class='hunk'>@@ -1062,20 +1035,21 @@ static int alps_tdmb7_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	data[2] = ((div &gt;&gt; 10) &amp; 0x60) | 0x85;</div><div class='ctx'> 	data[3] = params-&gt;frequency &lt; 592000000 ? 0x40 : 0x80;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;msg, 1) != 1) return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct cx22700_config alps_tdmb7_config = {</div><div class='ctx'> 	.demod_address = 0x43,</div><div class='del'>-	.pll_set = alps_tdmb7_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int philips_tdm1316l_pll_init(struct dvb_frontend* fe)</div><div class='add'>+static int philips_tdm1316l_tuner_init(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab };</div><div class='hunk'>@@ -1083,6 +1057,8 @@ static int philips_tdm1316l_pll_init(struct dvb_frontend* fe)</div><div class='ctx'> 	struct i2c_msg tuner_msg = { .addr=0x60, .flags=0, .buf=td1316_init, .len=sizeof(td1316_init) };</div><div class='ctx'> </div><div class='ctx'> 	// setup PLL configuration</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;tuner_msg, 1) != 1) return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='hunk'>@@ -1090,6 +1066,8 @@ static int philips_tdm1316l_pll_init(struct dvb_frontend* fe)</div><div class='ctx'> 	tuner_msg.addr = 0x65;</div><div class='ctx'> 	tuner_msg.buf = disable_mc44BC374c;</div><div class='ctx'> 	tuner_msg.len = sizeof(disable_mc44BC374c);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;tuner_msg, 1) != 1) {</div><div class='ctx'> 		i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;tuner_msg, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1097,7 +1075,7 @@ static int philips_tdm1316l_pll_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tdm1316l_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='hunk'>@@ -1157,6 +1135,8 @@ static int philips_tdm1316l_pll_set(struct dvb_frontend* fe, struct dvb_frontend</div><div class='ctx'> 	tuner_buf[2] = 0xca;</div><div class='ctx'> 	tuner_buf[3] = (cp &lt;&lt; 5) | (filter &lt;&lt; 3) | band;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -1176,8 +1156,6 @@ static struct tda1004x_config philips_tdm1316l_config = {</div><div class='ctx'> 	.demod_address = 0x8,</div><div class='ctx'> 	.invert = 1,</div><div class='ctx'> 	.invert_oclk = 0,</div><div class='del'>-	.pll_init = philips_tdm1316l_pll_init,</div><div class='del'>-	.pll_set = philips_tdm1316l_pll_set,</div><div class='ctx'> 	.request_firmware = philips_tdm1316l_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1299,7 +1277,7 @@ static int alps_stv0299_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tsa5059_pll_set(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='hunk'>@@ -1322,7 +1300,9 @@ static int philips_tsa5059_pll_set(struct dvb_frontend *fe, struct i2c_adapter *</div><div class='ctx'> 	if (ttusb-&gt;revision == TTUSB_REV_2_2)</div><div class='ctx'> 		buf[3] |= 0x20;</div><div class='ctx'> </div><div class='del'>-	if (i2c_transfer(i2c, &amp;msg, 1) != 1)</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1338,10 +1318,9 @@ static struct stv0299_config alps_stv0299_config = {</div><div class='ctx'> 	.volt13_op0_op1 = STV0299_VOLT13_OP1,</div><div class='ctx'> 	.min_delay_ms = 100,</div><div class='ctx'> 	.set_symbol_rate = alps_stv0299_set_symbol_rate,</div><div class='del'>-	.pll_set = philips_tsa5059_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb* ttusb = (struct ttusb*) fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 buf[4];</div><div class='hunk'>@@ -1355,6 +1334,8 @@ static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct</div><div class='ctx'> 	buf[2] = 0x8e;</div><div class='ctx'> 	buf[3] = 0x00;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -1364,10 +1345,9 @@ static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct</div><div class='ctx'> static struct tda8083_config ttusb_novas_grundig_29504_491_config = {</div><div class='ctx'> </div><div class='ctx'> 	.demod_address = 0x68,</div><div class='del'>-	.pll_set = ttusb_novas_grundig_29504_491_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='add'>+static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ttusb* ttusb = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u32 div;</div><div class='hunk'>@@ -1381,6 +1361,8 @@ static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param</div><div class='ctx'> 	data[2] = 0x85 | ((div &gt;&gt; 10) &amp; 0x60);</div><div class='ctx'> 	data[3] = (params-&gt;frequency &lt; 174000000 ? 0x88 : params-&gt;frequency &lt; 470000000 ? 0x84 : 0x81);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer (&amp;ttusb-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -1393,7 +1375,6 @@ static struct ves1820_config alps_tdbe2_config = {</div><div class='ctx'> 	.xin = 57840000UL,</div><div class='ctx'> 	.invert = 1,</div><div class='ctx'> 	.selagc = VES1820_SELAGC_SIGNAMPERR,</div><div class='del'>-	.pll_set = alps_tdbe2_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 read_pwm(struct ttusb* ttusb)</div><div class='hunk'>@@ -1410,6 +1391,174 @@ static u8 read_pwm(struct ttusb* ttusb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+{</div><div class='add'>+	struct ttusb *ttusb = (struct ttusb *) fe-&gt;dvb-&gt;priv;</div><div class='add'>+	u8 tuner_buf[5];</div><div class='add'>+	struct i2c_msg tuner_msg = {.addr = 0x60,</div><div class='add'>+				    .flags = 0,</div><div class='add'>+				    .buf = tuner_buf,</div><div class='add'>+				    .len = sizeof(tuner_buf) };</div><div class='add'>+	int tuner_frequency = 0;</div><div class='add'>+	u8 band, cp, filter;</div><div class='add'>+</div><div class='add'>+	// determine charge pump</div><div class='add'>+	tuner_frequency = params-&gt;frequency;</div><div class='add'>+	if      (tuner_frequency &lt;  87000000) {return -EINVAL;}</div><div class='add'>+	else if (tuner_frequency &lt; 130000000) {cp = 3; band = 1;}</div><div class='add'>+	else if (tuner_frequency &lt; 160000000) {cp = 5; band = 1;}</div><div class='add'>+	else if (tuner_frequency &lt; 200000000) {cp = 6; band = 1;}</div><div class='add'>+	else if (tuner_frequency &lt; 290000000) {cp = 3; band = 2;}</div><div class='add'>+	else if (tuner_frequency &lt; 420000000) {cp = 5; band = 2;}</div><div class='add'>+	else if (tuner_frequency &lt; 480000000) {cp = 6; band = 2;}</div><div class='add'>+	else if (tuner_frequency &lt; 620000000) {cp = 3; band = 4;}</div><div class='add'>+	else if (tuner_frequency &lt; 830000000) {cp = 5; band = 4;}</div><div class='add'>+	else if (tuner_frequency &lt; 895000000) {cp = 7; band = 4;}</div><div class='add'>+	else {return -EINVAL;}</div><div class='add'>+</div><div class='add'>+	// assume PLL filter should always be 8MHz for the moment.</div><div class='add'>+	filter = 1;</div><div class='add'>+</div><div class='add'>+	// calculate divisor</div><div class='add'>+	// (Finput + Fif)/Fref; Fif = 36125000 Hz, Fref = 62500 Hz</div><div class='add'>+	tuner_frequency = ((params-&gt;frequency + 36125000) / 62500);</div><div class='add'>+</div><div class='add'>+	// setup tuner buffer</div><div class='add'>+	tuner_buf[0] = tuner_frequency &gt;&gt; 8;</div><div class='add'>+	tuner_buf[1] = tuner_frequency &amp; 0xff;</div><div class='add'>+	tuner_buf[2] = 0xc8;</div><div class='add'>+	tuner_buf[3] = (cp &lt;&lt; 5) | (filter &lt;&lt; 3) | band;</div><div class='add'>+	tuner_buf[4] = 0x80;</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;tuner_msg, 1) != 1) {</div><div class='add'>+		printk("dvb-ttusb-budget: dvbc_philips_tdm1316l_pll_set Error 1\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	if (i2c_transfer(&amp;ttusb-&gt;i2c_adap, &amp;tuner_msg, 1) != 1) {</div><div class='add'>+		printk("dvb-ttusb-budget: dvbc_philips_tdm1316l_pll_set Error 2\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 dvbc_philips_tdm1316l_inittab[] = {</div><div class='add'>+	0x80, 0x21,</div><div class='add'>+	0x80, 0x20,</div><div class='add'>+	0x81, 0x01,</div><div class='add'>+	0x81, 0x00,</div><div class='add'>+	0x00, 0x09,</div><div class='add'>+	0x01, 0x69,</div><div class='add'>+	0x03, 0x00,</div><div class='add'>+	0x04, 0x00,</div><div class='add'>+	0x07, 0x00,</div><div class='add'>+	0x08, 0x00,</div><div class='add'>+	0x20, 0x00,</div><div class='add'>+	0x21, 0x40,</div><div class='add'>+	0x22, 0x00,</div><div class='add'>+	0x23, 0x00,</div><div class='add'>+	0x24, 0x40,</div><div class='add'>+	0x25, 0x88,</div><div class='add'>+	0x30, 0xff,</div><div class='add'>+	0x31, 0x00,</div><div class='add'>+	0x32, 0xff,</div><div class='add'>+	0x33, 0x00,</div><div class='add'>+	0x34, 0x50,</div><div class='add'>+	0x35, 0x7f,</div><div class='add'>+	0x36, 0x00,</div><div class='add'>+	0x37, 0x20,</div><div class='add'>+	0x38, 0x00,</div><div class='add'>+	0x40, 0x1c,</div><div class='add'>+	0x41, 0xff,</div><div class='add'>+	0x42, 0x29,</div><div class='add'>+	0x43, 0x20,</div><div class='add'>+	0x44, 0xff,</div><div class='add'>+	0x45, 0x00,</div><div class='add'>+	0x46, 0x00,</div><div class='add'>+	0x49, 0x04,</div><div class='add'>+	0x4a, 0xff,</div><div class='add'>+	0x4b, 0x7f,</div><div class='add'>+	0x52, 0x30,</div><div class='add'>+	0x55, 0xae,</div><div class='add'>+	0x56, 0x47,</div><div class='add'>+	0x57, 0xe1,</div><div class='add'>+	0x58, 0x3a,</div><div class='add'>+	0x5a, 0x1e,</div><div class='add'>+	0x5b, 0x34,</div><div class='add'>+	0x60, 0x00,</div><div class='add'>+	0x63, 0x00,</div><div class='add'>+	0x64, 0x00,</div><div class='add'>+	0x65, 0x00,</div><div class='add'>+	0x66, 0x00,</div><div class='add'>+	0x67, 0x00,</div><div class='add'>+	0x68, 0x00,</div><div class='add'>+	0x69, 0x00,</div><div class='add'>+	0x6a, 0x02,</div><div class='add'>+	0x6b, 0x00,</div><div class='add'>+	0x70, 0xff,</div><div class='add'>+	0x71, 0x00,</div><div class='add'>+	0x72, 0x00,</div><div class='add'>+	0x73, 0x00,</div><div class='add'>+	0x74, 0x0c,</div><div class='add'>+	0x80, 0x00,</div><div class='add'>+	0x81, 0x00,</div><div class='add'>+	0x82, 0x00,</div><div class='add'>+	0x83, 0x00,</div><div class='add'>+	0x84, 0x04,</div><div class='add'>+	0x85, 0x80,</div><div class='add'>+	0x86, 0x24,</div><div class='add'>+	0x87, 0x78,</div><div class='add'>+	0x88, 0x00,</div><div class='add'>+	0x89, 0x00,</div><div class='add'>+	0x90, 0x01,</div><div class='add'>+	0x91, 0x01,</div><div class='add'>+	0xa0, 0x00,</div><div class='add'>+	0xa1, 0x00,</div><div class='add'>+	0xa2, 0x00,</div><div class='add'>+	0xb0, 0x91,</div><div class='add'>+	0xb1, 0x0b,</div><div class='add'>+	0xc0, 0x4b,</div><div class='add'>+	0xc1, 0x00,</div><div class='add'>+	0xc2, 0x00,</div><div class='add'>+	0xd0, 0x00,</div><div class='add'>+	0xd1, 0x00,</div><div class='add'>+	0xd2, 0x00,</div><div class='add'>+	0xd3, 0x00,</div><div class='add'>+	0xd4, 0x00,</div><div class='add'>+	0xd5, 0x00,</div><div class='add'>+	0xde, 0x00,</div><div class='add'>+	0xdf, 0x00,</div><div class='add'>+	0x61, 0x38,</div><div class='add'>+	0x62, 0x0a,</div><div class='add'>+	0x53, 0x13,</div><div class='add'>+	0x59, 0x08,</div><div class='add'>+	0x55, 0x00,</div><div class='add'>+	0x56, 0x40,</div><div class='add'>+	0x57, 0x08,</div><div class='add'>+	0x58, 0x3d,</div><div class='add'>+	0x88, 0x10,</div><div class='add'>+	0xa0, 0x00,</div><div class='add'>+	0xa0, 0x00,</div><div class='add'>+	0xa0, 0x00,</div><div class='add'>+	0xa0, 0x04,</div><div class='add'>+	0xff, 0xff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct stv0297_config dvbc_philips_tdm1316l_config = {</div><div class='add'>+	.demod_address = 0x1c,</div><div class='add'>+	.inittab = dvbc_philips_tdm1316l_inittab,</div><div class='add'>+	.invert = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void frontend_init(struct ttusb* ttusb)</div><div class='ctx'> {</div><div class='ctx'> 	switch(le16_to_cpu(ttusb-&gt;dev-&gt;descriptor.idProduct)) {</div><div class='hunk'>@@ -1417,11 +1566,13 @@ static void frontend_init(struct ttusb* ttusb)</div><div class='ctx'> 		// try the stv0299 based first</div><div class='ctx'> 		ttusb-&gt;fe = stv0299_attach(&amp;alps_stv0299_config, &amp;ttusb-&gt;i2c_adap);</div><div class='ctx'> 		if (ttusb-&gt;fe != NULL) {</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.set_params = philips_tsa5059_tuner_set_params;</div><div class='add'>+</div><div class='ctx'> 			if(ttusb-&gt;revision == TTUSB_REV_2_2) { // ALPS BSBE1</div><div class='ctx'> 				alps_stv0299_config.inittab = alps_bsbe1_inittab;</div><div class='del'>-				ttusb-&gt;fe-&gt;ops-&gt;set_voltage = lnbp21_set_voltage;</div><div class='add'>+				lnbp21_attach(ttusb-&gt;fe, &amp;ttusb-&gt;i2c_adap, 0, 0);</div><div class='ctx'> 			} else { // ALPS BSRU6</div><div class='del'>-				ttusb-&gt;fe-&gt;ops-&gt;set_voltage = ttusb_set_voltage;</div><div class='add'>+				ttusb-&gt;fe-&gt;ops.set_voltage = ttusb_set_voltage;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1429,28 +1580,41 @@ static void frontend_init(struct ttusb* ttusb)</div><div class='ctx'> 		// Grundig 29504-491</div><div class='ctx'> 		ttusb-&gt;fe = tda8083_attach(&amp;ttusb_novas_grundig_29504_491_config, &amp;ttusb-&gt;i2c_adap);</div><div class='ctx'> 		if (ttusb-&gt;fe != NULL) {</div><div class='del'>-			ttusb-&gt;fe-&gt;ops-&gt;set_voltage = ttusb_set_voltage;</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.set_params = ttusb_novas_grundig_29504_491_tuner_set_params;</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.set_voltage = ttusb_set_voltage;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x1004: // Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659))</div><div class='ctx'> 		ttusb-&gt;fe = ves1820_attach(&amp;alps_tdbe2_config, &amp;ttusb-&gt;i2c_adap, read_pwm(ttusb));</div><div class='del'>-		if (ttusb-&gt;fe != NULL)</div><div class='add'>+		if (ttusb-&gt;fe != NULL) {</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.set_params = alps_tdbe2_tuner_set_params;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ttusb-&gt;fe = stv0297_attach(&amp;dvbc_philips_tdm1316l_config, &amp;ttusb-&gt;i2c_adap);</div><div class='add'>+		if (ttusb-&gt;fe != NULL) {</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.set_params = dvbc_philips_tdm1316l_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 0x1005: // Hauppauge/TT Nova-USB-t budget (tda10046/Philips td1316(tda6651tt) OR cx22700/ALPS TDMB7(??))</div><div class='ctx'> 		// try the ALPS TDMB7 first</div><div class='ctx'> 		ttusb-&gt;fe = cx22700_attach(&amp;alps_tdmb7_config, &amp;ttusb-&gt;i2c_adap);</div><div class='del'>-		if (ttusb-&gt;fe != NULL)</div><div class='add'>+		if (ttusb-&gt;fe != NULL) {</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.set_params = alps_tdmb7_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		// Philips td1316</div><div class='ctx'> 		ttusb-&gt;fe = tda10046_attach(&amp;philips_tdm1316l_config, &amp;ttusb-&gt;i2c_adap);</div><div class='del'>-		if (ttusb-&gt;fe != NULL)</div><div class='add'>+		if (ttusb-&gt;fe != NULL) {</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.init = philips_tdm1316l_tuner_init;</div><div class='add'>+			ttusb-&gt;fe-&gt;ops.tuner_ops.set_params = philips_tdm1316l_tuner_set_params;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1461,8 +1625,8 @@ static void frontend_init(struct ttusb* ttusb)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dvb_register_frontend(&amp;ttusb-&gt;adapter, ttusb-&gt;fe)) {</div><div class='ctx'> 			printk("dvb-ttusb-budget: Frontend registration failed!\n");</div><div class='del'>-			if (ttusb-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-				ttusb-&gt;fe-&gt;ops-&gt;release(ttusb-&gt;fe);</div><div class='add'>+			if (ttusb-&gt;fe-&gt;ops.release)</div><div class='add'>+				ttusb-&gt;fe-&gt;ops.release(ttusb-&gt;fe);</div><div class='ctx'> 			ttusb-&gt;fe = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1507,7 +1671,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;ttusb-&gt;semi2c);</div><div class='ctx'> </div><div class='del'>-	if ((result = dvb_register_adapter(&amp;ttusb-&gt;adapter, "Technotrend/Hauppauge Nova-USB", THIS_MODULE)) &lt; 0) {</div><div class='add'>+	if ((result = dvb_register_adapter(&amp;ttusb-&gt;adapter, "Technotrend/Hauppauge Nova-USB", THIS_MODULE, &amp;udev-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		ttusb_free_iso_urbs(ttusb);</div><div class='ctx'> 		kfree(ttusb);</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -1578,13 +1742,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	ttusb-&gt;stc_devfs_handle =</div><div class='del'>-	    devfs_register(ttusb-&gt;adapter-&gt;devfs_handle, TTUSB_BUDGET_NAME,</div><div class='del'>-			   DEVFS_FL_DEFAULT, 0, 192,</div><div class='del'>-			   S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP</div><div class='del'>-			   | S_IROTH | S_IWOTH, &amp;stc_fops, ttusb);</div><div class='del'>-#endif</div><div class='ctx'> 	usb_set_intfdata(intf, (void *) ttusb);</div><div class='ctx'> </div><div class='ctx'> 	frontend_init(ttusb);</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c<br/>index 44dea3211848..6c1cb770bcf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusb_dec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusb_dec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttusb-dec/ttusb_dec.c</a></div><div class='hunk'>@@ -1432,7 +1432,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)</div><div class='ctx'> 	dprintk("%s\n", __FUNCTION__);</div><div class='ctx'> </div><div class='ctx'> 	if ((result = dvb_register_adapter(&amp;dec-&gt;adapter,</div><div class='del'>-					   dec-&gt;model_name, THIS_MODULE)) &lt; 0) {</div><div class='add'>+					   dec-&gt;model_name, THIS_MODULE, &amp;dec-&gt;udev-&gt;dev)) &lt; 0) {</div><div class='ctx'> 		printk("%s: dvb_register_adapter failed: error %d\n",</div><div class='ctx'> 		       __FUNCTION__, result);</div><div class='ctx'> </div><div class='hunk'>@@ -1657,8 +1657,8 @@ static int ttusb_dec_probe(struct usb_interface *intf,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (dvb_register_frontend(&amp;dec-&gt;adapter, dec-&gt;fe)) {</div><div class='ctx'> 			printk("budget-ci: Frontend registration failed!\n");</div><div class='del'>-			if (dec-&gt;fe-&gt;ops-&gt;release)</div><div class='del'>-				dec-&gt;fe-&gt;ops-&gt;release(dec-&gt;fe);</div><div class='add'>+			if (dec-&gt;fe-&gt;ops.release)</div><div class='add'>+				dec-&gt;fe-&gt;ops.release(dec-&gt;fe);</div><div class='ctx'> 			dec-&gt;fe = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c<br/>index a5a46175fa09..42f39a89bc4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/dvb/ttusb-dec/ttusbdecfe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/dvb/ttusb-dec/ttusbdecfe.c</a></div><div class='hunk'>@@ -28,8 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> struct ttusbdecfe_state {</div><div class='ctx'> </div><div class='del'>-	struct dvb_frontend_ops ops;</div><div class='del'>-</div><div class='ctx'> 	/* configuration settings */</div><div class='ctx'> 	const struct ttusbdecfe_config* config;</div><div class='ctx'> </div><div class='hunk'>@@ -203,10 +201,9 @@ struct dvb_frontend* ttusbdecfe_dvbt_attach(const struct ttusbdecfe_config* conf</div><div class='ctx'> </div><div class='ctx'> 	/* setup the state */</div><div class='ctx'> 	state-&gt;config = config;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;ttusbdecfe_dvbt_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;ttusbdecfe_dvbt_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> }</div><div class='hunk'>@@ -226,10 +223,9 @@ struct dvb_frontend* ttusbdecfe_dvbs_attach(const struct ttusbdecfe_config* conf</div><div class='ctx'> 	state-&gt;config = config;</div><div class='ctx'> 	state-&gt;voltage = 0;</div><div class='ctx'> 	state-&gt;hi_band = 0;</div><div class='del'>-	memcpy(&amp;state-&gt;ops, &amp;ttusbdecfe_dvbs_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> </div><div class='ctx'> 	/* create dvb_frontend */</div><div class='del'>-	state-&gt;frontend.ops = &amp;state-&gt;ops;</div><div class='add'>+	memcpy(&amp;state-&gt;frontend.ops, &amp;ttusbdecfe_dvbs_ops, sizeof(struct dvb_frontend_ops));</div><div class='ctx'> 	state-&gt;frontend.demodulator_priv = state;</div><div class='ctx'> 	return &amp;state-&gt;frontend;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig<br/>index 3fff75763693..de3128a31de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/Kconfig</a></div><div class='hunk'>@@ -136,7 +136,7 @@ config RADIO_GEMTEK_PCI</div><div class='ctx'> 	  Choose Y here if you have this PCI FM radio card.</div><div class='ctx'> </div><div class='ctx'> 	  In order to control your radio card, you will need to use programs</div><div class='del'>-	  that are compatible with the Video for Linux API.  Information on </div><div class='add'>+	  that are compatible with the Video for Linux API.  Information on</div><div class='ctx'> 	  this API and pointers to "v4l" programs may be found at</div><div class='ctx'> 	  &lt;file:Documentation/video4linux/API.html&gt;.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile<br/>index 8b351945d066..e95b6805e002 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/Makefile</a></div><div class='hunk'>@@ -20,3 +20,5 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o</div><div class='ctx'> obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o</div><div class='ctx'> obj-$(CONFIG_RADIO_TRUST) += radio-trust.o</div><div class='ctx'> obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o</div><div class='add'>+</div><div class='add'>+EXTRA_CFLAGS += -Isound</div><div class='head'>diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c<br/>index dc292da2605f..c4312fa0e2f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-radio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/miropcm20-radio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-radio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/miropcm20-radio.c</a></div><div class='hunk'>@@ -16,13 +16,14 @@</div><div class='ctx'> </div><div class='ctx'> /* What ever you think about the ACI, version 0x07 is not very well!</div><div class='ctx'>  * I can't get frequency, 'tuner status', 'tuner flags' or mute/mono</div><div class='del'>- * conditions...                Robert </div><div class='add'>+ * conditions...                Robert</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='del'>-#include "../../../sound/oss/aci.h"</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include "oss/aci.h"</div><div class='ctx'> #include "miropcm20-rds-core.h"</div><div class='ctx'> </div><div class='ctx'> static int radio_nr = -1;</div><div class='hunk'>@@ -123,7 +124,7 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct pcm20_device *pcm20 = dev-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='ctx'> 		case VIDIOCGCAP:</div><div class='hunk'>@@ -139,7 +140,7 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			v-&gt;rangelow=87*16000;</div><div class='ctx'> 			v-&gt;rangehigh=108*16000;</div><div class='hunk'>@@ -172,7 +173,7 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags=VIDEO_AUDIO_MUTABLE;</div><div class='hunk'>@@ -183,12 +184,12 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				v-&gt;mode|=VIDEO_SOUND_MONO;</div><div class='ctx'> 			/* v-&gt;step=2048; */</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			pcm20_mute(pcm20, !!(v-&gt;flags&amp;VIDEO_AUDIO_MUTE));</div><div class='hunk'>@@ -237,7 +238,7 @@ static int __init pcm20_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if(video_register_device(&amp;pcm20_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='ctx'> 		goto video_register_device;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	if(attach_aci_rds()&lt;0)</div><div class='ctx'> 		goto attach_aci_rds;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c<br/>index b602c73e2309..9428d8b2642c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/miropcm20-rds-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/miropcm20-rds-core.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include "../../../sound/oss/aci.h"</div><div class='add'>+#include "oss/aci.h"</div><div class='ctx'> #include "miropcm20-rds-core.h"</div><div class='ctx'> </div><div class='ctx'> #define DEBUG 0</div><div class='hunk'>@@ -33,24 +33,24 @@ static struct mutex aci_rds_mutex;</div><div class='ctx'> #define RDS_BUSYMASK        0x10   /* Bit 4 */</div><div class='ctx'> #define RDS_CLOCKMASK       0x08   /* Bit 3 */</div><div class='ctx'> </div><div class='del'>-#define RDS_DATA(x)         (((x) &gt;&gt; RDS_DATASHIFT) &amp; 1) </div><div class='add'>+#define RDS_DATA(x)         (((x) &gt;&gt; RDS_DATASHIFT) &amp; 1)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #if DEBUG</div><div class='ctx'> static void print_matrix(char array[], unsigned int length)</div><div class='ctx'> {</div><div class='del'>-        int i, j;</div><div class='del'>-</div><div class='del'>-        for (i=0; i&lt;length; i++) {</div><div class='del'>-                printk(KERN_DEBUG "aci-rds: ");</div><div class='del'>-                for (j=7; j&gt;=0; j--) {</div><div class='del'>-                        printk("%d", (array[i] &gt;&gt; j) &amp; 0x1);</div><div class='del'>-                }</div><div class='del'>-                if (i%8 == 0)</div><div class='del'>-                        printk(" byte-border\n");</div><div class='del'>-                else</div><div class='del'>-                        printk("\n");</div><div class='del'>-        }</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;length; i++) {</div><div class='add'>+		printk(KERN_DEBUG "aci-rds: ");</div><div class='add'>+		for (j=7; j&gt;=0; j--) {</div><div class='add'>+			printk("%d", (array[i] &gt;&gt; j) &amp; 0x1);</div><div class='add'>+		}</div><div class='add'>+		if (i%8 == 0)</div><div class='add'>+			printk(" byte-border\n");</div><div class='add'>+		else</div><div class='add'>+			printk("\n");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> #endif /* DEBUG */</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +114,7 @@ static int rds_write(unsigned char cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char sendbuffer[8];</div><div class='ctx'> 	int i;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (byte2trans(cmd, sendbuffer, 8) != 0){</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -151,7 +151,7 @@ static int rds_read(unsigned char databuffer[], int datasize)</div><div class='ctx'> 	   I have to waitread() here */</div><div class='ctx'> 	if (rds_waitread() &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	memset(databuffer, 0, datasize);</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt; READSIZE; i++)</div><div class='hunk'>@@ -194,7 +194,7 @@ int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize)</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;aci_rds_mutex);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(aci_rds_cmd);</div><div class='head'>diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c<br/>index e09214082e01..c1b1db65e668 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/miropcm20-rds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/miropcm20-rds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/miropcm20-rds.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@ static int rds_f_release(struct inode *in, struct file *fi)</div><div class='ctx'> </div><div class='ctx'> static void print_matrix(char *ch, char out[])</div><div class='ctx'> {</div><div class='del'>-        int j;</div><div class='add'>+	int j;</div><div class='ctx'> </div><div class='ctx'> 	for (j=7; j&gt;=0; j--) {</div><div class='ctx'> 		 out[7-j] = ((*ch &gt;&gt; j) &amp; 0x1) + '0';</div><div class='hunk'>@@ -115,7 +115,6 @@ static struct file_operations rds_fops = {</div><div class='ctx'> static struct miscdevice rds_miscdev = {</div><div class='ctx'> 	.minor		= MISC_DYNAMIC_MINOR,</div><div class='ctx'> 	.name		= "radiotext",</div><div class='del'>-	.devfs_name	= "v4l/rds/radiotext",</div><div class='ctx'> 	.fops		= &amp;rds_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c<br/>index 557fb5c4af38..df22a582e7a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aimslab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-aimslab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aimslab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-aimslab.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'>  *   out(port, start_increasing_volume);</div><div class='ctx'>  *   wait(a_wee_while);</div><div class='ctx'>  *   out(port, stop_changing_the_volume);</div><div class='del'>- *  </div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;	/* Modules 			*/</div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_RTRACK_PORT 	*/</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;	/* Lock for the I/O 		*/</div><div class='ctx'> </div><div class='hunk'>@@ -41,7 +42,7 @@</div><div class='ctx'> #define CONFIG_RADIO_RTRACK_PORT -1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int io = CONFIG_RADIO_RTRACK_PORT; </div><div class='add'>+static int io = CONFIG_RADIO_RTRACK_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static struct mutex lock;</div><div class='ctx'> </div><div class='hunk'>@@ -93,12 +94,12 @@ static int rt_setvol(struct rt_device *dev, int vol)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(vol == dev-&gt;curvol) {	/* requested volume = current */</div><div class='ctx'> 		if (dev-&gt;muted) {	/* user is unmuting the card  */</div><div class='ctx'> 			dev-&gt;muted = 0;</div><div class='ctx'> 			outb (0xd8, io);	/* enable card */</div><div class='del'>-		}	</div><div class='add'>+		}</div><div class='ctx'> 		mutex_unlock(&amp;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -114,10 +115,10 @@ static int rt_setvol(struct rt_device *dev, int vol)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;muted = 0;</div><div class='ctx'> 	if(vol &gt; dev-&gt;curvol)</div><div class='del'>-		for(i = dev-&gt;curvol; i &lt; vol; i++) </div><div class='add'>+		for(i = dev-&gt;curvol; i &lt; vol; i++)</div><div class='ctx'> 			rt_incvol();</div><div class='ctx'> 	else</div><div class='del'>-		for(i = dev-&gt;curvol; i &gt; vol; i--) </div><div class='add'>+		for(i = dev-&gt;curvol; i &gt; vol; i--)</div><div class='ctx'> 			rt_decvol();</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;curvol = vol;</div><div class='hunk'>@@ -125,7 +126,7 @@ static int rt_setvol(struct rt_device *dev, int vol)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* the 128+64 on these outb's is to keep the volume stable while tuning </div><div class='add'>+/* the 128+64 on these outb's is to keep the volume stable while tuning</div><div class='ctx'>  * without them, the volume _will_ creep up with each frequency change</div><div class='ctx'>  * and bit 4 (+16) is to keep the signal strength meter enabled</div><div class='ctx'>  */</div><div class='hunk'>@@ -140,7 +141,7 @@ static void send_0_byte(int port, struct rt_device *dev)</div><div class='ctx'> 		outb_p(128+64+16+8+  1, port);  /* on + wr-enable + data low */</div><div class='ctx'> 		outb_p(128+64+16+8+2+1, port);  /* clock */</div><div class='ctx'> 	}</div><div class='del'>-	sleep_delay(1000); </div><div class='add'>+	sleep_delay(1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void send_1_byte(int port, struct rt_device *dev)</div><div class='hunk'>@@ -148,13 +149,13 @@ static void send_1_byte(int port, struct rt_device *dev)</div><div class='ctx'> 	if ((dev-&gt;curvol == 0) || (dev-&gt;muted)) {</div><div class='ctx'> 		outb_p(128+64+16+4  +1, port);   /* wr-enable+data high */</div><div class='ctx'> 		outb_p(128+64+16+4+2+1, port);   /* clock */</div><div class='del'>-	} </div><div class='add'>+	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		outb_p(128+64+16+8+4  +1, port); /* on+wr-enable+data high */</div><div class='ctx'> 		outb_p(128+64+16+8+4+2+1, port); /* clock */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sleep_delay(1000); </div><div class='add'>+	sleep_delay(1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rt_setfreq(struct rt_device *dev, unsigned long freq)</div><div class='hunk'>@@ -167,9 +168,9 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)</div><div class='ctx'> </div><div class='ctx'> 	freq += 171200;			/* Add 10.7 MHz IF 		*/</div><div class='ctx'> 	freq /= 800;			/* Convert to 50 kHz units	*/</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;lock);			/* Stop other ops interfering */</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 	send_0_byte (io, dev);		/*  0: LSB of frequency		*/</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 13; i++)	/*   : frequency bits (1-13)	*/</div><div class='hunk'>@@ -195,7 +196,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)</div><div class='ctx'> 		outb (0xd0, io);	/* volume steady + sigstr */</div><div class='ctx'> 	else</div><div class='ctx'> 		outb (0xd8, io);	/* volume steady + sigstr + on */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -213,7 +214,7 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct rt_device *rt=dev-&gt;priv;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='ctx'> 		case VIDIOCGCAP:</div><div class='hunk'>@@ -229,7 +230,7 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			v-&gt;rangelow=(87*16000);</div><div class='ctx'> 			v-&gt;rangehigh=(108*16000);</div><div class='hunk'>@@ -261,21 +262,21 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags|=VIDEO_AUDIO_MUTABLE|VIDEO_AUDIO_VOLUME;</div><div class='ctx'> 			v-&gt;volume=rt-&gt;curvol * 6554;</div><div class='ctx'> 			v-&gt;step=6554;</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE) </div><div class='add'>+			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE)</div><div class='ctx'> 				rt_mute(rt);</div><div class='ctx'> 			else</div><div class='ctx'> 				rt_setvol(rt,v-&gt;volume/6554);</div><div class='hunk'>@@ -298,7 +299,7 @@ static struct file_operations rtrack_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open           = video_exclusive_open,</div><div class='ctx'> 	.release        = video_exclusive_release,</div><div class='del'>-	.ioctl	        = rt_ioctl,</div><div class='add'>+	.ioctl		= rt_ioctl,</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='ctx'> 	.llseek         = no_llseek,</div><div class='ctx'> };</div><div class='hunk'>@@ -320,14 +321,14 @@ static int __init rtrack_init(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!request_region(io, 2, "rtrack")) </div><div class='add'>+	if (!request_region(io, 2, "rtrack"))</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "rtrack: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rtrack_radio.priv=&amp;rtrack_unit;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(video_register_device(&amp;rtrack_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(io, 2);</div><div class='hunk'>@@ -336,10 +337,10 @@ static int __init rtrack_init(void)</div><div class='ctx'> 	printk(KERN_INFO "AIMSlab RadioTrack/RadioReveal card driver.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the I/O locking */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='del'>-	</div><div class='del'>- 	/* mute card - prevents noisy bootups */</div><div class='add'>+</div><div class='add'>+	/* mute card - prevents noisy bootups */</div><div class='ctx'> </div><div class='ctx'> 	/* this ensures that the volume is all the way down  */</div><div class='ctx'> 	outb(0x48, io);		/* volume down but still "on"	*/</div><div class='head'>diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c<br/>index 83bdae23417d..95e6322133ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aztech.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-aztech.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-aztech.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-aztech.c</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='del'>-/* radio-aztech.c - Aztech radio card driver for Linux 2.2 </div><div class='add'>+/* radio-aztech.c - Aztech radio card driver for Linux 2.2</div><div class='ctx'>  *</div><div class='del'>- * Adapted to support the Video for Linux API by </div><div class='add'>+ * Adapted to support the Video for Linux API by</div><div class='ctx'>  * Russell Kroll &lt;rkroll@exploits.org&gt;.  Based on original tuner code by:</div><div class='ctx'>  *</div><div class='ctx'>  * Quay Ly</div><div class='ctx'>  * Donald Song</div><div class='del'>- * Jason Lewis      (jlewis@twilight.vtc.vsc.edu) </div><div class='add'>+ * Jason Lewis      (jlewis@twilight.vtc.vsc.edu)</div><div class='ctx'>  * Scott McGrath    (smcgrath@twilight.vtc.vsc.edu)</div><div class='ctx'>  * William McGrath  (wmcgrath@twilight.vtc.vsc.edu)</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_AZTECH_PORT 	*/</div><div class='ctx'> </div><div class='ctx'> /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */</div><div class='hunk'>@@ -39,7 +40,7 @@</div><div class='ctx'> #define CONFIG_RADIO_AZTECH_PORT -1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int io = CONFIG_RADIO_AZTECH_PORT; </div><div class='add'>+static int io = CONFIG_RADIO_AZTECH_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static int radio_wait_time = 1000;</div><div class='ctx'> static struct mutex lock;</div><div class='hunk'>@@ -53,15 +54,15 @@ struct az_device</div><div class='ctx'> </div><div class='ctx'> static int volconvert(int level)</div><div class='ctx'> {</div><div class='del'>-	level&gt;&gt;=14;	 	/* Map 16bits down to 2 bit */</div><div class='del'>- 	level&amp;=3;</div><div class='del'>-	</div><div class='add'>+	level&gt;&gt;=14;		/* Map 16bits down to 2 bit */</div><div class='add'>+	level&amp;=3;</div><div class='add'>+</div><div class='ctx'> 	/* convert to card-friendly values */</div><div class='del'>-	switch (level) </div><div class='add'>+	switch (level)</div><div class='ctx'> 	{</div><div class='del'>-		case 0: </div><div class='add'>+		case 0:</div><div class='ctx'> 			return 0;</div><div class='del'>-		case 1: </div><div class='add'>+		case 1:</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			return 4;</div><div class='hunk'>@@ -121,9 +122,9 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)</div><div class='ctx'> </div><div class='ctx'> 	frequency += 171200;		/* Add 10.7 MHz IF		*/</div><div class='ctx'> 	frequency /= 800;		/* Convert to 50 kHz units	*/</div><div class='del'>-					</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	send_0_byte (dev);		/*  0: LSB of frequency       */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 13; i++)	/*   : frequency bits (1-13)  */</div><div class='hunk'>@@ -151,7 +152,7 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)</div><div class='ctx'> </div><div class='ctx'> 	udelay (radio_wait_time);</div><div class='ctx'> 	outb_p(128+64+volconvert(dev-&gt;curvol), io);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -162,7 +163,7 @@ static int az_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct az_device *az = dev-&gt;priv;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='ctx'> 		case VIDIOCGCAP:</div><div class='hunk'>@@ -178,7 +179,7 @@ static int az_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			v-&gt;rangelow=(87*16000);</div><div class='ctx'> 			v-&gt;rangehigh=(108*16000);</div><div class='hunk'>@@ -211,7 +212,7 @@ static int az_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags|=VIDEO_AUDIO_MUTABLE|VIDEO_AUDIO_VOLUME;</div><div class='hunk'>@@ -222,17 +223,17 @@ static int az_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			v-&gt;volume=az-&gt;curvol;</div><div class='ctx'> 			v-&gt;step=16384;</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			az-&gt;curvol=v-&gt;volume;</div><div class='ctx'> </div><div class='ctx'> 			az-&gt;stereo=(v-&gt;mode&amp;VIDEO_SOUND_STEREO)?1:0;</div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE) </div><div class='add'>+			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE)</div><div class='ctx'> 				az_setvol(az,0);</div><div class='ctx'> 			else</div><div class='ctx'> 				az_setvol(az,az-&gt;curvol);</div><div class='hunk'>@@ -277,7 +278,7 @@ static int __init aztech_init(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!request_region(io, 2, "aztech")) </div><div class='add'>+	if (!request_region(io, 2, "aztech"))</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "aztech: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -285,13 +286,13 @@ static int __init aztech_init(void)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='ctx'> 	aztech_radio.priv=&amp;aztech_unit;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(video_register_device(&amp;aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(io,2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "Aztech radio card driver v1.00/19990224 rkroll@exploits.org\n");</div><div class='ctx'> 	/* mute card - prevents noisy bootups */</div><div class='ctx'> 	outb (0, io);</div><div class='head'>diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c<br/>index f1b5ac81e9d2..8641aec7baf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-cadet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-cadet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-cadet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-cadet.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * Russell Kroll    (rkroll@exploits.org)</div><div class='ctx'>  * Quay Ly</div><div class='ctx'>  * Donald Song</div><div class='del'>- * Jason Lewis      (jlewis@twilight.vtc.vsc.edu) </div><div class='add'>+ * Jason Lewis      (jlewis@twilight.vtc.vsc.edu)</div><div class='ctx'>  * Scott McGrath    (smcgrath@twilight.vtc.vsc.edu)</div><div class='ctx'>  * William McGrath  (wmcgrath@twilight.vtc.vsc.edu)</div><div class='ctx'>  *</div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -55,29 +56,29 @@ static int cadet_probe(void);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Signal Strength Threshold Values</div><div class='del'>- * The V4L API spec does not define any particular unit for the signal </div><div class='add'>+ * The V4L API spec does not define any particular unit for the signal</div><div class='ctx'>  * strength value.  These values are in microvolts of RF at the tuner's input.</div><div class='ctx'>  */</div><div class='ctx'> static __u16 sigtable[2][4]={{5,10,30,150},{28,40,63,1000}};</div><div class='ctx'> </div><div class='ctx'> static int cadet_getrds(void)</div><div class='ctx'> {</div><div class='del'>-        int rdsstat=0;</div><div class='add'>+	int rdsstat=0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='del'>-        outb(3,io);                 /* Select Decoder Control/Status */</div><div class='add'>+	outb(3,io);                 /* Select Decoder Control/Status */</div><div class='ctx'> 	outb(inb(io+1)&amp;0x7f,io+1);  /* Reset RDS detection */</div><div class='ctx'> 	spin_unlock(&amp;cadet_io_lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cadet_io_lock);	</div><div class='del'>-        outb(3,io);                 /* Select Decoder Control/Status */</div><div class='add'>+	spin_lock(&amp;cadet_io_lock);</div><div class='add'>+	outb(3,io);                 /* Select Decoder Control/Status */</div><div class='ctx'> 	if((inb(io+1)&amp;0x80)!=0) {</div><div class='del'>-	        rdsstat|=VIDEO_TUNER_RDS_ON;</div><div class='add'>+		rdsstat|=VIDEO_TUNER_RDS_ON;</div><div class='ctx'> 	}</div><div class='ctx'> 	if((inb(io+1)&amp;0x10)!=0) {</div><div class='del'>-	        rdsstat|=VIDEO_TUNER_MBS_ON;</div><div class='add'>+		rdsstat|=VIDEO_TUNER_MBS_ON;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;cadet_io_lock);</div><div class='ctx'> 	return rdsstat;</div><div class='hunk'>@@ -86,49 +87,49 @@ static int cadet_getrds(void)</div><div class='ctx'> static int cadet_getstereo(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-        if(curtuner != 0)	/* Only FM has stereo capability! */</div><div class='del'>-	        return 0;</div><div class='add'>+	if(curtuner != 0)	/* Only FM has stereo capability! */</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='del'>-        outb(7,io);          /* Select tuner control */</div><div class='add'>+	outb(7,io);          /* Select tuner control */</div><div class='ctx'> 	if( (inb(io+1) &amp; 0x40) == 0)</div><div class='del'>-        	ret = 1;</div><div class='del'>-        spin_unlock(&amp;cadet_io_lock);</div><div class='del'>-        return ret;</div><div class='add'>+		ret = 1;</div><div class='add'>+	spin_unlock(&amp;cadet_io_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned cadet_gettune(void)</div><div class='ctx'> {</div><div class='del'>-        int curvol,i;</div><div class='add'>+	int curvol,i;</div><div class='ctx'> 	unsigned fifo=0;</div><div class='ctx'> </div><div class='del'>-        /*</div><div class='del'>-         * Prepare for read</div><div class='del'>-         */</div><div class='add'>+	/*</div><div class='add'>+	 * Prepare for read</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='del'>-	</div><div class='del'>-        outb(7,io);       /* Select tuner control */</div><div class='del'>-        curvol=inb(io+1); /* Save current volume/mute setting */</div><div class='del'>-        outb(0x00,io+1);  /* Ensure WRITE-ENABLE is LOW */</div><div class='add'>+</div><div class='add'>+	outb(7,io);       /* Select tuner control */</div><div class='add'>+	curvol=inb(io+1); /* Save current volume/mute setting */</div><div class='add'>+	outb(0x00,io+1);  /* Ensure WRITE-ENABLE is LOW */</div><div class='ctx'> 	tunestat=0xffff;</div><div class='ctx'> </div><div class='del'>-        /*</div><div class='del'>-         * Read the shift register</div><div class='del'>-         */</div><div class='del'>-        for(i=0;i&lt;25;i++) {</div><div class='del'>-                fifo=(fifo&lt;&lt;1)|((inb(io+1)&gt;&gt;7)&amp;0x01);</div><div class='del'>-                if(i&lt;24) {</div><div class='del'>-                        outb(0x01,io+1);</div><div class='add'>+	/*</div><div class='add'>+	 * Read the shift register</div><div class='add'>+	 */</div><div class='add'>+	for(i=0;i&lt;25;i++) {</div><div class='add'>+		fifo=(fifo&lt;&lt;1)|((inb(io+1)&gt;&gt;7)&amp;0x01);</div><div class='add'>+		if(i&lt;24) {</div><div class='add'>+			outb(0x01,io+1);</div><div class='ctx'> 			tunestat&amp;=inb(io+1);</div><div class='del'>-                        outb(0x00,io+1);</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /*</div><div class='del'>-         * Restore volume/mute setting</div><div class='del'>-         */</div><div class='del'>-        outb(curvol,io+1);</div><div class='add'>+			outb(0x00,io+1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Restore volume/mute setting</div><div class='add'>+	 */</div><div class='add'>+	outb(curvol,io+1);</div><div class='ctx'> 	spin_unlock(&amp;cadet_io_lock);</div><div class='ctx'> </div><div class='ctx'> 	return fifo;</div><div class='hunk'>@@ -136,43 +137,43 @@ static unsigned cadet_gettune(void)</div><div class='ctx'> </div><div class='ctx'> static unsigned cadet_getfreq(void)</div><div class='ctx'> {</div><div class='del'>-        int i;</div><div class='del'>-        unsigned freq=0,test,fifo=0;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned freq=0,test,fifo=0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read current tuning</div><div class='ctx'> 	 */</div><div class='ctx'> 	fifo=cadet_gettune();</div><div class='ctx'> </div><div class='del'>-        /*</div><div class='del'>-         * Convert to actual frequency</div><div class='del'>-         */</div><div class='add'>+	/*</div><div class='add'>+	 * Convert to actual frequency</div><div class='add'>+	 */</div><div class='ctx'> 	if(curtuner==0) {    /* FM */</div><div class='del'>-	        test=12500;</div><div class='del'>-                for(i=0;i&lt;14;i++) {</div><div class='del'>-                        if((fifo&amp;0x01)!=0) {</div><div class='del'>-                                freq+=test;</div><div class='del'>-                        }</div><div class='del'>-                        test=test&lt;&lt;1;</div><div class='del'>-                        fifo=fifo&gt;&gt;1;</div><div class='del'>-                }</div><div class='del'>-                freq-=10700000;           /* IF frequency is 10.7 MHz */</div><div class='del'>-                freq=(freq*16)/1000000;   /* Make it 1/16 MHz */</div><div class='add'>+		test=12500;</div><div class='add'>+		for(i=0;i&lt;14;i++) {</div><div class='add'>+			if((fifo&amp;0x01)!=0) {</div><div class='add'>+				freq+=test;</div><div class='add'>+			}</div><div class='add'>+			test=test&lt;&lt;1;</div><div class='add'>+			fifo=fifo&gt;&gt;1;</div><div class='add'>+		}</div><div class='add'>+		freq-=10700000;           /* IF frequency is 10.7 MHz */</div><div class='add'>+		freq=(freq*16)/1000000;   /* Make it 1/16 MHz */</div><div class='ctx'> 	}</div><div class='ctx'> 	if(curtuner==1) {    /* AM */</div><div class='del'>-	        freq=((fifo&amp;0x7fff)-2010)*16;</div><div class='add'>+		freq=((fifo&amp;0x7fff)-2010)*16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        return freq;</div><div class='add'>+	return freq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cadet_settune(unsigned fifo)</div><div class='ctx'> {</div><div class='del'>-        int i;</div><div class='del'>-	unsigned test;  </div><div class='add'>+	int i;</div><div class='add'>+	unsigned test;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outb(7,io);                /* Select tuner control */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Write the shift register</div><div class='hunk'>@@ -183,7 +184,7 @@ static void cadet_settune(unsigned fifo)</div><div class='ctx'> 	outb(7,io);                /* Select tuner control */</div><div class='ctx'> 	outb(test,io+1);           /* Initialize for write */</div><div class='ctx'> 	for(i=0;i&lt;25;i++) {</div><div class='del'>-   	        test|=0x01;              /* Toggle SCK High */</div><div class='add'>+		test|=0x01;              /* Toggle SCK High */</div><div class='ctx'> 		outb(test,io+1);</div><div class='ctx'> 		test&amp;=0xfe;              /* Toggle SCK Low */</div><div class='ctx'> 		outb(test,io+1);</div><div class='hunk'>@@ -196,57 +197,57 @@ static void cadet_settune(unsigned fifo)</div><div class='ctx'> </div><div class='ctx'> static void cadet_setfreq(unsigned freq)</div><div class='ctx'> {</div><div class='del'>-        unsigned fifo;</div><div class='del'>-        int i,j,test;</div><div class='del'>-        int curvol;</div><div class='add'>+	unsigned fifo;</div><div class='add'>+	int i,j,test;</div><div class='add'>+	int curvol;</div><div class='ctx'> </div><div class='del'>-        /* </div><div class='del'>-         * Formulate a fifo command</div><div class='del'>-         */</div><div class='add'>+	/*</div><div class='add'>+	 * Formulate a fifo command</div><div class='add'>+	 */</div><div class='ctx'> 	fifo=0;</div><div class='ctx'> 	if(curtuner==0) {    /* FM */</div><div class='del'>-        	test=102400;</div><div class='del'>-                freq=(freq*1000)/16;       /* Make it kHz */</div><div class='del'>-                freq+=10700;               /* IF is 10700 kHz */</div><div class='del'>-                for(i=0;i&lt;14;i++) {</div><div class='del'>-                        fifo=fifo&lt;&lt;1;</div><div class='del'>-                        if(freq&gt;=test) {</div><div class='del'>-                                fifo|=0x01;</div><div class='del'>-                                freq-=test;</div><div class='del'>-                        }</div><div class='del'>-                        test=test&gt;&gt;1;</div><div class='del'>-                }</div><div class='add'>+		test=102400;</div><div class='add'>+		freq=(freq*1000)/16;       /* Make it kHz */</div><div class='add'>+		freq+=10700;               /* IF is 10700 kHz */</div><div class='add'>+		for(i=0;i&lt;14;i++) {</div><div class='add'>+			fifo=fifo&lt;&lt;1;</div><div class='add'>+			if(freq&gt;=test) {</div><div class='add'>+				fifo|=0x01;</div><div class='add'>+				freq-=test;</div><div class='add'>+			}</div><div class='add'>+			test=test&gt;&gt;1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if(curtuner==1) {    /* AM */</div><div class='del'>-                fifo=(freq/16)+2010;            /* Make it kHz */</div><div class='add'>+		fifo=(freq/16)+2010;            /* Make it kHz */</div><div class='ctx'> 		fifo|=0x100000;            /* Select AM Band */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        /*</div><div class='del'>-         * Save current volume/mute setting</div><div class='del'>-         */</div><div class='add'>+	/*</div><div class='add'>+	 * Save current volume/mute setting</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='ctx'> 	outb(7,io);                /* Select tuner control */</div><div class='del'>-        curvol=inb(io+1); </div><div class='del'>-        spin_unlock(&amp;cadet_io_lock);</div><div class='add'>+	curvol=inb(io+1);</div><div class='add'>+	spin_unlock(&amp;cadet_io_lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Tune the card</div><div class='ctx'> 	 */</div><div class='ctx'> 	for(j=3;j&gt;-1;j--) {</div><div class='del'>-	        cadet_settune(fifo|(j&lt;&lt;16));</div><div class='del'>-	        </div><div class='del'>-	        spin_lock(&amp;cadet_io_lock);</div><div class='add'>+		cadet_settune(fifo|(j&lt;&lt;16));</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;cadet_io_lock);</div><div class='ctx'> 		outb(7,io);         /* Select tuner control */</div><div class='ctx'> 		outb(curvol,io+1);</div><div class='ctx'> 		spin_unlock(&amp;cadet_io_lock);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		msleep(100);</div><div class='ctx'> </div><div class='ctx'> 		cadet_gettune();</div><div class='ctx'> 		if((tunestat &amp; 0x40) == 0) {   /* Tuned */</div><div class='del'>-		        sigstrength=sigtable[curtuner][j];</div><div class='add'>+			sigstrength=sigtable[curtuner][j];</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -257,28 +258,28 @@ static void cadet_setfreq(unsigned freq)</div><div class='ctx'> static int cadet_getvol(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='del'>-	</div><div class='del'>-        outb(7,io);                /* Select tuner control */</div><div class='del'>-        if((inb(io + 1) &amp; 0x20) != 0)</div><div class='del'>-        	ret = 0xffff;</div><div class='del'>-        </div><div class='del'>-        spin_unlock(&amp;cadet_io_lock);</div><div class='del'>-        return ret;</div><div class='add'>+</div><div class='add'>+	outb(7,io);                /* Select tuner control */</div><div class='add'>+	if((inb(io + 1) &amp; 0x20) != 0)</div><div class='add'>+		ret = 0xffff;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;cadet_io_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void cadet_setvol(int vol)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;cadet_io_lock);</div><div class='del'>-        outb(7,io);                /* Select tuner control */</div><div class='del'>-        if(vol&gt;0)</div><div class='del'>-                outb(0x20,io+1);</div><div class='del'>-        else</div><div class='del'>-                outb(0x00,io+1);</div><div class='add'>+	outb(7,io);                /* Select tuner control */</div><div class='add'>+	if(vol&gt;0)</div><div class='add'>+		outb(0x20,io+1);</div><div class='add'>+	else</div><div class='add'>+		outb(0x00,io+1);</div><div class='ctx'> 	spin_unlock(&amp;cadet_io_lock);</div><div class='del'>-}  </div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void cadet_handler(unsigned long data)</div><div class='ctx'> {</div><div class='hunk'>@@ -288,15 +289,15 @@ static void cadet_handler(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	if(spin_trylock(&amp;cadet_io_lock))</div><div class='ctx'> 	{</div><div class='del'>-	        outb(0x3,io);       /* Select RDS Decoder Control */</div><div class='add'>+		outb(0x3,io);       /* Select RDS Decoder Control */</div><div class='ctx'> 		if((inb(io+1)&amp;0x20)!=0) {</div><div class='del'>-		        printk(KERN_CRIT "cadet: RDS fifo overflow\n");</div><div class='add'>+			printk(KERN_CRIT "cadet: RDS fifo overflow\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		outb(0x80,io);      /* Select RDS fifo */</div><div class='ctx'> 		while((inb(io)&amp;0x80)!=0) {</div><div class='del'>-		        rdsbuf[rdsin]=inb(io+1);</div><div class='add'>+			rdsbuf[rdsin]=inb(io+1);</div><div class='ctx'> 			if(rdsin==rdsout)</div><div class='del'>-			        printk(KERN_WARNING "cadet: RDS buffer overflow\n");</div><div class='add'>+				printk(KERN_WARNING "cadet: RDS buffer overflow\n");</div><div class='ctx'> 			else</div><div class='ctx'> 				rdsin++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -307,9 +308,9 @@ static void cadet_handler(unsigned long data)</div><div class='ctx'> 	 * Service pending read</div><div class='ctx'> 	 */</div><div class='ctx'> 	if( rdsin!=rdsout)</div><div class='del'>-	        wake_up_interruptible(&amp;read_queue);</div><div class='add'>+		wake_up_interruptible(&amp;read_queue);</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='add'>+	/*</div><div class='ctx'> 	 * Clean up and exit</div><div class='ctx'> 	 */</div><div class='ctx'> 	init_timer(&amp;readtimer);</div><div class='hunk'>@@ -324,12 +325,12 @@ static void cadet_handler(unsigned long data)</div><div class='ctx'> static ssize_t cadet_read(struct file *file, char __user *data,</div><div class='ctx'> 			  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-        int i=0;</div><div class='add'>+	int i=0;</div><div class='ctx'> 	unsigned char readbuf[RDS_BUFFER];</div><div class='ctx'> </div><div class='del'>-        if(rdsstat==0) {</div><div class='add'>+	if(rdsstat==0) {</div><div class='ctx'> 		spin_lock(&amp;cadet_io_lock);</div><div class='del'>-	        rdsstat=1;</div><div class='add'>+		rdsstat=1;</div><div class='ctx'> 		outb(0x80,io);        /* Select RDS fifo */</div><div class='ctx'> 		spin_unlock(&amp;cadet_io_lock);</div><div class='ctx'> 		init_timer(&amp;readtimer);</div><div class='hunk'>@@ -339,15 +340,15 @@ static ssize_t cadet_read(struct file *file, char __user *data,</div><div class='ctx'> 		add_timer(&amp;readtimer);</div><div class='ctx'> 	}</div><div class='ctx'> 	if(rdsin==rdsout) {</div><div class='del'>-  	        if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-		        return -EWOULDBLOCK;</div><div class='del'>-	        interruptible_sleep_on(&amp;read_queue);</div><div class='del'>-	}		</div><div class='add'>+		if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='add'>+			return -EWOULDBLOCK;</div><div class='add'>+		interruptible_sleep_on(&amp;read_queue);</div><div class='add'>+	}</div><div class='ctx'> 	while( i&lt;count &amp;&amp; rdsin!=rdsout)</div><div class='del'>-	        readbuf[i++]=rdsbuf[rdsout++];</div><div class='add'>+		readbuf[i++]=rdsbuf[rdsout++];</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(data,readbuf,i))</div><div class='del'>-	        return -EFAULT;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -375,29 +376,29 @@ static int cadet_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			switch(v-&gt;tuner) {</div><div class='del'>-			        case 0:</div><div class='del'>-			        strcpy(v-&gt;name,"FM");</div><div class='del'>-			        v-&gt;rangelow=1400;     /* 87.5 MHz */</div><div class='del'>-			        v-&gt;rangehigh=1728;    /* 108.0 MHz */</div><div class='del'>-			        v-&gt;flags=0;</div><div class='del'>-			        v-&gt;mode=0;</div><div class='del'>-			        v-&gt;mode|=VIDEO_MODE_AUTO;</div><div class='del'>-			        v-&gt;signal=sigstrength;</div><div class='del'>-			        if(cadet_getstereo()==1) {</div><div class='del'>-				        v-&gt;flags|=VIDEO_TUNER_STEREO_ON;</div><div class='del'>-			        }</div><div class='add'>+				case 0:</div><div class='add'>+				strcpy(v-&gt;name,"FM");</div><div class='add'>+				v-&gt;rangelow=1400;     /* 87.5 MHz */</div><div class='add'>+				v-&gt;rangehigh=1728;    /* 108.0 MHz */</div><div class='add'>+				v-&gt;flags=0;</div><div class='add'>+				v-&gt;mode=0;</div><div class='add'>+				v-&gt;mode|=VIDEO_MODE_AUTO;</div><div class='add'>+				v-&gt;signal=sigstrength;</div><div class='add'>+				if(cadet_getstereo()==1) {</div><div class='add'>+					v-&gt;flags|=VIDEO_TUNER_STEREO_ON;</div><div class='add'>+				}</div><div class='ctx'> 				v-&gt;flags|=cadet_getrds();</div><div class='del'>-			        break;</div><div class='del'>-			        case 1:</div><div class='del'>-			        strcpy(v-&gt;name,"AM");</div><div class='del'>-			        v-&gt;rangelow=8320;      /* 520 kHz */</div><div class='del'>-			        v-&gt;rangehigh=26400;    /* 1650 kHz */</div><div class='del'>-			        v-&gt;flags=0;</div><div class='del'>-			        v-&gt;flags|=VIDEO_TUNER_LOW;</div><div class='del'>-			        v-&gt;mode=0;</div><div class='del'>-			        v-&gt;mode|=VIDEO_MODE_AUTO;</div><div class='del'>-			        v-&gt;signal=sigstrength;</div><div class='del'>-			        break;</div><div class='add'>+				break;</div><div class='add'>+				case 1:</div><div class='add'>+				strcpy(v-&gt;name,"AM");</div><div class='add'>+				v-&gt;rangelow=8320;      /* 520 kHz */</div><div class='add'>+				v-&gt;rangehigh=26400;    /* 1650 kHz */</div><div class='add'>+				v-&gt;flags=0;</div><div class='add'>+				v-&gt;flags|=VIDEO_TUNER_LOW;</div><div class='add'>+				v-&gt;mode=0;</div><div class='add'>+				v-&gt;mode|=VIDEO_MODE_AUTO;</div><div class='add'>+				v-&gt;signal=sigstrength;</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -407,49 +408,49 @@ static int cadet_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			if((v-&gt;tuner&lt;0)||(v-&gt;tuner&gt;1)) {</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-			curtuner=v-&gt;tuner;	</div><div class='add'>+			curtuner=v-&gt;tuner;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGFREQ:</div><div class='ctx'> 		{</div><div class='del'>-		        unsigned long *freq = arg;</div><div class='add'>+			unsigned long *freq = arg;</div><div class='ctx'> 			*freq = cadet_getfreq();</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSFREQ:</div><div class='ctx'> 		{</div><div class='del'>-		        unsigned long *freq = arg;</div><div class='add'>+			unsigned long *freq = arg;</div><div class='ctx'> 			if((curtuner==0)&amp;&amp;((*freq&lt;1400)||(*freq&gt;1728))) {</div><div class='del'>-			        return -EINVAL;</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			if((curtuner==1)&amp;&amp;((*freq&lt;8320)||(*freq&gt;26400))) {</div><div class='del'>-			        return -EINVAL;</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			cadet_setfreq(*freq);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags=VIDEO_AUDIO_MUTABLE|VIDEO_AUDIO_VOLUME;</div><div class='ctx'> 			if(cadet_getstereo()==0) {</div><div class='del'>-			        v-&gt;mode=VIDEO_SOUND_MONO;</div><div class='add'>+				v-&gt;mode=VIDEO_SOUND_MONO;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				v-&gt;mode=VIDEO_SOUND_STEREO;</div><div class='ctx'> 			}</div><div class='ctx'> 			v-&gt;volume=cadet_getvol();</div><div class='ctx'> 			v-&gt;step=0xffff;</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			cadet_setvol(v-&gt;volume);</div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE) </div><div class='add'>+			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE)</div><div class='ctx'> 				cadet_setvol(0);</div><div class='ctx'> 			else</div><div class='ctx'> 				cadet_setvol(0xffff);</div><div class='hunk'>@@ -539,16 +540,16 @@ static struct pnp_driver cadet_pnp_driver = {</div><div class='ctx'> </div><div class='ctx'> static int cadet_probe(void)</div><div class='ctx'> {</div><div class='del'>-        static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};</div><div class='add'>+	static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for(i=0;i&lt;8;i++) {</div><div class='del'>-	        io=iovals[i];</div><div class='add'>+		io=iovals[i];</div><div class='ctx'> 		if (request_region(io, 2, "cadet-probe")) {</div><div class='del'>-		        cadet_setfreq(1410);</div><div class='add'>+			cadet_setfreq(1410);</div><div class='ctx'> 			if(cadet_getfreq()==1410) {</div><div class='ctx'> 				release_region(io, 2);</div><div class='del'>-			        return io;</div><div class='add'>+				return io;</div><div class='ctx'> 			}</div><div class='ctx'> 			release_region(io, 2);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -556,7 +557,7 @@ static int cadet_probe(void)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * io should only be set if the user has used something like</div><div class='ctx'>  * isapnp (the userspace program) to initialize this card for us</div><div class='ctx'>  */</div><div class='hunk'>@@ -564,7 +565,7 @@ static int cadet_probe(void)</div><div class='ctx'> static int __init cadet_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_init(&amp;cadet_io_lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	If a probe was requested then probe ISAPnP first (safest)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -579,12 +580,12 @@ static int __init cadet_init(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Else we bail out</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='del'>-        if(io &lt; 0) {</div><div class='del'>-#ifdef MODULE        </div><div class='add'>+</div><div class='add'>+	if(io &lt; 0) {</div><div class='add'>+#ifdef MODULE</div><div class='ctx'> 		printk(KERN_ERR "You must set an I/O address with io=0x???\n");</div><div class='ctx'> #endif</div><div class='del'>-	        goto fail;</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!request_region(io,2,"cadet"))</div><div class='ctx'> 		goto fail;</div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c<br/>index 8e499b8f64c7..4c82956390c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-gemtek-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-gemtek-pci.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  ***************************************************************************</div><div class='del'>- *     </div><div class='add'>+ *</div><div class='ctx'>  *     radio-gemtek-pci.c - Gemtek PCI Radio driver</div><div class='ctx'>  *     (C) 2001 Vladimir Shebordaev &lt;vshebordaev@mail.ru&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,19 +31,19 @@</div><div class='ctx'>  *     radio device driver.</div><div class='ctx'>  *</div><div class='ctx'>  *     Please, let me know if this piece of code was useful :)</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  *     TODO: multiple device support and portability were not tested</div><div class='ctx'>  *</div><div class='ctx'>  ***************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -69,18 +69,18 @@</div><div class='ctx'> #define TRUE (1)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef FALSE </div><div class='add'>+#ifndef FALSE</div><div class='ctx'> #define FALSE (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct gemtek_pci_card {</div><div class='ctx'> 	struct video_device *videodev;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	u32 iobase;</div><div class='ctx'> 	u32 length;</div><div class='ctx'> 	u8  chiprev;</div><div class='ctx'> 	u16 model;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	u32 current_frequency;</div><div class='ctx'> 	u8  mute;</div><div class='ctx'> };</div><div class='hunk'>@@ -96,7 +96,7 @@ static inline u8 gemtek_pci_out( u16 value, u32 port )</div><div class='ctx'> 	return (u8)value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define _b0( v ) *((u8 *)&amp;v)  </div><div class='add'>+#define _b0( v ) *((u8 *)&amp;v)</div><div class='ctx'> static void __gemtek_pci_cmd( u16 value, u32 port, u8 *last_byte, int keep )</div><div class='ctx'> {</div><div class='ctx'> 	register u8 byte = *last_byte;</div><div class='hunk'>@@ -104,7 +104,7 @@ static void __gemtek_pci_cmd( u16 value, u32 port, u8 *last_byte, int keep )</div><div class='ctx'> 	if ( !value ) {</div><div class='ctx'> 		if ( !keep )</div><div class='ctx'> 			value = (u16)port;</div><div class='del'>-		byte &amp;= 0xfd;	</div><div class='add'>+		byte &amp;= 0xfd;</div><div class='ctx'> 	} else</div><div class='ctx'> 		byte |= 2;</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +116,7 @@ static void __gemtek_pci_cmd( u16 value, u32 port, u8 *last_byte, int keep )</div><div class='ctx'> 	byte &amp;= 0xfe;</div><div class='ctx'> 	_b0( value ) = byte;</div><div class='ctx'> 	outw( value, port );</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	*last_byte = byte;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,13 +193,13 @@ static int gemtek_pci_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			c-&gt;audios = 1;</div><div class='ctx'> 			strcpy( c-&gt;name, "Gemtek PCI Radio" );</div><div class='ctx'> 			return 0;</div><div class='del'>-		} </div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *t = arg;</div><div class='ctx'> </div><div class='del'>-			if ( t-&gt;tuner ) </div><div class='add'>+			if ( t-&gt;tuner )</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			t-&gt;rangelow = GEMTEK_PCI_RANGE_LOW;</div><div class='hunk'>@@ -228,7 +228,7 @@ static int gemtek_pci_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCSFREQ:</div><div class='ctx'> 		{</div><div class='ctx'> 			unsigned long *freq = arg;</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 			if ( (*freq &lt; GEMTEK_PCI_RANGE_LOW) ||</div><div class='ctx'> 			     (*freq &gt; GEMTEK_PCI_RANGE_HIGH) )</div><div class='ctx'> 				return -EINVAL;</div><div class='hunk'>@@ -239,9 +239,9 @@ static int gemtek_pci_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *a = arg;</div><div class='ctx'> </div><div class='ctx'> 			memset( a, 0, sizeof( *a ) );</div><div class='hunk'>@@ -249,17 +249,17 @@ static int gemtek_pci_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			a-&gt;volume = 1;</div><div class='ctx'> 			a-&gt;step = 65535;</div><div class='ctx'> 			strcpy( a-&gt;name, "Radio" );</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *a = arg;</div><div class='ctx'> </div><div class='del'>-			if ( a-&gt;audio ) </div><div class='add'>+			if ( a-&gt;audio )</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-			if ( a-&gt;flags &amp; VIDEO_AUDIO_MUTE ) </div><div class='add'>+			if ( a-&gt;flags &amp; VIDEO_AUDIO_MUTE )</div><div class='ctx'> 				gemtek_pci_mute( card );</div><div class='ctx'> 			else</div><div class='ctx'> 				gemtek_pci_unmute( card );</div><div class='hunk'>@@ -323,9 +323,9 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ( pci_enable_device( pci_dev ) ) </div><div class='add'>+	if ( pci_enable_device( pci_dev ) )</div><div class='ctx'> 		goto err_pci;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	card-&gt;iobase = pci_resource_start( pci_dev, 0 );</div><div class='ctx'> 	card-&gt;length = pci_resource_len( pci_dev, 0 );</div><div class='ctx'> </div><div class='hunk'>@@ -338,7 +338,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci</div><div class='ctx'> 	pci_read_config_word( pci_dev, PCI_SUBSYSTEM_ID, &amp;card-&gt;model );</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata( pci_dev, card );</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	if ( (devradio = kmalloc( sizeof( struct video_device ), GFP_KERNEL )) == NULL ) {</div><div class='ctx'> 		printk( KERN_ERR "gemtek_pci: out of memory\n" );</div><div class='ctx'> 		goto err_video;</div><div class='hunk'>@@ -354,7 +354,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci</div><div class='ctx'> 	devradio-&gt;priv = card;</div><div class='ctx'> 	gemtek_pci_mute( card );</div><div class='ctx'> </div><div class='del'>-	printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n", </div><div class='add'>+	printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n",</div><div class='ctx'> 		card-&gt;chiprev, card-&gt;iobase, card-&gt;iobase + card-&gt;length - 1 );</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -364,7 +364,7 @@ err_video:</div><div class='ctx'> </div><div class='ctx'> err_pci:</div><div class='ctx'> 	kfree( card );</div><div class='del'>-	return -ENODEV;        </div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __devexit gemtek_pci_remove( struct pci_dev *pci_dev )</div><div class='hunk'>@@ -375,12 +375,12 @@ static void __devexit gemtek_pci_remove( struct pci_dev *pci_dev )</div><div class='ctx'> 	kfree( card-&gt;videodev );</div><div class='ctx'> </div><div class='ctx'> 	release_region( card-&gt;iobase, card-&gt;length );</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if ( mx )</div><div class='ctx'> 		gemtek_pci_mute( card );</div><div class='ctx'> </div><div class='ctx'> 	kfree( card );</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	pci_set_drvdata( pci_dev, NULL );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c<br/>index 47173be97b9f..162f37d8bf96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-gemtek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-gemtek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-gemtek.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * Besides the protocol changes, this is mostly a copy of:</div><div class='ctx'>  *</div><div class='ctx'>  *    RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  *    Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood</div><div class='ctx'>  *    Converted to new API by Alan Cox &lt;Alan.Cox@linux.org&gt;</div><div class='ctx'>  *    Various bugfixes and enhancements by Russell Kroll &lt;rkroll@exploits.org&gt;</div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_GEMTEK_PORT 	*/</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -29,7 +30,7 @@</div><div class='ctx'> #define CONFIG_RADIO_GEMTEK_PORT -1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int io = CONFIG_RADIO_GEMTEK_PORT; </div><div class='add'>+static int io = CONFIG_RADIO_GEMTEK_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +49,7 @@ struct gemtek_device</div><div class='ctx'>  */</div><div class='ctx'> static void gemtek_mute(struct gemtek_device *dev)</div><div class='ctx'> {</div><div class='del'>-        if(dev-&gt;muted)</div><div class='add'>+	if(dev-&gt;muted)</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock(&amp;lock);</div><div class='ctx'> 	outb(0x10, io);</div><div class='hunk'>@@ -94,20 +95,20 @@ static int gemtek_setfreq(struct gemtek_device *dev, unsigned long freq)</div><div class='ctx'> 	freq /= 100000;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* 2 start bits */</div><div class='ctx'> 	outb_p(0x03, io);</div><div class='ctx'> 	udelay(5);</div><div class='ctx'> 	outb_p(0x07, io);</div><div class='ctx'> 	udelay(5);</div><div class='ctx'> </div><div class='del'>-        /* 28 frequency bits (lsb first) */</div><div class='add'>+	/* 28 frequency bits (lsb first) */</div><div class='ctx'> 	for (i = 0; i &lt; 14; i++)</div><div class='ctx'> 		if (freq &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			one();</div><div class='ctx'> 		else</div><div class='ctx'> 			zero();</div><div class='del'>-        /* 36 unknown bits */</div><div class='add'>+	/* 36 unknown bits */</div><div class='ctx'> 	for (i = 0; i &lt; 11; i++)</div><div class='ctx'> 		zero();</div><div class='ctx'> 	one();</div><div class='hunk'>@@ -123,7 +124,7 @@ static int gemtek_setfreq(struct gemtek_device *dev, unsigned long freq)</div><div class='ctx'> 	udelay(5);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +160,7 @@ static int gemtek_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			v-&gt;rangelow=87*16000;</div><div class='ctx'> 			v-&gt;rangehigh=108*16000;</div><div class='hunk'>@@ -193,25 +194,25 @@ static int gemtek_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags|=VIDEO_AUDIO_MUTABLE;</div><div class='ctx'> 			v-&gt;volume=1;</div><div class='ctx'> 			v-&gt;step=65535;</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE) </div><div class='add'>+			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE)</div><div class='ctx'> 				gemtek_mute(rt);</div><div class='ctx'> 			else</div><div class='del'>-			        gemtek_unmute(rt);</div><div class='add'>+				gemtek_unmute(rt);</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -254,14 +255,14 @@ static int __init gemtek_init(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!request_region(io, 4, "gemtek")) </div><div class='add'>+	if (!request_region(io, 4, "gemtek"))</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "gemtek: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gemtek_radio.priv=&amp;gemtek_unit;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(video_register_device(&amp;gemtek_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(io, 4);</div><div class='hunk'>@@ -274,7 +275,7 @@ static int __init gemtek_init(void)</div><div class='ctx'> 	/* this is _maybe_ unnecessary */</div><div class='ctx'> 	outb(0x01, io);</div><div class='ctx'> </div><div class='del'>- 	/* mute card - prevents noisy bootups */</div><div class='add'>+	/* mute card - prevents noisy bootups */</div><div class='ctx'> 	gemtek_unit.muted = 0;</div><div class='ctx'> 	gemtek_mute(&amp;gemtek_unit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c<br/>index 39c1d9118636..fcfa6c9fe225 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maestro.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-maestro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maestro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-maestro.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * (c) 2000 A. Tlalka, atlka@pg.gda.pl</div><div class='ctx'>  * Notes on the hardware</div><div class='ctx'>  *</div><div class='del'>- *  + Frequency control is done digitally </div><div class='add'>+ *  + Frequency control is done digitally</div><div class='ctx'>  *  + No volume control - only mute/unmute - you have to use Aux line volume</div><div class='ctx'>  *  control on Maestro card to set the volume</div><div class='ctx'>  *  + Radio status (tuned/not_tuned and stereo/mono) is valid some time after</div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"0.05"</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +103,7 @@ static struct video_device maestro_radio = {</div><div class='ctx'> struct radio_device {</div><div class='ctx'> 	u16	io,	/* base of Maestro card radio io (GPIO_DATA)*/</div><div class='ctx'> 		muted,	/* VIDEO_AUDIO_MUTE */</div><div class='del'>-		stereo,	/* VIDEO_TUNER_STEREO_ON */	</div><div class='add'>+		stereo,	/* VIDEO_TUNER_STEREO_ON */</div><div class='ctx'> 		tuned;	/* signal strength (0 or 0xffff) */</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> };</div><div class='hunk'>@@ -122,14 +122,14 @@ static u32 radio_bits_get(struct radio_device *dev)</div><div class='ctx'> 	for (l=24;l--;) {</div><div class='ctx'> 		outw(STR_CLK, io);		/* HI state */</div><div class='ctx'> 		udelay(2);</div><div class='del'>-		if(!l) </div><div class='add'>+		if(!l)</div><div class='ctx'> 			dev-&gt;tuned = inw(io) &amp; STR_MOST ? 0 : 0xffff;</div><div class='ctx'> 		outw(0, io);			/* LO state */</div><div class='ctx'> 		udelay(2);</div><div class='ctx'> 		data &lt;&lt;= 1;			/* shift data */</div><div class='ctx'> 		rdata = inw(io);</div><div class='ctx'> 		if(!l)</div><div class='del'>-			dev-&gt;stereo =  rdata &amp; STR_MOST ? </div><div class='add'>+			dev-&gt;stereo =  rdata &amp; STR_MOST ?</div><div class='ctx'> 			0 : VIDEO_TUNER_STEREO_ON;</div><div class='ctx'> 		else</div><div class='ctx'> 			if(rdata &amp; STR_DATA)</div><div class='head'>diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c<br/>index f0bf47bcb64c..f93d7afe7304 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maxiradio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-maxiradio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-maxiradio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-maxiradio.c</a></div><div class='hunk'>@@ -1,15 +1,15 @@</div><div class='del'>-/* </div><div class='del'>- * Guillemot Maxi Radio FM 2000 PCI radio card driver for Linux </div><div class='add'>+/*</div><div class='add'>+ * Guillemot Maxi Radio FM 2000 PCI radio card driver for Linux</div><div class='ctx'>  * (C) 2001 Dimitromanolakis Apostolos &lt;apdim@grecian.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based in the radio Maestro PCI driver. Actually it uses the same chip</div><div class='ctx'>  * for radio but different pci controller.</div><div class='ctx'>  *</div><div class='ctx'>  * I didn't have any specs I reversed engineered the protocol from</div><div class='del'>- * the windows driver (radio.dll). </div><div class='add'>+ * the windows driver (radio.dll).</div><div class='ctx'>  *</div><div class='ctx'>  * The card uses the TEA5757 chip that includes a search function but it</div><div class='del'>- * is useless as I haven't found any way to read back the frequency. If </div><div class='add'>+ * is useless as I haven't found any way to read back the frequency. If</div><div class='ctx'>  * anybody does please mail me.</div><div class='ctx'>  *</div><div class='ctx'>  * For the pdf file see:</div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'>  *     - tiding up</div><div class='ctx'>  *     - removed support for multiple devices as it didn't work anyway</div><div class='ctx'>  *</div><div class='del'>- * BUGS: </div><div class='add'>+ * BUGS:</div><div class='ctx'>  *   - card unmutes if you change frequency</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* version 0.75      Sun Feb  4 22:51:27 EET 2001 */</div><div class='ctx'> #define DRIVER_VERSION	"0.75"</div><div class='hunk'>@@ -80,7 +81,7 @@ static struct file_operations maxiradio_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.open           = video_exclusive_open,</div><div class='ctx'> 	.release        = video_exclusive_release,</div><div class='del'>-	.ioctl	        = radio_ioctl,</div><div class='add'>+	.ioctl		= radio_ioctl,</div><div class='ctx'> 	.compat_ioctl	= v4l_compat_ioctl32,</div><div class='ctx'> 	.llseek         = no_llseek,</div><div class='ctx'> };</div><div class='hunk'>@@ -97,11 +98,11 @@ static struct radio_device</div><div class='ctx'> {</div><div class='ctx'> 	__u16	io,	/* base of radio io */</div><div class='ctx'> 		muted,	/* VIDEO_AUDIO_MUTE */</div><div class='del'>-		stereo,	/* VIDEO_TUNER_STEREO_ON */	</div><div class='add'>+		stereo,	/* VIDEO_TUNER_STEREO_ON */</div><div class='ctx'> 		tuned;	/* signal strength (0 or 0xffff) */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	unsigned long freq;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	struct mutex lock;</div><div class='ctx'> } radio_unit = {0, 0, 0, 0, };</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +115,7 @@ static void outbit(unsigned long bit, __u16 io)</div><div class='ctx'> 			outb(  power|wren|data|clk ,io); udelay(4);</div><div class='ctx'> 			outb(  power|wren|data     ,io); udelay(4);</div><div class='ctx'> 		}</div><div class='del'>-	else	</div><div class='add'>+	else</div><div class='ctx'> 		{</div><div class='ctx'> 			outb(  power|wren          ,io); udelay(4);</div><div class='ctx'> 			outb(  power|wren|clk      ,io); udelay(4);</div><div class='hunk'>@@ -132,12 +133,12 @@ static void set_freq(__u16 io, __u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long int si;</div><div class='ctx'> 	int bl;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* TEA5757 shift register bits (see pdf) */</div><div class='ctx'> </div><div class='del'>-	outbit(0,io); // 24  search </div><div class='add'>+	outbit(0,io); // 24  search</div><div class='ctx'> 	outbit(1,io); // 23  search up/down</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outbit(0,io); // 22  stereo/mono</div><div class='ctx'> </div><div class='ctx'> 	outbit(0,io); // 21  band</div><div class='hunk'>@@ -145,24 +146,24 @@ static void set_freq(__u16 io, __u32 data)</div><div class='ctx'> </div><div class='ctx'> 	outbit(0,io); // 19  port ?</div><div class='ctx'> 	outbit(0,io); // 18  port ?</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outbit(0,io); // 17  search level</div><div class='ctx'> 	outbit(0,io); // 16  search level</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	si = 0x8000;</div><div class='ctx'> 	for(bl = 1; bl &lt;= 16 ; bl++) { outbit(data &amp; si,io); si &gt;&gt;=1; }</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outb(power,io);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_stereo(__u16 io)</div><div class='del'>-{	</div><div class='add'>+{</div><div class='ctx'> 	outb(power,io); udelay(4);</div><div class='ctx'> 	return !(inb(io) &amp; mo_st);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_tune(__u16 io)</div><div class='del'>-{	</div><div class='add'>+{</div><div class='ctx'> 	outb(power+clk,io); udelay(4);</div><div class='ctx'> 	return !(inb(io) &amp; mo_st);</div><div class='ctx'> }</div><div class='hunk'>@@ -177,7 +178,7 @@ static inline int radio_function(struct inode *inode, struct file *file,</div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 		case VIDIOCGCAP: {</div><div class='ctx'> 			struct video_capability *v = arg;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			memset(v,0,sizeof(*v));</div><div class='ctx'> 			strcpy(v-&gt;name, "Maxi Radio FM2000 radio");</div><div class='ctx'> 			v-&gt;type=VID_TYPE_TUNER;</div><div class='hunk'>@@ -186,22 +187,22 @@ static inline int radio_function(struct inode *inode, struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGTUNER: {</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if(v-&gt;tuner)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 			card-&gt;stereo = 0xffff * get_stereo(card-&gt;io);</div><div class='ctx'> 			card-&gt;tuned = 0xffff * get_tune(card-&gt;io);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			v-&gt;flags = VIDEO_TUNER_LOW | card-&gt;stereo;</div><div class='ctx'> 			v-&gt;signal = card-&gt;tuned;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			strcpy(v-&gt;name, "FM");</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			v-&gt;rangelow = FREQ_LO;</div><div class='ctx'> 			v-&gt;rangehigh = FREQ_HI;</div><div class='ctx'> 			v-&gt;mode = VIDEO_MODE_AUTO;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSTUNER: {</div><div class='hunk'>@@ -212,13 +213,13 @@ static inline int radio_function(struct inode *inode, struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGFREQ: {</div><div class='ctx'> 			unsigned long *freq = arg;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			*freq = card-&gt;freq;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSFREQ: {</div><div class='ctx'> 			unsigned long *freq = arg;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if (*freq &lt; FREQ_LO || *freq &gt; FREQ_HI)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			card-&gt;freq = *freq;</div><div class='hunk'>@@ -226,18 +227,18 @@ static inline int radio_function(struct inode *inode, struct file *file,</div><div class='ctx'> 			msleep(125);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		case VIDIOCGAUDIO: {	</div><div class='add'>+		case VIDIOCGAUDIO: {</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0,sizeof(*v));</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='ctx'> 			v-&gt;flags=VIDEO_AUDIO_MUTABLE | card-&gt;muted;</div><div class='ctx'> 			v-&gt;mode=VIDEO_SOUND_STEREO;</div><div class='del'>-			return 0;		</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		case VIDIOCSAUDIO: {</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			card-&gt;muted = v-&gt;flags &amp; VIDEO_AUDIO_MUTE;</div><div class='hunk'>@@ -249,13 +250,13 @@ static inline int radio_function(struct inode *inode, struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGUNIT: {</div><div class='ctx'> 			struct video_unit *v = arg;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			v-&gt;video=VIDEO_NO_UNIT;</div><div class='ctx'> 			v-&gt;vbi=VIDEO_NO_UNIT;</div><div class='ctx'> 			v-&gt;radio=dev-&gt;minor;</div><div class='ctx'> 			v-&gt;audio=0;</div><div class='ctx'> 			v-&gt;teletext=VIDEO_NO_UNIT;</div><div class='del'>-			return 0;		</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		default: return -ENOIOCTLCMD;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -267,7 +268,7 @@ static int radio_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct radio_device *card=dev-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;card-&gt;lock);</div><div class='ctx'> 	ret = video_usercopy(inode, file, cmd, arg, radio_function);</div><div class='ctx'> 	mutex_unlock(&amp;card-&gt;lock);</div><div class='hunk'>@@ -282,21 +283,21 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	if(!request_region(pci_resource_start(pdev, 0),</div><div class='del'>-	                   pci_resource_len(pdev, 0), "Maxi Radio FM 2000")) {</div><div class='del'>-	        printk(KERN_ERR "radio-maxiradio: can't reserve I/O ports\n");</div><div class='del'>-	        goto err_out;</div><div class='add'>+			   pci_resource_len(pdev, 0), "Maxi Radio FM 2000")) {</div><div class='add'>+		printk(KERN_ERR "radio-maxiradio: can't reserve I/O ports\n");</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(pdev))</div><div class='del'>-	        goto err_out_free_region;</div><div class='add'>+		goto err_out_free_region;</div><div class='ctx'> </div><div class='ctx'> 	radio_unit.io = pci_resource_start(pdev, 0);</div><div class='ctx'> 	mutex_init(&amp;radio_unit.lock);</div><div class='ctx'> 	maxiradio_radio.priv = &amp;radio_unit;</div><div class='ctx'> </div><div class='ctx'> 	if(video_register_device(&amp;maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {</div><div class='del'>-	        printk("radio-maxiradio: can't register device!");</div><div class='del'>-	        goto err_out_free_region;</div><div class='add'>+		printk("radio-maxiradio: can't register device!");</div><div class='add'>+		goto err_out_free_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "radio-maxiradio: version "</div><div class='head'>diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c<br/>index 28a47c9e7a81..5b68ac4c7322 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-rtrack2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-rtrack2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-rtrack2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-rtrack2.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood</div><div class='ctx'>  * Converted to new API by Alan Cox &lt;Alan.Cox@linux.org&gt;</div><div class='ctx'>  * Various bugfixes and enhancements by Russell Kroll &lt;rkroll@exploits.org&gt;</div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_RTRACK2_PORT 	*/</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,7 +23,7 @@</div><div class='ctx'> #define CONFIG_RADIO_RTRACK2_PORT -1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int io = CONFIG_RADIO_RTRACK2_PORT; </div><div class='add'>+static int io = CONFIG_RADIO_RTRACK2_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -38,7 +39,7 @@ struct rt_device</div><div class='ctx'> </div><div class='ctx'> static void rt_mute(struct rt_device *dev)</div><div class='ctx'> {</div><div class='del'>-        if(dev-&gt;muted)</div><div class='add'>+	if(dev-&gt;muted)</div><div class='ctx'> 		return;</div><div class='ctx'> 	spin_lock(&amp;lock);</div><div class='ctx'> 	outb(1, io);</div><div class='hunk'>@@ -58,14 +59,14 @@ static void rt_unmute(struct rt_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void zero(void)</div><div class='ctx'> {</div><div class='del'>-        outb_p(1, io);</div><div class='add'>+	outb_p(1, io);</div><div class='ctx'> 	outb_p(3, io);</div><div class='ctx'> 	outb_p(1, io);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void one(void)</div><div class='ctx'> {</div><div class='del'>-        outb_p(5, io);</div><div class='add'>+	outb_p(5, io);</div><div class='ctx'> 	outb_p(7, io);</div><div class='ctx'> 	outb_p(5, io);</div><div class='ctx'> }</div><div class='hunk'>@@ -75,7 +76,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	freq = freq / 200 + 856;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;lock);</div><div class='ctx'> </div><div class='ctx'> 	outb_p(0xc8, io);</div><div class='hunk'>@@ -94,7 +95,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)</div><div class='ctx'> 	outb_p(0xc8, io);</div><div class='ctx'> 	if (!dev-&gt;muted)</div><div class='ctx'> 		outb_p(0, io);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -127,7 +128,7 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			v-&gt;rangelow=88*16000;</div><div class='ctx'> 			v-&gt;rangehigh=108*16000;</div><div class='hunk'>@@ -159,25 +160,25 @@ static int rt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags|=VIDEO_AUDIO_MUTABLE;</div><div class='ctx'> 			v-&gt;volume=1;</div><div class='ctx'> 			v-&gt;step=65535;</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE) </div><div class='add'>+			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE)</div><div class='ctx'> 				rt_mute(rt);</div><div class='ctx'> 			else</div><div class='del'>-			        rt_unmute(rt);</div><div class='add'>+				rt_unmute(rt);</div><div class='ctx'> </div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -219,7 +220,7 @@ static int __init rtrack2_init(void)</div><div class='ctx'> 		printk(KERN_ERR "You must set an I/O address with io=0x20c or io=0x30c\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (!request_region(io, 4, "rtrack2")) </div><div class='add'>+	if (!request_region(io, 4, "rtrack2"))</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "rtrack2: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -227,16 +228,16 @@ static int __init rtrack2_init(void)</div><div class='ctx'> </div><div class='ctx'> 	rtrack2_radio.priv=&amp;rtrack2_unit;</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;lock);	</div><div class='add'>+	spin_lock_init(&amp;lock);</div><div class='ctx'> 	if(video_register_device(&amp;rtrack2_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(io, 4);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "AIMSlab Radiotrack II card driver.\n");</div><div class='ctx'> </div><div class='del'>- 	/* mute card - prevents noisy bootups */</div><div class='add'>+	/* mute card - prevents noisy bootups */</div><div class='ctx'> 	outb(1, io);</div><div class='ctx'> 	rtrack2_unit.muted = 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c<br/>index 53073b424107..efee6e339d15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-sf16fmi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-sf16fmi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-sf16fmi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-sf16fmi.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>  *  Frequency control is done digitally -- ie out(port,encodefreq(95.8));</div><div class='ctx'>  *  No volume control - only mute/unmute - you have to use line volume</div><div class='ctx'>  *  control on SB-part of SF16FMI</div><div class='del'>- *  </div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;	/* __setup			*/</div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;	/* request_region		*/</div><div class='ctx'> #include &lt;linux/delay.h&gt;	/* udelay			*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='hunk'>@@ -29,19 +30,19 @@</div><div class='ctx'> struct fmi_device</div><div class='ctx'> {</div><div class='ctx'> 	int port;</div><div class='del'>-        int curvol; /* 1 or 0 */</div><div class='del'>-        unsigned long curfreq; /* freq in kHz */</div><div class='del'>-        __u32 flags;</div><div class='add'>+	int curvol; /* 1 or 0 */</div><div class='add'>+	unsigned long curfreq; /* freq in kHz */</div><div class='add'>+	__u32 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int io = -1; </div><div class='add'>+static int io = -1;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static struct pnp_dev *dev = NULL;</div><div class='ctx'> static struct mutex lock;</div><div class='ctx'> </div><div class='ctx'> /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */</div><div class='ctx'> /* It is only useful to give freq in intervall of 800 (=0.05Mhz),</div><div class='del'>- * other bits will be truncated, e.g 92.7400016 -&gt; 92.7, but </div><div class='add'>+ * other bits will be truncated, e.g 92.7400016 -&gt; 92.7, but</div><div class='ctx'>  * 92.7400017 -&gt; 92.75</div><div class='ctx'>  */</div><div class='ctx'> #define RSF16_ENCODE(x)	((x)/800+214)</div><div class='hunk'>@@ -51,7 +52,7 @@ static struct mutex lock;</div><div class='ctx'> static void outbits(int bits, unsigned int data, int port)</div><div class='ctx'> {</div><div class='ctx'> 	while(bits--) {</div><div class='del'>- 		if(data &amp; 1) {</div><div class='add'>+		if(data &amp; 1) {</div><div class='ctx'> 			outb(5, port);</div><div class='ctx'> 			udelay(6);</div><div class='ctx'> 			outb(7, port);</div><div class='hunk'>@@ -101,7 +102,7 @@ static inline int fmi_getsigstr(struct fmi_device *dev)</div><div class='ctx'> 	int res;</div><div class='ctx'> 	int myport = dev-&gt;port;</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;lock);</div><div class='ctx'> 	val = dev-&gt;curvol ? 0x08 : 0x00;	/* unmute/mute */</div><div class='ctx'> 	outb(val, myport);</div><div class='hunk'>@@ -109,7 +110,7 @@ static inline int fmi_getsigstr(struct fmi_device *dev)</div><div class='ctx'> 	msleep(143); 		/* was schedule_timeout(HZ/7) */</div><div class='ctx'> 	res = (int)inb(myport+1);</div><div class='ctx'> 	outb(val, myport);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;lock);</div><div class='ctx'> 	return (res &amp; 2) ? 0 : 0xFFFF;</div><div class='ctx'> }</div><div class='hunk'>@@ -119,7 +120,7 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct fmi_device *fmi=dev-&gt;priv;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='ctx'> 		case VIDIOCGCAP:</div><div class='hunk'>@@ -174,18 +175,18 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			/*rounding in steps of 800 to match th freq</div><div class='ctx'> 			  that will be used */</div><div class='del'>-			fmi-&gt;curfreq = (*freq/800)*800; </div><div class='add'>+			fmi-&gt;curfreq = (*freq/800)*800;</div><div class='ctx'> 			fmi_setfreq(fmi);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0,sizeof(*v));</div><div class='ctx'> 			v-&gt;flags=( (!fmi-&gt;curvol)*VIDEO_AUDIO_MUTE | VIDEO_AUDIO_MUTABLE);</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='ctx'> 			v-&gt;mode=VIDEO_SOUND_STEREO;</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='hunk'>@@ -193,19 +194,19 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			fmi-&gt;curvol= v-&gt;flags&amp;VIDEO_AUDIO_MUTE ? 0 : 1;</div><div class='del'>-			fmi-&gt;curvol ? </div><div class='add'>+			fmi-&gt;curvol ?</div><div class='ctx'> 				fmi_unmute(fmi-&gt;port) : fmi_mute(fmi-&gt;port);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-	        case VIDIOCGUNIT:</div><div class='add'>+		case VIDIOCGUNIT:</div><div class='ctx'> 		{</div><div class='del'>-               		struct video_unit *v = arg;</div><div class='add'>+			struct video_unit *v = arg;</div><div class='ctx'> 			v-&gt;video=VIDEO_NO_UNIT;</div><div class='ctx'> 			v-&gt;vbi=VIDEO_NO_UNIT;</div><div class='ctx'> 			v-&gt;radio=dev-&gt;minor;</div><div class='ctx'> 			v-&gt;audio=0; /* How do we find out this??? */</div><div class='ctx'> 			v-&gt;teletext=VIDEO_NO_UNIT;</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENOIOCTLCMD;</div><div class='hunk'>@@ -295,14 +296,14 @@ static int __init fmi_init(void)</div><div class='ctx'> 	fmi_unit.curfreq = 0;</div><div class='ctx'> 	fmi_unit.flags = VIDEO_TUNER_LOW;</div><div class='ctx'> 	fmi_radio.priv = &amp;fmi_unit;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (video_register_device(&amp;fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {</div><div class='ctx'> 		release_region(io, 2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "SF16FMx radio card driver at 0x%x\n", io);</div><div class='ctx'> 	/* mute card - prevents noisy bootups */</div><div class='ctx'> 	fmi_mute(io);</div><div class='head'>diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c<br/>index bcebd8cb19ad..3483b2c7bc9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-sf16fmr2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-sf16fmr2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-sf16fmr2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-sf16fmr2.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mutex lock;</div><div class='hunk'>@@ -202,7 +203,7 @@ static int fmr2_setvolume(struct fmr2_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fmr2_do_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-                      unsigned int cmd, void *arg)</div><div class='add'>+		      unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct fmr2_device *fmr2 = dev-&gt;priv;</div><div class='hunk'>@@ -344,7 +345,7 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fmr2_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-                      unsigned int cmd, unsigned long arg)</div><div class='add'>+		      unsigned int cmd, unsigned long arg)</div><div class='ctx'>  {</div><div class='ctx'> 	return video_usercopy(inode, file, cmd, arg, fmr2_do_ioctl);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c<br/>index fcfde2e4f195..dfba4ae596cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-terratec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-terratec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-terratec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-terratec.c</a></div><div class='hunk'>@@ -2,11 +2,11 @@</div><div class='ctx'>  * (c) 1999 R. Offermanns (rolf@offermanns.de)</div><div class='ctx'>  * based on the aimslab radio driver from M. Kirkwood</div><div class='ctx'>  * many thanks to Michael Becker and Friedhelm Birth (from TerraTec)</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  *</div><div class='ctx'>  * History:</div><div class='ctx'>  * 1999-05-21	First preview release</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  *  Notes on the hardware:</div><div class='ctx'>  *  There are two "main" chips on the card:</div><div class='ctx'>  *  - Philips OM5610 (http://www-us.semiconductors.philips.com/acrobat/datasheets/OM5610_2.pdf)</div><div class='hunk'>@@ -20,7 +20,7 @@</div><div class='ctx'>  *  (as soon i have understand how to get started :)</div><div class='ctx'>  *  If you can help me out with that, please contact me!!</div><div class='ctx'>  *</div><div class='del'>- *  </div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;	/* Modules 			*/</div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p			*/</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user		*/</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs		*/</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_TERRATEC_PORT 	*/</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +50,7 @@</div><div class='ctx'> #define WRT_EN		0x10</div><div class='ctx'> /*******************************************************************/</div><div class='ctx'> </div><div class='del'>-static int io = CONFIG_RADIO_TERRATEC_PORT; </div><div class='add'>+static int io = CONFIG_RADIO_TERRATEC_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static spinlock_t lock;</div><div class='ctx'> </div><div class='hunk'>@@ -88,15 +89,15 @@ static void tt_mute(struct tt_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int tt_setvol(struct tt_device *dev, int vol)</div><div class='ctx'> {</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> //	printk(KERN_ERR "setvol called, vol = %d\n", vol);</div><div class='ctx'> </div><div class='ctx'> 	if(vol == dev-&gt;curvol) {	/* requested volume = current */</div><div class='ctx'> 		if (dev-&gt;muted) {	/* user is unmuting the card  */</div><div class='ctx'> 			dev-&gt;muted = 0;</div><div class='ctx'> 			cardWriteVol(vol);	/* enable card */</div><div class='del'>-		}	</div><div class='del'>-	</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -107,9 +108,9 @@ static int tt_setvol(struct tt_device *dev, int vol)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;muted = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	cardWriteVol(vol);</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 	dev-&gt;curvol = vol;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -121,13 +122,13 @@ static int tt_setvol(struct tt_device *dev, int vol)</div><div class='ctx'> /* many more or less strange things are going on here, but hey, it works :) */</div><div class='ctx'> </div><div class='ctx'> static int tt_setfreq(struct tt_device *dev, unsigned long freq1)</div><div class='del'>-{	</div><div class='add'>+{</div><div class='ctx'> 	int freq;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int p;</div><div class='ctx'> 	int  temp;</div><div class='ctx'> 	long rest;</div><div class='del'>-     </div><div class='add'>+</div><div class='ctx'> 	unsigned char buffer[25];		/* we have to bit shift 25 registers */</div><div class='ctx'> 	freq = freq1/160;			/* convert the freq. to a nice to handle value */</div><div class='ctx'> 	for(i=24;i&gt;-1;i--)</div><div class='hunk'>@@ -142,9 +143,9 @@ static int tt_setfreq(struct tt_device *dev, unsigned long freq1)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (rest%temp  == rest)</div><div class='ctx'> 			buffer[i] = 0;</div><div class='del'>-		else </div><div class='add'>+		else</div><div class='ctx'> 		{</div><div class='del'>-			buffer[i] = 1; </div><div class='add'>+			buffer[i] = 1;</div><div class='ctx'> 			rest = rest-temp;</div><div class='ctx'> 		}</div><div class='ctx'> 		i--;</div><div class='hunk'>@@ -153,10 +154,10 @@ static int tt_setfreq(struct tt_device *dev, unsigned long freq1)</div><div class='ctx'>        }</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i=24;i&gt;-1;i--)			/* bit shift the values to the radiocard */</div><div class='ctx'> 	{</div><div class='del'>-		if (buffer[i]==1) </div><div class='add'>+		if (buffer[i]==1)</div><div class='ctx'> 		{</div><div class='ctx'> 			outb(WRT_EN|DATA, BASEPORT);</div><div class='ctx'> 			outb(WRT_EN|DATA|CLK_ON  , BASEPORT);</div><div class='hunk'>@@ -168,11 +169,11 @@ static int tt_setfreq(struct tt_device *dev, unsigned long freq1)</div><div class='ctx'> 			outb(WRT_EN|0x00|CLK_ON  , BASEPORT);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	outb(0x00, BASEPORT);     </div><div class='del'>-	</div><div class='add'>+	outb(0x00, BASEPORT);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;lock);</div><div class='del'>-  </div><div class='del'>-  	return 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tt_getsigstr(struct tt_device *dev)		/* TODO */</div><div class='hunk'>@@ -190,7 +191,7 @@ static int tt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *dev = video_devdata(file);</div><div class='ctx'> 	struct tt_device *tt=dev-&gt;priv;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch(cmd)</div><div class='ctx'> 	{</div><div class='ctx'> 		case VIDIOCGCAP:</div><div class='hunk'>@@ -206,7 +207,7 @@ static int tt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			v-&gt;rangelow=(87*16000);</div><div class='ctx'> 			v-&gt;rangehigh=(108*16000);</div><div class='hunk'>@@ -238,21 +239,21 @@ static int tt_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags|=VIDEO_AUDIO_MUTABLE|VIDEO_AUDIO_VOLUME;</div><div class='ctx'> 			v-&gt;volume=tt-&gt;curvol * 6554;</div><div class='ctx'> 			v-&gt;step=6554;</div><div class='ctx'> 			strcpy(v-&gt;name, "Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE) </div><div class='add'>+			if(v-&gt;flags&amp;VIDEO_AUDIO_MUTE)</div><div class='ctx'> 				tt_mute(tt);</div><div class='ctx'> 			else</div><div class='ctx'> 				tt_setvol(tt,v-&gt;volume/6554);</div><div class='hunk'>@@ -296,25 +297,25 @@ static int __init terratec_init(void)</div><div class='ctx'> 		printk(KERN_ERR "You must set an I/O address with io=0x???\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (!request_region(io, 2, "terratec")) </div><div class='add'>+	if (!request_region(io, 2, "terratec"))</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "TerraTec: port 0x%x already in use\n", io);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	terratec_radio.priv=&amp;terratec_unit;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(video_register_device(&amp;terratec_radio, VFL_TYPE_RADIO, radio_nr)==-1)</div><div class='ctx'> 	{</div><div class='ctx'> 		release_region(io,2);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "TERRATEC ActivRadio Standalone card driver.\n");</div><div class='ctx'> </div><div class='del'>- 	/* mute card - prevents noisy bootups */</div><div class='add'>+	/* mute card - prevents noisy bootups */</div><div class='ctx'> </div><div class='ctx'> 	/* this ensures that the volume is all the way down  */</div><div class='ctx'> 	cardWriteVol(0);</div><div class='hunk'>@@ -334,7 +335,7 @@ static void __exit terratec_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	video_unregister_device(&amp;terratec_radio);</div><div class='ctx'> 	release_region(io,2);</div><div class='del'>-	printk(KERN_INFO "TERRATEC ActivRadio Standalone card driver unloaded.\n");	</div><div class='add'>+	printk(KERN_INFO "TERRATEC ActivRadio Standalone card driver unloaded.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(terratec_init);</div><div class='head'>diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c<br/>index 5a099a50d4d0..8da4badc22b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-trust.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-trust.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-trust.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-trust.c</a></div><div class='hunk'>@@ -1,14 +1,14 @@</div><div class='del'>-/* radio-trust.c - Trust FM Radio card driver for Linux 2.2 </div><div class='add'>+/* radio-trust.c - Trust FM Radio card driver for Linux 2.2</div><div class='ctx'>  * by Eric Lammerts &lt;eric@scintilla.utwente.nl&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Based on radio-aztech.c. Original notes:</div><div class='ctx'>  *</div><div class='del'>- * Adapted to support the Video for Linux API by </div><div class='add'>+ * Adapted to support the Video for Linux API by</div><div class='ctx'>  * Russell Kroll &lt;rkroll@exploits.org&gt;.  Based on original tuner code by:</div><div class='ctx'>  *</div><div class='ctx'>  * Quay Ly</div><div class='ctx'>  * Donald Song</div><div class='del'>- * Jason Lewis      (jlewis@twilight.vtc.vsc.edu) </div><div class='add'>+ * Jason Lewis      (jlewis@twilight.vtc.vsc.edu)</div><div class='ctx'>  * Scott McGrath    (smcgrath@twilight.vtc.vsc.edu)</div><div class='ctx'>  * William McGrath  (wmcgrath@twilight.vtc.vsc.edu)</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_TRUST_PORT 	*/</div><div class='ctx'> </div><div class='ctx'> /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */</div><div class='hunk'>@@ -30,7 +31,7 @@</div><div class='ctx'> #define CONFIG_RADIO_TRUST_PORT -1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int io = CONFIG_RADIO_TRUST_PORT; </div><div class='add'>+static int io = CONFIG_RADIO_TRUST_PORT;</div><div class='ctx'> static int radio_nr = -1;</div><div class='ctx'> static int ioval = 0xf;</div><div class='ctx'> static __u16 curvol;</div><div class='hunk'>@@ -135,7 +136,7 @@ static void tr_setmute(int mute)</div><div class='ctx'> static int tr_getsigstr(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, v;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for(i = 0, v = 0; i &lt; 100; i++) v |= inb(io);</div><div class='ctx'> 	return (v &amp; 1)? 0 : 0xffff;</div><div class='ctx'> }</div><div class='hunk'>@@ -175,7 +176,7 @@ static int tr_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='ctx'> </div><div class='del'>-			if(v-&gt;tuner)	/* Only 1 tuner */ </div><div class='add'>+			if(v-&gt;tuner)	/* Only 1 tuner */</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			v-&gt;rangelow = 87500 * 16;</div><div class='hunk'>@@ -211,28 +212,28 @@ static int tr_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCGAUDIO:</div><div class='del'>-		{	</div><div class='add'>+		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> </div><div class='ctx'> 			memset(v,0, sizeof(*v));</div><div class='ctx'> 			v-&gt;flags = VIDEO_AUDIO_MUTABLE | VIDEO_AUDIO_VOLUME |</div><div class='del'>-			          VIDEO_AUDIO_BASS | VIDEO_AUDIO_TREBLE;</div><div class='add'>+				  VIDEO_AUDIO_BASS | VIDEO_AUDIO_TREBLE;</div><div class='ctx'> 			v-&gt;mode = curstereo? VIDEO_SOUND_STEREO : VIDEO_SOUND_MONO;</div><div class='ctx'> 			v-&gt;volume = curvol * 2048;</div><div class='ctx'> 			v-&gt;step = 2048;</div><div class='ctx'> 			v-&gt;bass = curbass * 4370;</div><div class='ctx'> 			v-&gt;treble = curtreble * 4370;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			strcpy(v-&gt;name, "Trust FM Radio");</div><div class='del'>-			return 0;			</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		case VIDIOCSAUDIO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_audio *v = arg;</div><div class='ctx'> </div><div class='del'>-			if(v-&gt;audio) </div><div class='add'>+			if(v-&gt;audio)</div><div class='ctx'> 				return -EINVAL;</div><div class='del'>-			tr_setvol(v-&gt;volume);					</div><div class='add'>+			tr_setvol(v-&gt;volume);</div><div class='ctx'> 			tr_setbass(v-&gt;bass);</div><div class='ctx'> 			tr_settreble(v-&gt;treble);</div><div class='ctx'> 			tr_setstereo(v-&gt;mode &amp; VIDEO_SOUND_STEREO);</div><div class='hunk'>@@ -292,7 +293,7 @@ static int __init trust_init(void)</div><div class='ctx'> 	write_i2c(2, TDA7318_ADDR, 0xe0);	/* speaker att. RR = 0 dB */</div><div class='ctx'> 	write_i2c(2, TDA7318_ADDR, 0x40);	/* stereo 1 input, gain = 18.75 dB */</div><div class='ctx'> </div><div class='del'>-	tr_setvol(0x8000);					</div><div class='add'>+	tr_setvol(0x8000);</div><div class='ctx'> 	tr_setbass(0x8000);</div><div class='ctx'> 	tr_settreble(0x8000);</div><div class='ctx'> 	tr_setstereo(1);</div><div class='head'>diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c<br/>index e50955836d6b..edd012288669 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-typhoon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-typhoon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-typhoon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-typhoon.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p                   */</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user              */</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs           */</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_TYPHOON_*         */</div><div class='ctx'> </div><div class='ctx'> #define BANNER "Typhoon Radio Card driver v0.1\n"</div><div class='hunk'>@@ -361,8 +362,8 @@ static int __init typhoon_init(void)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RADIO_TYPHOON_PROC_FS</div><div class='ctx'> 	if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL,</div><div class='del'>-				    typhoon_get_info)) </div><div class='del'>-	    	printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");</div><div class='add'>+				    typhoon_get_info))</div><div class='add'>+		printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c<br/>index 7bf1a4264891..59b86a6b4b0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-zoltrix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/radio/radio-zoltrix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/radio/radio-zoltrix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/radio/radio-zoltrix.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* zoltrix radio plus driver for Linux radio support</div><div class='ctx'>  * (c) 1998 C. van Schaik &lt;carl@leg.uct.ac.za&gt;</div><div class='ctx'>  *</div><div class='del'>- * BUGS  </div><div class='add'>+ * BUGS</div><div class='ctx'>  *  Due to the inconsistency in reading from the signal flags</div><div class='ctx'>  *  it is difficult to get an accurate tuned signal.</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * 1999-05-06 - (C. van Schaik)</div><div class='ctx'>  *	      - Make signal strength and stereo scans</div><div class='del'>- *	        kinder to cpu while in delay</div><div class='add'>+ *		kinder to cpu while in delay</div><div class='ctx'>  * 1999-01-05 - (C. van Schaik)</div><div class='ctx'>  *	      - Changed tuning to 1/160Mhz accuracy</div><div class='ctx'>  *	      - Added stereo support</div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;		/* outb, outb_p                   */</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;	/* copy to/from user              */</div><div class='ctx'> #include &lt;linux/videodev.h&gt;	/* kernel radio structs           */</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/config.h&gt;	/* CONFIG_RADIO_ZOLTRIX_PORT      */</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_RADIO_ZOLTRIX_PORT</div><div class='hunk'>@@ -105,7 +106,7 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)</div><div class='ctx'> 	i = 45;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outb(0, io);</div><div class='ctx'> 	outb(0, io);</div><div class='ctx'> 	inb(io + 3);            /* Zoltrix needs to be read to confirm */</div><div class='hunk'>@@ -139,8 +140,8 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)</div><div class='ctx'> 	udelay(1000);</div><div class='ctx'> 	inb(io+2);</div><div class='ctx'> </div><div class='del'>-        udelay(1000);</div><div class='del'>-        </div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;muted)</div><div class='ctx'> 	{</div><div class='ctx'> 		outb(0, io);</div><div class='hunk'>@@ -148,12 +149,12 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)</div><div class='ctx'> 		inb(io + 3);</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(!dev-&gt;muted)</div><div class='ctx'> 	{</div><div class='del'>-	        zol_setvol(dev, dev-&gt;curvol);</div><div class='add'>+		zol_setvol(dev, dev-&gt;curvol);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -174,14 +175,14 @@ static int zol_getsigstr(struct zol_device *dev)</div><div class='ctx'> 	b = inb(io);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (a != b)</div><div class='ctx'> 		return (0);</div><div class='ctx'> </div><div class='del'>-        if ((a == 0xcf) || (a == 0xdf)  /* I found this out by playing */</div><div class='add'>+	if ((a == 0xcf) || (a == 0xdf)  /* I found this out by playing */</div><div class='ctx'> 		|| (a == 0xef))       /* with a binary scanner on the card io */</div><div class='ctx'> 		return (1);</div><div class='del'>- 	return (0);</div><div class='add'>+	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int zol_is_stereo (struct zol_device *dev)</div><div class='hunk'>@@ -189,7 +190,7 @@ static int zol_is_stereo (struct zol_device *dev)</div><div class='ctx'> 	int x1, x2;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outb(0x00, io);</div><div class='ctx'> 	outb(dev-&gt;curvol, io);</div><div class='ctx'> 	msleep(20);</div><div class='hunk'>@@ -199,7 +200,7 @@ static int zol_is_stereo (struct zol_device *dev)</div><div class='ctx'> 	x2 = inb(io);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if ((x1 == x2) &amp;&amp; (x1 == 0xcf))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -226,7 +227,7 @@ static int zol_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	case VIDIOCGTUNER:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_tuner *v = arg;</div><div class='del'>-			if (v-&gt;tuner)	</div><div class='add'>+			if (v-&gt;tuner)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			strcpy(v-&gt;name, "FM");</div><div class='ctx'> 			v-&gt;rangelow = (int) (88.0 * 16000);</div><div class='hunk'>@@ -351,7 +352,7 @@ static int __init zoltrix_init(void)</div><div class='ctx'> 	printk(KERN_INFO "Zoltrix Radio Plus card driver.\n");</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;zoltrix_unit.lock);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* mute card - prevents noisy bootups */</div><div class='ctx'> </div><div class='ctx'> 	/* this ensures that the volume is all the way down  */</div><div class='head'>diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig<br/>index 6b4197018561..6d532f170ce5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/Kconfig</a></div><div class='hunk'>@@ -224,6 +224,12 @@ config VIDEO_ZORAN_LML33R10</div><div class='ctx'> 	  support for the Linux Media Labs LML33R10 MJPEG capture/playback</div><div class='ctx'> 	  card.</div><div class='ctx'> </div><div class='add'>+config VIDEO_ZORAN_AVS6EYES</div><div class='add'>+	tristate "AverMedia 6 Eyes support (EXPERIMENTAL)"</div><div class='add'>+	depends on VIDEO_ZORAN &amp;&amp; EXPERIMENTAL &amp;&amp; VIDEO_V4L1</div><div class='add'>+	help</div><div class='add'>+	  Support for the AverMedia 6 Eyes video surveillance card.</div><div class='add'>+</div><div class='ctx'> config VIDEO_ZR36120</div><div class='ctx'> 	tristate "Zoran ZR36120/36125 Video For Linux"</div><div class='ctx'> 	depends on PCI &amp;&amp; I2C &amp;&amp; VIDEO_V4L1 &amp;&amp; BROKEN</div><div class='hunk'>@@ -306,17 +312,6 @@ config VIDEO_HEXIUM_GEMINI</div><div class='ctx'> </div><div class='ctx'> source "drivers/media/video/cx88/Kconfig"</div><div class='ctx'> </div><div class='del'>-config VIDEO_OVCAMCHIP</div><div class='del'>-	tristate "OmniVision Camera Chip support"</div><div class='del'>-	depends on I2C &amp;&amp; VIDEO_V4L1</div><div class='del'>-	---help---</div><div class='del'>-	  Support for the OmniVision OV6xxx and OV7xxx series of camera chips.</div><div class='del'>-	  This driver is intended to be used with the ov511 and w9968cf USB</div><div class='del'>-	  camera drivers.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called ovcamchip.</div><div class='del'>-</div><div class='ctx'> config VIDEO_M32R_AR</div><div class='ctx'> 	tristate "AR devices"</div><div class='ctx'> 	depends on M32R &amp;&amp; VIDEO_V4L1</div><div class='hunk'>@@ -357,6 +352,15 @@ config VIDEO_CS53L32A</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called cs53l32a.</div><div class='ctx'> </div><div class='add'>+config VIDEO_TLV320AIC23B</div><div class='add'>+	tristate "Texas Instruments TLV320AIC23B audio codec"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  Support for the Texas Instruments TLV320AIC23B audio codec.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called tlv320aic23b.</div><div class='add'>+</div><div class='ctx'> config VIDEO_WM8775</div><div class='ctx'> 	tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"</div><div class='ctx'> 	depends on VIDEO_DEV &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -377,13 +381,25 @@ config VIDEO_WM8739</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called wm8739.</div><div class='ctx'> </div><div class='add'>+config VIDEO_CX2341X</div><div class='add'>+	tristate "Conexant CX2341x MPEG encoders"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  Support for the Conexant CX23416 MPEG encoders</div><div class='add'>+	  and CX23415 MPEG encoder/decoders.</div><div class='add'>+</div><div class='add'>+	  This module currently supports the encoding functions only.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called cx2341x.</div><div class='add'>+</div><div class='ctx'> source "drivers/media/video/cx25840/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config VIDEO_SAA711X</div><div class='del'>-	tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)"</div><div class='del'>-	depends on VIDEO_V4L1 &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	tristate "Philips SAA7113/4/5 video decoders"</div><div class='add'>+	depends on VIDEO_DEV &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	---help---</div><div class='del'>-	  Old support for the Philips SAA7113/4 video decoders.</div><div class='add'>+	  Support for the Philips SAA7113/4/5 video decoders.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called saa7115.</div><div class='hunk'>@@ -429,6 +445,8 @@ endmenu # encoder / decoder chips</div><div class='ctx'> menu "V4L USB devices"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_DEV</div><div class='ctx'> </div><div class='add'>+source "drivers/media/video/pvrusb2/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/media/video/em28xx/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config USB_DSBR</div><div class='hunk'>@@ -447,6 +465,35 @@ source "drivers/media/video/usbvideo/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/media/video/et61x251/Kconfig"</div><div class='ctx'> </div><div class='add'>+config VIDEO_OVCAMCHIP</div><div class='add'>+	tristate "OmniVision Camera Chip support"</div><div class='add'>+	depends on I2C &amp;&amp; VIDEO_V4L1</div><div class='add'>+	---help---</div><div class='add'>+	  Support for the OmniVision OV6xxx and OV7xxx series of camera chips.</div><div class='add'>+	  This driver is intended to be used with the ov511 and w9968cf USB</div><div class='add'>+	  camera drivers.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called ovcamchip.</div><div class='add'>+</div><div class='add'>+config USB_W9968CF</div><div class='add'>+	tristate "USB W996[87]CF JPEG Dual Mode Camera support"</div><div class='add'>+	depends on USB &amp;&amp; VIDEO_V4L1 &amp;&amp; I2C</div><div class='add'>+	select VIDEO_OVCAMCHIP</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here if you want support for cameras based on OV681 or</div><div class='add'>+	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.</div><div class='add'>+</div><div class='add'>+	  This driver has an optional plugin, which is distributed as a</div><div class='add'>+	  separate module only (released under GPL). It allows to use higher</div><div class='add'>+	  resolutions and framerates, but cannot be included in the official</div><div class='add'>+	  Linux kernel for performance purposes.</div><div class='add'>+</div><div class='add'>+	  See &lt;file:Documentation/video4linux/w9968cf.txt&gt; for more info.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called w9968cf.</div><div class='add'>+</div><div class='ctx'> config USB_OV511</div><div class='ctx'> 	tristate "USB OV511 Camera support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L1</div><div class='hunk'>@@ -483,24 +530,6 @@ config USB_STV680</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called stv680.</div><div class='ctx'> </div><div class='del'>-config USB_W9968CF</div><div class='del'>-	tristate "USB W996[87]CF JPEG Dual Mode Camera support"</div><div class='del'>-	depends on USB &amp;&amp; VIDEO_V4L1 &amp;&amp; I2C</div><div class='del'>-	select VIDEO_OVCAMCHIP</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want support for cameras based on OV681 or</div><div class='del'>-	  Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.</div><div class='del'>-</div><div class='del'>-	  This driver has an optional plugin, which is distributed as a</div><div class='del'>-	  separate module only (released under GPL). It allows to use higher</div><div class='del'>-	  resolutions and framerates, but cannot be included in the official</div><div class='del'>-	  Linux kernel for performance purposes.</div><div class='del'>-</div><div class='del'>-	  See &lt;file:Documentation/video4linux/w9968cf.txt&gt; for more info.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called w9968cf.</div><div class='del'>-</div><div class='ctx'> source "drivers/media/video/zc0301/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/media/video/pwc/Kconfig"</div><div class='head'>diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile<br/>index e5bf2687b76d..353d61cfac1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/Makefile</a></div><div class='hunk'>@@ -6,7 +6,7 @@ zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o</div><div class='ctx'> zr36067-objs	:=	zoran_procfs.o zoran_device.o \</div><div class='ctx'> 			zoran_driver.o zoran_card.o</div><div class='ctx'> tuner-objs	:=	tuner-core.o tuner-types.o tuner-simple.o \</div><div class='del'>-			mt20xx.o tda8290.o tea5767.o</div><div class='add'>+			mt20xx.o tda8290.o tea5767.o tda9887.o</div><div class='ctx'> </div><div class='ctx'> msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o</div><div class='ctx'> </div><div class='hunk'>@@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_ZORAN_DC30) += adv7175.o vpx3220.o zr36050.o \</div><div class='ctx'> 	zr36016.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_ZORAN_LML33) += bt819.o bt856.o zr36060.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_ZORAN_LML33R10) += saa7114.o adv7170.o zr36060.o</div><div class='add'>+obj-$(CONFIG_VIDEO_ZORAN_AVS6EYES) += bt866.o ks0127.o zr36060.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_PMS) += pms.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_PLANB) += planb.o</div><div class='hunk'>@@ -46,8 +47,10 @@ obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/</div><div class='ctx'> obj-$(CONFIG_VIDEO_CX88) += cx88/</div><div class='ctx'> obj-$(CONFIG_VIDEO_EM28XX) += em28xx/</div><div class='ctx'> obj-$(CONFIG_VIDEO_EM28XX) += tvp5150.o</div><div class='add'>+obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/</div><div class='ctx'> obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o</div><div class='add'>+obj-$(CONFIG_VIDEO_TLV320AIC23B) += tlv320aic23b.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_WM8775) += wm8775.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_WM8739) += wm8739.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/</div><div class='hunk'>@@ -58,7 +61,7 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_DPC) += saa7111.o dpc7146.o</div><div class='ctx'> obj-$(CONFIG_TUNER_3036) += tuner-3036.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o</div><div class='add'>+obj-$(CONFIG_VIDEO_TUNER) += tuner.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_BUF)   += video-buf.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_BUF_DVB) += video-buf-dvb.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o</div><div class='hunk'>@@ -71,6 +74,7 @@ obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o</div><div class='add'>+obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_DABUSB)        += dabusb.o</div><div class='ctx'> obj-$(CONFIG_USB_DSBR)          += dsbr100.o</div><div class='head'>diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c<br/>index dbe025170599..5c5e682a3004 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/arv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/arv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/arv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/arv.c</a></div><div class='hunk'>@@ -18,9 +18,7 @@</div><div class='ctx'>  * 2003-09-01:	Support w3cam by Takeo Takahashi</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -31,6 +29,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -212,7 +211,7 @@ void init_iic(void)</div><div class='ctx'> 	ar_outl(0x0300, PLDI2CMOD); 	/* I2CMOD ACK/8b-data/7b-addr/auto */</div><div class='ctx'> 	ar_outl(0x1, PLDI2CACK);	/* I2CACK ACK                      */</div><div class='ctx'> </div><div class='del'>-    	/* I2C CLK */</div><div class='add'>+	/* I2C CLK */</div><div class='ctx'> 	/* 50MH-100k */</div><div class='ctx'> 	if (freq == 75) {</div><div class='ctx'> 		ar_outl(369, PLDI2CFREQ);	/* BCLK = 75MHz */</div><div class='head'>diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c<br/>new file mode 100644<br/>index 000000000000..05e42bbcfc3d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt866.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt866.c</a></div><div class='hunk'>@@ -0,0 +1,377 @@</div><div class='add'>+/*</div><div class='add'>+    bt866 - BT866 Digital Video Encoder (Rockwell Part)</div><div class='add'>+</div><div class='add'>+    Copyright (C) 1999 Mike Bernson &lt;mike@mlb.org&gt;</div><div class='add'>+    Copyright (C) 1998 Dave Perks &lt;dperks@ibm.net&gt;</div><div class='add'>+</div><div class='add'>+    Modifications for LML33/DC10plus unified driver</div><div class='add'>+    Copyright (C) 2000 Serguei Miridonov &lt;mirsev@cicese.mx&gt;</div><div class='add'>+</div><div class='add'>+    This code was modify/ported from the saa7111 driver written</div><div class='add'>+    by Dave Perks.</div><div class='add'>+</div><div class='add'>+    This code was adapted for the bt866 by Christer Weinigel and ported</div><div class='add'>+    to 2.6 by Martin Samuelsson.</div><div class='add'>+</div><div class='add'>+    This program is free software; you can redistribute it and/or modify</div><div class='add'>+    it under the terms of the GNU General Public License as published by</div><div class='add'>+    the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+    (at your option) any later version.</div><div class='add'>+</div><div class='add'>+    This program is distributed in the hope that it will be useful,</div><div class='add'>+    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+    GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+    You should have received a copy of the GNU General Public License</div><div class='add'>+    along with this program; if not, write to the Free Software</div><div class='add'>+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/major.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/pgtable.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/video_encoder.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define	BT866_DEVNAME	"bt866"</div><div class='add'>+#define I2C_BT866	0x88</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define DEBUG(x)		/* Debug driver */</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+struct bt866 {</div><div class='add'>+	struct i2c_client *i2c;</div><div class='add'>+	int addr;</div><div class='add'>+	unsigned char reg[128];</div><div class='add'>+</div><div class='add'>+	int norm;</div><div class='add'>+	int enable;</div><div class='add'>+	int bright;</div><div class='add'>+	int contrast;</div><div class='add'>+	int hue;</div><div class='add'>+	int sat;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bt866_write(struct bt866 *dev,</div><div class='add'>+			unsigned char subaddr, unsigned char data);</div><div class='add'>+</div><div class='add'>+static int bt866_do_command(struct bt866 *encoder,</div><div class='add'>+			unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case ENCODER_GET_CAPABILITIES:</div><div class='add'>+	{</div><div class='add'>+		struct video_encoder_capability *cap = arg;</div><div class='add'>+</div><div class='add'>+		DEBUG(printk</div><div class='add'>+		      (KERN_INFO "%s: get capabilities\n",</div><div class='add'>+		       encoder-&gt;i2c-&gt;name));</div><div class='add'>+</div><div class='add'>+		cap-&gt;flags</div><div class='add'>+			= VIDEO_ENCODER_PAL</div><div class='add'>+			| VIDEO_ENCODER_NTSC</div><div class='add'>+			| VIDEO_ENCODER_CCIR;</div><div class='add'>+		cap-&gt;inputs = 2;</div><div class='add'>+		cap-&gt;outputs = 1;</div><div class='add'>+	}</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case ENCODER_SET_NORM:</div><div class='add'>+	{</div><div class='add'>+		int *iarg = arg;</div><div class='add'>+</div><div class='add'>+		DEBUG(printk(KERN_INFO "%s: set norm %d\n",</div><div class='add'>+			     encoder-&gt;i2c-&gt;name, *iarg));</div><div class='add'>+</div><div class='add'>+		switch (*iarg) {</div><div class='add'>+</div><div class='add'>+		case VIDEO_MODE_NTSC:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case VIDEO_MODE_PAL:</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		encoder-&gt;norm = *iarg;</div><div class='add'>+	}</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case ENCODER_SET_INPUT:</div><div class='add'>+	{</div><div class='add'>+		int *iarg = arg;</div><div class='add'>+		static const __u8 init[] = {</div><div class='add'>+			0xc8, 0xcc, /* CRSCALE */</div><div class='add'>+			0xca, 0x91, /* CBSCALE */</div><div class='add'>+			0xcc, 0x24, /* YC16 | OSDNUM */</div><div class='add'>+			0xda, 0x00, /*  */</div><div class='add'>+			0xdc, 0x24, /* SETMODE | PAL */</div><div class='add'>+			0xde, 0x02, /* EACTIVE */</div><div class='add'>+</div><div class='add'>+			/* overlay colors */</div><div class='add'>+			0x70, 0xEB, 0x90, 0x80, 0xB0, 0x80, /* white */</div><div class='add'>+			0x72, 0xA2, 0x92, 0x8E, 0xB2, 0x2C, /* yellow */</div><div class='add'>+			0x74, 0x83, 0x94, 0x2C, 0xB4, 0x9C, /* cyan */</div><div class='add'>+			0x76, 0x70, 0x96, 0x3A, 0xB6, 0x48, /* green */</div><div class='add'>+			0x78, 0x54, 0x98, 0xC6, 0xB8, 0xB8, /* magenta */</div><div class='add'>+			0x7A, 0x41, 0x9A, 0xD4, 0xBA, 0x64, /* red */</div><div class='add'>+			0x7C, 0x23, 0x9C, 0x72, 0xBC, 0xD4, /* blue */</div><div class='add'>+			0x7E, 0x10, 0x9E, 0x80, 0xBE, 0x80, /* black */</div><div class='add'>+</div><div class='add'>+			0x60, 0xEB, 0x80, 0x80, 0xc0, 0x80, /* white */</div><div class='add'>+			0x62, 0xA2, 0x82, 0x8E, 0xc2, 0x2C, /* yellow */</div><div class='add'>+			0x64, 0x83, 0x84, 0x2C, 0xc4, 0x9C, /* cyan */</div><div class='add'>+			0x66, 0x70, 0x86, 0x3A, 0xc6, 0x48, /* green */</div><div class='add'>+			0x68, 0x54, 0x88, 0xC6, 0xc8, 0xB8, /* magenta */</div><div class='add'>+			0x6A, 0x41, 0x8A, 0xD4, 0xcA, 0x64, /* red */</div><div class='add'>+			0x6C, 0x23, 0x8C, 0x72, 0xcC, 0xD4, /* blue */</div><div class='add'>+			0x6E, 0x10, 0x8E, 0x80, 0xcE, 0x80, /* black */</div><div class='add'>+		};</div><div class='add'>+		int i;</div><div class='add'>+		u8 val;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(init) / 2; i += 2)</div><div class='add'>+			bt866_write(encoder, init[i], init[i+1]);</div><div class='add'>+</div><div class='add'>+		val = encoder-&gt;reg[0xdc];</div><div class='add'>+</div><div class='add'>+		if (*iarg == 0)</div><div class='add'>+			val |= 0x40; /* CBSWAP */</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~0x40; /* !CBSWAP */</div><div class='add'>+</div><div class='add'>+		bt866_write(encoder, 0xdc, val);</div><div class='add'>+</div><div class='add'>+		val = encoder-&gt;reg[0xcc];</div><div class='add'>+		if (*iarg == 2)</div><div class='add'>+			val |= 0x01; /* OSDBAR */</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~0x01; /* !OSDBAR */</div><div class='add'>+		bt866_write(encoder, 0xcc, val);</div><div class='add'>+</div><div class='add'>+		DEBUG(printk(KERN_INFO "%s: set input %d\n",</div><div class='add'>+			     encoder-&gt;i2c-&gt;name, *iarg));</div><div class='add'>+</div><div class='add'>+		switch (*iarg) {</div><div class='add'>+		case 0:</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case ENCODER_SET_OUTPUT:</div><div class='add'>+	{</div><div class='add'>+		int *iarg = arg;</div><div class='add'>+</div><div class='add'>+		DEBUG(printk(KERN_INFO "%s: set output %d\n",</div><div class='add'>+			     encoder-&gt;i2c-&gt;name, *iarg));</div><div class='add'>+</div><div class='add'>+		/* not much choice of outputs */</div><div class='add'>+		if (*iarg != 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case ENCODER_ENABLE_OUTPUT:</div><div class='add'>+	{</div><div class='add'>+		int *iarg = arg;</div><div class='add'>+		encoder-&gt;enable = !!*iarg;</div><div class='add'>+</div><div class='add'>+		DEBUG(printk</div><div class='add'>+		      (KERN_INFO "%s: enable output %d\n",</div><div class='add'>+		       encoder-&gt;i2c-&gt;name, encoder-&gt;enable));</div><div class='add'>+	}</div><div class='add'>+	break;</div><div class='add'>+</div><div class='add'>+	case 4711:</div><div class='add'>+	{</div><div class='add'>+		int *iarg = arg;</div><div class='add'>+		__u8 val;</div><div class='add'>+</div><div class='add'>+		printk("bt866: square = %d\n", *iarg);</div><div class='add'>+</div><div class='add'>+		val = encoder-&gt;reg[0xdc];</div><div class='add'>+		if (*iarg)</div><div class='add'>+			val |= 1; /* SQUARE */</div><div class='add'>+		else</div><div class='add'>+			val &amp;= ~1; /* !SQUARE */</div><div class='add'>+		bt866_write(encoder, 0xdc, val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt866_write(struct bt866 *encoder,</div><div class='add'>+			unsigned char subaddr, unsigned char data)</div><div class='add'>+{</div><div class='add'>+	unsigned char buffer[2];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buffer[0] = subaddr;</div><div class='add'>+	buffer[1] = data;</div><div class='add'>+</div><div class='add'>+	encoder-&gt;reg[subaddr] = data;</div><div class='add'>+</div><div class='add'>+	DEBUG(printk</div><div class='add'>+	      ("%s: write 0x%02X = 0x%02X\n",</div><div class='add'>+	       encoder-&gt;i2c-&gt;name, subaddr, data));</div><div class='add'>+</div><div class='add'>+	for (err = 0; err &lt; 3;) {</div><div class='add'>+		if (i2c_master_send(encoder-&gt;i2c, buffer, 2) == 2)</div><div class='add'>+			break;</div><div class='add'>+		err++;</div><div class='add'>+		printk(KERN_WARNING "%s: I/O error #%d "</div><div class='add'>+		       "(write 0x%02x/0x%02x)\n",</div><div class='add'>+		       encoder-&gt;i2c-&gt;name, err, encoder-&gt;addr, subaddr);</div><div class='add'>+		schedule_timeout_interruptible(HZ/10);</div><div class='add'>+	}</div><div class='add'>+	if (err == 3) {</div><div class='add'>+		printk(KERN_WARNING "%s: giving up\n",</div><div class='add'>+		       encoder-&gt;i2c-&gt;name);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt866_attach(struct i2c_adapter *adapter);</div><div class='add'>+static int bt866_detach(struct i2c_client *client);</div><div class='add'>+static int bt866_command(struct i2c_client *client,</div><div class='add'>+			 unsigned int cmd, void *arg);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Addresses to scan */</div><div class='add'>+static unsigned short normal_i2c[]	= {I2C_BT866&gt;&gt;1, I2C_CLIENT_END};</div><div class='add'>+static unsigned short probe[2]		= {I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='add'>+static unsigned short ignore[2]		= {I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='add'>+</div><div class='add'>+static struct i2c_client_address_data addr_data = {</div><div class='add'>+	normal_i2c,</div><div class='add'>+	probe,</div><div class='add'>+	ignore,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver i2c_driver_bt866 = {</div><div class='add'>+	.driver.name = BT866_DEVNAME,</div><div class='add'>+	.id = I2C_DRIVERID_BT866,</div><div class='add'>+	.attach_adapter = bt866_attach,</div><div class='add'>+	.detach_client = bt866_detach,</div><div class='add'>+	.command = bt866_command</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct i2c_client bt866_client_tmpl =</div><div class='add'>+{</div><div class='add'>+	.name = "(nil)",</div><div class='add'>+	.addr = 0,</div><div class='add'>+	.adapter = NULL,</div><div class='add'>+	.driver = &amp;i2c_driver_bt866,</div><div class='add'>+	.usage_count = 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bt866_found_proc(struct i2c_adapter *adapter,</div><div class='add'>+			    int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct bt866 *encoder;</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+</div><div class='add'>+	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;bt866_client_tmpl, sizeof(*client));</div><div class='add'>+</div><div class='add'>+	encoder = kzalloc(sizeof(*encoder), GFP_KERNEL);</div><div class='add'>+	if (encoder == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, encoder);</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+	sprintf(client-&gt;name, "%s-%02x", BT866_DEVNAME, adapter-&gt;id);</div><div class='add'>+</div><div class='add'>+	encoder-&gt;i2c = client;</div><div class='add'>+	encoder-&gt;addr = addr;</div><div class='add'>+	//encoder-&gt;encoder_type = ENCODER_TYPE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* initialize */</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt866_attach(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;id == I2C_HW_B_ZR36067)</div><div class='add'>+		return i2c_probe(adapter, &amp;addr_data, bt866_found_proc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt866_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct bt866 *encoder = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+	kfree(encoder);</div><div class='add'>+	kfree(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bt866_command(struct i2c_client *client,</div><div class='add'>+			 unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct bt866 *encoder = i2c_get_clientdata(client);</div><div class='add'>+	return bt866_do_command(encoder, cmd, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit bt866_init(void)</div><div class='add'>+{</div><div class='add'>+	i2c_add_driver(&amp;i2c_driver_bt866);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit bt866_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;i2c_driver_bt866);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(bt866_init);</div><div class='add'>+module_exit(bt866_exit);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c<br/>index 2b64aa835b42..de14818d5cc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt8xx/bttv-cards.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -269,7 +268,7 @@ static struct CARD {</div><div class='ctx'> 	{ 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },</div><div class='ctx'> 	{ 0x18501f7f, BTTV_BOARD_FLYVIDEO_98,   "Lifeview Flyvideo 98" },</div><div class='ctx'> </div><div class='del'>-    	{ 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },</div><div class='add'>+	{ 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },</div><div class='ctx'> 	{ 0x010114c7, BTTV_BOARD_MODTEC_205,    "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },</div><div class='ctx'> </div><div class='ctx'> 	{ 0x10b42636, BTTV_BOARD_HAUPPAUGE878,  "STB ???" },</div><div class='hunk'>@@ -309,6 +308,7 @@ static struct CARD {</div><div class='ctx'> 	{ 0x07611461, BTTV_BOARD_AVDVBT_761,    "AverMedia AverTV DVB-T 761" },</div><div class='ctx'> 	{ 0xdb1018ac, BTTV_BOARD_DVICO_DVBT_LITE,    "DViCO FusionHDTV DVB-T Lite" },</div><div class='ctx'> 	{ 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,    "DViCO FusionHDTV 5 Lite" },</div><div class='add'>+	{ 0x00261822, BTTV_BOARD_TWINHAN_DST,	"DNTV Live! Mini "},</div><div class='ctx'> </div><div class='ctx'> 	{ 0, -1, NULL }</div><div class='ctx'> };</div><div class='hunk'>@@ -1903,7 +1903,7 @@ struct tvcard bttv_tvcards[] = {</div><div class='ctx'> 		.no_tda7432     = 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	[BTTV_BOARD_OSPREY2x0] = {</div><div class='del'>-		.name           = "Osprey 210/220",   /* 0x1(A|B)-04C0-C1 */</div><div class='add'>+		.name           = "Osprey 210/220/230",   /* 0x1(A|B)-04C0-C1 */</div><div class='ctx'> 		.video_inputs   = 2,</div><div class='ctx'> 		.audio_inputs   = 1,</div><div class='ctx'> 		.tuner          = -1,</div><div class='hunk'>@@ -2745,7 +2745,7 @@ struct tvcard bttv_tvcards[] = {</div><div class='ctx'> 		/* Michael Krufky &lt;mkrufky@m1k.net&gt; */</div><div class='ctx'> 		.name           = "DViCO FusionHDTV 5 Lite",</div><div class='ctx'> 		.tuner          = 0,</div><div class='del'>-		.tuner_type     = TUNER_LG_TDVS_H062F,</div><div class='add'>+		.tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */</div><div class='ctx'> 		.tuner_addr	= ADDR_UNSET,</div><div class='ctx'> 		.radio_addr     = ADDR_UNSET,</div><div class='ctx'> 		.video_inputs   = 3,</div><div class='hunk'>@@ -2762,7 +2762,7 @@ struct tvcard bttv_tvcards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 		/* ---- card 0x88---------------------------------- */</div><div class='ctx'> 	[BTTV_BOARD_ACORP_Y878F] = {</div><div class='del'>-		/* Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt; */</div><div class='add'>+		/* Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt; */</div><div class='ctx'> 		.name		= "Acorp Y878F",</div><div class='ctx'> 		.video_inputs	= 3,</div><div class='ctx'> 		.audio_inputs	= 1,</div><div class='hunk'>@@ -3547,11 +3547,6 @@ void __devinit bttv_init_card2(struct bttv *btv)</div><div class='ctx'> 	/* Hybrid DVB card, DOES have a tda9887 */</div><div class='ctx'> 	if (btv-&gt;c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)</div><div class='ctx'> 		tda9887 = 1;</div><div class='del'>-	if((btv-&gt;tuner_type == TUNER_PHILIPS_FM1216ME_MK3) ||</div><div class='del'>-	   (btv-&gt;tuner_type == TUNER_PHILIPS_FM1236_MK3) ||</div><div class='del'>-	   (btv-&gt;tuner_type == TUNER_PHILIPS_FM1256_IH3) ||</div><div class='del'>-	    tda9887)</div><div class='del'>-		request_module("tda9887");</div><div class='ctx'> 	if (btv-&gt;tuner_type != UNSET)</div><div class='ctx'> 		request_module("tuner");</div><div class='ctx'> }</div><div class='hunk'>@@ -3790,6 +3785,7 @@ static void __devinit osprey_eeprom(struct bttv *btv)</div><div class='ctx'> 		       break;</div><div class='ctx'> 	       case 0x0060:</div><div class='ctx'> 	       case 0x0070:</div><div class='add'>+	       case 0x00A0:</div><div class='ctx'> 		       btv-&gt;c.type = BTTV_BOARD_OSPREY2x0;</div><div class='ctx'> 		       /* enable output on select control lines */</div><div class='ctx'> 		       gpio_inout(0xffffff,0x000303);</div><div class='hunk'>@@ -4846,7 +4842,7 @@ static void picolo_tetra_muxsel (struct bttv* btv, unsigned int input)</div><div class='ctx'>  *</div><div class='ctx'>  * The IVC120G security card has 4 i2c controlled TDA8540 matrix</div><div class='ctx'>  * swichers to provide 16 channels to MUX0. The TDA8540's have</div><div class='del'>- * 4 indepedant outputs and as such the IVC120G also has the</div><div class='add'>+ * 4 independent outputs and as such the IVC120G also has the</div><div class='ctx'>  * optional "Monitor Out" bus. This allows the card to be looking</div><div class='ctx'>  * at one input while the monitor is looking at another.</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c<br/>index 423e954948be..5764a89d3562 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt8xx/bttv-driver.c</a></div><div class='hunk'>@@ -4019,8 +4019,9 @@ static int __devinit bttv_probe(struct pci_dev *dev,</div><div class='ctx'> 	if (!request_mem_region(pci_resource_start(dev,0),</div><div class='ctx'> 				pci_resource_len(dev,0),</div><div class='ctx'> 				btv-&gt;c.name)) {</div><div class='del'>-		printk(KERN_WARNING "bttv%d: can't request iomem (0x%lx).\n",</div><div class='del'>-		       btv-&gt;c.nr, pci_resource_start(dev,0));</div><div class='add'>+		printk(KERN_WARNING "bttv%d: can't request iomem (0x%llx).\n",</div><div class='add'>+		       btv-&gt;c.nr,</div><div class='add'>+		       (unsigned long long)pci_resource_start(dev,0));</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(dev);</div><div class='hunk'>@@ -4031,8 +4032,9 @@ static int __devinit bttv_probe(struct pci_dev *dev,</div><div class='ctx'> 	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &amp;lat);</div><div class='ctx'> 	printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ",</div><div class='ctx'> 	       bttv_num,btv-&gt;id, btv-&gt;revision, pci_name(dev));</div><div class='del'>-	printk("irq: %d, latency: %d, mmio: 0x%lx\n",</div><div class='del'>-	       btv-&gt;c.pci-&gt;irq, lat, pci_resource_start(dev,0));</div><div class='add'>+	printk("irq: %d, latency: %d, mmio: 0x%llx\n",</div><div class='add'>+	       btv-&gt;c.pci-&gt;irq, lat,</div><div class='add'>+	       (unsigned long long)pci_resource_start(dev,0));</div><div class='ctx'> 	schedule();</div><div class='ctx'> </div><div class='ctx'> 	btv-&gt;bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000);</div><div class='hunk'>@@ -4048,7 +4050,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,</div><div class='ctx'> 	/* disable irqs, register irq handler */</div><div class='ctx'> 	btwrite(0, BT848_INT_MASK);</div><div class='ctx'> 	result = request_irq(btv-&gt;c.pci-&gt;irq, bttv_irq,</div><div class='del'>-			     SA_SHIRQ | SA_INTERRUPT,btv-&gt;c.name,(void *)btv);</div><div class='add'>+			     IRQF_SHARED | IRQF_DISABLED,btv-&gt;c.name,(void *)btv);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "bttv%d: can't get IRQ %d\n",</div><div class='ctx'> 		       bttv_num,btv-&gt;c.pci-&gt;irq);</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c<br/>index c4d5e2b70c28..ba081f6f8c82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-gpio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-gpio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-gpio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt8xx/bttv-gpio.c</a></div><div class='hunk'>@@ -118,20 +118,6 @@ int bttv_sub_del_devices(struct bttv_core *core)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bttv_gpio_irq(struct bttv_core *core)</div><div class='del'>-{</div><div class='del'>-	struct bttv_sub_driver *drv;</div><div class='del'>-	struct bttv_sub_device *dev;</div><div class='del'>-	struct list_head *item;</div><div class='del'>-</div><div class='del'>-	list_for_each(item,&amp;core-&gt;subs) {</div><div class='del'>-		dev = list_entry(item,struct bttv_sub_device,list);</div><div class='del'>-		drv = to_bttv_sub_drv(dev-&gt;dev.driver);</div><div class='del'>-		if (drv &amp;&amp; drv-&gt;gpio_irq)</div><div class='del'>-			drv-&gt;gpio_irq(dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> /* external: sub-driver register/unregister                                */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c<br/>index 69efa0e5174d..b41f81d2372c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt8xx/bttv-input.c</a></div><div class='hunk'>@@ -355,7 +355,7 @@ int bttv_input_init(struct bttv *btv)</div><div class='ctx'> </div><div class='ctx'> 	if (ir-&gt;rc5_gpio) {</div><div class='ctx'> 		u32 gpio;</div><div class='del'>-	    	/* enable remote irq */</div><div class='add'>+		/* enable remote irq */</div><div class='ctx'> 		bttv_gpio_inout(&amp;btv-&gt;c, (1 &lt;&lt; 4), 1 &lt;&lt; 4);</div><div class='ctx'> 		gpio = bttv_gpio_read(&amp;btv-&gt;c);</div><div class='ctx'> 		bttv_gpio_write(&amp;btv-&gt;c, gpio &amp; ~(1 &lt;&lt; 4));</div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h<br/>index 3a23265c1538..f9c9e3c4d111 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt8xx/bttv.h</a></div><div class='hunk'>@@ -350,7 +350,6 @@ struct bttv_sub_driver {</div><div class='ctx'> 	char                   wanted[BUS_ID_SIZE];</div><div class='ctx'> 	int                    (*probe)(struct bttv_sub_device *sub);</div><div class='ctx'> 	void                   (*remove)(struct bttv_sub_device *sub);</div><div class='del'>-	void                   (*gpio_irq)(struct bttv_sub_device *sub);</div><div class='ctx'> };</div><div class='ctx'> #define to_bttv_sub_drv(x) container_of((x), struct bttv_sub_driver, drv)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h<br/>index ee989d2e15d9..311c4c541e01 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttvp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bt8xx/bttvp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bt8xx/bttvp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bt8xx/bttvp.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -214,7 +215,6 @@ extern struct videobuf_queue_ops bttv_vbi_qops;</div><div class='ctx'> extern struct bus_type bttv_sub_bus_type;</div><div class='ctx'> int bttv_sub_add_device(struct bttv_core *core, char *name);</div><div class='ctx'> int bttv_sub_del_devices(struct bttv_core *core);</div><div class='del'>-void bttv_gpio_irq(struct bttv_core *core);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------- */</div><div class='hunk'>@@ -360,7 +360,7 @@ struct bttv {</div><div class='ctx'> 	int mbox_csel;</div><div class='ctx'> </div><div class='ctx'> 	/* risc memory management data</div><div class='del'>-	   - must aquire s_lock before changing these</div><div class='add'>+	   - must acquire s_lock before changing these</div><div class='ctx'> 	   - only the irq handler is supported to touch top + bottom + vcurr */</div><div class='ctx'> 	struct btcx_riscmem     main;</div><div class='ctx'> 	struct bttv_buffer      *screen;    /* overlay             */</div><div class='head'>diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c<br/>index cf61c590f4ad..7d0b6e59c6e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/bw-qcam.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/bw-qcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/bw-qcam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/bw-qcam.c</a></div><div class='hunk'>@@ -73,6 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE.</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -759,7 +760,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		{</div><div class='ctx'> 			struct video_picture *p = arg;</div><div class='ctx'> 			if(p-&gt;palette!=VIDEO_PALETTE_GREY)</div><div class='del'>-			    	return -EINVAL;</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			if(p-&gt;depth!=4 &amp;&amp; p-&gt;depth!=6)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c<br/>index 22a7386bbea6..a3989bd2f81b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/c-qcam.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/c-qcam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/c-qcam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/c-qcam.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='head'>diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c<br/>index 840fe0177121..353d02b67c33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/compat_ioctl32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/compat_ioctl32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/compat_ioctl32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/compat_ioctl32.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * ioctls.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='head'>diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c<br/>index 85d84e89d8f4..3b31a0dd2f0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cpia.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */</div><div class='ctx'> /* #define _CPIA_DEBUG_  1 */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -47,13 +46,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "cpia.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_CPIA_PP</div><div class='del'>-extern int cpia_pp_init(void);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_VIDEO_CPIA_USB</div><div class='del'>-extern int cpia_usb_init(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int video_nr = -1;</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='hunk'>@@ -67,10 +59,10 @@ MODULE_SUPPORTED_DEVICE("video");</div><div class='ctx'> static unsigned short colorspace_conv;</div><div class='ctx'> module_param(colorspace_conv, ushort, 0444);</div><div class='ctx'> MODULE_PARM_DESC(colorspace_conv,</div><div class='del'>-                 " Colorspace conversion:"</div><div class='del'>-                 "\n  0 = disable, 1 = enable"</div><div class='del'>-                 "\n  Default value is 0"</div><div class='del'>-                 );</div><div class='add'>+		 " Colorspace conversion:"</div><div class='add'>+		 "\n  0 = disable, 1 = enable"</div><div class='add'>+		 "\n  Default value is 0"</div><div class='add'>+		 );</div><div class='ctx'> </div><div class='ctx'> #define ABOUT "V4L-Driver for Vision CPiA based cameras"</div><div class='ctx'> </div><div class='hunk'>@@ -4047,13 +4039,6 @@ static int __init cpia_init(void)</div><div class='ctx'> 	proc_cpia_create();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_VIDEO_CPIA_PP</div><div class='del'>-	cpia_pp_init();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_VIDEO_CPIA_USB</div><div class='del'>-	cpia_usb_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h<br/>index dde27a6a4a09..6eaa692021c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cpia.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -247,7 +248,7 @@ enum v4l_camstates {</div><div class='ctx'> struct cam_data {</div><div class='ctx'> 	struct list_head cam_data_list;</div><div class='ctx'> </div><div class='del'>-	struct mutex busy_lock;     /* guard against SMP multithreading */</div><div class='add'>+	struct mutex busy_lock;		/* guard against SMP multithreading */</div><div class='ctx'> 	struct cpia_camera_ops *ops;	/* lowlevel driver operations */</div><div class='ctx'> 	void *lowlevel_data;		/* private data for lowlevel driver */</div><div class='ctx'> 	u8 *raw_image;			/* buffer for raw image data */</div><div class='head'>diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h<br/>index 1764991b0ac9..c5ecb2be5f93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia2/cpia2.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia2/cpia2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia2/cpia2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cpia2/cpia2.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c<br/>index 481e178ef56d..d09f49950f2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia2/cpia2_v4l.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia2/cpia2_v4l.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia2/cpia2_v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cpia2/cpia2_v4l.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -343,7 +342,9 @@ static int cpia2_close(struct inode *inode, struct file *file)</div><div class='ctx'> 		cpia2_free_buffers(cam);</div><div class='ctx'> 		if (!cam-&gt;present) {</div><div class='ctx'> 			video_unregister_device(dev);</div><div class='add'>+			mutex_unlock(&amp;cam-&gt;busy_lock);</div><div class='ctx'> 			kfree(cam);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1167,9 +1168,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam)</div><div class='ctx'> 		} else {</div><div class='ctx'> 		    if(cam-&gt;params.flicker_control.cam_register &amp;</div><div class='ctx'> 		       CPIA2_VP_FLICKER_MODES_50HZ) {</div><div class='del'>-		    	mode = FLICKER_50;</div><div class='add'>+			mode = FLICKER_50;</div><div class='ctx'> 		    } else {</div><div class='del'>-		    	mode = FLICKER_60;</div><div class='add'>+			mode = FLICKER_60;</div><div class='ctx'> 		    }</div><div class='ctx'> 		}</div><div class='ctx'> 		for(i=0; i&lt;NUM_FLICKER_CONTROLS; i++) {</div><div class='head'>diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c<br/>index 0b00e6027dfb..41f4b8d17559 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia_pp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia_pp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia_pp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cpia_pp.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */</div><div class='ctx'> /* #define _CPIA_DEBUG_  1 */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -803,7 +802,7 @@ static struct parport_driver cpia_pp_driver = {</div><div class='ctx'> 	.detach = cpia_pp_detach,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int cpia_pp_init(void)</div><div class='add'>+static int cpia_pp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT,</div><div class='ctx'> 	       CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER);</div><div class='hunk'>@@ -860,6 +859,8 @@ void cleanup_module(void)</div><div class='ctx'> </div><div class='ctx'> static int __init cpia_pp_setup(char *str)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!strncmp(str, "parport", 7)) {</div><div class='ctx'> 		int n = simple_strtoul(str + 7, NULL, 10);</div><div class='ctx'> 		if (parport_ptr &lt; PARPORT_MAX) {</div><div class='hunk'>@@ -873,6 +874,10 @@ static int __init cpia_pp_setup(char *str)</div><div class='ctx'> 		parport_nr[parport_ptr++] = PPCPIA_PARPORT_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err=cpia_pp_init();</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c<br/>index 9c49a4b00116..2ee34a3b9280 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cpia_usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cpia_usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cpia_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cpia_usb.c</a></div><div class='hunk'>@@ -474,12 +474,6 @@ static int cpia_usb_close(void *privdata)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cpia_usb_init(void)</div><div class='del'>-{</div><div class='del'>-	/* return -ENODEV; */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Probing and initializing */</div><div class='ctx'> </div><div class='ctx'> static int cpia_probe(struct usb_interface *intf,</div><div class='head'>diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c<br/>new file mode 100644<br/>index 000000000000..65f00fc08fa9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx2341x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx2341x.c</a></div><div class='hunk'>@@ -0,0 +1,932 @@</div><div class='add'>+/*</div><div class='add'>+ * cx2341x - generic code for cx23415/6 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;media/tuner.h&gt;</div><div class='add'>+#include &lt;media/cx2341x.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("cx23415/6 driver");</div><div class='add'>+MODULE_AUTHOR("Hans Verkuil");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int debug = 0;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0-1)");</div><div class='add'>+</div><div class='add'>+const u32 cx2341x_mpeg_ctrls[] = {</div><div class='add'>+	V4L2_CID_MPEG_CLASS,</div><div class='add'>+	V4L2_CID_MPEG_STREAM_TYPE,</div><div class='add'>+	V4L2_CID_MPEG_STREAM_VBI_FMT,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_ENCODING,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_L2_BITRATE,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_MODE,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_MODE_EXTENSION,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_EMPHASIS,</div><div class='add'>+	V4L2_CID_MPEG_AUDIO_CRC,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_ENCODING,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_ASPECT,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_B_FRAMES,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_GOP_SIZE,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_GOP_CLOSURE,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_PULLDOWN,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_BITRATE_MODE,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_BITRATE,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,</div><div class='add'>+	V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM,</div><div class='add'>+	V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP,</div><div class='add'>+	0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Map the control ID to the correct field in the cx2341x_mpeg_params</div><div class='add'>+   struct. Return -EINVAL if the ID is unknown, else return 0. */</div><div class='add'>+static int cx2341x_get_ctrl(struct cx2341x_mpeg_params *params,</div><div class='add'>+		struct v4l2_ext_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_sampling_freq;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_encoding;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_l2_bitrate;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_mode;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_mode_extension;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_EMPHASIS:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_emphasis;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_CRC:</div><div class='add'>+		ctrl-&gt;value = params-&gt;audio_crc;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_encoding;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_aspect;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_B_FRAMES:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_b_frames;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_SIZE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_gop_size;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_gop_closure;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_PULLDOWN:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_pulldown;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_bitrate_mode;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_bitrate;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_bitrate_peak;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_temporal_decimation;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;stream_type;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:</div><div class='add'>+		ctrl-&gt;value = params-&gt;stream_vbi_fmt;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_spatial_filter_mode;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_spatial_filter;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_luma_spatial_filter_type;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_chroma_spatial_filter_type;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_temporal_filter_mode;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_temporal_filter;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_median_filter_type;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_luma_median_filter_top;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_luma_median_filter_bottom;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_chroma_median_filter_top;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_chroma_median_filter_bottom;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Map the control ID to the correct field in the cx2341x_mpeg_params</div><div class='add'>+   struct. Return -EINVAL if the ID is unknown, else return 0. */</div><div class='add'>+static int cx2341x_set_ctrl(struct cx2341x_mpeg_params *params,</div><div class='add'>+		struct v4l2_ext_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='add'>+		params-&gt;audio_sampling_freq = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+		params-&gt;audio_encoding = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+		params-&gt;audio_l2_bitrate = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='add'>+		params-&gt;audio_mode = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='add'>+		params-&gt;audio_mode_extension = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_EMPHASIS:</div><div class='add'>+		params-&gt;audio_emphasis = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_CRC:</div><div class='add'>+		params-&gt;audio_crc = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='add'>+		params-&gt;video_aspect = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_B_FRAMES: {</div><div class='add'>+		int b = ctrl-&gt;value + 1;</div><div class='add'>+		int gop = params-&gt;video_gop_size;</div><div class='add'>+		params-&gt;video_b_frames = ctrl-&gt;value;</div><div class='add'>+		params-&gt;video_gop_size = b * ((gop + b - 1) / b);</div><div class='add'>+		/* Max GOP size = 34 */</div><div class='add'>+		while (params-&gt;video_gop_size &gt; 34)</div><div class='add'>+			params-&gt;video_gop_size -= b;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_SIZE: {</div><div class='add'>+		int b = params-&gt;video_b_frames + 1;</div><div class='add'>+		int gop = ctrl-&gt;value;</div><div class='add'>+		params-&gt;video_gop_size = b * ((gop + b - 1) / b);</div><div class='add'>+		/* Max GOP size = 34 */</div><div class='add'>+		while (params-&gt;video_gop_size &gt; 34)</div><div class='add'>+			params-&gt;video_gop_size -= b;</div><div class='add'>+		ctrl-&gt;value = params-&gt;video_gop_size;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:</div><div class='add'>+		params-&gt;video_gop_closure = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_PULLDOWN:</div><div class='add'>+		params-&gt;video_pulldown = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+		/* MPEG-1 only allows CBR */</div><div class='add'>+		if (params-&gt;video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1 &amp;&amp;</div><div class='add'>+		    ctrl-&gt;value != V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		params-&gt;video_bitrate_mode = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE:</div><div class='add'>+		params-&gt;video_bitrate = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:</div><div class='add'>+		params-&gt;video_bitrate_peak = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION:</div><div class='add'>+		params-&gt;video_temporal_decimation = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+		params-&gt;stream_type = ctrl-&gt;value;</div><div class='add'>+		params-&gt;video_encoding =</div><div class='add'>+			(params-&gt;stream_type == V4L2_MPEG_STREAM_TYPE_MPEG1_SS ||</div><div class='add'>+			 params-&gt;stream_type == V4L2_MPEG_STREAM_TYPE_MPEG1_VCD) ?</div><div class='add'>+			V4L2_MPEG_VIDEO_ENCODING_MPEG_1 : V4L2_MPEG_VIDEO_ENCODING_MPEG_2;</div><div class='add'>+		if (params-&gt;video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1) {</div><div class='add'>+			/* MPEG-1 implies CBR */</div><div class='add'>+			params-&gt;video_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:</div><div class='add'>+		params-&gt;stream_vbi_fmt = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+		params-&gt;video_spatial_filter_mode = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER:</div><div class='add'>+		params-&gt;video_spatial_filter = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		params-&gt;video_luma_spatial_filter_type = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		params-&gt;video_chroma_spatial_filter_type = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+		params-&gt;video_temporal_filter_mode = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER:</div><div class='add'>+		params-&gt;video_temporal_filter = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		params-&gt;video_median_filter_type = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		params-&gt;video_luma_median_filter_top = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		params-&gt;video_luma_median_filter_bottom = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		params-&gt;video_chroma_median_filter_top = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		params-&gt;video_chroma_median_filter_bottom = ctrl-&gt;value;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx2341x_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)</div><div class='add'>+{</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	qctrl-&gt;flags = 0;</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	/* MPEG controls */</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+		name = "Spatial Filter Mode";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER:</div><div class='add'>+		name = "Spatial Filter";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		name = "Spatial Luma Filter Type";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		name = "Spatial Chroma Filter Type";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+		name = "Temporal Filter Mode";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER:</div><div class='add'>+		name = "Temporal Filter";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		name = "Median Filter Type";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		name = "Median Luma Filter Maximum";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		name = "Median Luma Filter Minimum";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		name = "Median Chroma Filter Maximum";</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		name = "Median Chroma Filter Minimum";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, min, max, step, def);</div><div class='add'>+	}</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		qctrl-&gt;type = V4L2_CTRL_TYPE_MENU;</div><div class='add'>+		min = 0;</div><div class='add'>+		step = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		qctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_UPDATE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	qctrl-&gt;minimum = min;</div><div class='add'>+	qctrl-&gt;maximum = max;</div><div class='add'>+	qctrl-&gt;step = step;</div><div class='add'>+	qctrl-&gt;default_value = def;</div><div class='add'>+	qctrl-&gt;reserved[0] = qctrl-&gt;reserved[1] = 0;</div><div class='add'>+	snprintf(qctrl-&gt;name, sizeof(qctrl-&gt;name), name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params, struct v4l2_queryctrl *qctrl)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_LAYER_2, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_LAYER_2);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_L2_BITRATE_192K,</div><div class='add'>+				V4L2_MPEG_AUDIO_L2_BITRATE_384K, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_L2_BITRATE_224K);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='add'>+		err = v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+		if (err == 0 &amp;&amp; params-&gt;audio_mode != V4L2_MPEG_AUDIO_MODE_JOINT_STEREO)</div><div class='add'>+			qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='add'>+		/* this setting is read-only for the cx2341x since the</div><div class='add'>+		   V4L2_CID_MPEG_STREAM_TYPE really determines the</div><div class='add'>+		   MPEG-1/2 setting */</div><div class='add'>+		err = v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+		if (err == 0)</div><div class='add'>+			qctrl-&gt;flags |= V4L2_CTRL_FLAG_READ_ONLY;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+		err = v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+		if (err == 0 &amp;&amp; params-&gt;video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1)</div><div class='add'>+			qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:</div><div class='add'>+		err = v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+		if (err == 0 &amp;&amp; params-&gt;video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)</div><div class='add'>+			qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:</div><div class='add'>+		if (params-&gt;capabilities &amp; CX2341X_CAP_HAS_SLICED_VBI)</div><div class='add'>+			return v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+		return cx2341x_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_STREAM_VBI_FMT_NONE,</div><div class='add'>+				V4L2_MPEG_STREAM_VBI_FMT_NONE, 1,</div><div class='add'>+				V4L2_MPEG_STREAM_VBI_FMT_NONE);</div><div class='add'>+</div><div class='add'>+	/* CX23415/6 specific */</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+		return cx2341x_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO, 1,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl, 0, 15, 1, 0);</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		if (params-&gt;video_spatial_filter_mode == V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE, 1,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF);</div><div class='add'>+		if (params-&gt;video_spatial_filter_mode == V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR, 1,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF);</div><div class='add'>+		if (params-&gt;video_spatial_filter_mode == V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+		return cx2341x_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO, 1,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl, 0, 31, 1, 0);</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		if (params-&gt;video_temporal_filter_mode == V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		return cx2341x_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG, 1,</div><div class='add'>+				V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF);</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl, 0, 255, 1, 255);</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		if (params-&gt;video_median_filter_type == V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl, 0, 255, 1, 0);</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		if (params-&gt;video_median_filter_type == V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl, 0, 255, 1, 255);</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		if (params-&gt;video_median_filter_type == V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM:</div><div class='add'>+		cx2341x_ctrl_query_fill(qctrl, 0, 255, 1, 0);</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		if (params-&gt;video_median_filter_type == V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF)</div><div class='add'>+		       qctrl-&gt;flags |= V4L2_CTRL_FLAG_INACTIVE;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return v4l2_ctrl_query_fill_std(qctrl);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char **cx2341x_ctrl_get_menu(u32 id)</div><div class='add'>+{</div><div class='add'>+	static const char *mpeg_stream_type[] = {</div><div class='add'>+		"MPEG-2 Program Stream",</div><div class='add'>+		"",</div><div class='add'>+		"MPEG-1 System Stream",</div><div class='add'>+		"MPEG-2 DVD-compatible Stream",</div><div class='add'>+		"MPEG-1 VCD-compatible Stream",</div><div class='add'>+		"MPEG-2 SVCD-compatible Stream",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const char *cx2341x_video_spatial_filter_mode_menu[] = {</div><div class='add'>+		"Manual",</div><div class='add'>+		"Auto",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const char *cx2341x_video_luma_spatial_filter_type_menu[] = {</div><div class='add'>+		"Off",</div><div class='add'>+		"1D Horizontal",</div><div class='add'>+		"1D Vertical",</div><div class='add'>+		"2D H/V Separable",</div><div class='add'>+		"2D Symmetric non-separable",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const char *cx2341x_video_chroma_spatial_filter_type_menu[] = {</div><div class='add'>+		"Off",</div><div class='add'>+		"1D Horizontal",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const char *cx2341x_video_temporal_filter_mode_menu[] = {</div><div class='add'>+		"Manual",</div><div class='add'>+		"Auto",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const char *cx2341x_video_median_filter_type_menu[] = {</div><div class='add'>+		"Off",</div><div class='add'>+		"Horizontal",</div><div class='add'>+		"Vertical",</div><div class='add'>+		"Horizontal/Vertical",</div><div class='add'>+		"Diagonal",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+		return mpeg_stream_type;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='add'>+		return NULL;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:</div><div class='add'>+		return cx2341x_video_spatial_filter_mode_menu;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		return cx2341x_video_luma_spatial_filter_type_menu;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE:</div><div class='add'>+		return cx2341x_video_chroma_spatial_filter_type_menu;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE:</div><div class='add'>+		return cx2341x_video_temporal_filter_mode_menu;</div><div class='add'>+	case V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE:</div><div class='add'>+		return cx2341x_video_median_filter_type_menu;</div><div class='add'>+	default:</div><div class='add'>+		return v4l2_ctrl_get_menu(id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params)</div><div class='add'>+{</div><div class='add'>+	params-&gt;audio_properties = (params-&gt;audio_sampling_freq &lt;&lt; 0) |</div><div class='add'>+		((3 - params-&gt;audio_encoding) &lt;&lt; 2) |</div><div class='add'>+		((1 + params-&gt;audio_l2_bitrate) &lt;&lt; 4) |</div><div class='add'>+		(params-&gt;audio_mode &lt;&lt; 8) |</div><div class='add'>+		(params-&gt;audio_mode_extension &lt;&lt; 10) |</div><div class='add'>+		(((params-&gt;audio_emphasis == V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17) ?</div><div class='add'>+		  3 :</div><div class='add'>+		  params-&gt;audio_emphasis) &lt;&lt; 12) |</div><div class='add'>+		(params-&gt;audio_crc &lt;&lt; 14);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params,</div><div class='add'>+		  struct v4l2_ext_controls *ctrls, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (cmd == VIDIOC_G_EXT_CTRLS) {</div><div class='add'>+		for (i = 0; i &lt; ctrls-&gt;count; i++) {</div><div class='add'>+			struct v4l2_ext_control *ctrl = ctrls-&gt;controls + i;</div><div class='add'>+</div><div class='add'>+			err = cx2341x_get_ctrl(params, ctrl);</div><div class='add'>+			if (err) {</div><div class='add'>+				ctrls-&gt;error_idx = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ctrls-&gt;count; i++) {</div><div class='add'>+		struct v4l2_ext_control *ctrl = ctrls-&gt;controls + i;</div><div class='add'>+		struct v4l2_queryctrl qctrl;</div><div class='add'>+		const char **menu_items = NULL;</div><div class='add'>+</div><div class='add'>+		qctrl.id = ctrl-&gt;id;</div><div class='add'>+		err = cx2341x_ctrl_query(params, &amp;qctrl);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		if (qctrl.type == V4L2_CTRL_TYPE_MENU)</div><div class='add'>+			menu_items = cx2341x_ctrl_get_menu(qctrl.id);</div><div class='add'>+		err = v4l2_ctrl_check(ctrl, &amp;qctrl, menu_items);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		err = cx2341x_set_ctrl(params, ctrl);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (err == 0 &amp;&amp; params-&gt;video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR &amp;&amp;</div><div class='add'>+			params-&gt;video_bitrate_peak &lt; params-&gt;video_bitrate) {</div><div class='add'>+		err = -ERANGE;</div><div class='add'>+		ctrls-&gt;error_idx = ctrls-&gt;count;</div><div class='add'>+	}</div><div class='add'>+	if (err) {</div><div class='add'>+		ctrls-&gt;error_idx = i;</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		cx2341x_calc_audio_properties(params);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p)</div><div class='add'>+{</div><div class='add'>+	static struct cx2341x_mpeg_params default_params = {</div><div class='add'>+	/* misc */</div><div class='add'>+	.capabilities = 0,</div><div class='add'>+	.port = CX2341X_PORT_MEMORY,</div><div class='add'>+	.width = 720,</div><div class='add'>+	.height = 480,</div><div class='add'>+	.is_50hz = 0,</div><div class='add'>+</div><div class='add'>+	/* stream */</div><div class='add'>+	.stream_type = V4L2_MPEG_STREAM_TYPE_MPEG2_PS,</div><div class='add'>+	.stream_vbi_fmt = V4L2_MPEG_STREAM_VBI_FMT_NONE,</div><div class='add'>+</div><div class='add'>+	/* audio */</div><div class='add'>+	.audio_sampling_freq = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000,</div><div class='add'>+	.audio_encoding = V4L2_MPEG_AUDIO_ENCODING_LAYER_2,</div><div class='add'>+	.audio_l2_bitrate = V4L2_MPEG_AUDIO_L2_BITRATE_224K,</div><div class='add'>+	.audio_mode = V4L2_MPEG_AUDIO_MODE_STEREO,</div><div class='add'>+	.audio_mode_extension = V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4,</div><div class='add'>+	.audio_emphasis = V4L2_MPEG_AUDIO_EMPHASIS_NONE,</div><div class='add'>+	.audio_crc = V4L2_MPEG_AUDIO_CRC_NONE,</div><div class='add'>+</div><div class='add'>+	/* video */</div><div class='add'>+	.video_encoding = V4L2_MPEG_VIDEO_ENCODING_MPEG_2,</div><div class='add'>+	.video_aspect = V4L2_MPEG_VIDEO_ASPECT_4x3,</div><div class='add'>+	.video_b_frames = 2,</div><div class='add'>+	.video_gop_size = 12,</div><div class='add'>+	.video_gop_closure = 1,</div><div class='add'>+	.video_pulldown = 0,</div><div class='add'>+	.video_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,</div><div class='add'>+	.video_bitrate = 6000000,</div><div class='add'>+	.video_bitrate_peak = 8000000,</div><div class='add'>+	.video_temporal_decimation = 0,</div><div class='add'>+</div><div class='add'>+	/* encoding filters */</div><div class='add'>+	.video_spatial_filter_mode = V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL,</div><div class='add'>+	.video_spatial_filter = 0,</div><div class='add'>+	.video_luma_spatial_filter_type = V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR,</div><div class='add'>+	.video_chroma_spatial_filter_type = V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR,</div><div class='add'>+	.video_temporal_filter_mode = V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL,</div><div class='add'>+	.video_temporal_filter = 0,</div><div class='add'>+	.video_median_filter_type = V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF,</div><div class='add'>+	.video_luma_median_filter_top = 255,</div><div class='add'>+	.video_luma_median_filter_bottom = 0,</div><div class='add'>+	.video_chroma_median_filter_top = 255,</div><div class='add'>+	.video_chroma_median_filter_bottom = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	*p = default_params;</div><div class='add'>+	cx2341x_calc_audio_properties(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx2341x_api(void *priv, cx2341x_mbox_func func, int cmd, int args, ...)</div><div class='add'>+{</div><div class='add'>+	u32 data[CX2341X_MBOX_MAX_DATA];</div><div class='add'>+	va_list vargs;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	va_start(vargs, args);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; args; i++) {</div><div class='add'>+		data[i] = va_arg(vargs, int);</div><div class='add'>+	}</div><div class='add'>+	va_end(vargs);</div><div class='add'>+	return func(priv, cmd, args, 0, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cx2341x_update(void *priv, cx2341x_mbox_func func,</div><div class='add'>+		const struct cx2341x_mpeg_params *old, const struct cx2341x_mpeg_params *new)</div><div class='add'>+{</div><div class='add'>+	static int mpeg_stream_type[] = {</div><div class='add'>+		0,	/* MPEG-2 PS */</div><div class='add'>+		1,	/* MPEG-2 TS */</div><div class='add'>+		2,	/* MPEG-1 SS */</div><div class='add'>+		14,	/* DVD */</div><div class='add'>+		11,	/* VCD */</div><div class='add'>+		12,	/* SVCD */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 2, new-&gt;port, 0);</div><div class='add'>+</div><div class='add'>+	if (old == NULL || old-&gt;is_50hz != new-&gt;is_50hz) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1, new-&gt;is_50hz);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old == NULL || old-&gt;width != new-&gt;width || old-&gt;height != new-&gt;height ||</div><div class='add'>+			old-&gt;video_encoding != new-&gt;video_encoding) {</div><div class='add'>+		u16 w = new-&gt;width;</div><div class='add'>+		u16 h = new-&gt;height;</div><div class='add'>+</div><div class='add'>+		if (new-&gt;video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1) {</div><div class='add'>+			w /= 2;</div><div class='add'>+			h /= 2;</div><div class='add'>+		}</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_SIZE, 2, h, w);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (old == NULL || old-&gt;stream_type != new-&gt;stream_type) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_STREAM_TYPE, 1, mpeg_stream_type[new-&gt;stream_type]);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_aspect != new-&gt;video_aspect) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_ASPECT_RATIO, 1, 1 + new-&gt;video_aspect);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_b_frames != new-&gt;video_b_frames ||</div><div class='add'>+		old-&gt;video_gop_size != new-&gt;video_gop_size) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_GOP_PROPERTIES, 2,</div><div class='add'>+				new-&gt;video_gop_size, new-&gt;video_b_frames + 1);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_gop_closure != new-&gt;video_gop_closure) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_GOP_CLOSURE, 1, new-&gt;video_gop_closure);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_pulldown != new-&gt;video_pulldown) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_3_2_PULLDOWN, 1, new-&gt;video_pulldown);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;audio_properties != new-&gt;audio_properties) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_AUDIO_PROPERTIES, 1, new-&gt;audio_properties);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_bitrate_mode != new-&gt;video_bitrate_mode ||</div><div class='add'>+		old-&gt;video_bitrate != new-&gt;video_bitrate ||</div><div class='add'>+		old-&gt;video_bitrate_peak != new-&gt;video_bitrate_peak) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_BIT_RATE, 5,</div><div class='add'>+				new-&gt;video_bitrate_mode, new-&gt;video_bitrate,</div><div class='add'>+				new-&gt;video_bitrate_peak / 400, 0, 0);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_spatial_filter_mode != new-&gt;video_spatial_filter_mode ||</div><div class='add'>+		old-&gt;video_temporal_filter_mode != new-&gt;video_temporal_filter_mode ||</div><div class='add'>+		old-&gt;video_median_filter_type != new-&gt;video_median_filter_type) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_DNR_FILTER_MODE, 2,</div><div class='add'>+				new-&gt;video_spatial_filter_mode | (new-&gt;video_temporal_filter_mode &lt;&lt; 1),</div><div class='add'>+				new-&gt;video_median_filter_type);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL ||</div><div class='add'>+		old-&gt;video_luma_median_filter_bottom != new-&gt;video_luma_median_filter_bottom ||</div><div class='add'>+		old-&gt;video_luma_median_filter_top != new-&gt;video_luma_median_filter_top ||</div><div class='add'>+		old-&gt;video_chroma_median_filter_bottom != new-&gt;video_chroma_median_filter_bottom ||</div><div class='add'>+		old-&gt;video_chroma_median_filter_top != new-&gt;video_chroma_median_filter_top) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_CORING_LEVELS, 4,</div><div class='add'>+				new-&gt;video_luma_median_filter_bottom,</div><div class='add'>+				new-&gt;video_luma_median_filter_top,</div><div class='add'>+				new-&gt;video_chroma_median_filter_bottom,</div><div class='add'>+				new-&gt;video_chroma_median_filter_top);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL ||</div><div class='add'>+		old-&gt;video_luma_spatial_filter_type != new-&gt;video_luma_spatial_filter_type ||</div><div class='add'>+		old-&gt;video_chroma_spatial_filter_type != new-&gt;video_chroma_spatial_filter_type) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_SPATIAL_FILTER_TYPE, 2,</div><div class='add'>+			new-&gt;video_luma_spatial_filter_type, new-&gt;video_chroma_spatial_filter_type);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL ||</div><div class='add'>+		old-&gt;video_spatial_filter != new-&gt;video_spatial_filter ||</div><div class='add'>+		old-&gt;video_temporal_filter != new-&gt;video_temporal_filter) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_DNR_FILTER_PROPS, 2,</div><div class='add'>+			new-&gt;video_spatial_filter, new-&gt;video_temporal_filter);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	if (old == NULL || old-&gt;video_temporal_decimation != new-&gt;video_temporal_decimation) {</div><div class='add'>+		err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_DROP_RATE, 1,</div><div class='add'>+			new-&gt;video_temporal_decimation);</div><div class='add'>+		if (err) return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *cx2341x_menu_item(struct cx2341x_mpeg_params *p, u32 id)</div><div class='add'>+{</div><div class='add'>+	const char **menu = cx2341x_ctrl_get_menu(id);</div><div class='add'>+	struct v4l2_ext_control ctrl;</div><div class='add'>+</div><div class='add'>+	if (menu == NULL)</div><div class='add'>+		goto invalid;</div><div class='add'>+	ctrl.id = id;</div><div class='add'>+	if (cx2341x_get_ctrl(p, &amp;ctrl))</div><div class='add'>+		goto invalid;</div><div class='add'>+	while (ctrl.value-- &amp;&amp; *menu) menu++;</div><div class='add'>+	if (*menu == NULL)</div><div class='add'>+		goto invalid;</div><div class='add'>+	return *menu;</div><div class='add'>+</div><div class='add'>+invalid:</div><div class='add'>+	return "&lt;invalid&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix)</div><div class='add'>+{</div><div class='add'>+	int is_mpeg1 = p-&gt;video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1;</div><div class='add'>+</div><div class='add'>+	/* Stream */</div><div class='add'>+	printk(KERN_INFO "%s: Stream: %s\n",</div><div class='add'>+		prefix,</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_STREAM_TYPE));</div><div class='add'>+</div><div class='add'>+	/* Video */</div><div class='add'>+	printk(KERN_INFO "%s: Video:  %dx%d, %d fps\n",</div><div class='add'>+		prefix,</div><div class='add'>+		p-&gt;width / (is_mpeg1 ? 2 : 1), p-&gt;height / (is_mpeg1 ? 2 : 1),</div><div class='add'>+		p-&gt;is_50hz ? 25 : 30);</div><div class='add'>+	printk(KERN_INFO "%s: Video:  %s, %s, %s, %d",</div><div class='add'>+		prefix,</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_VIDEO_ENCODING),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_VIDEO_ASPECT),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_VIDEO_BITRATE_MODE),</div><div class='add'>+		p-&gt;video_bitrate);</div><div class='add'>+	if (p-&gt;video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) {</div><div class='add'>+		printk(", Peak %d", p-&gt;video_bitrate_peak);</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+	printk(KERN_INFO "%s: Video:  GOP Size %d, %d B-Frames, %sGOP Closure, %s3:2 Pulldown\n",</div><div class='add'>+		prefix,</div><div class='add'>+		p-&gt;video_gop_size, p-&gt;video_b_frames,</div><div class='add'>+		p-&gt;video_gop_closure ? "" : "No ",</div><div class='add'>+		p-&gt;video_pulldown ? "" : "No ");</div><div class='add'>+	if (p-&gt;video_temporal_decimation) {</div><div class='add'>+		printk(KERN_INFO "%s: Video: Temporal Decimation %d\n",</div><div class='add'>+			prefix, p-&gt;video_temporal_decimation);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Audio */</div><div class='add'>+	printk(KERN_INFO "%s: Audio:  %s, %s, %s, %s",</div><div class='add'>+		prefix,</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_ENCODING),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_L2_BITRATE),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_MODE));</div><div class='add'>+	if (p-&gt;audio_mode == V4L2_MPEG_AUDIO_MODE_JOINT_STEREO) {</div><div class='add'>+		printk(", %s",</div><div class='add'>+			cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_MODE_EXTENSION));</div><div class='add'>+	}</div><div class='add'>+	printk(", %s, %s\n",</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_EMPHASIS),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_CRC));</div><div class='add'>+</div><div class='add'>+	/* Encoding filters */</div><div class='add'>+	printk(KERN_INFO "%s: Spatial Filter:  %s, Luma %s, Chroma %s, %d\n",</div><div class='add'>+		prefix,</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE),</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE),</div><div class='add'>+		p-&gt;video_spatial_filter);</div><div class='add'>+	printk(KERN_INFO "%s: Temporal Filter: %s, %d\n",</div><div class='add'>+		prefix,</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE),</div><div class='add'>+		p-&gt;video_temporal_filter);</div><div class='add'>+	printk(KERN_INFO "%s: Median Filter:   %s, Luma [%d, %d], Chroma [%d, %d]\n",</div><div class='add'>+		prefix,</div><div class='add'>+		cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE),</div><div class='add'>+		p-&gt;video_luma_median_filter_bottom,</div><div class='add'>+		p-&gt;video_luma_median_filter_top,</div><div class='add'>+		p-&gt;video_chroma_median_filter_bottom,</div><div class='add'>+		p-&gt;video_chroma_median_filter_top);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(cx2341x_fill_defaults);</div><div class='add'>+EXPORT_SYMBOL(cx2341x_ctrl_query);</div><div class='add'>+EXPORT_SYMBOL(cx2341x_ctrl_get_menu);</div><div class='add'>+EXPORT_SYMBOL(cx2341x_ext_ctrls);</div><div class='add'>+EXPORT_SYMBOL(cx2341x_update);</div><div class='add'>+EXPORT_SYMBOL(cx2341x_log_status);</div><div class='add'>+EXPORT_SYMBOL(cx2341x_mpeg_ctrls);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Local variables:</div><div class='add'>+ * c-basic-offset: 8</div><div class='add'>+ * End:</div><div class='add'>+ */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-audio.c b/drivers/media/video/cx25840/cx25840-audio.c<br/>index 9a4b813152e5..f897c1ebd5f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-audio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-audio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx25840/cx25840-audio.c</a></div><div class='hunk'>@@ -30,9 +30,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 	if (freq != 32000 &amp;&amp; freq != 44100 &amp;&amp; freq != 48000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* assert soft reset */</div><div class='del'>-	cx25840_and_or(client, 0x810, ~0x1, 0x01);</div><div class='del'>-</div><div class='ctx'> 	/* common for all inputs and rates */</div><div class='ctx'> 	/* SA_MCLK_SEL=1, SA_MCLK_DIV=0x10 */</div><div class='ctx'> 	cx25840_write(client, 0x127, 0x50);</div><div class='hunk'>@@ -46,6 +43,9 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 			/* AUX_PLL_FRAC */</div><div class='ctx'> 			cx25840_write4(client, 0x110, 0xee39bb01);</div><div class='ctx'> </div><div class='add'>+			if (state-&gt;is_cx25836)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* src3/4/6_ctl = 0x0801f77f */</div><div class='ctx'> 			cx25840_write4(client, 0x900, 0x7ff70108);</div><div class='ctx'> 			cx25840_write4(client, 0x904, 0x7ff70108);</div><div class='hunk'>@@ -59,6 +59,9 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 			/* AUX_PLL_FRAC */</div><div class='ctx'> 			cx25840_write4(client, 0x110, 0xd66bec00);</div><div class='ctx'> </div><div class='add'>+			if (state-&gt;is_cx25836)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* src3/4/6_ctl = 0x08016d59 */</div><div class='ctx'> 			cx25840_write4(client, 0x900, 0x596d0108);</div><div class='ctx'> 			cx25840_write4(client, 0x904, 0x596d0108);</div><div class='hunk'>@@ -72,6 +75,9 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 			/* AUX_PLL_FRAC */</div><div class='ctx'> 			cx25840_write4(client, 0x110, 0xe5d69800);</div><div class='ctx'> </div><div class='add'>+			if (state-&gt;is_cx25836)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* src3/4/6_ctl = 0x08014faa */</div><div class='ctx'> 			cx25840_write4(client, 0x900, 0xaa4f0108);</div><div class='ctx'> 			cx25840_write4(client, 0x904, 0xaa4f0108);</div><div class='hunk'>@@ -87,6 +93,9 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 			/* AUX_PLL_FRAC */</div><div class='ctx'> 			cx25840_write4(client, 0x110, 0x69082a01);</div><div class='ctx'> </div><div class='add'>+			if (state-&gt;is_cx25836)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* src1_ctl = 0x08010000 */</div><div class='ctx'> 			cx25840_write4(client, 0x8f8, 0x00000108);</div><div class='ctx'> </div><div class='hunk'>@@ -106,6 +115,9 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 			/* AUX_PLL_FRAC */</div><div class='ctx'> 			cx25840_write4(client, 0x110, 0xd66bec00);</div><div class='ctx'> </div><div class='add'>+			if (state-&gt;is_cx25836)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* src1_ctl = 0x08010000 */</div><div class='ctx'> 			cx25840_write4(client, 0x8f8, 0xcd600108);</div><div class='ctx'> </div><div class='hunk'>@@ -122,6 +134,9 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 			/* AUX_PLL_FRAC */</div><div class='ctx'> 			cx25840_write4(client, 0x110, 0xe5d69800);</div><div class='ctx'> </div><div class='add'>+			if (state-&gt;is_cx25836)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			/* src1_ctl = 0x08010000 */</div><div class='ctx'> 			cx25840_write4(client, 0x8f8, 0x00800108);</div><div class='ctx'> </div><div class='hunk'>@@ -133,9 +148,6 @@ static int set_audclk_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* deassert soft reset */</div><div class='del'>-	cx25840_and_or(client, 0x810, ~0x1, 0x00);</div><div class='del'>-</div><div class='ctx'> 	state-&gt;audclk_freq = freq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -148,6 +160,10 @@ void cx25840_audio_set_path(struct i2c_client *client)</div><div class='ctx'> 	/* stop microcontroller */</div><div class='ctx'> 	cx25840_and_or(client, 0x803, ~0x10, 0);</div><div class='ctx'> </div><div class='add'>+	/* assert soft reset */</div><div class='add'>+	if (!state-&gt;is_cx25836)</div><div class='add'>+		cx25840_and_or(client, 0x810, ~0x1, 0x01);</div><div class='add'>+</div><div class='ctx'> 	/* Mute everything to prevent the PFFT! */</div><div class='ctx'> 	cx25840_write(client, 0x8d3, 0x1f);</div><div class='ctx'> </div><div class='hunk'>@@ -161,13 +177,19 @@ void cx25840_audio_set_path(struct i2c_client *client)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Set Path1 to Analog Demod Main Channel */</div><div class='ctx'> 		cx25840_write4(client, 0x8d0, 0x7038061f);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	set_audclk_freq(client, state-&gt;audclk_freq);</div><div class='add'>+</div><div class='add'>+	/* deassert soft reset */</div><div class='add'>+	if (!state-&gt;is_cx25836)</div><div class='add'>+		cx25840_and_or(client, 0x810, ~0x1, 0x00);</div><div class='add'>+</div><div class='add'>+	if (state-&gt;aud_input != CX25840_AUDIO_SERIAL) {</div><div class='ctx'> 		/* When the microcontroller detects the</div><div class='ctx'> 		 * audio format, it will unmute the lines */</div><div class='ctx'> 		cx25840_and_or(client, 0x803, ~0x10, 0x10);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	set_audclk_freq(client, state-&gt;audclk_freq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_volume(struct i2c_client *client)</div><div class='hunk'>@@ -291,11 +313,25 @@ static void set_mute(struct i2c_client *client, int mute)</div><div class='ctx'> </div><div class='ctx'> int cx25840_audio(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='ctx'> 	struct v4l2_control *ctrl = arg;</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case VIDIOC_INT_AUDIO_CLOCK_FREQ:</div><div class='del'>-		return set_audclk_freq(client, *(u32 *)arg);</div><div class='add'>+		if (state-&gt;aud_input != CX25840_AUDIO_SERIAL) {</div><div class='add'>+			cx25840_and_or(client, 0x803, ~0x10, 0);</div><div class='add'>+			cx25840_write(client, 0x8d3, 0x1f);</div><div class='add'>+		}</div><div class='add'>+		if (!state-&gt;is_cx25836)</div><div class='add'>+			cx25840_and_or(client, 0x810, ~0x1, 1);</div><div class='add'>+		retval = set_audclk_freq(client, *(u32 *)arg);</div><div class='add'>+		if (!state-&gt;is_cx25836)</div><div class='add'>+			cx25840_and_or(client, 0x810, ~0x1, 0);</div><div class='add'>+		if (state-&gt;aud_input != CX25840_AUDIO_SERIAL) {</div><div class='add'>+			cx25840_and_or(client, 0x803, ~0x10, 0x10);</div><div class='add'>+		}</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='ctx'> 		switch (ctrl-&gt;id) {</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c<br/>index a961bb2ab0fd..5c2036b40ea1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx25840/cx25840-core.c</a></div><div class='hunk'>@@ -10,6 +10,9 @@</div><div class='ctx'>  *</div><div class='ctx'>  * VBI support by Hans Verkuil &lt;hverkuil@xs4all.nl&gt;.</div><div class='ctx'>  *</div><div class='add'>+ * NTSC sliced VBI support by Christopher Neufeld &lt;television@cneufeld.ca&gt;</div><div class='add'>+ * with additional fixes by Hans Verkuil &lt;hverkuil@xs4all.nl&gt;.</div><div class='add'>+ *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or</div><div class='ctx'>  * modify it under the terms of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation; either version 2</div><div class='hunk'>@@ -43,7 +46,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static unsigned short normal_i2c[] = { 0x88 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int cx25840_debug;</div><div class='add'>+int cx25840_debug;</div><div class='ctx'> </div><div class='ctx'> module_param_named(debug,cx25840_debug, int, 0644);</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +108,7 @@ u32 cx25840_read4(struct i2c_client * client, u16 addr)</div><div class='ctx'> 	    (buffer[2] &lt;&lt; 8) | buffer[3];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cx25840_and_or(struct i2c_client *client, u16 addr, u8 and_mask,</div><div class='add'>+int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned and_mask,</div><div class='ctx'> 		   u8 or_value)</div><div class='ctx'> {</div><div class='ctx'> 	return cx25840_write(client, addr,</div><div class='hunk'>@@ -117,7 +120,8 @@ int cx25840_and_or(struct i2c_client *client, u16 addr, u8 and_mask,</div><div class='ctx'> </div><div class='ctx'> static int set_input(struct i2c_client *client, enum cx25840_video_input vid_input,</div><div class='ctx'> 						enum cx25840_audio_input aud_input);</div><div class='del'>-static void log_status(struct i2c_client *client);</div><div class='add'>+static void log_audio_status(struct i2c_client *client);</div><div class='add'>+static void log_video_status(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='hunk'>@@ -147,6 +151,33 @@ static void init_dll2(struct i2c_client *client)</div><div class='ctx'> 	cx25840_write(client, 0x15d, 0xe1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cx25836_initialize(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	/* reset configuration is described on page 3-77 of the CX25836 datasheet */</div><div class='add'>+	/* 2. */</div><div class='add'>+	cx25840_and_or(client, 0x000, ~0x01, 0x01);</div><div class='add'>+	cx25840_and_or(client, 0x000, ~0x01, 0x00);</div><div class='add'>+	/* 3a. */</div><div class='add'>+	cx25840_and_or(client, 0x15a, ~0x70, 0x00);</div><div class='add'>+	/* 3b. */</div><div class='add'>+	cx25840_and_or(client, 0x15b, ~0x1e, 0x06);</div><div class='add'>+	/* 3c. */</div><div class='add'>+	cx25840_and_or(client, 0x159, ~0x02, 0x02);</div><div class='add'>+	/* 3d. */</div><div class='add'>+	/* There should be a 10-us delay here, but since the</div><div class='add'>+	   i2c bus already has a 10-us delay we don't need to do</div><div class='add'>+	   anything */</div><div class='add'>+	/* 3e. */</div><div class='add'>+	cx25840_and_or(client, 0x159, ~0x02, 0x00);</div><div class='add'>+	/* 3f. */</div><div class='add'>+	cx25840_and_or(client, 0x159, ~0xc0, 0xc0);</div><div class='add'>+	/* 3g. */</div><div class='add'>+	cx25840_and_or(client, 0x159, ~0x01, 0x00);</div><div class='add'>+	cx25840_and_or(client, 0x159, ~0x01, 0x01);</div><div class='add'>+	/* 3h. */</div><div class='add'>+	cx25840_and_or(client, 0x15b, ~0x1e, 0x10);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cx25840_initialize(struct i2c_client *client, int loadfw)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='hunk'>@@ -220,17 +251,7 @@ static void input_change(struct i2c_client *client)</div><div class='ctx'> 	cx25840_and_or(client, 0x401, ~0x60, 0);</div><div class='ctx'> 	cx25840_and_or(client, 0x401, ~0x60, 0x60);</div><div class='ctx'> </div><div class='del'>-	/* Note: perhaps V4L2_STD_PAL_M should be handled as V4L2_STD_NTSC</div><div class='del'>-	   instead of V4L2_STD_PAL. Someone needs to test this. */</div><div class='del'>-	if (std &amp; V4L2_STD_PAL) {</div><div class='del'>-		/* Follow tuner change procedure for PAL */</div><div class='del'>-		cx25840_write(client, 0x808, 0xff);</div><div class='del'>-		cx25840_write(client, 0x80b, 0x10);</div><div class='del'>-	} else if (std &amp; V4L2_STD_SECAM) {</div><div class='del'>-		/* Select autodetect for SECAM */</div><div class='del'>-		cx25840_write(client, 0x808, 0xff);</div><div class='del'>-		cx25840_write(client, 0x80b, 0x10);</div><div class='del'>-	} else if (std &amp; V4L2_STD_NTSC) {</div><div class='add'>+	if (std &amp; V4L2_STD_525_60) {</div><div class='ctx'> 		/* Certain Hauppauge PVR150 models have a hardware bug</div><div class='ctx'> 		   that causes audio to drop out. For these models the</div><div class='ctx'> 		   audio standard must be set explicitly.</div><div class='hunk'>@@ -249,6 +270,14 @@ static void input_change(struct i2c_client *client)</div><div class='ctx'> 			cx25840_write(client, 0x808, hw_fix ? 0x1f : 0xf6);</div><div class='ctx'> 		}</div><div class='ctx'> 		cx25840_write(client, 0x80b, 0x00);</div><div class='add'>+	} else if (std &amp; V4L2_STD_PAL) {</div><div class='add'>+		/* Follow tuner change procedure for PAL */</div><div class='add'>+		cx25840_write(client, 0x808, 0xff);</div><div class='add'>+		cx25840_write(client, 0x80b, 0x10);</div><div class='add'>+	} else if (std &amp; V4L2_STD_SECAM) {</div><div class='add'>+		/* Select autodetect for SECAM */</div><div class='add'>+		cx25840_write(client, 0x808, 0xff);</div><div class='add'>+		cx25840_write(client, 0x80b, 0x10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cx25840_read(client, 0x803) &amp; 0x10) {</div><div class='hunk'>@@ -319,8 +348,10 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp</div><div class='ctx'> </div><div class='ctx'> 	state-&gt;vid_input = vid_input;</div><div class='ctx'> 	state-&gt;aud_input = aud_input;</div><div class='del'>-	cx25840_audio_set_path(client);</div><div class='del'>-	input_change(client);</div><div class='add'>+	if (!state-&gt;is_cx25836) {</div><div class='add'>+		cx25840_audio_set_path(client);</div><div class='add'>+		input_change(client);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -354,6 +385,8 @@ static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	v4l_dbg(1, cx25840_debug, client, "changing video std to fmt %i\n",fmt);</div><div class='add'>+</div><div class='ctx'> 	/* Follow step 9 of section 3.16 in the cx25840 datasheet.</div><div class='ctx'> 	   Without this PAL may display a vertical ghosting effect.</div><div class='ctx'> 	   This happens for example with the Yuan MPC622. */</div><div class='hunk'>@@ -370,6 +403,7 @@ static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)</div><div class='ctx'> </div><div class='ctx'> v4l2_std_id cx25840_get_v4lstd(struct i2c_client * client)</div><div class='ctx'> {</div><div class='add'>+	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='ctx'> 	/* check VID_FMT_SEL first */</div><div class='ctx'> 	u8 fmt = cx25840_read(client, 0x400) &amp; 0xf;</div><div class='ctx'> </div><div class='hunk'>@@ -383,7 +417,7 @@ v4l2_std_id cx25840_get_v4lstd(struct i2c_client * client)</div><div class='ctx'> 	{</div><div class='ctx'> 		/* if the audio std is A2-M, then this is the South Korean</div><div class='ctx'> 		   NTSC standard */</div><div class='del'>-		if (cx25840_read(client, 0x805) == 2)</div><div class='add'>+		if (!state-&gt;is_cx25836 &amp;&amp; cx25840_read(client, 0x805) == 2)</div><div class='ctx'> 			return V4L2_STD_NTSC_M_KR;</div><div class='ctx'> 		return V4L2_STD_NTSC_M;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -456,6 +490,8 @@ static int set_v4lctrl(struct i2c_client *client, struct v4l2_control *ctrl)</div><div class='ctx'> 	case V4L2_CID_AUDIO_TREBLE:</div><div class='ctx'> 	case V4L2_CID_AUDIO_BALANCE:</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return cx25840_audio(client, VIDIOC_S_CTRL, ctrl);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -490,6 +526,8 @@ static int get_v4lctrl(struct i2c_client *client, struct v4l2_control *ctrl)</div><div class='ctx'> 	case V4L2_CID_AUDIO_TREBLE:</div><div class='ctx'> 	case V4L2_CID_AUDIO_BALANCE:</div><div class='ctx'> 	case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return cx25840_audio(client, VIDIOC_G_CTRL, ctrl);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -579,91 +617,6 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct v4l2_queryctrl cx25840_qctrl[] = {</div><div class='del'>-	{</div><div class='del'>-		.id            = V4L2_CID_BRIGHTNESS,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Brightness",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 255,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 128,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_CONTRAST,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Contrast",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 127,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 64,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_SATURATION,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Saturation",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 127,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 64,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_HUE,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Hue",</div><div class='del'>-		.minimum       = -128,</div><div class='del'>-		.maximum       = 127,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 0,</div><div class='del'>-		.flags 	       = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_AUDIO_VOLUME,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Volume",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 58880,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_AUDIO_BALANCE,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Balance",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 32768,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_AUDIO_MUTE,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='del'>-		.name          = "Mute",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 1,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 1,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_AUDIO_BASS,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Bass",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 32768,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_AUDIO_TREBLE,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Treble",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 32768,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ----------------------------------------------------------------------- */</div><div class='del'>-</div><div class='ctx'> static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> 			   void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -706,8 +659,8 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_STREAMON:</div><div class='ctx'> 		v4l_dbg(1, cx25840_debug, client, "enable output\n");</div><div class='del'>-		cx25840_write(client, 0x115, 0x8c);</div><div class='del'>-		cx25840_write(client, 0x116, 0x07);</div><div class='add'>+		cx25840_write(client, 0x115, state-&gt;is_cx25836 ? 0x0c : 0x8c);</div><div class='add'>+		cx25840_write(client, 0x116, state-&gt;is_cx25836 ? 0x04 : 0x07);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_STREAMOFF:</div><div class='hunk'>@@ -717,7 +670,9 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_LOG_STATUS:</div><div class='del'>-		log_status(client);</div><div class='add'>+		log_video_status(client);</div><div class='add'>+		if (!state-&gt;is_cx25836)</div><div class='add'>+			log_audio_status(client);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='hunk'>@@ -729,13 +684,29 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> 	case VIDIOC_QUERYCTRL:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_queryctrl *qc = arg;</div><div class='del'>-		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(cx25840_qctrl); i++)</div><div class='del'>-			if (qc-&gt;id &amp;&amp; qc-&gt;id == cx25840_qctrl[i].id) {</div><div class='del'>-				memcpy(qc, &amp;cx25840_qctrl[i], sizeof(*qc));</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='add'>+		switch (qc-&gt;id) {</div><div class='add'>+			case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			case V4L2_CID_CONTRAST:</div><div class='add'>+			case V4L2_CID_SATURATION:</div><div class='add'>+			case V4L2_CID_HUE:</div><div class='add'>+				return v4l2_ctrl_query_fill_std(qc);</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		switch (qc-&gt;id) {</div><div class='add'>+			case V4L2_CID_AUDIO_VOLUME:</div><div class='add'>+			case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+			case V4L2_CID_AUDIO_BALANCE:</div><div class='add'>+			case V4L2_CID_AUDIO_BASS:</div><div class='add'>+			case V4L2_CID_AUDIO_TREBLE:</div><div class='add'>+				return v4l2_ctrl_query_fill_std(qc);</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -760,31 +731,41 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> 		return set_input(client, route-&gt;input, state-&gt;aud_input);</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_INT_G_AUDIO_ROUTING:</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		route-&gt;input = state-&gt;aud_input;</div><div class='ctx'> 		route-&gt;output = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_INT_S_AUDIO_ROUTING:</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return set_input(client, state-&gt;vid_input, route-&gt;input);</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_S_FREQUENCY:</div><div class='del'>-		input_change(client);</div><div class='add'>+		if (!state-&gt;is_cx25836) {</div><div class='add'>+			input_change(client);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_G_TUNER:</div><div class='ctx'> 	{</div><div class='del'>-		u8 mode = cx25840_read(client, 0x804);</div><div class='del'>-		u8 vpres = cx25840_read(client, 0x80a) &amp; 0x10;</div><div class='add'>+		u8 vpres = cx25840_read(client, 0x40e) &amp; 0x20;</div><div class='add'>+		u8 mode;</div><div class='ctx'> 		int val = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (state-&gt;radio)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		vt-&gt;signal = vpres ? 0xffff : 0x0;</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		vt-&gt;capability |=</div><div class='ctx'> 		    V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 |</div><div class='ctx'> 		    V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;</div><div class='ctx'> </div><div class='del'>-		vt-&gt;signal = vpres ? 0xffff : 0x0;</div><div class='add'>+		mode = cx25840_read(client, 0x804);</div><div class='ctx'> </div><div class='ctx'> 		/* get rxsubchans and audmode */</div><div class='ctx'> 		if ((mode &amp; 0xf) == 1)</div><div class='hunk'>@@ -804,7 +785,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_S_TUNER:</div><div class='del'>-		if (state-&gt;radio)</div><div class='add'>+		if (state-&gt;radio || state-&gt;is_cx25836)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		switch (vt-&gt;audmode) {</div><div class='hunk'>@@ -846,12 +827,14 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,</div><div class='ctx'> 		return set_v4lfmt(client, (struct v4l2_format *)arg);</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_INT_RESET:</div><div class='del'>-		cx25840_initialize(client, 0);</div><div class='add'>+		if (state-&gt;is_cx25836)</div><div class='add'>+			cx25836_initialize(client);</div><div class='add'>+		else</div><div class='add'>+			cx25840_initialize(client, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_INT_G_CHIP_IDENT:</div><div class='del'>-		*(enum v4l2_chip_ident *)arg =</div><div class='del'>-			V4L2_IDENT_CX25840 + ((cx25840_read(client, 0x100) &gt;&gt; 4) &amp; 0xf);</div><div class='add'>+		*(enum v4l2_chip_ident *)arg = state-&gt;id;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -870,6 +853,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,</div><div class='ctx'> {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> 	struct cx25840_state *state;</div><div class='add'>+	enum v4l2_chip_ident id;</div><div class='ctx'> 	u16 device_id;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the adapter supports the needed features</div><div class='hunk'>@@ -878,10 +862,11 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='del'>-	if (client == 0)</div><div class='add'>+	state = kzalloc(sizeof(struct cx25840_state), GFP_KERNEL);</div><div class='add'>+	if (state == 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	client = &amp;state-&gt;c;</div><div class='ctx'> 	client-&gt;addr = address;</div><div class='ctx'> 	client-&gt;adapter = adapter;</div><div class='ctx'> 	client-&gt;driver = &amp;i2c_driver_cx25840;</div><div class='hunk'>@@ -893,10 +878,18 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 	device_id |= cx25840_read(client, 0x100);</div><div class='ctx'> </div><div class='ctx'> 	/* The high byte of the device ID should be</div><div class='del'>-	 * 0x84 if chip is present */</div><div class='del'>-	if ((device_id &amp; 0xff00) != 0x8400) {</div><div class='add'>+	 * 0x83 for the cx2583x and 0x84 for the cx2584x */</div><div class='add'>+	if ((device_id &amp; 0xff00) == 0x8300) {</div><div class='add'>+		id = V4L2_IDENT_CX25836 + ((device_id &gt;&gt; 4) &amp; 0xf) - 6;</div><div class='add'>+		state-&gt;is_cx25836 = 1;</div><div class='add'>+	}</div><div class='add'>+	else if ((device_id &amp; 0xff00) == 0x8400) {</div><div class='add'>+		id = V4L2_IDENT_CX25840 + ((device_id &gt;&gt; 4) &amp; 0xf);</div><div class='add'>+		state-&gt;is_cx25836 = 0;</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='ctx'> 		v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n");</div><div class='del'>-		kfree(client);</div><div class='add'>+		kfree(state);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -905,21 +898,19 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,</div><div class='ctx'> 		    (device_id &amp; 0x0f) &lt; 3 ? (device_id &amp; 0x0f) + 1 : 3,</div><div class='ctx'> 		    address &lt;&lt; 1, adapter-&gt;name);</div><div class='ctx'> </div><div class='del'>-	state = kmalloc(sizeof(struct cx25840_state), GFP_KERNEL);</div><div class='del'>-	if (state == NULL) {</div><div class='del'>-		kfree(client);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	i2c_set_clientdata(client, state);</div><div class='del'>-	memset(state, 0, sizeof(struct cx25840_state));</div><div class='ctx'> 	state-&gt;vid_input = CX25840_COMPOSITE7;</div><div class='ctx'> 	state-&gt;aud_input = CX25840_AUDIO8;</div><div class='ctx'> 	state-&gt;audclk_freq = 48000;</div><div class='ctx'> 	state-&gt;pvr150_workaround = 0;</div><div class='ctx'> 	state-&gt;audmode = V4L2_TUNER_MODE_LANG1;</div><div class='add'>+	state-&gt;vbi_line_offset = 8;</div><div class='add'>+	state-&gt;id = id;</div><div class='ctx'> </div><div class='del'>-	cx25840_initialize(client, 1);</div><div class='add'>+	if (state-&gt;is_cx25836)</div><div class='add'>+		cx25836_initialize(client);</div><div class='add'>+	else</div><div class='add'>+		cx25840_initialize(client, 1);</div><div class='ctx'> </div><div class='ctx'> 	i2c_attach_client(client);</div><div class='ctx'> </div><div class='hunk'>@@ -944,7 +935,6 @@ static int cx25840_detach_client(struct i2c_client *client)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(state);</div><div class='del'>-	kfree(client);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -977,7 +967,7 @@ module_exit(m__exit);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static void log_status(struct i2c_client *client)</div><div class='add'>+static void log_video_status(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	static const char *const fmt_strs[] = {</div><div class='ctx'> 		"0x0",</div><div class='hunk'>@@ -989,9 +979,36 @@ static void log_status(struct i2c_client *client)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='del'>-	u8 microctrl_vidfmt = cx25840_read(client, 0x80a);</div><div class='ctx'> 	u8 vidfmt_sel = cx25840_read(client, 0x400) &amp; 0xf;</div><div class='ctx'> 	u8 gen_stat1 = cx25840_read(client, 0x40d);</div><div class='add'>+	u8 gen_stat2 = cx25840_read(client, 0x40e);</div><div class='add'>+	int vid_input = state-&gt;vid_input;</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "Video signal:              %spresent\n",</div><div class='add'>+		    (gen_stat2 &amp; 0x20) ? "" : "not ");</div><div class='add'>+	v4l_info(client, "Detected format:           %s\n",</div><div class='add'>+		    fmt_strs[gen_stat1 &amp; 0xf]);</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "Specified standard:        %s\n",</div><div class='add'>+		    vidfmt_sel ? fmt_strs[vidfmt_sel] : "automatic detection");</div><div class='add'>+</div><div class='add'>+	if (vid_input &gt;= CX25840_COMPOSITE1 &amp;&amp;</div><div class='add'>+	    vid_input &lt;= CX25840_COMPOSITE8) {</div><div class='add'>+		v4l_info(client, "Specified video input:     Composite %d\n",</div><div class='add'>+			vid_input - CX25840_COMPOSITE1 + 1);</div><div class='add'>+	} else {</div><div class='add'>+		v4l_info(client, "Specified video input:     S-Video (Luma In%d, Chroma In%d)\n",</div><div class='add'>+			(vid_input &amp; 0xf0) &gt;&gt; 4, (vid_input &amp; 0xf00) &gt;&gt; 8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "Specified audioclock freq: %d Hz\n", state-&gt;audclk_freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static void log_audio_status(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='ctx'> 	u8 download_ctl = cx25840_read(client, 0x803);</div><div class='ctx'> 	u8 mod_det_stat0 = cx25840_read(client, 0x804);</div><div class='ctx'> 	u8 mod_det_stat1 = cx25840_read(client, 0x805);</div><div class='hunk'>@@ -999,15 +1016,9 @@ static void log_status(struct i2c_client *client)</div><div class='ctx'> 	u8 pref_mode = cx25840_read(client, 0x809);</div><div class='ctx'> 	u8 afc0 = cx25840_read(client, 0x80b);</div><div class='ctx'> 	u8 mute_ctl = cx25840_read(client, 0x8d3);</div><div class='del'>-	int vid_input = state-&gt;vid_input;</div><div class='ctx'> 	int aud_input = state-&gt;aud_input;</div><div class='ctx'> 	char *p;</div><div class='ctx'> </div><div class='del'>-	v4l_info(client, "Video signal:              %spresent\n",</div><div class='del'>-		    (microctrl_vidfmt &amp; 0x10) ? "" : "not ");</div><div class='del'>-	v4l_info(client, "Detected format:           %s\n",</div><div class='del'>-		    fmt_strs[gen_stat1 &amp; 0xf]);</div><div class='del'>-</div><div class='ctx'> 	switch (mod_det_stat0) {</div><div class='ctx'> 	case 0x00: p = "mono"; break;</div><div class='ctx'> 	case 0x01: p = "stereo"; break;</div><div class='hunk'>@@ -1107,25 +1118,12 @@ static void log_status(struct i2c_client *client)</div><div class='ctx'> 		v4l_info(client, "Configured audio system:   %s\n", p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	v4l_info(client, "Specified standard:        %s\n",</div><div class='del'>-		    vidfmt_sel ? fmt_strs[vidfmt_sel] : "automatic detection");</div><div class='del'>-</div><div class='del'>-	if (vid_input &gt;= CX25840_COMPOSITE1 &amp;&amp;</div><div class='del'>-	    vid_input &lt;= CX25840_COMPOSITE8) {</div><div class='del'>-		v4l_info(client, "Specified video input:     Composite %d\n",</div><div class='del'>-			vid_input - CX25840_COMPOSITE1 + 1);</div><div class='del'>-	} else {</div><div class='del'>-		v4l_info(client, "Specified video input:     S-Video (Luma In%d, Chroma In%d)\n",</div><div class='del'>-			(vid_input &amp; 0xf0) &gt;&gt; 4, (vid_input &amp; 0xf00) &gt;&gt; 8);</div><div class='del'>-	}</div><div class='ctx'> 	if (aud_input) {</div><div class='ctx'> 		v4l_info(client, "Specified audio input:     Tuner (In%d)\n", aud_input);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		v4l_info(client, "Specified audio input:     External\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	v4l_info(client, "Specified audioclock freq: %d Hz\n", state-&gt;audclk_freq);</div><div class='del'>-</div><div class='ctx'> 	switch (pref_mode &amp; 0xf) {</div><div class='ctx'> 	case 0: p = "mono/language A"; break;</div><div class='ctx'> 	case 1: p = "language B"; break;</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h<br/>index 1736929fc204..28049064dd7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx25840/cx25840-core.h</a></div><div class='hunk'>@@ -24,6 +24,8 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> </div><div class='add'>+extern int cx25840_debug;</div><div class='add'>+</div><div class='ctx'> /* ENABLE_PVR150_WORKAROUND activates a workaround for a hardware bug that is</div><div class='ctx'>    present in Hauppauge PVR-150 (and possibly PVR-500) cards that have</div><div class='ctx'>    certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The</div><div class='hunk'>@@ -33,12 +35,16 @@</div><div class='ctx'> #define CX25840_CID_ENABLE_PVR150_WORKAROUND (V4L2_CID_PRIVATE_BASE+0)</div><div class='ctx'> </div><div class='ctx'> struct cx25840_state {</div><div class='add'>+	struct i2c_client c;</div><div class='ctx'> 	int pvr150_workaround;</div><div class='ctx'> 	int radio;</div><div class='ctx'> 	enum cx25840_video_input vid_input;</div><div class='ctx'> 	enum cx25840_audio_input aud_input;</div><div class='ctx'> 	u32 audclk_freq;</div><div class='ctx'> 	int audmode;</div><div class='add'>+	int vbi_line_offset;</div><div class='add'>+	enum v4l2_chip_ident id;</div><div class='add'>+	int is_cx25836;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='hunk'>@@ -47,7 +53,7 @@ int cx25840_write(struct i2c_client *client, u16 addr, u8 value);</div><div class='ctx'> int cx25840_write4(struct i2c_client *client, u16 addr, u32 value);</div><div class='ctx'> u8 cx25840_read(struct i2c_client *client, u16 addr);</div><div class='ctx'> u32 cx25840_read4(struct i2c_client *client, u16 addr);</div><div class='del'>-int cx25840_and_or(struct i2c_client *client, u16 addr, u8 mask, u8 value);</div><div class='add'>+int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned mask, u8 value);</div><div class='ctx'> v4l2_std_id cx25840_get_v4lstd(struct i2c_client *client);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c<br/>index 57feca288d2b..6cc8bf215e85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-vbi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx25840/cx25840-vbi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx25840/cx25840-vbi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx25840/cx25840-vbi.c</a></div><div class='hunk'>@@ -84,67 +84,140 @@ static int decode_vps(u8 * dst, u8 * p)</div><div class='ctx'> </div><div class='ctx'> void cx25840_vbi_setup(struct i2c_client *client)</div><div class='ctx'> {</div><div class='add'>+	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='ctx'> 	v4l2_std_id std = cx25840_get_v4lstd(client);</div><div class='add'>+	int hblank,hactive,burst,vblank,vactive,sc,vblank656,src_decimation;</div><div class='add'>+	int luma_lpf,uv_lpf, comb;</div><div class='add'>+	u32 pll_int,pll_frac,pll_post;</div><div class='ctx'> </div><div class='add'>+	/* datasheet startup, step 8d */</div><div class='ctx'> 	if (std &amp; ~V4L2_STD_NTSC) {</div><div class='del'>-		/* datasheet startup, step 8d */</div><div class='ctx'> 		cx25840_write(client, 0x49f, 0x11);</div><div class='add'>+	} else {</div><div class='add'>+		cx25840_write(client, 0x49f, 0x14);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		cx25840_write(client, 0x470, 0x84);</div><div class='del'>-		cx25840_write(client, 0x471, 0x00);</div><div class='del'>-		cx25840_write(client, 0x472, 0x2d);</div><div class='del'>-		cx25840_write(client, 0x473, 0x5d);</div><div class='del'>-</div><div class='del'>-		cx25840_write(client, 0x474, 0x24);</div><div class='del'>-		cx25840_write(client, 0x475, 0x40);</div><div class='del'>-		cx25840_write(client, 0x476, 0x24);</div><div class='del'>-		cx25840_write(client, 0x477, 0x28);</div><div class='del'>-</div><div class='del'>-		cx25840_write(client, 0x478, 0x1f);</div><div class='del'>-		cx25840_write(client, 0x479, 0x02);</div><div class='add'>+	if (std &amp; V4L2_STD_625_50) {</div><div class='add'>+		hblank=0x084;</div><div class='add'>+		hactive=0x2d0;</div><div class='add'>+		burst=0x5d;</div><div class='add'>+		vblank=0x024;</div><div class='add'>+		vactive=0x244;</div><div class='add'>+		vblank656=0x28;</div><div class='add'>+		src_decimation=0x21f;</div><div class='ctx'> </div><div class='add'>+		luma_lpf=2;</div><div class='ctx'> 		if (std &amp; V4L2_STD_SECAM) {</div><div class='del'>-			cx25840_write(client, 0x47a, 0x80);</div><div class='del'>-			cx25840_write(client, 0x47b, 0x00);</div><div class='del'>-			cx25840_write(client, 0x47c, 0x5f);</div><div class='del'>-			cx25840_write(client, 0x47d, 0x42);</div><div class='add'>+			uv_lpf=0;</div><div class='add'>+			comb=0;</div><div class='add'>+			sc=0x0a425f;</div><div class='ctx'> 		} else {</div><div class='del'>-			cx25840_write(client, 0x47a, 0x90);</div><div class='del'>-			cx25840_write(client, 0x47b, 0x20);</div><div class='del'>-			cx25840_write(client, 0x47c, 0x63);</div><div class='del'>-			cx25840_write(client, 0x47d, 0x82);</div><div class='add'>+			uv_lpf=1;</div><div class='add'>+			comb=0x20;</div><div class='add'>+			sc=0x0a8263;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		cx25840_write(client, 0x47e, 0x0a);</div><div class='del'>-		cx25840_write(client, 0x47f, 0x01);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* datasheet startup, step 8d */</div><div class='del'>-		cx25840_write(client, 0x49f, 0x14);</div><div class='add'>+		hactive=720;</div><div class='add'>+		hblank=122;</div><div class='add'>+		vactive=487;</div><div class='add'>+		luma_lpf=1;</div><div class='add'>+		uv_lpf=1;</div><div class='add'>+</div><div class='add'>+		src_decimation=0x21f;</div><div class='add'>+		if (std == V4L2_STD_PAL_M) {</div><div class='add'>+			vblank=20;</div><div class='add'>+			vblank656=24;</div><div class='add'>+			burst=0x61;</div><div class='add'>+			comb=0x20;</div><div class='add'>+</div><div class='add'>+			sc=555452;</div><div class='add'>+		} else {</div><div class='add'>+			vblank=26;</div><div class='add'>+			vblank656=26;</div><div class='add'>+			burst=0x5b;</div><div class='add'>+			comb=0x66;</div><div class='add'>+			sc=556063;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DEBUG: Displays configured PLL frequency */</div><div class='add'>+	pll_int=cx25840_read(client, 0x108);</div><div class='add'>+	pll_frac=cx25840_read4(client, 0x10c)&amp;0x1ffffff;</div><div class='add'>+	pll_post=cx25840_read(client, 0x109);</div><div class='add'>+	v4l_dbg(1, cx25840_debug, client,</div><div class='add'>+				"PLL regs = int: %u, frac: %u, post: %u\n",</div><div class='add'>+				pll_int,pll_frac,pll_post);</div><div class='add'>+</div><div class='add'>+	if (pll_post) {</div><div class='add'>+		int fin, fsc;</div><div class='add'>+		int pll= (28636363L*((((u64)pll_int)&lt;&lt;25L)+pll_frac)) &gt;&gt;25L;</div><div class='add'>+</div><div class='add'>+		pll/=pll_post;</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "PLL = %d.%06d MHz\n",</div><div class='add'>+						pll/1000000, pll%1000000);</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "PLL/8 = %d.%06d MHz\n",</div><div class='add'>+						pll/8000000, (pll/8)%1000000);</div><div class='add'>+</div><div class='add'>+		fin=((u64)src_decimation*pll)&gt;&gt;12;</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "ADC Sampling freq = "</div><div class='add'>+						"%d.%06d MHz\n",</div><div class='add'>+						fin/1000000,fin%1000000);</div><div class='add'>+</div><div class='add'>+		fsc= (((u64)sc)*pll) &gt;&gt; 24L;</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "Chroma sub-carrier freq = "</div><div class='add'>+						"%d.%06d MHz\n",</div><div class='add'>+						fsc/1000000,fsc%1000000);</div><div class='add'>+</div><div class='add'>+		v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, "</div><div class='add'>+			"vblank %i , vactive %i, vblank656 %i, src_dec %i,"</div><div class='add'>+			"burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x,"</div><div class='add'>+			" sc 0x%06x\n",</div><div class='add'>+			hblank, hactive, vblank, vactive, vblank656,</div><div class='add'>+			src_decimation, burst, luma_lpf, uv_lpf, comb, sc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sets horizontal blanking delay and active lines */</div><div class='add'>+	cx25840_write(client, 0x470, hblank);</div><div class='add'>+	cx25840_write(client, 0x471, 0xff&amp;(((hblank&gt;&gt;8)&amp;0x3)|(hactive &lt;&lt;4)));</div><div class='add'>+	cx25840_write(client, 0x472, hactive&gt;&gt;4);</div><div class='add'>+</div><div class='add'>+	/* Sets burst gate delay */</div><div class='add'>+	cx25840_write(client, 0x473, burst);</div><div class='ctx'> </div><div class='del'>-		cx25840_write(client, 0x470, 0x7a);</div><div class='del'>-		cx25840_write(client, 0x471, 0x00);</div><div class='del'>-		cx25840_write(client, 0x472, 0x2d);</div><div class='del'>-		cx25840_write(client, 0x473, 0x5b);</div><div class='add'>+	/* Sets vertical blanking delay and active duration */</div><div class='add'>+	cx25840_write(client, 0x474, vblank);</div><div class='add'>+	cx25840_write(client, 0x475, 0xff&amp;(((vblank&gt;&gt;8)&amp;0x3)|(vactive &lt;&lt;4)));</div><div class='add'>+	cx25840_write(client, 0x476, vactive&gt;&gt;4);</div><div class='add'>+	cx25840_write(client, 0x477, vblank656);</div><div class='ctx'> </div><div class='del'>-		cx25840_write(client, 0x474, 0x1a);</div><div class='del'>-		cx25840_write(client, 0x475, 0x70);</div><div class='del'>-		cx25840_write(client, 0x476, 0x1e);</div><div class='del'>-		cx25840_write(client, 0x477, 0x1e);</div><div class='add'>+	/* Sets src decimation rate */</div><div class='add'>+	cx25840_write(client, 0x478, 0xff&amp;src_decimation);</div><div class='add'>+	cx25840_write(client, 0x479, 0xff&amp;(src_decimation&gt;&gt;8));</div><div class='ctx'> </div><div class='del'>-		cx25840_write(client, 0x478, 0x1f);</div><div class='del'>-		cx25840_write(client, 0x479, 0x02);</div><div class='del'>-		cx25840_write(client, 0x47a, 0x50);</div><div class='del'>-		cx25840_write(client, 0x47b, 0x66);</div><div class='add'>+	/* Sets Luma and UV Low pass filters */</div><div class='add'>+	cx25840_write(client, 0x47a, luma_lpf&lt;&lt;6|((uv_lpf&lt;&lt;4)&amp;0x30));</div><div class='ctx'> </div><div class='del'>-		cx25840_write(client, 0x47c, 0x1f);</div><div class='del'>-		cx25840_write(client, 0x47d, 0x7c);</div><div class='del'>-		cx25840_write(client, 0x47e, 0x08);</div><div class='add'>+	/* Enables comb filters */</div><div class='add'>+	cx25840_write(client, 0x47b, comb);</div><div class='add'>+</div><div class='add'>+	/* Sets SC Step*/</div><div class='add'>+	cx25840_write(client, 0x47c, sc);</div><div class='add'>+	cx25840_write(client, 0x47d, 0xff&amp;sc&gt;&gt;8);</div><div class='add'>+	cx25840_write(client, 0x47e, 0xff&amp;sc&gt;&gt;16);</div><div class='add'>+</div><div class='add'>+	/* Sets VBI parameters */</div><div class='add'>+	if (std &amp; V4L2_STD_625_50) {</div><div class='add'>+		cx25840_write(client, 0x47f, 0x01);</div><div class='add'>+		state-&gt;vbi_line_offset = 5;</div><div class='add'>+	} else {</div><div class='ctx'> 		cx25840_write(client, 0x47f, 0x00);</div><div class='add'>+		state-&gt;vbi_line_offset = 8;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct cx25840_state *state = i2c_get_clientdata(client);</div><div class='ctx'> 	struct v4l2_format *fmt;</div><div class='ctx'> 	struct v4l2_sliced_vbi_format *svbi;</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +255,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_S_FMT:</div><div class='ctx'> 	{</div><div class='del'>-		int is_pal = !(cx25840_get_v4lstd(client) &amp; V4L2_STD_NTSC);</div><div class='add'>+		int is_pal = !(cx25840_get_v4lstd(client) &amp; V4L2_STD_525_60);</div><div class='ctx'> 		int vbi_offset = is_pal ? 1 : 0;</div><div class='ctx'> 		int i, x;</div><div class='ctx'> 		u8 lcr[24];</div><div class='hunk'>@@ -211,7 +284,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		cx25840_vbi_setup(client);</div><div class='ctx'> </div><div class='ctx'> 		/* Sliced VBI */</div><div class='del'>-		cx25840_write(client, 0x404, 0x36);	/* Ancillery data */</div><div class='add'>+		cx25840_write(client, 0x404, 0x32);	/* Ancillary data */</div><div class='ctx'> 		cx25840_write(client, 0x406, 0x13);</div><div class='ctx'> 		cx25840_write(client, 0x47f, vbi_offset);</div><div class='ctx'> </div><div class='hunk'>@@ -248,8 +321,18 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (x = 1, i = 0x424; i &lt;= 0x434; i++, x++) {</div><div class='del'>-			cx25840_write(client, i, lcr[6 + x]);</div><div class='add'>+		if (is_pal) {</div><div class='add'>+			for (x = 1, i = 0x424; i &lt;= 0x434; i++, x++) {</div><div class='add'>+				cx25840_write(client, i, lcr[6 + x]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		else {</div><div class='add'>+			for (x = 1, i = 0x424; i &lt;= 0x430; i++, x++) {</div><div class='add'>+				cx25840_write(client, i, lcr[9 + x]);</div><div class='add'>+			}</div><div class='add'>+			for (i = 0x431; i &lt;= 0x434; i++) {</div><div class='add'>+				cx25840_write(client, i, 0);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		cx25840_write(client, 0x43c, 0x16);</div><div class='hunk'>@@ -257,7 +340,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		if (is_pal) {</div><div class='ctx'> 			cx25840_write(client, 0x474, 0x2a);</div><div class='ctx'> 		} else {</div><div class='del'>-			cx25840_write(client, 0x474, 0x1a + 6);</div><div class='add'>+			cx25840_write(client, 0x474, 0x22);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -278,7 +361,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		id1 = p[-1];</div><div class='ctx'> 		id2 = p[0] &amp; 0xf;</div><div class='ctx'> 		l = p[2] &amp; 0x3f;</div><div class='del'>-		l += 5;</div><div class='add'>+		l += state-&gt;vbi_line_offset;</div><div class='ctx'> 		p += 4;</div><div class='ctx'> </div><div class='ctx'> 		switch (id2) {</div><div class='head'>diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig<br/>index 630273992a41..80e23ee9801c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/Kconfig</a></div><div class='hunk'>@@ -35,13 +35,25 @@ config VIDEO_CX88_ALSA</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called cx88-alsa.</div><div class='ctx'> </div><div class='add'>+config VIDEO_CX88_BLACKBIRD</div><div class='add'>+	tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"</div><div class='add'>+	depends on VIDEO_CX88</div><div class='add'>+	select VIDEO_CX2341X</div><div class='add'>+	---help---</div><div class='add'>+	  This adds support for MPEG encoder cards based on the</div><div class='add'>+	  Blackbird reference design, using the Conexant 2388x</div><div class='add'>+	  and 23416 chips.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called cx88-blackbird.</div><div class='add'>+</div><div class='ctx'> config VIDEO_CX88_DVB</div><div class='ctx'> 	tristate "DVB/ATSC Support for cx2388x based TV cards"</div><div class='ctx'> 	depends on VIDEO_CX88 &amp;&amp; DVB_CORE</div><div class='ctx'> 	select VIDEO_BUF_DVB</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This adds support for DVB/ATSC cards based on the</div><div class='del'>-	  Connexant 2388x chip.</div><div class='add'>+	  Conexant 2388x chip.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called cx88-dvb.</div><div class='hunk'>@@ -61,6 +73,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS</div><div class='ctx'> 	select DVB_LGDT330X</div><div class='ctx'> 	select DVB_NXT200X</div><div class='ctx'> 	select DVB_CX24123</div><div class='add'>+	select DVB_ISL6421</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This builds cx88-dvb with all currently supported frontend</div><div class='ctx'> 	  demodulators.  If you wish to tweak your configuration, and</div><div class='hunk'>@@ -139,6 +152,7 @@ config VIDEO_CX88_DVB_CX24123</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on VIDEO_CX88_DVB &amp;&amp; !VIDEO_CX88_DVB_ALL_FRONTENDS</div><div class='ctx'> 	select DVB_CX24123</div><div class='add'>+	select DVB_ISL6421</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This adds DVB-S support for cards based on the</div><div class='ctx'> 	  Connexant 2388x chip and the CX24123 demodulator.</div><div class='head'>diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile<br/>index 0dcd09b9b727..352b919f30c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/Makefile</a></div><div class='hunk'>@@ -3,9 +3,10 @@ cx88xx-objs	:= cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \</div><div class='ctx'> cx8800-objs	:= cx88-video.o cx88-vbi.o</div><div class='ctx'> cx8802-objs	:= cx88-mpeg.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o cx88-blackbird.o</div><div class='del'>-obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o</div><div class='add'>+obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o</div><div class='add'>+obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o</div><div class='add'>+obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o</div><div class='ctx'> obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o</div><div class='ctx'> </div><div class='ctx'> EXTRA_CFLAGS += -Idrivers/media/video</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c<br/>index 320b3d9384ba..f0340662e078 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-alsa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-alsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-alsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-alsa.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *  PCI function #1 of the cx2388x.</div><div class='ctx'>  *</div><div class='ctx'>  *    (c) 2005,2006 Ricardo Cerqueira &lt;v4l@cerqueira.org&gt;</div><div class='del'>- *    (c) 2005 Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+ *    (c) 2005 Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'>  *    Based on a dummy cx88 module by Gerd Knorr &lt;kraxel@bytesex.org&gt;</div><div class='ctx'>  *    Based on dummy.c by Jaroslav Kysela &lt;perex@suse.cz&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -111,7 +111,7 @@ MODULE_PARM_DESC(index, "Index value for cx88x capture interface(s).");</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("ALSA driver module for cx2388x based TV cards");</div><div class='ctx'> MODULE_AUTHOR("Ricardo Cerqueira");</div><div class='del'>-MODULE_AUTHOR("Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;");</div><div class='add'>+MODULE_AUTHOR("Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("{{Conexant,23881},"</div><div class='ctx'> 			"{{Conexant,23882},"</div><div class='hunk'>@@ -696,12 +696,11 @@ static int __devinit snd_cx88_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	cx88_reset(core);</div><div class='ctx'> 	chip-&gt;core = core;</div><div class='ctx'> </div><div class='ctx'> 	/* get irq */</div><div class='ctx'> 	err = request_irq(chip-&gt;pci-&gt;irq, cx8801_irq,</div><div class='del'>-			  SA_SHIRQ | SA_INTERRUPT, chip-&gt;core-&gt;name, chip);</div><div class='add'>+			  IRQF_SHARED | IRQF_DISABLED, chip-&gt;core-&gt;name, chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dprintk(0, "%s: can't get IRQ %d\n",</div><div class='ctx'> 		       chip-&gt;core-&gt;name, chip-&gt;pci-&gt;irq);</div><div class='hunk'>@@ -713,9 +712,9 @@ static int __devinit snd_cx88_create(struct snd_card *card,</div><div class='ctx'> 	pci_read_config_byte(pci, PCI_LATENCY_TIMER,  &amp;chip-&gt;pci_lat);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, "</div><div class='del'>-	       "latency: %d, mmio: 0x%lx\n", core-&gt;name, devno,</div><div class='add'>+	       "latency: %d, mmio: 0x%llx\n", core-&gt;name, devno,</div><div class='ctx'> 	       pci_name(pci), chip-&gt;pci_rev, pci-&gt;irq,</div><div class='del'>-	       chip-&gt;pci_lat,pci_resource_start(pci,0));</div><div class='add'>+	       chip-&gt;pci_lat,(unsigned long long)pci_resource_start(pci,0));</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='ctx'> 	synchronize_irq(chip-&gt;irq);</div><div class='hunk'>@@ -767,8 +766,8 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> 	strcpy (card-&gt;driver, "CX88x");</div><div class='ctx'> 	sprintf(card-&gt;shortname, "Conexant CX%x", pci-&gt;device);</div><div class='del'>-	sprintf(card-&gt;longname, "%s at %#lx",</div><div class='del'>-		card-&gt;shortname, pci_resource_start(pci, 0));</div><div class='add'>+	sprintf(card-&gt;longname, "%s at %#llx",</div><div class='add'>+		card-&gt;shortname,(unsigned long long)pci_resource_start(pci, 0));</div><div class='ctx'> 	strcpy (card-&gt;mixername, "CX88");</div><div class='ctx'> </div><div class='ctx'> 	dprintk (0, "%s/%i: ALSA support for cx2388x boards\n",</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c<br/>index e100d8ef369a..b60177f173c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-blackbird.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-blackbird.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-blackbird.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-blackbird.c</a></div><div class='hunk'>@@ -30,9 +30,10 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/cx2341x.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cx88.h"</div><div class='del'>-#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards");</div><div class='ctx'> MODULE_AUTHOR("Jelle Foks &lt;jelle@foks.8m.com&gt;, Gerd Knorr &lt;kraxel@bytesex.org&gt; [SuSE Labs]");</div><div class='hunk'>@@ -53,7 +54,6 @@ static LIST_HEAD(cx8802_devlist);</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-#define BLACKBIRD_FIRM_ENC_FILENAME "blackbird-fw-enc.bin"</div><div class='ctx'> #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024</div><div class='ctx'> </div><div class='ctx'> /* defines below are from ivtv-driver.h */</div><div class='hunk'>@@ -63,8 +63,6 @@ static LIST_HEAD(cx8802_devlist);</div><div class='ctx'> /* Firmware API commands */</div><div class='ctx'> #define IVTV_API_STD_TIMEOUT 500</div><div class='ctx'> </div><div class='del'>-#define BLACKBIRD_API_PING               0x80</div><div class='del'>-#define BLACKBIRD_API_BEGIN_CAPTURE      0x81</div><div class='ctx'> enum blackbird_capture_type {</div><div class='ctx'> 	BLACKBIRD_MPEG_CAPTURE,</div><div class='ctx'> 	BLACKBIRD_RAW_CAPTURE,</div><div class='hunk'>@@ -78,205 +76,29 @@ enum blackbird_capture_bits {</div><div class='ctx'> 	BLACKBIRD_RAW_BITS_PASSTHRU_CAPTURE = 0x08,</div><div class='ctx'> 	BLACKBIRD_RAW_BITS_TO_HOST_CAPTURE  = 0x10</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_END_CAPTURE        0x82</div><div class='ctx'> enum blackbird_capture_end {</div><div class='ctx'> 	BLACKBIRD_END_AT_GOP, /* stop at the end of gop, generate irq */</div><div class='ctx'> 	BLACKBIRD_END_NOW, /* stop immediately, no irq */</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_AUDIO_ID       0x89</div><div class='del'>-#define BLACKBIRD_API_SET_VIDEO_ID       0x8B</div><div class='del'>-#define BLACKBIRD_API_SET_PCR_ID         0x8D</div><div class='del'>-#define BLACKBIRD_API_SET_FRAMERATE      0x8F</div><div class='ctx'> enum blackbird_framerate {</div><div class='ctx'> 	BLACKBIRD_FRAMERATE_NTSC_30, /* NTSC: 30fps */</div><div class='ctx'> 	BLACKBIRD_FRAMERATE_PAL_25   /* PAL: 25fps */</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_RESOLUTION     0x91</div><div class='del'>-#define BLACKBIRD_API_SET_VIDEO_BITRATE  0x95</div><div class='del'>-enum blackbird_video_bitrate_type {</div><div class='del'>-	BLACKBIRD_VIDEO_VBR,</div><div class='del'>-	BLACKBIRD_VIDEO_CBR</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_PEAK_RATE_DIVISOR 400</div><div class='del'>-enum blackbird_mux_rate {</div><div class='del'>-	BLACKBIRD_MUX_RATE_DEFAULT,</div><div class='del'>-	 /* dvd mux rate: multiply by 400 to get the actual rate */</div><div class='del'>-	BLACKBIRD_MUX_RATE_DVD = 25200</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_GOP_STRUCTURE  0x97</div><div class='del'>-#define BLACKBIRD_API_SET_ASPECT_RATIO   0x99</div><div class='del'>-enum blackbird_aspect_ratio {</div><div class='del'>-	BLACKBIRD_ASPECT_RATIO_FORBIDDEN,</div><div class='del'>-	BLACKBIRD_ASPECT_RATIO_1_1_SQUARE,</div><div class='del'>-	BLACKBIRD_ASPECT_RATIO_4_3,</div><div class='del'>-	BLACKBIRD_ASPECT_RATIO_16_9,</div><div class='del'>-	BLACKBIRD_ASPECT_RATIO_221_100,</div><div class='del'>-	BLACKBIRD_ASPECT_RATIO_RESERVED</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_DNR_MODE       0x9B</div><div class='del'>-enum blackbird_dnr_bits {</div><div class='del'>-	BLACKBIRD_DNR_BITS_MANUAL,</div><div class='del'>-	BLACKBIRD_DNR_BITS_AUTO_SPATIAL,</div><div class='del'>-	BLACKBIRD_DNR_BITS_AUTO_TEMPORAL,</div><div class='del'>-	BLACKBIRD_DNR_BITS_AUTO</div><div class='del'>-};</div><div class='del'>-enum blackbird_median_filter {</div><div class='del'>-	BLACKBIRD_MEDIAN_FILTER_DISABLED,</div><div class='del'>-	BLACKBIRD_MEDIAN_FILTER_HORIZONTAL,</div><div class='del'>-	BLACKBIRD_MEDIAN_FILTER_VERTICAL,</div><div class='del'>-	BLACKBIRD_MEDIAN_FILTER_HV,</div><div class='del'>-	BLACKBIRD_MEDIAN_FILTER_DIAGONAL</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_MANUAL_DNR     0x9D</div><div class='del'>-#define BLACKBIRD_API_SET_DNR_MEDIAN     0x9F</div><div class='del'>-#define BLACKBIRD_API_SET_SPATIAL_FILTER 0xA1</div><div class='del'>-enum blackbird_spatial_filter_luma {</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_LUMA_DISABLED,</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_LUMA_1D_HORIZ,</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_LUMA_1D_VERT,</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_LUMA_2D_HV, /* separable, default */</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_LUMA_2D_SYMM /* symmetric non-separable */</div><div class='del'>-};</div><div class='del'>-enum blackbird_spatial_filter_chroma {</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_CHROMA_DISABLED,</div><div class='del'>-	BLACKBIRD_SPATIAL_FILTER_CHROMA_1D_HORIZ /* default */</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_3_2_PULLDOWN   0xB1</div><div class='del'>-enum blackbird_pulldown {</div><div class='del'>-	BLACKBIRD_3_2_PULLDOWN_DISABLED,</div><div class='del'>-	BLACKBIRD_3_2_PULLDOWN_ENABLED</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_VBI_LINE_NO    0xB7</div><div class='del'>-enum blackbird_vbi_line_bits {</div><div class='del'>-	BLACKBIRD_VBI_LINE_BITS_TOP_FIELD,</div><div class='del'>-	BLACKBIRD_VBI_LINE_BITS_BOT_FIELD = (1 &lt;&lt; 31),</div><div class='del'>-	BLACKBIRD_VBI_LINE_BITS_ALL_LINES = 0xFFFFFFFF</div><div class='del'>-};</div><div class='del'>-enum blackbird_vbi_line {</div><div class='del'>-	BLACKBIRD_VBI_LINE_DISABLED,</div><div class='del'>-	BLACKBIRD_VBI_LINE_ENABLED</div><div class='del'>-};</div><div class='del'>-enum blackbird_vbi_slicing {</div><div class='del'>-	BLACKBIRD_VBI_SLICING_NONE,</div><div class='del'>-	BLACKBIRD_VBI_SLICING_CLOSED_CAPTION</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_STREAM_TYPE    0xB9</div><div class='del'>-enum blackbird_stream_type {</div><div class='del'>-	BLACKBIRD_STREAM_PROGRAM,</div><div class='del'>-	BLACKBIRD_STREAM_TRANSPORT,</div><div class='del'>-	BLACKBIRD_STREAM_MPEG1,</div><div class='del'>-	BLACKBIRD_STREAM_PES_AV,</div><div class='del'>-	BLACKBIRD_STREAM_UNKNOWN4,</div><div class='del'>-	BLACKBIRD_STREAM_PES_VIDEO,</div><div class='del'>-	BLACKBIRD_STREAM_UNKNOWN6,</div><div class='del'>-	BLACKBIRD_STREAM_PES_AUDIO,</div><div class='del'>-	BLACKBIRD_STREAM_UNKNOWN8,</div><div class='del'>-	BLACKBIRD_STREAM_UNKNOWN9, /* audio/pcm ? */</div><div class='del'>-	BLACKBIRD_STREAM_DVD,</div><div class='del'>-	BLACKBIRD_STREAM_VCD,</div><div class='del'>-	BLACKBIRD_STREAM_UNKNOWN12 /* svcd/xvcd ? */</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_SET_OUTPUT_PORT    0xBB</div><div class='ctx'> enum blackbird_stream_port {</div><div class='ctx'> 	BLACKBIRD_OUTPUT_PORT_MEMORY,</div><div class='ctx'> 	BLACKBIRD_OUTPUT_PORT_STREAMING,</div><div class='ctx'> 	BLACKBIRD_OUTPUT_PORT_SERIAL</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_AUDIO_PARAMS   0xBD</div><div class='del'>-enum blackbird_audio_bits_sample_rate {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_44100HZ,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_48000HZ,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_32000HZ,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_RESERVED_HZ,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_encoding {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1 = 0x1 &lt;&lt; 2,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2 = 0x2 &lt;&lt; 2,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_bitrate_layer_1 {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_FREE_FORMAT,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_32  = 0x01 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_64  = 0x02 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_96  = 0x03 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_128 = 0x04 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_160 = 0x05 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_192 = 0x06 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_224 = 0x07 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_256 = 0x08 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_288 = 0x09 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_320 = 0x0A &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_352 = 0x0B &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_384 = 0x0C &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_416 = 0x0D &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_1_448 = 0x0E &lt;&lt; 4,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_bitrate_layer_2 {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_FREE_FORMAT,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_32  = 0x01 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_48  = 0x02 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_56  = 0x03 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_64  = 0x04 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_80  = 0x05 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_96  = 0x06 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_112 = 0x07 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_128 = 0x08 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_160 = 0x09 &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_192 = 0x0A &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_224 = 0x0B &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_256 = 0x0C &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_320 = 0x0D &lt;&lt; 4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_LAYER_2_384 = 0x0E &lt;&lt; 4,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_mode {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_STEREO,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_JOINT_STEREO = 0x1 &lt;&lt; 8,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_DUAL         = 0x2 &lt;&lt; 8,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_MONO         = 0x3 &lt;&lt; 8,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_mode_extension {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_BOUND_4,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_BOUND_8  = 0x1 &lt;&lt; 10,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_BOUND_12 = 0x2 &lt;&lt; 10,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_BOUND_16 = 0x3 &lt;&lt; 10,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_emphasis {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_EMPHASIS_50_15     = 0x1 &lt;&lt; 12,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_EMPHASIS_RESERVED  = 0x2 &lt;&lt; 12,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_EMPHASIS_CCITT_J17 = 0x3 &lt;&lt; 12,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_crc {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_CRC_OFF,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_CRC_ON = 0x1 &lt;&lt; 14,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_copyright {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_COPYRIGHT_ON = 0x1 &lt;&lt; 15,</div><div class='del'>-};</div><div class='del'>-enum blackbird_audio_bits_original {</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_COPY,</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_ORIGINAL = 0x1 &lt;&lt; 16,</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_HALT               0xC3</div><div class='del'>-#define BLACKBIRD_API_GET_VERSION        0xC4</div><div class='del'>-#define BLACKBIRD_API_SET_GOP_CLOSURE    0xC5</div><div class='del'>-enum blackbird_gop_closure {</div><div class='del'>-	BLACKBIRD_GOP_CLOSURE_OFF,</div><div class='del'>-	BLACKBIRD_GOP_CLOSURE_ON,</div><div class='del'>-};</div><div class='del'>-#define BLACKBIRD_API_DATA_XFER_STATUS   0xC6</div><div class='ctx'> enum blackbird_data_xfer_status {</div><div class='ctx'> 	BLACKBIRD_MORE_BUFFERS_FOLLOW,</div><div class='ctx'> 	BLACKBIRD_LAST_BUFFER,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_PROGRAM_INDEX_INFO 0xC7</div><div class='ctx'> enum blackbird_picture_mask {</div><div class='ctx'> 	BLACKBIRD_PICTURE_MASK_NONE,</div><div class='ctx'> 	BLACKBIRD_PICTURE_MASK_I_FRAMES,</div><div class='ctx'> 	BLACKBIRD_PICTURE_MASK_I_P_FRAMES = 0x3,</div><div class='ctx'> 	BLACKBIRD_PICTURE_MASK_ALL_FRAMES = 0x7,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_VBI_PARAMS     0xC8</div><div class='ctx'> enum blackbird_vbi_mode_bits {</div><div class='ctx'> 	BLACKBIRD_VBI_BITS_SLICED,</div><div class='ctx'> 	BLACKBIRD_VBI_BITS_RAW,</div><div class='hunk'>@@ -288,33 +110,23 @@ enum blackbird_vbi_insertion_bits {</div><div class='ctx'> 	BLACKBIRD_VBI_BITS_SEPARATE_STREAM_USR_DATA = 0x4 &lt;&lt; 1,</div><div class='ctx'> 	BLACKBIRD_VBI_BITS_SEPARATE_STREAM_PRV_DATA = 0x5 &lt;&lt; 1,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_DMA_BLOCK_SIZE 0xC9</div><div class='ctx'> enum blackbird_dma_unit {</div><div class='ctx'> 	BLACKBIRD_DMA_BYTES,</div><div class='ctx'> 	BLACKBIRD_DMA_FRAMES,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_DMA_TRANSFER_INFO  0xCA</div><div class='del'>-#define BLACKBIRD_API_DMA_TRANSFER_STAT  0xCB</div><div class='ctx'> enum blackbird_dma_transfer_status_bits {</div><div class='ctx'> 	BLACKBIRD_DMA_TRANSFER_BITS_DONE = 0x01,</div><div class='ctx'> 	BLACKBIRD_DMA_TRANSFER_BITS_ERROR = 0x04,</div><div class='ctx'> 	BLACKBIRD_DMA_TRANSFER_BITS_LL_ERROR = 0x10,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_DMA2HOST_ADDR  0xCC</div><div class='del'>-#define BLACKBIRD_API_INIT_VIDEO_INPUT   0xCD</div><div class='del'>-#define BLACKBIRD_API_SET_FRAMESKIP      0xD0</div><div class='del'>-#define BLACKBIRD_API_PAUSE              0xD2</div><div class='ctx'> enum blackbird_pause {</div><div class='ctx'> 	BLACKBIRD_PAUSE_ENCODING,</div><div class='ctx'> 	BLACKBIRD_RESUME_ENCODING,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_REFRESH_INPUT      0xD3</div><div class='del'>-#define BLACKBIRD_API_SET_COPYRIGHT      0xD4</div><div class='ctx'> enum blackbird_copyright {</div><div class='ctx'> 	BLACKBIRD_COPYRIGHT_OFF,</div><div class='ctx'> 	BLACKBIRD_COPYRIGHT_ON,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_NOTIFICATION   0xD5</div><div class='ctx'> enum blackbird_notification_type {</div><div class='ctx'> 	BLACKBIRD_NOTIFICATION_REFRESH,</div><div class='ctx'> };</div><div class='hunk'>@@ -325,7 +137,6 @@ enum blackbird_notification_status {</div><div class='ctx'> enum blackbird_notification_mailbox {</div><div class='ctx'> 	BLACKBIRD_NOTIFICATION_NO_MAILBOX = -1,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_CAPTURE_LINES  0xD6</div><div class='ctx'> enum blackbird_field1_lines {</div><div class='ctx'> 	BLACKBIRD_FIELD1_SAA7114 = 0x00EF, /* 239 */</div><div class='ctx'> 	BLACKBIRD_FIELD1_SAA7115 = 0x00F0, /* 240 */</div><div class='hunk'>@@ -336,12 +147,10 @@ enum blackbird_field2_lines {</div><div class='ctx'> 	BLACKBIRD_FIELD2_SAA7115 = 0x00F0, /* 240 */</div><div class='ctx'> 	BLACKBIRD_FIELD2_MICRONAS = 0x0106, /* 262 */</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_SET_CUSTOM_DATA    0xD7</div><div class='ctx'> enum blackbird_custom_data_type {</div><div class='ctx'> 	BLACKBIRD_CUSTOM_EXTENSION_USR_DATA,</div><div class='ctx'> 	BLACKBIRD_CUSTOM_PRIVATE_PACKET,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_MUTE_VIDEO         0xD9</div><div class='ctx'> enum blackbird_mute {</div><div class='ctx'> 	BLACKBIRD_UNMUTE,</div><div class='ctx'> 	BLACKBIRD_MUTE,</div><div class='hunk'>@@ -356,7 +165,6 @@ enum blackbird_mute_video_shift {</div><div class='ctx'> 	BLACKBIRD_MUTE_VIDEO_U_SHIFT = 16,</div><div class='ctx'> 	BLACKBIRD_MUTE_VIDEO_Y_SHIFT = 24,</div><div class='ctx'> };</div><div class='del'>-#define BLACKBIRD_API_MUTE_AUDIO         0xDA</div><div class='ctx'> </div><div class='ctx'> /* Registers */</div><div class='ctx'> #define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8 /*| IVTV_REG_OFFSET*/)</div><div class='hunk'>@@ -498,15 +306,12 @@ static int register_read(struct cx88_core *core, u32 address, u32 *value)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-/* We don't need to call the API often, so using just one mailbox will probably suffice */</div><div class='del'>-static int blackbird_api_cmd(struct cx8802_dev *dev, u32 command,</div><div class='del'>-			     u32 inputcnt, u32 outputcnt, ...)</div><div class='add'>+static int blackbird_mbox_func(void *priv, int command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])</div><div class='ctx'> {</div><div class='add'>+	struct cx8802_dev *dev = priv;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	u32 value, flag, retval;</div><div class='ctx'> 	int i;</div><div class='del'>-	va_list args;</div><div class='del'>-	va_start(args, outputcnt);</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1,"%s: 0x%X\n", __FUNCTION__, command);</div><div class='ctx'> </div><div class='hunk'>@@ -530,12 +335,11 @@ static int blackbird_api_cmd(struct cx8802_dev *dev, u32 command,</div><div class='ctx'> 	/* write command + args + fill remaining with zeros */</div><div class='ctx'> 	memory_write(dev-&gt;core, dev-&gt;mailbox + 1, command); /* command code */</div><div class='ctx'> 	memory_write(dev-&gt;core, dev-&gt;mailbox + 3, IVTV_API_STD_TIMEOUT); /* timeout */</div><div class='del'>-	for (i = 0; i &lt; inputcnt ; i++) {</div><div class='del'>-		value = va_arg(args, int);</div><div class='del'>-		memory_write(dev-&gt;core, dev-&gt;mailbox + 4 + i, value);</div><div class='del'>-		dprintk(1, "API Input %d = %d\n", i, value);</div><div class='add'>+	for (i = 0; i &lt; in; i++) {</div><div class='add'>+		memory_write(dev-&gt;core, dev-&gt;mailbox + 4 + i, data[i]);</div><div class='add'>+		dprintk(1, "API Input %d = %d\n", i, data[i]);</div><div class='ctx'> 	}</div><div class='del'>-	for (; i &lt; 16 ; i++)</div><div class='add'>+	for (; i &lt; CX2341X_MBOX_MAX_DATA; i++)</div><div class='ctx'> 		memory_write(dev-&gt;core, dev-&gt;mailbox + 4 + i, 0);</div><div class='ctx'> </div><div class='ctx'> 	flag |= 3; /* tell 'em we're done writing */</div><div class='hunk'>@@ -555,12 +359,10 @@ static int blackbird_api_cmd(struct cx8802_dev *dev, u32 command,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read output values */</div><div class='del'>-	for (i = 0; i &lt; outputcnt ; i++) {</div><div class='del'>-		int *vptr = va_arg(args, int *);</div><div class='del'>-		memory_read(dev-&gt;core, dev-&gt;mailbox + 4 + i, vptr);</div><div class='del'>-		dprintk(1, "API Output %d = %d\n", i, *vptr);</div><div class='add'>+	for (i = 0; i &lt; out; i++) {</div><div class='add'>+		memory_read(dev-&gt;core, dev-&gt;mailbox + 4 + i, data + i);</div><div class='add'>+		dprintk(1, "API Output %d = %d\n", i, data[i]);</div><div class='ctx'> 	}</div><div class='del'>-	va_end(args);</div><div class='ctx'> </div><div class='ctx'> 	memory_read(dev-&gt;core, dev-&gt;mailbox + 2, &amp;retval);</div><div class='ctx'> 	dprintk(1, "API result = %d\n",retval);</div><div class='hunk'>@@ -569,7 +371,29 @@ static int blackbird_api_cmd(struct cx8802_dev *dev, u32 command,</div><div class='ctx'> 	memory_write(dev-&gt;core, dev-&gt;mailbox, flag);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='add'>+/* ------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+/* We don't need to call the API often, so using just one mailbox will probably suffice */</div><div class='add'>+static int blackbird_api_cmd(struct cx8802_dev *dev, u32 command,</div><div class='add'>+			     u32 inputcnt, u32 outputcnt, ...)</div><div class='add'>+{</div><div class='add'>+	u32 data[CX2341X_MBOX_MAX_DATA];</div><div class='add'>+	va_list vargs;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='add'>+	va_start(vargs, outputcnt);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; inputcnt; i++) {</div><div class='add'>+		data[i] = va_arg(vargs, int);</div><div class='add'>+	}</div><div class='add'>+	err = blackbird_mbox_func(dev, command, inputcnt, outputcnt, data);</div><div class='add'>+	for (i = 0; i &lt; outputcnt; i++) {</div><div class='add'>+		int *vptr = va_arg(vargs, int *);</div><div class='add'>+		*vptr = data[i];</div><div class='add'>+	}</div><div class='add'>+	va_end(vargs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int blackbird_find_mailbox(struct cx8802_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -614,13 +438,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		dprintk(0, "Error with register_write\n");</div><div class='ctx'> </div><div class='del'>-	retval = request_firmware(&amp;firmware, BLACKBIRD_FIRM_ENC_FILENAME,</div><div class='add'>+	retval = request_firmware(&amp;firmware, CX2341X_FIRM_ENC_FILENAME,</div><div class='ctx'> 				  &amp;dev-&gt;pci-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (retval != 0) {</div><div class='ctx'> 		dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",</div><div class='del'>-			BLACKBIRD_FIRM_ENC_FILENAME);</div><div class='add'>+			CX2341X_FIRM_ENC_FILENAME);</div><div class='ctx'> 		dprintk(0, "Please fix your hotplug setup, the board will "</div><div class='ctx'> 			"not work without firmware loaded!\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -629,11 +453,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)</div><div class='ctx'> 	if (firmware-&gt;size != BLACKBIRD_FIRM_IMAGE_SIZE) {</div><div class='ctx'> 		dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",</div><div class='ctx'> 			firmware-&gt;size, BLACKBIRD_FIRM_IMAGE_SIZE);</div><div class='add'>+		release_firmware(firmware);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (0 != memcmp(firmware-&gt;data, magic, 8)) {</div><div class='ctx'> 		dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");</div><div class='add'>+		release_firmware(firmware);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -654,6 +480,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (checksum) {</div><div class='ctx'> 		dprintk(0, "ERROR: Firmware load failed (checksum mismatch).\n");</div><div class='add'>+		release_firmware(firmware);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	release_firmware(firmware);</div><div class='hunk'>@@ -686,12 +513,19 @@ DB* DVD | MPEG2 | 720x576PAL | CBR     | 600 :Good    | 6000 Kbps  | 25fps   | M</div><div class='ctx'> *DB: "DirectBurn"</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static struct blackbird_dnr default_dnr_params = {</div><div class='del'>-	.mode     = BLACKBIRD_DNR_BITS_MANUAL,</div><div class='del'>-	.type     = BLACKBIRD_MEDIAN_FILTER_DISABLED,</div><div class='del'>-	.spatial  = 0,</div><div class='del'>-	.temporal = 0</div><div class='del'>-};</div><div class='add'>+static void blackbird_codec_settings(struct cx8802_dev *dev)</div><div class='add'>+{</div><div class='add'>+	/* assign frame size */</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0,</div><div class='add'>+				dev-&gt;height, dev-&gt;width);</div><div class='add'>+</div><div class='add'>+	dev-&gt;params.width = dev-&gt;width;</div><div class='add'>+	dev-&gt;params.height = dev-&gt;height;</div><div class='add'>+	dev-&gt;params.is_50hz = (dev-&gt;core-&gt;tvnorm-&gt;id &amp; V4L2_STD_625_50) != 0;</div><div class='add'>+</div><div class='add'>+	cx2341x_update(dev, blackbird_mbox_func, NULL, &amp;dev-&gt;params);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct v4l2_mpeg_compression default_mpeg_params = {</div><div class='ctx'> 	.st_type          = V4L2_MPEG_PS_2,</div><div class='ctx'> 	.st_bitrate       = {</div><div class='hunk'>@@ -712,7 +546,7 @@ static struct v4l2_mpeg_compression default_mpeg_params = {</div><div class='ctx'> 		.target   = 224,</div><div class='ctx'> 		.max      = 224</div><div class='ctx'> 	},</div><div class='del'>-	.au_sample_rate    = 44100,</div><div class='add'>+	.au_sample_rate    = 48000,</div><div class='ctx'> 	.au_pesid          = 0,</div><div class='ctx'> 	.vi_type           = V4L2_MPEG_VI_2,</div><div class='ctx'> 	.vi_aspect_ratio   = V4L2_MPEG_ASPECT_4_3,</div><div class='hunk'>@@ -723,524 +557,13 @@ static struct v4l2_mpeg_compression default_mpeg_params = {</div><div class='ctx'> 		.max       = 6000</div><div class='ctx'> 	},</div><div class='ctx'> 	.vi_frame_rate     = 25,</div><div class='del'>-	.vi_frames_per_gop = 15,</div><div class='add'>+	.vi_frames_per_gop = 12,</div><div class='ctx'> 	.vi_bframes_count  = 2,</div><div class='ctx'> 	.vi_pesid          = 0,</div><div class='del'>-	.closed_gops       = 0,</div><div class='add'>+	.closed_gops       = 1,</div><div class='ctx'> 	.pulldown          = 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static enum blackbird_stream_type mpeg_stream_types[] = {</div><div class='del'>-	[V4L2_MPEG_SS_1]   = BLACKBIRD_STREAM_MPEG1,</div><div class='del'>-	[V4L2_MPEG_PS_2]   = BLACKBIRD_STREAM_PROGRAM,</div><div class='del'>-	[V4L2_MPEG_TS_2]   = BLACKBIRD_STREAM_TRANSPORT,</div><div class='del'>-	[V4L2_MPEG_PS_DVD] = BLACKBIRD_STREAM_DVD,</div><div class='del'>-};</div><div class='del'>-static enum blackbird_aspect_ratio mpeg_stream_ratios[] = {</div><div class='del'>-	[V4L2_MPEG_ASPECT_SQUARE] = BLACKBIRD_ASPECT_RATIO_1_1_SQUARE,</div><div class='del'>-	[V4L2_MPEG_ASPECT_4_3]    = BLACKBIRD_ASPECT_RATIO_4_3,</div><div class='del'>-	[V4L2_MPEG_ASPECT_16_9]   = BLACKBIRD_ASPECT_RATIO_16_9,</div><div class='del'>-	[V4L2_MPEG_ASPECT_1_221]  = BLACKBIRD_ASPECT_RATIO_221_100,</div><div class='del'>-};</div><div class='del'>-static enum blackbird_video_bitrate_type mpeg_video_bitrates[] = {</div><div class='del'>-	[V4L2_BITRATE_NONE] = BLACKBIRD_VIDEO_CBR,</div><div class='del'>-	[V4L2_BITRATE_CBR]  = BLACKBIRD_VIDEO_CBR,</div><div class='del'>-	[V4L2_BITRATE_VBR]  = BLACKBIRD_VIDEO_VBR,</div><div class='del'>-};</div><div class='del'>-/* find the best layer I/II bitrate to fit a given numeric value */</div><div class='del'>-struct bitrate_bits {</div><div class='del'>-	u32 bits; /* layer bits for the best fit */</div><div class='del'>-	u32 rate; /* actual numeric value for the layer best fit */</div><div class='del'>-};</div><div class='del'>-struct bitrate_approximation {</div><div class='del'>-	u32                 target;   /* numeric value of the rate we want */</div><div class='del'>-	struct bitrate_bits layer[2];</div><div class='del'>-};</div><div class='del'>-static struct bitrate_approximation mpeg_audio_bitrates[] = {</div><div class='del'>-	/* target  layer[0].bits           layer[0].rate       layer[1].bits           layer[1].rate */</div><div class='del'>-	{   0, { {                                0,   0, }, {                                0,   0, }, }, },</div><div class='del'>-	{  32, { { BLACKBIRD_AUDIO_BITS_LAYER_1_32 ,  32, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_32 ,  32, }, }, },</div><div class='del'>-	{  48, { { BLACKBIRD_AUDIO_BITS_LAYER_1_64 ,  64, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_48 ,  48, }, }, },</div><div class='del'>-	{  56, { { BLACKBIRD_AUDIO_BITS_LAYER_1_64 ,  64, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_56 ,  56, }, }, },</div><div class='del'>-	{  64, { { BLACKBIRD_AUDIO_BITS_LAYER_1_64 ,  64, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_64 ,  64, }, }, },</div><div class='del'>-	{  80, { { BLACKBIRD_AUDIO_BITS_LAYER_1_96 ,  96, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_80 ,  80, }, }, },</div><div class='del'>-	{  96, { { BLACKBIRD_AUDIO_BITS_LAYER_1_96 ,  96, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_96 ,  96, }, }, },</div><div class='del'>-	{ 112, { { BLACKBIRD_AUDIO_BITS_LAYER_1_128, 128, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_112, 112, }, }, },</div><div class='del'>-	{ 128, { { BLACKBIRD_AUDIO_BITS_LAYER_1_128, 128, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_128, 128, }, }, },</div><div class='del'>-	{ 160, { { BLACKBIRD_AUDIO_BITS_LAYER_1_160, 160, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_160, 160, }, }, },</div><div class='del'>-	{ 192, { { BLACKBIRD_AUDIO_BITS_LAYER_1_192, 192, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_192, 192, }, }, },</div><div class='del'>-	{ 224, { { BLACKBIRD_AUDIO_BITS_LAYER_1_224, 224, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_224, 224, }, }, },</div><div class='del'>-	{ 256, { { BLACKBIRD_AUDIO_BITS_LAYER_1_256, 256, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_256, 256, }, }, },</div><div class='del'>-	{ 288, { { BLACKBIRD_AUDIO_BITS_LAYER_1_288, 288, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_320, 320, }, }, },</div><div class='del'>-	{ 320, { { BLACKBIRD_AUDIO_BITS_LAYER_1_320, 320, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_320, 320, }, }, },</div><div class='del'>-	{ 352, { { BLACKBIRD_AUDIO_BITS_LAYER_1_352, 352, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },</div><div class='del'>-	{ 384, { { BLACKBIRD_AUDIO_BITS_LAYER_1_384, 384, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },</div><div class='del'>-	{ 416, { { BLACKBIRD_AUDIO_BITS_LAYER_1_416, 416, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },</div><div class='del'>-	{ 448, { { BLACKBIRD_AUDIO_BITS_LAYER_1_448, 448, }, { BLACKBIRD_AUDIO_BITS_LAYER_2_384, 384, }, }, },</div><div class='del'>-};</div><div class='del'>-static const int BITRATES_SIZE = ARRAY_SIZE(mpeg_audio_bitrates);</div><div class='del'>-</div><div class='del'>-static void blackbird_set_default_params(struct cx8802_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct v4l2_mpeg_compression *params = &amp;dev-&gt;params;</div><div class='del'>-	u32 au_params;</div><div class='del'>-</div><div class='del'>-	/* assign stream type */</div><div class='del'>-	if( params-&gt;st_type &gt;= ARRAY_SIZE(mpeg_stream_types) )</div><div class='del'>-		params-&gt;st_type = V4L2_MPEG_PS_2;</div><div class='del'>-	if( params-&gt;st_type == V4L2_MPEG_SS_1 )</div><div class='del'>-		params-&gt;vi_type = V4L2_MPEG_VI_1;</div><div class='del'>-	else</div><div class='del'>-		params-&gt;vi_type = V4L2_MPEG_VI_2;</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, mpeg_stream_types[params-&gt;st_type]);</div><div class='del'>-</div><div class='del'>-	/* assign framerate */</div><div class='del'>-	if( params-&gt;vi_frame_rate &lt;= 25 )</div><div class='del'>-	{</div><div class='del'>-		params-&gt;vi_frame_rate = 25;</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_PAL_25);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		params-&gt;vi_frame_rate = 30;</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_NTSC_30);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign aspect ratio */</div><div class='del'>-	if( params-&gt;vi_aspect_ratio &gt;= ARRAY_SIZE(mpeg_stream_ratios) )</div><div class='del'>-		params-&gt;vi_aspect_ratio = V4L2_MPEG_ASPECT_4_3;</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_ASPECT_RATIO, 1, 0, mpeg_stream_ratios[params-&gt;vi_aspect_ratio]);</div><div class='del'>-</div><div class='del'>-	/* assign gop properties */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, params-&gt;vi_frames_per_gop, params-&gt;vi_bframes_count+1);</div><div class='del'>-</div><div class='del'>-	/* assign gop closure */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0, params-&gt;closed_gops);</div><div class='del'>-</div><div class='del'>-	/* assign 3 2 pulldown */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0, params-&gt;pulldown);</div><div class='del'>-</div><div class='del'>-	/* make sure the params are within bounds */</div><div class='del'>-	if( params-&gt;st_bitrate.mode &gt;= ARRAY_SIZE(mpeg_video_bitrates) )</div><div class='del'>-		params-&gt;vi_bitrate.mode = V4L2_BITRATE_NONE;</div><div class='del'>-	if( params-&gt;vi_bitrate.mode &gt;= ARRAY_SIZE(mpeg_video_bitrates) )</div><div class='del'>-		params-&gt;vi_bitrate.mode = V4L2_BITRATE_NONE;</div><div class='del'>-	if( params-&gt;au_bitrate.mode &gt;= ARRAY_SIZE(mpeg_video_bitrates) )</div><div class='del'>-		params-&gt;au_bitrate.mode = V4L2_BITRATE_NONE;</div><div class='del'>-</div><div class='del'>-	/* assign audio properties */</div><div class='del'>-	/* note: it's not necessary to set the samplerate, the mpeg encoder seems to autodetect/adjust */</div><div class='del'>-	au_params = BLACKBIRD_AUDIO_BITS_STEREO |</div><div class='del'>-			/* BLACKBIRD_AUDIO_BITS_BOUND_4 | */</div><div class='del'>-			BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE |</div><div class='del'>-			BLACKBIRD_AUDIO_BITS_CRC_OFF |</div><div class='del'>-			BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF |</div><div class='del'>-			BLACKBIRD_AUDIO_BITS_COPY |</div><div class='del'>-			0;</div><div class='del'>-	if( params-&gt;au_sample_rate &lt;= 32000 )</div><div class='del'>-	{</div><div class='del'>-		params-&gt;au_sample_rate = 32000;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_32000HZ;</div><div class='del'>-	}</div><div class='del'>-	else if( params-&gt;au_sample_rate &lt;= 44100 )</div><div class='del'>-	{</div><div class='del'>-		params-&gt;au_sample_rate = 44100;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_44100HZ;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		params-&gt;au_sample_rate = 48000;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_48000HZ;</div><div class='del'>-	}</div><div class='del'>-	if( params-&gt;au_type == V4L2_MPEG_AU_2_I )</div><div class='del'>-	{</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_LAYER_1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/* TODO: try to handle the other formats more gracefully */</div><div class='del'>-		params-&gt;au_type = V4L2_MPEG_AU_2_II;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_LAYER_2;</div><div class='del'>-	}</div><div class='del'>-	if( params-&gt;au_bitrate.mode )</div><div class='del'>-	{</div><div class='del'>-		int layer;</div><div class='del'>-</div><div class='del'>-		if( params-&gt;au_bitrate.mode == V4L2_BITRATE_CBR )</div><div class='del'>-			params-&gt;au_bitrate.max = params-&gt;vi_bitrate.target;</div><div class='del'>-		else</div><div class='del'>-			params-&gt;au_bitrate.target = params-&gt;vi_bitrate.max;</div><div class='del'>-</div><div class='del'>-		layer = params-&gt;au_type;</div><div class='del'>-		if( params-&gt;au_bitrate.target == 0 )</div><div class='del'>-		{</div><div class='del'>-			/* TODO: use the minimum possible bitrate instead of 0 ? */</div><div class='del'>-			au_params |= 0;</div><div class='del'>-		}</div><div class='del'>-		else if( params-&gt;au_bitrate.target &gt;=</div><div class='del'>-			 mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate )</div><div class='del'>-		{</div><div class='del'>-			/* clamp the bitrate to the max supported by the standard */</div><div class='del'>-			params-&gt;au_bitrate.target = mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate;</div><div class='del'>-			params-&gt;au_bitrate.max = params-&gt;au_bitrate.target;</div><div class='del'>-			au_params |= mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].bits;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/* round up to the nearest supported bitrate */</div><div class='del'>-			int i;</div><div class='del'>-			for(i = 1; i &lt; BITRATES_SIZE; i++)</div><div class='del'>-			{</div><div class='del'>-				if( params-&gt;au_bitrate.target &gt; mpeg_audio_bitrates[i-1].layer[layer].rate &amp;&amp;</div><div class='del'>-				    params-&gt;au_bitrate.target &lt;= mpeg_audio_bitrates[i].layer[layer].rate )</div><div class='del'>-				{</div><div class='del'>-					params-&gt;au_bitrate.target = mpeg_audio_bitrates[i].layer[layer].rate;</div><div class='del'>-					params-&gt;au_bitrate.max = params-&gt;au_bitrate.target;</div><div class='del'>-					au_params |= mpeg_audio_bitrates[i].layer[layer].bits;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/* TODO: ??? */</div><div class='del'>-		params-&gt;au_bitrate.target = params-&gt;au_bitrate.max = 0;</div><div class='del'>-		au_params |= 0;</div><div class='del'>-	}</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0, au_params );</div><div class='del'>-</div><div class='del'>-	/* assign bitrates */</div><div class='del'>-	if( params-&gt;vi_bitrate.mode )</div><div class='del'>-	{</div><div class='del'>-		/* bitrate is set, let's figure out the cbr/vbr mess */</div><div class='del'>-		if( params-&gt;vi_bitrate.max &lt; params-&gt;vi_bitrate.target )</div><div class='del'>-		{</div><div class='del'>-			if( params-&gt;vi_bitrate.mode == V4L2_BITRATE_CBR )</div><div class='del'>-				params-&gt;vi_bitrate.max = params-&gt;vi_bitrate.target;</div><div class='del'>-			else</div><div class='del'>-				params-&gt;vi_bitrate.target = params-&gt;vi_bitrate.max;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if( params-&gt;st_bitrate.max &lt; params-&gt;st_bitrate.target )</div><div class='del'>-		{</div><div class='del'>-			if( params-&gt;st_bitrate.mode == V4L2_BITRATE_VBR )</div><div class='del'>-				params-&gt;st_bitrate.target = params-&gt;st_bitrate.max;</div><div class='del'>-			else</div><div class='del'>-				params-&gt;st_bitrate.max = params-&gt;st_bitrate.target;</div><div class='del'>-		}</div><div class='del'>-		/* calculate vi_bitrate = st_bitrate - au_bitrate */</div><div class='del'>-		params-&gt;vi_bitrate.max = params-&gt;st_bitrate.max - params-&gt;au_bitrate.max;</div><div class='del'>-		params-&gt;vi_bitrate.target = params-&gt;st_bitrate.target - params-&gt;au_bitrate.target;</div><div class='del'>-	}</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_VIDEO_BITRATE, 4, 0,</div><div class='del'>-				mpeg_video_bitrates[params-&gt;vi_bitrate.mode],</div><div class='del'>-				params-&gt;vi_bitrate.target * 1000, /* kbps -&gt; bps */</div><div class='del'>-				params-&gt;vi_bitrate.max * 1000 / BLACKBIRD_PEAK_RATE_DIVISOR, /* peak/400 */</div><div class='del'>-				BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/); /* encoding buffer, ckennedy */</div><div class='del'>-</div><div class='del'>-	/* TODO: implement the stream ID stuff:</div><div class='del'>-		ts_pid_pmt, ts_pid_audio, ts_pid_video, ts_pid_pcr,</div><div class='del'>-		ps_size, au_pesid, vi_pesid</div><div class='del'>-	*/</div><div class='del'>-}</div><div class='del'>-#define CHECK_PARAM( name ) ( dev-&gt;params.name != params-&gt;name )</div><div class='del'>-#define IF_PARAM( name ) if( CHECK_PARAM( name ) )</div><div class='del'>-#define UPDATE_PARAM( name ) dev-&gt;params.name = params-&gt;name</div><div class='del'>-void blackbird_set_params(struct cx8802_dev *dev, struct v4l2_mpeg_compression *params)</div><div class='del'>-{</div><div class='del'>-	u32 au_params;</div><div class='del'>-</div><div class='del'>-	/* assign stream type */</div><div class='del'>-	if( params-&gt;st_type &gt;= ARRAY_SIZE(mpeg_stream_types) )</div><div class='del'>-		params-&gt;st_type = V4L2_MPEG_PS_2;</div><div class='del'>-	if( params-&gt;st_type == V4L2_MPEG_SS_1 )</div><div class='del'>-		params-&gt;vi_type = V4L2_MPEG_VI_1;</div><div class='del'>-	else</div><div class='del'>-		params-&gt;vi_type = V4L2_MPEG_VI_2;</div><div class='del'>-	if( CHECK_PARAM( st_type ) || CHECK_PARAM( vi_type ) )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( st_type );</div><div class='del'>-		UPDATE_PARAM( vi_type );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0, mpeg_stream_types[params-&gt;st_type]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign framerate */</div><div class='del'>-	if( params-&gt;vi_frame_rate &lt;= 25 )</div><div class='del'>-		params-&gt;vi_frame_rate = 25;</div><div class='del'>-	else</div><div class='del'>-		params-&gt;vi_frame_rate = 30;</div><div class='del'>-	IF_PARAM( vi_frame_rate )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( vi_frame_rate );</div><div class='del'>-		if( params-&gt;vi_frame_rate == 25 )</div><div class='del'>-			blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_PAL_25);</div><div class='del'>-		else</div><div class='del'>-			blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0, BLACKBIRD_FRAMERATE_NTSC_30);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign aspect ratio */</div><div class='del'>-	if( params-&gt;vi_aspect_ratio &gt;= ARRAY_SIZE(mpeg_stream_ratios) )</div><div class='del'>-		params-&gt;vi_aspect_ratio = V4L2_MPEG_ASPECT_4_3;</div><div class='del'>-	IF_PARAM( vi_aspect_ratio )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( vi_aspect_ratio );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_ASPECT_RATIO, 1, 0, mpeg_stream_ratios[params-&gt;vi_aspect_ratio]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign gop properties */</div><div class='del'>-	if( CHECK_PARAM( vi_frames_per_gop ) || CHECK_PARAM( vi_bframes_count ) )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( vi_frames_per_gop );</div><div class='del'>-		UPDATE_PARAM( vi_bframes_count );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, params-&gt;vi_frames_per_gop, params-&gt;vi_bframes_count+1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign gop closure */</div><div class='del'>-	IF_PARAM( closed_gops )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( closed_gops );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0, params-&gt;closed_gops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign 3 2 pulldown */</div><div class='del'>-	IF_PARAM( pulldown )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( pulldown );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0, params-&gt;pulldown);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure the params are within bounds */</div><div class='del'>-	if( params-&gt;st_bitrate.mode &gt;= ARRAY_SIZE(mpeg_video_bitrates) )</div><div class='del'>-		params-&gt;vi_bitrate.mode = V4L2_BITRATE_NONE;</div><div class='del'>-	if( params-&gt;vi_bitrate.mode &gt;= ARRAY_SIZE(mpeg_video_bitrates) )</div><div class='del'>-		params-&gt;vi_bitrate.mode = V4L2_BITRATE_NONE;</div><div class='del'>-	if( params-&gt;au_bitrate.mode &gt;= ARRAY_SIZE(mpeg_video_bitrates) )</div><div class='del'>-		params-&gt;au_bitrate.mode = V4L2_BITRATE_NONE;</div><div class='del'>-</div><div class='del'>-	/* assign audio properties */</div><div class='del'>-	/* note: it's not necessary to set the samplerate, the mpeg encoder seems to autodetect/adjust */</div><div class='del'>-	au_params = BLACKBIRD_AUDIO_BITS_STEREO |</div><div class='del'>-			/* BLACKBIRD_AUDIO_BITS_BOUND_4 | */</div><div class='del'>-	BLACKBIRD_AUDIO_BITS_EMPHASIS_NONE |</div><div class='del'>-		BLACKBIRD_AUDIO_BITS_CRC_OFF |</div><div class='del'>-		BLACKBIRD_AUDIO_BITS_COPYRIGHT_OFF |</div><div class='del'>-		BLACKBIRD_AUDIO_BITS_COPY |</div><div class='del'>-		0;</div><div class='del'>-	if( params-&gt;au_sample_rate &lt; 32000 )</div><div class='del'>-	{</div><div class='del'>-		params-&gt;au_sample_rate = 32000;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_32000HZ;</div><div class='del'>-	}</div><div class='del'>-	else if( params-&gt;au_sample_rate &lt; 44100 )</div><div class='del'>-	{</div><div class='del'>-		params-&gt;au_sample_rate = 44100;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_44100HZ;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		params-&gt;au_sample_rate = 48000;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_48000HZ;</div><div class='del'>-	}</div><div class='del'>-	if( params-&gt;au_type == V4L2_MPEG_AU_2_I )</div><div class='del'>-	{</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_LAYER_1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/* TODO: try to handle the other formats more gracefully */</div><div class='del'>-		params-&gt;au_type = V4L2_MPEG_AU_2_II;</div><div class='del'>-		au_params |= BLACKBIRD_AUDIO_BITS_LAYER_2;</div><div class='del'>-	}</div><div class='del'>-	if( params-&gt;au_bitrate.mode )</div><div class='del'>-	{</div><div class='del'>-		int layer;</div><div class='del'>-</div><div class='del'>-		if( params-&gt;au_bitrate.mode == V4L2_BITRATE_CBR )</div><div class='del'>-			params-&gt;au_bitrate.max = params-&gt;vi_bitrate.target;</div><div class='del'>-		else</div><div class='del'>-			params-&gt;au_bitrate.target = params-&gt;vi_bitrate.max;</div><div class='del'>-</div><div class='del'>-		layer = params-&gt;au_type;</div><div class='del'>-		if( params-&gt;au_bitrate.target == 0 )</div><div class='del'>-		{</div><div class='del'>-			/* TODO: use the minimum possible bitrate instead of 0 ? */</div><div class='del'>-			au_params |= 0;</div><div class='del'>-		}</div><div class='del'>-		else if( params-&gt;au_bitrate.target &gt;=</div><div class='del'>-			 mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate )</div><div class='del'>-		{</div><div class='del'>-			/* clamp the bitrate to the max supported by the standard */</div><div class='del'>-			params-&gt;au_bitrate.target = mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].rate;</div><div class='del'>-			params-&gt;au_bitrate.max = params-&gt;au_bitrate.target;</div><div class='del'>-			au_params |= mpeg_audio_bitrates[BITRATES_SIZE-1].layer[layer].bits;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/* round up to the nearest supported bitrate */</div><div class='del'>-			int i;</div><div class='del'>-			for(i = 1; i &lt; BITRATES_SIZE; i++)</div><div class='del'>-			{</div><div class='del'>-				if( params-&gt;au_bitrate.target &gt; mpeg_audio_bitrates[i-1].layer[layer].rate &amp;&amp;</div><div class='del'>-				    params-&gt;au_bitrate.target &lt;= mpeg_audio_bitrates[i].layer[layer].rate )</div><div class='del'>-				{</div><div class='del'>-					params-&gt;au_bitrate.target = mpeg_audio_bitrates[i].layer[layer].rate;</div><div class='del'>-					params-&gt;au_bitrate.max = params-&gt;au_bitrate.target;</div><div class='del'>-					au_params |= mpeg_audio_bitrates[i].layer[layer].bits;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/* TODO: ??? */</div><div class='del'>-		params-&gt;au_bitrate.target = params-&gt;au_bitrate.max = 0;</div><div class='del'>-		au_params |= 0;</div><div class='del'>-	}</div><div class='del'>-	if( CHECK_PARAM( au_type ) || CHECK_PARAM( au_sample_rate )</div><div class='del'>-		|| CHECK_PARAM( au_bitrate.mode ) || CHECK_PARAM( au_bitrate.max )</div><div class='del'>-		|| CHECK_PARAM( au_bitrate.target )</div><div class='del'>-	)</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( au_type );</div><div class='del'>-		UPDATE_PARAM( au_sample_rate );</div><div class='del'>-		UPDATE_PARAM( au_bitrate );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0, au_params );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign bitrates */</div><div class='del'>-	if( params-&gt;vi_bitrate.mode )</div><div class='del'>-	{</div><div class='del'>-		/* bitrate is set, let's figure out the cbr/vbr mess */</div><div class='del'>-		if( params-&gt;vi_bitrate.max &lt; params-&gt;vi_bitrate.target )</div><div class='del'>-		{</div><div class='del'>-			if( params-&gt;vi_bitrate.mode == V4L2_BITRATE_CBR )</div><div class='del'>-				params-&gt;vi_bitrate.max = params-&gt;vi_bitrate.target;</div><div class='del'>-			else</div><div class='del'>-				params-&gt;vi_bitrate.target = params-&gt;vi_bitrate.max;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if( params-&gt;st_bitrate.max &lt; params-&gt;st_bitrate.target )</div><div class='del'>-		{</div><div class='del'>-			if( params-&gt;st_bitrate.mode == V4L2_BITRATE_VBR )</div><div class='del'>-				params-&gt;st_bitrate.target = params-&gt;st_bitrate.max;</div><div class='del'>-			else</div><div class='del'>-				params-&gt;st_bitrate.max = params-&gt;st_bitrate.target;</div><div class='del'>-		}</div><div class='del'>-		/* calculate vi_bitrate = st_bitrate - au_bitrate */</div><div class='del'>-		params-&gt;vi_bitrate.max = params-&gt;st_bitrate.max - params-&gt;au_bitrate.max;</div><div class='del'>-		params-&gt;vi_bitrate.target = params-&gt;st_bitrate.target - params-&gt;au_bitrate.target;</div><div class='del'>-	}</div><div class='del'>-	UPDATE_PARAM( st_bitrate );</div><div class='del'>-	if( CHECK_PARAM( vi_bitrate.mode ) || CHECK_PARAM( vi_bitrate.max )</div><div class='del'>-		|| CHECK_PARAM( vi_bitrate.target )</div><div class='del'>-	)</div><div class='del'>-	{</div><div class='del'>-		UPDATE_PARAM( vi_bitrate );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_VIDEO_BITRATE, 4, 0,</div><div class='del'>-				mpeg_video_bitrates[params-&gt;vi_bitrate.mode],</div><div class='del'>-				params-&gt;vi_bitrate.target * 1000, /* kbps -&gt; bps */</div><div class='del'>-				params-&gt;vi_bitrate.max * 1000 / BLACKBIRD_PEAK_RATE_DIVISOR, /* peak/400 */</div><div class='del'>-				BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/); /* encoding buffer, ckennedy */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: implement the stream ID stuff:</div><div class='del'>-		ts_pid_pmt, ts_pid_audio, ts_pid_video, ts_pid_pcr,</div><div class='del'>-		ps_size, au_pesid, vi_pesid</div><div class='del'>-	*/</div><div class='del'>-	UPDATE_PARAM( ts_pid_pmt );</div><div class='del'>-	UPDATE_PARAM( ts_pid_audio );</div><div class='del'>-	UPDATE_PARAM( ts_pid_video );</div><div class='del'>-	UPDATE_PARAM( ts_pid_pcr );</div><div class='del'>-	UPDATE_PARAM( ps_size );</div><div class='del'>-	UPDATE_PARAM( au_pesid );</div><div class='del'>-	UPDATE_PARAM( vi_pesid );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void blackbird_set_default_dnr_params(struct cx8802_dev *dev)</div><div class='del'>-{</div><div class='del'>-	/* assign dnr filter mode */</div><div class='del'>-	if( dev-&gt;dnr_params.mode &gt; BLACKBIRD_DNR_BITS_AUTO )</div><div class='del'>-		dev-&gt;dnr_params.mode = BLACKBIRD_DNR_BITS_MANUAL;</div><div class='del'>-	if( dev-&gt;dnr_params.type &gt; BLACKBIRD_MEDIAN_FILTER_DIAGONAL )</div><div class='del'>-		dev-&gt;dnr_params.type = BLACKBIRD_MEDIAN_FILTER_DISABLED;</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MODE, 2, 0,</div><div class='del'>-				dev-&gt;dnr_params.mode,</div><div class='del'>-				dev-&gt;dnr_params.type</div><div class='del'>-			);</div><div class='del'>-</div><div class='del'>-	/* assign dnr filter props*/</div><div class='del'>-	if( dev-&gt;dnr_params.spatial &gt; 15 )</div><div class='del'>-		dev-&gt;dnr_params.spatial = 15;</div><div class='del'>-	if( dev-&gt;dnr_params.temporal &gt; 31 )</div><div class='del'>-		dev-&gt;dnr_params.temporal = 31;</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_MANUAL_DNR, 2, 0,</div><div class='del'>-				dev-&gt;dnr_params.spatial,</div><div class='del'>-				dev-&gt;dnr_params.temporal</div><div class='del'>-			);</div><div class='del'>-}</div><div class='del'>-#define CHECK_DNR_PARAM( name ) ( dev-&gt;dnr_params.name != dnr_params-&gt;name )</div><div class='del'>-#define UPDATE_DNR_PARAM( name ) dev-&gt;dnr_params.name = dnr_params-&gt;name</div><div class='del'>-void blackbird_set_dnr_params(struct cx8802_dev *dev, struct blackbird_dnr* dnr_params)</div><div class='del'>-{</div><div class='del'>-	/* assign dnr filter mode */</div><div class='del'>-	/* clamp values */</div><div class='del'>-	if( dnr_params-&gt;mode &gt; BLACKBIRD_DNR_BITS_AUTO )</div><div class='del'>-		dnr_params-&gt;mode = BLACKBIRD_DNR_BITS_MANUAL;</div><div class='del'>-	if( dnr_params-&gt;type &gt; BLACKBIRD_MEDIAN_FILTER_DIAGONAL )</div><div class='del'>-		dnr_params-&gt;type = BLACKBIRD_MEDIAN_FILTER_DISABLED;</div><div class='del'>-	/* check if the params actually changed */</div><div class='del'>-	if( CHECK_DNR_PARAM( mode ) || CHECK_DNR_PARAM( type ) )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_DNR_PARAM( mode );</div><div class='del'>-		UPDATE_DNR_PARAM( type );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MODE, 2, 0, dnr_params-&gt;mode, dnr_params-&gt;type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign dnr filter props*/</div><div class='del'>-	if( dnr_params-&gt;spatial &gt; 15 )</div><div class='del'>-		dnr_params-&gt;spatial = 15;</div><div class='del'>-	if( dnr_params-&gt;temporal &gt; 31 )</div><div class='del'>-		dnr_params-&gt;temporal = 31;</div><div class='del'>-	if( CHECK_DNR_PARAM( spatial ) || CHECK_DNR_PARAM( temporal ) )</div><div class='del'>-	{</div><div class='del'>-		UPDATE_DNR_PARAM( spatial );</div><div class='del'>-		UPDATE_DNR_PARAM( temporal );</div><div class='del'>-		blackbird_api_cmd(dev, BLACKBIRD_API_SET_MANUAL_DNR, 2, 0, dnr_params-&gt;spatial, dnr_params-&gt;temporal);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void blackbird_codec_settings(struct cx8802_dev *dev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* assign output port */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_OUTPUT_PORT, 1, 0, BLACKBIRD_OUTPUT_PORT_STREAMING); /* Host */</div><div class='del'>-</div><div class='del'>-	/* assign frame size */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_RESOLUTION, 2, 0,</div><div class='del'>-				dev-&gt;height, dev-&gt;width);</div><div class='del'>-</div><div class='del'>-	/* assign coring levels (luma_h, luma_l, chroma_h, chroma_l) */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MEDIAN, 4, 0, 0, 255, 0, 255);</div><div class='del'>-</div><div class='del'>-	/* assign spatial filter type: luma_t: horiz_only, chroma_t: horiz_only */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_SPATIAL_FILTER, 2, 0,</div><div class='del'>-				BLACKBIRD_SPATIAL_FILTER_LUMA_1D_HORIZ,</div><div class='del'>-				BLACKBIRD_SPATIAL_FILTER_CHROMA_1D_HORIZ</div><div class='del'>-			);</div><div class='del'>-</div><div class='del'>-	/* assign frame drop rate */</div><div class='del'>-	/* blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_DROP_RATE, 1, 0, 0); */</div><div class='del'>-</div><div class='del'>-	blackbird_set_default_params(dev);</div><div class='del'>-	blackbird_set_default_dnr_params(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int blackbird_initialize_codec(struct cx8802_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_core *core = dev-&gt;core;</div><div class='hunk'>@@ -1248,7 +571,7 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1,"Initialize codec\n");</div><div class='del'>-	retval = blackbird_api_cmd(dev, BLACKBIRD_API_PING, 0, 0); /* ping */</div><div class='add'>+	retval = blackbird_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		/* ping was not successful, reset and upload firmware */</div><div class='ctx'> 		cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */</div><div class='hunk'>@@ -1263,13 +586,13 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)</div><div class='ctx'> 		if (dev-&gt;mailbox &lt; 0)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='del'>-		retval = blackbird_api_cmd(dev, BLACKBIRD_API_PING, 0, 0); /* ping */</div><div class='add'>+		retval = blackbird_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */</div><div class='ctx'> 		if (retval &lt; 0) {</div><div class='ctx'> 			dprintk(0, "ERROR: Firmware ping failed!\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		retval = blackbird_api_cmd(dev, BLACKBIRD_API_GET_VERSION, 0, 1, &amp;version);</div><div class='add'>+		retval = blackbird_api_cmd(dev, CX2341X_ENC_GET_VERSION, 0, 1, &amp;version);</div><div class='ctx'> 		if (retval &lt; 0) {</div><div class='ctx'> 			dprintk(0, "ERROR: Firmware get encoder version failed!\n");</div><div class='ctx'> 			return -1;</div><div class='hunk'>@@ -1289,35 +612,35 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)</div><div class='ctx'> 	/* blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0xef, 0xef);</div><div class='ctx'> 	   blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0xf0, 0xf0);</div><div class='ctx'> 	   blackbird_api_cmd(dev, IVTV_API_ASSIGN_NUM_VSYNC_LINES, 4, 0, 0x180, 0x180); */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_CAPTURE_LINES, 2, 0,</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0,</div><div class='ctx'> 			BLACKBIRD_FIELD1_SAA7115,</div><div class='del'>-			BLACKBIRD_FIELD1_SAA7115</div><div class='add'>+			BLACKBIRD_FIELD2_SAA7115</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='ctx'> 	/* blackbird_api_cmd(dev, IVTV_API_ASSIGN_PLACEHOLDER, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_SET_CUSTOM_DATA, 12, 0,</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_SET_PLACEHOLDER, 12, 0,</div><div class='ctx'> 			BLACKBIRD_CUSTOM_EXTENSION_USR_DATA,</div><div class='ctx'> 			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize the video input */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_INIT_VIDEO_INPUT, 0, 0);</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_INITIALIZE_INPUT, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE);</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE);</div><div class='ctx'> 	msleep(1);</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE);</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE);</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='ctx'> 	/* start capturing to the host interface */</div><div class='del'>-	/* blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0, 0, 0x13); */</div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0,</div><div class='add'>+	/* blackbird_api_cmd(dev, CX2341X_ENC_START_CAPTURE, 2, 0, 0, 0x13); */</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_START_CAPTURE, 2, 0,</div><div class='ctx'> 			BLACKBIRD_MPEG_CAPTURE,</div><div class='ctx'> 			BLACKBIRD_RAW_BITS_NONE</div><div class='ctx'> 		);</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='del'>-	blackbird_api_cmd(dev, BLACKBIRD_API_REFRESH_INPUT, 0,0);</div><div class='add'>+	blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1366,6 +689,39 @@ static struct videobuf_queue_ops blackbird_qops = {</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='add'>+static const u32 *ctrl_classes[] = {</div><div class='add'>+	cx88_user_ctrls,</div><div class='add'>+	cx2341x_mpeg_ctrls,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int blackbird_queryctrl(struct cx8802_dev *dev, struct v4l2_queryctrl *qctrl)</div><div class='add'>+{</div><div class='add'>+	qctrl-&gt;id = v4l2_ctrl_next(ctrl_classes, qctrl-&gt;id);</div><div class='add'>+	if (qctrl-&gt;id == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Standard V4L2 controls */</div><div class='add'>+	if (cx8800_ctrl_query(qctrl) == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* MPEG V4L2 controls */</div><div class='add'>+	if (cx2341x_ctrl_query(&amp;dev-&gt;params, qctrl))</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_DISABLED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int blackbird_querymenu(struct cx8802_dev *dev, struct v4l2_querymenu *qmenu)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_queryctrl qctrl;</div><div class='add'>+</div><div class='add'>+	qctrl.id = qmenu-&gt;id;</div><div class='add'>+	blackbird_queryctrl(dev, &amp;qctrl);</div><div class='add'>+	return v4l2_ctrl_query_menu(qmenu, &amp;qctrl, cx2341x_ctrl_get_menu(qmenu-&gt;id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------ */</div><div class='add'>+</div><div class='ctx'> static int mpeg_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			 unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -1485,27 +841,84 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_mpeg_compression *f = arg;</div><div class='ctx'> </div><div class='del'>-		memcpy(f,&amp;dev-&gt;params,sizeof(*f));</div><div class='add'>+		printk(KERN_WARNING "VIDIOC_G_MPEGCOMP is obsolete. "</div><div class='add'>+				    "Replace with VIDIOC_G_EXT_CTRLS!");</div><div class='add'>+		memcpy(f,&amp;default_mpeg_params,sizeof(*f));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_S_MPEGCOMP:</div><div class='add'>+		printk(KERN_WARNING "VIDIOC_S_MPEGCOMP is obsolete. "</div><div class='add'>+				    "Replace with VIDIOC_S_EXT_CTRLS!");</div><div class='add'>+		return 0;</div><div class='add'>+	case VIDIOC_G_EXT_CTRLS:</div><div class='ctx'> 	{</div><div class='del'>-		struct v4l2_mpeg_compression *f = arg;</div><div class='add'>+		struct v4l2_ext_controls *f = arg;</div><div class='add'>+</div><div class='add'>+		if (f-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return cx2341x_ext_ctrls(&amp;dev-&gt;params, f, cmd);</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_EXT_CTRLS:</div><div class='add'>+	case VIDIOC_TRY_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *f = arg;</div><div class='add'>+		struct cx2341x_mpeg_params p;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (f-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		p = dev-&gt;params;</div><div class='add'>+		err = cx2341x_ext_ctrls(&amp;p, f, cmd);</div><div class='add'>+		if (err == 0 &amp;&amp; cmd == VIDIOC_S_EXT_CTRLS) {</div><div class='add'>+			err = cx2341x_update(dev, blackbird_mbox_func, &amp;dev-&gt;params, &amp;p);</div><div class='add'>+			dev-&gt;params = p;</div><div class='add'>+		}</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		blackbird_api_cmd(fh-&gt;dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,</div><div class='add'>+				  BLACKBIRD_END_NOW,</div><div class='add'>+				  BLACKBIRD_MPEG_CAPTURE,</div><div class='add'>+				  BLACKBIRD_RAW_BITS_NONE);</div><div class='ctx'> </div><div class='del'>-		blackbird_set_params(dev, f);</div><div class='add'>+		cx88_do_ioctl(inode, file, 0, dev-&gt;core, cmd, arg, mpeg_do_ioctl);</div><div class='add'>+</div><div class='add'>+		blackbird_initialize_codec(dev);</div><div class='add'>+		cx88_set_scale(dev-&gt;core, dev-&gt;width, dev-&gt;height,</div><div class='add'>+			       fh-&gt;mpegq.field);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_LOG_STATUS:</div><div class='add'>+	{</div><div class='add'>+		char name[32 + 2];</div><div class='add'>+</div><div class='add'>+		snprintf(name, sizeof(name), "%s/2", core-&gt;name);</div><div class='add'>+		printk("%s/2: ============  START LOG STATUS  ============\n",</div><div class='add'>+		       core-&gt;name);</div><div class='add'>+		cx88_call_i2c_clients(core, VIDIOC_LOG_STATUS, 0);</div><div class='add'>+		cx2341x_log_status(&amp;dev-&gt;params, name);</div><div class='add'>+		printk("%s/2: =============  END LOG STATUS  =============\n",</div><div class='add'>+		       core-&gt;name);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	case VIDIOC_QUERYMENU:</div><div class='add'>+		return blackbird_querymenu(dev, arg);</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *c = arg;</div><div class='add'>+</div><div class='add'>+		if (blackbird_queryctrl(dev, c) == 0)</div><div class='add'>+			return 0;</div><div class='add'>+		return cx88_do_ioctl(inode, file, 0, dev-&gt;core, cmd, arg, mpeg_do_ioctl);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		return cx88_do_ioctl( inode, file, 0, dev-&gt;core, cmd, arg, cx88_ioctl_hook );</div><div class='add'>+		return cx88_do_ioctl(inode, file, 0, dev-&gt;core, cmd, arg, mpeg_do_ioctl);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int (*cx88_ioctl_hook)(struct inode *inode, struct file *file,</div><div class='del'>-			unsigned int cmd, void *arg);</div><div class='del'>-unsigned int (*cx88_ioctl_translator)(unsigned int cmd);</div><div class='del'>-</div><div class='ctx'> static unsigned int mpeg_translate_ioctl(unsigned int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	return cmd;</div><div class='hunk'>@@ -1514,8 +927,8 @@ static unsigned int mpeg_translate_ioctl(unsigned int cmd)</div><div class='ctx'> static int mpeg_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	cmd = cx88_ioctl_translator( cmd );</div><div class='del'>-	return video_usercopy(inode, file, cmd, arg, cx88_ioctl_hook);</div><div class='add'>+	cmd = mpeg_translate_ioctl( cmd );</div><div class='add'>+	return video_usercopy(inode, file, cmd, arg, mpeg_do_ioctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mpeg_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -1562,13 +975,14 @@ static int mpeg_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx8802_fh  *fh  = file-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	/* blackbird_api_cmd(fh-&gt;dev, BLACKBIRD_API_END_CAPTURE, 3, 0, BLACKBIRD_END_NOW, 0, 0x13); */</div><div class='del'>-	blackbird_api_cmd(fh-&gt;dev, BLACKBIRD_API_END_CAPTURE, 3, 0,</div><div class='add'>+	/* blackbird_api_cmd(fh-&gt;dev, CX2341X_ENC_STOP_CAPTURE, 3, 0, BLACKBIRD_END_NOW, 0, 0x13); */</div><div class='add'>+	blackbird_api_cmd(fh-&gt;dev, CX2341X_ENC_STOP_CAPTURE, 3, 0,</div><div class='ctx'> 			BLACKBIRD_END_NOW,</div><div class='ctx'> 			BLACKBIRD_MPEG_CAPTURE,</div><div class='ctx'> 			BLACKBIRD_RAW_BITS_NONE</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='add'>+	cx8802_cancel_buffers(fh-&gt;dev);</div><div class='ctx'> 	/* stop mpeg capture */</div><div class='ctx'> 	if (fh-&gt;mpegq.streaming)</div><div class='ctx'> 		videobuf_streamoff(&amp;fh-&gt;mpegq);</div><div class='hunk'>@@ -1683,19 +1097,13 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 	dev-&gt;core = core;</div><div class='ctx'> 	dev-&gt;width = 720;</div><div class='ctx'> 	dev-&gt;height = 576;</div><div class='del'>-	memcpy(&amp;dev-&gt;params,&amp;default_mpeg_params,sizeof(default_mpeg_params));</div><div class='del'>-	memcpy(&amp;dev-&gt;dnr_params,&amp;default_dnr_params,sizeof(default_dnr_params));</div><div class='del'>-</div><div class='del'>-	if (core-&gt;board == CX88_BOARD_HAUPPAUGE_ROSLYN) {</div><div class='del'>-</div><div class='del'>-		if (core-&gt;tuner_formats &amp; V4L2_STD_525_60) {</div><div class='del'>-			dev-&gt;height = 480;</div><div class='del'>-			dev-&gt;params.vi_frame_rate = 30;</div><div class='del'>-		} else {</div><div class='del'>-			dev-&gt;height = 576;</div><div class='del'>-			dev-&gt;params.vi_frame_rate = 25;</div><div class='del'>-		}</div><div class='add'>+	cx2341x_fill_defaults(&amp;dev-&gt;params);</div><div class='add'>+	dev-&gt;params.port = CX2341X_PORT_STREAMING;</div><div class='ctx'> </div><div class='add'>+	if (core-&gt;tvnorm-&gt;id &amp; V4L2_STD_525_60) {</div><div class='add'>+		dev-&gt;height = 480;</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;height = 576;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = cx8802_init_common(dev);</div><div class='hunk'>@@ -1766,8 +1174,6 @@ static int blackbird_init(void)</div><div class='ctx'> 	printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",</div><div class='ctx'> 	       SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);</div><div class='ctx'> #endif</div><div class='del'>-	cx88_ioctl_hook = mpeg_do_ioctl;</div><div class='del'>-	cx88_ioctl_translator = mpeg_translate_ioctl;</div><div class='ctx'> 	return pci_register_driver(&amp;blackbird_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1779,11 +1185,6 @@ static void blackbird_fini(void)</div><div class='ctx'> module_init(blackbird_init);</div><div class='ctx'> module_exit(blackbird_fini);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(cx88_ioctl_hook);</div><div class='del'>-EXPORT_SYMBOL(cx88_ioctl_translator);</div><div class='del'>-EXPORT_SYMBOL(blackbird_set_params);</div><div class='del'>-EXPORT_SYMBOL(blackbird_set_dnr_params);</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c<br/>index f80154b87d22..14bd4863d157 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-cards.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-cards.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.radio = {</div><div class='ctx'> 			 .type  = CX88_RADIO,</div><div class='ctx'> 			 .gpio0 = 0xff10,</div><div class='del'>-		 },</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_ATI_WONDER_PRO] = {</div><div class='ctx'> 		.name           = "ATI TV Wonder Pro",</div><div class='hunk'>@@ -267,7 +267,7 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.gpio1  = 0x00007004,</div><div class='ctx'> 			.gpio2  = 0x0035d700,</div><div class='ctx'> 			.gpio3  = 0x02000000,</div><div class='del'>-		 },</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_LEADTEK_PVR2000] = {</div><div class='ctx'> 		// gpio values for PAL version from regspy by DScaler</div><div class='hunk'>@@ -413,7 +413,7 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.type   = CX88_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 1,</div><div class='ctx'> 			.gpio0  = 0x000027df,</div><div class='del'>-		 },{</div><div class='add'>+		},{</div><div class='ctx'> 			.type   = CX88_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   = 2,</div><div class='ctx'> 			.gpio0  = 0x000027df,</div><div class='hunk'>@@ -536,7 +536,7 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.type   = CX88_VMUX_COMPOSITE1,</div><div class='ctx'> 			.vmux   = 1,</div><div class='ctx'> 			.gpio0  = 0x000027df,</div><div class='del'>-		 },{</div><div class='add'>+		},{</div><div class='ctx'> 			.type   = CX88_VMUX_SVIDEO,</div><div class='ctx'> 			.vmux   = 2,</div><div class='ctx'> 			.gpio0  = 0x000027df,</div><div class='hunk'>@@ -759,7 +759,7 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = {</div><div class='ctx'> 		.name           = "DViCO FusionHDTV 5 Gold",</div><div class='del'>-		.tuner_type     = TUNER_LG_TDVS_H062F,</div><div class='add'>+		.tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H062F */</div><div class='ctx'> 		.radio_type     = UNSET,</div><div class='ctx'> 		.tuner_addr	= ADDR_UNSET,</div><div class='ctx'> 		.radio_addr	= ADDR_UNSET,</div><div class='hunk'>@@ -1050,11 +1050,7 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		.dvb            = 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = {</div><div class='del'>-		/* FIXME: Standard video using the cx88 broadcast decoder is</div><div class='del'>-		 * working, but blackbird isn't working yet, audio is only</div><div class='del'>-		 * working correctly for television mode. S-Video and Composite</div><div class='del'>-		 * are working for video-only, so I have them disabled for now.</div><div class='del'>-		 */</div><div class='add'>+		/* FIXME: Audio not working for s-video / composite inputs. */</div><div class='ctx'> 		.name           = "KWorld HardwareMpegTV XPert",</div><div class='ctx'> 		.tuner_type     = TUNER_PHILIPS_TDA8290,</div><div class='ctx'> 		.radio_type     = UNSET,</div><div class='hunk'>@@ -1065,12 +1061,21 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 			.vmux   = 0,</div><div class='ctx'> 			.gpio0  = 0x3de2,</div><div class='ctx'> 			.gpio2  = 0x00ff,</div><div class='add'>+		},{</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0  = 0x3de6,</div><div class='add'>+		},{</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0  = 0x3de6,</div><div class='ctx'> 		}},</div><div class='ctx'> 		.radio = {</div><div class='ctx'> 			.type   = CX88_RADIO,</div><div class='ctx'> 			.gpio0  = 0x3de6,</div><div class='ctx'> 			.gpio2  = 0x00ff,</div><div class='ctx'> 		},</div><div class='add'>+		.blackbird      = 1,</div><div class='ctx'> 	},</div><div class='ctx'> 	[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {</div><div class='ctx'> 		.name           = "DViCO FusionHDTV DVB-T Hybrid",</div><div class='hunk'>@@ -1093,7 +1098,117 @@ struct cx88_board cx88_boards[] = {</div><div class='ctx'> 		}},</div><div class='ctx'> 		.dvb            = 1,</div><div class='ctx'> 	},</div><div class='del'>-</div><div class='add'>+	[CX88_BOARD_PCHDTV_HD5500] = {</div><div class='add'>+		.name           = "pcHDTV HD5500 HDTV",</div><div class='add'>+		.tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr	= ADDR_UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='add'>+		.tda9887_conf   = TDA9887_PRESENT,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x87fd,</div><div class='add'>+		},{</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0  = 0x87f9,</div><div class='add'>+		},{</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0  = 0x87f9,</div><div class='add'>+		}},</div><div class='add'>+		.dvb            = 1,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_KWORLD_MCE200_DELUXE] = {</div><div class='add'>+		/* FIXME: tested TV input only, disabled composite,</div><div class='add'>+		   svideo and radio until they can be tested also. */</div><div class='add'>+		.name           = "Kworld MCE 200 Deluxe",</div><div class='add'>+		.tuner_type     = TUNER_TENA_9533_DI,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tda9887_conf   = TDA9887_PRESENT,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x0000BDE6</div><div class='add'>+		}},</div><div class='add'>+		.blackbird = 1,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_PIXELVIEW_PLAYTV_P7000] = {</div><div class='add'>+		/* FIXME: SVideo, Composite and FM inputs are untested */</div><div class='add'>+		.name           = "PixelView PlayTV P7000",</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr	= ADDR_UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='add'>+		.tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE |</div><div class='add'>+				  TDA9887_PORT2_ACTIVE,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x5da6,</div><div class='add'>+		}},</div><div class='add'>+		.blackbird = 1,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_NPGTECH_REALTV_TOP10FM] = {</div><div class='add'>+		.name           = "NPG Tech Real TV FM Top 10",</div><div class='add'>+		.tuner_type     = TUNER_TNF_5335MF, /* Actually a TNF9535 */</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr	= ADDR_UNSET,</div><div class='add'>+		.radio_addr	= ADDR_UNSET,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0	= 0x0788,</div><div class='add'>+		},{</div><div class='add'>+			.type   = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux   = 1,</div><div class='add'>+			.gpio0	= 0x078b,</div><div class='add'>+		},{</div><div class='add'>+			.type   = CX88_VMUX_SVIDEO,</div><div class='add'>+			.vmux   = 2,</div><div class='add'>+			.gpio0	= 0x078b,</div><div class='add'>+		}},</div><div class='add'>+		.radio = {</div><div class='add'>+			 .type  = CX88_RADIO,</div><div class='add'>+			 .gpio0 = 0x074a,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_WINFAST_DTV2000H] = {</div><div class='add'>+		/* video inputs and radio still in testing */</div><div class='add'>+		.name           = "WinFast DTV2000 H",</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+		.tda9887_conf   = TDA9887_PRESENT,</div><div class='add'>+		.input          = {{</div><div class='add'>+			.type   = CX88_VMUX_TELEVISION,</div><div class='add'>+			.vmux   = 0,</div><div class='add'>+			.gpio0  = 0x00017304,</div><div class='add'>+			.gpio1  = 0x00008203,</div><div class='add'>+			.gpio2  = 0x00017304,</div><div class='add'>+			.gpio3  = 0x02000000,</div><div class='add'>+		}},</div><div class='add'>+		.dvb            = 1,</div><div class='add'>+	},</div><div class='add'>+	[CX88_BOARD_GENIATECH_DVBS] = {</div><div class='add'>+		.name          = "Geniatech DVB-S",</div><div class='add'>+		.tuner_type    = TUNER_ABSENT,</div><div class='add'>+		.radio_type    = UNSET,</div><div class='add'>+		.tuner_addr    = ADDR_UNSET,</div><div class='add'>+		.radio_addr    = ADDR_UNSET,</div><div class='add'>+		.input  = {{</div><div class='add'>+			.type  = CX88_VMUX_DVB,</div><div class='add'>+			.vmux  = 0,</div><div class='add'>+		},{</div><div class='add'>+			.type  = CX88_VMUX_COMPOSITE1,</div><div class='add'>+			.vmux  = 1,</div><div class='add'>+		}},</div><div class='add'>+		.dvb      = 1,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);</div><div class='ctx'> </div><div class='hunk'>@@ -1311,6 +1426,38 @@ struct cx88_subid cx88_subids[] = {</div><div class='ctx'> 		.subvendor = 0x18ac,</div><div class='ctx'> 		.subdevice = 0xdb44,</div><div class='ctx'> 		.card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x7063,</div><div class='add'>+		.subdevice = 0x5500,</div><div class='add'>+		.card      = CX88_BOARD_PCHDTV_HD5500,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x17de,</div><div class='add'>+		.subdevice = 0x0841,</div><div class='add'>+		.card      = CX88_BOARD_KWORLD_MCE200_DELUXE,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x1822,</div><div class='add'>+		.subdevice = 0x0019,</div><div class='add'>+		.card      = CX88_BOARD_DNTV_LIVE_DVB_T_PRO,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x1554,</div><div class='add'>+		.subdevice = 0x4813,</div><div class='add'>+		.card      = CX88_BOARD_PIXELVIEW_PLAYTV_P7000,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x14f1,</div><div class='add'>+		.subdevice = 0x0842,</div><div class='add'>+		.card      = CX88_BOARD_NPGTECH_REALTV_TOP10FM,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x107d,</div><div class='add'>+		.subdevice = 0x665e,</div><div class='add'>+		.card      = CX88_BOARD_WINFAST_DTV2000H,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x18ac,</div><div class='add'>+		.subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */</div><div class='add'>+		.card      = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,</div><div class='add'>+	},{</div><div class='add'>+		.subvendor = 0x14f1,</div><div class='add'>+		.subdevice = 0x0084,</div><div class='add'>+		.card      = CX88_BOARD_GENIATECH_DVBS,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);</div><div class='hunk'>@@ -1572,11 +1719,6 @@ void cx88_card_setup(struct cx88_core *core)</div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(cx88_boards);</div><div class='del'>-EXPORT_SYMBOL(cx88_bcount);</div><div class='del'>-EXPORT_SYMBOL(cx88_subids);</div><div class='del'>-EXPORT_SYMBOL(cx88_idcount);</div><div class='del'>-EXPORT_SYMBOL(cx88_card_list);</div><div class='del'>-EXPORT_SYMBOL(cx88_card_setup);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c<br/>index e1092d5d4628..973d3f39b2d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-core.c</a></div><div class='hunk'>@@ -677,7 +677,7 @@ static unsigned int inline norm_htotal(struct cx88_tvnorm *norm)</div><div class='ctx'> </div><div class='ctx'> static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm)</div><div class='ctx'> {</div><div class='del'>-	return (norm-&gt;id &amp; V4L2_STD_625_50) ? 511 : 288;</div><div class='add'>+	return (norm-&gt;id &amp; V4L2_STD_625_50) ? 511 : 400;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height,</div><div class='hunk'>@@ -932,9 +932,9 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm)</div><div class='ctx'> 		htotal, cx_read(MO_HTOTAL), (u32)tmp64);</div><div class='ctx'> 	cx_write(MO_HTOTAL, htotal);</div><div class='ctx'> </div><div class='del'>-	// vbi stuff</div><div class='del'>-	cx_write(MO_VBI_PACKET, ((1 &lt;&lt; 11) | /* (norm_vdelay(norm)   &lt;&lt; 11) | */</div><div class='del'>-				 norm_vbipack(norm)));</div><div class='add'>+	// vbi stuff, set vbi offset to 10 (for 20 Clk*2 pixels), this makes</div><div class='add'>+	// the effective vbi offset ~244 samples, the same as the Bt8x8</div><div class='add'>+	cx_write(MO_VBI_PACKET, (10&lt;&lt;11) | norm_vbipack(norm));</div><div class='ctx'> </div><div class='ctx'> 	// this is needed as well to set all tvnorm parameter</div><div class='ctx'> 	cx88_set_scale(core, 320, 240, V4L2_FIELD_INTERLACED);</div><div class='hunk'>@@ -1031,8 +1031,8 @@ static int get_ressources(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> 			       pci_resource_len(pci,0),</div><div class='ctx'> 			       core-&gt;name))</div><div class='ctx'> 		return 0;</div><div class='del'>-	printk(KERN_ERR "%s: can't get MMIO memory @ 0x%lx\n",</div><div class='del'>-	       core-&gt;name,pci_resource_start(pci,0));</div><div class='add'>+	printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",</div><div class='add'>+	       core-&gt;name,(unsigned long long)pci_resource_start(pci,0));</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1181,8 +1181,6 @@ EXPORT_SYMBOL(cx88_set_scale);</div><div class='ctx'> EXPORT_SYMBOL(cx88_vdev_init);</div><div class='ctx'> EXPORT_SYMBOL(cx88_core_get);</div><div class='ctx'> EXPORT_SYMBOL(cx88_core_put);</div><div class='del'>-EXPORT_SYMBOL(cx88_start_audio_dma);</div><div class='del'>-EXPORT_SYMBOL(cx88_stop_audio_dma);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c<br/>index 3619a449aefd..afde3789d702 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-dvb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-dvb.c</a></div><div class='hunk'>@@ -51,6 +51,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_LGDT330X</div><div class='ctx'> # include "lgdt330x.h"</div><div class='add'>+# include "lg_h06xf.h"</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_NXT200X</div><div class='ctx'> # include "nxt200x.h"</div><div class='hunk'>@@ -58,6 +59,7 @@</div><div class='ctx'> #ifdef HAVE_CX24123</div><div class='ctx'> # include "cx24123.h"</div><div class='ctx'> #endif</div><div class='add'>+#include "isl6421.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("driver for cx2388x based DVB cards");</div><div class='ctx'> MODULE_AUTHOR("Chris Pascoe &lt;c.pascoe@itee.uq.edu.au&gt;");</div><div class='hunk'>@@ -113,21 +115,6 @@ static struct videobuf_queue_ops dvb_qops = {</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-#if defined(HAVE_MT352) || defined(HAVE_ZL10353)</div><div class='del'>-static int zarlink_pll_set(struct dvb_frontend *fe,</div><div class='del'>-			      struct dvb_frontend_parameters *params,</div><div class='del'>-			      u8 *pllbuf)</div><div class='del'>-{</div><div class='del'>-	struct cx8802_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='del'>-</div><div class='del'>-	pllbuf[0] = dev-&gt;core-&gt;pll_addr &lt;&lt; 1;</div><div class='del'>-	dvb_pll_configure(dev-&gt;core-&gt;pll_desc, pllbuf + 1,</div><div class='del'>-			  params-&gt;frequency,</div><div class='del'>-			  params-&gt;u.ofdm.bandwidth);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef HAVE_MT352</div><div class='ctx'> static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,19 +183,16 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)</div><div class='ctx'> static struct mt352_config dvico_fusionhdtv = {</div><div class='ctx'> 	.demod_address = 0x0F,</div><div class='ctx'> 	.demod_init    = dvico_fusionhdtv_demod_init,</div><div class='del'>-	.pll_set       = zarlink_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config dntv_live_dvbt_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.demod_init    = dntv_live_dvbt_demod_init,</div><div class='del'>-	.pll_set       = zarlink_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config dvico_fusionhdtv_dual = {</div><div class='ctx'> 	.demod_address = 0x0F,</div><div class='ctx'> 	.demod_init    = dvico_dual_demod_init,</div><div class='del'>-	.pll_set       = zarlink_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef HAVE_VP3054_I2C</div><div class='hunk'>@@ -246,6 +230,8 @@ static int philips_fmd1216_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 		  .buf = fmd1216_init, .len = sizeof(fmd1216_init) };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if ((err = i2c_transfer(&amp;dev-&gt;core-&gt;i2c_adap, &amp;msg, 1)) != 1) {</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -256,14 +242,14 @@ static int philips_fmd1216_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dntv_live_dvbt_pro_pll_set(struct dvb_frontend* fe,</div><div class='del'>-				      struct dvb_frontend_parameters* params,</div><div class='del'>-				      u8* pllbuf)</div><div class='add'>+static int dntv_live_dvbt_pro_tuner_set_params(struct dvb_frontend* fe,</div><div class='add'>+					       struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='add'>+	u8 buf[4];</div><div class='ctx'> 	struct i2c_msg msg =</div><div class='ctx'> 		{ .addr = dev-&gt;core-&gt;pll_addr, .flags = 0,</div><div class='del'>-		  .buf = pllbuf+1, .len = 4 };</div><div class='add'>+		  .buf = buf, .len = 4 };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Switch PLL to DVB mode */</div><div class='hunk'>@@ -272,14 +258,16 @@ static int dntv_live_dvbt_pro_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Tune PLL */</div><div class='del'>-	pllbuf[0] = dev-&gt;core-&gt;pll_addr &lt;&lt; 1;</div><div class='del'>-	dvb_pll_configure(dev-&gt;core-&gt;pll_desc, pllbuf+1,</div><div class='add'>+	dvb_pll_configure(dev-&gt;core-&gt;pll_desc, buf,</div><div class='ctx'> 			  params-&gt;frequency,</div><div class='ctx'> 			  params-&gt;u.ofdm.bandwidth);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if ((err = i2c_transfer(&amp;dev-&gt;core-&gt;i2c_adap, &amp;msg, 1)) != 1) {</div><div class='add'>+</div><div class='ctx'> 		printk(KERN_WARNING "cx88-dvb: %s error "</div><div class='ctx'> 			   "(addr %02x &lt;- %02x, err = %i)\n",</div><div class='del'>-			   __FUNCTION__, pllbuf[0], pllbuf[1], err);</div><div class='add'>+			   __FUNCTION__, dev-&gt;core-&gt;pll_addr, buf[0], err);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -293,27 +281,27 @@ static struct mt352_config dntv_live_dvbt_pro_config = {</div><div class='ctx'> 	.demod_address = 0x0f,</div><div class='ctx'> 	.no_tuner      = 1,</div><div class='ctx'> 	.demod_init    = dntv_live_dvbt_pro_demod_init,</div><div class='del'>-	.pll_set       = dntv_live_dvbt_pro_pll_set,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef HAVE_ZL10353</div><div class='del'>-static int dvico_hybrid_tune_pll(struct dvb_frontend *fe,</div><div class='del'>-				 struct dvb_frontend_parameters *params,</div><div class='del'>-				 u8 *pllbuf)</div><div class='add'>+static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,</div><div class='add'>+					 struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='add'>+	u8 pllbuf[4];</div><div class='ctx'> 	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct i2c_msg msg =</div><div class='ctx'> 		{ .addr = dev-&gt;core-&gt;pll_addr, .flags = 0,</div><div class='del'>-		  .buf = pllbuf + 1, .len = 4 };</div><div class='add'>+		  .buf = pllbuf, .len = 4 };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	pllbuf[0] = dev-&gt;core-&gt;pll_addr &lt;&lt; 1;</div><div class='del'>-	dvb_pll_configure(dev-&gt;core-&gt;pll_desc, pllbuf + 1,</div><div class='add'>+	dvb_pll_configure(dev-&gt;core-&gt;pll_desc, pllbuf,</div><div class='ctx'> 			  params-&gt;frequency,</div><div class='ctx'> 			  params-&gt;u.ofdm.bandwidth);</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if ((err = i2c_transfer(&amp;dev-&gt;core-&gt;i2c_adap, &amp;msg, 1)) != 1) {</div><div class='ctx'> 		printk(KERN_WARNING "cx88-dvb: %s error "</div><div class='ctx'> 			   "(addr %02x &lt;- %02x, err = %i)\n",</div><div class='hunk'>@@ -329,12 +317,11 @@ static int dvico_hybrid_tune_pll(struct dvb_frontend *fe,</div><div class='ctx'> </div><div class='ctx'> static struct zl10353_config dvico_fusionhdtv_hybrid = {</div><div class='ctx'> 	.demod_address = 0x0F,</div><div class='del'>-	.pll_set       = dvico_hybrid_tune_pll,</div><div class='add'>+	.no_tuner      = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {</div><div class='ctx'> 	.demod_address = 0x0F,</div><div class='del'>-	.pll_set       = zarlink_pll_set,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -342,21 +329,15 @@ static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {</div><div class='ctx'> static struct cx22702_config connexant_refboard_config = {</div><div class='ctx'> 	.demod_address = 0x43,</div><div class='ctx'> 	.output_mode   = CX22702_SERIAL_OUTPUT,</div><div class='del'>-	.pll_address   = 0x60,</div><div class='del'>-	.pll_desc      = &amp;dvb_pll_thomson_dtt7579,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cx22702_config hauppauge_novat_config = {</div><div class='ctx'> 	.demod_address = 0x43,</div><div class='ctx'> 	.output_mode   = CX22702_SERIAL_OUTPUT,</div><div class='del'>-	.pll_address   = 0x61,</div><div class='del'>-	.pll_desc      = &amp;dvb_pll_thomson_dtt759x,</div><div class='ctx'> };</div><div class='ctx'> static struct cx22702_config hauppauge_hvr1100_config = {</div><div class='ctx'> 	.demod_address = 0x63,</div><div class='ctx'> 	.output_mode   = CX22702_SERIAL_OUTPUT,</div><div class='del'>-	.pll_address   = 0x61,</div><div class='del'>-	.pll_desc      = &amp;dvb_pll_fmd1216me,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -371,15 +352,13 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,</div><div class='ctx'> </div><div class='ctx'> static struct or51132_config pchdtv_hd3000 = {</div><div class='ctx'> 	.demod_address    = 0x15,</div><div class='del'>-	.pll_address      = 0x61,</div><div class='del'>-	.pll_desc         = &amp;dvb_pll_thomson_dtt761x,</div><div class='ctx'> 	.set_ts_params    = or51132_set_ts_param,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef HAVE_LGDT330X</div><div class='del'>-static int lgdt330x_pll_set(struct dvb_frontend* fe,</div><div class='del'>-			    struct dvb_frontend_parameters* params)</div><div class='add'>+static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,</div><div class='add'>+				     struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME make this routine use the tuner-simple code.</div><div class='ctx'> 	 * It could probably be shared with a number of ATSC</div><div class='hunk'>@@ -392,12 +371,12 @@ static int lgdt330x_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> 		{ .addr = dev-&gt;core-&gt;pll_addr, .flags = 0, .buf = buf, .len = 4 };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Put the analog decoder in standby to keep it quiet */</div><div class='del'>-	cx88_call_i2c_clients (dev-&gt;core, TUNER_SET_STANDBY, NULL);</div><div class='del'>-</div><div class='ctx'> 	dvb_pll_configure(core-&gt;pll_desc, buf, params-&gt;frequency, 0);</div><div class='ctx'> 	dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",</div><div class='ctx'> 			__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);</div><div class='add'>+</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if ((err = i2c_transfer(&amp;core-&gt;i2c_adap, &amp;msg, 1)) != 1) {</div><div class='ctx'> 		printk(KERN_WARNING "cx88-dvb: %s error "</div><div class='ctx'> 			   "(addr %02x &lt;- %02x, err = %i)\n",</div><div class='hunk'>@@ -407,16 +386,21 @@ static int lgdt330x_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> 		else</div><div class='ctx'> 			return -EREMOTEIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (core-&gt;tuner_type == TUNER_LG_TDVS_H062F) {</div><div class='del'>-		/* Set the Auxiliary Byte. */</div><div class='del'>-		buf[2] &amp;= ~0x20;</div><div class='del'>-		buf[2] |= 0x18;</div><div class='del'>-		buf[3] = 0x50;</div><div class='del'>-		i2c_transfer(&amp;core-&gt;i2c_adap, &amp;msg, 1);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int lgdt3303_tuner_set_params(struct dvb_frontend* fe,</div><div class='add'>+				     struct dvb_frontend_parameters* params)</div><div class='add'>+{</div><div class='add'>+	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct cx88_core *core = dev-&gt;core;</div><div class='add'>+</div><div class='add'>+	/* Put the analog decoder in standby to keep it quiet */</div><div class='add'>+	cx88_call_i2c_clients (dev-&gt;core, TUNER_SET_STANDBY, NULL);</div><div class='add'>+</div><div class='add'>+	return lg_h06xf_pll_set(fe, &amp;core-&gt;i2c_adap, params);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='hunk'>@@ -444,7 +428,6 @@ static struct lgdt330x_config fusionhdtv_3_gold = {</div><div class='ctx'> 	.demod_address    = 0x0e,</div><div class='ctx'> 	.demod_chip       = LGDT3302,</div><div class='ctx'> 	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */</div><div class='del'>-	.pll_set          = lgdt330x_pll_set,</div><div class='ctx'> 	.set_ts_params    = lgdt330x_set_ts_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -452,7 +435,13 @@ static struct lgdt330x_config fusionhdtv_5_gold = {</div><div class='ctx'> 	.demod_address    = 0x0e,</div><div class='ctx'> 	.demod_chip       = LGDT3303,</div><div class='ctx'> 	.serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */</div><div class='del'>-	.pll_set          = lgdt330x_pll_set,</div><div class='add'>+	.set_ts_params    = lgdt330x_set_ts_param,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct lgdt330x_config pchdtv_hd5500 = {</div><div class='add'>+	.demod_address    = 0x59,</div><div class='add'>+	.demod_chip       = LGDT3303,</div><div class='add'>+	.serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */</div><div class='ctx'> 	.set_ts_params    = lgdt330x_set_ts_param,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -477,8 +466,6 @@ static int nxt200x_set_pll_input(u8* buf, int input)</div><div class='ctx'> </div><div class='ctx'> static struct nxt200x_config ati_hdtvwonder = {</div><div class='ctx'> 	.demod_address    = 0x0a,</div><div class='del'>-	.pll_address      = 0x61,</div><div class='del'>-	.pll_desc         = &amp;dvb_pll_tuv1236d,</div><div class='ctx'> 	.set_pll_input    = nxt200x_set_pll_input,</div><div class='ctx'> 	.set_ts_params    = nxt200x_set_ts_param,</div><div class='ctx'> };</div><div class='hunk'>@@ -493,28 +480,50 @@ static int cx24123_set_ts_param(struct dvb_frontend* fe,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cx24123_enable_lnb_voltage(struct dvb_frontend* fe, int on)</div><div class='add'>+static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	struct cx88_core *core = dev-&gt;core;</div><div class='ctx'> </div><div class='del'>-	if (on)</div><div class='del'>-		cx_write(MO_GP0_IO, 0x000006f9);</div><div class='del'>-	else</div><div class='add'>+	if (voltage == SEC_VOLTAGE_OFF) {</div><div class='ctx'> 		cx_write(MO_GP0_IO, 0x000006fB);</div><div class='add'>+	} else {</div><div class='add'>+		cx_write(MO_GP0_IO, 0x000006f9);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (core-&gt;prev_set_voltage)</div><div class='add'>+		return core-&gt;prev_set_voltage(fe, voltage);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)</div><div class='add'>+{</div><div class='add'>+	struct cx8802_dev *dev= fe-&gt;dvb-&gt;priv;</div><div class='add'>+	struct cx88_core *core = dev-&gt;core;</div><div class='add'>+</div><div class='add'>+	if (voltage == SEC_VOLTAGE_OFF) {</div><div class='add'>+		dprintk(1,"LNB Voltage OFF\n");</div><div class='add'>+		cx_write(MO_GP0_IO, 0x0000efff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (core-&gt;prev_set_voltage)</div><div class='add'>+		return core-&gt;prev_set_voltage(fe, voltage);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cx24123_config geniatech_dvbs_config = {</div><div class='add'>+	.demod_address  = 0x55,</div><div class='add'>+	.set_ts_params  = cx24123_set_ts_param,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct cx24123_config hauppauge_novas_config = {</div><div class='ctx'> 	.demod_address		= 0x55,</div><div class='del'>-	.use_isl6421		= 1,</div><div class='ctx'> 	.set_ts_params		= cx24123_set_ts_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct cx24123_config kworld_dvbs_100_config = {</div><div class='ctx'> 	.demod_address		= 0x15,</div><div class='del'>-	.use_isl6421		= 0,</div><div class='ctx'> 	.set_ts_params		= cx24123_set_ts_param,</div><div class='del'>-	.enable_lnb_voltage	= cx24123_enable_lnb_voltage,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -530,6 +539,11 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_DVB_T1:</div><div class='ctx'> 		dev-&gt;dvb.frontend = cx22702_attach(&amp;hauppauge_novat_config,</div><div class='ctx'> 						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt759x);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:</div><div class='ctx'> 	case CX88_BOARD_CONEXANT_DVB_T1:</div><div class='hunk'>@@ -537,44 +551,92 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_WINFAST_DTV1000:</div><div class='ctx'> 		dev-&gt;dvb.frontend = cx22702_attach(&amp;connexant_refboard_config,</div><div class='ctx'> 						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x60,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt7579);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_WINFAST_DTV2000H:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100:</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_HVR1100LP:</div><div class='ctx'> 		dev-&gt;dvb.frontend = cx22702_attach(&amp;hauppauge_hvr1100_config,</div><div class='ctx'> 						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_fmd1216me);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(HAVE_MT352) || defined(HAVE_ZL10353)</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:</div><div class='del'>-		dev-&gt;core-&gt;pll_addr = 0x60;</div><div class='del'>-		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_thomson_dtt7579;</div><div class='ctx'> #ifdef HAVE_MT352</div><div class='ctx'> 		dev-&gt;dvb.frontend = mt352_attach(&amp;dvico_fusionhdtv,</div><div class='ctx'> 						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='del'>-		if (dev-&gt;dvb.frontend != NULL)</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x60,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt7579);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_ZL10353</div><div class='ctx'> 		/* ZL10353 replaces MT352 on later cards */</div><div class='ctx'> 		dev-&gt;dvb.frontend = zl10353_attach(&amp;dvico_fusionhdtv_plus_v1_1,</div><div class='ctx'> 						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x60,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt7579);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:</div><div class='add'>+#ifdef HAVE_MT352</div><div class='add'>+		/* The tin box says DEE1601, but it seems to be DTT7579</div><div class='add'>+		 * compatible, with a slightly different MT352 AGC gain. */</div><div class='add'>+		dev-&gt;dvb.frontend = mt352_attach(&amp;dvico_fusionhdtv_dual,</div><div class='add'>+						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt7579);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+#ifdef HAVE_ZL10353</div><div class='add'>+		/* ZL10353 replaces MT352 on later cards */</div><div class='add'>+		dev-&gt;dvb.frontend = zl10353_attach(&amp;dvico_fusionhdtv_plus_v1_1,</div><div class='add'>+						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt7579);</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> #endif /* HAVE_MT352 || HAVE_ZL10353 */</div><div class='ctx'> #ifdef HAVE_MT352</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:</div><div class='del'>-		dev-&gt;core-&gt;pll_addr = 0x61;</div><div class='del'>-		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_lg_z201;</div><div class='ctx'> 		dev-&gt;dvb.frontend = mt352_attach(&amp;dvico_fusionhdtv,</div><div class='ctx'> 						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_lg_z201);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_KWORLD_DVB_T:</div><div class='ctx'> 	case CX88_BOARD_DNTV_LIVE_DVB_T:</div><div class='ctx'> 	case CX88_BOARD_ADSTECH_DVB_T_PCI:</div><div class='del'>-		dev-&gt;core-&gt;pll_addr = 0x61;</div><div class='del'>-		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_unknown_1;</div><div class='ctx'> 		dev-&gt;dvb.frontend = mt352_attach(&amp;dntv_live_dvbt_config,</div><div class='ctx'> 						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_unknown_1);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:</div><div class='ctx'> #ifdef HAVE_VP3054_I2C</div><div class='hunk'>@@ -582,18 +644,13 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_fmd1216me;</div><div class='ctx'> 		dev-&gt;dvb.frontend = mt352_attach(&amp;dntv_live_dvbt_pro_config,</div><div class='ctx'> 			&amp;((struct vp3054_i2c_state *)dev-&gt;card_priv)-&gt;adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = dntv_live_dvbt_pro_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> #else</div><div class='ctx'> 		printk("%s: built without vp3054 support\n", dev-&gt;core-&gt;name);</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='del'>-	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:</div><div class='del'>-		/* The tin box says DEE1601, but it seems to be DTT7579</div><div class='del'>-		 * compatible, with a slightly different MT352 AGC gain. */</div><div class='del'>-		dev-&gt;core-&gt;pll_addr = 0x61;</div><div class='del'>-		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_thomson_dtt7579;</div><div class='del'>-		dev-&gt;dvb.frontend = mt352_attach(&amp;dvico_fusionhdtv_dual,</div><div class='del'>-						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='del'>-		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_ZL10353</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:</div><div class='hunk'>@@ -601,12 +658,20 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_thomson_fe6600;</div><div class='ctx'> 		dev-&gt;dvb.frontend = zl10353_attach(&amp;dvico_fusionhdtv_hybrid,</div><div class='ctx'> 						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_OR51132</div><div class='ctx'> 	case CX88_BOARD_PCHDTV_HD3000:</div><div class='ctx'> 		dev-&gt;dvb.frontend = or51132_attach(&amp;pchdtv_hd3000,</div><div class='ctx'> 						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_thomson_dtt761x);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_LGDT330X</div><div class='hunk'>@@ -627,6 +692,9 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_microtune_4042;</div><div class='ctx'> 		dev-&gt;dvb.frontend = lgdt330x_attach(&amp;fusionhdtv_3_gold,</div><div class='ctx'> 						    &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = lgdt3302_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T:</div><div class='hunk'>@@ -643,6 +711,9 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_thomson_dtt761x;</div><div class='ctx'> 		dev-&gt;dvb.frontend = lgdt330x_attach(&amp;fusionhdtv_3_gold,</div><div class='ctx'> 						    &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = lgdt3302_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:</div><div class='hunk'>@@ -655,10 +726,28 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 		mdelay(100);</div><div class='ctx'> 		cx_set(MO_GP0_IO, 1);</div><div class='ctx'> 		mdelay(200);</div><div class='del'>-		dev-&gt;core-&gt;pll_addr = 0x61;</div><div class='del'>-		dev-&gt;core-&gt;pll_desc = &amp;dvb_pll_tdvs_tua6034;</div><div class='ctx'> 		dev-&gt;dvb.frontend = lgdt330x_attach(&amp;fusionhdtv_5_gold,</div><div class='ctx'> 						    &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = lgdt3303_tuner_set_params;</div><div class='add'>+		}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_PCHDTV_HD5500:</div><div class='add'>+		dev-&gt;ts_gen_cntrl = 0x08;</div><div class='add'>+		{</div><div class='add'>+		/* Do a hardware reset of chip before using it. */</div><div class='add'>+		struct cx88_core *core = dev-&gt;core;</div><div class='add'>+</div><div class='add'>+		cx_clear(MO_GP0_IO, 1);</div><div class='add'>+		mdelay(100);</div><div class='add'>+		cx_set(MO_GP0_IO, 1);</div><div class='add'>+		mdelay(200);</div><div class='add'>+		dev-&gt;dvb.frontend = lgdt330x_attach(&amp;pchdtv_hd5500,</div><div class='add'>+						    &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = lgdt3303_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -666,6 +755,11 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_ATI_HDTVWONDER:</div><div class='ctx'> 		dev-&gt;dvb.frontend = nxt200x_attach(&amp;ati_hdtvwonder,</div><div class='ctx'> 						 &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend != NULL) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61,</div><div class='add'>+				       &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       &amp;dvb_pll_tuv1236d);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_CX24123</div><div class='hunk'>@@ -673,10 +767,26 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:</div><div class='ctx'> 		dev-&gt;dvb.frontend = cx24123_attach(&amp;hauppauge_novas_config,</div><div class='ctx'> 			&amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			isl6421_attach(dev-&gt;dvb.frontend, &amp;dev-&gt;core-&gt;i2c_adap,</div><div class='add'>+				       0x08, 0x00, 0x00);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_KWORLD_DVBS_100:</div><div class='ctx'> 		dev-&gt;dvb.frontend = cx24123_attach(&amp;kworld_dvbs_100_config,</div><div class='ctx'> 			&amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;core-&gt;prev_set_voltage = dev-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.set_voltage = kworld_dvbs_100_set_voltage;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CX88_BOARD_GENIATECH_DVBS:</div><div class='add'>+		dev-&gt;dvb.frontend = cx24123_attach(&amp;geniatech_dvbs_config,</div><div class='add'>+						   &amp;dev-&gt;core-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;core-&gt;prev_set_voltage = dev-&gt;dvb.frontend-&gt;ops.set_voltage;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.set_voltage = geniatech_dvbs_set_voltage;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -690,15 +800,15 @@ static int dvb_register(struct cx8802_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;core-&gt;pll_desc) {</div><div class='del'>-		dev-&gt;dvb.frontend-&gt;ops-&gt;info.frequency_min = dev-&gt;core-&gt;pll_desc-&gt;min;</div><div class='del'>-		dev-&gt;dvb.frontend-&gt;ops-&gt;info.frequency_max = dev-&gt;core-&gt;pll_desc-&gt;max;</div><div class='add'>+		dev-&gt;dvb.frontend-&gt;ops.info.frequency_min = dev-&gt;core-&gt;pll_desc-&gt;min;</div><div class='add'>+		dev-&gt;dvb.frontend-&gt;ops.info.frequency_max = dev-&gt;core-&gt;pll_desc-&gt;max;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Put the analog decoder in standby to keep it quiet */</div><div class='ctx'> 	cx88_call_i2c_clients (dev-&gt;core, TUNER_SET_STANDBY, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* register everything */</div><div class='del'>-	return videobuf_dvb_register(&amp;dev-&gt;dvb, THIS_MODULE, dev);</div><div class='add'>+	return videobuf_dvb_register(&amp;dev-&gt;dvb, THIS_MODULE, dev, &amp;dev-&gt;pci-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c<br/>index f720901e9638..70663805cc30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-i2c.c</a></div><div class='hunk'>@@ -138,13 +138,13 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (core-&gt;dvbdev) {</div><div class='del'>-		if (core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops-&gt;i2c_gate_ctrl)</div><div class='del'>-			core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops-&gt;i2c_gate_ctrl(core-&gt;dvbdev-&gt;dvb.frontend, 1);</div><div class='add'>+		if (core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(core-&gt;dvbdev-&gt;dvb.frontend, 1);</div><div class='ctx'> </div><div class='ctx'> 		i2c_clients_command(&amp;core-&gt;i2c_adap, cmd, arg);</div><div class='ctx'> </div><div class='del'>-		if (core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops-&gt;i2c_gate_ctrl)</div><div class='del'>-			core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops-&gt;i2c_gate_ctrl(core-&gt;dvbdev-&gt;dvb.frontend, 0);</div><div class='add'>+		if (core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+			core-&gt;dvbdev-&gt;dvb.frontend-&gt;ops.i2c_gate_ctrl(core-&gt;dvbdev-&gt;dvb.frontend, 0);</div><div class='ctx'> 	} else</div><div class='ctx'> 		i2c_clients_command(&amp;core-&gt;i2c_adap, cmd, arg);</div><div class='ctx'> }</div><div class='hunk'>@@ -234,7 +234,6 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(cx88_call_i2c_clients);</div><div class='del'>-EXPORT_SYMBOL(cx88_i2c_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c<br/>index 78a63b7dd380..72b630a91f41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-input.c</a></div><div class='hunk'>@@ -70,14 +70,33 @@ MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");</div><div class='ctx'> static void cx88_ir_handle_key(struct cx88_IR *ir)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_core *core = ir-&gt;core;</div><div class='del'>-	u32 gpio, data;</div><div class='add'>+	u32 gpio, data, auxgpio;</div><div class='ctx'> </div><div class='ctx'> 	/* read gpio value */</div><div class='ctx'> 	gpio = cx_read(ir-&gt;gpio_addr);</div><div class='add'>+	if (core-&gt;board == CX88_BOARD_NPGTECH_REALTV_TOP10FM) {</div><div class='add'>+		/* This board apparently uses a combination of 2 GPIO</div><div class='add'>+		   to represent the keys. Additionally, the second GPIO</div><div class='add'>+		   can be used for parity.</div><div class='add'>+</div><div class='add'>+		   Example:</div><div class='add'>+</div><div class='add'>+		   for key "5"</div><div class='add'>+			gpio = 0x758, auxgpio = 0xe5 or 0xf5</div><div class='add'>+		   for key "Power"</div><div class='add'>+			gpio = 0x758, auxgpio = 0xed or 0xfd</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		auxgpio = cx_read(MO_GP1_IO);</div><div class='add'>+		/* Take out the parity part */</div><div class='add'>+		gpio+=(gpio &amp; 0x7fd) + (auxgpio &amp; 0xef);</div><div class='add'>+	} else</div><div class='add'>+		auxgpio = gpio;</div><div class='add'>+</div><div class='ctx'> 	if (ir-&gt;polling) {</div><div class='del'>-		if (ir-&gt;last_gpio == gpio)</div><div class='add'>+		if (ir-&gt;last_gpio == auxgpio)</div><div class='ctx'> 			return;</div><div class='del'>-		ir-&gt;last_gpio = gpio;</div><div class='add'>+		ir-&gt;last_gpio = auxgpio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* extract data */</div><div class='hunk'>@@ -172,12 +191,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> 		ir_type = IR_TYPE_RC5;</div><div class='ctx'> 		ir-&gt;sampling = 1;</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_WINFAST_DTV2000H:</div><div class='ctx'> 	case CX88_BOARD_WINFAST2000XP_EXPERT:</div><div class='ctx'> 		ir_codes = ir_codes_winfast;</div><div class='ctx'> 		ir-&gt;gpio_addr = MO_GP0_IO;</div><div class='ctx'> 		ir-&gt;mask_keycode = 0x8f8;</div><div class='ctx'> 		ir-&gt;mask_keyup = 0x100;</div><div class='del'>-		ir-&gt;polling = 1; /* ms */</div><div class='add'>+		ir-&gt;polling = 50; /* ms */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CX88_BOARD_IODATA_GVBCTV7E:</div><div class='ctx'> 		ir_codes = ir_codes_iodata_bctv7e;</div><div class='hunk'>@@ -228,6 +248,12 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)</div><div class='ctx'> 		ir_type = IR_TYPE_PD;</div><div class='ctx'> 		ir-&gt;sampling = 0xff00; /* address */</div><div class='ctx'> 		break;</div><div class='add'>+	case CX88_BOARD_NPGTECH_REALTV_TOP10FM:</div><div class='add'>+		ir_codes = ir_codes_npgtech;</div><div class='add'>+		ir-&gt;gpio_addr = MO_GP0_IO;</div><div class='add'>+		ir-&gt;mask_keycode = 0xfa;</div><div class='add'>+		ir-&gt;polling = 50; /* ms */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (NULL == ir_codes) {</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c<br/>index 7d16888b4a86..138a4f692501 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-mpeg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-mpeg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-mpeg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-mpeg.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_core *core = dev-&gt;core;</div><div class='ctx'> </div><div class='del'>-	dprintk(0, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev-&gt;width, dev-&gt;height, buf-&gt;vb.field);</div><div class='add'>+	dprintk(1, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev-&gt;width, dev-&gt;height, buf-&gt;vb.field);</div><div class='ctx'> </div><div class='ctx'> 	/* setup fifo + format */</div><div class='ctx'> 	cx88_sram_channel_setup(core, &amp;cx88_sram_channels[SRAM_CH28],</div><div class='hunk'>@@ -76,6 +76,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,</div><div class='ctx'> 		case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:</div><div class='ctx'> 		case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T:</div><div class='ctx'> 		case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:</div><div class='add'>+		case CX88_BOARD_PCHDTV_HD5500:</div><div class='ctx'> 			cx_write(TS_SOP_STAT, 1&lt;&lt;13);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:</div><div class='hunk'>@@ -109,7 +110,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,</div><div class='ctx'> 	q-&gt;count = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* enable irqs */</div><div class='del'>-	dprintk( 0, "setting the interrupt mask\n" );</div><div class='add'>+	dprintk( 1, "setting the interrupt mask\n" );</div><div class='ctx'> 	cx_set(MO_PCI_INTMSK, core-&gt;pci_irqmask | 0x04);</div><div class='ctx'> 	cx_set(MO_TS_INTMSK,  0x1f0011);</div><div class='ctx'> </div><div class='hunk'>@@ -122,7 +123,7 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,</div><div class='ctx'> static int cx8802_stop_dma(struct cx8802_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cx88_core *core = dev-&gt;core;</div><div class='del'>-	dprintk( 0, "cx8802_stop_dma\n" );</div><div class='add'>+	dprintk( 1, "cx8802_stop_dma\n" );</div><div class='ctx'> </div><div class='ctx'> 	/* stop dma */</div><div class='ctx'> 	cx_clear(MO_TS_DMACNTRL, 0x11);</div><div class='hunk'>@@ -142,10 +143,43 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,</div><div class='ctx'> 	struct cx88_buffer *buf;</div><div class='ctx'> 	struct list_head *item;</div><div class='ctx'> </div><div class='del'>-	dprintk( 0, "cx8802_restart_queue\n" );</div><div class='add'>+       dprintk( 1, "cx8802_restart_queue\n" );</div><div class='ctx'> 	if (list_empty(&amp;q-&gt;active))</div><div class='ctx'> 	{</div><div class='del'>-		dprintk( 0, "cx8802_restart_queue: queue is empty\n" );</div><div class='add'>+	       struct cx88_buffer *prev;</div><div class='add'>+	       prev = NULL;</div><div class='add'>+</div><div class='add'>+	       dprintk(1, "cx8802_restart_queue: queue is empty\n" );</div><div class='add'>+</div><div class='add'>+	       for (;;) {</div><div class='add'>+		       if (list_empty(&amp;q-&gt;queued))</div><div class='add'>+			       return 0;</div><div class='add'>+		       buf = list_entry(q-&gt;queued.next, struct cx88_buffer, vb.queue);</div><div class='add'>+		       if (NULL == prev) {</div><div class='add'>+			       list_del(&amp;buf-&gt;vb.queue);</div><div class='add'>+			       list_add_tail(&amp;buf-&gt;vb.queue,&amp;q-&gt;active);</div><div class='add'>+			       cx8802_start_dma(dev, q, buf);</div><div class='add'>+			       buf-&gt;vb.state = STATE_ACTIVE;</div><div class='add'>+			       buf-&gt;count    = q-&gt;count++;</div><div class='add'>+			       mod_timer(&amp;q-&gt;timeout, jiffies+BUFFER_TIMEOUT);</div><div class='add'>+			       dprintk(1,"[%p/%d] restart_queue - first active\n",</div><div class='add'>+				       buf,buf-&gt;vb.i);</div><div class='add'>+</div><div class='add'>+		       } else if (prev-&gt;vb.width  == buf-&gt;vb.width  &amp;&amp;</div><div class='add'>+				  prev-&gt;vb.height == buf-&gt;vb.height &amp;&amp;</div><div class='add'>+				  prev-&gt;fmt       == buf-&gt;fmt) {</div><div class='add'>+			       list_del(&amp;buf-&gt;vb.queue);</div><div class='add'>+			       list_add_tail(&amp;buf-&gt;vb.queue,&amp;q-&gt;active);</div><div class='add'>+			       buf-&gt;vb.state = STATE_ACTIVE;</div><div class='add'>+			       buf-&gt;count    = q-&gt;count++;</div><div class='add'>+			       prev-&gt;risc.jmp[1] = cpu_to_le32(buf-&gt;risc.dma);</div><div class='add'>+			       dprintk(1,"[%p/%d] restart_queue - move to active\n",</div><div class='add'>+				       buf,buf-&gt;vb.i);</div><div class='add'>+		       } else {</div><div class='add'>+			       return 0;</div><div class='add'>+		       }</div><div class='add'>+		       prev = buf;</div><div class='add'>+	       }</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -204,13 +238,13 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)</div><div class='ctx'> 	buf-&gt;risc.jmp[1] = cpu_to_le32(cx88q-&gt;stopper.dma);</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;cx88q-&gt;active)) {</div><div class='del'>-		dprintk( 0, "queue is empty - first active\n" );</div><div class='add'>+		dprintk( 1, "queue is empty - first active\n" );</div><div class='ctx'> 		list_add_tail(&amp;buf-&gt;vb.queue,&amp;cx88q-&gt;active);</div><div class='ctx'> 		cx8802_start_dma(dev, cx88q, buf);</div><div class='ctx'> 		buf-&gt;vb.state = STATE_ACTIVE;</div><div class='ctx'> 		buf-&gt;count    = cx88q-&gt;count++;</div><div class='ctx'> 		mod_timer(&amp;cx88q-&gt;timeout, jiffies+BUFFER_TIMEOUT);</div><div class='del'>-		dprintk(0,"[%p/%d] %s - first active\n",</div><div class='add'>+		dprintk(1,"[%p/%d] %s - first active\n",</div><div class='ctx'> 			buf, buf-&gt;vb.i, __FUNCTION__);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -244,7 +278,7 @@ static void do_cancel_buffers(struct cx8802_dev *dev, char *reason, int restart)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (restart)</div><div class='ctx'> 	{</div><div class='del'>-		dprintk(0, "restarting queue\n" );</div><div class='add'>+		dprintk(1, "restarting queue\n" );</div><div class='ctx'> 		cx8802_restart_queue(dev,q);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;dev-&gt;slock,flags);</div><div class='hunk'>@@ -386,9 +420,9 @@ int cx8802_init_common(struct cx8802_dev *dev)</div><div class='ctx'> 	pci_read_config_byte(dev-&gt;pci, PCI_CLASS_REVISION, &amp;dev-&gt;pci_rev);</div><div class='ctx'> 	pci_read_config_byte(dev-&gt;pci, PCI_LATENCY_TIMER,  &amp;dev-&gt;pci_lat);</div><div class='ctx'> 	printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, "</div><div class='del'>-	       "latency: %d, mmio: 0x%lx\n", dev-&gt;core-&gt;name,</div><div class='add'>+	       "latency: %d, mmio: 0x%llx\n", dev-&gt;core-&gt;name,</div><div class='ctx'> 	       pci_name(dev-&gt;pci), dev-&gt;pci_rev, dev-&gt;pci-&gt;irq,</div><div class='del'>-	       dev-&gt;pci_lat,pci_resource_start(dev-&gt;pci,0));</div><div class='add'>+	       dev-&gt;pci_lat,(unsigned long long)pci_resource_start(dev-&gt;pci,0));</div><div class='ctx'> </div><div class='ctx'> 	/* initialize driver struct */</div><div class='ctx'> 	spin_lock_init(&amp;dev-&gt;slock);</div><div class='hunk'>@@ -404,7 +438,7 @@ int cx8802_init_common(struct cx8802_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* get irq */</div><div class='ctx'> 	err = request_irq(dev-&gt;pci-&gt;irq, cx8802_irq,</div><div class='del'>-			  SA_SHIRQ | SA_INTERRUPT, dev-&gt;core-&gt;name, dev);</div><div class='add'>+			  IRQF_SHARED | IRQF_DISABLED, dev-&gt;core-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: can't get IRQ %d\n",</div><div class='ctx'> 		       dev-&gt;core-&gt;name, dev-&gt;pci-&gt;irq);</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c<br/>index 641a0c5a6490..5785c3481579 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-tvaudio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-tvaudio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-tvaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-tvaudio.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cx88.h"</div><div class='hunk'>@@ -137,21 +138,28 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)</div><div class='ctx'> {</div><div class='ctx'> 	u32 volume;</div><div class='ctx'> </div><div class='del'>-#ifndef USING_CX88_ALSA</div><div class='add'>+#ifndef CONFIG_VIDEO_CX88_ALSA</div><div class='ctx'> 	/* restart dma; This avoids buzz in NICAM and is good in others  */</div><div class='ctx'> 	cx88_stop_audio_dma(core);</div><div class='ctx'> #endif</div><div class='ctx'> 	cx_write(AUD_RATE_THRES_DMD, 0x000000C0);</div><div class='del'>-#ifndef USING_CX88_ALSA</div><div class='add'>+#ifndef CONFIG_VIDEO_CX88_ALSA</div><div class='ctx'> 	cx88_start_audio_dma(core);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (cx88_boards[core-&gt;board].blackbird) {</div><div class='ctx'> 		/* sets sound input from external adc */</div><div class='del'>-		if (core-&gt;board == CX88_BOARD_HAUPPAUGE_ROSLYN)</div><div class='add'>+		switch (core-&gt;board) {</div><div class='add'>+		case CX88_BOARD_HAUPPAUGE_ROSLYN:</div><div class='add'>+		case CX88_BOARD_KWORLD_MCE200_DELUXE:</div><div class='add'>+		case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:</div><div class='add'>+		case CX88_BOARD_PIXELVIEW_PLAYTV_P7000:</div><div class='add'>+		case CX88_BOARD_ASUS_PVR_416:</div><div class='ctx'> 			cx_clear(AUD_CTL, EN_I2SIN_ENABLE);</div><div class='del'>-		else</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='ctx'> 			cx_set(AUD_CTL, EN_I2SIN_ENABLE);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		cx_write(AUD_I2SINPUTCNTL, 4);</div><div class='ctx'> 		cx_write(AUD_BAUDRATE, 1);</div><div class='hunk'>@@ -718,7 +726,7 @@ static void set_audio_standard_FM(struct cx88_core *core,</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-int cx88_detect_nicam(struct cx88_core *core)</div><div class='add'>+static int cx88_detect_nicam(struct cx88_core *core)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c<br/>index 846faadc9f1c..aa2a69770098 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-vbi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-vbi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-vbi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-vbi.c</a></div><div class='hunk'>@@ -34,8 +34,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)</div><div class='ctx'> 	if (dev-&gt;core-&gt;tvnorm-&gt;id &amp; V4L2_STD_525_60) {</div><div class='ctx'> 		/* ntsc */</div><div class='ctx'> 		f-&gt;fmt.vbi.sampling_rate = 28636363;</div><div class='del'>-		f-&gt;fmt.vbi.start[0] = 10 -1;</div><div class='del'>-		f-&gt;fmt.vbi.start[1] = 273 -1;</div><div class='add'>+		f-&gt;fmt.vbi.start[0] = 10;</div><div class='add'>+		f-&gt;fmt.vbi.start[1] = 273;</div><div class='ctx'> </div><div class='ctx'> 	} else if (dev-&gt;core-&gt;tvnorm-&gt;id &amp; V4L2_STD_625_50) {</div><div class='ctx'> 		/* pal */</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c<br/>index 694d1d80ff3f..2225d4b94140 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-video.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88-video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88-video.c</a></div><div class='hunk'>@@ -327,6 +327,51 @@ static struct cx88_ctrl cx8800_ctls[] = {</div><div class='ctx'> };</div><div class='ctx'> static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);</div><div class='ctx'> </div><div class='add'>+const u32 cx88_user_ctrls[] = {</div><div class='add'>+	V4L2_CID_USER_CLASS,</div><div class='add'>+	V4L2_CID_BRIGHTNESS,</div><div class='add'>+	V4L2_CID_CONTRAST,</div><div class='add'>+	V4L2_CID_SATURATION,</div><div class='add'>+	V4L2_CID_HUE,</div><div class='add'>+	V4L2_CID_AUDIO_VOLUME,</div><div class='add'>+	V4L2_CID_AUDIO_BALANCE,</div><div class='add'>+	V4L2_CID_AUDIO_MUTE,</div><div class='add'>+	0</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(cx88_user_ctrls);</div><div class='add'>+</div><div class='add'>+static const u32 *ctrl_classes[] = {</div><div class='add'>+	cx88_user_ctrls,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (qctrl-&gt;id &lt; V4L2_CID_BASE ||</div><div class='add'>+	    qctrl-&gt;id &gt;= V4L2_CID_LASTP1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; CX8800_CTLS; i++)</div><div class='add'>+		if (cx8800_ctls[i].v.id == qctrl-&gt;id)</div><div class='add'>+			break;</div><div class='add'>+	if (i == CX8800_CTLS) {</div><div class='add'>+		*qctrl = no_ctl;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	*qctrl = cx8800_ctls[i].v;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cx8800_ctrl_query);</div><div class='add'>+</div><div class='add'>+static int cx88_queryctrl(struct v4l2_queryctrl *qctrl)</div><div class='add'>+{</div><div class='add'>+	qctrl-&gt;id = v4l2_ctrl_next(ctrl_classes, qctrl-&gt;id);</div><div class='add'>+	if (qctrl-&gt;id == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return cx8800_ctrl_query(qctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ------------------------------------------------------------------- */</div><div class='ctx'> /* resource management                                                 */</div><div class='ctx'> </div><div class='hunk'>@@ -494,8 +539,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		buf = list_entry(q-&gt;queued.next, struct cx88_buffer, vb.queue);</div><div class='ctx'> 		if (NULL == prev) {</div><div class='del'>-			list_del(&amp;buf-&gt;vb.queue);</div><div class='del'>-			list_add_tail(&amp;buf-&gt;vb.queue,&amp;q-&gt;active);</div><div class='add'>+			list_move_tail(&amp;buf-&gt;vb.queue, &amp;q-&gt;active);</div><div class='ctx'> 			start_video_dma(dev, q, buf);</div><div class='ctx'> 			buf-&gt;vb.state = STATE_ACTIVE;</div><div class='ctx'> 			buf-&gt;count    = q-&gt;count++;</div><div class='hunk'>@@ -506,8 +550,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,</div><div class='ctx'> 		} else if (prev-&gt;vb.width  == buf-&gt;vb.width  &amp;&amp;</div><div class='ctx'> 			   prev-&gt;vb.height == buf-&gt;vb.height &amp;&amp;</div><div class='ctx'> 			   prev-&gt;fmt       == buf-&gt;fmt) {</div><div class='del'>-			list_del(&amp;buf-&gt;vb.queue);</div><div class='del'>-			list_add_tail(&amp;buf-&gt;vb.queue,&amp;q-&gt;active);</div><div class='add'>+			list_move_tail(&amp;buf-&gt;vb.queue, &amp;q-&gt;active);</div><div class='ctx'> 			buf-&gt;vb.state = STATE_ACTIVE;</div><div class='ctx'> 			buf-&gt;count    = q-&gt;count++;</div><div class='ctx'> 			prev-&gt;risc.jmp[1] = cpu_to_le32(buf-&gt;risc.dma);</div><div class='hunk'>@@ -1364,20 +1407,8 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,</div><div class='ctx'> 	case VIDIOC_QUERYCTRL:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_queryctrl *c = arg;</div><div class='del'>-		int i;</div><div class='ctx'> </div><div class='del'>-		if (c-&gt;id &lt;  V4L2_CID_BASE ||</div><div class='del'>-		    c-&gt;id &gt;= V4L2_CID_LASTP1)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		for (i = 0; i &lt; CX8800_CTLS; i++)</div><div class='del'>-			if (cx8800_ctls[i].v.id == c-&gt;id)</div><div class='del'>-				break;</div><div class='del'>-		if (i == CX8800_CTLS) {</div><div class='del'>-			*c = no_ctl;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		*c = cx8800_ctls[i].v;</div><div class='del'>-		return 0;</div><div class='add'>+		return cx88_queryctrl(c);</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='ctx'> 		return get_control(core,arg);</div><div class='hunk'>@@ -1849,9 +1880,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> 	pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &amp;dev-&gt;pci_rev);</div><div class='ctx'> 	pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &amp;dev-&gt;pci_lat);</div><div class='ctx'> 	printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "</div><div class='del'>-	       "latency: %d, mmio: 0x%lx\n", core-&gt;name,</div><div class='add'>+	       "latency: %d, mmio: 0x%llx\n", core-&gt;name,</div><div class='ctx'> 	       pci_name(pci_dev), dev-&gt;pci_rev, pci_dev-&gt;irq,</div><div class='del'>-	       dev-&gt;pci_lat,pci_resource_start(pci_dev,0));</div><div class='add'>+	       dev-&gt;pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci_dev);</div><div class='ctx'> 	if (!pci_dma_supported(pci_dev,0xffffffff)) {</div><div class='hunk'>@@ -1884,7 +1915,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> </div><div class='ctx'> 	/* get irq */</div><div class='ctx'> 	err = request_irq(pci_dev-&gt;irq, cx8800_irq,</div><div class='del'>-			  SA_SHIRQ | SA_INTERRUPT, core-&gt;name, dev);</div><div class='add'>+			  IRQF_SHARED | IRQF_DISABLED, core-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: can't get IRQ %d\n",</div><div class='ctx'> 		       core-&gt;name,pci_dev-&gt;irq);</div><div class='hunk'>@@ -1895,8 +1926,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> 	/* load and configure helper modules */</div><div class='ctx'> 	if (TUNER_ABSENT != core-&gt;tuner_type)</div><div class='ctx'> 		request_module("tuner");</div><div class='del'>-	if (core-&gt;tda9887_conf)</div><div class='del'>-		request_module("tda9887");</div><div class='ctx'> </div><div class='ctx'> 	/* register v4l devices */</div><div class='ctx'> 	dev-&gt;video_dev = cx88_vdev_init(core,dev-&gt;pci,</div><div class='head'>diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h<br/>index 326a25f147f6..e7810955dd4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/cx88/cx88.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/cx88/cx88.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/cx88/cx88.h</a></div><div class='hunk'>@@ -25,9 +25,11 @@</div><div class='ctx'> #include &lt;linux/videodev2.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/tuner.h&gt;</div><div class='ctx'> #include &lt;media/tveeprom.h&gt;</div><div class='ctx'> #include &lt;media/video-buf.h&gt;</div><div class='add'>+#include &lt;media/cx2341x.h&gt;</div><div class='ctx'> #include &lt;media/video-buf-dvb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "btcx-risc.h"</div><div class='hunk'>@@ -35,7 +37,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)</div><div class='add'>+#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)</div><div class='ctx'> </div><div class='ctx'> #ifndef TRUE</div><div class='ctx'> # define TRUE (1==1)</div><div class='hunk'>@@ -189,6 +191,12 @@ extern struct sram_channel cx88_sram_channels[];</div><div class='ctx'> #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44</div><div class='ctx'> #define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45</div><div class='ctx'> #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46</div><div class='add'>+#define CX88_BOARD_PCHDTV_HD5500           47</div><div class='add'>+#define CX88_BOARD_KWORLD_MCE200_DELUXE    48</div><div class='add'>+#define CX88_BOARD_PIXELVIEW_PLAYTV_P7000  49</div><div class='add'>+#define CX88_BOARD_NPGTECH_REALTV_TOP10FM  50</div><div class='add'>+#define CX88_BOARD_WINFAST_DTV2000H        51</div><div class='add'>+#define CX88_BOARD_GENIATECH_DVBS          52</div><div class='ctx'> </div><div class='ctx'> enum cx88_itype {</div><div class='ctx'> 	CX88_VMUX_COMPOSITE1 = 1,</div><div class='hunk'>@@ -296,6 +304,7 @@ struct cx88_core {</div><div class='ctx'> 	/* config info -- dvb */</div><div class='ctx'> 	struct dvb_pll_desc        *pll_desc;</div><div class='ctx'> 	unsigned int               pll_addr;</div><div class='add'>+	int 			   (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);</div><div class='ctx'> </div><div class='ctx'> 	/* state info */</div><div class='ctx'> 	struct task_struct         *kthread;</div><div class='hunk'>@@ -391,14 +400,6 @@ struct cx8802_suspend_state {</div><div class='ctx'> 	int                        disabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* TODO: move this to struct v4l2_mpeg_compression ? */</div><div class='del'>-struct blackbird_dnr {</div><div class='del'>-	u32                       mode;</div><div class='del'>-	u32                       type;</div><div class='del'>-	u32                       spatial;</div><div class='del'>-	u32                       temporal;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct cx8802_dev {</div><div class='ctx'> 	struct cx88_core           *core;</div><div class='ctx'> 	spinlock_t                 slock;</div><div class='hunk'>@@ -432,8 +433,7 @@ struct cx8802_dev {</div><div class='ctx'> 	unsigned char              ts_gen_cntrl;</div><div class='ctx'> </div><div class='ctx'> 	/* mpeg params */</div><div class='del'>-	struct v4l2_mpeg_compression params;</div><div class='del'>-	struct blackbird_dnr       dnr_params;</div><div class='add'>+	struct cx2341x_mpeg_params params;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='hunk'>@@ -564,7 +564,6 @@ void cx88_newstation(struct cx88_core *core);</div><div class='ctx'> void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t);</div><div class='ctx'> void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual);</div><div class='ctx'> int cx88_audio_thread(void *data);</div><div class='del'>-int cx88_detect_nicam(struct cx88_core *core);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='ctx'> /* cx88-input.c                                                */</div><div class='hunk'>@@ -592,16 +591,8 @@ int cx8802_resume_common(struct pci_dev *pci_dev);</div><div class='ctx'> extern int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,</div><div class='ctx'> 				struct cx88_core *core, unsigned int cmd,</div><div class='ctx'> 				void *arg, v4l2_kioctl driver_ioctl);</div><div class='del'>-</div><div class='del'>-/* ----------------------------------------------------------- */</div><div class='del'>-/* cx88-blackbird.c                                            */</div><div class='del'>-extern int (*cx88_ioctl_hook)(struct inode *inode, struct file *file,</div><div class='del'>-				unsigned int cmd, void *arg);</div><div class='del'>-extern unsigned int (*cx88_ioctl_translator)(unsigned int cmd);</div><div class='del'>-void blackbird_set_params(struct cx8802_dev *dev,</div><div class='del'>-				struct v4l2_mpeg_compression *params);</div><div class='del'>-void blackbird_set_dnr_params(struct cx8802_dev *dev,</div><div class='del'>-				struct blackbird_dnr* dnr_params);</div><div class='add'>+extern const u32 cx88_user_ctrls[];</div><div class='add'>+extern int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/media/video/dsbr100.c b/drivers/media/video/dsbr100.c<br/>index 3b4e9985c3d7..f7e33f9ee8e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/dsbr100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/dsbr100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/dsbr100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/dsbr100.c</a></div><div class='hunk'>@@ -72,6 +72,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c<br/>index 3ba3439db580..ed882ebc7b95 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/em28xx/em28xx-cards.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'>    Copyright (C) 2005 Ludovico Cavedon &lt;cavedon@sssup.it&gt;</div><div class='ctx'> 		      Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='del'>-		      Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+		      Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'> 		      Sascha Sommer &lt;saschasommer@freenet.de&gt;</div><div class='ctx'> </div><div class='ctx'>    This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -29,6 +29,8 @@</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;media/tuner.h&gt;</div><div class='ctx'> #include &lt;media/msp3400.h&gt;</div><div class='add'>+#include &lt;media/saa7115.h&gt;</div><div class='add'>+#include &lt;media/tvp5150.h&gt;</div><div class='ctx'> #include &lt;media/tveeprom.h&gt;</div><div class='ctx'> #include &lt;media/audiochip.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='hunk'>@@ -46,11 +48,11 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input           = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -64,11 +66,11 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input           = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -82,11 +84,11 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input           = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -100,15 +102,15 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 2,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE2,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -122,15 +124,15 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 2,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE2,</div><div class='ctx'> 			.amux     = 0,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -146,11 +148,11 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		/*FIXME: S-Video not tested */</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = TVP5150_COMPOSITE0,</div><div class='ctx'> 			.amux     = MSP_INPUT_DEFAULT,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 2,</div><div class='add'>+			.vmux     = TVP5150_SVIDEO,</div><div class='ctx'> 			.amux     = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,</div><div class='ctx'> 					MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),</div><div class='ctx'> 		}},</div><div class='hunk'>@@ -165,15 +167,15 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder        = EM28XX_SAA7114,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 4,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE4,</div><div class='ctx'> 			.amux     = 0,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -188,15 +190,15 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 2,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE2,</div><div class='ctx'> 			.amux     = 0,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -211,15 +213,15 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 2,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE2,</div><div class='ctx'> 			.amux     = 0,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -234,15 +236,15 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_TELEVISION,</div><div class='del'>-			.vmux     = 2,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE2,</div><div class='ctx'> 			.amux     = 0,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -254,11 +256,11 @@ struct em28xx_board em28xx_boards[] = {</div><div class='ctx'> 		.decoder      = EM28XX_SAA7113,</div><div class='ctx'> 		.input          = {{</div><div class='ctx'> 			.type     = EM28XX_VMUX_COMPOSITE1,</div><div class='del'>-			.vmux     = 0,</div><div class='add'>+			.vmux     = SAA7115_COMPOSITE0,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		},{</div><div class='ctx'> 			.type     = EM28XX_VMUX_SVIDEO,</div><div class='del'>-			.vmux     = 9,</div><div class='add'>+			.vmux     = SAA7115_SVIDEO3,</div><div class='ctx'> 			.amux     = 1,</div><div class='ctx'> 		}},</div><div class='ctx'> 	},</div><div class='hunk'>@@ -324,8 +326,4 @@ void em28xx_card_setup(struct em28xx *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(em28xx_boards);</div><div class='del'>-EXPORT_SYMBOL(em28xx_bcount);</div><div class='del'>-EXPORT_SYMBOL(em28xx_id_table);</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE (usb, em28xx_id_table);</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c<br/>index e5ee8bceb210..4350cc75b025 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/em28xx/em28xx-core.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'>    Copyright (C) 2005 Ludovico Cavedon &lt;cavedon@sssup.it&gt;</div><div class='ctx'> 		      Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='del'>-		      Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+		      Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'> 		      Sascha Sommer &lt;saschasommer@freenet.de&gt;</div><div class='ctx'> </div><div class='ctx'>    This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -317,8 +317,8 @@ int em28xx_outfmt_set_yuv422(struct em28xx *dev)</div><div class='ctx'> 	return em28xx_write_regs(dev, VINCTRL_REG, "\x11", 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,</div><div class='del'>-				  u8 ymax)</div><div class='add'>+static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax,</div><div class='add'>+				  u8 ymin, u8 ymax)</div><div class='ctx'> {</div><div class='ctx'> 	em28xx_coredbg("em28xx Scale: (%d,%d)-(%d,%d)\n", xmin, ymin, xmax, ymax);</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +328,7 @@ int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,</div><div class='ctx'> 	return em28xx_write_regs(dev, YMAX_REG, &amp;ymax, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,</div><div class='add'>+static int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,</div><div class='ctx'> 				   u16 width, u16 height)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cwidth = width;</div><div class='hunk'>@@ -345,7 +345,7 @@ int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,</div><div class='ctx'> 	return em28xx_write_regs(dev, OFLOW_REG, &amp;overflow, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)</div><div class='add'>+static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mode;</div><div class='ctx'> 	/* the em2800 scaler only supports scaling down to 50% */</div><div class='hunk'>@@ -534,7 +534,7 @@ static inline void em28xx_isoc_video_copy(struct em28xx *dev,</div><div class='ctx'>  * em28xx_isoIrq()</div><div class='ctx'>  * handles the incoming isoc urbs and fills the frames from our inqueue</div><div class='ctx'>  */</div><div class='del'>-void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+static void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct em28xx *dev = urb-&gt;context;</div><div class='ctx'> 	int i, status;</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c<br/>index 5b6cece37aee..d829d8f8c1f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/em28xx/em28xx-i2c.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'>    Copyright (C) 2005 Ludovico Cavedon &lt;cavedon@sssup.it&gt;</div><div class='ctx'> 		      Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='del'>-		      Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+		      Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'> 		      Sascha Sommer &lt;saschasommer@freenet.de&gt;</div><div class='ctx'> </div><div class='ctx'>    This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -399,17 +399,6 @@ static u32 functionality(struct i2c_adapter *adap)</div><div class='ctx'> 	return I2C_FUNC_SMBUS_EMUL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef I2C_PEC</div><div class='del'>-static void inc_use(struct i2c_adapter *adap)</div><div class='del'>-{</div><div class='del'>-	MOD_INC_USE_COUNT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dec_use(struct i2c_adapter *adap)</div><div class='del'>-{</div><div class='del'>-	MOD_DEC_USE_COUNT;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int em28xx_set_tuner(int check_eeprom, struct i2c_client *client)</div><div class='ctx'> {</div><div class='hunk'>@@ -436,9 +425,19 @@ static int attach_inform(struct i2c_client *client)</div><div class='ctx'> 	struct em28xx *dev = client-&gt;adapter-&gt;algo_data;</div><div class='ctx'> </div><div class='ctx'> 	switch (client-&gt;addr &lt;&lt; 1) {</div><div class='del'>-		case 0x86:</div><div class='add'>+		case 0x43:</div><div class='add'>+		case 0x4b:</div><div class='add'>+		{</div><div class='add'>+			struct tuner_setup tun_setup;</div><div class='add'>+</div><div class='add'>+			tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;</div><div class='add'>+			tun_setup.type = TUNER_TDA9887;</div><div class='add'>+			tun_setup.addr = client-&gt;addr;</div><div class='add'>+</div><div class='add'>+			em28xx_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &amp;tun_setup);</div><div class='ctx'> 			em28xx_i2c_call_clients(dev, TDA9887_SET_CONFIG, &amp;dev-&gt;tda9887_conf);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 		case 0x42:</div><div class='ctx'> 			dprintk1(1,"attach_inform: saa7114 detected.\n");</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -464,6 +463,7 @@ static int attach_inform(struct i2c_client *client)</div><div class='ctx'> 		case 0xba:</div><div class='ctx'> 			dprintk1(1,"attach_inform: tvp5150 detected.\n");</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			dprintk1(1,"attach inform: detected I2C address %x\n", client-&gt;addr &lt;&lt; 1);</div><div class='ctx'> 			dev-&gt;tuner_addr = client-&gt;addr;</div><div class='hunk'>@@ -480,12 +480,7 @@ static struct i2c_algorithm em28xx_algo = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct i2c_adapter em28xx_adap_template = {</div><div class='del'>-#ifdef I2C_PEC</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='del'>-#else</div><div class='del'>-	.inc_use = inc_use,</div><div class='del'>-	.dec_use = dec_use,</div><div class='del'>-#endif</div><div class='ctx'> 	.class = I2C_CLASS_TV_ANALOG,</div><div class='ctx'> 	.name = "em28xx",</div><div class='ctx'> 	.id = I2C_HW_B_EM28XX,</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c<br/>index 31e89e4f18be..3ffb5684f127 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/em28xx/em28xx-input.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'>    Copyright (C) 2005 Ludovico Cavedon &lt;cavedon@sssup.it&gt;</div><div class='ctx'> 		      Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='del'>-		      Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+		      Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'> 		      Sascha Sommer &lt;saschasommer@freenet.de&gt;</div><div class='ctx'> </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -105,7 +105,7 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_key_pinnacle_usb(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='add'>+static int get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[3];</div><div class='ctx'> </div><div class='hunk'>@@ -148,8 +148,8 @@ void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)</div><div class='ctx'> 		snprintf(ir-&gt;c.name, sizeof(ir-&gt;c.name), "i2c IR (EM28XX Terratec)");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case (EM2820_BOARD_PINNACLE_USB_2):</div><div class='del'>-		ir-&gt;ir_codes = ir_codes_em_pinnacle_usb;</div><div class='del'>-		ir-&gt;get_key = get_key_pinnacle_usb;</div><div class='add'>+		ir-&gt;ir_codes = ir_codes_pinnacle_grey;</div><div class='add'>+		ir-&gt;get_key = get_key_pinnacle_usb_grey;</div><div class='ctx'> 		snprintf(ir-&gt;c.name, sizeof(ir-&gt;c.name), "i2c IR (EM28XX Pinnacle PCTV)");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c<br/>index cf7cdf9ef617..2a461dde480c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-video.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx-video.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx-video.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/em28xx/em28xx-video.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'>    Copyright (C) 2005 Ludovico Cavedon &lt;cavedon@sssup.it&gt;</div><div class='ctx'> 		      Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='del'>-		      Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+		      Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'> 		      Sascha Sommer &lt;saschasommer@freenet.de&gt;</div><div class='ctx'> </div><div class='ctx'> 	Some parts based on SN9C10x PC Camera Controllers GPL driver made</div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_AUTHOR "Ludovico Cavedon &lt;cavedon@sssup.it&gt;, " \</div><div class='ctx'> 		      "Markus Rechberger &lt;mrechberger@gmail.com&gt;, " \</div><div class='del'>-		      "Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;, " \</div><div class='add'>+		      "Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;, " \</div><div class='ctx'> 		      "Sascha Sommer &lt;saschasommer@freenet.de&gt;"</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME         "em28xx"</div><div class='hunk'>@@ -170,8 +170,12 @@ static int em28xx_config(struct em28xx *dev)</div><div class='ctx'> static void em28xx_config_i2c(struct em28xx *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct v4l2_frequency f;</div><div class='add'>+	struct v4l2_routing route;</div><div class='add'>+</div><div class='add'>+	route.input = INPUT(dev-&gt;ctl_input)-&gt;vmux;</div><div class='add'>+	route.output = 0;</div><div class='ctx'> 	em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);</div><div class='del'>-	em28xx_i2c_call_clients(dev, VIDIOC_S_INPUT, &amp;dev-&gt;ctl_input);</div><div class='add'>+	em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &amp;route);</div><div class='ctx'> 	em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* configure tuner */</div><div class='hunk'>@@ -206,19 +210,19 @@ static void em28xx_empty_framequeues(struct em28xx *dev)</div><div class='ctx'> </div><div class='ctx'> static void video_mux(struct em28xx *dev, int index)</div><div class='ctx'> {</div><div class='del'>-	int input, ainput;</div><div class='add'>+	int ainput;</div><div class='add'>+	struct v4l2_routing route;</div><div class='ctx'> </div><div class='del'>-	input = INPUT(index)-&gt;vmux;</div><div class='add'>+	route.input = INPUT(index)-&gt;vmux;</div><div class='add'>+	route.output = 0;</div><div class='ctx'> 	dev-&gt;ctl_input = index;</div><div class='ctx'> 	dev-&gt;ctl_ainput = INPUT(index)-&gt;amux;</div><div class='ctx'> </div><div class='del'>-	em28xx_i2c_call_clients(dev, VIDIOC_S_INPUT, &amp;input);</div><div class='add'>+	em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &amp;route);</div><div class='ctx'> </div><div class='del'>-	em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev-&gt;ctl_ainput);</div><div class='add'>+	em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,route.input,dev-&gt;ctl_ainput);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;has_msp34xx) {</div><div class='del'>-		struct v4l2_routing route;</div><div class='del'>-</div><div class='ctx'> 		if (dev-&gt;i2s_speed)</div><div class='ctx'> 			em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &amp;dev-&gt;i2s_speed);</div><div class='ctx'> 		route.input = dev-&gt;ctl_ainput;</div><div class='hunk'>@@ -1570,8 +1574,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,</div><div class='ctx'> 		request_module("tvp5150");</div><div class='ctx'> 	if (dev-&gt;has_tuner)</div><div class='ctx'> 		request_module("tuner");</div><div class='del'>-	if (dev-&gt;tda9887_conf)</div><div class='del'>-		request_module("tda9887");</div><div class='ctx'> #endif</div><div class='ctx'> 	errCode = em28xx_config(dev);</div><div class='ctx'> 	if (errCode) {</div><div class='head'>diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h<br/>index e1ddc2f27a21..d8fcc9e17ac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/em28xx/em28xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/em28xx/em28xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/em28xx/em28xx.h</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'> </div><div class='ctx'>    Copyright (C) 2005 Markus Rechberger &lt;mrechberger@gmail.com&gt;</div><div class='ctx'> 		      Ludovico Cavedon &lt;cavedon@sssup.it&gt;</div><div class='del'>-		      Mauro Carvalho Chehab &lt;mchehab@brturbo.com.br&gt;</div><div class='add'>+		      Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;</div><div class='ctx'> </div><div class='ctx'>    Based on the em2800 driver from Sascha Sommer &lt;saschasommer@freenet.de&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -319,13 +319,7 @@ int em28xx_audio_analog_set(struct em28xx *dev);</div><div class='ctx'> int em28xx_colorlevels_set_default(struct em28xx *dev);</div><div class='ctx'> int em28xx_capture_start(struct em28xx *dev, int start);</div><div class='ctx'> int em28xx_outfmt_set_yuv422(struct em28xx *dev);</div><div class='del'>-int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,</div><div class='del'>-			   u8 ymax);</div><div class='del'>-int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,</div><div class='del'>-			    u16 width, u16 height);</div><div class='del'>-int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v);</div><div class='ctx'> int em28xx_resolution_set(struct em28xx *dev);</div><div class='del'>-void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs);</div><div class='ctx'> int em28xx_init_isoc(struct em28xx *dev);</div><div class='ctx'> void em28xx_uninit_isoc(struct em28xx *dev);</div><div class='ctx'> int em28xx_set_alternate(struct em28xx *dev);</div><div class='head'>diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c<br/>index dfc9dd732c9d..8992b6e62b9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/et61x251/et61x251_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/et61x251/et61x251_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/et61x251/et61x251_core.c</a></div><div class='hunk'>@@ -2341,11 +2341,9 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='ctx'> 		return et61x251_vidioc_g_ctrl(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_S_CTRL_OLD:</div><div class='ctx'> 	case VIDIOC_S_CTRL:</div><div class='ctx'> 		return et61x251_vidioc_s_ctrl(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_CROPCAP_OLD:</div><div class='ctx'> 	case VIDIOC_CROPCAP:</div><div class='ctx'> 		return et61x251_vidioc_cropcap(cam, arg);</div><div class='ctx'> </div><div class='hunk'>@@ -2392,7 +2390,6 @@ static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 	case VIDIOC_G_PARM:</div><div class='ctx'> 		return et61x251_vidioc_g_parm(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_S_PARM_OLD:</div><div class='ctx'> 	case VIDIOC_S_PARM:</div><div class='ctx'> 		return et61x251_vidioc_s_parm(cam, arg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c<br/>index 7e66d83fe0ce..fba30a40e9c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ir-kbd-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ir-kbd-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ir-kbd-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/ir-kbd-i2c.c</a></div><div class='hunk'>@@ -150,12 +150,11 @@ static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The new pinnacle PCTV remote (with the colored buttons)</div><div class='add'>+/* Common (grey or coloured) pinnacle PCTV remote handling</div><div class='ctx'>  *</div><div class='del'>- * Ricardo Cerqueira &lt;v4l@cerqueira.org&gt;</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='add'>+static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,</div><div class='add'>+			    int parity_offset, int marker, int code_modulo)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char b[4];</div><div class='ctx'> 	unsigned int start = 0,parity = 0,code = 0;</div><div class='hunk'>@@ -167,9 +166,9 @@ int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (start = 0; start&lt;4; start++) {</div><div class='del'>-		if (b[start] == 0x80) {</div><div class='del'>-			code=b[(start+3)%4];</div><div class='del'>-			parity=b[(start+2)%4];</div><div class='add'>+		if (b[start] == marker) {</div><div class='add'>+			code=b[(start+parity_offset+1)%4];</div><div class='add'>+			parity=b[(start+parity_offset)%4];</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -181,16 +180,14 @@ int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> 	if (ir-&gt;old == parity)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	ir-&gt;old = parity;</div><div class='ctx'> </div><div class='del'>-	/* Reduce code value to fit inside IR_KEYTAB_SIZE</div><div class='del'>-	 *</div><div class='del'>-	 * this is the only value that results in 42 unique</div><div class='del'>-	 * codes &lt; 128</div><div class='del'>-	 */</div><div class='add'>+	/* drop special codes when a key is held down a long time for the grey controller</div><div class='add'>+	   In this case, the second bit of the code is asserted */</div><div class='add'>+	if (marker == 0xfe &amp;&amp; (code &amp; 0x40))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	code %= 0x88;</div><div class='add'>+	code %= code_modulo;</div><div class='ctx'> </div><div class='ctx'> 	*ir_raw = code;</div><div class='ctx'> 	*ir_key = code;</div><div class='hunk'>@@ -200,7 +197,40 @@ int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(get_key_pinnacle);</div><div class='add'>+/* The grey pinnacle PCTV remote</div><div class='add'>+ *</div><div class='add'>+ *  There are one issue with this remote:</div><div class='add'>+ *   - I2c packet does not change when the same key is pressed quickly. The workaround</div><div class='add'>+ *     is to hold down each key for about half a second, so that another code is generated</div><div class='add'>+ *     in the i2c packet, and the function can distinguish key presses.</div><div class='add'>+ *</div><div class='add'>+ * Sylvain Pasche &lt;sylvain.pasche@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+int get_key_pinnacle_grey(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	return get_key_pinnacle(ir, ir_key, ir_raw, 1, 0xfe, 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(get_key_pinnacle_grey);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* The new pinnacle PCTV remote (with the colored buttons)</div><div class='add'>+ *</div><div class='add'>+ * Ricardo Cerqueira &lt;v4l@cerqueira.org&gt;</div><div class='add'>+ */</div><div class='add'>+int get_key_pinnacle_color(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)</div><div class='add'>+{</div><div class='add'>+	/* code_modulo parameter (0x88) is used to reduce code value to fit inside IR_KEYTAB_SIZE</div><div class='add'>+	 *</div><div class='add'>+	 * this is the only value that results in 42 unique</div><div class='add'>+	 * codes &lt; 128</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return get_key_pinnacle(ir, ir_key, ir_raw, 2, 0x80, 0x88);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(get_key_pinnacle_color);</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c<br/>new file mode 100644<br/>index 000000000000..3bf7ac4f5288<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ks0127.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/ks0127.c</a></div><div class='hunk'>@@ -0,0 +1,846 @@</div><div class='add'>+/*</div><div class='add'>+ * Video Capture Driver (Video for Linux 1/2)</div><div class='add'>+ * for the Matrox Marvel G200,G400 and Rainbow Runner-G series</div><div class='add'>+ *</div><div class='add'>+ * This module is an interface to the KS0127 video decoder chip.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1999  Ryan Drake &lt;stiletto@mediaone.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Modified and extended by</div><div class='add'>+ *	Mike Bernson &lt;mike@mlb.org&gt;</div><div class='add'>+ *	Gerard v.d. Horst</div><div class='add'>+ *	Leon van Stuivenberg &lt;l.vanstuivenberg@chello.nl&gt;</div><div class='add'>+ *	Gernot Ziegler &lt;gz@lysator.liu.se&gt;</div><div class='add'>+ *</div><div class='add'>+ * Version History:</div><div class='add'>+ * V1.0 Ryan Drake	   Initial version by Ryan Drake</div><div class='add'>+ * V1.1 Gerard v.d. Horst  Added some debugoutput, reset the video-standard</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __KERNEL__</div><div class='add'>+#define __KERNEL__</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include "ks0127.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/video_decoder.h&gt;</div><div class='add'>+</div><div class='add'>+#define dprintk     if (debug) printk</div><div class='add'>+</div><div class='add'>+/* i2c identification */</div><div class='add'>+#define I2C_KS0127_ADDON   0xD8</div><div class='add'>+#define I2C_KS0127_ONBOARD 0xDA</div><div class='add'>+</div><div class='add'>+#define KS_TYPE_UNKNOWN	0</div><div class='add'>+#define KS_TYPE_0122S	1</div><div class='add'>+#define KS_TYPE_0127	2</div><div class='add'>+#define KS_TYPE_0127B	3</div><div class='add'>+</div><div class='add'>+/* ks0127 control registers */</div><div class='add'>+#define KS_STAT     0x00</div><div class='add'>+#define KS_CMDA     0x01</div><div class='add'>+#define KS_CMDB     0x02</div><div class='add'>+#define KS_CMDC     0x03</div><div class='add'>+#define KS_CMDD     0x04</div><div class='add'>+#define KS_HAVB     0x05</div><div class='add'>+#define KS_HAVE     0x06</div><div class='add'>+#define KS_HS1B     0x07</div><div class='add'>+#define KS_HS1E     0x08</div><div class='add'>+#define KS_HS2B     0x09</div><div class='add'>+#define KS_HS2E     0x0a</div><div class='add'>+#define KS_AGC      0x0b</div><div class='add'>+#define KS_HXTRA    0x0c</div><div class='add'>+#define KS_CDEM     0x0d</div><div class='add'>+#define KS_PORTAB   0x0e</div><div class='add'>+#define KS_LUMA     0x0f</div><div class='add'>+#define KS_CON      0x10</div><div class='add'>+#define KS_BRT      0x11</div><div class='add'>+#define KS_CHROMA   0x12</div><div class='add'>+#define KS_CHROMB   0x13</div><div class='add'>+#define KS_DEMOD    0x14</div><div class='add'>+#define KS_SAT      0x15</div><div class='add'>+#define KS_HUE      0x16</div><div class='add'>+#define KS_VERTIA   0x17</div><div class='add'>+#define KS_VERTIB   0x18</div><div class='add'>+#define KS_VERTIC   0x19</div><div class='add'>+#define KS_HSCLL    0x1a</div><div class='add'>+#define KS_HSCLH    0x1b</div><div class='add'>+#define KS_VSCLL    0x1c</div><div class='add'>+#define KS_VSCLH    0x1d</div><div class='add'>+#define KS_OFMTA    0x1e</div><div class='add'>+#define KS_OFMTB    0x1f</div><div class='add'>+#define KS_VBICTL   0x20</div><div class='add'>+#define KS_CCDAT2   0x21</div><div class='add'>+#define KS_CCDAT1   0x22</div><div class='add'>+#define KS_VBIL30   0x23</div><div class='add'>+#define KS_VBIL74   0x24</div><div class='add'>+#define KS_VBIL118  0x25</div><div class='add'>+#define KS_VBIL1512 0x26</div><div class='add'>+#define KS_TTFRAM   0x27</div><div class='add'>+#define KS_TESTA    0x28</div><div class='add'>+#define KS_UVOFFH   0x29</div><div class='add'>+#define KS_UVOFFL   0x2a</div><div class='add'>+#define KS_UGAIN    0x2b</div><div class='add'>+#define KS_VGAIN    0x2c</div><div class='add'>+#define KS_VAVB     0x2d</div><div class='add'>+#define KS_VAVE     0x2e</div><div class='add'>+#define KS_CTRACK   0x2f</div><div class='add'>+#define KS_POLCTL   0x30</div><div class='add'>+#define KS_REFCOD   0x31</div><div class='add'>+#define KS_INVALY   0x32</div><div class='add'>+#define KS_INVALU   0x33</div><div class='add'>+#define KS_INVALV   0x34</div><div class='add'>+#define KS_UNUSEY   0x35</div><div class='add'>+#define KS_UNUSEU   0x36</div><div class='add'>+#define KS_UNUSEV   0x37</div><div class='add'>+#define KS_USRSAV   0x38</div><div class='add'>+#define KS_USREAV   0x39</div><div class='add'>+#define KS_SHS1A    0x3a</div><div class='add'>+#define KS_SHS1B    0x3b</div><div class='add'>+#define KS_SHS1C    0x3c</div><div class='add'>+#define KS_CMDE     0x3d</div><div class='add'>+#define KS_VSDEL    0x3e</div><div class='add'>+#define KS_CMDF     0x3f</div><div class='add'>+#define KS_GAMMA0   0x40</div><div class='add'>+#define KS_GAMMA1   0x41</div><div class='add'>+#define KS_GAMMA2   0x42</div><div class='add'>+#define KS_GAMMA3   0x43</div><div class='add'>+#define KS_GAMMA4   0x44</div><div class='add'>+#define KS_GAMMA5   0x45</div><div class='add'>+#define KS_GAMMA6   0x46</div><div class='add'>+#define KS_GAMMA7   0x47</div><div class='add'>+#define KS_GAMMA8   0x48</div><div class='add'>+#define KS_GAMMA9   0x49</div><div class='add'>+#define KS_GAMMA10  0x4a</div><div class='add'>+#define KS_GAMMA11  0x4b</div><div class='add'>+#define KS_GAMMA12  0x4c</div><div class='add'>+#define KS_GAMMA13  0x4d</div><div class='add'>+#define KS_GAMMA14  0x4e</div><div class='add'>+#define KS_GAMMA15  0x4f</div><div class='add'>+#define KS_GAMMA16  0x50</div><div class='add'>+#define KS_GAMMA17  0x51</div><div class='add'>+#define KS_GAMMA18  0x52</div><div class='add'>+#define KS_GAMMA19  0x53</div><div class='add'>+#define KS_GAMMA20  0x54</div><div class='add'>+#define KS_GAMMA21  0x55</div><div class='add'>+#define KS_GAMMA22  0x56</div><div class='add'>+#define KS_GAMMA23  0x57</div><div class='add'>+#define KS_GAMMA24  0x58</div><div class='add'>+#define KS_GAMMA25  0x59</div><div class='add'>+#define KS_GAMMA26  0x5a</div><div class='add'>+#define KS_GAMMA27  0x5b</div><div class='add'>+#define KS_GAMMA28  0x5c</div><div class='add'>+#define KS_GAMMA29  0x5d</div><div class='add'>+#define KS_GAMMA30  0x5e</div><div class='add'>+#define KS_GAMMA31  0x5f</div><div class='add'>+#define KS_GAMMAD0  0x60</div><div class='add'>+#define KS_GAMMAD1  0x61</div><div class='add'>+#define KS_GAMMAD2  0x62</div><div class='add'>+#define KS_GAMMAD3  0x63</div><div class='add'>+#define KS_GAMMAD4  0x64</div><div class='add'>+#define KS_GAMMAD5  0x65</div><div class='add'>+#define KS_GAMMAD6  0x66</div><div class='add'>+#define KS_GAMMAD7  0x67</div><div class='add'>+#define KS_GAMMAD8  0x68</div><div class='add'>+#define KS_GAMMAD9  0x69</div><div class='add'>+#define KS_GAMMAD10 0x6a</div><div class='add'>+#define KS_GAMMAD11 0x6b</div><div class='add'>+#define KS_GAMMAD12 0x6c</div><div class='add'>+#define KS_GAMMAD13 0x6d</div><div class='add'>+#define KS_GAMMAD14 0x6e</div><div class='add'>+#define KS_GAMMAD15 0x6f</div><div class='add'>+#define KS_GAMMAD16 0x70</div><div class='add'>+#define KS_GAMMAD17 0x71</div><div class='add'>+#define KS_GAMMAD18 0x72</div><div class='add'>+#define KS_GAMMAD19 0x73</div><div class='add'>+#define KS_GAMMAD20 0x74</div><div class='add'>+#define KS_GAMMAD21 0x75</div><div class='add'>+#define KS_GAMMAD22 0x76</div><div class='add'>+#define KS_GAMMAD23 0x77</div><div class='add'>+#define KS_GAMMAD24 0x78</div><div class='add'>+#define KS_GAMMAD25 0x79</div><div class='add'>+#define KS_GAMMAD26 0x7a</div><div class='add'>+#define KS_GAMMAD27 0x7b</div><div class='add'>+#define KS_GAMMAD28 0x7c</div><div class='add'>+#define KS_GAMMAD29 0x7d</div><div class='add'>+#define KS_GAMMAD30 0x7e</div><div class='add'>+#define KS_GAMMAD31 0x7f</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+* mga_dev : represents one ks0127 chip.</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+struct adjust {</div><div class='add'>+	int	contrast;</div><div class='add'>+	int	bright;</div><div class='add'>+	int	hue;</div><div class='add'>+	int	ugain;</div><div class='add'>+	int	vgain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ks0127 {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	unsigned char	addr;</div><div class='add'>+	int		format_width;</div><div class='add'>+	int		format_height;</div><div class='add'>+	int		cap_width;</div><div class='add'>+	int		cap_height;</div><div class='add'>+	int		norm;</div><div class='add'>+	int		ks_type;</div><div class='add'>+	u8 		regs[256];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int debug; /* insmod parameter */</div><div class='add'>+</div><div class='add'>+module_param(debug, int, 0);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug output");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static u8 reg_defaults[64];</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void init_reg_defaults(void)</div><div class='add'>+{</div><div class='add'>+	u8 *table = reg_defaults;</div><div class='add'>+</div><div class='add'>+	table[KS_CMDA]     = 0x2c;  /* VSE=0, CCIR 601, autodetect standard */</div><div class='add'>+	table[KS_CMDB]     = 0x12;  /* VALIGN=0, AGC control and input */</div><div class='add'>+	table[KS_CMDC]     = 0x00;  /* Test options */</div><div class='add'>+	/* clock &amp; input select, write 1 to PORTA */</div><div class='add'>+	table[KS_CMDD]     = 0x01;</div><div class='add'>+	table[KS_HAVB]     = 0x00;  /* HAV Start Control */</div><div class='add'>+	table[KS_HAVE]     = 0x00;  /* HAV End Control */</div><div class='add'>+	table[KS_HS1B]     = 0x10;  /* HS1 Start Control */</div><div class='add'>+	table[KS_HS1E]     = 0x00;  /* HS1 End Control */</div><div class='add'>+	table[KS_HS2B]     = 0x00;  /* HS2 Start Control */</div><div class='add'>+	table[KS_HS2E]     = 0x00;  /* HS2 End Control */</div><div class='add'>+	table[KS_AGC]      = 0x53;  /* Manual setting for AGC */</div><div class='add'>+	table[KS_HXTRA]    = 0x00;  /* Extra Bits for HAV and HS1/2 */</div><div class='add'>+	table[KS_CDEM]     = 0x00;  /* Chroma Demodulation Control */</div><div class='add'>+	table[KS_PORTAB]   = 0x0f;  /* port B is input, port A output GPPORT */</div><div class='add'>+	table[KS_LUMA]     = 0x01;  /* Luma control */</div><div class='add'>+	table[KS_CON]      = 0x00;  /* Contrast Control */</div><div class='add'>+	table[KS_BRT]      = 0x00;  /* Brightness Control */</div><div class='add'>+	table[KS_CHROMA]   = 0x2a;  /* Chroma control A */</div><div class='add'>+	table[KS_CHROMB]   = 0x90;  /* Chroma control B */</div><div class='add'>+	table[KS_DEMOD]    = 0x00;  /* Chroma Demodulation Control &amp; Status */</div><div class='add'>+	table[KS_SAT]      = 0x00;  /* Color Saturation Control*/</div><div class='add'>+	table[KS_HUE]      = 0x00;  /* Hue Control */</div><div class='add'>+	table[KS_VERTIA]   = 0x00;  /* Vertical Processing Control A */</div><div class='add'>+	/* Vertical Processing Control B, luma 1 line delayed */</div><div class='add'>+	table[KS_VERTIB]   = 0x12;</div><div class='add'>+	table[KS_VERTIC]   = 0x0b;  /* Vertical Processing Control C */</div><div class='add'>+	table[KS_HSCLL]    = 0x00;  /* Horizontal Scaling Ratio Low */</div><div class='add'>+	table[KS_HSCLH]    = 0x00;  /* Horizontal Scaling Ratio High */</div><div class='add'>+	table[KS_VSCLL]    = 0x00;  /* Vertical Scaling Ratio Low */</div><div class='add'>+	table[KS_VSCLH]    = 0x00;  /* Vertical Scaling Ratio High */</div><div class='add'>+	/* 16 bit YCbCr 4:2:2 output; I can't make the bt866 like 8 bit /Sam */</div><div class='add'>+	table[KS_OFMTA]    = 0x30;</div><div class='add'>+	table[KS_OFMTB]    = 0x00;  /* Output Control B */</div><div class='add'>+	/* VBI Decoder Control; 4bit fmt: avoid Y overflow */</div><div class='add'>+	table[KS_VBICTL]   = 0x5d;</div><div class='add'>+	table[KS_CCDAT2]   = 0x00;  /* Read Only register */</div><div class='add'>+	table[KS_CCDAT1]   = 0x00;  /* Read Only register */</div><div class='add'>+	table[KS_VBIL30]   = 0xa8;  /* VBI data decoding options */</div><div class='add'>+	table[KS_VBIL74]   = 0xaa;  /* VBI data decoding options */</div><div class='add'>+	table[KS_VBIL118]  = 0x2a;  /* VBI data decoding options */</div><div class='add'>+	table[KS_VBIL1512] = 0x00;  /* VBI data decoding options */</div><div class='add'>+	table[KS_TTFRAM]   = 0x00;  /* Teletext frame alignment pattern */</div><div class='add'>+	table[KS_TESTA]    = 0x00;  /* test register, shouldn't be written */</div><div class='add'>+	table[KS_UVOFFH]   = 0x00;  /* UV Offset Adjustment High */</div><div class='add'>+	table[KS_UVOFFL]   = 0x00;  /* UV Offset Adjustment Low */</div><div class='add'>+	table[KS_UGAIN]    = 0x00;  /* U Component Gain Adjustment */</div><div class='add'>+	table[KS_VGAIN]    = 0x00;  /* V Component Gain Adjustment */</div><div class='add'>+	table[KS_VAVB]     = 0x07;  /* VAV Begin */</div><div class='add'>+	table[KS_VAVE]     = 0x00;  /* VAV End */</div><div class='add'>+	table[KS_CTRACK]   = 0x00;  /* Chroma Tracking Control */</div><div class='add'>+	table[KS_POLCTL]   = 0x41;  /* Timing Signal Polarity Control */</div><div class='add'>+	table[KS_REFCOD]   = 0x80;  /* Reference Code Insertion Control */</div><div class='add'>+	table[KS_INVALY]   = 0x10;  /* Invalid Y Code */</div><div class='add'>+	table[KS_INVALU]   = 0x80;  /* Invalid U Code */</div><div class='add'>+	table[KS_INVALV]   = 0x80;  /* Invalid V Code */</div><div class='add'>+	table[KS_UNUSEY]   = 0x10;  /* Unused Y Code */</div><div class='add'>+	table[KS_UNUSEU]   = 0x80;  /* Unused U Code */</div><div class='add'>+	table[KS_UNUSEV]   = 0x80;  /* Unused V Code */</div><div class='add'>+	table[KS_USRSAV]   = 0x00;  /* reserved */</div><div class='add'>+	table[KS_USREAV]   = 0x00;  /* reserved */</div><div class='add'>+	table[KS_SHS1A]    = 0x00;  /* User Defined SHS1 A */</div><div class='add'>+	/* User Defined SHS1 B, ALT656=1 on 0127B */</div><div class='add'>+	table[KS_SHS1B]    = 0x80;</div><div class='add'>+	table[KS_SHS1C]    = 0x00;  /* User Defined SHS1 C */</div><div class='add'>+	table[KS_CMDE]     = 0x00;  /* Command Register E */</div><div class='add'>+	table[KS_VSDEL]    = 0x00;  /* VS Delay Control */</div><div class='add'>+	/* Command Register F, update -immediately- */</div><div class='add'>+	/* (there might come no vsync)*/</div><div class='add'>+	table[KS_CMDF]     = 0x02;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* We need to manually read because of a bug in the KS0127 chip.</div><div class='add'>+ *</div><div class='add'>+ * An explanation from kayork@mail.utexas.edu:</div><div class='add'>+ *</div><div class='add'>+ * During I2C reads, the KS0127 only samples for a stop condition</div><div class='add'>+ * during the place where the acknoledge bit should be. Any standard</div><div class='add'>+ * I2C implementation (correctly) throws in another clock transition</div><div class='add'>+ * at the 9th bit, and the KS0127 will not recognize the stop condition</div><div class='add'>+ * and will continue to clock out data.</div><div class='add'>+ *</div><div class='add'>+ * So we have to do the read ourself.  Big deal.</div><div class='add'>+	   workaround in i2c-algo-bit</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static u8 ks0127_read(struct ks0127 *ks, u8 reg)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *c = ks-&gt;client;</div><div class='add'>+	char val = 0;</div><div class='add'>+	struct i2c_msg msgs[] = {</div><div class='add'>+		{c-&gt;addr, 0, sizeof(reg), &amp;reg},</div><div class='add'>+		{c-&gt;addr, I2C_M_RD | I2C_M_NO_RD_ACK, sizeof(val), &amp;val}};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(c-&gt;adapter, msgs, ARRAY_SIZE(msgs));</div><div class='add'>+	if (ret != ARRAY_SIZE(msgs))</div><div class='add'>+		dprintk("ks0127_write error\n");</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void ks0127_write(struct ks0127 *ks, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	char msg[] = {reg, val};</div><div class='add'>+</div><div class='add'>+	if (i2c_master_send(ks-&gt;client, msg, sizeof(msg)) != sizeof(msg))</div><div class='add'>+		dprintk("ks0127_write error\n");</div><div class='add'>+</div><div class='add'>+	ks-&gt;regs[reg] = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* generic bit-twiddling */</div><div class='add'>+static void ks0127_and_or(struct ks0127 *ks, u8 reg, u8 and_v, u8 or_v)</div><div class='add'>+{</div><div class='add'>+	u8 val = ks-&gt;regs[reg];</div><div class='add'>+	val = (val &amp; and_v) | or_v;</div><div class='add'>+	ks0127_write(ks, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/****************************************************************************</div><div class='add'>+* ks0127 private api</div><div class='add'>+****************************************************************************/</div><div class='add'>+static void ks0127_reset(struct ks0127* ks)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 *table = reg_defaults;</div><div class='add'>+</div><div class='add'>+	ks-&gt;ks_type = KS_TYPE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	dprintk("ks0127: reset\n");</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	/* initialize all registers to known values */</div><div class='add'>+	/* (except STAT, 0x21, 0x22, TEST and 0x38,0x39) */</div><div class='add'>+</div><div class='add'>+	for(i = 1; i &lt; 33; i++)</div><div class='add'>+		ks0127_write(ks, i, table[i]);</div><div class='add'>+</div><div class='add'>+	for(i = 35; i &lt; 40; i++)</div><div class='add'>+		ks0127_write(ks, i, table[i]);</div><div class='add'>+</div><div class='add'>+	for(i = 41; i &lt; 56; i++)</div><div class='add'>+		ks0127_write(ks, i, table[i]);</div><div class='add'>+</div><div class='add'>+	for(i = 58; i &lt; 64; i++)</div><div class='add'>+		ks0127_write(ks, i, table[i]);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if ((ks0127_read(ks, KS_STAT) &amp; 0x80) == 0) {</div><div class='add'>+		ks-&gt;ks_type = KS_TYPE_0122S;</div><div class='add'>+		dprintk("ks0127: ks0122s Found\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch(ks0127_read(ks, KS_CMDE) &amp; 0x0f) {</div><div class='add'>+</div><div class='add'>+	case 0:</div><div class='add'>+		ks-&gt;ks_type = KS_TYPE_0127;</div><div class='add'>+		dprintk("ks0127: ks0127 found\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 9:</div><div class='add'>+		ks-&gt;ks_type = KS_TYPE_0127B;</div><div class='add'>+		dprintk("ks0127: ks0127B Revision A found\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dprintk("ks0127: unknown revision\n");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks0127_command(struct i2c_client *client,</div><div class='add'>+			  unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	int		*iarg = (int*)arg;</div><div class='add'>+</div><div class='add'>+	int		status;</div><div class='add'>+</div><div class='add'>+	if (!ks)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+</div><div class='add'>+	case DECODER_INIT:</div><div class='add'>+		dprintk("ks0127: command DECODER_INIT\n");</div><div class='add'>+		ks0127_reset(ks);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DECODER_SET_INPUT:</div><div class='add'>+		switch(*iarg) {</div><div class='add'>+		case KS_INPUT_COMPOSITE_1:</div><div class='add'>+		case KS_INPUT_COMPOSITE_2:</div><div class='add'>+		case KS_INPUT_COMPOSITE_3:</div><div class='add'>+		case KS_INPUT_COMPOSITE_4:</div><div class='add'>+		case KS_INPUT_COMPOSITE_5:</div><div class='add'>+		case KS_INPUT_COMPOSITE_6:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_INPUT %d: "</div><div class='add'>+				"Composite\n", *iarg);</div><div class='add'>+			/* autodetect 50/60 Hz */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDA,   0xfc, 0x00);</div><div class='add'>+			/* VSE=0 */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDA,   ~0x40, 0x00);</div><div class='add'>+			/* set input line */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDB,   0xb0, *iarg);</div><div class='add'>+			/* non-freerunning mode */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDC,   0x70, 0x0a);</div><div class='add'>+			/* analog input */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDD,   0x03, 0x00);</div><div class='add'>+			/* enable chroma demodulation */</div><div class='add'>+			ks0127_and_or(ks, KS_CTRACK, 0xcf, 0x00);</div><div class='add'>+			/* chroma trap, HYBWR=1 */</div><div class='add'>+			ks0127_and_or(ks, KS_LUMA,   0x00,</div><div class='add'>+				       (reg_defaults[KS_LUMA])|0x0c);</div><div class='add'>+			/* scaler fullbw, luma comb off */</div><div class='add'>+			ks0127_and_or(ks, KS_VERTIA, 0x08, 0x81);</div><div class='add'>+			/* manual chroma comb .25 .5 .25 */</div><div class='add'>+			ks0127_and_or(ks, KS_VERTIC, 0x0f, 0x90);</div><div class='add'>+</div><div class='add'>+			/* chroma path delay */</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMB, 0x0f, 0x90);</div><div class='add'>+</div><div class='add'>+			ks0127_write(ks, KS_UGAIN, reg_defaults[KS_UGAIN]);</div><div class='add'>+			ks0127_write(ks, KS_VGAIN, reg_defaults[KS_VGAIN]);</div><div class='add'>+			ks0127_write(ks, KS_UVOFFH, reg_defaults[KS_UVOFFH]);</div><div class='add'>+			ks0127_write(ks, KS_UVOFFL, reg_defaults[KS_UVOFFL]);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case KS_INPUT_SVIDEO_1:</div><div class='add'>+		case KS_INPUT_SVIDEO_2:</div><div class='add'>+		case KS_INPUT_SVIDEO_3:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_INPUT %d: "</div><div class='add'>+				"S-Video\n", *iarg);</div><div class='add'>+			/* autodetect 50/60 Hz */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDA,   0xfc, 0x00);</div><div class='add'>+			/* VSE=0 */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDA,   ~0x40, 0x00);</div><div class='add'>+			/* set input line */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDB,   0xb0, *iarg);</div><div class='add'>+			/* non-freerunning mode */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDC,   0x70, 0x0a);</div><div class='add'>+			/* analog input */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDD,   0x03, 0x00);</div><div class='add'>+			/* enable chroma demodulation */</div><div class='add'>+			ks0127_and_or(ks, KS_CTRACK, 0xcf, 0x00);</div><div class='add'>+			ks0127_and_or(ks, KS_LUMA, 0x00,</div><div class='add'>+				       reg_defaults[KS_LUMA]);</div><div class='add'>+			/* disable luma comb */</div><div class='add'>+			ks0127_and_or(ks, KS_VERTIA, 0x08,</div><div class='add'>+				       (reg_defaults[KS_VERTIA]&amp;0xf0)|0x01);</div><div class='add'>+			ks0127_and_or(ks, KS_VERTIC, 0x0f,</div><div class='add'>+				       reg_defaults[KS_VERTIC]&amp;0xf0);</div><div class='add'>+</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMB, 0x0f,</div><div class='add'>+				       reg_defaults[KS_CHROMB]&amp;0xf0);</div><div class='add'>+</div><div class='add'>+			ks0127_write(ks, KS_UGAIN, reg_defaults[KS_UGAIN]);</div><div class='add'>+			ks0127_write(ks, KS_VGAIN, reg_defaults[KS_VGAIN]);</div><div class='add'>+			ks0127_write(ks, KS_UVOFFH, reg_defaults[KS_UVOFFH]);</div><div class='add'>+			ks0127_write(ks, KS_UVOFFL, reg_defaults[KS_UVOFFL]);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case KS_INPUT_YUV656:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_INPUT 15: "</div><div class='add'>+				"YUV656\n");</div><div class='add'>+			if (ks-&gt;norm == VIDEO_MODE_NTSC ||</div><div class='add'>+			    ks-&gt;norm == KS_STD_PAL_M)</div><div class='add'>+				/* force 60 Hz */</div><div class='add'>+				ks0127_and_or(ks, KS_CMDA,   0xfc, 0x03);</div><div class='add'>+			else</div><div class='add'>+				/* force 50 Hz */</div><div class='add'>+				ks0127_and_or(ks, KS_CMDA,   0xfc, 0x02);</div><div class='add'>+</div><div class='add'>+			ks0127_and_or(ks, KS_CMDA,   0xff, 0x40); /* VSE=1 */</div><div class='add'>+			/* set input line and VALIGN */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDB,   0xb0, (*iarg | 0x40));</div><div class='add'>+			/* freerunning mode, */</div><div class='add'>+			/* TSTGEN = 1 TSTGFR=11 TSTGPH=0 TSTGPK=0  VMEM=1*/</div><div class='add'>+			ks0127_and_or(ks, KS_CMDC,   0x70, 0x87);</div><div class='add'>+			/* digital input, SYNDIR = 0 INPSL=01 CLKDIR=0 EAV=0 */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDD,   0x03, 0x08);</div><div class='add'>+			/* disable chroma demodulation */</div><div class='add'>+			ks0127_and_or(ks, KS_CTRACK, 0xcf, 0x30);</div><div class='add'>+			/* HYPK =01 CTRAP = 0 HYBWR=0 PED=1 RGBH=1 UNIT=1 */</div><div class='add'>+			ks0127_and_or(ks, KS_LUMA,   0x00, 0x71);</div><div class='add'>+			ks0127_and_or(ks, KS_VERTIC, 0x0f,</div><div class='add'>+				       reg_defaults[KS_VERTIC]&amp;0xf0);</div><div class='add'>+</div><div class='add'>+			/* scaler fullbw, luma comb off */</div><div class='add'>+			ks0127_and_or(ks, KS_VERTIA, 0x08, 0x81);</div><div class='add'>+</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMB, 0x0f,</div><div class='add'>+				       reg_defaults[KS_CHROMB]&amp;0xf0);</div><div class='add'>+</div><div class='add'>+			ks0127_and_or(ks, KS_CON, 0x00, 0x00);</div><div class='add'>+			ks0127_and_or(ks, KS_BRT, 0x00, 32);	/* spec: 34 */</div><div class='add'>+				/* spec: 229 (e5) */</div><div class='add'>+			ks0127_and_or(ks, KS_SAT, 0x00, 0xe8);</div><div class='add'>+			ks0127_and_or(ks, KS_HUE, 0x00, 0);</div><div class='add'>+</div><div class='add'>+			ks0127_and_or(ks, KS_UGAIN, 0x00, 238);</div><div class='add'>+			ks0127_and_or(ks, KS_VGAIN, 0x00, 0x00);</div><div class='add'>+</div><div class='add'>+			/*UOFF:0x30, VOFF:0x30, TSTCGN=1 */</div><div class='add'>+			ks0127_and_or(ks, KS_UVOFFH, 0x00, 0x4f);</div><div class='add'>+			ks0127_and_or(ks, KS_UVOFFL, 0x00, 0x00);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_INPUT: "</div><div class='add'>+				"Unknown input %d\n", *iarg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* hack: CDMLPF sometimes spontaneously switches on; */</div><div class='add'>+		/* force back off */</div><div class='add'>+		ks0127_write(ks, KS_DEMOD, reg_defaults[KS_DEMOD]);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DECODER_SET_OUTPUT:</div><div class='add'>+		switch(*iarg) {</div><div class='add'>+		case KS_OUTPUT_YUV656E:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_OUTPUT: "</div><div class='add'>+				"OUTPUT_YUV656E (Missing)\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case KS_OUTPUT_EXV:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_OUTPUT: "</div><div class='add'>+				"OUTPUT_EXV\n");</div><div class='add'>+			ks0127_and_or(ks, KS_OFMTA, 0xf0, 0x09);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DECODER_SET_NORM: //sam This block mixes old and new norm names...</div><div class='add'>+		/* Set to automatic SECAM/Fsc mode */</div><div class='add'>+		ks0127_and_or(ks, KS_DEMOD, 0xf0, 0x00);</div><div class='add'>+</div><div class='add'>+		ks-&gt;norm = *iarg;</div><div class='add'>+		switch(*iarg)</div><div class='add'>+		{</div><div class='add'>+		/* this is untested !! */</div><div class='add'>+		/* It just detects PAL_N/NTSC_M (no special frequencies) */</div><div class='add'>+		/* And you have to set the standard a second time afterwards */</div><div class='add'>+		case VIDEO_MODE_AUTO:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_NORM: AUTO\n");</div><div class='add'>+</div><div class='add'>+			/* The chip determines the format */</div><div class='add'>+			/* based on the current field rate */</div><div class='add'>+			ks0127_and_or(ks, KS_CMDA,   0xfc, 0x00);</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x20);</div><div class='add'>+			/* This is wrong for PAL ! As I said, */</div><div class='add'>+			/* you need to set the standard once again !! */</div><div class='add'>+			ks-&gt;format_height = 240;</div><div class='add'>+			ks-&gt;format_width = 704;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case VIDEO_MODE_NTSC:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_NORM: NTSC_M\n");</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x20);</div><div class='add'>+			ks-&gt;format_height = 240;</div><div class='add'>+			ks-&gt;format_width = 704;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case KS_STD_NTSC_N:</div><div class='add'>+			dprintk("ks0127: command KS0127_SET_STANDARD: "</div><div class='add'>+				"NTSC_N (fixme)\n");</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x40);</div><div class='add'>+			ks-&gt;format_height = 240;</div><div class='add'>+			ks-&gt;format_width = 704;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case VIDEO_MODE_PAL:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_NORM: PAL_N\n");</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x20);</div><div class='add'>+			ks-&gt;format_height = 290;</div><div class='add'>+			ks-&gt;format_width = 704;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case KS_STD_PAL_M:</div><div class='add'>+			dprintk("ks0127: command KS0127_SET_STANDARD: "</div><div class='add'>+				"PAL_M (fixme)\n");</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMA, 0x9f, 0x40);</div><div class='add'>+			ks-&gt;format_height = 290;</div><div class='add'>+			ks-&gt;format_width = 704;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case VIDEO_MODE_SECAM:</div><div class='add'>+			dprintk("ks0127: command KS0127_SET_STANDARD: "</div><div class='add'>+				"SECAM\n");</div><div class='add'>+			ks-&gt;format_height = 290;</div><div class='add'>+			ks-&gt;format_width = 704;</div><div class='add'>+</div><div class='add'>+			/* set to secam autodetection */</div><div class='add'>+			ks0127_and_or(ks, KS_CHROMA, 0xdf, 0x20);</div><div class='add'>+			ks0127_and_or(ks, KS_DEMOD, 0xf0, 0x00);</div><div class='add'>+			schedule_timeout_interruptible(HZ/10+1);</div><div class='add'>+</div><div class='add'>+			/* did it autodetect? */</div><div class='add'>+			if (ks0127_read(ks, KS_DEMOD) &amp; 0x40)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* force to secam mode */</div><div class='add'>+			ks0127_and_or(ks, KS_DEMOD, 0xf0, 0x0f);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			dprintk("ks0127: command DECODER_SET_NORM: "</div><div class='add'>+				"Unknown norm %d\n", *iarg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case DECODER_SET_PICTURE:</div><div class='add'>+		dprintk("ks0127: command DECODER_SET_PICTURE "</div><div class='add'>+			"not yet supported (fixme)\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	//sam todo: KS0127_SET_BRIGHTNESS: Merge into DECODER_SET_PICTURE</div><div class='add'>+	//sam todo: KS0127_SET_CONTRAST: Merge into DECODER_SET_PICTURE</div><div class='add'>+	//sam todo: KS0127_SET_HUE: Merge into DECODER_SET_PICTURE?</div><div class='add'>+	//sam todo: KS0127_SET_SATURATION: Merge into DECODER_SET_PICTURE</div><div class='add'>+	//sam todo: KS0127_SET_AGC_MODE:</div><div class='add'>+	//sam todo: KS0127_SET_AGC:</div><div class='add'>+	//sam todo: KS0127_SET_CHROMA_MODE:</div><div class='add'>+	//sam todo: KS0127_SET_PIXCLK_MODE:</div><div class='add'>+	//sam todo: KS0127_SET_GAMMA_MODE:</div><div class='add'>+	//sam todo: KS0127_SET_UGAIN:</div><div class='add'>+	//sam todo: KS0127_SET_VGAIN:</div><div class='add'>+	//sam todo: KS0127_SET_INVALY:</div><div class='add'>+	//sam todo: KS0127_SET_INVALU:</div><div class='add'>+	//sam todo: KS0127_SET_INVALV:</div><div class='add'>+	//sam todo: KS0127_SET_UNUSEY:</div><div class='add'>+	//sam todo: KS0127_SET_UNUSEU:</div><div class='add'>+	//sam todo: KS0127_SET_UNUSEV:</div><div class='add'>+	//sam todo: KS0127_SET_VSALIGN_MODE:</div><div class='add'>+</div><div class='add'>+	case DECODER_ENABLE_OUTPUT:</div><div class='add'>+	{</div><div class='add'>+</div><div class='add'>+		int *iarg = arg;</div><div class='add'>+		int enable = (*iarg != 0);</div><div class='add'>+			if (enable) {</div><div class='add'>+				dprintk("ks0127: command "</div><div class='add'>+					"DECODER_ENABLE_OUTPUT on "</div><div class='add'>+					"(%d)\n", enable);</div><div class='add'>+				/* All output pins on */</div><div class='add'>+				ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x30);</div><div class='add'>+				/* Obey the OEN pin */</div><div class='add'>+				ks0127_and_or(ks, KS_CDEM, 0x7f, 0x00);</div><div class='add'>+			} else {</div><div class='add'>+				dprintk("ks0127: command "</div><div class='add'>+					"DECODER_ENABLE_OUTPUT off "</div><div class='add'>+					"(%d)\n", enable);</div><div class='add'>+				/* Video output pins off */</div><div class='add'>+				ks0127_and_or(ks, KS_OFMTA, 0xcf, 0x00);</div><div class='add'>+				/* Ignore the OEN pin */</div><div class='add'>+				ks0127_and_or(ks, KS_CDEM, 0x7f, 0x80);</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	//sam todo: KS0127_SET_OUTPUT_MODE:</div><div class='add'>+	//sam todo: KS0127_SET_WIDTH:</div><div class='add'>+	//sam todo: KS0127_SET_HEIGHT:</div><div class='add'>+	//sam todo: KS0127_SET_HSCALE:</div><div class='add'>+</div><div class='add'>+	case DECODER_GET_STATUS:</div><div class='add'>+		dprintk("ks0127: command DECODER_GET_STATUS\n");</div><div class='add'>+		*iarg = 0;</div><div class='add'>+		status = ks0127_read(ks, KS_STAT);</div><div class='add'>+		if (!(status &amp; 0x20))		 /* NOVID not set */</div><div class='add'>+			*iarg = (*iarg &amp; DECODER_STATUS_GOOD);</div><div class='add'>+		if ((status &amp; 0x01))		      /* CLOCK set */</div><div class='add'>+			*iarg = (*iarg &amp; DECODER_STATUS_COLOR);</div><div class='add'>+		if ((status &amp; 0x08))		   /* PALDET set */</div><div class='add'>+			*iarg = (*iarg &amp; DECODER_STATUS_PAL);</div><div class='add'>+		else</div><div class='add'>+			*iarg = (*iarg &amp; DECODER_STATUS_NTSC);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	//Catch any unknown command</div><div class='add'>+	default:</div><div class='add'>+		dprintk("ks0127: command unknown: %04X\n", cmd);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ks0127_probe(struct i2c_adapter *adapter);</div><div class='add'>+static int ks0127_detach(struct i2c_client *client);</div><div class='add'>+static int ks0127_command(struct i2c_client *client,</div><div class='add'>+			  unsigned int cmd, void *arg);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Addresses to scan */</div><div class='add'>+static unsigned short normal_i2c[] = {I2C_KS0127_ADDON&gt;&gt;1,</div><div class='add'>+				       I2C_KS0127_ONBOARD&gt;&gt;1, I2C_CLIENT_END};</div><div class='add'>+static unsigned short probe[2] =	{I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='add'>+static unsigned short ignore[2] = 	{I2C_CLIENT_END, I2C_CLIENT_END};</div><div class='add'>+static struct i2c_client_address_data addr_data = {</div><div class='add'>+	normal_i2c,</div><div class='add'>+	probe,</div><div class='add'>+	ignore,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver i2c_driver_ks0127 = {</div><div class='add'>+	.driver.name = "ks0127",</div><div class='add'>+	.id             = I2C_DRIVERID_KS0127,</div><div class='add'>+	.attach_adapter = ks0127_probe,</div><div class='add'>+	.detach_client  = ks0127_detach,</div><div class='add'>+	.command        = ks0127_command</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_client ks0127_client_tmpl =</div><div class='add'>+{</div><div class='add'>+	.name = "(ks0127 unset)",</div><div class='add'>+	.addr = 0,</div><div class='add'>+	.adapter = NULL,</div><div class='add'>+	.driver = &amp;i2c_driver_ks0127,</div><div class='add'>+	.usage_count = 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ks0127_found_proc(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct ks0127 *ks;</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+</div><div class='add'>+	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='add'>+	if (client == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(client, &amp;ks0127_client_tmpl, sizeof(*client));</div><div class='add'>+</div><div class='add'>+	ks = kzalloc(sizeof(*ks), GFP_KERNEL);</div><div class='add'>+	if (ks == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, ks);</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;addr = addr;</div><div class='add'>+	sprintf(client-&gt;name, "ks0127-%02x", adapter-&gt;id);</div><div class='add'>+</div><div class='add'>+	ks-&gt;client = client;</div><div class='add'>+	ks-&gt;addr = addr;</div><div class='add'>+	ks-&gt;ks_type = KS_TYPE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* power up */</div><div class='add'>+	ks0127_write(ks, KS_CMDA, 0x2c);</div><div class='add'>+	mdelay(10);</div><div class='add'>+</div><div class='add'>+	/* reset the device */</div><div class='add'>+	ks0127_reset(ks);</div><div class='add'>+	printk(KERN_INFO "ks0127: attach: %s video decoder\n",</div><div class='add'>+	       ks-&gt;addr==(I2C_KS0127_ADDON&gt;&gt;1) ? "addon" : "on-board");</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ks0127_probe(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;id == I2C_HW_B_ZR36067)</div><div class='add'>+		return i2c_probe(adapter, &amp;addr_data, ks0127_found_proc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks0127_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct ks0127 *ks = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	ks0127_write(ks, KS_OFMTA, 0x20); /*tristate*/</div><div class='add'>+	ks0127_write(ks, KS_CMDA, 0x2c | 0x80); /* power down */</div><div class='add'>+</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+	kfree(ks);</div><div class='add'>+	kfree(client);</div><div class='add'>+</div><div class='add'>+	dprintk("ks0127: detach\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __devinit ks0127_init_module(void)</div><div class='add'>+{</div><div class='add'>+	init_reg_defaults();</div><div class='add'>+	i2c_add_driver(&amp;i2c_driver_ks0127);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit ks0127_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;i2c_driver_ks0127);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+module_init(ks0127_init_module);</div><div class='add'>+module_exit(ks0127_cleanup_module);</div><div class='head'>diff --git a/drivers/media/video/ks0127.h b/drivers/media/video/ks0127.h<br/>new file mode 100644<br/>index 000000000000..1ec578833aea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ks0127.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/ks0127.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ * Video Capture Driver ( Video for Linux 1/2 )</div><div class='add'>+ * for the Matrox Marvel G200,G400 and Rainbow Runner-G series</div><div class='add'>+ *</div><div class='add'>+ * This module is an interface to the KS0127 video decoder chip.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1999  Ryan Drake &lt;stiletto@mediaone.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version 2</div><div class='add'>+ * of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef KS0127_H</div><div class='add'>+#define KS0127_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='add'>+</div><div class='add'>+/* input channels */</div><div class='add'>+#define KS_INPUT_COMPOSITE_1    0</div><div class='add'>+#define KS_INPUT_COMPOSITE_2    1</div><div class='add'>+#define KS_INPUT_COMPOSITE_3    2</div><div class='add'>+#define KS_INPUT_COMPOSITE_4    4</div><div class='add'>+#define KS_INPUT_COMPOSITE_5    5</div><div class='add'>+#define KS_INPUT_COMPOSITE_6    6</div><div class='add'>+</div><div class='add'>+#define KS_INPUT_SVIDEO_1       8</div><div class='add'>+#define KS_INPUT_SVIDEO_2       9</div><div class='add'>+#define KS_INPUT_SVIDEO_3       10</div><div class='add'>+</div><div class='add'>+#define KS_INPUT_YUV656		15</div><div class='add'>+#define KS_INPUT_COUNT          10</div><div class='add'>+</div><div class='add'>+/* output channels */</div><div class='add'>+#define KS_OUTPUT_YUV656E       0</div><div class='add'>+#define KS_OUTPUT_EXV           1</div><div class='add'>+</div><div class='add'>+/* video standards */</div><div class='add'>+#define KS_STD_NTSC_N           112       /* 50 Hz NTSC */</div><div class='add'>+#define KS_STD_PAL_M            113       /* 60 Hz PAL  */</div><div class='add'>+</div><div class='add'>+#endif /* KS0127_H */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c<br/>index 850bee97090c..e278753f8f25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/meye.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/meye.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/meye.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/meye.c</a></div><div class='hunk'>@@ -26,12 +26,12 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -1682,13 +1682,13 @@ static unsigned int meye_poll(struct file *file, poll_table *wait)</div><div class='ctx'> </div><div class='ctx'> static void meye_vm_open(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	int idx = (int)vma-&gt;vm_private_data;</div><div class='add'>+	long idx = (long)vma-&gt;vm_private_data;</div><div class='ctx'> 	meye.vma_use_count[idx]++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void meye_vm_close(struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='del'>-	int idx = (int)vma-&gt;vm_private_data;</div><div class='add'>+	long idx = (long)vma-&gt;vm_private_data;</div><div class='ctx'> 	meye.vma_use_count[idx]--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1881,7 +1881,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,</div><div class='ctx'> </div><div class='ctx'> 	meye.mchip_irq = pcidev-&gt;irq;</div><div class='ctx'> 	if (request_irq(meye.mchip_irq, meye_irq,</div><div class='del'>-			SA_INTERRUPT | SA_SHIRQ, "meye", meye_irq)) {</div><div class='add'>+			IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) {</div><div class='ctx'> 		printk(KERN_ERR "meye: request_irq failed\n");</div><div class='ctx'> 		goto outreqirq;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h<br/>index 0d09a0e3803c..ea107cb5c845 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/meye.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/meye.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/meye.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/meye.h</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \</div><div class='ctx'> 			    __stringify(MEYE_DRIVER_MINORVERSION)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kfifo.h&gt;</div><div class='head'>diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c<br/>index b806999d6e0f..dbb75a7db199 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/msp3400-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/msp3400-driver.c</a></div><div class='hunk'>@@ -385,67 +385,6 @@ static int msp_mode_v4l1_to_v4l2(int mode)</div><div class='ctx'> 	return V4L2_TUNER_MODE_MONO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct v4l2_queryctrl msp_qctrl_std[] = {</div><div class='del'>-	{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_VOLUME,</div><div class='del'>-		.name          = "Volume",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 58880,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	},{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_MUTE,</div><div class='del'>-		.name          = "Mute",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 1,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 1,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct v4l2_queryctrl msp_qctrl_sound_processing[] = {</div><div class='del'>-	{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_BALANCE,</div><div class='del'>-		.name          = "Balance",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 32768,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	},{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_BASS,</div><div class='del'>-		.name          = "Bass",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 32768,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	},{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_TREBLE,</div><div class='del'>-		.name          = "Treble",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 65535,</div><div class='del'>-		.step          = 65535/100,</div><div class='del'>-		.default_value = 32768,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-	},{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_LOUDNESS,</div><div class='del'>-		.name          = "Loudness",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 1,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 1,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int msp_get_ctrl(struct i2c_client *client, struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct msp_state *state = i2c_get_clientdata(client);</div><div class='hunk'>@@ -674,22 +613,31 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		int sc1_out = rt-&gt;output &amp; 0xf;</div><div class='ctx'> 		int sc2_out = (rt-&gt;output &gt;&gt; 4) &amp; 0xf;</div><div class='ctx'> 		u16 val, reg;</div><div class='add'>+		int i;</div><div class='add'>+		int extern_input = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (state-&gt;routing.input == rt-&gt;input &amp;&amp;</div><div class='ctx'> 		    state-&gt;routing.output == rt-&gt;output)</div><div class='ctx'> 			break;</div><div class='ctx'> 		state-&gt;routing = *rt;</div><div class='add'>+		/* check if the tuner input is used */</div><div class='add'>+		for (i = 0; i &lt; 5; i++) {</div><div class='add'>+			if (((rt-&gt;input &gt;&gt; (4 + i * 4)) &amp; 0xf) == 0)</div><div class='add'>+				extern_input = 0;</div><div class='add'>+		}</div><div class='add'>+		if (extern_input)</div><div class='add'>+			state-&gt;mode = MSP_MODE_EXTERN;</div><div class='add'>+		else</div><div class='add'>+			state-&gt;mode = MSP_MODE_AM_DETECT;</div><div class='ctx'> 		msp_set_scart(client, sc_in, 0);</div><div class='ctx'> 		msp_set_scart(client, sc1_out, 1);</div><div class='ctx'> 		msp_set_scart(client, sc2_out, 2);</div><div class='ctx'> 		msp_set_audmode(client);</div><div class='ctx'> 		reg = (state-&gt;opmode == OPMODE_AUTOSELECT) ? 0x30 : 0xbb;</div><div class='ctx'> 		val = msp_read_dem(client, reg);</div><div class='del'>-		if (tuner != ((val &gt;&gt; 8) &amp; 1)) {</div><div class='del'>-			msp_write_dem(client, reg, (val &amp; ~0x100) | (tuner &lt;&lt; 8));</div><div class='del'>-			/* wake thread when a new tuner input is chosen */</div><div class='del'>-			msp_wake_thread(client);</div><div class='del'>-		}</div><div class='add'>+		msp_write_dem(client, reg, (val &amp; ~0x100) | (tuner &lt;&lt; 8));</div><div class='add'>+		/* wake thread when a new input is chosen */</div><div class='add'>+		msp_wake_thread(client);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -744,21 +692,25 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 	case VIDIOC_QUERYCTRL:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_queryctrl *qc = arg;</div><div class='del'>-		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(msp_qctrl_std); i++)</div><div class='del'>-			if (qc-&gt;id &amp;&amp; qc-&gt;id == msp_qctrl_std[i].id) {</div><div class='del'>-				memcpy(qc, &amp;msp_qctrl_std[i], sizeof(*qc));</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='add'>+		switch (qc-&gt;id) {</div><div class='add'>+			case V4L2_CID_AUDIO_VOLUME:</div><div class='add'>+			case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+				return v4l2_ctrl_query_fill_std(qc);</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='ctx'> 		if (!state-&gt;has_sound_processing)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(msp_qctrl_sound_processing); i++)</div><div class='del'>-			if (qc-&gt;id &amp;&amp; qc-&gt;id == msp_qctrl_sound_processing[i].id) {</div><div class='del'>-				memcpy(qc, &amp;msp_qctrl_sound_processing[i], sizeof(*qc));</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		switch (qc-&gt;id) {</div><div class='add'>+			case V4L2_CID_AUDIO_LOUDNESS:</div><div class='add'>+			case V4L2_CID_AUDIO_BALANCE:</div><div class='add'>+			case V4L2_CID_AUDIO_BASS:</div><div class='add'>+			case V4L2_CID_AUDIO_TREBLE:</div><div class='add'>+				return v4l2_ctrl_query_fill_std(qc);</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='hunk'>@@ -794,7 +746,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		case MSP_MODE_EXTERN: p = "External input"; break;</div><div class='ctx'> 		default: p = "unknown"; break;</div><div class='ctx'> 		}</div><div class='del'>-		if (state-&gt;opmode == OPMODE_MANUAL) {</div><div class='add'>+		if (state-&gt;mode == MSP_MODE_EXTERN) {</div><div class='add'>+			v4l_info(client, "Mode:     %s\n", p);</div><div class='add'>+		} else if (state-&gt;opmode == OPMODE_MANUAL) {</div><div class='ctx'> 			v4l_info(client, "Mode:     %s (%s%s)\n", p,</div><div class='ctx'> 				(state-&gt;rxsubchans &amp; V4L2_TUNER_SUB_STEREO) ? "stereo" : "mono",</div><div class='ctx'> 				(state-&gt;rxsubchans &amp; V4L2_TUNER_SUB_LANG2) ? ", dual" : "");</div><div class='head'>diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h<br/>index 4e451049013d..545e4ac094f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/msp3400-driver.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-driver.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/msp3400-driver.h</a></div><div class='hunk'>@@ -90,8 +90,8 @@ struct msp_state {</div><div class='ctx'> 	/* thread */</div><div class='ctx'> 	struct task_struct   *kthread;</div><div class='ctx'> 	wait_queue_head_t    wq;</div><div class='del'>-	int                  restart:1;</div><div class='del'>-	int                  watch_stereo:1;</div><div class='add'>+	unsigned int         restart:1;</div><div class='add'>+	unsigned int         watch_stereo:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* msp3400-driver.c */</div><div class='head'>diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c<br/>index 633a10213789..f2fd9195b3ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-kthreads.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/msp3400-kthreads.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/msp3400-kthreads.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/msp3400-kthreads.c</a></div><div class='hunk'>@@ -244,19 +244,21 @@ static void msp3400c_set_audmode(struct i2c_client *client)</div><div class='ctx'> 	   the hardware does not support SAP. So the rxsubchans combination</div><div class='ctx'> 	   of STEREO | LANG2 does not occur. */</div><div class='ctx'> </div><div class='del'>-	/* switch to mono if only mono is available */</div><div class='del'>-	if (state-&gt;rxsubchans == V4L2_TUNER_SUB_MONO)</div><div class='del'>-		audmode = V4L2_TUNER_MODE_MONO;</div><div class='del'>-	/* if bilingual */</div><div class='del'>-	else if (state-&gt;rxsubchans &amp; V4L2_TUNER_SUB_LANG2) {</div><div class='del'>-		/* and mono or stereo, then fallback to lang1 */</div><div class='del'>-		if (audmode == V4L2_TUNER_MODE_MONO ||</div><div class='del'>-		    audmode == V4L2_TUNER_MODE_STEREO)</div><div class='del'>-			audmode = V4L2_TUNER_MODE_LANG1;</div><div class='add'>+	if (state-&gt;mode != MSP_MODE_EXTERN) {</div><div class='add'>+		/* switch to mono if only mono is available */</div><div class='add'>+		if (state-&gt;rxsubchans == V4L2_TUNER_SUB_MONO)</div><div class='add'>+			audmode = V4L2_TUNER_MODE_MONO;</div><div class='add'>+		/* if bilingual */</div><div class='add'>+		else if (state-&gt;rxsubchans &amp; V4L2_TUNER_SUB_LANG2) {</div><div class='add'>+			/* and mono or stereo, then fallback to lang1 */</div><div class='add'>+			if (audmode == V4L2_TUNER_MODE_MONO ||</div><div class='add'>+			    audmode == V4L2_TUNER_MODE_STEREO)</div><div class='add'>+				audmode = V4L2_TUNER_MODE_LANG1;</div><div class='add'>+		}</div><div class='add'>+		/* if stereo, and audmode is not mono, then switch to stereo */</div><div class='add'>+		else if (audmode != V4L2_TUNER_MODE_MONO)</div><div class='add'>+			audmode = V4L2_TUNER_MODE_STEREO;</div><div class='ctx'> 	}</div><div class='del'>-	/* if stereo, and audmode is not mono, then switch to stereo */</div><div class='del'>-	else if (audmode != V4L2_TUNER_MODE_MONO)</div><div class='del'>-		audmode = V4L2_TUNER_MODE_STEREO;</div><div class='ctx'> </div><div class='ctx'> 	/* switch demodulator */</div><div class='ctx'> 	switch (state-&gt;mode) {</div><div class='hunk'>@@ -481,6 +483,7 @@ int msp3400c_thread(void *data)</div><div class='ctx'> 			/* no carrier scan, just unmute */</div><div class='ctx'> 			v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");</div><div class='ctx'> 			state-&gt;scan_in_progress = 0;</div><div class='add'>+			state-&gt;rxsubchans = V4L2_TUNER_SUB_STEREO;</div><div class='ctx'> 			msp_set_audio(client);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -947,6 +950,14 @@ int msp34xxg_thread(void *data)</div><div class='ctx'> 		if (kthread_should_stop())</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		if (state-&gt;mode == MSP_MODE_EXTERN) {</div><div class='add'>+			/* no carrier scan needed, just unmute */</div><div class='add'>+			v4l_dbg(1, msp_debug, client, "thread: no carrier scan\n");</div><div class='add'>+			state-&gt;scan_in_progress = 0;</div><div class='add'>+			msp_set_audio(client);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* setup the chip*/</div><div class='ctx'> 		msp34xxg_reset(client);</div><div class='ctx'> 		state-&gt;std = state-&gt;radio ? 0x40 : msp_standard;</div><div class='hunk'>@@ -978,6 +989,11 @@ int msp34xxg_thread(void *data)</div><div class='ctx'> 		v4l_dbg(1, msp_debug, client, "detected standard: %s (0x%04x)\n",</div><div class='ctx'> 			msp_standard_std_name(state-&gt;std), state-&gt;std);</div><div class='ctx'> </div><div class='add'>+		if (state-&gt;std == 9) {</div><div class='add'>+			/* AM NICAM mode */</div><div class='add'>+			msp_write_dsp(client, 0x0e, 0x7c00);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* unmute: dispatch sound to scart output, set scart volume */</div><div class='ctx'> 		msp_set_audio(client);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c<br/>index fdc8e3f13937..1b07a61c2ebb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ov511.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ov511.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ov511.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/ov511.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -3239,7 +3238,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)</div><div class='ctx'> 		RESTRICT_TO_RANGE(frame-&gt;bytes_recvd, 8, max_raw);</div><div class='ctx'> </div><div class='ctx'> 		if (frame-&gt;scanstate == STATE_LINES) {</div><div class='del'>-	    		int nextf;</div><div class='add'>+			int nextf;</div><div class='ctx'> </div><div class='ctx'> 			frame-&gt;grabstate = FRAME_DONE;</div><div class='ctx'> 			wake_up_interruptible(&amp;frame-&gt;wq);</div><div class='hunk'>@@ -3405,7 +3404,7 @@ eof:</div><div class='ctx'> 	RESTRICT_TO_RANGE(frame-&gt;bytes_recvd, 8, max_raw);</div><div class='ctx'> </div><div class='ctx'> 	if (frame-&gt;scanstate == STATE_LINES) {</div><div class='del'>-    		int nextf;</div><div class='add'>+		int nextf;</div><div class='ctx'> </div><div class='ctx'> 		frame-&gt;grabstate = FRAME_DONE;</div><div class='ctx'> 		wake_up_interruptible(&amp;frame-&gt;wq);</div><div class='head'>diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h<br/>index 12b3d51e1c34..68b082bcee1d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/ov511.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/ov511.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/ov511.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/ov511.h</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='head'>diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c<br/>index d9e3cada52f4..3484e36b6801 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/planb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/planb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/planb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/planb.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c<br/>index 09835ca098b1..5d681fa8bcb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pms.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -804,7 +805,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			struct video_picture *p = arg;</div><div class='ctx'> 			if(!((p-&gt;palette==VIDEO_PALETTE_RGB565 &amp;&amp; p-&gt;depth==16)</div><div class='ctx'> 			    ||(p-&gt;palette==VIDEO_PALETTE_RGB555 &amp;&amp; p-&gt;depth==15)))</div><div class='del'>-			    	return -EINVAL;</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 			pd-&gt;picture= *p;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig<br/>new file mode 100644<br/>index 000000000000..7e727fe14b32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+config VIDEO_PVRUSB2</div><div class='add'>+	tristate "Hauppauge WinTV-PVR USB2 support"</div><div class='add'>+	depends on VIDEO_V4L2 &amp;&amp; USB &amp;&amp; I2C &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	select VIDEO_TUNER</div><div class='add'>+	select VIDEO_TVEEPROM</div><div class='add'>+	select VIDEO_CX2341X</div><div class='add'>+	select VIDEO_SAA711X</div><div class='add'>+	select VIDEO_MSP3400</div><div class='add'>+	---help---</div><div class='add'>+	  This is a video4linux driver for Conexant 23416 based</div><div class='add'>+	  usb2 personal video recorder devices.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called pvrusb2</div><div class='add'>+</div><div class='add'>+config VIDEO_PVRUSB2_24XXX</div><div class='add'>+	bool "Hauppauge WinTV-PVR USB2 support for 24xxx model series"</div><div class='add'>+	depends on VIDEO_PVRUSB2 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select VIDEO_CX25840</div><div class='add'>+	select VIDEO_WM8775</div><div class='add'>+	---help---</div><div class='add'>+	  This option enables inclusion of additional logic to operate</div><div class='add'>+	  newer WinTV-PVR USB2 devices whose model number is of the</div><div class='add'>+	  form "24xxx" (leading prefix of "24" followed by 3 digits).</div><div class='add'>+	  To see if you may need this option, examine the white</div><div class='add'>+	  sticker on the underside of your device.  Enabling this</div><div class='add'>+	  option will not harm support for older devices, however it</div><div class='add'>+	  is a separate option because of the experimental nature of</div><div class='add'>+	  this new feature.</div><div class='add'>+</div><div class='add'>+	  If you are in doubt, say N.</div><div class='add'>+</div><div class='add'>+	  Note: This feature is _very_ experimental.  You have been</div><div class='add'>+	  warned.</div><div class='add'>+</div><div class='add'>+config VIDEO_PVRUSB2_SYSFS</div><div class='add'>+	bool "pvrusb2 sysfs support (EXPERIMENTAL)"</div><div class='add'>+	default y</div><div class='add'>+	depends on VIDEO_PVRUSB2 &amp;&amp; SYSFS &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  This option enables the operation of a sysfs based</div><div class='add'>+	  interface for query and control of the pvrusb2 driver.</div><div class='add'>+</div><div class='add'>+	  This is not generally needed for v4l applications,</div><div class='add'>+	  although certain applications are optimized to take</div><div class='add'>+	  advantage of this feature.</div><div class='add'>+</div><div class='add'>+	  If you are in doubt, say Y.</div><div class='add'>+</div><div class='add'>+	  Note: This feature is experimental and subject to change.</div><div class='add'>+</div><div class='add'>+config VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+	bool "pvrusb2 debug interface"</div><div class='add'>+	depends on VIDEO_PVRUSB2_SYSFS</div><div class='add'>+	---help---</div><div class='add'>+	  This option enables the inclusion of a debug interface</div><div class='add'>+	  in the pvrusb2 driver, hosted through sysfs.</div><div class='add'>+</div><div class='add'>+	  You do not need to select this option unless you plan</div><div class='add'>+	  on debugging the driver or performing a manual firmware</div><div class='add'>+	  extraction.</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile<br/>new file mode 100644<br/>index 000000000000..02e414210dac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o</div><div class='add'>+obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o</div><div class='add'>+</div><div class='add'>+obj-pvrusb2-24xxx-$(CONFIG_VIDEO_PVRUSB2_24XXX) := \</div><div class='add'>+		   pvrusb2-cx2584x-v4l.o \</div><div class='add'>+		   pvrusb2-wm8775.o</div><div class='add'>+</div><div class='add'>+pvrusb2-objs	:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \</div><div class='add'>+		   pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \</div><div class='add'>+		   pvrusb2-encoder.o pvrusb2-video-v4l.o \</div><div class='add'>+		   pvrusb2-eeprom.o pvrusb2-tuner.o \</div><div class='add'>+		   pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \</div><div class='add'>+		   pvrusb2-ctrl.o pvrusb2-std.o \</div><div class='add'>+		   pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \</div><div class='add'>+		   $(obj-pvrusb2-24xxx-y) \</div><div class='add'>+		   $(obj-pvrusb2-sysfs-y) $(obj-pvrusb2-debugifc-y)</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c<br/>new file mode 100644<br/>index 000000000000..9846c464ec80<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-audio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-audio.c</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-audio.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/msp3400.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_msp3400_handler {</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	struct pvr2_i2c_client *client;</div><div class='add'>+	struct pvr2_i2c_handler i2c_handler;</div><div class='add'>+	struct pvr2_audio_stat astat;</div><div class='add'>+	unsigned long stale_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This function selects the correct audio input source */</div><div class='add'>+static void set_stereo(struct pvr2_msp3400_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	struct v4l2_routing route;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo");</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;input_val == PVR2_CVAL_INPUT_TV) {</div><div class='add'>+		struct v4l2_tuner vt;</div><div class='add'>+		memset(&amp;vt,0,sizeof(vt));</div><div class='add'>+		vt.audmode = hdw-&gt;audiomode_val;</div><div class='add'>+		pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_S_TUNER,&amp;vt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	route.input = MSP_INPUT_DEFAULT;</div><div class='add'>+	route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);</div><div class='add'>+	switch (hdw-&gt;input_val) {</div><div class='add'>+	case PVR2_CVAL_INPUT_TV:</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_RADIO:</div><div class='add'>+		/* Assume that msp34xx also handle FM decoding, in which case</div><div class='add'>+		   we're still using the tuner. */</div><div class='add'>+		/* HV: actually it is more likely to be the SCART2 input if</div><div class='add'>+		   the ivtv experience is any indication. */</div><div class='add'>+		route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,</div><div class='add'>+				    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_SVIDEO:</div><div class='add'>+	case PVR2_CVAL_INPUT_COMPOSITE:</div><div class='add'>+		/* SCART 1 input */</div><div class='add'>+		route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,</div><div class='add'>+				    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_S_AUDIO_ROUTING,&amp;route);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_stereo(struct pvr2_msp3400_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	return (hdw-&gt;input_dirty ||</div><div class='add'>+		hdw-&gt;audiomode_dirty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_msp3400_ops {</div><div class='add'>+	void (*update)(struct pvr2_msp3400_handler *);</div><div class='add'>+	int (*check)(struct pvr2_msp3400_handler *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct pvr2_msp3400_ops msp3400_ops[] = {</div><div class='add'>+	{ .update = set_stereo, .check = check_stereo},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int msp3400_check(struct pvr2_msp3400_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (ctxt-&gt;stale_mask &amp; msk) continue;</div><div class='add'>+		if (msp3400_ops[idx].check(ctxt)) {</div><div class='add'>+			ctxt-&gt;stale_mask |= msk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ctxt-&gt;stale_mask != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void msp3400_update(struct pvr2_msp3400_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(msp3400_ops)/sizeof(msp3400_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (!(ctxt-&gt;stale_mask &amp; msk)) continue;</div><div class='add'>+		ctxt-&gt;stale_mask &amp;= ~msk;</div><div class='add'>+		msp3400_ops[idx].update(ctxt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This reads back the current signal type */</div><div class='add'>+static int get_audio_status(struct pvr2_msp3400_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_tuner vt;</div><div class='add'>+	int stat;</div><div class='add'>+</div><div class='add'>+	memset(&amp;vt,0,sizeof(vt));</div><div class='add'>+	stat = pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_G_TUNER,&amp;vt);</div><div class='add'>+	if (stat &lt; 0) return stat;</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;hdw-&gt;flag_stereo = (vt.audmode &amp; V4L2_TUNER_MODE_STEREO) != 0;</div><div class='add'>+	ctxt-&gt;hdw-&gt;flag_bilingual =</div><div class='add'>+		(vt.audmode &amp; V4L2_TUNER_MODE_LANG2) != 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;client-&gt;handler = NULL;</div><div class='add'>+	ctxt-&gt;hdw-&gt;audio_stat = NULL;</div><div class='add'>+	kfree(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt,</div><div class='add'>+					  char *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf,cnt,"handler: pvrusb2-audio v4l2");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const static struct pvr2_i2c_handler_functions msp3400_funcs = {</div><div class='add'>+	.detach = (void (*)(void *))pvr2_msp3400_detach,</div><div class='add'>+	.check = (int (*)(void *))msp3400_check,</div><div class='add'>+	.update = (void (*)(void *))msp3400_update,</div><div class='add'>+	.describe = (unsigned int (*)(void *,char *,unsigned int))pvr2_msp3400_describe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_msp3400_handler *ctxt;</div><div class='add'>+	if (hdw-&gt;audio_stat) return 0;</div><div class='add'>+	if (cp-&gt;handler) return 0;</div><div class='add'>+</div><div class='add'>+	ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);</div><div class='add'>+	if (!ctxt) return 0;</div><div class='add'>+	memset(ctxt,0,sizeof(*ctxt));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;i2c_handler.func_data = ctxt;</div><div class='add'>+	ctxt-&gt;i2c_handler.func_table = &amp;msp3400_funcs;</div><div class='add'>+	ctxt-&gt;client = cp;</div><div class='add'>+	ctxt-&gt;hdw = hdw;</div><div class='add'>+	ctxt-&gt;astat.ctxt = ctxt;</div><div class='add'>+	ctxt-&gt;astat.status = (int (*)(void *))get_audio_status;</div><div class='add'>+	ctxt-&gt;astat.detach = (void (*)(void *))pvr2_msp3400_detach;</div><div class='add'>+	ctxt-&gt;stale_mask = (1 &lt;&lt; (sizeof(msp3400_ops)/</div><div class='add'>+				  sizeof(msp3400_ops[0]))) - 1;</div><div class='add'>+	cp-&gt;handler = &amp;ctxt-&gt;i2c_handler;</div><div class='add'>+	hdw-&gt;audio_stat = &amp;ctxt-&gt;astat;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",</div><div class='add'>+		   cp-&gt;client-&gt;addr);</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.h b/drivers/media/video/pvrusb2/pvrusb2-audio.h<br/>new file mode 100644<br/>index 000000000000..536339b68843<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-audio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-audio.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_AUDIO_H</div><div class='add'>+#define __PVRUSB2_AUDIO_H</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_msp3400_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_AUDIO_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c<br/>new file mode 100644<br/>index 000000000000..f129f316d20e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-context.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-context.c</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+/*</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-context.h"</div><div class='add'>+#include "pvrusb2-io.h"</div><div class='add'>+#include "pvrusb2-ioread.h"</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_context_destroy(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	if (mp-&gt;hdw) pvr2_hdw_destroy(mp-&gt;hdw);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"Destroying pvr_main id=%p",mp);</div><div class='add'>+	flush_workqueue(mp-&gt;workqueue);</div><div class='add'>+	destroy_workqueue(mp-&gt;workqueue);</div><div class='add'>+	kfree(mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_context_trigger_poll(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	queue_work(mp-&gt;workqueue,&amp;mp-&gt;workpoll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_context_poll(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	pvr2_context_enter(mp); do {</div><div class='add'>+		pvr2_hdw_poll(mp-&gt;hdw);</div><div class='add'>+	} while (0); pvr2_context_exit(mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_context_setup(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	pvr2_context_enter(mp); do {</div><div class='add'>+		if (!pvr2_hdw_dev_ok(mp-&gt;hdw)) break;</div><div class='add'>+		pvr2_hdw_setup(mp-&gt;hdw);</div><div class='add'>+		pvr2_hdw_setup_poll_trigger(</div><div class='add'>+			mp-&gt;hdw,</div><div class='add'>+			(void (*)(void *))pvr2_context_trigger_poll,</div><div class='add'>+			mp);</div><div class='add'>+		if (!pvr2_hdw_dev_ok(mp-&gt;hdw)) break;</div><div class='add'>+		if (!pvr2_hdw_init_ok(mp-&gt;hdw)) break;</div><div class='add'>+		mp-&gt;video_stream.stream = pvr2_hdw_get_video_stream(mp-&gt;hdw);</div><div class='add'>+		if (mp-&gt;setup_func) {</div><div class='add'>+			mp-&gt;setup_func(mp);</div><div class='add'>+		}</div><div class='add'>+	} while (0); pvr2_context_exit(mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_context *pvr2_context_create(</div><div class='add'>+	struct usb_interface *intf,</div><div class='add'>+	const struct usb_device_id *devid,</div><div class='add'>+	void (*setup_func)(struct pvr2_context *))</div><div class='add'>+{</div><div class='add'>+	struct pvr2_context *mp = NULL;</div><div class='add'>+	mp = kmalloc(sizeof(*mp),GFP_KERNEL);</div><div class='add'>+	if (!mp) goto done;</div><div class='add'>+	memset(mp,0,sizeof(*mp));</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_main id=%p",mp);</div><div class='add'>+	mp-&gt;setup_func = setup_func;</div><div class='add'>+	mutex_init(&amp;mp-&gt;mutex);</div><div class='add'>+	mp-&gt;hdw = pvr2_hdw_create(intf,devid);</div><div class='add'>+	if (!mp-&gt;hdw) {</div><div class='add'>+		pvr2_context_destroy(mp);</div><div class='add'>+		mp = NULL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mp-&gt;workqueue = create_singlethread_workqueue("pvrusb2");</div><div class='add'>+	INIT_WORK(&amp;mp-&gt;workinit,(void (*)(void*))pvr2_context_setup,mp);</div><div class='add'>+	INIT_WORK(&amp;mp-&gt;workpoll,(void (*)(void*))pvr2_context_poll,mp);</div><div class='add'>+	queue_work(mp-&gt;workqueue,&amp;mp-&gt;workinit);</div><div class='add'>+ done:</div><div class='add'>+	return mp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_context_enter(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;mp-&gt;mutex);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CREG,"pvr2_context_enter(id=%p)",mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_context_exit(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	int destroy_flag = 0;</div><div class='add'>+	if (!(mp-&gt;mc_first || !mp-&gt;disconnect_flag)) {</div><div class='add'>+		destroy_flag = !0;</div><div class='add'>+	}</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CREG,"pvr2_context_exit(id=%p) outside",mp);</div><div class='add'>+	mutex_unlock(&amp;mp-&gt;mutex);</div><div class='add'>+	if (destroy_flag) pvr2_context_destroy(mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_context_run_checks(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_channel *ch1,*ch2;</div><div class='add'>+	for (ch1 = mp-&gt;mc_first; ch1; ch1 = ch2) {</div><div class='add'>+		ch2 = ch1-&gt;mc_next;</div><div class='add'>+		if (ch1-&gt;check_func) {</div><div class='add'>+			ch1-&gt;check_func(ch1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_context_disconnect(struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	pvr2_context_enter(mp); do {</div><div class='add'>+		pvr2_hdw_disconnect(mp-&gt;hdw);</div><div class='add'>+		mp-&gt;disconnect_flag = !0;</div><div class='add'>+		pvr2_context_run_checks(mp);</div><div class='add'>+	} while (0); pvr2_context_exit(mp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_channel_init(struct pvr2_channel *cp,struct pvr2_context *mp)</div><div class='add'>+{</div><div class='add'>+	cp-&gt;hdw = mp-&gt;hdw;</div><div class='add'>+	cp-&gt;mc_head = mp;</div><div class='add'>+	cp-&gt;mc_next = NULL;</div><div class='add'>+	cp-&gt;mc_prev = mp-&gt;mc_last;</div><div class='add'>+	if (mp-&gt;mc_last) {</div><div class='add'>+		mp-&gt;mc_last-&gt;mc_next = cp;</div><div class='add'>+	} else {</div><div class='add'>+		mp-&gt;mc_first = cp;</div><div class='add'>+	}</div><div class='add'>+	mp-&gt;mc_last = cp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_channel_disclaim_stream(struct pvr2_channel *cp)</div><div class='add'>+{</div><div class='add'>+	if (!cp-&gt;stream) return;</div><div class='add'>+	pvr2_stream_kill(cp-&gt;stream-&gt;stream);</div><div class='add'>+	cp-&gt;stream-&gt;user = NULL;</div><div class='add'>+	cp-&gt;stream = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_channel_done(struct pvr2_channel *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_context *mp = cp-&gt;mc_head;</div><div class='add'>+	pvr2_channel_disclaim_stream(cp);</div><div class='add'>+	if (cp-&gt;mc_next) {</div><div class='add'>+		cp-&gt;mc_next-&gt;mc_prev = cp-&gt;mc_prev;</div><div class='add'>+	} else {</div><div class='add'>+		mp-&gt;mc_last = cp-&gt;mc_prev;</div><div class='add'>+	}</div><div class='add'>+	if (cp-&gt;mc_prev) {</div><div class='add'>+		cp-&gt;mc_prev-&gt;mc_next = cp-&gt;mc_next;</div><div class='add'>+	} else {</div><div class='add'>+		mp-&gt;mc_first = cp-&gt;mc_next;</div><div class='add'>+	}</div><div class='add'>+	cp-&gt;hdw = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_channel_claim_stream(struct pvr2_channel *cp,</div><div class='add'>+			      struct pvr2_context_stream *sp)</div><div class='add'>+{</div><div class='add'>+	int code = 0;</div><div class='add'>+	pvr2_context_enter(cp-&gt;mc_head); do {</div><div class='add'>+		if (sp == cp-&gt;stream) break;</div><div class='add'>+		if (sp-&gt;user) {</div><div class='add'>+			code = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		pvr2_channel_disclaim_stream(cp);</div><div class='add'>+		if (!sp) break;</div><div class='add'>+		sp-&gt;user = cp;</div><div class='add'>+		cp-&gt;stream = sp;</div><div class='add'>+	} while (0); pvr2_context_exit(cp-&gt;mc_head);</div><div class='add'>+	return code;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// This is the marker for the real beginning of a legitimate mpeg2 stream.</div><div class='add'>+static char stream_sync_key[] = {</div><div class='add'>+	0x00, 0x00, 0x01, 0xba,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_ioread *pvr2_channel_create_mpeg_stream(</div><div class='add'>+	struct pvr2_context_stream *sp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ioread *cp;</div><div class='add'>+	cp = pvr2_ioread_create();</div><div class='add'>+	if (!cp) return NULL;</div><div class='add'>+	pvr2_ioread_setup(cp,sp-&gt;stream);</div><div class='add'>+	pvr2_ioread_set_sync_key(cp,stream_sync_key,sizeof(stream_sync_key));</div><div class='add'>+	return cp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.h b/drivers/media/video/pvrusb2/pvrusb2-context.h<br/>new file mode 100644<br/>index 000000000000..6327fa1f7e4f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-context.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-context.h</a></div><div class='hunk'>@@ -0,0 +1,92 @@</div><div class='add'>+/*</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_BASE_H</div><div class='add'>+#define __PVRUSB2_BASE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_hdw;     /* hardware interface - defined elsewhere */</div><div class='add'>+struct pvr2_stream;  /* stream interface - defined elsewhere */</div><div class='add'>+</div><div class='add'>+struct pvr2_context;        /* All central state */</div><div class='add'>+struct pvr2_channel;        /* One I/O pathway to a user */</div><div class='add'>+struct pvr2_context_stream; /* Wrapper for a stream */</div><div class='add'>+struct pvr2_crit_reg;       /* Critical region pointer */</div><div class='add'>+struct pvr2_ioread;         /* Low level stream structure */</div><div class='add'>+</div><div class='add'>+struct pvr2_context_stream {</div><div class='add'>+	struct pvr2_channel *user;</div><div class='add'>+	struct pvr2_stream *stream;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_context {</div><div class='add'>+	struct pvr2_channel *mc_first;</div><div class='add'>+	struct pvr2_channel *mc_last;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	struct pvr2_context_stream video_stream;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	int disconnect_flag;</div><div class='add'>+</div><div class='add'>+	/* Called after pvr2_context initialization is complete */</div><div class='add'>+	void (*setup_func)(struct pvr2_context *);</div><div class='add'>+</div><div class='add'>+	/* Work queue overhead for out-of-line processing */</div><div class='add'>+	struct workqueue_struct *workqueue;</div><div class='add'>+	struct work_struct workinit;</div><div class='add'>+	struct work_struct workpoll;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_channel {</div><div class='add'>+	struct pvr2_context *mc_head;</div><div class='add'>+	struct pvr2_channel *mc_next;</div><div class='add'>+	struct pvr2_channel *mc_prev;</div><div class='add'>+	struct pvr2_context_stream *stream;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	void (*check_func)(struct pvr2_channel *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pvr2_context_enter(struct pvr2_context *);</div><div class='add'>+void pvr2_context_exit(struct pvr2_context *);</div><div class='add'>+</div><div class='add'>+struct pvr2_context *pvr2_context_create(struct usb_interface *intf,</div><div class='add'>+					 const struct usb_device_id *devid,</div><div class='add'>+					 void (*setup_func)(struct pvr2_context *));</div><div class='add'>+void pvr2_context_disconnect(struct pvr2_context *);</div><div class='add'>+</div><div class='add'>+void pvr2_channel_init(struct pvr2_channel *,struct pvr2_context *);</div><div class='add'>+void pvr2_channel_done(struct pvr2_channel *);</div><div class='add'>+int pvr2_channel_claim_stream(struct pvr2_channel *,</div><div class='add'>+			      struct pvr2_context_stream *);</div><div class='add'>+struct pvr2_ioread *pvr2_channel_create_mpeg_stream(</div><div class='add'>+	struct pvr2_context_stream *);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_CONTEXT_H */</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c<br/>new file mode 100644<br/>index 000000000000..fb6198f1df98<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-ctrl.c</a></div><div class='hunk'>@@ -0,0 +1,593 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-ctrl.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Set the given control. */</div><div class='add'>+int pvr2_ctrl_set_value(struct pvr2_ctrl *cptr,int val)</div><div class='add'>+{</div><div class='add'>+	return pvr2_ctrl_set_mask_value(cptr,~0,val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Set/clear specific bits of the given control. */</div><div class='add'>+int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;set_value != 0) {</div><div class='add'>+			if (cptr-&gt;info-&gt;type == pvr2_ctl_bitmask) {</div><div class='add'>+				mask &amp;= cptr-&gt;info-&gt;def.type_bitmask.valid_bits;</div><div class='add'>+			} else if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='add'>+				if (val &lt; cptr-&gt;info-&gt;def.type_int.min_value) {</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				if (val &gt; cptr-&gt;info-&gt;def.type_int.max_value) {</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else if (cptr-&gt;info-&gt;type == pvr2_ctl_enum) {</div><div class='add'>+				if (val &gt;= cptr-&gt;info-&gt;def.type_enum.count) {</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			} else if (cptr-&gt;info-&gt;type != pvr2_ctl_bool) {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			ret = cptr-&gt;info-&gt;set_value(cptr,mask,val);</div><div class='add'>+		} else {</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Get the current value of the given control. */</div><div class='add'>+int pvr2_ctrl_get_value(struct pvr2_ctrl *cptr,int *valptr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		ret = cptr-&gt;info-&gt;get_value(cptr,valptr);</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve control's type */</div><div class='add'>+enum pvr2_ctl_type pvr2_ctrl_get_type(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return pvr2_ctl_int;</div><div class='add'>+	return cptr-&gt;info-&gt;type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve control's maximum value (int type) */</div><div class='add'>+int pvr2_ctrl_get_max(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='add'>+			ret = cptr-&gt;info-&gt;def.type_int.max_value;</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve control's minimum value (int type) */</div><div class='add'>+int pvr2_ctrl_get_min(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='add'>+			ret = cptr-&gt;info-&gt;def.type_int.min_value;</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve control's default value (any type) */</div><div class='add'>+int pvr2_ctrl_get_def(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='add'>+			ret = cptr-&gt;info-&gt;default_value;</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve control's enumeration count (enum only) */</div><div class='add'>+int pvr2_ctrl_get_cnt(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_enum) {</div><div class='add'>+			ret = cptr-&gt;info-&gt;def.type_enum.count;</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve control's valid mask bits (bit mask only) */</div><div class='add'>+int pvr2_ctrl_get_mask(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_bitmask) {</div><div class='add'>+			ret = cptr-&gt;info-&gt;def.type_bitmask.valid_bits;</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve the control's name */</div><div class='add'>+const char *pvr2_ctrl_get_name(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return NULL;</div><div class='add'>+	return cptr-&gt;info-&gt;name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve the control's desc */</div><div class='add'>+const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return NULL;</div><div class='add'>+	return cptr-&gt;info-&gt;desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve a control enumeration or bit mask value */</div><div class='add'>+int pvr2_ctrl_get_valname(struct pvr2_ctrl *cptr,int val,</div><div class='add'>+			  char *bptr,unsigned int bmax,</div><div class='add'>+			  unsigned int *blen)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	*blen = 0;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_enum) {</div><div class='add'>+			const char **names;</div><div class='add'>+			names = cptr-&gt;info-&gt;def.type_enum.value_names;</div><div class='add'>+			if ((val &gt;= 0) &amp;&amp;</div><div class='add'>+			    (val &lt; cptr-&gt;info-&gt;def.type_enum.count)) {</div><div class='add'>+				if (names[val]) {</div><div class='add'>+					*blen = scnprintf(</div><div class='add'>+						bptr,bmax,"%s",</div><div class='add'>+						names[val]);</div><div class='add'>+				} else {</div><div class='add'>+					*blen = 0;</div><div class='add'>+				}</div><div class='add'>+				ret = 0;</div><div class='add'>+			}</div><div class='add'>+		} else if (cptr-&gt;info-&gt;type == pvr2_ctl_bitmask) {</div><div class='add'>+			const char **names;</div><div class='add'>+			unsigned int idx;</div><div class='add'>+			int msk;</div><div class='add'>+			names = cptr-&gt;info-&gt;def.type_bitmask.bit_names;</div><div class='add'>+			val &amp;= cptr-&gt;info-&gt;def.type_bitmask.valid_bits;</div><div class='add'>+			for (idx = 0, msk = 1; val; idx++, msk &lt;&lt;= 1) {</div><div class='add'>+				if (val &amp; msk) {</div><div class='add'>+					*blen = scnprintf(bptr,bmax,"%s",</div><div class='add'>+							  names[idx]);</div><div class='add'>+					ret = 0;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return V4L ID for this control or zero if none */</div><div class='add'>+int pvr2_ctrl_get_v4lid(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	return cptr-&gt;info-&gt;v4l_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+</div><div class='add'>+	if (cptr-&gt;info-&gt;get_v4lflags) {</div><div class='add'>+		flags = cptr-&gt;info-&gt;get_v4lflags(cptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cptr-&gt;info-&gt;set_value) {</div><div class='add'>+		flags &amp;= ~V4L2_CTRL_FLAG_READ_ONLY;</div><div class='add'>+	} else {</div><div class='add'>+		flags |= V4L2_CTRL_FLAG_READ_ONLY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return true if control is writable */</div><div class='add'>+int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	return cptr-&gt;info-&gt;set_value != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return true if control has custom symbolic representation */</div><div class='add'>+int pvr2_ctrl_has_custom_symbols(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return 0;</div><div class='add'>+	if (!cptr-&gt;info-&gt;val_to_sym) return 0;</div><div class='add'>+	if (!cptr-&gt;info-&gt;sym_to_val) return 0;</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Convert a given mask/val to a custom symbolic value */</div><div class='add'>+int pvr2_ctrl_custom_value_to_sym(struct pvr2_ctrl *cptr,</div><div class='add'>+				  int mask,int val,</div><div class='add'>+				  char *buf,unsigned int maxlen,</div><div class='add'>+				  unsigned int *len)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	if (!cptr-&gt;info-&gt;val_to_sym) return -EINVAL;</div><div class='add'>+	return cptr-&gt;info-&gt;val_to_sym(cptr,mask,val,buf,maxlen,len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Convert a symbolic value to a mask/value pair */</div><div class='add'>+int pvr2_ctrl_custom_sym_to_value(struct pvr2_ctrl *cptr,</div><div class='add'>+				  const char *buf,unsigned int len,</div><div class='add'>+				  int *maskptr,int *valptr)</div><div class='add'>+{</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	if (!cptr-&gt;info-&gt;sym_to_val) return -EINVAL;</div><div class='add'>+	return cptr-&gt;info-&gt;sym_to_val(cptr,buf,len,maskptr,valptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int gen_bitmask_string(int msk,int val,int msk_only,</div><div class='add'>+				       const char **names,</div><div class='add'>+				       char *ptr,unsigned int len)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	long sm,um;</div><div class='add'>+	int spcFl;</div><div class='add'>+	unsigned int uc,cnt;</div><div class='add'>+	const char *idStr;</div><div class='add'>+</div><div class='add'>+	spcFl = 0;</div><div class='add'>+	uc = 0;</div><div class='add'>+	um = 0;</div><div class='add'>+	for (idx = 0, sm = 1; msk; idx++, sm &lt;&lt;= 1) {</div><div class='add'>+		if (sm &amp; msk) {</div><div class='add'>+			msk &amp;= ~sm;</div><div class='add'>+			idStr = names[idx];</div><div class='add'>+			if (idStr) {</div><div class='add'>+				cnt = scnprintf(ptr,len,"%s%s%s",</div><div class='add'>+						(spcFl ? " " : ""),</div><div class='add'>+						(msk_only ? "" :</div><div class='add'>+						 ((val &amp; sm) ? "+" : "-")),</div><div class='add'>+						idStr);</div><div class='add'>+				ptr += cnt; len -= cnt; uc += cnt;</div><div class='add'>+				spcFl = !0;</div><div class='add'>+			} else {</div><div class='add'>+				um |= sm;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (um) {</div><div class='add'>+		if (msk_only) {</div><div class='add'>+			cnt = scnprintf(ptr,len,"%s0x%lx",</div><div class='add'>+					(spcFl ? " " : ""),</div><div class='add'>+					um);</div><div class='add'>+			ptr += cnt; len -= cnt; uc += cnt;</div><div class='add'>+			spcFl = !0;</div><div class='add'>+		} else if (um &amp; val) {</div><div class='add'>+			cnt = scnprintf(ptr,len,"%s+0x%lx",</div><div class='add'>+					(spcFl ? " " : ""),</div><div class='add'>+					um &amp; val);</div><div class='add'>+			ptr += cnt; len -= cnt; uc += cnt;</div><div class='add'>+			spcFl = !0;</div><div class='add'>+		} else if (um &amp; ~val) {</div><div class='add'>+			cnt = scnprintf(ptr,len,"%s+0x%lx",</div><div class='add'>+					(spcFl ? " " : ""),</div><div class='add'>+					um &amp; ~val);</div><div class='add'>+			ptr += cnt; len -= cnt; uc += cnt;</div><div class='add'>+			spcFl = !0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return uc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *boolNames[] = {</div><div class='add'>+	"false",</div><div class='add'>+	"true",</div><div class='add'>+	"no",</div><div class='add'>+	"yes",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int parse_token(const char *ptr,unsigned int len,</div><div class='add'>+		       int *valptr,</div><div class='add'>+		       const char **names,unsigned int namecnt)</div><div class='add'>+{</div><div class='add'>+	char buf[33];</div><div class='add'>+	unsigned int slen;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int negfl;</div><div class='add'>+	char *p2;</div><div class='add'>+	*valptr = 0;</div><div class='add'>+	if (!names) namecnt = 0;</div><div class='add'>+	for (idx = 0; idx &lt; namecnt; idx++) {</div><div class='add'>+		if (!names[idx]) continue;</div><div class='add'>+		slen = strlen(names[idx]);</div><div class='add'>+		if (slen != len) continue;</div><div class='add'>+		if (memcmp(names[idx],ptr,slen)) continue;</div><div class='add'>+		*valptr = idx;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	negfl = 0;</div><div class='add'>+	if ((*ptr == '-') || (*ptr == '+')) {</div><div class='add'>+		negfl = (*ptr == '-');</div><div class='add'>+		ptr++; len--;</div><div class='add'>+	}</div><div class='add'>+	if (len &gt;= sizeof(buf)) return -EINVAL;</div><div class='add'>+	memcpy(buf,ptr,len);</div><div class='add'>+	buf[len] = 0;</div><div class='add'>+	*valptr = simple_strtol(buf,&amp;p2,0);</div><div class='add'>+	if (negfl) *valptr = -(*valptr);</div><div class='add'>+	if (*p2) return -EINVAL;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int parse_mtoken(const char *ptr,unsigned int len,</div><div class='add'>+			int *valptr,</div><div class='add'>+			const char **names,int valid_bits)</div><div class='add'>+{</div><div class='add'>+	char buf[33];</div><div class='add'>+	unsigned int slen;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	char *p2;</div><div class='add'>+	int msk;</div><div class='add'>+	*valptr = 0;</div><div class='add'>+	for (idx = 0, msk = 1; valid_bits; idx++, msk &lt;&lt;= 1) {</div><div class='add'>+		if (!msk &amp; valid_bits) continue;</div><div class='add'>+		valid_bits &amp;= ~msk;</div><div class='add'>+		if (!names[idx]) continue;</div><div class='add'>+		slen = strlen(names[idx]);</div><div class='add'>+		if (slen != len) continue;</div><div class='add'>+		if (memcmp(names[idx],ptr,slen)) continue;</div><div class='add'>+		*valptr = msk;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (len &gt;= sizeof(buf)) return -EINVAL;</div><div class='add'>+	memcpy(buf,ptr,len);</div><div class='add'>+	buf[len] = 0;</div><div class='add'>+	*valptr = simple_strtol(buf,&amp;p2,0);</div><div class='add'>+	if (*p2) return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int parse_tlist(const char *ptr,unsigned int len,</div><div class='add'>+		       int *maskptr,int *valptr,</div><div class='add'>+		       const char **names,int valid_bits)</div><div class='add'>+{</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+	int mask,val,kv,mode,ret;</div><div class='add'>+	mask = 0;</div><div class='add'>+	val = 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+	while (len) {</div><div class='add'>+		cnt = 0;</div><div class='add'>+		while ((cnt &lt; len) &amp;&amp;</div><div class='add'>+		       ((ptr[cnt] &lt;= 32) ||</div><div class='add'>+			(ptr[cnt] &gt;= 127))) cnt++;</div><div class='add'>+		ptr += cnt;</div><div class='add'>+		len -= cnt;</div><div class='add'>+		mode = 0;</div><div class='add'>+		if ((*ptr == '-') || (*ptr == '+')) {</div><div class='add'>+			mode = (*ptr == '-') ? -1 : 1;</div><div class='add'>+			ptr++;</div><div class='add'>+			len--;</div><div class='add'>+		}</div><div class='add'>+		cnt = 0;</div><div class='add'>+		while (cnt &lt; len) {</div><div class='add'>+			if (ptr[cnt] &lt;= 32) break;</div><div class='add'>+			if (ptr[cnt] &gt;= 127) break;</div><div class='add'>+			cnt++;</div><div class='add'>+		}</div><div class='add'>+		if (!cnt) break;</div><div class='add'>+		if (parse_mtoken(ptr,cnt,&amp;kv,names,valid_bits)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ptr += cnt;</div><div class='add'>+		len -= cnt;</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case 0:</div><div class='add'>+			mask = valid_bits;</div><div class='add'>+			val |= kv;</div><div class='add'>+			break;</div><div class='add'>+		case -1:</div><div class='add'>+			mask |= kv;</div><div class='add'>+			val &amp;= ~kv;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			mask |= kv;</div><div class='add'>+			val |= kv;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*maskptr = mask;</div><div class='add'>+	*valptr = val;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Convert a symbolic value to a mask/value pair */</div><div class='add'>+int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *cptr,</div><div class='add'>+			   const char *ptr,unsigned int len,</div><div class='add'>+			   int *maskptr,int *valptr)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	*maskptr = 0;</div><div class='add'>+	*valptr = 0;</div><div class='add'>+</div><div class='add'>+	cnt = 0;</div><div class='add'>+	while ((cnt &lt; len) &amp;&amp; ((ptr[cnt] &lt;= 32) || (ptr[cnt] &gt;= 127))) cnt++;</div><div class='add'>+	len -= cnt; ptr += cnt;</div><div class='add'>+	cnt = 0;</div><div class='add'>+	while ((cnt &lt; len) &amp;&amp; ((ptr[len-(cnt+1)] &lt;= 32) ||</div><div class='add'>+			       (ptr[len-(cnt+1)] &gt;= 127))) cnt++;</div><div class='add'>+	len -= cnt;</div><div class='add'>+</div><div class='add'>+	if (!len) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='add'>+			ret = parse_token(ptr,len,valptr,NULL,0);</div><div class='add'>+			if ((ret &gt;= 0) &amp;&amp;</div><div class='add'>+			    ((*valptr &lt; cptr-&gt;info-&gt;def.type_int.min_value) ||</div><div class='add'>+			     (*valptr &gt; cptr-&gt;info-&gt;def.type_int.max_value))) {</div><div class='add'>+				ret = -ERANGE;</div><div class='add'>+			}</div><div class='add'>+			if (maskptr) *maskptr = ~0;</div><div class='add'>+		} else if (cptr-&gt;info-&gt;type == pvr2_ctl_bool) {</div><div class='add'>+			ret = parse_token(</div><div class='add'>+				ptr,len,valptr,boolNames,</div><div class='add'>+				sizeof(boolNames)/sizeof(boolNames[0]));</div><div class='add'>+			if (ret == 1) {</div><div class='add'>+				*valptr = *valptr ? !0 : 0;</div><div class='add'>+			} else if (ret == 0) {</div><div class='add'>+				*valptr = (*valptr &amp; 1) ? !0 : 0;</div><div class='add'>+			}</div><div class='add'>+			if (maskptr) *maskptr = 1;</div><div class='add'>+		} else if (cptr-&gt;info-&gt;type == pvr2_ctl_enum) {</div><div class='add'>+			ret = parse_token(</div><div class='add'>+				ptr,len,valptr,</div><div class='add'>+				cptr-&gt;info-&gt;def.type_enum.value_names,</div><div class='add'>+				cptr-&gt;info-&gt;def.type_enum.count);</div><div class='add'>+			if ((ret &gt;= 0) &amp;&amp;</div><div class='add'>+			    ((*valptr &lt; 0) ||</div><div class='add'>+			     (*valptr &gt;= cptr-&gt;info-&gt;def.type_enum.count))) {</div><div class='add'>+				ret = -ERANGE;</div><div class='add'>+			}</div><div class='add'>+			if (maskptr) *maskptr = ~0;</div><div class='add'>+		} else if (cptr-&gt;info-&gt;type == pvr2_ctl_bitmask) {</div><div class='add'>+			ret = parse_tlist(</div><div class='add'>+				ptr,len,maskptr,valptr,</div><div class='add'>+				cptr-&gt;info-&gt;def.type_bitmask.bit_names,</div><div class='add'>+				cptr-&gt;info-&gt;def.type_bitmask.valid_bits);</div><div class='add'>+		}</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Convert a given mask/val to a symbolic value */</div><div class='add'>+int pvr2_ctrl_value_to_sym_internal(struct pvr2_ctrl *cptr,</div><div class='add'>+				    int mask,int val,</div><div class='add'>+				    char *buf,unsigned int maxlen,</div><div class='add'>+				    unsigned int *len)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	*len = 0;</div><div class='add'>+	if (cptr-&gt;info-&gt;type == pvr2_ctl_int) {</div><div class='add'>+		*len = scnprintf(buf,maxlen,"%d",val);</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else if (cptr-&gt;info-&gt;type == pvr2_ctl_bool) {</div><div class='add'>+		*len = scnprintf(buf,maxlen,"%s",val ? "true" : "false");</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else if (cptr-&gt;info-&gt;type == pvr2_ctl_enum) {</div><div class='add'>+		const char **names;</div><div class='add'>+		names = cptr-&gt;info-&gt;def.type_enum.value_names;</div><div class='add'>+		if ((val &gt;= 0) &amp;&amp;</div><div class='add'>+		    (val &lt; cptr-&gt;info-&gt;def.type_enum.count)) {</div><div class='add'>+			if (names[val]) {</div><div class='add'>+				*len = scnprintf(</div><div class='add'>+					buf,maxlen,"%s",</div><div class='add'>+					names[val]);</div><div class='add'>+			} else {</div><div class='add'>+				*len = 0;</div><div class='add'>+			}</div><div class='add'>+			ret = 0;</div><div class='add'>+		}</div><div class='add'>+	} else if (cptr-&gt;info-&gt;type == pvr2_ctl_bitmask) {</div><div class='add'>+		*len = gen_bitmask_string(</div><div class='add'>+			val &amp; mask &amp; cptr-&gt;info-&gt;def.type_bitmask.valid_bits,</div><div class='add'>+			~0,!0,</div><div class='add'>+			cptr-&gt;info-&gt;def.type_bitmask.bit_names,</div><div class='add'>+			buf,maxlen);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Convert a given mask/val to a symbolic value */</div><div class='add'>+int pvr2_ctrl_value_to_sym(struct pvr2_ctrl *cptr,</div><div class='add'>+			   int mask,int val,</div><div class='add'>+			   char *buf,unsigned int maxlen,</div><div class='add'>+			   unsigned int *len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	LOCK_TAKE(cptr-&gt;hdw-&gt;big_lock); do {</div><div class='add'>+		ret = pvr2_ctrl_value_to_sym_internal(cptr,mask,val,</div><div class='add'>+						      buf,maxlen,len);</div><div class='add'>+	} while(0); LOCK_GIVE(cptr-&gt;hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.h b/drivers/media/video/pvrusb2/pvrusb2-ctrl.h<br/>new file mode 100644<br/>index 000000000000..c1680053cd64<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ctrl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-ctrl.h</a></div><div class='hunk'>@@ -0,0 +1,123 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_CTRL_H</div><div class='add'>+#define __PVRUSB2_CTRL_H</div><div class='add'>+</div><div class='add'>+struct pvr2_ctrl;</div><div class='add'>+</div><div class='add'>+enum pvr2_ctl_type {</div><div class='add'>+	pvr2_ctl_int = 0,</div><div class='add'>+	pvr2_ctl_enum = 1,</div><div class='add'>+	pvr2_ctl_bitmask = 2,</div><div class='add'>+	pvr2_ctl_bool = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Set the given control. */</div><div class='add'>+int pvr2_ctrl_set_value(struct pvr2_ctrl *,int val);</div><div class='add'>+</div><div class='add'>+/* Set/clear specific bits of the given control. */</div><div class='add'>+int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *,int mask,int val);</div><div class='add'>+</div><div class='add'>+/* Get the current value of the given control. */</div><div class='add'>+int pvr2_ctrl_get_value(struct pvr2_ctrl *,int *valptr);</div><div class='add'>+</div><div class='add'>+/* Retrieve control's type */</div><div class='add'>+enum pvr2_ctl_type pvr2_ctrl_get_type(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve control's maximum value (int type) */</div><div class='add'>+int pvr2_ctrl_get_max(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve control's minimum value (int type) */</div><div class='add'>+int pvr2_ctrl_get_min(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve control's default value (any type) */</div><div class='add'>+int pvr2_ctrl_get_def(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve control's enumeration count (enum only) */</div><div class='add'>+int pvr2_ctrl_get_cnt(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve control's valid mask bits (bit mask only) */</div><div class='add'>+int pvr2_ctrl_get_mask(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve the control's name */</div><div class='add'>+const char *pvr2_ctrl_get_name(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve the control's desc */</div><div class='add'>+const char *pvr2_ctrl_get_desc(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Retrieve a control enumeration or bit mask value */</div><div class='add'>+int pvr2_ctrl_get_valname(struct pvr2_ctrl *,int,char *,unsigned int,</div><div class='add'>+			  unsigned int *);</div><div class='add'>+</div><div class='add'>+/* Return true if control is writable */</div><div class='add'>+int pvr2_ctrl_is_writable(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Return V4L flags value for control (or zero if there is no v4l control</div><div class='add'>+   actually under this control) */</div><div class='add'>+unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Return V4L ID for this control or zero if none */</div><div class='add'>+int pvr2_ctrl_get_v4lid(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Return true if control has custom symbolic representation */</div><div class='add'>+int pvr2_ctrl_has_custom_symbols(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* Convert a given mask/val to a custom symbolic value */</div><div class='add'>+int pvr2_ctrl_custom_value_to_sym(struct pvr2_ctrl *,</div><div class='add'>+				  int mask,int val,</div><div class='add'>+				  char *buf,unsigned int maxlen,</div><div class='add'>+				  unsigned int *len);</div><div class='add'>+</div><div class='add'>+/* Convert a symbolic value to a mask/value pair */</div><div class='add'>+int pvr2_ctrl_custom_sym_to_value(struct pvr2_ctrl *,</div><div class='add'>+				  const char *buf,unsigned int len,</div><div class='add'>+				  int *maskptr,int *valptr);</div><div class='add'>+</div><div class='add'>+/* Convert a given mask/val to a symbolic value */</div><div class='add'>+int pvr2_ctrl_value_to_sym(struct pvr2_ctrl *,</div><div class='add'>+			   int mask,int val,</div><div class='add'>+			   char *buf,unsigned int maxlen,</div><div class='add'>+			   unsigned int *len);</div><div class='add'>+</div><div class='add'>+/* Convert a symbolic value to a mask/value pair */</div><div class='add'>+int pvr2_ctrl_sym_to_value(struct pvr2_ctrl *,</div><div class='add'>+			   const char *buf,unsigned int len,</div><div class='add'>+			   int *maskptr,int *valptr);</div><div class='add'>+</div><div class='add'>+/* Convert a given mask/val to a symbolic value - must already be</div><div class='add'>+   inside of critical region. */</div><div class='add'>+int pvr2_ctrl_value_to_sym_internal(struct pvr2_ctrl *,</div><div class='add'>+			   int mask,int val,</div><div class='add'>+			   char *buf,unsigned int maxlen,</div><div class='add'>+			   unsigned int *len);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_CTRL_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c<br/>new file mode 100644<br/>index 000000000000..c80c26be6e4d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   This source file is specifically designed to interface with the</div><div class='add'>+   cx2584x, in kernels 2.6.16 or newer.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-cx2584x-v4l.h"</div><div class='add'>+#include "pvrusb2-video-v4l.h"</div><div class='add'>+#include "pvrusb2-i2c-cmd-v4l2.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;media/cx25840.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l_cx2584x {</div><div class='add'>+	struct pvr2_i2c_handler handler;</div><div class='add'>+	struct pvr2_decoder_ctrl ctrl;</div><div class='add'>+	struct pvr2_i2c_client *client;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	unsigned long stale_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_input(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	struct v4l2_routing route;</div><div class='add'>+	enum cx25840_video_input vid_input;</div><div class='add'>+	enum cx25840_audio_input aud_input;</div><div class='add'>+</div><div class='add'>+	memset(&amp;route,0,sizeof(route));</div><div class='add'>+</div><div class='add'>+	switch(hdw-&gt;input_val) {</div><div class='add'>+	case PVR2_CVAL_INPUT_TV:</div><div class='add'>+		vid_input = CX25840_COMPOSITE7;</div><div class='add'>+		aud_input = CX25840_AUDIO8;</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_COMPOSITE:</div><div class='add'>+		vid_input = CX25840_COMPOSITE3;</div><div class='add'>+		aud_input = CX25840_AUDIO_SERIAL;</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_SVIDEO:</div><div class='add'>+		vid_input = CX25840_SVIDEO1;</div><div class='add'>+		aud_input = CX25840_AUDIO_SERIAL;</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_RADIO:</div><div class='add'>+	default:</div><div class='add'>+		// Just set it to be composite input for now...</div><div class='add'>+		vid_input = CX25840_COMPOSITE3;</div><div class='add'>+		aud_input = CX25840_AUDIO_SERIAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx2584x set_input vid=0x%x aud=0x%x",</div><div class='add'>+		   vid_input,aud_input);</div><div class='add'>+	route.input = (u32)vid_input;</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_S_VIDEO_ROUTING,&amp;route);</div><div class='add'>+	route.input = (u32)aud_input;</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_S_AUDIO_ROUTING,&amp;route);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_input(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	return hdw-&gt;input_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_audio(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx2584x set_audio %d",</div><div class='add'>+		   hdw-&gt;srate_val);</div><div class='add'>+	switch (hdw-&gt;srate_val) {</div><div class='add'>+	default:</div><div class='add'>+	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000:</div><div class='add'>+		val = 48000;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100:</div><div class='add'>+		val = 44100;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000:</div><div class='add'>+		val = 32000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_AUDIO_CLOCK_FREQ,&amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_audio(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	return hdw-&gt;srate_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l_cx2584x_ops {</div><div class='add'>+	void (*update)(struct pvr2_v4l_cx2584x *);</div><div class='add'>+	int (*check)(struct pvr2_v4l_cx2584x *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = {</div><div class='add'>+	{ .update = set_input, .check = check_input},</div><div class='add'>+	{ .update = set_audio, .check = check_audio},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;client-&gt;handler = NULL;</div><div class='add'>+	ctxt-&gt;hdw-&gt;decoder_ctrl = NULL;</div><div class='add'>+	kfree(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int decoder_check(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(decoder_ops)/sizeof(decoder_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (ctxt-&gt;stale_mask &amp; msk) continue;</div><div class='add'>+		if (decoder_ops[idx].check(ctxt)) {</div><div class='add'>+			ctxt-&gt;stale_mask |= msk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ctxt-&gt;stale_mask != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_update(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(decoder_ops)/sizeof(decoder_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (!(ctxt-&gt;stale_mask &amp; msk)) continue;</div><div class='add'>+		ctxt-&gt;stale_mask &amp;= ~msk;</div><div class='add'>+		decoder_ops[idx].update(ctxt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_enable(struct pvr2_v4l_cx2584x *ctxt,int fl)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_enable(%d)",fl);</div><div class='add'>+	pvr2_v4l2_cmd_stream(ctxt-&gt;client,fl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int decoder_detect(struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	/* Attempt to query the decoder - let's see if it will answer */</div><div class='add'>+	struct v4l2_queryctrl qc;</div><div class='add'>+</div><div class='add'>+	memset(&amp;qc,0,sizeof(qc));</div><div class='add'>+</div><div class='add'>+	qc.id = V4L2_CID_BRIGHTNESS;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_i2c_client_cmd(cp,VIDIOC_QUERYCTRL,&amp;qc);</div><div class='add'>+	return ret == 0; /* Return true if it answered */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int decoder_is_tuned(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_tuner vt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;vt,0,sizeof(vt));</div><div class='add'>+	ret = pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_G_TUNER,&amp;vt);</div><div class='add'>+	if (ret &lt; 0) return -EINVAL;</div><div class='add'>+	return vt.signal ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt,</div><div class='add'>+				     char *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf,cnt,"handler: pvrusb2-cx2584x-v4l");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	ret = pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_RESET,NULL);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const static struct pvr2_i2c_handler_functions hfuncs = {</div><div class='add'>+	.detach = (void (*)(void *))decoder_detach,</div><div class='add'>+	.check = (int (*)(void *))decoder_check,</div><div class='add'>+	.update = (void (*)(void *))decoder_update,</div><div class='add'>+	.describe = (unsigned int (*)(void *,char *,unsigned int))decoder_describe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw,</div><div class='add'>+			       struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l_cx2584x *ctxt;</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;decoder_ctrl) return 0;</div><div class='add'>+	if (cp-&gt;handler) return 0;</div><div class='add'>+	if (!decoder_detect(cp)) return 0;</div><div class='add'>+</div><div class='add'>+	ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);</div><div class='add'>+	if (!ctxt) return 0;</div><div class='add'>+	memset(ctxt,0,sizeof(*ctxt));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;handler.func_data = ctxt;</div><div class='add'>+	ctxt-&gt;handler.func_table = &amp;hfuncs;</div><div class='add'>+	ctxt-&gt;ctrl.ctxt = ctxt;</div><div class='add'>+	ctxt-&gt;ctrl.detach = (void (*)(void *))decoder_detach;</div><div class='add'>+	ctxt-&gt;ctrl.enable = (void (*)(void *,int))decoder_enable;</div><div class='add'>+	ctxt-&gt;ctrl.tuned = (int (*)(void *))decoder_is_tuned;</div><div class='add'>+	ctxt-&gt;ctrl.force_reset = (void (*)(void*))decoder_reset;</div><div class='add'>+	ctxt-&gt;client = cp;</div><div class='add'>+	ctxt-&gt;hdw = hdw;</div><div class='add'>+	ctxt-&gt;stale_mask = (1 &lt;&lt; (sizeof(decoder_ops)/</div><div class='add'>+				  sizeof(decoder_ops[0]))) - 1;</div><div class='add'>+	hdw-&gt;decoder_ctrl = &amp;ctxt-&gt;ctrl;</div><div class='add'>+	cp-&gt;handler = &amp;ctxt-&gt;handler;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x cx2584x V4L2 handler set up",</div><div class='add'>+		   cp-&gt;client-&gt;addr);</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h<br/>new file mode 100644<br/>index 000000000000..54b2844e7a71<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_CX2584X_V4L_H</div><div class='add'>+#define __PVRUSB2_CX2584X_V4L_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   This module connects the pvrusb2 driver to the I2C chip level</div><div class='add'>+   driver which handles combined device audio &amp; video processing.</div><div class='add'>+   This interface is used internally by the driver; higher level code</div><div class='add'>+   should only interact through the interface provided by</div><div class='add'>+   pvrusb2-hdw.h.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_CX2584X_V4L_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-debug.h b/drivers/media/video/pvrusb2/pvrusb2-debug.h<br/>new file mode 100644<br/>index 000000000000..d95a8588e4f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-debug.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/*</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_DEBUG_H</div><div class='add'>+#define __PVRUSB2_DEBUG_H</div><div class='add'>+</div><div class='add'>+extern int pvrusb2_debug;</div><div class='add'>+</div><div class='add'>+#define pvr2_trace(msk, fmt, arg...) do {if(msk &amp; pvrusb2_debug) printk(KERN_INFO "pvrusb2: " fmt "\n", ##arg); } while (0)</div><div class='add'>+</div><div class='add'>+/* These are listed in *rough* order of decreasing usefulness and</div><div class='add'>+   increasing noise level. */</div><div class='add'>+#define PVR2_TRACE_INFO       (1 &lt;&lt;  0) // Normal messages</div><div class='add'>+#define PVR2_TRACE_ERROR_LEGS (1 &lt;&lt;  1) // error messages</div><div class='add'>+#define PVR2_TRACE_TOLERANCE  (1 &lt;&lt;  2) // track tolerance-affected errors</div><div class='add'>+#define PVR2_TRACE_TRAP       (1 &lt;&lt;  3) // Trap &amp; report misbehavior from app</div><div class='add'>+#define PVR2_TRACE_INIT       (1 &lt;&lt;  4) // misc initialization steps</div><div class='add'>+#define PVR2_TRACE_START_STOP (1 &lt;&lt;  5) // Streaming start / stop</div><div class='add'>+#define PVR2_TRACE_CTL        (1 &lt;&lt;  6) // commit of control changes</div><div class='add'>+#define PVR2_TRACE_DEBUG      (1 &lt;&lt;  7) // Temporary debug code</div><div class='add'>+#define PVR2_TRACE_EEPROM     (1 &lt;&lt;  8) // eeprom parsing / report</div><div class='add'>+#define PVR2_TRACE_STRUCT     (1 &lt;&lt;  9) // internal struct creation</div><div class='add'>+#define PVR2_TRACE_OPEN_CLOSE (1 &lt;&lt; 10) // application open / close</div><div class='add'>+#define PVR2_TRACE_CREG       (1 &lt;&lt; 11) // Main critical region entry / exit</div><div class='add'>+#define PVR2_TRACE_SYSFS      (1 &lt;&lt; 12) // Sysfs driven I/O</div><div class='add'>+#define PVR2_TRACE_FIRMWARE   (1 &lt;&lt; 13) // firmware upload actions</div><div class='add'>+#define PVR2_TRACE_CHIPS      (1 &lt;&lt; 14) // chip broadcast operation</div><div class='add'>+#define PVR2_TRACE_I2C        (1 &lt;&lt; 15) // I2C related stuff</div><div class='add'>+#define PVR2_TRACE_I2C_CMD    (1 &lt;&lt; 16) // Software commands to I2C modules</div><div class='add'>+#define PVR2_TRACE_I2C_CORE   (1 &lt;&lt; 17) // I2C core debugging</div><div class='add'>+#define PVR2_TRACE_I2C_TRAF   (1 &lt;&lt; 18) // I2C traffic through the adapter</div><div class='add'>+#define PVR2_TRACE_V4LIOCTL   (1 &lt;&lt; 19) // v4l ioctl details</div><div class='add'>+#define PVR2_TRACE_ENCODER    (1 &lt;&lt; 20) // mpeg2 encoder operation</div><div class='add'>+#define PVR2_TRACE_BUF_POOL   (1 &lt;&lt; 21) // Track buffer pool management</div><div class='add'>+#define PVR2_TRACE_BUF_FLOW   (1 &lt;&lt; 22) // Track buffer flow in system</div><div class='add'>+#define PVR2_TRACE_DATA_FLOW  (1 &lt;&lt; 23) // Track data flow</div><div class='add'>+#define PVR2_TRACE_DEBUGIFC   (1 &lt;&lt; 24) // Debug interface actions</div><div class='add'>+#define PVR2_TRACE_GPIO       (1 &lt;&lt; 25) // GPIO state bit changes</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_HDW_INTERNAL_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c<br/>new file mode 100644<br/>index 000000000000..f985f00d885a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-debugifc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-debugifc.c</a></div><div class='hunk'>@@ -0,0 +1,478 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "pvrusb2-debugifc.h"</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+struct debugifc_mask_item {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned long msk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct debugifc_mask_item mask_items[] = {</div><div class='add'>+	{"ENC_FIRMWARE",(1&lt;&lt;PVR2_SUBSYS_B_ENC_FIRMWARE)},</div><div class='add'>+	{"ENC_CFG",(1&lt;&lt;PVR2_SUBSYS_B_ENC_CFG)},</div><div class='add'>+	{"DIG_RUN",(1&lt;&lt;PVR2_SUBSYS_B_DIGITIZER_RUN)},</div><div class='add'>+	{"USB_RUN",(1&lt;&lt;PVR2_SUBSYS_B_USBSTREAM_RUN)},</div><div class='add'>+	{"ENC_RUN",(1&lt;&lt;PVR2_SUBSYS_B_ENC_RUN)},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int debugifc_count_whitespace(const char *buf,</div><div class='add'>+					      unsigned int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int scnt;</div><div class='add'>+	char ch;</div><div class='add'>+</div><div class='add'>+	for (scnt = 0; scnt &lt; count; scnt++) {</div><div class='add'>+		ch = buf[scnt];</div><div class='add'>+		if (ch == ' ') continue;</div><div class='add'>+		if (ch == '\t') continue;</div><div class='add'>+		if (ch == '\n') continue;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return scnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int debugifc_count_nonwhitespace(const char *buf,</div><div class='add'>+						 unsigned int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int scnt;</div><div class='add'>+	char ch;</div><div class='add'>+</div><div class='add'>+	for (scnt = 0; scnt &lt; count; scnt++) {</div><div class='add'>+		ch = buf[scnt];</div><div class='add'>+		if (ch == ' ') break;</div><div class='add'>+		if (ch == '\t') break;</div><div class='add'>+		if (ch == '\n') break;</div><div class='add'>+	}</div><div class='add'>+	return scnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int debugifc_isolate_word(const char *buf,unsigned int count,</div><div class='add'>+					  const char **wstrPtr,</div><div class='add'>+					  unsigned int *wlenPtr)</div><div class='add'>+{</div><div class='add'>+	const char *wptr;</div><div class='add'>+	unsigned int consume_cnt = 0;</div><div class='add'>+	unsigned int wlen;</div><div class='add'>+	unsigned int scnt;</div><div class='add'>+</div><div class='add'>+	wptr = NULL;</div><div class='add'>+	wlen = 0;</div><div class='add'>+	scnt = debugifc_count_whitespace(buf,count);</div><div class='add'>+	consume_cnt += scnt; count -= scnt; buf += scnt;</div><div class='add'>+	if (!count) goto done;</div><div class='add'>+</div><div class='add'>+	scnt = debugifc_count_nonwhitespace(buf,count);</div><div class='add'>+	if (!scnt) goto done;</div><div class='add'>+	wptr = buf;</div><div class='add'>+	wlen = scnt;</div><div class='add'>+	consume_cnt += scnt; count -= scnt; buf += scnt;</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	*wstrPtr = wptr;</div><div class='add'>+	*wlenPtr = wlen;</div><div class='add'>+	return consume_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int debugifc_parse_unsigned_number(const char *buf,unsigned int count,</div><div class='add'>+					  u32 *num_ptr)</div><div class='add'>+{</div><div class='add'>+	u32 result = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ch;</div><div class='add'>+	int radix = 10;</div><div class='add'>+	if ((count &gt;= 2) &amp;&amp; (buf[0] == '0') &amp;&amp;</div><div class='add'>+	    ((buf[1] == 'x') || (buf[1] == 'X'))) {</div><div class='add'>+		radix = 16;</div><div class='add'>+		count -= 2;</div><div class='add'>+		buf += 2;</div><div class='add'>+	} else if ((count &gt;= 1) &amp;&amp; (buf[0] == '0')) {</div><div class='add'>+		radix = 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (count--) {</div><div class='add'>+		ch = *buf++;</div><div class='add'>+		if ((ch &gt;= '0') &amp;&amp; (ch &lt;= '9')) {</div><div class='add'>+			val = ch - '0';</div><div class='add'>+		} else if ((ch &gt;= 'a') &amp;&amp; (ch &lt;= 'f')) {</div><div class='add'>+			val = ch - 'a' + 10;</div><div class='add'>+		} else if ((ch &gt;= 'A') &amp;&amp; (ch &lt;= 'F')) {</div><div class='add'>+			val = ch - 'A' + 10;</div><div class='add'>+		} else {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (val &gt;= radix) return -EINVAL;</div><div class='add'>+		result *= radix;</div><div class='add'>+		result += val;</div><div class='add'>+	}</div><div class='add'>+	*num_ptr = result;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int debugifc_match_keyword(const char *buf,unsigned int count,</div><div class='add'>+				  const char *keyword)</div><div class='add'>+{</div><div class='add'>+	unsigned int kl;</div><div class='add'>+	if (!keyword) return 0;</div><div class='add'>+	kl = strlen(keyword);</div><div class='add'>+	if (kl != count) return 0;</div><div class='add'>+	return !memcmp(buf,keyword,kl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned long debugifc_find_mask(const char *buf,unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct debugifc_mask_item *mip;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(mask_items)/sizeof(mask_items[0]); idx++) {</div><div class='add'>+		mip = mask_items + idx;</div><div class='add'>+		if (debugifc_match_keyword(buf,count,mip-&gt;name)) {</div><div class='add'>+			return mip-&gt;msk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int debugifc_print_mask(char *buf,unsigned int sz,</div><div class='add'>+			       unsigned long msk,unsigned long val)</div><div class='add'>+{</div><div class='add'>+	struct debugifc_mask_item *mip;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int bcnt = 0;</div><div class='add'>+	int ccnt;</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(mask_items)/sizeof(mask_items[0]); idx++) {</div><div class='add'>+		mip = mask_items + idx;</div><div class='add'>+		if (!(mip-&gt;msk &amp; msk)) continue;</div><div class='add'>+		ccnt = scnprintf(buf,sz,"%s%c%s",</div><div class='add'>+				 (bcnt ? " " : ""),</div><div class='add'>+				 ((mip-&gt;msk &amp; val) ? '+' : '-'),</div><div class='add'>+				 mip-&gt;name);</div><div class='add'>+		sz -= ccnt;</div><div class='add'>+		buf += ccnt;</div><div class='add'>+		bcnt += ccnt;</div><div class='add'>+	}</div><div class='add'>+	return bcnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int debugifc_parse_subsys_mask(const char *buf,</div><div class='add'>+					       unsigned int count,</div><div class='add'>+					       unsigned long *mskPtr,</div><div class='add'>+					       unsigned long *valPtr)</div><div class='add'>+{</div><div class='add'>+	const char *wptr;</div><div class='add'>+	unsigned int consume_cnt = 0;</div><div class='add'>+	unsigned int scnt;</div><div class='add'>+	unsigned int wlen;</div><div class='add'>+	int mode;</div><div class='add'>+	unsigned long m1,msk,val;</div><div class='add'>+</div><div class='add'>+	msk = 0;</div><div class='add'>+	val = 0;</div><div class='add'>+</div><div class='add'>+	while (count) {</div><div class='add'>+		scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+		if (!scnt) break;</div><div class='add'>+		consume_cnt += scnt; count -= scnt; buf += scnt;</div><div class='add'>+		if (!wptr) break;</div><div class='add'>+</div><div class='add'>+		mode = 0;</div><div class='add'>+		if (wlen) switch (wptr[0]) {</div><div class='add'>+		case '+':</div><div class='add'>+			wptr++;</div><div class='add'>+			wlen--;</div><div class='add'>+			break;</div><div class='add'>+		case '-':</div><div class='add'>+			mode = 1;</div><div class='add'>+			wptr++;</div><div class='add'>+			wlen--;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!wlen) continue;</div><div class='add'>+		m1 = debugifc_find_mask(wptr,wlen);</div><div class='add'>+		if (!m1) break;</div><div class='add'>+		msk |= m1;</div><div class='add'>+		if (!mode) val |= m1;</div><div class='add'>+	}</div><div class='add'>+	*mskPtr = msk;</div><div class='add'>+	*valPtr = val;</div><div class='add'>+	return consume_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_debugifc_print_info(struct pvr2_hdw *hdw,char *buf,unsigned int acnt)</div><div class='add'>+{</div><div class='add'>+	int bcnt = 0;</div><div class='add'>+	int ccnt;</div><div class='add'>+	struct pvr2_hdw_debug_info dbg;</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_get_debug_info(hdw,&amp;dbg);</div><div class='add'>+</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"big lock %s; ctl lock %s",</div><div class='add'>+			 (dbg.big_lock_held ? "held" : "free"),</div><div class='add'>+			 (dbg.ctl_lock_held ? "held" : "free"));</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	if (dbg.ctl_lock_held) {</div><div class='add'>+		ccnt = scnprintf(buf,acnt,"; cmd_state=%d cmd_code=%d"</div><div class='add'>+				 " cmd_wlen=%d cmd_rlen=%d"</div><div class='add'>+				 " wpend=%d rpend=%d tmout=%d rstatus=%d"</div><div class='add'>+				 " wstatus=%d",</div><div class='add'>+				 dbg.cmd_debug_state,dbg.cmd_code,</div><div class='add'>+				 dbg.cmd_debug_write_len,</div><div class='add'>+				 dbg.cmd_debug_read_len,</div><div class='add'>+				 dbg.cmd_debug_write_pend,</div><div class='add'>+				 dbg.cmd_debug_read_pend,</div><div class='add'>+				 dbg.cmd_debug_timeout,</div><div class='add'>+				 dbg.cmd_debug_rstatus,</div><div class='add'>+				 dbg.cmd_debug_wstatus);</div><div class='add'>+		bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	}</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(</div><div class='add'>+		buf,acnt,"driver flags: %s %s %s\n",</div><div class='add'>+		(dbg.flag_init_ok ? "initialized" : "uninitialized"),</div><div class='add'>+		(dbg.flag_ok ? "ok" : "fail"),</div><div class='add'>+		(dbg.flag_disconnected ? "disconnected" : "connected"));</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Subsystems enabled / configured: ");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = debugifc_print_mask(buf,acnt,dbg.subsys_flags,dbg.subsys_flags);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Subsystems disabled / unconfigured: ");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = debugifc_print_mask(buf,acnt,~dbg.subsys_flags,dbg.subsys_flags);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Attached I2C modules:\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = pvr2_i2c_report(hdw,buf,acnt);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	return bcnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_debugifc_print_status(struct pvr2_hdw *hdw,</div><div class='add'>+			       char *buf,unsigned int acnt)</div><div class='add'>+{</div><div class='add'>+	int bcnt = 0;</div><div class='add'>+	int ccnt;</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 gpio_dir,gpio_in,gpio_out;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_hdw_is_hsm(hdw);</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"USB link speed: %s\n",</div><div class='add'>+			 (ret &lt; 0 ? "FAIL" : (ret ? "high" : "full")));</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	gpio_dir = 0; gpio_in = 0; gpio_out = 0;</div><div class='add'>+	pvr2_hdw_gpio_get_dir(hdw,&amp;gpio_dir);</div><div class='add'>+	pvr2_hdw_gpio_get_out(hdw,&amp;gpio_out);</div><div class='add'>+	pvr2_hdw_gpio_get_in(hdw,&amp;gpio_in);</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"GPIO state: dir=0x%x in=0x%x out=0x%x\n",</div><div class='add'>+			 gpio_dir,gpio_in,gpio_out);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Streaming is %s\n",</div><div class='add'>+			 pvr2_hdw_get_streaming(hdw) ? "on" : "off");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	msk = pvr2_hdw_subsys_get(hdw);</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Subsystems enabled / configured: ");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = debugifc_print_mask(buf,acnt,msk,msk);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Subsystems disabled / unconfigured: ");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = debugifc_print_mask(buf,acnt,~msk,msk);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	msk = pvr2_hdw_subsys_stream_get(hdw);</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"Subsystems stopped on stream shutdown: ");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = debugifc_print_mask(buf,acnt,msk,msk);</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+	ccnt = scnprintf(buf,acnt,"\n");</div><div class='add'>+	bcnt += ccnt; acnt -= ccnt; buf += ccnt;</div><div class='add'>+</div><div class='add'>+	return bcnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,</div><div class='add'>+				unsigned int count)</div><div class='add'>+{</div><div class='add'>+	const char *wptr;</div><div class='add'>+	unsigned int wlen;</div><div class='add'>+	unsigned int scnt;</div><div class='add'>+</div><div class='add'>+	scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+	if (!scnt) return 0;</div><div class='add'>+	count -= scnt; buf += scnt;</div><div class='add'>+	if (!wptr) return 0;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_DEBUGIFC,"debugifc cmd: \"%.*s\"",wlen,wptr);</div><div class='add'>+	if (debugifc_match_keyword(wptr,wlen,"reset")) {</div><div class='add'>+		scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+		if (!scnt) return -EINVAL;</div><div class='add'>+		count -= scnt; buf += scnt;</div><div class='add'>+		if (!wptr) return -EINVAL;</div><div class='add'>+		if (debugifc_match_keyword(wptr,wlen,"cpu")) {</div><div class='add'>+			pvr2_hdw_cpureset_assert(hdw,!0);</div><div class='add'>+			pvr2_hdw_cpureset_assert(hdw,0);</div><div class='add'>+			return 0;</div><div class='add'>+		} else if (debugifc_match_keyword(wptr,wlen,"bus")) {</div><div class='add'>+			pvr2_hdw_device_reset(hdw);</div><div class='add'>+		} else if (debugifc_match_keyword(wptr,wlen,"soft")) {</div><div class='add'>+			return pvr2_hdw_cmd_powerup(hdw);</div><div class='add'>+		} else if (debugifc_match_keyword(wptr,wlen,"deep")) {</div><div class='add'>+			return pvr2_hdw_cmd_deep_reset(hdw);</div><div class='add'>+		} else if (debugifc_match_keyword(wptr,wlen,"firmware")) {</div><div class='add'>+			return pvr2_upload_firmware2(hdw);</div><div class='add'>+		} else if (debugifc_match_keyword(wptr,wlen,"decoder")) {</div><div class='add'>+			return pvr2_hdw_cmd_decoder_reset(hdw);</div><div class='add'>+		}</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (debugifc_match_keyword(wptr,wlen,"subsys_flags")) {</div><div class='add'>+		unsigned long msk = 0;</div><div class='add'>+		unsigned long val = 0;</div><div class='add'>+		if (debugifc_parse_subsys_mask(buf,count,&amp;msk,&amp;val) != count) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_DEBUGIFC,</div><div class='add'>+				   "debugifc parse error on subsys mask");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		pvr2_hdw_subsys_bit_chg(hdw,msk,val);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (debugifc_match_keyword(wptr,wlen,"stream_flags")) {</div><div class='add'>+		unsigned long msk = 0;</div><div class='add'>+		unsigned long val = 0;</div><div class='add'>+		if (debugifc_parse_subsys_mask(buf,count,&amp;msk,&amp;val) != count) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_DEBUGIFC,</div><div class='add'>+				   "debugifc parse error on stream mask");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		pvr2_hdw_subsys_stream_bit_chg(hdw,msk,val);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (debugifc_match_keyword(wptr,wlen,"cpufw")) {</div><div class='add'>+		scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+		if (!scnt) return -EINVAL;</div><div class='add'>+		count -= scnt; buf += scnt;</div><div class='add'>+		if (!wptr) return -EINVAL;</div><div class='add'>+		if (debugifc_match_keyword(wptr,wlen,"fetch")) {</div><div class='add'>+			pvr2_hdw_cpufw_set_enabled(hdw,!0);</div><div class='add'>+			return 0;</div><div class='add'>+		} else if (debugifc_match_keyword(wptr,wlen,"done")) {</div><div class='add'>+			pvr2_hdw_cpufw_set_enabled(hdw,0);</div><div class='add'>+			return 0;</div><div class='add'>+		} else {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (debugifc_match_keyword(wptr,wlen,"gpio")) {</div><div class='add'>+		int dir_fl = 0;</div><div class='add'>+		int ret;</div><div class='add'>+		u32 msk,val;</div><div class='add'>+		scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+		if (!scnt) return -EINVAL;</div><div class='add'>+		count -= scnt; buf += scnt;</div><div class='add'>+		if (!wptr) return -EINVAL;</div><div class='add'>+		if (debugifc_match_keyword(wptr,wlen,"dir")) {</div><div class='add'>+			dir_fl = !0;</div><div class='add'>+		} else if (!debugifc_match_keyword(wptr,wlen,"out")) {</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+		if (!scnt) return -EINVAL;</div><div class='add'>+		count -= scnt; buf += scnt;</div><div class='add'>+		if (!wptr) return -EINVAL;</div><div class='add'>+		ret = debugifc_parse_unsigned_number(wptr,wlen,&amp;msk);</div><div class='add'>+		if (ret) return ret;</div><div class='add'>+		scnt = debugifc_isolate_word(buf,count,&amp;wptr,&amp;wlen);</div><div class='add'>+		if (wptr) {</div><div class='add'>+			ret = debugifc_parse_unsigned_number(wptr,wlen,&amp;val);</div><div class='add'>+			if (ret) return ret;</div><div class='add'>+		} else {</div><div class='add'>+			val = msk;</div><div class='add'>+			msk = 0xffffffff;</div><div class='add'>+		}</div><div class='add'>+		if (dir_fl) {</div><div class='add'>+			ret = pvr2_hdw_gpio_chg_dir(hdw,msk,val);</div><div class='add'>+		} else {</div><div class='add'>+			ret = pvr2_hdw_gpio_chg_out(hdw,msk,val);</div><div class='add'>+		}</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	pvr2_trace(PVR2_TRACE_DEBUGIFC,</div><div class='add'>+		   "debugifc failed to recognize cmd: \"%.*s\"",wlen,wptr);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_debugifc_docmd(struct pvr2_hdw *hdw,const char *buf,</div><div class='add'>+			unsigned int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int bcnt = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (count) {</div><div class='add'>+		for (bcnt = 0; bcnt &lt; count; bcnt++) {</div><div class='add'>+			if (buf[bcnt] == '\n') break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = pvr2_debugifc_do1cmd(hdw,buf,bcnt);</div><div class='add'>+		if (ret &lt; 0) return ret;</div><div class='add'>+		if (bcnt &lt; count) bcnt++;</div><div class='add'>+		buf += bcnt;</div><div class='add'>+		count -= bcnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.h b/drivers/media/video/pvrusb2/pvrusb2-debugifc.h<br/>new file mode 100644<br/>index 000000000000..990b02d35d36<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-debugifc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-debugifc.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_DEBUGIFC_H</div><div class='add'>+#define __PVRUSB2_DEBUGIFC_H</div><div class='add'>+</div><div class='add'>+struct pvr2_hdw;</div><div class='add'>+</div><div class='add'>+/* Non-intrusively print some useful debugging info from inside the</div><div class='add'>+   driver.  This should work even if the driver appears to be</div><div class='add'>+   wedged. */</div><div class='add'>+int pvr2_debugifc_print_info(struct pvr2_hdw *,</div><div class='add'>+			     char *buf_ptr,unsigned int buf_size);</div><div class='add'>+</div><div class='add'>+/* Print general status of driver.  This will also trigger a probe of</div><div class='add'>+   the USB link.  Unlike print_info(), this one synchronizes with the</div><div class='add'>+   driver so the information should be self-consistent (but it will</div><div class='add'>+   hang if the driver is wedged). */</div><div class='add'>+int pvr2_debugifc_print_status(struct pvr2_hdw *,</div><div class='add'>+			       char *buf_ptr,unsigned int buf_size);</div><div class='add'>+</div><div class='add'>+/* Parse a string command into a driver action. */</div><div class='add'>+int pvr2_debugifc_docmd(struct pvr2_hdw *,</div><div class='add'>+			const char *buf_ptr,unsigned int buf_size);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_DEBUGIFC_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c<br/>new file mode 100644<br/>index 000000000000..6cff8e75f426<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-eeprom.c</a></div><div class='hunk'>@@ -0,0 +1,164 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-eeprom.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+</div><div class='add'>+#define trace_eeprom(...) pvr2_trace(PVR2_TRACE_EEPROM,__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   Read and analyze data in the eeprom.  Use tveeprom to figure out</div><div class='add'>+   the packet structure, since this is another Hauppauge device and</div><div class='add'>+   internally it has a family resemblence to ivtv-type devices</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;media/tveeprom.h&gt;</div><div class='add'>+</div><div class='add'>+/* We seem to only be interested in the last 128 bytes of the EEPROM */</div><div class='add'>+#define EEPROM_SIZE 128</div><div class='add'>+</div><div class='add'>+/* Grab EEPROM contents, needed for direct method. */</div><div class='add'>+static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct i2c_msg msg[2];</div><div class='add'>+	u8 *eeprom;</div><div class='add'>+	u8 iadd[2];</div><div class='add'>+	u8 addr;</div><div class='add'>+	u16 eepromSize;</div><div class='add'>+	unsigned int offs;</div><div class='add'>+	int ret;</div><div class='add'>+	int mode16 = 0;</div><div class='add'>+	unsigned pcnt,tcnt;</div><div class='add'>+	eeprom = kmalloc(EEPROM_SIZE,GFP_KERNEL);</div><div class='add'>+	if (!eeprom) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Failed to allocate memory"</div><div class='add'>+			   " required to read eeprom");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_eeprom("Value for eeprom addr from controller was 0x%x",</div><div class='add'>+		     hdw-&gt;eeprom_addr);</div><div class='add'>+	addr = hdw-&gt;eeprom_addr;</div><div class='add'>+	/* Seems that if the high bit is set, then the *real* eeprom</div><div class='add'>+	   address is shifted right now bit position (noticed this in</div><div class='add'>+	   newer PVR USB2 hardware) */</div><div class='add'>+	if (addr &amp; 0x80) addr &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	/* FX2 documentation states that a 16bit-addressed eeprom is</div><div class='add'>+	   expected if the I2C address is an odd number (yeah, this is</div><div class='add'>+	   strange but it's what they do) */</div><div class='add'>+	mode16 = (addr &amp; 1);</div><div class='add'>+	eepromSize = (mode16 ? 4096 : 256);</div><div class='add'>+	trace_eeprom("Examining %d byte eeprom at location 0x%x"</div><div class='add'>+		     " using %d bit addressing",eepromSize,addr,</div><div class='add'>+		     mode16 ? 16 : 8);</div><div class='add'>+</div><div class='add'>+	msg[0].addr = addr;</div><div class='add'>+	msg[0].flags = 0;</div><div class='add'>+	msg[0].len = mode16 ? 2 : 1;</div><div class='add'>+	msg[0].buf = iadd;</div><div class='add'>+	msg[1].addr = addr;</div><div class='add'>+	msg[1].flags = I2C_M_RD;</div><div class='add'>+</div><div class='add'>+	/* We have to do the actual eeprom data fetch ourselves, because</div><div class='add'>+	   (1) we're only fetching part of the eeprom, and (2) if we were</div><div class='add'>+	   getting the whole thing our I2C driver can't grab it in one</div><div class='add'>+	   pass - which is what tveeprom is otherwise going to attempt */</div><div class='add'>+	memset(eeprom,0,EEPROM_SIZE);</div><div class='add'>+	for (tcnt = 0; tcnt &lt; EEPROM_SIZE; tcnt += pcnt) {</div><div class='add'>+		pcnt = 16;</div><div class='add'>+		if (pcnt + tcnt &gt; EEPROM_SIZE) pcnt = EEPROM_SIZE-tcnt;</div><div class='add'>+		offs = tcnt + (eepromSize - EEPROM_SIZE);</div><div class='add'>+		if (mode16) {</div><div class='add'>+			iadd[0] = offs &gt;&gt; 8;</div><div class='add'>+			iadd[1] = offs;</div><div class='add'>+		} else {</div><div class='add'>+			iadd[0] = offs;</div><div class='add'>+		}</div><div class='add'>+		msg[1].len = pcnt;</div><div class='add'>+		msg[1].buf = eeprom+tcnt;</div><div class='add'>+		if ((ret = i2c_transfer(</div><div class='add'>+			     &amp;hdw-&gt;i2c_adap,</div><div class='add'>+			     msg,sizeof(msg)/sizeof(msg[0]))) != 2) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "eeprom fetch set offs err=%d",ret);</div><div class='add'>+			kfree(eeprom);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return eeprom;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Directly call eeprom analysis function within tveeprom. */</div><div class='add'>+int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	u8 *eeprom;</div><div class='add'>+	struct tveeprom tvdata;</div><div class='add'>+</div><div class='add'>+	memset(&amp;tvdata,0,sizeof(tvdata));</div><div class='add'>+</div><div class='add'>+	eeprom = pvr2_eeprom_fetch(hdw);</div><div class='add'>+	if (!eeprom) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		struct i2c_client fake_client;</div><div class='add'>+		/* Newer version expects a useless client interface */</div><div class='add'>+		fake_client.addr = hdw-&gt;eeprom_addr;</div><div class='add'>+		fake_client.adapter = &amp;hdw-&gt;i2c_adap;</div><div class='add'>+		tveeprom_hauppauge_analog(&amp;fake_client,&amp;tvdata,eeprom);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_eeprom("eeprom assumed v4l tveeprom module");</div><div class='add'>+	trace_eeprom("eeprom direct call results:");</div><div class='add'>+	trace_eeprom("has_radio=%d",tvdata.has_radio);</div><div class='add'>+	trace_eeprom("tuner_type=%d",tvdata.tuner_type);</div><div class='add'>+	trace_eeprom("tuner_formats=0x%x",tvdata.tuner_formats);</div><div class='add'>+	trace_eeprom("audio_processor=%d",tvdata.audio_processor);</div><div class='add'>+	trace_eeprom("model=%d",tvdata.model);</div><div class='add'>+	trace_eeprom("revision=%d",tvdata.revision);</div><div class='add'>+	trace_eeprom("serial_number=%d",tvdata.serial_number);</div><div class='add'>+	trace_eeprom("rev_str=%s",tvdata.rev_str);</div><div class='add'>+	hdw-&gt;tuner_type = tvdata.tuner_type;</div><div class='add'>+	hdw-&gt;serial_number = tvdata.serial_number;</div><div class='add'>+	hdw-&gt;std_mask_eeprom = tvdata.tuner_formats;</div><div class='add'>+</div><div class='add'>+	kfree(eeprom);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h b/drivers/media/video/pvrusb2/pvrusb2-eeprom.h<br/>new file mode 100644<br/>index 000000000000..84242975dea7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-eeprom.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-eeprom.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_EEPROM_H</div><div class='add'>+#define __PVRUSB2_EEPROM_H</div><div class='add'>+</div><div class='add'>+struct pvr2_hdw;</div><div class='add'>+</div><div class='add'>+int pvr2_eeprom_analyze(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_EEPROM_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c<br/>new file mode 100644<br/>index 000000000000..18a7073501c6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-encoder.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-encoder.c</a></div><div class='hunk'>@@ -0,0 +1,418 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;   // for linux/firmware.h</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include "pvrusb2-util.h"</div><div class='add'>+#include "pvrusb2-encoder.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Firmware mailbox flags - definitions found from ivtv */</div><div class='add'>+#define IVTV_MBOX_FIRMWARE_DONE 0x00000004</div><div class='add'>+#define IVTV_MBOX_DRIVER_DONE 0x00000002</div><div class='add'>+#define IVTV_MBOX_DRIVER_BUSY 0x00000001</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_encoder_write_words(struct pvr2_hdw *hdw,</div><div class='add'>+				    const u32 *data, unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int offs = 0;</div><div class='add'>+	unsigned int chunkCnt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+</div><div class='add'>+	Format: First byte must be 0x01.  Remaining 32 bit words are</div><div class='add'>+	spread out into chunks of 7 bytes each, little-endian ordered,</div><div class='add'>+	offset at zero within each 2 blank bytes following and a</div><div class='add'>+	single byte that is 0x44 plus the offset of the word.  Repeat</div><div class='add'>+	request for additional words, with offset adjusted</div><div class='add'>+	accordingly.</div><div class='add'>+</div><div class='add'>+	*/</div><div class='add'>+	while (dlen) {</div><div class='add'>+		chunkCnt = 8;</div><div class='add'>+		if (chunkCnt &gt; dlen) chunkCnt = dlen;</div><div class='add'>+		memset(hdw-&gt;cmd_buffer,0,sizeof(hdw-&gt;cmd_buffer));</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = 0x01;</div><div class='add'>+		for (idx = 0; idx &lt; chunkCnt; idx++) {</div><div class='add'>+			hdw-&gt;cmd_buffer[1+(idx*7)+6] = 0x44 + idx + offs;</div><div class='add'>+			PVR2_DECOMPOSE_LE(hdw-&gt;cmd_buffer, 1+(idx*7),</div><div class='add'>+					  data[idx]);</div><div class='add'>+		}</div><div class='add'>+		ret = pvr2_send_request(hdw,</div><div class='add'>+					hdw-&gt;cmd_buffer,1+(chunkCnt*7),</div><div class='add'>+					NULL,0);</div><div class='add'>+		if (ret) return ret;</div><div class='add'>+		data += chunkCnt;</div><div class='add'>+		dlen -= chunkCnt;</div><div class='add'>+		offs += chunkCnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_encoder_read_words(struct pvr2_hdw *hdw,int statusFl,</div><div class='add'>+				   u32 *data, unsigned int dlen)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int offs = 0;</div><div class='add'>+	unsigned int chunkCnt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+</div><div class='add'>+	Format: First byte must be 0x02 (status check) or 0x28 (read</div><div class='add'>+	back block of 32 bit words).  Next 6 bytes must be zero,</div><div class='add'>+	followed by a single byte of 0x44+offset for portion to be</div><div class='add'>+	read.  Returned data is packed set of 32 bits words that were</div><div class='add'>+	read.</div><div class='add'>+</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	while (dlen) {</div><div class='add'>+		chunkCnt = 16;</div><div class='add'>+		if (chunkCnt &gt; dlen) chunkCnt = dlen;</div><div class='add'>+		memset(hdw-&gt;cmd_buffer,0,sizeof(hdw-&gt;cmd_buffer));</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = statusFl ? 0x02 : 0x28;</div><div class='add'>+		hdw-&gt;cmd_buffer[7] = 0x44 + offs;</div><div class='add'>+		ret = pvr2_send_request(hdw,</div><div class='add'>+					hdw-&gt;cmd_buffer,8,</div><div class='add'>+					hdw-&gt;cmd_buffer,chunkCnt * 4);</div><div class='add'>+		if (ret) return ret;</div><div class='add'>+</div><div class='add'>+		for (idx = 0; idx &lt; chunkCnt; idx++) {</div><div class='add'>+			data[idx] = PVR2_COMPOSE_LE(hdw-&gt;cmd_buffer,idx*4);</div><div class='add'>+		}</div><div class='add'>+		data += chunkCnt;</div><div class='add'>+		dlen -= chunkCnt;</div><div class='add'>+		offs += chunkCnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This prototype is set up to be compatible with the</div><div class='add'>+   cx2341x_mbox_func prototype in cx2341x.h, which should be in</div><div class='add'>+   kernels 2.6.18 or later.  We do this so that we can enable</div><div class='add'>+   cx2341x.ko to write to our encoder (by handing it a pointer to this</div><div class='add'>+   function).  For earlier kernels this doesn't really matter. */</div><div class='add'>+static int pvr2_encoder_cmd(void *ctxt,</div><div class='add'>+			    int cmd,</div><div class='add'>+			    int arg_cnt_send,</div><div class='add'>+			    int arg_cnt_recv,</div><div class='add'>+			    u32 *argp)</div><div class='add'>+{</div><div class='add'>+	unsigned int poll_count;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	/* These sizes look to be limited by the FX2 firmware implementation */</div><div class='add'>+	u32 wrData[16];</div><div class='add'>+	u32 rdData[16];</div><div class='add'>+	struct pvr2_hdw *hdw = (struct pvr2_hdw *)ctxt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+</div><div class='add'>+	The encoder seems to speak entirely using blocks 32 bit words.</div><div class='add'>+	In ivtv driver terms, this is a mailbox which we populate with</div><div class='add'>+	data and watch what the hardware does with it.  The first word</div><div class='add'>+	is a set of flags used to control the transaction, the second</div><div class='add'>+	word is the command to execute, the third byte is zero (ivtv</div><div class='add'>+	driver suggests that this is some kind of return value), and</div><div class='add'>+	the fourth byte is a specified timeout (windows driver always</div><div class='add'>+	uses 0x00060000 except for one case when it is zero).  All</div><div class='add'>+	successive words are the argument words for the command.</div><div class='add'>+</div><div class='add'>+	First, write out the entire set of words, with the first word</div><div class='add'>+	being zero.</div><div class='add'>+</div><div class='add'>+	Next, write out just the first word again, but set it to</div><div class='add'>+	IVTV_MBOX_DRIVER_DONE | IVTV_DRIVER_BUSY this time (which</div><div class='add'>+	probably means "go").</div><div class='add'>+</div><div class='add'>+	Next, read back 16 words as status.  Check the first word,</div><div class='add'>+	which should have IVTV_MBOX_FIRMWARE_DONE set.  If however</div><div class='add'>+	that bit is not set, then the command isn't done so repeat the</div><div class='add'>+	read.</div><div class='add'>+</div><div class='add'>+	Next, read back 32 words and compare with the original</div><div class='add'>+	arugments.  Hopefully they will match.</div><div class='add'>+</div><div class='add'>+	Finally, write out just the first word again, but set it to</div><div class='add'>+	0x0 this time (which probably means "idle").</div><div class='add'>+</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	if (arg_cnt_send &gt; (sizeof(wrData)/sizeof(wrData[0]))-4) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"Failed to write cx23416 command"</div><div class='add'>+			" - too many input arguments"</div><div class='add'>+			" (was given %u limit %u)",</div><div class='add'>+			arg_cnt_send,</div><div class='add'>+			(unsigned int)(sizeof(wrData)/sizeof(wrData[0])) - 4);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (arg_cnt_recv &gt; (sizeof(rdData)/sizeof(rdData[0]))-4) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"Failed to write cx23416 command"</div><div class='add'>+			" - too many return arguments"</div><div class='add'>+			" (was given %u limit %u)",</div><div class='add'>+			arg_cnt_recv,</div><div class='add'>+			(unsigned int)(sizeof(rdData)/sizeof(rdData[0])) - 4);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+</div><div class='add'>+		wrData[0] = 0;</div><div class='add'>+		wrData[1] = cmd;</div><div class='add'>+		wrData[2] = 0;</div><div class='add'>+		wrData[3] = 0x00060000;</div><div class='add'>+		for (idx = 0; idx &lt; arg_cnt_send; idx++) {</div><div class='add'>+			wrData[idx+4] = argp[idx];</div><div class='add'>+		}</div><div class='add'>+		for (; idx &lt; (sizeof(wrData)/sizeof(wrData[0]))-4; idx++) {</div><div class='add'>+			wrData[idx+4] = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = pvr2_encoder_write_words(hdw,wrData,idx);</div><div class='add'>+		if (ret) break;</div><div class='add'>+		wrData[0] = IVTV_MBOX_DRIVER_DONE|IVTV_MBOX_DRIVER_BUSY;</div><div class='add'>+		ret = pvr2_encoder_write_words(hdw,wrData,1);</div><div class='add'>+		if (ret) break;</div><div class='add'>+		poll_count = 0;</div><div class='add'>+		while (1) {</div><div class='add'>+			if (poll_count &lt; 10000000) poll_count++;</div><div class='add'>+			ret = pvr2_encoder_read_words(hdw,!0,rdData,1);</div><div class='add'>+			if (ret) break;</div><div class='add'>+			if (rdData[0] &amp; IVTV_MBOX_FIRMWARE_DONE) {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (poll_count == 100) {</div><div class='add'>+				pvr2_trace(</div><div class='add'>+					PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					"***WARNING*** device's encoder"</div><div class='add'>+					" appears to be stuck"</div><div class='add'>+					" (status=0%08x)",rdData[0]);</div><div class='add'>+				pvr2_trace(</div><div class='add'>+					PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					"Encoder command: 0x%02x",cmd);</div><div class='add'>+				for (idx = 4; idx &lt; arg_cnt_send; idx++) {</div><div class='add'>+					pvr2_trace(</div><div class='add'>+						PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						"Encoder arg%d: 0x%08x",</div><div class='add'>+						idx-3,wrData[idx]);</div><div class='add'>+				}</div><div class='add'>+				pvr2_trace(</div><div class='add'>+					PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					"Giving up waiting."</div><div class='add'>+					"  It is likely that"</div><div class='add'>+					" this is a bad idea...");</div><div class='add'>+				ret = -EBUSY;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (ret) break;</div><div class='add'>+		wrData[0] = 0x7;</div><div class='add'>+		ret = pvr2_encoder_read_words(</div><div class='add'>+			hdw,0,rdData,</div><div class='add'>+			sizeof(rdData)/sizeof(rdData[0]));</div><div class='add'>+		if (ret) break;</div><div class='add'>+		for (idx = 0; idx &lt; arg_cnt_recv; idx++) {</div><div class='add'>+			argp[idx] = rdData[idx+4];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		wrData[0] = 0x0;</div><div class='add'>+		ret = pvr2_encoder_write_words(hdw,wrData,1);</div><div class='add'>+		if (ret) break;</div><div class='add'>+</div><div class='add'>+	} while(0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_encoder_vcmd(struct pvr2_hdw *hdw, int cmd,</div><div class='add'>+			     int args, ...)</div><div class='add'>+{</div><div class='add'>+	va_list vl;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	u32 data[12];</div><div class='add'>+</div><div class='add'>+	if (args &gt; sizeof(data)/sizeof(data[0])) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"Failed to write cx23416 command"</div><div class='add'>+			" - too many arguments"</div><div class='add'>+			" (was given %u limit %u)",</div><div class='add'>+			args,(unsigned int)(sizeof(data)/sizeof(data[0])));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	va_start(vl, args);</div><div class='add'>+	for (idx = 0; idx &lt; args; idx++) {</div><div class='add'>+		data[idx] = va_arg(vl, u32);</div><div class='add'>+	}</div><div class='add'>+	va_end(vl);</div><div class='add'>+</div><div class='add'>+	return pvr2_encoder_cmd(hdw,cmd,args,0,data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_encoder_configure(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure"</div><div class='add'>+		   " (cx2341x module)");</div><div class='add'>+	hdw-&gt;enc_ctl_state.port = CX2341X_PORT_STREAMING;</div><div class='add'>+	hdw-&gt;enc_ctl_state.width = hdw-&gt;res_hor_val;</div><div class='add'>+	hdw-&gt;enc_ctl_state.height = hdw-&gt;res_ver_val;</div><div class='add'>+	hdw-&gt;enc_ctl_state.is_50hz = ((hdw-&gt;std_mask_cur &amp;</div><div class='add'>+				       (V4L2_STD_NTSC|V4L2_STD_PAL_M)) ?</div><div class='add'>+				      0 : 1);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!ret) ret = pvr2_encoder_vcmd(</div><div class='add'>+		hdw,CX2341X_ENC_SET_NUM_VSYNC_LINES, 2,</div><div class='add'>+		0xf0, 0xf0);</div><div class='add'>+</div><div class='add'>+	/* setup firmware to notify us about some events (don't know why...) */</div><div class='add'>+	if (!ret) ret = pvr2_encoder_vcmd(</div><div class='add'>+		hdw,CX2341X_ENC_SET_EVENT_NOTIFICATION, 4,</div><div class='add'>+		0, 0, 0x10000000, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	if (!ret) ret = pvr2_encoder_vcmd(</div><div class='add'>+		hdw,CX2341X_ENC_SET_VBI_LINE, 5,</div><div class='add'>+		0xffffffff,0,0,0,0);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Failed to configure cx32416");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cx2341x_update(hdw,pvr2_encoder_cmd,</div><div class='add'>+			     (hdw-&gt;enc_cur_valid ? &amp;hdw-&gt;enc_cur_state : NULL),</div><div class='add'>+			     &amp;hdw-&gt;enc_ctl_state);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Error from cx2341x module code=%d",ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!ret) ret = pvr2_encoder_vcmd(</div><div class='add'>+		hdw, CX2341X_ENC_INITIALIZE_INPUT, 0);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Failed to initialize cx32416 video input");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdw-&gt;subsys_enabled_mask |= (1&lt;&lt;PVR2_SUBSYS_B_ENC_CFG);</div><div class='add'>+	memcpy(&amp;hdw-&gt;enc_cur_state,&amp;hdw-&gt;enc_ctl_state,</div><div class='add'>+	       sizeof(struct cx2341x_mpeg_params));</div><div class='add'>+	hdw-&gt;enc_cur_valid = !0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_encoder_start(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* unmask some interrupts */</div><div class='add'>+	pvr2_write_register(hdw, 0x0048, 0xbfffffff);</div><div class='add'>+</div><div class='add'>+	/* change some GPIO data */</div><div class='add'>+	pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000481);</div><div class='add'>+	pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;config == pvr2_config_vbi) {</div><div class='add'>+		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,</div><div class='add'>+					   0x01,0x14);</div><div class='add'>+	} else if (hdw-&gt;config == pvr2_config_mpeg) {</div><div class='add'>+		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,</div><div class='add'>+					   0,0x13);</div><div class='add'>+	} else {</div><div class='add'>+		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,</div><div class='add'>+					   0,0x13);</div><div class='add'>+	}</div><div class='add'>+	if (!status) {</div><div class='add'>+		hdw-&gt;subsys_enabled_mask |= (1&lt;&lt;PVR2_SUBSYS_B_ENC_RUN);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_encoder_stop(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* mask all interrupts */</div><div class='add'>+	pvr2_write_register(hdw, 0x0048, 0xffffffff);</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;config == pvr2_config_vbi) {</div><div class='add'>+		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_STOP_CAPTURE,3,</div><div class='add'>+					   0x01,0x01,0x14);</div><div class='add'>+	} else if (hdw-&gt;config == pvr2_config_mpeg) {</div><div class='add'>+		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_STOP_CAPTURE,3,</div><div class='add'>+					   0x01,0,0x13);</div><div class='add'>+	} else {</div><div class='add'>+		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_STOP_CAPTURE,3,</div><div class='add'>+					   0x01,0,0x13);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* change some GPIO data */</div><div class='add'>+	/* Note: Bit d7 of dir appears to control the LED.  So we shut it</div><div class='add'>+	   off here. */</div><div class='add'>+	pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000401);</div><div class='add'>+	pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		hdw-&gt;subsys_enabled_mask &amp;= ~(1&lt;&lt;PVR2_SUBSYS_B_ENC_RUN);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.h b/drivers/media/video/pvrusb2/pvrusb2-encoder.h<br/>new file mode 100644<br/>index 000000000000..01b5a0b89c03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-encoder.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-encoder.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_ENCODER_H</div><div class='add'>+#define __PVRUSB2_ENCODER_H</div><div class='add'>+</div><div class='add'>+struct pvr2_hdw;</div><div class='add'>+</div><div class='add'>+int pvr2_encoder_configure(struct pvr2_hdw *);</div><div class='add'>+int pvr2_encoder_start(struct pvr2_hdw *);</div><div class='add'>+int pvr2_encoder_stop(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_ENCODER_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h<br/>new file mode 100644<br/>index 000000000000..0d6dc33ca320<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h</a></div><div class='hunk'>@@ -0,0 +1,367 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_HDW_INTERNAL_H</div><div class='add'>+#define __PVRUSB2_HDW_INTERNAL_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+  This header sets up all the internal structures and definitions needed to</div><div class='add'>+  track and coordinate the driver's interaction with the hardware.  ONLY</div><div class='add'>+  source files which actually implement part of that whole circus should be</div><div class='add'>+  including this header.  Higher levels, like the external layers to the</div><div class='add'>+  various public APIs (V4L, sysfs, etc) should NOT ever include this</div><div class='add'>+  private, internal header.  This means that pvrusb2-hdw, pvrusb2-encoder,</div><div class='add'>+  etc will include this, but pvrusb2-v4l should not.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2-io.h"</div><div class='add'>+#include &lt;media/cx2341x.h&gt;</div><div class='add'>+</div><div class='add'>+/* Legal values for the SRATE state variable */</div><div class='add'>+#define PVR2_CVAL_SRATE_48 0</div><div class='add'>+#define PVR2_CVAL_SRATE_44_1 1</div><div class='add'>+</div><div class='add'>+/* Legal values for the AUDIOBITRATE state variable */</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_384 0</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_320 1</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_256 2</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_224 3</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_192 4</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_160 5</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_128 6</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_112 7</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_96 8</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_80 9</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_64 10</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_56 11</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_48 12</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_32 13</div><div class='add'>+#define PVR2_CVAL_AUDIOBITRATE_VBR 14</div><div class='add'>+</div><div class='add'>+/* Legal values for the AUDIOEMPHASIS state variable */</div><div class='add'>+#define PVR2_CVAL_AUDIOEMPHASIS_NONE 0</div><div class='add'>+#define PVR2_CVAL_AUDIOEMPHASIS_50_15 1</div><div class='add'>+#define PVR2_CVAL_AUDIOEMPHASIS_CCITT 2</div><div class='add'>+</div><div class='add'>+/* Legal values for PVR2_CID_HSM */</div><div class='add'>+#define PVR2_CVAL_HSM_FAIL 0</div><div class='add'>+#define PVR2_CVAL_HSM_FULL 1</div><div class='add'>+#define PVR2_CVAL_HSM_HIGH 2</div><div class='add'>+</div><div class='add'>+#define PVR2_VID_ENDPOINT        0x84</div><div class='add'>+#define PVR2_UNK_ENDPOINT        0x86    /* maybe raw yuv ? */</div><div class='add'>+#define PVR2_VBI_ENDPOINT        0x88</div><div class='add'>+</div><div class='add'>+#define PVR2_CTL_BUFFSIZE        64</div><div class='add'>+</div><div class='add'>+#define FREQTABLE_SIZE 500</div><div class='add'>+</div><div class='add'>+#define LOCK_TAKE(x) do { mutex_lock(&amp;x##_mutex); x##_held = !0; } while (0)</div><div class='add'>+#define LOCK_GIVE(x) do { x##_held = 0; mutex_unlock(&amp;x##_mutex); } while (0)</div><div class='add'>+</div><div class='add'>+struct pvr2_decoder;</div><div class='add'>+</div><div class='add'>+typedef int (*pvr2_ctlf_is_dirty)(struct pvr2_ctrl *);</div><div class='add'>+typedef void (*pvr2_ctlf_clear_dirty)(struct pvr2_ctrl *);</div><div class='add'>+typedef int (*pvr2_ctlf_get_value)(struct pvr2_ctrl *,int *);</div><div class='add'>+typedef int (*pvr2_ctlf_set_value)(struct pvr2_ctrl *,int msk,int val);</div><div class='add'>+typedef int (*pvr2_ctlf_val_to_sym)(struct pvr2_ctrl *,int msk,int val,</div><div class='add'>+				    char *,unsigned int,unsigned int *);</div><div class='add'>+typedef int (*pvr2_ctlf_sym_to_val)(struct pvr2_ctrl *,</div><div class='add'>+				    const char *,unsigned int,</div><div class='add'>+				    int *mskp,int *valp);</div><div class='add'>+typedef unsigned int (*pvr2_ctlf_get_v4lflags)(struct pvr2_ctrl *);</div><div class='add'>+</div><div class='add'>+/* This structure describes a specific control.  A table of these is set up</div><div class='add'>+   in pvrusb2-hdw.c. */</div><div class='add'>+struct pvr2_ctl_info {</div><div class='add'>+	/* Control's name suitable for use as an identifier */</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	/* Short description of control */</div><div class='add'>+	const char *desc;</div><div class='add'>+</div><div class='add'>+	/* Control's implementation */</div><div class='add'>+	pvr2_ctlf_get_value get_value;      /* Get its value */</div><div class='add'>+	pvr2_ctlf_set_value set_value;      /* Set its value */</div><div class='add'>+	pvr2_ctlf_val_to_sym val_to_sym;    /* Custom convert value-&gt;symbol */</div><div class='add'>+	pvr2_ctlf_sym_to_val sym_to_val;    /* Custom convert symbol-&gt;value */</div><div class='add'>+	pvr2_ctlf_is_dirty is_dirty;        /* Return true if dirty */</div><div class='add'>+	pvr2_ctlf_clear_dirty clear_dirty;  /* Clear dirty state */</div><div class='add'>+	pvr2_ctlf_get_v4lflags get_v4lflags;/* Retrieve v4l flags */</div><div class='add'>+</div><div class='add'>+	/* Control's type (int, enum, bitmask) */</div><div class='add'>+	enum pvr2_ctl_type type;</div><div class='add'>+</div><div class='add'>+	/* Associated V4L control ID, if any */</div><div class='add'>+	int v4l_id;</div><div class='add'>+</div><div class='add'>+	/* Associated driver internal ID, if any */</div><div class='add'>+	int internal_id;</div><div class='add'>+</div><div class='add'>+	/* Don't implicitly initialize this control's value */</div><div class='add'>+	int skip_init;</div><div class='add'>+</div><div class='add'>+	/* Starting value for this control */</div><div class='add'>+	int default_value;</div><div class='add'>+</div><div class='add'>+	/* Type-specific control information */</div><div class='add'>+	union {</div><div class='add'>+		struct { /* Integer control */</div><div class='add'>+			long min_value; /* lower limit */</div><div class='add'>+			long max_value; /* upper limit */</div><div class='add'>+		} type_int;</div><div class='add'>+		struct { /* enumerated control */</div><div class='add'>+			unsigned int count;       /* enum value count */</div><div class='add'>+			const char **value_names; /* symbol names */</div><div class='add'>+		} type_enum;</div><div class='add'>+		struct { /* bitmask control */</div><div class='add'>+			unsigned int valid_bits; /* bits in use */</div><div class='add'>+			const char **bit_names;  /* symbol name/bit */</div><div class='add'>+		} type_bitmask;</div><div class='add'>+	} def;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Same as pvr2_ctl_info, but includes storage for the control description */</div><div class='add'>+#define PVR2_CTLD_INFO_DESC_SIZE 32</div><div class='add'>+struct pvr2_ctld_info {</div><div class='add'>+	struct pvr2_ctl_info info;</div><div class='add'>+	char desc[PVR2_CTLD_INFO_DESC_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_ctrl {</div><div class='add'>+	const struct pvr2_ctl_info *info;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_audio_stat {</div><div class='add'>+	void *ctxt;</div><div class='add'>+	void (*detach)(void *);</div><div class='add'>+	int (*status)(void *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_decoder_ctrl {</div><div class='add'>+	void *ctxt;</div><div class='add'>+	void (*detach)(void *);</div><div class='add'>+	void (*enable)(void *,int);</div><div class='add'>+	int (*tuned)(void *);</div><div class='add'>+	void (*force_reset)(void *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PVR2_I2C_PEND_DETECT  0x01  /* Need to detect a client type */</div><div class='add'>+#define PVR2_I2C_PEND_CLIENT  0x02  /* Client needs a specific update */</div><div class='add'>+#define PVR2_I2C_PEND_REFRESH 0x04  /* Client has specific pending bits */</div><div class='add'>+#define PVR2_I2C_PEND_STALE   0x08  /* Broadcast pending bits */</div><div class='add'>+</div><div class='add'>+#define PVR2_I2C_PEND_ALL (PVR2_I2C_PEND_DETECT |\</div><div class='add'>+			   PVR2_I2C_PEND_CLIENT |\</div><div class='add'>+			   PVR2_I2C_PEND_REFRESH |\</div><div class='add'>+			   PVR2_I2C_PEND_STALE)</div><div class='add'>+</div><div class='add'>+/* Disposition of firmware1 loading situation */</div><div class='add'>+#define FW1_STATE_UNKNOWN 0</div><div class='add'>+#define FW1_STATE_MISSING 1</div><div class='add'>+#define FW1_STATE_FAILED 2</div><div class='add'>+#define FW1_STATE_RELOAD 3</div><div class='add'>+#define FW1_STATE_OK 4</div><div class='add'>+</div><div class='add'>+/* Known major hardware variants, keyed from device ID */</div><div class='add'>+#define PVR2_HDW_TYPE_29XXX 0</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+#define PVR2_HDW_TYPE_24XXX 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef int (*pvr2_i2c_func)(struct pvr2_hdw *,u8,u8 *,u16,u8 *, u16);</div><div class='add'>+#define PVR2_I2C_FUNC_CNT 128</div><div class='add'>+</div><div class='add'>+/* This structure contains all state data directly needed to</div><div class='add'>+   manipulate the hardware (as opposed to complying with a kernel</div><div class='add'>+   interface) */</div><div class='add'>+struct pvr2_hdw {</div><div class='add'>+	/* Underlying USB device handle */</div><div class='add'>+	struct usb_device *usb_dev;</div><div class='add'>+	struct usb_interface *usb_intf;</div><div class='add'>+</div><div class='add'>+	/* Device type, one of PVR2_HDW_TYPE_xxxxx */</div><div class='add'>+	unsigned int hdw_type;</div><div class='add'>+</div><div class='add'>+	/* Video spigot */</div><div class='add'>+	struct pvr2_stream *vid_stream;</div><div class='add'>+</div><div class='add'>+	/* Mutex for all hardware state control */</div><div class='add'>+	struct mutex big_lock_mutex;</div><div class='add'>+	int big_lock_held;  /* For debugging */</div><div class='add'>+</div><div class='add'>+	void (*poll_trigger_func)(void *);</div><div class='add'>+	void *poll_trigger_data;</div><div class='add'>+</div><div class='add'>+	char name[32];</div><div class='add'>+</div><div class='add'>+	/* I2C stuff */</div><div class='add'>+	struct i2c_adapter i2c_adap;</div><div class='add'>+	struct i2c_algorithm i2c_algo;</div><div class='add'>+	pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];</div><div class='add'>+	int i2c_cx25840_hack_state;</div><div class='add'>+	int i2c_linked;</div><div class='add'>+	unsigned int i2c_pend_types;    /* Which types of update are needed */</div><div class='add'>+	unsigned long i2c_pend_mask;    /* Change bits we need to scan */</div><div class='add'>+	unsigned long i2c_stale_mask;   /* Pending broadcast change bits */</div><div class='add'>+	unsigned long i2c_active_mask;  /* All change bits currently in use */</div><div class='add'>+	struct list_head i2c_clients;</div><div class='add'>+	struct mutex i2c_list_lock;</div><div class='add'>+</div><div class='add'>+	/* Frequency table */</div><div class='add'>+	unsigned int freqTable[FREQTABLE_SIZE];</div><div class='add'>+	unsigned int freqProgSlot;</div><div class='add'>+	unsigned int freqSlot;</div><div class='add'>+</div><div class='add'>+	/* Stuff for handling low level control interaction with device */</div><div class='add'>+	struct mutex ctl_lock_mutex;</div><div class='add'>+	int ctl_lock_held;  /* For debugging */</div><div class='add'>+	struct urb *ctl_write_urb;</div><div class='add'>+	struct urb *ctl_read_urb;</div><div class='add'>+	unsigned char *ctl_write_buffer;</div><div class='add'>+	unsigned char *ctl_read_buffer;</div><div class='add'>+	volatile int ctl_write_pend_flag;</div><div class='add'>+	volatile int ctl_read_pend_flag;</div><div class='add'>+	volatile int ctl_timeout_flag;</div><div class='add'>+	struct completion ctl_done;</div><div class='add'>+	unsigned char cmd_buffer[PVR2_CTL_BUFFSIZE];</div><div class='add'>+	int cmd_debug_state;               // Low level command debugging info</div><div class='add'>+	unsigned char cmd_debug_code;      //</div><div class='add'>+	unsigned int cmd_debug_write_len;  //</div><div class='add'>+	unsigned int cmd_debug_read_len;   //</div><div class='add'>+</div><div class='add'>+	int flag_ok;            // device in known good state</div><div class='add'>+	int flag_disconnected;  // flag_ok == 0 due to disconnect</div><div class='add'>+	int flag_init_ok;       // true if structure is fully initialized</div><div class='add'>+	int flag_streaming_enabled; // true if streaming should be on</div><div class='add'>+	int fw1_state;          // current situation with fw1</div><div class='add'>+</div><div class='add'>+	int flag_decoder_is_tuned;</div><div class='add'>+</div><div class='add'>+	struct pvr2_decoder_ctrl *decoder_ctrl;</div><div class='add'>+</div><div class='add'>+	// CPU firmware info (used to help find / save firmware data)</div><div class='add'>+	char *fw_buffer;</div><div class='add'>+	unsigned int fw_size;</div><div class='add'>+</div><div class='add'>+	// Which subsystem pieces have been enabled / configured</div><div class='add'>+	unsigned long subsys_enabled_mask;</div><div class='add'>+</div><div class='add'>+	// Which subsystems are manipulated to enable streaming</div><div class='add'>+	unsigned long subsys_stream_mask;</div><div class='add'>+</div><div class='add'>+	// True if there is a request to trigger logging of state in each</div><div class='add'>+	// module.</div><div class='add'>+	int log_requested;</div><div class='add'>+</div><div class='add'>+	/* Tuner / frequency control stuff */</div><div class='add'>+	unsigned int tuner_type;</div><div class='add'>+	int tuner_updated;</div><div class='add'>+	unsigned int freqVal;</div><div class='add'>+	int freqDirty;</div><div class='add'>+</div><div class='add'>+	/* Video standard handling */</div><div class='add'>+	v4l2_std_id std_mask_eeprom; // Hardware supported selections</div><div class='add'>+	v4l2_std_id std_mask_avail;  // Which standards we may select from</div><div class='add'>+	v4l2_std_id std_mask_cur;    // Currently selected standard(s)</div><div class='add'>+	unsigned int std_enum_cnt;   // # of enumerated standards</div><div class='add'>+	int std_enum_cur;            // selected standard enumeration value</div><div class='add'>+	int std_dirty;               // True if std_mask_cur has changed</div><div class='add'>+	struct pvr2_ctl_info std_info_enum;</div><div class='add'>+	struct pvr2_ctl_info std_info_avail;</div><div class='add'>+	struct pvr2_ctl_info std_info_cur;</div><div class='add'>+	struct v4l2_standard *std_defs;</div><div class='add'>+	const char **std_enum_names;</div><div class='add'>+</div><div class='add'>+	// Generated string names, one per actual V4L2 standard</div><div class='add'>+	const char *std_mask_ptrs[32];</div><div class='add'>+	char std_mask_names[32][10];</div><div class='add'>+</div><div class='add'>+	int unit_number;             /* ID for driver instance */</div><div class='add'>+	unsigned long serial_number; /* ID for hardware itself */</div><div class='add'>+</div><div class='add'>+	/* Minor number used by v4l logic (yes, this is a hack, as there should</div><div class='add'>+	   be no v4l junk here).  Probably a better way to do this. */</div><div class='add'>+	int v4l_minor_number;</div><div class='add'>+</div><div class='add'>+	/* Location of eeprom or a negative number if none */</div><div class='add'>+	int eeprom_addr;</div><div class='add'>+</div><div class='add'>+	enum pvr2_config config;</div><div class='add'>+</div><div class='add'>+	/* Information about what audio signal we're hearing */</div><div class='add'>+	int flag_stereo;</div><div class='add'>+	int flag_bilingual;</div><div class='add'>+	struct pvr2_audio_stat *audio_stat;</div><div class='add'>+</div><div class='add'>+	/* Control state needed for cx2341x module */</div><div class='add'>+	struct cx2341x_mpeg_params enc_cur_state;</div><div class='add'>+	struct cx2341x_mpeg_params enc_ctl_state;</div><div class='add'>+	/* True if an encoder attribute has changed */</div><div class='add'>+	int enc_stale;</div><div class='add'>+	/* True if enc_cur_state is valid */</div><div class='add'>+	int enc_cur_valid;</div><div class='add'>+</div><div class='add'>+	/* Control state */</div><div class='add'>+#define VCREATE_DATA(lab) int lab##_val; int lab##_dirty</div><div class='add'>+	VCREATE_DATA(brightness);</div><div class='add'>+	VCREATE_DATA(contrast);</div><div class='add'>+	VCREATE_DATA(saturation);</div><div class='add'>+	VCREATE_DATA(hue);</div><div class='add'>+	VCREATE_DATA(volume);</div><div class='add'>+	VCREATE_DATA(balance);</div><div class='add'>+	VCREATE_DATA(bass);</div><div class='add'>+	VCREATE_DATA(treble);</div><div class='add'>+	VCREATE_DATA(mute);</div><div class='add'>+	VCREATE_DATA(input);</div><div class='add'>+	VCREATE_DATA(audiomode);</div><div class='add'>+	VCREATE_DATA(res_hor);</div><div class='add'>+	VCREATE_DATA(res_ver);</div><div class='add'>+	VCREATE_DATA(srate);</div><div class='add'>+#undef VCREATE_DATA</div><div class='add'>+</div><div class='add'>+	struct pvr2_ctld_info *mpeg_ctrl_info;</div><div class='add'>+</div><div class='add'>+	struct pvr2_ctrl *controls;</div><div class='add'>+	unsigned int control_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_HDW_INTERNAL_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c<br/>new file mode 100644<br/>index 000000000000..9b48abcf6089<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-hdw.c</a></div><div class='hunk'>@@ -0,0 +1,3094 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include "pvrusb2.h"</div><div class='add'>+#include "pvrusb2-std.h"</div><div class='add'>+#include "pvrusb2-util.h"</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+#include "pvrusb2-tuner.h"</div><div class='add'>+#include "pvrusb2-eeprom.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-encoder.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+</div><div class='add'>+struct usb_device_id pvr2_device_table[] = {</div><div class='add'>+	[PVR2_HDW_TYPE_29XXX] = { USB_DEVICE(0x2040, 0x2900) },</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+	[PVR2_HDW_TYPE_24XXX] = { USB_DEVICE(0x2040, 0x2400) },</div><div class='add'>+#endif</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, pvr2_device_table);</div><div class='add'>+</div><div class='add'>+static const char *pvr2_device_names[] = {</div><div class='add'>+	[PVR2_HDW_TYPE_29XXX] = "WinTV PVR USB2 Model Category 29xxxx",</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+	[PVR2_HDW_TYPE_24XXX] = "WinTV PVR USB2 Model Category 24xxxx",</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_string_table {</div><div class='add'>+	const char **lst;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+// Names of other client modules to request for 24xxx model hardware</div><div class='add'>+static const char *pvr2_client_24xxx[] = {</div><div class='add'>+	"cx25840",</div><div class='add'>+	"tuner",</div><div class='add'>+	"wm8775",</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// Names of other client modules to request for 29xxx model hardware</div><div class='add'>+static const char *pvr2_client_29xxx[] = {</div><div class='add'>+	"msp3400",</div><div class='add'>+	"saa7115",</div><div class='add'>+	"tuner",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pvr2_string_table pvr2_client_lists[] = {</div><div class='add'>+	[PVR2_HDW_TYPE_29XXX] = {</div><div class='add'>+		pvr2_client_29xxx,</div><div class='add'>+		sizeof(pvr2_client_29xxx)/sizeof(pvr2_client_29xxx[0]),</div><div class='add'>+	},</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+	[PVR2_HDW_TYPE_24XXX] = {</div><div class='add'>+		pvr2_client_24xxx,</div><div class='add'>+		sizeof(pvr2_client_24xxx)/sizeof(pvr2_client_24xxx[0]),</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pvr2_hdw *unit_pointers[PVR_NUM] = {[ 0 ... PVR_NUM-1 ] = NULL};</div><div class='add'>+static DECLARE_MUTEX(pvr2_unit_sem);</div><div class='add'>+</div><div class='add'>+static int ctlchg = 0;</div><div class='add'>+static int initusbreset = 1;</div><div class='add'>+static int procreload = 0;</div><div class='add'>+static int tuner[PVR_NUM] = { [0 ... PVR_NUM-1] = -1 };</div><div class='add'>+static int tolerance[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 };</div><div class='add'>+static int video_std[PVR_NUM] = { [0 ... PVR_NUM-1] = 0 };</div><div class='add'>+static int init_pause_msec = 0;</div><div class='add'>+</div><div class='add'>+module_param(ctlchg, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(ctlchg, "0=optimize ctl change 1=always accept new ctl value");</div><div class='add'>+module_param(init_pause_msec, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(init_pause_msec, "hardware initialization settling delay");</div><div class='add'>+module_param(initusbreset, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(initusbreset, "Do USB reset device on probe");</div><div class='add'>+module_param(procreload, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(procreload,</div><div class='add'>+		 "Attempt init failure recovery with firmware reload");</div><div class='add'>+module_param_array(tuner,    int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(tuner,"specify installed tuner type");</div><div class='add'>+module_param_array(video_std,    int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(video_std,"specify initial video standard");</div><div class='add'>+module_param_array(tolerance,    int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(tolerance,"specify stream error tolerance");</div><div class='add'>+</div><div class='add'>+#define PVR2_CTL_WRITE_ENDPOINT  0x01</div><div class='add'>+#define PVR2_CTL_READ_ENDPOINT   0x81</div><div class='add'>+</div><div class='add'>+#define PVR2_GPIO_IN 0x9008</div><div class='add'>+#define PVR2_GPIO_OUT 0x900c</div><div class='add'>+#define PVR2_GPIO_DIR 0x9020</div><div class='add'>+</div><div class='add'>+#define trace_firmware(...) pvr2_trace(PVR2_TRACE_FIRMWARE,__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define PVR2_FIRMWARE_ENDPOINT   0x02</div><div class='add'>+</div><div class='add'>+/* size of a firmware chunk */</div><div class='add'>+#define FIRMWARE_CHUNK_SIZE 0x2000</div><div class='add'>+</div><div class='add'>+/* Define the list of additional controls we'll dynamically construct based</div><div class='add'>+   on query of the cx2341x module. */</div><div class='add'>+struct pvr2_mpeg_ids {</div><div class='add'>+	const char *strid;</div><div class='add'>+	int id;</div><div class='add'>+};</div><div class='add'>+static const struct pvr2_mpeg_ids mpeg_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.strid = "audio_layer",</div><div class='add'>+		.id = V4L2_CID_MPEG_AUDIO_ENCODING,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "audio_bitrate",</div><div class='add'>+		.id = V4L2_CID_MPEG_AUDIO_L2_BITRATE,</div><div class='add'>+	},{</div><div class='add'>+		/* Already using audio_mode elsewhere :-( */</div><div class='add'>+		.strid = "mpeg_audio_mode",</div><div class='add'>+		.id = V4L2_CID_MPEG_AUDIO_MODE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "mpeg_audio_mode_extension",</div><div class='add'>+		.id = V4L2_CID_MPEG_AUDIO_MODE_EXTENSION,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "audio_emphasis",</div><div class='add'>+		.id = V4L2_CID_MPEG_AUDIO_EMPHASIS,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "audio_crc",</div><div class='add'>+		.id = V4L2_CID_MPEG_AUDIO_CRC,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_aspect",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_ASPECT,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_b_frames",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_B_FRAMES,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_gop_size",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_GOP_SIZE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_gop_closure",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_GOP_CLOSURE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_pulldown",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_PULLDOWN,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_bitrate_mode",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_BITRATE_MODE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_bitrate",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_BITRATE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_bitrate_peak",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_temporal_decimation",</div><div class='add'>+		.id = V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "stream_type",</div><div class='add'>+		.id = V4L2_CID_MPEG_STREAM_TYPE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_spatial_filter_mode",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_spatial_filter",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_luma_spatial_filter_type",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_chroma_spatial_filter_type",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_temporal_filter_mode",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_temporal_filter",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_median_filter_type",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_luma_median_filter_top",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_luma_median_filter_bottom",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_chroma_median_filter_top",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP,</div><div class='add'>+	},{</div><div class='add'>+		.strid = "video_chroma_median_filter_bottom",</div><div class='add'>+		.id = V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+#define MPEGDEF_COUNT (sizeof(mpeg_ids)/sizeof(mpeg_ids[0]))</div><div class='add'>+</div><div class='add'>+static const char *control_values_srate[] = {</div><div class='add'>+	[PVR2_CVAL_SRATE_48]   = "48KHz",</div><div class='add'>+	[PVR2_CVAL_SRATE_44_1] = "44.1KHz",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *control_values_input[] = {</div><div class='add'>+	[PVR2_CVAL_INPUT_TV]        = "television",  /*xawtv needs this name*/</div><div class='add'>+	[PVR2_CVAL_INPUT_RADIO]     = "radio",</div><div class='add'>+	[PVR2_CVAL_INPUT_SVIDEO]    = "s-video",</div><div class='add'>+	[PVR2_CVAL_INPUT_COMPOSITE] = "composite",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *control_values_audiomode[] = {</div><div class='add'>+	[V4L2_TUNER_MODE_MONO]   = "Mono",</div><div class='add'>+	[V4L2_TUNER_MODE_STEREO] = "Stereo",</div><div class='add'>+	[V4L2_TUNER_MODE_LANG1]  = "Lang1",</div><div class='add'>+	[V4L2_TUNER_MODE_LANG2]  = "Lang2",</div><div class='add'>+	[V4L2_TUNER_MODE_LANG1_LANG2] = "Lang1+Lang2",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *control_values_hsm[] = {</div><div class='add'>+	[PVR2_CVAL_HSM_FAIL] = "Fail",</div><div class='add'>+	[PVR2_CVAL_HSM_HIGH] = "High",</div><div class='add'>+	[PVR2_CVAL_HSM_FULL] = "Full",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *control_values_subsystem[] = {</div><div class='add'>+	[PVR2_SUBSYS_B_ENC_FIRMWARE]  = "enc_firmware",</div><div class='add'>+	[PVR2_SUBSYS_B_ENC_CFG] = "enc_config",</div><div class='add'>+	[PVR2_SUBSYS_B_DIGITIZER_RUN] = "digitizer_run",</div><div class='add'>+	[PVR2_SUBSYS_B_USBSTREAM_RUN] = "usbstream_run",</div><div class='add'>+	[PVR2_SUBSYS_B_ENC_RUN] = "enc_run",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl);</div><div class='add'>+static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw);</div><div class='add'>+static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw);</div><div class='add'>+static unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw);</div><div class='add'>+static void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw);</div><div class='add'>+static void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw);</div><div class='add'>+static void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw);</div><div class='add'>+static void pvr2_hdw_subsys_bit_chg_no_lock(struct pvr2_hdw *hdw,</div><div class='add'>+					    unsigned long msk,</div><div class='add'>+					    unsigned long val);</div><div class='add'>+static void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw,</div><div class='add'>+						   unsigned long msk,</div><div class='add'>+						   unsigned long val);</div><div class='add'>+static int pvr2_send_request_ex(struct pvr2_hdw *hdw,</div><div class='add'>+				unsigned int timeout,int probe_fl,</div><div class='add'>+				void *write_data,unsigned int write_len,</div><div class='add'>+				void *read_data,unsigned int read_len);</div><div class='add'>+static int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res);</div><div class='add'>+static int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res);</div><div class='add'>+</div><div class='add'>+static int ctrl_channelfreq_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	if ((hdw-&gt;freqProgSlot &gt; 0) &amp;&amp; (hdw-&gt;freqProgSlot &lt;= FREQTABLE_SIZE)) {</div><div class='add'>+		*vp = hdw-&gt;freqTable[hdw-&gt;freqProgSlot-1];</div><div class='add'>+	} else {</div><div class='add'>+		*vp = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_channelfreq_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	if ((hdw-&gt;freqProgSlot &gt; 0) &amp;&amp; (hdw-&gt;freqProgSlot &lt;= FREQTABLE_SIZE)) {</div><div class='add'>+		hdw-&gt;freqTable[hdw-&gt;freqProgSlot-1] = v;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_channelprog_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;freqProgSlot;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_channelprog_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	if ((v &gt;= 0) &amp;&amp; (v &lt;= FREQTABLE_SIZE)) {</div><div class='add'>+		hdw-&gt;freqProgSlot = v;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_channel_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;freqSlot;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_channel_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	unsigned freq = 0;</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	hdw-&gt;freqSlot = v;</div><div class='add'>+	if ((hdw-&gt;freqSlot &gt; 0) &amp;&amp; (hdw-&gt;freqSlot &lt;= FREQTABLE_SIZE)) {</div><div class='add'>+		freq = hdw-&gt;freqTable[hdw-&gt;freqSlot-1];</div><div class='add'>+	}</div><div class='add'>+	if (freq &amp;&amp; (freq != hdw-&gt;freqVal)) {</div><div class='add'>+		hdw-&gt;freqVal = freq;</div><div class='add'>+		hdw-&gt;freqDirty = !0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_freq_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;freqVal;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_freq_is_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	return cptr-&gt;hdw-&gt;freqDirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctrl_freq_clear_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	cptr-&gt;hdw-&gt;freqDirty = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_freq_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	hdw-&gt;freqVal = v;</div><div class='add'>+	hdw-&gt;freqDirty = !0;</div><div class='add'>+	hdw-&gt;freqSlot = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cx2341x_is_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	return cptr-&gt;hdw-&gt;enc_stale != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctrl_cx2341x_clear_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	cptr-&gt;hdw-&gt;enc_stale = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cx2341x_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct v4l2_ext_controls cs;</div><div class='add'>+	struct v4l2_ext_control c1;</div><div class='add'>+	memset(&amp;cs,0,sizeof(cs));</div><div class='add'>+	memset(&amp;c1,0,sizeof(c1));</div><div class='add'>+	cs.controls = &amp;c1;</div><div class='add'>+	cs.count = 1;</div><div class='add'>+	c1.id = cptr-&gt;info-&gt;v4l_id;</div><div class='add'>+	ret = cx2341x_ext_ctrls(&amp;cptr-&gt;hdw-&gt;enc_ctl_state,&amp;cs,</div><div class='add'>+				VIDIOC_G_EXT_CTRLS);</div><div class='add'>+	if (ret) return ret;</div><div class='add'>+	*vp = c1.value;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_cx2341x_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct v4l2_ext_controls cs;</div><div class='add'>+	struct v4l2_ext_control c1;</div><div class='add'>+	memset(&amp;cs,0,sizeof(cs));</div><div class='add'>+	memset(&amp;c1,0,sizeof(c1));</div><div class='add'>+	cs.controls = &amp;c1;</div><div class='add'>+	cs.count = 1;</div><div class='add'>+	c1.id = cptr-&gt;info-&gt;v4l_id;</div><div class='add'>+	c1.value = v;</div><div class='add'>+	ret = cx2341x_ext_ctrls(&amp;cptr-&gt;hdw-&gt;enc_ctl_state,&amp;cs,</div><div class='add'>+				VIDIOC_S_EXT_CTRLS);</div><div class='add'>+	if (ret) return ret;</div><div class='add'>+	cptr-&gt;hdw-&gt;enc_stale = !0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ctrl_cx2341x_getv4lflags(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_queryctrl qctrl;</div><div class='add'>+	struct pvr2_ctl_info *info;</div><div class='add'>+	qctrl.id = cptr-&gt;info-&gt;v4l_id;</div><div class='add'>+	cx2341x_ctrl_query(&amp;cptr-&gt;hdw-&gt;enc_ctl_state,&amp;qctrl);</div><div class='add'>+	/* Strip out the const so we can adjust a function pointer.  It's</div><div class='add'>+	   OK to do this here because we know this is a dynamically created</div><div class='add'>+	   control, so the underlying storage for the info pointer is (a)</div><div class='add'>+	   private to us, and (b) not in read-only storage.  Either we do</div><div class='add'>+	   this or we significantly complicate the underlying control</div><div class='add'>+	   implementation. */</div><div class='add'>+	info = (struct pvr2_ctl_info *)(cptr-&gt;info);</div><div class='add'>+	if (qctrl.flags &amp; V4L2_CTRL_FLAG_READ_ONLY) {</div><div class='add'>+		if (info-&gt;set_value) {</div><div class='add'>+			info-&gt;set_value = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (!(info-&gt;set_value)) {</div><div class='add'>+			info-&gt;set_value = ctrl_cx2341x_set;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return qctrl.flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_streamingenabled_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;flag_streaming_enabled;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_hsm_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	int result = pvr2_hdw_is_hsm(cptr-&gt;hdw);</div><div class='add'>+	*vp = PVR2_CVAL_HSM_FULL;</div><div class='add'>+	if (result &lt; 0) *vp = PVR2_CVAL_HSM_FAIL;</div><div class='add'>+	if (result) *vp = PVR2_CVAL_HSM_HIGH;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_stdavail_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;std_mask_avail;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_stdavail_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	v4l2_std_id ns;</div><div class='add'>+	ns = hdw-&gt;std_mask_avail;</div><div class='add'>+	ns = (ns &amp; ~m) | (v &amp; m);</div><div class='add'>+	if (ns == hdw-&gt;std_mask_avail) return 0;</div><div class='add'>+	hdw-&gt;std_mask_avail = ns;</div><div class='add'>+	pvr2_hdw_internal_set_std_avail(hdw);</div><div class='add'>+	pvr2_hdw_internal_find_stdenum(hdw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_std_val_to_sym(struct pvr2_ctrl *cptr,int msk,int val,</div><div class='add'>+			       char *bufPtr,unsigned int bufSize,</div><div class='add'>+			       unsigned int *len)</div><div class='add'>+{</div><div class='add'>+	*len = pvr2_std_id_to_str(bufPtr,bufSize,msk &amp; val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_std_sym_to_val(struct pvr2_ctrl *cptr,</div><div class='add'>+			       const char *bufPtr,unsigned int bufSize,</div><div class='add'>+			       int *mskp,int *valp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	v4l2_std_id id;</div><div class='add'>+	ret = pvr2_std_str_to_id(&amp;id,bufPtr,bufSize);</div><div class='add'>+	if (ret &lt; 0) return ret;</div><div class='add'>+	if (mskp) *mskp = id;</div><div class='add'>+	if (valp) *valp = id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_stdcur_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;std_mask_cur;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_stdcur_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	v4l2_std_id ns;</div><div class='add'>+	ns = hdw-&gt;std_mask_cur;</div><div class='add'>+	ns = (ns &amp; ~m) | (v &amp; m);</div><div class='add'>+	if (ns == hdw-&gt;std_mask_cur) return 0;</div><div class='add'>+	hdw-&gt;std_mask_cur = ns;</div><div class='add'>+	hdw-&gt;std_dirty = !0;</div><div class='add'>+	pvr2_hdw_internal_find_stdenum(hdw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_stdcur_is_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	return cptr-&gt;hdw-&gt;std_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctrl_stdcur_clear_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	cptr-&gt;hdw-&gt;std_dirty = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_signal_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = ((pvr2_hdw_get_signal_status_internal(cptr-&gt;hdw) &amp;</div><div class='add'>+		PVR2_SIGNAL_OK) ? 1 : 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_subsys_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;subsys_enabled_mask;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_subsys_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	pvr2_hdw_subsys_bit_chg_no_lock(cptr-&gt;hdw,m,v);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_subsys_stream_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;subsys_stream_mask;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_subsys_stream_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	pvr2_hdw_subsys_stream_bit_chg_no_lock(cptr-&gt;hdw,m,v);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctrl_stdenumcur_set(struct pvr2_ctrl *cptr,int m,int v)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = cptr-&gt;hdw;</div><div class='add'>+	if (v &lt; 0) return -EINVAL;</div><div class='add'>+	if (v &gt; hdw-&gt;std_enum_cnt) return -EINVAL;</div><div class='add'>+	hdw-&gt;std_enum_cur = v;</div><div class='add'>+	if (!v) return 0;</div><div class='add'>+	v--;</div><div class='add'>+	if (hdw-&gt;std_mask_cur == hdw-&gt;std_defs[v].id) return 0;</div><div class='add'>+	hdw-&gt;std_mask_cur = hdw-&gt;std_defs[v].id;</div><div class='add'>+	hdw-&gt;std_dirty = !0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ctrl_stdenumcur_get(struct pvr2_ctrl *cptr,int *vp)</div><div class='add'>+{</div><div class='add'>+	*vp = cptr-&gt;hdw-&gt;std_enum_cur;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ctrl_stdenumcur_is_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	return cptr-&gt;hdw-&gt;std_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void ctrl_stdenumcur_clear_dirty(struct pvr2_ctrl *cptr)</div><div class='add'>+{</div><div class='add'>+	cptr-&gt;hdw-&gt;std_dirty = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define DEFINT(vmin,vmax) \</div><div class='add'>+	.type = pvr2_ctl_int, \</div><div class='add'>+	.def.type_int.min_value = vmin, \</div><div class='add'>+	.def.type_int.max_value = vmax</div><div class='add'>+</div><div class='add'>+#define DEFENUM(tab) \</div><div class='add'>+	.type = pvr2_ctl_enum, \</div><div class='add'>+	.def.type_enum.count = (sizeof(tab)/sizeof((tab)[0])), \</div><div class='add'>+	.def.type_enum.value_names = tab</div><div class='add'>+</div><div class='add'>+#define DEFBOOL \</div><div class='add'>+	.type = pvr2_ctl_bool</div><div class='add'>+</div><div class='add'>+#define DEFMASK(msk,tab) \</div><div class='add'>+	.type = pvr2_ctl_bitmask, \</div><div class='add'>+	.def.type_bitmask.valid_bits = msk, \</div><div class='add'>+	.def.type_bitmask.bit_names = tab</div><div class='add'>+</div><div class='add'>+#define DEFREF(vname) \</div><div class='add'>+	.set_value = ctrl_set_##vname, \</div><div class='add'>+	.get_value = ctrl_get_##vname, \</div><div class='add'>+	.is_dirty = ctrl_isdirty_##vname, \</div><div class='add'>+	.clear_dirty = ctrl_cleardirty_##vname</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define VCREATE_FUNCS(vname) \</div><div class='add'>+static int ctrl_get_##vname(struct pvr2_ctrl *cptr,int *vp) \</div><div class='add'>+{*vp = cptr-&gt;hdw-&gt;vname##_val; return 0;} \</div><div class='add'>+static int ctrl_set_##vname(struct pvr2_ctrl *cptr,int m,int v) \</div><div class='add'>+{cptr-&gt;hdw-&gt;vname##_val = v; cptr-&gt;hdw-&gt;vname##_dirty = !0; return 0;} \</div><div class='add'>+static int ctrl_isdirty_##vname(struct pvr2_ctrl *cptr) \</div><div class='add'>+{return cptr-&gt;hdw-&gt;vname##_dirty != 0;} \</div><div class='add'>+static void ctrl_cleardirty_##vname(struct pvr2_ctrl *cptr) \</div><div class='add'>+{cptr-&gt;hdw-&gt;vname##_dirty = 0;}</div><div class='add'>+</div><div class='add'>+VCREATE_FUNCS(brightness)</div><div class='add'>+VCREATE_FUNCS(contrast)</div><div class='add'>+VCREATE_FUNCS(saturation)</div><div class='add'>+VCREATE_FUNCS(hue)</div><div class='add'>+VCREATE_FUNCS(volume)</div><div class='add'>+VCREATE_FUNCS(balance)</div><div class='add'>+VCREATE_FUNCS(bass)</div><div class='add'>+VCREATE_FUNCS(treble)</div><div class='add'>+VCREATE_FUNCS(mute)</div><div class='add'>+VCREATE_FUNCS(input)</div><div class='add'>+VCREATE_FUNCS(audiomode)</div><div class='add'>+VCREATE_FUNCS(res_hor)</div><div class='add'>+VCREATE_FUNCS(res_ver)</div><div class='add'>+VCREATE_FUNCS(srate)</div><div class='add'>+</div><div class='add'>+#define MIN_FREQ 55250000L</div><div class='add'>+#define MAX_FREQ 850000000L</div><div class='add'>+</div><div class='add'>+/* Table definition of all controls which can be manipulated */</div><div class='add'>+static const struct pvr2_ctl_info control_defs[] = {</div><div class='add'>+	{</div><div class='add'>+		.v4l_id = V4L2_CID_BRIGHTNESS,</div><div class='add'>+		.desc = "Brightness",</div><div class='add'>+		.name = "brightness",</div><div class='add'>+		.default_value = 128,</div><div class='add'>+		DEFREF(brightness),</div><div class='add'>+		DEFINT(0,255),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_CONTRAST,</div><div class='add'>+		.desc = "Contrast",</div><div class='add'>+		.name = "contrast",</div><div class='add'>+		.default_value = 68,</div><div class='add'>+		DEFREF(contrast),</div><div class='add'>+		DEFINT(0,127),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_SATURATION,</div><div class='add'>+		.desc = "Saturation",</div><div class='add'>+		.name = "saturation",</div><div class='add'>+		.default_value = 64,</div><div class='add'>+		DEFREF(saturation),</div><div class='add'>+		DEFINT(0,127),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_HUE,</div><div class='add'>+		.desc = "Hue",</div><div class='add'>+		.name = "hue",</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(hue),</div><div class='add'>+		DEFINT(-128,127),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_AUDIO_VOLUME,</div><div class='add'>+		.desc = "Volume",</div><div class='add'>+		.name = "volume",</div><div class='add'>+		.default_value = 65535,</div><div class='add'>+		DEFREF(volume),</div><div class='add'>+		DEFINT(0,65535),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_AUDIO_BALANCE,</div><div class='add'>+		.desc = "Balance",</div><div class='add'>+		.name = "balance",</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(balance),</div><div class='add'>+		DEFINT(-32768,32767),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_AUDIO_BASS,</div><div class='add'>+		.desc = "Bass",</div><div class='add'>+		.name = "bass",</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(bass),</div><div class='add'>+		DEFINT(-32768,32767),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_AUDIO_TREBLE,</div><div class='add'>+		.desc = "Treble",</div><div class='add'>+		.name = "treble",</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(treble),</div><div class='add'>+		DEFINT(-32768,32767),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_AUDIO_MUTE,</div><div class='add'>+		.desc = "Mute",</div><div class='add'>+		.name = "mute",</div><div class='add'>+		.default_value = 0,</div><div class='add'>+		DEFREF(mute),</div><div class='add'>+		DEFBOOL,</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Video Source",</div><div class='add'>+		.name = "input",</div><div class='add'>+		.internal_id = PVR2_CID_INPUT,</div><div class='add'>+		.default_value = PVR2_CVAL_INPUT_TV,</div><div class='add'>+		DEFREF(input),</div><div class='add'>+		DEFENUM(control_values_input),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Audio Mode",</div><div class='add'>+		.name = "audio_mode",</div><div class='add'>+		.internal_id = PVR2_CID_AUDIOMODE,</div><div class='add'>+		.default_value = V4L2_TUNER_MODE_STEREO,</div><div class='add'>+		DEFREF(audiomode),</div><div class='add'>+		DEFENUM(control_values_audiomode),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Horizontal capture resolution",</div><div class='add'>+		.name = "resolution_hor",</div><div class='add'>+		.internal_id = PVR2_CID_HRES,</div><div class='add'>+		.default_value = 720,</div><div class='add'>+		DEFREF(res_hor),</div><div class='add'>+		DEFINT(320,720),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Vertical capture resolution",</div><div class='add'>+		.name = "resolution_ver",</div><div class='add'>+		.internal_id = PVR2_CID_VRES,</div><div class='add'>+		.default_value = 480,</div><div class='add'>+		DEFREF(res_ver),</div><div class='add'>+		DEFINT(200,625),</div><div class='add'>+	},{</div><div class='add'>+		.v4l_id = V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,</div><div class='add'>+		.desc = "Sample rate",</div><div class='add'>+		.name = "srate",</div><div class='add'>+		.default_value = PVR2_CVAL_SRATE_48,</div><div class='add'>+		DEFREF(srate),</div><div class='add'>+		DEFENUM(control_values_srate),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Tuner Frequency (Hz)",</div><div class='add'>+		.name = "frequency",</div><div class='add'>+		.internal_id = PVR2_CID_FREQUENCY,</div><div class='add'>+		.default_value = 175250000L,</div><div class='add'>+		.set_value = ctrl_freq_set,</div><div class='add'>+		.get_value = ctrl_freq_get,</div><div class='add'>+		.is_dirty = ctrl_freq_is_dirty,</div><div class='add'>+		.clear_dirty = ctrl_freq_clear_dirty,</div><div class='add'>+		DEFINT(MIN_FREQ,MAX_FREQ),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Channel",</div><div class='add'>+		.name = "channel",</div><div class='add'>+		.set_value = ctrl_channel_set,</div><div class='add'>+		.get_value = ctrl_channel_get,</div><div class='add'>+		DEFINT(0,FREQTABLE_SIZE),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Channel Program Frequency",</div><div class='add'>+		.name = "freq_table_value",</div><div class='add'>+		.set_value = ctrl_channelfreq_set,</div><div class='add'>+		.get_value = ctrl_channelfreq_get,</div><div class='add'>+		DEFINT(MIN_FREQ,MAX_FREQ),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Channel Program ID",</div><div class='add'>+		.name = "freq_table_channel",</div><div class='add'>+		.set_value = ctrl_channelprog_set,</div><div class='add'>+		.get_value = ctrl_channelprog_get,</div><div class='add'>+		DEFINT(0,FREQTABLE_SIZE),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Streaming Enabled",</div><div class='add'>+		.name = "streaming_enabled",</div><div class='add'>+		.get_value = ctrl_streamingenabled_get,</div><div class='add'>+		DEFBOOL,</div><div class='add'>+	},{</div><div class='add'>+		.desc = "USB Speed",</div><div class='add'>+		.name = "usb_speed",</div><div class='add'>+		.get_value = ctrl_hsm_get,</div><div class='add'>+		DEFENUM(control_values_hsm),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Signal Present",</div><div class='add'>+		.name = "signal_present",</div><div class='add'>+		.get_value = ctrl_signal_get,</div><div class='add'>+		DEFBOOL,</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Video Standards Available Mask",</div><div class='add'>+		.name = "video_standard_mask_available",</div><div class='add'>+		.internal_id = PVR2_CID_STDAVAIL,</div><div class='add'>+		.skip_init = !0,</div><div class='add'>+		.get_value = ctrl_stdavail_get,</div><div class='add'>+		.set_value = ctrl_stdavail_set,</div><div class='add'>+		.val_to_sym = ctrl_std_val_to_sym,</div><div class='add'>+		.sym_to_val = ctrl_std_sym_to_val,</div><div class='add'>+		.type = pvr2_ctl_bitmask,</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Video Standards In Use Mask",</div><div class='add'>+		.name = "video_standard_mask_active",</div><div class='add'>+		.internal_id = PVR2_CID_STDCUR,</div><div class='add'>+		.skip_init = !0,</div><div class='add'>+		.get_value = ctrl_stdcur_get,</div><div class='add'>+		.set_value = ctrl_stdcur_set,</div><div class='add'>+		.is_dirty = ctrl_stdcur_is_dirty,</div><div class='add'>+		.clear_dirty = ctrl_stdcur_clear_dirty,</div><div class='add'>+		.val_to_sym = ctrl_std_val_to_sym,</div><div class='add'>+		.sym_to_val = ctrl_std_sym_to_val,</div><div class='add'>+		.type = pvr2_ctl_bitmask,</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Subsystem enabled mask",</div><div class='add'>+		.name = "debug_subsys_mask",</div><div class='add'>+		.skip_init = !0,</div><div class='add'>+		.get_value = ctrl_subsys_get,</div><div class='add'>+		.set_value = ctrl_subsys_set,</div><div class='add'>+		DEFMASK(PVR2_SUBSYS_ALL,control_values_subsystem),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Subsystem stream mask",</div><div class='add'>+		.name = "debug_subsys_stream_mask",</div><div class='add'>+		.skip_init = !0,</div><div class='add'>+		.get_value = ctrl_subsys_stream_get,</div><div class='add'>+		.set_value = ctrl_subsys_stream_set,</div><div class='add'>+		DEFMASK(PVR2_SUBSYS_ALL,control_values_subsystem),</div><div class='add'>+	},{</div><div class='add'>+		.desc = "Video Standard Name",</div><div class='add'>+		.name = "video_standard",</div><div class='add'>+		.internal_id = PVR2_CID_STDENUM,</div><div class='add'>+		.skip_init = !0,</div><div class='add'>+		.get_value = ctrl_stdenumcur_get,</div><div class='add'>+		.set_value = ctrl_stdenumcur_set,</div><div class='add'>+		.is_dirty = ctrl_stdenumcur_is_dirty,</div><div class='add'>+		.clear_dirty = ctrl_stdenumcur_clear_dirty,</div><div class='add'>+		.type = pvr2_ctl_enum,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CTRLDEF_COUNT (sizeof(control_defs)/sizeof(control_defs[0]))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const char *pvr2_config_get_name(enum pvr2_config cfg)</div><div class='add'>+{</div><div class='add'>+	switch (cfg) {</div><div class='add'>+	case pvr2_config_empty: return "empty";</div><div class='add'>+	case pvr2_config_mpeg: return "mpeg";</div><div class='add'>+	case pvr2_config_vbi: return "vbi";</div><div class='add'>+	case pvr2_config_radio: return "radio";</div><div class='add'>+	}</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct usb_device *pvr2_hdw_get_dev(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;usb_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+unsigned long pvr2_hdw_get_sn(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;serial_number;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_get_unit_number(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;unit_number;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Attempt to locate one of the given set of files.  Messages are logged</div><div class='add'>+   appropriate to what has been found.  The return value will be 0 or</div><div class='add'>+   greater on success (it will be the index of the file name found) and</div><div class='add'>+   fw_entry will be filled in.  Otherwise a negative error is returned on</div><div class='add'>+   failure.  If the return value is -ENOENT then no viable firmware file</div><div class='add'>+   could be located. */</div><div class='add'>+static int pvr2_locate_firmware(struct pvr2_hdw *hdw,</div><div class='add'>+				const struct firmware **fw_entry,</div><div class='add'>+				const char *fwtypename,</div><div class='add'>+				unsigned int fwcount,</div><div class='add'>+				const char *fwnames[])</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	for (idx = 0; idx &lt; fwcount; idx++) {</div><div class='add'>+		ret = request_firmware(fw_entry,</div><div class='add'>+				       fwnames[idx],</div><div class='add'>+				       &amp;hdw-&gt;usb_dev-&gt;dev);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			trace_firmware("Located %s firmware: %s;"</div><div class='add'>+				       " uploading...",</div><div class='add'>+				       fwtypename,</div><div class='add'>+				       fwnames[idx]);</div><div class='add'>+			return idx;</div><div class='add'>+		}</div><div class='add'>+		if (ret == -ENOENT) continue;</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "request_firmware fatal error with code=%d",ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+		   "***WARNING***"</div><div class='add'>+		   " Device %s firmware"</div><div class='add'>+		   " seems to be missing.",</div><div class='add'>+		   fwtypename);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+		   "Did you install the pvrusb2 firmware files"</div><div class='add'>+		   " in their proper location?");</div><div class='add'>+	if (fwcount == 1) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "request_firmware unable to locate %s file %s",</div><div class='add'>+			   fwtypename,fwnames[0]);</div><div class='add'>+	} else {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "request_firmware unable to locate"</div><div class='add'>+			   " one of the following %s files:",</div><div class='add'>+			   fwtypename);</div><div class='add'>+		for (idx = 0; idx &lt; fwcount; idx++) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "request_firmware: Failed to find %s",</div><div class='add'>+				   fwnames[idx]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pvr2_upload_firmware1().</div><div class='add'>+ *</div><div class='add'>+ * Send the 8051 firmware to the device.  After the upload, arrange for</div><div class='add'>+ * device to re-enumerate.</div><div class='add'>+ *</div><div class='add'>+ * NOTE : the pointer to the firmware data given by request_firmware()</div><div class='add'>+ * is not suitable for an usb transaction.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw_entry = NULL;</div><div class='add'>+	void  *fw_ptr;</div><div class='add'>+	unsigned int pipe;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 address;</div><div class='add'>+	static const char *fw_files_29xxx[] = {</div><div class='add'>+		"v4l-pvrusb2-29xxx-01.fw",</div><div class='add'>+	};</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+	static const char *fw_files_24xxx[] = {</div><div class='add'>+		"v4l-pvrusb2-24xxx-01.fw",</div><div class='add'>+	};</div><div class='add'>+#endif</div><div class='add'>+	static const struct pvr2_string_table fw_file_defs[] = {</div><div class='add'>+		[PVR2_HDW_TYPE_29XXX] = {</div><div class='add'>+			fw_files_29xxx,</div><div class='add'>+			sizeof(fw_files_29xxx)/sizeof(fw_files_29xxx[0]),</div><div class='add'>+		},</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+		[PVR2_HDW_TYPE_24XXX] = {</div><div class='add'>+			fw_files_24xxx,</div><div class='add'>+			sizeof(fw_files_24xxx)/sizeof(fw_files_24xxx[0]),</div><div class='add'>+		},</div><div class='add'>+#endif</div><div class='add'>+	};</div><div class='add'>+	hdw-&gt;fw1_state = FW1_STATE_FAILED; // default result</div><div class='add'>+</div><div class='add'>+	trace_firmware("pvr2_upload_firmware1");</div><div class='add'>+</div><div class='add'>+	ret = pvr2_locate_firmware(hdw,&amp;fw_entry,"fx2 controller",</div><div class='add'>+				   fw_file_defs[hdw-&gt;hdw_type].cnt,</div><div class='add'>+				   fw_file_defs[hdw-&gt;hdw_type].lst);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (ret == -ENOENT) hdw-&gt;fw1_state = FW1_STATE_MISSING;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_settoggle(hdw-&gt;usb_dev, 0 &amp; 0xf, !(0 &amp; USB_DIR_IN), 0);</div><div class='add'>+	usb_clear_halt(hdw-&gt;usb_dev, usb_sndbulkpipe(hdw-&gt;usb_dev, 0 &amp; 0x7f));</div><div class='add'>+</div><div class='add'>+	pipe = usb_sndctrlpipe(hdw-&gt;usb_dev, 0);</div><div class='add'>+</div><div class='add'>+	if (fw_entry-&gt;size != 0x2000){</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,"wrong fx2 firmware size");</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_ptr = kmalloc(0x800, GFP_KERNEL);</div><div class='add'>+	if (fw_ptr == NULL){</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have to hold the CPU during firmware upload. */</div><div class='add'>+	pvr2_hdw_cpureset_assert(hdw,1);</div><div class='add'>+</div><div class='add'>+	/* upload the firmware to address 0000-1fff in 2048 (=0x800) bytes</div><div class='add'>+	   chunk. */</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	for(address = 0; address &lt; fw_entry-&gt;size; address += 0x800) {</div><div class='add'>+		memcpy(fw_ptr, fw_entry-&gt;data + address, 0x800);</div><div class='add'>+		ret += usb_control_msg(hdw-&gt;usb_dev, pipe, 0xa0, 0x40, address,</div><div class='add'>+				       0, fw_ptr, 0x800, HZ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_firmware("Upload done, releasing device's CPU");</div><div class='add'>+</div><div class='add'>+	/* Now release the CPU.  It will disconnect and reconnect later. */</div><div class='add'>+	pvr2_hdw_cpureset_assert(hdw,0);</div><div class='add'>+</div><div class='add'>+	kfree(fw_ptr);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+</div><div class='add'>+	trace_firmware("Upload done (%d bytes sent)",ret);</div><div class='add'>+</div><div class='add'>+	/* We should have written 8192 bytes */</div><div class='add'>+	if (ret == 8192) {</div><div class='add'>+		hdw-&gt;fw1_state = FW1_STATE_RELOAD;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pvr2_upload_firmware2()</div><div class='add'>+ *</div><div class='add'>+ * This uploads encoder firmware on endpoint 2.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int pvr2_upload_firmware2(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw_entry = NULL;</div><div class='add'>+	void  *fw_ptr;</div><div class='add'>+	unsigned int pipe, fw_len, fw_done;</div><div class='add'>+	int actual_length;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int fwidx;</div><div class='add'>+	static const char *fw_files[] = {</div><div class='add'>+		CX2341X_FIRM_ENC_FILENAME,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	trace_firmware("pvr2_upload_firmware2");</div><div class='add'>+</div><div class='add'>+	ret = pvr2_locate_firmware(hdw,&amp;fw_entry,"encoder",</div><div class='add'>+				   sizeof(fw_files)/sizeof(fw_files[0]),</div><div class='add'>+				   fw_files);</div><div class='add'>+	if (ret &lt; 0) return ret;</div><div class='add'>+	fwidx = ret;</div><div class='add'>+	ret = 0;</div><div class='add'>+	/* Since we're about to completely reinitialize the encoder,</div><div class='add'>+	   invalidate our cached copy of its configuration state.  Next</div><div class='add'>+	   time we configure the encoder, then we'll fully configure it. */</div><div class='add'>+	hdw-&gt;enc_cur_valid = 0;</div><div class='add'>+</div><div class='add'>+	/* First prepare firmware loading */</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x0048, 0xffffffff); /*interrupt mask*/</div><div class='add'>+	ret |= pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000088); /*gpio dir*/</div><div class='add'>+	ret |= pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000008); /*gpio output state*/</div><div class='add'>+	ret |= pvr2_hdw_cmd_deep_reset(hdw);</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0xa064, 0x00000000); /*APU command*/</div><div class='add'>+	ret |= pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000408); /*gpio dir*/</div><div class='add'>+	ret |= pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000008); /*gpio output state*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x9058, 0xffffffed); /*VPU ctrl*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x9054, 0xfffffffd); /*reset hw blocks*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x07f8, 0x80000800); /*encoder SDRAM refresh*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x07fc, 0x0000001a); /*encoder SDRAM pre-charge*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x0700, 0x00000000); /*I2C clock*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0xaa00, 0x00000000); /*unknown*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0xaa04, 0x00057810); /*unknown*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0xaa10, 0x00148500); /*unknown*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0xaa18, 0x00840000); /*unknown*/</div><div class='add'>+	ret |= pvr2_write_u8(hdw, 0x52, 0);</div><div class='add'>+	ret |= pvr2_write_u16(hdw, 0x0600, 0);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "firmware2 upload prep failed, ret=%d",ret);</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now send firmware */</div><div class='add'>+</div><div class='add'>+	fw_len = fw_entry-&gt;size;</div><div class='add'>+</div><div class='add'>+	if (fw_len % FIRMWARE_CHUNK_SIZE) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "size of %s firmware"</div><div class='add'>+			   " must be a multiple of 8192B",</div><div class='add'>+			   fw_files[fwidx]);</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_ptr = kmalloc(FIRMWARE_CHUNK_SIZE, GFP_KERNEL);</div><div class='add'>+	if (fw_ptr == NULL){</div><div class='add'>+		release_firmware(fw_entry);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "failed to allocate memory for firmware2 upload");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pipe = usb_sndbulkpipe(hdw-&gt;usb_dev, PVR2_FIRMWARE_ENDPOINT);</div><div class='add'>+</div><div class='add'>+	for (fw_done = 0 ; (fw_done &lt; fw_len) &amp;&amp; !ret ;</div><div class='add'>+	     fw_done += FIRMWARE_CHUNK_SIZE ) {</div><div class='add'>+		int i;</div><div class='add'>+		memcpy(fw_ptr, fw_entry-&gt;data + fw_done, FIRMWARE_CHUNK_SIZE);</div><div class='add'>+		/* Usbsnoop log  shows that we must swap bytes... */</div><div class='add'>+		for (i = 0; i &lt; FIRMWARE_CHUNK_SIZE/4 ; i++)</div><div class='add'>+			((u32 *)fw_ptr)[i] = ___swab32(((u32 *)fw_ptr)[i]);</div><div class='add'>+</div><div class='add'>+		ret |= usb_bulk_msg(hdw-&gt;usb_dev, pipe, fw_ptr,</div><div class='add'>+				    FIRMWARE_CHUNK_SIZE,</div><div class='add'>+				    &amp;actual_length, HZ);</div><div class='add'>+		ret |= (actual_length != FIRMWARE_CHUNK_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_firmware("upload of %s : %i / %i ",</div><div class='add'>+		       fw_files[fwidx],fw_done,fw_len);</div><div class='add'>+</div><div class='add'>+	kfree(fw_ptr);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "firmware2 upload transfer failure");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Finish upload */</div><div class='add'>+</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x9054, 0xffffffff); /*reset hw blocks*/</div><div class='add'>+	ret |= pvr2_write_register(hdw, 0x9058, 0xffffffe8); /*VPU ctrl*/</div><div class='add'>+	ret |= pvr2_write_u16(hdw, 0x0600, 0);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "firmware2 upload post-proc failure");</div><div class='add'>+	} else {</div><div class='add'>+		hdw-&gt;subsys_enabled_mask |= (1&lt;&lt;PVR2_SUBSYS_B_ENC_FIRMWARE);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define FIRMWARE_RECOVERY_BITS \</div><div class='add'>+	((1&lt;&lt;PVR2_SUBSYS_B_ENC_CFG) | \</div><div class='add'>+	 (1&lt;&lt;PVR2_SUBSYS_B_ENC_RUN) | \</div><div class='add'>+	 (1&lt;&lt;PVR2_SUBSYS_B_ENC_FIRMWARE) | \</div><div class='add'>+	 (1&lt;&lt;PVR2_SUBSYS_B_USBSTREAM_RUN))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+  This single function is key to pretty much everything.  The pvrusb2</div><div class='add'>+  device can logically be viewed as a series of subsystems which can be</div><div class='add'>+  stopped / started or unconfigured / configured.  To get things streaming,</div><div class='add'>+  one must configure everything and start everything, but there may be</div><div class='add'>+  various reasons over time to deconfigure something or stop something.</div><div class='add'>+  This function handles all of this activity.  Everything EVERYWHERE that</div><div class='add'>+  must affect a subsystem eventually comes here to do the work.</div><div class='add'>+</div><div class='add'>+  The current state of all subsystems is represented by a single bit mask,</div><div class='add'>+  known as subsys_enabled_mask.  The bit positions are defined by the</div><div class='add'>+  PVR2_SUBSYS_xxxx macros, with one subsystem per bit position.  At any</div><div class='add'>+  time the set of configured or active subsystems can be queried just by</div><div class='add'>+  looking at that mask.  To change bits in that mask, this function here</div><div class='add'>+  must be called.  The "msk" argument indicates which bit positions to</div><div class='add'>+  change, and the "val" argument defines the new values for the positions</div><div class='add'>+  defined by "msk".</div><div class='add'>+</div><div class='add'>+  There is a priority ordering of starting / stopping things, and for</div><div class='add'>+  multiple requested changes, this function implements that ordering.</div><div class='add'>+  (Thus we will act on a request to load encoder firmware before we</div><div class='add'>+  configure the encoder.)  In addition to priority ordering, there is a</div><div class='add'>+  recovery strategy implemented here.  If a particular step fails and we</div><div class='add'>+  detect that failure, this function will clear the affected subsystem bits</div><div class='add'>+  and restart.  Thus we have a means for recovering from a dead encoder:</div><div class='add'>+  Clear all bits that correspond to subsystems that we need to restart /</div><div class='add'>+  reconfigure and start over.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+static void pvr2_hdw_subsys_bit_chg_no_lock(struct pvr2_hdw *hdw,</div><div class='add'>+					    unsigned long msk,</div><div class='add'>+					    unsigned long val)</div><div class='add'>+{</div><div class='add'>+	unsigned long nmsk;</div><div class='add'>+	unsigned long vmsk;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int tryCount = 0;</div><div class='add'>+</div><div class='add'>+	if (!hdw-&gt;flag_ok) return;</div><div class='add'>+</div><div class='add'>+	msk &amp;= PVR2_SUBSYS_ALL;</div><div class='add'>+	nmsk = (hdw-&gt;subsys_enabled_mask &amp; ~msk) | (val &amp; msk);</div><div class='add'>+	nmsk &amp;= PVR2_SUBSYS_ALL;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		tryCount++;</div><div class='add'>+		if (!((nmsk ^ hdw-&gt;subsys_enabled_mask) &amp;</div><div class='add'>+		      PVR2_SUBSYS_ALL)) break;</div><div class='add'>+		if (tryCount &gt; 4) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Too many retries when configuring device;"</div><div class='add'>+				   " giving up");</div><div class='add'>+			pvr2_hdw_render_useless(hdw);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (tryCount &gt; 1) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Retrying device reconfiguration");</div><div class='add'>+		}</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "subsys mask changing 0x%lx:0x%lx"</div><div class='add'>+			   " from 0x%lx to 0x%lx",</div><div class='add'>+			   msk,val,hdw-&gt;subsys_enabled_mask,nmsk);</div><div class='add'>+</div><div class='add'>+		vmsk = (nmsk ^ hdw-&gt;subsys_enabled_mask) &amp;</div><div class='add'>+			hdw-&gt;subsys_enabled_mask;</div><div class='add'>+		if (vmsk) {</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_ENC_RUN)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " pvr2_encoder_stop");</div><div class='add'>+				ret = pvr2_encoder_stop(hdw);</div><div class='add'>+				if (ret) {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						   "Error recovery initiated");</div><div class='add'>+					hdw-&gt;subsys_enabled_mask &amp;=</div><div class='add'>+						~FIRMWARE_RECOVERY_BITS;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_USBSTREAM_RUN)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " pvr2_hdw_cmd_usbstream(0)");</div><div class='add'>+				pvr2_hdw_cmd_usbstream(hdw,0);</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_DIGITIZER_RUN)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " decoder disable");</div><div class='add'>+				if (hdw-&gt;decoder_ctrl) {</div><div class='add'>+					hdw-&gt;decoder_ctrl-&gt;enable(</div><div class='add'>+						hdw-&gt;decoder_ctrl-&gt;ctxt,0);</div><div class='add'>+				} else {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						   "WARNING:"</div><div class='add'>+						   " No decoder present");</div><div class='add'>+				}</div><div class='add'>+				hdw-&gt;subsys_enabled_mask &amp;=</div><div class='add'>+					~(1&lt;&lt;PVR2_SUBSYS_B_DIGITIZER_RUN);</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; PVR2_SUBSYS_CFG_ALL) {</div><div class='add'>+				hdw-&gt;subsys_enabled_mask &amp;=</div><div class='add'>+					~(vmsk &amp; PVR2_SUBSYS_CFG_ALL);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		vmsk = (nmsk ^ hdw-&gt;subsys_enabled_mask) &amp; nmsk;</div><div class='add'>+		if (vmsk) {</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_ENC_FIRMWARE)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " pvr2_upload_firmware2");</div><div class='add'>+				ret = pvr2_upload_firmware2(hdw);</div><div class='add'>+				if (ret) {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						   "Failure uploading encoder"</div><div class='add'>+						   " firmware");</div><div class='add'>+					pvr2_hdw_render_useless(hdw);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_ENC_CFG)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " pvr2_encoder_configure");</div><div class='add'>+				ret = pvr2_encoder_configure(hdw);</div><div class='add'>+				if (ret) {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						   "Error recovery initiated");</div><div class='add'>+					hdw-&gt;subsys_enabled_mask &amp;=</div><div class='add'>+						~FIRMWARE_RECOVERY_BITS;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_DIGITIZER_RUN)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " decoder enable");</div><div class='add'>+				if (hdw-&gt;decoder_ctrl) {</div><div class='add'>+					hdw-&gt;decoder_ctrl-&gt;enable(</div><div class='add'>+						hdw-&gt;decoder_ctrl-&gt;ctxt,!0);</div><div class='add'>+				} else {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						   "WARNING:"</div><div class='add'>+						   " No decoder present");</div><div class='add'>+				}</div><div class='add'>+				hdw-&gt;subsys_enabled_mask |=</div><div class='add'>+					(1&lt;&lt;PVR2_SUBSYS_B_DIGITIZER_RUN);</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_USBSTREAM_RUN)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " pvr2_hdw_cmd_usbstream(1)");</div><div class='add'>+				pvr2_hdw_cmd_usbstream(hdw,!0);</div><div class='add'>+			}</div><div class='add'>+			if (vmsk &amp; (1&lt;&lt;PVR2_SUBSYS_B_ENC_RUN)) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+					   "/*---TRACE_CTL----*/"</div><div class='add'>+					   " pvr2_encoder_start");</div><div class='add'>+				ret = pvr2_encoder_start(hdw);</div><div class='add'>+				if (ret) {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+						   "Error recovery initiated");</div><div class='add'>+					hdw-&gt;subsys_enabled_mask &amp;=</div><div class='add'>+						~FIRMWARE_RECOVERY_BITS;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_subsys_bit_chg(struct pvr2_hdw *hdw,</div><div class='add'>+			     unsigned long msk,unsigned long val)</div><div class='add'>+{</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		pvr2_hdw_subsys_bit_chg_no_lock(hdw,msk,val);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;subsys_enabled_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+unsigned long pvr2_hdw_subsys_stream_get(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;subsys_stream_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_hdw_subsys_stream_bit_chg_no_lock(struct pvr2_hdw *hdw,</div><div class='add'>+						   unsigned long msk,</div><div class='add'>+						   unsigned long val)</div><div class='add'>+{</div><div class='add'>+	unsigned long val2;</div><div class='add'>+	msk &amp;= PVR2_SUBSYS_ALL;</div><div class='add'>+	val2 = ((hdw-&gt;subsys_stream_mask &amp; ~msk) | (val &amp; msk));</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+		   "stream mask changing 0x%lx:0x%lx from 0x%lx to 0x%lx",</div><div class='add'>+		   msk,val,hdw-&gt;subsys_stream_mask,val2);</div><div class='add'>+	hdw-&gt;subsys_stream_mask = val2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_subsys_stream_bit_chg(struct pvr2_hdw *hdw,</div><div class='add'>+				    unsigned long msk,</div><div class='add'>+				    unsigned long val)</div><div class='add'>+{</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		pvr2_hdw_subsys_stream_bit_chg_no_lock(hdw,msk,val);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_hdw_set_streaming_no_lock(struct pvr2_hdw *hdw,int enableFl)</div><div class='add'>+{</div><div class='add'>+	if ((!enableFl) == !(hdw-&gt;flag_streaming_enabled)) return 0;</div><div class='add'>+	if (enableFl) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_START_STOP,</div><div class='add'>+			   "/*--TRACE_STREAM--*/ enable");</div><div class='add'>+		pvr2_hdw_subsys_bit_chg_no_lock(hdw,~0,~0);</div><div class='add'>+	} else {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_START_STOP,</div><div class='add'>+			   "/*--TRACE_STREAM--*/ disable");</div><div class='add'>+		pvr2_hdw_subsys_bit_chg_no_lock(hdw,hdw-&gt;subsys_stream_mask,0);</div><div class='add'>+	}</div><div class='add'>+	if (!hdw-&gt;flag_ok) return -EIO;</div><div class='add'>+	hdw-&gt;flag_streaming_enabled = enableFl != 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_get_streaming(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;flag_streaming_enabled != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_set_streaming(struct pvr2_hdw *hdw,int enable_flag)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		ret = pvr2_hdw_set_streaming_no_lock(hdw,enable_flag);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_hdw_set_stream_type_no_lock(struct pvr2_hdw *hdw,</div><div class='add'>+					    enum pvr2_config config)</div><div class='add'>+{</div><div class='add'>+	unsigned long sm = hdw-&gt;subsys_enabled_mask;</div><div class='add'>+	if (!hdw-&gt;flag_ok) return -EIO;</div><div class='add'>+	pvr2_hdw_subsys_bit_chg_no_lock(hdw,hdw-&gt;subsys_stream_mask,0);</div><div class='add'>+	hdw-&gt;config = config;</div><div class='add'>+	pvr2_hdw_subsys_bit_chg_no_lock(hdw,~0,sm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_set_stream_type(struct pvr2_hdw *hdw,enum pvr2_config config)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	if (!hdw-&gt;flag_ok) return -EIO;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock);</div><div class='add'>+	ret = pvr2_hdw_set_stream_type_no_lock(hdw,config);</div><div class='add'>+	LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int get_default_tuner_type(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int unit_number = hdw-&gt;unit_number;</div><div class='add'>+	int tp = -1;</div><div class='add'>+	if ((unit_number &gt;= 0) &amp;&amp; (unit_number &lt; PVR_NUM)) {</div><div class='add'>+		tp = tuner[unit_number];</div><div class='add'>+	}</div><div class='add'>+	if (tp &lt; 0) return -EINVAL;</div><div class='add'>+	hdw-&gt;tuner_type = tp;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static v4l2_std_id get_default_standard(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int unit_number = hdw-&gt;unit_number;</div><div class='add'>+	int tp = 0;</div><div class='add'>+	if ((unit_number &gt;= 0) &amp;&amp; (unit_number &lt; PVR_NUM)) {</div><div class='add'>+		tp = video_std[unit_number];</div><div class='add'>+	}</div><div class='add'>+	return tp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int get_default_error_tolerance(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int unit_number = hdw-&gt;unit_number;</div><div class='add'>+	int tp = 0;</div><div class='add'>+	if ((unit_number &gt;= 0) &amp;&amp; (unit_number &lt; PVR_NUM)) {</div><div class='add'>+		tp = tolerance[unit_number];</div><div class='add'>+	}</div><div class='add'>+	return tp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_hdw_check_firmware(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	/* Try a harmless request to fetch the eeprom's address over</div><div class='add'>+	   endpoint 1.  See what happens.  Only the full FX2 image can</div><div class='add'>+	   respond to this.  If this probe fails then likely the FX2</div><div class='add'>+	   firmware needs be loaded. */</div><div class='add'>+	int result;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = 0xeb;</div><div class='add'>+		result = pvr2_send_request_ex(hdw,HZ*1,!0,</div><div class='add'>+					   hdw-&gt;cmd_buffer,1,</div><div class='add'>+					   hdw-&gt;cmd_buffer,1);</div><div class='add'>+		if (result &lt; 0) break;</div><div class='add'>+	} while(0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	if (result) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Probe of device endpoint 1 result status %d",</div><div class='add'>+			   result);</div><div class='add'>+	} else {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Probe of device endpoint 1 succeeded");</div><div class='add'>+	}</div><div class='add'>+	return result == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	char buf[40];</div><div class='add'>+	unsigned int bcnt;</div><div class='add'>+	v4l2_std_id std1,std2;</div><div class='add'>+</div><div class='add'>+	std1 = get_default_standard(hdw);</div><div class='add'>+</div><div class='add'>+	bcnt = pvr2_std_id_to_str(buf,sizeof(buf),hdw-&gt;std_mask_eeprom);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+		   "Supported video standard(s) reported by eeprom: %.*s",</div><div class='add'>+		   bcnt,buf);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;std_mask_avail = hdw-&gt;std_mask_eeprom;</div><div class='add'>+</div><div class='add'>+	std2 = std1 &amp; ~hdw-&gt;std_mask_avail;</div><div class='add'>+	if (std2) {</div><div class='add'>+		bcnt = pvr2_std_id_to_str(buf,sizeof(buf),std2);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Expanding supported video standards"</div><div class='add'>+			   " to include: %.*s",</div><div class='add'>+			   bcnt,buf);</div><div class='add'>+		hdw-&gt;std_mask_avail |= std2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_internal_set_std_avail(hdw);</div><div class='add'>+</div><div class='add'>+	if (std1) {</div><div class='add'>+		bcnt = pvr2_std_id_to_str(buf,sizeof(buf),std1);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Initial video standard forced to %.*s",</div><div class='add'>+			   bcnt,buf);</div><div class='add'>+		hdw-&gt;std_mask_cur = std1;</div><div class='add'>+		hdw-&gt;std_dirty = !0;</div><div class='add'>+		pvr2_hdw_internal_find_stdenum(hdw);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;std_enum_cnt &gt; 1) {</div><div class='add'>+		// Autoselect the first listed standard</div><div class='add'>+		hdw-&gt;std_enum_cur = 1;</div><div class='add'>+		hdw-&gt;std_mask_cur = hdw-&gt;std_defs[hdw-&gt;std_enum_cur-1].id;</div><div class='add'>+		hdw-&gt;std_dirty = !0;</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Initial video standard auto-selected to %s",</div><div class='add'>+			   hdw-&gt;std_defs[hdw-&gt;std_enum_cur-1].name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+		   "Unable to select a viable initial video standard");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	int reloadFl = 0;</div><div class='add'>+	if (!reloadFl) {</div><div class='add'>+		reloadFl = (hdw-&gt;usb_intf-&gt;cur_altsetting-&gt;desc.bNumEndpoints</div><div class='add'>+			    == 0);</div><div class='add'>+		if (reloadFl) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+				   "USB endpoint config looks strange"</div><div class='add'>+				   "; possibly firmware needs to be loaded");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!reloadFl) {</div><div class='add'>+		reloadFl = !pvr2_hdw_check_firmware(hdw);</div><div class='add'>+		if (reloadFl) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+				   "Check for FX2 firmware failed"</div><div class='add'>+				   "; possibly firmware needs to be loaded");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (reloadFl) {</div><div class='add'>+		if (pvr2_upload_firmware1(hdw) != 0) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Failure uploading firmware1");</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;fw1_state = FW1_STATE_OK;</div><div class='add'>+</div><div class='add'>+	if (initusbreset) {</div><div class='add'>+		pvr2_hdw_device_reset(hdw);</div><div class='add'>+	}</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; pvr2_client_lists[hdw-&gt;hdw_type].cnt; idx++) {</div><div class='add'>+		request_module(pvr2_client_lists[hdw-&gt;hdw_type].lst[idx]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_cmd_powerup(hdw);</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	if (pvr2_upload_firmware2(hdw)){</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,"device unstable!!");</div><div class='add'>+		pvr2_hdw_render_useless(hdw);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// This step MUST happen after the earlier powerup step.</div><div class='add'>+	pvr2_i2c_core_init(hdw);</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; CTRLDEF_COUNT; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		if (cptr-&gt;info-&gt;skip_init) continue;</div><div class='add'>+		if (!cptr-&gt;info-&gt;set_value) continue;</div><div class='add'>+		cptr-&gt;info-&gt;set_value(cptr,~0,cptr-&gt;info-&gt;default_value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Do not use pvr2_reset_ctl_endpoints() here.  It is not</div><div class='add'>+	// thread-safe against the normal pvr2_send_request() mechanism.</div><div class='add'>+	// (We should make it thread safe).</div><div class='add'>+</div><div class='add'>+	ret = pvr2_hdw_get_eeprom_addr(hdw);</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Unable to determine location of eeprom, skipping");</div><div class='add'>+	} else {</div><div class='add'>+		hdw-&gt;eeprom_addr = ret;</div><div class='add'>+		pvr2_eeprom_analyze(hdw);</div><div class='add'>+		if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_setup_std(hdw);</div><div class='add'>+</div><div class='add'>+	if (!get_default_tuner_type(hdw)) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "pvr2_hdw_setup: Tuner type overridden to %d",</div><div class='add'>+			   hdw-&gt;tuner_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdw-&gt;tuner_updated = !0;</div><div class='add'>+	pvr2_i2c_core_check_stale(hdw);</div><div class='add'>+	hdw-&gt;tuner_updated = 0;</div><div class='add'>+</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_commit_ctl_internal(hdw);</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	hdw-&gt;vid_stream = pvr2_stream_create();</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+		   "pvr2_hdw_setup: video stream is %p",hdw-&gt;vid_stream);</div><div class='add'>+	if (hdw-&gt;vid_stream) {</div><div class='add'>+		idx = get_default_error_tolerance(hdw);</div><div class='add'>+		if (idx) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+				   "pvr2_hdw_setup: video stream %p"</div><div class='add'>+				   " setting tolerance %u",</div><div class='add'>+				   hdw-&gt;vid_stream,idx);</div><div class='add'>+		}</div><div class='add'>+		pvr2_stream_setup(hdw-&gt;vid_stream,hdw-&gt;usb_dev,</div><div class='add'>+				  PVR2_VID_ENDPOINT,idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	/* Make sure everything is up to date */</div><div class='add'>+	pvr2_i2c_core_sync(hdw);</div><div class='add'>+</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) return;</div><div class='add'>+</div><div class='add'>+	hdw-&gt;flag_init_ok = !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_setup(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_setup(hdw=%p) begin",hdw);</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		pvr2_hdw_setup_low(hdw);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "pvr2_hdw_setup(hdw=%p) done, ok=%d init_ok=%d",</div><div class='add'>+			   hdw,hdw-&gt;flag_ok,hdw-&gt;flag_init_ok);</div><div class='add'>+		if (pvr2_hdw_dev_ok(hdw)) {</div><div class='add'>+			if (pvr2_hdw_init_ok(hdw)) {</div><div class='add'>+				pvr2_trace(</div><div class='add'>+					PVR2_TRACE_INFO,</div><div class='add'>+					"Device initialization"</div><div class='add'>+					" completed successfully.");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (hdw-&gt;fw1_state == FW1_STATE_RELOAD) {</div><div class='add'>+				pvr2_trace(</div><div class='add'>+					PVR2_TRACE_INFO,</div><div class='add'>+					"Device microcontroller firmware"</div><div class='add'>+					" (re)loaded; it should now reset"</div><div class='add'>+					" and reconnect.");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			pvr2_trace(</div><div class='add'>+				PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				"Device initialization was not successful.");</div><div class='add'>+			if (hdw-&gt;fw1_state == FW1_STATE_MISSING) {</div><div class='add'>+				pvr2_trace(</div><div class='add'>+					PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					"Giving up since device"</div><div class='add'>+					" microcontroller firmware"</div><div class='add'>+					" appears to be missing.");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (procreload) {</div><div class='add'>+			pvr2_trace(</div><div class='add'>+				PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				"Attempting pvrusb2 recovery by reloading"</div><div class='add'>+				" primary firmware.");</div><div class='add'>+			pvr2_trace(</div><div class='add'>+				PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				"If this works, device should disconnect"</div><div class='add'>+				" and reconnect in a sane state.");</div><div class='add'>+			hdw-&gt;fw1_state = FW1_STATE_UNKNOWN;</div><div class='add'>+			pvr2_upload_firmware1(hdw);</div><div class='add'>+		} else {</div><div class='add'>+			pvr2_trace(</div><div class='add'>+				PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				"***WARNING*** pvrusb2 device hardware"</div><div class='add'>+				" appears to be jammed"</div><div class='add'>+				" and I can't clear it.");</div><div class='add'>+			pvr2_trace(</div><div class='add'>+				PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				"You might need to power cycle"</div><div class='add'>+				" the pvrusb2 device"</div><div class='add'>+				" in order to recover.");</div><div class='add'>+		}</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_setup(hdw=%p) end",hdw);</div><div class='add'>+	return hdw-&gt;flag_init_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Create and return a structure for interacting with the underlying</div><div class='add'>+   hardware */</div><div class='add'>+struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='add'>+				 const struct usb_device_id *devid)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx,cnt1,cnt2;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	unsigned int hdw_type;</div><div class='add'>+	int valid_std_mask;</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	__u8 ifnum;</div><div class='add'>+	struct v4l2_queryctrl qctrl;</div><div class='add'>+	struct pvr2_ctl_info *ciptr;</div><div class='add'>+</div><div class='add'>+	hdw_type = devid - pvr2_device_table;</div><div class='add'>+	if (hdw_type &gt;=</div><div class='add'>+	    sizeof(pvr2_device_names)/sizeof(pvr2_device_names[0])) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Bogus device type of %u reported",hdw_type);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdw = kmalloc(sizeof(*hdw),GFP_KERNEL);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",</div><div class='add'>+		   hdw,pvr2_device_names[hdw_type]);</div><div class='add'>+	if (!hdw) goto fail;</div><div class='add'>+	memset(hdw,0,sizeof(*hdw));</div><div class='add'>+	cx2341x_fill_defaults(&amp;hdw-&gt;enc_ctl_state);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;control_cnt = CTRLDEF_COUNT;</div><div class='add'>+	hdw-&gt;control_cnt += MPEGDEF_COUNT;</div><div class='add'>+	hdw-&gt;controls = kmalloc(sizeof(struct pvr2_ctrl) * hdw-&gt;control_cnt,</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!hdw-&gt;controls) goto fail;</div><div class='add'>+	memset(hdw-&gt;controls,0,sizeof(struct pvr2_ctrl) * hdw-&gt;control_cnt);</div><div class='add'>+	hdw-&gt;hdw_type = hdw_type;</div><div class='add'>+	for (idx = 0; idx &lt; hdw-&gt;control_cnt; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		cptr-&gt;hdw = hdw;</div><div class='add'>+	}</div><div class='add'>+	for (idx = 0; idx &lt; 32; idx++) {</div><div class='add'>+		hdw-&gt;std_mask_ptrs[idx] = hdw-&gt;std_mask_names[idx];</div><div class='add'>+	}</div><div class='add'>+	for (idx = 0; idx &lt; CTRLDEF_COUNT; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		cptr-&gt;info = control_defs+idx;</div><div class='add'>+	}</div><div class='add'>+	/* Define and configure additional controls from cx2341x module. */</div><div class='add'>+	hdw-&gt;mpeg_ctrl_info = kmalloc(</div><div class='add'>+		sizeof(*(hdw-&gt;mpeg_ctrl_info)) * MPEGDEF_COUNT, GFP_KERNEL);</div><div class='add'>+	if (!hdw-&gt;mpeg_ctrl_info) goto fail;</div><div class='add'>+	memset(hdw-&gt;mpeg_ctrl_info,0,</div><div class='add'>+	       sizeof(*(hdw-&gt;mpeg_ctrl_info)) * MPEGDEF_COUNT);</div><div class='add'>+	for (idx = 0; idx &lt; MPEGDEF_COUNT; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx + CTRLDEF_COUNT;</div><div class='add'>+		ciptr = &amp;(hdw-&gt;mpeg_ctrl_info[idx].info);</div><div class='add'>+		ciptr-&gt;desc = hdw-&gt;mpeg_ctrl_info[idx].desc;</div><div class='add'>+		ciptr-&gt;name = mpeg_ids[idx].strid;</div><div class='add'>+		ciptr-&gt;v4l_id = mpeg_ids[idx].id;</div><div class='add'>+		ciptr-&gt;skip_init = !0;</div><div class='add'>+		ciptr-&gt;get_value = ctrl_cx2341x_get;</div><div class='add'>+		ciptr-&gt;get_v4lflags = ctrl_cx2341x_getv4lflags;</div><div class='add'>+		ciptr-&gt;is_dirty = ctrl_cx2341x_is_dirty;</div><div class='add'>+		if (!idx) ciptr-&gt;clear_dirty = ctrl_cx2341x_clear_dirty;</div><div class='add'>+		qctrl.id = ciptr-&gt;v4l_id;</div><div class='add'>+		cx2341x_ctrl_query(&amp;hdw-&gt;enc_ctl_state,&amp;qctrl);</div><div class='add'>+		if (!(qctrl.flags &amp; V4L2_CTRL_FLAG_READ_ONLY)) {</div><div class='add'>+			ciptr-&gt;set_value = ctrl_cx2341x_set;</div><div class='add'>+		}</div><div class='add'>+		strncpy(hdw-&gt;mpeg_ctrl_info[idx].desc,qctrl.name,</div><div class='add'>+			PVR2_CTLD_INFO_DESC_SIZE);</div><div class='add'>+		hdw-&gt;mpeg_ctrl_info[idx].desc[PVR2_CTLD_INFO_DESC_SIZE-1] = 0;</div><div class='add'>+		ciptr-&gt;default_value = qctrl.default_value;</div><div class='add'>+		switch (qctrl.type) {</div><div class='add'>+		default:</div><div class='add'>+		case V4L2_CTRL_TYPE_INTEGER:</div><div class='add'>+			ciptr-&gt;type = pvr2_ctl_int;</div><div class='add'>+			ciptr-&gt;def.type_int.min_value = qctrl.minimum;</div><div class='add'>+			ciptr-&gt;def.type_int.max_value = qctrl.maximum;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CTRL_TYPE_BOOLEAN:</div><div class='add'>+			ciptr-&gt;type = pvr2_ctl_bool;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CTRL_TYPE_MENU:</div><div class='add'>+			ciptr-&gt;type = pvr2_ctl_enum;</div><div class='add'>+			ciptr-&gt;def.type_enum.value_names =</div><div class='add'>+				cx2341x_ctrl_get_menu(ciptr-&gt;v4l_id);</div><div class='add'>+			for (cnt1 = 0;</div><div class='add'>+			     ciptr-&gt;def.type_enum.value_names[cnt1] != NULL;</div><div class='add'>+			     cnt1++) { }</div><div class='add'>+			ciptr-&gt;def.type_enum.count = cnt1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		cptr-&gt;info = ciptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Initialize video standard enum dynamic control</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_STDENUM);</div><div class='add'>+	if (cptr) {</div><div class='add'>+		memcpy(&amp;hdw-&gt;std_info_enum,cptr-&gt;info,</div><div class='add'>+		       sizeof(hdw-&gt;std_info_enum));</div><div class='add'>+		cptr-&gt;info = &amp;hdw-&gt;std_info_enum;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	// Initialize control data regarding video standard masks</div><div class='add'>+	valid_std_mask = pvr2_std_get_usable();</div><div class='add'>+	for (idx = 0; idx &lt; 32; idx++) {</div><div class='add'>+		if (!(valid_std_mask &amp; (1 &lt;&lt; idx))) continue;</div><div class='add'>+		cnt1 = pvr2_std_id_to_str(</div><div class='add'>+			hdw-&gt;std_mask_names[idx],</div><div class='add'>+			sizeof(hdw-&gt;std_mask_names[idx])-1,</div><div class='add'>+			1 &lt;&lt; idx);</div><div class='add'>+		hdw-&gt;std_mask_names[idx][cnt1] = 0;</div><div class='add'>+	}</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_STDAVAIL);</div><div class='add'>+	if (cptr) {</div><div class='add'>+		memcpy(&amp;hdw-&gt;std_info_avail,cptr-&gt;info,</div><div class='add'>+		       sizeof(hdw-&gt;std_info_avail));</div><div class='add'>+		cptr-&gt;info = &amp;hdw-&gt;std_info_avail;</div><div class='add'>+		hdw-&gt;std_info_avail.def.type_bitmask.bit_names =</div><div class='add'>+			hdw-&gt;std_mask_ptrs;</div><div class='add'>+		hdw-&gt;std_info_avail.def.type_bitmask.valid_bits =</div><div class='add'>+			valid_std_mask;</div><div class='add'>+	}</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_STDCUR);</div><div class='add'>+	if (cptr) {</div><div class='add'>+		memcpy(&amp;hdw-&gt;std_info_cur,cptr-&gt;info,</div><div class='add'>+		       sizeof(hdw-&gt;std_info_cur));</div><div class='add'>+		cptr-&gt;info = &amp;hdw-&gt;std_info_cur;</div><div class='add'>+		hdw-&gt;std_info_cur.def.type_bitmask.bit_names =</div><div class='add'>+			hdw-&gt;std_mask_ptrs;</div><div class='add'>+		hdw-&gt;std_info_avail.def.type_bitmask.valid_bits =</div><div class='add'>+			valid_std_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdw-&gt;eeprom_addr = -1;</div><div class='add'>+	hdw-&gt;unit_number = -1;</div><div class='add'>+	hdw-&gt;v4l_minor_number = -1;</div><div class='add'>+	hdw-&gt;ctl_write_buffer = kmalloc(PVR2_CTL_BUFFSIZE,GFP_KERNEL);</div><div class='add'>+	if (!hdw-&gt;ctl_write_buffer) goto fail;</div><div class='add'>+	hdw-&gt;ctl_read_buffer = kmalloc(PVR2_CTL_BUFFSIZE,GFP_KERNEL);</div><div class='add'>+	if (!hdw-&gt;ctl_read_buffer) goto fail;</div><div class='add'>+	hdw-&gt;ctl_write_urb = usb_alloc_urb(0,GFP_KERNEL);</div><div class='add'>+	if (!hdw-&gt;ctl_write_urb) goto fail;</div><div class='add'>+	hdw-&gt;ctl_read_urb = usb_alloc_urb(0,GFP_KERNEL);</div><div class='add'>+	if (!hdw-&gt;ctl_read_urb) goto fail;</div><div class='add'>+</div><div class='add'>+	down(&amp;pvr2_unit_sem); do {</div><div class='add'>+		for (idx = 0; idx &lt; PVR_NUM; idx++) {</div><div class='add'>+			if (unit_pointers[idx]) continue;</div><div class='add'>+			hdw-&gt;unit_number = idx;</div><div class='add'>+			unit_pointers[idx] = hdw;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (0); up(&amp;pvr2_unit_sem);</div><div class='add'>+</div><div class='add'>+	cnt1 = 0;</div><div class='add'>+	cnt2 = scnprintf(hdw-&gt;name+cnt1,sizeof(hdw-&gt;name)-cnt1,"pvrusb2");</div><div class='add'>+	cnt1 += cnt2;</div><div class='add'>+	if (hdw-&gt;unit_number &gt;= 0) {</div><div class='add'>+		cnt2 = scnprintf(hdw-&gt;name+cnt1,sizeof(hdw-&gt;name)-cnt1,"_%c",</div><div class='add'>+				 ('a' + hdw-&gt;unit_number));</div><div class='add'>+		cnt1 += cnt2;</div><div class='add'>+	}</div><div class='add'>+	if (cnt1 &gt;= sizeof(hdw-&gt;name)) cnt1 = sizeof(hdw-&gt;name)-1;</div><div class='add'>+	hdw-&gt;name[cnt1] = 0;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"Driver unit number is %d, name is %s",</div><div class='add'>+		   hdw-&gt;unit_number,hdw-&gt;name);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;tuner_type = -1;</div><div class='add'>+	hdw-&gt;flag_ok = !0;</div><div class='add'>+	/* Initialize the mask of subsystems that we will shut down when we</div><div class='add'>+	   stop streaming. */</div><div class='add'>+	hdw-&gt;subsys_stream_mask = PVR2_SUBSYS_RUN_ALL;</div><div class='add'>+	hdw-&gt;subsys_stream_mask |= (1&lt;&lt;PVR2_SUBSYS_B_ENC_CFG);</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"subsys_stream_mask: 0x%lx",</div><div class='add'>+		   hdw-&gt;subsys_stream_mask);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;usb_intf = intf;</div><div class='add'>+	hdw-&gt;usb_dev = interface_to_usbdev(intf);</div><div class='add'>+</div><div class='add'>+	ifnum = hdw-&gt;usb_intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber;</div><div class='add'>+	usb_set_interface(hdw-&gt;usb_dev,ifnum,0);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;hdw-&gt;ctl_lock_mutex);</div><div class='add'>+	mutex_init(&amp;hdw-&gt;big_lock_mutex);</div><div class='add'>+</div><div class='add'>+	return hdw;</div><div class='add'>+ fail:</div><div class='add'>+	if (hdw) {</div><div class='add'>+		if (hdw-&gt;ctl_read_urb) usb_free_urb(hdw-&gt;ctl_read_urb);</div><div class='add'>+		if (hdw-&gt;ctl_write_urb) usb_free_urb(hdw-&gt;ctl_write_urb);</div><div class='add'>+		if (hdw-&gt;ctl_read_buffer) kfree(hdw-&gt;ctl_read_buffer);</div><div class='add'>+		if (hdw-&gt;ctl_write_buffer) kfree(hdw-&gt;ctl_write_buffer);</div><div class='add'>+		if (hdw-&gt;controls) kfree(hdw-&gt;controls);</div><div class='add'>+		if (hdw-&gt;mpeg_ctrl_info) kfree(hdw-&gt;mpeg_ctrl_info);</div><div class='add'>+		kfree(hdw);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Remove _all_ associations between this driver and the underlying USB</div><div class='add'>+   layer. */</div><div class='add'>+static void pvr2_hdw_remove_usb_stuff(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	if (hdw-&gt;flag_disconnected) return;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_remove_usb_stuff: hdw=%p",hdw);</div><div class='add'>+	if (hdw-&gt;ctl_read_urb) {</div><div class='add'>+		usb_kill_urb(hdw-&gt;ctl_read_urb);</div><div class='add'>+		usb_free_urb(hdw-&gt;ctl_read_urb);</div><div class='add'>+		hdw-&gt;ctl_read_urb = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;ctl_write_urb) {</div><div class='add'>+		usb_kill_urb(hdw-&gt;ctl_write_urb);</div><div class='add'>+		usb_free_urb(hdw-&gt;ctl_write_urb);</div><div class='add'>+		hdw-&gt;ctl_write_urb = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;ctl_read_buffer) {</div><div class='add'>+		kfree(hdw-&gt;ctl_read_buffer);</div><div class='add'>+		hdw-&gt;ctl_read_buffer = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;ctl_write_buffer) {</div><div class='add'>+		kfree(hdw-&gt;ctl_write_buffer);</div><div class='add'>+		hdw-&gt;ctl_write_buffer = NULL;</div><div class='add'>+	}</div><div class='add'>+	pvr2_hdw_render_useless_unlocked(hdw);</div><div class='add'>+	hdw-&gt;flag_disconnected = !0;</div><div class='add'>+	hdw-&gt;usb_dev = NULL;</div><div class='add'>+	hdw-&gt;usb_intf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Destroy hardware interaction structure */</div><div class='add'>+void pvr2_hdw_destroy(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_destroy: hdw=%p",hdw);</div><div class='add'>+	if (hdw-&gt;fw_buffer) {</div><div class='add'>+		kfree(hdw-&gt;fw_buffer);</div><div class='add'>+		hdw-&gt;fw_buffer = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;vid_stream) {</div><div class='add'>+		pvr2_stream_destroy(hdw-&gt;vid_stream);</div><div class='add'>+		hdw-&gt;vid_stream = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;audio_stat) {</div><div class='add'>+		hdw-&gt;audio_stat-&gt;detach(hdw-&gt;audio_stat-&gt;ctxt);</div><div class='add'>+	}</div><div class='add'>+	if (hdw-&gt;decoder_ctrl) {</div><div class='add'>+		hdw-&gt;decoder_ctrl-&gt;detach(hdw-&gt;decoder_ctrl-&gt;ctxt);</div><div class='add'>+	}</div><div class='add'>+	pvr2_i2c_core_done(hdw);</div><div class='add'>+	pvr2_hdw_remove_usb_stuff(hdw);</div><div class='add'>+	down(&amp;pvr2_unit_sem); do {</div><div class='add'>+		if ((hdw-&gt;unit_number &gt;= 0) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;unit_number &lt; PVR_NUM) &amp;&amp;</div><div class='add'>+		    (unit_pointers[hdw-&gt;unit_number] == hdw)) {</div><div class='add'>+			unit_pointers[hdw-&gt;unit_number] = NULL;</div><div class='add'>+		}</div><div class='add'>+	} while (0); up(&amp;pvr2_unit_sem);</div><div class='add'>+	if (hdw-&gt;controls) kfree(hdw-&gt;controls);</div><div class='add'>+	if (hdw-&gt;mpeg_ctrl_info) kfree(hdw-&gt;mpeg_ctrl_info);</div><div class='add'>+	if (hdw-&gt;std_defs) kfree(hdw-&gt;std_defs);</div><div class='add'>+	if (hdw-&gt;std_enum_names) kfree(hdw-&gt;std_enum_names);</div><div class='add'>+	kfree(hdw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_init_ok(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;flag_init_ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_dev_ok(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return (hdw &amp;&amp; hdw-&gt;flag_ok);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Called when hardware has been unplugged */</div><div class='add'>+void pvr2_hdw_disconnect(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_disconnect(hdw=%p)",hdw);</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock);</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+	pvr2_hdw_remove_usb_stuff(hdw);</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Attempt to autoselect an appropriate value for std_enum_cur given</div><div class='add'>+// whatever is currently in std_mask_cur</div><div class='add'>+static void pvr2_hdw_internal_find_stdenum(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	for (idx = 1; idx &lt; hdw-&gt;std_enum_cnt; idx++) {</div><div class='add'>+		if (hdw-&gt;std_defs[idx-1].id == hdw-&gt;std_mask_cur) {</div><div class='add'>+			hdw-&gt;std_enum_cur = idx;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;std_enum_cur = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Calculate correct set of enumerated standards based on currently known</div><div class='add'>+// set of available standards bits.</div><div class='add'>+static void pvr2_hdw_internal_set_std_avail(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_standard *newstd;</div><div class='add'>+	unsigned int std_cnt;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	newstd = pvr2_std_create_enum(&amp;std_cnt,hdw-&gt;std_mask_avail);</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;std_defs) {</div><div class='add'>+		kfree(hdw-&gt;std_defs);</div><div class='add'>+		hdw-&gt;std_defs = NULL;</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;std_enum_cnt = 0;</div><div class='add'>+	if (hdw-&gt;std_enum_names) {</div><div class='add'>+		kfree(hdw-&gt;std_enum_names);</div><div class='add'>+		hdw-&gt;std_enum_names = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!std_cnt) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"WARNING: Failed to identify any viable standards");</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;std_enum_names = kmalloc(sizeof(char *)*(std_cnt+1),GFP_KERNEL);</div><div class='add'>+	hdw-&gt;std_enum_names[0] = "none";</div><div class='add'>+	for (idx = 0; idx &lt; std_cnt; idx++) {</div><div class='add'>+		hdw-&gt;std_enum_names[idx+1] =</div><div class='add'>+			newstd[idx].name;</div><div class='add'>+	}</div><div class='add'>+	// Set up the dynamic control for this standard</div><div class='add'>+	hdw-&gt;std_info_enum.def.type_enum.value_names = hdw-&gt;std_enum_names;</div><div class='add'>+	hdw-&gt;std_info_enum.def.type_enum.count = std_cnt+1;</div><div class='add'>+	hdw-&gt;std_defs = newstd;</div><div class='add'>+	hdw-&gt;std_enum_cnt = std_cnt+1;</div><div class='add'>+	hdw-&gt;std_enum_cur = 0;</div><div class='add'>+	hdw-&gt;std_info_cur.def.type_bitmask.valid_bits = hdw-&gt;std_mask_avail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_get_stdenum_value(struct pvr2_hdw *hdw,</div><div class='add'>+			       struct v4l2_standard *std,</div><div class='add'>+			       unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	if (!idx) return ret;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		if (idx &gt;= hdw-&gt;std_enum_cnt) break;</div><div class='add'>+		idx--;</div><div class='add'>+		memcpy(std,hdw-&gt;std_defs+idx,sizeof(*std));</div><div class='add'>+		ret = 0;</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Get the number of defined controls */</div><div class='add'>+unsigned int pvr2_hdw_get_ctrl_count(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;control_cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve a control handle given its index (0..count-1) */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_index(struct pvr2_hdw *hdw,</div><div class='add'>+					     unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	if (idx &gt;= hdw-&gt;control_cnt) return NULL;</div><div class='add'>+	return hdw-&gt;controls + idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Retrieve a control handle given its index (0..count-1) */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_id(struct pvr2_hdw *hdw,</div><div class='add'>+					  unsigned int ctl_id)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* This could be made a lot more efficient, but for now... */</div><div class='add'>+	for (idx = 0; idx &lt; hdw-&gt;control_cnt; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		i = cptr-&gt;info-&gt;internal_id;</div><div class='add'>+		if (i &amp;&amp; (i == ctl_id)) return cptr;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Given a V4L ID, retrieve the control structure associated with it. */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_v4l(struct pvr2_hdw *hdw,unsigned int ctl_id)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* This could be made a lot more efficient, but for now... */</div><div class='add'>+	for (idx = 0; idx &lt; hdw-&gt;control_cnt; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		i = cptr-&gt;info-&gt;v4l_id;</div><div class='add'>+		if (i &amp;&amp; (i == ctl_id)) return cptr;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Given a V4L ID for its immediate predecessor, retrieve the control</div><div class='add'>+   structure associated with it. */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_nextv4l(struct pvr2_hdw *hdw,</div><div class='add'>+					    unsigned int ctl_id)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr,*cp2;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* This could be made a lot more efficient, but for now... */</div><div class='add'>+	cp2 = NULL;</div><div class='add'>+	for (idx = 0; idx &lt; hdw-&gt;control_cnt; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		i = cptr-&gt;info-&gt;v4l_id;</div><div class='add'>+		if (!i) continue;</div><div class='add'>+		if (i &lt;= ctl_id) continue;</div><div class='add'>+		if (cp2 &amp;&amp; (cp2-&gt;info-&gt;v4l_id &lt; i)) continue;</div><div class='add'>+		cp2 = cptr;</div><div class='add'>+	}</div><div class='add'>+	return cp2;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const char *get_ctrl_typename(enum pvr2_ctl_type tp)</div><div class='add'>+{</div><div class='add'>+	switch (tp) {</div><div class='add'>+	case pvr2_ctl_int: return "integer";</div><div class='add'>+	case pvr2_ctl_enum: return "enum";</div><div class='add'>+	case pvr2_ctl_bool: return "boolean";</div><div class='add'>+	case pvr2_ctl_bitmask: return "bitmask";</div><div class='add'>+	}</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Commit all control changes made up to this point.  Subsystems can be</div><div class='add'>+   indirectly affected by these changes.  For a given set of things being</div><div class='add'>+   committed, we'll clear the affected subsystem bits and then once we're</div><div class='add'>+   done committing everything we'll make a request to restore the subsystem</div><div class='add'>+   state(s) back to their previous value before this function was called.</div><div class='add'>+   Thus we can automatically reconfigure affected pieces of the driver as</div><div class='add'>+   controls are changed. */</div><div class='add'>+static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned long saved_subsys_mask = hdw-&gt;subsys_enabled_mask;</div><div class='add'>+	unsigned long stale_subsys_mask = 0;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	int value;</div><div class='add'>+	int commit_flag = 0;</div><div class='add'>+	char buf[100];</div><div class='add'>+	unsigned int bcnt,ccnt;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; hdw-&gt;control_cnt; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		if (cptr-&gt;info-&gt;is_dirty == 0) continue;</div><div class='add'>+		if (!cptr-&gt;info-&gt;is_dirty(cptr)) continue;</div><div class='add'>+		if (!commit_flag) {</div><div class='add'>+			commit_flag = !0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bcnt = scnprintf(buf,sizeof(buf),"\"%s\" &lt;-- ",</div><div class='add'>+				 cptr-&gt;info-&gt;name);</div><div class='add'>+		value = 0;</div><div class='add'>+		cptr-&gt;info-&gt;get_value(cptr,&amp;value);</div><div class='add'>+		pvr2_ctrl_value_to_sym_internal(cptr,~0,value,</div><div class='add'>+						buf+bcnt,</div><div class='add'>+						sizeof(buf)-bcnt,&amp;ccnt);</div><div class='add'>+		bcnt += ccnt;</div><div class='add'>+		bcnt += scnprintf(buf+bcnt,sizeof(buf)-bcnt," &lt;%s&gt;",</div><div class='add'>+				  get_ctrl_typename(cptr-&gt;info-&gt;type));</div><div class='add'>+		pvr2_trace(PVR2_TRACE_CTL,</div><div class='add'>+			   "/*--TRACE_COMMIT--*/ %.*s",</div><div class='add'>+			   bcnt,buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!commit_flag) {</div><div class='add'>+		/* Nothing has changed */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When video standard changes, reset the hres and vres values -</div><div class='add'>+	   but if the user has pending changes there, then let the changes</div><div class='add'>+	   take priority. */</div><div class='add'>+	if (hdw-&gt;std_dirty) {</div><div class='add'>+		/* Rewrite the vertical resolution to be appropriate to the</div><div class='add'>+		   video standard that has been selected. */</div><div class='add'>+		int nvres;</div><div class='add'>+		if (hdw-&gt;std_mask_cur &amp; V4L2_STD_525_60) {</div><div class='add'>+			nvres = 480;</div><div class='add'>+		} else {</div><div class='add'>+			nvres = 576;</div><div class='add'>+		}</div><div class='add'>+		if (nvres != hdw-&gt;res_ver_val) {</div><div class='add'>+			hdw-&gt;res_ver_val = nvres;</div><div class='add'>+			hdw-&gt;res_ver_dirty = !0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;std_dirty ||</div><div class='add'>+	    0) {</div><div class='add'>+		/* If any of this changes, then the encoder needs to be</div><div class='add'>+		   reconfigured, and we need to reset the stream. */</div><div class='add'>+		stale_subsys_mask |= (1&lt;&lt;PVR2_SUBSYS_B_ENC_CFG);</div><div class='add'>+		stale_subsys_mask |= hdw-&gt;subsys_stream_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;srate_dirty) {</div><div class='add'>+		/* Write new sample rate into control structure since</div><div class='add'>+		 * the master copy is stale.  We must track srate</div><div class='add'>+		 * separate from the mpeg control structure because</div><div class='add'>+		 * other logic also uses this value. */</div><div class='add'>+		struct v4l2_ext_controls cs;</div><div class='add'>+		struct v4l2_ext_control c1;</div><div class='add'>+		memset(&amp;cs,0,sizeof(cs));</div><div class='add'>+		memset(&amp;c1,0,sizeof(c1));</div><div class='add'>+		cs.controls = &amp;c1;</div><div class='add'>+		cs.count = 1;</div><div class='add'>+		c1.id = V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ;</div><div class='add'>+		c1.value = hdw-&gt;srate_val;</div><div class='add'>+		cx2341x_ext_ctrls(&amp;hdw-&gt;enc_ctl_state,&amp;cs,VIDIOC_S_EXT_CTRLS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Scan i2c core at this point - before we clear all the dirty</div><div class='add'>+	   bits.  Various parts of the i2c core will notice dirty bits as</div><div class='add'>+	   appropriate and arrange to broadcast or directly send updates to</div><div class='add'>+	   the client drivers in order to keep everything in sync */</div><div class='add'>+	pvr2_i2c_core_check_stale(hdw);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; hdw-&gt;control_cnt; idx++) {</div><div class='add'>+		cptr = hdw-&gt;controls + idx;</div><div class='add'>+		if (!cptr-&gt;info-&gt;clear_dirty) continue;</div><div class='add'>+		cptr-&gt;info-&gt;clear_dirty(cptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now execute i2c core update */</div><div class='add'>+	pvr2_i2c_core_sync(hdw);</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_subsys_bit_chg_no_lock(hdw,stale_subsys_mask,0);</div><div class='add'>+	pvr2_hdw_subsys_bit_chg_no_lock(hdw,~0,saved_subsys_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_commit_ctl(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		pvr2_hdw_commit_ctl_internal(hdw);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_poll(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		pvr2_i2c_core_sync(hdw);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_setup_poll_trigger(struct pvr2_hdw *hdw,</div><div class='add'>+				 void (*func)(void *),</div><div class='add'>+				 void *data)</div><div class='add'>+{</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		hdw-&gt;poll_trigger_func = func;</div><div class='add'>+		hdw-&gt;poll_trigger_data = data;</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_poll_trigger_unlocked(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	if (hdw-&gt;poll_trigger_func) {</div><div class='add'>+		hdw-&gt;poll_trigger_func(hdw-&gt;poll_trigger_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return name for this driver instance */</div><div class='add'>+const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return bit mask indicating signal status */</div><div class='add'>+static unsigned int pvr2_hdw_get_signal_status_internal(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned int msk = 0;</div><div class='add'>+	switch (hdw-&gt;input_val) {</div><div class='add'>+	case PVR2_CVAL_INPUT_TV:</div><div class='add'>+	case PVR2_CVAL_INPUT_RADIO:</div><div class='add'>+		if (hdw-&gt;decoder_ctrl &amp;&amp;</div><div class='add'>+		    hdw-&gt;decoder_ctrl-&gt;tuned(hdw-&gt;decoder_ctrl-&gt;ctxt)) {</div><div class='add'>+			msk |= PVR2_SIGNAL_OK;</div><div class='add'>+			if (hdw-&gt;audio_stat &amp;&amp;</div><div class='add'>+			    hdw-&gt;audio_stat-&gt;status(hdw-&gt;audio_stat-&gt;ctxt)) {</div><div class='add'>+				if (hdw-&gt;flag_stereo) {</div><div class='add'>+					msk |= PVR2_SIGNAL_STEREO;</div><div class='add'>+				}</div><div class='add'>+				if (hdw-&gt;flag_bilingual) {</div><div class='add'>+					msk |= PVR2_SIGNAL_SAP;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		msk |= PVR2_SIGNAL_OK | PVR2_SIGNAL_STEREO;</div><div class='add'>+	}</div><div class='add'>+	return msk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_is_hsm(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = 0x0b;</div><div class='add'>+		result = pvr2_send_request(hdw,</div><div class='add'>+					   hdw-&gt;cmd_buffer,1,</div><div class='add'>+					   hdw-&gt;cmd_buffer,1);</div><div class='add'>+		if (result &lt; 0) break;</div><div class='add'>+		result = (hdw-&gt;cmd_buffer[0] != 0);</div><div class='add'>+	} while(0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return bit mask indicating signal status */</div><div class='add'>+unsigned int pvr2_hdw_get_signal_status(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned int msk = 0;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		msk = pvr2_hdw_get_signal_status_internal(hdw);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+	return msk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Get handle to video output stream */</div><div class='add'>+struct pvr2_stream *pvr2_hdw_get_video_stream(struct pvr2_hdw *hp)</div><div class='add'>+{</div><div class='add'>+	return hp-&gt;vid_stream;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int nr = pvr2_hdw_get_unit_number(hdw);</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		hdw-&gt;log_requested = !0;</div><div class='add'>+		printk(KERN_INFO "pvrusb2: =================  START STATUS CARD #%d  =================\n", nr);</div><div class='add'>+		pvr2_i2c_core_check_stale(hdw);</div><div class='add'>+		hdw-&gt;log_requested = 0;</div><div class='add'>+		pvr2_i2c_core_sync(hdw);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INFO,"cx2341x config:");</div><div class='add'>+		cx2341x_log_status(&amp;hdw-&gt;enc_ctl_state, "pvrusb2");</div><div class='add'>+		printk(KERN_INFO "pvrusb2: ==================  END STATUS CARD #%d  ==================\n", nr);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw, int enable_flag)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 address;</div><div class='add'>+	unsigned int pipe;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		if ((hdw-&gt;fw_buffer == 0) == !enable_flag) break;</div><div class='add'>+</div><div class='add'>+		if (!enable_flag) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_FIRMWARE,</div><div class='add'>+				   "Cleaning up after CPU firmware fetch");</div><div class='add'>+			kfree(hdw-&gt;fw_buffer);</div><div class='add'>+			hdw-&gt;fw_buffer = NULL;</div><div class='add'>+			hdw-&gt;fw_size = 0;</div><div class='add'>+			/* Now release the CPU.  It will disconnect and</div><div class='add'>+			   reconnect later. */</div><div class='add'>+			pvr2_hdw_cpureset_assert(hdw,0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pvr2_trace(PVR2_TRACE_FIRMWARE,</div><div class='add'>+			   "Preparing to suck out CPU firmware");</div><div class='add'>+		hdw-&gt;fw_size = 0x2000;</div><div class='add'>+		hdw-&gt;fw_buffer = kmalloc(hdw-&gt;fw_size,GFP_KERNEL);</div><div class='add'>+		if (!hdw-&gt;fw_buffer) {</div><div class='add'>+			hdw-&gt;fw_size = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memset(hdw-&gt;fw_buffer,0,hdw-&gt;fw_size);</div><div class='add'>+</div><div class='add'>+		/* We have to hold the CPU during firmware upload. */</div><div class='add'>+		pvr2_hdw_cpureset_assert(hdw,1);</div><div class='add'>+</div><div class='add'>+		/* download the firmware from address 0000-1fff in 2048</div><div class='add'>+		   (=0x800) bytes chunk. */</div><div class='add'>+</div><div class='add'>+		pvr2_trace(PVR2_TRACE_FIRMWARE,"Grabbing CPU firmware");</div><div class='add'>+		pipe = usb_rcvctrlpipe(hdw-&gt;usb_dev, 0);</div><div class='add'>+		for(address = 0; address &lt; hdw-&gt;fw_size; address += 0x800) {</div><div class='add'>+			ret = usb_control_msg(hdw-&gt;usb_dev,pipe,0xa0,0xc0,</div><div class='add'>+					      address,0,</div><div class='add'>+					      hdw-&gt;fw_buffer+address,0x800,HZ);</div><div class='add'>+			if (ret &lt; 0) break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pvr2_trace(PVR2_TRACE_FIRMWARE,"Done grabbing CPU firmware");</div><div class='add'>+</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Return true if we're in a mode for retrieval CPU firmware */</div><div class='add'>+int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;fw_buffer != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_cpufw_get(struct pvr2_hdw *hdw,unsigned int offs,</div><div class='add'>+		       char *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;big_lock); do {</div><div class='add'>+		if (!buf) break;</div><div class='add'>+		if (!cnt) break;</div><div class='add'>+</div><div class='add'>+		if (!hdw-&gt;fw_buffer) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (offs &gt;= hdw-&gt;fw_size) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_FIRMWARE,</div><div class='add'>+				   "Read firmware data offs=%d EOF",</div><div class='add'>+				   offs);</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (offs + cnt &gt; hdw-&gt;fw_size) cnt = hdw-&gt;fw_size - offs;</div><div class='add'>+</div><div class='add'>+		memcpy(buf,hdw-&gt;fw_buffer+offs,cnt);</div><div class='add'>+</div><div class='add'>+		pvr2_trace(PVR2_TRACE_FIRMWARE,</div><div class='add'>+			   "Read firmware data offs=%d cnt=%d",</div><div class='add'>+			   offs,cnt);</div><div class='add'>+		ret = cnt;</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;big_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;v4l_minor_number;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Store the v4l minor device number */</div><div class='add'>+void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *hdw,int v)</div><div class='add'>+{</div><div class='add'>+	hdw-&gt;v4l_minor_number = v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_ctl_write_complete(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = urb-&gt;context;</div><div class='add'>+	hdw-&gt;ctl_write_pend_flag = 0;</div><div class='add'>+	if (hdw-&gt;ctl_read_pend_flag) return;</div><div class='add'>+	complete(&amp;hdw-&gt;ctl_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_ctl_read_complete(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = urb-&gt;context;</div><div class='add'>+	hdw-&gt;ctl_read_pend_flag = 0;</div><div class='add'>+	if (hdw-&gt;ctl_write_pend_flag) return;</div><div class='add'>+	complete(&amp;hdw-&gt;ctl_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_ctl_timeout(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = (struct pvr2_hdw *)data;</div><div class='add'>+	if (hdw-&gt;ctl_write_pend_flag || hdw-&gt;ctl_read_pend_flag) {</div><div class='add'>+		hdw-&gt;ctl_timeout_flag = !0;</div><div class='add'>+		if (hdw-&gt;ctl_write_pend_flag &amp;&amp; hdw-&gt;ctl_write_urb) {</div><div class='add'>+			usb_unlink_urb(hdw-&gt;ctl_write_urb);</div><div class='add'>+		}</div><div class='add'>+		if (hdw-&gt;ctl_read_pend_flag &amp;&amp; hdw-&gt;ctl_read_urb) {</div><div class='add'>+			usb_unlink_urb(hdw-&gt;ctl_read_urb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_send_request_ex(struct pvr2_hdw *hdw,</div><div class='add'>+				unsigned int timeout,int probe_fl,</div><div class='add'>+				void *write_data,unsigned int write_len,</div><div class='add'>+				void *read_data,unsigned int read_len)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct timer_list timer;</div><div class='add'>+	if (!hdw-&gt;ctl_lock_held) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Attempted to execute control transfer"</div><div class='add'>+			   " without lock!!");</div><div class='add'>+		return -EDEADLK;</div><div class='add'>+	}</div><div class='add'>+	if ((!hdw-&gt;flag_ok) &amp;&amp; !probe_fl) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Attempted to execute control transfer"</div><div class='add'>+			   " when device not ok");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	if (!(hdw-&gt;ctl_read_urb &amp;&amp; hdw-&gt;ctl_write_urb)) {</div><div class='add'>+		if (!probe_fl) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Attempted to execute control transfer"</div><div class='add'>+				   " when USB is disconnected");</div><div class='add'>+		}</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure that we have sane parameters */</div><div class='add'>+	if (!write_data) write_len = 0;</div><div class='add'>+	if (!read_data) read_len = 0;</div><div class='add'>+	if (write_len &gt; PVR2_CTL_BUFFSIZE) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"Attempted to execute %d byte"</div><div class='add'>+			" control-write transfer (limit=%d)",</div><div class='add'>+			write_len,PVR2_CTL_BUFFSIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (read_len &gt; PVR2_CTL_BUFFSIZE) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"Attempted to execute %d byte"</div><div class='add'>+			" control-read transfer (limit=%d)",</div><div class='add'>+			write_len,PVR2_CTL_BUFFSIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if ((!write_len) &amp;&amp; (!read_len)) {</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"Attempted to execute null control transfer?");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_debug_state = 1;</div><div class='add'>+	if (write_len) {</div><div class='add'>+		hdw-&gt;cmd_debug_code = ((unsigned char *)write_data)[0];</div><div class='add'>+	} else {</div><div class='add'>+		hdw-&gt;cmd_debug_code = 0;</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;cmd_debug_write_len = write_len;</div><div class='add'>+	hdw-&gt;cmd_debug_read_len = read_len;</div><div class='add'>+</div><div class='add'>+	/* Initialize common stuff */</div><div class='add'>+	init_completion(&amp;hdw-&gt;ctl_done);</div><div class='add'>+	hdw-&gt;ctl_timeout_flag = 0;</div><div class='add'>+	hdw-&gt;ctl_write_pend_flag = 0;</div><div class='add'>+	hdw-&gt;ctl_read_pend_flag = 0;</div><div class='add'>+	init_timer(&amp;timer);</div><div class='add'>+	timer.expires = jiffies + timeout;</div><div class='add'>+	timer.data = (unsigned long)hdw;</div><div class='add'>+	timer.function = pvr2_ctl_timeout;</div><div class='add'>+</div><div class='add'>+	if (write_len) {</div><div class='add'>+		hdw-&gt;cmd_debug_state = 2;</div><div class='add'>+		/* Transfer write data to internal buffer */</div><div class='add'>+		for (idx = 0; idx &lt; write_len; idx++) {</div><div class='add'>+			hdw-&gt;ctl_write_buffer[idx] =</div><div class='add'>+				((unsigned char *)write_data)[idx];</div><div class='add'>+		}</div><div class='add'>+		/* Initiate a write request */</div><div class='add'>+		usb_fill_bulk_urb(hdw-&gt;ctl_write_urb,</div><div class='add'>+				  hdw-&gt;usb_dev,</div><div class='add'>+				  usb_sndbulkpipe(hdw-&gt;usb_dev,</div><div class='add'>+						  PVR2_CTL_WRITE_ENDPOINT),</div><div class='add'>+				  hdw-&gt;ctl_write_buffer,</div><div class='add'>+				  write_len,</div><div class='add'>+				  pvr2_ctl_write_complete,</div><div class='add'>+				  hdw);</div><div class='add'>+		hdw-&gt;ctl_write_urb-&gt;actual_length = 0;</div><div class='add'>+		hdw-&gt;ctl_write_pend_flag = !0;</div><div class='add'>+		status = usb_submit_urb(hdw-&gt;ctl_write_urb,GFP_KERNEL);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Failed to submit write-control"</div><div class='add'>+				   " URB status=%d",status);</div><div class='add'>+			hdw-&gt;ctl_write_pend_flag = 0;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (read_len) {</div><div class='add'>+		hdw-&gt;cmd_debug_state = 3;</div><div class='add'>+		memset(hdw-&gt;ctl_read_buffer,0x43,read_len);</div><div class='add'>+		/* Initiate a read request */</div><div class='add'>+		usb_fill_bulk_urb(hdw-&gt;ctl_read_urb,</div><div class='add'>+				  hdw-&gt;usb_dev,</div><div class='add'>+				  usb_rcvbulkpipe(hdw-&gt;usb_dev,</div><div class='add'>+						  PVR2_CTL_READ_ENDPOINT),</div><div class='add'>+				  hdw-&gt;ctl_read_buffer,</div><div class='add'>+				  read_len,</div><div class='add'>+				  pvr2_ctl_read_complete,</div><div class='add'>+				  hdw);</div><div class='add'>+		hdw-&gt;ctl_read_urb-&gt;actual_length = 0;</div><div class='add'>+		hdw-&gt;ctl_read_pend_flag = !0;</div><div class='add'>+		status = usb_submit_urb(hdw-&gt;ctl_read_urb,GFP_KERNEL);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Failed to submit read-control"</div><div class='add'>+				   " URB status=%d",status);</div><div class='add'>+			hdw-&gt;ctl_read_pend_flag = 0;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start timer */</div><div class='add'>+	add_timer(&amp;timer);</div><div class='add'>+</div><div class='add'>+	/* Now wait for all I/O to complete */</div><div class='add'>+	hdw-&gt;cmd_debug_state = 4;</div><div class='add'>+	while (hdw-&gt;ctl_write_pend_flag || hdw-&gt;ctl_read_pend_flag) {</div><div class='add'>+		wait_for_completion(&amp;hdw-&gt;ctl_done);</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;cmd_debug_state = 5;</div><div class='add'>+</div><div class='add'>+	/* Stop timer */</div><div class='add'>+	del_timer_sync(&amp;timer);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_debug_state = 6;</div><div class='add'>+	status = 0;</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;ctl_timeout_flag) {</div><div class='add'>+		status = -ETIMEDOUT;</div><div class='add'>+		if (!probe_fl) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "Timed out control-write");</div><div class='add'>+		}</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (write_len) {</div><div class='add'>+		/* Validate results of write request */</div><div class='add'>+		if ((hdw-&gt;ctl_write_urb-&gt;status != 0) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;ctl_write_urb-&gt;status != -ENOENT) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;ctl_write_urb-&gt;status != -ESHUTDOWN) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;ctl_write_urb-&gt;status != -ECONNRESET)) {</div><div class='add'>+			/* USB subsystem is reporting some kind of failure</div><div class='add'>+			   on the write */</div><div class='add'>+			status = hdw-&gt;ctl_write_urb-&gt;status;</div><div class='add'>+			if (!probe_fl) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					   "control-write URB failure,"</div><div class='add'>+					   " status=%d",</div><div class='add'>+					   status);</div><div class='add'>+			}</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		if (hdw-&gt;ctl_write_urb-&gt;actual_length &lt; write_len) {</div><div class='add'>+			/* Failed to write enough data */</div><div class='add'>+			status = -EIO;</div><div class='add'>+			if (!probe_fl) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					   "control-write URB short,"</div><div class='add'>+					   " expected=%d got=%d",</div><div class='add'>+					   write_len,</div><div class='add'>+					   hdw-&gt;ctl_write_urb-&gt;actual_length);</div><div class='add'>+			}</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (read_len) {</div><div class='add'>+		/* Validate results of read request */</div><div class='add'>+		if ((hdw-&gt;ctl_read_urb-&gt;status != 0) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;ctl_read_urb-&gt;status != -ENOENT) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;ctl_read_urb-&gt;status != -ESHUTDOWN) &amp;&amp;</div><div class='add'>+		    (hdw-&gt;ctl_read_urb-&gt;status != -ECONNRESET)) {</div><div class='add'>+			/* USB subsystem is reporting some kind of failure</div><div class='add'>+			   on the read */</div><div class='add'>+			status = hdw-&gt;ctl_read_urb-&gt;status;</div><div class='add'>+			if (!probe_fl) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					   "control-read URB failure,"</div><div class='add'>+					   " status=%d",</div><div class='add'>+					   status);</div><div class='add'>+			}</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		if (hdw-&gt;ctl_read_urb-&gt;actual_length &lt; read_len) {</div><div class='add'>+			/* Failed to read enough data */</div><div class='add'>+			status = -EIO;</div><div class='add'>+			if (!probe_fl) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+					   "control-read URB short,"</div><div class='add'>+					   " expected=%d got=%d",</div><div class='add'>+					   read_len,</div><div class='add'>+					   hdw-&gt;ctl_read_urb-&gt;actual_length);</div><div class='add'>+			}</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		/* Transfer retrieved data out from internal buffer */</div><div class='add'>+		for (idx = 0; idx &lt; read_len; idx++) {</div><div class='add'>+			((unsigned char *)read_data)[idx] =</div><div class='add'>+				hdw-&gt;ctl_read_buffer[idx];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_debug_state = 0;</div><div class='add'>+	if ((status &lt; 0) &amp;&amp; (!probe_fl)) {</div><div class='add'>+		pvr2_hdw_render_useless_unlocked(hdw);</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_send_request(struct pvr2_hdw *hdw,</div><div class='add'>+		      void *write_data,unsigned int write_len,</div><div class='add'>+		      void *read_data,unsigned int read_len)</div><div class='add'>+{</div><div class='add'>+	return pvr2_send_request_ex(hdw,HZ*4,0,</div><div class='add'>+				    write_data,write_len,</div><div class='add'>+				    read_data,read_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_write_register(struct pvr2_hdw *hdw, u16 reg, u32 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_buffer[0] = 0x04;  /* write register prefix */</div><div class='add'>+	PVR2_DECOMPOSE_LE(hdw-&gt;cmd_buffer,1,data);</div><div class='add'>+	hdw-&gt;cmd_buffer[5] = 0;</div><div class='add'>+	hdw-&gt;cmd_buffer[6] = (reg &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	hdw-&gt;cmd_buffer[7] = reg &amp; 0xff;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ret = pvr2_send_request(hdw, hdw-&gt;cmd_buffer, 8, hdw-&gt;cmd_buffer, 0);</div><div class='add'>+</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_read_register(struct pvr2_hdw *hdw, u16 reg, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_buffer[0] = 0x05;  /* read register prefix */</div><div class='add'>+	hdw-&gt;cmd_buffer[1] = 0;</div><div class='add'>+	hdw-&gt;cmd_buffer[2] = 0;</div><div class='add'>+	hdw-&gt;cmd_buffer[3] = 0;</div><div class='add'>+	hdw-&gt;cmd_buffer[4] = 0;</div><div class='add'>+	hdw-&gt;cmd_buffer[5] = 0;</div><div class='add'>+	hdw-&gt;cmd_buffer[6] = (reg &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	hdw-&gt;cmd_buffer[7] = reg &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	ret |= pvr2_send_request(hdw, hdw-&gt;cmd_buffer, 8, hdw-&gt;cmd_buffer, 4);</div><div class='add'>+	*data = PVR2_COMPOSE_LE(hdw-&gt;cmd_buffer,0);</div><div class='add'>+</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_write_u16(struct pvr2_hdw *hdw, u16 data, int res)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_buffer[0] = (data &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	hdw-&gt;cmd_buffer[1] = data &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_send_request(hdw, hdw-&gt;cmd_buffer, 2, hdw-&gt;cmd_buffer, res);</div><div class='add'>+</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_write_u8(struct pvr2_hdw *hdw, u8 data, int res)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	hdw-&gt;cmd_buffer[0] = data;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_send_request(hdw, hdw-&gt;cmd_buffer, 1, hdw-&gt;cmd_buffer, res);</div><div class='add'>+</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_hdw_render_useless_unlocked(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	if (!hdw-&gt;flag_ok) return;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"render_useless");</div><div class='add'>+	hdw-&gt;flag_ok = 0;</div><div class='add'>+	if (hdw-&gt;vid_stream) {</div><div class='add'>+		pvr2_stream_setup(hdw-&gt;vid_stream,NULL,0,0);</div><div class='add'>+	}</div><div class='add'>+	hdw-&gt;flag_streaming_enabled = 0;</div><div class='add'>+	hdw-&gt;subsys_enabled_mask = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_render_useless(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+	pvr2_hdw_render_useless_unlocked(hdw);</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_device_reset(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"Performing a device reset...");</div><div class='add'>+	ret = usb_lock_device_for_reset(hdw-&gt;usb_dev,NULL);</div><div class='add'>+	if (ret == 1) {</div><div class='add'>+		ret = usb_reset_device(hdw-&gt;usb_dev);</div><div class='add'>+		usb_unlock_device(hdw-&gt;usb_dev);</div><div class='add'>+	} else {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Failed to lock USB device ret=%d",ret);</div><div class='add'>+	}</div><div class='add'>+	if (init_pause_msec) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INFO,</div><div class='add'>+			   "Waiting %u msec for hardware to settle",</div><div class='add'>+			   init_pause_msec);</div><div class='add'>+		msleep(init_pause_msec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_cpureset_assert(struct pvr2_hdw *hdw,int val)</div><div class='add'>+{</div><div class='add'>+	char da[1];</div><div class='add'>+	unsigned int pipe;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!hdw-&gt;usb_dev) return;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"cpureset_assert(%d)",val);</div><div class='add'>+</div><div class='add'>+	da[0] = val ? 0x01 : 0x00;</div><div class='add'>+</div><div class='add'>+	/* Write the CPUCS register on the 8051.  The lsb of the register</div><div class='add'>+	   is the reset bit; a 1 asserts reset while a 0 clears it. */</div><div class='add'>+	pipe = usb_sndctrlpipe(hdw-&gt;usb_dev, 0);</div><div class='add'>+	ret = usb_control_msg(hdw-&gt;usb_dev,pipe,0xa0,0x40,0xe600,0,da,1,HZ);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "cpureset_assert(%d) error=%d",val,ret);</div><div class='add'>+		pvr2_hdw_render_useless(hdw);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_cmd_deep_reset(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,"Requesting uproc hard reset");</div><div class='add'>+		hdw-&gt;flag_ok = !0;</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = 0xdd;</div><div class='add'>+		status = pvr2_send_request(hdw,hdw-&gt;cmd_buffer,1,NULL,0);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_cmd_powerup(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,"Requesting powerup");</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = 0xde;</div><div class='add'>+		status = pvr2_send_request(hdw,hdw-&gt;cmd_buffer,1,NULL,0);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	if (!hdw-&gt;decoder_ctrl) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Unable to reset decoder: nothing attached");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hdw-&gt;decoder_ctrl-&gt;force_reset) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+			   "Unable to reset decoder: not implemented");</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,</div><div class='add'>+		   "Requesting decoder reset");</div><div class='add'>+	hdw-&gt;decoder_ctrl-&gt;force_reset(hdw-&gt;decoder_ctrl-&gt;ctxt);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_hdw_cmd_usbstream(struct pvr2_hdw *hdw,int runFl)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = (runFl ? 0x36 : 0x37);</div><div class='add'>+		status = pvr2_send_request(hdw,hdw-&gt;cmd_buffer,1,NULL,0);</div><div class='add'>+	} while (0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	if (!status) {</div><div class='add'>+		hdw-&gt;subsys_enabled_mask =</div><div class='add'>+			((hdw-&gt;subsys_enabled_mask &amp;</div><div class='add'>+			  ~(1&lt;&lt;PVR2_SUBSYS_B_USBSTREAM_RUN)) |</div><div class='add'>+			 (runFl ? (1&lt;&lt;PVR2_SUBSYS_B_USBSTREAM_RUN) : 0));</div><div class='add'>+	}</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_hdw_get_debug_info(const struct pvr2_hdw *hdw,</div><div class='add'>+			     struct pvr2_hdw_debug_info *ptr)</div><div class='add'>+{</div><div class='add'>+	ptr-&gt;big_lock_held = hdw-&gt;big_lock_held;</div><div class='add'>+	ptr-&gt;ctl_lock_held = hdw-&gt;ctl_lock_held;</div><div class='add'>+	ptr-&gt;flag_ok = hdw-&gt;flag_ok;</div><div class='add'>+	ptr-&gt;flag_disconnected = hdw-&gt;flag_disconnected;</div><div class='add'>+	ptr-&gt;flag_init_ok = hdw-&gt;flag_init_ok;</div><div class='add'>+	ptr-&gt;flag_streaming_enabled = hdw-&gt;flag_streaming_enabled;</div><div class='add'>+	ptr-&gt;subsys_flags = hdw-&gt;subsys_enabled_mask;</div><div class='add'>+	ptr-&gt;cmd_debug_state = hdw-&gt;cmd_debug_state;</div><div class='add'>+	ptr-&gt;cmd_code = hdw-&gt;cmd_debug_code;</div><div class='add'>+	ptr-&gt;cmd_debug_write_len = hdw-&gt;cmd_debug_write_len;</div><div class='add'>+	ptr-&gt;cmd_debug_read_len = hdw-&gt;cmd_debug_read_len;</div><div class='add'>+	ptr-&gt;cmd_debug_timeout = hdw-&gt;ctl_timeout_flag;</div><div class='add'>+	ptr-&gt;cmd_debug_write_pend = hdw-&gt;ctl_write_pend_flag;</div><div class='add'>+	ptr-&gt;cmd_debug_read_pend = hdw-&gt;ctl_read_pend_flag;</div><div class='add'>+	ptr-&gt;cmd_debug_rstatus = hdw-&gt;ctl_read_urb-&gt;status;</div><div class='add'>+	ptr-&gt;cmd_debug_wstatus = hdw-&gt;ctl_read_urb-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_gpio_get_dir(struct pvr2_hdw *hdw,u32 *dp)</div><div class='add'>+{</div><div class='add'>+	return pvr2_read_register(hdw,PVR2_GPIO_DIR,dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_gpio_get_out(struct pvr2_hdw *hdw,u32 *dp)</div><div class='add'>+{</div><div class='add'>+	return pvr2_read_register(hdw,PVR2_GPIO_OUT,dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_gpio_get_in(struct pvr2_hdw *hdw,u32 *dp)</div><div class='add'>+{</div><div class='add'>+	return pvr2_read_register(hdw,PVR2_GPIO_IN,dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_gpio_chg_dir(struct pvr2_hdw *hdw,u32 msk,u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 cval,nval;</div><div class='add'>+	int ret;</div><div class='add'>+	if (~msk) {</div><div class='add'>+		ret = pvr2_read_register(hdw,PVR2_GPIO_DIR,&amp;cval);</div><div class='add'>+		if (ret) return ret;</div><div class='add'>+		nval = (cval &amp; ~msk) | (val &amp; msk);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_GPIO,</div><div class='add'>+			   "GPIO direction changing 0x%x:0x%x"</div><div class='add'>+			   " from 0x%x to 0x%x",</div><div class='add'>+			   msk,val,cval,nval);</div><div class='add'>+	} else {</div><div class='add'>+		nval = val;</div><div class='add'>+		pvr2_trace(PVR2_TRACE_GPIO,</div><div class='add'>+			   "GPIO direction changing to 0x%x",nval);</div><div class='add'>+	}</div><div class='add'>+	return pvr2_write_register(hdw,PVR2_GPIO_DIR,nval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_hdw_gpio_chg_out(struct pvr2_hdw *hdw,u32 msk,u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 cval,nval;</div><div class='add'>+	int ret;</div><div class='add'>+	if (~msk) {</div><div class='add'>+		ret = pvr2_read_register(hdw,PVR2_GPIO_OUT,&amp;cval);</div><div class='add'>+		if (ret) return ret;</div><div class='add'>+		nval = (cval &amp; ~msk) | (val &amp; msk);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_GPIO,</div><div class='add'>+			   "GPIO output changing 0x%x:0x%x from 0x%x to 0x%x",</div><div class='add'>+			   msk,val,cval,nval);</div><div class='add'>+	} else {</div><div class='add'>+		nval = val;</div><div class='add'>+		pvr2_trace(PVR2_TRACE_GPIO,</div><div class='add'>+			   "GPIO output changing to 0x%x",nval);</div><div class='add'>+	}</div><div class='add'>+	return pvr2_write_register(hdw,PVR2_GPIO_OUT,nval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_hdw_get_eeprom_addr(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock); do {</div><div class='add'>+		hdw-&gt;cmd_buffer[0] = 0xeb;</div><div class='add'>+		result = pvr2_send_request(hdw,</div><div class='add'>+					   hdw-&gt;cmd_buffer,1,</div><div class='add'>+					   hdw-&gt;cmd_buffer,1);</div><div class='add'>+		if (result &lt; 0) break;</div><div class='add'>+		result = hdw-&gt;cmd_buffer[0];</div><div class='add'>+	} while(0); LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h<br/>new file mode 100644<br/>index 000000000000..fd931b5da490<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-hdw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-hdw.h</a></div><div class='hunk'>@@ -0,0 +1,303 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_HDW_H</div><div class='add'>+#define __PVRUSB2_HDW_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include "pvrusb2-io.h"</div><div class='add'>+#include "pvrusb2-ctrl.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Private internal control ids, look these up with</div><div class='add'>+   pvr2_hdw_get_ctrl_by_id() - these are NOT visible in V4L */</div><div class='add'>+#define PVR2_CID_STDENUM 1</div><div class='add'>+#define PVR2_CID_STDCUR 2</div><div class='add'>+#define PVR2_CID_STDAVAIL 3</div><div class='add'>+#define PVR2_CID_INPUT 4</div><div class='add'>+#define PVR2_CID_AUDIOMODE 5</div><div class='add'>+#define PVR2_CID_FREQUENCY 6</div><div class='add'>+#define PVR2_CID_HRES 7</div><div class='add'>+#define PVR2_CID_VRES 8</div><div class='add'>+</div><div class='add'>+/* Legal values for the INPUT state variable */</div><div class='add'>+#define PVR2_CVAL_INPUT_TV 0</div><div class='add'>+#define PVR2_CVAL_INPUT_SVIDEO 1</div><div class='add'>+#define PVR2_CVAL_INPUT_COMPOSITE 2</div><div class='add'>+#define PVR2_CVAL_INPUT_RADIO 3</div><div class='add'>+</div><div class='add'>+/* Values that pvr2_hdw_get_signal_status() returns */</div><div class='add'>+#define PVR2_SIGNAL_OK     0x0001</div><div class='add'>+#define PVR2_SIGNAL_STEREO 0x0002</div><div class='add'>+#define PVR2_SIGNAL_SAP    0x0004</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Subsystem definitions - these are various pieces that can be</div><div class='add'>+   independently stopped / started.  Usually you don't want to mess with</div><div class='add'>+   this directly (let the driver handle things itself), but it is useful</div><div class='add'>+   for debugging. */</div><div class='add'>+#define PVR2_SUBSYS_B_ENC_FIRMWARE        0</div><div class='add'>+#define PVR2_SUBSYS_B_ENC_CFG             1</div><div class='add'>+#define PVR2_SUBSYS_B_DIGITIZER_RUN       2</div><div class='add'>+#define PVR2_SUBSYS_B_USBSTREAM_RUN       3</div><div class='add'>+#define PVR2_SUBSYS_B_ENC_RUN             4</div><div class='add'>+</div><div class='add'>+#define PVR2_SUBSYS_CFG_ALL ( \</div><div class='add'>+	(1 &lt;&lt; PVR2_SUBSYS_B_ENC_FIRMWARE) | \</div><div class='add'>+	(1 &lt;&lt; PVR2_SUBSYS_B_ENC_CFG) )</div><div class='add'>+#define PVR2_SUBSYS_RUN_ALL ( \</div><div class='add'>+	(1 &lt;&lt; PVR2_SUBSYS_B_DIGITIZER_RUN) | \</div><div class='add'>+	(1 &lt;&lt; PVR2_SUBSYS_B_USBSTREAM_RUN) | \</div><div class='add'>+	(1 &lt;&lt; PVR2_SUBSYS_B_ENC_RUN) )</div><div class='add'>+#define PVR2_SUBSYS_ALL ( \</div><div class='add'>+	PVR2_SUBSYS_CFG_ALL | \</div><div class='add'>+	PVR2_SUBSYS_RUN_ALL )</div><div class='add'>+</div><div class='add'>+enum pvr2_config {</div><div class='add'>+	pvr2_config_empty,</div><div class='add'>+	pvr2_config_mpeg,</div><div class='add'>+	pvr2_config_vbi,</div><div class='add'>+	pvr2_config_radio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *pvr2_config_get_name(enum pvr2_config);</div><div class='add'>+</div><div class='add'>+struct pvr2_hdw;</div><div class='add'>+</div><div class='add'>+/* Create and return a structure for interacting with the underlying</div><div class='add'>+   hardware */</div><div class='add'>+struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,</div><div class='add'>+				 const struct usb_device_id *devid);</div><div class='add'>+</div><div class='add'>+/* Poll for background activity (if any) */</div><div class='add'>+void pvr2_hdw_poll(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Trigger a poll to take place later at a convenient time */</div><div class='add'>+void pvr2_hdw_poll_trigger_unlocked(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Register a callback used to trigger a future poll */</div><div class='add'>+void pvr2_hdw_setup_poll_trigger(struct pvr2_hdw *,</div><div class='add'>+				 void (*func)(void *),</div><div class='add'>+				 void *data);</div><div class='add'>+</div><div class='add'>+/* Destroy hardware interaction structure */</div><div class='add'>+void pvr2_hdw_destroy(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Set up the structure and attempt to put the device into a usable state.</div><div class='add'>+   This can be a time-consuming operation, which is why it is not done</div><div class='add'>+   internally as part of the create() step.  Return value is exactly the</div><div class='add'>+   same as pvr2_hdw_init_ok(). */</div><div class='add'>+int pvr2_hdw_setup(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Initialization succeeded */</div><div class='add'>+int pvr2_hdw_init_ok(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Return true if in the ready (normal) state */</div><div class='add'>+int pvr2_hdw_dev_ok(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Return small integer number [1..N] for logical instance number of this</div><div class='add'>+   device.  This is useful for indexing array-valued module parameters. */</div><div class='add'>+int pvr2_hdw_get_unit_number(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Get pointer to underlying USB device */</div><div class='add'>+struct usb_device *pvr2_hdw_get_dev(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Retrieve serial number of device */</div><div class='add'>+unsigned long pvr2_hdw_get_sn(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Called when hardware has been unplugged */</div><div class='add'>+void pvr2_hdw_disconnect(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Get the number of defined controls */</div><div class='add'>+unsigned int pvr2_hdw_get_ctrl_count(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Retrieve a control handle given its index (0..count-1) */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_index(struct pvr2_hdw *,unsigned int);</div><div class='add'>+</div><div class='add'>+/* Retrieve a control handle given its internal ID (if any) */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_id(struct pvr2_hdw *,unsigned int);</div><div class='add'>+</div><div class='add'>+/* Retrieve a control handle given its V4L ID (if any) */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_v4l(struct pvr2_hdw *,unsigned int ctl_id);</div><div class='add'>+</div><div class='add'>+/* Retrieve a control handle given its immediate predecessor V4L ID (if any) */</div><div class='add'>+struct pvr2_ctrl *pvr2_hdw_get_ctrl_nextv4l(struct pvr2_hdw *,</div><div class='add'>+					    unsigned int ctl_id);</div><div class='add'>+</div><div class='add'>+/* Commit all control changes made up to this point */</div><div class='add'>+int pvr2_hdw_commit_ctl(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Return name for this driver instance */</div><div class='add'>+const char *pvr2_hdw_get_driver_name(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Return PVR2_SIGNAL_XXXX bit mask indicating signal status */</div><div class='add'>+unsigned int pvr2_hdw_get_signal_status(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Query device and see if it thinks it is on a high-speed USB link */</div><div class='add'>+int pvr2_hdw_is_hsm(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Turn streaming on/off */</div><div class='add'>+int pvr2_hdw_set_streaming(struct pvr2_hdw *,int);</div><div class='add'>+</div><div class='add'>+/* Find out if streaming is on */</div><div class='add'>+int pvr2_hdw_get_streaming(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Configure the type of stream to generate */</div><div class='add'>+int pvr2_hdw_set_stream_type(struct pvr2_hdw *, enum pvr2_config);</div><div class='add'>+</div><div class='add'>+/* Get handle to video output stream */</div><div class='add'>+struct pvr2_stream *pvr2_hdw_get_video_stream(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Emit a video standard struct */</div><div class='add'>+int pvr2_hdw_get_stdenum_value(struct pvr2_hdw *hdw,struct v4l2_standard *std,</div><div class='add'>+			       unsigned int idx);</div><div class='add'>+</div><div class='add'>+/* Enable / disable various pieces of hardware.  Items to change are</div><div class='add'>+   identified by bit positions within msk, and new state for each item is</div><div class='add'>+   identified by corresponding bit positions within val. */</div><div class='add'>+void pvr2_hdw_subsys_bit_chg(struct pvr2_hdw *hdw,</div><div class='add'>+			     unsigned long msk,unsigned long val);</div><div class='add'>+</div><div class='add'>+/* Retrieve mask indicating which pieces of hardware are currently enabled</div><div class='add'>+   / configured. */</div><div class='add'>+unsigned long pvr2_hdw_subsys_get(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Adjust mask of what get shut down when streaming is stopped.  This is a</div><div class='add'>+   debugging aid. */</div><div class='add'>+void pvr2_hdw_subsys_stream_bit_chg(struct pvr2_hdw *hdw,</div><div class='add'>+				    unsigned long msk,unsigned long val);</div><div class='add'>+</div><div class='add'>+/* Retrieve mask indicating which pieces of hardware are disabled when</div><div class='add'>+   streaming is turned off. */</div><div class='add'>+unsigned long pvr2_hdw_subsys_stream_get(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Enable / disable retrieval of CPU firmware.  This must be enabled before</div><div class='add'>+   pvr2_hdw_cpufw_get() will function.  Note that doing this may prevent</div><div class='add'>+   the device from running (and leaving this mode may imply a device</div><div class='add'>+   reset). */</div><div class='add'>+void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *, int enable_flag);</div><div class='add'>+</div><div class='add'>+/* Return true if we're in a mode for retrieval CPU firmware */</div><div class='add'>+int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Retrieve a piece of the CPU's firmware at the given offset.  Return</div><div class='add'>+   value is the number of bytes retrieved or zero if we're past the end or</div><div class='add'>+   an error otherwise (e.g. if firmware retrieval is not enabled). */</div><div class='add'>+int pvr2_hdw_cpufw_get(struct pvr2_hdw *,unsigned int offs,</div><div class='add'>+		       char *buf,unsigned int cnt);</div><div class='add'>+</div><div class='add'>+/* Retrieve previously stored v4l minor device number */</div><div class='add'>+int pvr2_hdw_v4l_get_minor_number(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Store the v4l minor device number */</div><div class='add'>+void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *,int);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* The following entry points are all lower level things you normally don't</div><div class='add'>+   want to worry about. */</div><div class='add'>+</div><div class='add'>+/* Issue a command and get a response from the device.  LOTS of higher</div><div class='add'>+   level stuff is built on this. */</div><div class='add'>+int pvr2_send_request(struct pvr2_hdw *,</div><div class='add'>+		      void *write_ptr,unsigned int write_len,</div><div class='add'>+		      void *read_ptr,unsigned int read_len);</div><div class='add'>+</div><div class='add'>+/* Slightly higher level device communication functions. */</div><div class='add'>+int pvr2_write_register(struct pvr2_hdw *, u16, u32);</div><div class='add'>+</div><div class='add'>+/* Call if for any reason we can't talk to the hardware anymore - this will</div><div class='add'>+   cause the driver to stop flailing on the device. */</div><div class='add'>+void pvr2_hdw_render_useless(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Set / clear 8051's reset bit */</div><div class='add'>+void pvr2_hdw_cpureset_assert(struct pvr2_hdw *,int);</div><div class='add'>+</div><div class='add'>+/* Execute a USB-commanded device reset */</div><div class='add'>+void pvr2_hdw_device_reset(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Execute hard reset command (after this point it's likely that the</div><div class='add'>+   encoder will have to be reconfigured).  This also clears the "useless"</div><div class='add'>+   state. */</div><div class='add'>+int pvr2_hdw_cmd_deep_reset(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Execute simple reset command */</div><div class='add'>+int pvr2_hdw_cmd_powerup(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Order decoder to reset */</div><div class='add'>+int pvr2_hdw_cmd_decoder_reset(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+/* Direct manipulation of GPIO bits */</div><div class='add'>+int pvr2_hdw_gpio_get_dir(struct pvr2_hdw *hdw,u32 *);</div><div class='add'>+int pvr2_hdw_gpio_get_out(struct pvr2_hdw *hdw,u32 *);</div><div class='add'>+int pvr2_hdw_gpio_get_in(struct pvr2_hdw *hdw,u32 *);</div><div class='add'>+int pvr2_hdw_gpio_chg_dir(struct pvr2_hdw *hdw,u32 msk,u32 val);</div><div class='add'>+int pvr2_hdw_gpio_chg_out(struct pvr2_hdw *hdw,u32 msk,u32 val);</div><div class='add'>+</div><div class='add'>+/* This data structure is specifically for the next function... */</div><div class='add'>+struct pvr2_hdw_debug_info {</div><div class='add'>+	int big_lock_held;</div><div class='add'>+	int ctl_lock_held;</div><div class='add'>+	int flag_ok;</div><div class='add'>+	int flag_disconnected;</div><div class='add'>+	int flag_init_ok;</div><div class='add'>+	int flag_streaming_enabled;</div><div class='add'>+	unsigned long subsys_flags;</div><div class='add'>+	int cmd_debug_state;</div><div class='add'>+	int cmd_debug_write_len;</div><div class='add'>+	int cmd_debug_read_len;</div><div class='add'>+	int cmd_debug_write_pend;</div><div class='add'>+	int cmd_debug_read_pend;</div><div class='add'>+	int cmd_debug_timeout;</div><div class='add'>+	int cmd_debug_rstatus;</div><div class='add'>+	int cmd_debug_wstatus;</div><div class='add'>+	unsigned char cmd_code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Non-intrusively retrieve internal state info - this is useful for</div><div class='add'>+   diagnosing lockups.  Note that this operation is completed without any</div><div class='add'>+   kind of locking and so it is not atomic and may yield inconsistent</div><div class='add'>+   results.  This is *purely* a debugging aid. */</div><div class='add'>+void pvr2_hdw_get_debug_info(const struct pvr2_hdw *hdw,</div><div class='add'>+			     struct pvr2_hdw_debug_info *);</div><div class='add'>+</div><div class='add'>+/* Cause modules to log their state once */</div><div class='add'>+void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw);</div><div class='add'>+</div><div class='add'>+/* Cause encoder firmware to be uploaded into the device.  This is normally</div><div class='add'>+   done autonomously, but the interface is exported here because it is also</div><div class='add'>+   a debugging aid. */</div><div class='add'>+int pvr2_upload_firmware2(struct pvr2_hdw *hdw);</div><div class='add'>+</div><div class='add'>+/* List of device types that we can match */</div><div class='add'>+extern struct usb_device_id pvr2_device_table[];</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_HDW_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c<br/>new file mode 100644<br/>index 000000000000..fbe6039aeb6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include "pvrusb2-i2c-cmd-v4l2.h"</div><div class='add'>+#include "pvrusb2-audio.h"</div><div class='add'>+#include "pvrusb2-tuner.h"</div><div class='add'>+#include "pvrusb2-video-v4l.h"</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+#include "pvrusb2-cx2584x-v4l.h"</div><div class='add'>+#include "pvrusb2-wm8775.h"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+#define OP_STANDARD 0</div><div class='add'>+#define OP_BCSH 1</div><div class='add'>+#define OP_VOLUME 2</div><div class='add'>+#define OP_FREQ 3</div><div class='add'>+#define OP_AUDIORATE 4</div><div class='add'>+#define OP_SIZE 5</div><div class='add'>+#define OP_LOG 6</div><div class='add'>+</div><div class='add'>+static const struct pvr2_i2c_op * const ops[] = {</div><div class='add'>+	[OP_STANDARD] = &amp;pvr2_i2c_op_v4l2_standard,</div><div class='add'>+	[OP_BCSH] = &amp;pvr2_i2c_op_v4l2_bcsh,</div><div class='add'>+	[OP_VOLUME] = &amp;pvr2_i2c_op_v4l2_volume,</div><div class='add'>+	[OP_FREQ] = &amp;pvr2_i2c_op_v4l2_frequency,</div><div class='add'>+	[OP_SIZE] = &amp;pvr2_i2c_op_v4l2_size,</div><div class='add'>+	[OP_LOG] = &amp;pvr2_i2c_op_v4l2_log,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+	id = cp-&gt;client-&gt;driver-&gt;id;</div><div class='add'>+	cp-&gt;ctl_mask = ((1 &lt;&lt; OP_STANDARD) |</div><div class='add'>+			(1 &lt;&lt; OP_BCSH) |</div><div class='add'>+			(1 &lt;&lt; OP_VOLUME) |</div><div class='add'>+			(1 &lt;&lt; OP_FREQ) |</div><div class='add'>+			(1 &lt;&lt; OP_SIZE) |</div><div class='add'>+			(1 &lt;&lt; OP_LOG));</div><div class='add'>+</div><div class='add'>+	if (id == I2C_DRIVERID_MSP3400) {</div><div class='add'>+		if (pvr2_i2c_msp3400_setup(hdw,cp)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (id == I2C_DRIVERID_TUNER) {</div><div class='add'>+		if (pvr2_i2c_tuner_setup(hdw,cp)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+	if (id == I2C_DRIVERID_CX25840) {</div><div class='add'>+		if (pvr2_i2c_cx2584x_v4l_setup(hdw,cp)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (id == I2C_DRIVERID_WM8775) {</div><div class='add'>+		if (pvr2_i2c_wm8775_setup(hdw,cp)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if (id == I2C_DRIVERID_SAA711X) {</div><div class='add'>+		if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) {</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	if (idx &gt;= sizeof(ops)/sizeof(ops[0])) return 0;</div><div class='add'>+	return ops[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c<br/>new file mode 100644<br/>index 000000000000..8a9933dec912<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c</a></div><div class='hunk'>@@ -0,0 +1,232 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-cmd-v4l2.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_standard(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	v4l2_std_id vs;</div><div class='add'>+	vs = hdw-&gt;std_mask_cur;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,</div><div class='add'>+		   "i2c v4l2 set_standard(0x%llx)",(__u64)vs);</div><div class='add'>+</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&amp;vs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_standard(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;std_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard = {</div><div class='add'>+	.check = check_standard,</div><div class='add'>+	.update = set_standard,</div><div class='add'>+	.name = "v4l2_standard",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_bcsh(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_control ctrl;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_bcsh"</div><div class='add'>+		   " b=%d c=%d s=%d h=%d",</div><div class='add'>+		   hdw-&gt;brightness_val,hdw-&gt;contrast_val,</div><div class='add'>+		   hdw-&gt;saturation_val,hdw-&gt;hue_val);</div><div class='add'>+	memset(&amp;ctrl,0,sizeof(ctrl));</div><div class='add'>+	ctrl.id = V4L2_CID_BRIGHTNESS;</div><div class='add'>+	ctrl.value = hdw-&gt;brightness_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_CONTRAST;</div><div class='add'>+	ctrl.value = hdw-&gt;contrast_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_SATURATION;</div><div class='add'>+	ctrl.value = hdw-&gt;saturation_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_HUE;</div><div class='add'>+	ctrl.value = hdw-&gt;hue_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_bcsh(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return (hdw-&gt;brightness_dirty ||</div><div class='add'>+		hdw-&gt;contrast_dirty ||</div><div class='add'>+		hdw-&gt;saturation_dirty ||</div><div class='add'>+		hdw-&gt;hue_dirty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh = {</div><div class='add'>+	.check = check_bcsh,</div><div class='add'>+	.update = set_bcsh,</div><div class='add'>+	.name = "v4l2_bcsh",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_volume(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_control ctrl;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,</div><div class='add'>+		   "i2c v4l2 set_volume"</div><div class='add'>+		   "(vol=%d bal=%d bas=%d treb=%d mute=%d)",</div><div class='add'>+		   hdw-&gt;volume_val,</div><div class='add'>+		   hdw-&gt;balance_val,</div><div class='add'>+		   hdw-&gt;bass_val,</div><div class='add'>+		   hdw-&gt;treble_val,</div><div class='add'>+		   hdw-&gt;mute_val);</div><div class='add'>+	memset(&amp;ctrl,0,sizeof(ctrl));</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_MUTE;</div><div class='add'>+	ctrl.value = hdw-&gt;mute_val ? 1 : 0;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_VOLUME;</div><div class='add'>+	ctrl.value = hdw-&gt;volume_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_BALANCE;</div><div class='add'>+	ctrl.value = hdw-&gt;balance_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_BASS;</div><div class='add'>+	ctrl.value = hdw-&gt;bass_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+	ctrl.id = V4L2_CID_AUDIO_TREBLE;</div><div class='add'>+	ctrl.value = hdw-&gt;treble_val;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_CTRL,&amp;ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_volume(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return (hdw-&gt;volume_dirty ||</div><div class='add'>+		hdw-&gt;balance_dirty ||</div><div class='add'>+		hdw-&gt;bass_dirty ||</div><div class='add'>+		hdw-&gt;treble_dirty ||</div><div class='add'>+		hdw-&gt;mute_dirty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume = {</div><div class='add'>+	.check = check_volume,</div><div class='add'>+	.update = set_volume,</div><div class='add'>+	.name = "v4l2_volume",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_frequency(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned long fv;</div><div class='add'>+	struct v4l2_frequency freq;</div><div class='add'>+	fv = hdw-&gt;freqVal;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_freq(%lu)",fv);</div><div class='add'>+	memset(&amp;freq,0,sizeof(freq));</div><div class='add'>+	freq.frequency = fv / 62500;</div><div class='add'>+	freq.tuner = 0;</div><div class='add'>+	freq.type = V4L2_TUNER_ANALOG_TV;</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_FREQUENCY,&amp;freq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_frequency(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;freqDirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency = {</div><div class='add'>+	.check = check_frequency,</div><div class='add'>+	.update = set_frequency,</div><div class='add'>+	.name = "v4l2_freq",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_size(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_format fmt;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fmt,0,sizeof(fmt));</div><div class='add'>+</div><div class='add'>+	fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+	fmt.fmt.pix.width = hdw-&gt;res_hor_val;</div><div class='add'>+	fmt.fmt.pix.height = hdw-&gt;res_ver_val;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_size(%dx%d)",</div><div class='add'>+			   fmt.fmt.pix.width,fmt.fmt.pix.height);</div><div class='add'>+</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_S_FMT,&amp;fmt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_size(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return (hdw-&gt;res_hor_dirty || hdw-&gt;res_ver_dirty);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size = {</div><div class='add'>+	.check = check_size,</div><div class='add'>+	.update = set_size,</div><div class='add'>+	.name = "v4l2_size",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void do_log(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 do_log()");</div><div class='add'>+	pvr2_i2c_core_cmd(hdw,VIDIOC_LOG_STATUS,NULL);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_log(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	return hdw-&gt;log_requested != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log = {</div><div class='add'>+	.check = check_log,</div><div class='add'>+	.update = do_log,</div><div class='add'>+	.name = "v4l2_log",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl)</div><div class='add'>+{</div><div class='add'>+	pvr2_i2c_client_cmd(cp,</div><div class='add'>+			    (fl ? VIDIOC_STREAMON : VIDIOC_STREAMOFF),NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h<br/>new file mode 100644<br/>index 000000000000..ecabddba1ec5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_CMD_V4L2_H</div><div class='add'>+#define __PVRUSB2_CMD_V4L2_H</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard;</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size;</div><div class='add'>+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log;</div><div class='add'>+</div><div class='add'>+void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *,int);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_CMD_V4L2_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c<br/>new file mode 100644<br/>index 000000000000..7fca47982277<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.c</a></div><div class='hunk'>@@ -0,0 +1,941 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+</div><div class='add'>+#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+  This module attempts to implement a compliant I2C adapter for the pvrusb2</div><div class='add'>+  device.  By doing this we can then make use of existing functionality in</div><div class='add'>+  V4L (e.g. tuner.c) rather than rolling our own.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static unsigned int i2c_scan = 0;</div><div class='add'>+module_param(i2c_scan, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");</div><div class='add'>+</div><div class='add'>+static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp,</div><div class='add'>+					     unsigned int detail,</div><div class='add'>+					     char *buf,unsigned int maxlen);</div><div class='add'>+</div><div class='add'>+static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */</div><div class='add'>+			  u8 i2c_addr,      /* I2C address we're talking to */</div><div class='add'>+			  u8 *data,         /* Data to write */</div><div class='add'>+			  u16 length)       /* Size of data to write */</div><div class='add'>+{</div><div class='add'>+	/* Return value - default 0 means success */</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!data) length = 0;</div><div class='add'>+	if (length &gt; (sizeof(hdw-&gt;cmd_buffer) - 3)) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Killing an I2C write to %u that is too large"</div><div class='add'>+			   " (desired=%u limit=%u)",</div><div class='add'>+			   i2c_addr,</div><div class='add'>+			   length,(unsigned int)(sizeof(hdw-&gt;cmd_buffer) - 3));</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	/* Clear the command buffer (likely to be paranoia) */</div><div class='add'>+	memset(hdw-&gt;cmd_buffer, 0, sizeof(hdw-&gt;cmd_buffer));</div><div class='add'>+</div><div class='add'>+	/* Set up command buffer for an I2C write */</div><div class='add'>+	hdw-&gt;cmd_buffer[0] = 0x08;      /* write prefix */</div><div class='add'>+	hdw-&gt;cmd_buffer[1] = i2c_addr;  /* i2c addr of chip */</div><div class='add'>+	hdw-&gt;cmd_buffer[2] = length;    /* length of what follows */</div><div class='add'>+	if (length) memcpy(hdw-&gt;cmd_buffer + 3, data, length);</div><div class='add'>+</div><div class='add'>+	/* Do the operation */</div><div class='add'>+	ret = pvr2_send_request(hdw,</div><div class='add'>+				hdw-&gt;cmd_buffer,</div><div class='add'>+				length + 3,</div><div class='add'>+				hdw-&gt;cmd_buffer,</div><div class='add'>+				1);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (hdw-&gt;cmd_buffer[0] != 8) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			if (hdw-&gt;cmd_buffer[0] != 7) {</div><div class='add'>+				trace_i2c("unexpected status"</div><div class='add'>+					  " from i2_write[%d]: %d",</div><div class='add'>+					  i2c_addr,hdw-&gt;cmd_buffer[0]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */</div><div class='add'>+			 u8 i2c_addr,       /* I2C address we're talking to */</div><div class='add'>+			 u8 *data,          /* Data to write */</div><div class='add'>+			 u16 dlen,          /* Size of data to write */</div><div class='add'>+			 u8 *res,           /* Where to put data we read */</div><div class='add'>+			 u16 rlen)          /* Amount of data to read */</div><div class='add'>+{</div><div class='add'>+	/* Return value - default 0 means success */</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!data) dlen = 0;</div><div class='add'>+	if (dlen &gt; (sizeof(hdw-&gt;cmd_buffer) - 4)) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Killing an I2C read to %u that has wlen too large"</div><div class='add'>+			   " (desired=%u limit=%u)",</div><div class='add'>+			   i2c_addr,</div><div class='add'>+			   dlen,(unsigned int)(sizeof(hdw-&gt;cmd_buffer) - 4));</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if (res &amp;&amp; (rlen &gt; (sizeof(hdw-&gt;cmd_buffer) - 1))) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Killing an I2C read to %u that has rlen too large"</div><div class='add'>+			   " (desired=%u limit=%u)",</div><div class='add'>+			   i2c_addr,</div><div class='add'>+			   rlen,(unsigned int)(sizeof(hdw-&gt;cmd_buffer) - 1));</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	LOCK_TAKE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	/* Clear the command buffer (likely to be paranoia) */</div><div class='add'>+	memset(hdw-&gt;cmd_buffer, 0, sizeof(hdw-&gt;cmd_buffer));</div><div class='add'>+</div><div class='add'>+	/* Set up command buffer for an I2C write followed by a read */</div><div class='add'>+	hdw-&gt;cmd_buffer[0] = 0x09;  /* read prefix */</div><div class='add'>+	hdw-&gt;cmd_buffer[1] = dlen;  /* arg length */</div><div class='add'>+	hdw-&gt;cmd_buffer[2] = rlen;  /* answer length. Device will send one</div><div class='add'>+				       more byte (status). */</div><div class='add'>+	hdw-&gt;cmd_buffer[3] = i2c_addr;  /* i2c addr of chip */</div><div class='add'>+	if (dlen) memcpy(hdw-&gt;cmd_buffer + 4, data, dlen);</div><div class='add'>+</div><div class='add'>+	/* Do the operation */</div><div class='add'>+	ret = pvr2_send_request(hdw,</div><div class='add'>+				hdw-&gt;cmd_buffer,</div><div class='add'>+				4 + dlen,</div><div class='add'>+				hdw-&gt;cmd_buffer,</div><div class='add'>+				rlen + 1);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (hdw-&gt;cmd_buffer[0] != 8) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			if (hdw-&gt;cmd_buffer[0] != 7) {</div><div class='add'>+				trace_i2c("unexpected status"</div><div class='add'>+					  " from i2_read[%d]: %d",</div><div class='add'>+					  i2c_addr,hdw-&gt;cmd_buffer[0]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy back the result */</div><div class='add'>+	if (res &amp;&amp; rlen) {</div><div class='add'>+		if (ret) {</div><div class='add'>+			/* Error, just blank out the return buffer */</div><div class='add'>+			memset(res, 0, rlen);</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(res, hdw-&gt;cmd_buffer + 1, rlen);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	LOCK_GIVE(hdw-&gt;ctl_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is the common low level entry point for doing I2C operations to the</div><div class='add'>+   hardware. */</div><div class='add'>+static int pvr2_i2c_basic_op(struct pvr2_hdw *hdw,</div><div class='add'>+			     u8 i2c_addr,</div><div class='add'>+			     u8 *wdata,</div><div class='add'>+			     u16 wlen,</div><div class='add'>+			     u8 *rdata,</div><div class='add'>+			     u16 rlen)</div><div class='add'>+{</div><div class='add'>+	if (!rdata) rlen = 0;</div><div class='add'>+	if (!wdata) wlen = 0;</div><div class='add'>+	if (rlen || !wlen) {</div><div class='add'>+		return pvr2_i2c_read(hdw,i2c_addr,wdata,wlen,rdata,rlen);</div><div class='add'>+	} else {</div><div class='add'>+		return pvr2_i2c_write(hdw,i2c_addr,wdata,wlen);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+</div><div class='add'>+/* This is a special entry point that is entered if an I2C operation is</div><div class='add'>+   attempted to a wm8775 chip on model 24xxx hardware.  Autodetect of this</div><div class='add'>+   part doesn't work, but we know it is really there.  So let's look for</div><div class='add'>+   the autodetect attempt and just return success if we see that. */</div><div class='add'>+static int i2c_hack_wm8775(struct pvr2_hdw *hdw,</div><div class='add'>+			   u8 i2c_addr,u8 *wdata,u16 wlen,u8 *rdata,u16 rlen)</div><div class='add'>+{</div><div class='add'>+	if (!(rlen || wlen)) {</div><div class='add'>+		// This is a probe attempt.  Just let it succeed.</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return pvr2_i2c_basic_op(hdw,i2c_addr,wdata,wlen,rdata,rlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is a special entry point that is entered if an I2C operation is</div><div class='add'>+   attempted to a cx25840 chip on model 24xxx hardware.  This chip can</div><div class='add'>+   sometimes wedge itself.  Worse still, when this happens msp3400 can</div><div class='add'>+   falsely detect this part and then the system gets hosed up after msp3400</div><div class='add'>+   gets confused and dies.  What we want to do here is try to keep msp3400</div><div class='add'>+   away and also try to notice if the chip is wedged and send a warning to</div><div class='add'>+   the system log. */</div><div class='add'>+static int i2c_hack_cx25840(struct pvr2_hdw *hdw,</div><div class='add'>+			    u8 i2c_addr,u8 *wdata,u16 wlen,u8 *rdata,u16 rlen)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int subaddr;</div><div class='add'>+	u8 wbuf[2];</div><div class='add'>+	int state = hdw-&gt;i2c_cx25840_hack_state;</div><div class='add'>+</div><div class='add'>+	if (!(rlen || wlen)) {</div><div class='add'>+		// Probe attempt - always just succeed and don't bother the</div><div class='add'>+		// hardware (this helps to make the state machine further</div><div class='add'>+		// down somewhat easier).</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state == 3) {</div><div class='add'>+		return pvr2_i2c_basic_op(hdw,i2c_addr,wdata,wlen,rdata,rlen);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We're looking for the exact pattern where the revision register</div><div class='add'>+	   is being read.  The cx25840 module will always look at the</div><div class='add'>+	   revision register first.  Any other pattern of access therefore</div><div class='add'>+	   has to be a probe attempt from somebody else so we'll reject it.</div><div class='add'>+	   Normally we could just let each client just probe the part</div><div class='add'>+	   anyway, but when the cx25840 is wedged, msp3400 will get a false</div><div class='add'>+	   positive and that just screws things up... */</div><div class='add'>+</div><div class='add'>+	if (wlen == 0) {</div><div class='add'>+		switch (state) {</div><div class='add'>+		case 1: subaddr = 0x0100; break;</div><div class='add'>+		case 2: subaddr = 0x0101; break;</div><div class='add'>+		default: goto fail;</div><div class='add'>+		}</div><div class='add'>+	} else if (wlen == 2) {</div><div class='add'>+		subaddr = (wdata[0] &lt;&lt; 8) | wdata[1];</div><div class='add'>+		switch (subaddr) {</div><div class='add'>+		case 0x0100: state = 1; break;</div><div class='add'>+		case 0x0101: state = 2; break;</div><div class='add'>+		default: goto fail;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+	if (!rlen) goto success;</div><div class='add'>+	state = 0;</div><div class='add'>+	if (rlen != 1) goto fail;</div><div class='add'>+</div><div class='add'>+	/* If we get to here then we have a legitimate read for one of the</div><div class='add'>+	   two revision bytes, so pass it through. */</div><div class='add'>+	wbuf[0] = subaddr &gt;&gt; 8;</div><div class='add'>+	wbuf[1] = subaddr;</div><div class='add'>+	ret = pvr2_i2c_basic_op(hdw,i2c_addr,wbuf,2,rdata,rlen);</div><div class='add'>+</div><div class='add'>+	if ((ret != 0) || (*rdata == 0x04) || (*rdata == 0x0a)) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "WARNING: Detected a wedged cx25840 chip;"</div><div class='add'>+			   " the device will not work.");</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "WARNING: Try power cycling the pvrusb2 device.");</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "WARNING: Disabling further access to the device"</div><div class='add'>+			   " to prevent other foul-ups.");</div><div class='add'>+		// This blocks all further communication with the part.</div><div class='add'>+		hdw-&gt;i2c_func[0x44] = NULL;</div><div class='add'>+		pvr2_hdw_render_useless(hdw);</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Success! */</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"cx25840 appears to be OK.");</div><div class='add'>+	state = 3;</div><div class='add'>+</div><div class='add'>+ success:</div><div class='add'>+	hdw-&gt;i2c_cx25840_hack_state = state;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	hdw-&gt;i2c_cx25840_hack_state = state;</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_24XXX */</div><div class='add'>+</div><div class='add'>+/* This is a very, very limited I2C adapter implementation.  We can only</div><div class='add'>+   support what we actually know will work on the device... */</div><div class='add'>+static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,</div><div class='add'>+			 struct i2c_msg msgs[],</div><div class='add'>+			 int num)</div><div class='add'>+{</div><div class='add'>+	int ret = -ENOTSUPP;</div><div class='add'>+	pvr2_i2c_func funcp = NULL;</div><div class='add'>+	struct pvr2_hdw *hdw = (struct pvr2_hdw *)(i2c_adap-&gt;algo_data);</div><div class='add'>+</div><div class='add'>+	if (!num) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	if ((msgs[0].flags &amp; I2C_M_NOSTART)) {</div><div class='add'>+		trace_i2c("i2c refusing I2C_M_NOSTART");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	if (msgs[0].addr &lt; PVR2_I2C_FUNC_CNT) {</div><div class='add'>+		funcp = hdw-&gt;i2c_func[msgs[0].addr];</div><div class='add'>+	}</div><div class='add'>+	if (!funcp) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num == 1) {</div><div class='add'>+		if (msgs[0].flags &amp; I2C_M_RD) {</div><div class='add'>+			/* Simple read */</div><div class='add'>+			u16 tcnt,bcnt,offs;</div><div class='add'>+			if (!msgs[0].len) {</div><div class='add'>+				/* Length == 0 read.  This is a probe. */</div><div class='add'>+				if (funcp(hdw,msgs[0].addr,NULL,0,NULL,0)) {</div><div class='add'>+					ret = -EIO;</div><div class='add'>+					goto done;</div><div class='add'>+				}</div><div class='add'>+				ret = 1;</div><div class='add'>+				goto done;</div><div class='add'>+			}</div><div class='add'>+			/* If the read is short enough we'll do the whole</div><div class='add'>+			   thing atomically.  Otherwise we have no choice</div><div class='add'>+			   but to break apart the reads. */</div><div class='add'>+			tcnt = msgs[0].len;</div><div class='add'>+			offs = 0;</div><div class='add'>+			while (tcnt) {</div><div class='add'>+				bcnt = tcnt;</div><div class='add'>+				if (bcnt &gt; sizeof(hdw-&gt;cmd_buffer)-1) {</div><div class='add'>+					bcnt = sizeof(hdw-&gt;cmd_buffer)-1;</div><div class='add'>+				}</div><div class='add'>+				if (funcp(hdw,msgs[0].addr,NULL,0,</div><div class='add'>+					  msgs[0].buf+offs,bcnt)) {</div><div class='add'>+					ret = -EIO;</div><div class='add'>+					goto done;</div><div class='add'>+				}</div><div class='add'>+				offs += bcnt;</div><div class='add'>+				tcnt -= bcnt;</div><div class='add'>+			}</div><div class='add'>+			ret = 1;</div><div class='add'>+			goto done;</div><div class='add'>+		} else {</div><div class='add'>+			/* Simple write */</div><div class='add'>+			ret = 1;</div><div class='add'>+			if (funcp(hdw,msgs[0].addr,</div><div class='add'>+				  msgs[0].buf,msgs[0].len,NULL,0)) {</div><div class='add'>+				ret = -EIO;</div><div class='add'>+			}</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	} else if (num == 2) {</div><div class='add'>+		if (msgs[0].addr != msgs[1].addr) {</div><div class='add'>+			trace_i2c("i2c refusing 2 phase transfer with"</div><div class='add'>+				  " conflicting target addresses");</div><div class='add'>+			ret = -ENOTSUPP;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		if ((!((msgs[0].flags &amp; I2C_M_RD))) &amp;&amp;</div><div class='add'>+		    (msgs[1].flags &amp; I2C_M_RD)) {</div><div class='add'>+			u16 tcnt,bcnt,wcnt,offs;</div><div class='add'>+			/* Write followed by atomic read.  If the read</div><div class='add'>+			   portion is short enough we'll do the whole thing</div><div class='add'>+			   atomically.  Otherwise we have no choice but to</div><div class='add'>+			   break apart the reads. */</div><div class='add'>+			tcnt = msgs[1].len;</div><div class='add'>+			wcnt = msgs[0].len;</div><div class='add'>+			offs = 0;</div><div class='add'>+			while (tcnt || wcnt) {</div><div class='add'>+				bcnt = tcnt;</div><div class='add'>+				if (bcnt &gt; sizeof(hdw-&gt;cmd_buffer)-1) {</div><div class='add'>+					bcnt = sizeof(hdw-&gt;cmd_buffer)-1;</div><div class='add'>+				}</div><div class='add'>+				if (funcp(hdw,msgs[0].addr,</div><div class='add'>+					  msgs[0].buf,wcnt,</div><div class='add'>+					  msgs[1].buf+offs,bcnt)) {</div><div class='add'>+					ret = -EIO;</div><div class='add'>+					goto done;</div><div class='add'>+				}</div><div class='add'>+				offs += bcnt;</div><div class='add'>+				tcnt -= bcnt;</div><div class='add'>+				wcnt = 0;</div><div class='add'>+			}</div><div class='add'>+			ret = 2;</div><div class='add'>+			goto done;</div><div class='add'>+		} else {</div><div class='add'>+			trace_i2c("i2c refusing complex transfer"</div><div class='add'>+				  " read0=%d read1=%d",</div><div class='add'>+				  (msgs[0].flags &amp; I2C_M_RD),</div><div class='add'>+				  (msgs[1].flags &amp; I2C_M_RD));</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		trace_i2c("i2c refusing %d phase transfer",num);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	if (pvrusb2_debug &amp; PVR2_TRACE_I2C_TRAF) {</div><div class='add'>+		unsigned int idx,offs,cnt;</div><div class='add'>+		for (idx = 0; idx &lt; num; idx++) {</div><div class='add'>+			cnt = msgs[idx].len;</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "pvrusb2 i2c xfer %u/%u:"</div><div class='add'>+			       " addr=0x%x len=%d %s%s",</div><div class='add'>+			       idx+1,num,</div><div class='add'>+			       msgs[idx].addr,</div><div class='add'>+			       cnt,</div><div class='add'>+			       (msgs[idx].flags &amp; I2C_M_RD ?</div><div class='add'>+				"read" : "write"),</div><div class='add'>+			       (msgs[idx].flags &amp; I2C_M_NOSTART ?</div><div class='add'>+				" nostart" : ""));</div><div class='add'>+			if ((ret &gt; 0) || !(msgs[idx].flags &amp; I2C_M_RD)) {</div><div class='add'>+				if (cnt &gt; 8) cnt = 8;</div><div class='add'>+				printk(" [");</div><div class='add'>+				for (offs = 0; offs &lt; (cnt&gt;8?8:cnt); offs++) {</div><div class='add'>+					if (offs) printk(" ");</div><div class='add'>+					printk("%02x",msgs[idx].buf[offs]);</div><div class='add'>+				}</div><div class='add'>+				if (offs &lt; cnt) printk(" ...");</div><div class='add'>+				printk("]");</div><div class='add'>+			}</div><div class='add'>+			if (idx+1 == num) {</div><div class='add'>+				printk(" result=%d",ret);</div><div class='add'>+			}</div><div class='add'>+			printk("\n");</div><div class='add'>+		}</div><div class='add'>+		if (!num) {</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "pvrusb2 i2c xfer null transfer result=%d\n",</div><div class='add'>+			       ret);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_i2c_control(struct i2c_adapter *adapter,</div><div class='add'>+			    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 pvr2_i2c_functionality(struct i2c_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C | I2C_FUNC_SMBUS_BYTE_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_i2c_core_singleton(struct i2c_client *cp,</div><div class='add'>+				   unsigned int cmd,void *arg)</div><div class='add'>+{</div><div class='add'>+	int stat;</div><div class='add'>+	if (!cp) return -EINVAL;</div><div class='add'>+	if (!(cp-&gt;driver)) return -EINVAL;</div><div class='add'>+	if (!(cp-&gt;driver-&gt;command)) return -EINVAL;</div><div class='add'>+	if (!try_module_get(cp-&gt;driver-&gt;driver.owner)) return -EAGAIN;</div><div class='add'>+	stat = cp-&gt;driver-&gt;command(cp,cmd,arg);</div><div class='add'>+	module_put(cp-&gt;driver-&gt;driver.owner);</div><div class='add'>+	return stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_client_cmd(struct pvr2_i2c_client *cp,unsigned int cmd,void *arg)</div><div class='add'>+{</div><div class='add'>+	int stat;</div><div class='add'>+	if (pvrusb2_debug &amp; PVR2_TRACE_I2C_CMD) {</div><div class='add'>+		char buf[100];</div><div class='add'>+		unsigned int cnt;</div><div class='add'>+		cnt = pvr2_i2c_client_describe(cp,PVR2_I2C_DETAIL_DEBUG,</div><div class='add'>+					       buf,sizeof(buf));</div><div class='add'>+		pvr2_trace(PVR2_TRACE_I2C_CMD,</div><div class='add'>+			   "i2c COMMAND (code=%u 0x%x) to %.*s",</div><div class='add'>+			   cmd,cmd,cnt,buf);</div><div class='add'>+	}</div><div class='add'>+	stat = pvr2_i2c_core_singleton(cp-&gt;client,cmd,arg);</div><div class='add'>+	if (pvrusb2_debug &amp; PVR2_TRACE_I2C_CMD) {</div><div class='add'>+		char buf[100];</div><div class='add'>+		unsigned int cnt;</div><div class='add'>+		cnt = pvr2_i2c_client_describe(cp,PVR2_I2C_DETAIL_DEBUG,</div><div class='add'>+					       buf,sizeof(buf));</div><div class='add'>+		pvr2_trace(PVR2_TRACE_I2C_CMD,</div><div class='add'>+			   "i2c COMMAND to %.*s (ret=%d)",cnt,buf,stat);</div><div class='add'>+	}</div><div class='add'>+	return stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_core_cmd(struct pvr2_hdw *hdw,unsigned int cmd,void *arg)</div><div class='add'>+{</div><div class='add'>+	struct list_head *item,*nc;</div><div class='add'>+	struct pvr2_i2c_client *cp;</div><div class='add'>+	int stat = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!hdw) return stat;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	list_for_each_safe(item,nc,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+		cp = list_entry(item,struct pvr2_i2c_client,list);</div><div class='add'>+		if (!cp-&gt;recv_enable) continue;</div><div class='add'>+		mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+		stat = pvr2_i2c_client_cmd(cp,cmd,arg);</div><div class='add'>+		mutex_lock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	return stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int handler_check(struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_i2c_handler *hp = cp-&gt;handler;</div><div class='add'>+	if (!hp) return 0;</div><div class='add'>+	if (!hp-&gt;func_table-&gt;check) return 0;</div><div class='add'>+	return hp-&gt;func_table-&gt;check(hp-&gt;func_data) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BUFSIZE 500</div><div class='add'>+</div><div class='add'>+void pvr2_i2c_core_sync(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	struct list_head *item,*nc;</div><div class='add'>+	struct pvr2_i2c_client *cp;</div><div class='add'>+</div><div class='add'>+	if (!hdw-&gt;i2c_linked) return;</div><div class='add'>+	if (!(hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_ALL)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_I2C_CORE,"i2c: core_sync BEGIN");</div><div class='add'>+		if (hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_DETECT) {</div><div class='add'>+			/* One or more I2C clients have attached since we</div><div class='add'>+			   last synced.  So scan the list and identify the</div><div class='add'>+			   new clients. */</div><div class='add'>+			char *buf;</div><div class='add'>+			unsigned int cnt;</div><div class='add'>+			unsigned long amask = 0;</div><div class='add'>+			buf = kmalloc(BUFSIZE,GFP_KERNEL);</div><div class='add'>+			pvr2_trace(PVR2_TRACE_I2C_CORE,"i2c: PEND_DETECT");</div><div class='add'>+			hdw-&gt;i2c_pend_types &amp;= ~PVR2_I2C_PEND_DETECT;</div><div class='add'>+			list_for_each(item,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+				cp = list_entry(item,struct pvr2_i2c_client,</div><div class='add'>+						list);</div><div class='add'>+				if (!cp-&gt;detected_flag) {</div><div class='add'>+					cp-&gt;ctl_mask = 0;</div><div class='add'>+					pvr2_i2c_probe(hdw,cp);</div><div class='add'>+					cp-&gt;detected_flag = !0;</div><div class='add'>+					msk = cp-&gt;ctl_mask;</div><div class='add'>+					cnt = 0;</div><div class='add'>+					if (buf) {</div><div class='add'>+						cnt = pvr2_i2c_client_describe(</div><div class='add'>+							cp,</div><div class='add'>+							PVR2_I2C_DETAIL_ALL,</div><div class='add'>+							buf,BUFSIZE);</div><div class='add'>+					}</div><div class='add'>+					trace_i2c("Probed: %.*s",cnt,buf);</div><div class='add'>+					if (handler_check(cp)) {</div><div class='add'>+						hdw-&gt;i2c_pend_types |=</div><div class='add'>+							PVR2_I2C_PEND_CLIENT;</div><div class='add'>+					}</div><div class='add'>+					cp-&gt;pend_mask = msk;</div><div class='add'>+					hdw-&gt;i2c_pend_mask |= msk;</div><div class='add'>+					hdw-&gt;i2c_pend_types |=</div><div class='add'>+						PVR2_I2C_PEND_REFRESH;</div><div class='add'>+				}</div><div class='add'>+				amask |= cp-&gt;ctl_mask;</div><div class='add'>+			}</div><div class='add'>+			hdw-&gt;i2c_active_mask = amask;</div><div class='add'>+			if (buf) kfree(buf);</div><div class='add'>+		}</div><div class='add'>+		if (hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_STALE) {</div><div class='add'>+			/* Need to do one or more global updates.  Arrange</div><div class='add'>+			   for this to happen. */</div><div class='add'>+			unsigned long m2;</div><div class='add'>+			pvr2_trace(PVR2_TRACE_I2C_CORE,</div><div class='add'>+				   "i2c: PEND_STALE (0x%lx)",</div><div class='add'>+				   hdw-&gt;i2c_stale_mask);</div><div class='add'>+			hdw-&gt;i2c_pend_types &amp;= ~PVR2_I2C_PEND_STALE;</div><div class='add'>+			list_for_each(item,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+				cp = list_entry(item,struct pvr2_i2c_client,</div><div class='add'>+						list);</div><div class='add'>+				m2 = hdw-&gt;i2c_stale_mask;</div><div class='add'>+				m2 &amp;= cp-&gt;ctl_mask;</div><div class='add'>+				m2 &amp;= ~cp-&gt;pend_mask;</div><div class='add'>+				if (m2) {</div><div class='add'>+					pvr2_trace(PVR2_TRACE_I2C_CORE,</div><div class='add'>+						   "i2c: cp=%p setting 0x%lx",</div><div class='add'>+						   cp,m2);</div><div class='add'>+					cp-&gt;pend_mask |= m2;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			hdw-&gt;i2c_pend_mask |= hdw-&gt;i2c_stale_mask;</div><div class='add'>+			hdw-&gt;i2c_stale_mask = 0;</div><div class='add'>+			hdw-&gt;i2c_pend_types |= PVR2_I2C_PEND_REFRESH;</div><div class='add'>+		}</div><div class='add'>+		if (hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_CLIENT) {</div><div class='add'>+			/* One or more client handlers are asking for an</div><div class='add'>+			   update.  Run through the list of known clients</div><div class='add'>+			   and update each one. */</div><div class='add'>+			pvr2_trace(PVR2_TRACE_I2C_CORE,"i2c: PEND_CLIENT");</div><div class='add'>+			hdw-&gt;i2c_pend_types &amp;= ~PVR2_I2C_PEND_CLIENT;</div><div class='add'>+			list_for_each_safe(item,nc,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+				cp = list_entry(item,struct pvr2_i2c_client,</div><div class='add'>+						list);</div><div class='add'>+				if (!cp-&gt;handler) continue;</div><div class='add'>+				if (!cp-&gt;handler-&gt;func_table-&gt;update) continue;</div><div class='add'>+				pvr2_trace(PVR2_TRACE_I2C_CORE,</div><div class='add'>+					   "i2c: cp=%p update",cp);</div><div class='add'>+				mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+				cp-&gt;handler-&gt;func_table-&gt;update(</div><div class='add'>+					cp-&gt;handler-&gt;func_data);</div><div class='add'>+				mutex_lock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+				/* If client's update function set some</div><div class='add'>+				   additional pending bits, account for that</div><div class='add'>+				   here. */</div><div class='add'>+				if (cp-&gt;pend_mask &amp; ~hdw-&gt;i2c_pend_mask) {</div><div class='add'>+					hdw-&gt;i2c_pend_mask |= cp-&gt;pend_mask;</div><div class='add'>+					hdw-&gt;i2c_pend_types |=</div><div class='add'>+						PVR2_I2C_PEND_REFRESH;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_REFRESH) {</div><div class='add'>+			const struct pvr2_i2c_op *opf;</div><div class='add'>+			unsigned long pm;</div><div class='add'>+			/* Some actual updates are pending.  Walk through</div><div class='add'>+			   each update type and perform it. */</div><div class='add'>+			pvr2_trace(PVR2_TRACE_I2C_CORE,"i2c: PEND_REFRESH"</div><div class='add'>+				   " (0x%lx)",hdw-&gt;i2c_pend_mask);</div><div class='add'>+			hdw-&gt;i2c_pend_types &amp;= ~PVR2_I2C_PEND_REFRESH;</div><div class='add'>+			pm = hdw-&gt;i2c_pend_mask;</div><div class='add'>+			hdw-&gt;i2c_pend_mask = 0;</div><div class='add'>+			for (idx = 0, msk = 1; pm; idx++, msk &lt;&lt;= 1) {</div><div class='add'>+				if (!(pm &amp; msk)) continue;</div><div class='add'>+				pm &amp;= ~msk;</div><div class='add'>+				list_for_each(item,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+					cp = list_entry(item,</div><div class='add'>+							struct pvr2_i2c_client,</div><div class='add'>+							list);</div><div class='add'>+					if (cp-&gt;pend_mask &amp; msk) {</div><div class='add'>+						cp-&gt;pend_mask &amp;= ~msk;</div><div class='add'>+						cp-&gt;recv_enable = !0;</div><div class='add'>+					} else {</div><div class='add'>+						cp-&gt;recv_enable = 0;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				opf = pvr2_i2c_get_op(idx);</div><div class='add'>+				if (!opf) continue;</div><div class='add'>+				mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+				opf-&gt;update(hdw);</div><div class='add'>+				mutex_lock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		pvr2_trace(PVR2_TRACE_I2C_CORE,"i2c: core_sync END");</div><div class='add'>+	} while (0); mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_core_check_stale(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk,sm,pm;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	const struct pvr2_i2c_op *opf;</div><div class='add'>+	struct list_head *item;</div><div class='add'>+	struct pvr2_i2c_client *cp;</div><div class='add'>+	unsigned int pt = 0;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_I2C_CORE,"pvr2_i2c_core_check_stale BEGIN");</div><div class='add'>+</div><div class='add'>+	pm = hdw-&gt;i2c_active_mask;</div><div class='add'>+	sm = 0;</div><div class='add'>+	for (idx = 0, msk = 1; pm; idx++, msk &lt;&lt;= 1) {</div><div class='add'>+		if (!(msk &amp; pm)) continue;</div><div class='add'>+		pm &amp;= ~msk;</div><div class='add'>+		opf = pvr2_i2c_get_op(idx);</div><div class='add'>+		if (!opf) continue;</div><div class='add'>+		if (opf-&gt;check(hdw)) {</div><div class='add'>+			sm |= msk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sm) pt |= PVR2_I2C_PEND_STALE;</div><div class='add'>+</div><div class='add'>+	list_for_each(item,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+		cp = list_entry(item,struct pvr2_i2c_client,list);</div><div class='add'>+		if (!handler_check(cp)) continue;</div><div class='add'>+		pt |= PVR2_I2C_PEND_CLIENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pt) {</div><div class='add'>+		mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+			hdw-&gt;i2c_pend_types |= pt;</div><div class='add'>+			hdw-&gt;i2c_stale_mask |= sm;</div><div class='add'>+			hdw-&gt;i2c_pend_mask |= hdw-&gt;i2c_stale_mask;</div><div class='add'>+		} while (0); mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_I2C_CORE,</div><div class='add'>+		   "i2c: types=0x%x stale=0x%lx pend=0x%lx",</div><div class='add'>+		   hdw-&gt;i2c_pend_types,</div><div class='add'>+		   hdw-&gt;i2c_stale_mask,</div><div class='add'>+		   hdw-&gt;i2c_pend_mask);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_I2C_CORE,"pvr2_i2c_core_check_stale END");</div><div class='add'>+</div><div class='add'>+	return (hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_ALL) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp,</div><div class='add'>+					     unsigned int detail,</div><div class='add'>+					     char *buf,unsigned int maxlen)</div><div class='add'>+{</div><div class='add'>+	unsigned int ccnt,bcnt;</div><div class='add'>+	int spcfl = 0;</div><div class='add'>+	const struct pvr2_i2c_op *opf;</div><div class='add'>+</div><div class='add'>+	ccnt = 0;</div><div class='add'>+	if (detail &amp; PVR2_I2C_DETAIL_DEBUG) {</div><div class='add'>+		bcnt = scnprintf(buf,maxlen,</div><div class='add'>+				 "ctxt=%p ctl_mask=0x%lx",</div><div class='add'>+				 cp,cp-&gt;ctl_mask);</div><div class='add'>+		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+		spcfl = !0;</div><div class='add'>+	}</div><div class='add'>+	bcnt = scnprintf(buf,maxlen,</div><div class='add'>+			 "%s%s @ 0x%x",</div><div class='add'>+			 (spcfl ? " " : ""),</div><div class='add'>+			 cp-&gt;client-&gt;name,</div><div class='add'>+			 cp-&gt;client-&gt;addr);</div><div class='add'>+	ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+	if ((detail &amp; PVR2_I2C_DETAIL_HANDLER) &amp;&amp;</div><div class='add'>+	    cp-&gt;handler &amp;&amp; cp-&gt;handler-&gt;func_table-&gt;describe) {</div><div class='add'>+		bcnt = scnprintf(buf,maxlen," (");</div><div class='add'>+		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+		bcnt = cp-&gt;handler-&gt;func_table-&gt;describe(</div><div class='add'>+			cp-&gt;handler-&gt;func_data,buf,maxlen);</div><div class='add'>+		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+		bcnt = scnprintf(buf,maxlen,")");</div><div class='add'>+		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+	}</div><div class='add'>+	if ((detail &amp; PVR2_I2C_DETAIL_CTLMASK) &amp;&amp; cp-&gt;ctl_mask) {</div><div class='add'>+		unsigned int idx;</div><div class='add'>+		unsigned long msk,sm;</div><div class='add'>+		int spcfl;</div><div class='add'>+		bcnt = scnprintf(buf,maxlen," [");</div><div class='add'>+		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+		sm = 0;</div><div class='add'>+		spcfl = 0;</div><div class='add'>+		for (idx = 0, msk = 1; msk; idx++, msk &lt;&lt;= 1) {</div><div class='add'>+			if (!(cp-&gt;ctl_mask &amp; msk)) continue;</div><div class='add'>+			opf = pvr2_i2c_get_op(idx);</div><div class='add'>+			if (opf) {</div><div class='add'>+				bcnt = scnprintf(buf,maxlen,"%s%s",</div><div class='add'>+						 spcfl ? " " : "",</div><div class='add'>+						 opf-&gt;name);</div><div class='add'>+				ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+				spcfl = !0;</div><div class='add'>+			} else {</div><div class='add'>+				sm |= msk;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (sm) {</div><div class='add'>+			bcnt = scnprintf(buf,maxlen,"%s%lx",</div><div class='add'>+					 idx != 0 ? " " : "",sm);</div><div class='add'>+			ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+		}</div><div class='add'>+		bcnt = scnprintf(buf,maxlen,"]");</div><div class='add'>+		ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+	}</div><div class='add'>+	return ccnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int pvr2_i2c_report(struct pvr2_hdw *hdw,</div><div class='add'>+			     char *buf,unsigned int maxlen)</div><div class='add'>+{</div><div class='add'>+	unsigned int ccnt,bcnt;</div><div class='add'>+	struct list_head *item;</div><div class='add'>+	struct pvr2_i2c_client *cp;</div><div class='add'>+	ccnt = 0;</div><div class='add'>+	mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+		list_for_each(item,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+			cp = list_entry(item,struct pvr2_i2c_client,list);</div><div class='add'>+			bcnt = pvr2_i2c_client_describe(</div><div class='add'>+				cp,</div><div class='add'>+				(PVR2_I2C_DETAIL_HANDLER|</div><div class='add'>+				 PVR2_I2C_DETAIL_CTLMASK),</div><div class='add'>+				buf,maxlen);</div><div class='add'>+			ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+			bcnt = scnprintf(buf,maxlen,"\n");</div><div class='add'>+			ccnt += bcnt; buf += bcnt; maxlen -= bcnt;</div><div class='add'>+		}</div><div class='add'>+	} while (0); mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	return ccnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_i2c_attach_inform(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = (struct pvr2_hdw *)(client-&gt;adapter-&gt;algo_data);</div><div class='add'>+	struct pvr2_i2c_client *cp;</div><div class='add'>+	int fl = !(hdw-&gt;i2c_pend_types &amp; PVR2_I2C_PEND_ALL);</div><div class='add'>+	cp = kmalloc(sizeof(*cp),GFP_KERNEL);</div><div class='add'>+	trace_i2c("i2c_attach [client=%s @ 0x%x ctxt=%p]",</div><div class='add'>+		  client-&gt;name,</div><div class='add'>+		  client-&gt;addr,cp);</div><div class='add'>+	if (!cp) return -ENOMEM;</div><div class='add'>+	memset(cp,0,sizeof(*cp));</div><div class='add'>+	INIT_LIST_HEAD(&amp;cp-&gt;list);</div><div class='add'>+	cp-&gt;client = client;</div><div class='add'>+	mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+		list_add_tail(&amp;cp-&gt;list,&amp;hdw-&gt;i2c_clients);</div><div class='add'>+		hdw-&gt;i2c_pend_types |= PVR2_I2C_PEND_DETECT;</div><div class='add'>+	} while (0); mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	if (fl) pvr2_hdw_poll_trigger_unlocked(hdw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_i2c_detach_inform(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = (struct pvr2_hdw *)(client-&gt;adapter-&gt;algo_data);</div><div class='add'>+	struct pvr2_i2c_client *cp;</div><div class='add'>+	struct list_head *item,*nc;</div><div class='add'>+	unsigned long amask = 0;</div><div class='add'>+	int foundfl = 0;</div><div class='add'>+	mutex_lock(&amp;hdw-&gt;i2c_list_lock); do {</div><div class='add'>+		list_for_each_safe(item,nc,&amp;hdw-&gt;i2c_clients) {</div><div class='add'>+			cp = list_entry(item,struct pvr2_i2c_client,list);</div><div class='add'>+			if (cp-&gt;client == client) {</div><div class='add'>+				trace_i2c("pvr2_i2c_detach"</div><div class='add'>+					  " [client=%s @ 0x%x ctxt=%p]",</div><div class='add'>+					  client-&gt;name,</div><div class='add'>+					  client-&gt;addr,cp);</div><div class='add'>+				if (cp-&gt;handler &amp;&amp;</div><div class='add'>+				    cp-&gt;handler-&gt;func_table-&gt;detach) {</div><div class='add'>+					cp-&gt;handler-&gt;func_table-&gt;detach(</div><div class='add'>+						cp-&gt;handler-&gt;func_data);</div><div class='add'>+				}</div><div class='add'>+				list_del(&amp;cp-&gt;list);</div><div class='add'>+				kfree(cp);</div><div class='add'>+				foundfl = !0;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			amask |= cp-&gt;ctl_mask;</div><div class='add'>+		}</div><div class='add'>+		hdw-&gt;i2c_active_mask = amask;</div><div class='add'>+	} while (0); mutex_unlock(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	if (!foundfl) {</div><div class='add'>+		trace_i2c("pvr2_i2c_detach [client=%s @ 0x%x ctxt=&lt;unknown&gt;]",</div><div class='add'>+			  client-&gt;name,</div><div class='add'>+			  client-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_algorithm pvr2_i2c_algo_template = {</div><div class='add'>+	.master_xfer   = pvr2_i2c_xfer,</div><div class='add'>+	.algo_control  = pvr2_i2c_control,</div><div class='add'>+	.functionality = pvr2_i2c_functionality,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_adapter pvr2_i2c_adap_template = {</div><div class='add'>+	.owner         = THIS_MODULE,</div><div class='add'>+	.class	   = I2C_CLASS_TV_ANALOG,</div><div class='add'>+	.id            = I2C_HW_B_BT848,</div><div class='add'>+	.client_register = pvr2_i2c_attach_inform,</div><div class='add'>+	.client_unregister = pvr2_i2c_detach_inform,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void do_i2c_scan(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	struct i2c_msg msg[1];</div><div class='add'>+	int i,rc;</div><div class='add'>+	msg[0].addr = 0;</div><div class='add'>+	msg[0].flags = I2C_M_RD;</div><div class='add'>+	msg[0].len = 0;</div><div class='add'>+	msg[0].buf = NULL;</div><div class='add'>+	printk("%s: i2c scan beginning\n",hdw-&gt;name);</div><div class='add'>+	for (i = 0; i &lt; 128; i++) {</div><div class='add'>+		msg[0].addr = i;</div><div class='add'>+		rc = i2c_transfer(&amp;hdw-&gt;i2c_adap,msg,</div><div class='add'>+				  sizeof(msg)/sizeof(msg[0]));</div><div class='add'>+		if (rc != 1) continue;</div><div class='add'>+		printk("%s: i2c scan: found device @ 0x%x\n",hdw-&gt;name,i);</div><div class='add'>+	}</div><div class='add'>+	printk("%s: i2c scan done.\n",hdw-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_i2c_core_init(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	// The default action for all possible I2C addresses is just to do</div><div class='add'>+	// the transfer normally.</div><div class='add'>+	for (idx = 0; idx &lt; PVR2_I2C_FUNC_CNT; idx++) {</div><div class='add'>+		hdw-&gt;i2c_func[idx] = pvr2_i2c_basic_op;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_24XXX</div><div class='add'>+	// If however we're dealing with new hardware, insert some hacks in</div><div class='add'>+	// the I2C transfer stack to let things work better.</div><div class='add'>+	if (hdw-&gt;hdw_type == PVR2_HDW_TYPE_24XXX) {</div><div class='add'>+		hdw-&gt;i2c_func[0x1b] = i2c_hack_wm8775;</div><div class='add'>+		hdw-&gt;i2c_func[0x44] = i2c_hack_cx25840;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	// Configure the adapter and set up everything else related to it.</div><div class='add'>+	memcpy(&amp;hdw-&gt;i2c_adap,&amp;pvr2_i2c_adap_template,sizeof(hdw-&gt;i2c_adap));</div><div class='add'>+	memcpy(&amp;hdw-&gt;i2c_algo,&amp;pvr2_i2c_algo_template,sizeof(hdw-&gt;i2c_algo));</div><div class='add'>+	strlcpy(hdw-&gt;i2c_adap.name,hdw-&gt;name,sizeof(hdw-&gt;i2c_adap.name));</div><div class='add'>+	hdw-&gt;i2c_adap.algo = &amp;hdw-&gt;i2c_algo;</div><div class='add'>+	hdw-&gt;i2c_adap.algo_data = hdw;</div><div class='add'>+	hdw-&gt;i2c_pend_mask = 0;</div><div class='add'>+	hdw-&gt;i2c_stale_mask = 0;</div><div class='add'>+	hdw-&gt;i2c_active_mask = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;hdw-&gt;i2c_clients);</div><div class='add'>+	mutex_init(&amp;hdw-&gt;i2c_list_lock);</div><div class='add'>+	hdw-&gt;i2c_linked = !0;</div><div class='add'>+	i2c_add_adapter(&amp;hdw-&gt;i2c_adap);</div><div class='add'>+	if (i2c_scan) do_i2c_scan(hdw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_i2c_core_done(struct pvr2_hdw *hdw)</div><div class='add'>+{</div><div class='add'>+	if (hdw-&gt;i2c_linked) {</div><div class='add'>+		i2c_del_adapter(&amp;hdw-&gt;i2c_adap);</div><div class='add'>+		hdw-&gt;i2c_linked = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h<br/>new file mode 100644<br/>index 000000000000..6d7e25247576<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-i2c-core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-i2c-core.h</a></div><div class='hunk'>@@ -0,0 +1,93 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_I2C_CORE_H</div><div class='add'>+#define __PVRUSB2_I2C_CORE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_hdw;</div><div class='add'>+struct pvr2_i2c_client;</div><div class='add'>+struct pvr2_i2c_handler;</div><div class='add'>+struct pvr2_i2c_handler_functions;</div><div class='add'>+struct pvr2_i2c_op;</div><div class='add'>+struct pvr2_i2c_op_functions;</div><div class='add'>+</div><div class='add'>+struct pvr2_i2c_client {</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct pvr2_i2c_handler *handler;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	int detected_flag;</div><div class='add'>+	int recv_enable;</div><div class='add'>+	unsigned long pend_mask;</div><div class='add'>+	unsigned long ctl_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_i2c_handler {</div><div class='add'>+	void *func_data;</div><div class='add'>+	const struct pvr2_i2c_handler_functions *func_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_i2c_handler_functions {</div><div class='add'>+	void (*detach)(void *);</div><div class='add'>+	int (*check)(void *);</div><div class='add'>+	void (*update)(void *);</div><div class='add'>+	unsigned int (*describe)(void *,char *,unsigned int);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_i2c_op {</div><div class='add'>+	int (*check)(struct pvr2_hdw *);</div><div class='add'>+	void (*update)(struct pvr2_hdw *);</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pvr2_i2c_core_init(struct pvr2_hdw *);</div><div class='add'>+void pvr2_i2c_core_done(struct pvr2_hdw *);</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_client_cmd(struct pvr2_i2c_client *,unsigned int cmd,void *arg);</div><div class='add'>+int pvr2_i2c_core_cmd(struct pvr2_hdw *,unsigned int cmd,void *arg);</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_core_check_stale(struct pvr2_hdw *);</div><div class='add'>+void pvr2_i2c_core_sync(struct pvr2_hdw *);</div><div class='add'>+unsigned int pvr2_i2c_report(struct pvr2_hdw *,char *buf,unsigned int maxlen);</div><div class='add'>+#define PVR2_I2C_DETAIL_DEBUG   0x0001</div><div class='add'>+#define PVR2_I2C_DETAIL_HANDLER 0x0002</div><div class='add'>+#define PVR2_I2C_DETAIL_CTLMASK 0x0004</div><div class='add'>+#define PVR2_I2C_DETAIL_ALL (\</div><div class='add'>+	PVR2_I2C_DETAIL_DEBUG |\</div><div class='add'>+	PVR2_I2C_DETAIL_HANDLER |\</div><div class='add'>+	PVR2_I2C_DETAIL_CTLMASK)</div><div class='add'>+</div><div class='add'>+void pvr2_i2c_probe(struct pvr2_hdw *,struct pvr2_i2c_client *);</div><div class='add'>+const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_I2C_CORE_H */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c<br/>new file mode 100644<br/>index 000000000000..681f79c8064e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-io.c</a></div><div class='hunk'>@@ -0,0 +1,664 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-io.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+#define BUFFER_SIG 0x47653271</div><div class='add'>+</div><div class='add'>+// #define SANITY_CHECK_BUFFERS</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef SANITY_CHECK_BUFFERS</div><div class='add'>+#define BUFFER_CHECK(bp) do { \</div><div class='add'>+	if ((bp)-&gt;signature != BUFFER_SIG) { \</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS, \</div><div class='add'>+		"Buffer %p is bad at %s:%d", \</div><div class='add'>+		(bp),__FILE__,__LINE__); \</div><div class='add'>+		pvr2_buffer_describe(bp,"BadSig"); \</div><div class='add'>+		BUG(); \</div><div class='add'>+	} \</div><div class='add'>+} while (0)</div><div class='add'>+#else</div><div class='add'>+#define BUFFER_CHECK(bp) do {} while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct pvr2_stream {</div><div class='add'>+	/* Buffers queued for reading */</div><div class='add'>+	struct list_head queued_list;</div><div class='add'>+	unsigned int q_count;</div><div class='add'>+	unsigned int q_bcount;</div><div class='add'>+	/* Buffers with retrieved data */</div><div class='add'>+	struct list_head ready_list;</div><div class='add'>+	unsigned int r_count;</div><div class='add'>+	unsigned int r_bcount;</div><div class='add'>+	/* Buffers available for use */</div><div class='add'>+	struct list_head idle_list;</div><div class='add'>+	unsigned int i_count;</div><div class='add'>+	unsigned int i_bcount;</div><div class='add'>+	/* Pointers to all buffers */</div><div class='add'>+	struct pvr2_buffer **buffers;</div><div class='add'>+	/* Array size of buffers */</div><div class='add'>+	unsigned int buffer_slot_count;</div><div class='add'>+	/* Total buffers actually in circulation */</div><div class='add'>+	unsigned int buffer_total_count;</div><div class='add'>+	/* Designed number of buffers to be in circulation */</div><div class='add'>+	unsigned int buffer_target_count;</div><div class='add'>+	/* Executed when ready list become non-empty */</div><div class='add'>+	pvr2_stream_callback callback_func;</div><div class='add'>+	void *callback_data;</div><div class='add'>+	/* Context for transfer endpoint */</div><div class='add'>+	struct usb_device *dev;</div><div class='add'>+	int endpoint;</div><div class='add'>+	/* Overhead for mutex enforcement */</div><div class='add'>+	spinlock_t list_lock;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	/* Tracking state for tolerating errors */</div><div class='add'>+	unsigned int fail_count;</div><div class='add'>+	unsigned int fail_tolerance;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_buffer {</div><div class='add'>+	int id;</div><div class='add'>+	int signature;</div><div class='add'>+	enum pvr2_buffer_state state;</div><div class='add'>+	void *ptr;               /* Pointer to storage area */</div><div class='add'>+	unsigned int max_count;  /* Size of storage area */</div><div class='add'>+	unsigned int used_count; /* Amount of valid data in storage area */</div><div class='add'>+	int status;              /* Transfer result status */</div><div class='add'>+	struct pvr2_stream *stream;</div><div class='add'>+	struct list_head list_overhead;</div><div class='add'>+	struct urb *purb;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *pvr2_buffer_state_decode(enum pvr2_buffer_state st)</div><div class='add'>+{</div><div class='add'>+	switch (st) {</div><div class='add'>+	case pvr2_buffer_state_none: return "none";</div><div class='add'>+	case pvr2_buffer_state_idle: return "idle";</div><div class='add'>+	case pvr2_buffer_state_queued: return "queued";</div><div class='add'>+	case pvr2_buffer_state_ready: return "ready";</div><div class='add'>+	}</div><div class='add'>+	return "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef SANITY_CHECK_BUFFERS</div><div class='add'>+static void pvr2_buffer_describe(struct pvr2_buffer *bp,const char *msg)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INFO,</div><div class='add'>+		   "buffer%s%s %p state=%s id=%d status=%d"</div><div class='add'>+		   " stream=%p purb=%p sig=0x%x",</div><div class='add'>+		   (msg ? " " : ""),</div><div class='add'>+		   (msg ? msg : ""),</div><div class='add'>+		   bp,</div><div class='add'>+		   (bp ? pvr2_buffer_state_decode(bp-&gt;state) : "(invalid)"),</div><div class='add'>+		   (bp ? bp-&gt;id : 0),</div><div class='add'>+		   (bp ? bp-&gt;status : 0),</div><div class='add'>+		   (bp ? bp-&gt;stream : NULL),</div><div class='add'>+		   (bp ? bp-&gt;purb : NULL),</div><div class='add'>+		   (bp ? bp-&gt;signature : 0));</div><div class='add'>+}</div><div class='add'>+#endif  /*  SANITY_CHECK_BUFFERS  */</div><div class='add'>+</div><div class='add'>+static void pvr2_buffer_remove(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	unsigned int *cnt;</div><div class='add'>+	unsigned int *bcnt;</div><div class='add'>+	unsigned int ccnt;</div><div class='add'>+	struct pvr2_stream *sp = bp-&gt;stream;</div><div class='add'>+	switch (bp-&gt;state) {</div><div class='add'>+	case pvr2_buffer_state_idle:</div><div class='add'>+		cnt = &amp;sp-&gt;i_count;</div><div class='add'>+		bcnt = &amp;sp-&gt;i_bcount;</div><div class='add'>+		ccnt = bp-&gt;max_count;</div><div class='add'>+		break;</div><div class='add'>+	case pvr2_buffer_state_queued:</div><div class='add'>+		cnt = &amp;sp-&gt;q_count;</div><div class='add'>+		bcnt = &amp;sp-&gt;q_bcount;</div><div class='add'>+		ccnt = bp-&gt;max_count;</div><div class='add'>+		break;</div><div class='add'>+	case pvr2_buffer_state_ready:</div><div class='add'>+		cnt = &amp;sp-&gt;r_count;</div><div class='add'>+		bcnt = &amp;sp-&gt;r_bcount;</div><div class='add'>+		ccnt = bp-&gt;used_count;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	list_del_init(&amp;bp-&gt;list_overhead);</div><div class='add'>+	(*cnt)--;</div><div class='add'>+	(*bcnt) -= ccnt;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/"</div><div class='add'>+		   " bufferPool     %8s dec cap=%07d cnt=%02d",</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),*bcnt,*cnt);</div><div class='add'>+	bp-&gt;state = pvr2_buffer_state_none;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_buffer_set_none(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	BUFFER_CHECK(bp);</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ bufferState    %p %6s --&gt; %6s",</div><div class='add'>+		   bp,</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   pvr2_buffer_state_decode(pvr2_buffer_state_none));</div><div class='add'>+	spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	pvr2_buffer_remove(bp);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_buffer_set_ready(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	int fl;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	BUFFER_CHECK(bp);</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ bufferState    %p %6s --&gt; %6s",</div><div class='add'>+		   bp,</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   pvr2_buffer_state_decode(pvr2_buffer_state_ready));</div><div class='add'>+	spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	fl = (sp-&gt;r_count == 0);</div><div class='add'>+	pvr2_buffer_remove(bp);</div><div class='add'>+	list_add_tail(&amp;bp-&gt;list_overhead,&amp;sp-&gt;ready_list);</div><div class='add'>+	bp-&gt;state = pvr2_buffer_state_ready;</div><div class='add'>+	(sp-&gt;r_count)++;</div><div class='add'>+	sp-&gt;r_bcount += bp-&gt;used_count;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/"</div><div class='add'>+		   " bufferPool     %8s inc cap=%07d cnt=%02d",</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   sp-&gt;r_bcount,sp-&gt;r_count);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	return fl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_buffer_set_idle(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	BUFFER_CHECK(bp);</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ bufferState    %p %6s --&gt; %6s",</div><div class='add'>+		   bp,</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   pvr2_buffer_state_decode(pvr2_buffer_state_idle));</div><div class='add'>+	spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	pvr2_buffer_remove(bp);</div><div class='add'>+	list_add_tail(&amp;bp-&gt;list_overhead,&amp;sp-&gt;idle_list);</div><div class='add'>+	bp-&gt;state = pvr2_buffer_state_idle;</div><div class='add'>+	(sp-&gt;i_count)++;</div><div class='add'>+	sp-&gt;i_bcount += bp-&gt;max_count;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/"</div><div class='add'>+		   " bufferPool     %8s inc cap=%07d cnt=%02d",</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   sp-&gt;i_bcount,sp-&gt;i_count);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_buffer_set_queued(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	BUFFER_CHECK(bp);</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ bufferState    %p %6s --&gt; %6s",</div><div class='add'>+		   bp,</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   pvr2_buffer_state_decode(pvr2_buffer_state_queued));</div><div class='add'>+	spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	pvr2_buffer_remove(bp);</div><div class='add'>+	list_add_tail(&amp;bp-&gt;list_overhead,&amp;sp-&gt;queued_list);</div><div class='add'>+	bp-&gt;state = pvr2_buffer_state_queued;</div><div class='add'>+	(sp-&gt;q_count)++;</div><div class='add'>+	sp-&gt;q_bcount += bp-&gt;max_count;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/"</div><div class='add'>+		   " bufferPool     %8s inc cap=%07d cnt=%02d",</div><div class='add'>+		   pvr2_buffer_state_decode(bp-&gt;state),</div><div class='add'>+		   sp-&gt;q_bcount,sp-&gt;q_count);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_buffer_wipe(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;state == pvr2_buffer_state_queued) {</div><div class='add'>+		usb_kill_urb(bp-&gt;purb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_buffer_init(struct pvr2_buffer *bp,</div><div class='add'>+			    struct pvr2_stream *sp,</div><div class='add'>+			    unsigned int id)</div><div class='add'>+{</div><div class='add'>+	memset(bp,0,sizeof(*bp));</div><div class='add'>+	bp-&gt;signature = BUFFER_SIG;</div><div class='add'>+	bp-&gt;id = id;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_POOL,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ bufferInit     %p stream=%p",bp,sp);</div><div class='add'>+	bp-&gt;stream = sp;</div><div class='add'>+	bp-&gt;state = pvr2_buffer_state_none;</div><div class='add'>+	INIT_LIST_HEAD(&amp;bp-&gt;list_overhead);</div><div class='add'>+	bp-&gt;purb = usb_alloc_urb(0,GFP_KERNEL);</div><div class='add'>+	if (! bp-&gt;purb) return -ENOMEM;</div><div class='add'>+#ifdef SANITY_CHECK_BUFFERS</div><div class='add'>+	pvr2_buffer_describe(bp,"create");</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_buffer_done(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+#ifdef SANITY_CHECK_BUFFERS</div><div class='add'>+	pvr2_buffer_describe(bp,"delete");</div><div class='add'>+#endif</div><div class='add'>+	pvr2_buffer_wipe(bp);</div><div class='add'>+	pvr2_buffer_set_none(bp);</div><div class='add'>+	bp-&gt;signature = 0;</div><div class='add'>+	bp-&gt;stream = NULL;</div><div class='add'>+	if (bp-&gt;purb) usb_free_urb(bp-&gt;purb);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"</div><div class='add'>+		   " bufferDone     %p",bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_stream_buffer_count(struct pvr2_stream *sp,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int scnt;</div><div class='add'>+</div><div class='add'>+	/* Allocate buffers pointer array in multiples of 32 entries */</div><div class='add'>+	if (cnt == sp-&gt;buffer_total_count) return 0;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_POOL,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ poolResize    "</div><div class='add'>+		   " stream=%p cur=%d adj=%+d",</div><div class='add'>+		   sp,</div><div class='add'>+		   sp-&gt;buffer_total_count,</div><div class='add'>+		   cnt-sp-&gt;buffer_total_count);</div><div class='add'>+</div><div class='add'>+	scnt = cnt &amp; ~0x1f;</div><div class='add'>+	if (cnt &gt; scnt) scnt += 0x20;</div><div class='add'>+</div><div class='add'>+	if (cnt &gt; sp-&gt;buffer_total_count) {</div><div class='add'>+		if (scnt &gt; sp-&gt;buffer_slot_count) {</div><div class='add'>+			struct pvr2_buffer **nb;</div><div class='add'>+			nb = kmalloc(scnt * sizeof(*nb),GFP_KERNEL);</div><div class='add'>+			if (!nb) return -ENOMEM;</div><div class='add'>+			if (sp-&gt;buffer_slot_count) {</div><div class='add'>+				memcpy(nb,sp-&gt;buffers,</div><div class='add'>+				       sp-&gt;buffer_slot_count * sizeof(*nb));</div><div class='add'>+				kfree(sp-&gt;buffers);</div><div class='add'>+			}</div><div class='add'>+			sp-&gt;buffers = nb;</div><div class='add'>+			sp-&gt;buffer_slot_count = scnt;</div><div class='add'>+		}</div><div class='add'>+		while (sp-&gt;buffer_total_count &lt; cnt) {</div><div class='add'>+			struct pvr2_buffer *bp;</div><div class='add'>+			bp = kmalloc(sizeof(*bp),GFP_KERNEL);</div><div class='add'>+			if (!bp) return -ENOMEM;</div><div class='add'>+			ret = pvr2_buffer_init(bp,sp,sp-&gt;buffer_total_count);</div><div class='add'>+			if (ret) {</div><div class='add'>+				kfree(bp);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+			sp-&gt;buffers[sp-&gt;buffer_total_count] = bp;</div><div class='add'>+			(sp-&gt;buffer_total_count)++;</div><div class='add'>+			pvr2_buffer_set_idle(bp);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		while (sp-&gt;buffer_total_count &gt; cnt) {</div><div class='add'>+			struct pvr2_buffer *bp;</div><div class='add'>+			bp = sp-&gt;buffers[sp-&gt;buffer_total_count - 1];</div><div class='add'>+			/* Paranoia */</div><div class='add'>+			sp-&gt;buffers[sp-&gt;buffer_total_count - 1] = NULL;</div><div class='add'>+			(sp-&gt;buffer_total_count)--;</div><div class='add'>+			pvr2_buffer_done(bp);</div><div class='add'>+			kfree(bp);</div><div class='add'>+		}</div><div class='add'>+		if (scnt &lt; sp-&gt;buffer_slot_count) {</div><div class='add'>+			struct pvr2_buffer **nb = NULL;</div><div class='add'>+			if (scnt) {</div><div class='add'>+				nb = kmalloc(scnt * sizeof(*nb),GFP_KERNEL);</div><div class='add'>+				if (!nb) return -ENOMEM;</div><div class='add'>+				memcpy(nb,sp-&gt;buffers,scnt * sizeof(*nb));</div><div class='add'>+			}</div><div class='add'>+			kfree(sp-&gt;buffers);</div><div class='add'>+			sp-&gt;buffers = nb;</div><div class='add'>+			sp-&gt;buffer_slot_count = scnt;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_stream_achieve_buffer_count(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_buffer *bp;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;buffer_total_count == sp-&gt;buffer_target_count) return 0;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_POOL,</div><div class='add'>+		   "/*---TRACE_FLOW---*/"</div><div class='add'>+		   " poolCheck      stream=%p cur=%d tgt=%d",</div><div class='add'>+		   sp,sp-&gt;buffer_total_count,sp-&gt;buffer_target_count);</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;buffer_total_count &lt; sp-&gt;buffer_target_count) {</div><div class='add'>+		return pvr2_stream_buffer_count(sp,sp-&gt;buffer_target_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cnt = 0;</div><div class='add'>+	while ((sp-&gt;buffer_total_count - cnt) &gt; sp-&gt;buffer_target_count) {</div><div class='add'>+		bp = sp-&gt;buffers[sp-&gt;buffer_total_count - (cnt + 1)];</div><div class='add'>+		if (bp-&gt;state != pvr2_buffer_state_idle) break;</div><div class='add'>+		cnt++;</div><div class='add'>+	}</div><div class='add'>+	if (cnt) {</div><div class='add'>+		pvr2_stream_buffer_count(sp,sp-&gt;buffer_total_count - cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_stream_internal_flush(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	struct list_head *lp;</div><div class='add'>+	struct pvr2_buffer *bp1;</div><div class='add'>+	while ((lp = sp-&gt;queued_list.next) != &amp;sp-&gt;queued_list) {</div><div class='add'>+		bp1 = list_entry(lp,struct pvr2_buffer,list_overhead);</div><div class='add'>+		pvr2_buffer_wipe(bp1);</div><div class='add'>+		/* At this point, we should be guaranteed that no</div><div class='add'>+		   completion callback may happen on this buffer.  But it's</div><div class='add'>+		   possible that it might have completed after we noticed</div><div class='add'>+		   it but before we wiped it.  So double check its status</div><div class='add'>+		   here first. */</div><div class='add'>+		if (bp1-&gt;state != pvr2_buffer_state_queued) continue;</div><div class='add'>+		pvr2_buffer_set_idle(bp1);</div><div class='add'>+	}</div><div class='add'>+	if (sp-&gt;buffer_total_count != sp-&gt;buffer_target_count) {</div><div class='add'>+		pvr2_stream_achieve_buffer_count(sp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_stream_init(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;sp-&gt;list_lock);</div><div class='add'>+	mutex_init(&amp;sp-&gt;mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sp-&gt;queued_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sp-&gt;ready_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;sp-&gt;idle_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_stream_done(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		pvr2_stream_internal_flush(sp);</div><div class='add'>+		pvr2_stream_buffer_count(sp,0);</div><div class='add'>+	} while (0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void buffer_complete(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_buffer *bp = urb-&gt;context;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	BUFFER_CHECK(bp);</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	bp-&gt;used_count = 0;</div><div class='add'>+	bp-&gt;status = 0;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+		   "/*---TRACE_FLOW---*/ bufferComplete %p stat=%d cnt=%d",</div><div class='add'>+		   bp,urb-&gt;status,urb-&gt;actual_length);</div><div class='add'>+	spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	if ((!(urb-&gt;status)) ||</div><div class='add'>+	    (urb-&gt;status == -ENOENT) ||</div><div class='add'>+	    (urb-&gt;status == -ECONNRESET) ||</div><div class='add'>+	    (urb-&gt;status == -ESHUTDOWN)) {</div><div class='add'>+		bp-&gt;used_count = urb-&gt;actual_length;</div><div class='add'>+		if (sp-&gt;fail_count) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_TOLERANCE,</div><div class='add'>+				   "stream %p transfer ok"</div><div class='add'>+				   " - fail count reset",sp);</div><div class='add'>+			sp-&gt;fail_count = 0;</div><div class='add'>+		}</div><div class='add'>+	} else if (sp-&gt;fail_count &lt; sp-&gt;fail_tolerance) {</div><div class='add'>+		// We can tolerate this error, because we're below the</div><div class='add'>+		// threshold...</div><div class='add'>+		(sp-&gt;fail_count)++;</div><div class='add'>+		pvr2_trace(PVR2_TRACE_TOLERANCE,</div><div class='add'>+			   "stream %p ignoring error %d"</div><div class='add'>+			   " - fail count increased to %u",</div><div class='add'>+			   sp,urb-&gt;status,sp-&gt;fail_count);</div><div class='add'>+	} else {</div><div class='add'>+		bp-&gt;status = urb-&gt;status;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	pvr2_buffer_set_ready(bp);</div><div class='add'>+	if (sp &amp;&amp; sp-&gt;callback_func) {</div><div class='add'>+		sp-&gt;callback_func(sp-&gt;callback_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_stream *pvr2_stream_create(void)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	sp = kmalloc(sizeof(*sp),GFP_KERNEL);</div><div class='add'>+	if (!sp) return sp;</div><div class='add'>+	memset(sp,0,sizeof(*sp));</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_stream_create: sp=%p",sp);</div><div class='add'>+	pvr2_stream_init(sp);</div><div class='add'>+	return sp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_stream_destroy(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	if (!sp) return;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr2_stream_destroy: sp=%p",sp);</div><div class='add'>+	pvr2_stream_done(sp);</div><div class='add'>+	kfree(sp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_stream_setup(struct pvr2_stream *sp,</div><div class='add'>+		       struct usb_device *dev,</div><div class='add'>+		       int endpoint,</div><div class='add'>+		       unsigned int tolerance)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		pvr2_stream_internal_flush(sp);</div><div class='add'>+		sp-&gt;dev = dev;</div><div class='add'>+		sp-&gt;endpoint = endpoint;</div><div class='add'>+		sp-&gt;fail_tolerance = tolerance;</div><div class='add'>+	} while(0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_stream_set_callback(struct pvr2_stream *sp,</div><div class='add'>+			      pvr2_stream_callback func,</div><div class='add'>+			      void *data)</div><div class='add'>+{</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+		sp-&gt;callback_data = data;</div><div class='add'>+		sp-&gt;callback_func = func;</div><div class='add'>+		spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	} while(0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Query / set the nominal buffer count */</div><div class='add'>+</div><div class='add'>+int pvr2_stream_set_buffer_count(struct pvr2_stream *sp,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	if (sp-&gt;buffer_target_count == cnt) return 0;</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		sp-&gt;buffer_target_count = cnt;</div><div class='add'>+		ret = pvr2_stream_achieve_buffer_count(sp);</div><div class='add'>+	} while(0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_buffer *pvr2_stream_get_idle_buffer(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	struct list_head *lp = sp-&gt;idle_list.next;</div><div class='add'>+	if (lp == &amp;sp-&gt;idle_list) return NULL;</div><div class='add'>+	return list_entry(lp,struct pvr2_buffer,list_overhead);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_buffer *pvr2_stream_get_ready_buffer(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	struct list_head *lp = sp-&gt;ready_list.next;</div><div class='add'>+	if (lp == &amp;sp-&gt;ready_list) return NULL;</div><div class='add'>+	return list_entry(lp,struct pvr2_buffer,list_overhead);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id)</div><div class='add'>+{</div><div class='add'>+	if (id &lt; 0) return NULL;</div><div class='add'>+	if (id &gt;= sp-&gt;buffer_total_count) return NULL;</div><div class='add'>+	return sp-&gt;buffers[id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_stream_get_ready_count(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	return sp-&gt;r_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_stream_kill(struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_buffer *bp;</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		pvr2_stream_internal_flush(sp);</div><div class='add'>+		while ((bp = pvr2_stream_get_ready_buffer(sp)) != 0) {</div><div class='add'>+			pvr2_buffer_set_idle(bp);</div><div class='add'>+		}</div><div class='add'>+		if (sp-&gt;buffer_total_count != sp-&gt;buffer_target_count) {</div><div class='add'>+			pvr2_stream_achieve_buffer_count(sp);</div><div class='add'>+		}</div><div class='add'>+	} while(0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_buffer_queue(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+#undef SEED_BUFFER</div><div class='add'>+#ifdef SEED_BUFFER</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	unsigned int val;</div><div class='add'>+#endif</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	if (!bp) return -EINVAL;</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		pvr2_buffer_wipe(bp);</div><div class='add'>+		if (!sp-&gt;dev) {</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		pvr2_buffer_set_queued(bp);</div><div class='add'>+#ifdef SEED_BUFFER</div><div class='add'>+		for (idx = 0; idx &lt; (bp-&gt;max_count) / 4; idx++) {</div><div class='add'>+			val = bp-&gt;id &lt;&lt; 24;</div><div class='add'>+			val |= idx;</div><div class='add'>+			((unsigned int *)(bp-&gt;ptr))[idx] = val;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		bp-&gt;status = -EINPROGRESS;</div><div class='add'>+		usb_fill_bulk_urb(bp-&gt;purb,      // struct urb *urb</div><div class='add'>+				  sp-&gt;dev,       // struct usb_device *dev</div><div class='add'>+				  // endpoint (below)</div><div class='add'>+				  usb_rcvbulkpipe(sp-&gt;dev,sp-&gt;endpoint),</div><div class='add'>+				  bp-&gt;ptr,       // void *transfer_buffer</div><div class='add'>+				  bp-&gt;max_count, // int buffer_length</div><div class='add'>+				  buffer_complete,</div><div class='add'>+				  bp);</div><div class='add'>+		usb_submit_urb(bp-&gt;purb,GFP_KERNEL);</div><div class='add'>+	} while(0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_buffer_set_buffer(struct pvr2_buffer *bp,void *ptr,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	if (!bp) return -EINVAL;</div><div class='add'>+	sp = bp-&gt;stream;</div><div class='add'>+	mutex_lock(&amp;sp-&gt;mutex); do {</div><div class='add'>+		spin_lock_irqsave(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+		if (bp-&gt;state != pvr2_buffer_state_idle) {</div><div class='add'>+			ret = -EPERM;</div><div class='add'>+		} else {</div><div class='add'>+			bp-&gt;ptr = ptr;</div><div class='add'>+			bp-&gt;stream-&gt;i_bcount -= bp-&gt;max_count;</div><div class='add'>+			bp-&gt;max_count = cnt;</div><div class='add'>+			bp-&gt;stream-&gt;i_bcount += bp-&gt;max_count;</div><div class='add'>+			pvr2_trace(PVR2_TRACE_BUF_FLOW,</div><div class='add'>+				   "/*---TRACE_FLOW---*/ bufferPool    "</div><div class='add'>+				   " %8s cap cap=%07d cnt=%02d",</div><div class='add'>+				   pvr2_buffer_state_decode(</div><div class='add'>+					   pvr2_buffer_state_idle),</div><div class='add'>+				   bp-&gt;stream-&gt;i_bcount,bp-&gt;stream-&gt;i_count);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;sp-&gt;list_lock,irq_flags);</div><div class='add'>+	} while(0); mutex_unlock(&amp;sp-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int pvr2_buffer_get_count(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	return bp-&gt;used_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_buffer_get_status(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	return bp-&gt;status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_buffer_get_id(struct pvr2_buffer *bp)</div><div class='add'>+{</div><div class='add'>+	return bp-&gt;id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.h b/drivers/media/video/pvrusb2/pvrusb2-io.h<br/>new file mode 100644<br/>index 000000000000..96285ad234a6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-io.h</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_IO_H</div><div class='add'>+#define __PVRUSB2_IO_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+typedef void (*pvr2_stream_callback)(void *);</div><div class='add'>+</div><div class='add'>+enum pvr2_buffer_state {</div><div class='add'>+	pvr2_buffer_state_none = 0,   // Not on any list</div><div class='add'>+	pvr2_buffer_state_idle = 1,   // Buffer is ready to be used again</div><div class='add'>+	pvr2_buffer_state_queued = 2, // Buffer has been queued for filling</div><div class='add'>+	pvr2_buffer_state_ready = 3,  // Buffer has data available</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_stream;</div><div class='add'>+struct pvr2_buffer;</div><div class='add'>+</div><div class='add'>+/* Initialize / tear down stream structure */</div><div class='add'>+struct pvr2_stream *pvr2_stream_create(void);</div><div class='add'>+void pvr2_stream_destroy(struct pvr2_stream *);</div><div class='add'>+void pvr2_stream_setup(struct pvr2_stream *,</div><div class='add'>+		       struct usb_device *dev,int endpoint,</div><div class='add'>+		       unsigned int tolerance);</div><div class='add'>+void pvr2_stream_set_callback(struct pvr2_stream *,</div><div class='add'>+			      pvr2_stream_callback func,</div><div class='add'>+			      void *data);</div><div class='add'>+</div><div class='add'>+/* Query / set the nominal buffer count */</div><div class='add'>+int pvr2_stream_set_buffer_count(struct pvr2_stream *,unsigned int);</div><div class='add'>+</div><div class='add'>+/* Get a pointer to a buffer that is either idle, ready, or is specified</div><div class='add'>+   named. */</div><div class='add'>+struct pvr2_buffer *pvr2_stream_get_idle_buffer(struct pvr2_stream *);</div><div class='add'>+struct pvr2_buffer *pvr2_stream_get_ready_buffer(struct pvr2_stream *);</div><div class='add'>+struct pvr2_buffer *pvr2_stream_get_buffer(struct pvr2_stream *sp,int id);</div><div class='add'>+</div><div class='add'>+/* Find out how many buffers are idle or ready */</div><div class='add'>+int pvr2_stream_get_ready_count(struct pvr2_stream *);</div><div class='add'>+</div><div class='add'>+/* Kill all pending buffers and throw away any ready buffers as well */</div><div class='add'>+void pvr2_stream_kill(struct pvr2_stream *);</div><div class='add'>+</div><div class='add'>+/* Set up the actual storage for a buffer */</div><div class='add'>+int pvr2_buffer_set_buffer(struct pvr2_buffer *,void *ptr,unsigned int cnt);</div><div class='add'>+</div><div class='add'>+/* Find out size of data in the given ready buffer */</div><div class='add'>+unsigned int pvr2_buffer_get_count(struct pvr2_buffer *);</div><div class='add'>+</div><div class='add'>+/* Retrieve completion code for given ready buffer */</div><div class='add'>+int pvr2_buffer_get_status(struct pvr2_buffer *);</div><div class='add'>+</div><div class='add'>+/* Retrieve ID of given buffer */</div><div class='add'>+int pvr2_buffer_get_id(struct pvr2_buffer *);</div><div class='add'>+</div><div class='add'>+/* Start reading into given buffer (kill it if needed) */</div><div class='add'>+int pvr2_buffer_queue(struct pvr2_buffer *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_IO_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c<br/>new file mode 100644<br/>index 000000000000..f7a2e225a002<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ioread.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-ioread.c</a></div><div class='hunk'>@@ -0,0 +1,509 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-ioread.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#define BUFFER_COUNT 32</div><div class='add'>+#define BUFFER_SIZE PAGE_ALIGN(0x4000)</div><div class='add'>+</div><div class='add'>+struct pvr2_ioread {</div><div class='add'>+	struct pvr2_stream *stream;</div><div class='add'>+	char *buffer_storage[BUFFER_COUNT];</div><div class='add'>+	char *sync_key_ptr;</div><div class='add'>+	unsigned int sync_key_len;</div><div class='add'>+	unsigned int sync_buf_offs;</div><div class='add'>+	unsigned int sync_state;</div><div class='add'>+	unsigned int sync_trashed_count;</div><div class='add'>+	int enabled;         // Streaming is on</div><div class='add'>+	int spigot_open;     // OK to pass data to client</div><div class='add'>+	int stream_running;  // Passing data to client now</div><div class='add'>+</div><div class='add'>+	/* State relevant to current buffer being read */</div><div class='add'>+	struct pvr2_buffer *c_buf;</div><div class='add'>+	char *c_data_ptr;</div><div class='add'>+	unsigned int c_data_len;</div><div class='add'>+	unsigned int c_data_offs;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pvr2_ioread_init(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	cp-&gt;stream = NULL;</div><div class='add'>+	mutex_init(&amp;cp-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; BUFFER_COUNT; idx++) {</div><div class='add'>+		cp-&gt;buffer_storage[idx] = kmalloc(BUFFER_SIZE,GFP_KERNEL);</div><div class='add'>+		if (!(cp-&gt;buffer_storage[idx])) break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (idx &lt; BUFFER_COUNT) {</div><div class='add'>+		// An allocation appears to have failed</div><div class='add'>+		for (idx = 0; idx &lt; BUFFER_COUNT; idx++) {</div><div class='add'>+			if (!(cp-&gt;buffer_storage[idx])) continue;</div><div class='add'>+			kfree(cp-&gt;buffer_storage[idx]);</div><div class='add'>+		}</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_ioread_done(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	pvr2_ioread_setup(cp,NULL);</div><div class='add'>+	for (idx = 0; idx &lt; BUFFER_COUNT; idx++) {</div><div class='add'>+		if (!(cp-&gt;buffer_storage[idx])) continue;</div><div class='add'>+		kfree(cp-&gt;buffer_storage[idx]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_ioread *pvr2_ioread_create(void)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ioread *cp;</div><div class='add'>+	cp = kmalloc(sizeof(*cp),GFP_KERNEL);</div><div class='add'>+	if (!cp) return NULL;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_create id=%p",cp);</div><div class='add'>+	memset(cp,0,sizeof(*cp));</div><div class='add'>+	if (pvr2_ioread_init(cp) &lt; 0) {</div><div class='add'>+		kfree(cp);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return cp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_ioread_destroy(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	if (!cp) return;</div><div class='add'>+	pvr2_ioread_done(cp);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"pvr2_ioread_destroy id=%p",cp);</div><div class='add'>+	if (cp-&gt;sync_key_ptr) {</div><div class='add'>+		kfree(cp-&gt;sync_key_ptr);</div><div class='add'>+		cp-&gt;sync_key_ptr = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(cp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pvr2_ioread_set_sync_key(struct pvr2_ioread *cp,</div><div class='add'>+			      const char *sync_key_ptr,</div><div class='add'>+			      unsigned int sync_key_len)</div><div class='add'>+{</div><div class='add'>+	if (!cp) return;</div><div class='add'>+</div><div class='add'>+	if (!sync_key_ptr) sync_key_len = 0;</div><div class='add'>+	if ((sync_key_len == cp-&gt;sync_key_len) &amp;&amp;</div><div class='add'>+	    ((!sync_key_len) ||</div><div class='add'>+	     (!memcmp(sync_key_ptr,cp-&gt;sync_key_ptr,sync_key_len)))) return;</div><div class='add'>+</div><div class='add'>+	if (sync_key_len != cp-&gt;sync_key_len) {</div><div class='add'>+		if (cp-&gt;sync_key_ptr) {</div><div class='add'>+			kfree(cp-&gt;sync_key_ptr);</div><div class='add'>+			cp-&gt;sync_key_ptr = NULL;</div><div class='add'>+		}</div><div class='add'>+		cp-&gt;sync_key_len = 0;</div><div class='add'>+		if (sync_key_len) {</div><div class='add'>+			cp-&gt;sync_key_ptr = kmalloc(sync_key_len,GFP_KERNEL);</div><div class='add'>+			if (cp-&gt;sync_key_ptr) {</div><div class='add'>+				cp-&gt;sync_key_len = sync_key_len;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!cp-&gt;sync_key_len) return;</div><div class='add'>+	memcpy(cp-&gt;sync_key_ptr,sync_key_ptr,cp-&gt;sync_key_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_ioread_stop(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	if (!(cp-&gt;enabled)) return;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_START_STOP,</div><div class='add'>+		   "/*---TRACE_READ---*/ pvr2_ioread_stop id=%p",cp);</div><div class='add'>+	pvr2_stream_kill(cp-&gt;stream);</div><div class='add'>+	cp-&gt;c_buf = NULL;</div><div class='add'>+	cp-&gt;c_data_ptr = NULL;</div><div class='add'>+	cp-&gt;c_data_len = 0;</div><div class='add'>+	cp-&gt;c_data_offs = 0;</div><div class='add'>+	cp-&gt;enabled = 0;</div><div class='add'>+	cp-&gt;stream_running = 0;</div><div class='add'>+	cp-&gt;spigot_open = 0;</div><div class='add'>+	if (cp-&gt;sync_state) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+			   "/*---TRACE_READ---*/ sync_state &lt;== 0");</div><div class='add'>+		cp-&gt;sync_state = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_ioread_start(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	int stat;</div><div class='add'>+	struct pvr2_buffer *bp;</div><div class='add'>+	if (cp-&gt;enabled) return 0;</div><div class='add'>+	if (!(cp-&gt;stream)) return 0;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_START_STOP,</div><div class='add'>+		   "/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp);</div><div class='add'>+	while ((bp = pvr2_stream_get_idle_buffer(cp-&gt;stream)) != 0) {</div><div class='add'>+		stat = pvr2_buffer_queue(bp);</div><div class='add'>+		if (stat &lt; 0) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+				   "/*---TRACE_READ---*/"</div><div class='add'>+				   " pvr2_ioread_start id=%p"</div><div class='add'>+				   " error=%d",</div><div class='add'>+				   cp,stat);</div><div class='add'>+			pvr2_ioread_stop(cp);</div><div class='add'>+			return stat;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cp-&gt;enabled = !0;</div><div class='add'>+	cp-&gt;c_buf = NULL;</div><div class='add'>+	cp-&gt;c_data_ptr = NULL;</div><div class='add'>+	cp-&gt;c_data_len = 0;</div><div class='add'>+	cp-&gt;c_data_offs = 0;</div><div class='add'>+	cp-&gt;stream_running = 0;</div><div class='add'>+	if (cp-&gt;sync_key_len) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+			   "/*---TRACE_READ---*/ sync_state &lt;== 1");</div><div class='add'>+		cp-&gt;sync_state = 1;</div><div class='add'>+		cp-&gt;sync_trashed_count = 0;</div><div class='add'>+		cp-&gt;sync_buf_offs = 0;</div><div class='add'>+	}</div><div class='add'>+	cp-&gt;spigot_open = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_stream *pvr2_ioread_get_stream(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	return cp-&gt;stream;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_ioread_setup(struct pvr2_ioread *cp,struct pvr2_stream *sp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	struct pvr2_buffer *bp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cp-&gt;mutex); do {</div><div class='add'>+		if (cp-&gt;stream) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_START_STOP,</div><div class='add'>+				   "/*---TRACE_READ---*/"</div><div class='add'>+				   " pvr2_ioread_setup (tear-down) id=%p",cp);</div><div class='add'>+			pvr2_ioread_stop(cp);</div><div class='add'>+			pvr2_stream_kill(cp-&gt;stream);</div><div class='add'>+			pvr2_stream_set_buffer_count(cp-&gt;stream,0);</div><div class='add'>+			cp-&gt;stream = NULL;</div><div class='add'>+		}</div><div class='add'>+		if (sp) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_START_STOP,</div><div class='add'>+				   "/*---TRACE_READ---*/"</div><div class='add'>+				   " pvr2_ioread_setup (setup) id=%p",cp);</div><div class='add'>+			pvr2_stream_kill(sp);</div><div class='add'>+			ret = pvr2_stream_set_buffer_count(sp,BUFFER_COUNT);</div><div class='add'>+			if (ret &lt; 0) return ret;</div><div class='add'>+			for (idx = 0; idx &lt; BUFFER_COUNT; idx++) {</div><div class='add'>+				bp = pvr2_stream_get_buffer(sp,idx);</div><div class='add'>+				pvr2_buffer_set_buffer(bp,</div><div class='add'>+						       cp-&gt;buffer_storage[idx],</div><div class='add'>+						       BUFFER_SIZE);</div><div class='add'>+			}</div><div class='add'>+			cp-&gt;stream = sp;</div><div class='add'>+		}</div><div class='add'>+	} while (0); mutex_unlock(&amp;cp-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_ioread_set_enabled(struct pvr2_ioread *cp,int fl)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	if ((!fl) == (!(cp-&gt;enabled))) return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cp-&gt;mutex); do {</div><div class='add'>+		if (fl) {</div><div class='add'>+			ret = pvr2_ioread_start(cp);</div><div class='add'>+		} else {</div><div class='add'>+			pvr2_ioread_stop(cp);</div><div class='add'>+		}</div><div class='add'>+	} while (0); mutex_unlock(&amp;cp-&gt;mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_ioread_get_buffer(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	int stat;</div><div class='add'>+</div><div class='add'>+	while (cp-&gt;c_data_len &lt;= cp-&gt;c_data_offs) {</div><div class='add'>+		if (cp-&gt;c_buf) {</div><div class='add'>+			// Flush out current buffer first.</div><div class='add'>+			stat = pvr2_buffer_queue(cp-&gt;c_buf);</div><div class='add'>+			if (stat &lt; 0) {</div><div class='add'>+				// Streaming error...</div><div class='add'>+				pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+					   "/*---TRACE_READ---*/"</div><div class='add'>+					   " pvr2_ioread_read id=%p"</div><div class='add'>+					   " queue_error=%d",</div><div class='add'>+					   cp,stat);</div><div class='add'>+				pvr2_ioread_stop(cp);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			cp-&gt;c_buf = NULL;</div><div class='add'>+			cp-&gt;c_data_ptr = NULL;</div><div class='add'>+			cp-&gt;c_data_len = 0;</div><div class='add'>+			cp-&gt;c_data_offs = 0;</div><div class='add'>+		}</div><div class='add'>+		// Now get a freshly filled buffer.</div><div class='add'>+		cp-&gt;c_buf = pvr2_stream_get_ready_buffer(cp-&gt;stream);</div><div class='add'>+		if (!cp-&gt;c_buf) break; // Nothing ready; done.</div><div class='add'>+		cp-&gt;c_data_len = pvr2_buffer_get_count(cp-&gt;c_buf);</div><div class='add'>+		if (!cp-&gt;c_data_len) {</div><div class='add'>+			// Nothing transferred.  Was there an error?</div><div class='add'>+			stat = pvr2_buffer_get_status(cp-&gt;c_buf);</div><div class='add'>+			if (stat &lt; 0) {</div><div class='add'>+				// Streaming error...</div><div class='add'>+				pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+					   "/*---TRACE_READ---*/"</div><div class='add'>+					   " pvr2_ioread_read id=%p"</div><div class='add'>+					   " buffer_error=%d",</div><div class='add'>+					   cp,stat);</div><div class='add'>+				pvr2_ioread_stop(cp);</div><div class='add'>+				// Give up.</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			// Start over...</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		cp-&gt;c_data_offs = 0;</div><div class='add'>+		cp-&gt;c_data_ptr = cp-&gt;buffer_storage[</div><div class='add'>+			pvr2_buffer_get_id(cp-&gt;c_buf)];</div><div class='add'>+	}</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pvr2_ioread_filter(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	if (!cp-&gt;enabled) return;</div><div class='add'>+	if (cp-&gt;sync_state != 1) return;</div><div class='add'>+</div><div class='add'>+	// Search the stream for our synchronization key.  This is made</div><div class='add'>+	// complicated by the fact that in order to be honest with</div><div class='add'>+	// ourselves here we must search across buffer boundaries...</div><div class='add'>+	mutex_lock(&amp;cp-&gt;mutex); while (1) {</div><div class='add'>+		// Ensure we have a buffer</div><div class='add'>+		if (!pvr2_ioread_get_buffer(cp)) break;</div><div class='add'>+		if (!cp-&gt;c_data_len) break;</div><div class='add'>+</div><div class='add'>+		// Now walk the buffer contents until we match the key or</div><div class='add'>+		// run out of buffer data.</div><div class='add'>+		for (idx = cp-&gt;c_data_offs; idx &lt; cp-&gt;c_data_len; idx++) {</div><div class='add'>+			if (cp-&gt;sync_buf_offs &gt;= cp-&gt;sync_key_len) break;</div><div class='add'>+			if (cp-&gt;c_data_ptr[idx] ==</div><div class='add'>+			    cp-&gt;sync_key_ptr[cp-&gt;sync_buf_offs]) {</div><div class='add'>+				// Found the next key byte</div><div class='add'>+				(cp-&gt;sync_buf_offs)++;</div><div class='add'>+			} else {</div><div class='add'>+				// Whoops, mismatched.  Start key over...</div><div class='add'>+				cp-&gt;sync_buf_offs = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Consume what we've walked through</div><div class='add'>+		cp-&gt;c_data_offs += idx;</div><div class='add'>+		cp-&gt;sync_trashed_count += idx;</div><div class='add'>+</div><div class='add'>+		// If we've found the key, then update state and get out.</div><div class='add'>+		if (cp-&gt;sync_buf_offs &gt;= cp-&gt;sync_key_len) {</div><div class='add'>+			cp-&gt;sync_trashed_count -= cp-&gt;sync_key_len;</div><div class='add'>+			pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+				   "/*---TRACE_READ---*/"</div><div class='add'>+				   " sync_state &lt;== 2 (skipped %u bytes)",</div><div class='add'>+				   cp-&gt;sync_trashed_count);</div><div class='add'>+			cp-&gt;sync_state = 2;</div><div class='add'>+			cp-&gt;sync_buf_offs = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cp-&gt;c_data_offs &lt; cp-&gt;c_data_len) {</div><div class='add'>+			// Sanity check - should NEVER get here</div><div class='add'>+			pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+				   "ERROR: pvr2_ioread filter sync problem"</div><div class='add'>+				   " len=%u offs=%u",</div><div class='add'>+				   cp-&gt;c_data_len,cp-&gt;c_data_offs);</div><div class='add'>+			// Get out so we don't get stuck in an infinite</div><div class='add'>+			// loop.</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		continue; // (for clarity)</div><div class='add'>+	} mutex_unlock(&amp;cp-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_ioread_avail(struct pvr2_ioread *cp)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	if (!(cp-&gt;enabled)) {</div><div class='add'>+		// Stream is not enabled; so this is an I/O error</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;sync_state == 1) {</div><div class='add'>+		pvr2_ioread_filter(cp);</div><div class='add'>+		if (cp-&gt;sync_state == 1) return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (cp-&gt;stream_running) {</div><div class='add'>+		if (!pvr2_stream_get_ready_count(cp-&gt;stream)) {</div><div class='add'>+			// No data available at all right now.</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (pvr2_stream_get_ready_count(cp-&gt;stream) &lt; BUFFER_COUNT/2) {</div><div class='add'>+			// Haven't buffered up enough yet; try again later</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((!(cp-&gt;spigot_open)) != (!(ret == 0))) {</div><div class='add'>+		cp-&gt;spigot_open = (ret == 0);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+			   "/*---TRACE_READ---*/ data is %s",</div><div class='add'>+			   cp-&gt;spigot_open ? "available" : "pending");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pvr2_ioread_read(struct pvr2_ioread *cp,void __user *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	unsigned int copied_cnt;</div><div class='add'>+	unsigned int bcnt;</div><div class='add'>+	const char *src;</div><div class='add'>+	int stat;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	unsigned int req_cnt = cnt;</div><div class='add'>+</div><div class='add'>+	if (!cnt) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_TRAP,</div><div class='add'>+			   "/*---TRACE_READ---*/ pvr2_ioread_read id=%p"</div><div class='add'>+			   " ZERO Request? Returning zero.",cp);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stat = pvr2_ioread_avail(cp);</div><div class='add'>+	if (stat &lt; 0) return stat;</div><div class='add'>+</div><div class='add'>+	cp-&gt;stream_running = !0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cp-&gt;mutex); do {</div><div class='add'>+</div><div class='add'>+		// Suck data out of the buffers and copy to the user</div><div class='add'>+		copied_cnt = 0;</div><div class='add'>+		if (!buf) cnt = 0;</div><div class='add'>+		while (1) {</div><div class='add'>+			if (!pvr2_ioread_get_buffer(cp)) {</div><div class='add'>+				ret = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!cnt) break;</div><div class='add'>+</div><div class='add'>+			if (cp-&gt;sync_state == 2) {</div><div class='add'>+				// We're repeating the sync key data into</div><div class='add'>+				// the stream.</div><div class='add'>+				src = cp-&gt;sync_key_ptr + cp-&gt;sync_buf_offs;</div><div class='add'>+				bcnt = cp-&gt;sync_key_len - cp-&gt;sync_buf_offs;</div><div class='add'>+			} else {</div><div class='add'>+				// Normal buffer copy</div><div class='add'>+				src = cp-&gt;c_data_ptr + cp-&gt;c_data_offs;</div><div class='add'>+				bcnt = cp-&gt;c_data_len - cp-&gt;c_data_offs;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!bcnt) break;</div><div class='add'>+</div><div class='add'>+			// Don't run past user's buffer</div><div class='add'>+			if (bcnt &gt; cnt) bcnt = cnt;</div><div class='add'>+</div><div class='add'>+			if (copy_to_user(buf,src,bcnt)) {</div><div class='add'>+				// User supplied a bad pointer?</div><div class='add'>+				// Give up - this *will* cause data</div><div class='add'>+				// to be lost.</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			cnt -= bcnt;</div><div class='add'>+			buf += bcnt;</div><div class='add'>+			copied_cnt += bcnt;</div><div class='add'>+</div><div class='add'>+			if (cp-&gt;sync_state == 2) {</div><div class='add'>+				// Update offset inside sync key that we're</div><div class='add'>+				// repeating back out.</div><div class='add'>+				cp-&gt;sync_buf_offs += bcnt;</div><div class='add'>+				if (cp-&gt;sync_buf_offs &gt;= cp-&gt;sync_key_len) {</div><div class='add'>+					// Consumed entire key; switch mode</div><div class='add'>+					// to normal.</div><div class='add'>+					pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+						   "/*---TRACE_READ---*/"</div><div class='add'>+						   " sync_state &lt;== 0");</div><div class='add'>+					cp-&gt;sync_state = 0;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				// Update buffer offset.</div><div class='add'>+				cp-&gt;c_data_offs += bcnt;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (0); mutex_unlock(&amp;cp-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		if (copied_cnt) {</div><div class='add'>+			// If anything was copied, return that count</div><div class='add'>+			ret = copied_cnt;</div><div class='add'>+		} else {</div><div class='add'>+			// Nothing copied; suggest to caller that another</div><div class='add'>+			// attempt should be tried again later</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_DATA_FLOW,</div><div class='add'>+		   "/*---TRACE_READ---*/ pvr2_ioread_read"</div><div class='add'>+		   " id=%p request=%d result=%d",</div><div class='add'>+		   cp,req_cnt,ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.h b/drivers/media/video/pvrusb2/pvrusb2-ioread.h<br/>new file mode 100644<br/>index 000000000000..1d362f833588<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-ioread.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-ioread.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_IOREAD_H</div><div class='add'>+#define __PVRUSB2_IOREAD_H</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-io.h"</div><div class='add'>+</div><div class='add'>+struct pvr2_ioread;</div><div class='add'>+</div><div class='add'>+struct pvr2_ioread *pvr2_ioread_create(void);</div><div class='add'>+void pvr2_ioread_destroy(struct pvr2_ioread *);</div><div class='add'>+int pvr2_ioread_setup(struct pvr2_ioread *,struct pvr2_stream *);</div><div class='add'>+struct pvr2_stream *pvr2_ioread_get_stream(struct pvr2_ioread *);</div><div class='add'>+void pvr2_ioread_set_sync_key(struct pvr2_ioread *,</div><div class='add'>+			      const char *sync_key_ptr,</div><div class='add'>+			      unsigned int sync_key_len);</div><div class='add'>+int pvr2_ioread_set_enabled(struct pvr2_ioread *,int fl);</div><div class='add'>+int pvr2_ioread_read(struct pvr2_ioread *,void __user *buf,unsigned int cnt);</div><div class='add'>+int pvr2_ioread_avail(struct pvr2_ioread *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_IOREAD_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c<br/>new file mode 100644<br/>index 000000000000..8f1a5afdd34e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-main.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2-context.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include "pvrusb2-v4l2.h"</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS</div><div class='add'>+#include "pvrusb2-sysfs.h"</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */</div><div class='add'>+</div><div class='add'>+#define DRIVER_AUTHOR "Mike Isely &lt;isely@pobox.com&gt;"</div><div class='add'>+#define DRIVER_DESC "Hauppauge WinTV-PVR-USB2 MPEG2 Encoder/Tuner"</div><div class='add'>+#define DRIVER_VERSION "V4L in-tree version"</div><div class='add'>+</div><div class='add'>+#define DEFAULT_DEBUG_MASK (PVR2_TRACE_ERROR_LEGS| \</div><div class='add'>+			    PVR2_TRACE_INFO| \</div><div class='add'>+			    PVR2_TRACE_TOLERANCE| \</div><div class='add'>+			    PVR2_TRACE_TRAP| \</div><div class='add'>+			    0)</div><div class='add'>+</div><div class='add'>+int pvrusb2_debug = DEFAULT_DEBUG_MASK;</div><div class='add'>+</div><div class='add'>+module_param_named(debug,pvrusb2_debug,int,S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug trace mask");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS</div><div class='add'>+static struct pvr2_sysfs_class *class_ptr = NULL;</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */</div><div class='add'>+</div><div class='add'>+static void pvr_setup_attach(struct pvr2_context *pvr)</div><div class='add'>+{</div><div class='add'>+	/* Create association with v4l layer */</div><div class='add'>+	pvr2_v4l2_create(pvr);</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS</div><div class='add'>+	pvr2_sysfs_create(pvr,class_ptr);</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr_probe(struct usb_interface *intf,</div><div class='add'>+		     const struct usb_device_id *devid)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_context *pvr;</div><div class='add'>+</div><div class='add'>+	/* Create underlying hardware interface */</div><div class='add'>+	pvr = pvr2_context_create(intf,devid,pvr_setup_attach);</div><div class='add'>+	if (!pvr) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "Failed to create hdw handler");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr_probe(pvr=%p)",pvr);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, pvr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pvr_disconnect()</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void pvr_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_context *pvr = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) BEGIN",pvr);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata (intf, NULL);</div><div class='add'>+	pvr2_context_disconnect(pvr);</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) DONE",pvr);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver pvr_driver = {</div><div class='add'>+	.name =         "pvrusb2",</div><div class='add'>+	.id_table =     pvr2_device_table,</div><div class='add'>+	.probe =        pvr_probe,</div><div class='add'>+	.disconnect =   pvr_disconnect</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pvr_init() / pvr_exit()</div><div class='add'>+ *</div><div class='add'>+ * This code is run to initialize/exit the driver.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int __init pvr_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr_init");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS</div><div class='add'>+	class_ptr = pvr2_sysfs_class_create();</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */</div><div class='add'>+</div><div class='add'>+	ret = usb_register(&amp;pvr_driver);</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		info(DRIVER_DESC " : " DRIVER_VERSION);</div><div class='add'>+	if (pvrusb2_debug) info("Debug mask is %d (0x%x)",</div><div class='add'>+				pvrusb2_debug,pvrusb2_debug);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit pvr_exit(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"pvr_exit");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_SYSFS</div><div class='add'>+	pvr2_sysfs_class_destroy(class_ptr);</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */</div><div class='add'>+</div><div class='add'>+	usb_deregister(&amp;pvr_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pvr_init);</div><div class='add'>+module_exit(pvr_exit);</div><div class='add'>+</div><div class='add'>+/* Mike Isely &lt;mcisely@pobox.com&gt; 11-Mar-2006: See pvrusb2-hdw.c for</div><div class='add'>+   MODULE_DEVICE_TABLE().  We have to declare that attribute there</div><div class='add'>+   because that's where the device table actually is now and it seems</div><div class='add'>+   that certain gcc configurations get angry if MODULE_DEVICE_TABLE()</div><div class='add'>+   is used on what ends up being an external symbol. */</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c<br/>new file mode 100644<br/>index 000000000000..f95c598ff627<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-std.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-std.c</a></div><div class='hunk'>@@ -0,0 +1,408 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-std.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;asm/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+struct std_name {</div><div class='add'>+	const char *name;</div><div class='add'>+	v4l2_std_id id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define CSTD_PAL \</div><div class='add'>+	(V4L2_STD_PAL_B| \</div><div class='add'>+	 V4L2_STD_PAL_B1| \</div><div class='add'>+	 V4L2_STD_PAL_G| \</div><div class='add'>+	 V4L2_STD_PAL_H| \</div><div class='add'>+	 V4L2_STD_PAL_I| \</div><div class='add'>+	 V4L2_STD_PAL_D| \</div><div class='add'>+	 V4L2_STD_PAL_D1| \</div><div class='add'>+	 V4L2_STD_PAL_K| \</div><div class='add'>+	 V4L2_STD_PAL_M| \</div><div class='add'>+	 V4L2_STD_PAL_N| \</div><div class='add'>+	 V4L2_STD_PAL_Nc| \</div><div class='add'>+	 V4L2_STD_PAL_60)</div><div class='add'>+</div><div class='add'>+#define CSTD_NTSC \</div><div class='add'>+	(V4L2_STD_NTSC_M| \</div><div class='add'>+	 V4L2_STD_NTSC_M_JP| \</div><div class='add'>+	 V4L2_STD_NTSC_M_KR| \</div><div class='add'>+	 V4L2_STD_NTSC_443)</div><div class='add'>+</div><div class='add'>+#define CSTD_SECAM \</div><div class='add'>+	(V4L2_STD_SECAM_B| \</div><div class='add'>+	 V4L2_STD_SECAM_D| \</div><div class='add'>+	 V4L2_STD_SECAM_G| \</div><div class='add'>+	 V4L2_STD_SECAM_H| \</div><div class='add'>+	 V4L2_STD_SECAM_K| \</div><div class='add'>+	 V4L2_STD_SECAM_K1| \</div><div class='add'>+	 V4L2_STD_SECAM_L| \</div><div class='add'>+	 V4L2_STD_SECAM_LC)</div><div class='add'>+</div><div class='add'>+#define TSTD_B   (V4L2_STD_PAL_B|V4L2_STD_SECAM_B)</div><div class='add'>+#define TSTD_B1  (V4L2_STD_PAL_B1)</div><div class='add'>+#define TSTD_D   (V4L2_STD_PAL_D|V4L2_STD_SECAM_D)</div><div class='add'>+#define TSTD_D1  (V4L2_STD_PAL_D1)</div><div class='add'>+#define TSTD_G   (V4L2_STD_PAL_G|V4L2_STD_SECAM_G)</div><div class='add'>+#define TSTD_H   (V4L2_STD_PAL_H|V4L2_STD_SECAM_H)</div><div class='add'>+#define TSTD_I   (V4L2_STD_PAL_I)</div><div class='add'>+#define TSTD_K   (V4L2_STD_PAL_K|V4L2_STD_SECAM_K)</div><div class='add'>+#define TSTD_K1  (V4L2_STD_SECAM_K1)</div><div class='add'>+#define TSTD_L   (V4L2_STD_SECAM_L)</div><div class='add'>+#define TSTD_M   (V4L2_STD_PAL_M|V4L2_STD_NTSC_M)</div><div class='add'>+#define TSTD_N   (V4L2_STD_PAL_N)</div><div class='add'>+#define TSTD_Nc  (V4L2_STD_PAL_Nc)</div><div class='add'>+#define TSTD_60  (V4L2_STD_PAL_60)</div><div class='add'>+</div><div class='add'>+#define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_SECAM)</div><div class='add'>+</div><div class='add'>+/* Mapping of standard bits to color system */</div><div class='add'>+const static struct std_name std_groups[] = {</div><div class='add'>+	{"PAL",CSTD_PAL},</div><div class='add'>+	{"NTSC",CSTD_NTSC},</div><div class='add'>+	{"SECAM",CSTD_SECAM},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Mapping of standard bits to modulation system */</div><div class='add'>+const static struct std_name std_items[] = {</div><div class='add'>+	{"B",TSTD_B},</div><div class='add'>+	{"B1",TSTD_B1},</div><div class='add'>+	{"D",TSTD_D},</div><div class='add'>+	{"D1",TSTD_D1},</div><div class='add'>+	{"G",TSTD_G},</div><div class='add'>+	{"H",TSTD_H},</div><div class='add'>+	{"I",TSTD_I},</div><div class='add'>+	{"K",TSTD_K},</div><div class='add'>+	{"K1",TSTD_K1},</div><div class='add'>+	{"L",TSTD_L},</div><div class='add'>+	{"LC",V4L2_STD_SECAM_LC},</div><div class='add'>+	{"M",TSTD_M},</div><div class='add'>+	{"Mj",V4L2_STD_NTSC_M_JP},</div><div class='add'>+	{"443",V4L2_STD_NTSC_443},</div><div class='add'>+	{"Mk",V4L2_STD_NTSC_M_KR},</div><div class='add'>+	{"N",TSTD_N},</div><div class='add'>+	{"Nc",TSTD_Nc},</div><div class='add'>+	{"60",TSTD_60},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Search an array of std_name structures and return a pointer to the</div><div class='add'>+// element with the matching name.</div><div class='add'>+static const struct std_name *find_std_name(const struct std_name *arrPtr,</div><div class='add'>+					    unsigned int arrSize,</div><div class='add'>+					    const char *bufPtr,</div><div class='add'>+					    unsigned int bufSize)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	const struct std_name *p;</div><div class='add'>+	for (idx = 0; idx &lt; arrSize; idx++) {</div><div class='add'>+		p = arrPtr + idx;</div><div class='add'>+		if (strlen(p-&gt;name) != bufSize) continue;</div><div class='add'>+		if (!memcmp(bufPtr,p-&gt;name,bufSize)) return p;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,</div><div class='add'>+		       unsigned int bufSize)</div><div class='add'>+{</div><div class='add'>+	v4l2_std_id id = 0;</div><div class='add'>+	v4l2_std_id cmsk = 0;</div><div class='add'>+	v4l2_std_id t;</div><div class='add'>+	int mMode = 0;</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+	char ch;</div><div class='add'>+	const struct std_name *sp;</div><div class='add'>+</div><div class='add'>+	while (bufSize) {</div><div class='add'>+		if (!mMode) {</div><div class='add'>+			cnt = 0;</div><div class='add'>+			while ((cnt &lt; bufSize) &amp;&amp; (bufPtr[cnt] != '-')) cnt++;</div><div class='add'>+			if (cnt &gt;= bufSize) return 0; // No more characters</div><div class='add'>+			sp = find_std_name(</div><div class='add'>+				std_groups,</div><div class='add'>+				sizeof(std_groups)/sizeof(std_groups[0]),</div><div class='add'>+				bufPtr,cnt);</div><div class='add'>+			if (!sp) return 0; // Illegal color system name</div><div class='add'>+			cnt++;</div><div class='add'>+			bufPtr += cnt;</div><div class='add'>+			bufSize -= cnt;</div><div class='add'>+			mMode = !0;</div><div class='add'>+			cmsk = sp-&gt;id;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		cnt = 0;</div><div class='add'>+		while (cnt &lt; bufSize) {</div><div class='add'>+			ch = bufPtr[cnt];</div><div class='add'>+			if (ch == ';') {</div><div class='add'>+				mMode = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (ch == '/') break;</div><div class='add'>+			cnt++;</div><div class='add'>+		}</div><div class='add'>+		sp = find_std_name(std_items,</div><div class='add'>+				   sizeof(std_items)/sizeof(std_items[0]),</div><div class='add'>+				   bufPtr,cnt);</div><div class='add'>+		if (!sp) return 0; // Illegal modulation system ID</div><div class='add'>+		t = sp-&gt;id &amp; cmsk;</div><div class='add'>+		if (!t) return 0; // Specific color + modulation system illegal</div><div class='add'>+		id |= t;</div><div class='add'>+		if (cnt &lt; bufSize) cnt++;</div><div class='add'>+		bufPtr += cnt;</div><div class='add'>+		bufSize -= cnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (idPtr) *idPtr = id;</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+unsigned int pvr2_std_id_to_str(char *bufPtr, unsigned int bufSize,</div><div class='add'>+				v4l2_std_id id)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx1,idx2;</div><div class='add'>+	const struct std_name *ip,*gp;</div><div class='add'>+	int gfl,cfl;</div><div class='add'>+	unsigned int c1,c2;</div><div class='add'>+	cfl = 0;</div><div class='add'>+	c1 = 0;</div><div class='add'>+	for (idx1 = 0;</div><div class='add'>+	     idx1 &lt; sizeof(std_groups)/sizeof(std_groups[0]);</div><div class='add'>+	     idx1++) {</div><div class='add'>+		gp = std_groups + idx1;</div><div class='add'>+		gfl = 0;</div><div class='add'>+		for (idx2 = 0;</div><div class='add'>+		     idx2 &lt; sizeof(std_items)/sizeof(std_items[0]);</div><div class='add'>+		     idx2++) {</div><div class='add'>+			ip = std_items + idx2;</div><div class='add'>+			if (!(gp-&gt;id &amp; ip-&gt;id &amp; id)) continue;</div><div class='add'>+			if (!gfl) {</div><div class='add'>+				if (cfl) {</div><div class='add'>+					c2 = scnprintf(bufPtr,bufSize,";");</div><div class='add'>+					c1 += c2;</div><div class='add'>+					bufSize -= c2;</div><div class='add'>+					bufPtr += c2;</div><div class='add'>+				}</div><div class='add'>+				cfl = !0;</div><div class='add'>+				c2 = scnprintf(bufPtr,bufSize,</div><div class='add'>+					       "%s-",gp-&gt;name);</div><div class='add'>+				gfl = !0;</div><div class='add'>+			} else {</div><div class='add'>+				c2 = scnprintf(bufPtr,bufSize,"/");</div><div class='add'>+			}</div><div class='add'>+			c1 += c2;</div><div class='add'>+			bufSize -= c2;</div><div class='add'>+			bufPtr += c2;</div><div class='add'>+			c2 = scnprintf(bufPtr,bufSize,</div><div class='add'>+				       ip-&gt;name);</div><div class='add'>+			c1 += c2;</div><div class='add'>+			bufSize -= c2;</div><div class='add'>+			bufPtr += c2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return c1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// Template data for possible enumerated video standards.  Here we group</div><div class='add'>+// standards which share common frame rates and resolution.</div><div class='add'>+static struct v4l2_standard generic_standards[] = {</div><div class='add'>+	{</div><div class='add'>+		.id             = (TSTD_B|TSTD_B1|</div><div class='add'>+				   TSTD_D|TSTD_D1|</div><div class='add'>+				   TSTD_G|</div><div class='add'>+				   TSTD_H|</div><div class='add'>+				   TSTD_I|</div><div class='add'>+				   TSTD_K|TSTD_K1|</div><div class='add'>+				   TSTD_L|</div><div class='add'>+				   V4L2_STD_SECAM_LC |</div><div class='add'>+				   TSTD_N|TSTD_Nc),</div><div class='add'>+		.frameperiod    =</div><div class='add'>+		{</div><div class='add'>+			.numerator  = 1,</div><div class='add'>+			.denominator= 25</div><div class='add'>+		},</div><div class='add'>+		.framelines     = 625,</div><div class='add'>+		.reserved       = {0,0,0,0}</div><div class='add'>+	}, {</div><div class='add'>+		.id             = (TSTD_M|</div><div class='add'>+				   V4L2_STD_NTSC_M_JP|</div><div class='add'>+				   V4L2_STD_NTSC_M_KR),</div><div class='add'>+		.frameperiod    =</div><div class='add'>+		{</div><div class='add'>+			.numerator  = 1001,</div><div class='add'>+			.denominator= 30000</div><div class='add'>+		},</div><div class='add'>+		.framelines     = 525,</div><div class='add'>+		.reserved       = {0,0,0,0}</div><div class='add'>+	}, { // This is a total wild guess</div><div class='add'>+		.id             = (TSTD_60),</div><div class='add'>+		.frameperiod    =</div><div class='add'>+		{</div><div class='add'>+			.numerator  = 1001,</div><div class='add'>+			.denominator= 30000</div><div class='add'>+		},</div><div class='add'>+		.framelines     = 525,</div><div class='add'>+		.reserved       = {0,0,0,0}</div><div class='add'>+	}, { // This is total wild guess</div><div class='add'>+		.id             = V4L2_STD_NTSC_443,</div><div class='add'>+		.frameperiod    =</div><div class='add'>+		{</div><div class='add'>+			.numerator  = 1001,</div><div class='add'>+			.denominator= 30000</div><div class='add'>+		},</div><div class='add'>+		.framelines     = 525,</div><div class='add'>+		.reserved       = {0,0,0,0}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define generic_standards_cnt (sizeof(generic_standards)/sizeof(generic_standards[0]))</div><div class='add'>+</div><div class='add'>+static struct v4l2_standard *match_std(v4l2_std_id id)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	for (idx = 0; idx &lt; generic_standards_cnt; idx++) {</div><div class='add'>+		if (generic_standards[idx].id &amp; id) {</div><div class='add'>+			return generic_standards + idx;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_std_fill(struct v4l2_standard *std,v4l2_std_id id)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_standard *template;</div><div class='add'>+	int idx;</div><div class='add'>+	unsigned int bcnt;</div><div class='add'>+	template = match_std(id);</div><div class='add'>+	if (!template) return 0;</div><div class='add'>+	idx = std-&gt;index;</div><div class='add'>+	memcpy(std,template,sizeof(*template));</div><div class='add'>+	std-&gt;index = idx;</div><div class='add'>+	std-&gt;id = id;</div><div class='add'>+	bcnt = pvr2_std_id_to_str(std-&gt;name,sizeof(std-&gt;name)-1,id);</div><div class='add'>+	std-&gt;name[bcnt] = 0;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"Set up standard idx=%u name=%s",</div><div class='add'>+		   std-&gt;index,std-&gt;name);</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* These are special cases of combined standards that we should enumerate</div><div class='add'>+   separately if the component pieces are present. */</div><div class='add'>+static v4l2_std_id std_mixes[] = {</div><div class='add'>+	V4L2_STD_PAL_B | V4L2_STD_PAL_G,</div><div class='add'>+	V4L2_STD_PAL_D | V4L2_STD_PAL_K,</div><div class='add'>+	V4L2_STD_SECAM_B | V4L2_STD_SECAM_G,</div><div class='add'>+	V4L2_STD_SECAM_D | V4L2_STD_SECAM_K,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,</div><div class='add'>+					   v4l2_std_id id)</div><div class='add'>+{</div><div class='add'>+	unsigned int std_cnt = 0;</div><div class='add'>+	unsigned int idx,bcnt,idx2;</div><div class='add'>+	v4l2_std_id idmsk,cmsk,fmsk;</div><div class='add'>+	struct v4l2_standard *stddefs;</div><div class='add'>+</div><div class='add'>+	if (pvrusb2_debug &amp; PVR2_TRACE_INIT) {</div><div class='add'>+		char buf[50];</div><div class='add'>+		bcnt = pvr2_std_id_to_str(buf,sizeof(buf),id);</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_INIT,"Mapping standards mask=0x%x (%.*s)",</div><div class='add'>+			(int)id,bcnt,buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*countptr = 0;</div><div class='add'>+	std_cnt = 0;</div><div class='add'>+	fmsk = 0;</div><div class='add'>+	for (idmsk = 1, cmsk = id; cmsk; idmsk &lt;&lt;= 1) {</div><div class='add'>+		if (!(idmsk &amp; cmsk)) continue;</div><div class='add'>+		cmsk &amp;= ~idmsk;</div><div class='add'>+		if (match_std(idmsk)) {</div><div class='add'>+			std_cnt++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		fmsk |= idmsk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx2 = 0; idx2 &lt; sizeof(std_mixes)/sizeof(std_mixes[0]); idx2++) {</div><div class='add'>+		if ((id &amp; std_mixes[idx2]) == std_mixes[idx2]) std_cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fmsk) {</div><div class='add'>+		char buf[50];</div><div class='add'>+		bcnt = pvr2_std_id_to_str(buf,sizeof(buf),fmsk);</div><div class='add'>+		pvr2_trace(</div><div class='add'>+			PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			"WARNING:"</div><div class='add'>+			" Failed to classify the following standard(s): %.*s",</div><div class='add'>+			bcnt,buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_INIT,"Setting up %u unique standard(s)",</div><div class='add'>+		   std_cnt);</div><div class='add'>+	if (!std_cnt) return NULL; // paranoia</div><div class='add'>+</div><div class='add'>+	stddefs = kmalloc(sizeof(struct v4l2_standard) * std_cnt,</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	memset(stddefs,0,sizeof(struct v4l2_standard) * std_cnt);</div><div class='add'>+	for (idx = 0; idx &lt; std_cnt; idx++) stddefs[idx].index = idx;</div><div class='add'>+</div><div class='add'>+	idx = 0;</div><div class='add'>+</div><div class='add'>+	/* Enumerate potential special cases */</div><div class='add'>+	for (idx2 = 0; ((idx2 &lt; sizeof(std_mixes)/sizeof(std_mixes[0])) &amp;&amp;</div><div class='add'>+			(idx &lt; std_cnt)); idx2++) {</div><div class='add'>+		if (!(id &amp; std_mixes[idx2])) continue;</div><div class='add'>+		if (pvr2_std_fill(stddefs+idx,std_mixes[idx2])) idx++;</div><div class='add'>+	}</div><div class='add'>+	/* Now enumerate individual pieces */</div><div class='add'>+	for (idmsk = 1, cmsk = id; cmsk &amp;&amp; (idx &lt; std_cnt); idmsk &lt;&lt;= 1) {</div><div class='add'>+		if (!(idmsk &amp; cmsk)) continue;</div><div class='add'>+		cmsk &amp;= ~idmsk;</div><div class='add'>+		if (!pvr2_std_fill(stddefs+idx,idmsk)) continue;</div><div class='add'>+		idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*countptr = std_cnt;</div><div class='add'>+	return stddefs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+v4l2_std_id pvr2_std_get_usable(void)</div><div class='add'>+{</div><div class='add'>+	return CSTD_ALL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.h b/drivers/media/video/pvrusb2/pvrusb2-std.h<br/>new file mode 100644<br/>index 000000000000..07c399375341<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-std.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-std.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_STD_H</div><div class='add'>+#define __PVRUSB2_STD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+</div><div class='add'>+// Convert string describing one or more video standards into a mask of V4L</div><div class='add'>+// standard bits.  Return true if conversion succeeds otherwise return</div><div class='add'>+// false.  String is expected to be of the form: C1-x/y;C2-a/b where C1 and</div><div class='add'>+// C2 are color system names (e.g. "PAL", "NTSC") and x, y, a, and b are</div><div class='add'>+// modulation schemes (e.g. "M", "B", "G", etc).</div><div class='add'>+int pvr2_std_str_to_id(v4l2_std_id *idPtr,const char *bufPtr,</div><div class='add'>+		       unsigned int bufSize);</div><div class='add'>+</div><div class='add'>+// Convert any arbitrary set of video standard bits into an unambiguous</div><div class='add'>+// readable string.  Return value is the number of bytes consumed in the</div><div class='add'>+// buffer.  The formatted string is of a form that can be parsed by our</div><div class='add'>+// sibling std_std_to_id() function.</div><div class='add'>+unsigned int pvr2_std_id_to_str(char *bufPtr, unsigned int bufSize,</div><div class='add'>+				v4l2_std_id id);</div><div class='add'>+</div><div class='add'>+// Create an array of suitable v4l2_standard structures given a bit mask of</div><div class='add'>+// video standards to support.  The array is allocated from the heap, and</div><div class='add'>+// the number of elements is returned in the first argument.</div><div class='add'>+struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,</div><div class='add'>+					   v4l2_std_id id);</div><div class='add'>+</div><div class='add'>+// Return mask of which video standard bits are valid</div><div class='add'>+v4l2_std_id pvr2_std_get_usable(void);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_STD_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c<br/>new file mode 100644<br/>index 000000000000..6af55a8b6f05<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-sysfs.c</a></div><div class='hunk'>@@ -0,0 +1,865 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include "pvrusb2-sysfs.h"</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+#include "pvrusb2-debugifc.h"</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+</div><div class='add'>+#define pvr2_sysfs_trace(...) pvr2_trace(PVR2_TRACE_SYSFS,__VA_ARGS__)</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs {</div><div class='add'>+	struct pvr2_channel channel;</div><div class='add'>+	struct class_device *class_dev;</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+	struct pvr2_sysfs_debugifc *debugifc;</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+	struct pvr2_sysfs_ctl_item *item_first;</div><div class='add'>+	struct pvr2_sysfs_ctl_item *item_last;</div><div class='add'>+	struct sysfs_ops kops;</div><div class='add'>+	struct kobj_type ktype;</div><div class='add'>+	struct class_device_attribute attr_v4l_minor_number;</div><div class='add'>+	struct class_device_attribute attr_unit_number;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+struct pvr2_sysfs_debugifc {</div><div class='add'>+	struct class_device_attribute attr_debugcmd;</div><div class='add'>+	struct class_device_attribute attr_debuginfo;</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs_ctl_item {</div><div class='add'>+	struct class_device_attribute attr_name;</div><div class='add'>+	struct class_device_attribute attr_type;</div><div class='add'>+	struct class_device_attribute attr_min;</div><div class='add'>+	struct class_device_attribute attr_max;</div><div class='add'>+	struct class_device_attribute attr_enum;</div><div class='add'>+	struct class_device_attribute attr_bits;</div><div class='add'>+	struct class_device_attribute attr_val;</div><div class='add'>+	struct class_device_attribute attr_custom;</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *chptr;</div><div class='add'>+	struct pvr2_sysfs_ctl_item *item_next;</div><div class='add'>+	struct attribute *attr_gen[7];</div><div class='add'>+	struct attribute_group grp;</div><div class='add'>+	char name[80];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs_class {</div><div class='add'>+	struct class class;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t show_name(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	name = pvr2_ctrl_get_desc(cptr);</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_name(cid=%d) is %s",sfp,id,name);</div><div class='add'>+</div><div class='add'>+	if (!name) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf,PAGE_SIZE,"%s\n",name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_type(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	const char *name;</div><div class='add'>+	enum pvr2_ctl_type tp;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tp = pvr2_ctrl_get_type(cptr);</div><div class='add'>+	switch (tp) {</div><div class='add'>+	case pvr2_ctl_int: name = "integer"; break;</div><div class='add'>+	case pvr2_ctl_enum: name = "enum"; break;</div><div class='add'>+	case pvr2_ctl_bitmask: name = "bitmask"; break;</div><div class='add'>+	case pvr2_ctl_bool: name = "boolean"; break;</div><div class='add'>+	default: name = "?"; break;</div><div class='add'>+	}</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_type(cid=%d) is %s",sfp,id,name);</div><div class='add'>+</div><div class='add'>+	if (!name) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf,PAGE_SIZE,"%s\n",name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_min(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	long val;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	val = pvr2_ctrl_get_min(cptr);</div><div class='add'>+</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_min(cid=%d) is %ld",sfp,id,val);</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf,PAGE_SIZE,"%ld\n",val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_max(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	long val;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	val = pvr2_ctrl_get_max(cptr);</div><div class='add'>+</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_max(cid=%d) is %ld",sfp,id,val);</div><div class='add'>+</div><div class='add'>+	return scnprintf(buf,PAGE_SIZE,"%ld\n",val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_val_norm(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	int val,ret;</div><div class='add'>+	unsigned int cnt = 0;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_ctrl_get_value(cptr,&amp;val);</div><div class='add'>+	if (ret &lt; 0) return ret;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_ctrl_value_to_sym(cptr,~0,val,</div><div class='add'>+				     buf,PAGE_SIZE-1,&amp;cnt);</div><div class='add'>+</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_norm(cid=%d) is %.*s (%d)",</div><div class='add'>+			 sfp,id,cnt,buf,val);</div><div class='add'>+	buf[cnt] = '\n';</div><div class='add'>+	return cnt+1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_val_custom(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	int val,ret;</div><div class='add'>+	unsigned int cnt = 0;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_ctrl_get_value(cptr,&amp;val);</div><div class='add'>+	if (ret &lt; 0) return ret;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_ctrl_custom_value_to_sym(cptr,~0,val,</div><div class='add'>+					    buf,PAGE_SIZE-1,&amp;cnt);</div><div class='add'>+</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_custom(cid=%d) is %.*s (%d)",</div><div class='add'>+			 sfp,id,cnt,buf,val);</div><div class='add'>+	buf[cnt] = '\n';</div><div class='add'>+	return cnt+1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_enum(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	long val;</div><div class='add'>+	unsigned int bcnt,ccnt,ecnt;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	ecnt = pvr2_ctrl_get_cnt(cptr);</div><div class='add'>+	bcnt = 0;</div><div class='add'>+	for (val = 0; val &lt; ecnt; val++) {</div><div class='add'>+		pvr2_ctrl_get_valname(cptr,val,buf+bcnt,PAGE_SIZE-bcnt,&amp;ccnt);</div><div class='add'>+		if (!ccnt) continue;</div><div class='add'>+		bcnt += ccnt;</div><div class='add'>+		if (bcnt &gt;= PAGE_SIZE) break;</div><div class='add'>+		buf[bcnt] = '\n';</div><div class='add'>+		bcnt++;</div><div class='add'>+	}</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_enum(cid=%d)",sfp,id);</div><div class='add'>+	return bcnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bits(int id,struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	int valid_bits,msk;</div><div class='add'>+	unsigned int bcnt,ccnt;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (!cptr) return -EINVAL;</div><div class='add'>+	valid_bits = pvr2_ctrl_get_mask(cptr);</div><div class='add'>+	bcnt = 0;</div><div class='add'>+	for (msk = 1; valid_bits; msk &lt;&lt;= 1) {</div><div class='add'>+		if (!(msk &amp; valid_bits)) continue;</div><div class='add'>+		valid_bits &amp;= ~msk;</div><div class='add'>+		pvr2_ctrl_get_valname(cptr,msk,buf+bcnt,PAGE_SIZE-bcnt,&amp;ccnt);</div><div class='add'>+		bcnt += ccnt;</div><div class='add'>+		if (bcnt &gt;= PAGE_SIZE) break;</div><div class='add'>+		buf[bcnt] = '\n';</div><div class='add'>+		bcnt++;</div><div class='add'>+	}</div><div class='add'>+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_bits(cid=%d)",sfp,id);</div><div class='add'>+	return bcnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int store_val_any(int id,int customfl,struct pvr2_sysfs *sfp,</div><div class='add'>+			 const char *buf,unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	int ret;</div><div class='add'>+	int mask,val;</div><div class='add'>+</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,id);</div><div class='add'>+	if (customfl) {</div><div class='add'>+		ret = pvr2_ctrl_custom_sym_to_value(cptr,buf,count,&amp;mask,&amp;val);</div><div class='add'>+	} else {</div><div class='add'>+		ret = pvr2_ctrl_sym_to_value(cptr,buf,count,&amp;mask,&amp;val);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0) return ret;</div><div class='add'>+	ret = pvr2_ctrl_set_mask_value(cptr,mask,val);</div><div class='add'>+	pvr2_hdw_commit_ctl(sfp-&gt;channel.hdw);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_val_norm(int id,struct class_device *class_dev,</div><div class='add'>+			     const char *buf,size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	int ret;</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	ret = store_val_any(id,0,sfp,buf,count);</div><div class='add'>+	if (!ret) ret = count;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_val_custom(int id,struct class_device *class_dev,</div><div class='add'>+				const char *buf,size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	int ret;</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	ret = store_val_any(id,1,sfp,buf,count);</div><div class='add'>+	if (!ret) ret = count;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Mike Isely &lt;isely@pobox.com&gt; 30-April-2005</div><div class='add'>+</div><div class='add'>+  This next batch of horrible preprocessor hackery is needed because the</div><div class='add'>+  kernel's class_device_attribute mechanism fails to pass the actual</div><div class='add'>+  attribute through to the show / store functions, which means we have no</div><div class='add'>+  way to package up any attribute-specific parameters, like for example the</div><div class='add'>+  control id.  So we work around this brain-damage by encoding the control</div><div class='add'>+  id into the show / store functions themselves and pick the function based</div><div class='add'>+  on the control id we're setting up.  These macros try to ease the pain.</div><div class='add'>+  Yuck.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#define CREATE_SHOW_INSTANCE(sf_name,ctl_id) \</div><div class='add'>+static ssize_t sf_name##_##ctl_id(struct class_device *class_dev,char *buf) \</div><div class='add'>+{ return sf_name(ctl_id,class_dev,buf); }</div><div class='add'>+</div><div class='add'>+#define CREATE_STORE_INSTANCE(sf_name,ctl_id) \</div><div class='add'>+static ssize_t sf_name##_##ctl_id(struct class_device *class_dev,const char *buf,size_t count) \</div><div class='add'>+{ return sf_name(ctl_id,class_dev,buf,count); }</div><div class='add'>+</div><div class='add'>+#define CREATE_BATCH(ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_name,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_type,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_min,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_max,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_val_norm,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_val_custom,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_enum,ctl_id) \</div><div class='add'>+CREATE_SHOW_INSTANCE(show_bits,ctl_id) \</div><div class='add'>+CREATE_STORE_INSTANCE(store_val_norm,ctl_id) \</div><div class='add'>+CREATE_STORE_INSTANCE(store_val_custom,ctl_id) \</div><div class='add'>+</div><div class='add'>+CREATE_BATCH(0)</div><div class='add'>+CREATE_BATCH(1)</div><div class='add'>+CREATE_BATCH(2)</div><div class='add'>+CREATE_BATCH(3)</div><div class='add'>+CREATE_BATCH(4)</div><div class='add'>+CREATE_BATCH(5)</div><div class='add'>+CREATE_BATCH(6)</div><div class='add'>+CREATE_BATCH(7)</div><div class='add'>+CREATE_BATCH(8)</div><div class='add'>+CREATE_BATCH(9)</div><div class='add'>+CREATE_BATCH(10)</div><div class='add'>+CREATE_BATCH(11)</div><div class='add'>+CREATE_BATCH(12)</div><div class='add'>+CREATE_BATCH(13)</div><div class='add'>+CREATE_BATCH(14)</div><div class='add'>+CREATE_BATCH(15)</div><div class='add'>+CREATE_BATCH(16)</div><div class='add'>+CREATE_BATCH(17)</div><div class='add'>+CREATE_BATCH(18)</div><div class='add'>+CREATE_BATCH(19)</div><div class='add'>+CREATE_BATCH(20)</div><div class='add'>+CREATE_BATCH(21)</div><div class='add'>+CREATE_BATCH(22)</div><div class='add'>+CREATE_BATCH(23)</div><div class='add'>+CREATE_BATCH(24)</div><div class='add'>+CREATE_BATCH(25)</div><div class='add'>+CREATE_BATCH(26)</div><div class='add'>+CREATE_BATCH(27)</div><div class='add'>+CREATE_BATCH(28)</div><div class='add'>+CREATE_BATCH(29)</div><div class='add'>+CREATE_BATCH(30)</div><div class='add'>+CREATE_BATCH(31)</div><div class='add'>+CREATE_BATCH(32)</div><div class='add'>+CREATE_BATCH(33)</div><div class='add'>+CREATE_BATCH(34)</div><div class='add'>+CREATE_BATCH(35)</div><div class='add'>+CREATE_BATCH(36)</div><div class='add'>+CREATE_BATCH(37)</div><div class='add'>+CREATE_BATCH(38)</div><div class='add'>+CREATE_BATCH(39)</div><div class='add'>+CREATE_BATCH(40)</div><div class='add'>+CREATE_BATCH(41)</div><div class='add'>+CREATE_BATCH(42)</div><div class='add'>+CREATE_BATCH(43)</div><div class='add'>+CREATE_BATCH(44)</div><div class='add'>+CREATE_BATCH(45)</div><div class='add'>+CREATE_BATCH(46)</div><div class='add'>+CREATE_BATCH(47)</div><div class='add'>+CREATE_BATCH(48)</div><div class='add'>+CREATE_BATCH(49)</div><div class='add'>+CREATE_BATCH(50)</div><div class='add'>+CREATE_BATCH(51)</div><div class='add'>+CREATE_BATCH(52)</div><div class='add'>+CREATE_BATCH(53)</div><div class='add'>+CREATE_BATCH(54)</div><div class='add'>+CREATE_BATCH(55)</div><div class='add'>+CREATE_BATCH(56)</div><div class='add'>+CREATE_BATCH(57)</div><div class='add'>+CREATE_BATCH(58)</div><div class='add'>+CREATE_BATCH(59)</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs_func_set {</div><div class='add'>+	ssize_t (*show_name)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*show_type)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*show_min)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*show_max)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*show_enum)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*show_bits)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*show_val_norm)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*store_val_norm)(struct class_device *,</div><div class='add'>+				  const char *,size_t);</div><div class='add'>+	ssize_t (*show_val_custom)(struct class_device *,char *);</div><div class='add'>+	ssize_t (*store_val_custom)(struct class_device *,</div><div class='add'>+				    const char *,size_t);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INIT_BATCH(ctl_id) \</div><div class='add'>+[ctl_id] = { \</div><div class='add'>+    .show_name = show_name_##ctl_id, \</div><div class='add'>+    .show_type = show_type_##ctl_id, \</div><div class='add'>+    .show_min = show_min_##ctl_id, \</div><div class='add'>+    .show_max = show_max_##ctl_id, \</div><div class='add'>+    .show_enum = show_enum_##ctl_id, \</div><div class='add'>+    .show_bits = show_bits_##ctl_id, \</div><div class='add'>+    .show_val_norm = show_val_norm_##ctl_id, \</div><div class='add'>+    .store_val_norm = store_val_norm_##ctl_id, \</div><div class='add'>+    .show_val_custom = show_val_custom_##ctl_id, \</div><div class='add'>+    .store_val_custom = store_val_custom_##ctl_id, \</div><div class='add'>+} \</div><div class='add'>+</div><div class='add'>+static struct pvr2_sysfs_func_set funcs[] = {</div><div class='add'>+	INIT_BATCH(0),</div><div class='add'>+	INIT_BATCH(1),</div><div class='add'>+	INIT_BATCH(2),</div><div class='add'>+	INIT_BATCH(3),</div><div class='add'>+	INIT_BATCH(4),</div><div class='add'>+	INIT_BATCH(5),</div><div class='add'>+	INIT_BATCH(6),</div><div class='add'>+	INIT_BATCH(7),</div><div class='add'>+	INIT_BATCH(8),</div><div class='add'>+	INIT_BATCH(9),</div><div class='add'>+	INIT_BATCH(10),</div><div class='add'>+	INIT_BATCH(11),</div><div class='add'>+	INIT_BATCH(12),</div><div class='add'>+	INIT_BATCH(13),</div><div class='add'>+	INIT_BATCH(14),</div><div class='add'>+	INIT_BATCH(15),</div><div class='add'>+	INIT_BATCH(16),</div><div class='add'>+	INIT_BATCH(17),</div><div class='add'>+	INIT_BATCH(18),</div><div class='add'>+	INIT_BATCH(19),</div><div class='add'>+	INIT_BATCH(20),</div><div class='add'>+	INIT_BATCH(21),</div><div class='add'>+	INIT_BATCH(22),</div><div class='add'>+	INIT_BATCH(23),</div><div class='add'>+	INIT_BATCH(24),</div><div class='add'>+	INIT_BATCH(25),</div><div class='add'>+	INIT_BATCH(26),</div><div class='add'>+	INIT_BATCH(27),</div><div class='add'>+	INIT_BATCH(28),</div><div class='add'>+	INIT_BATCH(29),</div><div class='add'>+	INIT_BATCH(30),</div><div class='add'>+	INIT_BATCH(31),</div><div class='add'>+	INIT_BATCH(32),</div><div class='add'>+	INIT_BATCH(33),</div><div class='add'>+	INIT_BATCH(34),</div><div class='add'>+	INIT_BATCH(35),</div><div class='add'>+	INIT_BATCH(36),</div><div class='add'>+	INIT_BATCH(37),</div><div class='add'>+	INIT_BATCH(38),</div><div class='add'>+	INIT_BATCH(39),</div><div class='add'>+	INIT_BATCH(40),</div><div class='add'>+	INIT_BATCH(41),</div><div class='add'>+	INIT_BATCH(42),</div><div class='add'>+	INIT_BATCH(43),</div><div class='add'>+	INIT_BATCH(44),</div><div class='add'>+	INIT_BATCH(45),</div><div class='add'>+	INIT_BATCH(46),</div><div class='add'>+	INIT_BATCH(47),</div><div class='add'>+	INIT_BATCH(48),</div><div class='add'>+	INIT_BATCH(49),</div><div class='add'>+	INIT_BATCH(50),</div><div class='add'>+	INIT_BATCH(51),</div><div class='add'>+	INIT_BATCH(52),</div><div class='add'>+	INIT_BATCH(53),</div><div class='add'>+	INIT_BATCH(54),</div><div class='add'>+	INIT_BATCH(55),</div><div class='add'>+	INIT_BATCH(56),</div><div class='add'>+	INIT_BATCH(57),</div><div class='add'>+	INIT_BATCH(58),</div><div class='add'>+	INIT_BATCH(59),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs_ctl_item *cip;</div><div class='add'>+	struct pvr2_sysfs_func_set *fp;</div><div class='add'>+	struct pvr2_ctrl *cptr;</div><div class='add'>+	unsigned int cnt,acnt;</div><div class='add'>+</div><div class='add'>+	if ((ctl_id &lt; 0) || (ctl_id &gt;= (sizeof(funcs)/sizeof(funcs[0])))) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fp = funcs + ctl_id;</div><div class='add'>+	cptr = pvr2_hdw_get_ctrl_by_index(sfp-&gt;channel.hdw,ctl_id);</div><div class='add'>+	if (!cptr) return;</div><div class='add'>+</div><div class='add'>+	cip = kmalloc(sizeof(*cip),GFP_KERNEL);</div><div class='add'>+	if (!cip) return;</div><div class='add'>+	memset(cip,0,sizeof(*cip));</div><div class='add'>+	pvr2_sysfs_trace("Creating pvr2_sysfs_ctl_item id=%p",cip);</div><div class='add'>+</div><div class='add'>+	cip-&gt;cptr = cptr;</div><div class='add'>+</div><div class='add'>+	cip-&gt;chptr = sfp;</div><div class='add'>+	cip-&gt;item_next = NULL;</div><div class='add'>+	if (sfp-&gt;item_last) {</div><div class='add'>+		sfp-&gt;item_last-&gt;item_next = cip;</div><div class='add'>+	} else {</div><div class='add'>+		sfp-&gt;item_first = cip;</div><div class='add'>+	}</div><div class='add'>+	sfp-&gt;item_last = cip;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_name.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_name.attr.name = "name";</div><div class='add'>+	cip-&gt;attr_name.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_name.show = fp-&gt;show_name;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_type.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_type.attr.name = "type";</div><div class='add'>+	cip-&gt;attr_type.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_type.show = fp-&gt;show_type;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_min.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_min.attr.name = "min_val";</div><div class='add'>+	cip-&gt;attr_min.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_min.show = fp-&gt;show_min;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_max.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_max.attr.name = "max_val";</div><div class='add'>+	cip-&gt;attr_max.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_max.show = fp-&gt;show_max;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_val.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_val.attr.name = "cur_val";</div><div class='add'>+	cip-&gt;attr_val.attr.mode = S_IRUGO;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_custom.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_custom.attr.name = "custom_val";</div><div class='add'>+	cip-&gt;attr_custom.attr.mode = S_IRUGO;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_enum.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_enum.attr.name = "enum_val";</div><div class='add'>+	cip-&gt;attr_enum.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_enum.show = fp-&gt;show_enum;</div><div class='add'>+</div><div class='add'>+	cip-&gt;attr_bits.attr.owner = THIS_MODULE;</div><div class='add'>+	cip-&gt;attr_bits.attr.name = "bit_val";</div><div class='add'>+	cip-&gt;attr_bits.attr.mode = S_IRUGO;</div><div class='add'>+	cip-&gt;attr_bits.show = fp-&gt;show_bits;</div><div class='add'>+</div><div class='add'>+	if (pvr2_ctrl_is_writable(cptr)) {</div><div class='add'>+		cip-&gt;attr_val.attr.mode |= S_IWUSR|S_IWGRP;</div><div class='add'>+		cip-&gt;attr_custom.attr.mode |= S_IWUSR|S_IWGRP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acnt = 0;</div><div class='add'>+	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_name.attr;</div><div class='add'>+	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_type.attr;</div><div class='add'>+	cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_val.attr;</div><div class='add'>+	cip-&gt;attr_val.show = fp-&gt;show_val_norm;</div><div class='add'>+	cip-&gt;attr_val.store = fp-&gt;store_val_norm;</div><div class='add'>+	if (pvr2_ctrl_has_custom_symbols(cptr)) {</div><div class='add'>+		cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_custom.attr;</div><div class='add'>+		cip-&gt;attr_custom.show = fp-&gt;show_val_custom;</div><div class='add'>+		cip-&gt;attr_custom.store = fp-&gt;store_val_custom;</div><div class='add'>+	}</div><div class='add'>+	switch (pvr2_ctrl_get_type(cptr)) {</div><div class='add'>+	case pvr2_ctl_enum:</div><div class='add'>+		// Control is an enumeration</div><div class='add'>+		cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_enum.attr;</div><div class='add'>+		break;</div><div class='add'>+	case pvr2_ctl_int:</div><div class='add'>+		// Control is an integer</div><div class='add'>+		cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_min.attr;</div><div class='add'>+		cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_max.attr;</div><div class='add'>+		break;</div><div class='add'>+	case pvr2_ctl_bitmask:</div><div class='add'>+		// Control is an bitmask</div><div class='add'>+		cip-&gt;attr_gen[acnt++] = &amp;cip-&gt;attr_bits.attr;</div><div class='add'>+		break;</div><div class='add'>+	default: break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cnt = scnprintf(cip-&gt;name,sizeof(cip-&gt;name)-1,"ctl_%s",</div><div class='add'>+			pvr2_ctrl_get_name(cptr));</div><div class='add'>+	cip-&gt;name[cnt] = 0;</div><div class='add'>+	cip-&gt;grp.name = cip-&gt;name;</div><div class='add'>+	cip-&gt;grp.attrs = cip-&gt;attr_gen;</div><div class='add'>+</div><div class='add'>+	sysfs_create_group(&amp;sfp-&gt;class_dev-&gt;kobj,&amp;cip-&gt;grp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+static ssize_t debuginfo_show(struct class_device *,char *);</div><div class='add'>+static ssize_t debugcmd_show(struct class_device *,char *);</div><div class='add'>+static ssize_t debugcmd_store(struct class_device *,const char *,size_t count);</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs_debugifc *dip;</div><div class='add'>+	dip = kmalloc(sizeof(*dip),GFP_KERNEL);</div><div class='add'>+	if (!dip) return;</div><div class='add'>+	memset(dip,0,sizeof(*dip));</div><div class='add'>+	dip-&gt;attr_debugcmd.attr.owner = THIS_MODULE;</div><div class='add'>+	dip-&gt;attr_debugcmd.attr.name = "debugcmd";</div><div class='add'>+	dip-&gt;attr_debugcmd.attr.mode = S_IRUGO|S_IWUSR|S_IWGRP;</div><div class='add'>+	dip-&gt;attr_debugcmd.show = debugcmd_show;</div><div class='add'>+	dip-&gt;attr_debugcmd.store = debugcmd_store;</div><div class='add'>+	dip-&gt;attr_debuginfo.attr.owner = THIS_MODULE;</div><div class='add'>+	dip-&gt;attr_debuginfo.attr.name = "debuginfo";</div><div class='add'>+	dip-&gt;attr_debuginfo.attr.mode = S_IRUGO;</div><div class='add'>+	dip-&gt;attr_debuginfo.show = debuginfo_show;</div><div class='add'>+	sfp-&gt;debugifc = dip;</div><div class='add'>+	class_device_create_file(sfp-&gt;class_dev,&amp;dip-&gt;attr_debugcmd);</div><div class='add'>+	class_device_create_file(sfp-&gt;class_dev,&amp;dip-&gt;attr_debuginfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_tear_down_debugifc(struct pvr2_sysfs *sfp)</div><div class='add'>+{</div><div class='add'>+	if (!sfp-&gt;debugifc) return;</div><div class='add'>+	class_device_remove_file(sfp-&gt;class_dev,</div><div class='add'>+				 &amp;sfp-&gt;debugifc-&gt;attr_debuginfo);</div><div class='add'>+	class_device_remove_file(sfp-&gt;class_dev,&amp;sfp-&gt;debugifc-&gt;attr_debugcmd);</div><div class='add'>+	kfree(sfp-&gt;debugifc);</div><div class='add'>+	sfp-&gt;debugifc = NULL;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_add_controls(struct pvr2_sysfs *sfp)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx,cnt;</div><div class='add'>+	cnt = pvr2_hdw_get_ctrl_count(sfp-&gt;channel.hdw);</div><div class='add'>+	for (idx = 0; idx &lt; cnt; idx++) {</div><div class='add'>+		pvr2_sysfs_add_control(sfp,idx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_tear_down_controls(struct pvr2_sysfs *sfp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs_ctl_item *cip1,*cip2;</div><div class='add'>+	for (cip1 = sfp-&gt;item_first; cip1; cip1 = cip2) {</div><div class='add'>+		cip2 = cip1-&gt;item_next;</div><div class='add'>+		sysfs_remove_group(&amp;sfp-&gt;class_dev-&gt;kobj,&amp;cip1-&gt;grp);</div><div class='add'>+		pvr2_sysfs_trace("Destroying pvr2_sysfs_ctl_item id=%p",cip1);</div><div class='add'>+		kfree(cip1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_class_release(struct class *class)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs_class *clp;</div><div class='add'>+	clp = container_of(class,struct pvr2_sysfs_class,class);</div><div class='add'>+	pvr2_sysfs_trace("Destroying pvr2_sysfs_class id=%p",clp);</div><div class='add'>+	kfree(clp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_release(struct class_device *class_dev)</div><div class='add'>+{</div><div class='add'>+	pvr2_sysfs_trace("Releasing class_dev id=%p",class_dev);</div><div class='add'>+	kfree(class_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void class_dev_destroy(struct pvr2_sysfs *sfp)</div><div class='add'>+{</div><div class='add'>+	if (!sfp-&gt;class_dev) return;</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+	pvr2_sysfs_tear_down_debugifc(sfp);</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+	pvr2_sysfs_tear_down_controls(sfp);</div><div class='add'>+	class_device_remove_file(sfp-&gt;class_dev,&amp;sfp-&gt;attr_v4l_minor_number);</div><div class='add'>+	class_device_remove_file(sfp-&gt;class_dev,&amp;sfp-&gt;attr_unit_number);</div><div class='add'>+	pvr2_sysfs_trace("Destroying class_dev id=%p",sfp-&gt;class_dev);</div><div class='add'>+	sfp-&gt;class_dev-&gt;class_data = NULL;</div><div class='add'>+	class_device_unregister(sfp-&gt;class_dev);</div><div class='add'>+	sfp-&gt;class_dev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t v4l_minor_number_show(struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	return scnprintf(buf,PAGE_SIZE,"%d\n",</div><div class='add'>+			 pvr2_hdw_v4l_get_minor_number(sfp-&gt;channel.hdw));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t unit_number_show(struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	return scnprintf(buf,PAGE_SIZE,"%d\n",</div><div class='add'>+			 pvr2_hdw_get_unit_number(sfp-&gt;channel.hdw));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void class_dev_create(struct pvr2_sysfs *sfp,</div><div class='add'>+			     struct pvr2_sysfs_class *class_ptr)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *usb_dev;</div><div class='add'>+	struct class_device *class_dev;</div><div class='add'>+	usb_dev = pvr2_hdw_get_dev(sfp-&gt;channel.hdw);</div><div class='add'>+	if (!usb_dev) return;</div><div class='add'>+	class_dev = kmalloc(sizeof(*class_dev),GFP_KERNEL);</div><div class='add'>+	if (!class_dev) return;</div><div class='add'>+	memset(class_dev,0,sizeof(*class_dev));</div><div class='add'>+</div><div class='add'>+	pvr2_sysfs_trace("Creating class_dev id=%p",class_dev);</div><div class='add'>+</div><div class='add'>+	class_dev-&gt;class = &amp;class_ptr-&gt;class;</div><div class='add'>+	if (pvr2_hdw_get_sn(sfp-&gt;channel.hdw)) {</div><div class='add'>+		snprintf(class_dev-&gt;class_id,BUS_ID_SIZE,"sn-%lu",</div><div class='add'>+			 pvr2_hdw_get_sn(sfp-&gt;channel.hdw));</div><div class='add'>+	} else if (pvr2_hdw_get_unit_number(sfp-&gt;channel.hdw) &gt;= 0) {</div><div class='add'>+		snprintf(class_dev-&gt;class_id,BUS_ID_SIZE,"unit-%c",</div><div class='add'>+			 pvr2_hdw_get_unit_number(sfp-&gt;channel.hdw) + 'a');</div><div class='add'>+	} else {</div><div class='add'>+		kfree(class_dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	class_dev-&gt;dev = &amp;usb_dev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	sfp-&gt;class_dev = class_dev;</div><div class='add'>+	class_dev-&gt;class_data = sfp;</div><div class='add'>+	class_device_register(class_dev);</div><div class='add'>+</div><div class='add'>+	sfp-&gt;attr_v4l_minor_number.attr.owner = THIS_MODULE;</div><div class='add'>+	sfp-&gt;attr_v4l_minor_number.attr.name = "v4l_minor_number";</div><div class='add'>+	sfp-&gt;attr_v4l_minor_number.attr.mode = S_IRUGO;</div><div class='add'>+	sfp-&gt;attr_v4l_minor_number.show = v4l_minor_number_show;</div><div class='add'>+	sfp-&gt;attr_v4l_minor_number.store = NULL;</div><div class='add'>+	class_device_create_file(sfp-&gt;class_dev,&amp;sfp-&gt;attr_v4l_minor_number);</div><div class='add'>+	sfp-&gt;attr_unit_number.attr.owner = THIS_MODULE;</div><div class='add'>+	sfp-&gt;attr_unit_number.attr.name = "unit_number";</div><div class='add'>+	sfp-&gt;attr_unit_number.attr.mode = S_IRUGO;</div><div class='add'>+	sfp-&gt;attr_unit_number.show = unit_number_show;</div><div class='add'>+	sfp-&gt;attr_unit_number.store = NULL;</div><div class='add'>+	class_device_create_file(sfp-&gt;class_dev,&amp;sfp-&gt;attr_unit_number);</div><div class='add'>+</div><div class='add'>+	pvr2_sysfs_add_controls(sfp);</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+	pvr2_sysfs_add_debugifc(sfp);</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_sysfs_internal_check(struct pvr2_channel *chp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	sfp = container_of(chp,struct pvr2_sysfs,channel);</div><div class='add'>+	if (!sfp-&gt;channel.mc_head-&gt;disconnect_flag) return;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"Destroying pvr2_sysfs id=%p",sfp);</div><div class='add'>+	class_dev_destroy(sfp);</div><div class='add'>+	pvr2_channel_done(&amp;sfp-&gt;channel);</div><div class='add'>+	kfree(sfp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *mp,</div><div class='add'>+				     struct pvr2_sysfs_class *class_ptr)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	sfp = kmalloc(sizeof(*sfp),GFP_KERNEL);</div><div class='add'>+	if (!sfp) return sfp;</div><div class='add'>+	memset(sfp,0,sizeof(*sfp));</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr2_sysfs id=%p",sfp);</div><div class='add'>+	pvr2_channel_init(&amp;sfp-&gt;channel,mp);</div><div class='add'>+	sfp-&gt;channel.check_func = pvr2_sysfs_internal_check;</div><div class='add'>+</div><div class='add'>+	class_dev_create(sfp,class_ptr);</div><div class='add'>+	return sfp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_sysfs_hotplug(struct class_device *cd,char **envp,</div><div class='add'>+			      int numenvp,char *buf,int size)</div><div class='add'>+{</div><div class='add'>+	/* Even though we don't do anything here, we still need this function</div><div class='add'>+	   because sysfs will still try to call it. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs_class *pvr2_sysfs_class_create(void)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs_class *clp;</div><div class='add'>+	clp = kmalloc(sizeof(*clp),GFP_KERNEL);</div><div class='add'>+	if (!clp) return clp;</div><div class='add'>+	memset(clp,0,sizeof(*clp));</div><div class='add'>+	pvr2_sysfs_trace("Creating pvr2_sysfs_class id=%p",clp);</div><div class='add'>+	clp-&gt;class.name = "pvrusb2";</div><div class='add'>+	clp-&gt;class.class_release = pvr2_sysfs_class_release;</div><div class='add'>+	clp-&gt;class.release = pvr2_sysfs_release;</div><div class='add'>+	clp-&gt;class.uevent = pvr2_sysfs_hotplug;</div><div class='add'>+	if (class_register(&amp;clp-&gt;class)) {</div><div class='add'>+		pvr2_sysfs_trace(</div><div class='add'>+			"Registration failed for pvr2_sysfs_class id=%p",clp);</div><div class='add'>+		kfree(clp);</div><div class='add'>+		clp = NULL;</div><div class='add'>+	}</div><div class='add'>+	return clp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *clp)</div><div class='add'>+{</div><div class='add'>+	class_unregister(&amp;clp-&gt;class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC</div><div class='add'>+static ssize_t debuginfo_show(struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	pvr2_hdw_trigger_module_log(sfp-&gt;channel.hdw);</div><div class='add'>+	return pvr2_debugifc_print_info(sfp-&gt;channel.hdw,buf,PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t debugcmd_show(struct class_device *class_dev,char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+	return pvr2_debugifc_print_status(sfp-&gt;channel.hdw,buf,PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t debugcmd_store(struct class_device *class_dev,</div><div class='add'>+			      const char *buf,size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_sysfs *sfp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sfp = (struct pvr2_sysfs *)class_dev-&gt;class_data;</div><div class='add'>+	if (!sfp) return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = pvr2_debugifc_docmd(sfp-&gt;channel.hdw,buf,count);</div><div class='add'>+	if (ret &lt; 0) return ret;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h b/drivers/media/video/pvrusb2/pvrusb2-sysfs.h<br/>new file mode 100644<br/>index 000000000000..ff9373b47f8f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-sysfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-sysfs.h</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_SYSFS_H</div><div class='add'>+#define __PVRUSB2_SYSFS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include "pvrusb2-context.h"</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs;</div><div class='add'>+struct pvr2_sysfs_class;</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs_class *pvr2_sysfs_class_create(void);</div><div class='add'>+void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *);</div><div class='add'>+</div><div class='add'>+struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *,</div><div class='add'>+				     struct pvr2_sysfs_class *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_SYSFS_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c<br/>new file mode 100644<br/>index 000000000000..af9f246f8d3f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-tuner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-tuner.c</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "pvrusb2.h"</div><div class='add'>+#include "pvrusb2-util.h"</div><div class='add'>+#include "pvrusb2-tuner.h"</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/tuner.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_tuner_handler {</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	struct pvr2_i2c_client *client;</div><div class='add'>+	struct pvr2_i2c_handler i2c_handler;</div><div class='add'>+	int type_update_fl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_type(struct pvr2_tuner_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	struct tuner_setup setup;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c tuner set_type(%d)",hdw-&gt;tuner_type);</div><div class='add'>+	if (((int)(hdw-&gt;tuner_type)) &lt; 0) return;</div><div class='add'>+</div><div class='add'>+	setup.addr = ADDR_UNSET;</div><div class='add'>+	setup.type = hdw-&gt;tuner_type;</div><div class='add'>+	setup.mode_mask = T_RADIO | T_ANALOG_TV;</div><div class='add'>+	/* We may really want mode_mask to be T_ANALOG_TV for now */</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,TUNER_SET_TYPE_ADDR,&amp;setup);</div><div class='add'>+	ctxt-&gt;type_update_fl = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int tuner_check(struct pvr2_tuner_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	if (hdw-&gt;tuner_updated) ctxt-&gt;type_update_fl = !0;</div><div class='add'>+	return ctxt-&gt;type_update_fl != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void tuner_update(struct pvr2_tuner_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	if (ctxt-&gt;type_update_fl) set_type(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_tuner_detach(struct pvr2_tuner_handler *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;client-&gt;handler = NULL;</div><div class='add'>+	kfree(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int pvr2_tuner_describe(struct pvr2_tuner_handler *ctxt,char *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf,cnt,"handler: pvrusb2-tuner");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const static struct pvr2_i2c_handler_functions tuner_funcs = {</div><div class='add'>+	.detach = (void (*)(void *))pvr2_tuner_detach,</div><div class='add'>+	.check = (int (*)(void *))tuner_check,</div><div class='add'>+	.update = (void (*)(void *))tuner_update,</div><div class='add'>+	.describe = (unsigned int (*)(void *,char *,unsigned int))pvr2_tuner_describe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_tuner_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_tuner_handler *ctxt;</div><div class='add'>+	if (cp-&gt;handler) return 0;</div><div class='add'>+</div><div class='add'>+	ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);</div><div class='add'>+	if (!ctxt) return 0;</div><div class='add'>+	memset(ctxt,0,sizeof(*ctxt));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;i2c_handler.func_data = ctxt;</div><div class='add'>+	ctxt-&gt;i2c_handler.func_table = &amp;tuner_funcs;</div><div class='add'>+	ctxt-&gt;type_update_fl = !0;</div><div class='add'>+	ctxt-&gt;client = cp;</div><div class='add'>+	ctxt-&gt;hdw = hdw;</div><div class='add'>+	cp-&gt;handler = &amp;ctxt-&gt;i2c_handler;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x tuner handler set up",</div><div class='add'>+		   cp-&gt;client-&gt;addr);</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.h b/drivers/media/video/pvrusb2/pvrusb2-tuner.h<br/>new file mode 100644<br/>index 000000000000..556f12aa9160<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-tuner.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-tuner.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_TUNER_H</div><div class='add'>+#define __PVRUSB2_TUNER_H</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_tuner_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_TUNER_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-util.h b/drivers/media/video/pvrusb2/pvrusb2-util.h<br/>new file mode 100644<br/>index 000000000000..e53aee416f56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-util.h</a></div><div class='hunk'>@@ -0,0 +1,63 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_UTIL_H</div><div class='add'>+#define __PVRUSB2_UTIL_H</div><div class='add'>+</div><div class='add'>+#define PVR2_DECOMPOSE_LE(t,i,d) \</div><div class='add'>+    do {    \</div><div class='add'>+	(t)[i] = (d) &amp; 0xff;\</div><div class='add'>+	(t)[i+1] = ((d) &gt;&gt; 8) &amp; 0xff;\</div><div class='add'>+	(t)[i+2] = ((d) &gt;&gt; 16) &amp; 0xff;\</div><div class='add'>+	(t)[i+3] = ((d) &gt;&gt; 24) &amp; 0xff;\</div><div class='add'>+    } while(0)</div><div class='add'>+</div><div class='add'>+#define PVR2_DECOMPOSE_BE(t,i,d) \</div><div class='add'>+    do {    \</div><div class='add'>+	(t)[i+3] = (d) &amp; 0xff;\</div><div class='add'>+	(t)[i+2] = ((d) &gt;&gt; 8) &amp; 0xff;\</div><div class='add'>+	(t)[i+1] = ((d) &gt;&gt; 16) &amp; 0xff;\</div><div class='add'>+	(t)[i] = ((d) &gt;&gt; 24) &amp; 0xff;\</div><div class='add'>+    } while(0)</div><div class='add'>+</div><div class='add'>+#define PVR2_COMPOSE_LE(t,i) \</div><div class='add'>+    ((((u32)((t)[i+3])) &lt;&lt; 24) | \</div><div class='add'>+     (((u32)((t)[i+2])) &lt;&lt; 16) | \</div><div class='add'>+     (((u32)((t)[i+1])) &lt;&lt; 8) | \</div><div class='add'>+     ((u32)((t)[i])))</div><div class='add'>+</div><div class='add'>+#define PVR2_COMPOSE_BE(t,i) \</div><div class='add'>+    ((((u32)((t)[i])) &lt;&lt; 24) | \</div><div class='add'>+     (((u32)((t)[i+1])) &lt;&lt; 16) | \</div><div class='add'>+     (((u32)((t)[i+2])) &lt;&lt; 8) | \</div><div class='add'>+     ((u32)((t)[i+3])))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_UTIL_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c<br/>new file mode 100644<br/>index 000000000000..0caf70b8c0de<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-v4l2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-v4l2.c</a></div><div class='hunk'>@@ -0,0 +1,1124 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include "pvrusb2-context.h"</div><div class='add'>+#include "pvrusb2-hdw.h"</div><div class='add'>+#include "pvrusb2.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include "pvrusb2-v4l2.h"</div><div class='add'>+#include "pvrusb2-ioread.h"</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2_dev;</div><div class='add'>+struct pvr2_v4l2_fh;</div><div class='add'>+struct pvr2_v4l2;</div><div class='add'>+</div><div class='add'>+/* V4L no longer provide the ability to set / get a private context pointer</div><div class='add'>+   (i.e. video_get_drvdata / video_set_drvdata), which means we have to</div><div class='add'>+   concoct our own context locating mechanism.  Supposedly this is intended</div><div class='add'>+   to simplify driver implementation.  It's not clear to me how that can</div><div class='add'>+   possibly be true.  Our solution here is to maintain a lookup table of</div><div class='add'>+   our context instances, indexed by the minor device number of the V4L</div><div class='add'>+   device.  See pvr2_v4l2_open() for some implications of this approach. */</div><div class='add'>+static struct pvr2_v4l2_dev *devices[256];</div><div class='add'>+static DEFINE_MUTEX(device_lock);</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2_dev {</div><div class='add'>+	struct pvr2_v4l2 *v4lp;</div><div class='add'>+	struct video_device *vdev;</div><div class='add'>+	struct pvr2_context_stream *stream;</div><div class='add'>+	int ctxt_idx;</div><div class='add'>+	enum pvr2_config config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2_fh {</div><div class='add'>+	struct pvr2_channel channel;</div><div class='add'>+	struct pvr2_v4l2_dev *dev_info;</div><div class='add'>+	enum v4l2_priority prio;</div><div class='add'>+	struct pvr2_ioread *rhp;</div><div class='add'>+	struct file *file;</div><div class='add'>+	struct pvr2_v4l2 *vhead;</div><div class='add'>+	struct pvr2_v4l2_fh *vnext;</div><div class='add'>+	struct pvr2_v4l2_fh *vprev;</div><div class='add'>+	wait_queue_head_t wait_data;</div><div class='add'>+	int fw_mode_flag;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2 {</div><div class='add'>+	struct pvr2_channel channel;</div><div class='add'>+	struct pvr2_v4l2_fh *vfirst;</div><div class='add'>+	struct pvr2_v4l2_fh *vlast;</div><div class='add'>+</div><div class='add'>+	struct v4l2_prio_state prio;</div><div class='add'>+</div><div class='add'>+	/* streams */</div><div class='add'>+	struct pvr2_v4l2_dev video_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int video_nr[PVR_NUM] = {[0 ... PVR_NUM-1] = -1};</div><div class='add'>+module_param_array(video_nr, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(video_nr, "Offset for device's minor");</div><div class='add'>+</div><div class='add'>+static struct v4l2_capability pvr_capability ={</div><div class='add'>+	.driver         = "pvrusb2",</div><div class='add'>+	.card           = "Hauppauge WinTV pvr-usb2",</div><div class='add'>+	.bus_info       = "usb",</div><div class='add'>+	.version        = KERNEL_VERSION(0,8,0),</div><div class='add'>+	.capabilities   = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |</div><div class='add'>+			   V4L2_CAP_TUNER | V4L2_CAP_AUDIO |</div><div class='add'>+			   V4L2_CAP_READWRITE),</div><div class='add'>+	.reserved       = {0,0,0,0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct v4l2_tuner pvr_v4l2_tuners[]= {</div><div class='add'>+	{</div><div class='add'>+		.index      = 0,</div><div class='add'>+		.name       = "TV Tuner",</div><div class='add'>+		.type           = V4L2_TUNER_ANALOG_TV,</div><div class='add'>+		.capability     = (V4L2_TUNER_CAP_NORM |</div><div class='add'>+				   V4L2_TUNER_CAP_STEREO |</div><div class='add'>+				   V4L2_TUNER_CAP_LANG1 |</div><div class='add'>+				   V4L2_TUNER_CAP_LANG2),</div><div class='add'>+		.rangelow   = 0,</div><div class='add'>+		.rangehigh  = 0,</div><div class='add'>+		.rxsubchans     = V4L2_TUNER_SUB_STEREO,</div><div class='add'>+		.audmode        = V4L2_TUNER_MODE_STEREO,</div><div class='add'>+		.signal         = 0,</div><div class='add'>+		.afc            = 0,</div><div class='add'>+		.reserved       = {0,0,0,0}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct v4l2_fmtdesc pvr_fmtdesc [] = {</div><div class='add'>+	{</div><div class='add'>+		.index          = 0,</div><div class='add'>+		.type           = V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='add'>+		.flags          = V4L2_FMT_FLAG_COMPRESSED,</div><div class='add'>+		.description    = "MPEG1/2",</div><div class='add'>+		// This should really be V4L2_PIX_FMT_MPEG, but xawtv</div><div class='add'>+		// breaks when I do that.</div><div class='add'>+		.pixelformat    = 0, // V4L2_PIX_FMT_MPEG,</div><div class='add'>+		.reserved       = { 0, 0, 0, 0 }</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PVR_FORMAT_PIX  0</div><div class='add'>+#define PVR_FORMAT_VBI  1</div><div class='add'>+</div><div class='add'>+static struct v4l2_format pvr_format [] = {</div><div class='add'>+	[PVR_FORMAT_PIX] = {</div><div class='add'>+		.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE,</div><div class='add'>+		.fmt    = {</div><div class='add'>+			.pix        = {</div><div class='add'>+				.width          = 720,</div><div class='add'>+				.height             = 576,</div><div class='add'>+				// This should really be V4L2_PIX_FMT_MPEG,</div><div class='add'>+				// but xawtv breaks when I do that.</div><div class='add'>+				.pixelformat    = 0, // V4L2_PIX_FMT_MPEG,</div><div class='add'>+				.field          = V4L2_FIELD_INTERLACED,</div><div class='add'>+				.bytesperline   = 0,  // doesn't make sense</div><div class='add'>+						      // here</div><div class='add'>+				//FIXME : Don't know what to put here...</div><div class='add'>+				.sizeimage          = (32*1024),</div><div class='add'>+				.colorspace     = 0, // doesn't make sense here</div><div class='add'>+				.priv           = 0</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[PVR_FORMAT_VBI] = {</div><div class='add'>+		.type   = V4L2_BUF_TYPE_VBI_CAPTURE,</div><div class='add'>+		.fmt    = {</div><div class='add'>+			.vbi        = {</div><div class='add'>+				.sampling_rate = 27000000,</div><div class='add'>+				.offset = 248,</div><div class='add'>+				.samples_per_line = 1443,</div><div class='add'>+				.sample_format = V4L2_PIX_FMT_GREY,</div><div class='add'>+				.start = { 0, 0 },</div><div class='add'>+				.count = { 0, 0 },</div><div class='add'>+				.flags = 0,</div><div class='add'>+				.reserved = { 0, 0 }</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pvr_ioctl()</div><div class='add'>+ *</div><div class='add'>+ * This is part of Video 4 Linux API. The procedure handles ioctl() calls.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+			      unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l2_fh *fh = file-&gt;private_data;</div><div class='add'>+	struct pvr2_v4l2 *vp = fh-&gt;vhead;</div><div class='add'>+	struct pvr2_v4l2_dev *dev_info = fh-&gt;dev_info;</div><div class='add'>+	struct pvr2_hdw *hdw = fh-&gt;channel.mc_head-&gt;hdw;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pvrusb2_debug &amp; PVR2_TRACE_V4LIOCTL) {</div><div class='add'>+		v4l_print_ioctl(pvr2_hdw_get_driver_name(hdw),cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_ERROR_LEGS,</div><div class='add'>+			   "ioctl failed - bad or no context");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check priority */</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	case VIDIOC_S_TUNER:</div><div class='add'>+	case VIDIOC_S_FREQUENCY:</div><div class='add'>+		ret = v4l2_prio_check(&amp;vp-&gt;prio, &amp;fh-&gt;prio);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_QUERYCAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_capability *cap = arg;</div><div class='add'>+</div><div class='add'>+		memcpy(cap, &amp;pvr_capability, sizeof(struct v4l2_capability));</div><div class='add'>+</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_PRIORITY:</div><div class='add'>+	{</div><div class='add'>+		enum v4l2_priority *p = arg;</div><div class='add'>+</div><div class='add'>+		*p = v4l2_prio_max(&amp;vp-&gt;prio);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_PRIORITY:</div><div class='add'>+	{</div><div class='add'>+		enum v4l2_priority *prio = arg;</div><div class='add'>+</div><div class='add'>+		ret = v4l2_prio_change(&amp;vp-&gt;prio, &amp;fh-&gt;prio, *prio);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_ENUMSTD:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_standard *vs = (struct v4l2_standard *)arg;</div><div class='add'>+		int idx = vs-&gt;index;</div><div class='add'>+		ret = pvr2_hdw_get_stdenum_value(hdw,vs,idx+1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_STD:</div><div class='add'>+	{</div><div class='add'>+		int val = 0;</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_STDCUR),&amp;val);</div><div class='add'>+		*(v4l2_std_id *)arg = val;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_STDCUR),</div><div class='add'>+			*(v4l2_std_id *)arg);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_ENUMINPUT:</div><div class='add'>+	{</div><div class='add'>+		struct pvr2_ctrl *cptr;</div><div class='add'>+		struct v4l2_input *vi = (struct v4l2_input *)arg;</div><div class='add'>+		struct v4l2_input tmp;</div><div class='add'>+		unsigned int cnt;</div><div class='add'>+</div><div class='add'>+		cptr = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT);</div><div class='add'>+</div><div class='add'>+		memset(&amp;tmp,0,sizeof(tmp));</div><div class='add'>+		tmp.index = vi-&gt;index;</div><div class='add'>+		ret = 0;</div><div class='add'>+		switch (vi-&gt;index) {</div><div class='add'>+		case PVR2_CVAL_INPUT_TV:</div><div class='add'>+		case PVR2_CVAL_INPUT_RADIO:</div><div class='add'>+			tmp.type = V4L2_INPUT_TYPE_TUNER;</div><div class='add'>+			break;</div><div class='add'>+		case PVR2_CVAL_INPUT_SVIDEO:</div><div class='add'>+		case PVR2_CVAL_INPUT_COMPOSITE:</div><div class='add'>+			tmp.type = V4L2_INPUT_TYPE_CAMERA;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (ret &lt; 0) break;</div><div class='add'>+</div><div class='add'>+		cnt = 0;</div><div class='add'>+		pvr2_ctrl_get_valname(cptr,vi-&gt;index,</div><div class='add'>+				      tmp.name,sizeof(tmp.name)-1,&amp;cnt);</div><div class='add'>+		tmp.name[cnt] = 0;</div><div class='add'>+</div><div class='add'>+		/* Don't bother with audioset, since this driver currently</div><div class='add'>+		   always switches the audio whenever the video is</div><div class='add'>+		   switched. */</div><div class='add'>+</div><div class='add'>+		/* Handling std is a tougher problem.  It doesn't make</div><div class='add'>+		   sense in cases where a device might be multi-standard.</div><div class='add'>+		   We could just copy out the current value for the</div><div class='add'>+		   standard, but it can change over time.  For now just</div><div class='add'>+		   leave it zero. */</div><div class='add'>+</div><div class='add'>+		memcpy(vi, &amp;tmp, sizeof(tmp));</div><div class='add'>+</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_INPUT:</div><div class='add'>+	{</div><div class='add'>+		struct pvr2_ctrl *cptr;</div><div class='add'>+		struct v4l2_input *vi = (struct v4l2_input *)arg;</div><div class='add'>+		int val;</div><div class='add'>+		cptr = pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT);</div><div class='add'>+		val = 0;</div><div class='add'>+		ret = pvr2_ctrl_get_value(cptr,&amp;val);</div><div class='add'>+		vi-&gt;index = val;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_input *vi = (struct v4l2_input *)arg;</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_INPUT),</div><div class='add'>+			vi-&gt;index);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_ENUMAUDIO:</div><div class='add'>+	{</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_AUDIO:</div><div class='add'>+	{</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_AUDIO:</div><div class='add'>+	{</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *vt = (struct v4l2_tuner *)arg;</div><div class='add'>+		unsigned int status_mask;</div><div class='add'>+		int val;</div><div class='add'>+		if (vt-&gt;index !=0) break;</div><div class='add'>+</div><div class='add'>+		status_mask = pvr2_hdw_get_signal_status(hdw);</div><div class='add'>+</div><div class='add'>+		memcpy(vt, &amp;pvr_v4l2_tuners[vt-&gt;index],</div><div class='add'>+		       sizeof(struct v4l2_tuner));</div><div class='add'>+</div><div class='add'>+		vt-&gt;signal = 0;</div><div class='add'>+		if (status_mask &amp; PVR2_SIGNAL_OK) {</div><div class='add'>+			if (status_mask &amp; PVR2_SIGNAL_STEREO) {</div><div class='add'>+				vt-&gt;rxsubchans = V4L2_TUNER_SUB_STEREO;</div><div class='add'>+			} else {</div><div class='add'>+				vt-&gt;rxsubchans = V4L2_TUNER_SUB_MONO;</div><div class='add'>+			}</div><div class='add'>+			if (status_mask &amp; PVR2_SIGNAL_SAP) {</div><div class='add'>+				vt-&gt;rxsubchans |= (V4L2_TUNER_SUB_LANG1 |</div><div class='add'>+						   V4L2_TUNER_SUB_LANG2);</div><div class='add'>+			}</div><div class='add'>+			vt-&gt;signal = 65535;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val = 0;</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_AUDIOMODE),</div><div class='add'>+			&amp;val);</div><div class='add'>+		vt-&gt;audmode = val;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *vt=(struct v4l2_tuner *)arg;</div><div class='add'>+</div><div class='add'>+		if (vt-&gt;index != 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_AUDIOMODE),</div><div class='add'>+			vt-&gt;audmode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		const struct v4l2_frequency *vf = (struct v4l2_frequency *)arg;</div><div class='add'>+		ret = pvr2_ctrl_set_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_FREQUENCY),</div><div class='add'>+			vf-&gt;frequency * 62500);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_frequency *vf = (struct v4l2_frequency *)arg;</div><div class='add'>+		int val = 0;</div><div class='add'>+		ret = pvr2_ctrl_get_value(</div><div class='add'>+			pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_FREQUENCY),</div><div class='add'>+			&amp;val);</div><div class='add'>+		val /= 62500;</div><div class='add'>+		vf-&gt;frequency = val;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_ENUM_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_fmtdesc *fd = (struct v4l2_fmtdesc *)arg;</div><div class='add'>+</div><div class='add'>+		/* Only one format is supported : mpeg.*/</div><div class='add'>+		if (fd-&gt;index != 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memcpy(fd, pvr_fmtdesc, sizeof(struct v4l2_fmtdesc));</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *vf = (struct v4l2_format *)arg;</div><div class='add'>+		int val;</div><div class='add'>+		switch(vf-&gt;type) {</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+			memcpy(vf, &amp;pvr_format[PVR_FORMAT_PIX],</div><div class='add'>+			       sizeof(struct v4l2_format));</div><div class='add'>+			val = 0;</div><div class='add'>+			pvr2_ctrl_get_value(</div><div class='add'>+				pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_HRES),</div><div class='add'>+				&amp;val);</div><div class='add'>+			vf-&gt;fmt.pix.width = val;</div><div class='add'>+			val = 0;</div><div class='add'>+			pvr2_ctrl_get_value(</div><div class='add'>+				pvr2_hdw_get_ctrl_by_id(hdw,PVR2_CID_VRES),</div><div class='add'>+				&amp;val);</div><div class='add'>+			vf-&gt;fmt.pix.height = val;</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+			// ????? Still need to figure out to do VBI correctly</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_TRY_FMT:</div><div class='add'>+	case VIDIOC_S_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *vf = (struct v4l2_format *)arg;</div><div class='add'>+</div><div class='add'>+		ret = 0;</div><div class='add'>+		switch(vf-&gt;type) {</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_CAPTURE: {</div><div class='add'>+			int h = vf-&gt;fmt.pix.height;</div><div class='add'>+			int w = vf-&gt;fmt.pix.width;</div><div class='add'>+</div><div class='add'>+			if (h &lt; 200) {</div><div class='add'>+				h = 200;</div><div class='add'>+			} else if (h &gt; 625) {</div><div class='add'>+				h = 625;</div><div class='add'>+			}</div><div class='add'>+			if (w &lt; 320) {</div><div class='add'>+				w = 320;</div><div class='add'>+			} else if (w &gt; 720) {</div><div class='add'>+				w = 720;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memcpy(vf, &amp;pvr_format[PVR_FORMAT_PIX],</div><div class='add'>+			       sizeof(struct v4l2_format));</div><div class='add'>+			vf-&gt;fmt.pix.width = w;</div><div class='add'>+			vf-&gt;fmt.pix.height = h;</div><div class='add'>+</div><div class='add'>+			if (cmd == VIDIOC_S_FMT) {</div><div class='add'>+				pvr2_ctrl_set_value(</div><div class='add'>+					pvr2_hdw_get_ctrl_by_id(hdw,</div><div class='add'>+								PVR2_CID_HRES),</div><div class='add'>+					vf-&gt;fmt.pix.width);</div><div class='add'>+				pvr2_ctrl_set_value(</div><div class='add'>+					pvr2_hdw_get_ctrl_by_id(hdw,</div><div class='add'>+								PVR2_CID_VRES),</div><div class='add'>+					vf-&gt;fmt.pix.height);</div><div class='add'>+			}</div><div class='add'>+		} break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+			// ????? Still need to figure out to do VBI correctly</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_STREAMON:</div><div class='add'>+	{</div><div class='add'>+		ret = pvr2_hdw_set_stream_type(hdw,dev_info-&gt;config);</div><div class='add'>+		if (ret &lt; 0) return ret;</div><div class='add'>+		ret = pvr2_hdw_set_streaming(hdw,!0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_STREAMOFF:</div><div class='add'>+	{</div><div class='add'>+		ret = pvr2_hdw_set_streaming(hdw,0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct pvr2_ctrl *cptr;</div><div class='add'>+		struct v4l2_queryctrl *vc = (struct v4l2_queryctrl *)arg;</div><div class='add'>+		ret = 0;</div><div class='add'>+		if (vc-&gt;id &amp; V4L2_CTRL_FLAG_NEXT_CTRL) {</div><div class='add'>+			cptr = pvr2_hdw_get_ctrl_nextv4l(</div><div class='add'>+				hdw,(vc-&gt;id &amp; ~V4L2_CTRL_FLAG_NEXT_CTRL));</div><div class='add'>+			if (cptr) vc-&gt;id = pvr2_ctrl_get_v4lid(cptr);</div><div class='add'>+		} else {</div><div class='add'>+			cptr = pvr2_hdw_get_ctrl_v4l(hdw,vc-&gt;id);</div><div class='add'>+		}</div><div class='add'>+		if (!cptr) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_V4LIOCTL,</div><div class='add'>+				   "QUERYCTRL id=0x%x not implemented here",</div><div class='add'>+				   vc-&gt;id);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pvr2_trace(PVR2_TRACE_V4LIOCTL,</div><div class='add'>+			   "QUERYCTRL id=0x%x mapping name=%s (%s)",</div><div class='add'>+			   vc-&gt;id,pvr2_ctrl_get_name(cptr),</div><div class='add'>+			   pvr2_ctrl_get_desc(cptr));</div><div class='add'>+		strlcpy(vc-&gt;name,pvr2_ctrl_get_desc(cptr),sizeof(vc-&gt;name));</div><div class='add'>+		vc-&gt;flags = pvr2_ctrl_get_v4lflags(cptr);</div><div class='add'>+		vc-&gt;default_value = pvr2_ctrl_get_def(cptr);</div><div class='add'>+		switch (pvr2_ctrl_get_type(cptr)) {</div><div class='add'>+		case pvr2_ctl_enum:</div><div class='add'>+			vc-&gt;type = V4L2_CTRL_TYPE_MENU;</div><div class='add'>+			vc-&gt;minimum = 0;</div><div class='add'>+			vc-&gt;maximum = pvr2_ctrl_get_cnt(cptr) - 1;</div><div class='add'>+			vc-&gt;step = 1;</div><div class='add'>+			break;</div><div class='add'>+		case pvr2_ctl_bool:</div><div class='add'>+			vc-&gt;type = V4L2_CTRL_TYPE_BOOLEAN;</div><div class='add'>+			vc-&gt;minimum = 0;</div><div class='add'>+			vc-&gt;maximum = 1;</div><div class='add'>+			vc-&gt;step = 1;</div><div class='add'>+			break;</div><div class='add'>+		case pvr2_ctl_int:</div><div class='add'>+			vc-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+			vc-&gt;minimum = pvr2_ctrl_get_min(cptr);</div><div class='add'>+			vc-&gt;maximum = pvr2_ctrl_get_max(cptr);</div><div class='add'>+			vc-&gt;step = 1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pvr2_trace(PVR2_TRACE_V4LIOCTL,</div><div class='add'>+				   "QUERYCTRL id=0x%x name=%s not mappable",</div><div class='add'>+				   vc-&gt;id,pvr2_ctrl_get_name(cptr));</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_QUERYMENU:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_querymenu *vm = (struct v4l2_querymenu *)arg;</div><div class='add'>+		unsigned int cnt = 0;</div><div class='add'>+		ret = pvr2_ctrl_get_valname(pvr2_hdw_get_ctrl_v4l(hdw,vm-&gt;id),</div><div class='add'>+					    vm-&gt;index,</div><div class='add'>+					    vm-&gt;name,sizeof(vm-&gt;name)-1,</div><div class='add'>+					    &amp;cnt);</div><div class='add'>+		vm-&gt;name[cnt] = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *vc = (struct v4l2_control *)arg;</div><div class='add'>+		int val = 0;</div><div class='add'>+		ret = pvr2_ctrl_get_value(pvr2_hdw_get_ctrl_v4l(hdw,vc-&gt;id),</div><div class='add'>+					  &amp;val);</div><div class='add'>+		vc-&gt;value = val;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *vc = (struct v4l2_control *)arg;</div><div class='add'>+		ret = pvr2_ctrl_set_value(pvr2_hdw_get_ctrl_v4l(hdw,vc-&gt;id),</div><div class='add'>+					  vc-&gt;value);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *ctls =</div><div class='add'>+			(struct v4l2_ext_controls *)arg;</div><div class='add'>+		struct v4l2_ext_control *ctrl;</div><div class='add'>+		unsigned int idx;</div><div class='add'>+		int val;</div><div class='add'>+		for (idx = 0; idx &lt; ctls-&gt;count; idx++) {</div><div class='add'>+			ctrl = ctls-&gt;controls + idx;</div><div class='add'>+			ret = pvr2_ctrl_get_value(</div><div class='add'>+				pvr2_hdw_get_ctrl_v4l(hdw,ctrl-&gt;id),&amp;val);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ctls-&gt;error_idx = idx;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/* Ensure that if read as a 64 bit value, the user</div><div class='add'>+			   will still get a hopefully sane value */</div><div class='add'>+			ctrl-&gt;value64 = 0;</div><div class='add'>+			ctrl-&gt;value = val;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *ctls =</div><div class='add'>+			(struct v4l2_ext_controls *)arg;</div><div class='add'>+		struct v4l2_ext_control *ctrl;</div><div class='add'>+		unsigned int idx;</div><div class='add'>+		for (idx = 0; idx &lt; ctls-&gt;count; idx++) {</div><div class='add'>+			ctrl = ctls-&gt;controls + idx;</div><div class='add'>+			ret = pvr2_ctrl_set_value(</div><div class='add'>+				pvr2_hdw_get_ctrl_v4l(hdw,ctrl-&gt;id),</div><div class='add'>+				ctrl-&gt;value);</div><div class='add'>+			if (ret) {</div><div class='add'>+				ctls-&gt;error_idx = idx;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_TRY_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *ctls =</div><div class='add'>+			(struct v4l2_ext_controls *)arg;</div><div class='add'>+		struct v4l2_ext_control *ctrl;</div><div class='add'>+		struct pvr2_ctrl *pctl;</div><div class='add'>+		unsigned int idx;</div><div class='add'>+		/* For the moment just validate that the requested control</div><div class='add'>+		   actually exists. */</div><div class='add'>+		for (idx = 0; idx &lt; ctls-&gt;count; idx++) {</div><div class='add'>+			ctrl = ctls-&gt;controls + idx;</div><div class='add'>+			pctl = pvr2_hdw_get_ctrl_v4l(hdw,ctrl-&gt;id);</div><div class='add'>+			if (!pctl) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				ctls-&gt;error_idx = idx;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case VIDIOC_LOG_STATUS:</div><div class='add'>+	{</div><div class='add'>+		pvr2_hdw_trigger_module_log(hdw);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	default :</div><div class='add'>+		ret = v4l_compat_translate_ioctl(inode,file,cmd,</div><div class='add'>+						 arg,pvr2_v4l2_do_ioctl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_commit_ctl(hdw);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		if (pvrusb2_debug &amp; PVR2_TRACE_V4LIOCTL) {</div><div class='add'>+			pvr2_trace(PVR2_TRACE_V4LIOCTL,</div><div class='add'>+				   "pvr2_v4l2_do_ioctl failure, ret=%d",ret);</div><div class='add'>+		} else {</div><div class='add'>+			if (pvrusb2_debug &amp; PVR2_TRACE_V4LIOCTL) {</div><div class='add'>+				pvr2_trace(PVR2_TRACE_V4LIOCTL,</div><div class='add'>+					   "pvr2_v4l2_do_ioctl failure, ret=%d"</div><div class='add'>+					   " command was:",ret);</div><div class='add'>+				v4l_print_ioctl(pvr2_hdw_get_driver_name(hdw),</div><div class='add'>+						cmd);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_V4LIOCTL,</div><div class='add'>+			   "pvr2_v4l2_do_ioctl complete, ret=%d (0x%x)",</div><div class='add'>+			   ret,ret);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "pvrusb2: unregistering device video%d [%s]\n",</div><div class='add'>+	       dip-&gt;vdev-&gt;minor,pvr2_config_get_name(dip-&gt;config));</div><div class='add'>+	if (dip-&gt;ctxt_idx &gt;= 0) {</div><div class='add'>+		mutex_lock(&amp;device_lock);</div><div class='add'>+		devices[dip-&gt;ctxt_idx] = NULL;</div><div class='add'>+		dip-&gt;ctxt_idx = -1;</div><div class='add'>+		mutex_unlock(&amp;device_lock);</div><div class='add'>+	}</div><div class='add'>+	video_unregister_device(dip-&gt;vdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_v4l2_destroy_no_lock(struct pvr2_v4l2 *vp)</div><div class='add'>+{</div><div class='add'>+	pvr2_hdw_v4l_store_minor_number(vp-&gt;channel.mc_head-&gt;hdw,-1);</div><div class='add'>+	pvr2_v4l2_dev_destroy(&amp;vp-&gt;video_dev);</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"Destroying pvr2_v4l2 id=%p",vp);</div><div class='add'>+	pvr2_channel_done(&amp;vp-&gt;channel);</div><div class='add'>+	kfree(vp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_v4l2_internal_check(struct pvr2_channel *chp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l2 *vp;</div><div class='add'>+	vp = container_of(chp,struct pvr2_v4l2,channel);</div><div class='add'>+	if (!vp-&gt;channel.mc_head-&gt;disconnect_flag) return;</div><div class='add'>+	if (vp-&gt;vfirst) return;</div><div class='add'>+	pvr2_v4l2_destroy_no_lock(vp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_v4l2_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+			   unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+/* Temporary hack : use ivtv api until a v4l2 one is available. */</div><div class='add'>+#define IVTV_IOC_G_CODEC        0xFFEE7703</div><div class='add'>+#define IVTV_IOC_S_CODEC        0xFFEE7704</div><div class='add'>+	if (cmd == IVTV_IOC_G_CODEC || cmd == IVTV_IOC_S_CODEC) return 0;</div><div class='add'>+	return video_usercopy(inode, file, cmd, arg, pvr2_v4l2_do_ioctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_v4l2_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l2_fh *fhp = file-&gt;private_data;</div><div class='add'>+	struct pvr2_v4l2 *vp = fhp-&gt;vhead;</div><div class='add'>+	struct pvr2_context *mp = fhp-&gt;vhead-&gt;channel.mc_head;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_OPEN_CLOSE,"pvr2_v4l2_release");</div><div class='add'>+</div><div class='add'>+	if (fhp-&gt;rhp) {</div><div class='add'>+		struct pvr2_stream *sp;</div><div class='add'>+		struct pvr2_hdw *hdw;</div><div class='add'>+		hdw = fhp-&gt;channel.mc_head-&gt;hdw;</div><div class='add'>+		pvr2_hdw_set_streaming(hdw,0);</div><div class='add'>+		sp = pvr2_ioread_get_stream(fhp-&gt;rhp);</div><div class='add'>+		if (sp) pvr2_stream_set_callback(sp,NULL,NULL);</div><div class='add'>+		pvr2_ioread_destroy(fhp-&gt;rhp);</div><div class='add'>+		fhp-&gt;rhp = NULL;</div><div class='add'>+	}</div><div class='add'>+	v4l2_prio_close(&amp;vp-&gt;prio, &amp;fhp-&gt;prio);</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+</div><div class='add'>+	pvr2_context_enter(mp); do {</div><div class='add'>+		if (fhp-&gt;vnext) {</div><div class='add'>+			fhp-&gt;vnext-&gt;vprev = fhp-&gt;vprev;</div><div class='add'>+		} else {</div><div class='add'>+			vp-&gt;vlast = fhp-&gt;vprev;</div><div class='add'>+		}</div><div class='add'>+		if (fhp-&gt;vprev) {</div><div class='add'>+			fhp-&gt;vprev-&gt;vnext = fhp-&gt;vnext;</div><div class='add'>+		} else {</div><div class='add'>+			vp-&gt;vfirst = fhp-&gt;vnext;</div><div class='add'>+		}</div><div class='add'>+		fhp-&gt;vnext = NULL;</div><div class='add'>+		fhp-&gt;vprev = NULL;</div><div class='add'>+		fhp-&gt;vhead = NULL;</div><div class='add'>+		pvr2_channel_done(&amp;fhp-&gt;channel);</div><div class='add'>+		pvr2_trace(PVR2_TRACE_STRUCT,</div><div class='add'>+			   "Destroying pvr_v4l2_fh id=%p",fhp);</div><div class='add'>+		kfree(fhp);</div><div class='add'>+		if (vp-&gt;channel.mc_head-&gt;disconnect_flag &amp;&amp; !vp-&gt;vfirst) {</div><div class='add'>+			pvr2_v4l2_destroy_no_lock(vp);</div><div class='add'>+		}</div><div class='add'>+	} while (0); pvr2_context_exit(mp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pvr2_v4l2_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l2_dev *dip = NULL; /* Our own context pointer */</div><div class='add'>+	struct pvr2_v4l2_fh *fhp;</div><div class='add'>+	struct pvr2_v4l2 *vp;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;device_lock);</div><div class='add'>+	/* MCI 7-Jun-2006 Even though we're just doing what amounts to an</div><div class='add'>+	   atomic read of the device mapping array here, we still need the</div><div class='add'>+	   mutex.  The problem is that there is a tiny race possible when</div><div class='add'>+	   we register the device.  We can't update the device mapping</div><div class='add'>+	   array until after the device has been registered, owing to the</div><div class='add'>+	   fact that we can't know the minor device number until after the</div><div class='add'>+	   registration succeeds.  And if another thread tries to open the</div><div class='add'>+	   device in the window of time after registration but before the</div><div class='add'>+	   map is updated, then it will get back an erroneous null pointer</div><div class='add'>+	   and the open will result in a spurious failure.  The only way to</div><div class='add'>+	   prevent that is to (a) be inside the mutex here before we access</div><div class='add'>+	   the array, and (b) cover the entire registration process later</div><div class='add'>+	   on with this same mutex.  Thus if we get inside the mutex here,</div><div class='add'>+	   then we can be assured that the registration process actually</div><div class='add'>+	   completed correctly.  This is an unhappy complication from the</div><div class='add'>+	   use of global data in a driver that lives in a preemptible</div><div class='add'>+	   environment.  It sure would be nice if the video device itself</div><div class='add'>+	   had a means for storing and retrieving a local context pointer.</div><div class='add'>+	   Oh wait.  It did.  But now it's gone.  Silly me. */</div><div class='add'>+	{</div><div class='add'>+		unsigned int midx = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='add'>+		if (midx &lt; sizeof(devices)/sizeof(devices[0])) {</div><div class='add'>+			dip = devices[midx];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;device_lock);</div><div class='add'>+</div><div class='add'>+	if (!dip) return -ENODEV; /* Should be impossible but I'm paranoid */</div><div class='add'>+</div><div class='add'>+	vp = dip-&gt;v4lp;</div><div class='add'>+	hdw = vp-&gt;channel.hdw;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_OPEN_CLOSE,"pvr2_v4l2_open");</div><div class='add'>+</div><div class='add'>+	if (!pvr2_hdw_dev_ok(hdw)) {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_OPEN_CLOSE,</div><div class='add'>+			   "pvr2_v4l2_open: hardware not ready");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fhp = kmalloc(sizeof(*fhp),GFP_KERNEL);</div><div class='add'>+	if (!fhp) {</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memset(fhp,0,sizeof(*fhp));</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;fhp-&gt;wait_data);</div><div class='add'>+	fhp-&gt;dev_info = dip;</div><div class='add'>+</div><div class='add'>+	pvr2_context_enter(vp-&gt;channel.mc_head); do {</div><div class='add'>+		pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr_v4l2_fh id=%p",fhp);</div><div class='add'>+		pvr2_channel_init(&amp;fhp-&gt;channel,vp-&gt;channel.mc_head);</div><div class='add'>+		fhp-&gt;vnext = NULL;</div><div class='add'>+		fhp-&gt;vprev = vp-&gt;vlast;</div><div class='add'>+		if (vp-&gt;vlast) {</div><div class='add'>+			vp-&gt;vlast-&gt;vnext = fhp;</div><div class='add'>+		} else {</div><div class='add'>+			vp-&gt;vfirst = fhp;</div><div class='add'>+		}</div><div class='add'>+		vp-&gt;vlast = fhp;</div><div class='add'>+		fhp-&gt;vhead = vp;</div><div class='add'>+	} while (0); pvr2_context_exit(vp-&gt;channel.mc_head);</div><div class='add'>+</div><div class='add'>+	fhp-&gt;file = file;</div><div class='add'>+	file-&gt;private_data = fhp;</div><div class='add'>+	v4l2_prio_open(&amp;vp-&gt;prio,&amp;fhp-&gt;prio);</div><div class='add'>+</div><div class='add'>+	fhp-&gt;fw_mode_flag = pvr2_hdw_cpufw_get_enabled(hdw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_v4l2_notify(struct pvr2_v4l2_fh *fhp)</div><div class='add'>+{</div><div class='add'>+	wake_up(&amp;fhp-&gt;wait_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct pvr2_stream *sp;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	if (fh-&gt;rhp) return 0;</div><div class='add'>+</div><div class='add'>+	/* First read() attempt.  Try to claim the stream and start</div><div class='add'>+	   it... */</div><div class='add'>+	if ((ret = pvr2_channel_claim_stream(&amp;fh-&gt;channel,</div><div class='add'>+					     fh-&gt;dev_info-&gt;stream)) != 0) {</div><div class='add'>+		/* Someone else must already have it */</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fh-&gt;rhp = pvr2_channel_create_mpeg_stream(fh-&gt;dev_info-&gt;stream);</div><div class='add'>+	if (!fh-&gt;rhp) {</div><div class='add'>+		pvr2_channel_claim_stream(&amp;fh-&gt;channel,NULL);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdw = fh-&gt;channel.mc_head-&gt;hdw;</div><div class='add'>+	sp = fh-&gt;dev_info-&gt;stream-&gt;stream;</div><div class='add'>+	pvr2_stream_set_callback(sp,(pvr2_stream_callback)pvr2_v4l2_notify,fh);</div><div class='add'>+	pvr2_hdw_set_stream_type(hdw,fh-&gt;dev_info-&gt;config);</div><div class='add'>+	pvr2_hdw_set_streaming(hdw,!0);</div><div class='add'>+	ret = pvr2_ioread_set_enabled(fh-&gt;rhp,!0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t pvr2_v4l2_read(struct file *file,</div><div class='add'>+			      char __user *buff, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l2_fh *fh = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fh-&gt;fw_mode_flag) {</div><div class='add'>+		struct pvr2_hdw *hdw = fh-&gt;channel.mc_head-&gt;hdw;</div><div class='add'>+		char *tbuf;</div><div class='add'>+		int c1,c2;</div><div class='add'>+		int tcnt = 0;</div><div class='add'>+		unsigned int offs = *ppos;</div><div class='add'>+</div><div class='add'>+		tbuf = kmalloc(PAGE_SIZE,GFP_KERNEL);</div><div class='add'>+		if (!tbuf) return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		while (count) {</div><div class='add'>+			c1 = count;</div><div class='add'>+			if (c1 &gt; PAGE_SIZE) c1 = PAGE_SIZE;</div><div class='add'>+			c2 = pvr2_hdw_cpufw_get(hdw,offs,tbuf,c1);</div><div class='add'>+			if (c2 &lt; 0) {</div><div class='add'>+				tcnt = c2;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!c2) break;</div><div class='add'>+			if (copy_to_user(buff,tbuf,c2)) {</div><div class='add'>+				tcnt = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			offs += c2;</div><div class='add'>+			tcnt += c2;</div><div class='add'>+			buff += c2;</div><div class='add'>+			count -= c2;</div><div class='add'>+			*ppos += c2;</div><div class='add'>+		}</div><div class='add'>+		kfree(tbuf);</div><div class='add'>+		return tcnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!fh-&gt;rhp) {</div><div class='add'>+		ret = pvr2_v4l2_iosetup(fh);</div><div class='add'>+		if (ret) {</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		ret = pvr2_ioread_read(fh-&gt;rhp,buff,count);</div><div class='add'>+		if (ret &gt;= 0) break;</div><div class='add'>+		if (ret != -EAGAIN) break;</div><div class='add'>+		if (file-&gt;f_flags &amp; O_NONBLOCK) break;</div><div class='add'>+		/* Doing blocking I/O.  Wait here. */</div><div class='add'>+		ret = wait_event_interruptible(</div><div class='add'>+			fh-&gt;wait_data,</div><div class='add'>+			pvr2_ioread_avail(fh-&gt;rhp) &gt;= 0);</div><div class='add'>+		if (ret &lt; 0) break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int pvr2_v4l2_poll(struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	unsigned int mask = 0;</div><div class='add'>+	struct pvr2_v4l2_fh *fh = file-&gt;private_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (fh-&gt;fw_mode_flag) {</div><div class='add'>+		mask |= POLLIN | POLLRDNORM;</div><div class='add'>+		return mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!fh-&gt;rhp) {</div><div class='add'>+		ret = pvr2_v4l2_iosetup(fh);</div><div class='add'>+		if (ret) return POLLERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	poll_wait(file,&amp;fh-&gt;wait_data,wait);</div><div class='add'>+</div><div class='add'>+	if (pvr2_ioread_avail(fh-&gt;rhp) &gt;= 0) {</div><div class='add'>+		mask |= POLLIN | POLLRDNORM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct file_operations vdev_fops = {</div><div class='add'>+	.owner      = THIS_MODULE,</div><div class='add'>+	.open       = pvr2_v4l2_open,</div><div class='add'>+	.release    = pvr2_v4l2_release,</div><div class='add'>+	.read       = pvr2_v4l2_read,</div><div class='add'>+	.ioctl      = pvr2_v4l2_ioctl,</div><div class='add'>+	.llseek     = no_llseek,</div><div class='add'>+	.poll       = pvr2_v4l2_poll,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define VID_HARDWARE_PVRUSB2    38  /* FIXME : need a good value */</div><div class='add'>+</div><div class='add'>+static struct video_device vdev_template = {</div><div class='add'>+	.owner      = THIS_MODULE,</div><div class='add'>+	.type       = VID_TYPE_CAPTURE | VID_TYPE_TUNER,</div><div class='add'>+	.type2      = (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE</div><div class='add'>+		       | V4L2_CAP_TUNER | V4L2_CAP_AUDIO</div><div class='add'>+		       | V4L2_CAP_READWRITE),</div><div class='add'>+	.hardware   = VID_HARDWARE_PVRUSB2,</div><div class='add'>+	.fops       = &amp;vdev_fops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,</div><div class='add'>+			       struct pvr2_v4l2 *vp,</div><div class='add'>+			       enum pvr2_config cfg)</div><div class='add'>+{</div><div class='add'>+	int mindevnum;</div><div class='add'>+	int unit_number;</div><div class='add'>+	int v4l_type;</div><div class='add'>+	dip-&gt;v4lp = vp;</div><div class='add'>+	dip-&gt;config = cfg;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	switch (cfg) {</div><div class='add'>+	case pvr2_config_mpeg:</div><div class='add'>+		v4l_type = VFL_TYPE_GRABBER;</div><div class='add'>+		dip-&gt;stream = &amp;vp-&gt;channel.mc_head-&gt;video_stream;</div><div class='add'>+		break;</div><div class='add'>+	case pvr2_config_vbi:</div><div class='add'>+		v4l_type = VFL_TYPE_VBI;</div><div class='add'>+		break;</div><div class='add'>+	case pvr2_config_radio:</div><div class='add'>+		v4l_type = VFL_TYPE_RADIO;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Bail out (this should be impossible) */</div><div class='add'>+		err("Failed to set up pvrusb2 v4l dev"</div><div class='add'>+		    " due to unrecognized config");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dip-&gt;stream) {</div><div class='add'>+		err("Failed to set up pvrusb2 v4l dev"</div><div class='add'>+		    " due to missing stream instance");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dip-&gt;vdev = video_device_alloc();</div><div class='add'>+	if (!dip-&gt;vdev) {</div><div class='add'>+		err("Alloc of pvrusb2 v4l video device failed");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(dip-&gt;vdev,&amp;vdev_template,sizeof(vdev_template));</div><div class='add'>+	dip-&gt;vdev-&gt;release = video_device_release;</div><div class='add'>+	mutex_lock(&amp;device_lock);</div><div class='add'>+</div><div class='add'>+	mindevnum = -1;</div><div class='add'>+	unit_number = pvr2_hdw_get_unit_number(vp-&gt;channel.mc_head-&gt;hdw);</div><div class='add'>+	if ((unit_number &gt;= 0) &amp;&amp; (unit_number &lt; PVR_NUM)) {</div><div class='add'>+		mindevnum = video_nr[unit_number];</div><div class='add'>+	}</div><div class='add'>+	if ((video_register_device(dip-&gt;vdev, v4l_type, mindevnum) &lt; 0) &amp;&amp;</div><div class='add'>+	    (video_register_device(dip-&gt;vdev, v4l_type, -1) &lt; 0)) {</div><div class='add'>+		err("Failed to register pvrusb2 v4l video device");</div><div class='add'>+	} else {</div><div class='add'>+		printk(KERN_INFO "pvrusb2: registered device video%d [%s]\n",</div><div class='add'>+		       dip-&gt;vdev-&gt;minor,pvr2_config_get_name(dip-&gt;config));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((dip-&gt;vdev-&gt;minor &lt; sizeof(devices)/sizeof(devices[0])) &amp;&amp;</div><div class='add'>+	    (devices[dip-&gt;vdev-&gt;minor] == NULL)) {</div><div class='add'>+		dip-&gt;ctxt_idx = dip-&gt;vdev-&gt;minor;</div><div class='add'>+		devices[dip-&gt;ctxt_idx] = dip;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;device_lock);</div><div class='add'>+</div><div class='add'>+	pvr2_hdw_v4l_store_minor_number(vp-&gt;channel.mc_head-&gt;hdw,</div><div class='add'>+					dip-&gt;vdev-&gt;minor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *mnp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l2 *vp;</div><div class='add'>+</div><div class='add'>+	vp = kmalloc(sizeof(*vp),GFP_KERNEL);</div><div class='add'>+	if (!vp) return vp;</div><div class='add'>+	memset(vp,0,sizeof(*vp));</div><div class='add'>+	vp-&gt;video_dev.ctxt_idx = -1;</div><div class='add'>+	pvr2_channel_init(&amp;vp-&gt;channel,mnp);</div><div class='add'>+	pvr2_trace(PVR2_TRACE_STRUCT,"Creating pvr2_v4l2 id=%p",vp);</div><div class='add'>+</div><div class='add'>+	vp-&gt;channel.check_func = pvr2_v4l2_internal_check;</div><div class='add'>+</div><div class='add'>+	/* register streams */</div><div class='add'>+	pvr2_v4l2_dev_init(&amp;vp-&gt;video_dev,vp,pvr2_config_mpeg);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return vp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.h b/drivers/media/video/pvrusb2/pvrusb2-v4l2.h<br/>new file mode 100644<br/>index 000000000000..9a995e2d2256<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-v4l2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-v4l2.h</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef __PVRUSB2_V4L2_H</div><div class='add'>+#define __PVRUSB2_V4L2_H</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-context.h"</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2;</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l2 *pvr2_v4l2_create(struct pvr2_context *);</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_V4L2_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 75 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c<br/>new file mode 100644<br/>index 000000000000..05f2cddeb47b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-video-v4l.c</a></div><div class='hunk'>@@ -0,0 +1,253 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   This source file is specifically designed to interface with the</div><div class='add'>+   saa711x support that is available in the v4l available starting</div><div class='add'>+   with linux 2.6.15.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-video-v4l.h"</div><div class='add'>+#include "pvrusb2-i2c-cmd-v4l2.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/saa7115.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l_decoder {</div><div class='add'>+	struct pvr2_i2c_handler handler;</div><div class='add'>+	struct pvr2_decoder_ctrl ctrl;</div><div class='add'>+	struct pvr2_i2c_client *client;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	unsigned long stale_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_input(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	struct v4l2_routing route;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_input(%d)",hdw-&gt;input_val);</div><div class='add'>+	switch(hdw-&gt;input_val) {</div><div class='add'>+	case PVR2_CVAL_INPUT_TV:</div><div class='add'>+		route.input = SAA7115_COMPOSITE4;</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_COMPOSITE:</div><div class='add'>+		route.input = SAA7115_COMPOSITE5;</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_SVIDEO:</div><div class='add'>+		route.input = SAA7115_SVIDEO2;</div><div class='add'>+		break;</div><div class='add'>+	case PVR2_CVAL_INPUT_RADIO:</div><div class='add'>+		// ????? No idea yet what to do here</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	route.output = 0;</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_S_VIDEO_ROUTING,&amp;route);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_input(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	return hdw-&gt;input_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_audio(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_audio %d",</div><div class='add'>+		   hdw-&gt;srate_val);</div><div class='add'>+	switch (hdw-&gt;srate_val) {</div><div class='add'>+	default:</div><div class='add'>+	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000:</div><div class='add'>+		val = 48000;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100:</div><div class='add'>+		val = 44100;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000:</div><div class='add'>+		val = 32000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_AUDIO_CLOCK_FREQ,&amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_audio(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	return hdw-&gt;srate_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l_decoder_ops {</div><div class='add'>+	void (*update)(struct pvr2_v4l_decoder *);</div><div class='add'>+	int (*check)(struct pvr2_v4l_decoder *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct pvr2_v4l_decoder_ops decoder_ops[] = {</div><div class='add'>+	{ .update = set_input, .check = check_input},</div><div class='add'>+	{ .update = set_audio, .check = check_audio},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_detach(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;client-&gt;handler = NULL;</div><div class='add'>+	ctxt-&gt;hdw-&gt;decoder_ctrl = NULL;</div><div class='add'>+	kfree(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int decoder_check(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(decoder_ops)/sizeof(decoder_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (ctxt-&gt;stale_mask &amp; msk) continue;</div><div class='add'>+		if (decoder_ops[idx].check(ctxt)) {</div><div class='add'>+			ctxt-&gt;stale_mask |= msk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ctxt-&gt;stale_mask != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_update(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(decoder_ops)/sizeof(decoder_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (!(ctxt-&gt;stale_mask &amp; msk)) continue;</div><div class='add'>+		ctxt-&gt;stale_mask &amp;= ~msk;</div><div class='add'>+		decoder_ops[idx].update(ctxt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int decoder_detect(struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	/* Attempt to query the decoder - let's see if it will answer */</div><div class='add'>+	struct v4l2_tuner vt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;vt,0,sizeof(vt));</div><div class='add'>+	ret = pvr2_i2c_client_cmd(cp,VIDIOC_G_TUNER,&amp;vt);</div><div class='add'>+	return ret == 0; /* Return true if it answered */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void decoder_enable(struct pvr2_v4l_decoder *ctxt,int fl)</div><div class='add'>+{</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 decoder_enable(%d)",fl);</div><div class='add'>+	pvr2_v4l2_cmd_stream(ctxt-&gt;client,fl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int decoder_is_tuned(struct pvr2_v4l_decoder *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_tuner vt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;vt,0,sizeof(vt));</div><div class='add'>+	ret = pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_G_TUNER,&amp;vt);</div><div class='add'>+	if (ret &lt; 0) return -EINVAL;</div><div class='add'>+	return vt.signal ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf,cnt,"handler: pvrusb2-video-v4l");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const static struct pvr2_i2c_handler_functions hfuncs = {</div><div class='add'>+	.detach = (void (*)(void *))decoder_detach,</div><div class='add'>+	.check = (int (*)(void *))decoder_check,</div><div class='add'>+	.update = (void (*)(void *))decoder_update,</div><div class='add'>+	.describe = (unsigned int (*)(void *,char *,unsigned int))decoder_describe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,</div><div class='add'>+			       struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l_decoder *ctxt;</div><div class='add'>+</div><div class='add'>+	if (hdw-&gt;decoder_ctrl) return 0;</div><div class='add'>+	if (cp-&gt;handler) return 0;</div><div class='add'>+	if (!decoder_detect(cp)) return 0;</div><div class='add'>+</div><div class='add'>+	ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);</div><div class='add'>+	if (!ctxt) return 0;</div><div class='add'>+	memset(ctxt,0,sizeof(*ctxt));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;handler.func_data = ctxt;</div><div class='add'>+	ctxt-&gt;handler.func_table = &amp;hfuncs;</div><div class='add'>+	ctxt-&gt;ctrl.ctxt = ctxt;</div><div class='add'>+	ctxt-&gt;ctrl.detach = (void (*)(void *))decoder_detach;</div><div class='add'>+	ctxt-&gt;ctrl.enable = (void (*)(void *,int))decoder_enable;</div><div class='add'>+	ctxt-&gt;ctrl.tuned = (int (*)(void *))decoder_is_tuned;</div><div class='add'>+	ctxt-&gt;client = cp;</div><div class='add'>+	ctxt-&gt;hdw = hdw;</div><div class='add'>+	ctxt-&gt;stale_mask = (1 &lt;&lt; (sizeof(decoder_ops)/</div><div class='add'>+				  sizeof(decoder_ops[0]))) - 1;</div><div class='add'>+	hdw-&gt;decoder_ctrl = &amp;ctxt-&gt;ctrl;</div><div class='add'>+	cp-&gt;handler = &amp;ctxt-&gt;handler;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up",</div><div class='add'>+		   cp-&gt;client-&gt;addr);</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h<br/>new file mode 100644<br/>index 000000000000..2b917fda02e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-video-v4l.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-video-v4l.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_VIDEO_V4L_H</div><div class='add'>+#define __PVRUSB2_VIDEO_V4L_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   This module connects the pvrusb2 driver to the I2C chip level</div><div class='add'>+   driver which handles device video processing.  This interface is</div><div class='add'>+   used internally by the driver; higher level code should only</div><div class='add'>+   interact through the interface provided by pvrusb2-hdw.h.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_VIDEO_V4L_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c<br/>new file mode 100644<br/>index 000000000000..2413e5198e16<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-wm8775.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-wm8775.c</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   This source file is specifically designed to interface with the</div><div class='add'>+   wm8775.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-wm8775.h"</div><div class='add'>+#include "pvrusb2-i2c-cmd-v4l2.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-hdw-internal.h"</div><div class='add'>+#include "pvrusb2-debug.h"</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l_wm8775 {</div><div class='add'>+	struct pvr2_i2c_handler handler;</div><div class='add'>+	struct pvr2_i2c_client *client;</div><div class='add'>+	struct pvr2_hdw *hdw;</div><div class='add'>+	unsigned long stale_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void set_input(struct pvr2_v4l_wm8775 *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_routing route;</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	int msk = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;route,0,sizeof(route));</div><div class='add'>+</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c wm8775 set_input(val=%d msk=0x%x)",</div><div class='add'>+		   hdw-&gt;input_val,msk);</div><div class='add'>+</div><div class='add'>+	// Always point to input #1 no matter what</div><div class='add'>+	route.input = 2;</div><div class='add'>+	pvr2_i2c_client_cmd(ctxt-&gt;client,VIDIOC_INT_S_AUDIO_ROUTING,&amp;route);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_input(struct pvr2_v4l_wm8775 *ctxt)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_hdw *hdw = ctxt-&gt;hdw;</div><div class='add'>+	return hdw-&gt;input_dirty != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct pvr2_v4l_wm8775_ops {</div><div class='add'>+	void (*update)(struct pvr2_v4l_wm8775 *);</div><div class='add'>+	int (*check)(struct pvr2_v4l_wm8775 *);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct pvr2_v4l_wm8775_ops wm8775_ops[] = {</div><div class='add'>+	{ .update = set_input, .check = check_input},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned int wm8775_describe(struct pvr2_v4l_wm8775 *ctxt,</div><div class='add'>+				     char *buf,unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf,cnt,"handler: pvrusb2-wm8775");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void wm8775_detach(struct pvr2_v4l_wm8775 *ctxt)</div><div class='add'>+{</div><div class='add'>+	ctxt-&gt;client-&gt;handler = NULL;</div><div class='add'>+	kfree(ctxt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int wm8775_check(struct pvr2_v4l_wm8775 *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(wm8775_ops)/sizeof(wm8775_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (ctxt-&gt;stale_mask &amp; msk) continue;</div><div class='add'>+		if (wm8775_ops[idx].check(ctxt)) {</div><div class='add'>+			ctxt-&gt;stale_mask |= msk;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ctxt-&gt;stale_mask != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void wm8775_update(struct pvr2_v4l_wm8775 *ctxt)</div><div class='add'>+{</div><div class='add'>+	unsigned long msk;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; sizeof(wm8775_ops)/sizeof(wm8775_ops[0]);</div><div class='add'>+	     idx++) {</div><div class='add'>+		msk = 1 &lt;&lt; idx;</div><div class='add'>+		if (!(ctxt-&gt;stale_mask &amp; msk)) continue;</div><div class='add'>+		ctxt-&gt;stale_mask &amp;= ~msk;</div><div class='add'>+		wm8775_ops[idx].update(ctxt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+const static struct pvr2_i2c_handler_functions hfuncs = {</div><div class='add'>+	.detach = (void (*)(void *))wm8775_detach,</div><div class='add'>+	.check = (int (*)(void *))wm8775_check,</div><div class='add'>+	.update = (void (*)(void *))wm8775_update,</div><div class='add'>+	.describe = (unsigned int (*)(void *,char *,unsigned int))wm8775_describe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_wm8775_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)</div><div class='add'>+{</div><div class='add'>+	struct pvr2_v4l_wm8775 *ctxt;</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;handler) return 0;</div><div class='add'>+</div><div class='add'>+	ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);</div><div class='add'>+	if (!ctxt) return 0;</div><div class='add'>+	memset(ctxt,0,sizeof(*ctxt));</div><div class='add'>+</div><div class='add'>+	ctxt-&gt;handler.func_data = ctxt;</div><div class='add'>+	ctxt-&gt;handler.func_table = &amp;hfuncs;</div><div class='add'>+	ctxt-&gt;client = cp;</div><div class='add'>+	ctxt-&gt;hdw = hdw;</div><div class='add'>+	ctxt-&gt;stale_mask = (1 &lt;&lt; (sizeof(wm8775_ops)/</div><div class='add'>+				  sizeof(wm8775_ops[0]))) - 1;</div><div class='add'>+	cp-&gt;handler = &amp;ctxt-&gt;handler;</div><div class='add'>+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x wm8775 V4L2 handler set up",</div><div class='add'>+		   cp-&gt;client-&gt;addr);</div><div class='add'>+	return !0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.h b/drivers/media/video/pvrusb2/pvrusb2-wm8775.h<br/>new file mode 100644<br/>index 000000000000..8aaeff4e1e20<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2-wm8775.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2-wm8775.h</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_WM8775_H</div><div class='add'>+#define __PVRUSB2_WM8775_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+</div><div class='add'>+   This module connects the pvrusb2 driver to the I2C chip level</div><div class='add'>+   driver which performs analog -&gt; digital audio conversion for</div><div class='add'>+   external audio inputs.  This interface is used internally by the</div><div class='add'>+   driver; higher level code should only interact through the</div><div class='add'>+   interface provided by pvrusb2-hdw.h.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pvrusb2-i2c-core.h"</div><div class='add'>+</div><div class='add'>+int pvr2_i2c_wm8775_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_WM8775_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pvrusb2/pvrusb2.h b/drivers/media/video/pvrusb2/pvrusb2.h<br/>new file mode 100644<br/>index 000000000000..074533e9c21e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pvrusb2/pvrusb2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pvrusb2/pvrusb2.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  $Id$</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 Mike Isely &lt;isely@pobox.com&gt;</div><div class='add'>+ *  Copyright (C) 2004 Aurelien Alleaume &lt;slts@free.fr&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or modify</div><div class='add'>+ *  it under the terms of the GNU General Public License as published by</div><div class='add'>+ *  the Free Software Foundation; either version 2 of the License</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ *  GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; if not, write to the Free Software</div><div class='add'>+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PVRUSB2_H</div><div class='add'>+#define __PVRUSB2_H</div><div class='add'>+</div><div class='add'>+/* Maximum number of pvrusb2 instances we can track at once.  You</div><div class='add'>+   might want to increase this - however the driver operation will not</div><div class='add'>+   be impaired if it is too small.  Instead additional units just</div><div class='add'>+   won't have an ID assigned and it might not be possible to specify</div><div class='add'>+   module paramters for those extra units. */</div><div class='add'>+#define PVR_NUM 20</div><div class='add'>+</div><div class='add'>+#endif /* __PVRUSB2_H */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Stuff for Emacs to see, in order to encourage consistent editing style:</div><div class='add'>+  *** Local Variables: ***</div><div class='add'>+  *** mode: c ***</div><div class='add'>+  *** fill-column: 70 ***</div><div class='add'>+  *** tab-width: 8 ***</div><div class='add'>+  *** c-basic-offset: 8 ***</div><div class='add'>+  *** End: ***</div><div class='add'>+  */</div><div class='head'>diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig<br/>index 53cbc950f95c..697145e0bf15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/Kconfig</a></div><div class='hunk'>@@ -7,6 +7,7 @@ config USB_PWC</div><div class='ctx'> 	   * Philips PCA645, PCA646</div><div class='ctx'> 	   * Philips PCVC675, PCVC680, PCVC690</div><div class='ctx'> 	   * Philips PCVC720/40, PCVC730, PCVC740, PCVC750</div><div class='add'>+	   * Philips SPC900NC</div><div class='ctx'> 	   * Askey VC010</div><div class='ctx'> 	   * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro'</div><div class='ctx'> 	     and 'Orbit'/'Sphere'</div><div class='hunk'>@@ -19,10 +20,18 @@ config USB_PWC</div><div class='ctx'> 	  and never will be, but the 665 and 720/20 are supported by other</div><div class='ctx'> 	  drivers.</div><div class='ctx'> </div><div class='del'>-	  See &lt;file:Documentation/usb/philips.txt&gt; for more information and</div><div class='del'>-	  installation instructions.</div><div class='add'>+	  Some newer logitech webcams are not handled by this driver but by the</div><div class='add'>+	  Usb Video Class driver (linux-uvc).</div><div class='ctx'> </div><div class='ctx'> 	  The built-in microphone is enabled by selecting USB Audio support.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called pwc.</div><div class='add'>+</div><div class='add'>+config USB_PWC_DEBUG</div><div class='add'>+	bool "USB Philips Cameras verbose debug"</div><div class='add'>+	depends USB_PWC</div><div class='add'>+	help</div><div class='add'>+	  Say Y here in order to have the pwc driver generate verbose debugging</div><div class='add'>+	  messages.</div><div class='add'>+	  A special module options 'trace' is used to control the verbosity.</div><div class='head'>diff --git a/drivers/media/video/pwc/Makefile b/drivers/media/video/pwc/Makefile<br/>index 33d60126c024..9db2260d10cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/Makefile</a></div><div class='hunk'>@@ -1,3 +1,12 @@</div><div class='del'>-pwc-objs	:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-timon.o pwc-kiara.o</div><div class='add'>+pwc-objs	:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o</div><div class='add'>+pwc-objs	+= pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_PWC) += pwc.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_USB_PWC_DEBUG),y)</div><div class='add'>+EXTRA_CFLAGS += -DCONFIG_PWC_DEBUG=1</div><div class='add'>+else</div><div class='add'>+EXTRA_CFLAGS += -DCONFIG_PWC_DEBUG=0</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c<br/>index 4ba549bfa0e0..0bd115588f31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-ctrl.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>    Functions that send various control messages to the webcam, including</div><div class='ctx'>    video modes.</div><div class='ctx'>    (C) 1999-2003 Nemosoft Unv.</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -41,12 +41,14 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pwc.h"</div><div class='del'>-#include "pwc-ioctl.h"</div><div class='ctx'> #include "pwc-uncompress.h"</div><div class='ctx'> #include "pwc-kiara.h"</div><div class='ctx'> #include "pwc-timon.h"</div><div class='add'>+#include "pwc-dec1.h"</div><div class='add'>+#include "pwc-dec23.h"</div><div class='ctx'> </div><div class='ctx'> /* Request types: video */</div><div class='ctx'> #define SET_LUM_CTL			0x01</div><div class='hunk'>@@ -57,6 +59,10 @@</div><div class='ctx'> #define GET_STATUS_CTL			0x06</div><div class='ctx'> #define SET_EP_STREAM_CTL		0x07</div><div class='ctx'> #define GET_EP_STREAM_CTL		0x08</div><div class='add'>+#define GET_XX_CTL			0x09</div><div class='add'>+#define SET_XX_CTL			0x0A</div><div class='add'>+#define GET_XY_CTL			0x0B</div><div class='add'>+#define SET_XY_CTL			0x0C</div><div class='ctx'> #define SET_MPT_CTL			0x0D</div><div class='ctx'> #define GET_MPT_CTL			0x0E</div><div class='ctx'> </div><div class='hunk'>@@ -93,12 +99,20 @@</div><div class='ctx'> #define READ_SHUTTER_FORMATTER			0x0600</div><div class='ctx'> #define READ_RED_GAIN_FORMATTER			0x0700</div><div class='ctx'> #define READ_BLUE_GAIN_FORMATTER		0x0800</div><div class='add'>+#define GET_STATUS_B00				0x0B00</div><div class='ctx'> #define SENSOR_TYPE_FORMATTER1			0x0C00</div><div class='add'>+#define GET_STATUS_3000				0x3000</div><div class='ctx'> #define READ_RAW_Y_MEAN_FORMATTER		0x3100</div><div class='ctx'> #define SET_POWER_SAVE_MODE_FORMATTER		0x3200</div><div class='ctx'> #define MIRROR_IMAGE_FORMATTER			0x3300</div><div class='ctx'> #define LED_FORMATTER				0x3400</div><div class='add'>+#define LOWLIGHT				0x3500</div><div class='add'>+#define GET_STATUS_3600				0x3600</div><div class='ctx'> #define SENSOR_TYPE_FORMATTER2			0x3700</div><div class='add'>+#define GET_STATUS_3800				0x3800</div><div class='add'>+#define GET_STATUS_4000				0x4000</div><div class='add'>+#define GET_STATUS_4100				0x4100	/* Get */</div><div class='add'>+#define CTL_STATUS_4200				0x4200	/* [GS] 1 */</div><div class='ctx'> </div><div class='ctx'> /* Formatters for the Video Endpoint controls [GS]ET_EP_STREAM_CTL */</div><div class='ctx'> #define VIDEO_OUTPUT_CONTROL_FORMATTER		0x0100</div><div class='hunk'>@@ -138,6 +152,7 @@ static struct Nala_table_entry Nala_table[PSZ_MAX][8] =</div><div class='ctx'> #include "pwc-nala.h"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void pwc_set_image_buffer_size(struct pwc_device *pdev);</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -159,31 +174,7 @@ static struct Nala_table_entry Nala_table[PSZ_MAX][8] =</div><div class='ctx'> 		&amp;buf, buflen, 500)</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-void pwc_hexdump(void *p, int len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char *s;</div><div class='del'>-	char buf[100], *d;</div><div class='del'>-</div><div class='del'>-	s = (unsigned char *)p;</div><div class='del'>-	d = buf;</div><div class='del'>-	*d = '\0';</div><div class='del'>-	Debug("Doing hexdump @ %p, %d bytes.\n", p, len);</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		d += sprintf(d, "%02X ", *s++);</div><div class='del'>-		if ((i &amp; 0xF) == 0xF) {</div><div class='del'>-			Debug("%s\n", buf);</div><div class='del'>-			d = buf;</div><div class='del'>-			*d = '\0';</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((i &amp; 0xF) != 0)</div><div class='del'>-		Debug("%s\n", buf);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int send_video_command(struct usb_device *udev, int index, void *buf, int buflen)</div><div class='add'>+static int send_video_command(struct usb_device *udev, int index, void *buf, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	return usb_control_msg(udev,</div><div class='ctx'> 		usb_sndctrlpipe(udev, 0),</div><div class='hunk'>@@ -196,7 +187,7 @@ static inline int send_video_command(struct usb_device *udev, int index, void *b</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames)</div><div class='add'>+static int set_video_mode_Nala(struct pwc_device *pdev, int size, int frames)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[3];</div><div class='ctx'> 	int ret, fps;</div><div class='hunk'>@@ -229,34 +220,14 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra</div><div class='ctx'> 	if (pEntry-&gt;alternate == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (pEntry-&gt;compressed)</div><div class='del'>-		return -ENOENT; /* Not supported. */</div><div class='del'>-</div><div class='ctx'> 	memcpy(buf, pEntry-&gt;mode, 3);</div><div class='ctx'> 	ret = send_video_command(pdev-&gt;udev, pdev-&gt;vendpoint, buf, 3);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		Debug("Failed to send video command... %d\n", ret);</div><div class='add'>+		PWC_DEBUG_MODULE("Failed to send video command... %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pEntry-&gt;compressed &amp;&amp; pdev-&gt;vpalette != VIDEO_PALETTE_RAW)</div><div class='del'>-	 {</div><div class='del'>-	   switch(pdev-&gt;type) {</div><div class='del'>-	     case 645:</div><div class='del'>-	     case 646:</div><div class='del'>-/*	       pwc_dec1_init(pdev-&gt;type, pdev-&gt;release, buf, pdev-&gt;decompress_data); */</div><div class='del'>-	       break;</div><div class='del'>-</div><div class='del'>-	     case 675:</div><div class='del'>-	     case 680:</div><div class='del'>-	     case 690:</div><div class='del'>-	     case 720:</div><div class='del'>-	     case 730:</div><div class='del'>-	     case 740:</div><div class='del'>-	     case 750:</div><div class='del'>-/*	       pwc_dec23_init(pdev-&gt;type, pdev-&gt;release, buf, pdev-&gt;decompress_data); */</div><div class='del'>-	       break;</div><div class='del'>-	   }</div><div class='del'>-	}</div><div class='add'>+		pwc_dec1_init(pdev-&gt;type, pdev-&gt;release, buf, pdev-&gt;decompress_data);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;cmd_len = 3;</div><div class='ctx'> 	memcpy(pdev-&gt;cmd_buf, buf, 3);</div><div class='hunk'>@@ -283,7 +254,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int set_video_mode_Timon(struct pwc_device *pdev, int size, int frames, int compression, int snapshot)</div><div class='add'>+static int set_video_mode_Timon(struct pwc_device *pdev, int size, int frames, int compression, int snapshot)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[13];</div><div class='ctx'> 	const struct Timon_table_entry *pChoose;</div><div class='hunk'>@@ -315,8 +286,8 @@ static inline int set_video_mode_Timon(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-/* 	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pdev-&gt;vpalette != VIDEO_PALETTE_RAW)</div><div class='del'>-	   pwc_dec23_init(pdev-&gt;type, pdev-&gt;release, buf, pdev-&gt;decompress_data); */</div><div class='add'>+	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pdev-&gt;vpalette != VIDEO_PALETTE_RAW)</div><div class='add'>+		pwc_dec23_init(pdev, pdev-&gt;type, buf);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;cmd_len = 13;</div><div class='ctx'> 	memcpy(pdev-&gt;cmd_buf, buf, 13);</div><div class='hunk'>@@ -336,7 +307,7 @@ static inline int set_video_mode_Timon(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int frames, int compression, int snapshot)</div><div class='add'>+static int set_video_mode_Kiara(struct pwc_device *pdev, int size, int frames, int compression, int snapshot)</div><div class='ctx'> {</div><div class='ctx'> 	const struct Kiara_table_entry *pChoose = NULL;</div><div class='ctx'> 	int fps, ret;</div><div class='hunk'>@@ -350,21 +321,14 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> 	fps = (frames / 5) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* special case: VGA @ 5 fps and snapshot is raw bayer mode */</div><div class='del'>-	if (size == PSZ_VGA &amp;&amp; frames == 5 &amp;&amp; snapshot)</div><div class='add'>+	if (size == PSZ_VGA &amp;&amp; frames == 5 &amp;&amp; snapshot &amp;&amp; pdev-&gt;vpalette == VIDEO_PALETTE_RAW)</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Only available in case the raw palette is selected or</div><div class='ctx'> 		   we have the decompressor available. This mode is</div><div class='ctx'> 		   only available in compressed form</div><div class='ctx'> 		*/</div><div class='del'>-		if (pdev-&gt;vpalette == VIDEO_PALETTE_RAW)</div><div class='del'>-		{</div><div class='del'>-			Info("Choosing VGA/5 BAYER mode (%d).\n", pdev-&gt;vpalette);</div><div class='del'>-			pChoose = &amp;RawEntry;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			Info("VGA/5 BAYER mode _must_ have a decompressor available, or use RAW palette.\n");</div><div class='del'>-		}</div><div class='add'>+		PWC_DEBUG_SIZE("Choosing VGA/5 BAYER mode.\n");</div><div class='add'>+		pChoose = &amp;RawEntry;</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='ctx'> 	{</div><div class='hunk'>@@ -372,6 +336,7 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> 		   if the preferred ratio is not available.</div><div class='ctx'> 		   Skip this step when using RAW modes.</div><div class='ctx'> 		*/</div><div class='add'>+		snapshot = 0;</div><div class='ctx'> 		while (compression &lt;= 3) {</div><div class='ctx'> 			pChoose = &amp;Kiara_table[size][fps][compression];</div><div class='ctx'> 			if (pChoose-&gt;alternate != 0)</div><div class='hunk'>@@ -382,7 +347,7 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> 	if (pChoose == NULL || pChoose-&gt;alternate == 0)</div><div class='ctx'> 		return -ENOENT; /* Not supported. */</div><div class='ctx'> </div><div class='del'>-	Debug("Using alternate setting %d.\n", pChoose-&gt;alternate);</div><div class='add'>+	PWC_TRACE("Using alternate setting %d.\n", pChoose-&gt;alternate);</div><div class='ctx'> </div><div class='ctx'> 	/* usb_control_msg won't take staticly allocated arrays as argument?? */</div><div class='ctx'> 	memcpy(buf, pChoose-&gt;mode, 12);</div><div class='hunk'>@@ -394,8 +359,8 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-/*	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pdev-&gt;vpalette != VIDEO_PALETTE_RAW)</div><div class='del'>-	  pwc_dec23_init(pdev-&gt;type, pdev-&gt;release, buf, pdev-&gt;decompress_data); */</div><div class='add'>+	if (pChoose-&gt;bandlength &gt; 0 &amp;&amp; pdev-&gt;vpalette != VIDEO_PALETTE_RAW)</div><div class='add'>+		pwc_dec23_init(pdev, pdev-&gt;type, buf);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;cmd_len = 12;</div><div class='ctx'> 	memcpy(pdev-&gt;cmd_buf, buf, 12);</div><div class='hunk'>@@ -410,49 +375,13 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr</div><div class='ctx'> 		pdev-&gt;frame_size = (pdev-&gt;vbandlength * pdev-&gt;image.y) / 4;</div><div class='ctx'> 	else</div><div class='ctx'> 		pdev-&gt;frame_size = (pdev-&gt;image.x * pdev-&gt;image.y * 12) / 8;</div><div class='add'>+	PWC_TRACE("frame_size=%d, vframes=%d, vsize=%d, vsnapshot=%d, vbandlength=%d\n",</div><div class='add'>+	    pdev-&gt;frame_size,pdev-&gt;vframes,pdev-&gt;vsize,pdev-&gt;vsnapshot,pdev-&gt;vbandlength);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void pwc_set_image_buffer_size(struct pwc_device *pdev)</div><div class='del'>-{</div><div class='del'>-	int i, factor = 0, filler = 0;</div><div class='del'>-</div><div class='del'>-	/* for PALETTE_YUV420P */</div><div class='del'>-	switch(pdev-&gt;vpalette)</div><div class='del'>-	{</div><div class='del'>-	case VIDEO_PALETTE_YUV420P:</div><div class='del'>-		factor = 6;</div><div class='del'>-		filler = 128;</div><div class='del'>-		break;</div><div class='del'>-	case VIDEO_PALETTE_RAW:</div><div class='del'>-		factor = 6; /* can be uncompressed YUV420P */</div><div class='del'>-		filler = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set sizes in bytes */</div><div class='del'>-	pdev-&gt;image.size = pdev-&gt;image.x * pdev-&gt;image.y * factor / 4;</div><div class='del'>-	pdev-&gt;view.size  = pdev-&gt;view.x  * pdev-&gt;view.y  * factor / 4;</div><div class='del'>-</div><div class='del'>-	/* Align offset, or you'll get some very weird results in</div><div class='del'>-	   YUV420 mode... x must be multiple of 4 (to get the Y's in</div><div class='del'>-	   place), and y even (or you'll mixup U &amp; V). This is less of a</div><div class='del'>-	   problem for YUV420P.</div><div class='del'>-	 */</div><div class='del'>-	pdev-&gt;offset.x = ((pdev-&gt;view.x - pdev-&gt;image.x) / 2) &amp; 0xFFFC;</div><div class='del'>-	pdev-&gt;offset.y = ((pdev-&gt;view.y - pdev-&gt;image.y) / 2) &amp; 0xFFFE;</div><div class='del'>-</div><div class='del'>-	/* Fill buffers with gray or black */</div><div class='del'>-	for (i = 0; i &lt; MAX_IMAGES; i++) {</div><div class='del'>-		if (pdev-&gt;image_ptr[i] != NULL)</div><div class='del'>-			memset(pdev-&gt;image_ptr[i], filler, pdev-&gt;view.size);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>    @pdev: device structure</div><div class='ctx'>    @width: viewport width</div><div class='hunk'>@@ -465,50 +394,78 @@ int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frame</div><div class='ctx'> {</div><div class='ctx'> 	int ret, size;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_FLOW, "set_video_mode(%dx%d @ %d, palette %d).\n", width, height, frames, pdev-&gt;vpalette);</div><div class='add'>+	PWC_DEBUG_FLOW("set_video_mode(%dx%d @ %d, palette %d).\n", width, height, frames, pdev-&gt;vpalette);</div><div class='ctx'> 	size = pwc_decode_size(pdev, width, height);</div><div class='ctx'> 	if (size &lt; 0) {</div><div class='del'>-		Debug("Could not find suitable size.\n");</div><div class='add'>+		PWC_DEBUG_MODULE("Could not find suitable size.\n");</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='del'>-	Debug("decode_size = %d.\n", size);</div><div class='add'>+	PWC_TRACE("decode_size = %d.\n", size);</div><div class='ctx'> </div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-	switch(pdev-&gt;type) {</div><div class='del'>-	case 645:</div><div class='del'>-	case 646:</div><div class='add'>+	if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='ctx'> 		ret = set_video_mode_Nala(pdev, size, frames);</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='del'>-	case 675:</div><div class='del'>-	case 680:</div><div class='del'>-	case 690:</div><div class='del'>-		ret = set_video_mode_Timon(pdev, size, frames, compression, snapshot);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 720:</div><div class='del'>-	case 730:</div><div class='del'>-	case 740:</div><div class='del'>-	case 750:</div><div class='add'>+	} else if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='ctx'> 		ret = set_video_mode_Kiara(pdev, size, frames, compression, snapshot);</div><div class='del'>-		break;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		ret = set_video_mode_Timon(pdev, size, frames, compression, snapshot);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		if (ret == -ENOENT)</div><div class='del'>-			Info("Video mode %s@%d fps is only supported with the decompressor module (pwcx).\n", size2name[size], frames);</div><div class='del'>-		else {</div><div class='del'>-			Err("Failed to set video mode %s@%d fps; return code = %d\n", size2name[size], frames, ret);</div><div class='del'>-		}</div><div class='add'>+		PWC_ERROR("Failed to set video mode %s@%d fps; return code = %d\n", size2name[size], frames, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	pdev-&gt;view.x = width;</div><div class='ctx'> 	pdev-&gt;view.y = height;</div><div class='ctx'> 	pdev-&gt;frame_total_size = pdev-&gt;frame_size + pdev-&gt;frame_header_size + pdev-&gt;frame_trailer_size;</div><div class='ctx'> 	pwc_set_image_buffer_size(pdev);</div><div class='del'>-	Trace(TRACE_SIZE, "Set viewport to %dx%d, image size is %dx%d.\n", width, height, pwc_image_sizes[size].x, pwc_image_sizes[size].y);</div><div class='add'>+	PWC_DEBUG_SIZE("Set viewport to %dx%d, image size is %dx%d.\n", width, height, pwc_image_sizes[size].x, pwc_image_sizes[size].y);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BLACK_Y 0</div><div class='add'>+#define BLACK_U 128</div><div class='add'>+#define BLACK_V 128</div><div class='add'>+</div><div class='add'>+static void pwc_set_image_buffer_size(struct pwc_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int i, factor = 0;</div><div class='add'>+</div><div class='add'>+	/* for PALETTE_YUV420P */</div><div class='add'>+	switch(pdev-&gt;vpalette)</div><div class='add'>+	{</div><div class='add'>+	case VIDEO_PALETTE_YUV420P:</div><div class='add'>+		factor = 6;</div><div class='add'>+		break;</div><div class='add'>+	case VIDEO_PALETTE_RAW:</div><div class='add'>+		factor = 6; /* can be uncompressed YUV420P */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set sizes in bytes */</div><div class='add'>+	pdev-&gt;image.size = pdev-&gt;image.x * pdev-&gt;image.y * factor / 4;</div><div class='add'>+	pdev-&gt;view.size  = pdev-&gt;view.x  * pdev-&gt;view.y  * factor / 4;</div><div class='add'>+</div><div class='add'>+	/* Align offset, or you'll get some very weird results in</div><div class='add'>+	   YUV420 mode... x must be multiple of 4 (to get the Y's in</div><div class='add'>+	   place), and y even (or you'll mixup U &amp; V). This is less of a</div><div class='add'>+	   problem for YUV420P.</div><div class='add'>+	 */</div><div class='add'>+	pdev-&gt;offset.x = ((pdev-&gt;view.x - pdev-&gt;image.x) / 2) &amp; 0xFFFC;</div><div class='add'>+	pdev-&gt;offset.y = ((pdev-&gt;view.y - pdev-&gt;image.y) / 2) &amp; 0xFFFE;</div><div class='add'>+</div><div class='add'>+	/* Fill buffers with black colors */</div><div class='add'>+	for (i = 0; i &lt; pwc_mbufs; i++) {</div><div class='add'>+		unsigned char *p = pdev-&gt;image_data + pdev-&gt;images[i].offset;</div><div class='add'>+		memset(p, BLACK_Y, pdev-&gt;view.x * pdev-&gt;view.y);</div><div class='add'>+		p += pdev-&gt;view.x * pdev-&gt;view.y;</div><div class='add'>+		memset(p, BLACK_U, pdev-&gt;view.x * pdev-&gt;view.y/4);</div><div class='add'>+		p += pdev-&gt;view.x * pdev-&gt;view.y/4;</div><div class='add'>+		memset(p, BLACK_V, pdev-&gt;view.x * pdev-&gt;view.y/4);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* BRIGHTNESS */</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +477,7 @@ int pwc_get_brightness(struct pwc_device *pdev)</div><div class='ctx'> 	ret = RecvControlMsg(GET_LUM_CTL, BRIGHTNESS_FORMATTER, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	return buf &lt;&lt; 9;</div><div class='add'>+	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pwc_set_brightness(struct pwc_device *pdev, int value)</div><div class='hunk'>@@ -545,7 +502,7 @@ int pwc_get_contrast(struct pwc_device *pdev)</div><div class='ctx'> 	ret = RecvControlMsg(GET_LUM_CTL, CONTRAST_FORMATTER, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	return buf &lt;&lt; 10;</div><div class='add'>+	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pwc_set_contrast(struct pwc_device *pdev, int value)</div><div class='hunk'>@@ -570,7 +527,7 @@ int pwc_get_gamma(struct pwc_device *pdev)</div><div class='ctx'> 	ret = RecvControlMsg(GET_LUM_CTL, GAMMA_FORMATTER, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	return buf &lt;&lt; 11;</div><div class='add'>+	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pwc_set_gamma(struct pwc_device *pdev, int value)</div><div class='hunk'>@@ -588,37 +545,47 @@ int pwc_set_gamma(struct pwc_device *pdev, int value)</div><div class='ctx'> </div><div class='ctx'> /* SATURATION */</div><div class='ctx'> </div><div class='del'>-int pwc_get_saturation(struct pwc_device *pdev)</div><div class='add'>+/* return a value between [-100 , 100] */</div><div class='add'>+int pwc_get_saturation(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	char buf;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, saturation_register;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;type &lt; 675)</div><div class='del'>-		return -1;</div><div class='del'>-	ret = RecvControlMsg(GET_CHROM_CTL, pdev-&gt;type &lt; 730 ? SATURATION_MODE_FORMATTER2 : SATURATION_MODE_FORMATTER1, 1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (pdev-&gt;type &lt; 730)</div><div class='add'>+		saturation_register = SATURATION_MODE_FORMATTER2;</div><div class='add'>+	else</div><div class='add'>+		saturation_register = SATURATION_MODE_FORMATTER1;</div><div class='add'>+	ret = RecvControlMsg(GET_CHROM_CTL, saturation_register, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	return 32768 + buf * 327;</div><div class='add'>+	*value = (signed)buf;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* @param value saturation color between [-100 , 100] */</div><div class='ctx'> int pwc_set_saturation(struct pwc_device *pdev, int value)</div><div class='ctx'> {</div><div class='ctx'> 	char buf;</div><div class='add'>+	int saturation_register;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;type &lt; 675)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (value &lt; 0)</div><div class='del'>-		value = 0;</div><div class='del'>-	if (value &gt; 0xffff)</div><div class='del'>-		value = 0xffff;</div><div class='del'>-	/* saturation ranges from -100 to +100 */</div><div class='del'>-	buf = (value - 32768) / 327;</div><div class='del'>-	return SendControlMsg(SET_CHROM_CTL, pdev-&gt;type &lt; 730 ? SATURATION_MODE_FORMATTER2 : SATURATION_MODE_FORMATTER1, 1);</div><div class='add'>+	if (value &lt; -100)</div><div class='add'>+		value = -100;</div><div class='add'>+	if (value &gt; 100)</div><div class='add'>+		value = 100;</div><div class='add'>+	if (pdev-&gt;type &lt; 730)</div><div class='add'>+		saturation_register = SATURATION_MODE_FORMATTER2;</div><div class='add'>+	else</div><div class='add'>+		saturation_register = SATURATION_MODE_FORMATTER1;</div><div class='add'>+	return SendControlMsg(SET_CHROM_CTL, saturation_register, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* AGC */</div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_agc(struct pwc_device *pdev, int mode, int value)</div><div class='add'>+int pwc_set_agc(struct pwc_device *pdev, int mode, int value)</div><div class='ctx'> {</div><div class='ctx'> 	char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -643,7 +610,7 @@ static inline int pwc_set_agc(struct pwc_device *pdev, int mode, int value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_agc(struct pwc_device *pdev, int *value)</div><div class='add'>+int pwc_get_agc(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -673,7 +640,7 @@ static inline int pwc_get_agc(struct pwc_device *pdev, int *value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value)</div><div class='add'>+int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value)</div><div class='ctx'> {</div><div class='ctx'> 	char buf[2];</div><div class='ctx'> 	int speed, ret;</div><div class='hunk'>@@ -691,23 +658,16 @@ static inline int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int v</div><div class='ctx'> 			value = 0;</div><div class='ctx'> 		if (value &gt; 0xffff)</div><div class='ctx'> 			value = 0xffff;</div><div class='del'>-		switch(pdev-&gt;type) {</div><div class='del'>-		case 675:</div><div class='del'>-		case 680:</div><div class='del'>-		case 690:</div><div class='add'>+</div><div class='add'>+		if (DEVICE_USE_CODEC2(pdev-&gt;type)) {</div><div class='ctx'> 			/* speed ranges from 0x0 to 0x290 (656) */</div><div class='ctx'> 			speed = (value / 100);</div><div class='ctx'> 			buf[1] = speed &gt;&gt; 8;</div><div class='ctx'> 			buf[0] = speed &amp; 0xff;</div><div class='del'>-			break;</div><div class='del'>-		case 720:</div><div class='del'>-		case 730:</div><div class='del'>-		case 740:</div><div class='del'>-		case 750:</div><div class='add'>+		} else if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='ctx'> 			/* speed seems to range from 0x0 to 0xff */</div><div class='ctx'> 			buf[1] = 0;</div><div class='ctx'> 			buf[0] = value &gt;&gt; 8;</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		ret = SendControlMsg(SET_LUM_CTL, PRESET_SHUTTER_FORMATTER, 2);</div><div class='hunk'>@@ -715,6 +675,25 @@ static inline int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int v</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This function is not exported to v4l1, so output values between 0 -&gt; 256 */</div><div class='add'>+int pwc_get_shutter_speed(struct pwc_device *pdev, int *value)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[2];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = RecvControlMsg(GET_STATUS_CTL, READ_SHUTTER_FORMATTER, 2);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	*value = buf[0] + (buf[1] &lt;&lt; 8);</div><div class='add'>+	if (DEVICE_USE_CODEC2(pdev-&gt;type)) {</div><div class='add'>+		/* speed ranges from 0x0 to 0x290 (656) */</div><div class='add'>+		*value *= 256/656;</div><div class='add'>+	} else if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='add'>+		/* speed seems to range from 0x0 to 0xff */</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* POWER */</div><div class='ctx'> </div><div class='hunk'>@@ -736,19 +715,19 @@ int pwc_camera_power(struct pwc_device *pdev, int power)</div><div class='ctx'> </div><div class='ctx'> /* private calls */</div><div class='ctx'> </div><div class='del'>-static inline int pwc_restore_user(struct pwc_device *pdev)</div><div class='add'>+int pwc_restore_user(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	char buf; /* dummy */</div><div class='ctx'> 	return SendControlMsg(SET_STATUS_CTL, RESTORE_USER_DEFAULTS_FORMATTER, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_save_user(struct pwc_device *pdev)</div><div class='add'>+int pwc_save_user(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	char buf; /* dummy */</div><div class='ctx'> 	return SendControlMsg(SET_STATUS_CTL, SAVE_USER_DEFAULTS_FORMATTER, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_restore_factory(struct pwc_device *pdev)</div><div class='add'>+int pwc_restore_factory(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	char buf; /* dummy */</div><div class='ctx'> 	return SendControlMsg(SET_STATUS_CTL, RESTORE_FACTORY_DEFAULTS_FORMATTER, 0);</div><div class='hunk'>@@ -766,7 +745,7 @@ static inline int pwc_restore_factory(struct pwc_device *pdev)</div><div class='ctx'>   * 03: manual</div><div class='ctx'>   * 04: auto</div><div class='ctx'>   */</div><div class='del'>-static inline int pwc_set_awb(struct pwc_device *pdev, int mode)</div><div class='add'>+int pwc_set_awb(struct pwc_device *pdev, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -786,7 +765,7 @@ static inline int pwc_set_awb(struct pwc_device *pdev, int mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_awb(struct pwc_device *pdev)</div><div class='add'>+int pwc_get_awb(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -798,7 +777,7 @@ static inline int pwc_get_awb(struct pwc_device *pdev)</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_red_gain(struct pwc_device *pdev, int value)</div><div class='add'>+int pwc_set_red_gain(struct pwc_device *pdev, int value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -811,7 +790,7 @@ static inline int pwc_set_red_gain(struct pwc_device *pdev, int value)</div><div class='ctx'> 	return SendControlMsg(SET_CHROM_CTL, PRESET_MANUAL_RED_GAIN_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_red_gain(struct pwc_device *pdev, int *value)</div><div class='add'>+int pwc_get_red_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -824,7 +803,7 @@ static inline int pwc_get_red_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_blue_gain(struct pwc_device *pdev, int value)</div><div class='add'>+int pwc_set_blue_gain(struct pwc_device *pdev, int value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -837,7 +816,7 @@ static inline int pwc_set_blue_gain(struct pwc_device *pdev, int value)</div><div class='ctx'> 	return SendControlMsg(SET_CHROM_CTL, PRESET_MANUAL_BLUE_GAIN_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_blue_gain(struct pwc_device *pdev, int *value)</div><div class='add'>+int pwc_get_blue_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -854,7 +833,7 @@ static inline int pwc_get_blue_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'>    internal red/blue gains, which may be different from the manual</div><div class='ctx'>    gains set or read above.</div><div class='ctx'>  */</div><div class='del'>-static inline int pwc_read_red_gain(struct pwc_device *pdev, int *value)</div><div class='add'>+static int pwc_read_red_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -866,7 +845,7 @@ static inline int pwc_read_red_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_read_blue_gain(struct pwc_device *pdev, int *value)</div><div class='add'>+static int pwc_read_blue_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -879,7 +858,7 @@ static inline int pwc_read_blue_gain(struct pwc_device *pdev, int *value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_wb_speed(struct pwc_device *pdev, int speed)</div><div class='add'>+static int pwc_set_wb_speed(struct pwc_device *pdev, int speed)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -888,7 +867,7 @@ static inline int pwc_set_wb_speed(struct pwc_device *pdev, int speed)</div><div class='ctx'> 	return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_SPEED_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_wb_speed(struct pwc_device *pdev, int *value)</div><div class='add'>+static int pwc_get_wb_speed(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -901,7 +880,7 @@ static inline int pwc_get_wb_speed(struct pwc_device *pdev, int *value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_wb_delay(struct pwc_device *pdev, int delay)</div><div class='add'>+static int pwc_set_wb_delay(struct pwc_device *pdev, int delay)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -910,7 +889,7 @@ static inline int pwc_set_wb_delay(struct pwc_device *pdev, int delay)</div><div class='ctx'> 	return SendControlMsg(SET_CHROM_CTL, AWB_CONTROL_DELAY_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_wb_delay(struct pwc_device *pdev, int *value)</div><div class='add'>+static int pwc_get_wb_delay(struct pwc_device *pdev, int *value)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -965,7 +944,7 @@ static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_contour(struct pwc_device *pdev, int contour)</div><div class='add'>+int pwc_set_contour(struct pwc_device *pdev, int contour)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -990,7 +969,7 @@ static inline int pwc_set_contour(struct pwc_device *pdev, int contour)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_contour(struct pwc_device *pdev, int *contour)</div><div class='add'>+int pwc_get_contour(struct pwc_device *pdev, int *contour)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1012,7 +991,7 @@ static inline int pwc_get_contour(struct pwc_device *pdev, int *contour)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_backlight(struct pwc_device *pdev, int backlight)</div><div class='add'>+int pwc_set_backlight(struct pwc_device *pdev, int backlight)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -1023,7 +1002,7 @@ static inline int pwc_set_backlight(struct pwc_device *pdev, int backlight)</div><div class='ctx'> 	return SendControlMsg(SET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_backlight(struct pwc_device *pdev, int *backlight)</div><div class='add'>+int pwc_get_backlight(struct pwc_device *pdev, int *backlight)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned char buf;</div><div class='hunk'>@@ -1031,12 +1010,35 @@ static inline int pwc_get_backlight(struct pwc_device *pdev, int *backlight)</div><div class='ctx'> 	ret = RecvControlMsg(GET_LUM_CTL, BACK_LIGHT_COMPENSATION_FORMATTER, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	*backlight = buf;</div><div class='add'>+	*backlight = !!buf;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int pwc_set_colour_mode(struct pwc_device *pdev, int colour)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf;</div><div class='ctx'> </div><div class='del'>-static inline int pwc_set_flicker(struct pwc_device *pdev, int flicker)</div><div class='add'>+	if (colour)</div><div class='add'>+		buf = 0xff;</div><div class='add'>+	else</div><div class='add'>+		buf = 0x0;</div><div class='add'>+	return SendControlMsg(SET_CHROM_CTL, COLOUR_MODE_FORMATTER, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pwc_get_colour_mode(struct pwc_device *pdev, int *colour)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned char buf;</div><div class='add'>+</div><div class='add'>+	ret = RecvControlMsg(GET_CHROM_CTL, COLOUR_MODE_FORMATTER, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	*colour = !!buf;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pwc_set_flicker(struct pwc_device *pdev, int flicker)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -1047,7 +1049,7 @@ static inline int pwc_set_flicker(struct pwc_device *pdev, int flicker)</div><div class='ctx'> 	return SendControlMsg(SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_flicker(struct pwc_device *pdev, int *flicker)</div><div class='add'>+int pwc_get_flicker(struct pwc_device *pdev, int *flicker)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned char buf;</div><div class='hunk'>@@ -1055,12 +1057,11 @@ static inline int pwc_get_flicker(struct pwc_device *pdev, int *flicker)</div><div class='ctx'> 	ret = RecvControlMsg(GET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	*flicker = buf;</div><div class='add'>+	*flicker = !!buf;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static inline int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise)</div><div class='add'>+int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -1072,7 +1073,7 @@ static inline int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise)</div><div class='ctx'> 	return SendControlMsg(SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise)</div><div class='add'>+int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned char buf;</div><div class='hunk'>@@ -1084,7 +1085,7 @@ static inline int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pwc_mpt_reset(struct pwc_device *pdev, int flags)</div><div class='add'>+static int _pwc_mpt_reset(struct pwc_device *pdev, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='hunk'>@@ -1092,7 +1093,18 @@ static int pwc_mpt_reset(struct pwc_device *pdev, int flags)</div><div class='ctx'> 	return SendControlMsg(SET_MPT_CTL, PT_RESET_CONTROL_FORMATTER, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)</div><div class='add'>+int pwc_mpt_reset(struct pwc_device *pdev, int flags)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	ret = _pwc_mpt_reset(pdev, flags);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		pdev-&gt;pan_angle = 0;</div><div class='add'>+		pdev-&gt;tilt_angle = 0;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[4];</div><div class='ctx'> </div><div class='hunk'>@@ -1110,7 +1122,35 @@ static inline int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)</div><div class='ctx'> 	return SendControlMsg(SET_MPT_CTL, PT_RELATIVE_CONTROL_FORMATTER, 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int pwc_mpt_get_status(struct pwc_device *pdev, struct pwc_mpt_status *status)</div><div class='add'>+int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* check absolute ranges */</div><div class='add'>+	if (pan  &lt; pdev-&gt;angle_range.pan_min  ||</div><div class='add'>+	    pan  &gt; pdev-&gt;angle_range.pan_max  ||</div><div class='add'>+	    tilt &lt; pdev-&gt;angle_range.tilt_min ||</div><div class='add'>+	    tilt &gt; pdev-&gt;angle_range.tilt_max)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* go to relative range, check again */</div><div class='add'>+	pan  -= pdev-&gt;pan_angle;</div><div class='add'>+	tilt -= pdev-&gt;tilt_angle;</div><div class='add'>+	/* angles are specified in degrees * 100, thus the limit = 36000 */</div><div class='add'>+	if (pan &lt; -36000 || pan &gt; 36000 || tilt &lt; -36000 || tilt &gt; 36000)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	ret = _pwc_mpt_set_angle(pdev, pan, tilt);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		pdev-&gt;pan_angle  += pan;</div><div class='add'>+		pdev-&gt;tilt_angle += tilt;</div><div class='add'>+	}</div><div class='add'>+	if (ret == -EPIPE) /* stall -&gt; out of range */</div><div class='add'>+		ret = -ERANGE;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pwc_mpt_get_status(struct pwc_device *pdev, struct pwc_mpt_status *status)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned char buf[5];</div><div class='hunk'>@@ -1151,6 +1191,26 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)</div><div class='ctx'>  /* End of Add-Ons                                    */</div><div class='ctx'>  /* ************************************************* */</div><div class='ctx'> </div><div class='add'>+/* Linux 2.5.something and 2.6 pass direct pointers to arguments of</div><div class='add'>+   ioctl() calls. With 2.4, you have to do tedious copy_from_user()</div><div class='add'>+   and copy_to_user() calls. With these macros we circumvent this,</div><div class='add'>+   and let me maintain only one source file. The functionality is</div><div class='add'>+   exactly the same otherwise.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* define local variable for arg */</div><div class='add'>+#define ARG_DEF(ARG_type, ARG_name)\</div><div class='add'>+	ARG_type *ARG_name = arg;</div><div class='add'>+/* copy arg to local variable */</div><div class='add'>+#define ARG_IN(ARG_name) /* nothing */</div><div class='add'>+/* argument itself (referenced) */</div><div class='add'>+#define ARGR(ARG_name) (*ARG_name)</div><div class='add'>+/* argument address */</div><div class='add'>+#define ARGA(ARG_name) ARG_name</div><div class='add'>+/* copy local variable to arg */</div><div class='add'>+#define ARG_OUT(ARG_name) /* nothing */</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -1180,206 +1240,243 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSCQUAL:</div><div class='ctx'> 	{</div><div class='del'>-		int *qual = arg;</div><div class='add'>+		ARG_DEF(int, qual)</div><div class='ctx'> </div><div class='del'>-		if (*qual &lt; 0 || *qual &gt; 3)</div><div class='add'>+		ARG_IN(qual)</div><div class='add'>+		if (ARGR(qual) &lt; 0 || ARGR(qual) &gt; 3)</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		else</div><div class='del'>-			ret = pwc_try_video_mode(pdev, pdev-&gt;view.x, pdev-&gt;view.y, pdev-&gt;vframes, *qual, pdev-&gt;vsnapshot);</div><div class='add'>+			ret = pwc_try_video_mode(pdev, pdev-&gt;view.x, pdev-&gt;view.y, pdev-&gt;vframes, ARGR(qual), pdev-&gt;vsnapshot);</div><div class='ctx'> 		if (ret &gt;= 0)</div><div class='del'>-			pdev-&gt;vcompression = *qual;</div><div class='add'>+			pdev-&gt;vcompression = ARGR(qual);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGCQUAL:</div><div class='ctx'> 	{</div><div class='del'>-		int *qual = arg;</div><div class='del'>-		*qual = pdev-&gt;vcompression;</div><div class='add'>+		ARG_DEF(int, qual)</div><div class='add'>+</div><div class='add'>+		ARGR(qual) = pdev-&gt;vcompression;</div><div class='add'>+		ARG_OUT(qual)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCPROBE:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_probe *probe = arg;</div><div class='del'>-		strcpy(probe-&gt;name, pdev-&gt;vdev-&gt;name);</div><div class='del'>-		probe-&gt;type = pdev-&gt;type;</div><div class='add'>+		ARG_DEF(struct pwc_probe, probe)</div><div class='add'>+</div><div class='add'>+		strcpy(ARGR(probe).name, pdev-&gt;vdev-&gt;name);</div><div class='add'>+		ARGR(probe).type = pdev-&gt;type;</div><div class='add'>+		ARG_OUT(probe)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGSERIAL:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_serial *serial = arg;</div><div class='del'>-		strcpy(serial-&gt;serial, pdev-&gt;serial);</div><div class='add'>+		ARG_DEF(struct pwc_serial, serial)</div><div class='add'>+</div><div class='add'>+		strcpy(ARGR(serial).serial, pdev-&gt;serial);</div><div class='add'>+		ARG_OUT(serial)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSAGC:</div><div class='ctx'> 	{</div><div class='del'>-		int *agc = arg;</div><div class='del'>-		if (pwc_set_agc(pdev, *agc &lt; 0 ? 1 : 0, *agc))</div><div class='add'>+		ARG_DEF(int, agc)</div><div class='add'>+</div><div class='add'>+		ARG_IN(agc)</div><div class='add'>+		if (pwc_set_agc(pdev, ARGR(agc) &lt; 0 ? 1 : 0, ARGR(agc)))</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGAGC:</div><div class='ctx'> 	{</div><div class='del'>-		int *agc = arg;</div><div class='add'>+		ARG_DEF(int, agc)</div><div class='ctx'> </div><div class='del'>-		if (pwc_get_agc(pdev, agc))</div><div class='add'>+		if (pwc_get_agc(pdev, ARGA(agc)))</div><div class='ctx'> 			ret = -EINVAL;</div><div class='add'>+		ARG_OUT(agc)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSSHUTTER:</div><div class='ctx'> 	{</div><div class='del'>-		int *shutter_speed = arg;</div><div class='del'>-		ret = pwc_set_shutter_speed(pdev, *shutter_speed &lt; 0 ? 1 : 0, *shutter_speed);</div><div class='add'>+		ARG_DEF(int, shutter_speed)</div><div class='add'>+</div><div class='add'>+		ARG_IN(shutter_speed)</div><div class='add'>+		ret = pwc_set_shutter_speed(pdev, ARGR(shutter_speed) &lt; 0 ? 1 : 0, ARGR(shutter_speed));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSAWB:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_whitebalance *wb = arg;</div><div class='add'>+		ARG_DEF(struct pwc_whitebalance, wb)</div><div class='ctx'> </div><div class='del'>-		ret = pwc_set_awb(pdev, wb-&gt;mode);</div><div class='del'>-		if (ret &gt;= 0 &amp;&amp; wb-&gt;mode == PWC_WB_MANUAL) {</div><div class='del'>-			pwc_set_red_gain(pdev, wb-&gt;manual_red);</div><div class='del'>-			pwc_set_blue_gain(pdev, wb-&gt;manual_blue);</div><div class='add'>+		ARG_IN(wb)</div><div class='add'>+		ret = pwc_set_awb(pdev, ARGR(wb).mode);</div><div class='add'>+		if (ret &gt;= 0 &amp;&amp; ARGR(wb).mode == PWC_WB_MANUAL) {</div><div class='add'>+			pwc_set_red_gain(pdev, ARGR(wb).manual_red);</div><div class='add'>+			pwc_set_blue_gain(pdev, ARGR(wb).manual_blue);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGAWB:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_whitebalance *wb = arg;</div><div class='add'>+		ARG_DEF(struct pwc_whitebalance, wb)</div><div class='ctx'> </div><div class='del'>-		memset(wb, 0, sizeof(struct pwc_whitebalance));</div><div class='del'>-		wb-&gt;mode = pwc_get_awb(pdev);</div><div class='del'>-		if (wb-&gt;mode &lt; 0)</div><div class='add'>+		memset(ARGA(wb), 0, sizeof(struct pwc_whitebalance));</div><div class='add'>+		ARGR(wb).mode = pwc_get_awb(pdev);</div><div class='add'>+		if (ARGR(wb).mode &lt; 0)</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 		else {</div><div class='del'>-			if (wb-&gt;mode == PWC_WB_MANUAL) {</div><div class='del'>-				ret = pwc_get_red_gain(pdev, &amp;wb-&gt;manual_red);</div><div class='add'>+			if (ARGR(wb).mode == PWC_WB_MANUAL) {</div><div class='add'>+				ret = pwc_get_red_gain(pdev, &amp;ARGR(wb).manual_red);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					break;</div><div class='del'>-				ret = pwc_get_blue_gain(pdev, &amp;wb-&gt;manual_blue);</div><div class='add'>+				ret = pwc_get_blue_gain(pdev, &amp;ARGR(wb).manual_blue);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='del'>-			if (wb-&gt;mode == PWC_WB_AUTO) {</div><div class='del'>-				ret = pwc_read_red_gain(pdev, &amp;wb-&gt;read_red);</div><div class='add'>+			if (ARGR(wb).mode == PWC_WB_AUTO) {</div><div class='add'>+				ret = pwc_read_red_gain(pdev, &amp;ARGR(wb).read_red);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					break;</div><div class='del'>-				ret = pwc_read_blue_gain(pdev, &amp;wb-&gt;read_blue);</div><div class='add'>+				ret =pwc_read_blue_gain(pdev, &amp;ARGR(wb).read_blue);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		ARG_OUT(wb)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSAWBSPEED:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_wb_speed *wbs = arg;</div><div class='add'>+		ARG_DEF(struct pwc_wb_speed, wbs)</div><div class='ctx'> </div><div class='del'>-		if (wbs-&gt;control_speed &gt; 0) {</div><div class='del'>-			ret = pwc_set_wb_speed(pdev, wbs-&gt;control_speed);</div><div class='add'>+		if (ARGR(wbs).control_speed &gt; 0) {</div><div class='add'>+			ret = pwc_set_wb_speed(pdev, ARGR(wbs).control_speed);</div><div class='ctx'> 		}</div><div class='del'>-		if (wbs-&gt;control_delay &gt; 0) {</div><div class='del'>-			ret = pwc_set_wb_delay(pdev, wbs-&gt;control_delay);</div><div class='add'>+		if (ARGR(wbs).control_delay &gt; 0) {</div><div class='add'>+			ret = pwc_set_wb_delay(pdev, ARGR(wbs).control_delay);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGAWBSPEED:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_wb_speed *wbs = arg;</div><div class='add'>+		ARG_DEF(struct pwc_wb_speed, wbs)</div><div class='ctx'> </div><div class='del'>-		ret = pwc_get_wb_speed(pdev, &amp;wbs-&gt;control_speed);</div><div class='add'>+		ret = pwc_get_wb_speed(pdev, &amp;ARGR(wbs).control_speed);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		ret = pwc_get_wb_delay(pdev, &amp;wbs-&gt;control_delay);</div><div class='add'>+		ret = pwc_get_wb_delay(pdev, &amp;ARGR(wbs).control_delay);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='add'>+		ARG_OUT(wbs)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSLED:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_leds *leds = arg;</div><div class='del'>-		ret = pwc_set_leds(pdev, leds-&gt;led_on, leds-&gt;led_off);</div><div class='del'>-	    	break;</div><div class='add'>+		ARG_DEF(struct pwc_leds, leds)</div><div class='add'>+</div><div class='add'>+		ARG_IN(leds)</div><div class='add'>+		ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGLED:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_leds *leds = arg;</div><div class='del'>-		ret = pwc_get_leds(pdev, &amp;leds-&gt;led_on, &amp;leds-&gt;led_off);</div><div class='add'>+		ARG_DEF(struct pwc_leds, leds)</div><div class='add'>+</div><div class='add'>+		ret = pwc_get_leds(pdev, &amp;ARGR(leds).led_on, &amp;ARGR(leds).led_off);</div><div class='add'>+		ARG_OUT(leds)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSCONTOUR:</div><div class='ctx'> 	{</div><div class='del'>-		int *contour = arg;</div><div class='del'>-		ret = pwc_set_contour(pdev, *contour);</div><div class='add'>+		ARG_DEF(int, contour)</div><div class='add'>+</div><div class='add'>+		ARG_IN(contour)</div><div class='add'>+		ret = pwc_set_contour(pdev, ARGR(contour));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGCONTOUR:</div><div class='ctx'> 	{</div><div class='del'>-		int *contour = arg;</div><div class='del'>-		ret = pwc_get_contour(pdev, contour);</div><div class='add'>+		ARG_DEF(int, contour)</div><div class='add'>+</div><div class='add'>+		ret = pwc_get_contour(pdev, ARGA(contour));</div><div class='add'>+		ARG_OUT(contour)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSBACKLIGHT:</div><div class='ctx'> 	{</div><div class='del'>-		int *backlight = arg;</div><div class='del'>-		ret = pwc_set_backlight(pdev, *backlight);</div><div class='add'>+		ARG_DEF(int, backlight)</div><div class='add'>+</div><div class='add'>+		ARG_IN(backlight)</div><div class='add'>+		ret = pwc_set_backlight(pdev, ARGR(backlight));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGBACKLIGHT:</div><div class='ctx'> 	{</div><div class='del'>-		int *backlight = arg;</div><div class='del'>-		ret = pwc_get_backlight(pdev, backlight);</div><div class='add'>+		ARG_DEF(int, backlight)</div><div class='add'>+</div><div class='add'>+		ret = pwc_get_backlight(pdev, ARGA(backlight));</div><div class='add'>+		ARG_OUT(backlight)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSFLICKER:</div><div class='ctx'> 	{</div><div class='del'>-		int *flicker = arg;</div><div class='del'>-		ret = pwc_set_flicker(pdev, *flicker);</div><div class='add'>+		ARG_DEF(int, flicker)</div><div class='add'>+</div><div class='add'>+		ARG_IN(flicker)</div><div class='add'>+		ret = pwc_set_flicker(pdev, ARGR(flicker));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGFLICKER:</div><div class='ctx'> 	{</div><div class='del'>-		int *flicker = arg;</div><div class='del'>-		ret = pwc_get_flicker(pdev, flicker);</div><div class='add'>+		ARG_DEF(int, flicker)</div><div class='add'>+</div><div class='add'>+		ret = pwc_get_flicker(pdev, ARGA(flicker));</div><div class='add'>+		ARG_OUT(flicker)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCSDYNNOISE:</div><div class='ctx'> 	{</div><div class='del'>-		int *dynnoise = arg;</div><div class='del'>-		ret = pwc_set_dynamic_noise(pdev, *dynnoise);</div><div class='add'>+		ARG_DEF(int, dynnoise)</div><div class='add'>+</div><div class='add'>+		ARG_IN(dynnoise)</div><div class='add'>+		ret = pwc_set_dynamic_noise(pdev, ARGR(dynnoise));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGDYNNOISE:</div><div class='ctx'> 	{</div><div class='del'>-		int *dynnoise = arg;</div><div class='del'>-		ret = pwc_get_dynamic_noise(pdev, dynnoise);</div><div class='add'>+		ARG_DEF(int, dynnoise)</div><div class='add'>+</div><div class='add'>+		ret = pwc_get_dynamic_noise(pdev, ARGA(dynnoise));</div><div class='add'>+		ARG_OUT(dynnoise);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGREALSIZE:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_imagesize *size = arg;</div><div class='del'>-		size-&gt;width = pdev-&gt;image.x;</div><div class='del'>-		size-&gt;height = pdev-&gt;image.y;</div><div class='add'>+		ARG_DEF(struct pwc_imagesize, size)</div><div class='add'>+</div><div class='add'>+		ARGR(size).width = pdev-&gt;image.x;</div><div class='add'>+		ARGR(size).height = pdev-&gt;image.y;</div><div class='add'>+		ARG_OUT(size)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1387,14 +1484,10 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='ctx'> 		{</div><div class='del'>-			int *flags = arg;</div><div class='add'>+			ARG_DEF(int, flags)</div><div class='ctx'> </div><div class='del'>-			ret = pwc_mpt_reset(pdev, *flags);</div><div class='del'>-			if (ret &gt;= 0)</div><div class='del'>-			{</div><div class='del'>-				pdev-&gt;pan_angle = 0;</div><div class='del'>-				pdev-&gt;tilt_angle = 0;</div><div class='del'>-			}</div><div class='add'>+			ARG_IN(flags)</div><div class='add'>+			ret = pwc_mpt_reset(pdev, ARGR(flags));</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1407,8 +1500,10 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='ctx'> 		{</div><div class='del'>-			struct pwc_mpt_range *range = arg;</div><div class='del'>-			*range = pdev-&gt;angle_range;</div><div class='add'>+			ARG_DEF(struct pwc_mpt_range, range)</div><div class='add'>+</div><div class='add'>+			ARGR(range) = pdev-&gt;angle_range;</div><div class='add'>+			ARG_OUT(range)</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1423,48 +1518,23 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='ctx'> 		{</div><div class='del'>-			struct pwc_mpt_angles *angles = arg;</div><div class='add'>+			ARG_DEF(struct pwc_mpt_angles, angles)</div><div class='add'>+</div><div class='add'>+			ARG_IN(angles)</div><div class='ctx'> 			/* The camera can only set relative angles, so</div><div class='ctx'> 			   do some calculations when getting an absolute angle .</div><div class='ctx'> 			 */</div><div class='del'>-			if (angles-&gt;absolute)</div><div class='add'>+			if (ARGR(angles).absolute)</div><div class='ctx'> 			{</div><div class='del'>-				new_pan  = angles-&gt;pan;</div><div class='del'>-				new_tilt = angles-&gt;tilt;</div><div class='add'>+				new_pan  = ARGR(angles).pan;</div><div class='add'>+				new_tilt = ARGR(angles).tilt;</div><div class='ctx'> 			}</div><div class='ctx'> 			else</div><div class='ctx'> 			{</div><div class='del'>-				new_pan  = pdev-&gt;pan_angle  + angles-&gt;pan;</div><div class='del'>-				new_tilt = pdev-&gt;tilt_angle + angles-&gt;tilt;</div><div class='del'>-			}</div><div class='del'>-			/* check absolute ranges */</div><div class='del'>-			if (new_pan  &lt; pdev-&gt;angle_range.pan_min  ||</div><div class='del'>-			    new_pan  &gt; pdev-&gt;angle_range.pan_max  ||</div><div class='del'>-			    new_tilt &lt; pdev-&gt;angle_range.tilt_min ||</div><div class='del'>-			    new_tilt &gt; pdev-&gt;angle_range.tilt_max)</div><div class='del'>-			{</div><div class='del'>-				ret = -ERANGE;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				/* go to relative range, check again */</div><div class='del'>-				new_pan  -= pdev-&gt;pan_angle;</div><div class='del'>-				new_tilt -= pdev-&gt;tilt_angle;</div><div class='del'>-				/* angles are specified in degrees * 100, thus the limit = 36000 */</div><div class='del'>-				if (new_pan &lt; -36000 || new_pan &gt; 36000 || new_tilt &lt; -36000 || new_tilt &gt; 36000)</div><div class='del'>-					ret = -ERANGE;</div><div class='del'>-			}</div><div class='del'>-			if (ret == 0) /* no errors so far */</div><div class='del'>-			{</div><div class='del'>-				ret = pwc_mpt_set_angle(pdev, new_pan, new_tilt);</div><div class='del'>-				if (ret &gt;= 0)</div><div class='del'>-				{</div><div class='del'>-					pdev-&gt;pan_angle  += new_pan;</div><div class='del'>-					pdev-&gt;tilt_angle += new_tilt;</div><div class='del'>-				}</div><div class='del'>-				if (ret == -EPIPE) /* stall -&gt; out of range */</div><div class='del'>-					ret = -ERANGE;</div><div class='add'>+				new_pan  = pdev-&gt;pan_angle  + ARGR(angles).pan;</div><div class='add'>+				new_tilt = pdev-&gt;tilt_angle + ARGR(angles).tilt;</div><div class='ctx'> 			}</div><div class='add'>+			ret = pwc_mpt_set_angle(pdev, new_pan, new_tilt);</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1478,11 +1548,12 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='ctx'> 		{</div><div class='del'>-			struct pwc_mpt_angles *angles = arg;</div><div class='add'>+			ARG_DEF(struct pwc_mpt_angles, angles)</div><div class='ctx'> </div><div class='del'>-			angles-&gt;absolute = 1;</div><div class='del'>-			angles-&gt;pan  = pdev-&gt;pan_angle;</div><div class='del'>-			angles-&gt;tilt = pdev-&gt;tilt_angle;</div><div class='add'>+			ARGR(angles).absolute = 1;</div><div class='add'>+			ARGR(angles).pan  = pdev-&gt;pan_angle;</div><div class='add'>+			ARGR(angles).tilt = pdev-&gt;tilt_angle;</div><div class='add'>+			ARG_OUT(angles)</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1495,8 +1566,10 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='ctx'> 		{</div><div class='del'>-			struct pwc_mpt_status *status = arg;</div><div class='del'>-			ret = pwc_mpt_get_status(pdev, status);</div><div class='add'>+			ARG_DEF(struct pwc_mpt_status, status)</div><div class='add'>+</div><div class='add'>+			ret = pwc_mpt_get_status(pdev, ARGA(status));</div><div class='add'>+			ARG_OUT(status)</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 		{</div><div class='hunk'>@@ -1507,22 +1580,24 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOCPWCGVIDCMD:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_video_command *cmd = arg;</div><div class='del'>-</div><div class='del'>-		cmd-&gt;type = pdev-&gt;type;</div><div class='del'>-		cmd-&gt;release = pdev-&gt;release;</div><div class='del'>-		cmd-&gt;command_len = pdev-&gt;cmd_len;</div><div class='del'>-		memcpy(&amp;cmd-&gt;command_buf, pdev-&gt;cmd_buf, pdev-&gt;cmd_len);</div><div class='del'>-		cmd-&gt;bandlength = pdev-&gt;vbandlength;</div><div class='del'>-		cmd-&gt;frame_size = pdev-&gt;frame_size;</div><div class='add'>+		ARG_DEF(struct pwc_video_command, cmd);</div><div class='add'>+</div><div class='add'>+		ARGR(cmd).type = pdev-&gt;type;</div><div class='add'>+		ARGR(cmd).release = pdev-&gt;release;</div><div class='add'>+		ARGR(cmd).command_len = pdev-&gt;cmd_len;</div><div class='add'>+		memcpy(&amp;ARGR(cmd).command_buf, pdev-&gt;cmd_buf, pdev-&gt;cmd_len);</div><div class='add'>+		ARGR(cmd).bandlength = pdev-&gt;vbandlength;</div><div class='add'>+		ARGR(cmd).frame_size = pdev-&gt;frame_size;</div><div class='add'>+		ARG_OUT(cmd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'>        /*</div><div class='ctx'> 	case VIDIOCPWCGVIDTABLE:</div><div class='ctx'> 	{</div><div class='del'>-		struct pwc_table_init_buffer *table = arg;</div><div class='del'>-		table-&gt;len = pdev-&gt;cmd_len;</div><div class='del'>-		memcpy(&amp;table-&gt;buffer, pdev-&gt;decompress_data, pdev-&gt;decompressor-&gt;table_size);</div><div class='add'>+		ARG_DEF(struct pwc_table_init_buffer, table);</div><div class='add'>+		ARGR(table).len = pdev-&gt;cmd_len;</div><div class='add'>+		memcpy(&amp;ARGR(table).buffer, pdev-&gt;decompress_data, pdev-&gt;decompressor-&gt;table_size);</div><div class='add'>+		ARG_OUT(table)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	*/</div><div class='hunk'>@@ -1538,4 +1613,4 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/* vim: set cinoptions= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec1.c b/drivers/media/video/pwc/pwc-dec1.c<br/>new file mode 100644<br/>index 000000000000..c29593f589eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-dec1.c</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+/* Linux driver for Philips webcam</div><div class='add'>+   Decompression for chipset version 1</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='add'>+</div><div class='add'>+   NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='add'>+   driver and thus may have bugs that are not present in the original version.</div><div class='add'>+   Please send bug reports and support requests to &lt;luc@saillard.org&gt;.</div><div class='add'>+   The decompression routines have been implemented by reverse-engineering the</div><div class='add'>+   Nemosoft binary pwcx module. Caveat emptor.</div><div class='add'>+</div><div class='add'>+   This program is free software; you can redistribute it and/or modify</div><div class='add'>+   it under the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version.</div><div class='add'>+</div><div class='add'>+   This program is distributed in the hope that it will be useful,</div><div class='add'>+   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+   GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+   You should have received a copy of the GNU General Public License</div><div class='add'>+   along with this program; if not, write to the Free Software</div><div class='add'>+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "pwc-dec1.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void pwc_dec1_init(int type, int release, void *buffer, void *table)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pwc_dec1_exit(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pwc_dec1_alloc(struct pwc_device *pwc)</div><div class='add'>+{</div><div class='add'>+	pwc-&gt;decompress_data = kmalloc(sizeof(struct pwc_dec1_private), GFP_KERNEL);</div><div class='add'>+	if (pwc-&gt;decompress_data == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec1.h b/drivers/media/video/pwc/pwc-dec1.h<br/>new file mode 100644<br/>index 000000000000..8b62ddcc5c7e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-dec1.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/* Linux driver for Philips webcam</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='add'>+</div><div class='add'>+   NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='add'>+   driver and thus may have bugs that are not present in the original version.</div><div class='add'>+   Please send bug reports and support requests to &lt;luc@saillard.org&gt;.</div><div class='add'>+   The decompression routines have been implemented by reverse-engineering the</div><div class='add'>+   Nemosoft binary pwcx module. Caveat emptor.</div><div class='add'>+</div><div class='add'>+   This program is free software; you can redistribute it and/or modify</div><div class='add'>+   it under the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version.</div><div class='add'>+</div><div class='add'>+   This program is distributed in the hope that it will be useful,</div><div class='add'>+   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+   GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+   You should have received a copy of the GNU General Public License</div><div class='add'>+   along with this program; if not, write to the Free Software</div><div class='add'>+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifndef PWC_DEC1_H</div><div class='add'>+#define PWC_DEC1_H</div><div class='add'>+</div><div class='add'>+#include "pwc.h"</div><div class='add'>+</div><div class='add'>+struct pwc_dec1_private</div><div class='add'>+{</div><div class='add'>+	int version;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int  pwc_dec1_alloc(struct pwc_device *pwc);</div><div class='add'>+void pwc_dec1_init(int type, int release, void *buffer, void *private_data);</div><div class='add'>+void pwc_dec1_exit(void);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/video/pwc/pwc-dec23.c<br/>new file mode 100644<br/>index 000000000000..9e2d91f26bfe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec23.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-dec23.c</a></div><div class='hunk'>@@ -0,0 +1,941 @@</div><div class='add'>+/* Linux driver for Philips webcam</div><div class='add'>+   Decompression for chipset version 2 et 3</div><div class='add'>+   (C) 2004-2006  Luc Saillard (luc@saillard.org)</div><div class='add'>+</div><div class='add'>+   NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='add'>+   driver and thus may have bugs that are not present in the original version.</div><div class='add'>+   Please send bug reports and support requests to &lt;luc@saillard.org&gt;.</div><div class='add'>+   The decompression routines have been implemented by reverse-engineering the</div><div class='add'>+   Nemosoft binary pwcx module. Caveat emptor.</div><div class='add'>+</div><div class='add'>+   This program is free software; you can redistribute it and/or modify</div><div class='add'>+   it under the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version.</div><div class='add'>+</div><div class='add'>+   This program is distributed in the hope that it will be useful,</div><div class='add'>+   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+   GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+   You should have received a copy of the GNU General Public License</div><div class='add'>+   along with this program; if not, write to the Free Software</div><div class='add'>+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "pwc-timon.h"</div><div class='add'>+#include "pwc-kiara.h"</div><div class='add'>+#include "pwc-dec23.h"</div><div class='add'>+#include &lt;media/pwc-ioctl.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * USE_LOOKUP_TABLE_TO_CLAMP</div><div class='add'>+ *   0: use a C version of this tests:  {  a&lt;0?0:(a&gt;255?255:a) }</div><div class='add'>+ *   1: use a faster lookup table for cpu with a big cache (intel)</div><div class='add'>+ */</div><div class='add'>+#define USE_LOOKUP_TABLE_TO_CLAMP	1</div><div class='add'>+/*</div><div class='add'>+ * UNROLL_LOOP_FOR_COPYING_BLOCK</div><div class='add'>+ *   0: use a loop for a smaller code (but little slower)</div><div class='add'>+ *   1: when unrolling the loop, gcc produces some faster code (perhaps only</div><div class='add'>+ *   valid for intel processor class). Activating this option, automaticaly</div><div class='add'>+ *   activate USE_LOOKUP_TABLE_TO_CLAMP</div><div class='add'>+ */</div><div class='add'>+#define UNROLL_LOOP_FOR_COPY		1</div><div class='add'>+#if UNROLL_LOOP_FOR_COPY</div><div class='add'>+# undef USE_LOOKUP_TABLE_TO_CLAMP</div><div class='add'>+# define USE_LOOKUP_TABLE_TO_CLAMP 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ENABLE_BAYER_DECODER</div><div class='add'>+ *   0: bayer decoder is not build (save some space)</div><div class='add'>+ *   1: bayer decoder is build and can be used</div><div class='add'>+ */</div><div class='add'>+#define ENABLE_BAYER_DECODER 0</div><div class='add'>+</div><div class='add'>+static void build_subblock_pattern(struct pwc_dec23_private *pdec)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int initial_values[12] = {</div><div class='add'>+		-0x526500, -0x221200, 0x221200, 0x526500,</div><div class='add'>+			   -0x3de200, 0x3de200,</div><div class='add'>+		-0x6db480, -0x2d5d00, 0x2d5d00, 0x6db480,</div><div class='add'>+			   -0x12c200, 0x12c200</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+	static const unsigned int values_derivated[12] = {</div><div class='add'>+		0xa4ca, 0x4424, -0x4424, -0xa4ca,</div><div class='add'>+			0x7bc4, -0x7bc4,</div><div class='add'>+		0xdb69, 0x5aba, -0x5aba, -0xdb69,</div><div class='add'>+			0x2584, -0x2584</div><div class='add'>+	};</div><div class='add'>+	unsigned int temp_values[12];</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	memcpy(temp_values, initial_values, sizeof(initial_values));</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		for (j = 0; j &lt; 12; j++) {</div><div class='add'>+			pdec-&gt;table_subblock[i][j] = temp_values[j];</div><div class='add'>+			temp_values[j] += values_derivated[j];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void build_bit_powermask_table(struct pwc_dec23_private *pdec)</div><div class='add'>+{</div><div class='add'>+	unsigned char *p;</div><div class='add'>+	unsigned int bit, byte, mask, val;</div><div class='add'>+	unsigned int bitpower = 1;</div><div class='add'>+</div><div class='add'>+	for (bit = 0; bit &lt; 8; bit++) {</div><div class='add'>+		mask = bitpower - 1;</div><div class='add'>+		p = pdec-&gt;table_bitpowermask[bit];</div><div class='add'>+		for (byte = 0; byte &lt; 256; byte++) {</div><div class='add'>+			val = (byte &amp; mask);</div><div class='add'>+			if (byte &amp; bitpower)</div><div class='add'>+				val = -val;</div><div class='add'>+			*p++ = val;</div><div class='add'>+		}</div><div class='add'>+		bitpower&lt;&lt;=1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void build_table_color(const unsigned int romtable[16][8],</div><div class='add'>+			      unsigned char p0004[16][1024],</div><div class='add'>+			      unsigned char p8004[16][256])</div><div class='add'>+{</div><div class='add'>+	int compression_mode, j, k, bit, pw;</div><div class='add'>+	unsigned char *p0, *p8;</div><div class='add'>+	const unsigned int *r;</div><div class='add'>+</div><div class='add'>+	/* We have 16 compressions tables */</div><div class='add'>+	for (compression_mode = 0; compression_mode &lt; 16; compression_mode++) {</div><div class='add'>+		p0 = p0004[compression_mode];</div><div class='add'>+		p8 = p8004[compression_mode];</div><div class='add'>+		r  = romtable[compression_mode];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 8; j++, r++, p0 += 128) {</div><div class='add'>+</div><div class='add'>+			for (k = 0; k &lt; 16; k++) {</div><div class='add'>+				if (k == 0)</div><div class='add'>+					bit = 1;</div><div class='add'>+				else if (k &gt;= 1 &amp;&amp; k &lt; 3)</div><div class='add'>+					bit = (r[0] &gt;&gt; 15) &amp; 7;</div><div class='add'>+				else if (k &gt;= 3 &amp;&amp; k &lt; 6)</div><div class='add'>+					bit = (r[0] &gt;&gt; 12) &amp; 7;</div><div class='add'>+				else if (k &gt;= 6 &amp;&amp; k &lt; 10)</div><div class='add'>+					bit = (r[0] &gt;&gt; 9) &amp; 7;</div><div class='add'>+				else if (k &gt;= 10 &amp;&amp; k &lt; 13)</div><div class='add'>+					bit = (r[0] &gt;&gt; 6) &amp; 7;</div><div class='add'>+				else if (k &gt;= 13 &amp;&amp; k &lt; 15)</div><div class='add'>+					bit = (r[0] &gt;&gt; 3) &amp; 7;</div><div class='add'>+				else</div><div class='add'>+					bit = (r[0]) &amp; 7;</div><div class='add'>+				if (k == 0)</div><div class='add'>+					*p8++ = 8;</div><div class='add'>+				else</div><div class='add'>+					*p8++ = j - bit;</div><div class='add'>+				*p8++ = bit;</div><div class='add'>+</div><div class='add'>+				pw = 1 &lt;&lt; bit;</div><div class='add'>+				p0[k + 0x00] = (1 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x10] = (2 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x20] = (3 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x30] = (4 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x40] = (-1 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x50] = (-2 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x60] = (-3 * pw) + 0x80;</div><div class='add'>+				p0[k + 0x70] = (-4 * pw) + 0x80;</div><div class='add'>+			}	/* end of for (k=0; k&lt;16; k++, p8++) */</div><div class='add'>+		}	/* end of for (j=0; j&lt;8; j++ , table++) */</div><div class='add'>+	} /* end of foreach compression_mode */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void fill_table_dc00_d800(struct pwc_dec23_private *pdec)</div><div class='add'>+{</div><div class='add'>+#define SCALEBITS 15</div><div class='add'>+#define ONE_HALF  (1UL &lt;&lt; (SCALEBITS - 1))</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int offset1 = ONE_HALF;</div><div class='add'>+	unsigned int offset2 = 0x0000;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;256; i++) {</div><div class='add'>+		pdec-&gt;table_dc00[i] = offset1 &amp; ~(ONE_HALF);</div><div class='add'>+		pdec-&gt;table_d800[i] = offset2;</div><div class='add'>+</div><div class='add'>+		offset1 += 0x7bc4;</div><div class='add'>+		offset2 += 0x7bc4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To decode the stream:</div><div class='add'>+ *   if look_bits(2) == 0:	# op == 2 in the lookup table</div><div class='add'>+ *      skip_bits(2)</div><div class='add'>+ *      end of the stream</div><div class='add'>+ *   elif look_bits(3) == 7:	# op == 1 in the lookup table</div><div class='add'>+ *      skip_bits(3)</div><div class='add'>+ *      yyyy = get_bits(4)</div><div class='add'>+ *      xxxx = get_bits(8)</div><div class='add'>+ *   else:			# op == 0 in the lookup table</div><div class='add'>+ *      skip_bits(x)</div><div class='add'>+ *</div><div class='add'>+ * For speedup processing, we build a lookup table and we takes the first 6 bits.</div><div class='add'>+ *</div><div class='add'>+ * struct {</div><div class='add'>+ *   unsigned char op;	    // operation to execute</div><div class='add'>+ *   unsigned char bits;    // bits use to perform operation</div><div class='add'>+ *   unsigned char offset1; // offset to add to access in the table_0004 % 16</div><div class='add'>+ *   unsigned char offset2; // offset to add to access in the table_0004</div><div class='add'>+ * }</div><div class='add'>+ *</div><div class='add'>+ * How to build this table ?</div><div class='add'>+ *   op == 2 when (i%4)==0</div><div class='add'>+ *   op == 1 when (i%8)==7</div><div class='add'>+ *   op == 0 otherwise</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static const unsigned char hash_table_ops[64*4] = {</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x10,</div><div class='add'>+	0x00, 0x06, 0x01, 0x30,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x01, 0x20,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x50,</div><div class='add'>+	0x00, 0x05, 0x02, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x03, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x10,</div><div class='add'>+	0x00, 0x06, 0x02, 0x10,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x01, 0x60,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x50,</div><div class='add'>+	0x00, 0x05, 0x02, 0x40,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x03, 0x40,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x10,</div><div class='add'>+	0x00, 0x06, 0x01, 0x70,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x01, 0x20,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x50,</div><div class='add'>+	0x00, 0x05, 0x02, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x03, 0x00,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x10,</div><div class='add'>+	0x00, 0x06, 0x02, 0x50,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x01, 0x60,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x00,</div><div class='add'>+	0x00, 0x04, 0x01, 0x50,</div><div class='add'>+	0x00, 0x05, 0x02, 0x40,</div><div class='add'>+	0x02, 0x00, 0x00, 0x00,</div><div class='add'>+	0x00, 0x03, 0x01, 0x40,</div><div class='add'>+	0x00, 0x05, 0x03, 0x40,</div><div class='add'>+	0x01, 0x00, 0x00, 0x00</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static const unsigned int MulIdx[16][16] = {</div><div class='add'>+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},</div><div class='add'>+	{0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3,},</div><div class='add'>+	{0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,},</div><div class='add'>+	{4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4,},</div><div class='add'>+	{6, 7, 8, 9, 7, 10, 11, 8, 8, 11, 10, 7, 9, 8, 7, 6,},</div><div class='add'>+	{4, 5, 5, 4, 4, 5, 5, 4, 4, 5, 5, 4, 4, 5, 5, 4,},</div><div class='add'>+	{1, 3, 0, 2, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3, 0, 2,},</div><div class='add'>+	{0, 3, 3, 0, 1, 2, 2, 1, 2, 1, 1, 2, 3, 0, 0, 3,},</div><div class='add'>+	{0, 1, 2, 3, 3, 2, 1, 0, 3, 2, 1, 0, 0, 1, 2, 3,},</div><div class='add'>+	{1, 1, 1, 1, 3, 3, 3, 3, 0, 0, 0, 0, 2, 2, 2, 2,},</div><div class='add'>+	{7, 10, 11, 8, 9, 8, 7, 6, 6, 7, 8, 9, 8, 11, 10, 7,},</div><div class='add'>+	{4, 5, 5, 4, 5, 4, 4, 5, 5, 4, 4, 5, 4, 5, 5, 4,},</div><div class='add'>+	{7, 9, 6, 8, 10, 8, 7, 11, 11, 7, 8, 10, 8, 6, 9, 7,},</div><div class='add'>+	{1, 3, 0, 2, 2, 0, 3, 1, 2, 0, 3, 1, 1, 3, 0, 2,},</div><div class='add'>+	{1, 2, 2, 1, 3, 0, 0, 3, 0, 3, 3, 0, 2, 1, 1, 2,},</div><div class='add'>+	{10, 8, 7, 11, 8, 6, 9, 7, 7, 9, 6, 8, 11, 7, 8, 10}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if USE_LOOKUP_TABLE_TO_CLAMP</div><div class='add'>+#define MAX_OUTER_CROP_VALUE	(512)</div><div class='add'>+static unsigned char pwc_crop_table[256 + 2*MAX_OUTER_CROP_VALUE];</div><div class='add'>+#define CLAMP(x) (pwc_crop_table[MAX_OUTER_CROP_VALUE+(x)])</div><div class='add'>+#else</div><div class='add'>+#define CLAMP(x) ((x)&gt;255?255:((x)&lt;0?0:x))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* If the type or the command change, we rebuild the lookup table */</div><div class='add'>+int pwc_dec23_init(struct pwc_device *pwc, int type, unsigned char *cmd)</div><div class='add'>+{</div><div class='add'>+	int flags, version, shift, i;</div><div class='add'>+	struct pwc_dec23_private *pdec;</div><div class='add'>+</div><div class='add'>+	if (pwc-&gt;decompress_data == NULL) {</div><div class='add'>+		pdec = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);</div><div class='add'>+		if (pdec == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pwc-&gt;decompress_data = pdec;</div><div class='add'>+	}</div><div class='add'>+	pdec = pwc-&gt;decompress_data;</div><div class='add'>+</div><div class='add'>+	if (DEVICE_USE_CODEC3(type)) {</div><div class='add'>+		flags = cmd[2] &amp; 0x18;</div><div class='add'>+		if (flags == 8)</div><div class='add'>+			pdec-&gt;nbits = 7;	/* More bits, mean more bits to encode the stream, but better quality */</div><div class='add'>+		else if (flags == 0x10)</div><div class='add'>+			pdec-&gt;nbits = 8;</div><div class='add'>+		else</div><div class='add'>+			pdec-&gt;nbits = 6;</div><div class='add'>+</div><div class='add'>+		version = cmd[2] &gt;&gt; 5;</div><div class='add'>+		build_table_color(KiaraRomTable[version][0], pdec-&gt;table_0004_pass1, pdec-&gt;table_8004_pass1);</div><div class='add'>+		build_table_color(KiaraRomTable[version][1], pdec-&gt;table_0004_pass2, pdec-&gt;table_8004_pass2);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		flags = cmd[2] &amp; 6;</div><div class='add'>+		if (flags == 2)</div><div class='add'>+			pdec-&gt;nbits = 7;</div><div class='add'>+		else if (flags == 4)</div><div class='add'>+			pdec-&gt;nbits = 8;</div><div class='add'>+		else</div><div class='add'>+			pdec-&gt;nbits = 6;</div><div class='add'>+</div><div class='add'>+		version = cmd[2] &gt;&gt; 3;</div><div class='add'>+		build_table_color(TimonRomTable[version][0], pdec-&gt;table_0004_pass1, pdec-&gt;table_8004_pass1);</div><div class='add'>+		build_table_color(TimonRomTable[version][1], pdec-&gt;table_0004_pass2, pdec-&gt;table_8004_pass2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Informations can be coded on a variable number of bits but never less than 8 */</div><div class='add'>+	shift = 8 - pdec-&gt;nbits;</div><div class='add'>+	pdec-&gt;scalebits = SCALEBITS - shift;</div><div class='add'>+	pdec-&gt;nbitsmask = 0xFF &gt;&gt; shift;</div><div class='add'>+</div><div class='add'>+	fill_table_dc00_d800(pdec);</div><div class='add'>+	build_subblock_pattern(pdec);</div><div class='add'>+	build_bit_powermask_table(pdec);</div><div class='add'>+</div><div class='add'>+#if USE_LOOKUP_TABLE_TO_CLAMP</div><div class='add'>+	/* Build the static table to clamp value [0-255] */</div><div class='add'>+	for (i=0;i&lt;MAX_OUTER_CROP_VALUE;i++)</div><div class='add'>+		pwc_crop_table[i] = 0;</div><div class='add'>+	for (i=0; i&lt;256; i++)</div><div class='add'>+		pwc_crop_table[MAX_OUTER_CROP_VALUE+i] = i;</div><div class='add'>+	for (i=0; i&lt;MAX_OUTER_CROP_VALUE; i++)</div><div class='add'>+		pwc_crop_table[MAX_OUTER_CROP_VALUE+256+i] = 255;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy the 4x4 image block to Y plane buffer</div><div class='add'>+ */</div><div class='add'>+static void copy_image_block_Y(const int *src, unsigned char *dst, unsigned int bytes_per_line, unsigned int scalebits)</div><div class='add'>+{</div><div class='add'>+#if UNROLL_LOOP_FOR_COPY</div><div class='add'>+	const unsigned char *cm = pwc_crop_table+MAX_OUTER_CROP_VALUE;</div><div class='add'>+	const int *c = src;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+</div><div class='add'>+	*d++ = cm[c[0] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[1] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[2] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[3] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	*d++ = cm[c[4] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[5] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[6] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[7] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*2;</div><div class='add'>+	*d++ = cm[c[8] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[9] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[10] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[11] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*3;</div><div class='add'>+	*d++ = cm[c[12] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[13] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[14] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[15] &gt;&gt; scalebits];</div><div class='add'>+#else</div><div class='add'>+	int i;</div><div class='add'>+	const int *c = src;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		*d++ = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		*d++ = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*2;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		*d++ = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*3;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		*d++ = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy the 4x4 image block to a CrCb plane buffer</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void copy_image_block_CrCb(const int *src, unsigned char *dst, unsigned int bytes_per_line, unsigned int scalebits)</div><div class='add'>+{</div><div class='add'>+#if UNROLL_LOOP_FOR_COPY</div><div class='add'>+	/* Unroll all loops */</div><div class='add'>+	const unsigned char *cm = pwc_crop_table+MAX_OUTER_CROP_VALUE;</div><div class='add'>+	const int *c = src;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+</div><div class='add'>+	*d++ = cm[c[0] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[4] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[1] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[5] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[2] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[6] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[3] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[7] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	*d++ = cm[c[12] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[8] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[13] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[9] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[14] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[10] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[15] &gt;&gt; scalebits];</div><div class='add'>+	*d++ = cm[c[11] &gt;&gt; scalebits];</div><div class='add'>+#else</div><div class='add'>+	int i;</div><div class='add'>+	const int *c1 = src;</div><div class='add'>+	const int *c2 = src + 4;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c1++, c2++) {</div><div class='add'>+		*d++ = CLAMP((*c1) &gt;&gt; scalebits);</div><div class='add'>+		*d++ = CLAMP((*c2) &gt;&gt; scalebits);</div><div class='add'>+	}</div><div class='add'>+	c1 = src + 12;</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c1++, c2++) {</div><div class='add'>+		*d++ = CLAMP((*c1) &gt;&gt; scalebits);</div><div class='add'>+		*d++ = CLAMP((*c2) &gt;&gt; scalebits);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if ENABLE_BAYER_DECODER</div><div class='add'>+/*</div><div class='add'>+ * Format: 8x2 pixels</div><div class='add'>+ *   . G . G . G . G . G . G . G</div><div class='add'>+ *   . . . . . . . . . . . . . .</div><div class='add'>+ *   . G . G . G . G . G . G . G</div><div class='add'>+ *   . . . . . . . . . . . . . .</div><div class='add'>+ *   or</div><div class='add'>+ *   . . . . . . . . . . . . . .</div><div class='add'>+ *   G . G . G . G . G . G . G .</div><div class='add'>+ *   . . . . . . . . . . . . . .</div><div class='add'>+ *   G . G . G . G . G . G . G .</div><div class='add'>+*/</div><div class='add'>+static void copy_image_block_Green(const int *src, unsigned char *dst, unsigned int bytes_per_line, unsigned int scalebits)</div><div class='add'>+{</div><div class='add'>+#if UNROLL_LOOP_FOR_COPY</div><div class='add'>+	/* Unroll all loops */</div><div class='add'>+	const unsigned char *cm = pwc_crop_table+MAX_OUTER_CROP_VALUE;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+	const int *c = src;</div><div class='add'>+</div><div class='add'>+	d[0] = cm[c[0] &gt;&gt; scalebits];</div><div class='add'>+	d[2] = cm[c[1] &gt;&gt; scalebits];</div><div class='add'>+	d[4] = cm[c[2] &gt;&gt; scalebits];</div><div class='add'>+	d[6] = cm[c[3] &gt;&gt; scalebits];</div><div class='add'>+	d[8] = cm[c[4] &gt;&gt; scalebits];</div><div class='add'>+	d[10] = cm[c[5] &gt;&gt; scalebits];</div><div class='add'>+	d[12] = cm[c[6] &gt;&gt; scalebits];</div><div class='add'>+	d[14] = cm[c[7] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	d[0] = cm[c[8] &gt;&gt; scalebits];</div><div class='add'>+	d[2] = cm[c[9] &gt;&gt; scalebits];</div><div class='add'>+	d[4] = cm[c[10] &gt;&gt; scalebits];</div><div class='add'>+	d[6] = cm[c[11] &gt;&gt; scalebits];</div><div class='add'>+	d[8] = cm[c[12] &gt;&gt; scalebits];</div><div class='add'>+	d[10] = cm[c[13] &gt;&gt; scalebits];</div><div class='add'>+	d[12] = cm[c[14] &gt;&gt; scalebits];</div><div class='add'>+	d[14] = cm[c[15] &gt;&gt; scalebits];</div><div class='add'>+#else</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char *d;</div><div class='add'>+	const int *c = src;</div><div class='add'>+</div><div class='add'>+	d = dst;</div><div class='add'>+	for (i = 0; i &lt; 8; i++, c++)</div><div class='add'>+		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	for (i = 0; i &lt; 8; i++, c++)</div><div class='add'>+		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if ENABLE_BAYER_DECODER</div><div class='add'>+/*</div><div class='add'>+ * Format: 4x4 pixels</div><div class='add'>+ *   R . R . R . R</div><div class='add'>+ *   . B . B . B .</div><div class='add'>+ *   R . R . R . R</div><div class='add'>+ *   . B . B . B .</div><div class='add'>+ */</div><div class='add'>+static void copy_image_block_RedBlue(const int *src, unsigned char *dst, unsigned int bytes_per_line, unsigned int scalebits)</div><div class='add'>+{</div><div class='add'>+#if UNROLL_LOOP_FOR_COPY</div><div class='add'>+	/* Unroll all loops */</div><div class='add'>+	const unsigned char *cm = pwc_crop_table+MAX_OUTER_CROP_VALUE;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+	const int *c = src;</div><div class='add'>+</div><div class='add'>+	d[0] = cm[c[0] &gt;&gt; scalebits];</div><div class='add'>+	d[2] = cm[c[1] &gt;&gt; scalebits];</div><div class='add'>+	d[4] = cm[c[2] &gt;&gt; scalebits];</div><div class='add'>+	d[6] = cm[c[3] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	d[1] = cm[c[4] &gt;&gt; scalebits];</div><div class='add'>+	d[3] = cm[c[5] &gt;&gt; scalebits];</div><div class='add'>+	d[5] = cm[c[6] &gt;&gt; scalebits];</div><div class='add'>+	d[7] = cm[c[7] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*2;</div><div class='add'>+	d[0] = cm[c[8] &gt;&gt; scalebits];</div><div class='add'>+	d[2] = cm[c[9] &gt;&gt; scalebits];</div><div class='add'>+	d[4] = cm[c[10] &gt;&gt; scalebits];</div><div class='add'>+	d[6] = cm[c[11] &gt;&gt; scalebits];</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*3;</div><div class='add'>+	d[1] = cm[c[12] &gt;&gt; scalebits];</div><div class='add'>+	d[3] = cm[c[13] &gt;&gt; scalebits];</div><div class='add'>+	d[5] = cm[c[14] &gt;&gt; scalebits];</div><div class='add'>+	d[7] = cm[c[15] &gt;&gt; scalebits];</div><div class='add'>+#else</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char *d;</div><div class='add'>+	const int *c = src;</div><div class='add'>+</div><div class='add'>+	d = dst;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		d[i*2+1] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*2;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		d[i*2] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+</div><div class='add'>+	d = dst + bytes_per_line*3;</div><div class='add'>+	for (i = 0; i &lt; 4; i++, c++)</div><div class='add'>+		d[i*2+1] = CLAMP((*c) &gt;&gt; scalebits);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To manage the stream, we keep bits in a 32 bits register.</div><div class='add'>+ * fill_nbits(n): fill the reservoir with at least n bits</div><div class='add'>+ * skip_bits(n): discard n bits from the reservoir</div><div class='add'>+ * get_bits(n): fill the reservoir, returns the first n bits and discard the</div><div class='add'>+ *              bits from the reservoir.</div><div class='add'>+ * __get_nbits(n): faster version of get_bits(n), but asumes that the reservoir</div><div class='add'>+ *                 contains at least n bits. bits returned is discarded.</div><div class='add'>+ */</div><div class='add'>+#define fill_nbits(pdec, nbits_wanted) do { \</div><div class='add'>+   while (pdec-&gt;nbits_in_reservoir&lt;(nbits_wanted)) \</div><div class='add'>+    { \</div><div class='add'>+      pdec-&gt;reservoir |= (*(pdec-&gt;stream)++) &lt;&lt; (pdec-&gt;nbits_in_reservoir); \</div><div class='add'>+      pdec-&gt;nbits_in_reservoir += 8; \</div><div class='add'>+    } \</div><div class='add'>+}  while(0);</div><div class='add'>+</div><div class='add'>+#define skip_nbits(pdec, nbits_to_skip) do { \</div><div class='add'>+   pdec-&gt;reservoir &gt;&gt;= (nbits_to_skip); \</div><div class='add'>+   pdec-&gt;nbits_in_reservoir -= (nbits_to_skip); \</div><div class='add'>+}  while(0);</div><div class='add'>+</div><div class='add'>+#define get_nbits(pdec, nbits_wanted, result) do { \</div><div class='add'>+   fill_nbits(pdec, nbits_wanted); \</div><div class='add'>+   result = (pdec-&gt;reservoir) &amp; ((1U&lt;&lt;(nbits_wanted))-1); \</div><div class='add'>+   skip_nbits(pdec, nbits_wanted); \</div><div class='add'>+}  while(0);</div><div class='add'>+</div><div class='add'>+#define __get_nbits(pdec, nbits_wanted, result) do { \</div><div class='add'>+   result = (pdec-&gt;reservoir) &amp; ((1U&lt;&lt;(nbits_wanted))-1); \</div><div class='add'>+   skip_nbits(pdec, nbits_wanted); \</div><div class='add'>+}  while(0);</div><div class='add'>+</div><div class='add'>+#define look_nbits(pdec, nbits_wanted) \</div><div class='add'>+   ((pdec-&gt;reservoir) &amp; ((1U&lt;&lt;(nbits_wanted))-1))</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Decode a 4x4 pixel block</div><div class='add'>+ */</div><div class='add'>+static void decode_block(struct pwc_dec23_private *pdec,</div><div class='add'>+			 const unsigned char *ptable0004,</div><div class='add'>+			 const unsigned char *ptable8004)</div><div class='add'>+{</div><div class='add'>+	unsigned int primary_color;</div><div class='add'>+	unsigned int channel_v, offset1, op;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	fill_nbits(pdec, 16);</div><div class='add'>+	__get_nbits(pdec, pdec-&gt;nbits, primary_color);</div><div class='add'>+</div><div class='add'>+	if (look_nbits(pdec,2) == 0) {</div><div class='add'>+		skip_nbits(pdec, 2);</div><div class='add'>+		/* Very simple, the color is the same for all pixels of the square */</div><div class='add'>+		for (i = 0; i &lt; 16; i++)</div><div class='add'>+			pdec-&gt;temp_colors[i] = pdec-&gt;table_dc00[primary_color];</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This block is encoded with small pattern */</div><div class='add'>+	for (i = 0; i &lt; 16; i++)</div><div class='add'>+		pdec-&gt;temp_colors[i] = pdec-&gt;table_d800[primary_color];</div><div class='add'>+</div><div class='add'>+	__get_nbits(pdec, 3, channel_v);</div><div class='add'>+	channel_v = ((channel_v &amp; 1) &lt;&lt; 2) | (channel_v &amp; 2) | ((channel_v &amp; 4) &gt;&gt; 2);</div><div class='add'>+</div><div class='add'>+	ptable0004 += (channel_v * 128);</div><div class='add'>+	ptable8004 += (channel_v * 32);</div><div class='add'>+</div><div class='add'>+	offset1 = 0;</div><div class='add'>+	do</div><div class='add'>+	{</div><div class='add'>+		unsigned int htable_idx, rows = 0;</div><div class='add'>+		const unsigned int *block;</div><div class='add'>+</div><div class='add'>+		/* [  zzzz y x x ]</div><div class='add'>+		 *     xx == 00 :=&gt; end of the block def, remove the two bits from the stream</div><div class='add'>+		 *    yxx == 111</div><div class='add'>+		 *    yxx == any other value</div><div class='add'>+		 *</div><div class='add'>+		 */</div><div class='add'>+		fill_nbits(pdec, 16);</div><div class='add'>+		htable_idx = look_nbits(pdec, 6);</div><div class='add'>+		op = hash_table_ops[htable_idx * 4];</div><div class='add'>+</div><div class='add'>+		if (op == 2) {</div><div class='add'>+			skip_nbits(pdec, 2);</div><div class='add'>+</div><div class='add'>+		} else if (op == 1) {</div><div class='add'>+			/* 15bits [ xxxx xxxx yyyy 111 ]</div><div class='add'>+			 * yyy =&gt; offset in the table8004</div><div class='add'>+			 * xxx =&gt; offset in the tabled004 (tree)</div><div class='add'>+			 */</div><div class='add'>+			unsigned int mask, shift;</div><div class='add'>+			unsigned int nbits, col1;</div><div class='add'>+			unsigned int yyyy;</div><div class='add'>+</div><div class='add'>+			skip_nbits(pdec, 3);</div><div class='add'>+			/* offset1 += yyyy */</div><div class='add'>+			__get_nbits(pdec, 4, yyyy);</div><div class='add'>+			offset1 += 1 + yyyy;</div><div class='add'>+			offset1 &amp;= 0x0F;</div><div class='add'>+			nbits = ptable8004[offset1 * 2];</div><div class='add'>+</div><div class='add'>+			/* col1 = xxxx xxxx */</div><div class='add'>+			__get_nbits(pdec, nbits+1, col1);</div><div class='add'>+</div><div class='add'>+			/* Bit mask table */</div><div class='add'>+			mask = pdec-&gt;table_bitpowermask[nbits][col1];</div><div class='add'>+			shift = ptable8004[offset1 * 2 + 1];</div><div class='add'>+			rows = ((mask &lt;&lt; shift) + 0x80) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+			block = pdec-&gt;table_subblock[rows];</div><div class='add'>+			for (i = 0; i &lt; 16; i++)</div><div class='add'>+				pdec-&gt;temp_colors[i] += block[MulIdx[offset1][i]];</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			/* op == 0</div><div class='add'>+			 * offset1 is coded on 3 bits</div><div class='add'>+			 */</div><div class='add'>+			unsigned int shift;</div><div class='add'>+</div><div class='add'>+			offset1 += hash_table_ops [htable_idx * 4 + 2];</div><div class='add'>+			offset1 &amp;= 0x0F;</div><div class='add'>+</div><div class='add'>+			rows = ptable0004[offset1 + hash_table_ops [htable_idx * 4 + 3]];</div><div class='add'>+			block = pdec-&gt;table_subblock[rows];</div><div class='add'>+			for (i = 0; i &lt; 16; i++)</div><div class='add'>+				pdec-&gt;temp_colors[i] += block[MulIdx[offset1][i]];</div><div class='add'>+</div><div class='add'>+			shift = hash_table_ops[htable_idx * 4 + 1];</div><div class='add'>+			skip_nbits(pdec, shift);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (op != 2);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void DecompressBand23(struct pwc_dec23_private *pdec,</div><div class='add'>+			     const unsigned char *rawyuv,</div><div class='add'>+			     unsigned char *planar_y,</div><div class='add'>+			     unsigned char *planar_u,</div><div class='add'>+			     unsigned char *planar_v,</div><div class='add'>+			     unsigned int   compressed_image_width,</div><div class='add'>+			     unsigned int   real_image_width)</div><div class='add'>+{</div><div class='add'>+	int compression_index, nblocks;</div><div class='add'>+	const unsigned char *ptable0004;</div><div class='add'>+	const unsigned char *ptable8004;</div><div class='add'>+</div><div class='add'>+	pdec-&gt;reservoir = 0;</div><div class='add'>+	pdec-&gt;nbits_in_reservoir = 0;</div><div class='add'>+	pdec-&gt;stream = rawyuv + 1;	/* The first byte of the stream is skipped */</div><div class='add'>+</div><div class='add'>+	get_nbits(pdec, 4, compression_index);</div><div class='add'>+</div><div class='add'>+	/* pass 1: uncompress Y component */</div><div class='add'>+	nblocks = compressed_image_width / 4;</div><div class='add'>+</div><div class='add'>+	ptable0004 = pdec-&gt;table_0004_pass1[compression_index];</div><div class='add'>+	ptable8004 = pdec-&gt;table_8004_pass1[compression_index];</div><div class='add'>+</div><div class='add'>+	/* Each block decode a square of 4x4 */</div><div class='add'>+	while (nblocks) {</div><div class='add'>+		decode_block(pdec, ptable0004, ptable8004);</div><div class='add'>+		copy_image_block_Y(pdec-&gt;temp_colors, planar_y, real_image_width, pdec-&gt;scalebits);</div><div class='add'>+		planar_y += 4;</div><div class='add'>+		nblocks--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pass 2: uncompress UV component */</div><div class='add'>+	nblocks = compressed_image_width / 8;</div><div class='add'>+</div><div class='add'>+	ptable0004 = pdec-&gt;table_0004_pass2[compression_index];</div><div class='add'>+	ptable8004 = pdec-&gt;table_8004_pass2[compression_index];</div><div class='add'>+</div><div class='add'>+	/* Each block decode a square of 4x4 */</div><div class='add'>+	while (nblocks) {</div><div class='add'>+		decode_block(pdec, ptable0004, ptable8004);</div><div class='add'>+		copy_image_block_CrCb(pdec-&gt;temp_colors, planar_u, real_image_width/2, pdec-&gt;scalebits);</div><div class='add'>+</div><div class='add'>+		decode_block(pdec, ptable0004, ptable8004);</div><div class='add'>+		copy_image_block_CrCb(pdec-&gt;temp_colors, planar_v, real_image_width/2, pdec-&gt;scalebits);</div><div class='add'>+</div><div class='add'>+		planar_v += 8;</div><div class='add'>+		planar_u += 8;</div><div class='add'>+		nblocks -= 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if ENABLE_BAYER_DECODER</div><div class='add'>+/*</div><div class='add'>+ * Size need to be a multiple of 8 in width</div><div class='add'>+ *</div><div class='add'>+ * Return a block of four line encoded like this:</div><div class='add'>+ *</div><div class='add'>+ *   G R G R G R G R G R G R G R G R</div><div class='add'>+ *   B G B G B G B G B G B G B G B G</div><div class='add'>+ *   G R G R G R G R G R G R G R G R</div><div class='add'>+ *   B G B G B G B G B G B G B G B G</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void DecompressBandBayer(struct pwc_dec23_private *pdec,</div><div class='add'>+				const unsigned char *rawyuv,</div><div class='add'>+				unsigned char *rgbbayer,</div><div class='add'>+				unsigned int   compressed_image_width,</div><div class='add'>+				unsigned int   real_image_width)</div><div class='add'>+{</div><div class='add'>+	int compression_index, nblocks;</div><div class='add'>+	const unsigned char *ptable0004;</div><div class='add'>+	const unsigned char *ptable8004;</div><div class='add'>+	unsigned char *dest;</div><div class='add'>+</div><div class='add'>+	pdec-&gt;reservoir = 0;</div><div class='add'>+	pdec-&gt;nbits_in_reservoir = 0;</div><div class='add'>+	pdec-&gt;stream = rawyuv + 1;	/* The first byte of the stream is skipped */</div><div class='add'>+</div><div class='add'>+	get_nbits(pdec, 4, compression_index);</div><div class='add'>+</div><div class='add'>+	/* pass 1: uncompress RB component */</div><div class='add'>+	nblocks = compressed_image_width / 4;</div><div class='add'>+</div><div class='add'>+	ptable0004 = pdec-&gt;table_0004_pass1[compression_index];</div><div class='add'>+	ptable8004 = pdec-&gt;table_8004_pass1[compression_index];</div><div class='add'>+	dest = rgbbayer;</div><div class='add'>+</div><div class='add'>+	/* Each block decode a square of 4x4 */</div><div class='add'>+	while (nblocks) {</div><div class='add'>+		decode_block(pdec, ptable0004, ptable8004);</div><div class='add'>+		copy_image_block_RedBlue(pdec-&gt;temp_colors, rgbbayer, real_image_width, pdec-&gt;scalebits);</div><div class='add'>+		dest += 8;</div><div class='add'>+		nblocks--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pass 2: uncompress G component */</div><div class='add'>+	nblocks = compressed_image_width / 8;</div><div class='add'>+</div><div class='add'>+	ptable0004 = pdec-&gt;table_0004_pass2[compression_index];</div><div class='add'>+	ptable8004 = pdec-&gt;table_8004_pass2[compression_index];</div><div class='add'>+</div><div class='add'>+	/* Each block decode a square of 4x4 */</div><div class='add'>+	while (nblocks) {</div><div class='add'>+		decode_block(pdec, ptable0004, ptable8004);</div><div class='add'>+		copy_image_block_Green(pdec-&gt;temp_colors, rgbbayer+1, real_image_width, pdec-&gt;scalebits);</div><div class='add'>+</div><div class='add'>+		decode_block(pdec, ptable0004, ptable8004);</div><div class='add'>+		copy_image_block_Green(pdec-&gt;temp_colors, rgbbayer+real_image_width, real_image_width, pdec-&gt;scalebits);</div><div class='add'>+</div><div class='add'>+		rgbbayer += 16;</div><div class='add'>+		nblocks -= 2;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *</div><div class='add'>+ * Uncompress a pwc23 buffer.</div><div class='add'>+ *</div><div class='add'>+ * pwc.view: size of the image wanted</div><div class='add'>+ * pwc.image: size of the image returned by the camera</div><div class='add'>+ * pwc.offset: (x,y) to displayer image in the view</div><div class='add'>+ *</div><div class='add'>+ * src: raw data</div><div class='add'>+ * dst: image output</div><div class='add'>+ * flags: PWCX_FLAG_PLANAR or PWCX_FLAG_BAYER</div><div class='add'>+ */</div><div class='add'>+void pwc_dec23_decompress(const struct pwc_device *pwc,</div><div class='add'>+			  const void *src,</div><div class='add'>+			  void *dst,</div><div class='add'>+			  int flags)</div><div class='add'>+{</div><div class='add'>+	int bandlines_left, stride, bytes_per_block;</div><div class='add'>+</div><div class='add'>+	bandlines_left = pwc-&gt;image.y / 4;</div><div class='add'>+	bytes_per_block = pwc-&gt;view.x * 4;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; PWCX_FLAG_BAYER) {</div><div class='add'>+#if ENABLE_BAYER_DECODER</div><div class='add'>+		/* RGB Bayer format */</div><div class='add'>+		unsigned char *rgbout;</div><div class='add'>+</div><div class='add'>+		stride = pwc-&gt;view.x * pwc-&gt;offset.y;</div><div class='add'>+		rgbout = dst + stride + pwc-&gt;offset.x;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		while (bandlines_left--) {</div><div class='add'>+</div><div class='add'>+			DecompressBandBayer(pwc-&gt;decompress_data,</div><div class='add'>+					    src,</div><div class='add'>+					    rgbout,</div><div class='add'>+					    pwc-&gt;image.x, pwc-&gt;view.x);</div><div class='add'>+</div><div class='add'>+			src += pwc-&gt;vbandlength;</div><div class='add'>+			rgbout += bytes_per_block;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		memset(dst, 0, pwc-&gt;view.x * pwc-&gt;view.y);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* YUV420P image format */</div><div class='add'>+		unsigned char *pout_planar_y;</div><div class='add'>+		unsigned char *pout_planar_u;</div><div class='add'>+		unsigned char *pout_planar_v;</div><div class='add'>+		unsigned int   plane_size;</div><div class='add'>+</div><div class='add'>+		plane_size = pwc-&gt;view.x * pwc-&gt;view.y;</div><div class='add'>+</div><div class='add'>+		/* offset in Y plane */</div><div class='add'>+		stride = pwc-&gt;view.x * pwc-&gt;offset.y;</div><div class='add'>+		pout_planar_y = dst + stride + pwc-&gt;offset.x;</div><div class='add'>+</div><div class='add'>+		/* offsets in U/V planes */</div><div class='add'>+		stride = (pwc-&gt;view.x * pwc-&gt;offset.y) / 4 + pwc-&gt;offset.x / 2;</div><div class='add'>+		pout_planar_u = dst + plane_size + stride;</div><div class='add'>+		pout_planar_v = dst + plane_size + plane_size / 4 + stride;</div><div class='add'>+</div><div class='add'>+		while (bandlines_left--) {</div><div class='add'>+</div><div class='add'>+			DecompressBand23(pwc-&gt;decompress_data,</div><div class='add'>+					 src,</div><div class='add'>+					 pout_planar_y, pout_planar_u, pout_planar_v,</div><div class='add'>+					 pwc-&gt;image.x, pwc-&gt;view.x);</div><div class='add'>+			src += pwc-&gt;vbandlength;</div><div class='add'>+			pout_planar_y += bytes_per_block;</div><div class='add'>+			pout_planar_u += pwc-&gt;view.x;</div><div class='add'>+			pout_planar_v += pwc-&gt;view.x;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pwc_dec23_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* Do nothing */</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Allocate a private structure used by lookup table.</div><div class='add'>+ * You must call kfree() to free the memory allocated.</div><div class='add'>+ */</div><div class='add'>+int pwc_dec23_alloc(struct pwc_device *pwc)</div><div class='add'>+{</div><div class='add'>+	pwc-&gt;decompress_data = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);</div><div class='add'>+	if (pwc-&gt;decompress_data == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-dec23.h b/drivers/media/video/pwc/pwc-dec23.h<br/>new file mode 100644<br/>index 000000000000..1c55298ad153<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-dec23.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-dec23.h</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/* Linux driver for Philips webcam</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='add'>+</div><div class='add'>+   NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='add'>+   driver and thus may have bugs that are not present in the original version.</div><div class='add'>+   Please send bug reports and support requests to &lt;luc@saillard.org&gt;.</div><div class='add'>+   The decompression routines have been implemented by reverse-engineering the</div><div class='add'>+   Nemosoft binary pwcx module. Caveat emptor.</div><div class='add'>+</div><div class='add'>+   This program is free software; you can redistribute it and/or modify</div><div class='add'>+   it under the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version.</div><div class='add'>+</div><div class='add'>+   This program is distributed in the hope that it will be useful,</div><div class='add'>+   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+   GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+   You should have received a copy of the GNU General Public License</div><div class='add'>+   along with this program; if not, write to the Free Software</div><div class='add'>+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef PWC_DEC23_H</div><div class='add'>+#define PWC_DEC23_H</div><div class='add'>+</div><div class='add'>+#include "pwc.h"</div><div class='add'>+</div><div class='add'>+struct pwc_dec23_private</div><div class='add'>+{</div><div class='add'>+  unsigned int scalebits;</div><div class='add'>+  unsigned int nbitsmask, nbits; /* Number of bits of a color in the compressed stream */</div><div class='add'>+</div><div class='add'>+  unsigned int reservoir;</div><div class='add'>+  unsigned int nbits_in_reservoir;</div><div class='add'>+  const unsigned char *stream;</div><div class='add'>+  int temp_colors[16];</div><div class='add'>+</div><div class='add'>+  unsigned char table_0004_pass1[16][1024];</div><div class='add'>+  unsigned char table_0004_pass2[16][1024];</div><div class='add'>+  unsigned char table_8004_pass1[16][256];</div><div class='add'>+  unsigned char table_8004_pass2[16][256];</div><div class='add'>+  unsigned int  table_subblock[256][12];</div><div class='add'>+</div><div class='add'>+  unsigned char table_bitpowermask[8][256];</div><div class='add'>+  unsigned int  table_d800[256];</div><div class='add'>+  unsigned int  table_dc00[256];</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pwc_dec23_alloc(struct pwc_device *pwc);</div><div class='add'>+int pwc_dec23_init(struct pwc_device *pwc, int type, unsigned char *cmd);</div><div class='add'>+void pwc_dec23_exit(void);</div><div class='add'>+void pwc_dec23_decompress(const struct pwc_device *pwc,</div><div class='add'>+			  const void *src,</div><div class='add'>+			  void *dst,</div><div class='add'>+			  int flags);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c<br/>index 41418294a32b..47d0d83a0264 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-if.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-if.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-if.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-if.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='ctx'>    USB and Video4Linux interface part.</div><div class='ctx'>    (C) 1999-2004 Nemosoft Unv.</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -62,18 +62,21 @@</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pwc.h"</div><div class='del'>-#include "pwc-ioctl.h"</div><div class='ctx'> #include "pwc-kiara.h"</div><div class='ctx'> #include "pwc-timon.h"</div><div class='add'>+#include "pwc-dec23.h"</div><div class='add'>+#include "pwc-dec1.h"</div><div class='ctx'> #include "pwc-uncompress.h"</div><div class='ctx'> </div><div class='ctx'> /* Function prototypes and driver templates */</div><div class='ctx'> </div><div class='ctx'> /* hotplug device table support */</div><div class='del'>-static struct usb_device_id pwc_device_table [] = {</div><div class='add'>+static const struct usb_device_id pwc_device_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0302) }, /* Philips models */</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0303) },</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0304) },</div><div class='hunk'>@@ -81,9 +84,10 @@ static struct usb_device_id pwc_device_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0308) },</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x030C) },</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0310) },</div><div class='del'>-	{ USB_DEVICE(0x0471, 0x0311) },</div><div class='add'>+	{ USB_DEVICE(0x0471, 0x0311) }, /* Philips ToUcam PRO II */</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0312) },</div><div class='ctx'> 	{ USB_DEVICE(0x0471, 0x0313) }, /* the 'new' 720K */</div><div class='add'>+	{ USB_DEVICE(0x0471, 0x0329) }, /* Philips SPC 900NC PC Camera */</div><div class='ctx'> 	{ USB_DEVICE(0x069A, 0x0001) }, /* Askey */</div><div class='ctx'> 	{ USB_DEVICE(0x046D, 0x08B0) }, /* Logitech QuickCam Pro 3000 */</div><div class='ctx'> 	{ USB_DEVICE(0x046D, 0x08B1) }, /* Logitech QuickCam Notebook Pro */</div><div class='hunk'>@@ -94,8 +98,9 @@ static struct usb_device_id pwc_device_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x046D, 0x08B6) }, /* Logitech (reserved) */</div><div class='ctx'> 	{ USB_DEVICE(0x046D, 0x08B7) }, /* Logitech (reserved) */</div><div class='ctx'> 	{ USB_DEVICE(0x046D, 0x08B8) }, /* Logitech (reserved) */</div><div class='del'>-	{ USB_DEVICE(0x055D, 0x9000) }, /* Samsung */</div><div class='del'>-	{ USB_DEVICE(0x055D, 0x9001) },</div><div class='add'>+	{ USB_DEVICE(0x055D, 0x9000) }, /* Samsung MPC-C10 */</div><div class='add'>+	{ USB_DEVICE(0x055D, 0x9001) }, /* Samsung MPC-C30 */</div><div class='add'>+	{ USB_DEVICE(0x055D, 0x9002) },	/* Samsung SNC-35E (Ver3.0) */</div><div class='ctx'> 	{ USB_DEVICE(0x041E, 0x400C) }, /* Creative Webcam 5 */</div><div class='ctx'> 	{ USB_DEVICE(0x041E, 0x4011) }, /* Creative Webcam Pro Ex */</div><div class='ctx'> 	{ USB_DEVICE(0x04CC, 0x8116) }, /* Afina Eye */</div><div class='hunk'>@@ -122,11 +127,13 @@ static struct usb_driver pwc_driver = {</div><div class='ctx'> static int default_size = PSZ_QCIF;</div><div class='ctx'> static int default_fps = 10;</div><div class='ctx'> static int default_fbufs = 3;   /* Default number of frame buffers */</div><div class='del'>-static int default_mbufs = 2;	/* Default number of mmap() buffers */</div><div class='del'>-       int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX;</div><div class='add'>+       int pwc_mbufs = 2;	/* Default number of mmap() buffers */</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='add'>+       int pwc_trace = PWC_DEBUG_LEVEL;</div><div class='add'>+#endif</div><div class='ctx'> static int power_save = 0;</div><div class='ctx'> static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */</div><div class='del'>-static int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */</div><div class='add'>+static int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */</div><div class='ctx'> static struct {</div><div class='ctx'> 	int type;</div><div class='ctx'> 	char serial_number[30];</div><div class='hunk'>@@ -138,7 +145,7 @@ static struct {</div><div class='ctx'> </div><div class='ctx'> static int pwc_video_open(struct inode *inode, struct file *file);</div><div class='ctx'> static int pwc_video_close(struct inode *inode, struct file *file);</div><div class='del'>-static ssize_t pwc_video_read(struct file *file, char __user * buf,</div><div class='add'>+static ssize_t pwc_video_read(struct file *file, char __user *buf,</div><div class='ctx'> 			  size_t count, loff_t *ppos);</div><div class='ctx'> static unsigned int pwc_video_poll(struct file *file, poll_table *wait);</div><div class='ctx'> static int  pwc_video_ioctl(struct inode *inode, struct file *file,</div><div class='hunk'>@@ -153,7 +160,6 @@ static struct file_operations pwc_fops = {</div><div class='ctx'> 	.poll =		pwc_video_poll,</div><div class='ctx'> 	.mmap =		pwc_video_mmap,</div><div class='ctx'> 	.ioctl =        pwc_video_ioctl,</div><div class='del'>-	.compat_ioctl = v4l_compat_ioctl32,</div><div class='ctx'> 	.llseek =       no_llseek,</div><div class='ctx'> };</div><div class='ctx'> static struct video_device pwc_template = {</div><div class='hunk'>@@ -203,52 +209,44 @@ static struct video_device pwc_template = {</div><div class='ctx'> /* Here we want the physical address of the memory.</div><div class='ctx'>  * This is used when initializing the contents of the area.</div><div class='ctx'>  */</div><div class='del'>-static inline unsigned long kvirt_to_pa(unsigned long adr)</div><div class='del'>-{</div><div class='del'>-	unsigned long kva, ret;</div><div class='ctx'> </div><div class='del'>-	kva = (unsigned long) page_address(vmalloc_to_page((void *)adr));</div><div class='del'>-	kva |= adr &amp; (PAGE_SIZE-1); /* restore the offset */</div><div class='del'>-	ret = __pa(kva);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void * rvmalloc(unsigned long size)</div><div class='add'>+</div><div class='add'>+static void *pwc_rvmalloc(unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	void * mem;</div><div class='ctx'> 	unsigned long adr;</div><div class='ctx'> </div><div class='del'>-	size=PAGE_ALIGN(size);</div><div class='ctx'> 	mem=vmalloc_32(size);</div><div class='del'>-	if (mem)</div><div class='del'>-	{</div><div class='del'>-		memset(mem, 0, size); /* Clear the ram out, no junk to the user */</div><div class='del'>-		adr=(unsigned long) mem;</div><div class='del'>-		while (size &gt; 0)</div><div class='del'>-		{</div><div class='del'>-			SetPageReserved(vmalloc_to_page((void *)adr));</div><div class='del'>-			adr+=PAGE_SIZE;</div><div class='del'>-			size-=PAGE_SIZE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!mem)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memset(mem, 0, size); /* Clear the ram out, no junk to the user */</div><div class='add'>+	adr=(unsigned long) mem;</div><div class='add'>+	while (size &gt; 0)</div><div class='add'>+	 {</div><div class='add'>+	   SetPageReserved(vmalloc_to_page((void *)adr));</div><div class='add'>+	   adr  += PAGE_SIZE;</div><div class='add'>+	   size -= PAGE_SIZE;</div><div class='add'>+	 }</div><div class='ctx'> 	return mem;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rvfree(void * mem, unsigned long size)</div><div class='add'>+static void pwc_rvfree(void * mem, unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long adr;</div><div class='ctx'> </div><div class='del'>-	if (mem)</div><div class='del'>-	{</div><div class='del'>-		adr=(unsigned long) mem;</div><div class='del'>-		while ((long) size &gt; 0)</div><div class='del'>-		{</div><div class='del'>-			ClearPageReserved(vmalloc_to_page((void *)adr));</div><div class='del'>-			adr+=PAGE_SIZE;</div><div class='del'>-			size-=PAGE_SIZE;</div><div class='del'>-		}</div><div class='del'>-		vfree(mem);</div><div class='del'>-	}</div><div class='add'>+	if (!mem)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	adr=(unsigned long) mem;</div><div class='add'>+	while ((long) size &gt; 0)</div><div class='add'>+	 {</div><div class='add'>+	   ClearPageReserved(vmalloc_to_page((void *)adr));</div><div class='add'>+	   adr  += PAGE_SIZE;</div><div class='add'>+	   size -= PAGE_SIZE;</div><div class='add'>+	 }</div><div class='add'>+	vfree(mem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -256,100 +254,83 @@ static void rvfree(void * mem, unsigned long size)</div><div class='ctx'> </div><div class='ctx'> static int pwc_allocate_buffers(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, err;</div><div class='ctx'> 	void *kbuf;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_MEMORY, "&gt;&gt; pwc_allocate_buffers(pdev = 0x%p)\n", pdev);</div><div class='add'>+	PWC_DEBUG_MEMORY("&gt;&gt; pwc_allocate_buffers(pdev = 0x%p)\n", pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-#ifdef PWC_MAGIC</div><div class='del'>-	if (pdev-&gt;magic != PWC_MAGIC) {</div><div class='del'>-		Err("allocate_buffers(): magic failed.\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	/* Allocate Isochronous pipe buffers */</div><div class='add'>+	/* Allocate Isochronuous pipe buffers */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_ISO_BUFS; i++) {</div><div class='ctx'> 		if (pdev-&gt;sbuf[i].data == NULL) {</div><div class='del'>-			kbuf = kmalloc(ISO_BUFFER_SIZE, GFP_KERNEL);</div><div class='add'>+			kbuf = kzalloc(ISO_BUFFER_SIZE, GFP_KERNEL);</div><div class='ctx'> 			if (kbuf == NULL) {</div><div class='del'>-				Err("Failed to allocate iso buffer %d.\n", i);</div><div class='add'>+				PWC_ERROR("Failed to allocate iso buffer %d.\n", i);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='del'>-			Trace(TRACE_MEMORY, "Allocated iso buffer at %p.\n", kbuf);</div><div class='add'>+			PWC_DEBUG_MEMORY("Allocated iso buffer at %p.\n", kbuf);</div><div class='ctx'> 			pdev-&gt;sbuf[i].data = kbuf;</div><div class='del'>-			memset(kbuf, 0, ISO_BUFFER_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate frame buffer structure */</div><div class='ctx'> 	if (pdev-&gt;fbuf == NULL) {</div><div class='del'>-		kbuf = kmalloc(default_fbufs * sizeof(struct pwc_frame_buf), GFP_KERNEL);</div><div class='add'>+		kbuf = kzalloc(default_fbufs * sizeof(struct pwc_frame_buf), GFP_KERNEL);</div><div class='ctx'> 		if (kbuf == NULL) {</div><div class='del'>-			Err("Failed to allocate frame buffer structure.\n");</div><div class='add'>+			PWC_ERROR("Failed to allocate frame buffer structure.\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		Trace(TRACE_MEMORY, "Allocated frame buffer structure at %p.\n", kbuf);</div><div class='add'>+		PWC_DEBUG_MEMORY("Allocated frame buffer structure at %p.\n", kbuf);</div><div class='ctx'> 		pdev-&gt;fbuf = kbuf;</div><div class='del'>-		memset(kbuf, 0, default_fbufs * sizeof(struct pwc_frame_buf));</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* create frame buffers, and make circular ring */</div><div class='ctx'> 	for (i = 0; i &lt; default_fbufs; i++) {</div><div class='ctx'> 		if (pdev-&gt;fbuf[i].data == NULL) {</div><div class='ctx'> 			kbuf = vmalloc(PWC_FRAME_SIZE); /* need vmalloc since frame buffer &gt; 128K */</div><div class='ctx'> 			if (kbuf == NULL) {</div><div class='del'>-				Err("Failed to allocate frame buffer %d.\n", i);</div><div class='add'>+				PWC_ERROR("Failed to allocate frame buffer %d.\n", i);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='del'>-			Trace(TRACE_MEMORY, "Allocated frame buffer %d at %p.\n", i, kbuf);</div><div class='add'>+			PWC_DEBUG_MEMORY("Allocated frame buffer %d at %p.\n", i, kbuf);</div><div class='ctx'> 			pdev-&gt;fbuf[i].data = kbuf;</div><div class='del'>-			memset(kbuf, 128, PWC_FRAME_SIZE);</div><div class='add'>+			memset(kbuf, 0, PWC_FRAME_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate decompressor table space */</div><div class='del'>-	kbuf = NULL;</div><div class='del'>-	switch (pdev-&gt;type)</div><div class='del'>-	 {</div><div class='del'>-	  case 675:</div><div class='del'>-	  case 680:</div><div class='del'>-	  case 690:</div><div class='del'>-	  case 720:</div><div class='del'>-	  case 730:</div><div class='del'>-	  case 740:</div><div class='del'>-	  case 750:</div><div class='del'>-#if 0</div><div class='del'>-	    Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private));</div><div class='del'>-	    kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);	/* Timon &amp; Kiara */</div><div class='del'>-	    break;</div><div class='del'>-	  case 645:</div><div class='del'>-	  case 646:</div><div class='del'>-	    /* TODO &amp; FIXME */</div><div class='del'>-	    kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);</div><div class='del'>-	    break;</div><div class='del'>-#endif</div><div class='del'>-	;</div><div class='del'>-	 }</div><div class='del'>-	pdev-&gt;decompress_data = kbuf;</div><div class='add'>+	if (DEVICE_USE_CODEC1(pdev-&gt;type))</div><div class='add'>+		err = pwc_dec1_alloc(pdev);</div><div class='add'>+	else</div><div class='add'>+		err = pwc_dec23_alloc(pdev);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		PWC_ERROR("Failed to allocate decompress table.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate image buffer; double buffer for mmap() */</div><div class='del'>-	kbuf = rvmalloc(default_mbufs * pdev-&gt;len_per_image);</div><div class='add'>+	kbuf = pwc_rvmalloc(pwc_mbufs * pdev-&gt;len_per_image);</div><div class='ctx'> 	if (kbuf == NULL) {</div><div class='del'>-		Err("Failed to allocate image buffer(s). needed (%d)\n",default_mbufs * pdev-&gt;len_per_image);</div><div class='add'>+		PWC_ERROR("Failed to allocate image buffer(s). needed (%d)\n",</div><div class='add'>+				pwc_mbufs * pdev-&gt;len_per_image);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	Trace(TRACE_MEMORY, "Allocated image buffer at %p.\n", kbuf);</div><div class='add'>+	PWC_DEBUG_MEMORY("Allocated image buffer at %p.\n", kbuf);</div><div class='ctx'> 	pdev-&gt;image_data = kbuf;</div><div class='del'>-	for (i = 0; i &lt; default_mbufs; i++)</div><div class='del'>-		pdev-&gt;image_ptr[i] = kbuf + i * pdev-&gt;len_per_image;</div><div class='del'>-	for (; i &lt; MAX_IMAGES; i++)</div><div class='del'>-		pdev-&gt;image_ptr[i] = NULL;</div><div class='add'>+	for (i = 0; i &lt; pwc_mbufs; i++) {</div><div class='add'>+		pdev-&gt;images[i].offset = i * pdev-&gt;len_per_image;</div><div class='add'>+		pdev-&gt;images[i].vma_use_count = 0;</div><div class='add'>+	}</div><div class='add'>+	for (; i &lt; MAX_IMAGES; i++) {</div><div class='add'>+		pdev-&gt;images[i].offset = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_MEMORY, "&lt;&lt; pwc_allocate_buffers()\n");</div><div class='add'>+	PWC_DEBUG_MEMORY("&lt;&lt; pwc_allocate_buffers()\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -357,21 +338,14 @@ static void pwc_free_buffers(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_MEMORY, "Entering free_buffers(%p).\n", pdev);</div><div class='add'>+	PWC_DEBUG_MEMORY("Entering free_buffers(%p).\n", pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-#ifdef PWC_MAGIC</div><div class='del'>-	if (pdev-&gt;magic != PWC_MAGIC) {</div><div class='del'>-		Err("free_buffers(): magic failed.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Release Iso-pipe buffers */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_ISO_BUFS; i++)</div><div class='ctx'> 		if (pdev-&gt;sbuf[i].data != NULL) {</div><div class='del'>-			Trace(TRACE_MEMORY, "Freeing ISO buffer at %p.\n", pdev-&gt;sbuf[i].data);</div><div class='add'>+			PWC_DEBUG_MEMORY("Freeing ISO buffer at %p.\n", pdev-&gt;sbuf[i].data);</div><div class='ctx'> 			kfree(pdev-&gt;sbuf[i].data);</div><div class='ctx'> 			pdev-&gt;sbuf[i].data = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -380,7 +354,7 @@ static void pwc_free_buffers(struct pwc_device *pdev)</div><div class='ctx'> 	if (pdev-&gt;fbuf != NULL) {</div><div class='ctx'> 		for (i = 0; i &lt; default_fbufs; i++) {</div><div class='ctx'> 			if (pdev-&gt;fbuf[i].data != NULL) {</div><div class='del'>-				Trace(TRACE_MEMORY, "Freeing frame buffer %d at %p.\n", i, pdev-&gt;fbuf[i].data);</div><div class='add'>+				PWC_DEBUG_MEMORY("Freeing frame buffer %d at %p.\n", i, pdev-&gt;fbuf[i].data);</div><div class='ctx'> 				vfree(pdev-&gt;fbuf[i].data);</div><div class='ctx'> 				pdev-&gt;fbuf[i].data = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -391,20 +365,19 @@ static void pwc_free_buffers(struct pwc_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Intermediate decompression buffer &amp; tables */</div><div class='ctx'> 	if (pdev-&gt;decompress_data != NULL) {</div><div class='del'>-		Trace(TRACE_MEMORY, "Freeing decompression buffer at %p.\n", pdev-&gt;decompress_data);</div><div class='add'>+		PWC_DEBUG_MEMORY("Freeing decompression buffer at %p.\n", pdev-&gt;decompress_data);</div><div class='ctx'> 		kfree(pdev-&gt;decompress_data);</div><div class='ctx'> 		pdev-&gt;decompress_data = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	pdev-&gt;decompressor = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Release image buffers */</div><div class='ctx'> 	if (pdev-&gt;image_data != NULL) {</div><div class='del'>-		Trace(TRACE_MEMORY, "Freeing image buffer at %p.\n", pdev-&gt;image_data);</div><div class='del'>-		rvfree(pdev-&gt;image_data, default_mbufs * pdev-&gt;len_per_image);</div><div class='add'>+		PWC_DEBUG_MEMORY("Freeing image buffer at %p.\n", pdev-&gt;image_data);</div><div class='add'>+		pwc_rvfree(pdev-&gt;image_data, pwc_mbufs * pdev-&gt;len_per_image);</div><div class='ctx'> 	}</div><div class='ctx'> 	pdev-&gt;image_data = NULL;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_MEMORY, "Leaving free_buffers().\n");</div><div class='add'>+	PWC_DEBUG_MEMORY("Leaving free_buffers().\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The frame &amp; image buffer mess.</div><div class='hunk'>@@ -464,7 +437,7 @@ static void pwc_free_buffers(struct pwc_device *pdev)</div><div class='ctx'> /**</div><div class='ctx'>   \brief Find next frame buffer to fill. Take from empty or full list, whichever comes first.</div><div class='ctx'>  */</div><div class='del'>-static inline int pwc_next_fill_frame(struct pwc_device *pdev)</div><div class='add'>+static int pwc_next_fill_frame(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -489,23 +462,17 @@ static inline int pwc_next_fill_frame(struct pwc_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* Hmm. Take it from the full list */</div><div class='del'>-#if PWC_DEBUG</div><div class='ctx'> 		/* sanity check */</div><div class='ctx'> 		if (pdev-&gt;full_frames == NULL) {</div><div class='del'>-			Err("Neither empty or full frames available!\n");</div><div class='add'>+			PWC_ERROR("Neither empty or full frames available!\n");</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='ctx'> 		pdev-&gt;fill_frame = pdev-&gt;full_frames;</div><div class='ctx'> 		pdev-&gt;full_frames = pdev-&gt;full_frames-&gt;next;</div><div class='ctx'> 		ret = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	pdev-&gt;fill_frame-&gt;next = NULL;</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-	Trace(TRACE_SEQUENCE, "Assigning sequence number %d.\n", pdev-&gt;sequence);</div><div class='del'>-	pdev-&gt;fill_frame-&gt;sequence = pdev-&gt;sequence++;</div><div class='del'>-#endif</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -521,6 +488,8 @@ static void pwc_reset_buffers(struct pwc_device *pdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	PWC_DEBUG_MEMORY("&gt;&gt; %s __enter__\n", __FUNCTION__);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;pdev-&gt;ptrlock, flags);</div><div class='ctx'> 	pdev-&gt;full_frames = NULL;</div><div class='ctx'> 	pdev-&gt;full_frames_tail = NULL;</div><div class='hunk'>@@ -540,13 +509,15 @@ static void pwc_reset_buffers(struct pwc_device *pdev)</div><div class='ctx'> 	pdev-&gt;image_read_pos = 0;</div><div class='ctx'> 	pdev-&gt;fill_image = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='add'>+</div><div class='add'>+	PWC_DEBUG_MEMORY("&lt;&lt; %s __leaving__\n", __FUNCTION__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>   \brief Do all the handling for getting one frame: get pointer, decompress, advance pointers.</div><div class='ctx'>  */</div><div class='del'>-static int pwc_handle_frame(struct pwc_device *pdev)</div><div class='add'>+int pwc_handle_frame(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -556,41 +527,40 @@ static int pwc_handle_frame(struct pwc_device *pdev)</div><div class='ctx'> 	   we can release the lock after this without problems */</div><div class='ctx'> 	if (pdev-&gt;read_frame != NULL) {</div><div class='ctx'> 		/* This can't theoretically happen */</div><div class='del'>-		Err("Huh? Read frame still in use?\n");</div><div class='add'>+		PWC_ERROR("Huh? Read frame still in use?\n");</div><div class='add'>+		spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;full_frames == NULL) {</div><div class='add'>+		PWC_ERROR("Woops. No frames ready.\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='del'>-		if (pdev-&gt;full_frames == NULL) {</div><div class='del'>-			Err("Woops. No frames ready.\n");</div><div class='add'>+		pdev-&gt;read_frame = pdev-&gt;full_frames;</div><div class='add'>+		pdev-&gt;full_frames = pdev-&gt;full_frames-&gt;next;</div><div class='add'>+		pdev-&gt;read_frame-&gt;next = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;read_frame != NULL) {</div><div class='add'>+		/* Decompression is a lenghty process, so it's outside of the lock.</div><div class='add'>+		   This gives the isoc_handler the opportunity to fill more frames</div><div class='add'>+		   in the mean time.</div><div class='add'>+		*/</div><div class='add'>+		spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='add'>+		ret = pwc_decompress(pdev);</div><div class='add'>+		spin_lock_irqsave(&amp;pdev-&gt;ptrlock, flags);</div><div class='add'>+</div><div class='add'>+		/* We're done with read_buffer, tack it to the end of the empty buffer list */</div><div class='add'>+		if (pdev-&gt;empty_frames == NULL) {</div><div class='add'>+			pdev-&gt;empty_frames = pdev-&gt;read_frame;</div><div class='add'>+			pdev-&gt;empty_frames_tail = pdev-&gt;empty_frames;</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='del'>-			pdev-&gt;read_frame = pdev-&gt;full_frames;</div><div class='del'>-			pdev-&gt;full_frames = pdev-&gt;full_frames-&gt;next;</div><div class='del'>-			pdev-&gt;read_frame-&gt;next = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pdev-&gt;read_frame != NULL) {</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-			Trace(TRACE_SEQUENCE, "Decompressing frame %d\n", pdev-&gt;read_frame-&gt;sequence);</div><div class='del'>-#endif</div><div class='del'>-			/* Decompression is a lenghty process, so it's outside of the lock.</div><div class='del'>-			   This gives the isoc_handler the opportunity to fill more frames</div><div class='del'>-			   in the mean time.</div><div class='del'>-			*/</div><div class='del'>-			spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='del'>-			ret = pwc_decompress(pdev);</div><div class='del'>-			spin_lock_irqsave(&amp;pdev-&gt;ptrlock, flags);</div><div class='del'>-</div><div class='del'>-			/* We're done with read_buffer, tack it to the end of the empty buffer list */</div><div class='del'>-			if (pdev-&gt;empty_frames == NULL) {</div><div class='del'>-				pdev-&gt;empty_frames = pdev-&gt;read_frame;</div><div class='del'>-				pdev-&gt;empty_frames_tail = pdev-&gt;empty_frames;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				pdev-&gt;empty_frames_tail-&gt;next = pdev-&gt;read_frame;</div><div class='del'>-				pdev-&gt;empty_frames_tail = pdev-&gt;read_frame;</div><div class='del'>-			}</div><div class='del'>-			pdev-&gt;read_frame = NULL;</div><div class='add'>+			pdev-&gt;empty_frames_tail-&gt;next = pdev-&gt;read_frame;</div><div class='add'>+			pdev-&gt;empty_frames_tail = pdev-&gt;read_frame;</div><div class='ctx'> 		}</div><div class='add'>+		pdev-&gt;read_frame = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdev-&gt;ptrlock, flags);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -599,12 +569,114 @@ static int pwc_handle_frame(struct pwc_device *pdev)</div><div class='ctx'> /**</div><div class='ctx'>   \brief Advance pointers of image buffer (after each user request)</div><div class='ctx'> */</div><div class='del'>-static inline void pwc_next_image(struct pwc_device *pdev)</div><div class='add'>+void pwc_next_image(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	pdev-&gt;image_used[pdev-&gt;fill_image] = 0;</div><div class='del'>-	pdev-&gt;fill_image = (pdev-&gt;fill_image + 1) % default_mbufs;</div><div class='add'>+	pdev-&gt;fill_image = (pdev-&gt;fill_image + 1) % pwc_mbufs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * Print debug information when a frame is discarded because all of our buffer</div><div class='add'>+ * is full</div><div class='add'>+ */</div><div class='add'>+static void pwc_frame_dumped(struct pwc_device *pdev)</div><div class='add'>+{</div><div class='add'>+	pdev-&gt;vframes_dumped++;</div><div class='add'>+	if (pdev-&gt;vframe_count &lt; FRAME_LOWMARK)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;vframes_dumped &lt; 20)</div><div class='add'>+		PWC_DEBUG_FLOW("Dumping frame %d\n", pdev-&gt;vframe_count);</div><div class='add'>+	else if (pdev-&gt;vframes_dumped == 20)</div><div class='add'>+		PWC_DEBUG_FLOW("Dumping frame %d (last message)\n",</div><div class='add'>+				pdev-&gt;vframe_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pwc_rcv_short_packet(struct pwc_device *pdev, const struct pwc_frame_buf *fbuf)</div><div class='add'>+{</div><div class='add'>+	int awake = 0;</div><div class='add'>+</div><div class='add'>+	/* The ToUCam Fun CMOS sensor causes the firmware to send 2 or 3 bogus</div><div class='add'>+	   frames on the USB wire after an exposure change. This conditition is</div><div class='add'>+	   however detected  in the cam and a bit is set in the header.</div><div class='add'>+	   */</div><div class='add'>+	if (pdev-&gt;type == 730) {</div><div class='add'>+		unsigned char *ptr = (unsigned char *)fbuf-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (ptr[1] == 1 &amp;&amp; ptr[0] &amp; 0x10) {</div><div class='add'>+			PWC_TRACE("Hyundai CMOS sensor bug. Dropping frame.\n");</div><div class='add'>+			pdev-&gt;drop_frames += 2;</div><div class='add'>+			pdev-&gt;vframes_error++;</div><div class='add'>+		}</div><div class='add'>+		if ((ptr[0] ^ pdev-&gt;vmirror) &amp; 0x01) {</div><div class='add'>+			if (ptr[0] &amp; 0x01) {</div><div class='add'>+				pdev-&gt;snapshot_button_status = 1;</div><div class='add'>+				PWC_TRACE("Snapshot button pressed.\n");</div><div class='add'>+			}</div><div class='add'>+			else {</div><div class='add'>+				PWC_TRACE("Snapshot button released.\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ((ptr[0] ^ pdev-&gt;vmirror) &amp; 0x02) {</div><div class='add'>+			if (ptr[0] &amp; 0x02)</div><div class='add'>+				PWC_TRACE("Image is mirrored.\n");</div><div class='add'>+			else</div><div class='add'>+				PWC_TRACE("Image is normal.\n");</div><div class='add'>+		}</div><div class='add'>+		pdev-&gt;vmirror = ptr[0] &amp; 0x03;</div><div class='add'>+		/* Sometimes the trailer of the 730 is still sent as a 4 byte packet</div><div class='add'>+		   after a short frame; this condition is filtered out specifically. A 4 byte</div><div class='add'>+		   frame doesn't make sense anyway.</div><div class='add'>+		   So we get either this sequence:</div><div class='add'>+		   drop_bit set -&gt; 4 byte frame -&gt; short frame -&gt; good frame</div><div class='add'>+		   Or this one:</div><div class='add'>+		   drop_bit set -&gt; short frame -&gt; good frame</div><div class='add'>+		   So we drop either 3 or 2 frames in all!</div><div class='add'>+		   */</div><div class='add'>+		if (fbuf-&gt;filled == 4)</div><div class='add'>+			pdev-&gt;drop_frames++;</div><div class='add'>+	}</div><div class='add'>+	else if (pdev-&gt;type == 740 || pdev-&gt;type == 720) {</div><div class='add'>+		unsigned char *ptr = (unsigned char *)fbuf-&gt;data;</div><div class='add'>+		if ((ptr[0] ^ pdev-&gt;vmirror) &amp; 0x01) {</div><div class='add'>+			if (ptr[0] &amp; 0x01) {</div><div class='add'>+				pdev-&gt;snapshot_button_status = 1;</div><div class='add'>+				PWC_TRACE("Snapshot button pressed.\n");</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+				PWC_TRACE("Snapshot button released.\n");</div><div class='add'>+		}</div><div class='add'>+		pdev-&gt;vmirror = ptr[0] &amp; 0x03;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case we were instructed to drop the frame, do so silently.</div><div class='add'>+	   The buffer pointers are not updated either (but the counters are reset below).</div><div class='add'>+	   */</div><div class='add'>+	if (pdev-&gt;drop_frames &gt; 0)</div><div class='add'>+		pdev-&gt;drop_frames--;</div><div class='add'>+	else {</div><div class='add'>+		/* Check for underflow first */</div><div class='add'>+		if (fbuf-&gt;filled &lt; pdev-&gt;frame_total_size) {</div><div class='add'>+			PWC_DEBUG_FLOW("Frame buffer underflow (%d bytes);"</div><div class='add'>+				       " discarded.\n", fbuf-&gt;filled);</div><div class='add'>+			pdev-&gt;vframes_error++;</div><div class='add'>+		}</div><div class='add'>+		else {</div><div class='add'>+			/* Send only once per EOF */</div><div class='add'>+			awake = 1; /* delay wake_ups */</div><div class='add'>+</div><div class='add'>+			/* Find our next frame to fill. This will always succeed, since we</div><div class='add'>+			 * nick a frame from either empty or full list, but if we had to</div><div class='add'>+			 * take it from the full list, it means a frame got dropped.</div><div class='add'>+			 */</div><div class='add'>+			if (pwc_next_fill_frame(pdev))</div><div class='add'>+				pwc_frame_dumped(pdev);</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+	} /* !drop_frames */</div><div class='add'>+	pdev-&gt;vframe_count++;</div><div class='add'>+	return awake;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* This gets called for the Isochronous pipe (video). This is done in</div><div class='ctx'>  * interrupt time, so it has to be fast, not crash, and not stall. Neat.</div><div class='hunk'>@@ -620,17 +692,12 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	awake = 0;</div><div class='ctx'> 	pdev = (struct pwc_device *)urb-&gt;context;</div><div class='ctx'> 	if (pdev == NULL) {</div><div class='del'>-		Err("isoc_handler() called with NULL device?!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#ifdef PWC_MAGIC</div><div class='del'>-	if (pdev-&gt;magic != PWC_MAGIC) {</div><div class='del'>-		Err("isoc_handler() called with bad magic!\n");</div><div class='add'>+		PWC_ERROR("isoc_handler() called with NULL device?!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	if (urb-&gt;status == -ENOENT || urb-&gt;status == -ECONNRESET) {</div><div class='del'>-		Trace(TRACE_OPEN, "pwc_isoc_handler(): URB (%p) unlinked %ssynchronuously.\n", urb, urb-&gt;status == -ENOENT ? "" : "a");</div><div class='add'>+		PWC_DEBUG_OPEN("URB (%p) unlinked %ssynchronuously.\n", urb, urb-&gt;status == -ENOENT ? "" : "a");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (urb-&gt;status != -EINPROGRESS &amp;&amp; urb-&gt;status != 0) {</div><div class='hunk'>@@ -645,13 +712,13 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 			case -EILSEQ:		errmsg = "CRC/Timeout (could be anything)"; break;</div><div class='ctx'> 			case -ETIMEDOUT:	errmsg = "NAK (device does not respond)"; break;</div><div class='ctx'> 		}</div><div class='del'>-		Trace(TRACE_FLOW, "pwc_isoc_handler() called with status %d [%s].\n", urb-&gt;status, errmsg);</div><div class='add'>+		PWC_DEBUG_FLOW("pwc_isoc_handler() called with status %d [%s].\n", urb-&gt;status, errmsg);</div><div class='ctx'> 		/* Give up after a number of contiguous errors on the USB bus.</div><div class='ctx'> 		   Appearantly something is wrong so we simulate an unplug event.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (++pdev-&gt;visoc_errors &gt; MAX_ISOC_ERRORS)</div><div class='ctx'> 		{</div><div class='del'>-			Info("Too many ISOC errors, bailing out.\n");</div><div class='add'>+			PWC_INFO("Too many ISOC errors, bailing out.\n");</div><div class='ctx'> 			pdev-&gt;error_status = EIO;</div><div class='ctx'> 			awake = 1;</div><div class='ctx'> 			wake_up_interruptible(&amp;pdev-&gt;frameq);</div><div class='hunk'>@@ -661,7 +728,7 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	fbuf = pdev-&gt;fill_frame;</div><div class='ctx'> 	if (fbuf == NULL) {</div><div class='del'>-		Err("pwc_isoc_handler without valid fill frame.\n");</div><div class='add'>+		PWC_ERROR("pwc_isoc_handler without valid fill frame.\n");</div><div class='ctx'> 		awake = 1;</div><div class='ctx'> 		goto handler_end;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -688,7 +755,7 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 					/* ...copy data to frame buffer, if possible */</div><div class='ctx'> 					if (flen + fbuf-&gt;filled &gt; pdev-&gt;frame_total_size) {</div><div class='del'>-						Trace(TRACE_FLOW, "Frame buffer overflow (flen = %d, frame_total_size = %d).\n", flen, pdev-&gt;frame_total_size);</div><div class='add'>+						PWC_DEBUG_FLOW("Frame buffer overflow (flen = %d, frame_total_size = %d).\n", flen, pdev-&gt;frame_total_size);</div><div class='ctx'> 						pdev-&gt;vsync = 0; /* Hmm, let's wait for an EOF (end-of-frame) */</div><div class='ctx'> 						pdev-&gt;vframes_error++;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -704,96 +771,28 @@ static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 				/* Shorter packet... We probably have the end of an image-frame;</div><div class='ctx'> 				   wake up read() process and let select()/poll() do something.</div><div class='ctx'> 				   Decompression is done in user time over there.</div><div class='del'>-				 */</div><div class='add'>+				   */</div><div class='ctx'> 				if (pdev-&gt;vsync == 2) {</div><div class='del'>-					/* The ToUCam Fun CMOS sensor causes the firmware to send 2 or 3 bogus</div><div class='del'>-					   frames on the USB wire after an exposure change. This conditition is</div><div class='del'>-					   however detected  in the cam and a bit is set in the header.</div><div class='del'>-					 */</div><div class='del'>-					if (pdev-&gt;type == 730) {</div><div class='del'>-						unsigned char *ptr = (unsigned char *)fbuf-&gt;data;</div><div class='del'>-</div><div class='del'>-						if (ptr[1] == 1 &amp;&amp; ptr[0] &amp; 0x10) {</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-							Debug("Hyundai CMOS sensor bug. Dropping frame %d.\n", fbuf-&gt;sequence);</div><div class='del'>-#endif</div><div class='del'>-							pdev-&gt;drop_frames += 2;</div><div class='del'>-							pdev-&gt;vframes_error++;</div><div class='del'>-						}</div><div class='del'>-						if ((ptr[0] ^ pdev-&gt;vmirror) &amp; 0x01) {</div><div class='del'>-							if (ptr[0] &amp; 0x01)</div><div class='del'>-								Info("Snapshot button pressed.\n");</div><div class='del'>-							else</div><div class='del'>-								Info("Snapshot button released.\n");</div><div class='del'>-						}</div><div class='del'>-						if ((ptr[0] ^ pdev-&gt;vmirror) &amp; 0x02) {</div><div class='del'>-							if (ptr[0] &amp; 0x02)</div><div class='del'>-								Info("Image is mirrored.\n");</div><div class='del'>-							else</div><div class='del'>-								Info("Image is normal.\n");</div><div class='del'>-						}</div><div class='del'>-						pdev-&gt;vmirror = ptr[0] &amp; 0x03;</div><div class='del'>-						/* Sometimes the trailer of the 730 is still sent as a 4 byte packet</div><div class='del'>-						   after a short frame; this condition is filtered out specifically. A 4 byte</div><div class='del'>-						   frame doesn't make sense anyway.</div><div class='del'>-						   So we get either this sequence:</div><div class='del'>-							drop_bit set -&gt; 4 byte frame -&gt; short frame -&gt; good frame</div><div class='del'>-						   Or this one:</div><div class='del'>-							drop_bit set -&gt; short frame -&gt; good frame</div><div class='del'>-						   So we drop either 3 or 2 frames in all!</div><div class='del'>-						 */</div><div class='del'>-						if (fbuf-&gt;filled == 4)</div><div class='del'>-							pdev-&gt;drop_frames++;</div><div class='add'>+					if (pwc_rcv_short_packet(pdev, fbuf)) {</div><div class='add'>+						awake = 1;</div><div class='add'>+						fbuf = pdev-&gt;fill_frame;</div><div class='ctx'> 					}</div><div class='del'>-</div><div class='del'>-					/* In case we were instructed to drop the frame, do so silently.</div><div class='del'>-					   The buffer pointers are not updated either (but the counters are reset below).</div><div class='del'>-					 */</div><div class='del'>-					if (pdev-&gt;drop_frames &gt; 0)</div><div class='del'>-						pdev-&gt;drop_frames--;</div><div class='del'>-					else {</div><div class='del'>-						/* Check for underflow first */</div><div class='del'>-						if (fbuf-&gt;filled &lt; pdev-&gt;frame_total_size) {</div><div class='del'>-							Trace(TRACE_FLOW, "Frame buffer underflow (%d bytes); discarded.\n", fbuf-&gt;filled);</div><div class='del'>-							pdev-&gt;vframes_error++;</div><div class='del'>-						}</div><div class='del'>-						else {</div><div class='del'>-							/* Send only once per EOF */</div><div class='del'>-							awake = 1; /* delay wake_ups */</div><div class='del'>-</div><div class='del'>-							/* Find our next frame to fill. This will always succeed, since we</div><div class='del'>-							 * nick a frame from either empty or full list, but if we had to</div><div class='del'>-							 * take it from the full list, it means a frame got dropped.</div><div class='del'>-							 */</div><div class='del'>-							if (pwc_next_fill_frame(pdev)) {</div><div class='del'>-								pdev-&gt;vframes_dumped++;</div><div class='del'>-								if ((pdev-&gt;vframe_count &gt; FRAME_LOWMARK) &amp;&amp; (pwc_trace &amp; TRACE_FLOW)) {</div><div class='del'>-									if (pdev-&gt;vframes_dumped &lt; 20)</div><div class='del'>-										Trace(TRACE_FLOW, "Dumping frame %d.\n", pdev-&gt;vframe_count);</div><div class='del'>-									if (pdev-&gt;vframes_dumped == 20)</div><div class='del'>-										Trace(TRACE_FLOW, "Dumping frame %d (last message).\n", pdev-&gt;vframe_count);</div><div class='del'>-								}</div><div class='del'>-							}</div><div class='del'>-							fbuf = pdev-&gt;fill_frame;</div><div class='del'>-						}</div><div class='del'>-					} /* !drop_frames */</div><div class='del'>-					pdev-&gt;vframe_count++;</div><div class='ctx'> 				}</div><div class='ctx'> 				fbuf-&gt;filled = 0;</div><div class='ctx'> 				fillptr = fbuf-&gt;data;</div><div class='ctx'> 				pdev-&gt;vsync = 1;</div><div class='del'>-			} /* .. flen &lt; last_packet_size */</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			pdev-&gt;vlast_packet_size = flen;</div><div class='ctx'> 		} /* ..status == 0 */</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-		/* This is normally not interesting to the user, unless you are really debugging something */</div><div class='ctx'> 		else {</div><div class='add'>+			/* This is normally not interesting to the user, unless</div><div class='add'>+			 * you are really debugging something */</div><div class='ctx'> 			static int iso_error = 0;</div><div class='ctx'> 			iso_error++;</div><div class='ctx'> 			if (iso_error &lt; 20)</div><div class='del'>-				Trace(TRACE_FLOW, "Iso frame %d of USB has error %d\n", i, fst);</div><div class='add'>+				PWC_DEBUG_FLOW("Iso frame %d of USB has error %d\n", i, fst);</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> handler_end:</div><div class='hunk'>@@ -803,11 +802,11 @@ handler_end:</div><div class='ctx'> 	urb-&gt;dev = pdev-&gt;udev;</div><div class='ctx'> 	i = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (i != 0)</div><div class='del'>-		Err("Error (%d) re-submitting urb in pwc_isoc_handler.\n", i);</div><div class='add'>+		PWC_ERROR("Error (%d) re-submitting urb in pwc_isoc_handler.\n", i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='add'>+int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct urb *urb;</div><div class='hunk'>@@ -826,7 +825,6 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	/* Get the current alternate interface, adjust packet size */</div><div class='ctx'> 	if (!udev-&gt;actconfig)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	intf = usb_ifnum_to_if(udev, 0);</div><div class='ctx'> 	if (intf)</div><div class='ctx'> 		idesc = usb_altnum_to_altsetting(intf, pdev-&gt;valternate);</div><div class='hunk'>@@ -836,20 +834,21 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Search video endpoint */</div><div class='ctx'> 	pdev-&gt;vmax_packet_size = -1;</div><div class='del'>-	for (i = 0; i &lt; idesc-&gt;desc.bNumEndpoints; i++)</div><div class='add'>+	for (i = 0; i &lt; idesc-&gt;desc.bNumEndpoints; i++) {</div><div class='ctx'> 		if ((idesc-&gt;endpoint[i].desc.bEndpointAddress &amp; 0xF) == pdev-&gt;vendpoint) {</div><div class='ctx'> 			pdev-&gt;vmax_packet_size = le16_to_cpu(idesc-&gt;endpoint[i].desc.wMaxPacketSize);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;vmax_packet_size &lt; 0 || pdev-&gt;vmax_packet_size &gt; ISO_MAX_FRAME_SIZE) {</div><div class='del'>-		Err("Failed to find packet size for video endpoint in current alternate setting.\n");</div><div class='add'>+		PWC_ERROR("Failed to find packet size for video endpoint in current alternate setting.\n");</div><div class='ctx'> 		return -ENFILE; /* Odd error, that should be noticeable */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set alternate interface */</div><div class='ctx'> 	ret = 0;</div><div class='del'>-	Trace(TRACE_OPEN, "Setting alternate interface %d\n", pdev-&gt;valternate);</div><div class='add'>+	PWC_DEBUG_OPEN("Setting alternate interface %d\n", pdev-&gt;valternate);</div><div class='ctx'> 	ret = usb_set_interface(pdev-&gt;udev, 0, pdev-&gt;valternate);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -857,12 +856,12 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_ISO_BUFS; i++) {</div><div class='ctx'> 		urb = usb_alloc_urb(ISO_FRAMES_PER_DESC, GFP_KERNEL);</div><div class='ctx'> 		if (urb == NULL) {</div><div class='del'>-			Err("Failed to allocate urb %d\n", i);</div><div class='add'>+			PWC_ERROR("Failed to allocate urb %d\n", i);</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		pdev-&gt;sbuf[i].urb = urb;</div><div class='del'>-		Trace(TRACE_MEMORY, "Allocated URB at 0x%p\n", urb);</div><div class='add'>+		PWC_DEBUG_MEMORY("Allocated URB at 0x%p\n", urb);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* De-allocate in reverse order */</div><div class='hunk'>@@ -899,24 +898,26 @@ static int pwc_isoc_init(struct pwc_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_ISO_BUFS; i++) {</div><div class='ctx'> 		ret = usb_submit_urb(pdev-&gt;sbuf[i].urb, GFP_KERNEL);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			Err("isoc_init() submit_urb %d failed with error %d\n", i, ret);</div><div class='add'>+			PWC_ERROR("isoc_init() submit_urb %d failed with error %d\n", i, ret);</div><div class='ctx'> 		else</div><div class='del'>-			Trace(TRACE_MEMORY, "URB 0x%p submitted.\n", pdev-&gt;sbuf[i].urb);</div><div class='add'>+			PWC_DEBUG_MEMORY("URB 0x%p submitted.\n", pdev-&gt;sbuf[i].urb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* All is done... */</div><div class='ctx'> 	pdev-&gt;iso_init = 1;</div><div class='del'>-	Trace(TRACE_OPEN, "&lt;&lt; pwc_isoc_init()\n");</div><div class='add'>+	PWC_DEBUG_OPEN("&lt;&lt; pwc_isoc_init()\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pwc_isoc_cleanup(struct pwc_device *pdev)</div><div class='add'>+void pwc_isoc_cleanup(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_OPEN, "&gt;&gt; pwc_isoc_cleanup()\n");</div><div class='add'>+	PWC_DEBUG_OPEN("&gt;&gt; pwc_isoc_cleanup()\n");</div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return;</div><div class='add'>+	if (pdev-&gt;iso_init == 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Unlinking ISOC buffers one by one */</div><div class='ctx'> 	for (i = 0; i &lt; MAX_ISO_BUFS; i++) {</div><div class='hunk'>@@ -925,10 +926,10 @@ static void pwc_isoc_cleanup(struct pwc_device *pdev)</div><div class='ctx'> 		urb = pdev-&gt;sbuf[i].urb;</div><div class='ctx'> 		if (urb != 0) {</div><div class='ctx'> 			if (pdev-&gt;iso_init) {</div><div class='del'>-				Trace(TRACE_MEMORY, "Unlinking URB %p\n", urb);</div><div class='add'>+				PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb);</div><div class='ctx'> 				usb_kill_urb(urb);</div><div class='ctx'> 			}</div><div class='del'>-			Trace(TRACE_MEMORY, "Freeing URB\n");</div><div class='add'>+			PWC_DEBUG_MEMORY("Freeing URB\n");</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='ctx'> 			pdev-&gt;sbuf[i].urb = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -938,12 +939,12 @@ static void pwc_isoc_cleanup(struct pwc_device *pdev)</div><div class='ctx'> 	   is signalled by EPIPE)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pdev-&gt;error_status &amp;&amp; pdev-&gt;error_status != EPIPE) {</div><div class='del'>-		Trace(TRACE_OPEN, "Setting alternate interface 0.\n");</div><div class='add'>+		PWC_DEBUG_OPEN("Setting alternate interface 0.\n");</div><div class='ctx'> 		usb_set_interface(pdev-&gt;udev, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;iso_init = 0;</div><div class='del'>-	Trace(TRACE_OPEN, "&lt;&lt; pwc_isoc_cleanup()\n");</div><div class='add'>+	PWC_DEBUG_OPEN("&lt;&lt; pwc_isoc_cleanup()\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_fps, int new_compression, int new_snapshot)</div><div class='hunk'>@@ -957,18 +958,18 @@ int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_f</div><div class='ctx'> 	/* Try to set video mode... */</div><div class='ctx'> 	start = ret = pwc_set_video_mode(pdev, width, height, new_fps, new_compression, new_snapshot);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		Trace(TRACE_FLOW, "pwc_set_video_mode attempt 1 failed.\n");</div><div class='add'>+		PWC_DEBUG_FLOW("pwc_set_video_mode attempt 1 failed.\n");</div><div class='ctx'> 		/* That failed... restore old mode (we know that worked) */</div><div class='ctx'> 		start = pwc_set_video_mode(pdev, pdev-&gt;view.x, pdev-&gt;view.y, pdev-&gt;vframes, pdev-&gt;vcompression, pdev-&gt;vsnapshot);</div><div class='ctx'> 		if (start) {</div><div class='del'>-			Trace(TRACE_FLOW, "pwc_set_video_mode attempt 2 failed.\n");</div><div class='add'>+			PWC_DEBUG_FLOW("pwc_set_video_mode attempt 2 failed.\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (start == 0)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (pwc_isoc_init(pdev) &lt; 0)</div><div class='ctx'> 		{</div><div class='del'>-			Info("Failed to restart ISOC transfers in pwc_try_video_mode.\n");</div><div class='add'>+			PWC_WARNING("Failed to restart ISOC transfers in pwc_try_video_mode.\n");</div><div class='ctx'> 			ret = -EAGAIN; /* let's try again, who knows if it works a second time */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -976,54 +977,129 @@ int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_f</div><div class='ctx'> 	return ret; /* Return original error code */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*********</div><div class='add'>+ * sysfs</div><div class='add'>+ *********/</div><div class='add'>+static struct pwc_device *cd_to_pwc(struct class_device *cd)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vdev = to_video_device(cd);</div><div class='add'>+	return video_get_drvdata(vdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_pan_tilt(struct class_device *class_dev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev = cd_to_pwc(class_dev);</div><div class='add'>+	return sprintf(buf, "%d %d\n", pdev-&gt;pan_angle, pdev-&gt;tilt_angle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t store_pan_tilt(struct class_device *class_dev, const char *buf,</div><div class='add'>+			 size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev = cd_to_pwc(class_dev);</div><div class='add'>+	int pan, tilt;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (strncmp(buf, "reset", 5) == 0)</div><div class='add'>+		ret = pwc_mpt_reset(pdev, 0x3);</div><div class='add'>+</div><div class='add'>+	else if (sscanf(buf, "%d %d", &amp;pan, &amp;tilt) &gt; 0)</div><div class='add'>+		ret = pwc_mpt_set_angle(pdev, pan, tilt);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return strlen(buf);</div><div class='add'>+}</div><div class='add'>+static CLASS_DEVICE_ATTR(pan_tilt, S_IRUGO | S_IWUSR, show_pan_tilt,</div><div class='add'>+			 store_pan_tilt);</div><div class='add'>+</div><div class='add'>+static ssize_t show_snapshot_button_status(struct class_device *class_dev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev = cd_to_pwc(class_dev);</div><div class='add'>+	int status = pdev-&gt;snapshot_button_status;</div><div class='add'>+	pdev-&gt;snapshot_button_status = 0;</div><div class='add'>+	return sprintf(buf, "%d\n", status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static CLASS_DEVICE_ATTR(button, S_IRUGO | S_IWUSR, show_snapshot_button_status,</div><div class='add'>+			 NULL);</div><div class='add'>+</div><div class='add'>+static void pwc_create_sysfs_files(struct video_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev = video_get_drvdata(vdev);</div><div class='add'>+	if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='add'>+		video_device_create_file(vdev, &amp;class_device_attr_pan_tilt);</div><div class='add'>+	video_device_create_file(vdev, &amp;class_device_attr_button);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pwc_remove_sysfs_files(struct video_device *vdev)</div><div class='add'>+{</div><div class='add'>+	struct pwc_device *pdev = video_get_drvdata(vdev);</div><div class='add'>+	if (pdev-&gt;features &amp; FEATURE_MOTOR_PANTILT)</div><div class='add'>+		video_device_remove_file(vdev, &amp;class_device_attr_pan_tilt);</div><div class='add'>+	video_device_remove_file(vdev, &amp;class_device_attr_button);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='add'>+static const char *pwc_sensor_type_to_string(unsigned int sensor_type)</div><div class='add'>+{</div><div class='add'>+	switch(sensor_type) {</div><div class='add'>+		case 0x00:</div><div class='add'>+			return "Hyundai CMOS sensor";</div><div class='add'>+		case 0x20:</div><div class='add'>+			return "Sony CCD sensor + TDA8787";</div><div class='add'>+		case 0x2E:</div><div class='add'>+			return "Sony CCD sensor + Exas 98L59";</div><div class='add'>+		case 0x2F:</div><div class='add'>+			return "Sony CCD sensor + ADI 9804";</div><div class='add'>+		case 0x30:</div><div class='add'>+			return "Sharp CCD sensor + TDA8787";</div><div class='add'>+		case 0x3E:</div><div class='add'>+			return "Sharp CCD sensor + Exas 98L59";</div><div class='add'>+		case 0x3F:</div><div class='add'>+			return "Sharp CCD sensor + ADI 9804";</div><div class='add'>+		case 0x40:</div><div class='add'>+			return "UPA 1021 sensor";</div><div class='add'>+		case 0x100:</div><div class='add'>+			return "VGA sensor";</div><div class='add'>+		case 0x101:</div><div class='add'>+			return "PAL MR sensor";</div><div class='add'>+		default:</div><div class='add'>+			return "unknown type of sensor";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************/</div><div class='ctx'> /* Video4Linux functions */</div><div class='ctx'> </div><div class='ctx'> static int pwc_video_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, ret;</div><div class='ctx'> 	struct video_device *vdev = video_devdata(file);</div><div class='ctx'> 	struct pwc_device *pdev;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_OPEN, "&gt;&gt; video_open called(vdev = 0x%p).\n", vdev);</div><div class='add'>+	PWC_DEBUG_OPEN("&gt;&gt; video_open called(vdev = 0x%p).\n", vdev);</div><div class='ctx'> </div><div class='ctx'> 	pdev = (struct pwc_device *)vdev-&gt;priv;</div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		BUG();</div><div class='del'>-	if (pdev-&gt;vopen)</div><div class='add'>+	if (pdev-&gt;vopen) {</div><div class='add'>+		PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;pdev-&gt;modlock);</div><div class='ctx'> 	if (!pdev-&gt;usb_init) {</div><div class='del'>-		Trace(TRACE_OPEN, "Doing first time initialization.\n");</div><div class='add'>+		PWC_DEBUG_OPEN("Doing first time initialization.\n");</div><div class='ctx'> 		pdev-&gt;usb_init = 1;</div><div class='ctx'> </div><div class='del'>-		if (pwc_trace &amp; TRACE_OPEN)</div><div class='add'>+		/* Query sensor type */</div><div class='add'>+		ret = pwc_get_cmos_sensor(pdev, &amp;i);</div><div class='add'>+		if (ret &gt;= 0)</div><div class='ctx'> 		{</div><div class='del'>-			/* Query sensor type */</div><div class='del'>-			const char *sensor_type = NULL;</div><div class='del'>-			int ret;</div><div class='del'>-</div><div class='del'>-			ret = pwc_get_cmos_sensor(pdev, &amp;i);</div><div class='del'>-			if (ret &gt;= 0)</div><div class='del'>-			{</div><div class='del'>-				switch(i) {</div><div class='del'>-				case 0x00:  sensor_type = "Hyundai CMOS sensor"; break;</div><div class='del'>-				case 0x20:  sensor_type = "Sony CCD sensor + TDA8787"; break;</div><div class='del'>-				case 0x2E:  sensor_type = "Sony CCD sensor + Exas 98L59"; break;</div><div class='del'>-				case 0x2F:  sensor_type = "Sony CCD sensor + ADI 9804"; break;</div><div class='del'>-				case 0x30:  sensor_type = "Sharp CCD sensor + TDA8787"; break;</div><div class='del'>-				case 0x3E:  sensor_type = "Sharp CCD sensor + Exas 98L59"; break;</div><div class='del'>-				case 0x3F:  sensor_type = "Sharp CCD sensor + ADI 9804"; break;</div><div class='del'>-				case 0x40:  sensor_type = "UPA 1021 sensor"; break;</div><div class='del'>-				case 0x100: sensor_type = "VGA sensor"; break;</div><div class='del'>-				case 0x101: sensor_type = "PAL MR sensor"; break;</div><div class='del'>-				default:    sensor_type = "unknown type of sensor"; break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (sensor_type != NULL)</div><div class='del'>-				Info("This %s camera is equipped with a %s (%d).\n", pdev-&gt;vdev-&gt;name, sensor_type, i);</div><div class='add'>+			PWC_DEBUG_OPEN("This %s camera is equipped with a %s (%d).\n",</div><div class='add'>+					pdev-&gt;vdev-&gt;name,</div><div class='add'>+					pwc_sensor_type_to_string(i), i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1031,34 +1107,32 @@ static int pwc_video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (power_save) {</div><div class='ctx'> 		i = pwc_camera_power(pdev, 1);</div><div class='ctx'> 		if (i &lt; 0)</div><div class='del'>-			Info("Failed to restore power to the camera! (%d)\n", i);</div><div class='add'>+			PWC_DEBUG_OPEN("Failed to restore power to the camera! (%d)\n", i);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Set LED on/off time */</div><div class='ctx'> 	if (pwc_set_leds(pdev, led_on, led_off) &lt; 0)</div><div class='del'>-		Info("Failed to set LED on/off time.\n");</div><div class='add'>+		PWC_DEBUG_OPEN("Failed to set LED on/off time.\n");</div><div class='ctx'> </div><div class='ctx'> 	pwc_construct(pdev); /* set min/max sizes correct */</div><div class='ctx'> </div><div class='ctx'> 	/* So far, so good. Allocate memory. */</div><div class='ctx'> 	i = pwc_allocate_buffers(pdev);</div><div class='ctx'> 	if (i &lt; 0) {</div><div class='del'>-		Trace(TRACE_OPEN, "Failed to allocate buffer memory.\n");</div><div class='add'>+		PWC_DEBUG_OPEN("Failed to allocate buffers memory.\n");</div><div class='add'>+		pwc_free_buffers(pdev);</div><div class='ctx'> 		up(&amp;pdev-&gt;modlock);</div><div class='ctx'> 		return i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset buffers &amp; parameters */</div><div class='ctx'> 	pwc_reset_buffers(pdev);</div><div class='del'>-	for (i = 0; i &lt; default_mbufs; i++)</div><div class='add'>+	for (i = 0; i &lt; pwc_mbufs; i++)</div><div class='ctx'> 		pdev-&gt;image_used[i] = 0;</div><div class='ctx'> 	pdev-&gt;vframe_count = 0;</div><div class='ctx'> 	pdev-&gt;vframes_dumped = 0;</div><div class='ctx'> 	pdev-&gt;vframes_error = 0;</div><div class='ctx'> 	pdev-&gt;visoc_errors = 0;</div><div class='ctx'> 	pdev-&gt;error_status = 0;</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-	pdev-&gt;sequence = 0;</div><div class='del'>-#endif</div><div class='ctx'> 	pwc_construct(pdev); /* set min/max sizes correct */</div><div class='ctx'> </div><div class='ctx'> 	/* Set some defaults */</div><div class='hunk'>@@ -1070,29 +1144,44 @@ static int pwc_video_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	 */</div><div class='ctx'> 	i = pwc_set_video_mode(pdev, pwc_image_sizes[pdev-&gt;vsize].x, pwc_image_sizes[pdev-&gt;vsize].y, pdev-&gt;vframes, pdev-&gt;vcompression, 0);</div><div class='ctx'> 	if (i)	{</div><div class='del'>-		Trace(TRACE_OPEN, "First attempt at set_video_mode failed.\n");</div><div class='del'>-		if (pdev-&gt;type == 730 || pdev-&gt;type == 740 || pdev-&gt;type == 750)</div><div class='del'>-			i = pwc_set_video_mode(pdev, pwc_image_sizes[PSZ_QSIF].x, pwc_image_sizes[PSZ_QSIF].y, 10, pdev-&gt;vcompression, 0);</div><div class='add'>+		unsigned int default_resolution;</div><div class='add'>+		PWC_DEBUG_OPEN("First attempt at set_video_mode failed.\n");</div><div class='add'>+		if (pdev-&gt;type&gt;= 730)</div><div class='add'>+			default_resolution = PSZ_QSIF;</div><div class='ctx'> 		else</div><div class='del'>-			i = pwc_set_video_mode(pdev, pwc_image_sizes[PSZ_QCIF].x, pwc_image_sizes[PSZ_QCIF].y, 10, pdev-&gt;vcompression, 0);</div><div class='add'>+			default_resolution = PSZ_QCIF;</div><div class='add'>+</div><div class='add'>+		i = pwc_set_video_mode(pdev,</div><div class='add'>+				       pwc_image_sizes[default_resolution].x,</div><div class='add'>+				       pwc_image_sizes[default_resolution].y,</div><div class='add'>+				       10,</div><div class='add'>+				       pdev-&gt;vcompression,</div><div class='add'>+				       0);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i) {</div><div class='del'>-		Trace(TRACE_OPEN, "Second attempt at set_video_mode failed.\n");</div><div class='add'>+		PWC_DEBUG_OPEN("Second attempt at set_video_mode failed.\n");</div><div class='add'>+		pwc_free_buffers(pdev);</div><div class='ctx'> 		up(&amp;pdev-&gt;modlock);</div><div class='ctx'> 		return i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pwc_isoc_init(pdev);</div><div class='ctx'> 	if (i) {</div><div class='del'>-		Trace(TRACE_OPEN, "Failed to init ISOC stuff = %d.\n", i);</div><div class='add'>+		PWC_DEBUG_OPEN("Failed to init ISOC stuff = %d.\n", i);</div><div class='add'>+		pwc_isoc_cleanup(pdev);</div><div class='add'>+		pwc_free_buffers(pdev);</div><div class='ctx'> 		up(&amp;pdev-&gt;modlock);</div><div class='ctx'> 		return i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Initialize the webcam to sane value */</div><div class='add'>+	pwc_set_brightness(pdev, 0x7fff);</div><div class='add'>+	pwc_set_agc(pdev, 1, 0);</div><div class='add'>+</div><div class='ctx'> 	pdev-&gt;vopen++;</div><div class='ctx'> 	file-&gt;private_data = vdev;</div><div class='ctx'> 	up(&amp;pdev-&gt;modlock);</div><div class='del'>-	Trace(TRACE_OPEN, "&lt;&lt; video_open() returns 0.\n");</div><div class='add'>+	PWC_DEBUG_OPEN("&lt;&lt; video_open() returns 0.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1103,35 +1192,23 @@ static int pwc_video_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct pwc_device *pdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_OPEN, "&gt;&gt; video_close called(vdev = 0x%p).\n", vdev);</div><div class='add'>+	PWC_DEBUG_OPEN("&gt;&gt; video_close called(vdev = 0x%p).\n", vdev);</div><div class='ctx'> </div><div class='ctx'> 	pdev = (struct pwc_device *)vdev-&gt;priv;</div><div class='ctx'> 	if (pdev-&gt;vopen == 0)</div><div class='del'>-		Info("video_close() called on closed device?\n");</div><div class='add'>+		PWC_DEBUG_MODULE("video_close() called on closed device?\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Dump statistics, but only if a reasonable amount of frames were</div><div class='ctx'> 	   processed (to prevent endless log-entries in case of snap-shot</div><div class='ctx'> 	   programs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pdev-&gt;vframe_count &gt; 20)</div><div class='del'>-		Info("Closing video device: %d frames received, dumped %d frames, %d frames with errors.\n", pdev-&gt;vframe_count, pdev-&gt;vframes_dumped, pdev-&gt;vframes_error);</div><div class='add'>+		PWC_DEBUG_MODULE("Closing video device: %d frames received, dumped %d frames, %d frames with errors.\n", pdev-&gt;vframe_count, pdev-&gt;vframes_dumped, pdev-&gt;vframes_error);</div><div class='ctx'> </div><div class='del'>-	switch (pdev-&gt;type)</div><div class='del'>-	 {</div><div class='del'>-	  case 675:</div><div class='del'>-	  case 680:</div><div class='del'>-	  case 690:</div><div class='del'>-	  case 720:</div><div class='del'>-	  case 730:</div><div class='del'>-	  case 740:</div><div class='del'>-	  case 750:</div><div class='del'>-/*	    pwc_dec23_exit();	*//* Timon &amp; Kiara */</div><div class='del'>-	    break;</div><div class='del'>-	  case 645:</div><div class='del'>-	  case 646:</div><div class='del'>-/*	    pwc_dec1_exit(); */</div><div class='del'>-	    break;</div><div class='del'>-	 }</div><div class='add'>+	if (DEVICE_USE_CODEC1(pdev-&gt;type))</div><div class='add'>+	    pwc_dec1_exit();</div><div class='add'>+	else</div><div class='add'>+	    pwc_dec23_exit();</div><div class='ctx'> </div><div class='ctx'> 	pwc_isoc_cleanup(pdev);</div><div class='ctx'> 	pwc_free_buffers(pdev);</div><div class='hunk'>@@ -1140,15 +1217,15 @@ static int pwc_video_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (pdev-&gt;error_status != EPIPE) {</div><div class='ctx'> 		/* Turn LEDs off */</div><div class='ctx'> 		if (pwc_set_leds(pdev, 0, 0) &lt; 0)</div><div class='del'>-			Info("Failed to set LED on/off time.\n");</div><div class='add'>+			PWC_DEBUG_MODULE("Failed to set LED on/off time.\n");</div><div class='ctx'> 		if (power_save) {</div><div class='ctx'> 			i = pwc_camera_power(pdev, 0);</div><div class='ctx'> 			if (i &lt; 0)</div><div class='del'>-				Err("Failed to power down camera (%d)\n", i);</div><div class='add'>+				PWC_ERROR("Failed to power down camera (%d)\n", i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	pdev-&gt;vopen = 0;</div><div class='del'>-	Trace(TRACE_OPEN, "&lt;&lt; video_close()\n");</div><div class='add'>+	pdev-&gt;vopen--;</div><div class='add'>+	PWC_DEBUG_OPEN("&lt;&lt; video_close() vopen=%d\n", pdev-&gt;vopen);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1164,7 +1241,7 @@ static int pwc_video_close(struct inode *inode, struct file *file)</div><div class='ctx'> 		device is tricky anyhow.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t pwc_video_read(struct file *file, char __user * buf,</div><div class='add'>+static ssize_t pwc_video_read(struct file *file, char __user *buf,</div><div class='ctx'> 			  size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *vdev = file-&gt;private_data;</div><div class='hunk'>@@ -1172,8 +1249,10 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,</div><div class='ctx'> 	int noblock = file-&gt;f_flags &amp; O_NONBLOCK;</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 	int bytes_to_read;</div><div class='add'>+	void *image_buffer_addr;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count);</div><div class='add'>+	PWC_DEBUG_READ("pwc_video_read(vdev=0x%p, buf=%p, count=%zd) called.\n",</div><div class='add'>+			vdev, buf, count);</div><div class='ctx'> 	if (vdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	pdev = vdev-&gt;priv;</div><div class='hunk'>@@ -1214,16 +1293,19 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_READ, "Copying data to user space.\n");</div><div class='add'>+	PWC_DEBUG_READ("Copying data to user space.\n");</div><div class='ctx'> 	if (pdev-&gt;vpalette == VIDEO_PALETTE_RAW)</div><div class='del'>-		bytes_to_read = pdev-&gt;frame_size;</div><div class='add'>+		bytes_to_read = pdev-&gt;frame_size + sizeof(struct pwc_raw_frame);</div><div class='ctx'> 	else</div><div class='ctx'> 		bytes_to_read = pdev-&gt;view.size;</div><div class='ctx'> </div><div class='ctx'> 	/* copy bytes to user space; we allow for partial reads */</div><div class='ctx'> 	if (count + pdev-&gt;image_read_pos &gt; bytes_to_read)</div><div class='ctx'> 		count = bytes_to_read - pdev-&gt;image_read_pos;</div><div class='del'>-	if (copy_to_user(buf, pdev-&gt;image_ptr[pdev-&gt;fill_image] + pdev-&gt;image_read_pos, count))</div><div class='add'>+	image_buffer_addr = pdev-&gt;image_data;</div><div class='add'>+	image_buffer_addr += pdev-&gt;images[pdev-&gt;fill_image].offset;</div><div class='add'>+	image_buffer_addr += pdev-&gt;image_read_pos;</div><div class='add'>+	if (copy_to_user(buf, image_buffer_addr, count))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	pdev-&gt;image_read_pos += count;</div><div class='ctx'> 	if (pdev-&gt;image_read_pos &gt;= bytes_to_read) { /* All data has been read */</div><div class='hunk'>@@ -1253,370 +1335,56 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pwc_video_do_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			      unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	struct video_device *vdev = file-&gt;private_data;</div><div class='del'>-	struct pwc_device *pdev;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-</div><div class='del'>-	if (vdev == NULL)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	pdev = vdev-&gt;priv;</div><div class='del'>-	if (pdev == NULL)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		/* Query cabapilities */</div><div class='del'>-		case VIDIOCGCAP:</div><div class='del'>-		{</div><div class='del'>-			struct video_capability *caps = arg;</div><div class='del'>-</div><div class='del'>-			strcpy(caps-&gt;name, vdev-&gt;name);</div><div class='del'>-			caps-&gt;type = VID_TYPE_CAPTURE;</div><div class='del'>-			caps-&gt;channels = 1;</div><div class='del'>-			caps-&gt;audios = 1;</div><div class='del'>-			caps-&gt;minwidth  = pdev-&gt;view_min.x;</div><div class='del'>-			caps-&gt;minheight = pdev-&gt;view_min.y;</div><div class='del'>-			caps-&gt;maxwidth  = pdev-&gt;view_max.x;</div><div class='del'>-			caps-&gt;maxheight = pdev-&gt;view_max.y;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Channel functions (simulate 1 channel) */</div><div class='del'>-		case VIDIOCGCHAN:</div><div class='del'>-		{</div><div class='del'>-			struct video_channel *v = arg;</div><div class='del'>-</div><div class='del'>-			if (v-&gt;channel != 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			v-&gt;flags = 0;</div><div class='del'>-			v-&gt;tuners = 0;</div><div class='del'>-			v-&gt;type = VIDEO_TYPE_CAMERA;</div><div class='del'>-			strcpy(v-&gt;name, "Webcam");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCSCHAN:</div><div class='del'>-		{</div><div class='del'>-			/* The spec says the argument is an integer, but</div><div class='del'>-			   the bttv driver uses a video_channel arg, which</div><div class='del'>-			   makes sense becasue it also has the norm flag.</div><div class='del'>-			 */</div><div class='del'>-			struct video_channel *v = arg;</div><div class='del'>-			if (v-&gt;channel != 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Picture functions; contrast etc. */</div><div class='del'>-		case VIDIOCGPICT:</div><div class='del'>-		{</div><div class='del'>-			struct video_picture *p = arg;</div><div class='del'>-			int val;</div><div class='del'>-</div><div class='del'>-			val = pwc_get_brightness(pdev);</div><div class='del'>-			if (val &gt;= 0)</div><div class='del'>-				p-&gt;brightness = val;</div><div class='del'>-			else</div><div class='del'>-				p-&gt;brightness = 0xffff;</div><div class='del'>-			val = pwc_get_contrast(pdev);</div><div class='del'>-			if (val &gt;= 0)</div><div class='del'>-				p-&gt;contrast = val;</div><div class='del'>-			else</div><div class='del'>-				p-&gt;contrast = 0xffff;</div><div class='del'>-			/* Gamma, Whiteness, what's the difference? :) */</div><div class='del'>-			val = pwc_get_gamma(pdev);</div><div class='del'>-			if (val &gt;= 0)</div><div class='del'>-				p-&gt;whiteness = val;</div><div class='del'>-			else</div><div class='del'>-				p-&gt;whiteness = 0xffff;</div><div class='del'>-			val = pwc_get_saturation(pdev);</div><div class='del'>-			if (val &gt;= 0)</div><div class='del'>-				p-&gt;colour = val;</div><div class='del'>-			else</div><div class='del'>-				p-&gt;colour = 0xffff;</div><div class='del'>-			p-&gt;depth = 24;</div><div class='del'>-			p-&gt;palette = pdev-&gt;vpalette;</div><div class='del'>-			p-&gt;hue = 0xFFFF; /* N/A */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCSPICT:</div><div class='del'>-		{</div><div class='del'>-			struct video_picture *p = arg;</div><div class='del'>-			/*</div><div class='del'>-			 *	FIXME:	Suppose we are mid read</div><div class='del'>-				ANSWER: No problem: the firmware of the camera</div><div class='del'>-					can handle brightness/contrast/etc</div><div class='del'>-					changes at _any_ time, and the palette</div><div class='del'>-					is used exactly once in the uncompress</div><div class='del'>-					routine.</div><div class='del'>-			 */</div><div class='del'>-			pwc_set_brightness(pdev, p-&gt;brightness);</div><div class='del'>-			pwc_set_contrast(pdev, p-&gt;contrast);</div><div class='del'>-			pwc_set_gamma(pdev, p-&gt;whiteness);</div><div class='del'>-			pwc_set_saturation(pdev, p-&gt;colour);</div><div class='del'>-			if (p-&gt;palette &amp;&amp; p-&gt;palette != pdev-&gt;vpalette) {</div><div class='del'>-				switch (p-&gt;palette) {</div><div class='del'>-					case VIDEO_PALETTE_YUV420P:</div><div class='del'>-					case VIDEO_PALETTE_RAW:</div><div class='del'>-						pdev-&gt;vpalette = p-&gt;palette;</div><div class='del'>-						return pwc_try_video_mode(pdev, pdev-&gt;image.x, pdev-&gt;image.y, pdev-&gt;vframes, pdev-&gt;vcompression, pdev-&gt;vsnapshot);</div><div class='del'>-						break;</div><div class='del'>-					default:</div><div class='del'>-						return -EINVAL;</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Window/size parameters */</div><div class='del'>-		case VIDIOCGWIN:</div><div class='del'>-		{</div><div class='del'>-			struct video_window *vw = arg;</div><div class='del'>-</div><div class='del'>-			vw-&gt;x = 0;</div><div class='del'>-			vw-&gt;y = 0;</div><div class='del'>-			vw-&gt;width = pdev-&gt;view.x;</div><div class='del'>-			vw-&gt;height = pdev-&gt;view.y;</div><div class='del'>-			vw-&gt;chromakey = 0;</div><div class='del'>-			vw-&gt;flags = (pdev-&gt;vframes &lt;&lt; PWC_FPS_SHIFT) |</div><div class='del'>-				   (pdev-&gt;vsnapshot ? PWC_FPS_SNAPSHOT : 0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCSWIN:</div><div class='del'>-		{</div><div class='del'>-			struct video_window *vw = arg;</div><div class='del'>-			int fps, snapshot, ret;</div><div class='del'>-</div><div class='del'>-			fps = (vw-&gt;flags &amp; PWC_FPS_FRMASK) &gt;&gt; PWC_FPS_SHIFT;</div><div class='del'>-			snapshot = vw-&gt;flags &amp; PWC_FPS_SNAPSHOT;</div><div class='del'>-			if (fps == 0)</div><div class='del'>-				fps = pdev-&gt;vframes;</div><div class='del'>-			if (pdev-&gt;view.x == vw-&gt;width &amp;&amp; pdev-&gt;view.y &amp;&amp; fps == pdev-&gt;vframes &amp;&amp; snapshot == pdev-&gt;vsnapshot)</div><div class='del'>-				return 0;</div><div class='del'>-			ret = pwc_try_video_mode(pdev, vw-&gt;width, vw-&gt;height, fps, pdev-&gt;vcompression, snapshot);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* We don't have overlay support (yet) */</div><div class='del'>-		case VIDIOCGFBUF:</div><div class='del'>-		{</div><div class='del'>-			struct video_buffer *vb = arg;</div><div class='del'>-</div><div class='del'>-			memset(vb,0,sizeof(*vb));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* mmap() functions */</div><div class='del'>-		case VIDIOCGMBUF:</div><div class='del'>-		{</div><div class='del'>-			/* Tell the user program how much memory is needed for a mmap() */</div><div class='del'>-			struct video_mbuf *vm = arg;</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			memset(vm, 0, sizeof(*vm));</div><div class='del'>-			vm-&gt;size = default_mbufs * pdev-&gt;len_per_image;</div><div class='del'>-			vm-&gt;frames = default_mbufs; /* double buffering should be enough for most applications */</div><div class='del'>-			for (i = 0; i &lt; default_mbufs; i++)</div><div class='del'>-				vm-&gt;offsets[i] = i * pdev-&gt;len_per_image;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCMCAPTURE:</div><div class='del'>-		{</div><div class='del'>-			/* Start capture into a given image buffer (called 'frame' in video_mmap structure) */</div><div class='del'>-			struct video_mmap *vm = arg;</div><div class='del'>-</div><div class='del'>-			Trace(TRACE_READ, "VIDIOCMCAPTURE: %dx%d, frame %d, format %d\n", vm-&gt;width, vm-&gt;height, vm-&gt;frame, vm-&gt;format);</div><div class='del'>-			if (vm-&gt;frame &lt; 0 || vm-&gt;frame &gt;= default_mbufs)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			/* xawtv is nasty. It probes the available palettes</div><div class='del'>-			   by setting a very small image size and trying</div><div class='del'>-			   various palettes... The driver doesn't support</div><div class='del'>-			   such small images, so I'm working around it.</div><div class='del'>-			 */</div><div class='del'>-			if (vm-&gt;format)</div><div class='del'>-			{</div><div class='del'>-				switch (vm-&gt;format)</div><div class='del'>-				{</div><div class='del'>-					case VIDEO_PALETTE_YUV420P:</div><div class='del'>-					case VIDEO_PALETTE_RAW:</div><div class='del'>-						break;</div><div class='del'>-					default:</div><div class='del'>-						return -EINVAL;</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if ((vm-&gt;width != pdev-&gt;view.x || vm-&gt;height != pdev-&gt;view.y) &amp;&amp;</div><div class='del'>-			    (vm-&gt;width &gt;= pdev-&gt;view_min.x &amp;&amp; vm-&gt;height &gt;= pdev-&gt;view_min.y)) {</div><div class='del'>-				int ret;</div><div class='del'>-</div><div class='del'>-				Trace(TRACE_OPEN, "VIDIOCMCAPTURE: changing size to please xawtv :-(.\n");</div><div class='del'>-				ret = pwc_try_video_mode(pdev, vm-&gt;width, vm-&gt;height, pdev-&gt;vframes, pdev-&gt;vcompression, pdev-&gt;vsnapshot);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			} /* ... size mismatch */</div><div class='del'>-</div><div class='del'>-			/* FIXME: should we lock here? */</div><div class='del'>-			if (pdev-&gt;image_used[vm-&gt;frame])</div><div class='del'>-				return -EBUSY;	/* buffer wasn't available. Bummer */</div><div class='del'>-			pdev-&gt;image_used[vm-&gt;frame] = 1;</div><div class='del'>-</div><div class='del'>-			/* Okay, we're done here. In the SYNC call we wait until a</div><div class='del'>-			   frame comes available, then expand image into the given</div><div class='del'>-			   buffer.</div><div class='del'>-			   In contrast to the CPiA cam the Philips cams deliver a</div><div class='del'>-			   constant stream, almost like a grabber card. Also,</div><div class='del'>-			   we have separate buffers for the rawdata and the image,</div><div class='del'>-			   meaning we can nearly always expand into the requested buffer.</div><div class='del'>-			 */</div><div class='del'>-			Trace(TRACE_READ, "VIDIOCMCAPTURE done.\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCSYNC:</div><div class='del'>-		{</div><div class='del'>-			/* The doc says: "Whenever a buffer is used it should</div><div class='del'>-			   call VIDIOCSYNC to free this frame up and continue."</div><div class='del'>-</div><div class='del'>-			   The only odd thing about this whole procedure is</div><div class='del'>-			   that MCAPTURE flags the buffer as "in use", and</div><div class='del'>-			   SYNC immediately unmarks it, while it isn't</div><div class='del'>-			   after SYNC that you know that the buffer actually</div><div class='del'>-			   got filled! So you better not start a CAPTURE in</div><div class='del'>-			   the same frame immediately (use double buffering).</div><div class='del'>-			   This is not a problem for this cam, since it has</div><div class='del'>-			   extra intermediate buffers, but a hardware</div><div class='del'>-			   grabber card will then overwrite the buffer</div><div class='del'>-			   you're working on.</div><div class='del'>-			 */</div><div class='del'>-			int *mbuf = arg;</div><div class='del'>-			int ret;</div><div class='del'>-</div><div class='del'>-			Trace(TRACE_READ, "VIDIOCSYNC called (%d).\n", *mbuf);</div><div class='del'>-</div><div class='del'>-			/* bounds check */</div><div class='del'>-			if (*mbuf &lt; 0 || *mbuf &gt;= default_mbufs)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			/* check if this buffer was requested anyway */</div><div class='del'>-			if (pdev-&gt;image_used[*mbuf] == 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			/* Add ourselves to the frame wait-queue.</div><div class='del'>-</div><div class='del'>-			   FIXME: needs auditing for safety.</div><div class='del'>-			   QUESTION: In what respect? I think that using the</div><div class='del'>-				     frameq is safe now.</div><div class='del'>-			 */</div><div class='del'>-			add_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='del'>-			while (pdev-&gt;full_frames == NULL) {</div><div class='del'>-				if (pdev-&gt;error_status) {</div><div class='del'>-					remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='del'>-					set_current_state(TASK_RUNNING);</div><div class='del'>-					return -pdev-&gt;error_status;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (signal_pending(current)) {</div><div class='del'>-					remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='del'>-					set_current_state(TASK_RUNNING);</div><div class='del'>-					return -ERESTARTSYS;</div><div class='del'>-				}</div><div class='del'>-				schedule();</div><div class='del'>-				set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			}</div><div class='del'>-			remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='del'>-			set_current_state(TASK_RUNNING);</div><div class='del'>-</div><div class='del'>-			/* The frame is ready. Expand in the image buffer</div><div class='del'>-			   requested by the user. I don't care if you</div><div class='del'>-			   mmap() 5 buffers and request data in this order:</div><div class='del'>-			   buffer 4 2 3 0 1 2 3 0 4 3 1 . . .</div><div class='del'>-			   Grabber hardware may not be so forgiving.</div><div class='del'>-			 */</div><div class='del'>-			Trace(TRACE_READ, "VIDIOCSYNC: frame ready.\n");</div><div class='del'>-			pdev-&gt;fill_image = *mbuf; /* tell in which buffer we want the image to be expanded */</div><div class='del'>-			/* Decompress, etc */</div><div class='del'>-			ret = pwc_handle_frame(pdev);</div><div class='del'>-			pdev-&gt;image_used[*mbuf] = 0;</div><div class='del'>-			if (ret)</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCGAUDIO:</div><div class='del'>-		{</div><div class='del'>-			struct video_audio *v = arg;</div><div class='del'>-</div><div class='del'>-			strcpy(v-&gt;name, "Microphone");</div><div class='del'>-			v-&gt;audio = -1; /* unknown audio minor */</div><div class='del'>-			v-&gt;flags = 0;</div><div class='del'>-			v-&gt;mode = VIDEO_SOUND_MONO;</div><div class='del'>-			v-&gt;volume = 0;</div><div class='del'>-			v-&gt;bass = 0;</div><div class='del'>-			v-&gt;treble = 0;</div><div class='del'>-			v-&gt;balance = 0x8000;</div><div class='del'>-			v-&gt;step = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCSAUDIO:</div><div class='del'>-		{</div><div class='del'>-			/* Dummy: nothing can be set */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case VIDIOCGUNIT:</div><div class='del'>-		{</div><div class='del'>-			struct video_unit *vu = arg;</div><div class='del'>-</div><div class='del'>-			vu-&gt;video = pdev-&gt;vdev-&gt;minor &amp; 0x3F;</div><div class='del'>-			vu-&gt;audio = -1; /* not known yet */</div><div class='del'>-			vu-&gt;vbi = -1;</div><div class='del'>-			vu-&gt;radio = -1;</div><div class='del'>-			vu-&gt;teletext = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		default:</div><div class='del'>-			return pwc_ioctl(pdev, cmd, arg);</div><div class='del'>-	} /* ..switch */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int pwc_video_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			   unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	return video_usercopy(inode, file, cmd, arg, pwc_video_do_ioctl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	struct video_device *vdev = file-&gt;private_data;</div><div class='ctx'> 	struct pwc_device *pdev;</div><div class='del'>-	unsigned long start = vma-&gt;vm_start;</div><div class='del'>-	unsigned long size  = vma-&gt;vm_end-vma-&gt;vm_start;</div><div class='del'>-	unsigned long page, pos;</div><div class='add'>+	unsigned long start;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned long page, pos = 0;</div><div class='add'>+	int index;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_MEMORY, "mmap(0x%p, 0x%lx, %lu) called.\n", vdev, start, size);</div><div class='add'>+	PWC_DEBUG_MEMORY("&gt;&gt; %s\n", __FUNCTION__);</div><div class='ctx'> 	pdev = vdev-&gt;priv;</div><div class='add'>+	size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+	start = vma-&gt;vm_start;</div><div class='ctx'> </div><div class='del'>-	vma-&gt;vm_flags |= VM_IO;</div><div class='add'>+	/* Find the idx buffer for this mapping */</div><div class='add'>+	for (index = 0; index &lt; pwc_mbufs; index++) {</div><div class='add'>+		pos = pdev-&gt;images[index].offset;</div><div class='add'>+		if ((pos&gt;&gt;PAGE_SHIFT) == vma-&gt;vm_pgoff)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (index == MAX_IMAGES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (index == 0) {</div><div class='add'>+		/*</div><div class='add'>+		 * Special case for v4l1. In v4l1, we map only one big buffer,</div><div class='add'>+		 * but in v4l2 each buffer is mapped</div><div class='add'>+		 */</div><div class='add'>+		unsigned long total_size;</div><div class='add'>+		total_size = pwc_mbufs * pdev-&gt;len_per_image;</div><div class='add'>+		if (size != pdev-&gt;len_per_image &amp;&amp; size != total_size) {</div><div class='add'>+			PWC_ERROR("Wrong size (%lu) needed to be len_per_image=%d or total_size=%lu\n",</div><div class='add'>+				   size, pdev-&gt;len_per_image, total_size);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (size &gt; pdev-&gt;len_per_image)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pos = (unsigned long)pdev-&gt;image_data;</div><div class='add'>+	vma-&gt;vm_flags |= VM_IO;	/* from 2.6.9-acX */</div><div class='add'>+</div><div class='add'>+	pos += (unsigned long)pdev-&gt;image_data;</div><div class='ctx'> 	while (size &gt; 0) {</div><div class='ctx'> 		page = vmalloc_to_pfn((void *)pos);</div><div class='ctx'> 		if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED))</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-</div><div class='ctx'> 		start += PAGE_SIZE;</div><div class='ctx'> 		pos += PAGE_SIZE;</div><div class='ctx'> 		if (size &gt; PAGE_SIZE)</div><div class='hunk'>@@ -1624,7 +1392,6 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		else</div><div class='ctx'> 			size = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1645,10 +1412,12 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	int video_nr = -1; /* default: use next available device */</div><div class='ctx'> 	char serial_number[30], *name;</div><div class='ctx'> </div><div class='add'>+	vendor_id = le16_to_cpu(udev-&gt;descriptor.idVendor);</div><div class='add'>+	product_id = le16_to_cpu(udev-&gt;descriptor.idProduct);</div><div class='add'>+</div><div class='ctx'> 	/* Check if we can handle this device */</div><div class='del'>-	Trace(TRACE_PROBE, "probe() called [%04X %04X], if %d\n",</div><div class='del'>-		le16_to_cpu(udev-&gt;descriptor.idVendor),</div><div class='del'>-		le16_to_cpu(udev-&gt;descriptor.idProduct),</div><div class='add'>+	PWC_DEBUG_PROBE("probe() called [%04X %04X], if %d\n",</div><div class='add'>+		vendor_id, product_id,</div><div class='ctx'> 		intf-&gt;altsetting-&gt;desc.bInterfaceNumber);</div><div class='ctx'> </div><div class='ctx'> 	/* the interfaces are probed one by one. We are only interested in the</div><div class='hunk'>@@ -1658,61 +1427,63 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	if (intf-&gt;altsetting-&gt;desc.bInterfaceNumber &gt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	vendor_id = le16_to_cpu(udev-&gt;descriptor.idVendor);</div><div class='del'>-	product_id = le16_to_cpu(udev-&gt;descriptor.idProduct);</div><div class='del'>-</div><div class='ctx'> 	if (vendor_id == 0x0471) {</div><div class='ctx'> 		switch (product_id) {</div><div class='ctx'> 		case 0x0302:</div><div class='del'>-			Info("Philips PCA645VC USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCA645VC USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 645 webcam";</div><div class='ctx'> 			type_id = 645;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0303:</div><div class='del'>-			Info("Philips PCA646VC USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCA646VC USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 646 webcam";</div><div class='ctx'> 			type_id = 646;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0304:</div><div class='del'>-			Info("Askey VC010 type 2 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Askey VC010 type 2 USB webcam detected.\n");</div><div class='ctx'> 			name = "Askey VC010 webcam";</div><div class='ctx'> 			type_id = 646;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0307:</div><div class='del'>-			Info("Philips PCVC675K (Vesta) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC675K (Vesta) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 675 webcam";</div><div class='ctx'> 			type_id = 675;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0308:</div><div class='del'>-			Info("Philips PCVC680K (Vesta Pro) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC680K (Vesta Pro) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 680 webcam";</div><div class='ctx'> 			type_id = 680;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x030C:</div><div class='del'>-			Info("Philips PCVC690K (Vesta Pro Scan) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC690K (Vesta Pro Scan) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 690 webcam";</div><div class='ctx'> 			type_id = 690;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0310:</div><div class='del'>-			Info("Philips PCVC730K (ToUCam Fun)/PCVC830 (ToUCam II) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC730K (ToUCam Fun)/PCVC830 (ToUCam II) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 730 webcam";</div><div class='ctx'> 			type_id = 730;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0311:</div><div class='del'>-			Info("Philips PCVC740K (ToUCam Pro)/PCVC840 (ToUCam II) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC740K (ToUCam Pro)/PCVC840 (ToUCam II) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 740 webcam";</div><div class='ctx'> 			type_id = 740;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0312:</div><div class='del'>-			Info("Philips PCVC750K (ToUCam Pro Scan) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC750K (ToUCam Pro Scan) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 750 webcam";</div><div class='ctx'> 			type_id = 750;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x0313:</div><div class='del'>-			Info("Philips PCVC720K/40 (ToUCam XS) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Philips PCVC720K/40 (ToUCam XS) USB webcam detected.\n");</div><div class='ctx'> 			name = "Philips 720K/40 webcam";</div><div class='ctx'> 			type_id = 720;</div><div class='ctx'> 			break;</div><div class='add'>+		case 0x0329:</div><div class='add'>+			PWC_INFO("Philips SPC 900NC USB webcam detected.\n");</div><div class='add'>+			name = "Philips SPC 900NC webcam";</div><div class='add'>+			type_id = 720;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1721,7 +1492,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	else if (vendor_id == 0x069A) {</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x0001:</div><div class='del'>-			Info("Askey VC010 type 1 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Askey VC010 type 1 USB webcam detected.\n");</div><div class='ctx'> 			name = "Askey VC010 webcam";</div><div class='ctx'> 			type_id = 645;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1733,32 +1504,33 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	else if (vendor_id == 0x046d) {</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x08b0:</div><div class='del'>-			Info("Logitech QuickCam Pro 3000 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam Pro 3000 USB webcam detected.\n");</div><div class='ctx'> 			name = "Logitech QuickCam Pro 3000";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x08b1:</div><div class='del'>-			Info("Logitech QuickCam Notebook Pro USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam Notebook Pro USB webcam detected.\n");</div><div class='ctx'> 			name = "Logitech QuickCam Notebook Pro";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x08b2:</div><div class='del'>-			Info("Logitech QuickCam 4000 Pro USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam 4000 Pro USB webcam detected.\n");</div><div class='ctx'> 			name = "Logitech QuickCam Pro 4000";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x08b3:</div><div class='del'>-			Info("Logitech QuickCam Zoom USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam Zoom USB webcam detected.\n");</div><div class='ctx'> 			name = "Logitech QuickCam Zoom";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x08B4:</div><div class='del'>-			Info("Logitech QuickCam Zoom (new model) USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam Zoom (new model) USB webcam detected.\n");</div><div class='ctx'> 			name = "Logitech QuickCam Zoom";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='add'>+			power_save = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x08b5:</div><div class='del'>-			Info("Logitech QuickCam Orbit/Sphere USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam Orbit/Sphere USB webcam detected.\n");</div><div class='ctx'> 			name = "Logitech QuickCam Orbit";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='ctx'> 			features |= FEATURE_MOTOR_PANTILT;</div><div class='hunk'>@@ -1766,7 +1538,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 		case 0x08b6:</div><div class='ctx'> 		case 0x08b7:</div><div class='ctx'> 		case 0x08b8:</div><div class='del'>-			Info("Logitech QuickCam detected (reserved ID).\n");</div><div class='add'>+			PWC_INFO("Logitech QuickCam detected (reserved ID).\n");</div><div class='ctx'> 			name = "Logitech QuickCam (res.)";</div><div class='ctx'> 			type_id = 730; /* Assuming CMOS */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1782,15 +1554,20 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x9000:</div><div class='del'>-			Info("Samsung MPC-C10 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Samsung MPC-C10 USB webcam detected.\n");</div><div class='ctx'> 			name = "Samsung MPC-C10";</div><div class='ctx'> 			type_id = 675;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x9001:</div><div class='del'>-			Info("Samsung MPC-C30 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Samsung MPC-C30 USB webcam detected.\n");</div><div class='ctx'> 			name = "Samsung MPC-C30";</div><div class='ctx'> 			type_id = 675;</div><div class='ctx'> 			break;</div><div class='add'>+		case 0x9002:</div><div class='add'>+			PWC_INFO("Samsung SNC-35E (v3.0) USB webcam detected.\n");</div><div class='add'>+			name = "Samsung MPC-C30";</div><div class='add'>+			type_id = 740;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1799,12 +1576,12 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	else if (vendor_id == 0x041e) {</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x400c:</div><div class='del'>-			Info("Creative Labs Webcam 5 detected.\n");</div><div class='add'>+			PWC_INFO("Creative Labs Webcam 5 detected.\n");</div><div class='ctx'> 			name = "Creative Labs Webcam 5";</div><div class='ctx'> 			type_id = 730;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x4011:</div><div class='del'>-			Info("Creative Labs Webcam Pro Ex detected.\n");</div><div class='add'>+			PWC_INFO("Creative Labs Webcam Pro Ex detected.\n");</div><div class='ctx'> 			name = "Creative Labs Webcam Pro Ex";</div><div class='ctx'> 			type_id = 740;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1816,7 +1593,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	else if (vendor_id == 0x04cc) {</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x8116:</div><div class='del'>-			Info("Sotec Afina Eye USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Sotec Afina Eye USB webcam detected.\n");</div><div class='ctx'> 			name = "Sotec Afina Eye";</div><div class='ctx'> 			type_id = 730;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1829,7 +1606,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x8116:</div><div class='ctx'> 			/* This is essentially the same cam as the Sotec Afina Eye */</div><div class='del'>-			Info("AME Co. Afina Eye USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("AME Co. Afina Eye USB webcam detected.\n");</div><div class='ctx'> 			name = "AME Co. Afina Eye";</div><div class='ctx'> 			type_id = 750;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1842,12 +1619,12 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	else if (vendor_id == 0x0d81) {</div><div class='ctx'> 		switch(product_id) {</div><div class='ctx'> 		case 0x1900:</div><div class='del'>-			Info("Visionite VCS-UC300 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Visionite VCS-UC300 USB webcam detected.\n");</div><div class='ctx'> 			name = "Visionite VCS-UC300";</div><div class='ctx'> 			type_id = 740; /* CCD sensor */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x1910:</div><div class='del'>-			Info("Visionite VCS-UM100 USB webcam detected.\n");</div><div class='add'>+			PWC_INFO("Visionite VCS-UM100 USB webcam detected.\n");</div><div class='ctx'> 			name = "Visionite VCS-UM100";</div><div class='ctx'> 			type_id = 730; /* CMOS sensor */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1861,15 +1638,15 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> </div><div class='ctx'> 	memset(serial_number, 0, 30);</div><div class='ctx'> 	usb_string(udev, udev-&gt;descriptor.iSerialNumber, serial_number, 29);</div><div class='del'>-	Trace(TRACE_PROBE, "Device serial number is %s\n", serial_number);</div><div class='add'>+	PWC_DEBUG_PROBE("Device serial number is %s\n", serial_number);</div><div class='ctx'> </div><div class='ctx'> 	if (udev-&gt;descriptor.bNumConfigurations &gt; 1)</div><div class='del'>-		Info("Warning: more than 1 configuration available.\n");</div><div class='add'>+		PWC_WARNING("Warning: more than 1 configuration available.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate structure, initialize pointers, mutexes, etc. and link it to the usb_device */</div><div class='ctx'> 	pdev = kzalloc(sizeof(struct pwc_device), GFP_KERNEL);</div><div class='ctx'> 	if (pdev == NULL) {</div><div class='del'>-		Err("Oops, could not allocate memory for pwc_device.\n");</div><div class='add'>+		PWC_ERROR("Oops, could not allocate memory for pwc_device.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	pdev-&gt;type = type_id;</div><div class='hunk'>@@ -1900,17 +1677,18 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	pdev-&gt;vdev = video_device_alloc();</div><div class='ctx'> 	if (pdev-&gt;vdev == 0)</div><div class='ctx'> 	{</div><div class='del'>-		Err("Err, cannot allocate video_device struture. Failing probe.");</div><div class='add'>+		PWC_ERROR("Err, cannot allocate video_device struture. Failing probe.");</div><div class='ctx'> 		kfree(pdev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(pdev-&gt;vdev, &amp;pwc_template, sizeof(pwc_template));</div><div class='add'>+	pdev-&gt;vdev-&gt;dev = &amp;(udev-&gt;dev);</div><div class='ctx'> 	strcpy(pdev-&gt;vdev-&gt;name, name);</div><div class='ctx'> 	pdev-&gt;vdev-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	video_set_drvdata(pdev-&gt;vdev, pdev);</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;release = le16_to_cpu(udev-&gt;descriptor.bcdDevice);</div><div class='del'>-	Trace(TRACE_PROBE, "Release: %04x\n", pdev-&gt;release);</div><div class='add'>+	PWC_DEBUG_PROBE("Release: %04x\n", pdev-&gt;release);</div><div class='ctx'> </div><div class='ctx'> 	/* Now search device_hint[] table for a match, so we can hint a node number. */</div><div class='ctx'> 	for (hint = 0; hint &lt; MAX_DEV_HINTS; hint++) {</div><div class='hunk'>@@ -1918,10 +1696,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 		     (device_hint[hint].pdev == NULL)) {</div><div class='ctx'> 			/* so far, so good... try serial number */</div><div class='ctx'> 			if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {</div><div class='del'>-			    	/* match! */</div><div class='del'>-			    	video_nr = device_hint[hint].device_node;</div><div class='del'>-			    	Trace(TRACE_PROBE, "Found hint, will try to register as /dev/video%d\n", video_nr);</div><div class='del'>-			    	break;</div><div class='add'>+				/* match! */</div><div class='add'>+				video_nr = device_hint[hint].device_node;</div><div class='add'>+				PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1929,21 +1707,27 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id</div><div class='ctx'> 	pdev-&gt;vdev-&gt;release = video_device_release;</div><div class='ctx'> 	i = video_register_device(pdev-&gt;vdev, VFL_TYPE_GRABBER, video_nr);</div><div class='ctx'> 	if (i &lt; 0) {</div><div class='del'>-		Err("Failed to register as video device (%d).\n", i);</div><div class='add'>+		PWC_ERROR("Failed to register as video device (%d).\n", i);</div><div class='ctx'> 		video_device_release(pdev-&gt;vdev); /* Drip... drip... drip... */</div><div class='ctx'> 		kfree(pdev); /* Oops, no memory leaks please */</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='del'>-		Info("Registered as /dev/video%d.\n", pdev-&gt;vdev-&gt;minor &amp; 0x3F);</div><div class='add'>+		PWC_INFO("Registered as /dev/video%d.\n", pdev-&gt;vdev-&gt;minor &amp; 0x3F);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* occupy slot */</div><div class='ctx'> 	if (hint &lt; MAX_DEV_HINTS)</div><div class='ctx'> 		device_hint[hint].pdev = pdev;</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_PROBE, "probe() function returning struct at 0x%p.\n", pdev);</div><div class='add'>+	PWC_DEBUG_PROBE("probe() function returning struct at 0x%p.\n", pdev);</div><div class='ctx'> 	usb_set_intfdata (intf, pdev);</div><div class='add'>+	pwc_create_sysfs_files(pdev-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	/* Set the leds off */</div><div class='add'>+	pwc_set_leds(pdev, 0, 0);</div><div class='add'>+	pwc_camera_power(pdev, 0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1957,27 +1741,21 @@ static void usb_pwc_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	pdev = usb_get_intfdata (intf);</div><div class='ctx'> 	usb_set_intfdata (intf, NULL);</div><div class='ctx'> 	if (pdev == NULL) {</div><div class='del'>-		Err("pwc_disconnect() Called without private pointer.\n");</div><div class='add'>+		PWC_ERROR("pwc_disconnect() Called without private pointer.\n");</div><div class='ctx'> 		goto disconnect_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pdev-&gt;udev == NULL) {</div><div class='del'>-		Err("pwc_disconnect() already called for %p\n", pdev);</div><div class='add'>+		PWC_ERROR("pwc_disconnect() already called for %p\n", pdev);</div><div class='ctx'> 		goto disconnect_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pdev-&gt;udev != interface_to_usbdev(intf)) {</div><div class='del'>-		Err("pwc_disconnect() Woops: pointer mismatch udev/pdev.\n");</div><div class='del'>-		goto disconnect_out;</div><div class='del'>-	}</div><div class='del'>-#ifdef PWC_MAGIC</div><div class='del'>-	if (pdev-&gt;magic != PWC_MAGIC) {</div><div class='del'>-		Err("pwc_disconnect() Magic number failed. Consult your scrolls and try again.\n");</div><div class='add'>+		PWC_ERROR("pwc_disconnect() Woops: pointer mismatch udev/pdev.\n");</div><div class='ctx'> 		goto disconnect_out;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* We got unplugged; this is signalled by an EPIPE error code */</div><div class='ctx'> 	if (pdev-&gt;vopen) {</div><div class='del'>-		Info("Disconnected while webcam is in use!\n");</div><div class='add'>+		PWC_INFO("Disconnected while webcam is in use!\n");</div><div class='ctx'> 		pdev-&gt;error_status = EPIPE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1987,7 +1765,8 @@ static void usb_pwc_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	while (pdev-&gt;vopen)</div><div class='ctx'> 		schedule();</div><div class='ctx'> 	/* Device is now closed, so we can safely unregister it */</div><div class='del'>-	Trace(TRACE_PROBE, "Unregistering video device in disconnect().\n");</div><div class='add'>+	PWC_DEBUG_PROBE("Unregistering video device in disconnect().\n");</div><div class='add'>+	pwc_remove_sysfs_files(pdev-&gt;vdev);</div><div class='ctx'> 	video_unregister_device(pdev-&gt;vdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Free memory (don't set pdev to 0 just yet) */</div><div class='hunk'>@@ -2021,58 +1800,64 @@ static int pwc_atoi(const char *s)</div><div class='ctx'>  * Initialization code &amp; module stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static char size[10];</div><div class='del'>-static int fps = 0;</div><div class='del'>-static int fbufs = 0;</div><div class='del'>-static int mbufs = 0;</div><div class='del'>-static int trace = -1;</div><div class='add'>+static char *size;</div><div class='add'>+static int fps;</div><div class='add'>+static int fbufs;</div><div class='add'>+static int mbufs;</div><div class='ctx'> static int compression = -1;</div><div class='ctx'> static int leds[2] = { -1, -1 };</div><div class='del'>-static char *dev_hint[MAX_DEV_HINTS] = { };</div><div class='add'>+static int leds_nargs;</div><div class='add'>+static char *dev_hint[MAX_DEV_HINTS];</div><div class='add'>+static int dev_hint_nargs;</div><div class='add'>+</div><div class='add'>+module_param(size, charp, 0444);</div><div class='add'>+module_param(fps, int, 0444);</div><div class='add'>+module_param(fbufs, int, 0444);</div><div class='add'>+module_param(mbufs, int, 0444);</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='add'>+module_param_named(trace, pwc_trace, int, 0644);</div><div class='add'>+#endif</div><div class='add'>+module_param(power_save, int, 0444);</div><div class='add'>+module_param(compression, int, 0444);</div><div class='add'>+module_param_array(leds, int, &amp;leds_nargs, 0444);</div><div class='add'>+module_param_array(dev_hint, charp, &amp;dev_hint_nargs, 0444);</div><div class='ctx'> </div><div class='del'>-module_param_string(size, size, sizeof(size), 0);</div><div class='ctx'> MODULE_PARM_DESC(size, "Initial image size. One of sqcif, qsif, qcif, sif, cif, vga");</div><div class='del'>-module_param(fps, int, 0000);</div><div class='ctx'> MODULE_PARM_DESC(fps, "Initial frames per second. Varies with model, useful range 5-30");</div><div class='del'>-module_param(fbufs, int, 0000);</div><div class='ctx'> MODULE_PARM_DESC(fbufs, "Number of internal frame buffers to reserve");</div><div class='del'>-module_param(mbufs, int, 0000);</div><div class='ctx'> MODULE_PARM_DESC(mbufs, "Number of external (mmap()ed) image buffers");</div><div class='del'>-module_param(trace, int, 0000);</div><div class='ctx'> MODULE_PARM_DESC(trace, "For debugging purposes");</div><div class='del'>-module_param(power_save, bool, 0000);</div><div class='ctx'> MODULE_PARM_DESC(power_save, "Turn power save feature in camera on or off");</div><div class='del'>-module_param(compression, int, 0000);</div><div class='ctx'> MODULE_PARM_DESC(compression, "Preferred compression quality. Range 0 (uncompressed) to 3 (high compression)");</div><div class='del'>-module_param_array(leds, int, NULL, 0000);</div><div class='ctx'> MODULE_PARM_DESC(leds, "LED on,off time in milliseconds");</div><div class='del'>-module_param_array(dev_hint, charp, NULL, 0000);</div><div class='ctx'> MODULE_PARM_DESC(dev_hint, "Device node hints");</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Philips &amp; OEM USB webcam driver");</div><div class='ctx'> MODULE_AUTHOR("Luc Saillard &lt;luc@saillard.org&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("pwcx");</div><div class='add'>+MODULE_VERSION( PWC_VERSION );</div><div class='ctx'> </div><div class='ctx'> static int __init usb_pwc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, sz;</div><div class='ctx'> 	char *sizenames[PSZ_MAX] = { "sqcif", "qsif", "qcif", "sif", "cif", "vga" };</div><div class='ctx'> </div><div class='del'>-	Info("Philips webcam module version " PWC_VERSION " loaded.\n");</div><div class='del'>-	Info("Supports Philips PCA645/646, PCVC675/680/690, PCVC720[40]/730/740/750 &amp; PCVC830/840.\n");</div><div class='del'>-	Info("Also supports the Askey VC010, various Logitech Quickcams, Samsung MPC-C10 and MPC-C30,\n");</div><div class='del'>-	Info("the Creative WebCam 5 &amp; Pro Ex, SOTEC Afina Eye and Visionite VCS-UC300 and VCS-UM100.\n");</div><div class='add'>+	PWC_INFO("Philips webcam module version " PWC_VERSION " loaded.\n");</div><div class='add'>+	PWC_INFO("Supports Philips PCA645/646, PCVC675/680/690, PCVC720[40]/730/740/750 &amp; PCVC830/840.\n");</div><div class='add'>+	PWC_INFO("Also supports the Askey VC010, various Logitech Quickcams, Samsung MPC-C10 and MPC-C30,\n");</div><div class='add'>+	PWC_INFO("the Creative WebCam 5 &amp; Pro Ex, SOTEC Afina Eye and Visionite VCS-UC300 and VCS-UM100.\n");</div><div class='ctx'> </div><div class='ctx'> 	if (fps) {</div><div class='ctx'> 		if (fps &lt; 4 || fps &gt; 30) {</div><div class='del'>-			Err("Framerate out of bounds (4-30).\n");</div><div class='add'>+			PWC_ERROR("Framerate out of bounds (4-30).\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		default_fps = fps;</div><div class='del'>-		Info("Default framerate set to %d.\n", default_fps);</div><div class='add'>+		PWC_DEBUG_MODULE("Default framerate set to %d.\n", default_fps);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (size[0]) {</div><div class='add'>+	if (size) {</div><div class='ctx'> 		/* string; try matching with array */</div><div class='ctx'> 		for (sz = 0; sz &lt; PSZ_MAX; sz++) {</div><div class='ctx'> 			if (!strcmp(sizenames[sz], size)) { /* Found! */</div><div class='hunk'>@@ -2081,41 +1866,42 @@ static int __init usb_pwc_init(void)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sz == PSZ_MAX) {</div><div class='del'>-			Err("Size not recognized; try size=[sqcif | qsif | qcif | sif | cif | vga].\n");</div><div class='add'>+			PWC_ERROR("Size not recognized; try size=[sqcif | qsif | qcif | sif | cif | vga].\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		Info("Default image size set to %s [%dx%d].\n", sizenames[default_size], pwc_image_sizes[default_size].x, pwc_image_sizes[default_size].y);</div><div class='add'>+		PWC_DEBUG_MODULE("Default image size set to %s [%dx%d].\n", sizenames[default_size], pwc_image_sizes[default_size].x, pwc_image_sizes[default_size].y);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mbufs) {</div><div class='ctx'> 		if (mbufs &lt; 1 || mbufs &gt; MAX_IMAGES) {</div><div class='del'>-			Err("Illegal number of mmap() buffers; use a number between 1 and %d.\n", MAX_IMAGES);</div><div class='add'>+			PWC_ERROR("Illegal number of mmap() buffers; use a number between 1 and %d.\n", MAX_IMAGES);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		default_mbufs = mbufs;</div><div class='del'>-		Info("Number of image buffers set to %d.\n", default_mbufs);</div><div class='add'>+		pwc_mbufs = mbufs;</div><div class='add'>+		PWC_DEBUG_MODULE("Number of image buffers set to %d.\n", pwc_mbufs);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fbufs) {</div><div class='ctx'> 		if (fbufs &lt; 2 || fbufs &gt; MAX_FRAMES) {</div><div class='del'>-			Err("Illegal number of frame buffers; use a number between 2 and %d.\n", MAX_FRAMES);</div><div class='add'>+			PWC_ERROR("Illegal number of frame buffers; use a number between 2 and %d.\n", MAX_FRAMES);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		default_fbufs = fbufs;</div><div class='del'>-		Info("Number of frame buffers set to %d.\n", default_fbufs);</div><div class='add'>+		PWC_DEBUG_MODULE("Number of frame buffers set to %d.\n", default_fbufs);</div><div class='ctx'> 	}</div><div class='del'>-	if (trace &gt;= 0) {</div><div class='del'>-		Info("Trace options: 0x%04x\n", trace);</div><div class='del'>-		pwc_trace = trace;</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='add'>+	if (pwc_trace &gt;= 0) {</div><div class='add'>+		PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> 	if (compression &gt;= 0) {</div><div class='ctx'> 		if (compression &gt; 3) {</div><div class='del'>-			Err("Invalid compression setting; use a number between 0 (uncompressed) and 3 (high).\n");</div><div class='add'>+			PWC_ERROR("Invalid compression setting; use a number between 0 (uncompressed) and 3 (high).\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		pwc_preferred_compression = compression;</div><div class='del'>-		Info("Preferred compression set to %d.\n", pwc_preferred_compression);</div><div class='add'>+		PWC_DEBUG_MODULE("Preferred compression set to %d.\n", pwc_preferred_compression);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (power_save)</div><div class='del'>-		Info("Enabling power save on open/close.\n");</div><div class='add'>+		PWC_DEBUG_MODULE("Enabling power save on open/close.\n");</div><div class='ctx'> 	if (leds[0] &gt;= 0)</div><div class='ctx'> 		led_on = leds[0];</div><div class='ctx'> 	if (leds[1] &gt;= 0)</div><div class='hunk'>@@ -2146,14 +1932,14 @@ static int __init usb_pwc_init(void)</div><div class='ctx'> 				dot++;</div><div class='ctx'> 			/* Few sanity checks */</div><div class='ctx'> 			if (*dot != '\0' &amp;&amp; dot &gt; colon) {</div><div class='del'>-				Err("Malformed camera hint: the colon must be after the dot.\n");</div><div class='add'>+				PWC_ERROR("Malformed camera hint: the colon must be after the dot.\n");</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (*colon == '\0') {</div><div class='ctx'> 				/* No colon */</div><div class='ctx'> 				if (*dot != '\0') {</div><div class='del'>-					Err("Malformed camera hint: no colon + device node given.\n");</div><div class='add'>+					PWC_ERROR("Malformed camera hint: no colon + device node given.\n");</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 				}</div><div class='ctx'> 				else {</div><div class='hunk'>@@ -2178,28 +1964,27 @@ static int __init usb_pwc_init(void)</div><div class='ctx'> 					device_hint[i].serial_number[k] = '\0';</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-			Debug("device_hint[%d]:\n", i);</div><div class='del'>-			Debug("  type    : %d\n", device_hint[i].type);</div><div class='del'>-			Debug("  serial# : %s\n", device_hint[i].serial_number);</div><div class='del'>-			Debug("  node    : %d\n", device_hint[i].device_node);</div><div class='del'>-#endif</div><div class='add'>+			PWC_TRACE("device_hint[%d]:\n", i);</div><div class='add'>+			PWC_TRACE("  type    : %d\n", device_hint[i].type);</div><div class='add'>+			PWC_TRACE("  serial# : %s\n", device_hint[i].serial_number);</div><div class='add'>+			PWC_TRACE("  node    : %d\n", device_hint[i].device_node);</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='ctx'> 			device_hint[i].type = 0; /* not filled */</div><div class='ctx'> 	} /* ..for MAX_DEV_HINTS */</div><div class='ctx'> </div><div class='del'>-	Trace(TRACE_PROBE, "Registering driver at address 0x%p.\n", &amp;pwc_driver);</div><div class='add'>+	PWC_DEBUG_PROBE("Registering driver at address 0x%p.\n", &amp;pwc_driver);</div><div class='ctx'> 	return usb_register(&amp;pwc_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit usb_pwc_exit(void)</div><div class='ctx'> {</div><div class='del'>-	Trace(TRACE_MODULE, "Deregistering driver.\n");</div><div class='add'>+	PWC_DEBUG_MODULE("Deregistering driver.\n");</div><div class='ctx'> 	usb_deregister(&amp;pwc_driver);</div><div class='del'>-	Info("Philips webcam module removed.\n");</div><div class='add'>+	PWC_INFO("Philips webcam module removed.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(usb_pwc_init);</div><div class='ctx'> module_exit(usb_pwc_exit);</div><div class='ctx'> </div><div class='add'>+/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-kiara.c b/drivers/media/video/pwc/pwc-kiara.c<br/>index 4c96037f7be5..fec39cc5a9f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-kiara.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-kiara.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-kiara.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-kiara.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -316,3 +316,576 @@ const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4] =</div><div class='ctx'>    },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rom table for kiara chips</div><div class='add'>+ *</div><div class='add'>+ * 32 roms tables (one for each resolution ?)</div><div class='add'>+ *  2 tables per roms (one for each passes) (Y, and U&amp;V)</div><div class='add'>+ * 128 bytes per passes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+const unsigned int KiaraRomTable [8][2][16][8] =</div><div class='add'>+{</div><div class='add'>+ { /* version 0 */</div><div class='add'>+  { /* version 0, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000001,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x0000124a,0x00009252,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009292,0x00009292,0x00009493,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x000124db,0x000126dc,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 0, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000001,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009252,0x00009292,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009292,0x00009292,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00009292,</div><div class='add'>+    0x00009492,0x00009493,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x00009493,</div><div class='add'>+    0x000126dc,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x000136e4,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 1 */</div><div class='add'>+  { /* version 1, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009252,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00009252,</div><div class='add'>+    0x00009492,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 1, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000009,</div><div class='add'>+    0x00000049,0x00000009,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000249,0x00000049,0x0000024a,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009292,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 2 */</div><div class='add'>+  { /* version 2, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x00009493,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000124db,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 2, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x0000a49b,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 3 */</div><div class='add'>+  { /* version 3, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000136e4,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x0001b725,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001b925,0x00025bb6,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 3, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000126dc,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000136e4,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 4 */</div><div class='add'>+  { /* version 4, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x00009252,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x00009493,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 4, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00000249,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009252,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x00009252,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009493,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000124db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 5 */</div><div class='add'>+  { /* version 5, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001c96e,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001c924,0x0002496d,0x00025bb6,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 5, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009252,0x00009252,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000126dc,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 6 */</div><div class='add'>+  { /* version 6, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000126db,</div><div class='add'>+    0x0001c924,0x00024b6d,0x0002ddb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 6, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x00009252,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000124db,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000126dc,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 7 */</div><div class='add'>+  { /* version 7, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b725,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001c96e,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b924,0x0001c92d,0x00024b76,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000136db,</div><div class='add'>+    0x00024924,0x00024b6d,0x0002ddb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 7, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x00009492,0x00009292,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000124db,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000136db,</div><div class='add'>+    0x0001b724,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000136db,</div><div class='add'>+    0x0001b724,0x000126dc,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000136db,</div><div class='add'>+    0x0001b724,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001b724,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x0001b6db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ }</div><div class='add'>+};</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-kiara.h b/drivers/media/video/pwc/pwc-kiara.h<br/>index 12929abbb1f0..0bdb22547d86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-kiara.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-kiara.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-kiara.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-kiara.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #ifndef PWC_KIARA_H</div><div class='ctx'> #define PWC_KIARA_H</div><div class='ctx'> </div><div class='del'>-#include "pwc-ioctl.h"</div><div class='add'>+#include &lt;media/pwc-ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct Kiara_table_entry</div><div class='ctx'> {</div><div class='hunk'>@@ -37,8 +37,8 @@ struct Kiara_table_entry</div><div class='ctx'> 	unsigned char mode[12];		/* precomputed mode settings for cam */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const extern struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4];</div><div class='del'>-const extern unsigned int KiaraRomTable[8][2][16][8];</div><div class='add'>+extern const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4];</div><div class='add'>+extern const unsigned int KiaraRomTable[8][2][16][8];</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-misc.c b/drivers/media/video/pwc/pwc-misc.c<br/>index 58fe79747992..589c687439da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-misc.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='ctx'>    Various miscellaneous functions and tables.</div><div class='ctx'>    (C) 1999-2003 Nemosoft Unv.</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -24,18 +24,17 @@</div><div class='ctx'>    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pwc.h"</div><div class='ctx'> </div><div class='del'>-struct pwc_coord pwc_image_sizes[PSZ_MAX] =</div><div class='add'>+const struct pwc_coord pwc_image_sizes[PSZ_MAX] =</div><div class='ctx'> {</div><div class='del'>-	{ 128,  96, 0 },</div><div class='del'>-	{ 160, 120, 0 },</div><div class='del'>-	{ 176, 144, 0 },</div><div class='del'>-	{ 320, 240, 0 },</div><div class='del'>-	{ 352, 288, 0 },</div><div class='del'>-	{ 640, 480, 0 },</div><div class='add'>+	{ 128,  96, 0 }, /* sqcif */</div><div class='add'>+	{ 160, 120, 0 }, /* qsif */</div><div class='add'>+	{ 176, 144, 0 }, /* qcif */</div><div class='add'>+	{ 320, 240, 0 }, /* sif */</div><div class='add'>+	{ 352, 288, 0 }, /* cif */</div><div class='add'>+	{ 640, 480, 0 }, /* vga */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* x,y -&gt; PSZ_ */</div><div class='hunk'>@@ -52,7 +51,7 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (width &gt; pdev-&gt;abs_max.x || height &gt; pdev-&gt;abs_max.y)</div><div class='ctx'> 		{</div><div class='del'>-			Debug("VIDEO_PALETTE_RAW: going beyond abs_max.\n");</div><div class='add'>+			PWC_DEBUG_SIZE("VIDEO_PALETTE_RAW: going beyond abs_max.\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -60,7 +59,7 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)</div><div class='ctx'> 	{</div><div class='ctx'> 		if (width &gt; pdev-&gt;view_max.x || height &gt; pdev-&gt;view_max.y)</div><div class='ctx'> 		{</div><div class='del'>-			Debug("VIDEO_PALETTE_ not RAW: going beyond view_max.\n");</div><div class='add'>+			PWC_DEBUG_SIZE("VIDEO_PALETTE_not RAW: going beyond view_max.\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -81,9 +80,8 @@ int pwc_decode_size(struct pwc_device *pdev, int width, int height)</div><div class='ctx'> /* initialize variables depending on type and decompressor*/</div><div class='ctx'> void pwc_construct(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	switch(pdev-&gt;type) {</div><div class='del'>-	case 645:</div><div class='del'>-	case 646:</div><div class='add'>+	if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='add'>+</div><div class='ctx'> 		pdev-&gt;view_min.x = 128;</div><div class='ctx'> 		pdev-&gt;view_min.y =  96;</div><div class='ctx'> 		pdev-&gt;view_max.x = 352;</div><div class='hunk'>@@ -95,10 +93,23 @@ void pwc_construct(struct pwc_device *pdev)</div><div class='ctx'> 		pdev-&gt;vendpoint = 4;</div><div class='ctx'> 		pdev-&gt;frame_header_size = 0;</div><div class='ctx'> 		pdev-&gt;frame_trailer_size = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 675:</div><div class='del'>-	case 680:</div><div class='del'>-	case 690:</div><div class='add'>+</div><div class='add'>+	} else if (DEVICE_USE_CODEC3(pdev-&gt;type)) {</div><div class='add'>+</div><div class='add'>+		pdev-&gt;view_min.x = 160;</div><div class='add'>+		pdev-&gt;view_min.y = 120;</div><div class='add'>+		pdev-&gt;view_max.x = 640;</div><div class='add'>+		pdev-&gt;view_max.y = 480;</div><div class='add'>+		pdev-&gt;image_mask = 1 &lt;&lt; PSZ_QSIF | 1 &lt;&lt; PSZ_SIF | 1 &lt;&lt; PSZ_VGA;</div><div class='add'>+		pdev-&gt;abs_max.x = 640;</div><div class='add'>+		pdev-&gt;abs_max.y = 480;</div><div class='add'>+		pdev-&gt;vcinterface = 3;</div><div class='add'>+		pdev-&gt;vendpoint = 5;</div><div class='add'>+		pdev-&gt;frame_header_size = TOUCAM_HEADER_SIZE;</div><div class='add'>+		pdev-&gt;frame_trailer_size = TOUCAM_TRAILER_SIZE;</div><div class='add'>+</div><div class='add'>+	} else /* if (DEVICE_USE_CODEC2(pdev-&gt;type)) */ {</div><div class='add'>+</div><div class='ctx'> 		pdev-&gt;view_min.x = 128;</div><div class='ctx'> 		pdev-&gt;view_min.y =  96;</div><div class='ctx'> 		/* Anthill bug #38: PWC always reports max size, even without PWCX */</div><div class='hunk'>@@ -111,30 +122,12 @@ void pwc_construct(struct pwc_device *pdev)</div><div class='ctx'> 		pdev-&gt;vendpoint = 4;</div><div class='ctx'> 		pdev-&gt;frame_header_size = 0;</div><div class='ctx'> 		pdev-&gt;frame_trailer_size = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 720:</div><div class='del'>-	case 730:</div><div class='del'>-	case 740:</div><div class='del'>-	case 750:</div><div class='del'>-		pdev-&gt;view_min.x = 160;</div><div class='del'>-		pdev-&gt;view_min.y = 120;</div><div class='del'>-		pdev-&gt;view_max.x = 640;</div><div class='del'>-		pdev-&gt;view_max.y = 480;</div><div class='del'>-		pdev-&gt;image_mask = 1 &lt;&lt; PSZ_QSIF | 1 &lt;&lt; PSZ_SIF | 1 &lt;&lt; PSZ_VGA;</div><div class='del'>-		pdev-&gt;abs_max.x = 640;</div><div class='del'>-		pdev-&gt;abs_max.y = 480;</div><div class='del'>-		pdev-&gt;vcinterface = 3;</div><div class='del'>-		pdev-&gt;vendpoint = 5;</div><div class='del'>-		pdev-&gt;frame_header_size = TOUCAM_HEADER_SIZE;</div><div class='del'>-		pdev-&gt;frame_trailer_size = TOUCAM_TRAILER_SIZE;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='del'>-	Debug("type = %d\n",pdev-&gt;type);</div><div class='ctx'> 	pdev-&gt;vpalette = VIDEO_PALETTE_YUV420P; /* default */</div><div class='ctx'> 	pdev-&gt;view_min.size = pdev-&gt;view_min.x * pdev-&gt;view_min.y;</div><div class='ctx'> 	pdev-&gt;view_max.size = pdev-&gt;view_max.x * pdev-&gt;view_max.y;</div><div class='ctx'> 	/* length of image, in YUV format; always allocate enough memory. */</div><div class='del'>-	pdev-&gt;len_per_image = (pdev-&gt;abs_max.x * pdev-&gt;abs_max.y * 3) / 2;</div><div class='add'>+	pdev-&gt;len_per_image = PAGE_ALIGN((pdev-&gt;abs_max.x * pdev-&gt;abs_max.y * 3) / 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-timon.c b/drivers/media/video/pwc/pwc-timon.c<br/>index 175250d089cf..be65bdcd195b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-timon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-timon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-timon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-timon.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -314,3 +314,1133 @@ const struct Timon_table_entry Timon_table[PSZ_MAX][6][4] =</div><div class='ctx'>    },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * 16 versions:</div><div class='add'>+ *   2 tables  (one for Y, and one for U&amp;V)</div><div class='add'>+ *   16 levels of details per tables</div><div class='add'>+ *   8 blocs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+const unsigned int TimonRomTable [16][2][16][8] =</div><div class='add'>+{</div><div class='add'>+ { /* version 0 */</div><div class='add'>+  { /* version 0, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000001,0x00000001,</div><div class='add'>+    0x00000001,0x00000001,0x00000001,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000001,0x00000001,</div><div class='add'>+    0x00000001,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000001,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 0, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000001,0x00000001,</div><div class='add'>+    0x00000001,0x00000001,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000001,</div><div class='add'>+    0x00000001,0x00000009,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000009,</div><div class='add'>+    0x00000009,0x00000049,0x00000001,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000009,</div><div class='add'>+    0x00000009,0x00000049,0x00000001,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 1 */</div><div class='add'>+  { /* version 1, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000001,0x00000001,</div><div class='add'>+    0x00000001,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 1, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000001,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000009,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000001,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x00000009,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00000049,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009252,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 2 */</div><div class='add'>+  { /* version 2, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000009,0x00000009,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009252,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00009252,</div><div class='add'>+    0x00009492,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 2, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000009,</div><div class='add'>+    0x00000049,0x00000009,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000249,0x00000049,0x0000024a,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009292,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 3 */</div><div class='add'>+  { /* version 3, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00009292,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00009252,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009292,0x0000a49b,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x0001b725,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 3, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000001,0x00000000},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x00000049,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00000001},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009252,0x00009292,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009292,</div><div class='add'>+    0x0000a493,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 4 */</div><div class='add'>+  { /* version 4, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x00009252,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x00009493,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000124db,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 4, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x0000a49b,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 5 */</div><div class='add'>+  { /* version 5, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x0000124a,0x00001252,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009292,0x00009292,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000126dc,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 5, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x000124db,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x00009493,0x000124db,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x000124db,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000124db,</div><div class='add'>+    0x000126dc,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 6 */</div><div class='add'>+  { /* version 6, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000136e4,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x0001b725,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001b925,0x00025bb6,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 6, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x0000a49b,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000126dc,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000136e4,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 7 */</div><div class='add'>+  { /* version 7, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b725,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001c96e,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001c96e,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x0002496d,0x00025bb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 7, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000136e4,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000136e4,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x000136e4,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000126db,</div><div class='add'>+    0x0001b724,0x0001b925,0x0001b725,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 8 */</div><div class='add'>+  { /* version 8, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009292,0x00009493,0x0000a49b,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b725,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x00024b76,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001b925,0x00024b76,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001c92d,0x00024b76,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000136db,</div><div class='add'>+    0x0001b724,0x00024b6d,0x0002ddb6,0x0002efff},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 8, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000126dc,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b725,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x0002496d,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 9 */</div><div class='add'>+  { /* version 9, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000049,0x00000049,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x0000124a,0x00009252,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x00009493,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 9, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000049,</div><div class='add'>+    0x00000009,0x00000009,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000049,0x00000049,0x00000009,0x00000009},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00000249,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009252,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x00009252,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009493,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000124db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 10 */</div><div class='add'>+  { /* version 10, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x00009493,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x000124db,0x000124db,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000126dc,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x0000a49b,</div><div class='add'>+    0x000124db,0x000136e4,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b925,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x000136e4,0x0002496d,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 10, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000049,0x00000049,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00000249,0x00000049,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x00009252,0x0000024a,0x00000049},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009493,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009252,</div><div class='add'>+    0x00009492,0x00009493,0x00001252,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x00009493,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x00009492,0x00009493,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009493,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009252,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 11 */</div><div class='add'>+  { /* version 11, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00000249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009492,0x0000a49b,0x0000a49b,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001c96e,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001c924,0x0002496d,0x00025bb6,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 11, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00000249,</div><div class='add'>+    0x00000249,0x00000249,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009252,0x00009252,0x0000024a,0x0000024a},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000124db,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000126dc,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 12 */</div><div class='add'>+  { /* version 12, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000126db,</div><div class='add'>+    0x0001c924,0x00024b6d,0x0002ddb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 12, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009292,</div><div class='add'>+    0x00009492,0x00009252,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000124db,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000124db,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000126dc,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x000136e4,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000126db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 13 */</div><div class='add'>+  { /* version 13, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x00009252,0x00009292,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b725,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x0000a49b,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001c96e,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b924,0x0001c92d,0x00024b76,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000136db,</div><div class='add'>+    0x00024924,0x00024b6d,0x0002ddb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 13, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x00009492,0x00009292,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0000a49b,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000124db,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000136db,</div><div class='add'>+    0x0001b724,0x000124db,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000136db,</div><div class='add'>+    0x0001b724,0x000126dc,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000136db,</div><div class='add'>+    0x0001b724,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001b724,0x000126dc,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x0001b6db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 14 */</div><div class='add'>+  { /* version 14, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000924a,</div><div class='add'>+    0x00009292,0x00009493,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x000126dc,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x000136e4,0x0001b725,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b92d,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001c92d,0x0001c96e,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x00024b76,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b924,0x0002496d,0x00024b76,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b924,0x00024b6d,0x0002ddb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x0001b6db,</div><div class='add'>+    0x00024924,0x0002db6d,0x00036db6,0x0002efff},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 14, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00001249,</div><div class='add'>+    0x0000124a,0x0000124a,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x00009493,</div><div class='add'>+    0x0000a493,0x00009292,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x0000a49b,0x00001252,0x00001252},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000136e4,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000136e4,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x000136e4,0x00009493,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x0000a49b,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000124db,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b724,0x000136e4,0x000126dc,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x0001b6db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000136e4,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ },</div><div class='add'>+ { /* version 15 */</div><div class='add'>+  { /* version 15, passes 0 */</div><div class='add'>+   {0x00000000,0x00000000,0x00001249,0x00009493,</div><div class='add'>+    0x0000a493,0x0000a49b,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0001249b,0x000126dc,0x000136e4,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x000126dc,0x0001b724,0x0001b725,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0001b92d,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b925,0x0001c96e,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000124db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b724,0x0001c92d,0x0001c96e,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000126db,</div><div class='add'>+    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001b924,0x0002496d,0x00024b76,0x0002496e},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0002496d,0x00025bb6,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x00024b6d,0x00025bb6,0x00024b77},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000136db,</div><div class='add'>+    0x0001c924,0x00024b6d,0x0002ddb6,0x00025bbf},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x0001b6db,</div><div class='add'>+    0x00024924,0x0002db6d,0x00036db6,0x0002efff},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  },</div><div class='add'>+  { /* version 15, passes 1 */</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000924a,</div><div class='add'>+    0x00009292,0x00009292,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x0000a49b,</div><div class='add'>+    0x0000a493,0x000124db,0x00009292,0x00009292},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000124db,0x0001b724,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000126dc,0x0001b724,0x00009493,0x00009493},</div><div class='add'>+   {0x00000000,0x00000000,0x0000924a,0x000124db,</div><div class='add'>+    0x000136e4,0x0001b724,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009292,0x000136db,</div><div class='add'>+    0x0001b724,0x0001b724,0x0000a49b,0x0000a49b},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x00009492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000124db,0x000124db},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b724,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b925,0x000126dc,0x000126dc},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b925,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b925,0x000136e4,0x000136e4},</div><div class='add'>+   {0x00000000,0x00000000,0x0000a492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b925,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x000136db,</div><div class='add'>+    0x0001c924,0x0001b925,0x0001b725,0x0001b724},</div><div class='add'>+   {0x00000000,0x00000000,0x00012492,0x0001b6db,</div><div class='add'>+    0x00024924,0x0002496d,0x0001b92d,0x0001b925},</div><div class='add'>+   {0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='add'>+    0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='add'>+  }</div><div class='add'>+ }</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-timon.h b/drivers/media/video/pwc/pwc-timon.h<br/>index a86b3782a081..eef9e2cd4320 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-timon.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-timon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-timon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-timon.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> #ifndef PWC_TIMON_H</div><div class='ctx'> #define PWC_TIMON_H</div><div class='ctx'> </div><div class='del'>-#include "pwc-ioctl.h"</div><div class='add'>+#include &lt;media/pwc-ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct Timon_table_entry</div><div class='ctx'> {</div><div class='hunk'>@@ -52,8 +52,8 @@ struct Timon_table_entry</div><div class='ctx'> 	unsigned char mode[13];		/* precomputed mode settings for cam */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const extern struct Timon_table_entry Timon_table[PSZ_MAX][6][4];</div><div class='del'>-const extern unsigned int TimonRomTable [16][2][16][8];</div><div class='add'>+extern const struct Timon_table_entry Timon_table[PSZ_MAX][6][4];</div><div class='add'>+extern const unsigned int TimonRomTable [16][2][16][8];</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-uncompress.c b/drivers/media/video/pwc/pwc-uncompress.c<br/>index b37a89a163f9..5d82028ef942 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-uncompress.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-uncompress.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-uncompress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-uncompress.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* Linux driver for Philips webcam</div><div class='ctx'>    Decompression frontend.</div><div class='ctx'>    (C) 1999-2003 Nemosoft Unv.</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -22,6 +22,8 @@</div><div class='ctx'>    You should have received a copy of the GNU General Public License</div><div class='ctx'>    along with this program; if not, write to the Free Software</div><div class='ctx'>    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+</div><div class='add'>+   vim: set ts=8:</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/current.h&gt;</div><div class='hunk'>@@ -29,6 +31,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "pwc.h"</div><div class='ctx'> #include "pwc-uncompress.h"</div><div class='add'>+#include "pwc-dec1.h"</div><div class='add'>+#include "pwc-dec23.h"</div><div class='ctx'> </div><div class='ctx'> int pwc_decompress(struct pwc_device *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,107 +44,95 @@ int pwc_decompress(struct pwc_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-#if defined(__KERNEL__) &amp;&amp; defined(PWC_MAGIC)</div><div class='del'>-	if (pdev-&gt;magic != PWC_MAGIC) {</div><div class='del'>-		Err("pwc_decompress(): magic failed.\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	fbuf = pdev-&gt;read_frame;</div><div class='ctx'> 	if (fbuf == NULL)</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	image = pdev-&gt;image_ptr[pdev-&gt;fill_image];</div><div class='del'>-	if (!image)</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	image  = pdev-&gt;image_data;</div><div class='add'>+	image += pdev-&gt;images[pdev-&gt;fill_image].offset;</div><div class='ctx'> </div><div class='ctx'> 	yuv = fbuf-&gt;data + pdev-&gt;frame_header_size;  /* Skip header */</div><div class='ctx'> </div><div class='ctx'> 	/* Raw format; that's easy... */</div><div class='ctx'> 	if (pdev-&gt;vpalette == VIDEO_PALETTE_RAW)</div><div class='ctx'> 	{</div><div class='del'>-		memcpy(image, yuv, pdev-&gt;frame_size);</div><div class='add'>+		struct pwc_raw_frame *raw_frame = image;</div><div class='add'>+		raw_frame-&gt;type = cpu_to_le16(pdev-&gt;type);</div><div class='add'>+		raw_frame-&gt;vbandlength = cpu_to_le16(pdev-&gt;vbandlength);</div><div class='add'>+			/* cmd_buf is always 4 bytes, but sometimes, only the</div><div class='add'>+			 * first 3 bytes is filled (Nala case). We can</div><div class='add'>+			 * determine this using the type of the webcam */</div><div class='add'>+		memcpy(raw_frame-&gt;cmd, pdev-&gt;cmd_buf, 4);</div><div class='add'>+		memcpy(raw_frame+1, yuv, pdev-&gt;frame_size);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;vbandlength == 0) {</div><div class='del'>-		/* Uncompressed mode. We copy the data into the output buffer,</div><div class='del'>-		   using the viewport size (which may be larger than the image</div><div class='del'>-		   size). Unfortunately we have to do a bit of byte stuffing</div><div class='del'>-		   to get the desired output format/size.</div><div class='add'>+		/* Uncompressed mode.</div><div class='add'>+		 * We copy the data into the output buffer, using the viewport</div><div class='add'>+		 * size (which may be larger than the image size).</div><div class='add'>+		 * Unfortunately we have to do a bit of byte stuffing to get</div><div class='add'>+		 * the desired output format/size.</div><div class='add'>+		 *</div><div class='add'>+		 * We do some byte shuffling here to go from the</div><div class='add'>+		 * native format to YUV420P.</div><div class='ctx'> 		 */</div><div class='del'>-			/*</div><div class='del'>-			 * We do some byte shuffling here to go from the</div><div class='del'>-			 * native format to YUV420P.</div><div class='del'>-			 */</div><div class='del'>-			src = (u16 *)yuv;</div><div class='del'>-			n = pdev-&gt;view.x * pdev-&gt;view.y;</div><div class='del'>-</div><div class='del'>-			/* offset in Y plane */</div><div class='del'>-			stride = pdev-&gt;view.x * pdev-&gt;offset.y + pdev-&gt;offset.x;</div><div class='del'>-			dsty = (u16 *)(image + stride);</div><div class='del'>-</div><div class='del'>-			/* offsets in U/V planes */</div><div class='del'>-			stride = pdev-&gt;view.x * pdev-&gt;offset.y / 4 + pdev-&gt;offset.x / 2;</div><div class='del'>-			dstu = (u16 *)(image + n +         stride);</div><div class='del'>-			dstv = (u16 *)(image + n + n / 4 + stride);</div><div class='del'>-</div><div class='del'>-			/* increment after each line */</div><div class='del'>-			stride = (pdev-&gt;view.x - pdev-&gt;image.x) / 2; /* u16 is 2 bytes */</div><div class='del'>-</div><div class='del'>-			for (line = 0; line &lt; pdev-&gt;image.y; line++) {</div><div class='del'>-				for (col = 0; col &lt; pdev-&gt;image.x; col += 4) {</div><div class='del'>-					*dsty++ = *src++;</div><div class='del'>-					*dsty++ = *src++;</div><div class='del'>-					if (line &amp; 1)</div><div class='del'>-						*dstv++ = *src++;</div><div class='del'>-					else</div><div class='del'>-						*dstu++ = *src++;</div><div class='del'>-				}</div><div class='del'>-				dsty += stride;</div><div class='add'>+		src = (u16 *)yuv;</div><div class='add'>+		n = pdev-&gt;view.x * pdev-&gt;view.y;</div><div class='add'>+</div><div class='add'>+		/* offset in Y plane */</div><div class='add'>+		stride = pdev-&gt;view.x * pdev-&gt;offset.y + pdev-&gt;offset.x;</div><div class='add'>+		dsty = (u16 *)(image + stride);</div><div class='add'>+</div><div class='add'>+		/* offsets in U/V planes */</div><div class='add'>+		stride = pdev-&gt;view.x * pdev-&gt;offset.y / 4 + pdev-&gt;offset.x / 2;</div><div class='add'>+		dstu = (u16 *)(image + n +         stride);</div><div class='add'>+		dstv = (u16 *)(image + n + n / 4 + stride);</div><div class='add'>+</div><div class='add'>+		/* increment after each line */</div><div class='add'>+		stride = (pdev-&gt;view.x - pdev-&gt;image.x) / 2; /* u16 is 2 bytes */</div><div class='add'>+</div><div class='add'>+		for (line = 0; line &lt; pdev-&gt;image.y; line++) {</div><div class='add'>+			for (col = 0; col &lt; pdev-&gt;image.x; col += 4) {</div><div class='add'>+				*dsty++ = *src++;</div><div class='add'>+				*dsty++ = *src++;</div><div class='ctx'> 				if (line &amp; 1)</div><div class='del'>-					dstv += (stride &gt;&gt; 1);</div><div class='add'>+					*dstv++ = *src++;</div><div class='ctx'> 				else</div><div class='del'>-					dstu += (stride &gt;&gt; 1);</div><div class='add'>+					*dstu++ = *src++;</div><div class='ctx'> 			}</div><div class='add'>+			dsty += stride;</div><div class='add'>+			if (line &amp; 1)</div><div class='add'>+				dstv += (stride &gt;&gt; 1);</div><div class='add'>+			else</div><div class='add'>+				dstu += (stride &gt;&gt; 1);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	else {</div><div class='del'>-		/* Compressed; the decompressor routines will write the data</div><div class='del'>-		   in planar format immediately.</div><div class='del'>-		 */</div><div class='del'>-		int flags;</div><div class='del'>-</div><div class='del'>-		flags = PWCX_FLAG_PLANAR;</div><div class='del'>-		if (pdev-&gt;vsize == PSZ_VGA &amp;&amp; pdev-&gt;vframes == 5 &amp;&amp; pdev-&gt;vsnapshot)</div><div class='del'>-		 {</div><div class='del'>-		   printk(KERN_ERR "pwc: Mode Bayer is not supported for now\n");</div><div class='del'>-		   flags |= PWCX_FLAG_BAYER;</div><div class='del'>-		   return -ENXIO; /* No such device or address: missing decompressor */</div><div class='del'>-		 }</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		switch (pdev-&gt;type)</div><div class='del'>-		 {</div><div class='del'>-		  case 675:</div><div class='del'>-		  case 680:</div><div class='del'>-		  case 690:</div><div class='del'>-		  case 720:</div><div class='del'>-		  case 730:</div><div class='del'>-		  case 740:</div><div class='del'>-		  case 750:</div><div class='del'>-		    pwc_dec23_decompress(&amp;pdev-&gt;image, &amp;pdev-&gt;view,</div><div class='del'>-				&amp;pdev-&gt;offset, yuv, image, flags,</div><div class='del'>-				pdev-&gt;decompress_data, pdev-&gt;vbandlength);</div><div class='del'>-		    break;</div><div class='del'>-		  case 645:</div><div class='del'>-		  case 646:</div><div class='del'>-		    /* TODO &amp; FIXME */</div><div class='del'>-		    return -ENXIO; /* Missing decompressor */</div><div class='del'>-		    break;</div><div class='del'>-		 }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compressed;</div><div class='add'>+	 * the decompressor routines will write the data in planar format</div><div class='add'>+	 * immediately.</div><div class='add'>+	 */</div><div class='add'>+	if (pdev-&gt;vsize == PSZ_VGA &amp;&amp; pdev-&gt;vframes == 5 &amp;&amp; pdev-&gt;vsnapshot) {</div><div class='add'>+		PWC_ERROR("Mode Bayer is not supported for now\n");</div><div class='add'>+		/* flags |= PWCX_FLAG_BAYER; */</div><div class='add'>+		return -ENXIO; /* No such device or address: missing decompressor */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='add'>+</div><div class='add'>+		/* TODO &amp; FIXME */</div><div class='add'>+		PWC_ERROR("This chipset is not supported for now\n");</div><div class='add'>+		return -ENXIO; /* No such device or address: missing decompressor */</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		pwc_dec23_decompress(pdev, yuv, image, PWCX_FLAG_PLANAR);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-uncompress.h b/drivers/media/video/pwc/pwc-uncompress.h<br/>index f75e1b6cbe19..43028e74e9e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-uncompress.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc-uncompress.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-uncompress.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-uncompress.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* (C) 1999-2003 Nemosoft Unv.</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -30,9 +30,8 @@</div><div class='ctx'> #ifndef PWC_UNCOMPRESS_H</div><div class='ctx'> #define PWC_UNCOMPRESS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "pwc-ioctl.h"</div><div class='add'>+#include &lt;media/pwc-ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* from pwc-dec.h */</div><div class='ctx'> #define PWCX_FLAG_PLANAR        0x0001</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c<br/>new file mode 100644<br/>index 000000000000..b7eb3ce3b968<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc-v4l.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc-v4l.c</a></div><div class='hunk'>@@ -0,0 +1,1202 @@</div><div class='add'>+/* Linux driver for Philips webcam</div><div class='add'>+   USB and Video4Linux interface part.</div><div class='add'>+   (C) 1999-2004 Nemosoft Unv.</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='add'>+</div><div class='add'>+   NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='add'>+   driver and thus may have bugs that are not present in the original version.</div><div class='add'>+   Please send bug reports and support requests to &lt;luc@saillard.org&gt;.</div><div class='add'>+   The decompression routines have been implemented by reverse-engineering the</div><div class='add'>+   Nemosoft binary pwcx module. Caveat emptor.</div><div class='add'>+</div><div class='add'>+   This program is free software; you can redistribute it and/or modify</div><div class='add'>+   it under the terms of the GNU General Public License as published by</div><div class='add'>+   the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+   (at your option) any later version.</div><div class='add'>+</div><div class='add'>+   This program is distributed in the hope that it will be useful,</div><div class='add'>+   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+   GNU General Public License for more details.</div><div class='add'>+</div><div class='add'>+   You should have received a copy of the GNU General Public License</div><div class='add'>+   along with this program; if not, write to the Free Software</div><div class='add'>+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pwc.h"</div><div class='add'>+</div><div class='add'>+static struct v4l2_queryctrl pwc_controls[] = {</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_BRIGHTNESS,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Brightness",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 128,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 64,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_CONTRAST,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Contrast",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 64,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_SATURATION,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Saturation",</div><div class='add'>+	    .minimum = -100,</div><div class='add'>+	    .maximum = 100,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_GAMMA,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Gamma",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 32,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_RED_BALANCE,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Red Gain",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 256,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_BLUE_BALANCE,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Blue Gain",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 256,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_AUTO_WHITE_BALANCE,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	    .name    = "Auto White Balance",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 1,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_EXPOSURE,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Shutter Speed (Exposure)",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 256,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 200,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_AUTOGAIN,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	    .name    = "Auto Gain Enabled",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 1,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_GAIN,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Gain Level",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 256,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_SAVE_USER,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BUTTON,</div><div class='add'>+	    .name    = "Save User Settings",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 0,</div><div class='add'>+	    .step    = 0,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_RESTORE_USER,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BUTTON,</div><div class='add'>+	    .name    = "Restore User Settings",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 0,</div><div class='add'>+	    .step    = 0,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_RESTORE_FACTORY,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BUTTON,</div><div class='add'>+	    .name    = "Restore Factory Settings",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 0,</div><div class='add'>+	    .step    = 0,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_COLOUR_MODE,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	    .name    = "Colour mode",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 1,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_AUTOCONTOUR,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	    .name    = "Auto contour",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 1,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_CONTOUR,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Contour",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 63,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_BACKLIGHT,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	    .name    = "Backlight compensation",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 1,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	  .id      = V4L2_CID_PRIVATE_FLICKERLESS,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='add'>+	    .name    = "Flickerless",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 1,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+	    .id      = V4L2_CID_PRIVATE_NOISE_REDUCTION,</div><div class='add'>+	    .type    = V4L2_CTRL_TYPE_INTEGER,</div><div class='add'>+	    .name    = "Noise reduction",</div><div class='add'>+	    .minimum = 0,</div><div class='add'>+	    .maximum = 3,</div><div class='add'>+	    .step    = 1,</div><div class='add'>+	    .default_value = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void pwc_vidioc_fill_fmt(const struct pwc_device *pdev, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;f-&gt;fmt.pix, 0, sizeof(struct v4l2_pix_format));</div><div class='add'>+	f-&gt;fmt.pix.width        = pdev-&gt;view.x;</div><div class='add'>+	f-&gt;fmt.pix.height       = pdev-&gt;view.y;</div><div class='add'>+	f-&gt;fmt.pix.field        = V4L2_FIELD_NONE;</div><div class='add'>+	if (pdev-&gt;vpalette == VIDEO_PALETTE_YUV420P) {</div><div class='add'>+		f-&gt;fmt.pix.pixelformat  = V4L2_PIX_FMT_YUV420;</div><div class='add'>+		f-&gt;fmt.pix.bytesperline = (f-&gt;fmt.pix.width * 3)/2;</div><div class='add'>+		f-&gt;fmt.pix.sizeimage = f-&gt;fmt.pix.height * f-&gt;fmt.pix.bytesperline;</div><div class='add'>+	} else {</div><div class='add'>+		/* vbandlength contains 4 lines ...  */</div><div class='add'>+		f-&gt;fmt.pix.bytesperline = pdev-&gt;vbandlength/4;</div><div class='add'>+		f-&gt;fmt.pix.sizeimage = pdev-&gt;frame_size + sizeof(struct pwc_raw_frame);</div><div class='add'>+		if (DEVICE_USE_CODEC1(pdev-&gt;type))</div><div class='add'>+			f-&gt;fmt.pix.pixelformat  = V4L2_PIX_FMT_PWC1;</div><div class='add'>+		else</div><div class='add'>+			f-&gt;fmt.pix.pixelformat  = V4L2_PIX_FMT_PWC2;</div><div class='add'>+	}</div><div class='add'>+	PWC_DEBUG_IOCTL("pwc_vidioc_fill_fmt() "</div><div class='add'>+			"width=%d, height=%d, bytesperline=%d, sizeimage=%d, pixelformat=%c%c%c%c\n",</div><div class='add'>+			f-&gt;fmt.pix.width,</div><div class='add'>+			f-&gt;fmt.pix.height,</div><div class='add'>+			f-&gt;fmt.pix.bytesperline,</div><div class='add'>+			f-&gt;fmt.pix.sizeimage,</div><div class='add'>+			(f-&gt;fmt.pix.pixelformat)&amp;255,</div><div class='add'>+			(f-&gt;fmt.pix.pixelformat&gt;&gt;8)&amp;255,</div><div class='add'>+			(f-&gt;fmt.pix.pixelformat&gt;&gt;16)&amp;255,</div><div class='add'>+			(f-&gt;fmt.pix.pixelformat&gt;&gt;24)&amp;255);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ioctl(VIDIOC_TRY_FMT) */</div><div class='add'>+static int pwc_vidioc_try_fmt(struct pwc_device *pdev, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='add'>+		PWC_DEBUG_IOCTL("Bad video type must be V4L2_BUF_TYPE_VIDEO_CAPTURE\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (f-&gt;fmt.pix.pixelformat) {</div><div class='add'>+		case V4L2_PIX_FMT_YUV420:</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_PWC1:</div><div class='add'>+			if (DEVICE_USE_CODEC23(pdev-&gt;type)) {</div><div class='add'>+				PWC_DEBUG_IOCTL("codec1 is only supported for old pwc webcam\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_PIX_FMT_PWC2:</div><div class='add'>+			if (DEVICE_USE_CODEC1(pdev-&gt;type)) {</div><div class='add'>+				PWC_DEBUG_IOCTL("codec23 is only supported for new pwc webcam\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			PWC_DEBUG_IOCTL("Unsupported pixel format\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (f-&gt;fmt.pix.width &gt; pdev-&gt;view_max.x)</div><div class='add'>+		f-&gt;fmt.pix.width = pdev-&gt;view_max.x;</div><div class='add'>+	else if (f-&gt;fmt.pix.width &lt; pdev-&gt;view_min.x)</div><div class='add'>+		f-&gt;fmt.pix.width = pdev-&gt;view_min.x;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;fmt.pix.height &gt; pdev-&gt;view_max.y)</div><div class='add'>+		f-&gt;fmt.pix.height = pdev-&gt;view_max.y;</div><div class='add'>+	else if (f-&gt;fmt.pix.height &lt; pdev-&gt;view_min.y)</div><div class='add'>+		f-&gt;fmt.pix.height = pdev-&gt;view_min.y;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ioctl(VIDIOC_SET_FMT) */</div><div class='add'>+static int pwc_vidioc_set_fmt(struct pwc_device *pdev, struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	int ret, fps, snapshot, compression, pixelformat;</div><div class='add'>+</div><div class='add'>+	ret = pwc_vidioc_try_fmt(pdev, f);</div><div class='add'>+	if (ret&lt;0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pixelformat = f-&gt;fmt.pix.pixelformat;</div><div class='add'>+	compression = pdev-&gt;vcompression;</div><div class='add'>+	snapshot = 0;</div><div class='add'>+	fps = pdev-&gt;vframes;</div><div class='add'>+	if (f-&gt;fmt.pix.priv) {</div><div class='add'>+		compression = (f-&gt;fmt.pix.priv &amp; PWC_QLT_MASK) &gt;&gt; PWC_QLT_SHIFT;</div><div class='add'>+		snapshot = !!(f-&gt;fmt.pix.priv &amp; PWC_FPS_SNAPSHOT);</div><div class='add'>+		fps = (f-&gt;fmt.pix.priv &amp; PWC_FPS_FRMASK) &gt;&gt; PWC_FPS_SHIFT;</div><div class='add'>+		if (fps == 0)</div><div class='add'>+			fps = pdev-&gt;vframes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pixelformat == V4L2_PIX_FMT_YUV420)</div><div class='add'>+		pdev-&gt;vpalette = VIDEO_PALETTE_YUV420P;</div><div class='add'>+	else</div><div class='add'>+		pdev-&gt;vpalette = VIDEO_PALETTE_RAW;</div><div class='add'>+</div><div class='add'>+	PWC_DEBUG_IOCTL("Try to change format to: width=%d height=%d fps=%d "</div><div class='add'>+			"compression=%d snapshot=%d format=%c%c%c%c\n",</div><div class='add'>+			f-&gt;fmt.pix.width, f-&gt;fmt.pix.height, fps,</div><div class='add'>+			compression, snapshot,</div><div class='add'>+			(pixelformat)&amp;255,</div><div class='add'>+			(pixelformat&gt;&gt;8)&amp;255,</div><div class='add'>+			(pixelformat&gt;&gt;16)&amp;255,</div><div class='add'>+			(pixelformat&gt;&gt;24)&amp;255);</div><div class='add'>+</div><div class='add'>+	ret = pwc_try_video_mode(pdev,</div><div class='add'>+				 f-&gt;fmt.pix.width,</div><div class='add'>+				 f-&gt;fmt.pix.height,</div><div class='add'>+				 fps,</div><div class='add'>+				 compression,</div><div class='add'>+				 snapshot);</div><div class='add'>+</div><div class='add'>+	PWC_DEBUG_IOCTL("pwc_try_video_mode(), return=%d\n", ret);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pwc_vidioc_fill_fmt(pdev, f);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pwc_video_do_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+		       unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vdev = video_devdata(file);</div><div class='add'>+	struct pwc_device *pdev;</div><div class='add'>+	DECLARE_WAITQUEUE(wait, current);</div><div class='add'>+</div><div class='add'>+	if (vdev == NULL)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	pdev = vdev-&gt;priv;</div><div class='add'>+	if (pdev == NULL)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='add'>+	if (PWC_DEBUG_LEVEL_IOCTL &amp; pwc_trace)</div><div class='add'>+		v4l_printk_ioctl(cmd);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+		/* Query cabapilities */</div><div class='add'>+		case VIDIOCGCAP:</div><div class='add'>+		{</div><div class='add'>+			struct video_capability *caps = arg;</div><div class='add'>+</div><div class='add'>+			strcpy(caps-&gt;name, vdev-&gt;name);</div><div class='add'>+			caps-&gt;type = VID_TYPE_CAPTURE;</div><div class='add'>+			caps-&gt;channels = 1;</div><div class='add'>+			caps-&gt;audios = 1;</div><div class='add'>+			caps-&gt;minwidth  = pdev-&gt;view_min.x;</div><div class='add'>+			caps-&gt;minheight = pdev-&gt;view_min.y;</div><div class='add'>+			caps-&gt;maxwidth  = pdev-&gt;view_max.x;</div><div class='add'>+			caps-&gt;maxheight = pdev-&gt;view_max.y;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Channel functions (simulate 1 channel) */</div><div class='add'>+		case VIDIOCGCHAN:</div><div class='add'>+		{</div><div class='add'>+			struct video_channel *v = arg;</div><div class='add'>+</div><div class='add'>+			if (v-&gt;channel != 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			v-&gt;flags = 0;</div><div class='add'>+			v-&gt;tuners = 0;</div><div class='add'>+			v-&gt;type = VIDEO_TYPE_CAMERA;</div><div class='add'>+			strcpy(v-&gt;name, "Webcam");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCSCHAN:</div><div class='add'>+		{</div><div class='add'>+			/* The spec says the argument is an integer, but</div><div class='add'>+			   the bttv driver uses a video_channel arg, which</div><div class='add'>+			   makes sense becasue it also has the norm flag.</div><div class='add'>+			 */</div><div class='add'>+			struct video_channel *v = arg;</div><div class='add'>+			if (v-&gt;channel != 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* Picture functions; contrast etc. */</div><div class='add'>+		case VIDIOCGPICT:</div><div class='add'>+		{</div><div class='add'>+			struct video_picture *p = arg;</div><div class='add'>+			int val;</div><div class='add'>+</div><div class='add'>+			val = pwc_get_brightness(pdev);</div><div class='add'>+			if (val &gt;= 0)</div><div class='add'>+				p-&gt;brightness = (val&lt;&lt;9);</div><div class='add'>+			else</div><div class='add'>+				p-&gt;brightness = 0xffff;</div><div class='add'>+			val = pwc_get_contrast(pdev);</div><div class='add'>+			if (val &gt;= 0)</div><div class='add'>+				p-&gt;contrast = (val&lt;&lt;10);</div><div class='add'>+			else</div><div class='add'>+				p-&gt;contrast = 0xffff;</div><div class='add'>+			/* Gamma, Whiteness, what's the difference? :) */</div><div class='add'>+			val = pwc_get_gamma(pdev);</div><div class='add'>+			if (val &gt;= 0)</div><div class='add'>+				p-&gt;whiteness = (val&lt;&lt;11);</div><div class='add'>+			else</div><div class='add'>+				p-&gt;whiteness = 0xffff;</div><div class='add'>+			if (pwc_get_saturation(pdev, &amp;val)&lt;0)</div><div class='add'>+				p-&gt;colour = 0xffff;</div><div class='add'>+			else</div><div class='add'>+				p-&gt;colour = 32768 + val * 327;</div><div class='add'>+			p-&gt;depth = 24;</div><div class='add'>+			p-&gt;palette = pdev-&gt;vpalette;</div><div class='add'>+			p-&gt;hue = 0xFFFF; /* N/A */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCSPICT:</div><div class='add'>+		{</div><div class='add'>+			struct video_picture *p = arg;</div><div class='add'>+			/*</div><div class='add'>+			 *	FIXME:	Suppose we are mid read</div><div class='add'>+				ANSWER: No problem: the firmware of the camera</div><div class='add'>+					can handle brightness/contrast/etc</div><div class='add'>+					changes at _any_ time, and the palette</div><div class='add'>+					is used exactly once in the uncompress</div><div class='add'>+					routine.</div><div class='add'>+			 */</div><div class='add'>+			pwc_set_brightness(pdev, p-&gt;brightness);</div><div class='add'>+			pwc_set_contrast(pdev, p-&gt;contrast);</div><div class='add'>+			pwc_set_gamma(pdev, p-&gt;whiteness);</div><div class='add'>+			pwc_set_saturation(pdev, (p-&gt;colour-32768)/327);</div><div class='add'>+			if (p-&gt;palette &amp;&amp; p-&gt;palette != pdev-&gt;vpalette) {</div><div class='add'>+				switch (p-&gt;palette) {</div><div class='add'>+					case VIDEO_PALETTE_YUV420P:</div><div class='add'>+					case VIDEO_PALETTE_RAW:</div><div class='add'>+						pdev-&gt;vpalette = p-&gt;palette;</div><div class='add'>+						return pwc_try_video_mode(pdev, pdev-&gt;image.x, pdev-&gt;image.y, pdev-&gt;vframes, pdev-&gt;vcompression, pdev-&gt;vsnapshot);</div><div class='add'>+						break;</div><div class='add'>+					default:</div><div class='add'>+						return -EINVAL;</div><div class='add'>+						break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Window/size parameters */</div><div class='add'>+		case VIDIOCGWIN:</div><div class='add'>+		{</div><div class='add'>+			struct video_window *vw = arg;</div><div class='add'>+</div><div class='add'>+			vw-&gt;x = 0;</div><div class='add'>+			vw-&gt;y = 0;</div><div class='add'>+			vw-&gt;width = pdev-&gt;view.x;</div><div class='add'>+			vw-&gt;height = pdev-&gt;view.y;</div><div class='add'>+			vw-&gt;chromakey = 0;</div><div class='add'>+			vw-&gt;flags = (pdev-&gt;vframes &lt;&lt; PWC_FPS_SHIFT) |</div><div class='add'>+				   (pdev-&gt;vsnapshot ? PWC_FPS_SNAPSHOT : 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCSWIN:</div><div class='add'>+		{</div><div class='add'>+			struct video_window *vw = arg;</div><div class='add'>+			int fps, snapshot, ret;</div><div class='add'>+</div><div class='add'>+			fps = (vw-&gt;flags &amp; PWC_FPS_FRMASK) &gt;&gt; PWC_FPS_SHIFT;</div><div class='add'>+			snapshot = vw-&gt;flags &amp; PWC_FPS_SNAPSHOT;</div><div class='add'>+			if (fps == 0)</div><div class='add'>+				fps = pdev-&gt;vframes;</div><div class='add'>+			if (pdev-&gt;view.x == vw-&gt;width &amp;&amp; pdev-&gt;view.y &amp;&amp; fps == pdev-&gt;vframes &amp;&amp; snapshot == pdev-&gt;vsnapshot)</div><div class='add'>+				return 0;</div><div class='add'>+			ret = pwc_try_video_mode(pdev, vw-&gt;width, vw-&gt;height, fps, pdev-&gt;vcompression, snapshot);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We don't have overlay support (yet) */</div><div class='add'>+		case VIDIOCGFBUF:</div><div class='add'>+		{</div><div class='add'>+			struct video_buffer *vb = arg;</div><div class='add'>+</div><div class='add'>+			memset(vb,0,sizeof(*vb));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* mmap() functions */</div><div class='add'>+		case VIDIOCGMBUF:</div><div class='add'>+		{</div><div class='add'>+			/* Tell the user program how much memory is needed for a mmap() */</div><div class='add'>+			struct video_mbuf *vm = arg;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			memset(vm, 0, sizeof(*vm));</div><div class='add'>+			vm-&gt;size = pwc_mbufs * pdev-&gt;len_per_image;</div><div class='add'>+			vm-&gt;frames = pwc_mbufs; /* double buffering should be enough for most applications */</div><div class='add'>+			for (i = 0; i &lt; pwc_mbufs; i++)</div><div class='add'>+				vm-&gt;offsets[i] = i * pdev-&gt;len_per_image;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCMCAPTURE:</div><div class='add'>+		{</div><div class='add'>+			/* Start capture into a given image buffer (called 'frame' in video_mmap structure) */</div><div class='add'>+			struct video_mmap *vm = arg;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_READ("VIDIOCMCAPTURE: %dx%d, frame %d, format %d\n", vm-&gt;width, vm-&gt;height, vm-&gt;frame, vm-&gt;format);</div><div class='add'>+			if (vm-&gt;frame &lt; 0 || vm-&gt;frame &gt;= pwc_mbufs)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* xawtv is nasty. It probes the available palettes</div><div class='add'>+			   by setting a very small image size and trying</div><div class='add'>+			   various palettes... The driver doesn't support</div><div class='add'>+			   such small images, so I'm working around it.</div><div class='add'>+			 */</div><div class='add'>+			if (vm-&gt;format)</div><div class='add'>+			{</div><div class='add'>+				switch (vm-&gt;format)</div><div class='add'>+				{</div><div class='add'>+					case VIDEO_PALETTE_YUV420P:</div><div class='add'>+					case VIDEO_PALETTE_RAW:</div><div class='add'>+						break;</div><div class='add'>+					default:</div><div class='add'>+						return -EINVAL;</div><div class='add'>+						break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((vm-&gt;width != pdev-&gt;view.x || vm-&gt;height != pdev-&gt;view.y) &amp;&amp;</div><div class='add'>+			    (vm-&gt;width &gt;= pdev-&gt;view_min.x &amp;&amp; vm-&gt;height &gt;= pdev-&gt;view_min.y)) {</div><div class='add'>+				int ret;</div><div class='add'>+</div><div class='add'>+				PWC_DEBUG_OPEN("VIDIOCMCAPTURE: changing size to please xawtv :-(.\n");</div><div class='add'>+				ret = pwc_try_video_mode(pdev, vm-&gt;width, vm-&gt;height, pdev-&gt;vframes, pdev-&gt;vcompression, pdev-&gt;vsnapshot);</div><div class='add'>+				if (ret)</div><div class='add'>+					return ret;</div><div class='add'>+			} /* ... size mismatch */</div><div class='add'>+</div><div class='add'>+			/* FIXME: should we lock here? */</div><div class='add'>+			if (pdev-&gt;image_used[vm-&gt;frame])</div><div class='add'>+				return -EBUSY;	/* buffer wasn't available. Bummer */</div><div class='add'>+			pdev-&gt;image_used[vm-&gt;frame] = 1;</div><div class='add'>+</div><div class='add'>+			/* Okay, we're done here. In the SYNC call we wait until a</div><div class='add'>+			   frame comes available, then expand image into the given</div><div class='add'>+			   buffer.</div><div class='add'>+			   In contrast to the CPiA cam the Philips cams deliver a</div><div class='add'>+			   constant stream, almost like a grabber card. Also,</div><div class='add'>+			   we have separate buffers for the rawdata and the image,</div><div class='add'>+			   meaning we can nearly always expand into the requested buffer.</div><div class='add'>+			 */</div><div class='add'>+			PWC_DEBUG_READ("VIDIOCMCAPTURE done.\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCSYNC:</div><div class='add'>+		{</div><div class='add'>+			/* The doc says: "Whenever a buffer is used it should</div><div class='add'>+			   call VIDIOCSYNC to free this frame up and continue."</div><div class='add'>+</div><div class='add'>+			   The only odd thing about this whole procedure is</div><div class='add'>+			   that MCAPTURE flags the buffer as "in use", and</div><div class='add'>+			   SYNC immediately unmarks it, while it isn't</div><div class='add'>+			   after SYNC that you know that the buffer actually</div><div class='add'>+			   got filled! So you better not start a CAPTURE in</div><div class='add'>+			   the same frame immediately (use double buffering).</div><div class='add'>+			   This is not a problem for this cam, since it has</div><div class='add'>+			   extra intermediate buffers, but a hardware</div><div class='add'>+			   grabber card will then overwrite the buffer</div><div class='add'>+			   you're working on.</div><div class='add'>+			 */</div><div class='add'>+			int *mbuf = arg;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_READ("VIDIOCSYNC called (%d).\n", *mbuf);</div><div class='add'>+</div><div class='add'>+			/* bounds check */</div><div class='add'>+			if (*mbuf &lt; 0 || *mbuf &gt;= pwc_mbufs)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			/* check if this buffer was requested anyway */</div><div class='add'>+			if (pdev-&gt;image_used[*mbuf] == 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Add ourselves to the frame wait-queue.</div><div class='add'>+</div><div class='add'>+			   FIXME: needs auditing for safety.</div><div class='add'>+			   QUESTION: In what respect? I think that using the</div><div class='add'>+				     frameq is safe now.</div><div class='add'>+			 */</div><div class='add'>+			add_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+			while (pdev-&gt;full_frames == NULL) {</div><div class='add'>+				/* Check for unplugged/etc. here */</div><div class='add'>+				if (pdev-&gt;error_status) {</div><div class='add'>+					remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+					set_current_state(TASK_RUNNING);</div><div class='add'>+					return -pdev-&gt;error_status;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+					set_current_state(TASK_RUNNING);</div><div class='add'>+					return -ERESTARTSYS;</div><div class='add'>+				}</div><div class='add'>+				schedule();</div><div class='add'>+				set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+			}</div><div class='add'>+			remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+			set_current_state(TASK_RUNNING);</div><div class='add'>+</div><div class='add'>+			/* The frame is ready. Expand in the image buffer</div><div class='add'>+			   requested by the user. I don't care if you</div><div class='add'>+			   mmap() 5 buffers and request data in this order:</div><div class='add'>+			   buffer 4 2 3 0 1 2 3 0 4 3 1 . . .</div><div class='add'>+			   Grabber hardware may not be so forgiving.</div><div class='add'>+			 */</div><div class='add'>+			PWC_DEBUG_READ("VIDIOCSYNC: frame ready.\n");</div><div class='add'>+			pdev-&gt;fill_image = *mbuf; /* tell in which buffer we want the image to be expanded */</div><div class='add'>+			/* Decompress, etc */</div><div class='add'>+			ret = pwc_handle_frame(pdev);</div><div class='add'>+			pdev-&gt;image_used[*mbuf] = 0;</div><div class='add'>+			if (ret)</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCGAUDIO:</div><div class='add'>+		{</div><div class='add'>+			struct video_audio *v = arg;</div><div class='add'>+</div><div class='add'>+			strcpy(v-&gt;name, "Microphone");</div><div class='add'>+			v-&gt;audio = -1; /* unknown audio minor */</div><div class='add'>+			v-&gt;flags = 0;</div><div class='add'>+			v-&gt;mode = VIDEO_SOUND_MONO;</div><div class='add'>+			v-&gt;volume = 0;</div><div class='add'>+			v-&gt;bass = 0;</div><div class='add'>+			v-&gt;treble = 0;</div><div class='add'>+			v-&gt;balance = 0x8000;</div><div class='add'>+			v-&gt;step = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCSAUDIO:</div><div class='add'>+		{</div><div class='add'>+			/* Dummy: nothing can be set */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOCGUNIT:</div><div class='add'>+		{</div><div class='add'>+			struct video_unit *vu = arg;</div><div class='add'>+</div><div class='add'>+			vu-&gt;video = pdev-&gt;vdev-&gt;minor &amp; 0x3F;</div><div class='add'>+			vu-&gt;audio = -1; /* not known yet */</div><div class='add'>+			vu-&gt;vbi = -1;</div><div class='add'>+			vu-&gt;radio = -1;</div><div class='add'>+			vu-&gt;teletext = -1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* V4L2 Layer */</div><div class='add'>+		case VIDIOC_QUERYCAP:</div><div class='add'>+		{</div><div class='add'>+		    struct v4l2_capability *cap = arg;</div><div class='add'>+</div><div class='add'>+		    PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\</div><div class='add'>+				       "try to use the v4l2 layer\n");</div><div class='add'>+		    strcpy(cap-&gt;driver,PWC_NAME);</div><div class='add'>+		    strlcpy(cap-&gt;card, vdev-&gt;name, sizeof(cap-&gt;card));</div><div class='add'>+		    usb_make_path(pdev-&gt;udev,cap-&gt;bus_info,sizeof(cap-&gt;bus_info));</div><div class='add'>+		    cap-&gt;version = PWC_VERSION_CODE;</div><div class='add'>+		    cap-&gt;capabilities =</div><div class='add'>+			V4L2_CAP_VIDEO_CAPTURE	|</div><div class='add'>+			V4L2_CAP_STREAMING	|</div><div class='add'>+			V4L2_CAP_READWRITE;</div><div class='add'>+		    return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_ENUMINPUT:</div><div class='add'>+		{</div><div class='add'>+		    struct v4l2_input *i = arg;</div><div class='add'>+</div><div class='add'>+		    if ( i-&gt;index )	/* Only one INPUT is supported */</div><div class='add'>+			  return -EINVAL;</div><div class='add'>+</div><div class='add'>+		    memset(i, 0, sizeof(struct v4l2_input));</div><div class='add'>+		    strcpy(i-&gt;name, "usb");</div><div class='add'>+		    return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_G_INPUT:</div><div class='add'>+		{</div><div class='add'>+		    int *i = arg;</div><div class='add'>+		    *i = 0;	/* Only one INPUT is supported */</div><div class='add'>+		    return 0;</div><div class='add'>+		}</div><div class='add'>+		case VIDIOC_S_INPUT:</div><div class='add'>+		{</div><div class='add'>+			int *i = arg;</div><div class='add'>+</div><div class='add'>+			if ( *i ) {	/* Only one INPUT is supported */</div><div class='add'>+				PWC_DEBUG_IOCTL("Only one input source is"\</div><div class='add'>+					" supported with this webcam.\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* TODO: */</div><div class='add'>+		case VIDIOC_QUERYCTRL:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_queryctrl *c = arg;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) query id=%d\n", c-&gt;id);</div><div class='add'>+			for (i=0; i&lt;sizeof(pwc_controls)/sizeof(struct v4l2_queryctrl); i++) {</div><div class='add'>+				if (pwc_controls[i].id == c-&gt;id) {</div><div class='add'>+					PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) found\n");</div><div class='add'>+					memcpy(c,&amp;pwc_controls[i],sizeof(struct v4l2_queryctrl));</div><div class='add'>+					return 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCTRL) not found\n");</div><div class='add'>+</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		case VIDIOC_G_CTRL:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_control *c = arg;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			switch (c-&gt;id)</div><div class='add'>+			{</div><div class='add'>+				case V4L2_CID_BRIGHTNESS:</div><div class='add'>+					c-&gt;value = pwc_get_brightness(pdev);</div><div class='add'>+					if (c-&gt;value&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_CONTRAST:</div><div class='add'>+					c-&gt;value = pwc_get_contrast(pdev);</div><div class='add'>+					if (c-&gt;value&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_SATURATION:</div><div class='add'>+					ret = pwc_get_saturation(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_GAMMA:</div><div class='add'>+					c-&gt;value = pwc_get_gamma(pdev);</div><div class='add'>+					if (c-&gt;value&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_RED_BALANCE:</div><div class='add'>+					ret = pwc_get_red_gain(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value &gt;&gt;= 8;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_BLUE_BALANCE:</div><div class='add'>+					ret = pwc_get_blue_gain(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value &gt;&gt;= 8;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_AUTO_WHITE_BALANCE:</div><div class='add'>+					ret = pwc_get_awb(pdev);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value = (ret == PWC_WB_MANUAL)?0:1;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_GAIN:</div><div class='add'>+					ret = pwc_get_agc(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value &gt;&gt;= 8;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_AUTOGAIN:</div><div class='add'>+					ret = pwc_get_agc(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value = (c-&gt;value &lt; 0)?1:0;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_EXPOSURE:</div><div class='add'>+					ret = pwc_get_shutter_speed(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_COLOUR_MODE:</div><div class='add'>+					ret = pwc_get_colour_mode(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_AUTOCONTOUR:</div><div class='add'>+					ret = pwc_get_contour(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value=(c-&gt;value == -1?1:0);</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_CONTOUR:</div><div class='add'>+					ret = pwc_get_contour(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value &gt;&gt;= 10;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_BACKLIGHT:</div><div class='add'>+					ret = pwc_get_backlight(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_FLICKERLESS:</div><div class='add'>+					ret = pwc_get_flicker(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					c-&gt;value=(c-&gt;value?1:0);</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_NOISE_REDUCTION:</div><div class='add'>+					ret = pwc_get_dynamic_noise(pdev, &amp;c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+</div><div class='add'>+				case V4L2_CID_PRIVATE_SAVE_USER:</div><div class='add'>+				case V4L2_CID_PRIVATE_RESTORE_USER:</div><div class='add'>+				case V4L2_CID_PRIVATE_RESTORE_FACTORY:</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		case VIDIOC_S_CTRL:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_control *c = arg;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			switch (c-&gt;id)</div><div class='add'>+			{</div><div class='add'>+				case V4L2_CID_BRIGHTNESS:</div><div class='add'>+					c-&gt;value &lt;&lt;= 9;</div><div class='add'>+					ret = pwc_set_brightness(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_CONTRAST:</div><div class='add'>+					c-&gt;value &lt;&lt;= 10;</div><div class='add'>+					ret = pwc_set_contrast(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_SATURATION:</div><div class='add'>+					ret = pwc_set_saturation(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+					  return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_GAMMA:</div><div class='add'>+					c-&gt;value &lt;&lt;= 11;</div><div class='add'>+					ret = pwc_set_gamma(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_RED_BALANCE:</div><div class='add'>+					c-&gt;value &lt;&lt;= 8;</div><div class='add'>+					ret = pwc_set_red_gain(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_BLUE_BALANCE:</div><div class='add'>+					c-&gt;value &lt;&lt;= 8;</div><div class='add'>+					ret = pwc_set_blue_gain(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_AUTO_WHITE_BALANCE:</div><div class='add'>+					c-&gt;value = (c-&gt;value == 0)?PWC_WB_MANUAL:PWC_WB_AUTO;</div><div class='add'>+					ret = pwc_set_awb(pdev, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_EXPOSURE:</div><div class='add'>+					c-&gt;value &lt;&lt;= 8;</div><div class='add'>+					ret = pwc_set_shutter_speed(pdev, c-&gt;value?0:1, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_AUTOGAIN:</div><div class='add'>+					/* autogain off means nothing without a gain */</div><div class='add'>+					if (c-&gt;value == 0)</div><div class='add'>+						return 0;</div><div class='add'>+					ret = pwc_set_agc(pdev, c-&gt;value, 0);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_GAIN:</div><div class='add'>+					c-&gt;value &lt;&lt;= 8;</div><div class='add'>+					ret = pwc_set_agc(pdev, 0, c-&gt;value);</div><div class='add'>+					if (ret&lt;0)</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_SAVE_USER:</div><div class='add'>+					if (pwc_save_user(pdev))</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_RESTORE_USER:</div><div class='add'>+					if (pwc_restore_user(pdev))</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_RESTORE_FACTORY:</div><div class='add'>+					if (pwc_restore_factory(pdev))</div><div class='add'>+						return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_COLOUR_MODE:</div><div class='add'>+					ret = pwc_set_colour_mode(pdev, c-&gt;value);</div><div class='add'>+					if (ret &lt; 0)</div><div class='add'>+					  return -EINVAL;</div><div class='add'>+					return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_AUTOCONTOUR:</div><div class='add'>+				  c-&gt;value=(c-&gt;value == 1)?-1:0;</div><div class='add'>+				  ret = pwc_set_contour(pdev, c-&gt;value);</div><div class='add'>+				  if (ret &lt; 0)</div><div class='add'>+				    return -EINVAL;</div><div class='add'>+				  return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_CONTOUR:</div><div class='add'>+				  c-&gt;value &lt;&lt;= 10;</div><div class='add'>+				  ret = pwc_set_contour(pdev, c-&gt;value);</div><div class='add'>+				  if (ret &lt; 0)</div><div class='add'>+				    return -EINVAL;</div><div class='add'>+				  return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_BACKLIGHT:</div><div class='add'>+				  ret = pwc_set_backlight(pdev, c-&gt;value);</div><div class='add'>+				  if (ret &lt; 0)</div><div class='add'>+				    return -EINVAL;</div><div class='add'>+				  return 0;</div><div class='add'>+				case V4L2_CID_PRIVATE_FLICKERLESS:</div><div class='add'>+				  ret = pwc_set_flicker(pdev, c-&gt;value);</div><div class='add'>+				  if (ret &lt; 0)</div><div class='add'>+				    return -EINVAL;</div><div class='add'>+				case V4L2_CID_PRIVATE_NOISE_REDUCTION:</div><div class='add'>+				  ret = pwc_set_dynamic_noise(pdev, c-&gt;value);</div><div class='add'>+				  if (ret &lt; 0)</div><div class='add'>+				    return -EINVAL;</div><div class='add'>+				  return 0;</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_ENUM_FMT:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_fmtdesc *f = arg;</div><div class='add'>+			int index;</div><div class='add'>+</div><div class='add'>+			if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			      return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* We only support two format: the raw format, and YUV */</div><div class='add'>+			index = f-&gt;index;</div><div class='add'>+			memset(f,0,sizeof(struct v4l2_fmtdesc));</div><div class='add'>+			f-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+			f-&gt;index = index;</div><div class='add'>+			switch(index)</div><div class='add'>+			{</div><div class='add'>+				case 0:</div><div class='add'>+					/* RAW format */</div><div class='add'>+					f-&gt;pixelformat = pdev-&gt;type&lt;=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;</div><div class='add'>+					f-&gt;flags = V4L2_FMT_FLAG_COMPRESSED;</div><div class='add'>+					strlcpy(f-&gt;description,"Raw Philips Webcam",sizeof(f-&gt;description));</div><div class='add'>+					break;</div><div class='add'>+				case 1:</div><div class='add'>+					f-&gt;pixelformat = V4L2_PIX_FMT_YUV420;</div><div class='add'>+					strlcpy(f-&gt;description,"4:2:0, planar, Y-Cb-Cr",sizeof(f-&gt;description));</div><div class='add'>+					break;</div><div class='add'>+				default:</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_G_FMT:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_format *f = arg;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev-&gt;image.x,pdev-&gt;image.y);</div><div class='add'>+			if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+			      return -EINVAL;</div><div class='add'>+</div><div class='add'>+			pwc_vidioc_fill_fmt(pdev, f);</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_TRY_FMT:</div><div class='add'>+			return pwc_vidioc_try_fmt(pdev, arg);</div><div class='add'>+</div><div class='add'>+		case VIDIOC_S_FMT:</div><div class='add'>+			return pwc_vidioc_set_fmt(pdev, arg);</div><div class='add'>+</div><div class='add'>+		case VIDIOC_G_STD:</div><div class='add'>+		{</div><div class='add'>+			v4l2_std_id *std = arg;</div><div class='add'>+			*std = V4L2_STD_UNKNOWN;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_S_STD:</div><div class='add'>+		{</div><div class='add'>+			v4l2_std_id *std = arg;</div><div class='add'>+			if (*std != V4L2_STD_UNKNOWN)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_ENUMSTD:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_standard *std = arg;</div><div class='add'>+			if (std-&gt;index != 0)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			std-&gt;id = V4L2_STD_UNKNOWN;</div><div class='add'>+			strncpy(std-&gt;name, "webcam", sizeof(std-&gt;name));</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_REQBUFS:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_requestbuffers *rb = arg;</div><div class='add'>+			int nbuffers;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_REQBUFS) count=%d\n",rb-&gt;count);</div><div class='add'>+			if (rb-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (rb-&gt;memory != V4L2_MEMORY_MMAP)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			nbuffers = rb-&gt;count;</div><div class='add'>+			if (nbuffers &lt; 2)</div><div class='add'>+				nbuffers = 2;</div><div class='add'>+			else if (nbuffers &gt; pwc_mbufs)</div><div class='add'>+				nbuffers = pwc_mbufs;</div><div class='add'>+			/* Force to use our # of buffers */</div><div class='add'>+			rb-&gt;count = pwc_mbufs;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_QUERYBUF:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_buffer *buf = arg;</div><div class='add'>+			int index;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) index=%d\n",buf-&gt;index);</div><div class='add'>+			if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='add'>+				PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad type\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			if (buf-&gt;memory != V4L2_MEMORY_MMAP) {</div><div class='add'>+				PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad memory type\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			index = buf-&gt;index;</div><div class='add'>+			if (index &lt; 0 || index &gt;= pwc_mbufs) {</div><div class='add'>+				PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYBUF) Bad index %d\n", buf-&gt;index);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			memset(buf, 0, sizeof(struct v4l2_buffer));</div><div class='add'>+			buf-&gt;type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='add'>+			buf-&gt;index = index;</div><div class='add'>+			buf-&gt;m.offset = index * pdev-&gt;len_per_image;</div><div class='add'>+			if (pdev-&gt;vpalette == VIDEO_PALETTE_RAW)</div><div class='add'>+				buf-&gt;bytesused = pdev-&gt;frame_size + sizeof(struct pwc_raw_frame);</div><div class='add'>+			else</div><div class='add'>+				buf-&gt;bytesused = pdev-&gt;view.size;</div><div class='add'>+			buf-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+			buf-&gt;memory = V4L2_MEMORY_MMAP;</div><div class='add'>+			//buf-&gt;flags = V4L2_BUF_FLAG_MAPPED;</div><div class='add'>+			buf-&gt;length = pdev-&gt;len_per_image;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_READ("VIDIOC_QUERYBUF: index=%d\n",buf-&gt;index);</div><div class='add'>+			PWC_DEBUG_READ("VIDIOC_QUERYBUF: m.offset=%d\n",buf-&gt;m.offset);</div><div class='add'>+			PWC_DEBUG_READ("VIDIOC_QUERYBUF: bytesused=%d\n",buf-&gt;bytesused);</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_QBUF:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_buffer *buf = arg;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_QBUF) index=%d\n",buf-&gt;index);</div><div class='add'>+			if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (buf-&gt;memory != V4L2_MEMORY_MMAP)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			if (buf-&gt;index &lt; 0 || buf-&gt;index &gt;= pwc_mbufs)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			buf-&gt;flags |= V4L2_BUF_FLAG_QUEUED;</div><div class='add'>+			buf-&gt;flags &amp;= ~V4L2_BUF_FLAG_DONE;</div><div class='add'>+</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_DQBUF:</div><div class='add'>+		{</div><div class='add'>+			struct v4l2_buffer *buf = arg;</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("ioctl(VIDIOC_DQBUF)\n");</div><div class='add'>+</div><div class='add'>+			if (buf-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			/* Add ourselves to the frame wait-queue.</div><div class='add'>+</div><div class='add'>+			   FIXME: needs auditing for safety.</div><div class='add'>+			   QUESTION: In what respect? I think that using the</div><div class='add'>+				     frameq is safe now.</div><div class='add'>+			 */</div><div class='add'>+			add_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+			while (pdev-&gt;full_frames == NULL) {</div><div class='add'>+				if (pdev-&gt;error_status) {</div><div class='add'>+					remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+					set_current_state(TASK_RUNNING);</div><div class='add'>+					return -pdev-&gt;error_status;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (signal_pending(current)) {</div><div class='add'>+					remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+					set_current_state(TASK_RUNNING);</div><div class='add'>+					return -ERESTARTSYS;</div><div class='add'>+				}</div><div class='add'>+				schedule();</div><div class='add'>+				set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+			}</div><div class='add'>+			remove_wait_queue(&amp;pdev-&gt;frameq, &amp;wait);</div><div class='add'>+			set_current_state(TASK_RUNNING);</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: frame ready.\n");</div><div class='add'>+			/* Decompress data in pdev-&gt;images[pdev-&gt;fill_image] */</div><div class='add'>+			ret = pwc_handle_frame(pdev);</div><div class='add'>+			if (ret)</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: after pwc_handle_frame\n");</div><div class='add'>+</div><div class='add'>+			buf-&gt;index = pdev-&gt;fill_image;</div><div class='add'>+			if (pdev-&gt;vpalette == VIDEO_PALETTE_RAW)</div><div class='add'>+				buf-&gt;bytesused = pdev-&gt;frame_size + sizeof(struct pwc_raw_frame);</div><div class='add'>+			else</div><div class='add'>+				buf-&gt;bytesused = pdev-&gt;view.size;</div><div class='add'>+			buf-&gt;flags = V4L2_BUF_FLAG_MAPPED;</div><div class='add'>+			buf-&gt;field = V4L2_FIELD_NONE;</div><div class='add'>+			do_gettimeofday(&amp;buf-&gt;timestamp);</div><div class='add'>+			buf-&gt;sequence = 0;</div><div class='add'>+			buf-&gt;memory = V4L2_MEMORY_MMAP;</div><div class='add'>+			buf-&gt;m.offset = pdev-&gt;fill_image * pdev-&gt;len_per_image;</div><div class='add'>+			buf-&gt;length = buf-&gt;bytesused;</div><div class='add'>+			pwc_next_image(pdev);</div><div class='add'>+</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf-&gt;index=%d\n",buf-&gt;index);</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: buf-&gt;length=%d\n",buf-&gt;length);</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: m.offset=%d\n",buf-&gt;m.offset);</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: bytesused=%d\n",buf-&gt;bytesused);</div><div class='add'>+			PWC_DEBUG_IOCTL("VIDIOC_DQBUF: leaving\n");</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_STREAMON:</div><div class='add'>+		{</div><div class='add'>+			/* WARNING: pwc_try_video_mode() called pwc_isoc_init */</div><div class='add'>+			pwc_isoc_init(pdev);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		case VIDIOC_STREAMOFF:</div><div class='add'>+		{</div><div class='add'>+			pwc_isoc_cleanup(pdev);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return pwc_ioctl(pdev, cmd, arg);</div><div class='add'>+	} /* ..switch */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h<br/>index 1b0ee0ced0ed..7e9c4237d1e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/pwc/pwc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/pwc/pwc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/pwc/pwc.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* (C) 1999-2003 Nemosoft Unv.</div><div class='del'>-   (C) 2004      Luc Saillard (luc@saillard.org)</div><div class='add'>+   (C) 2004-2006 Luc Saillard (luc@saillard.org)</div><div class='ctx'> </div><div class='ctx'>    NOTE: this version of pwc is an unofficial (modified) release of pwc &amp; pcwx</div><div class='ctx'>    driver and thus may have bugs that are not present in the original version.</div><div class='hunk'>@@ -25,55 +25,90 @@</div><div class='ctx'> #ifndef PWC_H</div><div class='ctx'> #define PWC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "pwc-uncompress.h"</div><div class='del'>-#include "pwc-ioctl.h"</div><div class='del'>-</div><div class='del'>-/* Defines and structures for the Philips webcam */</div><div class='del'>-/* Used for checking memory corruption/pointer validation */</div><div class='del'>-#define PWC_MAGIC 0x89DC10ABUL</div><div class='del'>-#undef PWC_MAGIC</div><div class='add'>+#include &lt;media/pwc-ioctl.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Turn some debugging options on/off */</div><div class='del'>-#define PWC_DEBUG 0</div><div class='add'>+#ifndef CONFIG_PWC_DEBUG</div><div class='add'>+#define CONFIG_PWC_DEBUG 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Version block */</div><div class='add'>+#define PWC_MAJOR	10</div><div class='add'>+#define PWC_MINOR	0</div><div class='add'>+#define PWC_EXTRAMINOR	12</div><div class='add'>+#define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR)</div><div class='add'>+#define PWC_VERSION 	"10.0.12"</div><div class='add'>+#define PWC_NAME 	"pwc"</div><div class='add'>+#define PFX		PWC_NAME ": "</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* Trace certain actions in the driver */</div><div class='del'>-#define TRACE_MODULE	0x0001</div><div class='del'>-#define TRACE_PROBE	0x0002</div><div class='del'>-#define TRACE_OPEN	0x0004</div><div class='del'>-#define TRACE_READ	0x0008</div><div class='del'>-#define TRACE_MEMORY	0x0010</div><div class='del'>-#define TRACE_FLOW	0x0020</div><div class='del'>-#define TRACE_SIZE	0x0040</div><div class='del'>-#define TRACE_PWCX	0x0080</div><div class='del'>-#define TRACE_SEQUENCE	0x1000</div><div class='del'>-</div><div class='del'>-#define Trace(R, A...) if (pwc_trace &amp; R) printk(KERN_DEBUG PWC_NAME " " A)</div><div class='del'>-#define Debug(A...) printk(KERN_DEBUG PWC_NAME " " A)</div><div class='del'>-#define Info(A...)  printk(KERN_INFO  PWC_NAME " " A)</div><div class='del'>-#define Err(A...)   printk(KERN_ERR   PWC_NAME " " A)</div><div class='add'>+#define PWC_DEBUG_LEVEL_MODULE	(1&lt;&lt;0)</div><div class='add'>+#define PWC_DEBUG_LEVEL_PROBE	(1&lt;&lt;1)</div><div class='add'>+#define PWC_DEBUG_LEVEL_OPEN	(1&lt;&lt;2)</div><div class='add'>+#define PWC_DEBUG_LEVEL_READ	(1&lt;&lt;3)</div><div class='add'>+#define PWC_DEBUG_LEVEL_MEMORY	(1&lt;&lt;4)</div><div class='add'>+#define PWC_DEBUG_LEVEL_FLOW	(1&lt;&lt;5)</div><div class='add'>+#define PWC_DEBUG_LEVEL_SIZE	(1&lt;&lt;6)</div><div class='add'>+#define PWC_DEBUG_LEVEL_IOCTL	(1&lt;&lt;7)</div><div class='add'>+#define PWC_DEBUG_LEVEL_TRACE	(1&lt;&lt;8)</div><div class='add'>+</div><div class='add'>+#define PWC_DEBUG_MODULE(fmt, args...) PWC_DEBUG(MODULE, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_PROBE(fmt, args...) PWC_DEBUG(PROBE, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_OPEN(fmt, args...) PWC_DEBUG(OPEN, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_READ(fmt, args...) PWC_DEBUG(READ, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_MEMORY(fmt, args...) PWC_DEBUG(MEMORY, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_FLOW(fmt, args...) PWC_DEBUG(FLOW, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_SIZE(fmt, args...) PWC_DEBUG(SIZE, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_IOCTL(fmt, args...) PWC_DEBUG(IOCTL, fmt, ##args)</div><div class='add'>+#define PWC_DEBUG_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='add'>+</div><div class='add'>+#define PWC_DEBUG_LEVEL	(PWC_DEBUG_LEVEL_MODULE)</div><div class='add'>+</div><div class='add'>+#define PWC_DEBUG(level, fmt, args...) do {\</div><div class='add'>+	  if ((PWC_DEBUG_LEVEL_ ##level) &amp; pwc_trace) \</div><div class='add'>+	     printk(KERN_DEBUG PFX fmt, ##args); \</div><div class='add'>+	  } while(0)</div><div class='add'>+</div><div class='add'>+#define PWC_ERROR(fmt, args...) printk(KERN_ERR PFX fmt, ##args)</div><div class='add'>+#define PWC_WARNING(fmt, args...) printk(KERN_WARNING PFX fmt, ##args)</div><div class='add'>+#define PWC_INFO(fmt, args...) printk(KERN_INFO PFX fmt, ##args)</div><div class='add'>+#define PWC_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args)</div><div class='add'>+</div><div class='add'>+#else /* if ! CONFIG_PWC_DEBUG */</div><div class='add'>+</div><div class='add'>+#define PWC_ERROR(fmt, args...) printk(KERN_ERR PFX fmt, ##args)</div><div class='add'>+#define PWC_WARNING(fmt, args...) printk(KERN_WARNING PFX fmt, ##args)</div><div class='add'>+#define PWC_INFO(fmt, args...) printk(KERN_INFO PFX fmt, ##args)</div><div class='add'>+#define PWC_TRACE(fmt, args...) do { } while(0)</div><div class='add'>+#define PWC_DEBUG(level, fmt, args...) do { } while(0)</div><div class='add'>+</div><div class='add'>+#define pwc_trace 0</div><div class='ctx'> </div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Defines for ToUCam cameras */</div><div class='ctx'> #define TOUCAM_HEADER_SIZE		8</div><div class='ctx'> #define TOUCAM_TRAILER_SIZE		4</div><div class='ctx'> </div><div class='ctx'> #define FEATURE_MOTOR_PANTILT		0x0001</div><div class='del'>-</div><div class='del'>-/* Version block */</div><div class='del'>-#define PWC_MAJOR	9</div><div class='del'>-#define PWC_MINOR	0</div><div class='del'>-#define PWC_VERSION 	"9.0.2-unofficial"</div><div class='del'>-#define PWC_NAME 	"pwc"</div><div class='add'>+#define FEATURE_CODEC1			0x0002</div><div class='add'>+#define FEATURE_CODEC2			0x0004</div><div class='ctx'> </div><div class='ctx'> /* Turn certain features on/off */</div><div class='ctx'> #define PWC_INT_PIPE 0</div><div class='hunk'>@@ -95,6 +130,18 @@</div><div class='ctx'> /* Absolute maximum number of buffers available for mmap() */</div><div class='ctx'> #define MAX_IMAGES 		10</div><div class='ctx'> </div><div class='add'>+/* Some macros to quickly find the type of a webcam */</div><div class='add'>+#define DEVICE_USE_CODEC1(x) ((x)&lt;675)</div><div class='add'>+#define DEVICE_USE_CODEC2(x) ((x)&gt;=675 &amp;&amp; (x)&lt;700)</div><div class='add'>+#define DEVICE_USE_CODEC3(x) ((x)&gt;=700)</div><div class='add'>+#define DEVICE_USE_CODEC23(x) ((x)&gt;=675)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifndef V4L2_PIX_FMT_PWC1</div><div class='add'>+#define V4L2_PIX_FMT_PWC1	v4l2_fourcc('P','W','C','1')</div><div class='add'>+#define V4L2_PIX_FMT_PWC2	v4l2_fourcc('P','W','C','2')</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* The following structures were based on cpia.h. Why reinvent the wheel? :-) */</div><div class='ctx'> struct pwc_iso_buf</div><div class='ctx'> {</div><div class='hunk'>@@ -110,17 +157,19 @@ struct pwc_frame_buf</div><div class='ctx'>    void *data;</div><div class='ctx'>    volatile int filled;		/* number of bytes filled */</div><div class='ctx'>    struct pwc_frame_buf *next;	/* list */</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-   int sequence;		/* Sequence number */</div><div class='del'>-#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* additionnal informations used when dealing image between kernel and userland */</div><div class='add'>+struct pwc_imgbuf</div><div class='add'>+{</div><div class='add'>+	unsigned long offset;	/* offset of this buffer in the big array of image_data */</div><div class='add'>+	int   vma_use_count;	/* count the number of time this memory is mapped */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pwc_device</div><div class='ctx'> {</div><div class='ctx'>    struct video_device *vdev;</div><div class='del'>-#ifdef PWC_MAGIC</div><div class='del'>-   int magic;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'>    /* Pointer to our usb_device */</div><div class='ctx'>    struct usb_device *udev;</div><div class='ctx'> </div><div class='hunk'>@@ -177,12 +226,8 @@ struct pwc_device</div><div class='ctx'>    int frame_size;</div><div class='ctx'>    int frame_total_size; /* including header &amp; trailer */</div><div class='ctx'>    int drop_frames;</div><div class='del'>-#if PWC_DEBUG</div><div class='del'>-   int sequence;			/* Debugging aid */</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>    /* 3: decompression */</div><div class='del'>-   struct pwc_decompressor *decompressor;	/* function block with decompression routines */</div><div class='ctx'>    void *decompress_data;		/* private data for decompression engine */</div><div class='ctx'> </div><div class='ctx'>    /* 4: image */</div><div class='hunk'>@@ -198,7 +243,7 @@ struct pwc_device</div><div class='ctx'>    struct pwc_coord offset;		/* offset within the viewport */</div><div class='ctx'> </div><div class='ctx'>    void *image_data;			/* total buffer, which is subdivided into ... */</div><div class='del'>-   void *image_ptr[MAX_IMAGES];		/* ...several images... */</div><div class='add'>+   struct pwc_imgbuf images[MAX_IMAGES];/* ...several images... */</div><div class='ctx'>    int fill_image;			/* ...which are rotated. */</div><div class='ctx'>    int len_per_image;			/* length per image */</div><div class='ctx'>    int image_read_pos;			/* In case we read data in pieces, keep track of were we are in the imagebuffer */</div><div class='hunk'>@@ -211,6 +256,7 @@ struct pwc_device</div><div class='ctx'>    struct pwc_mpt_range angle_range;</div><div class='ctx'>    int pan_angle;			/* in degrees * 100 */</div><div class='ctx'>    int tilt_angle;			/* absolute angle; 0,0 is home position */</div><div class='add'>+   int snapshot_button_status;		/* set to 1 when the user push the button, reset to 0 when this value is read */</div><div class='ctx'> </div><div class='ctx'>    /*** Misc. data ***/</div><div class='ctx'>    wait_queue_head_t frameq;		/* When waiting for a frame to finish... */</div><div class='hunk'>@@ -219,20 +265,26 @@ struct pwc_device</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef __cplusplus</div><div class='ctx'> extern "C" {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Global variable */</div><div class='add'>+/* Global variables */</div><div class='add'>+#if CONFIG_PWC_DEBUG</div><div class='ctx'> extern int pwc_trace;</div><div class='add'>+#endif</div><div class='add'>+extern int pwc_mbufs;</div><div class='ctx'> </div><div class='ctx'> /** functions in pwc-if.c */</div><div class='ctx'> int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_fps, int new_compression, int new_snapshot);</div><div class='add'>+int pwc_handle_frame(struct pwc_device *pdev);</div><div class='add'>+void pwc_next_image(struct pwc_device *pdev);</div><div class='add'>+int pwc_isoc_init(struct pwc_device *pdev);</div><div class='add'>+void pwc_isoc_cleanup(struct pwc_device *pdev);</div><div class='ctx'> </div><div class='ctx'> /** Functions in pwc-misc.c */</div><div class='ctx'> /* sizes in pixels */</div><div class='del'>-extern struct pwc_coord pwc_image_sizes[PSZ_MAX];</div><div class='add'>+extern const struct pwc_coord pwc_image_sizes[PSZ_MAX];</div><div class='ctx'> </div><div class='ctx'> int pwc_decode_size(struct pwc_device *pdev, int width, int height);</div><div class='ctx'> void pwc_construct(struct pwc_device *pdev);</div><div class='hunk'>@@ -240,6 +292,9 @@ void pwc_construct(struct pwc_device *pdev);</div><div class='ctx'> /** Functions in pwc-ctrl.c */</div><div class='ctx'> /* Request a certain video mode. Returns &lt; 0 if not possible */</div><div class='ctx'> extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot);</div><div class='add'>+/* Calculate the number of bytes per image (not frame) */</div><div class='add'>+extern int pwc_mpt_reset(struct pwc_device *pdev, int flags);</div><div class='add'>+extern int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt);</div><div class='ctx'> </div><div class='ctx'> /* Various controls; should be obvious. Value 0..65535, or &lt; 0 on error */</div><div class='ctx'> extern int pwc_get_brightness(struct pwc_device *pdev);</div><div class='hunk'>@@ -248,10 +303,36 @@ extern int pwc_get_contrast(struct pwc_device *pdev);</div><div class='ctx'> extern int pwc_set_contrast(struct pwc_device *pdev, int value);</div><div class='ctx'> extern int pwc_get_gamma(struct pwc_device *pdev);</div><div class='ctx'> extern int pwc_set_gamma(struct pwc_device *pdev, int value);</div><div class='del'>-extern int pwc_get_saturation(struct pwc_device *pdev);</div><div class='add'>+extern int pwc_get_saturation(struct pwc_device *pdev, int *value);</div><div class='ctx'> extern int pwc_set_saturation(struct pwc_device *pdev, int value);</div><div class='ctx'> extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);</div><div class='ctx'> extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);</div><div class='add'>+extern int pwc_restore_user(struct pwc_device *pdev);</div><div class='add'>+extern int pwc_save_user(struct pwc_device *pdev);</div><div class='add'>+extern int pwc_restore_factory(struct pwc_device *pdev);</div><div class='add'>+</div><div class='add'>+/* exported for use by v4l2 controls */</div><div class='add'>+extern int pwc_get_red_gain(struct pwc_device *pdev, int *value);</div><div class='add'>+extern int pwc_set_red_gain(struct pwc_device *pdev, int value);</div><div class='add'>+extern int pwc_get_blue_gain(struct pwc_device *pdev, int *value);</div><div class='add'>+extern int pwc_set_blue_gain(struct pwc_device *pdev, int value);</div><div class='add'>+extern int pwc_get_awb(struct pwc_device *pdev);</div><div class='add'>+extern int pwc_set_awb(struct pwc_device *pdev, int mode);</div><div class='add'>+extern int pwc_set_agc(struct pwc_device *pdev, int mode, int value);</div><div class='add'>+extern int pwc_get_agc(struct pwc_device *pdev, int *value);</div><div class='add'>+extern int pwc_set_shutter_speed(struct pwc_device *pdev, int mode, int value);</div><div class='add'>+extern int pwc_get_shutter_speed(struct pwc_device *pdev, int *value);</div><div class='add'>+</div><div class='add'>+extern int pwc_set_colour_mode(struct pwc_device *pdev, int colour);</div><div class='add'>+extern int pwc_get_colour_mode(struct pwc_device *pdev, int *colour);</div><div class='add'>+extern int pwc_set_contour(struct pwc_device *pdev, int contour);</div><div class='add'>+extern int pwc_get_contour(struct pwc_device *pdev, int *contour);</div><div class='add'>+extern int pwc_set_backlight(struct pwc_device *pdev, int backlight);</div><div class='add'>+extern int pwc_get_backlight(struct pwc_device *pdev, int *backlight);</div><div class='add'>+extern int pwc_set_flicker(struct pwc_device *pdev, int flicker);</div><div class='add'>+extern int pwc_get_flicker(struct pwc_device *pdev, int *flicker);</div><div class='add'>+extern int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise);</div><div class='add'>+extern int pwc_get_dynamic_noise(struct pwc_device *pdev, int *noise);</div><div class='ctx'> </div><div class='ctx'> /* Power down or up the camera; not supported by all models */</div><div class='ctx'> extern int pwc_camera_power(struct pwc_device *pdev, int power);</div><div class='hunk'>@@ -259,6 +340,9 @@ extern int pwc_camera_power(struct pwc_device *pdev, int power);</div><div class='ctx'> /* Private ioctl()s; see pwc-ioctl.h */</div><div class='ctx'> extern int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg);</div><div class='ctx'> </div><div class='add'>+/** Functions in pwc-v4l.c */</div><div class='add'>+extern int pwc_video_do_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+			      unsigned int cmd, void *arg);</div><div class='ctx'> </div><div class='ctx'> /** pwc-uncompress.c */</div><div class='ctx'> /* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */</div><div class='hunk'>@@ -270,3 +354,4 @@ extern int pwc_decompress(struct pwc_device *pdev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='add'>+/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */</div><div class='head'>diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c<br/>index dd830e0e5e96..59a187272c83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa5246a.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa5246a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa5246a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa5246a.c</a></div><div class='hunk'>@@ -46,6 +46,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/videotext.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "saa5246a.h"</div><div class='head'>diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c<br/>index 531e9461cb66..19a8d65699f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa5249.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa5249.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa5249.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa5249.c</a></div><div class='hunk'>@@ -56,6 +56,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/videotext.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c<br/>index 41d951db6ec0..676b9970eb2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7110.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7110.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7110.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7110.c</a></div><div class='hunk'>@@ -43,6 +43,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define I2C_NAME(s) (s)-&gt;name</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int debug = 0;</div><div class='head'>diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c<br/>index dceebc0b1250..b59c11717273 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7115.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7115.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7115.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7115.c</a></div><div class='hunk'>@@ -72,6 +72,10 @@ struct saa7115_state {</div><div class='ctx'> 	int sat;</div><div class='ctx'> 	enum v4l2_chip_ident ident;</div><div class='ctx'> 	u32 audclk_freq;</div><div class='add'>+	u32 crystal_freq;</div><div class='add'>+	u8 ucgc;</div><div class='add'>+	u8 cgcdiv;</div><div class='add'>+	u8 apll;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='hunk'>@@ -375,10 +379,6 @@ static const unsigned char saa7113_init_auto_input[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned char saa7115_init_misc[] = {</div><div class='del'>-	0x38, 0x03,		/* audio stuff */</div><div class='del'>-	0x39, 0x10,</div><div class='del'>-	0x3a, 0x08,</div><div class='del'>-</div><div class='ctx'> 	0x81, 0x01,		/* reg 0x15,0x16 define blanking window */</div><div class='ctx'> 	0x82, 0x00,</div><div class='ctx'> 	0x83, 0x01,		/* I port settings */</div><div class='hunk'>@@ -584,6 +584,7 @@ static int saa7115_set_audio_clock_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 	u32 acni;</div><div class='ctx'> 	u32 hz;</div><div class='ctx'> 	u64 f;</div><div class='add'>+	u8 acc = 0; 	/* reg 0x3a, audio clock control */</div><div class='ctx'> </div><div class='ctx'> 	v4l_dbg(1, debug, client, "set audio clock freq: %d\n", freq);</div><div class='ctx'> </div><div class='hunk'>@@ -591,18 +592,34 @@ static int saa7115_set_audio_clock_freq(struct i2c_client *client, u32 freq)</div><div class='ctx'> 	if (freq &lt; 32000 || freq &gt; 48000)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* The saa7113 has no audio clock */</div><div class='add'>+	if (state-&gt;ident == V4L2_IDENT_SAA7113)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* hz is the refresh rate times 100 */</div><div class='ctx'> 	hz = (state-&gt;std &amp; V4L2_STD_525_60) ? 5994 : 5000;</div><div class='ctx'> 	/* acpf = (256 * freq) / field_frequency == (256 * 100 * freq) / hz */</div><div class='ctx'> 	acpf = (25600 * freq) / hz;</div><div class='ctx'> 	/* acni = (256 * freq * 2^23) / crystal_frequency =</div><div class='ctx'> 		  (freq * 2^(8+23)) / crystal_frequency =</div><div class='del'>-		  (freq &lt;&lt; 31) / 32.11 MHz */</div><div class='add'>+		  (freq &lt;&lt; 31) / crystal_frequency */</div><div class='ctx'> 	f = freq;</div><div class='ctx'> 	f = f &lt;&lt; 31;</div><div class='del'>-	do_div(f, 32110000);</div><div class='add'>+	do_div(f, state-&gt;crystal_freq);</div><div class='ctx'> 	acni = f;</div><div class='add'>+	if (state-&gt;ucgc) {</div><div class='add'>+		acpf = acpf * state-&gt;cgcdiv / 16;</div><div class='add'>+		acni = acni * state-&gt;cgcdiv / 16;</div><div class='add'>+		acc = 0x80;</div><div class='add'>+		if (state-&gt;cgcdiv == 3)</div><div class='add'>+			acc |= 0x40;</div><div class='add'>+	}</div><div class='add'>+	if (state-&gt;apll)</div><div class='add'>+		acc |= 0x08;</div><div class='ctx'> </div><div class='add'>+	saa7115_write(client, 0x38, 0x03);</div><div class='add'>+	saa7115_write(client, 0x39, 0x10);</div><div class='add'>+	saa7115_write(client, 0x3a, acc);</div><div class='ctx'> 	saa7115_write(client, 0x30, acpf &amp; 0xff);</div><div class='ctx'> 	saa7115_write(client, 0x31, (acpf &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'> 	saa7115_write(client, 0x32, (acpf &gt;&gt; 16) &amp; 0x03);</div><div class='hunk'>@@ -1073,48 +1090,6 @@ static void saa7115_decode_vbi_line(struct i2c_client *client,</div><div class='ctx'> </div><div class='ctx'> /* ============ SAA7115 AUDIO settings (end) ============= */</div><div class='ctx'> </div><div class='del'>-static struct v4l2_queryctrl saa7115_qctrl[] = {</div><div class='del'>-	{</div><div class='del'>-		.id            = V4L2_CID_BRIGHTNESS,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Brightness",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 255,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 128,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_CONTRAST,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Contrast",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 127,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 64,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_SATURATION,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Saturation",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 127,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 64,</div><div class='del'>-		.flags         = 0,</div><div class='del'>-	}, {</div><div class='del'>-		.id            = V4L2_CID_HUE,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_INTEGER,</div><div class='del'>-		.name          = "Hue",</div><div class='del'>-		.minimum       = -128,</div><div class='del'>-		.maximum       = 127,</div><div class='del'>-		.step          = 1,</div><div class='del'>-		.default_value = 0,</div><div class='del'>-		.flags 	       = 0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ----------------------------------------------------------------------- */</div><div class='del'>-</div><div class='ctx'> static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7115_state *state = i2c_get_clientdata(client);</div><div class='hunk'>@@ -1158,14 +1133,16 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar</div><div class='ctx'> 	case VIDIOC_QUERYCTRL:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_queryctrl *qc = arg;</div><div class='del'>-		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(saa7115_qctrl); i++)</div><div class='del'>-			if (qc-&gt;id &amp;&amp; qc-&gt;id == saa7115_qctrl[i].id) {</div><div class='del'>-				memcpy(qc, &amp;saa7115_qctrl[i], sizeof(*qc));</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		switch (qc-&gt;id) {</div><div class='add'>+			case V4L2_CID_BRIGHTNESS:</div><div class='add'>+			case V4L2_CID_CONTRAST:</div><div class='add'>+			case V4L2_CID_SATURATION:</div><div class='add'>+			case V4L2_CID_HUE:</div><div class='add'>+				return v4l2_ctrl_query_fill_std(qc);</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_G_STD:</div><div class='hunk'>@@ -1221,34 +1198,6 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_G_INPUT:</div><div class='del'>-		*(int *)arg = state-&gt;input;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case VIDIOC_S_INPUT:</div><div class='del'>-		v4l_dbg(1, debug, client, "decoder set input %d\n", *iarg);</div><div class='del'>-		/* inputs from 0-9 are available */</div><div class='del'>-		if (*iarg &lt; 0 || *iarg &gt; 9) {</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (state-&gt;input == *iarg)</div><div class='del'>-			break;</div><div class='del'>-		v4l_dbg(1, debug, client, "now setting %s input\n",</div><div class='del'>-			*iarg &gt;= 6 ? "S-Video" : "Composite");</div><div class='del'>-		state-&gt;input = *iarg;</div><div class='del'>-</div><div class='del'>-		/* select mode */</div><div class='del'>-		saa7115_write(client, 0x02,</div><div class='del'>-			      (saa7115_read(client, 0x02) &amp; 0xf0) |</div><div class='del'>-			       state-&gt;input);</div><div class='del'>-</div><div class='del'>-		/* bypass chrominance trap for modes 6..9 */</div><div class='del'>-		saa7115_write(client, 0x09,</div><div class='del'>-			      (saa7115_read(client, 0x09) &amp; 0x7f) |</div><div class='del'>-			       (state-&gt;input &lt; 6 ? 0x0 : 0x80));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case VIDIOC_STREAMON:</div><div class='ctx'> 	case VIDIOC_STREAMOFF:</div><div class='ctx'> 		v4l_dbg(1, debug, client, "%s output\n",</div><div class='hunk'>@@ -1260,6 +1209,21 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case VIDIOC_INT_S_CRYSTAL_FREQ:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crystal_freq *freq = arg;</div><div class='add'>+</div><div class='add'>+		if (freq-&gt;freq != SAA7115_FREQ_32_11_MHZ &amp;&amp;</div><div class='add'>+		    freq-&gt;freq != SAA7115_FREQ_24_576_MHZ)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		state-&gt;crystal_freq = freq-&gt;freq;</div><div class='add'>+		state-&gt;cgcdiv = (freq-&gt;flags &amp; SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;</div><div class='add'>+		state-&gt;ucgc = (freq-&gt;flags &amp; SAA7115_FREQ_FL_UCGC) ? 1 : 0;</div><div class='add'>+		state-&gt;apll = (freq-&gt;flags &amp; SAA7115_FREQ_FL_APLL) ? 1 : 0;</div><div class='add'>+		saa7115_set_audio_clock_freq(client, state-&gt;audclk_freq);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	case VIDIOC_INT_DECODE_VBI_LINE:</div><div class='ctx'> 		saa7115_decode_vbi_line(client, arg);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1401,10 +1365,13 @@ static int saa7115_attach(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 	v4l_dbg(1, debug, client, "writing init values\n");</div><div class='ctx'> </div><div class='ctx'> 	/* init to 60hz/48khz */</div><div class='del'>-	if (state-&gt;ident == V4L2_IDENT_SAA7113)</div><div class='add'>+	if (state-&gt;ident == V4L2_IDENT_SAA7113) {</div><div class='add'>+		state-&gt;crystal_freq = SAA7115_FREQ_24_576_MHZ;</div><div class='ctx'> 		saa7115_writeregs(client, saa7113_init_auto_input);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		state-&gt;crystal_freq = SAA7115_FREQ_32_11_MHZ;</div><div class='ctx'> 		saa7115_writeregs(client, saa7115_init_auto_input);</div><div class='add'>+	}</div><div class='ctx'> 	saa7115_writeregs(client, saa7115_init_misc);</div><div class='ctx'> 	saa7115_writeregs(client, saa7115_cfg_60hz_fullres_x);</div><div class='ctx'> 	saa7115_writeregs(client, saa7115_cfg_60hz_fullres_y);</div><div class='head'>diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c<br/>index c271e2e14105..ad401bdefeaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7127.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7127.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7127.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7127.c</a></div><div class='hunk'>@@ -270,7 +270,7 @@ static const char * const wss_strs[] = {</div><div class='ctx'> 	"letterbox 16:9 top",</div><div class='ctx'> 	"invalid",</div><div class='ctx'> 	"invalid",</div><div class='del'>-	"16:9 full format anamorphic"</div><div class='add'>+	"16:9 full format anamorphic",</div><div class='ctx'> 	"4:3 full format",</div><div class='ctx'> 	"invalid",</div><div class='ctx'> 	"invalid",</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c<br/>index 0e0ba50946e8..afc8f352b8e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa6752hs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa6752hs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa6752hs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa6752hs.c</a></div><div class='hunk'>@@ -39,6 +39,23 @@ enum saa6752hs_videoformat {</div><div class='ctx'> 	SAA6752HS_VF_UNKNOWN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct saa6752hs_mpeg_params {</div><div class='add'>+	/* transport streams */</div><div class='add'>+	__u16				ts_pid_pmt;</div><div class='add'>+	__u16				ts_pid_audio;</div><div class='add'>+	__u16				ts_pid_video;</div><div class='add'>+	__u16				ts_pid_pcr;</div><div class='add'>+</div><div class='add'>+	/* audio */</div><div class='add'>+	enum v4l2_mpeg_audio_l2_bitrate au_l2_bitrate;</div><div class='add'>+</div><div class='add'>+	/* video */</div><div class='add'>+	enum v4l2_mpeg_video_aspect	vi_aspect;</div><div class='add'>+	enum v4l2_mpeg_video_bitrate_mode vi_bitrate_mode;</div><div class='add'>+	__u32 				vi_bitrate;</div><div class='add'>+	__u32 				vi_bitrate_peak;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct v4l2_format v4l2_format_table[] =</div><div class='ctx'> {</div><div class='ctx'> 	[SAA6752HS_VF_D1] =</div><div class='hunk'>@@ -55,18 +72,19 @@ static const struct v4l2_format v4l2_format_table[] =</div><div class='ctx'> </div><div class='ctx'> struct saa6752hs_state {</div><div class='ctx'> 	struct i2c_client             client;</div><div class='del'>-	struct v4l2_mpeg_compression  params;</div><div class='add'>+	struct v4l2_mpeg_compression  old_params;</div><div class='add'>+	struct saa6752hs_mpeg_params  params;</div><div class='ctx'> 	enum saa6752hs_videoformat    video_format;</div><div class='ctx'> 	v4l2_std_id                   standard;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum saa6752hs_command {</div><div class='ctx'> 	SAA6752HS_COMMAND_RESET = 0,</div><div class='del'>-    	SAA6752HS_COMMAND_STOP = 1,</div><div class='del'>-    	SAA6752HS_COMMAND_START = 2,</div><div class='del'>-    	SAA6752HS_COMMAND_PAUSE = 3,</div><div class='del'>-    	SAA6752HS_COMMAND_RECONFIGURE = 4,</div><div class='del'>-    	SAA6752HS_COMMAND_SLEEP = 5,</div><div class='add'>+	SAA6752HS_COMMAND_STOP = 1,</div><div class='add'>+	SAA6752HS_COMMAND_START = 2,</div><div class='add'>+	SAA6752HS_COMMAND_PAUSE = 3,</div><div class='add'>+	SAA6752HS_COMMAND_RECONFIGURE = 4,</div><div class='add'>+	SAA6752HS_COMMAND_SLEEP = 5,</div><div class='ctx'> 	SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6,</div><div class='ctx'> </div><div class='ctx'> 	SAA6752HS_COMMAND_MAX</div><div class='hunk'>@@ -129,7 +147,22 @@ static u8 PMT[] = {</div><div class='ctx'> 	0x00, 0x00, 0x00, 0x00 /* CRC32 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct v4l2_mpeg_compression param_defaults =</div><div class='add'>+static struct saa6752hs_mpeg_params param_defaults =</div><div class='add'>+{</div><div class='add'>+	.ts_pid_pmt      = 16,</div><div class='add'>+	.ts_pid_video    = 260,</div><div class='add'>+	.ts_pid_audio    = 256,</div><div class='add'>+	.ts_pid_pcr      = 259,</div><div class='add'>+</div><div class='add'>+	.vi_aspect       = V4L2_MPEG_VIDEO_ASPECT_4x3,</div><div class='add'>+	.vi_bitrate      = 4000,</div><div class='add'>+	.vi_bitrate_peak = 6000,</div><div class='add'>+	.vi_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,</div><div class='add'>+</div><div class='add'>+	.au_l2_bitrate   = V4L2_MPEG_AUDIO_L2_BITRATE_256K,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct v4l2_mpeg_compression old_param_defaults =</div><div class='ctx'> {</div><div class='ctx'> 	.st_type         = V4L2_MPEG_TS_2,</div><div class='ctx'> 	.st_bitrate      = {</div><div class='hunk'>@@ -228,45 +261,57 @@ static int saa6752hs_chip_command(struct i2c_client* client,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int saa6752hs_set_bitrate(struct i2c_client* client,</div><div class='del'>-				 struct v4l2_mpeg_compression* params)</div><div class='add'>+				 struct saa6752hs_mpeg_params* params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[3];</div><div class='add'>+	int tot_bitrate;</div><div class='ctx'> </div><div class='ctx'> 	/* set the bitrate mode */</div><div class='ctx'> 	buf[0] = 0x71;</div><div class='del'>-	buf[1] = (params-&gt;vi_bitrate.mode == V4L2_BITRATE_VBR) ? 0 : 1;</div><div class='add'>+	buf[1] = (params-&gt;vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) ? 0 : 1;</div><div class='ctx'> 	i2c_master_send(client, buf, 2);</div><div class='ctx'> </div><div class='ctx'> 	/* set the video bitrate */</div><div class='del'>-	if (params-&gt;vi_bitrate.mode == V4L2_BITRATE_VBR) {</div><div class='add'>+	if (params-&gt;vi_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) {</div><div class='ctx'> 		/* set the target bitrate */</div><div class='ctx'> 		buf[0] = 0x80;</div><div class='del'>-	    	buf[1] = params-&gt;vi_bitrate.target &gt;&gt; 8;</div><div class='del'>-		buf[2] = params-&gt;vi_bitrate.target &amp; 0xff;</div><div class='add'>+		buf[1] = params-&gt;vi_bitrate &gt;&gt; 8;</div><div class='add'>+		buf[2] = params-&gt;vi_bitrate &amp; 0xff;</div><div class='ctx'> 		i2c_master_send(client, buf, 3);</div><div class='ctx'> </div><div class='ctx'> 		/* set the max bitrate */</div><div class='ctx'> 		buf[0] = 0x81;</div><div class='del'>-	    	buf[1] = params-&gt;vi_bitrate.max &gt;&gt; 8;</div><div class='del'>-		buf[2] = params-&gt;vi_bitrate.max &amp; 0xff;</div><div class='add'>+		buf[1] = params-&gt;vi_bitrate_peak &gt;&gt; 8;</div><div class='add'>+		buf[2] = params-&gt;vi_bitrate_peak &amp; 0xff;</div><div class='ctx'> 		i2c_master_send(client, buf, 3);</div><div class='add'>+		tot_bitrate = params-&gt;vi_bitrate_peak;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* set the target bitrate (no max bitrate for CBR) */</div><div class='ctx'> 		buf[0] = 0x81;</div><div class='del'>-	    	buf[1] = params-&gt;vi_bitrate.target &gt;&gt; 8;</div><div class='del'>-		buf[2] = params-&gt;vi_bitrate.target &amp; 0xff;</div><div class='add'>+		buf[1] = params-&gt;vi_bitrate &gt;&gt; 8;</div><div class='add'>+		buf[2] = params-&gt;vi_bitrate &amp; 0xff;</div><div class='ctx'> 		i2c_master_send(client, buf, 3);</div><div class='add'>+		tot_bitrate = params-&gt;vi_bitrate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set the audio bitrate */</div><div class='ctx'> 	buf[0] = 0x94;</div><div class='del'>-	buf[1] = (256 == params-&gt;au_bitrate.target) ? 0 : 1;</div><div class='add'>+	buf[1] = (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params-&gt;au_l2_bitrate) ? 0 : 1;</div><div class='ctx'> 	i2c_master_send(client, buf, 2);</div><div class='add'>+	tot_bitrate += (V4L2_MPEG_AUDIO_L2_BITRATE_256K == params-&gt;au_l2_bitrate) ? 256 : 384;</div><div class='add'>+</div><div class='add'>+	/* Note: the total max bitrate is determined by adding the video and audio</div><div class='add'>+	   bitrates together and also adding an extra 768kbit/s to stay on the</div><div class='add'>+	   safe side. If more control should be required, then an extra MPEG control</div><div class='add'>+	   should be added. */</div><div class='add'>+	tot_bitrate += 768;</div><div class='add'>+	if (tot_bitrate &gt; MPEG_TOTAL_TARGET_BITRATE_MAX)</div><div class='add'>+		tot_bitrate = MPEG_TOTAL_TARGET_BITRATE_MAX;</div><div class='ctx'> </div><div class='ctx'> 	/* set the total bitrate */</div><div class='ctx'> 	buf[0] = 0xb1;</div><div class='del'>-	buf[1] = params-&gt;st_bitrate.target &gt;&gt; 8;</div><div class='del'>-	buf[2] = params-&gt;st_bitrate.target &amp; 0xff;</div><div class='add'>+	buf[1] = tot_bitrate &gt;&gt; 8;</div><div class='add'>+	buf[2] = tot_bitrate &amp; 0xff;</div><div class='ctx'> 	i2c_master_send(client, buf, 3);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -318,50 +363,188 @@ static void saa6752hs_set_subsampling(struct i2c_client* client,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void saa6752hs_set_params(struct i2c_client* client,</div><div class='add'>+static void saa6752hs_old_set_params(struct i2c_client* client,</div><div class='ctx'> 				 struct v4l2_mpeg_compression* params)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa6752hs_state *h = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	/* check PIDs */</div><div class='del'>-	if (params-&gt;ts_pid_pmt &lt;= MPEG_PID_MAX)</div><div class='add'>+	if (params-&gt;ts_pid_pmt &lt;= MPEG_PID_MAX) {</div><div class='add'>+		h-&gt;old_params.ts_pid_pmt = params-&gt;ts_pid_pmt;</div><div class='ctx'> 		h-&gt;params.ts_pid_pmt = params-&gt;ts_pid_pmt;</div><div class='del'>-	if (params-&gt;ts_pid_pcr &lt;= MPEG_PID_MAX)</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;ts_pid_pcr &lt;= MPEG_PID_MAX) {</div><div class='add'>+		h-&gt;old_params.ts_pid_pcr = params-&gt;ts_pid_pcr;</div><div class='ctx'> 		h-&gt;params.ts_pid_pcr = params-&gt;ts_pid_pcr;</div><div class='del'>-	if (params-&gt;ts_pid_video &lt;= MPEG_PID_MAX)</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;ts_pid_video &lt;= MPEG_PID_MAX) {</div><div class='add'>+		h-&gt;old_params.ts_pid_video = params-&gt;ts_pid_video;</div><div class='ctx'> 		h-&gt;params.ts_pid_video = params-&gt;ts_pid_video;</div><div class='del'>-	if (params-&gt;ts_pid_audio &lt;= MPEG_PID_MAX)</div><div class='add'>+	}</div><div class='add'>+	if (params-&gt;ts_pid_audio &lt;= MPEG_PID_MAX) {</div><div class='add'>+		h-&gt;old_params.ts_pid_audio = params-&gt;ts_pid_audio;</div><div class='ctx'> 		h-&gt;params.ts_pid_audio = params-&gt;ts_pid_audio;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* check bitrate parameters */</div><div class='ctx'> 	if ((params-&gt;vi_bitrate.mode == V4L2_BITRATE_CBR) ||</div><div class='del'>-	    (params-&gt;vi_bitrate.mode == V4L2_BITRATE_VBR))</div><div class='del'>-		h-&gt;params.vi_bitrate.mode = params-&gt;vi_bitrate.mode;</div><div class='add'>+	    (params-&gt;vi_bitrate.mode == V4L2_BITRATE_VBR)) {</div><div class='add'>+		h-&gt;old_params.vi_bitrate.mode = params-&gt;vi_bitrate.mode;</div><div class='add'>+		h-&gt;params.vi_bitrate_mode = (params-&gt;vi_bitrate.mode == V4L2_BITRATE_VBR) ?</div><div class='add'>+		       V4L2_MPEG_VIDEO_BITRATE_MODE_VBR : V4L2_MPEG_VIDEO_BITRATE_MODE_CBR;</div><div class='add'>+	}</div><div class='ctx'> 	if (params-&gt;vi_bitrate.mode != V4L2_BITRATE_NONE)</div><div class='del'>-		h-&gt;params.st_bitrate.target = params-&gt;st_bitrate.target;</div><div class='add'>+		h-&gt;old_params.st_bitrate.target = params-&gt;st_bitrate.target;</div><div class='ctx'> 	if (params-&gt;vi_bitrate.mode != V4L2_BITRATE_NONE)</div><div class='del'>-		h-&gt;params.vi_bitrate.target = params-&gt;vi_bitrate.target;</div><div class='add'>+		h-&gt;old_params.vi_bitrate.target = params-&gt;vi_bitrate.target;</div><div class='ctx'> 	if (params-&gt;vi_bitrate.mode == V4L2_BITRATE_VBR)</div><div class='del'>-		h-&gt;params.vi_bitrate.max = params-&gt;vi_bitrate.max;</div><div class='add'>+		h-&gt;old_params.vi_bitrate.max = params-&gt;vi_bitrate.max;</div><div class='ctx'> 	if (params-&gt;au_bitrate.mode != V4L2_BITRATE_NONE)</div><div class='del'>-		h-&gt;params.au_bitrate.target = params-&gt;au_bitrate.target;</div><div class='add'>+		h-&gt;old_params.au_bitrate.target = params-&gt;au_bitrate.target;</div><div class='ctx'> </div><div class='ctx'> 	/* aspect ratio */</div><div class='ctx'> 	if (params-&gt;vi_aspect_ratio == V4L2_MPEG_ASPECT_4_3 ||</div><div class='del'>-	    params-&gt;vi_aspect_ratio == V4L2_MPEG_ASPECT_16_9)</div><div class='del'>-		h-&gt;params.vi_aspect_ratio = params-&gt;vi_aspect_ratio;</div><div class='add'>+	    params-&gt;vi_aspect_ratio == V4L2_MPEG_ASPECT_16_9) {</div><div class='add'>+		h-&gt;old_params.vi_aspect_ratio = params-&gt;vi_aspect_ratio;</div><div class='add'>+		if (params-&gt;vi_aspect_ratio == V4L2_MPEG_ASPECT_4_3)</div><div class='add'>+			h-&gt;params.vi_aspect = V4L2_MPEG_VIDEO_ASPECT_4x3;</div><div class='add'>+		else</div><div class='add'>+			h-&gt;params.vi_aspect = V4L2_MPEG_VIDEO_ASPECT_16x9;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* range checks */</div><div class='del'>-	if (h-&gt;params.st_bitrate.target &gt; MPEG_TOTAL_TARGET_BITRATE_MAX)</div><div class='del'>-		h-&gt;params.st_bitrate.target = MPEG_TOTAL_TARGET_BITRATE_MAX;</div><div class='del'>-	if (h-&gt;params.vi_bitrate.target &gt; MPEG_VIDEO_TARGET_BITRATE_MAX)</div><div class='del'>-		h-&gt;params.vi_bitrate.target = MPEG_VIDEO_TARGET_BITRATE_MAX;</div><div class='del'>-	if (h-&gt;params.vi_bitrate.max &gt; MPEG_VIDEO_MAX_BITRATE_MAX)</div><div class='del'>-		h-&gt;params.vi_bitrate.max = MPEG_VIDEO_MAX_BITRATE_MAX;</div><div class='del'>-	if (h-&gt;params.au_bitrate.target &lt;= 256)</div><div class='del'>-		h-&gt;params.au_bitrate.target = 256;</div><div class='add'>+	if (h-&gt;old_params.st_bitrate.target &gt; MPEG_TOTAL_TARGET_BITRATE_MAX)</div><div class='add'>+		h-&gt;old_params.st_bitrate.target = MPEG_TOTAL_TARGET_BITRATE_MAX;</div><div class='add'>+	if (h-&gt;old_params.vi_bitrate.target &gt; MPEG_VIDEO_TARGET_BITRATE_MAX)</div><div class='add'>+		h-&gt;old_params.vi_bitrate.target = MPEG_VIDEO_TARGET_BITRATE_MAX;</div><div class='add'>+	if (h-&gt;old_params.vi_bitrate.max &gt; MPEG_VIDEO_MAX_BITRATE_MAX)</div><div class='add'>+		h-&gt;old_params.vi_bitrate.max = MPEG_VIDEO_MAX_BITRATE_MAX;</div><div class='add'>+	h-&gt;params.vi_bitrate = params-&gt;vi_bitrate.target;</div><div class='add'>+	h-&gt;params.vi_bitrate_peak = params-&gt;vi_bitrate.max;</div><div class='add'>+	if (h-&gt;old_params.au_bitrate.target &lt;= 256) {</div><div class='add'>+		h-&gt;old_params.au_bitrate.target = 256;</div><div class='add'>+		h-&gt;params.au_l2_bitrate = V4L2_MPEG_AUDIO_L2_BITRATE_256K;</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		h-&gt;old_params.au_bitrate.target = 384;</div><div class='add'>+		h-&gt;params.au_l2_bitrate = V4L2_MPEG_AUDIO_L2_BITRATE_384K;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int handle_ctrl(struct saa6752hs_mpeg_params *params,</div><div class='add'>+		struct v4l2_ext_control *ctrl, unsigned int cmd)</div><div class='add'>+{</div><div class='add'>+	int old = 0, new;</div><div class='add'>+	int set = (cmd == VIDIOC_S_EXT_CTRLS);</div><div class='add'>+</div><div class='add'>+	new = ctrl-&gt;value;</div><div class='add'>+	switch (ctrl-&gt;id) {</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+			old = V4L2_MPEG_STREAM_TYPE_MPEG2_TS;</div><div class='add'>+			if (set &amp;&amp; new != old)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			new = old;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_PID_PMT:</div><div class='add'>+			old = params-&gt;ts_pid_pmt;</div><div class='add'>+			if (set &amp;&amp; new &gt; MPEG_PID_MAX)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &gt; MPEG_PID_MAX)</div><div class='add'>+				new = MPEG_PID_MAX;</div><div class='add'>+			params-&gt;ts_pid_pmt = new;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_PID_AUDIO:</div><div class='add'>+			old = params-&gt;ts_pid_audio;</div><div class='add'>+			if (set &amp;&amp; new &gt; MPEG_PID_MAX)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &gt; MPEG_PID_MAX)</div><div class='add'>+				new = MPEG_PID_MAX;</div><div class='add'>+			params-&gt;ts_pid_audio = new;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_PID_VIDEO:</div><div class='add'>+			old = params-&gt;ts_pid_video;</div><div class='add'>+			if (set &amp;&amp; new &gt; MPEG_PID_MAX)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &gt; MPEG_PID_MAX)</div><div class='add'>+				new = MPEG_PID_MAX;</div><div class='add'>+			params-&gt;ts_pid_video = new;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_PID_PCR:</div><div class='add'>+			old = params-&gt;ts_pid_pcr;</div><div class='add'>+			if (set &amp;&amp; new &gt; MPEG_PID_MAX)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &gt; MPEG_PID_MAX)</div><div class='add'>+				new = MPEG_PID_MAX;</div><div class='add'>+			params-&gt;ts_pid_pcr = new;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+			old = V4L2_MPEG_AUDIO_ENCODING_LAYER_2;</div><div class='add'>+			if (set &amp;&amp; new != old)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			new = old;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+			old = params-&gt;au_l2_bitrate;</div><div class='add'>+			if (set &amp;&amp; new != V4L2_MPEG_AUDIO_L2_BITRATE_256K &amp;&amp;</div><div class='add'>+				   new != V4L2_MPEG_AUDIO_L2_BITRATE_384K)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &lt;= V4L2_MPEG_AUDIO_L2_BITRATE_256K)</div><div class='add'>+				new = V4L2_MPEG_AUDIO_L2_BITRATE_256K;</div><div class='add'>+			else</div><div class='add'>+				new = V4L2_MPEG_AUDIO_L2_BITRATE_384K;</div><div class='add'>+			params-&gt;au_l2_bitrate = new;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='add'>+			old = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;</div><div class='add'>+			if (set &amp;&amp; new != old)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			new = old;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='add'>+			old = V4L2_MPEG_VIDEO_ENCODING_MPEG_2;</div><div class='add'>+			if (set &amp;&amp; new != old)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			new = old;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='add'>+			old = params-&gt;vi_aspect;</div><div class='add'>+			if (set &amp;&amp; new != V4L2_MPEG_VIDEO_ASPECT_16x9 &amp;&amp;</div><div class='add'>+				   new != V4L2_MPEG_VIDEO_ASPECT_4x3)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new != V4L2_MPEG_VIDEO_ASPECT_16x9)</div><div class='add'>+				new = V4L2_MPEG_VIDEO_ASPECT_4x3;</div><div class='add'>+			params-&gt;vi_aspect = new;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_BITRATE:</div><div class='add'>+			old = params-&gt;vi_bitrate * 1000;</div><div class='add'>+			new = 1000 * (new / 1000);</div><div class='add'>+			if (set &amp;&amp; new &gt; MPEG_VIDEO_TARGET_BITRATE_MAX * 1000)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &gt; MPEG_VIDEO_TARGET_BITRATE_MAX * 1000)</div><div class='add'>+				new = MPEG_VIDEO_TARGET_BITRATE_MAX * 1000;</div><div class='add'>+			params-&gt;vi_bitrate = new / 1000;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:</div><div class='add'>+			old = params-&gt;vi_bitrate_peak * 1000;</div><div class='add'>+			new = 1000 * (new / 1000);</div><div class='add'>+			if (set &amp;&amp; new &gt; MPEG_VIDEO_TARGET_BITRATE_MAX * 1000)</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			if (new &gt; MPEG_VIDEO_TARGET_BITRATE_MAX * 1000)</div><div class='add'>+				new = MPEG_VIDEO_TARGET_BITRATE_MAX * 1000;</div><div class='add'>+			params-&gt;vi_bitrate_peak = new / 1000;</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+			old = params-&gt;vi_bitrate_mode;</div><div class='add'>+			params-&gt;vi_bitrate_mode = new;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (cmd == VIDIOC_G_EXT_CTRLS)</div><div class='add'>+		ctrl-&gt;value = old;</div><div class='ctx'> 	else</div><div class='del'>-		h-&gt;params.au_bitrate.target = 384;</div><div class='add'>+		ctrl-&gt;value = new;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int saa6752hs_init(struct i2c_client* client)</div><div class='hunk'>@@ -395,22 +578,22 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	buf[2] = 0x0D;</div><div class='ctx'> 	i2c_master_send(client,buf,3);</div><div class='ctx'> </div><div class='del'>-    	/* Set minimum Q-scale {4} */</div><div class='add'>+	/* Set minimum Q-scale {4} */</div><div class='ctx'> 	buf[0] = 0x82;</div><div class='ctx'> 	buf[1] = 0x04;</div><div class='ctx'> 	i2c_master_send(client,buf,2);</div><div class='ctx'> </div><div class='del'>-    	/* Set maximum Q-scale {12} */</div><div class='add'>+	/* Set maximum Q-scale {12} */</div><div class='ctx'> 	buf[0] = 0x83;</div><div class='ctx'> 	buf[1] = 0x0C;</div><div class='ctx'> 	i2c_master_send(client,buf,2);</div><div class='ctx'> </div><div class='del'>-    	/* Set Output Protocol */</div><div class='add'>+	/* Set Output Protocol */</div><div class='ctx'> 	buf[0] = 0xD0;</div><div class='ctx'> 	buf[1] = 0x81;</div><div class='ctx'> 	i2c_master_send(client,buf,2);</div><div class='ctx'> </div><div class='del'>-    	/* Set video output stream format {TS} */</div><div class='add'>+	/* Set video output stream format {TS} */</div><div class='ctx'> 	buf[0] = 0xB0;</div><div class='ctx'> 	buf[1] = 0x05;</div><div class='ctx'> 	i2c_master_send(client,buf,2);</div><div class='hunk'>@@ -441,7 +624,7 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	localPMT[sizeof(PMT) - 2] = (crc &gt;&gt; 8) &amp; 0xFF;</div><div class='ctx'> 	localPMT[sizeof(PMT) - 1] = crc &amp; 0xFF;</div><div class='ctx'> </div><div class='del'>-    	/* Set Audio PID */</div><div class='add'>+	/* Set Audio PID */</div><div class='ctx'> 	buf[0] = 0xC1;</div><div class='ctx'> 	buf[1] = (h-&gt;params.ts_pid_audio &gt;&gt; 8) &amp; 0xFF;</div><div class='ctx'> 	buf[2] = h-&gt;params.ts_pid_audio &amp; 0xFF;</div><div class='hunk'>@@ -489,11 +672,11 @@ static int saa6752hs_init(struct i2c_client* client)</div><div class='ctx'> 	buf[3] = 0x82;</div><div class='ctx'> 	buf[4] = 0xB0;</div><div class='ctx'> 	buf[5] = buf2[0];</div><div class='del'>-	switch(h-&gt;params.vi_aspect_ratio) {</div><div class='del'>-	case V4L2_MPEG_ASPECT_16_9:</div><div class='add'>+	switch(h-&gt;params.vi_aspect) {</div><div class='add'>+	case V4L2_MPEG_VIDEO_ASPECT_16x9:</div><div class='ctx'> 		buf[6] = buf2[1] | 0x40;</div><div class='ctx'> 		break;</div><div class='del'>-	case V4L2_MPEG_ASPECT_4_3:</div><div class='add'>+	case V4L2_MPEG_VIDEO_ASPECT_4x3:</div><div class='ctx'> 	default:</div><div class='ctx'> 		buf[6] = buf2[1] &amp; 0xBF;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -515,6 +698,7 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	h-&gt;client = client_template;</div><div class='ctx'> 	h-&gt;params = param_defaults;</div><div class='add'>+	h-&gt;old_params = old_param_defaults;</div><div class='ctx'> 	h-&gt;client.adapter = adap;</div><div class='ctx'> 	h-&gt;client.addr = addr;</div><div class='ctx'> </div><div class='hunk'>@@ -550,20 +734,45 @@ static int</div><div class='ctx'> saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa6752hs_state *h = i2c_get_clientdata(client);</div><div class='del'>-	struct v4l2_mpeg_compression *params = arg;</div><div class='add'>+	struct v4l2_ext_controls *ctrls = arg;</div><div class='add'>+	struct v4l2_mpeg_compression *old_params = arg;</div><div class='add'>+	struct saa6752hs_mpeg_params params;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case VIDIOC_S_MPEGCOMP:</div><div class='del'>-		if (NULL == params) {</div><div class='add'>+		if (NULL == old_params) {</div><div class='ctx'> 			/* apply settings and start encoder */</div><div class='ctx'> 			saa6752hs_init(client);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		saa6752hs_set_params(client, params);</div><div class='add'>+		saa6752hs_old_set_params(client, old_params);</div><div class='ctx'> 		/* fall through */</div><div class='ctx'> 	case VIDIOC_G_MPEGCOMP:</div><div class='del'>-		*params = h-&gt;params;</div><div class='add'>+		*old_params = h-&gt;old_params;</div><div class='add'>+		break;</div><div class='add'>+	case VIDIOC_S_EXT_CTRLS:</div><div class='add'>+		if (ctrls-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (ctrls-&gt;count == 0) {</div><div class='add'>+			/* apply settings and start encoder */</div><div class='add'>+			saa6752hs_init(client);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		/* fall through */</div><div class='add'>+	case VIDIOC_TRY_EXT_CTRLS:</div><div class='add'>+	case VIDIOC_G_EXT_CTRLS:</div><div class='add'>+		if (ctrls-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		params = h-&gt;params;</div><div class='add'>+		for (i = 0; i &lt; ctrls-&gt;count; i++) {</div><div class='add'>+			if ((err = handle_ctrl(&amp;params, ctrls-&gt;controls + i, cmd))) {</div><div class='add'>+				ctrls-&gt;error_idx = i;</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		h-&gt;params = params;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VIDIOC_G_FMT:</div><div class='ctx'> 	{</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c<br/>index bb3e0ba946d3..f1fd69e7f119 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-alsa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-alsa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-alsa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-alsa.c</a></div><div class='hunk'>@@ -818,7 +818,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	    	/* output xbar always main channel */</div><div class='add'>+		/* output xbar always main channel */</div><div class='ctx'> 		saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);</div><div class='ctx'> </div><div class='ctx'> 		if (left || right) { // We've got data, turn the input on</div><div class='hunk'>@@ -929,7 +929,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(dev-&gt;pci-&gt;irq, saa7134_alsa_irq,</div><div class='del'>-				SA_SHIRQ | SA_INTERRUPT, dev-&gt;name,</div><div class='add'>+				IRQF_SHARED | IRQF_DISABLED, dev-&gt;name,</div><div class='ctx'> 				(void*) &amp;dev-&gt;dmasound);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c<br/>index 86eae3528330..927413aded10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-cards.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-cards.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-cards.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-cards.c</a></div><div class='hunk'>@@ -2160,7 +2160,7 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 		.radio = {</div><div class='ctx'> 			  .name = name_radio,</div><div class='ctx'> 			  .amux = LINE2,</div><div class='del'>-    		},</div><div class='add'>+		},</div><div class='ctx'> 	},</div><div class='ctx'> 	[SAA7134_BOARD_GOTVIEW_7135] = {</div><div class='ctx'> 		/* Mike Baikov &lt;mike@baikov.com&gt; */</div><div class='hunk'>@@ -2842,6 +2842,55 @@ struct saa7134_board saa7134_boards[] = {</div><div class='ctx'> 			.gpio = 0x000000,	/* GPIO21=Low for FM radio antenna */</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='add'>+	[SAA7134_BOARD_FLYVIDEO3000_NTSC] = {</div><div class='add'>+		/* "Zac Bowling" &lt;zac@zacbowling.com&gt; */</div><div class='add'>+		.name           = "LifeView FlyVIDEO3000 (NTSC)",</div><div class='add'>+		.audio_clock    = 0x00200000,</div><div class='add'>+		.tuner_type     = TUNER_PHILIPS_NTSC,</div><div class='add'>+		.radio_type     = UNSET,</div><div class='add'>+		.tuner_addr     = ADDR_UNSET,</div><div class='add'>+		.radio_addr     = ADDR_UNSET,</div><div class='add'>+</div><div class='add'>+		.gpiomask       = 0xe000,</div><div class='add'>+		.inputs         = {{</div><div class='add'>+			.name = name_tv,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.gpio = 0x8000,</div><div class='add'>+			.tv   = 1,</div><div class='add'>+		},{</div><div class='add'>+			.name = name_tv_mono,</div><div class='add'>+			.vmux = 1,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+			.gpio = 0x0000,</div><div class='add'>+			.tv   = 1,</div><div class='add'>+		},{</div><div class='add'>+			.name = name_comp1,</div><div class='add'>+			.vmux = 0,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+			.gpio = 0x4000,</div><div class='add'>+		},{</div><div class='add'>+			.name = name_comp2,</div><div class='add'>+			.vmux = 3,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+			.gpio = 0x4000,</div><div class='add'>+		},{</div><div class='add'>+			.name = name_svideo,</div><div class='add'>+			.vmux = 8,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+			.gpio = 0x4000,</div><div class='add'>+		}},</div><div class='add'>+		.radio = {</div><div class='add'>+			.name = name_radio,</div><div class='add'>+			.amux = LINE2,</div><div class='add'>+			.gpio = 0x2000,</div><div class='add'>+		},</div><div class='add'>+			.mute = {</div><div class='add'>+			.name = name_mute,</div><div class='add'>+			.amux = TV,</div><div class='add'>+			.gpio = 0x8000,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);</div><div class='hunk'>@@ -2901,6 +2950,12 @@ struct pci_device_id saa7134_pci_tbl[] = {</div><div class='ctx'> 	},{</div><div class='ctx'> 		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='ctx'> 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,</div><div class='add'>+		.subvendor    = 0x5169,</div><div class='add'>+		.subdevice    = 0x0138,</div><div class='add'>+		.driver_data  = SAA7134_BOARD_FLYVIDEO3000_NTSC,</div><div class='add'>+	},{</div><div class='add'>+		.vendor       = PCI_VENDOR_ID_PHILIPS,</div><div class='add'>+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,</div><div class='ctx'> 		.subvendor    = 0x5168,</div><div class='ctx'> 		.subdevice    = 0x0138,</div><div class='ctx'> 		.driver_data  = SAA7134_BOARD_FLYVIDEO3000,</div><div class='hunk'>@@ -3459,6 +3514,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)</div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case SAA7134_BOARD_FLYVIDEO2000:</div><div class='ctx'> 	case SAA7134_BOARD_FLYVIDEO3000:</div><div class='add'>+	case SAA7134_BOARD_FLYVIDEO3000_NTSC:</div><div class='ctx'> 		dev-&gt;has_remote = SAA7134_REMOTE_GPIO;</div><div class='ctx'> 		board_flyvideo(dev);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c<br/>index f0c2111f14ad..6e97cc84ba89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-core.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -871,9 +870,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> 	pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &amp;dev-&gt;pci_rev);</div><div class='ctx'> 	pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &amp;dev-&gt;pci_lat);</div><div class='ctx'> 	printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, "</div><div class='del'>-	       "latency: %d, mmio: 0x%lx\n", dev-&gt;name,</div><div class='add'>+	       "latency: %d, mmio: 0x%llx\n", dev-&gt;name,</div><div class='ctx'> 	       pci_name(pci_dev), dev-&gt;pci_rev, pci_dev-&gt;irq,</div><div class='del'>-	       dev-&gt;pci_lat,pci_resource_start(pci_dev,0));</div><div class='add'>+	       dev-&gt;pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));</div><div class='ctx'> 	pci_set_master(pci_dev);</div><div class='ctx'> 	if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) {</div><div class='ctx'> 		printk("%s: Oops: no 32bit PCI DMA ???\n",dev-&gt;name);</div><div class='hunk'>@@ -905,8 +904,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> 				pci_resource_len(pci_dev,0),</div><div class='ctx'> 				dev-&gt;name)) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='del'>-		printk(KERN_ERR "%s: can't get MMIO memory @ 0x%lx\n",</div><div class='del'>-		       dev-&gt;name,pci_resource_start(pci_dev,0));</div><div class='add'>+		printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",</div><div class='add'>+		       dev-&gt;name,(unsigned long long)pci_resource_start(pci_dev,0));</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000);</div><div class='hunk'>@@ -924,7 +923,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> </div><div class='ctx'> 	/* get irq */</div><div class='ctx'> 	err = request_irq(pci_dev-&gt;irq, saa7134_irq,</div><div class='del'>-			  SA_SHIRQ | SA_INTERRUPT, dev-&gt;name, dev);</div><div class='add'>+			  IRQF_SHARED | IRQF_DISABLED, dev-&gt;name, dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: can't get IRQ %d\n",</div><div class='ctx'> 		       dev-&gt;name,pci_dev-&gt;irq);</div><div class='hunk'>@@ -942,8 +941,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,</div><div class='ctx'> 	/* load i2c helpers */</div><div class='ctx'> 	if (TUNER_ABSENT != dev-&gt;tuner_type)</div><div class='ctx'> 		request_module("tuner");</div><div class='del'>-	if (dev-&gt;tda9887_conf)</div><div class='del'>-		request_module("tda9887");</div><div class='ctx'> 	if (card_is_empress(dev)) {</div><div class='ctx'> 		request_module("saa6752hs");</div><div class='ctx'> 		request_module_depend("saa7134-empress",&amp;need_empress);</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c<br/>index 222a36c38917..279828b8f299 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-dvb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-dvb.c</a></div><div class='hunk'>@@ -132,9 +132,8 @@ static int mt352_aver777_init(struct dvb_frontend* fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt352_pinnacle_pll_set(struct dvb_frontend* fe,</div><div class='del'>-				  struct dvb_frontend_parameters* params,</div><div class='del'>-				  u8* pllbuf)</div><div class='add'>+static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe,</div><div class='add'>+					   struct dvb_frontend_parameters* params)</div><div class='ctx'> {</div><div class='ctx'> 	u8 off[] = { 0x00, 0xf1};</div><div class='ctx'> 	u8 on[]  = { 0x00, 0x71};</div><div class='hunk'>@@ -147,30 +146,31 @@ static int mt352_pinnacle_pll_set(struct dvb_frontend* fe,</div><div class='ctx'> 	f.tuner     = 0;</div><div class='ctx'> 	f.type      = V4L2_TUNER_DIGITAL_TV;</div><div class='ctx'> 	f.frequency = params-&gt;frequency / 1000 * 16 / 1000;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> 	saa7134_i2c_call_clients(dev,VIDIOC_S_FREQUENCY,&amp;f);</div><div class='ctx'> 	msg.buf = on;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	pinnacle_antenna_pwr(dev, antenna_pwr);</div><div class='ctx'> </div><div class='ctx'> 	/* mt352 setup */</div><div class='del'>-	mt352_pinnacle_init(fe);</div><div class='del'>-	pllbuf[0] = 0xc2;</div><div class='del'>-	pllbuf[1] = 0x00;</div><div class='del'>-	pllbuf[2] = 0x00;</div><div class='del'>-	pllbuf[3] = 0x80;</div><div class='del'>-	pllbuf[4] = 0x00;</div><div class='del'>-	return 0;</div><div class='add'>+	return mt352_pinnacle_init(fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt352_aver777_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params, u8* pllbuf)</div><div class='add'>+static int mt352_aver777_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)</div><div class='ctx'> {</div><div class='del'>-	pllbuf[0] = 0xc2;</div><div class='add'>+	if (buf_len &lt; 5)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pllbuf[0] = 0x61;</div><div class='ctx'> 	dvb_pll_configure(&amp;dvb_pll_philips_td1316, pllbuf+1,</div><div class='ctx'> 			  params-&gt;frequency,</div><div class='ctx'> 			  params-&gt;u.ofdm.bandwidth);</div><div class='del'>-	return 0;</div><div class='add'>+	return 5;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config pinnacle_300i = {</div><div class='hunk'>@@ -179,13 +179,11 @@ static struct mt352_config pinnacle_300i = {</div><div class='ctx'> 	.if2           = 36150,</div><div class='ctx'> 	.no_tuner      = 1,</div><div class='ctx'> 	.demod_init    = mt352_pinnacle_init,</div><div class='del'>-	.pll_set       = mt352_pinnacle_pll_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mt352_config avermedia_777 = {</div><div class='ctx'> 	.demod_address = 0xf,</div><div class='ctx'> 	.demod_init    = mt352_aver777_init,</div><div class='del'>-	.pll_set       = mt352_aver777_pll_set,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -268,6 +266,8 @@ static int philips_tda6651_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_</div><div class='ctx'> 	tuner_buf[2] = 0xca;</div><div class='ctx'> 	tuner_buf[3] = (cp &lt;&lt; 5) | (filter &lt;&lt; 3) | band;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -281,6 +281,8 @@ static int philips_tda6651_pll_init(u8 addr, struct dvb_frontend *fe)</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };</div><div class='ctx'> </div><div class='ctx'> 	/* setup PLL configuration */</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -290,12 +292,12 @@ static int philips_tda6651_pll_init(u8 addr, struct dvb_frontend *fe)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_pll_60_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tu1216_tuner_60_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	return philips_tda6651_pll_init(0x60, fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_pll_60_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tu1216_tuner_60_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	return philips_tda6651_pll_set(0x60, fe, params);</div><div class='ctx'> }</div><div class='hunk'>@@ -315,20 +317,17 @@ static struct tda1004x_config philips_tu1216_60_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_4M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_DEFAULT,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_3617,</div><div class='del'>-	.pll_init      = philips_tu1216_pll_60_init,</div><div class='del'>-	.pll_set       = philips_tu1216_pll_60_set,</div><div class='del'>-	.pll_sleep     = NULL,</div><div class='ctx'> 	.request_firmware = philips_tu1216_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_pll_61_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tu1216_tuner_61_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	return philips_tda6651_pll_init(0x61, fe);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tu1216_pll_61_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tu1216_tuner_61_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	return philips_tda6651_pll_set(0x61, fe, params);</div><div class='ctx'> }</div><div class='hunk'>@@ -341,21 +340,20 @@ static struct tda1004x_config philips_tu1216_61_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_4M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_DEFAULT,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_3617,</div><div class='del'>-	.pll_init      = philips_tu1216_pll_61_init,</div><div class='del'>-	.pll_set       = philips_tu1216_pll_61_set,</div><div class='del'>-	.pll_sleep     = NULL,</div><div class='ctx'> 	.request_firmware = philips_tu1216_request_firmware,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int philips_europa_pll_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_europa_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 msg[] = { 0x0b, 0xf5, 0x86, 0xab };</div><div class='ctx'> 	struct i2c_msg init_msg = {.addr = 0x61,.flags = 0,.buf = msg,.len = sizeof(msg) };</div><div class='ctx'> </div><div class='ctx'> 	/* setup PLL configuration */</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;init_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -365,18 +363,20 @@ static int philips_europa_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 	init_msg.len  = 0x02;</div><div class='ctx'> 	msg[0] = 0x00;</div><div class='ctx'> 	msg[1] = 0x40;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;init_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_td1316_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_td1316_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	return philips_tda6651_pll_set(0x61, fe, params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void philips_europa_analog(struct dvb_frontend *fe)</div><div class='add'>+static int philips_europa_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	/* this message actually turns the tuner back to analog mode */</div><div class='hunk'>@@ -391,7 +391,20 @@ static void philips_europa_analog(struct dvb_frontend *fe)</div><div class='ctx'> 	analog_msg.len  = 0x02;</div><div class='ctx'> 	msg[0] = 0x00;</div><div class='ctx'> 	msg[1] = 0x14;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;analog_msg, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int philips_europa_demod_sleep(struct dvb_frontend *fe)</div><div class='add'>+{</div><div class='add'>+	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;original_demod_sleep)</div><div class='add'>+		dev-&gt;original_demod_sleep(fe);</div><div class='add'>+	fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda1004x_config philips_europa_config = {</div><div class='hunk'>@@ -402,21 +415,20 @@ static struct tda1004x_config philips_europa_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_4M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_IFO_AUTO_POS,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_052,</div><div class='del'>-	.pll_init      = philips_europa_pll_init,</div><div class='del'>-	.pll_set       = philips_td1316_pll_set,</div><div class='del'>-	.pll_sleep     = philips_europa_analog,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int philips_fmd1216_pll_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_fmd1216_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	/* this message is to set up ATC and ALC */</div><div class='ctx'> 	static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0xa0 };</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = 0x61,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	msleep(1);</div><div class='hunk'>@@ -424,22 +436,27 @@ static int philips_fmd1216_pll_init(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void philips_fmd1216_analog(struct dvb_frontend *fe)</div><div class='add'>+static int philips_fmd1216_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	/* this message actually turns the tuner back to analog mode */</div><div class='ctx'> 	static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0x60 };</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = 0x61,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1);</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> 	fmd1216_init[2] = 0x86;</div><div class='ctx'> 	fmd1216_init[3] = 0x54;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1);</div><div class='ctx'> 	msleep(1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_fmd1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[4];</div><div class='hunk'>@@ -516,6 +533,8 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_</div><div class='ctx'> 	tuner_buf[2] = 0x80 | (cp &lt;&lt; 6) | (mode  &lt;&lt; 3) | 4;</div><div class='ctx'> 	tuner_buf[3] = 0x40 | band;</div><div class='ctx'> </div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -528,9 +547,6 @@ static struct tda1004x_config medion_cardbus = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_IFO_AUTO_NEG,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_3613,</div><div class='del'>-	.pll_init      = philips_fmd1216_pll_init,</div><div class='del'>-	.pll_set       = philips_fmd1216_pll_set,</div><div class='del'>-	.pll_sleep	   = philips_fmd1216_analog,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -578,12 +594,12 @@ static struct tda827x_data tda827x_dvbt[] = {</div><div class='ctx'> 	{ .lomax =         0, .spd = 0, .bs = 0, .bp = 0, .cp = 0, .gc3 = 0, .div1p5 = 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int philips_tda827x_pll_init(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tda827x_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tda827x_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	u8 tuner_buf[14];</div><div class='hunk'>@@ -630,6 +646,8 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_</div><div class='ctx'> 	tuner_buf[13] = 0x40;</div><div class='ctx'> </div><div class='ctx'> 	tuner_msg.len = 14;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -638,18 +656,23 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_</div><div class='ctx'> 	tuner_buf[0] = 0x30;</div><div class='ctx'> 	tuner_buf[1] = 0x50 + tda827x_dvbt[i].cp;</div><div class='ctx'> 	tuner_msg.len = 2;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void philips_tda827x_pll_sleep(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tda827x_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 tda827x_sleep[] = { 0x30, 0xd0};</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep,</div><div class='ctx'> 				    .len = sizeof(tda827x_sleep) };</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda1004x_config tda827x_lifeview_config = {</div><div class='hunk'>@@ -659,9 +682,6 @@ static struct tda1004x_config tda827x_lifeview_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_TDA827X,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_045,</div><div class='del'>-	.pll_init      = philips_tda827x_pll_init,</div><div class='del'>-	.pll_set       = philips_tda827x_pll_set,</div><div class='del'>-	.pll_sleep	   = philips_tda827x_pll_sleep,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -753,6 +773,8 @@ static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb</div><div class='ctx'> 	tuner_buf[12] = 0x00;</div><div class='ctx'> 	tuner_buf[13] = 0x39;  // lpsel</div><div class='ctx'> 	msg.len = 14;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	if (i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1) != 1)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -760,10 +782,14 @@ static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb</div><div class='ctx'> 	msg.len = 2;</div><div class='ctx'> 	reg2[0] = 0x60;</div><div class='ctx'> 	reg2[1] = 0x3c;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	reg2[0] = 0xa0;</div><div class='ctx'> 	reg2[1] = 0x40;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	msleep(2);</div><div class='hunk'>@@ -771,36 +797,43 @@ static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb</div><div class='ctx'> 	reg2[0] = 0x30;</div><div class='ctx'> 	reg2[1] = 0x10 + tda827xa_dvbt[i].scr;</div><div class='ctx'> 	msg.len = 2;</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	msleep(550);</div><div class='ctx'> 	reg2[0] = 0x50;</div><div class='ctx'> 	reg2[1] = 0x4f + (tda827xa_dvbt[i].gc3 &lt;&lt; 4);</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void philips_tda827xa_pll_sleep(u8 addr, struct dvb_frontend *fe)</div><div class='add'>+static int philips_tda827xa_tuner_sleep(u8 addr, struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 tda827xa_sleep[] = { 0x30, 0x90};</div><div class='ctx'> 	struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tda827xa_sleep,</div><div class='ctx'> 				    .len = sizeof(tda827xa_sleep) };</div><div class='add'>+	if (fe-&gt;ops.i2c_gate_ctrl)</div><div class='add'>+		fe-&gt;ops.i2c_gate_ctrl(fe, 1);</div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tuner_msg, 1);</div><div class='del'>-</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int philips_tiger_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int philips_tiger_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 tda8290_close[] = { 0x21, 0xc0};</div><div class='ctx'> 	static u8 tda8290_open[]  = { 0x21, 0x80};</div><div class='ctx'> 	struct i2c_msg tda8290_msg = {.addr = 0x4b,.flags = 0, .len = 2};</div><div class='add'>+</div><div class='ctx'> 	/* close tda8290 i2c bridge */</div><div class='ctx'> 	tda8290_msg.buf = tda8290_close;</div><div class='ctx'> 	ret = i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;tda8290_msg, 1);</div><div class='hunk'>@@ -816,7 +849,7 @@ static int philips_tiger_pll_set(struct dvb_frontend *fe, struct dvb_frontend_pa</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int philips_tiger_dvb_mode(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tiger_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 data[] = { 0x3c, 0x33, 0x6a};</div><div class='hunk'>@@ -827,14 +860,15 @@ static int philips_tiger_dvb_mode(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void philips_tiger_analog_mode(struct dvb_frontend *fe)</div><div class='add'>+static int philips_tiger_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	static u8 data[] = { 0x3c, 0x33, 0x68};</div><div class='ctx'> 	struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};</div><div class='ctx'> </div><div class='ctx'> 	i2c_transfer(&amp;dev-&gt;i2c_adap, &amp;msg, 1);</div><div class='del'>-	philips_tda827xa_pll_sleep( 0x61, fe);</div><div class='add'>+	philips_tda827xa_tuner_sleep( 0x61, fe);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda1004x_config philips_tiger_config = {</div><div class='hunk'>@@ -844,15 +878,12 @@ static struct tda1004x_config philips_tiger_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_TDA827X,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_045,</div><div class='del'>-	.pll_init      = philips_tiger_dvb_mode,</div><div class='del'>-	.pll_set       = philips_tiger_pll_set,</div><div class='del'>-	.pll_sleep     = philips_tiger_analog_mode,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int lifeview_trio_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int lifeview_trio_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -860,16 +891,12 @@ static int lifeview_trio_pll_set(struct dvb_frontend *fe, struct dvb_frontend_pa</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lifeview_trio_dvb_mode(struct dvb_frontend *fe)</div><div class='add'>+static int lifeview_trio_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	philips_tda827xa_tuner_sleep(0x60, fe);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lifeview_trio_analog_mode(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	philips_tda827xa_pll_sleep(0x60, fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct tda1004x_config lifeview_trio_config = {</div><div class='ctx'> 	.demod_address = 0x09,</div><div class='ctx'> 	.invert        = 1,</div><div class='hunk'>@@ -877,15 +904,12 @@ static struct tda1004x_config lifeview_trio_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_TDA827X_GPL,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_045,</div><div class='del'>-	.pll_init      = lifeview_trio_dvb_mode,</div><div class='del'>-	.pll_set       = lifeview_trio_pll_set,</div><div class='del'>-	.pll_sleep     = lifeview_trio_analog_mode,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int ads_duo_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int ads_duo_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -893,7 +917,7 @@ static int ads_duo_pll_set(struct dvb_frontend *fe, struct dvb_frontend_paramete</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ads_duo_dvb_mode(struct dvb_frontend *fe)</div><div class='add'>+static int ads_duo_tuner_init(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	/* route TDA8275a AGC input to the channel decoder */</div><div class='hunk'>@@ -901,12 +925,13 @@ static int ads_duo_dvb_mode(struct dvb_frontend *fe)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ads_duo_analog_mode(struct dvb_frontend *fe)</div><div class='add'>+static int ads_duo_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = fe-&gt;dvb-&gt;priv;</div><div class='ctx'> 	/* route TDA8275a AGC input to the analog IF chip*/</div><div class='ctx'> 	saa_writeb(SAA7134_GPIO_GPSTATUS2, 0x20);</div><div class='del'>-	philips_tda827xa_pll_sleep( 0x61, fe);</div><div class='add'>+	philips_tda827xa_tuner_sleep( 0x61, fe);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct tda1004x_config ads_tech_duo_config = {</div><div class='hunk'>@@ -916,31 +941,24 @@ static struct tda1004x_config ads_tech_duo_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_TDA827X_GPL,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_045,</div><div class='del'>-	.pll_init      = ads_duo_dvb_mode,</div><div class='del'>-	.pll_set       = ads_duo_pll_set,</div><div class='del'>-	.pll_sleep     = ads_duo_analog_mode,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int tevion_dvb220rf_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='add'>+static int tevion_dvb220rf_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	ret = philips_tda827xa_pll_set(0x60, fe, params);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tevion_dvb220rf_pll_init(struct dvb_frontend *fe)</div><div class='add'>+static int tevion_dvb220rf_tuner_sleep(struct dvb_frontend *fe)</div><div class='ctx'> {</div><div class='add'>+	philips_tda827xa_tuner_sleep( 0x61, fe);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tevion_dvb220rf_pll_sleep(struct dvb_frontend *fe)</div><div class='del'>-{</div><div class='del'>-	philips_tda827xa_pll_sleep( 0x61, fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct tda1004x_config tevion_dvbt220rf_config = {</div><div class='ctx'> 	.demod_address = 0x08,</div><div class='ctx'> 	.invert        = 1,</div><div class='hunk'>@@ -948,9 +966,6 @@ static struct tda1004x_config tevion_dvbt220rf_config = {</div><div class='ctx'> 	.xtal_freq     = TDA10046_XTAL_16M,</div><div class='ctx'> 	.agc_config    = TDA10046_AGC_TDA827X,</div><div class='ctx'> 	.if_freq       = TDA10046_FREQ_045,</div><div class='del'>-	.pll_init      = tevion_dvb220rf_pll_init,</div><div class='del'>-	.pll_set       = tevion_dvb220rf_pll_set,</div><div class='del'>-	.pll_sleep     = tevion_dvb220rf_pll_sleep,</div><div class='ctx'> 	.request_firmware = NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -961,8 +976,6 @@ static struct tda1004x_config tevion_dvbt220rf_config = {</div><div class='ctx'> #ifdef HAVE_NXT200X</div><div class='ctx'> static struct nxt200x_config avertvhda180 = {</div><div class='ctx'> 	.demod_address    = 0x0a,</div><div class='del'>-	.pll_address      = 0x61,</div><div class='del'>-	.pll_desc         = &amp;dvb_pll_tdhu2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nxt200x_set_pll_input(u8 *buf, int input)</div><div class='hunk'>@@ -976,8 +989,6 @@ static int nxt200x_set_pll_input(u8 *buf, int input)</div><div class='ctx'> </div><div class='ctx'> static struct nxt200x_config kworldatsc110 = {</div><div class='ctx'> 	.demod_address    = 0x0a,</div><div class='del'>-	.pll_address      = 0x61,</div><div class='del'>-	.pll_desc         = &amp;dvb_pll_tuv1236d,</div><div class='ctx'> 	.set_pll_input    = nxt200x_set_pll_input,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1003,78 +1014,158 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 		printk("%s: pinnacle 300i dvb setup\n",dev-&gt;name);</div><div class='ctx'> 		dev-&gt;dvb.frontend = mt352_attach(&amp;pinnacle_300i,</div><div class='ctx'> 						 &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_777:</div><div class='ctx'> 		printk("%s: avertv 777 dvb setup\n",dev-&gt;name);</div><div class='ctx'> 		dev-&gt;dvb.frontend = mt352_attach(&amp;avermedia_777,</div><div class='ctx'> 						 &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_TDA1004X</div><div class='ctx'> 	case SAA7134_BOARD_MD7134:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;medion_cardbus,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_fmd1216_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_PHILIPS_TOUGH:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;philips_tu1216_60_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tu1216_tuner_60_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tu1216_tuner_60_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBTDUO:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;tda827x_lifeview_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tda827x_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda827x_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;tda827x_lifeview_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tda827x_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda827x_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_PHILIPS_EUROPA:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;philips_europa_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;original_demod_sleep = dev-&gt;dvb.frontend-&gt;ops.sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.sleep = philips_europa_demod_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_europa_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_europa_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_td1316_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;philips_europa_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_europa_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_europa_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_td1316_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_VIDEOMATE_DVBT_200:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;philips_tu1216_61_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tu1216_tuner_61_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tu1216_tuner_61_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_PHILIPS_TIGER:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;philips_tiger_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tiger_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_tiger_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tiger_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;philips_tiger_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tiger_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_tiger_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tiger_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBT_LR301:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;tda827x_lifeview_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = philips_tda827x_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = philips_tda827x_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = philips_tda827x_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVB_TRIO:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;lifeview_trio_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = lifeview_trio_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = lifeview_trio_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;ads_tech_duo_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = ads_duo_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = ads_duo_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = ads_duo_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_TEVION_DVBT_220RF:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;tevion_dvbt220rf_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = tevion_dvb220rf_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS:</div><div class='ctx'> 		dev-&gt;dvb.frontend = tda10046_attach(&amp;ads_tech_duo_config,</div><div class='ctx'> 						    &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.init = ads_duo_tuner_init;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.sleep = ads_duo_tuner_sleep;</div><div class='add'>+			dev-&gt;dvb.frontend-&gt;ops.tuner_ops.set_params = ads_duo_tuner_set_params;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef HAVE_NXT200X</div><div class='ctx'> 	case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:</div><div class='ctx'> 		dev-&gt;dvb.frontend = nxt200x_attach(&amp;avertvhda180, &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61, &amp;dev-&gt;i2c_adap, &amp;dvb_pll_tdhu2);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_KWORLD_ATSC110:</div><div class='ctx'> 		dev-&gt;dvb.frontend = nxt200x_attach(&amp;kworldatsc110, &amp;dev-&gt;i2c_adap);</div><div class='add'>+		if (dev-&gt;dvb.frontend) {</div><div class='add'>+			dvb_pll_attach(dev-&gt;dvb.frontend, 0x61, &amp;dev-&gt;i2c_adap, &amp;dvb_pll_tuv1236d);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1088,7 +1179,7 @@ static int dvb_init(struct saa7134_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* register everything else */</div><div class='del'>-	return videobuf_dvb_register(&amp;dev-&gt;dvb, THIS_MODULE, dev);</div><div class='add'>+	return videobuf_dvb_register(&amp;dev-&gt;dvb, THIS_MODULE, dev, &amp;dev-&gt;pci-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dvb_fini(struct saa7134_dev *dev)</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c<br/>index 1d972edb3be6..65d044086ce9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-empress.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-empress.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-empress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-empress.c</a></div><div class='hunk'>@@ -64,8 +64,10 @@ static void ts_reset_encoder(struct saa7134_dev* dev)</div><div class='ctx'> </div><div class='ctx'> static int ts_init_encoder(struct saa7134_dev* dev)</div><div class='ctx'> {</div><div class='add'>+	struct v4l2_ext_controls ctrls = { V4L2_CTRL_CLASS_MPEG, 0 };</div><div class='add'>+</div><div class='ctx'> 	ts_reset_encoder(dev);</div><div class='del'>-	saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, NULL);</div><div class='add'>+	saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, &amp;ctrls);</div><div class='ctx'> 	dev-&gt;empress_started = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -162,6 +164,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		       unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct saa7134_dev *dev = file-&gt;private_data;</div><div class='add'>+	struct v4l2_ext_controls *ctrls = arg;</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt; 1)</div><div class='ctx'> 		v4l_print_ioctl(dev-&gt;name,cmd);</div><div class='hunk'>@@ -278,12 +281,31 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		return saa7134_common_ioctl(dev, cmd, arg);</div><div class='ctx'> </div><div class='ctx'> 	case VIDIOC_S_MPEGCOMP:</div><div class='add'>+		printk(KERN_WARNING "VIDIOC_S_MPEGCOMP is obsolete. "</div><div class='add'>+				    "Replace with VIDIOC_S_EXT_CTRLS!");</div><div class='ctx'> 		saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, arg);</div><div class='ctx'> 		ts_init_encoder(dev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case VIDIOC_G_MPEGCOMP:</div><div class='add'>+		printk(KERN_WARNING "VIDIOC_G_MPEGCOMP is obsolete. "</div><div class='add'>+				    "Replace with VIDIOC_G_EXT_CTRLS!");</div><div class='ctx'> 		saa7134_i2c_call_clients(dev, VIDIOC_G_MPEGCOMP, arg);</div><div class='ctx'> 		return 0;</div><div class='add'>+	case VIDIOC_S_EXT_CTRLS:</div><div class='add'>+		/* count == 0 is abused in saa6752hs.c, so that special</div><div class='add'>+		   case is handled here explicitly. */</div><div class='add'>+		if (ctrls-&gt;count == 0)</div><div class='add'>+			return 0;</div><div class='add'>+		if (ctrls-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, arg);</div><div class='add'>+		ts_init_encoder(dev);</div><div class='add'>+		return 0;</div><div class='add'>+	case VIDIOC_G_EXT_CTRLS:</div><div class='add'>+		if (ctrls-&gt;ctrl_class != V4L2_CTRL_CLASS_MPEG)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		saa7134_i2c_call_clients(dev, VIDIOC_G_EXT_CTRLS, arg);</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOIOCTLCMD;</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c<br/>index 1426e4c8602f..7c595492c56b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-input.c</a></div><div class='hunk'>@@ -37,6 +37,10 @@ static unsigned int ir_debug = 0;</div><div class='ctx'> module_param(ir_debug, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");</div><div class='ctx'> </div><div class='add'>+static int pinnacle_remote = 0;</div><div class='add'>+module_param(pinnacle_remote, int, 0644);    /* Choose Pinnacle PCTV remote */</div><div class='add'>+MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");</div><div class='add'>+</div><div class='ctx'> #define dprintk(fmt, arg...)	if (ir_debug) \</div><div class='ctx'> 	printk(KERN_DEBUG "%s/ir: " fmt, dev-&gt;name , ## arg)</div><div class='ctx'> #define i2cdprintk(fmt, arg...)    if (ir_debug) \</div><div class='hunk'>@@ -316,8 +320,13 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)</div><div class='ctx'> 	switch (dev-&gt;board) {</div><div class='ctx'> 	case SAA7134_BOARD_PINNACLE_PCTV_110i:</div><div class='ctx'> 		snprintf(ir-&gt;c.name, sizeof(ir-&gt;c.name), "Pinnacle PCTV");</div><div class='del'>-		ir-&gt;get_key   = get_key_pinnacle;</div><div class='del'>-		ir-&gt;ir_codes  = ir_codes_pinnacle;</div><div class='add'>+		if (pinnacle_remote == 0) {</div><div class='add'>+			ir-&gt;get_key   = get_key_pinnacle_color;</div><div class='add'>+			ir-&gt;ir_codes = ir_codes_pinnacle_color;</div><div class='add'>+		} else {</div><div class='add'>+			ir-&gt;get_key   = get_key_pinnacle_grey;</div><div class='add'>+			ir-&gt;ir_codes = ir_codes_pinnacle_grey;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAA7134_BOARD_UPMOST_PURPLE_TV:</div><div class='ctx'> 		snprintf(ir-&gt;c.name, sizeof(ir-&gt;c.name), "Purple TV");</div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c<br/>index 7aa02b34e012..3895d05804ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-oss.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134-oss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134-oss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134-oss.c</a></div><div class='hunk'>@@ -845,7 +845,7 @@ int saa7134_oss_init1(struct saa7134_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if ((request_irq(dev-&gt;pci-&gt;irq, saa7134_oss_irq,</div><div class='del'>-			 SA_SHIRQ | SA_INTERRUPT, dev-&gt;name,</div><div class='add'>+			 IRQF_SHARED | IRQF_DISABLED, dev-&gt;name,</div><div class='ctx'> 			(void*) &amp;dev-&gt;dmasound)) &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h<br/>index 353af3a8b766..d5ee99c574cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/saa7134/saa7134.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/saa7134/saa7134.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/saa7134/saa7134.h</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;media/tuner.h&gt;</div><div class='ctx'> #include &lt;media/ir-common.h&gt;</div><div class='ctx'> #include &lt;media/ir-kbd-i2c.h&gt;</div><div class='hunk'>@@ -221,6 +222,7 @@ struct saa7134_format {</div><div class='ctx'> #define SAA7134_BOARD_AVERMEDIA_A169_B1 92</div><div class='ctx'> #define SAA7134_BOARD_MD7134_BRIDGE_2     93</div><div class='ctx'> #define SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS 94</div><div class='add'>+#define SAA7134_BOARD_FLYVIDEO3000_NTSC 95</div><div class='ctx'> </div><div class='ctx'> #define SAA7134_MAXBOARDS 8</div><div class='ctx'> #define SAA7134_INPUT_MAX 8</div><div class='hunk'>@@ -531,6 +533,7 @@ struct saa7134_dev {</div><div class='ctx'> </div><div class='ctx'> 	/* SAA7134_MPEG_DVB only */</div><div class='ctx'> 	struct videobuf_dvb        dvb;</div><div class='add'>+	int (*original_demod_sleep)(struct dvb_frontend* fe);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------- */</div><div class='head'>diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c<br/>index a846ebc78cd7..67987baee77a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/se401.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/se401.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/se401.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/se401.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> </div><div class='ctx'> static const char version[] = "0.24";</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='head'>diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h<br/>index a7a216bd4413..c0891b3e0018 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/se401.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/se401.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/se401.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/se401.h</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c<br/>index ea4394dc9415..48d138a7c723 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/sn9c102/sn9c102_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/sn9c102/sn9c102_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/sn9c102/sn9c102_core.c</a></div><div class='hunk'>@@ -2608,11 +2608,9 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='ctx'> 		return sn9c102_vidioc_g_ctrl(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_S_CTRL_OLD:</div><div class='ctx'> 	case VIDIOC_S_CTRL:</div><div class='ctx'> 		return sn9c102_vidioc_s_ctrl(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_CROPCAP_OLD:</div><div class='ctx'> 	case VIDIOC_CROPCAP:</div><div class='ctx'> 		return sn9c102_vidioc_cropcap(cam, arg);</div><div class='ctx'> </div><div class='hunk'>@@ -2659,7 +2657,6 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 	case VIDIOC_G_PARM:</div><div class='ctx'> 		return sn9c102_vidioc_g_parm(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_S_PARM_OLD:</div><div class='ctx'> 	case VIDIOC_S_PARM:</div><div class='ctx'> 		return sn9c102_vidioc_s_parm(cam, arg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c<br/>index 07476c71174a..b36ba9fa3a28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/stradis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/stradis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/stradis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/stradis.c</a></div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "saa7146.h"</div><div class='ctx'> #include "saa7146reg.h"</div><div class='hunk'>@@ -1982,7 +1983,7 @@ static int __devinit configure_saa7146(struct pci_dev *pdev, int num)</div><div class='ctx'> 	memcpy(&amp;saa-&gt;video_dev, &amp;saa_template, sizeof(saa_template));</div><div class='ctx'> 	saawrite(0, SAA7146_IER);	/* turn off all interrupts */</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(saa-&gt;irq, saa7146_irq, SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+	retval = request_irq(saa-&gt;irq, saa7146_irq, IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 		"stradis", saa);</div><div class='ctx'> 	if (retval == -EINVAL)</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "%d: Bad irq number or handler\n", num);</div><div class='hunk'>@@ -2189,7 +2190,7 @@ static struct pci_driver stradis_driver = {</div><div class='ctx'> 	.remove = __devexit_p(stradis_remove)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init stradis_init(void)</div><div class='add'>+static int __init stradis_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='hunk'>@@ -2202,7 +2203,7 @@ int __init stradis_init(void)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit stradis_exit(void)</div><div class='add'>+static void __exit stradis_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;stradis_driver);</div><div class='ctx'> 	printk(KERN_INFO "stradis: module cleanup complete\n");</div><div class='head'>diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c<br/>index b38bda83a7c5..2ba2991a214f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/stv680.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/stv680.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/stv680.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/stv680.c</a></div><div class='hunk'>@@ -58,7 +58,6 @@</div><div class='ctx'>  *			   Fixed proc entry removal bug.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -66,6 +65,7 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c<br/>index 103ccb919292..827633b3bb43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tda9875.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tda9875.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tda9875.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tda9875.c</a></div><div class='hunk'>@@ -26,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -163,7 +164,7 @@ static void do_tda9875_init(struct i2c_client *client)</div><div class='ctx'> 	struct tda9875 *t = i2c_get_clientdata(client);</div><div class='ctx'> 	dprintk("In tda9875_init\n");</div><div class='ctx'> 	tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/</div><div class='del'>-    	tda9875_write(client, TDA9875_MSR, 0x03 );    /* Monitor 0b00000XXX*/</div><div class='add'>+	tda9875_write(client, TDA9875_MSR, 0x03 );    /* Monitor 0b00000XXX*/</div><div class='ctx'> 	tda9875_write(client, TDA9875_C1MSB, 0x00 );  /*Car1(FM) MSB XMHz*/</div><div class='ctx'> 	tda9875_write(client, TDA9875_C1MIB, 0x00 );  /*Car1(FM) MIB XMHz*/</div><div class='ctx'> 	tda9875_write(client, TDA9875_C1LSB, 0x00 );  /*Car1(FM) LSB XMHz*/</div><div class='head'>diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c<br/>index 0d54f6c1982b..8dab481d384a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tda9887.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tda9887.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tda9887.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tda9887.c</a></div><div class='hunk'>@@ -18,49 +18,21 @@</div><div class='ctx'>    TDA9886 (PAL, SECAM, NTSC)</div><div class='ctx'>    TDA9887 (PAL, SECAM, NTSC, FM Radio)</div><div class='ctx'> </div><div class='del'>-   found on:</div><div class='del'>-   - Pinnacle PCTV (Jul.2002 Version with MT2032, bttv)</div><div class='del'>-      TDA9887 (world), TDA9885 (USA)</div><div class='del'>-      Note: OP2 of tda988x must be set to 1, else MT2032 is disabled!</div><div class='del'>-   - KNC One TV-Station RDS (saa7134)</div><div class='del'>-   - Hauppauge PVR-150/500 (possibly more)</div><div class='add'>+   Used as part of several tuners</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#define tda9887_info(fmt, arg...) do {\</div><div class='add'>+	printk(KERN_INFO "%s %d-%04x: " fmt, t-&gt;i2c.name, \</div><div class='add'>+			i2c_adapter_id(t-&gt;i2c.adapter), t-&gt;i2c.addr , ##arg); } while (0)</div><div class='add'>+#define tda9887_dbg(fmt, arg...) do {\</div><div class='add'>+	if (tuner_debug) \</div><div class='add'>+		printk(KERN_INFO "%s %d-%04x: " fmt, t-&gt;i2c.name, \</div><div class='add'>+			i2c_adapter_id(t-&gt;i2c.adapter), t-&gt;i2c.addr , ##arg); } while (0)</div><div class='ctx'> </div><div class='del'>-/* Addresses to scan */</div><div class='del'>-static unsigned short normal_i2c[] = {</div><div class='del'>-	0x84 &gt;&gt;1,</div><div class='del'>-	0x86 &gt;&gt;1,</div><div class='del'>-	0x96 &gt;&gt;1,</div><div class='del'>-	I2C_CLIENT_END,</div><div class='del'>-};</div><div class='del'>-I2C_CLIENT_INSMOD;</div><div class='del'>-</div><div class='del'>-/* insmod options */</div><div class='del'>-static unsigned int debug = 0;</div><div class='del'>-module_param(debug, int, 0644);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #define UNSET       (-1U)</div><div class='del'>-#define tda9887_info(fmt, arg...) do {\</div><div class='del'>-	printk(KERN_INFO "%s %d-%04x: " fmt, t-&gt;client.name, \</div><div class='del'>-			i2c_adapter_id(t-&gt;client.adapter), t-&gt;client.addr , ##arg); } while (0)</div><div class='del'>-#define tda9887_dbg(fmt, arg...) do {\</div><div class='del'>-	if (debug) \</div><div class='del'>-		printk(KERN_INFO "%s %d-%04x: " fmt, t-&gt;client.name, \</div><div class='del'>-			i2c_adapter_id(t-&gt;client.adapter), t-&gt;client.addr , ##arg); } while (0)</div><div class='del'>-</div><div class='del'>-struct tda9887 {</div><div class='del'>-	struct i2c_client  client;</div><div class='del'>-	v4l2_std_id        std;</div><div class='del'>-	enum tuner_mode    mode;</div><div class='del'>-	unsigned int       config;</div><div class='del'>-	unsigned int       using_v4l2;</div><div class='del'>-	unsigned int 	   radio_mode;</div><div class='del'>-	unsigned char 	   data[4];</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> struct tvnorm {</div><div class='ctx'> 	v4l2_std_id       std;</div><div class='hunk'>@@ -70,9 +42,6 @@ struct tvnorm {</div><div class='ctx'> 	unsigned char     e;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct i2c_driver driver;</div><div class='del'>-static struct i2c_client client_template;</div><div class='del'>-</div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> //</div><div class='hunk'>@@ -115,8 +84,7 @@ static struct i2c_client client_template;</div><div class='ctx'> #define cAudioGain6             0x80    // bit c7</div><div class='ctx'> </div><div class='ctx'> #define cTopMask                0x1f    // bit c0:4</div><div class='del'>-#define cTopPalSecamDefault	0x14 	// bit c0:4</div><div class='del'>-#define cTopNtscRadioDefault 	0x10 	// bit c0:4</div><div class='add'>+#define cTopDefault		0x10 	// bit c0:4</div><div class='ctx'> </div><div class='ctx'> //// third reg (e)</div><div class='ctx'> #define cAudioIF_4_5             0x00    // bit e0:1</div><div class='hunk'>@@ -154,7 +122,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis50  |</div><div class='del'>-			   cTopPalSecamDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_5_5   |</div><div class='ctx'> 			   cVideoIF_38_90 ),</div><div class='hunk'>@@ -165,7 +133,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis50  |</div><div class='del'>-			   cTopPalSecamDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_6_0   |</div><div class='ctx'> 			   cVideoIF_38_90 ),</div><div class='hunk'>@@ -176,7 +144,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis50  |</div><div class='del'>-			   cTopPalSecamDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_6_5   |</div><div class='ctx'> 			   cVideoIF_38_90 ),</div><div class='hunk'>@@ -187,7 +155,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis75  |</div><div class='del'>-			   cTopNtscRadioDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_4_5   |</div><div class='ctx'> 			   cVideoIF_45_75 ),</div><div class='hunk'>@@ -196,7 +164,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 		.name  = "SECAM-BGH",</div><div class='ctx'> 		.b     = ( cPositiveAmTV  |</div><div class='ctx'> 			   cQSS           ),</div><div class='del'>-		.c     = ( cTopPalSecamDefault),</div><div class='add'>+		.c     = ( cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36	  |</div><div class='ctx'> 			   cAudioIF_5_5   |</div><div class='ctx'> 			   cVideoIF_38_90 ),</div><div class='hunk'>@@ -205,7 +173,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 		.name  = "SECAM-L",</div><div class='ctx'> 		.b     = ( cPositiveAmTV  |</div><div class='ctx'> 			   cQSS           ),</div><div class='del'>-		.c     = ( cTopPalSecamDefault),</div><div class='add'>+		.c     = ( cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36	  |</div><div class='ctx'> 			   cAudioIF_6_5   |</div><div class='ctx'> 			   cVideoIF_38_90 ),</div><div class='hunk'>@@ -215,7 +183,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 		.b     = ( cOutputPort2Inactive |</div><div class='ctx'> 			   cPositiveAmTV  |</div><div class='ctx'> 			   cQSS           ),</div><div class='del'>-		.c     = ( cTopPalSecamDefault),</div><div class='add'>+		.c     = ( cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36	  |</div><div class='ctx'> 			   cAudioIF_6_5   |</div><div class='ctx'> 			   cVideoIF_33_90 ),</div><div class='hunk'>@@ -226,7 +194,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis50  |</div><div class='del'>-			   cTopPalSecamDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_6_5   |</div><div class='ctx'> 			   cVideoIF_38_90 ),</div><div class='hunk'>@@ -237,7 +205,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis75  |</div><div class='del'>-			   cTopNtscRadioDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_4_5   |</div><div class='ctx'> 			   cVideoIF_45_75 ),</div><div class='hunk'>@@ -248,7 +216,7 @@ static struct tvnorm tvnorms[] = {</div><div class='ctx'> 			   cQSS           ),</div><div class='ctx'> 		.c     = ( cDeemphasisON  |</div><div class='ctx'> 			   cDeemphasis50  |</div><div class='del'>-			   cTopNtscRadioDefault),</div><div class='add'>+			   cTopDefault),</div><div class='ctx'> 		.e     = ( cGating_36     |</div><div class='ctx'> 			   cAudioIF_4_5   |</div><div class='ctx'> 			   cVideoIF_58_75 ),</div><div class='hunk'>@@ -261,7 +229,7 @@ static struct tvnorm radio_stereo = {</div><div class='ctx'> 		  cQSS           ),</div><div class='ctx'> 	.c    = ( cDeemphasisOFF |</div><div class='ctx'> 		  cAudioGain6    |</div><div class='del'>-		  cTopNtscRadioDefault),</div><div class='add'>+		  cTopDefault),</div><div class='ctx'> 	.e    = ( cTunerGainLow  |</div><div class='ctx'> 		  cAudioIF_5_5   |</div><div class='ctx'> 		  cRadioIF_38_90 ),</div><div class='hunk'>@@ -273,7 +241,7 @@ static struct tvnorm radio_mono = {</div><div class='ctx'> 		  cQSS           ),</div><div class='ctx'> 	.c    = ( cDeemphasisON  |</div><div class='ctx'> 		  cDeemphasis75  |</div><div class='del'>-		  cTopNtscRadioDefault),</div><div class='add'>+		  cTopDefault),</div><div class='ctx'> 	.e    = ( cTunerGainLow  |</div><div class='ctx'> 		  cAudioIF_5_5   |</div><div class='ctx'> 		  cRadioIF_38_90 ),</div><div class='hunk'>@@ -281,7 +249,7 @@ static struct tvnorm radio_mono = {</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static void dump_read_message(struct tda9887 *t, unsigned char *buf)</div><div class='add'>+static void dump_read_message(struct tuner *t, unsigned char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	static char *afc[16] = {</div><div class='ctx'> 		"- 12.5 kHz",</div><div class='hunk'>@@ -309,7 +277,7 @@ static void dump_read_message(struct tda9887 *t, unsigned char *buf)</div><div class='ctx'> 	tda9887_info("  vfi level      : %s\n", (buf[0] &amp; 0x80) ? "high" : "low");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dump_write_message(struct tda9887 *t, unsigned char *buf)</div><div class='add'>+static void dump_write_message(struct tuner *t, unsigned char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	static char *sound[4] = {</div><div class='ctx'> 		"AM/TV",</div><div class='hunk'>@@ -405,13 +373,13 @@ static void dump_write_message(struct tda9887 *t, unsigned char *buf)</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)</div><div class='add'>+static int tda9887_set_tvnorm(struct tuner *t, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct tvnorm *norm = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;mode == T_RADIO) {</div><div class='del'>-		if (t-&gt;radio_mode == V4L2_TUNER_MODE_MONO)</div><div class='add'>+	if (t-&gt;mode == V4L2_TUNER_RADIO) {</div><div class='add'>+		if (t-&gt;audmode == V4L2_TUNER_MODE_MONO)</div><div class='ctx'> 			norm = &amp;radio_mono;</div><div class='ctx'> 		else</div><div class='ctx'> 			norm = &amp;radio_stereo;</div><div class='hunk'>@@ -445,7 +413,7 @@ module_param(port2, int, 0644);</div><div class='ctx'> module_param(qss, int, 0644);</div><div class='ctx'> module_param(adjust, int, 0644);</div><div class='ctx'> </div><div class='del'>-static int tda9887_set_insmod(struct tda9887 *t, char *buf)</div><div class='add'>+static int tda9887_set_insmod(struct tuner *t, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	if (UNSET != port1) {</div><div class='ctx'> 		if (port1)</div><div class='hunk'>@@ -474,27 +442,27 @@ static int tda9887_set_insmod(struct tda9887 *t, char *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda9887_set_config(struct tda9887 *t, char *buf)</div><div class='add'>+static int tda9887_set_config(struct tuner *t, char *buf)</div><div class='ctx'> {</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_PORT1_ACTIVE)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_PORT1_ACTIVE)</div><div class='ctx'> 		buf[1] &amp;= ~cOutputPort1Inactive;</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_PORT1_INACTIVE)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_PORT1_INACTIVE)</div><div class='ctx'> 		buf[1] |= cOutputPort1Inactive;</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_PORT2_ACTIVE)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_PORT2_ACTIVE)</div><div class='ctx'> 		buf[1] &amp;= ~cOutputPort2Inactive;</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_PORT2_INACTIVE)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_PORT2_INACTIVE)</div><div class='ctx'> 		buf[1] |= cOutputPort2Inactive;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;config &amp; TDA9887_QSS)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_QSS)</div><div class='ctx'> 		buf[1] |= cQSS;</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_INTERCARRIER)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_INTERCARRIER)</div><div class='ctx'> 		buf[1] &amp;= ~cQSS;</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;config &amp; TDA9887_AUTOMUTE)</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_AUTOMUTE)</div><div class='ctx'> 		buf[1] |= cAutoMuteFmActive;</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_DEEMPHASIS_MASK) {</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_DEEMPHASIS_MASK) {</div><div class='ctx'> 		buf[2] &amp;= ~0x60;</div><div class='del'>-		switch (t-&gt;config &amp; TDA9887_DEEMPHASIS_MASK) {</div><div class='add'>+		switch (t-&gt;tda9887_config &amp; TDA9887_DEEMPHASIS_MASK) {</div><div class='ctx'> 		case TDA9887_DEEMPHASIS_NONE:</div><div class='ctx'> 			buf[2] |= cDeemphasisOFF;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -506,153 +474,36 @@ static int tda9887_set_config(struct tda9887 *t, char *buf)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (t-&gt;config &amp; TDA9887_TOP_SET) {</div><div class='add'>+	if (t-&gt;tda9887_config &amp; TDA9887_TOP_SET) {</div><div class='ctx'> 		buf[2] &amp;= ~cTopMask;</div><div class='del'>-		buf[2] |= (t-&gt;config &gt;&gt; 8) &amp; cTopMask;</div><div class='add'>+		buf[2] |= (t-&gt;tda9887_config &gt;&gt; 8) &amp; cTopMask;</div><div class='ctx'> 	}</div><div class='del'>-	if ((t-&gt;config &amp; TDA9887_INTERCARRIER_NTSC) &amp;&amp; (t-&gt;std &amp; V4L2_STD_NTSC))</div><div class='add'>+	if ((t-&gt;tda9887_config &amp; TDA9887_INTERCARRIER_NTSC) &amp;&amp; (t-&gt;std &amp; V4L2_STD_NTSC))</div><div class='ctx'> 		buf[1] &amp;= ~cQSS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static char pal[] = "--";</div><div class='del'>-static char secam[] = "--";</div><div class='del'>-static char ntsc[] = "-";</div><div class='del'>-</div><div class='del'>-module_param_string(pal, pal, sizeof(pal), 0644);</div><div class='del'>-module_param_string(secam, secam, sizeof(secam), 0644);</div><div class='del'>-module_param_string(ntsc, ntsc, sizeof(ntsc), 0644);</div><div class='del'>-</div><div class='del'>-static int tda9887_fixup_std(struct tda9887 *t)</div><div class='del'>-{</div><div class='del'>-	/* get more precise norm info from insmod option */</div><div class='del'>-	if ((t-&gt;std &amp; V4L2_STD_PAL) == V4L2_STD_PAL) {</div><div class='del'>-		switch (pal[0]) {</div><div class='del'>-		case 'b':</div><div class='del'>-		case 'B':</div><div class='del'>-		case 'g':</div><div class='del'>-		case 'G':</div><div class='del'>-		case 'h':</div><div class='del'>-		case 'H':</div><div class='del'>-		case 'n':</div><div class='del'>-		case 'N':</div><div class='del'>-			if (pal[1] == 'c' || pal[1] == 'C') {</div><div class='del'>-				tda9887_dbg("insmod fixup: PAL =&gt; PAL-Nc\n");</div><div class='del'>-				t-&gt;std = V4L2_STD_PAL_Nc;</div><div class='del'>-			} else {</div><div class='del'>-				tda9887_dbg("insmod fixup: PAL =&gt; PAL-BGHN\n");</div><div class='del'>-				t-&gt;std = V4L2_STD_PAL_BG | V4L2_STD_PAL_H | V4L2_STD_PAL_N;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 'i':</div><div class='del'>-		case 'I':</div><div class='del'>-			tda9887_dbg("insmod fixup: PAL =&gt; PAL-I\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_PAL_I;</div><div class='del'>-			break;</div><div class='del'>-		case 'd':</div><div class='del'>-		case 'D':</div><div class='del'>-		case 'k':</div><div class='del'>-		case 'K':</div><div class='del'>-			tda9887_dbg("insmod fixup: PAL =&gt; PAL-DK\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_PAL_DK;</div><div class='del'>-			break;</div><div class='del'>-		case 'm':</div><div class='del'>-		case 'M':</div><div class='del'>-			tda9887_dbg("insmod fixup: PAL =&gt; PAL-M\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_PAL_M;</div><div class='del'>-			break;</div><div class='del'>-		case '-':</div><div class='del'>-			/* default parameter, do nothing */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			tda9887_info("pal= argument not recognised\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((t-&gt;std &amp; V4L2_STD_SECAM) == V4L2_STD_SECAM) {</div><div class='del'>-		switch (secam[0]) {</div><div class='del'>-		case 'b':</div><div class='del'>-		case 'B':</div><div class='del'>-		case 'g':</div><div class='del'>-		case 'G':</div><div class='del'>-		case 'h':</div><div class='del'>-		case 'H':</div><div class='del'>-			tda9887_dbg("insmod fixup: SECAM =&gt; SECAM-BGH\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H;</div><div class='del'>-			break;</div><div class='del'>-		case 'd':</div><div class='del'>-		case 'D':</div><div class='del'>-		case 'k':</div><div class='del'>-		case 'K':</div><div class='del'>-			tda9887_dbg("insmod fixup: SECAM =&gt; SECAM-DK\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_SECAM_DK;</div><div class='del'>-			break;</div><div class='del'>-		case 'l':</div><div class='del'>-		case 'L':</div><div class='del'>-			if (secam[1] == 'c' || secam[1] == 'C') {</div><div class='del'>-				tda9887_dbg("insmod fixup: SECAM =&gt; SECAM-L'\n");</div><div class='del'>-				t-&gt;std = V4L2_STD_SECAM_LC;</div><div class='del'>-			} else {</div><div class='del'>-				tda9887_dbg("insmod fixup: SECAM =&gt; SECAM-L\n");</div><div class='del'>-				t-&gt;std = V4L2_STD_SECAM_L;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case '-':</div><div class='del'>-			/* default parameter, do nothing */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			tda9887_info("secam= argument not recognised\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((t-&gt;std &amp; V4L2_STD_NTSC) == V4L2_STD_NTSC) {</div><div class='del'>-		switch (ntsc[0]) {</div><div class='del'>-		case 'm':</div><div class='del'>-		case 'M':</div><div class='del'>-			tda9887_dbg("insmod fixup: NTSC =&gt; NTSC-M\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_NTSC_M;</div><div class='del'>-			break;</div><div class='del'>-		case 'j':</div><div class='del'>-		case 'J':</div><div class='del'>-			tda9887_dbg("insmod fixup: NTSC =&gt; NTSC_M_JP\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_NTSC_M_JP;</div><div class='del'>-			break;</div><div class='del'>-		case 'k':</div><div class='del'>-		case 'K':</div><div class='del'>-			tda9887_dbg("insmod fixup: NTSC =&gt; NTSC_M_KR\n");</div><div class='del'>-			t-&gt;std = V4L2_STD_NTSC_M_KR;</div><div class='del'>-			break;</div><div class='del'>-		case '-':</div><div class='del'>-			/* default parameter, do nothing */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			tda9887_info("ntsc= argument not recognised\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tda9887_status(struct tda9887 *t)</div><div class='add'>+static int tda9887_status(struct tuner *t)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char buf[1];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	memset(buf,0,sizeof(buf));</div><div class='del'>-	if (1 != (rc = i2c_master_recv(&amp;t-&gt;client,buf,1)))</div><div class='add'>+	if (1 != (rc = i2c_master_recv(&amp;t-&gt;i2c,buf,1)))</div><div class='ctx'> 		tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);</div><div class='ctx'> 	dump_read_message(t, buf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda9887_configure(struct tda9887 *t)</div><div class='add'>+static void tda9887_configure(struct i2c_client *client)</div><div class='ctx'> {</div><div class='add'>+	struct tuner *t = i2c_get_clientdata(client);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	memset(t-&gt;data,0,sizeof(t-&gt;data));</div><div class='del'>-	tda9887_set_tvnorm(t,t-&gt;data);</div><div class='add'>+	memset(t-&gt;tda9887_data,0,sizeof(t-&gt;tda9887_data));</div><div class='add'>+	tda9887_set_tvnorm(t,t-&gt;tda9887_data);</div><div class='ctx'> </div><div class='ctx'> 	/* A note on the port settings:</div><div class='ctx'> 	   These settings tend to depend on the specifics of the board.</div><div class='hunk'>@@ -667,249 +518,84 @@ static int tda9887_configure(struct tda9887 *t)</div><div class='ctx'> 	   the ports should be set to active (0), but, again, that may</div><div class='ctx'> 	   differ depending on the precise hardware configuration.</div><div class='ctx'> 	 */</div><div class='del'>-	t-&gt;data[1] |= cOutputPort1Inactive;</div><div class='del'>-	t-&gt;data[1] |= cOutputPort2Inactive;</div><div class='add'>+	t-&gt;tda9887_data[1] |= cOutputPort1Inactive;</div><div class='add'>+	t-&gt;tda9887_data[1] |= cOutputPort2Inactive;</div><div class='ctx'> </div><div class='del'>-	tda9887_set_config(t,t-&gt;data);</div><div class='del'>-	tda9887_set_insmod(t,t-&gt;data);</div><div class='add'>+	tda9887_set_config(t,t-&gt;tda9887_data);</div><div class='add'>+	tda9887_set_insmod(t,t-&gt;tda9887_data);</div><div class='ctx'> </div><div class='ctx'> 	if (t-&gt;mode == T_STANDBY) {</div><div class='del'>-		t-&gt;data[1] |= cForcedMuteAudioON;</div><div class='add'>+		t-&gt;tda9887_data[1] |= cForcedMuteAudioON;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",</div><div class='del'>-		t-&gt;data[1],t-&gt;data[2],t-&gt;data[3]);</div><div class='del'>-	if (debug &gt; 1)</div><div class='del'>-		dump_write_message(t, t-&gt;data);</div><div class='add'>+		t-&gt;tda9887_data[1],t-&gt;tda9887_data[2],t-&gt;tda9887_data[3]);</div><div class='add'>+	if (tuner_debug &gt; 1)</div><div class='add'>+		dump_write_message(t, t-&gt;tda9887_data);</div><div class='ctx'> </div><div class='del'>-	if (4 != (rc = i2c_master_send(&amp;t-&gt;client,t-&gt;data,4)))</div><div class='add'>+	if (4 != (rc = i2c_master_send(&amp;t-&gt;i2c,t-&gt;tda9887_data,4)))</div><div class='ctx'> 		tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);</div><div class='ctx'> </div><div class='del'>-	if (debug &gt; 2) {</div><div class='add'>+	if (tuner_debug &gt; 2) {</div><div class='ctx'> 		msleep_interruptible(1000);</div><div class='ctx'> 		tda9887_status(t);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='add'>+static void tda9887_tuner_status(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct tda9887 *t;</div><div class='del'>-</div><div class='del'>-	client_template.adapter = adap;</div><div class='del'>-	client_template.addr    = addr;</div><div class='del'>-</div><div class='del'>-	if (NULL == (t = kzalloc(sizeof(*t), GFP_KERNEL)))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	t-&gt;client      = client_template;</div><div class='del'>-	t-&gt;std         = 0;</div><div class='del'>-	t-&gt;radio_mode = V4L2_TUNER_MODE_STEREO;</div><div class='del'>-</div><div class='del'>-	tda9887_info("chip found @ 0x%x (%s)\n", addr&lt;&lt;1, adap-&gt;name);</div><div class='del'>-</div><div class='del'>-	i2c_set_clientdata(&amp;t-&gt;client, t);</div><div class='del'>-	i2c_attach_client(&amp;t-&gt;client);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	struct tuner *t = i2c_get_clientdata(client);</div><div class='add'>+	tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n", t-&gt;tda9887_data[1], t-&gt;tda9887_data[2], t-&gt;tda9887_data[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda9887_probe(struct i2c_adapter *adap)</div><div class='add'>+static int tda9887_get_afc(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	if (adap-&gt;class &amp; I2C_CLASS_TV_ANALOG)</div><div class='del'>-		return i2c_probe(adap, &amp;addr_data, tda9887_attach);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct tuner *t = i2c_get_clientdata(client);</div><div class='add'>+	static int AFC_BITS_2_kHz[] = {</div><div class='add'>+		-12500,  -37500,  -62500,  -97500,</div><div class='add'>+		-112500, -137500, -162500, -187500,</div><div class='add'>+		187500,  162500,  137500,  112500,</div><div class='add'>+		97500 ,  62500,   37500 ,  12500</div><div class='add'>+	};</div><div class='add'>+	int afc=0;</div><div class='add'>+	__u8 reg = 0;</div><div class='ctx'> </div><div class='del'>-static int tda9887_detach(struct i2c_client *client)</div><div class='del'>-{</div><div class='del'>-	struct tda9887 *t = i2c_get_clientdata(client);</div><div class='add'>+	if (1 == i2c_master_recv(&amp;t-&gt;i2c,&amp;reg,1))</div><div class='add'>+		afc = AFC_BITS_2_kHz[(reg&gt;&gt;1)&amp;0x0f];</div><div class='ctx'> </div><div class='del'>-	i2c_detach_client(client);</div><div class='del'>-	kfree(t);</div><div class='del'>-	return 0;</div><div class='add'>+	return afc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SWITCH_V4L2	if (!t-&gt;using_v4l2 &amp;&amp; debug) \</div><div class='del'>-			  tda9887_info("switching to v4l2\n"); \</div><div class='del'>-			  t-&gt;using_v4l2 = 1;</div><div class='del'>-#define CHECK_V4L2	if (t-&gt;using_v4l2) { if (debug) \</div><div class='del'>-			  tda9887_info("ignore v4l1 call\n"); \</div><div class='del'>-			  return 0; }</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='add'>+static void tda9887_standby(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct tda9887 *t = i2c_get_clientdata(client);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-</div><div class='del'>-	/* --- configuration --- */</div><div class='del'>-	case AUDC_SET_RADIO:</div><div class='del'>-	{</div><div class='del'>-		t-&gt;mode = T_RADIO;</div><div class='del'>-		tda9887_configure(t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case TUNER_SET_STANDBY:</div><div class='del'>-	{</div><div class='del'>-		t-&gt;mode = T_STANDBY;</div><div class='del'>-		tda9887_configure(t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case TDA9887_SET_CONFIG:</div><div class='del'>-	{</div><div class='del'>-		int *i = arg;</div><div class='del'>-</div><div class='del'>-		t-&gt;config = *i;</div><div class='del'>-		tda9887_configure(t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* --- v4l ioctls --- */</div><div class='del'>-	/* take care: bttv does userspace copying, we'll get a</div><div class='del'>-	   kernel pointer here... */</div><div class='del'>-	case VIDIOCSCHAN:</div><div class='del'>-	{</div><div class='del'>-		static const v4l2_std_id map[] = {</div><div class='del'>-			[ VIDEO_MODE_PAL   ] = V4L2_STD_PAL,</div><div class='del'>-			[ VIDEO_MODE_NTSC  ] = V4L2_STD_NTSC_M,</div><div class='del'>-			[ VIDEO_MODE_SECAM ] = V4L2_STD_SECAM,</div><div class='del'>-			[ 4 /* bttv */     ] = V4L2_STD_PAL_M,</div><div class='del'>-			[ 5 /* bttv */     ] = V4L2_STD_PAL_N,</div><div class='del'>-			[ 6 /* bttv */     ] = V4L2_STD_NTSC_M_JP,</div><div class='del'>-		};</div><div class='del'>-		struct video_channel *vc = arg;</div><div class='del'>-</div><div class='del'>-		CHECK_V4L2;</div><div class='del'>-		t-&gt;mode = T_ANALOG_TV;</div><div class='del'>-		if (vc-&gt;norm &lt; ARRAY_SIZE(map))</div><div class='del'>-			t-&gt;std = map[vc-&gt;norm];</div><div class='del'>-		tda9887_fixup_std(t);</div><div class='del'>-		tda9887_configure(t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_STD:</div><div class='del'>-	{</div><div class='del'>-		v4l2_std_id *id = arg;</div><div class='del'>-</div><div class='del'>-		SWITCH_V4L2;</div><div class='del'>-		t-&gt;mode = T_ANALOG_TV;</div><div class='del'>-		t-&gt;std   = *id;</div><div class='del'>-		tda9887_fixup_std(t);</div><div class='del'>-		tda9887_configure(t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_FREQUENCY:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_frequency *f = arg;</div><div class='del'>-</div><div class='del'>-		SWITCH_V4L2;</div><div class='del'>-		if (V4L2_TUNER_ANALOG_TV == f-&gt;type) {</div><div class='del'>-			if (t-&gt;mode == T_ANALOG_TV)</div><div class='del'>-				return 0;</div><div class='del'>-			t-&gt;mode = T_ANALOG_TV;</div><div class='del'>-		}</div><div class='del'>-		if (V4L2_TUNER_RADIO == f-&gt;type) {</div><div class='del'>-			if (t-&gt;mode == T_RADIO)</div><div class='del'>-				return 0;</div><div class='del'>-			t-&gt;mode = T_RADIO;</div><div class='del'>-		}</div><div class='del'>-		tda9887_configure(t);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_G_TUNER:</div><div class='del'>-	{</div><div class='del'>-		static int AFC_BITS_2_kHz[] = {</div><div class='del'>-			-12500,  -37500,  -62500,  -97500,</div><div class='del'>-			-112500, -137500, -162500, -187500,</div><div class='del'>-			187500,  162500,  137500,  112500,</div><div class='del'>-			97500 ,  62500,   37500 ,  12500</div><div class='del'>-		};</div><div class='del'>-		struct v4l2_tuner* tuner = arg;</div><div class='del'>-</div><div class='del'>-		if (t-&gt;mode == T_RADIO) {</div><div class='del'>-			__u8 reg = 0;</div><div class='del'>-			tuner-&gt;afc=0;</div><div class='del'>-			if (1 == i2c_master_recv(&amp;t-&gt;client,&amp;reg,1))</div><div class='del'>-				tuner-&gt;afc = AFC_BITS_2_kHz[(reg&gt;&gt;1)&amp;0x0f];</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_TUNER:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_tuner* tuner = arg;</div><div class='del'>-</div><div class='del'>-		if (t-&gt;mode == T_RADIO) {</div><div class='del'>-			t-&gt;radio_mode = tuner-&gt;audmode;</div><div class='del'>-			tda9887_configure (t);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_LOG_STATUS:</div><div class='del'>-	{</div><div class='del'>-		tda9887_info("Data bytes: b=0x%02x c=0x%02x e=0x%02x\n", t-&gt;data[1], t-&gt;data[2], t-&gt;data[3]);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		/* nothing */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	tda9887_configure(client);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda9887_suspend(struct device * dev, pm_message_t state)</div><div class='add'>+static void tda9887_set_freq(struct i2c_client *client, unsigned int freq)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *c = container_of(dev, struct i2c_client, dev);</div><div class='del'>-	struct tda9887 *t = i2c_get_clientdata(c);</div><div class='del'>-</div><div class='del'>-	tda9887_dbg("suspend\n");</div><div class='del'>-	return 0;</div><div class='add'>+	tda9887_configure(client);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tda9887_resume(struct device * dev)</div><div class='add'>+int tda9887_tuner_init(struct i2c_client *c)</div><div class='ctx'> {</div><div class='del'>-	struct i2c_client *c = container_of(dev, struct i2c_client, dev);</div><div class='del'>-	struct tda9887 *t = i2c_get_clientdata(c);</div><div class='add'>+	struct tuner *t = i2c_get_clientdata(c);</div><div class='ctx'> </div><div class='del'>-	tda9887_dbg("resume\n");</div><div class='del'>-	tda9887_configure(t);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	strlcpy(c-&gt;name, "tda9887", sizeof(c-&gt;name));</div><div class='ctx'> </div><div class='del'>-/* ----------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static struct i2c_driver driver = {</div><div class='del'>-	.id             = I2C_DRIVERID_TDA9887,</div><div class='del'>-	.attach_adapter = tda9887_probe,</div><div class='del'>-	.detach_client  = tda9887_detach,</div><div class='del'>-	.command        = tda9887_command,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name    = "tda9887",</div><div class='del'>-		.suspend = tda9887_suspend,</div><div class='del'>-		.resume  = tda9887_resume,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-static struct i2c_client client_template =</div><div class='del'>-{</div><div class='del'>-	.name      = "tda9887",</div><div class='del'>-	.driver    = &amp;driver,</div><div class='del'>-};</div><div class='add'>+	tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t-&gt;i2c.addr,</div><div class='add'>+						t-&gt;i2c.driver-&gt;driver.name);</div><div class='ctx'> </div><div class='del'>-static int __init tda9887_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;driver);</div><div class='del'>-}</div><div class='add'>+	t-&gt;set_tv_freq = tda9887_set_freq;</div><div class='add'>+	t-&gt;set_radio_freq = tda9887_set_freq;</div><div class='add'>+	t-&gt;standby = tda9887_standby;</div><div class='add'>+	t-&gt;tuner_status = tda9887_tuner_status;</div><div class='add'>+	t-&gt;get_afc = tda9887_get_afc;</div><div class='ctx'> </div><div class='del'>-static void __exit tda9887_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;driver);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(tda9887_init_module);</div><div class='del'>-module_exit(tda9887_cleanup_module);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='ctx'>  * ---------------------------------------------------------------------------</div><div class='head'>diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c<br/>index c2b98f81c192..d1c41781ccc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tea5767.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tea5767.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tea5767.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tea5767.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * I2C address is allways 0xC0.</div><div class='ctx'>  *</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)</div><div class='add'>+ * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@infradead.org)</div><div class='ctx'>  * This code is placed under the terms of the GNU General Public License</div><div class='ctx'>  *</div><div class='ctx'>  * tea5767 autodetection thanks to Torsten Seeboth and Atsushi Nakagawa</div><div class='head'>diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c<br/>new file mode 100644<br/>index 000000000000..76b2e96429d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tlv320aic23b.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tlv320aic23b.c</a></div><div class='hunk'>@@ -0,0 +1,217 @@</div><div class='add'>+/*</div><div class='add'>+ * tlv320aic23b - driver version 0.0.1</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Scott Alfter &lt;salfter@ssai.us&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on wm8775 driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Ulf Eklund &lt;ivtv at eklund.to&gt;</div><div class='add'>+ * Copyright (C) 2005 Hans Verkuil &lt;hverkuil@xs4all.nl&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/i2c-id.h&gt;</div><div class='add'>+#include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("tlv320aic23b driver");</div><div class='add'>+MODULE_AUTHOR("Scott Alfter, Ulf Eklund, Hans Verkuil");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static unsigned short normal_i2c[] = { 0x34 &gt;&gt; 1, I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+struct tlv320aic23b_state {</div><div class='add'>+	u8 muted;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tlv320aic23b_write(struct i2c_client *client, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if ((reg &lt; 0 || reg &gt; 9) &amp;&amp; (reg != 15)) {</div><div class='add'>+		v4l_err(client, "Invalid register R%d\n", reg);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		if (i2c_smbus_write_byte_data(client, (reg &lt;&lt; 1) |</div><div class='add'>+					(val &gt;&gt; 8), val &amp; 0xff) == 0) {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	v4l_err(client, "I2C: cannot write %03x to register R%d\n", val, reg);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tlv320aic23b_command(struct i2c_client *client, unsigned int cmd,</div><div class='add'>+			  void *arg)</div><div class='add'>+{</div><div class='add'>+	struct tlv320aic23b_state *state = i2c_get_clientdata(client);</div><div class='add'>+	struct v4l2_control *ctrl = arg;</div><div class='add'>+	u32* freq = arg;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case VIDIOC_INT_AUDIO_CLOCK_FREQ:</div><div class='add'>+		switch (*freq) {</div><div class='add'>+			case 32000: /* set sample rate to 32 kHz */</div><div class='add'>+				tlv320aic23b_write(client, 8, 0x018);</div><div class='add'>+				break;</div><div class='add'>+			case 44100: /* set sample rate to 44.1 kHz */</div><div class='add'>+				tlv320aic23b_write(client, 8, 0x022);</div><div class='add'>+				break;</div><div class='add'>+			case 48000: /* set sample rate to 48 kHz */</div><div class='add'>+				tlv320aic23b_write(client, 8, 0x000);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+		if (ctrl-&gt;id != V4L2_CID_AUDIO_MUTE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ctrl-&gt;value = state-&gt;muted;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+		if (ctrl-&gt;id != V4L2_CID_AUDIO_MUTE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		state-&gt;muted = ctrl-&gt;value;</div><div class='add'>+		tlv320aic23b_write(client, 0, 0x180); /* mute both channels */</div><div class='add'>+		/* set gain on both channels to +3.0 dB */</div><div class='add'>+		if (!state-&gt;muted)</div><div class='add'>+			tlv320aic23b_write(client, 0, 0x119);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VIDIOC_LOG_STATUS:</div><div class='add'>+		v4l_info(client, "Input: %s\n",</div><div class='add'>+			    state-&gt;muted ? "muted" : "active");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* i2c implementation */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic i2c probe</div><div class='add'>+ * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '&gt;&gt;1'</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct i2c_driver i2c_driver;</div><div class='add'>+</div><div class='add'>+static int tlv320aic23b_attach(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct tlv320aic23b_state *state;</div><div class='add'>+</div><div class='add'>+	/* Check if the adapter supports the needed features */</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (client == 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	client-&gt;addr = address;</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;driver = &amp;i2c_driver;</div><div class='add'>+	snprintf(client-&gt;name, sizeof(client-&gt;name) - 1, "tlv320aic23b");</div><div class='add'>+</div><div class='add'>+	v4l_info(client, "chip found @ 0x%x (%s)\n", address &lt;&lt; 1, adapter-&gt;name);</div><div class='add'>+</div><div class='add'>+	state = kmalloc(sizeof(struct tlv320aic23b_state), GFP_KERNEL);</div><div class='add'>+	if (state == NULL) {</div><div class='add'>+		kfree(client);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	state-&gt;muted = 0;</div><div class='add'>+	i2c_set_clientdata(client, state);</div><div class='add'>+</div><div class='add'>+	/* initialize tlv320aic23b */</div><div class='add'>+	tlv320aic23b_write(client, 15, 0x000);	/* RESET */</div><div class='add'>+	tlv320aic23b_write(client, 6, 0x00A);   /* turn off DAC &amp; mic input */</div><div class='add'>+	tlv320aic23b_write(client, 7, 0x049);   /* left-justified, 24-bit, master mode */</div><div class='add'>+	tlv320aic23b_write(client, 0, 0x119);   /* set gain on both channels to +3.0 dB */</div><div class='add'>+	tlv320aic23b_write(client, 8, 0x000);   /* set sample rate to 48 kHz */</div><div class='add'>+	tlv320aic23b_write(client, 9, 0x001);   /* activate digital interface */</div><div class='add'>+</div><div class='add'>+	i2c_attach_client(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tlv320aic23b_probe(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;class &amp; I2C_CLASS_TV_ANALOG)</div><div class='add'>+		return i2c_probe(adapter, &amp;addr_data, tlv320aic23b_attach);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tlv320aic23b_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = i2c_detach_client(client);</div><div class='add'>+	if (err) {</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	kfree(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+/* i2c implementation */</div><div class='add'>+static struct i2c_driver i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "tlv320aic23b",</div><div class='add'>+	},</div><div class='add'>+	.id             = I2C_DRIVERID_TLV320AIC23B,</div><div class='add'>+	.attach_adapter = tlv320aic23b_probe,</div><div class='add'>+	.detach_client  = tlv320aic23b_detach,</div><div class='add'>+	.command        = tlv320aic23b_command,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int __init tlv320aic23b_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit tlv320aic23b_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;i2c_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(tlv320aic23b_init_module);</div><div class='add'>+module_exit(tlv320aic23b_cleanup_module);</div><div class='head'>diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c<br/>index 74ab48c09c6a..bdf506e6ae27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-3036.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-3036.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-3036.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tuner-3036.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;media/tuner.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c<br/>index 1013b4de89a2..f7eb402d5f2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tuner-core.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@ static unsigned int no_autodetect = 0;</div><div class='ctx'> static unsigned int show_i2c = 0;</div><div class='ctx'> </div><div class='ctx'> /* insmod options used at runtime =&gt; read/write */</div><div class='del'>-static unsigned int tuner_debug_old = 0;</div><div class='ctx'> int tuner_debug = 0;</div><div class='ctx'> </div><div class='ctx'> static unsigned int tv_range[2] = { 44, 958 };</div><div class='hunk'>@@ -54,8 +53,6 @@ static char ntsc[] = "-";</div><div class='ctx'> module_param(addr, int, 0444);</div><div class='ctx'> module_param(no_autodetect, int, 0444);</div><div class='ctx'> module_param(show_i2c, int, 0444);</div><div class='del'>-/* Note: tuner_debug is deprecated and will be removed in 2.6.17 */</div><div class='del'>-module_param_named(tuner_debug,tuner_debug_old, int, 0444);</div><div class='ctx'> module_param_named(debug,tuner_debug, int, 0644);</div><div class='ctx'> module_param_string(pal, pal, sizeof(pal), 0644);</div><div class='ctx'> module_param_string(secam, secam, sizeof(secam), 0644);</div><div class='hunk'>@@ -199,7 +196,7 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 		i2c_master_send(c, buffer, 4);</div><div class='ctx'> 		default_tuner_init(c);</div><div class='ctx'> 		break;</div><div class='del'>-	case TUNER_LG_TDVS_H062F:</div><div class='add'>+	case TUNER_LG_TDVS_H06XF:</div><div class='ctx'> 		/* Set the Auxiliary Byte. */</div><div class='ctx'> 		buffer[2] &amp;= ~0x20;</div><div class='ctx'> 		buffer[2] |= 0x18;</div><div class='hunk'>@@ -215,6 +212,9 @@ static void set_type(struct i2c_client *c, unsigned int type,</div><div class='ctx'> 		i2c_master_send(c,buffer,4);</div><div class='ctx'> 		default_tuner_init(c);</div><div class='ctx'> 		break;</div><div class='add'>+	case TUNER_TDA9887:</div><div class='add'>+		tda9887_tuner_init(c);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		default_tuner_init(c);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -241,6 +241,8 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup)</div><div class='ctx'> {</div><div class='ctx'> 	struct tuner *t = i2c_get_clientdata(c);</div><div class='ctx'> </div><div class='add'>+	tuner_dbg("set addr for type %i\n", t-&gt;type);</div><div class='add'>+</div><div class='ctx'> 	if ( t-&gt;type == UNSET &amp;&amp; ((tun_setup-&gt;addr == ADDR_UNSET &amp;&amp;</div><div class='ctx'> 		(t-&gt;mode_mask &amp; tun_setup-&gt;mode_mask)) ||</div><div class='ctx'> 		tun_setup-&gt;addr == c-&gt;addr)) {</div><div class='hunk'>@@ -414,7 +416,7 @@ static void tuner_status(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-/* static var Used only in tuner_attach and tuner_probe */</div><div class='add'>+/* static vars: used only in tuner_attach and tuner_probe */</div><div class='ctx'> static unsigned default_mode_mask;</div><div class='ctx'> </div><div class='ctx'> /* During client attach, set_type is called by adapter's attach_inform callback.</div><div class='hunk'>@@ -436,11 +438,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='ctx'> 	t-&gt;radio_if2 = 10700 * 1000;	/* 10.7MHz - FM radio */</div><div class='ctx'> 	t-&gt;audmode = V4L2_TUNER_MODE_STEREO;</div><div class='ctx'> 	t-&gt;mode_mask = T_UNINITIALIZED;</div><div class='del'>-	if (tuner_debug_old) {</div><div class='del'>-		tuner_debug = tuner_debug_old;</div><div class='del'>-		printk(KERN_ERR "tuner: tuner_debug is deprecated and will be removed in 2.6.17.\n");</div><div class='del'>-		printk(KERN_ERR "tuner: use the debug option instead.\n");</div><div class='del'>-	}</div><div class='add'>+	t-&gt;tuner_status = tuner_status;</div><div class='ctx'> </div><div class='ctx'> 	if (show_i2c) {</div><div class='ctx'> 		unsigned char buffer[16];</div><div class='hunk'>@@ -462,10 +460,14 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)</div><div class='ctx'> 		case 0x4b:</div><div class='ctx'> 			/* If chip is not tda8290, don't register.</div><div class='ctx'> 			   since it can be tda9887*/</div><div class='del'>-			if (tda8290_probe(&amp;t-&gt;i2c) != 0) {</div><div class='del'>-				tuner_dbg("chip at addr %x is not a tda8290\n", addr);</div><div class='del'>-				kfree(t);</div><div class='del'>-				return 0;</div><div class='add'>+			if (tda8290_probe(&amp;t-&gt;i2c) == 0) {</div><div class='add'>+				tuner_dbg("chip at addr %x is a tda8290\n", addr);</div><div class='add'>+			} else {</div><div class='add'>+				/* Default is being tda9887 */</div><div class='add'>+				t-&gt;type = TUNER_TDA9887;</div><div class='add'>+				t-&gt;mode_mask = T_RADIO | T_ANALOG_TV | T_DIGITAL_TV;</div><div class='add'>+				t-&gt;mode = T_STANDBY;</div><div class='add'>+				goto register_client;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 0x60:</div><div class='hunk'>@@ -592,6 +594,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 	case TUNER_SET_STANDBY:</div><div class='ctx'> 		if (check_mode(t, "TUNER_SET_STANDBY") == EINVAL)</div><div class='ctx'> 			return 0;</div><div class='add'>+		t-&gt;mode = T_STANDBY;</div><div class='ctx'> 		if (t-&gt;standby)</div><div class='ctx'> 			t-&gt;standby (client);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -604,6 +607,14 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		/* Should be implemented, since bttv calls it */</div><div class='ctx'> 		tuner_dbg("VIDIOCSAUDIO not implemented.\n");</div><div class='ctx'> 		break;</div><div class='add'>+	case TDA9887_SET_CONFIG:</div><div class='add'>+		if (t-&gt;type == TUNER_TDA9887) {</div><div class='add'>+			int *i = arg;</div><div class='add'>+</div><div class='add'>+			t-&gt;tda9887_config = *i;</div><div class='add'>+			set_freq(client, t-&gt;tv_freq);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	/* --- v4l ioctls --- */</div><div class='ctx'> 	/* take care: bttv does userspace copying, we'll get a</div><div class='ctx'> 	   kernel pointer here... */</div><div class='hunk'>@@ -711,14 +722,10 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 		{</div><div class='ctx'> 			struct v4l2_frequency *f = arg;</div><div class='ctx'> </div><div class='add'>+			if (set_mode (client, t, f-&gt;type, "VIDIOC_S_FREQUENCY")</div><div class='add'>+					== EINVAL)</div><div class='add'>+				return 0;</div><div class='ctx'> 			switch_v4l2();</div><div class='del'>-			if ((V4L2_TUNER_RADIO == f-&gt;type &amp;&amp; V4L2_TUNER_RADIO != t-&gt;mode)</div><div class='del'>-				|| (V4L2_TUNER_DIGITAL_TV == f-&gt;type</div><div class='del'>-					&amp;&amp; V4L2_TUNER_DIGITAL_TV != t-&gt;mode)) {</div><div class='del'>-				if (set_mode (client, t, f-&gt;type, "VIDIOC_S_FREQUENCY")</div><div class='del'>-					    == EINVAL)</div><div class='del'>-					return 0;</div><div class='del'>-			}</div><div class='ctx'> 			set_freq(client,f-&gt;frequency);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='hunk'>@@ -744,6 +751,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 			switch_v4l2();</div><div class='ctx'> </div><div class='ctx'> 			tuner-&gt;type = t-&gt;mode;</div><div class='add'>+			if (t-&gt;get_afc)</div><div class='add'>+				tuner-&gt;afc=t-&gt;get_afc(client);</div><div class='ctx'> 			if (t-&gt;mode == V4L2_TUNER_ANALOG_TV)</div><div class='ctx'> 				tuner-&gt;capability |= V4L2_TUNER_CAP_NORM;</div><div class='ctx'> 			if (t-&gt;mode != V4L2_TUNER_RADIO) {</div><div class='hunk'>@@ -787,7 +796,8 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	case VIDIOC_LOG_STATUS:</div><div class='del'>-		tuner_status(client);</div><div class='add'>+		if (t-&gt;tuner_status)</div><div class='add'>+			t-&gt;tuner_status(client);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c<br/>index 5d7abed71674..d071c5cbf013 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-simple.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-simple.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-simple.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tuner-simple.c</a></div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='ctx'> #include &lt;media/tuner.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int offset = 0;</div><div class='ctx'> module_param(offset, int, 0666);</div><div class='hunk'>@@ -105,7 +106,7 @@ static int tuner_stereo(struct i2c_client *c)</div><div class='ctx'> </div><div class='ctx'> 	switch (t-&gt;type) {</div><div class='ctx'> 		case TUNER_PHILIPS_FM1216ME_MK3:</div><div class='del'>-    		case TUNER_PHILIPS_FM1236_MK3:</div><div class='add'>+		case TUNER_PHILIPS_FM1236_MK3:</div><div class='ctx'> 		case TUNER_PHILIPS_FM1256_IH3:</div><div class='ctx'> 			stereo = ((status &amp; TUNER_SIGNAL) == TUNER_STEREO_MK3);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -128,6 +129,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 	u8 buffer[4];</div><div class='ctx'> 	int rc, IFPCoff, i, j;</div><div class='ctx'> 	enum param_type desired_type;</div><div class='add'>+	struct tuner_params *params;</div><div class='ctx'> </div><div class='ctx'> 	tun = &amp;tuners[t-&gt;type];</div><div class='ctx'> </div><div class='hunk'>@@ -169,19 +171,20 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 			  IFPCoff,t-&gt;type);</div><div class='ctx'> 		j = 0;</div><div class='ctx'> 	}</div><div class='add'>+	params = &amp;tun-&gt;params[j];</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; tun-&gt;params[j].count; i++) {</div><div class='del'>-		if (freq &gt; tun-&gt;params[j].ranges[i].limit)</div><div class='add'>+	for (i = 0; i &lt; params-&gt;count; i++) {</div><div class='add'>+		if (freq &gt; params-&gt;ranges[i].limit)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (i == tun-&gt;params[j].count) {</div><div class='add'>+	if (i == params-&gt;count) {</div><div class='ctx'> 		tuner_dbg("TV frequency out of range (%d &gt; %d)",</div><div class='del'>-				freq, tun-&gt;params[j].ranges[i - 1].limit);</div><div class='del'>-		freq = tun-&gt;params[j].ranges[--i].limit;</div><div class='add'>+				freq, params-&gt;ranges[i - 1].limit);</div><div class='add'>+		freq = params-&gt;ranges[--i].limit;</div><div class='ctx'> 	}</div><div class='del'>-	config = tun-&gt;params[j].ranges[i].config;</div><div class='del'>-	cb     = tun-&gt;params[j].ranges[i].cb;</div><div class='add'>+	config = params-&gt;ranges[i].config;</div><div class='add'>+	cb     = params-&gt;ranges[i].cb;</div><div class='ctx'> 	/*  i == 0 -&gt; VHF_LO</div><div class='ctx'> 	 *  i == 1 -&gt; VHF_HI</div><div class='ctx'> 	 *  i == 2 -&gt; UHF     */</div><div class='hunk'>@@ -281,7 +284,7 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tuners[t-&gt;type].params-&gt;cb_first_if_lower_freq &amp;&amp; div &lt; t-&gt;last_div) {</div><div class='add'>+	if (params-&gt;cb_first_if_lower_freq &amp;&amp; div &lt; t-&gt;last_div) {</div><div class='ctx'> 		buffer[0] = config;</div><div class='ctx'> 		buffer[1] = cb;</div><div class='ctx'> 		buffer[2] = (div&gt;&gt;8) &amp; 0x7f;</div><div class='hunk'>@@ -293,6 +296,43 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 		buffer[3] = cb;</div><div class='ctx'> 	}</div><div class='ctx'> 	t-&gt;last_div = div;</div><div class='add'>+	if (params-&gt;has_tda9887) {</div><div class='add'>+		int config = 0;</div><div class='add'>+		int is_secam_l = (t-&gt;std &amp; (V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC)) &amp;&amp;</div><div class='add'>+			!(t-&gt;std &amp; ~(V4L2_STD_SECAM_L | V4L2_STD_SECAM_LC));</div><div class='add'>+</div><div class='add'>+		if (t-&gt;std == V4L2_STD_SECAM_LC) {</div><div class='add'>+			if (params-&gt;port1_active ^ params-&gt;port1_invert_for_secam_lc)</div><div class='add'>+				config |= TDA9887_PORT1_ACTIVE;</div><div class='add'>+			if (params-&gt;port2_active ^ params-&gt;port2_invert_for_secam_lc)</div><div class='add'>+				config |= TDA9887_PORT2_ACTIVE;</div><div class='add'>+		}</div><div class='add'>+		else {</div><div class='add'>+			if (params-&gt;port1_active)</div><div class='add'>+				config |= TDA9887_PORT1_ACTIVE;</div><div class='add'>+			if (params-&gt;port2_active)</div><div class='add'>+				config |= TDA9887_PORT2_ACTIVE;</div><div class='add'>+		}</div><div class='add'>+		if (params-&gt;intercarrier_mode)</div><div class='add'>+			config |= TDA9887_INTERCARRIER;</div><div class='add'>+		if (is_secam_l) {</div><div class='add'>+			if (i == 0 &amp;&amp; params-&gt;default_top_secam_low)</div><div class='add'>+				config |= TDA9887_TOP(params-&gt;default_top_secam_low);</div><div class='add'>+			else if (i == 1 &amp;&amp; params-&gt;default_top_secam_mid)</div><div class='add'>+				config |= TDA9887_TOP(params-&gt;default_top_secam_mid);</div><div class='add'>+			else if (params-&gt;default_top_secam_high)</div><div class='add'>+				config |= TDA9887_TOP(params-&gt;default_top_secam_high);</div><div class='add'>+		}</div><div class='add'>+		else {</div><div class='add'>+			if (i == 0 &amp;&amp; params-&gt;default_top_low)</div><div class='add'>+				config |= TDA9887_TOP(params-&gt;default_top_low);</div><div class='add'>+			else if (i == 1 &amp;&amp; params-&gt;default_top_mid)</div><div class='add'>+				config |= TDA9887_TOP(params-&gt;default_top_mid);</div><div class='add'>+			else if (params-&gt;default_top_high)</div><div class='add'>+				config |= TDA9887_TOP(params-&gt;default_top_high);</div><div class='add'>+		}</div><div class='add'>+		i2c_clients_command(c-&gt;adapter, TDA9887_SET_CONFIG, &amp;config);</div><div class='add'>+	}</div><div class='ctx'> 	tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",</div><div class='ctx'> 		  buffer[0],buffer[1],buffer[2],buffer[3]);</div><div class='ctx'> </div><div class='hunk'>@@ -339,6 +379,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 	u16 div;</div><div class='ctx'> 	int rc, j;</div><div class='ctx'> 	enum param_type desired_type = TUNER_PARAM_TYPE_RADIO;</div><div class='add'>+	struct tuner_params *params;</div><div class='ctx'> </div><div class='ctx'> 	tun = &amp;tuners[t-&gt;type];</div><div class='ctx'> </div><div class='hunk'>@@ -352,7 +393,8 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 		j = 0;</div><div class='ctx'> </div><div class='ctx'> 	div = (20 * freq / 16000) + (int)(20*10.7); /* IF 10.7 MHz */</div><div class='del'>-	buffer[2] = (tun-&gt;params[j].ranges[0].config &amp; ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */</div><div class='add'>+	params = &amp;tun-&gt;params[j];</div><div class='add'>+	buffer[2] = (params-&gt;ranges[0].config &amp; ~TUNER_RATIO_MASK) | TUNER_RATIO_SELECT_50; /* 50 kHz step */</div><div class='ctx'> </div><div class='ctx'> 	switch (t-&gt;type) {</div><div class='ctx'> 	case TUNER_TENA_9533_DI:</div><div class='hunk'>@@ -384,7 +426,7 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 	}</div><div class='ctx'> 	buffer[0] = (div&gt;&gt;8) &amp; 0x7f;</div><div class='ctx'> 	buffer[1] = div      &amp; 0xff;</div><div class='del'>-	if (tuners[t-&gt;type].params-&gt;cb_first_if_lower_freq &amp;&amp; div &lt; t-&gt;last_div) {</div><div class='add'>+	if (params-&gt;cb_first_if_lower_freq &amp;&amp; div &lt; t-&gt;last_div) {</div><div class='ctx'> 		buffer[0] = buffer[2];</div><div class='ctx'> 		buffer[1] = buffer[3];</div><div class='ctx'> 		buffer[2] = (div&gt;&gt;8) &amp; 0x7f;</div><div class='hunk'>@@ -398,6 +440,18 @@ static void default_set_radio_freq(struct i2c_client *c, unsigned int freq)</div><div class='ctx'> 	       buffer[0],buffer[1],buffer[2],buffer[3]);</div><div class='ctx'> 	t-&gt;last_div = div;</div><div class='ctx'> </div><div class='add'>+	if (params-&gt;has_tda9887) {</div><div class='add'>+		int config = 0;</div><div class='add'>+		if (params-&gt;port1_active &amp;&amp; !params-&gt;port1_fm_high_sensitivity)</div><div class='add'>+			config |= TDA9887_PORT1_ACTIVE;</div><div class='add'>+		if (params-&gt;port2_active &amp;&amp; !params-&gt;port2_fm_high_sensitivity)</div><div class='add'>+			config |= TDA9887_PORT2_ACTIVE;</div><div class='add'>+		if (params-&gt;intercarrier_mode)</div><div class='add'>+			config |= TDA9887_INTERCARRIER;</div><div class='add'>+/*		if (params-&gt;port1_set_for_fm_mono)</div><div class='add'>+			config &amp;= ~TDA9887_PORT1_ACTIVE;*/</div><div class='add'>+		i2c_clients_command(c-&gt;adapter, TDA9887_SET_CONFIG, &amp;config);</div><div class='add'>+	}</div><div class='ctx'> 	if (4 != (rc = i2c_master_send(c,buffer,4)))</div><div class='ctx'> 		tuner_warn("i2c i/o error: rc == %d (should be 4)\n",rc);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c<br/>index a1ae036b44ec..a167e17c6dcd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-types.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tuner-types.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tuner-types.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tuner-types.c</a></div><div class='hunk'>@@ -380,6 +380,10 @@ static struct tuner_params tuner_philips_fq1216me_params[] = {</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_PAL,</div><div class='ctx'> 		.ranges = tuner_lg_pal_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_lg_pal_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_active = 1,</div><div class='add'>+		.port2_invert_for_secam_lc = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -542,6 +546,14 @@ static struct tuner_params tuner_fm1216me_mk3_params[] = {</div><div class='ctx'> 		.ranges = tuner_fm1216me_mk3_pal_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_fm1216me_mk3_pal_ranges),</div><div class='ctx'> 		.cb_first_if_lower_freq = 1,</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_active = 1,</div><div class='add'>+		.port2_invert_for_secam_lc = 1,</div><div class='add'>+		.port1_fm_high_sensitivity = 1,</div><div class='add'>+		.default_top_mid = -2,</div><div class='add'>+		.default_top_secam_mid = -2,</div><div class='add'>+		.default_top_secam_high = -2,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -612,6 +624,10 @@ static struct tuner_params tuner_fm1236_mk3_params[] = {</div><div class='ctx'> 		.ranges = tuner_fm1236_mk3_ntsc_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_fm1236_mk3_ntsc_ranges),</div><div class='ctx'> 		.cb_first_if_lower_freq = 1,</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_active = 1,</div><div class='add'>+		.port1_fm_high_sensitivity = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -632,6 +648,8 @@ static struct tuner_params tuner_microtune_4049_fm5_params[] = {</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_PAL,</div><div class='ctx'> 		.ranges = tuner_temic_4009f_5_pal_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_invert_for_secam_lc = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -648,6 +666,8 @@ static struct tuner_params tuner_panasonic_vp27_params[] = {</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_NTSC,</div><div class='ctx'> 		.ranges = tuner_panasonic_vp27_ntsc_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_panasonic_vp27_ntsc_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.intercarrier_mode = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -782,6 +802,13 @@ static struct tuner_params tuner_philips_fq1216ame_mk4_params[] = {</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_PAL,</div><div class='ctx'> 		.ranges = tuner_philips_fq12_6a___mk4_pal_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_philips_fq12_6a___mk4_pal_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_invert_for_secam_lc = 1,</div><div class='add'>+		.default_top_mid = -2,</div><div class='add'>+		.default_top_secam_low = -2,</div><div class='add'>+		.default_top_secam_mid = -2,</div><div class='add'>+		.default_top_secam_high = -2,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -870,11 +897,17 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = {</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_PAL,</div><div class='ctx'> 		.ranges = tuner_philips_fmd1216me_mk3_pal_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_pal_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_active = 1,</div><div class='add'>+		.port2_fm_high_sensitivity = 1,</div><div class='add'>+		.port2_invert_for_secam_lc = 1,</div><div class='add'>+		.port1_set_for_fm_mono = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* ------------ TUNER_LG_TDVS_H062F - INFINEON ATSC ------------ */</div><div class='add'>+/* ------ TUNER_LG_TDVS_H06XF - LG INNOTEK / INFINEON ATSC ----- */</div><div class='ctx'> </div><div class='ctx'> static struct tuner_range tuner_tua6034_ntsc_ranges[] = {</div><div class='ctx'> 	{ 16 * 165.00 /*MHz*/, 0x8e, 0x01 },</div><div class='hunk'>@@ -883,7 +916,7 @@ static struct tuner_range tuner_tua6034_ntsc_ranges[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct tuner_params tuner_tua6034_params[] = {</div><div class='add'>+static struct tuner_params tuner_lg_tdvs_h06xf_params[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_NTSC,</div><div class='ctx'> 		.ranges = tuner_tua6034_ntsc_ranges,</div><div class='hunk'>@@ -1005,6 +1038,7 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {</div><div class='ctx'> 		.type   = TUNER_PARAM_TYPE_NTSC,</div><div class='ctx'> 		.ranges = tuner_samsung_tcpn_2121p30a_ntsc_ranges,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_ntsc_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1024,6 +1058,26 @@ static struct tuner_params tuner_thomson_fe6600_params[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* ------------ TUNER_SAMSUNG_TCPG_6121P30A - Samsung PAL ------------ */</div><div class='add'>+</div><div class='add'>+static struct tuner_range tuner_samsung_tcpg_6121p30a_pal_ranges[] = {</div><div class='add'>+	{ 16 * 146.25 /*MHz*/, 0xce, 0x01, },</div><div class='add'>+	{ 16 * 428.50 /*MHz*/, 0xce, 0x02, },</div><div class='add'>+	{ 16 * 999.99        , 0xce, 0x08, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = {</div><div class='add'>+	{</div><div class='add'>+		.type   = TUNER_PARAM_TYPE_PAL,</div><div class='add'>+		.ranges = tuner_samsung_tcpg_6121p30a_pal_ranges,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_samsung_tcpg_6121p30a_pal_ranges),</div><div class='add'>+		.has_tda9887 = 1,</div><div class='add'>+		.port1_active = 1,</div><div class='add'>+		.port2_active = 1,</div><div class='add'>+		.port2_invert_for_secam_lc = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> struct tunertype tuners[] = {</div><div class='hunk'>@@ -1354,10 +1408,10 @@ struct tunertype tuners[] = {</div><div class='ctx'> 		.params = tuner_philips_fmd1216me_mk3_params,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params),</div><div class='ctx'> 	},</div><div class='del'>-	[TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */</div><div class='del'>-		.name   = "LG TDVS-H062F/TUA6034",</div><div class='del'>-		.params = tuner_tua6034_params,</div><div class='del'>-		.count  = ARRAY_SIZE(tuner_tua6034_params),</div><div class='add'>+	[TUNER_LG_TDVS_H06XF] = { /* LGINNOTEK ATSC */</div><div class='add'>+		.name   = "LG TDVS-H06xF", /* H061F, H062F &amp; H064F */</div><div class='add'>+		.params = tuner_lg_tdvs_h06xf_params,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_lg_tdvs_h06xf_params),</div><div class='ctx'> 	},</div><div class='ctx'> 	[TUNER_YMEC_TVF66T5_B_DFF] = { /* Philips PAL */</div><div class='ctx'> 		.name   = "Ymec TVF66T5-B/DFF",</div><div class='hunk'>@@ -1400,6 +1454,16 @@ struct tunertype tuners[] = {</div><div class='ctx'> 		.params = tuner_thomson_fe6600_params,</div><div class='ctx'> 		.count  = ARRAY_SIZE(tuner_thomson_fe6600_params),</div><div class='ctx'> 	},</div><div class='add'>+	[TUNER_SAMSUNG_TCPG_6121P30A] = { /* Samsung PAL */</div><div class='add'>+		.name   = "Samsung TCPG 6121P30A",</div><div class='add'>+		.params = tuner_samsung_tcpg_6121p30a_params,</div><div class='add'>+		.count  = ARRAY_SIZE(tuner_samsung_tcpg_6121p30a_params),</div><div class='add'>+	},</div><div class='add'>+	[TUNER_TDA9887] = { /* Philips TDA 9887 IF PLL Demodulator.</div><div class='add'>+				This chip is part of some modern tuners */</div><div class='add'>+		.name   = "Philips TDA988[5,6,7] IF PLL Demodulator",</div><div class='add'>+		/* see tda9887.c for details */</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> unsigned const int tuner_count = ARRAY_SIZE(tuners);</div><div class='head'>diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c<br/>index c2b756107548..936e3f746fba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tvaudio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tvaudio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tvaudio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tvaudio.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c<br/>index b463e996961a..d95529e8e513 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tveeprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tveeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tveeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tveeprom.c</a></div><div class='hunk'>@@ -73,14 +73,14 @@ static struct HAUPPAUGE_TUNER_FMT</div><div class='ctx'> }</div><div class='ctx'> hauppauge_tuner_fmt[] =</div><div class='ctx'> {</div><div class='del'>-	{ V4L2_STD_UNKNOWN," UNKNOWN" },</div><div class='del'>-	{ V4L2_STD_UNKNOWN," FM" },</div><div class='del'>-	{ V4L2_STD_PAL_BG, " PAL(B/G)" },</div><div class='del'>-	{ V4L2_STD_NTSC_M, " NTSC(M)" },</div><div class='del'>-	{ V4L2_STD_PAL_I,  " PAL(I)" },</div><div class='del'>-	{ V4L2_STD_SECAM_L," SECAM(L/L')" },</div><div class='del'>-	{ V4L2_STD_PAL_DK, " PAL(D/D1/K)" },</div><div class='del'>-	{ V4L2_STD_ATSC,   " ATSC/DVB Digital" },</div><div class='add'>+	{ V4L2_STD_UNKNOWN,                   " UNKNOWN" },</div><div class='add'>+	{ V4L2_STD_UNKNOWN,                   " FM" },</div><div class='add'>+	{ V4L2_STD_B|V4L2_STD_GH,             " PAL(B/G)" },</div><div class='add'>+	{ V4L2_STD_MN,                        " NTSC(M)" },</div><div class='add'>+	{ V4L2_STD_PAL_I,                     " PAL(I)" },</div><div class='add'>+	{ V4L2_STD_SECAM_L|V4L2_STD_SECAM_LC, " SECAM(L/L')" },</div><div class='add'>+	{ V4L2_STD_DK,                        " PAL(D/D1/K)" },</div><div class='add'>+	{ V4L2_STD_ATSC,                      " ATSC/DVB Digital" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This is the full list of possible tuners. Many thanks to Hauppauge for</div><div class='hunk'>@@ -200,7 +200,7 @@ hauppauge_tuner[] =</div><div class='ctx'> 	{ TUNER_ABSENT,        "Philips FQ1286A MK4"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "Philips FQ1216ME MK5"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "Philips FQ1236 MK5"},</div><div class='del'>-	{ TUNER_ABSENT,        "Samsung TCPG_6121P30A"},</div><div class='add'>+	{ TUNER_SAMSUNG_TCPG_6121P30A, "Samsung TCPG 6121P30A"},</div><div class='ctx'> 	{ TUNER_TCL_2002MB,    "TCL 2002MB_3H"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "TCL 2002MI_3H"},</div><div class='ctx'> 	{ TUNER_TCL_2002N,     "TCL 2002N 5H"},</div><div class='hunk'>@@ -219,7 +219,7 @@ hauppauge_tuner[] =</div><div class='ctx'> 	{ TUNER_ABSENT,        "Thompson DTT75105"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "Conexant_CX24109"},</div><div class='ctx'> 	{ TUNER_TCL_2002N,     "TCL M2523_5N_E"},</div><div class='del'>-	{ TUNER_ABSENT,        "TCL M2523_3DB_E"},</div><div class='add'>+	{ TUNER_TCL_2002MB,    "TCL M2523_3DB_E"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "Philips 8275A"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "Microtune MT2060"},</div><div class='ctx'> 	{ TUNER_ABSENT,        "Philips FM1236 MK5"},</div><div class='head'>diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c<br/>index 9e86caeb96a7..1654576de10e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tvmixer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tvmixer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tvmixer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tvmixer.c</a></div><div class='hunk'>@@ -198,10 +198,6 @@ static int tvmixer_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* lock bttv in memory while the mixer is in use  */</div><div class='ctx'> 	file-&gt;private_data = mix;</div><div class='del'>-#ifndef I2C_PEC</div><div class='del'>-	if (client-&gt;adapter-&gt;inc_use)</div><div class='del'>-		client-&gt;adapter-&gt;inc_use(client-&gt;adapter);</div><div class='del'>-#endif</div><div class='ctx'> 	if (client-&gt;adapter-&gt;owner)</div><div class='ctx'> 		try_module_get(client-&gt;adapter-&gt;owner);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -217,10 +213,6 @@ static int tvmixer_release(struct inode *inode, struct file *file)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifndef I2C_PEC</div><div class='del'>-	if (client-&gt;adapter-&gt;dec_use)</div><div class='del'>-		client-&gt;adapter-&gt;dec_use(client-&gt;adapter);</div><div class='del'>-#endif</div><div class='ctx'> 	if (client-&gt;adapter-&gt;owner)</div><div class='ctx'> 		module_put(client-&gt;adapter-&gt;owner);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c<br/>index dab4973bcf82..b167ffab2520 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/tvp5150.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/tvp5150.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/tvp5150.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/tvp5150.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='add'>+#include &lt;media/tvp5150.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "tvp5150_reg.h"</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +90,7 @@ struct tvp5150 {</div><div class='ctx'> 	struct i2c_client *client;</div><div class='ctx'> </div><div class='ctx'> 	v4l2_std_id norm;	/* Current set standard */</div><div class='del'>-	int input;</div><div class='add'>+	struct v4l2_routing route;</div><div class='ctx'> 	int enable;</div><div class='ctx'> 	int bright;</div><div class='ctx'> 	int contrast;</div><div class='hunk'>@@ -283,29 +284,26 @@ static void dump_reg(struct i2c_client *c)</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> 			Basic functions</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-enum tvp5150_input {</div><div class='del'>-	TVP5150_ANALOG_CH0 = 0,</div><div class='del'>-	TVP5150_SVIDEO = 1,</div><div class='del'>-	TVP5150_ANALOG_CH1 = 2,</div><div class='del'>-	TVP5150_BLACK_SCREEN = 8</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static inline void tvp5150_selmux(struct i2c_client *c,</div><div class='del'>-				  enum tvp5150_input input)</div><div class='add'>+static inline void tvp5150_selmux(struct i2c_client *c)</div><div class='ctx'> {</div><div class='ctx'> 	int opmode=0;</div><div class='del'>-</div><div class='ctx'> 	struct tvp5150 *decoder = i2c_get_clientdata(c);</div><div class='add'>+	int input = 0;</div><div class='ctx'> </div><div class='del'>-	if (!decoder-&gt;enable)</div><div class='del'>-		input |= TVP5150_BLACK_SCREEN;</div><div class='add'>+	if ((decoder-&gt;route.output &amp; TVP5150_BLACK_SCREEN) || !decoder-&gt;enable)</div><div class='add'>+		input = 8;</div><div class='ctx'> </div><div class='ctx'> 	switch (input) {</div><div class='del'>-	case TVP5150_ANALOG_CH0:</div><div class='del'>-	case TVP5150_ANALOG_CH1:</div><div class='add'>+	case TVP5150_COMPOSITE1:</div><div class='add'>+		input |= 2;</div><div class='add'>+		/* fall through */</div><div class='add'>+	case TVP5150_COMPOSITE0:</div><div class='ctx'> 		opmode=0x30;		/* TV Mode */</div><div class='ctx'> 		break;</div><div class='add'>+	case TVP5150_SVIDEO:</div><div class='ctx'> 	default:</div><div class='add'>+		input |= 1;</div><div class='ctx'> 		opmode=0;		/* Auto Mode */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -790,7 +788,7 @@ static inline void tvp5150_reset(struct i2c_client *c)</div><div class='ctx'> 	tvp5150_vdp_init(c, vbi_ram_default);</div><div class='ctx'> </div><div class='ctx'> 	/* Selects decoder input */</div><div class='del'>-	tvp5150_selmux(c, decoder-&gt;input);</div><div class='add'>+	tvp5150_selmux(c);</div><div class='ctx'> </div><div class='ctx'> 	/* Initializes TVP5150 to stream enabled values */</div><div class='ctx'> 	tvp5150_write_inittab(c, tvp5150_init_enable);</div><div class='hunk'>@@ -860,6 +858,21 @@ static int tvp5150_command(struct i2c_client *c,</div><div class='ctx'> 	case VIDIOC_INT_RESET:</div><div class='ctx'> 		tvp5150_reset(c);</div><div class='ctx'> 		break;</div><div class='add'>+	case VIDIOC_INT_G_VIDEO_ROUTING:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_routing *route = arg;</div><div class='add'>+</div><div class='add'>+		*route = decoder-&gt;route;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_INT_S_VIDEO_ROUTING:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_routing *route = arg;</div><div class='add'>+</div><div class='add'>+		decoder-&gt;route = *route;</div><div class='add'>+		tvp5150_selmux(c);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case VIDIOC_S_STD:</div><div class='ctx'> 		if (decoder-&gt;norm == *(v4l2_std_id *)arg)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1063,7 +1076,7 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,</div><div class='ctx'> 	rv = i2c_attach_client(c);</div><div class='ctx'> </div><div class='ctx'> 	core-&gt;norm = V4L2_STD_ALL;	/* Default is autodetect */</div><div class='del'>-	core-&gt;input = 2;</div><div class='add'>+	core-&gt;route.input = TVP5150_COMPOSITE1;</div><div class='ctx'> 	core-&gt;enable = 1;</div><div class='ctx'> 	core-&gt;bright = 32768;</div><div class='ctx'> 	core-&gt;contrast = 32768;</div><div class='head'>diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig<br/>index 39269a2c5635..59fb899f31f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/usbvideo/Kconfig</a></div><div class='hunk'>@@ -36,3 +36,15 @@ config USB_KONICAWC</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called konicawc.</div><div class='add'>+</div><div class='add'>+config USB_QUICKCAM_MESSENGER</div><div class='add'>+	tristate "USB Logitech Quickcam Messenger"</div><div class='add'>+	depends on USB &amp;&amp; VIDEO_DEV</div><div class='add'>+	select VIDEO_USBVIDEO</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y or M here to enable support for the USB Logitech Quickcam</div><div class='add'>+	  Messenger webcam.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called quickcam_messenger.</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/usbvideo/Makefile b/drivers/media/video/usbvideo/Makefile<br/>index bb52eb8dc2f9..4a1b144bee4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/usbvideo/Makefile</a></div><div class='hunk'>@@ -2,3 +2,4 @@ obj-$(CONFIG_VIDEO_USBVIDEO)    += usbvideo.o</div><div class='ctx'> obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o ultracam.o</div><div class='ctx'> obj-$(CONFIG_USB_KONICAWC)      += konicawc.o</div><div class='ctx'> obj-$(CONFIG_USB_VICAM)         += vicam.o</div><div class='add'>+obj-$(CONFIG_USB_QUICKCAM_MESSENGER)	+= quickcam_messenger.o</div><div class='head'>diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c<br/>index c11f5d46b114..6f31ecc88843 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/konicawc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/konicawc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/konicawc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/usbvideo/konicawc.c</a></div><div class='hunk'>@@ -15,8 +15,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "usbvideo.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c<br/>new file mode 100644<br/>index 000000000000..56e01b622417<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/quickcam_messenger.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/usbvideo/quickcam_messenger.c</a></div><div class='hunk'>@@ -0,0 +1,1120 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for Logitech Quickcam Messenger usb video camera</div><div class='add'>+ * Copyright (C) Jaya Kumar</div><div class='add'>+ *</div><div class='add'>+ * This work was sponsored by CIS(M) Sdn Bhd.</div><div class='add'>+ * History:</div><div class='add'>+ * 05/08/2006 - Jaya Kumar</div><div class='add'>+ * I wrote this based on the konicawc by Simon Evans.</div><div class='add'>+ * -</div><div class='add'>+ * Full credit for reverse engineering and creating an initial</div><div class='add'>+ * working linux driver for the VV6422 goes to the qce-ga project by</div><div class='add'>+ * Tuukka Toivonen, Jochen Hoenicke, Peter McConnell,</div><div class='add'>+ * Cristiano De Michele, Georg Acher, Jean-Frederic Clere as well as</div><div class='add'>+ * others.</div><div class='add'>+ * ---</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='add'>+</div><div class='add'>+#include "usbvideo.h"</div><div class='add'>+#include "quickcam_messenger.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Version Information</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_USB_DEBUG</div><div class='add'>+static int debug;</div><div class='add'>+#define DEBUG(n, format, arg...) \</div><div class='add'>+	if (n &lt;= debug) {	 \</div><div class='add'>+		printk(KERN_DEBUG __FILE__ ":%s(): " format "\n", __FUNCTION__ , ## arg); \</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+#define DEBUG(n, arg...)</div><div class='add'>+static const int debug = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define DRIVER_VERSION "v0.01"</div><div class='add'>+#define DRIVER_DESC "Logitech Quickcam Messenger USB"</div><div class='add'>+</div><div class='add'>+#define USB_LOGITECH_VENDOR_ID	0x046D</div><div class='add'>+#define USB_QCM_PRODUCT_ID	0x08F0</div><div class='add'>+</div><div class='add'>+#define MAX_CAMERAS	1</div><div class='add'>+</div><div class='add'>+#define MAX_COLOUR	32768</div><div class='add'>+#define MAX_HUE		32768</div><div class='add'>+#define MAX_BRIGHTNESS	32768</div><div class='add'>+#define MAX_CONTRAST	32768</div><div class='add'>+#define MAX_WHITENESS	32768</div><div class='add'>+</div><div class='add'>+static int size = SIZE_320X240;</div><div class='add'>+static int colour = MAX_COLOUR;</div><div class='add'>+static int hue = MAX_HUE;</div><div class='add'>+static int brightness =	MAX_BRIGHTNESS;</div><div class='add'>+static int contrast =	MAX_CONTRAST;</div><div class='add'>+static int whiteness =	MAX_WHITENESS;</div><div class='add'>+</div><div class='add'>+static struct usbvideo *cams;</div><div class='add'>+</div><div class='add'>+static struct usb_device_id qcm_table [] = {</div><div class='add'>+	{ USB_DEVICE(USB_LOGITECH_VENDOR_ID, USB_QCM_PRODUCT_ID) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, qcm_table);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INPUT</div><div class='add'>+static void qcm_register_input(struct qcm *cam, struct usb_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct input_dev *input_dev;</div><div class='add'>+</div><div class='add'>+	usb_make_path(dev, cam-&gt;input_physname, sizeof(cam-&gt;input_physname));</div><div class='add'>+	strncat(cam-&gt;input_physname, "/input0", sizeof(cam-&gt;input_physname));</div><div class='add'>+</div><div class='add'>+	cam-&gt;input = input_dev = input_allocate_device();</div><div class='add'>+	if (!input_dev) {</div><div class='add'>+		warn("insufficient mem for cam input device");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;name = "QCM button";</div><div class='add'>+	input_dev-&gt;phys = cam-&gt;input_physname;</div><div class='add'>+	usb_to_input_id(dev, &amp;input_dev-&gt;id);</div><div class='add'>+	input_dev-&gt;cdev.dev = &amp;dev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;evbit[0] = BIT(EV_KEY);</div><div class='add'>+	input_dev-&gt;keybit[LONG(BTN_0)] = BIT(BTN_0);</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;private = cam;</div><div class='add'>+</div><div class='add'>+	input_register_device(cam-&gt;input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_unregister_input(struct qcm *cam)</div><div class='add'>+{</div><div class='add'>+	if (cam-&gt;input) {</div><div class='add'>+		input_unregister_device(cam-&gt;input);</div><div class='add'>+		cam-&gt;input = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_report_buttonstat(struct qcm *cam)</div><div class='add'>+{</div><div class='add'>+	if (cam-&gt;input) {</div><div class='add'>+		input_report_key(cam-&gt;input, BTN_0, cam-&gt;button_sts);</div><div class='add'>+		input_sync(cam-&gt;input);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_int_irq(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct uvd *uvd = urb-&gt;context;</div><div class='add'>+	struct qcm *cam;</div><div class='add'>+</div><div class='add'>+	if (!CAMERA_IS_OPERATIONAL(uvd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!uvd-&gt;streaming)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	uvd-&gt;stats.urb_count++;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status &lt; 0)</div><div class='add'>+		uvd-&gt;stats.iso_err_count++;</div><div class='add'>+	else {</div><div class='add'>+		if (urb-&gt;actual_length &gt; 0 ) {</div><div class='add'>+			cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+			if (cam-&gt;button_sts_buf == 0x88)</div><div class='add'>+				cam-&gt;button_sts = 0x0;</div><div class='add'>+			else if (cam-&gt;button_sts_buf == 0x80)</div><div class='add'>+				cam-&gt;button_sts = 0x1;</div><div class='add'>+			qcm_report_buttonstat(cam);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		err("usb_submit_urb error (%d)", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_setup_input_int(struct qcm *cam, struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int errflag;</div><div class='add'>+	usb_fill_int_urb(cam-&gt;button_urb, uvd-&gt;dev,</div><div class='add'>+			usb_rcvintpipe(uvd-&gt;dev, uvd-&gt;video_endp + 1),</div><div class='add'>+			&amp;cam-&gt;button_sts_buf,</div><div class='add'>+			1,</div><div class='add'>+			qcm_int_irq,</div><div class='add'>+			uvd, 16);</div><div class='add'>+</div><div class='add'>+	errflag = usb_submit_urb(cam-&gt;button_urb, GFP_KERNEL);</div><div class='add'>+	if (errflag)</div><div class='add'>+		err ("usb_submit_int ret %d", errflag);</div><div class='add'>+	return errflag;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_stop_int_data(struct qcm *cam)</div><div class='add'>+{</div><div class='add'>+	usb_kill_urb(cam-&gt;button_urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_alloc_int_urb(struct qcm *cam)</div><div class='add'>+{</div><div class='add'>+	cam-&gt;button_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!cam-&gt;button_urb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_free_int(struct qcm *cam)</div><div class='add'>+{</div><div class='add'>+	if (cam-&gt;button_urb)</div><div class='add'>+		usb_free_urb(cam-&gt;button_urb);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_INPUT */</div><div class='add'>+</div><div class='add'>+static int qcm_stv_setb(struct usb_device *dev, u16 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* we'll wait up to 3 slices but no more */</div><div class='add'>+	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),</div><div class='add'>+		0x04, USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,</div><div class='add'>+		reg, 0, &amp;val, 1, 3*HZ);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_stv_setw(struct usb_device *dev, u16 reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* we'll wait up to 3 slices but no more */</div><div class='add'>+	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),</div><div class='add'>+		0x04, USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,</div><div class='add'>+		reg, 0, &amp;val, 2, 3*HZ);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_stv_getw(struct usb_device *dev, unsigned short reg,</div><div class='add'>+							__le16 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* we'll wait up to 3 slices but no more */</div><div class='add'>+	ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),</div><div class='add'>+		0x04, USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_DEVICE,</div><div class='add'>+		reg, 0, val, 2, 3*HZ);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_camera_on(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, STV_ISO_ENABLE, 0x01));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_camera_off(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, STV_ISO_ENABLE, 0x00));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_hsv2rgb(u16 hue, u16 sat, u16 val, u16 *r, u16 *g, u16 *b)</div><div class='add'>+{</div><div class='add'>+	unsigned int segment, valsat;</div><div class='add'>+	signed int   h = (signed int) hue;</div><div class='add'>+	unsigned int s = (sat - 32768) * 2;	/* rescale */</div><div class='add'>+	unsigned int v = val;</div><div class='add'>+	unsigned int p;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	the registers controling gain are 8 bit of which</div><div class='add'>+	we affect only the last 4 bits with our gain.</div><div class='add'>+	we know that if saturation is 0, (unsaturated) then</div><div class='add'>+	we're grayscale (center axis of the colour cone) so</div><div class='add'>+	we set rgb=value. we use a formula obtained from</div><div class='add'>+	wikipedia to map the cone to the RGB plane. it's</div><div class='add'>+	as follows for the human value case of h=0..360,</div><div class='add'>+	s=0..1, v=0..1</div><div class='add'>+	h_i = h/60 % 6 , f = h/60 - h_i , p = v(1-s)</div><div class='add'>+	q = v(1 - f*s) , t = v(1 - (1-f)s)</div><div class='add'>+	h_i==0 =&gt; r=v , g=t, b=p</div><div class='add'>+	h_i==1 =&gt; r=q , g=v, b=p</div><div class='add'>+	h_i==2 =&gt; r=p , g=v, b=t</div><div class='add'>+	h_i==3 =&gt; r=p , g=q, b=v</div><div class='add'>+	h_i==4 =&gt; r=t , g=p, b=v</div><div class='add'>+	h_i==5 =&gt; r=v , g=p, b=q</div><div class='add'>+	the bottom side (the point) and the stuff just up</div><div class='add'>+	of that is black so we simplify those two cases.</div><div class='add'>+	*/</div><div class='add'>+	if (sat &lt; 32768) {</div><div class='add'>+		/* anything less than this is unsaturated */</div><div class='add'>+		*r = val;</div><div class='add'>+		*g = val;</div><div class='add'>+		*b = val;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (val &lt;= (0xFFFF/8)) {</div><div class='add'>+		/* anything less than this is black */</div><div class='add'>+		*r = 0;</div><div class='add'>+		*g = 0;</div><div class='add'>+		*b = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the rest of this code is copying tukkat's</div><div class='add'>+	implementation of the hsv2rgb conversion as taken</div><div class='add'>+	from qc-usb-messenger code. the 10923 is 0xFFFF/6</div><div class='add'>+	to divide the cone into 6 sectors.  */</div><div class='add'>+</div><div class='add'>+	segment = (h + 10923) &amp; 0xFFFF;</div><div class='add'>+	segment = segment*3 &gt;&gt; 16;		/* 0..2: 0=R, 1=G, 2=B */</div><div class='add'>+	hue -= segment * 21845;			/* -10923..10923 */</div><div class='add'>+	h = hue;</div><div class='add'>+	h *= 3;</div><div class='add'>+	valsat = v*s &gt;&gt; 16;			/* 0..65534 */</div><div class='add'>+	p = v - valsat;</div><div class='add'>+	if (h &gt;= 0) {</div><div class='add'>+		unsigned int t = v - (valsat * (32769 - h) &gt;&gt; 15);</div><div class='add'>+		switch (segment) {</div><div class='add'>+		case 0:	/* R-&gt; */</div><div class='add'>+			*r = v;</div><div class='add'>+			*g = t;</div><div class='add'>+			*b = p;</div><div class='add'>+			break;</div><div class='add'>+		case 1:	/* G-&gt; */</div><div class='add'>+			*r = p;</div><div class='add'>+			*g = v;</div><div class='add'>+			*b = t;</div><div class='add'>+			break;</div><div class='add'>+		case 2:	/* B-&gt; */</div><div class='add'>+			*r = t;</div><div class='add'>+			*g = p;</div><div class='add'>+			*b = v;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int q = v - (valsat * (32769 + h) &gt;&gt; 15);</div><div class='add'>+		switch (segment) {</div><div class='add'>+		case 0:	/* -&gt;R */</div><div class='add'>+			*r = v;</div><div class='add'>+			*g = p;</div><div class='add'>+			*b = q;</div><div class='add'>+			break;</div><div class='add'>+		case 1:	/* -&gt;G */</div><div class='add'>+			*r = q;</div><div class='add'>+			*g = v;</div><div class='add'>+			*b = p;</div><div class='add'>+			break;</div><div class='add'>+		case 2:	/* -&gt;B */</div><div class='add'>+			*r = p;</div><div class='add'>+			*g = q;</div><div class='add'>+			*b = v;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_sensor_set_gains(struct uvd *uvd, u16 hue,</div><div class='add'>+	u16 saturation, u16 value)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 r=0,g=0,b=0;</div><div class='add'>+</div><div class='add'>+	/* this code is based on qc-usb-messenger */</div><div class='add'>+	qcm_hsv2rgb(hue, saturation, value, &amp;r, &amp;g, &amp;b);</div><div class='add'>+</div><div class='add'>+	r &gt;&gt;= 12;</div><div class='add'>+	g &gt;&gt;= 12;</div><div class='add'>+	b &gt;&gt;= 12;</div><div class='add'>+</div><div class='add'>+	/* min val is 8 */</div><div class='add'>+	r = max((u16) 8, r);</div><div class='add'>+	g = max((u16) 8, g);</div><div class='add'>+	b = max((u16) 8, b);</div><div class='add'>+</div><div class='add'>+	r |= 0x30;</div><div class='add'>+	g |= 0x30;</div><div class='add'>+	b |= 0x30;</div><div class='add'>+</div><div class='add'>+	/* set the r,g,b gain registers */</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x0509, r));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x050A, g));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x050B, b));</div><div class='add'>+</div><div class='add'>+	/* doing as qc-usb did */</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x050C, 0x2A));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x050D, 0x01));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x143F, 0x01));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_sensor_set_exposure(struct uvd *uvd, int exposure)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int formedval;</div><div class='add'>+</div><div class='add'>+	/* calculation was from qc-usb-messenger driver */</div><div class='add'>+	formedval = ( exposure &gt;&gt; 12 );</div><div class='add'>+</div><div class='add'>+	/* max value for formedval is 14 */</div><div class='add'>+	formedval = min(formedval, 14);</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev,</div><div class='add'>+			0x143A, 0xF0 | formedval));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x143F, 0x01));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_sensor_setlevels(struct uvd *uvd, int brightness, int contrast,</div><div class='add'>+					int hue, int colour)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	/* brightness is exposure, contrast is gain, colour is saturation */</div><div class='add'>+	CHECK_RET(ret,</div><div class='add'>+		qcm_sensor_set_exposure(uvd, brightness));</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_set_gains(uvd, hue, colour, contrast));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_sensor_setsize(struct uvd *uvd, u8 size)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x1505, size));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_sensor_set_shutter(struct uvd *uvd, int whiteness)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	/* some rescaling as done by the qc-usb-messenger code */</div><div class='add'>+	if (whiteness &gt; 0xC000)</div><div class='add'>+		whiteness = 0xC000 + (whiteness &amp; 0x3FFF)*8;</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x143D,</div><div class='add'>+				(whiteness &gt;&gt; 8) &amp; 0xFF));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x143E,</div><div class='add'>+				(whiteness &gt;&gt; 16) &amp; 0x03));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x143F, 0x01));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_sensor_init(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; sizeof(regval_table)/sizeof(regval_table[0]) ; i++) {</div><div class='add'>+		CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev,</div><div class='add'>+					regval_table[i].reg,</div><div class='add'>+					regval_table[i].val));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setw(uvd-&gt;dev, 0x15c1,</div><div class='add'>+				cpu_to_le16(ISOC_PACKET_SIZE)));</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, 0x15c3, 0x08));</div><div class='add'>+	CHECK_RET(ret, ret = qcm_stv_setb(uvd-&gt;dev, 0x143f, 0x01));</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_stv_setb(uvd-&gt;dev, STV_ISO_ENABLE, 0x00));</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_setsize(uvd, camera_sizes[cam-&gt;size].cmd));</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_setlevels(uvd, uvd-&gt;vpic.brightness,</div><div class='add'>+			uvd-&gt;vpic.contrast, uvd-&gt;vpic.hue, uvd-&gt;vpic.colour));</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_set_shutter(uvd, uvd-&gt;vpic.whiteness));</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_setsize(uvd, camera_sizes[cam-&gt;size].cmd));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_set_camera_size(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_setsize(uvd, camera_sizes[cam-&gt;size].cmd));</div><div class='add'>+	cam-&gt;width = camera_sizes[cam-&gt;size].width;</div><div class='add'>+	cam-&gt;height = camera_sizes[cam-&gt;size].height;</div><div class='add'>+	uvd-&gt;videosize = VIDEOSIZE(cam-&gt;width, cam-&gt;height);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_setup_on_open(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_set_gains(uvd, uvd-&gt;vpic.hue,</div><div class='add'>+				uvd-&gt;vpic.colour, uvd-&gt;vpic.contrast));</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_set_exposure(uvd, uvd-&gt;vpic.brightness));</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_set_shutter(uvd, uvd-&gt;vpic.whiteness));</div><div class='add'>+	CHECK_RET(ret, qcm_set_camera_size(uvd));</div><div class='add'>+	CHECK_RET(ret, qcm_camera_on(uvd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_adjust_picture(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	ret = qcm_camera_off(uvd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		err("can't turn camera off. abandoning pic adjustment");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if there's been a change in contrast, hue, or</div><div class='add'>+	colour then we need to recalculate hsv in order</div><div class='add'>+	to update gains */</div><div class='add'>+	if ((cam-&gt;contrast != uvd-&gt;vpic.contrast) ||</div><div class='add'>+		(cam-&gt;hue != uvd-&gt;vpic.hue) ||</div><div class='add'>+		(cam-&gt;colour != uvd-&gt;vpic.colour)) {</div><div class='add'>+		cam-&gt;contrast = uvd-&gt;vpic.contrast;</div><div class='add'>+		cam-&gt;hue = uvd-&gt;vpic.hue;</div><div class='add'>+		cam-&gt;colour = uvd-&gt;vpic.colour;</div><div class='add'>+		ret = qcm_sensor_set_gains(uvd, cam-&gt;hue, cam-&gt;colour,</div><div class='add'>+						cam-&gt;contrast);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("can't set gains. abandoning pic adjustment");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cam-&gt;brightness != uvd-&gt;vpic.brightness) {</div><div class='add'>+		cam-&gt;brightness = uvd-&gt;vpic.brightness;</div><div class='add'>+		ret = qcm_sensor_set_exposure(uvd, cam-&gt;brightness);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("can't set exposure. abandoning pic adjustment");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cam-&gt;whiteness != uvd-&gt;vpic.whiteness) {</div><div class='add'>+		cam-&gt;whiteness = uvd-&gt;vpic.whiteness;</div><div class='add'>+		qcm_sensor_set_shutter(uvd, cam-&gt;whiteness);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("can't set shutter. abandoning pic adjustment");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qcm_camera_on(uvd);</div><div class='add'>+	if (ret) {</div><div class='add'>+		err("can't reenable camera. pic adjustment failed");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_process_frame(struct uvd *uvd, u8 *cdata, int framelen)</div><div class='add'>+{</div><div class='add'>+	int datalen;</div><div class='add'>+	int totaldata;</div><div class='add'>+	struct framehdr {</div><div class='add'>+		__be16 id;</div><div class='add'>+		__be16 len;</div><div class='add'>+	};</div><div class='add'>+	struct framehdr *fhdr;</div><div class='add'>+</div><div class='add'>+	totaldata = 0;</div><div class='add'>+	while (framelen) {</div><div class='add'>+		fhdr = (struct framehdr *) cdata;</div><div class='add'>+		datalen = be16_to_cpu(fhdr-&gt;len);</div><div class='add'>+		framelen -= 4;</div><div class='add'>+		cdata += 4;</div><div class='add'>+</div><div class='add'>+		if ((fhdr-&gt;id) == cpu_to_be16(0x8001)) {</div><div class='add'>+			RingQueue_Enqueue(&amp;uvd-&gt;dp, marker, 4);</div><div class='add'>+			totaldata += 4;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if ((fhdr-&gt;id &amp; cpu_to_be16(0xFF00)) == cpu_to_be16(0x0200)) {</div><div class='add'>+			RingQueue_Enqueue(&amp;uvd-&gt;dp, cdata, datalen);</div><div class='add'>+			totaldata += datalen;</div><div class='add'>+		}</div><div class='add'>+		framelen -= datalen;</div><div class='add'>+		cdata += datalen;</div><div class='add'>+	}</div><div class='add'>+	return totaldata;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_compress_iso(struct uvd *uvd, struct urb *dataurb)</div><div class='add'>+{</div><div class='add'>+	int totlen;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char *cdata;</div><div class='add'>+</div><div class='add'>+	totlen=0;</div><div class='add'>+	for (i = 0; i &lt; dataurb-&gt;number_of_packets; i++) {</div><div class='add'>+		int n = dataurb-&gt;iso_frame_desc[i].actual_length;</div><div class='add'>+		int st = dataurb-&gt;iso_frame_desc[i].status;</div><div class='add'>+</div><div class='add'>+		cdata = dataurb-&gt;transfer_buffer +</div><div class='add'>+			dataurb-&gt;iso_frame_desc[i].offset;</div><div class='add'>+</div><div class='add'>+		if (st &lt; 0) {</div><div class='add'>+			warn("Data error: packet=%d. len=%d. status=%d.",</div><div class='add'>+			      i, n, st);</div><div class='add'>+			uvd-&gt;stats.iso_err_count++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (!n)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		totlen += qcm_process_frame(uvd, cdata, n);</div><div class='add'>+	}</div><div class='add'>+	return totlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void resubmit_urb(struct uvd *uvd, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	urb-&gt;dev = uvd-&gt;dev;</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (ret)</div><div class='add'>+		err("usb_submit_urb error (%d)", ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_isoc_irq(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	struct uvd *uvd = urb-&gt;context;</div><div class='add'>+</div><div class='add'>+	if (!CAMERA_IS_OPERATIONAL(uvd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!uvd-&gt;streaming)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	uvd-&gt;stats.urb_count++;</div><div class='add'>+</div><div class='add'>+	if (!urb-&gt;actual_length) {</div><div class='add'>+		resubmit_urb(uvd, urb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = qcm_compress_iso(uvd, urb);</div><div class='add'>+	resubmit_urb(uvd, urb);</div><div class='add'>+	uvd-&gt;stats.urb_length = len;</div><div class='add'>+	uvd-&gt;stats.data_count += len;</div><div class='add'>+	if (len)</div><div class='add'>+		RingQueue_WakeUpInterruptible(&amp;uvd-&gt;dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_start_data(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+	int i;</div><div class='add'>+	int errflag;</div><div class='add'>+	int pktsz;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pktsz = uvd-&gt;iso_packet_len;</div><div class='add'>+	if (!CAMERA_IS_OPERATIONAL(uvd)) {</div><div class='add'>+		err("Camera is not operational");</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = usb_set_interface(uvd-&gt;dev, uvd-&gt;iface, uvd-&gt;ifaceAltActive);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err("usb_set_interface error");</div><div class='add'>+		uvd-&gt;last_error = err;</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; USBVIDEO_NUMSBUF; i++) {</div><div class='add'>+		int j, k;</div><div class='add'>+		struct urb *urb = uvd-&gt;sbuf[i].urb;</div><div class='add'>+		urb-&gt;dev = uvd-&gt;dev;</div><div class='add'>+		urb-&gt;context = uvd;</div><div class='add'>+		urb-&gt;pipe = usb_rcvisocpipe(uvd-&gt;dev, uvd-&gt;video_endp);</div><div class='add'>+		urb-&gt;interval = 1;</div><div class='add'>+		urb-&gt;transfer_flags = URB_ISO_ASAP;</div><div class='add'>+		urb-&gt;transfer_buffer = uvd-&gt;sbuf[i].data;</div><div class='add'>+		urb-&gt;complete = qcm_isoc_irq;</div><div class='add'>+		urb-&gt;number_of_packets = FRAMES_PER_DESC;</div><div class='add'>+		urb-&gt;transfer_buffer_length = pktsz * FRAMES_PER_DESC;</div><div class='add'>+		for (j=k=0; j &lt; FRAMES_PER_DESC; j++, k += pktsz) {</div><div class='add'>+			urb-&gt;iso_frame_desc[j].offset = k;</div><div class='add'>+			urb-&gt;iso_frame_desc[j].length = pktsz;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uvd-&gt;streaming = 1;</div><div class='add'>+	uvd-&gt;curframe = -1;</div><div class='add'>+	for (i=0; i &lt; USBVIDEO_NUMSBUF; i++) {</div><div class='add'>+		errflag = usb_submit_urb(uvd-&gt;sbuf[i].urb, GFP_KERNEL);</div><div class='add'>+		if (errflag)</div><div class='add'>+			err ("usb_submit_isoc(%d) ret %d", i, errflag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CHECK_RET(err, qcm_setup_input_int(cam, uvd));</div><div class='add'>+	CHECK_RET(err, qcm_camera_on(uvd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_stop_data(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+	int i, j;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((uvd == NULL) || (!uvd-&gt;streaming) || (uvd-&gt;dev == NULL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = qcm_camera_off(uvd);</div><div class='add'>+	if (ret)</div><div class='add'>+		warn("couldn't turn the cam off.");</div><div class='add'>+</div><div class='add'>+	uvd-&gt;streaming = 0;</div><div class='add'>+</div><div class='add'>+	/* Unschedule all of the iso td's */</div><div class='add'>+	for (i=0; i &lt; USBVIDEO_NUMSBUF; i++)</div><div class='add'>+		usb_kill_urb(uvd-&gt;sbuf[i].urb);</div><div class='add'>+</div><div class='add'>+	qcm_stop_int_data(cam);</div><div class='add'>+</div><div class='add'>+	if (!uvd-&gt;remove_pending) {</div><div class='add'>+		/* Set packet size to 0 */</div><div class='add'>+		j = usb_set_interface(uvd-&gt;dev, uvd-&gt;iface,</div><div class='add'>+					uvd-&gt;ifaceAltInactive);</div><div class='add'>+		if (j &lt; 0) {</div><div class='add'>+			err("usb_set_interface() error %d.", j);</div><div class='add'>+			uvd-&gt;last_error = j;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_process_isoc(struct uvd *uvd, struct usbvideo_frame *frame)</div><div class='add'>+{</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+	int x;</div><div class='add'>+	struct rgb *rgbL0;</div><div class='add'>+	struct rgb *rgbL1;</div><div class='add'>+	struct bayL0 *bayL0;</div><div class='add'>+	struct bayL1 *bayL1;</div><div class='add'>+	int hor,ver,hordel,verdel;</div><div class='add'>+	assert(frame != NULL);</div><div class='add'>+</div><div class='add'>+	switch (cam-&gt;size) {</div><div class='add'>+	case SIZE_160X120:</div><div class='add'>+		hor = 162; ver = 124; hordel = 1; verdel = 2;</div><div class='add'>+		break;</div><div class='add'>+	case SIZE_320X240:</div><div class='add'>+	default:</div><div class='add'>+		hor = 324; ver = 248; hordel = 2; verdel = 4;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;scanstate == ScanState_Scanning) {</div><div class='add'>+		while (RingQueue_GetLength(&amp;uvd-&gt;dp) &gt;=</div><div class='add'>+			 4 + (hor*verdel + hordel)) {</div><div class='add'>+			if ((RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 0) == 0x00) &amp;&amp;</div><div class='add'>+			    (RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 1) == 0xff) &amp;&amp;</div><div class='add'>+			    (RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 2) == 0x00) &amp;&amp;</div><div class='add'>+			    (RING_QUEUE_PEEK(&amp;uvd-&gt;dp, 3) == 0xff)) {</div><div class='add'>+				frame-&gt;curline = 0;</div><div class='add'>+				frame-&gt;scanstate = ScanState_Lines;</div><div class='add'>+				frame-&gt;frameState = FrameState_Grabbing;</div><div class='add'>+				RING_QUEUE_DEQUEUE_BYTES(&amp;uvd-&gt;dp, 4);</div><div class='add'>+			/*</div><div class='add'>+			* if we're starting, we need to discard the first</div><div class='add'>+			* 4 lines of y bayer data</div><div class='add'>+			* and the first 2 gr elements of x bayer data</div><div class='add'>+			*/</div><div class='add'>+				RING_QUEUE_DEQUEUE_BYTES(&amp;uvd-&gt;dp,</div><div class='add'>+							(hor*verdel + hordel));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			RING_QUEUE_DEQUEUE_BYTES(&amp;uvd-&gt;dp, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;scanstate == ScanState_Scanning)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* now we can start processing bayer data so long as we have at least</div><div class='add'>+	* 2 lines worth of data. this is the simplest demosaicing method that</div><div class='add'>+	* I could think of. I use each 2x2 bayer element without interpolation</div><div class='add'>+	* to generate 4 rgb pixels.</div><div class='add'>+	*/</div><div class='add'>+	while ( frame-&gt;curline &lt; cam-&gt;height &amp;&amp;</div><div class='add'>+		(RingQueue_GetLength(&amp;uvd-&gt;dp) &gt;= hor*2)) {</div><div class='add'>+		/* get 2 lines of bayer for demosaicing</div><div class='add'>+		 * into 2 lines of RGB */</div><div class='add'>+		RingQueue_Dequeue(&amp;uvd-&gt;dp, cam-&gt;scratch, hor*2);</div><div class='add'>+		bayL0 = (struct bayL0 *) cam-&gt;scratch;</div><div class='add'>+		bayL1 = (struct bayL1 *) (cam-&gt;scratch + hor);</div><div class='add'>+		/* frame-&gt;curline is the rgb y line */</div><div class='add'>+		rgbL0 = (struct rgb *)</div><div class='add'>+				( frame-&gt;data + (cam-&gt;width*3*frame-&gt;curline));</div><div class='add'>+		/* w/2 because we're already doing 2 pixels */</div><div class='add'>+		rgbL1 = rgbL0 + (cam-&gt;width/2);</div><div class='add'>+</div><div class='add'>+		for (x=0; x &lt; cam-&gt;width; x+=2) {</div><div class='add'>+			rgbL0-&gt;r = bayL0-&gt;r;</div><div class='add'>+			rgbL0-&gt;g = bayL0-&gt;g;</div><div class='add'>+			rgbL0-&gt;b = bayL1-&gt;b;</div><div class='add'>+</div><div class='add'>+			rgbL0-&gt;r2 = bayL0-&gt;r;</div><div class='add'>+			rgbL0-&gt;g2 = bayL1-&gt;g;</div><div class='add'>+			rgbL0-&gt;b2 = bayL1-&gt;b;</div><div class='add'>+</div><div class='add'>+			rgbL1-&gt;r = bayL0-&gt;r;</div><div class='add'>+			rgbL1-&gt;g = bayL1-&gt;g;</div><div class='add'>+			rgbL1-&gt;b = bayL1-&gt;b;</div><div class='add'>+</div><div class='add'>+			rgbL1-&gt;r2 = bayL0-&gt;r;</div><div class='add'>+			rgbL1-&gt;g2 = bayL1-&gt;g;</div><div class='add'>+			rgbL1-&gt;b2 = bayL1-&gt;b;</div><div class='add'>+</div><div class='add'>+			rgbL0++;</div><div class='add'>+			rgbL1++;</div><div class='add'>+</div><div class='add'>+			bayL0++;</div><div class='add'>+			bayL1++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		frame-&gt;seqRead_Length += cam-&gt;width*3*2;</div><div class='add'>+		frame-&gt;curline += 2;</div><div class='add'>+	}</div><div class='add'>+	/* See if we filled the frame */</div><div class='add'>+	if (frame-&gt;curline == cam-&gt;height) {</div><div class='add'>+		frame-&gt;frameState = FrameState_Done_Hold;</div><div class='add'>+		frame-&gt;curline = 0;</div><div class='add'>+		uvd-&gt;curframe = -1;</div><div class='add'>+		uvd-&gt;stats.frame_num++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* taken from konicawc */</div><div class='add'>+static int qcm_set_video_mode(struct uvd *uvd, struct video_window *vw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int newsize;</div><div class='add'>+	int oldsize;</div><div class='add'>+	int x = vw-&gt;width;</div><div class='add'>+	int y = vw-&gt;height;</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	if (x &gt; 0 &amp;&amp; y &gt; 0) {</div><div class='add'>+		DEBUG(2, "trying to find size %d,%d", x, y);</div><div class='add'>+		for (newsize = 0; newsize &lt;= MAX_FRAME_SIZE; newsize++) {</div><div class='add'>+			if ((camera_sizes[newsize].width == x) &amp;&amp;</div><div class='add'>+				(camera_sizes[newsize].height == y))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		newsize = cam-&gt;size;</div><div class='add'>+</div><div class='add'>+	if (newsize &gt; MAX_FRAME_SIZE) {</div><div class='add'>+		DEBUG(1, "couldn't find size %d,%d", x, y);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (newsize == cam-&gt;size) {</div><div class='add'>+		DEBUG(1, "Nothing to do");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcm_stop_data(uvd);</div><div class='add'>+</div><div class='add'>+	if (cam-&gt;size != newsize) {</div><div class='add'>+		oldsize = cam-&gt;size;</div><div class='add'>+		cam-&gt;size = newsize;</div><div class='add'>+		ret = qcm_set_camera_size(uvd);</div><div class='add'>+		if (ret) {</div><div class='add'>+			err("Couldn't set camera size, err=%d",ret);</div><div class='add'>+			/* restore the original size */</div><div class='add'>+			cam-&gt;size = oldsize;</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush the input queue and clear any current frame in progress */</div><div class='add'>+</div><div class='add'>+	RingQueue_Flush(&amp;uvd-&gt;dp);</div><div class='add'>+	if (uvd-&gt;curframe != -1) {</div><div class='add'>+		uvd-&gt;frame[uvd-&gt;curframe].curline = 0;</div><div class='add'>+		uvd-&gt;frame[uvd-&gt;curframe].seqRead_Length = 0;</div><div class='add'>+		uvd-&gt;frame[uvd-&gt;curframe].seqRead_Index = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_start_data(uvd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_configure_video(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	memset(&amp;uvd-&gt;vpic, 0, sizeof(uvd-&gt;vpic));</div><div class='add'>+	memset(&amp;uvd-&gt;vpic_old, 0x55, sizeof(uvd-&gt;vpic_old));</div><div class='add'>+</div><div class='add'>+	uvd-&gt;vpic.colour = colour;</div><div class='add'>+	uvd-&gt;vpic.hue = hue;</div><div class='add'>+	uvd-&gt;vpic.brightness = brightness;</div><div class='add'>+	uvd-&gt;vpic.contrast = contrast;</div><div class='add'>+	uvd-&gt;vpic.whiteness = whiteness;</div><div class='add'>+	uvd-&gt;vpic.depth = 24;</div><div class='add'>+	uvd-&gt;vpic.palette = VIDEO_PALETTE_RGB24;</div><div class='add'>+</div><div class='add'>+	memset(&amp;uvd-&gt;vcap, 0, sizeof(uvd-&gt;vcap));</div><div class='add'>+	strcpy(uvd-&gt;vcap.name, "QCM USB Camera");</div><div class='add'>+	uvd-&gt;vcap.type = VID_TYPE_CAPTURE;</div><div class='add'>+	uvd-&gt;vcap.channels = 1;</div><div class='add'>+	uvd-&gt;vcap.audios = 0;</div><div class='add'>+</div><div class='add'>+	uvd-&gt;vcap.minwidth = camera_sizes[SIZE_160X120].width;</div><div class='add'>+	uvd-&gt;vcap.minheight = camera_sizes[SIZE_160X120].height;</div><div class='add'>+	uvd-&gt;vcap.maxwidth = camera_sizes[SIZE_320X240].width;</div><div class='add'>+	uvd-&gt;vcap.maxheight = camera_sizes[SIZE_320X240].height;</div><div class='add'>+</div><div class='add'>+	memset(&amp;uvd-&gt;vchan, 0, sizeof(uvd-&gt;vchan));</div><div class='add'>+	uvd-&gt;vchan.flags = 0 ;</div><div class='add'>+	uvd-&gt;vchan.tuners = 0;</div><div class='add'>+	uvd-&gt;vchan.channel = 0;</div><div class='add'>+	uvd-&gt;vchan.type = VIDEO_TYPE_CAMERA;</div><div class='add'>+	strcpy(uvd-&gt;vchan.name, "Camera");</div><div class='add'>+</div><div class='add'>+	CHECK_RET(ret, qcm_sensor_init(uvd));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qcm_probe(struct usb_interface *intf,</div><div class='add'>+			const struct usb_device_id *devid)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct uvd *uvd;</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='add'>+	struct qcm *cam;</div><div class='add'>+	size_t buffer_size;</div><div class='add'>+	unsigned char video_ep;</div><div class='add'>+	struct usb_host_interface *interface;</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint;</div><div class='add'>+	int i,j;</div><div class='add'>+	unsigned int ifacenum, ifacenum_inact=0;</div><div class='add'>+	__le16 sensor_id;</div><div class='add'>+</div><div class='add'>+	/* we don't support multiconfig cams */</div><div class='add'>+	if (dev-&gt;descriptor.bNumConfigurations != 1)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* first check for the video interface and not</div><div class='add'>+	* the audio interface */</div><div class='add'>+	interface = &amp;intf-&gt;cur_altsetting[0];</div><div class='add'>+	if ((interface-&gt;desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)</div><div class='add'>+		|| (interface-&gt;desc.bInterfaceSubClass !=</div><div class='add'>+			USB_CLASS_VENDOR_SPEC))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	walk through each endpoint in each setting in the interface</div><div class='add'>+	stop when we find the one that's an isochronous IN endpoint.</div><div class='add'>+	*/</div><div class='add'>+	for (i=0; i &lt; intf-&gt;num_altsetting; i++) {</div><div class='add'>+		interface = &amp;intf-&gt;cur_altsetting[i];</div><div class='add'>+		ifacenum = interface-&gt;desc.bAlternateSetting;</div><div class='add'>+		/* walk the end points */</div><div class='add'>+		for (j=0; j &lt; interface-&gt;desc.bNumEndpoints; j++) {</div><div class='add'>+			endpoint = &amp;interface-&gt;endpoint[j].desc;</div><div class='add'>+</div><div class='add'>+			if ((endpoint-&gt;bEndpointAddress &amp;</div><div class='add'>+				USB_ENDPOINT_DIR_MASK) != USB_DIR_IN)</div><div class='add'>+				continue; /* not input then not good */</div><div class='add'>+</div><div class='add'>+			buffer_size = le16_to_cpu(endpoint-&gt;wMaxPacketSize);</div><div class='add'>+			if (!buffer_size) {</div><div class='add'>+				ifacenum_inact = ifacenum;</div><div class='add'>+				continue; /* 0 pkt size is not what we want */</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((endpoint-&gt;bmAttributes &amp;</div><div class='add'>+				USB_ENDPOINT_XFERTYPE_MASK) ==</div><div class='add'>+				USB_ENDPOINT_XFER_ISOC) {</div><div class='add'>+				video_ep = endpoint-&gt;bEndpointAddress;</div><div class='add'>+				/* break out of the search */</div><div class='add'>+				goto good_videoep;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* failed out since nothing useful was found */</div><div class='add'>+	err("No suitable endpoint was found\n");</div><div class='add'>+	return -ENODEV;</div><div class='add'>+</div><div class='add'>+good_videoep:</div><div class='add'>+	/* disable isochronous stream before doing anything else */</div><div class='add'>+	err = qcm_stv_setb(dev, STV_ISO_ENABLE, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err("Failed to disable sensor stream");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	Check that this is the same unknown sensor that is known to work. This</div><div class='add'>+	sensor is suspected to be the ST VV6422C001. I'll check the same value</div><div class='add'>+	that the qc-usb driver checks. This value is probably not even the</div><div class='add'>+	sensor ID since it matches the USB dev ID. Oh well. If it doesn't</div><div class='add'>+	match, it's probably a diff sensor so exit and apologize.</div><div class='add'>+	*/</div><div class='add'>+	err = qcm_stv_getw(dev, CMOS_SENSOR_IDREV, &amp;sensor_id);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err("Couldn't read sensor values. Err %d\n",err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (sensor_id != cpu_to_le16(0x08F0)) {</div><div class='add'>+		err("Sensor ID %x != %x. Unsupported. Sorry\n",</div><div class='add'>+			le16_to_cpu(sensor_id), (0x08F0));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uvd = usbvideo_AllocateDevice(cams);</div><div class='add'>+	if (!uvd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	/* buf for doing demosaicing */</div><div class='add'>+	cam-&gt;scratch = kmalloc(324*2, GFP_KERNEL);</div><div class='add'>+	if (!cam-&gt;scratch) /* uvd freed in dereg */</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* yes, if we fail after here, cam-&gt;scratch gets freed</div><div class='add'>+	by qcm_free_uvd */</div><div class='add'>+</div><div class='add'>+	err = qcm_alloc_int_urb(cam);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* yes, if we fail after here, int urb gets freed</div><div class='add'>+	by qcm_free_uvd */</div><div class='add'>+</div><div class='add'>+	RESTRICT_TO_RANGE(size, SIZE_160X120, SIZE_320X240);</div><div class='add'>+	cam-&gt;width = camera_sizes[size].width;</div><div class='add'>+	cam-&gt;height = camera_sizes[size].height;</div><div class='add'>+	cam-&gt;size = size;</div><div class='add'>+</div><div class='add'>+	uvd-&gt;debug = debug;</div><div class='add'>+	uvd-&gt;flags = 0;</div><div class='add'>+	uvd-&gt;dev = dev;</div><div class='add'>+	uvd-&gt;iface = intf-&gt;altsetting-&gt;desc.bInterfaceNumber;</div><div class='add'>+	uvd-&gt;ifaceAltActive = ifacenum;</div><div class='add'>+	uvd-&gt;ifaceAltInactive = ifacenum_inact;</div><div class='add'>+	uvd-&gt;video_endp = video_ep;</div><div class='add'>+	uvd-&gt;iso_packet_len = buffer_size;</div><div class='add'>+	uvd-&gt;paletteBits = 1L &lt;&lt; VIDEO_PALETTE_RGB24;</div><div class='add'>+	uvd-&gt;defaultPalette = VIDEO_PALETTE_RGB24;</div><div class='add'>+	uvd-&gt;canvas = VIDEOSIZE(320, 240);</div><div class='add'>+	uvd-&gt;videosize = VIDEOSIZE(cam-&gt;width, cam-&gt;height);</div><div class='add'>+	err = qcm_configure_video(uvd);</div><div class='add'>+	if (err) {</div><div class='add'>+		err("failed to configure video settings");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = usbvideo_RegisterVideoDevice(uvd);</div><div class='add'>+	if (err) { /* the uvd gets freed in Deregister */</div><div class='add'>+		err("usbvideo_RegisterVideoDevice() failed.");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uvd-&gt;max_frame_size = (320 * 240 * 3);</div><div class='add'>+	qcm_register_input(cam, dev);</div><div class='add'>+	usb_set_intfdata(intf, uvd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qcm_free_uvd(struct uvd *uvd)</div><div class='add'>+{</div><div class='add'>+	struct qcm *cam = (struct qcm *) uvd-&gt;user_data;</div><div class='add'>+</div><div class='add'>+	kfree(cam-&gt;scratch);</div><div class='add'>+	qcm_unregister_input(cam);</div><div class='add'>+	qcm_free_int(cam);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usbvideo_cb qcm_driver = {</div><div class='add'>+	.probe = 		qcm_probe,</div><div class='add'>+	.setupOnOpen = 		qcm_setup_on_open,</div><div class='add'>+	.processData = 		qcm_process_isoc,</div><div class='add'>+	.setVideoMode = 	qcm_set_video_mode,</div><div class='add'>+	.startDataPump = 	qcm_start_data,</div><div class='add'>+	.stopDataPump = 	qcm_stop_data,</div><div class='add'>+	.adjustPicture = 	qcm_adjust_picture,</div><div class='add'>+	.userFree = 		qcm_free_uvd</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init qcm_init(void)</div><div class='add'>+{</div><div class='add'>+	info(DRIVER_DESC " " DRIVER_VERSION);</div><div class='add'>+</div><div class='add'>+	return usbvideo_register(</div><div class='add'>+		&amp;cams,</div><div class='add'>+		MAX_CAMERAS,</div><div class='add'>+		sizeof(struct qcm),</div><div class='add'>+		"QCM",</div><div class='add'>+		&amp;qcm_driver,</div><div class='add'>+		THIS_MODULE,</div><div class='add'>+		qcm_table);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit qcm_exit(void)</div><div class='add'>+{</div><div class='add'>+	usbvideo_Deregister(&amp;cams);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param(size, int, 0);</div><div class='add'>+MODULE_PARM_DESC(size, "Initial Size 0: 160x120 1: 320x240");</div><div class='add'>+module_param(colour, int, 0);</div><div class='add'>+MODULE_PARM_DESC(colour, "Initial colour");</div><div class='add'>+module_param(hue, int, 0);</div><div class='add'>+MODULE_PARM_DESC(hue, "Initial hue");</div><div class='add'>+module_param(brightness, int, 0);</div><div class='add'>+MODULE_PARM_DESC(brightness, "Initial brightness");</div><div class='add'>+module_param(contrast, int, 0);</div><div class='add'>+MODULE_PARM_DESC(contrast, "Initial contrast");</div><div class='add'>+module_param(whiteness, int, 0);</div><div class='add'>+MODULE_PARM_DESC(whiteness, "Initial whiteness");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_USB_DEBUG</div><div class='add'>+module_param(debug, int, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level: 0-9 (default=0)");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+module_init(qcm_init);</div><div class='add'>+module_exit(qcm_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Jaya Kumar");</div><div class='add'>+MODULE_DESCRIPTION("QCM USB Camera");</div><div class='add'>+MODULE_SUPPORTED_DEVICE("QCM USB Camera");</div><div class='head'>diff --git a/drivers/media/video/usbvideo/quickcam_messenger.h b/drivers/media/video/usbvideo/quickcam_messenger.h<br/>new file mode 100644<br/>index 000000000000..baab9c081b52<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/quickcam_messenger.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/usbvideo/quickcam_messenger.h</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+#ifndef quickcam_messenger_h</div><div class='add'>+#define quickcam_messenger_h</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_INPUT</div><div class='add'>+/* if we're not using input we dummy out these functions */</div><div class='add'>+#define qcm_register_input(...)</div><div class='add'>+#define qcm_unregister_input(...)</div><div class='add'>+#define qcm_report_buttonstat(...)</div><div class='add'>+#define qcm_setup_input_int(...) 0</div><div class='add'>+#define qcm_stop_int_data(...)</div><div class='add'>+#define qcm_alloc_int_urb(...) 0</div><div class='add'>+#define qcm_free_int(...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define CHECK_RET(ret, expr) \</div><div class='add'>+	if ((ret = expr) &lt; 0) return ret</div><div class='add'>+</div><div class='add'>+/* Control Registers for the STVV6422 ASIC</div><div class='add'>+ * - this define is taken from the qc-usb-messenger code</div><div class='add'>+ */</div><div class='add'>+#define STV_ISO_ENABLE		0x1440</div><div class='add'>+#define ISOC_PACKET_SIZE	1023</div><div class='add'>+</div><div class='add'>+/* Chip identification number including revision indicator */</div><div class='add'>+#define CMOS_SENSOR_IDREV	0xE00A</div><div class='add'>+</div><div class='add'>+struct rgb {</div><div class='add'>+	u8 b;</div><div class='add'>+	u8 g;</div><div class='add'>+	u8 r;</div><div class='add'>+	u8 b2;</div><div class='add'>+	u8 g2;</div><div class='add'>+	u8 r2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bayL0 {</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+	u8 r;</div><div class='add'>+	u8 g;</div><div class='add'>+#elif __LITTLE_ENDIAN</div><div class='add'>+	u8 g;</div><div class='add'>+	u8 r;</div><div class='add'>+#else</div><div class='add'>+#error not byte order defined</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bayL1 {</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+	u8 g;</div><div class='add'>+	u8 b;</div><div class='add'>+#elif __LITTLE_ENDIAN</div><div class='add'>+	u8 b;</div><div class='add'>+	u8 g;</div><div class='add'>+#else</div><div class='add'>+#error not byte order defined</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cam_size {</div><div class='add'>+	u16	width;</div><div class='add'>+	u16	height;</div><div class='add'>+	u8	cmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cam_size camera_sizes[] = {</div><div class='add'>+	{ 160, 120, 0xf },</div><div class='add'>+	{ 320, 240, 0x2 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum frame_sizes {</div><div class='add'>+	SIZE_160X120	= 0,</div><div class='add'>+	SIZE_320X240	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_FRAME_SIZE SIZE_320X240</div><div class='add'>+</div><div class='add'>+struct qcm {</div><div class='add'>+	u16 colour;</div><div class='add'>+	u16 hue;</div><div class='add'>+	u16 brightness;</div><div class='add'>+	u16 contrast;</div><div class='add'>+	u16 whiteness;</div><div class='add'>+</div><div class='add'>+	u8 size;</div><div class='add'>+	int height;</div><div class='add'>+	int width;</div><div class='add'>+	u8 *scratch;</div><div class='add'>+	struct urb *button_urb;</div><div class='add'>+	u8 button_sts;</div><div class='add'>+	u8 button_sts_buf;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INPUT</div><div class='add'>+	struct input_dev *input;</div><div class='add'>+	char input_physname[64];</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct regval {</div><div class='add'>+	u16 reg;</div><div class='add'>+	u8 val;</div><div class='add'>+};</div><div class='add'>+/* this table is derived from the</div><div class='add'>+qc-usb-messenger code */</div><div class='add'>+static const struct regval regval_table[] = {</div><div class='add'>+	{ STV_ISO_ENABLE, 0x00 },</div><div class='add'>+	{ 0x1436, 0x00 }, { 0x1432, 0x03 },</div><div class='add'>+	{ 0x143a, 0xF9 }, { 0x0509, 0x38 },</div><div class='add'>+	{ 0x050a, 0x38 }, { 0x050b, 0x38 },</div><div class='add'>+	{ 0x050c, 0x2A }, { 0x050d, 0x01 },</div><div class='add'>+	{ 0x1431, 0x00 }, { 0x1433, 0x34 },</div><div class='add'>+	{ 0x1438, 0x18 }, { 0x1439, 0x00 },</div><div class='add'>+	{ 0x143b, 0x05 }, { 0x143c, 0x00 },</div><div class='add'>+	{ 0x143e, 0x01 }, { 0x143d, 0x00 },</div><div class='add'>+	{ 0x1442, 0xe2 }, { 0x1500, 0xd0 },</div><div class='add'>+	{ 0x1500, 0xd0 }, { 0x1500, 0x50 },</div><div class='add'>+	{ 0x1501, 0xaf }, { 0x1502, 0xc2 },</div><div class='add'>+	{ 0x1503, 0x45 }, { 0x1505, 0x02 },</div><div class='add'>+	{ 0x150e, 0x8e }, { 0x150f, 0x37 },</div><div class='add'>+	{ 0x15c0, 0x00 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char marker[] = { 0x00, 0xff, 0x00, 0xFF };</div><div class='add'>+</div><div class='add'>+#endif /* quickcam_messenger_h */</div><div class='head'>diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h<br/>index 3cbf4fc499a3..051775d4c726 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/usbvideo.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/usbvideo/usbvideo.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/usbvideo/usbvideo.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/usbvideo/usbvideo.h</a></div><div class='hunk'>@@ -16,8 +16,8 @@</div><div class='ctx'> #ifndef usbvideo_h</div><div class='ctx'> #define	usbvideo_h</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c<br/>index 474a29bc1760..d83a2c84d233 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l1-compat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/v4l1-compat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l1-compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/v4l1-compat.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -32,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='head'>diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c<br/>index d330fa985bcc..f06dc19e504a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/v4l2-common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/v4l2-common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/v4l2-common.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * Added Gerd Knorrs v4l1 enhancements (Justin Schoeman)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -59,6 +58,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='add'>+#define __OLD_VIDIOC_ /* To allow fixing old calls*/</div><div class='ctx'> #include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_KMOD</div><div class='hunk'>@@ -293,7 +293,10 @@ static const char *v4l2_ioctls[] = {</div><div class='ctx'> #if 1</div><div class='ctx'> 	[_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",</div><div class='ctx'> #endif</div><div class='del'>-	[_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS"</div><div class='add'>+	[_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",</div><div class='add'>+	[_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",</div><div class='add'>+	[_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",</div><div class='add'>+	[_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS"</div><div class='ctx'> };</div><div class='ctx'> #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)</div><div class='ctx'> </div><div class='hunk'>@@ -331,7 +334,8 @@ static const char *v4l2_int_ioctls[] = {</div><div class='ctx'> 	[_IOC_NR(VIDIOC_INT_S_AUDIO_ROUTING)]  = "VIDIOC_INT_S_AUDIO_ROUTING",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)]  = "VIDIOC_INT_G_AUDIO_ROUTING",</div><div class='ctx'> 	[_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)]  = "VIDIOC_INT_S_VIDEO_ROUTING",</div><div class='del'>-	[_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING"</div><div class='add'>+	[_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING",</div><div class='add'>+	[_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)]   = "VIDIOC_INT_S_CRYSTAL_FREQ"</div><div class='ctx'> };</div><div class='ctx'> #define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)</div><div class='ctx'> </div><div class='hunk'>@@ -423,7 +427,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 	case TUNER_SET_TYPE_ADDR:</div><div class='ctx'> 	case TUNER_SET_STANDBY:</div><div class='ctx'> 	case TDA9887_SET_CONFIG:</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	case VIDIOC_OVERLAY_OLD:</div><div class='add'>+#endif</div><div class='ctx'> 	case VIDIOC_STREAMOFF:</div><div class='ctx'> 	case VIDIOC_G_OUTPUT:</div><div class='ctx'> 	case VIDIOC_S_OUTPUT:</div><div class='hunk'>@@ -439,7 +445,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 	case VIDIOC_G_AUDIO:</div><div class='ctx'> 	case VIDIOC_S_AUDIO:</div><div class='ctx'> 	case VIDIOC_ENUMAUDIO:</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	case VIDIOC_G_AUDIO_OLD:</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_audio *p=arg;</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +458,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 	case VIDIOC_G_AUDOUT:</div><div class='ctx'> 	case VIDIOC_S_AUDOUT:</div><div class='ctx'> 	case VIDIOC_ENUMAUDOUT:</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	case VIDIOC_G_AUDOUT_OLD:</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_audioout *p=arg;</div><div class='ctx'> 		printk ("%s: index=%d, name=%s, capability=%d, mode=%d\n", s,</div><div class='hunk'>@@ -478,9 +488,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 				prt_names(p-&gt;memory,v4l2_memory_names),</div><div class='ctx'> 				p-&gt;m.userptr);</div><div class='ctx'> 		printk ("%s: timecode= %02d:%02d:%02d type=%d, "</div><div class='del'>-			"flags=0x%08x, frames=%d, userbits=0x%p\n",</div><div class='add'>+			"flags=0x%08x, frames=%d, userbits=0x%08x\n",</div><div class='ctx'> 				s,tc-&gt;hours,tc-&gt;minutes,tc-&gt;seconds,</div><div class='del'>-				tc-&gt;type, tc-&gt;flags, tc-&gt;frames, tc-&gt;userbits);</div><div class='add'>+				tc-&gt;type, tc-&gt;flags, tc-&gt;frames, *(__u32 *) tc-&gt;userbits);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_QUERYCAP:</div><div class='hunk'>@@ -495,12 +505,31 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='ctx'> 	case VIDIOC_S_CTRL:</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	case VIDIOC_S_CTRL_OLD:</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_control *p=arg;</div><div class='ctx'> 		printk ("%s: id=%d, value=%d\n", s, p-&gt;id, p-&gt;value);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case VIDIOC_G_EXT_CTRLS:</div><div class='add'>+	case VIDIOC_S_EXT_CTRLS:</div><div class='add'>+	case VIDIOC_TRY_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *p = arg;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		printk("%s: ctrl_class=%d, count=%d\n", s, p-&gt;ctrl_class, p-&gt;count);</div><div class='add'>+		for (i = 0; i &lt; p-&gt;count; i++) {</div><div class='add'>+			struct v4l2_ext_control *c = &amp;p-&gt;controls[i];</div><div class='add'>+			if (cmd == VIDIOC_G_EXT_CTRLS)</div><div class='add'>+				printk("%s: id=%d\n", s, c-&gt;id);</div><div class='add'>+			else</div><div class='add'>+				printk("%s: id=%d, value=%d\n", s, c-&gt;id, c-&gt;value);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case VIDIOC_G_CROP:</div><div class='ctx'> 	case VIDIOC_S_CROP:</div><div class='ctx'> 	{</div><div class='hunk'>@@ -510,7 +539,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_CROPCAP:</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	case VIDIOC_CROPCAP_OLD:</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_cropcap *p=arg;</div><div class='ctx'> 		/*FIXME: Should also show rect structs */</div><div class='hunk'>@@ -667,6 +698,12 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 		printk ("%s: input=0x%x, output=0x%x\n", s, p-&gt;input, p-&gt;output);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case VIDIOC_INT_S_CRYSTAL_FREQ:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crystal_freq *p=arg;</div><div class='add'>+		printk ("%s: freq=%u, flags=0x%x\n", s, p-&gt;freq, p-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	case VIDIOC_G_SLICED_VBI_CAP:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_sliced_vbi_cap *p=arg;</div><div class='hunk'>@@ -696,7 +733,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> 	case VIDIOC_G_PARM:</div><div class='ctx'> 	case VIDIOC_S_PARM:</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	case VIDIOC_S_PARM_OLD:</div><div class='add'>+#endif</div><div class='ctx'> 	{</div><div class='ctx'> 		struct v4l2_streamparm *p=arg;</div><div class='ctx'> 		printk ("%s: type=%d\n", s, p-&gt;type);</div><div class='hunk'>@@ -915,6 +954,498 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+/* Helper functions for control handling			     */</div><div class='add'>+</div><div class='add'>+/* Check for correctness of the ctrl's value based on the data from</div><div class='add'>+   struct v4l2_queryctrl and the available menu items. Note that</div><div class='add'>+   menu_items may be NULL, in that case it is ignored. */</div><div class='add'>+int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,</div><div class='add'>+		const char **menu_items)</div><div class='add'>+{</div><div class='add'>+	if (qctrl-&gt;flags &amp; V4L2_CTRL_FLAG_DISABLED)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (qctrl-&gt;flags &amp; V4L2_CTRL_FLAG_GRABBED)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (qctrl-&gt;type == V4L2_CTRL_TYPE_BUTTON ||</div><div class='add'>+	    qctrl-&gt;type == V4L2_CTRL_TYPE_INTEGER64 ||</div><div class='add'>+	    qctrl-&gt;type == V4L2_CTRL_TYPE_CTRL_CLASS)</div><div class='add'>+		return 0;</div><div class='add'>+	if (ctrl-&gt;value &lt; qctrl-&gt;minimum || ctrl-&gt;value &gt; qctrl-&gt;maximum)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	if (qctrl-&gt;type == V4L2_CTRL_TYPE_MENU &amp;&amp; menu_items != NULL) {</div><div class='add'>+		if (menu_items[ctrl-&gt;value] == NULL ||</div><div class='add'>+		    menu_items[ctrl-&gt;value][0] == '\0')</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns NULL or a character pointer array containing the menu for</div><div class='add'>+   the given control ID. The pointer array ends with a NULL pointer.</div><div class='add'>+   An empty string signifies a menu entry that is invalid. This allows</div><div class='add'>+   drivers to disable certain options if it is not supported. */</div><div class='add'>+const char **v4l2_ctrl_get_menu(u32 id)</div><div class='add'>+{</div><div class='add'>+	static const char *mpeg_audio_sampling_freq[] = {</div><div class='add'>+		"44.1 kHz",</div><div class='add'>+		"48 kHz",</div><div class='add'>+		"32 kHz",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_encoding[] = {</div><div class='add'>+		"Layer I",</div><div class='add'>+		"Layer II",</div><div class='add'>+		"Layer III",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_l1_bitrate[] = {</div><div class='add'>+		"32 kbps",</div><div class='add'>+		"64 kbps",</div><div class='add'>+		"96 kbps",</div><div class='add'>+		"128 kbps",</div><div class='add'>+		"160 kbps",</div><div class='add'>+		"192 kbps",</div><div class='add'>+		"224 kbps",</div><div class='add'>+		"256 kbps",</div><div class='add'>+		"288 kbps",</div><div class='add'>+		"320 kbps",</div><div class='add'>+		"352 kbps",</div><div class='add'>+		"384 kbps",</div><div class='add'>+		"416 kbps",</div><div class='add'>+		"448 kbps",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_l2_bitrate[] = {</div><div class='add'>+		"32 kbps",</div><div class='add'>+		"48 kbps",</div><div class='add'>+		"56 kbps",</div><div class='add'>+		"64 kbps",</div><div class='add'>+		"80 kbps",</div><div class='add'>+		"96 kbps",</div><div class='add'>+		"112 kbps",</div><div class='add'>+		"128 kbps",</div><div class='add'>+		"160 kbps",</div><div class='add'>+		"192 kbps",</div><div class='add'>+		"224 kbps",</div><div class='add'>+		"256 kbps",</div><div class='add'>+		"320 kbps",</div><div class='add'>+		"384 kbps",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_l3_bitrate[] = {</div><div class='add'>+		"32 kbps",</div><div class='add'>+		"40 kbps",</div><div class='add'>+		"48 kbps",</div><div class='add'>+		"56 kbps",</div><div class='add'>+		"64 kbps",</div><div class='add'>+		"80 kbps",</div><div class='add'>+		"96 kbps",</div><div class='add'>+		"112 kbps",</div><div class='add'>+		"128 kbps",</div><div class='add'>+		"160 kbps",</div><div class='add'>+		"192 kbps",</div><div class='add'>+		"224 kbps",</div><div class='add'>+		"256 kbps",</div><div class='add'>+		"320 kbps",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_mode[] = {</div><div class='add'>+		"Stereo",</div><div class='add'>+		"Joint Stereo",</div><div class='add'>+		"Dual",</div><div class='add'>+		"Mono",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_mode_extension[] = {</div><div class='add'>+		"Bound 4",</div><div class='add'>+		"Bound 8",</div><div class='add'>+		"Bound 12",</div><div class='add'>+		"Bound 16",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_emphasis[] = {</div><div class='add'>+		"No Emphasis",</div><div class='add'>+		"50/15 us",</div><div class='add'>+		"CCITT J17",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_audio_crc[] = {</div><div class='add'>+		"No CRC",</div><div class='add'>+		"16-bit CRC",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_video_encoding[] = {</div><div class='add'>+		"MPEG-1",</div><div class='add'>+		"MPEG-2",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_video_aspect[] = {</div><div class='add'>+		"1x1",</div><div class='add'>+		"4x3",</div><div class='add'>+		"16x9",</div><div class='add'>+		"2.21x1",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_video_bitrate_mode[] = {</div><div class='add'>+		"Variable Bitrate",</div><div class='add'>+		"Constant Bitrate",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_stream_type[] = {</div><div class='add'>+		"MPEG-2 Program Stream",</div><div class='add'>+		"MPEG-2 Transport Stream",</div><div class='add'>+		"MPEG-1 System Stream",</div><div class='add'>+		"MPEG-2 DVD-compatible Stream",</div><div class='add'>+		"MPEG-1 VCD-compatible Stream",</div><div class='add'>+		"MPEG-2 SVCD-compatible Stream",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+	static const char *mpeg_stream_vbi_fmt[] = {</div><div class='add'>+		"No VBI",</div><div class='add'>+		"Private packet, IVTV format",</div><div class='add'>+		NULL</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='add'>+			return mpeg_audio_sampling_freq;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+			return mpeg_audio_encoding;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='add'>+			return mpeg_audio_l1_bitrate;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+			return mpeg_audio_l2_bitrate;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='add'>+			return mpeg_audio_l3_bitrate;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='add'>+			return mpeg_audio_mode;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='add'>+			return mpeg_audio_mode_extension;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_EMPHASIS:</div><div class='add'>+			return mpeg_audio_emphasis;</div><div class='add'>+		case V4L2_CID_MPEG_AUDIO_CRC:</div><div class='add'>+			return mpeg_audio_crc;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='add'>+			return mpeg_video_encoding;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='add'>+			return mpeg_video_aspect;</div><div class='add'>+		case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+			return mpeg_video_bitrate_mode;</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+			return mpeg_stream_type;</div><div class='add'>+		case V4L2_CID_MPEG_STREAM_VBI_FMT:</div><div class='add'>+			return mpeg_stream_vbi_fmt;</div><div class='add'>+		default:</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fill in a struct v4l2_queryctrl */</div><div class='add'>+int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)</div><div class='add'>+{</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	qctrl-&gt;flags = 0;</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	/* USER controls */</div><div class='add'>+	case V4L2_CID_USER_CLASS: 	name = "User Controls"; break;</div><div class='add'>+	case V4L2_CID_AUDIO_VOLUME: 	name = "Volume"; break;</div><div class='add'>+	case V4L2_CID_AUDIO_MUTE: 	name = "Mute"; break;</div><div class='add'>+	case V4L2_CID_AUDIO_BALANCE: 	name = "Balance"; break;</div><div class='add'>+	case V4L2_CID_AUDIO_BASS: 	name = "Bass"; break;</div><div class='add'>+	case V4L2_CID_AUDIO_TREBLE: 	name = "Treble"; break;</div><div class='add'>+	case V4L2_CID_AUDIO_LOUDNESS: 	name = "Loudness"; break;</div><div class='add'>+	case V4L2_CID_BRIGHTNESS: 	name = "Brightness"; break;</div><div class='add'>+	case V4L2_CID_CONTRAST: 	name = "Contrast"; break;</div><div class='add'>+	case V4L2_CID_SATURATION: 	name = "Saturation"; break;</div><div class='add'>+	case V4L2_CID_HUE: 		name = "Hue"; break;</div><div class='add'>+</div><div class='add'>+	/* MPEG controls */</div><div class='add'>+	case V4L2_CID_MPEG_CLASS: 		name = "MPEG Encoder Controls"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ: name = "Audio Sampling Frequency"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING: 	name = "Audio Encoding Layer"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L1_BITRATE: 	name = "Audio Layer I Bitrate"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE: 	name = "Audio Layer II Bitrate"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L3_BITRATE: 	name = "Audio Layer III Bitrate"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE: 		name = "Audio Stereo Mode"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION: name = "Audio Stereo Mode Extension"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_EMPHASIS: 	name = "Audio Emphasis"; break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_CRC: 		name = "Audio CRC"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ENCODING: 	name = "Video Encoding"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ASPECT: 	name = "Video Aspect"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_B_FRAMES: 	name = "Video B Frames"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_SIZE: 	name = "Video GOP Size"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE: 	name = "Video GOP Closure"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_PULLDOWN: 	name = "Video Pulldown"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: 	name = "Video Bitrate Mode"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE: 	name = "Video Bitrate"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: 	name = "Video Peak Bitrate"; break;</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION: name = "Video Temporal Decimation"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE: 	name = "Stream Type"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_PMT: 	name = "Stream PMT Program ID"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_AUDIO: 	name = "Stream Audio Program ID"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_VIDEO: 	name = "Stream Video Program ID"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_PCR: 	name = "Stream PCR Program ID"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO: name = "Stream PES Audio ID"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: name = "Stream PES Video ID"; break;</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:	name = "Stream VBI Format"; break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+	case V4L2_CID_AUDIO_LOUDNESS:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_PULLDOWN:</div><div class='add'>+		qctrl-&gt;type = V4L2_CTRL_TYPE_BOOLEAN;</div><div class='add'>+		min = 0;</div><div class='add'>+		max = step = 1;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_EMPHASIS:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_CRC:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:</div><div class='add'>+		qctrl-&gt;type = V4L2_CTRL_TYPE_MENU;</div><div class='add'>+		step = 1;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_USER_CLASS:</div><div class='add'>+	case V4L2_CID_MPEG_CLASS:</div><div class='add'>+		qctrl-&gt;type = V4L2_CTRL_TYPE_CTRL_CLASS;</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_READ_ONLY;</div><div class='add'>+		min = max = step = def = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		qctrl-&gt;type = V4L2_CTRL_TYPE_INTEGER;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_B_FRAMES:</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_UPDATE;</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_CID_AUDIO_VOLUME:</div><div class='add'>+	case V4L2_CID_AUDIO_BALANCE:</div><div class='add'>+	case V4L2_CID_AUDIO_BASS:</div><div class='add'>+	case V4L2_CID_AUDIO_TREBLE:</div><div class='add'>+	case V4L2_CID_BRIGHTNESS:</div><div class='add'>+	case V4L2_CID_CONTRAST:</div><div class='add'>+	case V4L2_CID_SATURATION:</div><div class='add'>+	case V4L2_CID_HUE:</div><div class='add'>+		qctrl-&gt;flags |= V4L2_CTRL_FLAG_SLIDER;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	qctrl-&gt;minimum = min;</div><div class='add'>+	qctrl-&gt;maximum = max;</div><div class='add'>+	qctrl-&gt;step = step;</div><div class='add'>+	qctrl-&gt;default_value = def;</div><div class='add'>+	qctrl-&gt;reserved[0] = qctrl-&gt;reserved[1] = 0;</div><div class='add'>+	snprintf(qctrl-&gt;name, sizeof(qctrl-&gt;name), name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fill in a struct v4l2_queryctrl with standard values based on</div><div class='add'>+   the control ID. */</div><div class='add'>+int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)</div><div class='add'>+{</div><div class='add'>+	switch (qctrl-&gt;id) {</div><div class='add'>+	/* USER controls */</div><div class='add'>+	case V4L2_CID_USER_CLASS:</div><div class='add'>+	case V4L2_CID_MPEG_CLASS:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 0, 0, 0);</div><div class='add'>+	case V4L2_CID_AUDIO_VOLUME:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 65535, 65535 / 100, 58880);</div><div class='add'>+	case V4L2_CID_AUDIO_MUTE:</div><div class='add'>+	case V4L2_CID_AUDIO_LOUDNESS:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 0);</div><div class='add'>+	case V4L2_CID_AUDIO_BALANCE:</div><div class='add'>+	case V4L2_CID_AUDIO_BASS:</div><div class='add'>+	case V4L2_CID_AUDIO_TREBLE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 65535, 65535 / 100, 32768);</div><div class='add'>+	case V4L2_CID_BRIGHTNESS:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 128);</div><div class='add'>+	case V4L2_CID_CONTRAST:</div><div class='add'>+	case V4L2_CID_SATURATION:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 127, 1, 64);</div><div class='add'>+	case V4L2_CID_HUE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, -128, 127, 1, 0);</div><div class='add'>+</div><div class='add'>+	/* MPEG controls */</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100,</div><div class='add'>+				V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_ENCODING:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_LAYER_1,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_LAYER_3, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_ENCODING_LAYER_2);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_L1_BITRATE_32K,</div><div class='add'>+				V4L2_MPEG_AUDIO_L1_BITRATE_448K, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_L1_BITRATE_256K);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_L2_BITRATE_32K,</div><div class='add'>+				V4L2_MPEG_AUDIO_L2_BITRATE_384K, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_L2_BITRATE_224K);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_L3_BITRATE_32K,</div><div class='add'>+				V4L2_MPEG_AUDIO_L3_BITRATE_320K, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_L3_BITRATE_192K);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_MODE_STEREO,</div><div class='add'>+				V4L2_MPEG_AUDIO_MODE_MONO, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_MODE_STEREO);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4,</div><div class='add'>+				V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_EMPHASIS:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_EMPHASIS_NONE,</div><div class='add'>+				V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_EMPHASIS_NONE);</div><div class='add'>+	case V4L2_CID_MPEG_AUDIO_CRC:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_AUDIO_CRC_NONE,</div><div class='add'>+				V4L2_MPEG_AUDIO_CRC_CRC16, 1,</div><div class='add'>+				V4L2_MPEG_AUDIO_CRC_NONE);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ENCODING:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_VIDEO_ENCODING_MPEG_1,</div><div class='add'>+				V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,</div><div class='add'>+				V4L2_MPEG_VIDEO_ENCODING_MPEG_2);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_ASPECT:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_VIDEO_ASPECT_1x1,</div><div class='add'>+				V4L2_MPEG_VIDEO_ASPECT_221x100, 1,</div><div class='add'>+				V4L2_MPEG_VIDEO_ASPECT_4x3);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_B_FRAMES:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 33, 1, 2);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_SIZE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 1, 34, 1, 12);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 1);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_PULLDOWN:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 0);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,</div><div class='add'>+				V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, 1,</div><div class='add'>+				V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 27000000, 1, 6000000);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 27000000, 1, 8000000);</div><div class='add'>+	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_TYPE:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_STREAM_TYPE_MPEG2_PS,</div><div class='add'>+				V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD, 1,</div><div class='add'>+				V4L2_MPEG_STREAM_TYPE_MPEG2_PS);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_PMT:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, (1 &lt;&lt; 14) - 1, 1, 16);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_AUDIO:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, (1 &lt;&lt; 14) - 1, 1, 260);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_VIDEO:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, (1 &lt;&lt; 14) - 1, 1, 256);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PID_PCR:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, (1 &lt;&lt; 14) - 1, 1, 259);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PES_ID_AUDIO:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0);</div><div class='add'>+	case V4L2_CID_MPEG_STREAM_VBI_FMT:</div><div class='add'>+		return v4l2_ctrl_query_fill(qctrl,</div><div class='add'>+				V4L2_MPEG_STREAM_VBI_FMT_NONE,</div><div class='add'>+				V4L2_MPEG_STREAM_VBI_FMT_IVTV, 1,</div><div class='add'>+				V4L2_MPEG_STREAM_VBI_FMT_NONE);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and</div><div class='add'>+   the menu. The qctrl pointer may be NULL, in which case it is ignored. */</div><div class='add'>+int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl,</div><div class='add'>+	       const char **menu_items)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (menu_items == NULL ||</div><div class='add'>+	    (qctrl &amp;&amp; (qmenu-&gt;index &lt; qctrl-&gt;minimum || qmenu-&gt;index &gt; qctrl-&gt;maximum)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; qmenu-&gt;index &amp;&amp; menu_items[i]; i++) ;</div><div class='add'>+	if (menu_items[i] == NULL || menu_items[i][0] == '\0')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	snprintf(qmenu-&gt;name, sizeof(qmenu-&gt;name), menu_items[qmenu-&gt;index]);</div><div class='add'>+	qmenu-&gt;reserved = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ctrl_classes points to an array of u32 pointers, the last element is</div><div class='add'>+   a NULL pointer. Each u32 array is a 0-terminated array of control IDs.</div><div class='add'>+   Each array must be sorted low to high and belong to the same control</div><div class='add'>+   class. The array of u32 pointer must also be sorted, from low class IDs</div><div class='add'>+   to high class IDs.</div><div class='add'>+</div><div class='add'>+   This function returns the first ID that follows after the given ID.</div><div class='add'>+   When no more controls are available 0 is returned. */</div><div class='add'>+u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl_class;</div><div class='add'>+	const u32 *pctrl;</div><div class='add'>+</div><div class='add'>+	/* if no query is desired, then just return the control ID */</div><div class='add'>+	if ((id &amp; V4L2_CTRL_FLAG_NEXT_CTRL) == 0)</div><div class='add'>+		return id;</div><div class='add'>+	if (ctrl_classes == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	id &amp;= V4L2_CTRL_ID_MASK;</div><div class='add'>+	ctrl_class = V4L2_CTRL_ID2CLASS(id);</div><div class='add'>+	id++;	/* select next control */</div><div class='add'>+	/* find first class that matches (or is greater than) the class of</div><div class='add'>+	   the ID */</div><div class='add'>+	while (*ctrl_classes &amp;&amp; V4L2_CTRL_ID2CLASS(**ctrl_classes) &lt; ctrl_class)</div><div class='add'>+		ctrl_classes++;</div><div class='add'>+	/* no more classes */</div><div class='add'>+	if (*ctrl_classes == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	pctrl = *ctrl_classes;</div><div class='add'>+	/* find first ctrl within the class that is &gt;= ID */</div><div class='add'>+	while (*pctrl &amp;&amp; *pctrl &lt; id) pctrl++;</div><div class='add'>+	if (*pctrl)</div><div class='add'>+		return *pctrl;</div><div class='add'>+	/* we are at the end of the controls of the current class. */</div><div class='add'>+	/* continue with next class if available */</div><div class='add'>+	ctrl_classes++;</div><div class='add'>+	if (*ctrl_classes == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	return **ctrl_classes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ----------------------------------------------------------------- */</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(v4l2_video_std_construct);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(v4l2_prio_init);</div><div class='hunk'>@@ -929,6 +1460,13 @@ EXPORT_SYMBOL(v4l2_type_names);</div><div class='ctx'> EXPORT_SYMBOL(v4l_printk_ioctl);</div><div class='ctx'> EXPORT_SYMBOL(v4l_printk_ioctl_arg);</div><div class='ctx'> </div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_next);</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_check);</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_get_menu);</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_query_menu);</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_query_fill);</div><div class='add'>+EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='ctx'>  * c-basic-offset: 8</div><div class='head'>diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c<br/>index caf3e7e2f219..7ee8a53cd336 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/video-buf-dvb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/video-buf-dvb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/video-buf-dvb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/video-buf-dvb.c</a></div><div class='hunk'>@@ -135,14 +135,15 @@ static int videobuf_dvb_stop_feed(struct dvb_demux_feed *feed)</div><div class='ctx'> </div><div class='ctx'> int videobuf_dvb_register(struct videobuf_dvb *dvb,</div><div class='ctx'> 			  struct module *module,</div><div class='del'>-			  void *adapter_priv)</div><div class='add'>+			  void *adapter_priv,</div><div class='add'>+			  struct device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;dvb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* register adapter */</div><div class='del'>-	result = dvb_register_adapter(&amp;dvb-&gt;adapter, dvb-&gt;name, module);</div><div class='add'>+	result = dvb_register_adapter(&amp;dvb-&gt;adapter, dvb-&gt;name, module, device);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n",</div><div class='ctx'> 		       dvb-&gt;name, result);</div><div class='head'>diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/videocodec.c<br/>index 8f271de57fd6..2ae3fb250630 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videocodec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/videocodec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videocodec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/videocodec.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> // kernel config is here (procfs flag)</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/videocodec.h<br/>index 8c233720b6a5..97a3bbeda505 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videocodec.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/videocodec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videocodec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/videocodec.h</a></div><div class='hunk'>@@ -222,14 +222,14 @@ M                       zr36055[1] 0001 0000c001 00000000 (zr36050[1])</div><div class='ctx'> /* ========================= */</div><div class='ctx'> </div><div class='ctx'> struct vfe_polarity {</div><div class='del'>-	int vsync_pol:1;</div><div class='del'>-	int hsync_pol:1;</div><div class='del'>-	int field_pol:1;</div><div class='del'>-	int blank_pol:1;</div><div class='del'>-	int subimg_pol:1;</div><div class='del'>-	int poe_pol:1;</div><div class='del'>-	int pvalid_pol:1;</div><div class='del'>-	int vclk_pol:1;</div><div class='add'>+	unsigned int vsync_pol:1;</div><div class='add'>+	unsigned int hsync_pol:1;</div><div class='add'>+	unsigned int field_pol:1;</div><div class='add'>+	unsigned int blank_pol:1;</div><div class='add'>+	unsigned int subimg_pol:1;</div><div class='add'>+	unsigned int poe_pol:1;</div><div class='add'>+	unsigned int pvalid_pol:1;</div><div class='add'>+	unsigned int vclk_pol:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vfe_settings {</div><div class='head'>diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c<br/>index 5f87dd5f1d0b..b26ebaff226f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/videodev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/videodev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/videodev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/videodev.c</a></div><div class='hunk'>@@ -1,20 +1,31 @@</div><div class='ctx'> /*</div><div class='del'>- * Video capture interface for Linux</div><div class='add'>+ * Video capture interface for Linux version 2</div><div class='ctx'>  *</div><div class='del'>- *		A generic video device interface for the LINUX operating system</div><div class='del'>- *		using a set of device structures/vectors for low level operations.</div><div class='add'>+ *	A generic video device interface for the LINUX operating system</div><div class='add'>+ *	using a set of device structures/vectors for low level operations.</div><div class='ctx'>  *</div><div class='del'>- *		This program is free software; you can redistribute it and/or</div><div class='del'>- *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		as published by the Free Software Foundation; either version</div><div class='del'>- *		2 of the License, or (at your option) any later version.</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License</div><div class='add'>+ *	as published by the Free Software Foundation; either version</div><div class='add'>+ *	2 of the License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='del'>- * Author:	Alan Cox, &lt;alan@redhat.com&gt;</div><div class='add'>+ * Authors:	Alan Cox, &lt;alan@redhat.com&gt; (version 1)</div><div class='add'>+ *              Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt; (version 2)</div><div class='ctx'>  *</div><div class='ctx'>  * Fixes:	20000516  Claudio Matsuoka &lt;claudio@conectiva.com&gt;</div><div class='ctx'>  *		- Added procfs support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define dbgarg(cmd, fmt, arg...) \</div><div class='add'>+		if (vfd-&gt;debug &amp; V4L2_DEBUG_IOCTL_ARG)			\</div><div class='add'>+			printk (KERN_DEBUG "%s: ",  vfd-&gt;name);		\</div><div class='add'>+			v4l_printk_ioctl(cmd);				\</div><div class='add'>+			printk (KERN_DEBUG "%s: " fmt, vfd-&gt;name, ## arg);</div><div class='add'>+</div><div class='add'>+#define dbgarg2(fmt, arg...) \</div><div class='add'>+		if (vfd-&gt;debug &amp; V4L2_DEBUG_IOCTL_ARG)			\</div><div class='add'>+			printk (KERN_DEBUG "%s: " fmt, vfd-&gt;name, ## arg);</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -26,11 +37,16 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='add'>+#define __OLD_VIDIOC_ /* To allow fixing old calls*/</div><div class='add'>+#include &lt;linux/videodev2.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_VIDEO_V4L1</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define VIDEO_NUM_DEVICES	256</div><div class='ctx'> #define VIDEO_NAME              "video4linux"</div><div class='hunk'>@@ -41,7 +57,8 @@</div><div class='ctx'> </div><div class='ctx'> static ssize_t show_name(struct class_device *cd, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vfd = container_of(cd, struct video_device, class_dev);</div><div class='add'>+	struct video_device *vfd = container_of(cd, struct video_device,</div><div class='add'>+								class_dev);</div><div class='ctx'> 	return sprintf(buf,"%.*s\n",(int)sizeof(vfd-&gt;name),vfd-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -62,7 +79,8 @@ void video_device_release(struct video_device *vfd)</div><div class='ctx'> </div><div class='ctx'> static void video_release(struct class_device *cd)</div><div class='ctx'> {</div><div class='del'>-	struct video_device *vfd = container_of(cd, struct video_device, class_dev);</div><div class='add'>+	struct video_device *vfd = container_of(cd, struct video_device,</div><div class='add'>+								class_dev);</div><div class='ctx'> </div><div class='ctx'> #if 1</div><div class='ctx'> 	/* needed until all drivers are fixed */</div><div class='hunk'>@@ -90,7 +108,7 @@ struct video_device* video_devdata(struct file *file)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *	Open a video device.</div><div class='add'>+ *	Open a video device - FIXME: Obsoleted</div><div class='ctx'>  */</div><div class='ctx'> static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -130,6 +148,7 @@ static int video_open(struct inode *inode, struct file *file)</div><div class='ctx'>  * helper function -- handles userspace copying for ioctl arguments</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> static unsigned int</div><div class='ctx'> video_fix_command(unsigned int cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,7 +174,11 @@ video_fix_command(unsigned int cmd)</div><div class='ctx'> 	}</div><div class='ctx'> 	return cmd;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Obsolete usercopy function - Should be removed soon</div><div class='add'>+ */</div><div class='ctx'> int</div><div class='ctx'> video_usercopy(struct inode *inode, struct file *file,</div><div class='ctx'> 	       unsigned int cmd, unsigned long arg,</div><div class='hunk'>@@ -166,8 +189,15 @@ video_usercopy(struct inode *inode, struct file *file,</div><div class='ctx'> 	void    *mbuf = NULL;</div><div class='ctx'> 	void	*parg = NULL;</div><div class='ctx'> 	int	err  = -EINVAL;</div><div class='add'>+	int     is_ext_ctrl;</div><div class='add'>+	size_t  ctrls_size = 0;</div><div class='add'>+	void __user *user_ptr = NULL;</div><div class='ctx'> </div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='ctx'> 	cmd = video_fix_command(cmd);</div><div class='add'>+#endif</div><div class='add'>+	is_ext_ctrl = (cmd == VIDIOC_S_EXT_CTRLS || cmd == VIDIOC_G_EXT_CTRLS ||</div><div class='add'>+		       cmd == VIDIOC_TRY_EXT_CTRLS);</div><div class='ctx'> </div><div class='ctx'> 	/*  Copy arguments into temp kernel buffer  */</div><div class='ctx'> 	switch (_IOC_DIR(cmd)) {</div><div class='hunk'>@@ -193,14 +223,43 @@ video_usercopy(struct inode *inode, struct file *file,</div><div class='ctx'> 				goto out;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	if (is_ext_ctrl) {</div><div class='add'>+		struct v4l2_ext_controls *p = parg;</div><div class='add'>+</div><div class='add'>+		/* In case of an error, tell the caller that it wasn't</div><div class='add'>+		   a specific control that caused it. */</div><div class='add'>+		p-&gt;error_idx = p-&gt;count;</div><div class='add'>+		user_ptr = (void __user *)p-&gt;controls;</div><div class='add'>+		if (p-&gt;count) {</div><div class='add'>+			ctrls_size = sizeof(struct v4l2_ext_control) * p-&gt;count;</div><div class='add'>+			/* Note: v4l2_ext_controls fits in sbuf[] so mbuf is still NULL. */</div><div class='add'>+			mbuf = kmalloc(ctrls_size, GFP_KERNEL);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			if (NULL == mbuf)</div><div class='add'>+				goto out_ext_ctrl;</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			if (copy_from_user(mbuf, user_ptr, ctrls_size))</div><div class='add'>+				goto out_ext_ctrl;</div><div class='add'>+			p-&gt;controls = mbuf;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* call driver */</div><div class='ctx'> 	err = func(inode, file, cmd, parg);</div><div class='ctx'> 	if (err == -ENOIOCTLCMD)</div><div class='ctx'> 		err = -EINVAL;</div><div class='add'>+	if (is_ext_ctrl) {</div><div class='add'>+		struct v4l2_ext_controls *p = parg;</div><div class='add'>+</div><div class='add'>+		p-&gt;controls = (void *)user_ptr;</div><div class='add'>+		if (p-&gt;count &amp;&amp; err == 0 &amp;&amp; copy_to_user(user_ptr, mbuf, ctrls_size))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		goto out_ext_ctrl;</div><div class='add'>+	}</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+out_ext_ctrl:</div><div class='ctx'> 	/*  Copy results into user buffer  */</div><div class='ctx'> 	switch (_IOC_DIR(cmd))</div><div class='ctx'> 	{</div><div class='hunk'>@@ -218,6 +277,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * open/release helper functions -- handle exclusive opens</div><div class='add'>+ * Should be removed soon</div><div class='ctx'>  */</div><div class='ctx'> int video_exclusive_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -242,6 +302,1184 @@ int video_exclusive_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static char *v4l2_memory_names[] = {</div><div class='add'>+	[V4L2_MEMORY_MMAP]    = "mmap",</div><div class='add'>+	[V4L2_MEMORY_USERPTR] = "userptr",</div><div class='add'>+	[V4L2_MEMORY_OVERLAY] = "overlay",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* FIXME: Those stuff are replicated also on v4l2-common.c */</div><div class='add'>+static char *v4l2_type_names_FIXME[] = {</div><div class='add'>+	[V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "video-cap",</div><div class='add'>+	[V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "video-over",</div><div class='add'>+	[V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "video-out",</div><div class='add'>+	[V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",</div><div class='add'>+	[V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",</div><div class='add'>+	[V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "sliced-vbi-out",</div><div class='add'>+	[V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-capture",</div><div class='add'>+	[V4L2_BUF_TYPE_PRIVATE]            = "private",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *v4l2_field_names_FIXME[] = {</div><div class='add'>+	[V4L2_FIELD_ANY]        = "any",</div><div class='add'>+	[V4L2_FIELD_NONE]       = "none",</div><div class='add'>+	[V4L2_FIELD_TOP]        = "top",</div><div class='add'>+	[V4L2_FIELD_BOTTOM]     = "bottom",</div><div class='add'>+	[V4L2_FIELD_INTERLACED] = "interlaced",</div><div class='add'>+	[V4L2_FIELD_SEQ_TB]     = "seq-tb",</div><div class='add'>+	[V4L2_FIELD_SEQ_BT]     = "seq-bt",</div><div class='add'>+	[V4L2_FIELD_ALTERNATE]  = "alternate",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define prt_names(a,arr) (((a)&gt;=0)&amp;&amp;((a)&lt;ARRAY_SIZE(arr)))?arr[a]:"unknown"</div><div class='add'>+</div><div class='add'>+static void dbgbuf(unsigned int cmd, struct video_device *vfd,</div><div class='add'>+					struct v4l2_buffer *p)</div><div class='add'>+{</div><div class='add'>+	struct v4l2_timecode *tc=&amp;p-&gt;timecode;</div><div class='add'>+</div><div class='add'>+	dbgarg (cmd, "%02ld:%02d:%02d.%08ld index=%d, type=%s, "</div><div class='add'>+		"bytesused=%d, flags=0x%08d, "</div><div class='add'>+		"field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx\n",</div><div class='add'>+			(p-&gt;timestamp.tv_sec/3600),</div><div class='add'>+			(int)(p-&gt;timestamp.tv_sec/60)%60,</div><div class='add'>+			(int)(p-&gt;timestamp.tv_sec%60),</div><div class='add'>+			p-&gt;timestamp.tv_usec,</div><div class='add'>+			p-&gt;index,</div><div class='add'>+			prt_names(p-&gt;type,v4l2_type_names_FIXME),</div><div class='add'>+			p-&gt;bytesused,p-&gt;flags,</div><div class='add'>+			p-&gt;field,p-&gt;sequence,</div><div class='add'>+			prt_names(p-&gt;memory,v4l2_memory_names),</div><div class='add'>+			p-&gt;m.userptr);</div><div class='add'>+	dbgarg2 ("timecode= %02d:%02d:%02d type=%d, "</div><div class='add'>+		"flags=0x%08d, frames=%d, userbits=0x%08x\n",</div><div class='add'>+			tc-&gt;hours,tc-&gt;minutes,tc-&gt;seconds,</div><div class='add'>+			tc-&gt;type, tc-&gt;flags, tc-&gt;frames, *(__u32 *) tc-&gt;userbits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void dbgrect(struct video_device *vfd, char *s,</div><div class='add'>+							struct v4l2_rect *r)</div><div class='add'>+{</div><div class='add'>+	dbgarg2 ("%sRect start at %dx%d, size= %dx%d\n", s, r-&gt;left, r-&gt;top,</div><div class='add'>+						r-&gt;width, r-&gt;height);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void v4l_print_pix_fmt (struct video_device *vfd,</div><div class='add'>+						struct v4l2_pix_format *fmt)</div><div class='add'>+{</div><div class='add'>+	dbgarg2 ("width=%d, height=%d, format=0x%08x, field=%s, "</div><div class='add'>+		"bytesperline=%d sizeimage=%d, colorspace=%d\n",</div><div class='add'>+		fmt-&gt;width,fmt-&gt;height,fmt-&gt;pixelformat,</div><div class='add'>+		prt_names(fmt-&gt;field,v4l2_field_names_FIXME),</div><div class='add'>+		fmt-&gt;bytesperline,fmt-&gt;sizeimage,fmt-&gt;colorspace);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int check_fmt (struct video_device *vfd, enum v4l2_buf_type type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_cap)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_VIDEO_OVERLAY:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_overlay)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_vbi)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_vbi_output)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_vbi_capture)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_video_output)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_VBI_OUTPUT:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_vbi_output)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	case V4L2_BUF_TYPE_PRIVATE:</div><div class='add'>+		if (vfd-&gt;vidioc_try_fmt_type_private)</div><div class='add'>+			return (0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return (-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __video_do_ioctl(struct inode *inode, struct file *file,</div><div class='add'>+		unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct video_device *vfd = video_devdata(file);</div><div class='add'>+	void                 *fh = file-&gt;private_data;</div><div class='add'>+	int                  ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ( (vfd-&gt;debug &amp; V4L2_DEBUG_IOCTL) &amp;&amp;</div><div class='add'>+				!(vfd-&gt;debug | V4L2_DEBUG_IOCTL_ARG)) {</div><div class='add'>+		v4l_print_ioctl(vfd-&gt;name, cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch(cmd) {</div><div class='add'>+	/* --- capabilities ------------------------------------------ */</div><div class='add'>+	case VIDIOC_QUERYCAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_capability *cap = (struct v4l2_capability*)arg;</div><div class='add'>+		memset(cap, 0, sizeof(*cap));</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_querycap)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_querycap(file, fh, cap);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "driver=%s, card=%s, bus=%s, "</div><div class='add'>+					"version=0x%08x, "</div><div class='add'>+					"capabilities=0x%08x\n",</div><div class='add'>+					cap-&gt;driver,cap-&gt;card,cap-&gt;bus_info,</div><div class='add'>+					cap-&gt;version,</div><div class='add'>+					cap-&gt;capabilities);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* --- priority ------------------------------------------ */</div><div class='add'>+	case VIDIOC_G_PRIORITY:</div><div class='add'>+	{</div><div class='add'>+		enum v4l2_priority *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_g_priority)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_priority(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg(cmd, "priority is %d\n", *p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_PRIORITY:</div><div class='add'>+	{</div><div class='add'>+		enum v4l2_priority *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_s_priority)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "setting priority to %d\n", *p);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_priority(file, fh, *p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* --- capture ioctls ---------------------------------------- */</div><div class='add'>+	case VIDIOC_ENUM_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_fmtdesc *f = arg;</div><div class='add'>+		enum v4l2_buf_type type;</div><div class='add'>+		unsigned int index;</div><div class='add'>+</div><div class='add'>+		index = f-&gt;index;</div><div class='add'>+		type  = f-&gt;type;</div><div class='add'>+		memset(f,0,sizeof(*f));</div><div class='add'>+		f-&gt;index = index;</div><div class='add'>+		f-&gt;type  = type;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_cap)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_cap(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OVERLAY:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_overlay)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_overlay(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_vbi)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_vbi(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_vbi_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_vbi_capture)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_vbi_capture(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_video_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_video_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_vbi_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_PRIVATE:</div><div class='add'>+			if (vfd-&gt;vidioc_enum_fmt_type_private)</div><div class='add'>+				ret=vfd-&gt;vidioc_enum_fmt_type_private(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "index=%d, type=%d, flags=%d, "</div><div class='add'>+					"description=%s,"</div><div class='add'>+					" pixelformat=0x%8x\n",</div><div class='add'>+					f-&gt;index, f-&gt;type, f-&gt;flags,</div><div class='add'>+					f-&gt;description,</div><div class='add'>+					f-&gt;pixelformat);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *f = (struct v4l2_format *)arg;</div><div class='add'>+		enum v4l2_buf_type type=f-&gt;type;</div><div class='add'>+</div><div class='add'>+		memset(&amp;f-&gt;fmt.pix,0,sizeof(f-&gt;fmt.pix));</div><div class='add'>+		f-&gt;type=type;</div><div class='add'>+</div><div class='add'>+		/* FIXME: Should be one dump per type */</div><div class='add'>+		dbgarg (cmd, "type=%s\n", prt_names(type,</div><div class='add'>+					v4l2_type_names_FIXME));</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_cap)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_cap(file, fh, f);</div><div class='add'>+			if (!ret)</div><div class='add'>+				v4l_print_pix_fmt(vfd,&amp;f-&gt;fmt.pix);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OVERLAY:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_overlay)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_overlay(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_vbi)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_vbi(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_vbi_output(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_vbi_capture)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_vbi_capture(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_video_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_video_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_vbi_output(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_PRIVATE:</div><div class='add'>+			if (vfd-&gt;vidioc_g_fmt_type_private)</div><div class='add'>+				ret=vfd-&gt;vidioc_g_fmt_type_private(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *f = (struct v4l2_format *)arg;</div><div class='add'>+</div><div class='add'>+		/* FIXME: Should be one dump per type */</div><div class='add'>+		dbgarg (cmd, "type=%s\n", prt_names(f-&gt;type,</div><div class='add'>+					v4l2_type_names_FIXME));</div><div class='add'>+</div><div class='add'>+		switch (f-&gt;type) {</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+			v4l_print_pix_fmt(vfd,&amp;f-&gt;fmt.pix);</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_cap)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_cap(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OVERLAY:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_overlay)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_overlay(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_vbi)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_vbi(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_vbi_output(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_vbi_capture)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_vbi_capture(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_video_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_video_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_vbi_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_PRIVATE:</div><div class='add'>+			if (vfd-&gt;vidioc_s_fmt_type_private)</div><div class='add'>+				ret=vfd-&gt;vidioc_s_fmt_type_private(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_TRY_FMT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_format *f = (struct v4l2_format *)arg;</div><div class='add'>+</div><div class='add'>+		/* FIXME: Should be one dump per type */</div><div class='add'>+		dbgarg (cmd, "type=%s\n", prt_names(f-&gt;type,</div><div class='add'>+						v4l2_type_names_FIXME));</div><div class='add'>+		switch (f-&gt;type) {</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_cap)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_cap(file, fh, f);</div><div class='add'>+			if (!ret)</div><div class='add'>+				v4l_print_pix_fmt(vfd,&amp;f-&gt;fmt.pix);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OVERLAY:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_overlay)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_overlay(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_vbi)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_vbi(file, fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_vbi_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_vbi_capture)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_vbi_capture(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VIDEO_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_video_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_video_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_VBI_OUTPUT:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_vbi_output)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_vbi_output(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		case V4L2_BUF_TYPE_PRIVATE:</div><div class='add'>+			if (vfd-&gt;vidioc_try_fmt_type_private)</div><div class='add'>+				ret=vfd-&gt;vidioc_try_fmt_type_private(file,</div><div class='add'>+								fh, f);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* FIXME: Those buf reqs could be handled here,</div><div class='add'>+	   with some changes on videobuf to allow its header to be included at</div><div class='add'>+	   videodev2.h or being merged at videodev2.</div><div class='add'>+	 */</div><div class='add'>+	case VIDIOC_REQBUFS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_requestbuffers *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_reqbufs)</div><div class='add'>+			break;</div><div class='add'>+		ret = check_fmt (vfd, p-&gt;type);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_reqbufs(file, fh, p);</div><div class='add'>+		dbgarg (cmd, "count=%d, type=%s, memory=%s\n",</div><div class='add'>+				p-&gt;count,</div><div class='add'>+				prt_names(p-&gt;type,v4l2_type_names_FIXME),</div><div class='add'>+				prt_names(p-&gt;memory,v4l2_memory_names));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_buffer *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_querybuf)</div><div class='add'>+			break;</div><div class='add'>+		ret = check_fmt (vfd, p-&gt;type);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_querybuf(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgbuf(cmd,vfd,p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_buffer *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_qbuf)</div><div class='add'>+			break;</div><div class='add'>+		ret = check_fmt (vfd, p-&gt;type);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_qbuf(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgbuf(cmd,vfd,p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_DQBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_buffer *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_qbuf)</div><div class='add'>+			break;</div><div class='add'>+		ret = check_fmt (vfd, p-&gt;type);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_qbuf(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgbuf(cmd,vfd,p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_OVERLAY:</div><div class='add'>+	{</div><div class='add'>+		int *i = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_overlay)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "value=%d\n",*i);</div><div class='add'>+		ret=vfd-&gt;vidioc_overlay(file, fh, *i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#ifdef HAVE_V4L1</div><div class='add'>+	/* --- streaming capture ------------------------------------- */</div><div class='add'>+	case VIDIOCGMBUF:</div><div class='add'>+	{</div><div class='add'>+		struct video_mbuf *p=arg;</div><div class='add'>+</div><div class='add'>+		memset(p,0,sizeof(p));</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidiocgmbuf)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidiocgmbuf(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "size=%d, frames=%d, offsets=0x%08lx\n",</div><div class='add'>+						p-&gt;size, p-&gt;frames,</div><div class='add'>+						(unsigned long)p-&gt;offsets);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	case VIDIOC_G_FBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_framebuffer *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_fbuf)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_fbuf(file, fh, arg);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			dbgarg (cmd, "capability=%d, flags=%d, base=0x%08lx\n",</div><div class='add'>+					p-&gt;capability,p-&gt;flags,</div><div class='add'>+					(unsigned long)p-&gt;base);</div><div class='add'>+			v4l_print_pix_fmt (vfd, &amp;p-&gt;fmt);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FBUF:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_framebuffer *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_s_fbuf)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		dbgarg (cmd, "capability=%d, flags=%d, base=0x%08lx\n",</div><div class='add'>+				p-&gt;capability,p-&gt;flags,(unsigned long)p-&gt;base);</div><div class='add'>+		v4l_print_pix_fmt (vfd, &amp;p-&gt;fmt);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_fbuf(file, fh, arg);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_STREAMON:</div><div class='add'>+	{</div><div class='add'>+		enum v4l2_buf_type i = *(int *)arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_streamon)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "type=%s\n", prt_names(i,v4l2_type_names_FIXME));</div><div class='add'>+		ret=vfd-&gt;vidioc_streamon(file, fh,i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_STREAMOFF:</div><div class='add'>+	{</div><div class='add'>+		enum v4l2_buf_type i = *(int *)arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_streamoff)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "type=%s\n", prt_names(i,v4l2_type_names_FIXME));</div><div class='add'>+		ret=vfd-&gt;vidioc_streamoff(file, fh, i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* ---------- tv norms ---------- */</div><div class='add'>+	case VIDIOC_ENUMSTD:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_standard *p = arg;</div><div class='add'>+		unsigned int index = p-&gt;index;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;tvnormsize) {</div><div class='add'>+			printk (KERN_WARNING "%s: no TV norms defined!\n",</div><div class='add'>+						vfd-&gt;name);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (index&lt;=0 || index &gt;= vfd-&gt;tvnormsize) {</div><div class='add'>+			ret=-EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		v4l2_video_std_construct(p, vfd-&gt;tvnorms[p-&gt;index].id,</div><div class='add'>+					 vfd-&gt;tvnorms[p-&gt;index].name);</div><div class='add'>+		p-&gt;index = index;</div><div class='add'>+</div><div class='add'>+		dbgarg (cmd, "index=%d, id=%Ld, name=%s, fps=%d/%d, "</div><div class='add'>+				"framelines=%d\n", p-&gt;index,</div><div class='add'>+				(unsigned long long)p-&gt;id, p-&gt;name,</div><div class='add'>+				p-&gt;frameperiod.numerator,</div><div class='add'>+				p-&gt;frameperiod.denominator,</div><div class='add'>+				p-&gt;framelines);</div><div class='add'>+</div><div class='add'>+		ret=0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *id = arg;</div><div class='add'>+</div><div class='add'>+		*id = vfd-&gt;current_norm;</div><div class='add'>+</div><div class='add'>+		dbgarg (cmd, "value=%Lu\n", (long long unsigned) *id);</div><div class='add'>+</div><div class='add'>+		ret=0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_STD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *id = arg;</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;tvnormsize) {</div><div class='add'>+			printk (KERN_WARNING "%s: no TV norms defined!\n",</div><div class='add'>+						vfd-&gt;name);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dbgarg (cmd, "value=%Lu\n", (long long unsigned) *id);</div><div class='add'>+</div><div class='add'>+		/* First search for exact match */</div><div class='add'>+		for (i = 0; i &lt; vfd-&gt;tvnormsize; i++)</div><div class='add'>+			if (*id == vfd-&gt;tvnorms[i].id)</div><div class='add'>+				break;</div><div class='add'>+		/* Then for a generic video std that contains desired std */</div><div class='add'>+		if (i == vfd-&gt;tvnormsize)</div><div class='add'>+			for (i = 0; i &lt; vfd-&gt;tvnormsize; i++)</div><div class='add'>+				if (*id &amp; vfd-&gt;tvnorms[i].id)</div><div class='add'>+					break;</div><div class='add'>+		if (i == vfd-&gt;tvnormsize) {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Calls the specific handler */</div><div class='add'>+		if (vfd-&gt;vidioc_s_std)</div><div class='add'>+			ret=vfd-&gt;vidioc_s_std(file, fh, i);</div><div class='add'>+		else</div><div class='add'>+			ret=-EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Updates standard information */</div><div class='add'>+		if (!ret)</div><div class='add'>+			vfd-&gt;current_norm=*id;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYSTD:</div><div class='add'>+	{</div><div class='add'>+		v4l2_std_id *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_querystd)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_querystd(file, fh, arg);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "detected std=%Lu\n",</div><div class='add'>+						(unsigned long long)*p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* ------ input switching ---------- */</div><div class='add'>+	/* FIXME: Inputs can be handled inside videodev2 */</div><div class='add'>+	case VIDIOC_ENUMINPUT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_input *p=arg;</div><div class='add'>+		int i=p-&gt;index;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_enum_input)</div><div class='add'>+			break;</div><div class='add'>+		memset(p, 0, sizeof(*p));</div><div class='add'>+		p-&gt;index=i;</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_enum_input(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "index=%d, name=%s, type=%d, "</div><div class='add'>+					"audioset=%d, "</div><div class='add'>+					"tuner=%d, std=%Ld, status=%d\n",</div><div class='add'>+					p-&gt;index,p-&gt;name,p-&gt;type,p-&gt;audioset,</div><div class='add'>+					p-&gt;tuner,</div><div class='add'>+					(unsigned long long)p-&gt;std,</div><div class='add'>+					p-&gt;status);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_INPUT:</div><div class='add'>+	{</div><div class='add'>+		unsigned int *i = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_g_input)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_input(file, fh, i);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "value=%d\n",*i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_INPUT:</div><div class='add'>+	{</div><div class='add'>+		unsigned int *i = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_s_input)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "value=%d\n",*i);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_input(file, fh, *i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ------ output switching ---------- */</div><div class='add'>+	case VIDIOC_G_OUTPUT:</div><div class='add'>+	{</div><div class='add'>+		unsigned int *i = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_g_output)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_output(file, fh, i);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "value=%d\n",*i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_OUTPUT:</div><div class='add'>+	{</div><div class='add'>+		unsigned int *i = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_s_output)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "value=%d\n",*i);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_output(file, fh, *i);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* --- controls ---------------------------------------------- */</div><div class='add'>+	case VIDIOC_QUERYCTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_queryctrl *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_queryctrl)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_queryctrl(file, fh, p);</div><div class='add'>+</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "id=%d, type=%d, name=%s, "</div><div class='add'>+					"min/max=%d/%d,"</div><div class='add'>+					" step=%d, default=%d, flags=0x%08x\n",</div><div class='add'>+					p-&gt;id,p-&gt;type,p-&gt;name,p-&gt;minimum,</div><div class='add'>+					p-&gt;maximum,p-&gt;step,p-&gt;default_value,</div><div class='add'>+					p-&gt;flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *p = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_g_ctrl)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "Enum for index=%d\n", p-&gt;id);</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_g_ctrl(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg2 ( "id=%d, value=%d\n", p-&gt;id, p-&gt;value);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CTRL:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_control *p = arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_s_ctrl)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "id=%d, value=%d\n", p-&gt;id, p-&gt;value);</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_s_ctrl(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *p = arg;</div><div class='add'>+</div><div class='add'>+		if (vfd-&gt;vidioc_g_ext_ctrls) {</div><div class='add'>+			dbgarg(cmd, "count=%d\n", p-&gt;count);</div><div class='add'>+</div><div class='add'>+			ret=vfd-&gt;vidioc_g_ext_ctrls(file, fh, p);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *p = arg;</div><div class='add'>+</div><div class='add'>+		if (vfd-&gt;vidioc_s_ext_ctrls) {</div><div class='add'>+			dbgarg(cmd, "count=%d\n", p-&gt;count);</div><div class='add'>+</div><div class='add'>+			ret=vfd-&gt;vidioc_s_ext_ctrls(file, fh, p);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_TRY_EXT_CTRLS:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_ext_controls *p = arg;</div><div class='add'>+</div><div class='add'>+		if (vfd-&gt;vidioc_try_ext_ctrls) {</div><div class='add'>+			dbgarg(cmd, "count=%d\n", p-&gt;count);</div><div class='add'>+</div><div class='add'>+			ret=vfd-&gt;vidioc_try_ext_ctrls(file, fh, p);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_QUERYMENU:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_querymenu *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_querymenu)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_querymenu(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "id=%d, index=%d, name=%s\n",</div><div class='add'>+						p-&gt;id,p-&gt;index,p-&gt;name);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* --- audio ---------------------------------------------- */</div><div class='add'>+	case VIDIOC_ENUMAUDIO:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_audio *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_enumaudio)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "Enum for index=%d\n", p-&gt;index);</div><div class='add'>+		ret=vfd-&gt;vidioc_enumaudio(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg2("index=%d, name=%s, capability=%d, "</div><div class='add'>+					"mode=%d\n",p-&gt;index,p-&gt;name,</div><div class='add'>+					p-&gt;capability, p-&gt;mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_AUDIO:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_audio *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_g_audio)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "Get for index=%d\n", p-&gt;index);</div><div class='add'>+		ret=vfd-&gt;vidioc_g_audio(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg2("index=%d, name=%s, capability=%d, "</div><div class='add'>+					"mode=%d\n",p-&gt;index,</div><div class='add'>+					p-&gt;name,p-&gt;capability, p-&gt;mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_AUDIO:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_audio *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_s_audio)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "index=%d, name=%s, capability=%d, "</div><div class='add'>+					"mode=%d\n", p-&gt;index, p-&gt;name,</div><div class='add'>+					p-&gt;capability, p-&gt;mode);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_audio(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_ENUMAUDOUT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_audioout *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_enumaudout)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "Enum for index=%d\n", p-&gt;index);</div><div class='add'>+		ret=vfd-&gt;vidioc_enumaudout(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg2("index=%d, name=%s, capability=%d, "</div><div class='add'>+					"mode=%d\n", p-&gt;index, p-&gt;name,</div><div class='add'>+					p-&gt;capability,p-&gt;mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_AUDOUT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_audioout *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_g_audout)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "Enum for index=%d\n", p-&gt;index);</div><div class='add'>+		ret=vfd-&gt;vidioc_g_audout(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg2("index=%d, name=%s, capability=%d, "</div><div class='add'>+					"mode=%d\n", p-&gt;index, p-&gt;name,</div><div class='add'>+					p-&gt;capability,p-&gt;mode);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_AUDOUT:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_audioout *p=arg;</div><div class='add'>+</div><div class='add'>+		if (!vfd-&gt;vidioc_s_audout)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "index=%d, name=%s, capability=%d, "</div><div class='add'>+					"mode=%d\n", p-&gt;index, p-&gt;name,</div><div class='add'>+					p-&gt;capability,p-&gt;mode);</div><div class='add'>+</div><div class='add'>+		ret=vfd-&gt;vidioc_s_audout(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_MODULATOR:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_modulator *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_modulator)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_modulator(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg(cmd, "index=%d, name=%s, "</div><div class='add'>+					"capability=%d, rangelow=%d,"</div><div class='add'>+					" rangehigh=%d, txsubchans=%d\n",</div><div class='add'>+					p-&gt;index, p-&gt;name,p-&gt;capability,</div><div class='add'>+					p-&gt;rangelow, p-&gt;rangehigh,</div><div class='add'>+					p-&gt;txsubchans);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_MODULATOR:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_modulator *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_s_modulator)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "index=%d, name=%s, capability=%d, "</div><div class='add'>+				"rangelow=%d, rangehigh=%d, txsubchans=%d\n",</div><div class='add'>+				p-&gt;index, p-&gt;name,p-&gt;capability,p-&gt;rangelow,</div><div class='add'>+				p-&gt;rangehigh,p-&gt;txsubchans);</div><div class='add'>+			ret=vfd-&gt;vidioc_s_modulator(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_CROP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crop *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_crop)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_crop(file, fh, p);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			dbgarg(cmd, "type=%d\n", p-&gt;type);</div><div class='add'>+			dbgrect(vfd, "", &amp;p-&gt;c);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_CROP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_crop *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_s_crop)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "type=%d\n", p-&gt;type);</div><div class='add'>+		dbgrect(vfd, "", &amp;p-&gt;c);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_crop(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_CROPCAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_cropcap *p=arg;</div><div class='add'>+		/*FIXME: Should also show v4l2_fract pixelaspect */</div><div class='add'>+		if (!vfd-&gt;vidioc_cropcap)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg(cmd, "type=%d\n", p-&gt;type);</div><div class='add'>+		dbgrect(vfd, "bounds ", &amp;p-&gt;bounds);</div><div class='add'>+		dbgrect(vfd, "defrect ", &amp;p-&gt;defrect);</div><div class='add'>+		ret=vfd-&gt;vidioc_cropcap(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_MPEGCOMP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_mpeg_compression *p=arg;</div><div class='add'>+</div><div class='add'>+		/*FIXME: Several fields not shown */</div><div class='add'>+		if (!vfd-&gt;vidioc_g_mpegcomp)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_mpegcomp(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "ts_pid_pmt=%d, ts_pid_audio=%d,"</div><div class='add'>+					" ts_pid_video=%d, ts_pid_pcr=%d, "</div><div class='add'>+					"ps_size=%d, au_sample_rate=%d, "</div><div class='add'>+					"au_pesid=%c, vi_frame_rate=%d, "</div><div class='add'>+					"vi_frames_per_gop=%d, "</div><div class='add'>+					"vi_bframes_count=%d, vi_pesid=%c\n",</div><div class='add'>+					p-&gt;ts_pid_pmt,p-&gt;ts_pid_audio,</div><div class='add'>+					p-&gt;ts_pid_video,p-&gt;ts_pid_pcr,</div><div class='add'>+					p-&gt;ps_size, p-&gt;au_sample_rate,</div><div class='add'>+					p-&gt;au_pesid, p-&gt;vi_frame_rate,</div><div class='add'>+					p-&gt;vi_frames_per_gop,</div><div class='add'>+					p-&gt;vi_bframes_count, p-&gt;vi_pesid);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_MPEGCOMP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_mpeg_compression *p=arg;</div><div class='add'>+		/*FIXME: Several fields not shown */</div><div class='add'>+		if (!vfd-&gt;vidioc_s_mpegcomp)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "ts_pid_pmt=%d, ts_pid_audio=%d, "</div><div class='add'>+				"ts_pid_video=%d, ts_pid_pcr=%d, ps_size=%d, "</div><div class='add'>+				"au_sample_rate=%d, au_pesid=%c, "</div><div class='add'>+				"vi_frame_rate=%d, vi_frames_per_gop=%d, "</div><div class='add'>+				"vi_bframes_count=%d, vi_pesid=%c\n",</div><div class='add'>+				p-&gt;ts_pid_pmt,p-&gt;ts_pid_audio, p-&gt;ts_pid_video,</div><div class='add'>+				p-&gt;ts_pid_pcr, p-&gt;ps_size, p-&gt;au_sample_rate,</div><div class='add'>+				p-&gt;au_pesid, p-&gt;vi_frame_rate,</div><div class='add'>+				p-&gt;vi_frames_per_gop, p-&gt;vi_bframes_count,</div><div class='add'>+				p-&gt;vi_pesid);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_mpegcomp(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_JPEGCOMP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_jpegcompression *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_jpegcomp)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_jpegcomp(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "quality=%d, APPn=%d, "</div><div class='add'>+						"APP_len=%d, COM_len=%d, "</div><div class='add'>+						"jpeg_markers=%d\n",</div><div class='add'>+						p-&gt;quality,p-&gt;APPn,p-&gt;APP_len,</div><div class='add'>+						p-&gt;COM_len,p-&gt;jpeg_markers);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_JPEGCOMP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_jpegcompression *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_jpegcomp)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "quality=%d, APPn=%d, APP_len=%d, "</div><div class='add'>+					"COM_len=%d, jpeg_markers=%d\n",</div><div class='add'>+					p-&gt;quality,p-&gt;APPn,p-&gt;APP_len,</div><div class='add'>+					p-&gt;COM_len,p-&gt;jpeg_markers);</div><div class='add'>+			ret=vfd-&gt;vidioc_s_jpegcomp(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_PARM:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_streamparm *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_parm)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_parm(file, fh, p);</div><div class='add'>+		dbgarg (cmd, "type=%d\n", p-&gt;type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_PARM:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_streamparm *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_s_parm)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "type=%d\n", p-&gt;type);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_parm(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_tuner)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_tuner(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "index=%d, name=%s, type=%d, "</div><div class='add'>+					"capability=%d, rangelow=%d, "</div><div class='add'>+					"rangehigh=%d, signal=%d, afc=%d, "</div><div class='add'>+					"rxsubchans=%d, audmode=%d\n",</div><div class='add'>+					p-&gt;index, p-&gt;name, p-&gt;type,</div><div class='add'>+					p-&gt;capability, p-&gt;rangelow,</div><div class='add'>+					p-&gt;rangehigh, p-&gt;rxsubchans,</div><div class='add'>+					p-&gt;audmode, p-&gt;signal, p-&gt;afc);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_TUNER:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_tuner *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_s_tuner)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "index=%d, name=%s, type=%d, "</div><div class='add'>+				"capability=%d, rangelow=%d, rangehigh=%d, "</div><div class='add'>+				"signal=%d, afc=%d, rxsubchans=%d, "</div><div class='add'>+				"audmode=%d\n",p-&gt;index, p-&gt;name, p-&gt;type,</div><div class='add'>+				p-&gt;capability, p-&gt;rangelow,p-&gt;rangehigh,</div><div class='add'>+				p-&gt;rxsubchans, p-&gt;audmode, p-&gt;signal,</div><div class='add'>+				p-&gt;afc);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_tuner(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_frequency *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_frequency)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_frequency(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "tuner=%d, type=%d, frequency=%d\n",</div><div class='add'>+						p-&gt;tuner,p-&gt;type,p-&gt;frequency);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_S_FREQUENCY:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_frequency *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_s_frequency)</div><div class='add'>+			break;</div><div class='add'>+		dbgarg (cmd, "tuner=%d, type=%d, frequency=%d\n",</div><div class='add'>+				p-&gt;tuner,p-&gt;type,p-&gt;frequency);</div><div class='add'>+		ret=vfd-&gt;vidioc_s_frequency(file, fh, p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_G_SLICED_VBI_CAP:</div><div class='add'>+	{</div><div class='add'>+		struct v4l2_sliced_vbi_cap *p=arg;</div><div class='add'>+		if (!vfd-&gt;vidioc_g_sliced_vbi_cap)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_g_sliced_vbi_cap(file, fh, p);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dbgarg (cmd, "service_set=%d\n", p-&gt;service_set);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VIDIOC_LOG_STATUS:</div><div class='add'>+	{</div><div class='add'>+		if (!vfd-&gt;vidioc_log_status)</div><div class='add'>+			break;</div><div class='add'>+		ret=vfd-&gt;vidioc_log_status(file, fh);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* --- Others --------------------------------------------- */</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret=v4l_compat_translate_ioctl(inode,file,cmd,arg,__video_do_ioctl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vfd-&gt;debug &amp; V4L2_DEBUG_IOCTL_ARG) {</div><div class='add'>+		if (ret&lt;0) {</div><div class='add'>+			printk ("%s: err:\n", vfd-&gt;name);</div><div class='add'>+			v4l_print_ioctl(vfd-&gt;name, cmd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int video_ioctl2 (struct inode *inode, struct file *file,</div><div class='add'>+	       unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	char	sbuf[128];</div><div class='add'>+	void    *mbuf = NULL;</div><div class='add'>+	void	*parg = NULL;</div><div class='add'>+	int	err  = -EINVAL;</div><div class='add'>+	int     is_ext_ctrl;</div><div class='add'>+	size_t  ctrls_size = 0;</div><div class='add'>+	void __user *user_ptr = NULL;</div><div class='add'>+</div><div class='add'>+#ifdef __OLD_VIDIOC_</div><div class='add'>+	cmd = video_fix_command(cmd);</div><div class='add'>+#endif</div><div class='add'>+	is_ext_ctrl = (cmd == VIDIOC_S_EXT_CTRLS || cmd == VIDIOC_G_EXT_CTRLS ||</div><div class='add'>+		       cmd == VIDIOC_TRY_EXT_CTRLS);</div><div class='add'>+</div><div class='add'>+	/*  Copy arguments into temp kernel buffer  */</div><div class='add'>+	switch (_IOC_DIR(cmd)) {</div><div class='add'>+	case _IOC_NONE:</div><div class='add'>+		parg = NULL;</div><div class='add'>+		break;</div><div class='add'>+	case _IOC_READ:</div><div class='add'>+	case _IOC_WRITE:</div><div class='add'>+	case (_IOC_WRITE | _IOC_READ):</div><div class='add'>+		if (_IOC_SIZE(cmd) &lt;= sizeof(sbuf)) {</div><div class='add'>+			parg = sbuf;</div><div class='add'>+		} else {</div><div class='add'>+			/* too big to allocate from stack */</div><div class='add'>+			mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);</div><div class='add'>+			if (NULL == mbuf)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			parg = mbuf;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		if (_IOC_DIR(cmd) &amp; _IOC_WRITE)</div><div class='add'>+			if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd)))</div><div class='add'>+				goto out;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_ext_ctrl) {</div><div class='add'>+		struct v4l2_ext_controls *p = parg;</div><div class='add'>+</div><div class='add'>+		/* In case of an error, tell the caller that it wasn't</div><div class='add'>+		   a specific control that caused it. */</div><div class='add'>+		p-&gt;error_idx = p-&gt;count;</div><div class='add'>+		user_ptr = (void __user *)p-&gt;controls;</div><div class='add'>+		if (p-&gt;count) {</div><div class='add'>+			ctrls_size = sizeof(struct v4l2_ext_control) * p-&gt;count;</div><div class='add'>+			/* Note: v4l2_ext_controls fits in sbuf[] so mbuf is still NULL. */</div><div class='add'>+			mbuf = kmalloc(ctrls_size, GFP_KERNEL);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			if (NULL == mbuf)</div><div class='add'>+				goto out_ext_ctrl;</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			if (copy_from_user(mbuf, user_ptr, ctrls_size))</div><div class='add'>+				goto out_ext_ctrl;</div><div class='add'>+			p-&gt;controls = mbuf;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handles IOCTL */</div><div class='add'>+	err = __video_do_ioctl(inode, file, cmd, parg);</div><div class='add'>+	if (err == -ENOIOCTLCMD)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	if (is_ext_ctrl) {</div><div class='add'>+		struct v4l2_ext_controls *p = parg;</div><div class='add'>+</div><div class='add'>+		p-&gt;controls = (void *)user_ptr;</div><div class='add'>+		if (p-&gt;count &amp;&amp; err == 0 &amp;&amp; copy_to_user(user_ptr, mbuf, ctrls_size))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		goto out_ext_ctrl;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out_ext_ctrl:</div><div class='add'>+	/*  Copy results into user buffer  */</div><div class='add'>+	switch (_IOC_DIR(cmd))</div><div class='add'>+	{</div><div class='add'>+	case _IOC_READ:</div><div class='add'>+	case (_IOC_WRITE | _IOC_READ):</div><div class='add'>+		if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(mbuf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct file_operations video_fops;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -324,10 +1562,6 @@ int video_register_device(struct video_device *vfd, int type, int nr)</div><div class='ctx'> 	video_device[i]=vfd;</div><div class='ctx'> 	vfd-&gt;minor=i;</div><div class='ctx'> 	mutex_unlock(&amp;videodev_lock);</div><div class='del'>-</div><div class='del'>-	sprintf(vfd-&gt;devfs_name, "v4l/%s%d", name_base, i - base);</div><div class='del'>-	devfs_mk_cdev(MKDEV(VIDEO_MAJOR, vfd-&gt;minor),</div><div class='del'>-			S_IFCHR | S_IRUSR | S_IWUSR, vfd-&gt;devfs_name);</div><div class='ctx'> 	mutex_init(&amp;vfd-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* sysfs class */</div><div class='hunk'>@@ -336,7 +1570,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)</div><div class='ctx'> 		vfd-&gt;class_dev.dev = vfd-&gt;dev;</div><div class='ctx'> 	vfd-&gt;class_dev.class       = &amp;video_class;</div><div class='ctx'> 	vfd-&gt;class_dev.devt        = MKDEV(VIDEO_MAJOR, vfd-&gt;minor);</div><div class='del'>-	strlcpy(vfd-&gt;class_dev.class_id, vfd-&gt;devfs_name + 4, BUS_ID_SIZE);</div><div class='add'>+	sprintf(vfd-&gt;class_dev.class_id, "%s%d", name_base, i - base);</div><div class='ctx'> 	class_device_register(&amp;vfd-&gt;class_dev);</div><div class='ctx'> 	class_device_create_file(&amp;vfd-&gt;class_dev,</div><div class='ctx'> 				&amp;class_device_attr_name);</div><div class='hunk'>@@ -365,13 +1599,14 @@ void video_unregister_device(struct video_device *vfd)</div><div class='ctx'> 	if(video_device[vfd-&gt;minor]!=vfd)</div><div class='ctx'> 		panic("videodev: bad unregister");</div><div class='ctx'> </div><div class='del'>-	devfs_remove(vfd-&gt;devfs_name);</div><div class='ctx'> 	video_device[vfd-&gt;minor]=NULL;</div><div class='ctx'> 	class_device_unregister(&amp;vfd-&gt;class_dev);</div><div class='ctx'> 	mutex_unlock(&amp;videodev_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/*</div><div class='add'>+ * Video fs operations</div><div class='add'>+ */</div><div class='ctx'> static struct file_operations video_fops=</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='hunk'>@@ -387,7 +1622,7 @@ static int __init videodev_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Linux video capture interface: v1.00\n");</div><div class='add'>+	printk(KERN_INFO "Linux video capture interface: v2.00\n");</div><div class='ctx'> 	if (register_chrdev(VIDEO_MAJOR, VIDEO_NAME, &amp;video_fops)) {</div><div class='ctx'> 		printk(KERN_WARNING "video_dev: unable to get major %d\n", VIDEO_MAJOR);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -418,11 +1653,12 @@ EXPORT_SYMBOL(video_devdata);</div><div class='ctx'> EXPORT_SYMBOL(video_usercopy);</div><div class='ctx'> EXPORT_SYMBOL(video_exclusive_open);</div><div class='ctx'> EXPORT_SYMBOL(video_exclusive_release);</div><div class='add'>+EXPORT_SYMBOL(video_ioctl2);</div><div class='ctx'> EXPORT_SYMBOL(video_device_alloc);</div><div class='ctx'> EXPORT_SYMBOL(video_device_release);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Alan Cox");</div><div class='del'>-MODULE_DESCRIPTION("Device registrar for Video4Linux drivers");</div><div class='add'>+MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c<br/>index a8c101494cf5..268e69fdefc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/vino.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/vino.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/vino.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/vino.c</a></div><div class='hunk'>@@ -40,7 +40,7 @@</div><div class='ctx'> #include &lt;linux/i2c-algo-sgi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='del'>-#include &lt;linux/videodev2.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c<br/>index 779db26771c0..41d23c8acbd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/vivi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/vivi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/vivi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/vivi.c</a></div><div class='hunk'>@@ -48,34 +48,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "font.h"</div><div class='ctx'> </div><div class='del'>-#ifndef kzalloc</div><div class='del'>-#define kzalloc(size, flags)                            \</div><div class='del'>-({                                                      \</div><div class='del'>-	void *__ret = kmalloc(size, flags);             \</div><div class='del'>-	if (__ret)                                      \</div><div class='del'>-		memset(__ret, 0, size);                 \</div><div class='del'>-	__ret;                                          \</div><div class='del'>-})</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");</div><div class='del'>-MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");</div><div class='del'>-MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-</div><div class='ctx'> #define VIVI_MAJOR_VERSION 0</div><div class='ctx'> #define VIVI_MINOR_VERSION 4</div><div class='ctx'> #define VIVI_RELEASE 0</div><div class='ctx'> #define VIVI_VERSION KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE)</div><div class='ctx'> </div><div class='del'>-static int video_nr = -1;        /* /dev/videoN, -1 for autodetect */</div><div class='del'>-module_param(video_nr, int, 0);</div><div class='del'>-</div><div class='del'>-static int debug = 0;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-</div><div class='del'>-static unsigned int vid_limit = 16;</div><div class='del'>-module_param(vid_limit,int,0644);</div><div class='del'>-MODULE_PARM_DESC(vid_limit,"capture memory limit in megabytes");</div><div class='add'>+/* Declare static vars that will be used as parameters */</div><div class='add'>+static unsigned int vid_limit = 16;	/* Video memory limit, in Mb */</div><div class='add'>+static struct video_device vivi;	/* Video device */</div><div class='add'>+static int video_nr = -1;		/* /dev/videoN, -1 for autodetect */</div><div class='ctx'> </div><div class='ctx'> /* supported controls */</div><div class='ctx'> static struct v4l2_queryctrl vivi_qctrl[] = {</div><div class='hunk'>@@ -129,10 +110,10 @@ static struct v4l2_queryctrl vivi_qctrl[] = {</div><div class='ctx'> </div><div class='ctx'> static int qctl_regs[ARRAY_SIZE(vivi_qctrl)];</div><div class='ctx'> </div><div class='del'>-#define dprintk(level,fmt, arg...)			     \</div><div class='del'>-	do { 						     \</div><div class='del'>-		if (debug &gt;= (level))			     \</div><div class='del'>-			printk(KERN_DEBUG "vivi: " fmt , ## arg);    \</div><div class='add'>+#define dprintk(level,fmt, arg...)					\</div><div class='add'>+	do {								\</div><div class='add'>+		if (vivi.debug &gt;= (level))				\</div><div class='add'>+			printk(KERN_DEBUG "vivi: " fmt , ## arg);	\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------</div><div class='hunk'>@@ -190,7 +171,7 @@ struct vivi_dev {</div><div class='ctx'> </div><div class='ctx'> 	/* various device info */</div><div class='ctx'> 	unsigned int               resources;</div><div class='del'>-	struct video_device        video_dev;</div><div class='add'>+	struct video_device        vfd;</div><div class='ctx'> </div><div class='ctx'> 	struct vivi_dmaqueue       vidq;</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +229,8 @@ static u8 bars[8][3] = {</div><div class='ctx'> #define TSTAMP_MAX_Y TSTAMP_MIN_Y+15</div><div class='ctx'> #define TSTAMP_MIN_X 64</div><div class='ctx'> </div><div class='del'>-void prep_to_addr(struct sg_to_addr to_addr[],struct videobuf_buffer *vb)</div><div class='add'>+static void prep_to_addr(struct sg_to_addr to_addr[],</div><div class='add'>+			 struct videobuf_buffer *vb)</div><div class='ctx'> {</div><div class='ctx'> 	int i, pos=0;</div><div class='ctx'> </div><div class='hunk'>@@ -259,7 +241,7 @@ void prep_to_addr(struct sg_to_addr to_addr[],struct videobuf_buffer *vb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])</div><div class='add'>+static int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])</div><div class='ctx'> {</div><div class='ctx'> 	int p1=0,p2=pages-1,p3=pages/2;</div><div class='ctx'> </div><div class='hunk'>@@ -280,8 +262,8 @@ inline int get_addr_pos(int pos, int pages, struct sg_to_addr to_addr[])</div><div class='ctx'> 	return (p1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,</div><div class='del'>-					int hmax, int line, char *timestr)</div><div class='add'>+static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,</div><div class='add'>+		     int hmax, int line, char *timestr)</div><div class='ctx'> {</div><div class='ctx'> 	int  w,i,j,pos=inipos,pgpos,oldpg,y;</div><div class='ctx'> 	char *p,*s,*basep;</div><div class='hunk'>@@ -491,7 +473,7 @@ static void vivi_thread_tick(struct vivi_dmaqueue  *dma_q)</div><div class='ctx'> 		dprintk(1,"%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void vivi_sleep(struct vivi_dmaqueue  *dma_q)</div><div class='add'>+static void vivi_sleep(struct vivi_dmaqueue  *dma_q)</div><div class='ctx'> {</div><div class='ctx'> 	int timeout;</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='hunk'>@@ -526,7 +508,7 @@ void vivi_sleep(struct vivi_dmaqueue  *dma_q)</div><div class='ctx'> 	try_to_freeze();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vivi_thread(void *data)</div><div class='add'>+static int vivi_thread(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct vivi_dmaqueue  *dma_q=data;</div><div class='ctx'> </div><div class='hunk'>@@ -542,7 +524,7 @@ int vivi_thread(void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vivi_start_thread(struct vivi_dmaqueue  *dma_q)</div><div class='add'>+static int vivi_start_thread(struct vivi_dmaqueue  *dma_q)</div><div class='ctx'> {</div><div class='ctx'> 	dma_q-&gt;frame=0;</div><div class='ctx'> 	dma_q-&gt;ini_jiffies=jiffies;</div><div class='hunk'>@@ -560,7 +542,7 @@ int vivi_start_thread(struct vivi_dmaqueue  *dma_q)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void vivi_stop_thread(struct vivi_dmaqueue  *dma_q)</div><div class='add'>+static void vivi_stop_thread(struct vivi_dmaqueue  *dma_q)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1,"%s\n",__FUNCTION__);</div><div class='ctx'> 	/* shutdown control thread */</div><div class='hunk'>@@ -666,8 +648,7 @@ buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)</div><div class='add'>+static void free_buffer(struct videobuf_queue *vq, struct vivi_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1,"%s\n",__FUNCTION__);</div><div class='ctx'> </div><div class='hunk'>@@ -791,8 +772,8 @@ static void buffer_release(struct videobuf_queue *vq, struct videobuf_buffer *vb</div><div class='ctx'> 	free_buffer(vq,buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vivi_map_sg (void *dev, struct scatterlist *sg, int nents,</div><div class='del'>-	   int direction)</div><div class='add'>+static int vivi_map_sg(void *dev, struct scatterlist *sg, int nents,</div><div class='add'>+		       int direction)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -808,15 +789,15 @@ int vivi_map_sg (void *dev, struct scatterlist *sg, int nents,</div><div class='ctx'> 	return nents;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,</div><div class='del'>-					int direction)</div><div class='add'>+static int vivi_unmap_sg(void *dev,struct scatterlist *sglist,int nr_pages,</div><div class='add'>+			 int direction)</div><div class='ctx'> {</div><div class='ctx'> 	dprintk(1,"%s\n",__FUNCTION__);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist,int nr_pages,</div><div class='del'>-					int direction)</div><div class='add'>+static int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist, int nr_pages,</div><div class='add'>+			    int direction)</div><div class='ctx'> {</div><div class='ctx'> //	dprintk(1,"%s\n",__FUNCTION__);</div><div class='ctx'> </div><div class='hunk'>@@ -840,7 +821,80 @@ static struct videobuf_queue_ops vivi_video_qops = {</div><div class='ctx'> 	IOCTL handling</div><div class='ctx'>    ------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int vivi_try_fmt(struct vivi_dev *dev, struct vivi_fh *fh,</div><div class='add'>+</div><div class='add'>+static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)</div><div class='add'>+{</div><div class='add'>+	/* is it free? */</div><div class='add'>+	down(&amp;dev-&gt;lock);</div><div class='add'>+	if (dev-&gt;resources) {</div><div class='add'>+		/* no, someone else uses it */</div><div class='add'>+		up(&amp;dev-&gt;lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	/* it's free, grab it */</div><div class='add'>+	dev-&gt;resources =1;</div><div class='add'>+	dprintk(1,"res: get\n");</div><div class='add'>+	up(&amp;dev-&gt;lock);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int res_locked(struct vivi_dev *dev)</div><div class='add'>+{</div><div class='add'>+	return (dev-&gt;resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void res_free(struct vivi_dev *dev, struct vivi_fh *fh)</div><div class='add'>+{</div><div class='add'>+	down(&amp;dev-&gt;lock);</div><div class='add'>+	dev-&gt;resources = 0;</div><div class='add'>+	dprintk(1,"res: put\n");</div><div class='add'>+	up(&amp;dev-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------</div><div class='add'>+	IOCTL vidioc handling</div><div class='add'>+   ------------------------------------------------------------------*/</div><div class='add'>+static int vidioc_querycap (struct file *file, void  *priv,</div><div class='add'>+					struct v4l2_capability *cap)</div><div class='add'>+{</div><div class='add'>+	strcpy(cap-&gt;driver, "vivi");</div><div class='add'>+	strcpy(cap-&gt;card, "vivi");</div><div class='add'>+	cap-&gt;version = VIVI_VERSION;</div><div class='add'>+	cap-&gt;capabilities =	V4L2_CAP_VIDEO_CAPTURE |</div><div class='add'>+				V4L2_CAP_STREAMING     |</div><div class='add'>+				V4L2_CAP_READWRITE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_enum_fmt_cap (struct file *file, void  *priv,</div><div class='add'>+					struct v4l2_fmtdesc *f)</div><div class='add'>+{</div><div class='add'>+	if (f-&gt;index &gt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	strlcpy(f-&gt;description,format.name,sizeof(f-&gt;description));</div><div class='add'>+	f-&gt;pixelformat = format.fourcc;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_g_fmt_cap (struct file *file, void *priv,</div><div class='add'>+					struct v4l2_format *f)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='add'>+</div><div class='add'>+	f-&gt;fmt.pix.width        = fh-&gt;width;</div><div class='add'>+	f-&gt;fmt.pix.height       = fh-&gt;height;</div><div class='add'>+	f-&gt;fmt.pix.field        = fh-&gt;vb_vidq.field;</div><div class='add'>+	f-&gt;fmt.pix.pixelformat  = fh-&gt;fmt-&gt;fourcc;</div><div class='add'>+	f-&gt;fmt.pix.bytesperline =</div><div class='add'>+		(f-&gt;fmt.pix.width * fh-&gt;fmt-&gt;depth) &gt;&gt; 3;</div><div class='add'>+	f-&gt;fmt.pix.sizeimage =</div><div class='add'>+		f-&gt;fmt.pix.height * f-&gt;fmt.pix.bytesperline;</div><div class='add'>+</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vidioc_try_fmt_cap (struct file *file, void *priv,</div><div class='ctx'> 			struct v4l2_format *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct vivi_fmt *fmt;</div><div class='hunk'>@@ -848,7 +902,8 @@ static int vivi_try_fmt(struct vivi_dev *dev, struct vivi_fh *fh,</div><div class='ctx'> 	unsigned int maxw, maxh;</div><div class='ctx'> </div><div class='ctx'> 	if (format.fourcc != f-&gt;fmt.pix.pixelformat) {</div><div class='del'>-		dprintk(1,"Fourcc format invalid.\n");</div><div class='add'>+		dprintk(1,"Fourcc format (0x%08x) invalid. Driver accepts "</div><div class='add'>+			"only 0x%08x\n",f-&gt;fmt.pix.pixelformat,format.fourcc);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	fmt=&amp;format;</div><div class='hunk'>@@ -884,356 +939,196 @@ static int vivi_try_fmt(struct vivi_dev *dev, struct vivi_fh *fh,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int res_get(struct vivi_dev *dev, struct vivi_fh *fh)</div><div class='add'>+/*FIXME: This seems to be generic enough to be at videodev2 */</div><div class='add'>+static int vidioc_s_fmt_cap (struct file *file, void *priv,</div><div class='add'>+					struct v4l2_format *f)</div><div class='ctx'> {</div><div class='del'>-	/* is it free? */</div><div class='del'>-	down(&amp;dev-&gt;lock);</div><div class='del'>-	if (dev-&gt;resources) {</div><div class='del'>-		/* no, someone else uses it */</div><div class='del'>-		up(&amp;dev-&gt;lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* it's free, grab it */</div><div class='del'>-	dev-&gt;resources =1;</div><div class='del'>-	dprintk(1,"res: get\n");</div><div class='del'>-	up(&amp;dev-&gt;lock);</div><div class='del'>-	return 1;</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='add'>+	int ret = vidioc_try_fmt_cap(file,fh,f);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return (ret);</div><div class='add'>+</div><div class='add'>+	fh-&gt;fmt           = &amp;format;</div><div class='add'>+	fh-&gt;width         = f-&gt;fmt.pix.width;</div><div class='add'>+	fh-&gt;height        = f-&gt;fmt.pix.height;</div><div class='add'>+	fh-&gt;vb_vidq.field = f-&gt;fmt.pix.field;</div><div class='add'>+	fh-&gt;type          = f-&gt;type;</div><div class='add'>+</div><div class='add'>+	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int res_locked(struct vivi_dev *dev)</div><div class='add'>+static int vidioc_reqbufs (struct file *file, void *priv, struct v4l2_requestbuffers *p)</div><div class='ctx'> {</div><div class='del'>-	return (dev-&gt;resources);</div><div class='del'>-}</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='ctx'> </div><div class='del'>-static void res_free(struct vivi_dev *dev, struct vivi_fh *fh)</div><div class='del'>-{</div><div class='del'>-	down(&amp;dev-&gt;lock);</div><div class='del'>-	dev-&gt;resources = 0;</div><div class='del'>-	dprintk(1,"res: put\n");</div><div class='del'>-	up(&amp;dev-&gt;lock);</div><div class='add'>+	return (videobuf_reqbufs(&amp;fh-&gt;vb_vidq, p));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vivi_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg)</div><div class='add'>+static int vidioc_querybuf (struct file *file, void *priv, struct v4l2_buffer *p)</div><div class='ctx'> {</div><div class='del'>-	struct vivi_fh  *fh     = file-&gt;private_data;</div><div class='del'>-	struct vivi_dev *dev    = fh-&gt;dev;</div><div class='del'>-	int ret=0;</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='ctx'> </div><div class='del'>-	if (debug) {</div><div class='del'>-		if (_IOC_DIR(cmd) &amp; _IOC_WRITE)</div><div class='del'>-			v4l_printk_ioctl_arg("vivi(w)",cmd, arg);</div><div class='del'>-		else if (!_IOC_DIR(cmd) &amp; _IOC_READ) {</div><div class='del'>-			v4l_print_ioctl("vivi", cmd);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	return (videobuf_querybuf(&amp;fh-&gt;vb_vidq, p));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	switch(cmd) {</div><div class='del'>-	/* --- capabilities ------------------------------------------ */</div><div class='del'>-	case VIDIOC_QUERYCAP:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_capability *cap = (struct v4l2_capability*)arg;</div><div class='del'>-</div><div class='del'>-		memset(cap, 0, sizeof(*cap));</div><div class='del'>-</div><div class='del'>-		strcpy(cap-&gt;driver, "vivi");</div><div class='del'>-		strcpy(cap-&gt;card, "vivi");</div><div class='del'>-		cap-&gt;version = VIVI_VERSION;</div><div class='del'>-		cap-&gt;capabilities =</div><div class='del'>-					V4L2_CAP_VIDEO_CAPTURE |</div><div class='del'>-					V4L2_CAP_STREAMING     |</div><div class='del'>-					V4L2_CAP_READWRITE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* --- capture ioctls ---------------------------------------- */</div><div class='del'>-	case VIDIOC_ENUM_FMT:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_fmtdesc *f = arg;</div><div class='del'>-		enum v4l2_buf_type type;</div><div class='del'>-		unsigned int index;</div><div class='add'>+static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *p)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='ctx'> </div><div class='del'>-		index = f-&gt;index;</div><div class='del'>-		type  = f-&gt;type;</div><div class='add'>+	return (videobuf_qbuf(&amp;fh-&gt;vb_vidq, p));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='ctx'> </div><div class='del'>-		switch (type) {</div><div class='del'>-		case V4L2_BUF_TYPE_VIDEO_CAPTURE:</div><div class='del'>-			if (index &gt; 0){</div><div class='del'>-				ret=-EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			memset(f,0,sizeof(*f));</div><div class='add'>+	return (videobuf_dqbuf(&amp;fh-&gt;vb_vidq, p,</div><div class='add'>+				file-&gt;f_flags &amp; O_NONBLOCK));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			f-&gt;index = index;</div><div class='del'>-			f-&gt;type  = type;</div><div class='del'>-			strlcpy(f-&gt;description,format.name,sizeof(f-&gt;description));</div><div class='del'>-			f-&gt;pixelformat = format.fourcc;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+#ifdef HAVE_V4L1</div><div class='add'>+static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='add'>+	struct videobuf_queue *q=&amp;fh-&gt;vb_vidq;</div><div class='add'>+	struct v4l2_requestbuffers req;</div><div class='add'>+	unsigned int i, ret;</div><div class='add'>+</div><div class='add'>+	req.type   = q-&gt;type;</div><div class='add'>+	req.count  = 8;</div><div class='add'>+	req.memory = V4L2_MEMORY_MMAP;</div><div class='add'>+	ret = videobuf_reqbufs(q,&amp;req);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return (ret);</div><div class='add'>+</div><div class='add'>+	mbuf-&gt;frames = req.count;</div><div class='add'>+	mbuf-&gt;size   = 0;</div><div class='add'>+	for (i = 0; i &lt; mbuf-&gt;frames; i++) {</div><div class='add'>+		mbuf-&gt;offsets[i]  = q-&gt;bufs[i]-&gt;boff;</div><div class='add'>+		mbuf-&gt;size       += q-&gt;bufs[i]-&gt;bsize;</div><div class='ctx'> 	}</div><div class='del'>-	case VIDIOC_G_FMT:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_format *f = (struct v4l2_format *)arg;</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-		if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='add'>+	struct vivi_dev *dev    = fh-&gt;dev;</div><div class='ctx'> </div><div class='del'>-		memset(&amp;f-&gt;fmt.pix,0,sizeof(f-&gt;fmt.pix));</div><div class='del'>-		f-&gt;fmt.pix.width        = fh-&gt;width;</div><div class='del'>-		f-&gt;fmt.pix.height       = fh-&gt;height;</div><div class='del'>-		f-&gt;fmt.pix.field        = fh-&gt;vb_vidq.field;</div><div class='del'>-		f-&gt;fmt.pix.pixelformat  = fh-&gt;fmt-&gt;fourcc;</div><div class='del'>-		f-&gt;fmt.pix.bytesperline =</div><div class='del'>-			(f-&gt;fmt.pix.width * fh-&gt;fmt-&gt;depth) &gt;&gt; 3;</div><div class='del'>-		f-&gt;fmt.pix.sizeimage =</div><div class='del'>-			f-&gt;fmt.pix.height * f-&gt;fmt.pix.bytesperline;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_FMT:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_format *f = arg;</div><div class='add'>+	if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (i != fh-&gt;type)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			dprintk(1,"Only capture supported.\n");</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if (!res_get(dev,fh))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	return (videobuf_streamon(&amp;fh-&gt;vb_vidq));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ret = vivi_try_fmt(dev,fh,f);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='add'>+static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)</div><div class='add'>+{</div><div class='add'>+	struct vivi_fh  *fh=priv;</div><div class='add'>+	struct vivi_dev *dev    = fh-&gt;dev;</div><div class='ctx'> </div><div class='del'>-		fh-&gt;fmt           = &amp;format;</div><div class='del'>-		fh-&gt;width         = f-&gt;fmt.pix.width;</div><div class='del'>-		fh-&gt;height        = f-&gt;fmt.pix.height;</div><div class='del'>-		fh-&gt;vb_vidq.field = f-&gt;fmt.pix.field;</div><div class='del'>-		fh-&gt;type          = f-&gt;type;</div><div class='add'>+	if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (i != fh-&gt;type)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_TRY_FMT:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_format *f = arg;</div><div class='del'>-		if (f-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	videobuf_streamoff(&amp;fh-&gt;vb_vidq);</div><div class='add'>+	res_free(dev,fh);</div><div class='ctx'> </div><div class='del'>-		ret=vivi_try_fmt(dev,fh,f);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_REQBUFS:</div><div class='del'>-		if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret=videobuf_reqbufs(&amp;fh-&gt;vb_vidq, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VIDIOC_QUERYBUF:</div><div class='del'>-		if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret=videobuf_querybuf(&amp;fh-&gt;vb_vidq, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VIDIOC_QBUF:</div><div class='del'>-		if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret=videobuf_qbuf(&amp;fh-&gt;vb_vidq, arg);</div><div class='del'>-		break;</div><div class='del'>-	case VIDIOC_DQBUF:</div><div class='del'>-		if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret=videobuf_dqbuf(&amp;fh-&gt;vb_vidq, arg,</div><div class='del'>-					file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-		break;</div><div class='del'>-#ifdef HAVE_V4L1</div><div class='del'>-	/* --- streaming capture ------------------------------------- */</div><div class='del'>-	case VIDIOCGMBUF:</div><div class='del'>-	{</div><div class='del'>-		struct video_mbuf *mbuf = arg;</div><div class='del'>-		struct videobuf_queue *q=&amp;fh-&gt;vb_vidq;</div><div class='del'>-		struct v4l2_requestbuffers req;</div><div class='del'>-		unsigned int i;</div><div class='del'>-</div><div class='del'>-		memset(&amp;req,0,sizeof(req));</div><div class='del'>-		req.type   = q-&gt;type;</div><div class='del'>-		req.count  = 8;</div><div class='del'>-		req.memory = V4L2_MEMORY_MMAP;</div><div class='del'>-		ret = videobuf_reqbufs(q,&amp;req);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		memset(mbuf,0,sizeof(*mbuf));</div><div class='del'>-		mbuf-&gt;frames = req.count;</div><div class='del'>-		mbuf-&gt;size   = 0;</div><div class='del'>-		for (i = 0; i &lt; mbuf-&gt;frames; i++) {</div><div class='del'>-			mbuf-&gt;offsets[i]  = q-&gt;bufs[i]-&gt;boff;</div><div class='del'>-			mbuf-&gt;size       += q-&gt;bufs[i]-&gt;bsize;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	case VIDIOC_STREAMON:</div><div class='del'>-	{</div><div class='del'>-		if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (!res_get(dev,fh))</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		ret=videobuf_streamon(&amp;fh-&gt;vb_vidq);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_STREAMOFF:</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct v4l2_tvnorm tvnorms[] = {</div><div class='ctx'> 	{</div><div class='del'>-		if (fh-&gt;type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = videobuf_streamoff(&amp;fh-&gt;vb_vidq);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		res_free(dev,fh);</div><div class='del'>-		break;</div><div class='add'>+		.name      = "NTSC-M",</div><div class='add'>+		.id        = V4L2_STD_NTSC_M,</div><div class='ctx'> 	}</div><div class='del'>-	/* ---------- tv norms ---------- */</div><div class='del'>-	case VIDIOC_ENUMSTD:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_standard *e = arg;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (e-&gt;index&gt;0) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ret = v4l2_video_std_construct(e, V4L2_STD_NTSC_M, "NTSC-M");</div><div class='add'>+static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id a)</div><div class='add'>+{</div><div class='ctx'> </div><div class='del'>-		/* Allows vivi to use different fps from video std */</div><div class='del'>-		e-&gt;frameperiod.numerator = WAKE_NUMERATOR;</div><div class='del'>-		e-&gt;frameperiod.denominator = WAKE_DENOMINATOR;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_G_STD:</div><div class='del'>-	{</div><div class='del'>-		v4l2_std_id *id = arg;</div><div class='add'>+/* only one input in this sample driver */</div><div class='add'>+static int vidioc_enum_input (struct file *file, void *priv,</div><div class='add'>+				struct v4l2_input *inp)</div><div class='add'>+{</div><div class='add'>+	if (inp-&gt;index != 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		*id = V4L2_STD_NTSC_M;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_STD:</div><div class='del'>-	{</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	/* ------ input switching ---------- */</div><div class='del'>-	case VIDIOC_ENUMINPUT:</div><div class='del'>-	{ /* only one input in this sample driver */</div><div class='del'>-		struct v4l2_input *inp = arg;</div><div class='add'>+	inp-&gt;type = V4L2_INPUT_TYPE_CAMERA;</div><div class='add'>+	inp-&gt;std = V4L2_STD_NTSC_M;</div><div class='add'>+	strcpy(inp-&gt;name,"Camera");</div><div class='ctx'> </div><div class='del'>-		if (inp-&gt;index != 0) {</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		memset(inp, 0, sizeof(*inp));</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		inp-&gt;index = 0;</div><div class='del'>-		inp-&gt;type = V4L2_INPUT_TYPE_CAMERA;</div><div class='del'>-		inp-&gt;std = V4L2_STD_NTSC_M;</div><div class='del'>-		strcpy(inp-&gt;name,"Camera");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_G_INPUT:</div><div class='del'>-	{</div><div class='del'>-		unsigned int *i = arg;</div><div class='add'>+static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)</div><div class='add'>+{</div><div class='add'>+	*i = 0;</div><div class='ctx'> </div><div class='del'>-		*i = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_INPUT:</div><div class='del'>-	{</div><div class='del'>-		unsigned int *i = arg;</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='add'>+static int vidioc_s_input (struct file *file, void *priv, unsigned int i)</div><div class='add'>+{</div><div class='add'>+	if (i &gt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (*i &gt; 0)</div><div class='del'>-			ret=-EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	return (0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> 	/* --- controls ---------------------------------------------- */</div><div class='del'>-	case VIDIOC_QUERYCTRL:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_queryctrl *qc = arg;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(vivi_qctrl); i++)</div><div class='del'>-			if (qc-&gt;id &amp;&amp; qc-&gt;id == vivi_qctrl[i].id) {</div><div class='del'>-				memcpy(qc, &amp;(vivi_qctrl[i]),</div><div class='del'>-					sizeof(*qc));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+static int vidioc_queryctrl (struct file *file, void *priv,</div><div class='add'>+				struct v4l2_queryctrl *qc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		ret=-EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_G_CTRL:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_control *ctrl = arg;</div><div class='del'>-		int i;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vivi_qctrl); i++)</div><div class='add'>+		if (qc-&gt;id &amp;&amp; qc-&gt;id == vivi_qctrl[i].id) {</div><div class='add'>+			memcpy(qc, &amp;(vivi_qctrl[i]),</div><div class='add'>+				sizeof(*qc));</div><div class='add'>+			return (0);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(vivi_qctrl); i++)</div><div class='del'>-			if (ctrl-&gt;id == vivi_qctrl[i].id) {</div><div class='del'>-				ctrl-&gt;value=qctl_regs[i];</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ret=-EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case VIDIOC_S_CTRL:</div><div class='del'>-	{</div><div class='del'>-		struct v4l2_control *ctrl = arg;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(vivi_qctrl); i++)</div><div class='del'>-			if (ctrl-&gt;id == vivi_qctrl[i].id) {</div><div class='del'>-				if (ctrl-&gt;value &lt;</div><div class='del'>-					vivi_qctrl[i].minimum</div><div class='del'>-					|| ctrl-&gt;value &gt;</div><div class='del'>-					vivi_qctrl[i].maximum) {</div><div class='del'>-						ret=-ERANGE;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				qctl_regs[i]=ctrl-&gt;value;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		ret=-EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		ret=v4l_compat_translate_ioctl(inode,file,cmd,arg,vivi_do_ioctl);</div><div class='del'>-	}</div><div class='add'>+static int vidioc_g_ctrl (struct file *file, void *priv,</div><div class='add'>+				struct v4l2_control *ctrl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (debug) {</div><div class='del'>-		if (ret&lt;0) {</div><div class='del'>-			v4l_print_ioctl("vivi(err)", cmd);</div><div class='del'>-			dprintk(1,"errcode=%d\n",ret);</div><div class='del'>-		} else if (_IOC_DIR(cmd) &amp; _IOC_READ)</div><div class='del'>-			v4l_printk_ioctl_arg("vivi(r)",cmd, arg);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vivi_qctrl); i++)</div><div class='add'>+		if (ctrl-&gt;id == vivi_qctrl[i].id) {</div><div class='add'>+			ctrl-&gt;value=qctl_regs[i];</div><div class='add'>+			return (0);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int vivi_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+static int vidioc_s_ctrl (struct file *file, void *priv,</div><div class='add'>+				struct v4l2_control *ctrl)</div><div class='ctx'> {</div><div class='del'>-	return video_usercopy(inode, file, cmd, arg, vivi_do_ioctl);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(vivi_qctrl); i++)</div><div class='add'>+		if (ctrl-&gt;id == vivi_qctrl[i].id) {</div><div class='add'>+			if (ctrl-&gt;value &lt;</div><div class='add'>+				vivi_qctrl[i].minimum</div><div class='add'>+				|| ctrl-&gt;value &gt;</div><div class='add'>+				vivi_qctrl[i].maximum) {</div><div class='add'>+					return (-ERANGE);</div><div class='add'>+				}</div><div class='add'>+			qctl_regs[i]=ctrl-&gt;value;</div><div class='add'>+			return (0);</div><div class='add'>+		}</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------</div><div class='hunk'>@@ -1255,7 +1150,7 @@ static int vivi_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each(list,&amp;vivi_devlist) {</div><div class='ctx'> 		h = list_entry(list, struct vivi_dev, vivi_devlist);</div><div class='del'>-		if (h-&gt;video_dev.minor == minor) {</div><div class='add'>+		if (h-&gt;vfd.minor == minor) {</div><div class='ctx'> 			dev  = h;</div><div class='ctx'> 			type = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1264,6 +1159,7 @@ static int vivi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	/* If more than one user, mutex should be added */</div><div class='ctx'> 	dev-&gt;users++;</div><div class='ctx'> </div><div class='hunk'>@@ -1279,6 +1175,7 @@ static int vivi_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = fh;</div><div class='ctx'> 	fh-&gt;dev      = dev;</div><div class='add'>+</div><div class='ctx'> 	fh-&gt;type     = V4L2_BUF_TYPE_VIDEO_CAPTURE;</div><div class='ctx'> 	fh-&gt;fmt      = &amp;format;</div><div class='ctx'> 	fh-&gt;width    = 640;</div><div class='hunk'>@@ -1314,7 +1211,7 @@ static int vivi_open(struct inode *inode, struct file *file)</div><div class='ctx'> static ssize_t</div><div class='ctx'> vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct vivi_fh *fh = file-&gt;private_data;</div><div class='add'>+	struct vivi_fh        *fh = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (fh-&gt;type==V4L2_BUF_TYPE_VIDEO_CAPTURE) {</div><div class='ctx'> 		if (res_locked(fh-&gt;dev))</div><div class='hunk'>@@ -1328,8 +1225,8 @@ vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos)</div><div class='ctx'> static unsigned int</div><div class='ctx'> vivi_poll(struct file *file, struct poll_table_struct *wait)</div><div class='ctx'> {</div><div class='del'>-	struct vivi_fh *fh = file-&gt;private_data;</div><div class='del'>-	struct vivi_buffer *buf;</div><div class='add'>+	struct vivi_fh        *fh = file-&gt;private_data;</div><div class='add'>+	struct vivi_buffer    *buf;</div><div class='ctx'> </div><div class='ctx'> 	dprintk(1,"%s\n",__FUNCTION__);</div><div class='ctx'> </div><div class='hunk'>@@ -1358,8 +1255,8 @@ vivi_poll(struct file *file, struct poll_table_struct *wait)</div><div class='ctx'> </div><div class='ctx'> static int vivi_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct vivi_fh  *fh     = file-&gt;private_data;</div><div class='del'>-	struct vivi_dev *dev    = fh-&gt;dev;</div><div class='add'>+	struct vivi_fh         *fh = file-&gt;private_data;</div><div class='add'>+	struct vivi_dev *dev       = fh-&gt;dev;</div><div class='ctx'> 	struct vivi_dmaqueue *vidq = &amp;dev-&gt;vidq;</div><div class='ctx'> </div><div class='ctx'> 	int minor = iminor(inode);</div><div class='hunk'>@@ -1379,7 +1276,7 @@ static int vivi_release(struct inode *inode, struct file *file)</div><div class='ctx'> static int</div><div class='ctx'> vivi_mmap(struct file *file, struct vm_area_struct * vma)</div><div class='ctx'> {</div><div class='del'>-	struct vivi_fh *fh = file-&gt;private_data;</div><div class='add'>+	struct vivi_fh        *fh = file-&gt;private_data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dprintk (1,"mmap called, vma=0x%08lx\n",(unsigned long)vma);</div><div class='hunk'>@@ -1400,20 +1297,44 @@ static struct file_operations vivi_fops = {</div><div class='ctx'> 	.release        = vivi_release,</div><div class='ctx'> 	.read           = vivi_read,</div><div class='ctx'> 	.poll		= vivi_poll,</div><div class='del'>-	.ioctl          = vivi_ioctl,</div><div class='add'>+	.ioctl          = video_ioctl2, /* V4L2 ioctl handler */</div><div class='ctx'> 	.mmap		= vivi_mmap,</div><div class='ctx'> 	.llseek         = no_llseek,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct video_device vivi = {</div><div class='del'>-	.name		= "VTM Virtual Video Capture Board",</div><div class='add'>+	.name		= "vivi",</div><div class='ctx'> 	.type		= VID_TYPE_CAPTURE,</div><div class='ctx'> 	.hardware	= 0,</div><div class='ctx'> 	.fops           = &amp;vivi_fops,</div><div class='ctx'> 	.minor		= -1,</div><div class='ctx'> //	.release	= video_device_release,</div><div class='add'>+</div><div class='add'>+	.vidioc_querycap      = vidioc_querycap,</div><div class='add'>+	.vidioc_enum_fmt_cap  = vidioc_enum_fmt_cap,</div><div class='add'>+	.vidioc_g_fmt_cap     = vidioc_g_fmt_cap,</div><div class='add'>+	.vidioc_try_fmt_cap   = vidioc_try_fmt_cap,</div><div class='add'>+	.vidioc_s_fmt_cap     = vidioc_s_fmt_cap,</div><div class='add'>+	.vidioc_reqbufs       = vidioc_reqbufs,</div><div class='add'>+	.vidioc_querybuf      = vidioc_querybuf,</div><div class='add'>+	.vidioc_qbuf          = vidioc_qbuf,</div><div class='add'>+	.vidioc_dqbuf         = vidioc_dqbuf,</div><div class='add'>+	.vidioc_s_std         = vidioc_s_std,</div><div class='add'>+	.vidioc_enum_input    = vidioc_enum_input,</div><div class='add'>+	.vidioc_g_input       = vidioc_g_input,</div><div class='add'>+	.vidioc_s_input       = vidioc_s_input,</div><div class='add'>+	.vidioc_queryctrl     = vidioc_queryctrl,</div><div class='add'>+	.vidioc_g_ctrl        = vidioc_g_ctrl,</div><div class='add'>+	.vidioc_s_ctrl        = vidioc_s_ctrl,</div><div class='add'>+	.vidioc_streamon      = vidioc_streamon,</div><div class='add'>+	.vidioc_streamoff     = vidioc_streamoff,</div><div class='add'>+#ifdef HAVE_V4L1</div><div class='add'>+	.vidiocgmbuf          = vidiocgmbuf,</div><div class='add'>+#endif</div><div class='add'>+	.tvnorms              = tvnorms,</div><div class='add'>+	.tvnormsize           = ARRAY_SIZE(tvnorms),</div><div class='ctx'> };</div><div class='del'>-/* ------------------------------------------------------------------</div><div class='add'>+/* -----------------------------------------------------------------</div><div class='ctx'> 	Initialization and module stuff</div><div class='ctx'>    ------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='hunk'>@@ -1457,3 +1378,16 @@ static void __exit vivi_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(vivi_init);</div><div class='ctx'> module_exit(vivi_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Video Technology Magazine Virtual Video Capture Board");</div><div class='add'>+MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+</div><div class='add'>+module_param(video_nr, int, 0);</div><div class='add'>+</div><div class='add'>+module_param_named(debug,vivi.debug, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug,"activates debug info");</div><div class='add'>+</div><div class='add'>+module_param(vid_limit,int,0644);</div><div class='add'>+MODULE_PARM_DESC(vid_limit,"capture memory limit in megabytes");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c<br/>index 40b205b91481..1eca7e65d235 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/vpx3220.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/vpx3220.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/vpx3220.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/vpx3220.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #define I2C_NAME(x) (x)-&gt;name</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/video_decoder.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define I2C_VPX3220        0x86</div><div class='head'>diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c<br/>index 80ef8a1b8f63..4bdc886abc4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/w9966.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/w9966.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/w9966.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/w9966.c</a></div><div class='hunk'>@@ -58,6 +58,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#define DEBUG				// Undef me for production</div><div class='head'>diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h<br/>index 2836b45ec206..ec7696e8f1fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/w9968cf.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/w9968cf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/w9968cf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/w9968cf.h</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/param.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='head'>diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig<br/>index 115833e4f4dd..a859a6920189 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zc0301/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> config USB_ZC0301</div><div class='del'>-	tristate "USB ZC0301 Image Processor and Control Chip support"</div><div class='add'>+	tristate "USB ZC0301[P] Image Processor and Control Chip support"</div><div class='ctx'> 	depends on USB &amp;&amp; VIDEO_V4L1</div><div class='ctx'> 	---help---</div><div class='del'>-	  Say Y here if you want support for cameras based on the ZC0301</div><div class='del'>-	  Image Processor and Control Chip.</div><div class='add'>+	  Say Y here if you want support for cameras based on the ZC0301 or</div><div class='add'>+	  ZC0301P Image Processors and Control Chips.</div><div class='ctx'> </div><div class='ctx'> 	  See &lt;file:Documentation/video4linux/zc0301.txt&gt; for more info.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/zc0301/Makefile b/drivers/media/video/zc0301/Makefile<br/>index d749199d8f06..d9e6d97fade6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zc0301/Makefile</a></div><div class='hunk'>@@ -1,3 +1,3 @@</div><div class='del'>-zc0301-objs     := zc0301_core.o zc0301_pas202bcb.o</div><div class='add'>+zc0301-objs     := zc0301_core.o zc0301_pb0330.o zc0301_pas202bcb.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_ZC0301)        += zc0301.o</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c<br/>index 0fad39754f7a..1b2be2d2a3ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zc0301/zc0301_core.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /***************************************************************************</div><div class='del'>- * Video4Linux2 driver for ZC0301 Image Processor and Control Chip         *</div><div class='add'>+ * Video4Linux2 driver for ZC0301[P] Image Processor and Control Chip      *</div><div class='ctx'>  *                                                                         *</div><div class='ctx'>  * Copyright (C) 2006 by Luca Risolia &lt;luca.risolia@studio.unibo.it&gt;       *</div><div class='ctx'>  *                                                                         *</div><div class='hunk'>@@ -47,13 +47,13 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#define ZC0301_MODULE_NAME    "V4L2 driver for ZC0301 "                       \</div><div class='add'>+#define ZC0301_MODULE_NAME    "V4L2 driver for ZC0301[P] "                    \</div><div class='ctx'> 			      "Image Processor and Control Chip"</div><div class='ctx'> #define ZC0301_MODULE_AUTHOR  "(C) 2006 Luca Risolia"</div><div class='ctx'> #define ZC0301_AUTHOR_EMAIL   "&lt;luca.risolia@studio.unibo.it&gt;"</div><div class='ctx'> #define ZC0301_MODULE_LICENSE "GPL"</div><div class='del'>-#define ZC0301_MODULE_VERSION "1:1.03"</div><div class='del'>-#define ZC0301_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 3)</div><div class='add'>+#define ZC0301_MODULE_VERSION "1:1.05"</div><div class='add'>+#define ZC0301_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 5)</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='hunk'>@@ -427,10 +427,11 @@ resubmit_urb:</div><div class='ctx'> static int zc0301_start_transfer(struct zc0301_device* cam)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev = cam-&gt;usbdev;</div><div class='add'>+	struct usb_host_interface* altsetting = usb_altnum_to_altsetting(</div><div class='add'>+						     usb_ifnum_to_if(udev, 0),</div><div class='add'>+						     ZC0301_ALTERNATE_SETTING);</div><div class='add'>+	const unsigned int psz = altsetting-&gt;endpoint[0].desc.wMaxPacketSize;</div><div class='ctx'> 	struct urb* urb;</div><div class='del'>-	const unsigned int wMaxPacketSize[] = {0, 128, 192, 256, 384,</div><div class='del'>-					       512, 768, 1023};</div><div class='del'>-	const unsigned int psz = wMaxPacketSize[ZC0301_ALTERNATE_SETTING];</div><div class='ctx'> 	s8 i, j;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1772,11 +1773,9 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 	case VIDIOC_G_CTRL:</div><div class='ctx'> 		return zc0301_vidioc_g_ctrl(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_S_CTRL_OLD:</div><div class='ctx'> 	case VIDIOC_S_CTRL:</div><div class='ctx'> 		return zc0301_vidioc_s_ctrl(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_CROPCAP_OLD:</div><div class='ctx'> 	case VIDIOC_CROPCAP:</div><div class='ctx'> 		return zc0301_vidioc_cropcap(cam, arg);</div><div class='ctx'> </div><div class='hunk'>@@ -1823,7 +1822,6 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,</div><div class='ctx'> 	case VIDIOC_G_PARM:</div><div class='ctx'> 		return zc0301_vidioc_g_parm(cam, arg);</div><div class='ctx'> </div><div class='del'>-	case VIDIOC_S_PARM_OLD:</div><div class='ctx'> 	case VIDIOC_S_PARM:</div><div class='ctx'> 		return zc0301_vidioc_s_parm(cam, arg);</div><div class='ctx'> </div><div class='hunk'>@@ -1914,7 +1912,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;cam-&gt;dev_mutex);</div><div class='ctx'> </div><div class='del'>-	DBG(2, "ZC0301 Image Processor and Control Chip detected "</div><div class='add'>+	DBG(2, "ZC0301[P] Image Processor and Control Chip detected "</div><div class='ctx'> 	       "(vid/pid 0x%04X/0x%04X)",id-&gt;idVendor, id-&gt;idProduct);</div><div class='ctx'> </div><div class='ctx'> 	for  (i = 0; zc0301_sensor_table[i]; i++) {</div><div class='hunk'>@@ -1936,7 +1934,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)</div><div class='ctx'> 		cam-&gt;state |= DEV_MISCONFIGURED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(cam-&gt;v4ldev-&gt;name, "ZC0301 PC Camera");</div><div class='add'>+	strcpy(cam-&gt;v4ldev-&gt;name, "ZC0301[P] PC Camera");</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;</div><div class='ctx'> 	cam-&gt;v4ldev-&gt;hardware = 0;</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_pas202bcb.c b/drivers/media/video/zc0301/zc0301_pas202bcb.c<br/>index eaadf0252049..ecfd39a56df1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_pas202bcb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_pas202bcb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_pas202bcb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zc0301/zc0301_pas202bcb.c</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> /***************************************************************************</div><div class='del'>- * Plug-in for PAS202BCB image sensor connected to the ZC030! Image        *</div><div class='add'>+ * Plug-in for PAS202BCB image sensor connected to the ZC0301[P] Image     *</div><div class='ctx'>  * Processor and Control Chip                                              *</div><div class='ctx'>  *                                                                         *</div><div class='ctx'>  * Copyright (C) 2006 by Luca Risolia &lt;luca.risolia@studio.unibo.it&gt;       *</div><div class='ctx'>  *                                                                         *</div><div class='del'>- * Initialization values of the ZC0301 have been taken from the SPCA5XX    *</div><div class='add'>+ * Initialization values of the ZC0301[P] have been taken from the SPCA5XX *</div><div class='ctx'>  * driver maintained by Michel Xhaard &lt;mxhaard@magic.fr&gt;                   *</div><div class='ctx'>  *                                                                         *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify    *</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_pb0330.c b/drivers/media/video/zc0301/zc0301_pb0330.c<br/>new file mode 100644<br/>index 000000000000..ed8542e6c50f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_pb0330.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zc0301/zc0301_pb0330.c</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+/***************************************************************************</div><div class='add'>+ * Plug-in for PB-0330 image sensor connected to the ZC0301[P] Image       *</div><div class='add'>+ * Processor and Control Chip                                              *</div><div class='add'>+ *                                                                         *</div><div class='add'>+ * Copyright (C) 2006 by Luca Risolia &lt;luca.risolia@studio.unibo.it&gt;       *</div><div class='add'>+ *                                                                         *</div><div class='add'>+ * Initialization values of the ZC0301[P] have been taken from the SPCA5XX *</div><div class='add'>+ * driver maintained by Michel Xhaard &lt;mxhaard@magic.fr&gt;                   *</div><div class='add'>+ *                                                                         *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify    *</div><div class='add'>+ * it under the terms of the GNU General Public License as published by    *</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or       *</div><div class='add'>+ * (at your option) any later version.                                     *</div><div class='add'>+ *                                                                         *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,         *</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *</div><div class='add'>+ * GNU General Public License for more details.                            *</div><div class='add'>+ *                                                                         *</div><div class='add'>+ * You should have received a copy of the GNU General Public License       *</div><div class='add'>+ * along with this program; if not, write to the Free Software             *</div><div class='add'>+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "zc0301_sensor.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct zc0301_sensor pb0330;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int pb0330_init(struct zc0301_device* cam)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0000, 0x01);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0008, 0x03);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0010, 0x0A);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0002, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0003, 0x02);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0004, 0x80);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0005, 0x01);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0006, 0xE0);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0001, 0x01);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0012, 0x05);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0012, 0x07);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0098, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x009A, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x011A, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x011C, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0012, 0x05);</div><div class='add'>+</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x01, 0x0006);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x02, 0x0011);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x03, 0x01E7);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x04, 0x0287);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x06, 0x0003);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x07, 0x3002);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x20, 0x1100);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x2F, 0xF7B0);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x30, 0x0005);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x31, 0x0000);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x34, 0x0100);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x35, 0x0060);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x3D, 0x068F);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x40, 0x01E0);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x58, 0x0078);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x62, 0x0411);</div><div class='add'>+</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0087, 0x10);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0101, 0x37);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0012, 0x05);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0100, 0x0D);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0189, 0x06);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01AD, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01C5, 0x03);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01CB, 0x13);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0250, 0x08);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0301, 0x08);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01A8, 0x60);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x018D, 0x6C);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01AD, 0x09);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01AE, 0x15);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010A, 0x50);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010B, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010C, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010D, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010E, 0x50);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010F, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0110, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0111, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0112, 0x50);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0008, 0x03);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01C6, 0x08);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01CB, 0x0F);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010A, 0x50);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010B, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010C, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010D, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010E, 0x50);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x010F, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0110, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0111, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0112, 0x50);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0180, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0019, 0x00);</div><div class='add'>+</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x05, 0x0066);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x09, 0x02B2);</div><div class='add'>+	err += zc0301_i2c_write(cam, 0x10, 0x0002);</div><div class='add'>+</div><div class='add'>+	err += zc0301_write_reg(cam, 0x011D, 0x60);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0190, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0191, 0x07);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0192, 0x8C);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0195, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0196, 0x00);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0197, 0x8A);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x018C, 0x10);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x018F, 0x20);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01A9, 0x14);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01AA, 0x24);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x001D, 0xD7);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x001E, 0xF0);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x001F, 0xF8);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0020, 0xFF);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01AD, 0x09);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x01AE, 0x15);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0180, 0x40);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0180, 0x42);</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct zc0301_sensor pb0330 = {</div><div class='add'>+	.name = "PB-0330",</div><div class='add'>+	.init = &amp;pb0330_init,</div><div class='add'>+	.cropcap = {</div><div class='add'>+		.bounds = {</div><div class='add'>+			.left = 0,</div><div class='add'>+			.top = 0,</div><div class='add'>+			.width = 640,</div><div class='add'>+			.height = 480,</div><div class='add'>+		},</div><div class='add'>+		.defrect = {</div><div class='add'>+			.left = 0,</div><div class='add'>+			.top = 0,</div><div class='add'>+			.width = 640,</div><div class='add'>+			.height = 480,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	.pix_format = {</div><div class='add'>+		.width = 640,</div><div class='add'>+		.height = 480,</div><div class='add'>+		.pixelformat = V4L2_PIX_FMT_JPEG,</div><div class='add'>+		.priv = 8,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int zc0301_probe_pb0330(struct zc0301_device* cam)</div><div class='add'>+{</div><div class='add'>+	int r0, err = 0;</div><div class='add'>+</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0000, 0x01);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0010, 0x0a);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0001, 0x01);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0012, 0x03);</div><div class='add'>+	err += zc0301_write_reg(cam, 0x0012, 0x01);</div><div class='add'>+</div><div class='add'>+	msleep(10);</div><div class='add'>+</div><div class='add'>+	r0 = zc0301_i2c_read(cam, 0x00, 2);</div><div class='add'>+</div><div class='add'>+	if (r0 &lt; 0 || err)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (r0 != 0x8243)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	zc0301_attach_sensor(cam, &amp;pb0330);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h<br/>index 1f95c28b1015..4363a915b1f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_sensor.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zc0301/zc0301_sensor.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zc0301/zc0301_sensor.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zc0301/zc0301_sensor.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /***************************************************************************</div><div class='del'>- * API for image sensors connected to the ZC030! Image Processor and       *</div><div class='add'>+ * API for image sensors connected to the ZC0301 Image Processor and       *</div><div class='ctx'>  * Control Chip                                                            *</div><div class='ctx'>  *                                                                         *</div><div class='ctx'>  * Copyright (C) 2006 by Luca Risolia &lt;luca.risolia@studio.unibo.it&gt;       *</div><div class='hunk'>@@ -35,11 +35,13 @@ struct zc0301_sensor;</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> extern int zc0301_probe_pas202bcb(struct zc0301_device* cam);</div><div class='add'>+extern int zc0301_probe_pb0330(struct zc0301_device* cam);</div><div class='ctx'> </div><div class='ctx'> #define ZC0301_SENSOR_TABLE                                                   \</div><div class='ctx'> /* Weak detections must go at the end of the list */                          \</div><div class='ctx'> static int (*zc0301_sensor_table[])(struct zc0301_device*) = {                \</div><div class='ctx'> 	&amp;zc0301_probe_pas202bcb,                                              \</div><div class='add'>+	&amp;zc0301_probe_pb0330,                                                 \</div><div class='ctx'> 	NULL,                                                                 \</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -58,14 +60,28 @@ zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor);</div><div class='ctx'> </div><div class='ctx'> #define ZC0301_ID_TABLE                                                       \</div><div class='ctx'> static const struct usb_device_id zc0301_id_table[] =  {                      \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x4017, 0xff), },                         \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x041e, 0x4017, 0xff), }, /* ICM105 */            \</div><div class='ctx'> 	{ ZC0301_USB_DEVICE(0x041e, 0x401c, 0xff), }, /* PAS106 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x041e, 0x401e, 0xff), }, /* HV7131B */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x041e, 0x401e, 0xff), }, /* HV7131 */            \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x041e, 0x401f, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x041e, 0x4022, 0xff), },                         \</div><div class='ctx'> 	{ ZC0301_USB_DEVICE(0x041e, 0x4034, 0xff), }, /* PAS106 */            \</div><div class='ctx'> 	{ ZC0301_USB_DEVICE(0x041e, 0x4035, 0xff), }, /* PAS106 */            \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202BCB */         \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x041e, 0x4036, 0xff), }, /* HV7131 */            \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x041e, 0x403a, 0xff), }, /* HV7131 */            \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x0458, 0x7007, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x0458, 0x700C, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x0458, 0x700f, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */            \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x055f, 0xd003, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x055f, 0xd004, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */            \</div><div class='ctx'> 	{ ZC0301_USB_DEVICE(0x0ac8, 0x0301, 0xff), },                         \</div><div class='del'>-	{ ZC0301_USB_DEVICE(0x10fd, 0x8050, 0xff), }, /* TAS5130D */          \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x0ac8, 0x301b, 0xff), }, /* PB-0330/HV7131 */    \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x0ac8, 0x303b, 0xff), }, /* PB-0330 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x10fd, 0x0128, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x10fd, 0x8050, 0xff), }, /* TAS5130 */           \</div><div class='add'>+	{ ZC0301_USB_DEVICE(0x10fd, 0x804e, 0xff), }, /* TAS5130 */           \</div><div class='ctx'> 	{ }                                                                   \</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h<br/>index 0166f555a5ca..ffcda95ed9d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zoran.h</a></div><div class='hunk'>@@ -159,7 +159,7 @@ Private IOCTL to set up for displaying MJPEG</div><div class='ctx'> #define BUZ_MAX_FRAME     256	/* Must be a power of 2 */</div><div class='ctx'> #define BUZ_MASK_FRAME    255	/* Must be BUZ_MAX_FRAME-1 */</div><div class='ctx'> </div><div class='del'>-#define BUZ_MAX_INPUT       8</div><div class='add'>+#define BUZ_MAX_INPUT       16</div><div class='ctx'> </div><div class='ctx'> #if VIDEO_MAX_FRAME &lt;= 32</div><div class='ctx'> #   define   V4L_MAX_FRAME   32</div><div class='hunk'>@@ -191,6 +191,9 @@ enum card_type {</div><div class='ctx'> 	/* Iomega */</div><div class='ctx'> 	BUZ,</div><div class='ctx'> </div><div class='add'>+	/* AverMedia */</div><div class='add'>+	AVS6EYES,</div><div class='add'>+</div><div class='ctx'> 	/* total number of cards */</div><div class='ctx'> 	NUM_CARDS</div><div class='ctx'> };</div><div class='hunk'>@@ -379,6 +382,9 @@ struct card_info {</div><div class='ctx'> 	/* is the /GWS line conected? */</div><div class='ctx'> 	u8 gws_not_connected;</div><div class='ctx'> </div><div class='add'>+	/* avs6eyes mux setting */</div><div class='add'>+	u8 input_mux;</div><div class='add'>+</div><div class='ctx'> 	void (*init) (struct zoran * zr);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c<br/>index 0a85c9e7fb48..f2249ed25273 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_card.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_card.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zoran_card.c</a></div><div class='hunk'>@@ -27,7 +27,8 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -38,6 +39,7 @@</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;linux/i2c-algo-bit.h&gt;</div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/sem.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='hunk'>@@ -93,6 +95,11 @@ module_param(default_input, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(default_input,</div><div class='ctx'> 		 "Default input (0=Composite, 1=S-Video, 2=Internal)");</div><div class='ctx'> </div><div class='add'>+static int default_mux = 1;	/* 6 Eyes input selection */</div><div class='add'>+module_param(default_mux, int, 0);</div><div class='add'>+MODULE_PARM_DESC(default_mux,</div><div class='add'>+		 "Default 6 Eyes mux setting (Input selection)");</div><div class='add'>+</div><div class='ctx'> static int default_norm = 0;	/* 0=PAL, 1=NTSC 2=SECAM */</div><div class='ctx'> module_param(default_norm, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)");</div><div class='hunk'>@@ -301,6 +308,30 @@ lml33_init (struct zoran *zr)</div><div class='ctx'> 	GPIO(zr, 2, 1);		// Set Composite input/output</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+avs6eyes_init (struct zoran *zr)</div><div class='add'>+{</div><div class='add'>+	// AverMedia 6-Eyes original driver by Christer Weinigel</div><div class='add'>+</div><div class='add'>+	// Lifted straight from Christer's old driver and</div><div class='add'>+	// modified slightly by Martin Samuelsson.</div><div class='add'>+</div><div class='add'>+	int mux = default_mux; /* 1 = BT866, 7 = VID1 */</div><div class='add'>+</div><div class='add'>+	GPIO(zr, 4, 1); /* Bt866 SLEEP on */</div><div class='add'>+	udelay(2);</div><div class='add'>+</div><div class='add'>+	GPIO(zr, 0, 1); /* ZR36060 /RESET on */</div><div class='add'>+	GPIO(zr, 1, 0); /* ZR36060 /SLEEP on */</div><div class='add'>+	GPIO(zr, 2, mux &amp; 1);   /* MUX S0 */</div><div class='add'>+	GPIO(zr, 3, 0); /* /FRAME on */</div><div class='add'>+	GPIO(zr, 4, 0); /* Bt866 SLEEP off */</div><div class='add'>+	GPIO(zr, 5, mux &amp; 2);   /* MUX S1 */</div><div class='add'>+	GPIO(zr, 6, 0); /* ? */</div><div class='add'>+	GPIO(zr, 7, mux &amp; 4);   /* MUX S2 */</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static char *</div><div class='ctx'> i2cid_to_modulename (u16 i2c_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -391,6 +422,14 @@ static struct tvnorm f60sqpixel_dc10 = { 780, 640, 0, 716, 525, 480, 12 };</div><div class='ctx'> static struct tvnorm f50ccir601_lm33r10 = { 864, 720, 74+54, 804, 625, 576, 18 };</div><div class='ctx'> static struct tvnorm f60ccir601_lm33r10 = { 858, 720, 56+54, 788, 525, 480, 16 };</div><div class='ctx'> </div><div class='add'>+/* FIXME: The ks0127 seem incapable of swapping U and V, too, which is why I</div><div class='add'>+ * copy Maxim's left shift hack for the 6 Eyes.</div><div class='add'>+ *</div><div class='add'>+ * Christer's driver used the unshifted norms, though...</div><div class='add'>+ * /Sam  */</div><div class='add'>+static struct tvnorm f50ccir601_avs6eyes = { 864, 720, 74, 804, 625, 576, 18 };</div><div class='add'>+static struct tvnorm f60ccir601_avs6eyes = { 858, 720, 56, 788, 525, 480, 16 };</div><div class='add'>+</div><div class='ctx'> static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.type = DC10_old,</div><div class='hunk'>@@ -419,6 +458,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { -1, 0 },</div><div class='ctx'> 		.vfe_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 0,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;dc10_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = DC10_new,</div><div class='hunk'>@@ -445,6 +485,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { -1, 1},</div><div class='ctx'> 		.vfe_pol = { 1, 1, 1, 1, 0, 0, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 0,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;dc10plus_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = DC10plus,</div><div class='hunk'>@@ -474,6 +515,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { -1, 1 },</div><div class='ctx'> 		.vfe_pol = { 1, 1, 1, 1, 0, 0, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 0,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;dc10plus_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = DC30,</div><div class='hunk'>@@ -502,6 +544,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { -1, 0 },</div><div class='ctx'> 		.vfe_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 0,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;dc10_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = DC30plus,</div><div class='hunk'>@@ -532,6 +575,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { -1, 0 },</div><div class='ctx'> 		.vfe_pol = { 0, 0, 0, 0, 0, 0, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 0,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;dc10_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = LML33,</div><div class='hunk'>@@ -558,6 +602,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { 3, 1 },</div><div class='ctx'> 		.vfe_pol = { 1, 1, 0, 0, 0, 1, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 1,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;lml33_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = LML33R10,</div><div class='hunk'>@@ -586,6 +631,7 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { 3, 1 },</div><div class='ctx'> 		.vfe_pol = { 1, 1, 0, 0, 0, 1, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 1,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;lml33_init,</div><div class='ctx'> 	}, {</div><div class='ctx'> 		.type = BUZ,</div><div class='hunk'>@@ -614,8 +660,49 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {</div><div class='ctx'> 		.gpcs = { 3, 1 },</div><div class='ctx'> 		.vfe_pol = { 1, 1, 0, 0, 0, 1, 0, 0 },</div><div class='ctx'> 		.gws_not_connected = 1,</div><div class='add'>+		.input_mux = 0,</div><div class='ctx'> 		.init = &amp;buz_init,</div><div class='add'>+	}, {</div><div class='add'>+		.type = AVS6EYES,</div><div class='add'>+		.name = "6-Eyes",</div><div class='add'>+		/* AverMedia chose not to brand the 6-Eyes. Thus it</div><div class='add'>+		   can't be autodetected, and requires card=x. */</div><div class='add'>+		.vendor_id = -1,</div><div class='add'>+		.device_id = -1,</div><div class='add'>+		.i2c_decoder = I2C_DRIVERID_KS0127,</div><div class='add'>+		.i2c_encoder = I2C_DRIVERID_BT866,</div><div class='add'>+		.video_codec = CODEC_TYPE_ZR36060,</div><div class='add'>+</div><div class='add'>+		.inputs = 10,</div><div class='add'>+		.input = {</div><div class='add'>+			{ 0, "Composite 1" },</div><div class='add'>+			{ 1, "Composite 2" },</div><div class='add'>+			{ 2, "Composite 3" },</div><div class='add'>+			{ 4, "Composite 4" },</div><div class='add'>+			{ 5, "Composite 5" },</div><div class='add'>+			{ 6, "Composite 6" },</div><div class='add'>+			{ 8, "S-Video 1" },</div><div class='add'>+			{ 9, "S-Video 2" },</div><div class='add'>+			{10, "S-Video 3" },</div><div class='add'>+			{15, "YCbCr" }</div><div class='add'>+		},</div><div class='add'>+		.norms = 2,</div><div class='add'>+		.tvn = {</div><div class='add'>+			&amp;f50ccir601_avs6eyes,</div><div class='add'>+			&amp;f60ccir601_avs6eyes,</div><div class='add'>+			NULL</div><div class='add'>+		},</div><div class='add'>+		.jpeg_int = ZR36057_ISR_GIRQ1,</div><div class='add'>+		.vsync_int = ZR36057_ISR_GIRQ0,</div><div class='add'>+		.gpio = { 1, 0, 3, -1, -1, -1, -1, -1 },// Validity unknown /Sam</div><div class='add'>+		.gpio_pol = { 0, 0, 0, 0, 0, 0, 0, 0 }, // Validity unknown /Sam</div><div class='add'>+		.gpcs = { 3, 1 },			// Validity unknown /Sam</div><div class='add'>+		.vfe_pol = { 1, 0, 0, 0, 0, 1, 0, 0 },  // Validity unknown /Sam</div><div class='add'>+		.gws_not_connected = 1,</div><div class='add'>+		.input_mux = 1,</div><div class='add'>+		.init = &amp;avs6eyes_init,</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1293,7 +1380,7 @@ find_zr36057 (void)</div><div class='ctx'> </div><div class='ctx'> 		result = request_irq(zr-&gt;pci_dev-&gt;irq,</div><div class='ctx'> 				     zoran_irq,</div><div class='del'>-				     SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+				     IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 				     ZR_DEVNAME(zr),</div><div class='ctx'> 				     (void *) zr);</div><div class='ctx'> 		if (result &lt; 0) {</div><div class='head'>diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c<br/>index c690b2ee880a..3cbac2e8aed3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_device.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zoran_device.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -536,7 +535,7 @@ zr36057_overlay (struct zoran *zr,</div><div class='ctx'> 		 * All error messages are internal driver checking only! */</div><div class='ctx'> </div><div class='ctx'> 		/* video display top and bottom registers */</div><div class='del'>-		reg = (u32) zr-&gt;buffer.base +</div><div class='add'>+		reg = (long) zr-&gt;buffer.base +</div><div class='ctx'> 		    zr-&gt;overlay_settings.x *</div><div class='ctx'> 		    ((zr-&gt;overlay_settings.format-&gt;depth + 7) / 8) +</div><div class='ctx'> 		    zr-&gt;overlay_settings.y *</div><div class='head'>diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c<br/>index b5a576a37fd2..d9a5876eb386 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zoran_driver.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -73,6 +72,7 @@</div><div class='ctx'> 			     )</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/videodev.h&gt;</div><div class='add'>+#include &lt;media/v4l2-common.h&gt;</div><div class='ctx'> #include "videocodec.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -2047,7 +2047,7 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 		dprintk(3, KERN_DEBUG "%s: VIDIOCGCAP\n", ZR_DEVNAME(zr));</div><div class='ctx'> </div><div class='ctx'> 		memset(vcap, 0, sizeof(struct video_capability));</div><div class='del'>-		strncpy(vcap-&gt;name, ZR_DEVNAME(zr), sizeof(vcap-&gt;name));</div><div class='add'>+		strncpy(vcap-&gt;name, ZR_DEVNAME(zr), sizeof(vcap-&gt;name)-1);</div><div class='ctx'> 		vcap-&gt;type = ZORAN_VID_TYPE;</div><div class='ctx'> </div><div class='ctx'> 		vcap-&gt;channels = zr-&gt;card.inputs;</div><div class='hunk'>@@ -2689,8 +2689,8 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 		dprintk(3, KERN_DEBUG "%s: VIDIOC_QUERYCAP\n", ZR_DEVNAME(zr));</div><div class='ctx'> </div><div class='ctx'> 		memset(cap, 0, sizeof(*cap));</div><div class='del'>-		strncpy(cap-&gt;card, ZR_DEVNAME(zr), sizeof(cap-&gt;card));</div><div class='del'>-		strncpy(cap-&gt;driver, "zoran", sizeof(cap-&gt;driver));</div><div class='add'>+		strncpy(cap-&gt;card, ZR_DEVNAME(zr), sizeof(cap-&gt;card)-1);</div><div class='add'>+		strncpy(cap-&gt;driver, "zoran", sizeof(cap-&gt;driver)-1);</div><div class='ctx'> 		snprintf(cap-&gt;bus_info, sizeof(cap-&gt;bus_info), "PCI:%s",</div><div class='ctx'> 			 pci_name(zr-&gt;pci_dev));</div><div class='ctx'> 		cap-&gt;version =</div><div class='hunk'>@@ -2742,7 +2742,7 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 		memset(fmt, 0, sizeof(*fmt));</div><div class='ctx'> 		fmt-&gt;index = index;</div><div class='ctx'> 		fmt-&gt;type = type;</div><div class='del'>-		strncpy(fmt-&gt;description, zoran_formats[i].name, 31);</div><div class='add'>+		strncpy(fmt-&gt;description, zoran_formats[i].name, sizeof(fmt-&gt;description)-1);</div><div class='ctx'> 		fmt-&gt;pixelformat = zoran_formats[i].fourcc;</div><div class='ctx'> 		if (zoran_formats[i].flags &amp; ZORAN_FORMAT_COMPRESSED)</div><div class='ctx'> 			fmt-&gt;flags |= V4L2_FMT_FLAG_COMPRESSED;</div><div class='hunk'>@@ -3566,16 +3566,16 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> </div><div class='ctx'> 		switch (ctrl-&gt;id) {</div><div class='ctx'> 		case V4L2_CID_BRIGHTNESS:</div><div class='del'>-			strncpy(ctrl-&gt;name, "Brightness", 31);</div><div class='add'>+			strncpy(ctrl-&gt;name, "Brightness", sizeof(ctrl-&gt;name)-1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case V4L2_CID_CONTRAST:</div><div class='del'>-			strncpy(ctrl-&gt;name, "Contrast", 31);</div><div class='add'>+			strncpy(ctrl-&gt;name, "Contrast", sizeof(ctrl-&gt;name)-1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case V4L2_CID_SATURATION:</div><div class='del'>-			strncpy(ctrl-&gt;name, "Saturation", 31);</div><div class='add'>+			strncpy(ctrl-&gt;name, "Saturation", sizeof(ctrl-&gt;name)-1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case V4L2_CID_HUE:</div><div class='del'>-			strncpy(ctrl-&gt;name, "Hue", 31);</div><div class='add'>+			strncpy(ctrl-&gt;name, "Hue", sizeof(ctrl-&gt;name)-1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3693,7 +3693,7 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 					&amp;caps);</div><div class='ctx'> 			if (caps.flags &amp; VIDEO_DECODER_AUTO) {</div><div class='ctx'> 				std-&gt;id = V4L2_STD_ALL;</div><div class='del'>-				strncpy(std-&gt;name, "Autodetect", 31);</div><div class='add'>+				strncpy(std-&gt;name, "Autodetect", sizeof(std-&gt;name)-1);</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			} else</div><div class='ctx'> 				return -EINVAL;</div><div class='hunk'>@@ -3701,21 +3701,21 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 		switch (std-&gt;index) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			std-&gt;id = V4L2_STD_PAL;</div><div class='del'>-			strncpy(std-&gt;name, "PAL", 31);</div><div class='add'>+			strncpy(std-&gt;name, "PAL", sizeof(std-&gt;name)-1);</div><div class='ctx'> 			std-&gt;frameperiod.numerator = 1;</div><div class='ctx'> 			std-&gt;frameperiod.denominator = 25;</div><div class='ctx'> 			std-&gt;framelines = zr-&gt;card.tvn[0]-&gt;Ht;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			std-&gt;id = V4L2_STD_NTSC;</div><div class='del'>-			strncpy(std-&gt;name, "NTSC", 31);</div><div class='add'>+			strncpy(std-&gt;name, "NTSC", sizeof(std-&gt;name)-1);</div><div class='ctx'> 			std-&gt;frameperiod.numerator = 1001;</div><div class='ctx'> 			std-&gt;frameperiod.denominator = 30000;</div><div class='ctx'> 			std-&gt;framelines = zr-&gt;card.tvn[1]-&gt;Ht;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			std-&gt;id = V4L2_STD_SECAM;</div><div class='del'>-			strncpy(std-&gt;name, "SECAM", 31);</div><div class='add'>+			strncpy(std-&gt;name, "SECAM", sizeof(std-&gt;name)-1);</div><div class='ctx'> 			std-&gt;frameperiod.numerator = 1;</div><div class='ctx'> 			std-&gt;frameperiod.denominator = 25;</div><div class='ctx'> 			std-&gt;framelines = zr-&gt;card.tvn[2]-&gt;Ht;</div><div class='hunk'>@@ -3871,7 +3871,7 @@ zoran_do_ioctl (struct inode *inode,</div><div class='ctx'> 		memset(outp, 0, sizeof(*outp));</div><div class='ctx'> 		outp-&gt;index = 0;</div><div class='ctx'> 		outp-&gt;type = V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY;</div><div class='del'>-		strncpy(outp-&gt;name, "Autodetect", 31);</div><div class='add'>+		strncpy(outp-&gt;name, "Autodetect", sizeof(outp-&gt;name)-1);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c<br/>index a00fae90229a..c7f6f6488360 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_procfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zoran_procfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zoran_procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zoran_procfs.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -43,6 +42,7 @@</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "videocodec.h"</div><div class='head'>diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c<br/>index 6ac3b6740089..50437383ed62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zr36120.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zr36120.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zr36120.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zr36120.c</a></div><div class='hunk'>@@ -1858,7 +1858,7 @@ int __init find_zoran(void)</div><div class='ctx'> 		DEBUG(printk(KERN_DEBUG "zoran: mapped-memory at 0x%p\n",ztv-&gt;zoran_mem));</div><div class='ctx'> </div><div class='ctx'> 		result = request_irq(dev-&gt;irq, zoran_irq,</div><div class='del'>-			SA_SHIRQ|SA_INTERRUPT,"zoran", ztv);</div><div class='add'>+			IRQF_SHARED|IRQF_DISABLED,"zoran", ztv);</div><div class='ctx'> 		if (result==-EINVAL)</div><div class='ctx'> 		{</div><div class='ctx'> 			iounmap(ztv-&gt;zoran_mem);</div><div class='head'>diff --git a/drivers/media/video/zr36120_mem.c b/drivers/media/video/zr36120_mem.c<br/>index c87113d6cc60..416eaa93b8a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/media/video/zr36120_mem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/media/video/zr36120_mem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/media/video/zr36120_mem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/media/video/zr36120_mem.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile<br/>index 51740b346224..b114236f4395 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/Makefile</a></div><div class='hunk'>@@ -33,6 +33,11 @@</div><div class='ctx'> #  For mptfc:</div><div class='ctx'> #CFLAGS_mptfc.o += -DMPT_DEBUG_FC</div><div class='ctx'> </div><div class='add'>+#  For mptsas:</div><div class='add'>+#CFLAGS_mptsas.o += -DMPT_DEBUG_SAS</div><div class='add'>+#CFLAGS_mptsas.o += -DMPT_DEBUG_SAS_WIDE</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FUSION_SPI)	+= mptbase.o mptscsih.o mptspi.o</div><div class='head'>diff --git a/drivers/message/fusion/lsi/fc_log.h b/drivers/message/fusion/lsi/fc_log.h<br/>deleted file mode 100644<br/>index dc98d46f9071..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/fc_log.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/fc_log.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) 2000-2001 LSI Logic Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- *  NAME:           fc_log.h</div><div class='del'>- *  SUMMARY:        MPI IocLogInfo definitions for the SYMFC9xx chips</div><div class='del'>- *  DESCRIPTION:    Contains the enumerated list of values that may be returned</div><div class='del'>- *                  in the IOCLogInfo field of a MPI Default Reply Message.</div><div class='del'>- *</div><div class='del'>- *  CREATION DATE:  6/02/2000</div><div class='del'>- *  ID:             $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MpiIocLogInfo_t enum</div><div class='del'>- *</div><div class='del'>- * These 32 bit values are used in the IOCLogInfo field of the MPI reply</div><div class='del'>- * messages.</div><div class='del'>- * The value is 0xabcccccc where</div><div class='del'>- *          a = The type of log info as per the MPI spec. Since these codes are</div><div class='del'>- *              all for Fibre Channel this value will always be 2.</div><div class='del'>- *          b = Specifies a subclass of the firmware where</div><div class='del'>- *                  0 = FCP Initiator</div><div class='del'>- *                  1 = FCP Target</div><div class='del'>- *                  2 = LAN</div><div class='del'>- *                  3 = MPI Message Layer</div><div class='del'>- *                  4 = FC Link</div><div class='del'>- *                  5 = Context Manager</div><div class='del'>- *                  6 = Invalid Field Offset</div><div class='del'>- *                  7 = State Change Info</div><div class='del'>- *                  all others are reserved for future use</div><div class='del'>- *          c = A specific value within the subclass.</div><div class='del'>- *</div><div class='del'>- * NOTE: Any new values should be added to the end of each subclass so that the</div><div class='del'>- *       codes remain consistent across firmware releases.</div><div class='del'>- */</div><div class='del'>-typedef enum _MpiIocLogInfoFc</div><div class='del'>-{</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_BASE                     = 0x20000000,</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 0x20000001, /* received an out of order frame - unsupported */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 0x20000002, /* Bad Rx Frame, bad start of frame primative */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME   = 0x20000003, /* Bad Rx Frame, bad end of frame primative */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN           = 0x20000004, /* Bad Rx Frame, overrun */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER           = 0x20000005, /* Other errors caught by IOC which require retries */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD       = 0x20000006, /* Main processor could not initialize sub-processor */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OVERRUN         = 0x20000007, /* Scatter Gather overrun  */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_BAD_STATUS      = 0x20000008, /* Receiver detected context mismatch via invalid header */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_UNEXPECTED_FRAME= 0x20000009, /* CtxMgr detected unsupported frame type  */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_LINK_FAILURE       = 0x2000000A, /* Link failure occurred  */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INIT_ERROR_TX_TIMEOUT         = 0x2000000B, /* Transmitter timeout error */</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_BASE                   = 0x21000000,</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_NO_PDISC               = 0x21000001, /* not sent because we are waiting for a PDISC from the initiator */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_NO_LOGIN               = 0x21000002, /* not sent because we are not logged in to the remote node */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_DOAR_KILLED_BY_LIP     = 0x21000003, /* Data Out, Auto Response, not sent due to a LIP */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_DIAR_KILLED_BY_LIP     = 0x21000004, /* Data In, Auto Response, not sent due to a LIP */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_DIAR_MISSING_DATA      = 0x21000005, /* Data In, Auto Response, missing data frames */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_DONR_KILLED_BY_LIP     = 0x21000006, /* Data Out, No Response, not sent due to a LIP */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_WRSP_KILLED_BY_LIP     = 0x21000007, /* Auto-response after a write not sent due to a LIP */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_DINR_KILLED_BY_LIP     = 0x21000008, /* Data In, No Response, not completed due to a LIP */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_DINR_MISSING_DATA      = 0x21000009, /* Data In, No Response, missing data frames */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_MRSP_KILLED_BY_LIP     = 0x2100000a, /* Manual Response not sent due to a LIP */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_NO_CLASS_3             = 0x2100000b, /* not sent because remote node does not support Class 3 */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_LOGIN_NOT_VALID        = 0x2100000c, /* not sent because login to remote node not validated */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_FROM_OUTBOUND          = 0x2100000e, /* cleared from the outbound queue after a logout */</div><div class='del'>-    MPI_IOCLOGINFO_FC_TARGET_WAITING_FOR_DATA_IN    = 0x2100000f, /* cleared waiting for data after a logout */</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_LAN_BASE                      = 0x22000000,</div><div class='del'>-    MPI_IOCLOGINFO_FC_LAN_TRANS_SGL_MISSING         = 0x22000001, /* Transaction Context Sgl Missing */</div><div class='del'>-    MPI_IOCLOGINFO_FC_LAN_TRANS_WRONG_PLACE         = 0x22000002, /* Transaction Context found before an EOB */</div><div class='del'>-    MPI_IOCLOGINFO_FC_LAN_TRANS_RES_BITS_SET        = 0x22000003, /* Transaction Context value has reserved bits set */</div><div class='del'>-    MPI_IOCLOGINFO_FC_LAN_WRONG_SGL_FLAG            = 0x22000004, /* Invalid SGL Flags */</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_MSG_BASE                      = 0x23000000,</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_LINK_BASE                     = 0x24000000,</div><div class='del'>-    MPI_IOCLOGINFO_FC_LINK_LOOP_INIT_TIMEOUT        = 0x24000001, /* Loop initialization timed out */</div><div class='del'>-    MPI_IOCLOGINFO_FC_LINK_ALREADY_INITIALIZED      = 0x24000002, /* Another system controller already initialized the loop */</div><div class='del'>-    MPI_IOCLOGINFO_FC_LINK_LINK_NOT_ESTABLISHED     = 0x24000003, /* Not synchronized to signal or still negotiating (possible cable problem) */</div><div class='del'>-    MPI_IOCLOGINFO_FC_LINK_CRC_ERROR                = 0x24000004, /* CRC check detected error on received frame */</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_CTX_BASE                      = 0x25000000,</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_INVALID_FIELD_BYTE_OFFSET     = 0x26000000, /* The lower 24 bits give the byte offset of the field in the request message that is invalid */</div><div class='del'>-    MPI_IOCLOGINFO_FC_INVALID_FIELD_MAX_OFFSET      = 0x26ffffff,</div><div class='del'>-</div><div class='del'>-    MPI_IOCLOGINFO_FC_STATE_CHANGE                  = 0x27000000  /* The lower 24 bits give additional information concerning state change */</div><div class='del'>-</div><div class='del'>-} MpiIocLogInfoFc_t;</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi.h b/drivers/message/fusion/lsi/mpi.h<br/>index 02cdc840a06b..81ad77622dac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI Message independent structures and definitions</div><div class='ctx'>  *  Creation Date:  July 27, 2000</div><div class='ctx'>  *</div><div class='del'>- *    mpi.h Version:  01.05.10</div><div class='add'>+ *    mpi.h Version:  01.05.11</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -76,6 +76,7 @@</div><div class='ctx'>  *                      Added EEDP IOCStatus codes.</div><div class='ctx'>  *  08-03-05  01.05.09  Bumped MPI_HEADER_VERSION_UNIT.</div><div class='ctx'>  *  08-30-05  01.05.10  Added 2 new IOCStatus codes for Target.</div><div class='add'>+ *  03-27-06  01.05.11  Bumped MPI_HEADER_VERSION_UNIT.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -106,7 +107,7 @@</div><div class='ctx'> /* Note: The major versions of 0xe0 through 0xff are reserved */</div><div class='ctx'> </div><div class='ctx'> /* versioning for this MPI header set */</div><div class='del'>-#define MPI_HEADER_VERSION_UNIT             (0x0C)</div><div class='add'>+#define MPI_HEADER_VERSION_UNIT             (0x0D)</div><div class='ctx'> #define MPI_HEADER_VERSION_DEV              (0x00)</div><div class='ctx'> #define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)</div><div class='ctx'> #define MPI_HEADER_VERSION_UNIT_SHIFT       (8)</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h<br/>index b1becec27e1b..47e13e360c10 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_cnfg.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_cnfg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_cnfg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_cnfg.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI Config message, structures, and Pages</div><div class='ctx'>  *  Creation Date:  July 27, 2000</div><div class='ctx'>  *</div><div class='del'>- *    mpi_cnfg.h Version:  01.05.11</div><div class='add'>+ *    mpi_cnfg.h Version:  01.05.12</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -266,6 +266,16 @@</div><div class='ctx'>  *                      Added postpone SATA Init bit to SAS IO Unit Page 1</div><div class='ctx'>  *                      ControlFlags.</div><div class='ctx'>  *                      Changed LogEntry format for Log Page 0.</div><div class='add'>+ *  03-27-06  01.05.12  Added two new Flags defines for Manufacturing Page 4.</div><div class='add'>+ *                      Added Manufacturing Page 7.</div><div class='add'>+ *                      Added MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING.</div><div class='add'>+ *                      Added IOC Page 6.</div><div class='add'>+ *                      Added PrevBootDeviceForm field to CONFIG_PAGE_BIOS_2.</div><div class='add'>+ *                      Added MaxLBAHigh field to RAID Volume Page 0.</div><div class='add'>+ *                      Added Nvdata version fields to SAS IO Unit Page 0.</div><div class='add'>+ *                      Added AdditionalControlFlags, MaxTargetPortConnectTime,</div><div class='add'>+ *                      ReportDeviceMissingDelay, and IODeviceMissingDelay</div><div class='add'>+ *                      fields to SAS IO Unit Page 1.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -631,9 +641,11 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4</div><div class='ctx'> } CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4,</div><div class='ctx'>   ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t;</div><div class='ctx'> </div><div class='del'>-#define MPI_MANUFACTURING4_PAGEVERSION                  (0x03)</div><div class='add'>+#define MPI_MANUFACTURING4_PAGEVERSION                  (0x04)</div><div class='ctx'> </div><div class='ctx'> /* defines for the Flags field */</div><div class='add'>+#define MPI_MANPAGE4_FORCE_BAD_BLOCK_TABLE              (0x80)</div><div class='add'>+#define MPI_MANPAGE4_FORCE_OFFLINE_FAILOVER             (0x40)</div><div class='ctx'> #define MPI_MANPAGE4_IME_DISABLE                        (0x20)</div><div class='ctx'> #define MPI_MANPAGE4_IM_DISABLE                         (0x10)</div><div class='ctx'> #define MPI_MANPAGE4_IS_DISABLE                         (0x08)</div><div class='hunk'>@@ -668,6 +680,66 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_6</div><div class='ctx'> #define MPI_MANUFACTURING6_PAGEVERSION                  (0x00)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+typedef struct _MPI_MANPAGE7_CONNECTOR_INFO</div><div class='add'>+{</div><div class='add'>+    U32                         Pinout;                 /* 00h */</div><div class='add'>+    U8                          Connector[16];          /* 04h */</div><div class='add'>+    U8                          Location;               /* 14h */</div><div class='add'>+    U8                          Reserved1;              /* 15h */</div><div class='add'>+    U16                         Slot;                   /* 16h */</div><div class='add'>+    U32                         Reserved2;              /* 18h */</div><div class='add'>+} MPI_MANPAGE7_CONNECTOR_INFO, MPI_POINTER PTR_MPI_MANPAGE7_CONNECTOR_INFO,</div><div class='add'>+  MpiManPage7ConnectorInfo_t, MPI_POINTER pMpiManPage7ConnectorInfo_t;</div><div class='add'>+</div><div class='add'>+/* defines for the Pinout field */</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8484_L4                 (0x00080000)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8484_L3                 (0x00040000)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8484_L2                 (0x00020000)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8484_L1                 (0x00010000)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8470_L4                 (0x00000800)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8470_L3                 (0x00000400)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8470_L2                 (0x00000200)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8470_L1                 (0x00000100)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_SFF_8482                    (0x00000002)</div><div class='add'>+#define MPI_MANPAGE7_PINOUT_CONNECTION_UNKNOWN          (0x00000001)</div><div class='add'>+</div><div class='add'>+/* defines for the Location field */</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_UNKNOWN                   (0x01)</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_INTERNAL                  (0x02)</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_EXTERNAL                  (0x04)</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_SWITCHABLE                (0x08)</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_AUTO                      (0x10)</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_NOT_PRESENT               (0x20)</div><div class='add'>+#define MPI_MANPAGE7_LOCATION_NOT_CONNECTED             (0x80)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Host code (drivers, BIOS, utilities, etc.) should leave this define set to</div><div class='add'>+ * one and check NumPhys at runtime.</div><div class='add'>+ */</div><div class='add'>+#ifndef MPI_MANPAGE7_CONNECTOR_INFO_MAX</div><div class='add'>+#define MPI_MANPAGE7_CONNECTOR_INFO_MAX   (1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef struct _CONFIG_PAGE_MANUFACTURING_7</div><div class='add'>+{</div><div class='add'>+    CONFIG_PAGE_HEADER          Header;                 /* 00h */</div><div class='add'>+    U32                         Reserved1;              /* 04h */</div><div class='add'>+    U32                         Reserved2;              /* 08h */</div><div class='add'>+    U32                         Flags;                  /* 0Ch */</div><div class='add'>+    U8                          EnclosureName[16];      /* 10h */</div><div class='add'>+    U8                          NumPhys;                /* 20h */</div><div class='add'>+    U8                          Reserved3;              /* 21h */</div><div class='add'>+    U16                         Reserved4;              /* 22h */</div><div class='add'>+    MPI_MANPAGE7_CONNECTOR_INFO ConnectorInfo[MPI_MANPAGE7_CONNECTOR_INFO_MAX]; /* 24h */</div><div class='add'>+} CONFIG_PAGE_MANUFACTURING_7, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_7,</div><div class='add'>+  ManufacturingPage7_t, MPI_POINTER pManufacturingPage7_t;</div><div class='add'>+</div><div class='add'>+#define MPI_MANUFACTURING7_PAGEVERSION                  (0x00)</div><div class='add'>+</div><div class='add'>+/* defines for the Flags field */</div><div class='add'>+#define MPI_MANPAGE7_FLAG_USE_SLOT_INFO                 (0x00000001)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> *   IO Unit Config Pages</div><div class='ctx'> ****************************************************************************/</div><div class='hunk'>@@ -867,7 +939,7 @@ typedef struct _CONFIG_PAGE_IOC_2</div><div class='ctx'> } CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,</div><div class='ctx'>   IOCPage2_t, MPI_POINTER pIOCPage2_t;</div><div class='ctx'> </div><div class='del'>-#define MPI_IOCPAGE2_PAGEVERSION                        (0x03)</div><div class='add'>+#define MPI_IOCPAGE2_PAGEVERSION                        (0x04)</div><div class='ctx'> </div><div class='ctx'> /* IOC Page 2 Capabilities flags */</div><div class='ctx'> </div><div class='hunk'>@@ -878,6 +950,7 @@ typedef struct _CONFIG_PAGE_IOC_2</div><div class='ctx'> #define MPI_IOCPAGE2_CAP_FLAGS_RAID_6_SUPPORT           (0x00000010)</div><div class='ctx'> #define MPI_IOCPAGE2_CAP_FLAGS_RAID_10_SUPPORT          (0x00000020)</div><div class='ctx'> #define MPI_IOCPAGE2_CAP_FLAGS_RAID_50_SUPPORT          (0x00000040)</div><div class='add'>+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING   (0x10000000)</div><div class='ctx'> #define MPI_IOCPAGE2_CAP_FLAGS_SES_SUPPORT              (0x20000000)</div><div class='ctx'> #define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT            (0x40000000)</div><div class='ctx'> #define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT    (0x80000000)</div><div class='hunk'>@@ -975,6 +1048,44 @@ typedef struct _CONFIG_PAGE_IOC_5</div><div class='ctx'> </div><div class='ctx'> #define MPI_IOCPAGE5_PAGEVERSION                        (0x00)</div><div class='ctx'> </div><div class='add'>+typedef struct _CONFIG_PAGE_IOC_6</div><div class='add'>+{</div><div class='add'>+    CONFIG_PAGE_HEADER          Header;                         /* 00h */</div><div class='add'>+    U32                         CapabilitiesFlags;              /* 04h */</div><div class='add'>+    U8                          MaxDrivesIS;                    /* 08h */</div><div class='add'>+    U8                          MaxDrivesIM;                    /* 09h */</div><div class='add'>+    U8                          MaxDrivesIME;                   /* 0Ah */</div><div class='add'>+    U8                          Reserved1;                      /* 0Bh */</div><div class='add'>+    U8                          MinDrivesIS;                    /* 0Ch */</div><div class='add'>+    U8                          MinDrivesIM;                    /* 0Dh */</div><div class='add'>+    U8                          MinDrivesIME;                   /* 0Eh */</div><div class='add'>+    U8                          Reserved2;                      /* 0Fh */</div><div class='add'>+    U8                          MaxGlobalHotSpares;             /* 10h */</div><div class='add'>+    U8                          Reserved3;                      /* 11h */</div><div class='add'>+    U16                         Reserved4;                      /* 12h */</div><div class='add'>+    U32                         Reserved5;                      /* 14h */</div><div class='add'>+    U32                         SupportedStripeSizeMapIS;       /* 18h */</div><div class='add'>+    U32                         SupportedStripeSizeMapIME;      /* 1Ch */</div><div class='add'>+    U32                         Reserved6;                      /* 20h */</div><div class='add'>+    U8                          MetadataSize;                   /* 24h */</div><div class='add'>+    U8                          Reserved7;                      /* 25h */</div><div class='add'>+    U16                         Reserved8;                      /* 26h */</div><div class='add'>+    U16                         MaxBadBlockTableEntries;        /* 28h */</div><div class='add'>+    U16                         Reserved9;                      /* 2Ah */</div><div class='add'>+    U16                         IRNvsramUsage;                  /* 2Ch */</div><div class='add'>+    U16                         Reserved10;                     /* 2Eh */</div><div class='add'>+    U32                         IRNvsramVersion;                /* 30h */</div><div class='add'>+    U32                         Reserved11;                     /* 34h */</div><div class='add'>+    U32                         Reserved12;                     /* 38h */</div><div class='add'>+} CONFIG_PAGE_IOC_6, MPI_POINTER PTR_CONFIG_PAGE_IOC_6,</div><div class='add'>+  IOCPage6_t, MPI_POINTER pIOCPage6_t;</div><div class='add'>+</div><div class='add'>+#define MPI_IOCPAGE6_PAGEVERSION                        (0x00)</div><div class='add'>+</div><div class='add'>+/* IOC Page 6 Capabilities Flags */</div><div class='add'>+</div><div class='add'>+#define MPI_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE         (0x00000001)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************</div><div class='ctx'> *   BIOS Config Pages</div><div class='hunk'>@@ -1218,13 +1329,13 @@ typedef struct _CONFIG_PAGE_BIOS_2</div><div class='ctx'>     U32                         Reserved5;              /* 14h */</div><div class='ctx'>     U32                         Reserved6;              /* 18h */</div><div class='ctx'>     U8                          BootDeviceForm;         /* 1Ch */</div><div class='del'>-    U8                          Reserved7;              /* 1Dh */</div><div class='add'>+    U8                          PrevBootDeviceForm;     /* 1Ch */</div><div class='ctx'>     U16                         Reserved8;              /* 1Eh */</div><div class='ctx'>     MPI_BIOSPAGE2_BOOT_DEVICE   BootDevice;             /* 20h */</div><div class='ctx'> } CONFIG_PAGE_BIOS_2, MPI_POINTER PTR_CONFIG_PAGE_BIOS_2,</div><div class='ctx'>   BIOSPage2_t, MPI_POINTER pBIOSPage2_t;</div><div class='ctx'> </div><div class='del'>-#define MPI_BIOSPAGE2_PAGEVERSION                       (0x01)</div><div class='add'>+#define MPI_BIOSPAGE2_PAGEVERSION                       (0x02)</div><div class='ctx'> </div><div class='ctx'> #define MPI_BIOSPAGE2_FORM_MASK                         (0x0F)</div><div class='ctx'> #define MPI_BIOSPAGE2_FORM_ADAPTER_ORDER                (0x00)</div><div class='hunk'>@@ -2080,7 +2191,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0</div><div class='ctx'>     RAID_VOL0_STATUS        VolumeStatus;   /* 08h */</div><div class='ctx'>     RAID_VOL0_SETTINGS      VolumeSettings; /* 0Ch */</div><div class='ctx'>     U32                     MaxLBA;         /* 10h */</div><div class='del'>-    U32                     Reserved1;      /* 14h */</div><div class='add'>+    U32                     MaxLBAHigh;     /* 14h */</div><div class='ctx'>     U32                     StripeSize;     /* 18h */</div><div class='ctx'>     U32                     Reserved2;      /* 1Ch */</div><div class='ctx'>     U32                     Reserved3;      /* 20h */</div><div class='hunk'>@@ -2092,7 +2203,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0</div><div class='ctx'> } CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,</div><div class='ctx'>   RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;</div><div class='ctx'> </div><div class='del'>-#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x05)</div><div class='add'>+#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x06)</div><div class='ctx'> </div><div class='ctx'> /* values for RAID Volume Page 0 InactiveStatus field */</div><div class='ctx'> #define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE               (0x00)</div><div class='hunk'>@@ -2324,7 +2435,8 @@ typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA</div><div class='ctx'> typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0</div><div class='ctx'> {</div><div class='ctx'>     CONFIG_EXTENDED_PAGE_HEADER     Header;                             /* 00h */</div><div class='del'>-    U32                             Reserved1;                          /* 08h */</div><div class='add'>+    U16                             NvdataVersionDefault;               /* 08h */</div><div class='add'>+    U16                             NvdataVersionPersistent;            /* 0Ah */</div><div class='ctx'>     U8                              NumPhys;                            /* 0Ch */</div><div class='ctx'>     U8                              Reserved2;                          /* 0Dh */</div><div class='ctx'>     U16                             Reserved3;                          /* 0Eh */</div><div class='hunk'>@@ -2332,7 +2444,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0</div><div class='ctx'> } CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,</div><div class='ctx'>   SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;</div><div class='ctx'> </div><div class='del'>-#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x03)</div><div class='add'>+#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x04)</div><div class='ctx'> </div><div class='ctx'> /* values for SAS IO Unit Page 0 PortFlags */</div><div class='ctx'> #define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS    (0x08)</div><div class='hunk'>@@ -2373,12 +2485,13 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0</div><div class='ctx'> </div><div class='ctx'> typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA</div><div class='ctx'> {</div><div class='del'>-    U8          Port;                   /* 00h */</div><div class='del'>-    U8          PortFlags;              /* 01h */</div><div class='del'>-    U8          PhyFlags;               /* 02h */</div><div class='del'>-    U8          MaxMinLinkRate;         /* 03h */</div><div class='del'>-    U32         ControllerPhyDeviceInfo;/* 04h */</div><div class='del'>-    U32         Reserved1;              /* 08h */</div><div class='add'>+    U8          Port;                       /* 00h */</div><div class='add'>+    U8          PortFlags;                  /* 01h */</div><div class='add'>+    U8          PhyFlags;                   /* 02h */</div><div class='add'>+    U8          MaxMinLinkRate;             /* 03h */</div><div class='add'>+    U32         ControllerPhyDeviceInfo;    /* 04h */</div><div class='add'>+    U16         MaxTargetPortConnectTime;   /* 08h */</div><div class='add'>+    U16         Reserved1;                  /* 0Ah */</div><div class='ctx'> } MPI_SAS_IO_UNIT1_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT1_PHY_DATA,</div><div class='ctx'>   SasIOUnit1PhyData, MPI_POINTER pSasIOUnit1PhyData;</div><div class='ctx'> </div><div class='hunk'>@@ -2395,15 +2508,17 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1</div><div class='ctx'>     CONFIG_EXTENDED_PAGE_HEADER Header;                             /* 00h */</div><div class='ctx'>     U16                         ControlFlags;                       /* 08h */</div><div class='ctx'>     U16                         MaxNumSATATargets;                  /* 0Ah */</div><div class='del'>-    U32                         Reserved1;                          /* 0Ch */</div><div class='add'>+    U16                         AdditionalControlFlags;             /* 0Ch */</div><div class='add'>+    U16                         Reserved1;                          /* 0Eh */</div><div class='ctx'>     U8                          NumPhys;                            /* 10h */</div><div class='ctx'>     U8                          SATAMaxQDepth;                      /* 11h */</div><div class='del'>-    U16                         Reserved2;                          /* 12h */</div><div class='add'>+    U8                          ReportDeviceMissingDelay;           /* 12h */</div><div class='add'>+    U8                          IODeviceMissingDelay;               /* 13h */</div><div class='ctx'>     MPI_SAS_IO_UNIT1_PHY_DATA   PhyData[MPI_SAS_IOUNIT1_PHY_MAX];   /* 14h */</div><div class='ctx'> } CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1,</div><div class='ctx'>   SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t;</div><div class='ctx'> </div><div class='del'>-#define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x05)</div><div class='add'>+#define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x06)</div><div class='ctx'> </div><div class='ctx'> /* values for SAS IO Unit Page 1 ControlFlags */</div><div class='ctx'> #define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST            (0x8000)</div><div class='hunk'>@@ -2428,6 +2543,13 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1</div><div class='ctx'> #define MPI_SAS_IOUNIT1_CONTROL_FIRST_LVL_DISC_ONLY         (0x0002)</div><div class='ctx'> #define MPI_SAS_IOUNIT1_CONTROL_CLEAR_AFFILIATION           (0x0001)</div><div class='ctx'> </div><div class='add'>+/* values for SAS IO Unit Page 1 AdditionalControlFlags */</div><div class='add'>+#define MPI_SAS_IOUNIT1_ACONTROL_ALLOW_TABLE_TO_TABLE       (0x0001)</div><div class='add'>+</div><div class='add'>+/* defines for SAS IO Unit Page 1 ReportDeviceMissingDelay */</div><div class='add'>+#define MPI_SAS_IOUNIT1_REPORT_MISSING_TIMEOUT_MASK         (0x7F)</div><div class='add'>+#define MPI_SAS_IOUNIT1_REPORT_MISSING_UNIT_16              (0x80)</div><div class='add'>+</div><div class='ctx'> /* values for SAS IO Unit Page 1 PortFlags */</div><div class='ctx'> #define MPI_SAS_IOUNIT1_PORT_FLAGS_0_TARGET_IOC_NUM         (0x00)</div><div class='ctx'> #define MPI_SAS_IOUNIT1_PORT_FLAGS_1_TARGET_IOC_NUM         (0x04)</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt<br/>index 4a5f8dd1d766..582cfe7c2aa1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_history.txt?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_history.txt</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_history.txt?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_history.txt</a></div><div class='hunk'>@@ -6,25 +6,25 @@</div><div class='ctx'>  Copyright (c) 2000-2005 LSI Logic Corporation.</div><div class='ctx'> </div><div class='ctx'>  ---------------------------------------</div><div class='del'>- Header Set Release Version:    01.05.12</div><div class='del'>- Header Set Release Date:       08-30-05</div><div class='add'>+ Header Set Release Version:    01.05.13</div><div class='add'>+ Header Set Release Date:       03-27-06</div><div class='ctx'>  ---------------------------------------</div><div class='ctx'> </div><div class='ctx'>  Filename               Current version     Prior version</div><div class='ctx'>  ----------             ---------------     -------------</div><div class='del'>- mpi.h                  01.05.10            01.05.09</div><div class='del'>- mpi_ioc.h              01.05.10            01.05.09</div><div class='del'>- mpi_cnfg.h             01.05.11            01.05.10</div><div class='del'>- mpi_init.h             01.05.06            01.05.06</div><div class='del'>- mpi_targ.h             01.05.05            01.05.05</div><div class='add'>+ mpi.h                  01.05.11            01.05.10</div><div class='add'>+ mpi_ioc.h              01.05.11            01.05.10</div><div class='add'>+ mpi_cnfg.h             01.05.12            01.05.11</div><div class='add'>+ mpi_init.h             01.05.07            01.05.06</div><div class='add'>+ mpi_targ.h             01.05.06            01.05.05</div><div class='ctx'>  mpi_fc.h               01.05.01            01.05.01</div><div class='ctx'>  mpi_lan.h              01.05.01            01.05.01</div><div class='ctx'>  mpi_raid.h             01.05.02            01.05.02</div><div class='ctx'>  mpi_tool.h             01.05.03            01.05.03</div><div class='ctx'>  mpi_inb.h              01.05.01            01.05.01</div><div class='del'>- mpi_sas.h              01.05.02            01.05.01</div><div class='del'>- mpi_type.h             01.05.02            01.05.01</div><div class='del'>- mpi_history.txt        01.05.12            01.05.11</div><div class='add'>+ mpi_sas.h              01.05.03            01.05.02</div><div class='add'>+ mpi_type.h             01.05.02            01.05.02</div><div class='add'>+ mpi_history.txt        01.05.13            01.05.12</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>  *  Date      Version   Description</div><div class='hunk'>@@ -93,6 +93,7 @@ mpi.h</div><div class='ctx'>  *                      Added EEDP IOCStatus codes.</div><div class='ctx'>  *  08-03-05  01.05.09  Bumped MPI_HEADER_VERSION_UNIT.</div><div class='ctx'>  *  08-30-05  01.05.10  Added 2 new IOCStatus codes for Target.</div><div class='add'>+ *  03-27-06  01.05.11  Bumped MPI_HEADER_VERSION_UNIT.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> mpi_ioc.h</div><div class='hunk'>@@ -170,6 +171,17 @@ mpi_ioc.h</div><div class='ctx'>  *                      Added new ReasonCode value for SAS Device Status Change</div><div class='ctx'>  *                      event.</div><div class='ctx'>  *                      Added new family code for FC949E.</div><div class='add'>+ *  03-27-06  01.05.11  Added MPI_IOCFACTS_CAPABILITY_TLR.</div><div class='add'>+ *                      Added additional Reason Codes and more event data fields</div><div class='add'>+ *                      to EVENT_DATA_SAS_DEVICE_STATUS_CHANGE.</div><div class='add'>+ *                      Added EVENT_DATA_SAS_BROADCAST_PRIMITIVE structure and</div><div class='add'>+ *                      new event.</div><div class='add'>+ *                      Added MPI_EVENT_SAS_SMP_ERROR and event data structure.</div><div class='add'>+ *                      Added MPI_EVENT_SAS_INIT_DEVICE_STATUS_CHANGE and event</div><div class='add'>+ *                      data structure.</div><div class='add'>+ *                      Added MPI_EVENT_SAS_INIT_TABLE_OVERFLOW and event</div><div class='add'>+ *                      data structure.</div><div class='add'>+ *                      Added MPI_EXT_IMAGE_TYPE_INITIALIZATION.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> mpi_cnfg.h</div><div class='hunk'>@@ -425,6 +437,16 @@ mpi_cnfg.h</div><div class='ctx'>  *                      Added postpone SATA Init bit to SAS IO Unit Page 1</div><div class='ctx'>  *                      ControlFlags.</div><div class='ctx'>  *                      Changed LogEntry format for Log Page 0.</div><div class='add'>+ *  03-27-06  01.05.12  Added two new Flags defines for Manufacturing Page 4.</div><div class='add'>+ *                      Added Manufacturing Page 7.</div><div class='add'>+ *                      Added MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING.</div><div class='add'>+ *                      Added IOC Page 6.</div><div class='add'>+ *                      Added PrevBootDeviceForm field to CONFIG_PAGE_BIOS_2.</div><div class='add'>+ *                      Added MaxLBAHigh field to RAID Volume Page 0.</div><div class='add'>+ *                      Added Nvdata version fields to SAS IO Unit Page 0.</div><div class='add'>+ *                      Added AdditionalControlFlags, MaxTargetPortConnectTime,</div><div class='add'>+ *                      ReportDeviceMissingDelay, and IODeviceMissingDelay</div><div class='add'>+ *                      fields to SAS IO Unit Page 1.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> mpi_init.h</div><div class='hunk'>@@ -467,6 +489,7 @@ mpi_init.h</div><div class='ctx'>  *                      Added four new defines for SEP SlotStatus.</div><div class='ctx'>  *  08-03-05  01.05.06  Fixed some MPI_SCSIIO32_MSGFLGS_ defines to make them</div><div class='ctx'>  *                      unique in the first 32 characters.</div><div class='add'>+ *  03-27-06  01.05.07  Added Task Management type of Clear ACA.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> mpi_targ.h</div><div class='hunk'>@@ -511,6 +534,7 @@ mpi_targ.h</div><div class='ctx'>  *  02-22-05  01.05.03  Changed a comment.</div><div class='ctx'>  *  03-11-05  01.05.04  Removed TargetAssistExtended Request.</div><div class='ctx'>  *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.</div><div class='add'>+ *  03-27-06  01.05.06  Added a comment.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> mpi_fc.h</div><div class='hunk'>@@ -610,6 +634,10 @@ mpi_sas.h</div><div class='ctx'>  *  08-30-05  01.05.02  Added DeviceInfo bit for SEP.</div><div class='ctx'>  *                      Added PrimFlags and Primitive field to SAS IO Unit</div><div class='ctx'>  *                      Control request, and added a new operation code.</div><div class='add'>+ *  03-27-06  01.05.03  Added Force Full Discovery, Transmit Port Select Signal,</div><div class='add'>+ *                      and Remove Device operations to SAS IO Unit Control.</div><div class='add'>+ *                      Added DevHandle field to SAS IO Unit Control request and</div><div class='add'>+ *                      reply.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> mpi_type.h</div><div class='hunk'>@@ -625,20 +653,20 @@ mpi_type.h</div><div class='ctx'> </div><div class='ctx'> mpi_history.txt         Parts list history</div><div class='ctx'> </div><div class='del'>-Filename    01.05.12  01.05.11  01.05.10  01.05.09</div><div class='del'>-----------  --------  --------  --------  --------</div><div class='del'>-mpi.h       01.05.10  01.05.09  01.05.08  01.05.07</div><div class='del'>-mpi_ioc.h   01.05.10  01.05.09  01.05.09  01.05.08</div><div class='del'>-mpi_cnfg.h  01.05.11  01.05.10  01.05.09  01.05.08</div><div class='del'>-mpi_init.h  01.05.06  01.05.06  01.05.05  01.05.04</div><div class='del'>-mpi_targ.h  01.05.05  01.05.05  01.05.05  01.05.04</div><div class='del'>-mpi_fc.h    01.05.01  01.05.01  01.05.01  01.05.01</div><div class='del'>-mpi_lan.h   01.05.01  01.05.01  01.05.01  01.05.01</div><div class='del'>-mpi_raid.h  01.05.02  01.05.02  01.05.02  01.05.02</div><div class='del'>-mpi_tool.h  01.05.03  01.05.03  01.05.03  01.05.03</div><div class='del'>-mpi_inb.h   01.05.01  01.05.01  01.05.01  01.05.01</div><div class='del'>-mpi_sas.h   01.05.02  01.05.01  01.05.01  01.05.01</div><div class='del'>-mpi_type.h  01.05.02  01.05.01  01.05.01  01.05.01</div><div class='add'>+Filename    01.05.13  01.05.12  01.05.11  01.05.10  01.05.09</div><div class='add'>+----------  --------  --------  --------  --------  --------</div><div class='add'>+mpi.h       01.05.11  01.05.10  01.05.09  01.05.08  01.05.07</div><div class='add'>+mpi_ioc.h   01.05.11  01.05.10  01.05.09  01.05.09  01.05.08</div><div class='add'>+mpi_cnfg.h  01.05.12  01.05.11  01.05.10  01.05.09  01.05.08</div><div class='add'>+mpi_init.h  01.05.07  01.05.06  01.05.06  01.05.05  01.05.04</div><div class='add'>+mpi_targ.h  01.05.06  01.05.05  01.05.05  01.05.05  01.05.04</div><div class='add'>+mpi_fc.h    01.05.01  01.05.01  01.05.01  01.05.01  01.05.01</div><div class='add'>+mpi_lan.h   01.05.01  01.05.01  01.05.01  01.05.01  01.05.01</div><div class='add'>+mpi_raid.h  01.05.02  01.05.02  01.05.02  01.05.02  01.05.02</div><div class='add'>+mpi_tool.h  01.05.03  01.05.03  01.05.03  01.05.03  01.05.03</div><div class='add'>+mpi_inb.h   01.05.01  01.05.01  01.05.01  01.05.01  01.05.01</div><div class='add'>+mpi_sas.h   01.05.03  01.05.02  01.05.01  01.05.01  01.05.01</div><div class='add'>+mpi_type.h  01.05.02  01.05.02  01.05.01  01.05.01  01.05.01</div><div class='ctx'> </div><div class='ctx'> Filename    01.05.08   01.05.07   01.05.06   01.05.05   01.05.04   01.05.03</div><div class='ctx'> ----------  --------   --------   --------   --------   --------   --------</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_init.h b/drivers/message/fusion/lsi/mpi_init.h<br/>index 68941f459ca3..c1c678989a23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_init.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_init.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI initiator mode messages and structures</div><div class='ctx'>  *  Creation Date:  June 8, 2000</div><div class='ctx'>  *</div><div class='del'>- *    mpi_init.h Version:  01.05.06</div><div class='add'>+ *    mpi_init.h Version:  01.05.07</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'>  *                      Added four new defines for SEP SlotStatus.</div><div class='ctx'>  *  08-03-05  01.05.06  Fixed some MPI_SCSIIO32_MSGFLGS_ defines to make them</div><div class='ctx'>  *                      unique in the first 32 characters.</div><div class='add'>+ *  03-27-06  01.05.07  Added Task Management type of Clear ACA.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -427,6 +428,7 @@ typedef struct _MSG_SCSI_TASK_MGMT</div><div class='ctx'> #define MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET    (0x05)</div><div class='ctx'> #define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_TASK_SET        (0x06)</div><div class='ctx'> #define MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK            (0x07)</div><div class='add'>+#define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_ACA             (0x08)</div><div class='ctx'> </div><div class='ctx'> /* MsgFlags bits */</div><div class='ctx'> #define MPI_SCSITASKMGMT_MSGFLAGS_TARGET_RESET_OPTION   (0x00)</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h<br/>index 2c5f43fa7c73..18ba407fd399 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_ioc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_ioc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_ioc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_ioc.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages</div><div class='ctx'>  *  Creation Date:  August 11, 2000</div><div class='ctx'>  *</div><div class='del'>- *    mpi_ioc.h Version:  01.05.10</div><div class='add'>+ *    mpi_ioc.h Version:  01.05.11</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -87,6 +87,17 @@</div><div class='ctx'>  *                      Added new ReasonCode value for SAS Device Status Change</div><div class='ctx'>  *                      event.</div><div class='ctx'>  *                      Added new family code for FC949E.</div><div class='add'>+ *  03-27-06  01.05.11  Added MPI_IOCFACTS_CAPABILITY_TLR.</div><div class='add'>+ *                      Added additional Reason Codes and more event data fields</div><div class='add'>+ *                      to EVENT_DATA_SAS_DEVICE_STATUS_CHANGE.</div><div class='add'>+ *                      Added EVENT_DATA_SAS_BROADCAST_PRIMITIVE structure and</div><div class='add'>+ *                      new event.</div><div class='add'>+ *                      Added MPI_EVENT_SAS_SMP_ERROR and event data structure.</div><div class='add'>+ *                      Added MPI_EVENT_SAS_INIT_DEVICE_STATUS_CHANGE and event</div><div class='add'>+ *                      data structure.</div><div class='add'>+ *                      Added MPI_EVENT_SAS_INIT_TABLE_OVERFLOW and event</div><div class='add'>+ *                      data structure.</div><div class='add'>+ *                      Added MPI_EXT_IMAGE_TYPE_INITIALIZATION.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -272,6 +283,7 @@ typedef struct _MSG_IOC_FACTS_REPLY</div><div class='ctx'> #define MPI_IOCFACTS_CAPABILITY_MULTICAST               (0x00000100)</div><div class='ctx'> #define MPI_IOCFACTS_CAPABILITY_SCSIIO32                (0x00000200)</div><div class='ctx'> #define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16             (0x00000400)</div><div class='add'>+#define MPI_IOCFACTS_CAPABILITY_TLR                     (0x00000800)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -448,30 +460,34 @@ typedef struct _MSG_EVENT_ACK_REPLY</div><div class='ctx'> </div><div class='ctx'> /* Event */</div><div class='ctx'> </div><div class='del'>-#define MPI_EVENT_NONE                      (0x00000000)</div><div class='del'>-#define MPI_EVENT_LOG_DATA                  (0x00000001)</div><div class='del'>-#define MPI_EVENT_STATE_CHANGE              (0x00000002)</div><div class='del'>-#define MPI_EVENT_UNIT_ATTENTION            (0x00000003)</div><div class='del'>-#define MPI_EVENT_IOC_BUS_RESET             (0x00000004)</div><div class='del'>-#define MPI_EVENT_EXT_BUS_RESET             (0x00000005)</div><div class='del'>-#define MPI_EVENT_RESCAN                    (0x00000006)</div><div class='del'>-#define MPI_EVENT_LINK_STATUS_CHANGE        (0x00000007)</div><div class='del'>-#define MPI_EVENT_LOOP_STATE_CHANGE         (0x00000008)</div><div class='del'>-#define MPI_EVENT_LOGOUT                    (0x00000009)</div><div class='del'>-#define MPI_EVENT_EVENT_CHANGE              (0x0000000A)</div><div class='del'>-#define MPI_EVENT_INTEGRATED_RAID           (0x0000000B)</div><div class='del'>-#define MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE (0x0000000C)</div><div class='del'>-#define MPI_EVENT_ON_BUS_TIMER_EXPIRED      (0x0000000D)</div><div class='del'>-#define MPI_EVENT_QUEUE_FULL                (0x0000000E)</div><div class='del'>-#define MPI_EVENT_SAS_DEVICE_STATUS_CHANGE  (0x0000000F)</div><div class='del'>-#define MPI_EVENT_SAS_SES                   (0x00000010)</div><div class='del'>-#define MPI_EVENT_PERSISTENT_TABLE_FULL     (0x00000011)</div><div class='del'>-#define MPI_EVENT_SAS_PHY_LINK_STATUS       (0x00000012)</div><div class='del'>-#define MPI_EVENT_SAS_DISCOVERY_ERROR       (0x00000013)</div><div class='del'>-#define MPI_EVENT_IR_RESYNC_UPDATE          (0x00000014)</div><div class='del'>-#define MPI_EVENT_IR2                       (0x00000015)</div><div class='del'>-#define MPI_EVENT_SAS_DISCOVERY             (0x00000016)</div><div class='del'>-#define MPI_EVENT_LOG_ENTRY_ADDED           (0x00000021)</div><div class='add'>+#define MPI_EVENT_NONE                          (0x00000000)</div><div class='add'>+#define MPI_EVENT_LOG_DATA                      (0x00000001)</div><div class='add'>+#define MPI_EVENT_STATE_CHANGE                  (0x00000002)</div><div class='add'>+#define MPI_EVENT_UNIT_ATTENTION                (0x00000003)</div><div class='add'>+#define MPI_EVENT_IOC_BUS_RESET                 (0x00000004)</div><div class='add'>+#define MPI_EVENT_EXT_BUS_RESET                 (0x00000005)</div><div class='add'>+#define MPI_EVENT_RESCAN                        (0x00000006)</div><div class='add'>+#define MPI_EVENT_LINK_STATUS_CHANGE            (0x00000007)</div><div class='add'>+#define MPI_EVENT_LOOP_STATE_CHANGE             (0x00000008)</div><div class='add'>+#define MPI_EVENT_LOGOUT                        (0x00000009)</div><div class='add'>+#define MPI_EVENT_EVENT_CHANGE                  (0x0000000A)</div><div class='add'>+#define MPI_EVENT_INTEGRATED_RAID               (0x0000000B)</div><div class='add'>+#define MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE     (0x0000000C)</div><div class='add'>+#define MPI_EVENT_ON_BUS_TIMER_EXPIRED          (0x0000000D)</div><div class='add'>+#define MPI_EVENT_QUEUE_FULL                    (0x0000000E)</div><div class='add'>+#define MPI_EVENT_SAS_DEVICE_STATUS_CHANGE      (0x0000000F)</div><div class='add'>+#define MPI_EVENT_SAS_SES                       (0x00000010)</div><div class='add'>+#define MPI_EVENT_PERSISTENT_TABLE_FULL         (0x00000011)</div><div class='add'>+#define MPI_EVENT_SAS_PHY_LINK_STATUS           (0x00000012)</div><div class='add'>+#define MPI_EVENT_SAS_DISCOVERY_ERROR           (0x00000013)</div><div class='add'>+#define MPI_EVENT_IR_RESYNC_UPDATE              (0x00000014)</div><div class='add'>+#define MPI_EVENT_IR2                           (0x00000015)</div><div class='add'>+#define MPI_EVENT_SAS_DISCOVERY                 (0x00000016)</div><div class='add'>+#define MPI_EVENT_SAS_BROADCAST_PRIMITIVE       (0x00000017)</div><div class='add'>+#define MPI_EVENT_SAS_INIT_DEVICE_STATUS_CHANGE (0x00000018)</div><div class='add'>+#define MPI_EVENT_SAS_INIT_TABLE_OVERFLOW       (0x00000019)</div><div class='add'>+#define MPI_EVENT_SAS_SMP_ERROR                 (0x0000001A)</div><div class='add'>+#define MPI_EVENT_LOG_ENTRY_ADDED               (0x00000021)</div><div class='ctx'> </div><div class='ctx'> /* AckRequired field values */</div><div class='ctx'> </div><div class='hunk'>@@ -558,18 +574,25 @@ typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE</div><div class='ctx'>     U8                      PhyNum;                     /* 0Eh */</div><div class='ctx'>     U8                      Reserved1;                  /* 0Fh */</div><div class='ctx'>     U64                     SASAddress;                 /* 10h */</div><div class='add'>+    U8                      LUN[8];                     /* 18h */</div><div class='add'>+    U16                     TaskTag;                    /* 20h */</div><div class='add'>+    U16                     Reserved2;                  /* 22h */</div><div class='ctx'> } EVENT_DATA_SAS_DEVICE_STATUS_CHANGE,</div><div class='ctx'>   MPI_POINTER PTR_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE,</div><div class='ctx'>   MpiEventDataSasDeviceStatusChange_t,</div><div class='ctx'>   MPI_POINTER pMpiEventDataSasDeviceStatusChange_t;</div><div class='ctx'> </div><div class='ctx'> /* MPI SAS Device Status Change Event data ReasonCode values */</div><div class='del'>-#define MPI_EVENT_SAS_DEV_STAT_RC_ADDED                 (0x03)</div><div class='del'>-#define MPI_EVENT_SAS_DEV_STAT_RC_NOT_RESPONDING        (0x04)</div><div class='del'>-#define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA            (0x05)</div><div class='del'>-#define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED      (0x06)</div><div class='del'>-#define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED           (0x07)</div><div class='del'>-#define MPI_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET (0x08)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_ADDED                     (0x03)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_NOT_RESPONDING            (0x04)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA                (0x05)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED          (0x06)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED               (0x07)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET     (0x08)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_TASK_ABORT_INTERNAL       (0x09)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_ABORT_TASK_SET_INTERNAL   (0x0A)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_CLEAR_TASK_SET_INTERNAL   (0x0B)</div><div class='add'>+#define MPI_EVENT_SAS_DEV_STAT_RC_QUERY_TASK_INTERNAL       (0x0C)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* SCSI Event data for Queue Full event */</div><div class='hunk'>@@ -742,6 +765,27 @@ typedef struct _EVENT_DATA_SAS_SES</div><div class='ctx'> } EVENT_DATA_SAS_SES, MPI_POINTER PTR_EVENT_DATA_SAS_SES,</div><div class='ctx'>   MpiEventDataSasSes_t, MPI_POINTER pMpiEventDataSasSes_t;</div><div class='ctx'> </div><div class='add'>+/* SAS Broadcast Primitive Event data */</div><div class='add'>+</div><div class='add'>+typedef struct _EVENT_DATA_SAS_BROADCAST_PRIMITIVE</div><div class='add'>+{</div><div class='add'>+    U8                      PhyNum;                     /* 00h */</div><div class='add'>+    U8                      Port;                       /* 01h */</div><div class='add'>+    U8                      PortWidth;                  /* 02h */</div><div class='add'>+    U8                      Primitive;                  /* 04h */</div><div class='add'>+} EVENT_DATA_SAS_BROADCAST_PRIMITIVE,</div><div class='add'>+  MPI_POINTER PTR_EVENT_DATA_SAS_BROADCAST_PRIMITIVE,</div><div class='add'>+  MpiEventDataSasBroadcastPrimitive_t,</div><div class='add'>+  MPI_POINTER pMpiEventDataSasBroadcastPrimitive_t;</div><div class='add'>+</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_CHANGE              (0x01)</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_EXPANDER            (0x03)</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_RESERVED2           (0x04)</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_RESERVED3           (0x05)</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_RESERVED4           (0x06)</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_CHANGE0_RESERVED    (0x07)</div><div class='add'>+#define MPI_EVENT_PRIMITIVE_CHANGE1_RESERVED    (0x08)</div><div class='add'>+</div><div class='ctx'> /* SAS Phy Link Status Event data */</div><div class='ctx'> </div><div class='ctx'> typedef struct _EVENT_DATA_SAS_PHY_LINK_STATUS</div><div class='hunk'>@@ -804,6 +848,53 @@ typedef struct _EVENT_DATA_DISCOVERY_ERROR</div><div class='ctx'> #define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_PATHS                (0x00000800)</div><div class='ctx'> #define MPI_EVENT_DSCVRY_ERR_DS_MAX_SATA_TARGETS            (0x00001000)</div><div class='ctx'> </div><div class='add'>+/* SAS SMP Error Event data */</div><div class='add'>+</div><div class='add'>+typedef struct _EVENT_DATA_SAS_SMP_ERROR</div><div class='add'>+{</div><div class='add'>+    U8                      Status;                     /* 00h */</div><div class='add'>+    U8                      Port;                       /* 01h */</div><div class='add'>+    U8                      SMPFunctionResult;          /* 02h */</div><div class='add'>+    U8                      Reserved1;                  /* 03h */</div><div class='add'>+    U64                     SASAddress;                 /* 04h */</div><div class='add'>+} EVENT_DATA_SAS_SMP_ERROR, MPI_POINTER PTR_EVENT_DATA_SAS_SMP_ERROR,</div><div class='add'>+  MpiEventDataSasSmpError_t, MPI_POINTER pMpiEventDataSasSmpError_t;</div><div class='add'>+</div><div class='add'>+/* defines for the Status field of the SAS SMP Error event */</div><div class='add'>+#define MPI_EVENT_SAS_SMP_FUNCTION_RESULT_VALID         (0x00)</div><div class='add'>+#define MPI_EVENT_SAS_SMP_CRC_ERROR                     (0x01)</div><div class='add'>+#define MPI_EVENT_SAS_SMP_TIMEOUT                       (0x02)</div><div class='add'>+#define MPI_EVENT_SAS_SMP_NO_DESTINATION                (0x03)</div><div class='add'>+#define MPI_EVENT_SAS_SMP_BAD_DESTINATION               (0x04)</div><div class='add'>+</div><div class='add'>+/* SAS Initiator Device Status Change Event data */</div><div class='add'>+</div><div class='add'>+typedef struct _EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE</div><div class='add'>+{</div><div class='add'>+    U8                      ReasonCode;                 /* 00h */</div><div class='add'>+    U8                      Port;                       /* 01h */</div><div class='add'>+    U16                     DevHandle;                  /* 02h */</div><div class='add'>+    U64                     SASAddress;                 /* 04h */</div><div class='add'>+} EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE,</div><div class='add'>+  MPI_POINTER PTR_EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE,</div><div class='add'>+  MpiEventDataSasInitDevStatusChange_t,</div><div class='add'>+  MPI_POINTER pMpiEventDataSasInitDevStatusChange_t;</div><div class='add'>+</div><div class='add'>+/* defines for the ReasonCode field of the SAS Initiator Device Status Change event */</div><div class='add'>+#define MPI_EVENT_SAS_INIT_RC_ADDED                 (0x01)</div><div class='add'>+</div><div class='add'>+/* SAS Initiator Device Table Overflow Event data */</div><div class='add'>+</div><div class='add'>+typedef struct _EVENT_DATA_SAS_INIT_TABLE_OVERFLOW</div><div class='add'>+{</div><div class='add'>+    U8                      MaxInit;                    /* 00h */</div><div class='add'>+    U8                      CurrentInit;                /* 01h */</div><div class='add'>+    U16                     Reserved1;                  /* 02h */</div><div class='add'>+} EVENT_DATA_SAS_INIT_TABLE_OVERFLOW,</div><div class='add'>+  MPI_POINTER PTR_EVENT_DATA_SAS_INIT_TABLE_OVERFLOW,</div><div class='add'>+  MpiEventDataSasInitTableOverflow_t,</div><div class='add'>+  MPI_POINTER pMpiEventDataSasInitTableOverflow_t;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'> *</div><div class='hunk'>@@ -1013,5 +1104,6 @@ typedef struct _MPI_EXT_IMAGE_HEADER</div><div class='ctx'> #define MPI_EXT_IMAGE_TYPE_FW                   (0x01)</div><div class='ctx'> #define MPI_EXT_IMAGE_TYPE_NVDATA               (0x03)</div><div class='ctx'> #define MPI_EXT_IMAGE_TYPE_BOOTLOADER           (0x04)</div><div class='add'>+#define MPI_EXT_IMAGE_TYPE_INITIALIZATION       (0x05)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h<br/>index a9c14ad132ce..871ebc08b706 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_log_sas.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_log_sas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_log_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_log_sas.h</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #ifndef IOPI_IOCLOGINFO_H_INCLUDED</div><div class='ctx'> #define IOPI_IOCLOGINFO_H_INCLUDED</div><div class='ctx'> </div><div class='add'>+#define SAS_LOGINFO_NEXUS_LOSS		0x31170000</div><div class='add'>+#define SAS_LOGINFO_MASK			0xFFFF0000</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*  IOC LOGINFO defines, 0x00000000 - 0x0FFFFFFF                            */</div><div class='hunk'>@@ -51,6 +53,9 @@</div><div class='ctx'> #define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_DNM        (0x00030500) /* Device Not Mapped */</div><div class='ctx'> #define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_PERSIST    (0x00030600) /* Persistent Page not found */</div><div class='ctx'> #define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_DEFAULT    (0x00030700) /* Default Page not found */</div><div class='add'>+</div><div class='add'>+#define IOP_LOGINFO_CODE_DIAG_MSG_ERROR                 (0x00040000) /* Error handling diag msg - or'd with diag status */</div><div class='add'>+</div><div class='ctx'> #define IOP_LOGINFO_CODE_TASK_TERMINATED                (0x00050000)</div><div class='ctx'> </div><div class='ctx'> #define IOP_LOGINFO_CODE_ENCL_MGMT_READ_ACTION_ERR0R    (0x00060001) /* Read Action not supported for SEP msg */</div><div class='hunk'>@@ -103,6 +108,7 @@</div><div class='ctx'> #define PL_LOGINFO_CODE_IO_EXECUTED                         (0x00140000)</div><div class='ctx'> #define PL_LOGINFO_CODE_PERS_RESV_OUT_NOT_AFFIL_OWNER       (0x00150000)</div><div class='ctx'> #define PL_LOGINFO_CODE_OPEN_TXDMA_ABORT                    (0x00160000)</div><div class='add'>+#define PL_LOGINFO_CODE_IO_DEVICE_MISSING_DELAY_RETRY       (0x00170000)</div><div class='ctx'> #define PL_LOGINFO_SUB_CODE_OPEN_FAILURE                    (0x00000100)</div><div class='ctx'> #define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_NO_DEST_TIMEOUT    (0x00000101)</div><div class='ctx'> #define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ORR_TIMEOUT        (0x0000011A) /* Open Reject (Retry) Timeout */</div><div class='hunk'>@@ -165,11 +171,81 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /* IR LOGINFO_CODE defines, valid if IOC_LOGINFO_ORIGINATOR = IR            */</div><div class='ctx'> /****************************************************************************/</div><div class='del'>-#define IR_LOGINFO_CODE_UNUSED1                         (0x00010000)</div><div class='del'>-#define IR_LOGINFO_CODE_UNUSED2                         (0x00020000)</div><div class='add'>+#define IR_LOGINFO_RAID_ACTION_ERROR                           (0x00010000)</div><div class='add'>+#define IR_LOGINFO_CODE_UNUSED2                                (0x00020000)</div><div class='add'>+</div><div class='add'>+/* Amount of information passed down for Create Volume is too large */</div><div class='add'>+#define IR_LOGINFO_VOLUME_CREATE_INVALID_LENGTH                (0x00010001)</div><div class='add'>+/* Creation of duplicate volume attempted (Bus/Target ID checked) */</div><div class='add'>+#define IR_LOGINFO_VOLUME_CREATE_DUPLICATE                     (0x00010002)</div><div class='add'>+/* Creation failed due to maximum number of supported volumes exceeded */</div><div class='add'>+#define IR_LOGINFO_VOLUME_CREATE_NO_SLOTS                      (0x00010003)</div><div class='add'>+/* Creation failed due to DMA error in trying to read from host */</div><div class='add'>+#define IR_LOGINFO_VOLUME_CREATE_DMA_ERROR                     (0x00010004)</div><div class='add'>+/* Creation failed due to invalid volume type passed down */</div><div class='add'>+#define IR_LOGINFO_VOLUME_CREATE_INVALID_VOLUME_TYPE           (0x00010005)</div><div class='add'>+/* Creation failed due to error reading MFG Page 4 */</div><div class='add'>+#define IR_LOGINFO_VOLUME_MFG_PAGE4_ERROR                      (0x00010006)</div><div class='add'>+/* Creation failed when trying to create internal structures */</div><div class='add'>+#define IR_LOGINFO_VOLUME_INTERNAL_CONFIG_STRUCTURE_ERROR      (0x00010007)</div><div class='add'>+</div><div class='add'>+/* Activation failed due to trying to activate an already active volume */</div><div class='add'>+#define IR_LOGINFO_VOLUME_ACTIVATING_AN_ACTIVE_VOLUME          (0x00010010)</div><div class='add'>+/* Activation failed due to trying to active unsupported volume type  */</div><div class='add'>+#define IR_LOGINFO_VOLUME_ACTIVATING_INVALID_VOLUME_TYPE       (0x00010011)</div><div class='add'>+/* Activation failed due to trying to active too many volumes  */</div><div class='add'>+#define IR_LOGINFO_VOLUME_ACTIVATING_TOO_MANY_VOLUMES          (0x00010012)</div><div class='add'>+/* Activation failed due to Volume ID in use already */</div><div class='add'>+#define IR_LOGINFO_VOLUME_ACTIVATING_VOLUME_ID_IN_USE          (0x00010013)</div><div class='add'>+/* Activation failed call to activateVolume returned failure */</div><div class='add'>+#define IR_LOGINFO_VOLUME_ACTIVATE_VOLUME_FAILED               (0x00010014)</div><div class='add'>+/* Activation failed trying to import the volume */</div><div class='add'>+#define IR_LOGINFO_VOLUME_ACTIVATING_IMPORT_VOLUME_FAILED      (0x00010015)</div><div class='add'>+</div><div class='add'>+/* Phys Disk failed, too many phys disks */</div><div class='add'>+#define IR_LOGINFO_PHYSDISK_CREATE_TOO_MANY_DISKS              (0x00010020)</div><div class='add'>+/* Amount of information passed down for Create Pnysdisk is too large */</div><div class='add'>+#define IR_LOGINFO_PHYSDISK_CREATE_INVALID_LENGTH              (0x00010021)</div><div class='add'>+/* Creation failed due to DMA error in trying to read from host */</div><div class='add'>+#define IR_LOGINFO_PHYSDISK_CREATE_DMA_ERROR                   (0x00010022)</div><div class='add'>+/* Creation failed due to invalid Bus TargetID passed down */</div><div class='add'>+#define IR_LOGINFO_PHYSDISK_CREATE_BUS_TID_INVALID             (0x00010023)</div><div class='add'>+/* Creation failed due to error in creating RAID Phys Disk Config Page */</div><div class='add'>+#define IR_LOGINFO_PHYSDISK_CREATE_CONFIG_PAGE_ERROR           (0x00010024)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Compatibility Error : IR Disabled */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED                  (0x00010030)</div><div class='add'>+/* Compatibility Error : Inquiry Comand failed */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_INQUIRY_FAILED                 (0x00010031)</div><div class='add'>+/* Compatibility Error : Device not direct access device */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_NOT_DIRECT_ACCESS              (0x00010032)</div><div class='add'>+/* Compatibility Error : Removable device found */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_REMOVABLE_FOUND                (0x00010033)</div><div class='add'>+/* Compatibility Error : Device SCSI Version not 2 or higher */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_NEED_SCSI_2_OR_HIGHER          (0x00010034)</div><div class='add'>+/* Compatibility Error : SATA device, 48 BIT LBA not supported */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_SATA_48BIT_LBA_NOT_SUPPORTED   (0x00010035)</div><div class='add'>+/* Compatibility Error : Device does not have 512 byte block sizes */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_DEVICE_NOT_512_BYTE_BLOCK      (0x00010036)</div><div class='add'>+/* Compatibility Error : Volume Type check failed */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_VOLUME_TYPE_CHECK_FAILED       (0x00010037)</div><div class='add'>+/* Compatibility Error : Volume Type is unsupported by FW */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_UNSUPPORTED_VOLUME_TYPE        (0x00010038)</div><div class='add'>+/* Compatibility Error : Disk drive too small for use in volume */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_DISK_TOO_SMALL                 (0x00010039)</div><div class='add'>+/* Compatibility Error : Phys disk for Create Volume not found */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_PHYS_DISK_NOT_FOUND            (0x0001003A)</div><div class='add'>+/* Compatibility Error : membership count error, too many or too few disks for volume type */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_MEMBERSHIP_COUNT               (0x0001003B)</div><div class='add'>+/* Compatibility Error : Disk stripe sizes must be 64KB */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_NON_64K_STRIPE_SIZE            (0x0001003C)</div><div class='add'>+/* Compatibility Error : IME size limited to &lt; 2TB */</div><div class='add'>+#define IR_LOGINFO_COMPAT_ERROR_IME_VOL_NOT_CURRENTLY_SUPPORTED (0x0001003D)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='del'>-/* Defines for convienence                                                  */</div><div class='add'>+/* Defines for convenience                                                  */</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> #define IOC_LOGINFO_PREFIX_IOP                          ((MPI_IOCLOGINFO_TYPE_SAS &lt;&lt; MPI_IOCLOGINFO_TYPE_SHIFT) | IOC_LOGINFO_ORIGINATOR_IOP)</div><div class='ctx'> #define IOC_LOGINFO_PREFIX_PL                           ((MPI_IOCLOGINFO_TYPE_SAS &lt;&lt; MPI_IOCLOGINFO_TYPE_SHIFT) | IOC_LOGINFO_ORIGINATOR_PL)</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_sas.h b/drivers/message/fusion/lsi/mpi_sas.h<br/>index 70514867bddf..50b8f0a8f456 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_sas.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_sas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_sas.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI Serial Attached SCSI structures and definitions</div><div class='ctx'>  *  Creation Date:  August 19, 2004</div><div class='ctx'>  *</div><div class='del'>- *    mpi_sas.h Version:  01.05.02</div><div class='add'>+ *    mpi_sas.h Version:  01.05.03</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -17,6 +17,10 @@</div><div class='ctx'>  *  08-30-05  01.05.02  Added DeviceInfo bit for SEP.</div><div class='ctx'>  *                      Added PrimFlags and Primitive field to SAS IO Unit</div><div class='ctx'>  *                      Control request, and added a new operation code.</div><div class='add'>+ *  03-27-06  01.05.03  Added Force Full Discovery, Transmit Port Select Signal,</div><div class='add'>+ *                      and Remove Device operations to SAS IO Unit Control.</div><div class='add'>+ *                      Added DevHandle field to SAS IO Unit Control request and</div><div class='add'>+ *                      reply.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -209,7 +213,7 @@ typedef struct _MSG_SAS_IOUNIT_CONTROL_REQUEST</div><div class='ctx'>     U8                      Reserved1;          /* 01h */</div><div class='ctx'>     U8                      ChainOffset;        /* 02h */</div><div class='ctx'>     U8                      Function;           /* 03h */</div><div class='del'>-    U16                     Reserved2;          /* 04h */</div><div class='add'>+    U16                     DevHandle;          /* 04h */</div><div class='ctx'>     U8                      Reserved3;          /* 06h */</div><div class='ctx'>     U8                      MsgFlags;           /* 07h */</div><div class='ctx'>     U32                     MsgContext;         /* 08h */</div><div class='hunk'>@@ -231,6 +235,9 @@ typedef struct _MSG_SAS_IOUNIT_CONTROL_REQUEST</div><div class='ctx'> #define MPI_SAS_OP_PHY_CLEAR_ERROR_LOG          (0x08)</div><div class='ctx'> #define MPI_SAS_OP_MAP_CURRENT                  (0x09)</div><div class='ctx'> #define MPI_SAS_OP_SEND_PRIMITIVE               (0x0A)</div><div class='add'>+#define MPI_SAS_OP_FORCE_FULL_DISCOVERY         (0x0B)</div><div class='add'>+#define MPI_SAS_OP_TRANSMIT_PORT_SELECT_SIGNAL  (0x0C)</div><div class='add'>+#define MPI_SAS_OP_TRANSMIT_REMOVE_DEVICE       (0x0D)</div><div class='ctx'> </div><div class='ctx'> /* values for the PrimFlags field */</div><div class='ctx'> #define MPI_SAS_PRIMFLAGS_SINGLE                (0x08)</div><div class='hunk'>@@ -245,7 +252,7 @@ typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY</div><div class='ctx'>     U8                      Reserved1;          /* 01h */</div><div class='ctx'>     U8                      MsgLength;          /* 02h */</div><div class='ctx'>     U8                      Function;           /* 03h */</div><div class='del'>-    U16                     Reserved2;          /* 04h */</div><div class='add'>+    U16                     DevHandle;          /* 04h */</div><div class='ctx'>     U8                      Reserved3;          /* 06h */</div><div class='ctx'>     U8                      MsgFlags;           /* 07h */</div><div class='ctx'>     U32                     MsgContext;         /* 08h */</div><div class='head'>diff --git a/drivers/message/fusion/lsi/mpi_targ.h b/drivers/message/fusion/lsi/mpi_targ.h<br/>index 3f462859ceea..20b667315773 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_targ.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/lsi/mpi_targ.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/lsi/mpi_targ.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/lsi/mpi_targ.h</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  *          Title:  MPI Target mode messages and structures</div><div class='ctx'>  *  Creation Date:  June 22, 2000</div><div class='ctx'>  *</div><div class='del'>- *    mpi_targ.h Version:  01.05.05</div><div class='add'>+ *    mpi_targ.h Version:  01.05.06</div><div class='ctx'>  *</div><div class='ctx'>  *  Version History</div><div class='ctx'>  *  ---------------</div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'>  *  02-22-05  01.05.03  Changed a comment.</div><div class='ctx'>  *  03-11-05  01.05.04  Removed TargetAssistExtended Request.</div><div class='ctx'>  *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.</div><div class='add'>+ *  03-27-06  01.05.06  Added a comment.</div><div class='ctx'>  *  --------------------------------------------------------------------------</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -351,7 +352,7 @@ typedef struct _MSG_TARGET_ASSIST_REQUEST</div><div class='ctx'> #define TARGET_ASSIST_FLAGS_CONFIRMED               (0x08)</div><div class='ctx'> #define TARGET_ASSIST_FLAGS_REPOST_CMD_BUFFER       (0x80)</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+/* Standard Target Mode Reply message */</div><div class='ctx'> typedef struct _MSG_TARGET_ERROR_REPLY</div><div class='ctx'> {</div><div class='ctx'>     U16                     Reserved;                   /* 00h */</div><div class='head'>diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c<br/>index a30084076ac8..43308df64623 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptbase.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/mptbase.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> */</div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -63,9 +62,6 @@</div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef __sparc__</div><div class='del'>-#include &lt;asm/irq.h&gt;			/* needed for __irq_itoa() proto */</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include "mptbase.h"</div><div class='ctx'> </div><div class='hunk'>@@ -372,20 +368,21 @@ static irqreturn_t</div><div class='ctx'> mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)</div><div class='ctx'> {</div><div class='ctx'> 	MPT_ADAPTER *ioc = bus_id;</div><div class='del'>-	u32 pa;</div><div class='add'>+	u32 pa = CHIPREG_READ32_dmasync(&amp;ioc-&gt;chip-&gt;ReplyFifo);</div><div class='add'>+</div><div class='add'>+	if (pa == 0xFFFFFFFF)</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Drain the reply FIFO!</div><div class='ctx'> 	 */</div><div class='del'>-	while (1) {</div><div class='del'>-		pa = CHIPREG_READ32_dmasync(&amp;ioc-&gt;chip-&gt;ReplyFifo);</div><div class='del'>-		if (pa == 0xFFFFFFFF)</div><div class='del'>-			return IRQ_HANDLED;</div><div class='del'>-		else if (pa &amp; MPI_ADDRESS_REPLY_A_BIT)</div><div class='add'>+	do {</div><div class='add'>+		if (pa &amp; MPI_ADDRESS_REPLY_A_BIT)</div><div class='ctx'> 			mpt_reply(ioc, pa);</div><div class='ctx'> 		else</div><div class='ctx'> 			mpt_turbo_reply(ioc, pa);</div><div class='del'>-	}</div><div class='add'>+		pa = CHIPREG_READ32_dmasync(&amp;ioc-&gt;chip-&gt;ReplyFifo);</div><div class='add'>+	} while (pa != 0xFFFFFFFF);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -1188,7 +1185,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	ioc-&gt;pcidev = pdev;</div><div class='ctx'> 	ioc-&gt;diagPending = 0;</div><div class='ctx'> 	spin_lock_init(&amp;ioc-&gt;diagLock);</div><div class='del'>-	spin_lock_init(&amp;ioc-&gt;fc_rescan_work_lock);</div><div class='ctx'> 	spin_lock_init(&amp;ioc-&gt;initializing_hba_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the event logging.</div><div class='hunk'>@@ -1224,31 +1220,25 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	port = psize = 0;</div><div class='ctx'> 	for (ii=0; ii &lt; DEVICE_COUNT_RESOURCE; ii++) {</div><div class='ctx'> 		if (pci_resource_flags(pdev, ii) &amp; PCI_BASE_ADDRESS_SPACE_IO) {</div><div class='add'>+			if (psize)</div><div class='add'>+				continue;</div><div class='ctx'> 			/* Get I/O space! */</div><div class='ctx'> 			port = pci_resource_start(pdev, ii);</div><div class='ctx'> 			psize = pci_resource_len(pdev,ii);</div><div class='ctx'> 		} else {</div><div class='add'>+			if (msize)</div><div class='add'>+				continue;</div><div class='ctx'> 			/* Get memmap */</div><div class='ctx'> 			mem_phys = pci_resource_start(pdev, ii);</div><div class='ctx'> 			msize = pci_resource_len(pdev,ii);</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ioc-&gt;mem_size = msize;</div><div class='ctx'> </div><div class='del'>-	if (ii == DEVICE_COUNT_RESOURCE) {</div><div class='del'>-		printk(KERN_ERR MYNAM ": ERROR - MPT adapter has no memory regions defined!\n");</div><div class='del'>-		kfree(ioc);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dinitprintk((KERN_INFO MYNAM ": MPT adapter @ %lx, msize=%dd bytes\n", mem_phys, msize));</div><div class='del'>-	dinitprintk((KERN_INFO MYNAM ": (port i/o @ %lx, psize=%dd bytes)\n", port, psize));</div><div class='del'>-</div><div class='ctx'> 	mem = NULL;</div><div class='ctx'> 	/* Get logical ptr for PciMem0 space */</div><div class='ctx'> 	/*mem = ioremap(mem_phys, msize);*/</div><div class='del'>-	mem = ioremap(mem_phys, 0x100);</div><div class='add'>+	mem = ioremap(mem_phys, msize);</div><div class='ctx'> 	if (mem == NULL) {</div><div class='ctx'> 		printk(KERN_ERR MYNAM ": ERROR - Unable to map adapter memory!\n");</div><div class='ctx'> 		kfree(ioc);</div><div class='hunk'>@@ -1348,11 +1338,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		ioc-&gt;bus_type = SAS;</div><div class='ctx'> 		ioc-&gt;errata_flag_1064 = 1;</div><div class='ctx'> 	}</div><div class='del'>-	else if (pdev-&gt;device == MPI_MANUFACTPAGE_DEVID_SAS1066) {</div><div class='del'>-		ioc-&gt;prod_name = "LSISAS1066";</div><div class='del'>-		ioc-&gt;bus_type = SAS;</div><div class='del'>-		ioc-&gt;errata_flag_1064 = 1;</div><div class='del'>-	}</div><div class='ctx'> 	else if (pdev-&gt;device == MPI_MANUFACTPAGE_DEVID_SAS1068) {</div><div class='ctx'> 		ioc-&gt;prod_name = "LSISAS1068";</div><div class='ctx'> 		ioc-&gt;bus_type = SAS;</div><div class='hunk'>@@ -1362,14 +1347,14 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		ioc-&gt;prod_name = "LSISAS1064E";</div><div class='ctx'> 		ioc-&gt;bus_type = SAS;</div><div class='ctx'> 	}</div><div class='del'>-	else if (pdev-&gt;device == MPI_MANUFACTPAGE_DEVID_SAS1066E) {</div><div class='del'>-		ioc-&gt;prod_name = "LSISAS1066E";</div><div class='del'>-		ioc-&gt;bus_type = SAS;</div><div class='del'>-	}</div><div class='ctx'> 	else if (pdev-&gt;device == MPI_MANUFACTPAGE_DEVID_SAS1068E) {</div><div class='ctx'> 		ioc-&gt;prod_name = "LSISAS1068E";</div><div class='ctx'> 		ioc-&gt;bus_type = SAS;</div><div class='ctx'> 	}</div><div class='add'>+	else if (pdev-&gt;device == MPI_MANUFACTPAGE_DEVID_SAS1078) {</div><div class='add'>+		ioc-&gt;prod_name = "LSISAS1078";</div><div class='add'>+		ioc-&gt;bus_type = SAS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ioc-&gt;errata_flag_1064)</div><div class='ctx'> 		pci_disable_io_access(pdev);</div><div class='hunk'>@@ -1386,39 +1371,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	/* Set lookup ptr. */</div><div class='ctx'> 	list_add_tail(&amp;ioc-&gt;list, &amp;ioc_list);</div><div class='ctx'> </div><div class='del'>-	ioc-&gt;pci_irq = -1;</div><div class='del'>-	if (pdev-&gt;irq) {</div><div class='del'>-		if (mpt_msi_enable &amp;&amp; !pci_enable_msi(pdev))</div><div class='del'>-			printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc-&gt;name);</div><div class='del'>-</div><div class='del'>-		r = request_irq(pdev-&gt;irq, mpt_interrupt, SA_SHIRQ, ioc-&gt;name, ioc);</div><div class='del'>-</div><div class='del'>-		if (r &lt; 0) {</div><div class='del'>-#ifndef __sparc__</div><div class='del'>-			printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n",</div><div class='del'>-					ioc-&gt;name, pdev-&gt;irq);</div><div class='del'>-#else</div><div class='del'>-			printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %s!\n",</div><div class='del'>-					ioc-&gt;name, __irq_itoa(pdev-&gt;irq));</div><div class='del'>-#endif</div><div class='del'>-			list_del(&amp;ioc-&gt;list);</div><div class='del'>-			iounmap(mem);</div><div class='del'>-			kfree(ioc);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ioc-&gt;pci_irq = pdev-&gt;irq;</div><div class='del'>-</div><div class='del'>-		pci_set_master(pdev);			/* ?? */</div><div class='del'>-		pci_set_drvdata(pdev, ioc);</div><div class='del'>-</div><div class='del'>-#ifndef __sparc__</div><div class='del'>-		dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc-&gt;name, pdev-&gt;irq));</div><div class='del'>-#else</div><div class='del'>-		dprintk((KERN_INFO MYNAM ": %s installed at interrupt %s\n", ioc-&gt;name, __irq_itoa(pdev-&gt;irq)));</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mpt_detect_bound_ports(ioc, pdev);</div><div class='hunk'>@@ -1428,11 +1380,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		printk(KERN_WARNING MYNAM</div><div class='ctx'> 		  ": WARNING - %s did not initialize properly! (%d)\n",</div><div class='ctx'> 		  ioc-&gt;name, r);</div><div class='del'>-</div><div class='ctx'> 		list_del(&amp;ioc-&gt;list);</div><div class='del'>-		free_irq(ioc-&gt;pci_irq, ioc);</div><div class='del'>-		if (mpt_msi_enable)</div><div class='del'>-			pci_disable_msi(pdev);</div><div class='ctx'> 		if (ioc-&gt;alt_ioc)</div><div class='ctx'> 			ioc-&gt;alt_ioc-&gt;alt_ioc = NULL;</div><div class='ctx'> 		iounmap(mem);</div><div class='hunk'>@@ -1651,6 +1599,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)</div><div class='ctx'> 	int	 handlers;</div><div class='ctx'> 	int	 ret = 0;</div><div class='ctx'> 	int	 reset_alt_ioc_active = 0;</div><div class='add'>+	int	 irq_allocated = 0;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO MYNAM ": Initiating %s %s\n",</div><div class='ctx'> 			ioc-&gt;name, reason==MPT_HOSTEVENT_IOC_BRINGUP ? "bringup" : "recovery");</div><div class='hunk'>@@ -1734,6 +1683,36 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Device is reset now. It must have de-asserted the interrupt line</div><div class='add'>+	 * (if it was asserted) and it should be safe to register for the</div><div class='add'>+	 * interrupt now.</div><div class='add'>+	 */</div><div class='add'>+	if ((ret == 0) &amp;&amp; (reason == MPT_HOSTEVENT_IOC_BRINGUP)) {</div><div class='add'>+		ioc-&gt;pci_irq = -1;</div><div class='add'>+		if (ioc-&gt;pcidev-&gt;irq) {</div><div class='add'>+			if (mpt_msi_enable &amp;&amp; !pci_enable_msi(ioc-&gt;pcidev))</div><div class='add'>+				printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n",</div><div class='add'>+					ioc-&gt;name);</div><div class='add'>+			rc = request_irq(ioc-&gt;pcidev-&gt;irq, mpt_interrupt,</div><div class='add'>+					IRQF_SHARED, ioc-&gt;name, ioc);</div><div class='add'>+			if (rc &lt; 0) {</div><div class='add'>+				printk(MYIOC_s_ERR_FMT "Unable to allocate "</div><div class='add'>+					"interrupt %d!\n", ioc-&gt;name,</div><div class='add'>+					ioc-&gt;pcidev-&gt;irq);</div><div class='add'>+				if (mpt_msi_enable)</div><div class='add'>+					pci_disable_msi(ioc-&gt;pcidev);</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='add'>+			irq_allocated = 1;</div><div class='add'>+			ioc-&gt;pci_irq = ioc-&gt;pcidev-&gt;irq;</div><div class='add'>+			pci_set_master(ioc-&gt;pcidev);		/* ?? */</div><div class='add'>+			pci_set_drvdata(ioc-&gt;pcidev, ioc);</div><div class='add'>+			dprintk((KERN_INFO MYNAM ": %s installed at interrupt "</div><div class='add'>+				"%d\n", ioc-&gt;name, ioc-&gt;pcidev-&gt;irq));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Prime reply &amp; request queues!</div><div class='ctx'> 	 * (mucho alloc's) Must be done prior to</div><div class='ctx'> 	 * init as upper addresses are needed for init.</div><div class='hunk'>@@ -1833,7 +1812,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)</div><div class='ctx'> 				ret = mptbase_sas_persist_operation(ioc,</div><div class='ctx'> 				    MPI_SAS_OP_CLEAR_NOT_PRESENT);</div><div class='ctx'> 				if(ret != 0)</div><div class='del'>-					return -1;</div><div class='add'>+					goto out;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Find IM volumes</div><div class='hunk'>@@ -1841,14 +1820,6 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)</div><div class='ctx'> 			mpt_findImVolumes(ioc);</div><div class='ctx'> </div><div class='ctx'> 		} else if (ioc-&gt;bus_type == FC) {</div><div class='del'>-			/*</div><div class='del'>-			 *  Pre-fetch FC port WWN and stuff...</div><div class='del'>-			 *  (FCPortPage0_t stuff)</div><div class='del'>-			 */</div><div class='del'>-			for (ii=0; ii &lt; ioc-&gt;facts.NumberOfPorts; ii++) {</div><div class='del'>-				(void) mptbase_GetFcPortPage0(ioc, ii);</div><div class='del'>-			}</div><div class='del'>-</div><div class='ctx'> 			if ((ioc-&gt;pfacts[0].ProtocolFlags &amp; MPI_PORTFACTS_PROTOCOL_LAN) &amp;&amp;</div><div class='ctx'> 			    (ioc-&gt;lan_cnfg_page0.Header.PageLength == 0)) {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -1914,6 +1885,12 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)</div><div class='ctx'> 		/* FIXME?  Examine results here? */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	if ((ret != 0) &amp;&amp; irq_allocated) {</div><div class='add'>+		free_irq(ioc-&gt;pci_irq, ioc);</div><div class='add'>+		if (mpt_msi_enable)</div><div class='add'>+			pci_disable_msi(ioc-&gt;pcidev);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2288,7 +2265,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible(1);</div><div class='add'>+			msleep(1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (1);	/* 1 msec delay */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2676,7 +2653,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)</div><div class='ctx'> 	state = mpt_GetIocState(ioc, 1);</div><div class='ctx'> 	while (state != MPI_IOC_STATE_OPERATIONAL &amp;&amp; --cntdn) {</div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible(1);</div><div class='add'>+			msleep(1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay(1);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2928,7 +2905,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, MpiFwHeader_t *pFwHeader, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 	/* wait 1 msec */</div><div class='ctx'> 	if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-		msleep_interruptible(1);</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mdelay (1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2945,7 +2922,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, MpiFwHeader_t *pFwHeader, int sleepFlag)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* wait .1 sec */</div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible (100);</div><div class='add'>+			msleep (100);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (100);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3035,7 +3012,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, MpiFwHeader_t *pFwHeader, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 		/* wait 1 msec */</div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible (1);</div><div class='add'>+			msleep (1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (1);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3083,7 +3060,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, MpiFwHeader_t *pFwHeader, int sleepFlag)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible (10);</div><div class='add'>+			msleep (10);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (10);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3134,7 +3111,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag)</div><div class='ctx'> 		SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, sleepFlag);</div><div class='ctx'> </div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible (1000);</div><div class='add'>+			msleep (1000);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (1000);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3156,7 +3133,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag)</div><div class='ctx'> 			return hard_reset_done;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible (10);</div><div class='add'>+			msleep (10);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (10);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3197,6 +3174,37 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)</div><div class='ctx'> 	u32 diag1val = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	if (ioc-&gt;pcidev-&gt;device == MPI_MANUFACTPAGE_DEVID_SAS1078) {</div><div class='add'>+		drsprintk((MYIOC_s_WARN_FMT "%s: Doorbell=%p; 1078 reset "</div><div class='add'>+			"address=%p\n",  ioc-&gt;name, __FUNCTION__,</div><div class='add'>+			&amp;ioc-&gt;chip-&gt;Doorbell, &amp;ioc-&gt;chip-&gt;Reset_1078));</div><div class='add'>+		CHIPREG_WRITE32(&amp;ioc-&gt;chip-&gt;Reset_1078, 0x07);</div><div class='add'>+		if (sleepFlag == CAN_SLEEP)</div><div class='add'>+			msleep(1);</div><div class='add'>+		else</div><div class='add'>+			mdelay(1);</div><div class='add'>+</div><div class='add'>+		for (count = 0; count &lt; 60; count ++) {</div><div class='add'>+			doorbell = CHIPREG_READ32(&amp;ioc-&gt;chip-&gt;Doorbell);</div><div class='add'>+			doorbell &amp;= MPI_IOC_STATE_MASK;</div><div class='add'>+</div><div class='add'>+			drsprintk((MYIOC_s_INFO_FMT</div><div class='add'>+				"looking for READY STATE: doorbell=%x"</div><div class='add'>+			        " count=%d\n",</div><div class='add'>+				ioc-&gt;name, doorbell, count));</div><div class='add'>+			if (doorbell == MPI_IOC_STATE_READY) {</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* wait 1 sec */</div><div class='add'>+			if (sleepFlag == CAN_SLEEP)</div><div class='add'>+				msleep(1000);</div><div class='add'>+			else</div><div class='add'>+				mdelay(1000);</div><div class='add'>+		}</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Clear any existing interrupts */</div><div class='ctx'> 	CHIPREG_WRITE32(&amp;ioc-&gt;chip-&gt;IntStatus, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -3227,7 +3235,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 			/* wait 100 msec */</div><div class='ctx'> 			if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-				msleep_interruptible (100);</div><div class='add'>+				msleep (100);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				mdelay (100);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3306,7 +3314,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 				/* wait 1 sec */</div><div class='ctx'> 				if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-					msleep_interruptible (1000);</div><div class='add'>+					msleep (1000);</div><div class='ctx'> 				} else {</div><div class='ctx'> 					mdelay (1000);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3334,7 +3342,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 				/* wait 1 sec */</div><div class='ctx'> 				if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-					msleep_interruptible (1000);</div><div class='add'>+					msleep (1000);</div><div class='ctx'> 				} else {</div><div class='ctx'> 					mdelay (1000);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3368,7 +3376,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 		/* wait 100 msec */</div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible (100);</div><div class='add'>+			msleep (100);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (100);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3462,7 +3470,7 @@ SendIocReset(MPT_ADAPTER *ioc, u8 reset_type, int sleepFlag)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (sleepFlag == CAN_SLEEP) {</div><div class='del'>-			msleep_interruptible(1);</div><div class='add'>+			msleep(1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mdelay (1);	/* 1 msec delay */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3902,7 +3910,7 @@ WaitForDoorbellAck(MPT_ADAPTER *ioc, int howlong, int sleepFlag)</div><div class='ctx'> 			intstat = CHIPREG_READ32(&amp;ioc-&gt;chip-&gt;IntStatus);</div><div class='ctx'> 			if (! (intstat &amp; MPI_HIS_IOP_DOORBELL_STATUS))</div><div class='ctx'> 				break;</div><div class='del'>-			msleep_interruptible (1);</div><div class='add'>+			msleep (1);</div><div class='ctx'> 			count++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -3951,7 +3959,7 @@ WaitForDoorbellInt(MPT_ADAPTER *ioc, int howlong, int sleepFlag)</div><div class='ctx'> 			intstat = CHIPREG_READ32(&amp;ioc-&gt;chip-&gt;IntStatus);</div><div class='ctx'> 			if (intstat &amp; MPI_HIS_DOORBELL_INTERRUPT)</div><div class='ctx'> 				break;</div><div class='del'>-			msleep_interruptible(1);</div><div class='add'>+			msleep(1);</div><div class='ctx'> 			count++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -4174,108 +4182,6 @@ GetLanConfigPages(MPT_ADAPTER *ioc)</div><div class='ctx'> </div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='ctx'> /*</div><div class='del'>- *	mptbase_GetFcPortPage0 - Fetch FCPort config Page0.</div><div class='del'>- *	@ioc: Pointer to MPT_ADAPTER structure</div><div class='del'>- *	@portnum: IOC Port number</div><div class='del'>- *</div><div class='del'>- *	Return: 0 for success</div><div class='del'>- *	-ENOMEM if no memory available</div><div class='del'>- *		-EPERM if not allowed due to ISR context</div><div class='del'>- *		-EAGAIN if no msg frames currently available</div><div class='del'>- *		-EFAULT for non-successful reply or no reply (timeout)</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)</div><div class='del'>-{</div><div class='del'>-	ConfigPageHeader_t	 hdr;</div><div class='del'>-	CONFIGPARMS		 cfg;</div><div class='del'>-	FCPortPage0_t		*ppage0_alloc;</div><div class='del'>-	FCPortPage0_t		*pp0dest;</div><div class='del'>-	dma_addr_t		 page0_dma;</div><div class='del'>-	int			 data_sz;</div><div class='del'>-	int			 copy_sz;</div><div class='del'>-	int			 rc;</div><div class='del'>-	int			 count = 400;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Get FCPort Page 0 header */</div><div class='del'>-	hdr.PageVersion = 0;</div><div class='del'>-	hdr.PageLength = 0;</div><div class='del'>-	hdr.PageNumber = 0;</div><div class='del'>-	hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;</div><div class='del'>-	cfg.cfghdr.hdr = &amp;hdr;</div><div class='del'>-	cfg.physAddr = -1;</div><div class='del'>-	cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;</div><div class='del'>-	cfg.dir = 0;</div><div class='del'>-	cfg.pageAddr = portnum;</div><div class='del'>-	cfg.timeout = 0;</div><div class='del'>-</div><div class='del'>-	if ((rc = mpt_config(ioc, &amp;cfg)) != 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	if (hdr.PageLength == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	data_sz = hdr.PageLength * 4;</div><div class='del'>-	rc = -ENOMEM;</div><div class='del'>-	ppage0_alloc = (FCPortPage0_t *) pci_alloc_consistent(ioc-&gt;pcidev, data_sz, &amp;page0_dma);</div><div class='del'>-	if (ppage0_alloc) {</div><div class='del'>-</div><div class='del'>- try_again:</div><div class='del'>-		memset((u8 *)ppage0_alloc, 0, data_sz);</div><div class='del'>-		cfg.physAddr = page0_dma;</div><div class='del'>-		cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;</div><div class='del'>-</div><div class='del'>-		if ((rc = mpt_config(ioc, &amp;cfg)) == 0) {</div><div class='del'>-			/* save the data */</div><div class='del'>-			pp0dest = &amp;ioc-&gt;fc_port_page0[portnum];</div><div class='del'>-			copy_sz = min_t(int, sizeof(FCPortPage0_t), data_sz);</div><div class='del'>-			memcpy(pp0dest, ppage0_alloc, copy_sz);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 *	Normalize endianness of structure data,</div><div class='del'>-			 *	by byte-swapping all &gt; 1 byte fields!</div><div class='del'>-			 */</div><div class='del'>-			pp0dest-&gt;Flags = le32_to_cpu(pp0dest-&gt;Flags);</div><div class='del'>-			pp0dest-&gt;PortIdentifier = le32_to_cpu(pp0dest-&gt;PortIdentifier);</div><div class='del'>-			pp0dest-&gt;WWNN.Low = le32_to_cpu(pp0dest-&gt;WWNN.Low);</div><div class='del'>-			pp0dest-&gt;WWNN.High = le32_to_cpu(pp0dest-&gt;WWNN.High);</div><div class='del'>-			pp0dest-&gt;WWPN.Low = le32_to_cpu(pp0dest-&gt;WWPN.Low);</div><div class='del'>-			pp0dest-&gt;WWPN.High = le32_to_cpu(pp0dest-&gt;WWPN.High);</div><div class='del'>-			pp0dest-&gt;SupportedServiceClass = le32_to_cpu(pp0dest-&gt;SupportedServiceClass);</div><div class='del'>-			pp0dest-&gt;SupportedSpeeds = le32_to_cpu(pp0dest-&gt;SupportedSpeeds);</div><div class='del'>-			pp0dest-&gt;CurrentSpeed = le32_to_cpu(pp0dest-&gt;CurrentSpeed);</div><div class='del'>-			pp0dest-&gt;MaxFrameSize = le32_to_cpu(pp0dest-&gt;MaxFrameSize);</div><div class='del'>-			pp0dest-&gt;FabricWWNN.Low = le32_to_cpu(pp0dest-&gt;FabricWWNN.Low);</div><div class='del'>-			pp0dest-&gt;FabricWWNN.High = le32_to_cpu(pp0dest-&gt;FabricWWNN.High);</div><div class='del'>-			pp0dest-&gt;FabricWWPN.Low = le32_to_cpu(pp0dest-&gt;FabricWWPN.Low);</div><div class='del'>-			pp0dest-&gt;FabricWWPN.High = le32_to_cpu(pp0dest-&gt;FabricWWPN.High);</div><div class='del'>-			pp0dest-&gt;DiscoveredPortsCount = le32_to_cpu(pp0dest-&gt;DiscoveredPortsCount);</div><div class='del'>-			pp0dest-&gt;MaxInitiators = le32_to_cpu(pp0dest-&gt;MaxInitiators);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * if still doing discovery,</div><div class='del'>-			 * hang loose a while until finished</div><div class='del'>-			 */</div><div class='del'>-			if (pp0dest-&gt;PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) {</div><div class='del'>-				if (count-- &gt; 0) {</div><div class='del'>-					msleep_interruptible(100);</div><div class='del'>-					goto try_again;</div><div class='del'>-				}</div><div class='del'>-				printk(MYIOC_s_INFO_FMT "Firmware discovery not"</div><div class='del'>-							" complete.\n",</div><div class='del'>-						ioc-&gt;name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pci_free_consistent(ioc-&gt;pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='del'>-/*</div><div class='ctx'>  *	mptbase_sas_persist_operation - Perform operation on SAS Persitent Table</div><div class='ctx'>  *	@ioc: Pointer to MPT_ADAPTER structure</div><div class='ctx'>  *	@sas_address: 64bit SAS Address for operation.</div><div class='hunk'>@@ -5647,11 +5553,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh</div><div class='ctx'> 			a[5], a[4], a[3], a[2], a[1], a[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifndef __sparc__</div><div class='ctx'> 	y += sprintf(buffer+len+y, ", IRQ=%d", ioc-&gt;pci_irq);</div><div class='del'>-#else</div><div class='del'>-	y += sprintf(buffer+len+y, ", IRQ=%s", __irq_itoa(ioc-&gt;pci_irq));</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!ioc-&gt;active)</div><div class='ctx'> 		y += sprintf(buffer+len+y, " (disabled)");</div><div class='hunk'>@@ -5710,7 +5612,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag)</div><div class='ctx'> </div><div class='ctx'> 	/* The SCSI driver needs to adjust timeouts on all current</div><div class='ctx'> 	 * commands prior to the diagnostic reset being issued.</div><div class='del'>-	 * Prevents timeouts occuring during a diagnostic reset...very bad.</div><div class='add'>+	 * Prevents timeouts occurring during a diagnostic reset...very bad.</div><div class='ctx'> 	 * For all other protocol drivers, this is a no-op.</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -6483,7 +6385,6 @@ EXPORT_SYMBOL(mpt_findImVolumes);</div><div class='ctx'> EXPORT_SYMBOL(mpt_alloc_fw_memory);</div><div class='ctx'> EXPORT_SYMBOL(mpt_free_fw_memory);</div><div class='ctx'> EXPORT_SYMBOL(mptbase_sas_persist_operation);</div><div class='del'>-EXPORT_SYMBOL(mptbase_GetFcPortPage0);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='head'>diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h<br/>index f673cca507e1..a5ce10b67d02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptbase.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptbase.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/mptbase.h</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> #define MPTBASE_H_INCLUDED</div><div class='ctx'> /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -76,8 +75,8 @@</div><div class='ctx'> #define COPYRIGHT	"Copyright (c) 1999-2005 " MODULEAUTHOR</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define MPT_LINUX_VERSION_COMMON	"3.03.09"</div><div class='del'>-#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.03.09"</div><div class='add'>+#define MPT_LINUX_VERSION_COMMON	"3.04.00"</div><div class='add'>+#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.04.00"</div><div class='ctx'> #define WHAT_MAGIC_STRING		"@" "(" "#" ")"</div><div class='ctx'> </div><div class='ctx'> #define show_mptmod_ver(s,ver)  \</div><div class='hunk'>@@ -308,7 +307,8 @@ typedef struct _SYSIF_REGS</div><div class='ctx'> 	u32	HostIndex;	/* 50     Host Index register        */</div><div class='ctx'> 	u32	Reserved4[15];	/* 54-8F                             */</div><div class='ctx'> 	u32	Fubar;		/* 90     For Fubar usage            */</div><div class='del'>-	u32	Reserved5[27];	/* 94-FF                             */</div><div class='add'>+	u32     Reserved5[1050];/* 94-10F8                           */</div><div class='add'>+	u32     Reset_1078;     /* 10FC   Reset 1078                 */</div><div class='ctx'> } SYSIF_REGS;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -342,6 +342,7 @@ typedef struct _VirtTarget {</div><div class='ctx'> 	u8			 negoFlags;	/* bit field, see above */</div><div class='ctx'> 	u8			 raidVolume;	/* set, if RAID Volume */</div><div class='ctx'> 	u8			 type;		/* byte 0 of Inquiry data */</div><div class='add'>+	u8			 deleted;	/* target in process of being removed */</div><div class='ctx'> 	u32			 num_luns;</div><div class='ctx'> 	u32			 luns[8];		/* Max LUNs is 256 */</div><div class='ctx'> } VirtTarget;</div><div class='hunk'>@@ -487,6 +488,15 @@ typedef	struct _RaidCfgData {</div><div class='ctx'> 	int		 isRaid;		/* bit field, 1 if RAID */</div><div class='ctx'> }RaidCfgData;</div><div class='ctx'> </div><div class='add'>+typedef struct _FcCfgData {</div><div class='add'>+	/* will ultimately hold fc_port_page0 also */</div><div class='add'>+	struct {</div><div class='add'>+		FCPortPage1_t	*data;</div><div class='add'>+		dma_addr_t	 dma;</div><div class='add'>+		int		 pg_sz;</div><div class='add'>+	}			 fc_port_page1[2];</div><div class='add'>+} FcCfgData;</div><div class='add'>+</div><div class='ctx'> #define MPT_RPORT_INFO_FLAGS_REGISTERED	0x01	/* rport registered */</div><div class='ctx'> #define MPT_RPORT_INFO_FLAGS_MISSING	0x02	/* missing from DevPage0 scan */</div><div class='ctx'> </div><div class='hunk'>@@ -565,6 +575,7 @@ typedef struct _MPT_ADAPTER</div><div class='ctx'> 	SpiCfgData		spi_data;	/* Scsi config. data */</div><div class='ctx'> 	RaidCfgData		raid_data;	/* Raid config. data */</div><div class='ctx'> 	SasCfgData		sas_data;	/* Sas config. data */</div><div class='add'>+	FcCfgData		fc_data;	/* Fc config. data */</div><div class='ctx'> 	MPT_IOCTL		*ioctl;		/* ioctl data pointer */</div><div class='ctx'> 	struct proc_dir_entry	*ioc_dentry;</div><div class='ctx'> 	struct _MPT_ADAPTER	*alt_ioc;	/* ptr to 929 bound adapter port */</div><div class='hunk'>@@ -620,17 +631,20 @@ typedef struct _MPT_ADAPTER</div><div class='ctx'> 	struct mutex		 sas_discovery_mutex;</div><div class='ctx'> 	u8			 sas_discovery_runtime;</div><div class='ctx'> 	u8			 sas_discovery_ignore_events;</div><div class='add'>+	u16			 handle;</div><div class='ctx'> 	int			 sas_index; /* index refrencing */</div><div class='ctx'> 	MPT_SAS_MGMT		 sas_mgmt;</div><div class='ctx'> 	int			 num_ports;</div><div class='del'>-	struct work_struct	 mptscsih_persistTask;</div><div class='add'>+	struct work_struct	 sas_persist_task;</div><div class='ctx'> </div><div class='add'>+	struct work_struct	 fc_setup_reset_work;</div><div class='ctx'> 	struct list_head	 fc_rports;</div><div class='ctx'> 	spinlock_t		 fc_rescan_work_lock;</div><div class='ctx'> 	int			 fc_rescan_work_count;</div><div class='ctx'> 	struct work_struct	 fc_rescan_work;</div><div class='ctx'> 	char			 fc_rescan_work_q_name[KOBJ_NAME_LEN];</div><div class='ctx'> 	struct workqueue_struct *fc_rescan_work_q;</div><div class='add'>+	u8		port_serial_number;</div><div class='ctx'> } MPT_ADAPTER;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -882,6 +896,13 @@ typedef struct _mpt_sge {</div><div class='ctx'> #define DBG_DUMP_REQUEST_FRAME_HDR(mfp)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+// debug sas wide ports</div><div class='add'>+#ifdef MPT_DEBUG_SAS_WIDE</div><div class='add'>+#define dsaswideprintk(x) printk x</div><div class='add'>+#else</div><div class='add'>+#define dsaswideprintk(x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='ctx'> </div><div class='hunk'>@@ -1027,7 +1048,6 @@ extern void	 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);</div><div class='ctx'> extern void	 mpt_free_fw_memory(MPT_ADAPTER *ioc);</div><div class='ctx'> extern int	 mpt_findImVolumes(MPT_ADAPTER *ioc);</div><div class='ctx'> extern int	 mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);</div><div class='del'>-extern int	 mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Public data decl's...</div><div class='head'>diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c<br/>index 856487741ef4..a8f2fa985455 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptfc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptfc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptfc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/mptfc.c</a></div><div class='hunk'>@@ -132,21 +132,21 @@ static struct scsi_host_template mptfc_driver_template = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id mptfc_pci_table[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC909,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC909,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC919,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC929,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919X,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC919X,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929X,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC929X,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC939X,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC939X,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC949X,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949ES,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVICEID_FC949E,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='ctx'> 	{0}	/* Terminating entry */</div><div class='ctx'> };</div><div class='hunk'>@@ -169,13 +169,6 @@ static struct fc_function_template mptfc_transport_functions = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* FIXME! values controlling firmware RESCAN event</div><div class='del'>- * need to be set low to allow dev_loss_tmo to</div><div class='del'>- * work as expected.  Currently, firmware doesn't</div><div class='del'>- * notify driver of RESCAN event until some number</div><div class='del'>- * of seconds elapse.  This value can be set via</div><div class='del'>- * lsiutil.</div><div class='del'>- */</div><div class='ctx'> static void</div><div class='ctx'> mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)</div><div class='ctx'> {</div><div class='hunk'>@@ -312,10 +305,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	if (pp0_array)</div><div class='del'>-		kfree(pp0_array);</div><div class='del'>-	if (p0_array)</div><div class='del'>-		kfree(p0_array);</div><div class='add'>+	kfree(pp0_array);</div><div class='add'>+	kfree(p0_array);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -587,15 +578,266 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> #ifdef DMPT_DEBUG_FC</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='ctx'> 		dfcprintk ((MYIOC_s_INFO_FMT</div><div class='del'>-			"mptfc_qcmd.%d: %d:%d, mptscsih_qcmd returns non-zero.\n",</div><div class='add'>+			"mptfc_qcmd.%d: %d:%d, mptscsih_qcmd returns non-zero, (%x).\n",</div><div class='ctx'> 			((MPT_SCSI_HOST *) SCpnt-&gt;device-&gt;host-&gt;hostdata)-&gt;ioc-&gt;name,</div><div class='ctx'> 			((MPT_SCSI_HOST *) SCpnt-&gt;device-&gt;host-&gt;hostdata)-&gt;ioc-&gt;sh-&gt;host_no,</div><div class='del'>-			SCpnt-&gt;device-&gt;id,SCpnt-&gt;device-&gt;lun));</div><div class='add'>+			SCpnt-&gt;device-&gt;id,SCpnt-&gt;device-&gt;lun,err));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ *	mptfc_GetFcPortPage0 - Fetch FCPort config Page0.</div><div class='add'>+ *	@ioc: Pointer to MPT_ADAPTER structure</div><div class='add'>+ *	@portnum: IOC Port number</div><div class='add'>+ *</div><div class='add'>+ *	Return: 0 for success</div><div class='add'>+ *	-ENOMEM if no memory available</div><div class='add'>+ *		-EPERM if not allowed due to ISR context</div><div class='add'>+ *		-EAGAIN if no msg frames currently available</div><div class='add'>+ *		-EFAULT for non-successful reply or no reply (timeout)</div><div class='add'>+ *		-EINVAL portnum arg out of range (hardwired to two elements)</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)</div><div class='add'>+{</div><div class='add'>+	ConfigPageHeader_t	 hdr;</div><div class='add'>+	CONFIGPARMS		 cfg;</div><div class='add'>+	FCPortPage0_t		*ppage0_alloc;</div><div class='add'>+	FCPortPage0_t		*pp0dest;</div><div class='add'>+	dma_addr_t		 page0_dma;</div><div class='add'>+	int			 data_sz;</div><div class='add'>+	int			 copy_sz;</div><div class='add'>+	int			 rc;</div><div class='add'>+	int			 count = 400;</div><div class='add'>+</div><div class='add'>+	if (portnum &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Get FCPort Page 0 header */</div><div class='add'>+	hdr.PageVersion = 0;</div><div class='add'>+	hdr.PageLength = 0;</div><div class='add'>+	hdr.PageNumber = 0;</div><div class='add'>+	hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;</div><div class='add'>+	cfg.cfghdr.hdr = &amp;hdr;</div><div class='add'>+	cfg.physAddr = -1;</div><div class='add'>+	cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;</div><div class='add'>+	cfg.dir = 0;</div><div class='add'>+	cfg.pageAddr = portnum;</div><div class='add'>+	cfg.timeout = 0;</div><div class='add'>+</div><div class='add'>+	if ((rc = mpt_config(ioc, &amp;cfg)) != 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (hdr.PageLength == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	data_sz = hdr.PageLength * 4;</div><div class='add'>+	rc = -ENOMEM;</div><div class='add'>+	ppage0_alloc = (FCPortPage0_t *) pci_alloc_consistent(ioc-&gt;pcidev, data_sz, &amp;page0_dma);</div><div class='add'>+	if (ppage0_alloc) {</div><div class='add'>+</div><div class='add'>+ try_again:</div><div class='add'>+		memset((u8 *)ppage0_alloc, 0, data_sz);</div><div class='add'>+		cfg.physAddr = page0_dma;</div><div class='add'>+		cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;</div><div class='add'>+</div><div class='add'>+		if ((rc = mpt_config(ioc, &amp;cfg)) == 0) {</div><div class='add'>+			/* save the data */</div><div class='add'>+			pp0dest = &amp;ioc-&gt;fc_port_page0[portnum];</div><div class='add'>+			copy_sz = min_t(int, sizeof(FCPortPage0_t), data_sz);</div><div class='add'>+			memcpy(pp0dest, ppage0_alloc, copy_sz);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 *	Normalize endianness of structure data,</div><div class='add'>+			 *	by byte-swapping all &gt; 1 byte fields!</div><div class='add'>+			 */</div><div class='add'>+			pp0dest-&gt;Flags = le32_to_cpu(pp0dest-&gt;Flags);</div><div class='add'>+			pp0dest-&gt;PortIdentifier = le32_to_cpu(pp0dest-&gt;PortIdentifier);</div><div class='add'>+			pp0dest-&gt;WWNN.Low = le32_to_cpu(pp0dest-&gt;WWNN.Low);</div><div class='add'>+			pp0dest-&gt;WWNN.High = le32_to_cpu(pp0dest-&gt;WWNN.High);</div><div class='add'>+			pp0dest-&gt;WWPN.Low = le32_to_cpu(pp0dest-&gt;WWPN.Low);</div><div class='add'>+			pp0dest-&gt;WWPN.High = le32_to_cpu(pp0dest-&gt;WWPN.High);</div><div class='add'>+			pp0dest-&gt;SupportedServiceClass = le32_to_cpu(pp0dest-&gt;SupportedServiceClass);</div><div class='add'>+			pp0dest-&gt;SupportedSpeeds = le32_to_cpu(pp0dest-&gt;SupportedSpeeds);</div><div class='add'>+			pp0dest-&gt;CurrentSpeed = le32_to_cpu(pp0dest-&gt;CurrentSpeed);</div><div class='add'>+			pp0dest-&gt;MaxFrameSize = le32_to_cpu(pp0dest-&gt;MaxFrameSize);</div><div class='add'>+			pp0dest-&gt;FabricWWNN.Low = le32_to_cpu(pp0dest-&gt;FabricWWNN.Low);</div><div class='add'>+			pp0dest-&gt;FabricWWNN.High = le32_to_cpu(pp0dest-&gt;FabricWWNN.High);</div><div class='add'>+			pp0dest-&gt;FabricWWPN.Low = le32_to_cpu(pp0dest-&gt;FabricWWPN.Low);</div><div class='add'>+			pp0dest-&gt;FabricWWPN.High = le32_to_cpu(pp0dest-&gt;FabricWWPN.High);</div><div class='add'>+			pp0dest-&gt;DiscoveredPortsCount = le32_to_cpu(pp0dest-&gt;DiscoveredPortsCount);</div><div class='add'>+			pp0dest-&gt;MaxInitiators = le32_to_cpu(pp0dest-&gt;MaxInitiators);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * if still doing discovery,</div><div class='add'>+			 * hang loose a while until finished</div><div class='add'>+			 */</div><div class='add'>+			if (pp0dest-&gt;PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) {</div><div class='add'>+				if (count-- &gt; 0) {</div><div class='add'>+					msleep(100);</div><div class='add'>+					goto try_again;</div><div class='add'>+				}</div><div class='add'>+				printk(MYIOC_s_INFO_FMT "Firmware discovery not"</div><div class='add'>+							" complete.\n",</div><div class='add'>+						ioc-&gt;name);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pci_free_consistent(ioc-&gt;pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mptfc_WriteFcPortPage1(MPT_ADAPTER *ioc, int portnum)</div><div class='add'>+{</div><div class='add'>+	ConfigPageHeader_t	 hdr;</div><div class='add'>+	CONFIGPARMS		 cfg;</div><div class='add'>+	int			 rc;</div><div class='add'>+</div><div class='add'>+	if (portnum &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!(ioc-&gt;fc_data.fc_port_page1[portnum].data))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* get fcport page 1 header */</div><div class='add'>+	hdr.PageVersion = 0;</div><div class='add'>+	hdr.PageLength = 0;</div><div class='add'>+	hdr.PageNumber = 1;</div><div class='add'>+	hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;</div><div class='add'>+	cfg.cfghdr.hdr = &amp;hdr;</div><div class='add'>+	cfg.physAddr = -1;</div><div class='add'>+	cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;</div><div class='add'>+	cfg.dir = 0;</div><div class='add'>+	cfg.pageAddr = portnum;</div><div class='add'>+	cfg.timeout = 0;</div><div class='add'>+</div><div class='add'>+	if ((rc = mpt_config(ioc, &amp;cfg)) != 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (hdr.PageLength == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (hdr.PageLength*4 != ioc-&gt;fc_data.fc_port_page1[portnum].pg_sz)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cfg.physAddr = ioc-&gt;fc_data.fc_port_page1[portnum].dma;</div><div class='add'>+	cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;</div><div class='add'>+	cfg.dir = 1;</div><div class='add'>+</div><div class='add'>+	rc = mpt_config(ioc, &amp;cfg);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)</div><div class='add'>+{</div><div class='add'>+	ConfigPageHeader_t	 hdr;</div><div class='add'>+	CONFIGPARMS		 cfg;</div><div class='add'>+	FCPortPage1_t		*page1_alloc;</div><div class='add'>+	dma_addr_t		 page1_dma;</div><div class='add'>+	int			 data_sz;</div><div class='add'>+	int			 rc;</div><div class='add'>+</div><div class='add'>+	if (portnum &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* get fcport page 1 header */</div><div class='add'>+	hdr.PageVersion = 0;</div><div class='add'>+	hdr.PageLength = 0;</div><div class='add'>+	hdr.PageNumber = 1;</div><div class='add'>+	hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;</div><div class='add'>+	cfg.cfghdr.hdr = &amp;hdr;</div><div class='add'>+	cfg.physAddr = -1;</div><div class='add'>+	cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;</div><div class='add'>+	cfg.dir = 0;</div><div class='add'>+	cfg.pageAddr = portnum;</div><div class='add'>+	cfg.timeout = 0;</div><div class='add'>+</div><div class='add'>+	if ((rc = mpt_config(ioc, &amp;cfg)) != 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (hdr.PageLength == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+start_over:</div><div class='add'>+</div><div class='add'>+	if (ioc-&gt;fc_data.fc_port_page1[portnum].data == NULL) {</div><div class='add'>+		data_sz = hdr.PageLength * 4;</div><div class='add'>+		if (data_sz &lt; sizeof(FCPortPage1_t))</div><div class='add'>+			data_sz = sizeof(FCPortPage1_t);</div><div class='add'>+</div><div class='add'>+		page1_alloc = (FCPortPage1_t *) pci_alloc_consistent(ioc-&gt;pcidev,</div><div class='add'>+						data_sz,</div><div class='add'>+						&amp;page1_dma);</div><div class='add'>+		if (!page1_alloc)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		page1_alloc = ioc-&gt;fc_data.fc_port_page1[portnum].data;</div><div class='add'>+		page1_dma = ioc-&gt;fc_data.fc_port_page1[portnum].dma;</div><div class='add'>+		data_sz = ioc-&gt;fc_data.fc_port_page1[portnum].pg_sz;</div><div class='add'>+		if (hdr.PageLength * 4 &gt; data_sz) {</div><div class='add'>+			ioc-&gt;fc_data.fc_port_page1[portnum].data = NULL;</div><div class='add'>+			pci_free_consistent(ioc-&gt;pcidev, data_sz, (u8 *)</div><div class='add'>+				page1_alloc, page1_dma);</div><div class='add'>+			goto start_over;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(page1_alloc,0,data_sz);</div><div class='add'>+</div><div class='add'>+	cfg.physAddr = page1_dma;</div><div class='add'>+	cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;</div><div class='add'>+</div><div class='add'>+	if ((rc = mpt_config(ioc, &amp;cfg)) == 0) {</div><div class='add'>+		ioc-&gt;fc_data.fc_port_page1[portnum].data = page1_alloc;</div><div class='add'>+		ioc-&gt;fc_data.fc_port_page1[portnum].pg_sz = data_sz;</div><div class='add'>+		ioc-&gt;fc_data.fc_port_page1[portnum].dma = page1_dma;</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		ioc-&gt;fc_data.fc_port_page1[portnum].data = NULL;</div><div class='add'>+		pci_free_consistent(ioc-&gt;pcidev, data_sz, (u8 *)</div><div class='add'>+			page1_alloc, page1_dma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mptfc_SetFcPortPage1_defaults(MPT_ADAPTER *ioc)</div><div class='add'>+{</div><div class='add'>+	int		ii;</div><div class='add'>+	FCPortPage1_t	*pp1;</div><div class='add'>+</div><div class='add'>+	#define MPTFC_FW_DEVICE_TIMEOUT	(1)</div><div class='add'>+	#define MPTFC_FW_IO_PEND_TIMEOUT (1)</div><div class='add'>+	#define ON_FLAGS  (MPI_FCPORTPAGE1_FLAGS_IMMEDIATE_ERROR_REPLY)</div><div class='add'>+	#define OFF_FLAGS (MPI_FCPORTPAGE1_FLAGS_VERBOSE_RESCAN_EVENTS)</div><div class='add'>+</div><div class='add'>+	for (ii=0; ii&lt;ioc-&gt;facts.NumberOfPorts; ii++) {</div><div class='add'>+		if (mptfc_GetFcPortPage1(ioc, ii) != 0)</div><div class='add'>+			continue;</div><div class='add'>+		pp1 = ioc-&gt;fc_data.fc_port_page1[ii].data;</div><div class='add'>+		if ((pp1-&gt;InitiatorDeviceTimeout == MPTFC_FW_DEVICE_TIMEOUT)</div><div class='add'>+		 &amp;&amp; (pp1-&gt;InitiatorIoPendTimeout == MPTFC_FW_IO_PEND_TIMEOUT)</div><div class='add'>+		 &amp;&amp; ((pp1-&gt;Flags &amp; ON_FLAGS) == ON_FLAGS)</div><div class='add'>+		 &amp;&amp; ((pp1-&gt;Flags &amp; OFF_FLAGS) == 0))</div><div class='add'>+			continue;</div><div class='add'>+		pp1-&gt;InitiatorDeviceTimeout = MPTFC_FW_DEVICE_TIMEOUT;</div><div class='add'>+		pp1-&gt;InitiatorIoPendTimeout = MPTFC_FW_IO_PEND_TIMEOUT;</div><div class='add'>+		pp1-&gt;Flags &amp;= ~OFF_FLAGS;</div><div class='add'>+		pp1-&gt;Flags |= ON_FLAGS;</div><div class='add'>+		mptfc_WriteFcPortPage1(ioc, ii);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> mptfc_init_host_attr(MPT_ADAPTER *ioc,int portnum)</div><div class='ctx'> {</div><div class='hunk'>@@ -629,6 +871,31 @@ mptfc_init_host_attr(MPT_ADAPTER *ioc,int portnum)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+mptfc_setup_reset(void *arg)</div><div class='add'>+{</div><div class='add'>+	MPT_ADAPTER		*ioc = (MPT_ADAPTER *)arg;</div><div class='add'>+	u64			pn;</div><div class='add'>+	struct mptfc_rport_info *ri;</div><div class='add'>+</div><div class='add'>+	/* reset about to happen, delete (block) all rports */</div><div class='add'>+	list_for_each_entry(ri, &amp;ioc-&gt;fc_rports, list) {</div><div class='add'>+		if (ri-&gt;flags &amp; MPT_RPORT_INFO_FLAGS_REGISTERED) {</div><div class='add'>+			ri-&gt;flags &amp;= ~MPT_RPORT_INFO_FLAGS_REGISTERED;</div><div class='add'>+			fc_remote_port_delete(ri-&gt;rport);	/* won't sleep */</div><div class='add'>+			ri-&gt;rport = NULL;</div><div class='add'>+</div><div class='add'>+			pn = (u64)ri-&gt;pg0.WWPN.High &lt;&lt; 32 |</div><div class='add'>+			     (u64)ri-&gt;pg0.WWPN.Low;</div><div class='add'>+			dfcprintk ((MYIOC_s_INFO_FMT</div><div class='add'>+				"mptfc_setup_reset.%d: %llx deleted\n",</div><div class='add'>+				ioc-&gt;name,</div><div class='add'>+				ioc-&gt;sh-&gt;host_no,</div><div class='add'>+				(unsigned long long)pn));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> mptfc_rescan_devices(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	MPT_ADAPTER		*ioc = (MPT_ADAPTER *)arg;</div><div class='hunk'>@@ -651,7 +918,7 @@ mptfc_rescan_devices(void *arg)</div><div class='ctx'> 		 * will reregister existing rports</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (ii=0; ii &lt; ioc-&gt;facts.NumberOfPorts; ii++) {</div><div class='del'>-			(void) mptbase_GetFcPortPage0(ioc, ii);</div><div class='add'>+			(void) mptfc_GetFcPortPage0(ioc, ii);</div><div class='ctx'> 			mptfc_init_host_attr(ioc,ii);	/* refresh */</div><div class='ctx'> 			mptfc_GetFcDevPage0(ioc,ii,mptfc_register_dev);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -753,7 +1020,9 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		goto out_mptfc_probe;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;ioc-&gt;fc_rescan_work_lock);</div><div class='ctx'> 	INIT_WORK(&amp;ioc-&gt;fc_rescan_work, mptfc_rescan_devices,(void *)ioc);</div><div class='add'>+	INIT_WORK(&amp;ioc-&gt;fc_setup_reset_work, mptfc_setup_reset, (void *)ioc);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ioc-&gt;FreeQlock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -889,6 +1158,15 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		goto out_mptfc_probe;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 *  Pre-fetch FC port WWN and stuff...</div><div class='add'>+	 *  (FCPortPage0_t stuff)</div><div class='add'>+	 */</div><div class='add'>+	for (ii=0; ii &lt; ioc-&gt;facts.NumberOfPorts; ii++) {</div><div class='add'>+		(void) mptfc_GetFcPortPage0(ioc, ii);</div><div class='add'>+	}</div><div class='add'>+	mptfc_SetFcPortPage1_defaults(ioc);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * scan for rports -</div><div class='ctx'> 	 *	by doing it via the workqueue, some locking is eliminated</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -917,6 +1195,81 @@ static struct pci_driver mptfc_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mptfc_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)</div><div class='add'>+{</div><div class='add'>+	MPT_SCSI_HOST *hd;</div><div class='add'>+	u8 event = le32_to_cpu(pEvReply-&gt;Event) &amp; 0xFF;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc=1;</div><div class='add'>+</div><div class='add'>+	devtverboseprintk((MYIOC_s_INFO_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n",</div><div class='add'>+			ioc-&gt;name, event));</div><div class='add'>+</div><div class='add'>+	if (ioc-&gt;sh == NULL ||</div><div class='add'>+		((hd = (MPT_SCSI_HOST *)ioc-&gt;sh-&gt;hostdata) == NULL))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case MPI_EVENT_RESCAN:</div><div class='add'>+		spin_lock_irqsave(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='add'>+		if (ioc-&gt;fc_rescan_work_q) {</div><div class='add'>+			if (ioc-&gt;fc_rescan_work_count++ == 0) {</div><div class='add'>+				queue_work(ioc-&gt;fc_rescan_work_q,</div><div class='add'>+					   &amp;ioc-&gt;fc_rescan_work);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rc = mptscsih_event_process(ioc,pEvReply);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mptfc_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)</div><div class='add'>+{</div><div class='add'>+	int		rc;</div><div class='add'>+	unsigned long	flags;</div><div class='add'>+</div><div class='add'>+	rc = mptscsih_ioc_reset(ioc,reset_phase);</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	dtmprintk((KERN_WARNING MYNAM</div><div class='add'>+		": IOC %s_reset routed to FC host driver!\n",</div><div class='add'>+		reset_phase==MPT_IOC_SETUP_RESET ? "setup" : (</div><div class='add'>+		reset_phase==MPT_IOC_PRE_RESET ? "pre" : "post")));</div><div class='add'>+</div><div class='add'>+	if (reset_phase == MPT_IOC_SETUP_RESET) {</div><div class='add'>+		spin_lock_irqsave(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='add'>+		if (ioc-&gt;fc_rescan_work_q) {</div><div class='add'>+			queue_work(ioc-&gt;fc_rescan_work_q,</div><div class='add'>+				   &amp;ioc-&gt;fc_setup_reset_work);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	else if (reset_phase == MPT_IOC_PRE_RESET) {</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	else {	/* MPT_IOC_POST_RESET */</div><div class='add'>+		mptfc_SetFcPortPage1_defaults(ioc);</div><div class='add'>+		spin_lock_irqsave(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='add'>+		if (ioc-&gt;fc_rescan_work_q) {</div><div class='add'>+			if (ioc-&gt;fc_rescan_work_count++ == 0) {</div><div class='add'>+				queue_work(ioc-&gt;fc_rescan_work_q,</div><div class='add'>+					   &amp;ioc-&gt;fc_rescan_work);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='ctx'> /**</div><div class='ctx'>  *	mptfc_init - Register MPT adapter(s) as SCSI host(s) with</div><div class='hunk'>@@ -931,8 +1284,8 @@ mptfc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	show_mptmod_ver(my_NAME, my_VERSION);</div><div class='ctx'> </div><div class='del'>-	/* sanity check module parameter */</div><div class='del'>-	if (mptfc_dev_loss_tmo == 0)</div><div class='add'>+	/* sanity check module parameters */</div><div class='add'>+	if (mptfc_dev_loss_tmo &lt;= 0)</div><div class='ctx'> 		mptfc_dev_loss_tmo = MPTFC_DEV_LOSS_TMO;</div><div class='ctx'> </div><div class='ctx'> 	mptfc_transport_template =</div><div class='hunk'>@@ -945,12 +1298,12 @@ mptfc_init(void)</div><div class='ctx'> 	mptfcTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTFC_DRIVER);</div><div class='ctx'> 	mptfcInternalCtx = mpt_register(mptscsih_scandv_complete, MPTFC_DRIVER);</div><div class='ctx'> </div><div class='del'>-	if (mpt_event_register(mptfcDoneCtx, mptscsih_event_process) == 0) {</div><div class='add'>+	if (mpt_event_register(mptfcDoneCtx, mptfc_event_process) == 0) {</div><div class='ctx'> 		devtverboseprintk((KERN_INFO MYNAM</div><div class='ctx'> 		  ": Registered for IOC event notifications\n"));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mpt_reset_register(mptfcDoneCtx, mptscsih_ioc_reset) == 0) {</div><div class='add'>+	if (mpt_reset_register(mptfcDoneCtx, mptfc_ioc_reset) == 0) {</div><div class='ctx'> 		dprintk((KERN_INFO MYNAM</div><div class='ctx'> 		  ": Registered for IOC reset notifications\n"));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -975,6 +1328,7 @@ mptfc_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct mptfc_rport_info	*p, *n;</div><div class='ctx'> 	struct workqueue_struct *work_q;</div><div class='ctx'> 	unsigned long		flags;</div><div class='add'>+	int			ii;</div><div class='ctx'> </div><div class='ctx'> 	/* destroy workqueue */</div><div class='ctx'> 	if ((work_q=ioc-&gt;fc_rescan_work_q)) {</div><div class='hunk'>@@ -991,6 +1345,16 @@ mptfc_remove(struct pci_dev *pdev)</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (ii=0; ii&lt;ioc-&gt;facts.NumberOfPorts; ii++) {</div><div class='add'>+		if (ioc-&gt;fc_data.fc_port_page1[ii].data) {</div><div class='add'>+			pci_free_consistent(ioc-&gt;pcidev,</div><div class='add'>+				ioc-&gt;fc_data.fc_port_page1[ii].pg_sz,</div><div class='add'>+				(u8 *) ioc-&gt;fc_data.fc_port_page1[ii].data,</div><div class='add'>+				ioc-&gt;fc_data.fc_port_page1[ii].dma);</div><div class='add'>+			ioc-&gt;fc_data.fc_port_page1[ii].data = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mptscsih_remove(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c<br/>index af6ec553ff7c..f7bd8b11ed3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptsas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptsas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptsas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/mptsas.c</a></div><div class='hunk'>@@ -50,11 +50,14 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;	/* for mdelay */</div><div class='ctx'> </div><div class='add'>+#include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport_sas.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_dbg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mptbase.h"</div><div class='ctx'> #include "mptscsih.h"</div><div class='hunk'>@@ -137,23 +140,37 @@ struct mptsas_devinfo {</div><div class='ctx'> 	u32	device_info;	/* bitfield detailed info about this device */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Specific details on ports, wide/narrow</div><div class='add'>+ */</div><div class='add'>+struct mptsas_portinfo_details{</div><div class='add'>+	u8	port_id; 	/* port number provided to transport */</div><div class='add'>+	u16	num_phys;	/* number of phys belong to this port */</div><div class='add'>+	u64	phy_bitmask; 	/* TODO, extend support for 255 phys */</div><div class='add'>+	struct sas_rphy *rphy;	/* transport layer rphy object */</div><div class='add'>+	struct sas_port *port;	/* transport layer port object */</div><div class='add'>+	struct scsi_target *starget;</div><div class='add'>+	struct mptsas_portinfo *port_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct mptsas_phyinfo {</div><div class='ctx'> 	u8	phy_id; 		/* phy index */</div><div class='del'>-	u8	port_id; 		/* port number this phy is part of */</div><div class='add'>+	u8	port_id; 		/* firmware port identifier */</div><div class='ctx'> 	u8	negotiated_link_rate;	/* nego'd link rate for this phy */</div><div class='ctx'> 	u8	hw_link_rate; 		/* hardware max/min phys link rate */</div><div class='ctx'> 	u8	programmed_link_rate;	/* programmed max/min phy link rate */</div><div class='add'>+	u8	sas_port_add_phy;	/* flag to request sas_port_add_phy*/</div><div class='ctx'> 	struct mptsas_devinfo identify;	/* point to phy device info */</div><div class='ctx'> 	struct mptsas_devinfo attached;	/* point to attached device info */</div><div class='del'>-	struct sas_phy *phy;</div><div class='del'>-	struct sas_rphy *rphy;</div><div class='del'>-	struct scsi_target *starget;</div><div class='add'>+	struct sas_phy *phy;		/* transport layer phy object */</div><div class='add'>+	struct mptsas_portinfo *portinfo;</div><div class='add'>+	struct mptsas_portinfo_details * port_details;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mptsas_portinfo {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	u16		handle;		/* unique id to address this */</div><div class='del'>-	u8		num_phys;	/* number of phys */</div><div class='add'>+	u16		num_phys;	/* number of phys */</div><div class='ctx'> 	struct mptsas_phyinfo *phy_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +186,7 @@ struct mptsas_enclosure {</div><div class='ctx'> 	u8	sep_channel;		/* SEP channel logical channel id */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef SASDEBUG</div><div class='add'>+#ifdef MPT_DEBUG_SAS</div><div class='ctx'> static void mptsas_print_phy_data(MPI_SAS_IO_UNIT0_PHY_DATA *phy_data)</div><div class='ctx'> {</div><div class='ctx'> 	printk("---- IO UNIT PAGE 0 ------------\n");</div><div class='hunk'>@@ -305,7 +322,7 @@ mptsas_find_portinfo_by_handle(MPT_ADAPTER *ioc, u16 handle)</div><div class='ctx'> static inline int</div><div class='ctx'> mptsas_is_end_device(struct mptsas_devinfo * attached)</div><div class='ctx'> {</div><div class='del'>-	if ((attached-&gt;handle) &amp;&amp;</div><div class='add'>+	if ((attached-&gt;sas_address) &amp;&amp;</div><div class='ctx'> 	    (attached-&gt;device_info &amp;</div><div class='ctx'> 	    MPI_SAS_DEVICE_INFO_END_DEVICE) &amp;&amp;</div><div class='ctx'> 	    ((attached-&gt;device_info &amp;</div><div class='hunk'>@@ -319,6 +336,253 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* no mutex */</div><div class='add'>+static void</div><div class='add'>+mptsas_port_delete(struct mptsas_portinfo_details * port_details)</div><div class='add'>+{</div><div class='add'>+	struct mptsas_portinfo *port_info;</div><div class='add'>+	struct mptsas_phyinfo *phy_info;</div><div class='add'>+	u8	i;</div><div class='add'>+</div><div class='add'>+	if (!port_details)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	port_info = port_details-&gt;port_info;</div><div class='add'>+	phy_info = port_info-&gt;phy_info;</div><div class='add'>+</div><div class='add'>+	dsaswideprintk((KERN_DEBUG "%s: [%p]: port=%02d num_phys=%02d "</div><div class='add'>+	    	"bitmask=0x%016llX\n",</div><div class='add'>+		__FUNCTION__, port_details, port_details-&gt;port_id,</div><div class='add'>+		port_details-&gt;num_phys, port_details-&gt;phy_bitmask));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; port_info-&gt;num_phys; i++, phy_info++) {</div><div class='add'>+		if(phy_info-&gt;port_details != port_details)</div><div class='add'>+			continue;</div><div class='add'>+		memset(&amp;phy_info-&gt;attached, 0, sizeof(struct mptsas_devinfo));</div><div class='add'>+		phy_info-&gt;port_details = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(port_details);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sas_rphy *</div><div class='add'>+mptsas_get_rphy(struct mptsas_phyinfo *phy_info)</div><div class='add'>+{</div><div class='add'>+	if (phy_info-&gt;port_details)</div><div class='add'>+		return phy_info-&gt;port_details-&gt;rphy;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mptsas_set_rphy(struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)</div><div class='add'>+{</div><div class='add'>+	if (phy_info-&gt;port_details) {</div><div class='add'>+		phy_info-&gt;port_details-&gt;rphy = rphy;</div><div class='add'>+		dsaswideprintk((KERN_DEBUG "sas_rphy_add: rphy=%p\n", rphy));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef MPT_DEBUG_SAS_WIDE</div><div class='add'>+	if (rphy) {</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;rphy-&gt;dev, "add:");</div><div class='add'>+		printk("rphy=%p release=%p\n",</div><div class='add'>+			rphy, rphy-&gt;dev.release);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sas_port *</div><div class='add'>+mptsas_get_port(struct mptsas_phyinfo *phy_info)</div><div class='add'>+{</div><div class='add'>+	if (phy_info-&gt;port_details)</div><div class='add'>+		return phy_info-&gt;port_details-&gt;port;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mptsas_set_port(struct mptsas_phyinfo *phy_info, struct sas_port *port)</div><div class='add'>+{</div><div class='add'>+	if (phy_info-&gt;port_details)</div><div class='add'>+		phy_info-&gt;port_details-&gt;port = port;</div><div class='add'>+</div><div class='add'>+#ifdef MPT_DEBUG_SAS_WIDE</div><div class='add'>+	if (port) {</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;port-&gt;dev, "add: ");</div><div class='add'>+		printk("port=%p release=%p\n",</div><div class='add'>+			port, port-&gt;dev.release);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct scsi_target *</div><div class='add'>+mptsas_get_starget(struct mptsas_phyinfo *phy_info)</div><div class='add'>+{</div><div class='add'>+	if (phy_info-&gt;port_details)</div><div class='add'>+		return phy_info-&gt;port_details-&gt;starget;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mptsas_set_starget(struct mptsas_phyinfo *phy_info, struct scsi_target *</div><div class='add'>+starget)</div><div class='add'>+{</div><div class='add'>+	if (phy_info-&gt;port_details)</div><div class='add'>+		phy_info-&gt;port_details-&gt;starget = starget;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * mptsas_setup_wide_ports</div><div class='add'>+ *</div><div class='add'>+ * Updates for new and existing narrow/wide port configuration</div><div class='add'>+ * in the sas_topology</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)</div><div class='add'>+{</div><div class='add'>+	struct mptsas_portinfo_details * port_details;</div><div class='add'>+	struct mptsas_phyinfo *phy_info, *phy_info_cmp;</div><div class='add'>+	u64	sas_address;</div><div class='add'>+	int	i, j;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='add'>+</div><div class='add'>+	phy_info = port_info-&gt;phy_info;</div><div class='add'>+	for (i = 0 ; i &lt; port_info-&gt;num_phys ; i++, phy_info++) {</div><div class='add'>+		if (phy_info-&gt;attached.handle)</div><div class='add'>+			continue;</div><div class='add'>+		port_details = phy_info-&gt;port_details;</div><div class='add'>+		if (!port_details)</div><div class='add'>+			continue;</div><div class='add'>+		if (port_details-&gt;num_phys &lt; 2)</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * Removing a phy from a port, letting the last</div><div class='add'>+		 * phy be removed by firmware events.</div><div class='add'>+		 */</div><div class='add'>+		dsaswideprintk((KERN_DEBUG</div><div class='add'>+			"%s: [%p]: port=%d deleting phy = %d\n",</div><div class='add'>+			__FUNCTION__, port_details,</div><div class='add'>+			port_details-&gt;port_id, i));</div><div class='add'>+		port_details-&gt;num_phys--;</div><div class='add'>+		port_details-&gt;phy_bitmask &amp;= ~ (1 &lt;&lt; phy_info-&gt;phy_id);</div><div class='add'>+		memset(&amp;phy_info-&gt;attached, 0, sizeof(struct mptsas_devinfo));</div><div class='add'>+		sas_port_delete_phy(port_details-&gt;port, phy_info-&gt;phy);</div><div class='add'>+		phy_info-&gt;port_details = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Populate and refresh the tree</div><div class='add'>+	 */</div><div class='add'>+	phy_info = port_info-&gt;phy_info;</div><div class='add'>+	for (i = 0 ; i &lt; port_info-&gt;num_phys ; i++, phy_info++) {</div><div class='add'>+		sas_address = phy_info-&gt;attached.sas_address;</div><div class='add'>+		dsaswideprintk((KERN_DEBUG "phy_id=%d sas_address=0x%018llX\n",</div><div class='add'>+			i, sas_address));</div><div class='add'>+		if (!sas_address)</div><div class='add'>+			continue;</div><div class='add'>+		port_details = phy_info-&gt;port_details;</div><div class='add'>+		/*</div><div class='add'>+		 * Forming a port</div><div class='add'>+		 */</div><div class='add'>+		if (!port_details) {</div><div class='add'>+			port_details = kzalloc(sizeof(*port_details),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+			if (!port_details)</div><div class='add'>+				goto out;</div><div class='add'>+			port_details-&gt;num_phys = 1;</div><div class='add'>+			port_details-&gt;port_info = port_info;</div><div class='add'>+			port_details-&gt;port_id = ioc-&gt;port_serial_number++;</div><div class='add'>+			if (phy_info-&gt;phy_id &lt; 64 )</div><div class='add'>+				port_details-&gt;phy_bitmask |=</div><div class='add'>+				    (1 &lt;&lt; phy_info-&gt;phy_id);</div><div class='add'>+			phy_info-&gt;sas_port_add_phy=1;</div><div class='add'>+			dsaswideprintk((KERN_DEBUG "\t\tForming port\n\t\t"</div><div class='add'>+				"phy_id=%d sas_address=0x%018llX\n",</div><div class='add'>+				i, sas_address));</div><div class='add'>+			phy_info-&gt;port_details = port_details;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == port_info-&gt;num_phys - 1)</div><div class='add'>+			continue;</div><div class='add'>+		phy_info_cmp = &amp;port_info-&gt;phy_info[i + 1];</div><div class='add'>+		for (j = i + 1 ; j &lt; port_info-&gt;num_phys ; j++,</div><div class='add'>+		    phy_info_cmp++) {</div><div class='add'>+			if (!phy_info_cmp-&gt;attached.sas_address)</div><div class='add'>+				continue;</div><div class='add'>+			if (sas_address != phy_info_cmp-&gt;attached.sas_address)</div><div class='add'>+				continue;</div><div class='add'>+			if (phy_info_cmp-&gt;port_details == port_details )</div><div class='add'>+				continue;</div><div class='add'>+			dsaswideprintk((KERN_DEBUG</div><div class='add'>+				"\t\tphy_id=%d sas_address=0x%018llX\n",</div><div class='add'>+				j, phy_info_cmp-&gt;attached.sas_address));</div><div class='add'>+			if (phy_info_cmp-&gt;port_details) {</div><div class='add'>+				port_details-&gt;rphy =</div><div class='add'>+				    mptsas_get_rphy(phy_info_cmp);</div><div class='add'>+				port_details-&gt;port =</div><div class='add'>+				    mptsas_get_port(phy_info_cmp);</div><div class='add'>+				port_details-&gt;starget =</div><div class='add'>+				    mptsas_get_starget(phy_info_cmp);</div><div class='add'>+				port_details-&gt;port_id =</div><div class='add'>+					phy_info_cmp-&gt;port_details-&gt;port_id;</div><div class='add'>+				port_details-&gt;num_phys =</div><div class='add'>+					phy_info_cmp-&gt;port_details-&gt;num_phys;</div><div class='add'>+//				port_info-&gt;port_serial_number--;</div><div class='add'>+				ioc-&gt;port_serial_number--;</div><div class='add'>+				if (!phy_info_cmp-&gt;port_details-&gt;num_phys)</div><div class='add'>+					kfree(phy_info_cmp-&gt;port_details);</div><div class='add'>+			} else</div><div class='add'>+				phy_info_cmp-&gt;sas_port_add_phy=1;</div><div class='add'>+			/*</div><div class='add'>+			 * Adding a phy to a port</div><div class='add'>+			 */</div><div class='add'>+			phy_info_cmp-&gt;port_details = port_details;</div><div class='add'>+			if (phy_info_cmp-&gt;phy_id &lt; 64 )</div><div class='add'>+				port_details-&gt;phy_bitmask |=</div><div class='add'>+				(1 &lt;&lt; phy_info_cmp-&gt;phy_id);</div><div class='add'>+			port_details-&gt;num_phys++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+</div><div class='add'>+#ifdef MPT_DEBUG_SAS_WIDE</div><div class='add'>+	for (i = 0; i &lt; port_info-&gt;num_phys; i++) {</div><div class='add'>+		port_details = port_info-&gt;phy_info[i].port_details;</div><div class='add'>+		if (!port_details)</div><div class='add'>+			continue;</div><div class='add'>+		dsaswideprintk((KERN_DEBUG</div><div class='add'>+			"%s: [%p]: phy_id=%02d port_id=%02d num_phys=%02d "</div><div class='add'>+		    	"bitmask=0x%016llX\n",</div><div class='add'>+			__FUNCTION__,</div><div class='add'>+			port_details, i, port_details-&gt;port_id,</div><div class='add'>+			port_details-&gt;num_phys, port_details-&gt;phy_bitmask));</div><div class='add'>+		dsaswideprintk((KERN_DEBUG"\t\tport = %p rphy=%p\n",</div><div class='add'>+			port_details-&gt;port, port_details-&gt;rphy));</div><div class='add'>+	}</div><div class='add'>+	dsaswideprintk((KERN_DEBUG"\n"));</div><div class='add'>+#endif</div><div class='add'>+	mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mptsas_target_reset(MPT_ADAPTER *ioc, VirtTarget * vtarget)</div><div class='add'>+{</div><div class='add'>+	MPT_SCSI_HOST		*hd = (MPT_SCSI_HOST *)ioc-&gt;sh-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	if (mptscsih_TMHandler(hd,</div><div class='add'>+	     MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET,</div><div class='add'>+	     vtarget-&gt;bus_id, vtarget-&gt;target_id, 0, 0, 5) &lt; 0) {</div><div class='add'>+		hd-&gt;tmPending = 0;</div><div class='add'>+		hd-&gt;tmState = TM_STATE_NONE;</div><div class='add'>+		printk(MYIOC_s_WARN_FMT</div><div class='add'>+	       "Error processing TaskMgmt id=%d TARGET_RESET\n",</div><div class='add'>+			ioc-&gt;name, vtarget-&gt;target_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mptsas_sas_enclosure_pg0(MPT_ADAPTER *ioc, struct mptsas_enclosure *enclosure,</div><div class='ctx'> 		u32 form, u32 form_specific)</div><div class='hunk'>@@ -400,11 +664,105 @@ mptsas_slave_configure(struct scsi_device *sdev)</div><div class='ctx'> 	return mptscsih_slave_configure(sdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This is pretty ugly.  We will be able to seriously clean it up</div><div class='del'>- * once the DV code in mptscsih goes away and we can properly</div><div class='del'>- * implement -&gt;target_alloc.</div><div class='del'>- */</div><div class='add'>+static int</div><div class='add'>+mptsas_target_alloc(struct scsi_target *starget)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = dev_to_shost(&amp;starget-&gt;dev);</div><div class='add'>+	MPT_SCSI_HOST		*hd = (MPT_SCSI_HOST *)host-&gt;hostdata;</div><div class='add'>+	VirtTarget		*vtarget;</div><div class='add'>+	u32			target_id;</div><div class='add'>+	u32			channel;</div><div class='add'>+	struct sas_rphy		*rphy;</div><div class='add'>+	struct mptsas_portinfo	*p;</div><div class='add'>+	int 			 i;</div><div class='add'>+</div><div class='add'>+	vtarget = kzalloc(sizeof(VirtTarget), GFP_KERNEL);</div><div class='add'>+	if (!vtarget)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	vtarget-&gt;starget = starget;</div><div class='add'>+	vtarget-&gt;ioc_id = hd-&gt;ioc-&gt;id;</div><div class='add'>+	vtarget-&gt;tflags = MPT_TARGET_FLAGS_Q_YES|MPT_TARGET_FLAGS_VALID_INQUIRY;</div><div class='add'>+</div><div class='add'>+	target_id = starget-&gt;id;</div><div class='add'>+	channel = 0;</div><div class='add'>+</div><div class='add'>+	hd-&gt;Targets[target_id] = vtarget;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RAID volumes placed beyond the last expected port.</div><div class='add'>+	 */</div><div class='add'>+	if (starget-&gt;channel == hd-&gt;ioc-&gt;num_ports)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rphy = dev_to_rphy(starget-&gt;dev.parent);</div><div class='add'>+	mutex_lock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='add'>+	list_for_each_entry(p, &amp;hd-&gt;ioc-&gt;sas_topology, list) {</div><div class='add'>+		for (i = 0; i &lt; p-&gt;num_phys; i++) {</div><div class='add'>+			if (p-&gt;phy_info[i].attached.sas_address !=</div><div class='add'>+					rphy-&gt;identify.sas_address)</div><div class='add'>+				continue;</div><div class='add'>+			target_id = p-&gt;phy_info[i].attached.id;</div><div class='add'>+			channel = p-&gt;phy_info[i].attached.channel;</div><div class='add'>+			mptsas_set_starget(&amp;p-&gt;phy_info[i], starget);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Exposing hidden raid components</div><div class='add'>+			 */</div><div class='add'>+			if (mptscsih_is_phys_disk(hd-&gt;ioc, target_id)) {</div><div class='add'>+				target_id = mptscsih_raid_id_to_num(hd,</div><div class='add'>+						target_id);</div><div class='add'>+				vtarget-&gt;tflags |=</div><div class='add'>+				    MPT_TARGET_FLAGS_RAID_COMPONENT;</div><div class='add'>+			}</div><div class='add'>+			mutex_unlock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='add'>+</div><div class='add'>+	kfree(vtarget);</div><div class='add'>+	return -ENXIO;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	vtarget-&gt;target_id = target_id;</div><div class='add'>+	vtarget-&gt;bus_id = channel;</div><div class='add'>+	starget-&gt;hostdata = vtarget;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mptsas_target_destroy(struct scsi_target *starget)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = dev_to_shost(&amp;starget-&gt;dev);</div><div class='add'>+	MPT_SCSI_HOST		*hd = (MPT_SCSI_HOST *)host-&gt;hostdata;</div><div class='add'>+	struct sas_rphy		*rphy;</div><div class='add'>+	struct mptsas_portinfo	*p;</div><div class='add'>+	int 			 i;</div><div class='add'>+</div><div class='add'>+	if (!starget-&gt;hostdata)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (starget-&gt;channel == hd-&gt;ioc-&gt;num_ports)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rphy = dev_to_rphy(starget-&gt;dev.parent);</div><div class='add'>+	list_for_each_entry(p, &amp;hd-&gt;ioc-&gt;sas_topology, list) {</div><div class='add'>+		for (i = 0; i &lt; p-&gt;num_phys; i++) {</div><div class='add'>+			if (p-&gt;phy_info[i].attached.sas_address !=</div><div class='add'>+					rphy-&gt;identify.sas_address)</div><div class='add'>+				continue;</div><div class='add'>+			mptsas_set_starget(&amp;p-&gt;phy_info[i], NULL);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	kfree(starget-&gt;hostdata);</div><div class='add'>+	starget-&gt;hostdata = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> mptsas_slave_alloc(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -412,61 +770,41 @@ mptsas_slave_alloc(struct scsi_device *sdev)</div><div class='ctx'> 	MPT_SCSI_HOST		*hd = (MPT_SCSI_HOST *)host-&gt;hostdata;</div><div class='ctx'> 	struct sas_rphy		*rphy;</div><div class='ctx'> 	struct mptsas_portinfo	*p;</div><div class='del'>-	VirtTarget		*vtarget;</div><div class='ctx'> 	VirtDevice		*vdev;</div><div class='ctx'> 	struct scsi_target 	*starget;</div><div class='del'>-	u32			target_id;</div><div class='del'>-	int i;</div><div class='add'>+	int 			i;</div><div class='ctx'> </div><div class='ctx'> 	vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL);</div><div class='ctx'> 	if (!vdev) {</div><div class='del'>-		printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",</div><div class='add'>+		printk(MYIOC_s_ERR_FMT "slave_alloc kzalloc(%zd) FAILED!\n",</div><div class='ctx'> 				hd-&gt;ioc-&gt;name, sizeof(VirtDevice));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	sdev-&gt;hostdata = vdev;</div><div class='ctx'> 	starget = scsi_target(sdev);</div><div class='del'>-	vtarget = starget-&gt;hostdata;</div><div class='del'>-	vtarget-&gt;ioc_id = hd-&gt;ioc-&gt;id;</div><div class='del'>-	vdev-&gt;vtarget = vtarget;</div><div class='del'>-	if (vtarget-&gt;num_luns == 0) {</div><div class='del'>-		vtarget-&gt;tflags = MPT_TARGET_FLAGS_Q_YES|MPT_TARGET_FLAGS_VALID_INQUIRY;</div><div class='del'>-		hd-&gt;Targets[sdev-&gt;id] = vtarget;</div><div class='del'>-	}</div><div class='add'>+	vdev-&gt;vtarget = starget-&gt;hostdata;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	  RAID volumes placed beyond the last expected port.</div><div class='del'>-	*/</div><div class='del'>-	if (sdev-&gt;channel == hd-&gt;ioc-&gt;num_ports) {</div><div class='del'>-		target_id = sdev-&gt;id;</div><div class='del'>-		vtarget-&gt;bus_id = 0;</div><div class='del'>-		vdev-&gt;lun = 0;</div><div class='add'>+	 * RAID volumes placed beyond the last expected port.</div><div class='add'>+	 */</div><div class='add'>+	if (sdev-&gt;channel == hd-&gt;ioc-&gt;num_ports)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	rphy = dev_to_rphy(sdev-&gt;sdev_target-&gt;dev.parent);</div><div class='ctx'> 	mutex_lock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> 	list_for_each_entry(p, &amp;hd-&gt;ioc-&gt;sas_topology, list) {</div><div class='ctx'> 		for (i = 0; i &lt; p-&gt;num_phys; i++) {</div><div class='del'>-			if (p-&gt;phy_info[i].attached.sas_address ==</div><div class='del'>-					rphy-&gt;identify.sas_address) {</div><div class='del'>-				target_id = p-&gt;phy_info[i].attached.id;</div><div class='del'>-				vtarget-&gt;bus_id = p-&gt;phy_info[i].attached.channel;</div><div class='del'>-				vdev-&gt;lun = sdev-&gt;lun;</div><div class='del'>-				p-&gt;phy_info[i].starget = sdev-&gt;sdev_target;</div><div class='del'>-				/*</div><div class='del'>-				 * Exposing hidden disk (RAID)</div><div class='del'>-				 */</div><div class='del'>-				if (mptscsih_is_phys_disk(hd-&gt;ioc, target_id)) {</div><div class='del'>-					target_id = mptscsih_raid_id_to_num(hd,</div><div class='del'>-							target_id);</div><div class='del'>-					vdev-&gt;vtarget-&gt;tflags |=</div><div class='del'>-					    MPT_TARGET_FLAGS_RAID_COMPONENT;</div><div class='del'>-					sdev-&gt;no_uld_attach = 1;</div><div class='del'>-				}</div><div class='del'>-				mutex_unlock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='add'>+			if (p-&gt;phy_info[i].attached.sas_address !=</div><div class='add'>+					rphy-&gt;identify.sas_address)</div><div class='add'>+				continue;</div><div class='add'>+			vdev-&gt;lun = sdev-&gt;lun;</div><div class='add'>+			/*</div><div class='add'>+			 * Exposing hidden raid components</div><div class='add'>+			 */</div><div class='add'>+			if (mptscsih_is_phys_disk(hd-&gt;ioc,</div><div class='add'>+					p-&gt;phy_info[i].attached.id))</div><div class='add'>+				sdev-&gt;no_uld_attach = 1;</div><div class='add'>+			mutex_unlock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;hd-&gt;ioc-&gt;sas_topology_mutex);</div><div class='hunk'>@@ -475,57 +813,39 @@ mptsas_slave_alloc(struct scsi_device *sdev)</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	vtarget-&gt;target_id = target_id;</div><div class='del'>-	vtarget-&gt;num_luns++;</div><div class='add'>+	vdev-&gt;vtarget-&gt;num_luns++;</div><div class='add'>+	sdev-&gt;hostdata = vdev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mptsas_slave_destroy(struct scsi_device *sdev)</div><div class='add'>+static int</div><div class='add'>+mptsas_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> {</div><div class='del'>-	struct Scsi_Host *host = sdev-&gt;host;</div><div class='del'>-	MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)host-&gt;hostdata;</div><div class='del'>-	VirtDevice *vdev;</div><div class='add'>+	VirtDevice	*vdev = SCpnt-&gt;device-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Issue target reset to flush firmware outstanding commands.</div><div class='del'>-	 */</div><div class='del'>-	vdev = sdev-&gt;hostdata;</div><div class='del'>-	if (vdev-&gt;configured_lun){</div><div class='del'>-		if (mptscsih_TMHandler(hd,</div><div class='del'>-		     MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET,</div><div class='del'>-		     vdev-&gt;vtarget-&gt;bus_id,</div><div class='del'>-		     vdev-&gt;vtarget-&gt;target_id,</div><div class='del'>-		     0, 0, 5 /* 5 second timeout */)</div><div class='del'>-		     &lt; 0){</div><div class='del'>-</div><div class='del'>-			/* The TM request failed!</div><div class='del'>-			 * Fatal error case.</div><div class='del'>-			 */</div><div class='del'>-			printk(MYIOC_s_WARN_FMT</div><div class='del'>-		       "Error processing TaskMgmt id=%d TARGET_RESET\n",</div><div class='del'>-				hd-&gt;ioc-&gt;name,</div><div class='del'>-				vdev-&gt;vtarget-&gt;target_id);</div><div class='del'>-</div><div class='del'>-			hd-&gt;tmPending = 0;</div><div class='del'>-			hd-&gt;tmState = TM_STATE_NONE;</div><div class='del'>-		}</div><div class='add'>+//	scsi_print_command(SCpnt);</div><div class='add'>+	if (vdev-&gt;vtarget-&gt;deleted) {</div><div class='add'>+		SCpnt-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='add'>+		done(SCpnt);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	mptscsih_slave_destroy(sdev);</div><div class='add'>+</div><div class='add'>+	return mptscsih_qcmd(SCpnt,done);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static struct scsi_host_template mptsas_driver_template = {</div><div class='ctx'> 	.module				= THIS_MODULE,</div><div class='ctx'> 	.proc_name			= "mptsas",</div><div class='ctx'> 	.proc_info			= mptscsih_proc_info,</div><div class='ctx'> 	.name				= "MPT SPI Host",</div><div class='ctx'> 	.info				= mptscsih_info,</div><div class='del'>-	.queuecommand			= mptscsih_qcmd,</div><div class='del'>-	.target_alloc			= mptscsih_target_alloc,</div><div class='add'>+	.queuecommand			= mptsas_qcmd,</div><div class='add'>+	.target_alloc			= mptsas_target_alloc,</div><div class='ctx'> 	.slave_alloc			= mptsas_slave_alloc,</div><div class='ctx'> 	.slave_configure		= mptsas_slave_configure,</div><div class='del'>-	.target_destroy			= mptscsih_target_destroy,</div><div class='del'>-	.slave_destroy			= mptsas_slave_destroy,</div><div class='add'>+	.target_destroy			= mptsas_target_destroy,</div><div class='add'>+	.slave_destroy			= mptscsih_slave_destroy,</div><div class='ctx'> 	.change_queue_depth 		= mptscsih_change_queue_depth,</div><div class='ctx'> 	.eh_abort_handler		= mptscsih_abort,</div><div class='ctx'> 	.eh_device_reset_handler	= mptscsih_dev_reset,</div><div class='hunk'>@@ -795,7 +1115,7 @@ mptsas_sas_io_unit_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)</div><div class='ctx'> </div><div class='ctx'> 	port_info-&gt;num_phys = buffer-&gt;NumPhys;</div><div class='ctx'> 	port_info-&gt;phy_info = kcalloc(port_info-&gt;num_phys,</div><div class='del'>-		sizeof(struct mptsas_phyinfo),GFP_KERNEL);</div><div class='add'>+		sizeof(*port_info-&gt;phy_info),GFP_KERNEL);</div><div class='ctx'> 	if (!port_info-&gt;phy_info) {</div><div class='ctx'> 		error = -ENOMEM;</div><div class='ctx'> 		goto out_free_consistent;</div><div class='hunk'>@@ -811,6 +1131,7 @@ mptsas_sas_io_unit_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)</div><div class='ctx'> 		    buffer-&gt;PhyData[i].Port;</div><div class='ctx'> 		port_info-&gt;phy_info[i].negotiated_link_rate =</div><div class='ctx'> 		    buffer-&gt;PhyData[i].NegotiatedLinkRate;</div><div class='add'>+		port_info-&gt;phy_info[i].portinfo = port_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out_free_consistent:</div><div class='hunk'>@@ -968,7 +1289,7 @@ mptsas_sas_expander_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info,</div><div class='ctx'> 	CONFIGPARMS cfg;</div><div class='ctx'> 	SasExpanderPage0_t *buffer;</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='del'>-	int error;</div><div class='add'>+	int i, error;</div><div class='ctx'> </div><div class='ctx'> 	hdr.PageVersion = MPI_SASEXPANDER0_PAGEVERSION;</div><div class='ctx'> 	hdr.ExtPageLength = 0;</div><div class='hunk'>@@ -1013,12 +1334,15 @@ mptsas_sas_expander_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info,</div><div class='ctx'> 	port_info-&gt;num_phys = buffer-&gt;NumPhys;</div><div class='ctx'> 	port_info-&gt;handle = le16_to_cpu(buffer-&gt;DevHandle);</div><div class='ctx'> 	port_info-&gt;phy_info = kcalloc(port_info-&gt;num_phys,</div><div class='del'>-		sizeof(struct mptsas_phyinfo),GFP_KERNEL);</div><div class='add'>+		sizeof(*port_info-&gt;phy_info),GFP_KERNEL);</div><div class='ctx'> 	if (!port_info-&gt;phy_info) {</div><div class='ctx'> 		error = -ENOMEM;</div><div class='ctx'> 		goto out_free_consistent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; port_info-&gt;num_phys; i++)</div><div class='add'>+		port_info-&gt;phy_info[i].portinfo = port_info;</div><div class='add'>+</div><div class='ctx'>  out_free_consistent:</div><div class='ctx'> 	pci_free_consistent(ioc-&gt;pcidev, hdr.ExtPageLength * 4,</div><div class='ctx'> 			    buffer, dma_handle);</div><div class='hunk'>@@ -1161,19 +1485,23 @@ static int mptsas_probe_one_phy(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	MPT_ADAPTER *ioc;</div><div class='ctx'> 	struct sas_phy *phy;</div><div class='del'>-	int error;</div><div class='add'>+	struct sas_port *port;</div><div class='add'>+	int error = 0;</div><div class='ctx'> </div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (!dev) {</div><div class='add'>+		error = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!phy_info-&gt;phy) {</div><div class='ctx'> 		phy = sas_phy_alloc(dev, index);</div><div class='del'>-		if (!phy)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (!phy) {</div><div class='add'>+			error = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		phy = phy_info-&gt;phy;</div><div class='ctx'> </div><div class='del'>-	phy-&gt;port_identifier = phy_info-&gt;port_id;</div><div class='ctx'> 	mptsas_parse_device_info(&amp;phy-&gt;identify, &amp;phy_info-&gt;identify);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1265,19 +1593,52 @@ static int mptsas_probe_one_phy(struct device *dev,</div><div class='ctx'> 		error = sas_phy_add(phy);</div><div class='ctx'> 		if (error) {</div><div class='ctx'> 			sas_phy_free(phy);</div><div class='del'>-			return error;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		phy_info-&gt;phy = phy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((phy_info-&gt;attached.handle) &amp;&amp;</div><div class='del'>-	    (!phy_info-&gt;rphy)) {</div><div class='add'>+	if (!phy_info-&gt;attached.handle ||</div><div class='add'>+			!phy_info-&gt;port_details)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	port = mptsas_get_port(phy_info);</div><div class='add'>+	ioc = phy_to_ioc(phy_info-&gt;phy);</div><div class='add'>+</div><div class='add'>+	if (phy_info-&gt;sas_port_add_phy) {</div><div class='add'>+</div><div class='add'>+		if (!port) {</div><div class='add'>+			port = sas_port_alloc(dev,</div><div class='add'>+			    phy_info-&gt;port_details-&gt;port_id);</div><div class='add'>+			dsaswideprintk((KERN_DEBUG</div><div class='add'>+			    "sas_port_alloc: port=%p dev=%p port_id=%d\n",</div><div class='add'>+			    port, dev, phy_info-&gt;port_details-&gt;port_id));</div><div class='add'>+			if (!port) {</div><div class='add'>+				error = -ENOMEM;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			error = sas_port_add(port);</div><div class='add'>+			if (error) {</div><div class='add'>+				dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+					"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+					__FUNCTION__, __LINE__));</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			mptsas_set_port(phy_info, port);</div><div class='add'>+		}</div><div class='add'>+		dsaswideprintk((KERN_DEBUG "sas_port_add_phy: phy_id=%d\n",</div><div class='add'>+		    phy_info-&gt;phy_id));</div><div class='add'>+		sas_port_add_phy(port, phy_info-&gt;phy);</div><div class='add'>+		phy_info-&gt;sas_port_add_phy = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mptsas_get_rphy(phy_info) &amp;&amp; port &amp;&amp; !port-&gt;rphy) {</div><div class='ctx'> </div><div class='ctx'> 		struct sas_rphy *rphy;</div><div class='add'>+		struct device *parent;</div><div class='ctx'> 		struct sas_identify identify;</div><div class='ctx'> </div><div class='del'>-		ioc = phy_to_ioc(phy_info-&gt;phy);</div><div class='del'>-</div><div class='add'>+		parent = dev-&gt;parent-&gt;parent;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Let the hotplug_work thread handle processing</div><div class='ctx'> 		 * the adding/removing of devices that occur</div><div class='hunk'>@@ -1285,36 +1646,63 @@ static int mptsas_probe_one_phy(struct device *dev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ioc-&gt;sas_discovery_runtime &amp;&amp;</div><div class='ctx'> 			mptsas_is_end_device(&amp;phy_info-&gt;attached))</div><div class='del'>-			return 0;</div><div class='add'>+				goto out;</div><div class='ctx'> </div><div class='ctx'> 		mptsas_parse_device_info(&amp;identify, &amp;phy_info-&gt;attached);</div><div class='add'>+		if (scsi_is_host_device(parent)) {</div><div class='add'>+			struct mptsas_portinfo *port_info;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='add'>+			port_info = mptsas_find_portinfo_by_handle(ioc,</div><div class='add'>+								   ioc-&gt;handle);</div><div class='add'>+			mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; port_info-&gt;num_phys; i++)</div><div class='add'>+				if (port_info-&gt;phy_info[i].identify.sas_address ==</div><div class='add'>+				    identify.sas_address)</div><div class='add'>+					goto out;</div><div class='add'>+</div><div class='add'>+		} else if (scsi_is_sas_rphy(parent)) {</div><div class='add'>+			struct sas_rphy *parent_rphy = dev_to_rphy(parent);</div><div class='add'>+			if (identify.sas_address ==</div><div class='add'>+			    parent_rphy-&gt;identify.sas_address)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (identify.device_type) {</div><div class='ctx'> 		case SAS_END_DEVICE:</div><div class='del'>-			rphy = sas_end_device_alloc(phy);</div><div class='add'>+			rphy = sas_end_device_alloc(port);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SAS_EDGE_EXPANDER_DEVICE:</div><div class='ctx'> 		case SAS_FANOUT_EXPANDER_DEVICE:</div><div class='del'>-			rphy = sas_expander_alloc(phy, identify.device_type);</div><div class='add'>+			rphy = sas_expander_alloc(port, identify.device_type);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			rphy = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!rphy)</div><div class='del'>-			return 0; /* non-fatal: an rphy can be added later */</div><div class='add'>+		if (!rphy) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+				__FUNCTION__, __LINE__));</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		rphy-&gt;identify = identify;</div><div class='del'>-</div><div class='ctx'> 		error = sas_rphy_add(rphy);</div><div class='ctx'> 		if (error) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+				__FUNCTION__, __LINE__));</div><div class='ctx'> 			sas_rphy_free(rphy);</div><div class='del'>-			return error;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		phy_info-&gt;rphy = rphy;</div><div class='add'>+		mptsas_set_rphy(phy_info, rphy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+ out:</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1333,6 +1721,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc)</div><div class='ctx'> 		goto out_free_port_info;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='add'>+	ioc-&gt;handle = hba-&gt;handle;</div><div class='ctx'> 	port_info = mptsas_find_portinfo_by_handle(ioc, hba-&gt;handle);</div><div class='ctx'> 	if (!port_info) {</div><div class='ctx'> 		port_info = hba;</div><div class='hunk'>@@ -1342,8 +1731,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc)</div><div class='ctx'> 		for (i = 0; i &lt; hba-&gt;num_phys; i++)</div><div class='ctx'> 			port_info-&gt;phy_info[i].negotiated_link_rate =</div><div class='ctx'> 				hba-&gt;phy_info[i].negotiated_link_rate;</div><div class='del'>-		if (hba-&gt;phy_info)</div><div class='del'>-			kfree(hba-&gt;phy_info);</div><div class='add'>+		kfree(hba-&gt;phy_info);</div><div class='ctx'> 		kfree(hba);</div><div class='ctx'> 		hba = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1362,24 +1750,24 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc)</div><div class='ctx'> 		    port_info-&gt;phy_info[i].phy_id;</div><div class='ctx'> 		handle = port_info-&gt;phy_info[i].identify.handle;</div><div class='ctx'> </div><div class='del'>-		if (port_info-&gt;phy_info[i].attached.handle) {</div><div class='add'>+		if (port_info-&gt;phy_info[i].attached.handle)</div><div class='ctx'> 			mptsas_sas_device_pg0(ioc,</div><div class='ctx'> 				&amp;port_info-&gt;phy_info[i].attached,</div><div class='ctx'> 				(MPI_SAS_DEVICE_PGAD_FORM_HANDLE &lt;&lt;</div><div class='ctx'> 				 MPI_SAS_DEVICE_PGAD_FORM_SHIFT),</div><div class='ctx'> 				port_info-&gt;phy_info[i].attached.handle);</div><div class='del'>-		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	mptsas_setup_wide_ports(ioc, port_info);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; port_info-&gt;num_phys; i++, ioc-&gt;sas_index++)</div><div class='ctx'> 		mptsas_probe_one_phy(&amp;ioc-&gt;sh-&gt;shost_gendev,</div><div class='ctx'> 		    &amp;port_info-&gt;phy_info[i], ioc-&gt;sas_index, 1);</div><div class='del'>-		ioc-&gt;sas_index++;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out_free_port_info:</div><div class='del'>-	if (hba)</div><div class='del'>-		kfree(hba);</div><div class='add'>+	kfree(hba);</div><div class='ctx'>  out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -1388,6 +1776,8 @@ static int</div><div class='ctx'> mptsas_probe_expander_phys(MPT_ADAPTER *ioc, u32 *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct mptsas_portinfo *port_info, *p, *ex;</div><div class='add'>+	struct device *parent;</div><div class='add'>+	struct sas_rphy *rphy;</div><div class='ctx'> 	int error = -ENOMEM, i, j;</div><div class='ctx'> </div><div class='ctx'> 	ex = kzalloc(sizeof(*port_info), GFP_KERNEL);</div><div class='hunk'>@@ -1409,16 +1799,13 @@ mptsas_probe_expander_phys(MPT_ADAPTER *ioc, u32 *handle)</div><div class='ctx'> 		list_add_tail(&amp;port_info-&gt;list, &amp;ioc-&gt;sas_topology);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		port_info-&gt;handle = ex-&gt;handle;</div><div class='del'>-		if (ex-&gt;phy_info)</div><div class='del'>-			kfree(ex-&gt;phy_info);</div><div class='add'>+		kfree(ex-&gt;phy_info);</div><div class='ctx'> 		kfree(ex);</div><div class='ctx'> 		ex = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; port_info-&gt;num_phys; i++) {</div><div class='del'>-		struct device *parent;</div><div class='del'>-</div><div class='ctx'> 		mptsas_sas_expander_pg1(ioc, &amp;port_info-&gt;phy_info[i],</div><div class='ctx'> 			(MPI_SAS_EXPAND_PGAD_FORM_HANDLE_PHY_NUM &lt;&lt;</div><div class='ctx'> 			 MPI_SAS_EXPAND_PGAD_FORM_SHIFT), (i &lt;&lt; 16) + *handle);</div><div class='hunk'>@@ -1442,34 +1829,34 @@ mptsas_probe_expander_phys(MPT_ADAPTER *ioc, u32 *handle)</div><div class='ctx'> 			port_info-&gt;phy_info[i].attached.phy_id =</div><div class='ctx'> 			    port_info-&gt;phy_info[i].phy_id;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If we find a parent port handle this expander is</div><div class='del'>-		 * attached to another expander, else it hangs of the</div><div class='del'>-		 * HBA phys.</div><div class='del'>-		 */</div><div class='del'>-		parent = &amp;ioc-&gt;sh-&gt;shost_gendev;</div><div class='add'>+	parent = &amp;ioc-&gt;sh-&gt;shost_gendev;</div><div class='add'>+	for (i = 0; i &lt; port_info-&gt;num_phys; i++) {</div><div class='ctx'> 		mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> 		list_for_each_entry(p, &amp;ioc-&gt;sas_topology, list) {</div><div class='ctx'> 			for (j = 0; j &lt; p-&gt;num_phys; j++) {</div><div class='del'>-				if (port_info-&gt;phy_info[i].identify.handle ==</div><div class='add'>+				if (port_info-&gt;phy_info[i].identify.handle !=</div><div class='ctx'> 						p-&gt;phy_info[j].attached.handle)</div><div class='del'>-					parent = &amp;p-&gt;phy_info[j].rphy-&gt;dev;</div><div class='add'>+					continue;</div><div class='add'>+				rphy = mptsas_get_rphy(&amp;p-&gt;phy_info[j]);</div><div class='add'>+				parent = &amp;rphy-&gt;dev;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mptsas_setup_wide_ports(ioc, port_info);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; port_info-&gt;num_phys; i++, ioc-&gt;sas_index++)</div><div class='ctx'> 		mptsas_probe_one_phy(parent, &amp;port_info-&gt;phy_info[i],</div><div class='ctx'> 		    ioc-&gt;sas_index, 0);</div><div class='del'>-		ioc-&gt;sas_index++;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  out_free_port_info:</div><div class='ctx'> 	if (ex) {</div><div class='del'>-		if (ex-&gt;phy_info)</div><div class='del'>-			kfree(ex-&gt;phy_info);</div><div class='add'>+		kfree(ex-&gt;phy_info);</div><div class='ctx'> 		kfree(ex);</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='hunk'>@@ -1488,7 +1875,12 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc)</div><div class='ctx'> {</div><div class='ctx'> 	struct mptsas_portinfo buffer;</div><div class='ctx'> 	struct mptsas_portinfo *port_info, *n, *parent;</div><div class='add'>+	struct mptsas_phyinfo *phy_info;</div><div class='add'>+	struct scsi_target * starget;</div><div class='add'>+	VirtTarget * vtarget;</div><div class='add'>+	struct sas_port * port;</div><div class='ctx'> 	int i;</div><div class='add'>+	u64	expander_sas_address;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> 	list_for_each_entry_safe(port_info, n, &amp;ioc-&gt;sas_topology, list) {</div><div class='hunk'>@@ -1503,6 +1895,25 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc)</div><div class='ctx'> 		     MPI_SAS_EXPAND_PGAD_FORM_SHIFT), port_info-&gt;handle)) {</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='add'>+			 * Issue target reset to all child end devices</div><div class='add'>+			 * then mark them deleted to prevent further</div><div class='add'>+			 * IO going to them.</div><div class='add'>+			 */</div><div class='add'>+			phy_info = port_info-&gt;phy_info;</div><div class='add'>+			for (i = 0; i &lt; port_info-&gt;num_phys; i++, phy_info++) {</div><div class='add'>+				starget = mptsas_get_starget(phy_info);</div><div class='add'>+				if (!starget)</div><div class='add'>+					continue;</div><div class='add'>+				vtarget = starget-&gt;hostdata;</div><div class='add'>+				if(vtarget-&gt;deleted)</div><div class='add'>+					continue;</div><div class='add'>+				vtarget-&gt;deleted = 1;</div><div class='add'>+				mptsas_target_reset(ioc, vtarget);</div><div class='add'>+				sas_port_delete(mptsas_get_port(phy_info));</div><div class='add'>+				mptsas_port_delete(phy_info-&gt;port_details);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='ctx'> 			 * Obtain the port_info instance to the parent port</div><div class='ctx'> 			 */</div><div class='ctx'> 			parent = mptsas_find_portinfo_by_handle(ioc,</div><div class='hunk'>@@ -1511,34 +1922,43 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc)</div><div class='ctx'> 			if (!parent)</div><div class='ctx'> 				goto next_port;</div><div class='ctx'> </div><div class='add'>+			expander_sas_address =</div><div class='add'>+				port_info-&gt;phy_info[0].identify.sas_address;</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Delete rphys in the parent that point</div><div class='ctx'> 			 * to this expander.  The transport layer will</div><div class='ctx'> 			 * cleanup all the children.</div><div class='ctx'> 			 */</div><div class='del'>-			for (i = 0; i &lt; parent-&gt;num_phys; i++) {</div><div class='del'>-				if ((!parent-&gt;phy_info[i].rphy) ||</div><div class='del'>-				    (parent-&gt;phy_info[i].attached.sas_address !=</div><div class='del'>-				   port_info-&gt;phy_info[i].identify.sas_address))</div><div class='add'>+			phy_info = parent-&gt;phy_info;</div><div class='add'>+			for (i = 0; i &lt; parent-&gt;num_phys; i++, phy_info++) {</div><div class='add'>+				port = mptsas_get_port(phy_info);</div><div class='add'>+				if (!port)</div><div class='add'>+					continue;</div><div class='add'>+				if (phy_info-&gt;attached.sas_address !=</div><div class='add'>+					expander_sas_address)</div><div class='ctx'> 					continue;</div><div class='del'>-				sas_rphy_delete(parent-&gt;phy_info[i].rphy);</div><div class='del'>-				memset(&amp;parent-&gt;phy_info[i].attached, 0,</div><div class='del'>-				    sizeof(struct mptsas_devinfo));</div><div class='del'>-				parent-&gt;phy_info[i].rphy = NULL;</div><div class='del'>-				parent-&gt;phy_info[i].starget = NULL;</div><div class='add'>+#ifdef MPT_DEBUG_SAS_WIDE</div><div class='add'>+				dev_printk(KERN_DEBUG, &amp;port-&gt;dev, "delete\n");</div><div class='add'>+#endif</div><div class='add'>+				sas_port_delete(port);</div><div class='add'>+				mptsas_port_delete(phy_info-&gt;port_details);</div><div class='ctx'> 			}</div><div class='ctx'>  next_port:</div><div class='add'>+</div><div class='add'>+			phy_info = port_info-&gt;phy_info;</div><div class='add'>+			for (i = 0; i &lt; port_info-&gt;num_phys; i++, phy_info++)</div><div class='add'>+				mptsas_port_delete(phy_info-&gt;port_details);</div><div class='add'>+</div><div class='ctx'> 			list_del(&amp;port_info-&gt;list);</div><div class='del'>-			if (port_info-&gt;phy_info)</div><div class='del'>-				kfree(port_info-&gt;phy_info);</div><div class='add'>+			kfree(port_info-&gt;phy_info);</div><div class='ctx'> 			kfree(port_info);</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		* Free this memory allocated from inside</div><div class='ctx'> 		* mptsas_sas_expander_pg0</div><div class='ctx'> 		*/</div><div class='del'>-		if (buffer.phy_info)</div><div class='del'>-			kfree(buffer.phy_info);</div><div class='add'>+		kfree(buffer.phy_info);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> }</div><div class='hunk'>@@ -1574,60 +1994,59 @@ mptsas_scan_sas_topology(MPT_ADAPTER *ioc)</div><div class='ctx'> /*</div><div class='ctx'>  * Work queue thread to handle Runtime discovery</div><div class='ctx'>  * Mere purpose is the hot add/delete of expanders</div><div class='add'>+ *(Mutex UNLOCKED)</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-mptscsih_discovery_work(void * arg)</div><div class='add'>+__mptsas_discovery_work(MPT_ADAPTER *ioc)</div><div class='ctx'> {</div><div class='del'>-	struct mptsas_discovery_event *ev = arg;</div><div class='del'>-	MPT_ADAPTER *ioc = ev-&gt;ioc;</div><div class='ctx'> 	u32 handle = 0xFFFF;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ioc-&gt;sas_discovery_mutex);</div><div class='ctx'> 	ioc-&gt;sas_discovery_runtime=1;</div><div class='ctx'> 	mptsas_delete_expander_phys(ioc);</div><div class='ctx'> 	mptsas_probe_hba_phys(ioc);</div><div class='ctx'> 	while (!mptsas_probe_expander_phys(ioc, &amp;handle))</div><div class='ctx'> 		;</div><div class='del'>-	kfree(ev);</div><div class='ctx'> 	ioc-&gt;sas_discovery_runtime=0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Work queue thread to handle Runtime discovery</div><div class='add'>+ * Mere purpose is the hot add/delete of expanders</div><div class='add'>+ *(Mutex LOCKED)</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+mptsas_discovery_work(void * arg)</div><div class='add'>+{</div><div class='add'>+	struct mptsas_discovery_event *ev = arg;</div><div class='add'>+	MPT_ADAPTER *ioc = ev-&gt;ioc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ioc-&gt;sas_discovery_mutex);</div><div class='add'>+	__mptsas_discovery_work(ioc);</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_discovery_mutex);</div><div class='add'>+	kfree(ev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct mptsas_phyinfo *</div><div class='del'>-mptsas_find_phyinfo_by_parent(MPT_ADAPTER *ioc, u16 parent_handle, u8 phy_id)</div><div class='add'>+mptsas_find_phyinfo_by_sas_address(MPT_ADAPTER *ioc, u64 sas_address)</div><div class='ctx'> {</div><div class='ctx'> 	struct mptsas_portinfo *port_info;</div><div class='del'>-	struct mptsas_devinfo device_info;</div><div class='ctx'> 	struct mptsas_phyinfo *phy_info = NULL;</div><div class='del'>-	int i, error;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Retrieve the parent sas_address</div><div class='del'>-	 */</div><div class='del'>-	error = mptsas_sas_device_pg0(ioc, &amp;device_info,</div><div class='del'>-		(MPI_SAS_DEVICE_PGAD_FORM_HANDLE &lt;&lt;</div><div class='del'>-		 MPI_SAS_DEVICE_PGAD_FORM_SHIFT),</div><div class='del'>-		parent_handle);</div><div class='del'>-	if (error)</div><div class='del'>-		return NULL;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The phy_info structures are never deallocated during lifetime of</div><div class='del'>-	 * a host, so the code below is safe without additional refcounting.</div><div class='del'>-	 */</div><div class='ctx'> 	mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> 	list_for_each_entry(port_info, &amp;ioc-&gt;sas_topology, list) {</div><div class='ctx'> 		for (i = 0; i &lt; port_info-&gt;num_phys; i++) {</div><div class='del'>-			if (port_info-&gt;phy_info[i].identify.sas_address ==</div><div class='del'>-			    device_info.sas_address &amp;&amp;</div><div class='del'>-			    port_info-&gt;phy_info[i].phy_id == phy_id) {</div><div class='del'>-				phy_info = &amp;port_info-&gt;phy_info[i];</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+			if (port_info-&gt;phy_info[i].attached.sas_address</div><div class='add'>+			    != sas_address)</div><div class='add'>+				continue;</div><div class='add'>+			if (!mptsas_is_end_device(</div><div class='add'>+				&amp;port_info-&gt;phy_info[i].attached))</div><div class='add'>+				continue;</div><div class='add'>+			phy_info = &amp;port_info-&gt;phy_info[i];</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='del'>-</div><div class='ctx'> 	return phy_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1638,21 +2057,19 @@ mptsas_find_phyinfo_by_target(MPT_ADAPTER *ioc, u32 id)</div><div class='ctx'> 	struct mptsas_phyinfo *phy_info = NULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * The phy_info structures are never deallocated during lifetime of</div><div class='del'>-	 * a host, so the code below is safe without additional refcounting.</div><div class='del'>-	 */</div><div class='ctx'> 	mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> 	list_for_each_entry(port_info, &amp;ioc-&gt;sas_topology, list) {</div><div class='del'>-		for (i = 0; i &lt; port_info-&gt;num_phys; i++)</div><div class='del'>-			if (mptsas_is_end_device(&amp;port_info-&gt;phy_info[i].attached))</div><div class='del'>-				if (port_info-&gt;phy_info[i].attached.id == id) {</div><div class='del'>-					phy_info = &amp;port_info-&gt;phy_info[i];</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='add'>+		for (i = 0; i &lt; port_info-&gt;num_phys; i++) {</div><div class='add'>+			if (port_info-&gt;phy_info[i].attached.id != id)</div><div class='add'>+				continue;</div><div class='add'>+			if (!mptsas_is_end_device(</div><div class='add'>+				&amp;port_info-&gt;phy_info[i].attached))</div><div class='add'>+				continue;</div><div class='add'>+			phy_info = &amp;port_info-&gt;phy_info[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='del'>-</div><div class='ctx'> 	return phy_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1660,7 +2077,7 @@ mptsas_find_phyinfo_by_target(MPT_ADAPTER *ioc, u32 id)</div><div class='ctx'>  * Work queue thread to clear the persitency table</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-mptscsih_sas_persist_clear_table(void * arg)</div><div class='add'>+mptsas_persist_clear_table(void * arg)</div><div class='ctx'> {</div><div class='ctx'> 	MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;</div><div class='ctx'> </div><div class='hunk'>@@ -1681,7 +2098,6 @@ mptsas_reprobe_target(struct scsi_target *starget, int uld_attach)</div><div class='ctx'> 			mptsas_reprobe_lun);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Work queue thread to handle SAS hotplug events</div><div class='ctx'>  */</div><div class='hunk'>@@ -1692,14 +2108,17 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 	MPT_ADAPTER *ioc = ev-&gt;ioc;</div><div class='ctx'> 	struct mptsas_phyinfo *phy_info;</div><div class='ctx'> 	struct sas_rphy *rphy;</div><div class='add'>+	struct sas_port *port;</div><div class='ctx'> 	struct scsi_device *sdev;</div><div class='add'>+	struct scsi_target * starget;</div><div class='ctx'> 	struct sas_identify identify;</div><div class='ctx'> 	char *ds = NULL;</div><div class='ctx'> 	struct mptsas_devinfo sas_device;</div><div class='ctx'> 	VirtTarget *vtarget;</div><div class='add'>+	VirtDevice *vdevice;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ioc-&gt;sas_discovery_mutex);</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;ioc-&gt;sas_discovery_mutex);</div><div class='ctx'> 	switch (ev-&gt;event_type) {</div><div class='ctx'> 	case MPTSAS_DEL_DEVICE:</div><div class='ctx'> </div><div class='hunk'>@@ -1708,24 +2127,50 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Sanity checks, for non-existing phys and remote rphys.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!phy_info)</div><div class='add'>+		if (!phy_info || !phy_info-&gt;port_details) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='ctx'> 			break;</div><div class='del'>-		if (!phy_info-&gt;rphy)</div><div class='add'>+		}</div><div class='add'>+		rphy = mptsas_get_rphy(phy_info);</div><div class='add'>+		if (!rphy) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='ctx'> 			break;</div><div class='del'>-		if (phy_info-&gt;starget) {</div><div class='del'>-			vtarget = phy_info-&gt;starget-&gt;hostdata;</div><div class='add'>+		}</div><div class='add'>+		port = mptsas_get_port(phy_info);</div><div class='add'>+		if (!port) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (!vtarget)</div><div class='add'>+		starget = mptsas_get_starget(phy_info);</div><div class='add'>+		if (starget) {</div><div class='add'>+			vtarget = starget-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+			if (!vtarget) {</div><div class='add'>+				dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+					"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+					__FUNCTION__, __LINE__));</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Handling  RAID components</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (ev-&gt;phys_disk_num_valid) {</div><div class='ctx'> 				vtarget-&gt;target_id = ev-&gt;phys_disk_num;</div><div class='ctx'> 				vtarget-&gt;tflags |= MPT_TARGET_FLAGS_RAID_COMPONENT;</div><div class='del'>-				mptsas_reprobe_target(vtarget-&gt;starget, 1);</div><div class='add'>+				mptsas_reprobe_target(starget, 1);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			vtarget-&gt;deleted = 1;</div><div class='add'>+			mptsas_target_reset(ioc, vtarget);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (phy_info-&gt;attached.device_info &amp; MPI_SAS_DEVICE_INFO_SSP_TARGET)</div><div class='hunk'>@@ -1739,10 +2184,11 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 		       "removing %s device, channel %d, id %d, phy %d\n",</div><div class='ctx'> 		       ioc-&gt;name, ds, ev-&gt;channel, ev-&gt;id, phy_info-&gt;phy_id);</div><div class='ctx'> </div><div class='del'>-		sas_rphy_delete(phy_info-&gt;rphy);</div><div class='del'>-		memset(&amp;phy_info-&gt;attached, 0, sizeof(struct mptsas_devinfo));</div><div class='del'>-		phy_info-&gt;rphy = NULL;</div><div class='del'>-		phy_info-&gt;starget = NULL;</div><div class='add'>+#ifdef MPT_DEBUG_SAS_WIDE</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;port-&gt;dev, "delete\n");</div><div class='add'>+#endif</div><div class='add'>+		sas_port_delete(port);</div><div class='add'>+		mptsas_port_delete(phy_info-&gt;port_details);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MPTSAS_ADD_DEVICE:</div><div class='ctx'> </div><div class='hunk'>@@ -1754,59 +2200,60 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (mptsas_sas_device_pg0(ioc, &amp;sas_device,</div><div class='ctx'> 		    (MPI_SAS_DEVICE_PGAD_FORM_BUS_TARGET_ID &lt;&lt;</div><div class='del'>-		     MPI_SAS_DEVICE_PGAD_FORM_SHIFT), ev-&gt;id))</div><div class='add'>+		     MPI_SAS_DEVICE_PGAD_FORM_SHIFT), ev-&gt;id)) {</div><div class='add'>+				dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+					"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+					__FUNCTION__, __LINE__));</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		phy_info = mptsas_find_phyinfo_by_parent(ioc,</div><div class='del'>-				sas_device.handle_parent, sas_device.phy_id);</div><div class='add'>+		ssleep(2);</div><div class='add'>+		__mptsas_discovery_work(ioc);</div><div class='ctx'> </div><div class='del'>-		if (!phy_info) {</div><div class='del'>-			u32 handle = 0xFFFF;</div><div class='add'>+		phy_info = mptsas_find_phyinfo_by_sas_address(ioc,</div><div class='add'>+				sas_device.sas_address);</div><div class='ctx'> </div><div class='del'>-			/*</div><div class='del'>-			* Its possible when an expander has been hot added</div><div class='del'>-			* containing attached devices, the sas firmware</div><div class='del'>-			* may send a RC_ADDED event prior to the</div><div class='del'>-			* DISCOVERY STOP event. If that occurs, our</div><div class='del'>-			* view of the topology in the driver in respect to this</div><div class='del'>-			* expander might of not been setup, and we hit this</div><div class='del'>-			* condition.</div><div class='del'>-			* Therefore, this code kicks off discovery to</div><div class='del'>-			* refresh the data.</div><div class='del'>-			* Then again, we check whether the parent phy has</div><div class='del'>-			* been created.</div><div class='del'>-			*/</div><div class='del'>-			ioc-&gt;sas_discovery_runtime=1;</div><div class='del'>-			mptsas_delete_expander_phys(ioc);</div><div class='del'>-			mptsas_probe_hba_phys(ioc);</div><div class='del'>-			while (!mptsas_probe_expander_phys(ioc, &amp;handle))</div><div class='del'>-				;</div><div class='del'>-			ioc-&gt;sas_discovery_runtime=0;</div><div class='del'>-</div><div class='del'>-			phy_info = mptsas_find_phyinfo_by_parent(ioc,</div><div class='del'>-				sas_device.handle_parent, sas_device.phy_id);</div><div class='del'>-			if (!phy_info)</div><div class='del'>-				break;</div><div class='add'>+		if (!phy_info || !phy_info-&gt;port_details) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (phy_info-&gt;starget) {</div><div class='del'>-			vtarget = phy_info-&gt;starget-&gt;hostdata;</div><div class='add'>+		starget = mptsas_get_starget(phy_info);</div><div class='add'>+		if (starget) {</div><div class='add'>+			vtarget = starget-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-			if (!vtarget)</div><div class='add'>+			if (!vtarget) {</div><div class='add'>+				dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+					"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+				       	__FUNCTION__, __LINE__));</div><div class='ctx'> 				break;</div><div class='add'>+			}</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Handling  RAID components</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (vtarget-&gt;tflags &amp; MPT_TARGET_FLAGS_RAID_COMPONENT) {</div><div class='ctx'> 				vtarget-&gt;tflags &amp;= ~MPT_TARGET_FLAGS_RAID_COMPONENT;</div><div class='ctx'> 				vtarget-&gt;target_id = ev-&gt;id;</div><div class='del'>-				mptsas_reprobe_target(phy_info-&gt;starget, 0);</div><div class='add'>+				mptsas_reprobe_target(starget, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (phy_info-&gt;rphy)</div><div class='add'>+		if (mptsas_get_rphy(phy_info)) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+		port = mptsas_get_port(phy_info);</div><div class='add'>+		if (!port) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		memcpy(&amp;phy_info-&gt;attached, &amp;sas_device,</div><div class='ctx'> 		    sizeof(struct mptsas_devinfo));</div><div class='hunk'>@@ -1823,28 +2270,23 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 		       ioc-&gt;name, ds, ev-&gt;channel, ev-&gt;id, ev-&gt;phy_id);</div><div class='ctx'> </div><div class='ctx'> 		mptsas_parse_device_info(&amp;identify, &amp;phy_info-&gt;attached);</div><div class='del'>-		switch (identify.device_type) {</div><div class='del'>-		case SAS_END_DEVICE:</div><div class='del'>-			rphy = sas_end_device_alloc(phy_info-&gt;phy);</div><div class='del'>-			break;</div><div class='del'>-		case SAS_EDGE_EXPANDER_DEVICE:</div><div class='del'>-		case SAS_FANOUT_EXPANDER_DEVICE:</div><div class='del'>-			rphy = sas_expander_alloc(phy_info-&gt;phy, identify.device_type);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rphy = NULL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!rphy)</div><div class='add'>+		rphy = sas_end_device_alloc(port);</div><div class='add'>+		if (!rphy) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='ctx'> 			break; /* non-fatal: an rphy can be added later */</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		rphy-&gt;identify = identify;</div><div class='ctx'> 		if (sas_rphy_add(rphy)) {</div><div class='add'>+			dfailprintk((MYIOC_s_ERR_FMT</div><div class='add'>+				"%s: exit at line=%d\n", ioc-&gt;name,</div><div class='add'>+			       	__FUNCTION__, __LINE__));</div><div class='ctx'> 			sas_rphy_free(rphy);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		phy_info-&gt;rphy = rphy;</div><div class='add'>+		mptsas_set_rphy(phy_info, rphy);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MPTSAS_ADD_RAID:</div><div class='ctx'> 		sdev = scsi_device_lookup(</div><div class='hunk'>@@ -1876,6 +2318,9 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 		printk(MYIOC_s_INFO_FMT</div><div class='ctx'> 		       "removing raid volume, channel %d, id %d\n",</div><div class='ctx'> 		       ioc-&gt;name, ioc-&gt;num_ports, ev-&gt;id);</div><div class='add'>+		vdevice = sdev-&gt;hostdata;</div><div class='add'>+		vdevice-&gt;vtarget-&gt;deleted = 1;</div><div class='add'>+		mptsas_target_reset(ioc, vdevice-&gt;vtarget);</div><div class='ctx'> 		scsi_remove_device(sdev);</div><div class='ctx'> 		scsi_device_put(sdev);</div><div class='ctx'> 		mpt_findImVolumes(ioc);</div><div class='hunk'>@@ -1885,12 +2330,13 @@ mptsas_hotplug_work(void *arg)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(ev);</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_discovery_mutex);</div><div class='add'>+	kfree(ev);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mptscsih_send_sas_event(MPT_ADAPTER *ioc,</div><div class='add'>+mptsas_send_sas_event(MPT_ADAPTER *ioc,</div><div class='ctx'> 		EVENT_DATA_SAS_DEVICE_STATUS_CHANGE *sas_event_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mptsas_hotplug_event *ev;</div><div class='hunk'>@@ -1906,7 +2352,7 @@ mptscsih_send_sas_event(MPT_ADAPTER *ioc,</div><div class='ctx'> 	switch (sas_event_data-&gt;ReasonCode) {</div><div class='ctx'> 	case MPI_EVENT_SAS_DEV_STAT_RC_ADDED:</div><div class='ctx'> 	case MPI_EVENT_SAS_DEV_STAT_RC_NOT_RESPONDING:</div><div class='del'>-		ev = kmalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='add'>+		ev = kzalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='ctx'> 		if (!ev) {</div><div class='ctx'> 			printk(KERN_WARNING "mptsas: lost hotplug event\n");</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1936,10 +2382,9 @@ mptscsih_send_sas_event(MPT_ADAPTER *ioc,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Persistent table is full.</div><div class='ctx'> 	 */</div><div class='del'>-		INIT_WORK(&amp;ioc-&gt;mptscsih_persistTask,</div><div class='del'>-		    mptscsih_sas_persist_clear_table,</div><div class='del'>-		    (void *)ioc);</div><div class='del'>-		schedule_work(&amp;ioc-&gt;mptscsih_persistTask);</div><div class='add'>+		INIT_WORK(&amp;ioc-&gt;sas_persist_task,</div><div class='add'>+		    mptsas_persist_clear_table, (void *)ioc);</div><div class='add'>+		schedule_work(&amp;ioc-&gt;sas_persist_task);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA:</div><div class='ctx'> 	/* TODO */</div><div class='hunk'>@@ -1951,7 +2396,7 @@ mptscsih_send_sas_event(MPT_ADAPTER *ioc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mptscsih_send_raid_event(MPT_ADAPTER *ioc,</div><div class='add'>+mptsas_send_raid_event(MPT_ADAPTER *ioc,</div><div class='ctx'> 		EVENT_DATA_RAID *raid_event_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mptsas_hotplug_event *ev;</div><div class='hunk'>@@ -1961,13 +2406,12 @@ mptscsih_send_raid_event(MPT_ADAPTER *ioc,</div><div class='ctx'> 	if (ioc-&gt;bus_type != SAS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ev = kmalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='add'>+	ev = kzalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='ctx'> 	if (!ev) {</div><div class='ctx'> 		printk(KERN_WARNING "mptsas: lost hotplug event\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ev,0,sizeof(struct mptsas_hotplug_event));</div><div class='ctx'> 	INIT_WORK(&amp;ev-&gt;work, mptsas_hotplug_work, ev);</div><div class='ctx'> 	ev-&gt;ioc = ioc;</div><div class='ctx'> 	ev-&gt;id = raid_event_data-&gt;VolumeID;</div><div class='hunk'>@@ -2029,7 +2473,7 @@ mptscsih_send_raid_event(MPT_ADAPTER *ioc,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mptscsih_send_discovery(MPT_ADAPTER *ioc,</div><div class='add'>+mptsas_send_discovery_event(MPT_ADAPTER *ioc,</div><div class='ctx'> 	EVENT_DATA_SAS_DISCOVERY *discovery_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mptsas_discovery_event *ev;</div><div class='hunk'>@@ -2044,11 +2488,10 @@ mptscsih_send_discovery(MPT_ADAPTER *ioc,</div><div class='ctx'> 	if (discovery_data-&gt;DiscoveryStatus)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	ev = kmalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='add'>+	ev = kzalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='ctx'> 	if (!ev)</div><div class='ctx'> 		return;</div><div class='del'>-	memset(ev,0,sizeof(struct mptsas_discovery_event));</div><div class='del'>-	INIT_WORK(&amp;ev-&gt;work, mptscsih_discovery_work, ev);</div><div class='add'>+	INIT_WORK(&amp;ev-&gt;work, mptsas_discovery_work, ev);</div><div class='ctx'> 	ev-&gt;ioc = ioc;</div><div class='ctx'> 	schedule_work(&amp;ev-&gt;work);</div><div class='ctx'> };</div><div class='hunk'>@@ -2076,21 +2519,21 @@ mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case MPI_EVENT_SAS_DEVICE_STATUS_CHANGE:</div><div class='del'>-		mptscsih_send_sas_event(ioc,</div><div class='add'>+		mptsas_send_sas_event(ioc,</div><div class='ctx'> 			(EVENT_DATA_SAS_DEVICE_STATUS_CHANGE *)reply-&gt;Data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MPI_EVENT_INTEGRATED_RAID:</div><div class='del'>-		mptscsih_send_raid_event(ioc,</div><div class='add'>+		mptsas_send_raid_event(ioc,</div><div class='ctx'> 			(EVENT_DATA_RAID *)reply-&gt;Data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MPI_EVENT_PERSISTENT_TABLE_FULL:</div><div class='del'>-		INIT_WORK(&amp;ioc-&gt;mptscsih_persistTask,</div><div class='del'>-		    mptscsih_sas_persist_clear_table,</div><div class='add'>+		INIT_WORK(&amp;ioc-&gt;sas_persist_task,</div><div class='add'>+		    mptsas_persist_clear_table,</div><div class='ctx'> 		    (void *)ioc);</div><div class='del'>-		schedule_work(&amp;ioc-&gt;mptscsih_persistTask);</div><div class='add'>+		schedule_work(&amp;ioc-&gt;sas_persist_task);</div><div class='ctx'> 		break;</div><div class='ctx'> 	 case MPI_EVENT_SAS_DISCOVERY:</div><div class='del'>-		mptscsih_send_discovery(ioc,</div><div class='add'>+		mptsas_send_discovery_event(ioc,</div><div class='ctx'> 			(EVENT_DATA_SAS_DISCOVERY *)reply-&gt;Data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2309,7 +2752,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_mptsas_probe:</div><div class='add'>+ out_mptsas_probe:</div><div class='ctx'> </div><div class='ctx'> 	mptscsih_remove(pdev);</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -2319,6 +2762,7 @@ static void __devexit mptsas_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct mptsas_portinfo *p, *n;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	ioc-&gt;sas_discovery_ignore_events=1;</div><div class='ctx'> 	sas_remove_host(ioc-&gt;sh);</div><div class='hunk'>@@ -2326,8 +2770,9 @@ static void __devexit mptsas_remove(struct pci_dev *pdev)</div><div class='ctx'> 	mutex_lock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='ctx'> 	list_for_each_entry_safe(p, n, &amp;ioc-&gt;sas_topology, list) {</div><div class='ctx'> 		list_del(&amp;p-&gt;list);</div><div class='del'>-		if (p-&gt;phy_info)</div><div class='del'>-			kfree(p-&gt;phy_info);</div><div class='add'>+		for (i = 0 ; i &lt; p-&gt;num_phys ; i++)</div><div class='add'>+			mptsas_port_delete(p-&gt;phy_info[i].port_details);</div><div class='add'>+		kfree(p-&gt;phy_info);</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ioc-&gt;sas_topology_mutex);</div><div class='hunk'>@@ -2336,17 +2781,15 @@ static void __devexit mptsas_remove(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id mptsas_pci_table[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1066,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1068,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064E,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064E,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1066E,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068E,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1068E,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='ctx'> 	{0}	/* Terminating entry */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c<br/>index 84fa271eb8f4..8242b16e3168 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptscsih.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptscsih.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptscsih.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/mptscsih.c</a></div><div class='hunk'>@@ -1922,7 +1922,7 @@ mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout )</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;hd-&gt;ioc-&gt;FreeQlock, flags);</div><div class='del'>-		msleep_interruptible(250);</div><div class='add'>+		msleep(250);</div><div class='ctx'> 	} while (--loop_count);</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -2521,18 +2521,6 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)</div><div class='ctx'> 			hd-&gt;cmdPtr = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* 7. FC: Rescan for blocked rports which might have returned.</div><div class='del'>-		 */</div><div class='del'>-		if (ioc-&gt;bus_type == FC) {</div><div class='del'>-			spin_lock_irqsave(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='del'>-			if (ioc-&gt;fc_rescan_work_q) {</div><div class='del'>-				if (ioc-&gt;fc_rescan_work_count++ == 0) {</div><div class='del'>-					queue_work(ioc-&gt;fc_rescan_work_q,</div><div class='del'>-						   &amp;ioc-&gt;fc_rescan_work);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='del'>-		}</div><div class='ctx'> 		dtmprintk((MYIOC_s_WARN_FMT "Post-Reset complete.\n", ioc-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -2546,7 +2534,6 @@ mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)</div><div class='ctx'> {</div><div class='ctx'> 	MPT_SCSI_HOST *hd;</div><div class='ctx'> 	u8 event = le32_to_cpu(pEvReply-&gt;Event) &amp; 0xFF;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	devtverboseprintk((MYIOC_s_INFO_FMT "MPT event (=%02Xh) routed to SCSI host driver!\n",</div><div class='ctx'> 			ioc-&gt;name, event));</div><div class='hunk'>@@ -2569,14 +2556,6 @@ mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MPI_EVENT_RESCAN:				/* 06 */</div><div class='del'>-		spin_lock_irqsave(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='del'>-		if (ioc-&gt;fc_rescan_work_q) {</div><div class='del'>-			if (ioc-&gt;fc_rescan_work_count++ == 0) {</div><div class='del'>-				queue_work(ioc-&gt;fc_rescan_work_q,</div><div class='del'>-					   &amp;ioc-&gt;fc_rescan_work);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;ioc-&gt;fc_rescan_work_lock, flags);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='head'>diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c<br/>index f2a4d382ea19..0a1ff762205f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptspi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/fusion/mptspi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/fusion/mptspi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/fusion/mptspi.c</a></div><div class='hunk'>@@ -775,9 +775,9 @@ static struct spi_function_template mptspi_transport_functions = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id mptspi_pci_table[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1030,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='del'>-	{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_1030_53C1035,</div><div class='add'>+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID },</div><div class='ctx'> 	{0}	/* Terminating entry */</div><div class='ctx'> };</div><div class='hunk'>@@ -831,6 +831,7 @@ mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * spi module resume handler</div><div class='ctx'>  */</div><div class='hunk'>@@ -846,6 +847,7 @@ mptspi_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='ctx'> /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/</div><div class='head'>diff --git a/drivers/message/i2o/core.h b/drivers/message/i2o/core.h<br/>index 184974cc734d..dc388a3ff5e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/core.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/core.h</a></div><div class='hunk'>@@ -38,6 +38,9 @@ extern struct device_attribute i2o_device_attrs[];</div><div class='ctx'> extern void i2o_device_remove(struct i2o_device *);</div><div class='ctx'> extern int i2o_device_parse_lct(struct i2o_controller *);</div><div class='ctx'> </div><div class='add'>+int i2o_parm_issue(struct i2o_device *i2o_dev, int cmd, void *oplist,</div><div class='add'>+		   int oplen, void *reslist, int reslen);</div><div class='add'>+</div><div class='ctx'> /* IOP */</div><div class='ctx'> extern struct i2o_controller *i2o_iop_alloc(void);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c<br/>index 5a6cca8e8c45..8abe45e49ad7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/debug.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c<br/>index 5ea133c59afb..7bd4d85d0b42 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/exec-osm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/exec-osm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/exec-osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/exec-osm.c</a></div><div class='hunk'>@@ -55,6 +55,7 @@ struct i2o_exec_wait {</div><div class='ctx'> 	u32 m;			/* message id */</div><div class='ctx'> 	struct i2o_message *msg;	/* pointer to the reply message */</div><div class='ctx'> 	struct list_head list;	/* node in global wait list */</div><div class='add'>+	spinlock_t lock;	/* lock before modifying */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Work struct needed to handle LCT NOTIFY replies */</div><div class='hunk'>@@ -87,6 +88,7 @@ static struct i2o_exec_wait *i2o_exec_wait_alloc(void)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;wait-&gt;list);</div><div class='add'>+	spin_lock_init(&amp;wait-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return wait;</div><div class='ctx'> };</div><div class='hunk'>@@ -125,6 +127,7 @@ int i2o_msg_post_wait_mem(struct i2o_controller *c, struct i2o_message *msg,</div><div class='ctx'> 	DECLARE_WAIT_QUEUE_HEAD(wq);</div><div class='ctx'> 	struct i2o_exec_wait *wait;</div><div class='ctx'> 	static u32 tcntxt = 0x80000000;</div><div class='add'>+	long flags;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	wait = i2o_exec_wait_alloc();</div><div class='hunk'>@@ -146,33 +149,28 @@ int i2o_msg_post_wait_mem(struct i2o_controller *c, struct i2o_message *msg,</div><div class='ctx'> 	wait-&gt;tcntxt = tcntxt++;</div><div class='ctx'> 	msg-&gt;u.s.tcntxt = cpu_to_le32(wait-&gt;tcntxt);</div><div class='ctx'> </div><div class='add'>+	wait-&gt;wq = &amp;wq;</div><div class='add'>+	/*</div><div class='add'>+	 * we add elements to the head, because if a entry in the list will</div><div class='add'>+	 * never be removed, we have to iterate over it every time</div><div class='add'>+	 */</div><div class='add'>+	list_add(&amp;wait-&gt;list, &amp;i2o_exec_wait_list);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Post the message to the controller. At some point later it will</div><div class='ctx'> 	 * return. If we time out before it returns then complete will be zero.</div><div class='ctx'> 	 */</div><div class='ctx'> 	i2o_msg_post(c, msg);</div><div class='ctx'> </div><div class='del'>-	if (!wait-&gt;complete) {</div><div class='del'>-		wait-&gt;wq = &amp;wq;</div><div class='del'>-		/*</div><div class='del'>-		 * we add elements add the head, because if a entry in the list</div><div class='del'>-		 * will never be removed, we have to iterate over it every time</div><div class='del'>-		 */</div><div class='del'>-		list_add(&amp;wait-&gt;list, &amp;i2o_exec_wait_list);</div><div class='del'>-</div><div class='del'>-		wait_event_interruptible_timeout(wq, wait-&gt;complete,</div><div class='del'>-						 timeout * HZ);</div><div class='add'>+	wait_event_interruptible_timeout(wq, wait-&gt;complete, timeout * HZ);</div><div class='ctx'> </div><div class='del'>-		wait-&gt;wq = NULL;</div><div class='del'>-	}</div><div class='add'>+	spin_lock_irqsave(&amp;wait-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	barrier();</div><div class='add'>+	wait-&gt;wq = NULL;</div><div class='ctx'> </div><div class='del'>-	if (wait-&gt;complete) {</div><div class='add'>+	if (wait-&gt;complete)</div><div class='ctx'> 		rc = le32_to_cpu(wait-&gt;msg-&gt;body[0]) &gt;&gt; 24;</div><div class='del'>-		i2o_flush_reply(c, wait-&gt;m);</div><div class='del'>-		i2o_exec_wait_free(wait);</div><div class='del'>-	} else {</div><div class='add'>+	else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We cannot remove it now. This is important. When it does</div><div class='ctx'> 		 * terminate (which it must do if the controller has not</div><div class='hunk'>@@ -186,6 +184,13 @@ int i2o_msg_post_wait_mem(struct i2o_controller *c, struct i2o_message *msg,</div><div class='ctx'> 		rc = -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;wait-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (rc != -ETIMEDOUT) {</div><div class='add'>+		i2o_flush_reply(c, wait-&gt;m);</div><div class='add'>+		i2o_exec_wait_free(wait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +218,6 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m,</div><div class='ctx'> {</div><div class='ctx'> 	struct i2o_exec_wait *wait, *tmp;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;</div><div class='ctx'> 	int rc = 1;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -223,23 +227,24 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m,</div><div class='ctx'> 	 * already expired. Not much we can do about that except log it for</div><div class='ctx'> 	 * debug purposes, increase timeout, and recompile.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;lock, flags);</div><div class='ctx'> 	list_for_each_entry_safe(wait, tmp, &amp;i2o_exec_wait_list, list) {</div><div class='ctx'> 		if (wait-&gt;tcntxt == context) {</div><div class='del'>-			list_del(&amp;wait-&gt;list);</div><div class='add'>+			spin_lock_irqsave(&amp;wait-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-			spin_unlock_irqrestore(&amp;lock, flags);</div><div class='add'>+			list_del(&amp;wait-&gt;list);</div><div class='ctx'> </div><div class='ctx'> 			wait-&gt;m = m;</div><div class='ctx'> 			wait-&gt;msg = msg;</div><div class='ctx'> 			wait-&gt;complete = 1;</div><div class='ctx'> </div><div class='del'>-			barrier();</div><div class='del'>-</div><div class='del'>-			if (wait-&gt;wq) {</div><div class='del'>-				wake_up_interruptible(wait-&gt;wq);</div><div class='add'>+			if (wait-&gt;wq)</div><div class='ctx'> 				rc = 0;</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='add'>+				rc = -1;</div><div class='add'>+</div><div class='add'>+			spin_unlock_irqrestore(&amp;wait-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+			if (rc) {</div><div class='ctx'> 				struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 				dev = &amp;c-&gt;pdev-&gt;dev;</div><div class='hunk'>@@ -248,15 +253,13 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m,</div><div class='ctx'> 					 c-&gt;name);</div><div class='ctx'> 				i2o_dma_free(dev, &amp;wait-&gt;dma);</div><div class='ctx'> 				i2o_exec_wait_free(wait);</div><div class='del'>-				rc = -1;</div><div class='del'>-			}</div><div class='add'>+			} else</div><div class='add'>+				wake_up_interruptible(wait-&gt;wq);</div><div class='ctx'> </div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	osm_warn("%s: Bogus reply in POST WAIT (tr-context: %08x)!\n", c-&gt;name,</div><div class='ctx'> 		 context);</div><div class='ctx'> </div><div class='hunk'>@@ -322,14 +325,9 @@ static DEVICE_ATTR(product_id, S_IRUGO, i2o_exec_show_product_id, NULL);</div><div class='ctx'> static int i2o_exec_probe(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2o_device *i2o_dev = to_i2o_device(dev);</div><div class='del'>-	struct i2o_controller *c = i2o_dev-&gt;iop;</div><div class='ctx'> </div><div class='ctx'> 	i2o_event_register(i2o_dev, &amp;i2o_exec_driver, 0, 0xffffffff);</div><div class='ctx'> </div><div class='del'>-	c-&gt;exec = i2o_dev;</div><div class='del'>-</div><div class='del'>-	i2o_exec_lct_notify(c, c-&gt;lct-&gt;change_ind + 1);</div><div class='del'>-</div><div class='ctx'> 	device_create_file(dev, &amp;dev_attr_vendor_id);</div><div class='ctx'> 	device_create_file(dev, &amp;dev_attr_product_id);</div><div class='ctx'> </div><div class='hunk'>@@ -523,6 +521,8 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct i2o_message *msg;</div><div class='ctx'> </div><div class='add'>+	down(&amp;c-&gt;lct_lock);</div><div class='add'>+</div><div class='ctx'> 	dev = &amp;c-&gt;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (i2o_dma_realloc</div><div class='hunk'>@@ -545,6 +545,8 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)</div><div class='ctx'> </div><div class='ctx'> 	i2o_msg_post(c, msg);</div><div class='ctx'> </div><div class='add'>+	up(&amp;c-&gt;lct_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c<br/>index 7d4c5497785b..1ddc2fb429d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_block.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/i2o_block.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/i2o_block.c</a></div><div class='hunk'>@@ -1089,7 +1089,6 @@ static int i2o_block_probe(struct device *dev)</div><div class='ctx'> 	gd = i2o_blk_dev-&gt;gd;</div><div class='ctx'> 	gd-&gt;first_minor = unit &lt;&lt; 4;</div><div class='ctx'> 	sprintf(gd-&gt;disk_name, "i2o/hd%c", 'a' + unit);</div><div class='del'>-	sprintf(gd-&gt;devfs_name, "i2o/hd%c", 'a' + unit);</div><div class='ctx'> 	gd-&gt;driverfs_dev = &amp;i2o_dev-&gt;device;</div><div class='ctx'> </div><div class='ctx'> 	/* setup request queue */</div><div class='head'>diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c<br/>index 89daf67b764d..7d23e082bf26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/i2o_config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/i2o_config.c</a></div><div class='hunk'>@@ -36,9 +36,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#define SG_TABLESIZE		30</div><div class='add'>+#include "core.h"</div><div class='ctx'> </div><div class='del'>-extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int);</div><div class='add'>+#define SG_TABLESIZE		30</div><div class='ctx'> </div><div class='ctx'> static int i2o_cfg_ioctl(struct inode *, struct file *, unsigned int,</div><div class='ctx'> 			 unsigned long);</div><div class='head'>diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c<br/>index c08ddac3717d..6ebf38213f9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/i2o_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/i2o_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/i2o_scsi.c</a></div><div class='hunk'>@@ -65,9 +65,7 @@</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;scsi/sg.h&gt;</div><div class='del'>-#include &lt;scsi/sg_request.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OSM_NAME	"scsi-osm"</div><div class='ctx'> #define OSM_VERSION	"1.316"</div><div class='hunk'>@@ -588,6 +586,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,</div><div class='ctx'> </div><div class='ctx'> 	mptr = &amp;msg-&gt;body[0];</div><div class='ctx'> </div><div class='add'>+#if 0 /* this code can't work */</div><div class='ctx'> #ifdef CONFIG_I2O_EXT_ADAPTEC</div><div class='ctx'> 	if (c-&gt;adaptec) {</div><div class='ctx'> 		u32 adpt_flags = 0;</div><div class='hunk'>@@ -625,6 +624,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,</div><div class='ctx'> 		*mptr++ = cpu_to_le32(adpt_flags | tid);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	msg-&gt;u.head[1] = cpu_to_le32(cmd | HOST_TID &lt;&lt; 12 | tid);</div><div class='ctx'> 	msg-&gt;u.s.icntxt = cpu_to_le32(i2o_scsi_driver.context);</div><div class='head'>diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c<br/>index 492167446936..3305c12372a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/iop.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/iop.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/iop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/iop.c</a></div><div class='hunk'>@@ -683,9 +683,10 @@ static int i2o_iop_systab_set(struct i2o_controller *c)</div><div class='ctx'> 			c-&gt;mem_alloc = 1;</div><div class='ctx'> 			sb-&gt;current_mem_size = 1 + res-&gt;end - res-&gt;start;</div><div class='ctx'> 			sb-&gt;current_mem_base = res-&gt;start;</div><div class='del'>-			osm_info("%s: allocated %ld bytes of PCI memory at "</div><div class='del'>-				 "0x%08lX.\n", c-&gt;name,</div><div class='del'>-				 1 + res-&gt;end - res-&gt;start, res-&gt;start);</div><div class='add'>+			osm_info("%s: allocated %llu bytes of PCI memory at "</div><div class='add'>+				"0x%016llX.\n", c-&gt;name,</div><div class='add'>+				(unsigned long long)(1 + res-&gt;end - res-&gt;start),</div><div class='add'>+				(unsigned long long)res-&gt;start);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -704,9 +705,10 @@ static int i2o_iop_systab_set(struct i2o_controller *c)</div><div class='ctx'> 			c-&gt;io_alloc = 1;</div><div class='ctx'> 			sb-&gt;current_io_size = 1 + res-&gt;end - res-&gt;start;</div><div class='ctx'> 			sb-&gt;current_mem_base = res-&gt;start;</div><div class='del'>-			osm_info("%s: allocated %ld bytes of PCI I/O at 0x%08lX"</div><div class='del'>-				 ".\n", c-&gt;name, 1 + res-&gt;end - res-&gt;start,</div><div class='del'>-				 res-&gt;start);</div><div class='add'>+			osm_info("%s: allocated %llu bytes of PCI I/O at "</div><div class='add'>+				"0x%016llX.\n", c-&gt;name,</div><div class='add'>+				(unsigned long long)(1 + res-&gt;end - res-&gt;start),</div><div class='add'>+				(unsigned long long)res-&gt;start);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -804,8 +806,6 @@ void i2o_iop_remove(struct i2o_controller *c)</div><div class='ctx'> </div><div class='ctx'> 	/* Ask the IOP to switch to RESET state */</div><div class='ctx'> 	i2o_iop_reset(c);</div><div class='del'>-</div><div class='del'>-	put_device(&amp;c-&gt;device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1059,7 +1059,7 @@ struct i2o_controller *i2o_iop_alloc(void)</div><div class='ctx'> </div><div class='ctx'> 	snprintf(poolname, sizeof(poolname), "i2o_%s_msg_inpool", c-&gt;name);</div><div class='ctx'> 	if (i2o_pool_alloc</div><div class='del'>-	    (&amp;c-&gt;in_msg, poolname, I2O_INBOUND_MSG_FRAME_SIZE * 4,</div><div class='add'>+	    (&amp;c-&gt;in_msg, poolname, I2O_INBOUND_MSG_FRAME_SIZE * 4 + sizeof(u32),</div><div class='ctx'> 	     I2O_MSG_INPOOL_MIN)) {</div><div class='ctx'> 		kfree(c);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='hunk'>@@ -1241,7 +1241,6 @@ EXPORT_SYMBOL(i2o_cntxt_list_remove);</div><div class='ctx'> EXPORT_SYMBOL(i2o_cntxt_list_get_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> EXPORT_SYMBOL(i2o_msg_get_wait);</div><div class='del'>-EXPORT_SYMBOL(i2o_msg_nop);</div><div class='ctx'> EXPORT_SYMBOL(i2o_find_iop);</div><div class='ctx'> EXPORT_SYMBOL(i2o_iop_find_device);</div><div class='ctx'> EXPORT_SYMBOL(i2o_event_register);</div><div class='head'>diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c<br/>index 4f1515cae5dc..1b58444d5aaf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/message/i2o/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/message/i2o/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/message/i2o/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/message/i2o/pci.c</a></div><div class='hunk'>@@ -274,7 +274,7 @@ static int i2o_pci_irq_enable(struct i2o_controller *c)</div><div class='ctx'> 	writel(0xffffffff, c-&gt;irq_mask);</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;irq) {</div><div class='del'>-		rc = request_irq(pdev-&gt;irq, i2o_pci_interrupt, SA_SHIRQ,</div><div class='add'>+		rc = request_irq(pdev-&gt;irq, i2o_pci_interrupt, IRQF_SHARED,</div><div class='ctx'> 				 c-&gt;name, c);</div><div class='ctx'> 		if (rc &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: unable to allocate interrupt %d."</div><div class='head'>diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c<br/>index aff83f966803..2bf32721eb53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mfd/ucb1x00-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mfd/ucb1x00-core.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *  Note that all locks are private to this file.  Nothing else may</div><div class='ctx'>  *  touch them.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -420,8 +419,10 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb)</div><div class='ctx'> 	unsigned long mask;</div><div class='ctx'> </div><div class='ctx'> 	mask = probe_irq_on();</div><div class='del'>-	if (!mask)</div><div class='add'>+	if (!mask) {</div><div class='add'>+		probe_irq_off(mask);</div><div class='ctx'> 		return NO_IRQ;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable the ADC interrupt.</div><div class='hunk'>@@ -478,7 +479,7 @@ static int ucb1x00_probe(struct mcp *mcp)</div><div class='ctx'> 	mcp_enable(mcp);</div><div class='ctx'> 	id = mcp_reg_read(mcp, UCB_ID);</div><div class='ctx'> </div><div class='del'>-	if (id != UCB_ID_1200 &amp;&amp; id != UCB_ID_1300) {</div><div class='add'>+	if (id != UCB_ID_1200 &amp;&amp; id != UCB_ID_1300 &amp;&amp; id != UCB_ID_TC35143) {</div><div class='ctx'> 		printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -507,7 +508,7 @@ static int ucb1x00_probe(struct mcp *mcp)</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(ucb-&gt;irq, ucb1x00_irq, SA_TRIGGER_RISING,</div><div class='add'>+	ret = request_irq(ucb-&gt;irq, ucb1x00_irq, IRQF_TRIGGER_RISING,</div><div class='ctx'> 			  "UCB1x00", ucb);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",</div><div class='head'>diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c<br/>index 79fd062ccb34..02776814443e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-ts.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mfd/ucb1x00-ts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00-ts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mfd/ucb1x00-ts.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * pin should provide pulses even when the LCD is blanked, otherwise</div><div class='ctx'>  * a pen touch needed to unblank the LCD will never be read.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h<br/>index 9c9a647d8b7b..ca8df8072d43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mfd/ucb1x00.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mfd/ucb1x00.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mfd/ucb1x00.h</a></div><div class='hunk'>@@ -94,6 +94,7 @@</div><div class='ctx'> #define UCB_ID		0x0c</div><div class='ctx'> #define UCB_ID_1200		0x1004</div><div class='ctx'> #define UCB_ID_1300		0x1005</div><div class='add'>+#define UCB_ID_TC35143          0x9712</div><div class='ctx'> </div><div class='ctx'> #define UCB_MODE	0x0d</div><div class='ctx'> #define UCB_MODE_DYN_VFLAG_ENA	(1 &lt;&lt; 12)</div><div class='head'>diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h<br/>index 6aba41954448..634d538ccd14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/misc/ibmasm/ibmasm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/misc/ibmasm/ibmasm.h</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='head'>diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c<br/>index 26a230b6ff80..4a35caff5d02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasmfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/misc/ibmasm/ibmasmfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/ibmasmfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/misc/ibmasm/ibmasmfs.c</a></div><div class='hunk'>@@ -90,10 +90,11 @@ static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root);</div><div class='ctx'> static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct super_block *ibmasmfs_get_super(struct file_system_type *fst,</div><div class='del'>-			int flags, const char *name, void *data)</div><div class='add'>+static int ibmasmfs_get_super(struct file_system_type *fst,</div><div class='add'>+			int flags, const char *name, void *data,</div><div class='add'>+			struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fst, flags, data, ibmasmfs_fill_super);</div><div class='add'>+	return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct super_operations ibmasmfs_s_ops = {</div><div class='head'>diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c<br/>index 1fdf03fd2da7..2f3bddfab937 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/module.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/misc/ibmasm/module.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/misc/ibmasm/module.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/misc/ibmasm/module.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(sp, 0, sizeof(struct service_processor));</div><div class='ctx'> </div><div class='del'>-	sp-&gt;lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+	spin_lock_init(&amp;sp-&gt;lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;sp-&gt;command_queue);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, (void *)sp);</div><div class='hunk'>@@ -113,7 +113,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> 		goto error_ioremap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	result = request_irq(sp-&gt;irq, ibmasm_interrupt_handler, SA_SHIRQ, sp-&gt;devname, (void*)sp);</div><div class='add'>+	result = request_irq(sp-&gt;irq, ibmasm_interrupt_handler, IRQF_SHARED, sp-&gt;devname, (void*)sp);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		dev_err(sp-&gt;dev, "Failed to register interrupt handler\n");</div><div class='ctx'> 		goto error_request_irq;</div><div class='head'>diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig<br/>index 003b077c2324..45bcf098e762 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/Kconfig</a></div><div class='hunk'>@@ -84,7 +84,7 @@ config MMC_WBSD</div><div class='ctx'> </div><div class='ctx'> config MMC_AU1X</div><div class='ctx'> 	tristate "Alchemy AU1XX0 MMC Card Interface support"</div><div class='del'>-	depends on SOC_AU1X00 &amp;&amp; MMC</div><div class='add'>+	depends on MMC &amp;&amp; SOC_AU1200</div><div class='ctx'> 	help</div><div class='ctx'> 	  This selects the AMD Alchemy(R) Multimedia card interface.</div><div class='ctx'> 	  If you have a Alchemy platform with a MMC slot, say Y or M here.</div><div class='head'>diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c<br/>index 88f0eef9cf33..6b7638b84290 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/at91_mci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/at91_mci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/at91_mci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/at91_mci.c</a></div><div class='hunk'>@@ -53,7 +53,6 @@</div><div class='ctx'>      Gets the status of the write protect pin, if available.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -81,13 +80,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef	SUPPORT_4WIRE</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MMC_DEBUG</div><div class='del'>-#define DBG(fmt...)	\</div><div class='del'>-	printk(fmt)</div><div class='del'>-#else</div><div class='del'>-#define DBG(fmt...)	do { } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static struct clk *mci_clk;</div><div class='ctx'> </div><div class='ctx'> #define FL_SENT_COMMAND (1 &lt;&lt; 0)</div><div class='hunk'>@@ -202,50 +194,50 @@ static void at91mci_pre_dma_read(struct at91mci_host *host)</div><div class='ctx'> 	struct mmc_command *cmd;</div><div class='ctx'> 	struct mmc_data *data;</div><div class='ctx'> </div><div class='del'>-	DBG("pre dma read\n");</div><div class='add'>+	pr_debug("pre dma read\n");</div><div class='ctx'> </div><div class='ctx'> 	cmd = host-&gt;cmd;</div><div class='ctx'> 	if (!cmd) {</div><div class='del'>-		DBG("no command\n");</div><div class='add'>+		pr_debug("no command\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data = cmd-&gt;data;</div><div class='ctx'> 	if (!data) {</div><div class='del'>-		DBG("no data\n");</div><div class='add'>+		pr_debug("no data\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		/* nothing left to transfer */</div><div class='ctx'> 		if (host-&gt;transfer_index &gt;= data-&gt;sg_len) {</div><div class='del'>-			DBG("Nothing left to transfer (index = %d)\n", host-&gt;transfer_index);</div><div class='add'>+			pr_debug("Nothing left to transfer (index = %d)\n", host-&gt;transfer_index);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check to see if this needs filling */</div><div class='ctx'> 		if (i == 0) {</div><div class='ctx'> 			if (at91_mci_read(AT91_PDC_RCR) != 0) {</div><div class='del'>-				DBG("Transfer active in current\n");</div><div class='add'>+				pr_debug("Transfer active in current\n");</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='ctx'> 			if (at91_mci_read(AT91_PDC_RNCR) != 0) {</div><div class='del'>-				DBG("Transfer active in next\n");</div><div class='add'>+				pr_debug("Transfer active in next\n");</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Setup the next transfer */</div><div class='del'>-		DBG("Using transfer index %d\n", host-&gt;transfer_index);</div><div class='add'>+		pr_debug("Using transfer index %d\n", host-&gt;transfer_index);</div><div class='ctx'> </div><div class='ctx'> 		sg = &amp;data-&gt;sg[host-&gt;transfer_index++];</div><div class='del'>-		DBG("sg = %p\n", sg);</div><div class='add'>+		pr_debug("sg = %p\n", sg);</div><div class='ctx'> </div><div class='ctx'> 		sg-&gt;dma_address = dma_map_page(NULL, sg-&gt;page, sg-&gt;offset, sg-&gt;length, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-		DBG("dma address = %08X, length = %d\n", sg-&gt;dma_address, sg-&gt;length);</div><div class='add'>+		pr_debug("dma address = %08X, length = %d\n", sg-&gt;dma_address, sg-&gt;length);</div><div class='ctx'> </div><div class='ctx'> 		if (i == 0) {</div><div class='ctx'> 			at91_mci_write(AT91_PDC_RPR, sg-&gt;dma_address);</div><div class='hunk'>@@ -257,7 +249,7 @@ static void at91mci_pre_dma_read(struct at91mci_host *host)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DBG("pre dma read done\n");</div><div class='add'>+	pr_debug("pre dma read done\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -268,17 +260,17 @@ static void at91mci_post_dma_read(struct at91mci_host *host)</div><div class='ctx'> 	struct mmc_command *cmd;</div><div class='ctx'> 	struct mmc_data *data;</div><div class='ctx'> </div><div class='del'>-	DBG("post dma read\n");</div><div class='add'>+	pr_debug("post dma read\n");</div><div class='ctx'> </div><div class='ctx'> 	cmd = host-&gt;cmd;</div><div class='ctx'> 	if (!cmd) {</div><div class='del'>-		DBG("no command\n");</div><div class='add'>+		pr_debug("no command\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	data = cmd-&gt;data;</div><div class='ctx'> 	if (!data) {</div><div class='del'>-		DBG("no data\n");</div><div class='add'>+		pr_debug("no data\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -289,17 +281,17 @@ static void at91mci_post_dma_read(struct at91mci_host *host)</div><div class='ctx'> </div><div class='ctx'> 		struct scatterlist *sg;</div><div class='ctx'> </div><div class='del'>-		DBG("finishing index %d\n", host-&gt;in_use_index);</div><div class='add'>+		pr_debug("finishing index %d\n", host-&gt;in_use_index);</div><div class='ctx'> </div><div class='ctx'> 		sg = &amp;data-&gt;sg[host-&gt;in_use_index++];</div><div class='ctx'> </div><div class='del'>-		DBG("Unmapping page %08X\n", sg-&gt;dma_address);</div><div class='add'>+		pr_debug("Unmapping page %08X\n", sg-&gt;dma_address);</div><div class='ctx'> </div><div class='ctx'> 		dma_unmap_page(NULL, sg-&gt;dma_address, sg-&gt;length, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		/* Swap the contents of the buffer */</div><div class='ctx'> 		buffer = kmap_atomic(sg-&gt;page, KM_BIO_SRC_IRQ) + sg-&gt;offset;</div><div class='del'>-		DBG("buffer = %p, length = %d\n", buffer, sg-&gt;length);</div><div class='add'>+		pr_debug("buffer = %p, length = %d\n", buffer, sg-&gt;length);</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;bytes_xfered += sg-&gt;length;</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +312,7 @@ static void at91mci_post_dma_read(struct at91mci_host *host)</div><div class='ctx'> 		at91_mci_write(AT91_PDC_PTCR, AT91_PDC_RXTDIS | AT91_PDC_TXTDIS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DBG("post dma read done\n");</div><div class='add'>+	pr_debug("post dma read done\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -331,7 +323,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)</div><div class='ctx'> 	struct mmc_command *cmd;</div><div class='ctx'> 	struct mmc_data *data;</div><div class='ctx'> </div><div class='del'>-	DBG("Handling the transmit\n");</div><div class='add'>+	pr_debug("Handling the transmit\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Disable the transfer */</div><div class='ctx'> 	at91_mci_write(AT91_PDC_PTCR, AT91_PDC_RXTDIS | AT91_PDC_TXTDIS);</div><div class='hunk'>@@ -387,12 +379,12 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_</div><div class='ctx'> 	/* Not sure if this is needed */</div><div class='ctx'> #if 0</div><div class='ctx'> 	if ((at91_mci_read(AT91_MCI_SR) &amp; AT91_MCI_RTOE) &amp;&amp; (cmd-&gt;opcode == 1)) {</div><div class='del'>-		DBG("Clearing timeout\n");</div><div class='add'>+		pr_debug("Clearing timeout\n");</div><div class='ctx'> 		at91_mci_write(AT91_MCI_ARGR, 0);</div><div class='ctx'> 		at91_mci_write(AT91_MCI_CMDR, AT91_MCI_OPDCMD);</div><div class='ctx'> 		while (!(at91_mci_read(AT91_MCI_SR) &amp; AT91_MCI_CMDRDY)) {</div><div class='ctx'> 			/* spin */</div><div class='del'>-			DBG("Clearing: SR = %08X\n", at91_mci_read(AT91_MCI_SR));</div><div class='add'>+			pr_debug("Clearing: SR = %08X\n", at91_mci_read(AT91_MCI_SR));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -411,7 +403,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (data) {</div><div class='del'>-		block_length = 1 &lt;&lt; data-&gt;blksz_bits;</div><div class='add'>+		block_length = data-&gt;blksz;</div><div class='ctx'> 		blocks = data-&gt;blocks;</div><div class='ctx'> </div><div class='ctx'> 		/* always set data start - also set direction flag for read */</div><div class='hunk'>@@ -439,7 +431,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set the arguments and send the command</div><div class='ctx'> 	 */</div><div class='del'>-	DBG("Sending command %d as %08X, arg = %08X, blocks = %d, length = %d (MR = %08lX)\n",</div><div class='add'>+	pr_debug("Sending command %d as %08X, arg = %08X, blocks = %d, length = %d (MR = %08lX)\n",</div><div class='ctx'> 		cmd-&gt;opcode, cmdr, cmd-&gt;arg, blocks, block_length, at91_mci_read(AT91_MCI_MR));</div><div class='ctx'> </div><div class='ctx'> 	if (!data) {</div><div class='hunk'>@@ -491,7 +483,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_</div><div class='ctx'> </div><div class='ctx'> 			at91mci_sg_to_dma(host, data);</div><div class='ctx'> </div><div class='del'>-			DBG("Transmitting %d bytes\n", host-&gt;total_length);</div><div class='add'>+			pr_debug("Transmitting %d bytes\n", host-&gt;total_length);</div><div class='ctx'> </div><div class='ctx'> 			at91_mci_write(AT91_PDC_TPR, host-&gt;physical_address);</div><div class='ctx'> 			at91_mci_write(AT91_PDC_TCR, host-&gt;total_length / 4);</div><div class='hunk'>@@ -525,7 +517,7 @@ static void at91mci_process_command(struct at91mci_host *host, struct mmc_comman</div><div class='ctx'> </div><div class='ctx'> 	ier = at91_mci_send_command(host, cmd);</div><div class='ctx'> </div><div class='del'>-	DBG("setting ier to %08X\n", ier);</div><div class='add'>+	pr_debug("setting ier to %08X\n", ier);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop on errors or the required value */</div><div class='ctx'> 	at91_mci_write(AT91_MCI_IER, 0xffff0000 | ier);</div><div class='hunk'>@@ -570,7 +562,7 @@ static void at91mci_completed_command(struct at91mci_host *host)</div><div class='ctx'> </div><div class='ctx'> 	status = at91_mci_read(AT91_MCI_SR);</div><div class='ctx'> </div><div class='del'>-	DBG("Status = %08X [%08X %08X %08X %08X]\n",</div><div class='add'>+	pr_debug("Status = %08X [%08X %08X %08X %08X]\n",</div><div class='ctx'> 		 status, cmd-&gt;resp[0], cmd-&gt;resp[1], cmd-&gt;resp[2], cmd-&gt;resp[3]);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE |</div><div class='hunk'>@@ -590,7 +582,7 @@ static void at91mci_completed_command(struct at91mci_host *host)</div><div class='ctx'> 			else</div><div class='ctx'> 				cmd-&gt;error = MMC_ERR_FAILED;</div><div class='ctx'> </div><div class='del'>-			DBG("Error detected and set to %d (cmd = %d, retries = %d)\n",</div><div class='add'>+			pr_debug("Error detected and set to %d (cmd = %d, retries = %d)\n",</div><div class='ctx'> 				 cmd-&gt;error, cmd-&gt;opcode, cmd-&gt;retries);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -621,10 +613,7 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	struct at91mci_host *host = mmc_priv(mmc);</div><div class='ctx'> 	unsigned long at91_master_clock = clk_get_rate(mci_clk);</div><div class='ctx'> </div><div class='del'>-	if (host)</div><div class='del'>-		host-&gt;bus_mode = ios-&gt;bus_mode;</div><div class='del'>-	else</div><div class='del'>-		printk("MMC: No host for bus_mode\n");</div><div class='add'>+	host-&gt;bus_mode = ios-&gt;bus_mode;</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;clock == 0) {</div><div class='ctx'> 		/* Disable the MCI controller */</div><div class='hunk'>@@ -640,15 +629,15 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 		else</div><div class='ctx'> 			clkdiv = (at91_master_clock / ios-&gt;clock) / 2;</div><div class='ctx'> </div><div class='del'>-		DBG("clkdiv = %d. mcck = %ld\n", clkdiv,</div><div class='add'>+		pr_debug("clkdiv = %d. mcck = %ld\n", clkdiv,</div><div class='ctx'> 			at91_master_clock / (2 * (clkdiv + 1)));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ios-&gt;bus_width == MMC_BUS_WIDTH_4 &amp;&amp; host-&gt;board-&gt;wire4) {</div><div class='del'>-		DBG("MMC: Setting controller bus width to 4\n");</div><div class='add'>+		pr_debug("MMC: Setting controller bus width to 4\n");</div><div class='ctx'> 		at91_mci_write(AT91_MCI_SDCR, at91_mci_read(AT91_MCI_SDCR) | AT91_MCI_SDCBUS);</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='del'>-		DBG("MMC: Setting controller bus width to 1\n");</div><div class='add'>+		pr_debug("MMC: Setting controller bus width to 1\n");</div><div class='ctx'> 		at91_mci_write(AT91_MCI_SDCR, at91_mci_read(AT91_MCI_SDCR) &amp; ~AT91_MCI_SDCBUS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -656,7 +645,7 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	at91_mci_write(AT91_MCI_MR, (at91_mci_read(AT91_MCI_MR) &amp; ~AT91_MCI_CLKDIV) | clkdiv);</div><div class='ctx'> </div><div class='ctx'> 	/* maybe switch power to the card */</div><div class='del'>-	if (host &amp;&amp; host-&gt;board-&gt;vcc_pin) {</div><div class='add'>+	if (host-&gt;board-&gt;vcc_pin) {</div><div class='ctx'> 		switch (ios-&gt;power_mode) {</div><div class='ctx'> 			case MMC_POWER_OFF:</div><div class='ctx'> 				at91_set_gpio_output(host-&gt;board-&gt;vcc_pin, 0);</div><div class='hunk'>@@ -679,11 +668,8 @@ static irqreturn_t at91_mci_irq(int irq, void *devid, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	unsigned int int_status;</div><div class='ctx'> </div><div class='del'>-	if (host == NULL)</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-</div><div class='ctx'> 	int_status = at91_mci_read(AT91_MCI_SR);</div><div class='del'>-	DBG("MCI irq: status = %08X, %08lX, %08lX\n", int_status, at91_mci_read(AT91_MCI_IMR),</div><div class='add'>+	pr_debug("MCI irq: status = %08X, %08lX, %08lX\n", int_status, at91_mci_read(AT91_MCI_IMR),</div><div class='ctx'> 		int_status &amp; at91_mci_read(AT91_MCI_IMR));</div><div class='ctx'> </div><div class='ctx'> 	if ((int_status &amp; at91_mci_read(AT91_MCI_IMR)) &amp; 0xffff0000)</div><div class='hunk'>@@ -692,75 +678,75 @@ static irqreturn_t at91_mci_irq(int irq, void *devid, struct pt_regs *regs)</div><div class='ctx'> 	int_status &amp;= at91_mci_read(AT91_MCI_IMR);</div><div class='ctx'> </div><div class='ctx'> 	if (int_status &amp; AT91_MCI_UNRE)</div><div class='del'>-		DBG("MMC: Underrun error\n");</div><div class='add'>+		pr_debug("MMC: Underrun error\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_OVRE)</div><div class='del'>-		DBG("MMC: Overrun error\n");</div><div class='add'>+		pr_debug("MMC: Overrun error\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_DTOE)</div><div class='del'>-		DBG("MMC: Data timeout\n");</div><div class='add'>+		pr_debug("MMC: Data timeout\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_DCRCE)</div><div class='del'>-		DBG("MMC: CRC error in data\n");</div><div class='add'>+		pr_debug("MMC: CRC error in data\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_RTOE)</div><div class='del'>-		DBG("MMC: Response timeout\n");</div><div class='add'>+		pr_debug("MMC: Response timeout\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_RENDE)</div><div class='del'>-		DBG("MMC: Response end bit error\n");</div><div class='add'>+		pr_debug("MMC: Response end bit error\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_RCRCE)</div><div class='del'>-		DBG("MMC: Response CRC error\n");</div><div class='add'>+		pr_debug("MMC: Response CRC error\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_RDIRE)</div><div class='del'>-		DBG("MMC: Response direction error\n");</div><div class='add'>+		pr_debug("MMC: Response direction error\n");</div><div class='ctx'> 	if (int_status &amp; AT91_MCI_RINDE)</div><div class='del'>-		DBG("MMC: Response index error\n");</div><div class='add'>+		pr_debug("MMC: Response index error\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Only continue processing if no errors */</div><div class='ctx'> 	if (!completed) {</div><div class='ctx'> 		if (int_status &amp; AT91_MCI_TXBUFE) {</div><div class='del'>-			DBG("TX buffer empty\n");</div><div class='add'>+			pr_debug("TX buffer empty\n");</div><div class='ctx'> 			at91_mci_handle_transmitted(host);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_RXBUFF) {</div><div class='del'>-			DBG("RX buffer full\n");</div><div class='add'>+			pr_debug("RX buffer full\n");</div><div class='ctx'> 			at91_mci_write(AT91_MCI_IER, AT91_MCI_CMDRDY);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_ENDTX) {</div><div class='del'>-			DBG("Transmit has ended\n");</div><div class='add'>+			pr_debug("Transmit has ended\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_ENDRX) {</div><div class='del'>-			DBG("Receive has ended\n");</div><div class='add'>+			pr_debug("Receive has ended\n");</div><div class='ctx'> 			at91mci_post_dma_read(host);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_NOTBUSY) {</div><div class='del'>-			DBG("Card is ready\n");</div><div class='add'>+			pr_debug("Card is ready\n");</div><div class='ctx'> 			at91_mci_write(AT91_MCI_IER, AT91_MCI_CMDRDY);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_DTIP) {</div><div class='del'>-			DBG("Data transfer in progress\n");</div><div class='add'>+			pr_debug("Data transfer in progress\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_BLKE) {</div><div class='del'>-			DBG("Block transfer has ended\n");</div><div class='add'>+			pr_debug("Block transfer has ended\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_TXRDY) {</div><div class='del'>-			DBG("Ready to transmit\n");</div><div class='add'>+			pr_debug("Ready to transmit\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_RXRDY) {</div><div class='del'>-			DBG("Ready to receive\n");</div><div class='add'>+			pr_debug("Ready to receive\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (int_status &amp; AT91_MCI_CMDRDY) {</div><div class='del'>-			DBG("Command ready\n");</div><div class='add'>+			pr_debug("Command ready\n");</div><div class='ctx'> 			completed = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	at91_mci_write(AT91_MCI_IDR, int_status);</div><div class='ctx'> </div><div class='ctx'> 	if (completed) {</div><div class='del'>-		DBG("Completed command\n");</div><div class='add'>+		pr_debug("Completed command\n");</div><div class='ctx'> 		at91_mci_write(AT91_MCI_IDR, 0xffffffff);</div><div class='ctx'> 		at91mci_completed_command(host);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -779,10 +765,10 @@ static irqreturn_t at91_mmc_det_irq(int irq, void *_host, struct pt_regs *regs)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (present != host-&gt;present) {</div><div class='ctx'> 		host-&gt;present = present;</div><div class='del'>-		DBG("%s: card %s\n", mmc_hostname(host-&gt;mmc),</div><div class='add'>+		pr_debug("%s: card %s\n", mmc_hostname(host-&gt;mmc),</div><div class='ctx'> 			present ? "insert" : "remove");</div><div class='ctx'> 		if (!present) {</div><div class='del'>-			DBG("****** Resetting SD-card bus width ******\n");</div><div class='add'>+			pr_debug("****** Resetting SD-card bus width ******\n");</div><div class='ctx'> 			at91_mci_write(AT91_MCI_SDCR, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		mmc_detect_change(host-&gt;mmc, msecs_to_jiffies(100));</div><div class='hunk'>@@ -822,13 +808,13 @@ static int at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct at91mci_host *host;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	DBG("Probe MCI devices\n");</div><div class='add'>+	pr_debug("Probe MCI devices\n");</div><div class='ctx'> 	at91_mci_disable();</div><div class='ctx'> 	at91_mci_enable();</div><div class='ctx'> </div><div class='ctx'> 	mmc = mmc_alloc_host(sizeof(struct at91mci_host), &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!mmc) {</div><div class='del'>-		DBG("Failed to allocate mmc host\n");</div><div class='add'>+		pr_debug("Failed to allocate mmc host\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -854,8 +840,9 @@ static int at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	 * Get Clock</div><div class='ctx'> 	 */</div><div class='ctx'> 	mci_clk = clk_get(&amp;pdev-&gt;dev, "mci_clk");</div><div class='del'>-	if (!mci_clk) {</div><div class='add'>+	if (IS_ERR(mci_clk)) {</div><div class='ctx'> 		printk(KERN_ERR "AT91 MMC: no clock defined.\n");</div><div class='add'>+		mmc_free_host(mmc);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	clk_enable(mci_clk);			/* Enable the peripheral clock */</div><div class='hunk'>@@ -863,9 +850,12 @@ static int at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the MCI interrupt</div><div class='ctx'> 	 */</div><div class='del'>-	ret = request_irq(AT91_ID_MCI, at91_mci_irq, SA_SHIRQ, DRIVER_NAME, host);</div><div class='add'>+	ret = request_irq(AT91_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		DBG("Failed to request MCI interrupt\n");</div><div class='add'>+		printk(KERN_ERR "Failed to request MCI interrupt\n");</div><div class='add'>+		clk_disable(mci_clk);</div><div class='add'>+		clk_put(mci_clk);</div><div class='add'>+		mmc_free_host(mmc);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -886,12 +876,12 @@ static int at91_mci_probe(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (host-&gt;board-&gt;det_pin) {</div><div class='ctx'> 		ret = request_irq(host-&gt;board-&gt;det_pin, at91_mmc_det_irq,</div><div class='del'>-				SA_SAMPLE_RANDOM, DRIVER_NAME, host);</div><div class='add'>+				0, DRIVER_NAME, host);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			DBG("couldn't allocate MMC detect irq\n");</div><div class='add'>+			printk(KERN_ERR "couldn't allocate MMC detect irq\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DBG(KERN_INFO "Added MCI driver\n");</div><div class='add'>+	pr_debug(KERN_INFO "Added MCI driver\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -924,7 +914,7 @@ static int at91_mci_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='del'>-	DBG("Removed\n");</div><div class='add'>+	pr_debug("MCI Removed\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c<br/>index 5dc4bee7abeb..fb606165af3b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/au1xmmc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/au1xmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/au1xmmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/au1xmmc.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  * So we use the timer to check the status manually.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -887,7 +886,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* THe interrupt is shared among all controllers */</div><div class='del'>-	ret = request_irq(AU1100_SD_IRQ, au1xmmc_irq, SA_INTERRUPT, "MMC", 0);</div><div class='add'>+	ret = request_irq(AU1100_SD_IRQ, au1xmmc_irq, IRQF_DISABLED, "MMC", 0);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(DRIVER_NAME "ERROR: Couldn't get int %d: %d\n",</div><div class='head'>diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c<br/>index a4eb1d0e7a71..7ca9e95bdf89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/imxmmc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/imxmmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/imxmmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/imxmmc.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *             deficiencies</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMC_DEBUG</div><div class='ctx'> #define DEBUG</div><div class='hunk'>@@ -228,7 +227,7 @@ static int imxmci_busy_wait_for_status(struct imxmci_host *host,</div><div class='ctx'> static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int nob = data-&gt;blocks;</div><div class='del'>-	unsigned int blksz = 1 &lt;&lt; data-&gt;blksz_bits;</div><div class='add'>+	unsigned int blksz = data-&gt;blksz;</div><div class='ctx'> 	unsigned int datasz = nob * blksz;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c<br/>index 6201f3086a02..33525bdf2ab6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/mmc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/mmc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/mmc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/mmc.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -129,7 +128,7 @@ static void mmc_wait_done(struct mmc_request *mrq)</div><div class='ctx'> </div><div class='ctx'> int mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_COMPLETION(complete);</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(complete);</div><div class='ctx'> </div><div class='ctx'> 	mrq-&gt;done_data = &amp;complete;</div><div class='ctx'> 	mrq-&gt;done = mmc_wait_done;</div><div class='head'>diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c<br/>index 587458b370b9..115cc21094b9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/mmc_block.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/mmc_block.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/mmc_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/mmc_block.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mmc/card.h&gt;</div><div class='hunk'>@@ -409,7 +408,6 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	sprintf(md-&gt;disk-&gt;disk_name, "mmcblk%d", devidx);</div><div class='del'>-	sprintf(md-&gt;disk-&gt;devfs_name, "mmc/blk%d", devidx);</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_hardsect_size(md-&gt;queue.queue, 1 &lt;&lt; md-&gt;block_bits);</div><div class='ctx'> </div><div class='hunk'>@@ -555,7 +553,6 @@ static int __init mmc_blk_init(void)</div><div class='ctx'> 	if (major == 0)</div><div class='ctx'> 		major = res;</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("mmc");</div><div class='ctx'> 	return mmc_register_driver(&amp;mmc_driver);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='hunk'>@@ -565,7 +562,6 @@ static int __init mmc_blk_init(void)</div><div class='ctx'> static void __exit mmc_blk_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	mmc_unregister_driver(&amp;mmc_driver);</div><div class='del'>-	devfs_remove("mmc");</div><div class='ctx'> 	unregister_blkdev(major, "mmc");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c<br/>index da8e4d7339cc..1886562abdd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/mmci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/mmci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/mmci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/mmci.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -532,11 +531,11 @@ static int mmci_probe(struct amba_device *dev, void *id)</div><div class='ctx'> 	writel(0, host-&gt;base + MMCIMASK1);</div><div class='ctx'> 	writel(0xfff, host-&gt;base + MMCICLEAR);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq[0], mmci_irq, SA_SHIRQ, DRIVER_NAME " (cmd)", host);</div><div class='add'>+	ret = request_irq(dev-&gt;irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq[1], mmci_pio_irq, SA_SHIRQ, DRIVER_NAME " (pio)", host);</div><div class='add'>+	ret = request_irq(dev-&gt;irq[1], mmci_pio_irq, IRQF_SHARED, DRIVER_NAME " (pio)", host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto irq0_free;</div><div class='ctx'> </div><div class='hunk'>@@ -546,9 +545,9 @@ static int mmci_probe(struct amba_device *dev, void *id)</div><div class='ctx'> </div><div class='ctx'> 	mmc_add_host(mmc);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%08lx irq %d,%d\n",</div><div class='add'>+	printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%016llx irq %d,%d\n",</div><div class='ctx'> 		mmc_hostname(mmc), amba_rev(dev), amba_config(dev),</div><div class='del'>-		dev-&gt;res.start, dev-&gt;irq[0], dev-&gt;irq[1]);</div><div class='add'>+		(unsigned long long)dev-&gt;res.start, dev-&gt;irq[0], dev-&gt;irq[1]);</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;host-&gt;timer);</div><div class='ctx'> 	host-&gt;timer.data = (unsigned long)host;</div><div class='head'>diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c<br/>index becb3c68c34d..ddf06b32c159 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/omap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/omap.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -61,6 +60,7 @@ struct mmc_omap_host {</div><div class='ctx'> 	unsigned char		id; /* 16xx chips have 2 MMC blocks */</div><div class='ctx'> 	struct clk *		iclk;</div><div class='ctx'> 	struct clk *		fclk;</div><div class='add'>+	struct resource		*res;</div><div class='ctx'> 	void __iomem		*base;</div><div class='ctx'> 	int			irq;</div><div class='ctx'> 	unsigned char		bus_mode;</div><div class='hunk'>@@ -340,8 +340,6 @@ static void</div><div class='ctx'> mmc_omap_xfer_data(struct mmc_omap_host *host, int write)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='del'>-	void __iomem *reg;</div><div class='del'>-	u16 *p;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;buffer_bytes_left == 0) {</div><div class='ctx'> 		host-&gt;sg_idx++;</div><div class='hunk'>@@ -584,10 +582,10 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data)</div><div class='ctx'> 	int sync_dev = 0;</div><div class='ctx'> </div><div class='ctx'> 	data_addr = io_v2p((u32) host-&gt;base) + OMAP_MMC_REG_DATA;</div><div class='del'>-	frame = 1 &lt;&lt; data-&gt;blksz_bits;</div><div class='add'>+	frame = data-&gt;blksz;</div><div class='ctx'> 	count = sg_dma_len(sg);</div><div class='ctx'> </div><div class='del'>-	if ((data-&gt;blocks == 1) &amp;&amp; (count &gt; (1 &lt;&lt; data-&gt;blksz_bits)))</div><div class='add'>+	if ((data-&gt;blocks == 1) &amp;&amp; (count &gt; data-&gt;blksz))</div><div class='ctx'> 		count = frame;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;dma_len = count;</div><div class='hunk'>@@ -658,12 +656,12 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)</div><div class='ctx'> 	struct mmc_data *mmcdat = host-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(host-&gt;dma_ch &lt; 0)) {</div><div class='del'>-		dev_err(mmc_dev(host-&gt;mmc), "DMA callback while DMA not</div><div class='del'>-				enabled\n");</div><div class='add'>+		dev_err(mmc_dev(host-&gt;mmc),</div><div class='add'>+			"DMA callback while DMA not enabled\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* FIXME: We really should do something to _handle_ the errors */</div><div class='del'>-	if (ch_status &amp; OMAP_DMA_TOUT_IRQ) {</div><div class='add'>+	if (ch_status &amp; OMAP1_DMA_TOUT_IRQ) {</div><div class='ctx'> 		dev_err(mmc_dev(host-&gt;mmc),"DMA timeout\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -776,7 +774,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	block_size = 1 &lt;&lt; data-&gt;blksz_bits;</div><div class='add'>+	block_size = data-&gt;blksz;</div><div class='ctx'> </div><div class='ctx'> 	OMAP_MMC_WRITE(host-&gt;base, NBLK, data-&gt;blocks - 1);</div><div class='ctx'> 	OMAP_MMC_WRITE(host-&gt;base, BLEN, block_size - 1);</div><div class='hunk'>@@ -973,20 +971,20 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct omap_mmc_conf *minfo = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct mmc_host *mmc;</div><div class='ctx'> 	struct mmc_omap_host *host = NULL;</div><div class='add'>+	struct resource *r;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int irq;</div><div class='ctx'> 	</div><div class='del'>-	if (platform_get_resource(pdev, IORESOURCE_MEM, 0) ||</div><div class='del'>-			platform_get_irq(pdev, IORESOURCE_IRQ, 0)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "mmc_omap_probe: invalid resource type\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (!r || irq &lt; 0)</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(pdev-&gt;resource[0].start,</div><div class='add'>+	r = request_mem_region(pdev-&gt;resource[0].start,</div><div class='ctx'> 				pdev-&gt;resource[0].end - pdev-&gt;resource[0].start + 1,</div><div class='del'>-				pdev-&gt;name)) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "request_mem_region failed\n");</div><div class='add'>+			       pdev-&gt;name);</div><div class='add'>+	if (!r)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mmc = mmc_alloc_host(sizeof(struct mmc_omap_host), &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!mmc) {</div><div class='hunk'>@@ -1003,6 +1001,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> 	host-&gt;dma_timer.data = (unsigned long) host;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;id = pdev-&gt;id;</div><div class='add'>+	host-&gt;res = r;</div><div class='add'>+	host-&gt;irq = irq;</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_omap24xx()) {</div><div class='ctx'> 		host-&gt;iclk = clk_get(&amp;pdev-&gt;dev, "mmc_ick");</div><div class='hunk'>@@ -1032,13 +1032,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> 	host-&gt;dma_ch = -1;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;irq = pdev-&gt;resource[1].start;</div><div class='del'>-	host-&gt;base = ioremap(pdev-&gt;res.start, SZ_4K);</div><div class='del'>-	if (!host-&gt;base) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	host-&gt;base = (void __iomem*)IO_ADDRESS(r-&gt;start);</div><div class='ctx'> </div><div class='del'>-	 if (minfo-&gt;wire4)</div><div class='add'>+	if (minfo-&gt;wire4)</div><div class='ctx'> 		 mmc-&gt;caps |= MMC_CAP_4_BIT_DATA;</div><div class='ctx'> </div><div class='ctx'> 	mmc-&gt;ops = &amp;mmc_omap_ops;</div><div class='hunk'>@@ -1057,8 +1053,8 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;power_pin &gt;= 0) {</div><div class='ctx'> 		if ((ret = omap_request_gpio(host-&gt;power_pin)) != 0) {</div><div class='del'>-			dev_err(mmc_dev(host-&gt;mmc), "Unable to get GPIO</div><div class='del'>-					pin for MMC power\n");</div><div class='add'>+			dev_err(mmc_dev(host-&gt;mmc),</div><div class='add'>+				"Unable to get GPIO pin for MMC power\n");</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		omap_set_gpio_direction(host-&gt;power_pin, 0);</div><div class='hunk'>@@ -1086,7 +1082,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		omap_set_gpio_direction(host-&gt;switch_pin, 1);</div><div class='ctx'> 		ret = request_irq(OMAP_GPIO_IRQ(host-&gt;switch_pin),</div><div class='del'>-				  mmc_omap_switch_irq, SA_TRIGGER_RISING, DRIVER_NAME, host);</div><div class='add'>+				  mmc_omap_switch_irq, IRQF_TRIGGER_RISING, DRIVER_NAME, host);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			dev_warn(mmc_dev(host-&gt;mmc), "Unable to get IRQ for MMC cover switch\n");</div><div class='ctx'> 			omap_free_gpio(host-&gt;switch_pin);</div><div class='hunk'>@@ -1100,7 +1096,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)</div><div class='ctx'> 				device_remove_file(&amp;pdev-&gt;dev, &amp;dev_attr_cover_switch);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			dev_wan(mmc_dev(host-&gt;mmc), "Unable to create sysfs attributes\n");</div><div class='add'>+			dev_warn(mmc_dev(host-&gt;mmc), "Unable to create sysfs attributes\n");</div><div class='ctx'> 			free_irq(OMAP_GPIO_IRQ(host-&gt;switch_pin), host);</div><div class='ctx'> 			omap_free_gpio(host-&gt;switch_pin);</div><div class='ctx'> 			host-&gt;switch_pin = -1;</div><div class='head'>diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c<br/>index b49368fd96b8..ef350908478c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/pxamci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/pxamci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/pxamci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/pxamci.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *	1 and 3 byte data transfers not supported</div><div class='ctx'>  *	max block length up to 1023</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c<br/>index b0053280ff2d..4e21b3b9d330 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/sdhci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/sdhci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/sdhci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/sdhci.c</a></div><div class='hunk'>@@ -8,12 +8,6 @@</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>- /*</div><div class='del'>-  * Note that PIO transfer is rather crappy atm. The buffer full/empty</div><div class='del'>-  * interrupts aren't reliable so we currently transfer the entire buffer</div><div class='del'>-  * directly. Patches to solve the problem are welcome.</div><div class='del'>-  */</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -27,16 +21,50 @@</div><div class='ctx'> #include "sdhci.h"</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "sdhci"</div><div class='del'>-#define DRIVER_VERSION "0.11"</div><div class='add'>+#define DRIVER_VERSION "0.12"</div><div class='ctx'> </div><div class='ctx'> #define BUGMAIL "&lt;sdhci-devel@list.drzeus.cx&gt;"</div><div class='ctx'> </div><div class='ctx'> #define DBG(f, x...) \</div><div class='ctx'> 	pr_debug(DRIVER_NAME " [%s()]: " f, __func__,## x)</div><div class='ctx'> </div><div class='add'>+static unsigned int debug_nodma = 0;</div><div class='add'>+static unsigned int debug_forcedma = 0;</div><div class='add'>+static unsigned int debug_quirks = 0;</div><div class='add'>+</div><div class='add'>+#define SDHCI_QUIRK_CLOCK_BEFORE_RESET			(1&lt;&lt;0)</div><div class='add'>+#define SDHCI_QUIRK_FORCE_DMA				(1&lt;&lt;1)</div><div class='add'>+</div><div class='ctx'> static const struct pci_device_id pci_ids[] __devinitdata = {</div><div class='del'>-	/* handle any SD host controller */</div><div class='del'>-	{PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI &lt;&lt; 8), 0xFFFF00)},</div><div class='add'>+	{</div><div class='add'>+		.vendor		= PCI_VENDOR_ID_RICOH,</div><div class='add'>+		.device		= PCI_DEVICE_ID_RICOH_R5C822,</div><div class='add'>+		.subvendor	= PCI_VENDOR_ID_IBM,</div><div class='add'>+		.subdevice	= PCI_ANY_ID,</div><div class='add'>+		.driver_data	= SDHCI_QUIRK_CLOCK_BEFORE_RESET |</div><div class='add'>+				  SDHCI_QUIRK_FORCE_DMA,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.vendor		= PCI_VENDOR_ID_RICOH,</div><div class='add'>+		.device		= PCI_DEVICE_ID_RICOH_R5C822,</div><div class='add'>+		.subvendor	= PCI_ANY_ID,</div><div class='add'>+		.subdevice	= PCI_ANY_ID,</div><div class='add'>+		.driver_data	= SDHCI_QUIRK_FORCE_DMA,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{</div><div class='add'>+		.vendor		= PCI_VENDOR_ID_TI,</div><div class='add'>+		.device		= PCI_DEVICE_ID_TI_XX21_XX11_SD,</div><div class='add'>+		.subvendor	= PCI_ANY_ID,</div><div class='add'>+		.subdevice	= PCI_ANY_ID,</div><div class='add'>+		.driver_data	= SDHCI_QUIRK_FORCE_DMA,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	{	/* Generic SD host controller */</div><div class='add'>+		PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI &lt;&lt; 8), 0xFFFF00)</div><div class='add'>+	},</div><div class='add'>+</div><div class='ctx'> 	{ /* end: all zeroes */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -94,12 +122,27 @@ static void sdhci_dumpregs(struct sdhci_host *host)</div><div class='ctx'> </div><div class='ctx'> static void sdhci_reset(struct sdhci_host *host, u8 mask)</div><div class='ctx'> {</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='ctx'> 	writeb(mask, host-&gt;ioaddr + SDHCI_SOFTWARE_RESET);</div><div class='ctx'> </div><div class='del'>-	if (mask &amp; SDHCI_RESET_ALL) {</div><div class='add'>+	if (mask &amp; SDHCI_RESET_ALL)</div><div class='ctx'> 		host-&gt;clock = 0;</div><div class='ctx'> </div><div class='del'>-		mdelay(50);</div><div class='add'>+	/* Wait max 100 ms */</div><div class='add'>+	timeout = 100;</div><div class='add'>+</div><div class='add'>+	/* hw clears the bit when it's done */</div><div class='add'>+	while (readb(host-&gt;ioaddr + SDHCI_SOFTWARE_RESET) &amp; mask) {</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			printk(KERN_ERR "%s: Reset 0x%x never completed. "</div><div class='add'>+				"Please report this to " BUGMAIL ".\n",</div><div class='add'>+				mmc_hostname(host-&gt;mmc), (int)mask);</div><div class='add'>+			sdhci_dumpregs(host);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		timeout--;</div><div class='add'>+		mdelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -109,13 +152,15 @@ static void sdhci_init(struct sdhci_host *host)</div><div class='ctx'> </div><div class='ctx'> 	sdhci_reset(host, SDHCI_RESET_ALL);</div><div class='ctx'> </div><div class='del'>-	intmask = ~(SDHCI_INT_CARD_INT | SDHCI_INT_BUF_EMPTY | SDHCI_INT_BUF_FULL);</div><div class='add'>+	intmask = SDHCI_INT_BUS_POWER | SDHCI_INT_DATA_END_BIT |</div><div class='add'>+		SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_INDEX |</div><div class='add'>+		SDHCI_INT_END_BIT | SDHCI_INT_CRC | SDHCI_INT_TIMEOUT |</div><div class='add'>+		SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT |</div><div class='add'>+		SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL |</div><div class='add'>+		SDHCI_INT_DMA_END | SDHCI_INT_DATA_END | SDHCI_INT_RESPONSE;</div><div class='ctx'> </div><div class='ctx'> 	writel(intmask, host-&gt;ioaddr + SDHCI_INT_ENABLE);</div><div class='ctx'> 	writel(intmask, host-&gt;ioaddr + SDHCI_SIGNAL_ENABLE);</div><div class='del'>-</div><div class='del'>-	/* This is unknown magic. */</div><div class='del'>-	writeb(0xE, host-&gt;ioaddr + SDHCI_TIMEOUT_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_activate_led(struct sdhci_host *host)</div><div class='hunk'>@@ -172,79 +217,96 @@ static inline int sdhci_next_sg(struct sdhci_host* host)</div><div class='ctx'> 	return host-&gt;num_sg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sdhci_transfer_pio(struct sdhci_host *host)</div><div class='add'>+static void sdhci_read_block_pio(struct sdhci_host *host)</div><div class='ctx'> {</div><div class='add'>+	int blksize, chunk_remain;</div><div class='add'>+	u32 data;</div><div class='ctx'> 	char *buffer;</div><div class='del'>-	u32 mask;</div><div class='del'>-	int bytes, size;</div><div class='del'>-	unsigned long max_jiffies;</div><div class='add'>+	int size;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!host-&gt;data);</div><div class='add'>+	DBG("PIO reading\n");</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;num_sg == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bytes = 0;</div><div class='del'>-	if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-		mask = SDHCI_DATA_AVAILABLE;</div><div class='del'>-	else</div><div class='del'>-		mask = SDHCI_SPACE_AVAILABLE;</div><div class='add'>+	blksize = host-&gt;data-&gt;blksz;</div><div class='add'>+	chunk_remain = 0;</div><div class='add'>+	data = 0;</div><div class='ctx'> </div><div class='ctx'> 	buffer = sdhci_kmap_sg(host) + host-&gt;offset;</div><div class='ctx'> </div><div class='del'>-	/* Transfer shouldn't take more than 5 s */</div><div class='del'>-	max_jiffies = jiffies + HZ * 5;</div><div class='add'>+	while (blksize) {</div><div class='add'>+		if (chunk_remain == 0) {</div><div class='add'>+			data = readl(host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='add'>+			chunk_remain = min(blksize, 4);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	while (host-&gt;size &gt; 0) {</div><div class='del'>-		if (time_after(jiffies, max_jiffies)) {</div><div class='del'>-			printk(KERN_ERR "%s: PIO transfer stalled. "</div><div class='del'>-				"Please report this to "</div><div class='del'>-				BUGMAIL ".\n", mmc_hostname(host-&gt;mmc));</div><div class='del'>-			sdhci_dumpregs(host);</div><div class='add'>+		size = min(host-&gt;size, host-&gt;remain);</div><div class='add'>+		size = min(size, chunk_remain);</div><div class='ctx'> </div><div class='del'>-			sdhci_kunmap_sg(host);</div><div class='add'>+		chunk_remain -= size;</div><div class='add'>+		blksize -= size;</div><div class='add'>+		host-&gt;offset += size;</div><div class='add'>+		host-&gt;remain -= size;</div><div class='add'>+		host-&gt;size -= size;</div><div class='add'>+		while (size) {</div><div class='add'>+			*buffer = data &amp; 0xFF;</div><div class='add'>+			buffer++;</div><div class='add'>+			data &gt;&gt;= 8;</div><div class='add'>+			size--;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			host-&gt;data-&gt;error = MMC_ERR_FAILED;</div><div class='del'>-			sdhci_finish_data(host);</div><div class='del'>-			return;</div><div class='add'>+		if (host-&gt;remain == 0) {</div><div class='add'>+			sdhci_kunmap_sg(host);</div><div class='add'>+			if (sdhci_next_sg(host) == 0) {</div><div class='add'>+				BUG_ON(blksize != 0);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+			buffer = sdhci_kmap_sg(host);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!(readl(host-&gt;ioaddr + SDHCI_PRESENT_STATE) &amp; mask))</div><div class='del'>-			continue;</div><div class='add'>+	sdhci_kunmap_sg(host);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		size = min(host-&gt;size, host-&gt;remain);</div><div class='add'>+static void sdhci_write_block_pio(struct sdhci_host *host)</div><div class='add'>+{</div><div class='add'>+	int blksize, chunk_remain;</div><div class='add'>+	u32 data;</div><div class='add'>+	char *buffer;</div><div class='add'>+	int bytes, size;</div><div class='ctx'> </div><div class='del'>-		if (size &gt;= 4) {</div><div class='del'>-			if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-				*(u32*)buffer = readl(host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='del'>-			else</div><div class='del'>-				writel(*(u32*)buffer, host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='del'>-			size = 4;</div><div class='del'>-		} else if (size &gt;= 2) {</div><div class='del'>-			if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-				*(u16*)buffer = readw(host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='del'>-			else</div><div class='del'>-				writew(*(u16*)buffer, host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='del'>-			size = 2;</div><div class='del'>-		} else {</div><div class='del'>-			if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-				*(u8*)buffer = readb(host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='del'>-			else</div><div class='del'>-				writeb(*(u8*)buffer, host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='del'>-			size = 1;</div><div class='del'>-		}</div><div class='add'>+	DBG("PIO writing\n");</div><div class='add'>+</div><div class='add'>+	blksize = host-&gt;data-&gt;blksz;</div><div class='add'>+	chunk_remain = 4;</div><div class='add'>+	data = 0;</div><div class='ctx'> </div><div class='del'>-		buffer += size;</div><div class='add'>+	bytes = 0;</div><div class='add'>+	buffer = sdhci_kmap_sg(host) + host-&gt;offset;</div><div class='add'>+</div><div class='add'>+	while (blksize) {</div><div class='add'>+		size = min(host-&gt;size, host-&gt;remain);</div><div class='add'>+		size = min(size, chunk_remain);</div><div class='add'>+</div><div class='add'>+		chunk_remain -= size;</div><div class='add'>+		blksize -= size;</div><div class='ctx'> 		host-&gt;offset += size;</div><div class='ctx'> 		host-&gt;remain -= size;</div><div class='del'>-</div><div class='del'>-		bytes += size;</div><div class='ctx'> 		host-&gt;size -= size;</div><div class='add'>+		while (size) {</div><div class='add'>+			data &gt;&gt;= 8;</div><div class='add'>+			data |= (u32)*buffer &lt;&lt; 24;</div><div class='add'>+			buffer++;</div><div class='add'>+			size--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (chunk_remain == 0) {</div><div class='add'>+			writel(data, host-&gt;ioaddr + SDHCI_BUFFER);</div><div class='add'>+			chunk_remain = min(blksize, 4);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (host-&gt;remain == 0) {</div><div class='ctx'> 			sdhci_kunmap_sg(host);</div><div class='ctx'> 			if (sdhci_next_sg(host) == 0) {</div><div class='del'>-				DBG("PIO transfer: %d bytes\n", bytes);</div><div class='add'>+				BUG_ON(blksize != 0);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			buffer = sdhci_kmap_sg(host);</div><div class='hunk'>@@ -252,38 +314,87 @@ static void sdhci_transfer_pio(struct sdhci_host *host)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sdhci_kunmap_sg(host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sdhci_transfer_pio(struct sdhci_host *host)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!host-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (host-&gt;size == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+		mask = SDHCI_DATA_AVAILABLE;</div><div class='add'>+	else</div><div class='add'>+		mask = SDHCI_SPACE_AVAILABLE;</div><div class='add'>+</div><div class='add'>+	while (readl(host-&gt;ioaddr + SDHCI_PRESENT_STATE) &amp; mask) {</div><div class='add'>+		if (host-&gt;data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+			sdhci_read_block_pio(host);</div><div class='add'>+		else</div><div class='add'>+			sdhci_write_block_pio(host);</div><div class='add'>+</div><div class='add'>+		if (host-&gt;size == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		BUG_ON(host-&gt;num_sg == 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	DBG("PIO transfer: %d bytes\n", bytes);</div><div class='add'>+	DBG("PIO transfer complete.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)</div><div class='ctx'> {</div><div class='del'>-	u16 mode;</div><div class='add'>+	u8 count;</div><div class='add'>+	unsigned target_timeout, current_timeout;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(host-&gt;data);</div><div class='ctx'> </div><div class='del'>-	if (data == NULL) {</div><div class='del'>-		writew(0, host-&gt;ioaddr + SDHCI_TRANSFER_MODE);</div><div class='add'>+	if (data == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	DBG("blksz %04x blks %04x flags %08x\n",</div><div class='del'>-		1 &lt;&lt; data-&gt;blksz_bits, data-&gt;blocks, data-&gt;flags);</div><div class='add'>+		data-&gt;blksz, data-&gt;blocks, data-&gt;flags);</div><div class='ctx'> 	DBG("tsac %d ms nsac %d clk\n",</div><div class='ctx'> 		data-&gt;timeout_ns / 1000000, data-&gt;timeout_clks);</div><div class='ctx'> </div><div class='del'>-	mode = SDHCI_TRNS_BLK_CNT_EN;</div><div class='del'>-	if (data-&gt;blocks &gt; 1)</div><div class='del'>-		mode |= SDHCI_TRNS_MULTI;</div><div class='del'>-	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='del'>-		mode |= SDHCI_TRNS_READ;</div><div class='del'>-	if (host-&gt;flags &amp; SDHCI_USE_DMA)</div><div class='del'>-		mode |= SDHCI_TRNS_DMA;</div><div class='add'>+	/* Sanity checks */</div><div class='add'>+	BUG_ON(data-&gt;blksz * data-&gt;blocks &gt; 524288);</div><div class='add'>+	BUG_ON(data-&gt;blksz &gt; host-&gt;max_block);</div><div class='add'>+	BUG_ON(data-&gt;blocks &gt; 65535);</div><div class='ctx'> </div><div class='del'>-	writew(mode, host-&gt;ioaddr + SDHCI_TRANSFER_MODE);</div><div class='add'>+	/* timeout in us */</div><div class='add'>+	target_timeout = data-&gt;timeout_ns / 1000 +</div><div class='add'>+		data-&gt;timeout_clks / host-&gt;clock;</div><div class='ctx'> </div><div class='del'>-	writew(1 &lt;&lt; data-&gt;blksz_bits, host-&gt;ioaddr + SDHCI_BLOCK_SIZE);</div><div class='del'>-	writew(data-&gt;blocks, host-&gt;ioaddr + SDHCI_BLOCK_COUNT);</div><div class='add'>+	/*</div><div class='add'>+	 * Figure out needed cycles.</div><div class='add'>+	 * We do this in steps in order to fit inside a 32 bit int.</div><div class='add'>+	 * The first step is the minimum timeout, which will have a</div><div class='add'>+	 * minimum resolution of 6 bits:</div><div class='add'>+	 * (1) 2^13*1000 &gt; 2^22,</div><div class='add'>+	 * (2) host-&gt;timeout_clk &lt; 2^16</div><div class='add'>+	 *     =&gt;</div><div class='add'>+	 *     (1) / (2) &gt; 2^6</div><div class='add'>+	 */</div><div class='add'>+	count = 0;</div><div class='add'>+	current_timeout = (1 &lt;&lt; 13) * 1000 / host-&gt;timeout_clk;</div><div class='add'>+	while (current_timeout &lt; target_timeout) {</div><div class='add'>+		count++;</div><div class='add'>+		current_timeout &lt;&lt;= 1;</div><div class='add'>+		if (count &gt;= 0xF)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (count &gt;= 0xF) {</div><div class='add'>+		printk(KERN_WARNING "%s: Too large timeout requested!\n",</div><div class='add'>+			mmc_hostname(host-&gt;mmc));</div><div class='add'>+		count = 0xE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writeb(count, host-&gt;ioaddr + SDHCI_TIMEOUT_CONTROL);</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;flags &amp; SDHCI_USE_DMA) {</div><div class='ctx'> 		int count;</div><div class='hunk'>@@ -294,7 +405,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)</div><div class='ctx'> </div><div class='ctx'> 		writel(sg_dma_address(data-&gt;sg), host-&gt;ioaddr + SDHCI_DMA_ADDRESS);</div><div class='ctx'> 	} else {</div><div class='del'>-		host-&gt;size = (1 &lt;&lt; data-&gt;blksz_bits) * data-&gt;blocks;</div><div class='add'>+		host-&gt;size = data-&gt;blksz * data-&gt;blocks;</div><div class='ctx'> </div><div class='ctx'> 		host-&gt;cur_sg = data-&gt;sg;</div><div class='ctx'> 		host-&gt;num_sg = data-&gt;sg_len;</div><div class='hunk'>@@ -302,12 +413,37 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)</div><div class='ctx'> 		host-&gt;offset = 0;</div><div class='ctx'> 		host-&gt;remain = host-&gt;cur_sg-&gt;length;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* We do not handle DMA boundaries, so set it to max (512 KiB) */</div><div class='add'>+	writew(SDHCI_MAKE_BLKSZ(7, data-&gt;blksz),</div><div class='add'>+		host-&gt;ioaddr + SDHCI_BLOCK_SIZE);</div><div class='add'>+	writew(data-&gt;blocks, host-&gt;ioaddr + SDHCI_BLOCK_COUNT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sdhci_set_transfer_mode(struct sdhci_host *host,</div><div class='add'>+	struct mmc_data *data)</div><div class='add'>+{</div><div class='add'>+	u16 mode;</div><div class='add'>+</div><div class='add'>+	WARN_ON(host-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mode = SDHCI_TRNS_BLK_CNT_EN;</div><div class='add'>+	if (data-&gt;blocks &gt; 1)</div><div class='add'>+		mode |= SDHCI_TRNS_MULTI;</div><div class='add'>+	if (data-&gt;flags &amp; MMC_DATA_READ)</div><div class='add'>+		mode |= SDHCI_TRNS_READ;</div><div class='add'>+	if (host-&gt;flags &amp; SDHCI_USE_DMA)</div><div class='add'>+		mode |= SDHCI_TRNS_DMA;</div><div class='add'>+</div><div class='add'>+	writew(mode, host-&gt;ioaddr + SDHCI_TRANSFER_MODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sdhci_finish_data(struct sdhci_host *host)</div><div class='ctx'> {</div><div class='ctx'> 	struct mmc_data *data;</div><div class='del'>-	u32 intmask;</div><div class='ctx'> 	u16 blocks;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!host-&gt;data);</div><div class='hunk'>@@ -318,14 +454,6 @@ static void sdhci_finish_data(struct sdhci_host *host)</div><div class='ctx'> 	if (host-&gt;flags &amp; SDHCI_USE_DMA) {</div><div class='ctx'> 		pci_unmap_sg(host-&gt;chip-&gt;pdev, data-&gt;sg, data-&gt;sg_len,</div><div class='ctx'> 			(data-&gt;flags &amp; MMC_DATA_READ)?PCI_DMA_FROMDEVICE:PCI_DMA_TODEVICE);</div><div class='del'>-	} else {</div><div class='del'>-		intmask = readl(host-&gt;ioaddr + SDHCI_SIGNAL_ENABLE);</div><div class='del'>-		intmask &amp;= ~(SDHCI_INT_BUF_EMPTY | SDHCI_INT_BUF_FULL);</div><div class='del'>-		writel(intmask, host-&gt;ioaddr + SDHCI_SIGNAL_ENABLE);</div><div class='del'>-</div><div class='del'>-		intmask = readl(host-&gt;ioaddr + SDHCI_INT_ENABLE);</div><div class='del'>-		intmask &amp;= ~(SDHCI_INT_BUF_EMPTY | SDHCI_INT_BUF_FULL);</div><div class='del'>-		writel(intmask, host-&gt;ioaddr + SDHCI_INT_ENABLE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -335,16 +463,14 @@ static void sdhci_finish_data(struct sdhci_host *host)</div><div class='ctx'> 		blocks = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		blocks = readw(host-&gt;ioaddr + SDHCI_BLOCK_COUNT);</div><div class='del'>-	data-&gt;bytes_xfered = (1 &lt;&lt; data-&gt;blksz_bits) * (data-&gt;blocks - blocks);</div><div class='add'>+	data-&gt;bytes_xfered = data-&gt;blksz * (data-&gt;blocks - blocks);</div><div class='ctx'> </div><div class='ctx'> 	if ((data-&gt;error == MMC_ERR_NONE) &amp;&amp; blocks) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Controller signalled completion even "</div><div class='ctx'> 			"though there were blocks left. Please report this "</div><div class='ctx'> 			"to " BUGMAIL ".\n", mmc_hostname(host-&gt;mmc));</div><div class='ctx'> 		data-&gt;error = MMC_ERR_FAILED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (host-&gt;size != 0) {</div><div class='add'>+	} else if (host-&gt;size != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: %d bytes were left untransferred. "</div><div class='ctx'> 			"Please report this to " BUGMAIL ".\n",</div><div class='ctx'> 			mmc_hostname(host-&gt;mmc), host-&gt;size);</div><div class='hunk'>@@ -371,27 +497,38 @@ static void sdhci_finish_data(struct sdhci_host *host)</div><div class='ctx'> static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int flags;</div><div class='del'>-	u32 present;</div><div class='del'>-	unsigned long max_jiffies;</div><div class='add'>+	u32 mask;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(host-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	DBG("Sending cmd (%x)\n", cmd-&gt;opcode);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait max 10 ms */</div><div class='del'>-	max_jiffies = jiffies + (HZ + 99)/100;</div><div class='del'>-	do {</div><div class='del'>-		if (time_after(jiffies, max_jiffies)) {</div><div class='add'>+	timeout = 10;</div><div class='add'>+</div><div class='add'>+	mask = SDHCI_CMD_INHIBIT;</div><div class='add'>+	if ((cmd-&gt;data != NULL) || (cmd-&gt;flags &amp; MMC_RSP_BUSY))</div><div class='add'>+		mask |= SDHCI_DATA_INHIBIT;</div><div class='add'>+</div><div class='add'>+	/* We shouldn't wait for data inihibit for stop commands, even</div><div class='add'>+	   though they might use busy signaling */</div><div class='add'>+	if (host-&gt;mrq-&gt;data &amp;&amp; (cmd == host-&gt;mrq-&gt;data-&gt;stop))</div><div class='add'>+		mask &amp;= ~SDHCI_DATA_INHIBIT;</div><div class='add'>+</div><div class='add'>+	while (readl(host-&gt;ioaddr + SDHCI_PRESENT_STATE) &amp; mask) {</div><div class='add'>+		if (timeout == 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Controller never released "</div><div class='del'>-				"inhibit bits. Please report this to "</div><div class='add'>+				"inhibit bit(s). Please report this to "</div><div class='ctx'> 				BUGMAIL ".\n", mmc_hostname(host-&gt;mmc));</div><div class='ctx'> 			sdhci_dumpregs(host);</div><div class='ctx'> 			cmd-&gt;error = MMC_ERR_FAILED;</div><div class='ctx'> 			tasklet_schedule(&amp;host-&gt;finish_tasklet);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		present = readl(host-&gt;ioaddr + SDHCI_PRESENT_STATE);</div><div class='del'>-	} while (present &amp; (SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT));</div><div class='add'>+		timeout--;</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;host-&gt;timer, jiffies + 10 * HZ);</div><div class='ctx'> </div><div class='hunk'>@@ -401,6 +538,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)</div><div class='ctx'> </div><div class='ctx'> 	writel(cmd-&gt;arg, host-&gt;ioaddr + SDHCI_ARGUMENT);</div><div class='ctx'> </div><div class='add'>+	sdhci_set_transfer_mode(host, cmd-&gt;data);</div><div class='add'>+</div><div class='ctx'> 	if ((cmd-&gt;flags &amp; MMC_RSP_136) &amp;&amp; (cmd-&gt;flags &amp; MMC_RSP_BUSY)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Unsupported response type! "</div><div class='ctx'> 			"Please report this to " BUGMAIL ".\n",</div><div class='hunk'>@@ -426,7 +565,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)</div><div class='ctx'> 	if (cmd-&gt;data)</div><div class='ctx'> 		flags |= SDHCI_CMD_DATA;</div><div class='ctx'> </div><div class='del'>-	writel(SDHCI_MAKE_CMD(cmd-&gt;opcode, flags),</div><div class='add'>+	writew(SDHCI_MAKE_CMD(cmd-&gt;opcode, flags),</div><div class='ctx'> 		host-&gt;ioaddr + SDHCI_COMMAND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -456,31 +595,9 @@ static void sdhci_finish_command(struct sdhci_host *host)</div><div class='ctx'> </div><div class='ctx'> 	DBG("Ending cmd (%x)\n", host-&gt;cmd-&gt;opcode);</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;cmd-&gt;data) {</div><div class='del'>-		u32 intmask;</div><div class='del'>-</div><div class='add'>+	if (host-&gt;cmd-&gt;data)</div><div class='ctx'> 		host-&gt;data = host-&gt;cmd-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!(host-&gt;flags &amp; SDHCI_USE_DMA)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Don't enable the interrupts until now to make sure we</div><div class='del'>-			 * get stable handling of the FIFO.</div><div class='del'>-			 */</div><div class='del'>-			intmask = readl(host-&gt;ioaddr + SDHCI_INT_ENABLE);</div><div class='del'>-			intmask |= SDHCI_INT_BUF_EMPTY | SDHCI_INT_BUF_FULL;</div><div class='del'>-			writel(intmask, host-&gt;ioaddr + SDHCI_INT_ENABLE);</div><div class='del'>-</div><div class='del'>-			intmask = readl(host-&gt;ioaddr + SDHCI_SIGNAL_ENABLE);</div><div class='del'>-			intmask |= SDHCI_INT_BUF_EMPTY | SDHCI_INT_BUF_FULL;</div><div class='del'>-			writel(intmask, host-&gt;ioaddr + SDHCI_SIGNAL_ENABLE);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * The buffer interrupts are to unreliable so we</div><div class='del'>-			 * start the transfer immediatly.</div><div class='del'>-			 */</div><div class='del'>-			sdhci_transfer_pio(host);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='add'>+	else</div><div class='ctx'> 		tasklet_schedule(&amp;host-&gt;finish_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;cmd = NULL;</div><div class='hunk'>@@ -490,7 +607,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> {</div><div class='ctx'> 	int div;</div><div class='ctx'> 	u16 clk;</div><div class='del'>-	unsigned long max_jiffies;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> </div><div class='ctx'> 	if (clock == host-&gt;clock)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -511,17 +628,19 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)</div><div class='ctx'> 	writew(clk, host-&gt;ioaddr + SDHCI_CLOCK_CONTROL);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait max 10 ms */</div><div class='del'>-	max_jiffies = jiffies + (HZ + 99)/100;</div><div class='del'>-	do {</div><div class='del'>-		if (time_after(jiffies, max_jiffies)) {</div><div class='add'>+	timeout = 10;</div><div class='add'>+	while (!((clk = readw(host-&gt;ioaddr + SDHCI_CLOCK_CONTROL))</div><div class='add'>+		&amp; SDHCI_CLOCK_INT_STABLE)) {</div><div class='add'>+		if (timeout == 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: Internal clock never stabilised. "</div><div class='ctx'> 				"Please report this to " BUGMAIL ".\n",</div><div class='ctx'> 				mmc_hostname(host-&gt;mmc));</div><div class='ctx'> 			sdhci_dumpregs(host);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		clk = readw(host-&gt;ioaddr + SDHCI_CLOCK_CONTROL);</div><div class='del'>-	} while (!(clk &amp; SDHCI_CLOCK_INT_STABLE));</div><div class='add'>+		timeout--;</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	clk |= SDHCI_CLOCK_CARD_EN;</div><div class='ctx'> 	writew(clk, host-&gt;ioaddr + SDHCI_CLOCK_CONTROL);</div><div class='hunk'>@@ -530,6 +649,46 @@ out:</div><div class='ctx'> 	host-&gt;clock = clock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sdhci_set_power(struct sdhci_host *host, unsigned short power)</div><div class='add'>+{</div><div class='add'>+	u8 pwr;</div><div class='add'>+</div><div class='add'>+	if (host-&gt;power == power)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	writeb(0, host-&gt;ioaddr + SDHCI_POWER_CONTROL);</div><div class='add'>+</div><div class='add'>+	if (power == (unsigned short)-1)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pwr = SDHCI_POWER_ON;</div><div class='add'>+</div><div class='add'>+	switch (power) {</div><div class='add'>+	case MMC_VDD_170:</div><div class='add'>+	case MMC_VDD_180:</div><div class='add'>+	case MMC_VDD_190:</div><div class='add'>+		pwr |= SDHCI_POWER_180;</div><div class='add'>+		break;</div><div class='add'>+	case MMC_VDD_290:</div><div class='add'>+	case MMC_VDD_300:</div><div class='add'>+	case MMC_VDD_310:</div><div class='add'>+		pwr |= SDHCI_POWER_300;</div><div class='add'>+		break;</div><div class='add'>+	case MMC_VDD_320:</div><div class='add'>+	case MMC_VDD_330:</div><div class='add'>+	case MMC_VDD_340:</div><div class='add'>+		pwr |= SDHCI_POWER_330;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writeb(pwr, host-&gt;ioaddr + SDHCI_POWER_CONTROL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	host-&gt;power = power;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************\</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * MMC callbacks                                                             *</div><div class='hunk'>@@ -576,17 +735,15 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ios-&gt;power_mode == MMC_POWER_OFF) {</div><div class='ctx'> 		writel(0, host-&gt;ioaddr + SDHCI_SIGNAL_ENABLE);</div><div class='del'>-		spin_unlock_irqrestore(&amp;host-&gt;lock, flags);</div><div class='ctx'> 		sdhci_init(host);</div><div class='del'>-		spin_lock_irqsave(&amp;host-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sdhci_set_clock(host, ios-&gt;clock);</div><div class='ctx'> </div><div class='ctx'> 	if (ios-&gt;power_mode == MMC_POWER_OFF)</div><div class='del'>-		writeb(0, host-&gt;ioaddr + SDHCI_POWER_CONTROL);</div><div class='add'>+		sdhci_set_power(host, -1);</div><div class='ctx'> 	else</div><div class='del'>-		writeb(0xFF, host-&gt;ioaddr + SDHCI_POWER_CONTROL);</div><div class='add'>+		sdhci_set_power(host, ios-&gt;vdd);</div><div class='ctx'> </div><div class='ctx'> 	ctrl = readb(host-&gt;ioaddr + SDHCI_HOST_CONTROL);</div><div class='ctx'> 	if (ios-&gt;bus_width == MMC_BUS_WIDTH_4)</div><div class='hunk'>@@ -679,6 +836,19 @@ static void sdhci_tasklet_finish(unsigned long param)</div><div class='ctx'> 	if ((mrq-&gt;cmd-&gt;error != MMC_ERR_NONE) ||</div><div class='ctx'> 		(mrq-&gt;data &amp;&amp; ((mrq-&gt;data-&gt;error != MMC_ERR_NONE) ||</div><div class='ctx'> 		(mrq-&gt;data-&gt;stop &amp;&amp; (mrq-&gt;data-&gt;stop-&gt;error != MMC_ERR_NONE))))) {</div><div class='add'>+</div><div class='add'>+		/* Some controllers need this kick or reset won't work here */</div><div class='add'>+		if (host-&gt;chip-&gt;quirks &amp; SDHCI_QUIRK_CLOCK_BEFORE_RESET) {</div><div class='add'>+			unsigned int clock;</div><div class='add'>+</div><div class='add'>+			/* This is to force an update */</div><div class='add'>+			clock = host-&gt;clock;</div><div class='add'>+			host-&gt;clock = 0;</div><div class='add'>+			sdhci_set_clock(host, clock);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Spec says we should do both at the same time, but Ricoh</div><div class='add'>+		   controllers do not like that. */</div><div class='ctx'> 		sdhci_reset(host, SDHCI_RESET_CMD);</div><div class='ctx'> 		sdhci_reset(host, SDHCI_RESET_DATA);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -793,7 +963,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)</div><div class='ctx'> 	if (host-&gt;data-&gt;error != MMC_ERR_NONE)</div><div class='ctx'> 		sdhci_finish_data(host);</div><div class='ctx'> 	else {</div><div class='del'>-		if (intmask &amp; (SDHCI_INT_BUF_FULL | SDHCI_INT_BUF_EMPTY))</div><div class='add'>+		if (intmask &amp; (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))</div><div class='ctx'> 			sdhci_transfer_pio(host);</div><div class='ctx'> </div><div class='ctx'> 		if (intmask &amp; SDHCI_INT_DATA_END)</div><div class='hunk'>@@ -818,50 +988,44 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	DBG("*** %s got interrupt: 0x%08x\n", host-&gt;slot_descr, intmask);</div><div class='ctx'> </div><div class='del'>-	if (intmask &amp; (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE))</div><div class='add'>+	if (intmask &amp; (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE)) {</div><div class='add'>+		writel(intmask &amp; (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE),</div><div class='add'>+			host-&gt;ioaddr + SDHCI_INT_STATUS);</div><div class='ctx'> 		tasklet_schedule(&amp;host-&gt;card_tasklet);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (intmask &amp; SDHCI_INT_CMD_MASK) {</div><div class='del'>-		sdhci_cmd_irq(host, intmask &amp; SDHCI_INT_CMD_MASK);</div><div class='add'>+	intmask &amp;= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE);</div><div class='ctx'> </div><div class='add'>+	if (intmask &amp; SDHCI_INT_CMD_MASK) {</div><div class='ctx'> 		writel(intmask &amp; SDHCI_INT_CMD_MASK,</div><div class='ctx'> 			host-&gt;ioaddr + SDHCI_INT_STATUS);</div><div class='add'>+		sdhci_cmd_irq(host, intmask &amp; SDHCI_INT_CMD_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (intmask &amp; SDHCI_INT_DATA_MASK) {</div><div class='del'>-		sdhci_data_irq(host, intmask &amp; SDHCI_INT_DATA_MASK);</div><div class='del'>-</div><div class='ctx'> 		writel(intmask &amp; SDHCI_INT_DATA_MASK,</div><div class='ctx'> 			host-&gt;ioaddr + SDHCI_INT_STATUS);</div><div class='add'>+		sdhci_data_irq(host, intmask &amp; SDHCI_INT_DATA_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	intmask &amp;= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK);</div><div class='ctx'> </div><div class='del'>-	if (intmask &amp; SDHCI_INT_CARD_INT) {</div><div class='del'>-		printk(KERN_ERR "%s: Unexpected card interrupt. Please "</div><div class='del'>-			"report this to " BUGMAIL ".\n",</div><div class='del'>-			mmc_hostname(host-&gt;mmc));</div><div class='del'>-		sdhci_dumpregs(host);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (intmask &amp; SDHCI_INT_BUS_POWER) {</div><div class='del'>-		printk(KERN_ERR "%s: Unexpected bus power interrupt. Please "</div><div class='del'>-			"report this to " BUGMAIL ".\n",</div><div class='add'>+		printk(KERN_ERR "%s: Card is consuming too much power!\n",</div><div class='ctx'> 			mmc_hostname(host-&gt;mmc));</div><div class='del'>-		sdhci_dumpregs(host);</div><div class='add'>+		writel(SDHCI_INT_BUS_POWER, host-&gt;ioaddr + SDHCI_INT_STATUS);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (intmask &amp; SDHCI_INT_ACMD12ERR) {</div><div class='del'>-		printk(KERN_ERR "%s: Unexpected auto CMD12 error. Please "</div><div class='add'>+	intmask &amp;= SDHCI_INT_BUS_POWER;</div><div class='add'>+</div><div class='add'>+	if (intmask) {</div><div class='add'>+		printk(KERN_ERR "%s: Unexpected interrupt 0x%08x. Please "</div><div class='ctx'> 			"report this to " BUGMAIL ".\n",</div><div class='del'>-			mmc_hostname(host-&gt;mmc));</div><div class='add'>+			mmc_hostname(host-&gt;mmc), intmask);</div><div class='ctx'> 		sdhci_dumpregs(host);</div><div class='ctx'> </div><div class='del'>-		writew(~0, host-&gt;ioaddr + SDHCI_ACMD12_ERR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (intmask)</div><div class='ctx'> 		writel(intmask, host-&gt;ioaddr + SDHCI_INT_STATUS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	result = IRQ_HANDLED;</div><div class='ctx'> </div><div class='hunk'>@@ -954,6 +1118,7 @@ static int sdhci_resume (struct pci_dev *pdev)</div><div class='ctx'> static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	unsigned int version;</div><div class='ctx'> 	struct sdhci_chip *chip;</div><div class='ctx'> 	struct mmc_host *mmc;</div><div class='ctx'> 	struct sdhci_host *host;</div><div class='hunk'>@@ -985,6 +1150,16 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((pdev-&gt;class &amp; 0x0000FF) == PCI_SDHCI_IFVENDOR) {</div><div class='add'>+		printk(KERN_ERR DRIVER_NAME ": Vendor specific interface. Aborting.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((pdev-&gt;class &amp; 0x0000FF) &gt; PCI_SDHCI_IFVENDOR) {</div><div class='add'>+		printk(KERN_ERR DRIVER_NAME ": Unknown interface. Aborting.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mmc = mmc_alloc_host(sizeof(struct sdhci_host), &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!mmc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1012,9 +1187,30 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> 		goto release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	sdhci_reset(host, SDHCI_RESET_ALL);</div><div class='add'>+</div><div class='add'>+	version = readw(host-&gt;ioaddr + SDHCI_HOST_VERSION);</div><div class='add'>+	version = (version &amp; SDHCI_SPEC_VER_MASK) &gt;&gt; SDHCI_SPEC_VER_SHIFT;</div><div class='add'>+	if (version != 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Unknown controller version (%d). "</div><div class='add'>+			"You may experience problems.\n", host-&gt;slot_descr,</div><div class='add'>+			version);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	caps = readl(host-&gt;ioaddr + SDHCI_CAPABILITIES);</div><div class='ctx'> </div><div class='del'>-	if ((caps &amp; SDHCI_CAN_DO_DMA) &amp;&amp; ((pdev-&gt;class &amp; 0x0000FF) == 0x01))</div><div class='add'>+	if (debug_nodma)</div><div class='add'>+		DBG("DMA forced off\n");</div><div class='add'>+	else if (debug_forcedma) {</div><div class='add'>+		DBG("DMA forced on\n");</div><div class='add'>+		host-&gt;flags |= SDHCI_USE_DMA;</div><div class='add'>+	} else if (chip-&gt;quirks &amp; SDHCI_QUIRK_FORCE_DMA)</div><div class='add'>+		host-&gt;flags |= SDHCI_USE_DMA;</div><div class='add'>+	else if ((pdev-&gt;class &amp; 0x0000FF) != PCI_SDHCI_IFDMA)</div><div class='add'>+		DBG("Controller doesn't have DMA interface\n");</div><div class='add'>+	else if (!(caps &amp; SDHCI_CAN_DO_DMA))</div><div class='add'>+		DBG("Controller doesn't have DMA capability\n");</div><div class='add'>+	else</div><div class='ctx'> 		host-&gt;flags |= SDHCI_USE_DMA;</div><div class='ctx'> </div><div class='ctx'> 	if (host-&gt;flags &amp; SDHCI_USE_DMA) {</div><div class='hunk'>@@ -1030,18 +1226,59 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> 	else /* XXX: Hack to get MMC layer to avoid highmem */</div><div class='ctx'> 		pdev-&gt;dma_mask = 0;</div><div class='ctx'> </div><div class='del'>-	host-&gt;max_clk = (caps &amp; SDHCI_CLOCK_BASE_MASK) &gt;&gt; SDHCI_CLOCK_BASE_SHIFT;</div><div class='add'>+	host-&gt;max_clk =</div><div class='add'>+		(caps &amp; SDHCI_CLOCK_BASE_MASK) &gt;&gt; SDHCI_CLOCK_BASE_SHIFT;</div><div class='add'>+	if (host-&gt;max_clk == 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Hardware doesn't specify base clock "</div><div class='add'>+			"frequency.\n", host-&gt;slot_descr);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='ctx'> 	host-&gt;max_clk *= 1000000;</div><div class='ctx'> </div><div class='add'>+	host-&gt;timeout_clk =</div><div class='add'>+		(caps &amp; SDHCI_TIMEOUT_CLK_MASK) &gt;&gt; SDHCI_TIMEOUT_CLK_SHIFT;</div><div class='add'>+	if (host-&gt;timeout_clk == 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Hardware doesn't specify timeout clock "</div><div class='add'>+			"frequency.\n", host-&gt;slot_descr);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+	if (caps &amp; SDHCI_TIMEOUT_CLK_UNIT)</div><div class='add'>+		host-&gt;timeout_clk *= 1000;</div><div class='add'>+</div><div class='add'>+	host-&gt;max_block = (caps &amp; SDHCI_MAX_BLOCK_MASK) &gt;&gt; SDHCI_MAX_BLOCK_SHIFT;</div><div class='add'>+	if (host-&gt;max_block &gt;= 3) {</div><div class='add'>+		printk(KERN_ERR "%s: Invalid maximum block size.\n",</div><div class='add'>+			host-&gt;slot_descr);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+	host-&gt;max_block = 512 &lt;&lt; host-&gt;max_block;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set host parameters.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mmc-&gt;ops = &amp;sdhci_ops;</div><div class='ctx'> 	mmc-&gt;f_min = host-&gt;max_clk / 256;</div><div class='ctx'> 	mmc-&gt;f_max = host-&gt;max_clk;</div><div class='del'>-	mmc-&gt;ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;</div><div class='ctx'> 	mmc-&gt;caps = MMC_CAP_4_BIT_DATA;</div><div class='ctx'> </div><div class='add'>+	mmc-&gt;ocr_avail = 0;</div><div class='add'>+	if (caps &amp; SDHCI_CAN_VDD_330)</div><div class='add'>+		mmc-&gt;ocr_avail |= MMC_VDD_32_33|MMC_VDD_33_34;</div><div class='add'>+	else if (caps &amp; SDHCI_CAN_VDD_300)</div><div class='add'>+		mmc-&gt;ocr_avail |= MMC_VDD_29_30|MMC_VDD_30_31;</div><div class='add'>+	else if (caps &amp; SDHCI_CAN_VDD_180)</div><div class='add'>+		mmc-&gt;ocr_avail |= MMC_VDD_17_18|MMC_VDD_18_19;</div><div class='add'>+</div><div class='add'>+	if (mmc-&gt;ocr_avail == 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Hardware doesn't report any "</div><div class='add'>+			"support voltages.\n", host-&gt;slot_descr);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;host-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1054,10 +1291,10 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> 	mmc-&gt;max_phys_segs = 16;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Maximum number of sectors in one transfer. Limited by sector</div><div class='del'>-	 * count register.</div><div class='add'>+	 * Maximum number of sectors in one transfer. Limited by DMA boundary</div><div class='add'>+	 * size (512KiB), which means (512 KiB/512=) 1024 entries.</div><div class='ctx'> 	 */</div><div class='del'>-	mmc-&gt;max_sectors = 0x3FFF;</div><div class='add'>+	mmc-&gt;max_sectors = 1024;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Maximum segment size. Could be one segment with the maximum number</div><div class='hunk'>@@ -1073,12 +1310,12 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> 	tasklet_init(&amp;host-&gt;finish_tasklet,</div><div class='ctx'> 		sdhci_tasklet_finish, (unsigned long)host);</div><div class='ctx'> </div><div class='del'>-	setup_timer(&amp;host-&gt;timer, sdhci_timeout_timer, (int)host);</div><div class='add'>+	setup_timer(&amp;host-&gt;timer, sdhci_timeout_timer, (long)host);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(host-&gt;irq, sdhci_irq, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(host-&gt;irq, sdhci_irq, IRQF_SHARED,</div><div class='ctx'> 		host-&gt;slot_descr, host);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto unmap;</div><div class='add'>+		goto untasklet;</div><div class='ctx'> </div><div class='ctx'> 	sdhci_init(host);</div><div class='ctx'> </div><div class='hunk'>@@ -1097,10 +1334,10 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-unmap:</div><div class='add'>+untasklet:</div><div class='ctx'> 	tasklet_kill(&amp;host-&gt;card_tasklet);</div><div class='ctx'> 	tasklet_kill(&amp;host-&gt;finish_tasklet);</div><div class='del'>-</div><div class='add'>+unmap:</div><div class='ctx'> 	iounmap(host-&gt;ioaddr);</div><div class='ctx'> release:</div><div class='ctx'> 	pci_release_region(pdev, host-&gt;bar);</div><div class='hunk'>@@ -1144,13 +1381,18 @@ static int __devinit sdhci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='del'>-	u8 slots;</div><div class='add'>+	u8 slots, rev;</div><div class='ctx'> 	struct sdhci_chip *chip;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(pdev == NULL);</div><div class='ctx'> 	BUG_ON(ent == NULL);</div><div class='ctx'> </div><div class='del'>-	DBG("found at %s\n", pci_name(pdev));</div><div class='add'>+	pci_read_config_byte(pdev, PCI_CLASS_REVISION, &amp;rev);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO DRIVER_NAME</div><div class='add'>+		": SDHCI controller found at %s [%04x:%04x] (rev %x)\n",</div><div class='add'>+		pci_name(pdev), (int)pdev-&gt;vendor, (int)pdev-&gt;device,</div><div class='add'>+		(int)rev);</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_read_config_byte(pdev, PCI_SLOT_INFO, &amp;slots);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1173,6 +1415,10 @@ static int __devinit sdhci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pdev = pdev;</div><div class='add'>+	chip-&gt;quirks = ent-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	if (debug_quirks)</div><div class='add'>+		chip-&gt;quirks = debug_quirks;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;num_slots = slots;</div><div class='ctx'> 	pci_set_drvdata(pdev, chip);</div><div class='hunk'>@@ -1251,7 +1497,15 @@ static void __exit sdhci_drv_exit(void)</div><div class='ctx'> module_init(sdhci_drv_init);</div><div class='ctx'> module_exit(sdhci_drv_exit);</div><div class='ctx'> </div><div class='add'>+module_param(debug_nodma, uint, 0444);</div><div class='add'>+module_param(debug_forcedma, uint, 0444);</div><div class='add'>+module_param(debug_quirks, uint, 0444);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Pierre Ossman &lt;drzeus@drzeus.cx&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver");</div><div class='ctx'> MODULE_VERSION(DRIVER_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)");</div><div class='add'>+MODULE_PARM_DESC(debug_forcedma, "Forcefully enable DMA transfers. (default 0)");</div><div class='add'>+MODULE_PARM_DESC(debug_quirks, "Force certain quirks.");</div><div class='head'>diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/sdhci.h<br/>index 3b270ef486b4..f2453343f783 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/sdhci.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/sdhci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/sdhci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/sdhci.h</a></div><div class='hunk'>@@ -12,6 +12,10 @@</div><div class='ctx'>  * PCI registers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define PCI_SDHCI_IFPIO			0x00</div><div class='add'>+#define PCI_SDHCI_IFDMA			0x01</div><div class='add'>+#define PCI_SDHCI_IFVENDOR		0x02</div><div class='add'>+</div><div class='ctx'> #define PCI_SLOT_INFO			0x40	/* 8 bits */</div><div class='ctx'> #define  PCI_SLOT_INFO_SLOTS(x)		((x &gt;&gt; 4) &amp; 7)</div><div class='ctx'> #define  PCI_SLOT_INFO_FIRST_BAR_MASK	0x07</div><div class='hunk'>@@ -23,6 +27,7 @@</div><div class='ctx'> #define SDHCI_DMA_ADDRESS	0x00</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_BLOCK_SIZE	0x04</div><div class='add'>+#define  SDHCI_MAKE_BLKSZ(dma, blksz) (((dma &amp; 0x7) &lt;&lt; 12) | (blksz &amp; 0xFFF))</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_BLOCK_COUNT	0x06</div><div class='ctx'> </div><div class='hunk'>@@ -67,6 +72,10 @@</div><div class='ctx'> #define  SDHCI_CTRL_4BITBUS	0x02</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_POWER_CONTROL	0x29</div><div class='add'>+#define  SDHCI_POWER_ON		0x01</div><div class='add'>+#define  SDHCI_POWER_180	0x0A</div><div class='add'>+#define  SDHCI_POWER_300	0x0C</div><div class='add'>+#define  SDHCI_POWER_330	0x0E</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_BLOCK_GAP_CONTROL	0x2A</div><div class='ctx'> </div><div class='hunk'>@@ -91,8 +100,8 @@</div><div class='ctx'> #define  SDHCI_INT_RESPONSE	0x00000001</div><div class='ctx'> #define  SDHCI_INT_DATA_END	0x00000002</div><div class='ctx'> #define  SDHCI_INT_DMA_END	0x00000008</div><div class='del'>-#define  SDHCI_INT_BUF_EMPTY	0x00000010</div><div class='del'>-#define  SDHCI_INT_BUF_FULL	0x00000020</div><div class='add'>+#define  SDHCI_INT_SPACE_AVAIL	0x00000010</div><div class='add'>+#define  SDHCI_INT_DATA_AVAIL	0x00000020</div><div class='ctx'> #define  SDHCI_INT_CARD_INSERT	0x00000040</div><div class='ctx'> #define  SDHCI_INT_CARD_REMOVE	0x00000080</div><div class='ctx'> #define  SDHCI_INT_CARD_INT	0x00000100</div><div class='hunk'>@@ -112,7 +121,7 @@</div><div class='ctx'> #define  SDHCI_INT_CMD_MASK	(SDHCI_INT_RESPONSE | SDHCI_INT_TIMEOUT | \</div><div class='ctx'> 		SDHCI_INT_CRC | SDHCI_INT_END_BIT | SDHCI_INT_INDEX)</div><div class='ctx'> #define  SDHCI_INT_DATA_MASK	(SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | \</div><div class='del'>-		SDHCI_INT_BUF_EMPTY | SDHCI_INT_BUF_FULL | \</div><div class='add'>+		SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \</div><div class='ctx'> 		SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \</div><div class='ctx'> 		SDHCI_INT_DATA_END_BIT)</div><div class='ctx'> </div><div class='hunk'>@@ -121,9 +130,17 @@</div><div class='ctx'> /* 3E-3F reserved */</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_CAPABILITIES	0x40</div><div class='del'>-#define  SDHCI_CAN_DO_DMA	0x00400000</div><div class='add'>+#define  SDHCI_TIMEOUT_CLK_MASK	0x0000003F</div><div class='add'>+#define  SDHCI_TIMEOUT_CLK_SHIFT 0</div><div class='add'>+#define  SDHCI_TIMEOUT_CLK_UNIT	0x00000080</div><div class='ctx'> #define  SDHCI_CLOCK_BASE_MASK	0x00003F00</div><div class='ctx'> #define  SDHCI_CLOCK_BASE_SHIFT	8</div><div class='add'>+#define  SDHCI_MAX_BLOCK_MASK	0x00030000</div><div class='add'>+#define  SDHCI_MAX_BLOCK_SHIFT  16</div><div class='add'>+#define  SDHCI_CAN_DO_DMA	0x00400000</div><div class='add'>+#define  SDHCI_CAN_VDD_330	0x01000000</div><div class='add'>+#define  SDHCI_CAN_VDD_300	0x02000000</div><div class='add'>+#define  SDHCI_CAN_VDD_180	0x04000000</div><div class='ctx'> </div><div class='ctx'> /* 44-47 reserved for more caps */</div><div class='ctx'> </div><div class='hunk'>@@ -136,6 +153,10 @@</div><div class='ctx'> #define SDHCI_SLOT_INT_STATUS	0xFC</div><div class='ctx'> </div><div class='ctx'> #define SDHCI_HOST_VERSION	0xFE</div><div class='add'>+#define  SDHCI_VENDOR_VER_MASK	0xFF00</div><div class='add'>+#define  SDHCI_VENDOR_VER_SHIFT	8</div><div class='add'>+#define  SDHCI_SPEC_VER_MASK	0x00FF</div><div class='add'>+#define  SDHCI_SPEC_VER_SHIFT	0</div><div class='ctx'> </div><div class='ctx'> struct sdhci_chip;</div><div class='ctx'> </div><div class='hunk'>@@ -149,8 +170,11 @@ struct sdhci_host {</div><div class='ctx'> #define SDHCI_USE_DMA		(1&lt;&lt;0)</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		max_clk;	/* Max possible freq (MHz) */</div><div class='add'>+	unsigned int		timeout_clk;	/* Timeout freq (KHz) */</div><div class='add'>+	unsigned int		max_block;	/* Max block size (bytes) */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		clock;		/* Current clock (MHz) */</div><div class='add'>+	unsigned short		power;		/* Current voltage */</div><div class='ctx'> </div><div class='ctx'> 	struct mmc_request	*mrq;		/* Current request */</div><div class='ctx'> 	struct mmc_command	*cmd;		/* Current command */</div><div class='hunk'>@@ -180,6 +204,8 @@ struct sdhci_host {</div><div class='ctx'> struct sdhci_chip {</div><div class='ctx'> 	struct pci_dev		*pdev;</div><div class='ctx'> </div><div class='add'>+	unsigned long		quirks;</div><div class='add'>+</div><div class='ctx'> 	int			num_slots;	/* Slots on controller */</div><div class='ctx'> 	struct sdhci_host	*hosts[0];	/* Pointers to hosts */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c<br/>index 8167332d4013..8a30ef3ae419 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mmc/wbsd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mmc/wbsd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mmc/wbsd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mmc/wbsd.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * - On APIC systems the FIFO empty interrupt is sometimes lost.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -1554,7 +1553,7 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)</div><div class='ctx'> 	 * Allocate interrupt.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, wbsd_irq, SA_SHIRQ, DRIVER_NAME, host);</div><div class='add'>+	ret = request_irq(irq, wbsd_irq, IRQF_SHARED, DRIVER_NAME, host);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig<br/>index f6b775e63ac8..1344ad7a4b14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/Kconfig</a></div><div class='hunk'>@@ -78,7 +78,7 @@ config MTD_REDBOOT_DIRECTORY_BLOCK</div><div class='ctx'> 	  option.</div><div class='ctx'> </div><div class='ctx'> 	  The option specifies which Flash sectors holds the RedBoot</div><div class='del'>-	  partition table.  A zero or positive value gives an absolete</div><div class='add'>+	  partition table.  A zero or positive value gives an absolute</div><div class='ctx'> 	  erase block number. A negative value specifies a number of</div><div class='ctx'> 	  sectors before the end of the device.</div><div class='ctx'> </div><div class='hunk'>@@ -86,14 +86,14 @@ config MTD_REDBOOT_DIRECTORY_BLOCK</div><div class='ctx'> 	  block and "-2" means the penultimate block.</div><div class='ctx'> </div><div class='ctx'> config MTD_REDBOOT_PARTS_UNALLOCATED</div><div class='del'>-	bool "  Include unallocated flash regions"</div><div class='add'>+	bool "Include unallocated flash regions"</div><div class='ctx'> 	depends on MTD_REDBOOT_PARTS</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you need to register each unallocated flash region as a MTD</div><div class='ctx'> 	  'partition', enable this option.</div><div class='ctx'> </div><div class='ctx'> config MTD_REDBOOT_PARTS_READONLY</div><div class='del'>-	bool "  Force read-only for RedBoot system images"</div><div class='add'>+	bool "Force read-only for RedBoot system images"</div><div class='ctx'> 	depends on MTD_REDBOOT_PARTS</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you need to force read-only for 'RedBoot', 'RedBoot Config' and</div><div class='hunk'>@@ -103,7 +103,7 @@ config MTD_CMDLINE_PARTS</div><div class='ctx'> 	bool "Command line partition table parsing"</div><div class='ctx'> 	depends on MTD_PARTITIONS = "y"</div><div class='ctx'> 	---help---</div><div class='del'>-	  Allow generic configuration of the MTD paritition tables via the kernel</div><div class='add'>+	  Allow generic configuration of the MTD partition tables via the kernel</div><div class='ctx'> 	  command line. Multiple flash resources are supported for hardware where</div><div class='ctx'> 	  different kinds of flash memory are available.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig<br/>index a7ec5954caf5..6d8f30deb868 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/Kconfig</a></div><div class='hunk'>@@ -30,7 +30,6 @@ config MTD_JEDECPROBE</div><div class='ctx'> </div><div class='ctx'> config MTD_GEN_PROBE</div><div class='ctx'> 	tristate</div><div class='del'>-	select OBSOLETE_INTERMODULE</div><div class='ctx'> </div><div class='ctx'> config MTD_CFI_ADV_OPTIONS</div><div class='ctx'> 	bool "Flash chip driver advanced configuration options"</div><div class='head'>diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile<br/>index 8afe3092c4e3..75bc1c2a0f43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/Makefile</a></div><div class='hunk'>@@ -3,13 +3,6 @@</div><div class='ctx'> #</div><div class='ctx'> # $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $</div><div class='ctx'> </div><div class='del'>-#                       *** BIG UGLY NOTE ***</div><div class='del'>-#</div><div class='del'>-# The removal of get_module_symbol() and replacement with</div><div class='del'>-# inter_module_register() et al has introduced a link order dependency</div><div class='del'>-# here where previously there was none.  We now have to ensure that</div><div class='del'>-# the CFI command set drivers are linked before gen_probe.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_MTD)		+= chipreg.o</div><div class='ctx'> obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o</div><div class='ctx'> obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o</div><div class='head'>diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c<br/>index 57115618c496..16eaca69fb5a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/amd_flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/amd_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/amd_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/amd_flash.c</a></div><div class='hunk'>@@ -97,7 +97,6 @@ struct amd_flash_private {</div><div class='ctx'> 	int interleave;</div><div class='ctx'> 	int numchips;</div><div class='ctx'> 	unsigned long chipshift;</div><div class='del'>-//	const char *im_name;</div><div class='ctx'> 	struct flchip chips[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -131,12 +130,6 @@ static struct mtd_chip_driver amd_flash_chipdrv = {</div><div class='ctx'> 	.module = THIS_MODULE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char im_name[] = "amd_flash";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static inline __u32 wide_read(struct map_info *map, __u32 addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (map-&gt;buswidth == 1) {</div><div class='hunk'>@@ -737,6 +730,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)</div><div class='ctx'> 		offset += dev_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	mtd-&gt;type = MTD_NORFLASH;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_NORFLASH;</div><div class='ctx'> 	mtd-&gt;name = map-&gt;name;</div><div class='ctx'> 	mtd-&gt;erase = amd_flash_erase;</div><div class='head'>diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c<br/>index 1c074d63ff3a..39edb8250fbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0001.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_cmdset_0001.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0001.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/cfi_cmdset_0001.c</a></div><div class='hunk'>@@ -331,13 +331,6 @@ read_pri_intelext(struct map_info *map, __u16 adr)</div><div class='ctx'> 	return extp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This routine is made available to other mtd code via</div><div class='del'>- * inter_module_register.  It must only be accessed through</div><div class='del'>- * inter_module_get which will bump the use count of this module.  The</div><div class='del'>- * addresses passed back in cfi are valid as long as the use count of</div><div class='del'>- * this module is non-zero, i.e. between inter_module_get and</div><div class='del'>- * inter_module_put.  Keith Owens &lt;kaos@ocs.com.au&gt; 29 Oct 2000.</div><div class='del'>- */</div><div class='ctx'> struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='hunk'>@@ -364,6 +357,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)</div><div class='ctx'> 	mtd-&gt;resume  = cfi_intelext_resume;</div><div class='ctx'> 	mtd-&gt;flags   = MTD_CAP_NORFLASH;</div><div class='ctx'> 	mtd-&gt;name    = map-&gt;name;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;reboot_notifier.notifier_call = cfi_intelext_reboot;</div><div class='ctx'> </div><div class='hunk'>@@ -406,7 +400,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)</div><div class='ctx'> 	for (i=0; i&lt; cfi-&gt;numchips; i++) {</div><div class='ctx'> 		cfi-&gt;chips[i].word_write_time = 1&lt;&lt;cfi-&gt;cfiq-&gt;WordWriteTimeoutTyp;</div><div class='ctx'> 		cfi-&gt;chips[i].buffer_write_time = 1&lt;&lt;cfi-&gt;cfiq-&gt;BufWriteTimeoutTyp;</div><div class='del'>-		cfi-&gt;chips[i].erase_time = 1&lt;&lt;cfi-&gt;cfiq-&gt;BlockEraseTimeoutTyp;</div><div class='add'>+		cfi-&gt;chips[i].erase_time = 1000&lt;&lt;cfi-&gt;cfiq-&gt;BlockEraseTimeoutTyp;</div><div class='ctx'> 		cfi-&gt;chips[i].ref_point_counter = 0;</div><div class='ctx'> 		init_waitqueue_head(&amp;(cfi-&gt;chips[i].wq));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -415,6 +409,11 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)</div><div class='ctx'> </div><div class='ctx'> 	return cfi_intelext_setup(mtd);</div><div class='ctx'> }</div><div class='add'>+struct mtd_info *cfi_cmdset_0003(struct map_info *map, int primary) __attribute__((alias("cfi_cmdset_0001")));</div><div class='add'>+struct mtd_info *cfi_cmdset_0200(struct map_info *map, int primary) __attribute__((alias("cfi_cmdset_0001")));</div><div class='add'>+EXPORT_SYMBOL_GPL(cfi_cmdset_0001);</div><div class='add'>+EXPORT_SYMBOL_GPL(cfi_cmdset_0003);</div><div class='add'>+EXPORT_SYMBOL_GPL(cfi_cmdset_0200);</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='hunk'>@@ -547,12 +546,12 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,</div><div class='ctx'> 		if (extp-&gt;MinorVersion &gt;= '4') {</div><div class='ctx'> 			struct cfi_intelext_programming_regioninfo *prinfo;</div><div class='ctx'> 			prinfo = (struct cfi_intelext_programming_regioninfo *)&amp;extp-&gt;extra[offs];</div><div class='del'>-			MTD_PROGREGION_SIZE(mtd) = cfi-&gt;interleave &lt;&lt; prinfo-&gt;ProgRegShift;</div><div class='add'>+			mtd-&gt;writesize = cfi-&gt;interleave &lt;&lt; prinfo-&gt;ProgRegShift;</div><div class='ctx'> 			MTD_PROGREGION_CTRLMODE_VALID(mtd) = cfi-&gt;interleave * prinfo-&gt;ControlValid;</div><div class='ctx'> 			MTD_PROGREGION_CTRLMODE_INVALID(mtd) = cfi-&gt;interleave * prinfo-&gt;ControlInvalid;</div><div class='del'>-			mtd-&gt;flags |= MTD_PROGRAM_REGIONS;</div><div class='add'>+			mtd-&gt;flags &amp;= ~MTD_BIT_WRITEABLE;</div><div class='ctx'> 			printk(KERN_DEBUG "%s: program region size/ctrl_valid/ctrl_inval = %d/%d/%d\n",</div><div class='del'>-			       map-&gt;name, MTD_PROGREGION_SIZE(mtd),</div><div class='add'>+			       map-&gt;name, mtd-&gt;writesize,</div><div class='ctx'> 			       MTD_PROGREGION_CTRLMODE_VALID(mtd),</div><div class='ctx'> 			       MTD_PROGREGION_CTRLMODE_INVALID(mtd));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -896,26 +895,33 @@ static void __xipram xip_enable(struct map_info *map, struct flchip *chip,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * When a delay is required for the flash operation to complete, the</div><div class='del'>- * xip_udelay() function is polling for both the given timeout and pending</div><div class='del'>- * (but still masked) hardware interrupts.  Whenever there is an interrupt</div><div class='del'>- * pending then the flash erase or write operation is suspended, array mode</div><div class='del'>- * restored and interrupts unmasked.  Task scheduling might also happen at that</div><div class='del'>- * point.  The CPU eventually returns from the interrupt or the call to</div><div class='del'>- * schedule() and the suspended flash operation is resumed for the remaining</div><div class='del'>- * of the delay period.</div><div class='add'>+ * xip_wait_for_operation() function is polling for both the given timeout</div><div class='add'>+ * and pending (but still masked) hardware interrupts.  Whenever there is an</div><div class='add'>+ * interrupt pending then the flash erase or write operation is suspended,</div><div class='add'>+ * array mode restored and interrupts unmasked.  Task scheduling might also</div><div class='add'>+ * happen at that point.  The CPU eventually returns from the interrupt or</div><div class='add'>+ * the call to schedule() and the suspended flash operation is resumed for</div><div class='add'>+ * the remaining of the delay period.</div><div class='ctx'>  *</div><div class='ctx'>  * Warning: this function _will_ fool interrupt latency tracing tools.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,</div><div class='del'>-				unsigned long adr, int usec)</div><div class='add'>+static int __xipram xip_wait_for_operation(</div><div class='add'>+		struct map_info *map, struct flchip *chip,</div><div class='add'>+		unsigned long adr, int *chip_op_time )</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='ctx'> 	struct cfi_pri_intelext *cfip = cfi-&gt;cmdset_priv;</div><div class='ctx'> 	map_word status, OK = CMD(0x80);</div><div class='del'>-	unsigned long suspended, start = xip_currtime();</div><div class='add'>+	unsigned long usec, suspended, start, done;</div><div class='ctx'> 	flstate_t oldstate, newstate;</div><div class='ctx'> </div><div class='add'>+       	start = xip_currtime();</div><div class='add'>+	usec = *chip_op_time * 8;</div><div class='add'>+	if (usec == 0)</div><div class='add'>+		usec = 500000;</div><div class='add'>+	done = 0;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 		if (xip_irqpending() &amp;&amp; cfip &amp;&amp;</div><div class='hunk'>@@ -932,9 +938,9 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 			 * we resume the whole thing at once).  Yes, it</div><div class='ctx'> 			 * can happen!</div><div class='ctx'> 			 */</div><div class='add'>+			usec -= done;</div><div class='ctx'> 			map_write(map, CMD(0xb0), adr);</div><div class='ctx'> 			map_write(map, CMD(0x70), adr);</div><div class='del'>-			usec -= xip_elapsed_since(start);</div><div class='ctx'> 			suspended = xip_currtime();</div><div class='ctx'> 			do {</div><div class='ctx'> 				if (xip_elapsed_since(suspended) &gt; 100000) {</div><div class='hunk'>@@ -944,7 +950,7 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 					 * This is a critical error but there</div><div class='ctx'> 					 * is not much we can do here.</div><div class='ctx'> 					 */</div><div class='del'>-					return;</div><div class='add'>+					return -EIO;</div><div class='ctx'> 				}</div><div class='ctx'> 				status = map_read(map, adr);</div><div class='ctx'> 			} while (!map_word_andequal(map, status, OK, OK));</div><div class='hunk'>@@ -1004,65 +1010,107 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 			xip_cpu_idle();</div><div class='ctx'> 		}</div><div class='ctx'> 		status = map_read(map, adr);</div><div class='add'>+		done = xip_elapsed_since(start);</div><div class='ctx'> 	} while (!map_word_andequal(map, status, OK, OK)</div><div class='del'>-		 &amp;&amp; xip_elapsed_since(start) &lt; usec);</div><div class='del'>-}</div><div class='add'>+		 &amp;&amp; done &lt; usec);</div><div class='ctx'> </div><div class='del'>-#define UDELAY(map, chip, adr, usec)  xip_udelay(map, chip, adr, usec)</div><div class='add'>+	return (done &gt;= usec) ? -ETIME : 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The INVALIDATE_CACHED_RANGE() macro is normally used in parallel while</div><div class='ctx'>  * the flash is actively programming or erasing since we have to poll for</div><div class='ctx'>  * the operation to complete anyway.  We can't do that in a generic way with</div><div class='ctx'>  * a XIP setup so do it before the actual flash operation in this case</div><div class='del'>- * and stub it out from INVALIDATE_CACHE_UDELAY.</div><div class='add'>+ * and stub it out from INVAL_CACHE_AND_WAIT.</div><div class='ctx'>  */</div><div class='ctx'> #define XIP_INVAL_CACHED_RANGE(map, from, size)  \</div><div class='ctx'> 	INVALIDATE_CACHED_RANGE(map, from, size)</div><div class='ctx'> </div><div class='del'>-#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \</div><div class='del'>-	UDELAY(map, chip, cmd_adr, usec)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Extra notes:</div><div class='del'>- *</div><div class='del'>- * Activating this XIP support changes the way the code works a bit.  For</div><div class='del'>- * example the code to suspend the current process when concurrent access</div><div class='del'>- * happens is never executed because xip_udelay() will always return with the</div><div class='del'>- * same chip state as it was entered with.  This is why there is no care for</div><div class='del'>- * the presence of add_wait_queue() or schedule() calls from within a couple</div><div class='del'>- * xip_disable()'d  areas of code, like in do_erase_oneblock for example.</div><div class='del'>- * The queueing and scheduling are always happening within xip_udelay().</div><div class='del'>- *</div><div class='del'>- * Similarly, get_chip() and put_chip() just happen to always be executed</div><div class='del'>- * with chip-&gt;state set to FL_READY (or FL_XIP_WHILE_*) where flash state</div><div class='del'>- * is in array mode, therefore never executing many cases therein and not</div><div class='del'>- * causing any problem with XIP.</div><div class='del'>- */</div><div class='add'>+#define INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, inval_adr, inval_len, p_usec) \</div><div class='add'>+	xip_wait_for_operation(map, chip, cmd_adr, p_usec)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define xip_disable(map, chip, adr)</div><div class='ctx'> #define xip_enable(map, chip, adr)</div><div class='ctx'> #define XIP_INVAL_CACHED_RANGE(x...)</div><div class='add'>+#define INVAL_CACHE_AND_WAIT inval_cache_and_wait_for_operation</div><div class='add'>+</div><div class='add'>+static int inval_cache_and_wait_for_operation(</div><div class='add'>+		struct map_info *map, struct flchip *chip,</div><div class='add'>+		unsigned long cmd_adr, unsigned long inval_adr, int inval_len,</div><div class='add'>+		int *chip_op_time )</div><div class='add'>+{</div><div class='add'>+	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='add'>+	map_word status, status_OK = CMD(0x80);</div><div class='add'>+	int z, chip_state = chip-&gt;state;</div><div class='add'>+	unsigned long timeo;</div><div class='add'>+</div><div class='add'>+	spin_unlock(chip-&gt;mutex);</div><div class='add'>+	if (inval_len)</div><div class='add'>+		INVALIDATE_CACHED_RANGE(map, inval_adr, inval_len);</div><div class='add'>+	if (*chip_op_time)</div><div class='add'>+		cfi_udelay(*chip_op_time);</div><div class='add'>+	spin_lock(chip-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	timeo = *chip_op_time * 8 * HZ / 1000000;</div><div class='add'>+	if (timeo &lt; HZ/2)</div><div class='add'>+		timeo = HZ/2;</div><div class='add'>+	timeo += jiffies;</div><div class='add'>+</div><div class='add'>+	z = 0;</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (chip-&gt;state != chip_state) {</div><div class='add'>+			/* Someone's suspended the operation: sleep */</div><div class='add'>+			DECLARE_WAITQUEUE(wait, current);</div><div class='add'>+</div><div class='add'>+			set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+			add_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='add'>+			spin_unlock(chip-&gt;mutex);</div><div class='add'>+			schedule();</div><div class='add'>+			remove_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='add'>+			timeo = jiffies + (HZ / 2); /* FIXME */</div><div class='add'>+			spin_lock(chip-&gt;mutex);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-#define UDELAY(map, chip, adr, usec)  \</div><div class='del'>-do {  \</div><div class='del'>-	spin_unlock(chip-&gt;mutex);  \</div><div class='del'>-	cfi_udelay(usec);  \</div><div class='del'>-	spin_lock(chip-&gt;mutex);  \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \</div><div class='del'>-do {  \</div><div class='del'>-	spin_unlock(chip-&gt;mutex);  \</div><div class='del'>-	INVALIDATE_CACHED_RANGE(map, adr, len);  \</div><div class='del'>-	cfi_udelay(usec);  \</div><div class='del'>-	spin_lock(chip-&gt;mutex);  \</div><div class='del'>-} while (0)</div><div class='add'>+		status = map_read(map, cmd_adr);</div><div class='add'>+		if (map_word_andequal(map, status, status_OK, status_OK))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* OK Still waiting */</div><div class='add'>+		if (time_after(jiffies, timeo)) {</div><div class='add'>+			map_write(map, CMD(0x70), cmd_adr);</div><div class='add'>+			chip-&gt;state = FL_STATUS;</div><div class='add'>+			return -ETIME;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Latency issues. Drop the lock, wait a while and retry */</div><div class='add'>+		z++;</div><div class='add'>+		spin_unlock(chip-&gt;mutex);</div><div class='add'>+		cfi_udelay(1);</div><div class='add'>+		spin_lock(chip-&gt;mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!z) {</div><div class='add'>+		if (!--(*chip_op_time))</div><div class='add'>+			*chip_op_time = 1;</div><div class='add'>+	} else if (z &gt; 1)</div><div class='add'>+		++(*chip_op_time);</div><div class='add'>+</div><div class='add'>+	/* Done and happy. */</div><div class='add'>+ 	chip-&gt;state = FL_STATUS;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define WAIT_TIMEOUT(map, chip, adr, udelay) \</div><div class='add'>+	({ int __udelay = (udelay); \</div><div class='add'>+	   INVAL_CACHE_AND_WAIT(map, chip, adr, 0, 0, &amp;__udelay); })</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long cmd_addr;</div><div class='hunk'>@@ -1252,14 +1300,11 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 				     unsigned long adr, map_word datum, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='del'>-	map_word status, status_OK, write_cmd;</div><div class='del'>-	unsigned long timeo;</div><div class='del'>-	int z, ret=0;</div><div class='add'>+	map_word status, write_cmd;</div><div class='add'>+	int ret=0;</div><div class='ctx'> </div><div class='ctx'> 	adr += chip-&gt;start;</div><div class='ctx'> </div><div class='del'>-	/* Let's determine those according to the interleave only once */</div><div class='del'>-	status_OK = CMD(0x80);</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case FL_WRITING:</div><div class='ctx'> 		write_cmd = (cfi-&gt;cfiq-&gt;P_ID != 0x0200) ? CMD(0x40) : CMD(0x41);</div><div class='hunk'>@@ -1285,57 +1330,17 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 	map_write(map, datum, adr);</div><div class='ctx'> 	chip-&gt;state = mode;</div><div class='ctx'> </div><div class='del'>-	INVALIDATE_CACHE_UDELAY(map, chip, adr,</div><div class='del'>-				adr, map_bankwidth(map),</div><div class='del'>-				chip-&gt;word_write_time);</div><div class='del'>-</div><div class='del'>-	timeo = jiffies + (HZ/2);</div><div class='del'>-	z = 0;</div><div class='del'>-	for (;;) {</div><div class='del'>-		if (chip-&gt;state != mode) {</div><div class='del'>-			/* Someone's suspended the write. Sleep */</div><div class='del'>-			DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-</div><div class='del'>-			set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-			add_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='del'>-			spin_unlock(chip-&gt;mutex);</div><div class='del'>-			schedule();</div><div class='del'>-			remove_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='del'>-			timeo = jiffies + (HZ / 2); /* FIXME */</div><div class='del'>-			spin_lock(chip-&gt;mutex);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = map_read(map, adr);</div><div class='del'>-		if (map_word_andequal(map, status, status_OK, status_OK))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* OK Still waiting */</div><div class='del'>-		if (time_after(jiffies, timeo)) {</div><div class='del'>-			map_write(map, CMD(0x70), adr);</div><div class='del'>-			chip-&gt;state = FL_STATUS;</div><div class='del'>-			xip_enable(map, chip, adr);</div><div class='del'>-			printk(KERN_ERR "%s: word write error (status timeout)\n", map-&gt;name);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Latency issues. Drop the lock, wait a while and retry */</div><div class='del'>-		z++;</div><div class='del'>-		UDELAY(map, chip, adr, 1);</div><div class='del'>-	}</div><div class='del'>-	if (!z) {</div><div class='del'>-		chip-&gt;word_write_time--;</div><div class='del'>-		if (!chip-&gt;word_write_time)</div><div class='del'>-			chip-&gt;word_write_time = 1;</div><div class='add'>+	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,</div><div class='add'>+				   adr, map_bankwidth(map),</div><div class='add'>+				   &amp;chip-&gt;word_write_time);</div><div class='add'>+	if (ret) {</div><div class='add'>+		xip_enable(map, chip, adr);</div><div class='add'>+		printk(KERN_ERR "%s: word write error (status timeout)\n", map-&gt;name);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (z &gt; 1)</div><div class='del'>-		chip-&gt;word_write_time++;</div><div class='del'>-</div><div class='del'>-	/* Done and happy. */</div><div class='del'>-	chip-&gt;state = FL_STATUS;</div><div class='ctx'> </div><div class='ctx'> 	/* check for errors */</div><div class='add'>+	status = map_read(map, adr);</div><div class='ctx'> 	if (map_word_bitsset(map, status, CMD(0x1a))) {</div><div class='ctx'> 		unsigned long chipstatus = MERGESTATUS(status);</div><div class='ctx'> </div><div class='hunk'>@@ -1452,9 +1457,9 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 				    unsigned long *pvec_seek, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='del'>-	map_word status, status_OK, write_cmd, datum;</div><div class='del'>-	unsigned long cmd_adr, timeo;</div><div class='del'>-	int wbufsize, z, ret=0, word_gap, words;</div><div class='add'>+	map_word status, write_cmd, datum;</div><div class='add'>+	unsigned long cmd_adr;</div><div class='add'>+	int ret, wbufsize, word_gap, words;</div><div class='ctx'> 	const struct kvec *vec;</div><div class='ctx'> 	unsigned long vec_seek;</div><div class='ctx'> </div><div class='hunk'>@@ -1463,7 +1468,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 	cmd_adr = adr &amp; ~(wbufsize-1);</div><div class='ctx'> </div><div class='ctx'> 	/* Let's determine this according to the interleave only once */</div><div class='del'>-	status_OK = CMD(0x80);</div><div class='ctx'> 	write_cmd = (cfi-&gt;cfiq-&gt;P_ID != 0x0200) ? CMD(0xe8) : CMD(0xe9);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(chip-&gt;mutex);</div><div class='hunk'>@@ -1477,12 +1481,14 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 	ENABLE_VPP(map);</div><div class='ctx'> 	xip_disable(map, chip, cmd_adr);</div><div class='ctx'> </div><div class='del'>-	/* §4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set</div><div class='add'>+	/* §4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set</div><div class='ctx'> 	   [...], the device will not accept any more Write to Buffer commands".</div><div class='ctx'> 	   So we must check here and reset those bits if they're set. Otherwise</div><div class='ctx'> 	   we're just pissing in the wind */</div><div class='del'>-	if (chip-&gt;state != FL_STATUS)</div><div class='add'>+	if (chip-&gt;state != FL_STATUS) {</div><div class='ctx'> 		map_write(map, CMD(0x70), cmd_adr);</div><div class='add'>+		chip-&gt;state = FL_STATUS;</div><div class='add'>+	}</div><div class='ctx'> 	status = map_read(map, cmd_adr);</div><div class='ctx'> 	if (map_word_bitsset(map, status, CMD(0x30))) {</div><div class='ctx'> 		xip_enable(map, chip, cmd_adr);</div><div class='hunk'>@@ -1493,32 +1499,20 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;state = FL_WRITING_TO_BUFFER;</div><div class='del'>-</div><div class='del'>-	z = 0;</div><div class='del'>-	for (;;) {</div><div class='del'>-		map_write(map, write_cmd, cmd_adr);</div><div class='del'>-</div><div class='add'>+	map_write(map, write_cmd, cmd_adr);</div><div class='add'>+	ret = WAIT_TIMEOUT(map, chip, cmd_adr, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Argh. Not ready for write to buffer */</div><div class='add'>+		map_word Xstatus = map_read(map, cmd_adr);</div><div class='add'>+		map_write(map, CMD(0x70), cmd_adr);</div><div class='add'>+		chip-&gt;state = FL_STATUS;</div><div class='ctx'> 		status = map_read(map, cmd_adr);</div><div class='del'>-		if (map_word_andequal(map, status, status_OK, status_OK))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		UDELAY(map, chip, cmd_adr, 1);</div><div class='del'>-</div><div class='del'>-		if (++z &gt; 20) {</div><div class='del'>-			/* Argh. Not ready for write to buffer */</div><div class='del'>-			map_word Xstatus;</div><div class='del'>-			map_write(map, CMD(0x70), cmd_adr);</div><div class='del'>-			chip-&gt;state = FL_STATUS;</div><div class='del'>-			Xstatus = map_read(map, cmd_adr);</div><div class='del'>-			/* Odd. Clear status bits */</div><div class='del'>-			map_write(map, CMD(0x50), cmd_adr);</div><div class='del'>-			map_write(map, CMD(0x70), cmd_adr);</div><div class='del'>-			xip_enable(map, chip, cmd_adr);</div><div class='del'>-			printk(KERN_ERR "%s: Chip not ready for buffer write. status = %lx, Xstatus = %lx\n",</div><div class='del'>-			       map-&gt;name, status.x[0], Xstatus.x[0]);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		map_write(map, CMD(0x50), cmd_adr);</div><div class='add'>+		map_write(map, CMD(0x70), cmd_adr);</div><div class='add'>+		xip_enable(map, chip, cmd_adr);</div><div class='add'>+		printk(KERN_ERR "%s: Chip not ready for buffer write. Xstatus = %lx, status = %lx\n",</div><div class='add'>+				map-&gt;name, Xstatus.x[0], status.x[0]);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Figure out the number of words to write */</div><div class='hunk'>@@ -1573,56 +1567,19 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 	map_write(map, CMD(0xd0), cmd_adr);</div><div class='ctx'> 	chip-&gt;state = FL_WRITING;</div><div class='ctx'> </div><div class='del'>-	INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr,</div><div class='del'>-				adr, len,</div><div class='del'>-				chip-&gt;buffer_write_time);</div><div class='del'>-</div><div class='del'>-	timeo = jiffies + (HZ/2);</div><div class='del'>-	z = 0;</div><div class='del'>-	for (;;) {</div><div class='del'>-		if (chip-&gt;state != FL_WRITING) {</div><div class='del'>-			/* Someone's suspended the write. Sleep */</div><div class='del'>-			DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-			set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-			add_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='del'>-			spin_unlock(chip-&gt;mutex);</div><div class='del'>-			schedule();</div><div class='del'>-			remove_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='del'>-			timeo = jiffies + (HZ / 2); /* FIXME */</div><div class='del'>-			spin_lock(chip-&gt;mutex);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = map_read(map, cmd_adr);</div><div class='del'>-		if (map_word_andequal(map, status, status_OK, status_OK))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* OK Still waiting */</div><div class='del'>-		if (time_after(jiffies, timeo)) {</div><div class='del'>-			map_write(map, CMD(0x70), cmd_adr);</div><div class='del'>-			chip-&gt;state = FL_STATUS;</div><div class='del'>-			xip_enable(map, chip, cmd_adr);</div><div class='del'>-			printk(KERN_ERR "%s: buffer write error (status timeout)\n", map-&gt;name);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Latency issues. Drop the lock, wait a while and retry */</div><div class='del'>-		z++;</div><div class='del'>-		UDELAY(map, chip, cmd_adr, 1);</div><div class='del'>-	}</div><div class='del'>-	if (!z) {</div><div class='del'>-		chip-&gt;buffer_write_time--;</div><div class='del'>-		if (!chip-&gt;buffer_write_time)</div><div class='del'>-			chip-&gt;buffer_write_time = 1;</div><div class='add'>+	ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,</div><div class='add'>+				   adr, len,</div><div class='add'>+				   &amp;chip-&gt;buffer_write_time);</div><div class='add'>+	if (ret) {</div><div class='add'>+		map_write(map, CMD(0x70), cmd_adr);</div><div class='add'>+		chip-&gt;state = FL_STATUS;</div><div class='add'>+		xip_enable(map, chip, cmd_adr);</div><div class='add'>+		printk(KERN_ERR "%s: buffer write error (status timeout)\n", map-&gt;name);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (z &gt; 1)</div><div class='del'>-		chip-&gt;buffer_write_time++;</div><div class='del'>-</div><div class='del'>-	/* Done and happy. */</div><div class='del'>- 	chip-&gt;state = FL_STATUS;</div><div class='ctx'> </div><div class='ctx'> 	/* check for errors */</div><div class='add'>+	status = map_read(map, cmd_adr);</div><div class='ctx'> 	if (map_word_bitsset(map, status, CMD(0x1a))) {</div><div class='ctx'> 		unsigned long chipstatus = MERGESTATUS(status);</div><div class='ctx'> </div><div class='hunk'>@@ -1693,6 +1650,11 @@ static int cfi_intelext_writev (struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 			if (chipnum == cfi-&gt;numchips)</div><div class='ctx'> 				return 0;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Be nice and reschedule with the chip in a usable state for other</div><div class='add'>+		   processes. */</div><div class='add'>+		cond_resched();</div><div class='add'>+</div><div class='ctx'> 	} while (len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1713,17 +1675,12 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 				      unsigned long adr, int len, void *thunk)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='del'>-	map_word status, status_OK;</div><div class='del'>-	unsigned long timeo;</div><div class='add'>+	map_word status;</div><div class='ctx'> 	int retries = 3;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	adr += chip-&gt;start;</div><div class='ctx'> </div><div class='del'>-	/* Let's determine this according to the interleave only once */</div><div class='del'>-	status_OK = CMD(0x80);</div><div class='del'>-</div><div class='ctx'>  retry:</div><div class='ctx'> 	spin_lock(chip-&gt;mutex);</div><div class='ctx'> 	ret = get_chip(map, chip, adr, FL_ERASING);</div><div class='hunk'>@@ -1745,48 +1702,15 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 	chip-&gt;state = FL_ERASING;</div><div class='ctx'> 	chip-&gt;erase_suspended = 0;</div><div class='ctx'> </div><div class='del'>-	INVALIDATE_CACHE_UDELAY(map, chip, adr,</div><div class='del'>-				adr, len,</div><div class='del'>-				chip-&gt;erase_time*1000/2);</div><div class='del'>-</div><div class='del'>-	/* FIXME. Use a timer to check this, and return immediately. */</div><div class='del'>-	/* Once the state machine's known to be working I'll do that */</div><div class='del'>-</div><div class='del'>-	timeo = jiffies + (HZ*20);</div><div class='del'>-	for (;;) {</div><div class='del'>-		if (chip-&gt;state != FL_ERASING) {</div><div class='del'>-			/* Someone's suspended the erase. Sleep */</div><div class='del'>-			set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-			add_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='del'>-			spin_unlock(chip-&gt;mutex);</div><div class='del'>-			schedule();</div><div class='del'>-			remove_wait_queue(&amp;chip-&gt;wq, &amp;wait);</div><div class='del'>-			spin_lock(chip-&gt;mutex);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (chip-&gt;erase_suspended) {</div><div class='del'>-			/* This erase was suspended and resumed.</div><div class='del'>-			   Adjust the timeout */</div><div class='del'>-			timeo = jiffies + (HZ*20); /* FIXME */</div><div class='del'>-			chip-&gt;erase_suspended = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = map_read(map, adr);</div><div class='del'>-		if (map_word_andequal(map, status, status_OK, status_OK))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* OK Still waiting */</div><div class='del'>-		if (time_after(jiffies, timeo)) {</div><div class='del'>-			map_write(map, CMD(0x70), adr);</div><div class='del'>-			chip-&gt;state = FL_STATUS;</div><div class='del'>-			xip_enable(map, chip, adr);</div><div class='del'>-			printk(KERN_ERR "%s: block erase error: (status timeout)\n", map-&gt;name);</div><div class='del'>-			ret = -EIO;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Latency issues. Drop the lock, wait a while and retry */</div><div class='del'>-		UDELAY(map, chip, adr, 1000000/HZ);</div><div class='add'>+	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,</div><div class='add'>+				   adr, len,</div><div class='add'>+				   &amp;chip-&gt;erase_time);</div><div class='add'>+	if (ret) {</div><div class='add'>+		map_write(map, CMD(0x70), adr);</div><div class='add'>+		chip-&gt;state = FL_STATUS;</div><div class='add'>+		xip_enable(map, chip, adr);</div><div class='add'>+		printk(KERN_ERR "%s: block erase error: (status timeout)\n", map-&gt;name);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We've broken this before. It doesn't hurt to be safe */</div><div class='hunk'>@@ -1815,7 +1739,6 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 		} else if (chipstatus &amp; 0x20 &amp;&amp; retries--) {</div><div class='ctx'> 			printk(KERN_DEBUG "block erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus);</div><div class='del'>-			timeo = jiffies + HZ;</div><div class='ctx'> 			put_chip(map, chip, adr);</div><div class='ctx'> 			spin_unlock(chip-&gt;mutex);</div><div class='ctx'> 			goto retry;</div><div class='hunk'>@@ -1921,15 +1844,11 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='ctx'> 	struct cfi_pri_intelext *extp = cfi-&gt;cmdset_priv;</div><div class='del'>-	map_word status, status_OK;</div><div class='del'>-	unsigned long timeo = jiffies + HZ;</div><div class='add'>+	int udelay;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	adr += chip-&gt;start;</div><div class='ctx'> </div><div class='del'>-	/* Let's determine this according to the interleave only once */</div><div class='del'>-	status_OK = CMD(0x80);</div><div class='del'>-</div><div class='ctx'> 	spin_lock(chip-&gt;mutex);</div><div class='ctx'> 	ret = get_chip(map, chip, adr, FL_LOCKING);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1954,41 +1873,21 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip</div><div class='ctx'> 	 * If Instant Individual Block Locking supported then no need</div><div class='ctx'> 	 * to delay.</div><div class='ctx'> 	 */</div><div class='add'>+	udelay = (!extp || !(extp-&gt;FeatureSupport &amp; (1 &lt;&lt; 5))) ? 1000000/HZ : 0;</div><div class='ctx'> </div><div class='del'>-	if (!extp || !(extp-&gt;FeatureSupport &amp; (1 &lt;&lt; 5)))</div><div class='del'>-		UDELAY(map, chip, adr, 1000000/HZ);</div><div class='del'>-</div><div class='del'>-	/* FIXME. Use a timer to check this, and return immediately. */</div><div class='del'>-	/* Once the state machine's known to be working I'll do that */</div><div class='del'>-</div><div class='del'>-	timeo = jiffies + (HZ*20);</div><div class='del'>-	for (;;) {</div><div class='del'>-</div><div class='del'>-		status = map_read(map, adr);</div><div class='del'>-		if (map_word_andequal(map, status, status_OK, status_OK))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* OK Still waiting */</div><div class='del'>-		if (time_after(jiffies, timeo)) {</div><div class='del'>-			map_write(map, CMD(0x70), adr);</div><div class='del'>-			chip-&gt;state = FL_STATUS;</div><div class='del'>-			xip_enable(map, chip, adr);</div><div class='del'>-			printk(KERN_ERR "%s: block unlock error: (status timeout)\n", map-&gt;name);</div><div class='del'>-			put_chip(map, chip, adr);</div><div class='del'>-			spin_unlock(chip-&gt;mutex);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Latency issues. Drop the lock, wait a while and retry */</div><div class='del'>-		UDELAY(map, chip, adr, 1);</div><div class='add'>+	ret = WAIT_TIMEOUT(map, chip, adr, udelay);</div><div class='add'>+	if (ret) {</div><div class='add'>+		map_write(map, CMD(0x70), adr);</div><div class='add'>+		chip-&gt;state = FL_STATUS;</div><div class='add'>+		xip_enable(map, chip, adr);</div><div class='add'>+		printk(KERN_ERR "%s: block unlock error: (status timeout)\n", map-&gt;name);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Done and happy. */</div><div class='del'>-	chip-&gt;state = FL_STATUS;</div><div class='ctx'> 	xip_enable(map, chip, adr);</div><div class='del'>-	put_chip(map, chip, adr);</div><div class='add'>+out:	put_chip(map, chip, adr);</div><div class='ctx'> 	spin_unlock(chip-&gt;mutex);</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len)</div><div class='hunk'>@@ -2445,28 +2344,8 @@ static void cfi_intelext_destroy(struct mtd_info *mtd)</div><div class='ctx'> 	kfree(mtd-&gt;eraseregions);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char im_name_0001[] = "cfi_cmdset_0001";</div><div class='del'>-static char im_name_0003[] = "cfi_cmdset_0003";</div><div class='del'>-static char im_name_0200[] = "cfi_cmdset_0200";</div><div class='del'>-</div><div class='del'>-static int __init cfi_intelext_init(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_register(im_name_0001, THIS_MODULE, &amp;cfi_cmdset_0001);</div><div class='del'>-	inter_module_register(im_name_0003, THIS_MODULE, &amp;cfi_cmdset_0001);</div><div class='del'>-	inter_module_register(im_name_0200, THIS_MODULE, &amp;cfi_cmdset_0001);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cfi_intelext_exit(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_unregister(im_name_0001);</div><div class='del'>-	inter_module_unregister(im_name_0003);</div><div class='del'>-	inter_module_unregister(im_name_0200);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cfi_intelext_init);</div><div class='del'>-module_exit(cfi_intelext_exit);</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("David Woodhouse &lt;dwmw2@infradead.org&gt; et al.");</div><div class='ctx'> MODULE_DESCRIPTION("MTD chip driver for Intel/Sharp flash chips");</div><div class='add'>+MODULE_ALIAS("cfi_cmdset_0003");</div><div class='add'>+MODULE_ALIAS("cfi_cmdset_0200");</div><div class='head'>diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c<br/>index aed10bd5c3c3..9885726a16e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0002.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_cmdset_0002.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0002.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/cfi_cmdset_0002.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -236,6 +235,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)</div><div class='ctx'> 	mtd-&gt;resume  = cfi_amdstd_resume;</div><div class='ctx'> 	mtd-&gt;flags   = MTD_CAP_NORFLASH;</div><div class='ctx'> 	mtd-&gt;name    = map-&gt;name;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (cfi-&gt;cfi_mode==CFI_MODE_CFI){</div><div class='ctx'> 		unsigned char bootloc;</div><div class='hunk'>@@ -326,7 +326,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)</div><div class='ctx'> </div><div class='ctx'> 	return cfi_amdstd_setup(mtd);</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL_GPL(cfi_cmdset_0002);</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='hunk'>@@ -1758,25 +1758,6 @@ static void cfi_amdstd_destroy(struct mtd_info *mtd)</div><div class='ctx'> 	kfree(mtd-&gt;eraseregions);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char im_name[]="cfi_cmdset_0002";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init cfi_amdstd_init(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_register(im_name, THIS_MODULE, &amp;cfi_cmdset_0002);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit cfi_amdstd_exit(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_unregister(im_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(cfi_amdstd_init);</div><div class='del'>-module_exit(cfi_amdstd_exit);</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Crossnet Co. &lt;info@crossnet.co.jp&gt; et al.");</div><div class='ctx'> MODULE_DESCRIPTION("MTD chip driver for AMD/Fujitsu flash chips");</div><div class='head'>diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c<br/>index 0807c1c91e55..fae70a5db540 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0020.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_cmdset_0020.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_cmdset_0020.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/cfi_cmdset_0020.c</a></div><div class='hunk'>@@ -162,6 +162,7 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)</div><div class='ctx'> </div><div class='ctx'> 	return cfi_staa_setup(map);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cfi_cmdset_0020);</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *cfi_staa_setup(struct map_info *map)</div><div class='ctx'> {</div><div class='hunk'>@@ -237,9 +238,8 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)</div><div class='ctx'> 	mtd-&gt;unlock = cfi_staa_unlock;</div><div class='ctx'> 	mtd-&gt;suspend = cfi_staa_suspend;</div><div class='ctx'> 	mtd-&gt;resume = cfi_staa_resume;</div><div class='del'>-	mtd-&gt;flags = MTD_CAP_NORFLASH;</div><div class='del'>-	mtd-&gt;flags |= MTD_ECC; /* FIXME: Not all STMicro flashes have this */</div><div class='del'>-	mtd-&gt;eccsize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */</div><div class='add'>+	mtd-&gt;flags = MTD_CAP_NORFLASH &amp; ~MTD_BIT_WRITEABLE;</div><div class='add'>+	mtd-&gt;writesize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */</div><div class='ctx'> 	map-&gt;fldrv = &amp;cfi_staa_chipdrv;</div><div class='ctx'> 	__module_get(THIS_MODULE);</div><div class='ctx'> 	mtd-&gt;name = map-&gt;name;</div><div class='hunk'>@@ -1410,20 +1410,4 @@ static void cfi_staa_destroy(struct mtd_info *mtd)</div><div class='ctx'> 	kfree(cfi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char im_name[]="cfi_cmdset_0020";</div><div class='del'>-</div><div class='del'>-static int __init cfi_staa_init(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_register(im_name, THIS_MODULE, &amp;cfi_cmdset_0020);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cfi_staa_exit(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_unregister(im_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cfi_staa_init);</div><div class='del'>-module_exit(cfi_staa_exit);</div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c<br/>index e636aa86bc24..60e11a0ada97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/cfi_probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/cfi_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/cfi_probe.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>    $Id: cfi_probe.c,v 1.86 2005/11/29 14:48:31 gleixner Exp $</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -349,12 +348,12 @@ static void print_cfi_ident(struct cfi_ident *cfip)</div><div class='ctx'> 	else</div><div class='ctx'> 		printk("No Vpp line\n");</div><div class='ctx'> </div><div class='del'>-	printk("Typical byte/word write timeout: %d µs\n", 1&lt;&lt;cfip-&gt;WordWriteTimeoutTyp);</div><div class='del'>-	printk("Maximum byte/word write timeout: %d µs\n", (1&lt;&lt;cfip-&gt;WordWriteTimeoutMax) * (1&lt;&lt;cfip-&gt;WordWriteTimeoutTyp));</div><div class='add'>+	printk("Typical byte/word write timeout: %d µs\n", 1&lt;&lt;cfip-&gt;WordWriteTimeoutTyp);</div><div class='add'>+	printk("Maximum byte/word write timeout: %d µs\n", (1&lt;&lt;cfip-&gt;WordWriteTimeoutMax) * (1&lt;&lt;cfip-&gt;WordWriteTimeoutTyp));</div><div class='ctx'> </div><div class='ctx'> 	if (cfip-&gt;BufWriteTimeoutTyp || cfip-&gt;BufWriteTimeoutMax) {</div><div class='del'>-		printk("Typical full buffer write timeout: %d µs\n", 1&lt;&lt;cfip-&gt;BufWriteTimeoutTyp);</div><div class='del'>-		printk("Maximum full buffer write timeout: %d µs\n", (1&lt;&lt;cfip-&gt;BufWriteTimeoutMax) * (1&lt;&lt;cfip-&gt;BufWriteTimeoutTyp));</div><div class='add'>+		printk("Typical full buffer write timeout: %d µs\n", 1&lt;&lt;cfip-&gt;BufWriteTimeoutTyp);</div><div class='add'>+		printk("Maximum full buffer write timeout: %d µs\n", (1&lt;&lt;cfip-&gt;BufWriteTimeoutMax) * (1&lt;&lt;cfip-&gt;BufWriteTimeoutTyp));</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='ctx'> 		printk("Full buffer write not supported\n");</div><div class='head'>diff --git a/drivers/mtd/chips/chipreg.c b/drivers/mtd/chips/chipreg.c<br/>index c2127840a183..2174c97549f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/chipreg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/chipreg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/chipreg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/chipreg.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c<br/>index 41bd59d20d85..cdb0f590b40c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/gen_probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/gen_probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/gen_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/gen_probe.c</a></div><div class='hunk'>@@ -37,8 +37,15 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)</div><div class='ctx'> 	if (!mtd)</div><div class='ctx'> 		mtd = check_cmd_set(map, 0); /* Then the secondary */</div><div class='ctx'> </div><div class='del'>-	if (mtd)</div><div class='add'>+	if (mtd) {</div><div class='add'>+		if (mtd-&gt;size &gt; map-&gt;size) {</div><div class='add'>+			printk(KERN_WARNING "Reducing visibility of %ldKiB chip to %ldKiB\n",</div><div class='add'>+			       (unsigned long)mtd-&gt;size &gt;&gt; 10, </div><div class='add'>+			       (unsigned long)map-&gt;size &gt;&gt; 10);</div><div class='add'>+			mtd-&gt;size = map-&gt;size;</div><div class='add'>+		}</div><div class='ctx'> 		return mtd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_WARNING"gen_probe: No supported Vendor Command Set found\n");</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +107,12 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi</div><div class='ctx'> 	 * Align bitmap storage size to full byte.</div><div class='ctx'> 	 */</div><div class='ctx'> 	max_chips = map-&gt;size &gt;&gt; cfi.chipshift;</div><div class='del'>-	mapsize = (max_chips / 8) + ((max_chips % 8) ? 1 : 0);</div><div class='add'>+	if (!max_chips) {</div><div class='add'>+		printk(KERN_WARNING "NOR chip too large to fit in mapping. Attempting to cope...\n");</div><div class='add'>+		max_chips = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mapsize = (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG;</div><div class='ctx'> 	chip_map = kmalloc(mapsize, GFP_KERNEL);</div><div class='ctx'> 	if (!chip_map) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map-&gt;name);</div><div class='hunk'>@@ -194,25 +206,28 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,</div><div class='ctx'> {</div><div class='ctx'> 	struct cfi_private *cfi = map-&gt;fldrv_priv;</div><div class='ctx'> 	__u16 type = primary?cfi-&gt;cfiq-&gt;P_ID:cfi-&gt;cfiq-&gt;A_ID;</div><div class='del'>-#if defined(CONFIG_MODULES) &amp;&amp; defined(HAVE_INTER_MODULE)</div><div class='del'>-	char probename[32];</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+	char probename[16+sizeof(MODULE_SYMBOL_PREFIX)];</div><div class='ctx'> 	cfi_cmdset_fn_t *probe_function;</div><div class='ctx'> </div><div class='del'>-	sprintf(probename, "cfi_cmdset_%4.4X", type);</div><div class='add'>+	sprintf(probename, MODULE_SYMBOL_PREFIX "cfi_cmdset_%4.4X", type);</div><div class='ctx'> </div><div class='del'>-	probe_function = inter_module_get_request(probename, probename);</div><div class='add'>+	probe_function = __symbol_get(probename);</div><div class='add'>+	if (!probe_function) {</div><div class='add'>+		request_module(probename + sizeof(MODULE_SYMBOL_PREFIX) - 1);</div><div class='add'>+		probe_function = __symbol_get(probename);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (probe_function) {</div><div class='ctx'> 		struct mtd_info *mtd;</div><div class='ctx'> </div><div class='ctx'> 		mtd = (*probe_function)(map, primary);</div><div class='ctx'> 		/* If it was happy, it'll have increased its own use count */</div><div class='del'>-		inter_module_put(probename);</div><div class='add'>+		symbol_put_addr(probe_function);</div><div class='ctx'> 		return mtd;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	printk(KERN_NOTICE "Support for command set %04X not present\n",</div><div class='del'>-	       type);</div><div class='add'>+	printk(KERN_NOTICE "Support for command set %04X not present\n", type);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -226,12 +241,8 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch(type){</div><div class='del'>-		/* Urgh. Ifdefs. The version with weak symbols was</div><div class='del'>-		 * _much_ nicer. Shame it didn't seem to work on</div><div class='del'>-		 * anything but x86, really.</div><div class='del'>-		 * But we can't rely in inter_module_get() because</div><div class='del'>-		 * that'd mean we depend on link order.</div><div class='del'>-		 */</div><div class='add'>+		/* We need these for the !CONFIG_MODULES case,</div><div class='add'>+		   because symbol_get() doesn't work there */</div><div class='ctx'> #ifdef CONFIG_MTD_CFI_INTELEXT</div><div class='ctx'> 	case 0x0001:</div><div class='ctx'> 	case 0x0003:</div><div class='hunk'>@@ -246,9 +257,9 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)</div><div class='ctx'>         case 0x0020:</div><div class='ctx'> 		return cfi_cmdset_0020(map, primary);</div><div class='ctx'> #endif</div><div class='add'>+	default:</div><div class='add'>+		return cfi_cmdset_unknown(map, primary);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return cfi_cmdset_unknown(map, primary);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c<br/>index c40b48dabed3..2c3f019197c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/jedec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/jedec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/jedec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/jedec.c</a></div><div class='hunk'>@@ -256,6 +256,7 @@ static struct mtd_info *jedec_probe(struct map_info *map)</div><div class='ctx'>    MTD-&gt;name = map-&gt;name;</div><div class='ctx'>    MTD-&gt;type = MTD_NORFLASH;</div><div class='ctx'>    MTD-&gt;flags = MTD_CAP_NORFLASH;</div><div class='add'>+   MTD-&gt;writesize = 1;</div><div class='ctx'>    MTD-&gt;erasesize = SectorSize*(map-&gt;buswidth);</div><div class='ctx'>    //   printk("MTD-&gt;erasesize is %x\n",(unsigned int)MTD-&gt;erasesize);</div><div class='ctx'>    MTD-&gt;size = priv-&gt;size;</div><div class='head'>diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c<br/>index 517ea33e7260..8f39d0a31438 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/jedec_probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/jedec_probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/jedec_probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/jedec_probe.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>    Occasionally maintained by Thayne Harbaugh tharbaugh at lnxi dot com</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c<br/>index a611de9b1515..ac01a949b687 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/map_absent.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/map_absent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/map_absent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/map_absent.c</a></div><div class='hunk'>@@ -64,7 +64,8 @@ static struct mtd_info *map_absent_probe(struct map_info *map)</div><div class='ctx'> 	mtd-&gt;write 	= map_absent_write;</div><div class='ctx'> 	mtd-&gt;sync 	= map_absent_sync;</div><div class='ctx'> 	mtd-&gt;flags 	= 0;</div><div class='del'>-	mtd-&gt;erasesize = PAGE_SIZE;</div><div class='add'>+	mtd-&gt;erasesize  = PAGE_SIZE;</div><div class='add'>+	mtd-&gt;writesize  = 1;</div><div class='ctx'> </div><div class='ctx'> 	__module_get(THIS_MODULE);</div><div class='ctx'> 	return mtd;</div><div class='head'>diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c<br/>index bd2e876a814b..3a66680abfd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/map_ram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/map_ram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/map_ram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/map_ram.c</a></div><div class='hunk'>@@ -70,7 +70,8 @@ static struct mtd_info *map_ram_probe(struct map_info *map)</div><div class='ctx'> 	mtd-&gt;read = mapram_read;</div><div class='ctx'> 	mtd-&gt;write = mapram_write;</div><div class='ctx'> 	mtd-&gt;sync = mapram_nop;</div><div class='del'>-	mtd-&gt;flags = MTD_CAP_RAM | MTD_VOLATILE;</div><div class='add'>+	mtd-&gt;flags = MTD_CAP_RAM;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;erasesize = PAGE_SIZE;</div><div class='ctx'>  	while(mtd-&gt;size &amp; (mtd-&gt;erasesize - 1))</div><div class='head'>diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c<br/>index 624c12c232c8..1b328b1378fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/map_rom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/map_rom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/map_rom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/map_rom.c</a></div><div class='hunk'>@@ -46,9 +46,8 @@ static struct mtd_info *map_rom_probe(struct map_info *map)</div><div class='ctx'> 	mtd-&gt;write = maprom_write;</div><div class='ctx'> 	mtd-&gt;sync = maprom_nop;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_ROM;</div><div class='del'>-	mtd-&gt;erasesize = 131072;</div><div class='del'>- 	while(mtd-&gt;size &amp; (mtd-&gt;erasesize - 1))</div><div class='del'>-		mtd-&gt;erasesize &gt;&gt;= 1;</div><div class='add'>+	mtd-&gt;erasesize = map-&gt;size;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	__module_get(THIS_MODULE);</div><div class='ctx'> 	return mtd;</div><div class='head'>diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c<br/>index 3cc0b23c5865..967abbecdff9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/chips/sharp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/chips/sharp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/chips/sharp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/chips/sharp.c</a></div><div class='hunk'>@@ -140,6 +140,7 @@ static struct mtd_info *sharp_probe(struct map_info *map)</div><div class='ctx'> 	mtd-&gt;suspend = sharp_suspend;</div><div class='ctx'> 	mtd-&gt;resume = sharp_resume;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_NORFLASH;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> 	mtd-&gt;name = map-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	memset(sharp, 0, sizeof(*sharp));</div><div class='head'>diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig<br/>index 7fac438b5c32..16c02b5ccf7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/Kconfig</a></div><div class='hunk'>@@ -47,6 +47,11 @@ config MTD_MS02NV</div><div class='ctx'> 	  accelerator.  Say Y here if you have a DECstation 5000/2x0 or a</div><div class='ctx'> 	  DECsystem 5900 equipped with such a module.</div><div class='ctx'> </div><div class='add'>+	  If you want to compile this driver as a module ( = code which can be</div><div class='add'>+	  inserted in and removed from the running kernel whenever you want),</div><div class='add'>+	  say M here and read &lt;file:Documentation/modules.txt&gt;.  The module will</div><div class='add'>+	  be called ms02-nv.o.</div><div class='add'>+</div><div class='ctx'> config MTD_DATAFLASH</div><div class='ctx'> 	tristate "Support for AT45xxx DataFlash"</div><div class='ctx'> 	depends on MTD &amp;&amp; SPI_MASTER &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -209,7 +214,6 @@ config MTD_DOC2001PLUS</div><div class='ctx'> config MTD_DOCPROBE</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select MTD_DOCECC</div><div class='del'>-	select OBSOLETE_INTERMODULE</div><div class='ctx'> </div><div class='ctx'> config MTD_DOCECC</div><div class='ctx'> 	tristate</div><div class='head'>diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile<br/>index b6573670316f..0f788d5c4bf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/Makefile</a></div><div class='hunk'>@@ -3,13 +3,6 @@</div><div class='ctx'> #</div><div class='ctx'> # $Id: Makefile.common,v 1.7 2004/12/22 17:51:15 joern Exp $</div><div class='ctx'> </div><div class='del'>-#                       *** BIG UGLY NOTE ***</div><div class='del'>-#</div><div class='del'>-# The removal of get_module_symbol() and replacement with</div><div class='del'>-# inter_module_register() et al has introduced a link order dependency</div><div class='del'>-# here where previously there was none.  We now have to ensure that</div><div class='del'>-# doc200[01].o are linked before docprobe.o</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_MTD_DOC2000)	+= doc2000.o</div><div class='ctx'> obj-$(CONFIG_MTD_DOC2001)	+= doc2001.o</div><div class='ctx'> obj-$(CONFIG_MTD_DOC2001PLUS)	+= doc2001plus.o</div><div class='head'>diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c<br/>index 4160b8334c53..ede3561be870 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/block2mtd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/block2mtd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/block2mtd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/block2mtd.c</a></div><div class='hunk'>@@ -4,11 +4,10 @@</div><div class='ctx'>  * block2mtd.c - create an mtd from a block device</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001,2002	Simon Evans &lt;spse@secret.org.uk&gt;</div><div class='del'>- * Copyright (C) 2004,2005	Jörn Engel &lt;joern@wh.fh-wedel.de&gt;</div><div class='add'>+ * Copyright (C) 2004-2006	Jörn Engel &lt;joern@wh.fh-wedel.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Licence: GPL</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -324,6 +323,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mtd.size = dev-&gt;blkdev-&gt;bd_inode-&gt;i_size &amp; PAGE_MASK;</div><div class='ctx'> 	dev-&gt;mtd.erasesize = erase_size;</div><div class='add'>+	dev-&gt;mtd.writesize = 1;</div><div class='ctx'> 	dev-&gt;mtd.type = MTD_RAM;</div><div class='ctx'> 	dev-&gt;mtd.flags = MTD_CAP_RAM;</div><div class='ctx'> 	dev-&gt;mtd.erase = block2mtd_erase;</div><div class='hunk'>@@ -331,7 +331,6 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)</div><div class='ctx'> 	dev-&gt;mtd.writev = default_mtd_writev;</div><div class='ctx'> 	dev-&gt;mtd.sync = block2mtd_sync;</div><div class='ctx'> 	dev-&gt;mtd.read = block2mtd_read;</div><div class='del'>-	dev-&gt;mtd.readv = default_mtd_readv;</div><div class='ctx'> 	dev-&gt;mtd.priv = dev;</div><div class='ctx'> 	dev-&gt;mtd.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='hunk'>@@ -351,6 +350,12 @@ devinit_err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* This function works similar to reguler strtoul.  In addition, it</div><div class='add'>+ * allows some suffixes for a more human-readable number format:</div><div class='add'>+ * ki, Ki, kiB, KiB	- multiply result with 1024</div><div class='add'>+ * Mi, MiB		- multiply result with 1024^2</div><div class='add'>+ * Gi, GiB		- multiply result with 1024^3</div><div class='add'>+ */</div><div class='ctx'> static int ustrtoul(const char *cp, char **endp, unsigned int base)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long result = simple_strtoul(cp, endp, base);</div><div class='hunk'>@@ -359,11 +364,16 @@ static int ustrtoul(const char *cp, char **endp, unsigned int base)</div><div class='ctx'> 		result *= 1024;</div><div class='ctx'> 	case 'M':</div><div class='ctx'> 		result *= 1024;</div><div class='add'>+	case 'K':</div><div class='ctx'> 	case 'k':</div><div class='ctx'> 		result *= 1024;</div><div class='ctx'> 	/* By dwmw2 editorial decree, "ki", "Mi" or "Gi" are to be used. */</div><div class='del'>-		if ((*endp)[1] == 'i')</div><div class='del'>-			(*endp) += 2;</div><div class='add'>+		if ((*endp)[1] == 'i') {</div><div class='add'>+			if ((*endp)[2] == 'B')</div><div class='add'>+				(*endp) += 3;</div><div class='add'>+			else</div><div class='add'>+				(*endp) += 2;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -418,7 +428,8 @@ static inline void kill_final_newline(char *str)</div><div class='ctx'> </div><div class='ctx'> static int block2mtd_setup(const char *val, struct kernel_param *kp)</div><div class='ctx'> {</div><div class='del'>-	char buf[80+12], *str=buf; /* 80 for device, 12 for erase size */</div><div class='add'>+	char buf[80+12]; /* 80 for device, 12 for erase size */</div><div class='add'>+	char *str = buf;</div><div class='ctx'> 	char *token[2];</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	size_t erase_size = PAGE_SIZE;</div><div class='hunk'>@@ -430,7 +441,7 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)</div><div class='ctx'> 	strcpy(str, val);</div><div class='ctx'> 	kill_final_newline(str);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;2; i++)</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='ctx'> 		token[i] = strsep(&amp;str, ",");</div><div class='ctx'> </div><div class='ctx'> 	if (str)</div><div class='hunk'>@@ -449,8 +460,10 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)</div><div class='ctx'> </div><div class='ctx'> 	if (token[1]) {</div><div class='ctx'> 		ret = parse_num(&amp;erase_size, token[1]);</div><div class='del'>-		if (ret)</div><div class='add'>+		if (ret) {</div><div class='add'>+			kfree(name);</div><div class='ctx'> 			parse_err("illegal erase size");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	add_device(name, erase_size);</div><div class='head'>diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c<br/>index 23e7a5c7d2c1..603a7951ac9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/doc2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/doc2000.c</a></div><div class='hunk'>@@ -55,17 +55,10 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		    size_t *retlen, u_char *buf);</div><div class='ctx'> static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		     size_t *retlen, const u_char *buf);</div><div class='del'>-static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-			  unsigned long count, loff_t to, size_t *retlen,</div><div class='del'>-			  u_char *eccbuf, struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf);</div><div class='del'>-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf);</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			struct mtd_oob_ops *ops);</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops);</div><div class='ctx'> static int doc_write_oob_nolock(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 			 size_t *retlen, const u_char *buf);</div><div class='ctx'> static int doc_erase (struct mtd_info *mtd, struct erase_info *instr);</div><div class='hunk'>@@ -517,16 +510,9 @@ static int DoC2k_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char im_name[] = "DoC2k_init";</div><div class='del'>-</div><div class='del'>-/* This routine is made available to other mtd code via</div><div class='del'>- * inter_module_register.  It must only be accessed through</div><div class='del'>- * inter_module_get which will bump the use count of this module.  The</div><div class='del'>- * addresses passed back in mtd are valid as long as the use count of</div><div class='del'>- * this module is non-zero, i.e. between inter_module_get and</div><div class='del'>- * inter_module_put.  Keith Owens &lt;kaos@ocs.com.au&gt; 29 Oct 2000.</div><div class='del'>- */</div><div class='del'>-static void DoC2k_init(struct mtd_info *mtd)</div><div class='add'>+/* This routine is found from the docprobe code by symbol_get(),</div><div class='add'>+ * which will bump the use count of this module. */</div><div class='add'>+void DoC2k_init(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct DiskOnChip *old = NULL;</div><div class='hunk'>@@ -586,7 +572,7 @@ static void DoC2k_init(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;ecctype = MTD_ECC_RS_DiskOnChip;</div><div class='ctx'> 	mtd-&gt;size = 0;</div><div class='ctx'> 	mtd-&gt;erasesize = 0;</div><div class='del'>-	mtd-&gt;oobblock = 512;</div><div class='add'>+	mtd-&gt;writesize = 512;</div><div class='ctx'> 	mtd-&gt;oobsize = 16;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;erase = doc_erase;</div><div class='hunk'>@@ -594,9 +580,6 @@ static void DoC2k_init(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='ctx'> 	mtd-&gt;write = doc_write;</div><div class='del'>-	mtd-&gt;read_ecc = doc_read_ecc;</div><div class='del'>-	mtd-&gt;write_ecc = doc_write_ecc;</div><div class='del'>-	mtd-&gt;writev_ecc = doc_writev_ecc;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = doc_write_oob;</div><div class='ctx'> 	mtd-&gt;sync = NULL;</div><div class='hunk'>@@ -623,21 +606,15 @@ static void DoC2k_init(struct mtd_info *mtd)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(DoC2k_init);</div><div class='ctx'> </div><div class='ctx'> static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		    size_t * retlen, u_char * buf)</div><div class='ctx'> {</div><div class='del'>-	/* Just a special case of doc_read_ecc */</div><div class='del'>-	return doc_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			size_t * retlen, u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem *docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip;</div><div class='del'>-	unsigned char syndrome[6];</div><div class='add'>+	unsigned char syndrome[6], eccbuf[6];</div><div class='ctx'> 	volatile char dummy;</div><div class='ctx'> 	int i, len256 = 0, ret=0;</div><div class='ctx'> 	size_t left = len;</div><div class='hunk'>@@ -685,15 +662,9 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		DoC_Address(this, ADDR_COLUMN_PAGE, from, CDSN_CTRL_WP,</div><div class='ctx'> 			    CDSN_CTRL_ECC_IO);</div><div class='ctx'> </div><div class='del'>-		if (eccbuf) {</div><div class='del'>-			/* Prime the ECC engine */</div><div class='del'>-			WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-			WriteDOC(DOC_ECC_EN, docptr, ECCConf);</div><div class='del'>-		} else {</div><div class='del'>-			/* disable the ECC engine */</div><div class='del'>-			WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-			WriteDOC(DOC_ECC_DIS, docptr, ECCConf);</div><div class='del'>-		}</div><div class='add'>+		/* Prime the ECC engine */</div><div class='add'>+		WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='add'>+		WriteDOC(DOC_ECC_EN, docptr, ECCConf);</div><div class='ctx'> </div><div class='ctx'> 		/* treat crossing 256-byte sector for 2M x 8bits devices */</div><div class='ctx'> 		if (this-&gt;page256 &amp;&amp; from + len &gt; (from | 0xff) + 1) {</div><div class='hunk'>@@ -710,58 +681,59 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		/* Let the caller know we completed it */</div><div class='ctx'> 		*retlen += len;</div><div class='ctx'> </div><div class='del'>-		if (eccbuf) {</div><div class='del'>-			/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='del'>-			/* Note: this will work even with 2M x 8bit devices as   */</div><div class='del'>-			/*       they have 8 bytes of OOB per 256 page. mf.      */</div><div class='del'>-			DoC_ReadBuf(this, eccbuf, 6);</div><div class='del'>-</div><div class='del'>-			/* Flush the pipeline */</div><div class='del'>-			if (DoC_is_Millennium(this)) {</div><div class='del'>-				dummy = ReadDOC(docptr, ECCConf);</div><div class='del'>-				dummy = ReadDOC(docptr, ECCConf);</div><div class='del'>-				i = ReadDOC(docptr, ECCConf);</div><div class='del'>-			} else {</div><div class='del'>-				dummy = ReadDOC(docptr, 2k_ECCStatus);</div><div class='del'>-				dummy = ReadDOC(docptr, 2k_ECCStatus);</div><div class='del'>-				i = ReadDOC(docptr, 2k_ECCStatus);</div><div class='del'>-			}</div><div class='add'>+		/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='add'>+		/* Note: this will work even with 2M x 8bit devices as   */</div><div class='add'>+		/*       they have 8 bytes of OOB per 256 page. mf.      */</div><div class='add'>+		DoC_ReadBuf(this, eccbuf, 6);</div><div class='add'>+</div><div class='add'>+		/* Flush the pipeline */</div><div class='add'>+		if (DoC_is_Millennium(this)) {</div><div class='add'>+			dummy = ReadDOC(docptr, ECCConf);</div><div class='add'>+			dummy = ReadDOC(docptr, ECCConf);</div><div class='add'>+			i = ReadDOC(docptr, ECCConf);</div><div class='add'>+		} else {</div><div class='add'>+			dummy = ReadDOC(docptr, 2k_ECCStatus);</div><div class='add'>+			dummy = ReadDOC(docptr, 2k_ECCStatus);</div><div class='add'>+			i = ReadDOC(docptr, 2k_ECCStatus);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* Check the ECC Status */</div><div class='del'>-			if (i &amp; 0x80) {</div><div class='del'>-				int nb_errors;</div><div class='del'>-				/* There was an ECC error */</div><div class='add'>+		/* Check the ECC Status */</div><div class='add'>+		if (i &amp; 0x80) {</div><div class='add'>+			int nb_errors;</div><div class='add'>+			/* There was an ECC error */</div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='del'>-				printk(KERN_ERR "DiskOnChip ECC Error: Read at %lx\n", (long)from);</div><div class='add'>+			printk(KERN_ERR "DiskOnChip ECC Error: Read at %lx\n", (long)from);</div><div class='ctx'> #endif</div><div class='del'>-				/* Read the ECC syndrom through the DiskOnChip ECC logic.</div><div class='del'>-				   These syndrome will be all ZERO when there is no error */</div><div class='del'>-				for (i = 0; i &lt; 6; i++) {</div><div class='del'>-					syndrome[i] =</div><div class='del'>-					    ReadDOC(docptr, ECCSyndrome0 + i);</div><div class='del'>-				}</div><div class='del'>-	                        nb_errors = doc_decode_ecc(buf, syndrome);</div><div class='add'>+			/* Read the ECC syndrom through the DiskOnChip ECC</div><div class='add'>+			   logic.  These syndrome will be all ZERO when there</div><div class='add'>+			   is no error */</div><div class='add'>+			for (i = 0; i &lt; 6; i++) {</div><div class='add'>+				syndrome[i] =</div><div class='add'>+					ReadDOC(docptr, ECCSyndrome0 + i);</div><div class='add'>+			}</div><div class='add'>+			nb_errors = doc_decode_ecc(buf, syndrome);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='del'>-				printk(KERN_ERR "Errors corrected: %x\n", nb_errors);</div><div class='add'>+			printk(KERN_ERR "Errors corrected: %x\n", nb_errors);</div><div class='ctx'> #endif</div><div class='del'>-	                        if (nb_errors &lt; 0) {</div><div class='del'>-					/* We return error, but have actually done the read. Not that</div><div class='del'>-					   this can be told to user-space, via sys_read(), but at least</div><div class='del'>-					   MTD-aware stuff can know about it by checking *retlen */</div><div class='del'>-					ret = -EIO;</div><div class='del'>-	                        }</div><div class='add'>+			if (nb_errors &lt; 0) {</div><div class='add'>+				/* We return error, but have actually done the</div><div class='add'>+				   read. Not that this can be told to</div><div class='add'>+				   user-space, via sys_read(), but at least</div><div class='add'>+				   MTD-aware stuff can know about it by</div><div class='add'>+				   checking *retlen */</div><div class='add'>+				ret = -EIO;</div><div class='ctx'> 			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-			printk(KERN_DEBUG "ECC DATA at %lxB: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-				     (long)from, eccbuf[0], eccbuf[1], eccbuf[2],</div><div class='del'>-				     eccbuf[3], eccbuf[4], eccbuf[5]);</div><div class='add'>+		printk(KERN_DEBUG "ECC DATA at %lxB: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+		       (long)from, eccbuf[0], eccbuf[1], eccbuf[2],</div><div class='add'>+		       eccbuf[3], eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-			/* disable the ECC engine */</div><div class='del'>-			WriteDOC(DOC_ECC_DIS, docptr , ECCConf);</div><div class='del'>-		}</div><div class='add'>+		/* disable the ECC engine */</div><div class='add'>+		WriteDOC(DOC_ECC_DIS, docptr , ECCConf);</div><div class='ctx'> </div><div class='ctx'> 		/* according to 11.4.1, we need to wait for the busy line</div><div class='ctx'> 	         * drop if we read to the end of the page.  */</div><div class='hunk'>@@ -783,17 +755,10 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		     size_t * retlen, const u_char * buf)</div><div class='ctx'> {</div><div class='del'>-	char eccbuf[6];</div><div class='del'>-	return doc_write_ecc(mtd, to, len, retlen, buf, eccbuf, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			 size_t * retlen, const u_char * buf,</div><div class='del'>-			 u_char * eccbuf, struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	int di; /* Yes, DI is a hangover from when I was disassembling the binary driver */</div><div class='ctx'> 	void __iomem *docptr = this-&gt;virtadr;</div><div class='add'>+	unsigned char eccbuf[6];</div><div class='ctx'> 	volatile char dummy;</div><div class='ctx'> 	int len256 = 0;</div><div class='ctx'> 	struct Nand *mychip;</div><div class='hunk'>@@ -847,15 +812,9 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		DoC_Command(this, NAND_CMD_SEQIN, 0);</div><div class='ctx'> 		DoC_Address(this, ADDR_COLUMN_PAGE, to, 0, CDSN_CTRL_ECC_IO);</div><div class='ctx'> </div><div class='del'>-		if (eccbuf) {</div><div class='del'>-			/* Prime the ECC engine */</div><div class='del'>-			WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-			WriteDOC(DOC_ECC_EN | DOC_ECC_RW, docptr, ECCConf);</div><div class='del'>-		} else {</div><div class='del'>-			/* disable the ECC engine */</div><div class='del'>-			WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-			WriteDOC(DOC_ECC_DIS, docptr, ECCConf);</div><div class='del'>-		}</div><div class='add'>+		/* Prime the ECC engine */</div><div class='add'>+		WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='add'>+		WriteDOC(DOC_ECC_EN | DOC_ECC_RW, docptr, ECCConf);</div><div class='ctx'> </div><div class='ctx'> 		/* treat crossing 256-byte sector for 2M x 8bits devices */</div><div class='ctx'> 		if (this-&gt;page256 &amp;&amp; to + len &gt; (to | 0xff) + 1) {</div><div class='hunk'>@@ -885,39 +844,35 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> </div><div class='ctx'> 		DoC_WriteBuf(this, &amp;buf[len256], len - len256);</div><div class='ctx'> </div><div class='del'>-		if (eccbuf) {</div><div class='del'>-			WriteDOC(CDSN_CTRL_ECC_IO | CDSN_CTRL_CE, docptr,</div><div class='del'>-				 CDSNControl);</div><div class='del'>-</div><div class='del'>-			if (DoC_is_Millennium(this)) {</div><div class='del'>-				WriteDOC(0, docptr, NOP);</div><div class='del'>-				WriteDOC(0, docptr, NOP);</div><div class='del'>-				WriteDOC(0, docptr, NOP);</div><div class='del'>-			} else {</div><div class='del'>-				WriteDOC_(0, docptr, this-&gt;ioreg);</div><div class='del'>-				WriteDOC_(0, docptr, this-&gt;ioreg);</div><div class='del'>-				WriteDOC_(0, docptr, this-&gt;ioreg);</div><div class='del'>-			}</div><div class='add'>+		WriteDOC(CDSN_CTRL_ECC_IO | CDSN_CTRL_CE, docptr, CDSNControl);</div><div class='add'>+</div><div class='add'>+		if (DoC_is_Millennium(this)) {</div><div class='add'>+			WriteDOC(0, docptr, NOP);</div><div class='add'>+			WriteDOC(0, docptr, NOP);</div><div class='add'>+			WriteDOC(0, docptr, NOP);</div><div class='add'>+		} else {</div><div class='add'>+			WriteDOC_(0, docptr, this-&gt;ioreg);</div><div class='add'>+			WriteDOC_(0, docptr, this-&gt;ioreg);</div><div class='add'>+			WriteDOC_(0, docptr, this-&gt;ioreg);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			WriteDOC(CDSN_CTRL_ECC_IO | CDSN_CTRL_FLASH_IO | CDSN_CTRL_CE, docptr,</div><div class='del'>-				 CDSNControl);</div><div class='add'>+		WriteDOC(CDSN_CTRL_ECC_IO | CDSN_CTRL_FLASH_IO | CDSN_CTRL_CE, docptr,</div><div class='add'>+			 CDSNControl);</div><div class='ctx'> </div><div class='del'>-			/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='del'>-			for (di = 0; di &lt; 6; di++) {</div><div class='del'>-				eccbuf[di] = ReadDOC(docptr, ECCSyndrome0 + di);</div><div class='del'>-			}</div><div class='add'>+		/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='add'>+		for (di = 0; di &lt; 6; di++) {</div><div class='add'>+			eccbuf[di] = ReadDOC(docptr, ECCSyndrome0 + di);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* Reset the ECC engine */</div><div class='del'>-			WriteDOC(DOC_ECC_DIS, docptr, ECCConf);</div><div class='add'>+		/* Reset the ECC engine */</div><div class='add'>+		WriteDOC(DOC_ECC_DIS, docptr, ECCConf);</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-			printk</div><div class='del'>-			    ("OOB data at %lx is %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-			     (long) to, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='del'>-			     eccbuf[4], eccbuf[5]);</div><div class='add'>+		printk</div><div class='add'>+			("OOB data at %lx is %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+			 (long) to, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='add'>+			 eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		DoC_Command(this, NAND_CMD_PAGEPROG, 0);</div><div class='ctx'> </div><div class='ctx'> 		DoC_Command(this, NAND_CMD_STATUS, CDSN_CTRL_WP);</div><div class='hunk'>@@ -971,72 +926,18 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-			  unsigned long count, loff_t to, size_t *retlen,</div><div class='del'>-			  u_char *eccbuf, struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='del'>-	static char static_buf[512];</div><div class='del'>-	static DEFINE_MUTEX(writev_buf_mutex);</div><div class='del'>-</div><div class='del'>-	size_t totretlen = 0;</div><div class='del'>-	size_t thisvecofs = 0;</div><div class='del'>-	int ret= 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;writev_buf_mutex);</div><div class='del'>-</div><div class='del'>-	while(count) {</div><div class='del'>-		size_t thislen, thisretlen;</div><div class='del'>-		unsigned char *buf;</div><div class='del'>-</div><div class='del'>-		buf = vecs-&gt;iov_base + thisvecofs;</div><div class='del'>-		thislen = vecs-&gt;iov_len - thisvecofs;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		if (thislen &gt;= 512) {</div><div class='del'>-			thislen = thislen &amp; ~(512-1);</div><div class='del'>-			thisvecofs += thislen;</div><div class='del'>-		} else {</div><div class='del'>-			/* Not enough to fill a page. Copy into buf */</div><div class='del'>-			memcpy(static_buf, buf, thislen);</div><div class='del'>-			buf = &amp;static_buf[thislen];</div><div class='del'>-</div><div class='del'>-			while(count &amp;&amp; thislen &lt; 512) {</div><div class='del'>-				vecs++;</div><div class='del'>-				count--;</div><div class='del'>-				thisvecofs = min((512-thislen), vecs-&gt;iov_len);</div><div class='del'>-				memcpy(buf, vecs-&gt;iov_base, thisvecofs);</div><div class='del'>-				thislen += thisvecofs;</div><div class='del'>-				buf += thisvecofs;</div><div class='del'>-			}</div><div class='del'>-			buf = static_buf;</div><div class='del'>-		}</div><div class='del'>-		if (count &amp;&amp; thisvecofs == vecs-&gt;iov_len) {</div><div class='del'>-			thisvecofs = 0;</div><div class='del'>-			vecs++;</div><div class='del'>-			count--;</div><div class='del'>-		}</div><div class='del'>-		ret = doc_write_ecc(mtd, to, thislen, &amp;thisretlen, buf, eccbuf, oobsel);</div><div class='del'>-</div><div class='del'>-		totretlen += thisretlen;</div><div class='del'>-</div><div class='del'>-		if (ret || thisretlen != thislen)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		to += thislen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;writev_buf_mutex);</div><div class='del'>-	*retlen = totretlen;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			size_t * retlen, u_char * buf)</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	int len256 = 0, ret;</div><div class='ctx'> 	struct Nand *mychip;</div><div class='add'>+	uint8_t *buf = ops-&gt;oobbuf;</div><div class='add'>+	size_t len = ops-&gt;len;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	ofs += ops-&gt;ooboffs;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;this-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1077,7 +978,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> </div><div class='ctx'> 	DoC_ReadBuf(this, &amp;buf[len256], len - len256);</div><div class='ctx'> </div><div class='del'>-	*retlen = len;</div><div class='add'>+	ops-&gt;retlen = len;</div><div class='ctx'> 	/* Reading the full OOB data drops us off of the end of the page,</div><div class='ctx'>          * causing the flash device to go into busy mode, so we need</div><div class='ctx'>          * to wait until ready 11.4.1 and Toshiba TC58256FT docs */</div><div class='hunk'>@@ -1192,17 +1093,20 @@ static int doc_write_oob_nolock(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>- 			 size_t * retlen, const u_char * buf)</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>- 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='del'>- 	int ret;</div><div class='add'>+	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>- 	mutex_lock(&amp;this-&gt;lock);</div><div class='del'>- 	ret = doc_write_oob_nolock(mtd, ofs, len, retlen, buf);</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;this-&gt;lock);</div><div class='add'>+	ret = doc_write_oob_nolock(mtd, ofs + ops-&gt;ooboffs, ops-&gt;len,</div><div class='add'>+				   &amp;ops-&gt;retlen, ops-&gt;oobbuf);</div><div class='ctx'> </div><div class='del'>- 	mutex_unlock(&amp;this-&gt;lock);</div><div class='del'>- 	return ret;</div><div class='add'>+	mutex_unlock(&amp;this-&gt;lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int doc_erase(struct mtd_info *mtd, struct erase_info *instr)</div><div class='hunk'>@@ -1277,12 +1181,6 @@ static int doc_erase(struct mtd_info *mtd, struct erase_info *instr)</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static int __init init_doc2000(void)</div><div class='del'>-{</div><div class='del'>-       inter_module_register(im_name, THIS_MODULE, &amp;DoC2k_init);</div><div class='del'>-       return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __exit cleanup_doc2000(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='hunk'>@@ -1298,11 +1196,9 @@ static void __exit cleanup_doc2000(void)</div><div class='ctx'> 		kfree(this-&gt;chips);</div><div class='ctx'> 		kfree(mtd);</div><div class='ctx'> 	}</div><div class='del'>-	inter_module_unregister(im_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_exit(cleanup_doc2000);</div><div class='del'>-module_init(init_doc2000);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("David Woodhouse &lt;dwmw2@infradead.org&gt; et al.");</div><div class='head'>diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c<br/>index 681a9c73a2a3..0e2a9326f717 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/doc2001.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/doc2001.c</a></div><div class='hunk'>@@ -37,16 +37,10 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		    size_t *retlen, u_char *buf);</div><div class='ctx'> static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		     size_t *retlen, const u_char *buf);</div><div class='del'>-static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf, u_char *eccbuf,</div><div class='del'>-			struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf, u_char *eccbuf,</div><div class='del'>-			 struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf);</div><div class='del'>-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf);</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			struct mtd_oob_ops *ops);</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops);</div><div class='ctx'> static int doc_erase (struct mtd_info *mtd, struct erase_info *instr);</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *docmillist = NULL;</div><div class='hunk'>@@ -324,16 +318,9 @@ static int DoCMil_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char im_name[] = "DoCMil_init";</div><div class='del'>-</div><div class='del'>-/* This routine is made available to other mtd code via</div><div class='del'>- * inter_module_register.  It must only be accessed through</div><div class='del'>- * inter_module_get which will bump the use count of this module.  The</div><div class='del'>- * addresses passed back in mtd are valid as long as the use count of</div><div class='del'>- * this module is non-zero, i.e. between inter_module_get and</div><div class='del'>- * inter_module_put.  Keith Owens &lt;kaos@ocs.com.au&gt; 29 Oct 2000.</div><div class='del'>- */</div><div class='del'>-static void DoCMil_init(struct mtd_info *mtd)</div><div class='add'>+/* This routine is found from the docprobe code by symbol_get(),</div><div class='add'>+ * which will bump the use count of this module. */</div><div class='add'>+void DoCMil_init(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct DiskOnChip *old = NULL;</div><div class='hunk'>@@ -368,7 +355,7 @@ static void DoCMil_init(struct mtd_info *mtd)</div><div class='ctx'> 	/* FIXME: erase size is not always 8KiB */</div><div class='ctx'> 	mtd-&gt;erasesize = 0x2000;</div><div class='ctx'> </div><div class='del'>-	mtd-&gt;oobblock = 512;</div><div class='add'>+	mtd-&gt;writesize = 512;</div><div class='ctx'> 	mtd-&gt;oobsize = 16;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;erase = doc_erase;</div><div class='hunk'>@@ -376,8 +363,6 @@ static void DoCMil_init(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='ctx'> 	mtd-&gt;write = doc_write;</div><div class='del'>-	mtd-&gt;read_ecc = doc_read_ecc;</div><div class='del'>-	mtd-&gt;write_ecc = doc_write_ecc;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = doc_write_oob;</div><div class='ctx'> 	mtd-&gt;sync = NULL;</div><div class='hunk'>@@ -401,21 +386,14 @@ static void DoCMil_init(struct mtd_info *mtd)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(DoCMil_init);</div><div class='ctx'> </div><div class='ctx'> static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		     size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='del'>-	/* Just a special case of doc_read_ecc */</div><div class='del'>-	return doc_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int doc_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			 size_t *retlen, u_char *buf, u_char *eccbuf,</div><div class='del'>-			 struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	volatile char dummy;</div><div class='del'>-	unsigned char syndrome[6];</div><div class='add'>+	unsigned char syndrome[6], eccbuf[6];</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem *docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[from &gt;&gt; (this-&gt;chipshift)];</div><div class='hunk'>@@ -445,15 +423,9 @@ static int doc_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 	DoC_Address(docptr, 3, from, CDSN_CTRL_WP, 0x00);</div><div class='ctx'> 	DoC_WaitReady(docptr);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='del'>-		WriteDOC (DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-		WriteDOC (DOC_ECC_EN, docptr, ECCConf);</div><div class='del'>-	} else {</div><div class='del'>-		/* disable the ECC engine */</div><div class='del'>-		WriteDOC (DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-		WriteDOC (DOC_ECC_DIS, docptr, ECCConf);</div><div class='del'>-	}</div><div class='add'>+	/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='add'>+	WriteDOC (DOC_ECC_RESET, docptr, ECCConf);</div><div class='add'>+	WriteDOC (DOC_ECC_EN, docptr, ECCConf);</div><div class='ctx'> </div><div class='ctx'> 	/* Read the data via the internal pipeline through CDSN IO register,</div><div class='ctx'> 	   see Pipelined Read Operations 11.3 */</div><div class='hunk'>@@ -473,58 +445,56 @@ static int doc_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 	*retlen = len;</div><div class='ctx'>         ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* Read the ECC data from Spare Data Area,</div><div class='del'>-		   see Reed-Solomon EDC/ECC 11.1 */</div><div class='del'>-		dummy = ReadDOC(docptr, ReadPipeInit);</div><div class='add'>+	/* Read the ECC data from Spare Data Area,</div><div class='add'>+	   see Reed-Solomon EDC/ECC 11.1 */</div><div class='add'>+	dummy = ReadDOC(docptr, ReadPipeInit);</div><div class='ctx'> #ifndef USE_MEMCPY</div><div class='del'>-		for (i = 0; i &lt; 5; i++) {</div><div class='del'>-			/* N.B. you have to increase the source address in this way or the</div><div class='del'>-			   ECC logic will not work properly */</div><div class='del'>-			eccbuf[i] = ReadDOC(docptr, Mil_CDSN_IO + i);</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; 5; i++) {</div><div class='add'>+		/* N.B. you have to increase the source address in this way or the</div><div class='add'>+		   ECC logic will not work properly */</div><div class='add'>+		eccbuf[i] = ReadDOC(docptr, Mil_CDSN_IO + i);</div><div class='add'>+	}</div><div class='ctx'> #else</div><div class='del'>-		memcpy_fromio(eccbuf, docptr + DoC_Mil_CDSN_IO, 5);</div><div class='add'>+	memcpy_fromio(eccbuf, docptr + DoC_Mil_CDSN_IO, 5);</div><div class='ctx'> #endif</div><div class='del'>-		eccbuf[5] = ReadDOC(docptr, LastDataRead);</div><div class='add'>+	eccbuf[5] = ReadDOC(docptr, LastDataRead);</div><div class='ctx'> </div><div class='del'>-		/* Flush the pipeline */</div><div class='del'>-		dummy = ReadDOC(docptr, ECCConf);</div><div class='del'>-		dummy = ReadDOC(docptr, ECCConf);</div><div class='add'>+	/* Flush the pipeline */</div><div class='add'>+	dummy = ReadDOC(docptr, ECCConf);</div><div class='add'>+	dummy = ReadDOC(docptr, ECCConf);</div><div class='ctx'> </div><div class='del'>-		/* Check the ECC Status */</div><div class='del'>-		if (ReadDOC(docptr, ECCConf) &amp; 0x80) {</div><div class='del'>-                        int nb_errors;</div><div class='del'>-			/* There was an ECC error */</div><div class='add'>+	/* Check the ECC Status */</div><div class='add'>+	if (ReadDOC(docptr, ECCConf) &amp; 0x80) {</div><div class='add'>+		int nb_errors;</div><div class='add'>+		/* There was an ECC error */</div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='del'>-			printk("DiskOnChip ECC Error: Read at %lx\n", (long)from);</div><div class='add'>+		printk("DiskOnChip ECC Error: Read at %lx\n", (long)from);</div><div class='ctx'> #endif</div><div class='del'>-			/* Read the ECC syndrom through the DiskOnChip ECC logic.</div><div class='del'>-			   These syndrome will be all ZERO when there is no error */</div><div class='del'>-			for (i = 0; i &lt; 6; i++) {</div><div class='del'>-				syndrome[i] = ReadDOC(docptr, ECCSyndrome0 + i);</div><div class='del'>-			}</div><div class='del'>-                        nb_errors = doc_decode_ecc(buf, syndrome);</div><div class='add'>+		/* Read the ECC syndrom through the DiskOnChip ECC logic.</div><div class='add'>+		   These syndrome will be all ZERO when there is no error */</div><div class='add'>+		for (i = 0; i &lt; 6; i++) {</div><div class='add'>+			syndrome[i] = ReadDOC(docptr, ECCSyndrome0 + i);</div><div class='add'>+		}</div><div class='add'>+		nb_errors = doc_decode_ecc(buf, syndrome);</div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='del'>-			printk("ECC Errors corrected: %x\n", nb_errors);</div><div class='add'>+		printk("ECC Errors corrected: %x\n", nb_errors);</div><div class='ctx'> #endif</div><div class='del'>-                        if (nb_errors &lt; 0) {</div><div class='del'>-				/* We return error, but have actually done the read. Not that</div><div class='del'>-				   this can be told to user-space, via sys_read(), but at least</div><div class='del'>-				   MTD-aware stuff can know about it by checking *retlen */</div><div class='del'>-				ret = -EIO;</div><div class='del'>-                        }</div><div class='add'>+		if (nb_errors &lt; 0) {</div><div class='add'>+			/* We return error, but have actually done the read. Not that</div><div class='add'>+			   this can be told to user-space, via sys_read(), but at least</div><div class='add'>+			   MTD-aware stuff can know about it by checking *retlen */</div><div class='add'>+			ret = -EIO;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-		printk("ECC DATA at %lx: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-		       (long)from, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='del'>-		       eccbuf[4], eccbuf[5]);</div><div class='add'>+	printk("ECC DATA at %lx: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+	       (long)from, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='add'>+	       eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		/* disable the ECC engine */</div><div class='del'>-		WriteDOC(DOC_ECC_DIS, docptr , ECCConf);</div><div class='del'>-	}</div><div class='add'>+	/* disable the ECC engine */</div><div class='add'>+	WriteDOC(DOC_ECC_DIS, docptr , ECCConf);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -532,15 +502,8 @@ static int doc_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> static int doc_write (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		      size_t *retlen, const u_char *buf)</div><div class='ctx'> {</div><div class='del'>-	char eccbuf[6];</div><div class='del'>-	return doc_write_ecc(mtd, to, len, retlen, buf, eccbuf, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			  size_t *retlen, const u_char *buf, u_char *eccbuf,</div><div class='del'>-			 struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='ctx'> 	int i,ret = 0;</div><div class='add'>+	char eccbuf[6];</div><div class='ctx'> 	volatile char dummy;</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem *docptr = this-&gt;virtadr;</div><div class='hunk'>@@ -581,15 +544,9 @@ static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 	DoC_Address(docptr, 3, to, 0x00, 0x00);</div><div class='ctx'> 	DoC_WaitReady(docptr);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='del'>-		WriteDOC (DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-		WriteDOC (DOC_ECC_EN | DOC_ECC_RW, docptr, ECCConf);</div><div class='del'>-	} else {</div><div class='del'>-		/* disable the ECC engine */</div><div class='del'>-		WriteDOC (DOC_ECC_RESET, docptr, ECCConf);</div><div class='del'>-		WriteDOC (DOC_ECC_DIS, docptr, ECCConf);</div><div class='del'>-	}</div><div class='add'>+	/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='add'>+	WriteDOC (DOC_ECC_RESET, docptr, ECCConf);</div><div class='add'>+	WriteDOC (DOC_ECC_EN | DOC_ECC_RW, docptr, ECCConf);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the data via the internal pipeline through CDSN IO register,</div><div class='ctx'> 	   see Pipelined Write Operations 11.2 */</div><div class='hunk'>@@ -604,46 +561,44 @@ static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> #endif</div><div class='ctx'> 	WriteDOC(0x00, docptr, WritePipeTerm);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* Write ECC data to flash, the ECC info is generated by the DiskOnChip ECC logic</div><div class='del'>-		   see Reed-Solomon EDC/ECC 11.1 */</div><div class='del'>-		WriteDOC(0, docptr, NOP);</div><div class='del'>-		WriteDOC(0, docptr, NOP);</div><div class='del'>-		WriteDOC(0, docptr, NOP);</div><div class='add'>+	/* Write ECC data to flash, the ECC info is generated by the DiskOnChip ECC logic</div><div class='add'>+	   see Reed-Solomon EDC/ECC 11.1 */</div><div class='add'>+	WriteDOC(0, docptr, NOP);</div><div class='add'>+	WriteDOC(0, docptr, NOP);</div><div class='add'>+	WriteDOC(0, docptr, NOP);</div><div class='ctx'> </div><div class='del'>-		/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='del'>-		for (i = 0; i &lt; 6; i++) {</div><div class='del'>-			eccbuf[i] = ReadDOC(docptr, ECCSyndrome0 + i);</div><div class='del'>-		}</div><div class='add'>+	/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		eccbuf[i] = ReadDOC(docptr, ECCSyndrome0 + i);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* ignore the ECC engine */</div><div class='del'>-		WriteDOC(DOC_ECC_DIS, docptr , ECCConf);</div><div class='add'>+	/* ignore the ECC engine */</div><div class='add'>+	WriteDOC(DOC_ECC_DIS, docptr , ECCConf);</div><div class='ctx'> </div><div class='ctx'> #ifndef USE_MEMCPY</div><div class='del'>-		/* Write the ECC data to flash */</div><div class='del'>-		for (i = 0; i &lt; 6; i++) {</div><div class='del'>-			/* N.B. you have to increase the source address in this way or the</div><div class='del'>-			   ECC logic will not work properly */</div><div class='del'>-			WriteDOC(eccbuf[i], docptr, Mil_CDSN_IO + i);</div><div class='del'>-		}</div><div class='add'>+	/* Write the ECC data to flash */</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		/* N.B. you have to increase the source address in this way or the</div><div class='add'>+		   ECC logic will not work properly */</div><div class='add'>+		WriteDOC(eccbuf[i], docptr, Mil_CDSN_IO + i);</div><div class='add'>+	}</div><div class='ctx'> #else</div><div class='del'>-		memcpy_toio(docptr + DoC_Mil_CDSN_IO, eccbuf, 6);</div><div class='add'>+	memcpy_toio(docptr + DoC_Mil_CDSN_IO, eccbuf, 6);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		/* write the block status BLOCK_USED (0x5555) at the end of ECC data</div><div class='del'>-		   FIXME: this is only a hack for programming the IPL area for LinuxBIOS</div><div class='del'>-		   and should be replace with proper codes in user space utilities */</div><div class='del'>-		WriteDOC(0x55, docptr, Mil_CDSN_IO);</div><div class='del'>-		WriteDOC(0x55, docptr, Mil_CDSN_IO + 1);</div><div class='add'>+	/* write the block status BLOCK_USED (0x5555) at the end of ECC data</div><div class='add'>+	   FIXME: this is only a hack for programming the IPL area for LinuxBIOS</div><div class='add'>+	   and should be replace with proper codes in user space utilities */</div><div class='add'>+	WriteDOC(0x55, docptr, Mil_CDSN_IO);</div><div class='add'>+	WriteDOC(0x55, docptr, Mil_CDSN_IO + 1);</div><div class='ctx'> </div><div class='del'>-		WriteDOC(0x00, docptr, WritePipeTerm);</div><div class='add'>+	WriteDOC(0x00, docptr, WritePipeTerm);</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-		printk("OOB data at %lx is %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-		       (long) to, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='del'>-		       eccbuf[4], eccbuf[5]);</div><div class='add'>+	printk("OOB data at %lx is %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+	       (long) to, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='add'>+	       eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Commit the Page Program command and wait for ready</div><div class='ctx'> 	   see Software Requirement 11.4 item 1.*/</div><div class='hunk'>@@ -670,8 +625,8 @@ static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf)</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> #ifndef USE_MEMCPY</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -680,6 +635,12 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem *docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[ofs &gt;&gt; this-&gt;chipshift];</div><div class='add'>+	uint8_t *buf = ops-&gt;oobbuf;</div><div class='add'>+	size_t len = ops-&gt;len;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	ofs += ops-&gt;ooboffs;</div><div class='ctx'> </div><div class='ctx'> 	/* Find the chip which is to be used and select it */</div><div class='ctx'> 	if (this-&gt;curfloor != mychip-&gt;floor) {</div><div class='hunk'>@@ -716,13 +677,13 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> #endif</div><div class='ctx'> 	buf[len - 1] = ReadDOC(docptr, LastDataRead);</div><div class='ctx'> </div><div class='del'>-	*retlen = len;</div><div class='add'>+	ops-&gt;retlen = len;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf)</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> #ifndef USE_MEMCPY</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -732,6 +693,12 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem *docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[ofs &gt;&gt; this-&gt;chipshift];</div><div class='add'>+	uint8_t *buf = ops-&gt;oobbuf;</div><div class='add'>+	size_t len = ops-&gt;len;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	ofs += ops-&gt;ooboffs;</div><div class='ctx'> </div><div class='ctx'> 	/* Find the chip which is to be used and select it */</div><div class='ctx'> 	if (this-&gt;curfloor != mychip-&gt;floor) {</div><div class='hunk'>@@ -783,12 +750,12 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 	if (ReadDOC(docptr, Mil_CDSN_IO) &amp; 1) {</div><div class='ctx'> 		printk("Error programming oob data\n");</div><div class='ctx'> 		/* FIXME: implement Bad Block Replacement (in nftl.c ??) */</div><div class='del'>-		*retlen = 0;</div><div class='add'>+		ops-&gt;retlen = 0;</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	dummy = ReadDOC(docptr, LastDataRead);</div><div class='ctx'> </div><div class='del'>-	*retlen = len;</div><div class='add'>+	ops-&gt;retlen = len;</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -856,12 +823,6 @@ int doc_erase (struct mtd_info *mtd, struct erase_info *instr)</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static int __init init_doc2001(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_register(im_name, THIS_MODULE, &amp;DoCMil_init);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __exit cleanup_doc2001(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='hunk'>@@ -877,11 +838,9 @@ static void __exit cleanup_doc2001(void)</div><div class='ctx'> 		kfree(this-&gt;chips);</div><div class='ctx'> 		kfree(mtd);</div><div class='ctx'> 	}</div><div class='del'>-	inter_module_unregister(im_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_exit(cleanup_doc2001);</div><div class='del'>-module_init(init_doc2001);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("David Woodhouse &lt;dwmw2@infradead.org&gt; et al.");</div><div class='head'>diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c<br/>index 5f57f29efee4..92dbb47f2ac3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001plus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/doc2001plus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/doc2001plus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/doc2001plus.c</a></div><div class='hunk'>@@ -41,16 +41,10 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		size_t *retlen, u_char *buf);</div><div class='ctx'> static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		size_t *retlen, const u_char *buf);</div><div class='del'>-static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-		size_t *retlen, u_char *buf, u_char *eccbuf,</div><div class='del'>-		struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-		size_t *retlen, const u_char *buf, u_char *eccbuf,</div><div class='del'>-		struct nand_oobinfo *oobsel);</div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-		size_t *retlen, u_char *buf);</div><div class='del'>-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-		size_t *retlen, const u_char *buf);</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			struct mtd_oob_ops *ops);</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops);</div><div class='ctx'> static int doc_erase (struct mtd_info *mtd, struct erase_info *instr);</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *docmilpluslist = NULL;</div><div class='hunk'>@@ -447,16 +441,9 @@ static int DoCMilPlus_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char im_name[] = "DoCMilPlus_init";</div><div class='del'>-</div><div class='del'>-/* This routine is made available to other mtd code via</div><div class='del'>- * inter_module_register.  It must only be accessed through</div><div class='del'>- * inter_module_get which will bump the use count of this module.  The</div><div class='del'>- * addresses passed back in mtd are valid as long as the use count of</div><div class='del'>- * this module is non-zero, i.e. between inter_module_get and</div><div class='del'>- * inter_module_put.  Keith Owens &lt;kaos@ocs.com.au&gt; 29 Oct 2000.</div><div class='del'>- */</div><div class='del'>-static void DoCMilPlus_init(struct mtd_info *mtd)</div><div class='add'>+/* This routine is found from the docprobe code by symbol_get(),</div><div class='add'>+ * which will bump the use count of this module. */</div><div class='add'>+void DoCMilPlus_init(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct DiskOnChip *old = NULL;</div><div class='hunk'>@@ -490,7 +477,7 @@ static void DoCMilPlus_init(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;size = 0;</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;erasesize = 0;</div><div class='del'>-	mtd-&gt;oobblock = 512;</div><div class='add'>+	mtd-&gt;writesize = 512;</div><div class='ctx'> 	mtd-&gt;oobsize = 16;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;erase = doc_erase;</div><div class='hunk'>@@ -498,8 +485,6 @@ static void DoCMilPlus_init(struct mtd_info *mtd)</div><div class='ctx'> 	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = doc_read;</div><div class='ctx'> 	mtd-&gt;write = doc_write;</div><div class='del'>-	mtd-&gt;read_ecc = doc_read_ecc;</div><div class='del'>-	mtd-&gt;write_ecc = doc_write_ecc;</div><div class='ctx'> 	mtd-&gt;read_oob = doc_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = doc_write_oob;</div><div class='ctx'> 	mtd-&gt;sync = NULL;</div><div class='hunk'>@@ -524,6 +509,7 @@ static void DoCMilPlus_init(struct mtd_info *mtd)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(DoCMilPlus_init);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> static int doc_dumpblk(struct mtd_info *mtd, loff_t from)</div><div class='hunk'>@@ -603,18 +589,10 @@ static int doc_dumpblk(struct mtd_info *mtd, loff_t from)</div><div class='ctx'> static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		    size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='del'>-	/* Just a special case of doc_read_ecc */</div><div class='del'>-	return doc_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf, u_char *eccbuf,</div><div class='del'>-			struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='ctx'> 	int ret, i;</div><div class='ctx'> 	volatile char dummy;</div><div class='ctx'> 	loff_t fofs;</div><div class='del'>-	unsigned char syndrome[6];</div><div class='add'>+	unsigned char syndrome[6], eccbuf[6];</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem * docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[from &gt;&gt; (this-&gt;chipshift)];</div><div class='hunk'>@@ -652,56 +630,51 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 	WriteDOC(0, docptr, Mplus_FlashControl);</div><div class='ctx'> 	DoC_WaitReady(docptr);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='del'>-		WriteDOC(DOC_ECC_RESET, docptr, Mplus_ECCConf);</div><div class='del'>-		WriteDOC(DOC_ECC_EN, docptr, Mplus_ECCConf);</div><div class='del'>-	} else {</div><div class='del'>-		/* disable the ECC engine */</div><div class='del'>-		WriteDOC(DOC_ECC_RESET, docptr, Mplus_ECCConf);</div><div class='del'>-	}</div><div class='add'>+	/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='add'>+	WriteDOC(DOC_ECC_RESET, docptr, Mplus_ECCConf);</div><div class='add'>+	WriteDOC(DOC_ECC_EN, docptr, Mplus_ECCConf);</div><div class='ctx'> </div><div class='ctx'> 	/* Let the caller know we completed it */</div><div class='ctx'> 	*retlen = len;</div><div class='del'>-        ret = 0;</div><div class='add'>+	ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='ctx'> 	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* Read the data via the internal pipeline through CDSN IO</div><div class='del'>-		   register, see Pipelined Read Operations 11.3 */</div><div class='del'>-		MemReadDOC(docptr, buf, len);</div><div class='add'>+	/* Read the data via the internal pipeline through CDSN IO</div><div class='add'>+	   register, see Pipelined Read Operations 11.3 */</div><div class='add'>+	MemReadDOC(docptr, buf, len);</div><div class='ctx'> </div><div class='del'>-		/* Read the ECC data following raw data */</div><div class='del'>-		MemReadDOC(docptr, eccbuf, 4);</div><div class='del'>-		eccbuf[4] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='del'>-		eccbuf[5] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='add'>+	/* Read the ECC data following raw data */</div><div class='add'>+	MemReadDOC(docptr, eccbuf, 4);</div><div class='add'>+	eccbuf[4] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='add'>+	eccbuf[5] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='ctx'> </div><div class='del'>-		/* Flush the pipeline */</div><div class='del'>-		dummy = ReadDOC(docptr, Mplus_ECCConf);</div><div class='del'>-		dummy = ReadDOC(docptr, Mplus_ECCConf);</div><div class='add'>+	/* Flush the pipeline */</div><div class='add'>+	dummy = ReadDOC(docptr, Mplus_ECCConf);</div><div class='add'>+	dummy = ReadDOC(docptr, Mplus_ECCConf);</div><div class='ctx'> </div><div class='del'>-		/* Check the ECC Status */</div><div class='del'>-		if (ReadDOC(docptr, Mplus_ECCConf) &amp; 0x80) {</div><div class='del'>-                        int nb_errors;</div><div class='del'>-			/* There was an ECC error */</div><div class='add'>+	/* Check the ECC Status */</div><div class='add'>+	if (ReadDOC(docptr, Mplus_ECCConf) &amp; 0x80) {</div><div class='add'>+		int nb_errors;</div><div class='add'>+		/* There was an ECC error */</div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='del'>-			printk("DiskOnChip ECC Error: Read at %lx\n", (long)from);</div><div class='add'>+		printk("DiskOnChip ECC Error: Read at %lx\n", (long)from);</div><div class='ctx'> #endif</div><div class='del'>-			/* Read the ECC syndrom through the DiskOnChip ECC logic.</div><div class='del'>-			   These syndrome will be all ZERO when there is no error */</div><div class='del'>-			for (i = 0; i &lt; 6; i++)</div><div class='del'>-				syndrome[i] = ReadDOC(docptr, Mplus_ECCSyndrome0 + i);</div><div class='add'>+		/* Read the ECC syndrom through the DiskOnChip ECC logic.</div><div class='add'>+		   These syndrome will be all ZERO when there is no error */</div><div class='add'>+		for (i = 0; i &lt; 6; i++)</div><div class='add'>+			syndrome[i] = ReadDOC(docptr, Mplus_ECCSyndrome0 + i);</div><div class='ctx'> </div><div class='del'>-                        nb_errors = doc_decode_ecc(buf, syndrome);</div><div class='add'>+		nb_errors = doc_decode_ecc(buf, syndrome);</div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='del'>-			printk("ECC Errors corrected: %x\n", nb_errors);</div><div class='add'>+		printk("ECC Errors corrected: %x\n", nb_errors);</div><div class='ctx'> #endif</div><div class='del'>-                        if (nb_errors &lt; 0) {</div><div class='del'>-				/* We return error, but have actually done the read. Not that</div><div class='del'>-				   this can be told to user-space, via sys_read(), but at least</div><div class='del'>-				   MTD-aware stuff can know about it by checking *retlen */</div><div class='add'>+		if (nb_errors &lt; 0) {</div><div class='add'>+			/* We return error, but have actually done the</div><div class='add'>+			   read. Not that this can be told to user-space, via</div><div class='add'>+			   sys_read(), but at least MTD-aware stuff can know</div><div class='add'>+			   about it by checking *retlen */</div><div class='ctx'> #ifdef ECC_DEBUG</div><div class='ctx'> 			printk("%s(%d): Millennium Plus ECC error (from=0x%x:\n",</div><div class='ctx'> 				__FILE__, __LINE__, (int)from);</div><div class='hunk'>@@ -715,24 +688,16 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 				eccbuf[3], eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='ctx'> 				ret = -EIO;</div><div class='del'>-                        }</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-		printk("ECC DATA at %lx: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-		       (long)from, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='del'>-		       eccbuf[4], eccbuf[5]);</div><div class='add'>+	printk("ECC DATA at %lx: %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+	       (long)from, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='add'>+	       eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-		/* disable the ECC engine */</div><div class='del'>-		WriteDOC(DOC_ECC_DIS, docptr , Mplus_ECCConf);</div><div class='del'>-	} else {</div><div class='del'>-		/* Read the data via the internal pipeline through CDSN IO</div><div class='del'>-		   register, see Pipelined Read Operations 11.3 */</div><div class='del'>-		MemReadDOC(docptr, buf, len-2);</div><div class='del'>-		buf[len-2] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='del'>-		buf[len-1] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='del'>-	}</div><div class='add'>+	/* disable the ECC engine */</div><div class='add'>+	WriteDOC(DOC_ECC_DIS, docptr , Mplus_ECCConf);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable flash internally */</div><div class='ctx'> 	WriteDOC(0, docptr, Mplus_FlashSelect);</div><div class='hunk'>@@ -743,17 +708,10 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		     size_t *retlen, const u_char *buf)</div><div class='ctx'> {</div><div class='del'>-	char eccbuf[6];</div><div class='del'>-	return doc_write_ecc(mtd, to, len, retlen, buf, eccbuf, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf, u_char *eccbuf,</div><div class='del'>-			 struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='ctx'> 	int i, before, ret = 0;</div><div class='ctx'> 	loff_t fto;</div><div class='ctx'> 	volatile char dummy;</div><div class='add'>+	char eccbuf[6];</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem * docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[to &gt;&gt; (this-&gt;chipshift)];</div><div class='hunk'>@@ -803,46 +761,42 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 	/* Disable the ECC engine */</div><div class='ctx'> 	WriteDOC(DOC_ECC_RESET, docptr, Mplus_ECCConf);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		if (before) {</div><div class='del'>-			/* Write the block status BLOCK_USED (0x5555) */</div><div class='del'>-			WriteDOC(0x55, docptr, Mil_CDSN_IO);</div><div class='del'>-			WriteDOC(0x55, docptr, Mil_CDSN_IO);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='del'>-		WriteDOC(DOC_ECC_EN | DOC_ECC_RW, docptr, Mplus_ECCConf);</div><div class='add'>+	if (before) {</div><div class='add'>+		/* Write the block status BLOCK_USED (0x5555) */</div><div class='add'>+		WriteDOC(0x55, docptr, Mil_CDSN_IO);</div><div class='add'>+		WriteDOC(0x55, docptr, Mil_CDSN_IO);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* init the ECC engine, see Reed-Solomon EDC/ECC 11.1 .*/</div><div class='add'>+	WriteDOC(DOC_ECC_EN | DOC_ECC_RW, docptr, Mplus_ECCConf);</div><div class='add'>+</div><div class='ctx'> 	MemWriteDOC(docptr, (unsigned char *) buf, len);</div><div class='ctx'> </div><div class='del'>-	if (eccbuf) {</div><div class='del'>-		/* Write ECC data to flash, the ECC info is generated by</div><div class='del'>-		   the DiskOnChip ECC logic see Reed-Solomon EDC/ECC 11.1 */</div><div class='del'>-		DoC_Delay(docptr, 3);</div><div class='add'>+	/* Write ECC data to flash, the ECC info is generated by</div><div class='add'>+	   the DiskOnChip ECC logic see Reed-Solomon EDC/ECC 11.1 */</div><div class='add'>+	DoC_Delay(docptr, 3);</div><div class='ctx'> </div><div class='del'>-		/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			eccbuf[i] = ReadDOC(docptr, Mplus_ECCSyndrome0 + i);</div><div class='add'>+	/* Read the ECC data through the DiskOnChip ECC logic */</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		eccbuf[i] = ReadDOC(docptr, Mplus_ECCSyndrome0 + i);</div><div class='ctx'> </div><div class='del'>-		/* disable the ECC engine */</div><div class='del'>-		WriteDOC(DOC_ECC_DIS, docptr, Mplus_ECCConf);</div><div class='add'>+	/* disable the ECC engine */</div><div class='add'>+	WriteDOC(DOC_ECC_DIS, docptr, Mplus_ECCConf);</div><div class='ctx'> </div><div class='del'>-		/* Write the ECC data to flash */</div><div class='del'>-		MemWriteDOC(docptr, eccbuf, 6);</div><div class='add'>+	/* Write the ECC data to flash */</div><div class='add'>+	MemWriteDOC(docptr, eccbuf, 6);</div><div class='ctx'> </div><div class='del'>-		if (!before) {</div><div class='del'>-			/* Write the block status BLOCK_USED (0x5555) */</div><div class='del'>-			WriteDOC(0x55, docptr, Mil_CDSN_IO+6);</div><div class='del'>-			WriteDOC(0x55, docptr, Mil_CDSN_IO+7);</div><div class='del'>-		}</div><div class='add'>+	if (!before) {</div><div class='add'>+		/* Write the block status BLOCK_USED (0x5555) */</div><div class='add'>+		WriteDOC(0x55, docptr, Mil_CDSN_IO+6);</div><div class='add'>+		WriteDOC(0x55, docptr, Mil_CDSN_IO+7);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef PSYCHO_DEBUG</div><div class='del'>-		printk("OOB data at %lx is %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='del'>-		       (long) to, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='del'>-		       eccbuf[4], eccbuf[5]);</div><div class='add'>+	printk("OOB data at %lx is %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X\n",</div><div class='add'>+	       (long) to, eccbuf[0], eccbuf[1], eccbuf[2], eccbuf[3],</div><div class='add'>+	       eccbuf[4], eccbuf[5]);</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	WriteDOC(0x00, docptr, Mplus_WritePipeTerm);</div><div class='ctx'> 	WriteDOC(0x00, docptr, Mplus_WritePipeTerm);</div><div class='hunk'>@@ -876,14 +830,20 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf)</div><div class='add'>+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t fofs, base;</div><div class='ctx'> 	struct DiskOnChip *this = mtd-&gt;priv;</div><div class='ctx'> 	void __iomem * docptr = this-&gt;virtadr;</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[ofs &gt;&gt; this-&gt;chipshift];</div><div class='ctx'> 	size_t i, size, got, want;</div><div class='add'>+	uint8_t *buf = ops-&gt;oobbuf;</div><div class='add'>+	size_t len = ops-&gt;len;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	ofs += ops-&gt;ooboffs;</div><div class='ctx'> </div><div class='ctx'> 	DoC_CheckASIC(docptr);</div><div class='ctx'> </div><div class='hunk'>@@ -949,12 +909,12 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 	/* Disable flash internally */</div><div class='ctx'> 	WriteDOC(0, docptr, Mplus_FlashSelect);</div><div class='ctx'> </div><div class='del'>-	*retlen = len;</div><div class='add'>+	ops-&gt;retlen = len;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='del'>-			 size_t *retlen, const u_char *buf)</div><div class='add'>+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	volatile char dummy;</div><div class='ctx'> 	loff_t fofs, base;</div><div class='hunk'>@@ -963,6 +923,12 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 	struct Nand *mychip = &amp;this-&gt;chips[ofs &gt;&gt; this-&gt;chipshift];</div><div class='ctx'> 	size_t i, size, got, want;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	uint8_t *buf = ops-&gt;oobbuf;</div><div class='add'>+	size_t len = ops-&gt;len;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	ofs += ops-&gt;ooboffs;</div><div class='ctx'> </div><div class='ctx'> 	DoC_CheckASIC(docptr);</div><div class='ctx'> </div><div class='hunk'>@@ -1038,7 +1004,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 			printk("MTD: Error 0x%x programming oob at 0x%x\n",</div><div class='ctx'> 				dummy, (int)ofs);</div><div class='ctx'> 			/* FIXME: implement Bad Block Replacement */</div><div class='del'>-			*retlen = 0;</div><div class='add'>+			ops-&gt;retlen = 0;</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		dummy = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='hunk'>@@ -1051,7 +1017,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,</div><div class='ctx'> 	/* Disable flash internally */</div><div class='ctx'> 	WriteDOC(0, docptr, Mplus_FlashSelect);</div><div class='ctx'> </div><div class='del'>-	*retlen = len;</div><div class='add'>+	ops-&gt;retlen = len;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1122,12 +1088,6 @@ int doc_erase(struct mtd_info *mtd, struct erase_info *instr)</div><div class='ctx'>  *</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static int __init init_doc2001plus(void)</div><div class='del'>-{</div><div class='del'>-	inter_module_register(im_name, THIS_MODULE, &amp;DoCMilPlus_init);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __exit cleanup_doc2001plus(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='hunk'>@@ -1143,11 +1103,9 @@ static void __exit cleanup_doc2001plus(void)</div><div class='ctx'> 		kfree(this-&gt;chips);</div><div class='ctx'> 		kfree(mtd);</div><div class='ctx'> 	}</div><div class='del'>-	inter_module_unregister(im_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_exit(cleanup_doc2001plus);</div><div class='del'>-module_init(init_doc2001plus);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Greg Ungerer &lt;gerg@snapgear.com&gt; et al.");</div><div class='head'>diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c<br/>index 13178b9dd00a..78872c3f3760 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docprobe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/docprobe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/docprobe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/docprobe.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> */</div><div class='ctx'> #define DOC_SINGLE_DRIVER</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -231,6 +230,10 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr</div><div class='ctx'> </div><div class='ctx'> static int docfound;</div><div class='ctx'> </div><div class='add'>+extern void DoC2k_init(struct mtd_info *);</div><div class='add'>+extern void DoCMil_init(struct mtd_info *);</div><div class='add'>+extern void DoCMilPlus_init(struct mtd_info *);</div><div class='add'>+</div><div class='ctx'> static void __init DoC_Probe(unsigned long physadr)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *docptr;</div><div class='hunk'>@@ -239,8 +242,6 @@ static void __init DoC_Probe(unsigned long physadr)</div><div class='ctx'> 	int ChipID;</div><div class='ctx'> 	char namebuf[15];</div><div class='ctx'> 	char *name = namebuf;</div><div class='del'>-	char *im_funcname = NULL;</div><div class='del'>-	char *im_modname = NULL;</div><div class='ctx'> 	void (*initroutine)(struct mtd_info *) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	docptr = ioremap(physadr, DOC_IOREMAP_LEN);</div><div class='hunk'>@@ -278,41 +279,33 @@ static void __init DoC_Probe(unsigned long physadr)</div><div class='ctx'> 		switch(ChipID) {</div><div class='ctx'> 		case DOC_ChipID_Doc2kTSOP:</div><div class='ctx'> 			name="2000 TSOP";</div><div class='del'>-			im_funcname = "DoC2k_init";</div><div class='del'>-			im_modname = "doc2000";</div><div class='add'>+			initroutine = symbol_request(DoC2k_init);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case DOC_ChipID_Doc2k:</div><div class='ctx'> 			name="2000";</div><div class='del'>-			im_funcname = "DoC2k_init";</div><div class='del'>-			im_modname = "doc2000";</div><div class='add'>+			initroutine = symbol_request(DoC2k_init);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case DOC_ChipID_DocMil:</div><div class='ctx'> 			name="Millennium";</div><div class='ctx'> #ifdef DOC_SINGLE_DRIVER</div><div class='del'>-			im_funcname = "DoC2k_init";</div><div class='del'>-			im_modname = "doc2000";</div><div class='add'>+			initroutine = symbol_request(DoC2k_init);</div><div class='ctx'> #else</div><div class='del'>-			im_funcname = "DoCMil_init";</div><div class='del'>-			im_modname = "doc2001";</div><div class='add'>+			initroutine = symbol_request(DoCMil_init);</div><div class='ctx'> #endif /* DOC_SINGLE_DRIVER */</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case DOC_ChipID_DocMilPlus16:</div><div class='ctx'> 		case DOC_ChipID_DocMilPlus32:</div><div class='ctx'> 			name="MillenniumPlus";</div><div class='del'>-			im_funcname = "DoCMilPlus_init";</div><div class='del'>-			im_modname = "doc2001plus";</div><div class='add'>+			initroutine = symbol_request(DoCMilPlus_init);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (im_funcname)</div><div class='del'>-			initroutine = inter_module_get_request(im_funcname, im_modname);</div><div class='del'>-</div><div class='ctx'> 		if (initroutine) {</div><div class='ctx'> 			(*initroutine)(mtd);</div><div class='del'>-			inter_module_put(im_funcname);</div><div class='add'>+			symbol_put_addr(initroutine);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_NOTICE "Cannot find driver for DiskOnChip %s at 0x%lX\n", name, physadr);</div><div class='head'>diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c<br/>index 29b0ddaa324e..4ea50a1dda85 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/lart.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/lart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/lart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/lart.c</a></div><div class='hunk'>@@ -635,6 +635,7 @@ int __init lart_flash_init (void)</div><div class='ctx'>    printk ("%s: This looks like a LART board to me.\n",module_name);</div><div class='ctx'>    mtd.name = module_name;</div><div class='ctx'>    mtd.type = MTD_NORFLASH;</div><div class='add'>+   mtd.writesize = 1;</div><div class='ctx'>    mtd.flags = MTD_CAP_NORFLASH;</div><div class='ctx'>    mtd.size = FLASH_BLOCKSIZE_PARAM * FLASH_NUMBLOCKS_16m_PARAM + FLASH_BLOCKSIZE_MAIN * FLASH_NUMBLOCKS_16m_MAIN;</div><div class='ctx'>    mtd.erasesize = FLASH_BLOCKSIZE_MAIN;</div><div class='head'>diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c<br/>index 04e65d5dae00..a8466141e914 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/m25p80.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/m25p80.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/m25p80.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/m25p80.c</a></div><div class='hunk'>@@ -465,6 +465,7 @@ static int __devinit m25p_probe(struct spi_device *spi)</div><div class='ctx'> 		flash-&gt;mtd.name = spi-&gt;dev.bus_id;</div><div class='ctx'> </div><div class='ctx'> 	flash-&gt;mtd.type = MTD_NORFLASH;</div><div class='add'>+	flash-&gt;mtd.writesize = 1;</div><div class='ctx'> 	flash-&gt;mtd.flags = MTD_CAP_NORFLASH;</div><div class='ctx'> 	flash-&gt;mtd.size = info-&gt;sector_size * info-&gt;n_sectors;</div><div class='ctx'> 	flash-&gt;mtd.erasesize = info-&gt;sector_size;</div><div class='head'>diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c<br/>index 485f663493d2..08dfb899b272 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/ms02-nv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/ms02-nv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/ms02-nv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/ms02-nv.c</a></div><div class='hunk'>@@ -219,12 +219,13 @@ static int __init ms02nv_init_one(ulong addr)</div><div class='ctx'> 	mp-&gt;uaddr = phys_to_virt(fixaddr);</div><div class='ctx'> </div><div class='ctx'> 	mtd-&gt;type = MTD_RAM;</div><div class='del'>-	mtd-&gt;flags = MTD_CAP_RAM | MTD_XIP;</div><div class='add'>+	mtd-&gt;flags = MTD_CAP_RAM;</div><div class='ctx'> 	mtd-&gt;size = fixsize;</div><div class='ctx'> 	mtd-&gt;name = (char *)ms02nv_name;</div><div class='ctx'> 	mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mtd-&gt;read = ms02nv_read;</div><div class='ctx'> 	mtd-&gt;write = ms02nv_write;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EIO;</div><div class='ctx'> 	if (add_mtd_device(mtd)) {</div><div class='head'>diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c<br/>index a19480d07888..5db716045927 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtd_dataflash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/mtd_dataflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtd_dataflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/mtd_dataflash.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * as published by the Free Software Foundation; either version</div><div class='ctx'>  * 2 of the License, or (at your option) any later version.</div><div class='ctx'> */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -478,6 +477,7 @@ add_dataflash(struct spi_device *spi, char *name,</div><div class='ctx'> 	device-&gt;name = (pdata &amp;&amp; pdata-&gt;name) ? pdata-&gt;name : priv-&gt;name;</div><div class='ctx'> 	device-&gt;size = nr_pages * pagesize;</div><div class='ctx'> 	device-&gt;erasesize = pagesize;</div><div class='add'>+	device-&gt;writesize = pagesize;</div><div class='ctx'> 	device-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	device-&gt;type = MTD_DATAFLASH;</div><div class='ctx'> 	device-&gt;flags = MTD_CAP_NORFLASH;</div><div class='head'>diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c<br/>index 1443117fd8f4..e427c82d5f4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtdram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/mtdram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/mtdram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/mtdram.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -106,6 +105,7 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,</div><div class='ctx'> 	mtd-&gt;type = MTD_RAM;</div><div class='ctx'> 	mtd-&gt;flags = MTD_CAP_RAM;</div><div class='ctx'> 	mtd-&gt;size = size;</div><div class='add'>+	mtd-&gt;writesize = 1;</div><div class='ctx'> 	mtd-&gt;erasesize = MTDRAM_ERASE_SIZE;</div><div class='ctx'> 	mtd-&gt;priv = mapped_address;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c<br/>index e8685ee6c1e4..6c7337f9ebbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/phram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/phram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/phram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/phram.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> /**</div><div class='ctx'>  * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) ????		Jochen Schäuble &lt;psionic@psionic.de&gt;</div><div class='del'>- * Copyright (c) 2003-2004	Jörn Engel &lt;joern@wh.fh-wedel.de&gt;</div><div class='add'>+ * Copyright (c) ????		Jochen Schäuble &lt;psionic@psionic.de&gt;</div><div class='add'>+ * Copyright (c) 2003-2004	Jörn Engel &lt;joern@wh.fh-wedel.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Usage:</div><div class='ctx'>  *</div><div class='hunk'>@@ -142,7 +142,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)</div><div class='ctx'> </div><div class='ctx'> 	new-&gt;mtd.name = name;</div><div class='ctx'> 	new-&gt;mtd.size = len;</div><div class='del'>-	new-&gt;mtd.flags = MTD_CAP_RAM | MTD_ERASEABLE | MTD_VOLATILE;</div><div class='add'>+	new-&gt;mtd.flags = MTD_CAP_RAM;</div><div class='ctx'>         new-&gt;mtd.erase = phram_erase;</div><div class='ctx'> 	new-&gt;mtd.point = phram_point;</div><div class='ctx'> 	new-&gt;mtd.unpoint = phram_unpoint;</div><div class='hunk'>@@ -151,6 +151,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)</div><div class='ctx'> 	new-&gt;mtd.owner = THIS_MODULE;</div><div class='ctx'> 	new-&gt;mtd.type = MTD_RAM;</div><div class='ctx'> 	new-&gt;mtd.erasesize = PAGE_SIZE;</div><div class='add'>+	new-&gt;mtd.writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	ret = -EAGAIN;</div><div class='ctx'> 	if (add_mtd_device(&amp;new-&gt;mtd)) {</div><div class='hunk'>@@ -266,12 +267,16 @@ static int phram_setup(const char *val, struct kernel_param *kp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = parse_num32(&amp;start, token[1]);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(name);</div><div class='ctx'> 		parse_err("illegal start address\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = parse_num32(&amp;len, token[2]);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(name);</div><div class='ctx'> 		parse_err("illegal device length\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	register_device(name, start, len);</div><div class='ctx'> </div><div class='hunk'>@@ -296,5 +301,5 @@ module_init(init_phram);</div><div class='ctx'> module_exit(cleanup_phram);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Jörn Engel &lt;joern@wh.fh-wedel.de&gt;");</div><div class='add'>+MODULE_AUTHOR("Jörn Engel &lt;joern@wh.fh-wedel.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MTD driver for physical RAM");</div><div class='head'>diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c<br/>index 666cce1bf60c..6f9bbf6fee4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/pmc551.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/pmc551.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/pmc551.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/pmc551.c</a></div><div class='hunk'>@@ -82,7 +82,6 @@</div><div class='ctx'>  *       * Comb the init routine.  It's still a bit cludgy on a few things.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -551,11 +550,11 @@ static u32 fixup_pmc551 (struct pci_dev *dev)</div><div class='ctx'>         /*</div><div class='ctx'>          * Some screen fun</div><div class='ctx'>          */</div><div class='del'>-        printk(KERN_DEBUG "pmc551: %d%c (0x%x) of %sprefetchable memory at 0x%lx\n",</div><div class='add'>+        printk(KERN_DEBUG "pmc551: %d%c (0x%x) of %sprefetchable memory at 0x%llx\n",</div><div class='ctx'> 	       (size&lt;1024)?size:(size&lt;1048576)?size&gt;&gt;10:size&gt;&gt;20,</div><div class='ctx'>                (size&lt;1024)?'B':(size&lt;1048576)?'K':'M',</div><div class='ctx'> 	       size, ((dcmd&amp;(0x1&lt;&lt;3)) == 0)?"non-":"",</div><div class='del'>-               (dev-&gt;resource[0].start)&amp;PCI_BASE_ADDRESS_MEM_MASK );</div><div class='add'>+               (unsigned long long)((dev-&gt;resource[0].start)&amp;PCI_BASE_ADDRESS_MEM_MASK));</div><div class='ctx'> </div><div class='ctx'>         /*</div><div class='ctx'>          * Check to see the state of the memory</div><div class='hunk'>@@ -685,8 +684,8 @@ static int __init init_pmc551(void)</div><div class='ctx'>                         break;</div><div class='ctx'>                 }</div><div class='ctx'> </div><div class='del'>-                printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%lX\n",</div><div class='del'>-				    PCI_Device-&gt;resource[0].start);</div><div class='add'>+                printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%llx\n",</div><div class='add'>+				    (unsigned long long)PCI_Device-&gt;resource[0].start);</div><div class='ctx'> </div><div class='ctx'>                 /*</div><div class='ctx'>                  * The PMC551 device acts VERY weird if you don't init it</div><div class='hunk'>@@ -778,7 +777,8 @@ static int __init init_pmc551(void)</div><div class='ctx'>                 mtd-&gt;type 	= MTD_RAM;</div><div class='ctx'>                 mtd-&gt;name 	= "PMC551 RAM board";</div><div class='ctx'>                 mtd-&gt;erasesize 	= 0x10000;</div><div class='del'>-		mtd-&gt;owner = THIS_MODULE;</div><div class='add'>+                mtd-&gt;writesize  = 1;</div><div class='add'>+                mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'>                 if (add_mtd_device(mtd)) {</div><div class='ctx'>                         printk(KERN_NOTICE "pmc551: Failed to register new device\n");</div><div class='head'>diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c<br/>index 6faee6c6958c..542a0c009006 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/devices/slram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/devices/slram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/devices/slram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/devices/slram.c</a></div><div class='hunk'>@@ -200,8 +200,7 @@ static int register_device(char *name, unsigned long start, unsigned long length</div><div class='ctx'> </div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;name = name;</div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;size = length;</div><div class='del'>-	(*curmtd)-&gt;mtdinfo-&gt;flags = MTD_CLEAR_BITS | MTD_SET_BITS |</div><div class='del'>-					MTD_WRITEB_WRITEABLE | MTD_VOLATILE | MTD_CAP_RAM;</div><div class='add'>+	(*curmtd)-&gt;mtdinfo-&gt;flags = MTD_CAP_RAM;</div><div class='ctx'>         (*curmtd)-&gt;mtdinfo-&gt;erase = slram_erase;</div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;point = slram_point;</div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;unpoint = slram_unpoint;</div><div class='hunk'>@@ -210,6 +209,7 @@ static int register_device(char *name, unsigned long start, unsigned long length</div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;type = MTD_RAM;</div><div class='ctx'> 	(*curmtd)-&gt;mtdinfo-&gt;erasesize = SLRAM_BLK_SZ;</div><div class='add'>+	(*curmtd)-&gt;mtdinfo-&gt;writesize = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (add_mtd_device((*curmtd)-&gt;mtdinfo))	{</div><div class='ctx'> 		E("slram: Failed to register new device\n");</div><div class='head'>diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c<br/>index a3b92479719d..4116535805f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/inftlcore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/inftlcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/inftlcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/inftlcore.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -36,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nftl.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/inftl.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -79,14 +79,12 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)</div><div class='ctx'> 	inftl-&gt;mbd.devnum = -1;</div><div class='ctx'> 	inftl-&gt;mbd.blksize = 512;</div><div class='ctx'> 	inftl-&gt;mbd.tr = tr;</div><div class='del'>-	memcpy(&amp;inftl-&gt;oobinfo, &amp;mtd-&gt;oobinfo, sizeof(struct nand_oobinfo));</div><div class='del'>-	inftl-&gt;oobinfo.useecc = MTD_NANDECC_PLACEONLY;</div><div class='ctx'> </div><div class='del'>-        if (INFTL_mount(inftl) &lt; 0) {</div><div class='add'>+	if (INFTL_mount(inftl) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "INFTL: could not mount device\n");</div><div class='ctx'> 		kfree(inftl);</div><div class='ctx'> 		return;</div><div class='del'>-        }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* OK, it's a new one. Set up all the data structures. */</div><div class='ctx'> </div><div class='hunk'>@@ -152,6 +150,69 @@ static void inftl_remove_dev(struct mtd_blktrans_dev *dev)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Read oob data from flash</div><div class='add'>+ */</div><div class='add'>+int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+		   size_t *retlen, uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = offs &amp; (mtd-&gt;writesize - 1);</div><div class='add'>+	ops.ooblen = len;</div><div class='add'>+	ops.oobbuf = buf;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	res = mtd-&gt;read_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write oob data to flash</div><div class='add'>+ */</div><div class='add'>+int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+		    size_t *retlen, uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = offs &amp; (mtd-&gt;writesize - 1);</div><div class='add'>+	ops.ooblen = len;</div><div class='add'>+	ops.oobbuf = buf;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	res = mtd-&gt;write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write data and oob to flash</div><div class='add'>+ */</div><div class='add'>+static int inftl_write(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+		       size_t *retlen, uint8_t *buf, uint8_t *oob)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = offs;</div><div class='add'>+	ops.ooblen = mtd-&gt;oobsize;</div><div class='add'>+	ops.oobbuf = oob;</div><div class='add'>+	ops.datbuf = buf;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	res = mtd-&gt;write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * INFTL_findfreeblock: Find a free Erase Unit on the INFTL partition.</div><div class='ctx'>  *	This function is used when the give Virtual Unit Chain.</div><div class='ctx'>  */</div><div class='hunk'>@@ -198,10 +259,11 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned</div><div class='ctx'> 	u16 BlockMap[MAX_SECTORS_PER_UNIT];</div><div class='ctx'> 	unsigned char BlockDeleted[MAX_SECTORS_PER_UNIT];</div><div class='ctx'> 	unsigned int thisEUN, prevEUN, status;</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	int block, silly;</div><div class='ctx'> 	unsigned int targetEUN;</div><div class='ctx'> 	struct inftl_oob oob;</div><div class='del'>-        size_t retlen;</div><div class='add'>+	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"</div><div class='ctx'> 		"pending=%d)\n", inftl, thisVUC, pendingblock);</div><div class='hunk'>@@ -221,18 +283,18 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned</div><div class='ctx'> 	 * Scan to find the Erase Unit which holds the actual data for each</div><div class='ctx'> 	 * 512-byte block within the Chain.</div><div class='ctx'> 	 */</div><div class='del'>-        silly = MAX_LOOPS;</div><div class='add'>+	silly = MAX_LOOPS;</div><div class='ctx'> 	while (thisEUN &lt; inftl-&gt;nb_blocks) {</div><div class='ctx'> 		for (block = 0; block &lt; inftl-&gt;EraseSize/SECTORSIZE; block ++) {</div><div class='ctx'> 			if ((BlockMap[block] != 0xffff) || BlockDeleted[block])</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (MTD_READOOB(inftl-&gt;mbd.mtd, (thisEUN * inftl-&gt;EraseSize)</div><div class='del'>-			     + (block * SECTORSIZE), 16 , &amp;retlen,</div><div class='del'>-			     (char *)&amp;oob) &lt; 0)</div><div class='add'>+			if (inftl_read_oob(mtd, (thisEUN * inftl-&gt;EraseSize)</div><div class='add'>+					   + (block * SECTORSIZE), 16, &amp;retlen,</div><div class='add'>+					   (char *)&amp;oob) &lt; 0)</div><div class='ctx'> 				status = SECTOR_IGNORE;</div><div class='ctx'> 			else</div><div class='del'>-                        	status = oob.b.Status | oob.b.Status1;</div><div class='add'>+				status = oob.b.Status | oob.b.Status1;</div><div class='ctx'> </div><div class='ctx'> 			switch(status) {</div><div class='ctx'> 			case SECTOR_FREE:</div><div class='hunk'>@@ -282,29 +344,31 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-                /*</div><div class='add'>+		/*</div><div class='ctx'> 		 * Copy only in non free block (free blocks can only</div><div class='ctx'>                  * happen in case of media errors or deleted blocks).</div><div class='ctx'> 		 */</div><div class='del'>-                if (BlockMap[block] == BLOCK_NIL)</div><div class='del'>-                        continue;</div><div class='del'>-</div><div class='del'>-                ret = MTD_READ(inftl-&gt;mbd.mtd, (inftl-&gt;EraseSize *</div><div class='del'>-			BlockMap[block]) + (block * SECTORSIZE), SECTORSIZE,</div><div class='del'>-			&amp;retlen, movebuf);</div><div class='del'>-                if (ret &lt; 0) {</div><div class='del'>-			ret = MTD_READ(inftl-&gt;mbd.mtd, (inftl-&gt;EraseSize *</div><div class='del'>-				BlockMap[block]) + (block * SECTORSIZE),</div><div class='del'>-				SECTORSIZE, &amp;retlen, movebuf);</div><div class='add'>+		if (BlockMap[block] == BLOCK_NIL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = mtd-&gt;read(mtd, (inftl-&gt;EraseSize * BlockMap[block]) +</div><div class='add'>+				(block * SECTORSIZE), SECTORSIZE, &amp;retlen,</div><div class='add'>+				movebuf);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EUCLEAN) {</div><div class='add'>+			ret = mtd-&gt;read(mtd,</div><div class='add'>+					(inftl-&gt;EraseSize * BlockMap[block]) +</div><div class='add'>+					(block * SECTORSIZE), SECTORSIZE,</div><div class='add'>+					&amp;retlen, movebuf);</div><div class='ctx'> 			if (ret != -EIO)</div><div class='del'>-                        	DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "</div><div class='del'>-					"away on retry?\n");</div><div class='del'>-                }</div><div class='del'>-                memset(&amp;oob, 0xff, sizeof(struct inftl_oob));</div><div class='del'>-                oob.b.Status = oob.b.Status1 = SECTOR_USED;</div><div class='del'>-                MTD_WRITEECC(inftl-&gt;mbd.mtd, (inftl-&gt;EraseSize * targetEUN) +</div><div class='del'>-			(block * SECTORSIZE), SECTORSIZE, &amp;retlen,</div><div class='del'>-			movebuf, (char *)&amp;oob, &amp;inftl-&gt;oobinfo);</div><div class='add'>+				DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "</div><div class='add'>+				      "away on retry?\n");</div><div class='add'>+		}</div><div class='add'>+		memset(&amp;oob, 0xff, sizeof(struct inftl_oob));</div><div class='add'>+		oob.b.Status = oob.b.Status1 = SECTOR_USED;</div><div class='add'>+</div><div class='add'>+		inftl_write(inftl-&gt;mbd.mtd, (inftl-&gt;EraseSize * targetEUN) +</div><div class='add'>+			    (block * SECTORSIZE), SECTORSIZE, &amp;retlen,</div><div class='add'>+			    movebuf, (char *)&amp;oob);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -329,17 +393,17 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned</div><div class='ctx'> 		if (thisEUN == targetEUN)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-                if (INFTL_formatblock(inftl, thisEUN) &lt; 0) {</div><div class='add'>+		if (INFTL_formatblock(inftl, thisEUN) &lt; 0) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Could not erase : mark block as reserved.</div><div class='ctx'> 			 */</div><div class='ctx'> 			inftl-&gt;PUtable[thisEUN] = BLOCK_RESERVED;</div><div class='del'>-                } else {</div><div class='add'>+		} else {</div><div class='ctx'> 			/* Correctly erased : mark it as free */</div><div class='ctx'> 			inftl-&gt;PUtable[thisEUN] = BLOCK_FREE;</div><div class='ctx'> 			inftl-&gt;PUtable[prevEUN] = BLOCK_NIL;</div><div class='ctx'> 			inftl-&gt;numfreeEUNs++;</div><div class='del'>-                }</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return targetEUN;</div><div class='hunk'>@@ -415,6 +479,7 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)</div><div class='ctx'> 	unsigned int thisVUC = block / (inftl-&gt;EraseSize / SECTORSIZE);</div><div class='ctx'> 	unsigned int thisEUN, writeEUN, prev_block, status;</div><div class='ctx'> 	unsigned long blockofs = (block * SECTORSIZE) &amp; (inftl-&gt;EraseSize -1);</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	struct inftl_oob oob;</div><div class='ctx'> 	struct inftl_bci bci;</div><div class='ctx'> 	unsigned char anac, nacs, parity;</div><div class='hunk'>@@ -434,10 +499,10 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)</div><div class='ctx'> 		silly = MAX_LOOPS;</div><div class='ctx'> </div><div class='ctx'> 		while (thisEUN &lt;= inftl-&gt;lastEUN) {</div><div class='del'>-			MTD_READOOB(inftl-&gt;mbd.mtd, (thisEUN * inftl-&gt;EraseSize) +</div><div class='del'>-				blockofs, 8, &amp;retlen, (char *)&amp;bci);</div><div class='add'>+			inftl_read_oob(mtd, (thisEUN * inftl-&gt;EraseSize) +</div><div class='add'>+				       blockofs, 8, &amp;retlen, (char *)&amp;bci);</div><div class='ctx'> </div><div class='del'>-                        status = bci.Status | bci.Status1;</div><div class='add'>+			status = bci.Status | bci.Status1;</div><div class='ctx'> 			DEBUG(MTD_DEBUG_LEVEL3, "INFTL: status of block %d in "</div><div class='ctx'> 				"EUN %d is %x\n", block , writeEUN, status);</div><div class='ctx'> </div><div class='hunk'>@@ -522,8 +587,8 @@ hitused:</div><div class='ctx'> 		nacs = 0;</div><div class='ctx'> 		thisEUN = inftl-&gt;VUtable[thisVUC];</div><div class='ctx'> 		if (thisEUN != BLOCK_NIL) {</div><div class='del'>-			MTD_READOOB(inftl-&gt;mbd.mtd, thisEUN * inftl-&gt;EraseSize</div><div class='del'>-				+ 8, 8, &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+			inftl_read_oob(mtd, thisEUN * inftl-&gt;EraseSize</div><div class='add'>+				       + 8, 8, &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> 			anac = oob.u.a.ANAC + 1;</div><div class='ctx'> 			nacs = oob.u.a.NACs + 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -544,8 +609,8 @@ hitused:</div><div class='ctx'> 		oob.u.a.parityPerField = parity;</div><div class='ctx'> 		oob.u.a.discarded = 0xaa;</div><div class='ctx'> </div><div class='del'>-		MTD_WRITEOOB(inftl-&gt;mbd.mtd, writeEUN * inftl-&gt;EraseSize + 8, 8,</div><div class='del'>-			&amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+		inftl_write_oob(mtd, writeEUN * inftl-&gt;EraseSize + 8, 8,</div><div class='add'>+				&amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> </div><div class='ctx'> 		/* Also back up header... */</div><div class='ctx'> 		oob.u.b.virtualUnitNo = cpu_to_le16(thisVUC);</div><div class='hunk'>@@ -555,8 +620,8 @@ hitused:</div><div class='ctx'> 		oob.u.b.parityPerField = parity;</div><div class='ctx'> 		oob.u.b.discarded = 0xaa;</div><div class='ctx'> </div><div class='del'>-		MTD_WRITEOOB(inftl-&gt;mbd.mtd, writeEUN * inftl-&gt;EraseSize +</div><div class='del'>-			SECTORSIZE * 4 + 8, 8, &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+		inftl_write_oob(mtd, writeEUN * inftl-&gt;EraseSize +</div><div class='add'>+				SECTORSIZE * 4 + 8, 8, &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> </div><div class='ctx'> 		inftl-&gt;PUtable[writeEUN] = inftl-&gt;VUtable[thisVUC];</div><div class='ctx'> 		inftl-&gt;VUtable[thisVUC] = writeEUN;</div><div class='hunk'>@@ -576,6 +641,7 @@ hitused:</div><div class='ctx'>  */</div><div class='ctx'> static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)</div><div class='ctx'> {</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	unsigned char BlockUsed[MAX_SECTORS_PER_UNIT];</div><div class='ctx'> 	unsigned char BlockDeleted[MAX_SECTORS_PER_UNIT];</div><div class='ctx'> 	unsigned int thisEUN, status;</div><div class='hunk'>@@ -606,9 +672,9 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)</div><div class='ctx'> 			if (BlockUsed[block] || BlockDeleted[block])</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if (MTD_READOOB(inftl-&gt;mbd.mtd, (thisEUN * inftl-&gt;EraseSize)</div><div class='del'>-			    + (block * SECTORSIZE), 8 , &amp;retlen,</div><div class='del'>-			    (char *)&amp;bci) &lt; 0)</div><div class='add'>+			if (inftl_read_oob(mtd, (thisEUN * inftl-&gt;EraseSize)</div><div class='add'>+					   + (block * SECTORSIZE), 8 , &amp;retlen,</div><div class='add'>+					  (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 				status = SECTOR_IGNORE;</div><div class='ctx'> 			else</div><div class='ctx'> 				status = bci.Status | bci.Status1;</div><div class='hunk'>@@ -670,12 +736,12 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)</div><div class='ctx'> 		DEBUG(MTD_DEBUG_LEVEL3, "Deleting EUN %d from VUC %d\n",</div><div class='ctx'> 		      thisEUN, thisVUC);</div><div class='ctx'> </div><div class='del'>-                if (INFTL_formatblock(inftl, thisEUN) &lt; 0) {</div><div class='add'>+		if (INFTL_formatblock(inftl, thisEUN) &lt; 0) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Could not erase : mark block as reserved.</div><div class='ctx'> 			 */</div><div class='ctx'> 			inftl-&gt;PUtable[thisEUN] = BLOCK_RESERVED;</div><div class='del'>-                } else {</div><div class='add'>+		} else {</div><div class='ctx'> 			/* Correctly erased : mark it as free */</div><div class='ctx'> 			inftl-&gt;PUtable[thisEUN] = BLOCK_FREE;</div><div class='ctx'> 			inftl-&gt;numfreeEUNs++;</div><div class='hunk'>@@ -697,6 +763,7 @@ static int INFTL_deleteblock(struct INFTLrecord *inftl, unsigned block)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int thisEUN = inftl-&gt;VUtable[block / (inftl-&gt;EraseSize / SECTORSIZE)];</div><div class='ctx'> 	unsigned long blockofs = (block * SECTORSIZE) &amp; (inftl-&gt;EraseSize - 1);</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> 	int silly = MAX_LOOPS;</div><div class='ctx'> 	size_t retlen;</div><div class='hunk'>@@ -706,8 +773,8 @@ static int INFTL_deleteblock(struct INFTLrecord *inftl, unsigned block)</div><div class='ctx'> 		"block=%d)\n", inftl, block);</div><div class='ctx'> </div><div class='ctx'> 	while (thisEUN &lt; inftl-&gt;nb_blocks) {</div><div class='del'>-		if (MTD_READOOB(inftl-&gt;mbd.mtd, (thisEUN * inftl-&gt;EraseSize) +</div><div class='del'>-		    blockofs, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='add'>+		if (inftl_read_oob(mtd, (thisEUN * inftl-&gt;EraseSize) +</div><div class='add'>+				   blockofs, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 			status = SECTOR_IGNORE;</div><div class='ctx'> 		else</div><div class='ctx'> 			status = bci.Status | bci.Status1;</div><div class='hunk'>@@ -741,10 +808,10 @@ foundit:</div><div class='ctx'> 	if (thisEUN != BLOCK_NIL) {</div><div class='ctx'> 		loff_t ptr = (thisEUN * inftl-&gt;EraseSize) + blockofs;</div><div class='ctx'> </div><div class='del'>-		if (MTD_READOOB(inftl-&gt;mbd.mtd, ptr, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='add'>+		if (inftl_read_oob(mtd, ptr, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		bci.Status = bci.Status1 = SECTOR_DELETED;</div><div class='del'>-		if (MTD_WRITEOOB(inftl-&gt;mbd.mtd, ptr, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='add'>+		if (inftl_write_oob(mtd, ptr, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		INFTL_trydeletechain(inftl, block / (inftl-&gt;EraseSize / SECTORSIZE));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -784,9 +851,10 @@ static int inftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> </div><div class='ctx'> 		memset(&amp;oob, 0xff, sizeof(struct inftl_oob));</div><div class='ctx'> 		oob.b.Status = oob.b.Status1 = SECTOR_USED;</div><div class='del'>-		MTD_WRITEECC(inftl-&gt;mbd.mtd, (writeEUN * inftl-&gt;EraseSize) +</div><div class='del'>-			blockofs, SECTORSIZE, &amp;retlen, (char *)buffer,</div><div class='del'>-			(char *)&amp;oob, &amp;inftl-&gt;oobinfo);</div><div class='add'>+</div><div class='add'>+		inftl_write(inftl-&gt;mbd.mtd, (writeEUN * inftl-&gt;EraseSize) +</div><div class='add'>+			    blockofs, SECTORSIZE, &amp;retlen, (char *)buffer,</div><div class='add'>+			    (char *)&amp;oob);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * need to write SECTOR_USED flags since they are not written</div><div class='ctx'> 		 * in mtd_writeecc</div><div class='hunk'>@@ -804,17 +872,18 @@ static int inftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> 	struct INFTLrecord *inftl = (void *)mbd;</div><div class='ctx'> 	unsigned int thisEUN = inftl-&gt;VUtable[block / (inftl-&gt;EraseSize / SECTORSIZE)];</div><div class='ctx'> 	unsigned long blockofs = (block * SECTORSIZE) &amp; (inftl-&gt;EraseSize - 1);</div><div class='del'>-        unsigned int status;</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='add'>+	unsigned int status;</div><div class='ctx'> 	int silly = MAX_LOOPS;</div><div class='del'>-        struct inftl_bci bci;</div><div class='add'>+	struct inftl_bci bci;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: inftl_readblock(inftl=%p,block=%ld,"</div><div class='ctx'> 		"buffer=%p)\n", inftl, block, buffer);</div><div class='ctx'> </div><div class='ctx'> 	while (thisEUN &lt; inftl-&gt;nb_blocks) {</div><div class='del'>-		if (MTD_READOOB(inftl-&gt;mbd.mtd, (thisEUN * inftl-&gt;EraseSize) +</div><div class='del'>-		     blockofs, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='add'>+		if (inftl_read_oob(mtd, (thisEUN * inftl-&gt;EraseSize) +</div><div class='add'>+				  blockofs, 8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 			status = SECTOR_IGNORE;</div><div class='ctx'> 		else</div><div class='ctx'> 			status = bci.Status | bci.Status1;</div><div class='hunk'>@@ -850,10 +919,12 @@ foundit:</div><div class='ctx'> 		/* The requested block is not on the media, return all 0x00 */</div><div class='ctx'> 		memset(buffer, 0, SECTORSIZE);</div><div class='ctx'> 	} else {</div><div class='del'>-        	size_t retlen;</div><div class='add'>+		size_t retlen;</div><div class='ctx'> 		loff_t ptr = (thisEUN * inftl-&gt;EraseSize) + blockofs;</div><div class='del'>-		if (MTD_READ(inftl-&gt;mbd.mtd, ptr, SECTORSIZE, &amp;retlen,</div><div class='del'>-		    buffer))</div><div class='add'>+		int ret = mtd-&gt;read(mtd, ptr, SECTORSIZE, &amp;retlen, buffer);</div><div class='add'>+</div><div class='add'>+		/* Handle corrected bit flips gracefully */</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EUCLEAN)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c<br/>index 43fdc9433882..8f6006f1a519 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/inftlmount.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/inftlmount.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/inftlmount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/inftlmount.c</a></div><div class='hunk'>@@ -43,6 +43,11 @@</div><div class='ctx'> </div><div class='ctx'> char inftlmountrev[]="$Revision: 1.18 $";</div><div class='ctx'> </div><div class='add'>+extern int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+			  size_t *retlen, uint8_t *buf);</div><div class='add'>+extern int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+			   size_t *retlen, uint8_t *buf);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * find_boot_record: Find the INFTL Media Header and its Spare copy which</div><div class='ctx'>  *	contains the various device information of the INFTL partition and</div><div class='hunk'>@@ -57,6 +62,7 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 	unsigned int i, block;</div><div class='ctx'> 	u8 buf[SECTORSIZE];</div><div class='ctx'> 	struct INFTLMediaHeader *mh = &amp;inftl-&gt;MediaHdr;</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	struct INFTLPartition *ip;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='hunk'>@@ -80,8 +86,8 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 		 * Check for BNAND header first. Then whinge if it's found</div><div class='ctx'> 		 * but later checks fail.</div><div class='ctx'> 		 */</div><div class='del'>-		ret = MTD_READ(inftl-&gt;mbd.mtd, block * inftl-&gt;EraseSize,</div><div class='del'>-		    SECTORSIZE, &amp;retlen, buf);</div><div class='add'>+		ret = mtd-&gt;read(mtd, block * inftl-&gt;EraseSize,</div><div class='add'>+				SECTORSIZE, &amp;retlen, buf);</div><div class='ctx'> 		/* We ignore ret in case the ECC of the MediaHeader is invalid</div><div class='ctx'> 		   (which is apparently acceptable) */</div><div class='ctx'> 		if (retlen != SECTORSIZE) {</div><div class='hunk'>@@ -106,8 +112,9 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* To be safer with BIOS, also use erase mark as discriminant */</div><div class='del'>-		if ((ret = MTD_READOOB(inftl-&gt;mbd.mtd, block * inftl-&gt;EraseSize +</div><div class='del'>-		    SECTORSIZE + 8, 8, &amp;retlen, (char *)&amp;h1) &lt; 0)) {</div><div class='add'>+		if ((ret = inftl_read_oob(mtd, block * inftl-&gt;EraseSize +</div><div class='add'>+					  SECTORSIZE + 8, 8, &amp;retlen,</div><div class='add'>+					  (char *)&amp;h1) &lt; 0)) {</div><div class='ctx'> 			printk(KERN_WARNING "INFTL: ANAND header found at "</div><div class='ctx'> 				"0x%x in mtd%d, but OOB data read failed "</div><div class='ctx'> 				"(err %d)\n", block * inftl-&gt;EraseSize,</div><div class='hunk'>@@ -123,8 +130,8 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 		memcpy(mh, buf, sizeof(struct INFTLMediaHeader));</div><div class='ctx'> </div><div class='ctx'> 		/* Read the spare media header at offset 4096 */</div><div class='del'>-		MTD_READ(inftl-&gt;mbd.mtd, block * inftl-&gt;EraseSize + 4096,</div><div class='del'>-		    SECTORSIZE, &amp;retlen, buf);</div><div class='add'>+		mtd-&gt;read(mtd, block * inftl-&gt;EraseSize + 4096,</div><div class='add'>+			  SECTORSIZE, &amp;retlen, buf);</div><div class='ctx'> 		if (retlen != SECTORSIZE) {</div><div class='ctx'> 			printk(KERN_WARNING "INFTL: Unable to read spare "</div><div class='ctx'> 			       "Media Header\n");</div><div class='hunk'>@@ -233,7 +240,7 @@ static int find_boot_record(struct INFTLrecord *inftl)</div><div class='ctx'> 				 */</div><div class='ctx'> 				instr-&gt;addr = ip-&gt;Reserved0 * inftl-&gt;EraseSize;</div><div class='ctx'> 				instr-&gt;len = inftl-&gt;EraseSize;</div><div class='del'>-				MTD_ERASE(inftl-&gt;mbd.mtd, instr);</div><div class='add'>+				mtd-&gt;erase(mtd, instr);</div><div class='ctx'> 			}</div><div class='ctx'> 			if ((ip-&gt;lastUnit - ip-&gt;firstUnit + 1) &lt; ip-&gt;virtualUnits) {</div><div class='ctx'> 				printk(KERN_WARNING "INFTL: Media Header "</div><div class='hunk'>@@ -350,21 +357,21 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,</div><div class='ctx'> 	int len, int check_oob)</div><div class='ctx'> {</div><div class='ctx'> 	u8 buf[SECTORSIZE + inftl-&gt;mbd.mtd-&gt;oobsize];</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: check_free_sectors(inftl=%p,"</div><div class='del'>-		"address=0x%x,len=%d,check_oob=%d)\n", inftl,</div><div class='del'>-		address, len, check_oob);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; len; i += SECTORSIZE) {</div><div class='del'>-		if (MTD_READECC(inftl-&gt;mbd.mtd, address, SECTORSIZE, &amp;retlen, buf, &amp;buf[SECTORSIZE], &amp;inftl-&gt;oobinfo) &lt; 0)</div><div class='add'>+		if (mtd-&gt;read(mtd, address, SECTORSIZE, &amp;retlen, buf))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		if (memcmpb(buf, 0xff, SECTORSIZE) != 0)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='ctx'> 		if (check_oob) {</div><div class='del'>-			if (memcmpb(buf + SECTORSIZE, 0xff, inftl-&gt;mbd.mtd-&gt;oobsize) != 0)</div><div class='add'>+			if(inftl_read_oob(mtd, address, mtd-&gt;oobsize,</div><div class='add'>+					  &amp;retlen, &amp;buf[SECTORSIZE]) &lt; 0)</div><div class='add'>+				return -1;</div><div class='add'>+			if (memcmpb(buf + SECTORSIZE, 0xff, mtd-&gt;oobsize) != 0)</div><div class='ctx'> 				return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		address += SECTORSIZE;</div><div class='hunk'>@@ -387,6 +394,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	struct inftl_unittail uci;</div><div class='ctx'> 	struct erase_info *instr = &amp;inftl-&gt;instr;</div><div class='add'>+	struct mtd_info *mtd = inftl-&gt;mbd.mtd;</div><div class='ctx'> 	int physblock;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_formatblock(inftl=%p,"</div><div class='hunk'>@@ -404,8 +412,9 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)</div><div class='ctx'> 	/* Erase one physical eraseblock at a time, even though the NAND api</div><div class='ctx'> 	   allows us to group them.  This way we if we have a failure, we can</div><div class='ctx'> 	   mark only the failed block in the bbt. */</div><div class='del'>-	for (physblock = 0; physblock &lt; inftl-&gt;EraseSize; physblock += instr-&gt;len, instr-&gt;addr += instr-&gt;len) {</div><div class='del'>-		MTD_ERASE(inftl-&gt;mbd.mtd, instr);</div><div class='add'>+	for (physblock = 0; physblock &lt; inftl-&gt;EraseSize;</div><div class='add'>+	     physblock += instr-&gt;len, instr-&gt;addr += instr-&gt;len) {</div><div class='add'>+		mtd-&gt;erase(inftl-&gt;mbd.mtd, instr);</div><div class='ctx'> </div><div class='ctx'> 		if (instr-&gt;state == MTD_ERASE_FAILED) {</div><div class='ctx'> 			printk(KERN_WARNING "INFTL: error while formatting block %d\n",</div><div class='hunk'>@@ -414,10 +423,10 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-	 	* Check the "freeness" of Erase Unit before updating metadata.</div><div class='del'>-	 	* FixMe: is this check really necessary? Since we have check the</div><div class='del'>-	 	*        return code after the erase operation.</div><div class='del'>-	 	*/</div><div class='add'>+		 * Check the "freeness" of Erase Unit before updating metadata.</div><div class='add'>+		 * FixMe: is this check really necessary? Since we have check</div><div class='add'>+		 * the return code after the erase operation.</div><div class='add'>+		 */</div><div class='ctx'> 		if (check_free_sectors(inftl, instr-&gt;addr, instr-&gt;len, 1) != 0)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -429,8 +438,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)</div><div class='ctx'> 	uci.Reserved[2] = 0;</div><div class='ctx'> 	uci.Reserved[3] = 0;</div><div class='ctx'> 	instr-&gt;addr = block * inftl-&gt;EraseSize + SECTORSIZE * 2;</div><div class='del'>-	if (MTD_WRITEOOB(inftl-&gt;mbd.mtd, instr-&gt;addr +</div><div class='del'>-	    8, 8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='add'>+	if (inftl_write_oob(mtd, instr-&gt;addr + 8, 8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	return 0;</div><div class='ctx'> fail:</div><div class='hunk'>@@ -549,6 +557,7 @@ void INFTL_dumpVUchains(struct INFTLrecord *s)</div><div class='ctx'> </div><div class='ctx'> int INFTL_mount(struct INFTLrecord *s)</div><div class='ctx'> {</div><div class='add'>+	struct mtd_info *mtd = s-&gt;mbd.mtd;</div><div class='ctx'> 	unsigned int block, first_block, prev_block, last_block;</div><div class='ctx'> 	unsigned int first_logical_block, logical_block, erase_mark;</div><div class='ctx'> 	int chain_length, do_format_chain;</div><div class='hunk'>@@ -607,10 +616,11 @@ int INFTL_mount(struct INFTLrecord *s)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (MTD_READOOB(s-&gt;mbd.mtd, block * s-&gt;EraseSize + 8,</div><div class='del'>-			    8, &amp;retlen, (char *)&amp;h0) &lt; 0 ||</div><div class='del'>-			    MTD_READOOB(s-&gt;mbd.mtd, block * s-&gt;EraseSize +</div><div class='del'>-			    2 * SECTORSIZE + 8, 8, &amp;retlen, (char *)&amp;h1) &lt; 0) {</div><div class='add'>+			if (inftl_read_oob(mtd, block * s-&gt;EraseSize + 8,</div><div class='add'>+					   8, &amp;retlen, (char *)&amp;h0) &lt; 0 ||</div><div class='add'>+			    inftl_read_oob(mtd, block * s-&gt;EraseSize +</div><div class='add'>+					   2 * SECTORSIZE + 8, 8, &amp;retlen,</div><div class='add'>+					   (char *)&amp;h1) &lt; 0) {</div><div class='ctx'> 				/* Should never happen? */</div><div class='ctx'> 				do_format_chain++;</div><div class='ctx'> 				break;</div><div class='head'>diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig<br/>index 7abd7fee0dda..83d0b2a52527 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/Kconfig</a></div><div class='hunk'>@@ -37,7 +37,7 @@ config MTD_PHYSMAP_START</div><div class='ctx'> config MTD_PHYSMAP_LEN</div><div class='ctx'> 	hex "Physical length of flash mapping"</div><div class='ctx'> 	depends on MTD_PHYSMAP</div><div class='del'>-	default "0x4000000"</div><div class='add'>+	default "0"</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the total length of the mapping of the flash chips on</div><div class='ctx'> 	  your particular board. If there is space, or aliases, in the</div><div class='hunk'>@@ -78,7 +78,7 @@ config MTD_PNC2000</div><div class='ctx'> </div><div class='ctx'> config MTD_SC520CDP</div><div class='ctx'> 	tristate "CFI Flash device mapped on AMD SC520 CDP"</div><div class='del'>-	depends on X86 &amp;&amp; MTD_CFI</div><div class='add'>+	depends on X86 &amp;&amp; MTD_CFI &amp;&amp; MTD_CONCAT</div><div class='ctx'> 	help</div><div class='ctx'> 	  The SC520 CDP board has two banks of CFI-compliant chips and one</div><div class='ctx'> 	  Dual-in-line JEDEC chip. This 'mapping' driver supports that</div><div class='hunk'>@@ -109,7 +109,7 @@ config MTD_TS5500</div><div class='ctx'> 	  mtd1 allows you to reprogram your BIOS. BE VERY CAREFUL.</div><div class='ctx'> </div><div class='ctx'> 	  Note that jumper 3 ("Write Enable Drive A") must be set</div><div class='del'>-	  otherwise detection won't succeeed.</div><div class='add'>+	  otherwise detection won't succeed.</div><div class='ctx'> </div><div class='ctx'> config MTD_SBC_GXX</div><div class='ctx'> 	tristate "CFI Flash device mapped on Arcom SBC-GXx boards"</div><div class='hunk'>@@ -200,8 +200,8 @@ config MTD_TSUNAMI</div><div class='ctx'> 	  Support for the flash chip on Tsunami TIG bus.</div><div class='ctx'> </div><div class='ctx'> config MTD_LASAT</div><div class='del'>-	tristate "Flash chips on LASAT board"</div><div class='del'>-	depends on LASAT</div><div class='add'>+	tristate "LASAT flash device"</div><div class='add'>+	depends on LASAT &amp;&amp; MTD_CFI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for the flash chips on the Lasat 100 and 200 boards.</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +212,7 @@ config MTD_NETtel</div><div class='ctx'> 	  Support for flash chips on NETtel/SecureEdge/SnapGear boards.</div><div class='ctx'> </div><div class='ctx'> config MTD_ALCHEMY</div><div class='del'>-	tristate '  AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support'</div><div class='add'>+	tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support"</div><div class='ctx'> 	depends on SOC_AU1X00</div><div class='ctx'> 	help</div><div class='ctx'> 	  Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards</div><div class='hunk'>@@ -561,7 +561,6 @@ config MTD_PCMCIA</div><div class='ctx'> config MTD_PCMCIA_ANONYMOUS</div><div class='ctx'> 	bool "Use PCMCIA MTD drivers for anonymous PCMCIA cards"</div><div class='ctx'> 	depends on MTD_PCMCIA</div><div class='del'>-	default N</div><div class='ctx'> 	help</div><div class='ctx'> 	  If this option is enabled, PCMCIA cards which do not report</div><div class='ctx'> 	  anything about themselves are assumed to be MTD cards.</div><div class='head'>diff --git a/drivers/mtd/maps/alchemy-flash.c b/drivers/mtd/maps/alchemy-flash.c<br/>index b933a2a27b18..7fc8097e41d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/alchemy-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/alchemy-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/alchemy-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/alchemy-flash.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c<br/>index c350878d4592..447955be18af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/amd76xrom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/amd76xrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/amd76xrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/amd76xrom.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/cfi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/flashchip.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -123,9 +122,10 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		window-&gt;rsrc.parent = NULL;</div><div class='ctx'> 		printk(KERN_ERR MOD_NAME</div><div class='ctx'> 			" %s(): Unable to register resource"</div><div class='del'>-			" 0x%.08lx-0x%.08lx - kernel bug?\n",</div><div class='add'>+			" 0x%.16llx-0x%.16llx - kernel bug?\n",</div><div class='ctx'> 			__func__,</div><div class='del'>-			window-&gt;rsrc.start, window-&gt;rsrc.end);</div><div class='add'>+			(unsigned long long)window-&gt;rsrc.start,</div><div class='add'>+			(unsigned long long)window-&gt;rsrc.end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='head'>diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c<br/>index 5a95ab370a97..0402c21e291d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ceiva.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ceiva.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ceiva.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ceiva.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * $Id: ceiva.c,v 1.11 2004/09/16 23:27:12 gleixner Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c<br/>index fd0f0d3187de..92b5d883d7b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/cfi_flagadm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/cfi_flagadm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/cfi_flagadm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/cfi_flagadm.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- *  Copyright © 2001 Flaga hf. Medical Devices, Kári Davíðsson &lt;kd@flaga.is&gt;</div><div class='add'>+ *  Copyright © 2001 Flaga hf. Medical Devices, Kári Davíðsson &lt;kd@flaga.is&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  $Id: cfi_flagadm.c,v 1.15 2005/11/07 11:14:26 gleixner Exp $</div><div class='ctx'>  *</div><div class='hunk'>@@ -135,5 +135,5 @@ module_exit(cleanup_flagadm);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Kári Davíðsson &lt;kd@flaga.is&gt;");</div><div class='add'>+MODULE_AUTHOR("Kári Davíðsson &lt;kd@flaga.is&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MTD map driver for Flaga digital module");</div><div class='head'>diff --git a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c<br/>index a370953c1513..aa56defb94c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/cstm_mips_ixx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/cstm_mips_ixx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/cstm_mips_ixx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/cstm_mips_ixx.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)</div><div class='head'>diff --git a/drivers/mtd/maps/dbox2-flash.c b/drivers/mtd/maps/dbox2-flash.c<br/>index 652813cd6c2d..92a9c7fac993 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dbox2-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dbox2-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dbox2-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/dbox2-flash.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* partition_info gives details on the logical partitions that the split the</div><div class='hunk'>@@ -122,5 +121,5 @@ module_exit(cleanup_dbox2_flash);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Kári Davíðsson &lt;kd@flaga.is&gt;, Bastian Blank &lt;waldi@tuxbox.org&gt;, Alexander Wild &lt;wild@te-elektronik.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Kári Davíðsson &lt;kd@flaga.is&gt;, Bastian Blank &lt;waldi@tuxbox.org&gt;, Alexander Wild &lt;wild@te-elektronik.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("MTD map driver for D-Box 2 board");</div><div class='head'>diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c<br/>index 8b3784e2de89..b32bb9347d71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dc21285.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dc21285.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dc21285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/dc21285.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * $Id: dc21285.c,v 1.24 2005/11/07 11:14:26 gleixner Exp $</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c<br/>index c299d10b33e6..b1104fe1f207 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dilnetpc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dilnetpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dilnetpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/dilnetpc.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * and http://www.ssv-embedded.de/ssv/pc104/p170.htm</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c<br/>index 2bb3c0f0f970..a43c49905cac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dmv182.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/dmv182.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/dmv182.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/dmv182.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c<br/>index 60a6e51d662f..641e1dd8479e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ebony.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ebony.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ebony.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ebony.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ebony.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/edb7312.c b/drivers/mtd/maps/edb7312.c<br/>index b48a3473ffc1..1c5b97c89685 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/edb7312.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/edb7312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/edb7312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/edb7312.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c<br/>index 0667101ccbe1..6dde3182d64a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/h720x-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/h720x-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/h720x-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/h720x-flash.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *     2003 Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c<br/>index ea5073781b3a..db4b570d874a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ichxrom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ichxrom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ichxrom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ichxrom.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/cfi.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/flashchip.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -177,9 +176,10 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		window-&gt;rsrc.parent = NULL;</div><div class='ctx'> 		printk(KERN_DEBUG MOD_NAME</div><div class='ctx'> 			": %s(): Unable to register resource"</div><div class='del'>-			" 0x%.08lx-0x%.08lx - kernel bug?\n",</div><div class='add'>+			" 0x%.16llx-0x%.16llx - kernel bug?\n",</div><div class='ctx'> 			__func__,</div><div class='del'>-			window-&gt;rsrc.start, window-&gt;rsrc.end);</div><div class='add'>+			(unsigned long long)window-&gt;rsrc.start,</div><div class='add'>+			(unsigned long long)window-&gt;rsrc.end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Map the firmware hub into my address space. */</div><div class='head'>diff --git a/drivers/mtd/maps/impa7.c b/drivers/mtd/maps/impa7.c<br/>index ba7f40311a7e..a0b4dc7155dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/impa7.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/impa7.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/impa7.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/impa7.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c<br/>index a3ba52fbd868..c8db01b3e45f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/integrator-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/integrator-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/integrator-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/integrator-flash.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ipaq-flash.c b/drivers/mtd/maps/ipaq-flash.c<br/>index b8ccb0a95789..f27c132794c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ipaq-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ipaq-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ipaq-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ipaq-flash.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * $Id: ipaq-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c<br/>index 2c9cc7f37e92..c26488a1793a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp2000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ixp2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ixp2000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ixp2000.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@ struct ixp2000_flash_info {</div><div class='ctx'> 	struct		map_info map;</div><div class='ctx'> 	struct		mtd_partition *partitions;</div><div class='ctx'> 	struct		resource *res;</div><div class='del'>-	int		nr_banks;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long ofs)</div><div class='hunk'>@@ -183,7 +182,6 @@ static int ixp2000_flash_probe(struct platform_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	info-&gt;map.phys = NO_XIP;</div><div class='ctx'> </div><div class='del'>-	info-&gt;nr_banks = ixp_data-&gt;nr_banks;</div><div class='ctx'> 	info-&gt;map.size = ixp_data-&gt;nr_banks * window_size;</div><div class='ctx'> 	info-&gt;map.bankwidth = 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/maps/l440gx.c b/drivers/mtd/maps/l440gx.c<br/>index 851bf9576052..6b784ef5ee70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/l440gx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/l440gx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/l440gx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/l440gx.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PIIXE_IOBASE_RESOURCE	11</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/maps/lasat.c b/drivers/mtd/maps/lasat.c<br/>index c658d4045ef2..1c13d2dc0cdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/lasat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/lasat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/lasat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/lasat.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/lasat/lasat.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *lasat_mtd;</div><div class='head'>diff --git a/drivers/mtd/maps/mpc1211.c b/drivers/mtd/maps/mpc1211.c<br/>index 4685e8e13460..45a00fac88ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/mpc1211.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/mpc1211.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/mpc1211.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/mpc1211.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *flash_mtd;</div><div class='ctx'> static struct mtd_partition *parsed_parts;</div><div class='head'>diff --git a/drivers/mtd/maps/mtx-1_flash.c b/drivers/mtd/maps/mtx-1_flash.c<br/>index d1e66e186746..d884f2be28f6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/mtx-1_flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/mtx-1_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/mtx-1_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/mtx-1_flash.c</a></div><div class='hunk'>@@ -4,11 +4,10 @@</div><div class='ctx'>  * $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 2005 Bruno Randolf &lt;bruno.randolf@4g-systems.biz&gt;</div><div class='del'>- * (C) 2005 Jörn Engel &lt;joern@wohnheim.fh-wedel.de&gt;</div><div class='add'>+ * (C) 2005 Jörn Engel &lt;joern@wohnheim.fh-wedel.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c<br/>index 54a3102ab19a..0994b5b2e331 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/nettel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/nettel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/nettel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/nettel.c</a></div><div class='hunk'>@@ -20,6 +20,8 @@</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/cfi.h&gt;</div><div class='ctx'> #include &lt;linux/reboot.h&gt;</div><div class='add'>+#include &lt;linux/kdev_t.h&gt;</div><div class='add'>+#include &lt;linux/root_dev.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='hunk'>@@ -188,7 +190,7 @@ int nettel_eraseconfig(void)</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		add_wait_queue(&amp;wait_q, &amp;wait);</div><div class='ctx'> </div><div class='del'>-		ret = MTD_ERASE(mtd, &amp;nettel_erase);</div><div class='add'>+		ret = mtd-&gt;erase(mtd, &amp;nettel_erase);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			set_current_state(TASK_RUNNING);</div><div class='ctx'> 			remove_wait_queue(&amp;wait_q, &amp;wait);</div><div class='head'>diff --git a/drivers/mtd/maps/ocotea.c b/drivers/mtd/maps/ocotea.c<br/>index a21fcd195ab4..2f07602ba940 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ocotea.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ocotea.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ocotea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ocotea.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/ibm44x.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/ocotea.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c<br/>index dc3765270057..e6e391efbeb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/omap-toto-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/omap-toto-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/omap-toto-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/omap-toto-flash.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * $Id: omap-toto-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c<br/>index d27f4129afd3..c861134cbc48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/pcmciamtd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/pcmciamtd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/pcmciamtd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/pcmciamtd.c</a></div><div class='hunk'>@@ -713,6 +713,7 @@ static void pcmciamtd_detach(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> 	if(dev-&gt;mtd_info) {</div><div class='ctx'> 		del_mtd_device(dev-&gt;mtd_info);</div><div class='add'>+		map_destroy(dev-&gt;mtd_info);</div><div class='ctx'> 		info("mtd%d: Removed", dev-&gt;mtd_info-&gt;index);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c<br/>index f49ebc3c4606..7799a25a7f2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/physmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/physmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/physmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/physmap.c</a></div><div class='hunk'>@@ -14,112 +14,228 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/physmap.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-static struct mtd_info *mymtd;</div><div class='del'>-</div><div class='del'>-struct map_info physmap_map = {</div><div class='del'>-	.name = "phys_mapped_flash",</div><div class='del'>-	.phys = CONFIG_MTD_PHYSMAP_START,</div><div class='del'>-	.size = CONFIG_MTD_PHYSMAP_LEN,</div><div class='del'>-	.bankwidth = CONFIG_MTD_PHYSMAP_BANKWIDTH,</div><div class='add'>+struct physmap_flash_info {</div><div class='add'>+	struct mtd_info		*mtd;</div><div class='add'>+	struct map_info		map;</div><div class='add'>+	struct resource		*res;</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+	int			nr_parts;</div><div class='add'>+	struct mtd_partition	*parts;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int physmap_flash_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct physmap_flash_info *info;</div><div class='add'>+	struct physmap_flash_data *physmap_data;</div><div class='add'>+</div><div class='add'>+	info = platform_get_drvdata(dev);</div><div class='add'>+	if (info == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	platform_set_drvdata(dev, NULL);</div><div class='add'>+</div><div class='add'>+	physmap_data = dev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;mtd != NULL) {</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='del'>-static struct mtd_partition *mtd_parts;</div><div class='del'>-static int                   mtd_parts_nb;</div><div class='add'>+		if (info-&gt;nr_parts) {</div><div class='add'>+			del_mtd_partitions(info-&gt;mtd);</div><div class='add'>+			kfree(info-&gt;parts);</div><div class='add'>+		} else if (physmap_data-&gt;nr_parts) {</div><div class='add'>+			del_mtd_partitions(info-&gt;mtd);</div><div class='add'>+		} else {</div><div class='add'>+			del_mtd_device(info-&gt;mtd);</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		del_mtd_device(info-&gt;mtd);</div><div class='add'>+#endif</div><div class='add'>+		map_destroy(info-&gt;mtd);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int num_physmap_partitions;</div><div class='del'>-static struct mtd_partition *physmap_partitions;</div><div class='add'>+	if (info-&gt;map.virt != NULL)</div><div class='add'>+		iounmap((void *)info-&gt;map.virt);</div><div class='ctx'> </div><div class='del'>-static const char *part_probes[] __initdata = {"cmdlinepart", "RedBoot", NULL};</div><div class='add'>+	if (info-&gt;res != NULL) {</div><div class='add'>+		release_resource(info-&gt;res);</div><div class='add'>+		kfree(info-&gt;res);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-void physmap_set_partitions(struct mtd_partition *parts, int num_parts)</div><div class='del'>-{</div><div class='del'>-	physmap_partitions=parts;</div><div class='del'>-	num_physmap_partitions=num_parts;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_MTD_PARTITIONS */</div><div class='ctx'> </div><div class='del'>-static int __init init_physmap(void)</div><div class='add'>+static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int physmap_flash_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };</div><div class='del'>-	const char **type;</div><div class='add'>+	struct physmap_flash_data *physmap_data;</div><div class='add'>+	struct physmap_flash_info *info;</div><div class='add'>+	const char **probe_type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	physmap_data = dev-&gt;dev.platform_data;</div><div class='add'>+	if (physmap_data == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+       	printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",</div><div class='add'>+	    (unsigned long long)dev-&gt;resource-&gt;end - dev-&gt;resource-&gt;start + 1,</div><div class='add'>+	    (unsigned long long)dev-&gt;resource-&gt;start);</div><div class='add'>+</div><div class='add'>+	info = kmalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);</div><div class='add'>+	if (info == NULL) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='ctx'> </div><div class='del'>-       	printk(KERN_NOTICE "physmap flash device: %lx at %lx\n", physmap_map.size, physmap_map.phys);</div><div class='del'>-	physmap_map.virt = ioremap(physmap_map.phys, physmap_map.size);</div><div class='add'>+	platform_set_drvdata(dev, info);</div><div class='ctx'> </div><div class='del'>-	if (!physmap_map.virt) {</div><div class='del'>-		printk("Failed to ioremap\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+	info-&gt;res = request_mem_region(dev-&gt;resource-&gt;start,</div><div class='add'>+			dev-&gt;resource-&gt;end - dev-&gt;resource-&gt;start + 1,</div><div class='add'>+			dev-&gt;dev.bus_id);</div><div class='add'>+	if (info-&gt;res == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Could not reserve memory region\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	simple_map_init(&amp;physmap_map);</div><div class='add'>+	info-&gt;map.name = dev-&gt;dev.bus_id;</div><div class='add'>+	info-&gt;map.phys = dev-&gt;resource-&gt;start;</div><div class='add'>+	info-&gt;map.size = dev-&gt;resource-&gt;end - dev-&gt;resource-&gt;start + 1;</div><div class='add'>+	info-&gt;map.bankwidth = physmap_data-&gt;width;</div><div class='add'>+	info-&gt;map.set_vpp = physmap_data-&gt;set_vpp;</div><div class='add'>+</div><div class='add'>+	info-&gt;map.virt = ioremap(info-&gt;map.phys, info-&gt;map.size);</div><div class='add'>+	if (info-&gt;map.virt == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Failed to ioremap flash region\n");</div><div class='add'>+		err = EIO;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mymtd = NULL;</div><div class='del'>-	type = rom_probe_types;</div><div class='del'>-	for(; !mymtd &amp;&amp; *type; type++) {</div><div class='del'>-		mymtd = do_map_probe(*type, &amp;physmap_map);</div><div class='add'>+	simple_map_init(&amp;info-&gt;map);</div><div class='add'>+</div><div class='add'>+	probe_type = rom_probe_types;</div><div class='add'>+	for (; info-&gt;mtd == NULL &amp;&amp; *probe_type != NULL; probe_type++)</div><div class='add'>+		info-&gt;mtd = do_map_probe(*probe_type, &amp;info-&gt;map);</div><div class='add'>+	if (info-&gt;mtd == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "map_probe failed\n");</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto err_out;</div><div class='ctx'> 	}</div><div class='del'>-	if (mymtd) {</div><div class='del'>-		mymtd-&gt;owner = THIS_MODULE;</div><div class='add'>+	info-&gt;mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='del'>-		mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,</div><div class='del'>-						    &amp;mtd_parts, 0);</div><div class='add'>+	err = parse_mtd_partitions(info-&gt;mtd, part_probe_types, &amp;info-&gt;parts, 0);</div><div class='add'>+	if (err &gt; 0) {</div><div class='add'>+		add_mtd_partitions(info-&gt;mtd, info-&gt;parts, err);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (mtd_parts_nb &gt; 0)</div><div class='del'>-		{</div><div class='del'>-			add_mtd_partitions (mymtd, mtd_parts, mtd_parts_nb);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	if (physmap_data-&gt;nr_parts) {</div><div class='add'>+		printk(KERN_NOTICE "Using physmap partition information\n");</div><div class='add'>+		add_mtd_partitions(info-&gt;mtd, physmap_data-&gt;parts,</div><div class='add'>+						physmap_data-&gt;nr_parts);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	add_mtd_device(info-&gt;mtd);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	physmap_flash_remove(dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver physmap_flash_driver = {</div><div class='add'>+	.probe		= physmap_flash_probe,</div><div class='add'>+	.remove		= physmap_flash_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "physmap-flash",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		if (num_physmap_partitions != 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_NOTICE</div><div class='del'>-			       "Using physmap partition definition\n");</div><div class='del'>-			add_mtd_partitions (mymtd, physmap_partitions, num_physmap_partitions);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MTD_PHYSMAP_LEN</div><div class='add'>+#if CONFIG_MTD_PHYSMAP_LEN != 0</div><div class='add'>+#warning using PHYSMAP compat code</div><div class='add'>+#define PHYSMAP_COMPAT</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='del'>-		add_mtd_device(mymtd);</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+#ifdef PHYSMAP_COMPAT</div><div class='add'>+static struct physmap_flash_data physmap_flash_data = {</div><div class='add'>+	.width		= CONFIG_MTD_PHYSMAP_BANKWIDTH,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	iounmap(physmap_map.virt);</div><div class='del'>-	return -ENXIO;</div><div class='del'>-}</div><div class='add'>+static struct resource physmap_flash_resource = {</div><div class='add'>+	.start		= CONFIG_MTD_PHYSMAP_START,</div><div class='add'>+	.end		= CONFIG_MTD_PHYSMAP_START + CONFIG_MTD_PHYSMAP_LEN - 1,</div><div class='add'>+	.flags		= IORESOURCE_MEM,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void __exit cleanup_physmap(void)</div><div class='add'>+static struct platform_device physmap_flash = {</div><div class='add'>+	.name		= "physmap-flash",</div><div class='add'>+	.id		= 0,</div><div class='add'>+	.dev		= {</div><div class='add'>+		.platform_data	= &amp;physmap_flash_data,</div><div class='add'>+	},</div><div class='add'>+	.num_resources	= 1,</div><div class='add'>+	.resource	= &amp;physmap_flash_resource,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void physmap_configure(unsigned long addr, unsigned long size,</div><div class='add'>+		int bankwidth, void (*set_vpp)(struct map_info *, int))</div><div class='ctx'> {</div><div class='add'>+	physmap_flash_resource.start = addr;</div><div class='add'>+	physmap_flash_resource.end = addr + size - 1;</div><div class='add'>+	physmap_flash_data.width = bankwidth;</div><div class='add'>+	physmap_flash_data.set_vpp = set_vpp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='del'>-	if (mtd_parts_nb) {</div><div class='del'>-		del_mtd_partitions(mymtd);</div><div class='del'>-		kfree(mtd_parts);</div><div class='del'>-	} else if (num_physmap_partitions) {</div><div class='del'>-		del_mtd_partitions(mymtd);</div><div class='del'>-	} else {</div><div class='del'>-		del_mtd_device(mymtd);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	del_mtd_device(mymtd);</div><div class='add'>+void physmap_set_partitions(struct mtd_partition *parts, int num_parts)</div><div class='add'>+{</div><div class='add'>+	physmap_flash_data.nr_parts = num_parts;</div><div class='add'>+	physmap_flash_data.parts = parts;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='del'>-	map_destroy(mymtd);</div><div class='ctx'> </div><div class='del'>-	iounmap(physmap_map.virt);</div><div class='del'>-	physmap_map.virt = NULL;</div><div class='add'>+static int __init physmap_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = platform_driver_register(&amp;physmap_flash_driver);</div><div class='add'>+#ifdef PHYSMAP_COMPAT</div><div class='add'>+	if (err == 0)</div><div class='add'>+		platform_device_register(&amp;physmap_flash);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(init_physmap);</div><div class='del'>-module_exit(cleanup_physmap);</div><div class='add'>+static void __exit physmap_exit(void)</div><div class='add'>+{</div><div class='add'>+#ifdef PHYSMAP_COMPAT</div><div class='add'>+	platform_device_unregister(&amp;physmap_flash);</div><div class='add'>+#endif</div><div class='add'>+	platform_driver_unregister(&amp;physmap_flash_driver);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+module_init(physmap_init);</div><div class='add'>+module_exit(physmap_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("David Woodhouse &lt;dwmw2@infradead.org&gt;");</div><div class='head'>diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c<br/>index 50b14033613f..ec8fdae1dd99 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/redwood.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/redwood.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/redwood.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/redwood.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c<br/>index 5cefb015633c..950bf1c57841 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sa1100-flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sa1100-flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sa1100-flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/sa1100-flash.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * $Id: sa1100-flash.c,v 1.51 2005/11/07 11:14:28 gleixner Exp $</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c<br/>index 350286dc1d2e..7d0fcf8f4f33 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sbc8240.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sbc8240.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sbc8240.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/sbc8240.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * Both parts are JEDEC compatible.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c<br/>index e8c130e1efd3..9b50cfc355b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sc520cdp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sc520cdp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sc520cdp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/sc520cdp.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * For details see http://www.amd.com/products/epd/desiging/evalboards/18.elansc520/520_cdp_brief/index.html</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c<br/>index 97a8dfd69258..dcfb85840d1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/scb2_flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/scb2_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/scb2_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/scb2_flash.c</a></div><div class='hunk'>@@ -53,7 +53,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/cfi.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c<br/>index 28b8a571a91a..7391fd544e86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/scx200_docflash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/scx200_docflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/scx200_docflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/scx200_docflash.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -164,8 +163,9 @@ static int __init init_scx200_docflash(void)</div><div class='ctx'> 		outl(pmr, scx200_cb_base + SCx200_PMR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-       	printk(KERN_INFO NAME ": DOCCS mapped at 0x%lx-0x%lx, width %d\n",</div><div class='del'>-	       docmem.start, docmem.end, width);</div><div class='add'>+       	printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",</div><div class='add'>+			(unsigned long long)docmem.start,</div><div class='add'>+			(unsigned long long)docmem.end, width);</div><div class='ctx'> </div><div class='ctx'> 	scx200_docflash_map.size = size;</div><div class='ctx'> 	if (width == 8)</div><div class='head'>diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c<br/>index c53c2c369c9d..d76ceef453ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/solutionengine.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/solutionengine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/solutionengine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/solutionengine.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct mtd_info *flash_mtd;</div><div class='head'>diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c<br/>index 0758cb1d0105..4db2055cee31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sun_uflash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/sun_uflash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/sun_uflash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/sun_uflash.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;asm/ebus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -30,146 +31,141 @@</div><div class='ctx'> #define UFLASH_WINDOW_SIZE	0x200000</div><div class='ctx'> #define UFLASH_BUSWIDTH		1			/* EBus is 8-bit */</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR</div><div class='del'>-	("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION</div><div class='del'>-	("User-programmable flash device on Sun Microsystems boardsets");</div><div class='del'>-MODULE_SUPPORTED_DEVICE</div><div class='del'>-	("userflash");</div><div class='del'>-MODULE_LICENSE</div><div class='del'>-	("GPL");</div><div class='add'>+MODULE_AUTHOR("Eric Brower &lt;ebrower@usa.net&gt;");</div><div class='add'>+MODULE_DESCRIPTION("User-programmable flash device on Sun Microsystems boardsets");</div><div class='add'>+MODULE_SUPPORTED_DEVICE("userflash");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(device_list);</div><div class='ctx'> struct uflash_dev {</div><div class='del'>-	char *			name;	/* device name */</div><div class='add'>+	char			*name;	/* device name */</div><div class='ctx'> 	struct map_info 	map;	/* mtd map info */</div><div class='del'>-	struct mtd_info *	mtd;	/* mtd info */</div><div class='del'>-	struct list_head	list;</div><div class='add'>+	struct mtd_info		*mtd;	/* mtd info */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct map_info uflash_map_templ = {</div><div class='del'>-		.name =		"SUNW,???-????",</div><div class='del'>-		.size =		UFLASH_WINDOW_SIZE,</div><div class='del'>-		.bankwidth =	UFLASH_BUSWIDTH,</div><div class='add'>+	.name =		"SUNW,???-????",</div><div class='add'>+	.size =		UFLASH_WINDOW_SIZE,</div><div class='add'>+	.bankwidth =	UFLASH_BUSWIDTH,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int uflash_devinit(struct linux_ebus_device* edev)</div><div class='add'>+int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	int iTmp, nregs;</div><div class='del'>-	struct linux_prom_registers regs[2];</div><div class='del'>-	struct uflash_dev *pdev;</div><div class='del'>-</div><div class='del'>-	iTmp = prom_getproperty(</div><div class='del'>-		edev-&gt;prom_node, "reg", (void *)regs, sizeof(regs));</div><div class='del'>-	if ((iTmp % sizeof(regs[0])) != 0) {</div><div class='del'>-		printk("%s: Strange reg property size %d\n",</div><div class='del'>-			UFLASH_DEVNAME, iTmp);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	struct uflash_dev *up;</div><div class='add'>+	struct resource *res;</div><div class='ctx'> </div><div class='del'>-	nregs = iTmp / sizeof(regs[0]);</div><div class='add'>+	res = &amp;edev-&gt;resource[0];</div><div class='ctx'> </div><div class='del'>-	if (nregs != 1) {</div><div class='add'>+	if (edev-&gt;num_addrs != 1) {</div><div class='ctx'> 		/* Non-CFI userflash device-- once I find one we</div><div class='ctx'> 		 * can work on supporting it.</div><div class='ctx'> 		 */</div><div class='del'>-		printk("%s: unsupported device at 0x%lx (%d regs): " \</div><div class='add'>+		printk("%s: unsupported device at 0x%llx (%d regs): " \</div><div class='ctx'> 			"email ebrower@usa.net\n",</div><div class='del'>-			UFLASH_DEVNAME, edev-&gt;resource[0].start, nregs);</div><div class='add'>+		       dp-&gt;full_name, (unsigned long long)res-&gt;start,</div><div class='add'>+		       edev-&gt;num_addrs);</div><div class='add'>+</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(0 == (pdev = kmalloc(sizeof(struct uflash_dev), GFP_KERNEL))) {</div><div class='del'>-		printk("%s: unable to kmalloc new device\n", UFLASH_DEVNAME);</div><div class='del'>-		return(-ENOMEM);</div><div class='del'>-	}</div><div class='add'>+	up = kzalloc(sizeof(struct uflash_dev), GFP_KERNEL);</div><div class='add'>+	if (!up)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* copy defaults and tweak parameters */</div><div class='del'>-	memcpy(&amp;pdev-&gt;map, &amp;uflash_map_templ, sizeof(uflash_map_templ));</div><div class='del'>-	pdev-&gt;map.size = regs[0].reg_size;</div><div class='del'>-</div><div class='del'>-	iTmp = prom_getproplen(edev-&gt;prom_node, "model");</div><div class='del'>-	pdev-&gt;name = kmalloc(iTmp, GFP_KERNEL);</div><div class='del'>-	prom_getstring(edev-&gt;prom_node, "model", pdev-&gt;name, iTmp);</div><div class='del'>-	if(0 != pdev-&gt;name &amp;&amp; 0 &lt; strlen(pdev-&gt;name)) {</div><div class='del'>-		pdev-&gt;map.name = pdev-&gt;name;</div><div class='del'>-	}</div><div class='del'>-	pdev-&gt;map.phys = edev-&gt;resource[0].start;</div><div class='del'>-	pdev-&gt;map.virt = ioremap_nocache(edev-&gt;resource[0].start, pdev-&gt;map.size);</div><div class='del'>-	if(0 == pdev-&gt;map.virt) {</div><div class='del'>-		printk("%s: failed to map device\n", __FUNCTION__);</div><div class='del'>-		kfree(pdev-&gt;name);</div><div class='del'>-		kfree(pdev);</div><div class='del'>-		return(-1);</div><div class='add'>+	memcpy(&amp;up-&gt;map, &amp;uflash_map_templ, sizeof(uflash_map_templ));</div><div class='add'>+	up-&gt;map.size = (res-&gt;end - res-&gt;start) + 1UL;</div><div class='add'>+</div><div class='add'>+	up-&gt;name = of_get_property(dp, "model", NULL);</div><div class='add'>+	if (up-&gt;name &amp;&amp; 0 &lt; strlen(up-&gt;name))</div><div class='add'>+		up-&gt;map.name = up-&gt;name;</div><div class='add'>+</div><div class='add'>+	up-&gt;map.phys = res-&gt;start;</div><div class='add'>+</div><div class='add'>+	up-&gt;map.virt = ioremap_nocache(res-&gt;start, up-&gt;map.size);</div><div class='add'>+	if (!up-&gt;map.virt) {</div><div class='add'>+		printk("%s: Failed to map device.\n", dp-&gt;full_name);</div><div class='add'>+		kfree(up);</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	simple_map_init(&amp;pdev-&gt;map);</div><div class='add'>+	simple_map_init(&amp;up-&gt;map);</div><div class='ctx'> </div><div class='ctx'> 	/* MTD registration */</div><div class='del'>-	pdev-&gt;mtd = do_map_probe("cfi_probe", &amp;pdev-&gt;map);</div><div class='del'>-	if(0 == pdev-&gt;mtd) {</div><div class='del'>-		iounmap(pdev-&gt;map.virt);</div><div class='del'>-		kfree(pdev-&gt;name);</div><div class='del'>-		kfree(pdev);</div><div class='del'>-		return(-ENXIO);</div><div class='add'>+	up-&gt;mtd = do_map_probe("cfi_probe", &amp;up-&gt;map);</div><div class='add'>+	if (!up-&gt;mtd) {</div><div class='add'>+		iounmap(up-&gt;map.virt);</div><div class='add'>+		kfree(up);</div><div class='add'>+</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;pdev-&gt;list, &amp;device_list);</div><div class='add'>+	up-&gt;mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-	pdev-&gt;mtd-&gt;owner = THIS_MODULE;</div><div class='add'>+	add_mtd_device(up-&gt;mtd);</div><div class='ctx'> </div><div class='del'>-	add_mtd_device(pdev-&gt;mtd);</div><div class='del'>-	return(0);</div><div class='add'>+	dev_set_drvdata(&amp;edev-&gt;ofdev.dev, up);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init uflash_init(void)</div><div class='add'>+static int __devinit uflash_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus = NULL;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, UFLASH_OBPNAME)) {</div><div class='del'>-				if(0 &gt; prom_getproplen(edev-&gt;prom_node, "user")) {</div><div class='del'>-					DEBUG(2, "%s: ignoring device at 0x%lx\n",</div><div class='del'>-							UFLASH_DEVNAME, edev-&gt;resource[0].start);</div><div class='del'>-				} else {</div><div class='del'>-					uflash_devinit(edev);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	struct linux_ebus_device *edev = to_ebus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='ctx'> </div><div class='del'>-	if(list_empty(&amp;device_list)) {</div><div class='del'>-		printk("%s: unable to locate device\n", UFLASH_DEVNAME);</div><div class='add'>+	if (of_find_property(dp, "user", NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	return(0);</div><div class='add'>+</div><div class='add'>+	return uflash_devinit(edev, dp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit uflash_cleanup(void)</div><div class='add'>+static int __devexit uflash_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *udevlist;</div><div class='del'>-	struct uflash_dev *udev;</div><div class='del'>-</div><div class='del'>-	list_for_each(udevlist, &amp;device_list) {</div><div class='del'>-		udev = list_entry(udevlist, struct uflash_dev, list);</div><div class='del'>-		DEBUG(2, "%s: removing device %s\n",</div><div class='del'>-			UFLASH_DEVNAME, udev-&gt;name);</div><div class='del'>-</div><div class='del'>-		if(0 != udev-&gt;mtd) {</div><div class='del'>-			del_mtd_device(udev-&gt;mtd);</div><div class='del'>-			map_destroy(udev-&gt;mtd);</div><div class='del'>-		}</div><div class='del'>-		if(0 != udev-&gt;map.virt) {</div><div class='del'>-			iounmap(udev-&gt;map.virt);</div><div class='del'>-			udev-&gt;map.virt = NULL;</div><div class='del'>-		}</div><div class='del'>-		kfree(udev-&gt;name);</div><div class='del'>-		kfree(udev);</div><div class='add'>+	struct uflash_dev *up = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (up-&gt;mtd) {</div><div class='add'>+		del_mtd_device(up-&gt;mtd);</div><div class='add'>+		map_destroy(up-&gt;mtd);</div><div class='ctx'> 	}</div><div class='add'>+	if (up-&gt;map.virt) {</div><div class='add'>+		iounmap(up-&gt;map.virt);</div><div class='add'>+		up-&gt;map.virt = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(up);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id uflash_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = UFLASH_OBPNAME,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, uflash_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver uflash_driver = {</div><div class='add'>+	.name		= UFLASH_DEVNAME,</div><div class='add'>+	.match_table	= uflash_match,</div><div class='add'>+	.probe		= uflash_probe,</div><div class='add'>+	.remove		= __devexit_p(uflash_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init uflash_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;uflash_driver, &amp;ebus_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit uflash_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;uflash_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(uflash_init);</div><div class='del'>-module_exit(uflash_cleanup);</div><div class='add'>+module_exit(uflash_exit);</div><div class='head'>diff --git a/drivers/mtd/maps/tqm834x.c b/drivers/mtd/maps/tqm834x.c<br/>index c7ae9a515c1a..58e5912bd381 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/tqm834x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/tqm834x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/tqm834x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/tqm834x.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c<br/>index a43517053e7c..19578ba84ee8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/tqm8xxl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/tqm8xxl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/tqm8xxl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/tqm8xxl.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Thus, we choose CONFIG_MTD_CFI_I2 &amp; CONFIG_MTD_CFI_B4 at</div><div class='ctx'>  * kernel configuration.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/ts5500_flash.c b/drivers/mtd/maps/ts5500_flash.c<br/>index a7422c200567..b47270e850bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ts5500_flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/ts5500_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/ts5500_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/ts5500_flash.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  * $Id: ts5500_flash.c,v 1.5 2005/11/07 11:14:28 gleixner Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c<br/>index f7264dc2ac9b..389fea28b9a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/uclinux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/uclinux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/uclinux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/uclinux.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/walnut.c b/drivers/mtd/maps/walnut.c<br/>index f46bec66150f..ec80eec376bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/walnut.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/walnut.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/walnut.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/walnut.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/ibm4xx.h&gt;</div><div class='ctx'> #include &lt;platforms/4xx/walnut.h&gt;</div><div class='head'>diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c<br/>index 60c197ec455b..ac5b8105b6ef 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/maps/wr_sbc82xx_flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/maps/wr_sbc82xx_flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/maps/wr_sbc82xx_flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/maps/wr_sbc82xx_flash.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/map.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/immap_cpm2.h&gt;</div><div class='head'>diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c<br/>index 2cef280e388c..04ed34694b14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdblock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/mtdblock.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * (C) 1999-2003 David Woodhouse &lt;dwmw2@infradead.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -71,7 +70,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,</div><div class='ctx'> 	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	add_wait_queue(&amp;wait_q, &amp;wait);</div><div class='ctx'> </div><div class='del'>-	ret = MTD_ERASE(mtd, &amp;erase);</div><div class='add'>+	ret = mtd-&gt;erase(mtd, &amp;erase);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		remove_wait_queue(&amp;wait_q, &amp;wait);</div><div class='hunk'>@@ -88,7 +87,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,</div><div class='ctx'> 	 * Next, writhe data to flash.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	ret = MTD_WRITE (mtd, pos, len, &amp;retlen, buf);</div><div class='add'>+	ret = mtd-&gt;write(mtd, pos, len, &amp;retlen, buf);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	if (retlen != len)</div><div class='hunk'>@@ -138,7 +137,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 		mtd-&gt;name, pos, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!sect_size)</div><div class='del'>-		return MTD_WRITE (mtd, pos, len, &amp;retlen, buf);</div><div class='add'>+		return mtd-&gt;write(mtd, pos, len, &amp;retlen, buf);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		unsigned long sect_start = (pos/sect_size)*sect_size;</div><div class='hunk'>@@ -170,7 +169,8 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 			    mtdblk-&gt;cache_offset != sect_start) {</div><div class='ctx'> 				/* fill the cache with the current sector */</div><div class='ctx'> 				mtdblk-&gt;cache_state = STATE_EMPTY;</div><div class='del'>-				ret = MTD_READ(mtd, sect_start, sect_size, &amp;retlen, mtdblk-&gt;cache_data);</div><div class='add'>+				ret = mtd-&gt;read(mtd, sect_start, sect_size,</div><div class='add'>+						&amp;retlen, mtdblk-&gt;cache_data);</div><div class='ctx'> 				if (ret)</div><div class='ctx'> 					return ret;</div><div class='ctx'> 				if (retlen != sect_size)</div><div class='hunk'>@@ -207,7 +207,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 			mtd-&gt;name, pos, len);</div><div class='ctx'> </div><div class='ctx'> 	if (!sect_size)</div><div class='del'>-		return MTD_READ (mtd, pos, len, &amp;retlen, buf);</div><div class='add'>+		return mtd-&gt;read(mtd, pos, len, &amp;retlen, buf);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		unsigned long sect_start = (pos/sect_size)*sect_size;</div><div class='hunk'>@@ -226,7 +226,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,</div><div class='ctx'> 		    mtdblk-&gt;cache_offset == sect_start) {</div><div class='ctx'> 			memcpy (buf, mtdblk-&gt;cache_data + offset, size);</div><div class='ctx'> 		} else {</div><div class='del'>-			ret = MTD_READ (mtd, pos, size, &amp;retlen, buf);</div><div class='add'>+			ret = mtd-&gt;read(mtd, pos, size, &amp;retlen, buf);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			if (retlen != size)</div><div class='hunk'>@@ -288,8 +288,7 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;mtdblk-&gt;cache_mutex);</div><div class='ctx'> 	mtdblk-&gt;cache_state = STATE_EMPTY;</div><div class='del'>-	if ((mtdblk-&gt;mtd-&gt;flags &amp; MTD_CAP_RAM) != MTD_CAP_RAM &amp;&amp;</div><div class='del'>-	    mtdblk-&gt;mtd-&gt;erasesize) {</div><div class='add'>+	if ( !(mtdblk-&gt;mtd-&gt;flags &amp; MTD_NO_ERASE) &amp;&amp; mtdblk-&gt;mtd-&gt;erasesize) {</div><div class='ctx'> 		mtdblk-&gt;cache_size = mtdblk-&gt;mtd-&gt;erasesize;</div><div class='ctx'> 		mtdblk-&gt;cache_data = NULL;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c<br/>index 0c830ba41ef0..29563ed258a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock_ro.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdblock_ro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdblock_ro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/mtdblock_ro.c</a></div><div class='hunk'>@@ -45,9 +45,7 @@ static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)</div><div class='ctx'> 	dev-&gt;blksize = 512;</div><div class='ctx'> 	dev-&gt;size = mtd-&gt;size &gt;&gt; 9;</div><div class='ctx'> 	dev-&gt;tr = tr;</div><div class='del'>-	if ((mtd-&gt;flags &amp; (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE)) !=</div><div class='del'>-	    (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE))</div><div class='del'>-		dev-&gt;readonly = 1;</div><div class='add'>+	dev-&gt;readonly = 1;</div><div class='ctx'> </div><div class='ctx'> 	add_mtd_blktrans_dev(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c<br/>index 6f044584bdc6..fb8b4f7e48d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdchar.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdchar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdchar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/mtdchar.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -49,24 +48,18 @@ static struct mtd_notifier notifier = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We use file-&gt;private_data to store a pointer to the MTDdevice.</div><div class='del'>- * Since alighment is at least 32 bits, we have 2 bits free for OTP</div><div class='del'>- * modes as well.</div><div class='add'>+ * Data structure to hold the pointer to the mtd device as well</div><div class='add'>+ * as mode information ofr various use cases.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#define TO_MTD(file) (struct mtd_info *)((long)((file)-&gt;private_data) &amp; ~3L)</div><div class='del'>-</div><div class='del'>-#define MTD_MODE_OTP_FACT	1</div><div class='del'>-#define MTD_MODE_OTP_USER	2</div><div class='del'>-#define MTD_MODE(file)		((long)((file)-&gt;private_data) &amp; 3)</div><div class='del'>-</div><div class='del'>-#define SET_MTD_MODE(file, mode) \</div><div class='del'>-	do { long __p = (long)((file)-&gt;private_data); \</div><div class='del'>-	     (file)-&gt;private_data = (void *)((__p &amp; ~3L) | mode); } while (0)</div><div class='add'>+struct mtd_file_info {</div><div class='add'>+	struct mtd_info *mtd;</div><div class='add'>+	enum mtd_file_modes mode;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = TO_MTD(file);</div><div class='add'>+	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='add'>+	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='ctx'> </div><div class='ctx'> 	switch (orig) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -84,7 +77,7 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (offset &gt;= 0 &amp;&amp; offset &lt; mtd-&gt;size)</div><div class='add'>+	if (offset &gt;= 0 &amp;&amp; offset &lt;= mtd-&gt;size)</div><div class='ctx'> 		return file-&gt;f_pos = offset;</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -97,6 +90,7 @@ static int mtd_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	int minor = iminor(inode);</div><div class='ctx'> 	int devnum = minor &gt;&gt; 1;</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='add'>+	struct mtd_file_info *mfi;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL0, "MTD_open\n");</div><div class='ctx'> </div><div class='hunk'>@@ -117,14 +111,20 @@ static int mtd_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	file-&gt;private_data = mtd;</div><div class='del'>-</div><div class='ctx'> 	/* You can't open it RW if it's not a writeable device */</div><div class='ctx'> 	if ((file-&gt;f_mode &amp; 2) &amp;&amp; !(mtd-&gt;flags &amp; MTD_WRITEABLE)) {</div><div class='ctx'> 		put_mtd_device(mtd);</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);</div><div class='add'>+	if (!mfi) {</div><div class='add'>+		put_mtd_device(mtd);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	mfi-&gt;mtd = mtd;</div><div class='add'>+	file-&gt;private_data = mfi;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> } /* mtd_open */</div><div class='ctx'> </div><div class='hunk'>@@ -132,16 +132,17 @@ static int mtd_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static int mtd_close(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd;</div><div class='add'>+	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='add'>+	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL0, "MTD_close\n");</div><div class='ctx'> </div><div class='del'>-	mtd = TO_MTD(file);</div><div class='del'>-</div><div class='ctx'> 	if (mtd-&gt;sync)</div><div class='ctx'> 		mtd-&gt;sync(mtd);</div><div class='ctx'> </div><div class='ctx'> 	put_mtd_device(mtd);</div><div class='add'>+	file-&gt;private_data = NULL;</div><div class='add'>+	kfree(mfi);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> } /* mtd_close */</div><div class='hunk'>@@ -153,7 +154,8 @@ static int mtd_close(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = TO_MTD(file);</div><div class='add'>+	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='add'>+	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='ctx'> 	size_t retlen=0;</div><div class='ctx'> 	size_t total_retlen=0;</div><div class='ctx'> 	int ret=0;</div><div class='hunk'>@@ -170,36 +172,58 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Use kiovec in 2.5 to lock down the user's buffers</div><div class='ctx'> 	   and pass them directly to the MTD functions */</div><div class='add'>+</div><div class='add'>+	if (count &gt; MAX_KMALLOC_SIZE)</div><div class='add'>+		kbuf=kmalloc(MAX_KMALLOC_SIZE, GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		kbuf=kmalloc(count, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!kbuf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	while (count) {</div><div class='add'>+</div><div class='ctx'> 		if (count &gt; MAX_KMALLOC_SIZE)</div><div class='ctx'> 			len = MAX_KMALLOC_SIZE;</div><div class='ctx'> 		else</div><div class='ctx'> 			len = count;</div><div class='ctx'> </div><div class='del'>-		kbuf=kmalloc(len,GFP_KERNEL);</div><div class='del'>-		if (!kbuf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-</div><div class='del'>-		switch (MTD_MODE(file)) {</div><div class='del'>-		case MTD_MODE_OTP_FACT:</div><div class='add'>+		switch (mfi-&gt;mode) {</div><div class='add'>+		case MTD_MODE_OTP_FACTORY:</div><div class='ctx'> 			ret = mtd-&gt;read_fact_prot_reg(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MTD_MODE_OTP_USER:</div><div class='ctx'> 			ret = mtd-&gt;read_user_prot_reg(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 			break;</div><div class='add'>+		case MTD_MODE_RAW:</div><div class='add'>+		{</div><div class='add'>+			struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+			ops.mode = MTD_OOB_RAW;</div><div class='add'>+			ops.datbuf = kbuf;</div><div class='add'>+			ops.oobbuf = NULL;</div><div class='add'>+			ops.len = len;</div><div class='add'>+</div><div class='add'>+			ret = mtd-&gt;read_oob(mtd, *ppos, &amp;ops);</div><div class='add'>+			retlen = ops.retlen;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		default:</div><div class='del'>-			ret = MTD_READ(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='add'>+			ret = mtd-&gt;read(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Nand returns -EBADMSG on ecc errors, but it returns</div><div class='ctx'> 		 * the data. For our userspace tools it is important</div><div class='ctx'> 		 * to dump areas with ecc errors !</div><div class='add'>+		 * For kernel internal usage it also might return -EUCLEAN</div><div class='add'>+		 * to signal the caller that a bitflip has occured and has</div><div class='add'>+		 * been corrected by the ECC algorithm.</div><div class='ctx'> 		 * Userspace software which accesses NAND this way</div><div class='ctx'> 		 * must be aware of the fact that it deals with NAND</div><div class='ctx'> 		 */</div><div class='del'>-		if (!ret || (ret == -EBADMSG)) {</div><div class='add'>+		if (!ret || (ret == -EUCLEAN) || (ret == -EBADMSG)) {</div><div class='ctx'> 			*ppos += retlen;</div><div class='ctx'> 			if (copy_to_user(buf, kbuf, retlen)) {</div><div class='del'>-			        kfree(kbuf);</div><div class='add'>+				kfree(kbuf);</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			}</div><div class='ctx'> 			else</div><div class='hunk'>@@ -215,15 +239,16 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kfree(kbuf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(kbuf);</div><div class='ctx'> 	return total_retlen;</div><div class='ctx'> } /* mtd_read */</div><div class='ctx'> </div><div class='ctx'> static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count,loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = TO_MTD(file);</div><div class='add'>+	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='add'>+	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='ctx'> 	char *kbuf;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	size_t total_retlen=0;</div><div class='hunk'>@@ -241,25 +266,28 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (count &gt; MAX_KMALLOC_SIZE)</div><div class='add'>+		kbuf=kmalloc(MAX_KMALLOC_SIZE, GFP_KERNEL);</div><div class='add'>+	else</div><div class='add'>+		kbuf=kmalloc(count, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!kbuf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	while (count) {</div><div class='add'>+</div><div class='ctx'> 		if (count &gt; MAX_KMALLOC_SIZE)</div><div class='ctx'> 			len = MAX_KMALLOC_SIZE;</div><div class='ctx'> 		else</div><div class='ctx'> 			len = count;</div><div class='ctx'> </div><div class='del'>-		kbuf=kmalloc(len,GFP_KERNEL);</div><div class='del'>-		if (!kbuf) {</div><div class='del'>-			printk("kmalloc is null\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (copy_from_user(kbuf, buf, len)) {</div><div class='ctx'> 			kfree(kbuf);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		switch (MTD_MODE(file)) {</div><div class='del'>-		case MTD_MODE_OTP_FACT:</div><div class='add'>+		switch (mfi-&gt;mode) {</div><div class='add'>+		case MTD_MODE_OTP_FACTORY:</div><div class='ctx'> 			ret = -EROFS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case MTD_MODE_OTP_USER:</div><div class='hunk'>@@ -269,6 +297,21 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count</div><div class='ctx'> 			}</div><div class='ctx'> 			ret = mtd-&gt;write_user_prot_reg(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 			break;</div><div class='add'>+</div><div class='add'>+		case MTD_MODE_RAW:</div><div class='add'>+		{</div><div class='add'>+			struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+			ops.mode = MTD_OOB_RAW;</div><div class='add'>+			ops.datbuf = kbuf;</div><div class='add'>+			ops.oobbuf = NULL;</div><div class='add'>+			ops.len = len;</div><div class='add'>+</div><div class='add'>+			ret = mtd-&gt;write_oob(mtd, *ppos, &amp;ops);</div><div class='add'>+			retlen = ops.retlen;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			ret = (*(mtd-&gt;write))(mtd, *ppos, len, &amp;retlen, kbuf);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -282,10 +325,9 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count</div><div class='ctx'> 			kfree(kbuf);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		kfree(kbuf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(kbuf);</div><div class='ctx'> 	return total_retlen;</div><div class='ctx'> } /* mtd_write */</div><div class='ctx'> </div><div class='hunk'>@@ -299,13 +341,45 @@ static void mtdchar_erase_callback (struct erase_info *instr)</div><div class='ctx'> 	wake_up((wait_queue_head_t *)instr-&gt;priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_MTD_OTP) || defined(CONFIG_MTD_ONENAND_OTP)</div><div class='add'>+static int otp_select_filemode(struct mtd_file_info *mfi, int mode)</div><div class='add'>+{</div><div class='add'>+	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MTD_OTP_FACTORY:</div><div class='add'>+		if (!mtd-&gt;read_fact_prot_reg)</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		else</div><div class='add'>+			mfi-&gt;mode = MTD_MODE_OTP_FACTORY;</div><div class='add'>+		break;</div><div class='add'>+	case MTD_OTP_USER:</div><div class='add'>+		if (!mtd-&gt;read_fact_prot_reg)</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+		else</div><div class='add'>+			mfi-&gt;mode = MTD_MODE_OTP_USER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	case MTD_OTP_OFF:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+# define otp_select_filemode(f,m)	-EOPNOTSUPP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		     u_int cmd, u_long arg)</div><div class='ctx'> {</div><div class='del'>-	struct mtd_info *mtd = TO_MTD(file);</div><div class='add'>+	struct mtd_file_info *mfi = file-&gt;private_data;</div><div class='add'>+	struct mtd_info *mtd = mfi-&gt;mtd;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u_long size;</div><div class='add'>+	struct mtd_info_user info;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");</div><div class='ctx'> </div><div class='hunk'>@@ -341,7 +415,15 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	case MEMGETINFO:</div><div class='del'>-		if (copy_to_user(argp, mtd, sizeof(struct mtd_info_user)))</div><div class='add'>+		info.type	= mtd-&gt;type;</div><div class='add'>+		info.flags	= mtd-&gt;flags;</div><div class='add'>+		info.size	= mtd-&gt;size;</div><div class='add'>+		info.erasesize	= mtd-&gt;erasesize;</div><div class='add'>+		info.writesize	= mtd-&gt;writesize;</div><div class='add'>+		info.oobsize	= mtd-&gt;oobsize;</div><div class='add'>+		info.ecctype	= mtd-&gt;ecctype;</div><div class='add'>+		info.eccsize	= mtd-&gt;eccsize;</div><div class='add'>+		if (copy_to_user(argp, &amp;info, sizeof(struct mtd_info_user)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -400,8 +482,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	case MEMWRITEOOB:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct mtd_oob_buf buf;</div><div class='del'>-		void *databuf;</div><div class='del'>-		ssize_t retlen;</div><div class='add'>+		struct mtd_oob_ops ops;</div><div class='ctx'> </div><div class='ctx'> 		if(!(file-&gt;f_mode &amp; 2))</div><div class='ctx'> 			return -EPERM;</div><div class='hunk'>@@ -409,7 +490,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(struct mtd_oob_buf)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (buf.length &gt; 0x4096)</div><div class='add'>+		if (buf.length &gt; 4096)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (!mtd-&gt;write_oob)</div><div class='hunk'>@@ -421,21 +502,32 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		databuf = kmalloc(buf.length, GFP_KERNEL);</div><div class='del'>-		if (!databuf)</div><div class='add'>+		ops.len = buf.length;</div><div class='add'>+		ops.ooblen = buf.length;</div><div class='add'>+		ops.ooboffs = buf.start &amp; (mtd-&gt;oobsize - 1);</div><div class='add'>+		ops.datbuf = NULL;</div><div class='add'>+		ops.mode = MTD_OOB_PLACE;</div><div class='add'>+</div><div class='add'>+		if (ops.ooboffs &amp;&amp; ops.len &gt; (mtd-&gt;oobsize - ops.ooboffs))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);</div><div class='add'>+		if (!ops.oobbuf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		if (copy_from_user(databuf, buf.ptr, buf.length)) {</div><div class='del'>-			kfree(databuf);</div><div class='add'>+		if (copy_from_user(ops.oobbuf, buf.ptr, buf.length)) {</div><div class='add'>+			kfree(ops.oobbuf);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = (mtd-&gt;write_oob)(mtd, buf.start, buf.length, &amp;retlen, databuf);</div><div class='add'>+		buf.start &amp;= ~(mtd-&gt;oobsize - 1);</div><div class='add'>+		ret = mtd-&gt;write_oob(mtd, buf.start, &amp;ops);</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user(argp + sizeof(uint32_t), &amp;retlen, sizeof(uint32_t)))</div><div class='add'>+		if (copy_to_user(argp + sizeof(uint32_t), &amp;ops.retlen,</div><div class='add'>+				 sizeof(uint32_t)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> </div><div class='del'>-		kfree(databuf);</div><div class='add'>+		kfree(ops.oobbuf);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='hunk'>@@ -443,13 +535,12 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	case MEMREADOOB:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct mtd_oob_buf buf;</div><div class='del'>-		void *databuf;</div><div class='del'>-		ssize_t retlen;</div><div class='add'>+		struct mtd_oob_ops ops;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;buf, argp, sizeof(struct mtd_oob_buf)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (buf.length &gt; 0x4096)</div><div class='add'>+		if (buf.length &gt; 4096)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		if (!mtd-&gt;read_oob)</div><div class='hunk'>@@ -457,22 +548,32 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		else</div><div class='ctx'> 			ret = access_ok(VERIFY_WRITE, buf.ptr,</div><div class='ctx'> 					buf.length) ? 0 : -EFAULT;</div><div class='del'>-</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		databuf = kmalloc(buf.length, GFP_KERNEL);</div><div class='del'>-		if (!databuf)</div><div class='add'>+		ops.len = buf.length;</div><div class='add'>+		ops.ooblen = buf.length;</div><div class='add'>+		ops.ooboffs = buf.start &amp; (mtd-&gt;oobsize - 1);</div><div class='add'>+		ops.datbuf = NULL;</div><div class='add'>+		ops.mode = MTD_OOB_PLACE;</div><div class='add'>+</div><div class='add'>+		if (ops.ooboffs &amp;&amp; ops.len &gt; (mtd-&gt;oobsize - ops.ooboffs))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);</div><div class='add'>+		if (!ops.oobbuf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		ret = (mtd-&gt;read_oob)(mtd, buf.start, buf.length, &amp;retlen, databuf);</div><div class='add'>+		buf.start &amp;= ~(mtd-&gt;oobsize - 1);</div><div class='add'>+		ret = mtd-&gt;read_oob(mtd, buf.start, &amp;ops);</div><div class='ctx'> </div><div class='del'>-		if (put_user(retlen, (uint32_t __user *)argp))</div><div class='add'>+		if (put_user(ops.retlen, (uint32_t __user *)argp))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='del'>-		else if (retlen &amp;&amp; copy_to_user(buf.ptr, databuf, retlen))</div><div class='add'>+		else if (ops.retlen &amp;&amp; copy_to_user(buf.ptr, ops.oobbuf,</div><div class='add'>+						    ops.retlen))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> </div><div class='del'>-		kfree(databuf);</div><div class='add'>+		kfree(ops.oobbuf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -504,16 +605,22 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	case MEMSETOOBSEL:</div><div class='del'>-	{</div><div class='del'>-		if (copy_from_user(&amp;mtd-&gt;oobinfo, argp, sizeof(struct nand_oobinfo)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	/* Legacy interface */</div><div class='ctx'> 	case MEMGETOOBSEL:</div><div class='ctx'> 	{</div><div class='del'>-		if (copy_to_user(argp, &amp;(mtd-&gt;oobinfo), sizeof(struct nand_oobinfo)))</div><div class='add'>+		struct nand_oobinfo oi;</div><div class='add'>+</div><div class='add'>+		if (!mtd-&gt;ecclayout)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (mtd-&gt;ecclayout-&gt;eccbytes &gt; ARRAY_SIZE(oi.eccpos))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		oi.useecc = MTD_NANDECC_AUTOPLACE;</div><div class='add'>+		memcpy(&amp;oi.eccpos, mtd-&gt;ecclayout-&gt;eccpos, sizeof(oi.eccpos));</div><div class='add'>+		memcpy(&amp;oi.oobfree, mtd-&gt;ecclayout-&gt;oobfree,</div><div class='add'>+		       sizeof(oi.oobfree));</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;oi, sizeof(struct nand_oobinfo)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -544,31 +651,17 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MTD_OTP</div><div class='add'>+#if defined(CONFIG_MTD_OTP) || defined(CONFIG_MTD_ONENAND_OTP)</div><div class='ctx'> 	case OTPSELECT:</div><div class='ctx'> 	{</div><div class='ctx'> 		int mode;</div><div class='ctx'> 		if (copy_from_user(&amp;mode, argp, sizeof(int)))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		SET_MTD_MODE(file, 0);</div><div class='del'>-		switch (mode) {</div><div class='del'>-		case MTD_OTP_FACTORY:</div><div class='del'>-			if (!mtd-&gt;read_fact_prot_reg)</div><div class='del'>-				ret = -EOPNOTSUPP;</div><div class='del'>-			else</div><div class='del'>-				SET_MTD_MODE(file, MTD_MODE_OTP_FACT);</div><div class='del'>-			break;</div><div class='del'>-		case MTD_OTP_USER:</div><div class='del'>-			if (!mtd-&gt;read_fact_prot_reg)</div><div class='del'>-				ret = -EOPNOTSUPP;</div><div class='del'>-			else</div><div class='del'>-				SET_MTD_MODE(file, MTD_MODE_OTP_USER);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-		case MTD_OTP_OFF:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		mfi-&gt;mode = MTD_MODE_NORMAL;</div><div class='add'>+</div><div class='add'>+		ret = otp_select_filemode(mfi, mode);</div><div class='add'>+</div><div class='ctx'> 		file-&gt;f_pos = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -580,8 +673,8 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		if (!buf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='del'>-		switch (MTD_MODE(file)) {</div><div class='del'>-		case MTD_MODE_OTP_FACT:</div><div class='add'>+		switch (mfi-&gt;mode) {</div><div class='add'>+		case MTD_MODE_OTP_FACTORY:</div><div class='ctx'> 			if (mtd-&gt;get_fact_prot_info)</div><div class='ctx'> 				ret = mtd-&gt;get_fact_prot_info(mtd, buf, 4096);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -589,6 +682,8 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			if (mtd-&gt;get_user_prot_info)</div><div class='ctx'> 				ret = mtd-&gt;get_user_prot_info(mtd, buf, 4096);</div><div class='ctx'> 			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ret &gt;= 0) {</div><div class='ctx'> 			if (cmd == OTPGETREGIONCOUNT) {</div><div class='hunk'>@@ -607,7 +702,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	{</div><div class='ctx'> 		struct otp_info info;</div><div class='ctx'> </div><div class='del'>-		if (MTD_MODE(file) != MTD_MODE_OTP_USER)</div><div class='add'>+		if (mfi-&gt;mode != MTD_MODE_OTP_USER)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (copy_from_user(&amp;info, argp, sizeof(info)))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -618,6 +713,49 @@ static int mtd_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	case ECCGETLAYOUT:</div><div class='add'>+	{</div><div class='add'>+		if (!mtd-&gt;ecclayout)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(argp, &amp;mtd-&gt;ecclayout,</div><div class='add'>+				 sizeof(struct nand_ecclayout)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case ECCGETSTATS:</div><div class='add'>+	{</div><div class='add'>+		if (copy_to_user(argp, &amp;mtd-&gt;ecc_stats,</div><div class='add'>+				 sizeof(struct mtd_ecc_stats)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case MTDFILEMODE:</div><div class='add'>+	{</div><div class='add'>+		mfi-&gt;mode = 0;</div><div class='add'>+</div><div class='add'>+		switch(arg) {</div><div class='add'>+		case MTD_MODE_OTP_FACTORY:</div><div class='add'>+		case MTD_MODE_OTP_USER:</div><div class='add'>+			ret = otp_select_filemode(mfi, arg);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MTD_MODE_RAW:</div><div class='add'>+			if (!mtd-&gt;read_oob || !mtd-&gt;write_oob)</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			mfi-&gt;mode = arg;</div><div class='add'>+</div><div class='add'>+		case MTD_MODE_NORMAL:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		file-&gt;f_pos = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -ENOTTY;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c<br/>index 9af840364a74..1fea631b5852 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdconcat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdconcat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdconcat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/mtdconcat.c</a></div><div class='hunk'>@@ -19,6 +19,8 @@</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/concat.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Our storage structure:</div><div class='ctx'>  * Subdev points to an array of pointers to struct mtd_info objects</div><div class='hunk'>@@ -54,7 +56,7 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 	    size_t * retlen, u_char * buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_concat *concat = CONCAT(mtd);</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	int ret = 0, err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	*retlen = 0;</div><div class='hunk'>@@ -78,19 +80,29 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> </div><div class='ctx'> 		err = subdev-&gt;read(subdev, from, size, &amp;retsize, buf);</div><div class='ctx'> </div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='add'>+		/* Save information about bitflips! */</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			if (err == -EBADMSG) {</div><div class='add'>+				mtd-&gt;ecc_stats.failed++;</div><div class='add'>+				ret = err;</div><div class='add'>+			} else if (err == -EUCLEAN) {</div><div class='add'>+				mtd-&gt;ecc_stats.corrected++;</div><div class='add'>+				/* Do not overwrite -EBADMSG !! */</div><div class='add'>+				if (!ret)</div><div class='add'>+					ret = err;</div><div class='add'>+			} else</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		*retlen += retsize;</div><div class='ctx'> 		len -= size;</div><div class='ctx'> 		if (len == 0)</div><div class='del'>-			break;</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		err = -EINVAL;</div><div class='ctx'> 		buf += size;</div><div class='ctx'> 		from = 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -141,211 +153,185 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-concat_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-		size_t * retlen, u_char * buf, u_char * eccbuf,</div><div class='del'>-		struct nand_oobinfo *oobsel)</div><div class='add'>+concat_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='add'>+		unsigned long count, loff_t to, size_t * retlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_concat *concat = CONCAT(mtd);</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	struct kvec *vecs_copy;</div><div class='add'>+	unsigned long entry_low, entry_high;</div><div class='add'>+	size_t total_len = 0;</div><div class='ctx'> 	int i;</div><div class='add'>+	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	*retlen = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='del'>-		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		size_t size, retsize;</div><div class='del'>-</div><div class='del'>-		if (from &gt;= subdev-&gt;size) {</div><div class='del'>-			/* Not destined for this subdev */</div><div class='del'>-			size = 0;</div><div class='del'>-			from -= subdev-&gt;size;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (from + len &gt; subdev-&gt;size)</div><div class='del'>-			/* First part goes into this subdev */</div><div class='del'>-			size = subdev-&gt;size - from;</div><div class='del'>-		else</div><div class='del'>-			/* Entire transaction goes into this subdev */</div><div class='del'>-			size = len;</div><div class='add'>+	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='add'>+		return -EROFS;</div><div class='ctx'> </div><div class='del'>-		if (subdev-&gt;read_ecc)</div><div class='del'>-			err = subdev-&gt;read_ecc(subdev, from, size,</div><div class='del'>-					       &amp;retsize, buf, eccbuf, oobsel);</div><div class='del'>-		else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+	*retlen = 0;</div><div class='ctx'> </div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='add'>+	/* Calculate total length of data */</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		total_len += vecs[i].iov_len;</div><div class='ctx'> </div><div class='del'>-		*retlen += retsize;</div><div class='del'>-		len -= size;</div><div class='del'>-		if (len == 0)</div><div class='del'>-			break;</div><div class='add'>+	/* Do not allow write past end of device */</div><div class='add'>+	if ((to + total_len) &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		buf += size;</div><div class='del'>-		if (eccbuf) {</div><div class='del'>-			eccbuf += subdev-&gt;oobsize;</div><div class='del'>-			/* in nand.c at least, eccbufs are</div><div class='del'>-			   tagged with 2 (int)eccstatus'; we</div><div class='del'>-			   must account for these */</div><div class='del'>-			eccbuf += 2 * (sizeof (int));</div><div class='del'>-		}</div><div class='del'>-		from = 0;</div><div class='add'>+	/* Check alignment */</div><div class='add'>+	if (mtd-&gt;writesize &gt; 1) {</div><div class='add'>+		loff_t __to = to;</div><div class='add'>+		if (do_div(__to, mtd-&gt;writesize) || (total_len % mtd-&gt;writesize))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-concat_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-		 size_t * retlen, const u_char * buf, u_char * eccbuf,</div><div class='del'>-		 struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='del'>-	struct mtd_concat *concat = CONCAT(mtd);</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='del'>-		return -EROFS;</div><div class='del'>-</div><div class='del'>-	*retlen = 0;</div><div class='add'>+	/* make a copy of vecs */</div><div class='add'>+	vecs_copy = kmalloc(sizeof(struct kvec) * count, GFP_KERNEL);</div><div class='add'>+	if (!vecs_copy)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memcpy(vecs_copy, vecs, sizeof(struct kvec) * count);</div><div class='ctx'> </div><div class='add'>+	entry_low = 0;</div><div class='ctx'> 	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='ctx'> 		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		size_t size, retsize;</div><div class='add'>+		size_t size, wsize, retsize, old_iov_len;</div><div class='ctx'> </div><div class='ctx'> 		if (to &gt;= subdev-&gt;size) {</div><div class='del'>-			size = 0;</div><div class='ctx'> 			to -= subdev-&gt;size;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (to + len &gt; subdev-&gt;size)</div><div class='del'>-			size = subdev-&gt;size - to;</div><div class='del'>-		else</div><div class='del'>-			size = len;</div><div class='add'>+</div><div class='add'>+		size = min(total_len, (size_t)(subdev-&gt;size - to));</div><div class='add'>+		wsize = size; /* store for future use */</div><div class='add'>+</div><div class='add'>+		entry_high = entry_low;</div><div class='add'>+		while (entry_high &lt; count) {</div><div class='add'>+			if (size &lt;= vecs_copy[entry_high].iov_len)</div><div class='add'>+				break;</div><div class='add'>+			size -= vecs_copy[entry_high++].iov_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		old_iov_len = vecs_copy[entry_high].iov_len;</div><div class='add'>+		vecs_copy[entry_high].iov_len = size;</div><div class='ctx'> </div><div class='ctx'> 		if (!(subdev-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 			err = -EROFS;</div><div class='del'>-		else if (subdev-&gt;write_ecc)</div><div class='del'>-			err = subdev-&gt;write_ecc(subdev, to, size,</div><div class='del'>-						&amp;retsize, buf, eccbuf, oobsel);</div><div class='ctx'> 		else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+			err = subdev-&gt;writev(subdev, &amp;vecs_copy[entry_low],</div><div class='add'>+				entry_high - entry_low + 1, to, &amp;retsize);</div><div class='add'>+</div><div class='add'>+		vecs_copy[entry_high].iov_len = old_iov_len - size;</div><div class='add'>+		vecs_copy[entry_high].iov_base += size;</div><div class='add'>+</div><div class='add'>+		entry_low = entry_high;</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		*retlen += retsize;</div><div class='del'>-		len -= size;</div><div class='del'>-		if (len == 0)</div><div class='add'>+		total_len -= wsize;</div><div class='add'>+</div><div class='add'>+		if (total_len == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		buf += size;</div><div class='del'>-		if (eccbuf)</div><div class='del'>-			eccbuf += subdev-&gt;oobsize;</div><div class='ctx'> 		to = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	kfree(vecs_copy);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-concat_read_oob(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-		size_t * retlen, u_char * buf)</div><div class='add'>+concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_concat *concat = CONCAT(mtd);</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	int i;</div><div class='add'>+	struct mtd_oob_ops devops = *ops;</div><div class='add'>+	int i, err, ret = 0;</div><div class='ctx'> </div><div class='del'>-	*retlen = 0;</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='ctx'> 		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		size_t size, retsize;</div><div class='ctx'> </div><div class='ctx'> 		if (from &gt;= subdev-&gt;size) {</div><div class='del'>-			/* Not destined for this subdev */</div><div class='del'>-			size = 0;</div><div class='ctx'> 			from -= subdev-&gt;size;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (from + len &gt; subdev-&gt;size)</div><div class='del'>-			/* First part goes into this subdev */</div><div class='del'>-			size = subdev-&gt;size - from;</div><div class='del'>-		else</div><div class='del'>-			/* Entire transaction goes into this subdev */</div><div class='del'>-			size = len;</div><div class='ctx'> </div><div class='del'>-		if (subdev-&gt;read_oob)</div><div class='del'>-			err = subdev-&gt;read_oob(subdev, from, size,</div><div class='del'>-					       &amp;retsize, buf);</div><div class='del'>-		else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+		/* partial read ? */</div><div class='add'>+		if (from + devops.len &gt; subdev-&gt;size)</div><div class='add'>+			devops.len = subdev-&gt;size - from;</div><div class='add'>+</div><div class='add'>+		err = subdev-&gt;read_oob(subdev, from, &amp;devops);</div><div class='add'>+		ops-&gt;retlen += devops.retlen;</div><div class='add'>+</div><div class='add'>+		/* Save information about bitflips! */</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			if (err == -EBADMSG) {</div><div class='add'>+				mtd-&gt;ecc_stats.failed++;</div><div class='add'>+				ret = err;</div><div class='add'>+			} else if (err == -EUCLEAN) {</div><div class='add'>+				mtd-&gt;ecc_stats.corrected++;</div><div class='add'>+				/* Do not overwrite -EBADMSG !! */</div><div class='add'>+				if (!ret)</div><div class='add'>+					ret = err;</div><div class='add'>+			} else</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='add'>+		devops.len = ops-&gt;len - ops-&gt;retlen;</div><div class='add'>+		if (!devops.len)</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-		*retlen += retsize;</div><div class='del'>-		len -= size;</div><div class='del'>-		if (len == 0)</div><div class='del'>-			break;</div><div class='add'>+		if (devops.datbuf)</div><div class='add'>+			devops.datbuf += devops.retlen;</div><div class='add'>+		if (devops.oobbuf)</div><div class='add'>+			devops.oobbuf += devops.ooblen;</div><div class='ctx'> </div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		buf += size;</div><div class='ctx'> 		from = 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-concat_write_oob(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-		 size_t * retlen, const u_char * buf)</div><div class='add'>+concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_concat *concat = CONCAT(mtd);</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	int i;</div><div class='add'>+	struct mtd_oob_ops devops = *ops;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> </div><div class='del'>-	*retlen = 0;</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='ctx'> 		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='del'>-		size_t size, retsize;</div><div class='ctx'> </div><div class='ctx'> 		if (to &gt;= subdev-&gt;size) {</div><div class='del'>-			size = 0;</div><div class='ctx'> 			to -= subdev-&gt;size;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (to + len &gt; subdev-&gt;size)</div><div class='del'>-			size = subdev-&gt;size - to;</div><div class='del'>-		else</div><div class='del'>-			size = len;</div><div class='ctx'> </div><div class='del'>-		if (!(subdev-&gt;flags &amp; MTD_WRITEABLE))</div><div class='del'>-			err = -EROFS;</div><div class='del'>-		else if (subdev-&gt;write_oob)</div><div class='del'>-			err = subdev-&gt;write_oob(subdev, to, size, &amp;retsize,</div><div class='del'>-						buf);</div><div class='del'>-		else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+		/* partial write ? */</div><div class='add'>+		if (to + devops.len &gt; subdev-&gt;size)</div><div class='add'>+			devops.len = subdev-&gt;size - to;</div><div class='ctx'> </div><div class='add'>+		err = subdev-&gt;write_oob(subdev, to, &amp;devops);</div><div class='add'>+		ops-&gt;retlen += devops.retlen;</div><div class='ctx'> 		if (err)</div><div class='del'>-			break;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		*retlen += retsize;</div><div class='del'>-		len -= size;</div><div class='del'>-		if (len == 0)</div><div class='del'>-			break;</div><div class='add'>+		devops.len = ops-&gt;len - ops-&gt;retlen;</div><div class='add'>+		if (!devops.len)</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		buf += size;</div><div class='add'>+		if (devops.datbuf)</div><div class='add'>+			devops.datbuf += devops.retlen;</div><div class='add'>+		if (devops.oobbuf)</div><div class='add'>+			devops.oobbuf += devops.ooblen;</div><div class='ctx'> 		to = 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void concat_erase_callback(struct erase_info *instr)</div><div class='hunk'>@@ -636,6 +622,60 @@ static void concat_resume(struct mtd_info *mtd)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int concat_block_isbad(struct mtd_info *mtd, loff_t ofs)</div><div class='add'>+{</div><div class='add'>+	struct mtd_concat *concat = CONCAT(mtd);</div><div class='add'>+	int i, res = 0;</div><div class='add'>+</div><div class='add'>+	if (!concat-&gt;subdev[0]-&gt;block_isbad)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if (ofs &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='add'>+		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='add'>+</div><div class='add'>+		if (ofs &gt;= subdev-&gt;size) {</div><div class='add'>+			ofs -= subdev-&gt;size;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		res = subdev-&gt;block_isbad(subdev, ofs);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='add'>+{</div><div class='add'>+	struct mtd_concat *concat = CONCAT(mtd);</div><div class='add'>+	int i, err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!concat-&gt;subdev[0]-&gt;block_markbad)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ofs &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; concat-&gt;num_subdev; i++) {</div><div class='add'>+		struct mtd_info *subdev = concat-&gt;subdev[i];</div><div class='add'>+</div><div class='add'>+		if (ofs &gt;= subdev-&gt;size) {</div><div class='add'>+			ofs -= subdev-&gt;size;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = subdev-&gt;block_markbad(subdev, ofs);</div><div class='add'>+		if (!err)</div><div class='add'>+			mtd-&gt;ecc_stats.badblocks++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This function constructs a virtual MTD device by concatenating</div><div class='ctx'>  * num_devs MTD devices. A pointer to the new device object is</div><div class='hunk'>@@ -677,18 +717,22 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c</div><div class='ctx'> 	concat-&gt;mtd.flags = subdev[0]-&gt;flags;</div><div class='ctx'> 	concat-&gt;mtd.size = subdev[0]-&gt;size;</div><div class='ctx'> 	concat-&gt;mtd.erasesize = subdev[0]-&gt;erasesize;</div><div class='del'>-	concat-&gt;mtd.oobblock = subdev[0]-&gt;oobblock;</div><div class='add'>+	concat-&gt;mtd.writesize = subdev[0]-&gt;writesize;</div><div class='ctx'> 	concat-&gt;mtd.oobsize = subdev[0]-&gt;oobsize;</div><div class='ctx'> 	concat-&gt;mtd.ecctype = subdev[0]-&gt;ecctype;</div><div class='ctx'> 	concat-&gt;mtd.eccsize = subdev[0]-&gt;eccsize;</div><div class='del'>-	if (subdev[0]-&gt;read_ecc)</div><div class='del'>-		concat-&gt;mtd.read_ecc = concat_read_ecc;</div><div class='del'>-	if (subdev[0]-&gt;write_ecc)</div><div class='del'>-		concat-&gt;mtd.write_ecc = concat_write_ecc;</div><div class='add'>+	if (subdev[0]-&gt;writev)</div><div class='add'>+		concat-&gt;mtd.writev = concat_writev;</div><div class='ctx'> 	if (subdev[0]-&gt;read_oob)</div><div class='ctx'> 		concat-&gt;mtd.read_oob = concat_read_oob;</div><div class='ctx'> 	if (subdev[0]-&gt;write_oob)</div><div class='ctx'> 		concat-&gt;mtd.write_oob = concat_write_oob;</div><div class='add'>+	if (subdev[0]-&gt;block_isbad)</div><div class='add'>+		concat-&gt;mtd.block_isbad = concat_block_isbad;</div><div class='add'>+	if (subdev[0]-&gt;block_markbad)</div><div class='add'>+		concat-&gt;mtd.block_markbad = concat_block_markbad;</div><div class='add'>+</div><div class='add'>+	concat-&gt;mtd.ecc_stats.badblocks = subdev[0]-&gt;ecc_stats.badblocks;</div><div class='ctx'> </div><div class='ctx'> 	concat-&gt;subdev[0] = subdev[0];</div><div class='ctx'> </div><div class='hunk'>@@ -717,12 +761,12 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c</div><div class='ctx'> 				    subdev[i]-&gt;flags &amp; MTD_WRITEABLE;</div><div class='ctx'> 		}</div><div class='ctx'> 		concat-&gt;mtd.size += subdev[i]-&gt;size;</div><div class='del'>-		if (concat-&gt;mtd.oobblock   !=  subdev[i]-&gt;oobblock ||</div><div class='add'>+		concat-&gt;mtd.ecc_stats.badblocks +=</div><div class='add'>+			subdev[i]-&gt;ecc_stats.badblocks;</div><div class='add'>+		if (concat-&gt;mtd.writesize   !=  subdev[i]-&gt;writesize ||</div><div class='ctx'> 		    concat-&gt;mtd.oobsize    !=  subdev[i]-&gt;oobsize ||</div><div class='ctx'> 		    concat-&gt;mtd.ecctype    !=  subdev[i]-&gt;ecctype ||</div><div class='ctx'> 		    concat-&gt;mtd.eccsize    !=  subdev[i]-&gt;eccsize ||</div><div class='del'>-		    !concat-&gt;mtd.read_ecc  != !subdev[i]-&gt;read_ecc ||</div><div class='del'>-		    !concat-&gt;mtd.write_ecc != !subdev[i]-&gt;write_ecc ||</div><div class='ctx'> 		    !concat-&gt;mtd.read_oob  != !subdev[i]-&gt;read_oob ||</div><div class='ctx'> 		    !concat-&gt;mtd.write_oob != !subdev[i]-&gt;write_oob) {</div><div class='ctx'> 			kfree(concat);</div><div class='hunk'>@@ -734,14 +778,11 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	concat-&gt;mtd.ecclayout = subdev[0]-&gt;ecclayout;</div><div class='add'>+</div><div class='ctx'> 	concat-&gt;num_subdev = num_devs;</div><div class='ctx'> 	concat-&gt;mtd.name = name;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * NOTE: for now, we do not provide any readv()/writev() methods</div><div class='del'>-	 *       because they are messy to implement and they are not</div><div class='del'>-	 *       used to a great extent anyway.</div><div class='del'>-	 */</div><div class='ctx'> 	concat-&gt;mtd.erase = concat_erase;</div><div class='ctx'> 	concat-&gt;mtd.read = concat_read;</div><div class='ctx'> 	concat-&gt;mtd.write = concat_write;</div><div class='head'>diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c<br/>index 9905870f56e5..168d3ba063c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdcore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/mtdcore.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -47,6 +46,7 @@ int add_mtd_device(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	BUG_ON(mtd-&gt;writesize == 0);</div><div class='ctx'> 	mutex_lock(&amp;mtd_table_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; MAX_MTD_DEVICES; i++)</div><div class='hunk'>@@ -254,37 +254,6 @@ int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* default_mtd_readv - default mtd readv method for MTD devices that dont</div><div class='del'>- *		       implement their own</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs,</div><div class='del'>-		      unsigned long count, loff_t from, size_t *retlen)</div><div class='del'>-{</div><div class='del'>-	unsigned long i;</div><div class='del'>-	size_t totlen = 0, thislen;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if(!mtd-&gt;read) {</div><div class='del'>-		ret = -EIO;</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0; i&lt;count; i++) {</div><div class='del'>-			if (!vecs[i].iov_len)</div><div class='del'>-				continue;</div><div class='del'>-			ret = mtd-&gt;read(mtd, from, vecs[i].iov_len, &amp;thislen, vecs[i].iov_base);</div><div class='del'>-			totlen += thislen;</div><div class='del'>-			if (ret || thislen != vecs[i].iov_len)</div><div class='del'>-				break;</div><div class='del'>-			from += vecs[i].iov_len;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (retlen)</div><div class='del'>-		*retlen = totlen;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(add_mtd_device);</div><div class='ctx'> EXPORT_SYMBOL(del_mtd_device);</div><div class='ctx'> EXPORT_SYMBOL(get_mtd_device);</div><div class='hunk'>@@ -292,7 +261,6 @@ EXPORT_SYMBOL(put_mtd_device);</div><div class='ctx'> EXPORT_SYMBOL(register_mtd_user);</div><div class='ctx'> EXPORT_SYMBOL(unregister_mtd_user);</div><div class='ctx'> EXPORT_SYMBOL(default_mtd_writev);</div><div class='del'>-EXPORT_SYMBOL(default_mtd_readv);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c<br/>index 99395911d26f..06a930372b7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/mtdpart.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/mtdpart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/mtdpart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/mtdpart.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='hunk'>@@ -51,16 +50,21 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 			size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='ctx'> 	if (from &gt;= mtd-&gt;size)</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	else if (from + len &gt; mtd-&gt;size)</div><div class='ctx'> 		len = mtd-&gt;size - from;</div><div class='del'>-	if (part-&gt;master-&gt;read_ecc == NULL)</div><div class='del'>-		return part-&gt;master-&gt;read (part-&gt;master, from + part-&gt;offset,</div><div class='del'>-					len, retlen, buf);</div><div class='del'>-	else</div><div class='del'>-		return part-&gt;master-&gt;read_ecc (part-&gt;master, from + part-&gt;offset,</div><div class='del'>-					len, retlen, buf, NULL, &amp;mtd-&gt;oobinfo);</div><div class='add'>+	res = part-&gt;master-&gt;read (part-&gt;master, from + part-&gt;offset,</div><div class='add'>+				   len, retlen, buf);</div><div class='add'>+	if (unlikely(res)) {</div><div class='add'>+		if (res == -EUCLEAN)</div><div class='add'>+			mtd-&gt;ecc_stats.corrected++;</div><div class='add'>+		if (res == -EBADMSG)</div><div class='add'>+			mtd-&gt;ecc_stats.failed++;</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_point (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='hunk'>@@ -74,6 +78,7 @@ static int part_point (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 	return part-&gt;master-&gt;point (part-&gt;master, from + part-&gt;offset,</div><div class='ctx'> 				    len, retlen, buf);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='hunk'>@@ -81,31 +86,25 @@ static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_</div><div class='ctx'> 	part-&gt;master-&gt;unpoint (part-&gt;master, addr, from + part-&gt;offset, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int part_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel)</div><div class='add'>+static int part_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='del'>-	if (from &gt;= mtd-&gt;size)</div><div class='del'>-		len = 0;</div><div class='del'>-	else if (from + len &gt; mtd-&gt;size)</div><div class='del'>-		len = mtd-&gt;size - from;</div><div class='del'>-	return part-&gt;master-&gt;read_ecc (part-&gt;master, from + part-&gt;offset,</div><div class='del'>-					len, retlen, buf, eccbuf, oobsel);</div><div class='del'>-}</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='del'>-static int part_read_oob (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			size_t *retlen, u_char *buf)</div><div class='del'>-{</div><div class='del'>-	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if (from &gt;= mtd-&gt;size)</div><div class='del'>-		len = 0;</div><div class='del'>-	else if (from + len &gt; mtd-&gt;size)</div><div class='del'>-		len = mtd-&gt;size - from;</div><div class='del'>-	return part-&gt;master-&gt;read_oob (part-&gt;master, from + part-&gt;offset,</div><div class='del'>-					len, retlen, buf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (from + ops-&gt;len &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	res = part-&gt;master-&gt;read_oob(part-&gt;master, from + part-&gt;offset, ops);</div><div class='add'>+</div><div class='add'>+	if (unlikely(res)) {</div><div class='add'>+		if (res == -EUCLEAN)</div><div class='add'>+			mtd-&gt;ecc_stats.corrected++;</div><div class='add'>+		if (res == -EBADMSG)</div><div class='add'>+			mtd-&gt;ecc_stats.failed++;</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_read_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='hunk'>@@ -148,44 +147,23 @@ static int part_write (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		len = 0;</div><div class='ctx'> 	else if (to + len &gt; mtd-&gt;size)</div><div class='ctx'> 		len = mtd-&gt;size - to;</div><div class='del'>-	if (part-&gt;master-&gt;write_ecc == NULL)</div><div class='del'>-		return part-&gt;master-&gt;write (part-&gt;master, to + part-&gt;offset,</div><div class='del'>-					len, retlen, buf);</div><div class='del'>-	else</div><div class='del'>-		return part-&gt;master-&gt;write_ecc (part-&gt;master, to + part-&gt;offset,</div><div class='del'>-					len, retlen, buf, NULL, &amp;mtd-&gt;oobinfo);</div><div class='del'>-</div><div class='add'>+	return part-&gt;master-&gt;write (part-&gt;master, to + part-&gt;offset,</div><div class='add'>+				    len, retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int part_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			size_t *retlen, const u_char *buf,</div><div class='del'>-			 u_char *eccbuf, struct nand_oobinfo *oobsel)</div><div class='add'>+static int part_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='del'>-	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='del'>-		return -EROFS;</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='del'>-	if (to &gt;= mtd-&gt;size)</div><div class='del'>-		len = 0;</div><div class='del'>-	else if (to + len &gt; mtd-&gt;size)</div><div class='del'>-		len = mtd-&gt;size - to;</div><div class='del'>-	return part-&gt;master-&gt;write_ecc (part-&gt;master, to + part-&gt;offset,</div><div class='del'>-					len, retlen, buf, eccbuf, oobsel);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int part_write_oob (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			size_t *retlen, const u_char *buf)</div><div class='del'>-{</div><div class='del'>-	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 		return -EROFS;</div><div class='add'>+</div><div class='ctx'> 	if (to &gt;= mtd-&gt;size)</div><div class='del'>-		len = 0;</div><div class='del'>-	else if (to + len &gt; mtd-&gt;size)</div><div class='del'>-		len = mtd-&gt;size - to;</div><div class='del'>-	return part-&gt;master-&gt;write_oob (part-&gt;master, to + part-&gt;offset,</div><div class='del'>-					len, retlen, buf);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (to + ops-&gt;len &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return part-&gt;master-&gt;write_oob(part-&gt;master, to + part-&gt;offset, ops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_write_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='hunk'>@@ -208,52 +186,8 @@ static int part_writev (struct mtd_info *mtd,  const struct kvec *vecs,</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='ctx'> 	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 		return -EROFS;</div><div class='del'>-	if (part-&gt;master-&gt;writev_ecc == NULL)</div><div class='del'>-		return part-&gt;master-&gt;writev (part-&gt;master, vecs, count,</div><div class='add'>+	return part-&gt;master-&gt;writev (part-&gt;master, vecs, count,</div><div class='ctx'> 					to + part-&gt;offset, retlen);</div><div class='del'>-	else</div><div class='del'>-		return part-&gt;master-&gt;writev_ecc (part-&gt;master, vecs, count,</div><div class='del'>-					to + part-&gt;offset, retlen,</div><div class='del'>-					NULL, &amp;mtd-&gt;oobinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int part_readv (struct mtd_info *mtd,  struct kvec *vecs,</div><div class='del'>-			 unsigned long count, loff_t from, size_t *retlen)</div><div class='del'>-{</div><div class='del'>-	struct mtd_part *part = PART(mtd);</div><div class='del'>-	if (part-&gt;master-&gt;readv_ecc == NULL)</div><div class='del'>-		return part-&gt;master-&gt;readv (part-&gt;master, vecs, count,</div><div class='del'>-					from + part-&gt;offset, retlen);</div><div class='del'>-	else</div><div class='del'>-		return part-&gt;master-&gt;readv_ecc (part-&gt;master, vecs, count,</div><div class='del'>-					from + part-&gt;offset, retlen,</div><div class='del'>-					NULL, &amp;mtd-&gt;oobinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int part_writev_ecc (struct mtd_info *mtd,  const struct kvec *vecs,</div><div class='del'>-			 unsigned long count, loff_t to, size_t *retlen,</div><div class='del'>-			 u_char *eccbuf,  struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='del'>-	struct mtd_part *part = PART(mtd);</div><div class='del'>-	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='del'>-		return -EROFS;</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='del'>-	return part-&gt;master-&gt;writev_ecc (part-&gt;master, vecs, count,</div><div class='del'>-					to + part-&gt;offset, retlen,</div><div class='del'>-					eccbuf, oobsel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int part_readv_ecc (struct mtd_info *mtd,  struct kvec *vecs,</div><div class='del'>-			 unsigned long count, loff_t from, size_t *retlen,</div><div class='del'>-			 u_char *eccbuf,  struct nand_oobinfo *oobsel)</div><div class='del'>-{</div><div class='del'>-	struct mtd_part *part = PART(mtd);</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='del'>-	return part-&gt;master-&gt;readv_ecc (part-&gt;master, vecs, count,</div><div class='del'>-					from + part-&gt;offset, retlen,</div><div class='del'>-					eccbuf, oobsel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int part_erase (struct mtd_info *mtd, struct erase_info *instr)</div><div class='hunk'>@@ -329,12 +263,17 @@ static int part_block_isbad (struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> static int part_block_markbad (struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_part *part = PART(mtd);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='ctx'> 	if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 		return -EROFS;</div><div class='ctx'> 	if (ofs &gt;= mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ofs += part-&gt;offset;</div><div class='del'>-	return part-&gt;master-&gt;block_markbad(part-&gt;master, ofs);</div><div class='add'>+	res = part-&gt;master-&gt;block_markbad(part-&gt;master, ofs);</div><div class='add'>+	if (!res)</div><div class='add'>+		mtd-&gt;ecc_stats.badblocks++;</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -398,7 +337,7 @@ int add_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> 		slave-&gt;mtd.type = master-&gt;type;</div><div class='ctx'> 		slave-&gt;mtd.flags = master-&gt;flags &amp; ~parts[i].mask_flags;</div><div class='ctx'> 		slave-&gt;mtd.size = parts[i].size;</div><div class='del'>-		slave-&gt;mtd.oobblock = master-&gt;oobblock;</div><div class='add'>+		slave-&gt;mtd.writesize = master-&gt;writesize;</div><div class='ctx'> 		slave-&gt;mtd.oobsize = master-&gt;oobsize;</div><div class='ctx'> 		slave-&gt;mtd.ecctype = master-&gt;ecctype;</div><div class='ctx'> 		slave-&gt;mtd.eccsize = master-&gt;eccsize;</div><div class='hunk'>@@ -415,10 +354,6 @@ int add_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> 			slave-&gt;mtd.unpoint = part_unpoint;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (master-&gt;read_ecc)</div><div class='del'>-			slave-&gt;mtd.read_ecc = part_read_ecc;</div><div class='del'>-		if (master-&gt;write_ecc)</div><div class='del'>-			slave-&gt;mtd.write_ecc = part_write_ecc;</div><div class='ctx'> 		if (master-&gt;read_oob)</div><div class='ctx'> 			slave-&gt;mtd.read_oob = part_read_oob;</div><div class='ctx'> 		if (master-&gt;write_oob)</div><div class='hunk'>@@ -443,12 +378,6 @@ int add_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> 		}</div><div class='ctx'> 		if (master-&gt;writev)</div><div class='ctx'> 			slave-&gt;mtd.writev = part_writev;</div><div class='del'>-		if (master-&gt;readv)</div><div class='del'>-			slave-&gt;mtd.readv = part_readv;</div><div class='del'>-		if (master-&gt;writev_ecc)</div><div class='del'>-			slave-&gt;mtd.writev_ecc = part_writev_ecc;</div><div class='del'>-		if (master-&gt;readv_ecc)</div><div class='del'>-			slave-&gt;mtd.readv_ecc = part_readv_ecc;</div><div class='ctx'> 		if (master-&gt;lock)</div><div class='ctx'> 			slave-&gt;mtd.lock = part_lock;</div><div class='ctx'> 		if (master-&gt;unlock)</div><div class='hunk'>@@ -528,8 +457,17 @@ int add_mtd_partitions(struct mtd_info *master,</div><div class='ctx'> 				parts[i].name);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* copy oobinfo from master */</div><div class='del'>-		memcpy(&amp;slave-&gt;mtd.oobinfo, &amp;master-&gt;oobinfo, sizeof(slave-&gt;mtd.oobinfo));</div><div class='add'>+		slave-&gt;mtd.ecclayout = master-&gt;ecclayout;</div><div class='add'>+		if (master-&gt;block_isbad) {</div><div class='add'>+			uint32_t offs = 0;</div><div class='add'>+</div><div class='add'>+			while(offs &lt; slave-&gt;mtd.size) {</div><div class='add'>+				if (master-&gt;block_isbad(master,</div><div class='add'>+							offs + slave-&gt;offset))</div><div class='add'>+					slave-&gt;mtd.ecc_stats.badblocks++;</div><div class='add'>+				offs += slave-&gt;mtd.erasesize;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if(parts[i].mtdp)</div><div class='ctx'> 		{	/* store the object pointer (caller may or may not register it */</div><div class='head'>diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig<br/>index cfe288a6e853..3db77eec0ed2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/Kconfig</a></div><div class='hunk'>@@ -23,6 +23,14 @@ config MTD_NAND_VERIFY_WRITE</div><div class='ctx'> 	  device thinks the write was successful, a bit could have been</div><div class='ctx'> 	  flipped accidentaly due to device wear or something else.</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_ECC_SMC</div><div class='add'>+	bool "NAND ECC Smart Media byte order"</div><div class='add'>+	depends on MTD_NAND</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Software ECC according to the Smart Media Specification.</div><div class='add'>+	  The original Linux implementation had byte 0 and 1 swapped.</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_AUTCPU12</div><div class='ctx'> 	tristate "SmartMediaCard on autronix autcpu12 board"</div><div class='ctx'> 	depends on MTD_NAND &amp;&amp; ARCH_AUTCPU12</div><div class='hunk'>@@ -49,12 +57,24 @@ config MTD_NAND_SPIA</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you had to ask, you don't have one. Say 'N'.</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_AMS_DELTA</div><div class='add'>+	tristate "NAND Flash device on Amstrad E3"</div><div class='add'>+	depends on MACH_AMS_DELTA &amp;&amp; MTD_NAND</div><div class='add'>+	help</div><div class='add'>+	  Support for NAND flash on Amstrad E3 (Delta).</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_TOTO</div><div class='ctx'> 	tristate "NAND Flash device on TOTO board"</div><div class='del'>-	depends on ARCH_OMAP &amp;&amp; MTD_NAND</div><div class='add'>+	depends on ARCH_OMAP &amp;&amp; MTD_NAND &amp;&amp; BROKEN</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for NAND flash on Texas Instruments Toto platform.</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_TS7250</div><div class='add'>+	tristate "NAND Flash device on TS-7250 board"</div><div class='add'>+	depends on MACH_TS72XX &amp;&amp; MTD_NAND</div><div class='add'>+	help</div><div class='add'>+	  Support for NAND flash on Technologic Systems TS-7250 platform.</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_IDS</div><div class='ctx'> 	tristate</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +96,7 @@ config MTD_NAND_RTC_FROM4</div><div class='ctx'> </div><div class='ctx'> config MTD_NAND_PPCHAMELEONEVB</div><div class='ctx'> 	tristate "NAND Flash device on PPChameleonEVB board"</div><div class='del'>-	depends on PPCHAMELEONEVB &amp;&amp; MTD_NAND</div><div class='add'>+	depends on PPCHAMELEONEVB &amp;&amp; MTD_NAND &amp;&amp; BROKEN</div><div class='ctx'> 	help</div><div class='ctx'> 	  This enables the NAND flash driver on the PPChameleon EVB Board.</div><div class='ctx'> </div><div class='hunk'>@@ -87,7 +107,7 @@ config MTD_NAND_S3C2410</div><div class='ctx'> 	  This enables the NAND flash controller on the S3C2410 and S3C2440</div><div class='ctx'> 	  SoCs</div><div class='ctx'> </div><div class='del'>-	  No board specfic support is done by this driver, each board</div><div class='add'>+	  No board specific support is done by this driver, each board</div><div class='ctx'> 	  must advertise a platform_device for the driver to attach.</div><div class='ctx'> </div><div class='ctx'> config MTD_NAND_S3C2410_DEBUG</div><div class='hunk'>@@ -109,6 +129,22 @@ config MTD_NAND_S3C2410_HWECC</div><div class='ctx'> 	  currently not be able to switch to software, as there is no</div><div class='ctx'> 	  implementation for ECC method used by the S3C2410</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_NDFC</div><div class='add'>+	tristate "NDFC NanD Flash Controller"</div><div class='add'>+	depends on MTD_NAND &amp;&amp; 44x</div><div class='add'>+	help</div><div class='add'>+	 NDFC Nand Flash Controllers are integrated in EP44x SoCs</div><div class='add'>+</div><div class='add'>+config MTD_NAND_S3C2410_CLKSTOP</div><div class='add'>+	bool "S3C2410 NAND IDLE clock stop"</div><div class='add'>+	depends on MTD_NAND_S3C2410</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Stop the clock to the NAND controller when there is no chip</div><div class='add'>+	  selected to save power. This will mean there is a small delay</div><div class='add'>+	  when the is NAND chip selected or released, but will save</div><div class='add'>+	  approximately 5mA of power when there is nothing happening.</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_DISKONCHIP</div><div class='ctx'> 	tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"</div><div class='ctx'> 	depends on MTD_NAND &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -183,11 +219,24 @@ config MTD_NAND_SHARPSL</div><div class='ctx'> 	tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"</div><div class='ctx'> 	depends on MTD_NAND &amp;&amp; ARCH_PXA</div><div class='ctx'> </div><div class='add'>+config MTD_NAND_CS553X</div><div class='add'>+	tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"</div><div class='add'>+	depends on MTD_NAND &amp;&amp; X86_32 &amp;&amp; (X86_PC || X86_GENERICARCH)</div><div class='add'>+	help</div><div class='add'>+	  The CS553x companion chips for the AMD Geode processor</div><div class='add'>+	  include NAND flash controllers with built-in hardware ECC</div><div class='add'>+	  capabilities; enabling this option will allow you to use</div><div class='add'>+	  these. The driver will check the MSRs to verify that the</div><div class='add'>+	  controller is enabled for NAND, and currently requires that</div><div class='add'>+	  the controller be in MMIO mode.</div><div class='add'>+</div><div class='add'>+	  If you say "m", the module will be called "cs553x_nand.ko".</div><div class='add'>+</div><div class='ctx'> config MTD_NAND_NANDSIM</div><div class='ctx'> 	tristate "Support for NAND Flash Simulator"</div><div class='ctx'> 	depends on MTD_NAND &amp;&amp; MTD_PARTITIONS</div><div class='ctx'> 	help</div><div class='del'>-	  The simulator may simulate verious NAND flash chips for the</div><div class='add'>+	  The simulator may simulate various NAND flash chips for the</div><div class='ctx'> 	  MTD nand layer.</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile<br/>index 41742026a52e..f74759351c91 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/Makefile</a></div><div class='hunk'>@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD_NAND)			+= nand.o nand_ecc.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_IDS)		+= nand_ids.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_MTD_NAND_SPIA)		+= spia.o</div><div class='add'>+obj-$(CONFIG_MTD_NAND_AMS_DELTA)	+= ams-delta.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_TOTO)		+= toto.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_AUTCPU12)		+= autcpu12.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_EDB7312)		+= edb7312.o</div><div class='hunk'>@@ -17,6 +18,9 @@ obj-$(CONFIG_MTD_NAND_DISKONCHIP)	+= diskonchip.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_H1900)		+= h1910.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_RTC_FROM4)	+= rtc_from4.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_SHARPSL)		+= sharpsl.o</div><div class='add'>+obj-$(CONFIG_MTD_NAND_TS7250)		+= ts7250.o</div><div class='ctx'> obj-$(CONFIG_MTD_NAND_NANDSIM)		+= nandsim.o</div><div class='add'>+obj-$(CONFIG_MTD_NAND_CS553X)		+= cs553x_nand.o</div><div class='add'>+obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o</div><div class='ctx'> </div><div class='ctx'> nand-objs = nand_base.o nand_bbt.o</div><div class='head'>diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c<br/>new file mode 100644<br/>index 000000000000..d7897dc6b3c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ams-delta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/ams-delta.c</a></div><div class='hunk'>@@ -0,0 +1,237 @@</div><div class='add'>+/*</div><div class='add'>+ *  drivers/mtd/nand/ams-delta.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Jonathan McDowell &lt;noodles@earth.li&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Derived from drivers/mtd/toto.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *  Overview:</div><div class='add'>+ *   This is a device driver for the NAND flash device found on the</div><div class='add'>+ *   Amstrad E3 (Delta).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+#include &lt;asm/arch/board-ams-delta.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MTD structure for E3 (Delta)</div><div class='add'>+ */</div><div class='add'>+static struct mtd_info *ams_delta_mtd = NULL;</div><div class='add'>+</div><div class='add'>+#define NAND_MASK (AMS_DELTA_LATCH2_NAND_NRE | AMS_DELTA_LATCH2_NAND_NWE | AMS_DELTA_LATCH2_NAND_CLE | AMS_DELTA_LATCH2_NAND_ALE | AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define partitions for flash devices</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct mtd_partition partition_info[] = {</div><div class='add'>+	{ .name		= "Kernel",</div><div class='add'>+	  .offset	= 0,</div><div class='add'>+	  .size		= 3 * SZ_1M + SZ_512K },</div><div class='add'>+	{ .name		= "u-boot",</div><div class='add'>+	  .offset	= 3 * SZ_1M + SZ_512K,</div><div class='add'>+	  .size		= SZ_256K },</div><div class='add'>+	{ .name		= "u-boot params",</div><div class='add'>+	  .offset	= 3 * SZ_1M + SZ_512K + SZ_256K,</div><div class='add'>+	  .size		= SZ_256K },</div><div class='add'>+	{ .name		= "Amstrad LDR",</div><div class='add'>+	  .offset	= 4 * SZ_1M,</div><div class='add'>+	  .size		= SZ_256K },</div><div class='add'>+	{ .name		= "File system",</div><div class='add'>+	  .offset	= 4 * SZ_1M + 1 * SZ_256K,</div><div class='add'>+	  .size		= 27 * SZ_1M },</div><div class='add'>+	{ .name		= "PBL reserved",</div><div class='add'>+	  .offset	= 32 * SZ_1M - 3 * SZ_256K,</div><div class='add'>+	  .size		=  3 * SZ_256K },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	omap_writew(0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));</div><div class='add'>+	omap_writew(byte, this-&gt;IO_ADDR_W);</div><div class='add'>+	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0);</div><div class='add'>+	ndelay(40);</div><div class='add'>+	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE,</div><div class='add'>+			       AMS_DELTA_LATCH2_NAND_NWE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u_char ams_delta_read_byte(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	u_char res;</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0);</div><div class='add'>+	ndelay(40);</div><div class='add'>+	omap_writew(~0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));</div><div class='add'>+	res = omap_readw(this-&gt;IO_ADDR_R);</div><div class='add'>+	ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE,</div><div class='add'>+			       AMS_DELTA_LATCH2_NAND_NRE);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ams_delta_write_buf(struct mtd_info *mtd, const u_char *buf,</div><div class='add'>+				int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;len; i++)</div><div class='add'>+		ams_delta_write_byte(mtd, buf[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ams_delta_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;len; i++)</div><div class='add'>+		buf[i] = ams_delta_read_byte(mtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ams_delta_verify_buf(struct mtd_info *mtd, const u_char *buf,</div><div class='add'>+				int len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;len; i++)</div><div class='add'>+		if (buf[i] != ams_delta_read_byte(mtd))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Command control function</div><div class='add'>+ *</div><div class='add'>+ * ctrl:</div><div class='add'>+ * NAND_NCE: bit 0 -&gt; bit 2</div><div class='add'>+ * NAND_CLE: bit 1 -&gt; bit 7</div><div class='add'>+ * NAND_ALE: bit 2 -&gt; bit 6</div><div class='add'>+ */</div><div class='add'>+static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+				unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		unsigned long bits;</div><div class='add'>+</div><div class='add'>+		bits = (~ctrl &amp; NAND_NCE) &lt;&lt; 2;</div><div class='add'>+		bits |= (ctrl &amp; NAND_CLE) &lt;&lt; 7;</div><div class='add'>+		bits |= (ctrl &amp; NAND_ALE) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+		ams_delta_latch2_write(0xC2, bits);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		ams_delta_write_byte(mtd, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ams_delta_nand_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	return omap_get_gpio_datain(AMS_DELTA_GPIO_PIN_NAND_RB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Main initialization routine</div><div class='add'>+ */</div><div class='add'>+static int __init ams_delta_init(void)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for MTD device structure and private data */</div><div class='add'>+	ams_delta_mtd = kmalloc(sizeof(struct mtd_info) +</div><div class='add'>+				sizeof(struct nand_chip), GFP_KERNEL);</div><div class='add'>+	if (!ams_delta_mtd) {</div><div class='add'>+		printk (KERN_WARNING "Unable to allocate E3 NAND MTD device structure.\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ams_delta_mtd-&gt;owner = THIS_MODULE;</div><div class='add'>+</div><div class='add'>+	/* Get pointer to private data */</div><div class='add'>+	this = (struct nand_chip *) (&amp;ams_delta_mtd[1]);</div><div class='add'>+</div><div class='add'>+	/* Initialize structures */</div><div class='add'>+	memset(ams_delta_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='add'>+</div><div class='add'>+	/* Link the private data with the MTD structure */</div><div class='add'>+	ams_delta_mtd-&gt;priv = this;</div><div class='add'>+</div><div class='add'>+	/* Set address of NAND IO lines */</div><div class='add'>+	this-&gt;IO_ADDR_R = (OMAP_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH);</div><div class='add'>+	this-&gt;IO_ADDR_W = (OMAP_MPUIO_BASE + OMAP_MPUIO_OUTPUT);</div><div class='add'>+	this-&gt;read_byte = ams_delta_read_byte;</div><div class='add'>+	this-&gt;write_buf = ams_delta_write_buf;</div><div class='add'>+	this-&gt;read_buf = ams_delta_read_buf;</div><div class='add'>+	this-&gt;verify_buf = ams_delta_verify_buf;</div><div class='add'>+	this-&gt;cmd_ctrl = ams_delta_hwcontrol;</div><div class='add'>+	if (!omap_request_gpio(AMS_DELTA_GPIO_PIN_NAND_RB)) {</div><div class='add'>+		this-&gt;dev_ready = ams_delta_nand_ready;</div><div class='add'>+	} else {</div><div class='add'>+		this-&gt;dev_ready = NULL;</div><div class='add'>+		printk(KERN_NOTICE "Couldn't request gpio for Delta NAND ready.\n");</div><div class='add'>+	}</div><div class='add'>+	/* 25 us command delay time */</div><div class='add'>+	this-&gt;chip_delay = 30;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='add'>+</div><div class='add'>+	/* Set chip enabled, but  */</div><div class='add'>+	ams_delta_latch2_write(NAND_MASK, AMS_DELTA_LATCH2_NAND_NRE |</div><div class='add'>+					  AMS_DELTA_LATCH2_NAND_NWE |</div><div class='add'>+					  AMS_DELTA_LATCH2_NAND_NCE |</div><div class='add'>+					  AMS_DELTA_LATCH2_NAND_NWP);</div><div class='add'>+</div><div class='add'>+	/* Scan to find existance of the device */</div><div class='add'>+	if (nand_scan(ams_delta_mtd, 1)) {</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto out_mtd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register the partitions */</div><div class='add'>+	add_mtd_partitions(ams_delta_mtd, partition_info,</div><div class='add'>+			   ARRAY_SIZE(partition_info));</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+ out_mtd:</div><div class='add'>+	kfree(ams_delta_mtd);</div><div class='add'>+ out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ams_delta_init);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clean up routine</div><div class='add'>+ */</div><div class='add'>+static void __exit ams_delta_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	/* Release resources, unregister device */</div><div class='add'>+	nand_release(ams_delta_mtd);</div><div class='add'>+</div><div class='add'>+	/* Free the MTD device structure */</div><div class='add'>+	kfree(ams_delta_mtd);</div><div class='add'>+}</div><div class='add'>+module_exit(ams_delta_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Jonathan McDowell &lt;noodles@earth.li&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Glue layer for NAND flash on Amstrad E3 (Delta)");</div><div class='head'>diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c<br/>index bde3550910a2..31228334da12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/au1550nd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/au1550nd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/au1550nd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/au1550nd.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='hunk'>@@ -38,22 +39,21 @@</div><div class='ctx'>  */</div><div class='ctx'> static struct mtd_info *au1550_mtd = NULL;</div><div class='ctx'> static void __iomem *p_nand;</div><div class='del'>-static int nand_width = 1; /* default x8*/</div><div class='add'>+static int nand_width = 1;	/* default x8 */</div><div class='add'>+static void (*au1550_write_byte)(struct mtd_info *, u_char);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define partitions for flash device</div><div class='ctx'>  */</div><div class='ctx'> static const struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name 	= "NAND FS 0",</div><div class='del'>-	  	.offset = 0,</div><div class='del'>-	  	.size 	= 8*1024*1024</div><div class='del'>-	},</div><div class='add'>+	 .name = "NAND FS 0",</div><div class='add'>+	 .offset = 0,</div><div class='add'>+	 .size = 8 * 1024 * 1024},</div><div class='ctx'> 	{</div><div class='del'>-		.name 	= "NAND FS 1",</div><div class='del'>-		.offset =  MTDPART_OFS_APPEND,</div><div class='del'>- 		.size 	=    MTDPART_SIZ_FULL</div><div class='del'>-	}</div><div class='add'>+	 .name = "NAND FS 1",</div><div class='add'>+	 .offset = MTDPART_OFS_APPEND,</div><div class='add'>+	 .size = MTDPART_SIZ_FULL}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -130,21 +130,6 @@ static u16 au_read_word(struct mtd_info *mtd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * au_write_word -  write one word to the chip</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @word:	data word to write</div><div class='del'>- *</div><div class='del'>- *  write function for 16bit buswith without</div><div class='del'>- * endianess conversion</div><div class='del'>- */</div><div class='del'>-static void au_write_word(struct mtd_info *mtd, u16 word)</div><div class='del'>-{</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	writew(word, this-&gt;IO_ADDR_W);</div><div class='del'>-	au_sync();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * au_write_buf -  write buffer to chip</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @buf:	data buffer</div><div class='hunk'>@@ -157,7 +142,7 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		writeb(buf[i], this-&gt;IO_ADDR_W);</div><div class='ctx'> 		au_sync();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -176,7 +161,7 @@ static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		buf[i] = readb(this-&gt;IO_ADDR_R);</div><div class='ctx'> 		au_sync();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -195,7 +180,7 @@ static int au_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		if (buf[i] != readb(this-&gt;IO_ADDR_R))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		au_sync();</div><div class='hunk'>@@ -219,7 +204,7 @@ static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> 	u16 *p = (u16 *) buf;</div><div class='ctx'> 	len &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		writew(p[i], this-&gt;IO_ADDR_W);</div><div class='ctx'> 		au_sync();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -241,7 +226,7 @@ static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> 	u16 *p = (u16 *) buf;</div><div class='ctx'> 	len &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		p[i] = readw(this-&gt;IO_ADDR_R);</div><div class='ctx'> 		au_sync();</div><div class='ctx'> 	}</div><div class='hunk'>@@ -262,7 +247,7 @@ static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> 	u16 *p = (u16 *) buf;</div><div class='ctx'> 	len &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		if (p[i] != readw(this-&gt;IO_ADDR_R))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		au_sync();</div><div class='hunk'>@@ -270,32 +255,52 @@ static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Select the chip by setting nCE to low */</div><div class='add'>+#define NAND_CTL_SETNCE		1</div><div class='add'>+/* Deselect the chip by setting nCE to high */</div><div class='add'>+#define NAND_CTL_CLRNCE		2</div><div class='add'>+/* Select the command latch by setting CLE to high */</div><div class='add'>+#define NAND_CTL_SETCLE		3</div><div class='add'>+/* Deselect the command latch by setting CLE to low */</div><div class='add'>+#define NAND_CTL_CLRCLE		4</div><div class='add'>+/* Select the address latch by setting ALE to high */</div><div class='add'>+#define NAND_CTL_SETALE		5</div><div class='add'>+/* Deselect the address latch by setting ALE to low */</div><div class='add'>+#define NAND_CTL_CLRALE		6</div><div class='ctx'> </div><div class='ctx'> static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	register struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	switch(cmd){</div><div class='add'>+	switch (cmd) {</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETCLE: this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_CMD; break;</div><div class='del'>-	case NAND_CTL_CLRCLE: this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_DATA; break;</div><div class='add'>+	case NAND_CTL_SETCLE:</div><div class='add'>+		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_CMD;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NAND_CTL_CLRCLE:</div><div class='add'>+		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_DATA;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NAND_CTL_SETALE:</div><div class='add'>+		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_ADDR;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETALE: this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_ADDR; break;</div><div class='ctx'> 	case NAND_CTL_CLRALE:</div><div class='ctx'> 		this-&gt;IO_ADDR_W = p_nand + MEM_STNAND_DATA;</div><div class='del'>-		/* FIXME: Nobody knows why this is neccecary,</div><div class='add'>+		/* FIXME: Nobody knows why this is necessary,</div><div class='ctx'> 		 * but it works only that way */</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_SETNCE:</div><div class='ctx'> 		/* assert (force assert) chip enable */</div><div class='del'>-		au_writel((1&lt;&lt;(4+NAND_CS)) , MEM_STNDCTL); break;</div><div class='add'>+		au_writel((1 &lt;&lt; (4 + NAND_CS)), MEM_STNDCTL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CTL_CLRNCE:</div><div class='del'>- 		/* deassert chip enable */</div><div class='del'>-		au_writel(0, MEM_STNDCTL); break;</div><div class='add'>+		/* deassert chip enable */</div><div class='add'>+		au_writel(0, MEM_STNDCTL);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -312,69 +317,200 @@ int au1550_device_ready(struct mtd_info *mtd)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * au1550_select_chip - control -CE line</div><div class='add'>+ *	Forbid driving -CE manually permitting the NAND controller to do this.</div><div class='add'>+ *	Keeping -CE asserted during the whole sector reads interferes with the</div><div class='add'>+ *	NOR flash and PCMCIA drivers as it causes contention on the static bus.</div><div class='add'>+ *	We only have to hold -CE low for the NAND read commands since the flash</div><div class='add'>+ *	chip needs it to be asserted during chip not ready time but the NAND</div><div class='add'>+ *	controller keeps it released.</div><div class='add'>+ *</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @chip:	chipnumber to select, -1 for deselect</div><div class='add'>+ */</div><div class='add'>+static void au1550_select_chip(struct mtd_info *mtd, int chip)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * au1550_command - Send command to NAND device</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @command:	the command to be sent</div><div class='add'>+ * @column:	the column address for this command, -1 if none</div><div class='add'>+ * @page_addr:	the page address for this command, -1 if none</div><div class='add'>+ */</div><div class='add'>+static void au1550_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)</div><div class='add'>+{</div><div class='add'>+	register struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	int ce_override = 0, i;</div><div class='add'>+	ulong flags;</div><div class='add'>+</div><div class='add'>+	/* Begin command latch cycle */</div><div class='add'>+	au1550_hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='add'>+	/*</div><div class='add'>+	 * Write out the command to the device.</div><div class='add'>+	 */</div><div class='add'>+	if (command == NAND_CMD_SEQIN) {</div><div class='add'>+		int readcmd;</div><div class='add'>+</div><div class='add'>+		if (column &gt;= mtd-&gt;writesize) {</div><div class='add'>+			/* OOB area */</div><div class='add'>+			column -= mtd-&gt;writesize;</div><div class='add'>+			readcmd = NAND_CMD_READOOB;</div><div class='add'>+		} else if (column &lt; 256) {</div><div class='add'>+			/* First 256 bytes --&gt; READ0 */</div><div class='add'>+			readcmd = NAND_CMD_READ0;</div><div class='add'>+		} else {</div><div class='add'>+			column -= 256;</div><div class='add'>+			readcmd = NAND_CMD_READ1;</div><div class='add'>+		}</div><div class='add'>+		au1550_write_byte(mtd, readcmd);</div><div class='add'>+	}</div><div class='add'>+	au1550_write_byte(mtd, command);</div><div class='add'>+</div><div class='add'>+	/* Set ALE and clear CLE to start address cycle */</div><div class='add'>+	au1550_hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='add'>+</div><div class='add'>+	if (column != -1 || page_addr != -1) {</div><div class='add'>+		au1550_hwcontrol(mtd, NAND_CTL_SETALE);</div><div class='add'>+</div><div class='add'>+		/* Serially input address */</div><div class='add'>+		if (column != -1) {</div><div class='add'>+			/* Adjust columns for 16 bit buswidth */</div><div class='add'>+			if (this-&gt;options &amp; NAND_BUSWIDTH_16)</div><div class='add'>+				column &gt;&gt;= 1;</div><div class='add'>+			au1550_write_byte(mtd, column);</div><div class='add'>+		}</div><div class='add'>+		if (page_addr != -1) {</div><div class='add'>+			au1550_write_byte(mtd, (u8)(page_addr &amp; 0xff));</div><div class='add'>+</div><div class='add'>+			if (command == NAND_CMD_READ0 ||</div><div class='add'>+			    command == NAND_CMD_READ1 ||</div><div class='add'>+			    command == NAND_CMD_READOOB) {</div><div class='add'>+				/*</div><div class='add'>+				 * NAND controller will release -CE after</div><div class='add'>+				 * the last address byte is written, so we'll</div><div class='add'>+				 * have to forcibly assert it. No interrupts</div><div class='add'>+				 * are allowed while we do this as we don't</div><div class='add'>+				 * want the NOR flash or PCMCIA drivers to</div><div class='add'>+				 * steal our precious bytes of data...</div><div class='add'>+				 */</div><div class='add'>+				ce_override = 1;</div><div class='add'>+				local_irq_save(flags);</div><div class='add'>+				au1550_hwcontrol(mtd, NAND_CTL_SETNCE);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			au1550_write_byte(mtd, (u8)(page_addr &gt;&gt; 8));</div><div class='add'>+</div><div class='add'>+			/* One more address cycle for devices &gt; 32MiB */</div><div class='add'>+			if (this-&gt;chipsize &gt; (32 &lt;&lt; 20))</div><div class='add'>+				au1550_write_byte(mtd, (u8)((page_addr &gt;&gt; 16) &amp; 0x0f));</div><div class='add'>+		}</div><div class='add'>+		/* Latch in address */</div><div class='add'>+		au1550_hwcontrol(mtd, NAND_CTL_CLRALE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Program and erase have their own busy handlers.</div><div class='add'>+	 * Status and sequential in need no delay.</div><div class='add'>+	 */</div><div class='add'>+	switch (command) {</div><div class='add'>+</div><div class='add'>+	case NAND_CMD_PAGEPROG:</div><div class='add'>+	case NAND_CMD_ERASE1:</div><div class='add'>+	case NAND_CMD_ERASE2:</div><div class='add'>+	case NAND_CMD_SEQIN:</div><div class='add'>+	case NAND_CMD_STATUS:</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case NAND_CMD_RESET:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NAND_CMD_READ0:</div><div class='add'>+	case NAND_CMD_READ1:</div><div class='add'>+	case NAND_CMD_READOOB:</div><div class='add'>+		/* Check if we're really driving -CE low (just in case) */</div><div class='add'>+		if (unlikely(!ce_override))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Apply a short delay always to ensure that we do wait tWB. */</div><div class='add'>+		ndelay(100);</div><div class='add'>+		/* Wait for a chip to become ready... */</div><div class='add'>+		for (i = this-&gt;chip_delay; !this-&gt;dev_ready(mtd) &amp;&amp; i &gt; 0; --i)</div><div class='add'>+			udelay(1);</div><div class='add'>+</div><div class='add'>+		/* Release -CE and re-enable interrupts. */</div><div class='add'>+		au1550_hwcontrol(mtd, NAND_CTL_CLRNCE);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* Apply this short delay always to ensure that we do wait tWB. */</div><div class='add'>+	ndelay(100);</div><div class='add'>+</div><div class='add'>+	while(!this-&gt;dev_ready(mtd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-int __init au1xxx_nand_init (void)</div><div class='add'>+static int __init au1xxx_nand_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='del'>-	u16 boot_swapboot = 0; /* default value */</div><div class='add'>+	u16 boot_swapboot = 0;	/* default value */</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	u32 mem_staddr;</div><div class='ctx'> 	u32 nand_phys;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	au1550_mtd = kmalloc (sizeof(struct mtd_info) +</div><div class='del'>-			sizeof (struct nand_chip), GFP_KERNEL);</div><div class='add'>+	au1550_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!au1550_mtd) {</div><div class='del'>-		printk ("Unable to allocate NAND MTD dev structure.\n");</div><div class='add'>+		printk("Unable to allocate NAND MTD dev structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;au1550_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;au1550_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) au1550_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(au1550_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	au1550_mtd-&gt;priv = this;</div><div class='add'>+	au1550_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	/* disable interrupts */</div><div class='del'>-	au_writel(au_readl(MEM_STNDCTL) &amp; ~(1&lt;&lt;8), MEM_STNDCTL);</div><div class='del'>-</div><div class='del'>-	/* disable NAND boot */</div><div class='del'>-	au_writel(au_readl(MEM_STNDCTL) &amp; ~(1&lt;&lt;0), MEM_STNDCTL);</div><div class='add'>+	/* MEM_STNDCTL: disable ints, disable nand boot */</div><div class='add'>+	au_writel(0, MEM_STNDCTL);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MIPS_PB1550</div><div class='ctx'> 	/* set gpio206 high */</div><div class='del'>-	au_writel(au_readl(GPIO2_DIR) &amp; ~(1&lt;&lt;6), GPIO2_DIR);</div><div class='add'>+	au_writel(au_readl(GPIO2_DIR) &amp; ~(1 &lt;&lt; 6), GPIO2_DIR);</div><div class='ctx'> </div><div class='del'>-	boot_swapboot = (au_readl(MEM_STSTAT) &amp; (0x7&lt;&lt;1)) |</div><div class='del'>-		((bcsr-&gt;status &gt;&gt; 6)  &amp; 0x1);</div><div class='add'>+	boot_swapboot = (au_readl(MEM_STSTAT) &amp; (0x7 &lt;&lt; 1)) | ((bcsr-&gt;status &gt;&gt; 6) &amp; 0x1);</div><div class='ctx'> 	switch (boot_swapboot) {</div><div class='del'>-		case 0:</div><div class='del'>-		case 2:</div><div class='del'>-		case 8:</div><div class='del'>-		case 0xC:</div><div class='del'>-		case 0xD:</div><div class='del'>-			/* x16 NAND Flash */</div><div class='del'>-			nand_width = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-		case 9:</div><div class='del'>-		case 3:</div><div class='del'>-		case 0xE:</div><div class='del'>-		case 0xF:</div><div class='del'>-			/* x8 NAND Flash */</div><div class='del'>-			nand_width = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk("Pb1550 NAND: bad boot:swap\n");</div><div class='del'>-			retval = -EINVAL;</div><div class='del'>-			goto outmem;</div><div class='add'>+	case 0:</div><div class='add'>+	case 2:</div><div class='add'>+	case 8:</div><div class='add'>+	case 0xC:</div><div class='add'>+	case 0xD:</div><div class='add'>+		/* x16 NAND Flash */</div><div class='add'>+		nand_width = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+	case 9:</div><div class='add'>+	case 3:</div><div class='add'>+	case 0xE:</div><div class='add'>+	case 0xF:</div><div class='add'>+		/* x8 NAND Flash */</div><div class='add'>+		nand_width = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk("Pb1550 NAND: bad boot:swap\n");</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		goto outmem;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -424,21 +560,22 @@ int __init au1xxx_nand_init (void)</div><div class='ctx'> </div><div class='ctx'> 	/* make controller and MTD agree */</div><div class='ctx'> 	if (NAND_CS == 0)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG0) &amp; (1&lt;&lt;22);</div><div class='add'>+		nand_width = au_readl(MEM_STCFG0) &amp; (1 &lt;&lt; 22);</div><div class='ctx'> 	if (NAND_CS == 1)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG1) &amp; (1&lt;&lt;22);</div><div class='add'>+		nand_width = au_readl(MEM_STCFG1) &amp; (1 &lt;&lt; 22);</div><div class='ctx'> 	if (NAND_CS == 2)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG2) &amp; (1&lt;&lt;22);</div><div class='add'>+		nand_width = au_readl(MEM_STCFG2) &amp; (1 &lt;&lt; 22);</div><div class='ctx'> 	if (NAND_CS == 3)</div><div class='del'>-		nand_width = au_readl(MEM_STCFG3) &amp; (1&lt;&lt;22);</div><div class='del'>-</div><div class='add'>+		nand_width = au_readl(MEM_STCFG3) &amp; (1 &lt;&lt; 22);</div><div class='ctx'> </div><div class='ctx'> 	/* Set address of hardware control function */</div><div class='del'>-	this-&gt;hwcontrol = au1550_hwcontrol;</div><div class='ctx'> 	this-&gt;dev_ready = au1550_device_ready;</div><div class='add'>+	this-&gt;select_chip = au1550_select_chip;</div><div class='add'>+	this-&gt;cmdfunc = au1550_command;</div><div class='add'>+</div><div class='ctx'> 	/* 30 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 30;</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;options = NAND_NO_AUTOINCR;</div><div class='ctx'> </div><div class='hunk'>@@ -446,15 +583,14 @@ int __init au1xxx_nand_init (void)</div><div class='ctx'> 		this-&gt;options |= NAND_BUSWIDTH_16;</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;read_byte = (!nand_width) ? au_read_byte16 : au_read_byte;</div><div class='del'>-	this-&gt;write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;</div><div class='del'>-	this-&gt;write_word = au_write_word;</div><div class='add'>+	au1550_write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;</div><div class='ctx'> 	this-&gt;read_word = au_read_word;</div><div class='ctx'> 	this-&gt;write_buf = (!nand_width) ? au_write_buf16 : au_write_buf;</div><div class='ctx'> 	this-&gt;read_buf = (!nand_width) ? au_read_buf16 : au_read_buf;</div><div class='ctx'> 	this-&gt;verify_buf = (!nand_width) ? au_verify_buf16 : au_verify_buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device */</div><div class='del'>-	if (nand_scan (au1550_mtd, 1)) {</div><div class='add'>+	if (nand_scan(au1550_mtd, 1)) {</div><div class='ctx'> 		retval = -ENXIO;</div><div class='ctx'> 		goto outio;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -465,10 +601,10 @@ int __init au1xxx_nand_init (void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  outio:</div><div class='del'>-	iounmap ((void *)p_nand);</div><div class='add'>+	iounmap((void *)p_nand);</div><div class='ctx'> </div><div class='ctx'>  outmem:</div><div class='del'>-	kfree (au1550_mtd);</div><div class='add'>+	kfree(au1550_mtd);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -477,22 +613,21 @@ module_init(au1xxx_nand_init);</div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static void __exit au1550_cleanup (void)</div><div class='add'>+static void __exit au1550_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = (struct nand_chip *) &amp;au1550_mtd[1];</div><div class='add'>+	struct nand_chip *this = (struct nand_chip *)&amp;au1550_mtd[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='del'>-	nand_release (au1550_mtd);</div><div class='add'>+	nand_release(au1550_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (au1550_mtd);</div><div class='add'>+	kfree(au1550_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Unmap */</div><div class='del'>-	iounmap ((void *)p_nand);</div><div class='add'>+	iounmap((void *)p_nand);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(au1550_cleanup);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Embedded Edge, LLC");</div><div class='head'>diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c<br/>index a3c7fea404d0..fe94ae9ae1f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/autcpu12.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/autcpu12.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/autcpu12.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/autcpu12.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *  Copyright (c) 2002 Thomas Gleixner &lt;tgxl@linutronix.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Derived from drivers/mtd/spia.c</div><div class='del'>- * 	 Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)</div><div class='add'>+ *	 Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)</div><div class='ctx'>  *</div><div class='ctx'>  * $Id: autcpu12.c,v 1.23 2005/11/07 11:14:30 gleixner Exp $</div><div class='ctx'>  *</div><div class='hunk'>@@ -42,12 +42,7 @@</div><div class='ctx'>  * MTD structure for AUTCPU12 board</div><div class='ctx'>  */</div><div class='ctx'> static struct mtd_info *autcpu12_mtd = NULL;</div><div class='del'>-</div><div class='del'>-static int autcpu12_io_base = CS89712_VIRT_BASE;</div><div class='del'>-static int autcpu12_fio_pbase = AUTCPU12_PHYS_SMC;</div><div class='del'>-static int autcpu12_fio_ctrl = AUTCPU12_SMC_SELECT_OFFSET;</div><div class='del'>-static int autcpu12_pedr = AUTCPU12_SMC_PORT_OFFSET;</div><div class='del'>-static void __iomem * autcpu12_fio_base;</div><div class='add'>+static void __iomem *autcpu12_fio_base;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Define partitions for flash devices</div><div class='hunk'>@@ -94,108 +89,131 @@ static struct mtd_partition partition_info128k[] = {</div><div class='ctx'> #define NUM_PARTITIONS128K 2</div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='del'>-*/</div><div class='del'>-static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+ *</div><div class='add'>+ *	ALE bit 4 autcpu12_pedr</div><div class='add'>+ *	CLE bit 5 autcpu12_pedr</div><div class='add'>+ *	NCE bit 0 fio_ctrl</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+			       unsigned int ctrl)</div><div class='ctx'> {</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	switch(cmd){</div><div class='del'>-</div><div class='del'>-		case NAND_CTL_SETCLE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) |=  AUTCPU12_SMC_CLE; break;</div><div class='del'>-		case NAND_CTL_CLRCLE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) &amp;= ~AUTCPU12_SMC_CLE; break;</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		void __iomem *addr</div><div class='add'>+		unsigned char bits;</div><div class='ctx'> </div><div class='del'>-		case NAND_CTL_SETALE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) |=  AUTCPU12_SMC_ALE; break;</div><div class='del'>-		case NAND_CTL_CLRALE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) &amp;= ~AUTCPU12_SMC_ALE; break;</div><div class='add'>+		addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET;</div><div class='add'>+		bits = (ctrl &amp; NAND_CLE) &lt;&lt; 4;</div><div class='add'>+		bits |= (ctrl &amp; NAND_ALE) &lt;&lt; 2;</div><div class='add'>+		writeb((readb(addr) &amp; ~0x30) | bits, addr);</div><div class='ctx'> </div><div class='del'>-		case NAND_CTL_SETNCE: (*(volatile unsigned char *) (autcpu12_fio_base + autcpu12_fio_ctrl)) = 0x01; break;</div><div class='del'>-		case NAND_CTL_CLRNCE: (*(volatile unsigned char *) (autcpu12_fio_base + autcpu12_fio_ctrl)) = 0x00; break;</div><div class='add'>+		addr = autcpu12_fio_base + AUTCPU12_SMC_SELECT_OFFSET;</div><div class='add'>+		writeb((readb(addr) &amp; ~0x1) | (ctrl &amp; NAND_NCE), addr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-*	read device ready pin</div><div class='del'>-*/</div><div class='add'>+ *	read device ready pin</div><div class='add'>+ */</div><div class='ctx'> int autcpu12_device_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='add'>+	void __iomem *addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET;</div><div class='ctx'> </div><div class='del'>-	return ( (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) &amp; AUTCPU12_SMC_RDY) ? 1 : 0;</div><div class='del'>-</div><div class='add'>+	return readb(addr) &amp; AUTCPU12_SMC_RDY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-int __init autcpu12_init (void)</div><div class='add'>+static int __init autcpu12_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	autcpu12_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	autcpu12_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip),</div><div class='add'>+			       GFP_KERNEL);</div><div class='ctx'> 	if (!autcpu12_mtd) {</div><div class='del'>-		printk ("Unable to allocate AUTCPU12 NAND MTD device structure.\n");</div><div class='add'>+		printk("Unable to allocate AUTCPU12 NAND MTD device structure.\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* map physical adress */</div><div class='del'>-	autcpu12_fio_base = ioremap(autcpu12_fio_pbase,SZ_1K);</div><div class='del'>-	if(!autcpu12_fio_base){</div><div class='add'>+	autcpu12_fio_base = ioremap(AUTCPU12_PHYS_SMC, SZ_1K);</div><div class='add'>+	if (!autcpu12_fio_base) {</div><div class='ctx'> 		printk("Ioremap autcpu12 SmartMedia Card failed\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto out_mtd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;autcpu12_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;autcpu12_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) autcpu12_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(autcpu12_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	autcpu12_mtd-&gt;priv = this;</div><div class='add'>+	autcpu12_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/* Set address of NAND IO lines */</div><div class='ctx'> 	this-&gt;IO_ADDR_R = autcpu12_fio_base;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = autcpu12_fio_base;</div><div class='del'>-	this-&gt;hwcontrol = autcpu12_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = autcpu12_hwcontrol;</div><div class='ctx'> 	this-&gt;dev_ready = autcpu12_device_ready;</div><div class='ctx'> 	/* 20 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 20;</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the following for a flash based bad block table */</div><div class='ctx'> 	/*</div><div class='del'>-	this-&gt;options = NAND_USE_FLASH_BBT;</div><div class='del'>-	*/</div><div class='add'>+	   this-&gt;options = NAND_USE_FLASH_BBT;</div><div class='add'>+	 */</div><div class='ctx'> 	this-&gt;options = NAND_USE_FLASH_BBT;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existance of the device */</div><div class='del'>-	if (nand_scan (autcpu12_mtd, 1)) {</div><div class='add'>+	if (nand_scan(autcpu12_mtd, 1)) {</div><div class='ctx'> 		err = -ENXIO;</div><div class='ctx'> 		goto out_ior;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register the partitions */</div><div class='del'>-	switch(autcpu12_mtd-&gt;size){</div><div class='del'>-		case SZ_16M: add_mtd_partitions(autcpu12_mtd, partition_info16k, NUM_PARTITIONS16K); break;</div><div class='del'>-		case SZ_32M: add_mtd_partitions(autcpu12_mtd, partition_info32k, NUM_PARTITIONS32K); break;</div><div class='del'>-		case SZ_64M: add_mtd_partitions(autcpu12_mtd, partition_info64k, NUM_PARTITIONS64K); break;</div><div class='del'>-		case SZ_128M: add_mtd_partitions(autcpu12_mtd, partition_info128k, NUM_PARTITIONS128K); break;</div><div class='del'>-		default: {</div><div class='del'>-			printk ("Unsupported SmartMedia device\n");</div><div class='add'>+	switch (autcpu12_mtd-&gt;size) {</div><div class='add'>+		case SZ_16M:</div><div class='add'>+			add_mtd_partitions(autcpu12_mtd, partition_info16k,</div><div class='add'>+					   NUM_PARTITIONS16K);</div><div class='add'>+			break;</div><div class='add'>+		case SZ_32M:</div><div class='add'>+			add_mtd_partitions(autcpu12_mtd, partition_info32k,</div><div class='add'>+					   NUM_PARTITIONS32K);</div><div class='add'>+			break;</div><div class='add'>+		case SZ_64M:</div><div class='add'>+			add_mtd_partitions(autcpu12_mtd, partition_info64k,</div><div class='add'>+					   NUM_PARTITIONS64K);</div><div class='add'>+			break;</div><div class='add'>+		case SZ_128M:</div><div class='add'>+			add_mtd_partitions(autcpu12_mtd, partition_info128k,</div><div class='add'>+					   NUM_PARTITIONS128K);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk("Unsupported SmartMedia device\n");</div><div class='ctx'> 			err = -ENXIO;</div><div class='ctx'> 			goto out_ior;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='del'>-out_ior:</div><div class='del'>-	iounmap((void *)autcpu12_fio_base);</div><div class='del'>-out_mtd:</div><div class='del'>-	kfree (autcpu12_mtd);</div><div class='del'>-out:</div><div class='add'>+ out_ior:</div><div class='add'>+	iounmap(autcpu12_fio_base);</div><div class='add'>+ out_mtd:</div><div class='add'>+	kfree(autcpu12_mtd);</div><div class='add'>+ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -204,20 +222,19 @@ module_init(autcpu12_init);</div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static void __exit autcpu12_cleanup (void)</div><div class='add'>+static void __exit autcpu12_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='del'>-	nand_release (autcpu12_mtd);</div><div class='add'>+	nand_release(autcpu12_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap physical adress */</div><div class='del'>-	iounmap((void *)autcpu12_fio_base);</div><div class='add'>+	iounmap(autcpu12_fio_base);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (autcpu12_mtd);</div><div class='add'>+	kfree(autcpu12_mtd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(autcpu12_cleanup);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c<br/>new file mode 100644<br/>index 000000000000..e0a1d386e581<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/cs553x_nand.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/cs553x_nand.c</a></div><div class='hunk'>@@ -0,0 +1,353 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/mtd/nand/cs553x_nand.c</div><div class='add'>+ *</div><div class='add'>+ * (C) 2005, 2006 Red Hat Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: David Woodhouse &lt;dwmw2@infradead.org&gt;</div><div class='add'>+ *	   Tom Sylla &lt;tom.sylla@amd.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *  Overview:</div><div class='add'>+ *   This is a device driver for the NAND flash controller found on </div><div class='add'>+ *   the AMD CS5535/CS5536 companion chipsets for the Geode processor.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/msr.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define NR_CS553X_CONTROLLERS	4</div><div class='add'>+</div><div class='add'>+#define MSR_DIVIL_GLD_CAP	0x51400000	/* DIVIL capabilitiies */</div><div class='add'>+#define CAP_CS5535		0x2df000ULL</div><div class='add'>+#define CAP_CS5536		0x5df500ULL</div><div class='add'>+</div><div class='add'>+/* NAND Timing MSRs */</div><div class='add'>+#define MSR_NANDF_DATA		0x5140001b	/* NAND Flash Data Timing MSR */</div><div class='add'>+#define MSR_NANDF_CTL		0x5140001c	/* NAND Flash Control Timing */</div><div class='add'>+#define MSR_NANDF_RSVD		0x5140001d	/* Reserved */</div><div class='add'>+</div><div class='add'>+/* NAND BAR MSRs */</div><div class='add'>+#define MSR_DIVIL_LBAR_FLSH0	0x51400010	/* Flash Chip Select 0 */</div><div class='add'>+#define MSR_DIVIL_LBAR_FLSH1	0x51400011	/* Flash Chip Select 1 */</div><div class='add'>+#define MSR_DIVIL_LBAR_FLSH2	0x51400012	/* Flash Chip Select 2 */</div><div class='add'>+#define MSR_DIVIL_LBAR_FLSH3	0x51400013	/* Flash Chip Select 3 */</div><div class='add'>+	/* Each made up of... */</div><div class='add'>+#define FLSH_LBAR_EN		(1ULL&lt;&lt;32)</div><div class='add'>+#define FLSH_NOR_NAND		(1ULL&lt;&lt;33)	/* 1 for NAND */</div><div class='add'>+#define FLSH_MEM_IO		(1ULL&lt;&lt;34)	/* 1 for MMIO */</div><div class='add'>+	/* I/O BARs have BASE_ADDR in bits 15:4, IO_MASK in 47:36 */</div><div class='add'>+	/* MMIO BARs have BASE_ADDR in bits 31:12, MEM_MASK in 63:44 */</div><div class='add'>+</div><div class='add'>+/* Pin function selection MSR (IDE vs. flash on the IDE pins) */</div><div class='add'>+#define MSR_DIVIL_BALL_OPTS	0x51400015</div><div class='add'>+#define PIN_OPT_IDE		(1&lt;&lt;0)	/* 0 for flash, 1 for IDE */</div><div class='add'>+</div><div class='add'>+/* Registers within the NAND flash controller BAR -- memory mapped */</div><div class='add'>+#define MM_NAND_DATA		0x00	/* 0 to 0x7ff, in fact */</div><div class='add'>+#define MM_NAND_CTL		0x800	/* Any even address 0x800-0x80e */</div><div class='add'>+#define MM_NAND_IO		0x801	/* Any odd address 0x801-0x80f */</div><div class='add'>+#define MM_NAND_STS		0x810</div><div class='add'>+#define MM_NAND_ECC_LSB		0x811</div><div class='add'>+#define MM_NAND_ECC_MSB		0x812</div><div class='add'>+#define MM_NAND_ECC_COL		0x813</div><div class='add'>+#define MM_NAND_LAC		0x814</div><div class='add'>+#define MM_NAND_ECC_CTL		0x815</div><div class='add'>+</div><div class='add'>+/* Registers within the NAND flash controller BAR -- I/O mapped */</div><div class='add'>+#define IO_NAND_DATA		0x00	/* 0 to 3, in fact */</div><div class='add'>+#define IO_NAND_CTL		0x04</div><div class='add'>+#define IO_NAND_IO		0x05</div><div class='add'>+#define IO_NAND_STS		0x06</div><div class='add'>+#define IO_NAND_ECC_CTL		0x08</div><div class='add'>+#define IO_NAND_ECC_LSB		0x09</div><div class='add'>+#define IO_NAND_ECC_MSB		0x0a</div><div class='add'>+#define IO_NAND_ECC_COL		0x0b</div><div class='add'>+#define IO_NAND_LAC		0x0c</div><div class='add'>+</div><div class='add'>+#define CS_NAND_CTL_DIST_EN	(1&lt;&lt;4)	/* Enable NAND Distract interrupt */</div><div class='add'>+#define CS_NAND_CTL_RDY_INT_MASK	(1&lt;&lt;3)	/* Enable RDY/BUSY# interrupt */</div><div class='add'>+#define CS_NAND_CTL_ALE		(1&lt;&lt;2)</div><div class='add'>+#define CS_NAND_CTL_CLE		(1&lt;&lt;1)</div><div class='add'>+#define CS_NAND_CTL_CE		(1&lt;&lt;0)	/* Keep low; 1 to reset */</div><div class='add'>+</div><div class='add'>+#define CS_NAND_STS_FLASH_RDY	(1&lt;&lt;3)</div><div class='add'>+#define CS_NAND_CTLR_BUSY	(1&lt;&lt;2)</div><div class='add'>+#define CS_NAND_CMD_COMP	(1&lt;&lt;1)</div><div class='add'>+#define CS_NAND_DIST_ST		(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define CS_NAND_ECC_PARITY	(1&lt;&lt;2)</div><div class='add'>+#define CS_NAND_ECC_CLRECC	(1&lt;&lt;1)</div><div class='add'>+#define CS_NAND_ECC_ENECC	(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+static void cs553x_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	while (unlikely(len &gt; 0x800)) {</div><div class='add'>+		memcpy_fromio(buf, this-&gt;IO_ADDR_R, 0x800);</div><div class='add'>+		buf += 0x800;</div><div class='add'>+		len -= 0x800;</div><div class='add'>+	}</div><div class='add'>+	memcpy_fromio(buf, this-&gt;IO_ADDR_R, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs553x_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	while (unlikely(len &gt; 0x800)) {</div><div class='add'>+		memcpy_toio(this-&gt;IO_ADDR_R, buf, 0x800);</div><div class='add'>+		buf += 0x800;</div><div class='add'>+		len -= 0x800;</div><div class='add'>+	}</div><div class='add'>+	memcpy_toio(this-&gt;IO_ADDR_R, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char cs553x_read_byte(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	return readb(this-&gt;IO_ADDR_R);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs553x_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	int i = 100000;</div><div class='add'>+</div><div class='add'>+	while (i &amp;&amp; readb(this-&gt;IO_ADDR_R + MM_NAND_STS) &amp; CS_NAND_CTLR_BUSY) {</div><div class='add'>+		udelay(1);</div><div class='add'>+		i--;</div><div class='add'>+	}</div><div class='add'>+	writeb(byte, this-&gt;IO_ADDR_W + 0x801);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs553x_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+			     unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	void __iomem *mmio_base = this-&gt;IO_ADDR_R;</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		unsigned char ctl = (ctrl &amp; ~NAND_CTRL_CHANGE ) ^ 0x01;</div><div class='add'>+		writeb(ctl, mmio_base + MM_NAND_CTL);</div><div class='add'>+	}</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		cs553x_write_byte(mtd, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs553x_device_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	void __iomem *mmio_base = this-&gt;IO_ADDR_R;</div><div class='add'>+	unsigned char foo = readb(mmio_base + MM_NAND_STS);</div><div class='add'>+</div><div class='add'>+	return (foo &amp; CS_NAND_STS_FLASH_RDY) &amp;&amp; !(foo &amp; CS_NAND_CTLR_BUSY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	void __iomem *mmio_base = this-&gt;IO_ADDR_R;</div><div class='add'>+</div><div class='add'>+	writeb(0x07, mmio_base + MM_NAND_ECC_CTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)</div><div class='add'>+{</div><div class='add'>+	uint32_t ecc;</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	void __iomem *mmio_base = this-&gt;IO_ADDR_R;</div><div class='add'>+</div><div class='add'>+	ecc = readl(mmio_base + MM_NAND_STS);</div><div class='add'>+</div><div class='add'>+	ecc_code[1] = ecc &gt;&gt; 8;</div><div class='add'>+	ecc_code[0] = ecc &gt;&gt; 16;</div><div class='add'>+	ecc_code[2] = ecc &gt;&gt; 24;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mtd_info *cs553x_mtd[4];</div><div class='add'>+</div><div class='add'>+static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct nand_chip *this;</div><div class='add'>+	struct mtd_info *new_mtd;</div><div class='add'>+</div><div class='add'>+	printk(KERN_NOTICE "Probing CS553x NAND controller CS#%d at %sIO 0x%08lx\n", cs, mmio?"MM":"P", adr);</div><div class='add'>+</div><div class='add'>+	if (!mmio) {</div><div class='add'>+		printk(KERN_NOTICE "PIO mode not yet implemented for CS553X NAND controller\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for MTD device structure and private data */</div><div class='add'>+	new_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='add'>+	if (!new_mtd) {</div><div class='add'>+		printk(KERN_WARNING "Unable to allocate CS553X NAND MTD device structure.\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get pointer to private data */</div><div class='add'>+	this = (struct nand_chip *)(&amp;new_mtd[1]);</div><div class='add'>+</div><div class='add'>+	/* Initialize structures */</div><div class='add'>+	memset(new_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='add'>+</div><div class='add'>+	/* Link the private data with the MTD structure */</div><div class='add'>+	new_mtd-&gt;priv = this;</div><div class='add'>+	new_mtd-&gt;owner = THIS_MODULE;</div><div class='add'>+</div><div class='add'>+	/* map physical address */</div><div class='add'>+	this-&gt;IO_ADDR_R = this-&gt;IO_ADDR_W = ioremap(adr, 4096);</div><div class='add'>+	if (!this-&gt;IO_ADDR_R) {</div><div class='add'>+		printk(KERN_WARNING "ioremap cs553x NAND @0x%08lx failed\n", adr);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto out_mtd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	this-&gt;cmd_ctrl = cs553x_hwcontrol;</div><div class='add'>+	this-&gt;dev_ready = cs553x_device_ready;</div><div class='add'>+	this-&gt;read_byte = cs553x_read_byte;</div><div class='add'>+	this-&gt;read_buf = cs553x_read_buf;</div><div class='add'>+	this-&gt;write_buf = cs553x_write_buf;</div><div class='add'>+</div><div class='add'>+	this-&gt;chip_delay = 0;</div><div class='add'>+</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_HW;</div><div class='add'>+	this-&gt;ecc.size = 256;</div><div class='add'>+	this-&gt;ecc.bytes = 3;</div><div class='add'>+	this-&gt;ecc.hwctl  = cs_enable_hwecc;</div><div class='add'>+	this-&gt;ecc.calculate = cs_calculate_ecc;</div><div class='add'>+	this-&gt;ecc.correct  = nand_correct_data;</div><div class='add'>+</div><div class='add'>+	/* Enable the following for a flash based bad block table */</div><div class='add'>+	this-&gt;options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR;</div><div class='add'>+</div><div class='add'>+	/* Scan to find existance of the device */</div><div class='add'>+	if (nand_scan(new_mtd, 1)) {</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto out_ior;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs553x_mtd[cs] = new_mtd;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+out_ior:</div><div class='add'>+	iounmap((void *)this-&gt;IO_ADDR_R);</div><div class='add'>+out_mtd:</div><div class='add'>+	kfree(new_mtd);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_geode(void)</div><div class='add'>+{</div><div class='add'>+	/* These are the CPUs which will have a CS553[56] companion chip */</div><div class='add'>+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &amp;&amp;</div><div class='add'>+	    boot_cpu_data.x86 == 5 &amp;&amp;</div><div class='add'>+	    boot_cpu_data.x86_model == 10)</div><div class='add'>+		return 1; /* Geode LX */</div><div class='add'>+</div><div class='add'>+	if ((boot_cpu_data.x86_vendor == X86_VENDOR_NSC ||</div><div class='add'>+	     boot_cpu_data.x86_vendor == X86_VENDOR_CYRIX) &amp;&amp;</div><div class='add'>+	    boot_cpu_data.x86 == 5 &amp;&amp;</div><div class='add'>+	    boot_cpu_data.x86_model == 5)</div><div class='add'>+		return 1; /* Geode GX (née GX2) */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init cs553x_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = -ENXIO;</div><div class='add'>+	int i;</div><div class='add'>+	uint64_t val;</div><div class='add'>+</div><div class='add'>+	/* If the CPU isn't a Geode GX or LX, abort */</div><div class='add'>+	if (!is_geode())</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* If it doesn't have the CS553[56], abort */</div><div class='add'>+	rdmsrl(MSR_DIVIL_GLD_CAP, val);</div><div class='add'>+	val &amp;= ~0xFFULL;</div><div class='add'>+	if (val != CAP_CS5535 &amp;&amp; val != CAP_CS5536)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* If it doesn't have the NAND controller enabled, abort */</div><div class='add'>+	rdmsrl(MSR_DIVIL_BALL_OPTS, val);</div><div class='add'>+	if (val &amp; 1) {</div><div class='add'>+		printk(KERN_INFO "CS553x NAND controller: Flash I/O not enabled in MSR_DIVIL_BALL_OPTS.\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_CS553X_CONTROLLERS; i++) {</div><div class='add'>+		rdmsrl(MSR_DIVIL_LBAR_FLSH0 + i, val);</div><div class='add'>+</div><div class='add'>+		if ((val &amp; (FLSH_LBAR_EN|FLSH_NOR_NAND)) == (FLSH_LBAR_EN|FLSH_NOR_NAND))</div><div class='add'>+			err = cs553x_init_one(i, !!(val &amp; FLSH_MEM_IO), val &amp; 0xFFFFFFFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register all devices together here. This means we can easily hack it to </div><div class='add'>+	   do mtdconcat etc. if we want to. */</div><div class='add'>+	for (i = 0; i &lt; NR_CS553X_CONTROLLERS; i++) {</div><div class='add'>+		if (cs553x_mtd[i]) {</div><div class='add'>+			add_mtd_device(cs553x_mtd[i]);</div><div class='add'>+</div><div class='add'>+			/* If any devices registered, return success. Else the last error. */</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cs553x_init);</div><div class='add'>+</div><div class='add'>+static void __exit cs553x_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_CS553X_CONTROLLERS; i++) {</div><div class='add'>+		struct mtd_info *mtd = cs553x_mtd[i];</div><div class='add'>+		struct nand_chip *this;</div><div class='add'>+		void __iomem *mmio_base;</div><div class='add'>+</div><div class='add'>+		if (!mtd)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		this = cs553x_mtd[i]-&gt;priv;</div><div class='add'>+		mmio_base = this-&gt;IO_ADDR_R;</div><div class='add'>+</div><div class='add'>+		/* Release resources, unregister device */</div><div class='add'>+		nand_release(cs553x_mtd[i]);</div><div class='add'>+		cs553x_mtd[i] = NULL;</div><div class='add'>+</div><div class='add'>+		/* unmap physical adress */</div><div class='add'>+		iounmap(mmio_base);</div><div class='add'>+</div><div class='add'>+		/* Free the MTD device structure */</div><div class='add'>+		kfree(mtd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(cs553x_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("David Woodhouse &lt;dwmw2@infradead.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("NAND controller driver for AMD CS5535/CS5536 companion chip");</div><div class='head'>diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c<br/>index ec5e45e4e4ef..6107f532855b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/diskonchip.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/diskonchip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/diskonchip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/diskonchip.c</a></div><div class='hunk'>@@ -58,10 +58,10 @@ static unsigned long __initdata doc_locations[] = {</div><div class='ctx'> 	0xe4000000,</div><div class='ctx'> #elif defined(CONFIG_MOMENCO_OCELOT)</div><div class='ctx'> 	0x2f000000,</div><div class='del'>-        0xff000000,</div><div class='add'>+	0xff000000,</div><div class='ctx'> #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C)</div><div class='del'>-        0xff000000,</div><div class='del'>-##else</div><div class='add'>+	0xff000000,</div><div class='add'>+#else</div><div class='ctx'> #warning Unknown architecture for DiskOnChip. No default probe locations defined</div><div class='ctx'> #endif</div><div class='ctx'> 	0xffffffff };</div><div class='hunk'>@@ -73,7 +73,7 @@ struct doc_priv {</div><div class='ctx'> 	unsigned long physadr;</div><div class='ctx'> 	u_char ChipID;</div><div class='ctx'> 	u_char CDSNControl;</div><div class='del'>-	int chips_per_floor; /* The number of chips detected on each floor */</div><div class='add'>+	int chips_per_floor;	/* The number of chips detected on each floor */</div><div class='ctx'> 	int curfloor;</div><div class='ctx'> 	int curchip;</div><div class='ctx'> 	int mh0_page;</div><div class='hunk'>@@ -84,6 +84,7 @@ struct doc_priv {</div><div class='ctx'> /* This is the syndrome computed by the HW ecc generator upon reading an empty</div><div class='ctx'>    page, one with all 0xff for data and stored ecc code. */</div><div class='ctx'> static u_char empty_read_syndrome[6] = { 0x26, 0xff, 0x6d, 0x47, 0x73, 0x7a };</div><div class='add'>+</div><div class='ctx'> /* This is the ecc value computed by the HW ecc generator upon writing an empty</div><div class='ctx'>    page, one with all 0xff for data. */</div><div class='ctx'> static u_char empty_write_ecc[6] = { 0x4b, 0x00, 0xe2, 0x0e, 0x93, 0xf7 };</div><div class='hunk'>@@ -94,28 +95,29 @@ static u_char empty_write_ecc[6] = { 0x4b, 0x00, 0xe2, 0x0e, 0x93, 0xf7 };</div><div class='ctx'> #define DoC_is_Millennium(doc) ((doc)-&gt;ChipID == DOC_ChipID_DocMil)</div><div class='ctx'> #define DoC_is_2000(doc) ((doc)-&gt;ChipID == DOC_ChipID_Doc2k)</div><div class='ctx'> </div><div class='del'>-static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd);</div><div class='add'>+static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+			      unsigned int bitmask);</div><div class='ctx'> static void doc200x_select_chip(struct mtd_info *mtd, int chip);</div><div class='ctx'> </div><div class='del'>-static int debug=0;</div><div class='add'>+static int debug = 0;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> </div><div class='del'>-static int try_dword=1;</div><div class='add'>+static int try_dword = 1;</div><div class='ctx'> module_param(try_dword, int, 0);</div><div class='ctx'> </div><div class='del'>-static int no_ecc_failures=0;</div><div class='add'>+static int no_ecc_failures = 0;</div><div class='ctx'> module_param(no_ecc_failures, int, 0);</div><div class='ctx'> </div><div class='del'>-static int no_autopart=0;</div><div class='add'>+static int no_autopart = 0;</div><div class='ctx'> module_param(no_autopart, int, 0);</div><div class='ctx'> </div><div class='del'>-static int show_firmware_partition=0;</div><div class='add'>+static int show_firmware_partition = 0;</div><div class='ctx'> module_param(show_firmware_partition, int, 0);</div><div class='ctx'> </div><div class='ctx'> #ifdef MTD_NAND_DISKONCHIP_BBTWRITE</div><div class='del'>-static int inftl_bbt_write=1;</div><div class='add'>+static int inftl_bbt_write = 1;</div><div class='ctx'> #else</div><div class='del'>-static int inftl_bbt_write=0;</div><div class='add'>+static int inftl_bbt_write = 0;</div><div class='ctx'> #endif</div><div class='ctx'> module_param(inftl_bbt_write, int, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +125,6 @@ static unsigned long doc_config_location = CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDR</div><div class='ctx'> module_param(doc_config_location, ulong, 0);</div><div class='ctx'> MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe for DiskOnChip");</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Sector size for HW ECC */</div><div class='ctx'> #define SECTOR_SIZE 512</div><div class='ctx'> /* The sector bytes are packed into NB_DATA 10 bit words */</div><div class='hunk'>@@ -147,7 +148,7 @@ static struct rs_control *rs_decoder;</div><div class='ctx'>  * some comments, improved a minor bit and converted it to make use</div><div class='ctx'>  * of the generic Reed-Solomon libary. tglx</div><div class='ctx'>  */</div><div class='del'>-static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)</div><div class='add'>+static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, nerr, errpos[8];</div><div class='ctx'> 	uint8_t parity;</div><div class='hunk'>@@ -168,18 +169,18 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)</div><div class='ctx'> 	 *  s[i] = ds[3]x^3 + ds[2]x^2 + ds[1]x^1 + ds[0]</div><div class='ctx'> 	 *  where x = alpha^(FCR + i)</div><div class='ctx'> 	 */</div><div class='del'>-	for(j = 1; j &lt; NROOTS; j++) {</div><div class='del'>-		if(ds[j] == 0)</div><div class='add'>+	for (j = 1; j &lt; NROOTS; j++) {</div><div class='add'>+		if (ds[j] == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		tmp = rs-&gt;index_of[ds[j]];</div><div class='del'>-		for(i = 0; i &lt; NROOTS; i++)</div><div class='add'>+		for (i = 0; i &lt; NROOTS; i++)</div><div class='ctx'> 			s[i] ^= rs-&gt;alpha_to[rs_modnn(rs, tmp + (FCR + i) * j)];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Calc s[i] = s[i] / alpha^(v + i) */</div><div class='ctx'> 	for (i = 0; i &lt; NROOTS; i++) {</div><div class='ctx'> 		if (syn[i])</div><div class='del'>- 			syn[i] = rs_modnn(rs, rs-&gt;index_of[s[i]] + (NN - FCR - i));</div><div class='add'>+			syn[i] = rs_modnn(rs, rs-&gt;index_of[s[i]] + (NN - FCR - i));</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Call the decoder library */</div><div class='ctx'> 	nerr = decode_rs16(rs, NULL, NULL, 1019, syn, 0, errpos, 0, errval);</div><div class='hunk'>@@ -193,7 +194,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)</div><div class='ctx'> 	 * but they are given by the design of the de/encoder circuit</div><div class='ctx'> 	 * in the DoC ASIC's.</div><div class='ctx'> 	 */</div><div class='del'>-	for(i = 0;i &lt; nerr; i++) {</div><div class='add'>+	for (i = 0; i &lt; nerr; i++) {</div><div class='ctx'> 		int index, bitpos, pos = 1015 - errpos[i];</div><div class='ctx'> 		uint8_t val;</div><div class='ctx'> 		if (pos &gt;= NB_DATA &amp;&amp; pos &lt; 1019)</div><div class='hunk'>@@ -205,8 +206,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)</div><div class='ctx'> 			   can be modified since pos is even */</div><div class='ctx'> 			index = (pos &gt;&gt; 3) ^ 1;</div><div class='ctx'> 			bitpos = pos &amp; 7;</div><div class='del'>-			if ((index &gt;= 0 &amp;&amp; index &lt; SECTOR_SIZE) ||</div><div class='del'>-			    index == (SECTOR_SIZE + 1)) {</div><div class='add'>+			if ((index &gt;= 0 &amp;&amp; index &lt; SECTOR_SIZE) || index == (SECTOR_SIZE + 1)) {</div><div class='ctx'> 				val = (uint8_t) (errval[i] &gt;&gt; (2 + bitpos));</div><div class='ctx'> 				parity ^= val;</div><div class='ctx'> 				if (index &lt; SECTOR_SIZE)</div><div class='hunk'>@@ -216,9 +216,8 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)</div><div class='ctx'> 			bitpos = (bitpos + 10) &amp; 7;</div><div class='ctx'> 			if (bitpos == 0)</div><div class='ctx'> 				bitpos = 8;</div><div class='del'>-			if ((index &gt;= 0 &amp;&amp; index &lt; SECTOR_SIZE) ||</div><div class='del'>-			    index == (SECTOR_SIZE + 1)) {</div><div class='del'>-				val = (uint8_t)(errval[i] &lt;&lt; (8 - bitpos));</div><div class='add'>+			if ((index &gt;= 0 &amp;&amp; index &lt; SECTOR_SIZE) || index == (SECTOR_SIZE + 1)) {</div><div class='add'>+				val = (uint8_t) (errval[i] &lt;&lt; (8 - bitpos));</div><div class='ctx'> 				parity ^= val;</div><div class='ctx'> 				if (index &lt; SECTOR_SIZE)</div><div class='ctx'> 					data[index] ^= val;</div><div class='hunk'>@@ -250,10 +249,11 @@ static void DoC_Delay(struct doc_priv *doc, unsigned short cycles)</div><div class='ctx'> /* DOC_WaitReady: Wait for RDY line to be asserted by the flash chip */</div><div class='ctx'> static int _DoC_WaitReady(struct doc_priv *doc)</div><div class='ctx'> {</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	unsigned long timeo = jiffies + (HZ * 10);</div><div class='ctx'> </div><div class='del'>-	if(debug) printk("_DoC_WaitReady...\n");</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("_DoC_WaitReady...\n");</div><div class='ctx'> 	/* Out-of-line routine to wait for chip response */</div><div class='ctx'> 	if (DoC_is_MillenniumPlus(doc)) {</div><div class='ctx'> 		while ((ReadDOC(docptr, Mplus_FlashControl) &amp; CDSN_CTRL_FR_B_MASK) != CDSN_CTRL_FR_B_MASK) {</div><div class='hunk'>@@ -280,7 +280,7 @@ static int _DoC_WaitReady(struct doc_priv *doc)</div><div class='ctx'> </div><div class='ctx'> static inline int DoC_WaitReady(struct doc_priv *doc)</div><div class='ctx'> {</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (DoC_is_MillenniumPlus(doc)) {</div><div class='hunk'>@@ -298,7 +298,8 @@ static inline int DoC_WaitReady(struct doc_priv *doc)</div><div class='ctx'> 		DoC_Delay(doc, 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(debug) printk("DoC_WaitReady OK\n");</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("DoC_WaitReady OK\n");</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -306,9 +307,10 @@ static void doc2000_write_byte(struct mtd_info *mtd, u_char datum)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='del'>-	if(debug)printk("write_byte %02x\n", datum);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("write_byte %02x\n", datum);</div><div class='ctx'> 	WriteDOC(datum, docptr, CDSNSlowIO);</div><div class='ctx'> 	WriteDOC(datum, docptr, 2k_CDSN_IO);</div><div class='ctx'> }</div><div class='hunk'>@@ -317,77 +319,78 @@ static u_char doc2000_read_byte(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	u_char ret;</div><div class='ctx'> </div><div class='ctx'> 	ReadDOC(docptr, CDSNSlowIO);</div><div class='ctx'> 	DoC_Delay(doc, 2);</div><div class='ctx'> 	ret = ReadDOC(docptr, 2k_CDSN_IO);</div><div class='del'>-	if (debug) printk("read_byte returns %02x\n", ret);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("read_byte returns %02x\n", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2000_writebuf(struct mtd_info *mtd,</div><div class='del'>-			     const u_char *buf, int len)</div><div class='add'>+static void doc2000_writebuf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='del'>-	if (debug)printk("writebuf of %d bytes: ", len);</div><div class='del'>-	for (i=0; i &lt; len; i++) {</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("writebuf of %d bytes: ", len);</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		WriteDOC_(buf[i], docptr, DoC_2k_CDSN_IO + i);</div><div class='ctx'> 		if (debug &amp;&amp; i &lt; 16)</div><div class='ctx'> 			printk("%02x ", buf[i]);</div><div class='ctx'> 	}</div><div class='del'>-	if (debug) printk("\n");</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2000_readbuf(struct mtd_info *mtd,</div><div class='del'>-			    u_char *buf, int len)</div><div class='add'>+static void doc2000_readbuf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='del'>- 	int i;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (debug)printk("readbuf of %d bytes: ", len);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("readbuf of %d bytes: ", len);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len; i++) {</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		buf[i] = ReadDOC(docptr, 2k_CDSN_IO + i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2000_readbuf_dword(struct mtd_info *mtd,</div><div class='del'>-			    u_char *buf, int len)</div><div class='add'>+static void doc2000_readbuf_dword(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='del'>- 	int i;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (debug) printk("readbuf_dword of %d bytes: ", len);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("readbuf_dword of %d bytes: ", len);</div><div class='ctx'> </div><div class='del'>-	if (unlikely((((unsigned long)buf)|len) &amp; 3)) {</div><div class='del'>-		for (i=0; i &lt; len; i++) {</div><div class='del'>-			*(uint8_t *)(&amp;buf[i]) = ReadDOC(docptr, 2k_CDSN_IO + i);</div><div class='add'>+	if (unlikely((((unsigned long)buf) | len) &amp; 3)) {</div><div class='add'>+		for (i = 0; i &lt; len; i++) {</div><div class='add'>+			*(uint8_t *) (&amp;buf[i]) = ReadDOC(docptr, 2k_CDSN_IO + i);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i=0; i &lt; len; i+=4) {</div><div class='del'>-			*(uint32_t*)(&amp;buf[i]) = readl(docptr + DoC_2k_CDSN_IO + i);</div><div class='add'>+		for (i = 0; i &lt; len; i += 4) {</div><div class='add'>+			*(uint32_t *) (&amp;buf[i]) = readl(docptr + DoC_2k_CDSN_IO + i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc2000_verifybuf(struct mtd_info *mtd,</div><div class='del'>-			      const u_char *buf, int len)</div><div class='add'>+static int doc2000_verifybuf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len; i++)</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='ctx'> 		if (buf[i] != ReadDOC(docptr, 2k_CDSN_IO))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -400,12 +403,10 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)</div><div class='ctx'> 	uint16_t ret;</div><div class='ctx'> </div><div class='ctx'> 	doc200x_select_chip(mtd, nr);</div><div class='del'>-	doc200x_hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='del'>-	this-&gt;write_byte(mtd, NAND_CMD_READID);</div><div class='del'>-	doc200x_hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='del'>-	doc200x_hwcontrol(mtd, NAND_CTL_SETALE);</div><div class='del'>-	this-&gt;write_byte(mtd, 0);</div><div class='del'>-	doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);</div><div class='add'>+	doc200x_hwcontrol(mtd, NAND_CMD_READID,</div><div class='add'>+			  NAND_CTRL_CLE | NAND_CTRL_CHANGE);</div><div class='add'>+	doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);</div><div class='add'>+	doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	/* We cant' use dev_ready here, but at least we wait for the</div><div class='ctx'> 	 * command to complete</div><div class='hunk'>@@ -423,12 +424,11 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)</div><div class='ctx'> 		} ident;</div><div class='ctx'> 		void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='del'>-		doc200x_hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='del'>-		doc2000_write_byte(mtd, NAND_CMD_READID);</div><div class='del'>-		doc200x_hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='del'>-		doc200x_hwcontrol(mtd, NAND_CTL_SETALE);</div><div class='del'>-		doc2000_write_byte(mtd, 0);</div><div class='del'>-		doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);</div><div class='add'>+		doc200x_hwcontrol(mtd, NAND_CMD_READID,</div><div class='add'>+				  NAND_CTRL_CLE | NAND_CTRL_CHANGE);</div><div class='add'>+		doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);</div><div class='add'>+		doc200x_hwcontrol(mtd, NAND_CMD_NONE,</div><div class='add'>+				  NAND_NCE | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 		udelay(50);</div><div class='ctx'> </div><div class='hunk'>@@ -464,7 +464,7 @@ static void __init doc2000_count_chips(struct mtd_info *mtd)</div><div class='ctx'> 	printk(KERN_DEBUG "Detected %d chips per floor.\n", i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this, int state)</div><div class='add'>+static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this)</div><div class='ctx'> {</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -482,7 +482,7 @@ static void doc2001_write_byte(struct mtd_info *mtd, u_char datum)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='ctx'> 	WriteDOC(datum, docptr, CDSNSlowIO);</div><div class='ctx'> 	WriteDOC(datum, docptr, Mil_CDSN_IO);</div><div class='hunk'>@@ -493,7 +493,7 @@ static u_char doc2001_read_byte(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='ctx'> 	//ReadDOC(docptr, CDSNSlowIO);</div><div class='ctx'> 	/* 11.4.5 -- delay twice to allow extended length cycle */</div><div class='hunk'>@@ -503,50 +503,47 @@ static u_char doc2001_read_byte(struct mtd_info *mtd)</div><div class='ctx'> 	return ReadDOC(docptr, LastDataRead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2001_writebuf(struct mtd_info *mtd,</div><div class='del'>-			     const u_char *buf, int len)</div><div class='add'>+static void doc2001_writebuf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len; i++)</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='ctx'> 		WriteDOC_(buf[i], docptr, DoC_Mil_CDSN_IO + i);</div><div class='ctx'> 	/* Terminate write pipeline */</div><div class='ctx'> 	WriteDOC(0x00, docptr, WritePipeTerm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2001_readbuf(struct mtd_info *mtd,</div><div class='del'>-			    u_char *buf, int len)</div><div class='add'>+static void doc2001_readbuf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Start read pipeline */</div><div class='ctx'> 	ReadDOC(docptr, ReadPipeInit);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len-1; i++)</div><div class='add'>+	for (i = 0; i &lt; len - 1; i++)</div><div class='ctx'> 		buf[i] = ReadDOC(docptr, Mil_CDSN_IO + (i &amp; 0xff));</div><div class='ctx'> </div><div class='ctx'> 	/* Terminate read pipeline */</div><div class='ctx'> 	buf[i] = ReadDOC(docptr, LastDataRead);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc2001_verifybuf(struct mtd_info *mtd,</div><div class='del'>-			     const u_char *buf, int len)</div><div class='add'>+static int doc2001_verifybuf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Start read pipeline */</div><div class='ctx'> 	ReadDOC(docptr, ReadPipeInit);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len-1; i++)</div><div class='add'>+	for (i = 0; i &lt; len - 1; i++)</div><div class='ctx'> 		if (buf[i] != ReadDOC(docptr, Mil_CDSN_IO)) {</div><div class='ctx'> 			ReadDOC(docptr, LastDataRead);</div><div class='ctx'> 			return i;</div><div class='hunk'>@@ -560,87 +557,90 @@ static u_char doc2001plus_read_byte(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	u_char ret;</div><div class='ctx'> </div><div class='del'>-        ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='del'>-        ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='del'>-        ret = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='del'>-	if (debug) printk("read_byte returns %02x\n", ret);</div><div class='add'>+	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='add'>+	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='add'>+	ret = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("read_byte returns %02x\n", ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2001plus_writebuf(struct mtd_info *mtd,</div><div class='del'>-			     const u_char *buf, int len)</div><div class='add'>+static void doc2001plus_writebuf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (debug)printk("writebuf of %d bytes: ", len);</div><div class='del'>-	for (i=0; i &lt; len; i++) {</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("writebuf of %d bytes: ", len);</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='ctx'> 		WriteDOC_(buf[i], docptr, DoC_Mil_CDSN_IO + i);</div><div class='ctx'> 		if (debug &amp;&amp; i &lt; 16)</div><div class='ctx'> 			printk("%02x ", buf[i]);</div><div class='ctx'> 	}</div><div class='del'>-	if (debug) printk("\n");</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2001plus_readbuf(struct mtd_info *mtd,</div><div class='del'>-			    u_char *buf, int len)</div><div class='add'>+static void doc2001plus_readbuf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (debug)printk("readbuf of %d bytes: ", len);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("readbuf of %d bytes: ", len);</div><div class='ctx'> </div><div class='ctx'> 	/* Start read pipeline */</div><div class='ctx'> 	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='ctx'> 	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len-2; i++) {</div><div class='add'>+	for (i = 0; i &lt; len - 2; i++) {</div><div class='ctx'> 		buf[i] = ReadDOC(docptr, Mil_CDSN_IO);</div><div class='ctx'> 		if (debug &amp;&amp; i &lt; 16)</div><div class='ctx'> 			printk("%02x ", buf[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Terminate read pipeline */</div><div class='del'>-	buf[len-2] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='add'>+	buf[len - 2] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='ctx'> 	if (debug &amp;&amp; i &lt; 16)</div><div class='del'>-		printk("%02x ", buf[len-2]);</div><div class='del'>-	buf[len-1] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='add'>+		printk("%02x ", buf[len - 2]);</div><div class='add'>+	buf[len - 1] = ReadDOC(docptr, Mplus_LastDataRead);</div><div class='ctx'> 	if (debug &amp;&amp; i &lt; 16)</div><div class='del'>-		printk("%02x ", buf[len-1]);</div><div class='del'>-	if (debug) printk("\n");</div><div class='add'>+		printk("%02x ", buf[len - 1]);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc2001plus_verifybuf(struct mtd_info *mtd,</div><div class='del'>-			     const u_char *buf, int len)</div><div class='add'>+static int doc2001plus_verifybuf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (debug)printk("verifybuf of %d bytes: ", len);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("verifybuf of %d bytes: ", len);</div><div class='ctx'> </div><div class='ctx'> 	/* Start read pipeline */</div><div class='ctx'> 	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='ctx'> 	ReadDOC(docptr, Mplus_ReadPipeInit);</div><div class='ctx'> </div><div class='del'>-	for (i=0; i &lt; len-2; i++)</div><div class='add'>+	for (i = 0; i &lt; len - 2; i++)</div><div class='ctx'> 		if (buf[i] != ReadDOC(docptr, Mil_CDSN_IO)) {</div><div class='ctx'> 			ReadDOC(docptr, Mplus_LastDataRead);</div><div class='ctx'> 			ReadDOC(docptr, Mplus_LastDataRead);</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='del'>-	if (buf[len-2] != ReadDOC(docptr, Mplus_LastDataRead))</div><div class='del'>-		return len-2;</div><div class='del'>-	if (buf[len-1] != ReadDOC(docptr, Mplus_LastDataRead))</div><div class='del'>-		return len-1;</div><div class='add'>+	if (buf[len - 2] != ReadDOC(docptr, Mplus_LastDataRead))</div><div class='add'>+		return len - 2;</div><div class='add'>+	if (buf[len - 1] != ReadDOC(docptr, Mplus_LastDataRead))</div><div class='add'>+		return len - 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -648,10 +648,11 @@ static void doc2001plus_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int floor = 0;</div><div class='ctx'> </div><div class='del'>-	if(debug)printk("select chip (%d)\n", chip);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("select chip (%d)\n", chip);</div><div class='ctx'> </div><div class='ctx'> 	if (chip == -1) {</div><div class='ctx'> 		/* Disable flash internally */</div><div class='hunk'>@@ -660,7 +661,7 @@ static void doc2001plus_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	floor = chip / doc-&gt;chips_per_floor;</div><div class='del'>-	chip -= (floor *  doc-&gt;chips_per_floor);</div><div class='add'>+	chip -= (floor * doc-&gt;chips_per_floor);</div><div class='ctx'> </div><div class='ctx'> 	/* Assert ChipEnable and deassert WriteProtect */</div><div class='ctx'> 	WriteDOC((DOC_FLASH_CE), docptr, Mplus_FlashSelect);</div><div class='hunk'>@@ -674,72 +675,61 @@ static void doc200x_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int floor = 0;</div><div class='ctx'> </div><div class='del'>-	if(debug)printk("select chip (%d)\n", chip);</div><div class='add'>+	if (debug)</div><div class='add'>+		printk("select chip (%d)\n", chip);</div><div class='ctx'> </div><div class='ctx'> 	if (chip == -1)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	floor = chip / doc-&gt;chips_per_floor;</div><div class='del'>-	chip -= (floor *  doc-&gt;chips_per_floor);</div><div class='add'>+	chip -= (floor * doc-&gt;chips_per_floor);</div><div class='ctx'> </div><div class='ctx'> 	/* 11.4.4 -- deassert CE before changing chip */</div><div class='del'>-	doc200x_hwcontrol(mtd, NAND_CTL_CLRNCE);</div><div class='add'>+	doc200x_hwcontrol(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	WriteDOC(floor, docptr, FloorSelect);</div><div class='ctx'> 	WriteDOC(chip, docptr, CDSNDeviceSelect);</div><div class='ctx'> </div><div class='del'>-	doc200x_hwcontrol(mtd, NAND_CTL_SETNCE);</div><div class='add'>+	doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	doc-&gt;curchip = chip;</div><div class='ctx'> 	doc-&gt;curfloor = floor;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+#define CDSN_CTRL_MSK (CDSN_CTRL_CE | CDSN_CTRL_CLE | CDSN_CTRL_ALE)</div><div class='add'>+</div><div class='add'>+static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+			      unsigned int ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='del'>-	switch(cmd) {</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-		doc-&gt;CDSNControl |= CDSN_CTRL_CE;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		doc-&gt;CDSNControl &amp;= ~CDSN_CTRL_CE;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		doc-&gt;CDSNControl |= CDSN_CTRL_CLE;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-		doc-&gt;CDSNControl &amp;= ~CDSN_CTRL_CLE;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		doc-&gt;CDSNControl |= CDSN_CTRL_ALE;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-		doc-&gt;CDSNControl &amp;= ~CDSN_CTRL_ALE;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETWP:</div><div class='del'>-		doc-&gt;CDSNControl |= CDSN_CTRL_WP;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRWP:</div><div class='del'>-		doc-&gt;CDSNControl &amp;= ~CDSN_CTRL_WP;</div><div class='del'>-		break;</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		doc-&gt;CDSNControl &amp;= ~CDSN_CTRL_MSK;</div><div class='add'>+		doc-&gt;CDSNControl |= ctrl &amp; CDSN_CTRL_MSK;</div><div class='add'>+		if (debug)</div><div class='add'>+			printk("hwcontrol(%d): %02x\n", cmd, doc-&gt;CDSNControl);</div><div class='add'>+		WriteDOC(doc-&gt;CDSNControl, docptr, CDSNControl);</div><div class='add'>+		/* 11.4.3 -- 4 NOPs after CSDNControl write */</div><div class='add'>+		DoC_Delay(doc, 4);</div><div class='add'>+	}</div><div class='add'>+	if (cmd != NAND_CMD_NONE) {</div><div class='add'>+		if (DoC_is_2000(doc))</div><div class='add'>+			doc2000_write_byte(mtd, cmd);</div><div class='add'>+		else</div><div class='add'>+			doc2001_write_byte(mtd, cmd);</div><div class='ctx'> 	}</div><div class='del'>-	if (debug)printk("hwcontrol(%d): %02x\n", cmd, doc-&gt;CDSNControl);</div><div class='del'>-	WriteDOC(doc-&gt;CDSNControl, docptr, CDSNControl);</div><div class='del'>-	/* 11.4.3 -- 4 NOPs after CSDNControl write */</div><div class='del'>-	DoC_Delay(doc, 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)</div><div class='add'>+static void doc2001plus_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Must terminate write pipeline before sending any commands</div><div class='hunk'>@@ -756,9 +746,9 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col</div><div class='ctx'> 	if (command == NAND_CMD_SEQIN) {</div><div class='ctx'> 		int readcmd;</div><div class='ctx'> </div><div class='del'>-		if (column &gt;= mtd-&gt;oobblock) {</div><div class='add'>+		if (column &gt;= mtd-&gt;writesize) {</div><div class='ctx'> 			/* OOB area */</div><div class='del'>-			column -= mtd-&gt;oobblock;</div><div class='add'>+			column -= mtd-&gt;writesize;</div><div class='ctx'> 			readcmd = NAND_CMD_READOOB;</div><div class='ctx'> 		} else if (column &lt; 256) {</div><div class='ctx'> 			/* First 256 bytes --&gt; READ0 */</div><div class='hunk'>@@ -782,25 +772,26 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col</div><div class='ctx'> 			WriteDOC(column, docptr, Mplus_FlashAddress);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (page_addr != -1) {</div><div class='del'>-			WriteDOC((unsigned char) (page_addr &amp; 0xff), docptr, Mplus_FlashAddress);</div><div class='del'>-			WriteDOC((unsigned char) ((page_addr &gt;&gt; 8) &amp; 0xff), docptr, Mplus_FlashAddress);</div><div class='add'>+			WriteDOC((unsigned char)(page_addr &amp; 0xff), docptr, Mplus_FlashAddress);</div><div class='add'>+			WriteDOC((unsigned char)((page_addr &gt;&gt; 8) &amp; 0xff), docptr, Mplus_FlashAddress);</div><div class='ctx'> 			/* One more address cycle for higher density devices */</div><div class='ctx'> 			if (this-&gt;chipsize &amp; 0x0c000000) {</div><div class='del'>-				WriteDOC((unsigned char) ((page_addr &gt;&gt; 16) &amp; 0x0f), docptr, Mplus_FlashAddress);</div><div class='add'>+				WriteDOC((unsigned char)((page_addr &gt;&gt; 16) &amp; 0x0f), docptr, Mplus_FlashAddress);</div><div class='ctx'> 				printk("high density\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		WriteDOC(0, docptr, Mplus_WritePipeTerm);</div><div class='ctx'> 		WriteDOC(0, docptr, Mplus_WritePipeTerm);</div><div class='ctx'> 		/* deassert ALE */</div><div class='del'>-		if (command == NAND_CMD_READ0 || command == NAND_CMD_READ1 || command == NAND_CMD_READOOB || command == NAND_CMD_READID)</div><div class='add'>+		if (command == NAND_CMD_READ0 || command == NAND_CMD_READ1 ||</div><div class='add'>+		    command == NAND_CMD_READOOB || command == NAND_CMD_READID)</div><div class='ctx'> 			WriteDOC(0, docptr, Mplus_FlashControl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * program and erase have their own busy handlers</div><div class='ctx'> 	 * status and sequential in needs no delay</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> 	switch (command) {</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_PAGEPROG:</div><div class='hunk'>@@ -817,55 +808,57 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col</div><div class='ctx'> 		WriteDOC(NAND_CMD_STATUS, docptr, Mplus_FlashCmd);</div><div class='ctx'> 		WriteDOC(0, docptr, Mplus_WritePipeTerm);</div><div class='ctx'> 		WriteDOC(0, docptr, Mplus_WritePipeTerm);</div><div class='del'>-		while ( !(this-&gt;read_byte(mtd) &amp; 0x40));</div><div class='add'>+		while (!(this-&gt;read_byte(mtd) &amp; 0x40)) ;</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* This applies to read commands */</div><div class='add'>+		/* This applies to read commands */</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we don't have access to the busy pin, we apply the given</div><div class='ctx'> 		 * command delay</div><div class='del'>-		*/</div><div class='add'>+		 */</div><div class='ctx'> 		if (!this-&gt;dev_ready) {</div><div class='del'>-			udelay (this-&gt;chip_delay);</div><div class='add'>+			udelay(this-&gt;chip_delay);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Apply this short delay always to ensure that we do wait tWB in</div><div class='ctx'> 	 * any case on any machine. */</div><div class='del'>-	ndelay (100);</div><div class='add'>+	ndelay(100);</div><div class='ctx'> 	/* wait until command is processed */</div><div class='del'>-	while (!this-&gt;dev_ready(mtd));</div><div class='add'>+	while (!this-&gt;dev_ready(mtd)) ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int doc200x_dev_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='ctx'> 	if (DoC_is_MillenniumPlus(doc)) {</div><div class='ctx'> 		/* 11.4.2 -- must NOP four times before checking FR/B# */</div><div class='ctx'> 		DoC_Delay(doc, 4);</div><div class='ctx'> 		if ((ReadDOC(docptr, Mplus_FlashControl) &amp; CDSN_CTRL_FR_B_MASK) != CDSN_CTRL_FR_B_MASK) {</div><div class='del'>-			if(debug)</div><div class='add'>+			if (debug)</div><div class='ctx'> 				printk("not ready\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (debug)printk("was ready\n");</div><div class='add'>+		if (debug)</div><div class='add'>+			printk("was ready\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* 11.4.2 -- must NOP four times before checking FR/B# */</div><div class='ctx'> 		DoC_Delay(doc, 4);</div><div class='ctx'> 		if (!(ReadDOC(docptr, CDSNControl) &amp; CDSN_CTRL_FR_B)) {</div><div class='del'>-			if(debug)</div><div class='add'>+			if (debug)</div><div class='ctx'> 				printk("not ready\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* 11.4.2 -- Must NOP twice if it's ready */</div><div class='ctx'> 		DoC_Delay(doc, 2);</div><div class='del'>-		if (debug)printk("was ready\n");</div><div class='add'>+		if (debug)</div><div class='add'>+			printk("was ready\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -881,10 +874,10 @@ static void doc200x_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='ctx'> 	/* Prime the ECC engine */</div><div class='del'>-	switch(mode) {</div><div class='add'>+	switch (mode) {</div><div class='ctx'> 	case NAND_ECC_READ:</div><div class='ctx'> 		WriteDOC(DOC_ECC_RESET, docptr, ECCConf);</div><div class='ctx'> 		WriteDOC(DOC_ECC_EN, docptr, ECCConf);</div><div class='hunk'>@@ -900,10 +893,10 @@ static void doc2001plus_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> </div><div class='ctx'> 	/* Prime the ECC engine */</div><div class='del'>-	switch(mode) {</div><div class='add'>+	switch (mode) {</div><div class='ctx'> 	case NAND_ECC_READ:</div><div class='ctx'> 		WriteDOC(DOC_ECC_RESET, docptr, Mplus_ECCConf);</div><div class='ctx'> 		WriteDOC(DOC_ECC_EN, docptr, Mplus_ECCConf);</div><div class='hunk'>@@ -916,12 +909,11 @@ static void doc2001plus_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This code is only called on write */</div><div class='del'>-static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,</div><div class='del'>-				 unsigned char *ecc_code)</div><div class='add'>+static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat, unsigned char *ecc_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int emptymatch = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -961,7 +953,8 @@ static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,</div><div class='ctx'> 		   often.  It could be optimized away by examining the data in</div><div class='ctx'> 		   the writebuf routine, and remembering the result. */</div><div class='ctx'> 		for (i = 0; i &lt; 512; i++) {</div><div class='del'>-			if (dat[i] == 0xff) continue;</div><div class='add'>+			if (dat[i] == 0xff)</div><div class='add'>+				continue;</div><div class='ctx'> 			emptymatch = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -969,17 +962,20 @@ static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,</div><div class='ctx'> 	/* If emptymatch still =1, we do have an all-0xff data buffer.</div><div class='ctx'> 	   Return all-0xff ecc value instead of the computed one, so</div><div class='ctx'> 	   it'll look just like a freshly-erased page. */</div><div class='del'>-	if (emptymatch) memset(ecc_code, 0xff, 6);</div><div class='add'>+	if (emptymatch)</div><div class='add'>+		memset(ecc_code, 0xff, 6);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)</div><div class='add'>+static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,</div><div class='add'>+				u_char *read_ecc, u_char *isnull)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = 0;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='del'>-        void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	void __iomem *docptr = doc-&gt;virtadr;</div><div class='add'>+	uint8_t calc_ecc[6];</div><div class='ctx'> 	volatile u_char dummy;</div><div class='ctx'> 	int emptymatch = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1012,18 +1008,20 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_</div><div class='ctx'> 		   all-0xff data and stored ecc block.  Check the stored ecc. */</div><div class='ctx'> 		if (emptymatch) {</div><div class='ctx'> 			for (i = 0; i &lt; 6; i++) {</div><div class='del'>-				if (read_ecc[i] == 0xff) continue;</div><div class='add'>+				if (read_ecc[i] == 0xff)</div><div class='add'>+					continue;</div><div class='ctx'> 				emptymatch = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* If emptymatch still =1, check the data block. */</div><div class='ctx'> 		if (emptymatch) {</div><div class='del'>-		/* Note: this somewhat expensive test should not be triggered</div><div class='del'>-		   often.  It could be optimized away by examining the data in</div><div class='del'>-		   the readbuf routine, and remembering the result. */</div><div class='add'>+			/* Note: this somewhat expensive test should not be triggered</div><div class='add'>+			   often.  It could be optimized away by examining the data in</div><div class='add'>+			   the readbuf routine, and remembering the result. */</div><div class='ctx'> 			for (i = 0; i &lt; 512; i++) {</div><div class='del'>-				if (dat[i] == 0xff) continue;</div><div class='add'>+				if (dat[i] == 0xff)</div><div class='add'>+					continue;</div><div class='ctx'> 				emptymatch = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1032,7 +1030,8 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_</div><div class='ctx'> 		   erased block, in which case the ECC will not come out right.</div><div class='ctx'> 		   We'll suppress the error and tell the caller everything's</div><div class='ctx'> 		   OK.  Because it is. */</div><div class='del'>-		if (!emptymatch) ret = doc_ecc_decode (rs_decoder, dat, calc_ecc);</div><div class='add'>+		if (!emptymatch)</div><div class='add'>+			ret = doc_ecc_decode(rs_decoder, dat, calc_ecc);</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			printk(KERN_ERR "doc200x_correct_data corrected %d errors\n", ret);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1059,11 +1058,10 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_</div><div class='ctx'>  * safer.  The only problem with it is that any code that parses oobfree must</div><div class='ctx'>  * be able to handle out-of-order segments.</div><div class='ctx'>  */</div><div class='del'>-static struct nand_oobinfo doc200x_oobinfo = {</div><div class='del'>-        .useecc = MTD_NANDECC_AUTOPLACE,</div><div class='del'>-        .eccbytes = 6,</div><div class='del'>-        .eccpos = {0, 1, 2, 3, 4, 5},</div><div class='del'>-        .oobfree = { {8, 8}, {6, 2} }</div><div class='add'>+static struct nand_ecclayout doc200x_oobinfo = {</div><div class='add'>+	.eccbytes = 6,</div><div class='add'>+	.eccpos = {0, 1, 2, 3, 4, 5},</div><div class='add'>+	.oobfree = {{8, 8}, {6, 2}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Find the (I)NFTL Media Header, and optionally also the mirror media header.</div><div class='hunk'>@@ -1072,8 +1070,7 @@ static struct nand_oobinfo doc200x_oobinfo = {</div><div class='ctx'>    either "ANAND" or "BNAND".  If findmirror=1, also look for the mirror media</div><div class='ctx'>    header.  The page #s of the found media headers are placed in mh0_page and</div><div class='ctx'>    mh1_page in the DOC private structure. */</div><div class='del'>-static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,</div><div class='del'>-				     const char *id, int findmirror)</div><div class='add'>+static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const char *id, int findmirror)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='hunk'>@@ -1082,17 +1079,19 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	for (offs = 0; offs &lt; mtd-&gt;size; offs += mtd-&gt;erasesize) {</div><div class='del'>-		ret = mtd-&gt;read(mtd, offs, mtd-&gt;oobblock, &amp;retlen, buf);</div><div class='del'>-		if (retlen != mtd-&gt;oobblock) continue;</div><div class='add'>+		ret = mtd-&gt;read(mtd, offs, mtd-&gt;writesize, &amp;retlen, buf);</div><div class='add'>+		if (retlen != mtd-&gt;writesize)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			printk(KERN_WARNING "ECC error scanning DOC at 0x%x\n",</div><div class='del'>-				offs);</div><div class='add'>+			printk(KERN_WARNING "ECC error scanning DOC at 0x%x\n", offs);</div><div class='ctx'> 		}</div><div class='del'>-		if (memcmp(buf, id, 6)) continue;</div><div class='add'>+		if (memcmp(buf, id, 6))</div><div class='add'>+			continue;</div><div class='ctx'> 		printk(KERN_INFO "Found DiskOnChip %s Media Header at 0x%x\n", id, offs);</div><div class='ctx'> 		if (doc-&gt;mh0_page == -1) {</div><div class='ctx'> 			doc-&gt;mh0_page = offs &gt;&gt; this-&gt;page_shift;</div><div class='del'>-			if (!findmirror) return 1;</div><div class='add'>+			if (!findmirror)</div><div class='add'>+				return 1;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		doc-&gt;mh1_page = offs &gt;&gt; this-&gt;page_shift;</div><div class='hunk'>@@ -1105,8 +1104,8 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,</div><div class='ctx'> 	/* Only one mediaheader was found.  We want buf to contain a</div><div class='ctx'> 	   mediaheader on return, so we'll have to re-read the one we found. */</div><div class='ctx'> 	offs = doc-&gt;mh0_page &lt;&lt; this-&gt;page_shift;</div><div class='del'>-	ret = mtd-&gt;read(mtd, offs, mtd-&gt;oobblock, &amp;retlen, buf);</div><div class='del'>-	if (retlen != mtd-&gt;oobblock) {</div><div class='add'>+	ret = mtd-&gt;read(mtd, offs, mtd-&gt;writesize, &amp;retlen, buf);</div><div class='add'>+	if (retlen != mtd-&gt;writesize) {</div><div class='ctx'> 		/* Insanity.  Give up. */</div><div class='ctx'> 		printk(KERN_ERR "Read DiskOnChip Media Header once, but can't reread it???\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1114,8 +1113,7 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int __init nftl_partscan(struct mtd_info *mtd,</div><div class='del'>-				struct mtd_partition *parts)</div><div class='add'>+static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partition *parts)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='hunk'>@@ -1127,13 +1125,14 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,</div><div class='ctx'> 	unsigned blocks, maxblocks;</div><div class='ctx'> 	int offs, numheaders;</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(mtd-&gt;oobblock, GFP_KERNEL);</div><div class='add'>+	buf = kmalloc(mtd-&gt;writesize, GFP_KERNEL);</div><div class='ctx'> 	if (!buf) {</div><div class='ctx'> 		printk(KERN_ERR "DiskOnChip mediaheader kmalloc failed!\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (!(numheaders=find_media_headers(mtd, buf, "ANAND", 1))) goto out;</div><div class='del'>-	mh = (struct NFTLMediaHeader *) buf;</div><div class='add'>+	if (!(numheaders = find_media_headers(mtd, buf, "ANAND", 1)))</div><div class='add'>+		goto out;</div><div class='add'>+	mh = (struct NFTLMediaHeader *)buf;</div><div class='ctx'> </div><div class='ctx'> 	mh-&gt;NumEraseUnits = le16_to_cpu(mh-&gt;NumEraseUnits);</div><div class='ctx'> 	mh-&gt;FirstPhysicalEUN = le16_to_cpu(mh-&gt;FirstPhysicalEUN);</div><div class='hunk'>@@ -1155,8 +1154,8 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,</div><div class='ctx'> 		/* Auto-determine UnitSizeFactor.  The constraints are:</div><div class='ctx'> 		   - There can be at most 32768 virtual blocks.</div><div class='ctx'> 		   - There can be at most (virtual block size - page size)</div><div class='del'>-		     virtual blocks (because MediaHeader+BBT must fit in 1).</div><div class='del'>-		*/</div><div class='add'>+		   virtual blocks (because MediaHeader+BBT must fit in 1).</div><div class='add'>+		 */</div><div class='ctx'> 		mh-&gt;UnitSizeFactor = 0xff;</div><div class='ctx'> 		while (blocks &gt; maxblocks) {</div><div class='ctx'> 			blocks &gt;&gt;= 1;</div><div class='hunk'>@@ -1211,14 +1210,13 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = numparts;</div><div class='del'>-out:</div><div class='add'>+ out:</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This is a stripped-down copy of the code in inftlmount.c */</div><div class='del'>-static inline int __init inftl_partscan(struct mtd_info *mtd,</div><div class='del'>-				 struct mtd_partition *parts)</div><div class='add'>+static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partition *parts)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='hunk'>@@ -1235,15 +1233,16 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,</div><div class='ctx'> 	if (inftl_bbt_write)</div><div class='ctx'> 		end -= (INFTL_BBT_RESERVED_BLOCKS &lt;&lt; this-&gt;phys_erase_shift);</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(mtd-&gt;oobblock, GFP_KERNEL);</div><div class='add'>+	buf = kmalloc(mtd-&gt;writesize, GFP_KERNEL);</div><div class='ctx'> 	if (!buf) {</div><div class='ctx'> 		printk(KERN_ERR "DiskOnChip mediaheader kmalloc failed!\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!find_media_headers(mtd, buf, "BNAND", 0)) goto out;</div><div class='add'>+	if (!find_media_headers(mtd, buf, "BNAND", 0))</div><div class='add'>+		goto out;</div><div class='ctx'> 	doc-&gt;mh1_page = doc-&gt;mh0_page + (4096 &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	mh = (struct INFTLMediaHeader *) buf;</div><div class='add'>+	mh = (struct INFTLMediaHeader *)buf;</div><div class='ctx'> </div><div class='ctx'> 	mh-&gt;NoOfBootImageBlocks = le32_to_cpu(mh-&gt;NoOfBootImageBlocks);</div><div class='ctx'> 	mh-&gt;NoOfBinaryPartitions = le32_to_cpu(mh-&gt;NoOfBinaryPartitions);</div><div class='hunk'>@@ -1319,8 +1318,10 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,</div><div class='ctx'> 		parts[numparts].offset = ip-&gt;firstUnit &lt;&lt; vshift;</div><div class='ctx'> 		parts[numparts].size = (1 + ip-&gt;lastUnit - ip-&gt;firstUnit) &lt;&lt; vshift;</div><div class='ctx'> 		numparts++;</div><div class='del'>-		if (ip-&gt;lastUnit &gt; lastvunit) lastvunit = ip-&gt;lastUnit;</div><div class='del'>-		if (ip-&gt;flags &amp; INFTL_LAST) break;</div><div class='add'>+		if (ip-&gt;lastUnit &gt; lastvunit)</div><div class='add'>+			lastvunit = ip-&gt;lastUnit;</div><div class='add'>+		if (ip-&gt;flags &amp; INFTL_LAST)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	lastvunit++;</div><div class='ctx'> 	if ((lastvunit &lt;&lt; vshift) &lt; end) {</div><div class='hunk'>@@ -1330,7 +1331,7 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,</div><div class='ctx'> 		numparts++;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = numparts;</div><div class='del'>-out:</div><div class='add'>+ out:</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1342,11 +1343,12 @@ static int __init nftl_scan_bbt(struct mtd_info *mtd)</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='ctx'> 	struct mtd_partition parts[2];</div><div class='ctx'> </div><div class='del'>-	memset((char *) parts, 0, sizeof(parts));</div><div class='add'>+	memset((char *)parts, 0, sizeof(parts));</div><div class='ctx'> 	/* On NFTL, we have to find the media headers before we can read the</div><div class='ctx'> 	   BBTs, since they're stored in the media header eraseblocks. */</div><div class='ctx'> 	numparts = nftl_partscan(mtd, parts);</div><div class='del'>-	if (!numparts) return -EIO;</div><div class='add'>+	if (!numparts)</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	this-&gt;bbt_td-&gt;options = NAND_BBT_ABSPAGE | NAND_BBT_8BIT |</div><div class='ctx'> 				NAND_BBT_SAVECONTENT | NAND_BBT_WRITE |</div><div class='ctx'> 				NAND_BBT_VERSION;</div><div class='hunk'>@@ -1393,8 +1395,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)</div><div class='ctx'> 		this-&gt;bbt_td-&gt;pages[0] = 2;</div><div class='ctx'> 		this-&gt;bbt_md = NULL;</div><div class='ctx'> 	} else {</div><div class='del'>-		this-&gt;bbt_td-&gt;options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |</div><div class='del'>-					NAND_BBT_VERSION;</div><div class='add'>+		this-&gt;bbt_td-&gt;options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT | NAND_BBT_VERSION;</div><div class='ctx'> 		if (inftl_bbt_write)</div><div class='ctx'> 			this-&gt;bbt_td-&gt;options |= NAND_BBT_WRITE;</div><div class='ctx'> 		this-&gt;bbt_td-&gt;offs = 8;</div><div class='hunk'>@@ -1404,8 +1405,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)</div><div class='ctx'> 		this-&gt;bbt_td-&gt;reserved_block_code = 0x01;</div><div class='ctx'> 		this-&gt;bbt_td-&gt;pattern = "MSYS_BBT";</div><div class='ctx'> </div><div class='del'>-		this-&gt;bbt_md-&gt;options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |</div><div class='del'>-					NAND_BBT_VERSION;</div><div class='add'>+		this-&gt;bbt_md-&gt;options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT | NAND_BBT_VERSION;</div><div class='ctx'> 		if (inftl_bbt_write)</div><div class='ctx'> 			this-&gt;bbt_md-&gt;options |= NAND_BBT_WRITE;</div><div class='ctx'> 		this-&gt;bbt_md-&gt;offs = 8;</div><div class='hunk'>@@ -1420,12 +1420,13 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)</div><div class='ctx'> 	   At least as nand_bbt.c is currently written. */</div><div class='ctx'> 	if ((ret = nand_scan_bbt(mtd, NULL)))</div><div class='ctx'> 		return ret;</div><div class='del'>-	memset((char *) parts, 0, sizeof(parts));</div><div class='add'>+	memset((char *)parts, 0, sizeof(parts));</div><div class='ctx'> 	numparts = inftl_partscan(mtd, parts);</div><div class='ctx'> 	/* At least for now, require the INFTL Media Header.  We could probably</div><div class='ctx'> 	   do without it for non-INFTL use, since all it gives us is</div><div class='ctx'> 	   autopartitioning, but I want to give it more thought. */</div><div class='del'>-	if (!numparts) return -EIO;</div><div class='add'>+	if (!numparts)</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	add_mtd_device(mtd);</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> 	if (!no_autopart)</div><div class='hunk'>@@ -1439,7 +1440,6 @@ static inline int __init doc2000_init(struct mtd_info *mtd)</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	this-&gt;write_byte = doc2000_write_byte;</div><div class='ctx'> 	this-&gt;read_byte = doc2000_read_byte;</div><div class='ctx'> 	this-&gt;write_buf = doc2000_writebuf;</div><div class='ctx'> 	this-&gt;read_buf = doc2000_readbuf;</div><div class='hunk'>@@ -1457,7 +1457,6 @@ static inline int __init doc2001_init(struct mtd_info *mtd)</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	this-&gt;write_byte = doc2001_write_byte;</div><div class='ctx'> 	this-&gt;read_byte = doc2001_read_byte;</div><div class='ctx'> 	this-&gt;write_buf = doc2001_writebuf;</div><div class='ctx'> 	this-&gt;read_buf = doc2001_readbuf;</div><div class='hunk'>@@ -1489,16 +1488,15 @@ static inline int __init doc2001plus_init(struct mtd_info *mtd)</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	struct doc_priv *doc = this-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	this-&gt;write_byte = NULL;</div><div class='ctx'> 	this-&gt;read_byte = doc2001plus_read_byte;</div><div class='ctx'> 	this-&gt;write_buf = doc2001plus_writebuf;</div><div class='ctx'> 	this-&gt;read_buf = doc2001plus_readbuf;</div><div class='ctx'> 	this-&gt;verify_buf = doc2001plus_verifybuf;</div><div class='ctx'> 	this-&gt;scan_bbt = inftl_scan_bbt;</div><div class='del'>-	this-&gt;hwcontrol = NULL;</div><div class='add'>+	this-&gt;cmd_ctrl = NULL;</div><div class='ctx'> 	this-&gt;select_chip = doc2001plus_select_chip;</div><div class='ctx'> 	this-&gt;cmdfunc = doc2001plus_command;</div><div class='del'>-	this-&gt;enable_hwecc = doc2001plus_enable_hwecc;</div><div class='add'>+	this-&gt;ecc.hwctl = doc2001plus_enable_hwecc;</div><div class='ctx'> </div><div class='ctx'> 	doc-&gt;chips_per_floor = 1;</div><div class='ctx'> 	mtd-&gt;name = "DiskOnChip Millennium Plus";</div><div class='hunk'>@@ -1535,20 +1533,16 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> 	save_control = ReadDOC(virtadr, DOCControl);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the DiskOnChip ASIC */</div><div class='del'>-	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,</div><div class='del'>-		 virtadr, DOCControl);</div><div class='del'>-	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,</div><div class='del'>-		 virtadr, DOCControl);</div><div class='add'>+	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, virtadr, DOCControl);</div><div class='add'>+	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, virtadr, DOCControl);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the DiskOnChip ASIC */</div><div class='del'>-	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,</div><div class='del'>-		 virtadr, DOCControl);</div><div class='del'>-	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,</div><div class='del'>-		 virtadr, DOCControl);</div><div class='add'>+	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, virtadr, DOCControl);</div><div class='add'>+	WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, virtadr, DOCControl);</div><div class='ctx'> </div><div class='ctx'> 	ChipID = ReadDOC(virtadr, ChipID);</div><div class='ctx'> </div><div class='del'>-	switch(ChipID) {</div><div class='add'>+	switch (ChipID) {</div><div class='ctx'> 	case DOC_ChipID_Doc2k:</div><div class='ctx'> 		reg = DoC_2k_ECCStatus;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1564,15 +1558,13 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> 			ReadDOC(virtadr, Mplus_Power);</div><div class='ctx'> </div><div class='ctx'> 		/* Reset the Millennium Plus ASIC */</div><div class='del'>-		tmp = DOC_MODE_RESET | DOC_MODE_MDWREN | DOC_MODE_RST_LAT |</div><div class='del'>-			DOC_MODE_BDECT;</div><div class='add'>+		tmp = DOC_MODE_RESET | DOC_MODE_MDWREN | DOC_MODE_RST_LAT | DOC_MODE_BDECT;</div><div class='ctx'> 		WriteDOC(tmp, virtadr, Mplus_DOCControl);</div><div class='ctx'> 		WriteDOC(~tmp, virtadr, Mplus_CtrlConfirm);</div><div class='ctx'> </div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 		/* Enable the Millennium Plus ASIC */</div><div class='del'>-		tmp = DOC_MODE_NORMAL | DOC_MODE_MDWREN | DOC_MODE_RST_LAT |</div><div class='del'>-			DOC_MODE_BDECT;</div><div class='add'>+		tmp = DOC_MODE_NORMAL | DOC_MODE_MDWREN | DOC_MODE_RST_LAT | DOC_MODE_BDECT;</div><div class='ctx'> 		WriteDOC(tmp, virtadr, Mplus_DOCControl);</div><div class='ctx'> 		WriteDOC(~tmp, virtadr, Mplus_CtrlConfirm);</div><div class='ctx'> 		mdelay(1);</div><div class='hunk'>@@ -1596,7 +1588,7 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> 		goto notfound;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Check the TOGGLE bit in the ECC register */</div><div class='del'>-	tmp  = ReadDOC_(virtadr, reg) &amp; DOC_TOGGLE_BIT;</div><div class='add'>+	tmp = ReadDOC_(virtadr, reg) &amp; DOC_TOGGLE_BIT;</div><div class='ctx'> 	tmpb = ReadDOC_(virtadr, reg) &amp; DOC_TOGGLE_BIT;</div><div class='ctx'> 	tmpc = ReadDOC_(virtadr, reg) &amp; DOC_TOGGLE_BIT;</div><div class='ctx'> 	if ((tmp == tmpb) || (tmp != tmpc)) {</div><div class='hunk'>@@ -1626,11 +1618,11 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> 		if (ChipID == DOC_ChipID_DocMilPlus16) {</div><div class='ctx'> 			WriteDOC(~newval, virtadr, Mplus_AliasResolution);</div><div class='ctx'> 			oldval = ReadDOC(doc-&gt;virtadr, Mplus_AliasResolution);</div><div class='del'>-			WriteDOC(newval, virtadr, Mplus_AliasResolution); // restore it</div><div class='add'>+			WriteDOC(newval, virtadr, Mplus_AliasResolution);	// restore it</div><div class='ctx'> 		} else {</div><div class='ctx'> 			WriteDOC(~newval, virtadr, AliasResolution);</div><div class='ctx'> 			oldval = ReadDOC(doc-&gt;virtadr, AliasResolution);</div><div class='del'>-			WriteDOC(newval, virtadr, AliasResolution); // restore it</div><div class='add'>+			WriteDOC(newval, virtadr, AliasResolution);	// restore it</div><div class='ctx'> 		}</div><div class='ctx'> 		newval = ~newval;</div><div class='ctx'> 		if (oldval == newval) {</div><div class='hunk'>@@ -1642,10 +1634,8 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> 	printk(KERN_NOTICE "DiskOnChip found at 0x%lx\n", physadr);</div><div class='ctx'> </div><div class='ctx'> 	len = sizeof(struct mtd_info) +</div><div class='del'>-	      sizeof(struct nand_chip) +</div><div class='del'>-	      sizeof(struct doc_priv) +</div><div class='del'>-	      (2 * sizeof(struct nand_bbt_descr));</div><div class='del'>-	mtd =  kmalloc(len, GFP_KERNEL);</div><div class='add'>+	    sizeof(struct nand_chip) + sizeof(struct doc_priv) + (2 * sizeof(struct nand_bbt_descr));</div><div class='add'>+	mtd = kmalloc(len, GFP_KERNEL);</div><div class='ctx'> 	if (!mtd) {</div><div class='ctx'> 		printk(KERN_ERR "DiskOnChip kmalloc (%d bytes) failed!\n", len);</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='hunk'>@@ -1663,17 +1653,19 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> </div><div class='ctx'> 	nand-&gt;priv		= doc;</div><div class='ctx'> 	nand-&gt;select_chip	= doc200x_select_chip;</div><div class='del'>-	nand-&gt;hwcontrol		= doc200x_hwcontrol;</div><div class='add'>+	nand-&gt;cmd_ctrl		= doc200x_hwcontrol;</div><div class='ctx'> 	nand-&gt;dev_ready		= doc200x_dev_ready;</div><div class='ctx'> 	nand-&gt;waitfunc		= doc200x_wait;</div><div class='ctx'> 	nand-&gt;block_bad		= doc200x_block_bad;</div><div class='del'>-	nand-&gt;enable_hwecc	= doc200x_enable_hwecc;</div><div class='del'>-	nand-&gt;calculate_ecc	= doc200x_calculate_ecc;</div><div class='del'>-	nand-&gt;correct_data	= doc200x_correct_data;</div><div class='add'>+	nand-&gt;ecc.hwctl		= doc200x_enable_hwecc;</div><div class='add'>+	nand-&gt;ecc.calculate	= doc200x_calculate_ecc;</div><div class='add'>+	nand-&gt;ecc.correct	= doc200x_correct_data;</div><div class='ctx'> </div><div class='del'>-	nand-&gt;autooob		= &amp;doc200x_oobinfo;</div><div class='del'>-	nand-&gt;eccmode		= NAND_ECC_HW6_512;</div><div class='del'>-	nand-&gt;options		= NAND_USE_FLASH_BBT | NAND_HWECC_SYNDROME;</div><div class='add'>+	nand-&gt;ecc.layout	= &amp;doc200x_oobinfo;</div><div class='add'>+	nand-&gt;ecc.mode		= NAND_ECC_HW_SYNDROME;</div><div class='add'>+	nand-&gt;ecc.size		= 512;</div><div class='add'>+	nand-&gt;ecc.bytes		= 6;</div><div class='add'>+	nand-&gt;options		= NAND_USE_FLASH_BBT;</div><div class='ctx'> </div><div class='ctx'> 	doc-&gt;physadr		= physadr;</div><div class='ctx'> 	doc-&gt;virtadr		= virtadr;</div><div class='hunk'>@@ -1707,18 +1699,18 @@ static int __init doc_probe(unsigned long physadr)</div><div class='ctx'> 	doclist = mtd;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-notfound:</div><div class='add'>+ notfound:</div><div class='ctx'> 	/* Put back the contents of the DOCControl register, in case it's not</div><div class='ctx'> 	   actually a DiskOnChip.  */</div><div class='ctx'> 	WriteDOC(save_control, virtadr, DOCControl);</div><div class='del'>-fail:</div><div class='add'>+ fail:</div><div class='ctx'> 	iounmap(virtadr);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void release_nanddoc(void)</div><div class='ctx'> {</div><div class='del'>- 	struct mtd_info *mtd, *nextmtd;</div><div class='add'>+	struct mtd_info *mtd, *nextmtd;</div><div class='ctx'> 	struct nand_chip *nand;</div><div class='ctx'> 	struct doc_priv *doc;</div><div class='ctx'> </div><div class='hunk'>@@ -1747,8 +1739,8 @@ static int __init init_nanddoc(void)</div><div class='ctx'> 	 * generator polinomial degree = 4</div><div class='ctx'> 	 */</div><div class='ctx'> 	rs_decoder = init_rs(10, 0x409, FCR, 1, NROOTS);</div><div class='del'>- 	if (!rs_decoder) {</div><div class='del'>-		printk (KERN_ERR "DiskOnChip: Could not create a RS decoder\n");</div><div class='add'>+	if (!rs_decoder) {</div><div class='add'>+		printk(KERN_ERR "DiskOnChip: Could not create a RS decoder\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1758,7 +1750,7 @@ static int __init init_nanddoc(void)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto outerr;</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i=0; (doc_locations[i] != 0xffffffff); i++) {</div><div class='add'>+		for (i = 0; (doc_locations[i] != 0xffffffff); i++) {</div><div class='ctx'> 			doc_probe(doc_locations[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1770,7 +1762,7 @@ static int __init init_nanddoc(void)</div><div class='ctx'> 		goto outerr;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-outerr:</div><div class='add'>+ outerr:</div><div class='ctx'> 	free_rs(rs_decoder);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c<br/>index 9b1fd2f387fa..516c0e5e564c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/edb7312.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/edb7312.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/edb7312.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/edb7312.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  drivers/mtd/nand/edb7312.c</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2002 Marius Gröger (mag@sysgo.de)</div><div class='add'>+ *  Copyright (C) 2002 Marius Gröger (mag@sysgo.de)</div><div class='ctx'>  *</div><div class='ctx'>  *  Derived from drivers/mtd/nand/autcpu12.c</div><div class='ctx'>  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)</div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt; /* for CLPS7111_VIRT_BASE */</div><div class='add'>+#include &lt;asm/arch/hardware.h&gt;	/* for CLPS7111_VIRT_BASE */</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/hardware/clps7111.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -54,51 +54,45 @@ static struct mtd_info *ep7312_mtd = NULL;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static unsigned long ep7312_fio_pbase = EP7312_FIO_PBASE;</div><div class='del'>-static void __iomem * ep7312_pxdr = (void __iomem *) EP7312_PXDR;</div><div class='del'>-static void __iomem * ep7312_pxddr = (void __iomem *) EP7312_PXDDR;</div><div class='add'>+static void __iomem *ep7312_pxdr = (void __iomem *)EP7312_PXDR;</div><div class='add'>+static void __iomem *ep7312_pxddr = (void __iomem *)EP7312_PXDDR;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> /*</div><div class='ctx'>  * Define static partitions for flash device</div><div class='ctx'>  */</div><div class='ctx'> static struct mtd_partition partition_info[] = {</div><div class='del'>-	{ .name = "EP7312 Nand Flash",</div><div class='del'>-		  .offset = 0,</div><div class='del'>-		  .size = 8*1024*1024 }</div><div class='add'>+	{.name = "EP7312 Nand Flash",</div><div class='add'>+	 .offset = 0,</div><div class='add'>+	 .size = 8 * 1024 * 1024}</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> #define NUM_PARTITIONS 1</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='add'>+ *</div><div class='add'>+ *	NAND_NCE: bit 0 -&gt; bit 7</div><div class='add'>+ *	NAND_CLE: bit 1 -&gt; bit 4</div><div class='add'>+ *	NAND_ALE: bit 2 -&gt; bit 5</div><div class='ctx'>  */</div><div class='del'>-static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)</div><div class='ctx'> {</div><div class='del'>-	switch(cmd) {</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		clps_writeb(clps_readb(ep7312_pxdr) | 0x10, ep7312_pxdr);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-		clps_writeb(clps_readb(ep7312_pxdr) &amp; ~0x10, ep7312_pxdr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		clps_writeb(clps_readb(ep7312_pxdr) | 0x20, ep7312_pxdr);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-		clps_writeb(clps_readb(ep7312_pxdr) &amp; ~0x20, ep7312_pxdr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-		clps_writeb((clps_readb(ep7312_pxdr) | 0x80) &amp; ~0x40, ep7312_pxdr);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		clps_writeb((clps_readb(ep7312_pxdr) | 0x80) | 0x40, ep7312_pxdr);</div><div class='del'>-		break;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		unsigned char bits;</div><div class='add'>+</div><div class='add'>+		bits = (ctrl &amp; (NAND_CLE | NAND_ALE)) &lt;&lt; 3;</div><div class='add'>+		bits = (ctrl &amp; NAND_NCE) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+		clps_writeb((clps_readb(ep7312_pxdr)  &amp; 0xB0) | 0x10,</div><div class='add'>+			    ep7312_pxdr);</div><div class='ctx'> 	}</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -108,6 +102,7 @@ static int ep7312_device_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -115,18 +110,16 @@ const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-static int __init ep7312_init (void)</div><div class='add'>+static int __init ep7312_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	const char *part_type = 0;</div><div class='ctx'> 	int mtd_parts_nb = 0;</div><div class='ctx'> 	struct mtd_partition *mtd_parts = 0;</div><div class='del'>-	void __iomem * ep7312_fio_base;</div><div class='add'>+	void __iomem *ep7312_fio_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	ep7312_mtd = kmalloc(sizeof(struct mtd_info) +</div><div class='del'>-			     sizeof(struct nand_chip),</div><div class='del'>-			     GFP_KERNEL);</div><div class='add'>+	ep7312_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!ep7312_mtd) {</div><div class='ctx'> 		printk("Unable to allocate EDB7312 NAND MTD device structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -134,21 +127,22 @@ static int __init ep7312_init (void)</div><div class='ctx'> </div><div class='ctx'> 	/* map physical adress */</div><div class='ctx'> 	ep7312_fio_base = ioremap(ep7312_fio_pbase, SZ_1K);</div><div class='del'>-	if(!ep7312_fio_base) {</div><div class='add'>+	if (!ep7312_fio_base) {</div><div class='ctx'> 		printk("ioremap EDB7312 NAND flash failed\n");</div><div class='ctx'> 		kfree(ep7312_mtd);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;ep7312_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;ep7312_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) ep7312_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(ep7312_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	ep7312_mtd-&gt;priv = this;</div><div class='add'>+	ep7312_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set GPIO Port B control register so that the pins are configured</div><div class='hunk'>@@ -159,22 +153,20 @@ static int __init ep7312_init (void)</div><div class='ctx'> 	/* insert callbacks */</div><div class='ctx'> 	this-&gt;IO_ADDR_R = ep7312_fio_base;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = ep7312_fio_base;</div><div class='del'>-	this-&gt;hwcontrol = ep7312_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = ep7312_hwcontrol;</div><div class='ctx'> 	this-&gt;dev_ready = ep7312_device_ready;</div><div class='ctx'> 	/* 15 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 15;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device */</div><div class='del'>-	if (nand_scan (ep7312_mtd, 1)) {</div><div class='add'>+	if (nand_scan(ep7312_mtd, 1)) {</div><div class='ctx'> 		iounmap((void *)ep7312_fio_base);</div><div class='del'>-		kfree (ep7312_mtd);</div><div class='add'>+		kfree(ep7312_mtd);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> 	ep7312_mtd-&gt;name = "edb7312-nand";</div><div class='del'>-	mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, part_probes,</div><div class='del'>-					    &amp;mtd_parts, 0);</div><div class='add'>+	mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, part_probes, &amp;mtd_parts, 0);</div><div class='ctx'> 	if (mtd_parts_nb &gt; 0)</div><div class='ctx'> 		part_type = "command line";</div><div class='ctx'> 	else</div><div class='hunk'>@@ -193,24 +185,23 @@ static int __init ep7312_init (void)</div><div class='ctx'> 	/* Return happy */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_init(ep7312_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-static void __exit ep7312_cleanup (void)</div><div class='add'>+static void __exit ep7312_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = (struct nand_chip *) &amp;ep7312_mtd[1];</div><div class='add'>+	struct nand_chip *this = (struct nand_chip *)&amp;ep7312_mtd[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='del'>-	nand_release (ap7312_mtd);</div><div class='del'>-</div><div class='del'>-	/* Free internal data buffer */</div><div class='del'>-	kfree (this-&gt;data_buf);</div><div class='add'>+	nand_release(ap7312_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (ep7312_mtd);</div><div class='add'>+	kfree(ep7312_mtd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(ep7312_cleanup);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c<br/>index f68f7a99a630..2d585d2d090c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/h1910.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/h1910.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/h1910.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/h1910.c</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'>  *  Copyright (C) 2003 Joshua Wise (joshua@joshuawise.com)</div><div class='ctx'>  *</div><div class='ctx'>  *  Derived from drivers/mtd/nand/edb7312.c</div><div class='del'>- *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)</div><div class='add'>+ *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)</div><div class='ctx'>  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)</div><div class='ctx'>  *</div><div class='ctx'>  * $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $</div><div class='hunk'>@@ -26,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/mtd/nand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/partitions.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/hardware.h&gt; /* for CLPS7111_VIRT_BASE */</div><div class='add'>+#include &lt;asm/arch/hardware.h&gt;	/* for CLPS7111_VIRT_BASE */</div><div class='ctx'> #include &lt;asm/sizes.h&gt;</div><div class='ctx'> #include &lt;asm/arch/h1900-gpio.h&gt;</div><div class='ctx'> #include &lt;asm/arch/ipaq.h&gt;</div><div class='hunk'>@@ -45,47 +45,29 @@ static struct mtd_info *h1910_nand_mtd = NULL;</div><div class='ctx'>  * Define static partitions for flash device</div><div class='ctx'>  */</div><div class='ctx'> static struct mtd_partition partition_info[] = {</div><div class='del'>-	{ name: "h1910 NAND Flash",</div><div class='del'>-		  offset: 0,</div><div class='del'>-		  size: 16*1024*1024 }</div><div class='add'>+      {name:"h1910 NAND Flash",</div><div class='add'>+	      offset:0,</div><div class='add'>+      size:16 * 1024 * 1024}</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> #define NUM_PARTITIONS 1</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='add'>+ *</div><div class='add'>+ *	NAND_NCE: bit 0 - don't care</div><div class='add'>+ *	NAND_CLE: bit 1 - address bit 2</div><div class='add'>+ *	NAND_ALE: bit 2 - address bit 3</div><div class='ctx'>  */</div><div class='del'>-static void h1910_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+static void h1910_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+			    unsigned int ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip* this = (struct nand_chip *) (mtd-&gt;priv);</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		this-&gt;IO_ADDR_R |= (1 &lt;&lt; 2);</div><div class='del'>-		this-&gt;IO_ADDR_W |= (1 &lt;&lt; 2);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-		this-&gt;IO_ADDR_R &amp;= ~(1 &lt;&lt; 2);</div><div class='del'>-		this-&gt;IO_ADDR_W &amp;= ~(1 &lt;&lt; 2);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		this-&gt;IO_ADDR_R |= (1 &lt;&lt; 3);</div><div class='del'>-		this-&gt;IO_ADDR_W |= (1 &lt;&lt; 3);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-		this-&gt;IO_ADDR_R &amp;= ~(1 &lt;&lt; 3);</div><div class='del'>-		this-&gt;IO_ADDR_W &amp;= ~(1 &lt;&lt; 3);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W | ((ctrl &amp; 0x6) &lt;&lt; 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -101,7 +83,7 @@ static int h1910_device_ready(struct mtd_info *mtd)</div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-static int __init h1910_init (void)</div><div class='add'>+static int __init h1910_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	const char *part_type = 0;</div><div class='hunk'>@@ -119,24 +101,23 @@ static int __init h1910_init (void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) +</div><div class='del'>-			     sizeof(struct nand_chip),</div><div class='del'>-			     GFP_KERNEL);</div><div class='add'>+	h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!h1910_nand_mtd) {</div><div class='ctx'> 		printk("Unable to allocate h1910 NAND MTD device structure.\n");</div><div class='del'>-		iounmap ((void *) nandaddr);</div><div class='add'>+		iounmap((void *)nandaddr);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;h1910_nand_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;h1910_nand_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) h1910_nand_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(h1910_nand_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	h1910_nand_mtd-&gt;priv = this;</div><div class='add'>+	h1910_nand_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Enable VPEN</div><div class='hunk'>@@ -146,31 +127,28 @@ static int __init h1910_init (void)</div><div class='ctx'> 	/* insert callbacks */</div><div class='ctx'> 	this-&gt;IO_ADDR_R = nandaddr;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = nandaddr;</div><div class='del'>-	this-&gt;hwcontrol = h1910_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = h1910_hwcontrol;</div><div class='ctx'> 	this-&gt;dev_ready = NULL;	/* unknown whether that was correct or not so we will just do it like this */</div><div class='ctx'> 	/* 15 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 50;</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> 	this-&gt;options = NAND_NO_AUTOINCR;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device */</div><div class='del'>-	if (nand_scan (h1910_nand_mtd, 1)) {</div><div class='add'>+	if (nand_scan(h1910_nand_mtd, 1)) {</div><div class='ctx'> 		printk(KERN_NOTICE "No NAND device - returning -ENXIO\n");</div><div class='del'>-		kfree (h1910_nand_mtd);</div><div class='del'>-		iounmap ((void *) nandaddr);</div><div class='add'>+		kfree(h1910_nand_mtd);</div><div class='add'>+		iounmap((void *)nandaddr);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MTD_CMDLINE_PARTS</div><div class='del'>-	mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &amp;mtd_parts,</div><div class='del'>-						"h1910-nand");</div><div class='add'>+	mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &amp;mtd_parts, "h1910-nand");</div><div class='ctx'> 	if (mtd_parts_nb &gt; 0)</div><div class='del'>-	  part_type = "command line";</div><div class='add'>+		part_type = "command line";</div><div class='ctx'> 	else</div><div class='del'>-	  mtd_parts_nb = 0;</div><div class='add'>+		mtd_parts_nb = 0;</div><div class='ctx'> #endif</div><div class='del'>-	if (mtd_parts_nb == 0)</div><div class='del'>-	{</div><div class='add'>+	if (mtd_parts_nb == 0) {</div><div class='ctx'> 		mtd_parts = partition_info;</div><div class='ctx'> 		mtd_parts_nb = NUM_PARTITIONS;</div><div class='ctx'> 		part_type = "static";</div><div class='hunk'>@@ -183,24 +161,26 @@ static int __init h1910_init (void)</div><div class='ctx'> 	/* Return happy */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_init(h1910_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-static void __exit h1910_cleanup (void)</div><div class='add'>+static void __exit h1910_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = (struct nand_chip *) &amp;h1910_nand_mtd[1];</div><div class='add'>+	struct nand_chip *this = (struct nand_chip *)&amp;h1910_nand_mtd[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='del'>-	nand_release (h1910_nand_mtd);</div><div class='add'>+	nand_release(h1910_nand_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Release io resource */</div><div class='del'>-	iounmap ((void *) this-&gt;IO_ADDR_W);</div><div class='add'>+	iounmap((void *)this-&gt;IO_ADDR_W);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (h1910_nand_mtd);</div><div class='add'>+	kfree(h1910_nand_mtd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(h1910_cleanup);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c<br/>index 95e96fa1fceb..62b861304e03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/nand_base.c</a></div><div class='hunk'>@@ -10,67 +10,31 @@</div><div class='ctx'>  *	http://www.linux-mtd.infradead.org/tech/nand.html</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)</div><div class='del'>- * 		  2002 Thomas Gleixner (tglx@linutronix.de)</div><div class='add'>+ *		  2002-2006 Thomas Gleixner (tglx@linutronix.de)</div><div class='ctx'>  *</div><div class='del'>- *  02-08-2004  tglx: support for strange chips, which cannot auto increment</div><div class='del'>- *		pages on read / read_oob</div><div class='del'>- *</div><div class='del'>- *  03-17-2004  tglx: Check ready before auto increment check. Simon Bayes</div><div class='del'>- *		pointed this out, as he marked an auto increment capable chip</div><div class='del'>- *		as NOAUTOINCR in the board driver.</div><div class='del'>- *		Make reads over block boundaries work too</div><div class='del'>- *</div><div class='del'>- *  04-14-2004	tglx: first working version for 2k page size chips</div><div class='del'>- *</div><div class='del'>- *  05-19-2004  tglx: Basic support for Renesas AG-AND chips</div><div class='del'>- *</div><div class='del'>- *  09-24-2004  tglx: add support for hardware controllers (e.g. ECC) shared</div><div class='del'>- *		among multiple independend devices. Suggestions and initial patch</div><div class='del'>- *		from Ben Dooks &lt;ben-mtd@fluff.org&gt;</div><div class='del'>- *</div><div class='del'>- *  12-05-2004	dmarlin: add workaround for Renesas AG-AND chips "disturb" issue.</div><div class='del'>- *		Basically, any block not rewritten may lose data when surrounding blocks</div><div class='del'>- *		are rewritten many times.  JFFS2 ensures this doesn't happen for blocks</div><div class='del'>- *		it uses, but the Bad Block Table(s) may not be rewritten.  To ensure they</div><div class='del'>- *		do not lose data, force them to be rewritten when some of the surrounding</div><div class='del'>- *		blocks are erased.  Rather than tracking a specific nearby block (which</div><div class='del'>- *		could itself go bad), use a page address 'mask' to select several blocks</div><div class='del'>- *		in the same area, and rewrite the BBT when any of them are erased.</div><div class='del'>- *</div><div class='del'>- *  01-03-2005	dmarlin: added support for the device recovery command sequence for Renesas</div><div class='del'>- *		AG-AND chips.  If there was a sudden loss of power during an erase operation,</div><div class='del'>- * 		a "device recovery" operation must be performed when power is restored</div><div class='del'>- * 		to ensure correct operation.</div><div class='del'>- *</div><div class='del'>- *  01-20-2005	dmarlin: added support for optional hardware specific callback routine to</div><div class='del'>- *		perform extra error status checks on erase and write failures.  This required</div><div class='del'>- *		adding a wrapper function for nand_read_ecc.</div><div class='del'>- *</div><div class='del'>- * 08-20-2005	vwool: suspend/resume added</div><div class='del'>- *</div><div class='del'>- * Credits:</div><div class='add'>+ *  Credits:</div><div class='ctx'>  *	David Woodhouse for adding multichip support</div><div class='ctx'>  *</div><div class='ctx'>  *	Aleph One Ltd. and Toby Churchill Ltd. for supporting the</div><div class='ctx'>  *	rework for 2K page size chips</div><div class='ctx'>  *</div><div class='del'>- * TODO:</div><div class='add'>+ *  TODO:</div><div class='ctx'>  *	Enable cached programming for 2k page size chips</div><div class='ctx'>  *	Check, if mtd-&gt;ecctype should be set to MTD_ECC_HW</div><div class='ctx'>  *	if we have HW ecc support.</div><div class='ctx'>  *	The AG-AND chips have nice features for speed improvement,</div><div class='ctx'>  *	which are not supported yet. Read / program 4 pages in one go.</div><div class='ctx'>  *</div><div class='del'>- * $Id: nand_base.c,v 1.150 2005/09/15 13:58:48 vwool Exp $</div><div class='del'>- *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -88,75 +52,46 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Define default oob placement schemes for large and small page devices */</div><div class='del'>-static struct nand_oobinfo nand_oob_8 = {</div><div class='del'>-	.useecc = MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout nand_oob_8 = {</div><div class='ctx'> 	.eccbytes = 3,</div><div class='ctx'> 	.eccpos = {0, 1, 2},</div><div class='del'>-	.oobfree = { {3, 2}, {6, 2} }</div><div class='add'>+	.oobfree = {</div><div class='add'>+		{.offset = 3,</div><div class='add'>+		 .length = 2},</div><div class='add'>+		{.offset = 6,</div><div class='add'>+		 .length = 2}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct nand_oobinfo nand_oob_16 = {</div><div class='del'>-	.useecc = MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout nand_oob_16 = {</div><div class='ctx'> 	.eccbytes = 6,</div><div class='ctx'> 	.eccpos = {0, 1, 2, 3, 6, 7},</div><div class='del'>-	.oobfree = { {8, 8} }</div><div class='add'>+	.oobfree = {</div><div class='add'>+		{.offset = 8,</div><div class='add'>+		 . length = 8}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct nand_oobinfo nand_oob_64 = {</div><div class='del'>-	.useecc = MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout nand_oob_64 = {</div><div class='ctx'> 	.eccbytes = 24,</div><div class='ctx'> 	.eccpos = {</div><div class='del'>-		40, 41, 42, 43, 44, 45, 46, 47,</div><div class='del'>-		48, 49, 50, 51, 52, 53, 54, 55,</div><div class='del'>-		56, 57, 58, 59, 60, 61, 62, 63},</div><div class='del'>-	.oobfree = { {2, 38} }</div><div class='add'>+		   40, 41, 42, 43, 44, 45, 46, 47,</div><div class='add'>+		   48, 49, 50, 51, 52, 53, 54, 55,</div><div class='add'>+		   56, 57, 58, 59, 60, 61, 62, 63},</div><div class='add'>+	.oobfree = {</div><div class='add'>+		{.offset = 2,</div><div class='add'>+		 .length = 38}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* This is used for padding purposes in nand_write_oob */</div><div class='del'>-static u_char ffchars[] = {</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,</div><div class='del'>-};</div><div class='add'>+static int nand_get_device(struct nand_chip *chip, struct mtd_info *mtd,</div><div class='add'>+			   int new_state);</div><div class='add'>+</div><div class='add'>+static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='add'>+			     struct mtd_oob_ops *ops);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * NAND low-level MTD interface functions</div><div class='add'>+ * For devices which display every fart in the system on a seperate LED. Is</div><div class='add'>+ * compiled away when LED support is disabled.</div><div class='ctx'>  */</div><div class='del'>-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len);</div><div class='del'>-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len);</div><div class='del'>-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len);</div><div class='del'>-</div><div class='del'>-static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);</div><div class='del'>-static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			  size_t * retlen, u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel);</div><div class='del'>-static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);</div><div class='del'>-static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf);</div><div class='del'>-static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			   size_t * retlen, const u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel);</div><div class='del'>-static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char *buf);</div><div class='del'>-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-			unsigned long count, loff_t to, size_t * retlen);</div><div class='del'>-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-			unsigned long count, loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel);</div><div class='del'>-static int nand_erase (struct mtd_info *mtd, struct erase_info *instr);</div><div class='del'>-static void nand_sync (struct mtd_info *mtd);</div><div class='del'>-</div><div class='del'>-/* Some internal functions */</div><div class='del'>-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page, u_char *oob_buf,</div><div class='del'>-		struct nand_oobinfo *oobsel, int mode);</div><div class='del'>-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE</div><div class='del'>-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages,</div><div class='del'>-	u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode);</div><div class='del'>-#else</div><div class='del'>-#define nand_verify_pages(...) (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state);</div><div class='add'>+DEFINE_LED_TRIGGER(nand_led_trigger);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nand_release_device - [GENERIC] release chip</div><div class='hunk'>@@ -164,27 +99,19 @@ static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int ne</div><div class='ctx'>  *</div><div class='ctx'>  * Deselect, release chip lock and wake up anyone waiting on the device</div><div class='ctx'>  */</div><div class='del'>-static void nand_release_device (struct mtd_info *mtd)</div><div class='add'>+static void nand_release_device(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* De-select the NAND device */</div><div class='del'>-	this-&gt;select_chip(mtd, -1);</div><div class='del'>-</div><div class='del'>-	if (this-&gt;controller) {</div><div class='del'>-		/* Release the controller and the chip */</div><div class='del'>-		spin_lock(&amp;this-&gt;controller-&gt;lock);</div><div class='del'>-		this-&gt;controller-&gt;active = NULL;</div><div class='del'>-		this-&gt;state = FL_READY;</div><div class='del'>-		wake_up(&amp;this-&gt;controller-&gt;wq);</div><div class='del'>-		spin_unlock(&amp;this-&gt;controller-&gt;lock);</div><div class='del'>-	} else {</div><div class='del'>-		/* Release the chip */</div><div class='del'>-		spin_lock(&amp;this-&gt;chip_lock);</div><div class='del'>-		this-&gt;state = FL_READY;</div><div class='del'>-		wake_up(&amp;this-&gt;wq);</div><div class='del'>-		spin_unlock(&amp;this-&gt;chip_lock);</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;select_chip(mtd, -1);</div><div class='add'>+</div><div class='add'>+	/* Release the controller and the chip */</div><div class='add'>+	spin_lock(&amp;chip-&gt;controller-&gt;lock);</div><div class='add'>+	chip-&gt;controller-&gt;active = NULL;</div><div class='add'>+	chip-&gt;state = FL_READY;</div><div class='add'>+	wake_up(&amp;chip-&gt;controller-&gt;wq);</div><div class='add'>+	spin_unlock(&amp;chip-&gt;controller-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -193,23 +120,10 @@ static void nand_release_device (struct mtd_info *mtd)</div><div class='ctx'>  *</div><div class='ctx'>  * Default read function for 8bit buswith</div><div class='ctx'>  */</div><div class='del'>-static u_char nand_read_byte(struct mtd_info *mtd)</div><div class='del'>-{</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	return readb(this-&gt;IO_ADDR_R);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nand_write_byte - [DEFAULT] write one byte to the chip</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @byte:	pointer to data byte to write</div><div class='del'>- *</div><div class='del'>- * Default write function for 8it buswith</div><div class='del'>- */</div><div class='del'>-static void nand_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='add'>+static uint8_t nand_read_byte(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	writeb(byte, this-&gt;IO_ADDR_W);</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	return readb(chip-&gt;IO_ADDR_R);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -219,24 +133,10 @@ static void nand_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='ctx'>  * Default read function for 16bit buswith with</div><div class='ctx'>  * endianess conversion</div><div class='ctx'>  */</div><div class='del'>-static u_char nand_read_byte16(struct mtd_info *mtd)</div><div class='add'>+static uint8_t nand_read_byte16(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	return (u_char) cpu_to_le16(readw(this-&gt;IO_ADDR_R));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nand_write_byte16 - [DEFAULT] write one byte endianess aware to the chip</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @byte:	pointer to data byte to write</div><div class='del'>- *</div><div class='del'>- * Default write function for 16bit buswith with</div><div class='del'>- * endianess conversion</div><div class='del'>- */</div><div class='del'>-static void nand_write_byte16(struct mtd_info *mtd, u_char byte)</div><div class='del'>-{</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	writew(le16_to_cpu((u16) byte), this-&gt;IO_ADDR_W);</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	return (uint8_t) cpu_to_le16(readw(chip-&gt;IO_ADDR_R));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -248,40 +148,26 @@ static void nand_write_byte16(struct mtd_info *mtd, u_char byte)</div><div class='ctx'>  */</div><div class='ctx'> static u16 nand_read_word(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	return readw(this-&gt;IO_ADDR_R);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nand_write_word - [DEFAULT] write one word to the chip</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @word:	data word to write</div><div class='del'>- *</div><div class='del'>- * Default write function for 16bit buswith without</div><div class='del'>- * endianess conversion</div><div class='del'>- */</div><div class='del'>-static void nand_write_word(struct mtd_info *mtd, u16 word)</div><div class='del'>-{</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	writew(word, this-&gt;IO_ADDR_W);</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	return readw(chip-&gt;IO_ADDR_R);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nand_select_chip - [DEFAULT] control CE line</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @chip:	chipnumber to select, -1 for deselect</div><div class='add'>+ * @chipnr:	chipnumber to select, -1 for deselect</div><div class='ctx'>  *</div><div class='ctx'>  * Default select function for 1 chip devices.</div><div class='ctx'>  */</div><div class='del'>-static void nand_select_chip(struct mtd_info *mtd, int chip)</div><div class='add'>+static void nand_select_chip(struct mtd_info *mtd, int chipnr)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	switch(chip) {</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (chipnr) {</div><div class='ctx'> 	case -1:</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_CLRNCE);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0:</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_SETNCE);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -297,13 +183,13 @@ static void nand_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'>  *</div><div class='ctx'>  * Default write function for 8bit buswith</div><div class='ctx'>  */</div><div class='del'>-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++)</div><div class='del'>-		writeb(buf[i], this-&gt;IO_ADDR_W);</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		writeb(buf[i], chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -314,13 +200,13 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'>  *</div><div class='ctx'>  * Default read function for 8bit buswith</div><div class='ctx'>  */</div><div class='del'>-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='add'>+static void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++)</div><div class='del'>-		buf[i] = readb(this-&gt;IO_ADDR_R);</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		buf[i] = readb(chip-&gt;IO_ADDR_R);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -331,15 +217,14 @@ static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'>  *</div><div class='ctx'>  * Default verify function for 8bit buswith</div><div class='ctx'>  */</div><div class='del'>-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++)</div><div class='del'>-		if (buf[i] != readb(this-&gt;IO_ADDR_R))</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		if (buf[i] != readb(chip-&gt;IO_ADDR_R))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -351,15 +236,15 @@ static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'>  *</div><div class='ctx'>  * Default write function for 16bit buswith</div><div class='ctx'>  */</div><div class='del'>-static void nand_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+static void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	u16 *p = (u16 *) buf;</div><div class='ctx'> 	len &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++)</div><div class='del'>-		writew(p[i], this-&gt;IO_ADDR_W);</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		writew(p[i], chip-&gt;IO_ADDR_W);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -371,15 +256,15 @@ static void nand_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'>  *</div><div class='ctx'>  * Default read function for 16bit buswith</div><div class='ctx'>  */</div><div class='del'>-static void nand_read_buf16(struct mtd_info *mtd, u_char *buf, int len)</div><div class='add'>+static void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	u16 *p = (u16 *) buf;</div><div class='ctx'> 	len &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++)</div><div class='del'>-		p[i] = readw(this-&gt;IO_ADDR_R);</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		p[i] = readw(chip-&gt;IO_ADDR_R);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -390,15 +275,15 @@ static void nand_read_buf16(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'>  *</div><div class='ctx'>  * Default verify function for 16bit buswith</div><div class='ctx'>  */</div><div class='del'>-static int nand_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='add'>+static int nand_verify_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	u16 *p = (u16 *) buf;</div><div class='ctx'> 	len &gt;&gt;= 1;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;len; i++)</div><div class='del'>-		if (p[i] != readw(this-&gt;IO_ADDR_R))</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		if (p[i] != readw(chip-&gt;IO_ADDR_R))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -415,38 +300,37 @@ static int nand_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)</div><div class='ctx'> {</div><div class='ctx'> 	int page, chipnr, res = 0;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	u16 bad;</div><div class='ctx'> </div><div class='ctx'> 	if (getchip) {</div><div class='del'>-		page = (int)(ofs &gt;&gt; this-&gt;page_shift);</div><div class='del'>-		chipnr = (int)(ofs &gt;&gt; this-&gt;chip_shift);</div><div class='add'>+		page = (int)(ofs &gt;&gt; chip-&gt;page_shift);</div><div class='add'>+		chipnr = (int)(ofs &gt;&gt; chip-&gt;chip_shift);</div><div class='ctx'> </div><div class='del'>-		/* Grab the lock and see if the device is available */</div><div class='del'>-		nand_get_device (this, mtd, FL_READING);</div><div class='add'>+		nand_get_device(chip, mtd, FL_READING);</div><div class='ctx'> </div><div class='ctx'> 		/* Select the NAND device */</div><div class='del'>-		this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+		chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> 	} else</div><div class='del'>-		page = (int) ofs;</div><div class='add'>+		page = (int)ofs;</div><div class='ctx'> </div><div class='del'>-	if (this-&gt;options &amp; NAND_BUSWIDTH_16) {</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_READOOB, this-&gt;badblockpos &amp; 0xFE, page &amp; this-&gt;pagemask);</div><div class='del'>-		bad = cpu_to_le16(this-&gt;read_word(mtd));</div><div class='del'>-		if (this-&gt;badblockpos &amp; 0x1)</div><div class='add'>+	if (chip-&gt;options &amp; NAND_BUSWIDTH_16) {</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_READOOB, chip-&gt;badblockpos &amp; 0xFE,</div><div class='add'>+			      page &amp; chip-&gt;pagemask);</div><div class='add'>+		bad = cpu_to_le16(chip-&gt;read_word(mtd));</div><div class='add'>+		if (chip-&gt;badblockpos &amp; 0x1)</div><div class='ctx'> 			bad &gt;&gt;= 8;</div><div class='ctx'> 		if ((bad &amp; 0xFF) != 0xff)</div><div class='ctx'> 			res = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_READOOB, this-&gt;badblockpos, page &amp; this-&gt;pagemask);</div><div class='del'>-		if (this-&gt;read_byte(mtd) != 0xff)</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_READOOB, chip-&gt;badblockpos,</div><div class='add'>+			      page &amp; chip-&gt;pagemask);</div><div class='add'>+		if (chip-&gt;read_byte(mtd) != 0xff)</div><div class='ctx'> 			res = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (getchip) {</div><div class='del'>-		/* Deselect and wake up anyone waiting on the device */</div><div class='add'>+	if (getchip)</div><div class='ctx'> 		nand_release_device(mtd);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -461,23 +345,33 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)</div><div class='ctx'> */</div><div class='ctx'> static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	u_char buf[2] = {0, 0};</div><div class='del'>-	size_t	retlen;</div><div class='del'>-	int block;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	uint8_t buf[2] = { 0, 0 };</div><div class='add'>+	int block, ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Get block number */</div><div class='del'>-	block = ((int) ofs) &gt;&gt; this-&gt;bbt_erase_shift;</div><div class='del'>-	if (this-&gt;bbt)</div><div class='del'>-		this-&gt;bbt[block &gt;&gt; 2] |= 0x01 &lt;&lt; ((block &amp; 0x03) &lt;&lt; 1);</div><div class='add'>+	block = ((int)ofs) &gt;&gt; chip-&gt;bbt_erase_shift;</div><div class='add'>+	if (chip-&gt;bbt)</div><div class='add'>+		chip-&gt;bbt[block &gt;&gt; 2] |= 0x01 &lt;&lt; ((block &amp; 0x03) &lt;&lt; 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Do we have a flash based bad block table ? */</div><div class='del'>-	if (this-&gt;options &amp; NAND_USE_FLASH_BBT)</div><div class='del'>-		return nand_update_bbt (mtd, ofs);</div><div class='add'>+	if (chip-&gt;options &amp; NAND_USE_FLASH_BBT)</div><div class='add'>+		ret = nand_update_bbt(mtd, ofs);</div><div class='add'>+	else {</div><div class='add'>+		/* We write two bytes, so we dont have to mess with 16 bit</div><div class='add'>+		 * access</div><div class='add'>+		 */</div><div class='add'>+		ofs += mtd-&gt;oobsize;</div><div class='add'>+		chip-&gt;ops.len = 2;</div><div class='add'>+		chip-&gt;ops.datbuf = NULL;</div><div class='add'>+		chip-&gt;ops.oobbuf = buf;</div><div class='add'>+		chip-&gt;ops.ooboffs = chip-&gt;badblockpos &amp; ~0x01;</div><div class='ctx'> </div><div class='del'>-	/* We write two bytes, so we dont have to mess with 16 bit access */</div><div class='del'>-	ofs += mtd-&gt;oobsize + (this-&gt;badblockpos &amp; ~0x01);</div><div class='del'>-	return nand_write_oob (mtd, ofs , 2, &amp;retlen, buf);</div><div class='add'>+		ret = nand_do_write_oob(mtd, ofs, &amp;chip-&gt;ops);</div><div class='add'>+	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		mtd-&gt;ecc_stats.badblocks++;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -487,12 +381,12 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'>  *</div><div class='ctx'>  * The function expects, that the device is already selected</div><div class='ctx'>  */</div><div class='del'>-static int nand_check_wp (struct mtd_info *mtd)</div><div class='add'>+static int nand_check_wp(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	/* Check the WP bit */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);</div><div class='del'>-	return (this-&gt;read_byte(mtd) &amp; NAND_STATUS_WP) ? 0 : 1;</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);</div><div class='add'>+	return (chip-&gt;read_byte(mtd) &amp; NAND_STATUS_WP) ? 0 : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -505,32 +399,31 @@ static int nand_check_wp (struct mtd_info *mtd)</div><div class='ctx'>  * Check, if the block is bad. Either by reading the bad block table or</div><div class='ctx'>  * calling of the scan function.</div><div class='ctx'>  */</div><div class='del'>-static int nand_block_checkbad (struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt)</div><div class='add'>+static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,</div><div class='add'>+			       int allowbbt)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!this-&gt;bbt)</div><div class='del'>-		return this-&gt;block_bad(mtd, ofs, getchip);</div><div class='add'>+	if (!chip-&gt;bbt)</div><div class='add'>+		return chip-&gt;block_bad(mtd, ofs, getchip);</div><div class='ctx'> </div><div class='ctx'> 	/* Return info from the table */</div><div class='del'>-	return nand_isbad_bbt (mtd, ofs, allowbbt);</div><div class='add'>+	return nand_isbad_bbt(mtd, ofs, allowbbt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-DEFINE_LED_TRIGGER(nand_led_trigger);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Wait for the ready pin, after a command</div><div class='ctx'>  * The timeout is catched later.</div><div class='ctx'>  */</div><div class='ctx'> static void nand_wait_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	unsigned long	timeo = jiffies + 2;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	unsigned long timeo = jiffies + 2;</div><div class='ctx'> </div><div class='ctx'> 	led_trigger_event(nand_led_trigger, LED_FULL);</div><div class='ctx'> 	/* wait until command is processed or timeout occures */</div><div class='ctx'> 	do {</div><div class='del'>-		if (this-&gt;dev_ready(mtd))</div><div class='add'>+		if (chip-&gt;dev_ready(mtd))</div><div class='ctx'> 			break;</div><div class='ctx'> 		touch_softlockup_watchdog();</div><div class='ctx'> 	} while (time_before(jiffies, timeo));</div><div class='hunk'>@@ -547,21 +440,21 @@ static void nand_wait_ready(struct mtd_info *mtd)</div><div class='ctx'>  * Send command to NAND device. This function is used for small page</div><div class='ctx'>  * devices (256/512 Bytes per page)</div><div class='ctx'>  */</div><div class='del'>-static void nand_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)</div><div class='add'>+static void nand_command(struct mtd_info *mtd, unsigned int command,</div><div class='add'>+			 int column, int page_addr)</div><div class='ctx'> {</div><div class='del'>-	register struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	register struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int ctrl = NAND_CTRL_CLE | NAND_CTRL_CHANGE;</div><div class='ctx'> </div><div class='del'>-	/* Begin command latch cycle */</div><div class='del'>-	this-&gt;hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Write out the command to the device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (command == NAND_CMD_SEQIN) {</div><div class='ctx'> 		int readcmd;</div><div class='ctx'> </div><div class='del'>-		if (column &gt;= mtd-&gt;oobblock) {</div><div class='add'>+		if (column &gt;= mtd-&gt;writesize) {</div><div class='ctx'> 			/* OOB area */</div><div class='del'>-			column -= mtd-&gt;oobblock;</div><div class='add'>+			column -= mtd-&gt;writesize;</div><div class='ctx'> 			readcmd = NAND_CMD_READOOB;</div><div class='ctx'> 		} else if (column &lt; 256) {</div><div class='ctx'> 			/* First 256 bytes --&gt; READ0 */</div><div class='hunk'>@@ -570,38 +463,37 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in</div><div class='ctx'> 			column -= 256;</div><div class='ctx'> 			readcmd = NAND_CMD_READ1;</div><div class='ctx'> 		}</div><div class='del'>-		this-&gt;write_byte(mtd, readcmd);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, readcmd, ctrl);</div><div class='add'>+		ctrl &amp;= ~NAND_CTRL_CHANGE;</div><div class='ctx'> 	}</div><div class='del'>-	this-&gt;write_byte(mtd, command);</div><div class='del'>-</div><div class='del'>-	/* Set ALE and clear CLE to start address cycle */</div><div class='del'>-	this-&gt;hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='add'>+	chip-&gt;cmd_ctrl(mtd, command, ctrl);</div><div class='ctx'> </div><div class='del'>-	if (column != -1 || page_addr != -1) {</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_SETALE);</div><div class='del'>-</div><div class='del'>-		/* Serially input address */</div><div class='del'>-		if (column != -1) {</div><div class='del'>-			/* Adjust columns for 16 bit buswidth */</div><div class='del'>-			if (this-&gt;options &amp; NAND_BUSWIDTH_16)</div><div class='del'>-				column &gt;&gt;= 1;</div><div class='del'>-			this-&gt;write_byte(mtd, column);</div><div class='del'>-		}</div><div class='del'>-		if (page_addr != -1) {</div><div class='del'>-			this-&gt;write_byte(mtd, (unsigned char) (page_addr &amp; 0xff));</div><div class='del'>-			this-&gt;write_byte(mtd, (unsigned char) ((page_addr &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-			/* One more address cycle for devices &gt; 32MiB */</div><div class='del'>-			if (this-&gt;chipsize &gt; (32 &lt;&lt; 20))</div><div class='del'>-				this-&gt;write_byte(mtd, (unsigned char) ((page_addr &gt;&gt; 16) &amp; 0x0f));</div><div class='del'>-		}</div><div class='del'>-		/* Latch in address */</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_CLRALE);</div><div class='add'>+	/*</div><div class='add'>+	 * Address cycle, when necessary</div><div class='add'>+	 */</div><div class='add'>+	ctrl = NAND_CTRL_ALE | NAND_CTRL_CHANGE;</div><div class='add'>+	/* Serially input address */</div><div class='add'>+	if (column != -1) {</div><div class='add'>+		/* Adjust columns for 16 bit buswidth */</div><div class='add'>+		if (chip-&gt;options &amp; NAND_BUSWIDTH_16)</div><div class='add'>+			column &gt;&gt;= 1;</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, column, ctrl);</div><div class='add'>+		ctrl &amp;= ~NAND_CTRL_CHANGE;</div><div class='add'>+	}</div><div class='add'>+	if (page_addr != -1) {</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, page_addr, ctrl);</div><div class='add'>+		ctrl &amp;= ~NAND_CTRL_CHANGE;</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, page_addr &gt;&gt; 8, ctrl);</div><div class='add'>+		/* One more address cycle for devices &gt; 32MiB */</div><div class='add'>+		if (chip-&gt;chipsize &gt; (32 &lt;&lt; 20))</div><div class='add'>+			chip-&gt;cmd_ctrl(mtd, page_addr &gt;&gt; 16, ctrl);</div><div class='ctx'> 	}</div><div class='add'>+	chip-&gt;cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * program and erase have their own busy handlers</div><div class='ctx'> 	 * status and sequential in needs no delay</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> 	switch (command) {</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_PAGEPROG:</div><div class='hunk'>@@ -612,29 +504,30 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_RESET:</div><div class='del'>-		if (this-&gt;dev_ready)</div><div class='add'>+		if (chip-&gt;dev_ready)</div><div class='ctx'> 			break;</div><div class='del'>-		udelay(this-&gt;chip_delay);</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='del'>-		this-&gt;write_byte(mtd, NAND_CMD_STATUS);</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='del'>-		while ( !(this-&gt;read_byte(mtd) &amp; NAND_STATUS_READY));</div><div class='add'>+		udelay(chip-&gt;chip_delay);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_STATUS,</div><div class='add'>+			       NAND_CTRL_CLE | NAND_CTRL_CHANGE);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd,</div><div class='add'>+			       NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);</div><div class='add'>+		while (!(chip-&gt;read_byte(mtd) &amp; NAND_STATUS_READY)) ;</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* This applies to read commands */</div><div class='add'>+		/* This applies to read commands */</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we don't have access to the busy pin, we apply the given</div><div class='ctx'> 		 * command delay</div><div class='del'>-		*/</div><div class='del'>-		if (!this-&gt;dev_ready) {</div><div class='del'>-			udelay (this-&gt;chip_delay);</div><div class='add'>+		 */</div><div class='add'>+		if (!chip-&gt;dev_ready) {</div><div class='add'>+			udelay(chip-&gt;chip_delay);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Apply this short delay always to ensure that we do wait tWB in</div><div class='ctx'> 	 * any case on any machine. */</div><div class='del'>-	ndelay (100);</div><div class='add'>+	ndelay(100);</div><div class='ctx'> </div><div class='ctx'> 	nand_wait_ready(mtd);</div><div class='ctx'> }</div><div class='hunk'>@@ -646,50 +539,48 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in</div><div class='ctx'>  * @column:	the column address for this command, -1 if none</div><div class='ctx'>  * @page_addr:	the page address for this command, -1 if none</div><div class='ctx'>  *</div><div class='del'>- * Send command to NAND device. This is the version for the new large page devices</div><div class='del'>- * We dont have the seperate regions as we have in the small page devices.</div><div class='del'>- * We must emulate NAND_CMD_READOOB to keep the code compatible.</div><div class='del'>- *</div><div class='add'>+ * Send command to NAND device. This is the version for the new large page</div><div class='add'>+ * devices We dont have the separate regions as we have in the small page</div><div class='add'>+ * devices.  We must emulate NAND_CMD_READOOB to keep the code compatible.</div><div class='ctx'>  */</div><div class='del'>-static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column, int page_addr)</div><div class='add'>+static void nand_command_lp(struct mtd_info *mtd, unsigned int command,</div><div class='add'>+			    int column, int page_addr)</div><div class='ctx'> {</div><div class='del'>-	register struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	register struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* Emulate NAND_CMD_READOOB */</div><div class='ctx'> 	if (command == NAND_CMD_READOOB) {</div><div class='del'>-		column += mtd-&gt;oobblock;</div><div class='add'>+		column += mtd-&gt;writesize;</div><div class='ctx'> 		command = NAND_CMD_READ0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	/* Begin command latch cycle */</div><div class='del'>-	this-&gt;hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='del'>-	/* Write out the command to the device. */</div><div class='del'>-	this-&gt;write_byte(mtd, (command &amp; 0xff));</div><div class='del'>-	/* End command latch cycle */</div><div class='del'>-	this-&gt;hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='add'>+	/* Command latch cycle */</div><div class='add'>+	chip-&gt;cmd_ctrl(mtd, command &amp; 0xff,</div><div class='add'>+		       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	if (column != -1 || page_addr != -1) {</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_SETALE);</div><div class='add'>+		int ctrl = NAND_CTRL_CHANGE | NAND_NCE | NAND_ALE;</div><div class='ctx'> </div><div class='ctx'> 		/* Serially input address */</div><div class='ctx'> 		if (column != -1) {</div><div class='ctx'> 			/* Adjust columns for 16 bit buswidth */</div><div class='del'>-			if (this-&gt;options &amp; NAND_BUSWIDTH_16)</div><div class='add'>+			if (chip-&gt;options &amp; NAND_BUSWIDTH_16)</div><div class='ctx'> 				column &gt;&gt;= 1;</div><div class='del'>-			this-&gt;write_byte(mtd, column &amp; 0xff);</div><div class='del'>-			this-&gt;write_byte(mtd, column &gt;&gt; 8);</div><div class='add'>+			chip-&gt;cmd_ctrl(mtd, column, ctrl);</div><div class='add'>+			ctrl &amp;= ~NAND_CTRL_CHANGE;</div><div class='add'>+			chip-&gt;cmd_ctrl(mtd, column &gt;&gt; 8, ctrl);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (page_addr != -1) {</div><div class='del'>-			this-&gt;write_byte(mtd, (unsigned char) (page_addr &amp; 0xff));</div><div class='del'>-			this-&gt;write_byte(mtd, (unsigned char) ((page_addr &gt;&gt; 8) &amp; 0xff));</div><div class='add'>+			chip-&gt;cmd_ctrl(mtd, page_addr, ctrl);</div><div class='add'>+			chip-&gt;cmd_ctrl(mtd, page_addr &gt;&gt; 8,</div><div class='add'>+				       NAND_NCE | NAND_ALE);</div><div class='ctx'> 			/* One more address cycle for devices &gt; 128MiB */</div><div class='del'>-			if (this-&gt;chipsize &gt; (128 &lt;&lt; 20))</div><div class='del'>-				this-&gt;write_byte(mtd, (unsigned char) ((page_addr &gt;&gt; 16) &amp; 0xff));</div><div class='add'>+			if (chip-&gt;chipsize &gt; (128 &lt;&lt; 20))</div><div class='add'>+				chip-&gt;cmd_ctrl(mtd, page_addr &gt;&gt; 16,</div><div class='add'>+					       NAND_NCE | NAND_ALE);</div><div class='ctx'> 		}</div><div class='del'>-		/* Latch in address */</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_CLRALE);</div><div class='ctx'> 	}</div><div class='add'>+	chip-&gt;cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * program and erase have their own busy handlers</div><div class='hunk'>@@ -702,95 +593,96 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,</div><div class='ctx'> 	case NAND_CMD_ERASE1:</div><div class='ctx'> 	case NAND_CMD_ERASE2:</div><div class='ctx'> 	case NAND_CMD_SEQIN:</div><div class='add'>+	case NAND_CMD_RNDIN:</div><div class='ctx'> 	case NAND_CMD_STATUS:</div><div class='ctx'> 	case NAND_CMD_DEPLETE1:</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * read error status commands require only a short delay</div><div class='del'>-	 */</div><div class='add'>+		/*</div><div class='add'>+		 * read error status commands require only a short delay</div><div class='add'>+		 */</div><div class='ctx'> 	case NAND_CMD_STATUS_ERROR:</div><div class='ctx'> 	case NAND_CMD_STATUS_ERROR0:</div><div class='ctx'> 	case NAND_CMD_STATUS_ERROR1:</div><div class='ctx'> 	case NAND_CMD_STATUS_ERROR2:</div><div class='ctx'> 	case NAND_CMD_STATUS_ERROR3:</div><div class='del'>-		udelay(this-&gt;chip_delay);</div><div class='add'>+		udelay(chip-&gt;chip_delay);</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_RESET:</div><div class='del'>-		if (this-&gt;dev_ready)</div><div class='add'>+		if (chip-&gt;dev_ready)</div><div class='ctx'> 			break;</div><div class='del'>-		udelay(this-&gt;chip_delay);</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='del'>-		this-&gt;write_byte(mtd, NAND_CMD_STATUS);</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='del'>-		while ( !(this-&gt;read_byte(mtd) &amp; NAND_STATUS_READY));</div><div class='add'>+		udelay(chip-&gt;chip_delay);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_STATUS,</div><div class='add'>+			       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_NONE,</div><div class='add'>+			       NAND_NCE | NAND_CTRL_CHANGE);</div><div class='add'>+		while (!(chip-&gt;read_byte(mtd) &amp; NAND_STATUS_READY)) ;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case NAND_CMD_RNDOUT:</div><div class='add'>+		/* No ready / busy check necessary */</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_RNDOUTSTART,</div><div class='add'>+			       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_NONE,</div><div class='add'>+			       NAND_NCE | NAND_CTRL_CHANGE);</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_CMD_READ0:</div><div class='del'>-		/* Begin command latch cycle */</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_SETCLE);</div><div class='del'>-		/* Write out the start read command */</div><div class='del'>-		this-&gt;write_byte(mtd, NAND_CMD_READSTART);</div><div class='del'>-		/* End command latch cycle */</div><div class='del'>-		this-&gt;hwcontrol(mtd, NAND_CTL_CLRCLE);</div><div class='del'>-		/* Fall through into ready check */</div><div class='del'>-</div><div class='del'>-	/* This applies to read commands */</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_READSTART,</div><div class='add'>+			       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);</div><div class='add'>+		chip-&gt;cmd_ctrl(mtd, NAND_CMD_NONE,</div><div class='add'>+			       NAND_NCE | NAND_CTRL_CHANGE);</div><div class='add'>+</div><div class='add'>+		/* This applies to read commands */</div><div class='ctx'> 	default:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * If we don't have access to the busy pin, we apply the given</div><div class='ctx'> 		 * command delay</div><div class='del'>-		*/</div><div class='del'>-		if (!this-&gt;dev_ready) {</div><div class='del'>-			udelay (this-&gt;chip_delay);</div><div class='add'>+		 */</div><div class='add'>+		if (!chip-&gt;dev_ready) {</div><div class='add'>+			udelay(chip-&gt;chip_delay);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Apply this short delay always to ensure that we do wait tWB in</div><div class='ctx'> 	 * any case on any machine. */</div><div class='del'>-	ndelay (100);</div><div class='add'>+	ndelay(100);</div><div class='ctx'> </div><div class='ctx'> 	nand_wait_ready(mtd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nand_get_device - [GENERIC] Get chip for selected access</div><div class='del'>- * @this:	the nand chip descriptor</div><div class='add'>+ * @chip:	the nand chip descriptor</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @new_state:	the state which is requested</div><div class='ctx'>  *</div><div class='ctx'>  * Get the device and lock it for exclusive access</div><div class='ctx'>  */</div><div class='del'>-static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state)</div><div class='add'>+static int</div><div class='add'>+nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *active;</div><div class='del'>-	spinlock_t *lock;</div><div class='del'>-	wait_queue_head_t *wq;</div><div class='del'>-	DECLARE_WAITQUEUE (wait, current);</div><div class='del'>-</div><div class='del'>-	lock = (this-&gt;controller) ? &amp;this-&gt;controller-&gt;lock : &amp;this-&gt;chip_lock;</div><div class='del'>-	wq = (this-&gt;controller) ? &amp;this-&gt;controller-&gt;wq : &amp;this-&gt;wq;</div><div class='del'>-retry:</div><div class='del'>-	active = this;</div><div class='add'>+	spinlock_t *lock = &amp;chip-&gt;controller-&gt;lock;</div><div class='add'>+	wait_queue_head_t *wq = &amp;chip-&gt;controller-&gt;wq;</div><div class='add'>+	DECLARE_WAITQUEUE(wait, current);</div><div class='add'>+ retry:</div><div class='ctx'> 	spin_lock(lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Hardware controller shared among independend devices */</div><div class='del'>-	if (this-&gt;controller) {</div><div class='del'>-		if (this-&gt;controller-&gt;active)</div><div class='del'>-			active = this-&gt;controller-&gt;active;</div><div class='del'>-		else</div><div class='del'>-			this-&gt;controller-&gt;active = this;</div><div class='del'>-	}</div><div class='del'>-	if (active == this &amp;&amp; this-&gt;state == FL_READY) {</div><div class='del'>-		this-&gt;state = new_state;</div><div class='add'>+	/* Hardware controller shared among independend devices */</div><div class='add'>+	if (!chip-&gt;controller-&gt;active)</div><div class='add'>+		chip-&gt;controller-&gt;active = chip;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;controller-&gt;active == chip &amp;&amp; chip-&gt;state == FL_READY) {</div><div class='add'>+		chip-&gt;state = new_state;</div><div class='ctx'> 		spin_unlock(lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (new_state == FL_PM_SUSPENDED) {</div><div class='ctx'> 		spin_unlock(lock);</div><div class='del'>-		return (this-&gt;state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;</div><div class='add'>+		return (chip-&gt;state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> 	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 	add_wait_queue(wq, &amp;wait);</div><div class='hunk'>@@ -803,541 +695,341 @@ retry:</div><div class='ctx'> /**</div><div class='ctx'>  * nand_wait - [DEFAULT]  wait until the command is done</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @this:	NAND chip structure</div><div class='del'>- * @state:	state to select the max. timeout value</div><div class='add'>+ * @chip:	NAND chip structure</div><div class='ctx'>  *</div><div class='ctx'>  * Wait for command done. This applies to erase and program only</div><div class='ctx'>  * Erase can take up to 400ms and program up to 20ms according to</div><div class='ctx'>  * general NAND and SmartMedia specs</div><div class='del'>- *</div><div class='del'>-*/</div><div class='del'>-static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)</div><div class='add'>+ */</div><div class='add'>+static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	unsigned long	timeo = jiffies;</div><div class='del'>-	int	status;</div><div class='add'>+	unsigned long timeo = jiffies;</div><div class='add'>+	int status, state = chip-&gt;state;</div><div class='ctx'> </div><div class='ctx'> 	if (state == FL_ERASING)</div><div class='del'>-		 timeo += (HZ * 400) / 1000;</div><div class='add'>+		timeo += (HZ * 400) / 1000;</div><div class='ctx'> 	else</div><div class='del'>-		 timeo += (HZ * 20) / 1000;</div><div class='add'>+		timeo += (HZ * 20) / 1000;</div><div class='ctx'> </div><div class='ctx'> 	led_trigger_event(nand_led_trigger, LED_FULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Apply this short delay always to ensure that we do wait tWB in</div><div class='ctx'> 	 * any case on any machine. */</div><div class='del'>-	ndelay (100);</div><div class='add'>+	ndelay(100);</div><div class='ctx'> </div><div class='del'>-	if ((state == FL_ERASING) &amp;&amp; (this-&gt;options &amp; NAND_IS_AND))</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_STATUS_MULTI, -1, -1);</div><div class='add'>+	if ((state == FL_ERASING) &amp;&amp; (chip-&gt;options &amp; NAND_IS_AND))</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);</div><div class='ctx'> 	else</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);</div><div class='ctx'> </div><div class='ctx'> 	while (time_before(jiffies, timeo)) {</div><div class='del'>-		/* Check, if we were interrupted */</div><div class='del'>-		if (this-&gt;state != state)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		if (this-&gt;dev_ready) {</div><div class='del'>-			if (this-&gt;dev_ready(mtd))</div><div class='add'>+		if (chip-&gt;dev_ready) {</div><div class='add'>+			if (chip-&gt;dev_ready(mtd))</div><div class='ctx'> 				break;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (this-&gt;read_byte(mtd) &amp; NAND_STATUS_READY)</div><div class='add'>+			if (chip-&gt;read_byte(mtd) &amp; NAND_STATUS_READY)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> 	led_trigger_event(nand_led_trigger, LED_OFF);</div><div class='ctx'> </div><div class='del'>-	status = (int) this-&gt;read_byte(mtd);</div><div class='add'>+	status = (int)chip-&gt;read_byte(mtd);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_write_page - [GENERIC] write one page</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @this:	NAND chip structure</div><div class='del'>- * @page: 	startpage inside the chip, must be called with (page &amp; this-&gt;pagemask)</div><div class='del'>- * @oob_buf:	out of band data buffer</div><div class='del'>- * @oobsel:	out of band selecttion structre</div><div class='del'>- * @cached:	1 = enable cached programming if supported by chip</div><div class='del'>- *</div><div class='del'>- * Nand_page_program function is used for write and writev !</div><div class='del'>- * This function will always program a full page of data</div><div class='del'>- * If you call it with a non page aligned buffer, you're lost :)</div><div class='del'>- *</div><div class='del'>- * Cached programming is not supported yet.</div><div class='add'>+ * nand_read_page_raw - [Intern] read raw page data without ecc</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	buffer to store read data</div><div class='ctx'>  */</div><div class='del'>-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page,</div><div class='del'>-	u_char *oob_buf,  struct nand_oobinfo *oobsel, int cached)</div><div class='add'>+static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+			      uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	int 	i, status;</div><div class='del'>-	u_char	ecc_code[32];</div><div class='del'>-	int	eccmode = oobsel-&gt;useecc ? this-&gt;eccmode : NAND_ECC_NONE;</div><div class='del'>-	int  	*oob_config = oobsel-&gt;eccpos;</div><div class='del'>-	int	datidx = 0, eccidx = 0, eccsteps = this-&gt;eccsteps;</div><div class='del'>-	int	eccbytes = 0;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Enable cached programming */</div><div class='del'>-	cached = 0;</div><div class='del'>-</div><div class='del'>-	/* Send command to begin auto page programming */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_SEQIN, 0x00, page);</div><div class='add'>+	chip-&gt;read_buf(mtd, buf, mtd-&gt;writesize);</div><div class='add'>+	chip-&gt;read_buf(mtd, chip-&gt;oob_poi, mtd-&gt;oobsize);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Write out complete page of data, take care of eccmode */</div><div class='del'>-	switch (eccmode) {</div><div class='del'>-	/* No ecc, write all */</div><div class='del'>-	case NAND_ECC_NONE:</div><div class='del'>-		printk (KERN_WARNING "Writing data without ECC to NAND-FLASH is not recommended\n");</div><div class='del'>-		this-&gt;write_buf(mtd, this-&gt;data_poi, mtd-&gt;oobblock);</div><div class='del'>-		break;</div><div class='add'>+/**</div><div class='add'>+ * nand_read_page_swecc - {REPLACABLE] software ecc based page read function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	buffer to store read data</div><div class='add'>+ */</div><div class='add'>+static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	int i, eccsize = chip-&gt;ecc.size;</div><div class='add'>+	int eccbytes = chip-&gt;ecc.bytes;</div><div class='add'>+	int eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	uint8_t *p = buf;</div><div class='add'>+	uint8_t *ecc_calc = chip-&gt;buffers.ecccalc;</div><div class='add'>+	uint8_t *ecc_code = chip-&gt;buffers.ecccode;</div><div class='add'>+	int *eccpos = chip-&gt;ecc.layout-&gt;eccpos;</div><div class='ctx'> </div><div class='del'>-	/* Software ecc 3/256, write all */</div><div class='del'>-	case NAND_ECC_SOFT:</div><div class='del'>-		for (; eccsteps; eccsteps--) {</div><div class='del'>-			this-&gt;calculate_ecc(mtd, &amp;this-&gt;data_poi[datidx], ecc_code);</div><div class='del'>-			for (i = 0; i &lt; 3; i++, eccidx++)</div><div class='del'>-				oob_buf[oob_config[eccidx]] = ecc_code[i];</div><div class='del'>-			datidx += this-&gt;eccsize;</div><div class='del'>-		}</div><div class='del'>-		this-&gt;write_buf(mtd, this-&gt;data_poi, mtd-&gt;oobblock);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		eccbytes = this-&gt;eccbytes;</div><div class='del'>-		for (; eccsteps; eccsteps--) {</div><div class='del'>-			/* enable hardware ecc logic for write */</div><div class='del'>-			this-&gt;enable_hwecc(mtd, NAND_ECC_WRITE);</div><div class='del'>-			this-&gt;write_buf(mtd, &amp;this-&gt;data_poi[datidx], this-&gt;eccsize);</div><div class='del'>-			this-&gt;calculate_ecc(mtd, &amp;this-&gt;data_poi[datidx], ecc_code);</div><div class='del'>-			for (i = 0; i &lt; eccbytes; i++, eccidx++)</div><div class='del'>-				oob_buf[oob_config[eccidx]] = ecc_code[i];</div><div class='del'>-			/* If the hardware ecc provides syndromes then</div><div class='del'>-			 * the ecc code must be written immidiately after</div><div class='del'>-			 * the data bytes (words) */</div><div class='del'>-			if (this-&gt;options &amp; NAND_HWECC_SYNDROME)</div><div class='del'>-				this-&gt;write_buf(mtd, ecc_code, eccbytes);</div><div class='del'>-			datidx += this-&gt;eccsize;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	nand_read_page_raw(mtd, chip, buf);</div><div class='ctx'> </div><div class='del'>-	/* Write out OOB data */</div><div class='del'>-	if (this-&gt;options &amp; NAND_HWECC_SYNDROME)</div><div class='del'>-		this-&gt;write_buf(mtd, &amp;oob_buf[oobsel-&gt;eccbytes], mtd-&gt;oobsize - oobsel-&gt;eccbytes);</div><div class='del'>-	else</div><div class='del'>-		this-&gt;write_buf(mtd, oob_buf, mtd-&gt;oobsize);</div><div class='add'>+	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)</div><div class='add'>+		chip-&gt;ecc.calculate(mtd, p, &amp;ecc_calc[i]);</div><div class='ctx'> </div><div class='del'>-	/* Send command to actually program the data */</div><div class='del'>-	this-&gt;cmdfunc (mtd, cached ? NAND_CMD_CACHEDPROG : NAND_CMD_PAGEPROG, -1, -1);</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;ecc.total; i++)</div><div class='add'>+		ecc_code[i] = chip-&gt;oob_poi[eccpos[i]];</div><div class='ctx'> </div><div class='del'>-	if (!cached) {</div><div class='del'>-		/* call wait ready function */</div><div class='del'>-		status = this-&gt;waitfunc (mtd, this, FL_WRITING);</div><div class='add'>+	eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	p = buf;</div><div class='ctx'> </div><div class='del'>-		/* See if operation failed and additional status checks are available */</div><div class='del'>-		if ((status &amp; NAND_STATUS_FAIL) &amp;&amp; (this-&gt;errstat)) {</div><div class='del'>-			status = this-&gt;errstat(mtd, this, FL_WRITING, status, page);</div><div class='del'>-		}</div><div class='add'>+	for (i = 0 ; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {</div><div class='add'>+		int stat;</div><div class='ctx'> </div><div class='del'>-		/* See if device thinks it succeeded */</div><div class='del'>-		if (status &amp; NAND_STATUS_FAIL) {</div><div class='del'>-			DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write, page 0x%08x, ", __FUNCTION__, page);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Implement cached programming ! */</div><div class='del'>-		/* wait until cache is ready*/</div><div class='del'>-		// status = this-&gt;waitfunc (mtd, this, FL_CACHEDRPG);</div><div class='add'>+		stat = chip-&gt;ecc.correct(mtd, p, &amp;ecc_code[i], &amp;ecc_calc[i]);</div><div class='add'>+		if (stat == -1)</div><div class='add'>+			mtd-&gt;ecc_stats.failed++;</div><div class='add'>+		else</div><div class='add'>+			mtd-&gt;ecc_stats.corrected += stat;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE</div><div class='ctx'> /**</div><div class='del'>- * nand_verify_pages - [GENERIC] verify the chip contents after a write</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @this:	NAND chip structure</div><div class='del'>- * @page: 	startpage inside the chip, must be called with (page &amp; this-&gt;pagemask)</div><div class='del'>- * @numpages:	number of pages to verify</div><div class='del'>- * @oob_buf:	out of band data buffer</div><div class='del'>- * @oobsel:	out of band selecttion structre</div><div class='del'>- * @chipnr:	number of the current chip</div><div class='del'>- * @oobmode:	1 = full buffer verify, 0 = ecc only</div><div class='add'>+ * nand_read_page_hwecc - {REPLACABLE] hardware ecc based page read function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	buffer to store read data</div><div class='ctx'>  *</div><div class='del'>- * The NAND device assumes that it is always writing to a cleanly erased page.</div><div class='del'>- * Hence, it performs its internal write verification only on bits that</div><div class='del'>- * transitioned from 1 to 0. The device does NOT verify the whole page on a</div><div class='del'>- * byte by byte basis. It is possible that the page was not completely erased</div><div class='del'>- * or the page is becoming unusable due to wear. The read with ECC would catch</div><div class='del'>- * the error later when the ECC page check fails, but we would rather catch</div><div class='del'>- * it early in the page write stage. Better to write no data than invalid data.</div><div class='add'>+ * Not for syndrome calculating ecc controllers which need a special oob layout</div><div class='ctx'>  */</div><div class='del'>-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages,</div><div class='del'>-	u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode)</div><div class='add'>+static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	int 	i, j, datidx = 0, oobofs = 0, res = -EIO;</div><div class='del'>-	int	eccsteps = this-&gt;eccsteps;</div><div class='del'>-	int	hweccbytes;</div><div class='del'>-	u_char 	oobdata[64];</div><div class='del'>-</div><div class='del'>-	hweccbytes = (this-&gt;options &amp; NAND_HWECC_SYNDROME) ? (oobsel-&gt;eccbytes / eccsteps) : 0;</div><div class='del'>-</div><div class='del'>-	/* Send command to read back the first page */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_READ0, 0, page);</div><div class='del'>-</div><div class='del'>-	for(;;) {</div><div class='del'>-		for (j = 0; j &lt; eccsteps; j++) {</div><div class='del'>-			/* Loop through and verify the data */</div><div class='del'>-			if (this-&gt;verify_buf(mtd, &amp;this-&gt;data_poi[datidx], mtd-&gt;eccsize)) {</div><div class='del'>-				DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			datidx += mtd-&gt;eccsize;</div><div class='del'>-			/* Have we a hw generator layout ? */</div><div class='del'>-			if (!hweccbytes)</div><div class='del'>-				continue;</div><div class='del'>-			if (this-&gt;verify_buf(mtd, &amp;this-&gt;oob_buf[oobofs], hweccbytes)) {</div><div class='del'>-				DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			oobofs += hweccbytes;</div><div class='del'>-		}</div><div class='add'>+	int i, eccsize = chip-&gt;ecc.size;</div><div class='add'>+	int eccbytes = chip-&gt;ecc.bytes;</div><div class='add'>+	int eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	uint8_t *p = buf;</div><div class='add'>+	uint8_t *ecc_calc = chip-&gt;buffers.ecccalc;</div><div class='add'>+	uint8_t *ecc_code = chip-&gt;buffers.ecccode;</div><div class='add'>+	int *eccpos = chip-&gt;ecc.layout-&gt;eccpos;</div><div class='add'>+</div><div class='add'>+	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {</div><div class='add'>+		chip-&gt;ecc.hwctl(mtd, NAND_ECC_READ);</div><div class='add'>+		chip-&gt;read_buf(mtd, p, eccsize);</div><div class='add'>+		chip-&gt;ecc.calculate(mtd, p, &amp;ecc_calc[i]);</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;read_buf(mtd, chip-&gt;oob_poi, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='del'>-		/* check, if we must compare all data or if we just have to</div><div class='del'>-		 * compare the ecc bytes</div><div class='del'>-		 */</div><div class='del'>-		if (oobmode) {</div><div class='del'>-			if (this-&gt;verify_buf(mtd, &amp;oob_buf[oobofs], mtd-&gt;oobsize - hweccbytes * eccsteps)) {</div><div class='del'>-				DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* Read always, else autoincrement fails */</div><div class='del'>-			this-&gt;read_buf(mtd, oobdata, mtd-&gt;oobsize - hweccbytes * eccsteps);</div><div class='del'>-</div><div class='del'>-			if (oobsel-&gt;useecc != MTD_NANDECC_OFF &amp;&amp; !hweccbytes) {</div><div class='del'>-				int ecccnt = oobsel-&gt;eccbytes;</div><div class='del'>-</div><div class='del'>-				for (i = 0; i &lt; ecccnt; i++) {</div><div class='del'>-					int idx = oobsel-&gt;eccpos[i];</div><div class='del'>-					if (oobdata[idx] != oob_buf[oobofs + idx] ) {</div><div class='del'>-						DEBUG (MTD_DEBUG_LEVEL0,</div><div class='del'>-					       	"%s: Failed ECC write "</div><div class='del'>-						"verify, page 0x%08x, " "%6i bytes were succesful\n", __FUNCTION__, page, i);</div><div class='del'>-						goto out;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		oobofs += mtd-&gt;oobsize - hweccbytes * eccsteps;</div><div class='del'>-		page++;</div><div class='del'>-		numpages--;</div><div class='del'>-</div><div class='del'>-		/* Apply delay or wait for ready/busy pin</div><div class='del'>-		 * Do this before the AUTOINCR check, so no problems</div><div class='del'>-		 * arise if a chip which does auto increment</div><div class='del'>-		 * is marked as NOAUTOINCR by the board driver.</div><div class='del'>-		 * Do this also before returning, so the chip is</div><div class='del'>-		 * ready for the next command.</div><div class='del'>-		*/</div><div class='del'>-		if (!this-&gt;dev_ready)</div><div class='del'>-			udelay (this-&gt;chip_delay);</div><div class='del'>-		else</div><div class='del'>-			nand_wait_ready(mtd);</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;ecc.total; i++)</div><div class='add'>+		ecc_code[i] = chip-&gt;oob_poi[eccpos[i]];</div><div class='ctx'> </div><div class='del'>-		/* All done, return happy */</div><div class='del'>-		if (!numpages)</div><div class='del'>-			return 0;</div><div class='add'>+	eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	p = buf;</div><div class='ctx'> </div><div class='add'>+	for (i = 0 ; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {</div><div class='add'>+		int stat;</div><div class='ctx'> </div><div class='del'>-		/* Check, if the chip supports auto page increment */</div><div class='del'>-		if (!NAND_CANAUTOINCR(this))</div><div class='del'>-			this-&gt;cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);</div><div class='add'>+		stat = chip-&gt;ecc.correct(mtd, p, &amp;ecc_code[i], &amp;ecc_calc[i]);</div><div class='add'>+		if (stat == -1)</div><div class='add'>+			mtd-&gt;ecc_stats.failed++;</div><div class='add'>+		else</div><div class='add'>+			mtd-&gt;ecc_stats.corrected += stat;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * Terminate the read command. We come here in case of an error</div><div class='del'>-	 * So we must issue a reset command.</div><div class='del'>-	 */</div><div class='del'>-out:</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_RESET, -1, -1);</div><div class='del'>-	return res;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_read - [MTD Interface] MTD compability function for nand_do_read_ecc</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @from:	offset to read from</div><div class='del'>- * @len:	number of bytes to read</div><div class='del'>- * @retlen:	pointer to variable to store the number of read bytes</div><div class='del'>- * @buf:	the databuffer to put data</div><div class='add'>+ * nand_read_page_syndrome - {REPLACABLE] hardware ecc syndrom based page read</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	buffer to store read data</div><div class='ctx'>  *</div><div class='del'>- * This function simply calls nand_do_read_ecc with oob buffer and oobsel = NULL</div><div class='del'>- * and flags = 0xff</div><div class='add'>+ * The hw generator calculates the error syndrome automatically. Therefor</div><div class='add'>+ * we need a special oob layout and handling.</div><div class='ctx'>  */</div><div class='del'>-static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)</div><div class='add'>+static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				   uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	return nand_do_read_ecc (mtd, from, len, retlen, buf, NULL, &amp;mtd-&gt;oobinfo, 0xff);</div><div class='del'>-}</div><div class='add'>+	int i, eccsize = chip-&gt;ecc.size;</div><div class='add'>+	int eccbytes = chip-&gt;ecc.bytes;</div><div class='add'>+	int eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	uint8_t *p = buf;</div><div class='add'>+	uint8_t *oob = chip-&gt;oob_poi;</div><div class='add'>+</div><div class='add'>+	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {</div><div class='add'>+		int stat;</div><div class='add'>+</div><div class='add'>+		chip-&gt;ecc.hwctl(mtd, NAND_ECC_READ);</div><div class='add'>+		chip-&gt;read_buf(mtd, p, eccsize);</div><div class='add'>+</div><div class='add'>+		if (chip-&gt;ecc.prepad) {</div><div class='add'>+			chip-&gt;read_buf(mtd, oob, chip-&gt;ecc.prepad);</div><div class='add'>+			oob += chip-&gt;ecc.prepad;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chip-&gt;ecc.hwctl(mtd, NAND_ECC_READSYN);</div><div class='add'>+		chip-&gt;read_buf(mtd, oob, eccbytes);</div><div class='add'>+		stat = chip-&gt;ecc.correct(mtd, p, oob, NULL);</div><div class='add'>+</div><div class='add'>+		if (stat == -1)</div><div class='add'>+			mtd-&gt;ecc_stats.failed++;</div><div class='add'>+		else</div><div class='add'>+			mtd-&gt;ecc_stats.corrected += stat;</div><div class='add'>+</div><div class='add'>+		oob += eccbytes;</div><div class='ctx'> </div><div class='add'>+		if (chip-&gt;ecc.postpad) {</div><div class='add'>+			chip-&gt;read_buf(mtd, oob, chip-&gt;ecc.postpad);</div><div class='add'>+			oob += chip-&gt;ecc.postpad;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate remaining oob bytes */</div><div class='add'>+	i = mtd-&gt;oobsize - (oob - chip-&gt;oob_poi);</div><div class='add'>+	if (i)</div><div class='add'>+		chip-&gt;read_buf(mtd, oob, i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_read_ecc - [MTD Interface] MTD compability function for nand_do_read_ecc</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @from:	offset to read from</div><div class='del'>- * @len:	number of bytes to read</div><div class='del'>- * @retlen:	pointer to variable to store the number of read bytes</div><div class='del'>- * @buf:	the databuffer to put data</div><div class='del'>- * @oob_buf:	filesystem supplied oob data buffer</div><div class='del'>- * @oobsel:	oob selection structure</div><div class='del'>- *</div><div class='del'>- * This function simply calls nand_do_read_ecc with flags = 0xff</div><div class='add'>+ * nand_transfer_oob - [Internal] Transfer oob to client buffer</div><div class='add'>+ * @chip:	nand chip structure</div><div class='add'>+ * @oob:	oob destination address</div><div class='add'>+ * @ops:	oob ops structure</div><div class='ctx'>  */</div><div class='del'>-static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			  size_t * retlen, u_char * buf, u_char * oob_buf, struct nand_oobinfo *oobsel)</div><div class='add'>+static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,</div><div class='add'>+				  struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	/* use userspace supplied oobinfo, if zero */</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='del'>-	return nand_do_read_ecc(mtd, from, len, retlen, buf, oob_buf, oobsel, 0xff);</div><div class='add'>+	size_t len = ops-&gt;ooblen;</div><div class='add'>+</div><div class='add'>+	switch(ops-&gt;mode) {</div><div class='add'>+</div><div class='add'>+	case MTD_OOB_PLACE:</div><div class='add'>+	case MTD_OOB_RAW:</div><div class='add'>+		memcpy(oob, chip-&gt;oob_poi + ops-&gt;ooboffs, len);</div><div class='add'>+		return oob + len;</div><div class='add'>+</div><div class='add'>+	case MTD_OOB_AUTO: {</div><div class='add'>+		struct nand_oobfree *free = chip-&gt;ecc.layout-&gt;oobfree;</div><div class='add'>+		uint32_t boffs = 0, roffs = ops-&gt;ooboffs;</div><div class='add'>+		size_t bytes = 0;</div><div class='add'>+</div><div class='add'>+		for(; free-&gt;length &amp;&amp; len; free++, len -= bytes) {</div><div class='add'>+			/* Read request not from offset 0 ? */</div><div class='add'>+			if (unlikely(roffs)) {</div><div class='add'>+				if (roffs &gt;= free-&gt;length) {</div><div class='add'>+					roffs -= free-&gt;length;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				boffs = free-&gt;offset + roffs;</div><div class='add'>+				bytes = min_t(size_t, len,</div><div class='add'>+					      (free-&gt;length - roffs));</div><div class='add'>+				roffs = 0;</div><div class='add'>+			} else {</div><div class='add'>+				bytes = min_t(size_t, len, free-&gt;length);</div><div class='add'>+				boffs = free-&gt;offset;</div><div class='add'>+			}</div><div class='add'>+			memcpy(oob, chip-&gt;oob_poi + boffs, bytes);</div><div class='add'>+			oob += bytes;</div><div class='add'>+		}</div><div class='add'>+		return oob;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * nand_do_read_ecc - [MTD Interface] Read data with ECC</div><div class='add'>+ * nand_do_read_ops - [Internal] Read data with ECC</div><div class='add'>+ *</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @from:	offset to read from</div><div class='del'>- * @len:	number of bytes to read</div><div class='del'>- * @retlen:	pointer to variable to store the number of read bytes</div><div class='del'>- * @buf:	the databuffer to put data</div><div class='del'>- * @oob_buf:	filesystem supplied oob data buffer (can be NULL)</div><div class='del'>- * @oobsel:	oob selection structure</div><div class='del'>- * @flags:	flag to indicate if nand_get_device/nand_release_device should be preformed</div><div class='del'>- *		and how many corrected error bits are acceptable:</div><div class='del'>- *		  bits 0..7 - number of tolerable errors</div><div class='del'>- *		  bit  8    - 0 == do not get/release chip, 1 == get/release chip</div><div class='add'>+ * @ops:	oob ops structure</div><div class='ctx'>  *</div><div class='del'>- * NAND read with ECC</div><div class='add'>+ * Internal function. Called with chip held.</div><div class='ctx'>  */</div><div class='del'>-int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-			     size_t * retlen, u_char * buf, u_char * oob_buf,</div><div class='del'>-			     struct nand_oobinfo *oobsel, int flags)</div><div class='add'>+static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			    struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='add'>+	int chipnr, page, realpage, col, bytes, aligned;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	struct mtd_ecc_stats stats;</div><div class='add'>+	int blkcheck = (1 &lt;&lt; (chip-&gt;phys_erase_shift - chip-&gt;page_shift)) - 1;</div><div class='add'>+	int sndcmd = 1;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	uint32_t readlen = ops-&gt;len;</div><div class='add'>+	uint8_t *bufpoi, *oob, *buf;</div><div class='ctx'> </div><div class='del'>-	int i, j, col, realpage, page, end, ecc, chipnr, sndcmd = 1;</div><div class='del'>-	int read = 0, oob = 0, ecc_status = 0, ecc_failed = 0;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	u_char *data_poi, *oob_data = oob_buf;</div><div class='del'>-	u_char ecc_calc[32];</div><div class='del'>-	u_char ecc_code[32];</div><div class='del'>-        int eccmode, eccsteps;</div><div class='del'>-	int	*oob_config, datidx;</div><div class='del'>-	int	blockcheck = (1 &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift)) - 1;</div><div class='del'>-	int	eccbytes;</div><div class='del'>-	int	compareecc = 1;</div><div class='del'>-	int	oobreadlen;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3, "nand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);</div><div class='del'>-</div><div class='del'>-	/* Do not allow reads past end of device */</div><div class='del'>-	if ((from + len) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: Attempt read beyond end of device\n");</div><div class='del'>-		*retlen = 0;</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	if (flags &amp; NAND_GET_DEVICE)</div><div class='del'>-		nand_get_device (this, mtd, FL_READING);</div><div class='del'>-</div><div class='del'>-	/* Autoplace of oob data ? Use the default placement scheme */</div><div class='del'>-	if (oobsel-&gt;useecc == MTD_NANDECC_AUTOPLACE)</div><div class='del'>-		oobsel = this-&gt;autooob;</div><div class='del'>-</div><div class='del'>-	eccmode = oobsel-&gt;useecc ? this-&gt;eccmode : NAND_ECC_NONE;</div><div class='del'>-	oob_config = oobsel-&gt;eccpos;</div><div class='del'>-</div><div class='del'>-	/* Select the NAND device */</div><div class='del'>-	chipnr = (int)(from &gt;&gt; this-&gt;chip_shift);</div><div class='del'>-	this-&gt;select_chip(mtd, chipnr);</div><div class='del'>-</div><div class='del'>-	/* First we calculate the starting page */</div><div class='del'>-	realpage = (int) (from &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	page = realpage &amp; this-&gt;pagemask;</div><div class='del'>-</div><div class='del'>-	/* Get raw starting column */</div><div class='del'>-	col = from &amp; (mtd-&gt;oobblock - 1);</div><div class='del'>-</div><div class='del'>-	end = mtd-&gt;oobblock;</div><div class='del'>-	ecc = this-&gt;eccsize;</div><div class='del'>-	eccbytes = this-&gt;eccbytes;</div><div class='del'>-</div><div class='del'>-	if ((eccmode == NAND_ECC_NONE) || (this-&gt;options &amp; NAND_HWECC_SYNDROME))</div><div class='del'>-		compareecc = 0;</div><div class='del'>-</div><div class='del'>-	oobreadlen = mtd-&gt;oobsize;</div><div class='del'>-	if (this-&gt;options &amp; NAND_HWECC_SYNDROME)</div><div class='del'>-		oobreadlen -= oobsel-&gt;eccbytes;</div><div class='add'>+	stats = mtd-&gt;ecc_stats;</div><div class='ctx'> </div><div class='del'>-	/* Loop until all data read */</div><div class='del'>-	while (read &lt; len) {</div><div class='add'>+	chipnr = (int)(from &gt;&gt; chip-&gt;chip_shift);</div><div class='add'>+	chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> </div><div class='del'>-		int aligned = (!col &amp;&amp; (len - read) &gt;= end);</div><div class='del'>-		/*</div><div class='del'>-		 * If the read is not page aligned, we have to read into data buffer</div><div class='del'>-		 * due to ecc, else we read into return buffer direct</div><div class='del'>-		 */</div><div class='del'>-		if (aligned)</div><div class='del'>-			data_poi = &amp;buf[read];</div><div class='del'>-		else</div><div class='del'>-			data_poi = this-&gt;data_buf;</div><div class='add'>+	realpage = (int)(from &gt;&gt; chip-&gt;page_shift);</div><div class='add'>+	page = realpage &amp; chip-&gt;pagemask;</div><div class='ctx'> </div><div class='del'>-		/* Check, if we have this page in the buffer</div><div class='del'>-		 *</div><div class='del'>-		 * FIXME: Make it work when we must provide oob data too,</div><div class='del'>-		 * check the usage of data_buf oob field</div><div class='del'>-		 */</div><div class='del'>-		if (realpage == this-&gt;pagebuf &amp;&amp; !oob_buf) {</div><div class='del'>-			/* aligned read ? */</div><div class='del'>-			if (aligned)</div><div class='del'>-				memcpy (data_poi, this-&gt;data_buf, end);</div><div class='del'>-			goto readdata;</div><div class='del'>-		}</div><div class='add'>+	col = (int)(from &amp; (mtd-&gt;writesize - 1));</div><div class='add'>+	chip-&gt;oob_poi = chip-&gt;buffers.oobrbuf;</div><div class='ctx'> </div><div class='del'>-		/* Check, if we must send the read command */</div><div class='del'>-		if (sndcmd) {</div><div class='del'>-			this-&gt;cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);</div><div class='del'>-			sndcmd = 0;</div><div class='del'>-		}</div><div class='add'>+	buf = ops-&gt;datbuf;</div><div class='add'>+	oob = ops-&gt;oobbuf;</div><div class='ctx'> </div><div class='del'>-		/* get oob area, if we have no oob buffer from fs-driver */</div><div class='del'>-		if (!oob_buf || oobsel-&gt;useecc == MTD_NANDECC_AUTOPLACE ||</div><div class='del'>-			oobsel-&gt;useecc == MTD_NANDECC_AUTOPL_USR)</div><div class='del'>-			oob_data = &amp;this-&gt;data_buf[end];</div><div class='add'>+	while(1) {</div><div class='add'>+		bytes = min(mtd-&gt;writesize - col, readlen);</div><div class='add'>+		aligned = (bytes == mtd-&gt;writesize);</div><div class='ctx'> </div><div class='del'>-		eccsteps = this-&gt;eccsteps;</div><div class='add'>+		/* Is the current page in the buffer ? */</div><div class='add'>+		if (realpage != chip-&gt;pagebuf || oob) {</div><div class='add'>+			bufpoi = aligned ? buf : chip-&gt;buffers.databuf;</div><div class='ctx'> </div><div class='del'>-		switch (eccmode) {</div><div class='del'>-		case NAND_ECC_NONE: {	/* No ECC, Read in a page */</div><div class='del'>-			static unsigned long lastwhinge = 0;</div><div class='del'>-			if ((lastwhinge / HZ) != (jiffies / HZ)) {</div><div class='del'>-				printk (KERN_WARNING "Reading data from NAND FLASH without ECC is not recommended\n");</div><div class='del'>-				lastwhinge = jiffies;</div><div class='add'>+			if (likely(sndcmd)) {</div><div class='add'>+				chip-&gt;cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);</div><div class='add'>+				sndcmd = 0;</div><div class='ctx'> 			}</div><div class='del'>-			this-&gt;read_buf(mtd, data_poi, end);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		case NAND_ECC_SOFT:	/* Software ECC 3/256: Read in a page + oob data */</div><div class='del'>-			this-&gt;read_buf(mtd, data_poi, end);</div><div class='del'>-			for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=3, datidx += ecc)</div><div class='del'>-				this-&gt;calculate_ecc(mtd, &amp;data_poi[datidx], &amp;ecc_calc[i]);</div><div class='del'>-			break;</div><div class='add'>+			/* Now read the page into the buffer */</div><div class='add'>+			ret = chip-&gt;ecc.read_page(mtd, chip, bufpoi);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=eccbytes, datidx += ecc) {</div><div class='del'>-				this-&gt;enable_hwecc(mtd, NAND_ECC_READ);</div><div class='del'>-				this-&gt;read_buf(mtd, &amp;data_poi[datidx], ecc);</div><div class='del'>-</div><div class='del'>-				/* HW ecc with syndrome calculation must read the</div><div class='del'>-				 * syndrome from flash immidiately after the data */</div><div class='del'>-				if (!compareecc) {</div><div class='del'>-					/* Some hw ecc generators need to know when the</div><div class='del'>-					 * syndrome is read from flash */</div><div class='del'>-					this-&gt;enable_hwecc(mtd, NAND_ECC_READSYN);</div><div class='del'>-					this-&gt;read_buf(mtd, &amp;oob_data[i], eccbytes);</div><div class='del'>-					/* We calc error correction directly, it checks the hw</div><div class='del'>-					 * generator for an error, reads back the syndrome and</div><div class='del'>-					 * does the error correction on the fly */</div><div class='del'>-					ecc_status = this-&gt;correct_data(mtd, &amp;data_poi[datidx], &amp;oob_data[i], &amp;ecc_code[i]);</div><div class='del'>-					if ((ecc_status == -1) || (ecc_status &gt; (flags &amp;&amp; 0xff))) {</div><div class='del'>-						DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: "</div><div class='del'>-							"Failed ECC read, page 0x%08x on chip %d\n", page, chipnr);</div><div class='del'>-						ecc_failed++;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					this-&gt;calculate_ecc(mtd, &amp;data_poi[datidx], &amp;ecc_calc[i]);</div><div class='del'>-				}</div><div class='add'>+			/* Transfer not aligned data */</div><div class='add'>+			if (!aligned) {</div><div class='add'>+				chip-&gt;pagebuf = realpage;</div><div class='add'>+				memcpy(buf, chip-&gt;buffers.databuf + col, bytes);</div><div class='ctx'> 			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* read oobdata */</div><div class='del'>-		this-&gt;read_buf(mtd, &amp;oob_data[mtd-&gt;oobsize - oobreadlen], oobreadlen);</div><div class='ctx'> </div><div class='del'>-		/* Skip ECC check, if not requested (ECC_NONE or HW_ECC with syndromes) */</div><div class='del'>-		if (!compareecc)</div><div class='del'>-			goto readoob;</div><div class='add'>+			buf += bytes;</div><div class='ctx'> </div><div class='del'>-		/* Pick the ECC bytes out of the oob data */</div><div class='del'>-		for (j = 0; j &lt; oobsel-&gt;eccbytes; j++)</div><div class='del'>-			ecc_code[j] = oob_data[oob_config[j]];</div><div class='del'>-</div><div class='del'>-		/* correct data, if neccecary */</div><div class='del'>-		for (i = 0, j = 0, datidx = 0; i &lt; this-&gt;eccsteps; i++, datidx += ecc) {</div><div class='del'>-			ecc_status = this-&gt;correct_data(mtd, &amp;data_poi[datidx], &amp;ecc_code[j], &amp;ecc_calc[j]);</div><div class='del'>-</div><div class='del'>-			/* Get next chunk of ecc bytes */</div><div class='del'>-			j += eccbytes;</div><div class='del'>-</div><div class='del'>-			/* Check, if we have a fs supplied oob-buffer,</div><div class='del'>-			 * This is the legacy mode. Used by YAFFS1</div><div class='del'>-			 * Should go away some day</div><div class='del'>-			 */</div><div class='del'>-			if (oob_buf &amp;&amp; oobsel-&gt;useecc == MTD_NANDECC_PLACE) {</div><div class='del'>-				int *p = (int *)(&amp;oob_data[mtd-&gt;oobsize]);</div><div class='del'>-				p[i] = ecc_status;</div><div class='add'>+			if (unlikely(oob)) {</div><div class='add'>+				/* Raw mode does data:oob:data:oob */</div><div class='add'>+				if (ops-&gt;mode != MTD_OOB_RAW)</div><div class='add'>+					oob = nand_transfer_oob(chip, oob, ops);</div><div class='add'>+				else</div><div class='add'>+					buf = nand_transfer_oob(chip, buf, ops);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if ((ecc_status == -1) || (ecc_status &gt; (flags &amp;&amp; 0xff))) {</div><div class='del'>-				DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " "Failed ECC read, page 0x%08x\n", page);</div><div class='del'>-				ecc_failed++;</div><div class='add'>+			if (!(chip-&gt;options &amp; NAND_NO_READRDY)) {</div><div class='add'>+				/*</div><div class='add'>+				 * Apply delay or wait for ready/busy pin. Do</div><div class='add'>+				 * this before the AUTOINCR check, so no</div><div class='add'>+				 * problems arise if a chip which does auto</div><div class='add'>+				 * increment is marked as NOAUTOINCR by the</div><div class='add'>+				 * board driver.</div><div class='add'>+				 */</div><div class='add'>+				if (!chip-&gt;dev_ready)</div><div class='add'>+					udelay(chip-&gt;chip_delay);</div><div class='add'>+				else</div><div class='add'>+					nand_wait_ready(mtd);</div><div class='ctx'> 			}</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(buf, chip-&gt;buffers.databuf + col, bytes);</div><div class='add'>+			buf += bytes;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	readoob:</div><div class='del'>-		/* check, if we have a fs supplied oob-buffer */</div><div class='del'>-		if (oob_buf) {</div><div class='del'>-			/* without autoplace. Legacy mode used by YAFFS1 */</div><div class='del'>-			switch(oobsel-&gt;useecc) {</div><div class='del'>-			case MTD_NANDECC_AUTOPLACE:</div><div class='del'>-			case MTD_NANDECC_AUTOPL_USR:</div><div class='del'>-				/* Walk through the autoplace chunks */</div><div class='del'>-				for (i = 0; oobsel-&gt;oobfree[i][1]; i++) {</div><div class='del'>-					int from = oobsel-&gt;oobfree[i][0];</div><div class='del'>-					int num = oobsel-&gt;oobfree[i][1];</div><div class='del'>-					memcpy(&amp;oob_buf[oob], &amp;oob_data[from], num);</div><div class='del'>-					oob += num;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case MTD_NANDECC_PLACE:</div><div class='del'>-				/* YAFFS1 legacy mode */</div><div class='del'>-				oob_data += this-&gt;eccsteps * sizeof (int);</div><div class='del'>-			default:</div><div class='del'>-				oob_data += mtd-&gt;oobsize;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	readdata:</div><div class='del'>-		/* Partial page read, transfer data into fs buffer */</div><div class='del'>-		if (!aligned) {</div><div class='del'>-			for (j = col; j &lt; end &amp;&amp; read &lt; len; j++)</div><div class='del'>-				buf[read++] = data_poi[j];</div><div class='del'>-			this-&gt;pagebuf = realpage;</div><div class='del'>-		} else</div><div class='del'>-			read += mtd-&gt;oobblock;</div><div class='del'>-</div><div class='del'>-		/* Apply delay or wait for ready/busy pin</div><div class='del'>-		 * Do this before the AUTOINCR check, so no problems</div><div class='del'>-		 * arise if a chip which does auto increment</div><div class='del'>-		 * is marked as NOAUTOINCR by the board driver.</div><div class='del'>-		*/</div><div class='del'>-		if (!this-&gt;dev_ready)</div><div class='del'>-			udelay (this-&gt;chip_delay);</div><div class='del'>-		else</div><div class='del'>-			nand_wait_ready(mtd);</div><div class='add'>+		readlen -= bytes;</div><div class='ctx'> </div><div class='del'>-		if (read == len)</div><div class='add'>+		if (!readlen)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* For subsequent reads align to page boundary. */</div><div class='hunk'>@@ -1345,701 +1037,775 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		/* Increment page address */</div><div class='ctx'> 		realpage++;</div><div class='ctx'> </div><div class='del'>-		page = realpage &amp; this-&gt;pagemask;</div><div class='add'>+		page = realpage &amp; chip-&gt;pagemask;</div><div class='ctx'> 		/* Check, if we cross a chip boundary */</div><div class='ctx'> 		if (!page) {</div><div class='ctx'> 			chipnr++;</div><div class='del'>-			this-&gt;select_chip(mtd, -1);</div><div class='del'>-			this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+			chip-&gt;select_chip(mtd, -1);</div><div class='add'>+			chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		/* Check, if the chip supports auto page increment</div><div class='ctx'> 		 * or if we have hit a block boundary.</div><div class='del'>-		*/</div><div class='del'>-		if (!NAND_CANAUTOINCR(this) || !(page &amp; blockcheck))</div><div class='add'>+		 */</div><div class='add'>+		if (!NAND_CANAUTOINCR(chip) || !(page &amp; blkcheck))</div><div class='ctx'> 			sndcmd = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Deselect and wake up anyone waiting on the device */</div><div class='del'>-	if (flags &amp; NAND_GET_DEVICE)</div><div class='del'>-		nand_release_device(mtd);</div><div class='add'>+	ops-&gt;retlen = ops-&gt;len - (size_t) readlen;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Return success, if no ECC failures, else -EBADMSG</div><div class='del'>-	 * fs driver will take care of that, because</div><div class='del'>-	 * retlen == desired len and result == -EBADMSG</div><div class='del'>-	 */</div><div class='del'>-	*retlen = read;</div><div class='del'>-	return ecc_failed ? -EBADMSG : 0;</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mtd-&gt;ecc_stats.failed - stats.failed)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	return  mtd-&gt;ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_read_oob - [MTD Interface] NAND read out-of-band</div><div class='add'>+ * nand_read - [MTD Interface] MTD compability function for nand_do_read_ecc</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @from:	offset to read from</div><div class='ctx'>  * @len:	number of bytes to read</div><div class='ctx'>  * @retlen:	pointer to variable to store the number of read bytes</div><div class='ctx'>  * @buf:	the databuffer to put data</div><div class='ctx'>  *</div><div class='del'>- * NAND read out-of-band data from the spare area</div><div class='add'>+ * Get hold of the chip and call nand_do_read</div><div class='ctx'>  */</div><div class='del'>-static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)</div><div class='add'>+static int nand_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+		     size_t *retlen, uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	int i, col, page, chipnr;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int	blockcheck = (1 &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift)) - 1;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Do not allow reads past end of device */</div><div class='add'>+	if ((from + len) &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);</div><div class='add'>+	nand_get_device(chip, mtd, FL_READING);</div><div class='ctx'> </div><div class='del'>-	/* Shift to get page */</div><div class='del'>-	page = (int)(from &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	chipnr = (int)(from &gt;&gt; this-&gt;chip_shift);</div><div class='add'>+	chip-&gt;ops.len = len;</div><div class='add'>+	chip-&gt;ops.datbuf = buf;</div><div class='add'>+	chip-&gt;ops.oobbuf = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Mask to get column */</div><div class='del'>-	col = from &amp; (mtd-&gt;oobsize - 1);</div><div class='add'>+	ret = nand_do_read_ops(mtd, from, &amp;chip-&gt;ops);</div><div class='ctx'> </div><div class='del'>-	/* Initialize return length value */</div><div class='del'>-	*retlen = 0;</div><div class='add'>+	nand_release_device(mtd);</div><div class='ctx'> </div><div class='del'>-	/* Do not allow reads past end of device */</div><div class='del'>-	if ((from + len) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_read_oob: Attempt read beyond end of device\n");</div><div class='del'>-		*retlen = 0;</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	*retlen = chip-&gt;ops.retlen;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_read_oob_std - [REPLACABLE] the most common OOB data read function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @page:	page number to read</div><div class='add'>+ * @sndcmd:	flag whether to issue read command or not</div><div class='add'>+ */</div><div class='add'>+static int nand_read_oob_std(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+			     int page, int sndcmd)</div><div class='add'>+{</div><div class='add'>+	if (sndcmd) {</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_READOOB, 0, page);</div><div class='add'>+		sndcmd = 0;</div><div class='ctx'> 	}</div><div class='add'>+	chip-&gt;read_buf(mtd, chip-&gt;oob_poi, mtd-&gt;oobsize);</div><div class='add'>+	return sndcmd;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd , FL_READING);</div><div class='add'>+/**</div><div class='add'>+ * nand_read_oob_syndrome - [REPLACABLE] OOB data read function for HW ECC</div><div class='add'>+ *			    with syndromes</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @page:	page number to read</div><div class='add'>+ * @sndcmd:	flag whether to issue read command or not</div><div class='add'>+ */</div><div class='add'>+static int nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				  int page, int sndcmd)</div><div class='add'>+{</div><div class='add'>+	uint8_t *buf = chip-&gt;oob_poi;</div><div class='add'>+	int length = mtd-&gt;oobsize;</div><div class='add'>+	int chunk = chip-&gt;ecc.bytes + chip-&gt;ecc.prepad + chip-&gt;ecc.postpad;</div><div class='add'>+	int eccsize = chip-&gt;ecc.size;</div><div class='add'>+	uint8_t *bufpoi = buf;</div><div class='add'>+	int i, toread, sndrnd = 0, pos;</div><div class='add'>+</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_READ0, chip-&gt;ecc.size, page);</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;ecc.steps; i++) {</div><div class='add'>+		if (sndrnd) {</div><div class='add'>+			pos = eccsize + i * (eccsize + chunk);</div><div class='add'>+			if (mtd-&gt;writesize &gt; 512)</div><div class='add'>+				chip-&gt;cmdfunc(mtd, NAND_CMD_RNDOUT, pos, -1);</div><div class='add'>+			else</div><div class='add'>+				chip-&gt;cmdfunc(mtd, NAND_CMD_READ0, pos, page);</div><div class='add'>+		} else</div><div class='add'>+			sndrnd = 1;</div><div class='add'>+		toread = min_t(int, length, chunk);</div><div class='add'>+		chip-&gt;read_buf(mtd, bufpoi, toread);</div><div class='add'>+		bufpoi += toread;</div><div class='add'>+		length -= toread;</div><div class='add'>+	}</div><div class='add'>+	if (length &gt; 0)</div><div class='add'>+		chip-&gt;read_buf(mtd, bufpoi, length);</div><div class='ctx'> </div><div class='del'>-	/* Select the NAND device */</div><div class='del'>-	this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_write_oob_std - [REPLACABLE] the most common OOB data write function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @page:	page number to write</div><div class='add'>+ */</div><div class='add'>+static int nand_write_oob_std(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+			      int page)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	const uint8_t *buf = chip-&gt;oob_poi;</div><div class='add'>+	int length = mtd-&gt;oobsize;</div><div class='add'>+</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_SEQIN, mtd-&gt;writesize, page);</div><div class='add'>+	chip-&gt;write_buf(mtd, buf, length);</div><div class='add'>+	/* Send command to program the OOB data */</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);</div><div class='add'>+</div><div class='add'>+	status = chip-&gt;waitfunc(mtd, chip);</div><div class='add'>+</div><div class='add'>+	return status &amp; NAND_STATUS_FAIL ? -EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_write_oob_syndrome - [REPLACABLE] OOB data write function for HW ECC</div><div class='add'>+ *			     with syndrome - only for large page flash !</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @page:	page number to write</div><div class='add'>+ */</div><div class='add'>+static int nand_write_oob_syndrome(struct mtd_info *mtd,</div><div class='add'>+				   struct nand_chip *chip, int page)</div><div class='add'>+{</div><div class='add'>+	int chunk = chip-&gt;ecc.bytes + chip-&gt;ecc.prepad + chip-&gt;ecc.postpad;</div><div class='add'>+	int eccsize = chip-&gt;ecc.size, length = mtd-&gt;oobsize;</div><div class='add'>+	int i, len, pos, status = 0, sndcmd = 0, steps = chip-&gt;ecc.steps;</div><div class='add'>+	const uint8_t *bufpoi = chip-&gt;oob_poi;</div><div class='ctx'> </div><div class='del'>-	/* Send the read command */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_READOOB, col, page &amp; this-&gt;pagemask);</div><div class='ctx'> 	/*</div><div class='del'>-	 * Read the data, if we read more than one page</div><div class='del'>-	 * oob data, let the device transfer the data !</div><div class='add'>+	 * data-ecc-data-ecc ... ecc-oob</div><div class='add'>+	 * or</div><div class='add'>+	 * data-pad-ecc-pad-data-pad .... ecc-pad-oob</div><div class='ctx'> 	 */</div><div class='del'>-	i = 0;</div><div class='del'>-	while (i &lt; len) {</div><div class='del'>-		int thislen = mtd-&gt;oobsize - col;</div><div class='del'>-		thislen = min_t(int, thislen, len);</div><div class='del'>-		this-&gt;read_buf(mtd, &amp;buf[i], thislen);</div><div class='del'>-		i += thislen;</div><div class='del'>-</div><div class='del'>-		/* Read more ? */</div><div class='del'>-		if (i &lt; len) {</div><div class='del'>-			page++;</div><div class='del'>-			col = 0;</div><div class='del'>-</div><div class='del'>-			/* Check, if we cross a chip boundary */</div><div class='del'>-			if (!(page &amp; this-&gt;pagemask)) {</div><div class='del'>-				chipnr++;</div><div class='del'>-				this-&gt;select_chip(mtd, -1);</div><div class='del'>-				this-&gt;select_chip(mtd, chipnr);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Apply delay or wait for ready/busy pin</div><div class='del'>-			 * Do this before the AUTOINCR check, so no problems</div><div class='del'>-			 * arise if a chip which does auto increment</div><div class='del'>-			 * is marked as NOAUTOINCR by the board driver.</div><div class='del'>-			 */</div><div class='del'>-			if (!this-&gt;dev_ready)</div><div class='del'>-				udelay (this-&gt;chip_delay);</div><div class='del'>-			else</div><div class='del'>-				nand_wait_ready(mtd);</div><div class='add'>+	if (!chip-&gt;ecc.prepad &amp;&amp; !chip-&gt;ecc.postpad) {</div><div class='add'>+		pos = steps * (eccsize + chunk);</div><div class='add'>+		steps = 0;</div><div class='add'>+	} else</div><div class='add'>+		pos = eccsize + chunk;</div><div class='ctx'> </div><div class='del'>-			/* Check, if the chip supports auto page increment</div><div class='del'>-			 * or if we have hit a block boundary.</div><div class='del'>-			*/</div><div class='del'>-			if (!NAND_CANAUTOINCR(this) || !(page &amp; blockcheck)) {</div><div class='del'>-				/* For subsequent page reads set offset to 0 */</div><div class='del'>-			        this-&gt;cmdfunc (mtd, NAND_CMD_READOOB, 0x0, page &amp; this-&gt;pagemask);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_SEQIN, pos, page);</div><div class='add'>+	for (i = 0; i &lt; steps; i++) {</div><div class='add'>+		if (sndcmd) {</div><div class='add'>+			if (mtd-&gt;writesize &lt;= 512) {</div><div class='add'>+				uint32_t fill = 0xFFFFFFFF;</div><div class='add'>+</div><div class='add'>+				len = eccsize;</div><div class='add'>+				while (len &gt; 0) {</div><div class='add'>+					int num = min_t(int, len, 4);</div><div class='add'>+					chip-&gt;write_buf(mtd, (uint8_t *)&amp;fill,</div><div class='add'>+							num);</div><div class='add'>+					len -= num;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				pos = eccsize + i * (eccsize + chunk);</div><div class='add'>+				chip-&gt;cmdfunc(mtd, NAND_CMD_RNDIN, pos, -1);</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='add'>+		} else</div><div class='add'>+			sndcmd = 1;</div><div class='add'>+		len = min_t(int, length, chunk);</div><div class='add'>+		chip-&gt;write_buf(mtd, bufpoi, len);</div><div class='add'>+		bufpoi += len;</div><div class='add'>+		length -= len;</div><div class='ctx'> 	}</div><div class='add'>+	if (length &gt; 0)</div><div class='add'>+		chip-&gt;write_buf(mtd, bufpoi, length);</div><div class='ctx'> </div><div class='del'>-	/* Deselect and wake up anyone waiting on the device */</div><div class='del'>-	nand_release_device(mtd);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);</div><div class='add'>+	status = chip-&gt;waitfunc(mtd, chip);</div><div class='ctx'> </div><div class='del'>-	/* Return happy */</div><div class='del'>-	*retlen = len;</div><div class='del'>-	return 0;</div><div class='add'>+	return status &amp; NAND_STATUS_FAIL ? -EIO : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_read_raw - [GENERIC] Read raw data including oob into buffer</div><div class='add'>+ * nand_do_read_oob - [Intern] NAND read out-of-band</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @buf:	temporary buffer</div><div class='ctx'>  * @from:	offset to read from</div><div class='del'>- * @len:	number of bytes to read</div><div class='del'>- * @ooblen:	number of oob data bytes to read</div><div class='add'>+ * @ops:	oob operations description structure</div><div class='ctx'>  *</div><div class='del'>- * Read raw data including oob into buffer</div><div class='add'>+ * NAND read out-of-band data from the spare area</div><div class='ctx'>  */</div><div class='del'>-int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len, size_t ooblen)</div><div class='add'>+static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			    struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int page = (int) (from &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	int chip = (int) (from &gt;&gt; this-&gt;chip_shift);</div><div class='del'>-	int sndcmd = 1;</div><div class='del'>-	int cnt = 0;</div><div class='del'>-	int pagesize = mtd-&gt;oobblock + mtd-&gt;oobsize;</div><div class='del'>-	int	blockcheck = (1 &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift)) - 1;</div><div class='add'>+	int page, realpage, chipnr, sndcmd = 1;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int blkcheck = (1 &lt;&lt; (chip-&gt;phys_erase_shift - chip-&gt;page_shift)) - 1;</div><div class='add'>+	int readlen = ops-&gt;len;</div><div class='add'>+	uint8_t *buf = ops-&gt;oobbuf;</div><div class='ctx'> </div><div class='del'>-	/* Do not allow reads past end of device */</div><div class='del'>-	if ((from + len) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_read_raw: Attempt read beyond end of device\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08Lx, len = %i\n",</div><div class='add'>+	      (unsigned long long)from, readlen);</div><div class='ctx'> </div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd , FL_READING);</div><div class='add'>+	chipnr = (int)(from &gt;&gt; chip-&gt;chip_shift);</div><div class='add'>+	chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> </div><div class='del'>-	this-&gt;select_chip (mtd, chip);</div><div class='add'>+	/* Shift to get page */</div><div class='add'>+	realpage = (int)(from &gt;&gt; chip-&gt;page_shift);</div><div class='add'>+	page = realpage &amp; chip-&gt;pagemask;</div><div class='ctx'> </div><div class='del'>-	/* Add requested oob length */</div><div class='del'>-	len += ooblen;</div><div class='add'>+	chip-&gt;oob_poi = chip-&gt;buffers.oobrbuf;</div><div class='ctx'> </div><div class='del'>-	while (len) {</div><div class='del'>-		if (sndcmd)</div><div class='del'>-			this-&gt;cmdfunc (mtd, NAND_CMD_READ0, 0, page &amp; this-&gt;pagemask);</div><div class='del'>-		sndcmd = 0;</div><div class='add'>+	while(1) {</div><div class='add'>+		sndcmd = chip-&gt;ecc.read_oob(mtd, chip, page, sndcmd);</div><div class='add'>+		buf = nand_transfer_oob(chip, buf, ops);</div><div class='add'>+</div><div class='add'>+		if (!(chip-&gt;options &amp; NAND_NO_READRDY)) {</div><div class='add'>+			/*</div><div class='add'>+			 * Apply delay or wait for ready/busy pin. Do this</div><div class='add'>+			 * before the AUTOINCR check, so no problems arise if a</div><div class='add'>+			 * chip which does auto increment is marked as</div><div class='add'>+			 * NOAUTOINCR by the board driver.</div><div class='add'>+			 */</div><div class='add'>+			if (!chip-&gt;dev_ready)</div><div class='add'>+				udelay(chip-&gt;chip_delay);</div><div class='add'>+			else</div><div class='add'>+				nand_wait_ready(mtd);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		this-&gt;read_buf (mtd, &amp;buf[cnt], pagesize);</div><div class='add'>+		readlen -= ops-&gt;ooblen;</div><div class='add'>+		if (!readlen)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		len -= pagesize;</div><div class='del'>-		cnt += pagesize;</div><div class='del'>-		page++;</div><div class='add'>+		/* Increment page address */</div><div class='add'>+		realpage++;</div><div class='ctx'> </div><div class='del'>-		if (!this-&gt;dev_ready)</div><div class='del'>-			udelay (this-&gt;chip_delay);</div><div class='del'>-		else</div><div class='del'>-			nand_wait_ready(mtd);</div><div class='add'>+		page = realpage &amp; chip-&gt;pagemask;</div><div class='add'>+		/* Check, if we cross a chip boundary */</div><div class='add'>+		if (!page) {</div><div class='add'>+			chipnr++;</div><div class='add'>+			chip-&gt;select_chip(mtd, -1);</div><div class='add'>+			chip-&gt;select_chip(mtd, chipnr);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/* Check, if the chip supports auto page increment */</div><div class='del'>-		if (!NAND_CANAUTOINCR(this) || !(page &amp; blockcheck))</div><div class='add'>+		/* Check, if the chip supports auto page increment</div><div class='add'>+		 * or if we have hit a block boundary.</div><div class='add'>+		 */</div><div class='add'>+		if (!NAND_CANAUTOINCR(chip) || !(page &amp; blkcheck))</div><div class='ctx'> 			sndcmd = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Deselect and wake up anyone waiting on the device */</div><div class='del'>-	nand_release_device(mtd);</div><div class='add'>+	ops-&gt;retlen = ops-&gt;len;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * nand_prepare_oobbuf - [GENERIC] Prepare the out of band buffer</div><div class='add'>+ * nand_read_oob - [MTD Interface] NAND read data and/or out-of-band</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @fsbuf:	buffer given by fs driver</div><div class='del'>- * @oobsel:	out of band selection structre</div><div class='del'>- * @autoplace:	1 = place given buffer into the oob bytes</div><div class='del'>- * @numpages:	number of pages to prepare</div><div class='del'>- *</div><div class='del'>- * Return:</div><div class='del'>- * 1. Filesystem buffer available and autoplacement is off,</div><div class='del'>- *    return filesystem buffer</div><div class='del'>- * 2. No filesystem buffer or autoplace is off, return internal</div><div class='del'>- *    buffer</div><div class='del'>- * 3. Filesystem buffer is given and autoplace selected</div><div class='del'>- *    put data from fs buffer into internal buffer and</div><div class='del'>- *    retrun internal buffer</div><div class='del'>- *</div><div class='del'>- * Note: The internal buffer is filled with 0xff. This must</div><div class='del'>- * be done only once, when no autoplacement happens</div><div class='del'>- * Autoplacement sets the buffer dirty flag, which</div><div class='del'>- * forces the 0xff fill before using the buffer again.</div><div class='add'>+ * @from:	offset to read from</div><div class='add'>+ * @ops:	oob operation description structure</div><div class='ctx'>  *</div><div class='del'>-*/</div><div class='del'>-static u_char * nand_prepare_oobbuf (struct mtd_info *mtd, u_char *fsbuf, struct nand_oobinfo *oobsel,</div><div class='del'>-		int autoplace, int numpages)</div><div class='add'>+ * NAND read data and/or out-of-band data</div><div class='add'>+ */</div><div class='add'>+static int nand_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			 struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int i, len, ofs;</div><div class='del'>-</div><div class='del'>-	/* Zero copy fs supplied buffer */</div><div class='del'>-	if (fsbuf &amp;&amp; !autoplace)</div><div class='del'>-		return fsbuf;</div><div class='del'>-</div><div class='del'>-	/* Check, if the buffer must be filled with ff again */</div><div class='del'>-	if (this-&gt;oobdirty) {</div><div class='del'>-		memset (this-&gt;oob_buf, 0xff,</div><div class='del'>-			mtd-&gt;oobsize &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift));</div><div class='del'>-		this-&gt;oobdirty = 0;</div><div class='add'>+	int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+			 uint8_t *buf) = NULL;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int ret = -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='add'>+</div><div class='add'>+	/* Do not allow reads past end of device */</div><div class='add'>+	if ((from + ops-&gt;len) &gt; mtd-&gt;size) {</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "</div><div class='add'>+		      "Attempt read beyond end of device\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If we have no autoplacement or no fs buffer use the internal one */</div><div class='del'>-	if (!autoplace || !fsbuf)</div><div class='del'>-		return this-&gt;oob_buf;</div><div class='del'>-</div><div class='del'>-	/* Walk through the pages and place the data */</div><div class='del'>-	this-&gt;oobdirty = 1;</div><div class='del'>-	ofs = 0;</div><div class='del'>-	while (numpages--) {</div><div class='del'>-		for (i = 0, len = 0; len &lt; mtd-&gt;oobavail; i++) {</div><div class='del'>-			int to = ofs + oobsel-&gt;oobfree[i][0];</div><div class='del'>-			int num = oobsel-&gt;oobfree[i][1];</div><div class='del'>-			memcpy (&amp;this-&gt;oob_buf[to], fsbuf, num);</div><div class='del'>-			len += num;</div><div class='del'>-			fsbuf += num;</div><div class='del'>-		}</div><div class='del'>-		ofs += mtd-&gt;oobavail;</div><div class='add'>+	nand_get_device(chip, mtd, FL_READING);</div><div class='add'>+</div><div class='add'>+	switch(ops-&gt;mode) {</div><div class='add'>+	case MTD_OOB_PLACE:</div><div class='add'>+	case MTD_OOB_AUTO:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MTD_OOB_RAW:</div><div class='add'>+		/* Replace the read_page algorithm temporary */</div><div class='add'>+		read_page = chip-&gt;ecc.read_page;</div><div class='add'>+		chip-&gt;ecc.read_page = nand_read_page_raw;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	return this-&gt;oob_buf;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;datbuf)</div><div class='add'>+		ret = nand_do_read_oob(mtd, from, ops);</div><div class='add'>+	else</div><div class='add'>+		ret = nand_do_read_ops(mtd, from, ops);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ops-&gt;mode == MTD_OOB_RAW))</div><div class='add'>+		chip-&gt;ecc.read_page = read_page;</div><div class='add'>+ out:</div><div class='add'>+	nand_release_device(mtd);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define NOTALIGNED(x) (x &amp; (mtd-&gt;oobblock-1)) != 0</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_write - [MTD Interface] compability function for nand_write_ecc</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @to:		offset to write to</div><div class='del'>- * @len:	number of bytes to write</div><div class='del'>- * @retlen:	pointer to variable to store the number of written bytes</div><div class='del'>- * @buf:	the data to write</div><div class='del'>- *</div><div class='del'>- * This function simply calls nand_write_ecc with oob buffer and oobsel = NULL</div><div class='del'>- *</div><div class='del'>-*/</div><div class='del'>-static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf)</div><div class='add'>+ * nand_write_page_raw - [Intern] raw page write function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	data buffer</div><div class='add'>+ */</div><div class='add'>+static void nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				const uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	return (nand_write_ecc (mtd, to, len, retlen, buf, NULL, NULL));</div><div class='add'>+	chip-&gt;write_buf(mtd, buf, mtd-&gt;writesize);</div><div class='add'>+	chip-&gt;write_buf(mtd, chip-&gt;oob_poi, mtd-&gt;oobsize);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_write_ecc - [MTD Interface] NAND write with ECC</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @to:		offset to write to</div><div class='del'>- * @len:	number of bytes to write</div><div class='del'>- * @retlen:	pointer to variable to store the number of written bytes</div><div class='del'>- * @buf:	the data to write</div><div class='del'>- * @eccbuf:	filesystem supplied oob data buffer</div><div class='del'>- * @oobsel:	oob selection structure</div><div class='del'>- *</div><div class='del'>- * NAND write with ECC</div><div class='add'>+ * nand_write_page_swecc - {REPLACABLE] software ecc based page write function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	data buffer</div><div class='ctx'>  */</div><div class='del'>-static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-			   size_t * retlen, const u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel)</div><div class='add'>+static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				  const uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	int startpage, page, ret = -EIO, oob = 0, written = 0, chipnr;</div><div class='del'>-	int autoplace = 0, numpages, totalpages;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	u_char *oobbuf, *bufstart;</div><div class='del'>-	int	ppblock = (1 &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift));</div><div class='add'>+	int i, eccsize = chip-&gt;ecc.size;</div><div class='add'>+	int eccbytes = chip-&gt;ecc.bytes;</div><div class='add'>+	int eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	uint8_t *ecc_calc = chip-&gt;buffers.ecccalc;</div><div class='add'>+	const uint8_t *p = buf;</div><div class='add'>+	int *eccpos = chip-&gt;ecc.layout-&gt;eccpos;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3, "nand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);</div><div class='add'>+	/* Software ecc calculation */</div><div class='add'>+	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)</div><div class='add'>+		chip-&gt;ecc.calculate(mtd, p, &amp;ecc_calc[i]);</div><div class='ctx'> </div><div class='del'>-	/* Initialize retlen, in case of early exit */</div><div class='del'>-	*retlen = 0;</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;ecc.total; i++)</div><div class='add'>+		chip-&gt;oob_poi[eccpos[i]] = ecc_calc[i];</div><div class='ctx'> </div><div class='del'>-	/* Do not allow write past end of device */</div><div class='del'>-	if ((to + len) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: Attempt to write past end of page\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	nand_write_page_raw(mtd, chip, buf);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* reject writes, which are not page aligned */</div><div class='del'>-	if (NOTALIGNED (to) || NOTALIGNED(len)) {</div><div class='del'>-		printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+/**</div><div class='add'>+ * nand_write_page_hwecc - {REPLACABLE] hardware ecc based page write function</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	data buffer</div><div class='add'>+ */</div><div class='add'>+static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+				  const uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	int i, eccsize = chip-&gt;ecc.size;</div><div class='add'>+	int eccbytes = chip-&gt;ecc.bytes;</div><div class='add'>+	int eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	uint8_t *ecc_calc = chip-&gt;buffers.ecccalc;</div><div class='add'>+	const uint8_t *p = buf;</div><div class='add'>+	int *eccpos = chip-&gt;ecc.layout-&gt;eccpos;</div><div class='add'>+</div><div class='add'>+	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {</div><div class='add'>+		chip-&gt;ecc.hwctl(mtd, NAND_ECC_WRITE);</div><div class='add'>+		chip-&gt;write_buf(mtd, p, eccsize);</div><div class='add'>+		chip-&gt;ecc.calculate(mtd, p, &amp;ecc_calc[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd, FL_WRITING);</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;ecc.total; i++)</div><div class='add'>+		chip-&gt;oob_poi[eccpos[i]] = ecc_calc[i];</div><div class='ctx'> </div><div class='del'>-	/* Calculate chipnr */</div><div class='del'>-	chipnr = (int)(to &gt;&gt; this-&gt;chip_shift);</div><div class='del'>-	/* Select the NAND device */</div><div class='del'>-	this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+	chip-&gt;write_buf(mtd, chip-&gt;oob_poi, mtd-&gt;oobsize);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Check, if it is write protected */</div><div class='del'>-	if (nand_check_wp(mtd))</div><div class='del'>-		goto out;</div><div class='add'>+/**</div><div class='add'>+ * nand_write_page_syndrome - {REPLACABLE] hardware ecc syndrom based page write</div><div class='add'>+ * @mtd:	mtd info structure</div><div class='add'>+ * @chip:	nand chip info structure</div><div class='add'>+ * @buf:	data buffer</div><div class='add'>+ *</div><div class='add'>+ * The hw generator calculates the error syndrome automatically. Therefor</div><div class='add'>+ * we need a special oob layout and handling.</div><div class='add'>+ */</div><div class='add'>+static void nand_write_page_syndrome(struct mtd_info *mtd,</div><div class='add'>+				    struct nand_chip *chip, const uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	int i, eccsize = chip-&gt;ecc.size;</div><div class='add'>+	int eccbytes = chip-&gt;ecc.bytes;</div><div class='add'>+	int eccsteps = chip-&gt;ecc.steps;</div><div class='add'>+	const uint8_t *p = buf;</div><div class='add'>+	uint8_t *oob = chip-&gt;oob_poi;</div><div class='ctx'> </div><div class='del'>-	/* if oobsel is NULL, use chip defaults */</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='add'>+	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {</div><div class='ctx'> </div><div class='del'>-	/* Autoplace of oob data ? Use the default placement scheme */</div><div class='del'>-	if (oobsel-&gt;useecc == MTD_NANDECC_AUTOPLACE) {</div><div class='del'>-		oobsel = this-&gt;autooob;</div><div class='del'>-		autoplace = 1;</div><div class='del'>-	}</div><div class='del'>-	if (oobsel-&gt;useecc == MTD_NANDECC_AUTOPL_USR)</div><div class='del'>-		autoplace = 1;</div><div class='add'>+		chip-&gt;ecc.hwctl(mtd, NAND_ECC_WRITE);</div><div class='add'>+		chip-&gt;write_buf(mtd, p, eccsize);</div><div class='ctx'> </div><div class='del'>-	/* Setup variables and oob buffer */</div><div class='del'>-	totalpages = len &gt;&gt; this-&gt;page_shift;</div><div class='del'>-	page = (int) (to &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	/* Invalidate the page cache, if we write to the cached page */</div><div class='del'>-	if (page &lt;= this-&gt;pagebuf &amp;&amp; this-&gt;pagebuf &lt; (page + totalpages))</div><div class='del'>-		this-&gt;pagebuf = -1;</div><div class='del'>-</div><div class='del'>-	/* Set it relative to chip */</div><div class='del'>-	page &amp;= this-&gt;pagemask;</div><div class='del'>-	startpage = page;</div><div class='del'>-	/* Calc number of pages we can write in one go */</div><div class='del'>-	numpages = min (ppblock - (startpage  &amp; (ppblock - 1)), totalpages);</div><div class='del'>-	oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel, autoplace, numpages);</div><div class='del'>-	bufstart = (u_char *)buf;</div><div class='del'>-</div><div class='del'>-	/* Loop until all data is written */</div><div class='del'>-	while (written &lt; len) {</div><div class='del'>-</div><div class='del'>-		this-&gt;data_poi = (u_char*) &amp;buf[written];</div><div class='del'>-		/* Write one page. If this is the last page to write</div><div class='del'>-		 * or the last page in this block, then use the</div><div class='del'>-		 * real pageprogram command, else select cached programming</div><div class='del'>-		 * if supported by the chip.</div><div class='del'>-		 */</div><div class='del'>-		ret = nand_write_page (mtd, this, page, &amp;oobbuf[oob], oobsel, (--numpages &gt; 0));</div><div class='del'>-		if (ret) {</div><div class='del'>-			DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: write_page failed %d\n", ret);</div><div class='del'>-			goto out;</div><div class='add'>+		if (chip-&gt;ecc.prepad) {</div><div class='add'>+			chip-&gt;write_buf(mtd, oob, chip-&gt;ecc.prepad);</div><div class='add'>+			oob += chip-&gt;ecc.prepad;</div><div class='ctx'> 		}</div><div class='del'>-		/* Next oob page */</div><div class='del'>-		oob += mtd-&gt;oobsize;</div><div class='del'>-		/* Update written bytes count */</div><div class='del'>-		written += mtd-&gt;oobblock;</div><div class='del'>-		if (written == len)</div><div class='del'>-			goto cmp;</div><div class='ctx'> </div><div class='del'>-		/* Increment page address */</div><div class='del'>-		page++;</div><div class='del'>-</div><div class='del'>-		/* Have we hit a block boundary ? Then we have to verify and</div><div class='del'>-		 * if verify is ok, we have to setup the oob buffer for</div><div class='del'>-		 * the next pages.</div><div class='del'>-		*/</div><div class='del'>-		if (!(page &amp; (ppblock - 1))){</div><div class='del'>-			int ofs;</div><div class='del'>-			this-&gt;data_poi = bufstart;</div><div class='del'>-			ret = nand_verify_pages (mtd, this, startpage,</div><div class='del'>-				page - startpage,</div><div class='del'>-				oobbuf, oobsel, chipnr, (eccbuf != NULL));</div><div class='del'>-			if (ret) {</div><div class='del'>-				DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			*retlen = written;</div><div class='del'>-</div><div class='del'>-			ofs = autoplace ? mtd-&gt;oobavail : mtd-&gt;oobsize;</div><div class='del'>-			if (eccbuf)</div><div class='del'>-				eccbuf += (page - startpage) * ofs;</div><div class='del'>-			totalpages -= page - startpage;</div><div class='del'>-			numpages = min (totalpages, ppblock);</div><div class='del'>-			page &amp;= this-&gt;pagemask;</div><div class='del'>-			startpage = page;</div><div class='del'>-			oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel,</div><div class='del'>-					autoplace, numpages);</div><div class='del'>-			oob = 0;</div><div class='del'>-			/* Check, if we cross a chip boundary */</div><div class='del'>-			if (!page) {</div><div class='del'>-				chipnr++;</div><div class='del'>-				this-&gt;select_chip(mtd, -1);</div><div class='del'>-				this-&gt;select_chip(mtd, chipnr);</div><div class='del'>-			}</div><div class='add'>+		chip-&gt;ecc.calculate(mtd, p, oob);</div><div class='add'>+		chip-&gt;write_buf(mtd, oob, eccbytes);</div><div class='add'>+		oob += eccbytes;</div><div class='add'>+</div><div class='add'>+		if (chip-&gt;ecc.postpad) {</div><div class='add'>+			chip-&gt;write_buf(mtd, oob, chip-&gt;ecc.postpad);</div><div class='add'>+			oob += chip-&gt;ecc.postpad;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	/* Verify the remaining pages */</div><div class='del'>-cmp:</div><div class='del'>-	this-&gt;data_poi = bufstart;</div><div class='del'>- 	ret = nand_verify_pages (mtd, this, startpage, totalpages,</div><div class='del'>-		oobbuf, oobsel, chipnr, (eccbuf != NULL));</div><div class='del'>-	if (!ret)</div><div class='del'>-		*retlen = written;</div><div class='del'>-	else</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	/* Deselect and wake up anyone waiting on the device */</div><div class='del'>-	nand_release_device(mtd);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	/* Calculate remaining oob bytes */</div><div class='add'>+	i = mtd-&gt;oobsize - (oob - chip-&gt;oob_poi);</div><div class='add'>+	if (i)</div><div class='add'>+		chip-&gt;write_buf(mtd, oob, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * nand_write_oob - [MTD Interface] NAND write out-of-band</div><div class='add'>+ * nand_write_page - [INTERNAL] write one page</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @to:		offset to write to</div><div class='del'>- * @len:	number of bytes to write</div><div class='del'>- * @retlen:	pointer to variable to store the number of written bytes</div><div class='add'>+ * @chip:	NAND chip descriptor</div><div class='ctx'>  * @buf:	the data to write</div><div class='del'>- *</div><div class='del'>- * NAND write out-of-band</div><div class='add'>+ * @page:	page number to write</div><div class='add'>+ * @cached:	cached programming</div><div class='ctx'>  */</div><div class='del'>-static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf)</div><div class='add'>+static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+			   const uint8_t *buf, int page, int cached)</div><div class='ctx'> {</div><div class='del'>-	int column, page, status, ret = -EIO, chipnr;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);</div><div class='ctx'> </div><div class='del'>-	/* Shift to get page */</div><div class='del'>-	page = (int) (to &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	chipnr = (int) (to &gt;&gt; this-&gt;chip_shift);</div><div class='add'>+	chip-&gt;ecc.write_page(mtd, chip, buf);</div><div class='ctx'> </div><div class='del'>-	/* Mask to get column */</div><div class='del'>-	column = to &amp; (mtd-&gt;oobsize - 1);</div><div class='add'>+	/*</div><div class='add'>+	 * Cached progamming disabled for now, Not sure if its worth the</div><div class='add'>+	 * trouble. The speed gain is not very impressive. (2.3-&gt;2.6Mib/s)</div><div class='add'>+	 */</div><div class='add'>+	cached = 0;</div><div class='ctx'> </div><div class='del'>-	/* Initialize return length value */</div><div class='del'>-	*retlen = 0;</div><div class='add'>+	if (!cached || !(chip-&gt;options &amp; NAND_CACHEPRG)) {</div><div class='ctx'> </div><div class='del'>-	/* Do not allow write past end of page */</div><div class='del'>-	if ((column + len) &gt; mtd-&gt;oobsize) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: Attempt to write past end of page\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);</div><div class='add'>+		status = chip-&gt;waitfunc(mtd, chip);</div><div class='add'>+		/*</div><div class='add'>+		 * See if operation failed and additional status checks are</div><div class='add'>+		 * available</div><div class='add'>+		 */</div><div class='add'>+		if ((status &amp; NAND_STATUS_FAIL) &amp;&amp; (chip-&gt;errstat))</div><div class='add'>+			status = chip-&gt;errstat(mtd, chip, FL_WRITING, status,</div><div class='add'>+					       page);</div><div class='add'>+</div><div class='add'>+		if (status &amp; NAND_STATUS_FAIL)</div><div class='add'>+			return -EIO;</div><div class='add'>+	} else {</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_CACHEDPROG, -1, -1);</div><div class='add'>+		status = chip-&gt;waitfunc(mtd, chip);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd, FL_WRITING);</div><div class='add'>+#ifdef CONFIG_MTD_NAND_VERIFY_WRITE</div><div class='add'>+	/* Send command to read back the data */</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_READ0, 0, page);</div><div class='ctx'> </div><div class='del'>-	/* Select the NAND device */</div><div class='del'>-	this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+	if (chip-&gt;verify_buf(mtd, buf, mtd-&gt;writesize))</div><div class='add'>+		return -EIO;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_fill_oob - [Internal] Transfer client buffer to oob</div><div class='add'>+ * @chip:	nand chip structure</div><div class='add'>+ * @oob:	oob data buffer</div><div class='add'>+ * @ops:	oob ops structure</div><div class='add'>+ */</div><div class='add'>+static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,</div><div class='add'>+				  struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	size_t len = ops-&gt;ooblen;</div><div class='add'>+</div><div class='add'>+	switch(ops-&gt;mode) {</div><div class='add'>+</div><div class='add'>+	case MTD_OOB_PLACE:</div><div class='add'>+	case MTD_OOB_RAW:</div><div class='add'>+		memcpy(chip-&gt;oob_poi + ops-&gt;ooboffs, oob, len);</div><div class='add'>+		return oob + len;</div><div class='add'>+</div><div class='add'>+	case MTD_OOB_AUTO: {</div><div class='add'>+		struct nand_oobfree *free = chip-&gt;ecc.layout-&gt;oobfree;</div><div class='add'>+		uint32_t boffs = 0, woffs = ops-&gt;ooboffs;</div><div class='add'>+		size_t bytes = 0;</div><div class='add'>+</div><div class='add'>+		for(; free-&gt;length &amp;&amp; len; free++, len -= bytes) {</div><div class='add'>+			/* Write request not from offset 0 ? */</div><div class='add'>+			if (unlikely(woffs)) {</div><div class='add'>+				if (woffs &gt;= free-&gt;length) {</div><div class='add'>+					woffs -= free-&gt;length;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				boffs = free-&gt;offset + woffs;</div><div class='add'>+				bytes = min_t(size_t, len,</div><div class='add'>+					      (free-&gt;length - woffs));</div><div class='add'>+				woffs = 0;</div><div class='add'>+			} else {</div><div class='add'>+				bytes = min_t(size_t, len, free-&gt;length);</div><div class='add'>+				boffs = free-&gt;offset;</div><div class='add'>+			}</div><div class='add'>+			memcpy(chip-&gt;oob_poi + woffs, oob, bytes);</div><div class='add'>+			oob += bytes;</div><div class='add'>+		}</div><div class='add'>+		return oob;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define NOTALIGNED(x) (x &amp; (mtd-&gt;writesize-1)) != 0</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_do_write_ops - [Internal] NAND write with ECC</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @to:		offset to write to</div><div class='add'>+ * @ops:	oob operations description structure</div><div class='add'>+ *</div><div class='add'>+ * NAND write with ECC</div><div class='add'>+ */</div><div class='add'>+static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,</div><div class='add'>+			     struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	int chipnr, realpage, page, blockmask;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	uint32_t writelen = ops-&gt;len;</div><div class='add'>+	uint8_t *oob = ops-&gt;oobbuf;</div><div class='add'>+	uint8_t *buf = ops-&gt;datbuf;</div><div class='add'>+	int bytes = mtd-&gt;writesize;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Reset the chip. Some chips (like the Toshiba TC5832DC found</div><div class='del'>-	   in one of my DiskOnChip 2000 test units) will clear the whole</div><div class='del'>-	   data page too if we don't do this. I have no clue why, but</div><div class='del'>-	   I seem to have 'fixed' it in the doc2000 driver in</div><div class='del'>-	   August 1999.  dwmw2. */</div><div class='del'>-	this-&gt;cmdfunc(mtd, NAND_CMD_RESET, -1, -1);</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='add'>+</div><div class='add'>+	/* reject writes, which are not page aligned */</div><div class='add'>+	if (NOTALIGNED(to) || NOTALIGNED(ops-&gt;len)) {</div><div class='add'>+		printk(KERN_NOTICE "nand_write: "</div><div class='add'>+		       "Attempt to write not page aligned data\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!writelen)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	chipnr = (int)(to &gt;&gt; chip-&gt;chip_shift);</div><div class='add'>+	chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> </div><div class='ctx'> 	/* Check, if it is write protected */</div><div class='ctx'> 	if (nand_check_wp(mtd))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='del'>-	/* Invalidate the page cache, if we write to the cached page */</div><div class='del'>-	if (page == this-&gt;pagebuf)</div><div class='del'>-		this-&gt;pagebuf = -1;</div><div class='del'>-</div><div class='del'>-	if (NAND_MUST_PAD(this)) {</div><div class='del'>-		/* Write out desired data */</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_SEQIN, mtd-&gt;oobblock, page &amp; this-&gt;pagemask);</div><div class='del'>-		/* prepad 0xff for partial programming */</div><div class='del'>-		this-&gt;write_buf(mtd, ffchars, column);</div><div class='del'>-		/* write data */</div><div class='del'>-		this-&gt;write_buf(mtd, buf, len);</div><div class='del'>-		/* postpad 0xff for partial programming */</div><div class='del'>-		this-&gt;write_buf(mtd, ffchars, mtd-&gt;oobsize - (len+column));</div><div class='del'>-	} else {</div><div class='del'>-		/* Write out desired data */</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_SEQIN, mtd-&gt;oobblock + column, page &amp; this-&gt;pagemask);</div><div class='del'>-		/* write data */</div><div class='del'>-		this-&gt;write_buf(mtd, buf, len);</div><div class='del'>-	}</div><div class='del'>-	/* Send command to program the OOB data */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_PAGEPROG, -1, -1);</div><div class='add'>+	realpage = (int)(to &gt;&gt; chip-&gt;page_shift);</div><div class='add'>+	page = realpage &amp; chip-&gt;pagemask;</div><div class='add'>+	blockmask = (1 &lt;&lt; (chip-&gt;phys_erase_shift - chip-&gt;page_shift)) - 1;</div><div class='ctx'> </div><div class='del'>-	status = this-&gt;waitfunc (mtd, this, FL_WRITING);</div><div class='add'>+	/* Invalidate the page cache, when we write to the cached page */</div><div class='add'>+	if (to &lt;= (chip-&gt;pagebuf &lt;&lt; chip-&gt;page_shift) &amp;&amp;</div><div class='add'>+	    (chip-&gt;pagebuf &lt;&lt; chip-&gt;page_shift) &lt; (to + ops-&gt;len))</div><div class='add'>+		chip-&gt;pagebuf = -1;</div><div class='ctx'> </div><div class='del'>-	/* See if device thinks it succeeded */</div><div class='del'>-	if (status &amp; NAND_STATUS_FAIL) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write, page 0x%08x\n", page);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	/* Return happy */</div><div class='del'>-	*retlen = len;</div><div class='add'>+	chip-&gt;oob_poi = chip-&gt;buffers.oobwbuf;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE</div><div class='del'>-	/* Send command to read back the data */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_READOOB, column, page &amp; this-&gt;pagemask);</div><div class='add'>+	while(1) {</div><div class='add'>+		int cached = writelen &gt; bytes &amp;&amp; page != blockmask;</div><div class='ctx'> </div><div class='del'>-	if (this-&gt;verify_buf(mtd, buf, len)) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write verify, page 0x%08x\n", page);</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+		if (unlikely(oob))</div><div class='add'>+			oob = nand_fill_oob(chip, oob, ops);</div><div class='add'>+</div><div class='add'>+		ret = nand_write_page(mtd, chip, buf, page, cached);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		writelen -= bytes;</div><div class='add'>+		if (!writelen)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		buf += bytes;</div><div class='add'>+		realpage++;</div><div class='add'>+</div><div class='add'>+		page = realpage &amp; chip-&gt;pagemask;</div><div class='add'>+		/* Check, if we cross a chip boundary */</div><div class='add'>+		if (!page) {</div><div class='add'>+			chipnr++;</div><div class='add'>+			chip-&gt;select_chip(mtd, -1);</div><div class='add'>+			chip-&gt;select_chip(mtd, chipnr);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	/* Deselect and wake up anyone waiting on the device */</div><div class='del'>-	nand_release_device(mtd);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(oob))</div><div class='add'>+		memset(chip-&gt;oob_poi, 0xff, mtd-&gt;oobsize);</div><div class='add'>+</div><div class='add'>+	ops-&gt;retlen = ops-&gt;len - writelen;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * nand_writev - [MTD Interface] compabilty function for nand_writev_ecc</div><div class='add'>+ * nand_write - [MTD Interface] NAND write with ECC</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @vecs:	the iovectors to write</div><div class='del'>- * @count:	number of vectors</div><div class='ctx'>  * @to:		offset to write to</div><div class='add'>+ * @len:	number of bytes to write</div><div class='ctx'>  * @retlen:	pointer to variable to store the number of written bytes</div><div class='add'>+ * @buf:	the data to write</div><div class='ctx'>  *</div><div class='del'>- * NAND write with kvec. This just calls the ecc function</div><div class='add'>+ * NAND write with ECC</div><div class='ctx'>  */</div><div class='del'>-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count,</div><div class='del'>-		loff_t to, size_t * retlen)</div><div class='add'>+static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='add'>+			  size_t *retlen, const uint8_t *buf)</div><div class='ctx'> {</div><div class='del'>-	return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, NULL));</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Do not allow reads past end of device */</div><div class='add'>+	if ((to + len) &gt; mtd-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nand_get_device(chip, mtd, FL_WRITING);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ops.len = len;</div><div class='add'>+	chip-&gt;ops.datbuf = (uint8_t *)buf;</div><div class='add'>+	chip-&gt;ops.oobbuf = NULL;</div><div class='add'>+</div><div class='add'>+	ret = nand_do_write_ops(mtd, to, &amp;chip-&gt;ops);</div><div class='add'>+</div><div class='add'>+	nand_release_device(mtd);</div><div class='add'>+</div><div class='add'>+	*retlen = chip-&gt;ops.retlen;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_writev_ecc - [MTD Interface] write with iovec with ecc</div><div class='add'>+ * nand_do_write_oob - [MTD Interface] NAND write out-of-band</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @vecs:	the iovectors to write</div><div class='del'>- * @count:	number of vectors</div><div class='ctx'>  * @to:		offset to write to</div><div class='del'>- * @retlen:	pointer to variable to store the number of written bytes</div><div class='del'>- * @eccbuf:	filesystem supplied oob data buffer</div><div class='del'>- * @oobsel:	oob selection structure</div><div class='add'>+ * @ops:	oob operation description structure</div><div class='ctx'>  *</div><div class='del'>- * NAND write with iovec with ecc</div><div class='add'>+ * NAND write out-of-band</div><div class='ctx'>  */</div><div class='del'>-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count,</div><div class='del'>-		loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel)</div><div class='add'>+static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='add'>+			     struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	int i, page, len, total_len, ret = -EIO, written = 0, chipnr;</div><div class='del'>-	int oob, numpages, autoplace = 0, startpage;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int	ppblock = (1 &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift));</div><div class='del'>-	u_char *oobbuf, *bufstart;</div><div class='del'>-</div><div class='del'>-	/* Preset written len for early exit */</div><div class='del'>-	*retlen = 0;</div><div class='del'>-</div><div class='del'>-	/* Calculate total length of data */</div><div class='del'>-	total_len = 0;</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		total_len += (int) vecs[i].iov_len;</div><div class='add'>+	int chipnr, page, status;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3,</div><div class='del'>-	       "nand_writev: to = 0x%08x, len = %i, count = %ld\n", (unsigned int) to, (unsigned int) total_len, count);</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n",</div><div class='add'>+	      (unsigned int)to, (int)ops-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Do not allow write past end of page */</div><div class='del'>-	if ((to + total_len) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_writev: Attempted write past end of device\n");</div><div class='add'>+	if ((ops-&gt;ooboffs + ops-&gt;len) &gt; mtd-&gt;oobsize) {</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_write_oob: "</div><div class='add'>+		      "Attempt to write past end of page\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* reject writes, which are not page aligned */</div><div class='del'>-	if (NOTALIGNED (to) || NOTALIGNED(total_len)) {</div><div class='del'>-		printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	chipnr = (int)(to &gt;&gt; chip-&gt;chip_shift);</div><div class='add'>+	chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> </div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd, FL_WRITING);</div><div class='add'>+	/* Shift to get page */</div><div class='add'>+	page = (int)(to &gt;&gt; chip-&gt;page_shift);</div><div class='ctx'> </div><div class='del'>-	/* Get the current chip-nr */</div><div class='del'>-	chipnr = (int) (to &gt;&gt; this-&gt;chip_shift);</div><div class='del'>-	/* Select the NAND device */</div><div class='del'>-	this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+	/*</div><div class='add'>+	 * Reset the chip. Some chips (like the Toshiba TC5832DC found in one</div><div class='add'>+	 * of my DiskOnChip 2000 test units) will clear the whole data page too</div><div class='add'>+	 * if we don't do this. I have no clue why, but I seem to have 'fixed'</div><div class='add'>+	 * it in the doc2000 driver in August 1999.  dwmw2.</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_RESET, -1, -1);</div><div class='ctx'> </div><div class='ctx'> 	/* Check, if it is write protected */</div><div class='ctx'> 	if (nand_check_wp(mtd))</div><div class='del'>-		goto out;</div><div class='add'>+		return -EROFS;</div><div class='ctx'> </div><div class='del'>-	/* if oobsel is NULL, use chip defaults */</div><div class='del'>-	if (oobsel == NULL)</div><div class='del'>-		oobsel = &amp;mtd-&gt;oobinfo;</div><div class='add'>+	/* Invalidate the page cache, if we write to the cached page */</div><div class='add'>+	if (page == chip-&gt;pagebuf)</div><div class='add'>+		chip-&gt;pagebuf = -1;</div><div class='ctx'> </div><div class='del'>-	/* Autoplace of oob data ? Use the default placement scheme */</div><div class='del'>-	if (oobsel-&gt;useecc == MTD_NANDECC_AUTOPLACE) {</div><div class='del'>-		oobsel = this-&gt;autooob;</div><div class='del'>-		autoplace = 1;</div><div class='del'>-	}</div><div class='del'>-	if (oobsel-&gt;useecc == MTD_NANDECC_AUTOPL_USR)</div><div class='del'>-		autoplace = 1;</div><div class='add'>+	chip-&gt;oob_poi = chip-&gt;buffers.oobwbuf;</div><div class='add'>+	memset(chip-&gt;oob_poi, 0xff, mtd-&gt;oobsize);</div><div class='add'>+	nand_fill_oob(chip, ops-&gt;oobbuf, ops);</div><div class='add'>+	status = chip-&gt;ecc.write_oob(mtd, chip, page &amp; chip-&gt;pagemask);</div><div class='add'>+	memset(chip-&gt;oob_poi, 0xff, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='del'>-	/* Setup start page */</div><div class='del'>-	page = (int) (to &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	/* Invalidate the page cache, if we write to the cached page */</div><div class='del'>-	if (page &lt;= this-&gt;pagebuf &amp;&amp; this-&gt;pagebuf &lt; ((to + total_len) &gt;&gt; this-&gt;page_shift))</div><div class='del'>-		this-&gt;pagebuf = -1;</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='ctx'> </div><div class='del'>-	startpage = page &amp; this-&gt;pagemask;</div><div class='add'>+	ops-&gt;retlen = ops-&gt;len;</div><div class='ctx'> </div><div class='del'>-	/* Loop until all kvec' data has been written */</div><div class='del'>-	len = 0;</div><div class='del'>-	while (count) {</div><div class='del'>-		/* If the given tuple is &gt;= pagesize then</div><div class='del'>-		 * write it out from the iov</div><div class='del'>-		 */</div><div class='del'>-		if ((vecs-&gt;iov_len - len) &gt;= mtd-&gt;oobblock) {</div><div class='del'>-			/* Calc number of pages we can write</div><div class='del'>-			 * out of this iov in one go */</div><div class='del'>-			numpages = (vecs-&gt;iov_len - len) &gt;&gt; this-&gt;page_shift;</div><div class='del'>-			/* Do not cross block boundaries */</div><div class='del'>-			numpages = min (ppblock - (startpage &amp; (ppblock - 1)), numpages);</div><div class='del'>-			oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);</div><div class='del'>-			bufstart = (u_char *)vecs-&gt;iov_base;</div><div class='del'>-			bufstart += len;</div><div class='del'>-			this-&gt;data_poi = bufstart;</div><div class='del'>-			oob = 0;</div><div class='del'>-			for (i = 1; i &lt;= numpages; i++) {</div><div class='del'>-				/* Write one page. If this is the last page to write</div><div class='del'>-				 * then use the real pageprogram command, else select</div><div class='del'>-				 * cached programming if supported by the chip.</div><div class='del'>-				 */</div><div class='del'>-				ret = nand_write_page (mtd, this, page &amp; this-&gt;pagemask,</div><div class='del'>-					&amp;oobbuf[oob], oobsel, i != numpages);</div><div class='del'>-				if (ret)</div><div class='del'>-					goto out;</div><div class='del'>-				this-&gt;data_poi += mtd-&gt;oobblock;</div><div class='del'>-				len += mtd-&gt;oobblock;</div><div class='del'>-				oob += mtd-&gt;oobsize;</div><div class='del'>-				page++;</div><div class='del'>-			}</div><div class='del'>-			/* Check, if we have to switch to the next tuple */</div><div class='del'>-			if (len &gt;= (int) vecs-&gt;iov_len) {</div><div class='del'>-				vecs++;</div><div class='del'>-				len = 0;</div><div class='del'>-				count--;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* We must use the internal buffer, read data out of each</div><div class='del'>-			 * tuple until we have a full page to write</div><div class='del'>-			 */</div><div class='del'>-			int cnt = 0;</div><div class='del'>-			while (cnt &lt; mtd-&gt;oobblock) {</div><div class='del'>-				if (vecs-&gt;iov_base != NULL &amp;&amp; vecs-&gt;iov_len)</div><div class='del'>-					this-&gt;data_buf[cnt++] = ((u_char *) vecs-&gt;iov_base)[len++];</div><div class='del'>-				/* Check, if we have to switch to the next tuple */</div><div class='del'>-				if (len &gt;= (int) vecs-&gt;iov_len) {</div><div class='del'>-					vecs++;</div><div class='del'>-					len = 0;</div><div class='del'>-					count--;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			this-&gt;pagebuf = page;</div><div class='del'>-			this-&gt;data_poi = this-&gt;data_buf;</div><div class='del'>-			bufstart = this-&gt;data_poi;</div><div class='del'>-			numpages = 1;</div><div class='del'>-			oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);</div><div class='del'>-			ret = nand_write_page (mtd, this, page &amp; this-&gt;pagemask,</div><div class='del'>-				oobbuf, oobsel, 0);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto out;</div><div class='del'>-			page++;</div><div class='del'>-		}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		this-&gt;data_poi = bufstart;</div><div class='del'>-		ret = nand_verify_pages (mtd, this, startpage, numpages, oobbuf, oobsel, chipnr, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='add'>+/**</div><div class='add'>+ * nand_write_oob - [MTD Interface] NAND write data and/or out-of-band</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @to:		offset to write to</div><div class='add'>+ * @ops:	oob operation description structure</div><div class='add'>+ */</div><div class='add'>+static int nand_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='add'>+			  struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,</div><div class='add'>+			  const uint8_t *buf) = NULL;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int ret = -ENOTSUPP;</div><div class='ctx'> </div><div class='del'>-		written += mtd-&gt;oobblock * numpages;</div><div class='del'>-		/* All done ? */</div><div class='del'>-		if (!count)</div><div class='del'>-			break;</div><div class='add'>+	ops-&gt;retlen = 0;</div><div class='ctx'> </div><div class='del'>-		startpage = page &amp; this-&gt;pagemask;</div><div class='del'>-		/* Check, if we cross a chip boundary */</div><div class='del'>-		if (!startpage) {</div><div class='del'>-			chipnr++;</div><div class='del'>-			this-&gt;select_chip(mtd, -1);</div><div class='del'>-			this-&gt;select_chip(mtd, chipnr);</div><div class='del'>-		}</div><div class='add'>+	/* Do not allow writes past end of device */</div><div class='add'>+	if ((to + ops-&gt;len) &gt; mtd-&gt;size) {</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "</div><div class='add'>+		      "Attempt read beyond end of device\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	/* Deselect and wake up anyone waiting on the device */</div><div class='del'>-	nand_release_device(mtd);</div><div class='ctx'> </div><div class='del'>-	*retlen = written;</div><div class='add'>+	nand_get_device(chip, mtd, FL_WRITING);</div><div class='add'>+</div><div class='add'>+	switch(ops-&gt;mode) {</div><div class='add'>+	case MTD_OOB_PLACE:</div><div class='add'>+	case MTD_OOB_AUTO:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MTD_OOB_RAW:</div><div class='add'>+		/* Replace the write_page algorithm temporary */</div><div class='add'>+		write_page = chip-&gt;ecc.write_page;</div><div class='add'>+		chip-&gt;ecc.write_page = nand_write_page_raw;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;datbuf)</div><div class='add'>+		ret = nand_do_write_oob(mtd, to, ops);</div><div class='add'>+	else</div><div class='add'>+		ret = nand_do_write_ops(mtd, to, ops);</div><div class='add'>+</div><div class='add'>+	if (unlikely(ops-&gt;mode == MTD_OOB_RAW))</div><div class='add'>+		chip-&gt;ecc.write_page = write_page;</div><div class='add'>+ out:</div><div class='add'>+	nand_release_device(mtd);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2050,12 +1816,12 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * Standard erase command for NAND chips</div><div class='ctx'>  */</div><div class='del'>-static void single_erase_cmd (struct mtd_info *mtd, int page)</div><div class='add'>+static void single_erase_cmd(struct mtd_info *mtd, int page)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	/* Send commands to erase a block */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE1, -1, page);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE2, -1, -1);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2066,15 +1832,15 @@ static void single_erase_cmd (struct mtd_info *mtd, int page)</div><div class='ctx'>  * AND multi block erase command function</div><div class='ctx'>  * Erase 4 consecutive blocks</div><div class='ctx'>  */</div><div class='del'>-static void multi_erase_cmd (struct mtd_info *mtd, int page)</div><div class='add'>+static void multi_erase_cmd(struct mtd_info *mtd, int page)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	/* Send commands to erase a block */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE1, -1, page);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_ERASE2, -1, -1);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE1, -1, page++);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE1, -1, page++);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE1, -1, page++);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2084,79 +1850,82 @@ static void multi_erase_cmd (struct mtd_info *mtd, int page)</div><div class='ctx'>  *</div><div class='ctx'>  * Erase one ore more blocks</div><div class='ctx'>  */</div><div class='del'>-static int nand_erase (struct mtd_info *mtd, struct erase_info *instr)</div><div class='add'>+static int nand_erase(struct mtd_info *mtd, struct erase_info *instr)</div><div class='ctx'> {</div><div class='del'>-	return nand_erase_nand (mtd, instr, 0);</div><div class='add'>+	return nand_erase_nand(mtd, instr, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BBT_PAGE_MASK	0xffffff3f</div><div class='ctx'> /**</div><div class='del'>- * nand_erase_intern - [NAND Interface] erase block(s)</div><div class='add'>+ * nand_erase_nand - [Internal] erase block(s)</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @instr:	erase instruction</div><div class='ctx'>  * @allowbbt:	allow erasing the bbt area</div><div class='ctx'>  *</div><div class='ctx'>  * Erase one ore more blocks</div><div class='ctx'>  */</div><div class='del'>-int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt)</div><div class='add'>+int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,</div><div class='add'>+		    int allowbbt)</div><div class='ctx'> {</div><div class='ctx'> 	int page, len, status, pages_per_block, ret, chipnr;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int rewrite_bbt[NAND_MAX_CHIPS]={0};	/* flags to indicate the page, if bbt needs to be rewritten. */</div><div class='del'>-	unsigned int bbt_masked_page;		/* bbt mask to compare to page being erased. */</div><div class='del'>-						/* It is used to see if the current page is in the same */</div><div class='del'>-						/*   256 block group and the same bank as the bbt. */</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	int rewrite_bbt[NAND_MAX_CHIPS]={0};</div><div class='add'>+	unsigned int bbt_masked_page = 0xffffffff;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3,</div><div class='del'>-	       "nand_erase: start = 0x%08x, len = %i\n", (unsigned int) instr-&gt;addr, (unsigned int) instr-&gt;len);</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL3, "nand_erase: start = 0x%08x, len = %i\n",</div><div class='add'>+	      (unsigned int)instr-&gt;addr, (unsigned int)instr-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Start address must align on block boundary */</div><div class='del'>-	if (instr-&gt;addr &amp; ((1 &lt;&lt; this-&gt;phys_erase_shift) - 1)) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Unaligned address\n");</div><div class='add'>+	if (instr-&gt;addr &amp; ((1 &lt;&lt; chip-&gt;phys_erase_shift) - 1)) {</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: Unaligned address\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Length must align on block boundary */</div><div class='del'>-	if (instr-&gt;len &amp; ((1 &lt;&lt; this-&gt;phys_erase_shift) - 1)) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Length not block aligned\n");</div><div class='add'>+	if (instr-&gt;len &amp; ((1 &lt;&lt; chip-&gt;phys_erase_shift) - 1)) {</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "</div><div class='add'>+		      "Length not block aligned\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do not allow erase past end of device */</div><div class='ctx'> 	if ((instr-&gt;len + instr-&gt;addr) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Erase past end of device\n");</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "</div><div class='add'>+		      "Erase past end of device\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	instr-&gt;fail_addr = 0xffffffff;</div><div class='ctx'> </div><div class='ctx'> 	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd, FL_ERASING);</div><div class='add'>+	nand_get_device(chip, mtd, FL_ERASING);</div><div class='ctx'> </div><div class='ctx'> 	/* Shift to get first page */</div><div class='del'>-	page = (int) (instr-&gt;addr &gt;&gt; this-&gt;page_shift);</div><div class='del'>-	chipnr = (int) (instr-&gt;addr &gt;&gt; this-&gt;chip_shift);</div><div class='add'>+	page = (int)(instr-&gt;addr &gt;&gt; chip-&gt;page_shift);</div><div class='add'>+	chipnr = (int)(instr-&gt;addr &gt;&gt; chip-&gt;chip_shift);</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate pages in each block */</div><div class='del'>-	pages_per_block = 1 &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift);</div><div class='add'>+	pages_per_block = 1 &lt;&lt; (chip-&gt;phys_erase_shift - chip-&gt;page_shift);</div><div class='ctx'> </div><div class='ctx'> 	/* Select the NAND device */</div><div class='del'>-	this-&gt;select_chip(mtd, chipnr);</div><div class='add'>+	chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> </div><div class='del'>-	/* Check the WP bit */</div><div class='ctx'> 	/* Check, if it is write protected */</div><div class='ctx'> 	if (nand_check_wp(mtd)) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Device is write protected!!!\n");</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "</div><div class='add'>+		      "Device is write protected!!!\n");</div><div class='ctx'> 		instr-&gt;state = MTD_ERASE_FAILED;</div><div class='ctx'> 		goto erase_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* if BBT requires refresh, set the BBT page mask to see if the BBT should be rewritten */</div><div class='del'>-	if (this-&gt;options &amp; BBT_AUTO_REFRESH) {</div><div class='del'>-		bbt_masked_page = this-&gt;bbt_td-&gt;pages[chipnr] &amp; BBT_PAGE_MASK;</div><div class='del'>-	} else {</div><div class='del'>-		bbt_masked_page = 0xffffffff;	/* should not match anything */</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * If BBT requires refresh, set the BBT page mask to see if the BBT</div><div class='add'>+	 * should be rewritten. Otherwise the mask is set to 0xffffffff which</div><div class='add'>+	 * can not be matched. This is also done when the bbt is actually</div><div class='add'>+	 * erased to avoid recusrsive updates</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;options &amp; BBT_AUTO_REFRESH &amp;&amp; !allowbbt)</div><div class='add'>+		bbt_masked_page = chip-&gt;bbt_td-&gt;pages[chipnr] &amp; BBT_PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Loop through the pages */</div><div class='ctx'> 	len = instr-&gt;len;</div><div class='hunk'>@@ -2164,64 +1933,77 @@ int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbb</div><div class='ctx'> 	instr-&gt;state = MTD_ERASING;</div><div class='ctx'> </div><div class='ctx'> 	while (len) {</div><div class='del'>-		/* Check if we have a bad block, we do not erase bad blocks ! */</div><div class='del'>-		if (nand_block_checkbad(mtd, ((loff_t) page) &lt;&lt; this-&gt;page_shift, 0, allowbbt)) {</div><div class='del'>-			printk (KERN_WARNING "nand_erase: attempt to erase a bad block at page 0x%08x\n", page);</div><div class='add'>+		/*</div><div class='add'>+		 * heck if we have a bad block, we do not erase bad blocks !</div><div class='add'>+		 */</div><div class='add'>+		if (nand_block_checkbad(mtd, ((loff_t) page) &lt;&lt;</div><div class='add'>+					chip-&gt;page_shift, 0, allowbbt)) {</div><div class='add'>+			printk(KERN_WARNING "nand_erase: attempt to erase a "</div><div class='add'>+			       "bad block at page 0x%08x\n", page);</div><div class='ctx'> 			instr-&gt;state = MTD_ERASE_FAILED;</div><div class='ctx'> 			goto erase_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Invalidate the page cache, if we erase the block which contains</div><div class='del'>-		   the current cached page */</div><div class='del'>-		if (page &lt;= this-&gt;pagebuf &amp;&amp; this-&gt;pagebuf &lt; (page + pages_per_block))</div><div class='del'>-			this-&gt;pagebuf = -1;</div><div class='add'>+		/*</div><div class='add'>+		 * Invalidate the page cache, if we erase the block which</div><div class='add'>+		 * contains the current cached page</div><div class='add'>+		 */</div><div class='add'>+		if (page &lt;= chip-&gt;pagebuf &amp;&amp; chip-&gt;pagebuf &lt;</div><div class='add'>+		    (page + pages_per_block))</div><div class='add'>+			chip-&gt;pagebuf = -1;</div><div class='ctx'> </div><div class='del'>-		this-&gt;erase_cmd (mtd, page &amp; this-&gt;pagemask);</div><div class='add'>+		chip-&gt;erase_cmd(mtd, page &amp; chip-&gt;pagemask);</div><div class='ctx'> </div><div class='del'>-		status = this-&gt;waitfunc (mtd, this, FL_ERASING);</div><div class='add'>+		status = chip-&gt;waitfunc(mtd, chip);</div><div class='ctx'> </div><div class='del'>-		/* See if operation failed and additional status checks are available */</div><div class='del'>-		if ((status &amp; NAND_STATUS_FAIL) &amp;&amp; (this-&gt;errstat)) {</div><div class='del'>-			status = this-&gt;errstat(mtd, this, FL_ERASING, status, page);</div><div class='del'>-		}</div><div class='add'>+		/*</div><div class='add'>+		 * See if operation failed and additional status checks are</div><div class='add'>+		 * available</div><div class='add'>+		 */</div><div class='add'>+		if ((status &amp; NAND_STATUS_FAIL) &amp;&amp; (chip-&gt;errstat))</div><div class='add'>+			status = chip-&gt;errstat(mtd, chip, FL_ERASING,</div><div class='add'>+					       status, page);</div><div class='ctx'> </div><div class='ctx'> 		/* See if block erase succeeded */</div><div class='ctx'> 		if (status &amp; NAND_STATUS_FAIL) {</div><div class='del'>-			DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: " "Failed erase, page 0x%08x\n", page);</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "</div><div class='add'>+			      "Failed erase, page 0x%08x\n", page);</div><div class='ctx'> 			instr-&gt;state = MTD_ERASE_FAILED;</div><div class='del'>-			instr-&gt;fail_addr = (page &lt;&lt; this-&gt;page_shift);</div><div class='add'>+			instr-&gt;fail_addr = (page &lt;&lt; chip-&gt;page_shift);</div><div class='ctx'> 			goto erase_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* if BBT requires refresh, set the BBT rewrite flag to the page being erased */</div><div class='del'>-		if (this-&gt;options &amp; BBT_AUTO_REFRESH) {</div><div class='del'>-			if (((page &amp; BBT_PAGE_MASK) == bbt_masked_page) &amp;&amp;</div><div class='del'>-			     (page != this-&gt;bbt_td-&gt;pages[chipnr])) {</div><div class='del'>-				rewrite_bbt[chipnr] = (page &lt;&lt; this-&gt;page_shift);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		/*</div><div class='add'>+		 * If BBT requires refresh, set the BBT rewrite flag to the</div><div class='add'>+		 * page being erased</div><div class='add'>+		 */</div><div class='add'>+		if (bbt_masked_page != 0xffffffff &amp;&amp;</div><div class='add'>+		    (page &amp; BBT_PAGE_MASK) == bbt_masked_page)</div><div class='add'>+			    rewrite_bbt[chipnr] = (page &lt;&lt; chip-&gt;page_shift);</div><div class='ctx'> </div><div class='ctx'> 		/* Increment page address and decrement length */</div><div class='del'>-		len -= (1 &lt;&lt; this-&gt;phys_erase_shift);</div><div class='add'>+		len -= (1 &lt;&lt; chip-&gt;phys_erase_shift);</div><div class='ctx'> 		page += pages_per_block;</div><div class='ctx'> </div><div class='ctx'> 		/* Check, if we cross a chip boundary */</div><div class='del'>-		if (len &amp;&amp; !(page &amp; this-&gt;pagemask)) {</div><div class='add'>+		if (len &amp;&amp; !(page &amp; chip-&gt;pagemask)) {</div><div class='ctx'> 			chipnr++;</div><div class='del'>-			this-&gt;select_chip(mtd, -1);</div><div class='del'>-			this-&gt;select_chip(mtd, chipnr);</div><div class='del'>-</div><div class='del'>-			/* if BBT requires refresh and BBT-PERCHIP,</div><div class='del'>-			 *   set the BBT page mask to see if this BBT should be rewritten */</div><div class='del'>-			if ((this-&gt;options &amp; BBT_AUTO_REFRESH) &amp;&amp; (this-&gt;bbt_td-&gt;options &amp; NAND_BBT_PERCHIP)) {</div><div class='del'>-				bbt_masked_page = this-&gt;bbt_td-&gt;pages[chipnr] &amp; BBT_PAGE_MASK;</div><div class='del'>-			}</div><div class='add'>+			chip-&gt;select_chip(mtd, -1);</div><div class='add'>+			chip-&gt;select_chip(mtd, chipnr);</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * If BBT requires refresh and BBT-PERCHIP, set the BBT</div><div class='add'>+			 * page mask to see if this BBT should be rewritten</div><div class='add'>+			 */</div><div class='add'>+			if (bbt_masked_page != 0xffffffff &amp;&amp;</div><div class='add'>+			    (chip-&gt;bbt_td-&gt;options &amp; NAND_BBT_PERCHIP))</div><div class='add'>+				bbt_masked_page = chip-&gt;bbt_td-&gt;pages[chipnr] &amp;</div><div class='add'>+					BBT_PAGE_MASK;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	instr-&gt;state = MTD_ERASE_DONE;</div><div class='ctx'> </div><div class='del'>-erase_exit:</div><div class='add'>+ erase_exit:</div><div class='ctx'> </div><div class='ctx'> 	ret = instr-&gt;state == MTD_ERASE_DONE ? 0 : -EIO;</div><div class='ctx'> 	/* Do call back function */</div><div class='hunk'>@@ -2231,16 +2013,21 @@ erase_exit:</div><div class='ctx'> 	/* Deselect and wake up anyone waiting on the device */</div><div class='ctx'> 	nand_release_device(mtd);</div><div class='ctx'> </div><div class='del'>-	/* if BBT requires refresh and erase was successful, rewrite any selected bad block tables */</div><div class='del'>-	if ((this-&gt;options &amp; BBT_AUTO_REFRESH) &amp;&amp; (!ret)) {</div><div class='del'>-		for (chipnr = 0; chipnr &lt; this-&gt;numchips; chipnr++) {</div><div class='del'>-			if (rewrite_bbt[chipnr]) {</div><div class='del'>-				/* update the BBT for chip */</div><div class='del'>-				DEBUG (MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt (%d:0x%0x 0x%0x)\n",</div><div class='del'>-					chipnr, rewrite_bbt[chipnr], this-&gt;bbt_td-&gt;pages[chipnr]);</div><div class='del'>-				nand_update_bbt (mtd, rewrite_bbt[chipnr]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * If BBT requires refresh and erase was successful, rewrite any</div><div class='add'>+	 * selected bad block tables</div><div class='add'>+	 */</div><div class='add'>+	if (bbt_masked_page == 0xffffffff || ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (chipnr = 0; chipnr &lt; chip-&gt;numchips; chipnr++) {</div><div class='add'>+		if (!rewrite_bbt[chipnr])</div><div class='add'>+			continue;</div><div class='add'>+		/* update the BBT for chip */</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt "</div><div class='add'>+		      "(%d:0x%0x 0x%0x)\n", chipnr, rewrite_bbt[chipnr],</div><div class='add'>+		      chip-&gt;bbt_td-&gt;pages[chipnr]);</div><div class='add'>+		nand_update_bbt(mtd, rewrite_bbt[chipnr]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Return more or less happy */</div><div class='hunk'>@@ -2253,51 +2040,50 @@ erase_exit:</div><div class='ctx'>  *</div><div class='ctx'>  * Sync is actually a wait for chip ready function</div><div class='ctx'>  */</div><div class='del'>-static void nand_sync (struct mtd_info *mtd)</div><div class='add'>+static void nand_sync(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL3, "nand_sync: called\n");</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL3, "nand_sync: called\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Grab the lock and see if the device is available */</div><div class='del'>-	nand_get_device (this, mtd, FL_SYNCING);</div><div class='add'>+	nand_get_device(chip, mtd, FL_SYNCING);</div><div class='ctx'> 	/* Release it and go back */</div><div class='del'>-	nand_release_device (mtd);</div><div class='add'>+	nand_release_device(mtd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * nand_block_isbad - [MTD Interface] Check whether the block at the given offset is bad</div><div class='add'>+ * nand_block_isbad - [MTD Interface] Check if block at offset is bad</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='del'>- * @ofs:	offset relative to mtd start</div><div class='add'>+ * @offs:	offset relative to mtd start</div><div class='ctx'>  */</div><div class='del'>-static int nand_block_isbad (struct mtd_info *mtd, loff_t ofs)</div><div class='add'>+static int nand_block_isbad(struct mtd_info *mtd, loff_t offs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Check for invalid offset */</div><div class='del'>-	if (ofs &gt; mtd-&gt;size)</div><div class='add'>+	if (offs &gt; mtd-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return nand_block_checkbad (mtd, ofs, 1, 0);</div><div class='add'>+	return nand_block_checkbad(mtd, offs, 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nand_block_markbad - [MTD Interface] Mark the block at the given offset as bad</div><div class='add'>+ * nand_block_markbad - [MTD Interface] Mark block at the given offset as bad</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @ofs:	offset relative to mtd start</div><div class='ctx'>  */</div><div class='del'>-static int nand_block_markbad (struct mtd_info *mtd, loff_t ofs)</div><div class='add'>+static int nand_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-        if ((ret = nand_block_isbad(mtd, ofs))) {</div><div class='del'>-        	/* If it was bad already, return success and do nothing. */</div><div class='add'>+	if ((ret = nand_block_isbad(mtd, ofs))) {</div><div class='add'>+		/* If it was bad already, return success and do nothing. */</div><div class='ctx'> 		if (ret &gt; 0)</div><div class='ctx'> 			return 0;</div><div class='del'>-        	return ret;</div><div class='del'>-        }</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return this-&gt;block_markbad(mtd, ofs);</div><div class='add'>+	return chip-&gt;block_markbad(mtd, ofs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2306,9 +2092,9 @@ static int nand_block_markbad (struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'>  */</div><div class='ctx'> static int nand_suspend(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	return nand_get_device (this, mtd, FL_PM_SUSPENDED);</div><div class='add'>+	return nand_get_device(chip, mtd, FL_PM_SUSPENDED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2317,373 +2103,385 @@ static int nand_suspend(struct mtd_info *mtd)</div><div class='ctx'>  */</div><div class='ctx'> static void nand_resume(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (this-&gt;state == FL_PM_SUSPENDED)</div><div class='add'>+	if (chip-&gt;state == FL_PM_SUSPENDED)</div><div class='ctx'> 		nand_release_device(mtd);</div><div class='ctx'> 	else</div><div class='del'>-		printk(KERN_ERR "resume() called for the chip which is not "</div><div class='del'>-				"in suspended state\n");</div><div class='del'>-</div><div class='add'>+		printk(KERN_ERR "nand_resume() called for a chip which is not "</div><div class='add'>+		       "in suspended state\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nand_scan - [NAND Interface] Scan for the NAND device</div><div class='del'>- * @mtd:	MTD device structure</div><div class='del'>- * @maxchips:	Number of chips to scan for</div><div class='del'>- *</div><div class='del'>- * This fills out all the not initialized function pointers</div><div class='del'>- * with the defaults.</div><div class='del'>- * The flash ID is read and the mtd/chip structures are</div><div class='del'>- * filled with the appropriate values. Buffers are allocated if</div><div class='del'>- * they are not provided by the board driver</div><div class='del'>- *</div><div class='add'>+/*</div><div class='add'>+ * Set default functions</div><div class='ctx'>  */</div><div class='del'>-int nand_scan (struct mtd_info *mtd, int maxchips)</div><div class='add'>+static void nand_set_defaults(struct nand_chip *chip, int busw)</div><div class='ctx'> {</div><div class='del'>-	int i, nand_maf_id, nand_dev_id, busw, maf_id;</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Get buswidth to select the correct functions*/</div><div class='del'>-	busw = this-&gt;options &amp; NAND_BUSWIDTH_16;</div><div class='del'>-</div><div class='ctx'> 	/* check for proper chip_delay setup, set 20us if not */</div><div class='del'>-	if (!this-&gt;chip_delay)</div><div class='del'>-		this-&gt;chip_delay = 20;</div><div class='add'>+	if (!chip-&gt;chip_delay)</div><div class='add'>+		chip-&gt;chip_delay = 20;</div><div class='ctx'> </div><div class='ctx'> 	/* check, if a user supplied command function given */</div><div class='del'>-	if (this-&gt;cmdfunc == NULL)</div><div class='del'>-		this-&gt;cmdfunc = nand_command;</div><div class='add'>+	if (chip-&gt;cmdfunc == NULL)</div><div class='add'>+		chip-&gt;cmdfunc = nand_command;</div><div class='ctx'> </div><div class='ctx'> 	/* check, if a user supplied wait function given */</div><div class='del'>-	if (this-&gt;waitfunc == NULL)</div><div class='del'>-		this-&gt;waitfunc = nand_wait;</div><div class='del'>-</div><div class='del'>-	if (!this-&gt;select_chip)</div><div class='del'>-		this-&gt;select_chip = nand_select_chip;</div><div class='del'>-	if (!this-&gt;write_byte)</div><div class='del'>-		this-&gt;write_byte = busw ? nand_write_byte16 : nand_write_byte;</div><div class='del'>-	if (!this-&gt;read_byte)</div><div class='del'>-		this-&gt;read_byte = busw ? nand_read_byte16 : nand_read_byte;</div><div class='del'>-	if (!this-&gt;write_word)</div><div class='del'>-		this-&gt;write_word = nand_write_word;</div><div class='del'>-	if (!this-&gt;read_word)</div><div class='del'>-		this-&gt;read_word = nand_read_word;</div><div class='del'>-	if (!this-&gt;block_bad)</div><div class='del'>-		this-&gt;block_bad = nand_block_bad;</div><div class='del'>-	if (!this-&gt;block_markbad)</div><div class='del'>-		this-&gt;block_markbad = nand_default_block_markbad;</div><div class='del'>-	if (!this-&gt;write_buf)</div><div class='del'>-		this-&gt;write_buf = busw ? nand_write_buf16 : nand_write_buf;</div><div class='del'>-	if (!this-&gt;read_buf)</div><div class='del'>-		this-&gt;read_buf = busw ? nand_read_buf16 : nand_read_buf;</div><div class='del'>-	if (!this-&gt;verify_buf)</div><div class='del'>-		this-&gt;verify_buf = busw ? nand_verify_buf16 : nand_verify_buf;</div><div class='del'>-	if (!this-&gt;scan_bbt)</div><div class='del'>-		this-&gt;scan_bbt = nand_default_bbt;</div><div class='add'>+	if (chip-&gt;waitfunc == NULL)</div><div class='add'>+		chip-&gt;waitfunc = nand_wait;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;select_chip)</div><div class='add'>+		chip-&gt;select_chip = nand_select_chip;</div><div class='add'>+	if (!chip-&gt;read_byte)</div><div class='add'>+		chip-&gt;read_byte = busw ? nand_read_byte16 : nand_read_byte;</div><div class='add'>+	if (!chip-&gt;read_word)</div><div class='add'>+		chip-&gt;read_word = nand_read_word;</div><div class='add'>+	if (!chip-&gt;block_bad)</div><div class='add'>+		chip-&gt;block_bad = nand_block_bad;</div><div class='add'>+	if (!chip-&gt;block_markbad)</div><div class='add'>+		chip-&gt;block_markbad = nand_default_block_markbad;</div><div class='add'>+	if (!chip-&gt;write_buf)</div><div class='add'>+		chip-&gt;write_buf = busw ? nand_write_buf16 : nand_write_buf;</div><div class='add'>+	if (!chip-&gt;read_buf)</div><div class='add'>+		chip-&gt;read_buf = busw ? nand_read_buf16 : nand_read_buf;</div><div class='add'>+	if (!chip-&gt;verify_buf)</div><div class='add'>+		chip-&gt;verify_buf = busw ? nand_verify_buf16 : nand_verify_buf;</div><div class='add'>+	if (!chip-&gt;scan_bbt)</div><div class='add'>+		chip-&gt;scan_bbt = nand_default_bbt;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;controller) {</div><div class='add'>+		chip-&gt;controller = &amp;chip-&gt;hwcontrol;</div><div class='add'>+		spin_lock_init(&amp;chip-&gt;controller-&gt;lock);</div><div class='add'>+		init_waitqueue_head(&amp;chip-&gt;controller-&gt;wq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the flash and manufacturer id and lookup if the type is supported</div><div class='add'>+ */</div><div class='add'>+static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,</div><div class='add'>+						  struct nand_chip *chip,</div><div class='add'>+						  int busw, int *maf_id)</div><div class='add'>+{</div><div class='add'>+	struct nand_flash_dev *type = NULL;</div><div class='add'>+	int i, dev_id, maf_idx;</div><div class='ctx'> </div><div class='ctx'> 	/* Select the device */</div><div class='del'>-	this-&gt;select_chip(mtd, 0);</div><div class='add'>+	chip-&gt;select_chip(mtd, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Send the command for reading device ID */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_READID, 0x00, -1);</div><div class='add'>+	chip-&gt;cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);</div><div class='ctx'> </div><div class='ctx'> 	/* Read manufacturer and device IDs */</div><div class='del'>-	nand_maf_id = this-&gt;read_byte(mtd);</div><div class='del'>-	nand_dev_id = this-&gt;read_byte(mtd);</div><div class='add'>+	*maf_id = chip-&gt;read_byte(mtd);</div><div class='add'>+	dev_id = chip-&gt;read_byte(mtd);</div><div class='ctx'> </div><div class='del'>-	/* Print and store flash device information */</div><div class='add'>+	/* Lookup the flash id */</div><div class='ctx'> 	for (i = 0; nand_flash_ids[i].name != NULL; i++) {</div><div class='add'>+		if (dev_id == nand_flash_ids[i].id) {</div><div class='add'>+			type =  &amp;nand_flash_ids[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (nand_dev_id != nand_flash_ids[i].id)</div><div class='del'>-			continue;</div><div class='add'>+	if (!type)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	if (!mtd-&gt;name)</div><div class='add'>+		mtd-&gt;name = type-&gt;name;</div><div class='add'>+</div><div class='add'>+	chip-&gt;chipsize = type-&gt;chipsize &lt;&lt; 20;</div><div class='add'>+</div><div class='add'>+	/* Newer devices have all the information in additional id bytes */</div><div class='add'>+	if (!type-&gt;pagesize) {</div><div class='add'>+		int extid;</div><div class='add'>+		/* The 3rd id byte contains non relevant data ATM */</div><div class='add'>+		extid = chip-&gt;read_byte(mtd);</div><div class='add'>+		/* The 4th id byte is the important one */</div><div class='add'>+		extid = chip-&gt;read_byte(mtd);</div><div class='add'>+		/* Calc pagesize */</div><div class='add'>+		mtd-&gt;writesize = 1024 &lt;&lt; (extid &amp; 0x3);</div><div class='add'>+		extid &gt;&gt;= 2;</div><div class='add'>+		/* Calc oobsize */</div><div class='add'>+		mtd-&gt;oobsize = (8 &lt;&lt; (extid &amp; 0x01)) * (mtd-&gt;writesize &gt;&gt; 9);</div><div class='add'>+		extid &gt;&gt;= 2;</div><div class='add'>+		/* Calc blocksize. Blocksize is multiples of 64KiB */</div><div class='add'>+		mtd-&gt;erasesize = (64 * 1024) &lt;&lt; (extid &amp; 0x03);</div><div class='add'>+		extid &gt;&gt;= 2;</div><div class='add'>+		/* Get buswidth information */</div><div class='add'>+		busw = (extid &amp; 0x01) ? NAND_BUSWIDTH_16 : 0;</div><div class='ctx'> </div><div class='del'>-		if (!mtd-&gt;name) mtd-&gt;name = nand_flash_ids[i].name;</div><div class='del'>-		this-&gt;chipsize = nand_flash_ids[i].chipsize &lt;&lt; 20;</div><div class='del'>-</div><div class='del'>-		/* New devices have all the information in additional id bytes */</div><div class='del'>-		if (!nand_flash_ids[i].pagesize) {</div><div class='del'>-			int extid;</div><div class='del'>-			/* The 3rd id byte contains non relevant data ATM */</div><div class='del'>-			extid = this-&gt;read_byte(mtd);</div><div class='del'>-			/* The 4th id byte is the important one */</div><div class='del'>-			extid = this-&gt;read_byte(mtd);</div><div class='del'>-			/* Calc pagesize */</div><div class='del'>-			mtd-&gt;oobblock = 1024 &lt;&lt; (extid &amp; 0x3);</div><div class='del'>-			extid &gt;&gt;= 2;</div><div class='del'>-			/* Calc oobsize */</div><div class='del'>-			mtd-&gt;oobsize = (8 &lt;&lt; (extid &amp; 0x01)) * (mtd-&gt;oobblock &gt;&gt; 9);</div><div class='del'>-			extid &gt;&gt;= 2;</div><div class='del'>-			/* Calc blocksize. Blocksize is multiples of 64KiB */</div><div class='del'>-			mtd-&gt;erasesize = (64 * 1024)  &lt;&lt; (extid &amp; 0x03);</div><div class='del'>-			extid &gt;&gt;= 2;</div><div class='del'>-			/* Get buswidth information */</div><div class='del'>-			busw = (extid &amp; 0x01) ? NAND_BUSWIDTH_16 : 0;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Old devices have chip data hardcoded in the device id table</div><div class='add'>+		 */</div><div class='add'>+		mtd-&gt;erasesize = type-&gt;erasesize;</div><div class='add'>+		mtd-&gt;writesize = type-&gt;pagesize;</div><div class='add'>+		mtd-&gt;oobsize = mtd-&gt;writesize / 32;</div><div class='add'>+		busw = type-&gt;options &amp; NAND_BUSWIDTH_16;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		} else {</div><div class='del'>-			/* Old devices have this data hardcoded in the</div><div class='del'>-			 * device id table */</div><div class='del'>-			mtd-&gt;erasesize = nand_flash_ids[i].erasesize;</div><div class='del'>-			mtd-&gt;oobblock = nand_flash_ids[i].pagesize;</div><div class='del'>-			mtd-&gt;oobsize = mtd-&gt;oobblock / 32;</div><div class='del'>-			busw = nand_flash_ids[i].options &amp; NAND_BUSWIDTH_16;</div><div class='del'>-		}</div><div class='add'>+	/* Try to identify manufacturer */</div><div class='add'>+	for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_id++) {</div><div class='add'>+		if (nand_manuf_ids[maf_idx].id == *maf_id)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Try to identify manufacturer */</div><div class='del'>-		for (maf_id = 0; nand_manuf_ids[maf_id].id != 0x0; maf_id++) {</div><div class='del'>-			if (nand_manuf_ids[maf_id].id == nand_maf_id)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * Check, if buswidth is correct. Hardware drivers should set</div><div class='add'>+	 * chip correct !</div><div class='add'>+	 */</div><div class='add'>+	if (busw != (chip-&gt;options &amp; NAND_BUSWIDTH_16)) {</div><div class='add'>+		printk(KERN_INFO "NAND device: Manufacturer ID:"</div><div class='add'>+		       " 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id,</div><div class='add'>+		       dev_id, nand_manuf_ids[maf_idx].name, mtd-&gt;name);</div><div class='add'>+		printk(KERN_WARNING "NAND bus width %d instead %d bit\n",</div><div class='add'>+		       (chip-&gt;options &amp; NAND_BUSWIDTH_16) ? 16 : 8,</div><div class='add'>+		       busw ? 16 : 8);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Check, if buswidth is correct. Hardware drivers should set</div><div class='del'>-		 * this correct ! */</div><div class='del'>-		if (busw != (this-&gt;options &amp; NAND_BUSWIDTH_16)) {</div><div class='del'>-			printk (KERN_INFO "NAND device: Manufacturer ID:"</div><div class='del'>-				" 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id,</div><div class='del'>-				nand_manuf_ids[maf_id].name , mtd-&gt;name);</div><div class='del'>-			printk (KERN_WARNING</div><div class='del'>-				"NAND bus width %d instead %d bit\n",</div><div class='del'>-					(this-&gt;options &amp; NAND_BUSWIDTH_16) ? 16 : 8,</div><div class='del'>-					busw ? 16 : 8);</div><div class='del'>-			this-&gt;select_chip(mtd, -1);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='add'>+	/* Calculate the address shift from the page size */</div><div class='add'>+	chip-&gt;page_shift = ffs(mtd-&gt;writesize) - 1;</div><div class='add'>+	/* Convert chipsize to number of pages per chip -1. */</div><div class='add'>+	chip-&gt;pagemask = (chip-&gt;chipsize &gt;&gt; chip-&gt;page_shift) - 1;</div><div class='ctx'> </div><div class='del'>-		/* Calculate the address shift from the page size */</div><div class='del'>-		this-&gt;page_shift = ffs(mtd-&gt;oobblock) - 1;</div><div class='del'>-		this-&gt;bbt_erase_shift = this-&gt;phys_erase_shift = ffs(mtd-&gt;erasesize) - 1;</div><div class='del'>-		this-&gt;chip_shift = ffs(this-&gt;chipsize) - 1;</div><div class='del'>-</div><div class='del'>-		/* Set the bad block position */</div><div class='del'>-		this-&gt;badblockpos = mtd-&gt;oobblock &gt; 512 ?</div><div class='del'>-			NAND_LARGE_BADBLOCK_POS : NAND_SMALL_BADBLOCK_POS;</div><div class='del'>-</div><div class='del'>-		/* Get chip options, preserve non chip based options */</div><div class='del'>-		this-&gt;options &amp;= ~NAND_CHIPOPTIONS_MSK;</div><div class='del'>-		this-&gt;options |= nand_flash_ids[i].options &amp; NAND_CHIPOPTIONS_MSK;</div><div class='del'>-		/* Set this as a default. Board drivers can override it, if neccecary */</div><div class='del'>-		this-&gt;options |= NAND_NO_AUTOINCR;</div><div class='del'>-		/* Check if this is a not a samsung device. Do not clear the options</div><div class='del'>-		 * for chips which are not having an extended id.</div><div class='del'>-		 */</div><div class='del'>-		if (nand_maf_id != NAND_MFR_SAMSUNG &amp;&amp; !nand_flash_ids[i].pagesize)</div><div class='del'>-			this-&gt;options &amp;= ~NAND_SAMSUNG_LP_OPTIONS;</div><div class='add'>+	chip-&gt;bbt_erase_shift = chip-&gt;phys_erase_shift =</div><div class='add'>+		ffs(mtd-&gt;erasesize) - 1;</div><div class='add'>+	chip-&gt;chip_shift = ffs(chip-&gt;chipsize) - 1;</div><div class='ctx'> </div><div class='del'>-		/* Check for AND chips with 4 page planes */</div><div class='del'>-		if (this-&gt;options &amp; NAND_4PAGE_ARRAY)</div><div class='del'>-			this-&gt;erase_cmd = multi_erase_cmd;</div><div class='del'>-		else</div><div class='del'>-			this-&gt;erase_cmd = single_erase_cmd;</div><div class='add'>+	/* Set the bad block position */</div><div class='add'>+	chip-&gt;badblockpos = mtd-&gt;writesize &gt; 512 ?</div><div class='add'>+		NAND_LARGE_BADBLOCK_POS : NAND_SMALL_BADBLOCK_POS;</div><div class='ctx'> </div><div class='del'>-		/* Do not replace user supplied command function ! */</div><div class='del'>-		if (mtd-&gt;oobblock &gt; 512 &amp;&amp; this-&gt;cmdfunc == nand_command)</div><div class='del'>-			this-&gt;cmdfunc = nand_command_lp;</div><div class='add'>+	/* Get chip options, preserve non chip based options */</div><div class='add'>+	chip-&gt;options &amp;= ~NAND_CHIPOPTIONS_MSK;</div><div class='add'>+	chip-&gt;options |= type-&gt;options &amp; NAND_CHIPOPTIONS_MSK;</div><div class='ctx'> </div><div class='del'>-		printk (KERN_INFO "NAND device: Manufacturer ID:"</div><div class='del'>-			" 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id,</div><div class='del'>-			nand_manuf_ids[maf_id].name , nand_flash_ids[i].name);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * Set chip as a default. Board drivers can override it, if necessary</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;options |= NAND_NO_AUTOINCR;</div><div class='add'>+</div><div class='add'>+	/* Check if chip is a not a samsung device. Do not clear the</div><div class='add'>+	 * options for chips which are not having an extended id.</div><div class='add'>+	 */</div><div class='add'>+	if (*maf_id != NAND_MFR_SAMSUNG &amp;&amp; !type-&gt;pagesize)</div><div class='add'>+		chip-&gt;options &amp;= ~NAND_SAMSUNG_LP_OPTIONS;</div><div class='add'>+</div><div class='add'>+	/* Check for AND chips with 4 page planes */</div><div class='add'>+	if (chip-&gt;options &amp; NAND_4PAGE_ARRAY)</div><div class='add'>+		chip-&gt;erase_cmd = multi_erase_cmd;</div><div class='add'>+	else</div><div class='add'>+		chip-&gt;erase_cmd = single_erase_cmd;</div><div class='add'>+</div><div class='add'>+	/* Do not replace user supplied command function ! */</div><div class='add'>+	if (mtd-&gt;writesize &gt; 512 &amp;&amp; chip-&gt;cmdfunc == nand_command)</div><div class='add'>+		chip-&gt;cmdfunc = nand_command_lp;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "NAND device: Manufacturer ID:"</div><div class='add'>+	       " 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, dev_id,</div><div class='add'>+	       nand_manuf_ids[maf_idx].name, type-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (!nand_flash_ids[i].name) {</div><div class='del'>-		printk (KERN_WARNING "No NAND device found!!!\n");</div><div class='del'>-		this-&gt;select_chip(mtd, -1);</div><div class='del'>-		return 1;</div><div class='add'>+	return type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* module_text_address() isn't exported, and it's mostly a pointless</div><div class='add'>+   test if this is a module _anyway_ -- they'd have to try _really_ hard</div><div class='add'>+   to call us from in-kernel code if the core NAND support is modular. */</div><div class='add'>+#ifdef MODULE</div><div class='add'>+#define caller_is_module() (1)</div><div class='add'>+#else</div><div class='add'>+#define caller_is_module() \</div><div class='add'>+	module_text_address((unsigned long)__builtin_return_address(0))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nand_scan - [NAND Interface] Scan for the NAND device</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @maxchips:	Number of chips to scan for</div><div class='add'>+ *</div><div class='add'>+ * This fills out all the uninitialized function pointers</div><div class='add'>+ * with the defaults.</div><div class='add'>+ * The flash ID is read and the mtd/chip structures are</div><div class='add'>+ * filled with the appropriate values.</div><div class='add'>+ * The mtd-&gt;owner field must be set to the module of the caller</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int nand_scan(struct mtd_info *mtd, int maxchips)</div><div class='add'>+{</div><div class='add'>+	int i, busw, nand_maf_id;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+	struct nand_flash_dev *type;</div><div class='add'>+</div><div class='add'>+	/* Many callers got this wrong, so check for it for a while... */</div><div class='add'>+	if (!mtd-&gt;owner &amp;&amp; caller_is_module()) {</div><div class='add'>+		printk(KERN_CRIT "nand_scan() called with NULL mtd-&gt;owner!\n");</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i=1; i &lt; maxchips; i++) {</div><div class='del'>-		this-&gt;select_chip(mtd, i);</div><div class='add'>+	/* Get buswidth to select the correct functions */</div><div class='add'>+	busw = chip-&gt;options &amp; NAND_BUSWIDTH_16;</div><div class='add'>+	/* Set the default functions */</div><div class='add'>+	nand_set_defaults(chip, busw);</div><div class='ctx'> </div><div class='del'>-		/* Send the command for reading device ID */</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_READID, 0x00, -1);</div><div class='add'>+	/* Read the flash type */</div><div class='add'>+	type = nand_get_flash_type(mtd, chip, busw, &amp;nand_maf_id);</div><div class='ctx'> </div><div class='add'>+	if (IS_ERR(type)) {</div><div class='add'>+		printk(KERN_WARNING "No NAND device found!!!\n");</div><div class='add'>+		chip-&gt;select_chip(mtd, -1);</div><div class='add'>+		return PTR_ERR(type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for a chip array */</div><div class='add'>+	for (i = 1; i &lt; maxchips; i++) {</div><div class='add'>+		chip-&gt;select_chip(mtd, i);</div><div class='add'>+		/* Send the command for reading device ID */</div><div class='add'>+		chip-&gt;cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);</div><div class='ctx'> 		/* Read manufacturer and device IDs */</div><div class='del'>-		if (nand_maf_id != this-&gt;read_byte(mtd) ||</div><div class='del'>-		    nand_dev_id != this-&gt;read_byte(mtd))</div><div class='add'>+		if (nand_maf_id != chip-&gt;read_byte(mtd) ||</div><div class='add'>+		    type-&gt;id != chip-&gt;read_byte(mtd))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i &gt; 1)</div><div class='ctx'> 		printk(KERN_INFO "%d NAND chips detected\n", i);</div><div class='ctx'> </div><div class='del'>-	/* Allocate buffers, if neccecary */</div><div class='del'>-	if (!this-&gt;oob_buf) {</div><div class='del'>-		size_t len;</div><div class='del'>-		len = mtd-&gt;oobsize &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift);</div><div class='del'>-		this-&gt;oob_buf = kmalloc (len, GFP_KERNEL);</div><div class='del'>-		if (!this-&gt;oob_buf) {</div><div class='del'>-			printk (KERN_ERR "nand_scan(): Cannot allocate oob_buf\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		this-&gt;options |= NAND_OOBBUF_ALLOC;</div><div class='del'>-	}</div><div class='add'>+	/* Store the number of chips and calc total size for mtd */</div><div class='add'>+	chip-&gt;numchips = i;</div><div class='add'>+	mtd-&gt;size = i * chip-&gt;chipsize;</div><div class='ctx'> </div><div class='del'>-	if (!this-&gt;data_buf) {</div><div class='del'>-		size_t len;</div><div class='del'>-		len = mtd-&gt;oobblock + mtd-&gt;oobsize;</div><div class='del'>-		this-&gt;data_buf = kmalloc (len, GFP_KERNEL);</div><div class='del'>-		if (!this-&gt;data_buf) {</div><div class='del'>-			if (this-&gt;options &amp; NAND_OOBBUF_ALLOC)</div><div class='del'>-				kfree (this-&gt;oob_buf);</div><div class='del'>-			printk (KERN_ERR "nand_scan(): Cannot allocate data_buf\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		this-&gt;options |= NAND_DATABUF_ALLOC;</div><div class='del'>-	}</div><div class='add'>+	/* Preset the internal oob write buffer */</div><div class='add'>+	memset(chip-&gt;buffers.oobwbuf, 0xff, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='del'>-	/* Store the number of chips and calc total size for mtd */</div><div class='del'>-	this-&gt;numchips = i;</div><div class='del'>-	mtd-&gt;size = i * this-&gt;chipsize;</div><div class='del'>-	/* Convert chipsize to number of pages per chip -1. */</div><div class='del'>-	this-&gt;pagemask = (this-&gt;chipsize &gt;&gt; this-&gt;page_shift) - 1;</div><div class='del'>-	/* Preset the internal oob buffer */</div><div class='del'>-	memset(this-&gt;oob_buf, 0xff, mtd-&gt;oobsize &lt;&lt; (this-&gt;phys_erase_shift - this-&gt;page_shift));</div><div class='del'>-</div><div class='del'>-	/* If no default placement scheme is given, select an</div><div class='del'>-	 * appropriate one */</div><div class='del'>-	if (!this-&gt;autooob) {</div><div class='del'>-		/* Select the appropriate default oob placement scheme for</div><div class='del'>-		 * placement agnostic filesystems */</div><div class='add'>+	/*</div><div class='add'>+	 * If no default placement scheme is given, select an appropriate one</div><div class='add'>+	 */</div><div class='add'>+	if (!chip-&gt;ecc.layout) {</div><div class='ctx'> 		switch (mtd-&gt;oobsize) {</div><div class='ctx'> 		case 8:</div><div class='del'>-			this-&gt;autooob = &amp;nand_oob_8;</div><div class='add'>+			chip-&gt;ecc.layout = &amp;nand_oob_8;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 16:</div><div class='del'>-			this-&gt;autooob = &amp;nand_oob_16;</div><div class='add'>+			chip-&gt;ecc.layout = &amp;nand_oob_16;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 64:</div><div class='del'>-			this-&gt;autooob = &amp;nand_oob_64;</div><div class='add'>+			chip-&gt;ecc.layout = &amp;nand_oob_64;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk (KERN_WARNING "No oob scheme defined for oobsize %d\n",</div><div class='del'>-				mtd-&gt;oobsize);</div><div class='add'>+			printk(KERN_WARNING "No oob scheme defined for "</div><div class='add'>+			       "oobsize %d\n", mtd-&gt;oobsize);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The number of bytes available for the filesystem to place fs dependend</div><div class='del'>-	 * oob data */</div><div class='del'>-	mtd-&gt;oobavail = 0;</div><div class='del'>-	for (i = 0; this-&gt;autooob-&gt;oobfree[i][1]; i++)</div><div class='del'>-		mtd-&gt;oobavail += this-&gt;autooob-&gt;oobfree[i][1];</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * check ECC mode, default to software</div><div class='del'>-	 * if 3byte/512byte hardware ECC is selected and we have 256 byte pagesize</div><div class='del'>-	 * fallback to software ECC</div><div class='del'>-	*/</div><div class='del'>-	this-&gt;eccsize = 256;	/* set default eccsize */</div><div class='del'>-	this-&gt;eccbytes = 3;</div><div class='del'>-</div><div class='del'>-	switch (this-&gt;eccmode) {</div><div class='del'>-	case NAND_ECC_HW12_2048:</div><div class='del'>-		if (mtd-&gt;oobblock &lt; 2048) {</div><div class='del'>-			printk(KERN_WARNING "2048 byte HW ECC not possible on %d byte page size, fallback to SW ECC\n",</div><div class='del'>-			       mtd-&gt;oobblock);</div><div class='del'>-			this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='del'>-			this-&gt;calculate_ecc = nand_calculate_ecc;</div><div class='del'>-			this-&gt;correct_data = nand_correct_data;</div><div class='del'>-		} else</div><div class='del'>-			this-&gt;eccsize = 2048;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_ECC_HW3_512:</div><div class='del'>-	case NAND_ECC_HW6_512:</div><div class='del'>-	case NAND_ECC_HW8_512:</div><div class='del'>-		if (mtd-&gt;oobblock == 256) {</div><div class='del'>-			printk (KERN_WARNING "512 byte HW ECC not possible on 256 Byte pagesize, fallback to SW ECC \n");</div><div class='del'>-			this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='del'>-			this-&gt;calculate_ecc = nand_calculate_ecc;</div><div class='del'>-			this-&gt;correct_data = nand_correct_data;</div><div class='del'>-		} else</div><div class='del'>-			this-&gt;eccsize = 512; /* set eccsize to 512 */</div><div class='del'>-		break;</div><div class='add'>+	 * check ECC mode, default to software if 3byte/512byte hardware ECC is</div><div class='add'>+	 * selected and we have 256 byte pagesize fallback to software ECC</div><div class='add'>+	 */</div><div class='add'>+	switch (chip-&gt;ecc.mode) {</div><div class='add'>+	case NAND_ECC_HW:</div><div class='add'>+		/* Use standard hwecc read page function ? */</div><div class='add'>+		if (!chip-&gt;ecc.read_page)</div><div class='add'>+			chip-&gt;ecc.read_page = nand_read_page_hwecc;</div><div class='add'>+		if (!chip-&gt;ecc.write_page)</div><div class='add'>+			chip-&gt;ecc.write_page = nand_write_page_hwecc;</div><div class='add'>+		if (!chip-&gt;ecc.read_oob)</div><div class='add'>+			chip-&gt;ecc.read_oob = nand_read_oob_std;</div><div class='add'>+		if (!chip-&gt;ecc.write_oob)</div><div class='add'>+			chip-&gt;ecc.write_oob = nand_write_oob_std;</div><div class='add'>+</div><div class='add'>+	case NAND_ECC_HW_SYNDROME:</div><div class='add'>+		if (!chip-&gt;ecc.calculate || !chip-&gt;ecc.correct ||</div><div class='add'>+		    !chip-&gt;ecc.hwctl) {</div><div class='add'>+			printk(KERN_WARNING "No ECC functions supplied, "</div><div class='add'>+			       "Hardware ECC not possible\n");</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+		/* Use standard syndrome read/write page function ? */</div><div class='add'>+		if (!chip-&gt;ecc.read_page)</div><div class='add'>+			chip-&gt;ecc.read_page = nand_read_page_syndrome;</div><div class='add'>+		if (!chip-&gt;ecc.write_page)</div><div class='add'>+			chip-&gt;ecc.write_page = nand_write_page_syndrome;</div><div class='add'>+		if (!chip-&gt;ecc.read_oob)</div><div class='add'>+			chip-&gt;ecc.read_oob = nand_read_oob_syndrome;</div><div class='add'>+		if (!chip-&gt;ecc.write_oob)</div><div class='add'>+			chip-&gt;ecc.write_oob = nand_write_oob_syndrome;</div><div class='add'>+</div><div class='add'>+		if (mtd-&gt;writesize &gt;= chip-&gt;ecc.size)</div><div class='add'>+			break;</div><div class='add'>+		printk(KERN_WARNING "%d byte HW ECC not possible on "</div><div class='add'>+		       "%d byte page size, fallback to SW ECC\n",</div><div class='add'>+		       chip-&gt;ecc.size, mtd-&gt;writesize);</div><div class='add'>+		chip-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> </div><div class='del'>-	case NAND_ECC_HW3_256:</div><div class='add'>+	case NAND_ECC_SOFT:</div><div class='add'>+		chip-&gt;ecc.calculate = nand_calculate_ecc;</div><div class='add'>+		chip-&gt;ecc.correct = nand_correct_data;</div><div class='add'>+		chip-&gt;ecc.read_page = nand_read_page_swecc;</div><div class='add'>+		chip-&gt;ecc.write_page = nand_write_page_swecc;</div><div class='add'>+		chip-&gt;ecc.read_oob = nand_read_oob_std;</div><div class='add'>+		chip-&gt;ecc.write_oob = nand_write_oob_std;</div><div class='add'>+		chip-&gt;ecc.size = 256;</div><div class='add'>+		chip-&gt;ecc.bytes = 3;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case NAND_ECC_NONE:</div><div class='del'>-		printk (KERN_WARNING "NAND_ECC_NONE selected by board driver. This is not recommended !!\n");</div><div class='del'>-		this-&gt;eccmode = NAND_ECC_NONE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_ECC_SOFT:</div><div class='del'>-		this-&gt;calculate_ecc = nand_calculate_ecc;</div><div class='del'>-		this-&gt;correct_data = nand_correct_data;</div><div class='add'>+		printk(KERN_WARNING "NAND_ECC_NONE selected by board driver. "</div><div class='add'>+		       "This is not recommended !!\n");</div><div class='add'>+		chip-&gt;ecc.read_page = nand_read_page_raw;</div><div class='add'>+		chip-&gt;ecc.write_page = nand_write_page_raw;</div><div class='add'>+		chip-&gt;ecc.read_oob = nand_read_oob_std;</div><div class='add'>+		chip-&gt;ecc.write_oob = nand_write_oob_std;</div><div class='add'>+		chip-&gt;ecc.size = mtd-&gt;writesize;</div><div class='add'>+		chip-&gt;ecc.bytes = 0;</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='del'>-		printk (KERN_WARNING "Invalid NAND_ECC_MODE %d\n", this-&gt;eccmode);</div><div class='add'>+		printk(KERN_WARNING "Invalid NAND_ECC_MODE %d\n",</div><div class='add'>+		       chip-&gt;ecc.mode);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check hardware ecc function availability and adjust number of ecc bytes per</div><div class='del'>-	 * calculation step</div><div class='del'>-	*/</div><div class='del'>-	switch (this-&gt;eccmode) {</div><div class='del'>-	case NAND_ECC_HW12_2048:</div><div class='del'>-		this-&gt;eccbytes += 4;</div><div class='del'>-	case NAND_ECC_HW8_512:</div><div class='del'>-		this-&gt;eccbytes += 2;</div><div class='del'>-	case NAND_ECC_HW6_512:</div><div class='del'>-		this-&gt;eccbytes += 3;</div><div class='del'>-	case NAND_ECC_HW3_512:</div><div class='del'>-	case NAND_ECC_HW3_256:</div><div class='del'>-		if (this-&gt;calculate_ecc &amp;&amp; this-&gt;correct_data &amp;&amp; this-&gt;enable_hwecc)</div><div class='del'>-			break;</div><div class='del'>-		printk (KERN_WARNING "No ECC functions supplied, Hardware ECC not possible\n");</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mtd-&gt;eccsize = this-&gt;eccsize;</div><div class='del'>-</div><div class='del'>-	/* Set the number of read / write steps for one page to ensure ECC generation */</div><div class='del'>-	switch (this-&gt;eccmode) {</div><div class='del'>-	case NAND_ECC_HW12_2048:</div><div class='del'>-		this-&gt;eccsteps = mtd-&gt;oobblock / 2048;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_ECC_HW3_512:</div><div class='del'>-	case NAND_ECC_HW6_512:</div><div class='del'>-	case NAND_ECC_HW8_512:</div><div class='del'>-		this-&gt;eccsteps = mtd-&gt;oobblock / 512;</div><div class='del'>-		break;</div><div class='del'>-	case NAND_ECC_HW3_256:</div><div class='del'>-	case NAND_ECC_SOFT:</div><div class='del'>-		this-&gt;eccsteps = mtd-&gt;oobblock / 256;</div><div class='del'>-		break;</div><div class='add'>+	/*</div><div class='add'>+	 * The number of bytes available for a client to place data into</div><div class='add'>+	 * the out of band area</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;ecc.layout-&gt;oobavail = 0;</div><div class='add'>+	for (i = 0; chip-&gt;ecc.layout-&gt;oobfree[i].length; i++)</div><div class='add'>+		chip-&gt;ecc.layout-&gt;oobavail +=</div><div class='add'>+			chip-&gt;ecc.layout-&gt;oobfree[i].length;</div><div class='ctx'> </div><div class='del'>-	case NAND_ECC_NONE:</div><div class='del'>-		this-&gt;eccsteps = 1;</div><div class='del'>-		break;</div><div class='add'>+	/*</div><div class='add'>+	 * Set the number of read / write steps for one page depending on ECC</div><div class='add'>+	 * mode</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;ecc.steps = mtd-&gt;writesize / chip-&gt;ecc.size;</div><div class='add'>+	if(chip-&gt;ecc.steps * chip-&gt;ecc.size != mtd-&gt;writesize) {</div><div class='add'>+		printk(KERN_WARNING "Invalid ecc parameters\n");</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='add'>+	chip-&gt;ecc.total = chip-&gt;ecc.steps * chip-&gt;ecc.bytes;</div><div class='ctx'> </div><div class='del'>-	/* Initialize state, waitqueue and spinlock */</div><div class='del'>-	this-&gt;state = FL_READY;</div><div class='del'>-	init_waitqueue_head (&amp;this-&gt;wq);</div><div class='del'>-	spin_lock_init (&amp;this-&gt;chip_lock);</div><div class='add'>+	/* Initialize state */</div><div class='add'>+	chip-&gt;state = FL_READY;</div><div class='ctx'> </div><div class='ctx'> 	/* De-select the device */</div><div class='del'>-	this-&gt;select_chip(mtd, -1);</div><div class='add'>+	chip-&gt;select_chip(mtd, -1);</div><div class='ctx'> </div><div class='ctx'> 	/* Invalidate the pagebuffer reference */</div><div class='del'>-	this-&gt;pagebuf = -1;</div><div class='add'>+	chip-&gt;pagebuf = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in remaining MTD driver data */</div><div class='ctx'> 	mtd-&gt;type = MTD_NANDFLASH;</div><div class='del'>-	mtd-&gt;flags = MTD_CAP_NANDFLASH | MTD_ECC;</div><div class='add'>+	mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='ctx'> 	mtd-&gt;ecctype = MTD_ECC_SW;</div><div class='ctx'> 	mtd-&gt;erase = nand_erase;</div><div class='ctx'> 	mtd-&gt;point = NULL;</div><div class='ctx'> 	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = nand_read;</div><div class='ctx'> 	mtd-&gt;write = nand_write;</div><div class='del'>-	mtd-&gt;read_ecc = nand_read_ecc;</div><div class='del'>-	mtd-&gt;write_ecc = nand_write_ecc;</div><div class='ctx'> 	mtd-&gt;read_oob = nand_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = nand_write_oob;</div><div class='del'>-	mtd-&gt;readv = NULL;</div><div class='del'>-	mtd-&gt;writev = nand_writev;</div><div class='del'>-	mtd-&gt;writev_ecc = nand_writev_ecc;</div><div class='ctx'> 	mtd-&gt;sync = nand_sync;</div><div class='ctx'> 	mtd-&gt;lock = NULL;</div><div class='ctx'> 	mtd-&gt;unlock = NULL;</div><div class='hunk'>@@ -2692,47 +2490,38 @@ int nand_scan (struct mtd_info *mtd, int maxchips)</div><div class='ctx'> 	mtd-&gt;block_isbad = nand_block_isbad;</div><div class='ctx'> 	mtd-&gt;block_markbad = nand_block_markbad;</div><div class='ctx'> </div><div class='del'>-	/* and make the autooob the default one */</div><div class='del'>-	memcpy(&amp;mtd-&gt;oobinfo, this-&gt;autooob, sizeof(mtd-&gt;oobinfo));</div><div class='del'>-</div><div class='del'>-	mtd-&gt;owner = THIS_MODULE;</div><div class='add'>+	/* propagate ecc.layout to mtd_info */</div><div class='add'>+	mtd-&gt;ecclayout = chip-&gt;ecc.layout;</div><div class='ctx'> </div><div class='ctx'> 	/* Check, if we should skip the bad block table scan */</div><div class='del'>-	if (this-&gt;options &amp; NAND_SKIP_BBTSCAN)</div><div class='add'>+	if (chip-&gt;options &amp; NAND_SKIP_BBTSCAN)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Build bad block table */</div><div class='del'>-	return this-&gt;scan_bbt (mtd);</div><div class='add'>+	return chip-&gt;scan_bbt(mtd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nand_release - [NAND Interface] Free resources held by the NAND device</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'> */</div><div class='del'>-void nand_release (struct mtd_info *mtd)</div><div class='add'>+void nand_release(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> 	/* Deregister partitions */</div><div class='del'>-	del_mtd_partitions (mtd);</div><div class='add'>+	del_mtd_partitions(mtd);</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Deregister the device */</div><div class='del'>-	del_mtd_device (mtd);</div><div class='add'>+	del_mtd_device(mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Free bad block table memory */</div><div class='del'>-	kfree (this-&gt;bbt);</div><div class='del'>-	/* Buffer allocated by nand_scan ? */</div><div class='del'>-	if (this-&gt;options &amp; NAND_OOBBUF_ALLOC)</div><div class='del'>-		kfree (this-&gt;oob_buf);</div><div class='del'>-	/* Buffer allocated by nand_scan ? */</div><div class='del'>-	if (this-&gt;options &amp; NAND_DATABUF_ALLOC)</div><div class='del'>-		kfree (this-&gt;data_buf);</div><div class='add'>+	kfree(chip-&gt;bbt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL (nand_scan);</div><div class='del'>-EXPORT_SYMBOL_GPL (nand_release);</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL_GPL(nand_scan);</div><div class='add'>+EXPORT_SYMBOL_GPL(nand_release);</div><div class='ctx'> </div><div class='ctx'> static int __init nand_base_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -2748,6 +2537,6 @@ static void __exit nand_base_exit(void)</div><div class='ctx'> module_init(nand_base_init);</div><div class='ctx'> module_exit(nand_base_exit);</div><div class='ctx'> </div><div class='del'>-MODULE_LICENSE ("GPL");</div><div class='del'>-MODULE_AUTHOR ("Steven J. Hill &lt;sjhill@realitydiluted.com&gt;, Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION ("Generic NAND flash driver code");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Steven J. Hill &lt;sjhill@realitydiluted.com&gt;, Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Generic NAND flash driver code");</div><div class='head'>diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c<br/>index ca286999fe08..a612c4ea8194 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_bbt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_bbt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_bbt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/nand_bbt.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Following assumptions are made:</div><div class='ctx'>  * - bbts start at a page boundary, if autolocated on a block boundary</div><div class='del'>- * - the space neccecary for a bbt in FLASH does not exceed a block boundary</div><div class='add'>+ * - the space necessary for a bbt in FLASH does not exceed a block boundary</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -60,7 +60,7 @@</div><div class='ctx'> #include &lt;linux/mtd/compatmac.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * check_pattern - [GENERIC] check if a pattern is in the buffer</div><div class='hunk'>@@ -75,7 +75,7 @@</div><div class='ctx'>  * pattern area contain 0xff</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_descr *td)</div><div class='add'>+static int check_pattern(uint8_t *buf, int len, int paglen, struct nand_bbt_descr *td)</div><div class='ctx'> {</div><div class='ctx'> 	int i, end = 0;</div><div class='ctx'> 	uint8_t *p = buf;</div><div class='hunk'>@@ -116,7 +116,7 @@ static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_des</div><div class='ctx'>  * no optional empty check</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-static int check_short_pattern (uint8_t *buf, struct nand_bbt_descr *td)</div><div class='add'>+static int check_short_pattern(uint8_t *buf, struct nand_bbt_descr *td)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	uint8_t *p = buf;</div><div class='hunk'>@@ -142,8 +142,8 @@ static int check_short_pattern (uint8_t *buf, struct nand_bbt_descr *td)</div><div class='ctx'>  * Read the bad block table starting from page.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,</div><div class='del'>-	int bits, int offs, int reserved_block_code)</div><div class='add'>+static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,</div><div class='add'>+		    int bits, int offs, int reserved_block_code)</div><div class='ctx'> {</div><div class='ctx'> 	int res, i, j, act = 0;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='hunk'>@@ -152,17 +152,17 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,</div><div class='ctx'> 	uint8_t msk = (uint8_t) ((1 &lt;&lt; bits) - 1);</div><div class='ctx'> </div><div class='ctx'> 	totlen = (num * bits) &gt;&gt; 3;</div><div class='del'>-	from = ((loff_t)page) &lt;&lt; this-&gt;page_shift;</div><div class='add'>+	from = ((loff_t) page) &lt;&lt; this-&gt;page_shift;</div><div class='ctx'> </div><div class='ctx'> 	while (totlen) {</div><div class='del'>-		len = min (totlen, (size_t) (1 &lt;&lt; this-&gt;bbt_erase_shift));</div><div class='del'>-		res = mtd-&gt;read_ecc (mtd, from, len, &amp;retlen, buf, NULL, this-&gt;autooob);</div><div class='add'>+		len = min(totlen, (size_t) (1 &lt;&lt; this-&gt;bbt_erase_shift));</div><div class='add'>+		res = mtd-&gt;read(mtd, from, len, &amp;retlen, buf);</div><div class='ctx'> 		if (res &lt; 0) {</div><div class='ctx'> 			if (retlen != len) {</div><div class='del'>-				printk (KERN_INFO "nand_bbt: Error reading bad block table\n");</div><div class='add'>+				printk(KERN_INFO "nand_bbt: Error reading bad block table\n");</div><div class='ctx'> 				return res;</div><div class='ctx'> 			}</div><div class='del'>-			printk (KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");</div><div class='add'>+			printk(KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Analyse data */</div><div class='hunk'>@@ -172,22 +172,23 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,</div><div class='ctx'> 				uint8_t tmp = (dat &gt;&gt; j) &amp; msk;</div><div class='ctx'> 				if (tmp == msk)</div><div class='ctx'> 					continue;</div><div class='del'>-				if (reserved_block_code &amp;&amp;</div><div class='del'>-				    (tmp == reserved_block_code)) {</div><div class='del'>-					printk (KERN_DEBUG "nand_read_bbt: Reserved block at 0x%08x\n",</div><div class='del'>-						((offs &lt;&lt; 2) + (act &gt;&gt; 1)) &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='add'>+				if (reserved_block_code &amp;&amp; (tmp == reserved_block_code)) {</div><div class='add'>+					printk(KERN_DEBUG "nand_read_bbt: Reserved block at 0x%08x\n",</div><div class='add'>+					       ((offs &lt;&lt; 2) + (act &gt;&gt; 1)) &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 					this-&gt;bbt[offs + (act &gt;&gt; 3)] |= 0x2 &lt;&lt; (act &amp; 0x06);</div><div class='add'>+					mtd-&gt;ecc_stats.bbtblocks++;</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				/* Leave it for now, if its matured we can move this</div><div class='ctx'> 				 * message to MTD_DEBUG_LEVEL0 */</div><div class='del'>-				printk (KERN_DEBUG "nand_read_bbt: Bad block at 0x%08x\n",</div><div class='del'>-					((offs &lt;&lt; 2) + (act &gt;&gt; 1)) &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='add'>+				printk(KERN_DEBUG "nand_read_bbt: Bad block at 0x%08x\n",</div><div class='add'>+				       ((offs &lt;&lt; 2) + (act &gt;&gt; 1)) &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 				/* Factory marked bad or worn out ? */</div><div class='ctx'> 				if (tmp == 0)</div><div class='ctx'> 					this-&gt;bbt[offs + (act &gt;&gt; 3)] |= 0x3 &lt;&lt; (act &amp; 0x06);</div><div class='ctx'> 				else</div><div class='ctx'> 					this-&gt;bbt[offs + (act &gt;&gt; 3)] |= 0x1 &lt;&lt; (act &amp; 0x06);</div><div class='add'>+				mtd-&gt;ecc_stats.badblocks++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		totlen -= len;</div><div class='hunk'>@@ -207,7 +208,7 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,</div><div class='ctx'>  * Read the bad block table for all chips starting at a given page</div><div class='ctx'>  * We assume that the bbt bits are in consecutive order.</div><div class='ctx'> */</div><div class='del'>-static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td, int chip)</div><div class='add'>+static int read_abs_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td, int chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int res = 0, i;</div><div class='hunk'>@@ -231,6 +232,42 @@ static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Scan read raw data from flash</div><div class='add'>+ */</div><div class='add'>+static int scan_read_raw(struct mtd_info *mtd, uint8_t *buf, loff_t offs,</div><div class='add'>+			 size_t len)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_RAW;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+	ops.ooblen = mtd-&gt;oobsize;</div><div class='add'>+	ops.oobbuf = buf;</div><div class='add'>+	ops.datbuf = buf;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	return mtd-&gt;read_oob(mtd, offs, &amp;ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scan write data with oob to flash</div><div class='add'>+ */</div><div class='add'>+static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+			  uint8_t *buf, uint8_t *oob)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+	ops.ooblen = mtd-&gt;oobsize;</div><div class='add'>+	ops.datbuf = buf;</div><div class='add'>+	ops.oobbuf = oob;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	return mtd-&gt;write_oob(mtd, offs, &amp;ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * read_abs_bbts - [GENERIC] Read the bad block table(s) for all chips starting at a given page</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -242,28 +279,85 @@ static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des</div><div class='ctx'>  * We assume that the bbt bits are in consecutive order.</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-static int read_abs_bbts (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td,</div><div class='del'>-	struct nand_bbt_descr *md)</div><div class='add'>+static int read_abs_bbts(struct mtd_info *mtd, uint8_t *buf,</div><div class='add'>+			 struct nand_bbt_descr *td, struct nand_bbt_descr *md)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the primary version, if available */</div><div class='ctx'> 	if (td-&gt;options &amp; NAND_BBT_VERSION) {</div><div class='del'>-		nand_read_raw (mtd, buf, td-&gt;pages[0] &lt;&lt; this-&gt;page_shift, mtd-&gt;oobblock, mtd-&gt;oobsize);</div><div class='del'>-		td-&gt;version[0] = buf[mtd-&gt;oobblock + td-&gt;veroffs];</div><div class='del'>-		printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", td-&gt;pages[0], td-&gt;version[0]);</div><div class='add'>+		scan_read_raw(mtd, buf, td-&gt;pages[0] &lt;&lt; this-&gt;page_shift,</div><div class='add'>+			      mtd-&gt;writesize);</div><div class='add'>+		td-&gt;version[0] = buf[mtd-&gt;writesize + td-&gt;veroffs];</div><div class='add'>+		printk(KERN_DEBUG "Bad block table at page %d, version 0x%02X\n",</div><div class='add'>+		       td-&gt;pages[0], td-&gt;version[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the mirror version, if available */</div><div class='ctx'> 	if (md &amp;&amp; (md-&gt;options &amp; NAND_BBT_VERSION)) {</div><div class='del'>-		nand_read_raw (mtd, buf, md-&gt;pages[0] &lt;&lt; this-&gt;page_shift, mtd-&gt;oobblock, mtd-&gt;oobsize);</div><div class='del'>-		md-&gt;version[0] = buf[mtd-&gt;oobblock + md-&gt;veroffs];</div><div class='del'>-		printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", md-&gt;pages[0], md-&gt;version[0]);</div><div class='add'>+		scan_read_raw(mtd, buf, md-&gt;pages[0] &lt;&lt; this-&gt;page_shift,</div><div class='add'>+			      mtd-&gt;writesize);</div><div class='add'>+		md-&gt;version[0] = buf[mtd-&gt;writesize + md-&gt;veroffs];</div><div class='add'>+		printk(KERN_DEBUG "Bad block table at page %d, version 0x%02X\n",</div><div class='add'>+		       md-&gt;pages[0], md-&gt;version[0]);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Scan a given block full</div><div class='add'>+ */</div><div class='add'>+static int scan_block_full(struct mtd_info *mtd, struct nand_bbt_descr *bd,</div><div class='add'>+			   loff_t offs, uint8_t *buf, size_t readlen,</div><div class='add'>+			   int scanlen, int len)</div><div class='add'>+{</div><div class='add'>+	int ret, j;</div><div class='add'>+</div><div class='add'>+	ret = scan_read_raw(mtd, buf, offs, readlen);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; len; j++, buf += scanlen) {</div><div class='add'>+		if (check_pattern(buf, scanlen, mtd-&gt;writesize, bd))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Scan a given block partially</div><div class='add'>+ */</div><div class='add'>+static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,</div><div class='add'>+			   loff_t offs, uint8_t *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int j, ret;</div><div class='add'>+</div><div class='add'>+	ops.len = mtd-&gt;oobsize;</div><div class='add'>+	ops.ooblen = mtd-&gt;oobsize;</div><div class='add'>+	ops.oobbuf = buf;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; len; j++) {</div><div class='add'>+		/*</div><div class='add'>+		 * Read the full oob until read_oob is fixed to</div><div class='add'>+		 * handle single byte reads for 16 bit</div><div class='add'>+		 * buswidth</div><div class='add'>+		 */</div><div class='add'>+		ret = mtd-&gt;read_oob(mtd, offs, &amp;ops);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (check_short_pattern(buf, bd))</div><div class='add'>+			return 1;</div><div class='add'>+</div><div class='add'>+		offs += mtd-&gt;writesize;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * create_bbt - [GENERIC] Create a bad block table by scanning the device</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -275,15 +369,16 @@ static int read_abs_bbts (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_de</div><div class='ctx'>  * Create a bad block table by scanning the device</div><div class='ctx'>  * for the given good/bad block identify pattern</div><div class='ctx'>  */</div><div class='del'>-static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd, int chip)</div><div class='add'>+static int create_bbt(struct mtd_info *mtd, uint8_t *buf,</div><div class='add'>+	struct nand_bbt_descr *bd, int chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int i, j, numblocks, len, scanlen;</div><div class='add'>+	int i, numblocks, len, scanlen;</div><div class='ctx'> 	int startblock;</div><div class='ctx'> 	loff_t from;</div><div class='del'>-	size_t readlen, ooblen;</div><div class='add'>+	size_t readlen;</div><div class='ctx'> </div><div class='del'>-	printk (KERN_INFO "Scanning device for bad blocks\n");</div><div class='add'>+	printk(KERN_INFO "Scanning device for bad blocks\n");</div><div class='ctx'> </div><div class='ctx'> 	if (bd-&gt;options &amp; NAND_BBT_SCANALLPAGES)</div><div class='ctx'> 		len = 1 &lt;&lt; (this-&gt;bbt_erase_shift - this-&gt;page_shift);</div><div class='hunk'>@@ -296,25 +391,24 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'> </div><div class='ctx'> 	if (!(bd-&gt;options &amp; NAND_BBT_SCANEMPTY)) {</div><div class='ctx'> 		/* We need only read few bytes from the OOB area */</div><div class='del'>-		scanlen = ooblen = 0;</div><div class='add'>+		scanlen = 0;</div><div class='ctx'> 		readlen = bd-&gt;len;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Full page content should be read */</div><div class='del'>-		scanlen	= mtd-&gt;oobblock + mtd-&gt;oobsize;</div><div class='del'>-		readlen = len * mtd-&gt;oobblock;</div><div class='del'>-		ooblen = len * mtd-&gt;oobsize;</div><div class='add'>+		scanlen = mtd-&gt;writesize + mtd-&gt;oobsize;</div><div class='add'>+		readlen = len * mtd-&gt;writesize;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip == -1) {</div><div class='del'>-		/* Note that numblocks is 2 * (real numblocks) here, see i+=2 below as it</div><div class='del'>-		 * makes shifting and masking less painful */</div><div class='add'>+		/* Note that numblocks is 2 * (real numblocks) here, see i+=2</div><div class='add'>+		 * below as it makes shifting and masking less painful */</div><div class='ctx'> 		numblocks = mtd-&gt;size &gt;&gt; (this-&gt;bbt_erase_shift - 1);</div><div class='ctx'> 		startblock = 0;</div><div class='ctx'> 		from = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (chip &gt;= this-&gt;numchips) {</div><div class='del'>-			printk (KERN_WARNING "create_bbt(): chipnr (%d) &gt; available chips (%d)\n",</div><div class='del'>-				chip + 1, this-&gt;numchips);</div><div class='add'>+			printk(KERN_WARNING "create_bbt(): chipnr (%d) &gt; available chips (%d)\n",</div><div class='add'>+			       chip + 1, this-&gt;numchips);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		numblocks = this-&gt;chipsize &gt;&gt; (this-&gt;bbt_erase_shift - 1);</div><div class='hunk'>@@ -326,36 +420,22 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'> 	for (i = startblock; i &lt; numblocks;) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		if (bd-&gt;options &amp; NAND_BBT_SCANEMPTY)</div><div class='del'>-			if ((ret = nand_read_raw (mtd, buf, from, readlen, ooblen)))</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; len; j++) {</div><div class='del'>-			if (!(bd-&gt;options &amp; NAND_BBT_SCANEMPTY)) {</div><div class='del'>-				size_t retlen;</div><div class='del'>-</div><div class='del'>-				/* Read the full oob until read_oob is fixed to</div><div class='del'>-				 * handle single byte reads for 16 bit buswidth */</div><div class='del'>-				ret = mtd-&gt;read_oob(mtd, from + j * mtd-&gt;oobblock,</div><div class='del'>-							mtd-&gt;oobsize, &amp;retlen, buf);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-</div><div class='del'>-				if (check_short_pattern (buf, bd)) {</div><div class='del'>-					this-&gt;bbt[i &gt;&gt; 3] |= 0x03 &lt;&lt; (i &amp; 0x6);</div><div class='del'>-					printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n",</div><div class='del'>-						i &gt;&gt; 1, (unsigned int) from);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (check_pattern (&amp;buf[j * scanlen], scanlen, mtd-&gt;oobblock, bd)) {</div><div class='del'>-					this-&gt;bbt[i &gt;&gt; 3] |= 0x03 &lt;&lt; (i &amp; 0x6);</div><div class='del'>-					printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n",</div><div class='del'>-						i &gt;&gt; 1, (unsigned int) from);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+		if (bd-&gt;options &amp; NAND_BBT_SCANALLPAGES)</div><div class='add'>+			ret = scan_block_full(mtd, bd, from, buf, readlen,</div><div class='add'>+					      scanlen, len);</div><div class='add'>+		else</div><div class='add'>+			ret = scan_block_fast(mtd, bd, from, buf, len);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			this-&gt;bbt[i &gt;&gt; 3] |= 0x03 &lt;&lt; (i &amp; 0x6);</div><div class='add'>+			printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",</div><div class='add'>+			       i &gt;&gt; 1, (unsigned int)from);</div><div class='add'>+			mtd-&gt;ecc_stats.badblocks++;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		i += 2;</div><div class='ctx'> 		from += (1 &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -374,22 +454,23 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'>  * block.</div><div class='ctx'>  * If the option NAND_BBT_PERCHIP is given, each chip is searched</div><div class='ctx'>  * for a bbt, which contains the bad block information of this chip.</div><div class='del'>- * This is neccecary to provide support for certain DOC devices.</div><div class='add'>+ * This is necessary to provide support for certain DOC devices.</div><div class='ctx'>  *</div><div class='ctx'>  * The bbt ident pattern resides in the oob area of the first page</div><div class='ctx'>  * in a block.</div><div class='ctx'>  */</div><div class='del'>-static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td)</div><div class='add'>+static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int i, chips;</div><div class='ctx'> 	int bits, startblock, block, dir;</div><div class='del'>-	int scanlen = mtd-&gt;oobblock + mtd-&gt;oobsize;</div><div class='add'>+	int scanlen = mtd-&gt;writesize + mtd-&gt;oobsize;</div><div class='ctx'> 	int bbtblocks;</div><div class='add'>+	int blocktopage = this-&gt;bbt_erase_shift - this-&gt;page_shift;</div><div class='ctx'> </div><div class='ctx'> 	/* Search direction top -&gt; down ? */</div><div class='ctx'> 	if (td-&gt;options &amp; NAND_BBT_LASTBLOCK) {</div><div class='del'>-		startblock = (mtd-&gt;size &gt;&gt; this-&gt;bbt_erase_shift) -1;</div><div class='add'>+		startblock = (mtd-&gt;size &gt;&gt; this-&gt;bbt_erase_shift) - 1;</div><div class='ctx'> 		dir = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		startblock = 0;</div><div class='hunk'>@@ -415,13 +496,16 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'> 		td-&gt;pages[i] = -1;</div><div class='ctx'> 		/* Scan the maximum number of blocks */</div><div class='ctx'> 		for (block = 0; block &lt; td-&gt;maxblocks; block++) {</div><div class='add'>+</div><div class='ctx'> 			int actblock = startblock + dir * block;</div><div class='add'>+			loff_t offs = actblock &lt;&lt; this-&gt;bbt_erase_shift;</div><div class='add'>+</div><div class='ctx'> 			/* Read first page */</div><div class='del'>-			nand_read_raw (mtd, buf, actblock &lt;&lt; this-&gt;bbt_erase_shift, mtd-&gt;oobblock, mtd-&gt;oobsize);</div><div class='del'>-			if (!check_pattern(buf, scanlen, mtd-&gt;oobblock, td)) {</div><div class='del'>-				td-&gt;pages[i] = actblock &lt;&lt; (this-&gt;bbt_erase_shift - this-&gt;page_shift);</div><div class='add'>+			scan_read_raw(mtd, buf, offs, mtd-&gt;writesize);</div><div class='add'>+			if (!check_pattern(buf, scanlen, mtd-&gt;writesize, td)) {</div><div class='add'>+				td-&gt;pages[i] = actblock &lt;&lt; blocktopage;</div><div class='ctx'> 				if (td-&gt;options &amp; NAND_BBT_VERSION) {</div><div class='del'>-					td-&gt;version[i] = buf[mtd-&gt;oobblock + td-&gt;veroffs];</div><div class='add'>+					td-&gt;version[i] = buf[mtd-&gt;writesize + td-&gt;veroffs];</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -431,9 +515,10 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'> 	/* Check, if we found a bbt for each requested chip */</div><div class='ctx'> 	for (i = 0; i &lt; chips; i++) {</div><div class='ctx'> 		if (td-&gt;pages[i] == -1)</div><div class='del'>-			printk (KERN_WARNING "Bad block table not found for chip %d\n", i);</div><div class='add'>+			printk(KERN_WARNING "Bad block table not found for chip %d\n", i);</div><div class='ctx'> 		else</div><div class='del'>-			printk (KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td-&gt;pages[i], td-&gt;version[i]);</div><div class='add'>+			printk(KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td-&gt;pages[i],</div><div class='add'>+			       td-&gt;version[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -447,21 +532,19 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'>  *</div><div class='ctx'>  * Search and read the bad block table(s)</div><div class='ctx'> */</div><div class='del'>-static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf,</div><div class='del'>-	struct nand_bbt_descr *td, struct nand_bbt_descr *md)</div><div class='add'>+static int search_read_bbts(struct mtd_info *mtd, uint8_t * buf, struct nand_bbt_descr *td, struct nand_bbt_descr *md)</div><div class='ctx'> {</div><div class='ctx'> 	/* Search the primary table */</div><div class='del'>-	search_bbt (mtd, buf, td);</div><div class='add'>+	search_bbt(mtd, buf, td);</div><div class='ctx'> </div><div class='ctx'> 	/* Search the mirror table */</div><div class='ctx'> 	if (md)</div><div class='del'>-		search_bbt (mtd, buf, md);</div><div class='add'>+		search_bbt(mtd, buf, md);</div><div class='ctx'> </div><div class='ctx'> 	/* Force result check */</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * write_bbt - [GENERIC] (Re)write the bad block table</div><div class='ctx'>  *</div><div class='hunk'>@@ -474,25 +557,31 @@ static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf,</div><div class='ctx'>  * (Re)write the bad block table</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-static int write_bbt (struct mtd_info *mtd, uint8_t *buf,</div><div class='del'>-	struct nand_bbt_descr *td, struct nand_bbt_descr *md, int chipsel)</div><div class='add'>+static int write_bbt(struct mtd_info *mtd, uint8_t *buf,</div><div class='add'>+		     struct nand_bbt_descr *td, struct nand_bbt_descr *md,</div><div class='add'>+		     int chipsel)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	struct nand_oobinfo oobinfo;</div><div class='ctx'> 	struct erase_info einfo;</div><div class='ctx'> 	int i, j, res, chip = 0;</div><div class='ctx'> 	int bits, startblock, dir, page, offs, numblocks, sft, sftmsk;</div><div class='del'>-	int nrchips, bbtoffs, pageoffs;</div><div class='add'>+	int nrchips, bbtoffs, pageoffs, ooboffs;</div><div class='ctx'> 	uint8_t msk[4];</div><div class='ctx'> 	uint8_t rcode = td-&gt;reserved_block_code;</div><div class='ctx'> 	size_t retlen, len = 0;</div><div class='ctx'> 	loff_t to;</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+	ops.ooblen = mtd-&gt;oobsize;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='ctx'> </div><div class='ctx'> 	if (!rcode)</div><div class='ctx'> 		rcode = 0xff;</div><div class='ctx'> 	/* Write bad block table per chip rather than per device ? */</div><div class='ctx'> 	if (td-&gt;options &amp; NAND_BBT_PERCHIP) {</div><div class='del'>-		numblocks = (int) (this-&gt;chipsize &gt;&gt; this-&gt;bbt_erase_shift);</div><div class='add'>+		numblocks = (int)(this-&gt;chipsize &gt;&gt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 		/* Full device write or specific chip ? */</div><div class='ctx'> 		if (chipsel == -1) {</div><div class='ctx'> 			nrchips = this-&gt;numchips;</div><div class='hunk'>@@ -501,7 +590,7 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,</div><div class='ctx'> 			chip = chipsel;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		numblocks = (int) (mtd-&gt;size &gt;&gt; this-&gt;bbt_erase_shift);</div><div class='add'>+		numblocks = (int)(mtd-&gt;size &gt;&gt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 		nrchips = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -530,27 +619,38 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,</div><div class='ctx'> 		for (i = 0; i &lt; td-&gt;maxblocks; i++) {</div><div class='ctx'> 			int block = startblock + dir * i;</div><div class='ctx'> 			/* Check, if the block is bad */</div><div class='del'>-			switch ((this-&gt;bbt[block &gt;&gt; 2] &gt;&gt; (2 * (block &amp; 0x03))) &amp; 0x03) {</div><div class='add'>+			switch ((this-&gt;bbt[block &gt;&gt; 2] &gt;&gt;</div><div class='add'>+				 (2 * (block &amp; 0x03))) &amp; 0x03) {</div><div class='ctx'> 			case 0x01:</div><div class='ctx'> 			case 0x03:</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			page = block &lt;&lt; (this-&gt;bbt_erase_shift - this-&gt;page_shift);</div><div class='add'>+			page = block &lt;&lt;</div><div class='add'>+				(this-&gt;bbt_erase_shift - this-&gt;page_shift);</div><div class='ctx'> 			/* Check, if the block is used by the mirror table */</div><div class='ctx'> 			if (!md || md-&gt;pages[chip] != page)</div><div class='ctx'> 				goto write;</div><div class='ctx'> 		}</div><div class='del'>-		printk (KERN_ERR "No space left to write bad block table\n");</div><div class='add'>+		printk(KERN_ERR "No space left to write bad block table\n");</div><div class='ctx'> 		return -ENOSPC;</div><div class='del'>-write:</div><div class='add'>+	write:</div><div class='ctx'> </div><div class='ctx'> 		/* Set up shift count and masks for the flash table */</div><div class='ctx'> 		bits = td-&gt;options &amp; NAND_BBT_NRBITS_MSK;</div><div class='add'>+		msk[2] = ~rcode;</div><div class='ctx'> 		switch (bits) {</div><div class='del'>-		case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x01; break;</div><div class='del'>-		case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x03; break;</div><div class='del'>-		case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C; msk[2] = ~rcode; msk[3] = 0x0f; break;</div><div class='del'>-		case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F; msk[2] = ~rcode; msk[3] = 0xff; break;</div><div class='add'>+		case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01;</div><div class='add'>+			msk[3] = 0x01;</div><div class='add'>+			break;</div><div class='add'>+		case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01;</div><div class='add'>+			msk[3] = 0x03;</div><div class='add'>+			break;</div><div class='add'>+		case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C;</div><div class='add'>+			msk[3] = 0x0f;</div><div class='add'>+			break;</div><div class='add'>+		case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F;</div><div class='add'>+			msk[3] = 0xff;</div><div class='add'>+			break;</div><div class='ctx'> 		default: return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -558,82 +658,92 @@ write:</div><div class='ctx'> </div><div class='ctx'> 		to = ((loff_t) page) &lt;&lt; this-&gt;page_shift;</div><div class='ctx'> </div><div class='del'>-		memcpy (&amp;oobinfo, this-&gt;autooob, sizeof(oobinfo));</div><div class='del'>-		oobinfo.useecc = MTD_NANDECC_PLACEONLY;</div><div class='del'>-</div><div class='ctx'> 		/* Must we save the block contents ? */</div><div class='ctx'> 		if (td-&gt;options &amp; NAND_BBT_SAVECONTENT) {</div><div class='ctx'> 			/* Make it block aligned */</div><div class='ctx'> 			to &amp;= ~((loff_t) ((1 &lt;&lt; this-&gt;bbt_erase_shift) - 1));</div><div class='ctx'> 			len = 1 &lt;&lt; this-&gt;bbt_erase_shift;</div><div class='del'>-			res = mtd-&gt;read_ecc (mtd, to, len, &amp;retlen, buf, &amp;buf[len], &amp;oobinfo);</div><div class='add'>+			res = mtd-&gt;read(mtd, to, len, &amp;retlen, buf);</div><div class='ctx'> 			if (res &lt; 0) {</div><div class='ctx'> 				if (retlen != len) {</div><div class='del'>-					printk (KERN_INFO "nand_bbt: Error reading block for writing the bad block table\n");</div><div class='add'>+					printk(KERN_INFO "nand_bbt: Error "</div><div class='add'>+					       "reading block for writing "</div><div class='add'>+					       "the bad block table\n");</div><div class='ctx'> 					return res;</div><div class='ctx'> 				}</div><div class='del'>-				printk (KERN_WARNING "nand_bbt: ECC error while reading block for writing bad block table\n");</div><div class='add'>+				printk(KERN_WARNING "nand_bbt: ECC error "</div><div class='add'>+				       "while reading block for writing "</div><div class='add'>+				       "bad block table\n");</div><div class='ctx'> 			}</div><div class='add'>+			/* Read oob data */</div><div class='add'>+			ops.len = (len &gt;&gt; this-&gt;page_shift) * mtd-&gt;oobsize;</div><div class='add'>+			ops.oobbuf = &amp;buf[len];</div><div class='add'>+			res = mtd-&gt;read_oob(mtd, to + mtd-&gt;writesize, &amp;ops);</div><div class='add'>+			if (res &lt; 0 || ops.retlen != ops.len)</div><div class='add'>+				goto outerr;</div><div class='add'>+</div><div class='ctx'> 			/* Calc the byte offset in the buffer */</div><div class='ctx'> 			pageoffs = page - (int)(to &gt;&gt; this-&gt;page_shift);</div><div class='ctx'> 			offs = pageoffs &lt;&lt; this-&gt;page_shift;</div><div class='ctx'> 			/* Preset the bbt area with 0xff */</div><div class='del'>-			memset (&amp;buf[offs], 0xff, (size_t)(numblocks &gt;&gt; sft));</div><div class='del'>-			/* Preset the bbt's oob area with 0xff */</div><div class='del'>-			memset (&amp;buf[len + pageoffs * mtd-&gt;oobsize], 0xff,</div><div class='del'>-				((len &gt;&gt; this-&gt;page_shift) - pageoffs) * mtd-&gt;oobsize);</div><div class='del'>-			if (td-&gt;options &amp; NAND_BBT_VERSION) {</div><div class='del'>-				buf[len + (pageoffs * mtd-&gt;oobsize) + td-&gt;veroffs] = td-&gt;version[chip];</div><div class='del'>-			}</div><div class='add'>+			memset(&amp;buf[offs], 0xff, (size_t) (numblocks &gt;&gt; sft));</div><div class='add'>+			ooboffs = len + (pageoffs * mtd-&gt;oobsize);</div><div class='add'>+</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Calc length */</div><div class='ctx'> 			len = (size_t) (numblocks &gt;&gt; sft);</div><div class='ctx'> 			/* Make it page aligned ! */</div><div class='del'>-			len = (len + (mtd-&gt;oobblock-1)) &amp; ~(mtd-&gt;oobblock-1);</div><div class='add'>+			len = (len + (mtd-&gt;writesize - 1)) &amp;</div><div class='add'>+				~(mtd-&gt;writesize - 1);</div><div class='ctx'> 			/* Preset the buffer with 0xff */</div><div class='del'>-			memset (buf, 0xff, len + (len &gt;&gt; this-&gt;page_shift) * mtd-&gt;oobsize);</div><div class='add'>+			memset(buf, 0xff, len +</div><div class='add'>+			       (len &gt;&gt; this-&gt;page_shift)* mtd-&gt;oobsize);</div><div class='ctx'> 			offs = 0;</div><div class='add'>+			ooboffs = len;</div><div class='ctx'> 			/* Pattern is located in oob area of first page */</div><div class='del'>-			memcpy (&amp;buf[len + td-&gt;offs], td-&gt;pattern, td-&gt;len);</div><div class='del'>-			if (td-&gt;options &amp; NAND_BBT_VERSION) {</div><div class='del'>-				buf[len + td-&gt;veroffs] = td-&gt;version[chip];</div><div class='del'>-			}</div><div class='add'>+			memcpy(&amp;buf[ooboffs + td-&gt;offs], td-&gt;pattern, td-&gt;len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (td-&gt;options &amp; NAND_BBT_VERSION)</div><div class='add'>+			buf[ooboffs + td-&gt;veroffs] = td-&gt;version[chip];</div><div class='add'>+</div><div class='ctx'> 		/* walk through the memory table */</div><div class='del'>-		for (i = 0; i &lt; numblocks; ) {</div><div class='add'>+		for (i = 0; i &lt; numblocks;) {</div><div class='ctx'> 			uint8_t dat;</div><div class='ctx'> 			dat = this-&gt;bbt[bbtoffs + (i &gt;&gt; 2)];</div><div class='del'>-			for (j = 0; j &lt; 4; j++ , i++) {</div><div class='add'>+			for (j = 0; j &lt; 4; j++, i++) {</div><div class='ctx'> 				int sftcnt = (i &lt;&lt; (3 - sft)) &amp; sftmsk;</div><div class='ctx'> 				/* Do not store the reserved bbt blocks ! */</div><div class='del'>-				buf[offs + (i &gt;&gt; sft)] &amp;= ~(msk[dat &amp; 0x03] &lt;&lt; sftcnt);</div><div class='add'>+				buf[offs + (i &gt;&gt; sft)] &amp;=</div><div class='add'>+					~(msk[dat &amp; 0x03] &lt;&lt; sftcnt);</div><div class='ctx'> 				dat &gt;&gt;= 2;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memset (&amp;einfo, 0, sizeof (einfo));</div><div class='add'>+		memset(&amp;einfo, 0, sizeof(einfo));</div><div class='ctx'> 		einfo.mtd = mtd;</div><div class='del'>-		einfo.addr = (unsigned long) to;</div><div class='add'>+		einfo.addr = (unsigned long)to;</div><div class='ctx'> 		einfo.len = 1 &lt;&lt; this-&gt;bbt_erase_shift;</div><div class='del'>-		res = nand_erase_nand (mtd, &amp;einfo, 1);</div><div class='del'>-		if (res &lt; 0) {</div><div class='del'>-			printk (KERN_WARNING "nand_bbt: Error during block erase: %d\n", res);</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='add'>+		res = nand_erase_nand(mtd, &amp;einfo, 1);</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			goto outerr;</div><div class='ctx'> </div><div class='del'>-		res = mtd-&gt;write_ecc (mtd, to, len, &amp;retlen, buf, &amp;buf[len], &amp;oobinfo);</div><div class='del'>-		if (res &lt; 0) {</div><div class='del'>-			printk (KERN_WARNING "nand_bbt: Error while writing bad block table %d\n", res);</div><div class='del'>-			return res;</div><div class='del'>-		}</div><div class='del'>-		printk (KERN_DEBUG "Bad block table written to 0x%08x, version 0x%02X\n",</div><div class='del'>-			(unsigned int) to, td-&gt;version[chip]);</div><div class='add'>+		res = scan_write_bbt(mtd, to, len, buf, &amp;buf[len]);</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			goto outerr;</div><div class='add'>+</div><div class='add'>+		printk(KERN_DEBUG "Bad block table written to 0x%08x, version "</div><div class='add'>+		       "0x%02X\n", (unsigned int)to, td-&gt;version[chip]);</div><div class='ctx'> </div><div class='ctx'> 		/* Mark it as used */</div><div class='ctx'> 		td-&gt;pages[chip] = page;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ outerr:</div><div class='add'>+	printk(KERN_WARNING</div><div class='add'>+	       "nand_bbt: Error while writing bad block table %d\n", res);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -644,27 +754,27 @@ write:</div><div class='ctx'>  * The function creates a memory based bbt by scanning the device</div><div class='ctx'>  * for manufacturer / software marked good / bad blocks</div><div class='ctx'> */</div><div class='del'>-static inline int nand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='add'>+static inline int nand_memory_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	bd-&gt;options &amp;= ~NAND_BBT_SCANEMPTY;</div><div class='del'>-	return create_bbt (mtd, this-&gt;data_buf, bd, -1);</div><div class='add'>+	return create_bbt(mtd, this-&gt;buffers.databuf, bd, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * check_create - [GENERIC] create and write bbt(s) if neccecary</div><div class='add'>+ * check_create - [GENERIC] create and write bbt(s) if necessary</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='ctx'>  * @buf:	temporary buffer</div><div class='ctx'>  * @bd:		descriptor for the good/bad block search pattern</div><div class='ctx'>  *</div><div class='ctx'>  * The function checks the results of the previous call to read_bbt</div><div class='del'>- * and creates / updates the bbt(s) if neccecary</div><div class='del'>- * Creation is neccecary if no bbt was found for the chip/device</div><div class='del'>- * Update is neccecary if one of the tables is missing or the</div><div class='add'>+ * and creates / updates the bbt(s) if necessary</div><div class='add'>+ * Creation is necessary if no bbt was found for the chip/device</div><div class='add'>+ * Update is necessary if one of the tables is missing or the</div><div class='ctx'>  * version nr. of one table is less than the other</div><div class='ctx'> */</div><div class='del'>-static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd)</div><div class='add'>+static int check_create(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd)</div><div class='ctx'> {</div><div class='ctx'> 	int i, chips, writeops, chipsel, res;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='hunk'>@@ -732,35 +842,35 @@ static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des</div><div class='ctx'> 			rd = td;</div><div class='ctx'> 			goto writecheck;</div><div class='ctx'> 		}</div><div class='del'>-create:</div><div class='add'>+	create:</div><div class='ctx'> 		/* Create the bad block table by scanning the device ? */</div><div class='ctx'> 		if (!(td-&gt;options &amp; NAND_BBT_CREATE))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Create the table in memory by scanning the chip(s) */</div><div class='del'>-		create_bbt (mtd, buf, bd, chipsel);</div><div class='add'>+		create_bbt(mtd, buf, bd, chipsel);</div><div class='ctx'> </div><div class='ctx'> 		td-&gt;version[i] = 1;</div><div class='ctx'> 		if (md)</div><div class='ctx'> 			md-&gt;version[i] = 1;</div><div class='del'>-writecheck:</div><div class='add'>+	writecheck:</div><div class='ctx'> 		/* read back first ? */</div><div class='ctx'> 		if (rd)</div><div class='del'>-			read_abs_bbt (mtd, buf, rd, chipsel);</div><div class='add'>+			read_abs_bbt(mtd, buf, rd, chipsel);</div><div class='ctx'> 		/* If they weren't versioned, read both. */</div><div class='ctx'> 		if (rd2)</div><div class='del'>-			read_abs_bbt (mtd, buf, rd2, chipsel);</div><div class='add'>+			read_abs_bbt(mtd, buf, rd2, chipsel);</div><div class='ctx'> </div><div class='ctx'> 		/* Write the bad block table to the device ? */</div><div class='ctx'> 		if ((writeops &amp; 0x01) &amp;&amp; (td-&gt;options &amp; NAND_BBT_WRITE)) {</div><div class='del'>-			res = write_bbt (mtd, buf, td, md, chipsel);</div><div class='add'>+			res = write_bbt(mtd, buf, td, md, chipsel);</div><div class='ctx'> 			if (res &lt; 0)</div><div class='ctx'> 				return res;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Write the mirror bad block table to the device ? */</div><div class='ctx'> 		if ((writeops &amp; 0x02) &amp;&amp; md &amp;&amp; (md-&gt;options &amp; NAND_BBT_WRITE)) {</div><div class='del'>-			res = write_bbt (mtd, buf, md, td, chipsel);</div><div class='add'>+			res = write_bbt(mtd, buf, md, td, chipsel);</div><div class='ctx'> 			if (res &lt; 0)</div><div class='ctx'> 				return res;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -777,7 +887,7 @@ writecheck:</div><div class='ctx'>  * accidental erasures / writes. The regions are identified by</div><div class='ctx'>  * the mark 0x02.</div><div class='ctx'> */</div><div class='del'>-static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)</div><div class='add'>+static void mark_bbt_region(struct mtd_info *mtd, struct nand_bbt_descr *td)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int i, j, chips, block, nrblocks, update;</div><div class='hunk'>@@ -795,7 +905,8 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)</div><div class='ctx'> 	for (i = 0; i &lt; chips; i++) {</div><div class='ctx'> 		if ((td-&gt;options &amp; NAND_BBT_ABSPAGE) ||</div><div class='ctx'> 		    !(td-&gt;options &amp; NAND_BBT_WRITE)) {</div><div class='del'>-		    	if (td-&gt;pages[i] == -1) continue;</div><div class='add'>+			if (td-&gt;pages[i] == -1)</div><div class='add'>+				continue;</div><div class='ctx'> 			block = td-&gt;pages[i] &gt;&gt; (this-&gt;bbt_erase_shift - this-&gt;page_shift);</div><div class='ctx'> 			block &lt;&lt;= 1;</div><div class='ctx'> 			oldval = this-&gt;bbt[(block &gt;&gt; 3)];</div><div class='hunk'>@@ -815,7 +926,8 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)</div><div class='ctx'> 			oldval = this-&gt;bbt[(block &gt;&gt; 3)];</div><div class='ctx'> 			newval = oldval | (0x2 &lt;&lt; (block &amp; 0x06));</div><div class='ctx'> 			this-&gt;bbt[(block &gt;&gt; 3)] = newval;</div><div class='del'>-			if (oldval != newval) update = 1;</div><div class='add'>+			if (oldval != newval)</div><div class='add'>+				update = 1;</div><div class='ctx'> 			block += 2;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* If we want reserved blocks to be recorded to flash, and some</div><div class='hunk'>@@ -840,7 +952,7 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)</div><div class='ctx'>  * by calling the nand_free_bbt function.</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='add'>+int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int len, res = 0;</div><div class='hunk'>@@ -850,21 +962,21 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='ctx'> </div><div class='ctx'> 	len = mtd-&gt;size &gt;&gt; (this-&gt;bbt_erase_shift + 2);</div><div class='ctx'> 	/* Allocate memory (2bit per block) */</div><div class='del'>-	this-&gt;bbt = kmalloc (len, GFP_KERNEL);</div><div class='add'>+	this-&gt;bbt = kmalloc(len, GFP_KERNEL);</div><div class='ctx'> 	if (!this-&gt;bbt) {</div><div class='del'>-		printk (KERN_ERR "nand_scan_bbt: Out of memory\n");</div><div class='add'>+		printk(KERN_ERR "nand_scan_bbt: Out of memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear the memory bad block table */</div><div class='del'>-	memset (this-&gt;bbt, 0x00, len);</div><div class='add'>+	memset(this-&gt;bbt, 0x00, len);</div><div class='ctx'> </div><div class='ctx'> 	/* If no primary table decriptor is given, scan the device</div><div class='ctx'> 	 * to build a memory based bad block table</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!td) {</div><div class='ctx'> 		if ((res = nand_memory_bbt(mtd, bd))) {</div><div class='del'>-			printk (KERN_ERR "nand_bbt: Can't scan flash and build the RAM-based BBT\n");</div><div class='del'>-			kfree (this-&gt;bbt);</div><div class='add'>+			printk(KERN_ERR "nand_bbt: Can't scan flash and build the RAM-based BBT\n");</div><div class='add'>+			kfree(this-&gt;bbt);</div><div class='ctx'> 			this-&gt;bbt = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		return res;</div><div class='hunk'>@@ -873,35 +985,34 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='ctx'> 	/* Allocate a temporary buffer for one eraseblock incl. oob */</div><div class='ctx'> 	len = (1 &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 	len += (len &gt;&gt; this-&gt;page_shift) * mtd-&gt;oobsize;</div><div class='del'>-	buf = kmalloc (len, GFP_KERNEL);</div><div class='add'>+	buf = vmalloc(len);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		printk (KERN_ERR "nand_bbt: Out of memory\n");</div><div class='del'>-		kfree (this-&gt;bbt);</div><div class='add'>+		printk(KERN_ERR "nand_bbt: Out of memory\n");</div><div class='add'>+		kfree(this-&gt;bbt);</div><div class='ctx'> 		this-&gt;bbt = NULL;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Is the bbt at a given page ? */</div><div class='ctx'> 	if (td-&gt;options &amp; NAND_BBT_ABSPAGE) {</div><div class='del'>-		res = read_abs_bbts (mtd, buf, td, md);</div><div class='add'>+		res = read_abs_bbts(mtd, buf, td, md);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Search the bad block table using a pattern in oob */</div><div class='del'>-		res = search_read_bbts (mtd, buf, td, md);</div><div class='add'>+		res = search_read_bbts(mtd, buf, td, md);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (res)</div><div class='del'>-		res = check_create (mtd, buf, bd);</div><div class='add'>+		res = check_create(mtd, buf, bd);</div><div class='ctx'> </div><div class='ctx'> 	/* Prevent the bbt regions from erasing / writing */</div><div class='del'>-	mark_bbt_region (mtd, td);</div><div class='add'>+	mark_bbt_region(mtd, td);</div><div class='ctx'> 	if (md)</div><div class='del'>-		mark_bbt_region (mtd, md);</div><div class='add'>+		mark_bbt_region(mtd, md);</div><div class='ctx'> </div><div class='del'>-	kfree (buf);</div><div class='add'>+	vfree(buf);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nand_update_bbt - [NAND Interface] update bad block table(s)</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -909,7 +1020,7 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)</div><div class='ctx'>  *</div><div class='ctx'>  * The function updates the bad block table(s)</div><div class='ctx'> */</div><div class='del'>-int nand_update_bbt (struct mtd_info *mtd, loff_t offs)</div><div class='add'>+int nand_update_bbt(struct mtd_info *mtd, loff_t offs)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int len, res = 0, writeops = 0;</div><div class='hunk'>@@ -925,9 +1036,9 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)</div><div class='ctx'> 	/* Allocate a temporary buffer for one eraseblock incl. oob */</div><div class='ctx'> 	len = (1 &lt;&lt; this-&gt;bbt_erase_shift);</div><div class='ctx'> 	len += (len &gt;&gt; this-&gt;page_shift) * mtd-&gt;oobsize;</div><div class='del'>-	buf = kmalloc (len, GFP_KERNEL);</div><div class='add'>+	buf = kmalloc(len, GFP_KERNEL);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		printk (KERN_ERR "nand_update_bbt: Out of memory\n");</div><div class='add'>+		printk(KERN_ERR "nand_update_bbt: Out of memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -935,7 +1046,7 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)</div><div class='ctx'> </div><div class='ctx'> 	/* Do we have a bbt per chip ? */</div><div class='ctx'> 	if (td-&gt;options &amp; NAND_BBT_PERCHIP) {</div><div class='del'>-		chip = (int) (offs &gt;&gt; this-&gt;chip_shift);</div><div class='add'>+		chip = (int)(offs &gt;&gt; this-&gt;chip_shift);</div><div class='ctx'> 		chipsel = chip;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		chip = 0;</div><div class='hunk'>@@ -948,17 +1059,17 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)</div><div class='ctx'> </div><div class='ctx'> 	/* Write the bad block table to the device ? */</div><div class='ctx'> 	if ((writeops &amp; 0x01) &amp;&amp; (td-&gt;options &amp; NAND_BBT_WRITE)) {</div><div class='del'>-		res = write_bbt (mtd, buf, td, md, chipsel);</div><div class='add'>+		res = write_bbt(mtd, buf, td, md, chipsel);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Write the mirror bad block table to the device ? */</div><div class='ctx'> 	if ((writeops &amp; 0x02) &amp;&amp; md &amp;&amp; (md-&gt;options &amp; NAND_BBT_WRITE)) {</div><div class='del'>-		res = write_bbt (mtd, buf, md, td, chipsel);</div><div class='add'>+		res = write_bbt(mtd, buf, md, td, chipsel);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	kfree (buf);</div><div class='add'>+ out:</div><div class='add'>+	kfree(buf);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -981,14 +1092,14 @@ static struct nand_bbt_descr largepage_memorybased = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nand_bbt_descr smallpage_flashbased = {</div><div class='del'>-	.options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,</div><div class='add'>+	.options = NAND_BBT_SCAN2NDPAGE,</div><div class='ctx'> 	.offs = 5,</div><div class='ctx'> 	.len = 1,</div><div class='ctx'> 	.pattern = scan_ff_pattern</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct nand_bbt_descr largepage_flashbased = {</div><div class='del'>-	.options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,</div><div class='add'>+	.options = NAND_BBT_SCAN2NDPAGE,</div><div class='ctx'> 	.offs = 0,</div><div class='ctx'> 	.len = 2,</div><div class='ctx'> 	.pattern = scan_ff_pattern</div><div class='hunk'>@@ -1036,7 +1147,7 @@ static struct nand_bbt_descr bbt_mirror_descr = {</div><div class='ctx'>  * support for the device and calls the nand_scan_bbt function</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-int nand_default_bbt (struct mtd_info *mtd)</div><div class='add'>+int nand_default_bbt(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1046,7 +1157,7 @@ int nand_default_bbt (struct mtd_info *mtd)</div><div class='ctx'> 	 * of the good / bad information, so we _must_ store</div><div class='ctx'> 	 * this information in a good / bad table during</div><div class='ctx'> 	 * startup</div><div class='del'>-	*/</div><div class='add'>+	 */</div><div class='ctx'> 	if (this-&gt;options &amp; NAND_IS_AND) {</div><div class='ctx'> 		/* Use the default pattern descriptors */</div><div class='ctx'> 		if (!this-&gt;bbt_td) {</div><div class='hunk'>@@ -1054,10 +1165,9 @@ int nand_default_bbt (struct mtd_info *mtd)</div><div class='ctx'> 			this-&gt;bbt_md = &amp;bbt_mirror_descr;</div><div class='ctx'> 		}</div><div class='ctx'> 		this-&gt;options |= NAND_USE_FLASH_BBT;</div><div class='del'>-		return nand_scan_bbt (mtd, &amp;agand_flashbased);</div><div class='add'>+		return nand_scan_bbt(mtd, &amp;agand_flashbased);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* Is a flash based bad block table requested ? */</div><div class='ctx'> 	if (this-&gt;options &amp; NAND_USE_FLASH_BBT) {</div><div class='ctx'> 		/* Use the default pattern descriptors */</div><div class='hunk'>@@ -1066,18 +1176,17 @@ int nand_default_bbt (struct mtd_info *mtd)</div><div class='ctx'> 			this-&gt;bbt_md = &amp;bbt_mirror_descr;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!this-&gt;badblock_pattern) {</div><div class='del'>-			this-&gt;badblock_pattern = (mtd-&gt;oobblock &gt; 512) ?</div><div class='del'>-				&amp;largepage_flashbased : &amp;smallpage_flashbased;</div><div class='add'>+			this-&gt;badblock_pattern = (mtd-&gt;writesize &gt; 512) ? &amp;largepage_flashbased : &amp;smallpage_flashbased;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		this-&gt;bbt_td = NULL;</div><div class='ctx'> 		this-&gt;bbt_md = NULL;</div><div class='ctx'> 		if (!this-&gt;badblock_pattern) {</div><div class='del'>-			this-&gt;badblock_pattern = (mtd-&gt;oobblock &gt; 512) ?</div><div class='del'>-				&amp;largepage_memorybased : &amp;smallpage_memorybased;</div><div class='add'>+			this-&gt;badblock_pattern = (mtd-&gt;writesize &gt; 512) ?</div><div class='add'>+			    &amp;largepage_memorybased : &amp;smallpage_memorybased;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return nand_scan_bbt (mtd, this-&gt;badblock_pattern);</div><div class='add'>+	return nand_scan_bbt(mtd, this-&gt;badblock_pattern);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1087,26 +1196,29 @@ int nand_default_bbt (struct mtd_info *mtd)</div><div class='ctx'>  * @allowbbt:	allow access to bad block table region</div><div class='ctx'>  *</div><div class='ctx'> */</div><div class='del'>-int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt)</div><div class='add'>+int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int block;</div><div class='del'>-	uint8_t	res;</div><div class='add'>+	uint8_t res;</div><div class='ctx'> </div><div class='ctx'> 	/* Get block number * 2 */</div><div class='del'>-	block = (int) (offs &gt;&gt; (this-&gt;bbt_erase_shift - 1));</div><div class='add'>+	block = (int)(offs &gt;&gt; (this-&gt;bbt_erase_shift - 1));</div><div class='ctx'> 	res = (this-&gt;bbt[block &gt;&gt; 3] &gt;&gt; (block &amp; 0x06)) &amp; 0x03;</div><div class='ctx'> </div><div class='del'>-	DEBUG (MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",</div><div class='del'>-		(unsigned int)offs, block &gt;&gt; 1, res);</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",</div><div class='add'>+	      (unsigned int)offs, block &gt;&gt; 1, res);</div><div class='ctx'> </div><div class='ctx'> 	switch ((int)res) {</div><div class='del'>-	case 0x00:	return 0;</div><div class='del'>-	case 0x01:	return 1;</div><div class='del'>-	case 0x02:	return allowbbt ? 0 : 1;</div><div class='add'>+	case 0x00:</div><div class='add'>+		return 0;</div><div class='add'>+	case 0x01:</div><div class='add'>+		return 1;</div><div class='add'>+	case 0x02:</div><div class='add'>+		return allowbbt ? 0 : 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL (nand_scan_bbt);</div><div class='del'>-EXPORT_SYMBOL (nand_default_bbt);</div><div class='add'>+EXPORT_SYMBOL(nand_scan_bbt);</div><div class='add'>+EXPORT_SYMBOL(nand_default_bbt);</div><div class='head'>diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c<br/>index 40ac909150a3..dd438ca47d9a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_ecc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_ecc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_ecc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/nand_ecc.c</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'>  * Copyright (C) 2000-2004 Steven J. Hill (sjhill@realitydiluted.com)</div><div class='ctx'>  *                         Toshiba America Electronics Components, Inc.</div><div class='ctx'>  *</div><div class='add'>+ * Copyright (C) 2006 Thomas Gleixner &lt;tglx@linutronix.de&gt;</div><div class='add'>+ *</div><div class='ctx'>  * $Id: nand_ecc.c,v 1.15 2005/11/07 11:14:30 gleixner Exp $</div><div class='ctx'>  *</div><div class='ctx'>  * This file is free software; you can redistribute it and/or modify it</div><div class='hunk'>@@ -62,90 +64,75 @@ static const u_char nand_ecc_precalc_table[] = {</div><div class='ctx'> 	0x00, 0x55, 0x56, 0x03, 0x59, 0x0c, 0x0f, 0x5a, 0x5a, 0x0f, 0x0c, 0x59, 0x03, 0x56, 0x55, 0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='del'>- * nand_trans_result - [GENERIC] create non-inverted ECC</div><div class='del'>- * @reg2:	line parity reg 2</div><div class='del'>- * @reg3:	line parity reg 3</div><div class='del'>- * @ecc_code:	ecc</div><div class='del'>- *</div><div class='del'>- * Creates non-inverted ECC code from line parity</div><div class='del'>- */</div><div class='del'>-static void nand_trans_result(u_char reg2, u_char reg3,</div><div class='del'>-	u_char *ecc_code)</div><div class='del'>-{</div><div class='del'>-	u_char a, b, i, tmp1, tmp2;</div><div class='del'>-</div><div class='del'>-	/* Initialize variables */</div><div class='del'>-	a = b = 0x80;</div><div class='del'>-	tmp1 = tmp2 = 0;</div><div class='del'>-</div><div class='del'>-	/* Calculate first ECC byte */</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		if (reg3 &amp; a)		/* LP15,13,11,9 --&gt; ecc_code[0] */</div><div class='del'>-			tmp1 |= b;</div><div class='del'>-		b &gt;&gt;= 1;</div><div class='del'>-		if (reg2 &amp; a)		/* LP14,12,10,8 --&gt; ecc_code[0] */</div><div class='del'>-			tmp1 |= b;</div><div class='del'>-		b &gt;&gt;= 1;</div><div class='del'>-		a &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate second ECC byte */</div><div class='del'>-	b = 0x80;</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		if (reg3 &amp; a)		/* LP7,5,3,1 --&gt; ecc_code[1] */</div><div class='del'>-			tmp2 |= b;</div><div class='del'>-		b &gt;&gt;= 1;</div><div class='del'>-		if (reg2 &amp; a)		/* LP6,4,2,0 --&gt; ecc_code[1] */</div><div class='del'>-			tmp2 |= b;</div><div class='del'>-		b &gt;&gt;= 1;</div><div class='del'>-		a &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Store two of the ECC bytes */</div><div class='del'>-	ecc_code[0] = tmp1;</div><div class='del'>-	ecc_code[1] = tmp2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * nand_calculate_ecc - [NAND Interface] Calculate 3 byte ECC code for 256 byte block</div><div class='add'>+ * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256-byte block</div><div class='ctx'>  * @mtd:	MTD block structure</div><div class='ctx'>  * @dat:	raw data</div><div class='ctx'>  * @ecc_code:	buffer for ECC</div><div class='ctx'>  */</div><div class='del'>-int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)</div><div class='add'>+int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,</div><div class='add'>+		       u_char *ecc_code)</div><div class='ctx'> {</div><div class='del'>-	u_char idx, reg1, reg2, reg3;</div><div class='del'>-	int j;</div><div class='add'>+	uint8_t idx, reg1, reg2, reg3, tmp1, tmp2;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize variables */</div><div class='ctx'> 	reg1 = reg2 = reg3 = 0;</div><div class='del'>-	ecc_code[0] = ecc_code[1] = ecc_code[2] = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Build up column parity */</div><div class='del'>-	for(j = 0; j &lt; 256; j++) {</div><div class='del'>-</div><div class='add'>+	for(i = 0; i &lt; 256; i++) {</div><div class='ctx'> 		/* Get CP0 - CP5 from table */</div><div class='del'>-		idx = nand_ecc_precalc_table[dat[j]];</div><div class='add'>+		idx = nand_ecc_precalc_table[*dat++];</div><div class='ctx'> 		reg1 ^= (idx &amp; 0x3f);</div><div class='ctx'> </div><div class='ctx'> 		/* All bit XOR = 1 ? */</div><div class='ctx'> 		if (idx &amp; 0x40) {</div><div class='del'>-			reg3 ^= (u_char) j;</div><div class='del'>-			reg2 ^= ~((u_char) j);</div><div class='add'>+			reg3 ^= (uint8_t) i;</div><div class='add'>+			reg2 ^= ~((uint8_t) i);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create non-inverted ECC code from line parity */</div><div class='del'>-	nand_trans_result(reg2, reg3, ecc_code);</div><div class='add'>+	tmp1  = (reg3 &amp; 0x80) &gt;&gt; 0; /* B7 -&gt; B7 */</div><div class='add'>+	tmp1 |= (reg2 &amp; 0x80) &gt;&gt; 1; /* B7 -&gt; B6 */</div><div class='add'>+	tmp1 |= (reg3 &amp; 0x40) &gt;&gt; 1; /* B6 -&gt; B5 */</div><div class='add'>+	tmp1 |= (reg2 &amp; 0x40) &gt;&gt; 2; /* B6 -&gt; B4 */</div><div class='add'>+	tmp1 |= (reg3 &amp; 0x20) &gt;&gt; 2; /* B5 -&gt; B3 */</div><div class='add'>+	tmp1 |= (reg2 &amp; 0x20) &gt;&gt; 3; /* B5 -&gt; B2 */</div><div class='add'>+	tmp1 |= (reg3 &amp; 0x10) &gt;&gt; 3; /* B4 -&gt; B1 */</div><div class='add'>+	tmp1 |= (reg2 &amp; 0x10) &gt;&gt; 4; /* B4 -&gt; B0 */</div><div class='add'>+</div><div class='add'>+	tmp2  = (reg3 &amp; 0x08) &lt;&lt; 4; /* B3 -&gt; B7 */</div><div class='add'>+	tmp2 |= (reg2 &amp; 0x08) &lt;&lt; 3; /* B3 -&gt; B6 */</div><div class='add'>+	tmp2 |= (reg3 &amp; 0x04) &lt;&lt; 3; /* B2 -&gt; B5 */</div><div class='add'>+	tmp2 |= (reg2 &amp; 0x04) &lt;&lt; 2; /* B2 -&gt; B4 */</div><div class='add'>+	tmp2 |= (reg3 &amp; 0x02) &lt;&lt; 2; /* B1 -&gt; B3 */</div><div class='add'>+	tmp2 |= (reg2 &amp; 0x02) &lt;&lt; 1; /* B1 -&gt; B2 */</div><div class='add'>+	tmp2 |= (reg3 &amp; 0x01) &lt;&lt; 1; /* B0 -&gt; B1 */</div><div class='add'>+	tmp2 |= (reg2 &amp; 0x01) &lt;&lt; 0; /* B7 -&gt; B0 */</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate final ECC code */</div><div class='del'>-	ecc_code[0] = ~ecc_code[0];</div><div class='del'>-	ecc_code[1] = ~ecc_code[1];</div><div class='add'>+#ifdef CONFIG_NAND_ECC_SMC</div><div class='add'>+	ecc_code[0] = ~tmp2;</div><div class='add'>+	ecc_code[1] = ~tmp1;</div><div class='add'>+#else</div><div class='add'>+	ecc_code[0] = ~tmp1;</div><div class='add'>+	ecc_code[1] = ~tmp2;</div><div class='add'>+#endif</div><div class='ctx'> 	ecc_code[2] = ((~reg1) &lt;&lt; 2) | 0x03;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(nand_calculate_ecc);</div><div class='add'>+</div><div class='add'>+static inline int countbits(uint32_t byte)</div><div class='add'>+{</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	for (;byte; byte &gt;&gt;= 1)</div><div class='add'>+		res += byte &amp; 0x01;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nand_correct_data - [NAND Interface] Detect and correct bit error(s)</div><div class='hunk'>@@ -156,93 +143,54 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code</div><div class='ctx'>  *</div><div class='ctx'>  * Detect and correct a 1 bit error for 256 byte block</div><div class='ctx'>  */</div><div class='del'>-int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)</div><div class='add'>+int nand_correct_data(struct mtd_info *mtd, u_char *dat,</div><div class='add'>+		      u_char *read_ecc, u_char *calc_ecc)</div><div class='ctx'> {</div><div class='del'>-	u_char a, b, c, d1, d2, d3, add, bit, i;</div><div class='add'>+	uint8_t s0, s1, s2;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NAND_ECC_SMC</div><div class='add'>+	s0 = calc_ecc[0] ^ read_ecc[0];</div><div class='add'>+	s1 = calc_ecc[1] ^ read_ecc[1];</div><div class='add'>+	s2 = calc_ecc[2] ^ read_ecc[2];</div><div class='add'>+#else</div><div class='add'>+	s1 = calc_ecc[0] ^ read_ecc[0];</div><div class='add'>+	s0 = calc_ecc[1] ^ read_ecc[1];</div><div class='add'>+	s2 = calc_ecc[2] ^ read_ecc[2];</div><div class='add'>+#endif</div><div class='add'>+	if ((s0 | s1 | s2) == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	/* Do error detection */</div><div class='del'>-	d1 = calc_ecc[0] ^ read_ecc[0];</div><div class='del'>-	d2 = calc_ecc[1] ^ read_ecc[1];</div><div class='del'>-	d3 = calc_ecc[2] ^ read_ecc[2];</div><div class='add'>+	/* Check for a single bit error */</div><div class='add'>+	if( ((s0 ^ (s0 &gt;&gt; 1)) &amp; 0x55) == 0x55 &amp;&amp;</div><div class='add'>+	    ((s1 ^ (s1 &gt;&gt; 1)) &amp; 0x55) == 0x55 &amp;&amp;</div><div class='add'>+	    ((s2 ^ (s2 &gt;&gt; 1)) &amp; 0x54) == 0x54) {</div><div class='ctx'> </div><div class='del'>-	if ((d1 | d2 | d3) == 0) {</div><div class='del'>-		/* No errors */</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		a = (d1 ^ (d1 &gt;&gt; 1)) &amp; 0x55;</div><div class='del'>-		b = (d2 ^ (d2 &gt;&gt; 1)) &amp; 0x55;</div><div class='del'>-		c = (d3 ^ (d3 &gt;&gt; 1)) &amp; 0x54;</div><div class='del'>-</div><div class='del'>-		/* Found and will correct single bit error in the data */</div><div class='del'>-		if ((a == 0x55) &amp;&amp; (b == 0x55) &amp;&amp; (c == 0x54)) {</div><div class='del'>-			c = 0x80;</div><div class='del'>-			add = 0;</div><div class='del'>-			a = 0x80;</div><div class='del'>-			for (i=0; i&lt;4; i++) {</div><div class='del'>-				if (d1 &amp; c)</div><div class='del'>-					add |= a;</div><div class='del'>-				c &gt;&gt;= 2;</div><div class='del'>-				a &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-			c = 0x80;</div><div class='del'>-			for (i=0; i&lt;4; i++) {</div><div class='del'>-				if (d2 &amp; c)</div><div class='del'>-					add |= a;</div><div class='del'>-				c &gt;&gt;= 2;</div><div class='del'>-				a &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-			bit = 0;</div><div class='del'>-			b = 0x04;</div><div class='del'>-			c = 0x80;</div><div class='del'>-			for (i=0; i&lt;3; i++) {</div><div class='del'>-				if (d3 &amp; c)</div><div class='del'>-					bit |= b;</div><div class='del'>-				c &gt;&gt;= 2;</div><div class='del'>-				b &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-			b = 0x01;</div><div class='del'>-			a = dat[add];</div><div class='del'>-			a ^= (b &lt;&lt; bit);</div><div class='del'>-			dat[add] = a;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			i = 0;</div><div class='del'>-			while (d1) {</div><div class='del'>-				if (d1 &amp; 0x01)</div><div class='del'>-					++i;</div><div class='del'>-				d1 &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-			while (d2) {</div><div class='del'>-				if (d2 &amp; 0x01)</div><div class='del'>-					++i;</div><div class='del'>-				d2 &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-			while (d3) {</div><div class='del'>-				if (d3 &amp; 0x01)</div><div class='del'>-					++i;</div><div class='del'>-				d3 &gt;&gt;= 1;</div><div class='del'>-			}</div><div class='del'>-			if (i == 1) {</div><div class='del'>-				/* ECC Code Error Correction */</div><div class='del'>-				read_ecc[0] = calc_ecc[0];</div><div class='del'>-				read_ecc[1] = calc_ecc[1];</div><div class='del'>-				read_ecc[2] = calc_ecc[2];</div><div class='del'>-				return 2;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				/* Uncorrectable Error */</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		uint32_t byteoffs, bitnum;</div><div class='add'>+</div><div class='add'>+		byteoffs = (s1 &lt;&lt; 0) &amp; 0x80;</div><div class='add'>+		byteoffs |= (s1 &lt;&lt; 1) &amp; 0x40;</div><div class='add'>+		byteoffs |= (s1 &lt;&lt; 2) &amp; 0x20;</div><div class='add'>+		byteoffs |= (s1 &lt;&lt; 3) &amp; 0x10;</div><div class='add'>+</div><div class='add'>+		byteoffs |= (s0 &gt;&gt; 4) &amp; 0x08;</div><div class='add'>+		byteoffs |= (s0 &gt;&gt; 3) &amp; 0x04;</div><div class='add'>+		byteoffs |= (s0 &gt;&gt; 2) &amp; 0x02;</div><div class='add'>+		byteoffs |= (s0 &gt;&gt; 1) &amp; 0x01;</div><div class='add'>+</div><div class='add'>+		bitnum = (s2 &gt;&gt; 5) &amp; 0x04;</div><div class='add'>+		bitnum |= (s2 &gt;&gt; 4) &amp; 0x02;</div><div class='add'>+		bitnum |= (s2 &gt;&gt; 3) &amp; 0x01;</div><div class='add'>+</div><div class='add'>+		dat[byteoffs] ^= (1 &lt;&lt; bitnum);</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Should never happen */</div><div class='add'>+	if(countbits(s0 | ((uint32_t)s1 &lt;&lt; 8) | ((uint32_t)s2 &lt;&lt;16)) == 1)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(nand_calculate_ecc);</div><div class='ctx'> EXPORT_SYMBOL(nand_correct_data);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c<br/>index dbc7e55a4247..2e2cdf2fc91d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_ids.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nand_ids.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nand_ids.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/nand_ids.c</a></div><div class='hunk'>@@ -18,99 +18,110 @@</div><div class='ctx'> *	Name. ID code, pagesize, chipsize in MegaByte, eraseblock size,</div><div class='ctx'> *	options</div><div class='ctx'> *</div><div class='del'>-* 	Pagesize; 0, 256, 512</div><div class='del'>-*	0 	get this information from the extended chip ID</div><div class='add'>+*	Pagesize; 0, 256, 512</div><div class='add'>+*	0	get this information from the extended chip ID</div><div class='ctx'> +	256	256 Byte page size</div><div class='ctx'> *	512	512 Byte page size</div><div class='ctx'> */</div><div class='ctx'> struct nand_flash_dev nand_flash_ids[] = {</div><div class='del'>-	{"NAND 1MiB 5V 8-bit", 		0x6e, 256, 1, 0x1000, 0},</div><div class='del'>-	{"NAND 2MiB 5V 8-bit", 		0x64, 256, 2, 0x1000, 0},</div><div class='del'>-	{"NAND 4MiB 5V 8-bit", 		0x6b, 512, 4, 0x2000, 0},</div><div class='del'>-	{"NAND 1MiB 3,3V 8-bit", 	0xe8, 256, 1, 0x1000, 0},</div><div class='del'>-	{"NAND 1MiB 3,3V 8-bit", 	0xec, 256, 1, 0x1000, 0},</div><div class='del'>-	{"NAND 2MiB 3,3V 8-bit", 	0xea, 256, 2, 0x1000, 0},</div><div class='del'>-	{"NAND 4MiB 3,3V 8-bit", 	0xd5, 512, 4, 0x2000, 0},</div><div class='del'>-	{"NAND 4MiB 3,3V 8-bit", 	0xe3, 512, 4, 0x2000, 0},</div><div class='del'>-	{"NAND 4MiB 3,3V 8-bit", 	0xe5, 512, 4, 0x2000, 0},</div><div class='del'>-	{"NAND 8MiB 3,3V 8-bit", 	0xd6, 512, 8, 0x2000, 0},</div><div class='del'>-</div><div class='del'>-	{"NAND 8MiB 1,8V 8-bit", 	0x39, 512, 8, 0x2000, 0},</div><div class='del'>-	{"NAND 8MiB 3,3V 8-bit", 	0xe6, 512, 8, 0x2000, 0},</div><div class='del'>-	{"NAND 8MiB 1,8V 16-bit", 	0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 8MiB 3,3V 16-bit", 	0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},</div><div class='del'>-</div><div class='del'>-	{"NAND 16MiB 1,8V 8-bit", 	0x33, 512, 16, 0x4000, 0},</div><div class='del'>-	{"NAND 16MiB 3,3V 8-bit", 	0x73, 512, 16, 0x4000, 0},</div><div class='del'>-	{"NAND 16MiB 1,8V 16-bit", 	0x43, 512, 16, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 16MiB 3,3V 16-bit", 	0x53, 512, 16, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-</div><div class='del'>-	{"NAND 32MiB 1,8V 8-bit", 	0x35, 512, 32, 0x4000, 0},</div><div class='del'>-	{"NAND 32MiB 3,3V 8-bit", 	0x75, 512, 32, 0x4000, 0},</div><div class='del'>-	{"NAND 32MiB 1,8V 16-bit", 	0x45, 512, 32, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 32MiB 3,3V 16-bit", 	0x55, 512, 32, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-</div><div class='del'>-	{"NAND 64MiB 1,8V 8-bit", 	0x36, 512, 64, 0x4000, 0},</div><div class='del'>-	{"NAND 64MiB 3,3V 8-bit", 	0x76, 512, 64, 0x4000, 0},</div><div class='del'>-	{"NAND 64MiB 1,8V 16-bit", 	0x46, 512, 64, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 64MiB 3,3V 16-bit", 	0x56, 512, 64, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-</div><div class='del'>-	{"NAND 128MiB 1,8V 8-bit", 	0x78, 512, 128, 0x4000, 0},</div><div class='del'>-	{"NAND 128MiB 1,8V 8-bit", 	0x39, 512, 128, 0x4000, 0},</div><div class='del'>-	{"NAND 128MiB 3,3V 8-bit", 	0x79, 512, 128, 0x4000, 0},</div><div class='del'>-	{"NAND 128MiB 1,8V 16-bit", 	0x72, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 128MiB 1,8V 16-bit", 	0x49, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 128MiB 3,3V 16-bit", 	0x74, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-	{"NAND 128MiB 3,3V 16-bit", 	0x59, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='del'>-</div><div class='del'>-	{"NAND 256MiB 3,3V 8-bit", 	0x71, 512, 256, 0x4000, 0},</div><div class='del'>-</div><div class='del'>-	/* These are the new chips with large page size. The pagesize</div><div class='del'>-	* and the erasesize is determined from the extended id bytes</div><div class='del'>-	*/</div><div class='add'>+	{"NAND 1MiB 5V 8-bit",		0x6e, 256, 1, 0x1000, 0},</div><div class='add'>+	{"NAND 2MiB 5V 8-bit",		0x64, 256, 2, 0x1000, 0},</div><div class='add'>+	{"NAND 4MiB 5V 8-bit",		0x6b, 512, 4, 0x2000, 0},</div><div class='add'>+	{"NAND 1MiB 3,3V 8-bit",	0xe8, 256, 1, 0x1000, 0},</div><div class='add'>+	{"NAND 1MiB 3,3V 8-bit",	0xec, 256, 1, 0x1000, 0},</div><div class='add'>+	{"NAND 2MiB 3,3V 8-bit",	0xea, 256, 2, 0x1000, 0},</div><div class='add'>+	{"NAND 4MiB 3,3V 8-bit",	0xd5, 512, 4, 0x2000, 0},</div><div class='add'>+	{"NAND 4MiB 3,3V 8-bit",	0xe3, 512, 4, 0x2000, 0},</div><div class='add'>+	{"NAND 4MiB 3,3V 8-bit",	0xe5, 512, 4, 0x2000, 0},</div><div class='add'>+	{"NAND 8MiB 3,3V 8-bit",	0xd6, 512, 8, 0x2000, 0},</div><div class='add'>+</div><div class='add'>+	{"NAND 8MiB 1,8V 8-bit",	0x39, 512, 8, 0x2000, 0},</div><div class='add'>+	{"NAND 8MiB 3,3V 8-bit",	0xe6, 512, 8, 0x2000, 0},</div><div class='add'>+	{"NAND 8MiB 1,8V 16-bit",	0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 8MiB 3,3V 16-bit",	0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},</div><div class='add'>+</div><div class='add'>+	{"NAND 16MiB 1,8V 8-bit",	0x33, 512, 16, 0x4000, 0},</div><div class='add'>+	{"NAND 16MiB 3,3V 8-bit",	0x73, 512, 16, 0x4000, 0},</div><div class='add'>+	{"NAND 16MiB 1,8V 16-bit",	0x43, 512, 16, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 16MiB 3,3V 16-bit",	0x53, 512, 16, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+</div><div class='add'>+	{"NAND 32MiB 1,8V 8-bit",	0x35, 512, 32, 0x4000, 0},</div><div class='add'>+	{"NAND 32MiB 3,3V 8-bit",	0x75, 512, 32, 0x4000, 0},</div><div class='add'>+	{"NAND 32MiB 1,8V 16-bit",	0x45, 512, 32, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 32MiB 3,3V 16-bit",	0x55, 512, 32, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+</div><div class='add'>+	{"NAND 64MiB 1,8V 8-bit",	0x36, 512, 64, 0x4000, 0},</div><div class='add'>+	{"NAND 64MiB 3,3V 8-bit",	0x76, 512, 64, 0x4000, 0},</div><div class='add'>+	{"NAND 64MiB 1,8V 16-bit",	0x46, 512, 64, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 64MiB 3,3V 16-bit",	0x56, 512, 64, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+</div><div class='add'>+	{"NAND 128MiB 1,8V 8-bit",	0x78, 512, 128, 0x4000, 0},</div><div class='add'>+	{"NAND 128MiB 1,8V 8-bit",	0x39, 512, 128, 0x4000, 0},</div><div class='add'>+	{"NAND 128MiB 3,3V 8-bit",	0x79, 512, 128, 0x4000, 0},</div><div class='add'>+	{"NAND 128MiB 1,8V 16-bit",	0x72, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 128MiB 1,8V 16-bit",	0x49, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 128MiB 3,3V 16-bit",	0x74, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+	{"NAND 128MiB 3,3V 16-bit",	0x59, 512, 128, 0x4000, NAND_BUSWIDTH_16},</div><div class='add'>+</div><div class='add'>+	{"NAND 256MiB 3,3V 8-bit",	0x71, 512, 256, 0x4000, 0},</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * These are the new chips with large page size. The pagesize and the</div><div class='add'>+	 * erasesize is determined from the extended id bytes</div><div class='add'>+	 */</div><div class='add'>+#define LP_OPTIONS (NAND_SAMSUNG_LP_OPTIONS | NAND_NO_READRDY | NAND_NO_AUTOINCR)</div><div class='add'>+#define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16)</div><div class='add'>+</div><div class='ctx'> 	/*512 Megabit */</div><div class='del'>-	{"NAND 64MiB 1,8V 8-bit", 	0xA2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 64MiB 3,3V 8-bit", 	0xF2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 64MiB 1,8V 16-bit", 	0xB2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 64MiB 3,3V 16-bit", 	0xC2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='add'>+	{"NAND 64MiB 1,8V 8-bit",	0xA2, 0,  64, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 64MiB 3,3V 8-bit",	0xF2, 0,  64, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 64MiB 1,8V 16-bit",	0xB2, 0,  64, 0, LP_OPTIONS16},</div><div class='add'>+	{"NAND 64MiB 3,3V 16-bit",	0xC2, 0,  64, 0, LP_OPTIONS16},</div><div class='ctx'> </div><div class='ctx'> 	/* 1 Gigabit */</div><div class='del'>-	{"NAND 128MiB 1,8V 8-bit", 	0xA1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 128MiB 3,3V 8-bit", 	0xF1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 128MiB 1,8V 16-bit", 	0xB1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 128MiB 3,3V 16-bit", 	0xC1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='add'>+	{"NAND 128MiB 1,8V 8-bit",	0xA1, 0, 128, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 128MiB 3,3V 8-bit",	0xF1, 0, 128, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 128MiB 1,8V 16-bit",	0xB1, 0, 128, 0, LP_OPTIONS16},</div><div class='add'>+	{"NAND 128MiB 3,3V 16-bit",	0xC1, 0, 128, 0, LP_OPTIONS16},</div><div class='ctx'> </div><div class='ctx'> 	/* 2 Gigabit */</div><div class='del'>-	{"NAND 256MiB 1,8V 8-bit", 	0xAA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 256MiB 3,3V 8-bit", 	0xDA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 256MiB 1,8V 16-bit", 	0xBA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 256MiB 3,3V 16-bit", 	0xCA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='add'>+	{"NAND 256MiB 1,8V 8-bit",	0xAA, 0, 256, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 256MiB 3,3V 8-bit",	0xDA, 0, 256, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 256MiB 1,8V 16-bit",	0xBA, 0, 256, 0, LP_OPTIONS16},</div><div class='add'>+	{"NAND 256MiB 3,3V 16-bit",	0xCA, 0, 256, 0, LP_OPTIONS16},</div><div class='ctx'> </div><div class='ctx'> 	/* 4 Gigabit */</div><div class='del'>-	{"NAND 512MiB 1,8V 8-bit", 	0xAC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 512MiB 3,3V 8-bit", 	0xDC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 512MiB 1,8V 16-bit", 	0xBC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 512MiB 3,3V 16-bit", 	0xCC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='add'>+	{"NAND 512MiB 1,8V 8-bit",	0xAC, 0, 512, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 512MiB 3,3V 8-bit",	0xDC, 0, 512, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 512MiB 1,8V 16-bit",	0xBC, 0, 512, 0, LP_OPTIONS16},</div><div class='add'>+	{"NAND 512MiB 3,3V 16-bit",	0xCC, 0, 512, 0, LP_OPTIONS16},</div><div class='ctx'> </div><div class='ctx'> 	/* 8 Gigabit */</div><div class='del'>-	{"NAND 1GiB 1,8V 8-bit", 	0xA3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 1GiB 3,3V 8-bit", 	0xD3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 1GiB 1,8V 16-bit", 	0xB3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 1GiB 3,3V 16-bit", 	0xC3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='add'>+	{"NAND 1GiB 1,8V 8-bit",	0xA3, 0, 1024, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 1GiB 3,3V 8-bit",	0xD3, 0, 1024, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 1GiB 1,8V 16-bit",	0xB3, 0, 1024, 0, LP_OPTIONS16},</div><div class='add'>+	{"NAND 1GiB 3,3V 16-bit",	0xC3, 0, 1024, 0, LP_OPTIONS16},</div><div class='ctx'> </div><div class='ctx'> 	/* 16 Gigabit */</div><div class='del'>-	{"NAND 2GiB 1,8V 8-bit", 	0xA5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 2GiB 3,3V 8-bit", 	0xD5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 2GiB 1,8V 16-bit", 	0xB5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-	{"NAND 2GiB 3,3V 16-bit", 	0xC5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},</div><div class='del'>-</div><div class='del'>-	/* Renesas AND 1 Gigabit. Those chips do not support extended id and have a strange page/block layout !</div><div class='del'>-	 * The chosen minimum erasesize is 4 * 2 * 2048 = 16384 Byte, as those chips have an array of 4 page planes</div><div class='del'>-	 * 1 block = 2 pages, but due to plane arrangement the blocks 0-3 consists of page 0 + 4,1 + 5, 2 + 6, 3 + 7</div><div class='del'>-	 * Anyway JFFS2 would increase the eraseblock size so we chose a combined one which can be erased in one go</div><div class='del'>-	 * There are more speed improvements for reads and writes possible, but not implemented now</div><div class='add'>+	{"NAND 2GiB 1,8V 8-bit",	0xA5, 0, 2048, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 2GiB 3,3V 8-bit",	0xD5, 0, 2048, 0, LP_OPTIONS},</div><div class='add'>+	{"NAND 2GiB 1,8V 16-bit",	0xB5, 0, 2048, 0, LP_OPTIONS16},</div><div class='add'>+	{"NAND 2GiB 3,3V 16-bit",	0xC5, 0, 2048, 0, LP_OPTIONS16},</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Renesas AND 1 Gigabit. Those chips do not support extended id and</div><div class='add'>+	 * have a strange page/block layout !  The chosen minimum erasesize is</div><div class='add'>+	 * 4 * 2 * 2048 = 16384 Byte, as those chips have an array of 4 page</div><div class='add'>+	 * planes 1 block = 2 pages, but due to plane arrangement the blocks</div><div class='add'>+	 * 0-3 consists of page 0 + 4,1 + 5, 2 + 6, 3 + 7 Anyway JFFS2 would</div><div class='add'>+	 * increase the eraseblock size so we chose a combined one which can be</div><div class='add'>+	 * erased in one go There are more speed improvements for reads and</div><div class='add'>+	 * writes possible, but not implemented now</div><div class='ctx'> 	 */</div><div class='del'>-	{"AND 128MiB 3,3V 8-bit",	0x01, 2048, 128, 0x4000, NAND_IS_AND | NAND_NO_AUTOINCR | NAND_4PAGE_ARRAY | BBT_AUTO_REFRESH},</div><div class='add'>+	{"AND 128MiB 3,3V 8-bit",	0x01, 2048, 128, 0x4000,</div><div class='add'>+	 NAND_IS_AND | NAND_NO_AUTOINCR |NAND_NO_READRDY | NAND_4PAGE_ARRAY |</div><div class='add'>+	 BBT_AUTO_REFRESH</div><div class='add'>+	},</div><div class='ctx'> </div><div class='ctx'> 	{NULL,}</div><div class='ctx'> };</div><div class='hunk'>@@ -125,13 +136,13 @@ struct nand_manufacturers nand_manuf_ids[] = {</div><div class='ctx'> 	{NAND_MFR_NATIONAL, "National"},</div><div class='ctx'> 	{NAND_MFR_RENESAS, "Renesas"},</div><div class='ctx'> 	{NAND_MFR_STMICRO, "ST Micro"},</div><div class='del'>-        {NAND_MFR_HYNIX, "Hynix"},</div><div class='add'>+	{NAND_MFR_HYNIX, "Hynix"},</div><div class='ctx'> 	{0x0, "Unknown"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL (nand_manuf_ids);</div><div class='del'>-EXPORT_SYMBOL (nand_flash_ids);</div><div class='add'>+EXPORT_SYMBOL(nand_manuf_ids);</div><div class='add'>+EXPORT_SYMBOL(nand_flash_ids);</div><div class='ctx'> </div><div class='del'>-MODULE_LICENSE ("GPL");</div><div class='del'>-MODULE_AUTHOR ("Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION ("Nand device &amp; manufacturer ID's");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Nand device &amp; manufacturer IDs");</div><div class='head'>diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c<br/>index a0af92cc7efd..545ff252d81e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nandsim.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/nandsim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/nandsim.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/nandsim.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * $Id: nandsim.c,v 1.8 2005/03/19 15:33:56 dedekind Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -369,7 +368,7 @@ init_nandsim(struct mtd_info *mtd)</div><div class='ctx'> 	/* Initialize the NAND flash parameters */</div><div class='ctx'> 	ns-&gt;busw = chip-&gt;options &amp; NAND_BUSWIDTH_16 ? 16 : 8;</div><div class='ctx'> 	ns-&gt;geom.totsz    = mtd-&gt;size;</div><div class='del'>-	ns-&gt;geom.pgsz     = mtd-&gt;oobblock;</div><div class='add'>+	ns-&gt;geom.pgsz     = mtd-&gt;writesize;</div><div class='ctx'> 	ns-&gt;geom.oobsz    = mtd-&gt;oobsize;</div><div class='ctx'> 	ns-&gt;geom.secsz    = mtd-&gt;erasesize;</div><div class='ctx'> 	ns-&gt;geom.pgszoob  = ns-&gt;geom.pgsz + ns-&gt;geom.oobsz;</div><div class='hunk'>@@ -1071,68 +1070,6 @@ switch_state(struct nandsim *ns)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-ns_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd-&gt;priv)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-</div><div class='del'>-	/* set CLE line high */</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		NS_DBG("ns_hwcontrol: start command latch cycles\n");</div><div class='del'>-		ns-&gt;lines.cle  = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set CLE line low */</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-		NS_DBG("ns_hwcontrol: stop command latch cycles\n");</div><div class='del'>-		ns-&gt;lines.cle  = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set ALE line high */</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		NS_DBG("ns_hwcontrol: start address latch cycles\n");</div><div class='del'>-		ns-&gt;lines.ale   = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set ALE line low */</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-		NS_DBG("ns_hwcontrol: stop address latch cycles\n");</div><div class='del'>-		ns-&gt;lines.ale  = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set WP line high */</div><div class='del'>-	case NAND_CTL_SETWP:</div><div class='del'>-		NS_DBG("ns_hwcontrol: enable write protection\n");</div><div class='del'>-		ns-&gt;lines.wp = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set WP line low */</div><div class='del'>-	case NAND_CTL_CLRWP:</div><div class='del'>-		NS_DBG("ns_hwcontrol: disable write protection\n");</div><div class='del'>-		ns-&gt;lines.wp = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set CE line low */</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-		NS_DBG("ns_hwcontrol: enable chip\n");</div><div class='del'>-		ns-&gt;lines.ce = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* set CE line high */</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		NS_DBG("ns_hwcontrol: disable chip\n");</div><div class='del'>-		ns-&gt;lines.ce = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		NS_ERR("hwcontrol: unknown command\n");</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u_char</div><div class='ctx'> ns_nand_read_byte(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='hunk'>@@ -1359,6 +1296,18 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ns_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int bitmask)</div><div class='add'>+{</div><div class='add'>+	struct nandsim *ns = ((struct nand_chip *)mtd-&gt;priv)-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ns-&gt;lines.cle = bitmask &amp; NAND_CLE ? 1 : 0;</div><div class='add'>+	ns-&gt;lines.ale = bitmask &amp; NAND_ALE ? 1 : 0;</div><div class='add'>+	ns-&gt;lines.ce = bitmask &amp; NAND_NCE ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		ns_nand_write_byte(mtd, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> ns_device_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='hunk'>@@ -1377,17 +1326,6 @@ ns_nand_read_word(struct mtd_info *mtd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-ns_nand_write_word(struct mtd_info *mtd, uint16_t word)</div><div class='del'>-{</div><div class='del'>-	struct nand_chip *chip = (struct nand_chip *)mtd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	NS_DBG("write_word\n");</div><div class='del'>-</div><div class='del'>-	chip-&gt;write_byte(mtd, word &amp; 0xFF);</div><div class='del'>-	chip-&gt;write_byte(mtd, word &gt;&gt; 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='ctx'> ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'>         struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd-&gt;priv)-&gt;priv;</div><div class='hunk'>@@ -1514,16 +1452,14 @@ static int __init ns_init_module(void)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register simulator's callbacks.</div><div class='ctx'> 	 */</div><div class='del'>-	chip-&gt;hwcontrol  = ns_hwcontrol;</div><div class='add'>+	chip-&gt;cmd_ctrl	 = ns_hwcontrol;</div><div class='ctx'> 	chip-&gt;read_byte  = ns_nand_read_byte;</div><div class='ctx'> 	chip-&gt;dev_ready  = ns_device_ready;</div><div class='del'>-	chip-&gt;write_byte = ns_nand_write_byte;</div><div class='ctx'> 	chip-&gt;write_buf  = ns_nand_write_buf;</div><div class='ctx'> 	chip-&gt;read_buf   = ns_nand_read_buf;</div><div class='ctx'> 	chip-&gt;verify_buf = ns_nand_verify_buf;</div><div class='del'>-	chip-&gt;write_word = ns_nand_write_word;</div><div class='ctx'> 	chip-&gt;read_word  = ns_nand_read_word;</div><div class='del'>-	chip-&gt;eccmode    = NAND_ECC_SOFT;</div><div class='add'>+	chip-&gt;ecc.mode   = NAND_ECC_SOFT;</div><div class='ctx'> 	chip-&gt;options   |= NAND_SKIP_BBTSCAN;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1546,6 +1482,8 @@ static int __init ns_init_module(void)</div><div class='ctx'> 		chip-&gt;options |= NAND_BUSWIDTH_16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nsmtd-&gt;owner = THIS_MODULE;</div><div class='add'>+</div><div class='ctx'> 	if ((retval = nand_scan(nsmtd, 1)) != 0) {</div><div class='ctx'> 		NS_ERR("can't register NAND Simulator\n");</div><div class='ctx'> 		if (retval &gt; 0)</div><div class='head'>diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c<br/>new file mode 100644<br/>index 000000000000..e5bd88f2d560<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ndfc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/ndfc.c</a></div><div class='hunk'>@@ -0,0 +1,311 @@</div><div class='add'>+/*</div><div class='add'>+ *  drivers/mtd/ndfc.c</div><div class='add'>+ *</div><div class='add'>+ *  Overview:</div><div class='add'>+ *   Platform independend driver for NDFC (NanD Flash Controller)</div><div class='add'>+ *   integrated into EP440 cores</div><div class='add'>+ *</div><div class='add'>+ *  Author: Thomas Gleixner</div><div class='add'>+ *</div><div class='add'>+ *  Copyright 2006 IBM</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute	 it and/or modify it</div><div class='add'>+ *  under  the terms of	 the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the	License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand_ecc.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;linux/mtd/ndfc.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/ibm44x.h&gt;</div><div class='add'>+</div><div class='add'>+struct ndfc_nand_mtd {</div><div class='add'>+	struct mtd_info			mtd;</div><div class='add'>+	struct nand_chip		chip;</div><div class='add'>+	struct platform_nand_chip	*pl_chip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ndfc_nand_mtd ndfc_mtd[NDFC_MAX_BANKS];</div><div class='add'>+</div><div class='add'>+struct ndfc_controller {</div><div class='add'>+	void __iomem		*ndfcbase;</div><div class='add'>+	struct nand_hw_control	ndfc_control;</div><div class='add'>+	atomic_t		childs_active;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ndfc_controller ndfc_ctrl;</div><div class='add'>+</div><div class='add'>+static void ndfc_select_chip(struct mtd_info *mtd, int chip)</div><div class='add'>+{</div><div class='add'>+	uint32_t ccr;</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	struct nand_chip *nandchip = mtd-&gt;priv;</div><div class='add'>+	struct ndfc_nand_mtd *nandmtd = nandchip-&gt;priv;</div><div class='add'>+	struct platform_nand_chip *pchip = nandmtd-&gt;pl_chip;</div><div class='add'>+</div><div class='add'>+	ccr = __raw_readl(ndfc-&gt;ndfcbase + NDFC_CCR);</div><div class='add'>+	if (chip &gt;= 0) {</div><div class='add'>+		ccr &amp;= ~NDFC_CCR_BS_MASK;</div><div class='add'>+		ccr |= NDFC_CCR_BS(chip + pchip-&gt;chip_offset);</div><div class='add'>+	} else</div><div class='add'>+		ccr |= NDFC_CCR_RESET_CE;</div><div class='add'>+	writel(ccr, ndfc-&gt;ndfcbase + NDFC_CCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+</div><div class='add'>+	if (cmd == NAND_CMD_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CLE)</div><div class='add'>+		writel(cmd &amp; 0xFF, ndfc-&gt;ndfcbase + NDFC_CMD);</div><div class='add'>+	else</div><div class='add'>+		writel(cmd &amp; 0xFF, ndfc-&gt;ndfcbase + NDFC_ALE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+</div><div class='add'>+	return __raw_readl(ndfc-&gt;ndfcbase + NDFC_STAT) &amp; NDFC_STAT_IS_READY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ndfc_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='add'>+{</div><div class='add'>+	uint32_t ccr;</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+</div><div class='add'>+	ccr = __raw_readl(ndfc-&gt;ndfcbase + NDFC_CCR);</div><div class='add'>+	ccr |= NDFC_CCR_RESET_ECC;</div><div class='add'>+	__raw_writel(ccr, ndfc-&gt;ndfcbase + NDFC_CCR);</div><div class='add'>+	wmb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_calculate_ecc(struct mtd_info *mtd,</div><div class='add'>+			      const u_char *dat, u_char *ecc_code)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	uint32_t ecc;</div><div class='add'>+	uint8_t *p = (uint8_t *)&amp;ecc;</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+	ecc = __raw_readl(ndfc-&gt;ndfcbase + NDFC_ECC);</div><div class='add'>+	ecc_code[0] = p[1];</div><div class='add'>+	ecc_code[1] = p[2];</div><div class='add'>+	ecc_code[2] = p[3];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Speedups for buffer read/write/verify</div><div class='add'>+ *</div><div class='add'>+ * NDFC allows 32bit read/write of data. So we can speed up the buffer</div><div class='add'>+ * functions. No further checking, as nand_base will always read/write</div><div class='add'>+ * page aligned.</div><div class='add'>+ */</div><div class='add'>+static void ndfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	uint32_t *p = (uint32_t *) buf;</div><div class='add'>+</div><div class='add'>+	for(;len &gt; 0; len -= 4)</div><div class='add'>+		*p++ = __raw_readl(ndfc-&gt;ndfcbase + NDFC_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ndfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	uint32_t *p = (uint32_t *) buf;</div><div class='add'>+</div><div class='add'>+	for(;len &gt; 0; len -= 4)</div><div class='add'>+		__raw_writel(*p++, ndfc-&gt;ndfcbase + NDFC_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	uint32_t *p = (uint32_t *) buf;</div><div class='add'>+</div><div class='add'>+	for(;len &gt; 0; len -= 4)</div><div class='add'>+		if (*p++ != __raw_readl(ndfc-&gt;ndfcbase + NDFC_DATA))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize chip structure</div><div class='add'>+ */</div><div class='add'>+static void ndfc_chip_init(struct ndfc_nand_mtd *mtd)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	struct nand_chip *chip = &amp;mtd-&gt;chip;</div><div class='add'>+</div><div class='add'>+	chip-&gt;IO_ADDR_R = ndfc-&gt;ndfcbase + NDFC_DATA;</div><div class='add'>+	chip-&gt;IO_ADDR_W = ndfc-&gt;ndfcbase + NDFC_DATA;</div><div class='add'>+	chip-&gt;cmd_ctrl = ndfc_hwcontrol;</div><div class='add'>+	chip-&gt;dev_ready = ndfc_ready;</div><div class='add'>+	chip-&gt;select_chip = ndfc_select_chip;</div><div class='add'>+	chip-&gt;chip_delay = 50;</div><div class='add'>+	chip-&gt;priv = mtd;</div><div class='add'>+	chip-&gt;options = mtd-&gt;pl_chip-&gt;options;</div><div class='add'>+	chip-&gt;controller = &amp;ndfc-&gt;ndfc_control;</div><div class='add'>+	chip-&gt;read_buf = ndfc_read_buf;</div><div class='add'>+	chip-&gt;write_buf = ndfc_write_buf;</div><div class='add'>+	chip-&gt;verify_buf = ndfc_verify_buf;</div><div class='add'>+	chip-&gt;ecc.correct = nand_correct_data;</div><div class='add'>+	chip-&gt;ecc.hwctl = ndfc_enable_hwecc;</div><div class='add'>+	chip-&gt;ecc.calculate = ndfc_calculate_ecc;</div><div class='add'>+	chip-&gt;ecc.mode = NAND_ECC_HW;</div><div class='add'>+	chip-&gt;ecc.size = 256;</div><div class='add'>+	chip-&gt;ecc.bytes = 3;</div><div class='add'>+	chip-&gt;ecclayout = mtd-&gt;pl_chip-&gt;ecclayout;</div><div class='add'>+	mtd-&gt;mtd.priv = chip;</div><div class='add'>+	mtd-&gt;mtd.owner = THIS_MODULE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_chip_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct platform_nand_chip *nc = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct ndfc_chip_settings *settings = nc-&gt;priv;</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	struct ndfc_nand_mtd *nandmtd;</div><div class='add'>+</div><div class='add'>+	if (nc-&gt;chip_offset &gt;= NDFC_MAX_BANKS || nc-&gt;nr_chips &gt; NDFC_MAX_BANKS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Set the bank settings */</div><div class='add'>+	__raw_writel(settings-&gt;bank_settings,</div><div class='add'>+		     ndfc-&gt;ndfcbase + NDFC_BCFG0 + (nc-&gt;chip_offset &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+	nandmtd = &amp;ndfc_mtd[pdev-&gt;id];</div><div class='add'>+	if (nandmtd-&gt;pl_chip)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	nandmtd-&gt;pl_chip = nc;</div><div class='add'>+	ndfc_chip_init(nandmtd);</div><div class='add'>+</div><div class='add'>+	/* Scan for chips */</div><div class='add'>+	if (nand_scan(&amp;nandmtd-&gt;mtd, nc-&gt;nr_chips)) {</div><div class='add'>+		nandmtd-&gt;pl_chip = NULL;</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+	printk("Number of partitions %d\n", nc-&gt;nr_partitions);</div><div class='add'>+	if (nc-&gt;nr_partitions) {</div><div class='add'>+		/* Add the full device, so complete dumps can be made */</div><div class='add'>+		add_mtd_device(&amp;nandmtd-&gt;mtd);</div><div class='add'>+		add_mtd_partitions(&amp;nandmtd-&gt;mtd, nc-&gt;partitions,</div><div class='add'>+				   nc-&gt;nr_partitions);</div><div class='add'>+</div><div class='add'>+	} else</div><div class='add'>+#else</div><div class='add'>+		add_mtd_device(&amp;nandmtd-&gt;mtd);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;ndfc-&gt;childs_active);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_chip_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_nand_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct platform_nand_ctrl *nc = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct ndfc_controller_settings *settings = nc-&gt;priv;</div><div class='add'>+	struct resource *res = pdev-&gt;resource;</div><div class='add'>+	struct ndfc_controller *ndfc = &amp;ndfc_ctrl;</div><div class='add'>+	unsigned long long phys = settings-&gt;ndfc_erpn | res-&gt;start;</div><div class='add'>+</div><div class='add'>+	ndfc-&gt;ndfcbase = ioremap64(phys, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (!ndfc-&gt;ndfcbase) {</div><div class='add'>+		printk(KERN_ERR "NDFC: ioremap failed\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__raw_writel(settings-&gt;ccr_settings, ndfc-&gt;ndfcbase + NDFC_CCR);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ndfc-&gt;ndfc_control.lock);</div><div class='add'>+	init_waitqueue_head(&amp;ndfc-&gt;ndfc_control.wq);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, ndfc);</div><div class='add'>+</div><div class='add'>+	printk("NDFC NAND Driver initialized. Chip-Rev: 0x%08x\n",</div><div class='add'>+	       __raw_readl(ndfc-&gt;ndfcbase + NDFC_REVID));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ndfc_nand_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ndfc_controller *ndfc = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;ndfc-&gt;childs_active))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (ndfc) {</div><div class='add'>+		platform_set_drvdata(pdev, NULL);</div><div class='add'>+		iounmap(ndfc_ctrl.ndfcbase);</div><div class='add'>+		ndfc_ctrl.ndfcbase = NULL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* driver device registration */</div><div class='add'>+</div><div class='add'>+static struct platform_driver ndfc_chip_driver = {</div><div class='add'>+	.probe		= ndfc_chip_probe,</div><div class='add'>+	.remove		= ndfc_chip_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ndfc-chip",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver ndfc_nand_driver = {</div><div class='add'>+	.probe		= ndfc_nand_probe,</div><div class='add'>+	.remove		= ndfc_nand_remove,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ndfc-nand",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ndfc_nand_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ndfc_ctrl.ndfc_control.lock);</div><div class='add'>+	init_waitqueue_head(&amp;ndfc_ctrl.ndfc_control.wq);</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;ndfc_nand_driver);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = platform_driver_register(&amp;ndfc_chip_driver);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ndfc_nand_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;ndfc_chip_driver);</div><div class='add'>+	platform_driver_unregister(&amp;ndfc_nand_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ndfc_nand_init);</div><div class='add'>+module_exit(ndfc_nand_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Thomas Gleixner &lt;tglx@linutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Platform driver for NDFC");</div><div class='head'>diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c<br/>index 91a95f34a6ee..22fa65c12ab9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ppchameleonevb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/ppchameleonevb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ppchameleonevb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/ppchameleonevb.c</a></div><div class='hunk'>@@ -58,21 +58,21 @@</div><div class='ctx'> /*</div><div class='ctx'>  * MTD structure for PPChameleonEVB board</div><div class='ctx'>  */</div><div class='del'>-static struct mtd_info *ppchameleon_mtd 	= NULL;</div><div class='add'>+static struct mtd_info *ppchameleon_mtd = NULL;</div><div class='ctx'> static struct mtd_info *ppchameleonevb_mtd = NULL;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Module stuff</div><div class='ctx'>  */</div><div class='del'>-static unsigned long ppchameleon_fio_pbase 	= CFG_NAND0_PADDR;</div><div class='add'>+static unsigned long ppchameleon_fio_pbase = CFG_NAND0_PADDR;</div><div class='ctx'> static unsigned long ppchameleonevb_fio_pbase = CFG_NAND1_PADDR;</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> module_param(ppchameleon_fio_pbase, ulong, 0);</div><div class='ctx'> module_param(ppchameleonevb_fio_pbase, ulong, 0);</div><div class='ctx'> #else</div><div class='del'>-__setup("ppchameleon_fio_pbase=",ppchameleon_fio_pbase);</div><div class='del'>-__setup("ppchameleonevb_fio_pbase=",ppchameleonevb_fio_pbase);</div><div class='add'>+__setup("ppchameleon_fio_pbase=", ppchameleon_fio_pbase);</div><div class='add'>+__setup("ppchameleonevb_fio_pbase=", ppchameleonevb_fio_pbase);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='hunk'>@@ -80,82 +80,96 @@ __setup("ppchameleonevb_fio_pbase=",ppchameleonevb_fio_pbase);</div><div class='ctx'>  * Define static partitions for flash devices</div><div class='ctx'>  */</div><div class='ctx'> static struct mtd_partition partition_info_hi[] = {</div><div class='del'>-	{ name: "PPChameleon HI Nand Flash",</div><div class='del'>-		  offset: 0,</div><div class='del'>-		  size: 128*1024*1024 }</div><div class='add'>+      { .name = "PPChameleon HI Nand Flash",</div><div class='add'>+	offset = 0,</div><div class='add'>+	.size = 128 * 1024 * 1024</div><div class='add'>+      }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition partition_info_me[] = {</div><div class='del'>-	{ name: "PPChameleon ME Nand Flash",</div><div class='del'>-		  offset: 0,</div><div class='del'>-		  size: 32*1024*1024 }</div><div class='add'>+      { .name = "PPChameleon ME Nand Flash",</div><div class='add'>+	.offset = 0,</div><div class='add'>+	.size = 32 * 1024 * 1024</div><div class='add'>+      }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct mtd_partition partition_info_evb[] = {</div><div class='del'>-	{ name: "PPChameleonEVB Nand Flash",</div><div class='del'>-		  offset: 0,</div><div class='del'>-		  size: 32*1024*1024 }</div><div class='add'>+      { .name = "PPChameleonEVB Nand Flash",</div><div class='add'>+	.offset = 0,</div><div class='add'>+	.size = 32 * 1024 * 1024</div><div class='add'>+      }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define NUM_PARTITIONS 1</div><div class='ctx'> </div><div class='del'>-extern int parse_cmdline_partitions(struct mtd_info *master,</div><div class='del'>-				    struct mtd_partition **pparts,</div><div class='del'>-				    const char *mtd_id);</div><div class='add'>+extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, const char *mtd_id);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='ctx'>  */</div><div class='del'>-static void ppchameleon_hwcontrol(struct mtd_info *mtdinfo, int cmd)</div><div class='add'>+static void ppchameleon_hwcontrol(struct mtd_info *mtdinfo, int cmd,</div><div class='add'>+				  unsigned int ctrl)</div><div class='ctx'> {</div><div class='del'>-	switch(cmd) {</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-        	MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND0_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-        	MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND0_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-        	MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND0_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-        	MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND0_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+#error Missing headerfiles. No way to fix this. -tglx</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case NAND_CTL_SETCLE:</div><div class='add'>+			MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND0_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_CLRCLE:</div><div class='add'>+			MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND0_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_SETALE:</div><div class='add'>+			MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND0_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_CLRALE:</div><div class='add'>+			MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND0_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_SETNCE:</div><div class='ctx'> 			MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND0_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_CLRNCE:</div><div class='ctx'> 			MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND0_PADDR);</div><div class='del'>-		break;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd)</div><div class='add'>+static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd,</div><div class='add'>+				     unsigned int ctrl)</div><div class='ctx'> {</div><div class='del'>-	switch(cmd) {</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-        	MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND1_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-        	MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND1_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-        	MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND1_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-        	MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND1_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-        	MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND1_PADDR);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-        	MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND1_PADDR);</div><div class='del'>-		break;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+#error Missing headerfiles. No way to fix this. -tglx</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case NAND_CTL_SETCLE:</div><div class='add'>+			MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND1_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_CLRCLE:</div><div class='add'>+			MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND1_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_SETALE:</div><div class='add'>+			MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND1_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_CLRALE:</div><div class='add'>+			MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND1_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_SETNCE:</div><div class='add'>+			MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND1_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		case NAND_CTL_CLRNCE:</div><div class='add'>+			MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND1_PADDR);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_READY_BUSY_PIN</div><div class='hunk'>@@ -164,15 +178,15 @@ static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd)</div><div class='ctx'>  */</div><div class='ctx'> static int ppchameleon_device_ready(struct mtd_info *minfo)</div><div class='ctx'> {</div><div class='del'>-	if (in_be32((volatile unsigned*)GPIO0_IR) &amp; NAND_RB_GPIO_PIN)</div><div class='add'>+	if (in_be32((volatile unsigned *)GPIO0_IR) &amp; NAND_RB_GPIO_PIN)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ppchameleonevb_device_ready(struct mtd_info *minfo)</div><div class='ctx'> {</div><div class='del'>-	if (in_be32((volatile unsigned*)GPIO0_IR) &amp; NAND_EVB_RB_GPIO_PIN)</div><div class='del'>-	return 1;</div><div class='add'>+	if (in_be32((volatile unsigned *)GPIO0_IR) &amp; NAND_EVB_RB_GPIO_PIN)</div><div class='add'>+		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -185,7 +199,7 @@ const char *part_probes_evb[] = { "cmdlinepart", NULL };</div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-static int __init ppchameleonevb_init (void)</div><div class='add'>+static int __init ppchameleonevb_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	const char *part_type = 0;</div><div class='hunk'>@@ -194,13 +208,11 @@ static int __init ppchameleonevb_init (void)</div><div class='ctx'> 	void __iomem *ppchameleon_fio_base;</div><div class='ctx'> 	void __iomem *ppchameleonevb_fio_base;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/*********************************</div><div class='ctx'> 	* Processor module NAND (if any) *</div><div class='ctx'> 	*********************************/</div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	ppchameleon_mtd = kmalloc(sizeof(struct mtd_info) +</div><div class='del'>-						      sizeof(struct nand_chip), GFP_KERNEL);</div><div class='add'>+	ppchameleon_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!ppchameleon_mtd) {</div><div class='ctx'> 		printk("Unable to allocate PPChameleon NAND MTD device structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -208,63 +220,65 @@ static int __init ppchameleonevb_init (void)</div><div class='ctx'> </div><div class='ctx'> 	/* map physical address */</div><div class='ctx'> 	ppchameleon_fio_base = ioremap(ppchameleon_fio_pbase, SZ_4M);</div><div class='del'>-	if(!ppchameleon_fio_base) {</div><div class='add'>+	if (!ppchameleon_fio_base) {</div><div class='ctx'> 		printk("ioremap PPChameleon NAND flash failed\n");</div><div class='ctx'> 		kfree(ppchameleon_mtd);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;ppchameleon_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;ppchameleon_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) ppchameleon_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(ppchameleon_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	ppchameleon_mtd-&gt;priv = this;</div><div class='add'>+	ppchameleon_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='del'>-        /* Initialize GPIOs */</div><div class='add'>+	/* Initialize GPIOs */</div><div class='ctx'> 	/* Pin mapping for NAND chip */</div><div class='ctx'> 	/*</div><div class='del'>-		CE	GPIO_01</div><div class='del'>-		CLE	GPIO_02</div><div class='del'>-		ALE	GPIO_03</div><div class='del'>-		R/B	GPIO_04</div><div class='del'>-	*/</div><div class='add'>+	   CE   GPIO_01</div><div class='add'>+	   CLE  GPIO_02</div><div class='add'>+	   ALE  GPIO_03</div><div class='add'>+	   R/B  GPIO_04</div><div class='add'>+	 */</div><div class='ctx'> 	/* output select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_OSRH, in_be32((volatile unsigned*)GPIO0_OSRH) &amp; 0xC0FFFFFF);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_OSRH, in_be32((volatile unsigned *)GPIO0_OSRH) &amp; 0xC0FFFFFF);</div><div class='ctx'> 	/* three-state select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) &amp; 0xC0FFFFFF);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TSRH, in_be32((volatile unsigned *)GPIO0_TSRH) &amp; 0xC0FFFFFF);</div><div class='ctx'> 	/* enable output driver */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_nCE_GPIO_PIN | NAND_CLE_GPIO_PIN | NAND_ALE_GPIO_PIN);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TCR,</div><div class='add'>+		 in_be32((volatile unsigned *)GPIO0_TCR) | NAND_nCE_GPIO_PIN | NAND_CLE_GPIO_PIN | NAND_ALE_GPIO_PIN);</div><div class='ctx'> #ifdef USE_READY_BUSY_PIN</div><div class='ctx'> 	/* three-state select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) &amp; 0xFF3FFFFF);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TSRH, in_be32((volatile unsigned *)GPIO0_TSRH) &amp; 0xFF3FFFFF);</div><div class='ctx'> 	/* high-impedecence */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) &amp; (~NAND_RB_GPIO_PIN));</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TCR, in_be32((volatile unsigned *)GPIO0_TCR) &amp; (~NAND_RB_GPIO_PIN));</div><div class='ctx'> 	/* input select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_ISR1H, (in_be32((volatile unsigned*)GPIO0_ISR1H) &amp; 0xFF3FFFFF) | 0x00400000);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_ISR1H,</div><div class='add'>+		 (in_be32((volatile unsigned *)GPIO0_ISR1H) &amp; 0xFF3FFFFF) | 0x00400000);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* insert callbacks */</div><div class='ctx'> 	this-&gt;IO_ADDR_R = ppchameleon_fio_base;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = ppchameleon_fio_base;</div><div class='del'>-	this-&gt;hwcontrol = ppchameleon_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = ppchameleon_hwcontrol;</div><div class='ctx'> #ifdef USE_READY_BUSY_PIN</div><div class='ctx'> 	this-&gt;dev_ready = ppchameleon_device_ready;</div><div class='ctx'> #endif</div><div class='ctx'> 	this-&gt;chip_delay = NAND_BIG_DELAY_US;</div><div class='ctx'> 	/* ECC mode */</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device (it could not be mounted) */</div><div class='del'>-	if (nand_scan (ppchameleon_mtd, 1)) {</div><div class='add'>+	if (nand_scan(ppchameleon_mtd, 1)) {</div><div class='ctx'> 		iounmap((void *)ppchameleon_fio_base);</div><div class='del'>-		kfree (ppchameleon_mtd);</div><div class='add'>+		kfree(ppchameleon_mtd);</div><div class='ctx'> 		goto nand_evb_init;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #ifndef USE_READY_BUSY_PIN</div><div class='ctx'> 	/* Adjust delay if necessary */</div><div class='ctx'> 	if (ppchameleon_mtd-&gt;size == NAND_SMALL_SIZE)</div><div class='hunk'>@@ -275,12 +289,11 @@ static int __init ppchameleonevb_init (void)</div><div class='ctx'> 	ppchameleon_mtd-&gt;name = "ppchameleon-nand";</div><div class='ctx'> 	mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, part_probes, &amp;mtd_parts, 0);</div><div class='ctx'> 	if (mtd_parts_nb &gt; 0)</div><div class='del'>-	  part_type = "command line";</div><div class='add'>+		part_type = "command line";</div><div class='ctx'> 	else</div><div class='del'>-	  mtd_parts_nb = 0;</div><div class='add'>+		mtd_parts_nb = 0;</div><div class='ctx'> #endif</div><div class='del'>-	if (mtd_parts_nb == 0)</div><div class='del'>-	{</div><div class='add'>+	if (mtd_parts_nb == 0) {</div><div class='ctx'> 		if (ppchameleon_mtd-&gt;size == NAND_SMALL_SIZE)</div><div class='ctx'> 			mtd_parts = partition_info_me;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -293,13 +306,12 @@ static int __init ppchameleonevb_init (void)</div><div class='ctx'> 	printk(KERN_NOTICE "Using %s partition definition\n", part_type);</div><div class='ctx'> 	add_mtd_partitions(ppchameleon_mtd, mtd_parts, mtd_parts_nb);</div><div class='ctx'> </div><div class='del'>-nand_evb_init:</div><div class='add'>+ nand_evb_init:</div><div class='ctx'> 	/****************************</div><div class='ctx'> 	* EVB NAND (always present) *</div><div class='ctx'> 	****************************/</div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	ppchameleonevb_mtd = kmalloc(sizeof(struct mtd_info) +</div><div class='del'>-							 sizeof(struct nand_chip), GFP_KERNEL);</div><div class='add'>+	ppchameleonevb_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!ppchameleonevb_mtd) {</div><div class='ctx'> 		printk("Unable to allocate PPChameleonEVB NAND MTD device structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -307,77 +319,76 @@ nand_evb_init:</div><div class='ctx'> </div><div class='ctx'> 	/* map physical address */</div><div class='ctx'> 	ppchameleonevb_fio_base = ioremap(ppchameleonevb_fio_pbase, SZ_4M);</div><div class='del'>-	if(!ppchameleonevb_fio_base) {</div><div class='add'>+	if (!ppchameleonevb_fio_base) {</div><div class='ctx'> 		printk("ioremap PPChameleonEVB NAND flash failed\n");</div><div class='ctx'> 		kfree(ppchameleonevb_mtd);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;ppchameleonevb_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;ppchameleonevb_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) ppchameleonevb_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(ppchameleonevb_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	ppchameleonevb_mtd-&gt;priv = this;</div><div class='ctx'> </div><div class='del'>-        /* Initialize GPIOs */</div><div class='add'>+	/* Initialize GPIOs */</div><div class='ctx'> 	/* Pin mapping for NAND chip */</div><div class='ctx'> 	/*</div><div class='del'>-		CE	GPIO_14</div><div class='del'>-		CLE	GPIO_15</div><div class='del'>-		ALE	GPIO_16</div><div class='del'>-		R/B	GPIO_31</div><div class='del'>-	*/</div><div class='add'>+	   CE   GPIO_14</div><div class='add'>+	   CLE  GPIO_15</div><div class='add'>+	   ALE  GPIO_16</div><div class='add'>+	   R/B  GPIO_31</div><div class='add'>+	 */</div><div class='ctx'> 	/* output select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_OSRH, in_be32((volatile unsigned*)GPIO0_OSRH) &amp; 0xFFFFFFF0);</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_OSRL, in_be32((volatile unsigned*)GPIO0_OSRL) &amp; 0x3FFFFFFF);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_OSRH, in_be32((volatile unsigned *)GPIO0_OSRH) &amp; 0xFFFFFFF0);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_OSRL, in_be32((volatile unsigned *)GPIO0_OSRL) &amp; 0x3FFFFFFF);</div><div class='ctx'> 	/* three-state select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) &amp; 0xFFFFFFF0);</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) &amp; 0x3FFFFFFF);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TSRH, in_be32((volatile unsigned *)GPIO0_TSRH) &amp; 0xFFFFFFF0);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TSRL, in_be32((volatile unsigned *)GPIO0_TSRL) &amp; 0x3FFFFFFF);</div><div class='ctx'> 	/* enable output driver */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN |</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TCR, in_be32((volatile unsigned *)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN |</div><div class='ctx'> 		 NAND_EVB_CLE_GPIO_PIN | NAND_EVB_ALE_GPIO_PIN);</div><div class='ctx'> #ifdef USE_READY_BUSY_PIN</div><div class='ctx'> 	/* three-state select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) &amp; 0xFFFFFFFC);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TSRL, in_be32((volatile unsigned *)GPIO0_TSRL) &amp; 0xFFFFFFFC);</div><div class='ctx'> 	/* high-impedecence */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) &amp; (~NAND_EVB_RB_GPIO_PIN));</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_TCR, in_be32((volatile unsigned *)GPIO0_TCR) &amp; (~NAND_EVB_RB_GPIO_PIN));</div><div class='ctx'> 	/* input select */</div><div class='del'>-	out_be32((volatile unsigned*)GPIO0_ISR1L, (in_be32((volatile unsigned*)GPIO0_ISR1L) &amp; 0xFFFFFFFC) | 0x00000001);</div><div class='add'>+	out_be32((volatile unsigned *)GPIO0_ISR1L,</div><div class='add'>+		 (in_be32((volatile unsigned *)GPIO0_ISR1L) &amp; 0xFFFFFFFC) | 0x00000001);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* insert callbacks */</div><div class='ctx'> 	this-&gt;IO_ADDR_R = ppchameleonevb_fio_base;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = ppchameleonevb_fio_base;</div><div class='del'>-	this-&gt;hwcontrol = ppchameleonevb_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = ppchameleonevb_hwcontrol;</div><div class='ctx'> #ifdef USE_READY_BUSY_PIN</div><div class='ctx'> 	this-&gt;dev_ready = ppchameleonevb_device_ready;</div><div class='ctx'> #endif</div><div class='ctx'> 	this-&gt;chip_delay = NAND_SMALL_DELAY_US;</div><div class='ctx'> </div><div class='ctx'> 	/* ECC mode */</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device */</div><div class='del'>-	if (nand_scan (ppchameleonevb_mtd, 1)) {</div><div class='add'>+	if (nand_scan(ppchameleonevb_mtd, 1)) {</div><div class='ctx'> 		iounmap((void *)ppchameleonevb_fio_base);</div><div class='del'>-		kfree (ppchameleonevb_mtd);</div><div class='add'>+		kfree(ppchameleonevb_mtd);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> 	ppchameleonevb_mtd-&gt;name = NAND_EVB_MTD_NAME;</div><div class='ctx'> 	mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, part_probes_evb, &amp;mtd_parts, 0);</div><div class='ctx'> 	if (mtd_parts_nb &gt; 0)</div><div class='del'>-	  part_type = "command line";</div><div class='add'>+		part_type = "command line";</div><div class='ctx'> 	else</div><div class='del'>-	  mtd_parts_nb = 0;</div><div class='add'>+		mtd_parts_nb = 0;</div><div class='ctx'> #endif</div><div class='del'>-	if (mtd_parts_nb == 0)</div><div class='del'>-	{</div><div class='add'>+	if (mtd_parts_nb == 0) {</div><div class='ctx'> 		mtd_parts = partition_info_evb;</div><div class='ctx'> 		mtd_parts_nb = NUM_PARTITIONS;</div><div class='ctx'> 		part_type = "static";</div><div class='hunk'>@@ -390,18 +401,19 @@ nand_evb_init:</div><div class='ctx'> 	/* Return happy */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_init(ppchameleonevb_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-static void __exit ppchameleonevb_cleanup (void)</div><div class='add'>+static void __exit ppchameleonevb_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> </div><div class='ctx'> 	/* Release resources, unregister device(s) */</div><div class='del'>-	nand_release (ppchameleon_mtd);</div><div class='del'>-	nand_release (ppchameleonevb_mtd);</div><div class='add'>+	nand_release(ppchameleon_mtd);</div><div class='add'>+	nand_release(ppchameleonevb_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Release iomaps */</div><div class='ctx'> 	this = (struct nand_chip *) &amp;ppchameleon_mtd[1];</div><div class='head'>diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c<br/>index 4129c03dfd90..f8c49645324d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/rtc_from4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/rtc_from4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/rtc_from4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/rtc_from4.c</a></div><div class='hunk'>@@ -97,12 +97,12 @@ static struct mtd_info *rtc_from4_mtd = NULL;</div><div class='ctx'> static void __iomem *rtc_from4_fio_base = (void *)P2SEGADDR(RTC_FROM4_FIO_BASE);</div><div class='ctx'> </div><div class='ctx'> static const struct mtd_partition partition_info[] = {</div><div class='del'>-        {</div><div class='del'>-                .name   = "Renesas flash partition 1",</div><div class='del'>-                .offset = 0,</div><div class='del'>-                .size   = MTDPART_SIZ_FULL</div><div class='del'>-        },</div><div class='add'>+	{</div><div class='add'>+	 .name = "Renesas flash partition 1",</div><div class='add'>+	 .offset = 0,</div><div class='add'>+	 .size = MTDPART_SIZ_FULL},</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> #define NUM_PARTITIONS 1</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -111,8 +111,8 @@ static const struct mtd_partition partition_info[] = {</div><div class='ctx'>  *		NAND_BBT_CREATE and/or NAND_BBT_WRITE</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' };</div><div class='del'>-static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' };</div><div class='add'>+static uint8_t bbt_pattern[] = { 'B', 'b', 't', '0' };</div><div class='add'>+static uint8_t mirror_pattern[] = { '1', 't', 'b', 'B' };</div><div class='ctx'> </div><div class='ctx'> static struct nand_bbt_descr rtc_from4_bbt_main_descr = {</div><div class='ctx'> 	.options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE</div><div class='hunk'>@@ -134,8 +134,6 @@ static struct nand_bbt_descr rtc_from4_bbt_mirror_descr = {</div><div class='ctx'> 	.pattern = mirror_pattern</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #ifdef RTC_FROM4_HWECC</div><div class='ctx'> </div><div class='ctx'> /* the Reed Solomon control structure */</div><div class='hunk'>@@ -144,15 +142,14 @@ static struct rs_control *rs_decoder;</div><div class='ctx'> /*</div><div class='ctx'>  *      hardware specific Out Of Band information</div><div class='ctx'>  */</div><div class='del'>-static struct nand_oobinfo rtc_from4_nand_oobinfo = {</div><div class='del'>-	.useecc = MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout rtc_from4_nand_oobinfo = {</div><div class='ctx'> 	.eccbytes = 32,</div><div class='ctx'> 	.eccpos = {</div><div class='del'>-		 0,  1,  2,  3,  4,  5,  6,  7,</div><div class='del'>-		 8,  9, 10, 11, 12, 13, 14, 15,</div><div class='del'>-		16, 17, 18, 19, 20, 21, 22, 23,</div><div class='del'>-		24, 25, 26, 27, 28, 29, 30, 31},</div><div class='del'>-	.oobfree = { {32, 32} }</div><div class='add'>+		   0, 1, 2, 3, 4, 5, 6, 7,</div><div class='add'>+		   8, 9, 10, 11, 12, 13, 14, 15,</div><div class='add'>+		   16, 17, 18, 19, 20, 21, 22, 23,</div><div class='add'>+		   24, 25, 26, 27, 28, 29, 30, 31},</div><div class='add'>+	.oobfree = {{32, 32}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Aargh. I missed the reversed bit order, when I</div><div class='hunk'>@@ -162,44 +159,42 @@ static struct nand_oobinfo rtc_from4_nand_oobinfo = {</div><div class='ctx'>  * of the ecc byte which we get from the FPGA</div><div class='ctx'>  */</div><div class='ctx'> static uint8_t revbits[256] = {</div><div class='del'>-        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,</div><div class='del'>-        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,</div><div class='del'>-        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,</div><div class='del'>-        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,</div><div class='del'>-        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,</div><div class='del'>-        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,</div><div class='del'>-        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,</div><div class='del'>-        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,</div><div class='del'>-        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,</div><div class='del'>-        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,</div><div class='del'>-        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,</div><div class='del'>-        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,</div><div class='del'>-        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,</div><div class='del'>-        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,</div><div class='del'>-        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,</div><div class='del'>-        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,</div><div class='del'>-        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,</div><div class='del'>-        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,</div><div class='del'>-        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,</div><div class='del'>-        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,</div><div class='del'>-        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,</div><div class='del'>-        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,</div><div class='del'>-        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,</div><div class='del'>-        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,</div><div class='del'>-        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,</div><div class='del'>-        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,</div><div class='del'>-        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,</div><div class='del'>-        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,</div><div class='del'>-        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,</div><div class='del'>-        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,</div><div class='del'>-        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,</div><div class='del'>-        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,</div><div class='add'>+	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,</div><div class='add'>+	0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,</div><div class='add'>+	0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,</div><div class='add'>+	0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,</div><div class='add'>+	0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,</div><div class='add'>+	0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,</div><div class='add'>+	0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,</div><div class='add'>+	0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,</div><div class='add'>+	0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,</div><div class='add'>+	0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,</div><div class='add'>+	0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,</div><div class='add'>+	0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,</div><div class='add'>+	0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,</div><div class='add'>+	0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,</div><div class='add'>+	0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,</div><div class='add'>+	0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,</div><div class='add'>+	0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,</div><div class='add'>+	0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,</div><div class='add'>+	0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,</div><div class='add'>+	0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,</div><div class='add'>+	0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,</div><div class='add'>+	0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,</div><div class='add'>+	0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,</div><div class='add'>+	0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,</div><div class='add'>+	0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,</div><div class='add'>+	0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,</div><div class='add'>+	0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,</div><div class='add'>+	0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,</div><div class='add'>+	0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,</div><div class='add'>+	0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,</div><div class='add'>+	0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,</div><div class='add'>+	0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * rtc_from4_hwcontrol - hardware specific access to control-lines</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -212,35 +207,20 @@ static uint8_t revbits[256] = {</div><div class='ctx'>  * Address lines (A24-A22), so no action is required here.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+				unsigned int ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip* this = (struct nand_chip *) (mtd-&gt;priv);</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='add'>+	struct nand_chip *chip = (mtd-&gt;priv);</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W | RTC_FROM4_CLE);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-		this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W &amp; ~RTC_FROM4_CLE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W | RTC_FROM4_ALE);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-		this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W &amp; ~RTC_FROM4_ALE);</div><div class='del'>-		break;</div><div class='add'>+	if (cmd == NAND_CMD_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='add'>+	if (ctrl &amp; NAND_CLE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W | RTC_FROM4_CLE);</div><div class='add'>+	else</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W | RTC_FROM4_ALE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * rtc_from4_nand_select_chip - hardware specific chip select</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -252,26 +232,25 @@ static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='ctx'>  */</div><div class='ctx'> static void rtc_from4_nand_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'> {</div><div class='del'>-        struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;IO_ADDR_R = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_R &amp; ~RTC_FROM4_NAND_ADDR_MASK);</div><div class='ctx'> 	this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W &amp; ~RTC_FROM4_NAND_ADDR_MASK);</div><div class='ctx'> </div><div class='del'>-        switch(chip) {</div><div class='add'>+	switch (chip) {</div><div class='ctx'> </div><div class='del'>-        case 0:		/* select slot 3 chip */</div><div class='add'>+	case 0:		/* select slot 3 chip */</div><div class='ctx'> 		this-&gt;IO_ADDR_R = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_R | RTC_FROM4_NAND_ADDR_SLOT3);</div><div class='ctx'> 		this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W | RTC_FROM4_NAND_ADDR_SLOT3);</div><div class='del'>-                break;</div><div class='del'>-        case 1:		/* select slot 4 chip */</div><div class='add'>+		break;</div><div class='add'>+	case 1:		/* select slot 4 chip */</div><div class='ctx'> 		this-&gt;IO_ADDR_R = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_R | RTC_FROM4_NAND_ADDR_SLOT4);</div><div class='ctx'> 		this-&gt;IO_ADDR_W = (void __iomem *)((unsigned long)this-&gt;IO_ADDR_W | RTC_FROM4_NAND_ADDR_SLOT4);</div><div class='del'>-                break;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-        }</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * rtc_from4_nand_device_ready - hardware specific ready/busy check</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -290,7 +269,6 @@ static int rtc_from4_nand_device_ready(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * deplete - code to perform device recovery in case there was a power loss</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -306,24 +284,23 @@ static int rtc_from4_nand_device_ready(struct mtd_info *mtd)</div><div class='ctx'>  */</div><div class='ctx'> static void deplete(struct mtd_info *mtd, int chip)</div><div class='ctx'> {</div><div class='del'>-        struct nand_chip *this = mtd-&gt;priv;</div><div class='add'>+	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-        /* wait until device is ready */</div><div class='del'>-        while (!this-&gt;dev_ready(mtd));</div><div class='add'>+	/* wait until device is ready */</div><div class='add'>+	while (!this-&gt;dev_ready(mtd)) ;</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;select_chip(mtd, chip);</div><div class='ctx'> </div><div class='ctx'> 	/* Send the commands for device recovery, phase 1 */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0000);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_DEPLETE2, -1, -1);</div><div class='add'>+	this-&gt;cmdfunc(mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0000);</div><div class='add'>+	this-&gt;cmdfunc(mtd, NAND_CMD_DEPLETE2, -1, -1);</div><div class='ctx'> </div><div class='ctx'> 	/* Send the commands for device recovery, phase 2 */</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0004);</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_DEPLETE2, -1, -1);</div><div class='add'>+	this-&gt;cmdfunc(mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0004);</div><div class='add'>+	this-&gt;cmdfunc(mtd, NAND_CMD_DEPLETE2, -1, -1);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef RTC_FROM4_HWECC</div><div class='ctx'> /*</div><div class='ctx'>  * rtc_from4_enable_hwecc - hardware specific hardware ECC enable function</div><div class='hunk'>@@ -335,39 +312,35 @@ static void deplete(struct mtd_info *mtd, int chip)</div><div class='ctx'>  */</div><div class='ctx'> static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned short * rs_ecc_ctl = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC_CTL);</div><div class='add'>+	volatile unsigned short *rs_ecc_ctl = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC_CTL);</div><div class='ctx'> 	unsigned short status;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='del'>-	    case NAND_ECC_READ :</div><div class='del'>-		status =  RTC_FROM4_RS_ECC_CTL_CLR</div><div class='del'>-			| RTC_FROM4_RS_ECC_CTL_FD_E;</div><div class='add'>+	case NAND_ECC_READ:</div><div class='add'>+		status = RTC_FROM4_RS_ECC_CTL_CLR | RTC_FROM4_RS_ECC_CTL_FD_E;</div><div class='ctx'> </div><div class='ctx'> 		*rs_ecc_ctl = status;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	    case NAND_ECC_READSYN :</div><div class='del'>-		status =  0x00;</div><div class='add'>+	case NAND_ECC_READSYN:</div><div class='add'>+		status = 0x00;</div><div class='ctx'> </div><div class='ctx'> 		*rs_ecc_ctl = status;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	    case NAND_ECC_WRITE :</div><div class='del'>-		status =  RTC_FROM4_RS_ECC_CTL_CLR</div><div class='del'>-			| RTC_FROM4_RS_ECC_CTL_GEN</div><div class='del'>-			| RTC_FROM4_RS_ECC_CTL_FD_E;</div><div class='add'>+	case NAND_ECC_WRITE:</div><div class='add'>+		status = RTC_FROM4_RS_ECC_CTL_CLR | RTC_FROM4_RS_ECC_CTL_GEN | RTC_FROM4_RS_ECC_CTL_FD_E;</div><div class='ctx'> </div><div class='ctx'> 		*rs_ecc_ctl = status;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	    default:</div><div class='add'>+	default:</div><div class='ctx'> 		BUG();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * rtc_from4_calculate_ecc - hardware specific code to read ECC code</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -383,7 +356,7 @@ static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'>  */</div><div class='ctx'> static void rtc_from4_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)</div><div class='ctx'> {</div><div class='del'>-	volatile unsigned short * rs_eccn = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECCN);</div><div class='add'>+	volatile unsigned short *rs_eccn = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECCN);</div><div class='ctx'> 	unsigned short value;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +368,6 @@ static void rtc_from4_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_c</div><div class='ctx'> 	ecc_code[7] |= 0x0f;	/* set the last four bits (not used) */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * rtc_from4_correct_data - hardware specific code to correct data using ECC code</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -414,7 +386,7 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha</div><div class='ctx'> 	unsigned short status;</div><div class='ctx'> 	uint16_t par[6], syn[6];</div><div class='ctx'> 	uint8_t ecc[8];</div><div class='del'>-        volatile unsigned short *rs_ecc;</div><div class='add'>+	volatile unsigned short *rs_ecc;</div><div class='ctx'> </div><div class='ctx'> 	status = *((volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC_CHK));</div><div class='ctx'> </div><div class='hunk'>@@ -424,23 +396,18 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha</div><div class='ctx'> </div><div class='ctx'> 	/* Read the syndrom pattern from the FPGA and correct the bitorder */</div><div class='ctx'> 	rs_ecc = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC);</div><div class='del'>-        for (i = 0; i &lt; 8; i++) {</div><div class='del'>-                ecc[i] = revbits[(*rs_ecc) &amp; 0xFF];</div><div class='del'>-                rs_ecc++;</div><div class='del'>-        }</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		ecc[i] = revbits[(*rs_ecc) &amp; 0xFF];</div><div class='add'>+		rs_ecc++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* convert into 6 10bit syndrome fields */</div><div class='del'>-	par[5] = rs_decoder-&gt;index_of[(((uint16_t)ecc[0] &gt;&gt; 0) &amp; 0x0ff) |</div><div class='del'>-				      (((uint16_t)ecc[1] &lt;&lt; 8) &amp; 0x300)];</div><div class='del'>-	par[4] = rs_decoder-&gt;index_of[(((uint16_t)ecc[1] &gt;&gt; 2) &amp; 0x03f) |</div><div class='del'>-				      (((uint16_t)ecc[2] &lt;&lt; 6) &amp; 0x3c0)];</div><div class='del'>-	par[3] = rs_decoder-&gt;index_of[(((uint16_t)ecc[2] &gt;&gt; 4) &amp; 0x00f) |</div><div class='del'>-				      (((uint16_t)ecc[3] &lt;&lt; 4) &amp; 0x3f0)];</div><div class='del'>-	par[2] = rs_decoder-&gt;index_of[(((uint16_t)ecc[3] &gt;&gt; 6) &amp; 0x003) |</div><div class='del'>-				      (((uint16_t)ecc[4] &lt;&lt; 2) &amp; 0x3fc)];</div><div class='del'>-	par[1] = rs_decoder-&gt;index_of[(((uint16_t)ecc[5] &gt;&gt; 0) &amp; 0x0ff) |</div><div class='del'>-				      (((uint16_t)ecc[6] &lt;&lt; 8) &amp; 0x300)];</div><div class='del'>-	par[0] = (((uint16_t)ecc[6] &gt;&gt; 2) &amp; 0x03f) | (((uint16_t)ecc[7] &lt;&lt; 6) &amp; 0x3c0);</div><div class='add'>+	par[5] = rs_decoder-&gt;index_of[(((uint16_t) ecc[0] &gt;&gt; 0) &amp; 0x0ff) | (((uint16_t) ecc[1] &lt;&lt; 8) &amp; 0x300)];</div><div class='add'>+	par[4] = rs_decoder-&gt;index_of[(((uint16_t) ecc[1] &gt;&gt; 2) &amp; 0x03f) | (((uint16_t) ecc[2] &lt;&lt; 6) &amp; 0x3c0)];</div><div class='add'>+	par[3] = rs_decoder-&gt;index_of[(((uint16_t) ecc[2] &gt;&gt; 4) &amp; 0x00f) | (((uint16_t) ecc[3] &lt;&lt; 4) &amp; 0x3f0)];</div><div class='add'>+	par[2] = rs_decoder-&gt;index_of[(((uint16_t) ecc[3] &gt;&gt; 6) &amp; 0x003) | (((uint16_t) ecc[4] &lt;&lt; 2) &amp; 0x3fc)];</div><div class='add'>+	par[1] = rs_decoder-&gt;index_of[(((uint16_t) ecc[5] &gt;&gt; 0) &amp; 0x0ff) | (((uint16_t) ecc[6] &lt;&lt; 8) &amp; 0x300)];</div><div class='add'>+	par[0] = (((uint16_t) ecc[6] &gt;&gt; 2) &amp; 0x03f) | (((uint16_t) ecc[7] &lt;&lt; 6) &amp; 0x3c0);</div><div class='ctx'> </div><div class='ctx'> 	/* Convert to computable syndrome */</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++) {</div><div class='hunk'>@@ -453,16 +420,14 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha</div><div class='ctx'> 		syn[i] = rs_decoder-&gt;index_of[syn[i]];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Let the library code do its magic.*/</div><div class='del'>-	res = decode_rs8(rs_decoder, (uint8_t *)buf, par, 512, syn, 0, NULL, 0xff, NULL);</div><div class='add'>+	/* Let the library code do its magic. */</div><div class='add'>+	res = decode_rs8(rs_decoder, (uint8_t *) buf, par, 512, syn, 0, NULL, 0xff, NULL);</div><div class='ctx'> 	if (res &gt; 0) {</div><div class='del'>-		DEBUG (MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: "</div><div class='del'>-			"ECC corrected %d errors on read\n", res);</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: " "ECC corrected %d errors on read\n", res);</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * rtc_from4_errstat - perform additional error status checks</div><div class='ctx'>  * @mtd:	MTD device structure</div><div class='hunk'>@@ -478,54 +443,66 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha</div><div class='ctx'>  * note: see pages 34..37 of data sheet for details.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int state, int status, int page)</div><div class='add'>+static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this,</div><div class='add'>+			     int state, int status, int page)</div><div class='ctx'> {</div><div class='del'>-	int	er_stat=0;</div><div class='del'>-	int	rtn, retlen;</div><div class='del'>-	size_t	len;</div><div class='add'>+	int er_stat = 0;</div><div class='add'>+	int rtn, retlen;</div><div class='add'>+	size_t len;</div><div class='ctx'> 	uint8_t *buf;</div><div class='del'>-	int	i;</div><div class='del'>-</div><div class='del'>-	this-&gt;cmdfunc (mtd, NAND_CMD_STATUS_CLEAR, -1, -1);</div><div class='del'>-</div><div class='del'>-        if (state == FL_ERASING) {</div><div class='del'>-		for (i=0; i&lt;4; i++) {</div><div class='del'>-			if (status &amp; 1&lt;&lt;(i+1)) {</div><div class='del'>-				this-&gt;cmdfunc (mtd, (NAND_CMD_STATUS_ERROR + i + 1), -1, -1);</div><div class='del'>-				rtn = this-&gt;read_byte(mtd);</div><div class='del'>-				this-&gt;cmdfunc (mtd, NAND_CMD_STATUS_RESET, -1, -1);</div><div class='del'>-				if (!(rtn &amp; ERR_STAT_ECC_AVAILABLE)) {</div><div class='del'>-					er_stat |= 1&lt;&lt;(i+1);	/* err_ecc_not_avail */</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	this-&gt;cmdfunc(mtd, NAND_CMD_STATUS_CLEAR, -1, -1);</div><div class='add'>+</div><div class='add'>+	if (state == FL_ERASING) {</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			if (!(status &amp; 1 &lt;&lt; (i + 1)))</div><div class='add'>+				continue;</div><div class='add'>+			this-&gt;cmdfunc(mtd, (NAND_CMD_STATUS_ERROR + i + 1),</div><div class='add'>+				      -1, -1);</div><div class='add'>+			rtn = this-&gt;read_byte(mtd);</div><div class='add'>+			this-&gt;cmdfunc(mtd, NAND_CMD_STATUS_RESET, -1, -1);</div><div class='add'>+</div><div class='add'>+			/* err_ecc_not_avail */</div><div class='add'>+			if (!(rtn &amp; ERR_STAT_ECC_AVAILABLE))</div><div class='add'>+				er_stat |= 1 &lt;&lt; (i + 1);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 	} else if (state == FL_WRITING) {</div><div class='add'>+</div><div class='add'>+		unsigned long corrected = mtd-&gt;ecc_stats.corrected;</div><div class='add'>+</div><div class='ctx'> 		/* single bank write logic */</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_STATUS_ERROR, -1, -1);</div><div class='add'>+		this-&gt;cmdfunc(mtd, NAND_CMD_STATUS_ERROR, -1, -1);</div><div class='ctx'> 		rtn = this-&gt;read_byte(mtd);</div><div class='del'>-		this-&gt;cmdfunc (mtd, NAND_CMD_STATUS_RESET, -1, -1);</div><div class='add'>+		this-&gt;cmdfunc(mtd, NAND_CMD_STATUS_RESET, -1, -1);</div><div class='add'>+</div><div class='ctx'> 		if (!(rtn &amp; ERR_STAT_ECC_AVAILABLE)) {</div><div class='del'>-			er_stat |= 1&lt;&lt;1;	/* err_ecc_not_avail */</div><div class='del'>-		} else {</div><div class='del'>-			len = mtd-&gt;oobblock;</div><div class='del'>-			buf = kmalloc (len, GFP_KERNEL);</div><div class='del'>-			if (!buf) {</div><div class='del'>-				printk (KERN_ERR "rtc_from4_errstat: Out of memory!\n");</div><div class='del'>-				er_stat = 1;			/* if we can't check, assume failed */</div><div class='del'>-			} else {</div><div class='del'>-				/* recovery read */</div><div class='del'>-				/* page read */</div><div class='del'>-				rtn = nand_do_read_ecc (mtd, page, len, &amp;retlen, buf, NULL, this-&gt;autooob, 1);</div><div class='del'>-				if (rtn) {	/* if read failed or &gt; 1-bit error corrected */</div><div class='del'>-					er_stat |= 1&lt;&lt;1;	/* ECC read failed */</div><div class='del'>-				}</div><div class='del'>-				kfree(buf);</div><div class='del'>-			}</div><div class='add'>+			/* err_ecc_not_avail */</div><div class='add'>+			er_stat |= 1 &lt;&lt; 1;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = mtd-&gt;writesize;</div><div class='add'>+		buf = kmalloc(len, GFP_KERNEL);</div><div class='add'>+		if (!buf) {</div><div class='add'>+			printk(KERN_ERR "rtc_from4_errstat: Out of memory!\n");</div><div class='add'>+			er_stat = 1;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* recovery read */</div><div class='add'>+		rtn = nand_do_read(mtd, page, len, &amp;retlen, buf);</div><div class='add'>+</div><div class='add'>+		/* if read failed or &gt; 1-bit error corrected */</div><div class='add'>+		if (rtn || (mtd-&gt;ecc_stats.corrected - corrected) &gt; 1) {</div><div class='add'>+			er_stat |= 1 &lt;&lt; 1;</div><div class='add'>+		kfree(buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rtn = status;</div><div class='del'>-	if (er_stat == 0) {				/* if ECC is available   */</div><div class='add'>+	if (er_stat == 0) {	/* if ECC is available   */</div><div class='ctx'> 		rtn = (status &amp; ~NAND_STATUS_FAIL);	/*   clear the error bit */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -533,33 +510,32 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int s</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-int __init rtc_from4_init (void)</div><div class='add'>+static int __init rtc_from4_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	unsigned short bcr1, bcr2, wcr2;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	rtc_from4_mtd = kmalloc(sizeof(struct mtd_info) + sizeof (struct nand_chip),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	rtc_from4_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!rtc_from4_mtd) {</div><div class='del'>-		printk ("Unable to allocate Renesas NAND MTD device structure.\n");</div><div class='add'>+		printk("Unable to allocate Renesas NAND MTD device structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;rtc_from4_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;rtc_from4_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) rtc_from4_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(rtc_from4_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	rtc_from4_mtd-&gt;priv = this;</div><div class='add'>+	rtc_from4_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/* set area 5 as PCMCIA mode to clear the spec of tDH(Data hold time;9ns min) */</div><div class='ctx'> 	bcr1 = *SH77X9_BCR1 &amp; ~0x0002;</div><div class='hunk'>@@ -580,9 +556,9 @@ int __init rtc_from4_init (void)</div><div class='ctx'> 	this-&gt;IO_ADDR_R = rtc_from4_fio_base;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = rtc_from4_fio_base;</div><div class='ctx'> 	/* Set address of hardware control function */</div><div class='del'>-	this-&gt;hwcontrol = rtc_from4_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = rtc_from4_hwcontrol;</div><div class='ctx'> 	/* Set address of chip select function */</div><div class='del'>-        this-&gt;select_chip = rtc_from4_nand_select_chip;</div><div class='add'>+	this-&gt;select_chip = rtc_from4_nand_select_chip;</div><div class='ctx'> 	/* command delay time (in us) */</div><div class='ctx'> 	this-&gt;chip_delay = 100;</div><div class='ctx'> 	/* return the status of the Ready/Busy line */</div><div class='hunk'>@@ -591,19 +567,20 @@ int __init rtc_from4_init (void)</div><div class='ctx'> #ifdef RTC_FROM4_HWECC</div><div class='ctx'> 	printk(KERN_INFO "rtc_from4_init: using hardware ECC detection.\n");</div><div class='ctx'> </div><div class='del'>-        this-&gt;eccmode = NAND_ECC_HW8_512;</div><div class='del'>-	this-&gt;options |= NAND_HWECC_SYNDROME;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_HW_SYNDROME;</div><div class='add'>+	this-&gt;ecc.size = 512;</div><div class='add'>+	this-&gt;ecc.bytes = 8;</div><div class='ctx'> 	/* return the status of extra status and ECC checks */</div><div class='ctx'> 	this-&gt;errstat = rtc_from4_errstat;</div><div class='ctx'> 	/* set the nand_oobinfo to support FPGA H/W error detection */</div><div class='del'>-	this-&gt;autooob = &amp;rtc_from4_nand_oobinfo;</div><div class='del'>-	this-&gt;enable_hwecc = rtc_from4_enable_hwecc;</div><div class='del'>-	this-&gt;calculate_ecc = rtc_from4_calculate_ecc;</div><div class='del'>-	this-&gt;correct_data = rtc_from4_correct_data;</div><div class='add'>+	this-&gt;ecc.layout = &amp;rtc_from4_nand_oobinfo;</div><div class='add'>+	this-&gt;ecc.hwctl = rtc_from4_enable_hwecc;</div><div class='add'>+	this-&gt;ecc.calculate = rtc_from4_calculate_ecc;</div><div class='add'>+	this-&gt;ecc.correct = rtc_from4_correct_data;</div><div class='ctx'> #else</div><div class='ctx'> 	printk(KERN_INFO "rtc_from4_init: using software ECC detection.\n");</div><div class='ctx'> </div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* set the bad block tables to support debugging */</div><div class='hunk'>@@ -617,7 +594,7 @@ int __init rtc_from4_init (void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Perform 'device recovery' for each chip in case there was a power loss. */</div><div class='del'>-	for (i=0; i &lt; this-&gt;numchips; i++) {</div><div class='add'>+	for (i = 0; i &lt; this-&gt;numchips; i++) {</div><div class='ctx'> 		deplete(rtc_from4_mtd, i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -643,7 +620,7 @@ int __init rtc_from4_init (void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	rs_decoder = init_rs(10, 0x409, 0, 1, 6);</div><div class='ctx'> 	if (!rs_decoder) {</div><div class='del'>-		printk (KERN_ERR "Could not create a RS decoder\n");</div><div class='add'>+		printk(KERN_ERR "Could not create a RS decoder\n");</div><div class='ctx'> 		nand_release(rtc_from4_mtd);</div><div class='ctx'> 		kfree(rtc_from4_mtd);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -652,20 +629,19 @@ int __init rtc_from4_init (void)</div><div class='ctx'> 	/* Return happy */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-module_init(rtc_from4_init);</div><div class='ctx'> </div><div class='add'>+module_init(rtc_from4_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static void __exit rtc_from4_cleanup (void)</div><div class='add'>+static void __exit rtc_from4_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Release resource, unregister partitions */</div><div class='ctx'> 	nand_release(rtc_from4_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (rtc_from4_mtd);</div><div class='add'>+	kfree(rtc_from4_mtd);</div><div class='ctx'> </div><div class='ctx'> #ifdef RTC_FROM4_HWECC</div><div class='ctx'> 	/* Free the reed solomon resources */</div><div class='hunk'>@@ -674,10 +650,9 @@ static void __exit rtc_from4_cleanup (void)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(rtc_from4_cleanup);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("d.marlin &lt;dmarlin@redhat.com");</div><div class='ctx'> MODULE_DESCRIPTION("Board-specific glue layer for AG-AND flash on Renesas FROM_BOARD4");</div><div class='del'>-</div><div class='head'>diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c<br/>index 5b55599739f3..ff5cef24d5bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/s3c2410.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/s3c2410.c</a></div><div class='hunk'>@@ -18,8 +18,9 @@</div><div class='ctx'>  *	20-Jun-2005  BJD  Updated s3c2440 support, fixed timing bug</div><div class='ctx'>  *	08-Jul-2005  BJD  Fix OOPS when no platform data supplied</div><div class='ctx'>  *	20-Oct-2005  BJD  Fix timing calculation bug</div><div class='add'>+ *	14-Jan-2006  BJD  Allow clock to be stopped when idle</div><div class='ctx'>  *</div><div class='del'>- * $Id: s3c2410.c,v 1.20 2005/11/07 11:14:31 gleixner Exp $</div><div class='add'>+ * $Id: s3c2410.c,v 1.23 2006/04/01 18:06:29 bjd Exp $</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -36,9 +37,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;config/mtd/nand/s3c2410/hwecc.h&gt;</div><div class='del'>-#include &lt;config/mtd/nand/s3c2410/debug.h&gt;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MTD_NAND_S3C2410_DEBUG</div><div class='ctx'> #define DEBUG</div><div class='ctx'> #endif</div><div class='hunk'>@@ -65,22 +63,26 @@</div><div class='ctx'> #include &lt;asm/arch/regs-nand.h&gt;</div><div class='ctx'> #include &lt;asm/arch/nand.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PFX "s3c2410-nand: "</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MTD_NAND_S3C2410_HWECC</div><div class='ctx'> static int hardware_ecc = 1;</div><div class='ctx'> #else</div><div class='ctx'> static int hardware_ecc = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MTD_NAND_S3C2410_CLKSTOP</div><div class='add'>+static int clock_stop = 1;</div><div class='add'>+#else</div><div class='add'>+static const int clock_stop = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* new oob placement block for use with hardware ecc generation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct nand_oobinfo nand_hw_eccoob = {</div><div class='del'>-	.useecc		= MTD_NANDECC_AUTOPLACE,</div><div class='del'>-	.eccbytes	= 3,</div><div class='del'>-	.eccpos		= {0, 1, 2 },</div><div class='del'>-	.oobfree	= { {8, 8} }</div><div class='add'>+static struct nand_ecclayout nand_hw_eccoob = {</div><div class='add'>+	.eccbytes = 3,</div><div class='add'>+	.eccpos = {0, 1, 2},</div><div class='add'>+	.oobfree = {{8, 8}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* controller and mtd information */</div><div class='hunk'>@@ -95,6 +97,12 @@ struct s3c2410_nand_mtd {</div><div class='ctx'> 	int				scan_res;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum s3c_cpu_type {</div><div class='add'>+	TYPE_S3C2410,</div><div class='add'>+	TYPE_S3C2412,</div><div class='add'>+	TYPE_S3C2440,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* overview of the s3c2410 nand state */</div><div class='ctx'> </div><div class='ctx'> struct s3c2410_nand_info {</div><div class='hunk'>@@ -108,9 +116,11 @@ struct s3c2410_nand_info {</div><div class='ctx'> 	struct resource			*area;</div><div class='ctx'> 	struct clk			*clk;</div><div class='ctx'> 	void __iomem			*regs;</div><div class='add'>+	void __iomem			*sel_reg;</div><div class='add'>+	int				sel_bit;</div><div class='ctx'> 	int				mtd_count;</div><div class='ctx'> </div><div class='del'>-	unsigned char			is_s3c2440;</div><div class='add'>+	enum s3c_cpu_type		cpu_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* conversion functions */</div><div class='hunk'>@@ -135,11 +145,16 @@ static struct s3c2410_platform_nand *to_nand_plat(struct platform_device *dev)</div><div class='ctx'> 	return dev-&gt;dev.platform_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int allow_clk_stop(struct s3c2410_nand_info *info)</div><div class='add'>+{</div><div class='add'>+	return clock_stop;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* timing calculations */</div><div class='ctx'> </div><div class='ctx'> #define NS_IN_KHZ 1000000</div><div class='ctx'> </div><div class='del'>-static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)</div><div class='add'>+static int s3c_nand_calc_rate(int wanted, unsigned long clk, int max)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='hunk'>@@ -149,8 +164,7 @@ static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)</div><div class='ctx'> 	pr_debug("result %d from %ld, %d\n", result, clk, wanted);</div><div class='ctx'> </div><div class='ctx'> 	if (result &gt; max) {</div><div class='del'>-		printk("%d ns is too big for current clock rate %ld\n",</div><div class='del'>-		       wanted, clk);</div><div class='add'>+		printk("%d ns is too big for current clock rate %ld\n", wanted, clk);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -169,46 +183,53 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_platform_nand *plat = to_nand_plat(pdev);</div><div class='ctx'> 	unsigned long clkrate = clk_get_rate(info-&gt;clk);</div><div class='add'>+	int tacls_max = (info-&gt;cpu_type == TYPE_S3C2412) ? 8 : 4;</div><div class='ctx'> 	int tacls, twrph0, twrph1;</div><div class='del'>-	unsigned long cfg;</div><div class='add'>+	unsigned long cfg = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the timing information for the controller */</div><div class='ctx'> </div><div class='ctx'> 	clkrate /= 1000;	/* turn clock into kHz for ease of use */</div><div class='ctx'> </div><div class='ctx'> 	if (plat != NULL) {</div><div class='del'>-		tacls  = s3c2410_nand_calc_rate(plat-&gt;tacls, clkrate, 4);</div><div class='del'>-		twrph0 = s3c2410_nand_calc_rate(plat-&gt;twrph0, clkrate, 8);</div><div class='del'>-		twrph1 = s3c2410_nand_calc_rate(plat-&gt;twrph1, clkrate, 8);</div><div class='add'>+		tacls = s3c_nand_calc_rate(plat-&gt;tacls, clkrate, tacls_max);</div><div class='add'>+		twrph0 = s3c_nand_calc_rate(plat-&gt;twrph0, clkrate, 8);</div><div class='add'>+		twrph1 = s3c_nand_calc_rate(plat-&gt;twrph1, clkrate, 8);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* default timings */</div><div class='del'>-		tacls = 4;</div><div class='add'>+		tacls = tacls_max;</div><div class='ctx'> 		twrph0 = 8;</div><div class='ctx'> 		twrph1 = 8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tacls &lt; 0 || twrph0 &lt; 0 || twrph1 &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "cannot get timings suitable for board\n");</div><div class='add'>+		dev_err(info-&gt;device, "cannot get suitable timings\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",</div><div class='del'>-	       tacls, to_ns(tacls, clkrate),</div><div class='del'>-	       twrph0, to_ns(twrph0, clkrate),</div><div class='del'>-	       twrph1, to_ns(twrph1, clkrate));</div><div class='add'>+	dev_info(info-&gt;device, "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",</div><div class='add'>+	       tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate));</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;is_s3c2440) {</div><div class='del'>-		cfg  = S3C2410_NFCONF_EN;</div><div class='del'>-		cfg |= S3C2410_NFCONF_TACLS(tacls-1);</div><div class='del'>-		cfg |= S3C2410_NFCONF_TWRPH0(twrph0-1);</div><div class='del'>-		cfg |= S3C2410_NFCONF_TWRPH1(twrph1-1);</div><div class='del'>-	} else {</div><div class='del'>-		cfg   = S3C2440_NFCONF_TACLS(tacls-1);</div><div class='del'>-		cfg  |= S3C2440_NFCONF_TWRPH0(twrph0-1);</div><div class='del'>-		cfg  |= S3C2440_NFCONF_TWRPH1(twrph1-1);</div><div class='add'>+ 	switch (info-&gt;cpu_type) {</div><div class='add'>+ 	case TYPE_S3C2410:</div><div class='add'>+		cfg = S3C2410_NFCONF_EN;</div><div class='add'>+		cfg |= S3C2410_NFCONF_TACLS(tacls - 1);</div><div class='add'>+		cfg |= S3C2410_NFCONF_TWRPH0(twrph0 - 1);</div><div class='add'>+		cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+ 	case TYPE_S3C2440:</div><div class='add'>+ 	case TYPE_S3C2412:</div><div class='add'>+		cfg = S3C2440_NFCONF_TACLS(tacls - 1);</div><div class='add'>+		cfg |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);</div><div class='add'>+		cfg |= S3C2440_NFCONF_TWRPH1(twrph1 - 1);</div><div class='add'>+</div><div class='add'>+		/* enable the controller and de-assert nFCE */</div><div class='add'>+</div><div class='add'>+		writel(S3C2440_NFCONT_ENABLE, info-&gt;regs + S3C2440_NFCONT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug(PFX "NF_CONF is 0x%lx\n", cfg);</div><div class='add'>+	dev_dbg(info-&gt;device, "NF_CONF is 0x%lx\n", cfg);</div><div class='ctx'> </div><div class='ctx'> 	writel(cfg, info-&gt;regs + S3C2410_NFCONF);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -221,99 +242,71 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)</div><div class='ctx'> 	struct s3c2410_nand_info *info;</div><div class='ctx'> 	struct s3c2410_nand_mtd *nmtd;</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='del'>-	void __iomem *reg;</div><div class='ctx'> 	unsigned long cur;</div><div class='del'>-	unsigned long bit;</div><div class='ctx'> </div><div class='ctx'> 	nmtd = this-&gt;priv;</div><div class='ctx'> 	info = nmtd-&gt;info;</div><div class='ctx'> </div><div class='del'>-	bit = (info-&gt;is_s3c2440) ? S3C2440_NFCONT_nFCE : S3C2410_NFCONF_nFCE;</div><div class='del'>-	reg = info-&gt;regs+((info-&gt;is_s3c2440) ? S3C2440_NFCONT:S3C2410_NFCONF);</div><div class='add'>+	if (chip != -1 &amp;&amp; allow_clk_stop(info))</div><div class='add'>+		clk_enable(info-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	cur = readl(reg);</div><div class='add'>+	cur = readl(info-&gt;sel_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (chip == -1) {</div><div class='del'>-		cur |= bit;</div><div class='add'>+		cur |= info-&gt;sel_bit;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (nmtd-&gt;set != NULL &amp;&amp; chip &gt; nmtd-&gt;set-&gt;nr_chips) {</div><div class='del'>-			printk(KERN_ERR PFX "chip %d out of range\n", chip);</div><div class='add'>+			dev_err(info-&gt;device, "invalid chip %d\n", chip);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (info-&gt;platform != NULL) {</div><div class='ctx'> 			if (info-&gt;platform-&gt;select_chip != NULL)</div><div class='del'>-				(info-&gt;platform-&gt;select_chip)(nmtd-&gt;set, chip);</div><div class='add'>+				(info-&gt;platform-&gt;select_chip) (nmtd-&gt;set, chip);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cur &amp;= ~bit;</div><div class='add'>+		cur &amp;= ~info-&gt;sel_bit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	writel(cur, reg);</div><div class='add'>+	writel(cur, info-&gt;sel_reg);</div><div class='add'>+</div><div class='add'>+	if (chip == -1 &amp;&amp; allow_clk_stop(info))</div><div class='add'>+		clk_disable(info-&gt;clk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* command and control functions</div><div class='del'>- *</div><div class='del'>- * Note, these all use tglx's method of changing the IO_ADDR_W field</div><div class='del'>- * to make the code simpler, and use the nand layer's code to issue the</div><div class='del'>- * command and address sequences via the proper IO ports.</div><div class='add'>+/* s3c2410_nand_hwcontrol</div><div class='ctx'>  *</div><div class='add'>+ * Issue command and address cycles to the chip</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+				   unsigned int ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='del'>-	struct nand_chip *chip = mtd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		printk(KERN_ERR "%s: called for NCE\n", __FUNCTION__);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		chip-&gt;IO_ADDR_W = info-&gt;regs + S3C2410_NFCMD;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		chip-&gt;IO_ADDR_W = info-&gt;regs + S3C2410_NFADDR;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		/* NAND_CTL_CLRCLE: */</div><div class='del'>-		/* NAND_CTL_CLRALE: */</div><div class='del'>-	default:</div><div class='del'>-		chip-&gt;IO_ADDR_W = info-&gt;regs + S3C2410_NFDATA;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	</div><div class='add'>+	if (cmd == NAND_CMD_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CLE)</div><div class='add'>+		writeb(cmd, info-&gt;regs + S3C2410_NFCMD);</div><div class='add'>+	else</div><div class='add'>+		writeb(cmd, info-&gt;regs + S3C2410_NFADDR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* command and control functions */</div><div class='ctx'> </div><div class='del'>-static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+				   unsigned int ctrl)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='del'>-	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		printk(KERN_ERR "%s: called for NCE\n", __FUNCTION__);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		chip-&gt;IO_ADDR_W = info-&gt;regs + S3C2440_NFCMD;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		chip-&gt;IO_ADDR_W = info-&gt;regs + S3C2440_NFADDR;</div><div class='del'>-		break;</div><div class='add'>+	if (cmd == NAND_CMD_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		/* NAND_CTL_CLRCLE: */</div><div class='del'>-		/* NAND_CTL_CLRALE: */</div><div class='del'>-	default:</div><div class='del'>-		chip-&gt;IO_ADDR_W = info-&gt;regs + S3C2440_NFDATA;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (ctrl &amp; NAND_CLE)</div><div class='add'>+		writeb(cmd, info-&gt;regs + S3C2440_NFCMD);</div><div class='add'>+	else</div><div class='add'>+		writeb(cmd, info-&gt;regs + S3C2440_NFADDR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* s3c2410_nand_devready()</div><div class='hunk'>@@ -324,28 +317,32 @@ static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='ctx'> static int s3c2410_nand_devready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='del'>-</div><div class='del'>-	if (info-&gt;is_s3c2440)</div><div class='del'>-		return readb(info-&gt;regs + S3C2440_NFSTAT) &amp; S3C2440_NFSTAT_READY;</div><div class='ctx'> 	return readb(info-&gt;regs + S3C2410_NFSTAT) &amp; S3C2410_NFSTAT_BUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int s3c2440_nand_devready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='add'>+	return readb(info-&gt;regs + S3C2440_NFSTAT) &amp; S3C2440_NFSTAT_READY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_nand_devready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='add'>+	return readb(info-&gt;regs + S3C2412_NFSTAT) &amp; S3C2412_NFSTAT_READY;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* ECC handling functions */</div><div class='ctx'> </div><div class='ctx'> static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,</div><div class='ctx'> 				     u_char *read_ecc, u_char *calc_ecc)</div><div class='ctx'> {</div><div class='del'>-	pr_debug("s3c2410_nand_correct_data(%p,%p,%p,%p)\n",</div><div class='del'>-		 mtd, dat, read_ecc, calc_ecc);</div><div class='add'>+	pr_debug("s3c2410_nand_correct_data(%p,%p,%p,%p)\n", mtd, dat, read_ecc, calc_ecc);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("eccs: read %02x,%02x,%02x vs calc %02x,%02x,%02x\n",</div><div class='del'>-		 read_ecc[0], read_ecc[1], read_ecc[2],</div><div class='del'>-		 calc_ecc[0], calc_ecc[1], calc_ecc[2]);</div><div class='add'>+		 read_ecc[0], read_ecc[1], read_ecc[2], calc_ecc[0], calc_ecc[1], calc_ecc[2]);</div><div class='ctx'> </div><div class='del'>-	if (read_ecc[0] == calc_ecc[0] &amp;&amp;</div><div class='del'>-	    read_ecc[1] == calc_ecc[1] &amp;&amp;</div><div class='del'>-	    read_ecc[2] == calc_ecc[2])</div><div class='add'>+	if (read_ecc[0] == calc_ecc[0] &amp;&amp; read_ecc[1] == calc_ecc[1] &amp;&amp; read_ecc[2] == calc_ecc[2])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* we curently have no method for correcting the error */</div><div class='hunk'>@@ -378,8 +375,7 @@ static void s3c2440_nand_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'> 	writel(ctrl | S3C2440_NFCONT_INITECC, info-&gt;regs + S3C2440_NFCONT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd,</div><div class='del'>-				      const u_char *dat, u_char *ecc_code)</div><div class='add'>+static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='ctx'> </div><div class='hunk'>@@ -387,15 +383,12 @@ static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd,</div><div class='ctx'> 	ecc_code[1] = readb(info-&gt;regs + S3C2410_NFECC + 1);</div><div class='ctx'> 	ecc_code[2] = readb(info-&gt;regs + S3C2410_NFECC + 2);</div><div class='ctx'> </div><div class='del'>-	pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n",</div><div class='del'>-		 ecc_code[0], ecc_code[1], ecc_code[2]);</div><div class='add'>+	pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n", ecc_code[0], ecc_code[1], ecc_code[2]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd,</div><div class='del'>-				      const u_char *dat, u_char *ecc_code)</div><div class='add'>+static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);</div><div class='ctx'> 	unsigned long ecc = readl(info-&gt;regs + S3C2440_NFMECC0);</div><div class='hunk'>@@ -404,13 +397,11 @@ static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd,</div><div class='ctx'> 	ecc_code[1] = ecc &gt;&gt; 8;</div><div class='ctx'> 	ecc_code[2] = ecc &gt;&gt; 16;</div><div class='ctx'> </div><div class='del'>-	pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n",</div><div class='del'>-		 ecc_code[0], ecc_code[1], ecc_code[2]);</div><div class='add'>+	pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n", ecc_code[0], ecc_code[1], ecc_code[2]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* over-ride the standard functions for a little more speed. We can</div><div class='ctx'>  * use read/write block to move the data buffers to/from the controller</div><div class='ctx'> */</div><div class='hunk'>@@ -421,8 +412,7 @@ static void s3c2410_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)</div><div class='ctx'> 	readsb(this-&gt;IO_ADDR_R, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void s3c2410_nand_write_buf(struct mtd_info *mtd,</div><div class='del'>-				   const u_char *buf, int len)</div><div class='add'>+static void s3c2410_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	writesb(this-&gt;IO_ADDR_W, buf, len);</div><div class='hunk'>@@ -459,7 +449,8 @@ static int s3c2410_nand_remove(struct platform_device *pdev)</div><div class='ctx'> 	/* free the common resources */</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;clk != NULL &amp;&amp; !IS_ERR(info-&gt;clk)) {</div><div class='del'>-		clk_disable(info-&gt;clk);</div><div class='add'>+		if (!allow_clk_stop(info))</div><div class='add'>+			clk_disable(info-&gt;clk);</div><div class='ctx'> 		clk_put(info-&gt;clk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -488,9 +479,7 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,</div><div class='ctx'> 		return add_mtd_device(&amp;mtd-&gt;mtd);</div><div class='ctx'> </div><div class='ctx'> 	if (set-&gt;nr_partitions &gt; 0 &amp;&amp; set-&gt;partitions != NULL) {</div><div class='del'>-		return add_mtd_partitions(&amp;mtd-&gt;mtd,</div><div class='del'>-					  set-&gt;partitions,</div><div class='del'>-					  set-&gt;nr_partitions);</div><div class='add'>+		return add_mtd_partitions(&amp;mtd-&gt;mtd, set-&gt;partitions, set-&gt;nr_partitions);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return add_mtd_device(&amp;mtd-&gt;mtd);</div><div class='hunk'>@@ -514,11 +503,8 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,</div><div class='ctx'> 				   struct s3c2410_nand_set *set)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *chip = &amp;nmtd-&gt;chip;</div><div class='add'>+	void __iomem *regs = info-&gt;regs;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;IO_ADDR_R	   = info-&gt;regs + S3C2410_NFDATA;</div><div class='del'>-	chip-&gt;IO_ADDR_W    = info-&gt;regs + S3C2410_NFDATA;</div><div class='del'>-	chip-&gt;hwcontrol    = s3c2410_nand_hwcontrol;</div><div class='del'>-	chip-&gt;dev_ready    = s3c2410_nand_devready;</div><div class='ctx'> 	chip-&gt;write_buf    = s3c2410_nand_write_buf;</div><div class='ctx'> 	chip-&gt;read_buf     = s3c2410_nand_read_buf;</div><div class='ctx'> 	chip-&gt;select_chip  = s3c2410_nand_select_chip;</div><div class='hunk'>@@ -527,29 +513,66 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,</div><div class='ctx'> 	chip-&gt;options	   = 0;</div><div class='ctx'> 	chip-&gt;controller   = &amp;info-&gt;controller;</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;is_s3c2440) {</div><div class='del'>-		chip-&gt;IO_ADDR_R	 = info-&gt;regs + S3C2440_NFDATA;</div><div class='del'>-		chip-&gt;IO_ADDR_W  = info-&gt;regs + S3C2440_NFDATA;</div><div class='del'>-		chip-&gt;hwcontrol  = s3c2440_nand_hwcontrol;</div><div class='del'>-	}</div><div class='add'>+	switch (info-&gt;cpu_type) {</div><div class='add'>+	case TYPE_S3C2410:</div><div class='add'>+		chip-&gt;IO_ADDR_W = regs + S3C2410_NFDATA;</div><div class='add'>+		info-&gt;sel_reg   = regs + S3C2410_NFCONF;</div><div class='add'>+		info-&gt;sel_bit	= S3C2410_NFCONF_nFCE;</div><div class='add'>+		chip-&gt;cmd_ctrl  = s3c2410_nand_hwcontrol;</div><div class='add'>+		chip-&gt;dev_ready = s3c2410_nand_devready;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TYPE_S3C2440:</div><div class='add'>+		chip-&gt;IO_ADDR_W = regs + S3C2440_NFDATA;</div><div class='add'>+		info-&gt;sel_reg   = regs + S3C2440_NFCONT;</div><div class='add'>+		info-&gt;sel_bit	= S3C2440_NFCONT_nFCE;</div><div class='add'>+		chip-&gt;cmd_ctrl  = s3c2440_nand_hwcontrol;</div><div class='add'>+		chip-&gt;dev_ready = s3c2440_nand_devready;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case TYPE_S3C2412:</div><div class='add'>+		chip-&gt;IO_ADDR_W = regs + S3C2440_NFDATA;</div><div class='add'>+		info-&gt;sel_reg   = regs + S3C2440_NFCONT;</div><div class='add'>+		info-&gt;sel_bit	= S3C2412_NFCONT_nFCE0;</div><div class='add'>+		chip-&gt;cmd_ctrl  = s3c2440_nand_hwcontrol;</div><div class='add'>+		chip-&gt;dev_ready = s3c2412_nand_devready;</div><div class='add'>+</div><div class='add'>+		if (readl(regs + S3C2410_NFCONF) &amp; S3C2412_NFCONF_NANDBOOT)</div><div class='add'>+			dev_info(info-&gt;device, "System booted from NAND\n");</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+  	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;IO_ADDR_R = chip-&gt;IO_ADDR_W;</div><div class='ctx'> </div><div class='ctx'> 	nmtd-&gt;info	   = info;</div><div class='ctx'> 	nmtd-&gt;mtd.priv	   = chip;</div><div class='add'>+	nmtd-&gt;mtd.owner    = THIS_MODULE;</div><div class='ctx'> 	nmtd-&gt;set	   = set;</div><div class='ctx'> </div><div class='ctx'> 	if (hardware_ecc) {</div><div class='del'>-		chip-&gt;correct_data  = s3c2410_nand_correct_data;</div><div class='del'>-		chip-&gt;enable_hwecc  = s3c2410_nand_enable_hwecc;</div><div class='del'>-		chip-&gt;calculate_ecc = s3c2410_nand_calculate_ecc;</div><div class='del'>-		chip-&gt;eccmode	    = NAND_ECC_HW3_512;</div><div class='del'>-		chip-&gt;autooob       = &amp;nand_hw_eccoob;</div><div class='del'>-</div><div class='del'>-		if (info-&gt;is_s3c2440) {</div><div class='del'>-			chip-&gt;enable_hwecc  = s3c2440_nand_enable_hwecc;</div><div class='del'>-			chip-&gt;calculate_ecc = s3c2440_nand_calculate_ecc;</div><div class='add'>+		chip-&gt;ecc.calculate = s3c2410_nand_calculate_ecc;</div><div class='add'>+		chip-&gt;ecc.correct   = s3c2410_nand_correct_data;</div><div class='add'>+		chip-&gt;ecc.mode	    = NAND_ECC_HW;</div><div class='add'>+		chip-&gt;ecc.size	    = 512;</div><div class='add'>+		chip-&gt;ecc.bytes	    = 3;</div><div class='add'>+		chip-&gt;ecc.layout    = &amp;nand_hw_eccoob;</div><div class='add'>+</div><div class='add'>+		switch (info-&gt;cpu_type) {</div><div class='add'>+		case TYPE_S3C2410:</div><div class='add'>+			chip-&gt;ecc.hwctl	    = s3c2410_nand_enable_hwecc;</div><div class='add'>+			chip-&gt;ecc.calculate = s3c2410_nand_calculate_ecc;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case TYPE_S3C2412:</div><div class='add'>+		case TYPE_S3C2440:</div><div class='add'>+  			chip-&gt;ecc.hwctl     = s3c2440_nand_enable_hwecc;</div><div class='add'>+  			chip-&gt;ecc.calculate = s3c2440_nand_calculate_ecc;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		chip-&gt;eccmode	    = NAND_ECC_SOFT;</div><div class='add'>+		chip-&gt;ecc.mode	    = NAND_ECC_SOFT;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -561,7 +584,8 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,</div><div class='ctx'>  * nand layer to look for devices</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)</div><div class='add'>+static int s3c24xx_nand_probe(struct platform_device *pdev,</div><div class='add'>+			      enum s3c_cpu_type cpu_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct s3c2410_platform_nand *plat = to_nand_plat(pdev);</div><div class='ctx'> 	struct s3c2410_nand_info *info;</div><div class='hunk'>@@ -616,7 +640,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)</div><div class='ctx'> 	info-&gt;device     = &amp;pdev-&gt;dev;</div><div class='ctx'> 	info-&gt;platform   = plat;</div><div class='ctx'> 	info-&gt;regs       = ioremap(res-&gt;start, size);</div><div class='del'>-	info-&gt;is_s3c2440 = is_s3c2440;</div><div class='add'>+	info-&gt;cpu_type   = cpu_type;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;regs == NULL) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "cannot reserve register region\n");</div><div class='hunk'>@@ -654,13 +678,11 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)</div><div class='ctx'> 	nmtd = info-&gt;mtds;</div><div class='ctx'> </div><div class='ctx'> 	for (setno = 0; setno &lt; nr_sets; setno++, nmtd++) {</div><div class='del'>-		pr_debug("initialising set %d (%p, info %p)\n",</div><div class='del'>-			 setno, nmtd, info);</div><div class='add'>+		pr_debug("initialising set %d (%p, info %p)\n", setno, nmtd, info);</div><div class='ctx'> </div><div class='ctx'> 		s3c2410_nand_init_chip(info, nmtd, sets);</div><div class='ctx'> </div><div class='del'>-		nmtd-&gt;scan_res = nand_scan(&amp;nmtd-&gt;mtd,</div><div class='del'>-					   (sets) ? sets-&gt;nr_chips : 1);</div><div class='add'>+		nmtd-&gt;scan_res = nand_scan(&amp;nmtd-&gt;mtd, (sets) ? sets-&gt;nr_chips : 1);</div><div class='ctx'> </div><div class='ctx'> 		if (nmtd-&gt;scan_res == 0) {</div><div class='ctx'> 			s3c2410_nand_add_partition(info, nmtd, sets);</div><div class='hunk'>@@ -670,6 +692,11 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)</div><div class='ctx'> 			sets++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (allow_clk_stop(info)) {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "clock idle support enabled\n");</div><div class='add'>+		clk_disable(info-&gt;clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pr_debug("initialised ok\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -681,21 +708,63 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* PM Support */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pm)</div><div class='add'>+{</div><div class='add'>+	struct s3c2410_nand_info *info = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		if (!allow_clk_stop(info))</div><div class='add'>+			clk_disable(info-&gt;clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c24xx_nand_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct s3c2410_nand_info *info = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		clk_enable(info-&gt;clk);</div><div class='add'>+		s3c2410_nand_inithw(info, dev);</div><div class='add'>+</div><div class='add'>+		if (allow_clk_stop(info))</div><div class='add'>+			clk_disable(info-&gt;clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define s3c24xx_nand_suspend NULL</div><div class='add'>+#define s3c24xx_nand_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* driver device registration */</div><div class='ctx'> </div><div class='ctx'> static int s3c2410_nand_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return s3c24xx_nand_probe(dev, 0);</div><div class='add'>+	return s3c24xx_nand_probe(dev, TYPE_S3C2410);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_nand_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return s3c24xx_nand_probe(dev, 1);</div><div class='add'>+	return s3c24xx_nand_probe(dev, TYPE_S3C2440);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_nand_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	return s3c24xx_nand_probe(dev, TYPE_S3C2412);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver s3c2410_nand_driver = {</div><div class='ctx'> 	.probe		= s3c2410_nand_probe,</div><div class='ctx'> 	.remove		= s3c2410_nand_remove,</div><div class='add'>+	.suspend	= s3c24xx_nand_suspend,</div><div class='add'>+	.resume		= s3c24xx_nand_resume,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "s3c2410-nand",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='hunk'>@@ -705,22 +774,37 @@ static struct platform_driver s3c2410_nand_driver = {</div><div class='ctx'> static struct platform_driver s3c2440_nand_driver = {</div><div class='ctx'> 	.probe		= s3c2440_nand_probe,</div><div class='ctx'> 	.remove		= s3c2410_nand_remove,</div><div class='add'>+	.suspend	= s3c24xx_nand_suspend,</div><div class='add'>+	.resume		= s3c24xx_nand_resume,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "s3c2440-nand",</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct platform_driver s3c2412_nand_driver = {</div><div class='add'>+	.probe		= s3c2412_nand_probe,</div><div class='add'>+	.remove		= s3c2410_nand_remove,</div><div class='add'>+	.suspend	= s3c24xx_nand_suspend,</div><div class='add'>+	.resume		= s3c24xx_nand_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "s3c2412-nand",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init s3c2410_nand_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk("S3C24XX NAND Driver, (c) 2004 Simtec Electronics\n");</div><div class='ctx'> </div><div class='add'>+	platform_driver_register(&amp;s3c2412_nand_driver);</div><div class='ctx'> 	platform_driver_register(&amp;s3c2440_nand_driver);</div><div class='ctx'> 	return platform_driver_register(&amp;s3c2410_nand_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit s3c2410_nand_exit(void)</div><div class='ctx'> {</div><div class='add'>+	platform_driver_unregister(&amp;s3c2412_nand_driver);</div><div class='ctx'> 	platform_driver_unregister(&amp;s3c2440_nand_driver);</div><div class='ctx'> 	platform_driver_unregister(&amp;s3c2410_nand_driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c<br/>index 1924a4f137c7..fbeedc3184e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sharpsl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/sharpsl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/sharpsl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/sharpsl.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@ static int sharpsl_phys_base = 0x0C000000;</div><div class='ctx'> #define FLCLE		(1 &lt;&lt; 1)</div><div class='ctx'> #define FLCE0		(1 &lt;&lt; 0)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * MTD structure for SharpSL</div><div class='ctx'>  */</div><div class='hunk'>@@ -60,50 +59,44 @@ static struct mtd_info *sharpsl_mtd = NULL;</div><div class='ctx'> static int nr_partitions;</div><div class='ctx'> static struct mtd_partition sharpsl_nand_default_partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-	.name = "System Area",</div><div class='del'>-	.offset = 0,</div><div class='del'>-	.size = 7 * 1024 * 1024,</div><div class='del'>-	},</div><div class='add'>+	 .name = "System Area",</div><div class='add'>+	 .offset = 0,</div><div class='add'>+	 .size = 7 * 1024 * 1024,</div><div class='add'>+	 },</div><div class='ctx'> 	{</div><div class='del'>-	.name = "Root Filesystem",</div><div class='del'>-	.offset = 7 * 1024 * 1024,</div><div class='del'>-	.size = 30 * 1024 * 1024,</div><div class='del'>-	},</div><div class='add'>+	 .name = "Root Filesystem",</div><div class='add'>+	 .offset = 7 * 1024 * 1024,</div><div class='add'>+	 .size = 30 * 1024 * 1024,</div><div class='add'>+	 },</div><div class='ctx'> 	{</div><div class='del'>-	.name = "Home Filesystem",</div><div class='del'>-	.offset = MTDPART_OFS_APPEND ,</div><div class='del'>-	.size = MTDPART_SIZ_FULL ,</div><div class='del'>-	},</div><div class='add'>+	 .name = "Home Filesystem",</div><div class='add'>+	 .offset = MTDPART_OFS_APPEND,</div><div class='add'>+	 .size = MTDPART_SIZ_FULL,</div><div class='add'>+	 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='add'>+ *	ctrl:</div><div class='add'>+ *	NAND_CNE: bit 0 -&gt; bit 0 &amp; 4</div><div class='add'>+ *	NAND_CLE: bit 1 -&gt; bit 1</div><div class='add'>+ *	NAND_ALE: bit 2 -&gt; bit 2</div><div class='add'>+ *</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='del'>-sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd)</div><div class='add'>+static void sharpsl_nand_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+				   unsigned int ctrl)</div><div class='ctx'> {</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case NAND_CTL_SETCLE:</div><div class='del'>-		writeb(readb(FLASHCTL) | FLCLE, FLASHCTL);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRCLE:</div><div class='del'>-		writeb(readb(FLASHCTL) &amp; ~FLCLE, FLASHCTL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETALE:</div><div class='del'>-		writeb(readb(FLASHCTL) | FLALE, FLASHCTL);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRALE:</div><div class='del'>-		writeb(readb(FLASHCTL) &amp; ~FLALE, FLASHCTL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case NAND_CTL_SETNCE:</div><div class='del'>-		writeb(readb(FLASHCTL) &amp; ~(FLCE0|FLCE1), FLASHCTL);</div><div class='del'>-		break;</div><div class='del'>-	case NAND_CTL_CLRNCE:</div><div class='del'>-		writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL);</div><div class='del'>-		break;</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		unsigned char bits = ctrl &amp; 0x07;</div><div class='add'>+</div><div class='add'>+		bits |= (ctrl &amp; 0x01) &lt;&lt; 4;</div><div class='add'>+		writeb((readb(FLASHCTL) &amp; 0x17) | bits, FLASHCTL);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static uint8_t scan_ff_pattern[] = { 0xff, 0xff };</div><div class='hunk'>@@ -122,31 +115,26 @@ static struct nand_bbt_descr sharpsl_akita_bbt = {</div><div class='ctx'> 	.pattern = scan_ff_pattern</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct nand_oobinfo akita_oobinfo = {</div><div class='del'>-	.useecc = MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout akita_oobinfo = {</div><div class='ctx'> 	.eccbytes = 24,</div><div class='ctx'> 	.eccpos = {</div><div class='del'>-		0x5,  0x1,  0x2,  0x3,  0x6,  0x7,  0x15, 0x11,</div><div class='del'>-		0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,</div><div class='del'>-		0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},</div><div class='del'>-	.oobfree = { {0x08, 0x09} }</div><div class='add'>+		   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,</div><div class='add'>+		   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,</div><div class='add'>+		   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},</div><div class='add'>+	.oobfree = {{0x08, 0x09}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-sharpsl_nand_dev_ready(struct mtd_info* mtd)</div><div class='add'>+static int sharpsl_nand_dev_ready(struct mtd_info *mtd)</div><div class='ctx'> {</div><div class='ctx'> 	return !((readb(FLASHCTL) &amp; FLRYBY) == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode)</div><div class='add'>+static void sharpsl_nand_enable_hwecc(struct mtd_info *mtd, int mode)</div><div class='ctx'> {</div><div class='del'>-	writeb(0 ,ECCCLRR);</div><div class='add'>+	writeb(0, ECCCLRR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat,</div><div class='del'>-				u_char* ecc_code)</div><div class='add'>+static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat, u_char * ecc_code)</div><div class='ctx'> {</div><div class='ctx'> 	ecc_code[0] = ~readb(ECCLPUB);</div><div class='ctx'> 	ecc_code[1] = ~readb(ECCLPLB);</div><div class='hunk'>@@ -154,47 +142,44 @@ sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat,</div><div class='ctx'> 	return readb(ECCCNTR) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_MTD_PARTITIONS</div><div class='ctx'> const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-int __init</div><div class='del'>-sharpsl_nand_init(void)</div><div class='add'>+static int __init sharpsl_nand_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='del'>-	struct mtd_partition* sharpsl_partition_info;</div><div class='add'>+	struct mtd_partition *sharpsl_partition_info;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	sharpsl_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	sharpsl_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!sharpsl_mtd) {</div><div class='del'>-		printk ("Unable to allocate SharpSL NAND MTD device structure.\n");</div><div class='add'>+		printk("Unable to allocate SharpSL NAND MTD device structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* map physical adress */</div><div class='ctx'> 	sharpsl_io_base = ioremap(sharpsl_phys_base, 0x1000);</div><div class='del'>-	if(!sharpsl_io_base){</div><div class='add'>+	if (!sharpsl_io_base) {</div><div class='ctx'> 		printk("ioremap to access Sharp SL NAND chip failed\n");</div><div class='ctx'> 		kfree(sharpsl_mtd);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;sharpsl_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;sharpsl_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) sharpsl_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(sharpsl_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	sharpsl_mtd-&gt;priv = this;</div><div class='add'>+	sharpsl_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PXA initialize</div><div class='hunk'>@@ -205,23 +190,25 @@ sharpsl_nand_init(void)</div><div class='ctx'> 	this-&gt;IO_ADDR_R = FLASHIO;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = FLASHIO;</div><div class='ctx'> 	/* Set address of hardware control function */</div><div class='del'>-	this-&gt;hwcontrol = sharpsl_nand_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = sharpsl_nand_hwcontrol;</div><div class='ctx'> 	this-&gt;dev_ready = sharpsl_nand_dev_ready;</div><div class='ctx'> 	/* 15 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 15;</div><div class='ctx'> 	/* set eccmode using hardware ECC */</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_HW3_256;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_HW;</div><div class='add'>+	this-&gt;ecc.size = 256;</div><div class='add'>+	this-&gt;ecc.bytes = 3;</div><div class='ctx'> 	this-&gt;badblock_pattern = &amp;sharpsl_bbt;</div><div class='ctx'> 	if (machine_is_akita() || machine_is_borzoi()) {</div><div class='ctx'> 		this-&gt;badblock_pattern = &amp;sharpsl_akita_bbt;</div><div class='del'>-		this-&gt;autooob = &amp;akita_oobinfo;</div><div class='add'>+		this-&gt;ecc.layout = &amp;akita_oobinfo;</div><div class='ctx'> 	}</div><div class='del'>-	this-&gt;enable_hwecc = sharpsl_nand_enable_hwecc;</div><div class='del'>-	this-&gt;calculate_ecc = sharpsl_nand_calculate_ecc;</div><div class='del'>-	this-&gt;correct_data = nand_correct_data;</div><div class='add'>+	this-&gt;ecc.hwctl = sharpsl_nand_enable_hwecc;</div><div class='add'>+	this-&gt;ecc.calculate = sharpsl_nand_calculate_ecc;</div><div class='add'>+	this-&gt;ecc.correct = nand_correct_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device */</div><div class='del'>-	err=nand_scan(sharpsl_mtd,1);</div><div class='add'>+	err = nand_scan(sharpsl_mtd, 1);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		iounmap(sharpsl_io_base);</div><div class='ctx'> 		kfree(sharpsl_mtd);</div><div class='hunk'>@@ -230,47 +217,39 @@ sharpsl_nand_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Register the partitions */</div><div class='ctx'> 	sharpsl_mtd-&gt;name = "sharpsl-nand";</div><div class='del'>-	nr_partitions = parse_mtd_partitions(sharpsl_mtd, part_probes,</div><div class='del'>-						&amp;sharpsl_partition_info, 0);</div><div class='add'>+	nr_partitions = parse_mtd_partitions(sharpsl_mtd, part_probes, &amp;sharpsl_partition_info, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (nr_partitions &lt;= 0) {</div><div class='ctx'> 		nr_partitions = DEFAULT_NUM_PARTITIONS;</div><div class='ctx'> 		sharpsl_partition_info = sharpsl_nand_default_partition_info;</div><div class='ctx'> 		if (machine_is_poodle()) {</div><div class='del'>-			sharpsl_partition_info[1].size=30 * 1024 * 1024;</div><div class='add'>+			sharpsl_partition_info[1].size = 22 * 1024 * 1024;</div><div class='ctx'> 		} else if (machine_is_corgi() || machine_is_shepherd()) {</div><div class='del'>-			sharpsl_partition_info[1].size=25 * 1024 * 1024;</div><div class='add'>+			sharpsl_partition_info[1].size = 25 * 1024 * 1024;</div><div class='ctx'> 		} else if (machine_is_husky()) {</div><div class='del'>-			sharpsl_partition_info[1].size=53 * 1024 * 1024;</div><div class='add'>+			sharpsl_partition_info[1].size = 53 * 1024 * 1024;</div><div class='ctx'> 		} else if (machine_is_spitz()) {</div><div class='del'>-			sharpsl_partition_info[1].size=5 * 1024 * 1024;</div><div class='add'>+			sharpsl_partition_info[1].size = 5 * 1024 * 1024;</div><div class='ctx'> 		} else if (machine_is_akita()) {</div><div class='del'>-			sharpsl_partition_info[1].size=58 * 1024 * 1024;</div><div class='add'>+			sharpsl_partition_info[1].size = 58 * 1024 * 1024;</div><div class='ctx'> 		} else if (machine_is_borzoi()) {</div><div class='del'>-			sharpsl_partition_info[1].size=32 * 1024 * 1024;</div><div class='add'>+			sharpsl_partition_info[1].size = 32 * 1024 * 1024;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (machine_is_husky() || machine_is_borzoi() || machine_is_akita()) {</div><div class='del'>-		/* Need to use small eraseblock size for backward compatibility */</div><div class='del'>-		sharpsl_mtd-&gt;flags |= MTD_NO_VIRTBLOCKS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	add_mtd_partitions(sharpsl_mtd, sharpsl_partition_info, nr_partitions);</div><div class='ctx'> </div><div class='ctx'> 	/* Return happy */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_init(sharpsl_nand_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> static void __exit sharpsl_nand_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	struct nand_chip *this = (struct nand_chip *) &amp;sharpsl_mtd[1];</div><div class='del'>-</div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='ctx'> 	nand_release(sharpsl_mtd);</div><div class='ctx'> </div><div class='hunk'>@@ -279,8 +258,8 @@ static void __exit sharpsl_nand_cleanup(void)</div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='ctx'> 	kfree(sharpsl_mtd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(sharpsl_nand_cleanup);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Richard Purdie &lt;rpurdie@rpsys.net&gt;");</div><div class='head'>diff --git a/drivers/mtd/nand/spia.c b/drivers/mtd/nand/spia.c<br/>index 9cf1ce718ec1..1f6d429b1583 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/spia.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/spia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/spia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/spia.c</a></div><div class='hunk'>@@ -39,16 +39,16 @@ static struct mtd_info *spia_mtd = NULL;</div><div class='ctx'>  */</div><div class='ctx'> #define SPIA_IO_BASE	0xd0000000	/* Start of EP7212 IO address space */</div><div class='ctx'> #define SPIA_FIO_BASE	0xf0000000	/* Address where flash is mapped */</div><div class='del'>-#define SPIA_PEDR	0x0080		/*</div><div class='del'>-					 * IO offset to Port E data register</div><div class='del'>-					 * where the CLE, ALE and NCE pins</div><div class='del'>-					 * are wired to.</div><div class='del'>-					 */</div><div class='del'>-#define SPIA_PEDDR	0x00c0		/*</div><div class='del'>-					 * IO offset to Port E data direction</div><div class='del'>-					 * register so we can control the IO</div><div class='del'>-					 * lines.</div><div class='del'>-					 */</div><div class='add'>+#define SPIA_PEDR	0x0080	/*</div><div class='add'>+				 * IO offset to Port E data register</div><div class='add'>+				 * where the CLE, ALE and NCE pins</div><div class='add'>+				 * are wired to.</div><div class='add'>+				 */</div><div class='add'>+#define SPIA_PEDDR	0x00c0	/*</div><div class='add'>+				 * IO offset to Port E data direction</div><div class='add'>+				 * register so we can control the IO</div><div class='add'>+				 * lines.</div><div class='add'>+				 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Module stuff</div><div class='hunk'>@@ -69,79 +69,84 @@ module_param(spia_peddr, int, 0);</div><div class='ctx'>  */</div><div class='ctx'> static const struct mtd_partition partition_info[] = {</div><div class='ctx'> 	{</div><div class='del'>-		.name	= "SPIA flash partition 1",</div><div class='del'>-		.offset	= 0,</div><div class='del'>-		.size	= 2*1024*1024</div><div class='del'>-	},</div><div class='add'>+	 .name = "SPIA flash partition 1",</div><div class='add'>+	 .offset = 0,</div><div class='add'>+	 .size = 2 * 1024 * 1024},</div><div class='ctx'> 	{</div><div class='del'>-		.name	= "SPIA flash partition 2",</div><div class='del'>-		.offset	= 2*1024*1024,</div><div class='del'>-		.size	= 6*1024*1024</div><div class='del'>-	}</div><div class='add'>+	 .name = "SPIA flash partition 2",</div><div class='add'>+	 .offset = 2 * 1024 * 1024,</div><div class='add'>+	 .size = 6 * 1024 * 1024}</div><div class='ctx'> };</div><div class='del'>-#define NUM_PARTITIONS 2</div><div class='ctx'> </div><div class='add'>+#define NUM_PARTITIONS 2</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='del'>-*/</div><div class='del'>-static void spia_hwcontrol(struct mtd_info *mtd, int cmd){</div><div class='del'>-</div><div class='del'>-    switch(cmd){</div><div class='add'>+ *</div><div class='add'>+ *	ctrl:</div><div class='add'>+ *	NAND_CNE: bit 0 -&gt; bit 2</div><div class='add'>+ *	NAND_CLE: bit 1 -&gt; bit 0</div><div class='add'>+ *	NAND_ALE: bit 2 -&gt; bit 1</div><div class='add'>+ */</div><div class='add'>+static void spia_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETCLE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) |=  0x01; break;</div><div class='del'>-	case NAND_CTL_CLRCLE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) &amp;= ~0x01; break;</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		void __iomem *addr = spia_io_base + spia_pedr;</div><div class='add'>+		unsigned char bits;</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETALE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) |=  0x02; break;</div><div class='del'>-	case NAND_CTL_CLRALE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) &amp;= ~0x02; break;</div><div class='add'>+		bits = (ctrl &amp; NAND_CNE) &lt;&lt; 2;</div><div class='add'>+		bits |= (ctrl &amp; NAND_CLE | NAND_ALE) &gt;&gt; 1;</div><div class='add'>+		writeb((readb(addr) &amp; ~0x7) | bits, addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case NAND_CTL_SETNCE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) &amp;= ~0x04; break;</div><div class='del'>-	case NAND_CTL_CLRNCE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) |=  0x04; break;</div><div class='del'>-    }</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-int __init spia_init (void)</div><div class='add'>+static int __init spia_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	spia_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	spia_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!spia_mtd) {</div><div class='del'>-		printk ("Unable to allocate SPIA NAND MTD device structure.\n");</div><div class='add'>+		printk("Unable to allocate SPIA NAND MTD device structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;spia_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;spia_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) spia_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(spia_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	spia_mtd-&gt;priv = this;</div><div class='add'>+	spia_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set GPIO Port E control register so that the pins are configured</div><div class='ctx'> 	 * to be outputs for controlling the NAND flash.</div><div class='ctx'> 	 */</div><div class='del'>-	(*(volatile unsigned char *) (spia_io_base + spia_peddr)) = 0x07;</div><div class='add'>+	(*(volatile unsigned char *)(spia_io_base + spia_peddr)) = 0x07;</div><div class='ctx'> </div><div class='ctx'> 	/* Set address of NAND IO lines */</div><div class='del'>-	this-&gt;IO_ADDR_R = (void __iomem *) spia_fio_base;</div><div class='del'>-	this-&gt;IO_ADDR_W = (void __iomem *) spia_fio_base;</div><div class='add'>+	this-&gt;IO_ADDR_R = (void __iomem *)spia_fio_base;</div><div class='add'>+	this-&gt;IO_ADDR_W = (void __iomem *)spia_fio_base;</div><div class='ctx'> 	/* Set address of hardware control function */</div><div class='del'>-	this-&gt;hwcontrol = spia_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = spia_hwcontrol;</div><div class='ctx'> 	/* 15 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 15;</div><div class='ctx'> </div><div class='ctx'> 	/* Scan to find existence of the device */</div><div class='del'>-	if (nand_scan (spia_mtd, 1)) {</div><div class='del'>-		kfree (spia_mtd);</div><div class='add'>+	if (nand_scan(spia_mtd, 1)) {</div><div class='add'>+		kfree(spia_mtd);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -151,22 +156,22 @@ int __init spia_init (void)</div><div class='ctx'> 	/* Return happy */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_init(spia_init);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static void __exit spia_cleanup (void)</div><div class='add'>+static void __exit spia_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='del'>-	nand_release (spia_mtd);</div><div class='add'>+	nand_release(spia_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (spia_mtd);</div><div class='add'>+	kfree(spia_mtd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(spia_cleanup);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Steven J. Hill &lt;sjhill@realitydiluted.com");</div><div class='head'>diff --git a/drivers/mtd/nand/toto.c b/drivers/mtd/nand/toto.c<br/>index 7609c43cb3ec..f9e2d4a0ab8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nand/toto.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nand/toto.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/toto.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/toto.c</a></div><div class='hunk'>@@ -32,6 +32,8 @@</div><div class='ctx'> #include &lt;asm/arch-omap1510/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='add'>+#define CONFIG_NAND_WORKAROUND 1</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * MTD structure for TOTO board</div><div class='ctx'>  */</div><div class='hunk'>@@ -39,25 +41,6 @@ static struct mtd_info *toto_mtd = NULL;</div><div class='ctx'> </div><div class='ctx'> static unsigned long toto_io_base = OMAP_FLASH_1_BASE;</div><div class='ctx'> </div><div class='del'>-#define CONFIG_NAND_WORKAROUND 1</div><div class='del'>-</div><div class='del'>-#define NAND_NCE 0x4000</div><div class='del'>-#define NAND_CLE 0x1000</div><div class='del'>-#define NAND_ALE 0x0002</div><div class='del'>-#define NAND_MASK (NAND_CLE | NAND_ALE | NAND_NCE)</div><div class='del'>-</div><div class='del'>-#define T_NAND_CTL_CLRALE(iob)  gpiosetout(NAND_ALE, 0)</div><div class='del'>-#define T_NAND_CTL_SETALE(iob)  gpiosetout(NAND_ALE, NAND_ALE)</div><div class='del'>-#ifdef CONFIG_NAND_WORKAROUND     /* "some" dev boards busted, blue wired to rts2 :( */</div><div class='del'>-#define T_NAND_CTL_CLRCLE(iob)  gpiosetout(NAND_CLE, 0); rts2setout(2, 2)</div><div class='del'>-#define T_NAND_CTL_SETCLE(iob)  gpiosetout(NAND_CLE, NAND_CLE); rts2setout(2, 0)</div><div class='del'>-#else</div><div class='del'>-#define T_NAND_CTL_CLRCLE(iob)  gpiosetout(NAND_CLE, 0)</div><div class='del'>-#define T_NAND_CTL_SETCLE(iob)  gpiosetout(NAND_CLE, NAND_CLE)</div><div class='del'>-#endif</div><div class='del'>-#define T_NAND_CTL_SETNCE(iob)  gpiosetout(NAND_NCE, 0)</div><div class='del'>-#define T_NAND_CTL_CLRNCE(iob)  gpiosetout(NAND_NCE, NAND_NCE)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Define partitions for flash devices</div><div class='ctx'>  */</div><div class='hunk'>@@ -91,91 +74,110 @@ static struct mtd_partition partition_info32M[] = {</div><div class='ctx'> </div><div class='ctx'> #define NUM_PARTITIONS32M 3</div><div class='ctx'> #define NUM_PARTITIONS64M 4</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	hardware specific access to control-lines</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static void toto_hwcontrol(struct mtd_info *mtd, int cmd)</div><div class='add'>+ *</div><div class='add'>+ *	ctrl:</div><div class='add'>+ *	NAND_NCE: bit 0 -&gt; bit 14 (0x4000)</div><div class='add'>+ *	NAND_CLE: bit 1 -&gt; bit 12 (0x1000)</div><div class='add'>+ *	NAND_ALE: bit 2 -&gt; bit 1  (0x0002)</div><div class='add'>+ */</div><div class='add'>+static void toto_hwcontrol(struct mtd_info *mtd, int cmd,</div><div class='add'>+			   unsigned int ctrl)</div><div class='ctx'> {</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		unsigned long bits;</div><div class='ctx'> </div><div class='del'>-	udelay(1); /* hopefully enough time for tc make proceding write to clear */</div><div class='del'>-	switch(cmd){</div><div class='add'>+		/* hopefully enough time for tc make proceding write to clear */</div><div class='add'>+		udelay(1);</div><div class='ctx'> </div><div class='del'>-		case NAND_CTL_SETCLE: T_NAND_CTL_SETCLE(cmd); break;</div><div class='del'>-		case NAND_CTL_CLRCLE: T_NAND_CTL_CLRCLE(cmd); break;</div><div class='add'>+		bits = (~ctrl &amp; NAND_NCE) &lt;&lt; 14;</div><div class='add'>+		bits |= (ctrl &amp; NAND_CLE) &lt;&lt; 12;</div><div class='add'>+		bits |= (ctrl &amp; NAND_ALE) &gt;&gt; 1;</div><div class='ctx'> </div><div class='del'>-		case NAND_CTL_SETALE: T_NAND_CTL_SETALE(cmd); break;</div><div class='del'>-		case NAND_CTL_CLRALE: T_NAND_CTL_CLRALE(cmd); break;</div><div class='add'>+#warning Wild guess as gpiosetout() is nowhere defined in the kernel source - tglx</div><div class='add'>+		gpiosetout(0x5002, bits);</div><div class='ctx'> </div><div class='del'>-		case NAND_CTL_SETNCE: T_NAND_CTL_SETNCE(cmd); break;</div><div class='del'>-		case NAND_CTL_CLRNCE: T_NAND_CTL_CLRNCE(cmd); break;</div><div class='add'>+#ifdef CONFIG_NAND_WORKAROUND</div><div class='add'>+		/* "some" dev boards busted, blue wired to rts2 :( */</div><div class='add'>+		rts2setout(2, (ctrl &amp; NAND_CLE) &lt;&lt; 1);</div><div class='add'>+#endif</div><div class='add'>+		/* allow time to ensure gpio state to over take memory write */</div><div class='add'>+		udelay(1);</div><div class='ctx'> 	}</div><div class='del'>-	udelay(1); /* allow time to ensure gpio state to over take memory write */</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Main initialization routine</div><div class='ctx'>  */</div><div class='del'>-int __init toto_init (void)</div><div class='add'>+static int __init toto_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct nand_chip *this;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for MTD device structure and private data */</div><div class='del'>-	toto_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),</div><div class='del'>-				GFP_KERNEL);</div><div class='add'>+	toto_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='ctx'> 	if (!toto_mtd) {</div><div class='del'>-		printk (KERN_WARNING "Unable to allocate toto NAND MTD device structure.\n");</div><div class='add'>+		printk(KERN_WARNING "Unable to allocate toto NAND MTD device structure.\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get pointer to private data */</div><div class='del'>-	this = (struct nand_chip *) (&amp;toto_mtd[1]);</div><div class='add'>+	this = (struct nand_chip *)(&amp;toto_mtd[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize structures */</div><div class='del'>-	memset((char *) toto_mtd, 0, sizeof(struct mtd_info));</div><div class='del'>-	memset((char *) this, 0, sizeof(struct nand_chip));</div><div class='add'>+	memset(toto_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='ctx'> </div><div class='ctx'> 	/* Link the private data with the MTD structure */</div><div class='ctx'> 	toto_mtd-&gt;priv = this;</div><div class='add'>+	toto_mtd-&gt;owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/* Set address of NAND IO lines */</div><div class='ctx'> 	this-&gt;IO_ADDR_R = toto_io_base;</div><div class='ctx'> 	this-&gt;IO_ADDR_W = toto_io_base;</div><div class='del'>-	this-&gt;hwcontrol = toto_hwcontrol;</div><div class='add'>+	this-&gt;cmd_ctrl = toto_hwcontrol;</div><div class='ctx'> 	this-&gt;dev_ready = NULL;</div><div class='ctx'> 	/* 25 us command delay time */</div><div class='ctx'> 	this-&gt;chip_delay = 30;</div><div class='del'>-	this-&gt;eccmode = NAND_ECC_SOFT;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='ctx'> </div><div class='del'>-        /* Scan to find existance of the device */</div><div class='del'>-	if (nand_scan (toto_mtd, 1)) {</div><div class='add'>+	/* Scan to find existance of the device */</div><div class='add'>+	if (nand_scan(toto_mtd, 1)) {</div><div class='ctx'> 		err = -ENXIO;</div><div class='ctx'> 		goto out_mtd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register the partitions */</div><div class='del'>-	switch(toto_mtd-&gt;size){</div><div class='del'>-		case SZ_64M: add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M); break;</div><div class='del'>-		case SZ_32M: add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M); break;</div><div class='del'>-		default: {</div><div class='del'>-			printk (KERN_WARNING "Unsupported Nand device\n");</div><div class='add'>+	switch (toto_mtd-&gt;size) {</div><div class='add'>+	case SZ_64M:</div><div class='add'>+		add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M);</div><div class='add'>+		break;</div><div class='add'>+	case SZ_32M:</div><div class='add'>+		add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M);</div><div class='add'>+		break;</div><div class='add'>+	default:{</div><div class='add'>+			printk(KERN_WARNING "Unsupported Nand device\n");</div><div class='ctx'> 			err = -ENXIO;</div><div class='ctx'> 			goto out_buf;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-    	gpioreserve(NAND_MASK);  /* claim our gpios */</div><div class='del'>-    	archflashwp(0,0);	 /* open up flash for writing */</div><div class='add'>+	gpioreserve(NAND_MASK);	/* claim our gpios */</div><div class='add'>+	archflashwp(0, 0);	/* open up flash for writing */</div><div class='ctx'> </div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='del'>-out_buf:</div><div class='del'>-	kfree (this-&gt;data_buf);</div><div class='del'>-out_mtd:</div><div class='del'>-	kfree (toto_mtd);</div><div class='del'>-out:</div><div class='add'>+ out_mtd:</div><div class='add'>+	kfree(toto_mtd);</div><div class='add'>+ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -184,20 +186,21 @@ module_init(toto_init);</div><div class='ctx'> /*</div><div class='ctx'>  * Clean up routine</div><div class='ctx'>  */</div><div class='del'>-static void __exit toto_cleanup (void)</div><div class='add'>+static void __exit toto_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* Release resources, unregister device */</div><div class='del'>-	nand_release (toto_mtd);</div><div class='add'>+	nand_release(toto_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* Free the MTD device structure */</div><div class='del'>-	kfree (toto_mtd);</div><div class='add'>+	kfree(toto_mtd);</div><div class='ctx'> </div><div class='ctx'> 	/* stop flash writes */</div><div class='del'>-	 archflashwp(0,1);</div><div class='add'>+	archflashwp(0, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* release gpios to system */</div><div class='del'>-	 gpiorelease(NAND_MASK);</div><div class='add'>+	gpiorelease(NAND_MASK);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> module_exit(toto_cleanup);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/mtd/nand/ts7250.c b/drivers/mtd/nand/ts7250.c<br/>new file mode 100644<br/>index 000000000000..f40081069ab2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nand/ts7250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nand/ts7250.c</a></div><div class='hunk'>@@ -0,0 +1,206 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/mtd/nand/ts7250.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2004 Technologic Systems (support@embeddedARM.com)</div><div class='add'>+ *</div><div class='add'>+ * Derived from drivers/mtd/nand/edb7312.c</div><div class='add'>+ *   Copyright (C) 2004 Marius Gröger (mag@sysgo.de)</div><div class='add'>+ *</div><div class='add'>+ * Derived from drivers/mtd/nand/autcpu12.c</div><div class='add'>+ *   Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)</div><div class='add'>+ *</div><div class='add'>+ * $Id: ts7250.c,v 1.4 2004/12/30 22:02:07 joff Exp $</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Overview:</div><div class='add'>+ *   This is a device driver for the NAND flash device found on the</div><div class='add'>+ *   TS-7250 board which utilizes a Samsung 32 Mbyte part.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/mtd/nand.h&gt;</div><div class='add'>+#include &lt;linux/mtd/partitions.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;asm/sizes.h&gt;</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MTD structure for TS7250 board</div><div class='add'>+ */</div><div class='add'>+static struct mtd_info *ts7250_mtd = NULL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+static const char *part_probes[] = { "cmdlinepart", NULL };</div><div class='add'>+</div><div class='add'>+#define NUM_PARTITIONS 3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define static partitions for flash device</div><div class='add'>+ */</div><div class='add'>+static struct mtd_partition partition_info32[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "TS-BOOTROM",</div><div class='add'>+		.offset		= 0x00000000,</div><div class='add'>+		.size		= 0x00004000,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "Linux",</div><div class='add'>+		.offset		= 0x00004000,</div><div class='add'>+		.size		= 0x01d00000,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "RedBoot",</div><div class='add'>+		.offset		= 0x01d04000,</div><div class='add'>+		.size		= 0x002fc000,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define static partitions for flash device</div><div class='add'>+ */</div><div class='add'>+static struct mtd_partition partition_info128[] = {</div><div class='add'>+	{</div><div class='add'>+		.name		= "TS-BOOTROM",</div><div class='add'>+		.offset		= 0x00000000,</div><div class='add'>+		.size		= 0x00004000,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "Linux",</div><div class='add'>+		.offset		= 0x00004000,</div><div class='add'>+		.size		= 0x07d00000,</div><div class='add'>+	}, {</div><div class='add'>+		.name		= "RedBoot",</div><div class='add'>+		.offset		= 0x07d04000,</div><div class='add'>+		.size		= 0x002fc000,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	hardware specific access to control-lines</div><div class='add'>+ *</div><div class='add'>+ *	ctrl:</div><div class='add'>+ *	NAND_NCE: bit 0 -&gt; bit 2</div><div class='add'>+ *	NAND_CLE: bit 1 -&gt; bit 1</div><div class='add'>+ *	NAND_ALE: bit 2 -&gt; bit 0</div><div class='add'>+ */</div><div class='add'>+static void ts7250_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *chip = mtd-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; NAND_CTRL_CHANGE) {</div><div class='add'>+		unsigned long addr = TS72XX_NAND_CONTROL_VIRT_BASE;</div><div class='add'>+		unsigned char bits;</div><div class='add'>+</div><div class='add'>+		bits = (ctrl &amp; NAND_NCE) &lt;&lt; 2;</div><div class='add'>+		bits |= ctrl &amp; NAND_CLE;</div><div class='add'>+		bits |= (ctrl &amp; NAND_ALE) &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+		__raw_writeb((__raw_readb(addr) &amp; ~0x7) | bits, addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd != NAND_CMD_NONE)</div><div class='add'>+		writeb(cmd, chip-&gt;IO_ADDR_W);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	read device ready pin</div><div class='add'>+ */</div><div class='add'>+static int ts7250_device_ready(struct mtd_info *mtd)</div><div class='add'>+{</div><div class='add'>+	return __raw_readb(TS72XX_NAND_BUSY_VIRT_BASE) &amp; 0x20;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Main initialization routine</div><div class='add'>+ */</div><div class='add'>+static int __init ts7250_init(void)</div><div class='add'>+{</div><div class='add'>+	struct nand_chip *this;</div><div class='add'>+	const char *part_type = 0;</div><div class='add'>+	int mtd_parts_nb = 0;</div><div class='add'>+	struct mtd_partition *mtd_parts = 0;</div><div class='add'>+</div><div class='add'>+	if (!machine_is_ts72xx() || board_is_ts7200())</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* Allocate memory for MTD device structure and private data */</div><div class='add'>+	ts7250_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);</div><div class='add'>+	if (!ts7250_mtd) {</div><div class='add'>+		printk("Unable to allocate TS7250 NAND MTD device structure.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get pointer to private data */</div><div class='add'>+	this = (struct nand_chip *)(&amp;ts7250_mtd[1]);</div><div class='add'>+</div><div class='add'>+	/* Initialize structures */</div><div class='add'>+	memset(ts7250_mtd, 0, sizeof(struct mtd_info));</div><div class='add'>+	memset(this, 0, sizeof(struct nand_chip));</div><div class='add'>+</div><div class='add'>+	/* Link the private data with the MTD structure */</div><div class='add'>+	ts7250_mtd-&gt;priv = this;</div><div class='add'>+	ts7250_mtd-&gt;owner = THIS_MODULE;</div><div class='add'>+</div><div class='add'>+	/* insert callbacks */</div><div class='add'>+	this-&gt;IO_ADDR_R = (void *)TS72XX_NAND_DATA_VIRT_BASE;</div><div class='add'>+	this-&gt;IO_ADDR_W = (void *)TS72XX_NAND_DATA_VIRT_BASE;</div><div class='add'>+	this-&gt;cmd_ctrl = ts7250_hwcontrol;</div><div class='add'>+	this-&gt;dev_ready = ts7250_device_ready;</div><div class='add'>+	this-&gt;chip_delay = 15;</div><div class='add'>+	this-&gt;ecc.mode = NAND_ECC_SOFT;</div><div class='add'>+</div><div class='add'>+	printk("Searching for NAND flash...\n");</div><div class='add'>+	/* Scan to find existence of the device */</div><div class='add'>+	if (nand_scan(ts7250_mtd, 1)) {</div><div class='add'>+		kfree(ts7250_mtd);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_MTD_PARTITIONS</div><div class='add'>+	ts7250_mtd-&gt;name = "ts7250-nand";</div><div class='add'>+	mtd_parts_nb = parse_mtd_partitions(ts7250_mtd, part_probes, &amp;mtd_parts, 0);</div><div class='add'>+	if (mtd_parts_nb &gt; 0)</div><div class='add'>+		part_type = "command line";</div><div class='add'>+	else</div><div class='add'>+		mtd_parts_nb = 0;</div><div class='add'>+#endif</div><div class='add'>+	if (mtd_parts_nb == 0) {</div><div class='add'>+		mtd_parts = partition_info32;</div><div class='add'>+		if (ts7250_mtd-&gt;size &gt;= (128 * 0x100000))</div><div class='add'>+			mtd_parts = partition_info128;</div><div class='add'>+		mtd_parts_nb = NUM_PARTITIONS;</div><div class='add'>+		part_type = "static";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register the partitions */</div><div class='add'>+	printk(KERN_NOTICE "Using %s partition definition\n", part_type);</div><div class='add'>+	add_mtd_partitions(ts7250_mtd, mtd_parts, mtd_parts_nb);</div><div class='add'>+</div><div class='add'>+	/* Return happy */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ts7250_init);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clean up routine</div><div class='add'>+ */</div><div class='add'>+static void __exit ts7250_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	/* Unregister the device */</div><div class='add'>+	del_mtd_device(ts7250_mtd);</div><div class='add'>+</div><div class='add'>+	/* Free the MTD device structure */</div><div class='add'>+	kfree(ts7250_mtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(ts7250_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Jesse Off &lt;joff@embeddedARM.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("MTD map driver for Technologic Systems TS-7250 board");</div><div class='head'>diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c<br/>index d7cd5fa16ba4..dd5cea8b4a7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nftlcore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nftlcore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nftlcore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nftlcore.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> </div><div class='ctx'> #define PRERELEASE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='hunk'>@@ -70,8 +69,6 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)</div><div class='ctx'> 	nftl-&gt;mbd.devnum = -1;</div><div class='ctx'> 	nftl-&gt;mbd.blksize = 512;</div><div class='ctx'> 	nftl-&gt;mbd.tr = tr;</div><div class='del'>-	memcpy(&amp;nftl-&gt;oobinfo, &amp;mtd-&gt;oobinfo, sizeof(struct nand_oobinfo));</div><div class='del'>-	nftl-&gt;oobinfo.useecc = MTD_NANDECC_PLACEONLY;</div><div class='ctx'> </div><div class='ctx'>         if (NFTL_mount(nftl) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "NFTL: could not mount device\n");</div><div class='hunk'>@@ -136,6 +133,69 @@ static void nftl_remove_dev(struct mtd_blktrans_dev *dev)</div><div class='ctx'> 	kfree(nftl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Read oob data from flash</div><div class='add'>+ */</div><div class='add'>+int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+		  size_t *retlen, uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = offs &amp; (mtd-&gt;writesize - 1);</div><div class='add'>+	ops.ooblen = len;</div><div class='add'>+	ops.oobbuf = buf;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	res = mtd-&gt;read_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write oob data to flash</div><div class='add'>+ */</div><div class='add'>+int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+		   size_t *retlen, uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = offs &amp; (mtd-&gt;writesize - 1);</div><div class='add'>+	ops.ooblen = len;</div><div class='add'>+	ops.oobbuf = buf;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	res = mtd-&gt;write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write data and oob to flash</div><div class='add'>+ */</div><div class='add'>+static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+		      size_t *retlen, uint8_t *buf, uint8_t *oob)</div><div class='add'>+{</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+	ops.ooboffs = offs;</div><div class='add'>+	ops.ooblen = mtd-&gt;oobsize;</div><div class='add'>+	ops.oobbuf = oob;</div><div class='add'>+	ops.datbuf = buf;</div><div class='add'>+	ops.len = len;</div><div class='add'>+</div><div class='add'>+	res = mtd-&gt;write_oob(mtd, offs &amp; ~(mtd-&gt;writesize - 1), &amp;ops);</div><div class='add'>+	*retlen = ops.retlen;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NFTL_RW</div><div class='ctx'> </div><div class='ctx'> /* Actual NFTL access routines */</div><div class='hunk'>@@ -185,6 +245,7 @@ static u16 NFTL_findfreeblock(struct NFTLrecord *nftl, int desperate )</div><div class='ctx'> </div><div class='ctx'> static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned pendingblock )</div><div class='ctx'> {</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	u16 BlockMap[MAX_SECTORS_PER_UNIT];</div><div class='ctx'> 	unsigned char BlockLastState[MAX_SECTORS_PER_UNIT];</div><div class='ctx'> 	unsigned char BlockFreeFound[MAX_SECTORS_PER_UNIT];</div><div class='hunk'>@@ -194,7 +255,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 	unsigned int targetEUN;</div><div class='ctx'> 	struct nftl_oob oob;</div><div class='ctx'> 	int inplace = 1;</div><div class='del'>-        size_t retlen;</div><div class='add'>+	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	memset(BlockMap, 0xff, sizeof(BlockMap));</div><div class='ctx'> 	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));</div><div class='hunk'>@@ -210,21 +271,21 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 	/* Scan to find the Erase Unit which holds the actual data for each</div><div class='ctx'> 	   512-byte block within the Chain.</div><div class='ctx'> 	*/</div><div class='del'>-        silly = MAX_LOOPS;</div><div class='add'>+	silly = MAX_LOOPS;</div><div class='ctx'> 	targetEUN = BLOCK_NIL;</div><div class='ctx'> 	while (thisEUN &lt;= nftl-&gt;lastEUN ) {</div><div class='del'>-                unsigned int status, foldmark;</div><div class='add'>+		unsigned int status, foldmark;</div><div class='ctx'> </div><div class='ctx'> 		targetEUN = thisEUN;</div><div class='ctx'> 		for (block = 0; block &lt; nftl-&gt;EraseSize / 512; block ++) {</div><div class='del'>-			MTD_READOOB(nftl-&gt;mbd.mtd,</div><div class='del'>-				    (thisEUN * nftl-&gt;EraseSize) + (block * 512),</div><div class='del'>-				    16 , &amp;retlen, (char *)&amp;oob);</div><div class='add'>+			nftl_read_oob(mtd, (thisEUN * nftl-&gt;EraseSize) +</div><div class='add'>+				      (block * 512), 16 , &amp;retlen,</div><div class='add'>+				      (char *)&amp;oob);</div><div class='ctx'> 			if (block == 2) {</div><div class='del'>-                                foldmark = oob.u.c.FoldMark | oob.u.c.FoldMark1;</div><div class='del'>-                                if (foldmark == FOLD_MARK_IN_PROGRESS) {</div><div class='del'>-                                        DEBUG(MTD_DEBUG_LEVEL1,</div><div class='del'>-                                              "Write Inhibited on EUN %d\n", thisEUN);</div><div class='add'>+				foldmark = oob.u.c.FoldMark | oob.u.c.FoldMark1;</div><div class='add'>+				if (foldmark == FOLD_MARK_IN_PROGRESS) {</div><div class='add'>+					DEBUG(MTD_DEBUG_LEVEL1,</div><div class='add'>+					      "Write Inhibited on EUN %d\n", thisEUN);</div><div class='ctx'> 					inplace = 0;</div><div class='ctx'> 				} else {</div><div class='ctx'> 					/* There's no other reason not to do inplace,</div><div class='hunk'>@@ -233,7 +294,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 					inplace = 1;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-                        status = oob.b.Status | oob.b.Status1;</div><div class='add'>+			status = oob.b.Status | oob.b.Status1;</div><div class='ctx'> 			BlockLastState[block] = status;</div><div class='ctx'> </div><div class='ctx'> 			switch(status) {</div><div class='hunk'>@@ -328,15 +389,15 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 			return BLOCK_NIL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-            /* We put a fold mark in the chain we are folding only if</div><div class='del'>-               we fold in place to help the mount check code. If we do</div><div class='del'>-               not fold in place, it is possible to find the valid</div><div class='del'>-               chain by selecting the longer one */</div><div class='del'>-            oob.u.c.FoldMark = oob.u.c.FoldMark1 = cpu_to_le16(FOLD_MARK_IN_PROGRESS);</div><div class='del'>-            oob.u.c.unused = 0xffffffff;</div><div class='del'>-            MTD_WRITEOOB(nftl-&gt;mbd.mtd, (nftl-&gt;EraseSize * targetEUN) + 2 * 512 + 8,</div><div class='del'>-                         8, &amp;retlen, (char *)&amp;oob.u);</div><div class='del'>-        }</div><div class='add'>+		/* We put a fold mark in the chain we are folding only if we</div><div class='add'>+               fold in place to help the mount check code. If we do not fold in</div><div class='add'>+               place, it is possible to find the valid chain by selecting the</div><div class='add'>+               longer one */</div><div class='add'>+		oob.u.c.FoldMark = oob.u.c.FoldMark1 = cpu_to_le16(FOLD_MARK_IN_PROGRESS);</div><div class='add'>+		oob.u.c.unused = 0xffffffff;</div><div class='add'>+		nftl_write_oob(mtd, (nftl-&gt;EraseSize * targetEUN) + 2 * 512 + 8,</div><div class='add'>+			       8, &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* OK. We now know the location of every block in the Virtual Unit Chain,</div><div class='ctx'> 	   and the Erase Unit into which we are supposed to be copying.</div><div class='hunk'>@@ -353,33 +414,33 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-                /* copy only in non free block (free blocks can only</div><div class='add'>+		/* copy only in non free block (free blocks can only</div><div class='ctx'>                    happen in case of media errors or deleted blocks) */</div><div class='del'>-                if (BlockMap[block] == BLOCK_NIL)</div><div class='del'>-                        continue;</div><div class='del'>-</div><div class='del'>-                ret = MTD_READ(nftl-&gt;mbd.mtd, (nftl-&gt;EraseSize * BlockMap[block]) + (block * 512),</div><div class='del'>-				  512, &amp;retlen, movebuf);</div><div class='del'>-                if (ret &lt; 0) {</div><div class='del'>-                    ret = MTD_READ(nftl-&gt;mbd.mtd, (nftl-&gt;EraseSize * BlockMap[block])</div><div class='del'>-                                      + (block * 512), 512, &amp;retlen,</div><div class='del'>-                                      movebuf);</div><div class='del'>-                    if (ret != -EIO)</div><div class='del'>-                        printk("Error went away on retry.\n");</div><div class='del'>-                }</div><div class='add'>+		if (BlockMap[block] == BLOCK_NIL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = mtd-&gt;read(mtd, (nftl-&gt;EraseSize * BlockMap[block]) + (block * 512),</div><div class='add'>+				512, &amp;retlen, movebuf);</div><div class='add'>+		if (ret &lt; 0 &amp;&amp; ret != -EUCLEAN) {</div><div class='add'>+			ret = mtd-&gt;read(mtd, (nftl-&gt;EraseSize * BlockMap[block])</div><div class='add'>+					+ (block * 512), 512, &amp;retlen,</div><div class='add'>+					movebuf);</div><div class='add'>+			if (ret != -EIO)</div><div class='add'>+				printk("Error went away on retry.\n");</div><div class='add'>+		}</div><div class='ctx'> 		memset(&amp;oob, 0xff, sizeof(struct nftl_oob));</div><div class='ctx'> 		oob.b.Status = oob.b.Status1 = SECTOR_USED;</div><div class='del'>-                MTD_WRITEECC(nftl-&gt;mbd.mtd, (nftl-&gt;EraseSize * targetEUN) + (block * 512),</div><div class='del'>-                             512, &amp;retlen, movebuf, (char *)&amp;oob, &amp;nftl-&gt;oobinfo);</div><div class='add'>+</div><div class='add'>+		nftl_write(nftl-&gt;mbd.mtd, (nftl-&gt;EraseSize * targetEUN) +</div><div class='add'>+			   (block * 512), 512, &amp;retlen, movebuf, (char *)&amp;oob);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        /* add the header so that it is now a valid chain */</div><div class='del'>-        oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum</div><div class='del'>-                = cpu_to_le16(thisVUC);</div><div class='del'>-        oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum = 0xffff;</div><div class='add'>+	/* add the header so that it is now a valid chain */</div><div class='add'>+	oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum = cpu_to_le16(thisVUC);</div><div class='add'>+	oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum = 0xffff;</div><div class='ctx'> </div><div class='del'>-        MTD_WRITEOOB(nftl-&gt;mbd.mtd, (nftl-&gt;EraseSize * targetEUN) + 8,</div><div class='del'>-                     8, &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+	nftl_write_oob(mtd, (nftl-&gt;EraseSize * targetEUN) + 8,</div><div class='add'>+		       8, &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> </div><div class='ctx'> 	/* OK. We've moved the whole lot into the new block. Now we have to free the original blocks. */</div><div class='ctx'> </div><div class='hunk'>@@ -396,18 +457,18 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p</div><div class='ctx'> 	while (thisEUN &lt;= nftl-&gt;lastEUN &amp;&amp; thisEUN != targetEUN) {</div><div class='ctx'> 		unsigned int EUNtmp;</div><div class='ctx'> </div><div class='del'>-                EUNtmp = nftl-&gt;ReplUnitTable[thisEUN];</div><div class='add'>+		EUNtmp = nftl-&gt;ReplUnitTable[thisEUN];</div><div class='ctx'> </div><div class='del'>-                if (NFTL_formatblock(nftl, thisEUN) &lt; 0) {</div><div class='add'>+		if (NFTL_formatblock(nftl, thisEUN) &lt; 0) {</div><div class='ctx'> 			/* could not erase : mark block as reserved</div><div class='ctx'> 			 */</div><div class='ctx'> 			nftl-&gt;ReplUnitTable[thisEUN] = BLOCK_RESERVED;</div><div class='del'>-                } else {</div><div class='add'>+		} else {</div><div class='ctx'> 			/* correctly erased : mark it as free */</div><div class='ctx'> 			nftl-&gt;ReplUnitTable[thisEUN] = BLOCK_FREE;</div><div class='ctx'> 			nftl-&gt;numfreeEUNs++;</div><div class='del'>-                }</div><div class='del'>-                thisEUN = EUNtmp;</div><div class='add'>+		}</div><div class='add'>+		thisEUN = EUNtmp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make this the new start of chain for thisVUC */</div><div class='hunk'>@@ -473,6 +534,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)</div><div class='ctx'> {</div><div class='ctx'> 	u16 lastEUN;</div><div class='ctx'> 	u16 thisVUC = block / (nftl-&gt;EraseSize / 512);</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	unsigned int writeEUN;</div><div class='ctx'> 	unsigned long blockofs = (block * 512) &amp; (nftl-&gt;EraseSize -1);</div><div class='ctx'> 	size_t retlen;</div><div class='hunk'>@@ -489,21 +551,22 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)</div><div class='ctx'> 		*/</div><div class='ctx'> 		lastEUN = BLOCK_NIL;</div><div class='ctx'> 		writeEUN = nftl-&gt;EUNtable[thisVUC];</div><div class='del'>-                silly = MAX_LOOPS;</div><div class='add'>+		silly = MAX_LOOPS;</div><div class='ctx'> 		while (writeEUN &lt;= nftl-&gt;lastEUN) {</div><div class='ctx'> 			struct nftl_bci bci;</div><div class='ctx'> 			size_t retlen;</div><div class='del'>-                        unsigned int status;</div><div class='add'>+			unsigned int status;</div><div class='ctx'> </div><div class='ctx'> 			lastEUN = writeEUN;</div><div class='ctx'> </div><div class='del'>-			MTD_READOOB(nftl-&gt;mbd.mtd, (writeEUN * nftl-&gt;EraseSize) + blockofs,</div><div class='del'>-				    8, &amp;retlen, (char *)&amp;bci);</div><div class='add'>+			nftl_read_oob(mtd,</div><div class='add'>+				      (writeEUN * nftl-&gt;EraseSize) + blockofs,</div><div class='add'>+				      8, &amp;retlen, (char *)&amp;bci);</div><div class='ctx'> </div><div class='ctx'> 			DEBUG(MTD_DEBUG_LEVEL2, "Status of block %d in EUN %d is %x\n",</div><div class='ctx'> 			      block , writeEUN, le16_to_cpu(bci.Status));</div><div class='ctx'> </div><div class='del'>-                        status = bci.Status | bci.Status1;</div><div class='add'>+			status = bci.Status | bci.Status1;</div><div class='ctx'> 			switch(status) {</div><div class='ctx'> 			case SECTOR_FREE:</div><div class='ctx'> 				return writeEUN;</div><div class='hunk'>@@ -574,10 +637,10 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)</div><div class='ctx'> 		/* We've found a free block. Insert it into the chain. */</div><div class='ctx'> </div><div class='ctx'> 		if (lastEUN != BLOCK_NIL) {</div><div class='del'>-                    thisVUC |= 0x8000; /* It's a replacement block */</div><div class='add'>+			thisVUC |= 0x8000; /* It's a replacement block */</div><div class='ctx'> 		} else {</div><div class='del'>-                    /* The first block in a new chain */</div><div class='del'>-                    nftl-&gt;EUNtable[thisVUC] = writeEUN;</div><div class='add'>+			/* The first block in a new chain */</div><div class='add'>+			nftl-&gt;EUNtable[thisVUC] = writeEUN;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* set up the actual EUN we're writing into */</div><div class='hunk'>@@ -585,29 +648,29 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)</div><div class='ctx'> 		nftl-&gt;ReplUnitTable[writeEUN] = BLOCK_NIL;</div><div class='ctx'> </div><div class='ctx'> 		/* ... and on the flash itself */</div><div class='del'>-		MTD_READOOB(nftl-&gt;mbd.mtd, writeEUN * nftl-&gt;EraseSize + 8, 8,</div><div class='del'>-			    &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+		nftl_read_oob(mtd, writeEUN * nftl-&gt;EraseSize + 8, 8,</div><div class='add'>+			      &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> </div><div class='ctx'> 		oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum = cpu_to_le16(thisVUC);</div><div class='ctx'> </div><div class='del'>-		MTD_WRITEOOB(nftl-&gt;mbd.mtd, writeEUN * nftl-&gt;EraseSize + 8, 8,</div><div class='del'>-                             &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+		nftl_write_oob(mtd, writeEUN * nftl-&gt;EraseSize + 8, 8,</div><div class='add'>+			       &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> </div><div class='del'>-                /* we link the new block to the chain only after the</div><div class='add'>+		/* we link the new block to the chain only after the</div><div class='ctx'>                    block is ready. It avoids the case where the chain</div><div class='ctx'>                    could point to a free block */</div><div class='del'>-                if (lastEUN != BLOCK_NIL) {</div><div class='add'>+		if (lastEUN != BLOCK_NIL) {</div><div class='ctx'> 			/* Both in our cache... */</div><div class='ctx'> 			nftl-&gt;ReplUnitTable[lastEUN] = writeEUN;</div><div class='ctx'> 			/* ... and on the flash itself */</div><div class='del'>-			MTD_READOOB(nftl-&gt;mbd.mtd, (lastEUN * nftl-&gt;EraseSize) + 8,</div><div class='del'>-				    8, &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+			nftl_read_oob(mtd, (lastEUN * nftl-&gt;EraseSize) + 8,</div><div class='add'>+				      8, &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> </div><div class='ctx'> 			oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum</div><div class='ctx'> 				= cpu_to_le16(writeEUN);</div><div class='ctx'> </div><div class='del'>-			MTD_WRITEOOB(nftl-&gt;mbd.mtd, (lastEUN * nftl-&gt;EraseSize) + 8,</div><div class='del'>-				     8, &amp;retlen, (char *)&amp;oob.u);</div><div class='add'>+			nftl_write_oob(mtd, (lastEUN * nftl-&gt;EraseSize) + 8,</div><div class='add'>+				       8, &amp;retlen, (char *)&amp;oob.u);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return writeEUN;</div><div class='hunk'>@@ -639,10 +702,9 @@ static int nftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;oob, 0xff, sizeof(struct nftl_oob));</div><div class='ctx'> 	oob.b.Status = oob.b.Status1 = SECTOR_USED;</div><div class='del'>-	MTD_WRITEECC(nftl-&gt;mbd.mtd, (writeEUN * nftl-&gt;EraseSize) + blockofs,</div><div class='del'>-		     512, &amp;retlen, (char *)buffer, (char *)&amp;oob, &amp;nftl-&gt;oobinfo);</div><div class='del'>-        /* need to write SECTOR_USED flags since they are not written in mtd_writeecc */</div><div class='ctx'> </div><div class='add'>+	nftl_write(nftl-&gt;mbd.mtd, (writeEUN * nftl-&gt;EraseSize) + blockofs,</div><div class='add'>+		   512, &amp;retlen, (char *)buffer, (char *)&amp;oob);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_NFTL_RW */</div><div class='hunk'>@@ -651,20 +713,22 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> 			  char *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct NFTLrecord *nftl = (void *)mbd;</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	u16 lastgoodEUN;</div><div class='ctx'> 	u16 thisEUN = nftl-&gt;EUNtable[block / (nftl-&gt;EraseSize / 512)];</div><div class='ctx'> 	unsigned long blockofs = (block * 512) &amp; (nftl-&gt;EraseSize - 1);</div><div class='del'>-        unsigned int status;</div><div class='add'>+	unsigned int status;</div><div class='ctx'> 	int silly = MAX_LOOPS;</div><div class='del'>-        size_t retlen;</div><div class='del'>-        struct nftl_bci bci;</div><div class='add'>+	size_t retlen;</div><div class='add'>+	struct nftl_bci bci;</div><div class='ctx'> </div><div class='ctx'> 	lastgoodEUN = BLOCK_NIL;</div><div class='ctx'> </div><div class='del'>-        if (thisEUN != BLOCK_NIL) {</div><div class='add'>+	if (thisEUN != BLOCK_NIL) {</div><div class='ctx'> 		while (thisEUN &lt; nftl-&gt;nb_blocks) {</div><div class='del'>-			if (MTD_READOOB(nftl-&gt;mbd.mtd, (thisEUN * nftl-&gt;EraseSize) + blockofs,</div><div class='del'>-					8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='add'>+			if (nftl_read_oob(mtd, (thisEUN * nftl-&gt;EraseSize) +</div><div class='add'>+					  blockofs, 8, &amp;retlen,</div><div class='add'>+					  (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 				status = SECTOR_IGNORE;</div><div class='ctx'> 			else</div><div class='ctx'> 				status = bci.Status | bci.Status1;</div><div class='hunk'>@@ -694,7 +758,7 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> 			}</div><div class='ctx'> 			thisEUN = nftl-&gt;ReplUnitTable[thisEUN];</div><div class='ctx'> 		}</div><div class='del'>-        }</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>  the_end:</div><div class='ctx'> 	if (lastgoodEUN == BLOCK_NIL) {</div><div class='hunk'>@@ -703,7 +767,9 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		loff_t ptr = (lastgoodEUN * nftl-&gt;EraseSize) + blockofs;</div><div class='ctx'> 		size_t retlen;</div><div class='del'>-		if (MTD_READ(nftl-&gt;mbd.mtd, ptr, 512, &amp;retlen, buffer))</div><div class='add'>+		int res = mtd-&gt;read(mtd, ptr, 512, &amp;retlen, buffer);</div><div class='add'>+</div><div class='add'>+		if (res &lt; 0 &amp;&amp; res != -EUCLEAN)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c<br/>index 3b104ebb219a..067262ee8df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/nftlmount.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/nftlmount.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/nftlmount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/nftlmount.c</a></div><div class='hunk'>@@ -33,6 +33,11 @@</div><div class='ctx'> </div><div class='ctx'> char nftlmountrev[]="$Revision: 1.41 $";</div><div class='ctx'> </div><div class='add'>+extern int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+			 size_t *retlen, uint8_t *buf);</div><div class='add'>+extern int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,</div><div class='add'>+			  size_t *retlen, uint8_t *buf);</div><div class='add'>+</div><div class='ctx'> /* find_boot_record: Find the NFTL Media Header and its Spare copy which contains the</div><div class='ctx'>  *	various device information of the NFTL partition and Bad Unit Table. Update</div><div class='ctx'>  *	the ReplUnitTable[] table accroding to the Bad Unit Table. ReplUnitTable[]</div><div class='hunk'>@@ -45,6 +50,7 @@ static int find_boot_record(struct NFTLrecord *nftl)</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	u8 buf[SECTORSIZE];</div><div class='ctx'> 	struct NFTLMediaHeader *mh = &amp;nftl-&gt;MediaHdr;</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'>         /* Assume logical EraseSize == physical erasesize for starting the scan.</div><div class='hunk'>@@ -65,7 +71,8 @@ static int find_boot_record(struct NFTLrecord *nftl)</div><div class='ctx'> </div><div class='ctx'> 		/* Check for ANAND header first. Then can whinge if it's found but later</div><div class='ctx'> 		   checks fail */</div><div class='del'>-		ret = MTD_READ(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize, SECTORSIZE, &amp;retlen, buf);</div><div class='add'>+		ret = mtd-&gt;read(mtd, block * nftl-&gt;EraseSize, SECTORSIZE,</div><div class='add'>+				&amp;retlen, buf);</div><div class='ctx'> 		/* We ignore ret in case the ECC of the MediaHeader is invalid</div><div class='ctx'> 		   (which is apparently acceptable) */</div><div class='ctx'> 		if (retlen != SECTORSIZE) {</div><div class='hunk'>@@ -90,8 +97,9 @@ static int find_boot_record(struct NFTLrecord *nftl)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* To be safer with BIOS, also use erase mark as discriminant */</div><div class='del'>-		if ((ret = MTD_READOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8,</div><div class='del'>-				8, &amp;retlen, (char *)&amp;h1) &lt; 0)) {</div><div class='add'>+		if ((ret = nftl_read_oob(mtd, block * nftl-&gt;EraseSize +</div><div class='add'>+					 SECTORSIZE + 8, 8, &amp;retlen,</div><div class='add'>+					 (char *)&amp;h1) &lt; 0)) {</div><div class='ctx'> 			printk(KERN_WARNING "ANAND header found at 0x%x in mtd%d, but OOB data read failed (err %d)\n",</div><div class='ctx'> 			       block * nftl-&gt;EraseSize, nftl-&gt;mbd.mtd-&gt;index, ret);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -109,8 +117,8 @@ static int find_boot_record(struct NFTLrecord *nftl)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Finally reread to check ECC */</div><div class='del'>-		if ((ret = MTD_READECC(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize, SECTORSIZE,</div><div class='del'>-				&amp;retlen, buf, (char *)&amp;oob, NULL) &lt; 0)) {</div><div class='add'>+		if ((ret = mtd-&gt;read(mtd, block * nftl-&gt;EraseSize, SECTORSIZE,</div><div class='add'>+				     &amp;retlen, buf) &lt; 0)) {</div><div class='ctx'> 			printk(KERN_NOTICE "ANAND header found at 0x%x in mtd%d, but ECC read failed (err %d)\n",</div><div class='ctx'> 			       block * nftl-&gt;EraseSize, nftl-&gt;mbd.mtd-&gt;index, ret);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -228,9 +236,9 @@ device is already correct.</div><div class='ctx'> The new DiskOnChip driver already scanned the bad block table.  Just query it.</div><div class='ctx'> 			if ((i &amp; (SECTORSIZE - 1)) == 0) {</div><div class='ctx'> 				/* read one sector for every SECTORSIZE of blocks */</div><div class='del'>-				if ((ret = MTD_READECC(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize +</div><div class='del'>-						       i + SECTORSIZE, SECTORSIZE, &amp;retlen, buf,</div><div class='del'>-						       (char *)&amp;oob, NULL)) &lt; 0) {</div><div class='add'>+				if ((ret = mtd-&gt;read(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize +</div><div class='add'>+						     i + SECTORSIZE, SECTORSIZE, &amp;retlen,</div><div class='add'>+						     buf)) &lt; 0) {</div><div class='ctx'> 					printk(KERN_NOTICE "Read of bad sector table failed (err %d)\n",</div><div class='ctx'> 					       ret);</div><div class='ctx'> 					kfree(nftl-&gt;ReplUnitTable);</div><div class='hunk'>@@ -268,18 +276,22 @@ static int memcmpb(void *a, int c, int n)</div><div class='ctx'> static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int len,</div><div class='ctx'> 			      int check_oob)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	size_t retlen;</div><div class='ctx'> 	u8 buf[SECTORSIZE + nftl-&gt;mbd.mtd-&gt;oobsize];</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='add'>+	size_t retlen;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i += SECTORSIZE) {</div><div class='del'>-		if (MTD_READECC(nftl-&gt;mbd.mtd, address, SECTORSIZE, &amp;retlen, buf, &amp;buf[SECTORSIZE], &amp;nftl-&gt;oobinfo) &lt; 0)</div><div class='add'>+		if (mtd-&gt;read(mtd, address, SECTORSIZE, &amp;retlen, buf))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		if (memcmpb(buf, 0xff, SECTORSIZE) != 0)</div><div class='ctx'> 			return -1;</div><div class='ctx'> </div><div class='ctx'> 		if (check_oob) {</div><div class='del'>-			if (memcmpb(buf + SECTORSIZE, 0xff, nftl-&gt;mbd.mtd-&gt;oobsize) != 0)</div><div class='add'>+			if(nftl_read_oob(mtd, address, mtd-&gt;oobsize,</div><div class='add'>+					 &amp;retlen, &amp;buf[SECTORSIZE]) &lt; 0)</div><div class='add'>+				return -1;</div><div class='add'>+			if (memcmpb(buf + SECTORSIZE, 0xff, mtd-&gt;oobsize) != 0)</div><div class='ctx'> 				return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		address += SECTORSIZE;</div><div class='hunk'>@@ -301,10 +313,11 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)</div><div class='ctx'> 	unsigned int nb_erases, erase_mark;</div><div class='ctx'> 	struct nftl_uci1 uci;</div><div class='ctx'> 	struct erase_info *instr = &amp;nftl-&gt;instr;</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the Unit Control Information #1 for Wear-Leveling */</div><div class='del'>-	if (MTD_READOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8,</div><div class='del'>-			8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='add'>+	if (nftl_read_oob(mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8,</div><div class='add'>+			  8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='ctx'> 		goto default_uci1;</div><div class='ctx'> </div><div class='ctx'> 	erase_mark = le16_to_cpu ((uci.EraseMark | uci.EraseMark1));</div><div class='hunk'>@@ -321,7 +334,7 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)</div><div class='ctx'> 	instr-&gt;mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	instr-&gt;addr = block * nftl-&gt;EraseSize;</div><div class='ctx'> 	instr-&gt;len = nftl-&gt;EraseSize;</div><div class='del'>-	MTD_ERASE(nftl-&gt;mbd.mtd, instr);</div><div class='add'>+	mtd-&gt;erase(mtd, instr);</div><div class='ctx'> </div><div class='ctx'> 	if (instr-&gt;state == MTD_ERASE_FAILED) {</div><div class='ctx'> 		printk("Error while formatting block %d\n", block);</div><div class='hunk'>@@ -343,8 +356,8 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> </div><div class='ctx'> 		uci.WearInfo = le32_to_cpu(nb_erases);</div><div class='del'>-		if (MTD_WRITEOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8, 8,</div><div class='del'>-				 &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='add'>+		if (nftl_write_oob(mtd, block * nftl-&gt;EraseSize + SECTORSIZE +</div><div class='add'>+				   8, 8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		return 0;</div><div class='ctx'> fail:</div><div class='hunk'>@@ -365,6 +378,7 @@ fail:</div><div class='ctx'>  *	case. */</div><div class='ctx'> static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_block)</div><div class='ctx'> {</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	unsigned int block, i, status;</div><div class='ctx'> 	struct nftl_bci bci;</div><div class='ctx'> 	int sectors_per_block;</div><div class='hunk'>@@ -374,8 +388,9 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b</div><div class='ctx'> 	block = first_block;</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		for (i = 0; i &lt; sectors_per_block; i++) {</div><div class='del'>-			if (MTD_READOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + i * SECTORSIZE,</div><div class='del'>-					8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='add'>+			if (nftl_read_oob(mtd,</div><div class='add'>+					  block * nftl-&gt;EraseSize + i * SECTORSIZE,</div><div class='add'>+					  8, &amp;retlen, (char *)&amp;bci) &lt; 0)</div><div class='ctx'> 				status = SECTOR_IGNORE;</div><div class='ctx'> 			else</div><div class='ctx'> 				status = bci.Status | bci.Status1;</div><div class='hunk'>@@ -394,9 +409,10 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b</div><div class='ctx'> 					/* sector not free actually : mark it as SECTOR_IGNORE  */</div><div class='ctx'> 					bci.Status = SECTOR_IGNORE;</div><div class='ctx'> 					bci.Status1 = SECTOR_IGNORE;</div><div class='del'>-					MTD_WRITEOOB(nftl-&gt;mbd.mtd,</div><div class='del'>-						     block * nftl-&gt;EraseSize + i * SECTORSIZE,</div><div class='del'>-						     8, &amp;retlen, (char *)&amp;bci);</div><div class='add'>+					nftl_write_oob(mtd, block *</div><div class='add'>+						       nftl-&gt;EraseSize +</div><div class='add'>+						       i * SECTORSIZE, 8,</div><div class='add'>+						       &amp;retlen, (char *)&amp;bci);</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='hunk'>@@ -481,13 +497,14 @@ static void format_chain(struct NFTLrecord *nftl, unsigned int first_block)</div><div class='ctx'>  *	1. */</div><div class='ctx'> static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)</div><div class='ctx'> {</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	struct nftl_uci1 h1;</div><div class='ctx'> 	unsigned int erase_mark;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	/* check erase mark. */</div><div class='del'>-	if (MTD_READOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8, 8,</div><div class='del'>-			&amp;retlen, (char *)&amp;h1) &lt; 0)</div><div class='add'>+	if (nftl_read_oob(mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8, 8,</div><div class='add'>+			  &amp;retlen, (char *)&amp;h1) &lt; 0)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='ctx'> 	erase_mark = le16_to_cpu ((h1.EraseMark | h1.EraseMark1));</div><div class='hunk'>@@ -501,8 +518,9 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)</div><div class='ctx'> 		h1.EraseMark = cpu_to_le16(ERASE_MARK);</div><div class='ctx'> 		h1.EraseMark1 = cpu_to_le16(ERASE_MARK);</div><div class='ctx'> 		h1.WearInfo = cpu_to_le32(0);</div><div class='del'>-		if (MTD_WRITEOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + SECTORSIZE + 8, 8,</div><div class='del'>-				 &amp;retlen, (char *)&amp;h1) &lt; 0)</div><div class='add'>+		if (nftl_write_oob(mtd,</div><div class='add'>+				   block * nftl-&gt;EraseSize + SECTORSIZE + 8, 8,</div><div class='add'>+				   &amp;retlen, (char *)&amp;h1) &lt; 0)</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> #if 0</div><div class='hunk'>@@ -513,8 +531,8 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)</div><div class='ctx'> 						SECTORSIZE, 0) != 0)</div><div class='ctx'> 				return -1;</div><div class='ctx'> </div><div class='del'>-			if (MTD_READOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + i,</div><div class='del'>-					16, &amp;retlen, buf) &lt; 0)</div><div class='add'>+			if (nftl_read_oob(mtd, block * nftl-&gt;EraseSize + i,</div><div class='add'>+					  16, &amp;retlen, buf) &lt; 0)</div><div class='ctx'> 				return -1;</div><div class='ctx'> 			if (i == SECTORSIZE) {</div><div class='ctx'> 				/* skip erase mark */</div><div class='hunk'>@@ -540,11 +558,12 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)</div><div class='ctx'>  */</div><div class='ctx'> static int get_fold_mark(struct NFTLrecord *nftl, unsigned int block)</div><div class='ctx'> {</div><div class='add'>+	struct mtd_info *mtd = nftl-&gt;mbd.mtd;</div><div class='ctx'> 	struct nftl_uci2 uci;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='del'>-	if (MTD_READOOB(nftl-&gt;mbd.mtd, block * nftl-&gt;EraseSize + 2 * SECTORSIZE + 8,</div><div class='del'>-			8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='add'>+	if (nftl_read_oob(mtd, block * nftl-&gt;EraseSize + 2 * SECTORSIZE + 8,</div><div class='add'>+			  8, &amp;retlen, (char *)&amp;uci) &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return le16_to_cpu((uci.FoldMark | uci.FoldMark1));</div><div class='hunk'>@@ -558,6 +577,7 @@ int NFTL_mount(struct NFTLrecord *s)</div><div class='ctx'> 	int chain_length, do_format_chain;</div><div class='ctx'> 	struct nftl_uci0 h0;</div><div class='ctx'> 	struct nftl_uci1 h1;</div><div class='add'>+	struct mtd_info *mtd = s-&gt;mbd.mtd;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='ctx'> 	/* search for NFTL MediaHeader and Spare NFTL Media Header */</div><div class='hunk'>@@ -582,10 +602,13 @@ int NFTL_mount(struct NFTLrecord *s)</div><div class='ctx'> </div><div class='ctx'> 			for (;;) {</div><div class='ctx'> 				/* read the block header. If error, we format the chain */</div><div class='del'>-				if (MTD_READOOB(s-&gt;mbd.mtd, block * s-&gt;EraseSize + 8, 8,</div><div class='del'>-						&amp;retlen, (char *)&amp;h0) &lt; 0 ||</div><div class='del'>-				    MTD_READOOB(s-&gt;mbd.mtd, block * s-&gt;EraseSize + SECTORSIZE + 8, 8,</div><div class='del'>-						&amp;retlen, (char *)&amp;h1) &lt; 0) {</div><div class='add'>+				if (nftl_read_oob(mtd,</div><div class='add'>+						  block * s-&gt;EraseSize + 8, 8,</div><div class='add'>+						  &amp;retlen, (char *)&amp;h0) &lt; 0 ||</div><div class='add'>+				    nftl_read_oob(mtd,</div><div class='add'>+						  block * s-&gt;EraseSize +</div><div class='add'>+						  SECTORSIZE + 8, 8,</div><div class='add'>+						  &amp;retlen, (char *)&amp;h1) &lt; 0) {</div><div class='ctx'> 					s-&gt;ReplUnitTable[block] = BLOCK_NIL;</div><div class='ctx'> 					do_format_chain = 1;</div><div class='ctx'> 					break;</div><div class='head'>diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig<br/>index 126ff6bf63d5..5930a03736d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/onenand/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/onenand/Kconfig</a></div><div class='hunk'>@@ -29,6 +29,20 @@ config MTD_ONENAND_GENERIC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for OneNAND flash via platform device driver.</div><div class='ctx'> </div><div class='add'>+config MTD_ONENAND_OTP</div><div class='add'>+	bool "OneNAND OTP Support"</div><div class='add'>+	depends on MTD_ONENAND</div><div class='add'>+	help</div><div class='add'>+	  One Block of the NAND Flash Array memory is reserved as</div><div class='add'>+	  a One-Time Programmable Block memory area.</div><div class='add'>+	  Also, 1st Block of NAND Flash Array can be used as OTP.</div><div class='add'>+</div><div class='add'>+	  The OTP block can be read, programmed and locked using the same</div><div class='add'>+	  operations as any other NAND Flash Array memory block.</div><div class='add'>+	  OTP block cannot be erased.</div><div class='add'>+</div><div class='add'>+	  OTP block is fully-guaranteed to be a valid block.</div><div class='add'>+</div><div class='ctx'> config MTD_ONENAND_SYNC_READ</div><div class='ctx'> 	bool "OneNAND Sync. Burst Read Support"</div><div class='ctx'> 	depends on ARCH_OMAP</div><div class='head'>diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c<br/>index a53a73fc2a5a..84ec40d25438 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/onenand_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/onenand/onenand_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/onenand_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/onenand/onenand_base.c</a></div><div class='hunk'>@@ -23,8 +23,7 @@</div><div class='ctx'> /**</div><div class='ctx'>  * onenand_oob_64 - oob info for large (2KB) page</div><div class='ctx'>  */</div><div class='del'>-static struct nand_oobinfo onenand_oob_64 = {</div><div class='del'>-	.useecc		= MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout onenand_oob_64 = {</div><div class='ctx'> 	.eccbytes	= 20,</div><div class='ctx'> 	.eccpos		= {</div><div class='ctx'> 		8, 9, 10, 11, 12,</div><div class='hunk'>@@ -34,14 +33,14 @@ static struct nand_oobinfo onenand_oob_64 = {</div><div class='ctx'> 		},</div><div class='ctx'> 	.oobfree	= {</div><div class='ctx'> 		{2, 3}, {14, 2}, {18, 3}, {30, 2},</div><div class='del'>-		{24, 3}, {46, 2}, {40, 3}, {62, 2} }</div><div class='add'>+		{34, 3}, {46, 2}, {50, 3}, {62, 2}</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * onenand_oob_32 - oob info for middle (1KB) page</div><div class='ctx'>  */</div><div class='del'>-static struct nand_oobinfo onenand_oob_32 = {</div><div class='del'>-	.useecc		= MTD_NANDECC_AUTOPLACE,</div><div class='add'>+static struct nand_ecclayout onenand_oob_32 = {</div><div class='ctx'> 	.eccbytes	= 10,</div><div class='ctx'> 	.eccpos		= {</div><div class='ctx'> 		8, 9, 10, 11, 12,</div><div class='hunk'>@@ -190,7 +189,7 @@ static int onenand_buffer_address(int dataram1, int sectors, int count)</div><div class='ctx'> static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	struct onenand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int value, readcmd = 0;</div><div class='add'>+	int value, readcmd = 0, block_cmd = 0;</div><div class='ctx'> 	int block, page;</div><div class='ctx'> 	/* Now we use page size operation */</div><div class='ctx'> 	int sectors = 4, count = 4;</div><div class='hunk'>@@ -206,6 +205,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le</div><div class='ctx'> </div><div class='ctx'> 	case ONENAND_CMD_ERASE:</div><div class='ctx'> 	case ONENAND_CMD_BUFFERRAM:</div><div class='add'>+	case ONENAND_CMD_OTP_ACCESS:</div><div class='add'>+		block_cmd = 1;</div><div class='ctx'> 		block = (int) (addr &gt;&gt; this-&gt;erase_shift);</div><div class='ctx'> 		page = -1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -233,6 +234,12 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le</div><div class='ctx'> 		/* Write 'DFS, FBA' of Flash */</div><div class='ctx'> 		value = onenand_block_address(this, block);</div><div class='ctx'> 		this-&gt;write_word(value, this-&gt;base + ONENAND_REG_START_ADDRESS1);</div><div class='add'>+</div><div class='add'>+		if (block_cmd) {</div><div class='add'>+			/* Select DataRAM for DDP */</div><div class='add'>+			value = onenand_bufferram_address(this, block);</div><div class='add'>+			this-&gt;write_word(value, this-&gt;base + ONENAND_REG_START_ADDRESS2);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (page != -1) {</div><div class='hunk'>@@ -301,6 +308,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)</div><div class='ctx'> </div><div class='ctx'> 		if (state != FL_READING)</div><div class='ctx'> 			cond_resched();</div><div class='add'>+		touch_softlockup_watchdog();</div><div class='ctx'> 	}</div><div class='ctx'> 	/* To get correct interrupt status in timeout case */</div><div class='ctx'> 	interrupt = this-&gt;read_word(this-&gt;base + ONENAND_REG_INTERRUPT);</div><div class='hunk'>@@ -344,7 +352,7 @@ static inline int onenand_bufferram_offset(struct mtd_info *mtd, int area)</div><div class='ctx'> </div><div class='ctx'> 	if (ONENAND_CURRENT_BUFFERRAM(this)) {</div><div class='ctx'> 		if (area == ONENAND_DATARAM)</div><div class='del'>-			return mtd-&gt;oobblock;</div><div class='add'>+			return mtd-&gt;writesize;</div><div class='ctx'> 		if (area == ONENAND_SPARERAM)</div><div class='ctx'> 			return mtd-&gt;oobsize;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -372,6 +380,17 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area,</div><div class='ctx'> </div><div class='ctx'> 	bufferram += onenand_bufferram_offset(mtd, area);</div><div class='ctx'> </div><div class='add'>+	if (ONENAND_CHECK_BYTE_ACCESS(count)) {</div><div class='add'>+		unsigned short word;</div><div class='add'>+</div><div class='add'>+		/* Align with word(16-bit) size */</div><div class='add'>+		count--;</div><div class='add'>+</div><div class='add'>+		/* Read word and save byte */</div><div class='add'>+		word = this-&gt;read_word(bufferram + offset + count);</div><div class='add'>+		buffer[count] = (word &amp; 0xff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(buffer, bufferram + offset, count);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -399,6 +418,17 @@ static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area,</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);</div><div class='ctx'> </div><div class='add'>+	if (ONENAND_CHECK_BYTE_ACCESS(count)) {</div><div class='add'>+		unsigned short word;</div><div class='add'>+</div><div class='add'>+		/* Align with word(16-bit) size */</div><div class='add'>+		count--;</div><div class='add'>+</div><div class='add'>+		/* Read word and save byte */</div><div class='add'>+		word = this-&gt;read_word(bufferram + offset + count);</div><div class='add'>+		buffer[count] = (word &amp; 0xff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(buffer, bufferram + offset, count);</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;mmcontrol(mtd, 0);</div><div class='hunk'>@@ -426,6 +456,22 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area,</div><div class='ctx'> </div><div class='ctx'> 	bufferram += onenand_bufferram_offset(mtd, area);</div><div class='ctx'> </div><div class='add'>+	if (ONENAND_CHECK_BYTE_ACCESS(count)) {</div><div class='add'>+		unsigned short word;</div><div class='add'>+		int byte_offset;</div><div class='add'>+</div><div class='add'>+		/* Align with word(16-bit) size */</div><div class='add'>+		count--;</div><div class='add'>+</div><div class='add'>+		/* Calculate byte access offset */</div><div class='add'>+		byte_offset = offset + count;</div><div class='add'>+</div><div class='add'>+		/* Read word and save byte */</div><div class='add'>+		word = this-&gt;read_word(bufferram + byte_offset);</div><div class='add'>+		word = (word &amp; ~0xff) | buffer[count];</div><div class='add'>+		this-&gt;write_word(word, bufferram + byte_offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(bufferram + offset, buffer, count);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -549,31 +595,28 @@ static void onenand_release_device(struct mtd_info *mtd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * onenand_read_ecc - [MTD Interface] Read data with ECC</div><div class='add'>+ * onenand_read - [MTD Interface] Read data from flash</div><div class='ctx'>  * @param mtd		MTD device structure</div><div class='ctx'>  * @param from		offset to read from</div><div class='ctx'>  * @param len		number of bytes to read</div><div class='ctx'>  * @param retlen	pointer to variable to store the number of read bytes</div><div class='ctx'>  * @param buf		the databuffer to put data</div><div class='del'>- * @param oob_buf	filesystem supplied oob data buffer</div><div class='del'>- * @param oobsel	oob selection structure</div><div class='ctx'>  *</div><div class='del'>- * OneNAND read with ECC</div><div class='del'>- */</div><div class='del'>-static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-	size_t *retlen, u_char *buf,</div><div class='del'>-	u_char *oob_buf, struct nand_oobinfo *oobsel)</div><div class='add'>+ * Read with ecc</div><div class='add'>+*/</div><div class='add'>+static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+	size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct onenand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int read = 0, column;</div><div class='ctx'> 	int thislen;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);</div><div class='ctx'> </div><div class='ctx'> 	/* Do not allow reads past end of device */</div><div class='ctx'> 	if ((from + len) &gt; mtd-&gt;size) {</div><div class='del'>-		DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: Attempt read beyond end of device\n");</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: Attempt read beyond end of device\n");</div><div class='ctx'> 		*retlen = 0;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -584,14 +627,14 @@ static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 	/* TODO handling oob */</div><div class='ctx'> </div><div class='ctx'> 	while (read &lt; len) {</div><div class='del'>-		thislen = min_t(int, mtd-&gt;oobblock, len - read);</div><div class='add'>+		thislen = min_t(int, mtd-&gt;writesize, len - read);</div><div class='ctx'> </div><div class='del'>-		column = from &amp; (mtd-&gt;oobblock - 1);</div><div class='del'>-		if (column + thislen &gt; mtd-&gt;oobblock)</div><div class='del'>-			thislen = mtd-&gt;oobblock - column;</div><div class='add'>+		column = from &amp; (mtd-&gt;writesize - 1);</div><div class='add'>+		if (column + thislen &gt; mtd-&gt;writesize)</div><div class='add'>+			thislen = mtd-&gt;writesize - column;</div><div class='ctx'> </div><div class='ctx'> 		if (!onenand_check_bufferram(mtd, from)) {</div><div class='del'>-			this-&gt;command(mtd, ONENAND_CMD_READ, from, mtd-&gt;oobblock);</div><div class='add'>+			this-&gt;command(mtd, ONENAND_CMD_READ, from, mtd-&gt;writesize);</div><div class='ctx'> </div><div class='ctx'> 			ret = this-&gt;wait(mtd, FL_READING);</div><div class='ctx'> 			/* First copy data and check return value for ECC handling */</div><div class='hunk'>@@ -606,7 +649,7 @@ static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='del'>-			DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: read failed = %d\n", ret);</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: read failed = %d\n", ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -628,23 +671,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * onenand_read - [MTD Interface] MTD compability function for onenand_read_ecc</div><div class='del'>- * @param mtd		MTD device structure</div><div class='del'>- * @param from		offset to read from</div><div class='del'>- * @param len		number of bytes to read</div><div class='del'>- * @param retlen	pointer to variable to store the number of read bytes</div><div class='del'>- * @param buf		the databuffer to put data</div><div class='del'>- *</div><div class='del'>- * This function simply calls onenand_read_ecc with oob buffer and oobsel = NULL</div><div class='del'>-*/</div><div class='del'>-static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-	size_t *retlen, u_char *buf)</div><div class='del'>-{</div><div class='del'>-	return onenand_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * onenand_read_oob - [MTD Interface] OneNAND read out-of-band</div><div class='add'>+ * onenand_do_read_oob - [MTD Interface] OneNAND read out-of-band</div><div class='ctx'>  * @param mtd		MTD device structure</div><div class='ctx'>  * @param from		offset to read from</div><div class='ctx'>  * @param len		number of bytes to read</div><div class='hunk'>@@ -653,8 +680,8 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'>  *</div><div class='ctx'>  * OneNAND read out-of-band data from the spare area</div><div class='ctx'>  */</div><div class='del'>-static int onenand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='del'>-	size_t *retlen, u_char *buf)</div><div class='add'>+int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+			size_t *retlen, u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct onenand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int read = 0, thislen, column;</div><div class='hunk'>@@ -704,7 +731,7 @@ static int onenand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='ctx'> 		/* Read more? */</div><div class='ctx'> 		if (read &lt; len) {</div><div class='ctx'> 			/* Page size */</div><div class='del'>-			from += mtd-&gt;oobblock;</div><div class='add'>+			from += mtd-&gt;writesize;</div><div class='ctx'> 			column = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -717,8 +744,53 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * onenand_read_oob - [MTD Interface] NAND write data and/or out-of-band</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @from:	offset to read from</div><div class='add'>+ * @ops:	oob operation description structure</div><div class='add'>+ */</div><div class='add'>+static int onenand_read_oob(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			    struct mtd_oob_ops *ops)</div><div class='add'>+{</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='add'>+</div><div class='add'>+	return onenand_do_read_oob(mtd, from + ops-&gt;ooboffs, ops-&gt;len,</div><div class='add'>+				   &amp;ops-&gt;retlen, ops-&gt;oobbuf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE</div><div class='ctx'> /**</div><div class='add'>+ * onenand_verify_oob - [GENERIC] verify the oob contents after a write</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param buf		the databuffer to verify</div><div class='add'>+ * @param to		offset to read from</div><div class='add'>+ * @param len		number of bytes to read and compare</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int onenand_verify_oob(struct mtd_info *mtd, const u_char *buf, loff_t to, int len)</div><div class='add'>+{</div><div class='add'>+	struct onenand_chip *this = mtd-&gt;priv;</div><div class='add'>+	char *readp = this-&gt;page_buf;</div><div class='add'>+	int column = to &amp; (mtd-&gt;oobsize - 1);</div><div class='add'>+	int status, i;</div><div class='add'>+</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_READOOB, to, mtd-&gt;oobsize);</div><div class='add'>+	onenand_update_bufferram(mtd, to, 0);</div><div class='add'>+	status = this-&gt;wait(mtd, FL_READING);</div><div class='add'>+	if (status)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	this-&gt;read_bufferram(mtd, ONENAND_SPARERAM, readp, column, len);</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; len; i++)</div><div class='add'>+		if (buf[i] != 0xFF &amp;&amp; buf[i] != readp[i])</div><div class='add'>+			return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * onenand_verify_page - [GENERIC] verify the chip contents after a write</div><div class='ctx'>  * @param mtd		MTD device structure</div><div class='ctx'>  * @param buf		the databuffer to verify</div><div class='hunk'>@@ -731,7 +803,7 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)</div><div class='ctx'> 	void __iomem *dataram0, *dataram1;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	this-&gt;command(mtd, ONENAND_CMD_READ, addr, mtd-&gt;oobblock);</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_READ, addr, mtd-&gt;writesize);</div><div class='ctx'> </div><div class='ctx'> 	ret = this-&gt;wait(mtd, FL_READING);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -741,53 +813,51 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)</div><div class='ctx'> </div><div class='ctx'> 	/* Check, if the two dataram areas are same */</div><div class='ctx'> 	dataram0 = this-&gt;base + ONENAND_DATARAM;</div><div class='del'>-	dataram1 = dataram0 + mtd-&gt;oobblock;</div><div class='add'>+	dataram1 = dataram0 + mtd-&gt;writesize;</div><div class='ctx'> </div><div class='del'>-	if (memcmp(dataram0, dataram1, mtd-&gt;oobblock))</div><div class='add'>+	if (memcmp(dataram0, dataram1, mtd-&gt;writesize))</div><div class='ctx'> 		return -EBADMSG;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define onenand_verify_page(...)	(0)</div><div class='add'>+#define onenand_verify_oob(...)		(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define NOTALIGNED(x)	((x &amp; (mtd-&gt;oobblock - 1)) != 0)</div><div class='add'>+#define NOTALIGNED(x)	((x &amp; (mtd-&gt;writesize - 1)) != 0)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * onenand_write_ecc - [MTD Interface] OneNAND write with ECC</div><div class='add'>+ * onenand_write - [MTD Interface] write buffer to FLASH</div><div class='ctx'>  * @param mtd		MTD device structure</div><div class='ctx'>  * @param to		offset to write to</div><div class='ctx'>  * @param len		number of bytes to write</div><div class='ctx'>  * @param retlen	pointer to variable to store the number of written bytes</div><div class='ctx'>  * @param buf		the data to write</div><div class='del'>- * @param eccbuf	filesystem supplied oob data buffer</div><div class='del'>- * @param oobsel	oob selection structure</div><div class='ctx'>  *</div><div class='del'>- * OneNAND write with ECC</div><div class='add'>+ * Write with ECC</div><div class='ctx'>  */</div><div class='del'>-static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-	size_t *retlen, const u_char *buf,</div><div class='del'>-	u_char *eccbuf, struct nand_oobinfo *oobsel)</div><div class='add'>+static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='add'>+	size_t *retlen, const u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct onenand_chip *this = mtd-&gt;priv;</div><div class='ctx'> 	int written = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);</div><div class='add'>+	DEBUG(MTD_DEBUG_LEVEL3, "onenand_write: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize retlen, in case of early exit */</div><div class='ctx'> 	*retlen = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Do not allow writes past end of device */</div><div class='ctx'> 	if (unlikely((to + len) &gt; mtd-&gt;size)) {</div><div class='del'>-		DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt write to past end of device\n");</div><div class='add'>+		DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: Attempt write to past end of device\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reject writes, which are not page aligned */</div><div class='ctx'>         if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(len))) {</div><div class='del'>-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt to write not page aligned data\n");</div><div class='add'>+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: Attempt to write not page aligned data\n");</div><div class='ctx'>                 return -EINVAL;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -796,20 +866,20 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> </div><div class='ctx'> 	/* Loop until all data write */</div><div class='ctx'> 	while (written &lt; len) {</div><div class='del'>-		int thislen = min_t(int, mtd-&gt;oobblock, len - written);</div><div class='add'>+		int thislen = min_t(int, mtd-&gt;writesize, len - written);</div><div class='ctx'> </div><div class='del'>-		this-&gt;command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd-&gt;oobblock);</div><div class='add'>+		this-&gt;command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd-&gt;writesize);</div><div class='ctx'> </div><div class='ctx'> 		this-&gt;write_bufferram(mtd, ONENAND_DATARAM, buf, 0, thislen);</div><div class='ctx'> 		this-&gt;write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='del'>-		this-&gt;command(mtd, ONENAND_CMD_PROG, to, mtd-&gt;oobblock);</div><div class='add'>+		this-&gt;command(mtd, ONENAND_CMD_PROG, to, mtd-&gt;writesize);</div><div class='ctx'> </div><div class='ctx'> 		onenand_update_bufferram(mtd, to, 1);</div><div class='ctx'> </div><div class='ctx'> 		ret = this-&gt;wait(mtd, FL_WRITING);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: write filaed %d\n", ret);</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: write filaed %d\n", ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -818,7 +888,7 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> 		/* Only check verify write turn on */</div><div class='ctx'> 		ret = onenand_verify_page(mtd, (u_char *) buf, to);</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: verify failed %d\n", ret);</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: verify failed %d\n", ret);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -839,24 +909,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * onenand_write - [MTD Interface] compability function for onenand_write_ecc</div><div class='del'>- * @param mtd		MTD device structure</div><div class='del'>- * @param to		offset to write to</div><div class='del'>- * @param len		number of bytes to write</div><div class='del'>- * @param retlen	pointer to variable to store the number of written bytes</div><div class='del'>- * @param buf		the data to write</div><div class='del'>- *</div><div class='del'>- * This function simply calls onenand_write_ecc</div><div class='del'>- * with oob buffer and oobsel = NULL</div><div class='del'>- */</div><div class='del'>-static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-	size_t *retlen, const u_char *buf)</div><div class='del'>-{</div><div class='del'>-	return onenand_write_ecc(mtd, to, len, retlen, buf, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * onenand_write_oob - [MTD Interface] OneNAND write out-of-band</div><div class='add'>+ * onenand_do_write_oob - [Internal] OneNAND write out-of-band</div><div class='ctx'>  * @param mtd		MTD device structure</div><div class='ctx'>  * @param to		offset to write to</div><div class='ctx'>  * @param len		number of bytes to write</div><div class='hunk'>@@ -865,11 +918,11 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'>  *</div><div class='ctx'>  * OneNAND write out-of-band</div><div class='ctx'>  */</div><div class='del'>-static int onenand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='del'>-	size_t *retlen, const u_char *buf)</div><div class='add'>+static int onenand_do_write_oob(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='add'>+				size_t *retlen, const u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct onenand_chip *this = mtd-&gt;priv;</div><div class='del'>-	int column, status;</div><div class='add'>+	int column, ret = 0;</div><div class='ctx'> 	int written = 0;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_oob: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);</div><div class='hunk'>@@ -894,16 +947,27 @@ static int onenand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,</div><div class='ctx'> </div><div class='ctx'> 		this-&gt;command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='del'>-		this-&gt;write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd-&gt;oobsize);</div><div class='del'>-		this-&gt;write_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);</div><div class='add'>+		/* We send data to spare ram with oobsize</div><div class='add'>+		 * to prevent byte access */</div><div class='add'>+		memset(this-&gt;page_buf, 0xff, mtd-&gt;oobsize);</div><div class='add'>+		memcpy(this-&gt;page_buf + column, buf, thislen);</div><div class='add'>+		this-&gt;write_bufferram(mtd, ONENAND_SPARERAM, this-&gt;page_buf, 0, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='ctx'> 		this-&gt;command(mtd, ONENAND_CMD_PROGOOB, to, mtd-&gt;oobsize);</div><div class='ctx'> </div><div class='ctx'> 		onenand_update_bufferram(mtd, to, 0);</div><div class='ctx'> </div><div class='del'>-		status = this-&gt;wait(mtd, FL_WRITING);</div><div class='del'>-		if (status)</div><div class='add'>+		ret = this-&gt;wait(mtd, FL_WRITING);</div><div class='add'>+		if (ret) {</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_oob: write filaed %d\n", ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = onenand_verify_oob(mtd, buf, to, thislen);</div><div class='add'>+		if (ret) {</div><div class='add'>+			DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_oob: verify failed %d\n", ret);</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		written += thislen;</div><div class='ctx'> </div><div class='hunk'>@@ -920,145 +984,22 @@ out:</div><div class='ctx'> </div><div class='ctx'> 	*retlen = written;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * onenand_writev_ecc - [MTD Interface] write with iovec with ecc</div><div class='del'>- * @param mtd		MTD device structure</div><div class='del'>- * @param vecs		the iovectors to write</div><div class='del'>- * @param count		number of vectors</div><div class='del'>- * @param to		offset to write to</div><div class='del'>- * @param retlen	pointer to variable to store the number of written bytes</div><div class='del'>- * @param eccbuf	filesystem supplied oob data buffer</div><div class='del'>- * @param oobsel	oob selection structure</div><div class='del'>- *</div><div class='del'>- * OneNAND write with iovec with ecc</div><div class='add'>+ * onenand_write_oob - [MTD Interface] NAND write data and/or out-of-band</div><div class='add'>+ * @mtd:	MTD device structure</div><div class='add'>+ * @from:	offset to read from</div><div class='add'>+ * @ops:	oob operation description structure</div><div class='ctx'>  */</div><div class='del'>-static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-	unsigned long count, loff_t to, size_t *retlen,</div><div class='del'>-	u_char *eccbuf, struct nand_oobinfo *oobsel)</div><div class='add'>+static int onenand_write_oob(struct mtd_info *mtd, loff_t to,</div><div class='add'>+			     struct mtd_oob_ops *ops)</div><div class='ctx'> {</div><div class='del'>-	struct onenand_chip *this = mtd-&gt;priv;</div><div class='del'>-	unsigned char *pbuf;</div><div class='del'>-	size_t total_len, len;</div><div class='del'>-	int i, written = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* Preset written len for early exit */</div><div class='del'>-	*retlen = 0;</div><div class='del'>-</div><div class='del'>-	/* Calculate total length of data */</div><div class='del'>-	total_len = 0;</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		total_len += vecs[i].iov_len;</div><div class='del'>-</div><div class='del'>-	DEBUG(MTD_DEBUG_LEVEL3, "onenand_writev_ecc: to = 0x%08x, len = %i, count = %ld\n", (unsigned int) to, (unsigned int) total_len, count);</div><div class='del'>-</div><div class='del'>-	/* Do not allow write past end of the device */</div><div class='del'>-	if (unlikely((to + total_len) &gt; mtd-&gt;size)) {</div><div class='del'>-		DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: Attempted write past end of device\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reject writes, which are not page aligned */</div><div class='del'>-        if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(total_len))) {</div><div class='del'>-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: Attempt to write not page aligned data\n");</div><div class='del'>-                return -EINVAL;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	/* Grab the lock and see if the device is available */</div><div class='del'>-	onenand_get_device(mtd, FL_WRITING);</div><div class='del'>-</div><div class='del'>-	/* TODO handling oob */</div><div class='del'>-</div><div class='del'>-	/* Loop until all keve's data has been written */</div><div class='del'>-	len = 0;</div><div class='del'>-	while (count) {</div><div class='del'>-		pbuf = this-&gt;page_buf;</div><div class='del'>-		/*</div><div class='del'>-		 * If the given tuple is &gt;= pagesize then</div><div class='del'>-		 * write it out from the iov</div><div class='del'>-		 */</div><div class='del'>-		if ((vecs-&gt;iov_len - len) &gt;= mtd-&gt;oobblock) {</div><div class='del'>-			pbuf = vecs-&gt;iov_base + len;</div><div class='del'>-</div><div class='del'>-			len += mtd-&gt;oobblock;</div><div class='del'>-</div><div class='del'>-			/* Check, if we have to switch to the next tuple */</div><div class='del'>-			if (len &gt;= (int) vecs-&gt;iov_len) {</div><div class='del'>-				vecs++;</div><div class='del'>-				len = 0;</div><div class='del'>-				count--;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			int cnt = 0, thislen;</div><div class='del'>-			while (cnt &lt; mtd-&gt;oobblock) {</div><div class='del'>-				thislen = min_t(int, mtd-&gt;oobblock - cnt, vecs-&gt;iov_len - len);</div><div class='del'>-				memcpy(this-&gt;page_buf + cnt, vecs-&gt;iov_base + len, thislen);</div><div class='del'>-				cnt += thislen;</div><div class='del'>-				len += thislen;</div><div class='del'>-</div><div class='del'>-				/* Check, if we have to switch to the next tuple */</div><div class='del'>-				if (len &gt;= (int) vecs-&gt;iov_len) {</div><div class='del'>-					vecs++;</div><div class='del'>-					len = 0;</div><div class='del'>-					count--;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		this-&gt;command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd-&gt;oobblock);</div><div class='add'>+	BUG_ON(ops-&gt;mode != MTD_OOB_PLACE);</div><div class='ctx'> </div><div class='del'>-		this-&gt;write_bufferram(mtd, ONENAND_DATARAM, pbuf, 0, mtd-&gt;oobblock);</div><div class='del'>-		this-&gt;write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd-&gt;oobsize);</div><div class='del'>-</div><div class='del'>-		this-&gt;command(mtd, ONENAND_CMD_PROG, to, mtd-&gt;oobblock);</div><div class='del'>-</div><div class='del'>-		onenand_update_bufferram(mtd, to, 1);</div><div class='del'>-</div><div class='del'>-		ret = this-&gt;wait(mtd, FL_WRITING);</div><div class='del'>-		if (ret) {</div><div class='del'>-			DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: write failed %d\n", ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Only check verify write turn on */</div><div class='del'>-		ret = onenand_verify_page(mtd, (u_char *) pbuf, to);</div><div class='del'>-		if (ret) {</div><div class='del'>-			DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: verify failed %d\n", ret);</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		written += mtd-&gt;oobblock;</div><div class='del'>-</div><div class='del'>-		to += mtd-&gt;oobblock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	/* Deselect and wakt up anyone waiting on the device */</div><div class='del'>-	onenand_release_device(mtd);</div><div class='del'>-</div><div class='del'>-	*retlen = written;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * onenand_writev - [MTD Interface] compabilty function for onenand_writev_ecc</div><div class='del'>- * @param mtd		MTD device structure</div><div class='del'>- * @param vecs		the iovectors to write</div><div class='del'>- * @param count		number of vectors</div><div class='del'>- * @param to		offset to write to</div><div class='del'>- * @param retlen	pointer to variable to store the number of written bytes</div><div class='del'>- *</div><div class='del'>- * OneNAND write with kvec. This just calls the ecc function</div><div class='del'>- */</div><div class='del'>-static int onenand_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='del'>-	unsigned long count, loff_t to, size_t *retlen)</div><div class='del'>-{</div><div class='del'>-	return onenand_writev_ecc(mtd, vecs, count, to, retlen, NULL, NULL);</div><div class='add'>+	return onenand_do_write_oob(mtd, to + ops-&gt;ooboffs, ops-&gt;len,</div><div class='add'>+				    &amp;ops-&gt;retlen, ops-&gt;oobbuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1227,7 +1168,7 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)</div><div class='ctx'> </div><div class='ctx'>         /* We write two bytes, so we dont have to mess with 16 bit access */</div><div class='ctx'>         ofs += mtd-&gt;oobsize + (bbm-&gt;badblockpos &amp; ~0x01);</div><div class='del'>-        return mtd-&gt;write_oob(mtd, ofs , 2, &amp;retlen, buf);</div><div class='add'>+        return onenand_do_write_oob(mtd, ofs , 2, &amp;retlen, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1324,6 +1265,304 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_MTD_ONENAND_OTP</div><div class='add'>+</div><div class='add'>+/* Interal OTP operation */</div><div class='add'>+typedef int (*otp_op_t)(struct mtd_info *mtd, loff_t form, size_t len,</div><div class='add'>+		size_t *retlen, u_char *buf);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * do_otp_read - [DEFAULT] Read OTP block area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to read</div><div class='add'>+ * @param len		number of bytes to read</div><div class='add'>+ * @param retlen	pointer to variable to store the number of readbytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ *</div><div class='add'>+ * Read OTP block area.</div><div class='add'>+ */</div><div class='add'>+static int do_otp_read(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+		size_t *retlen, u_char *buf)</div><div class='add'>+{</div><div class='add'>+	struct onenand_chip *this = mtd-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Enter OTP access mode */</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);</div><div class='add'>+	this-&gt;wait(mtd, FL_OTPING);</div><div class='add'>+</div><div class='add'>+	ret = mtd-&gt;read(mtd, from, len, retlen, buf);</div><div class='add'>+</div><div class='add'>+	/* Exit OTP access mode */</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_RESET, 0, 0);</div><div class='add'>+	this-&gt;wait(mtd, FL_RESETING);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * do_otp_write - [DEFAULT] Write OTP block area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to write</div><div class='add'>+ * @param len		number of bytes to write</div><div class='add'>+ * @param retlen	pointer to variable to store the number of write bytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ *</div><div class='add'>+ * Write OTP block area.</div><div class='add'>+ */</div><div class='add'>+static int do_otp_write(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+		size_t *retlen, u_char *buf)</div><div class='add'>+{</div><div class='add'>+	struct onenand_chip *this = mtd-&gt;priv;</div><div class='add'>+	unsigned char *pbuf = buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Force buffer page aligned */</div><div class='add'>+	if (len &lt; mtd-&gt;writesize) {</div><div class='add'>+		memcpy(this-&gt;page_buf, buf, len);</div><div class='add'>+		memset(this-&gt;page_buf + len, 0xff, mtd-&gt;writesize - len);</div><div class='add'>+		pbuf = this-&gt;page_buf;</div><div class='add'>+		len = mtd-&gt;writesize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enter OTP access mode */</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);</div><div class='add'>+	this-&gt;wait(mtd, FL_OTPING);</div><div class='add'>+</div><div class='add'>+	ret = mtd-&gt;write(mtd, from, len, retlen, pbuf);</div><div class='add'>+</div><div class='add'>+	/* Exit OTP access mode */</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_RESET, 0, 0);</div><div class='add'>+	this-&gt;wait(mtd, FL_RESETING);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * do_otp_lock - [DEFAULT] Lock OTP block area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to lock</div><div class='add'>+ * @param len		number of bytes to lock</div><div class='add'>+ * @param retlen	pointer to variable to store the number of lock bytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ *</div><div class='add'>+ * Lock OTP block area.</div><div class='add'>+ */</div><div class='add'>+static int do_otp_lock(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+		size_t *retlen, u_char *buf)</div><div class='add'>+{</div><div class='add'>+	struct onenand_chip *this = mtd-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Enter OTP access mode */</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);</div><div class='add'>+	this-&gt;wait(mtd, FL_OTPING);</div><div class='add'>+</div><div class='add'>+	ret = onenand_do_write_oob(mtd, from, len, retlen, buf);</div><div class='add'>+</div><div class='add'>+	/* Exit OTP access mode */</div><div class='add'>+	this-&gt;command(mtd, ONENAND_CMD_RESET, 0, 0);</div><div class='add'>+	this-&gt;wait(mtd, FL_RESETING);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_otp_walk - [DEFAULT] Handle OTP operation</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to read/write</div><div class='add'>+ * @param len		number of bytes to read/write</div><div class='add'>+ * @param retlen	pointer to variable to store the number of read bytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ * @param action	do given action</div><div class='add'>+ * @param mode		specify user and factory</div><div class='add'>+ *</div><div class='add'>+ * Handle OTP operation.</div><div class='add'>+ */</div><div class='add'>+static int onenand_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+			size_t *retlen, u_char *buf,</div><div class='add'>+			otp_op_t action, int mode)</div><div class='add'>+{</div><div class='add'>+	struct onenand_chip *this = mtd-&gt;priv;</div><div class='add'>+	int otp_pages;</div><div class='add'>+	int density;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	*retlen = 0;</div><div class='add'>+</div><div class='add'>+	density = this-&gt;device_id &gt;&gt; ONENAND_DEVICE_DENSITY_SHIFT;</div><div class='add'>+	if (density &lt; ONENAND_DEVICE_DENSITY_512Mb)</div><div class='add'>+		otp_pages = 20;</div><div class='add'>+	else</div><div class='add'>+		otp_pages = 10;</div><div class='add'>+</div><div class='add'>+	if (mode == MTD_OTP_FACTORY) {</div><div class='add'>+		from += mtd-&gt;writesize * otp_pages;</div><div class='add'>+		otp_pages = 64 - otp_pages;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check User/Factory boundary */</div><div class='add'>+	if (((mtd-&gt;writesize * otp_pages) - (from + len)) &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0 &amp;&amp; otp_pages &gt; 0) {</div><div class='add'>+		if (!action) {	/* OTP Info functions */</div><div class='add'>+			struct otp_info *otpinfo;</div><div class='add'>+</div><div class='add'>+			len -= sizeof(struct otp_info);</div><div class='add'>+			if (len &lt;= 0)</div><div class='add'>+				return -ENOSPC;</div><div class='add'>+</div><div class='add'>+			otpinfo = (struct otp_info *) buf;</div><div class='add'>+			otpinfo-&gt;start = from;</div><div class='add'>+			otpinfo-&gt;length = mtd-&gt;writesize;</div><div class='add'>+			otpinfo-&gt;locked = 0;</div><div class='add'>+</div><div class='add'>+			from += mtd-&gt;writesize;</div><div class='add'>+			buf += sizeof(struct otp_info);</div><div class='add'>+			*retlen += sizeof(struct otp_info);</div><div class='add'>+		} else {</div><div class='add'>+			size_t tmp_retlen;</div><div class='add'>+			int size = len;</div><div class='add'>+</div><div class='add'>+			ret = action(mtd, from, len, &amp;tmp_retlen, buf);</div><div class='add'>+</div><div class='add'>+			buf += size;</div><div class='add'>+			len -= size;</div><div class='add'>+			*retlen += size;</div><div class='add'>+</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		otp_pages--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_get_fact_prot_info - [MTD Interface] Read factory OTP info</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ * @param len		number of bytes to read</div><div class='add'>+ *</div><div class='add'>+ * Read factory OTP info.</div><div class='add'>+ */</div><div class='add'>+static int onenand_get_fact_prot_info(struct mtd_info *mtd,</div><div class='add'>+			struct otp_info *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t retlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = onenand_otp_walk(mtd, 0, len, &amp;retlen, (u_char *) buf, NULL, MTD_OTP_FACTORY);</div><div class='add'>+</div><div class='add'>+	return ret ? : retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_read_fact_prot_reg - [MTD Interface] Read factory OTP area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to read</div><div class='add'>+ * @param len		number of bytes to read</div><div class='add'>+ * @param retlen	pointer to variable to store the number of read bytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ *</div><div class='add'>+ * Read factory OTP area.</div><div class='add'>+ */</div><div class='add'>+static int onenand_read_fact_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			size_t len, size_t *retlen, u_char *buf)</div><div class='add'>+{</div><div class='add'>+	return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_read, MTD_OTP_FACTORY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_get_user_prot_info - [MTD Interface] Read user OTP info</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ * @param len		number of bytes to read</div><div class='add'>+ *</div><div class='add'>+ * Read user OTP info.</div><div class='add'>+ */</div><div class='add'>+static int onenand_get_user_prot_info(struct mtd_info *mtd,</div><div class='add'>+			struct otp_info *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	size_t retlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = onenand_otp_walk(mtd, 0, len, &amp;retlen, (u_char *) buf, NULL, MTD_OTP_USER);</div><div class='add'>+</div><div class='add'>+	return ret ? : retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_read_user_prot_reg - [MTD Interface] Read user OTP area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to read</div><div class='add'>+ * @param len		number of bytes to read</div><div class='add'>+ * @param retlen	pointer to variable to store the number of read bytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ *</div><div class='add'>+ * Read user OTP area.</div><div class='add'>+ */</div><div class='add'>+static int onenand_read_user_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			size_t len, size_t *retlen, u_char *buf)</div><div class='add'>+{</div><div class='add'>+	return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_read, MTD_OTP_USER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_write_user_prot_reg - [MTD Interface] Write user OTP area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to write</div><div class='add'>+ * @param len		number of bytes to write</div><div class='add'>+ * @param retlen	pointer to variable to store the number of write bytes</div><div class='add'>+ * @param buf		the databuffer to put/get data</div><div class='add'>+ *</div><div class='add'>+ * Write user OTP area.</div><div class='add'>+ */</div><div class='add'>+static int onenand_write_user_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			size_t len, size_t *retlen, u_char *buf)</div><div class='add'>+{</div><div class='add'>+	return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_write, MTD_OTP_USER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * onenand_lock_user_prot_reg - [MTD Interface] Lock user OTP area</div><div class='add'>+ * @param mtd		MTD device structure</div><div class='add'>+ * @param from		The offset to lock</div><div class='add'>+ * @param len		number of bytes to unlock</div><div class='add'>+ *</div><div class='add'>+ * Write lock mark on spare area in page 0 in OTP block</div><div class='add'>+ */</div><div class='add'>+static int onenand_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,</div><div class='add'>+			size_t len)</div><div class='add'>+{</div><div class='add'>+	unsigned char oob_buf[64];</div><div class='add'>+	size_t retlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(oob_buf, 0xff, mtd-&gt;oobsize);</div><div class='add'>+	/*</div><div class='add'>+	 * Note: OTP lock operation</div><div class='add'>+	 *       OTP block : 0xXXFC</div><div class='add'>+	 *       1st block : 0xXXF3 (If chip support)</div><div class='add'>+	 *       Both      : 0xXXF0 (If chip support)</div><div class='add'>+	 */</div><div class='add'>+	oob_buf[ONENAND_OTP_LOCK_OFFSET] = 0xFC;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Write lock mark to 8th word of sector0 of page0 of the spare0.</div><div class='add'>+	 * We write 16 bytes spare area instead of 2 bytes.</div><div class='add'>+	 */</div><div class='add'>+	from = 0;</div><div class='add'>+	len = 16;</div><div class='add'>+</div><div class='add'>+	ret = onenand_otp_walk(mtd, from, len, &amp;retlen, oob_buf, do_otp_lock, MTD_OTP_USER);</div><div class='add'>+</div><div class='add'>+	return ret ? : retlen;</div><div class='add'>+}</div><div class='add'>+#endif	/* CONFIG_MTD_ONENAND_OTP */</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * onenand_print_device_info - Print device ID</div><div class='ctx'>  * @param device        device ID</div><div class='hunk'>@@ -1423,15 +1662,15 @@ static int onenand_probe(struct mtd_info *mtd)</div><div class='ctx'> </div><div class='ctx'> 	/* OneNAND page size &amp; block size */</div><div class='ctx'> 	/* The data buffer size is equal to page size */</div><div class='del'>-	mtd-&gt;oobblock = this-&gt;read_word(this-&gt;base + ONENAND_REG_DATA_BUFFER_SIZE);</div><div class='del'>-	mtd-&gt;oobsize = mtd-&gt;oobblock &gt;&gt; 5;</div><div class='add'>+	mtd-&gt;writesize = this-&gt;read_word(this-&gt;base + ONENAND_REG_DATA_BUFFER_SIZE);</div><div class='add'>+	mtd-&gt;oobsize = mtd-&gt;writesize &gt;&gt; 5;</div><div class='ctx'> 	/* Pagers per block is always 64 in OneNAND */</div><div class='del'>-	mtd-&gt;erasesize = mtd-&gt;oobblock &lt;&lt; 6;</div><div class='add'>+	mtd-&gt;erasesize = mtd-&gt;writesize &lt;&lt; 6;</div><div class='ctx'> </div><div class='ctx'> 	this-&gt;erase_shift = ffs(mtd-&gt;erasesize) - 1;</div><div class='del'>-	this-&gt;page_shift = ffs(mtd-&gt;oobblock) - 1;</div><div class='add'>+	this-&gt;page_shift = ffs(mtd-&gt;writesize) - 1;</div><div class='ctx'> 	this-&gt;ppb_shift = (this-&gt;erase_shift - this-&gt;page_shift);</div><div class='del'>-	this-&gt;page_mask = (mtd-&gt;erasesize / mtd-&gt;oobblock) - 1;</div><div class='add'>+	this-&gt;page_mask = (mtd-&gt;erasesize / mtd-&gt;writesize) - 1;</div><div class='ctx'> </div><div class='ctx'> 	/* REVIST: Multichip handling */</div><div class='ctx'> </div><div class='hunk'>@@ -1475,7 +1714,6 @@ static void onenand_resume(struct mtd_info *mtd)</div><div class='ctx'> 				"in suspended state\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * onenand_scan - [OneNAND Interface] Scan for the OneNAND device</div><div class='ctx'>  * @param mtd		MTD device structure</div><div class='hunk'>@@ -1522,7 +1760,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)</div><div class='ctx'> 	/* Allocate buffers, if necessary */</div><div class='ctx'> 	if (!this-&gt;page_buf) {</div><div class='ctx'> 		size_t len;</div><div class='del'>-		len = mtd-&gt;oobblock + mtd-&gt;oobsize;</div><div class='add'>+		len = mtd-&gt;writesize + mtd-&gt;oobsize;</div><div class='ctx'> 		this-&gt;page_buf = kmalloc(len, GFP_KERNEL);</div><div class='ctx'> 		if (!this-&gt;page_buf) {</div><div class='ctx'> 			printk(KERN_ERR "onenand_scan(): Can't allocate page_buf\n");</div><div class='hunk'>@@ -1537,40 +1775,42 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)</div><div class='ctx'> </div><div class='ctx'> 	switch (mtd-&gt;oobsize) {</div><div class='ctx'> 	case 64:</div><div class='del'>-		this-&gt;autooob = &amp;onenand_oob_64;</div><div class='add'>+		this-&gt;ecclayout = &amp;onenand_oob_64;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 32:</div><div class='del'>-		this-&gt;autooob = &amp;onenand_oob_32;</div><div class='add'>+		this-&gt;ecclayout = &amp;onenand_oob_32;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n",</div><div class='ctx'> 			mtd-&gt;oobsize);</div><div class='ctx'> 		/* To prevent kernel oops */</div><div class='del'>-		this-&gt;autooob = &amp;onenand_oob_32;</div><div class='add'>+		this-&gt;ecclayout = &amp;onenand_oob_32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;mtd-&gt;oobinfo, this-&gt;autooob, sizeof(mtd-&gt;oobinfo));</div><div class='add'>+	mtd-&gt;ecclayout = this-&gt;ecclayout;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in remaining MTD driver data */</div><div class='ctx'> 	mtd-&gt;type = MTD_NANDFLASH;</div><div class='del'>-	mtd-&gt;flags = MTD_CAP_NANDFLASH | MTD_ECC;</div><div class='add'>+	mtd-&gt;flags = MTD_CAP_NANDFLASH;</div><div class='ctx'> 	mtd-&gt;ecctype = MTD_ECC_SW;</div><div class='ctx'> 	mtd-&gt;erase = onenand_erase;</div><div class='ctx'> 	mtd-&gt;point = NULL;</div><div class='ctx'> 	mtd-&gt;unpoint = NULL;</div><div class='ctx'> 	mtd-&gt;read = onenand_read;</div><div class='ctx'> 	mtd-&gt;write = onenand_write;</div><div class='del'>-	mtd-&gt;read_ecc = onenand_read_ecc;</div><div class='del'>-	mtd-&gt;write_ecc = onenand_write_ecc;</div><div class='ctx'> 	mtd-&gt;read_oob = onenand_read_oob;</div><div class='ctx'> 	mtd-&gt;write_oob = onenand_write_oob;</div><div class='del'>-	mtd-&gt;readv = NULL;</div><div class='del'>-	mtd-&gt;readv_ecc = NULL;</div><div class='del'>-	mtd-&gt;writev = onenand_writev;</div><div class='del'>-	mtd-&gt;writev_ecc = onenand_writev_ecc;</div><div class='add'>+#ifdef CONFIG_MTD_ONENAND_OTP</div><div class='add'>+	mtd-&gt;get_fact_prot_info = onenand_get_fact_prot_info;</div><div class='add'>+	mtd-&gt;read_fact_prot_reg = onenand_read_fact_prot_reg;</div><div class='add'>+	mtd-&gt;get_user_prot_info = onenand_get_user_prot_info;</div><div class='add'>+	mtd-&gt;read_user_prot_reg = onenand_read_user_prot_reg;</div><div class='add'>+	mtd-&gt;write_user_prot_reg = onenand_write_user_prot_reg;</div><div class='add'>+	mtd-&gt;lock_user_prot_reg = onenand_lock_user_prot_reg;</div><div class='add'>+#endif</div><div class='ctx'> 	mtd-&gt;sync = onenand_sync;</div><div class='ctx'> 	mtd-&gt;lock = NULL;</div><div class='ctx'> 	mtd-&gt;unlock = onenand_unlock;</div><div class='head'>diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c<br/>index 4510d3361eaa..1b00dac3d7d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/onenand_bbt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/onenand/onenand_bbt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/onenand/onenand_bbt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/onenand/onenand_bbt.c</a></div><div class='hunk'>@@ -17,6 +17,9 @@</div><div class='ctx'> #include &lt;linux/mtd/onenand.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/compatmac.h&gt;</div><div class='ctx'> </div><div class='add'>+extern int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,</div><div class='add'>+			       size_t *retlen, u_char *buf);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * check_short_pattern - [GENERIC] check if a pattern is in the buffer</div><div class='ctx'>  * @param buf		the buffer to search</div><div class='hunk'>@@ -87,13 +90,13 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr</div><div class='ctx'> </div><div class='ctx'> 			/* No need to read pages fully,</div><div class='ctx'> 			 * just read required OOB bytes */</div><div class='del'>-			ret = mtd-&gt;read_oob(mtd, from + j * mtd-&gt;oobblock + bd-&gt;offs,</div><div class='del'>-						readlen, &amp;retlen, &amp;buf[0]);</div><div class='add'>+			ret = onenand_do_read_oob(mtd, from + j * mtd-&gt;writesize + bd-&gt;offs,</div><div class='add'>+						  readlen, &amp;retlen, &amp;buf[0]);</div><div class='ctx'> </div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				return ret;</div><div class='ctx'> </div><div class='del'>-			if (check_short_pattern(&amp;buf[j * scanlen], scanlen, mtd-&gt;oobblock, bd)) {</div><div class='add'>+			if (check_short_pattern(&amp;buf[j * scanlen], scanlen, mtd-&gt;writesize, bd)) {</div><div class='ctx'> 				bbm-&gt;bbt[i &gt;&gt; 3] |= 0x03 &lt;&lt; (i &amp; 0x6);</div><div class='ctx'> 				printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",</div><div class='ctx'> 					i &gt;&gt; 1, (unsigned int) from);</div><div class='head'>diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c<br/>index c077d2ec9cdd..5b58523e4d4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/redboot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/redboot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/redboot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/redboot.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $</div><div class='add'>+ * $Id: redboot.c,v 1.21 2006/03/30 18:34:37 bjd Exp $</div><div class='ctx'>  *</div><div class='ctx'>  * Parse RedBoot-style Flash Image System (FIS) tables and</div><div class='ctx'>  * produce a Linux partition array to match.</div><div class='hunk'>@@ -15,14 +15,14 @@</div><div class='ctx'> </div><div class='ctx'> struct fis_image_desc {</div><div class='ctx'>     unsigned char name[16];      // Null terminated name</div><div class='del'>-    unsigned long flash_base;    // Address within FLASH of image</div><div class='del'>-    unsigned long mem_base;      // Address in memory where it executes</div><div class='del'>-    unsigned long size;          // Length of image</div><div class='del'>-    unsigned long entry_point;   // Execution entry point</div><div class='del'>-    unsigned long data_length;   // Length of actual data</div><div class='del'>-    unsigned char _pad[256-(16+7*sizeof(unsigned long))];</div><div class='del'>-    unsigned long desc_cksum;    // Checksum over image descriptor</div><div class='del'>-    unsigned long file_cksum;    // Checksum over image data</div><div class='add'>+    uint32_t	  flash_base;    // Address within FLASH of image</div><div class='add'>+    uint32_t	  mem_base;      // Address in memory where it executes</div><div class='add'>+    uint32_t	  size;          // Length of image</div><div class='add'>+    uint32_t	  entry_point;   // Execution entry point</div><div class='add'>+    uint32_t	  data_length;   // Length of actual data</div><div class='add'>+    unsigned char _pad[256-(16+7*sizeof(uint32_t))];</div><div class='add'>+    uint32_t	  desc_cksum;    // Checksum over image descriptor</div><div class='add'>+    uint32_t	  file_cksum;    // Checksum over image data</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct fis_list {</div><div class='head'>diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c<br/>index a3e00a4635a5..fa4362fb4dd8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/mtd/rfd_ftl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/mtd/rfd_ftl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/mtd/rfd_ftl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/mtd/rfd_ftl.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005  Sean Young &lt;sean@mess.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * $Id: rfd_ftl.c,v 1.5 2005/11/07 11:14:21 gleixner Exp $</div><div class='add'>+ * $Id: rfd_ftl.c,v 1.8 2006/01/15 12:51:44 sean Exp $</div><div class='ctx'>  *</div><div class='ctx'>  * This type of flash translation layer (FTL) is used by the Embedded BIOS</div><div class='ctx'>  * by General Software. It is known as the Resident Flash Disk (RFD), see:</div><div class='hunk'>@@ -61,6 +61,7 @@ struct block {</div><div class='ctx'> 		BLOCK_OK,</div><div class='ctx'> 		BLOCK_ERASING,</div><div class='ctx'> 		BLOCK_ERASED,</div><div class='add'>+		BLOCK_UNUSED,</div><div class='ctx'> 		BLOCK_FAILED</div><div class='ctx'> 	} state;</div><div class='ctx'> 	int free_sectors;</div><div class='hunk'>@@ -99,10 +100,8 @@ static int build_block_map(struct partition *part, int block_no)</div><div class='ctx'> 	block-&gt;offset = part-&gt;block_size * block_no;</div><div class='ctx'> </div><div class='ctx'> 	if (le16_to_cpu(part-&gt;header_cache[0]) != RFD_MAGIC) {</div><div class='del'>-		block-&gt;state = BLOCK_ERASED; /* assumption */</div><div class='del'>-		block-&gt;free_sectors = part-&gt;data_sectors_per_block;</div><div class='del'>-		part-&gt;reserved_block = block_no;</div><div class='del'>-		return 1;</div><div class='add'>+		block-&gt;state = BLOCK_UNUSED;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	block-&gt;state = BLOCK_OK;</div><div class='hunk'>@@ -124,7 +123,7 @@ static int build_block_map(struct partition *part, int block_no)</div><div class='ctx'> 			entry = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (entry &gt;= part-&gt;sector_count) {</div><div class='del'>-			printk(KERN_NOTICE PREFIX</div><div class='add'>+			printk(KERN_WARNING PREFIX</div><div class='ctx'> 				"'%s': unit #%d: entry %d corrupt, "</div><div class='ctx'> 				"sector %d out of range\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name, block_no, i, entry);</div><div class='hunk'>@@ -132,7 +131,7 @@ static int build_block_map(struct partition *part, int block_no)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (part-&gt;sector_map[entry] != -1) {</div><div class='del'>-			printk(KERN_NOTICE PREFIX</div><div class='add'>+			printk(KERN_WARNING PREFIX</div><div class='ctx'> 				"'%s': more than one entry for sector %d\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name, entry);</div><div class='ctx'> 			part-&gt;errors = 1;</div><div class='hunk'>@@ -167,7 +166,7 @@ static int scan_header(struct partition *part)</div><div class='ctx'> 	/* each erase block has three bytes header, followed by the map */</div><div class='ctx'> 	part-&gt;header_sectors_per_block =</div><div class='ctx'> 			((HEADER_MAP_OFFSET + sectors_per_block) *</div><div class='del'>-		 	sizeof(u16) + SECTOR_SIZE - 1) / SECTOR_SIZE;</div><div class='add'>+			sizeof(u16) + SECTOR_SIZE - 1) / SECTOR_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	part-&gt;data_sectors_per_block = sectors_per_block -</div><div class='ctx'> 			part-&gt;header_sectors_per_block;</div><div class='hunk'>@@ -226,7 +225,7 @@ static int scan_header(struct partition *part)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (part-&gt;reserved_block == -1) {</div><div class='del'>-		printk(KERN_NOTICE PREFIX "'%s': no empty erase unit found\n",</div><div class='add'>+		printk(KERN_WARNING PREFIX "'%s': no empty erase unit found\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		part-&gt;errors = 1;</div><div class='hunk'>@@ -315,7 +314,7 @@ static void erase_callback(struct erase_info *erase)</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_NOTICE PREFIX "'%s': unable to write RFD "</div><div class='add'>+		printk(KERN_ERR PREFIX "'%s': unable to write RFD "</div><div class='ctx'> 				"header at 0x%lx\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name,</div><div class='ctx'> 				part-&gt;blocks[i].offset);</div><div class='hunk'>@@ -348,7 +347,7 @@ static int erase_block(struct partition *part, int block)</div><div class='ctx'> 	rc = part-&gt;mbd.mtd-&gt;erase(part-&gt;mbd.mtd, erase);</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_WARNING PREFIX "erase of region %x,%x on '%s' "</div><div class='add'>+		printk(KERN_ERR PREFIX "erase of region %x,%x on '%s' "</div><div class='ctx'> 				"failed\n", erase-&gt;addr, erase-&gt;len,</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name);</div><div class='ctx'> 		kfree(erase);</div><div class='hunk'>@@ -383,7 +382,7 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_NOTICE PREFIX "error reading '%s' at "</div><div class='add'>+		printk(KERN_ERR PREFIX "error reading '%s' at "</div><div class='ctx'> 			"0x%lx\n", part-&gt;mbd.mtd-&gt;name,</div><div class='ctx'> 			part-&gt;blocks[block_no].offset);</div><div class='ctx'> </div><div class='hunk'>@@ -423,7 +422,7 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old</div><div class='ctx'> 			rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 		if (rc) {</div><div class='del'>-			printk(KERN_NOTICE PREFIX "'%s': Unable to "</div><div class='add'>+			printk(KERN_ERR PREFIX "'%s': Unable to "</div><div class='ctx'> 				"read sector for relocation\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +519,7 @@ static int reclaim_block(struct partition *part, u_long *old_sector)</div><div class='ctx'>  * because if we fill that one up first it'll have the most chance of having</div><div class='ctx'>  * the least live sectors at reclaim.</div><div class='ctx'>  */</div><div class='del'>-static int find_free_block(const struct partition *part)</div><div class='add'>+static int find_free_block(struct partition *part)</div><div class='ctx'> {</div><div class='ctx'> 	int block, stop;</div><div class='ctx'> </div><div class='hunk'>@@ -533,6 +532,9 @@ static int find_free_block(const struct partition *part)</div><div class='ctx'> 				block != part-&gt;reserved_block)</div><div class='ctx'> 			return block;</div><div class='ctx'> </div><div class='add'>+		if (part-&gt;blocks[block].state == BLOCK_UNUSED)</div><div class='add'>+			erase_block(part, block);</div><div class='add'>+</div><div class='ctx'> 		if (++block &gt;= part-&gt;total_blocks)</div><div class='ctx'> 			block = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -541,7 +543,7 @@ static int find_free_block(const struct partition *part)</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int find_writeable_block(struct partition *part, u_long *old_sector)</div><div class='add'>+static int find_writable_block(struct partition *part, u_long *old_sector)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, block;</div><div class='ctx'> 	size_t retlen;</div><div class='hunk'>@@ -570,7 +572,7 @@ static int find_writeable_block(struct partition *part, u_long *old_sector)</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_NOTICE PREFIX "'%s': unable to read header at "</div><div class='add'>+		printk(KERN_ERR PREFIX "'%s': unable to read header at "</div><div class='ctx'> 				"0x%lx\n", part-&gt;mbd.mtd-&gt;name,</div><div class='ctx'> 				part-&gt;blocks[block].offset);</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -602,7 +604,7 @@ static int mark_sector_deleted(struct partition *part, u_long old_addr)</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_WARNING PREFIX "error writing '%s' at "</div><div class='add'>+		printk(KERN_ERR PREFIX "error writing '%s' at "</div><div class='ctx'> 			"0x%lx\n", part-&gt;mbd.mtd-&gt;name, addr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -652,7 +654,7 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,</div><div class='ctx'> 	if (part-&gt;current_block == -1 ||</div><div class='ctx'> 		!part-&gt;blocks[part-&gt;current_block].free_sectors) {</div><div class='ctx'> </div><div class='del'>-		rc = find_writeable_block(part, old_addr);</div><div class='add'>+		rc = find_writable_block(part, old_addr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -675,7 +677,7 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_WARNING PREFIX "error writing '%s' at 0x%lx\n",</div><div class='add'>+		printk(KERN_ERR PREFIX "error writing '%s' at 0x%lx\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name, addr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -695,7 +697,7 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_WARNING PREFIX "error writing '%s' at 0x%lx\n",</div><div class='add'>+		printk(KERN_ERR PREFIX "error writing '%s' at 0x%lx\n",</div><div class='ctx'> 				part-&gt;mbd.mtd-&gt;name, addr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err;</div><div class='hunk'>@@ -776,7 +778,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)</div><div class='ctx'> 		part-&gt;block_size = block_size;</div><div class='ctx'> 	else {</div><div class='ctx'> 		if (!mtd-&gt;erasesize) {</div><div class='del'>-			printk(KERN_NOTICE PREFIX "please provide block_size");</div><div class='add'>+			printk(KERN_WARNING PREFIX "please provide block_size");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		else</div><div class='hunk'>@@ -791,8 +793,8 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)</div><div class='ctx'> 		if (!(mtd-&gt;flags &amp; MTD_WRITEABLE))</div><div class='ctx'> 			part-&gt;mbd.readonly = 1;</div><div class='ctx'> 		else if (part-&gt;errors) {</div><div class='del'>-			printk(KERN_NOTICE PREFIX "'%s': errors found, "</div><div class='del'>-					"setting read-only", mtd-&gt;name);</div><div class='add'>+			printk(KERN_WARNING PREFIX "'%s': errors found, "</div><div class='add'>+					"setting read-only\n", mtd-&gt;name);</div><div class='ctx'> 			part-&gt;mbd.readonly = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c<br/>index f6d51ce34b00..07136ec423bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c501.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c501.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c501.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c501.c</a></div><div class='hunk'>@@ -508,11 +508,11 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>  * speak of. We simply pull the packet out of its PIO buffer (which is slow)</div><div class='ctx'>  * and queue it for the kernel. Then we reset the card for the next packet.</div><div class='ctx'>  *</div><div class='del'>- * We sometimes get suprise interrupts late both because the SMP IRQ delivery</div><div class='add'>+ * We sometimes get surprise interrupts late both because the SMP IRQ delivery</div><div class='ctx'>  * is message passing and because the card sometimes seems to deliver late. I</div><div class='ctx'>  * think if it is part way through a receive and the mode is changed it carries</div><div class='ctx'>  * on receiving and sends us an interrupt. We have to band aid all these cases</div><div class='del'>- * to get a sensible 150kbytes/second performance. Even then you want a small</div><div class='add'>+ * to get a sensible 150kBytes/second performance. Even then you want a small</div><div class='ctx'>  * TCP window.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -909,7 +909,7 @@ MODULE_PARM_DESC(irq, "EtherLink IRQ number");</div><div class='ctx'>  * here also causes the module to be unloaded</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	dev_3c501 = el1_probe(-1);</div><div class='ctx'> 	if (IS_ERR(dev_3c501))</div><div class='head'>diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c<br/>index dcc98afa65d7..cb5ef75450dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c503.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c503.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c503.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c503.c</a></div><div class='hunk'>@@ -688,7 +688,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* This is set up so that only a single autoprobe takes place per call.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended. */</div><div class='del'>-int</div><div class='add'>+int __init</div><div class='ctx'> init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='head'>diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c<br/>index 111601ca4ca3..19c0b856c488 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c505.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c505.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c505.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c505.c</a></div><div class='hunk'>@@ -1633,7 +1633,7 @@ MODULE_PARM_DESC(io, "EtherLink Plus I/O base address(es)");</div><div class='ctx'> MODULE_PARM_DESC(irq, "EtherLink Plus IRQ number(s) (assigned)");</div><div class='ctx'> MODULE_PARM_DESC(dma, "EtherLink Plus DMA channel(s)");</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c<br/>index 4db82893909c..6039049259ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c507.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c507.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c507.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c507.c</a></div><div class='hunk'>@@ -932,7 +932,7 @@ module_param(irq, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(io, "EtherLink16 I/O base address");</div><div class='ctx'> MODULE_PARM_DESC(irq, "(ignored)");</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (io == 0)</div><div class='ctx'> 		printk("3c507: You should not use auto-probing with insmod!\n");</div><div class='head'>diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c<br/>index dc845f36fe49..cbdae54f715f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c509.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c509.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c509.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c509.c</a></div><div class='hunk'>@@ -68,7 +68,6 @@</div><div class='ctx'> /* Maximum events (Rx packets, etc.) to handle at each interrupt. */</div><div class='ctx'> static int max_interrupt_work = 10;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #ifdef CONFIG_MCA</div><div class='ctx'> #include &lt;linux/mca.h&gt;</div><div class='head'>diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c<br/>index 91d1c4c24d9b..4532b17e40ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c515.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c515.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c515.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c515.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@ static int max_interrupt_work = 20;</div><div class='ctx'> #define RX_RING_SIZE	16</div><div class='ctx'> #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -761,7 +760,7 @@ static int corkscrew_open(struct net_device *dev)</div><div class='ctx'> 				   vp-&gt;product_name, dev)) return -EAGAIN;</div><div class='ctx'> 		enable_dma(dev-&gt;dma);</div><div class='ctx'> 		set_dma_mode(dev-&gt;dma, DMA_MODE_CASCADE);</div><div class='del'>-	} else if (request_irq(dev-&gt;irq, &amp;corkscrew_interrupt, SA_SHIRQ,</div><div class='add'>+	} else if (request_irq(dev-&gt;irq, &amp;corkscrew_interrupt, IRQF_SHARED,</div><div class='ctx'> 			       vp-&gt;product_name, dev)) {</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c<br/>index b40885d41680..5dfd97f0ba9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c523.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c523.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c523.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c523.c</a></div><div class='hunk'>@@ -289,7 +289,7 @@ static int elmc_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	elmc_id_attn586();	/* disable interrupts */</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, &amp;elmc_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM,</div><div class='add'>+	ret = request_irq(dev-&gt;irq, &amp;elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "%s: couldn't get irq %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='hunk'>@@ -1277,7 +1277,7 @@ MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)");</div><div class='ctx'> MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev,found = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c<br/>index 6db3301e7965..03c0f7176fc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c527.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c527.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c527.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c527.c</a></div><div class='hunk'>@@ -435,7 +435,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)</div><div class='ctx'> 	 *	Grab the IRQ</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	err = request_irq(dev-&gt;irq, &amp;mc32_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM, DRV_NAME, dev);</div><div class='add'>+	err = request_irq(dev-&gt;irq, &amp;mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		release_region(dev-&gt;base_addr, MC32_IO_EXTENT);</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to get IRQ %d.\n", DRV_NAME, dev-&gt;irq);</div><div class='hunk'>@@ -1031,8 +1031,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-	if (skb == NULL) {</div><div class='add'>+	if (skb_padto(skb, ETH_ZLEN)) {</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1646,7 +1645,7 @@ static struct net_device *this_device;</div><div class='ctx'>  *	insmod multiple modules for now but it's a hack.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	this_device = mc32_probe(-1);</div><div class='ctx'> 	if (IS_ERR(this_device))</div><div class='head'>diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c<br/>index 274b0138d442..80e8ca013e44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/3c59x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/3c59x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/3c59x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/3c59x.c</a></div><div class='hunk'>@@ -17,172 +17,6 @@</div><div class='ctx'> 	410 Severn Ave., Suite 210</div><div class='ctx'> 	Annapolis MD 21403</div><div class='ctx'> </div><div class='del'>-	Linux Kernel Additions:</div><div class='del'>-	</div><div class='del'>- 	0.99H+lk0.9 - David S. Miller - softnet, PCI DMA updates</div><div class='del'>- 	0.99H+lk1.0 - Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>-		Remove compatibility defines for kernel versions &lt; 2.2.x.</div><div class='del'>-		Update for new 2.3.x module interface</div><div class='del'>-	LK1.1.2 (March 19, 2000)</div><div class='del'>-	* New PCI interface (jgarzik)</div><div class='del'>-</div><div class='del'>-    LK1.1.3 25 April 2000, Andrew Morton &lt;andrewm@uow.edu.au&gt;</div><div class='del'>-    - Merged with 3c575_cb.c</div><div class='del'>-    - Don't set RxComplete in boomerang interrupt enable reg</div><div class='del'>-    - spinlock in vortex_timer to protect mdio functions</div><div class='del'>-    - disable local interrupts around call to vortex_interrupt in</div><div class='del'>-      vortex_tx_timeout() (So vortex_interrupt can use spin_lock())</div><div class='del'>-    - Select window 3 in vortex_timer()'s write to Wn3_MAC_Ctrl</div><div class='del'>-    - In vortex_start_xmit(), move the lock to _after_ we've altered</div><div class='del'>-      vp-&gt;cur_tx and vp-&gt;tx_full.  This defeats the race between</div><div class='del'>-      vortex_start_xmit() and vortex_interrupt which was identified</div><div class='del'>-      by Bogdan Costescu.</div><div class='del'>-    - Merged back support for six new cards from various sources</div><div class='del'>-    - Set vortex_have_pci if pci_module_init returns zero (fixes cardbus</div><div class='del'>-      insertion oops)</div><div class='del'>-    - Tell it that 3c905C has NWAY for 100bT autoneg</div><div class='del'>-    - Fix handling of SetStatusEnd in 'Too much work..' code, as</div><div class='del'>-      per 2.3.99's 3c575_cb (Dave Hinds).</div><div class='del'>-    - Split ISR into two for vortex &amp; boomerang</div><div class='del'>-    - Fix MOD_INC/DEC races</div><div class='del'>-    - Handle resource allocation failures.</div><div class='del'>-    - Fix 3CCFE575CT LED polarity</div><div class='del'>-    - Make tx_interrupt_mitigation the default</div><div class='del'>-</div><div class='del'>-    LK1.1.4 25 April 2000, Andrew Morton &lt;andrewm@uow.edu.au&gt;    </div><div class='del'>-    - Add extra TxReset to vortex_up() to fix 575_cb hotplug initialisation probs.</div><div class='del'>-    - Put vortex_info_tbl into __devinitdata</div><div class='del'>-    - In the vortex_error StatsFull HACK, disable stats in vp-&gt;intr_enable as well</div><div class='del'>-      as in the hardware.</div><div class='del'>-    - Increased the loop counter in issue_and_wait from 2,000 to 4,000.</div><div class='del'>-</div><div class='del'>-    LK1.1.5 28 April 2000, andrewm</div><div class='del'>-    - Added powerpc defines (John Daniel &lt;jdaniel@etresoft.com&gt; said these work...)</div><div class='del'>-    - Some extra diagnostics</div><div class='del'>-    - In vortex_error(), reset the Tx on maxCollisions.  Otherwise most</div><div class='del'>-      chips usually get a Tx timeout.</div><div class='del'>-    - Added extra_reset module parm</div><div class='del'>-    - Replaced some inline timer manip with mod_timer</div><div class='del'>-      (Franois romieu &lt;Francois.Romieu@nic.fr&gt;)</div><div class='del'>-    - In vortex_up(), don't make Wn3_config initialisation dependent upon has_nway</div><div class='del'>-      (this came across from 3c575_cb).</div><div class='del'>-</div><div class='del'>-    LK1.1.6 06 Jun 2000, andrewm</div><div class='del'>-    - Backed out the PPC defines.</div><div class='del'>-    - Use del_timer_sync(), mod_timer().</div><div class='del'>-    - Fix wrapped ulong comparison in boomerang_rx()</div><div class='del'>-    - Add IS_TORNADO, use it to suppress 3c905C checksum error msg</div><div class='del'>-      (Donald Becker, I Lee Hetherington &lt;ilh@sls.lcs.mit.edu&gt;)</div><div class='del'>-    - Replace union wn3_config with BFINS/BFEXT manipulation for</div><div class='del'>-      sparc64 (Pete Zaitcev, Peter Jones)</div><div class='del'>-    - In vortex_error, do_tx_reset and vortex_tx_timeout(Vortex):</div><div class='del'>-      do a netif_wake_queue() to better recover from errors. (Anders Pedersen,</div><div class='del'>-      Donald Becker)</div><div class='del'>-    - Print a warning on out-of-memory (rate limited to 1 per 10 secs)</div><div class='del'>-    - Added two more Cardbus 575 NICs: 5b57 and 6564 (Paul Wagland)</div><div class='del'>-</div><div class='del'>-    LK1.1.7 2 Jul 2000 andrewm</div><div class='del'>-    - Better handling of shared IRQs</div><div class='del'>-    - Reset the transmitter on a Tx reclaim error</div><div class='del'>-    - Fixed crash under OOM during vortex_open() (Mark Hemment)</div><div class='del'>-    - Fix Rx cessation problem during OOM (help from Mark Hemment)</div><div class='del'>-    - The spinlocks around the mdio access were blocking interrupts for 300uS.</div><div class='del'>-      Fix all this to use spin_lock_bh() within mdio_read/write</div><div class='del'>-    - Only write to TxFreeThreshold if it's a boomerang - other NICs don't</div><div class='del'>-      have one.</div><div class='del'>-    - Added 802.3x MAC-layer flow control support</div><div class='del'>-</div><div class='del'>-   LK1.1.8 13 Aug 2000 andrewm</div><div class='del'>-    - Ignore request_region() return value - already reserved if Cardbus.</div><div class='del'>-    - Merged some additional Cardbus flags from Don's 0.99Qk</div><div class='del'>-    - Some fixes for 3c556 (Fred Maciel)</div><div class='del'>-    - Fix for EISA initialisation (Jan Rekorajski)</div><div class='del'>-    - Renamed MII_XCVR_PWR and EEPROM_230 to align with 3c575_cb and D. Becker's drivers</div><div class='del'>-    - Fixed MII_XCVR_PWR for 3CCFE575CT</div><div class='del'>-    - Added INVERT_LED_PWR, used it.</div><div class='del'>-    - Backed out the extra_reset stuff</div><div class='del'>-</div><div class='del'>-   LK1.1.9 12 Sep 2000 andrewm</div><div class='del'>-    - Backed out the tx_reset_resume flags.  It was a no-op.</div><div class='del'>-    - In vortex_error, don't reset the Tx on txReclaim errors</div><div class='del'>-    - In vortex_error, don't reset the Tx on maxCollisions errors.</div><div class='del'>-      Hence backed out all the DownListPtr logic here.</div><div class='del'>-    - In vortex_error, give Tornado cards a partial TxReset on</div><div class='del'>-      maxCollisions (David Hinds).  Defined MAX_COLLISION_RESET for this.</div><div class='del'>-    - Redid some driver flags and device names based on pcmcia_cs-3.1.20.</div><div class='del'>-    - Fixed a bug where, if vp-&gt;tx_full is set when the interface</div><div class='del'>-      is downed, it remains set when the interface is upped.  Bad</div><div class='del'>-      things happen.</div><div class='del'>-</div><div class='del'>-   LK1.1.10 17 Sep 2000 andrewm</div><div class='del'>-    - Added EEPROM_8BIT for 3c555 (Fred Maciel)</div><div class='del'>-    - Added experimental support for the 3c556B Laptop Hurricane (Louis Gerbarg)</div><div class='del'>-    - Add HAS_NWAY to "3c900 Cyclone 10Mbps TPO"</div><div class='del'>-</div><div class='del'>-   LK1.1.11 13 Nov 2000 andrewm</div><div class='del'>-    - Dump MOD_INC/DEC_USE_COUNT, use SET_MODULE_OWNER</div><div class='del'>-</div><div class='del'>-   LK1.1.12 1 Jan 2001 andrewm (2.4.0-pre1)</div><div class='del'>-    - Call pci_enable_device before we request our IRQ (Tobias Ringstrom)</div><div class='del'>-    - Add 3c590 PCI latency timer hack to vortex_probe1 (from 0.99Ra)</div><div class='del'>-    - Added extended issue_and_wait for the 3c905CX.</div><div class='del'>-    - Look for an MII on PHY index 24 first (3c905CX oddity).</div><div class='del'>-    - Add HAS_NWAY to 3cSOHO100-TX (Brett Frankenberger)</div><div class='del'>-    - Don't free skbs we don't own on oom path in vortex_open().</div><div class='del'>-</div><div class='del'>-   LK1.1.13 27 Jan 2001</div><div class='del'>-    - Added explicit `medialock' flag so we can truly</div><div class='del'>-      lock the media type down with `options'.</div><div class='del'>-    - "check ioremap return and some tidbits" (Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;)</div><div class='del'>-    - Added and used EEPROM_NORESET for 3c556B PM resumes.</div><div class='del'>-    - Fixed leakage of vp-&gt;rx_ring.</div><div class='del'>-    - Break out separate HAS_HWCKSM device capability flag.</div><div class='del'>-    - Kill vp-&gt;tx_full (ANK)</div><div class='del'>-    - Merge zerocopy fragment handling (ANK?)</div><div class='del'>-</div><div class='del'>-   LK1.1.14 15 Feb 2001</div><div class='del'>-    - Enable WOL.  Can be turned on with `enable_wol' module option.</div><div class='del'>-    - EISA and PCI initialisation fixes (jgarzik, Manfred Spraul)</div><div class='del'>-    - If a device's internalconfig register reports it has NWAY,</div><div class='del'>-      use it, even if autoselect is enabled.</div><div class='del'>-</div><div class='del'>-   LK1.1.15 6 June 2001 akpm</div><div class='del'>-    - Prevent double counting of received bytes (Lars Christensen)</div><div class='del'>-    - Add ethtool support (jgarzik)</div><div class='del'>-    - Add module parm descriptions (Andrzej M. Krzysztofowicz)</div><div class='del'>-    - Implemented alloc_etherdev() API</div><div class='del'>-    - Special-case the 'Tx error 82' message.</div><div class='del'>-</div><div class='del'>-   LK1.1.16 18 July 2001 akpm</div><div class='del'>-    - Make NETIF_F_SG dependent upon nr_free_highpages(), not on CONFIG_HIGHMEM</div><div class='del'>-    - Lessen verbosity of bootup messages</div><div class='del'>-    - Fix WOL - use new PM API functions.</div><div class='del'>-    - Use netif_running() instead of vp-&gt;open in suspend/resume.</div><div class='del'>-    - Don't reset the interface logic on open/close/rmmod.  It upsets</div><div class='del'>-      autonegotiation, and hence DHCP (from 0.99T).</div><div class='del'>-    - Back out EEPROM_NORESET flag because of the above (we do it for all</div><div class='del'>-      NICs).</div><div class='del'>-    - Correct 3c982 identification string</div><div class='del'>-    - Rename wait_for_completion() to issue_and_wait() to avoid completion.h</div><div class='del'>-      clash.</div><div class='del'>-</div><div class='del'>-   LK1.1.17 18Dec01 akpm</div><div class='del'>-    - PCI ID 9805 is a Python-T, not a dual-port Cyclone.  Apparently.</div><div class='del'>-      And it has NWAY.</div><div class='del'>-    - Mask our advertised modes (vp-&gt;advertising) with our capabilities</div><div class='del'>-	  (MII reg5) when deciding which duplex mode to use.</div><div class='del'>-    - Add `global_options' as default for options[].  Ditto global_enable_wol,</div><div class='del'>-      global_full_duplex.</div><div class='del'>-</div><div class='del'>-   LK1.1.18 01Jul02 akpm</div><div class='del'>-    - Fix for undocumented transceiver power-up bit on some 3c566B's</div><div class='del'>-      (Donald Becker, Rahul Karnik)</div><div class='del'>-</div><div class='del'>-    - See http://www.zip.com.au/~akpm/linux/#3c59x-2.3 for more details.</div><div class='del'>-    - Also see Documentation/networking/vortex.txt</div><div class='del'>-</div><div class='del'>-   LK1.1.19 10Nov02 Marc Zyngier &lt;maz@wild-wind.fr.eu.org&gt;</div><div class='del'>-    - EISA sysfs integration.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -236,7 +70,6 @@ static int vortex_debug = VORTEX_DEBUG;</div><div class='ctx'> static int vortex_debug = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -375,8 +208,7 @@ limit of 4K.</div><div class='ctx'>    of the drivers, and will likely be provided by some future kernel.</div><div class='ctx'> */</div><div class='ctx'> enum pci_flags_bit {</div><div class='del'>-	PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,</div><div class='del'>-	PCI_ADDR0=0x10&lt;&lt;0, PCI_ADDR1=0x10&lt;&lt;1, PCI_ADDR2=0x10&lt;&lt;2, PCI_ADDR3=0x10&lt;&lt;3,</div><div class='add'>+	PCI_USES_MASTER=4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {	IS_VORTEX=1, IS_BOOMERANG=2, IS_CYCLONE=4, IS_TORNADO=8,</div><div class='hunk'>@@ -446,95 +278,95 @@ static struct vortex_chip_info {</div><div class='ctx'> 	int io_size;</div><div class='ctx'> } vortex_info_tbl[] __devinitdata = {</div><div class='ctx'> 	{"3c590 Vortex 10Mbps",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='add'>+	 PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='ctx'> 	{"3c592 EISA 10Mbps Demon/Vortex",					/* AKPM: from Don's 3c59x_cb.c 0.49H */</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='add'>+	 PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='ctx'> 	{"3c597 EISA Fast Demon/Vortex",					/* AKPM: from Don's 3c59x_cb.c 0.49H */</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='add'>+	 PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='ctx'> 	{"3c595 Vortex 100baseTx",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='add'>+	 PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='ctx'> 	{"3c595 Vortex 100baseT4",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='add'>+	 PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='ctx'> </div><div class='ctx'> 	{"3c595 Vortex 100base-MII",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='add'>+	 PCI_USES_MASTER, IS_VORTEX, 32, },</div><div class='ctx'> 	{"3c900 Boomerang 10baseT",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },</div><div class='add'>+	 PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },</div><div class='ctx'> 	{"3c900 Boomerang 10Mbps Combo",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },</div><div class='add'>+	 PCI_USES_MASTER, IS_BOOMERANG|EEPROM_RESET, 64, },</div><div class='ctx'> 	{"3c900 Cyclone 10Mbps TPO",						/* AKPM: from Don's 0.99M */</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c900 Cyclone 10Mbps Combo",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{"3c900 Cyclone 10Mbps TPC",						/* AKPM: from Don's 0.99M */</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c900B-FL Cyclone 10base-FL",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c905 Boomerang 100baseTx",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },</div><div class='add'>+	 PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },</div><div class='ctx'> 	{"3c905 Boomerang 100baseT4",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },</div><div class='add'>+	 PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },</div><div class='ctx'> 	{"3c905B Cyclone 100baseTx",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{"3c905B Cyclone 10/100/BNC",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c905B-FX Cyclone 100baseFx",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c905C Tornado",</div><div class='del'>-	PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },</div><div class='add'>+	PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },</div><div class='ctx'> 	{"3c920B-EMB-WNM (ATI Radeon 9100 IGP)",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_MII|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_MII|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c980 Cyclone",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{"3c980C Python-T",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3cSOHO100-TX Hurricane",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c555 Laptop Hurricane",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|EEPROM_8BIT|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|EEPROM_8BIT|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c556 Laptop Tornado",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_8BIT|HAS_CB_FNS|INVERT_MII_PWR|</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_8BIT|HAS_CB_FNS|INVERT_MII_PWR|</div><div class='ctx'> 									HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c556B Laptop Hurricane",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_OFFSET|HAS_CB_FNS|INVERT_MII_PWR|</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_OFFSET|HAS_CB_FNS|INVERT_MII_PWR|</div><div class='ctx'> 	                                WNO_XCVR_PWR|HAS_HWCKSM, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{"3c575 [Megahertz] 10/100 LAN 	CardBus",</div><div class='del'>-	PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },</div><div class='add'>+	PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },</div><div class='ctx'> 	{"3c575 Boomerang CardBus",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },</div><div class='ctx'> 	{"3CCFE575BT Cyclone CardBus",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|</div><div class='ctx'> 									INVERT_LED_PWR|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3CCFE575CT Tornado CardBus",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='ctx'> 									MAX_COLLISION_RESET|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3CCFE656 Cyclone CardBus",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='ctx'> 									INVERT_LED_PWR|HAS_HWCKSM, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{"3CCFEM656B Cyclone+Winmodem CardBus",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='ctx'> 									INVERT_LED_PWR|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3CXFEM656C Tornado+Winmodem CardBus",			/* From pcmcia-cs-3.1.5 */</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_CB_FNS|EEPROM_8BIT|INVERT_MII_PWR|</div><div class='ctx'> 									MAX_COLLISION_RESET|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c450 HomePNA Tornado",						/* AKPM: from Don's 0.99Q */</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c920 Tornado",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='ctx'> 	{"3c982 Hydra Dual Port A",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{"3c982 Hydra Dual Port B",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },</div><div class='ctx'> 	{"3c905B-T4",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },</div><div class='ctx'> 	{"3c920B-EMB-WNM Tornado",</div><div class='del'>-	 PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='add'>+	 PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },</div><div class='ctx'> </div><div class='ctx'> 	{NULL,}, /* NULL terminated list. */</div><div class='ctx'> };</div><div class='hunk'>@@ -998,7 +830,7 @@ static int vortex_resume(struct pci_dev *pdev)</div><div class='ctx'> 		pci_enable_device(pdev);</div><div class='ctx'> 		pci_set_master(pdev);</div><div class='ctx'> 		if (request_irq(dev-&gt;irq, vp-&gt;full_bus_master_rx ?</div><div class='del'>-				&amp;boomerang_interrupt : &amp;vortex_interrupt, SA_SHIRQ, dev-&gt;name, dev)) {</div><div class='add'>+				&amp;boomerang_interrupt : &amp;vortex_interrupt, IRQF_SHARED, dev-&gt;name, dev)) {</div><div class='ctx'> 			printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 			pci_disable_device(pdev);</div><div class='ctx'> 			return -EBUSY;</div><div class='hunk'>@@ -1382,17 +1214,12 @@ static int __devinit vortex_probe1(struct device *gendev,</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		iowrite8(dev-&gt;dev_addr[i], ioaddr + i);</div><div class='ctx'> </div><div class='del'>-#ifdef __sparc__</div><div class='del'>-	if (print_info)</div><div class='del'>-		printk(", IRQ %s\n", __irq_itoa(dev-&gt;irq));</div><div class='del'>-#else</div><div class='ctx'> 	if (print_info)</div><div class='ctx'> 		printk(", IRQ %d\n", dev-&gt;irq);</div><div class='ctx'> 	/* Tell them about an invalid IRQ. */</div><div class='ctx'> 	if (dev-&gt;irq &lt;= 0 || dev-&gt;irq &gt;= NR_IRQS)</div><div class='ctx'> 		printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",</div><div class='ctx'> 			   dev-&gt;irq);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	EL3WINDOW(4);</div><div class='ctx'> 	step = (ioread8(ioaddr + Wn4_NetDiag) &amp; 0x1e) &gt;&gt; 1;</div><div class='hunk'>@@ -1413,8 +1240,10 @@ static int __devinit vortex_probe1(struct device *gendev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (print_info) {</div><div class='del'>-			printk(KERN_INFO "%s: CardBus functions mapped %8.8lx-&gt;%p\n",</div><div class='del'>-				print_name, pci_resource_start(pdev, 2),</div><div class='add'>+			printk(KERN_INFO "%s: CardBus functions mapped "</div><div class='add'>+				"%16.16llx-&gt;%p\n",</div><div class='add'>+				print_name,</div><div class='add'>+				(unsigned long long)pci_resource_start(pdev, 2),</div><div class='ctx'> 				vp-&gt;cb_fn_base);</div><div class='ctx'> 		}</div><div class='ctx'> 		EL3WINDOW(2);</div><div class='hunk'>@@ -1838,7 +1667,7 @@ vortex_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Use the now-standard shared IRQ implementation. */</div><div class='ctx'> 	if ((retval = request_irq(dev-&gt;irq, vp-&gt;full_bus_master_rx ?</div><div class='del'>-				&amp;boomerang_interrupt : &amp;vortex_interrupt, SA_SHIRQ, dev-&gt;name, dev))) {</div><div class='add'>+				&amp;boomerang_interrupt : &amp;vortex_interrupt, IRQF_SHARED, dev-&gt;name, dev))) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1902,7 +1731,7 @@ vortex_timer(unsigned long data)</div><div class='ctx'> 		printk(KERN_DEBUG "dev-&gt;watchdog_timeo=%d\n", dev-&gt;watchdog_timeo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	disable_irq(dev-&gt;irq);</div><div class='add'>+	disable_irq_lockdep(dev-&gt;irq);</div><div class='ctx'> 	old_window = ioread16(ioaddr + EL3_CMD) &gt;&gt; 13;</div><div class='ctx'> 	EL3WINDOW(4);</div><div class='ctx'> 	media_status = ioread16(ioaddr + Wn4_Media);</div><div class='hunk'>@@ -1983,7 +1812,7 @@ leave_media_alone:</div><div class='ctx'> 			 dev-&gt;name, media_tbl[dev-&gt;if_port].name);</div><div class='ctx'> </div><div class='ctx'> 	EL3WINDOW(old_window);</div><div class='del'>-	enable_irq(dev-&gt;irq);</div><div class='add'>+	enable_irq_lockdep(dev-&gt;irq);</div><div class='ctx'> 	mod_timer(&amp;vp-&gt;timer, RUN_AT(next_tick));</div><div class='ctx'> 	if (vp-&gt;deferred)</div><div class='ctx'> 		iowrite16(FakeIntr, ioaddr + EL3_CMD);</div><div class='head'>diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c<br/>index 066e22b01a94..1428bb7715af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/8139cp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8139cp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/8139cp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/8139cp.c</a></div><div class='hunk'>@@ -19,11 +19,11 @@</div><div class='ctx'> 	See the file COPYING in this distribution for more information.</div><div class='ctx'> </div><div class='ctx'> 	Contributors:</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 		Wake-on-LAN support - Felipe Damasio &lt;felipewd@terra.com.br&gt;</div><div class='ctx'> 		PCI suspend/resume  - Felipe Damasio &lt;felipewd@terra.com.br&gt;</div><div class='ctx'> 		LinkChg interrupt   - Felipe Damasio &lt;felipewd@terra.com.br&gt;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 	TODO:</div><div class='ctx'> 	* Test Tx checksumming thoroughly</div><div class='ctx'> 	* Implement dev-&gt;tx_timeout</div><div class='hunk'>@@ -52,7 +52,6 @@</div><div class='ctx'> #define DRV_RELDATE		"Mar 22, 2004"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -401,6 +400,11 @@ static void cp_clean_rings (struct cp_private *cp);</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> static void cp_poll_controller(struct net_device *dev);</div><div class='ctx'> #endif</div><div class='add'>+static int cp_get_eeprom_len(struct net_device *dev);</div><div class='add'>+static int cp_get_eeprom(struct net_device *dev,</div><div class='add'>+			 struct ethtool_eeprom *eeprom, u8 *data);</div><div class='add'>+static int cp_set_eeprom(struct net_device *dev,</div><div class='add'>+			 struct ethtool_eeprom *eeprom, u8 *data);</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id cp_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139,</div><div class='hunk'>@@ -461,7 +465,7 @@ static void cp_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> static inline void cp_set_rxbufsize (struct cp_private *cp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mtu = cp-&gt;dev-&gt;mtu;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (mtu &gt; ETH_DATA_LEN)</div><div class='ctx'> 		/* MTU + ethernet header + FCS + optional VLAN tag */</div><div class='ctx'> 		cp-&gt;rx_buf_sz = mtu + ETH_HLEN + 8;</div><div class='hunk'>@@ -510,7 +514,7 @@ static void cp_rx_err_acct (struct cp_private *cp, unsigned rx_tail,</div><div class='ctx'> static inline unsigned int cp_rx_csum_ok (u32 status)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int protocol = (status &gt;&gt; 16) &amp; 0x3;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (likely((protocol == RxProtoTCP) &amp;&amp; (!(status &amp; TCPFail))))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	else if ((protocol == RxProtoUDP) &amp;&amp; (!(status &amp; UDPFail)))</div><div class='hunk'>@@ -792,7 +796,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	entry = cp-&gt;tx_head;</div><div class='ctx'> 	eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;</div><div class='ctx'> 	if (dev-&gt;features &amp; NETIF_F_TSO)</div><div class='del'>-		mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='add'>+		mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_shinfo(skb)-&gt;nr_frags == 0) {</div><div class='ctx'> 		struct cp_desc *txd = &amp;cp-&gt;tx_ring[entry];</div><div class='hunk'>@@ -1061,7 +1065,7 @@ static void cp_init_hw (struct cp_private *cp)</div><div class='ctx'> 	cpw8(Config3, PARMEnable);</div><div class='ctx'> 	cp-&gt;wol_enabled = 0;</div><div class='ctx'> </div><div class='del'>-	cpw8(Config5, cpr8(Config5) &amp; PMEStatus); </div><div class='add'>+	cpw8(Config5, cpr8(Config5) &amp; PMEStatus);</div><div class='ctx'> </div><div class='ctx'> 	cpw32_f(HiTxRingAddr, 0);</div><div class='ctx'> 	cpw32_f(HiTxRingAddr + 4, 0);</div><div class='hunk'>@@ -1199,7 +1203,7 @@ static int cp_open (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	cp_init_hw(cp);</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(dev-&gt;irq, cp_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	rc = request_irq(dev-&gt;irq, cp_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out_hw;</div><div class='ctx'> </div><div class='hunk'>@@ -1351,7 +1355,7 @@ static void netdev_get_wol (struct cp_private *cp,</div><div class='ctx'> 		         WAKE_MCAST | WAKE_UCAST;</div><div class='ctx'> 	/* We don't need to go on if WOL is disabled */</div><div class='ctx'> 	if (!cp-&gt;wol_enabled) return;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	options        = cpr8 (Config3);</div><div class='ctx'> 	if (options &amp; LinkUp)        wol-&gt;wolopts |= WAKE_PHY;</div><div class='ctx'> 	if (options &amp; MagicPacket)   wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='hunk'>@@ -1577,6 +1581,9 @@ static struct ethtool_ops cp_ethtool_ops = {</div><div class='ctx'> 	.get_strings		= cp_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= cp_get_ethtool_stats,</div><div class='ctx'> 	.get_perm_addr		= ethtool_op_get_perm_addr,</div><div class='add'>+	.get_eeprom_len		= cp_get_eeprom_len,</div><div class='add'>+	.get_eeprom		= cp_get_eeprom,</div><div class='add'>+	.set_eeprom		= cp_set_eeprom,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='hunk'>@@ -1612,24 +1619,32 @@ static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> #define eeprom_delay()	readl(ee_addr)</div><div class='ctx'> </div><div class='ctx'> /* The EEPROM commands include the alway-set leading bit. */</div><div class='add'>+#define EE_EXTEND_CMD	(4)</div><div class='ctx'> #define EE_WRITE_CMD	(5)</div><div class='ctx'> #define EE_READ_CMD		(6)</div><div class='ctx'> #define EE_ERASE_CMD	(7)</div><div class='ctx'> </div><div class='del'>-static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned retval = 0;</div><div class='del'>-	void __iomem *ee_addr = ioaddr + Cfg9346;</div><div class='del'>-	int read_cmd = location | (EE_READ_CMD &lt;&lt; addr_len);</div><div class='add'>+#define EE_EWDS_ADDR	(0)</div><div class='add'>+#define EE_WRAL_ADDR	(1)</div><div class='add'>+#define EE_ERAL_ADDR	(2)</div><div class='add'>+#define EE_EWEN_ADDR	(3)</div><div class='ctx'> </div><div class='add'>+#define CP_EEPROM_MAGIC PCI_DEVICE_ID_REALTEK_8139</div><div class='add'>+</div><div class='add'>+static void eeprom_cmd_start(void __iomem *ee_addr)</div><div class='add'>+{</div><div class='ctx'> 	writeb (EE_ENB &amp; ~EE_CS, ee_addr);</div><div class='ctx'> 	writeb (EE_ENB, ee_addr);</div><div class='ctx'> 	eeprom_delay ();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eeprom_cmd(void __iomem *ee_addr, int cmd, int cmd_len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* Shift the read command bits out. */</div><div class='del'>-	for (i = 4 + addr_len; i &gt;= 0; i--) {</div><div class='del'>-		int dataval = (read_cmd &amp; (1 &lt;&lt; i)) ? EE_DATA_WRITE : 0;</div><div class='add'>+	/* Shift the command bits out. */</div><div class='add'>+	for (i = cmd_len - 1; i &gt;= 0; i--) {</div><div class='add'>+		int dataval = (cmd &amp; (1 &lt;&lt; i)) ? EE_DATA_WRITE : 0;</div><div class='ctx'> 		writeb (EE_ENB | dataval, ee_addr);</div><div class='ctx'> 		eeprom_delay ();</div><div class='ctx'> 		writeb (EE_ENB | dataval | EE_SHIFT_CLK, ee_addr);</div><div class='hunk'>@@ -1637,6 +1652,33 @@ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)</div><div class='ctx'> 	}</div><div class='ctx'> 	writeb (EE_ENB, ee_addr);</div><div class='ctx'> 	eeprom_delay ();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eeprom_cmd_end(void __iomem *ee_addr)</div><div class='add'>+{</div><div class='add'>+	writeb (~EE_CS, ee_addr);</div><div class='add'>+	eeprom_delay ();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eeprom_extend_cmd(void __iomem *ee_addr, int extend_cmd,</div><div class='add'>+			      int addr_len)</div><div class='add'>+{</div><div class='add'>+	int cmd = (EE_EXTEND_CMD &lt;&lt; addr_len) | (extend_cmd &lt;&lt; (addr_len - 2));</div><div class='add'>+</div><div class='add'>+	eeprom_cmd_start(ee_addr);</div><div class='add'>+	eeprom_cmd(ee_addr, cmd, 3 + addr_len);</div><div class='add'>+	eeprom_cmd_end(ee_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 read_eeprom (void __iomem *ioaddr, int location, int addr_len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u16 retval = 0;</div><div class='add'>+	void __iomem *ee_addr = ioaddr + Cfg9346;</div><div class='add'>+	int read_cmd = location | (EE_READ_CMD &lt;&lt; addr_len);</div><div class='add'>+</div><div class='add'>+	eeprom_cmd_start(ee_addr);</div><div class='add'>+	eeprom_cmd(ee_addr, read_cmd, 3 + addr_len);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 16; i &gt; 0; i--) {</div><div class='ctx'> 		writeb (EE_ENB | EE_SHIFT_CLK, ee_addr);</div><div class='hunk'>@@ -1648,13 +1690,125 @@ static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)</div><div class='ctx'> 		eeprom_delay ();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Terminate the EEPROM access. */</div><div class='del'>-	writeb (~EE_CS, ee_addr);</div><div class='del'>-	eeprom_delay ();</div><div class='add'>+	eeprom_cmd_end(ee_addr);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void write_eeprom(void __iomem *ioaddr, int location, u16 val,</div><div class='add'>+			 int addr_len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	void __iomem *ee_addr = ioaddr + Cfg9346;</div><div class='add'>+	int write_cmd = location | (EE_WRITE_CMD &lt;&lt; addr_len);</div><div class='add'>+</div><div class='add'>+	eeprom_extend_cmd(ee_addr, EE_EWEN_ADDR, addr_len);</div><div class='add'>+</div><div class='add'>+	eeprom_cmd_start(ee_addr);</div><div class='add'>+	eeprom_cmd(ee_addr, write_cmd, 3 + addr_len);</div><div class='add'>+	eeprom_cmd(ee_addr, val, 16);</div><div class='add'>+	eeprom_cmd_end(ee_addr);</div><div class='add'>+</div><div class='add'>+	eeprom_cmd_start(ee_addr);</div><div class='add'>+	for (i = 0; i &lt; 20000; i++)</div><div class='add'>+		if (readb(ee_addr) &amp; EE_DATA_READ)</div><div class='add'>+			break;</div><div class='add'>+	eeprom_cmd_end(ee_addr);</div><div class='add'>+</div><div class='add'>+	eeprom_extend_cmd(ee_addr, EE_EWDS_ADDR, addr_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cp_get_eeprom_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cp_private *cp = netdev_priv(dev);</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;cp-&gt;lock);</div><div class='add'>+	size = read_eeprom(cp-&gt;regs, 0, 8) == 0x8129 ? 256 : 128;</div><div class='add'>+	spin_unlock_irq(&amp;cp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cp_get_eeprom(struct net_device *dev,</div><div class='add'>+			 struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct cp_private *cp = netdev_priv(dev);</div><div class='add'>+	unsigned int addr_len;</div><div class='add'>+	u16 val;</div><div class='add'>+	u32 offset = eeprom-&gt;offset &gt;&gt; 1;</div><div class='add'>+	u32 len = eeprom-&gt;len;</div><div class='add'>+	u32 i = 0;</div><div class='add'>+</div><div class='add'>+	eeprom-&gt;magic = CP_EEPROM_MAGIC;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;cp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	addr_len = read_eeprom(cp-&gt;regs, 0, 8) == 0x8129 ? 8 : 6;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;offset &amp; 1) {</div><div class='add'>+		val = read_eeprom(cp-&gt;regs, offset, addr_len);</div><div class='add'>+		data[i++] = (u8)(val &gt;&gt; 8);</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (i &lt; len - 1) {</div><div class='add'>+		val = read_eeprom(cp-&gt;regs, offset, addr_len);</div><div class='add'>+		data[i++] = (u8)val;</div><div class='add'>+		data[i++] = (u8)(val &gt;&gt; 8);</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &lt; len) {</div><div class='add'>+		val = read_eeprom(cp-&gt;regs, offset, addr_len);</div><div class='add'>+		data[i] = (u8)val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;cp-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cp_set_eeprom(struct net_device *dev,</div><div class='add'>+			 struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct cp_private *cp = netdev_priv(dev);</div><div class='add'>+	unsigned int addr_len;</div><div class='add'>+	u16 val;</div><div class='add'>+	u32 offset = eeprom-&gt;offset &gt;&gt; 1;</div><div class='add'>+	u32 len = eeprom-&gt;len;</div><div class='add'>+	u32 i = 0;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;magic != CP_EEPROM_MAGIC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;cp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	addr_len = read_eeprom(cp-&gt;regs, 0, 8) == 0x8129 ? 8 : 6;</div><div class='add'>+</div><div class='add'>+	if (eeprom-&gt;offset &amp; 1) {</div><div class='add'>+		val = read_eeprom(cp-&gt;regs, offset, addr_len) &amp; 0xff;</div><div class='add'>+		val |= (u16)data[i++] &lt;&lt; 8;</div><div class='add'>+		write_eeprom(cp-&gt;regs, offset, val, addr_len);</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (i &lt; len - 1) {</div><div class='add'>+		val = (u16)data[i++];</div><div class='add'>+		val |= (u16)data[i++] &lt;&lt; 8;</div><div class='add'>+		write_eeprom(cp-&gt;regs, offset, val, addr_len);</div><div class='add'>+		offset++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i &lt; len) {</div><div class='add'>+		val = read_eeprom(cp-&gt;regs, offset, addr_len) &amp; 0xff00;</div><div class='add'>+		val |= (u16)data[i];</div><div class='add'>+		write_eeprom(cp-&gt;regs, offset, val, addr_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;cp-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Put the board into D3cold state and wait for WakeUp signal */</div><div class='ctx'> static void cp_set_d3_state (struct cp_private *cp)</div><div class='ctx'> {</div><div class='hunk'>@@ -1668,7 +1822,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	struct cp_private *cp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	void __iomem *regs;</div><div class='del'>-	long pciaddr;</div><div class='add'>+	resource_size_t pciaddr;</div><div class='ctx'> 	unsigned int addr_len, i, pci_using_dac;</div><div class='ctx'> 	u8 pci_rev;</div><div class='ctx'> </div><div class='hunk'>@@ -1682,9 +1836,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;vendor == PCI_VENDOR_ID_REALTEK &amp;&amp;</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_REALTEK_8139 &amp;&amp; pci_rev &lt; 0x20) {</div><div class='del'>-		printk(KERN_ERR PFX "pci dev %s (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",</div><div class='del'>-		       pci_name(pdev), pdev-&gt;vendor, pdev-&gt;device, pci_rev);</div><div class='del'>-		printk(KERN_ERR PFX "Try the \"8139too\" driver instead.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			   "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",</div><div class='add'>+		           pdev-&gt;vendor, pdev-&gt;device, pci_rev);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Try the \"8139too\" driver instead.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1722,14 +1877,13 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	pciaddr = pci_resource_start(pdev, 1);</div><div class='ctx'> 	if (!pciaddr) {</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n",</div><div class='del'>-		       pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no MMIO resource\n");</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pci_resource_len(pdev, 1) &lt; CP_REGS_SIZE) {</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",</div><div class='del'>-		       pci_resource_len(pdev, 1), pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "MMIO resource (%llx) too small\n",</div><div class='add'>+		       (unsigned long long)pci_resource_len(pdev, 1));</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1743,14 +1897,15 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			printk(KERN_ERR PFX "No usable DMA configuration, "</div><div class='del'>-			       "aborting.\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				   "No usable DMA configuration, aborting.\n");</div><div class='ctx'> 			goto err_out_res;</div><div class='ctx'> 		}</div><div class='ctx'> 		rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			printk(KERN_ERR PFX "No usable consistent DMA configuration, "</div><div class='del'>-			       "aborting.\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				   "No usable consistent DMA configuration, "</div><div class='add'>+			           "aborting.\n");</div><div class='ctx'> 			goto err_out_res;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1761,8 +1916,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	regs = ioremap(pciaddr, CP_REGS_SIZE);</div><div class='ctx'> 	if (!regs) {</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",</div><div class='del'>-		       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot map PCI MMIO (%Lx@%Lx)\n",</div><div class='add'>+		       (unsigned long long)pci_resource_len(pdev, 1),</div><div class='add'>+		       (unsigned long long)pciaddr);</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long) regs;</div><div class='hunk'>@@ -1831,7 +1987,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* enable busmastering and memory-write-invalidate */</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	if (cp-&gt;wol_enabled) cp_set_d3_state (cp);</div><div class='add'>+	if (cp-&gt;wol_enabled)</div><div class='add'>+		cp_set_d3_state (cp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1856,7 +2013,8 @@ static void cp_remove_one (struct pci_dev *pdev)</div><div class='ctx'> 	BUG_ON(!dev);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	iounmap(cp-&gt;regs);</div><div class='del'>-	if (cp-&gt;wol_enabled) pci_set_power_state (pdev, PCI_D0);</div><div class='add'>+	if (cp-&gt;wol_enabled)</div><div class='add'>+		pci_set_power_state (pdev, PCI_D0);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_clear_mwi(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -1919,7 +2077,7 @@ static int cp_resume (struct pci_dev *pdev)</div><div class='ctx'> 	mii_check_media(&amp;cp-&gt;mii_if, netif_msg_link(cp), FALSE);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore (&amp;cp-&gt;lock, flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='head'>diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c<br/>index feae7832fc84..e4f4eaff7679 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/8139too.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8139too.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/8139too.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/8139too.c</a></div><div class='hunk'>@@ -93,7 +93,6 @@</div><div class='ctx'> #define DRV_VERSION	"0.9.27"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='hunk'>@@ -165,7 +164,7 @@ static int multicast_filter_limit = 32;</div><div class='ctx'> static int debug = -1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Receive ring size </div><div class='add'>+ * Receive ring size</div><div class='ctx'>  * Warning: 64K ring has hardware issues and may lock up.</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_SH_DREAMCAST)</div><div class='hunk'>@@ -257,7 +256,7 @@ static struct pci_device_id rtl8139_pci_tbl[] = {</div><div class='ctx'> 	{0x018a, 0x0106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },</div><div class='ctx'> 	{0x126c, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },</div><div class='ctx'> 	{0x1743, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },</div><div class='del'>-	{0x021b, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, </div><div class='add'>+	{0x021b, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SH_SECUREEDGE5410</div><div class='ctx'> 	/* Bogus 8139 silicon reports 8129 without external PROM :-( */</div><div class='hunk'>@@ -769,7 +768,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,</div><div class='ctx'> 	/* dev and priv zeroed in alloc_etherdev */</div><div class='ctx'> 	dev = alloc_etherdev (sizeof (*tp));</div><div class='ctx'> 	if (dev == NULL) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: Unable to alloc new net device\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Unable to alloc new net device\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='hunk'>@@ -801,31 +800,31 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,</div><div class='ctx'> #ifdef USE_IO_OPS</div><div class='ctx'> 	/* make sure PCI base addr 0 is PIO */</div><div class='ctx'> 	if (!(pio_flags &amp; IORESOURCE_IO)) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: region #0 not a PIO resource, aborting\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "region #0 not a PIO resource, aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* check for weird/broken PCI region reporting */</div><div class='ctx'> 	if (pio_len &lt; RTL_MIN_IO_SIZE) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: Invalid PCI I/O region size(s), aborting\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid PCI I/O region size(s), aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	/* make sure PCI base addr 1 is MMIO */</div><div class='ctx'> 	if (!(mmio_flags &amp; IORESOURCE_MEM)) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: region #1 not an MMIO resource, aborting\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "region #1 not an MMIO resource, aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mmio_len &lt; RTL_MIN_IO_SIZE) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: Invalid PCI mem region size(s), aborting\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid PCI mem region size(s), aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	rc = pci_request_regions (pdev, "8139too");</div><div class='add'>+	rc = pci_request_regions (pdev, DRV_NAME);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	disable_dev_on_err = 1;</div><div class='hunk'>@@ -836,7 +835,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,</div><div class='ctx'> #ifdef USE_IO_OPS</div><div class='ctx'> 	ioaddr = ioport_map(pio_start, pio_len);</div><div class='ctx'> 	if (!ioaddr) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: cannot map PIO, aborting\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot map PIO, aborting\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -847,7 +846,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,</div><div class='ctx'> 	/* ioremap MMIO region */</div><div class='ctx'> 	ioaddr = pci_iomap(pdev, 1, 0);</div><div class='ctx'> 	if (ioaddr == NULL) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: cannot remap MMIO, aborting\n", pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot remap MMIO, aborting\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -861,8 +860,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* check for missing/broken hardware */</div><div class='ctx'> 	if (RTL_R32 (TxConfig) == 0xFFFFFFFF) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: Chip not responding, ignoring board\n",</div><div class='del'>-			pci_name(pdev));</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Chip not responding, ignoring board\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -876,9 +874,10 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	/* if unknown chip, assume array element #0, original RTL-8139 in this case */</div><div class='del'>-	printk (KERN_DEBUG PFX "%s: unknown chip version, assuming RTL-8139\n",</div><div class='del'>-		pci_name(pdev));</div><div class='del'>-	printk (KERN_DEBUG PFX "%s: TxConfig = 0x%lx\n", pci_name(pdev), RTL_R32 (TxConfig));</div><div class='add'>+	dev_printk (KERN_DEBUG, &amp;pdev-&gt;dev,</div><div class='add'>+		    "unknown chip version, assuming RTL-8139\n");</div><div class='add'>+	dev_printk (KERN_DEBUG, &amp;pdev-&gt;dev,</div><div class='add'>+		    "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));</div><div class='ctx'> 	tp-&gt;chipset = 0;</div><div class='ctx'> </div><div class='ctx'> match:</div><div class='hunk'>@@ -955,9 +954,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	if (pdev-&gt;vendor == PCI_VENDOR_ID_REALTEK &amp;&amp;</div><div class='ctx'> 	    pdev-&gt;device == PCI_DEVICE_ID_REALTEK_8139 &amp;&amp; pci_rev &gt;= 0x20) {</div><div class='del'>-		printk(KERN_INFO PFX "pci dev %s (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",</div><div class='del'>-		       pci_name(pdev), pdev-&gt;vendor, pdev-&gt;device, pci_rev);</div><div class='del'>-		printk(KERN_INFO PFX "Use the \"8139cp\" driver for improved performance and stability.\n");</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+			   "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",</div><div class='add'>+		       	   pdev-&gt;vendor, pdev-&gt;device, pci_rev);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+			   "Use the \"8139cp\" driver for improved performance and stability.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = rtl8139_init_board (pdev, &amp;dev);</div><div class='hunk'>@@ -1311,7 +1312,7 @@ static int rtl8139_open (struct net_device *dev)</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='ctx'> </div><div class='del'>-	retval = request_irq (dev-&gt;irq, rtl8139_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	retval = request_irq (dev-&gt;irq, rtl8139_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -1341,9 +1342,9 @@ static int rtl8139_open (struct net_device *dev)</div><div class='ctx'> 	netif_start_queue (dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_ifup(tp))</div><div class='del'>-		printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"</div><div class='del'>-			" GP Pins %2.2x %s-duplex.\n",</div><div class='del'>-			dev-&gt;name, pci_resource_start (tp-&gt;pci_dev, 1),</div><div class='add'>+		printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#llx IRQ %d"</div><div class='add'>+			" GP Pins %2.2x %s-duplex.\n", dev-&gt;name,</div><div class='add'>+			(unsigned long long)pci_resource_start (tp-&gt;pci_dev, 1),</div><div class='ctx'> 			dev-&gt;irq, RTL_R8 (MediaStatus),</div><div class='ctx'> 			tp-&gt;mii.full_duplex ? "full" : "half");</div><div class='ctx'> </div><div class='hunk'>@@ -1708,6 +1709,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;mmio_addr;</div><div class='ctx'> 	unsigned int entry;</div><div class='ctx'> 	unsigned int len = skb-&gt;len;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate the next Tx descriptor entry. */</div><div class='ctx'> 	entry = tp-&gt;cur_tx % NUM_TX_DESC;</div><div class='hunk'>@@ -1724,7 +1726,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;tp-&gt;lock);</div><div class='add'>+	spin_lock_irqsave(&amp;tp-&gt;lock, flags);</div><div class='ctx'> 	RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),</div><div class='ctx'> 		   tp-&gt;tx_flag | max(len, (unsigned int)ETH_ZLEN));</div><div class='ctx'> </div><div class='hunk'>@@ -1735,7 +1737,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if ((tp-&gt;cur_tx - NUM_TX_DESC) == tp-&gt;dirty_tx)</div><div class='ctx'> 		netif_stop_queue (dev);</div><div class='del'>-	spin_unlock_irq(&amp;tp-&gt;lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;tp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_tx_queued(tp))</div><div class='ctx'> 		printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",</div><div class='hunk'>@@ -1824,7 +1826,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev,</div><div class='ctx'> 	int tmp_work;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_rx_err (tp)) </div><div class='add'>+	if (netif_msg_rx_err (tp))</div><div class='ctx'> 		printk(KERN_DEBUG "%s: Ethernet frame had errors, status %8.8x.\n",</div><div class='ctx'> 			dev-&gt;name, rx_status);</div><div class='ctx'> 	tp-&gt;stats.rx_errors++;</div><div class='hunk'>@@ -1944,7 +1946,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,</div><div class='ctx'> 		 RTL_R16 (RxBufAddr),</div><div class='ctx'> 		 RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd));</div><div class='ctx'> </div><div class='del'>-	while (netif_running(dev) &amp;&amp; received &lt; budget </div><div class='add'>+	while (netif_running(dev) &amp;&amp; received &lt; budget</div><div class='ctx'> 	       &amp;&amp; (RTL_R8 (ChipCmd) &amp; RxBufEmpty) == 0) {</div><div class='ctx'> 		u32 ring_offset = cur_rx % RX_BUF_LEN;</div><div class='ctx'> 		u32 rx_status;</div><div class='hunk'>@@ -2031,7 +2033,7 @@ no_early_rx:</div><div class='ctx'> </div><div class='ctx'> 			netif_receive_skb (skb);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (net_ratelimit()) </div><div class='add'>+			if (net_ratelimit())</div><div class='ctx'> 				printk (KERN_WARNING</div><div class='ctx'> 					"%s: Memory squeeze, dropping packet.\n",</div><div class='ctx'> 					dev-&gt;name);</div><div class='hunk'>@@ -2158,13 +2160,13 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance,</div><div class='ctx'> 	status = RTL_R16 (IntrStatus);</div><div class='ctx'> </div><div class='ctx'> 	/* shared irq? */</div><div class='del'>-	if (unlikely((status &amp; rtl8139_intr_mask) == 0)) </div><div class='add'>+	if (unlikely((status &amp; rtl8139_intr_mask) == 0))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	handled = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* h/w no longer present (hotplug?) or major error, bail */</div><div class='del'>-	if (unlikely(status == 0xFFFF)) </div><div class='add'>+	if (unlikely(status == 0xFFFF))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* close possible race's with dev_close */</div><div class='head'>diff --git a/drivers/net/82596.c b/drivers/net/82596.c<br/>index da0c878dcba8..7e2ca9571467 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/82596.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/82596.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/82596.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/82596.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -1070,8 +1069,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				skb-&gt;len, (unsigned int)skb-&gt;data));</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/8390.c b/drivers/net/8390.c<br/>index f87027420081..d2935ae39814 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/8390.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/8390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/8390.c</a></div><div class='hunk'>@@ -249,7 +249,7 @@ void ei_tx_timeout(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Ugly but a reset can be slow, yet must be protected */</div><div class='ctx'> 		</div><div class='del'>-	disable_irq_nosync(dev-&gt;irq);</div><div class='add'>+	disable_irq_nosync_lockdep(dev-&gt;irq);</div><div class='ctx'> 	spin_lock(&amp;ei_local-&gt;page_lock);</div><div class='ctx'> 		</div><div class='ctx'> 	/* Try to restart the card.  Perhaps the user has fixed something. */</div><div class='hunk'>@@ -257,7 +257,7 @@ void ei_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	NS8390_init(dev, 1);</div><div class='ctx'> 		</div><div class='ctx'> 	spin_unlock(&amp;ei_local-&gt;page_lock);</div><div class='del'>-	enable_irq(dev-&gt;irq);</div><div class='add'>+	enable_irq_lockdep(dev-&gt;irq);</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'>     </div><div class='hunk'>@@ -275,12 +275,14 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);</div><div class='ctx'> 	int send_length = skb-&gt;len, output_page;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	char buf[ETH_ZLEN];</div><div class='add'>+	char *data = skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return 0;</div><div class='add'>+		memset(buf, 0, ETH_ZLEN);	/* more efficient than doing just the needed bits */</div><div class='add'>+		memcpy(buf, data, skb-&gt;len);</div><div class='ctx'> 		send_length = ETH_ZLEN;</div><div class='add'>+		data = buf;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mask interrupts from the ethercard. </div><div class='hunk'>@@ -347,7 +349,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 * trigger the send later, upon receiving a Tx done interrupt.</div><div class='ctx'> 	 */</div><div class='ctx'> 	 </div><div class='del'>-	ei_block_output(dev, send_length, skb-&gt;data, output_page);</div><div class='add'>+	ei_block_output(dev, send_length, data, output_page);</div><div class='ctx'> 		</div><div class='ctx'> 	if (! ei_local-&gt;txing) </div><div class='ctx'> 	{</div><div class='head'>diff --git a/drivers/net/8390.h b/drivers/net/8390.h<br/>index 51e39dcd0603..a9a58f518f45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/8390.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/8390.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/8390.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/8390.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef _8390_h</div><div class='ctx'> #define _8390_h</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='head'>diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig<br/>index bdaaad8f2123..39189903e355 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/Kconfig</a></div><div class='hunk'>@@ -447,6 +447,7 @@ config MIPS_GT96100ETH</div><div class='ctx'> config MIPS_AU1X00_ENET</div><div class='ctx'> 	bool "MIPS AU1000 Ethernet support"</div><div class='ctx'> 	depends on NET_ETHERNET &amp;&amp; SOC_AU1X00</div><div class='add'>+	select PHYLIB</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you have an Alchemy Semi AU1X00 based system</div><div class='hunk'>@@ -853,6 +854,17 @@ config SMC9194</div><div class='ctx'> 	  &lt;file:Documentation/networking/net-modules.txt&gt;. The module</div><div class='ctx'> 	  will be called smc9194.</div><div class='ctx'> </div><div class='add'>+config NET_NETX</div><div class='add'>+	tristate "NetX Ethernet support"</div><div class='add'>+	select MII</div><div class='add'>+	depends on NET_ETHERNET &amp;&amp; ARCH_NETX</div><div class='add'>+	help</div><div class='add'>+	  This is support for the Hilscher netX builtin Ethernet ports</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here and read</div><div class='add'>+	  &lt;file:Documentation/networking/net-modules.txt&gt;. The module</div><div class='add'>+	  will be called netx-eth.</div><div class='add'>+</div><div class='ctx'> config DM9000</div><div class='ctx'> 	tristate "DM9000 support"</div><div class='ctx'> 	depends on (ARM || MIPS) &amp;&amp; NET_ETHERNET</div><div class='hunk'>@@ -865,6 +877,22 @@ config DM9000</div><div class='ctx'> 	  &lt;file:Documentation/networking/net-modules.txt&gt;.  The module will be</div><div class='ctx'> 	  called dm9000.</div><div class='ctx'> </div><div class='add'>+config SMC911X</div><div class='add'>+	tristate "SMSC LAN911[5678] support"</div><div class='add'>+	select CRC32</div><div class='add'>+	select MII</div><div class='add'>+	depends on NET_ETHERNET &amp;&amp; ARCH_PXA</div><div class='add'>+	help</div><div class='add'>+	  This is a driver for SMSC's LAN911x series of Ethernet chipsets</div><div class='add'>+	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.</div><div class='add'>+	  Say Y if you want it compiled into the kernel, </div><div class='add'>+	  and read the Ethernet-HOWTO, available from</div><div class='add'>+	  &lt;http://www.linuxdoc.org/docs.html#howto&gt;.</div><div class='add'>+</div><div class='add'>+	  This driver is also available as a module. The module will be </div><div class='add'>+	  called smc911x.  If you want to compile it as a module, say M </div><div class='add'>+	  here and read &lt;file:Documentation/modules.txt&gt;</div><div class='add'>+</div><div class='ctx'> config NET_VENDOR_RACAL</div><div class='ctx'> 	bool "Racal-Interlan (Micom) NI cards"</div><div class='ctx'> 	depends on NET_ETHERNET &amp;&amp; ISA</div><div class='hunk'>@@ -1359,8 +1387,8 @@ config APRICOT</div><div class='ctx'> 	  called apricot.</div><div class='ctx'> </div><div class='ctx'> config B44</div><div class='del'>-	tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)"</div><div class='del'>-	depends on NET_PCI &amp;&amp; PCI &amp;&amp; EXPERIMENTAL</div><div class='add'>+	tristate "Broadcom 4400 ethernet support"</div><div class='add'>+	depends on NET_PCI &amp;&amp; PCI</div><div class='ctx'> 	select MII</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you have a network (Ethernet) controller of this type, say Y and</div><div class='hunk'>@@ -2163,6 +2191,8 @@ config TIGON3</div><div class='ctx'> config BNX2</div><div class='ctx'> 	tristate "Broadcom NetXtremeII support"</div><div class='ctx'> 	depends on PCI</div><div class='add'>+	select CRC32</div><div class='add'>+	select ZLIB_INFLATE</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports Broadcom NetXtremeII gigabit Ethernet cards.</div><div class='ctx'> </div><div class='hunk'>@@ -2171,7 +2201,7 @@ config BNX2</div><div class='ctx'> </div><div class='ctx'> config SPIDER_NET</div><div class='ctx'> 	tristate "Spider Gigabit Ethernet driver"</div><div class='del'>-	depends on PCI &amp;&amp; PPC_CELL</div><div class='add'>+	depends on PCI &amp;&amp; PPC_IBM_CELL_BLADE</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports the Gigabit Ethernet chips present on the</div><div class='hunk'>@@ -2179,11 +2209,11 @@ config SPIDER_NET</div><div class='ctx'> </div><div class='ctx'> config GIANFAR</div><div class='ctx'> 	tristate "Gianfar Ethernet"</div><div class='del'>-	depends on 85xx || 83xx</div><div class='add'>+	depends on 85xx || 83xx || PPC_86xx</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	help</div><div class='del'>-	  This driver supports the Gigabit TSEC on the MPC85xx </div><div class='del'>-	  family of chips, and the FEC on the 8540</div><div class='add'>+	  This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,</div><div class='add'>+	  and MPC86xx family of chips, and the FEC on the 8540.</div><div class='ctx'> </div><div class='ctx'> config GFAR_NAPI</div><div class='ctx'> 	bool "NAPI Support"</div><div class='hunk'>@@ -2311,6 +2341,23 @@ config S2IO_NAPI</div><div class='ctx'> </div><div class='ctx'> 	  If in doubt, say N.</div><div class='ctx'> </div><div class='add'>+config MYRI10GE</div><div class='add'>+	tristate "Myricom Myri-10G Ethernet support"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	select CRC32</div><div class='add'>+	---help---</div><div class='add'>+	  This driver supports Myricom Myri-10G Dual Protocol interface in</div><div class='add'>+	  Ethernet mode. If the eeprom on your board is not recent enough,</div><div class='add'>+	  you will need a newer firmware image.</div><div class='add'>+	  You may get this image or more information, at:</div><div class='add'>+</div><div class='add'>+	  &lt;http://www.myri.com/Myri-10G/&gt;</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here and read</div><div class='add'>+	  &lt;file:Documentation/networking/net-modules.txt&gt;.  The module</div><div class='add'>+	  will be called myri10ge.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/tokenring/Kconfig"</div><div class='head'>diff --git a/drivers/net/Makefile b/drivers/net/Makefile<br/>index b90468aea077..c91e95126f78 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/Makefile</a></div><div class='hunk'>@@ -187,12 +187,15 @@ obj-$(CONFIG_MACSONIC) += macsonic.o</div><div class='ctx'> obj-$(CONFIG_MACMACE) += macmace.o</div><div class='ctx'> obj-$(CONFIG_MAC89x0) += mac89x0.o</div><div class='ctx'> obj-$(CONFIG_TUN) += tun.o</div><div class='add'>+obj-$(CONFIG_NET_NETX) += netx-eth.o</div><div class='ctx'> obj-$(CONFIG_DL2K) += dl2k.o</div><div class='ctx'> obj-$(CONFIG_R8169) += r8169.o</div><div class='ctx'> obj-$(CONFIG_AMD8111_ETH) += amd8111e.o</div><div class='ctx'> obj-$(CONFIG_IBMVETH) += ibmveth.o</div><div class='ctx'> obj-$(CONFIG_S2IO) += s2io.o</div><div class='add'>+obj-$(CONFIG_MYRI10GE) += myri10ge/</div><div class='ctx'> obj-$(CONFIG_SMC91X) += smc91x.o</div><div class='add'>+obj-$(CONFIG_SMC911X) += smc911x.o</div><div class='ctx'> obj-$(CONFIG_DM9000) += dm9000.o</div><div class='ctx'> obj-$(CONFIG_FEC_8XX) += fec_8xx/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/Space.c b/drivers/net/Space.c<br/>index 60304f7e7e5b..a8c245a82261 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/Space.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/Space.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/Space.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/Space.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *		as published by the Free Software Foundation; either version</div><div class='ctx'>  *		2 of the License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/trdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c<br/>index 79bb56b8dcef..f4ea62641acd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/a2065.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/a2065.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/a2065.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/a2065.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='hunk'>@@ -496,7 +495,7 @@ static int lance_open (struct net_device *dev)</div><div class='ctx'> 	ll-&gt;rdp = LE_C0_STOP;</div><div class='ctx'> </div><div class='ctx'> 	/* Install the Interrupt handler */</div><div class='del'>-	ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(IRQ_AMIGA_PORTS, lance_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (ret) return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -573,8 +572,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	</div><div class='ctx'> 	if (len &lt; ETH_ZLEN) {</div><div class='ctx'> 		len = ETH_ZLEN;</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c<br/>index b508812e97ac..1c01e9b3d07c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/acenic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/acenic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/acenic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/acenic.c</a></div><div class='hunk'>@@ -50,7 +50,6 @@</div><div class='ctx'>  *   Grant Grundler &lt;grundler@cup.hp.com&gt;: PCI write posting fixes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='hunk'>@@ -579,11 +578,7 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk("Gigabit Ethernet at 0x%08lx, ", dev-&gt;base_addr);</div><div class='del'>-#ifdef __sparc__</div><div class='del'>-	printk("irq %s\n", __irq_itoa(pdev-&gt;irq));</div><div class='del'>-#else</div><div class='del'>-	printk("irq %i\n", pdev-&gt;irq);</div><div class='del'>-#endif</div><div class='add'>+	printk("irq %d\n", pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACENIC_OMIT_TIGON_I</div><div class='ctx'> 	if ((readl(&amp;ap-&gt;regs-&gt;HostCtrl) &gt;&gt; 28) == 4) {</div><div class='hunk'>@@ -1199,7 +1194,7 @@ static int __devinit ace_init(struct net_device *dev)</div><div class='ctx'> 		goto init_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ecode = request_irq(pdev-&gt;irq, ace_interrupt, SA_SHIRQ,</div><div class='add'>+	ecode = request_irq(pdev-&gt;irq, ace_interrupt, IRQF_SHARED,</div><div class='ctx'> 			    DRV_NAME, dev);</div><div class='ctx'> 	if (ecode) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",</div><div class='head'>diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h<br/>index a97107023495..62ec8ceee698 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/acenic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/acenic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/acenic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/acenic.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _ACENIC_H_</div><div class='ctx'> #define _ACENIC_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generate TX index update each time, when TX ring is closed.</div><div class='head'>diff --git a/drivers/net/acenic_firmware.h b/drivers/net/acenic_firmware.h<br/>index d7882dd783c8..ec146f60d77b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/acenic_firmware.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/acenic_firmware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/acenic_firmware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/acenic_firmware.h</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> /*</div><div class='ctx'>  * Declare these here even if Tigon I support is disabled to avoid</div><div class='ctx'>  * the compiler complaining about undefined symbols.</div><div class='head'>diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c<br/>index d9ba8be72af8..ed322a76980d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/amd8111e.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/amd8111e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/amd8111e.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/amd8111e.c</a></div><div class='hunk'>@@ -69,7 +69,6 @@ Revision History:</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -1377,7 +1376,7 @@ static int amd8111e_open(struct net_device * dev )</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if(dev-&gt;irq ==0 || request_irq(dev-&gt;irq, amd8111e_interrupt, SA_SHIRQ,</div><div class='add'>+	if(dev-&gt;irq ==0 || request_irq(dev-&gt;irq, amd8111e_interrupt, IRQF_SHARED,</div><div class='ctx'> 					 dev-&gt;name, dev)) </div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/apne.c b/drivers/net/apne.c<br/>index b9820b86cdcc..9cc13a0250d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/apne.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/apne.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/apne.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/apne.c</a></div><div class='hunk'>@@ -313,7 +313,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'>     dev-&gt;base_addr = ioaddr;</div><div class='ctx'> </div><div class='ctx'>     /* Install the Interrupt handler */</div><div class='del'>-    i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, DRV_NAME, dev);</div><div class='add'>+    i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);</div><div class='ctx'>     if (i) return i;</div><div class='ctx'> </div><div class='ctx'>     for(i = 0; i &lt; ETHER_ADDR_LEN; i++) {</div><div class='head'>diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c<br/>index 9edaa183227a..1d01ac0000e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/appletalk/cops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/cops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/appletalk/cops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/appletalk/cops.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@ static const char *version =</div><div class='ctx'>  *	  the driver figure it out.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/appletalk/cops_ffdrv.h b/drivers/net/appletalk/cops_ffdrv.h<br/>index 31cf8c9c947f..b02005087c1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/appletalk/cops_ffdrv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/cops_ffdrv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/appletalk/cops_ffdrv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/appletalk/cops_ffdrv.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COPS_DAYNA</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/appletalk/cops_ltdrv.h b/drivers/net/appletalk/cops_ltdrv.h<br/>index 4afb8e18ba65..c699b1ad31da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/appletalk/cops_ltdrv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/cops_ltdrv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/appletalk/cops_ltdrv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/appletalk/cops_ltdrv.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COPS_TANGENT</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c<br/>index 1a44a79ed064..7f7dd450226a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/appletalk/ipddp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/appletalk/ipddp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/appletalk/ipddp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/appletalk/ipddp.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *      of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c<br/>index fabc0607b0f1..5a95005253fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arcnet/arcnet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arcnet/arcnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arcnet/arcnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/arcnet/arcnet.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'> #define VERSION "arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.\n"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c<br/>index 96636ca8754e..979a33df0a8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arcnet/com20020-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arcnet/com20020-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arcnet/com20020-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/arcnet/com20020-pci.c</a></div><div class='hunk'>@@ -120,7 +120,7 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de</div><div class='ctx'> 		goto out_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = com20020_found(dev, SA_SHIRQ)) != 0)</div><div class='add'>+	if ((err = com20020_found(dev, IRQF_SHARED)) != 0)</div><div class='ctx'> 	        goto out_port;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c<br/>index d1b6b1f794e2..cc721addd576 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ariadne.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ariadne.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ariadne.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ariadne.c</a></div><div class='hunk'>@@ -320,7 +320,7 @@ static int ariadne_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     netif_start_queue(dev);</div><div class='ctx'> </div><div class='del'>-    i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt, SA_SHIRQ,</div><div class='add'>+    i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt, IRQF_SHARED,</div><div class='ctx'>                     dev-&gt;name, dev);</div><div class='ctx'>     if (i) return i;</div><div class='ctx'> </div><div class='hunk'>@@ -607,8 +607,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>     /* FIXME: is the 79C960 new enough to do its own padding right ? */</div><div class='ctx'>     if (skb-&gt;len &lt; ETH_ZLEN)</div><div class='ctx'>     {</div><div class='del'>-    	skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-    	if (skb == NULL)</div><div class='add'>+    	if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'>     	    return 0;</div><div class='ctx'>     	len = ETH_ZLEN;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c<br/>index 5503dc8a66e4..85493b7b924f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/at91_ether.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/at91_ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/at91_ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/arm/at91_ether.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -43,7 +42,9 @@</div><div class='ctx'> #define DRV_VERSION	"1.0"</div><div class='ctx'> </div><div class='ctx'> static struct net_device *at91_dev;</div><div class='del'>-static struct clk *ether_clk;</div><div class='add'>+</div><div class='add'>+static struct timer_list check_timer;</div><div class='add'>+#define LINK_POLL_INTERVAL	(HZ)</div><div class='ctx'> </div><div class='ctx'> /* ..................................................................... */</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +144,7 @@ static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int</div><div class='ctx'>  * MAC accordingly.</div><div class='ctx'>  * If no link or auto-negotiation is busy, then no changes are made.</div><div class='ctx'>  */</div><div class='del'>-static void update_linkspeed(struct net_device *dev)</div><div class='add'>+static void update_linkspeed(struct net_device *dev, int silent)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91_private *lp = (struct at91_private *) dev-&gt;priv;</div><div class='ctx'> 	unsigned int bmsr, bmcr, lpa, mac_cfg;</div><div class='hunk'>@@ -151,7 +152,8 @@ static void update_linkspeed(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (!mii_link_ok(&amp;lp-&gt;mii)) {		/* no link */</div><div class='ctx'> 		netif_carrier_off(dev);</div><div class='del'>-		printk(KERN_INFO "%s: Link down.\n", dev-&gt;name);</div><div class='add'>+		if (!silent)</div><div class='add'>+			printk(KERN_INFO "%s: Link down.\n", dev-&gt;name);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +188,8 @@ static void update_linkspeed(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	at91_emac_write(AT91_EMAC_CFG, mac_cfg);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: Link now %i-%s\n", dev-&gt;name, speed, (duplex == DUPLEX_FULL) ? "FullDuplex" : "HalfDuplex");</div><div class='add'>+	if (!silent)</div><div class='add'>+		printk(KERN_INFO "%s: Link now %i-%s\n", dev-&gt;name, speed, (duplex == DUPLEX_FULL) ? "FullDuplex" : "HalfDuplex");</div><div class='ctx'> 	netif_carrier_on(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +229,7 @@ static irqreturn_t at91ether_phy_interrupt(int irq, void *dev_id, struct pt_regs</div><div class='ctx'> 			goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	update_linkspeed(dev);</div><div class='add'>+	update_linkspeed(dev, 0);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	disable_mdi();</div><div class='hunk'>@@ -243,14 +246,17 @@ static void enable_phyirq(struct net_device *dev)</div><div class='ctx'> 	unsigned int dsintr, irq_number;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (lp-&gt;phy_type == MII_RTL8201_ID)	/* RTL8201 does not have an interrupt */</div><div class='del'>-		return;</div><div class='del'>-	if (lp-&gt;phy_type == MII_DP83847_ID)	/* DP83847 does not have an interrupt */</div><div class='del'>-		return;</div><div class='del'>-	if (lp-&gt;phy_type == MII_AC101L_ID)	/* AC101L interrupt not supported yet */</div><div class='add'>+	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='add'>+	if (!irq_number) {</div><div class='add'>+		/*</div><div class='add'>+		 * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),</div><div class='add'>+		 * or board does not have it connected.</div><div class='add'>+		 */</div><div class='add'>+		check_timer.expires = jiffies + LINK_POLL_INTERVAL;</div><div class='add'>+		add_timer(&amp;check_timer);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> 	status = request_irq(irq_number, at91ether_phy_interrupt, 0, dev-&gt;name, dev);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		printk(KERN_ERR "at91_ether: PHY IRQ %d request failed - status %d!\n", irq_number, status);</div><div class='hunk'>@@ -292,12 +298,11 @@ static void disable_phyirq(struct net_device *dev)</div><div class='ctx'> 	unsigned int dsintr;</div><div class='ctx'> 	unsigned int irq_number;</div><div class='ctx'> </div><div class='del'>-	if (lp-&gt;phy_type == MII_RTL8201_ID) 	/* RTL8201 does not have an interrupt */</div><div class='del'>-		return;</div><div class='del'>-	if (lp-&gt;phy_type == MII_DP83847_ID)	/* DP83847 does not have an interrupt */</div><div class='del'>-		return;</div><div class='del'>-	if (lp-&gt;phy_type == MII_AC101L_ID)	/* AC101L interrupt not supported yet */</div><div class='add'>+	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='add'>+	if (!irq_number) {</div><div class='add'>+		del_timer_sync(&amp;check_timer);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	enable_mdi();</div><div class='hunk'>@@ -326,7 +331,6 @@ static void disable_phyirq(struct net_device *dev)</div><div class='ctx'> 	disable_mdi();</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	irq_number = lp-&gt;board_data.phy_irq_pin;</div><div class='ctx'> 	free_irq(irq_number, dev);			/* Free interrupt handler */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -355,6 +359,18 @@ static void reset_phy(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void at91ether_check_link(unsigned long dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *) dev_id;</div><div class='add'>+</div><div class='add'>+	enable_mdi();</div><div class='add'>+	update_linkspeed(dev, 1);</div><div class='add'>+	disable_mdi();</div><div class='add'>+</div><div class='add'>+	check_timer.expires = jiffies + LINK_POLL_INTERVAL;</div><div class='add'>+	add_timer(&amp;check_timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ......................... ADDRESS MANAGEMENT ........................ */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -501,7 +517,7 @@ static int hash_get_index(__u8 *addr)</div><div class='ctx'> 		hash_index |= (bitval &lt;&lt; j);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        return hash_index;</div><div class='add'>+	return hash_index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -557,10 +573,8 @@ static void at91ether_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	at91_emac_write(AT91_EMAC_CFG, cfg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* ......................... ETHTOOL SUPPORT ........................... */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int mdio_read(struct net_device *dev, int phy_id, int location)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int value;</div><div class='hunk'>@@ -642,6 +656,22 @@ static struct ethtool_ops at91ether_ethtool_ops = {</div><div class='ctx'> 	.get_link	= ethtool_op_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int at91ether_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct at91_private *lp = (struct at91_private *) dev-&gt;priv;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='add'>+	enable_mdi();</div><div class='add'>+	res = generic_mii_ioctl(&amp;lp-&gt;mii, if_mii(rq), cmd, NULL);</div><div class='add'>+	disable_mdi();</div><div class='add'>+	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* ................................ MAC ................................ */</div><div class='ctx'> </div><div class='hunk'>@@ -685,10 +715,10 @@ static int at91ether_open(struct net_device *dev)</div><div class='ctx'> 	struct at91_private *lp = (struct at91_private *) dev-&gt;priv;</div><div class='ctx'> 	unsigned long ctl;</div><div class='ctx'> </div><div class='del'>-        if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='del'>-        	return -EADDRNOTAVAIL;</div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	clk_enable(ether_clk);			/* Re-enable Peripheral clock */</div><div class='add'>+	clk_enable(lp-&gt;ether_clk);		/* Re-enable Peripheral clock */</div><div class='ctx'> </div><div class='ctx'> 	/* Clear internal statistics */</div><div class='ctx'> 	ctl = at91_emac_read(AT91_EMAC_CTL);</div><div class='hunk'>@@ -708,7 +738,7 @@ static int at91ether_open(struct net_device *dev)</div><div class='ctx'> 	/* Determine current link speed */</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	enable_mdi();</div><div class='del'>-	update_linkspeed(dev);</div><div class='add'>+	update_linkspeed(dev, 0);</div><div class='ctx'> 	disable_mdi();</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -722,6 +752,7 @@ static int at91ether_open(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static int at91ether_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct at91_private *lp = (struct at91_private *) dev-&gt;priv;</div><div class='ctx'> 	unsigned long ctl;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable Receiver and Transmitter */</div><div class='hunk'>@@ -738,7 +769,7 @@ static int at91ether_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	clk_disable(ether_clk);			/* Disable Peripheral clock */</div><div class='add'>+	clk_disable(lp-&gt;ether_clk);		/* Disable Peripheral clock */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -870,7 +901,7 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id, struct pt_regs *re</div><div class='ctx'> 	if (intstatus &amp; AT91_EMAC_RCOM)		/* Receive complete */</div><div class='ctx'> 		at91ether_rx(dev);</div><div class='ctx'> </div><div class='del'>-	if (intstatus &amp; AT91_EMAC_TCOM) {		/* Transmit complete */</div><div class='add'>+	if (intstatus &amp; AT91_EMAC_TCOM) {	/* Transmit complete */</div><div class='ctx'> 		/* The TCOM bit is set even if the transmission failed. */</div><div class='ctx'> 		if (intstatus &amp; (AT91_EMAC_TUND | AT91_EMAC_RTRY))</div><div class='ctx'> 			lp-&gt;stats.tx_errors += 1;</div><div class='hunk'>@@ -899,7 +930,8 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id, struct pt_regs *re</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the ethernet interface</div><div class='ctx'>  */</div><div class='del'>-static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address, struct platform_device *pdev)</div><div class='add'>+static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address,</div><div class='add'>+			struct platform_device *pdev, struct clk *ether_clk)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91_eth_data *board_data = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -933,6 +965,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;board_data = *board_data;</div><div class='add'>+	lp-&gt;ether_clk = ether_clk;</div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -945,6 +978,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add</div><div class='ctx'> 	dev-&gt;set_multicast_list = at91ether_set_rx_mode;</div><div class='ctx'> 	dev-&gt;set_mac_address = set_mac_address;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;at91ether_ethtool_ops;</div><div class='add'>+	dev-&gt;do_ioctl = at91ether_ioctl;</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -975,6 +1009,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add</div><div class='ctx'> 	lp-&gt;mii.dev = dev;		/* Support for ethtool */</div><div class='ctx'> 	lp-&gt;mii.mdio_read = mdio_read;</div><div class='ctx'> 	lp-&gt;mii.mdio_write = mdio_write;</div><div class='add'>+	lp-&gt;mii.phy_id = phy_address;</div><div class='add'>+	lp-&gt;mii.phy_id_mask = 0x1f;</div><div class='add'>+	lp-&gt;mii.reg_num_mask = 0x1f;</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;phy_type = phy_type;	/* Type of PHY connected */</div><div class='ctx'> 	lp-&gt;phy_address = phy_address;	/* MDI address of PHY */</div><div class='hunk'>@@ -992,11 +1029,18 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add</div><div class='ctx'> 	/* Determine current link speed */</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	enable_mdi();</div><div class='del'>-	update_linkspeed(dev);</div><div class='add'>+	update_linkspeed(dev, 0);</div><div class='ctx'> 	disable_mdi();</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	netif_carrier_off(dev);		/* will be enabled in open() */</div><div class='ctx'> </div><div class='add'>+	/* If board has no PHY IRQ, use a timer to poll the PHY */</div><div class='add'>+	if (!lp-&gt;board_data.phy_irq_pin) {</div><div class='add'>+		init_timer(&amp;check_timer);</div><div class='add'>+		check_timer.data = (unsigned long)dev;</div><div class='add'>+		check_timer.function = at91ether_check_link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Display ethernet banner */</div><div class='ctx'> 	printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%02x:%02x:%02x:%02x:%02x:%02x)\n",</div><div class='ctx'> 		dev-&gt;name, (uint) dev-&gt;base_addr, dev-&gt;irq,</div><div class='hunk'>@@ -1005,7 +1049,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add</div><div class='ctx'> 		dev-&gt;dev_addr[0], dev-&gt;dev_addr[1], dev-&gt;dev_addr[2],</div><div class='ctx'> 		dev-&gt;dev_addr[3], dev-&gt;dev_addr[4], dev-&gt;dev_addr[5]);</div><div class='ctx'> 	if ((phy_type == MII_DM9161_ID) || (lp-&gt;phy_type == MII_DM9161A_ID))</div><div class='del'>-		printk(KERN_INFO "%s: Davicom 9196 PHY %s\n", dev-&gt;name, (lp-&gt;phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");</div><div class='add'>+		printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev-&gt;name, (lp-&gt;phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");</div><div class='ctx'> 	else if (phy_type == MII_LXT971A_ID)</div><div class='ctx'> 		printk(KERN_INFO "%s: Intel LXT971A PHY\n", dev-&gt;name);</div><div class='ctx'> 	else if (phy_type == MII_RTL8201_ID)</div><div class='hunk'>@@ -1031,9 +1075,10 @@ static int __init at91ether_probe(struct platform_device *pdev)</div><div class='ctx'> 	int detected = -1;</div><div class='ctx'> 	unsigned long phy_id;</div><div class='ctx'> 	unsigned short phy_address = 0;</div><div class='add'>+	struct clk *ether_clk;</div><div class='ctx'> </div><div class='ctx'> 	ether_clk = clk_get(&amp;pdev-&gt;dev, "ether_clk");</div><div class='del'>-	if (!ether_clk) {</div><div class='add'>+	if (IS_ERR(ether_clk)) {</div><div class='ctx'> 		printk(KERN_ERR "at91_ether: no clock defined\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1056,7 +1101,7 @@ static int __init at91ether_probe(struct platform_device *pdev)</div><div class='ctx'> 			case MII_DP83847_ID:		/* National Semiconductor DP83847:  */</div><div class='ctx'> 			case MII_AC101L_ID:		/* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */</div><div class='ctx'> 			case MII_KS8721_ID:		/* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */</div><div class='del'>-				detected = at91ether_setup(phy_id, phy_address, pdev);</div><div class='add'>+				detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1075,17 +1120,61 @@ static int __devexit at91ether_remove(struct platform_device *pdev)</div><div class='ctx'> 	unregister_netdev(at91_dev);</div><div class='ctx'> 	free_irq(at91_dev-&gt;irq, at91_dev);</div><div class='ctx'> 	dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp-&gt;dlist, (dma_addr_t)lp-&gt;dlist_phys);</div><div class='del'>-	clk_put(ether_clk);</div><div class='add'>+	clk_put(lp-&gt;ether_clk);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(at91_dev);</div><div class='ctx'> 	at91_dev = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)</div><div class='add'>+{</div><div class='add'>+	struct at91_private *lp = (struct at91_private *) at91_dev-&gt;priv;</div><div class='add'>+	struct net_device *net_dev = platform_get_drvdata(pdev);</div><div class='add'>+	int phy_irq = lp-&gt;board_data.phy_irq_pin;</div><div class='add'>+</div><div class='add'>+	if (netif_running(net_dev)) {</div><div class='add'>+		if (phy_irq)</div><div class='add'>+			disable_irq(phy_irq);</div><div class='add'>+</div><div class='add'>+		netif_stop_queue(net_dev);</div><div class='add'>+		netif_device_detach(net_dev);</div><div class='add'>+</div><div class='add'>+		clk_disable(lp-&gt;ether_clk);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at91ether_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct at91_private *lp = (struct at91_private *) at91_dev-&gt;priv;</div><div class='add'>+	struct net_device *net_dev = platform_get_drvdata(pdev);</div><div class='add'>+	int phy_irq = lp-&gt;board_data.phy_irq_pin;</div><div class='add'>+</div><div class='add'>+	if (netif_running(net_dev)) {</div><div class='add'>+		clk_enable(lp-&gt;ether_clk);</div><div class='add'>+</div><div class='add'>+		netif_device_attach(net_dev);</div><div class='add'>+		netif_start_queue(net_dev);</div><div class='add'>+</div><div class='add'>+		if (phy_irq)</div><div class='add'>+			enable_irq(phy_irq);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define at91ether_suspend	NULL</div><div class='add'>+#define at91ether_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct platform_driver at91ether_driver = {</div><div class='ctx'> 	.probe		= at91ether_probe,</div><div class='ctx'> 	.remove		= __devexit_p(at91ether_remove),</div><div class='del'>-	/* FIXME:  support suspend and resume */</div><div class='add'>+	.suspend	= at91ether_suspend,</div><div class='add'>+	.resume		= at91ether_resume,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DRV_NAME,</div><div class='ctx'> 		.owner	= THIS_MODULE,</div><div class='head'>diff --git a/drivers/net/arm/at91_ether.h b/drivers/net/arm/at91_ether.h<br/>index 9885735c9c8a..d1e72e02be3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/at91_ether.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/at91_ether.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/at91_ether.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/arm/at91_ether.h</a></div><div class='hunk'>@@ -80,6 +80,7 @@ struct at91_private</div><div class='ctx'> 	struct net_device_stats stats;</div><div class='ctx'> 	struct mii_if_info mii;			/* ethtool support */</div><div class='ctx'> 	struct at91_eth_data board_data;	/* board-specific configuration */</div><div class='add'>+	struct clk *ether_clk;			/* clock */</div><div class='ctx'> </div><div class='ctx'> 	/* PHY */</div><div class='ctx'> 	unsigned long phy_type;			/* type of PHY (PHY_ID) */</div><div class='head'>diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c<br/>index 36475eb2727f..312955d07b28 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/ether1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/ether1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/ether1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/arm/ether1.c</a></div><div class='hunk'>@@ -700,8 +700,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c<br/>index f1d5b1027ff7..081074180e62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/arm/ether3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/arm/ether3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/arm/ether3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/arm/ether3.c</a></div><div class='hunk'>@@ -518,8 +518,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	length = (length + 1) &amp; ~1;</div><div class='ctx'> 	if (length != skb-&gt;len) {</div><div class='del'>-		skb = skb_padto(skb, length);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, length))</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c<br/>index e613cc289749..5d7929c79bce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/at1700.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/at1700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/at1700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/at1700.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> 	response to inb()s from other device probes!</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c<br/>index 442b2cbeb58a..91783a8008be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/atarilance.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/atarilance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/atarilance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/atarilance.c</a></div><div class='hunk'>@@ -804,8 +804,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )</div><div class='ctx'> 		++len;</div><div class='ctx'> 		</div><div class='ctx'> 	if (len &gt; skb-&gt;len) {</div><div class='del'>-		skb = skb_padto(skb, len);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, len))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 		</div><div class='head'>diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c<br/>index 14dbad14afb6..55f6e3f65b53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/au1000_eth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/au1000_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/au1000_eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/au1000_eth.c</a></div><div class='hunk'>@@ -2,13 +2,16 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Alchemy Au1x00 ethernet driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2001,2002,2003 MontaVista Software Inc.</div><div class='add'>+ * Copyright 2001-2003, 2006 MontaVista Software Inc.</div><div class='ctx'>  * Copyright 2002 TimeSys Corp.</div><div class='ctx'>  * Added ethtool/mii-tool support,</div><div class='ctx'>  * Copyright 2004 Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='ctx'>  * Update: 2004 Bjoern Riemer, riemer@fokus.fraunhofer.de </div><div class='ctx'>  * or riemer@riemer-nt.de: fixed the link beat detection with </div><div class='ctx'>  * ioctls (SIOCGMIIPHY)</div><div class='add'>+ * Copyright 2006 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='add'>+ *  converted to use linux-2.6.x's PHY framework</div><div class='add'>+ *</div><div class='ctx'>  * Author: MontaVista Software, Inc.</div><div class='ctx'>  *         	ppopov@mvista.com or source@mvista.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -32,7 +35,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -53,6 +55,7 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;asm/mipsregs.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -68,7 +71,7 @@ static int au1000_debug = 5;</div><div class='ctx'> static int au1000_debug = 3;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define DRV_NAME	"au1000eth"</div><div class='add'>+#define DRV_NAME	"au1000_eth"</div><div class='ctx'> #define DRV_VERSION	"1.5"</div><div class='ctx'> #define DRV_AUTHOR	"Pete Popov &lt;ppopov@embeddedalley.com&gt;"</div><div class='ctx'> #define DRV_DESC	"Au1xxx on-chip Ethernet driver"</div><div class='hunk'>@@ -80,7 +83,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> // prototypes</div><div class='ctx'> static void hard_stop(struct net_device *);</div><div class='ctx'> static void enable_rx_tx(struct net_device *dev);</div><div class='del'>-static struct net_device * au1000_probe(u32 ioaddr, int irq, int port_num);</div><div class='add'>+static struct net_device * au1000_probe(int port_num);</div><div class='ctx'> static int au1000_init(struct net_device *);</div><div class='ctx'> static int au1000_open(struct net_device *);</div><div class='ctx'> static int au1000_close(struct net_device *);</div><div class='hunk'>@@ -88,17 +91,15 @@ static int au1000_tx(struct sk_buff *, struct net_device *);</div><div class='ctx'> static int au1000_rx(struct net_device *);</div><div class='ctx'> static irqreturn_t au1000_interrupt(int, void *, struct pt_regs *);</div><div class='ctx'> static void au1000_tx_timeout(struct net_device *);</div><div class='del'>-static int au1000_set_config(struct net_device *dev, struct ifmap *map);</div><div class='ctx'> static void set_rx_mode(struct net_device *);</div><div class='ctx'> static struct net_device_stats *au1000_get_stats(struct net_device *);</div><div class='del'>-static void au1000_timer(unsigned long);</div><div class='ctx'> static int au1000_ioctl(struct net_device *, struct ifreq *, int);</div><div class='ctx'> static int mdio_read(struct net_device *, int, int);</div><div class='ctx'> static void mdio_write(struct net_device *, int, int, u16);</div><div class='del'>-static void dump_mii(struct net_device *dev, int phy_id);</div><div class='add'>+static void au1000_adjust_link(struct net_device *);</div><div class='add'>+static void enable_mac(struct net_device *, int);</div><div class='ctx'> </div><div class='ctx'> // externs</div><div class='del'>-extern  void ack_rise_edge_irq(unsigned int);</div><div class='ctx'> extern int get_ethernet_addr(char *ethernet_addr);</div><div class='ctx'> extern void str2eaddr(unsigned char *ea, unsigned char *str);</div><div class='ctx'> extern char * __init prom_getcmdline(void);</div><div class='hunk'>@@ -126,705 +127,83 @@ static unsigned char au1000_mac_addr[6] __devinitdata = {</div><div class='ctx'> 	0x00, 0x50, 0xc2, 0x0c, 0x30, 0x00</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define nibswap(x) ((((x) &gt;&gt; 4) &amp; 0x0f) | (((x) &lt;&lt; 4) &amp; 0xf0))</div><div class='del'>-#define RUN_AT(x) (jiffies + (x))</div><div class='del'>-</div><div class='del'>-// For reading/writing 32-bit words from/to DMA memory</div><div class='del'>-#define cpu_to_dma32 cpu_to_be32</div><div class='del'>-#define dma32_to_cpu be32_to_cpu</div><div class='del'>-</div><div class='ctx'> struct au1000_private *au_macs[NUM_ETH_INTERFACES];</div><div class='ctx'> </div><div class='del'>-/* FIXME </div><div class='del'>- * All of the PHY code really should be detached from the MAC </div><div class='del'>- * code.</div><div class='add'>+/*</div><div class='add'>+ * board-specific configurations</div><div class='add'>+ *</div><div class='add'>+ * PHY detection algorithm</div><div class='add'>+ *</div><div class='add'>+ * If AU1XXX_PHY_STATIC_CONFIG is undefined, the PHY setup is</div><div class='add'>+ * autodetected:</div><div class='add'>+ *</div><div class='add'>+ * mii_probe() first searches the current MAC's MII bus for a PHY,</div><div class='add'>+ * selecting the first (or last, if AU1XXX_PHY_SEARCH_HIGHEST_ADDR is</div><div class='add'>+ * defined) PHY address not already claimed by another netdev.</div><div class='add'>+ *</div><div class='add'>+ * If nothing was found that way when searching for the 2nd ethernet</div><div class='add'>+ * controller's PHY and AU1XXX_PHY1_SEARCH_ON_MAC0 is defined, then</div><div class='add'>+ * the first MII bus is searched as well for an unclaimed PHY; this is</div><div class='add'>+ * needed in case of a dual-PHY accessible only through the MAC0's MII</div><div class='add'>+ * bus.</div><div class='add'>+ *</div><div class='add'>+ * Finally, if no PHY is found, then the corresponding ethernet</div><div class='add'>+ * controller is not registered to the network subsystem.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Default advertise */</div><div class='del'>-#define GENMII_DEFAULT_ADVERTISE \</div><div class='del'>-	ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | \</div><div class='del'>-	ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | \</div><div class='del'>-	ADVERTISED_Autoneg</div><div class='del'>-</div><div class='del'>-#define GENMII_DEFAULT_FEATURES \</div><div class='del'>-	SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | \</div><div class='del'>-	SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \</div><div class='del'>-	SUPPORTED_Autoneg</div><div class='del'>-</div><div class='del'>-int bcm_5201_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 data;</div><div class='del'>-	</div><div class='del'>-	/* Stop auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data &amp; ~MII_CNTL_AUTO);</div><div class='del'>-</div><div class='del'>-	/* Set advertisement to 10/100 and Half/Full duplex</div><div class='del'>-	 * (full capabilities) */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_ANADV);</div><div class='del'>-	data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;</div><div class='del'>-	mdio_write(dev, phy_addr, MII_ANADV, data);</div><div class='del'>-	</div><div class='del'>-	/* Restart auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data);</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4) </div><div class='del'>-		dump_mii(dev, phy_addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bcm_5201_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 mii_control, timeout;</div><div class='del'>-	</div><div class='del'>-	mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	for (timeout = 100; timeout &gt; 0; --timeout) {</div><div class='del'>-		mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-		if ((mii_control &amp; MII_CNTL_RESET) == 0)</div><div class='del'>-			break;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (mii_control &amp; MII_CNTL_RESET) {</div><div class='del'>-		printk(KERN_ERR "%s PHY reset timeout !\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-bcm_5201_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	u16 mii_data;</div><div class='del'>-	struct au1000_private *aup;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "bcm_5201_status error: NULL dev\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_STATUS);</div><div class='del'>-	if (mii_data &amp; MII_STAT_LINK) {</div><div class='del'>-		*link = 1;</div><div class='del'>-		mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_AUX_CNTRL);</div><div class='del'>-		if (mii_data &amp; MII_AUX_100) {</div><div class='del'>-			if (mii_data &amp; MII_AUX_FDX) {</div><div class='del'>-				*speed = IF_PORT_100BASEFX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				*speed = IF_PORT_100BASETX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASETX;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else  {</div><div class='del'>-			*speed = IF_PORT_10BASET;</div><div class='del'>-			dev-&gt;if_port = IF_PORT_10BASET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*link = 0;</div><div class='del'>-		*speed = 0;</div><div class='del'>-		dev-&gt;if_port = IF_PORT_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lsi_80227_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		printk("lsi_80227_init\n");</div><div class='del'>-</div><div class='del'>-	/* restart auto-negotiation */</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL,</div><div class='del'>-		   MII_CNTL_F100 | MII_CNTL_AUTO | MII_CNTL_RST_AUTO); // | MII_CNTL_FDX);</div><div class='del'>-	mdelay(1);</div><div class='del'>-</div><div class='del'>-	/* set up LEDs to correct display */</div><div class='del'>-#ifdef CONFIG_MIPS_MTX1</div><div class='del'>-	mdio_write(dev, phy_addr, 17, 0xff80);</div><div class='del'>-#else</div><div class='del'>-	mdio_write(dev, phy_addr, 17, 0xffc0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		dump_mii(dev, phy_addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lsi_80227_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 mii_control, timeout;</div><div class='del'>-	</div><div class='del'>-	if (au1000_debug &gt; 4) {</div><div class='del'>-		printk("lsi_80227_reset\n");</div><div class='del'>-		dump_mii(dev, phy_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	for (timeout = 100; timeout &gt; 0; --timeout) {</div><div class='del'>-		mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-		if ((mii_control &amp; MII_CNTL_RESET) == 0)</div><div class='del'>-			break;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (mii_control &amp; MII_CNTL_RESET) {</div><div class='del'>-		printk(KERN_ERR "%s PHY reset timeout !\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-lsi_80227_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	u16 mii_data;</div><div class='del'>-	struct au1000_private *aup;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "lsi_80227_status error: NULL dev\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_STATUS);</div><div class='del'>-	if (mii_data &amp; MII_STAT_LINK) {</div><div class='del'>-		*link = 1;</div><div class='del'>-		mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_LSI_PHY_STAT);</div><div class='del'>-		if (mii_data &amp; MII_LSI_PHY_STAT_SPD) {</div><div class='del'>-			if (mii_data &amp; MII_LSI_PHY_STAT_FDX) {</div><div class='del'>-				*speed = IF_PORT_100BASEFX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				*speed = IF_PORT_100BASETX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASETX;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else  {</div><div class='del'>-			*speed = IF_PORT_10BASET;</div><div class='del'>-			dev-&gt;if_port = IF_PORT_10BASET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*link = 0;</div><div class='del'>-		*speed = 0;</div><div class='del'>-		dev-&gt;if_port = IF_PORT_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int am79c901_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	printk("am79c901_init\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int am79c901_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	printk("am79c901_reset\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-am79c901_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int am79c874_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 data;</div><div class='del'>-</div><div class='del'>-	/* 79c874 has quit resembled bit assignments to BCM5201 */</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		printk("am79c847_init\n");</div><div class='del'>-</div><div class='del'>-	/* Stop auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data &amp; ~MII_CNTL_AUTO);</div><div class='del'>-</div><div class='del'>-	/* Set advertisement to 10/100 and Half/Full duplex</div><div class='del'>-	 * (full capabilities) */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_ANADV);</div><div class='del'>-	data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;</div><div class='del'>-	mdio_write(dev, phy_addr, MII_ANADV, data);</div><div class='del'>-	</div><div class='del'>-	/* Restart auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;</div><div class='del'>-</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data);</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4) dump_mii(dev, phy_addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int am79c874_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 mii_control, timeout;</div><div class='del'>-	</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		printk("am79c874_reset\n");</div><div class='del'>-</div><div class='del'>-	mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	for (timeout = 100; timeout &gt; 0; --timeout) {</div><div class='del'>-		mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-		if ((mii_control &amp; MII_CNTL_RESET) == 0)</div><div class='del'>-			break;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (mii_control &amp; MII_CNTL_RESET) {</div><div class='del'>-		printk(KERN_ERR "%s PHY reset timeout !\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-am79c874_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	u16 mii_data;</div><div class='del'>-	struct au1000_private *aup;</div><div class='del'>-</div><div class='del'>-	// printk("am79c874_status\n");</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "am79c874_status error: NULL dev\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_STATUS);</div><div class='del'>-</div><div class='del'>-	if (mii_data &amp; MII_STAT_LINK) {</div><div class='del'>-		*link = 1;</div><div class='del'>-		mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_AMD_PHY_STAT);</div><div class='del'>-		if (mii_data &amp; MII_AMD_PHY_STAT_SPD) {</div><div class='del'>-			if (mii_data &amp; MII_AMD_PHY_STAT_FDX) {</div><div class='del'>-				*speed = IF_PORT_100BASEFX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				*speed = IF_PORT_100BASETX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASETX;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			*speed = IF_PORT_10BASET;</div><div class='del'>-			dev-&gt;if_port = IF_PORT_10BASET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*link = 0;</div><div class='del'>-		*speed = 0;</div><div class='del'>-		dev-&gt;if_port = IF_PORT_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lxt971a_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		printk("lxt971a_init\n");</div><div class='del'>-</div><div class='del'>-	/* restart auto-negotiation */</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL,</div><div class='del'>-		   MII_CNTL_F100 | MII_CNTL_AUTO | MII_CNTL_RST_AUTO | MII_CNTL_FDX);</div><div class='del'>-</div><div class='del'>-	/* set up LEDs to correct display */</div><div class='del'>-	mdio_write(dev, phy_addr, 20, 0x0422);</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		dump_mii(dev, phy_addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int lxt971a_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 mii_control, timeout;</div><div class='del'>-	</div><div class='del'>-	if (au1000_debug &gt; 4) {</div><div class='del'>-		printk("lxt971a_reset\n");</div><div class='del'>-		dump_mii(dev, phy_addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	for (timeout = 100; timeout &gt; 0; --timeout) {</div><div class='del'>-		mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-		if ((mii_control &amp; MII_CNTL_RESET) == 0)</div><div class='del'>-			break;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (mii_control &amp; MII_CNTL_RESET) {</div><div class='del'>-		printk(KERN_ERR "%s PHY reset timeout !\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-lxt971a_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	u16 mii_data;</div><div class='del'>-	struct au1000_private *aup;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "lxt971a_status error: NULL dev\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_STATUS);</div><div class='del'>-	if (mii_data &amp; MII_STAT_LINK) {</div><div class='del'>-		*link = 1;</div><div class='del'>-		mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_INTEL_PHY_STAT);</div><div class='del'>-		if (mii_data &amp; MII_INTEL_PHY_STAT_SPD) {</div><div class='del'>-			if (mii_data &amp; MII_INTEL_PHY_STAT_FDX) {</div><div class='del'>-				*speed = IF_PORT_100BASEFX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				*speed = IF_PORT_100BASETX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASETX;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else  {</div><div class='del'>-			*speed = IF_PORT_10BASET;</div><div class='del'>-			dev-&gt;if_port = IF_PORT_10BASET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*link = 0;</div><div class='del'>-		*speed = 0;</div><div class='del'>-		dev-&gt;if_port = IF_PORT_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ks8995m_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 data;</div><div class='del'>-	</div><div class='del'>-//	printk("ks8995m_init\n");</div><div class='del'>-	/* Stop auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data &amp; ~MII_CNTL_AUTO);</div><div class='del'>-</div><div class='del'>-	/* Set advertisement to 10/100 and Half/Full duplex</div><div class='del'>-	 * (full capabilities) */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_ANADV);</div><div class='del'>-	data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;</div><div class='del'>-	mdio_write(dev, phy_addr, MII_ANADV, data);</div><div class='del'>-	</div><div class='del'>-	/* Restart auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data);</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4) dump_mii(dev, phy_addr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ks8995m_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 mii_control, timeout;</div><div class='del'>-	</div><div class='del'>-//	printk("ks8995m_reset\n");</div><div class='del'>-	mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	for (timeout = 100; timeout &gt; 0; --timeout) {</div><div class='del'>-		mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-		if ((mii_control &amp; MII_CNTL_RESET) == 0)</div><div class='del'>-			break;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (mii_control &amp; MII_CNTL_RESET) {</div><div class='del'>-		printk(KERN_ERR "%s PHY reset timeout !\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ks8995m_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	u16 mii_data;</div><div class='del'>-	struct au1000_private *aup;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "ks8995m_status error: NULL dev\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_STATUS);</div><div class='del'>-	if (mii_data &amp; MII_STAT_LINK) {</div><div class='del'>-		*link = 1;</div><div class='del'>-		mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_AUX_CNTRL);</div><div class='del'>-		if (mii_data &amp; MII_AUX_100) {</div><div class='del'>-			if (mii_data &amp; MII_AUX_FDX) {</div><div class='del'>-				*speed = IF_PORT_100BASEFX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				*speed = IF_PORT_100BASETX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASETX;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else  {											</div><div class='del'>-			*speed = IF_PORT_10BASET;</div><div class='del'>-			dev-&gt;if_port = IF_PORT_10BASET;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*link = 0;</div><div class='del'>-		*speed = 0;</div><div class='del'>-		dev-&gt;if_port = IF_PORT_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-smsc_83C185_init (struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 data;</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		printk("smsc_83C185_init\n");</div><div class='del'>-</div><div class='del'>-	/* Stop auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data &amp; ~MII_CNTL_AUTO);</div><div class='del'>-</div><div class='del'>-	/* Set advertisement to 10/100 and Half/Full duplex</div><div class='del'>-	 * (full capabilities) */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_ANADV);</div><div class='del'>-	data |= MII_NWAY_TX | MII_NWAY_TX_FDX | MII_NWAY_T_FDX | MII_NWAY_T;</div><div class='del'>-	mdio_write(dev, phy_addr, MII_ANADV, data);</div><div class='del'>-	</div><div class='del'>-	/* Restart auto-negotiation */</div><div class='del'>-	data = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	data |= MII_CNTL_RST_AUTO | MII_CNTL_AUTO;</div><div class='del'>-</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, data);</div><div class='del'>-</div><div class='del'>-	if (au1000_debug &gt; 4) dump_mii(dev, phy_addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-smsc_83C185_reset (struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	s16 mii_control, timeout;</div><div class='del'>-	</div><div class='del'>-	if (au1000_debug &gt; 4)</div><div class='del'>-		printk("smsc_83C185_reset\n");</div><div class='del'>-</div><div class='del'>-	mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-	mdio_write(dev, phy_addr, MII_CONTROL, mii_control | MII_CNTL_RESET);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	for (timeout = 100; timeout &gt; 0; --timeout) {</div><div class='del'>-		mii_control = mdio_read(dev, phy_addr, MII_CONTROL);</div><div class='del'>-		if ((mii_control &amp; MII_CNTL_RESET) == 0)</div><div class='del'>-			break;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (mii_control &amp; MII_CNTL_RESET) {</div><div class='del'>-		printk(KERN_ERR "%s PHY reset timeout !\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-smsc_83C185_status (struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	u16 mii_data;</div><div class='del'>-	struct au1000_private *aup;</div><div class='del'>-</div><div class='del'>-	if (!dev) {</div><div class='del'>-		printk(KERN_ERR "smsc_83C185_status error: NULL dev\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	mii_data = mdio_read(dev, aup-&gt;phy_addr, MII_STATUS);</div><div class='del'>-</div><div class='del'>-	if (mii_data &amp; MII_STAT_LINK) {</div><div class='del'>-		*link = 1;</div><div class='del'>-		mii_data = mdio_read(dev, aup-&gt;phy_addr, 0x1f);</div><div class='del'>-		if (mii_data &amp; (1&lt;&lt;3)) {</div><div class='del'>-			if (mii_data &amp; (1&lt;&lt;4)) {</div><div class='del'>-				*speed = IF_PORT_100BASEFX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				*speed = IF_PORT_100BASETX;</div><div class='del'>-				dev-&gt;if_port = IF_PORT_100BASETX;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			*speed = IF_PORT_10BASET;</div><div class='del'>-			dev-&gt;if_port = IF_PORT_10BASET;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*link = 0;</div><div class='del'>-		*speed = 0;</div><div class='del'>-		dev-&gt;if_port = IF_PORT_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-int stub_init(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	//printk("PHY stub_init\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int stub_reset(struct net_device *dev, int phy_addr)</div><div class='del'>-{</div><div class='del'>-	//printk("PHY stub_reset\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-stub_status(struct net_device *dev, int phy_addr, u16 *link, u16 *speed)</div><div class='del'>-{</div><div class='del'>-	//printk("PHY stub_status\n");</div><div class='del'>-	*link = 1;</div><div class='del'>-	/* hmmm, revisit */</div><div class='del'>-	*speed = IF_PORT_100BASEFX;</div><div class='del'>-	dev-&gt;if_port = IF_PORT_100BASEFX;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct phy_ops bcm_5201_ops = {</div><div class='del'>-	bcm_5201_init,</div><div class='del'>-	bcm_5201_reset,</div><div class='del'>-	bcm_5201_status,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct phy_ops am79c874_ops = {</div><div class='del'>-	am79c874_init,</div><div class='del'>-	am79c874_reset,</div><div class='del'>-	am79c874_status,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct phy_ops am79c901_ops = {</div><div class='del'>-	am79c901_init,</div><div class='del'>-	am79c901_reset,</div><div class='del'>-	am79c901_status,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct phy_ops lsi_80227_ops = { </div><div class='del'>-	lsi_80227_init,</div><div class='del'>-	lsi_80227_reset,</div><div class='del'>-	lsi_80227_status,</div><div class='del'>-};</div><div class='add'>+/* autodetection defaults */</div><div class='add'>+#undef  AU1XXX_PHY_SEARCH_HIGHEST_ADDR</div><div class='add'>+#define AU1XXX_PHY1_SEARCH_ON_MAC0</div><div class='ctx'> </div><div class='del'>-struct phy_ops lxt971a_ops = { </div><div class='del'>-	lxt971a_init,</div><div class='del'>-	lxt971a_reset,</div><div class='del'>-	lxt971a_status,</div><div class='del'>-};</div><div class='add'>+/* static PHY setup</div><div class='add'>+ *</div><div class='add'>+ * most boards PHY setup should be detectable properly with the</div><div class='add'>+ * autodetection algorithm in mii_probe(), but in some cases (e.g. if</div><div class='add'>+ * you have a switch attached, or want to use the PHY's interrupt</div><div class='add'>+ * notification capabilities) you can provide a static PHY</div><div class='add'>+ * configuration here</div><div class='add'>+ *</div><div class='add'>+ * IRQs may only be set, if a PHY address was configured</div><div class='add'>+ * If a PHY address is given, also a bus id is required to be set</div><div class='add'>+ *</div><div class='add'>+ * ps: make sure the used irqs are configured properly in the board</div><div class='add'>+ * specific irq-map</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-struct phy_ops ks8995m_ops = {</div><div class='del'>-	ks8995m_init,</div><div class='del'>-	ks8995m_reset,</div><div class='del'>-	ks8995m_status,</div><div class='del'>-};</div><div class='add'>+#if defined(CONFIG_MIPS_BOSPORUS)</div><div class='add'>+/*</div><div class='add'>+ * Micrel/Kendin 5 port switch attached to MAC0,</div><div class='add'>+ * MAC0 is associated with PHY address 5 (== WAN port)</div><div class='add'>+ * MAC1 is not associated with any PHY, since it's connected directly</div><div class='add'>+ * to the switch.</div><div class='add'>+ * no interrupts are used</div><div class='add'>+ */</div><div class='add'>+# define AU1XXX_PHY_STATIC_CONFIG</div><div class='ctx'> </div><div class='del'>-struct phy_ops smsc_83C185_ops = {</div><div class='del'>-	smsc_83C185_init,</div><div class='del'>-	smsc_83C185_reset,</div><div class='del'>-	smsc_83C185_status,</div><div class='del'>-};</div><div class='add'>+# define AU1XXX_PHY0_ADDR  5</div><div class='add'>+# define AU1XXX_PHY0_BUSID 0</div><div class='add'>+#  undef AU1XXX_PHY0_IRQ</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-struct phy_ops stub_ops = {</div><div class='del'>-	stub_init,</div><div class='del'>-	stub_reset,</div><div class='del'>-	stub_status,</div><div class='del'>-};</div><div class='add'>+#  undef AU1XXX_PHY1_ADDR</div><div class='add'>+#  undef AU1XXX_PHY1_BUSID</div><div class='add'>+#  undef AU1XXX_PHY1_IRQ</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct mii_chip_info {</div><div class='del'>-	const char * name;</div><div class='del'>-	u16 phy_id0;</div><div class='del'>-	u16 phy_id1;</div><div class='del'>-	struct phy_ops *phy_ops;	</div><div class='del'>-	int dual_phy;</div><div class='del'>-} mii_chip_table[] = {</div><div class='del'>-	{"Broadcom BCM5201 10/100 BaseT PHY",0x0040,0x6212, &amp;bcm_5201_ops,0},</div><div class='del'>-	{"Broadcom BCM5221 10/100 BaseT PHY",0x0040,0x61e4, &amp;bcm_5201_ops,0},</div><div class='del'>-	{"Broadcom BCM5222 10/100 BaseT PHY",0x0040,0x6322, &amp;bcm_5201_ops,1},</div><div class='del'>-	{"NS DP83847 PHY", 0x2000, 0x5c30, &amp;bcm_5201_ops ,0},</div><div class='del'>-	{"AMD 79C901 HomePNA PHY",0x0000,0x35c8, &amp;am79c901_ops,0},</div><div class='del'>-	{"AMD 79C874 10/100 BaseT PHY",0x0022,0x561b, &amp;am79c874_ops,0},</div><div class='del'>-	{"LSI 80227 10/100 BaseT PHY",0x0016,0xf840, &amp;lsi_80227_ops,0},</div><div class='del'>-	{"Intel LXT971A Dual Speed PHY",0x0013,0x78e2, &amp;lxt971a_ops,0},</div><div class='del'>-	{"Kendin KS8995M 10/100 BaseT PHY",0x0022,0x1450, &amp;ks8995m_ops,0},</div><div class='del'>-	{"SMSC LAN83C185 10/100 BaseT PHY",0x0007,0xc0a3, &amp;smsc_83C185_ops,0},</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-	{"Stub", 0x1234, 0x5678, &amp;stub_ops },</div><div class='add'>+#if defined(AU1XXX_PHY0_BUSID) &amp;&amp; (AU1XXX_PHY0_BUSID &gt; 0)</div><div class='add'>+# error MAC0-associated PHY attached 2nd MACs MII bus not supported yet</div><div class='ctx'> #endif</div><div class='del'>-	{0,},</div><div class='del'>-};</div><div class='ctx'> </div><div class='del'>-static int mdio_read(struct net_device *dev, int phy_id, int reg)</div><div class='add'>+/*</div><div class='add'>+ * MII operations</div><div class='add'>+ */</div><div class='add'>+static int mdio_read(struct net_device *dev, int phy_addr, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	volatile u32 *mii_control_reg;</div><div class='del'>-	volatile u32 *mii_data_reg;</div><div class='add'>+	volatile u32 *const mii_control_reg = &amp;aup-&gt;mac-&gt;mii_control;</div><div class='add'>+	volatile u32 *const mii_data_reg = &amp;aup-&gt;mac-&gt;mii_data;</div><div class='ctx'> 	u32 timedout = 20;</div><div class='ctx'> 	u32 mii_control;</div><div class='ctx'> </div><div class='del'>-	#ifdef CONFIG_BCM5222_DUAL_PHY</div><div class='del'>-	/* First time we probe, it's for the mac0 phy.</div><div class='del'>-	 * Since we haven't determined yet that we have a dual phy,</div><div class='del'>-	 * aup-&gt;mii-&gt;mii_control_reg won't be setup and we'll</div><div class='del'>-	 * default to the else statement.</div><div class='del'>-	 * By the time we probe for the mac1 phy, the mii_control_reg</div><div class='del'>-	 * will be setup to be the address of the mac0 phy control since</div><div class='del'>-	 * both phys are controlled through mac0.</div><div class='del'>-	 */</div><div class='del'>-	if (aup-&gt;mii &amp;&amp; aup-&gt;mii-&gt;mii_control_reg) {</div><div class='del'>-		mii_control_reg = aup-&gt;mii-&gt;mii_control_reg;</div><div class='del'>-		mii_data_reg = aup-&gt;mii-&gt;mii_data_reg;</div><div class='del'>-	}</div><div class='del'>-	else if (au_macs[0]-&gt;mii &amp;&amp; au_macs[0]-&gt;mii-&gt;mii_control_reg) {</div><div class='del'>-		/* assume both phys are controlled through mac0 */</div><div class='del'>-		mii_control_reg = au_macs[0]-&gt;mii-&gt;mii_control_reg;</div><div class='del'>-		mii_data_reg = au_macs[0]-&gt;mii-&gt;mii_data_reg;</div><div class='del'>-	}</div><div class='del'>-	else </div><div class='del'>-	#endif</div><div class='del'>-	{</div><div class='del'>-		/* default control and data reg addresses */</div><div class='del'>-		mii_control_reg = &amp;aup-&gt;mac-&gt;mii_control;</div><div class='del'>-		mii_data_reg = &amp;aup-&gt;mac-&gt;mii_data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	while (*mii_control_reg &amp; MAC_MII_BUSY) {</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 		if (--timedout == 0) {</div><div class='hunk'>@@ -835,7 +214,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mii_control = MAC_SET_MII_SELECT_REG(reg) | </div><div class='del'>-		MAC_SET_MII_SELECT_PHY(phy_id) | MAC_MII_READ;</div><div class='add'>+		MAC_SET_MII_SELECT_PHY(phy_addr) | MAC_MII_READ;</div><div class='ctx'> </div><div class='ctx'> 	*mii_control_reg = mii_control;</div><div class='ctx'> </div><div class='hunk'>@@ -851,32 +230,14 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg)</div><div class='ctx'> 	return (int)*mii_data_reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mdio_write(struct net_device *dev, int phy_id, int reg, u16 value)</div><div class='add'>+static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	volatile u32 *mii_control_reg;</div><div class='del'>-	volatile u32 *mii_data_reg;</div><div class='add'>+	volatile u32 *const mii_control_reg = &amp;aup-&gt;mac-&gt;mii_control;</div><div class='add'>+	volatile u32 *const mii_data_reg = &amp;aup-&gt;mac-&gt;mii_data;</div><div class='ctx'> 	u32 timedout = 20;</div><div class='ctx'> 	u32 mii_control;</div><div class='ctx'> </div><div class='del'>-	#ifdef CONFIG_BCM5222_DUAL_PHY</div><div class='del'>-	if (aup-&gt;mii &amp;&amp; aup-&gt;mii-&gt;mii_control_reg) {</div><div class='del'>-		mii_control_reg = aup-&gt;mii-&gt;mii_control_reg;</div><div class='del'>-		mii_data_reg = aup-&gt;mii-&gt;mii_data_reg;</div><div class='del'>-	}</div><div class='del'>-	else if (au_macs[0]-&gt;mii &amp;&amp; au_macs[0]-&gt;mii-&gt;mii_control_reg) {</div><div class='del'>-		/* assume both phys are controlled through mac0 */</div><div class='del'>-		mii_control_reg = au_macs[0]-&gt;mii-&gt;mii_control_reg;</div><div class='del'>-		mii_data_reg = au_macs[0]-&gt;mii-&gt;mii_data_reg;</div><div class='del'>-	}</div><div class='del'>-	else </div><div class='del'>-	#endif</div><div class='del'>-	{</div><div class='del'>-		/* default control and data reg addresses */</div><div class='del'>-		mii_control_reg = &amp;aup-&gt;mac-&gt;mii_control;</div><div class='del'>-		mii_data_reg = &amp;aup-&gt;mac-&gt;mii_data;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	while (*mii_control_reg &amp; MAC_MII_BUSY) {</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 		if (--timedout == 0) {</div><div class='hunk'>@@ -887,165 +248,145 @@ static void mdio_write(struct net_device *dev, int phy_id, int reg, u16 value)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mii_control = MAC_SET_MII_SELECT_REG(reg) | </div><div class='del'>-		MAC_SET_MII_SELECT_PHY(phy_id) | MAC_MII_WRITE;</div><div class='add'>+		MAC_SET_MII_SELECT_PHY(phy_addr) | MAC_MII_WRITE;</div><div class='ctx'> </div><div class='ctx'> 	*mii_data_reg = value;</div><div class='ctx'> 	*mii_control_reg = mii_control;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	/* WARNING: bus-&gt;phy_map[phy_addr].attached_dev == dev does</div><div class='add'>+	 * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */</div><div class='add'>+	struct net_device *const dev = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	enable_mac(dev, 0); /* make sure the MAC associated with this</div><div class='add'>+			     * mii_bus is enabled */</div><div class='add'>+	return mdio_read(dev, phy_addr, regnum);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void dump_mii(struct net_device *dev, int phy_id)</div><div class='add'>+static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,</div><div class='add'>+			 u16 value)</div><div class='ctx'> {</div><div class='del'>-	int i, val;</div><div class='add'>+	struct net_device *const dev = bus-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		if ((val = mdio_read(dev, phy_id, i)) &gt;= 0)</div><div class='del'>-			printk("%s: MII Reg %d=%x\n", dev-&gt;name, i, val);</div><div class='del'>-	}</div><div class='del'>-	for (i = 16; i &lt; 25; i++) {</div><div class='del'>-		if ((val = mdio_read(dev, phy_id, i)) &gt;= 0)</div><div class='del'>-			printk("%s: MII Reg %d=%x\n", dev-&gt;name, i, val);</div><div class='del'>-	}</div><div class='add'>+	enable_mac(dev, 0); /* make sure the MAC associated with this</div><div class='add'>+			     * mii_bus is enabled */</div><div class='add'>+	mdio_write(dev, phy_addr, regnum, value);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mii_probe (struct net_device * dev)</div><div class='add'>+static int mdiobus_reset(struct mii_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	int phy_addr;</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-	int phy_found=0;</div><div class='del'>-#endif</div><div class='add'>+	struct net_device *const dev = bus-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	/* search for total of 32 possible mii phy addresses */</div><div class='del'>-	for (phy_addr = 0; phy_addr &lt; 32; phy_addr++) {</div><div class='del'>-		u16 mii_status;</div><div class='del'>-		u16 phy_id0, phy_id1;</div><div class='del'>-		int i;</div><div class='add'>+	enable_mac(dev, 0); /* make sure the MAC associated with this</div><div class='add'>+			     * mii_bus is enabled */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		#ifdef CONFIG_BCM5222_DUAL_PHY</div><div class='del'>-		/* Mask the already found phy, try next one */</div><div class='del'>-		if (au_macs[0]-&gt;mii &amp;&amp; au_macs[0]-&gt;mii-&gt;mii_control_reg) {</div><div class='del'>-			if (au_macs[0]-&gt;phy_addr == phy_addr)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-		#endif</div><div class='del'>-</div><div class='del'>-		mii_status = mdio_read(dev, phy_addr, MII_STATUS);</div><div class='del'>-		if (mii_status == 0xffff || mii_status == 0x0000)</div><div class='del'>-			/* the mii is not accessable, try next one */</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		phy_id0 = mdio_read(dev, phy_addr, MII_PHY_ID0);</div><div class='del'>-		phy_id1 = mdio_read(dev, phy_addr, MII_PHY_ID1);</div><div class='del'>-</div><div class='del'>-		/* search our mii table for the current mii */ </div><div class='del'>-		for (i = 0; mii_chip_table[i].phy_id1; i++) {</div><div class='del'>-			if (phy_id0 == mii_chip_table[i].phy_id0 &amp;&amp;</div><div class='del'>-			    phy_id1 == mii_chip_table[i].phy_id1) {</div><div class='del'>-				struct mii_phy * mii_phy = aup-&gt;mii;</div><div class='del'>-</div><div class='del'>-				printk(KERN_INFO "%s: %s at phy address %d\n",</div><div class='del'>-				       dev-&gt;name, mii_chip_table[i].name, </div><div class='del'>-				       phy_addr);</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-				phy_found = 1;</div><div class='del'>-#endif</div><div class='del'>-				mii_phy-&gt;chip_info = mii_chip_table+i;</div><div class='del'>-				aup-&gt;phy_addr = phy_addr;</div><div class='del'>-				aup-&gt;want_autoneg = 1;</div><div class='del'>-				aup-&gt;phy_ops = mii_chip_table[i].phy_ops;</div><div class='del'>-				aup-&gt;phy_ops-&gt;phy_init(dev,phy_addr);</div><div class='del'>-</div><div class='del'>-				// Check for dual-phy and then store required </div><div class='del'>-				// values and set indicators. We need to do </div><div class='del'>-				// this now since mdio_{read,write} need the </div><div class='del'>-				// control and data register addresses.</div><div class='del'>-				#ifdef CONFIG_BCM5222_DUAL_PHY</div><div class='del'>-				if ( mii_chip_table[i].dual_phy) {</div><div class='del'>-</div><div class='del'>-					/* assume both phys are controlled </div><div class='del'>-					 * through MAC0. Board specific? */</div><div class='del'>-					</div><div class='del'>-					/* sanity check */</div><div class='del'>-					if (!au_macs[0] || !au_macs[0]-&gt;mii)</div><div class='del'>-						return -1;</div><div class='del'>-					aup-&gt;mii-&gt;mii_control_reg = (u32 *)</div><div class='del'>-						&amp;au_macs[0]-&gt;mac-&gt;mii_control;</div><div class='del'>-					aup-&gt;mii-&gt;mii_data_reg = (u32 *)</div><div class='del'>-						&amp;au_macs[0]-&gt;mac-&gt;mii_data;</div><div class='del'>-				}</div><div class='del'>-				#endif</div><div class='del'>-				goto found;</div><div class='del'>-			}</div><div class='add'>+static int mii_probe (struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct au1000_private *const aup = (struct au1000_private *) dev-&gt;priv;</div><div class='add'>+	struct phy_device *phydev = NULL;</div><div class='add'>+</div><div class='add'>+#if defined(AU1XXX_PHY_STATIC_CONFIG)</div><div class='add'>+	BUG_ON(aup-&gt;mac_id &lt; 0 || aup-&gt;mac_id &gt; 1);</div><div class='add'>+</div><div class='add'>+	if(aup-&gt;mac_id == 0) { /* get PHY0 */</div><div class='add'>+# if defined(AU1XXX_PHY0_ADDR)</div><div class='add'>+		phydev = au_macs[AU1XXX_PHY0_BUSID]-&gt;mii_bus.phy_map[AU1XXX_PHY0_ADDR];</div><div class='add'>+# else</div><div class='add'>+		printk (KERN_INFO DRV_NAME ":%s: using PHY-less setup\n",</div><div class='add'>+			dev-&gt;name);</div><div class='add'>+		return 0;</div><div class='add'>+# endif /* defined(AU1XXX_PHY0_ADDR) */</div><div class='add'>+	} else if (aup-&gt;mac_id == 1) { /* get PHY1 */</div><div class='add'>+# if defined(AU1XXX_PHY1_ADDR)</div><div class='add'>+		phydev = au_macs[AU1XXX_PHY1_BUSID]-&gt;mii_bus.phy_map[AU1XXX_PHY1_ADDR];</div><div class='add'>+# else</div><div class='add'>+		printk (KERN_INFO DRV_NAME ":%s: using PHY-less setup\n",</div><div class='add'>+			dev-&gt;name);</div><div class='add'>+		return 0;</div><div class='add'>+# endif /* defined(AU1XXX_PHY1_ADDR) */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#else /* defined(AU1XXX_PHY_STATIC_CONFIG) */</div><div class='add'>+	int phy_addr;</div><div class='add'>+</div><div class='add'>+	/* find the first (lowest address) PHY on the current MAC's MII bus */</div><div class='add'>+	for (phy_addr = 0; phy_addr &lt; PHY_MAX_ADDR; phy_addr++)</div><div class='add'>+		if (aup-&gt;mii_bus.phy_map[phy_addr]) {</div><div class='add'>+			phydev = aup-&gt;mii_bus.phy_map[phy_addr];</div><div class='add'>+# if !defined(AU1XXX_PHY_SEARCH_HIGHEST_ADDR)</div><div class='add'>+			break; /* break out with first one found */</div><div class='add'>+# endif</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-found:</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MIPS_BOSPORUS</div><div class='del'>-	/* This is a workaround for the Micrel/Kendin 5 port switch</div><div class='del'>-	   The second MAC doesn't see a PHY connected... so we need to</div><div class='del'>-	   trick it into thinking we have one.</div><div class='del'>-		</div><div class='del'>-	   If this kernel is run on another Au1500 development board</div><div class='del'>-	   the stub will be found as well as the actual PHY. However,</div><div class='del'>-	   the last found PHY will be used... usually at Addr 31 (Db1500).	</div><div class='del'>-	*/</div><div class='del'>-	if ( (!phy_found) )</div><div class='del'>-	{</div><div class='del'>-		u16 phy_id0, phy_id1;</div><div class='del'>-		int i;</div><div class='ctx'> </div><div class='del'>-		phy_id0 = 0x1234;</div><div class='del'>-		phy_id1 = 0x5678;</div><div class='del'>-</div><div class='del'>-		/* search our mii table for the current mii */ </div><div class='del'>-		for (i = 0; mii_chip_table[i].phy_id1; i++) {</div><div class='del'>-			if (phy_id0 == mii_chip_table[i].phy_id0 &amp;&amp;</div><div class='del'>-			    phy_id1 == mii_chip_table[i].phy_id1) {</div><div class='del'>-				struct mii_phy * mii_phy;</div><div class='del'>-</div><div class='del'>-				printk(KERN_INFO "%s: %s at phy address %d\n",</div><div class='del'>-				       dev-&gt;name, mii_chip_table[i].name, </div><div class='del'>-				       phy_addr);</div><div class='del'>-				mii_phy = kmalloc(sizeof(struct mii_phy), </div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-				if (mii_phy) {</div><div class='del'>-					mii_phy-&gt;chip_info = mii_chip_table+i;</div><div class='del'>-					aup-&gt;phy_addr = phy_addr;</div><div class='del'>-					mii_phy-&gt;next = aup-&gt;mii;</div><div class='del'>-					aup-&gt;phy_ops = </div><div class='del'>-						mii_chip_table[i].phy_ops;</div><div class='del'>-					aup-&gt;mii = mii_phy;</div><div class='del'>-					aup-&gt;phy_ops-&gt;phy_init(dev,phy_addr);</div><div class='del'>-				} else {</div><div class='del'>-					printk(KERN_ERR "%s: out of memory\n", </div><div class='del'>-							dev-&gt;name);</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				mii_phy-&gt;chip_info = mii_chip_table+i;</div><div class='del'>-				aup-&gt;phy_addr = phy_addr;</div><div class='del'>-				aup-&gt;phy_ops = mii_chip_table[i].phy_ops;</div><div class='del'>-				aup-&gt;phy_ops-&gt;phy_init(dev,phy_addr);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+# if defined(AU1XXX_PHY1_SEARCH_ON_MAC0)</div><div class='add'>+	/* try harder to find a PHY */</div><div class='add'>+	if (!phydev &amp;&amp; (aup-&gt;mac_id == 1)) {</div><div class='add'>+		/* no PHY found, maybe we have a dual PHY? */</div><div class='add'>+		printk (KERN_INFO DRV_NAME ": no PHY found on MAC1, "</div><div class='add'>+			"let's see if it's attached to MAC0...\n");</div><div class='add'>+</div><div class='add'>+		BUG_ON(!au_macs[0]);</div><div class='add'>+</div><div class='add'>+		/* find the first (lowest address) non-attached PHY on</div><div class='add'>+		 * the MAC0 MII bus */</div><div class='add'>+		for (phy_addr = 0; phy_addr &lt; PHY_MAX_ADDR; phy_addr++) {</div><div class='add'>+			struct phy_device *const tmp_phydev =</div><div class='add'>+				au_macs[0]-&gt;mii_bus.phy_map[phy_addr];</div><div class='add'>+</div><div class='add'>+			if (!tmp_phydev)</div><div class='add'>+				continue; /* no PHY here... */</div><div class='add'>+</div><div class='add'>+			if (tmp_phydev-&gt;attached_dev)</div><div class='add'>+				continue; /* already claimed by MAC0 */</div><div class='add'>+</div><div class='add'>+			phydev = tmp_phydev;</div><div class='add'>+			break; /* found it */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (aup-&gt;mac_id == 0) {</div><div class='del'>-		/* the Bosporus phy responds to addresses 0-5 but </div><div class='del'>-		 * 5 is the correct one.</div><div class='del'>-		 */</div><div class='del'>-		aup-&gt;phy_addr = 5;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+# endif /* defined(AU1XXX_PHY1_SEARCH_OTHER_BUS) */</div><div class='ctx'> </div><div class='del'>-	if (aup-&gt;mii-&gt;chip_info == NULL) {</div><div class='del'>-		printk(KERN_ERR "%s: Au1x No known MII transceivers found!\n",</div><div class='del'>-				dev-&gt;name);</div><div class='add'>+#endif /* defined(AU1XXX_PHY_STATIC_CONFIG) */</div><div class='add'>+	if (!phydev) {</div><div class='add'>+		printk (KERN_ERR DRV_NAME ":%s: no PHY found\n", dev-&gt;name);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: Using %s as default\n", </div><div class='del'>-			dev-&gt;name, aup-&gt;mii-&gt;chip_info-&gt;name);</div><div class='add'>+	/* now we are supposed to have a proper phydev, to attach to... */</div><div class='add'>+	BUG_ON(!phydev);</div><div class='add'>+	BUG_ON(phydev-&gt;attached_dev);</div><div class='add'>+</div><div class='add'>+	phydev = phy_connect(dev, phydev-&gt;dev.bus_id, &amp;au1000_adjust_link, 0);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(phydev)) {</div><div class='add'>+		printk(KERN_ERR "%s: Could not attach to PHY\n", dev-&gt;name);</div><div class='add'>+		return PTR_ERR(phydev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mask with MAC supported features */</div><div class='add'>+	phydev-&gt;supported &amp;= (SUPPORTED_10baseT_Half</div><div class='add'>+			      | SUPPORTED_10baseT_Full</div><div class='add'>+			      | SUPPORTED_100baseT_Half</div><div class='add'>+			      | SUPPORTED_100baseT_Full</div><div class='add'>+			      | SUPPORTED_Autoneg</div><div class='add'>+			      /* | SUPPORTED_Pause | SUPPORTED_Asym_Pause */</div><div class='add'>+			      | SUPPORTED_MII</div><div class='add'>+			      | SUPPORTED_TP);</div><div class='add'>+</div><div class='add'>+	phydev-&gt;advertising = phydev-&gt;supported;</div><div class='add'>+</div><div class='add'>+	aup-&gt;old_link = 0;</div><div class='add'>+	aup-&gt;old_speed = 0;</div><div class='add'>+	aup-&gt;old_duplex = -1;</div><div class='add'>+	aup-&gt;phy_dev = phydev;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: attached PHY driver [%s] "</div><div class='add'>+	       "(mii_bus:phy_addr=%s, irq=%d)\n",</div><div class='add'>+	       dev-&gt;name, phydev-&gt;drv-&gt;name, phydev-&gt;dev.bus_id, phydev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1097,35 +438,38 @@ static void hard_stop(struct net_device *dev)</div><div class='ctx'> 	au_sync_delay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void reset_mac(struct net_device *dev)</div><div class='add'>+static void enable_mac(struct net_device *dev, int force_reset)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-	u32 flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (au1000_debug &gt; 4) </div><div class='del'>-		printk(KERN_INFO "%s: reset mac, aup %x\n", </div><div class='del'>-				dev-&gt;name, (unsigned)aup);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;aup-&gt;lock, flags);</div><div class='del'>-	if (aup-&gt;timer.function == &amp;au1000_timer) {/* check if timer initted */</div><div class='del'>-		del_timer(&amp;aup-&gt;timer);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	hard_stop(dev);</div><div class='del'>-	#ifdef CONFIG_BCM5222_DUAL_PHY</div><div class='del'>-	if (aup-&gt;mac_id != 0) {</div><div class='del'>-	#endif</div><div class='del'>-		/* If BCM5222, we can't leave MAC0 in reset because then </div><div class='del'>-		 * we can't access the dual phy for ETH1 */</div><div class='add'>+	if(force_reset || (!aup-&gt;mac_enabled)) {</div><div class='ctx'> 		*aup-&gt;enable = MAC_EN_CLOCK_ENABLE;</div><div class='ctx'> 		au_sync_delay(2);</div><div class='del'>-		*aup-&gt;enable = 0;</div><div class='add'>+		*aup-&gt;enable = (MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2</div><div class='add'>+				| MAC_EN_CLOCK_ENABLE);</div><div class='ctx'> 		au_sync_delay(2);</div><div class='del'>-	#ifdef CONFIG_BCM5222_DUAL_PHY</div><div class='add'>+</div><div class='add'>+		aup-&gt;mac_enabled = 1;</div><div class='ctx'> 	}</div><div class='del'>-	#endif</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;aup-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_mac_unlocked(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct au1000_private *const aup = (struct au1000_private *) dev-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hard_stop(dev);</div><div class='add'>+</div><div class='add'>+	*aup-&gt;enable = MAC_EN_CLOCK_ENABLE;</div><div class='add'>+	au_sync_delay(2);</div><div class='add'>+	*aup-&gt;enable = 0;</div><div class='add'>+	au_sync_delay(2);</div><div class='add'>+</div><div class='ctx'> 	aup-&gt;tx_full = 0;</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_DMA; i++) {</div><div class='ctx'> 		/* reset control bits */</div><div class='hunk'>@@ -1135,9 +479,26 @@ static void reset_mac(struct net_device *dev)</div><div class='ctx'> 		/* reset control bits */</div><div class='ctx'> 		aup-&gt;tx_dma_ring[i]-&gt;buff_stat &amp;= ~0xf;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;aup-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	aup-&gt;mac_enabled = 0;</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void reset_mac(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct au1000_private *const aup = (struct au1000_private *) dev-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (au1000_debug &gt; 4)</div><div class='add'>+		printk(KERN_INFO "%s: reset mac, aup %x\n",</div><div class='add'>+		       dev-&gt;name, (unsigned)aup);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aup-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	reset_mac_unlocked (dev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;aup-&gt;lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * Setup the receive and transmit "rings".  These pointers are the addresses</div><div class='hunk'>@@ -1160,12 +521,27 @@ setup_hw_rings(struct au1000_private *aup, u32 rx_base, u32 tx_base)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='del'>-	int port;</div><div class='ctx'> 	u32 base_addr;</div><div class='ctx'> 	u32 macen_addr;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-} iflist[2];</div><div class='add'>+} iflist[2] = {</div><div class='add'>+#ifdef CONFIG_SOC_AU1000</div><div class='add'>+	{AU1000_ETH0_BASE, AU1000_MAC0_ENABLE, AU1000_MAC0_DMA_INT},</div><div class='add'>+	{AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SOC_AU1100</div><div class='add'>+	{AU1100_ETH0_BASE, AU1100_MAC0_ENABLE, AU1100_MAC0_DMA_INT}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SOC_AU1500</div><div class='add'>+	{AU1500_ETH0_BASE, AU1500_MAC0_ENABLE, AU1500_MAC0_DMA_INT},</div><div class='add'>+	{AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT}</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SOC_AU1550</div><div class='add'>+	{AU1550_ETH0_BASE, AU1550_MAC0_ENABLE, AU1550_MAC0_DMA_INT},</div><div class='add'>+	{AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT}</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int num_ifs;</div><div class='ctx'> </div><div class='hunk'>@@ -1176,58 +552,14 @@ static int num_ifs;</div><div class='ctx'>  */</div><div class='ctx'> static int __init au1000_init_module(void)</div><div class='ctx'> {</div><div class='del'>-	struct cpuinfo_mips *c = &amp;current_cpu_data;</div><div class='ctx'> 	int ni = (int)((au_readl(SYS_PINFUNC) &amp; (u32)(SYS_PF_NI2)) &gt;&gt; 4);</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int i, found_one = 0;</div><div class='ctx'> </div><div class='del'>-	switch (c-&gt;cputype) {</div><div class='del'>-#ifdef CONFIG_SOC_AU1000</div><div class='del'>-	case CPU_AU1000:</div><div class='del'>-		num_ifs = 2 - ni;</div><div class='del'>-		iflist[0].base_addr = AU1000_ETH0_BASE;</div><div class='del'>-		iflist[1].base_addr = AU1000_ETH1_BASE;</div><div class='del'>-		iflist[0].macen_addr = AU1000_MAC0_ENABLE;</div><div class='del'>-		iflist[1].macen_addr = AU1000_MAC1_ENABLE;</div><div class='del'>-		iflist[0].irq = AU1000_MAC0_DMA_INT;</div><div class='del'>-		iflist[1].irq = AU1000_MAC1_DMA_INT;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SOC_AU1100</div><div class='del'>-	case CPU_AU1100:</div><div class='del'>-		num_ifs = 1 - ni;</div><div class='del'>-		iflist[0].base_addr = AU1100_ETH0_BASE;</div><div class='del'>-		iflist[0].macen_addr = AU1100_MAC0_ENABLE;</div><div class='del'>-		iflist[0].irq = AU1100_MAC0_DMA_INT;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SOC_AU1500</div><div class='del'>-	case CPU_AU1500:</div><div class='del'>-		num_ifs = 2 - ni;</div><div class='del'>-		iflist[0].base_addr = AU1500_ETH0_BASE;</div><div class='del'>-		iflist[1].base_addr = AU1500_ETH1_BASE;</div><div class='del'>-		iflist[0].macen_addr = AU1500_MAC0_ENABLE;</div><div class='del'>-		iflist[1].macen_addr = AU1500_MAC1_ENABLE;</div><div class='del'>-		iflist[0].irq = AU1500_MAC0_DMA_INT;</div><div class='del'>-		iflist[1].irq = AU1500_MAC1_DMA_INT;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SOC_AU1550</div><div class='del'>-	case CPU_AU1550:</div><div class='del'>-		num_ifs = 2 - ni;</div><div class='del'>-		iflist[0].base_addr = AU1550_ETH0_BASE;</div><div class='del'>-		iflist[1].base_addr = AU1550_ETH1_BASE;</div><div class='del'>-		iflist[0].macen_addr = AU1550_MAC0_ENABLE;</div><div class='del'>-		iflist[1].macen_addr = AU1550_MAC1_ENABLE;</div><div class='del'>-		iflist[0].irq = AU1550_MAC0_DMA_INT;</div><div class='del'>-		iflist[1].irq = AU1550_MAC1_DMA_INT;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		num_ifs = 0;</div><div class='del'>-	}</div><div class='add'>+	num_ifs = NUM_ETH_INTERFACES - ni;</div><div class='add'>+</div><div class='ctx'> 	for(i = 0; i &lt; num_ifs; i++) {</div><div class='del'>-		dev = au1000_probe(iflist[i].base_addr, iflist[i].irq, i);</div><div class='add'>+		dev = au1000_probe(i);</div><div class='ctx'> 		iflist[i].dev = dev;</div><div class='ctx'> 		if (dev)</div><div class='ctx'> 			found_one++;</div><div class='hunk'>@@ -1237,178 +569,31 @@ static int __init au1000_init_module(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int au1000_setup_aneg(struct net_device *dev, u32 advertise)</div><div class='del'>-{</div><div class='del'>-	struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='del'>-	u16 ctl, adv;</div><div class='del'>-</div><div class='del'>-	/* Setup standard advertise */</div><div class='del'>-	adv = mdio_read(dev, aup-&gt;phy_addr, MII_ADVERTISE);</div><div class='del'>-	adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);</div><div class='del'>-	if (advertise &amp; ADVERTISED_10baseT_Half)</div><div class='del'>-		adv |= ADVERTISE_10HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_10baseT_Full)</div><div class='del'>-		adv |= ADVERTISE_10FULL;</div><div class='del'>-	if (advertise &amp; ADVERTISED_100baseT_Half)</div><div class='del'>-		adv |= ADVERTISE_100HALF;</div><div class='del'>-	if (advertise &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-		adv |= ADVERTISE_100FULL;</div><div class='del'>-	mdio_write(dev, aup-&gt;phy_addr, MII_ADVERTISE, adv);</div><div class='del'>-</div><div class='del'>-	/* Start/Restart aneg */</div><div class='del'>-	ctl = mdio_read(dev, aup-&gt;phy_addr, MII_BMCR);</div><div class='del'>-	ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);</div><div class='del'>-	mdio_write(dev, aup-&gt;phy_addr, MII_BMCR, ctl);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * ethtool operations</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-static int au1000_setup_forced(struct net_device *dev, int speed, int fd)</div><div class='add'>+static int au1000_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='del'>-	u16 ctl;</div><div class='del'>-</div><div class='del'>-	ctl = mdio_read(dev, aup-&gt;phy_addr, MII_BMCR);</div><div class='del'>-	ctl &amp;= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_ANENABLE);</div><div class='del'>-</div><div class='del'>-	/* First reset the PHY */</div><div class='del'>-	mdio_write(dev, aup-&gt;phy_addr, MII_BMCR, ctl | BMCR_RESET);</div><div class='del'>-</div><div class='del'>-	/* Select speed &amp; duplex */</div><div class='del'>-	switch (speed) {</div><div class='del'>-		case SPEED_10:</div><div class='del'>-			break;</div><div class='del'>-		case SPEED_100:</div><div class='del'>-			ctl |= BMCR_SPEED100;</div><div class='del'>-			break;</div><div class='del'>-		case SPEED_1000:</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (fd == DUPLEX_FULL)</div><div class='del'>-		ctl |= BMCR_FULLDPLX;</div><div class='del'>-	mdio_write(dev, aup-&gt;phy_addr, MII_BMCR, ctl);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (aup-&gt;phy_dev)</div><div class='add'>+		return phy_ethtool_gset(aup-&gt;phy_dev, cmd);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-au1000_start_link(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='del'>-	u32 advertise;</div><div class='del'>-	int autoneg;</div><div class='del'>-	int forced_speed;</div><div class='del'>-	int forced_duplex;</div><div class='del'>-</div><div class='del'>-	/* Default advertise */</div><div class='del'>-	advertise = GENMII_DEFAULT_ADVERTISE;</div><div class='del'>-	autoneg = aup-&gt;want_autoneg;</div><div class='del'>-	forced_speed = SPEED_100;</div><div class='del'>-	forced_duplex = DUPLEX_FULL;</div><div class='del'>-</div><div class='del'>-	/* Setup link parameters */</div><div class='del'>-	if (cmd) {</div><div class='del'>-		if (cmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='del'>-			advertise = cmd-&gt;advertising;</div><div class='del'>-			autoneg = 1;</div><div class='del'>-		} else {</div><div class='del'>-			autoneg = 0;</div><div class='del'>-</div><div class='del'>-			forced_speed = cmd-&gt;speed;</div><div class='del'>-			forced_duplex = cmd-&gt;duplex;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure PHY &amp; start aneg */</div><div class='del'>-	aup-&gt;want_autoneg = autoneg;</div><div class='del'>-	if (autoneg)</div><div class='del'>-		au1000_setup_aneg(dev, advertise);</div><div class='del'>-	else</div><div class='del'>-		au1000_setup_forced(dev, forced_speed, forced_duplex);</div><div class='del'>-	mod_timer(&amp;aup-&gt;timer, jiffies + HZ);</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int au1000_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='add'>+static int au1000_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='del'>-	u16 link, speed;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;supported = GENMII_DEFAULT_FEATURES;</div><div class='del'>-	cmd-&gt;advertising = GENMII_DEFAULT_ADVERTISE;</div><div class='del'>-	cmd-&gt;port = PORT_MII;</div><div class='del'>-	cmd-&gt;transceiver = XCVR_EXTERNAL;</div><div class='del'>-	cmd-&gt;phy_address = aup-&gt;phy_addr;</div><div class='del'>-	spin_lock_irq(&amp;aup-&gt;lock);</div><div class='del'>-	cmd-&gt;autoneg = aup-&gt;want_autoneg;</div><div class='del'>-	aup-&gt;phy_ops-&gt;phy_status(dev, aup-&gt;phy_addr, &amp;link, &amp;speed);</div><div class='del'>-	if ((speed == IF_PORT_100BASETX) || (speed == IF_PORT_100BASEFX))</div><div class='del'>-		cmd-&gt;speed = SPEED_100;</div><div class='del'>-	else if (speed == IF_PORT_10BASET)</div><div class='del'>-		cmd-&gt;speed = SPEED_10;</div><div class='del'>-	if (link &amp;&amp; (dev-&gt;if_port == IF_PORT_100BASEFX))</div><div class='del'>-		cmd-&gt;duplex = DUPLEX_FULL;</div><div class='del'>-	else</div><div class='del'>-		cmd-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-	spin_unlock_irq(&amp;aup-&gt;lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int au1000_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='del'>-{</div><div class='del'>-	 struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='del'>-	  unsigned long features = GENMII_DEFAULT_FEATURES;</div><div class='del'>-</div><div class='del'>-	 if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		 return -EPERM;</div><div class='del'>-</div><div class='del'>-	 if (cmd-&gt;autoneg != AUTONEG_ENABLE &amp;&amp; cmd-&gt;autoneg != AUTONEG_DISABLE)</div><div class='del'>-		 return -EINVAL;</div><div class='del'>-	 if (cmd-&gt;autoneg == AUTONEG_ENABLE &amp;&amp; cmd-&gt;advertising == 0)</div><div class='del'>-		 return -EINVAL;</div><div class='del'>-	 if (cmd-&gt;duplex != DUPLEX_HALF &amp;&amp; cmd-&gt;duplex != DUPLEX_FULL)</div><div class='del'>-		 return -EINVAL;</div><div class='del'>-	 if (cmd-&gt;autoneg == AUTONEG_DISABLE)</div><div class='del'>-		 switch (cmd-&gt;speed) {</div><div class='del'>-		 case SPEED_10:</div><div class='del'>-			 if (cmd-&gt;duplex == DUPLEX_HALF &amp;&amp;</div><div class='del'>-				 (features &amp; SUPPORTED_10baseT_Half) == 0)</div><div class='del'>-				 return -EINVAL;</div><div class='del'>-			 if (cmd-&gt;duplex == DUPLEX_FULL &amp;&amp;</div><div class='del'>-				 (features &amp; SUPPORTED_10baseT_Full) == 0)</div><div class='del'>-				 return -EINVAL;</div><div class='del'>-			 break;</div><div class='del'>-		 case SPEED_100:</div><div class='del'>-			 if (cmd-&gt;duplex == DUPLEX_HALF &amp;&amp;</div><div class='del'>-				 (features &amp; SUPPORTED_100baseT_Half) == 0)</div><div class='del'>-				 return -EINVAL;</div><div class='del'>-			 if (cmd-&gt;duplex == DUPLEX_FULL &amp;&amp;</div><div class='del'>-				 (features &amp; SUPPORTED_100baseT_Full) == 0)</div><div class='del'>-				 return -EINVAL;</div><div class='del'>-			 break;</div><div class='del'>-		 default:</div><div class='del'>-			 return -EINVAL;</div><div class='del'>-		 }</div><div class='del'>-	 else if ((features &amp; SUPPORTED_Autoneg) == 0)</div><div class='del'>-		 return -EINVAL;</div><div class='del'>-</div><div class='del'>-	 spin_lock_irq(&amp;aup-&gt;lock);</div><div class='del'>-	 au1000_start_link(dev, cmd);</div><div class='del'>-	 spin_unlock_irq(&amp;aup-&gt;lock);</div><div class='del'>-	 return 0;</div><div class='del'>-}</div><div class='add'>+	if (!capable(CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='ctx'> </div><div class='del'>-static int au1000_nway_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='add'>+	if (aup-&gt;phy_dev)</div><div class='add'>+		return phy_ethtool_sset(aup-&gt;phy_dev, cmd);</div><div class='ctx'> </div><div class='del'>-	if (!aup-&gt;want_autoneg)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	spin_lock_irq(&amp;aup-&gt;lock);</div><div class='del'>-	au1000_start_link(dev, NULL);</div><div class='del'>-	spin_unlock_irq(&amp;aup-&gt;lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1423,21 +608,14 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 	info-&gt;regdump_len = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 au1000_get_link(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return netif_carrier_ok(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct ethtool_ops au1000_ethtool_ops = {</div><div class='ctx'> 	.get_settings = au1000_get_settings,</div><div class='ctx'> 	.set_settings = au1000_set_settings,</div><div class='ctx'> 	.get_drvinfo = au1000_get_drvinfo,</div><div class='del'>-	.nway_reset = au1000_nway_reset,</div><div class='del'>-	.get_link = au1000_get_link</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct net_device *</div><div class='del'>-au1000_probe(u32 ioaddr, int irq, int port_num)</div><div class='add'>+static struct net_device * au1000_probe(int port_num)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned version_printed = 0;</div><div class='ctx'> 	struct au1000_private *aup = NULL;</div><div class='hunk'>@@ -1445,106 +623,115 @@ au1000_probe(u32 ioaddr, int irq, int port_num)</div><div class='ctx'> 	db_dest_t *pDB, *pDBfree;</div><div class='ctx'> 	char *pmac, *argptr;</div><div class='ctx'> 	char ethaddr[6];</div><div class='del'>-	int i, err;</div><div class='add'>+	int irq, i, err;</div><div class='add'>+	u32 base, macen;</div><div class='add'>+</div><div class='add'>+	if (port_num &gt;= NUM_ETH_INTERFACES)</div><div class='add'>+ 		return NULL;</div><div class='add'>+</div><div class='add'>+	base  = CPHYSADDR(iflist[port_num].base_addr );</div><div class='add'>+	macen = CPHYSADDR(iflist[port_num].macen_addr);</div><div class='add'>+	irq = iflist[port_num].irq;</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE, "Au1x00 ENET"))</div><div class='add'>+	if (!request_mem_region( base, MAC_IOSIZE, "Au1x00 ENET") ||</div><div class='add'>+	    !request_mem_region(macen, 4, "Au1x00 ENET"))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (version_printed++ == 0) </div><div class='add'>+	if (version_printed++ == 0)</div><div class='ctx'> 		printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR);</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct au1000_private));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk (KERN_ERR "au1000 eth: alloc_etherdev failed\n");  </div><div class='add'>+		printk(KERN_ERR "%s: alloc_etherdev failed\n", DRV_NAME);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = register_netdev(dev))) {</div><div class='del'>-		printk(KERN_ERR "Au1x_eth Cannot register net device err %d\n",</div><div class='del'>-				err);</div><div class='add'>+	if ((err = register_netdev(dev)) != 0) {</div><div class='add'>+		printk(KERN_ERR "%s: Cannot register net device, error %d\n",</div><div class='add'>+				DRV_NAME, err);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("%s: Au1x Ethernet found at 0x%x, irq %d\n", </div><div class='del'>-			dev-&gt;name, ioaddr, irq);</div><div class='add'>+	printk("%s: Au1xx0 Ethernet found at 0x%x, irq %d\n",</div><div class='add'>+		dev-&gt;name, base, irq);</div><div class='ctx'> </div><div class='ctx'> 	aup = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate the data buffers */</div><div class='ctx'> 	/* Snooping works fine with eth on all au1xxx */</div><div class='del'>-	aup-&gt;vaddr = (u32)dma_alloc_noncoherent(NULL,</div><div class='del'>-			MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS),</div><div class='del'>-			&amp;aup-&gt;dma_addr,</div><div class='del'>-			0);</div><div class='add'>+	aup-&gt;vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE *</div><div class='add'>+						(NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='add'>+						&amp;aup-&gt;dma_addr,	0);</div><div class='ctx'> 	if (!aup-&gt;vaddr) {</div><div class='ctx'> 		free_netdev(dev);</div><div class='del'>-		release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE);</div><div class='add'>+		release_mem_region( base, MAC_IOSIZE);</div><div class='add'>+		release_mem_region(macen, 4);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* aup-&gt;mac is the base address of the MAC's registers */</div><div class='del'>-	aup-&gt;mac = (volatile mac_reg_t *)((unsigned long)ioaddr);</div><div class='add'>+	aup-&gt;mac = (volatile mac_reg_t *)iflist[port_num].base_addr;</div><div class='add'>+</div><div class='ctx'> 	/* Setup some variables for quick register address access */</div><div class='del'>-	if (ioaddr == iflist[0].base_addr)</div><div class='del'>-	{</div><div class='del'>-		/* check env variables first */</div><div class='del'>-		if (!get_ethernet_addr(ethaddr)) { </div><div class='add'>+	aup-&gt;enable = (volatile u32 *)iflist[port_num].macen_addr;</div><div class='add'>+	aup-&gt;mac_id = port_num;</div><div class='add'>+	au_macs[port_num] = aup;</div><div class='add'>+</div><div class='add'>+	if (port_num == 0) {</div><div class='add'>+		/* Check the environment variables first */</div><div class='add'>+		if (get_ethernet_addr(ethaddr) == 0)</div><div class='ctx'> 			memcpy(au1000_mac_addr, ethaddr, sizeof(au1000_mac_addr));</div><div class='del'>-		} else {</div><div class='add'>+		else {</div><div class='ctx'> 			/* Check command line */</div><div class='ctx'> 			argptr = prom_getcmdline();</div><div class='del'>-			if ((pmac = strstr(argptr, "ethaddr=")) == NULL) {</div><div class='del'>-				printk(KERN_INFO "%s: No mac address found\n", </div><div class='del'>-						dev-&gt;name);</div><div class='del'>-				/* use the hard coded mac addresses */</div><div class='del'>-			} else {</div><div class='add'>+			if ((pmac = strstr(argptr, "ethaddr=")) == NULL)</div><div class='add'>+				printk(KERN_INFO "%s: No MAC address found\n",</div><div class='add'>+						 dev-&gt;name);</div><div class='add'>+				/* Use the hard coded MAC addresses */</div><div class='add'>+			else {</div><div class='ctx'> 				str2eaddr(ethaddr, pmac + strlen("ethaddr="));</div><div class='ctx'> 				memcpy(au1000_mac_addr, ethaddr, </div><div class='del'>-						sizeof(au1000_mac_addr));</div><div class='add'>+				       sizeof(au1000_mac_addr));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-			aup-&gt;enable = (volatile u32 *) </div><div class='del'>-				((unsigned long)iflist[0].macen_addr);</div><div class='del'>-		memcpy(dev-&gt;dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr));</div><div class='add'>+</div><div class='ctx'> 		setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);</div><div class='del'>-		aup-&gt;mac_id = 0;</div><div class='del'>-		au_macs[0] = aup;</div><div class='del'>-	}</div><div class='del'>-		else</div><div class='del'>-	if (ioaddr == iflist[1].base_addr)</div><div class='del'>-	{</div><div class='del'>-			aup-&gt;enable = (volatile u32 *) </div><div class='del'>-				((unsigned long)iflist[1].macen_addr);</div><div class='del'>-		memcpy(dev-&gt;dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr));</div><div class='del'>-		dev-&gt;dev_addr[4] += 0x10;</div><div class='add'>+	} else if (port_num == 1)</div><div class='ctx'> 		setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);</div><div class='del'>-		aup-&gt;mac_id = 1;</div><div class='del'>-		au_macs[1] = aup;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "%s: bad ioaddr\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* bring the device out of reset, otherwise probing the mii</div><div class='del'>-	 * will hang */</div><div class='del'>-	*aup-&gt;enable = MAC_EN_CLOCK_ENABLE;</div><div class='del'>-	au_sync_delay(2);</div><div class='del'>-	*aup-&gt;enable = MAC_EN_RESET0 | MAC_EN_RESET1 | </div><div class='del'>-		MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE;</div><div class='del'>-	au_sync_delay(2);</div><div class='ctx'> </div><div class='del'>-	aup-&gt;mii = kmalloc(sizeof(struct mii_phy), GFP_KERNEL);</div><div class='del'>-	if (!aup-&gt;mii) {</div><div class='del'>-		printk(KERN_ERR "%s: out of memory\n", dev-&gt;name);</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-	aup-&gt;mii-&gt;next = NULL;</div><div class='del'>-	aup-&gt;mii-&gt;chip_info = NULL;</div><div class='del'>-	aup-&gt;mii-&gt;status = 0;</div><div class='del'>-	aup-&gt;mii-&gt;mii_control_reg = 0;</div><div class='del'>-	aup-&gt;mii-&gt;mii_data_reg = 0;</div><div class='add'>+	/*</div><div class='add'>+	 * Assign to the Ethernet ports two consecutive MAC addresses</div><div class='add'>+	 * to match those that are printed on their stickers</div><div class='add'>+	 */</div><div class='add'>+	memcpy(dev-&gt;dev_addr, au1000_mac_addr, sizeof(au1000_mac_addr));</div><div class='add'>+	dev-&gt;dev_addr[5] += port_num;</div><div class='add'>+</div><div class='add'>+	*aup-&gt;enable = 0;</div><div class='add'>+	aup-&gt;mac_enabled = 0;</div><div class='add'>+</div><div class='add'>+	aup-&gt;mii_bus.priv = dev;</div><div class='add'>+	aup-&gt;mii_bus.read = mdiobus_read;</div><div class='add'>+	aup-&gt;mii_bus.write = mdiobus_write;</div><div class='add'>+	aup-&gt;mii_bus.reset = mdiobus_reset;</div><div class='add'>+	aup-&gt;mii_bus.name = "au1000_eth_mii";</div><div class='add'>+	aup-&gt;mii_bus.id = aup-&gt;mac_id;</div><div class='add'>+	aup-&gt;mii_bus.irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);</div><div class='add'>+	for(i = 0; i &lt; PHY_MAX_ADDR; ++i)</div><div class='add'>+		aup-&gt;mii_bus.irq[i] = PHY_POLL;</div><div class='add'>+</div><div class='add'>+	/* if known, set corresponding PHY IRQs */</div><div class='add'>+#if defined(AU1XXX_PHY_STATIC_CONFIG)</div><div class='add'>+# if defined(AU1XXX_PHY0_IRQ)</div><div class='add'>+	if (AU1XXX_PHY0_BUSID == aup-&gt;mii_bus.id)</div><div class='add'>+		aup-&gt;mii_bus.irq[AU1XXX_PHY0_ADDR] = AU1XXX_PHY0_IRQ;</div><div class='add'>+# endif</div><div class='add'>+# if defined(AU1XXX_PHY1_IRQ)</div><div class='add'>+	if (AU1XXX_PHY1_BUSID == aup-&gt;mii_bus.id)</div><div class='add'>+		aup-&gt;mii_bus.irq[AU1XXX_PHY1_ADDR] = AU1XXX_PHY1_IRQ;</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+	mdiobus_register(&amp;aup-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> 	if (mii_probe(dev) != 0) {</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -1581,7 +768,7 @@ au1000_probe(u32 ioaddr, int irq, int port_num)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;aup-&gt;lock);</div><div class='del'>-	dev-&gt;base_addr = ioaddr;</div><div class='add'>+	dev-&gt;base_addr = base;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;open = au1000_open;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = au1000_tx;</div><div class='hunk'>@@ -1590,7 +777,6 @@ au1000_probe(u32 ioaddr, int irq, int port_num)</div><div class='ctx'> 	dev-&gt;set_multicast_list = &amp;set_rx_mode;</div><div class='ctx'> 	dev-&gt;do_ioctl = &amp;au1000_ioctl;</div><div class='ctx'> 	SET_ETHTOOL_OPS(dev, &amp;au1000_ethtool_ops);</div><div class='del'>-	dev-&gt;set_config = &amp;au1000_set_config;</div><div class='ctx'> 	dev-&gt;tx_timeout = au1000_tx_timeout;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = ETH_TX_TIMEOUT;</div><div class='ctx'> </div><div class='hunk'>@@ -1606,7 +792,7 @@ err_out:</div><div class='ctx'> 	/* here we should have a valid dev plus aup-&gt; register addresses</div><div class='ctx'> 	 * so we can reset the mac properly.*/</div><div class='ctx'> 	reset_mac(dev);</div><div class='del'>-	kfree(aup-&gt;mii);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_DMA; i++) {</div><div class='ctx'> 		if (aup-&gt;rx_db_inuse[i])</div><div class='ctx'> 			ReleaseDB(aup, aup-&gt;rx_db_inuse[i]);</div><div class='hunk'>@@ -1615,13 +801,12 @@ err_out:</div><div class='ctx'> 		if (aup-&gt;tx_db_inuse[i])</div><div class='ctx'> 			ReleaseDB(aup, aup-&gt;tx_db_inuse[i]);</div><div class='ctx'> 	}</div><div class='del'>-	dma_free_noncoherent(NULL,</div><div class='del'>-			MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS),</div><div class='del'>-			(void *)aup-&gt;vaddr,</div><div class='del'>-			aup-&gt;dma_addr);</div><div class='add'>+	dma_free_noncoherent(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='add'>+			     (void *)aup-&gt;vaddr, aup-&gt;dma_addr);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	release_mem_region(CPHYSADDR(ioaddr), MAC_IOSIZE);</div><div class='add'>+	release_mem_region( base, MAC_IOSIZE);</div><div class='add'>+	release_mem_region(macen, 4);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1640,19 +825,14 @@ static int au1000_init(struct net_device *dev)</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 control;</div><div class='del'>-	u16 link, speed;</div><div class='ctx'> </div><div class='ctx'> 	if (au1000_debug &gt; 4) </div><div class='ctx'> 		printk("%s: au1000_init\n", dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;aup-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* bring the device out of reset */</div><div class='del'>-	*aup-&gt;enable = MAC_EN_CLOCK_ENABLE;</div><div class='del'>-        au_sync_delay(2);</div><div class='del'>-	*aup-&gt;enable = MAC_EN_RESET0 | MAC_EN_RESET1 | </div><div class='del'>-		MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE;</div><div class='del'>-	au_sync_delay(20);</div><div class='add'>+	enable_mac(dev, 1);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aup-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	aup-&gt;mac-&gt;control = 0;</div><div class='ctx'> 	aup-&gt;tx_head = (aup-&gt;tx_dma_ring[0]-&gt;buff_stat &amp; 0xC) &gt;&gt; 2;</div><div class='hunk'>@@ -1668,12 +848,16 @@ static int au1000_init(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	au_sync();</div><div class='ctx'> </div><div class='del'>-	aup-&gt;phy_ops-&gt;phy_status(dev, aup-&gt;phy_addr, &amp;link, &amp;speed);</div><div class='del'>-	control = MAC_DISABLE_RX_OWN | MAC_RX_ENABLE | MAC_TX_ENABLE;</div><div class='add'>+	control = MAC_RX_ENABLE | MAC_TX_ENABLE;</div><div class='ctx'> #ifndef CONFIG_CPU_LITTLE_ENDIAN</div><div class='ctx'> 	control |= MAC_BIG_ENDIAN;</div><div class='ctx'> #endif</div><div class='del'>-	if (link &amp;&amp; (dev-&gt;if_port == IF_PORT_100BASEFX)) {</div><div class='add'>+	if (aup-&gt;phy_dev) {</div><div class='add'>+		if (aup-&gt;phy_dev-&gt;link &amp;&amp; (DUPLEX_FULL == aup-&gt;phy_dev-&gt;duplex))</div><div class='add'>+			control |= MAC_FULL_DUPLEX;</div><div class='add'>+		else</div><div class='add'>+			control |= MAC_DISABLE_RX_OWN;</div><div class='add'>+	} else { /* PHY-less op, assume full-duplex */</div><div class='ctx'> 		control |= MAC_FULL_DUPLEX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1685,57 +869,84 @@ static int au1000_init(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void au1000_timer(unsigned long data)</div><div class='add'>+static void</div><div class='add'>+au1000_adjust_link(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *)data;</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	unsigned char if_port;</div><div class='del'>-	u16 link, speed;</div><div class='add'>+	struct phy_device *phydev = aup-&gt;phy_dev;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!dev) {</div><div class='del'>-		/* fatal error, don't restart the timer */</div><div class='del'>-		printk(KERN_ERR "au1000_timer error: NULL dev\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	int status_change = 0;</div><div class='ctx'> </div><div class='del'>-	if_port = dev-&gt;if_port;</div><div class='del'>-	if (aup-&gt;phy_ops-&gt;phy_status(dev, aup-&gt;phy_addr, &amp;link, &amp;speed) == 0) {</div><div class='del'>-		if (link) {</div><div class='del'>-			if (!netif_carrier_ok(dev)) {</div><div class='del'>-				netif_carrier_on(dev);</div><div class='del'>-				printk(KERN_INFO "%s: link up\n", dev-&gt;name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			if (netif_carrier_ok(dev)) {</div><div class='del'>-				netif_carrier_off(dev);</div><div class='del'>-				dev-&gt;if_port = 0;</div><div class='del'>-				printk(KERN_INFO "%s: link down\n", dev-&gt;name);</div><div class='del'>-			}</div><div class='add'>+	BUG_ON(!aup-&gt;phy_dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aup-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link &amp;&amp; (aup-&gt;old_speed != phydev-&gt;speed)) {</div><div class='add'>+		// speed changed</div><div class='add'>+</div><div class='add'>+		switch(phydev-&gt;speed) {</div><div class='add'>+		case SPEED_10:</div><div class='add'>+		case SPEED_100:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_WARNING</div><div class='add'>+			       "%s: Speed (%d) is not 10/100 ???\n",</div><div class='add'>+			       dev-&gt;name, phydev-&gt;speed);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		aup-&gt;old_speed = phydev-&gt;speed;</div><div class='add'>+</div><div class='add'>+		status_change = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (link &amp;&amp; (dev-&gt;if_port != if_port) &amp;&amp; </div><div class='del'>-			(dev-&gt;if_port != IF_PORT_UNKNOWN)) {</div><div class='add'>+	if (phydev-&gt;link &amp;&amp; (aup-&gt;old_duplex != phydev-&gt;duplex)) {</div><div class='add'>+		// duplex mode changed</div><div class='add'>+</div><div class='add'>+		/* switching duplex mode requires to disable rx and tx! */</div><div class='ctx'> 		hard_stop(dev);</div><div class='del'>-		if (dev-&gt;if_port == IF_PORT_100BASEFX) {</div><div class='del'>-			printk(KERN_INFO "%s: going to full duplex\n", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			aup-&gt;mac-&gt;control |= MAC_FULL_DUPLEX;</div><div class='del'>-			au_sync_delay(1);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			aup-&gt;mac-&gt;control &amp;= ~MAC_FULL_DUPLEX;</div><div class='del'>-			au_sync_delay(1);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		if (DUPLEX_FULL == phydev-&gt;duplex)</div><div class='add'>+			aup-&gt;mac-&gt;control = ((aup-&gt;mac-&gt;control</div><div class='add'>+					     | MAC_FULL_DUPLEX)</div><div class='add'>+					     &amp; ~MAC_DISABLE_RX_OWN);</div><div class='add'>+		else</div><div class='add'>+			aup-&gt;mac-&gt;control = ((aup-&gt;mac-&gt;control</div><div class='add'>+					      &amp; ~MAC_FULL_DUPLEX)</div><div class='add'>+					     | MAC_DISABLE_RX_OWN);</div><div class='add'>+		au_sync_delay(1);</div><div class='add'>+</div><div class='ctx'> 		enable_rx_tx(dev);</div><div class='add'>+		aup-&gt;old_duplex = phydev-&gt;duplex;</div><div class='add'>+</div><div class='add'>+		status_change = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	aup-&gt;timer.expires = RUN_AT((1*HZ)); </div><div class='del'>-	aup-&gt;timer.data = (unsigned long)dev;</div><div class='del'>-	aup-&gt;timer.function = &amp;au1000_timer; /* timer handler */</div><div class='del'>-	add_timer(&amp;aup-&gt;timer);</div><div class='add'>+	if(phydev-&gt;link != aup-&gt;old_link) {</div><div class='add'>+		// link state changed</div><div class='ctx'> </div><div class='add'>+		if (phydev-&gt;link) // link went up</div><div class='add'>+			netif_schedule(dev);</div><div class='add'>+		else { // link went down</div><div class='add'>+			aup-&gt;old_speed = 0;</div><div class='add'>+			aup-&gt;old_duplex = -1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		aup-&gt;old_link = phydev-&gt;link;</div><div class='add'>+		status_change = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;aup-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (status_change) {</div><div class='add'>+		if (phydev-&gt;link)</div><div class='add'>+			printk(KERN_INFO "%s: link up (%d/%s)\n",</div><div class='add'>+			       dev-&gt;name, phydev-&gt;speed,</div><div class='add'>+			       DUPLEX_FULL == phydev-&gt;duplex ? "Full" : "Half");</div><div class='add'>+		else</div><div class='add'>+			printk(KERN_INFO "%s: link down\n", dev-&gt;name);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int au1000_open(struct net_device *dev)</div><div class='hunk'>@@ -1746,25 +957,26 @@ static int au1000_open(struct net_device *dev)</div><div class='ctx'> 	if (au1000_debug &gt; 4)</div><div class='ctx'> 		printk("%s: open: dev=%p\n", dev-&gt;name, dev);</div><div class='ctx'> </div><div class='add'>+	if ((retval = request_irq(dev-&gt;irq, &amp;au1000_interrupt, 0,</div><div class='add'>+					dev-&gt;name, dev))) {</div><div class='add'>+		printk(KERN_ERR "%s: unable to get IRQ %d\n",</div><div class='add'>+				dev-&gt;name, dev-&gt;irq);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((retval = au1000_init(dev))) {</div><div class='ctx'> 		printk(KERN_ERR "%s: error in au1000_init\n", dev-&gt;name);</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	netif_start_queue(dev);</div><div class='ctx'> </div><div class='del'>-	if ((retval = request_irq(dev-&gt;irq, &amp;au1000_interrupt, 0, </div><div class='del'>-					dev-&gt;name, dev))) {</div><div class='del'>-		printk(KERN_ERR "%s: unable to get IRQ %d\n", </div><div class='del'>-				dev-&gt;name, dev-&gt;irq);</div><div class='del'>-		return retval;</div><div class='add'>+	if (aup-&gt;phy_dev) {</div><div class='add'>+		/* cause the PHY state machine to schedule a link state check */</div><div class='add'>+		aup-&gt;phy_dev-&gt;state = PHY_CHANGELINK;</div><div class='add'>+		phy_start(aup-&gt;phy_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;aup-&gt;timer); /* used in ioctl() */</div><div class='del'>-	aup-&gt;timer.expires = RUN_AT((3*HZ)); </div><div class='del'>-	aup-&gt;timer.data = (unsigned long)dev;</div><div class='del'>-	aup-&gt;timer.function = &amp;au1000_timer; /* timer handler */</div><div class='del'>-	add_timer(&amp;aup-&gt;timer);</div><div class='add'>+	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (au1000_debug &gt; 4)</div><div class='ctx'> 		printk("%s: open: Initialization done.\n", dev-&gt;name);</div><div class='hunk'>@@ -1774,16 +986,19 @@ static int au1000_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int au1000_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 flags;</div><div class='del'>-	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct au1000_private *const aup = (struct au1000_private *) dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (au1000_debug &gt; 4)</div><div class='ctx'> 		printk("%s: close: dev=%p\n", dev-&gt;name, dev);</div><div class='ctx'> </div><div class='del'>-	reset_mac(dev);</div><div class='add'>+	if (aup-&gt;phy_dev)</div><div class='add'>+		phy_stop(aup-&gt;phy_dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;aup-&gt;lock, flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	reset_mac_unlocked (dev);</div><div class='add'>+</div><div class='ctx'> 	/* stop the device */</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1805,21 +1020,18 @@ static void __exit au1000_cleanup_module(void)</div><div class='ctx'> 		if (dev) {</div><div class='ctx'> 			aup = (struct au1000_private *) dev-&gt;priv;</div><div class='ctx'> 			unregister_netdev(dev);</div><div class='del'>-			kfree(aup-&gt;mii);</div><div class='del'>-			for (j = 0; j &lt; NUM_RX_DMA; j++) {</div><div class='add'>+			for (j = 0; j &lt; NUM_RX_DMA; j++)</div><div class='ctx'> 				if (aup-&gt;rx_db_inuse[j])</div><div class='ctx'> 					ReleaseDB(aup, aup-&gt;rx_db_inuse[j]);</div><div class='del'>-			}</div><div class='del'>-			for (j = 0; j &lt; NUM_TX_DMA; j++) {</div><div class='add'>+			for (j = 0; j &lt; NUM_TX_DMA; j++)</div><div class='ctx'> 				if (aup-&gt;tx_db_inuse[j])</div><div class='ctx'> 					ReleaseDB(aup, aup-&gt;tx_db_inuse[j]);</div><div class='del'>-			}</div><div class='del'>-			dma_free_noncoherent(NULL,</div><div class='del'>-					MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS),</div><div class='del'>-					(void *)aup-&gt;vaddr,</div><div class='del'>-					aup-&gt;dma_addr);</div><div class='add'>+ 			dma_free_noncoherent(NULL, MAX_BUF_SIZE *</div><div class='add'>+ 					     (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='add'>+ 					     (void *)aup-&gt;vaddr, aup-&gt;dma_addr);</div><div class='add'>+ 			release_mem_region(dev-&gt;base_addr, MAC_IOSIZE);</div><div class='add'>+ 			release_mem_region(CPHYSADDR(iflist[i].macen_addr), 4);</div><div class='ctx'> 			free_netdev(dev);</div><div class='del'>-			release_mem_region(CPHYSADDR(iflist[i].base_addr), MAC_IOSIZE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1830,7 +1042,7 @@ static void update_tx_stats(struct net_device *dev, u32 status)</div><div class='ctx'> 	struct net_device_stats *ps = &amp;aup-&gt;stats;</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; TX_FRAME_ABORTED) {</div><div class='del'>-		if (dev-&gt;if_port == IF_PORT_100BASEFX) {</div><div class='add'>+		if (!aup-&gt;phy_dev || (DUPLEX_FULL == aup-&gt;phy_dev-&gt;duplex)) {</div><div class='ctx'> 			if (status &amp; (TX_JAB_TIMEOUT | TX_UNDERRUN)) {</div><div class='ctx'> 				/* any other tx errors are only valid</div><div class='ctx'> 				 * in half duplex mode */</div><div class='hunk'>@@ -2104,126 +1316,15 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = (struct au1000_private *)dev-&gt;priv;</div><div class='del'>-	u16 *data = (u16 *)&amp;rq-&gt;ifr_ifru;</div><div class='del'>-</div><div class='del'>-	switch(cmd) { </div><div class='del'>-		case SIOCDEVPRIVATE:	/* Get the address of the PHY in use. */</div><div class='del'>-		case SIOCGMIIPHY:</div><div class='del'>-		        if (!netif_running(dev)) return -EINVAL;</div><div class='del'>-			data[0] = aup-&gt;phy_addr;</div><div class='del'>-		case SIOCDEVPRIVATE+1:	/* Read the specified MII register. */</div><div class='del'>-		case SIOCGMIIREG:</div><div class='del'>-			data[3] =  mdio_read(dev, data[0], data[1]); </div><div class='del'>-			return 0;</div><div class='del'>-		case SIOCDEVPRIVATE+2:	/* Write the specified MII register */</div><div class='del'>-		case SIOCSMIIREG: </div><div class='del'>-			if (!capable(CAP_NET_ADMIN))</div><div class='del'>-				return -EPERM;</div><div class='del'>-			mdio_write(dev, data[0], data[1],data[2]);</div><div class='del'>-			return 0;</div><div class='del'>-		default:</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int au1000_set_config(struct net_device *dev, struct ifmap *map)</div><div class='del'>-{</div><div class='del'>-	struct au1000_private *aup = (struct au1000_private *) dev-&gt;priv;</div><div class='del'>-	u16 control;</div><div class='ctx'> </div><div class='del'>-	if (au1000_debug &gt; 4)  {</div><div class='del'>-		printk("%s: set_config called: dev-&gt;if_port %d map-&gt;port %x\n", </div><div class='del'>-				dev-&gt;name, dev-&gt;if_port, map-&gt;port);</div><div class='del'>-	}</div><div class='add'>+	if (!netif_running(dev)) return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	switch(map-&gt;port){</div><div class='del'>-		case IF_PORT_UNKNOWN: /* use auto here */   </div><div class='del'>-			printk(KERN_INFO "%s: config phy for aneg\n", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			dev-&gt;if_port = map-&gt;port;</div><div class='del'>-			/* Link Down: the timer will bring it up */</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-	</div><div class='del'>-			/* read current control */</div><div class='del'>-			control = mdio_read(dev, aup-&gt;phy_addr, MII_CONTROL);</div><div class='del'>-			control &amp;= ~(MII_CNTL_FDX | MII_CNTL_F100);</div><div class='del'>-</div><div class='del'>-			/* enable auto negotiation and reset the negotiation */</div><div class='del'>-			mdio_write(dev, aup-&gt;phy_addr, MII_CONTROL, </div><div class='del'>-					control | MII_CNTL_AUTO | </div><div class='del'>-					MII_CNTL_RST_AUTO);</div><div class='add'>+	if (!aup-&gt;phy_dev) return -EINVAL; // PHY not controllable</div><div class='ctx'> </div><div class='del'>-			break;</div><div class='del'>-    </div><div class='del'>-		case IF_PORT_10BASET: /* 10BaseT */         </div><div class='del'>-			printk(KERN_INFO "%s: config phy for 10BaseT\n", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			dev-&gt;if_port = map-&gt;port;</div><div class='del'>-	</div><div class='del'>-			/* Link Down: the timer will bring it up */</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-			/* set Speed to 10Mbps, Half Duplex */</div><div class='del'>-			control = mdio_read(dev, aup-&gt;phy_addr, MII_CONTROL);</div><div class='del'>-			control &amp;= ~(MII_CNTL_F100 | MII_CNTL_AUTO | </div><div class='del'>-					MII_CNTL_FDX);</div><div class='del'>-	</div><div class='del'>-			/* disable auto negotiation and force 10M/HD mode*/</div><div class='del'>-			mdio_write(dev, aup-&gt;phy_addr, MII_CONTROL, control);</div><div class='del'>-			break;</div><div class='del'>-    </div><div class='del'>-		case IF_PORT_100BASET: /* 100BaseT */</div><div class='del'>-		case IF_PORT_100BASETX: /* 100BaseTx */ </div><div class='del'>-			printk(KERN_INFO "%s: config phy for 100BaseTX\n", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			dev-&gt;if_port = map-&gt;port;</div><div class='del'>-	</div><div class='del'>-			/* Link Down: the timer will bring it up */</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-	</div><div class='del'>-			/* set Speed to 100Mbps, Half Duplex */</div><div class='del'>-			/* disable auto negotiation and enable 100MBit Mode */</div><div class='del'>-			control = mdio_read(dev, aup-&gt;phy_addr, MII_CONTROL);</div><div class='del'>-			control &amp;= ~(MII_CNTL_AUTO | MII_CNTL_FDX);</div><div class='del'>-			control |= MII_CNTL_F100;</div><div class='del'>-			mdio_write(dev, aup-&gt;phy_addr, MII_CONTROL, control);</div><div class='del'>-			break;</div><div class='del'>-    </div><div class='del'>-		case IF_PORT_100BASEFX: /* 100BaseFx */</div><div class='del'>-			printk(KERN_INFO "%s: config phy for 100BaseFX\n", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			dev-&gt;if_port = map-&gt;port;</div><div class='del'>-	</div><div class='del'>-			/* Link Down: the timer will bring it up */</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-	</div><div class='del'>-			/* set Speed to 100Mbps, Full Duplex */</div><div class='del'>-			/* disable auto negotiation and enable 100MBit Mode */</div><div class='del'>-			control = mdio_read(dev, aup-&gt;phy_addr, MII_CONTROL);</div><div class='del'>-			control &amp;= ~MII_CNTL_AUTO;</div><div class='del'>-			control |=  MII_CNTL_F100 | MII_CNTL_FDX;</div><div class='del'>-			mdio_write(dev, aup-&gt;phy_addr, MII_CONTROL, control);</div><div class='del'>-			break;</div><div class='del'>-		case IF_PORT_10BASE2: /* 10Base2 */</div><div class='del'>-		case IF_PORT_AUI: /* AUI */</div><div class='del'>-		/* These Modes are not supported (are they?)*/</div><div class='del'>-			printk(KERN_ERR "%s: 10Base2/AUI not supported", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-			break;</div><div class='del'>-    </div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_ERR "%s: Invalid media selected", </div><div class='del'>-					dev-&gt;name);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return phy_mii_ioctl(aup-&gt;phy_dev, if_mii(rq), cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct net_device_stats *au1000_get_stats(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/au1000_eth.h b/drivers/net/au1000_eth.h<br/>index 7f9326e39cc0..41c2f848d2c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/au1000_eth.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/au1000_eth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/au1000_eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/au1000_eth.h</a></div><div class='hunk'>@@ -40,120 +40,6 @@</div><div class='ctx'> </div><div class='ctx'> #define MULTICAST_FILTER_LIMIT 64</div><div class='ctx'> </div><div class='del'>-/* FIXME </div><div class='del'>- * The PHY defines should be in a separate file.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* MII register offsets */</div><div class='del'>-#define	MII_CONTROL 0x0000</div><div class='del'>-#define MII_STATUS  0x0001</div><div class='del'>-#define MII_PHY_ID0 0x0002</div><div class='del'>-#define	MII_PHY_ID1 0x0003</div><div class='del'>-#define MII_ANADV   0x0004</div><div class='del'>-#define MII_ANLPAR  0x0005</div><div class='del'>-#define MII_AEXP    0x0006</div><div class='del'>-#define MII_ANEXT   0x0007</div><div class='del'>-#define MII_LSI_PHY_CONFIG 0x0011</div><div class='del'>-/* Status register */</div><div class='del'>-#define MII_LSI_PHY_STAT   0x0012</div><div class='del'>-#define MII_AMD_PHY_STAT   MII_LSI_PHY_STAT</div><div class='del'>-#define MII_INTEL_PHY_STAT 0x0011</div><div class='del'>-</div><div class='del'>-#define MII_AUX_CNTRL  0x0018</div><div class='del'>-/* mii registers specific to AMD 79C901 */</div><div class='del'>-#define	MII_STATUS_SUMMARY = 0x0018</div><div class='del'>-</div><div class='del'>-/* MII Control register bit definitions. */</div><div class='del'>-#define	MII_CNTL_FDX      0x0100</div><div class='del'>-#define MII_CNTL_RST_AUTO 0x0200</div><div class='del'>-#define	MII_CNTL_ISOLATE  0x0400</div><div class='del'>-#define MII_CNTL_PWRDWN   0x0800</div><div class='del'>-#define	MII_CNTL_AUTO     0x1000</div><div class='del'>-#define MII_CNTL_F100     0x2000</div><div class='del'>-#define	MII_CNTL_LPBK     0x4000</div><div class='del'>-#define MII_CNTL_RESET    0x8000</div><div class='del'>-</div><div class='del'>-/* MII Status register bit  */</div><div class='del'>-#define	MII_STAT_EXT        0x0001 </div><div class='del'>-#define MII_STAT_JAB        0x0002</div><div class='del'>-#define	MII_STAT_LINK       0x0004</div><div class='del'>-#define MII_STAT_CAN_AUTO   0x0008</div><div class='del'>-#define	MII_STAT_FAULT      0x0010 </div><div class='del'>-#define MII_STAT_AUTO_DONE  0x0020</div><div class='del'>-#define	MII_STAT_CAN_T      0x0800</div><div class='del'>-#define MII_STAT_CAN_T_FDX  0x1000</div><div class='del'>-#define	MII_STAT_CAN_TX     0x2000 </div><div class='del'>-#define MII_STAT_CAN_TX_FDX 0x4000</div><div class='del'>-#define	MII_STAT_CAN_T4     0x8000</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define		MII_ID1_OUI_LO		0xFC00	/* low bits of OUI mask */</div><div class='del'>-#define		MII_ID1_MODEL		0x03F0	/* model number */</div><div class='del'>-#define		MII_ID1_REV		0x000F	/* model number */</div><div class='del'>-</div><div class='del'>-/* MII NWAY Register Bits ...</div><div class='del'>-   valid for the ANAR (Auto-Negotiation Advertisement) and</div><div class='del'>-   ANLPAR (Auto-Negotiation Link Partner) registers */</div><div class='del'>-#define	MII_NWAY_NODE_SEL 0x001f</div><div class='del'>-#define MII_NWAY_CSMA_CD  0x0001</div><div class='del'>-#define	MII_NWAY_T	  0x0020</div><div class='del'>-#define MII_NWAY_T_FDX    0x0040</div><div class='del'>-#define	MII_NWAY_TX       0x0080</div><div class='del'>-#define MII_NWAY_TX_FDX   0x0100</div><div class='del'>-#define	MII_NWAY_T4       0x0200 </div><div class='del'>-#define MII_NWAY_PAUSE    0x0400 </div><div class='del'>-#define	MII_NWAY_RF       0x2000 /* Remote Fault */</div><div class='del'>-#define MII_NWAY_ACK      0x4000 /* Remote Acknowledge */</div><div class='del'>-#define	MII_NWAY_NP       0x8000 /* Next Page (Enable) */</div><div class='del'>-</div><div class='del'>-/* mii stsout register bits */</div><div class='del'>-#define	MII_STSOUT_LINK_FAIL 0x4000</div><div class='del'>-#define	MII_STSOUT_SPD       0x0080</div><div class='del'>-#define MII_STSOUT_DPLX      0x0040</div><div class='del'>-</div><div class='del'>-/* mii stsics register bits */</div><div class='del'>-#define	MII_STSICS_SPD       0x8000</div><div class='del'>-#define MII_STSICS_DPLX      0x4000</div><div class='del'>-#define	MII_STSICS_LINKSTS   0x0001</div><div class='del'>-</div><div class='del'>-/* mii stssum register bits */</div><div class='del'>-#define	MII_STSSUM_LINK  0x0008</div><div class='del'>-#define MII_STSSUM_DPLX  0x0004</div><div class='del'>-#define	MII_STSSUM_AUTO  0x0002</div><div class='del'>-#define MII_STSSUM_SPD   0x0001</div><div class='del'>-</div><div class='del'>-/* lsi phy status register */</div><div class='del'>-#define MII_LSI_PHY_STAT_FDX	0x0040</div><div class='del'>-#define MII_LSI_PHY_STAT_SPD	0x0080</div><div class='del'>-</div><div class='del'>-/* amd phy status register */</div><div class='del'>-#define MII_AMD_PHY_STAT_FDX	0x0800</div><div class='del'>-#define MII_AMD_PHY_STAT_SPD	0x0400</div><div class='del'>-</div><div class='del'>-/* intel phy status register */</div><div class='del'>-#define MII_INTEL_PHY_STAT_FDX	0x0200</div><div class='del'>-#define MII_INTEL_PHY_STAT_SPD	0x4000</div><div class='del'>-</div><div class='del'>-/* Auxilliary Control/Status Register */</div><div class='del'>-#define MII_AUX_FDX      0x0001</div><div class='del'>-#define MII_AUX_100      0x0002</div><div class='del'>-#define MII_AUX_F100     0x0004</div><div class='del'>-#define MII_AUX_ANEG     0x0008</div><div class='del'>-</div><div class='del'>-typedef struct mii_phy {</div><div class='del'>-	struct mii_phy * next;</div><div class='del'>-	struct mii_chip_info * chip_info;</div><div class='del'>-	u16 status;</div><div class='del'>-	u32 *mii_control_reg;</div><div class='del'>-	u32 *mii_data_reg;</div><div class='del'>-} mii_phy_t;</div><div class='del'>-</div><div class='del'>-struct phy_ops {</div><div class='del'>-	int (*phy_init) (struct net_device *, int);</div><div class='del'>-	int (*phy_reset) (struct net_device *, int);</div><div class='del'>-	int (*phy_status) (struct net_device *, int, u16 *, u16 *);</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* </div><div class='ctx'>  * Data Buffer Descriptor. Data buffers must be aligned on 32 byte </div><div class='ctx'>  * boundary for both, receive and transmit.</div><div class='hunk'>@@ -200,7 +86,6 @@ typedef struct mac_reg {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct au1000_private {</div><div class='del'>-	</div><div class='ctx'> 	db_dest_t *pDBfree;</div><div class='ctx'> 	db_dest_t db[NUM_RX_BUFFS+NUM_TX_BUFFS];</div><div class='ctx'> 	volatile rx_dma_t *rx_dma_ring[NUM_RX_DMA];</div><div class='hunk'>@@ -213,8 +98,15 @@ struct au1000_private {</div><div class='ctx'> 	u32 tx_full;</div><div class='ctx'> </div><div class='ctx'> 	int mac_id;</div><div class='del'>-	mii_phy_t *mii;</div><div class='del'>-	struct phy_ops *phy_ops;</div><div class='add'>+</div><div class='add'>+	int mac_enabled;       /* whether MAC is currently enabled and running (req. for mdio) */</div><div class='add'>+</div><div class='add'>+	int old_link;          /* used by au1000_adjust_link */</div><div class='add'>+	int old_speed;</div><div class='add'>+	int old_duplex;</div><div class='add'>+</div><div class='add'>+	struct phy_device *phy_dev;</div><div class='add'>+	struct mii_bus mii_bus;</div><div class='ctx'> 	</div><div class='ctx'> 	/* These variables are just for quick access to certain regs addresses. */</div><div class='ctx'> 	volatile mac_reg_t *mac;  /* mac registers                      */   </div><div class='hunk'>@@ -223,14 +115,6 @@ struct au1000_private {</div><div class='ctx'> 	u32 vaddr;                /* virtual address of rx/tx buffers   */</div><div class='ctx'> 	dma_addr_t dma_addr;      /* dma address of rx/tx buffers       */</div><div class='ctx'> </div><div class='del'>-	u8 *hash_table;</div><div class='del'>-	u32 hash_mode;</div><div class='del'>-	u32 intr_work_done; /* number of Rx and Tx pkts processed in the isr */</div><div class='del'>-	int phy_addr;          /* phy address */</div><div class='del'>-	u32 options;           /* User-settable misc. driver options. */</div><div class='del'>-	u32 drv_flags;</div><div class='del'>-	int want_autoneg;</div><div class='ctx'> 	struct net_device_stats stats;</div><div class='del'>-	struct timer_list timer;</div><div class='ctx'> 	spinlock_t lock;       /* Serialise access to device */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/b44.c b/drivers/net/b44.c<br/>index d8233e0b7899..bea0fc0ede2f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/b44.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/b44.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/b44.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/b44.c</a></div><div class='hunk'>@@ -29,8 +29,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"b44"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"1.00"</div><div class='del'>-#define DRV_MODULE_RELDATE	"Apr 7, 2006"</div><div class='add'>+#define DRV_MODULE_VERSION	"1.01"</div><div class='add'>+#define DRV_MODULE_RELDATE	"Jun 16, 2006"</div><div class='ctx'> </div><div class='ctx'> #define B44_DEF_MSG_ENABLE	  \</div><div class='ctx'> 	(NETIF_MSG_DRV		| \</div><div class='hunk'>@@ -75,6 +75,15 @@</div><div class='ctx'> /* minimum number of free TX descriptors required to wake up TX process */</div><div class='ctx'> #define B44_TX_WAKEUP_THRESH		(B44_TX_RING_SIZE / 4)</div><div class='ctx'> </div><div class='add'>+/* b44 internal pattern match filter info */</div><div class='add'>+#define B44_PATTERN_BASE	0x400</div><div class='add'>+#define B44_PATTERN_SIZE	0x80</div><div class='add'>+#define B44_PMASK_BASE		0x600</div><div class='add'>+#define B44_PMASK_SIZE		0x10</div><div class='add'>+#define B44_MAX_PATTERNS	16</div><div class='add'>+#define B44_ETHIPV6UDP_HLEN	62</div><div class='add'>+#define B44_ETHIPV4UDP_HLEN	42</div><div class='add'>+</div><div class='ctx'> static char version[] __devinitdata =</div><div class='ctx'> 	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +110,7 @@ MODULE_DEVICE_TABLE(pci, b44_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> static void b44_halt(struct b44 *);</div><div class='ctx'> static void b44_init_rings(struct b44 *);</div><div class='del'>-static void b44_init_hw(struct b44 *);</div><div class='add'>+static void b44_init_hw(struct b44 *, int);</div><div class='ctx'> </div><div class='ctx'> static int dma_desc_align_mask;</div><div class='ctx'> static int dma_desc_sync_size;</div><div class='hunk'>@@ -873,7 +882,7 @@ static int b44_poll(struct net_device *netdev, int *budget)</div><div class='ctx'> 		spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> 		b44_halt(bp);</div><div class='ctx'> 		b44_init_rings(bp);</div><div class='del'>-		b44_init_hw(bp);</div><div class='add'>+		b44_init_hw(bp, 1);</div><div class='ctx'> 		netif_wake_queue(bp-&gt;dev);</div><div class='ctx'> 		spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> 		done = 1;</div><div class='hunk'>@@ -942,7 +951,7 @@ static void b44_tx_timeout(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	b44_halt(bp);</div><div class='ctx'> 	b44_init_rings(bp);</div><div class='del'>-	b44_init_hw(bp);</div><div class='add'>+	b44_init_hw(bp, 1);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1059,7 +1068,7 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	b44_halt(bp);</div><div class='ctx'> 	dev-&gt;mtu = new_mtu;</div><div class='ctx'> 	b44_init_rings(bp);</div><div class='del'>-	b44_init_hw(bp);</div><div class='add'>+	b44_init_hw(bp, 1);</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	b44_enable_ints(bp);</div><div class='hunk'>@@ -1356,13 +1365,15 @@ static int b44_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'>  * packet processing.  Invoked with bp-&gt;lock held.</div><div class='ctx'>  */</div><div class='ctx'> static void __b44_set_rx_mode(struct net_device *);</div><div class='del'>-static void b44_init_hw(struct b44 *bp)</div><div class='add'>+static void b44_init_hw(struct b44 *bp, int full_reset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	b44_chip_reset(bp);</div><div class='del'>-	b44_phy_reset(bp);</div><div class='del'>-	b44_setup_phy(bp);</div><div class='add'>+	if (full_reset) {</div><div class='add'>+		b44_phy_reset(bp);</div><div class='add'>+		b44_setup_phy(bp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable CRC32, set proper LED modes and power on PHY */</div><div class='ctx'> 	bw32(bp, B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);</div><div class='hunk'>@@ -1376,16 +1387,21 @@ static void b44_init_hw(struct b44 *bp)</div><div class='ctx'> 	bw32(bp, B44_TXMAXLEN, bp-&gt;dev-&gt;mtu + ETH_HLEN + 8 + RX_HEADER_LEN);</div><div class='ctx'> </div><div class='ctx'> 	bw32(bp, B44_TX_WMARK, 56); /* XXX magic */</div><div class='del'>-	bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);</div><div class='del'>-	bw32(bp, B44_DMATX_ADDR, bp-&gt;tx_ring_dma + bp-&gt;dma_offset);</div><div class='del'>-	bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |</div><div class='del'>-			      (bp-&gt;rx_offset &lt;&lt; DMARX_CTRL_ROSHIFT)));</div><div class='del'>-	bw32(bp, B44_DMARX_ADDR, bp-&gt;rx_ring_dma + bp-&gt;dma_offset);</div><div class='add'>+	if (full_reset) {</div><div class='add'>+		bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);</div><div class='add'>+		bw32(bp, B44_DMATX_ADDR, bp-&gt;tx_ring_dma + bp-&gt;dma_offset);</div><div class='add'>+		bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |</div><div class='add'>+				      (bp-&gt;rx_offset &lt;&lt; DMARX_CTRL_ROSHIFT)));</div><div class='add'>+		bw32(bp, B44_DMARX_ADDR, bp-&gt;rx_ring_dma + bp-&gt;dma_offset);</div><div class='ctx'> </div><div class='del'>-	bw32(bp, B44_DMARX_PTR, bp-&gt;rx_pending);</div><div class='del'>-	bp-&gt;rx_prod = bp-&gt;rx_pending;</div><div class='add'>+		bw32(bp, B44_DMARX_PTR, bp-&gt;rx_pending);</div><div class='add'>+		bp-&gt;rx_prod = bp-&gt;rx_pending;</div><div class='ctx'> </div><div class='del'>-	bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);</div><div class='add'>+		bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);</div><div class='add'>+	} else {</div><div class='add'>+		bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |</div><div class='add'>+				      (bp-&gt;rx_offset &lt;&lt; DMARX_CTRL_ROSHIFT)));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	val = br32(bp, B44_ENET_CTRL);</div><div class='ctx'> 	bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));</div><div class='hunk'>@@ -1401,11 +1417,11 @@ static int b44_open(struct net_device *dev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	b44_init_rings(bp);</div><div class='del'>-	b44_init_hw(bp);</div><div class='add'>+	b44_init_hw(bp, 1);</div><div class='ctx'> </div><div class='ctx'> 	b44_check_phy(bp);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(dev-&gt;irq, b44_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	err = request_irq(dev-&gt;irq, b44_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (unlikely(err &lt; 0)) {</div><div class='ctx'> 		b44_chip_reset(bp);</div><div class='ctx'> 		b44_free_rings(bp);</div><div class='hunk'>@@ -1450,6 +1466,140 @@ static void b44_poll_controller(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void bwfilter_table(struct b44 *bp, u8 *pp, u32 bytes, u32 table_offset)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	u32 *pattern = (u32 *) pp;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bytes; i += sizeof(u32)) {</div><div class='add'>+		bw32(bp, B44_FILT_ADDR, table_offset + i);</div><div class='add'>+		bw32(bp, B44_FILT_DATA, pattern[i / sizeof(u32)]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)</div><div class='add'>+{</div><div class='add'>+	int magicsync = 6;</div><div class='add'>+	int k, j, len = offset;</div><div class='add'>+	int ethaddr_bytes = ETH_ALEN;</div><div class='add'>+</div><div class='add'>+	memset(ppattern + offset, 0xff, magicsync);</div><div class='add'>+	for (j = 0; j &lt; magicsync; j++)</div><div class='add'>+		set_bit(len++, (unsigned long *) pmask);</div><div class='add'>+</div><div class='add'>+	for (j = 0; j &lt; B44_MAX_PATTERNS; j++) {</div><div class='add'>+		if ((B44_PATTERN_SIZE - len) &gt;= ETH_ALEN)</div><div class='add'>+			ethaddr_bytes = ETH_ALEN;</div><div class='add'>+		else</div><div class='add'>+			ethaddr_bytes = B44_PATTERN_SIZE - len;</div><div class='add'>+		if (ethaddr_bytes &lt;=0)</div><div class='add'>+			break;</div><div class='add'>+		for (k = 0; k&lt; ethaddr_bytes; k++) {</div><div class='add'>+			ppattern[offset + magicsync +</div><div class='add'>+				(j * ETH_ALEN) + k] = macaddr[k];</div><div class='add'>+			len++;</div><div class='add'>+			set_bit(len, (unsigned long *) pmask);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return len - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup magic packet patterns in the b44 WOL</div><div class='add'>+ * pattern matching filter.</div><div class='add'>+ */</div><div class='add'>+static void b44_setup_pseudo_magicp(struct b44 *bp)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	u32 val;</div><div class='add'>+	int plen0, plen1, plen2;</div><div class='add'>+	u8 *pwol_pattern;</div><div class='add'>+	u8 pwol_mask[B44_PMASK_SIZE];</div><div class='add'>+</div><div class='add'>+	pwol_pattern = kmalloc(B44_PATTERN_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!pwol_pattern) {</div><div class='add'>+		printk(KERN_ERR PFX "Memory not available for WOL\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ipv4 magic packet pattern - pattern 0.*/</div><div class='add'>+	memset(pwol_pattern, 0, B44_PATTERN_SIZE);</div><div class='add'>+	memset(pwol_mask, 0, B44_PMASK_SIZE);</div><div class='add'>+	plen0 = b44_magic_pattern(bp-&gt;dev-&gt;dev_addr, pwol_pattern, pwol_mask,</div><div class='add'>+				  B44_ETHIPV4UDP_HLEN);</div><div class='add'>+</div><div class='add'>+   	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE, B44_PATTERN_BASE);</div><div class='add'>+   	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE, B44_PMASK_BASE);</div><div class='add'>+</div><div class='add'>+	/* Raw ethernet II magic packet pattern - pattern 1 */</div><div class='add'>+	memset(pwol_pattern, 0, B44_PATTERN_SIZE);</div><div class='add'>+	memset(pwol_mask, 0, B44_PMASK_SIZE);</div><div class='add'>+	plen1 = b44_magic_pattern(bp-&gt;dev-&gt;dev_addr, pwol_pattern, pwol_mask,</div><div class='add'>+				  ETH_HLEN);</div><div class='add'>+</div><div class='add'>+   	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,</div><div class='add'>+		       B44_PATTERN_BASE + B44_PATTERN_SIZE);</div><div class='add'>+  	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,</div><div class='add'>+		       B44_PMASK_BASE + B44_PMASK_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Ipv6 magic packet pattern - pattern 2 */</div><div class='add'>+	memset(pwol_pattern, 0, B44_PATTERN_SIZE);</div><div class='add'>+	memset(pwol_mask, 0, B44_PMASK_SIZE);</div><div class='add'>+	plen2 = b44_magic_pattern(bp-&gt;dev-&gt;dev_addr, pwol_pattern, pwol_mask,</div><div class='add'>+				  B44_ETHIPV6UDP_HLEN);</div><div class='add'>+</div><div class='add'>+   	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,</div><div class='add'>+		       B44_PATTERN_BASE + B44_PATTERN_SIZE + B44_PATTERN_SIZE);</div><div class='add'>+  	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,</div><div class='add'>+		       B44_PMASK_BASE + B44_PMASK_SIZE + B44_PMASK_SIZE);</div><div class='add'>+</div><div class='add'>+	kfree(pwol_pattern);</div><div class='add'>+</div><div class='add'>+	/* set these pattern's lengths: one less than each real length */</div><div class='add'>+	val = plen0 | (plen1 &lt;&lt; 8) | (plen2 &lt;&lt; 16) | WKUP_LEN_ENABLE_THREE;</div><div class='add'>+	bw32(bp, B44_WKUP_LEN, val);</div><div class='add'>+</div><div class='add'>+	/* enable wakeup pattern matching */</div><div class='add'>+	val = br32(bp, B44_DEVCTRL);</div><div class='add'>+	bw32(bp, B44_DEVCTRL, val | DEVCTRL_PFE);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b44_setup_wol(struct b44 *bp)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u16 pmval;</div><div class='add'>+</div><div class='add'>+	bw32(bp, B44_RXCONFIG, RXCONFIG_ALLMULTI);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; B44_FLAG_B0_ANDLATER) {</div><div class='add'>+</div><div class='add'>+		bw32(bp, B44_WKUP_LEN, WKUP_LEN_DISABLE);</div><div class='add'>+</div><div class='add'>+		val = bp-&gt;dev-&gt;dev_addr[2] &lt;&lt; 24 |</div><div class='add'>+			bp-&gt;dev-&gt;dev_addr[3] &lt;&lt; 16 |</div><div class='add'>+			bp-&gt;dev-&gt;dev_addr[4] &lt;&lt; 8 |</div><div class='add'>+			bp-&gt;dev-&gt;dev_addr[5];</div><div class='add'>+		bw32(bp, B44_ADDR_LO, val);</div><div class='add'>+</div><div class='add'>+		val = bp-&gt;dev-&gt;dev_addr[0] &lt;&lt; 8 |</div><div class='add'>+			bp-&gt;dev-&gt;dev_addr[1];</div><div class='add'>+		bw32(bp, B44_ADDR_HI, val);</div><div class='add'>+</div><div class='add'>+		val = br32(bp, B44_DEVCTRL);</div><div class='add'>+		bw32(bp, B44_DEVCTRL, val | DEVCTRL_MPM | DEVCTRL_PFE);</div><div class='add'>+</div><div class='add'>+ 	} else {</div><div class='add'>+ 		b44_setup_pseudo_magicp(bp);</div><div class='add'>+ 	}</div><div class='add'>+</div><div class='add'>+	val = br32(bp, B44_SBTMSLOW);</div><div class='add'>+	bw32(bp, B44_SBTMSLOW, val | SBTMSLOW_PE);</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(bp-&gt;pdev, SSB_PMCSR, &amp;pmval);</div><div class='add'>+	pci_write_config_word(bp-&gt;pdev, SSB_PMCSR, pmval | SSB_PE);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int b44_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='hunk'>@@ -1475,6 +1625,11 @@ static int b44_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_poll_enable(dev);</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;flags &amp; B44_FLAG_WOL_ENABLE) {</div><div class='add'>+		b44_init_hw(bp, 0);</div><div class='add'>+		b44_setup_wol(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	b44_free_consistent(bp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1620,8 +1775,6 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EAGAIN;</div><div class='ctx'> 	cmd-&gt;supported = (SUPPORTED_Autoneg);</div><div class='ctx'> 	cmd-&gt;supported |= (SUPPORTED_100baseT_Half |</div><div class='ctx'> 			  SUPPORTED_100baseT_Full |</div><div class='hunk'>@@ -1649,6 +1802,12 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 		XCVR_INTERNAL : XCVR_EXTERNAL;</div><div class='ctx'> 	cmd-&gt;autoneg = (bp-&gt;flags &amp; B44_FLAG_FORCE_LINK) ?</div><div class='ctx'> 		AUTONEG_DISABLE : AUTONEG_ENABLE;</div><div class='add'>+	if (cmd-&gt;autoneg == AUTONEG_ENABLE)</div><div class='add'>+		cmd-&gt;advertising |= ADVERTISED_Autoneg;</div><div class='add'>+	if (!netif_running(dev)){</div><div class='add'>+		cmd-&gt;speed = 0;</div><div class='add'>+		cmd-&gt;duplex = 0xff;</div><div class='add'>+	}</div><div class='ctx'> 	cmd-&gt;maxtxpkt = 0;</div><div class='ctx'> 	cmd-&gt;maxrxpkt = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1658,9 +1817,6 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='ctx'> 	/* We do not support gigabit. */</div><div class='ctx'> 	if (cmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 		if (cmd-&gt;advertising &amp;</div><div class='hunk'>@@ -1677,28 +1833,39 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='del'>-		bp-&gt;flags &amp;= ~B44_FLAG_FORCE_LINK;</div><div class='del'>-		bp-&gt;flags &amp;= ~(B44_FLAG_ADV_10HALF |</div><div class='add'>+		bp-&gt;flags &amp;= ~(B44_FLAG_FORCE_LINK |</div><div class='add'>+			       B44_FLAG_100_BASE_T |</div><div class='add'>+			       B44_FLAG_FULL_DUPLEX |</div><div class='add'>+			       B44_FLAG_ADV_10HALF |</div><div class='ctx'> 			       B44_FLAG_ADV_10FULL |</div><div class='ctx'> 			       B44_FLAG_ADV_100HALF |</div><div class='ctx'> 			       B44_FLAG_ADV_100FULL);</div><div class='del'>-		if (cmd-&gt;advertising &amp; ADVERTISE_10HALF)</div><div class='del'>-			bp-&gt;flags |= B44_FLAG_ADV_10HALF;</div><div class='del'>-		if (cmd-&gt;advertising &amp; ADVERTISE_10FULL)</div><div class='del'>-			bp-&gt;flags |= B44_FLAG_ADV_10FULL;</div><div class='del'>-		if (cmd-&gt;advertising &amp; ADVERTISE_100HALF)</div><div class='del'>-			bp-&gt;flags |= B44_FLAG_ADV_100HALF;</div><div class='del'>-		if (cmd-&gt;advertising &amp; ADVERTISE_100FULL)</div><div class='del'>-			bp-&gt;flags |= B44_FLAG_ADV_100FULL;</div><div class='add'>+		if (cmd-&gt;advertising == 0) {</div><div class='add'>+			bp-&gt;flags |= (B44_FLAG_ADV_10HALF |</div><div class='add'>+				      B44_FLAG_ADV_10FULL |</div><div class='add'>+				      B44_FLAG_ADV_100HALF |</div><div class='add'>+				      B44_FLAG_ADV_100FULL);</div><div class='add'>+		} else {</div><div class='add'>+			if (cmd-&gt;advertising &amp; ADVERTISED_10baseT_Half)</div><div class='add'>+				bp-&gt;flags |= B44_FLAG_ADV_10HALF;</div><div class='add'>+			if (cmd-&gt;advertising &amp; ADVERTISED_10baseT_Full)</div><div class='add'>+				bp-&gt;flags |= B44_FLAG_ADV_10FULL;</div><div class='add'>+			if (cmd-&gt;advertising &amp; ADVERTISED_100baseT_Half)</div><div class='add'>+				bp-&gt;flags |= B44_FLAG_ADV_100HALF;</div><div class='add'>+			if (cmd-&gt;advertising &amp; ADVERTISED_100baseT_Full)</div><div class='add'>+				bp-&gt;flags |= B44_FLAG_ADV_100FULL;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bp-&gt;flags |= B44_FLAG_FORCE_LINK;</div><div class='add'>+		bp-&gt;flags &amp;= ~(B44_FLAG_100_BASE_T | B44_FLAG_FULL_DUPLEX);</div><div class='ctx'> 		if (cmd-&gt;speed == SPEED_100)</div><div class='ctx'> 			bp-&gt;flags |= B44_FLAG_100_BASE_T;</div><div class='ctx'> 		if (cmd-&gt;duplex == DUPLEX_FULL)</div><div class='ctx'> 			bp-&gt;flags |= B44_FLAG_FULL_DUPLEX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	b44_setup_phy(bp);</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		b44_setup_phy(bp);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1734,7 +1901,7 @@ static int b44_set_ringparam(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	b44_halt(bp);</div><div class='ctx'> 	b44_init_rings(bp);</div><div class='del'>-	b44_init_hw(bp);</div><div class='add'>+	b44_init_hw(bp, 1);</div><div class='ctx'> 	netif_wake_queue(bp-&gt;dev);</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1777,7 +1944,7 @@ static int b44_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	if (bp-&gt;flags &amp; B44_FLAG_PAUSE_AUTO) {</div><div class='ctx'> 		b44_halt(bp);</div><div class='ctx'> 		b44_init_rings(bp);</div><div class='del'>-		b44_init_hw(bp);</div><div class='add'>+		b44_init_hw(bp, 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		__b44_set_flow_ctrl(bp, bp-&gt;flags);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1819,12 +1986,40 @@ static void b44_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void b44_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct b44 *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	wol-&gt;supported = WAKE_MAGIC;</div><div class='add'>+	if (bp-&gt;flags &amp; B44_FLAG_WOL_ENABLE)</div><div class='add'>+		wol-&gt;wolopts = WAKE_MAGIC;</div><div class='add'>+	else</div><div class='add'>+		wol-&gt;wolopts = 0;</div><div class='add'>+	memset(&amp;wol-&gt;sopass, 0, sizeof(wol-&gt;sopass));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b44_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct b44 *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='add'>+		bp-&gt;flags |= B44_FLAG_WOL_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		bp-&gt;flags &amp;= ~B44_FLAG_WOL_ENABLE;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ethtool_ops b44_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= b44_get_drvinfo,</div><div class='ctx'> 	.get_settings		= b44_get_settings,</div><div class='ctx'> 	.set_settings		= b44_set_settings,</div><div class='ctx'> 	.nway_reset		= b44_nway_reset,</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_wol		= b44_get_wol,</div><div class='add'>+	.set_wol		= b44_set_wol,</div><div class='ctx'> 	.get_ringparam		= b44_get_ringparam,</div><div class='ctx'> 	.set_ringparam		= b44_set_ringparam,</div><div class='ctx'> 	.get_pauseparam		= b44_get_pauseparam,</div><div class='hunk'>@@ -1903,6 +2098,10 @@ static int __devinit b44_get_invariants(struct b44 *bp)</div><div class='ctx'> 	/* XXX - really required?</div><div class='ctx'> 	   bp-&gt;flags |= B44_FLAG_BUGGY_TXPTR;</div><div class='ctx'>          */</div><div class='add'>+</div><div class='add'>+ 	if (ssb_get_core_rev(bp) &gt;= 7)</div><div class='add'>+ 		bp-&gt;flags |= B44_FLAG_B0_ANDLATER;</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1921,13 +2120,14 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device, "</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot enable PCI device, "</div><div class='ctx'> 		       "aborting.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find proper PCI device "</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Cannot find proper PCI device "</div><div class='ctx'> 		       "base address, aborting.\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out_disable_pdev;</div><div class='hunk'>@@ -1935,8 +2135,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRV_MODULE_NAME);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Cannot obtain PCI resources, aborting.\n");</div><div class='ctx'> 		goto err_out_disable_pdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1944,15 +2144,13 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pci_set_dma_mask(pdev, (u64) B44_DMA_MASK);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "No usable DMA configuration, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration, aborting.\n");</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_set_consistent_dma_mask(pdev, (u64) B44_DMA_MASK);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "No usable DMA configuration, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration, aborting.\n");</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1961,7 +2159,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*bp));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Etherdev alloc failed, aborting.\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1982,8 +2180,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;regs = ioremap(b44reg_base, b44reg_len);</div><div class='ctx'> 	if (bp-&gt;regs == 0UL) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map device registers, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot map device registers, aborting.\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_free_dev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2013,8 +2210,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = b44_get_invariants(bp);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Problem fetching invariants of chip, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Problem fetching invariants of chip, aborting.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2034,8 +2231,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot register net device, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot register net device, aborting.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2103,6 +2299,10 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	if (bp-&gt;flags &amp; B44_FLAG_WOL_ENABLE) {</div><div class='add'>+		b44_init_hw(bp, 0);</div><div class='add'>+		b44_setup_wol(bp);</div><div class='add'>+	}</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2119,13 +2319,13 @@ static int b44_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, b44_interrupt, SA_SHIRQ, dev-&gt;name, dev))</div><div class='add'>+	if (request_irq(dev-&gt;irq, b44_interrupt, IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		printk(KERN_ERR PFX "%s: request_irq failed\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	b44_init_rings(bp);</div><div class='del'>-	b44_init_hw(bp);</div><div class='add'>+	b44_init_hw(bp, 1);</div><div class='ctx'> 	netif_device_attach(bp-&gt;dev);</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/b44.h b/drivers/net/b44.h<br/>index b178662978f3..4944507fad23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/b44.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/b44.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/b44.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/b44.h</a></div><div class='hunk'>@@ -24,6 +24,9 @@</div><div class='ctx'> #define  WKUP_LEN_P3_MASK	0x7f000000 /* Pattern 3 */</div><div class='ctx'> #define  WKUP_LEN_P3_SHIFT	24</div><div class='ctx'> #define  WKUP_LEN_D3		0x80000000</div><div class='add'>+#define  WKUP_LEN_DISABLE	0x80808080</div><div class='add'>+#define  WKUP_LEN_ENABLE_TWO	0x80800000</div><div class='add'>+#define  WKUP_LEN_ENABLE_THREE	0x80000000</div><div class='ctx'> #define B44_ISTAT	0x0020UL /* Interrupt Status */</div><div class='ctx'> #define  ISTAT_LS		0x00000020 /* Link Change (B0 only) */</div><div class='ctx'> #define  ISTAT_PME		0x00000040 /* Power Management Event */</div><div class='hunk'>@@ -264,6 +267,8 @@</div><div class='ctx'> #define  SBIDHIGH_VC_SHIFT	16</div><div class='ctx'> </div><div class='ctx'> /* SSB PCI config space registers.  */</div><div class='add'>+#define SSB_PMCSR		0x44</div><div class='add'>+#define  SSB_PE			0x100</div><div class='ctx'> #define	SSB_BAR0_WIN		0x80</div><div class='ctx'> #define	SSB_BAR1_WIN		0x84</div><div class='ctx'> #define	SSB_SPROM_CONTROL	0x88</div><div class='hunk'>@@ -420,6 +425,7 @@ struct b44 {</div><div class='ctx'> </div><div class='ctx'> 	u32			dma_offset;</div><div class='ctx'> 	u32			flags;</div><div class='add'>+#define B44_FLAG_B0_ANDLATER	0x00000001</div><div class='ctx'> #define B44_FLAG_BUGGY_TXPTR	0x00000002</div><div class='ctx'> #define B44_FLAG_REORDER_BUG	0x00000004</div><div class='ctx'> #define B44_FLAG_PAUSE_AUTO	0x00008000</div><div class='hunk'>@@ -435,6 +441,7 @@ struct b44 {</div><div class='ctx'> #define B44_FLAG_INTERNAL_PHY	0x10000000</div><div class='ctx'> #define B44_FLAG_RX_RING_HACK	0x20000000</div><div class='ctx'> #define B44_FLAG_TX_RING_HACK	0x40000000</div><div class='add'>+#define B44_FLAG_WOL_ENABLE	0x80000000</div><div class='ctx'> </div><div class='ctx'> 	u32			rx_offset;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c<br/>index bbca8ae8018c..6fad83f24c4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bmac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/bmac.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * May 1999, Al Viro: proper release of /proc/net/bmac entry, switched to</div><div class='ctx'>  * dynamic procfs inode.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c<br/>index 54161aef3cac..db73de0d2511 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bnx2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/bnx2.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Written by: Michael Chan  (mchan@broadcom.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -32,6 +31,7 @@</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/page.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='hunk'>@@ -49,14 +49,15 @@</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/zlib.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bnx2.h"</div><div class='ctx'> #include "bnx2_fw.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"bnx2"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"1.4.40"</div><div class='del'>-#define DRV_MODULE_RELDATE	"May 22, 2006"</div><div class='add'>+#define DRV_MODULE_VERSION	"1.4.43"</div><div class='add'>+#define DRV_MODULE_RELDATE	"June 28, 2006"</div><div class='ctx'> </div><div class='ctx'> #define RUN_AT(x) (jiffies + (x))</div><div class='ctx'> </div><div class='hunk'>@@ -1638,7 +1639,7 @@ bnx2_tx_int(struct bnx2 *bp)</div><div class='ctx'> 		skb = tx_buf-&gt;skb;</div><div class='ctx'> #ifdef BCM_TSO </div><div class='ctx'> 		/* partial BD completions possible with TSO packets */</div><div class='del'>-		if (skb_shinfo(skb)-&gt;tso_size) {</div><div class='add'>+		if (skb_is_gso(skb)) {</div><div class='ctx'> 			u16 last_idx, last_ring_idx;</div><div class='ctx'> </div><div class='ctx'> 			last_idx = sw_cons +</div><div class='hunk'>@@ -1674,7 +1675,7 @@ bnx2_tx_int(struct bnx2 *bp)</div><div class='ctx'> </div><div class='ctx'> 		tx_free_bd += last + 1;</div><div class='ctx'> </div><div class='del'>-		dev_kfree_skb_irq(skb);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 		hw_cons = bp-&gt;hw_tx_cons =</div><div class='ctx'> 			sblk-&gt;status_tx_quick_consumer_index0;</div><div class='hunk'>@@ -1820,9 +1821,9 @@ reuse_rx:</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, bp-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		if ((len &gt; (bp-&gt;dev-&gt;mtu + ETH_HLEN)) &amp;&amp;</div><div class='del'>-			(htons(skb-&gt;protocol) != 0x8100)) {</div><div class='add'>+			(ntohs(skb-&gt;protocol) != 0x8100)) {</div><div class='ctx'> </div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='ctx'> 			goto next_rx;</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='hunk'>@@ -2009,7 +2010,7 @@ bnx2_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Called with rtnl_lock from vlan functions and also dev-&gt;xmit_lock</div><div class='add'>+/* Called with rtnl_lock from vlan functions and also netif_tx_lock</div><div class='ctx'>  * from set_multicast.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='hunk'>@@ -2083,6 +2084,92 @@ bnx2_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	spin_unlock_bh(&amp;bp-&gt;phy_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define FW_BUF_SIZE	0x8000</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnx2_gunzip_init(struct bnx2 *bp)</div><div class='add'>+{</div><div class='add'>+	if ((bp-&gt;gunzip_buf = vmalloc(FW_BUF_SIZE)) == NULL)</div><div class='add'>+		goto gunzip_nomem1;</div><div class='add'>+</div><div class='add'>+	if ((bp-&gt;strm = kmalloc(sizeof(*bp-&gt;strm), GFP_KERNEL)) == NULL)</div><div class='add'>+		goto gunzip_nomem2;</div><div class='add'>+</div><div class='add'>+	bp-&gt;strm-&gt;workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL);</div><div class='add'>+	if (bp-&gt;strm-&gt;workspace == NULL)</div><div class='add'>+		goto gunzip_nomem3;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+gunzip_nomem3:</div><div class='add'>+	kfree(bp-&gt;strm);</div><div class='add'>+	bp-&gt;strm = NULL;</div><div class='add'>+</div><div class='add'>+gunzip_nomem2:</div><div class='add'>+	vfree(bp-&gt;gunzip_buf);</div><div class='add'>+	bp-&gt;gunzip_buf = NULL;</div><div class='add'>+</div><div class='add'>+gunzip_nomem1:</div><div class='add'>+	printk(KERN_ERR PFX "%s: Cannot allocate firmware buffer for "</div><div class='add'>+			    "uncompression.\n", bp-&gt;dev-&gt;name);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnx2_gunzip_end(struct bnx2 *bp)</div><div class='add'>+{</div><div class='add'>+	kfree(bp-&gt;strm-&gt;workspace);</div><div class='add'>+</div><div class='add'>+	kfree(bp-&gt;strm);</div><div class='add'>+	bp-&gt;strm = NULL;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;gunzip_buf) {</div><div class='add'>+		vfree(bp-&gt;gunzip_buf);</div><div class='add'>+		bp-&gt;gunzip_buf = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnx2_gunzip(struct bnx2 *bp, u8 *zbuf, int len, void **outbuf, int *outlen)</div><div class='add'>+{</div><div class='add'>+	int n, rc;</div><div class='add'>+</div><div class='add'>+	/* check gzip header */</div><div class='add'>+	if ((zbuf[0] != 0x1f) || (zbuf[1] != 0x8b) || (zbuf[2] != Z_DEFLATED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	n = 10;</div><div class='add'>+</div><div class='add'>+#define FNAME	0x8</div><div class='add'>+	if (zbuf[3] &amp; FNAME)</div><div class='add'>+		while ((zbuf[n++] != 0) &amp;&amp; (n &lt; len));</div><div class='add'>+</div><div class='add'>+	bp-&gt;strm-&gt;next_in = zbuf + n;</div><div class='add'>+	bp-&gt;strm-&gt;avail_in = len - n;</div><div class='add'>+	bp-&gt;strm-&gt;next_out = bp-&gt;gunzip_buf;</div><div class='add'>+	bp-&gt;strm-&gt;avail_out = FW_BUF_SIZE;</div><div class='add'>+</div><div class='add'>+	rc = zlib_inflateInit2(bp-&gt;strm, -MAX_WBITS);</div><div class='add'>+	if (rc != Z_OK)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = zlib_inflate(bp-&gt;strm, Z_FINISH);</div><div class='add'>+</div><div class='add'>+	*outlen = FW_BUF_SIZE - bp-&gt;strm-&gt;avail_out;</div><div class='add'>+	*outbuf = bp-&gt;gunzip_buf;</div><div class='add'>+</div><div class='add'>+	if ((rc != Z_OK) &amp;&amp; (rc != Z_STREAM_END))</div><div class='add'>+		printk(KERN_ERR PFX "%s: Firmware decompression error: %s\n",</div><div class='add'>+		       bp-&gt;dev-&gt;name, bp-&gt;strm-&gt;msg);</div><div class='add'>+</div><div class='add'>+	zlib_inflateEnd(bp-&gt;strm);</div><div class='add'>+</div><div class='add'>+	if (rc == Z_STREAM_END)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> load_rv2p_fw(struct bnx2 *bp, u32 *rv2p_code, u32 rv2p_code_len,</div><div class='ctx'> 	u32 rv2p_proc)</div><div class='hunk'>@@ -2092,9 +2179,9 @@ load_rv2p_fw(struct bnx2 *bp, u32 *rv2p_code, u32 rv2p_code_len,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; rv2p_code_len; i += 8) {</div><div class='del'>-		REG_WR(bp, BNX2_RV2P_INSTR_HIGH, *rv2p_code);</div><div class='add'>+		REG_WR(bp, BNX2_RV2P_INSTR_HIGH, cpu_to_le32(*rv2p_code));</div><div class='ctx'> 		rv2p_code++;</div><div class='del'>-		REG_WR(bp, BNX2_RV2P_INSTR_LOW, *rv2p_code);</div><div class='add'>+		REG_WR(bp, BNX2_RV2P_INSTR_LOW, cpu_to_le32(*rv2p_code));</div><div class='ctx'> 		rv2p_code++;</div><div class='ctx'> </div><div class='ctx'> 		if (rv2p_proc == RV2P_PROC1) {</div><div class='hunk'>@@ -2134,7 +2221,7 @@ load_cpu_fw(struct bnx2 *bp, struct cpu_reg *cpu_reg, struct fw_info *fw)</div><div class='ctx'> 		int j;</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; (fw-&gt;text_len / 4); j++, offset += 4) {</div><div class='del'>-			REG_WR_IND(bp, offset, fw-&gt;text[j]);</div><div class='add'>+			REG_WR_IND(bp, offset, cpu_to_le32(fw-&gt;text[j]));</div><div class='ctx'> 	        }</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2190,15 +2277,32 @@ load_cpu_fw(struct bnx2 *bp, struct cpu_reg *cpu_reg, struct fw_info *fw)</div><div class='ctx'> 	REG_WR_IND(bp, cpu_reg-&gt;mode, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='ctx'> bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct cpu_reg cpu_reg;</div><div class='ctx'> 	struct fw_info fw;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	void *text;</div><div class='add'>+	u32 text_len;</div><div class='add'>+</div><div class='add'>+	if ((rc = bnx2_gunzip_init(bp)) != 0)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the RV2P processor. */</div><div class='del'>-	load_rv2p_fw(bp, bnx2_rv2p_proc1, sizeof(bnx2_rv2p_proc1), RV2P_PROC1);</div><div class='del'>-	load_rv2p_fw(bp, bnx2_rv2p_proc2, sizeof(bnx2_rv2p_proc2), RV2P_PROC2);</div><div class='add'>+	rc = bnx2_gunzip(bp, bnx2_rv2p_proc1, sizeof(bnx2_rv2p_proc1), &amp;text,</div><div class='add'>+			 &amp;text_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_cpu_err;</div><div class='add'>+</div><div class='add'>+	load_rv2p_fw(bp, text, text_len, RV2P_PROC1);</div><div class='add'>+</div><div class='add'>+	rc = bnx2_gunzip(bp, bnx2_rv2p_proc2, sizeof(bnx2_rv2p_proc2), &amp;text,</div><div class='add'>+			 &amp;text_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_cpu_err;</div><div class='add'>+</div><div class='add'>+	load_rv2p_fw(bp, text, text_len, RV2P_PROC2);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the RX Processor. */</div><div class='ctx'> 	cpu_reg.mode = BNX2_RXP_CPU_MODE;</div><div class='hunk'>@@ -2222,7 +2326,13 @@ bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> 	fw.text_addr = bnx2_RXP_b06FwTextAddr;</div><div class='ctx'> 	fw.text_len = bnx2_RXP_b06FwTextLen;</div><div class='ctx'> 	fw.text_index = 0;</div><div class='del'>-	fw.text = bnx2_RXP_b06FwText;</div><div class='add'>+</div><div class='add'>+	rc = bnx2_gunzip(bp, bnx2_RXP_b06FwText, sizeof(bnx2_RXP_b06FwText),</div><div class='add'>+			 &amp;text, &amp;text_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_cpu_err;</div><div class='add'>+</div><div class='add'>+	fw.text = text;</div><div class='ctx'> </div><div class='ctx'> 	fw.data_addr = bnx2_RXP_b06FwDataAddr;</div><div class='ctx'> 	fw.data_len = bnx2_RXP_b06FwDataLen;</div><div class='hunk'>@@ -2268,7 +2378,13 @@ bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> 	fw.text_addr = bnx2_TXP_b06FwTextAddr;</div><div class='ctx'> 	fw.text_len = bnx2_TXP_b06FwTextLen;</div><div class='ctx'> 	fw.text_index = 0;</div><div class='del'>-	fw.text = bnx2_TXP_b06FwText;</div><div class='add'>+</div><div class='add'>+	rc = bnx2_gunzip(bp, bnx2_TXP_b06FwText, sizeof(bnx2_TXP_b06FwText),</div><div class='add'>+			 &amp;text, &amp;text_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_cpu_err;</div><div class='add'>+</div><div class='add'>+	fw.text = text;</div><div class='ctx'> </div><div class='ctx'> 	fw.data_addr = bnx2_TXP_b06FwDataAddr;</div><div class='ctx'> 	fw.data_len = bnx2_TXP_b06FwDataLen;</div><div class='hunk'>@@ -2314,7 +2430,13 @@ bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> 	fw.text_addr = bnx2_TPAT_b06FwTextAddr;</div><div class='ctx'> 	fw.text_len = bnx2_TPAT_b06FwTextLen;</div><div class='ctx'> 	fw.text_index = 0;</div><div class='del'>-	fw.text = bnx2_TPAT_b06FwText;</div><div class='add'>+</div><div class='add'>+	rc = bnx2_gunzip(bp, bnx2_TPAT_b06FwText, sizeof(bnx2_TPAT_b06FwText),</div><div class='add'>+			 &amp;text, &amp;text_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_cpu_err;</div><div class='add'>+</div><div class='add'>+	fw.text = text;</div><div class='ctx'> </div><div class='ctx'> 	fw.data_addr = bnx2_TPAT_b06FwDataAddr;</div><div class='ctx'> 	fw.data_len = bnx2_TPAT_b06FwDataLen;</div><div class='hunk'>@@ -2360,7 +2482,13 @@ bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> 	fw.text_addr = bnx2_COM_b06FwTextAddr;</div><div class='ctx'> 	fw.text_len = bnx2_COM_b06FwTextLen;</div><div class='ctx'> 	fw.text_index = 0;</div><div class='del'>-	fw.text = bnx2_COM_b06FwText;</div><div class='add'>+</div><div class='add'>+	rc = bnx2_gunzip(bp, bnx2_COM_b06FwText, sizeof(bnx2_COM_b06FwText),</div><div class='add'>+			 &amp;text, &amp;text_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_cpu_err;</div><div class='add'>+</div><div class='add'>+	fw.text = text;</div><div class='ctx'> </div><div class='ctx'> 	fw.data_addr = bnx2_COM_b06FwDataAddr;</div><div class='ctx'> 	fw.data_len = bnx2_COM_b06FwDataLen;</div><div class='hunk'>@@ -2384,6 +2512,9 @@ bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> </div><div class='ctx'> 	load_cpu_fw(bp, &amp;cpu_reg, &amp;fw);</div><div class='ctx'> </div><div class='add'>+init_cpu_err:</div><div class='add'>+	bnx2_gunzip_end(bp);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -3256,7 +3387,9 @@ bnx2_init_chip(struct bnx2 *bp)</div><div class='ctx'> 	 * context block must have already been enabled. */</div><div class='ctx'> 	bnx2_init_context(bp);</div><div class='ctx'> </div><div class='del'>-	bnx2_init_cpus(bp);</div><div class='add'>+	if ((rc = bnx2_init_cpus(bp)) != 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	bnx2_init_nvram(bp);</div><div class='ctx'> </div><div class='ctx'> 	bnx2_set_mac_addr(bp);</div><div class='hunk'>@@ -3509,7 +3642,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)</div><div class='ctx'> 				skb_shinfo(skb)-&gt;frags[j].size,</div><div class='ctx'> 				PCI_DMA_TODEVICE);</div><div class='ctx'> 		}</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> 		i += j + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3535,7 +3668,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)</div><div class='ctx'> </div><div class='ctx'> 		rx_buf-&gt;skb = NULL;</div><div class='ctx'> </div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3556,7 +3689,9 @@ bnx2_reset_nic(struct bnx2 *bp, u32 reset_code)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	bnx2_init_chip(bp);</div><div class='add'>+	if ((rc = bnx2_init_chip(bp)) != 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	bnx2_init_tx_ring(bp);</div><div class='ctx'> 	bnx2_init_rx_ring(bp);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3863,7 +3998,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> 	udelay(5);</div><div class='ctx'> </div><div class='ctx'> 	pci_unmap_single(bp-&gt;pdev, map, pkt_size, PCI_DMA_TODEVICE);</div><div class='del'>-	dev_kfree_skb_irq(skb);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;status_blk-&gt;status_tx_quick_consumer_index0 != bp-&gt;tx_prod) {</div><div class='ctx'> 		goto loopback_test_done;</div><div class='hunk'>@@ -4034,6 +4169,8 @@ bnx2_timer(unsigned long data)</div><div class='ctx'> 	msg = (u32) ++bp-&gt;fw_drv_pulse_wr_seq;</div><div class='ctx'> 	REG_WR_IND(bp, bp-&gt;shmem_base + BNX2_DRV_PULSE_MB, msg);</div><div class='ctx'> </div><div class='add'>+	bp-&gt;stats_blk-&gt;stat_FwRxDrop = REG_RD_IND(bp, BNX2_FW_RX_DROP_COUNT);</div><div class='add'>+</div><div class='ctx'> 	if ((bp-&gt;phy_flags &amp; PHY_SERDES_FLAG) &amp;&amp;</div><div class='ctx'> 	    (CHIP_NUM(bp) == CHIP_NUM_5706)) {</div><div class='ctx'> </div><div class='hunk'>@@ -4123,11 +4260,11 @@ bnx2_open(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		else {</div><div class='ctx'> 			rc = request_irq(bp-&gt;pdev-&gt;irq, bnx2_interrupt,</div><div class='del'>-					SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+					IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='del'>-		rc = request_irq(bp-&gt;pdev-&gt;irq, bnx2_interrupt, SA_SHIRQ,</div><div class='add'>+		rc = request_irq(bp-&gt;pdev-&gt;irq, bnx2_interrupt, IRQF_SHARED,</div><div class='ctx'> 				dev-&gt;name, dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -4174,7 +4311,7 @@ bnx2_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 			if (!rc) {</div><div class='ctx'> 				rc = request_irq(bp-&gt;pdev-&gt;irq, bnx2_interrupt,</div><div class='del'>-					SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+					IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				bnx2_free_skbs(bp);</div><div class='hunk'>@@ -4252,7 +4389,7 @@ bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Called with dev-&gt;xmit_lock.</div><div class='add'>+/* Called with netif_tx_lock.</div><div class='ctx'>  * hard_start_xmit is pseudo-lockless - a lock is only required when</div><div class='ctx'>  * the tx queue is full. This way, we get the benefit of lockless</div><div class='ctx'>  * operations most of the time without the complexities to handle</div><div class='hunk'>@@ -4290,7 +4427,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			(TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) &lt;&lt; 16));</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef BCM_TSO </div><div class='del'>-	if ((mss = skb_shinfo(skb)-&gt;tso_size) &amp;&amp;</div><div class='add'>+	if ((mss = skb_shinfo(skb)-&gt;gso_size) &amp;&amp;</div><div class='ctx'> 		(skb-&gt;len &gt; (bp-&gt;dev-&gt;mtu + ETH_HLEN))) {</div><div class='ctx'> 		u32 tcp_opt_len, ip_tcp_len;</div><div class='ctx'> </div><div class='hunk'>@@ -4310,7 +4447,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		ip_tcp_len = (skb-&gt;nh.iph-&gt;ihl &lt;&lt; 2) + sizeof(struct tcphdr);</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;nh.iph-&gt;check = 0;</div><div class='del'>-		skb-&gt;nh.iph-&gt;tot_len = ntohs(mss + ip_tcp_len + tcp_opt_len);</div><div class='add'>+		skb-&gt;nh.iph-&gt;tot_len = htons(mss + ip_tcp_len + tcp_opt_len);</div><div class='ctx'> 		skb-&gt;h.th-&gt;check =</div><div class='ctx'> 			~csum_tcpudp_magic(skb-&gt;nh.iph-&gt;saddr,</div><div class='ctx'> 					    skb-&gt;nh.iph-&gt;daddr,</div><div class='hunk'>@@ -4403,7 +4540,7 @@ bnx2_close(struct net_device *dev)</div><div class='ctx'> 	bnx2_netif_stop(bp);</div><div class='ctx'> 	del_timer_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	if (bp-&gt;flags &amp; NO_WOL_FLAG)</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_UNLOAD;</div><div class='add'>+		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;</div><div class='ctx'> 	else if (bp-&gt;wol)</div><div class='ctx'> 		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -4504,6 +4641,10 @@ bnx2_get_stats(struct net_device *dev)</div><div class='ctx'> 		net_stats-&gt;tx_aborted_errors +</div><div class='ctx'> 		net_stats-&gt;tx_carrier_errors;</div><div class='ctx'> </div><div class='add'>+	net_stats-&gt;rx_missed_errors =</div><div class='add'>+		(unsigned long) (stats_blk-&gt;stat_IfInMBUFDiscards +</div><div class='add'>+		stats_blk-&gt;stat_FwRxDrop);</div><div class='add'>+</div><div class='ctx'> 	return net_stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4986,7 +5127,17 @@ bnx2_set_rx_csum(struct net_device *dev, u32 data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BNX2_NUM_STATS 45</div><div class='add'>+static int</div><div class='add'>+bnx2_set_tso(struct net_device *dev, u32 data)</div><div class='add'>+{</div><div class='add'>+	if (data)</div><div class='add'>+		dev-&gt;features |= NETIF_F_TSO | NETIF_F_TSO_ECN;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;features &amp;= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNX2_NUM_STATS 46</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='ctx'> 	char string[ETH_GSTRING_LEN];</div><div class='hunk'>@@ -5036,6 +5187,7 @@ static struct {</div><div class='ctx'> 	{ "rx_mac_ctrl_frames" },</div><div class='ctx'> 	{ "rx_filtered_packets" },</div><div class='ctx'> 	{ "rx_discards" },</div><div class='add'>+	{ "rx_fw_discards" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define STATS_OFFSET32(offset_name) (offsetof(struct statistics_block, offset_name) / 4)</div><div class='hunk'>@@ -5086,6 +5238,7 @@ static const unsigned long bnx2_stats_offset_arr[BNX2_NUM_STATS] = {</div><div class='ctx'>     STATS_OFFSET32(stat_MacControlFramesReceived),                    </div><div class='ctx'>     STATS_OFFSET32(stat_IfInFramesL2FilterDiscards),                  </div><div class='ctx'>     STATS_OFFSET32(stat_IfInMBUFDiscards),                            </div><div class='add'>+    STATS_OFFSET32(stat_FwRxDrop),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* stat_IfHCInBadOctets and stat_Dot3StatsCarrierSenseErrors are</div><div class='hunk'>@@ -5096,7 +5249,7 @@ static u8 bnx2_5706_stats_len_arr[BNX2_NUM_STATS] = {</div><div class='ctx'> 	4,0,4,4,4,4,4,4,4,4,</div><div class='ctx'> 	4,4,4,4,4,4,4,4,4,4,</div><div class='ctx'> 	4,4,4,4,4,4,4,4,4,4,</div><div class='del'>-	4,4,4,4,4,</div><div class='add'>+	4,4,4,4,4,4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2_5708_stats_len_arr[BNX2_NUM_STATS] = {</div><div class='hunk'>@@ -5104,7 +5257,7 @@ static u8 bnx2_5708_stats_len_arr[BNX2_NUM_STATS] = {</div><div class='ctx'> 	4,4,4,4,4,4,4,4,4,4,</div><div class='ctx'> 	4,4,4,4,4,4,4,4,4,4,</div><div class='ctx'> 	4,4,4,4,4,4,4,4,4,4,</div><div class='del'>-	4,4,4,4,4,</div><div class='add'>+	4,4,4,4,4,4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BNX2_NUM_TESTS 6</div><div class='hunk'>@@ -5301,7 +5454,7 @@ static struct ethtool_ops bnx2_ethtool_ops = {</div><div class='ctx'> 	.set_sg			= ethtool_op_set_sg,</div><div class='ctx'> #ifdef BCM_TSO</div><div class='ctx'> 	.get_tso		= ethtool_op_get_tso,</div><div class='del'>-	.set_tso		= ethtool_op_set_tso,</div><div class='add'>+	.set_tso		= bnx2_set_tso,</div><div class='ctx'> #endif</div><div class='ctx'> 	.self_test_count	= bnx2_self_test_count,</div><div class='ctx'> 	.self_test		= bnx2_self_test,</div><div class='hunk'>@@ -5422,20 +5575,20 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	/* enable device (incl. PCI PM wakeup), and bus-mastering */</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device, aborting.");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot enable PCI device, aborting.");</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find PCI device base address, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Cannot find PCI device base address, aborting.\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = pci_request_regions(pdev, DRV_MODULE_NAME);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot obtain PCI resources, aborting.\n");</div><div class='ctx'> 		goto err_out_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5443,15 +5596,15 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);</div><div class='ctx'> 	if (bp-&gt;pm_cap == 0) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find power management capability, "</div><div class='del'>-			       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Cannot find power management capability, aborting.\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);</div><div class='ctx'> 	if (bp-&gt;pcix_cap == 0) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find PCIX capability, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot find PCIX capability, aborting.\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out_release;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5459,14 +5612,14 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {</div><div class='ctx'> 		bp-&gt;flags |= USING_DAC_FLAG;</div><div class='ctx'> 		if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) != 0) {</div><div class='del'>-			printk(KERN_ERR PFX "pci_set_consistent_dma_mask "</div><div class='del'>-			       "failed, aborting.\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"pci_set_consistent_dma_mask failed, aborting.\n");</div><div class='ctx'> 			rc = -EIO;</div><div class='ctx'> 			goto err_out_release;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) {</div><div class='del'>-		printk(KERN_ERR PFX "System does not support DMA, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "System does not support DMA, aborting.\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out_release;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5486,7 +5639,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	bp-&gt;regview = ioremap_nocache(dev-&gt;base_addr, mem_len);</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;regview) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map register space, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot map register space, aborting.\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_out_release;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5558,8 +5711,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	else if ((CHIP_ID(bp) == CHIP_ID_5706_A1) &amp;&amp;</div><div class='ctx'> 		!(bp-&gt;flags &amp; PCIX_FLAG)) {</div><div class='ctx'> </div><div class='del'>-		printk(KERN_ERR PFX "5706 A1 can only be used in a PCIX bus, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"5706 A1 can only be used in a PCIX bus, aborting.\n");</div><div class='ctx'> 		goto err_out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5580,7 +5733,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if ((reg &amp; BNX2_DEV_INFO_SIGNATURE_MAGIC_MASK) !=</div><div class='ctx'> 	    BNX2_DEV_INFO_SIGNATURE_MAGIC) {</div><div class='del'>-		printk(KERN_ERR PFX "Firmware not running, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Firmware not running, aborting.\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out_unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -5634,7 +5787,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (CHIP_NUM(bp) == CHIP_NUM_5708)</div><div class='add'>+	if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||</div><div class='add'>+	    (CHIP_ID(bp) == CHIP_ID_5708_B0) ||</div><div class='add'>+	    (CHIP_ID(bp) == CHIP_ID_5708_B1))</div><div class='ctx'> 		bp-&gt;flags |= NO_WOL_FLAG;</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_ID(bp) == CHIP_ID_5706_A0) {</div><div class='hunk'>@@ -5740,7 +5895,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if ((rc = register_netdev(dev))) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot register net device\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot register net device\n");</div><div class='ctx'> 		if (bp-&gt;regview)</div><div class='ctx'> 			iounmap(bp-&gt;regview);</div><div class='ctx'> 		pci_release_regions(pdev);</div><div class='hunk'>@@ -5780,7 +5935,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef BCM_TSO</div><div class='del'>-	dev-&gt;features |= NETIF_F_TSO;</div><div class='add'>+	dev-&gt;features |= NETIF_F_TSO | NETIF_F_TSO_ECN;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(bp-&gt;dev);</div><div class='hunk'>@@ -5822,7 +5977,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> 	del_timer_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	if (bp-&gt;flags &amp; NO_WOL_FLAG)</div><div class='del'>-		reset_code = BNX2_DRV_MSG_CODE_UNLOAD;</div><div class='add'>+		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;</div><div class='ctx'> 	else if (bp-&gt;wol)</div><div class='ctx'> 		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;</div><div class='ctx'> 	else</div><div class='head'>diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h<br/>index b87925f6a228..658c5ee95c73 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bnx2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/bnx2.h</a></div><div class='hunk'>@@ -231,6 +231,7 @@ struct statistics_block {</div><div class='ctx'> 	u32 stat_GenStat13;</div><div class='ctx'> 	u32 stat_GenStat14;</div><div class='ctx'> 	u32 stat_GenStat15;</div><div class='add'>+	u32 stat_FwRxDrop;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3481,6 +3482,8 @@ struct l2_fhdr {</div><div class='ctx'> </div><div class='ctx'> #define BNX2_COM_SCRATCH				0x00120000</div><div class='ctx'> </div><div class='add'>+#define BNX2_FW_RX_DROP_COUNT				 0x00120084</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  cp_reg definition</div><div class='hunk'>@@ -3747,7 +3750,12 @@ struct l2_fhdr {</div><div class='ctx'> #define DMA_READ_CHANS	5</div><div class='ctx'> #define DMA_WRITE_CHANS	3</div><div class='ctx'> </div><div class='del'>-#define BCM_PAGE_BITS	12</div><div class='add'>+/* Use CPU native page size up to 16K for the ring sizes.  */</div><div class='add'>+#if (PAGE_SHIFT &gt; 14)</div><div class='add'>+#define BCM_PAGE_BITS	14</div><div class='add'>+#else</div><div class='add'>+#define BCM_PAGE_BITS	PAGE_SHIFT</div><div class='add'>+#endif</div><div class='ctx'> #define BCM_PAGE_SIZE	(1 &lt;&lt; BCM_PAGE_BITS)</div><div class='ctx'> </div><div class='ctx'> #define TX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct tx_bd))</div><div class='hunk'>@@ -3770,7 +3778,7 @@ struct l2_fhdr {</div><div class='ctx'> </div><div class='ctx'> #define RX_RING_IDX(x) ((x) &amp; bp-&gt;rx_max_ring_idx)</div><div class='ctx'> </div><div class='del'>-#define RX_RING(x) (((x) &amp; ~MAX_RX_DESC_CNT) &gt;&gt; 8)</div><div class='add'>+#define RX_RING(x) (((x) &amp; ~MAX_RX_DESC_CNT) &gt;&gt; (BCM_PAGE_BITS - 4))</div><div class='ctx'> #define RX_IDX(x) ((x) &amp; MAX_RX_DESC_CNT)</div><div class='ctx'> </div><div class='ctx'> /* Context size. */</div><div class='hunk'>@@ -4048,6 +4056,9 @@ struct bnx2 {</div><div class='ctx'> 	u32			flash_size;</div><div class='ctx'> </div><div class='ctx'> 	int			status_stats_size;</div><div class='add'>+</div><div class='add'>+	struct z_stream_s	*strm;</div><div class='add'>+	void			*gunzip_buf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset);</div><div class='hunk'>@@ -4163,6 +4174,7 @@ struct fw_info {</div><div class='ctx'> #define BNX2_DRV_MSG_CODE_PULSE			 0x06000000</div><div class='ctx'> #define BNX2_DRV_MSG_CODE_DIAG			 0x07000000</div><div class='ctx'> #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL	 0x09000000</div><div class='add'>+#define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN		 0x0b000000</div><div class='ctx'> </div><div class='ctx'> #define BNX2_DRV_MSG_DATA			 0x00ff0000</div><div class='ctx'> #define BNX2_DRV_MSG_DATA_WAIT0			 0x00010000</div><div class='head'>diff --git a/drivers/net/bnx2_fw.h b/drivers/net/bnx2_fw.h<br/>index 8158974c35a8..2d753dca0d75 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bnx2_fw.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bnx2_fw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bnx2_fw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/bnx2_fw.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * the Free Software Foundation, except as noted below.</div><div class='ctx'>  *</div><div class='ctx'>  * This file contains firmware data derived from proprietary unpublished</div><div class='del'>- * source code, Copyright (c) 2004, 2005 Broadcom Corporation.</div><div class='add'>+ * source code, Copyright (c) 2004, 2005, 2006 Broadcom Corporation.</div><div class='ctx'>  *</div><div class='ctx'>  * Permission is hereby granted for the distribution of this firmware data</div><div class='ctx'>  * in hexadecimal or equivalent format, provided this copyright notice is</div><div class='hunk'>@@ -28,943 +28,641 @@ static const u32 bnx2_COM_b06FwBssAddr = 0x08005860;</div><div class='ctx'> static const int bnx2_COM_b06FwBssLen = 0x88;</div><div class='ctx'> static const u32 bnx2_COM_b06FwSbssAddr = 0x08005840;</div><div class='ctx'> static const int bnx2_COM_b06FwSbssLen = 0x1c;</div><div class='del'>-static u32 bnx2_COM_b06FwText[(0x57bc/4) + 1] = {</div><div class='del'>-	0x0a00022d, 0x00000000, 0x00000000, 0x0000000d, 0x636f6d20, 0x322e352e,</div><div class='del'>-	0x38000000, 0x02050802, 0x00000000, 0x00000003, 0x00000014, 0x00000032,</div><div class='del'>-	0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x000003e8, 0x0000ea60, 0x00000001, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x0000ffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800, 0x24425840,</div><div class='del'>-	0x3c030800, 0x246358e8, 0xac400000, 0x0043202b, 0x1480fffd, 0x24420004,</div><div class='del'>-	0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800, 0x261008b4, 0x3c1c0800,</div><div class='del'>-	0x279c5840, 0x0e0002f7, 0x00000000, 0x0000000d, 0x27bdffe8, 0x3c1a8000,</div><div class='del'>-	0x3c020008, 0x0342d825, 0x3c036010, 0xafbf0010, 0x8c655000, 0x3c020800,</div><div class='del'>-	0x24470f30, 0x3c040800, 0x24865860, 0x2402ff7f, 0x00a22824, 0x34a5380c,</div><div class='del'>-	0xac655000, 0x00002821, 0x24020037, 0x24030c80, 0xaf420008, 0xaf430024,</div><div class='del'>-	0xacc70000, 0x24a50001, 0x2ca20016, 0x1440fffc, 0x24c60004, 0x24845860,</div><div class='del'>-	0x3c020800, 0x24420f3c, 0x3c030800, 0x24630e2c, 0xac820004, 0x3c020800,</div><div class='del'>-	0x24420a2c, 0x3c050800, 0x24a51268, 0xac82000c, 0x3c020800, 0x244243dc,</div><div class='del'>-	0xac830008, 0x3c030800, 0x24633698, 0xac820014, 0x3c020800, 0x24423c24,</div><div class='del'>-	0xac830018, 0xac83001c, 0x3c030800, 0x24630f44, 0xac820024, 0x3c020800,</div><div class='del'>-	0x244243ac, 0xac83002c, 0x3c030800, 0x246343cc, 0xac820030, 0x3c020800,</div><div class='del'>-	0x244242f0, 0xac830034, 0x3c030800, 0x24633d78, 0xac82003c, 0x3c020800,</div><div class='del'>-	0x24420fd4, 0xac850010, 0xac850020, 0xac830040, 0x0e0010b7, 0xac820050,</div><div class='del'>-	0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe0, 0xafb00010, 0x27500100,</div><div class='del'>-	0xafbf0018, 0xafb10014, 0x9203000b, 0x24020003, 0x1462005b, 0x96110008,</div><div class='del'>-	0x32220001, 0x10400009, 0x27430080, 0x8e020000, 0x96040014, 0x000211c2,</div><div class='del'>-	0x00021040, 0x00621821, 0xa4640000, 0x0a0002d0, 0x3c020800, 0x3c020800,</div><div class='del'>-	0x8c430020, 0x1060002a, 0x3c030800, 0x0e00148e, 0x00000000, 0x97420108,</div><div class='del'>-	0x8f850018, 0x9743010c, 0x3042003e, 0x00021400, 0x00621825, 0xaca30000,</div><div class='del'>-	0x8f840018, 0x8f420100, 0xac820004, 0x97430116, 0x9742010e, 0x8f840018,</div><div class='del'>-	0x00031c00, 0x00431025, 0xac820008, 0x97430110, 0x97440112, 0x8f850018,</div><div class='del'>-	0x00031c00, 0x00832025, 0xaca4000c, 0x97420114, 0x8f840018, 0x3042ffff,</div><div class='del'>-	0xac820010, 0x8f830018, 0xac600014, 0x8f820018, 0x3c030800, 0xac400018,</div><div class='del'>-	0x946258ce, 0x8f840018, 0x3c032000, 0x00431025, 0xac82001c, 0x0e0014cc,</div><div class='del'>-	0x24040001, 0x3c030800, 0x8c620040, 0x24420001, 0xac620040, 0x3c020800,</div><div class='del'>-	0x8c430044, 0x32240004, 0x24630001, 0x10800017, 0xac430044, 0x8f4202b8,</div><div class='del'>-	0x04430007, 0x8e020020, 0x3c040800, 0x8c830060, 0x24020001, 0x24630001,</div><div class='del'>-	0x0a0002f2, 0xac830060, 0x3c060800, 0x8cc4005c, 0xaf420280, 0x96030016,</div><div class='del'>-	0x00001021, 0xa7430284, 0x8e050004, 0x24840001, 0x3c031000, 0xaf450288,</div><div class='del'>-	0xaf4302b8, 0x0a0002f2, 0xacc4005c, 0x32220002, 0x0a0002f2, 0x0002102b,</div><div class='del'>-	0x3c026000, 0xac400808, 0x0000000d, 0x00001021, 0x8fbf0018, 0x8fb10014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffc8, 0xafbf0034, 0xafbe0030,</div><div class='del'>-	0xafb7002c, 0xafb60028, 0xafb50024, 0xafb40020, 0xafb3001c, 0xafb20018,</div><div class='del'>-	0xafb10014, 0x0e000244, 0xafb00010, 0x3c170800, 0x3c160800, 0x24110020,</div><div class='del'>-	0x24150030, 0x2794000c, 0x27930008, 0x3c124000, 0x3c1e0800, 0x8f820004,</div><div class='del'>-	0x3c040800, 0x8c830020, 0x10430005, 0x8ee200a4, 0xaf830004, 0x0e001593,</div><div class='del'>-	0x00000000, 0x8ee200a4, 0x8ec300a0, 0x10430004, 0x26c400a0, 0x94820002,</div><div class='del'>-	0xa742009e, 0xaee300a4, 0x8f500000, 0x32020007, 0x1040ffee, 0x32020001,</div><div class='del'>-	0x1040002c, 0x32020002, 0x8f420100, 0xaf420020, 0x8f430104, 0xaf4300a8,</div><div class='del'>-	0x9342010b, 0x93630000, 0x306300ff, 0x10710005, 0x304400ff, 0x10750006,</div><div class='del'>-	0x2c820016, 0x0a000333, 0x00000000, 0xaf940000, 0x0a000334, 0x2c820016,</div><div class='del'>-	0xaf930000, 0x0a000334, 0x00000000, 0xaf800000, 0x14400005, 0x00041880,</div><div class='del'>-	0x0e0003cc, 0x00000000, 0x0a000340, 0x00000000, 0x3c020800, 0x24425860,</div><div class='del'>-	0x00621821, 0x8c620000, 0x0040f809, 0x00000000, 0x10400005, 0x3c030800,</div><div class='del'>-	0x8f420104, 0x3c016020, 0xac220014, 0x3c030800, 0x8c620034, 0xaf520138,</div><div class='del'>-	0x24420001, 0xac620034, 0x32020002, 0x1040001a, 0x32020004, 0x8f420140,</div><div class='del'>-	0xaf420020, 0x93630000, 0x306300ff, 0x10710005, 0x00000000, 0x10750006,</div><div class='del'>-	0x00000000, 0x0a00035d, 0x00000000, 0xaf940000, 0x0a00035e, 0x00000000,</div><div class='del'>-	0xaf930000, 0x0a00035e, 0x00000000, 0xaf800000, 0x0e000c7b, 0x00000000,</div><div class='del'>-	0x3c040800, 0x8c820038, 0xaf520178, 0x24420001, 0xac820038, 0x32020004,</div><div class='del'>-	0x1040ffa4, 0x00000000, 0x8f420180, 0xaf420020, 0x93630000, 0x306300ff,</div><div class='del'>-	0x10710005, 0x00000000, 0x10750006, 0x00000000, 0x0a000378, 0x00000000,</div><div class='del'>-	0xaf940000, 0x0a000379, 0x00000000, 0xaf930000, 0x0a000379, 0x00000000,</div><div class='del'>-	0xaf800000, 0x8f430180, 0x24020f00, 0x14620005, 0x00000000, 0x8f420188,</div><div class='del'>-	0xa742009c, 0x0a000387, 0x8fc2003c, 0x93620000, 0x14510004, 0x8fc2003c,</div><div class='del'>-	0x0e000bad, 0x00000000, 0x8fc2003c, 0xaf5201b8, 0x24420001, 0x0a00030b,</div><div class='del'>-	0xafc2003c, 0x27bdffe8, 0xafbf0010, 0x97420108, 0x24033000, 0x30447000,</div><div class='del'>-	0x10830016, 0x28823001, 0x10400007, 0x24024000, 0x1080000b, 0x24022000,</div><div class='del'>-	0x1082000c, 0x00000000, 0x0a0003b3, 0x00000000, 0x10820010, 0x24025000,</div><div class='del'>-	0x10820012, 0x00000000, 0x0a0003b3, 0x00000000, 0x0000000d, 0x0a0003b5,</div><div class='del'>-	0x00001021, 0x0e000442, 0x00000000, 0x0a0003b6, 0x8fbf0010, 0x0e00041a,</div><div class='del'>-	0x00000000, 0x0a0003b5, 0x00001021, 0x0e000669, 0x00000000, 0x0a0003b5,</div><div class='del'>-	0x00001021, 0x0e001467, 0x00000000, 0x0a0003b5, 0x00001021, 0x0000000d,</div><div class='del'>-	0x00001021, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x93620000, 0x24030020,</div><div class='del'>-	0x304400ff, 0x10830005, 0x24020030, 0x10820007, 0x00000000, 0x0a0003c9,</div><div class='del'>-	0x00000000, 0x2782000c, 0xaf820000, 0x03e00008, 0x00000000, 0x27820008,</div><div class='del'>-	0xaf820000, 0x03e00008, 0x00000000, 0xaf800000, 0x03e00008, 0x00000000,</div><div class='del'>-	0x0000000d, 0x03e00008, 0x00001021, 0x03e00008, 0x00001021, 0x27440100,</div><div class='del'>-	0x94830008, 0x30620004, 0x10400017, 0x30620002, 0x8f4202b8, 0x04430007,</div><div class='del'>-	0x8c820020, 0x3c040800, 0x8c830060, 0x24020001, 0x24630001, 0x03e00008,</div><div class='del'>-	0xac830060, 0xaf420280, 0x94830016, 0x3c060800, 0xa7430284, 0x8c850004,</div><div class='del'>-	0x8cc4005c, 0x00001021, 0x3c031000, 0x24840001, 0xaf450288, 0xaf4302b8,</div><div class='del'>-	0x03e00008, 0xacc4005c, 0x14400003, 0x3c040800, 0x03e00008, 0x00001021,</div><div class='del'>-	0x8c830084, 0x24020001, 0x24630001, 0x03e00008, 0xac830084, 0x27450100,</div><div class='del'>-	0x3c040800, 0x8c820088, 0x94a3000c, 0x24420001, 0x007a1821, 0xac820088,</div><div class='del'>-	0x8ca40018, 0x90664000, 0xaf440038, 0x8ca2001c, 0x2403fff8, 0x00063600,</div><div class='del'>-	0x00431024, 0x34420004, 0x3c030005, 0xaf42003c, 0xaf430030, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0xaf460404, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x3c020006, 0x34420001, 0xaf420030, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x8f420000, 0x30420010, 0x1040fffd, 0x00001021, 0x03e00008, 0x00000000,</div><div class='del'>-	0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100, 0x1060001e,</div><div class='del'>-	0xafbf0014, 0x0e00148e, 0x00000000, 0x8f830018, 0x8e020018, 0xac620000,</div><div class='del'>-	0x8f840018, 0x9602000c, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018,</div><div class='del'>-	0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f840018,</div><div class='del'>-	0x3c026000, 0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x946458ce,</div><div class='del'>-	0x8f850018, 0x00021400, 0x00441025, 0x24040001, 0x0e0014cc, 0xaca2001c,</div><div class='del'>-	0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafb00010,</div><div class='del'>-	0x27500100, 0xafbf0014, 0x92020009, 0x14400003, 0x3c020800, 0x0a00046c,</div><div class='del'>-	0x24020001, 0x8c430020, 0x1060001f, 0x00001021, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f830018, 0x8e020018, 0xac620000, 0x8f840018, 0x9602000c, 0xac820004,</div><div class='del'>-	0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,</div><div class='del'>-	0x8f820018, 0xac400014, 0x8f840018, 0x3c026000, 0x8c434448, 0xac830018,</div><div class='del'>-	0x96020008, 0x3c030800, 0x946458ce, 0x8f850018, 0x00021400, 0x00441025,</div><div class='del'>-	0x24040001, 0x0e0014cc, 0xaca2001c, 0x00001021, 0x8fbf0014, 0x8fb00010,</div><div class='del'>-	0x03e00008, 0x27bd0018, 0x3c0b0800, 0x8d6808b0, 0x3c070800, 0x24e700b0,</div><div class='del'>-	0x00084900, 0x01271821, 0xac640000, 0x93620005, 0x97660008, 0x00e95021,</div><div class='del'>-	0x93630023, 0x9364003f, 0x25080001, 0x00021600, 0x00063400, 0x00461025,</div><div class='del'>-	0x00031a00, 0x00431025, 0x00822025, 0xad440004, 0x9362007e, 0x9366007f,</div><div class='del'>-	0x8f630178, 0x9364007a, 0x00021600, 0x00063400, 0x00461025, 0x00031a00,</div><div class='del'>-	0x00431025, 0x00822025, 0xad440008, 0x93620080, 0x9363007d, 0x3108007f,</div><div class='del'>-	0x01403821, 0xad6808b0, 0x00021600, 0x00031c00, 0x00431025, 0x00451025,</div><div class='del'>-	0x03e00008, 0xace2000c, 0x27bdffb8, 0xafb3002c, 0x00009821, 0xafbe0040,</div><div class='del'>-	0x0000f021, 0xafb50034, 0x27550100, 0xafbf0044, 0xafb7003c, 0xafb60038,</div><div class='del'>-	0xafb40030, 0xafb20028, 0xafb10024, 0xafb00020, 0xafa00010, 0xafa00014,</div><div class='del'>-	0x96a20008, 0x8f540100, 0x8eb10018, 0x30420001, 0x10400037, 0x02a0b821,</div><div class='del'>-	0x8f630054, 0x2622ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d,</div><div class='del'>-	0x00000000, 0x2400015c, 0x0a0004e5, 0x00002021, 0x8f62004c, 0x02221023,</div><div class='del'>-	0x18400028, 0x00002021, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c,</div><div class='del'>-	0x308400ff, 0x24420001, 0x30a500ff, 0x00803821, 0x1485000b, 0xac62008c,</div><div class='del'>-	0x3c040800, 0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001,</div><div class='del'>-	0x00021023, 0x30420005, 0x0a0004e5, 0x34440004, 0x27660100, 0x00041080,</div><div class='del'>-	0x00c21021, 0x8c430000, 0x02231823, 0x04600004, 0x24820001, 0x30440007,</div><div class='del'>-	0x1485fff9, 0x00041080, 0x10870007, 0x3c030800, 0xa3640121, 0x8c620094,</div><div class='del'>-	0x24040005, 0x24420001, 0x0a0004e5, 0xac620094, 0x24040004, 0x00809821,</div><div class='del'>-	0x9362003f, 0x304400ff, 0x38830016, 0x2c630001, 0x38820010, 0x2c420001,</div><div class='del'>-	0x00621825, 0x1460000c, 0x24020001, 0x38830008, 0x2c630001, 0x38820014,</div><div class='del'>-	0x2c420001, 0x00621825, 0x14600005, 0x24020001, 0x24020012, 0x14820002,</div><div class='del'>-	0x00001021, 0x24020001, 0x10400009, 0x00000000, 0x8ea20020, 0x8f630040,</div><div class='del'>-	0x0040b021, 0x00431023, 0x5c400010, 0x8f760040, 0x0a000511, 0x00000000,</div><div class='del'>-	0x9343010b, 0x24020004, 0x1462000a, 0x8eb60020, 0x8f630040, 0x3c021000,</div><div class='del'>-	0x00761823, 0x0043102a, 0x10400004, 0x00000000, 0x0000000d, 0x00000000,</div><div class='del'>-	0x240002fa, 0x9343010b, 0x24020004, 0x5462000b, 0x96a20008, 0x24020001,</div><div class='del'>-	0xafa20010, 0x96a20008, 0x24030001, 0xafa30018, 0x8eb2001c, 0x36730002,</div><div class='del'>-	0x30420020, 0x0a000526, 0xafa20014, 0x36730080, 0x30420002, 0x10400003,</div><div class='del'>-	0xafa00018, 0x0a000526, 0x8eb2001c, 0x8eb20014, 0x2402fffb, 0x02628024,</div><div class='del'>-	0x1200002a, 0x3c030800, 0x8c620030, 0x02021024, 0x10400026, 0x3c020800,</div><div class='del'>-	0x8c430020, 0x10600024, 0x32620004, 0x0e00148e, 0x00000000, 0x8f830018,</div><div class='del'>-	0x8f420100, 0xac620000, 0x8f840018, 0x02401821, 0x32620002, 0xac900004,</div><div class='del'>-	0x8f840018, 0x54400001, 0x02c01821, 0xac830008, 0x8f830018, 0x8ee20020,</div><div class='del'>-	0xac62000c, 0x8f840018, 0x8f620040, 0xac820010, 0x8f830018, 0x8ee20018,</div><div class='del'>-	0xac620014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,</div><div class='del'>-	0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010, 0x00621825, 0x0e0014cc,</div><div class='del'>-	0xaca3001c, 0x32620004, 0x10400063, 0x00003821, 0x3c029000, 0x34420001,</div><div class='del'>-	0x3c038000, 0x02821025, 0xa360007c, 0xaf420020, 0x8f420020, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x93620023, 0x30420080, 0x10400011, 0x00000000,</div><div class='del'>-	0x8f65005c, 0x8f63004c, 0x9764003c, 0x8f620064, 0x00a32823, 0x00852821,</div><div class='del'>-	0x00a2102b, 0x54400006, 0x3c023fff, 0x93620023, 0x3042007f, 0xa3620023,</div><div class='del'>-	0xaf710064, 0x3c023fff, 0x0a000580, 0x3442ffff, 0x8f62005c, 0x02221023,</div><div class='del'>-	0x04400011, 0x00000000, 0x8f65005c, 0x8f630064, 0x9764003c, 0x3c023fff,</div><div class='del'>-	0x3442ffff, 0xaf710064, 0x00a32823, 0x00852821, 0x0045102b, 0x10400004,</div><div class='del'>-	0x02251021, 0x3c053fff, 0x34a5ffff, 0x02251021, 0xaf62005c, 0x24070001,</div><div class='del'>-	0xaf71004c, 0x8f620054, 0x16220005, 0x00000000, 0x93620023, 0x30420040,</div><div class='del'>-	0x10400017, 0x24020001, 0x9762006a, 0x00022880, 0x50a00001, 0x24050001,</div><div class='del'>-	0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804,</div><div class='del'>-	0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b,</div><div class='del'>-	0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021,</div><div class='del'>-	0xaf62000c, 0x93620082, 0x30420080, 0x50400001, 0xa3600081, 0x3c028000,</div><div class='del'>-	0x34420001, 0x02821025, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004,</div><div class='del'>-	0x00000000, 0x0e0013c4, 0x00000000, 0x00403821, 0x54e00001, 0x241e0001,</div><div class='del'>-	0x8f700040, 0x8f620040, 0x14520003, 0x00521023, 0x0a0005bf, 0x00001021,</div><div class='del'>-	0x28420001, 0x10400041, 0x8fa20010, 0x0e000fae, 0x02402021, 0xaf720040,</div><div class='del'>-	0x9362003e, 0x30420001, 0x1440000b, 0x3c029000, 0x93620022, 0x24420001,</div><div class='del'>-	0xa3620022, 0x93630022, 0x3c020800, 0x8c440098, 0x0064182b, 0x14600027,</div><div class='del'>-	0x3c020800, 0x3c029000, 0x34420001, 0x02821025, 0xaf420020, 0x3c038000,</div><div class='del'>-	0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000,</div><div class='del'>-	0x34420001, 0xa362007d, 0x8f640074, 0x34630001, 0x02831825, 0xaf430020,</div><div class='del'>-	0x04810006, 0x3c038000, 0x02802021, 0x0e000470, 0x24050273, 0x0a0005f2,</div><div class='del'>-	0x24050001, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000,</div><div class='del'>-	0xaf5401c0, 0xa34201c4, 0xaf4301f8, 0x24050001, 0x24020001, 0xa7620012,</div><div class='del'>-	0xa3600022, 0x0a0005fe, 0x2ca20001, 0x9743007a, 0x9444002a, 0x00002821,</div><div class='del'>-	0x00641821, 0x3063fffe, 0xa7630012, 0x2ca20001, 0x00021023, 0x03c2f024,</div><div class='del'>-	0x8fa20010, 0x10400004, 0x8fa30014, 0x0e0013c1, 0x00000000, 0x8fa30014,</div><div class='del'>-	0x10600003, 0x00000000, 0x0e0010eb, 0x00000000, 0x13c0001f, 0x3c029000,</div><div class='del'>-	0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074,</div><div class='del'>-	0x34630001, 0x02831825, 0xaf430020, 0x04810006, 0x3c038000, 0x02802021,</div><div class='del'>-	0x0e000470, 0x2405036c, 0x0a00062b, 0x8fa20018, 0x8f4201f8, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x24020002, 0x3c031000, 0xaf5401c0, 0xa34201c4, 0xaf4301f8,</div><div class='del'>-	0x8fa20018, 0x5040002f, 0x96a20008, 0x8f620048, 0x8f630024, 0x00761821,</div><div class='del'>-	0xaf630048, 0x9764003c, 0x00501023, 0x0044102b, 0x10400025, 0x3c029000,</div><div class='del'>-	0x34420001, 0x3c040800, 0x8c830080, 0x8f450100, 0x3c068000, 0x24630001,</div><div class='del'>-	0x00a21025, 0xac830080, 0xaf420020, 0x8f420020, 0x00461024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x9362007d, 0x3c038000, 0x34420004, 0xa362007d, 0x8f640074,</div><div class='del'>-	0x34630001, 0x00a31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00a02021,</div><div class='del'>-	0x0e000470, 0x2405038a, 0x0a00065b, 0x96a20008, 0x8f4201f8, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x24020002, 0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8,</div><div class='del'>-	0x96a20008, 0x8fbf0044, 0x8fbe0040, 0x8fb7003c, 0x8fb60038, 0x8fb50034,</div><div class='del'>-	0x8fb40030, 0x8fb3002c, 0x8fb20028, 0x8fb10024, 0x8fb00020, 0x00021042,</div><div class='del'>-	0x30420001, 0x03e00008, 0x27bd0048, 0x27bdffe0, 0xafbf0018, 0x97420108,</div><div class='del'>-	0x24030019, 0x304400ff, 0x10830065, 0x2882001a, 0x1040001a, 0x2882000a,</div><div class='del'>-	0x1040000f, 0x28820008, 0x10400040, 0x24020001, 0x1082003a, 0x28820002,</div><div class='del'>-	0x50400005, 0x24020006, 0x10800032, 0x3c026000, 0x0a0006fb, 0x00000000,</div><div class='del'>-	0x1082003d, 0x00000000, 0x0a0006fb, 0x00000000, 0x2402000b, 0x10820044,</div><div class='del'>-	0x2882000b, 0x1440004b, 0x2402000e, 0x10820045, 0x00000000, 0x0a0006fb,</div><div class='del'>-	0x00000000, 0x24020020, 0x10820062, 0x28820021, 0x1040000e, 0x2402001c,</div><div class='del'>-	0x1082004c, 0x2882001d, 0x10400005, 0x2402001b, 0x10820043, 0x00000000,</div><div class='del'>-	0x0a0006fb, 0x00000000, 0x2402001f, 0x10820050, 0x00000000, 0x0a0006fb,</div><div class='del'>-	0x00000000, 0x240200c1, 0x10820042, 0x288200c2, 0x10400005, 0x24020080,</div><div class='del'>-	0x10820021, 0x00000000, 0x0a0006fb, 0x00000000, 0x240200c2, 0x1082003d,</div><div class='del'>-	0x240200c9, 0x50820049, 0xafa00010, 0x0a0006fb, 0x00000000, 0x0e001163,</div><div class='del'>-	0xac400808, 0x0a0006fd, 0x8fbf0018, 0x3c026000, 0x8c444448, 0x3c030800,</div><div class='del'>-	0xac640064, 0x0e001163, 0x00000000, 0x3c026000, 0x8c444448, 0x3c030800,</div><div class='del'>-	0x0a0006fc, 0xac640068, 0x8f440100, 0x0e0006ff, 0x00000000, 0x3c026000,</div><div class='del'>-	0x8c444448, 0x3c030800, 0x0a0006fc, 0xac64006c, 0x0e001191, 0x00000000,</div><div class='del'>-	0x0a0006fd, 0x8fbf0018, 0x8f440100, 0x0e0011bb, 0x00000000, 0x0a0006fd,</div><div class='del'>-	0x8fbf0018, 0x0e001202, 0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0000000d,</div><div class='del'>-	0x0a0006fd, 0x8fbf0018, 0x0e000826, 0x00000000, 0x0a0006fd, 0x8fbf0018,</div><div class='del'>-	0x8f440100, 0x0e001264, 0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0e00134e,</div><div class='del'>-	0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0e00087c, 0x27440100, 0x0a0006fd,</div><div class='del'>-	0x8fbf0018, 0x8f640040, 0x0e000fae, 0x00000000, 0x0a0006fd, 0x8fbf0018,</div><div class='del'>-	0x8f440100, 0x0e001059, 0x00000000, 0x0a0006fd, 0x8fbf0018, 0x0e001417,</div><div class='del'>-	0x00000000, 0x0a0006fd, 0x8fbf0018, 0xafa00014, 0x8f440100, 0x8f450118,</div><div class='del'>-	0x8f46011c, 0x0e001439, 0x8f470120, 0x0a0006fd, 0x8fbf0018, 0x0000000d,</div><div class='del'>-	0x8fbf0018, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0010, 0x9742010c,</div><div class='del'>-	0x1440005e, 0x00803821, 0x3c029000, 0x34420001, 0x00e21025, 0xaf420020,</div><div class='del'>-	0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023,</div><div class='del'>-	0x30420010, 0x14400026, 0x3c030800, 0x8f630074, 0x3c027fff, 0x3442ffff,</div><div class='del'>-	0x00621824, 0xaf630074, 0x93620005, 0x34420001, 0xa3620005, 0x8f63004c,</div><div class='del'>-	0x8f620054, 0x10620021, 0x24040001, 0x9762006a, 0x00022880, 0x50a00001,</div><div class='del'>-	0x24050001, 0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821,</div><div class='del'>-	0x00852804, 0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050,</div><div class='del'>-	0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824,</div><div class='del'>-	0x00a21021, 0xaf62000c, 0x0a00073d, 0x24040001, 0x8c6200a8, 0x00002021,</div><div class='del'>-	0x24420001, 0xac6200a8, 0x0000000d, 0x00000000, 0x2400044d, 0x3c028000,</div><div class='del'>-	0x34420001, 0x00e21025, 0xaf420020, 0x1080001f, 0x3c029000, 0x34420001,</div><div class='del'>-	0x00e21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001,</div><div class='del'>-	0x00e31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00e02021, 0x0e000470,</div><div class='del'>-	0x24050455, 0x0a000761, 0x00000000, 0x8f4201f8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020002, 0x3c031000, 0xaf4701c0, 0xa34201c4, 0xaf4301f8, 0x0e001163,</div><div class='del'>-	0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffd8, 0xafbf0024,</div><div class='del'>-	0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014, 0xafb00010, 0x93630005,</div><div class='del'>-	0x00809821, 0x24020030, 0x30630030, 0x146200ac, 0x00a0a021, 0x3c020800,</div><div class='del'>-	0x8c430020, 0x106000a6, 0x00000000, 0x0e00148e, 0x00000000, 0x8f830018,</div><div class='del'>-	0xac730000, 0x936200c4, 0x30420002, 0x10400004, 0x24020001, 0x8f830018,</div><div class='del'>-	0x0a000784, 0x00000000, 0x8f830018, 0x24020003, 0xac620004, 0x8f6200dc,</div><div class='del'>-	0x8f630040, 0x00431023, 0x18400004, 0x00000000, 0x0000000d, 0x00000000,</div><div class='del'>-	0x24000509, 0x8f840018, 0x8f6200dc, 0xac820008, 0x8f830018, 0xac60000c,</div><div class='del'>-	0x8f820018, 0xac400010, 0x8f830018, 0x8f62004c, 0x3c100800, 0xac620014,</div><div class='del'>-	0x8f850018, 0x3c026000, 0x8c434448, 0x261258c0, 0x00002021, 0xaca30018,</div><div class='del'>-	0x9642000e, 0x8f850018, 0x3c034010, 0x00431025, 0x0e0014cc, 0xaca2001c,</div><div class='del'>-	0x8f830018, 0xac730000, 0x9362003e, 0x9363003f, 0x8f840018, 0x00021200,</div><div class='del'>-	0x00621825, 0xac830004, 0x93620081, 0x93630082, 0x8f840018, 0x00021600,</div><div class='del'>-	0x00031c00, 0x00431025, 0xac820008, 0x8f830018, 0x8f620040, 0xac62000c,</div><div class='del'>-	0x8f840018, 0x8f620048, 0xac820010, 0x8f71004c, 0x8f820018, 0xac510014,</div><div class='del'>-	0x8f620050, 0x8f850018, 0x00401821, 0x02221023, 0x5c400001, 0x02201821,</div><div class='del'>-	0x00002021, 0xaca30018, 0x9642000e, 0x8f850018, 0x3c03c00b, 0x00431025,</div><div class='del'>-	0x0e0014cc, 0xaca2001c, 0x8f620054, 0x8f840018, 0x00401821, 0x02221023,</div><div class='del'>-	0x5c400001, 0x02201821, 0xac830000, 0x8f840018, 0x8f630058, 0xac830004,</div><div class='del'>-	0x93620023, 0x30420010, 0x10400004, 0x00000000, 0x8f830018, 0x0a0007dd,</div><div class='del'>-	0x8f620148, 0x8f830018, 0x8f62005c, 0xac620008, 0x8f830018, 0x8f620060,</div><div class='del'>-	0xac62000c, 0x8f840018, 0x8f620064, 0xac820010, 0x97630068, 0x9762006a,</div><div class='del'>-	0x8f840018, 0x00031c00, 0x00431025, 0xac820014, 0x8f850018, 0x00002021,</div><div class='del'>-	0x2402ffff, 0x260358c0, 0xaca20018, 0x9462000e, 0x8f850018, 0x3c03c00c,</div><div class='del'>-	0x00431025, 0x0e0014cc, 0xaca2001c, 0x8f840018, 0x8f630018, 0xac830000,</div><div class='del'>-	0x936200c4, 0x30420002, 0x10400006, 0x00000000, 0x976200c8, 0x8f830018,</div><div class='del'>-	0x3042ffff, 0x0a000803, 0xac620004, 0x8f820018, 0xac400004, 0x8f830018,</div><div class='del'>-	0x8f62006c, 0xac620008, 0x8f840018, 0x8f6200dc, 0xac82000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x93620005, 0x8f830018, 0x00021600, 0x00541025, 0xac620014,</div><div class='del'>-	0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x260258c0, 0xaca30018,</div><div class='del'>-	0x9443000e, 0x8f850018, 0x3c02400d, 0x00621825, 0x0e0014cc, 0xaca3001c,</div><div class='del'>-	0x0e00122e, 0x02602021, 0x8fbf0024, 0x8fb40020, 0x8fb3001c, 0x8fb20018,</div><div class='del'>-	0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0028, 0x27bdffe0, 0xafb00010,</div><div class='del'>-	0x27500100, 0xafbf0018, 0xafb10014, 0x9603000c, 0x240200c1, 0x54620024,</div><div class='del'>-	0x8e040000, 0x3c029000, 0x8f450100, 0x34420001, 0x3c038000, 0x00a21025,</div><div class='del'>-	0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x9362007d,</div><div class='del'>-	0x3c038000, 0x34420004, 0xa362007d, 0x8f640074, 0x34630001, 0x00a31825,</div><div class='del'>-	0xaf430020, 0x04810006, 0x3c038000, 0x00a02021, 0x0e000470, 0x240505b2,</div><div class='del'>-	0x0a000878, 0x8fbf0018, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002,</div><div class='del'>-	0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8, 0x0a000878, 0x8fbf0018,</div><div class='del'>-	0x8f65004c, 0x24060001, 0x0e0012a3, 0x240705be, 0x3c020800, 0x8c430020,</div><div class='del'>-	0x9611000c, 0x1060001d, 0x8e100000, 0x0e00148e, 0x00000000, 0x8f820018,</div><div class='del'>-	0xac500000, 0x8f840018, 0x00111400, 0xac820004, 0x8f830018, 0xac600008,</div><div class='del'>-	0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f840018, 0x240205c1,</div><div class='del'>-	0xac820014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,</div><div class='del'>-	0xaca30018, 0x944358ce, 0x8f850018, 0x3c024019, 0x00621825, 0x0e0014cc,</div><div class='del'>-	0xaca3001c, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,</div><div class='del'>-	0x27bdffb0, 0xafb5003c, 0x0000a821, 0xafbe0048, 0x0000f021, 0xafb70044,</div><div class='del'>-	0x0000b821, 0xafb30034, 0x00009821, 0xafb60040, 0x0080b021, 0xafbf004c,</div><div class='del'>-	0xafb40038, 0xafb20030, 0xafb1002c, 0xafb00028, 0xafa00010, 0x8f620040,</div><div class='del'>-	0x8ec30014, 0x96d1000c, 0x00431023, 0x04410025, 0x8ed40000, 0x32220401,</div><div class='del'>-	0x1040030c, 0x3c029000, 0x34420001, 0x02821025, 0xaf420020, 0x3c038000,</div><div class='del'>-	0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000,</div><div class='del'>-	0x34420004, 0xa362007d, 0x8f640074, 0x34630001, 0x02831825, 0xaf430020,</div><div class='del'>-	0x04810006, 0x3c038000, 0x02802021, 0x0e000470, 0x24050664, 0x0a000ba2,</div><div class='del'>-	0x8fbf004c, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000,</div><div class='del'>-	0xaf5401c0, 0xa34201c4, 0xaf4301f8, 0x0a000ba2, 0x8fbf004c, 0x32220010,</div><div class='del'>-	0x1040006b, 0x00003021, 0x9362003f, 0x92c6000f, 0x304500ff, 0x24c3fff8,</div><div class='del'>-	0x2c62000f, 0x10400057, 0x3c020800, 0x244257c0, 0x00031880, 0x00621821,</div><div class='del'>-	0x8c640000, 0x00800008, 0x00000000, 0x38a20012, 0x0a000924, 0x0002a82b,</div><div class='del'>-	0x2402000e, 0x14a20004, 0x2402000c, 0x24150001, 0x0a000924, 0x24060010,</div><div class='del'>-	0x10a20049, 0x38a30010, 0x2c630001, 0x38a20016, 0x2c420001, 0x00621825,</div><div class='del'>-	0x1460004d, 0x0000a821, 0x24020014, 0x10a2004a, 0x00000000, 0x0000000d,</div><div class='del'>-	0x00000000, 0x2400069c, 0x0a000924, 0x0000a821, 0x24020016, 0x14a20005,</div><div class='del'>-	0x2402000c, 0x24150001, 0x24060010, 0x0a000924, 0x3231fffd, 0x10a20032,</div><div class='del'>-	0x38a30010, 0x2c630001, 0x38a2000e, 0x2c420001, 0x00621825, 0x14600036,</div><div class='del'>-	0x0000a821, 0x24020014, 0x14a20003, 0x24150001, 0x0a000924, 0x24060012,</div><div class='del'>-	0x0000000d, 0x00000000, 0x240006bc, 0x0a000924, 0x0000a821, 0x2402000e,</div><div class='del'>-	0x14a20004, 0x24020016, 0x24150001, 0x0a000924, 0x3231fffb, 0x14a20004,</div><div class='del'>-	0x24020014, 0x24150001, 0x0a000924, 0x3231fffd, 0x54a20013, 0x92c2000e,</div><div class='del'>-	0x24150001, 0x24060012, 0x0a000924, 0x3231fffd, 0x2402000c, 0x54a2000c,</div><div class='del'>-	0x92c2000e, 0x92c3000e, 0x2402000a, 0x10620005, 0x24150001, 0x0000000d,</div><div class='del'>-	0x00000000, 0x240006e8, 0x24150001, 0x0a000924, 0x24060014, 0x92c2000e,</div><div class='del'>-	0x14a20003, 0x00000000, 0x0a000924, 0x24150001, 0x10a6ffc1, 0x24020012,</div><div class='del'>-	0x10a20005, 0x0000a821, 0x0000000d, 0x00000000, 0x24000704, 0x0000a821,</div><div class='del'>-	0x12a00022, 0x32220004, 0x10400002, 0x24020001, 0xafa20010, 0x32230102,</div><div class='del'>-	0x24020002, 0x1462000f, 0x00000000, 0x92c2000a, 0x30420020, 0x1440000b,</div><div class='del'>-	0x00000000, 0x8f630048, 0x8f620040, 0x14620004, 0x00000000, 0x8f620048,</div><div class='del'>-	0x24420001, 0xaf620048, 0x8f620040, 0x24420001, 0xaf620040, 0xa366003f,</div><div class='del'>-	0x38c30012, 0x2c630001, 0x38c20010, 0x2c420001, 0x00621825, 0x10600005,</div><div class='del'>-	0x3c030800, 0x8c620074, 0x24420001, 0x0e00140d, 0xac620074, 0x32220040,</div><div class='del'>-	0x32230020, 0xafa30020, 0x32230080, 0xafa30024, 0x32230001, 0xafa30018,</div><div class='del'>-	0x32230008, 0xafa3001c, 0x32230100, 0x104000c4, 0xafa30014, 0x8ec60010,</div><div class='del'>-	0x8f630054, 0x24c2ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d,</div><div class='del'>-	0x00000000, 0x2400015c, 0x0a000989, 0x00009021, 0x8f62004c, 0x00c21023,</div><div class='del'>-	0x18400028, 0x00009021, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c,</div><div class='del'>-	0x308400ff, 0x24420001, 0x30a500ff, 0x00804021, 0x1485000b, 0xac62008c,</div><div class='del'>-	0x3c040800, 0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001,</div><div class='del'>-	0x00021023, 0x30420005, 0x0a000989, 0x34520004, 0x27670100, 0x00041080,</div><div class='del'>-	0x00e21021, 0x8c430000, 0x00c31823, 0x04600004, 0x24820001, 0x30440007,</div><div class='del'>-	0x1485fff9, 0x00041080, 0x10880007, 0x3c030800, 0xa3640121, 0x8c620094,</div><div class='del'>-	0x24120005, 0x24420001, 0x0a000989, 0xac620094, 0x24120004, 0x32420001,</div><div class='del'>-	0x10400021, 0x3c020800, 0x8c430020, 0x8ed00000, 0x1060001c, 0x8ed30010,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001,</div><div class='del'>-	0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x8f820018, 0xac530014, 0x8f850018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010,</div><div class='del'>-	0x00621825, 0x0e0014cc, 0xaca3001c, 0x24130001, 0x32420004, 0x10400068,</div><div class='del'>-	0x00003821, 0x3c029000, 0x8ec60010, 0x34420001, 0x3c038000, 0x02821025,</div><div class='del'>-	0xa360007c, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0x93620023, 0x30420080, 0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c,</div><div class='del'>-	0x9764003c, 0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b, 0x54400006,</div><div class='del'>-	0x3c023fff, 0x93620023, 0x3042007f, 0xa3620023, 0xaf660064, 0x3c023fff,</div><div class='del'>-	0x0a0009da, 0x3442ffff, 0x8f62005c, 0x00c21023, 0x04400011, 0x00000000,</div><div class='del'>-	0x8f65005c, 0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf660064,</div><div class='del'>-	0x00a32823, 0x00852821, 0x0045102b, 0x10400004, 0x00c51021, 0x3c053fff,</div><div class='del'>-	0x34a5ffff, 0x00c51021, 0xaf62005c, 0x24070001, 0xaf66004c, 0x8fa20010,</div><div class='del'>-	0x10400003, 0x00000000, 0xaf660050, 0xaf660054, 0x8f620054, 0x14c20005,</div><div class='del'>-	0x00000000, 0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a,</div><div class='del'>-	0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800,</div><div class='del'>-	0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021,</div><div class='del'>-	0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074,</div><div class='del'>-	0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x93620082, 0x30420080,</div><div class='del'>-	0x50400001, 0xa3600081, 0x3c028000, 0x34420001, 0x02821025, 0xaf420020,</div><div class='del'>-	0x9363007e, 0x9362007a, 0x10620005, 0x00e0b821, 0x0e0013c4, 0x00000000,</div><div class='del'>-	0x00403821, 0x00e0b821, 0x8fa30020, 0x10600009, 0x8fa20010, 0x8ec20018,</div><div class='del'>-	0xaf620018, 0x8ec3001c, 0xaf63001c, 0x8ec20020, 0x24170001, 0xaf620058,</div><div class='del'>-	0x8fa20010, 0x10400057, 0x8fa30024, 0x93620023, 0x30420040, 0x10400053,</div><div class='del'>-	0x00000000, 0x16600021, 0x3c120800, 0x8e420020, 0x8f70004c, 0x1040001e,</div><div class='del'>-	0x24130001, 0x0e00148e, 0x00000000, 0x8f820018, 0xac540000, 0x8f840018,</div><div class='del'>-	0x24020001, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,</div><div class='del'>-	0x8f830018, 0xac600010, 0x8f820018, 0xac500014, 0x8f850018, 0x3c026000,</div><div class='del'>-	0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,</div><div class='del'>-	0x3c024010, 0x00621825, 0xaca3001c, 0x0e0014cc, 0x24130001, 0x8e420020,</div><div class='del'>-	0x1040001c, 0x8ed00000, 0x0e00148e, 0x00000000, 0x8f820018, 0xac500000,</div><div class='del'>-	0x8f830018, 0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c,</div><div class='del'>-	0x8f820018, 0xac400010, 0x8f830018, 0x24020798, 0xac620014, 0x8f850018,</div><div class='del'>-	0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce,</div><div class='del'>-	0x8f850018, 0x3c024019, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000,</div><div class='del'>-	0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x24020001, 0xaf62000c, 0x93630023, 0x3c028000, 0x34420001,</div><div class='del'>-	0x02821025, 0x306300bf, 0xa3630023, 0xaf420020, 0x8fa30024, 0x10600012,</div><div class='del'>-	0x8fa30018, 0x9362007c, 0x24420001, 0xa362007c, 0x9363007e, 0x9362007a,</div><div class='del'>-	0x1462000b, 0x8fa30018, 0x9362007c, 0x3c030800, 0x8c640024, 0x0044102b,</div><div class='del'>-	0x14400005, 0x8fa30018, 0x0e0013c4, 0x00000000, 0x02e2b825, 0x8fa30018,</div><div class='del'>-	0x3062ffff, 0x10400003, 0x32220200, 0x0a000a94, 0x241e0004, 0x10400003,</div><div class='del'>-	0x00000000, 0x241e0040, 0x24170001, 0x12a000d0, 0x32220002, 0x104000cf,</div><div class='del'>-	0x8fa2001c, 0x92c2000a, 0x30420002, 0x5040003b, 0x92c2000a, 0x93620023,</div><div class='del'>-	0x30420008, 0x54400037, 0x92c2000a, 0x3c020800, 0x8c430020, 0x10600023,</div><div class='del'>-	0x3c029000, 0x0e00148e, 0x00000000, 0x8f840018, 0x8ec30000, 0xac830000,</div><div class='del'>-	0x92c2000a, 0x8f830018, 0x00021600, 0xac620004, 0x8f840018, 0x8f620040,</div><div class='del'>-	0xac820008, 0x8f850018, 0x8f63004c, 0xaca3000c, 0x9362003f, 0x8f840018,</div><div class='del'>-	0x304200ff, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f850018,</div><div class='del'>-	0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,</div><div class='del'>-	0x3c02401a, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000, 0x34420001,</div><div class='del'>-	0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x93630023, 0x3c028000, 0x34420001, 0x02821025, 0x34630008,</div><div class='del'>-	0xa3630023, 0xaf420020, 0x92c2000a, 0x30420020, 0x1040008e, 0x8fa2001c,</div><div class='del'>-	0x93620023, 0x30420001, 0x14400035, 0x3c020800, 0x8c430020, 0x10600023,</div><div class='del'>-	0x3c029000, 0x0e00148e, 0x00000000, 0x8f840018, 0x8ec30000, 0xac830000,</div><div class='del'>-	0x92c2000a, 0x8f830018, 0x00021600, 0xac620004, 0x8f840018, 0x8f620040,</div><div class='del'>-	0xac820008, 0x8f850018, 0x8f63004c, 0xaca3000c, 0x9362003f, 0x8f840018,</div><div class='del'>-	0x304200ff, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f850018,</div><div class='del'>-	0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,</div><div class='del'>-	0x3c02401a, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000, 0x34420001,</div><div class='del'>-	0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x93630023, 0x3c028000, 0x34420001, 0x02821025, 0x34630001,</div><div class='del'>-	0xa3630023, 0xaf420020, 0x93620023, 0x30420040, 0x10400052, 0x8fa2001c,</div><div class='del'>-	0x16600020, 0x3c120800, 0x8e420020, 0x8f70004c, 0x1040003c, 0x3c029000,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac540000, 0x8f840018, 0x24020001,</div><div class='del'>-	0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x8f820018, 0xac500014, 0x8f850018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010,</div><div class='del'>-	0x00621825, 0x0e0014cc, 0xaca3001c, 0x8e420020, 0x1040001e, 0x3c029000,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac540000, 0x8f840018, 0x3c02008d,</div><div class='del'>-	0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x8f840018, 0x240207ee, 0xac820014, 0x8f850018, 0x3c026000,</div><div class='del'>-	0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,</div><div class='del'>-	0x3c024019, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x3c029000, 0x34420001,</div><div class='del'>-	0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x93630023, 0x3c028000, 0x34420001, 0x02821025, 0x306300bf,</div><div class='del'>-	0xa3630023, 0xaf420020, 0x8fa2001c, 0x1040000e, 0x8fa20014, 0x92c2000a,</div><div class='del'>-	0xa3620082, 0x57c00005, 0x37de0008, 0x8fa30014, 0x10600004, 0x00000000,</div><div class='del'>-	0x37de0008, 0x0a000b75, 0x24170001, 0x0e0012cf, 0x02802021, 0x8fa20014,</div><div class='del'>-	0x10400003, 0x00000000, 0x37de0010, 0x24170001, 0x12e00020, 0x3c029000,</div><div class='del'>-	0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x03c21025, 0xa362007d,</div><div class='del'>-	0x8f640074, 0x34630001, 0x02831825, 0xaf430020, 0x04810006, 0x3c038000,</div><div class='del'>-	0x02802021, 0x0e000470, 0x2405082a, 0x0a000b9b, 0x00000000, 0x8f4201f8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf5401c0, 0xa34201c4,</div><div class='del'>-	0xaf4301f8, 0x9363003f, 0x24020012, 0x14620004, 0x8fbf004c, 0x0e00140d,</div><div class='del'>-	0x00000000, 0x8fbf004c, 0x8fbe0048, 0x8fb70044, 0x8fb60040, 0x8fb5003c,</div><div class='del'>-	0x8fb40038, 0x8fb30034, 0x8fb20030, 0x8fb1002c, 0x8fb00028, 0x03e00008,</div><div class='del'>-	0x27bd0050, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x8f500180, 0x97420184,</div><div class='del'>-	0x30420200, 0x14400015, 0x00000000, 0x8f430188, 0x3c02ff00, 0x00621824,</div><div class='del'>-	0x3c020200, 0x10620031, 0x0043102b, 0x14400007, 0x3c020300, 0x1060000b,</div><div class='del'>-	0x3c020100, 0x1062000d, 0x00000000, 0x0a000c2c, 0x00000000, 0x10620027,</div><div class='del'>-	0x3c020400, 0x1062003e, 0x02002021, 0x0a000c2c, 0x00000000, 0x0e000c31,</div><div class='del'>-	0x02002021, 0x0a000c2e, 0x8fbf0014, 0x93620005, 0x30420020, 0x1440005e,</div><div class='del'>-	0x8fbf0014, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020, 0x3c038000,</div><div class='del'>-	0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c038000,</div><div class='del'>-	0x34630001, 0x02031825, 0x34420020, 0xa3620005, 0xaf430020, 0x93620005,</div><div class='del'>-	0x30420020, 0x14400003, 0x02002021, 0x0000000d, 0x02002021, 0x0e000766,</div><div class='del'>-	0x24055854, 0x0a000c2e, 0x8fbf0014, 0x93620005, 0x30420001, 0x1040003f,</div><div class='del'>-	0x3c029000, 0x34420001, 0x02021025, 0xaf420020, 0x3c038000, 0x8f420020,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x93620023, 0x34420004, 0xa3620023,</div><div class='del'>-	0x93630005, 0x3c048000, 0x3c020800, 0x306300fe, 0xa3630005, 0x8c430020,</div><div class='del'>-	0x34840001, 0x02042025, 0x0a000c0a, 0xaf440020, 0x00002821, 0x00003021,</div><div class='del'>-	0x0e000fb1, 0x240708d9, 0x3c020800, 0x8c430020, 0x10600023, 0x8fbf0014,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac500000, 0x93630082, 0x9362003f,</div><div class='del'>-	0x8f840018, 0x00031a00, 0x00431025, 0xac820004, 0x8f830018, 0xac600008,</div><div class='del'>-	0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac400014,</div><div class='del'>-	0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,</div><div class='del'>-	0x944358ce, 0x8f850018, 0x3c02400a, 0x00621825, 0x0e0014cc, 0xaca3001c,</div><div class='del'>-	0x0a000c2e, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010, 0x03e00008,</div><div class='del'>-	0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x8f420188, 0x00803021, 0x93640000,</div><div class='del'>-	0x24030020, 0x00021402, 0x10830008, 0x304500ff, 0x3c036018, 0x8c625000,</div><div class='del'>-	0x34420400, 0xac625000, 0x0000000d, 0x00000000, 0x24000955, 0x9363003f,</div><div class='del'>-	0x24020012, 0x14620023, 0x3c029000, 0x34420001, 0x3c038000, 0x00c21025,</div><div class='del'>-	0xaf650178, 0xa365007a, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001,</div><div class='del'>-	0x00c31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00c02021, 0x0e000470,</div><div class='del'>-	0x24050963, 0x0a000c79, 0x8fbf0010, 0x8f4201f8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020002, 0x3c031000, 0xaf4601c0, 0xa34201c4, 0xaf4301f8, 0x0a000c79,</div><div class='del'>-	0x8fbf0010, 0x9362007e, 0x1445000e, 0x00000000, 0x8f620178, 0x1045000b,</div><div class='del'>-	0x00000000, 0x8f820000, 0xaf650178, 0x8f660178, 0x8f440180, 0x8f65004c,</div><div class='del'>-	0x8c430000, 0x0060f809, 0x30c600ff, 0x0a000c79, 0x8fbf0010, 0xaf650178,</div><div class='del'>-	0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x93630000,</div><div class='del'>-	0x24020020, 0x10620005, 0x00000000, 0x93630000, 0x24020030, 0x1462004d,</div><div class='del'>-	0x8fbf0010, 0x93420148, 0x2444ffff, 0x2c830005, 0x10600047, 0x3c020800,</div><div class='del'>-	0x24425800, 0x00041880, 0x00621821, 0x8c640000, 0x00800008, 0x00000000,</div><div class='del'>-	0x8f430144, 0x8f62000c, 0x14620006, 0x24020001, 0xaf62000c, 0x0e000d59,</div><div class='del'>-	0x00000000, 0x0a000cd1, 0x8fbf0010, 0x8f62000c, 0x0a000cca, 0x00000000,</div><div class='del'>-	0x97630010, 0x8f420144, 0x14430006, 0x24020001, 0xa7620010, 0x0e00137a,</div><div class='del'>-	0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620010, 0x0a000cca, 0x00000000,</div><div class='del'>-	0x97630012, 0x8f420144, 0x14430006, 0x24020001, 0xa7620012, 0x0e001395,</div><div class='del'>-	0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620012, 0x0a000cca, 0x00000000,</div><div class='del'>-	0x97630014, 0x8f420144, 0x14430006, 0x24020001, 0xa7620014, 0x0e0013bb,</div><div class='del'>-	0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620014, 0x0a000cca, 0x00000000,</div><div class='del'>-	0x97630016, 0x8f420144, 0x14430006, 0x24020001, 0xa7620016, 0x0e0013be,</div><div class='del'>-	0x00000000, 0x0a000cd1, 0x8fbf0010, 0x97620016, 0x14400006, 0x8fbf0010,</div><div class='del'>-	0x3c030800, 0x8c620070, 0x24420001, 0xac620070, 0x8fbf0010, 0x03e00008,</div><div class='del'>-	0x27bd0018, 0x27bdffe0, 0x3c029000, 0xafbf001c, 0xafb20018, 0xafb10014,</div><div class='del'>-	0xafb00010, 0x8f500140, 0x34420001, 0x3c038000, 0x02021025, 0xaf420020,</div><div class='del'>-	0x8f420020, 0x00431024, 0x1440fffd, 0x24020012, 0x24030080, 0xa362003f,</div><div class='del'>-	0xa3630082, 0x93620023, 0x30420040, 0x10400007, 0x00008821, 0x93620023,</div><div class='del'>-	0x24110001, 0x304200bf, 0xa3620023, 0x0a000cf0, 0x3c028000, 0x3c028000,</div><div class='del'>-	0x34420001, 0x3c039000, 0x34630001, 0x3c048000, 0x02021025, 0x02031825,</div><div class='del'>-	0xaf420020, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0x9362007d, 0x3c038000, 0x34420020, 0xa362007d, 0x8f640074, 0x34630001,</div><div class='del'>-	0x02031825, 0xaf430020, 0x04810006, 0x3c038000, 0x02002021, 0x0e000470,</div><div class='del'>-	0x24050a63, 0x0a000d13, 0x00000000, 0x8f4201f8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020002, 0x3c031000, 0xaf5001c0, 0xa34201c4, 0xaf4301f8, 0x1220003f,</div><div class='del'>-	0x3c120800, 0x8e420020, 0x8f71004c, 0x1040003c, 0x8fbf001c, 0x0e00148e,</div><div class='del'>-	0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001, 0xac820004,</div><div class='del'>-	0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,</div><div class='del'>-	0x8f820018, 0xac510014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,</div><div class='del'>-	0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024010, 0x00621825,</div><div class='del'>-	0x0e0014cc, 0xaca3001c, 0x8e420020, 0x1040001e, 0x8fbf001c, 0x0e00148e,</div><div class='del'>-	0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x3c02008d, 0xac820004,</div><div class='del'>-	0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,</div><div class='del'>-	0x8f840018, 0x24020a6a, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c024019,</div><div class='del'>-	0x00621825, 0x0e0014cc, 0xaca3001c, 0x8fbf001c, 0x8fb20018, 0x8fb10014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0010, 0x93620081,</div><div class='del'>-	0x3c030800, 0x8c640048, 0x0044102b, 0x14400005, 0x00000000, 0x0e000cd3,</div><div class='del'>-	0x00000000, 0x0a000da4, 0x8fbf0010, 0x93620081, 0x24420001, 0x0e0013c4,</div><div class='del'>-	0xa3620081, 0x9763006a, 0x00032880, 0x14a00002, 0x00403821, 0x24050001,</div><div class='del'>-	0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804,</div><div class='del'>-	0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b,</div><div class='del'>-	0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021,</div><div class='del'>-	0xaf62000c, 0x10e00021, 0x3c029000, 0x8f450140, 0x34420001, 0x3c038000,</div><div class='del'>-	0x00a21025, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0x9362007d, 0x3c038000, 0x34420004, 0xa362007d, 0x8f640074, 0x34630001,</div><div class='del'>-	0x00a31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00a02021, 0x0e000470,</div><div class='del'>-	0x24050a92, 0x0a000da4, 0x8fbf0010, 0x8f4201f8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020002, 0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8, 0x8fbf0010,</div><div class='del'>-	0x03e00008, 0x27bd0018, 0x27bdffd8, 0xafb3001c, 0x27530100, 0xafbf0024,</div><div class='del'>-	0xafb40020, 0xafb20018, 0xafb10014, 0xafb00010, 0x96620008, 0x3c140800,</div><div class='del'>-	0x8f520100, 0x30420001, 0x104000da, 0x00000000, 0x8e700018, 0x8f630054,</div><div class='del'>-	0x2602ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d, 0x00000000,</div><div class='del'>-	0x2400015c, 0x0a000dea, 0x00008821, 0x8f62004c, 0x02021023, 0x18400028,</div><div class='del'>-	0x00008821, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c, 0x308400ff,</div><div class='del'>-	0x24420001, 0x30a500ff, 0x00803821, 0x1485000b, 0xac62008c, 0x3c040800,</div><div class='del'>-	0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001, 0x00021023,</div><div class='del'>-	0x30420005, 0x0a000dea, 0x34510004, 0x27660100, 0x00041080, 0x00c21021,</div><div class='del'>-	0x8c430000, 0x02031823, 0x04600004, 0x24820001, 0x30440007, 0x1485fff9,</div><div class='del'>-	0x00041080, 0x10870007, 0x3c030800, 0xa3640121, 0x8c620094, 0x24110005,</div><div class='del'>-	0x24420001, 0x0a000dea, 0xac620094, 0x24110004, 0x32220001, 0x1040001e,</div><div class='del'>-	0x8e820020, 0x1040001d, 0x32220004, 0x0e00148e, 0x00000000, 0x8f820018,</div><div class='del'>-	0xac520000, 0x8f840018, 0x24020001, 0xac820004, 0x8f830018, 0xac600008,</div><div class='del'>-	0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac500014,</div><div class='del'>-	0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,</div><div class='del'>-	0x944358ce, 0x8f850018, 0x3c024010, 0x00621825, 0x0e0014cc, 0xaca3001c,</div><div class='del'>-	0x32220004, 0x10400081, 0x00003821, 0x3c029000, 0x34420001, 0x3c038000,</div><div class='del'>-	0x02421025, 0xa360007c, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x93620023, 0x30420080, 0x10400011, 0x00000000, 0x8f65005c,</div><div class='del'>-	0x8f63004c, 0x9764003c, 0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b,</div><div class='del'>-	0x54400006, 0x3c023fff, 0x93620023, 0x3042007f, 0xa3620023, 0xaf700064,</div><div class='del'>-	0x3c023fff, 0x0a000e37, 0x3442ffff, 0x8f62005c, 0x02021023, 0x04400011,</div><div class='del'>-	0x00000000, 0x8f65005c, 0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff,</div><div class='del'>-	0xaf700064, 0x00a32823, 0x00852821, 0x0045102b, 0x10400004, 0x02051021,</div><div class='del'>-	0x3c053fff, 0x34a5ffff, 0x02051021, 0xaf62005c, 0x24070001, 0xaf70004c,</div><div class='del'>-	0x8f620054, 0x16020005, 0x00000000, 0x93620023, 0x30420040, 0x10400017,</div><div class='del'>-	0x24020001, 0x9762006a, 0x00022880, 0x50a00001, 0x24050001, 0x97630068,</div><div class='del'>-	0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b,</div><div class='del'>-	0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001,</div><div class='del'>-	0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c,</div><div class='del'>-	0x93620082, 0x30420080, 0x50400001, 0xa3600081, 0x3c028000, 0x34420001,</div><div class='del'>-	0x02421025, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004, 0x00000000,</div><div class='del'>-	0x0e0013c4, 0x00000000, 0x00403821, 0x10e0001f, 0x3c029000, 0x34420001,</div><div class='del'>-	0x02421025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001,</div><div class='del'>-	0x02431825, 0xaf430020, 0x04810006, 0x3c038000, 0x02402021, 0x0e000470,</div><div class='del'>-	0x24050b3d, 0x0a000e8d, 0x00000000, 0x8f4201f8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020002, 0x3c031000, 0xaf5201c0, 0xa34201c4, 0xaf4301f8, 0x9342010b,</div><div class='del'>-	0x9343010b, 0x8e820020, 0x27500100, 0x38630006, 0x10400029, 0x2c710001,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,</div><div class='del'>-	0x96020008, 0xac820004, 0x8f830018, 0x8e020014, 0xac620008, 0x8f850018,</div><div class='del'>-	0x3c026000, 0x8c434448, 0xaca3000c, 0x8f840018, 0x96020012, 0xac820010,</div><div class='del'>-	0x8f850018, 0x8e030020, 0xaca30014, 0x9602000c, 0x9603000e, 0x8f840018,</div><div class='del'>-	0x00021400, 0x00431025, 0xac820018, 0x12200005, 0x3c020800, 0x944358ce,</div><div class='del'>-	0x8f840018, 0x0a000eb8, 0x3c024013, 0x944358ce, 0x8f840018, 0x3c024014,</div><div class='del'>-	0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001, 0x8e700014, 0x8f620040,</div><div class='del'>-	0x14500003, 0x00501023, 0x0a000ec3, 0x00001021, 0x28420001, 0x1040003a,</div><div class='del'>-	0x00000000, 0x0e000fae, 0x02002021, 0xaf700040, 0x9362003e, 0x30420001,</div><div class='del'>-	0x1440000b, 0x3c029000, 0x93620022, 0x24420001, 0xa3620022, 0x93630022,</div><div class='del'>-	0x3c020800, 0x8c440098, 0x0064182b, 0x14600025, 0x3c020800, 0x3c029000,</div><div class='del'>-	0x34420001, 0x02421025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x34420001, 0xa362007d,</div><div class='del'>-	0x8f640074, 0x34630001, 0x02431825, 0xaf430020, 0x04810006, 0x3c038000,</div><div class='del'>-	0x02402021, 0x0e000470, 0x24050273, 0x0a000ef6, 0x24020001, 0x8f4201f8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf5201c0, 0xa34201c4,</div><div class='del'>-	0xaf4301f8, 0x24020001, 0xa7620012, 0x0a000efe, 0xa3600022, 0x9743007a,</div><div class='del'>-	0x9444002a, 0x00641821, 0x3063fffe, 0xa7630012, 0x97420108, 0x8fbf0024,</div><div class='del'>-	0x8fb40020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x00021042,</div><div class='del'>-	0x30420001, 0x03e00008, 0x27bd0028, 0x27bdffe0, 0xafb20018, 0x3c120800,</div><div class='del'>-	0x8e420020, 0xafb00010, 0x27500100, 0xafbf001c, 0x10400046, 0xafb10014,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f840018, 0x8e020000, 0xac820000, 0x936300b1,</div><div class='del'>-	0x936200c5, 0x8f850018, 0x00031e00, 0x00021400, 0x34420100, 0x00621825,</div><div class='del'>-	0xaca30004, 0x8f840018, 0x8e02001c, 0xac820008, 0x8f830018, 0x8f620048,</div><div class='del'>-	0xac62000c, 0x8f840018, 0x96020012, 0xac820010, 0x8f830018, 0x8f620040,</div><div class='del'>-	0x24040001, 0xac620014, 0x8f850018, 0x3c026000, 0x8c434448, 0x3c020800,</div><div class='del'>-	0x245158c0, 0xaca30018, 0x9623000e, 0x8f850018, 0x3c024016, 0x00621825,</div><div class='del'>-	0x0e0014cc, 0xaca3001c, 0x96030008, 0x30630010, 0x1060001c, 0x8e420020,</div><div class='del'>-	0x1040001a, 0x8e100000, 0x0e00148e, 0x00000000, 0x8f820018, 0xac500000,</div><div class='del'>-	0x8f830018, 0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c,</div><div class='del'>-	0x8f820018, 0xac400010, 0x8f830018, 0xac600014, 0x8f850018, 0x3c036000,</div><div class='del'>-	0x8c634448, 0x24040001, 0xaca30018, 0x9622000e, 0x8f850018, 0x3c034015,</div><div class='del'>-	0x00431025, 0x0e0014cc, 0xaca2001c, 0x00001021, 0x8fbf001c, 0x8fb20018,</div><div class='del'>-	0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe0, 0xafb20018,</div><div class='del'>-	0x3c120800, 0x8e420020, 0xafb00010, 0x27500100, 0xafbf001c, 0x10400041,</div><div class='del'>-	0xafb10014, 0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000,</div><div class='del'>-	0x8f840018, 0x24020100, 0xac820004, 0x8f830018, 0x8e02001c, 0xac620008,</div><div class='del'>-	0x8f840018, 0x8e020018, 0xac82000c, 0x8f830018, 0x96020012, 0xac620010,</div><div class='del'>-	0x8f840018, 0x96020008, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x24040001, 0x3c020800, 0x245158c0, 0xaca30018, 0x9623000e, 0x8f850018,</div><div class='del'>-	0x3c024017, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x96030008, 0x30630010,</div><div class='del'>-	0x1060001c, 0x8e420020, 0x1040001a, 0x8e100000, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f820018, 0xac500000, 0x8f830018, 0xac600004, 0x8f820018, 0xac400008,</div><div class='del'>-	0x8f830018, 0xac60000c, 0x8f820018, 0xac400010, 0x8f830018, 0xac600014,</div><div class='del'>-	0x8f850018, 0x3c036000, 0x8c634448, 0x24040001, 0xaca30018, 0x9622000e,</div><div class='del'>-	0x8f850018, 0x3c034015, 0x00431025, 0x0e0014cc, 0xaca2001c, 0x00001021,</div><div class='del'>-	0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,</div><div class='del'>-	0x27bdfff0, 0x03e00008, 0x27bd0010, 0x27bdffd0, 0xafb10014, 0x00808821,</div><div class='del'>-	0xafb40020, 0x00c0a021, 0xafbf0028, 0xafb50024, 0xafb3001c, 0xafb20018,</div><div class='del'>-	0xafb00010, 0x93620023, 0x00e0a821, 0x30420040, 0x1040003e, 0x30b3ffff,</div><div class='del'>-	0x3c120800, 0x8e420020, 0x1040003a, 0x8f70004c, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f820018, 0xac510000, 0x8f840018, 0x24020001, 0xac820004, 0x8f830018,</div><div class='del'>-	0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,</div><div class='del'>-	0x24040001, 0xac500014, 0x8f850018, 0x3c026000, 0x8c434448, 0x3c020800,</div><div class='del'>-	0x245058c0, 0xaca30018, 0x9603000e, 0x8f850018, 0x3c024010, 0x00621825,</div><div class='del'>-	0x0e0014cc, 0xaca3001c, 0x8e430020, 0x1060001b, 0x00000000, 0x0e00148e,</div><div class='del'>-	0x00000000, 0x8f820018, 0xac510000, 0x8f840018, 0x3c02008d, 0xac820004,</div><div class='del'>-	0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,</div><div class='del'>-	0x8f820018, 0xac550014, 0x8f850018, 0x3c036000, 0x8c634448, 0x24040001,</div><div class='del'>-	0xaca30018, 0x9602000e, 0x8f850018, 0x3c034019, 0x00431025, 0x0e0014cc,</div><div class='del'>-	0xaca2001c, 0x93620023, 0x30420020, 0x14400003, 0x3c120800, 0x1280003f,</div><div class='del'>-	0x3c029000, 0x8e420020, 0x8f70004c, 0x1040003b, 0x3c029000, 0x0e00148e,</div><div class='del'>-	0x00000000, 0x8f820018, 0xac510000, 0x8f840018, 0x24020001, 0xac820004,</div><div class='del'>-	0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,</div><div class='del'>-	0x8f820018, 0x24040001, 0xac500014, 0x8f850018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x3c020800, 0x245058c0, 0xaca30018, 0x9603000e, 0x8f850018, 0x3c024010,</div><div class='del'>-	0x00621825, 0x0e0014cc, 0xaca3001c, 0x8e430020, 0x1060001c, 0x3c029000,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac510000, 0x8f840018, 0x00131400,</div><div class='del'>-	0xac820004, 0x8f830018, 0xac750008, 0x8f820018, 0xac40000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x8f820018, 0xac400014, 0x8f850018, 0x3c036000, 0x8c634448,</div><div class='del'>-	0x24040001, 0xaca30018, 0x9602000e, 0x8f850018, 0x3c03401b, 0x00431025,</div><div class='del'>-	0x0e0014cc, 0xaca2001c, 0x3c029000, 0x34420001, 0x02221025, 0xaf420020,</div><div class='del'>-	0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93630023,</div><div class='del'>-	0x3c028000, 0x34420001, 0x02221025, 0x8fbf0028, 0x8fb50024, 0x8fb40020,</div><div class='del'>-	0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x3063009f, 0xa3630023,</div><div class='del'>-	0xaf420020, 0x03e00008, 0x27bd0030, 0x27bdffe0, 0xafb10014, 0x27510100,</div><div class='del'>-	0x3c029000, 0x34420001, 0xafb00010, 0x00808021, 0x02021025, 0x3c038000,</div><div class='del'>-	0xafbf0018, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0xa7600008, 0x8f63005c, 0x3c028000, 0x34420001, 0xaf630148, 0x8f640050,</div><div class='del'>-	0x02021025, 0x3c039000, 0xaf64017c, 0xaf420020, 0x8f450100, 0x34630001,</div><div class='del'>-	0x3c048000, 0x00a31825, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x9362007d, 0x3c038000, 0x34420001, 0xa362007d, 0x8f640074,</div><div class='del'>-	0x34630001, 0x00a31825, 0xaf430020, 0x04810006, 0x3c038000, 0x00a02021,</div><div class='del'>-	0x0e000470, 0x24050de5, 0x0a001093, 0x3c020800, 0x8f4201f8, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x24020002, 0x3c031000, 0xaf4501c0, 0xa34201c4, 0xaf4301f8,</div><div class='del'>-	0x3c020800, 0x8c430020, 0x1060001e, 0x8fbf0018, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f830018, 0xac700000, 0x9622000c, 0x8f840018, 0x00021400, 0xac820004,</div><div class='del'>-	0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,</div><div class='del'>-	0x8f820018, 0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,</div><div class='del'>-	0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c02401f, 0x00621825,</div><div class='del'>-	0x0e0014cc, 0xaca3001c, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008,</div><div class='del'>-	0x27bd0020, 0x3c020800, 0x24424c3c, 0xaf82000c, 0x03e00008, 0x00000000,</div><div class='del'>-	0x27bdffe8, 0xafb00010, 0x27500100, 0xafbf0014, 0x8e02001c, 0x14400003,</div><div class='del'>-	0x3c020800, 0x0000000d, 0x3c020800, 0x8c430020, 0x10600020, 0x00001021,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,</div><div class='del'>-	0x8e02001c, 0xac820004, 0x8f830018, 0xac600008, 0x8f840018, 0x8e020018,</div><div class='del'>-	0xac82000c, 0x8f850018, 0x96020012, 0xaca20010, 0x8f830018, 0x3c026000,</div><div class='del'>-	0xac600014, 0x8f840018, 0x8c434448, 0x3c020800, 0xac830018, 0x944358ce,</div><div class='del'>-	0x8f840018, 0x3c024012, 0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001,</div><div class='del'>-	0x00001021, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800,</div><div class='del'>-	0x97430078, 0x9444002e, 0x00001021, 0x00641821, 0x3063fffe, 0x03e00008,</div><div class='del'>-	0xa7630010, 0x27bdfff0, 0x00001021, 0x03e00008, 0x27bd0010, 0x8f420100,</div><div class='del'>-	0x34420001, 0xaf4200a4, 0x03e00008, 0x00001021, 0x27bdffe0, 0xafbf0018,</div><div class='del'>-	0xafb10014, 0xafb00010, 0x9362007e, 0x30d000ff, 0x16020031, 0x00808821,</div><div class='del'>-	0x8f620178, 0x1602002e, 0x00000000, 0x9362007f, 0x1602002b, 0x00000000,</div><div class='del'>-	0x9362007a, 0x16020004, 0x00000000, 0x0000000d, 0x00000000, 0x240009d2,</div><div class='del'>-	0x0e0013e6, 0x00000000, 0x3c039000, 0x34630001, 0x3c048000, 0x02231825,</div><div class='del'>-	0xa370007a, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0x9362007d, 0x3c038000, 0xa362007d, 0x8f640074, 0x34630001, 0x02231825,</div><div class='del'>-	0xaf430020, 0x04810006, 0x3c038000, 0x02202021, 0x0e000470, 0x240509dd,</div><div class='del'>-	0x0a001138, 0x8fbf0018, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002,</div><div class='del'>-	0x3c031000, 0xaf5101c0, 0xa34201c4, 0xaf4301f8, 0x0a001138, 0x8fbf0018,</div><div class='del'>-	0x0000000d, 0x00000000, 0x240009e2, 0x8fbf0018, 0x8fb10014, 0x8fb00010,</div><div class='del'>-	0x03e00008, 0x27bd0020, 0x27bdffe8, 0x30a500ff, 0x3c029000, 0x34420001,</div><div class='del'>-	0x00803821, 0x00e21025, 0x3c038000, 0xafbf0010, 0xaf420020, 0x8f420020,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x00a21025,</div><div class='del'>-	0xa362007d, 0x8f640074, 0x34630001, 0x00e31825, 0xaf430020, 0x04810006,</div><div class='del'>-	0x3c038000, 0x00e02021, 0x0e000470, 0x00c02821, 0x0a001161, 0x8fbf0010,</div><div class='del'>-	0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4701c0,</div><div class='del'>-	0xa34201c4, 0xaf4301f8, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800,</div><div class='del'>-	0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100, 0x10600024, 0xafbf0014,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,</div><div class='del'>-	0x8e020004, 0xac820004, 0x8f830018, 0x8e020018, 0xac620008, 0x8f840018,</div><div class='del'>-	0x8e03001c, 0xac83000c, 0x9602000c, 0x9203000a, 0x8f840018, 0x00021400,</div><div class='del'>-	0x00431025, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018,</div><div class='del'>-	0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x946458ce, 0x8f850018,</div><div class='del'>-	0x00021400, 0x00441025, 0x24040001, 0x0e0014cc, 0xaca2001c, 0x8fbf0014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe8,</div><div class='del'>-	0xafb00010, 0x27500100, 0x10600020, 0xafbf0014, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f820018, 0xac400000, 0x8f830018, 0xac600004, 0x8f820018, 0xac400008,</div><div class='del'>-	0x8f830018, 0xac60000c, 0x9602000c, 0x9603000e, 0x8f840018, 0x00021400,</div><div class='del'>-	0x00431025, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018,</div><div class='del'>-	0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x946458ce, 0x8f850018,</div><div class='del'>-	0x00021400, 0x00441025, 0x24040001, 0x0e0014cc, 0xaca2001c, 0x8fbf0014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafb00010, 0x27500100,</div><div class='del'>-	0xafbf0014, 0x9602000c, 0x10400024, 0x00802821, 0x3c020800, 0x8c430020,</div><div class='del'>-	0x1060003a, 0x8fbf0014, 0x0e00148e, 0x00000000, 0x8f840018, 0x8e030000,</div><div class='del'>-	0xac830000, 0x9602000c, 0x8f840018, 0x00021400, 0xac820004, 0x8f830018,</div><div class='del'>-	0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,</div><div class='del'>-	0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,</div><div class='del'>-	0xaca30018, 0x944358ce, 0x8f850018, 0x3c02400b, 0x00621825, 0x0e0014cc,</div><div class='del'>-	0xaca3001c, 0x0a0011ff, 0x8fbf0014, 0x93620005, 0x30420010, 0x14400015,</div><div class='del'>-	0x3c029000, 0x34420001, 0x00a21025, 0xaf420020, 0x3c038000, 0x8f420020,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x93620005, 0x34630001,</div><div class='del'>-	0x00a02021, 0x00a31825, 0x24055852, 0x34420010, 0xa3620005, 0x0e000766,</div><div class='del'>-	0xaf430020, 0x0a0011ff, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010,</div><div class='del'>-	0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010,</div><div class='del'>-	0x27500100, 0x10600022, 0xafbf0014, 0x0e00148e, 0x00000000, 0x8f840018,</div><div class='del'>-	0x8e020004, 0xac820000, 0x9603000c, 0x9762002c, 0x8f840018, 0x00031c00,</div><div class='del'>-	0x00431025, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,</div><div class='del'>-	0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f850018, 0x3c026000,</div><div class='del'>-	0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018,</div><div class='del'>-	0x3c02400e, 0x00621825, 0x0e0014cc, 0xaca3001c, 0x0e00122e, 0x8e040000,</div><div class='del'>-	0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c038000, 0x8f420278,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf440240, 0xa3420244,</div><div class='del'>-	0x03e00008, 0xaf430278, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb10014,</div><div class='del'>-	0x00808821, 0xafb20018, 0x00c09021, 0xafb00010, 0x30b0ffff, 0x1060001c,</div><div class='del'>-	0xafbf001c, 0x0e00148e, 0x00000000, 0x8f820018, 0xac510000, 0x8f840018,</div><div class='del'>-	0x00101400, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,</div><div class='del'>-	0x8f830018, 0xac600010, 0x8f820018, 0xac520014, 0x8f840018, 0x3c026000,</div><div class='del'>-	0x8c434448, 0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c024019,</div><div class='del'>-	0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf001c, 0x8fb20018,</div><div class='del'>-	0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0x27450100,</div><div class='del'>-	0xafbf0010, 0x94a3000c, 0x240200c1, 0x14620031, 0x00803021, 0x3c029000,</div><div class='del'>-	0x34420001, 0x00c21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x3c028000, 0x34420001, 0x3c049000, 0x34840001, 0x3c058000,</div><div class='del'>-	0x24030012, 0x00c21025, 0x00c42025, 0xa363003f, 0xaf420020, 0xaf440020,</div><div class='del'>-	0x8f420020, 0x00451024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000,</div><div class='del'>-	0x34420020, 0xa362007d, 0x8f640074, 0x34630001, 0x00c31825, 0xaf430020,</div><div class='del'>-	0x04810006, 0x3c038000, 0x00c02021, 0x0e000470, 0x24050906, 0x0a0012a1,</div><div class='del'>-	0x8fbf0010, 0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000,</div><div class='del'>-	0xaf4601c0, 0xa34201c4, 0xaf4301f8, 0x0a0012a1, 0x8fbf0010, 0x00c02021,</div><div class='del'>-	0x94a5000c, 0x24060001, 0x0e000fb1, 0x2407090e, 0x8fbf0010, 0x03e00008,</div><div class='del'>-	0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb00010, 0x00808021,</div><div class='del'>-	0xafb20018, 0x00a09021, 0xafb10014, 0x30d100ff, 0x1060001c, 0xafbf001c,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001,</div><div class='del'>-	0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x8f820018, 0xac520014, 0x8f840018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c024010, 0x00621825,</div><div class='del'>-	0xac83001c, 0x0e0014cc, 0x02202021, 0x8fbf001c, 0x8fb20018, 0x8fb10014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0014, 0xafb00010,</div><div class='del'>-	0x93620005, 0x30420001, 0x10400036, 0x00808021, 0x3c029000, 0x34420001,</div><div class='del'>-	0x02021025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x93620023, 0x34420004, 0xa3620023, 0x93630005, 0x3c048000,</div><div class='del'>-	0x3c020800, 0x306300fe, 0xa3630005, 0x8c430020, 0x34840001, 0x02042025,</div><div class='del'>-	0xaf440020, 0x10600020, 0x8fbf0014, 0x0e00148e, 0x00000000, 0x8f820018,</div><div class='del'>-	0xac500000, 0x93630082, 0x9362003f, 0x8f840018, 0x00031a00, 0x00431025,</div><div class='del'>-	0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018,</div><div class='del'>-	0xac600010, 0x8f820018, 0xac400014, 0x8f840018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c02400a, 0x00621825,</div><div class='del'>-	0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf0014, 0x8fb00010, 0x03e00008,</div><div class='del'>-	0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb10014, 0x00808821,</div><div class='del'>-	0xafb20018, 0x00a09021, 0xafb00010, 0x30d000ff, 0x1060002f, 0xafbf001c,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac510000, 0x8f830018, 0xac700004,</div><div class='del'>-	0x8f820018, 0xac520008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,</div><div class='del'>-	0x9763006a, 0x00032880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081,</div><div class='del'>-	0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001,</div><div class='del'>-	0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021,</div><div class='del'>-	0x8f830018, 0x2402fffe, 0x00822824, 0x3c026000, 0xac650014, 0x8f840018,</div><div class='del'>-	0x8c434448, 0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c024011,</div><div class='del'>-	0x00621825, 0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf001c, 0x8fb20018,</div><div class='del'>-	0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0014,</div><div class='del'>-	0xafb00010, 0x8f440100, 0x27500100, 0x8f650050, 0x0e0010fc, 0x9206001b,</div><div class='del'>-	0x3c020800, 0x8c430020, 0x1060001d, 0x8e100018, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f840018, 0x8f420100, 0xac820000, 0x8f830018, 0xac700004, 0x8f840018,</div><div class='del'>-	0x8f620050, 0xac820008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,</div><div class='del'>-	0x8f830018, 0x3c026000, 0xac600014, 0x8f850018, 0x8c434448, 0x24040001,</div><div class='del'>-	0x3c020800, 0xaca30018, 0x944358ce, 0x8f850018, 0x3c02401c, 0x00621825,</div><div class='del'>-	0x0e0014cc, 0xaca3001c, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018,</div><div class='del'>-	0x8f430238, 0x3c020800, 0x04610013, 0x8c44009c, 0x2406fffe, 0x3c050800,</div><div class='del'>-	0x3c038000, 0x2484ffff, 0x14800009, 0x00000000, 0x97420078, 0x8ca3007c,</div><div class='del'>-	0x24420001, 0x00461024, 0x24630001, 0xa7620010, 0x03e00008, 0xaca3007c,</div><div class='del'>-	0x8f420238, 0x00431024, 0x1440fff3, 0x2484ffff, 0x8f420140, 0x3c031000,</div><div class='del'>-	0xaf420200, 0x03e00008, 0xaf430238, 0x27bdffe8, 0x3c029000, 0xafbf0010,</div><div class='del'>-	0x8f450140, 0x34420001, 0x3c038000, 0x00a21025, 0xaf420020, 0x8f420020,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x9362007d, 0x3c038000, 0x34420001,</div><div class='del'>-	0xa362007d, 0x8f640074, 0x34630001, 0x00a31825, 0xaf430020, 0x04810006,</div><div class='del'>-	0x3c038000, 0x00a02021, 0x0e000470, 0x24050ac7, 0x0a0013b9, 0x8fbf0010,</div><div class='del'>-	0x8f4201f8, 0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4501c0,</div><div class='del'>-	0xa34201c4, 0xaf4301f8, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x0000000d,</div><div class='del'>-	0x03e00008, 0x00000000, 0x0000000d, 0x03e00008, 0x00000000, 0x24020001,</div><div class='del'>-	0x03e00008, 0xa7620010, 0x9362003f, 0x304400ff, 0x3883000e, 0x2c630001,</div><div class='del'>-	0x38820010, 0x2c420001, 0x00621825, 0x14600003, 0x24020012, 0x14820003,</div><div class='del'>-	0x00000000, 0x03e00008, 0x00001021, 0x9363007e, 0x9362007a, 0x14620006,</div><div class='del'>-	0x00000000, 0x9363007e, 0x24020001, 0x24630001, 0x03e00008, 0xa363007e,</div><div class='del'>-	0x9362007e, 0x8f630178, 0x304200ff, 0x14430006, 0x00000000, 0x9363000b,</div><div class='del'>-	0x24020001, 0x24630001, 0x03e00008, 0xa363000b, 0x03e00008, 0x00001021,</div><div class='del'>-	0x9362000b, 0x10400023, 0x00001021, 0xa360000b, 0x9362003f, 0x304400ff,</div><div class='del'>-	0x3883000e, 0x2c630001, 0x38820010, 0x2c420001, 0x00621825, 0x14600017,</div><div class='del'>-	0x00001821, 0x24020012, 0x10820014, 0x00000000, 0x9363007e, 0x9362007a,</div><div class='del'>-	0x14620007, 0x00000000, 0x9362007e, 0x24030001, 0x24420001, 0xa362007e,</div><div class='del'>-	0x03e00008, 0x00601021, 0x9362007e, 0x8f630178, 0x304200ff, 0x14430005,</div><div class='del'>-	0x00001821, 0x9362000b, 0x24030001, 0x24420001, 0xa362000b, 0x03e00008,</div><div class='del'>-	0x00601021, 0x03e00008, 0x00000000, 0x24040001, 0xaf64000c, 0x8f6300dc,</div><div class='del'>-	0x8f6200cc, 0x50620001, 0xa7640010, 0xa7640012, 0xa7640014, 0x03e00008,</div><div class='del'>-	0xa7640016, 0x3c020800, 0x8c430020, 0x27bdffe8, 0x1060001b, 0xafbf0010,</div><div class='del'>-	0x0e00148e, 0x00000000, 0x8f820018, 0xac400000, 0x8f830018, 0xac600004,</div><div class='del'>-	0x8f820018, 0xac400008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,</div><div class='del'>-	0x8f830018, 0x3c026000, 0xac600014, 0x8f840018, 0x8c434448, 0x3c020800,</div><div class='del'>-	0xac830018, 0x944358ce, 0x8f840018, 0x3c024020, 0x00621825, 0xac83001c,</div><div class='del'>-	0x0e0014cc, 0x24040001, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800,</div><div class='del'>-	0x8c430020, 0x27bdffe0, 0xafb00010, 0x00a08021, 0xafb10014, 0x00c08821,</div><div class='del'>-	0xafb20018, 0x00e09021, 0x1060001e, 0xafbf001c, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f840018, 0x8f420100, 0xac820000, 0x8f830018, 0xac700004, 0x8f820018,</div><div class='del'>-	0xac510008, 0x8f830018, 0xac72000c, 0x8f840018, 0x8fa20030, 0xac820010,</div><div class='del'>-	0x8f830018, 0x8fa20034, 0xac620014, 0x8f840018, 0x3c026000, 0x8c434448,</div><div class='del'>-	0x3c020800, 0xac830018, 0x944358ce, 0x8f840018, 0x3c0240c9, 0x00621825,</div><div class='del'>-	0xac83001c, 0x0e0014cc, 0x24040001, 0x8fbf001c, 0x8fb20018, 0x8fb10014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0020, 0x3c020800, 0x8c430020, 0x27bdffe8,</div><div class='del'>-	0xafb00010, 0x27500100, 0x1060001d, 0xafbf0014, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x8f830018, 0x8e020004, 0xac620000, 0x8f840018, 0x8e020018, 0xac820004,</div><div class='del'>-	0x8f850018, 0x8e020000, 0xaca20008, 0x8f830018, 0xac60000c, 0x8f820018,</div><div class='del'>-	0xac400010, 0x8f830018, 0xac600014, 0x8f820018, 0xac400018, 0x96030008,</div><div class='del'>-	0x3c020800, 0x944458ce, 0x8f850018, 0x00031c00, 0x00641825, 0x24040001,</div><div class='del'>-	0x0e0014cc, 0xaca3001c, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018,</div><div class='del'>-	0x3c060800, 0x24c558c0, 0x3c02000a, 0x03421821, 0x94640006, 0x94a2000a,</div><div class='del'>-	0x00441023, 0x00021400, 0x00021c03, 0x04610006, 0xa4a40006, 0x0000000d,</div><div class='del'>-	0x00000000, 0x2400005a, 0x0a0014a3, 0x24020001, 0x8f820014, 0x0062102b,</div><div class='del'>-	0x14400002, 0x00001021, 0x24020001, 0x304200ff, 0x1040001c, 0x274a0400,</div><div class='del'>-	0x3c07000a, 0x3c020800, 0x244558c0, 0x94a9000a, 0x8f880014, 0x03471021,</div><div class='del'>-	0x94430006, 0x00402021, 0xa4a30006, 0x94820006, 0xa4a20006, 0x01221023,</div><div class='del'>-	0x00021400, 0x00021403, 0x04410006, 0x0048102b, 0x0000000d, 0x00000000,</div><div class='del'>-	0x2400005a, 0x0a0014be, 0x24020001, 0x14400002, 0x00001021, 0x24020001,</div><div class='del'>-	0x304200ff, 0x1440ffec, 0x03471021, 0x24c458c0, 0x8c820010, 0xaf420038,</div><div class='del'>-	0x8c830014, 0x3c020005, 0xaf43003c, 0xaf420030, 0xaf800010, 0xaf8a0018,</div><div class='del'>-	0x03e00008, 0x00000000, 0x27bdffe0, 0x8f820010, 0x8f850018, 0x3c070800,</div><div class='del'>-	0x24e858c0, 0xafbf001c, 0xafb20018, 0xafb10014, 0xafb00010, 0x9503000a,</div><div class='del'>-	0x8d060014, 0x00009021, 0x309000ff, 0x00e08821, 0x24420001, 0x24a50020,</div><div class='del'>-	0x24630001, 0xaf820010, 0xaf850018, 0xa503000a, 0x24c30020, 0x3c028000,</div><div class='del'>-	0x04c10007, 0xad030014, 0x00621024, 0x14400005, 0x262258c0, 0x8d020010,</div><div class='del'>-	0x24420001, 0xad020010, 0x262258c0, 0x9444000a, 0x94450018, 0x0010102b,</div><div class='del'>-	0x00a41826, 0x2c630001, 0x00621825, 0x1060001c, 0x3c030006, 0x8f820010,</div><div class='del'>-	0x24120001, 0x00021140, 0x00431025, 0xaf420030, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x27450400, 0x8f420000, 0x30420010, 0x1040fffd, 0x262258c0,</div><div class='del'>-	0x9444000a, 0x94430018, 0xaf800010, 0xaf850018, 0x14830012, 0x262758c0,</div><div class='del'>-	0x0e00155a, 0x00000000, 0x1600000e, 0x262758c0, 0x0e00148e, 0x00000000,</div><div class='del'>-	0x0a001517, 0x262758c0, 0x00041c00, 0x00031c03, 0x00051400, 0x00021403,</div><div class='del'>-	0x00621823, 0x18600002, 0x3c026000, 0xac400808, 0x262758c0, 0x94e2000e,</div><div class='del'>-	0x94e3000c, 0x24420001, 0xa4e2000e, 0x3042ffff, 0x50430001, 0xa4e0000e,</div><div class='del'>-	0x12000005, 0x3c02000a, 0x94e2000a, 0xa74200a2, 0x0a001554, 0x02401021,</div><div class='del'>-	0x03421821, 0x94640006, 0x94e2000a, 0x00441023, 0x00021400, 0x00021c03,</div><div class='del'>-	0x04610006, 0xa4e40006, 0x0000000d, 0x00000000, 0x2400005a, 0x0a001536,</div><div class='del'>-	0x24020001, 0x8f820014, 0x0062102b, 0x14400002, 0x00001021, 0x24020001,</div><div class='del'>-	0x304200ff, 0x1040001b, 0x3c020800, 0x3c06000a, 0x244558c0, 0x94a8000a,</div><div class='del'>-	0x8f870014, 0x03461021, 0x94430006, 0x00402021, 0xa4a30006, 0x94820006,</div><div class='del'>-	0xa4a20006, 0x01021023, 0x00021400, 0x00021403, 0x04410006, 0x0047102b,</div><div class='del'>-	0x0000000d, 0x00000000, 0x2400005a, 0x0a001550, 0x24020001, 0x14400002,</div><div class='del'>-	0x00001021, 0x24020001, 0x304200ff, 0x1440ffec, 0x03461021, 0x02401021,</div><div class='del'>-	0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,</div><div class='del'>-	0x3c020800, 0x244558c0, 0x94a3001a, 0x8ca40024, 0x00403021, 0x000318c0,</div><div class='del'>-	0x00832021, 0xaf44003c, 0x8ca20020, 0xaf420038, 0x3c020050, 0x34420008,</div><div class='del'>-	0xaf420030, 0x00000000, 0x00000000, 0x00000000, 0x8f420000, 0x30420020,</div><div class='del'>-	0x1040fffd, 0x00000000, 0x8f430400, 0x24c658c0, 0xacc30010, 0x8f420404,</div><div class='del'>-	0x3c030020, 0xacc20014, 0xaf430030, 0x94c40018, 0x94c3001c, 0x94c2001a,</div><div class='del'>-	0x94c5001e, 0x00832021, 0x24420001, 0xa4c2001a, 0x3042ffff, 0x14450002,</div><div class='del'>-	0xa4c40018, 0xa4c0001a, 0x03e00008, 0x00000000, 0x8f820010, 0x3c030006,</div><div class='del'>-	0x00021140, 0x00431025, 0xaf420030, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x27430400, 0x8f420000, 0x30420010, 0x1040fffd, 0x00000000, 0xaf800010,</div><div class='del'>-	0xaf830018, 0x03e00008, 0x00000000, 0x27bdffe8, 0xafb00010, 0x3c100800,</div><div class='del'>-	0x261058c0, 0x3c05000a, 0x02002021, 0x03452821, 0xafbf0014, 0x0e0015b0,</div><div class='del'>-	0x2406000a, 0x96020002, 0x9603001e, 0x3042000f, 0x24420003, 0x00431804,</div><div class='del'>-	0x24027fff, 0x0043102b, 0xaf830014, 0x10400004, 0x00000000, 0x0000000d,</div><div class='del'>-	0x00000000, 0x24000043, 0x0e00155a, 0x00000000, 0x8fbf0014, 0x8fb00010,</div><div class='del'>-	0x03e00008, 0x27bd0018, 0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff,</div><div class='del'>-	0x24a50004, 0xac820000, 0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000,</div><div class='del'>-	0x0a0015c1, 0x00a01021, 0xac860000, 0x00000000, 0x00000000, 0x24840004,</div><div class='del'>-	0x00a01021, 0x1440fffa, 0x24a5ffff, 0x03e00008, 0x00000000, 0x3c036000,</div><div class='del'>-	0x8c642b7c, 0x3c036010, 0x8c6553fc, 0x00041582, 0x00042302, 0x308403ff,</div><div class='del'>-	0x00052d82, 0x00441026, 0x0002102b, 0x0005282b, 0x00451025, 0x1440000d,</div><div class='del'>-	0x3c020050, 0x34420004, 0xaf400038, 0xaf40003c, 0xaf420030, 0x00000000,</div><div class='del'>-	0x00000000, 0x8f420000, 0x30420020, 0x1040fffd, 0x3c020020, 0xaf420030,</div><div class='del'>-	0x0000000d, 0x03e00008, 0x00000000, 0x3c020050, 0x34420004, 0xaf440038,</div><div class='del'>-	0xaf45003c, 0xaf420030, 0x00000000, 0x00000000, 0x8f420000, 0x30420020,</div><div class='del'>-	0x1040fffd, 0x3c020020, 0xaf420030, 0x03e00008, 0x00000000, 0x00000000};</div><div class='add'>+static u8 bnx2_COM_b06FwText[] = {</div><div class='add'>+	0x1f, 0x8b, 0x08, 0x08, 0x09, 0x83, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,</div><div class='add'>+	0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xec, 0x5b, 0x7d, 0x6c,</div><div class='add'>+	0x5b, 0xd7, 0x75, 0x3f, 0xef, 0xf1, 0x51, 0x7a, 0x96, 0x68, 0xf9, 0x99,</div><div class='add'>+	0x7e, 0x96, 0x59, 0x4f, 0xb1, 0x49, 0xf1, 0xc9, 0xd2, 0x62, 0x2d, 0x63,</div><div class='add'>+	0x34, 0x35, 0xd1, 0x3a, 0x26, 0x66, 0x48, 0xda, 0x71, 0x36, 0x67, 0xa0,</div><div class='add'>+	0x1d, 0x05, 0x51, 0x51, 0xaf, 0xd0, 0x48, 0xd9, 0xcd, 0xb2, 0x0c, 0x73,</div><div class='add'>+	0x96, 0xb4, 0x70, 0xbc, 0xb4, 0xa1, 0x25, 0x79, 0xf5, 0x06, 0x45, 0xcf,</div><div class='add'>+	0xb3, 0x34, 0x39, 0xc0, 0x82, 0x41, 0x10, 0x9d, 0x3a, 0x7f, 0x30, 0xa5,</div><div class='add'>+	0xed, 0x7c, 0x19, 0xe8, 0x12, 0x29, 0xb2, 0x93, 0xb5, 0x43, 0xd0, 0xa6,</div><div class='add'>+	0x68, 0xff, 0xe8, 0x8a, 0x6e, 0x30, 0x52, 0x0c, 0xf3, 0x3a, 0xa0, 0x30,</div><div class='add'>+	0xfa, 0xc7, 0xe6, 0x2d, 0x1f, 0xdc, 0xef, 0xdc, 0x77, 0x1f, 0xf9, 0x48,</div><div class='add'>+	0x51, 0x96, 0x1c, 0x34, 0x5d, 0xb7, 0x99, 0x80, 0xf0, 0xde, 0xbd, 0xf7,</div><div class='add'>+	0xbc, 0x7b, 0xcf, 0x3d, 0xdf, 0xe7, 0xdc, 0xab, 0x5f, 0x53, 0xa9, 0x85,</div><div class='add'>+	0xe4, 0x6f, 0x2d, 0xfe, 0xc2, 0x7f, 0xf4, 0xc7, 0xb9, 0xdb, 0x3e, 0x7d,</div><div class='add'>+	0x5b, 0x1f, 0x5e, 0x07, 0x54, 0xdd, 0xaf, 0x72, 0xbf, 0x0f, 0x7f, 0x26,</div><div class='add'>+	0xfe, 0xfa, 0xe4, 0x7b, 0xa3, 0x9f, 0x81, 0xbf, 0x2b, 0x18, 0x1c, 0xfe,</div><div class='add'>+	0x09, 0x91, 0xb2, 0x0c, 0x8c, 0xf7, 0x57, 0x2e, 0x5f, 0x7f, 0x9c, 0x17,</div><div class='add'>+	0x0e, 0xaf, 0x62, 0x9e, 0x9b, 0xbf, 0x9b, 0xbf, 0x9b, 0xbf, 0x9b, 0xbf,</div><div class='add'>+	0x9b, 0xbf, 0x9b, 0xbf, 0x9b, 0xbf, 0xff, 0x3f, 0x3f, 0x9f, 0x13, 0x72,</div><div class='add'>+	0x88, 0x98, 0x85, 0xff, 0x48, 0x57, 0xe3, 0x89, 0xa1, 0xa4, 0x45, 0xba,</div><div class='add'>+	0x2f, 0x7e, 0x65, 0x28, 0x67, 0x11, 0x25, 0x8a, 0xdb, 0xc3, 0x29, 0xfa,</div><div class='add'>+	0xb0, 0x9c, 0x37, 0x35, 0xe2, 0xfe, 0x5b, 0xe2, 0x1f, 0x3c, 0xfd, 0xfa,</div><div class='add'>+	0x9d, 0x91, 0xab, 0xb3, 0x3e, 0xd2, 0x8d, 0xf8, 0xcb, 0xba, 0xb1, 0x8d,</div><div class='add'>+	0xf4, 0x0e, 0x7c, 0xf3, 0x5c, 0xf7, 0x7f, 0xa8, 0xd4, 0xe6, 0xce, 0x75,</div><div class='add'>+	0xa5, 0xfc, 0x7a, 0x37, 0xe5, 0x37, 0xc7, 0x75, 0x52, 0xe3, 0x5d, 0x3f,</div><div class='add'>+	0x48, 0xfa, 0x8c, 0x61, 0x5f, 0xdc, 0xa0, 0xf9, 0x12, 0x65, 0x0e, 0x4c,</div><div class='add'>+	0xf0, 0x1a, 0xb1, 0x75, 0xf7, 0x62, 0x2e, 0x2d, 0x3e, 0x3c, 0xf4, 0x67,</div><div class='add'>+	0xd6, 0xd3, 0x65, 0xd5, 0xb2, 0x7a, 0xe6, 0x28, 0x30, 0xf0, 0x7c, 0x3f,</div><div class='add'>+	0xc6, 0x8b, 0x91, 0x1e, 0xa2, 0x3b, 0x49, 0xb5, 0xf2, 0x01, 0x9f, 0xa5,</div><div class='add'>+	0x53, 0xb2, 0x64, 0x51, 0xaa, 0x44, 0xf4, 0x77, 0x45, 0x85, 0x9e, 0xb7,</div><div class='add'>+	0xda, 0x69, 0xae, 0xf7, 0x83, 0x72, 0x02, 0xb8, 0xbc, 0x6d, 0x0d, 0x0f,</div><div class='add'>+	0x8d, 0x5b, 0x3c, 0x57, 0x7c, 0x9d, 0x83, 0x6f, 0x6f, 0x5b, 0xce, 0xd2,</div><div class='add'>+	0x68, 0xb4, 0xc8, 0x7d, 0xbd, 0x2d, 0xdc, 0xe7, 0x8f, 0x3f, 0x1c, 0x7c,</div><div class='add'>+	0xde, 0x0a, 0xc8, 0xbe, 0x1f, 0xa5, 0x92, 0x98, 0x6f, 0xac, 0xc8, 0xb0,</div><div class='add'>+	0xcf, 0xde, 0x91, 0xb3, 0x4c, 0xd9, 0x6f, 0xc5, 0x93, 0x56, 0x08, 0xfd,</div><div class='add'>+	0x1d, 0x72, 0x2c, 0xbd, 0x2e, 0x67, 0x59, 0x72, 0xac, 0x88, 0x6f, 0x7a,</div><div class='add'>+	0x65, 0xff, 0x3b, 0xa9, 0x9c, 0x15, 0x93, 0xfd, 0x57, 0x93, 0x49, 0xab,</div><div class='add'>+	0x5f, 0xf6, 0x1f, 0xbe, 0x2b, 0x67, 0xc5, 0x65, 0xff, 0xf7, 0x81, 0x8b,</div><div class='add'>+	0x41, 0xc7, 0x8a, 0x61, 0xfc, 0x25, 0x30, 0xfe, 0x9a, 0x41, 0x6d, 0x19,</div><div class='add'>+	0x8c, 0x61, 0xef, 0xb6, 0x4e, 0x97, 0x7d, 0x21, 0x7a, 0xbd, 0xfb, 0x32,</div><div class='add'>+	0x68, 0x63, 0xd0, 0xd9, 0x12, 0x29, 0x99, 0xee, 0x10, 0x68, 0x62, 0xd2,</div><div class='add'>+	0xb9, 0x52, 0x2b, 0xf9, 0x4e, 0xfa, 0xb0, 0xe7, 0xcf, 0x51, 0xd6, 0xd4,</div><div class='add'>+	0x69, 0xfd, 0x8c, 0x42, 0x9d, 0x7d, 0x6b, 0x28, 0x61, 0xe4, 0x29, 0xd5,</div><div class='add'>+	0x8d, 0x28, 0x6e, 0xd2, 0x24, 0x6d, 0x66, 0x71, 0xbd, 0x8a, 0x1e, 0x95,</div><div class='add'>+	0x22, 0xa1, 0x2c, 0x28, 0x3c, 0x72, 0xfa, 0x5d, 0x8e, 0x39, 0xb1, 0x26,</div><div class='add'>+	0xff, 0x85, 0x29, 0x35, 0x71, 0x2b, 0x0d, 0x1b, 0x8c, 0x0f, 0x80, 0x05,</div><div class='add'>+	0x1f, 0x74, 0x25, 0x79, 0x2a, 0x44, 0xc7, 0xec, 0x80, 0x92, 0x3a, 0x75,</div><div class='add'>+	0x37, 0x25, 0x63, 0x64, 0xaa, 0xd4, 0x25, 0xbe, 0x2d, 0x14, 0x43, 0x34,</div><div class='add'>+	0x6e, 0x93, 0x92, 0xb4, 0x99, 0x5e, 0xed, 0x18, 0x6f, 0x13, 0xb0, 0xe8,</div><div class='add'>+	0xeb, 0xf0, 0x51, 0x97, 0x91, 0x22, 0x9d, 0x71, 0x46, 0x7f, 0x50, 0x49,</div><div class='add'>+	0x8b, 0x39, 0x44, 0x7f, 0x78, 0x8c, 0x02, 0x74, 0xba, 0x68, 0x4a, 0xd8,</div><div class='add'>+	0x72, 0x39, 0x19, 0x33, 0x00, 0x07, 0xda, 0xd9, 0x26, 0x0d, 0xe3, 0x39,</div><div class='add'>+	0x6a, 0xf3, 0xfa, 0x21, 0xc8, 0xcc, 0xb7, 0x87, 0xb2, 0xd3, 0x62, 0xbe,</div><div class='add'>+	0xb0, 0x2f, 0xce, 0xf3, 0x75, 0x00, 0xee, 0x1d, 0xe0, 0xa5, 0x90, 0x26,</div><div class='add'>+	0x78, 0x95, 0xa0, 0xec, 0x84, 0x02, 0x79, 0xc2, 0x53, 0xd0, 0x2d, 0x0d,</div><div class='add'>+	0xfc, 0x35, 0xb2, 0xfa, 0x14, 0xca, 0x59, 0x9b, 0x28, 0x6f, 0xa0, 0x5d,</div><div class='add'>+	0xbc, 0xa0, 0x26, 0xed, 0x66, 0x4a, 0x69, 0x61, 0xec, 0x5f, 0xc8, 0x0a,</div><div class='add'>+	0x8d, 0xe1, 0x1b, 0xd5, 0x62, 0x98, 0x9f, 0x61, 0xef, 0xc3, 0x82, 0xfe,</div><div class='add'>+	0x4d, 0xf1, 0xfd, 0x74, 0x69, 0x22, 0xaf, 0x26, 0x4b, 0xed, 0xe4, 0x9b,</div><div class='add'>+	0x89, 0x40, 0x9a, 0xc7, 0xd5, 0xd4, 0x19, 0x8d, 0xfc, 0x93, 0x0a, 0x41,</div><div class='add'>+	0x3e, 0x0c, 0x5f, 0xfc, 0xb8, 0xba, 0xb3, 0x74, 0x41, 0x4d, 0x95, 0xf8,</div><div class='add'>+	0x1b, 0xc0, 0x16, 0x55, 0xd0, 0x96, 0xdf, 0xb7, 0x83, 0x96, 0x34, 0xac,</div><div class='add'>+	0xc6, 0x75, 0x3d, 0x51, 0x64, 0x99, 0xe5, 0x6f, 0xc1, 0x0f, 0xec, 0xe5,</div><div class='add'>+	0x9c, 0x0d, 0xfe, 0x08, 0x7e, 0x85, 0xc1, 0xaf, 0x6f, 0x82, 0x5f, 0xfd,</div><div class='add'>+	0xe0, 0x53, 0x8c, 0xde, 0x28, 0xf5, 0xd2, 0x6b, 0xa5, 0x1e, 0x7a, 0x15,</div><div class='add'>+	0x32, 0xf9, 0x4a, 0x29, 0x4c, 0x2f, 0x97, 0x3a, 0xe8, 0xa5, 0x52, 0x88,</div><div class='add'>+	0xce, 0x0b, 0x1e, 0xa6, 0x21, 0xff, 0x82, 0xaf, 0xfa, 0x26, 0xf0, 0xa4,</div><div class='add'>+	0x1d, 0x3c, 0x59, 0x0f, 0x79, 0xd9, 0x08, 0xf9, 0x9b, 0xee, 0xd6, 0x69,</div><div class='add'>+	0xaa, 0x9b, 0x12, 0x41, 0xf4, 0x6f, 0x89, 0x6b, 0x82, 0x4e, 0x1a, 0xc6,</div><div class='add'>+	0xc7, 0x26, 0xfc, 0x94, 0x32, 0x4e, 0xd3, 0x7b, 0x93, 0x1a, 0x8d, 0x95,</div><div class='add'>+	0xa6, 0x36, 0x3a, 0x7c, 0xe3, 0xf6, 0x2c, 0x5d, 0x44, 0x5f, 0xca, 0x98,</div><div class='add'>+	0xa5, 0x4b, 0xdb, 0x54, 0x1a, 0x9d, 0xfe, 0x1b, 0x4a, 0x9e, 0x39, 0x4d,</div><div class='add'>+	0x3f, 0xfe, 0x3a, 0x51, 0x06, 0x34, 0x51, 0xfb, 0x7e, 0x5a, 0x4e, 0x18,</div><div class='add'>+	0xa0, 0x45, 0x5f, 0xaf, 0x90, 0x08, 0xb5, 0x8f, 0x79, 0x19, 0x86, 0xae,</div><div class='add'>+	0x68, 0x4a, 0xca, 0x7e, 0x01, 0xfa, 0xd2, 0xaa, 0x24, 0xa7, 0x88, 0x72,</div><div class='add'>+	0x53, 0x65, 0xca, 0xc5, 0xfc, 0xf4, 0x98, 0x51, 0xa6, 0x74, 0xac, 0x89,</div><div class='add'>+	0xbe, 0x68, 0xb4, 0xd3, 0x68, 0xef, 0x6f, 0xf8, 0xdc, 0x5c, 0x65, 0xba,</div><div class='add'>+	0xd4, 0x8f, 0x77, 0xee, 0x23, 0x9a, 0x12, 0xef, 0x4e, 0x7f, 0xbe, 0xe4,</div><div class='add'>+	0xa7, 0x84, 0x99, 0x0f, 0x69, 0xf4, 0x8e, 0xcf, 0xc1, 0x29, 0xe1, 0x8e,</div><div class='add'>+	0x81, 0x57, 0xc3, 0xb0, 0x0f, 0x8e, 0x0c, 0x66, 0x27, 0xd6, 0x5c, 0x4b,</div><div class='add'>+	0x88, 0x6e, 0xc0, 0x0b, 0xd9, 0xd3, 0x18, 0x8f, 0x61, 0x25, 0x6e, 0x52,</div><div class='add'>+	0xa7, 0xd0, 0x8d, 0x7e, 0xc0, 0x0c, 0x28, 0xfb, 0x4a, 0xcc, 0x6b, 0xbc,</div><div class='add'>+	0x17, 0x19, 0xd7, 0xcd, 0x80, 0xd5, 0xf0, 0x4c, 0x48, 0x9c, 0xbd, 0x78,</div><div class='add'>+	0xf2, 0x5c, 0x8c, 0x27, 0x3f, 0x7f, 0xcf, 0x83, 0xe7, 0xe7, 0x2b, 0xef,</div><div class='add'>+	0x53, 0x9e, 0xf7, 0x7c, 0xe9, 0x4f, 0x03, 0x0e, 0x7e, 0x4c, 0xcf, 0x01,</div><div class='add'>+	0x1a, 0x9d, 0x38, 0x2c, 0xd7, 0xc2, 0x7b, 0x91, 0xd7, 0x38, 0x0d, 0x3a,</div><div class='add'>+	0x09, 0xc8, 0x15, 0xd6, 0x3a, 0xec, 0x59, 0xeb, 0x49, 0xcf, 0x5a, 0x4f,</div><div class='add'>+	0x7a, 0xd6, 0xca, 0x83, 0xb6, 0xb4, 0x4e, 0xb5, 0xfc, 0xd0, 0x51, 0xee,</div><div class='add'>+	0x39, 0x8e, 0x39, 0x9f, 0x03, 0x5f, 0xbe, 0x0a, 0x98, 0x38, 0x2d, 0xda,</div><div class='add'>+	0xa0, 0xc7, 0x94, 0x46, 0x7b, 0x4d, 0x7e, 0x7f, 0xb1, 0xd5, 0xc1, 0x8b,</div><div class='add'>+	0xdf, 0x2f, 0x48, 0x9c, 0x5a, 0x1d, 0xb8, 0xd2, 0x15, 0xa1, 0xff, 0xf3,</div><div class='add'>+	0x25, 0xd6, 0x4f, 0x8a, 0xf9, 0x2c, 0x3a, 0x94, 0x8e, 0xb5, 0xd3, 0x98,</div><div class='add'>+	0xa1, 0xc4, 0x46, 0x7b, 0x9a, 0x99, 0x8e, 0x09, 0xd5, 0x6a, 0x85, 0x0e,</div><div class='add'>+	0x50, 0x58, 0x65, 0xdb, 0x25, 0xf0, 0x7b, 0x49, 0xe2, 0x61, 0x70, 0x3b,</div><div class='add'>+	0xa3, 0x5a, 0xc1, 0xba, 0x7e, 0x96, 0xdf, 0x57, 0xf0, 0xce, 0x32, 0x9c,</div><div class='add'>+	0xd4, 0x9c, 0xb5, 0x5f, 0x45, 0x9b, 0xed, 0xce, 0x66, 0xd9, 0x76, 0xc7,</div><div class='add'>+	0xff, 0xa0, 0xa9, 0xb6, 0xfd, 0x05, 0xb3, 0xb6, 0xed, 0xea, 0x82, 0xd7,</div><div class='add'>+	0x66, 0xf1, 0xde, 0xc2, 0xe4, 0xb3, 0x58, 0x8e, 0xfc, 0xc0, 0x35, 0x06,</div><div class='add'>+	0x3d, 0x6c, 0x96, 0x38, 0x7c, 0x4b, 0xe2, 0x00, 0x5c, 0x01, 0x37, 0x5a,</div><div class='add'>+	0xe2, 0x6f, 0x04, 0x4b, 0xea, 0xda, 0x4c, 0x43, 0xf7, 0x7d, 0xad, 0x18,</div><div class='add'>+	0xbf, 0xec, 0xe3, 0x75, 0xdc, 0x27, 0x29, 0x69, 0xe8, 0xc9, 0xd8, 0xb4,</div><div class='add'>+	0x46, 0xd9, 0xd8, 0x26, 0x21, 0xd7, 0xd9, 0x58, 0xd5, 0x06, 0x8c, 0x4e,</div><div class='add'>+	0xd4, 0xdb, 0x00, 0xfe, 0x8e, 0x6d, 0x80, 0xa3, 0xfb, 0x63, 0xd3, 0x6c,</div><div class='add'>+	0x0b, 0x1c, 0xdd, 0x3f, 0x36, 0xc1, 0x36, 0x41, 0xcc, 0x09, 0xfd, 0x67,</div><div class='add'>+	0x3b, 0xe0, 0xda, 0x00, 0xfe, 0x86, 0x6d, 0x80, 0x0f, 0xf2, 0xcd, 0xf3,</div><div class='add'>+	0xb9, 0x6b, 0x8f, 0xd7, 0xcd, 0x3b, 0xce, 0xb6, 0x45, 0xd9, 0xd9, 0xcd,</div><div class='add'>+	0x30, 0xc7, 0xb1, 0x76, 0x80, 0x0a, 0xd3, 0xcc, 0xc3, 0x48, 0xe8, 0x08,</div><div class='add'>+	0x1d, 0x17, 0x36, 0xef, 0xf4, 0x04, 0x25, 0x0e, 0x9e, 0x18, 0xa0, 0x34,</div><div class='add'>+	0x6c, 0xc0, 0xdc, 0xc4, 0xb5, 0x32, 0xf8, 0x78, 0x47, 0x13, 0x59, 0xb0,</div><div class='add'>+	0x75, 0xf0, 0x93, 0xfd, 0x7e, 0xf2, 0xc5, 0xe3, 0x90, 0xb7, 0x98, 0xf0,</div><div class='add'>+	0x5d, 0xd5, 0x9f, 0xa6, 0xed, 0xaa, 0x69, 0x37, 0xc1, 0x3f, 0x62, 0xde,</div><div class='add'>+	0xfe, 0x98, 0x90, 0x4d, 0xef, 0x2f, 0x09, 0x1b, 0x94, 0x8c, 0x7d, 0x08,</div><div class='add'>+	0xf9, 0x75, 0x69, 0xe4, 0xea, 0x1f, 0xdb, 0xfa, 0x2b, 0x1e, 0x1f, 0xb2,</div><div class='add'>+	0x05, 0x76, 0xdf, 0x84, 0x3c, 0xb9, 0x76, 0x9f, 0xed, 0x71, 0x88, 0x6d,</div><div class='add'>+	0x26, 0xf4, 0x8d, 0x6d, 0x70, 0x80, 0xd4, 0x19, 0x4d, 0xda, 0x69, 0x5d,</div><div class='add'>+	0xda, 0xe9, 0x00, 0x6c, 0x34, 0xb7, 0x0d, 0xd9, 0x36, 0x45, 0x1b, 0xf6,</div><div class='add'>+	0x1a, 0xf6, 0x70, 0x77, 0x3a, 0x35, 0xc1, 0xfe, 0x10, 0xbe, 0x7b, 0x86,</div><div class='add'>+	0x75, 0xf8, 0xdb, 0x43, 0x23, 0xd3, 0xc2, 0x07, 0xb0, 0xff, 0x80, 0x65,</div><div class='add'>+	0x66, 0x1b, 0xce, 0xb6, 0x1c, 0xfb, 0x2e, 0x62, 0xdd, 0x8a, 0xad, 0x64,</div><div class='add'>+	0x39, 0xf1, 0xe2, 0xc5, 0x38, 0xad, 0x21, 0xf5, 0xa4, 0x43, 0x6b, 0x35,</div><div class='add'>+	0xfe, 0xa8, 0x46, 0x2d, 0x4c, 0x63, 0xc6, 0x7f, 0x2b, 0x70, 0xe6, 0x7d,</div><div class='add'>+	0xfd, 0x4f, 0xe0, 0xcc, 0xeb, 0xd6, 0xe3, 0x4d, 0x7a, 0x6b, 0xfc, 0xac,</div><div class='add'>+	0xfe, 0xf0, 0x33, 0xa4, 0x37, 0xc7, 0xcf, 0xd2, 0xbf, 0x58, 0x74, 0x9f,</div><div class='add'>+	0x0e, 0x3f, 0xdb, 0xad, 0xc0, 0xcf, 0x16, 0xa1, 0xef, 0x53, 0x3a, 0x1d,</div><div class='add'>+	0x3c, 0x15, 0xc9, 0xfc, 0x2b, 0x45, 0x61, 0x3f, 0x76, 0xd0, 0xc8, 0x94,</div><div class='add'>+	0x42, 0x7a, 0x17, 0xb5, 0xc3, 0x7f, 0xf4, 0x37, 0x61, 0xfe, 0x5d, 0x44,</div><div class='add'>+	0x9b, 0x1d, 0xbf, 0xd9, 0x15, 0x1e, 0x05, 0xff, 0xd3, 0x2f, 0x7e, 0x05,</div><div class='add'>+	0xdf, 0x3c, 0x4d, 0x07, 0xa7, 0x0e, 0x2b, 0x39, 0xfb, 0x08, 0xe0, 0x97,</div><div class='add'>+	0x83, 0xd5, 0x01, 0x9b, 0x07, 0xec, 0x97, 0x31, 0xef, 0xd3, 0xa4, 0xdf,</div><div class='add'>+	0x1e, 0x19, 0x48, 0x28, 0xc0, 0xe3, 0x45, 0x01, 0x2f, 0x7d, 0x71, 0x97,</div><div class='add'>+	0xb1, 0x53, 0xf0, 0x3f, 0x40, 0xef, 0x15, 0x2f, 0x80, 0xbe, 0xbd, 0xf0,</div><div class='add'>+	0x39, 0x91, 0x67, 0x61, 0x93, 0xe1, 0x8f, 0x22, 0x57, 0x31, 0x2d, 0x7c,</div><div class='add'>+	0x11, 0x29, 0x0f, 0x76, 0xa7, 0x41, 0xef, 0x38, 0xfc, 0xd3, 0x00, 0xfc,</div><div class='add'>+	0x53, 0x0c, 0xbe, 0xa9, 0x07, 0x7e, 0xc9, 0x82, 0x5f, 0x0a, 0x83, 0x1f,</div><div class='add'>+	0x06, 0xcd, 0xc2, 0x47, 0xcd, 0x42, 0xfe, 0xe7, 0x66, 0x48, 0x19, 0x04,</div><div class='add'>+	0xad, 0xcf, 0xc1, 0x3f, 0x26, 0x63, 0x77, 0x42, 0xcf, 0x22, 0x17, 0x66,</div><div class='add'>+	0xd5, 0x41, 0xca, 0xc1, 0x9f, 0x77, 0x6e, 0x8b, 0x62, 0xbd, 0x26, 0x4a,</div><div class='add'>+	0x84, 0x5c, 0x1d, 0xe5, 0xdf, 0x7e, 0x85, 0xac, 0x7f, 0x06, 0xef, 0x22,</div><div class='add'>+	0x61, 0xa2, 0x3d, 0x94, 0xb5, 0xa3, 0x46, 0xa7, 0xda, 0x03, 0x18, 0x6e,</div><div class='add'>+	0x87, 0x95, 0x03, 0x53, 0x11, 0x05, 0xfb, 0x03, 0xcd, 0x27, 0x60, 0xeb,</div><div class='add'>+	0xcb, 0x34, 0x1e, 0x63, 0x3d, 0x29, 0xd3, 0xf3, 0xb1, 0xc8, 0x40, 0x9e,</div><div class='add'>+	0x5a, 0xe9, 0x98, 0x39, 0x21, 0x7c, 0xbc, 0x16, 0x3f, 0x21, 0x74, 0x2c,</div><div class='add'>+	0x67, 0xe1, 0x59, 0xec, 0x54, 0xb2, 0x53, 0xbc, 0x7e, 0x14, 0x5a, 0xee,</div><div class='add'>+	0xc7, 0x93, 0xe7, 0x07, 0xdd, 0xfa, 0x49, 0x39, 0xd8, 0x9d, 0x87, 0x77,</div><div class='add'>+	0x88, 0x18, 0x8b, 0x58, 0x39, 0x35, 0x11, 0x0d, 0x45, 0x55, 0x8d, 0x86,</div><div class='add'>+	0x35, 0x85, 0x46, 0x61, 0x6f, 0xd2, 0xb1, 0xff, 0x2c, 0x1f, 0x33, 0x79,</div><div class='add'>+	0xbc, 0x99, 0xbe, 0x2a, 0xfc, 0x0d, 0xd6, 0x2e, 0x4c, 0x63, 0x5d, 0x3f,</div><div class='add'>+	0xf8, 0xcb, 0xeb, 0xf2, 0x3c, 0x68, 0xc3, 0xf6, 0x6b, 0x56, 0xe4, 0xd9,</div><div class='add'>+	0x3c, 0xed, 0x00, 0x6d, 0xd9, 0x66, 0xc1, 0x3e, 0x0c, 0x60, 0xed, 0x5e,</div><div class='add'>+	0xd8, 0x4f, 0x3c, 0x93, 0xbd, 0x1c, 0x07, 0x05, 0x68, 0xd8, 0x64, 0x79,</div><div class='add'>+	0xd4, 0xe5, 0x98, 0xe9, 0x19, 0xf3, 0xcb, 0xb1, 0x20, 0xfe, 0xe0, 0x7f,</div><div class='add'>+	0x4d, 0x96, 0x19, 0x6e, 0x73, 0x4c, 0xc6, 0x34, 0x09, 0xd3, 0xdc, 0x64,</div><div class='add'>+	0x02, 0x34, 0x8b, 0x9c, 0x4d, 0x10, 0xd3, 0x0c, 0x46, 0x7b, 0x7f, 0x82,</div><div class='add'>+	0xbe, 0x64, 0xaf, 0xf7, 0x3b, 0xb6, 0xb0, 0x55, 0x49, 0xc1, 0x17, 0xa8,</div><div class='add'>+	0x56, 0x0b, 0x7c, 0x45, 0x98, 0x5e, 0x15, 0xb0, 0x64, 0xa8, 0xf1, 0x68,</div><div class='add'>+	0xe8, 0x4b, 0x74, 0xab, 0xb0, 0x11, 0x09, 0xc3, 0x4b, 0xe3, 0xff, 0x52,</div><div class='add'>+	0xc9, 0x72, 0xbf, 0x69, 0xa5, 0xec, 0x20, 0xf3, 0x89, 0xd7, 0x33, 0x68,</div><div class='add'>+	0xae, 0xe4, 0xbc, 0xfb, 0x10, 0xa3, 0x16, 0x60, 0x6b, 0xce, 0x4f, 0xaa,</div><div class='add'>+	0xf4, 0xf8, 0x1d, 0xf0, 0x65, 0xb1, 0x6d, 0x58, 0xcb, 0xc4, 0x78, 0x1e,</div><div class='add'>+	0x6d, 0x15, 0x6d, 0xe8, 0x99, 0x11, 0x02, 0x8f, 0xb9, 0x9f, 0xe1, 0x4c,</div><div class='add'>+	0xfc, 0xbd, 0xcf, 0xb1, 0x75, 0x3e, 0xab, 0xde, 0x4a, 0x14, 0x64, 0x7a,</div><div class='add'>+	0xc5, 0x40, 0x2b, 0xcb, 0x50, 0xd5, 0x6d, 0xc2, 0x5f, 0x3b, 0xb6, 0xc4,</div><div class='add'>+	0x82, 0x2e, 0xc2, 0xe6, 0xf6, 0x79, 0x75, 0x91, 0xe3, 0x09, 0x57, 0x17,</div><div class='add'>+	0x23, 0xa1, 0x84, 0x0a, 0x5b, 0xdc, 0xa7, 0xd1, 0x09, 0xd1, 0x56, 0x28,</div><div class='add'>+	0x31, 0x18, 0x09, 0x2d, 0xa8, 0x1c, 0x4b, 0x33, 0x6c, 0x18, 0xf1, 0x4a,</div><div class='add'>+	0x40, 0xc2, 0x22, 0x9e, 0xb3, 0xdd, 0x98, 0x30, 0x84, 0x7e, 0x53, 0xf4,</div><div class='add'>+	0x1f, 0xab, 0xe8, 0xa8, 0x13, 0xff, 0xa9, 0x88, 0x11, 0x0b, 0x88, 0x11,</div><div class='add'>+	0x53, 0x42, 0x47, 0x8d, 0x04, 0x72, 0x04, 0xd0, 0xdc, 0xd1, 0xcf, 0x42,</div><div class='add'>+	0x91, 0x71, 0xc9, 0xb1, 0x5c, 0x0e, 0x00, 0x99, 0x13, 0x8e, 0x7d, 0xa4,</div><div class='add'>+	0x3c, 0xc7, 0x91, 0xa3, 0xea, 0x53, 0x34, 0x5c, 0x60, 0x3f, 0x8e, 0x3f,</div><div class='add'>+	0x9b, 0x6d, 0x2d, 0xec, 0xa3, 0xf0, 0xc5, 0x51, 0xf0, 0x39, 0x0f, 0x1a,</div><div class='add'>+	0xac, 0x97, 0x74, 0xdd, 0x4f, 0x07, 0xec, 0x3d, 0xa0, 0x79, 0x9c, 0x46,</div><div class='add'>+	0x4e, 0x8d, 0xb0, 0xcc, 0xf6, 0x14, 0x28, 0xd2, 0x73, 0x8c, 0xb6, 0x1b,</div><div class='add'>+	0x73, 0x2c, 0xdf, 0x83, 0xe5, 0x1d, 0xe0, 0x85, 0xd0, 0x51, 0xc8, 0x20,</div><div class='add'>+	0x65, 0x0b, 0x23, 0xf4, 0x58, 0x89, 0xfb, 0xf2, 0xa0, 0x1d, 0xe2, 0xda,</div><div class='add'>+	0xfe, 0xfd, 0x52, 0xce, 0x31, 0x9f, 0xe6, 0xce, 0x37, 0x22, 0xe7, 0x63,</div><div class='add'>+	0x38, 0x86, 0xe1, 0x6f, 0xaa, 0xf3, 0xee, 0x14, 0x3c, 0x8d, 0x18, 0x5d,</div><div class='add'>+	0x6a, 0x79, 0x87, 0x1f, 0xe3, 0xcf, 0xf7, 0xf3, 0x3b, 0xe6, 0x81, 0xef,</div><div class='add'>+	0x6f, 0xb6, 0xf6, 0x00, 0x76, 0x10, 0x73, 0xfa, 0xa9, 0xb3, 0xdd, 0xc5,</div><div class='add'>+	0x37, 0x81, 0xb5, 0xd9, 0xcf, 0x31, 0x9f, 0x1f, 0xa1, 0xec, 0xa9, 0x7c,</div><div class='add'>+	0x8f, 0x0a, 0x19, 0x9b, 0xcd, 0x28, 0xe4, 0xb7, 0x1e, 0xa6, 0xdc, 0xa9,</div><div class='add'>+	0xa3, 0x6c, 0x37, 0x40, 0xab, 0x3d, 0xb4, 0x6b, 0x22, 0xd2, 0x73, 0x80,</div><div class='add'>+	0x34, 0xb1, 0xce, 0x5b, 0x24, 0xe8, 0x1f, 0x9b, 0x15, 0xbe, 0x20, 0x43,</div><div class='add'>+	0xe9, 0x89, 0xed, 0xa1, 0x4b, 0xe8, 0x1b, 0x1e, 0x8c, 0x84, 0x17, 0xe8,</div><div class='add'>+	0x09, 0xd0, 0xe5, 0x23, 0xf8, 0x22, 0xab, 0x67, 0x0c, 0x3a, 0x84, 0x9c,</div><div class='add'>+	0x0a, 0xeb, 0x8f, 0x4a, 0xda, 0xe0, 0xbb, 0xcc, 0x51, 0xd0, 0x8f, 0xf2,</div><div class='add'>+	0x0e, 0x4d, 0x99, 0x9e, 0x4c, 0xcb, 0xaf, 0xc0, 0xf6, 0x1c, 0x11, 0xb1,</div><div class='add'>+	0x4b, 0x56, 0xd0, 0xee, 0xd2, 0x06, 0x47, 0x0e, 0x60, 0x8b, 0x30, 0xef,</div><div class='add'>+	0xe5, 0x41, 0x85, 0xb6, 0x20, 0x4e, 0x3f, 0x24, 0x78, 0xeb, 0xa3, 0x7d,</div><div class='add'>+	0x66, 0xd4, 0xd8, 0x47, 0xf3, 0x7e, 0x27, 0x56, 0xc0, 0x3c, 0x3d, 0xf7,</div><div class='add'>+	0x60, 0x0f, 0x90, 0x53, 0xfb, 0xeb, 0xeb, 0xa8, 0x2d, 0x12, 0x4e, 0xa8,</div><div class='add'>+	0x09, 0xfa, 0x93, 0xd2, 0xdd, 0xe4, 0xe8, 0x77, 0x2b, 0xdb, 0x7e, 0xf0,</div><div class='add'>+	0xb0, 0xd3, 0x69, 0x5b, 0x78, 0x16, 0x3a, 0xb1, 0x1e, 0xe3, 0xfe, 0xac,</div><div class='add'>+	0xc0, 0x7d, 0x84, 0xba, 0xa1, 0x6b, 0x22, 0x8f, 0x39, 0x51, 0x8b, 0x17,</div><div class='add'>+	0xf3, 0xbc, 0x9e, 0xcf, 0x5f, 0xc6, 0x3c, 0xdc, 0xcf, 0x70, 0x78, 0x2f,</div><div class='add'>+	0x3c, 0x41, 0x23, 0x90, 0xc7, 0x5c, 0x7f, 0x57, 0x68, 0x0c, 0xdf, 0xa4,</div><div class='add'>+	0x4a, 0x4d, 0x74, 0x54, 0xe3, 0xf1, 0x48, 0x38, 0xaf, 0x1e, 0x42, 0xdc,</div><div class='add'>+	0xf3, 0xb8, 0xea, 0xb7, 0x7e, 0xe6, 0x67, 0xbf, 0xe3, 0xb7, 0xae, 0x29,</div><div class='add'>+	0xd5, 0xb9, 0x10, 0x87, 0x8a, 0xdc, 0x60, 0x41, 0x19, 0x2c, 0x5d, 0x52,</div><div class='add'>+	0x92, 0x85, 0x6b, 0x4a, 0xaa, 0xc4, 0x30, 0x8e, 0xce, 0x67, 0xcf, 0x74,</div><div class='add'>+	0x82, 0x4e, 0x1f, 0x89, 0xef, 0xe6, 0x7a, 0x8f, 0x50, 0xea, 0xd4, 0xad,</div><div class='add'>+	0x94, 0x9e, 0xe6, 0xbc, 0x34, 0x02, 0x7c, 0x3f, 0x2a, 0xe7, 0x62, 0x41,</div><div class='add'>+	0xca, 0x9d, 0xe1, 0x31, 0xb6, 0x5f, 0xd6, 0xd5, 0x45, 0x1f, 0xef, 0x9f,</div><div class='add'>+	0xf9, 0x6f, 0x52, 0xc1, 0x7e, 0x53, 0xd2, 0x8f, 0xdf, 0x7d, 0x9c, 0x93,</div><div class='add'>+	0xe1, 0xf7, 0x6f, 0x86, 0xd3, 0xb7, 0x95, 0x16, 0x36, 0xdc, 0xc8, 0x3e,</div><div class='add'>+	0x57, 0xb3, 0xc7, 0x47, 0x7d, 0x7e, 0x6b, 0x7b, 0x13, 0xb5, 0x84, 0x80,</div><div class='add'>+	0xc3, 0x4a, 0x7b, 0x64, 0x98, 0x5f, 0x87, 0x1c, 0xb0, 0x4d, 0xd9, 0x0d,</div><div class='add'>+	0x7e, 0x5a, 0x6c, 0xc3, 0x60, 0x93, 0x76, 0x53, 0xae, 0xc4, 0xb2, 0x1d,</div><div class='add'>+	0x35, 0x32, 0x90, 0xb1, 0x34, 0x75, 0xb1, 0x1e, 0xb9, 0xba, 0x07, 0xdb,</div><div class='add'>+	0x9d, 0x87, 0xed, 0x46, 0x3c, 0x64, 0x53, 0xbe, 0x29, 0xce, 0x36, 0xbc,</div><div class='add'>+	0x0b, 0xb2, 0x85, 0xbe, 0x62, 0x55, 0x17, 0x77, 0x2d, 0xc1, 0x5d, 0x5b,</div><div class='add'>+	0xc2, 0xa3, 0x02, 0xd5, 0xe2, 0x3f, 0x4b, 0x8c, 0xff, 0x5f, 0x00, 0xff,</div><div class='add'>+	0xcf, 0x01, 0x7f, 0xc6, 0xa9, 0x31, 0xfe, 0x3b, 0x2b, 0xf8, 0x33, 0x0c,</div><div class='add'>+	0xfc, 0x1c, 0x64, 0xf1, 0x0d, 0xe8, 0xe2, 0x6b, 0x36, 0x7c, 0x9d, 0x0d,</div><div class='add'>+	0xff, 0x67, 0xc3, 0xdf, 0xd9, 0xf0, 0x8b, 0x36, 0x7c, 0x1e, 0xf6, 0x74,</div><div class='add'>+	0x0e, 0x36, 0xe9, 0xac, 0x9d, 0x34, 0x58, 0x9f, 0x92, 0x31, 0xf6, 0x9d,</div><div class='add'>+	0xbb, 0x65, 0xde, 0x1d, 0x92, 0x71, 0xf7, 0xa7, 0x64, 0x2c, 0x7b, 0x00,</div><div class='add'>+	0xb1, 0xec, 0x66, 0x1a, 0xed, 0xe1, 0x9c, 0xa4, 0x05, 0xcf, 0x75, 0x78,</div><div class='add'>+	0x22, 0x6e, 0xed, 0x49, 0x48, 0xbd, 0xfc, 0x0c, 0x62, 0x5c, 0xd8, 0xff,</div><div class='add'>+	0x1e, 0xe4, 0x37, 0x19, 0xc4, 0x6a, 0x56, 0x1f, 0xc7, 0xe5, 0xb0, 0x65,</div><div class='add'>+	0xef, 0x37, 0x39, 0x76, 0xfe, 0x2e, 0x19, 0x03, 0xbb, 0xed, 0x56, 0xc0,</div><div class='add'>+	0xa4, 0xd1, 0xd7, 0x8a, 0x6f, 0x7e, 0x07, 0xb2, 0xdf, 0x86, 0xf6, 0xce,</div><div class='add'>+	0x3a, 0x18, 0xe4, 0xb3, 0x56, 0x16, 0x7d, 0x11, 0xc0, 0xb4, 0x61, 0x9d,</div><div class='add'>+	0x0e, 0xb4, 0xf7, 0xa0, 0x7d, 0x8b, 0xb3, 0x8e, 0xf1, 0x2b, 0x68, 0xa7,</div><div class='add'>+	0xea, 0xbe, 0xd9, 0x8a, 0xbe, 0x4c, 0x5d, 0xdf, 0x9b, 0xe8, 0x4b, 0xa2,</div><div class='add'>+	0x6f, 0x51, 0x7e, 0x97, 0x47, 0x3b, 0x52, 0x07, 0xb3, 0x88, 0x3e, 0xc6,</div><div class='add'>+	0xf1, 0x5b, 0x78, 0xde, 0x47, 0xa3, 0x19, 0x8e, 0x03, 0xdc, 0xb1, 0xdc,</div><div class='add'>+	0x7a, 0x6a, 0xe3, 0xdc, 0xf7, 0x43, 0x21, 0x3b, 0xf3, 0xd2, 0x46, 0xa7,</div><div class='add'>+	0x27, 0xd8, 0x4f, 0x8c, 0x20, 0xee, 0xe1, 0x71, 0xe1, 0x9c, 0x3c, 0xfd,</div><div class='add'>+	0x1f, 0x00, 0xf6, 0x61, 0x8c, 0x21, 0x56, 0xb7, 0xcb, 0x4d, 0x8d, 0xc7,</div><div class='add'>+	0x1f, 0xc5, 0xf8, 0x5f, 0xca, 0x6f, 0x2b, 0x73, 0x03, 0xfe, 0x1b, 0x75,</div><div class='add'>+	0x7d, 0x6a, 0xb0, 0xb6, 0xbd, 0xd6, 0xf3, 0xbe, 0x4d, 0x5f, 0xfa, 0xfd,</div><div class='add'>+	0x48, 0x1d, 0xfc, 0xef, 0x6e, 0xa8, 0x6d, 0x3f, 0xc5, 0xdf, 0x20, 0x87,</div><div class='add'>+	0x70, 0xdb, 0x09, 0xc8, 0x1d, 0xdb, 0xa4, 0xfa, 0x79, 0x3e, 0x6b, 0xd4,</div><div class='add'>+	0xf6, 0x6d, 0x32, 0x6b, 0xdb, 0x1c, 0x27, 0x31, 0x5c, 0x08, 0xf2, 0xde,</div><div class='add'>+	0xa1, 0xec, 0xb2, 0x7f, 0x13, 0xe3, 0x61, 0xe5, 0x5e, 0xdb, 0x8b, 0x67,</div><div class='add'>+	0x48, 0xe6, 0x46, 0xe1, 0x4a, 0xcc, 0x3b, 0x5f, 0x0a, 0x40, 0xae, 0x3e,</div><div class='add'>+	0x0f, 0x9e, 0x73, 0xdc, 0x53, 0xd5, 0xf1, 0xf7, 0x68, 0x39, 0x1d, 0x67,</div><div class='add'>+	0x1f, 0xc0, 0x31, 0xfe, 0x36, 0x11, 0x1f, 0xfb, 0xe2, 0x4f, 0x70, 0x0c,</div><div class='add'>+	0xf6, 0xb4, 0xe3, 0x5b, 0x2c, 0xf8, 0x43, 0xb4, 0x4b, 0x7e, 0xc7, 0x6e,</div><div class='add'>+	0x22, 0x9f, 0xc8, 0x16, 0xd8, 0x9f, 0xb1, 0x0f, 0x89, 0xc0, 0x4e, 0xb3,</div><div class='add'>+	0x1f, 0xfd, 0x24, 0x7d, 0xc6, 0x5d, 0xcd, 0x6c, 0xfb, 0x34, 0xeb, 0x05,</div><div class='add'>+	0xc4, 0x0b, 0x1c, 0xe7, 0xb1, 0xed, 0xc6, 0x7b, 0xd1, 0x8d, 0x57, 0xee,</div><div class='add'>+	0xd7, 0xc8, 0xaa, 0xfa, 0x11, 0x67, 0x8f, 0x5b, 0x59, 0x37, 0x56, 0xb1,</div><div class='add'>+	0xef, 0xc6, 0xb6, 0xed, 0xc7, 0x75, 0xb6, 0xe1, 0xb2, 0xb0, 0x0d, 0x0f,</div><div class='add'>+	0x6a, 0x7e, 0xeb, 0xf7, 0x9b, 0x1d, 0x79, 0x6d, 0x6c, 0x1b, 0xee, 0xad,</div><div class='add'>+	0xd8, 0x06, 0x57, 0x5e, 0xbd, 0x79, 0xeb, 0x0f, 0xc0, 0x1b, 0x0b, 0xbc,</div><div class='add'>+	0xa9, 0xaf, 0xd5, 0x70, 0x8e, 0xe2, 0x87, 0x1f, 0xe2, 0x18, 0x91, 0x73,</div><div class='add'>+	0xd9, 0x18, 0xe5, 0x62, 0x45, 0xc4, 0x6a, 0x91, 0xd9, 0xd9, 0x4a, 0x8e,</div><div class='add'>+	0xf5, 0x35, 0x69, 0xbb, 0x6b, 0xe2, 0x22, 0x7a, 0xbc, 0x78, 0x09, 0xf8,</div><div class='add'>+	0x73, 0xbc, 0xa5, 0x49, 0x1b, 0xc1, 0xfd, 0xe3, 0x12, 0x47, 0x7e, 0xe7,</div><div class='add'>+	0x3a, 0x1e, 0x7c, 0x69, 0xf1, 0x47, 0xe0, 0x15, 0xc7, 0x7d, 0x51, 0x27,</div><div class='add'>+	0xde, 0xab, 0x89, 0xa9, 0xd7, 0xf8, 0xc9, 0xe2, 0x78, 0x89, 0x61, 0x74,</div><div class='add'>+	0x19, 0x2f, 0x05, 0x64, 0x5e, 0x63, 0xc8, 0x3c, 0x87, 0x63, 0x6d, 0xae,</div><div class='add'>+	0xb1, 0xd6, 0xc7, 0x50, 0x0b, 0x43, 0xc1, 0x6d, 0xcc, 0x13, 0x8e, 0xa1,</div><div class='add'>+	0xda, 0x28, 0x39, 0xe3, 0xc4, 0x50, 0x4e, 0x9d, 0xcd, 0xcd, 0x71, 0x5c,</div><div class='add'>+	0x5c, 0xd9, 0x0f, 0xef, 0xc0, 0x3e, 0x45, 0x9e, 0x14, 0x74, 0xea, 0x7f,</div><div class='add'>+	0x1a, 0xec, 0xf6, 0x51, 0xf4, 0x8f, 0xba, 0xfd, 0x9e, 0x5c, 0xc3, 0xc5,</div><div class='add'>+	0x85, 0x7d, 0xbd, 0x1b, 0xd3, 0xed, 0x96, 0x31, 0x1d, 0x62, 0x18, 0xdb,</div><div class='add'>+	0xc9, 0xbb, 0xf6, 0x16, 0x33, 0xe8, 0xe3, 0x75, 0x11, 0x1b, 0x12, 0xc7,</div><div class='add'>+	0x49, 0x90, 0xaf, 0xfd, 0x91, 0x50, 0x58, 0xad, 0xc7, 0xab, 0x75, 0xa1,</div><div class='add'>+	0x16, 0xaf, 0x41, 0xf1, 0xdd, 0xf8, 0x92, 0xef, 0x48, 0xc4, 0x92, 0xe3,</div><div class='add'>+	0xf6, 0x10, 0xe8, 0xc5, 0xf8, 0xb9, 0xba, 0xe1, 0xc6, 0xc9, 0x8c, 0xd3,</div><div class='add'>+	0x3f, 0x82, 0xc6, 0xbb, 0x15, 0xfe, 0x7e, 0xcc, 0xde, 0x2f, 0xe8, 0x96,</div><div class='add'>+	0x15, 0xb8, 0x0e, 0x7b, 0x70, 0x1d, 0x91, 0xb8, 0xb2, 0x2e, 0xb0, 0x7e,</div><div class='add'>+	0x78, 0x6b, 0x9a, 0xa6, 0xd8, 0x1b, 0x70, 0x0e, 0xf3, 0xb9, 0xb9, 0x6a,</div><div class='add'>+	0x2d, 0x0c, 0xf9, 0xb6, 0xc1, 0x1f, 0x02, 0xd7, 0xac, 0x88, 0x43, 0x03,</div><div class='add'>+	0x0b, 0xf5, 0x34, 0x1c, 0xc7, 0x5a, 0x88, 0xdb, 0x81, 0x8f, 0xcb, 0xf3,</div><div class='add'>+	0x26, 0x89, 0xcf, 0x37, 0xc5, 0xdc, 0x63, 0xa2, 0x06, 0xea, 0xd3, 0x39,</div><div class='add'>+	0x77, 0xc9, 0x0a, 0xde, 0x69, 0x92, 0x77, 0x8f, 0x56, 0xf0, 0x73, 0x78,</div><div class='add'>+	0x1c, 0x90, 0x74, 0xe5, 0xdc, 0x95, 0x75, 0x5a, 0xf0, 0xa7, 0x9d, 0x73,</div><div class='add'>+	0xd3, 0x41, 0x6a, 0x14, 0x23, 0x2f, 0x0c, 0xa9, 0xdb, 0x1c, 0x3a, 0x3a,</div><div class='add'>+	0x31, 0xf2, 0xda, 0xba, 0x18, 0xf9, 0xb6, 0x20, 0xc7, 0x5a, 0xc3, 0x50,</div><div class='add'>+	0x82, 0x79, 0xf8, 0xba, 0x97, 0x6d, 0xc8, 0x36, 0x70, 0x3d, 0x5f, 0x53,</div><div class='add'>+	0xbb, 0xec, 0x59, 0xa6, 0xd6, 0x1c, 0x20, 0xdf, 0x0c, 0xfb, 0x0e, 0x0b,</div><div class='add'>+	0x79, 0x06, 0x91, 0x36, 0xc9, 0x3a, 0xcb, 0xbe, 0xbd, 0x1a, 0x67, 0xcf,</div><div class='add'>+	0x51, 0xa3, 0x18, 0xfb, 0x46, 0xfd, 0xfa, 0x79, 0xbf, 0xdf, 0x3a, 0xac,</div><div class='add'>+	0x3b, 0x36, 0x73, 0x25, 0xbf, 0xee, 0xc2, 0xed, 0x41, 0x9c, 0xad, 0x50,</div><div class='add'>+	0x93, 0x55, 0xc0, 0xfe, 0xde, 0xf0, 0x37, 0x5b, 0xae, 0x2e, 0x06, 0x68,</div><div class='add'>+	0xfd, 0xcc, 0x2d, 0x42, 0x1f, 0x8d, 0xc9, 0xaa, 0x3e, 0x8e, 0x82, 0x37,</div><div class='add'>+	0x19, 0xa7, 0x06, 0x60, 0xae, 0xa7, 0xeb, 0xd7, 0x0b, 0xc6, 0xed, 0x37,</div><div class='add'>+	0xfd, 0xaa, 0xe5, 0xca, 0xc0, 0xf5, 0xf2, 0x91, 0x4f, 0xd5, 0xd1, 0xba,</div><div class='add'>+	0x51, 0x4d, 0xf8, 0x2c, 0xe8, 0x1a, 0x47, 0xde, 0x1d, 0x79, 0x81, 0x10,</div><div class='add'>+	0x3b, 0x39, 0x79, 0x78, 0x1a, 0xb9, 0x77, 0xe4, 0x02, 0xe7, 0xe3, 0x6e,</div><div class='add'>+	0x7e, 0xfe, 0x6a, 0x29, 0x72, 0x36, 0x8f, 0x9c, 0x79, 0x1e, 0x39, 0xf9,</div><div class='add'>+	0xcb, 0xc8, 0xc9, 0xcf, 0x97, 0x7a, 0x41, 0xff, 0x1e, 0x99, 0x8f, 0xb3,</div><div class='add'>+	0x8e, 0x99, 0x74, 0x11, 0xb9, 0xd3, 0x77, 0x67, 0xd8, 0x46, 0x74, 0xd1,</div><div class='add'>+	0x3d, 0xc8, 0x35, 0xbe, 0x3f, 0xa9, 0x68, 0x9d, 0x7d, 0x01, 0x5f, 0xc2,</div><div class='add'>+	0xb8, 0x91, 0x38, 0x71, 0x29, 0x4f, 0x1a, 0xc7, 0x8a, 0x23, 0x4d, 0x7e,</div><div class='add'>+	0x6b, 0xae, 0x95, 0x5a, 0xf6, 0x2c, 0xcb, 0x93, 0x6a, 0xac, 0xe8, 0xc2,</div><div class='add'>+	0x19, 0xd4, 0xd9, 0xf7, 0x87, 0x9c, 0xdb, 0xc4, 0x48, 0xe4, 0xd3, 0xeb,</div><div class='add'>+	0xe8, 0xed, 0x93, 0x65, 0xda, 0x19, 0xbb, 0x56, 0xbe, 0x68, 0xad, 0xa3,</div><div class='add'>+	0x6c, 0xef, 0x43, 0x32, 0x97, 0x5c, 0x78, 0x28, 0x69, 0xe5, 0x43, 0x3e,</div><div class='add'>+	0xf7, 0x7c, 0x62, 0x42, 0x47, 0x84, 0xc8, 0xbf, 0x20, 0xcd, 0x0d, 0x20,</div><div class='add'>+	0x71, 0x6e, 0xd9, 0xfe, 0x02, 0x1f, 0x10, 0xb1, 0x6d, 0x9c, 0x33, 0x03,</div><div class='add'>+	0xa2, 0xd6, 0xb6, 0xd1, 0xe2, 0x7e, 0x03, 0xfc, 0xbe, 0x8f, 0xe6, 0x90,</div><div class='add'>+	0x43, 0x14, 0x44, 0x1e, 0xde, 0x0e, 0x78, 0x37, 0x0f, 0xbf, 0x1f, 0xb9,</div><div class='add'>+	0x01, 0xd3, 0xd8, 0x04, 0xfc, 0x6f, 0x03, 0xc6, 0x6b, 0x43, 0x9f, 0x6b,</div><div class='add'>+	0x22, 0xf1, 0x3d, 0x8f, 0xb7, 0x13, 0xd7, 0x65, 0xab, 0xf3, 0xf2, 0x9c,</div><div class='add'>+	0x3c, 0xf6, 0x61, 0xf9, 0xf6, 0xbe, 0x3e, 0xcf, 0xdc, 0x6d, 0x9e, 0xb9,</div><div class='add'>+	0xef, 0xf0, 0xcc, 0xed, 0xc3, 0xb7, 0x2e, 0x3e, 0x41, 0x7c, 0xeb, 0xae,</div><div class='add'>+	0xf1, 0xb7, 0x9e, 0x35, 0x5c, 0xdc, 0xdb, 0x3d, 0xb8, 0xbf, 0x8f, 0xf9,</div><div class='add'>+	0xb9, 0xcf, 0xf4, 0xf4, 0xf1, 0x9a, 0x1b, 0x68, 0x6e, 0xb0, 0x8d, 0x16,</div><div class='add'>+	0x4f, 0x72, 0x5f, 0xd0, 0x83, 0x0b, 0xe3, 0x17, 0x90, 0x63, 0x6d, 0x74,</div><div class='add'>+	0xf1, 0x64, 0x8b, 0xc0, 0x9b, 0xfd, 0xf9, 0xc6, 0xca, 0x9a, 0x57, 0xb0,</div><div class='add'>+	0xa6, 0x3b, 0x97, 0x89, 0x6f, 0x19, 0x96, 0xf1, 0xe3, 0x31, 0xee, 0xe3,</div><div class='add'>+	0xb1, 0x37, 0xcb, 0x5f, 0x33, 0x82, 0xce, 0x9e, 0x0d, 0xc6, 0xcd, 0xfd,</div><div class='add'>+	0x56, 0x6b, 0x26, 0x8b, 0xdb, 0x9d, 0x34, 0x1b, 0xd4, 0xc0, 0x37, 0x55,</div><div class='add'>+	0xfa, 0x28, 0xae, 0x23, 0xa8, 0x4a, 0xb4, 0x8f, 0xf9, 0xbc, 0x4e, 0xd6,</div><div class='add'>+	0xaf, 0x5b, 0x30, 0x6f, 0xd8, 0xcd, 0xd1, 0x88, 0xe5, 0x38, 0x27, 0xec,</div><div class='add'>+	0xbe, 0x26, 0xc7, 0xd9, 0xee, 0xb3, 0xdf, 0xc7, 0x53, 0xc8, 0xaa, 0x3c,</div><div class='add'>+	0xaf, 0x29, 0xed, 0xa0, 0x83, 0x50, 0xcf, 0x8b, 0xb2, 0x9e, 0xb2, 0xe8,</div><div class='add'>+	0xad, 0x99, 0x18, 0x4e, 0x1c, 0xe3, 0x9c, 0xed, 0xac, 0x85, 0xfe, 0xe0,</div><div class='add'>+	0xbd, 0x98, 0x00, 0x1e, 0x61, 0x8a, 0xe2, 0xaf, 0x50, 0xca, 0xe3, 0x69,</div><div class='add'>+	0xe1, 0xa9, 0xe0, 0xc9, 0xf5, 0x0c, 0x1d, 0x4f, 0xe8, 0x18, 0xec, 0x53,</div><div class='add'>+	0xb4, 0xef, 0x92, 0x93, 0x3f, 0x41, 0x37, 0xde, 0x9e, 0x74, 0xea, 0x51,</div><div class='add'>+	0x8b, 0xd6, 0x72, 0xf5, 0xa8, 0x3f, 0x67, 0x9e, 0x9c, 0x70, 0xeb, 0x51,</div><div class='add'>+	0x8b, 0x24, 0xea, 0x51, 0x27, 0x56, 0xa8, 0x47, 0x25, 0x56, 0x5f, 0x8f,</div><div class='add'>+	0xe2, 0xf9, 0x35, 0xda, 0xd7, 0x4f, 0xca, 0x17, 0x64, 0x3d, 0xea, 0x3d,</div><div class='add'>+	0x72, 0xea, 0x51, 0x17, 0xa9, 0x71, 0x3d, 0xea, 0x78, 0x5d, 0x3d, 0x2a,</div><div class='add'>+	0x28, 0xea, 0x51, 0x3c, 0x8f, 0x53, 0x8f, 0x12, 0xed, 0xbe, 0x88, 0xa7,</div><div class='add'>+	0xee, 0x42, 0xf4, 0xee, 0x64, 0x07, 0x68, 0x66, 0xd0, 0xf7, 0x1a, 0xda,</div><div class='add'>+	0x34, 0x45, 0xc8, 0xdb, 0x4a, 0x35, 0xd0, 0x07, 0x6e, 0xb8, 0xbe, 0xa2,</div><div class='add'>+	0xd0, 0x06, 0xcc, 0x9b, 0xec, 0x7b, 0xd8, 0x53, 0x63, 0x61, 0x9a, 0xff,</div><div class='add'>+	0x62, 0xea, 0x2c, 0x07, 0x45, 0x9d, 0xe5, 0x87, 0x6b, 0xbc, 0x75, 0x96,</div><div class='add'>+	0x45, 0xba, 0x7e, 0x9d, 0xe5, 0x60, 0x83, 0x3a, 0xcb, 0x5b, 0x54, 0xad,</div><div class='add'>+	0xb3, 0xbc, 0x45, 0xd5, 0x3a, 0xcb, 0xc1, 0x12, 0xe7, 0xe2, 0x3e, 0x89,</div><div class='add'>+	0x5f, 0x06, 0xed, 0x41, 0xf1, 0xc7, 0xb5, 0x97, 0xc5, 0xca, 0x1e, 0x7e,</div><div class='add'>+	0xd9, 0x6a, 0x2f, 0x6c, 0x03, 0x22, 0x17, 0x2e, 0xd7, 0xd4, 0x5e, 0xb8,</div><div class='add'>+	0x0d, 0x9d, 0xb1, 0xd7, 0x08, 0x19, 0x99, 0x83, 0x7f, 0x5f, 0x9c, 0x0c,</div><div class='add'>+	0x61, 0xce, 0x0e, 0xf8, 0x8c, 0x0e, 0xe4, 0x06, 0x61, 0xb4, 0x15, 0xda,</div><div class='add'>+	0x64, 0x0d, 0xa1, 0x8f, 0xc7, 0xd9, 0x0e, 0x43, 0xb7, 0x6c, 0x77, 0x7f,</div><div class='add'>+	0x0f, 0x48, 0x1a, 0x44, 0x68, 0xb8, 0x9d, 0xf4, 0x20, 0xfb, 0x8e, 0xc9,</div><div class='add'>+	0x3d, 0x74, 0xc8, 0xde, 0x22, 0xf6, 0xbd, 0xc1, 0xaa, 0x95, 0xb9, 0xc1,</div><div class='add'>+	0x1b, 0x90, 0xb9, 0xcc, 0xaa, 0x65, 0x8e, 0xe5, 0xcd, 0x39, 0xf7, 0xdd,</div><div class='add'>+	0x60, 0xf1, 0xfa, 0x1d, 0x02, 0xa7, 0x77, 0x1b, 0xc8, 0xfb, 0x18, 0xec,</div><div class='add'>+	0x8e, 0x33, 0xbf, 0x2e, 0xd7, 0xab, 0x8f, 0x87, 0x9f, 0x6d, 0x66, 0xff,</div><div class='add'>+	0xbd, 0x72, 0x3d, 0xb1, 0xde, 0x7f, 0xaf, 0xe4, 0x47, 0x15, 0x61, 0x93,</div><div class='add'>+	0xb3, 0x25, 0xae, 0xed, 0x7b, 0xf9, 0x33, 0x8f, 0x9c, 0x00, 0x7d, 0x42,</div><div class='add'>+	0x0f, 0x98, 0xae, 0x41, 0xf0, 0x01, 0xeb, 0xd8, 0x4f, 0xc9, 0x5a, 0x16,</div><div class='add'>+	0x9e, 0x05, 0x97, 0x7f, 0xad, 0xb0, 0x99, 0xee, 0x18, 0xdb, 0x01, 0x0b,</div><div class='add'>+	0xfe, 0x8f, 0xeb, 0x28, 0x7c, 0x8e, 0xca, 0xfd, 0x2e, 0x5f, 0xbb, 0x2e,</div><div class='add'>+	0xbc, 0xa7, 0x72, 0xbb, 0x5c, 0xce, 0x8a, 0x7a, 0x2d, 0xa9, 0x9d, 0x7d,</div><div class='add'>+	0xd3, 0x2d, 0x6c, 0x6b, 0xb6, 0x58, 0xae, 0xcc, 0x26, 0xf0, 0xce, 0x7c,</div><div class='add'>+	0x7d, 0x17, 0x36, 0x9c, 0xcf, 0xaa, 0xbf, 0x23, 0x6a, 0x04, 0x73, 0x36,</div><div class='add'>+	0xdb, 0x6b, 0x8e, 0x41, 0x7f, 0x0b, 0xb2, 0xc4, 0xef, 0x51, 0x71, 0x2e,</div><div class='add'>+	0x21, 0x6a, 0xf8, 0x83, 0xdc, 0x76, 0xed, 0x4a, 0x94, 0xed, 0x30, 0xf6,</div><div class='add'>+	0x5c, 0xa5, 0x31, 0xe2, 0x23, 0xc8, 0x0c, 0xc7, 0xb1, 0x0c, 0xe7, 0xc6,</div><div class='add'>+	0x9e, 0x9a, 0xa7, 0x66, 0xab, 0xcb, 0xb8, 0x88, 0x75, 0x39, 0x00, 0x9a,</div><div class='add'>+	0xed, 0x10, 0x31, 0xea, 0xb8, 0x5d, 0xa6, 0xea, 0x19, 0x3f, 0xd3, 0xdc,</div><div class='add'>+	0x39, 0xe7, 0x3f, 0x66, 0x2f, 0x47, 0xfb, 0xcd, 0x37, 0x48, 0x7b, 0x47,</div><div class='add'>+	0x1f, 0x6b, 0xe9, 0xae, 0x23, 0x7e, 0x71, 0xe9, 0xee, 0xfa, 0xa8, 0x49,</div><div class='add'>+	0x49, 0x83, 0xa8, 0xac, 0x2b, 0x7e, 0x5a, 0x9e, 0x29, 0xfd, 0x5f, 0xd8,</div><div class='add'>+	0xaf, 0xe2, 0xd9, 0xaf, 0xab, 0xbb, 0xfb, 0xe4, 0x7e, 0xc3, 0x75, 0xba,</div><div class='add'>+	0x1b, 0x97, 0x75, 0xb9, 0x5f, 0x84, 0xee, 0xba, 0x7b, 0xe2, 0xb5, 0xb7,</div><div class='add'>+	0x5c, 0x67, 0xdd, 0x67, 0x48, 0x8d, 0xaf, 0x14, 0x7b, 0xff, 0xb4, 0xf9,</div><div class='add'>+	0xe3, 0xc5, 0xde, 0x1f, 0x87, 0x9e, 0x5e, 0xbd, 0x65, 0x1a, 0xb6, 0x89,</div><div class='add'>+	0xb8, 0xc2, 0xd1, 0x1f, 0xd8, 0xe3, 0x82, 0x9f, 0x16, 0x1e, 0xd2, 0xe9,</div><div class='add'>+	0x9f, 0xee, 0xe4, 0xfa, 0xac, 0x26, 0x73, 0x7c, 0x6e, 0x7f, 0xb1, 0x95,</div><div class='add'>+	0x63, 0xab, 0x4d, 0xd6, 0x77, 0x44, 0x6e, 0x95, 0x57, 0x4d, 0x8f, 0x1f,</div><div class='add'>+	0x31, 0x30, 0xce, 0x63, 0x61, 0xba, 0x1c, 0xbc, 0x91, 0xb8, 0xbc, 0xcb,</div><div class='add'>+	0x58, 0xf4, 0xad, 0x26, 0x2e, 0xbf, 0x55, 0xf7, 0x5b, 0x7f, 0xdd, 0x7a,</div><div class='add'>+	0xbd, 0x3a, 0x47, 0x35, 0x2e, 0xe7, 0x7c, 0x3e, 0xe8, 0xd4, 0x18, 0x4c,</div><div class='add'>+	0x8e, 0xcf, 0xd7, 0x4a, 0x9e, 0xf0, 0x3b, 0x72, 0x11, 0x1b, 0x79, 0x08,</div><div class='add'>+	0x64, 0xfc, 0x55, 0xc8, 0xca, 0x2b, 0x36, 0xf2, 0x0e, 0x1b, 0xf9, 0x88,</div><div class='add'>+	0x8d, 0xdc, 0xc3, 0x46, 0xee, 0x61, 0xf7, 0xc8, 0x1c, 0x26, 0x23, 0xeb,</div><div class='add'>+	0x56, 0x7c, 0x46, 0xcb, 0xf9, 0x61, 0x5e, 0xc9, 0xd8, 0xe3, 0x7c, 0x1f,</div><div class='add'>+	0x41, 0x4d, 0xc6, 0x36, 0xca, 0x78, 0xf0, 0x38, 0xdf, 0x77, 0x28, 0xab,</div><div class='add'>+	0x71, 0xae, 0x45, 0x91, 0xaa, 0xc6, 0x6f, 0x87, 0x8f, 0xda, 0x0e, 0xbc,</div><div class='add'>+	0x9a, 0x79, 0xdc, 0xa7, 0xc6, 0x5b, 0x99, 0x76, 0x8a, 0x1a, 0x5f, 0x2b,</div><div class='add'>+	0xcf, 0x0d, 0x7a, 0x03, 0x0e, 0xfe, 0xdd, 0xdc, 0xd6, 0xd4, 0xf8, 0xdd,</div><div class='add'>+	0xec, 0xd3, 0xc2, 0xa4, 0xba, 0xfd, 0xb7, 0x07, 0x98, 0xae, 0xa4, 0xde,</div><div class='add'>+	0x16, 0xe0, 0xb8, 0x76, 0xde, 0xf6, 0x8b, 0x3b, 0x05, 0xc9, 0x18, 0xd7,</div><div class='add'>+	0xcc, 0xb8, 0x5d, 0xa5, 0xab, 0xba, 0x2c, 0x5d, 0xfd, 0x95, 0xfa, 0x3f,</div><div class='add'>+	0xd3, 0xd2, 0xc7, 0x70, 0xa2, 0x36, 0xc6, 0x34, 0x75, 0xe7, 0xe3, 0xf3,</div><div class='add'>+	0x66, 0x5e, 0x47, 0xdc, 0x63, 0xc0, 0xf3, 0x60, 0x33, 0xb5, 0x0d, 0x0e,</div><div class='add'>+	0xf9, 0x2d, 0xef, 0xba, 0x6c, 0x43, 0x76, 0x90, 0x37, 0xc7, 0x5a, 0x7e,</div><div class='add'>+	0xcd, 0xa8, 0x38, 0x1b, 0x49, 0xf6, 0x47, 0x85, 0xec, 0xb0, 0xac, 0x69,</div><div class='add'>+	0xe2, 0xce, 0xd5, 0x47, 0xe2, 0x1e, 0x09, 0xcb, 0x19, 0xcb, 0xf2, 0x78,</div><div class='add'>+	0x7f, 0x57, 0x58, 0x53, 0x5b, 0xb0, 0x46, 0x98, 0xd2, 0x25, 0x71, 0x56,</div><div class='add'>+	0x80, 0x7c, 0xe9, 0xdc, 0x3a, 0x6a, 0xfb, 0x07, 0xbd, 0x9a, 0xc7, 0x46,</div><div class='add'>+	0x9d, 0xb3, 0x7a, 0xbb, 0xde, 0xff, 0x8d, 0x8a, 0x73, 0x65, 0xc7, 0x06,</div><div class='add'>+	0xb9, 0xe7, 0xc3, 0xab, 0x3b, 0xff, 0xbe, 0xbe, 0x3e, 0xb5, 0xd4, 0xd7,</div><div class='add'>+	0x0d, 0x24, 0x0d, 0x98, 0x36, 0x8d, 0xcf, 0xee, 0xe7, 0x4b, 0x7c, 0xaf,</div><div class='add'>+	0x25, 0x12, 0xe3, 0xdc, 0x6d, 0x44, 0xdc, 0xf9, 0x50, 0x21, 0x85, 0x3a,</div><div class='add'>+	0x8d, 0x19, 0x9c, 0xf3, 0x85, 0x86, 0x7d, 0x71, 0xca, 0x64, 0x27, 0x48,</div><div class='add'>+	0x43, 0xac, 0x98, 0xa9, 0xd6, 0x03, 0x1f, 0x5c, 0x43, 0x96, 0x2b, 0x97,</div><div class='add'>+	0x51, 0xce, 0x1f, 0x6a, 0xce, 0xed, 0x16, 0xe9, 0xb0, 0x72, 0xa0, 0x74,</div><div class='add'>+	0x84, 0x0e, 0x34, 0x8c, 0x29, 0x1b, 0xd7, 0x03, 0x2f, 0xd6, 0xd5, 0x14,</div><div class='add'>+	0x16, 0x44, 0x4d, 0x21, 0xb7, 0xc6, 0x6f, 0x3d, 0x19, 0x70, 0xee, 0xb5,</div><div class='add'>+	0x34, 0xd6, 0x93, 0x5d, 0x15, 0x3d, 0x71, 0xe1, 0xf8, 0x2c, 0xbe, 0x8d,</div><div class='add'>+	0x76, 0x8a, 0xb5, 0x0e, 0x2b, 0x59, 0xbb, 0x95, 0x76, 0x1a, 0x0e, 0xd6,</div><div class='add'>+	0xa3, 0x36, 0xe3, 0x75, 0x58, 0x39, 0x68, 0xe7, 0x95, 0xb4, 0xa8, 0x3d,</div><div class='add'>+	0x70, 0x8c, 0xbf, 0xe6, 0xda, 0x30, 0x95, 0xe9, 0xed, 0x98, 0xfb, 0x3d,</div><div class='add'>+	0xc3, 0x78, 0x6b, 0x8a, 0x2e, 0x9d, 0xf8, 0x2e, 0x51, 0x58, 0xe6, 0x6f,</div><div class='add'>+	0xce, 0x7c, 0xb9, 0x29, 0xae, 0x25, 0xde, 0x8f, 0xfd, 0x33, 0xfc, 0x6e,</div><div class='add'>+	0x25, 0x39, 0x55, 0x2e, 0xa7, 0x31, 0x3e, 0xd6, 0x7b, 0xaf, 0xc8, 0x8d,</div><div class='add'>+	0xd4, 0x38, 0x0d, 0x71, 0x8e, 0xac, 0x2d, 0xc9, 0x91, 0xd3, 0xd0, 0x35,</div><div class='add'>+	0xc4, 0x20, 0x76, 0x13, 0xbe, 0x75, 0xe3, 0x91, 0xcf, 0xae, 0x75, 0x64,</div><div class='add'>+	0xe4, 0xbb, 0x12, 0x0f, 0x1e, 0xff, 0xfb, 0x80, 0x7b, 0x0f, 0x28, 0x77,</div><div class='add'>+	0x2a, 0x8d, 0xfd, 0x37, 0x51, 0xca, 0x74, 0xf2, 0xbb, 0xec, 0x99, 0x23,</div><div class='add'>+	0x1b, 0x6a, 0xe1, 0xd1, 0x77, 0xca, 0x85, 0x0f, 0xd6, 0xc1, 0xf3, 0x19,</div><div class='add'>+	0xd7, 0x5f, 0xd5, 0xc1, 0x07, 0x3d, 0xf0, 0x66, 0x1d, 0x3c, 0xe2, 0xae,</div><div class='add'>+	0x33, 0xdf, 0xa8, 0x83, 0x37, 0x3d, 0xf0, 0xed, 0x75, 0xf0, 0xed, 0x80,</div><div class='add'>+	0x7f, 0xa3, 0x0e, 0x1e, 0x7d, 0xa7, 0x90, 0x13, 0x08, 0xda, 0x70, 0x8c,</div><div class='add'>+	0x74, 0x48, 0xe6, 0x89, 0x78, 0x2e, 0xb9, 0x1f, 0xc9, 0xf2, 0xd3, 0x01,</div><div class='add'>+	0x1a, 0x7b, 0xeb, 0xb5, 0x09, 0xd8, 0xa8, 0xaa, 0x4c, 0x39, 0xfa, 0xea,</div><div class='add'>+	0x95, 0x25, 0x96, 0xbd, 0x3c, 0xe4, 0x15, 0x7a, 0x54, 0x80, 0x3e, 0x15,</div><div class='add'>+	0x5c, 0x5f, 0xca, 0x77, 0xaa, 0x22, 0xc7, 0x1d, 0x3d, 0x56, 0x68, 0xbd,</div><div class='add'>+	0x35, 0x2f, 0x73, 0x91, 0xab, 0x8c, 0x3b, 0xfc, 0x86, 0xeb, 0x3b, 0xe8,</div><div class='add'>+	0x84, 0x63, 0x57, 0x58, 0xbf, 0x79, 0x7e, 0x69, 0x5f, 0x4a, 0x2c, 0x87,</div><div class='add'>+	0xce, 0x3a, 0xe9, 0x25, 0x32, 0x1b, 0x5e, 0x52, 0x77, 0xf1, 0xd5, 0xd9,</div><div class='add'>+	0x77, 0x12, 0xf6, 0x3d, 0xd7, 0xe2, 0xb7, 0x36, 0xac, 0xbd, 0x9e, 0x7d,</div><div class='add'>+	0xcf, 0x78, 0xec, 0x7b, 0x38, 0x58, 0xf5, 0xf9, 0x8f, 0x09, 0x9f, 0xdf,</div><div class='add'>+	0xd1, 0xc0, 0x66, 0xac, 0xde, 0xe7, 0xef, 0xfd, 0xd8, 0x3e, 0x7f, 0xb9,</div><div class='add'>+	0x75, 0x57, 0xe3, 0xf3, 0x1f, 0x69, 0xf9, 0x78, 0x3e, 0x9f, 0xd7, 0xac,</div><div class='add'>+	0xaf, 0x65, 0x7a, 0xcf, 0x59, 0x8e, 0xca, 0x18, 0x7b, 0xb7, 0x27, 0xc6,</div><div class='add'>+	0x66, 0xfc, 0xbe, 0x27, 0xef, 0x02, 0x9e, 0x5e, 0xeb, 0xc8, 0xdb, 0x51,</div><div class='add'>+	0x19, 0xa7, 0x73, 0xec, 0x8d, 0xf7, 0xc2, 0x23, 0x90, 0xd1, 0x7c, 0x8f,</div><div class='add'>+	0x8f, 0x54, 0x9a, 0x35, 0x9d, 0xb3, 0xed, 0x9f, 0x6f, 0xae, 0x17, 0xa1,</div><div class='add'>+	0xcb, 0xc2, 0x9f, 0x24, 0x3e, 0x81, 0x5a, 0xea, 0x49, 0xc8, 0x8f, 0xbb,</div><div class='add'>+	0xaf, 0x95, 0x6a, 0xa9, 0xf5, 0xe7, 0x1f, 0x7c, 0xee, 0x41, 0xca, 0x03,</div><div class='add'>+	0x95, 0x73, 0x10, 0xaf, 0x4e, 0xe9, 0x94, 0x9d, 0x21, 0xdd, 0x8c, 0x93,</div><div class='add'>+	0xb2, 0x8f, 0x71, 0x8e, 0xfd, 0xb0, 0x52, 0x6f, 0x3f, 0x24, 0x6b, 0x30,</div><div class='add'>+	0xea, 0xb2, 0x77, 0x82, 0x7e, 0x02, 0x7c, 0x58, 0xaf, 0x9c, 0x1a, 0x8c,</div><div class='add'>+	0xea, 0xdc, 0x09, 0x3a, 0xfe, 0xf3, 0xbb, 0x13, 0xc4, 0xf3, 0x6b, 0xb4,</div><div class='add'>+	0xb7, 0xc1, 0x9d, 0x20, 0xdf, 0x2a, 0xef, 0x04, 0xad, 0x17, 0x35, 0x18,</div><div class='add'>+	0x9e, 0xc7, 0xa9, 0xc1, 0x70, 0xbb, 0xb3, 0x8f, 0xe5, 0x3a, 0x4c, 0xa3,</div><div class='add'>+	0x93, 0xb7, 0x88, 0x7b, 0xa8, 0x9d, 0x7d, 0xb5, 0xf2, 0xbd, 0xef, 0x13,</div><div class='add'>+	0x8d, 0xa5, 0x79, 0xbd, 0xa3, 0x0d, 0xef, 0xb6, 0x24, 0x3f, 0xc1, 0x9a,</div><div class='add'>+	0xcb, 0x21, 0x51, 0x73, 0xb9, 0xb3, 0xcd, 0x5b, 0x73, 0x51, 0x57, 0xb8,</div><div class='add'>+	0xdb, 0x72, 0xa8, 0x41, 0xcd, 0xc5, 0xef, 0xb9, 0xdb, 0xe2, 0xf7, 0xdc,</div><div class='add'>+	0x6d, 0x39, 0x24, 0xeb, 0x2b, 0xea, 0x2f, 0xd1, 0xdd, 0x96, 0xe4, 0x8a,</div><div class='add'>+	0x77, 0x5b, 0xb6, 0x4a, 0x7d, 0xf5, 0xc2, 0xaf, 0xfe, 0xbc, 0x32, 0x55,</div><div class='add'>+	0x67, 0xe7, 0x13, 0xc2, 0xce, 0xdf, 0xd5, 0xea, 0xb7, 0x9e, 0x69, 0xbb,</div><div class='add'>+	0x9e, 0x9d, 0xdf, 0x57, 0xd1, 0x53, 0xbe, 0xa3, 0xcd, 0x77, 0xbe, 0x58,</div><div class='add'>+	0x16, 0xf9, 0x7c, 0xa6, 0x89, 0x72, 0x03, 0xbf, 0x2a, 0x68, 0xf6, 0x58,</div><div class='add'>+	0x6f, 0xed, 0x99, 0x63, 0xf5, 0x5e, 0xa4, 0xee, 0xb9, 0x17, 0x69, 0xa2,</div><div class='add'>+	0x5f, 0xaf, 0xab, 0x87, 0x04, 0xe4, 0xdd, 0x7e, 0xf8, 0xc2, 0x19, 0x43,</div><div class='add'>+	0xda, 0x5e, 0xc4, 0x70, 0x98, 0xae, 0x50, 0xe4, 0x3b, 0x95, 0x6d, 0xe4,</div><div class='add'>+	0x9b, 0x71, 0xce, 0x4b, 0x54, 0x11, 0x63, 0x42, 0x8e, 0x8b, 0x7e, 0xe1,</div><div class='add'>+	0x6f, 0xd4, 0xb8, 0x23, 0xb3, 0xe3, 0xf6, 0x05, 0xe0, 0xbf, 0x21, 0x51,</div><div class='add'>+	0x6d, 0x9b, 0x95, 0x5a, 0xce, 0x58, 0xe5, 0x0e, 0xbf, 0x09, 0xfb, 0xe0,</div><div class='add'>+	0xdc, 0x07, 0xca, 0x98, 0x7c, 0x67, 0xe4, 0x62, 0x5b, 0xf5, 0x3e, 0xd0,</div><div class='add'>+	0x67, 0xa4, 0x9c, 0x3a, 0xf7, 0x81, 0x48, 0x4d, 0x40, 0x3e, 0x6e, 0xe4,</div><div class='add'>+	0x3e, 0x50, 0xd7, 0x92, 0xfb, 0x40, 0x2b, 0xf3, 0x66, 0xe9, 0x7d, 0xa0,</div><div class='add'>+	0xc6, 0xfc, 0xe1, 0xfb, 0x40, 0xff, 0xde, 0xe6, 0xdc, 0x43, 0x5d, 0x89,</div><div class='add'>+	0x3f, 0x6e, 0x9c, 0xf4, 0x11, 0xe0, 0xf9, 0x3e, 0x50, 0xe5, 0x1e, 0x90,</div><div class='add'>+	0xe7, 0x0e, 0x10, 0xdf, 0x25, 0x59, 0xee, 0x0c, 0xce, 0x7b, 0xff, 0xa4,</div><div class='add'>+	0xa7, 0x72, 0xff, 0xe4, 0x7c, 0xc9, 0xf5, 0xed, 0xee, 0xb9, 0x1c, 0xc7,</div><div class='add'>+	0x39, 0xbb, 0x44, 0x8e, 0x7a, 0xae, 0x54, 0x5b, 0xc3, 0x60, 0xbe, 0x8f,</div><div class='add'>+	0x16, 0xcf, 0x81, 0x3e, 0x6f, 0x89, 0xdc, 0x00, 0x7c, 0xde, 0xe2, 0x23,</div><div class='add'>+	0xe6, 0x1d, 0x29, 0xa0, 0x8b, 0x38, 0xcb, 0x75, 0xf8, 0xdd, 0x21, 0x64,</div><div class='add'>+	0xc1, 0x91, 0x8b, 0xdd, 0x9e, 0xf3, 0xd0, 0xaa, 0x1c, 0x38, 0x67, 0xba,</div><div class='add'>+	0x0e, 0xef, 0x6a, 0x65, 0x46, 0x9c, 0xdd, 0x0c, 0xed, 0xb5, 0x9c, 0xf3,</div><div class='add'>+	0xc6, 0xa8, 0x38, 0xb7, 0x6d, 0xaf, 0xb3, 0x5b, 0x3a, 0xe4, 0x06, 0x31,</div><div class='add'>+	0x67, 0x8c, 0xeb, 0xd5, 0x8c, 0xfb, 0x66, 0xc1, 0xe3, 0x46, 0x67, 0x71,</div><div class='add'>+	0x2b, 0xd7, 0xf1, 0xdc, 0x9a, 0x0a, 0x21, 0x97, 0xd8, 0x9d, 0xce, 0x09,</div><div class='add'>+	0xbb, 0xe9, 0xac, 0xdd, 0x29, 0xd6, 0xde, 0x58, 0x77, 0x96, 0xcd, 0x72,</div><div class='add'>+	0xb5, 0x5c, 0x4c, 0x70, 0x3d, 0x9a, 0xde, 0xb3, 0x84, 0xa6, 0xb5, 0xba,</div><div class='add'>+	0x84, 0xdc, 0xb5, 0x62, 0xe3, 0x3b, 0x2a, 0xba, 0x34, 0x2e, 0xee, 0x21,</div><div class='add'>+	0xbb, 0xe7, 0xb5, 0x0e, 0xfd, 0xaa, 0xba, 0xb7, 0x5c, 0x3c, 0x53, 0x4f,</div><div class='add'>+	0xbf, 0x4d, 0xff, 0x4b, 0xe8, 0x77, 0x15, 0xf4, 0xe3, 0x77, 0x03, 0xef,</div><div class='add'>+	0xef, 0x8a, 0x7a, 0xc0, 0xb9, 0x52, 0xe4, 0x78, 0x9e, 0x38, 0x4e, 0x88,</div><div class='add'>+	0xcc, 0x2e, 0x50, 0x0f, 0xe8, 0xc8, 0xff, 0xeb, 0xe2, 0xde, 0x9d, 0x60,</div><div class='add'>+	0xfa, 0xb2, 0x7d, 0x8f, 0xbc, 0x70, 0x99, 0xd8, 0xc6, 0xdf, 0x8d, 0x7d,</div><div class='add'>+	0x94, 0xcb, 0x2f, 0xc5, 0x5c, 0xfa, 0xb3, 0xee, 0x73, 0x9d, 0xaa, 0x76,</div><div class='add'>+	0x5f, 0x7b, 0x57, 0xed, 0x53, 0x1d, 0xf9, 0xcc, 0x34, 0x90, 0xcf, 0x8c,</div><div class='add'>+	0xdc, 0xa3, 0x6f, 0xa6, 0x71, 0xbc, 0x9a, 0x9a, 0xfc, 0xef, 0x5e, 0xae,</div><div class='add'>+	0x26, 0xb6, 0x8d, 0x22, 0x0a, 0xbf, 0xac, 0xd7, 0x4e, 0xe3, 0xa4, 0x61,</div><div class='add'>+	0x93, 0x3a, 0xad, 0x69, 0xd2, 0x60, 0xc7, 0x4b, 0x12, 0x29, 0xa5, 0xa4,</div><div class='add'>+	0x52, 0x55, 0x45, 0x60, 0xa9, 0x21, 0x4e, 0xda, 0x0a, 0x71, 0x70, 0x0b,</div><div class='add'>+	0x48, 0x51, 0xc5, 0x21, 0x4d, 0xd3, 0x7b, 0x85, 0x84, 0x54, 0xa1, 0x8a,</div><div class='add'>+	0x46, 0x4e, 0x02, 0x15, 0x4a, 0xe5, 0x0a, 0x96, 0x72, 0x41, 0xa2, 0xd8,</div><div class='add'>+	0x8e, 0x02, 0x52, 0x2a, 0xf7, 0xca, 0x85, 0xba, 0xbf, 0x08, 0x89, 0x03,</div><div class='add'>+	0x70, 0x06, 0x29, 0x2a, 0x3f, 0xe2, 0xc0, 0x8d, 0x1b, 0x54, 0x5d, 0xde,</div><div class='add'>+	0x37, 0xb3, 0x63, 0xaf, 0x77, 0xd7, 0x8e, 0x03, 0x11, 0x07, 0x27, 0xbb,</div><div class='add'>+	0xf6, 0xcc, 0xce, 0xec, 0xcc, 0x37, 0x6f, 0xbe, 0xf7, 0x37, 0xfd, 0xbe,</div><div class='add'>+	0x78, 0x8d, 0x5a, 0xdb, 0x5b, 0xf3, 0x55, 0xec, 0xe7, 0xaf, 0x37, 0x18,</div><div class='add'>+	0x57, 0xed, 0xba, 0xe4, 0xa9, 0xf5, 0xe3, 0x9a, 0x72, 0xd9, 0x1b, 0xf0,</div><div class='add'>+	0xfe, 0xc7, 0x68, 0x51, 0xd8, 0x86, 0x94, 0xad, 0xee, 0xc5, 0x40, 0x9b,</div><div class='add'>+	0xd9, 0xff, 0x33, 0x16, 0x03, 0x3e, 0x9b, 0x68, 0xad, 0x6d, 0x8a, 0xed,</div><div class='add'>+	0x71, 0xd9, 0x16, 0xde, 0xda, 0xc2, 0xb6, 0x10, 0x3c, 0x16, 0xfd, 0x9e,</div><div class='add'>+	0xb1, 0xa8, 0xc9, 0xea, 0xa1, 0x16, 0xed, 0x74, 0x88, 0x21, 0xbf, 0x9d,</div><div class='add'>+	0x67, 0x6c, 0x05, 0xca, 0xce, 0x4f, 0x5d, 0x36, 0x3c, 0xe0, 0x73, 0xdc,</div><div class='add'>+	0x59, 0xeb, 0xc0, 0x27, 0xb5, 0x9d, 0x1a, 0x51, 0xed, 0x01, 0x8f, 0xc9,</div><div class='add'>+	0xc5, 0x45, 0x82, 0xbe, 0x86, 0x36, 0xe3, 0x82, 0xe3, 0xfa, 0x39, 0x14,</div><div class='add'>+	0x8f, 0xf1, 0xfa, 0x1b, 0x88, 0xe5, 0x70, 0xda, 0x3f, 0xd9, 0x76, 0xae,</div><div class='add'>+	0x9c, 0xe5, 0xbd, 0x42, 0xd4, 0x63, 0xbd, 0xef, 0x52, 0xdb, 0x82, 0xa8,</div><div class='add'>+	0x27, 0xe3, 0x20, 0x1c, 0x1d, 0xd0, 0xe1, 0xe2, 0x8d, 0x74, 0x3f, 0xff,</div><div class='add'>+	0x9e, 0x13, 0xcc, 0xdd, 0x7f, 0xdd, 0x1d, 0x36, 0x3f, 0x34, 0x64, 0xae,</div><div class='add'>+	0xde, 0x56, 0xdc, 0x5d, 0xd9, 0x89, 0x06, 0x85, 0xaf, 0xc1, 0xad, 0x7b,</div><div class='add'>+	0x41, 0x76, 0x5d, 0xe0, 0x3d, 0x7c, 0xa8, 0xba, 0x7f, 0xef, 0x84, 0x7d,</div><div class='add'>+	0xe8, 0x99, 0x16, 0x62, 0x1d, 0x44, 0x8e, 0xe5, 0x2b, 0x53, 0xc8, 0x45,</div><div class='add'>+	0xaa, 0xe6, 0xef, 0x78, 0xf3, 0x3c, 0x20, 0x3f, 0x55, 0x9e, 0x87, 0xca,</div><div class='add'>+	0x23, 0xc5, 0x7b, 0x24, 0x02, 0xf2, 0x3c, 0xdc, 0x32, 0x18, 0xf5, 0xea,</div><div class='add'>+	0xdf, 0xc3, 0x2d, 0x7f, 0x57, 0x1c, 0xf9, 0x5b, 0xf0, 0xd8, 0xe3, 0x97,</div><div class='add'>+	0xf3, 0x6a, 0x2d, 0x20, 0xe7, 0x43, 0xf1, 0x94, 0xde, 0x00, 0x9e, 0x12,</div><div class='add'>+	0x9c, 0xeb, 0xa1, 0xa5, 0x2f, 0xf2, 0x5e, 0x7e, 0x08, 0x7b, 0xb9, 0x51,</div><div class='add'>+	0x8b, 0xe9, 0x95, 0x72, 0xf0, 0xdc, 0x3a, 0x64, 0xa2, 0xca, 0xb9, 0x81,</div><div class='add'>+	0x5c, 0x44, 0x2c, 0x3c, 0xe6, 0xba, 0xe4, 0x60, 0x11, 0xbf, 0xa9, 0x58,</div><div class='add'>+	0x52, 0xa5, 0x47, 0xbd, 0x23, 0xf2, 0x0c, 0xbe, 0x1b, 0x3f, 0xcc, 0x1c,</div><div class='add'>+	0x18, 0xf2, 0x13, 0x76, 0xa6, 0x43, 0x0e, 0x1f, 0xbe, 0xcc, 0xbf, 0x8d,</div><div class='add'>+	0x39, 0xd7, 0x92, 0x8b, 0xca, 0x6b, 0xa5, 0x4b, 0xfd, 0xd0, 0x41, 0xe6,</div><div class='add'>+	0x6f, 0x0e, 0x2f, 0xad, 0xb3, 0x41, 0xc4, 0x53, 0xda, 0xdb, 0x74, 0xa1,</div><div class='add'>+	0xd8, 0x0c, 0x83, 0xf5, 0xf8, 0x4b, 0x79, 0x38, 0x4f, 0x42, 0x70, 0x9e,</div><div class='add'>+	0x9f, 0x3a, 0xc2, 0xe6, 0x44, 0x4f, 0xb3, 0x38, 0x9c, 0x53, 0x55, 0xfc,</div><div class='add'>+	0xa9, 0x72, 0xaa, 0x6f, 0x8f, 0x3a, 0x10, 0xa7, 0xe6, 0xc7, 0x04, 0xe6,</div><div class='add'>+	0x1f, 0xfa, 0x9c, 0x5a, 0x87, 0xd0, 0xeb, 0x10, 0xf3, 0x87, 0x76, 0x8d,</div><div class='add'>+	0x06, 0x6b, 0xb0, 0x66, 0x13, 0x2f, 0x50, 0x2b, 0xb1, 0x7f, 0xc9, 0xd1,</div><div class='add'>+	0x0a, 0x9d, 0xed, 0x69, 0xa6, 0xf3, 0x9e, 0x08, 0xd4, 0x79, 0x83, 0x72,</div><div class='add'>+	0xa4, 0xcc, 0x80, 0x1c, 0x29, 0x37, 0x0e, 0x75, 0x17, 0x0e, 0xe3, 0x2e,</div><div class='add'>+	0x2e, 0x30, 0xc0, 0xdc, 0xb9, 0x8b, 0xf1, 0x04, 0xee, 0x1c, 0xa5, 0xd0,</div><div class='add'>+	0x07, 0x6e, 0xee, 0xec, 0xf7, 0x13, 0x49, 0x5c, 0xfe, 0xdb, 0xdc, 0xa9,</div><div class='add'>+	0xa0, 0x7e, 0x27, 0x7c, 0xfd, 0x86, 0x1c, 0x9f, 0x6c, 0xc8, 0x13, 0x82,</div><div class='add'>+	0x38, 0xfe, 0x4e, 0xf7, 0xd3, 0xbb, 0xf6, 0xd1, 0xa6, 0x09, 0xfd, 0x70,</div><div class='add'>+	0x74, 0xb1, 0xba, 0xee, 0x5f, 0xf0, 0xd9, 0xb9, 0xc1, 0x67, 0x43, 0xc2,</div><div class='add'>+	0x27, 0xd7, 0x25, 0xf6, 0x90, 0x9d, 0x93, 0x61, 0x9d, 0x1e, 0x19, 0x66,</div><div class='add'>+	0xf7, 0xd4, 0xec, 0xfc, 0x88, 0x21, 0xec, 0x73, 0x74, 0x0e, 0xb9, 0xef,</div><div class='add'>+	0x14, 0x1a, 0xc6, 0xa5, 0xe2, 0x3b, 0xe9, 0x1b, 0x38, 0x77, 0x04, 0xb2,</div><div class='add'>+	0x1b, 0xf2, 0xfc, 0xf4, 0x6c, 0xd8, 0x34, 0x1c, 0x1f, 0x03, 0xfc, 0x08,</div><div class='add'>+	0xc0, 0xa9, 0x7a, 0x7e, 0x90, 0x0d, 0x3d, 0x68, 0x0e, 0x87, 0x7c, 0x73,</div><div class='add'>+	0x28, 0xf1, 0x06, 0x6e, 0x8f, 0x58, 0xbc, 0x83, 0x9e, 0x38, 0xc5, 0x9d,</div><div class='add'>+	0x18, 0x93, 0xee, 0x80, 0x78, 0x41, 0xc4, 0xfa, 0xf9, 0xfa, 0xcb, 0xef,</div><div class='add'>+	0x7c, 0x51, 0xf3, 0xaf, 0xad, 0x49, 0x6d, 0xba, 0x3c, 0xad, 0x4d, 0x15,</div><div class='add'>+	0x51, 0xee, 0xa2, 0x56, 0xdb, 0x97, 0x36, 0x5d, 0x1c, 0x11, 0x7c, 0x30,</div><div class='add'>+	0x79, 0xad, 0x42, 0x78, 0x4f, 0xdb, 0xbe, 0x25, 0xb8, 0xed, 0x80, 0x0f,</div><div class='add'>+	0xab, 0x8a, 0x73, 0x18, 0x2d, 0xbc, 0x97, 0xb4, 0xbd, 0xb8, 0xb9, 0x8e,</div><div class='add'>+	0x5b, 0xbe, 0x3f, 0x1d, 0x20, 0xdf, 0x9b, 0xd9, 0x0a, 0x91, 0xbf, 0x29,</div><div class='add'>+	0xe2, 0xb2, 0xa9, 0x68, 0x21, 0xde, 0xf1, 0x30, 0xe2, 0x7b, 0xe1, 0xd7,</div><div class='add'>+	0xa8, 0x62, 0xe1, 0x6e, 0x30, 0x16, 0xaa, 0xf6, 0x60, 0x1d, 0xb9, 0xa3,</div><div class='add'>+	0x2c, 0x8b, 0xc3, 0xe9, 0x5e, 0x0a, 0x99, 0x28, 0xff, 0x6c, 0xe2, 0x3e,</div><div class='add'>+	0x1d, 0x73, 0x78, 0x09, 0xfc, 0x3c, 0xb2, 0xde, 0x4c, 0x0b, 0x76, 0xe1,</div><div class='add'>+	0x60, 0x7f, 0x46, 0x84, 0x65, 0xf3, 0x67, 0xbd, 0xad, 0xf9, 0x33, 0x54,</div><div class='add'>+	0x39, 0xd4, 0xed, 0xa2, 0x35, 0x0b, 0x71, 0x92, 0xf0, 0x2f, 0x75, 0x77,</div><div class='add'>+	0xb4, 0x9b, 0x41, 0xf2, 0x4f, 0xc5, 0x7e, 0x82, 0x1f, 0xc9, 0xb9, 0xba,</div><div class='add'>+	0x41, 0x98, 0x3b, 0x9b, 0xbe, 0x6f, 0x30, 0x57, 0xdb, 0xb1, 0x29, 0x37,</div><div class='add'>+	0x9f, 0x2b, 0xc3, 0x33, 0x57, 0xd8, 0x8b, 0x9a, 0xcd, 0x95, 0xf2, 0x43,</div><div class='add'>+	0x2a, 0xdf, 0xdc, 0x51, 0xc8, 0x93, 0x45, 0xf7, 0x5c, 0xed, 0x8c, 0x7f,</div><div class='add'>+	0x4e, 0xce, 0xd9, 0x4e, 0xfb, 0xe0, 0x1a, 0x8f, 0x43, 0x34, 0xd0, 0x76,</div><div class='add'>+	0x12, 0x2c, 0x33, 0xfc, 0x6b, 0xeb, 0x86, 0x5c, 0x5b, 0xcc, 0x2b, 0x9e,</div><div class='add'>+	0x6f, 0xb8, 0xb6, 0xb0, 0x0f, 0x5c, 0x70, 0xf6, 0x81, 0xd3, 0x3e, 0x7d,</div><div class='add'>+	0x51, 0xd9, 0xbc, 0xff, 0xab, 0xed, 0x0d, 0xcf, 0x7d, 0x22, 0xce, 0xe9,</div><div class='add'>+	0xc8, 0x91, 0xdc, 0x47, 0xce, 0x37, 0xe4, 0x61, 0x3d, 0xdb, 0x5c, 0xa7,</div><div class='add'>+	0x6a, 0xee, 0x91, 0x73, 0x01, 0x79, 0x99, 0xa5, 0xf3, 0xf9, 0xc7, 0x06,</div><div class='add'>+	0x75, 0xf7, 0x53, 0xa4, 0x1a, 0xd3, 0x72, 0x40, 0xf0, 0x61, 0xb7, 0xbe,</div><div class='add'>+	0xbc, 0xec, 0xe4, 0x28, 0xe6, 0x5c, 0x63, 0xb0, 0x9c, 0xcf, 0x36, 0x89,</div><div class='add'>+	0xa7, 0x6f, 0x25, 0x9e, 0x63, 0xc0, 0x23, 0x37, 0xbd, 0x73, 0x35, 0xa1,</div><div class='add'>+	0x65, 0xf2, 0xa8, 0xb3, 0x87, 0xce, 0xea, 0x9f, 0xf0, 0x18, 0x3d, 0xb1,</div><div class='add'>+	0x23, 0xe2, 0x9c, 0x11, 0xe0, 0xd2, 0xb6, 0x97, 0xcd, 0x0e, 0x5a, 0x94,</div><div class='add'>+	0x7e, 0x46, 0x9a, 0xfa, 0xf8, 0x12, 0x15, 0x85, 0x7f, 0x0b, 0xb9, 0x51,</div><div class='add'>+	0xb0, 0x71, 0xc3, 0x47, 0x87, 0xe7, 0xf0, 0xf7, 0x1b, 0x13, 0x8e, 0xcc,</div><div class='add'>+	0xfd, 0x93, 0x31, 0x8c, 0x7a, 0x38, 0x0b, 0x01, 0xeb, 0x9d, 0x34, 0xc9,</div><div class='add'>+	0x31, 0xb9, 0x1d, 0x71, 0x4e, 0x80, 0x8c, 0xcd, 0xbb, 0x5d, 0xde, 0x8e,</div><div class='add'>+	0x4f, 0xa1, 0x55, 0xbd, 0xe4, 0xeb, 0x68, 0xd8, 0xfc, 0x72, 0xcf, 0xf6,</div><div class='add'>+	0x7d, 0x0a, 0x2a, 0x77, 0x5f, 0x71, 0x58, 0x75, 0x2d, 0x73, 0x69, 0xc1,</div><div class='add'>+	0x99, 0xe7, 0xd7, 0x55, 0xde, 0x6d, 0x77, 0x40, 0xde, 0x6d, 0x88, 0xe6,</div><div class='add'>+	0x84, 0xaf, 0x2e, 0x44, 0x39, 0x47, 0x37, 0x93, 0x9c, 0x5a, 0xd9, 0x6a,</div><div class='add'>+	0x23, 0x4e, 0xfc, 0x29, 0xee, 0xdd, 0x39, 0xf9, 0x7c, 0x5f, 0x04, 0xcf,</div><div class='add'>+	0x46, 0x4e, 0xb5, 0x2d, 0x62, 0xf1, 0x33, 0xa2, 0x5c, 0xa7, 0xa7, 0x1c,</div><div class='add'>+	0xdf, 0x17, 0xd5, 0x33, 0x3b, 0xb9, 0x7c, 0x8a, 0x64, 0x0e, 0x7d, 0x27,</div><div class='add'>+	0xcd, 0x15, 0x9b, 0xf5, 0x6b, 0x1f, 0xe2, 0x81, 0xe3, 0xf0, 0x95, 0x0a,</div><div class='add'>+	0xbf, 0x95, 0xa1, 0xfa, 0x80, 0x3e, 0xb5, 0x57, 0xfb, 0x04, 0xf9, 0x14,</div><div class='add'>+	0x12, 0x7e, 0x05, 0xbe, 0x76, 0xda, 0x99, 0x23, 0x77, 0xbf, 0xc2, 0xdc,</div><div class='add'>+	0x2f, 0x3c, 0xa7, 0xd3, 0x55, 0xb6, 0xd3, 0x55, 0xb6, 0x36, 0x5e, 0x3a,</div><div class='add'>+	0xeb, 0x54, 0x0b, 0xe5, 0x1f, 0x59, 0x2f, 0xfd, 0x56, 0xd8, 0xe6, 0xe6,</div><div class='add'>+	0xb3, 0x06, 0x2d, 0xac, 0xf7, 0xf2, 0x27, 0xc6, 0x1f, 0x94, 0xdb, 0xcb,</div><div class='add'>+	0xff, 0xdd, 0x9c, 0xa2, 0x5f, 0xc4, 0x02, 0xb6, 0xce, 0x07, 0x83, 0xf1,</div><div class='add'>+	0x1f, 0xbc, 0x6e, 0x13, 0x01, 0xeb, 0xb6, 0xf9, 0xbe, 0x22, 0xf7, 0x93,</div><div class='add'>+	0xe4, 0x95, 0x8a, 0x23, 0xaf, 0x36, 0x69, 0xd0, 0x27, 0xa7, 0x82, 0xd6,</div><div class='add'>+	0x29, 0xfa, 0x78, 0xca, 0xe9, 0xe3, 0x9b, 0xa2, 0x3f, 0xe3, 0x54, 0xa8,</div><div class='add'>+	0xe6, 0x0d, 0x1f, 0xe1, 0xeb, 0x98, 0xb2, 0xd1, 0x35, 0x90, 0xab, 0xdf,</div><div class='add'>+	0x6c, 0x43, 0xc6, 0x04, 0x71, 0xb2, 0x03, 0x01, 0xfa, 0x80, 0xee, 0xd2,</div><div class='add'>+	0x07, 0xe2, 0x55, 0x7d, 0x60, 0x45, 0xe8, 0x09, 0xbb, 0x1c, 0x1d, 0x34,</div><div class='add'>+	0xd8, 0x16, 0x97, 0xcb, 0xe3, 0xcc, 0x1b, 0xd8, 0xf8, 0xa4, 0x1d, 0x7d,</div><div class='add'>+	0xda, 0xaa, 0x9e, 0x99, 0xc3, 0xba, 0x65, 0x8d, 0x4b, 0xfb, 0xe5, 0x09,</div><div class='add'>+	0xce, 0xac, 0xa8, 0xcc, 0x3e, 0x30, 0xa3, 0xa4, 0xa5, 0x93, 0xf1, 0xa9,</div><div class='add'>+	0x50, 0x84, 0x16, 0xac, 0x28, 0x15, 0xac, 0x14, 0x73, 0x70, 0xf0, 0xe3,</div><div class='add'>+	0xd0, 0x80, 0x46, 0x11, 0x96, 0x35, 0x11, 0x2a, 0x95, 0x94, 0x4e, 0x76,</div><div class='add'>+	0x86, 0xc8, 0x2c, 0xc6, 0xa4, 0x0d, 0x9b, 0x71, 0x9a, 0x1f, 0x33, 0xe6,</div><div class='add'>+	0x49, 0x43, 0xcc, 0x8b, 0x93, 0xa3, 0x0e, 0x0c, 0x8a, 0x38, 0x4b, 0xfd,</div><div class='add'>+	0xe5, 0x91, 0x28, 0xb5, 0xa7, 0xa5, 0xcd, 0x68, 0x86, 0xdb, 0xf8, 0xc2,</div><div class='add'>+	0x8a, 0xd1, 0x95, 0x7c, 0xd2, 0x38, 0xc1, 0xed, 0x64, 0xac, 0x64, 0x62,</div><div class='add'>+	0x92, 0x9f, 0x5d, 0x2c, 0x45, 0x28, 0x67, 0x45, 0xa8, 0x50, 0x4a, 0x19,</div><div class='add'>+	0x43, 0x6d, 0xa2, 0xcd, 0x18, 0xda, 0x7c, 0x49, 0x1f, 0x33, 0x4e, 0x92,</div><div class='add'>+	0xbb, 0xcd, 0xaf, 0x9c, 0x36, 0xbd, 0x6d, 0xfd, 0x61, 0xe3, 0xfe, 0x44,</div><div class='add'>+	0xa8, 0x32, 0x7b, 0x9f, 0xf1, 0x92, 0x5b, 0x9d, 0x60, 0xd9, 0x14, 0x13,</div><div class='add'>+	0x67, 0xdb, 0x68, 0xe9, 0x34, 0xcb, 0x1d, 0x9c, 0x6d, 0x61, 0xd0, 0x62,</div><div class='add'>+	0x39, 0x4e, 0xef, 0x57, 0xed, 0x07, 0x12, 0x43, 0x39, 0x91, 0x43, 0x84,</div><div class='add'>+	0x33, 0x17, 0x2a, 0xb3, 0xbf, 0x9b, 0x5e, 0x7f, 0x3f, 0xeb, 0x5b, 0x1f,</div><div class='add'>+	0xc5, 0x28, 0x72, 0x15, 0x71, 0xdd, 0x36, 0x5d, 0x1b, 0x4f, 0x5e, 0xd9,</div><div class='add'>+	0x14, 0x79, 0x68, 0x09, 0x5a, 0x33, 0xa5, 0x3c, 0xcd, 0x71, 0xf9, 0x15,</div><div class='add'>+	0x94, 0x5b, 0x4b, 0xd0, 0x3d, 0x91, 0x8f, 0xd6, 0x4e, 0x77, 0xf4, 0x18,</div><div class='add'>+	0x85, 0x6e, 0x9a, 0xc6, 0xbc, 0xf0, 0x0b, 0x57, 0x66, 0x87, 0x86, 0x0d,</div><div class='add'>+	0xd2, 0xae, 0xa2, 0x1e, 0xff, 0xbf, 0x89, 0xfb, 0x28, 0x61, 0x7e, 0x66,</div><div class='add'>+	0xac, 0x31, 0x5e, 0x49, 0xc3, 0xf1, 0x12, 0x64, 0xf3, 0x41, 0x89, 0xa5,</div><div class='add'>+	0x39, 0x23, 0x42, 0xd0, 0x5f, 0x61, 0x7b, 0xeb, 0x35, 0x27, 0x7b, 0xa4,</div><div class='add'>+	0xfe, 0xe4, 0x3b, 0x9b, 0x43, 0x9f, 0x19, 0x71, 0x9f, 0xcf, 0x51, 0x7b,</div><div class='add'>+	0x66, 0xc6, 0x92, 0xef, 0xb9, 0x52, 0xee, 0xa5, 0x25, 0x6e, 0x7b, 0x64,</div><div class='add'>+	0xf8, 0x8c, 0x73, 0xa6, 0x0f, 0xff, 0xd9, 0x8b, 0x7b, 0x85, 0xb7, 0x7d,</div><div class='add'>+	0x7d, 0x14, 0xc5, 0x3d, 0x0d, 0xe8, 0x3c, 0xc7, 0xb0, 0xe9, 0x87, 0xc5,</div><div class='add'>+	0xb8, 0xa7, 0xe2, 0x98, 0xcb, 0xb9, 0xb8, 0x3a, 0x97, 0x08, 0x65, 0xba,</div><div class='add'>+	0xe9, 0x91, 0xd5, 0x45, 0x3f, 0x8b, 0xf3, 0x47, 0xf8, 0xba, 0x84, 0x9c,</div><div class='add'>+	0xa3, 0x36, 0xca, 0x64, 0xbb, 0x69, 0xb3, 0x14, 0x66, 0x71, 0x05, 0xec,</div><div class='add'>+	0x44, 0xb9, 0x4c, 0x81, 0xa6, 0xd6, 0x5f, 0xeb, 0x83, 0x1f, 0x66, 0x52,</div><div class='add'>+	0xab, 0x61, 0xe9, 0x51, 0x00, 0x96, 0x7e, 0xa9, 0xc3, 0xd2, 0xd1, 0xbe,</div><div class='add'>+	0xe6, 0x58, 0xea, 0x77, 0x62, 0xd6, 0xa3, 0x14, 0x71, 0x70, 0xf4, 0x39,</div><div class='add'>+	0xe3, 0xe8, 0x3d, 0xc6, 0xd1, 0xf1, 0x06, 0x38, 0xd2, 0x3c, 0x38, 0x3a,</div><div class='add'>+	0x51, 0x87, 0xa3, 0x6c, 0x5f, 0x33, 0x1c, 0x1d, 0x0f, 0xa1, 0xff, 0xcd,</div><div class='add'>+	0xd6, 0x32, 0xfa, 0xb0, 0x9f, 0x39, 0xbd, 0x49, 0xa5, 0xd5, 0xe4, 0xf8,</div><div class='add'>+	0x24, 0x55, 0x90, 0x73, 0x92, 0x58, 0xa2, 0xb4, 0xe0, 0x76, 0x05, 0x81,</div><div class='add'>+	0xbf, 0x2c, 0x8f, 0xc9, 0xae, 0x06, 0xe7, 0xaa, 0x24, 0x9c, 0x79, 0x93,</div><div class='add'>+	0x73, 0x99, 0xc9, 0x57, 0x66, 0x1f, 0x32, 0x36, 0xee, 0x6d, 0xe8, 0x3a,</div><div class='add'>+	0x7e, 0x0b, 0xb1, 0x8c, 0xbc, 0xbb, 0x81, 0x73, 0x5b, 0xe2, 0x74, 0xdf,</div><div class='add'>+	0x1a, 0xa0, 0x7b, 0xd6, 0x7e, 0xba, 0x6b, 0x0d, 0xd2, 0x03, 0x0b, 0x6d,</div><div class='add'>+	0x60, 0x0e, 0xf8, 0x5e, 0xcc, 0x81, 0x46, 0x33, 0x31, 0x2e, 0x53, 0xda,</div><div class='add'>+	0x4f, 0x95, 0x92, 0xc2, 0x35, 0xb0, 0x03, 0x0c, 0x35, 0xc6, 0x4e, 0xa6,</div><div class='add'>+	0x0e, 0x3b, 0xb2, 0x0e, 0x30, 0xb3, 0xe4, 0xb7, 0xad, 0xed, 0x32, 0xf8,</div><div class='add'>+	0x5d, 0x0d, 0xc6, 0x56, 0x58, 0xc4, 0x91, 0x24, 0x47, 0x67, 0x42, 0x90,</div><div class='add'>+	0x59, 0xb7, 0x18, 0x53, 0x3c, 0x17, 0x3c, 0x7e, 0xda, 0xf5, 0x41, 0x96,</div><div class='add'>+	0x39, 0x4f, 0x09, 0x1b, 0xf4, 0x94, 0xa9, 0xc7, 0x33, 0x64, 0x5f, 0xd6,</div><div class='add'>+	0xcc, 0x31, 0x91, 0xeb, 0xb6, 0x54, 0xf6, 0x9e, 0x31, 0x91, 0xe1, 0xb1,</div><div class='add'>+	0x57, 0x78, 0xf4, 0xca, 0xa1, 0x76, 0xaa, 0x38, 0x31, 0x4c, 0x85, 0x55,</div><div class='add'>+	0xdb, 0x7e, 0xc8, 0xfc, 0x7f, 0xcd, 0x84, 0xcc, 0xfe, 0xdb, 0xae, 0xc4,</div><div class='add'>+	0x74, 0x5a, 0x36, 0x55, 0xdf, 0xee, 0x08, 0x7c, 0x31, 0x47, 0xa4, 0x77,</div><div class='add'>+	0x37, 0xaa, 0xaf, 0xc4, 0xbf, 0xe3, 0xbb, 0xbf, 0x04, 0x97, 0x59, 0xab,</div><div class='add'>+	0x96, 0x85, 0xed, 0xf8, 0xd2, 0xd8, 0xc2, 0x2a, 0xce, 0x7e, 0x7b, 0xfc,</div><div class='add'>+	0xea, 0xf9, 0xd5, 0x5c, 0x1f, 0x4b, 0xd8, 0x94, 0x4e, 0x76, 0x68, 0x79,</div><div class='add'>+	0x3c, 0xf7, 0x5c, 0x98, 0x86, 0x19, 0x97, 0x38, 0x83, 0x6b, 0x6c, 0x34,</div><div class='add'>+	0x2c, 0xce, 0x38, 0xd9, 0xcd, 0x78, 0xc8, 0x0a, 0x3b, 0xfd, 0xd4, 0x91,</div><div class='add'>+	0x09, 0x9a, 0x2c, 0xa7, 0xf9, 0x53, 0x3f, 0x7e, 0xb5, 0xb9, 0xe3, 0xe1,</div><div class='add'>+	0x48, 0xe3, 0x37, 0x37, 0xff, 0xa8, 0xd5, 0x9d, 0xe6, 0xba, 0x33, 0x5b,</div><div class='add'>+	0xd6, 0x55, 0xe7, 0x12, 0xfd, 0x03, 0x69, 0xae, 0x1b, 0xa3, 0xbc, 0x57,</div><div class='add'>+	0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static u32 bnx2_COM_b06FwRodata[(0x58/4) + 1] = {</div><div class='hunk'>@@ -989,952 +687,368 @@ static u32 bnx2_RXP_b06FwBssAddr = 0x08005900;</div><div class='ctx'> static int bnx2_RXP_b06FwBssLen = 0x13a4;</div><div class='ctx'> static u32 bnx2_RXP_b06FwSbssAddr = 0x080058e0;</div><div class='ctx'> static int bnx2_RXP_b06FwSbssLen = 0x1c;</div><div class='del'>-static u32 bnx2_RXP_b06FwText[(0x588c/4) + 1] = {</div><div class='del'>-	0x0a000c61, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x322e362e,</div><div class='del'>-	0x31000000, 0x02060103, 0x00000000, 0x0000000d, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d,</div><div class='del'>-	0x3c020800, 0x244258e0, 0x3c030800, 0x24636ca4, 0xac400000, 0x0043202b,</div><div class='del'>-	0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800,</div><div class='del'>-	0x26103184, 0x3c1c0800, 0x279c58e0, 0x0e00104a, 0x00000000, 0x0000000d,</div><div class='del'>-	0x27bdffe8, 0xafb00010, 0xafbf0014, 0x0e000f1d, 0x00808021, 0x1440000d,</div><div class='del'>-	0x00000000, 0x8f820010, 0x10400005, 0x00000000, 0x9743011c, 0x9742011e,</div><div class='del'>-	0x0a000c89, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825,</div><div class='del'>-	0xaf830004, 0x8f840008, 0x3c020020, 0x34424000, 0x00821824, 0x54620004,</div><div class='del'>-	0x3c020020, 0x8f820014, 0x0a000c9a, 0x34421000, 0x34428000, 0x00821824,</div><div class='del'>-	0x14620004, 0x00000000, 0x8f820014, 0x34428000, 0xaf820014, 0x8f820008,</div><div class='del'>-	0x9743010c, 0x00403021, 0x30421000, 0x10400010, 0x3069ffff, 0x30c20020,</div><div class='del'>-	0x1440000e, 0x24070005, 0x3c021000, 0x00c21024, 0x10400009, 0x3c030dff,</div><div class='del'>-	0x3463ffff, 0x3c020e00, 0x00c21024, 0x0062182b, 0x50600004, 0x24070001,</div><div class='del'>-	0x0a000cb2, 0x3c020800, 0x24070001, 0x3c020800, 0x8c430034, 0x1460001d,</div><div class='del'>-	0x00405821, 0x8f820014, 0x30424000, 0x1440001a, 0x3c020001, 0x3c021f01,</div><div class='del'>-	0x00c24024, 0x3c031000, 0x15030015, 0x3c020001, 0x31220200, 0x14400012,</div><div class='del'>-	0x3c020001, 0x9744010e, 0x24020003, 0xa342018b, 0x97850016, 0x24020002,</div><div class='del'>-	0x34e30002, 0xaf400180, 0xa742018c, 0xa7430188, 0x24840004, 0x30a5bfff,</div><div class='del'>-	0xa744018e, 0xa74501a6, 0xaf4801b8, 0x0a000f19, 0x00001021, 0x3c020001,</div><div class='del'>-	0x00c21024, 0x1040002f, 0x00000000, 0x9742010e, 0x3c038000, 0x3046ffff,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9784000a,</div><div class='del'>-	0x8f850004, 0x8f870014, 0x24020080, 0x24030002, 0xaf420180, 0x24020003,</div><div class='del'>-	0xa743018c, 0xa746018e, 0xa7420188, 0x30e28000, 0xa7440190, 0x1040000c,</div><div class='del'>-	0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000,</div><div class='del'>-	0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00e21024, 0xaf820014,</div><div class='del'>-	0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff,</div><div class='del'>-	0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x0a000f19,</div><div class='del'>-	0x00001021, 0x8f820014, 0x30434000, 0x10600016, 0x00404021, 0x3c020f00,</div><div class='del'>-	0x00c21024, 0x14400012, 0x00000000, 0x93420116, 0x34424000, 0x03421821,</div><div class='del'>-	0x94650002, 0x2ca21389, 0x1040000b, 0x3c020800, 0x24425900, 0x00051942,</div><div class='del'>-	0x00031880, 0x00621821, 0x30a5001f, 0x8c640000, 0x24020001, 0x00a21004,</div><div class='del'>-	0x00822024, 0x02048025, 0x12000030, 0x3c021000, 0x9742010e, 0x34e80002,</div><div class='del'>-	0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020003, 0xa342018b, 0x9784000a, 0x8f850004, 0x8f870014, 0x24020180,</div><div class='del'>-	0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0xa7480188, 0x30e28000,</div><div class='del'>-	0xa7440190, 0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021,</div><div class='del'>-	0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,</div><div class='del'>-	0x00e21024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff,</div><div class='del'>-	0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,</div><div class='del'>-	0xaf4201b8, 0x0a000f19, 0x00001021, 0x00c21024, 0x104000c0, 0x3c020800,</div><div class='del'>-	0x8c430030, 0x10600037, 0x31024000, 0x10400035, 0x3c030f00, 0x00c31824,</div><div class='del'>-	0x3c020100, 0x0043102b, 0x14400031, 0x3c030800, 0x9742010e, 0x34e80002,</div><div class='del'>-	0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020003, 0xa342018b, 0x9784000a, 0x8f850004, 0x8f870014, 0x24020080,</div><div class='del'>-	0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0xa7480188, 0x30e28000,</div><div class='del'>-	0xa7440190, 0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021,</div><div class='del'>-	0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,</div><div class='del'>-	0x00e21024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff,</div><div class='del'>-	0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,</div><div class='del'>-	0xaf4201b8, 0x0a000f19, 0x00001021, 0x3c030800, 0x8c620024, 0x30420008,</div><div class='del'>-	0x10400035, 0x34ea0002, 0x3c020f00, 0x00c21024, 0x14400032, 0x8d620034,</div><div class='del'>-	0x31220200, 0x1040002f, 0x8d620034, 0x9742010e, 0x30e8fffb, 0x3c038000,</div><div class='del'>-	0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,</div><div class='del'>-	0xa342018b, 0x9784000a, 0x8f850004, 0x8f870014, 0x24020180, 0x24030002,</div><div class='del'>-	0xaf420180, 0xa743018c, 0xa746018e, 0xa7480188, 0x30e28000, 0xa7440190,</div><div class='del'>-	0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,</div><div class='del'>-	0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00e21024,</div><div class='del'>-	0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,</div><div class='del'>-	0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,</div><div class='del'>-	0x8d620034, 0x8f860008, 0x10400012, 0x30c20100, 0x10400010, 0x3c020f00,</div><div class='del'>-	0x00c21024, 0x3c030200, 0x1043000c, 0x3c020800, 0x8c430038, 0x8f840004,</div><div class='del'>-	0x3c020800, 0x2442003c, 0x2463ffff, 0x00832024, 0x00822021, 0x90830000,</div><div class='del'>-	0x24630004, 0x0a000de1, 0x000329c0, 0x00000000, 0x00061602, 0x3042000f,</div><div class='del'>-	0x000229c0, 0x3c04fc00, 0x00441021, 0x3c030300, 0x0062182b, 0x50600001,</div><div class='del'>-	0x24050800, 0x9742010e, 0x3148ffff, 0x3c038000, 0x24420004, 0x3046ffff,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9783000a,</div><div class='del'>-	0x8f840004, 0x8f870014, 0x24020002, 0xaf450180, 0xa742018c, 0xa746018e,</div><div class='del'>-	0xa7480188, 0x30e28000, 0xa7430190, 0x1040000c, 0xaf4401a8, 0x93420116,</div><div class='del'>-	0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,</div><div class='del'>-	0x3c02ffff, 0x34427fff, 0x00e21024, 0xaf820014, 0x97820016, 0x9743010c,</div><div class='del'>-	0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,</div><div class='del'>-	0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x0a000f19, 0x00001021, 0x8f424000,</div><div class='del'>-	0x30420100, 0x104000d5, 0x3c020800, 0x8c440024, 0x24030001, 0x1483002f,</div><div class='del'>-	0x00405021, 0x9742010e, 0x34e70002, 0x3c038000, 0x24420004, 0x3045ffff,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9783000a,</div><div class='del'>-	0x8f840004, 0x8f860014, 0x24020002, 0xaf400180, 0xa742018c, 0xa745018e,</div><div class='del'>-	0xa7470188, 0x30c28000, 0xa7430190, 0x1040000c, 0xaf4401a8, 0x93420116,</div><div class='del'>-	0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,</div><div class='del'>-	0x3c02ffff, 0x34427fff, 0x00c21024, 0xaf820014, 0x97820016, 0x9743010c,</div><div class='del'>-	0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,</div><div class='del'>-	0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x0a000f19, 0x00001021, 0x30820001,</div><div class='del'>-	0x1040002e, 0x30eb0004, 0x9742010e, 0x30e9fffb, 0x3c038000, 0x24420004,</div><div class='del'>-	0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b,</div><div class='del'>-	0x9783000a, 0x8f840004, 0x8f860014, 0x24020002, 0xaf400180, 0xa742018c,</div><div class='del'>-	0xa745018e, 0xa7470188, 0x30c28000, 0xa7430190, 0x1040000c, 0xaf4401a8,</div><div class='del'>-	0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff,</div><div class='del'>-	0x14600004, 0x3c02ffff, 0x34427fff, 0x00c21024, 0xaf820014, 0x97820016,</div><div class='del'>-	0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825,</div><div class='del'>-	0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x3127ffff, 0x8d420024,</div><div class='del'>-	0x30420004, 0x10400030, 0x8d420024, 0x9742010e, 0x30e9fffb, 0x3c038000,</div><div class='del'>-	0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,</div><div class='del'>-	0xa342018b, 0x9784000a, 0x8f850004, 0x8f880014, 0x24020100, 0x24030002,</div><div class='del'>-	0xaf420180, 0xa743018c, 0xa746018e, 0xa7470188, 0x31028000, 0xa7440190,</div><div class='del'>-	0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,</div><div class='del'>-	0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x01021024,</div><div class='del'>-	0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,</div><div class='del'>-	0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,</div><div class='del'>-	0x3127ffff, 0x8d420024, 0x30420008, 0x1040002d, 0x00000000, 0x9742010e,</div><div class='del'>-	0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020003, 0xa342018b, 0x9784000a, 0x8f850004, 0x8f880014, 0x24020180,</div><div class='del'>-	0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0xa7470188, 0x31028000,</div><div class='del'>-	0xa7440190, 0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021,</div><div class='del'>-	0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,</div><div class='del'>-	0x01021024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff,</div><div class='del'>-	0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,</div><div class='del'>-	0xaf4201b8, 0x15600041, 0x00001021, 0x27440180, 0x3c038000, 0x8f4201b8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x24022000, 0x24030002, 0xa4820008, 0xa083000b,</div><div class='del'>-	0xa4800010, 0x3c021000, 0xaf4201b8, 0x0a000f19, 0x00001021, 0x3c030800,</div><div class='del'>-	0x8c620024, 0x30420001, 0x1040002e, 0x00001021, 0x9742010e, 0x34e70002,</div><div class='del'>-	0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x24020003, 0xa342018b, 0x9783000a, 0x8f840004, 0x8f860014, 0x24020002,</div><div class='del'>-	0xaf400180, 0xa742018c, 0xa745018e, 0xa7470188, 0x30c28000, 0xa7430190,</div><div class='del'>-	0x1040000c, 0xaf4401a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,</div><div class='del'>-	0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00c21024,</div><div class='del'>-	0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,</div><div class='del'>-	0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,</div><div class='del'>-	0x00001021, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x8f4b0070,</div><div class='del'>-	0x93420112, 0x8f840008, 0x00022882, 0x30820100, 0x14400003, 0x24a30003,</div><div class='del'>-	0x03e00008, 0x00001021, 0x30824000, 0x10400010, 0x27424000, 0x00031880,</div><div class='del'>-	0x00431021, 0x8c470000, 0x24a30004, 0x00031880, 0x27424000, 0x00431021,</div><div class='del'>-	0x8c490000, 0x93430116, 0x27424000, 0x306300fc, 0x00431021, 0x8c4a0000,</div><div class='del'>-	0x0a000f45, 0x3c030800, 0x30822000, 0x1040ffea, 0x00031880, 0x27424000,</div><div class='del'>-	0x00431021, 0x8c470000, 0x24a30004, 0x00031880, 0x27424000, 0x00431021,</div><div class='del'>-	0x8c490000, 0x00005021, 0x3c030800, 0x24680100, 0x00071602, 0x00021080,</div><div class='del'>-	0x00481021, 0x8c460000, 0x00071b82, 0x306303fc, 0x01031821, 0x8c640400,</div><div class='del'>-	0x00071182, 0x304203fc, 0x01021021, 0x8c450800, 0x30e300ff, 0x00031880,</div><div class='del'>-	0x01031821, 0x00091602, 0x00021080, 0x01021021, 0x00c43026, 0x8c640c00,</div><div class='del'>-	0x8c431000, 0x00c53026, 0x00091382, 0x304203fc, 0x01021021, 0x8c451400,</div><div class='del'>-	0x312200ff, 0x00021080, 0x01021021, 0x00c43026, 0x00c33026, 0x00091982,</div><div class='del'>-	0x306303fc, 0x01031821, 0x8c641800, 0x8c431c00, 0x00c53026, 0x00c43026,</div><div class='del'>-	0x11400015, 0x00c33026, 0x000a1602, 0x00021080, 0x01021021, 0x8c432000,</div><div class='del'>-	0x000a1382, 0x304203fc, 0x01021021, 0x8c452400, 0x314200ff, 0x00021080,</div><div class='del'>-	0x01021021, 0x00c33026, 0x000a1982, 0x306303fc, 0x01031821, 0x8c642800,</div><div class='del'>-	0x8c432c00, 0x00c53026, 0x00c43026, 0x00c33026, 0x8f430070, 0x3c050800,</div><div class='del'>-	0x8ca43100, 0x2c820020, 0x10400008, 0x006b5823, 0x3c020800, 0x24423104,</div><div class='del'>-	0x00041880, 0x00621821, 0x24820001, 0xac6b0000, 0xaca23100, 0xaf860004,</div><div class='del'>-	0x03e00008, 0x24020001, 0x27bdffe8, 0xafbf0010, 0x8f460128, 0x8f840010,</div><div class='del'>-	0xaf460020, 0x8f450104, 0x8f420100, 0x24030800, 0xaf850008, 0xaf820014,</div><div class='del'>-	0xaf4301b8, 0x1080000a, 0x3c020800, 0x8c430034, 0x10600007, 0x30a22000,</div><div class='del'>-	0x10400005, 0x34a30100, 0x8f82000c, 0xaf830008, 0x24420001, 0xaf82000c,</div><div class='del'>-	0x3c020800, 0x8c4300c0, 0x10600006, 0x3c030800, 0x8c6200c4, 0x24040001,</div><div class='del'>-	0x24420001, 0x0a000fd5, 0xac6200c4, 0x8f820008, 0x3c030010, 0x00431024,</div><div class='del'>-	0x14400009, 0x3c02001f, 0x3c030800, 0x8c620020, 0x00002021, 0x24420001,</div><div class='del'>-	0x0e000c78, 0xac620020, 0x0a000fd5, 0x00402021, 0x3442ff00, 0x14c20009,</div><div class='del'>-	0x2403bfff, 0x3c030800, 0x8c620020, 0x24040001, 0x24420001, 0x0e000c78,</div><div class='del'>-	0xac620020, 0x0a000fd5, 0x00402021, 0x8f820014, 0x00431024, 0x14400006,</div><div class='del'>-	0x00000000, 0xaf400048, 0x0e0011a9, 0xaf400040, 0x0a000fd5, 0x00402021,</div><div class='del'>-	0x0e001563, 0x00000000, 0x00402021, 0x10800005, 0x3c024000, 0x8f430124,</div><div class='del'>-	0x3c026020, 0xac430014, 0x3c024000, 0xaf420138, 0x00000000, 0x8fbf0010,</div><div class='del'>-	0x03e00008, 0x27bd0018, 0x27bdffe0, 0xafbf0018, 0xafb10014, 0xafb00010,</div><div class='del'>-	0x8f420140, 0xaf420020, 0x8f430148, 0x3c027000, 0x00621824, 0x3c023000,</div><div class='del'>-	0x10620021, 0x0043102b, 0x14400006, 0x3c024000, 0x3c022000, 0x10620009,</div><div class='del'>-	0x3c024000, 0x0a001040, 0x00000000, 0x10620045, 0x3c025000, 0x10620047,</div><div class='del'>-	0x3c024000, 0x0a001040, 0x00000000, 0x27440180, 0x3c038000, 0x8f4201b8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x8f420148, 0x24030002, 0xa083000b,</div><div class='del'>-	0x00021402, 0xa4820008, 0x8f430148, 0xa4830010, 0x8f420144, 0x3c031000,</div><div class='del'>-	0xac820024, 0xaf4301b8, 0x0a001040, 0x3c024000, 0x8f420148, 0x24030002,</div><div class='del'>-	0x3044ffff, 0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003,</div><div class='del'>-	0x10400005, 0x24020003, 0x0600001d, 0x36053000, 0x0a001027, 0x3c038000,</div><div class='del'>-	0x12020007, 0x00000000, 0x0a001034, 0x00000000, 0x0e00112c, 0x00000000,</div><div class='del'>-	0x0a001025, 0x00402021, 0x0e00113e, 0x00000000, 0x00402021, 0x36053000,</div><div class='del'>-	0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008,</div><div class='del'>-	0xa222000b, 0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8,</div><div class='del'>-	0x0a001040, 0x3c024000, 0x0000000d, 0x00000000, 0x240002bf, 0x0a001040,</div><div class='del'>-	0x3c024000, 0x0e001441, 0x00000000, 0x0a001040, 0x3c024000, 0x0e0015ea,</div><div class='del'>-	0x00000000, 0x3c024000, 0xaf420178, 0x00000000, 0x8fbf0018, 0x8fb10014,</div><div class='del'>-	0x8fb00010, 0x03e00008, 0x27bd0020, 0x24020800, 0x03e00008, 0xaf4201b8,</div><div class='del'>-	0x27bdffe8, 0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000,</div><div class='del'>-	0x2403ff7f, 0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000,</div><div class='del'>-	0x3c020008, 0xaf430008, 0x8e040808, 0x0342d825, 0x8e020808, 0x3c030800,</div><div class='del'>-	0xac600020, 0x3084fff0, 0x2c840001, 0x3042fff0, 0x38420010, 0x2c420001,</div><div class='del'>-	0xaf840010, 0xaf820000, 0x0e00160c, 0x00000000, 0x0e001561, 0x00000000,</div><div class='del'>-	0x3c020400, 0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c,</div><div class='del'>-	0x8e021980, 0x34420200, 0xae021980, 0x8f500000, 0x32020003, 0x1040fffd,</div><div class='del'>-	0x32020001, 0x10400004, 0x32020002, 0x0e000f92, 0x00000000, 0x32020002,</div><div class='del'>-	0x1040fff6, 0x00000000, 0x0e000fe0, 0x00000000, 0x0a001071, 0x00000000,</div><div class='del'>-	0x27bdffe8, 0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000,</div><div class='del'>-	0x2403ff7f, 0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000,</div><div class='del'>-	0x3c020008, 0xaf430008, 0x8e040808, 0x0342d825, 0x8e020808, 0x3c030800,</div><div class='del'>-	0xac600020, 0x3084fff0, 0x2c840001, 0x3042fff0, 0x38420010, 0x2c420001,</div><div class='del'>-	0xaf840010, 0xaf820000, 0x0e00160c, 0x00000000, 0x0e001561, 0x00000000,</div><div class='del'>-	0x3c020400, 0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c,</div><div class='del'>-	0x8e021980, 0x8fbf0014, 0x34420200, 0xae021980, 0x8fb00010, 0x03e00008,</div><div class='del'>-	0x27bd0018, 0x00804821, 0x30a5ffff, 0x30c6ffff, 0x30e7ffff, 0x3c038000,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9783000a,</div><div class='del'>-	0x8f840004, 0x8f880014, 0xaf490180, 0xa745018c, 0xa746018e, 0xa7470188,</div><div class='del'>-	0x31028000, 0xa7430190, 0x1040000c, 0xaf4401a8, 0x93420116, 0x304200fc,</div><div class='del'>-	0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,</div><div class='del'>-	0x34427fff, 0x01021024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104,</div><div class='del'>-	0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,</div><div class='del'>-	0x3c021000, 0xaf4201b8, 0x03e00008, 0x00000000, 0x27440180, 0x3c038000,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x24022000, 0x24030002, 0xa4820008,</div><div class='del'>-	0xa083000b, 0xa4800010, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00000000,</div><div class='del'>-	0x27440180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0x8f420148, 0x24030002, 0xa083000b, 0x00021402, 0xa4820008, 0x8f430148,</div><div class='del'>-	0xa4830010, 0x8f420144, 0x3c031000, 0xac820024, 0x03e00008, 0xaf4301b8,</div><div class='del'>-	0x27bdffe0, 0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420148, 0x24030002,</div><div class='del'>-	0x3044ffff, 0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003,</div><div class='del'>-	0x10400005, 0x24020003, 0x0600001d, 0x36053000, 0x0a001117, 0x3c038000,</div><div class='del'>-	0x12020007, 0x00000000, 0x0a001124, 0x00000000, 0x0e00112c, 0x00000000,</div><div class='del'>-	0x0a001115, 0x00402021, 0x0e00113e, 0x00000000, 0x00402021, 0x36053000,</div><div class='del'>-	0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008,</div><div class='del'>-	0xa222000b, 0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8,</div><div class='del'>-	0x0a001128, 0x8fbf0018, 0x0000000d, 0x00000000, 0x240002bf, 0x8fbf0018,</div><div class='del'>-	0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x3084ffff, 0x2c821389,</div><div class='del'>-	0x1040000d, 0x00001021, 0x3c030800, 0x24635900, 0x00042942, 0x00052880,</div><div class='del'>-	0x00a32821, 0x3086001f, 0x8ca40000, 0x24030001, 0x00c31804, 0x00832025,</div><div class='del'>-	0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x3084ffff, 0x2c821389,</div><div class='del'>-	0x1040000e, 0x00001021, 0x3c030800, 0x24635900, 0x00042942, 0x00052880,</div><div class='del'>-	0x00a32821, 0x3086001f, 0x24030001, 0x8ca40000, 0x00c31804, 0x00031827,</div><div class='del'>-	0x00832024, 0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x9482000c,</div><div class='del'>-	0x24870014, 0x00021302, 0x00021080, 0x00824021, 0x00e8182b, 0x1060004f,</div><div class='del'>-	0x00000000, 0x90e30000, 0x2c620009, 0x10400047, 0x3c020800, 0x24425890,</div><div class='del'>-	0x00031880, 0x00621821, 0x8c640000, 0x00800008, 0x00000000, 0x0a0011a4,</div><div class='del'>-	0x24e70001, 0x90e30001, 0x2402000a, 0x54620024, 0x01003821, 0x01071023,</div><div class='del'>-	0x2c42000a, 0x54400020, 0x01003821, 0x3c050800, 0x8ca26c98, 0x24e70002,</div><div class='del'>-	0x34420100, 0xaca26c98, 0x90e30000, 0x90e20001, 0x90e40002, 0x90e60003,</div><div class='del'>-	0x24e70004, 0x24a56c98, 0x00031e00, 0x00021400, 0x00621825, 0x00042200,</div><div class='del'>-	0x00641825, 0x00661825, 0xaca30004, 0x90e20000, 0x90e30001, 0x90e40002,</div><div class='del'>-	0x90e60003, 0x24e70004, 0x00021600, 0x00031c00, 0x00431025, 0x00042200,</div><div class='del'>-	0x00441025, 0x00461025, 0x0a0011a4, 0xaca20008, 0x90e30001, 0x24020004,</div><div class='del'>-	0x1062000e, 0x00601021, 0x0a00119e, 0x01001021, 0x90e30001, 0x24020003,</div><div class='del'>-	0x10620008, 0x00601021, 0x0a00119e, 0x01001021, 0x90e30001, 0x24020002,</div><div class='del'>-	0x14620003, 0x01001021, 0x00601021, 0x00e21021, 0x0a0011a4, 0x00403821,</div><div class='del'>-	0x90e20001, 0x0a0011a4, 0x00e23821, 0x01003821, 0x00e8102b, 0x5440ffb4,</div><div class='del'>-	0x90e30000, 0x03e00008, 0x24020001, 0x27bdff90, 0x3c030800, 0xafbf006c,</div><div class='del'>-	0xafbe0068, 0xafb70064, 0xafb60060, 0xafb5005c, 0xafb40058, 0xafb30054,</div><div class='del'>-	0xafb20050, 0xafb1004c, 0xafb00048, 0xac606c98, 0x93620023, 0x30420010,</div><div class='del'>-	0x1440027c, 0x24020001, 0x93420116, 0x93630005, 0x34424000, 0x30630001,</div><div class='del'>-	0x14600005, 0x0342b021, 0x0e0015e0, 0x00000000, 0x0a001436, 0x8fbf006c,</div><div class='del'>-	0x93420112, 0x8f430104, 0x3c040020, 0x34424000, 0x00641824, 0x10600012,</div><div class='del'>-	0x03422821, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x8f420128, 0xaca20000, 0x8f640040, 0x24030008, 0x240240c1,</div><div class='del'>-	0xa4a20008, 0x24020002, 0xa0a2000b, 0x3c021000, 0x0a0011f1, 0xa0a3000a,</div><div class='del'>-	0x8f420104, 0x3c030040, 0x00431024, 0x1040001d, 0x3c038000, 0x27450180,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000,</div><div class='del'>-	0x8f640040, 0x24030010, 0x240240c1, 0xa4a20008, 0x24020002, 0xa0a3000a,</div><div class='del'>-	0x24030008, 0xa0a2000b, 0x3c021000, 0xa4a30010, 0xa0a00012, 0xa0a00013,</div><div class='del'>-	0xaca00014, 0xaca00024, 0xaca00028, 0xaca0002c, 0xaca40018, 0x0e0015e0,</div><div class='del'>-	0xaf4201b8, 0x0a001436, 0x8fbf006c, 0x8f820000, 0x10400016, 0x00000000,</div><div class='del'>-	0x8f420104, 0x3c030001, 0x00431024, 0x10400011, 0x00000000, 0x8ca3000c,</div><div class='del'>-	0x8f620030, 0x1462022d, 0x24020001, 0x8ca30010, 0x8f62002c, 0x14620229,</div><div class='del'>-	0x24020001, 0x9763003a, 0x96c20000, 0x14430225, 0x24020001, 0x97630038,</div><div class='del'>-	0x96c20002, 0x14430221, 0x24020001, 0xaf400048, 0xaf400054, 0xaf400040,</div><div class='del'>-	0x8f740040, 0x8f650048, 0x00b43023, 0x04c10004, 0x00000000, 0x0000000d,</div><div class='del'>-	0x00000000, 0x240001af, 0x9742011a, 0x3052ffff, 0x12400004, 0x8ed30004,</div><div class='del'>-	0x02721021, 0x0a001228, 0x2451ffff, 0x02608821, 0x92d7000d, 0xa7a00020,</div><div class='del'>-	0xa3a0001a, 0xafa00028, 0x9362003f, 0x32e30004, 0x1060003a, 0x305000ff,</div><div class='del'>-	0x24040012, 0x16040006, 0x24020001, 0x3c040800, 0x8c830028, 0x24630001,</div><div class='del'>-	0x0a001328, 0xac830028, 0x8f620044, 0x16620010, 0x27a60010, 0x27450180,</div><div class='del'>-	0x3c038000, 0x2402001a, 0xa7a20020, 0x24020020, 0xafb40028, 0xa3b00022,</div><div class='del'>-	0xa3a40023, 0xa3a2001a, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,</div><div class='del'>-	0x0a00130d, 0x00000000, 0x8f620044, 0x02621023, 0x0440001a, 0x02651023,</div><div class='del'>-	0x044100d9, 0x24020001, 0x3c020800, 0x8c4300d8, 0x10600004, 0x24020001,</div><div class='del'>-	0xa7a20020, 0x0a00125e, 0xafb40028, 0x2402001a, 0xa7a20020, 0x24020020,</div><div class='del'>-	0xafb40028, 0xa3b00022, 0xa3a40023, 0xa3a2001a, 0x27a60010, 0x27450180,</div><div class='del'>-	0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a00130d,</div><div class='del'>-	0x00000000, 0x0a001328, 0x24020001, 0x0293f023, 0x1bc00016, 0x025e102a,</div><div class='del'>-	0x54400007, 0x32f700fe, 0x57d2000f, 0x027e9821, 0x32e20001, 0x5440000c,</div><div class='del'>-	0x027e9821, 0x32f700fe, 0x0240f021, 0x3c040800, 0x8c8300c8, 0x00009021,</div><div class='del'>-	0x24020001, 0xa7a20020, 0xafb40028, 0x24630001, 0x0a001282, 0xac8300c8,</div><div class='del'>-	0x025e1023, 0x0a001282, 0x3052ffff, 0x0000f021, 0x24a2ffff, 0x02221823,</div><div class='del'>-	0x1860001f, 0x0072102a, 0x54400019, 0x00a08821, 0x97a20020, 0x3c040800,</div><div class='del'>-	0x8c8300cc, 0xafb40028, 0x34420001, 0x24630001, 0xa7a20020, 0x02741026,</div><div class='del'>-	0x2c420001, 0xac8300cc, 0x2cc30001, 0x00431024, 0x1440000a, 0x02401821,</div><div class='del'>-	0x27a60010, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x0a00130d, 0x00000000, 0x00a08821, 0x02431023, 0x3052ffff,</div><div class='del'>-	0x0a0012ae, 0x32f700f6, 0x02741023, 0x18400008, 0x97a20020, 0x3c040800,</div><div class='del'>-	0x8c8300d4, 0xafb30028, 0x34420400, 0x24630001, 0xa7a20020, 0xac8300d4,</div><div class='del'>-	0x32e20002, 0x1040001c, 0x32e20010, 0x8f620044, 0x1662000d, 0x27a60010,</div><div class='del'>-	0x97a20020, 0x27450180, 0x3c038000, 0xafb40028, 0x34420001, 0xa7a20020,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a00130d, 0x00000000,</div><div class='del'>-	0x97a20020, 0x27450180, 0x3c038000, 0xafb40028, 0x34420001, 0xa7a20020,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a00130d, 0x00000000,</div><div class='del'>-	0x54400003, 0x8ed50008, 0x0a001328, 0x24020001, 0x8f630054, 0x26a2ffff,</div><div class='del'>-	0x00431023, 0x18400011, 0x27a60010, 0x97a20020, 0x3c040800, 0x8c8300d0,</div><div class='del'>-	0x27450180, 0x3c078000, 0xafb40028, 0x34420001, 0x24630001, 0xa7a20020,</div><div class='del'>-	0xac8300d0, 0x8f4201b8, 0x00471024, 0x1440fffd, 0x00000000, 0x0a00130d,</div><div class='del'>-	0x00000000, 0x32e20020, 0x10400011, 0x00000000, 0x96c20012, 0x0052102b,</div><div class='del'>-	0x10400008, 0x97a20020, 0x96d20012, 0x12400003, 0x02721021, 0x0a0012f2,</div><div class='del'>-	0x2451ffff, 0x02608821, 0x97a20020, 0x93a3001a, 0x34420008, 0x34630004,</div><div class='del'>-	0xa7a20020, 0xa3a3001a, 0x8f420104, 0x3c030080, 0x00431024, 0x10400037,</div><div class='del'>-	0x3a03000a, 0x0e001151, 0x02c02021, 0x24030002, 0x1443002b, 0x3c030800,</div><div class='del'>-	0x27a60010, 0x97a20020, 0x27450180, 0x3c038000, 0xafb40028, 0x34420001,</div><div class='del'>-	0xa7a20020, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128,</div><div class='del'>-	0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018, 0x90c4000a,</div><div class='del'>-	0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010, 0x90c30012,</div><div class='del'>-	0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014, 0x8cc20024,</div><div class='del'>-	0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc4002c, 0x24020001, 0x3c031000,</div><div class='del'>-	0xaca4002c, 0xaf4301b8, 0xaf400044, 0xaf400050, 0x0a001436, 0x8fbf006c,</div><div class='del'>-	0x8c626c98, 0x30420100, 0x10400003, 0x24636c98, 0x8c620004, 0xaf62017c,</div><div class='del'>-	0x3a03000a, 0x2c630001, 0x3a02000c, 0x2c420001, 0x00621825, 0x14600003,</div><div class='del'>-	0x2402000e, 0x56020030, 0x00009021, 0x52400008, 0x96c4000e, 0x12400004,</div><div class='del'>-	0xa7b20040, 0x02721021, 0x0a001343, 0x2451ffff, 0x02608821, 0x96c4000e,</div><div class='del'>-	0x93630035, 0x8f62004c, 0x00642004, 0x00952021, 0x00821023, 0x18400015,</div><div class='del'>-	0x00000000, 0x8f620018, 0x02621023, 0x1c400015, 0x97a20020, 0x8f620018,</div><div class='del'>-	0x1662001c, 0x00000000, 0x8f62001c, 0x02a21023, 0x1c40000e, 0x97a20020,</div><div class='del'>-	0x8f62001c, 0x16a20015, 0x00000000, 0x8f620058, 0x00821023, 0x18400011,</div><div class='del'>-	0x97a20020, 0x0a001364, 0xafb10028, 0x8f620058, 0x00821023, 0x0441000b,</div><div class='del'>-	0x97a20020, 0xafb10028, 0xafb30034, 0xafb50038, 0xafa4003c, 0x34420020,</div><div class='del'>-	0x0a00136d, 0xa7a20020, 0x02809821, 0x02608821, 0x8f640058, 0x8f62004c,</div><div class='del'>-	0x02a21023, 0x18400009, 0x00000000, 0x8f620054, 0x02a21023, 0x1c400005,</div><div class='del'>-	0x97a20020, 0xafb10028, 0xafb50024, 0x0a001385, 0x34420040, 0x9742011a,</div><div class='del'>-	0x1440000c, 0x24020014, 0x8f620058, 0x14820009, 0x24020014, 0x8f63004c,</div><div class='del'>-	0x8f620054, 0x10620004, 0x97a20020, 0xafb10028, 0x34420080, 0xa7a20020,</div><div class='del'>-	0x24020014, 0x1202000a, 0x2a020015, 0x10400005, 0x2402000c, 0x12020006,</div><div class='del'>-	0x32e20001, 0x0a0013c6, 0x00000000, 0x24020016, 0x16020035, 0x32e20001,</div><div class='del'>-	0x8f620084, 0x24420001, 0x16a20031, 0x32e20001, 0x24020014, 0x12020021,</div><div class='del'>-	0x2a020015, 0x10400005, 0x2402000c, 0x12020008, 0x32e20001, 0x0a0013c6,</div><div class='del'>-	0x00000000, 0x24020016, 0x1202000c, 0x32e20001, 0x0a0013c6, 0x00000000,</div><div class='del'>-	0x97a30020, 0x2402000e, 0xafb10028, 0xa3b00022, 0xa3a20023, 0xafb50024,</div><div class='del'>-	0x34630054, 0x0a0013c5, 0xa7a30020, 0x97a20020, 0x93a4001a, 0x24030010,</div><div class='del'>-	0xafb10028, 0xa3b00022, 0xa3a30023, 0xafb50024, 0x3442005d, 0x34840002,</div><div class='del'>-	0xa7a20020, 0x0a0013c5, 0xa3a4001a, 0x97a20020, 0x24030012, 0xa3a30023,</div><div class='del'>-	0x93a3001a, 0xafb10028, 0xa3b00022, 0xafb50024, 0x3042fffe, 0x3442005c,</div><div class='del'>-	0x34630002, 0xa7a20020, 0xa3a3001a, 0x32e20001, 0x10400030, 0x2402000c,</div><div class='del'>-	0x12020013, 0x2a02000d, 0x10400005, 0x2402000a, 0x12020008, 0x97a20020,</div><div class='del'>-	0x0a0013f8, 0x32e20009, 0x2402000e, 0x1202001b, 0x32e20009, 0x0a0013f9,</div><div class='del'>-	0x0002102b, 0x93a4001a, 0x24030008, 0xafb10028, 0xa3b00022, 0xa3a30023,</div><div class='del'>-	0x0a0013f4, 0x34420013, 0x97a30020, 0x30620004, 0x14400005, 0x93a2001a,</div><div class='del'>-	0x3463001b, 0xa7a30020, 0x0a0013e7, 0x24030016, 0x3463001b, 0xa7a30020,</div><div class='del'>-	0x24030010, 0xafb10028, 0xa3b00022, 0xa3a30023, 0x34420002, 0x0a0013f7,</div><div class='del'>-	0xa3a2001a, 0x97a20020, 0x93a4001a, 0x24030010, 0xafb10028, 0xa3b00022,</div><div class='del'>-	0xa3a30023, 0x3442001b, 0x34840002, 0xa7a20020, 0xa3a4001a, 0x32e20009,</div><div class='del'>-	0x0002102b, 0x00021023, 0x30420007, 0x12400015, 0x34450003, 0x8f820018,</div><div class='del'>-	0x24030800, 0x27440180, 0x24420001, 0xaf820018, 0x24020004, 0xaf4301b8,</div><div class='del'>-	0xa4850008, 0xa082000b, 0x93430120, 0x00003021, 0x3c021000, 0xa492000e,</div><div class='del'>-	0xac950024, 0xac930028, 0x007e1821, 0xa483000c, 0xaf4201b8, 0x0a001413,</div><div class='del'>-	0x97a20020, 0x24060001, 0x97a20020, 0x10400020, 0x27450180, 0x3c038000,</div><div class='del'>-	0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000,</div><div class='del'>-	0x8fa30028, 0x240240c1, 0xa4a20008, 0xaca30018, 0x93a4001a, 0x24020002,</div><div class='del'>-	0xa0a2000b, 0xa0a4000a, 0x97a20020, 0xa4a20010, 0x93a30022, 0xa0a30012,</div><div class='del'>-	0x93a20023, 0xa0a20013, 0x8fa30024, 0xaca30014, 0x8fa20034, 0xaca20024,</div><div class='del'>-	0x8fa30038, 0xaca30028, 0x8fa2003c, 0x3c031000, 0xaca2002c, 0xaf4301b8,</div><div class='del'>-	0x00c01021, 0x8fbf006c, 0x8fbe0068, 0x8fb70064, 0x8fb60060, 0x8fb5005c,</div><div class='del'>-	0x8fb40058, 0x8fb30054, 0x8fb20050, 0x8fb1004c, 0x8fb00048, 0x03e00008,</div><div class='del'>-	0x27bd0070, 0x8f470140, 0x8f460148, 0x3c028000, 0x00c24024, 0x00062c02,</div><div class='del'>-	0x30a300ff, 0x24020019, 0x106200e7, 0x27440180, 0x2862001a, 0x1040001f,</div><div class='del'>-	0x24020008, 0x106200be, 0x28620009, 0x1040000d, 0x24020001, 0x10620046,</div><div class='del'>-	0x28620002, 0x50400005, 0x24020006, 0x1060002e, 0x00a01821, 0x0a00155e,</div><div class='del'>-	0x00000000, 0x1062005b, 0x00a01821, 0x0a00155e, 0x00000000, 0x2402000b,</div><div class='del'>-	0x10620084, 0x2862000c, 0x10400005, 0x24020009, 0x106200bc, 0x00061c02,</div><div class='del'>-	0x0a00155e, 0x00000000, 0x2402000e, 0x106200b7, 0x00061c02, 0x0a00155e,</div><div class='del'>-	0x00000000, 0x28620021, 0x10400009, 0x2862001f, 0x104000c1, 0x2402001b,</div><div class='del'>-	0x106200bf, 0x2402001c, 0x1062009a, 0x00061c02, 0x0a00155e, 0x00000000,</div><div class='del'>-	0x240200c2, 0x106200ca, 0x286200c3, 0x10400005, 0x24020080, 0x1062005a,</div><div class='del'>-	0x00a01821, 0x0a00155e, 0x00000000, 0x240200c9, 0x106200cd, 0x30c5ffff,</div><div class='del'>-	0x0a00155e, 0x00000000, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd,</div><div class='del'>-	0x24020001, 0xa4830008, 0x24030002, 0xac870000, 0xac800004, 0xa082000a,</div><div class='del'>-	0xa083000b, 0xa4860010, 0x8f430144, 0x3c021000, 0xac800028, 0xac830024,</div><div class='del'>-	0x3c036000, 0xaf4201b8, 0x03e00008, 0xac600808, 0x11000009, 0x00a01821,</div><div class='del'>-	0x3c020800, 0x24030002, 0xa0436c88, 0x24426c88, 0xac470008, 0x8f430144,</div><div class='del'>-	0x03e00008, 0xac430004, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd,</div><div class='del'>-	0x24020002, 0xac800000, 0xac870004, 0xa4830008, 0xa082000a, 0xa082000b,</div><div class='del'>-	0xa4860010, 0xac800024, 0x8f420144, 0x3c031000, 0xac820028, 0x3c026000,</div><div class='del'>-	0xaf4301b8, 0x03e00008, 0xac400808, 0x3c080800, 0x3c058000, 0x8f4201b8,</div><div class='del'>-	0x00451024, 0x1440fffd, 0x00000000, 0xac870000, 0x91026c88, 0x00002821,</div><div class='del'>-	0x10400002, 0x25076c88, 0x8ce50008, 0xac850004, 0xa4830008, 0x91036c88,</div><div class='del'>-	0x24020002, 0xa082000b, 0xa4860010, 0x34630001, 0xa083000a, 0x8f420144,</div><div class='del'>-	0xac820024, 0x91036c88, 0x10600002, 0x00001021, 0x8ce20004, 0xac820028,</div><div class='del'>-	0x3c021000, 0xaf4201b8, 0x3c026000, 0xa1006c88, 0x03e00008, 0xac400808,</div><div class='del'>-	0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002, 0xa082000b,</div><div class='del'>-	0xa4830008, 0xa4860010, 0x8f420144, 0x3c031000, 0xa4820012, 0x03e00008,</div><div class='del'>-	0xaf4301b8, 0x30c2ffff, 0x14400028, 0x00061c02, 0x93620005, 0x30420004,</div><div class='del'>-	0x14400020, 0x3c029000, 0x34420001, 0x00e21025, 0xaf420020, 0x3c038000,</div><div class='del'>-	0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c038000,</div><div class='del'>-	0x34630001, 0x00e31825, 0x34420004, 0xa3620005, 0xaf430020, 0x93620005,</div><div class='del'>-	0x30420004, 0x14400003, 0x3c038000, 0x0000000d, 0x3c038000, 0x8f4201b8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x24020005, 0x3c031000, 0xac870000, 0xa082000b,</div><div class='del'>-	0xaf4301b8, 0x0a00150d, 0x00061c02, 0x0000000d, 0x03e00008, 0x00000000,</div><div class='del'>-	0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001,</div><div class='del'>-	0xa4830008, 0x24030002, 0xac870000, 0xac800004, 0xa082000a, 0xa083000b,</div><div class='del'>-	0xa4860010, 0x8f430144, 0x3c021000, 0xac800028, 0xac830024, 0x03e00008,</div><div class='del'>-	0xaf4201b8, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002,</div><div class='del'>-	0xac800000, 0xac870004, 0xa4830008, 0xa082000a, 0xa082000b, 0xa4860010,</div><div class='del'>-	0xac800024, 0x8f420144, 0x3c031000, 0xac820028, 0x03e00008, 0xaf4301b8,</div><div class='del'>-	0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001,</div><div class='del'>-	0xa4830008, 0x24030002, 0xa082000a, 0x3c021000, 0xac870000, 0xac800004,</div><div class='del'>-	0xa083000b, 0xa4860010, 0xac800024, 0xac800028, 0x03e00008, 0xaf4201b8,</div><div class='del'>-	0x00a01821, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002,</div><div class='del'>-	0xac870000, 0xac800004, 0xa4830008, 0xa080000a, 0x0a001518, 0xa082000b,</div><div class='del'>-	0x8f440144, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002,</div><div class='del'>-	0x240340c9, 0xaf470180, 0xa342018b, 0x3c021000, 0xa7430188, 0xaf4401a4,</div><div class='del'>-	0xaf4501a8, 0xaf4001ac, 0x03e00008, 0xaf4201b8, 0x0000000d, 0x03e00008,</div><div class='del'>-	0x00000000, 0x03e00008, 0x00000000, 0x8f420100, 0x3042003e, 0x14400011,</div><div class='del'>-	0x24020001, 0xaf400048, 0x8f420100, 0x304207c0, 0x10400005, 0x00000000,</div><div class='del'>-	0xaf40004c, 0xaf400050, 0x03e00008, 0x24020001, 0xaf400054, 0xaf400040,</div><div class='del'>-	0x8f420100, 0x30423800, 0x54400001, 0xaf400044, 0x24020001, 0x03e00008,</div><div class='del'>-	0x00000000, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002,</div><div class='del'>-	0x240340c9, 0xaf440180, 0xa342018b, 0x3c021000, 0xa7430188, 0xaf4501a4,</div><div class='del'>-	0xaf4601a8, 0xaf4701ac, 0x03e00008, 0xaf4201b8, 0x3c029000, 0x34420001,</div><div class='del'>-	0x00822025, 0xaf440020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x00000000, 0x03e00008, 0x00000000, 0x3c028000, 0x34420001, 0x00822025,</div><div class='del'>-	0x03e00008, 0xaf440020, 0x308600ff, 0x27450180, 0x3c038000, 0x8f4201b8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8f640040,</div><div class='del'>-	0x24030008, 0x240240c1, 0xa4a20008, 0x24020002, 0xa0a2000b, 0x3c021000,</div><div class='del'>-	0xa0a6000a, 0xa4a30010, 0xa0a00012, 0xa0a00013, 0xaca00014, 0xaca00024,</div><div class='del'>-	0xaca00028, 0xaca0002c, 0xaca40018, 0x03e00008, 0xaf4201b8, 0x24020001,</div><div class='del'>-	0xacc40000, 0x03e00008, 0xa4e50000, 0x24020001, 0xaf400044, 0x03e00008,</div><div class='del'>-	0xaf400050, 0x00803021, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1,</div><div class='del'>-	0xa4a20008, 0xaca30018, 0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a,</div><div class='del'>-	0x94c20010, 0xa4a20010, 0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013,</div><div class='del'>-	0x8cc30014, 0xaca30014, 0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028,</div><div class='del'>-	0x8cc2002c, 0x3c031000, 0xaca2002c, 0x24020001, 0xaf4301b8, 0xaf400044,</div><div class='del'>-	0x03e00008, 0xaf400050, 0x27bdffe8, 0xafbf0010, 0x0e001047, 0x00000000,</div><div class='del'>-	0x00002021, 0x0e000c78, 0xaf400180, 0x8fbf0010, 0x03e00008, 0x27bd0018,</div><div class='del'>-	0x8f460148, 0x27450180, 0x3c038000, 0x00061402, 0x304700ff, 0x8f4201b8,</div><div class='del'>-	0x00431024, 0x1440fffd, 0x00000000, 0x8f440140, 0x00061202, 0x304200ff,</div><div class='del'>-	0x00061c02, 0xaca20004, 0x24020002, 0xa4a30008, 0x30c300ff, 0xa0a2000b,</div><div class='del'>-	0xaca30024, 0x10e0000a, 0xaca40000, 0x28e20004, 0x14400005, 0x24020001,</div><div class='del'>-	0x24020005, 0x54e20005, 0xa0a0000a, 0x24020001, 0x0a001609, 0xa0a2000a,</div><div class='del'>-	0xa0a0000a, 0x3c021000, 0x03e00008, 0xaf4201b8, 0x03e00008, 0x00001021,</div><div class='del'>-	0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000,</div><div class='del'>-	0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a00161f, 0x00a01021,</div><div class='del'>-	0xac860000, 0x00000000, 0x00000000, 0x24840004, 0x00a01021, 0x1440fffa,</div><div class='del'>-	0x24a5ffff, 0x03e00008, 0x00000000, 0x00000000 }; </div><div class='add'>+static u8 bnx2_RXP_b06FwText[] = {</div><div class='add'>+	0x1f, 0x8b, 0x08, 0x08, 0x07, 0x87, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,</div><div class='add'>+	0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xed, 0x5c, 0x5d, 0x6c,</div><div class='add'>+	0x1c, 0xd7, 0x75, 0x3e, 0xf3, 0x43, 0x71, 0x49, 0x91, 0xd4, 0x70, 0xb9,</div><div class='add'>+	0x62, 0x57, 0x12, 0x65, 0xed, 0x8a, 0x43, 0x71, 0x6d, 0x31, 0xce, 0x50,</div><div class='add'>+	0x58, 0xdb, 0x82, 0xb1, 0x48, 0xc7, 0xb3, 0xa4, 0xc8, 0x24, 0x02, 0x42,</div><div class='add'>+	0x1b, 0x42, 0xab, 0xa4, 0xa9, 0xc1, 0x90, 0x72, 0x91, 0x22, 0x2c, 0xa0,</div><div class='add'>+	0x1a, 0x79, 0xf0, 0x43, 0x10, 0x2f, 0x56, 0x3f, 0xa6, 0xd1, 0x8d, 0x96,</div><div class='add'>+	0xb6, 0x1c, 0x53, 0x08, 0x82, 0x82, 0xe5, 0x52, 0x52, 0x0b, 0x2c, 0xb4,</div><div class='add'>+	0x96, 0xed, 0x36, 0x7e, 0xa8, 0x23, 0x9a, 0x92, 0x8d, 0xa6, 0x68, 0x81,</div><div class='add'>+	0x22, 0xad, 0xd1, 0xf4, 0x4d, 0x95, 0x9a, 0x4a, 0x75, 0x5f, 0xd4, 0xa2,</div><div class='add'>+	0x48, 0xda, 0x46, 0xcd, 0xf4, 0xfb, 0xee, 0xcc, 0x88, 0xd4, 0x9a, 0xb2,</div><div class='add'>+	0x2c, 0x3b, 0x0d, 0x62, 0x74, 0x0e, 0x30, 0xd8, 0xb9, 0x7f, 0xe7, 0xef,</div><div class='add'>+	0x9e, 0x73, 0xee, 0x39, 0x77, 0x28, 0x7d, 0xa5, 0x43, 0xda, 0x25, 0x84,</div><div class='add'>+	0x4e, 0x3c, 0x99, 0xc3, 0xcf, 0x3c, 0xfd, 0xe0, 0xc3, 0x0f, 0xee, 0xc1,</div><div class='add'>+	0xeb, 0xb0, 0xa1, 0x6d, 0xd0, 0xa3, 0xfe, 0x18, 0x62, 0x88, 0x21, 0x86,</div><div class='add'>+	0x18, 0x62, 0x88, 0x21, 0x86, 0x18, 0x62, 0x88, 0x21, 0x86, 0x18, 0x62,</div><div class='add'>+	0x88, 0x21, 0x86, 0x18, 0x62, 0x88, 0x21, 0x86, 0x18, 0x62, 0x88, 0x21,</div><div class='add'>+	0x86, 0x18, 0x62, 0x88, 0x21, 0x86, 0x18, 0x62, 0x88, 0x21, 0x86, 0x18,</div><div class='add'>+	0x62, 0x88, 0x21, 0x86, 0x18, 0x62, 0x88, 0x21, 0x86, 0x18, 0x62, 0x88,</div><div class='add'>+	0x21, 0x86, 0x18, 0x62, 0x88, 0x21, 0x86, 0xff, 0xef, 0x60, 0x88, 0x58,</div><div class='add'>+	0xfc, 0xed, 0x0c, 0x1f, 0x49, 0xe8, 0x85, 0xcb, 0x07, 0x3d, 0x5b, 0x12,</div><div class='add'>+	0x46, 0x61, 0x69, 0x66, 0xda, 0x16, 0x71, 0xeb, 0xbb, 0x33, 0x45, 0xf9,</div><div class='add'>+	0x1f, 0xbf, 0x94, 0x32, 0x85, 0xfd, 0xdb, 0x0b, 0x37, 0x9f, 0x7d, 0xf3,</div><div class='add'>+	0x91, 0xec, 0x8d, 0x05, 0x43, 0x12, 0x56, 0xe1, 0xe8, 0xb0, 0xb5, 0x4b,</div><div class='add'>+	0x12, 0x7d, 0x58, 0xf3, 0xdd, 0xc1, 0xcf, 0x59, 0xd2, 0x15, 0xe1, 0xba,</div><div class='add'>+	0xee, 0xbf, 0x39, 0x68, 0xc9, 0x2b, 0x8d, 0x94, 0x5c, 0x68, 0x6c, 0xdf,</div><div class='add'>+	0x24, 0x5d, 0xd9, 0x52, 0x09, 0xfd, 0x6e, 0x8a, 0xe3, 0x96, 0x94, 0xab,</div><div class='add'>+	0x2d, 0xe2, 0x2a, 0xba, 0x7d, 0x5a, 0x71, 0xfe, 0x3e, 0xcd, 0x9b, 0x7f,</div><div class='add'>+	0x9e, 0xff, 0x1e, 0x24, 0xa5, 0xcb, 0x7d, 0x68, 0xf7, 0xa1, 0xcd, 0xf7,</div><div class='add'>+	0x81, 0xf4, 0x94, 0x98, 0x72, 0xa4, 0x91, 0x90, 0xa3, 0xd5, 0x8c, 0xe8,</div><div class='add'>+	0x05, 0x71, 0xbd, 0xbc, 0x9d, 0x2e, 0xa3, 0x6f, 0xea, 0x00, 0xdb, 0x29,</div><div class='add'>+	0xe0, 0xf9, 0x0e, 0xd7, 0x59, 0x5e, 0x5e, 0x4a, 0xb7, 0xc6, 0x14, 0x0d,</div><div class='add'>+	0x8e, 0xb1, 0x0f, 0xbf, 0x58, 0x5f, 0xae, 0x76, 0x00, 0x6f, 0xd6, 0x71,</div><div class='add'>+	0x41, 0xdc, 0x73, 0x2c, 0xd0, 0xf6, 0xfd, 0xdf, 0x75, 0x32, 0xb2, 0xe2,</div><div class='add'>+	0x74, 0x81, 0xa7, 0x16, 0x69, 0xb5, 0xc5, 0xd2, 0x0b, 0xb6, 0xb5, 0x22,</div><div class='add'>+	0x6d, 0x1c, 0xeb, 0x34, 0x0a, 0xbe, 0x3f, 0x9d, 0x97, 0xae, 0xa0, 0x6f,</div><div class='add'>+	0xb7, 0xe2, 0x63, 0x72, 0x42, 0xc3, 0xbc, 0x57, 0x49, 0x0f, 0x3a, 0xe2,</div><div class='add'>+	0x3b, 0x7f, 0xf3, 0x52, 0xac, 0x6c, 0x97, 0xc9, 0x54, 0xf6, 0xa0, 0x1b,</div><div class='add'>+	0xd0, 0x74, 0x3d, 0x67, 0x2b, 0x70, 0x6a, 0xe0, 0x4f, 0xdb, 0x81, 0xf5,</div><div class='add'>+	0xee, 0x0a, 0x68, 0x1a, 0x85, 0xcd, 0x62, 0x6c, 0x66, 0x9f, 0xe8, 0x3b,</div><div class='add'>+	0x87, 0x93, 0xe1, 0x78, 0x97, 0x36, 0x32, 0x6f, 0x88, 0x6e, 0xff, 0x81,</div><div class='add'>+	0xe6, 0xd5, 0x7a, 0xe5, 0xd8, 0xbc, 0x8e, 0x77, 0x5d, 0xae, 0xe6, 0x4b,</div><div class='add'>+	0x9a, 0xdb, 0xa8, 0x68, 0xde, 0xd9, 0x59, 0xad, 0x78, 0xd6, 0x94, 0xa3,</div><div class='add'>+	0xb6, 0x7f, 0xe1, 0xb4, 0x73, 0x42, 0x1b, 0x39, 0x7b, 0x46, 0x1b, 0x3d,</div><div class='add'>+	0xfb, 0x86, 0x36, 0xde, 0xd8, 0xb2, 0x49, 0xda, 0xb3, 0xd0, 0x1e, 0x71,</div><div class='add'>+	0x90, 0xbf, 0x4f, 0x87, 0xba, 0xec, 0xa2, 0xde, 0x4a, 0xe4, 0x7d, 0x9f,</div><div class='add'>+	0xf3, 0x86, 0xe6, 0x55, 0x6d, 0x8b, 0xfb, 0xe6, 0xa6, 0x22, 0x1a, 0xed,</div><div class='add'>+	0x72, 0x74, 0xde, 0x94, 0x63, 0xd5, 0x94, 0x3c, 0x57, 0x2d, 0x29, 0x5a,</div><div class='add'>+	0x86, 0x5d, 0xd2, 0xbc, 0x06, 0xc7, 0x2b, 0xa0, 0x75, 0x42, 0xdb, 0x07,</div><div class='add'>+	0x9a, 0xde, 0x59, 0x29, 0x5d, 0x71, 0xe6, 0x40, 0xaf, 0x03, 0x78, 0xff,</div><div class='add'>+	0x58, 0x1b, 0x6d, 0xf4, 0x6a, 0xde, 0xc9, 0x9b, 0xe2, 0x39, 0x59, 0xeb,</div><div class='add'>+	0x4b, 0x62, 0xba, 0xb0, 0x01, 0xc8, 0x0c, 0xfd, 0x38, 0xd0, 0x49, 0xca,</div><div class='add'>+	0xf7, 0xf5, 0x82, 0xff, 0x2c, 0x74, 0x6f, 0x5d, 0xa1, 0xfc, 0x8d, 0x5e,</div><div class='add'>+	0x29, 0xcf, 0x53, 0xd7, 0xa6, 0x36, 0x52, 0xf5, 0x2f, 0x78, 0x8e, 0xf4,</div><div class='add'>+	0x19, 0xe2, 0xfb, 0x47, 0x9d, 0x81, 0xf4, 0x21, 0x39, 0x03, 0xdc, 0x75,</div><div class='add'>+	0xad, 0xd8, 0xa0, 0xae, 0xc1, 0xdf, 0x2d, 0x39, 0x02, 0xbd, 0x15, 0x9d,</div><div class='add'>+	0x5e, 0x99, 0xb4, 0xb2, 0x2e, 0xf6, 0x68, 0x53, 0x20, 0x57, 0x32, 0xb4,</div><div class='add'>+	0x17, 0xd2, 0xe7, 0xde, 0x67, 0xd3, 0x9e, 0xa1, 0xcb, 0x53, 0x2f, 0x3d,</div><div class='add'>+	0xdf, 0xb3, 0x38, 0xb4, 0x91, 0x32, 0x43, 0xff, 0xf2, 0x45, 0xcf, 0xf6,</div><div class='add'>+	0xb6, 0xb4, 0x48, 0x29, 0x6d, 0x48, 0x16, 0xfb, 0xb4, 0x43, 0x4e, 0x3b,</div><div class='add'>+	0x22, 0x87, 0x2a, 0xd0, 0x8d, 0x6d, 0x5a, 0x8b, 0x62, 0x67, 0xca, 0x32,</div><div class='add'>+	0x50, 0x32, 0x75, 0x74, 0x26, 0x49, 0x97, 0x3a, 0xd2, 0xe5, 0x7a, 0x9e,</div><div class='add'>+	0x7a, 0xa2, 0x3d, 0x7f, 0x28, 0x5d, 0x69, 0xab, 0xba, 0x5a, 0xd5, 0xd3,</div><div class='add'>+	0xf8, 0x2f, 0x5d, 0x4f, 0xd4, 0xc9, 0x72, 0x28, 0xb7, 0x03, 0xdc, 0x8f,</div><div class='add'>+	0x40, 0x5f, 0xe2, 0xea, 0xc3, 0x0f, 0xb1, 0x6f, 0x93, 0x51, 0xb0, 0xd3,</div><div class='add'>+	0x17, 0x61, 0x14, 0x7a, 0x61, 0x37, 0x64, 0x19, 0xa6, 0xee, 0xe0, 0xc3,</div><div class='add'>+	0x1f, 0x49, 0x5e, 0xf9, 0xd5, 0x90, 0x97, 0xfc, 0xdb, 0x32, 0x55, 0x49,</div><div class='add'>+	0x80, 0x06, 0x65, 0xd4, 0xe5, 0xbd, 0x7c, 0x64, 0x1b, 0x7b, 0x20, 0x5f,</div><div class='add'>+	0x5e, 0xa6, 0xbe, 0x45, 0x7f, 0xa2, 0xfd, 0xf3, 0x9d, 0xb2, 0xfe, 0xcc,</div><div class='add'>+	0xbf, 0xee, 0x7c, 0x92, 0xf6, 0x96, 0x7c, 0x27, 0xe4, 0x78, 0x35, 0xc9,</div><div class='add'>+	0x3d, 0xd4, 0x56, 0x54, 0x6c, 0x8a, 0x64, 0x14, 0xdd, 0x28, 0x74, 0x48,</div><div class='add'>+	0x51, 0xed, 0xf7, 0x5e, 0xd0, 0x43, 0x2c, 0xa8, 0xf2, 0xbd, 0xa0, 0x64,</div><div class='add'>+	0x9b, 0xb6, 0xed, 0xcc, 0x11, 0xc9, 0xc2, 0xbe, 0x45, 0x8e, 0xcc, 0x99,</div><div class='add'>+	0x32, 0x6d, 0xff, 0x63, 0xa7, 0xb4, 0x2f, 0xdf, 0x6f, 0xa8, 0xb8, 0xae,</div><div class='add'>+	0xf7, 0x6e, 0x90, 0x4d, 0xe0, 0x77, 0xf9, 0x7e, 0x5d, 0xe4, 0xa6, 0x59,</div><div class='add'>+	0xc8, 0x5a, 0x23, 0x08, 0xf6, 0x46, 0x81, 0xb1, 0x4c, 0x43, 0x2c, 0x93,</div><div class='add'>+	0x44, 0x8b, 0x4d, 0x7d, 0xf9, 0xfe, 0xf8, 0xf0, 0xdd, 0xf5, 0x75, 0x64,</div><div class='add'>+	0x9e, 0xb4, 0xa9, 0x2f, 0xc6, 0xa8, 0x12, 0xf4, 0xc1, 0xf8, 0x74, 0xbb,</div><div class='add'>+	0xae, 0x8a, 0xa1, 0xae, 0x46, 0xfe, 0xef, 0xed, 0xc2, 0xf5, 0xaa, 0xa2,</div><div class='add'>+	0x79, 0xce, 0xbb, 0xa1, 0x2f, 0xd8, 0x32, 0x02, 0x7f, 0x37, 0xec, 0x4f,</div><div class='add'>+	0xcb, 0x91, 0x54, 0x76, 0xc2, 0x95, 0xc0, 0xe6, 0xaf, 0xad, 0xb1, 0xf9,</div><div class='add'>+	0xd1, 0xbb, 0xc8, 0x75, 0x3c, 0x94, 0xcb, 0x0d, 0xe5, 0x1a, 0x85, 0x5c,</div><div class='add'>+	0x63, 0x90, 0x6b, 0xe5, 0x23, 0xc8, 0xb5, 0xf2, 0x91, 0xe5, 0xd2, 0xa4,</div><div class='add'>+	0xec, 0x3c, 0x08, 0x5a, 0xa6, 0xfc, 0xab, 0x13, 0xd8, 0xf2, 0xbf, 0x38,</div><div class='add'>+	0x9f, 0x14, 0x19, 0x7c, 0x7f, 0x70, 0xd8, 0x16, 0xef, 0x5b, 0xe0, 0xd5,</div><div class='add'>+	0x71, 0x40, 0x8b, 0xef, 0xef, 0x97, 0xe1, 0x6e, 0xfe, 0x38, 0x8b, 0x7d,</div><div class='add'>+	0x5d, 0xcf, 0x1f, 0x29, 0x87, 0x3e, 0x7c, 0xef, 0xfe, 0xa8, 0x6b, 0x1f,</div><div class='add'>+	0x55, 0x0e, 0xc6, 0x9c, 0x4f, 0x35, 0x9d, 0xab, 0x1f, 0x56, 0x86, 0xf5,</div><div class='add'>+	0x63, 0xca, 0x2f, 0x4f, 0x86, 0xc7, 0x64, 0x72, 0x33, 0xed, 0xa9, 0xa4,</div><div class='add'>+	0x8d, 0x0c, 0x92, 0xef, 0xb5, 0xfc, 0x4a, 0x26, 0xe0, 0x0d, 0x39, 0xd1,</div><div class='add'>+	0xd2, 0x46, 0x39, 0xb2, 0x60, 0x49, 0x69, 0xe9, 0x4e, 0x71, 0x57, 0x03,</div><div class='add'>+	0x6f, 0xb4, 0x47, 0xf6, 0x7d, 0xd2, 0x7c, 0x2a, 0xc8, 0x2b, 0x2e, 0x54,</div><div class='add'>+	0x91, 0x83, 0x56, 0x13, 0x72, 0xd9, 0x48, 0xcb, 0x9b, 0x83, 0x87, 0xe5,</div><div class='add'>+	0xf3, 0xd5, 0x24, 0xe8, 0x31, 0x9f, 0x2c, 0xe7, 0x10, 0x17, 0xb5, 0xb2,</div><div class='add'>+	0x63, 0x08, 0x79, 0xaf, 0xd9, 0x9c, 0x13, 0xc4, 0x96, 0x72, 0x10, 0x83,</div><div class='add'>+	0x5d, 0x6f, 0x50, 0xe5, 0x14, 0x90, 0x4f, 0x64, 0x0c, 0xb1, 0xb7, 0x66,</div><div class='add'>+	0xb3, 0xcd, 0xfe, 0xa0, 0xef, 0xb3, 0x95, 0x5e, 0xad, 0xc8, 0xbc, 0x64,</div><div class='add'>+	0xf0, 0xa6, 0x4c, 0x3b, 0x41, 0xdf, 0xe7, 0x2a, 0xa3, 0x9b, 0x98, 0x1f,</div><div class='add'>+	0x1a, 0x05, 0xc9, 0x94, 0x9d, 0xf7, 0x7c, 0xd7, 0xba, 0x7d, 0xcd, 0xfa,</div><div class='add'>+	0x78, 0xb2, 0x13, 0x81, 0xce, 0x45, 0xfb, 0xaa, 0xad, 0xf7, 0xb6, 0x4a,</div><div class='add'>+	0x09, 0x27, 0x5d, 0xd6, 0x1a, 0x47, 0xe7, 0xbe, 0x4a, 0x79, 0x5b, 0xab,</div><div class='add'>+	0xdc, 0x34, 0x80, 0x3f, 0x6d, 0x68, 0x62, 0x1e, 0xaa, 0x94, 0xbb, 0xd9,</div><div class='add'>+	0xa6, 0xbe, 0x74, 0x4d, 0x12, 0xa3, 0x15, 0x5f, 0xae, 0x3a, 0x41, 0xee,</div><div class='add'>+	0x63, 0x68, 0x7a, 0x6f, 0x5b, 0xb8, 0x56, 0xd7, 0x76, 0x39, 0x97, 0x44,</div><div class='add'>+	0x3a, 0x0e, 0x55, 0xc4, 0x2a, 0x56, 0x76, 0x39, 0x6f, 0x4b, 0xb9, 0xa7,</div><div class='add'>+	0x6d, 0x75, 0x5d, 0x8a, 0xeb, 0x76, 0x0e, 0xaf, 0x9d, 0xbb, 0xcb, 0xb9,</div><div class='add'>+	0x28, 0xe5, 0x2d, 0x6d, 0xab, 0xb4, 0xd2, 0x58, 0xdb, 0x17, 0xac, 0xe5,</div><div class='add'>+	0xf8, 0x66, 0x71, 0xbb, 0x39, 0x47, 0xef, 0x6d, 0xbf, 0x45, 0x43, 0x32,</div><div class='add'>+	0xc5, 0x4a, 0xb9, 0xa7, 0x7d, 0x15, 0xaf, 0x4d, 0xbc, 0xde, 0x1a, 0xbc,</div><div class='add'>+	0xc4, 0xd9, 0xbe, 0x8a, 0x33, 0x07, 0x9c, 0x43, 0xab, 0x38, 0x39, 0x7e,</div><div class='add'>+	0x58, 0x8a, 0x38, 0xd3, 0x5a, 0x0a, 0x32, 0xbc, 0x54, 0xc9, 0x48, 0x79,</div><div class='add'>+	0x28, 0x01, 0xdd, 0xf7, 0x1f, 0xfc, 0x9a, 0xaa, 0x43, 0xcc, 0x61, 0x0f,</div><div class='add'>+	0xba, 0x32, 0x55, 0x5e, 0x87, 0xd8, 0x08, 0xdb, 0xf8, 0x5a, 0x5d, 0x86,</div><div class='add'>+	0x17, 0xeb, 0xa6, 0x1c, 0x6f, 0x70, 0xbf, 0x98, 0xe3, 0x05, 0x75, 0xc6,</div><div class='add'>+	0x85, 0x46, 0x4e, 0xdb, 0x87, 0xbd, 0x66, 0x9d, 0xb0, 0xaf, 0x61, 0x6a,</div><div class='add'>+	0xa3, 0x3c, 0x1f, 0x80, 0x97, 0x76, 0x7e, 0xac, 0x41, 0xdb, 0x79, 0x03,</div><div class='add'>+	0xb6, 0x41, 0xce, 0xa3, 0x9c, 0xbd, 0x95, 0xb9, 0x53, 0x66, 0xd1, 0x51,</div><div class='add'>+	0x75, 0x88, 0x56, 0xcb, 0x77, 0x20, 0x07, 0x4d, 0xa0, 0xd6, 0x80, 0xcd,</div><div class='add'>+	0xdb, 0x78, 0x6f, 0x70, 0xde, 0x32, 0xe6, 0x6d, 0xe0, 0x3c, 0xec, 0xcd,</div><div class='add'>+	0x25, 0xe5, 0x0f, 0xa6, 0xcd, 0xf1, 0x77, 0xb1, 0xc7, 0x68, 0xd7, 0x59,</div><div class='add'>+	0x57, 0x58, 0x02, 0x5f, 0xc1, 0x3e, 0xa2, 0x6e, 0x48, 0xed, 0x60, 0x7e,</div><div class='add'>+	0x8f, 0xb9, 0x19, 0xcc, 0xcd, 0x66, 0x18, 0xcf, 0x3d, 0xfb, 0x99, 0x0e,</div><div class='add'>+	0xe9, 0x42, 0xbb, 0xce, 0x35, 0xd9, 0x0c, 0x72, 0x5b, 0xdf, 0xcb, 0xb7,</div><div class='add'>+	0xc9, 0x4a, 0xca, 0xbf, 0x60, 0xd8, 0xd1, 0xdc, 0x08, 0x6f, 0xf3, 0x5c,</div><div class='add'>+	0xe6, 0xc5, 0xc4, 0xbd, 0x21, 0xcc, 0x83, 0xc7, 0xc5, 0x6d, 0xfc, 0x49,</div><div class='add'>+	0xb7, 0x74, 0xb9, 0xf8, 0x8d, 0xe6, 0x4c, 0x6f, 0x0e, 0x6a, 0x2e, 0xbe,</div><div class='add'>+	0xb7, 0x50, 0x3e, 0x17, 0xe7, 0xa1, 0x56, 0xac, 0x66, 0x26, 0x59, 0x1f,</div><div class='add'>+	0x15, 0xeb, 0x6c, 0xef, 0x85, 0x3f, 0x04, 0x75, 0xd7, 0x85, 0x5b, 0xbe,</div><div class='add'>+	0x70, 0x19, 0x7a, 0x4b, 0x43, 0x6f, 0x29, 0x39, 0xdf, 0x60, 0x9d, 0xe6,</div><div class='add'>+	0x42, 0x5f, 0x19, 0xf1, 0x1a, 0xe3, 0x58, 0x2b, 0x87, 0x81, 0x03, 0x3a,</div><div class='add'>+	0x17, 0x47, 0x2f, 0x64, 0x65, 0xca, 0xda, 0x1d, 0xf1, 0x00, 0x5c, 0x88,</div><div class='add'>+	0x1f, 0x85, 0x36, 0xf4, 0xf1, 0x1d, 0x9a, 0x53, 0xff, 0x86, 0x7f, 0x94,</div><div class='add'>+	0xed, 0x09, 0xbd, 0x30, 0xd6, 0xd4, 0xbf, 0x6e, 0xfc, 0xa1, 0x1c, 0x68,</div><div class='add'>+	0x33, 0x06, 0x31, 0xfe, 0xe8, 0xa8, 0xf3, 0x18, 0x8b, 0x48, 0xd7, 0x92,</div><div class='add'>+	0x23, 0x4b, 0x23, 0xdc, 0x37, 0x8b, 0xf1, 0xa7, 0x5c, 0xe7, 0x9e, 0x29,</div><div class='add'>+	0x5c, 0xc0, 0x19, 0xad, 0xf1, 0xfd, 0x11, 0x87, 0x6b, 0x7c, 0x99, 0x70,</div><div class='add'>+	0x3a, 0xc4, 0x48, 0x96, 0xb4, 0xc7, 0x07, 0x11, 0x7b, 0x1e, 0xe0, 0x3e,</div><div class='add'>+	0x32, 0x06, 0x6d, 0x17, 0xb0, 0xea, 0xb4, 0x3c, 0x3c, 0xc8, 0x75, 0xa0,</div><div class='add'>+	0xdd, 0x2a, 0x7a, 0x92, 0x34, 0xf3, 0x21, 0x4f, 0x43, 0xdd, 0x81, 0xbe,</div><div class='add'>+	0x06, 0xac, 0x40, 0x7f, 0x9f, 0xe9, 0x5e, 0xd5, 0x1f, 0xd7, 0x35, 0xf3,</div><div class='add'>+	0xcb, 0x18, 0x96, 0x90, 0x81, 0x33, 0x1b, 0x65, 0xe7, 0xa2, 0x25, 0xf6,</div><div class='add'>+	0x99, 0x55, 0xfe, 0x76, 0x9e, 0x5b, 0xcb, 0x5f, 0xf4, 0x7f, 0x15, 0x5c,</div><div class='add'>+	0xd0, 0xc5, 0x8e, 0xfa, 0x1e, 0x4b, 0x05, 0xb8, 0xa3, 0xf6, 0x7b, 0xe1,</div><div class='add'>+	0x5e, 0xf1, 0xfd, 0x99, 0x70, 0x4f, 0xb0, 0x07, 0x88, 0x95, 0xe7, 0x6f,</div><div class='add'>+	0xc5, 0xa9, 0x0c, 0xf6, 0x06, 0xb6, 0xa7, 0xe2, 0x11, 0xe3, 0x18, 0xed,</div><div class='add'>+	0xbb, 0x63, 0xd2, 0x2c, 0xb0, 0x8e, 0xe6, 0x3e, 0xc9, 0x44, 0xb9, 0x22,</div><div class='add'>+	0xa5, 0xad, 0x85, 0x67, 0x7d, 0xd8, 0xcf, 0xa4, 0xa5, 0x6c, 0xaf, 0x63,</div><div class='add'>+	0xaf, 0x97, 0x37, 0xa0, 0x1b, 0x8c, 0xc1, 0x26, 0xf5, 0x42, 0x42, 0x8a,</div><div class='add'>+	0x8d, 0x44, 0xc2, 0x3c, 0x31, 0xf0, 0x23, 0xcf, 0x48, 0x24, 0xf4, 0x13,</div><div class='add'>+	0x81, 0x9d, 0x4d, 0xd6, 0x6f, 0x20, 0x56, 0x6a, 0x72, 0x74, 0xe8, 0x86,</div><div class='add'>+	0xcf, 0x1a, 0xd8, 0xdb, 0x0b, 0x9b, 0x1b, 0x82, 0xcf, 0x80, 0x8f, 0x72,</div><div class='add'>+	0xa3, 0xa3, 0x37, 0xe0, 0xed, 0x2b, 0x11, 0x8f, 0xa6, 0x8e, 0xdc, 0xd3,</div><div class='add'>+	0xcb, 0xfb, 0xbe, 0x51, 0xd8, 0x90, 0x98, 0xce, 0x8f, 0x6f, 0xd1, 0xcf,</div><div class='add'>+	0xed, 0xdf, 0x62, 0x9c, 0x2b, 0x6d, 0x01, 0x3e, 0xdd, 0xcb, 0xe3, 0xf7,</div><div class='add'>+	0x9c, 0xc8, 0x44, 0x15, 0x3a, 0xdf, 0x03, 0x3d, 0x59, 0xf0, 0xc5, 0x3d,</div><div class='add'>+	0xa6, 0xca, 0xd1, 0xf5, 0x3d, 0x2f, 0x6e, 0x0a, 0x70, 0xf0, 0xfd, 0x27,</div><div class='add'>+	0x7e, 0x70, 0x86, 0x5e, 0x0e, 0xfb, 0x7e, 0x3f, 0xdc, 0x87, 0x5f, 0x45,</div><div class='add'>+	0xb9, 0x78, 0x5e, 0x44, 0xb2, 0xad, 0x3d, 0x37, 0xb2, 0xe3, 0x25, 0x9c,</div><div class='add'>+	0x33, 0xa7, 0x1d, 0xdf, 0x7f, 0x07, 0xcf, 0x35, 0xa7, 0xd9, 0x46, 0xde,</div><div class='add'>+	0x7f, 0xf6, 0x31, 0x07, 0xf8, 0x2c, 0xce, 0xbd, 0xd1, 0xa6, 0xb3, 0xff,</div><div class='add'>+	0x5e, 0xcf, 0xbd, 0x7b, 0x3f, 0xfb, 0xc9, 0xf3, 0x1d, 0x7d, 0xef, 0x03,</div><div class='add'>+	0xce, 0xfe, 0x0f, 0x5c, 0x77, 0x0f, 0x3e, 0x1b, 0xd8, 0x6d, 0xb1, 0xd1,</div><div class='add'>+	0x1c, 0x5f, 0xee, 0xd5, 0x7f, 0x7f, 0xad, 0xfb, 0x76, 0xff, 0xb5, 0xbb,</div><div class='add'>+	0x6f, 0xf7, 0xdf, 0xcd, 0xdd, 0xbf, 0x18, 0xff, 0xcd, 0x01, 0x0f, 0x7d,</div><div class='add'>+	0x70, 0xad, 0xff, 0xae, 0xe7, 0x93, 0xd4, 0xf7, 0xf3, 0x3d, 0xe5, 0xa1,</div><div class='add'>+	0xce, 0x30, 0x1f, 0x52, 0xe7, 0xf5, 0x17, 0xa7, 0x6d, 0xef, 0x7e, 0x53,</div><div class='add'>+	0x4a, 0xb9, 0x16, 0xc9, 0xe6, 0x6a, 0xb2, 0x43, 0x8e, 0x3b, 0x22, 0x4b,</div><div class='add'>+	0xaa, 0x16, 0x31, 0x51, 0x8b, 0x0f, 0xa0, 0x3e, 0x0b, 0xf4, 0xba, 0xa4,</div><div class='add'>+	0xf4, 0xf2, 0x02, 0x78, 0x89, 0xf0, 0x74, 0xdd, 0x05, 0x0f, 0x71, 0x10,</div><div class='add'>+	0x17, 0xf1, 0x0c, 0xe2, 0x7c, 0xb7, 0xd7, 0xc1, 0x85, 0x73, 0xea, 0x25,</div><div class='add'>+	0xd4, 0x64, 0xb6, 0xde, 0xa3, 0x07, 0x67, 0xb2, 0x5b, 0x96, 0xdd, 0xe9,</div><div class='add'>+	0xeb, 0xf2, 0x05, 0x9e, 0x59, 0x0a, 0xae, 0xce, 0x21, 0x56, 0x0f, 0x8d,</div><div class='add'>+	0x85, 0x75, 0xd2, 0xdc, 0x41, 0xcf, 0x8e, 0xee, 0x49, 0x78, 0x47, 0x92,</div><div class='add'>+	0x90, 0x92, 0x9a, 0xb5, 0x04, 0x1d, 0x68, 0x72, 0x0d, 0x67, 0xd0, 0xd5,</div><div class='add'>+	0xb9, 0x76, 0xe0, 0x45, 0xee, 0x77, 0x20, 0xbb, 0x57, 0xb4, 0x7e, 0xab,</div><div class='add'>+	0x55, 0x6b, 0x87, 0x2f, 0x65, 0xc4, 0x55, 0x6d, 0x9e, 0xd3, 0xa7, 0x66,</div><div class='add'>+	0x16, 0x2b, 0xc8, 0x03, 0x6d, 0x9c, 0xaf, 0x79, 0xbc, 0xd7, 0x49, 0x43,</div><div class='add'>+	0x93, 0x2b, 0x73, 0xba, 0xfc, 0xd3, 0x9c, 0x21, 0xff, 0x8c, 0x3a, 0xf4,</div><div class='add'>+	0x9a, 0x7d, 0x6a, 0xe6, 0xb4, 0x2d, 0xf7, 0x81, 0xd5, 0xf0, 0x0e, 0x4f,</div><div class='add'>+	0x76, 0x9a, 0x42, 0x5b, 0x1d, 0x48, 0xff, 0x8e, 0x20, 0xff, 0xc1, 0x9a,</div><div class='add'>+	0x2b, 0x73, 0xa4, 0xb5, 0x76, 0x8d, 0xf4, 0x22, 0x1f, 0x83, 0x5d, 0x0f,</div><div class='add'>+	0x30, 0x27, 0xe2, 0x7c, 0xd4, 0xab, 0x03, 0xd6, 0x3e, 0xc5, 0x5b, 0x42,</div><div class='add'>+	0x16, 0xeb, 0x9c, 0x6f, 0x82, 0xb7, 0x2e, 0x9c, 0x31, 0x59, 0x6b, 0x52,</div><div class='add'>+	0xfe, 0xb0, 0x5b, 0xe5, 0xaa, 0x1a, 0xfb, 0x0d, 0xb5, 0xc7, 0xef, 0xef,</div><div class='add'>+	0xe7, 0xde, 0x1b, 0x32, 0x95, 0x62, 0x9b, 0x63, 0x59, 0xd4, 0x9c, 0xc4,</div><div class='add'>+	0x97, 0xdd, 0xeb, 0x0a, 0x79, 0x0e, 0xde, 0xaf, 0x08, 0x65, 0xdb, 0x6d,</div><div class='add'>+	0x5d, 0x97, 0xd7, 0x7d, 0xf7, 0x00, 0xe5, 0x89, 0x72, 0x8b, 0x39, 0x9f,</div><div class='add'>+	0xb1, 0xd8, 0x28, 0xcc, 0xc0, 0x8e, 0xbf, 0x2a, 0xdf, 0x6f, 0x1c, 0x92,</div><div class='add'>+	0xef, 0x35, 0x26, 0xe5, 0xcf, 0x1a, 0x5f, 0x96, 0x3f, 0x6d, 0x1c, 0x94,</div><div class='add'>+	0xd7, 0x1b, 0x07, 0xe4, 0xb5, 0xc6, 0x84, 0xbc, 0xda, 0xd8, 0x0f, 0x1b,</div><div class='add'>+	0x1f, 0x87, 0x8d, 0x9f, 0x9a, 0x99, 0xac, 0xf7, 0xcb, 0xd4, 0x49, 0xc4,</div><div class='add'>+	0x20, 0xe7, 0x1b, 0xba, 0xba, 0xe3, 0xb3, 0xe9, 0xe7, 0x2d, 0x32, 0xad,</div><div class='add'>+	0xee, 0xaf, 0x34, 0xe4, 0x89, 0x2d, 0xbc, 0x2b, 0x7c, 0xc5, 0x33, 0x2e,</div><div class='add'>+	0x87, 0xf1, 0xe8, 0xe1, 0x94, 0xb4, 0x03, 0xbf, 0xca, 0x4b, 0x4d, 0x9e,</div><div class='add'>+	0xdb, 0x62, 0x86, 0xf7, 0x9c, 0x87, 0x24, 0xc9, 0xfb, 0xb0, 0x9c, 0x67,</div><div class='add'>+	0xa0, 0xde, 0x5e, 0xd7, 0x27, 0x73, 0xb4, 0x65, 0xe8, 0xc6, 0x95, 0x43,</div><div class='add'>+	0xb0, 0x53, 0xc3, 0x7e, 0xcb, 0xa5, 0x1e, 0x16, 0x97, 0x28, 0xf7, 0x46,</div><div class='add'>+	0x59, 0x5c, 0xa0, 0x6f, 0xff, 0x1b, 0x64, 0x6c, 0x97, 0xda, 0x82, 0x89,</div><div class='add'>+	0xb9, 0x6e, 0x98, 0xab, 0x6c, 0xa7, 0x3d, 0x00, 0x1f, 0xf1, 0x7e, 0x10,</div><div class='add'>+	0x4e, 0xab, 0x09, 0x27, 0xf1, 0x24, 0x54, 0x0c, 0x08, 0x70, 0x5b, 0x52,</div><div class='add'>+	0x5b, 0x4a, 0xca, 0xc2, 0x42, 0x0f, 0x9e, 0x94, 0x2c, 0xd4, 0x6d, 0x3c,</div><div class='add'>+	0x39, 0x3c, 0x43, 0x78, 0xd2, 0xb0, 0x53, 0xca, 0xc8, 0xd8, 0x12, 0xc9,</div><div class='add'>+	0x88, 0x78, 0x5c, 0xed, 0x0d, 0x6b, 0x2a, 0xf2, 0xa3, 0x85, 0xfc, 0x74,</div><div class='add'>+	0x87, 0x7d, 0x1d, 0x52, 0xab, 0x38, 0x32, 0x55, 0xfd, 0x94, 0x3e, 0xa5,</div><div class='add'>+	0x74, 0x07, 0xfc, 0x95, 0x21, 0xb4, 0xef, 0x0f, 0xdb, 0x8f, 0xca, 0xf4,</div><div class='add'>+	0xbc, 0xc8, 0xca, 0xcb, 0x03, 0x7a, 0x51, 0xb5, 0xf7, 0xa2, 0xad, 0xa3,</div><div class='add'>+	0x9d, 0x0d, 0xdb, 0xcc, 0x8f, 0x0e, 0xe0, 0x71, 0xd5, 0xf3, 0xf5, 0xea,</div><div class='add'>+	0xb8, 0x3c, 0x55, 0xed, 0x77, 0x5e, 0x87, 0xcd, 0xbd, 0x65, 0x46, 0xf7,</div><div class='add'>+	0xd2, 0x04, 0x24, 0x79, 0xf6, 0x56, 0x75, 0xf7, 0xf1, 0x04, 0xe2, 0xad,</div><div class='add'>+	0x9b, 0x34, 0xe5, 0x6f, 0x4f, 0x64, 0xad, 0xa7, 0xf5, 0x5c, 0x52, 0xda,</div><div class='add'>+	0x7d, 0xff, 0x71, 0x3b, 0x3b, 0x3b, 0xa9, 0x77, 0xca, 0xdf, 0xbf, 0x98,</div><div class='add'>+	0x91, 0x85, 0xb3, 0x5b, 0x65, 0xa1, 0x06, 0x99, 0x1a, 0xbf, 0x8e, 0x7d,</div><div class='add'>+	0x35, 0xe5, 0xea, 0x9e, 0x47, 0xb1, 0x27, 0x8c, 0x5d, 0x49, 0xe4, 0x6c,</div><div class='add'>+	0x1b, 0xc4, 0xec, 0x25, 0x5d, 0x49, 0x98, 0x85, 0x9c, 0x1c, 0x81, 0xdf,</div><div class='add'>+	0x4f, 0xdb, 0xb9, 0x1e, 0x69, 0xc7, 0x7b, 0x7d, 0x04, 0x7c, 0x5b, 0x32,</div><div class='add'>+	0xd5, 0x6b, 0xc9, 0x99, 0xc1, 0x68, 0xff, 0xb6, 0x62, 0x6e, 0x46, 0x16,</div><div class='add'>+	0xcf, 0x66, 0xf0, 0x9b, 0x83, 0xfd, 0xec, 0x94, 0x57, 0x6a, 0xfd, 0xb2,</div><div class='add'>+	0x54, 0xdb, 0x2a, 0x8b, 0xb5, 0xe6, 0x7d, 0xe8, 0xec, 0x09, 0xe2, 0x1d,</div><div class='add'>+	0xf1, 0xf4, 0x5b, 0x53, 0xfa, 0x56, 0x71, 0xcd, 0x7e, 0xeb, 0x29, 0xfd,</div><div class='add'>+	0x1f, 0xe4, 0x31, 0x33, 0xa0, 0xa9, 0x17, 0x7e, 0xa4, 0xee, 0x84, 0x26,</div><div class='add'>+	0x79, 0xf6, 0x2a, 0xbc, 0x4f, 0x26, 0x49, 0xfb, 0xf5, 0xc6, 0x07, 0xd1,</div><div class='add'>+	0x59, 0xcb, 0xcf, 0x9d, 0x68, 0x52, 0x06, 0xe2, 0xec, 0xbf, 0x71, 0x52,</div><div class='add'>+	0xef, 0x95, 0xe5, 0x6d, 0x0f, 0x58, 0x4f, 0xea, 0xad, 0x88, 0x01, 0x3f,</div><div class='add'>+	0x97, 0x9f, 0xee, 0xd9, 0x24, 0x3f, 0xfc, 0xcd, 0xec, 0xa9, 0x6f, 0x22,</div><div class='add'>+	0xd9, 0xbf, 0xb2, 0xa7, 0x83, 0x71, 0x01, 0xef, 0xec, 0xcf, 0xde, 0x70,</div><div class='add'>+	0x75, 0xea, 0xe1, 0x2f, 0xa0, 0x87, 0xec, 0x9c, 0xba, 0x9b, 0x56, 0x3c,</div><div class='add'>+	0x90, 0x3e, 0xf5, 0x52, 0x06, 0x6f, 0x18, 0xab, 0xf7, 0x03, 0x57, 0x59,</div><div class='add'>+	0xe9, 0xf9, 0x09, 0x27, 0x7b, 0x03, 0xe9, 0xb0, 0xbf, 0x68, 0xf7, 0xa7,</div><div class='add'>+	0x77, 0xea, 0x3b, 0x64, 0x32, 0xfd, 0x80, 0xf5, 0xb4, 0x6c, 0x21, 0xce,</div><div class='add'>+	0xd9, 0x05, 0xc1, 0xda, 0x79, 0xe2, 0xfb, 0x2b, 0xe0, 0x0b, 0x70, 0x28,</div><div class='add'>+	0xff, 0x51, 0x38, 0x77, 0x59, 0x5f, 0xd7, 0x79, 0xc6, 0x63, 0x0c, 0x71,</div><div class='add'>+	0xe1, 0xe2, 0x10, 0x65, 0x40, 0x82, 0x95, 0xca, 0xa6, 0x5d, 0xfd, 0xc3,</div><div class='add'>+	0xc8, 0x47, 0xfc, 0xfd, 0x56, 0x51, 0x27, 0x0f, 0xe7, 0xc0, 0xcb, 0x4f,</div><div class='add'>+	0xc0, 0x7f, 0x3f, 0x70, 0xa2, 0xf6, 0x48, 0x47, 0x74, 0xff, 0x4e, 0xd1,</div><div class='add'>+	0x7d, 0xad, 0x21, 0xe6, 0x2a, 0x5d, 0xf4, 0xd5, 0x75, 0xc8, 0xdd, 0x07,</div><div class='add'>+	0x7b, 0xb5, 0xf0, 0xcb, 0xbd, 0xe9, 0x0c, 0xf7, 0x98, 0xeb, 0x22, 0xba,</div><div class='add'>+	0x11, 0xbf, 0x5c, 0x73, 0x27, 0x1e, 0xee, 0x75, 0x3e, 0xea, 0xd4, 0x03,</div><div class='add'>+	0x09, 0x79, 0xf7, 0x44, 0xb4, 0x37, 0x07, 0x64, 0xba, 0x0a, 0xdd, 0xed,</div><div class='add'>+	0xea, 0x0f, 0xfc, 0x27, 0x1d, 0xf1, 0x40, 0xde, 0xff, 0x06, 0xbc, 0x07,</div><div class='add'>+	0xb8, 0x5b, 0x0b, 0xcd, 0xba, 0xc3, 0x58, 0x3d, 0xa0, 0x31, 0xb6, 0x0e,</div><div class='add'>+	0x4f, 0x57, 0xf6, 0x44, 0xbe, 0x98, 0x84, 0x5f, 0xed, 0xb6, 0x9e, 0x10,</div><div class='add'>+	0xd6, 0x63, 0xc4, 0x9b, 0x94, 0x1f, 0xbe, 0x0c, 0x1e, 0x92, 0xf4, 0x93,</div><div class='add'>+	0x7f, 0x5f, 0xe3, 0x27, 0x1c, 0xdb, 0x2a, 0x35, 0xd4, 0xd4, 0x5e, 0xde,</div><div class='add'>+	0x94, 0x69, 0x25, 0x03, 0xda, 0x35, 0xfa, 0x77, 0x29, 0xf4, 0xef, 0x47,</div><div class='add'>+	0x80, 0xa3, 0x5d, 0x8c, 0x47, 0x1f, 0xc7, 0x59, 0x9d, 0xcd, 0x2c, 0xeb,</div><div class='add'>+	0xcc, 0x03, 0x76, 0x4b, 0x51, 0xdd, 0x4f, 0xdf, 0x8b, 0xee, 0xa2, 0xd8,</div><div class='add'>+	0x94, 0x96, 0x8b, 0x95, 0x28, 0x2e, 0xa5, 0x71, 0x9e, 0xb4, 0xcb, 0xa5,</div><div class='add'>+	0xb9, 0x28, 0xe6, 0xb5, 0xcb, 0x12, 0xf2, 0x9a, 0x95, 0x97, 0x2c, 0x8c,</div><div class='add'>+	0x25, 0xe5, 0xe2, 0x5c, 0x12, 0x31, 0xab, 0x47, 0x56, 0xe6, 0x7a, 0x30,</div><div class='add'>+	0x96, 0xc2, 0xba, 0x14, 0xe6, 0xdb, 0xb2, 0x52, 0xb1, 0x81, 0x27, 0x87,</div><div class='add'>+	0x76, 0x0e, 0xed, 0x21, 0xb9, 0xa4, 0xbe, 0x17, 0x30, 0x2f, 0x18, 0x42,</div><div class='add'>+	0xdc, 0x62, 0x5e, 0x30, 0x82, 0x18, 0x32, 0x81, 0x27, 0x8a, 0x5d, 0xa7,</div><div class='add'>+	0x66, 0xa6, 0x2a, 0xbc, 0x73, 0x84, 0x0e, 0xac, 0x53, 0x33, 0xd3, 0xb6,</div><div class='add'>+	0x89, 0xba, 0xed, 0x1b, 0xda, 0x54, 0x83, 0x72, 0x41, 0xb7, 0x43, 0x1d,</div><div class='add'>+	0xa2, 0x3f, 0x4a, 0x9b, 0xe4, 0x79, 0x67, 0x20, 0xc6, 0x77, 0x01, 0x9f,</div><div class='add'>+	0x23, 0xfa, 0x6f, 0xd0, 0x17, 0xa0, 0xc3, 0x27, 0xba, 0xe4, 0xd2, 0xcb,</div><div class='add'>+	0x8c, 0x35, 0xae, 0xbc, 0x7a, 0x96, 0x3a, 0x2c, 0xf6, 0xac, 0xea, 0x90,</div><div class='add'>+	0x63, 0x0f, 0xe1, 0x8c, 0xd8, 0x0f, 0x7b, 0x32, 0x33, 0x87, 0x90, 0xcb,</div><div class='add'>+	0x7c, 0x1b, 0xf6, 0x59, 0x66, 0xcd, 0x9d, 0x0e, 0x6a, 0x84, 0x20, 0x06,</div><div class='add'>+	0xa0, 0xdd, 0x47, 0x5d, 0xb1, 0xdd, 0x07, 0xbb, 0xe3, 0x58, 0x9f, 0x1a,</div><div class='add'>+	0x5b, 0x04, 0x8e, 0x60, 0x8c, 0xed, 0xcd, 0xb2, 0xa8, 0xc6, 0x0e, 0xaa,</div><div class='add'>+	0xb1, 0xb2, 0xb2, 0x0f, 0x8e, 0x1d, 0x52, 0xb1, 0xe9, 0x7c, 0x23, 0xea,</div><div class='add'>+	0xdf, 0x88, 0x58, 0xc2, 0x7e, 0xf6, 0xe5, 0x61, 0xeb, 0x7b, 0x71, 0xae,</div><div class='add'>+	0x15, 0x64, 0xa9, 0x81, 0x3a, 0x30, 0xff, 0x7b, 0x98, 0xcb, 0x3d, 0xc8,</div><div class='add'>+	0x9e, 0x2a, 0xe9, 0xe4, 0xf1, 0x20, 0xce, 0x83, 0xfd, 0x21, 0xad, 0xb6,</div><div class='add'>+	0x90, 0xaf, 0x03, 0x61, 0xbb, 0x25, 0xa4, 0x4d, 0x3c, 0x36, 0x70, 0x1c,</div><div class='add'>+	0xc3, 0x5a, 0x17, 0x38, 0x18, 0x63, 0x11, 0x23, 0x52, 0x29, 0xe8, 0x82,</div><div class='add'>+	0x34, 0xdb, 0xa4, 0xac, 0xde, 0xf7, 0xc3, 0x76, 0xb9, 0x16, 0x3a, 0xb4,</div><div class='add'>+	0xa2, 0x75, 0xa5, 0x70, 0xcf, 0x53, 0xea, 0x9c, 0xd1, 0x93, 0x9b, 0xc3,</div><div class='add'>+	0x9c, 0x10, 0x7a, 0x45, 0x9c, 0xd5, 0x93, 0x8c, 0x37, 0xef, 0x84, 0x76,</div><div class='add'>+	0xda, 0x8b, 0xbe, 0x87, 0x44, 0xef, 0x65, 0xdf, 0x51, 0xe0, 0x61, 0xed,</div><div class='add'>+	0x3c, 0x0c, 0x99, 0xd9, 0xe6, 0xfa, 0x6c, 0xd3, 0xfa, 0xc4, 0x3a, 0xeb,</div><div class='add'>+	0x3b, 0x9a, 0xfa, 0x32, 0x52, 0x9b, 0xef, 0x52, 0xf1, 0xf2, 0x7c, 0x18,</div><div class='add'>+	0x2f, 0x17, 0x6b, 0x94, 0x05, 0x7e, 0x96, 0x7f, 0x5b, 0xe9, 0xa2, 0x76,</div><div class='add'>+	0x36, 0xb0, 0xf5, 0xa5, 0x93, 0x3c, 0x17, 0x57, 0xe7, 0xd5, 0xd4, 0xbc,</div><div class='add'>+	0xdf, 0x06, 0xff, 0xba, 0x1c, 0x55, 0x32, 0x70, 0x3e, 0xe6, 0xd5, 0x02,</div><div class='add'>+	0xbf, 0x31, 0x6c, 0xce, 0xa1, 0x8f, 0x44, 0x6b, 0x38, 0xff, 0xe7, 0xa8,</div><div class='add'>+	0x55, 0xbe, 0xac, 0xd6, 0xac, 0xfa, 0x0c, 0xf9, 0x71, 0x42, 0x9e, 0x7b,</div><div class='add'>+	0xc0, 0x5f, 0x67, 0x28, 0x43, 0x7b, 0x28, 0x03, 0xf1, 0xfd, 0x27, 0x70,</div><div class='add'>+	0xb7, 0x61, 0x1e, 0x79, 0xdd, 0x86, 0x3e, 0xbe, 0xff, 0x17, 0xfa, 0x76,</div><div class='add'>+	0x23, 0xff, 0x23, 0x6f, 0x89, 0x26, 0xde, 0xfe, 0x03, 0x63, 0x3d, 0x4a,</div><div class='add'>+	0xb7, 0x35, 0xd4, 0x26, 0x53, 0xbc, 0xef, 0x48, 0xe1, 0x1c, 0x38, 0xb9,</div><div class='add'>+	0x4d, 0xd1, 0xad, 0x9d, 0xbd, 0x86, 0xf1, 0x5e, 0xac, 0x89, 0xda, 0xcd,</div><div class='add'>+	0xb2, 0xe9, 0x58, 0xfb, 0x53, 0x25, 0xcf, 0x62, 0xed, 0x4e, 0xf2, 0x6f,</div><div class='add'>+	0x5b, 0x23, 0x3b, 0xe5, 0x26, 0x4f, 0xe4, 0xa7, 0x1f, 0x4f, 0x2b, 0x72,</div><div class='add'>+	0x21, 0xd8, 0x6d, 0xd2, 0x90, 0xd1, 0x7c, 0x9a, 0xdf, 0xf9, 0x12, 0xbc,</div><div class='add'>+	0x17, 0x1d, 0x19, 0xe4, 0x9e, 0xa1, 0xdd, 0x60, 0x4e, 0x47, 0x7f, 0x4b,</div><div class='add'>+	0xc8, 0x31, 0xd4, 0x24, 0xe5, 0x85, 0x8c, 0x56, 0x3c, 0x99, 0x45, 0x16,</div><div class='add'>+	0xad, 0xbe, 0xd5, 0xc9, 0x8b, 0x4b, 0xb6, 0x7c, 0x1b, 0x7e, 0x7a, 0xb2,</div><div class='add'>+	0x9e, 0x4d, 0x7f, 0x13, 0xf9, 0xc1, 0x91, 0x25, 0xe6, 0x13, 0x3d, 0x29,</div><div class='add'>+	0x65, 0x9b, 0xf3, 0x9a, 0x6c, 0x60, 0x4c, 0x9b, 0x47, 0x7e, 0x6a, 0xdd,</div><div class='add'>+	0x2d, 0x47, 0x82, 0x9f, 0x57, 0xd7, 0xc6, 0x0c, 0xca, 0xb1, 0x36, 0x66,</div><div class='add'>+	0x10, 0x0f, 0x63, 0xc6, 0x4e, 0xec, 0x13, 0x63, 0x06, 0xf6, 0xff, 0x24,</div><div class='add'>+	0x63, 0x86, 0x8d, 0x75, 0x8c, 0x19, 0x79, 0x59, 0xac, 0x32, 0x66, 0xec,</div><div class='add'>+	0x45, 0x9b, 0x31, 0xa3, 0x80, 0x76, 0x10, 0x2f, 0x16, 0x55, 0xbc, 0xc8,</div><div class='add'>+	0x5a, 0xcb, 0xc2, 0x38, 0x81, 0x3c, 0xb1, 0x8a, 0x3c, 0xb1, 0x8a, 0x3c,</div><div class='add'>+	0xb1, 0x8a, 0x3c, 0xb1, 0x8a, 0x3c, 0x11, 0xb6, 0xfe, 0x5a, 0x15, 0x79,</div><div class='add'>+	0x22, 0xfc, 0xe7, 0x3c, 0x72, 0x92, 0xa0, 0xa6, 0x38, 0x8c, 0x9a, 0xc2,</div><div class='add'>+	0xd5, 0xc6, 0xaa, 0xe3, 0xda, 0xbe, 0x2a, 0x6a, 0x43, 0xf5, 0x9d, 0x58,</div><div class='add'>+	0x1f, 0xda, 0x80, 0xba, 0xa8, 0xe6, 0x6c, 0x01, 0x5f, 0xd7, 0xe0, 0x1b,</div><div class='add'>+	0xd4, 0xd3, 0x56, 0x99, 0xca, 0xed, 0x80, 0x7c, 0xd8, 0x7f, 0xfb, 0xfb,</div><div class='add'>+	0xe8, 0x43, 0x3e, 0x9f, 0x63, 0x0d, 0xc2, 0x78, 0xb5, 0x0f, 0x6d, 0x1d,</div><div class='add'>+	0x6d, 0xec, 0xe9, 0x04, 0x7c, 0xc4, 0x7e, 0x90, 0xf9, 0x62, 0x7a, 0x41,</div><div class='add'>+	0x9e, 0xdc, 0x1c, 0xd8, 0xf4, 0x6f, 0x31, 0x27, 0x5e, 0xd3, 0xde, 0x88,</div><div class='add'>+	0x39, 0xf0, 0x17, 0xd8, 0x97, 0x5a, 0x03, 0x5c, 0xba, 0xfd, 0xe7, 0xc4,</div><div class='add'>+	0xd1, 0xb7, 0xe1, 0xd6, 0x1c, 0xda, 0xd5, 0xf7, 0x9a, 0xfa, 0xb2, 0x98,</div><div class='add'>+	0xcf, 0xef, 0xe2, 0x3b, 0xf0, 0xfb, 0x16, 0x7e, 0x61, 0x77, 0xf6, 0x05,</div><div class='add'>+	0xcc, 0xe9, 0xc3, 0xef, 0x77, 0x9a, 0xe6, 0x42, 0x0a, 0xfb, 0x2f, 0xd1,</div><div class='add'>+	0x77, 0x31, 0xa4, 0xc1, 0x6f, 0x89, 0x5f, 0x6a, 0xe2, 0xe3, 0x07, 0xe8,</div><div class='add'>+	0xfb, 0x6b, 0xf4, 0xf9, 0xfe, 0xdb, 0x4e, 0xd4, 0x27, 0xa5, 0x96, 0x70,</div><div class='add'>+	0xef, 0x46, 0xd5, 0xde, 0x69, 0xca, 0xe6, 0x8f, 0x2c, 0xe9, 0xaa, 0x0e,</div><div class='add'>+	0x7a, 0xae, 0x8e, 0xea, 0x08, 0x71, 0xbe, 0xbc, 0x10, 0xd4, 0xad, 0xc7,</div><div class='add'>+	0x51, 0x73, 0x16, 0xab, 0xb4, 0x91, 0x1c, 0xfa, 0x6d, 0x9c, 0x69, 0x32,</div><div class='add'>+	0x69, 0xdc, 0xaa, 0x63, 0x13, 0x89, 0xc9, 0x7a, 0x9b, 0x48, 0x37, 0x69,</div><div class='add'>+	0x32, 0x4f, 0x22, 0x8e, 0xd9, 0x99, 0xe2, 0xc2, 0xec, 0x8c, 0x07, 0x9c,</div><div class='add'>+	0x63, 0x75, 0xae, 0xe5, 0x3c, 0x93, 0xf7, 0x63, 0x4d, 0x74, 0x69, 0x13,</div><div class='add'>+	0x60, 0x06, 0xf4, 0x9e, 0xab, 0x93, 0x7e, 0x40, 0xb3, 0xac, 0x68, 0xda,</div><div class='add'>+	0xe8, 0x8f, 0xea, 0xc7, 0x1c, 0x6a, 0x5d, 0x99, 0x64, 0xed, 0x5c, 0x0c,</div><div class='add'>+	0x69, 0xba, 0x75, 0x49, 0x24, 0x0a, 0xcd, 0xf8, 0x82, 0x8c, 0xf3, 0xb9,</div><div class='add'>+	0xfa, 0xec, 0x8c, 0xfe, 0x42, 0x36, 0xc7, 0x3b, 0x11, 0xd7, 0x9a, 0x9d,</div><div class='add'>+	0x69, 0x1d, 0x48, 0xc8, 0x8f, 0x91, 0xbb, 0x1d, 0x53, 0x34, 0x66, 0x67,</div><div class='add'>+	0x8c, 0x17, 0x02, 0x5b, 0x0c, 0xe8, 0xe0, 0x3c, 0xc9, 0xb7, 0x43, 0x4e,</div><div class='add'>+	0xd2, 0x62, 0x4d, 0x1d, 0x8c, 0x4f, 0xaa, 0x7a, 0xd1, 0x94, 0x2b, 0x15,</div><div class='add'>+	0x45, 0x3b, 0xac, 0xdb, 0xc9, 0xc3, 0xec, 0x8c, 0xfc, 0xd1, 0x2d, 0x1e,</div><div class='add'>+	0xd6, 0x91, 0x87, 0x78, 0x49, 0x27, 0xd0, 0x5b, 0xc0, 0x7f, 0x12, 0xf5,</div><div class='add'>+	0x7b, 0x54, 0xab, 0xfb, 0xfe, 0x8a, 0x93, 0x43, 0x5c, 0xe0, 0x3e, 0xb6,</div><div class='add'>+	0xa8, 0x3c, 0xd7, 0x73, 0x32, 0xbc, 0xef, 0x9b, 0xe3, 0xdf, 0x39, 0x78,</div><div class='add'>+	0xf9, 0x01, 0xd4, 0x4d, 0xbc, 0x1b, 0xa4, 0x7f, 0xe1, 0xf7, 0x36, 0xff,</div><div class='add'>+	0xe2, 0x7c, 0xf6, 0x93, 0xe7, 0x81, 0xf4, 0x55, 0xf0, 0xe7, 0xe5, 0xd1,</div><div class='add'>+	0x87, 0x58, 0x51, 0x6c, 0x44, 0xb8, 0x78, 0xc7, 0xce, 0x39, 0x2a, 0xff,</div><div class='add'>+	0x6e, 0xf2, 0xd1, 0x96, 0xf0, 0xdc, 0xa5, 0x8e, 0xc8, 0x27, 0xf9, 0xe9,</div><div class='add'>+	0x84, 0x4d, 0x90, 0x17, 0xce, 0x8f, 0xee, 0x25, 0xd8, 0xfe, 0xb8, 0x36,</div><div class='add'>+	0x12, 0xdd, 0xa9, 0x7d, 0x9c, 0x3d, 0x8f, 0x74, 0x76, 0x37, 0x7e, 0x88,</div><div class='add'>+	0x83, 0xb4, 0x23, 0xbe, 0x22, 0x9e, 0x88, 0x8f, 0xfc, 0x44, 0xbc, 0x28,</div><div class='add'>+	0x1b, 0x5d, 0x97, 0x9f, 0x60, 0x5d, 0xc0, 0x4f, 0x69, 0x21, 0x0d, 0x9d,</div><div class='add'>+	0x90, 0xa7, 0x11, 0x6d, 0xa4, 0xba, 0xde, 0x1d, 0xc7, 0x0f, 0x5c, 0xc6,</div><div class='add'>+	0xd5, 0xb1, 0x06, 0xef, 0xa1, 0x48, 0x97, 0x7f, 0x3b, 0xb2, 0xa4, 0x8d,</div><div class='add'>+	0x34, 0xf8, 0x9d, 0xa9, 0xae, 0xb9, 0x8d, 0x88, 0xde, 0x5a, 0x9d, 0x46,</div><div class='add'>+	0xbf, 0xbc, 0x2b, 0xff, 0x0c, 0xf6, 0xa9, 0x3b, 0xf8, 0xbb, 0x14, 0x55,</div><div class='add'>+	0x47, 0xb1, 0x6f, 0xb9, 0xd5, 0x73, 0xa2, 0xbf, 0xd3, 0xd9, 0x1f, 0xe6,</div><div class='add'>+	0x43, 0x51, 0x6d, 0x1c, 0xd5, 0x59, 0xea, 0x9e, 0x7d, 0xaf, 0xe7, 0x68,</div><div class='add'>+	0xc8, 0x4f, 0x99, 0x33, 0x05, 0x3a, 0x08, 0xf1, 0xde, 0x91, 0xcf, 0x91,</div><div class='add'>+	0x26, 0x3e, 0x47, 0xc1, 0xe7, 0x3e, 0xf0, 0x39, 0x76, 0x8b, 0xcf, 0x5b,</div><div class='add'>+	0xb6, 0x97, 0x29, 0xc3, 0xf6, 0x46, 0xd6, 0xb5, 0xbd, 0x55, 0x3a, 0xab,</div><div class='add'>+	0x73, 0x83, 0xfb, 0x9a, 0x91, 0x86, 0x2f, 0xc7, 0x9d, 0x8f, 0x53, 0x37,</div><div class='add'>+	0xb7, 0xcb, 0x99, 0x85, 0xbb, 0xd5, 0xb7, 0x11, 0xaf, 0x2a, 0x77, 0x94,</div><div class='add'>+	0x4b, 0xf5, 0x80, 0x9f, 0x1f, 0x2f, 0xb1, 0x3d, 0x12, 0xea, 0x8a, 0x3a,</div><div class='add'>+	0xcb, 0x3a, 0x25, 0xb9, 0x1b, 0x2f, 0xbf, 0xf8, 0x9c, 0x76, 0xa5, 0x12,</div><div class='add'>+	0x9d, 0x4f, 0x5a, 0x78, 0xc6, 0xae, 0xe5, 0x29, 0xfa, 0x6e, 0x32, 0x66,</div><div class='add'>+	0x45, 0xf7, 0x67, 0x22, 0xfc, 0xfe, 0xc0, 0xef, 0x75, 0x6b, 0xbf, 0x13,</div><div class='add'>+	0xf0, 0x7c, 0x8a, 0x78, 0xd7, 0x53, 0x3c, 0x9f, 0xc6, 0x9c, 0x66, 0x19,</div><div class='add'>+	0x5c, 0xd8, 0xa4, 0x9e, 0xe4, 0x98, 0xe7, 0xd0, 0x2f, 0x4c, 0xd0, 0x0c,</div><div class='add'>+	0xee, 0xdd, 0x6a, 0x4b, 0xbe, 0x5c, 0x74, 0x36, 0x06, 0xe7, 0x28, 0x64,</div><div class='add'>+	0xba, 0x6c, 0xf1, 0xfe, 0x0a, 0x31, 0x8c, 0x67, 0x83, 0xb2, 0xb5, 0x16,</div><div class='add'>+	0xf5, 0x5c, 0x39, 0xd0, 0x0e, 0x1d, 0xb3, 0xdd, 0xd6, 0xcb, 0xfb, 0x0a,</div><div class='add'>+	0xca, 0xbc, 0xa0, 0xf6, 0x21, 0xd2, 0x71, 0xf4, 0x7d, 0xae, 0x55, 0x96,</div><div class='add'>+	0xc3, 0xbb, 0xad, 0xc5, 0x8a, 0xef, 0xbf, 0x83, 0x3c, 0xfc, 0x34, 0x74,</div><div class='add'>+	0x5f, 0xae, 0xff, 0xcc, 0x5f, 0x4e, 0xf1, 0x6f, 0xa5, 0x22, 0x9b, 0xd8,</div><div class='add'>+	0xd1, 0xcb, 0x7b, 0x20, 0xf8, 0x96, 0x1c, 0xaf, 0x87, 0x65, 0xbf, 0x70,</div><div class='add'>+	0x9c, 0x7d, 0xff, 0x0d, 0xbe, 0x7d, 0xff, 0xf4, 0xaa, 0x9d, 0x02, 0xfe,</div><div class='add'>+	0x17, 0x33, 0xe1, 0x9b, 0xdd, 0x90, 0x58, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static u32 bnx2_RXP_b06FwRodata[(0x28/4) + 1] = {</div><div class='hunk'>@@ -1943,387 +1057,264 @@ static u32 bnx2_RXP_b06FwRodata[(0x28/4) + 1] = {</div><div class='ctx'> static u32 bnx2_RXP_b06FwBss[(0x13a4/4) + 1] = { 0x0 };</div><div class='ctx'> static u32 bnx2_RXP_b06FwSbss[(0x1c/4) + 1] = { 0x0 };</div><div class='ctx'> </div><div class='del'>-static u32 bnx2_rv2p_proc1[] = {</div><div class='del'>-	0x00000008, 0xac000001, 0x0000000c, 0x2f800001, 0x00000010, 0x213f0004,</div><div class='del'>-	0x00000010, 0x20bf002c, 0x00000010, 0x203f0143, 0x00000018, 0x8000fffd,</div><div class='del'>-	0x00000010, 0xb1b8b017, 0x0000000b, 0x2fdf0002, 0x00000000, 0x03d80000,</div><div class='del'>-	0x00000000, 0x2c380000, 0x00000008, 0x2c800000, 0x00000008, 0x2d000000,</div><div class='del'>-	0x00000010, 0x91d40000, 0x00000008, 0x2d800108, 0x00000008, 0x02000002,</div><div class='del'>-	0x00000010, 0x91de0000, 0x0000000f, 0x42e0001c, 0x00000010, 0x91840a08,</div><div class='del'>-	0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008, 0x00000008, 0x2d800150,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x91de0000, 0x00000010, 0x2c620002,</div><div class='del'>-	0x00000018, 0x80000012, 0x0000000b, 0x2fdf0002, 0x0000000c, 0x1f800002,</div><div class='del'>-	0x00000000, 0x2c070000, 0x00000018, 0x8000ffe6, 0x00000008, 0x02000002,</div><div class='del'>-	0x0000000f, 0x42e0001c, 0x00000010, 0x91840a08, 0x00000008, 0x2c8000b0,</div><div class='del'>-	0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800108,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x91de0000, 0x00000018, 0x80000004,</div><div class='del'>-	0x0000000c, 0x1f800002, 0x00000000, 0x00000000, 0x00000018, 0x8000ffd9,</div><div class='del'>-	0x0000000c, 0x29800002, 0x0000000c, 0x1f800002, 0x00000000, 0x2adf0000,</div><div class='del'>-	0x00000008, 0x2a000005, 0x00000018, 0x8000ffd4, 0x00000008, 0x02240030,</div><div class='del'>-	0x00000018, 0x00040000, 0x00000018, 0x80000015, 0x00000018, 0x80000017,</div><div class='del'>-	0x00000018, 0x8000001b, 0x00000018, 0x8000004c, 0x00000018, 0x8000008c,</div><div class='del'>-	0x00000018, 0x8000000f, 0x00000018, 0x8000000e, 0x00000018, 0x8000000d,</div><div class='del'>-	0x00000018, 0x8000000c, 0x00000018, 0x800000c2, 0x00000018, 0x8000000a,</div><div class='del'>-	0x00000018, 0x80000009, 0x00000018, 0x80000008, 0x00000018, 0x800000fd,</div><div class='del'>-	0x00000018, 0x80000006, 0x00000018, 0x80000005, 0x00000018, 0x800000ff,</div><div class='del'>-	0x00000018, 0x80000104, 0x00000018, 0x80000002, 0x00000018, 0x80000098,</div><div class='del'>-	0x00000018, 0x80000000, 0x0000000c, 0x1f800001, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000018, 0x8000ffba, 0x00000010, 0x91d40000, 0x0000000c, 0x29800001,</div><div class='del'>-	0x0000000c, 0x1f800001, 0x00000008, 0x2a000002, 0x00000018, 0x8000ffb5,</div><div class='del'>-	0x00000010, 0xb1a0b012, 0x0000000b, 0x2fdf0002, 0x00000000, 0x2c200000,</div><div class='del'>-	0x00000008, 0x2c800000, 0x00000008, 0x2d000000, 0x00000010, 0x91d40000,</div><div class='del'>-	0x00000008, 0x2d80011c, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,</div><div class='del'>-	0x0000000f, 0x47600008, 0x0000000f, 0x060e0001, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000000, 0x0f580000, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,</div><div class='del'>-	0x00000000, 0x0b660000, 0x00000000, 0x0d610000, 0x00000018, 0x80000013,</div><div class='del'>-	0x0000000f, 0x47600008, 0x0000000b, 0x2fdf0002, 0x00000008, 0x2c800000,</div><div class='del'>-	0x00000008, 0x2d000000, 0x00000010, 0x91d40000, 0x00000008, 0x2d80011c,</div><div class='del'>-	0x0000000f, 0x060e0001, 0x00000010, 0x001f0000, 0x00000000, 0x0f580000,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,</div><div class='del'>-	0x00000000, 0x0b660000, 0x00000000, 0x0d610000, 0x00000000, 0x02620000,</div><div class='del'>-	0x0000000b, 0x2fdf0002, 0x00000000, 0x309a0000, 0x00000000, 0x31040000,</div><div class='del'>-	0x00000000, 0x0c961800, 0x00000009, 0x0c99ffff, 0x00000004, 0xcc993400,</div><div class='del'>-	0x00000010, 0xb1963202, 0x00000008, 0x0f800000, 0x0000000c, 0x29800001,</div><div class='del'>-	0x00000010, 0x00220002, 0x0000000c, 0x29520001, 0x0000000c, 0x29520000,</div><div class='del'>-	0x00000008, 0x22000001, 0x0000000c, 0x1f800001, 0x00000000, 0x2adf0000,</div><div class='del'>-	0x00000008, 0x2a000003, 0x00000018, 0x8000ff83, 0x00000010, 0xb1a0b01d,</div><div class='del'>-	0x0000000b, 0x2fdf0002, 0x00000000, 0x2c200000, 0x00000008, 0x2c8000b0,</div><div class='del'>-	0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800150,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000008, 0x2c800000,</div><div class='del'>-	0x00000008, 0x2d000000, 0x00000008, 0x2d800108, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x91de0000, 0x0000000f, 0x47600008, 0x00000000, 0x060e0000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000000, 0x0f580000, 0x00000010, 0x91de0000,</div><div class='del'>-	0x00000000, 0x0a640000, 0x00000000, 0x0ae50000, 0x00000000, 0x0b670000,</div><div class='del'>-	0x00000000, 0x0d620000, 0x00000000, 0x0ce71800, 0x00000009, 0x0c99ffff,</div><div class='del'>-	0x00000004, 0xcc993400, 0x00000010, 0xb1963220, 0x00000008, 0x0f800000,</div><div class='del'>-	0x00000018, 0x8000001e, 0x0000000f, 0x47600008, 0x0000000b, 0x2fdf0002,</div><div class='del'>-	0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008, 0x00000010, 0x91d40000,</div><div class='del'>-	0x00000008, 0x2d80012c, 0x0000000f, 0x060e0001, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000000, 0x0f580000, 0x00000010, 0x91de0000, 0x00000000, 0x0a640000,</div><div class='del'>-	0x00000000, 0x0ae50000, 0x00000000, 0x0b670000, 0x00000000, 0x0d620000,</div><div class='del'>-	0x00000000, 0x02630000, 0x0000000f, 0x47620010, 0x00000000, 0x0ce71800,</div><div class='del'>-	0x0000000b, 0x2fdf0002, 0x00000000, 0x311a0000, 0x00000000, 0x31840000,</div><div class='del'>-	0x0000000b, 0xc20000ff, 0x00000002, 0x42040000, 0x00000001, 0x31620800,</div><div class='del'>-	0x0000000f, 0x020e0010, 0x00000002, 0x31620800, 0x00000009, 0x0c99ffff,</div><div class='del'>-	0x00000004, 0xcc993400, 0x00000010, 0xb1963202, 0x00000008, 0x0f800000,</div><div class='del'>-	0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x0000000c, 0x61420006,</div><div class='del'>-	0x00000008, 0x22000008, 0x00000000, 0x2adf0000, 0x00000008, 0x2a000004,</div><div class='del'>-	0x00000018, 0x8000ff42, 0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008,</div><div class='del'>-	0x00000010, 0x91a0b008, 0x00000010, 0x91d40000, 0x0000000c, 0x31620018,</div><div class='del'>-	0x00000008, 0x2d800001, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,</div><div class='del'>-	0x00000008, 0xac000001, 0x00000018, 0x8000000e, 0x00000000, 0x0380b000,</div><div class='del'>-	0x0000000b, 0x2fdf0002, 0x00000000, 0x2c004000, 0x00000010, 0x91d40000,</div><div class='del'>-	0x00000008, 0x2d800101, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,</div><div class='del'>-	0x0000000c, 0x31620018, 0x00000008, 0x2d800001, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x91de0000, 0x0000000b, 0x2fdf0002, 0x00000000, 0x2c000e00,</div><div class='del'>-	0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x00000008, 0x2a000007,</div><div class='del'>-	0x00000018, 0x8000ff27, 0x00000010, 0xb1a0b016, 0x0000000b, 0x2fdf0002,</div><div class='del'>-	0x00000000, 0x03d80000, 0x00000000, 0x2c200000, 0x00000008, 0x2c8000b0,</div><div class='del'>-	0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800150,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000008, 0x2c800000,</div><div class='del'>-	0x00000008, 0x2d000000, 0x00000008, 0x2d800108, 0x00000008, 0x07000001,</div><div class='del'>-	0x00000010, 0xb5de1c00, 0x00000010, 0x2c620002, 0x00000018, 0x8000000a,</div><div class='del'>-	0x0000000b, 0x2fdf0002, 0x00000000, 0x2c070000, 0x0000000c, 0x1f800001,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000018, 0x8000ff11, 0x00000008, 0x2c8000b0,</div><div class='del'>-	0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800108,</div><div class='del'>-	0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x00000010, 0x91de0000,</div><div class='del'>-	0x00000000, 0x2adf0000, 0x00000008, 0x2a00000a, 0x00000018, 0x8000ff07,</div><div class='del'>-	0x00000000, 0x82265600, 0x0000000f, 0x47220008, 0x00000009, 0x070e000f,</div><div class='del'>-	0x00000008, 0x070e0008, 0x00000008, 0x02800001, 0x00000007, 0x02851c00,</div><div class='del'>-	0x00000008, 0x82850001, 0x00000000, 0x02840a00, 0x00000007, 0x42851c00,</div><div class='del'>-	0x00000003, 0xc3aa5200, 0x00000000, 0x03b10e00, 0x00000010, 0x001f0000,</div><div class='del'>-	0x0000000f, 0x0f280007, 0x00000007, 0x4b071c00, 0x00000000, 0x00000000,</div><div class='del'>-	0x0000000f, 0x0a960003, 0x00000000, 0x0a955c00, 0x00000000, 0x4a005a00,</div><div class='del'>-	0x00000000, 0x0c960a00, 0x00000009, 0x0c99ffff, 0x00000008, 0x0d00ffff,</div><div class='del'>-	0x00000010, 0xb1963202, 0x00000008, 0x0f800005, 0x00000010, 0x00220020,</div><div class='del'>-	0x00000000, 0x02a70000, 0x00000010, 0xb1850002, 0x00000008, 0x82850200,</div><div class='del'>-	0x00000000, 0x02000000, 0x00000000, 0x03a60000, 0x00000018, 0x8000004e,</div><div class='del'>-	0x00000000, 0x072b0000, 0x00000001, 0x878c1c00, 0x00000000, 0x870e1e00,</div><div class='del'>-	0x00000000, 0x860c1e00, 0x00000000, 0x03061e00, 0x00000010, 0xb18e0003,</div><div class='del'>-	0x00000018, 0x80000047, 0x00000018, 0x8000fffa, 0x00000010, 0x918c0003,</div><div class='del'>-	0x00000010, 0xb1870002, 0x00000018, 0x80000043, 0x00000010, 0x91d40000,</div><div class='del'>-	0x0000000c, 0x29800001, 0x00000000, 0x2a860000, 0x00000000, 0x230c0000,</div><div class='del'>-	0x00000000, 0x2b070000, 0x00000010, 0xb187000e, 0x00000008, 0x2a000008,</div><div class='del'>-	0x00000018, 0x8000003b, 0x00000010, 0x91d40000, 0x00000000, 0x28d18c00,</div><div class='del'>-	0x00000000, 0x2a860000, 0x00000000, 0x230c0000, 0x00000000, 0x2b070000,</div><div class='del'>-	0x00000018, 0x8000fff8, 0x00000010, 0x91d40000, 0x0000000c, 0x29800001,</div><div class='del'>-	0x00000000, 0x2aab0000, 0x00000000, 0xa3265600, 0x00000000, 0x2b000000,</div><div class='del'>-	0x0000000c, 0x1f800001, 0x00000008, 0x2a000008, 0x00000018, 0x8000fec8,</div><div class='del'>-	0x00000010, 0x91d40000, 0x0000000c, 0x29800001, 0x0000000c, 0x1f800001,</div><div class='del'>-	0x00000008, 0x2a000009, 0x00000018, 0x8000fec3, 0x00000010, 0x91d40000,</div><div class='del'>-	0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x00000000, 0x29420000,</div><div class='del'>-	0x00000008, 0x2a000002, 0x00000018, 0x8000febd, 0x00000018, 0x8000febc,</div><div class='del'>-	0x00000010, 0xb1bcb016, 0x0000000b, 0x2fdf0002, 0x00000000, 0x03d80000,</div><div class='del'>-	0x00000000, 0x2c3c0000, 0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008,</div><div class='del'>-	0x00000010, 0x91d40000, 0x00000008, 0x2d800150, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x205f0000, 0x00000008, 0x2c800000, 0x00000008, 0x2d000000,</div><div class='del'>-	0x00000008, 0x2d800108, 0x00000008, 0x07000001, 0x00000010, 0xb5de1c00,</div><div class='del'>-	0x00000010, 0x2c620002, 0x00000018, 0x8000000a, 0x0000000b, 0x2fdf0002,</div><div class='del'>-	0x00000000, 0x2c070000, 0x0000000c, 0x1f800000, 0x00000010, 0x91de0000,</div><div class='del'>-	0x00000018, 0x8000fea6, 0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008,</div><div class='del'>-	0x00000010, 0x91d40000, 0x00000008, 0x2d800108, 0x0000000c, 0x29800000,</div><div class='del'>-	0x0000000c, 0x1f800000, 0x00000010, 0x91de0000, 0x00000000, 0x2adf0000,</div><div class='del'>-	0x00000008, 0x2a000006, 0x00000018, 0x8000fe9c, 0x00000008, 0x03050004,</div><div class='del'>-	0x00000006, 0x83040c00, 0x00000008, 0x02850200, 0x00000000, 0x86050c00,</div><div class='del'>-	0x00000001, 0x860c0e00, 0x00000008, 0x02040004, 0x00000000, 0x02041800,</div><div class='del'>-	0x00000000, 0x83871800, 0x00000018, 0x00020000 };</div><div class='add'>+static u8 bnx2_rv2p_proc1[] = {</div><div class='add'>+	0x1f, 0x8b, 0x08, 0x08, 0x5e, 0xd0, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,</div><div class='add'>+	0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xc5, 0x56, 0xcf, 0x6b,</div><div class='add'>+	0x13, 0x51, 0x10, 0x9e, 0xec, 0x6e, 0xb2, 0xdb, 0x74, 0xbb, 0x1b, 0x2b,</div><div class='add'>+	0xda, 0xa0, 0xb1, 0x8d, 0x51, 0x6a, 0x7f, 0xa4, 0xb4, 0x11, 0x0f, 0x82,</div><div class='add'>+	0x42, 0x25, 0x3d, 0x04, 0x54, 0x44, 0x7a, 0x28, 0x22, 0x82, 0x36, 0x8a,</div><div class='add'>+	0xfe, 0x1b, 0xa1, 0x3f, 0xd2, 0x4b, 0x10, 0x7a, 0xb0, 0x58, 0xf1, 0x50,</div><div class='add'>+	0x10, 0x2a, 0x68, 0x0f, 0xc9, 0xa1, 0x20, 0x52, 0x11, 0xda, 0x8b, 0x07,</div><div class='add'>+	0x2f, 0x42, 0x0f, 0x7a, 0x69, 0xbd, 0xa8, 0xff, 0x82, 0x08, 0x4d, 0x7c,</div><div class='add'>+	0x6f, 0x66, 0x9e, 0xee, 0x6e, 0xb2, 0x4d, 0x15, 0xc1, 0x85, 0xf6, 0xe3,</div><div class='add'>+	0xbd, 0x9d, 0x79, 0x33, 0xf3, 0xcd, 0x37, 0xfb, 0x62, 0x01, 0x40, 0x04,</div><div class='add'>+	0x60, 0xcd, 0x46, 0x2c, 0x8d, 0x26, 0x04, 0x1a, 0x30, 0x7e, 0x52, 0x62,</div><div class='add'>+	0x16, 0xde, 0xa6, 0x25, 0x4e, 0x44, 0xc6, 0xd3, 0x49, 0x81, 0x7b, 0x0d,</div><div class='add'>+	0x28, 0xc9, 0x75, 0x4f, 0xf5, 0x55, 0xad, 0x53, 0xa0, 0x06, 0xbb, 0xa3,</div><div class='add'>+	0x80, 0xcf, 0x47, 0x9d, 0xf0, 0x7c, 0xd6, 0x42, 0x2c, 0x31, 0xc2, 0x48,</div><div class='add'>+	0x02, 0x61, 0x7b, 0x51, 0xae, 0xad, 0x48, 0x69, 0xc4, 0x42, 0x3f, 0xd0,</div><div class='add'>+	0x68, 0x7f, 0x67, 0xd1, 0x15, 0xff, 0x53, 0xf0, 0x39, 0x2f, 0xd7, 0x56,</div><div class='add'>+	0x7c, 0x0e, 0xed, 0xaa, 0xec, 0x2f, 0xfe, 0xd0, 0xfe, 0xba, 0xf0, 0x03,</div><div class='add'>+	0x7e, 0x94, 0x5f, 0x02, 0xcf, 0x29, 0x66, 0x65, 0x5e, 0xdd, 0x22, 0xa0,</div><div class='add'>+	0xca, 0xc7, 0x46, 0x2c, 0xf5, 0x91, 0xb5, 0x89, 0xef, 0xbf, 0x8a, 0xbc,</div><div class='add'>+	0x55, 0xdc, 0x76, 0xf1, 0x82, 0xf9, 0x06, 0xe3, 0x26, 0x91, 0x1f, 0x28,</div><div class='add'>+	0xf9, 0xe3, 0x00, 0xc8, 0xfd, 0x4f, 0x8d, 0x5f, 0xfb, 0x83, 0xfe, 0xf7,</div><div class='add'>+	0xbb, 0x43, 0xf2, 0xbc, 0x28, 0xc0, 0x90, 0xb4, 0xdb, 0xe6, 0x7c, 0xc6,</div><div class='add'>+	0xe0, 0xb4, 0x96, 0xc4, 0xf7, 0x06, 0xfa, 0x1f, 0x11, 0xe7, 0x4a, 0xec,</div><div class='add'>+	0x61, 0x3c, 0xce, 0x78, 0x95, 0xb1, 0xc2, 0xe8, 0x32, 0x3a, 0x8c, 0x5d,</div><div class='add'>+	0x8c, 0x36, 0xe3, 0x26, 0x63, 0x9c, 0xb1, 0x83, 0xd1, 0x62, 0xdc, 0x63,</div><div class='add'>+	0x8c, 0x31, 0x46, 0x19, 0x1b, 0x8c, 0x46, 0x84, 0x50, 0xe3, 0xf5, 0x63,</div><div class='add'>+	0x46, 0xe0, 0xba, 0x23, 0x81, 0xba, 0x5f, 0xb3, 0x2e, 0x24, 0x6f, 0xfc,</div><div class='add'>+	0x7e, 0x50, 0xd9, 0x31, 0xef, 0x58, 0xf7, 0x3a, 0xdb, 0x75, 0x57, 0x57,</div><div class='add'>+	0x02, 0xfa, 0x49, 0xef, 0xab, 0x9b, 0x54, 0x8b, 0x3e, 0xb8, 0x58, 0xcf,</div><div class='add'>+	0x9d, 0x82, 0x8b, 0x71, 0x9c, 0x18, 0xed, 0xab, 0xb4, 0x6e, 0xb8, 0x84,</div><div class='add'>+	0xf7, 0xe2, 0x84, 0x5f, 0x18, 0xef, 0x77, 0x12, 0x4e, 0x77, 0xc9, 0x7c,</div><div class='add'>+	0x0e, 0x8b, 0x80, 0xea, 0x1c, 0x95, 0x4f, 0xbb, 0x3c, 0xc2, 0xe2, 0xa9,</div><div class='add'>+	0xbc, 0xda, 0xc5, 0x25, 0x2c, 0x6a, 0xfe, 0xfa, 0x9f, 0x8c, 0x11, 0x1a,</div><div class='add'>+	0x39, 0x22, 0x75, 0xc9, 0x16, 0x3d, 0x83, 0x46, 0x63, 0xd9, 0x36, 0xe4,</div><div class='add'>+	0xfa, 0xdc, 0xf2, 0x7b, 0xd4, 0xfb, 0xd9, 0xa5, 0x1a, 0xe7, 0xe7, 0x2a,</div><div class='add'>+	0x9e, 0x69, 0x0e, 0x32, 0x40, 0xeb, 0x49, 0xe4, 0x1d, 0x04, 0x5a, 0xb8,</div><div class='add'>+	0x86, 0x8c, 0xbf, 0x5f, 0xa4, 0x43, 0x9d, 0xfb, 0x31, 0xcb, 0xfd, 0x38,</div><div class='add'>+	0x11, 0xd2, 0x8f, 0xb0, 0xb9, 0x68, 0x9e, 0xc7, 0xdb, 0xe9, 0x20, 0x6f,</div><div class='add'>+	0x61, 0xf3, 0xa3, 0xf8, 0xa6, 0xdd, 0x3f, 0xe5, 0xf1, 0x01, 0xf3, 0x58,</div><div class='add'>+	0x24, 0x1e, 0x93, 0xdf, 0x5a, 0xf2, 0x94, 0xf6, 0xf0, 0x24, 0xeb, 0xec,</div><div class='add'>+	0x0d, 0xe9, 0x73, 0x58, 0x7d, 0xd9, 0xbf, 0xee, 0x73, 0x20, 0x3f, 0xb8,</div><div class='add'>+	0x8b, 0xdf, 0x9b, 0x04, 0x14, 0x0b, 0x2a, 0x5f, 0x3f, 0xcf, 0xc7, 0xa8,</div><div class='add'>+	0xdf, 0x30, 0x97, 0x93, 0xfb, 0x62, 0xfe, 0x36, 0x35, 0x5c, 0x1b, 0xf9,</div><div class='add'>+	0x88, 0x04, 0xab, 0x98, 0x23, 0x7f, 0x47, 0xd3, 0x78, 0x7d, 0x50, 0x5d,</div><div class='add'>+	0xa8, 0xbe, 0x4b, 0x8c, 0x41, 0x7e, 0x9a, 0xeb, 0xcc, 0x50, 0x3c, 0xd2,</div><div class='add'>+	0x81, 0xc1, 0x3a, 0xc8, 0xf3, 0xf7, 0x28, 0xc8, 0x87, 0x55, 0x5d, 0x59,</div><div class='add'>+	0xf4, 0xce, 0x75, 0x12, 0x8a, 0x39, 0xd2, 0x55, 0x73, 0x5f, 0x59, 0x6f,</div><div class='add'>+	0x6b, 0xea, 0xbb, 0x84, 0xdb, 0xd5, 0x92, 0xee, 0xab, 0xf7, 0x12, 0x64,</div><div class='add'>+	0xbd, 0x3c, 0x47, 0x5a, 0xe8, 0xa3, 0x5d, 0x1c, 0xdf, 0x79, 0x0e, 0x64,</div><div class='add'>+	0x5b, 0x7d, 0x6f, 0x4c, 0xae, 0xeb, 0x0c, 0xeb, 0xfb, 0x68, 0x93, 0xbe,</div><div class='add'>+	0xd5, 0x7d, 0xf5, 0xef, 0x74, 0xce, 0xf5, 0x9b, 0x68, 0x97, 0xda, 0x59,</div><div class='add'>+	0xf7, 0xde, 0x4f, 0x71, 0xcf, 0xfd, 0x44, 0x6e, 0xa6, 0xca, 0xbb, 0xcf,</div><div class='add'>+	0x7b, 0xaf, 0x1c, 0x0a, 0xe9, 0x83, 0xf7, 0x3e, 0x0a, 0xd6, 0xeb, 0xd7,</div><div class='add'>+	0x23, 0xf5, 0x35, 0xce, 0xf5, 0x9b, 0x0d, 0xee, 0xc3, 0x54, 0xff, 0x0c,</div><div class='add'>+	0xe9, 0x3f, 0x53, 0x90, 0xfa, 0x71, 0xc1, 0x31, 0xe9, 0x7c, 0x42, 0x71,</div><div class='add'>+	0x8e, 0x66, 0x62, 0xde, 0xf3, 0x1a, 0xad, 0xe7, 0x67, 0xd0, 0x2f, 0x3e,</div><div class='add'>+	0xa7, 0xf6, 0xf3, 0x48, 0xd8, 0xe4, 0x8b, 0x2d, 0xe2, 0xbd, 0xa6, 0xab,</div><div class='add'>+	0xb9, 0x70, 0x91, 0xef, 0x01, 0x97, 0xec, 0xcc, 0x2b, 0x8a, 0x2f, 0xb9,</div><div class='add'>+	0xaf, 0xc3, 0x12, 0xcd, 0xc5, 0xad, 0x47, 0x84, 0x37, 0xe1, 0x32, 0x9d,</div><div class='add'>+	0xfb, 0xfb, 0xfb, 0x66, 0x21, 0x42, 0x97, 0x57, 0xc7, 0x51, 0xa1, 0x63,</div><div class='add'>+	0x9c, 0x63, 0x25, 0x57, 0x78, 0xae, 0x11, 0x9f, 0xf3, 0xa4, 0x73, 0x8d,</div><div class='add'>+	0xf3, 0xc3, 0xab, 0x45, 0x3e, 0xab, 0xba, 0xac, 0xf7, 0x9a, 0xd2, 0x1d,</div><div class='add'>+	0x0c, 0x9b, 0x38, 0x3f, 0xa9, 0xca, 0x02, 0x2e, 0x7b, 0x1d, 0x46, 0xbb,</div><div class='add'>+	0x4c, 0x18, 0xc3, 0xfc, 0x75, 0x78, 0x58, 0x93, 0x7e, 0x05, 0xbe, 0xdf,</div><div class='add'>+	0x7e, 0xb0, 0x5e, 0x74, 0xa8, 0xf0, 0xef, 0x8b, 0x05, 0x7c, 0x3f, 0x01,</div><div class='add'>+	0xcd, 0xf7, 0x1b, 0xc5, 0x29, 0x0f, 0x11, 0xda, 0xa7, 0xb8, 0xaf, 0xc3,</div><div class='add'>+	0xd2, 0xce, 0x11, 0x7e, 0xdc, 0x3f, 0xec, 0xc3, 0x05, 0x8f, 0x3f, 0x42,</div><div class='add'>+	0xe5, 0xc3, 0x40, 0x98, 0xbf, 0xb4, 0xff, 0xde, 0xe2, 0x3e, 0xa5, 0xf7,</div><div class='add'>+	0x2f, 0xc9, 0x7e, 0xaa, 0xff, 0x19, 0xd7, 0x3f, 0xec, 0xd5, 0xbd, 0x8a,</div><div class='add'>+	0xf7, 0xae, 0xbe, 0xff, 0x7d, 0xdc, 0xc1, 0x76, 0x5b, 0xfb, 0xd8, 0xd1,</div><div class='add'>+	0xf1, 0xf9, 0x41, 0xef, 0xfd, 0xfd, 0xa6, 0x4e, 0x3c, 0x6d, 0xd4, 0xd5,</div><div class='add'>+	0x5c, 0x6d, 0x84, 0xcc, 0xd5, 0xc5, 0xff, 0x3a, 0x57, 0x10, 0x98, 0xab,</div><div class='add'>+	0xd5, 0xfa, 0xc1, 0xe6, 0x0a, 0xb8, 0x7e, 0x08, 0x99, 0xab, 0x18, 0xf3,</div><div class='add'>+	0xf0, 0x94, 0xcf, 0x33, 0x20, 0xaa, 0xc7, 0xb0, 0x7d, 0xc6, 0x2c, 0xeb,</div><div class='add'>+	0x92, 0xf4, 0x68, 0x47, 0xcb, 0xa8, 0x3f, 0xc7, 0x2e, 0x93, 0x9d, 0x41,</div><div class='add'>+	0xfb, 0x49, 0x85, 0x0b, 0xb3, 0xf4, 0x7b, 0x4a, 0x83, 0x9f, 0x94, 0x15,</div><div class='add'>+	0x12, 0x3d, 0x80, 0x0b, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='del'>-static u32 bnx2_rv2p_proc2[] = {</div><div class='del'>-	0x00000000, 0x2a000000, 0x00000010, 0xb1d40000, 0x00000008, 0x02540003,</div><div class='del'>-	0x00000018, 0x00040000, 0x00000018, 0x8000000a, 0x00000018, 0x8000000a,</div><div class='del'>-	0x00000018, 0x8000000e, 0x00000018, 0x80000056, 0x00000018, 0x800001b9,</div><div class='del'>-	0x00000018, 0x800001e1, 0x00000018, 0x8000019b, 0x00000018, 0x800001f9,</div><div class='del'>-	0x00000018, 0x8000019f, 0x00000018, 0x800001a6, 0x00000018, 0x80000000,</div><div class='del'>-	0x0000000c, 0x29800001, 0x00000000, 0x2a000000, 0x0000000c, 0x29800000,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000018, 0x8000ffee, 0x0000000c, 0x29800001,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000010, 0x001f0000, 0x00000000, 0x2f80aa00,</div><div class='del'>-	0x00000000, 0x2a000000, 0x00000000, 0x0d610000, 0x00000000, 0x03620000,</div><div class='del'>-	0x00000000, 0x2c400000, 0x00000000, 0x02638c00, 0x00000000, 0x26460000,</div><div class='del'>-	0x00000010, 0x00420002, 0x00000008, 0x02040012, 0x00000010, 0xb9060836,</div><div class='del'>-	0x00000000, 0x0f580000, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,</div><div class='del'>-	0x00000000, 0x0b660000, 0x00000000, 0x0c000000, 0x00000000, 0x0b800000,</div><div class='del'>-	0x00000010, 0x00420009, 0x00000008, 0x0cc60012, 0x00000008, 0x0f800003,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x009f0000, 0x00000008, 0x27110012,</div><div class='del'>-	0x00000000, 0x66900000, 0x00000008, 0xa31b0012, 0x00000018, 0x80000008,</div><div class='del'>-	0x00000000, 0x0cc60000, 0x00000008, 0x0f800003, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x009f0000, 0x00000000, 0x27110000, 0x00000000, 0x66900000,</div><div class='del'>-	0x00000000, 0x231b0000, 0x00000010, 0xb197320e, 0x00000000, 0x25960000,</div><div class='del'>-	0x00000000, 0x021b0000, 0x00000010, 0x001f0000, 0x00000008, 0x0f800003,</div><div class='del'>-	0x0000000c, 0x29800000, 0x00000010, 0x20530000, 0x00000000, 0x22c50800,</div><div class='del'>-	0x00000010, 0x009f0000, 0x00000000, 0x27002200, 0x00000000, 0x26802000,</div><div class='del'>-	0x00000000, 0x231b0000, 0x0000000c, 0x69520001, 0x00000018, 0x8000fff3,</div><div class='del'>-	0x00000010, 0x01130002, 0x00000010, 0xb1980003, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000008, 0x0f800004, 0x00000008, 0x22000003, 0x00000008, 0x2c80000c,</div><div class='del'>-	0x00000008, 0x2d00000c, 0x00000010, 0x009f0000, 0x00000000, 0x25960000,</div><div class='del'>-	0x0000000c, 0x29800000, 0x00000000, 0x32140000, 0x00000000, 0x32950000,</div><div class='del'>-	0x00000000, 0x33160000, 0x00000000, 0x31e32e00, 0x00000008, 0x2d800010,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000018, 0x8000ffac, 0x00000000, 0x23000000,</div><div class='del'>-	0x00000000, 0x25e60000, 0x00000008, 0x2200000b, 0x0000000c, 0x69520000,</div><div class='del'>-	0x0000000c, 0x29800000, 0x00000010, 0x20530000, 0x00000018, 0x8000ffa5,</div><div class='del'>-	0x0000000c, 0x29800001, 0x00000010, 0x91de0000, 0x00000000, 0x2fd50000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000000, 0x02700000, 0x00000000, 0x0d620000,</div><div class='del'>-	0x00000000, 0xbb630800, 0x00000000, 0x2a000000, 0x00000009, 0x076000ff,</div><div class='del'>-	0x0000000f, 0x2c0e0007, 0x00000008, 0x2c800000, 0x00000008, 0x2d000064,</div><div class='del'>-	0x00000008, 0x2d80011c, 0x00000009, 0x06420002, 0x0000000c, 0x61420001,</div><div class='del'>-	0x00000000, 0x0f400000, 0x00000000, 0x02d08c00, 0x00000000, 0x23000000,</div><div class='del'>-	0x00000004, 0x826da000, 0x00000000, 0x8304a000, 0x00000000, 0x22c50c00,</div><div class='del'>-	0x00000000, 0x03760000, 0x00000004, 0x83860a00, 0x00000000, 0x83870c00,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000000, 0x037c0000, 0x00000000, 0x837b0c00,</div><div class='del'>-	0x00000001, 0x83060e00, 0x00000000, 0x83870c00, 0x00000000, 0x82850e00,</div><div class='del'>-	0x00000010, 0xb1860016, 0x0000000f, 0x47610018, 0x00000000, 0x068e0000,</div><div class='del'>-	0x0000000f, 0x47670010, 0x0000000f, 0x47e20010, 0x00000000, 0x870e1e00,</div><div class='del'>-	0x00000010, 0xb70e1a10, 0x00000010, 0x0ce7000e, 0x00000008, 0x22000009,</div><div class='del'>-	0x00000000, 0x286d0000, 0x0000000f, 0x65680010, 0x00000003, 0xf66c9400,</div><div class='del'>-	0x00000010, 0xb972a003, 0x0000000c, 0x73e70019, 0x0000000c, 0x21420004,</div><div class='del'>-	0x00000018, 0x8000023f, 0x00000000, 0x37ed0000, 0x0000000c, 0x73e7001a,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000008, 0x22000008, 0x0000000c, 0x61420004,</div><div class='del'>-	0x00000000, 0x02f60000, 0x00000004, 0x82840a00, 0x00000010, 0xb1840a2b,</div><div class='del'>-	0x00000010, 0x2d67000a, 0x00000010, 0xb96d0804, 0x00000004, 0xb6ed0a00,</div><div class='del'>-	0x00000000, 0x37ed0000, 0x00000018, 0x80000029, 0x0000000c, 0x61420000,</div><div class='del'>-	0x00000000, 0x37040000, 0x00000000, 0x37850000, 0x0000000c, 0x33e7001a,</div><div class='del'>-	0x00000018, 0x80000024, 0x00000010, 0xb96d0809, 0x00000004, 0xb6ed0a00,</div><div class='del'>-	0x00000000, 0x036d0000, 0x00000004, 0xb76e0c00, 0x00000010, 0x91ee0c1f,</div><div class='del'>-	0x0000000c, 0x73e7001a, 0x00000004, 0xb6ef0c00, 0x00000000, 0x37ed0000,</div><div class='del'>-	0x00000018, 0x8000001b, 0x0000000c, 0x61420000, 0x00000010, 0xb7ee0a05,</div><div class='del'>-	0x00000010, 0xb96f0815, 0x00000003, 0xb76e0800, 0x00000004, 0xb7ef0a00,</div><div class='del'>-	0x00000018, 0x80000015, 0x00000010, 0x0ce7000c, 0x00000008, 0x22000009,</div><div class='del'>-	0x00000000, 0x286d0000, 0x0000000f, 0x65680010, 0x00000003, 0xf66c9400,</div><div class='del'>-	0x00000010, 0xb972a003, 0x0000000c, 0x73e70019, 0x0000000c, 0x21420004,</div><div class='del'>-	0x00000018, 0x80000215, 0x00000010, 0x20530000, 0x00000008, 0x22000008,</div><div class='del'>-	0x0000000c, 0x61420004, 0x00000000, 0x37040000, 0x00000000, 0x37850000,</div><div class='del'>-	0x00000000, 0x036d0000, 0x00000003, 0xb8f10c00, 0x00000018, 0x80000004,</div><div class='del'>-	0x00000000, 0x02840000, 0x00000002, 0x21421800, 0x0000000c, 0x61420000,</div><div class='del'>-	0x00000000, 0x286d0000, 0x0000000f, 0x65ed0010, 0x00000009, 0x266dffff,</div><div class='del'>-	0x00000000, 0x23000000, 0x00000010, 0xb1840a3d, 0x00000010, 0x01420002,</div><div class='del'>-	0x00000004, 0xb8f10a00, 0x00000003, 0x83760a00, 0x00000010, 0xb8040c39,</div><div class='del'>-	0x00000010, 0xb7e6080a, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,</div><div class='del'>-	0x00000009, 0x0c68ffff, 0x00000009, 0x0b67ffff, 0x00000000, 0x0be60000,</div><div class='del'>-	0x00000000, 0x0c840000, 0x00000010, 0xb197320c, 0x00000008, 0x0f800002,</div><div class='del'>-	0x00000018, 0x8000000a, 0x00000000, 0x0a6a0000, 0x00000000, 0x0aeb0000,</div><div class='del'>-	0x00000000, 0x0c000000, 0x00000009, 0x0b6cffff, 0x00000000, 0x0be90000,</div><div class='del'>-	0x00000000, 0x0c840000, 0x00000010, 0xb1973203, 0x00000008, 0x0f800002,</div><div class='del'>-	0x00000018, 0x80000001, 0x00000010, 0x001f0000, 0x00000000, 0x0c860000,</div><div class='del'>-	0x00000000, 0x06980000, 0x00000008, 0x0f800003, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x009f0000, 0x00000010, 0xb1973210, 0x00000000, 0x231b0000,</div><div class='del'>-	0x00000000, 0x02043600, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,</div><div class='del'>-	0x00000009, 0x2607ffff, 0x00000000, 0x27111a00, 0x00000000, 0x66900000,</div><div class='del'>-	0x0000000c, 0x29000000, 0x00000018, 0x800001de, 0x00000000, 0x06980000,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000000, 0x22c58c00, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000008, 0x0f800003, 0x00000018, 0x8000fff0, 0x00000000, 0x02043600,</div><div class='del'>-	0x00000000, 0x231b0000, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,</div><div class='del'>-	0x00000009, 0x2607ffff, 0x00000000, 0x27111a00, 0x00000000, 0x66900000,</div><div class='del'>-	0x0000000c, 0x29000000, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,</div><div class='del'>-	0x00000000, 0x32140000, 0x00000000, 0x32950000, 0x00000005, 0x73e72c00,</div><div class='del'>-	0x00000005, 0x74683000, 0x00000000, 0x33170000, 0x00000018, 0x80000138,</div><div class='del'>-	0x00000010, 0x91c60004, 0x00000008, 0x07000004, 0x00000010, 0xb1c41c02,</div><div class='del'>-	0x00000010, 0x91840a04, 0x00000018, 0x800001c3, 0x00000010, 0x20530000,</div><div class='del'>-	0x00000000, 0x22c58c00, 0x00000010, 0xb1840a8e, 0x0000000c, 0x21420006,</div><div class='del'>-	0x00000010, 0x0ce7001a, 0x0000000f, 0x43680010, 0x00000000, 0x03f30c00,</div><div class='del'>-	0x00000010, 0x91870850, 0x0000000f, 0x46ec0010, 0x00000010, 0xb68d0c4e,</div><div class='del'>-	0x00000000, 0x838d0c00, 0x00000000, 0xa3050800, 0x00000001, 0xa3460e00,</div><div class='del'>-	0x00000000, 0x02048c00, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000008, 0x22000008, 0x00000003, 0x8384a000,</div><div class='del'>-	0x0000000f, 0x65870010, 0x00000009, 0x2607ffff, 0x00000000, 0x27750c00,</div><div class='del'>-	0x00000000, 0x66f40000, 0x0000000c, 0x29000000, 0x00000018, 0x800001aa,</div><div class='del'>-	0x00000000, 0x03068c00, 0x00000003, 0xf4680c00, 0x00000010, 0x20530000,</div><div class='del'>-	0x00000000, 0x22c58c00, 0x00000018, 0x8000ffe5, 0x00000000, 0x39760000,</div><div class='del'>-	0x00000000, 0x39840000, 0x0000000c, 0x33e70019, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000000, 0x031e0000, 0x00000000, 0x0760fe00, 0x0000000f, 0x0f0e0007,</div><div class='del'>-	0x00000000, 0x83850800, 0x00000000, 0x0a7d0000, 0x00000000, 0x0afe0000,</div><div class='del'>-	0x00000000, 0x0b7f0000, 0x00000000, 0x0d7a0000, 0x00000000, 0x0c000000,</div><div class='del'>-	0x00000000, 0x0bfc0000, 0x00000000, 0x0c970e00, 0x00000008, 0x0f800003,</div><div class='del'>-	0x0000000f, 0x47670010, 0x00000008, 0x070e0001, 0x0000000b, 0xc38000ff,</div><div class='del'>-	0x00000002, 0x43870000, 0x00000001, 0x33e70e00, 0x0000000f, 0x038e0010,</div><div class='del'>-	0x00000002, 0x33e70e00, 0x00000000, 0x28f30000, 0x00000010, 0x009f0000,</div><div class='del'>-	0x00000000, 0x02043600, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,</div><div class='del'>-	0x00000008, 0x22000006, 0x00000000, 0x231b0000, 0x00000000, 0x23ff0000,</div><div class='del'>-	0x00000000, 0x241b0000, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,</div><div class='del'>-	0x00000009, 0x2607ffff, 0x00000000, 0x27110000, 0x00000000, 0x26900000,</div><div class='del'>-	0x0000000c, 0x29000000, 0x00000018, 0x8000017e, 0x00000003, 0xf4683600,</div><div class='del'>-	0x00000000, 0x3a100000, 0x00000000, 0x3a910000, 0x00000003, 0xf66c2400,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000010, 0xb1923604, 0x00000008, 0x0f800004,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x009f0000, 0x00000000, 0x3e170000,</div><div class='del'>-	0x00000000, 0x3e940000, 0x00000000, 0x3f150000, 0x00000000, 0x3f960000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000000, 0x0f060000, 0x00000010, 0x20530000,</div><div class='del'>-	0x00000000, 0x22c53600, 0x00000018, 0x8000ffac, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000000, 0x031e0000, 0x00000000, 0x83850800, 0x00000009, 0x076000ff,</div><div class='del'>-	0x0000000f, 0x0f0e0007, 0x00000000, 0x0c000000, 0x00000000, 0x0a7d0000,</div><div class='del'>-	0x00000000, 0x0afe0000, 0x00000000, 0x0b7f0000, 0x00000000, 0x0d7a0000,</div><div class='del'>-	0x00000000, 0x0bfc0000, 0x00000000, 0x0c970e00, 0x00000008, 0x0f800003,</div><div class='del'>-	0x0000000f, 0x47670010, 0x00000008, 0x070e0001, 0x0000000b, 0xc38000ff,</div><div class='del'>-	0x00000002, 0x43870000, 0x00000001, 0x33e70e00, 0x0000000f, 0x038e0010,</div><div class='del'>-	0x00000002, 0x33e70e00, 0x00000000, 0x39840000, 0x00000003, 0xb9720800,</div><div class='del'>-	0x00000000, 0x28f30000, 0x0000000f, 0x65680010, 0x00000010, 0x009f0000,</div><div class='del'>-	0x00000000, 0x02043600, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,</div><div class='del'>-	0x00000008, 0x22000007, 0x00000000, 0x231b0000, 0x00000000, 0x23ff0000,</div><div class='del'>-	0x00000000, 0x241b0000, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,</div><div class='del'>-	0x00000009, 0x2607ffff, 0x00000000, 0x27110000, 0x00000000, 0x26900000,</div><div class='del'>-	0x0000000c, 0x29000000, 0x00000018, 0x80000145, 0x00000003, 0xf4683600,</div><div class='del'>-	0x00000000, 0x3a100000, 0x00000000, 0x3a910000, 0x00000003, 0xf66c2400,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000010, 0xb1923604, 0x00000008, 0x0f800004,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x009f0000, 0x00000000, 0x3e170000,</div><div class='del'>-	0x00000000, 0x3e940000, 0x00000000, 0x3f150000, 0x00000000, 0x3f960000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000000, 0x0f060000, 0x00000010, 0x20530000,</div><div class='del'>-	0x00000000, 0x22c53600, 0x00000018, 0x8000ff73, 0x00000010, 0x0ce70005,</div><div class='del'>-	0x00000008, 0x2c80000c, 0x00000008, 0x2d000070, 0x00000008, 0x2d800010,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000018, 0x8000011d,</div><div class='del'>-	0x00000000, 0x2c1e0000, 0x00000008, 0x2c8000b8, 0x00000008, 0x2d000010,</div><div class='del'>-	0x00000008, 0x2d800048, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,</div><div class='del'>-	0x00000018, 0x8000fe5d, 0x0000000c, 0x29800001, 0x00000000, 0x2a000000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000000, 0x0f008000, 0x00000008, 0x0f800007,</div><div class='del'>-	0x00000018, 0x80000006, 0x0000000c, 0x29800001, 0x00000000, 0x2a000000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x0000000f, 0x0f470007, 0x00000008, 0x0f800008,</div><div class='del'>-	0x00000018, 0x80000119, 0x00000010, 0x20530000, 0x00000018, 0x8000fe4f,</div><div class='del'>-	0x0000000c, 0x29800001, 0x00000010, 0x91de0000, 0x00000000, 0x2fd50000,</div><div class='del'>-	0x00000000, 0x2a000000, 0x00000009, 0x0261ffff, 0x0000000d, 0x70e10001,</div><div class='del'>-	0x00000018, 0x80000101, 0x00000000, 0x2c400000, 0x00000008, 0x2c8000c4,</div><div class='del'>-	0x00000008, 0x2d00001c, 0x00000008, 0x2d800001, 0x00000005, 0x70e10800,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000018, 0x8000fe41, 0x0000000c, 0x29800001,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000000, 0x2fd50000, 0x00000010, 0x001f0000,</div><div class='del'>-	0x00000000, 0x02700000, 0x00000000, 0x0d620000, 0x00000000, 0xbb630800,</div><div class='del'>-	0x00000000, 0x2a000000, 0x00000000, 0x0f400000, 0x00000000, 0x2c400000,</div><div class='del'>-	0x0000000c, 0x73e7001b, 0x00000010, 0x0ce7000e, 0x00000000, 0x286d0000,</div><div class='del'>-	0x0000000f, 0x65ed0010, 0x00000009, 0x266dffff, 0x00000018, 0x80000069,</div><div class='del'>-	0x00000008, 0x02000004, 0x00000010, 0x91c40803, 0x00000018, 0x800000f6,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000018, 0x800000e5, 0x00000008, 0x2c8000b8,</div><div class='del'>-	0x00000008, 0x2d000010, 0x00000008, 0x2d800048, 0x00000018, 0x80000005,</div><div class='del'>-	0x00000008, 0x2c8000c4, 0x00000008, 0x2d00001c, 0x00000008, 0x2d800001,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000008, 0x2c800048,</div><div class='del'>-	0x00000008, 0x2d000068, 0x00000008, 0x2d800104, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000010, 0x91de0000, 0x00000000, 0x27f60000, 0x00000010, 0xb87a9e04,</div><div class='del'>-	0x00000008, 0x2200000d, 0x00000018, 0x800000e2, 0x00000010, 0x20530000,</div><div class='del'>-	0x00000018, 0x8000fe18, 0x0000000c, 0x29800001, 0x00000010, 0x91de0000,</div><div class='del'>-	0x00000000, 0x2fd50000, 0x00000010, 0x001f0000, 0x00000000, 0x02700000,</div><div class='del'>-	0x00000000, 0x0d620000, 0x00000000, 0xbb630800, 0x00000000, 0x2a000000,</div><div class='del'>-	0x00000010, 0x0e670011, 0x00000000, 0x286d0000, 0x0000000f, 0x65ed0010,</div><div class='del'>-	0x00000009, 0x266dffff, 0x00000004, 0xb8f1a000, 0x00000000, 0x0f400000,</div><div class='del'>-	0x0000000c, 0x73e7001c, 0x00000018, 0x80000040, 0x00000008, 0x02000004,</div><div class='del'>-	0x00000010, 0x91c40802, 0x00000018, 0x800000cd, 0x00000000, 0x2c1e0000,</div><div class='del'>-	0x00000008, 0x2c8000b8, 0x00000008, 0x2d000010, 0x00000008, 0x2d800048,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000010, 0x91de0000, 0x00000018, 0x8000fdfe,</div><div class='del'>-	0x0000000c, 0x29800001, 0x00000000, 0x03550000, 0x00000000, 0x06460000,</div><div class='del'>-	0x00000000, 0x03d60000, 0x00000000, 0x2a000000, 0x0000000f, 0x0f480007,</div><div class='del'>-	0x00000010, 0xb18c0027, 0x0000000f, 0x47420008, 0x00000009, 0x070e000f,</div><div class='del'>-	0x00000008, 0x070e0008, 0x00000010, 0x001f0000, 0x00000008, 0x09000001,</div><div class='del'>-	0x00000007, 0x09121c00, 0x00000003, 0xcbca9200, 0x00000000, 0x0b97a200,</div><div class='del'>-	0x00000007, 0x4b171c00, 0x0000000f, 0x0a960003, 0x00000000, 0x0a959c00,</div><div class='del'>-	0x00000000, 0x4a009a00, 0x00000008, 0x82120001, 0x00000001, 0x0c170800,</div><div class='del'>-	0x00000000, 0x02180000, 0x00000000, 0x0c971800, 0x00000008, 0x0d00ffff,</div><div class='del'>-	0x00000008, 0x0f800006, 0x0000000c, 0x29000000, 0x00000008, 0x22000001,</div><div class='del'>-	0x00000000, 0x22c50c00, 0x00000010, 0x009f0000, 0x00000010, 0xb197320b,</div><div class='del'>-	0x00000000, 0x231b0000, 0x00000000, 0x27110800, 0x00000000, 0x66900000,</div><div class='del'>-	0x00000018, 0x800000a4, 0x00000000, 0x02180000, 0x00000010, 0x20530000,</div><div class='del'>-	0x00000000, 0x22c53600, 0x00000010, 0x001f0000, 0x00000008, 0x0f800006,</div><div class='del'>-	0x00000018, 0x8000fff5, 0x00000010, 0x91870002, 0x00000008, 0x2200000a,</div><div class='del'>-	0x00000000, 0x231b0000, 0x00000000, 0x27110800, 0x00000000, 0x66900000,</div><div class='del'>-	0x00000018, 0x80000098, 0x00000008, 0x0200000a, 0x00000010, 0x91c40804,</div><div class='del'>-	0x00000010, 0x02c20003, 0x00000010, 0x001f0000, 0x00000008, 0x0f800008,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000018, 0x8000fdc9, 0x00000000, 0x06820000,</div><div class='del'>-	0x00000010, 0x001f0000, 0x00000010, 0x0ce70028, 0x00000000, 0x03720000,</div><div class='del'>-	0x00000000, 0xa8760c00, 0x00000000, 0x0cf60000, 0x00000010, 0xb8723224,</div><div class='del'>-	0x00000000, 0x03440000, 0x00000008, 0x22000010, 0x00000000, 0x03ca0000,</div><div class='del'>-	0x0000000f, 0x65680010, 0x00000000, 0x0bcf0000, 0x00000000, 0x27f20000,</div><div class='del'>-	0x00000010, 0xb7ef3203, 0x0000000c, 0x21420004, 0x0000000c, 0x73e70019,</div><div class='del'>-	0x00000000, 0x07520000, 0x00000000, 0x29000000, 0x00000018, 0x8000007e,</div><div class='del'>-	0x00000004, 0xb9723200, 0x00000010, 0x20530000, 0x00000000, 0x22060000,</div><div class='del'>-	0x0000000c, 0x61420004, 0x00000000, 0x25070000, 0x00000000, 0x27970000,</div><div class='del'>-	0x00000000, 0x290e0000, 0x00000010, 0x0ce70010, 0x00000010, 0xb873320f,</div><div class='del'>-	0x0000000f, 0x436c0010, 0x00000000, 0x03f30c00, 0x00000000, 0x03f30000,</div><div class='del'>-	0x00000000, 0x83990e00, 0x00000001, 0x83860e00, 0x00000000, 0x83060e00,</div><div class='del'>-	0x00000003, 0xf66c0c00, 0x00000000, 0x39f30e00, 0x00000000, 0x3af50e00,</div><div class='del'>-	0x00000000, 0x7a740000, 0x0000000f, 0x43680010, 0x00000001, 0x83860e00,</div><div class='del'>-	0x00000000, 0x83060e00, 0x00000003, 0xf4680c00, 0x00000000, 0x286d0000,</div><div class='del'>-	0x00000000, 0x03690000, 0x00000010, 0xb1f60c54, 0x00000000, 0x0a6a0000,</div><div class='del'>-	0x00000000, 0x0aeb0000, 0x00000009, 0x0b6cffff, 0x00000000, 0x0c000000,</div><div class='del'>-	0x00000000, 0x0be90000, 0x00000003, 0x8cf6a000, 0x0000000c, 0x09800002,</div><div class='del'>-	0x00000010, 0x009f0000, 0x00000010, 0xb8173209, 0x00000000, 0x35140000,</div><div class='del'>-	0x00000000, 0x35950000, 0x00000005, 0x766c2c00, 0x00000000, 0x34970000,</div><div class='del'>-	0x00000004, 0xb8f12e00, 0x00000010, 0x001f0000, 0x00000008, 0x0f800004,</div><div class='del'>-	0x00000018, 0x8000fff7, 0x00000000, 0x03e90000, 0x00000010, 0xb8f6a01a,</div><div class='del'>-	0x00000010, 0x20130019, 0x00000010, 0xb1f10e18, 0x00000000, 0x83973200,</div><div class='del'>-	0x00000000, 0x38700e00, 0x00000000, 0xbb760e00, 0x00000000, 0x37d00000,</div><div class='del'>-	0x0000000c, 0x73e7001a, 0x00000003, 0xb8f1a000, 0x00000000, 0x32140000,</div><div class='del'>-	0x00000000, 0x32950000, 0x00000005, 0x73e72c00, 0x00000000, 0x33190000,</div><div class='del'>-	0x00000005, 0x74680000, 0x00000010, 0x0ce7000d, 0x00000008, 0x22000009,</div><div class='del'>-	0x00000000, 0x07520000, 0x00000000, 0x29000000, 0x0000000c, 0x73e70019,</div><div class='del'>-	0x0000000f, 0x65680010, 0x0000000c, 0x21420004, 0x00000018, 0x8000003c,</div><div class='del'>-	0x00000010, 0x20530000, 0x0000000c, 0x61420004, 0x00000000, 0x290e0000,</div><div class='del'>-	0x00000018, 0x80000002, 0x00000010, 0x91973206, 0x00000000, 0x35140000,</div><div class='del'>-	0x00000000, 0x35950000, 0x00000005, 0x766c2c00, 0x00000000, 0x34990000,</div><div class='del'>-	0x00000004, 0xb8f13200, 0x00000000, 0x83690c00, 0x00000010, 0xb1860013,</div><div class='del'>-	0x00000000, 0x28e90000, 0x00000008, 0x22000004, 0x00000000, 0x23ec0000,</div><div class='del'>-	0x00000000, 0x03690000, 0x00000010, 0xb8660c07, 0x00000009, 0x036cffff,</div><div class='del'>-	0x00000000, 0x326a0000, 0x00000000, 0x32eb0000, 0x00000005, 0x73e70c00,</div><div class='del'>-	0x00000000, 0x33690000, 0x00000005, 0x74680000, 0x0000000c, 0x73e7001c,</div><div class='del'>-	0x00000000, 0x03690000, 0x00000010, 0xb1f60c12, 0x00000010, 0xb1d00c11,</div><div class='del'>-	0x0000000c, 0x21420005, 0x0000000c, 0x33e7001c, 0x00000018, 0x8000000e,</div><div class='del'>-	0x00000010, 0x2e67000d, 0x00000000, 0x03690000, 0x00000010, 0xb1f60c0b,</div><div class='del'>-	0x00000010, 0xb1d00c0a, 0x00000000, 0x03440000, 0x00000008, 0x2200000c,</div><div class='del'>-	0x00000000, 0x07520000, 0x00000000, 0x29000000, 0x00000018, 0x80000015,</div><div class='del'>-	0x0000000c, 0x33e7001c, 0x00000010, 0x20530000, 0x00000000, 0x22060000,</div><div class='del'>-	0x00000000, 0x290e0000, 0x00000018, 0x000d0000, 0x00000000, 0x06820000,</div><div class='del'>-	0x00000010, 0x2de7000d, 0x00000010, 0x0ce7000c, 0x00000000, 0x27f20000,</div><div class='del'>-	0x00000010, 0xb96d9e0a, 0x00000000, 0xa86d9e00, 0x00000009, 0x0361ffff,</div><div class='del'>-	0x00000010, 0xb7500c07, 0x00000008, 0x2200000f, 0x0000000f, 0x65680010,</div><div class='del'>-	0x00000000, 0x29000000, 0x00000018, 0x80000004, 0x0000000c, 0x33e7001b,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000018, 0x000d0000, 0x00000000, 0x2b820000,</div><div class='del'>-	0x00000010, 0x20d2002f, 0x00000010, 0x0052002e, 0x00000009, 0x054e0007,</div><div class='del'>-	0x00000010, 0xb18a002c, 0x00000000, 0x050a8c00, 0x00000008, 0x850a0008,</div><div class='del'>-	0x00000010, 0x918a0029, 0x00000003, 0xc5008800, 0x00000008, 0xa3460001,</div><div class='del'>-	0x00000010, 0xb1c60007, 0x00000008, 0x22000001, 0x0000000c, 0x29800000,</div><div class='del'>-	0x00000010, 0x20530000, 0x00000000, 0x274e8c00, 0x00000000, 0x66cd0000,</div><div class='del'>-	0x00000000, 0x22c58c00, 0x00000008, 0x22000014, 0x00000003, 0x22c58e00,</div><div class='del'>-	0x00000003, 0x23c58e00, 0x00000003, 0x22c58e00, 0x00000003, 0x26cd9e00,</div><div class='del'>-	0x00000003, 0x27cd9e00, 0x00000003, 0x26cd9e00, 0x00000003, 0x274ea000,</div><div class='del'>-	0x00000003, 0x284ea000, 0x00000003, 0x274ea000, 0x0000000c, 0x69520000,</div><div class='del'>-	0x0000000c, 0x29800000, 0x00000010, 0x20530000, 0x00000003, 0x22c58e00,</div><div class='del'>-	0x00000003, 0x23c58e00, 0x00000003, 0x22c58e00, 0x00000003, 0x26cd9e00,</div><div class='del'>-	0x00000003, 0x27cd9e00, 0x00000003, 0x26cd9e00, 0x00000003, 0x274ea000,</div><div class='del'>-	0x00000003, 0x284ea000, 0x00000003, 0x274ea000, 0x00000000, 0xa2c58c00,</div><div class='del'>-	0x00000000, 0xa74e8c00, 0x00000000, 0xe6cd0000, 0x0000000f, 0x620a0010,</div><div class='del'>-	0x00000008, 0x23460001, 0x0000000c, 0x29800000, 0x00000010, 0x20530000,</div><div class='del'>-	0x0000000c, 0x29520000, 0x00000018, 0x80000002, 0x0000000c, 0x29800000,</div><div class='del'>-	0x00000018, 0x00570000 };</div><div class='add'>+static u8 bnx2_rv2p_proc2[] = {</div><div class='add'>+	0x1f, 0x8b, 0x08, 0x08, 0x7e, 0xd1, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,</div><div class='add'>+	0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xcd, 0x58, 0x5b, 0x6c,</div><div class='add'>+	0x54, 0x55, 0x14, 0x3d, 0xf3, 0xe8, 0xcc, 0x9d, 0xe9, 0xed, 0x9d, 0xf2,</div><div class='add'>+	0xb2, 0x03, 0xad, 0x08, 0xe5, 0xd1, 0x56, 0x29, 0xe8, 0x54, 0xab, 0x18,</div><div class='add'>+	0x15, 0x2c, 0x5a, 0x8c, 0x26, 0x68, 0xf0, 0xf9, 0x63, 0x14, 0x04, 0xda,</div><div class='add'>+	0x9a, 0x56, 0x9b, 0x16, 0xfb, 0x81, 0xaf, 0x09, 0x14, 0x6a, 0x4c, 0x25,</div><div class='add'>+	0xd6, 0x08, 0xc5, 0x47, 0xa0, 0x11, 0x1f, 0x84, 0xf0, 0xd3, 0x1f, 0x3b,</div><div class='add'>+	0x8d, 0x7f, 0x0a, 0x24, 0x6a, 0x88, 0xc4, 0xa8, 0x9f, 0x24, 0x68, 0xa0,</div><div class='add'>+	0x21, 0x0a, 0x58, 0x8b, 0x63, 0x4c, 0xb4, 0xf5, 0xec, 0xbd, 0xf6, 0xb9,</div><div class='add'>+	0x73, 0xef, 0x6d, 0x8b, 0x1a, 0xf9, 0x70, 0x3e, 0xba, 0x7b, 0xce, 0xd9,</div><div class='add'>+	0x67, 0x3f, 0xd6, 0xde, 0x67, 0x9f, 0x7d, 0xae, 0x52, 0xfc, 0xbb, 0xb6,</div><div class='add'>+	0x94, 0xc9, 0x37, 0x83, 0x96, 0xfe, 0x1b, 0x51, 0x0f, 0x85, 0xd3, 0x3c,</div><div class='add'>+	0x8e, 0x2a, 0xa2, 0x49, 0xa5, 0xb2, 0x5e, 0xea, 0x08, 0x7d, 0x44, 0xe8,</div><div class='add'>+	0x70, 0x08, 0xf4, 0xb4, 0xd0, 0x77, 0x84, 0xfe, 0x2e, 0xf4, 0x80, 0xd0,</div><div class='add'>+	0x0f, 0x85, 0xea, 0x5f, 0xd6, 0xd6, 0x7f, 0xf4, 0xb0, 0x46, 0x89, 0x7e,</div><div class='add'>+	0x1b, 0xd3, 0x35, 0xb0, 0xe3, 0xc1, 0x05, 0xc4, 0x77, 0x61, 0xa2, 0xc0,</div><div class='add'>+	0x87, 0xf9, 0x53, 0x7d, 0xa0, 0xd7, 0x60, 0xd7, 0xe1, 0xec, 0x0a, 0xb3,</div><div class='add'>+	0x1f, 0x64, 0x43, 0x09, 0xe8, 0xc6, 0x08, 0xe8, 0xea, 0x65, 0x4c, 0x7a,</div><div class='add'>+	0x9f, 0x0a, 0x63, 0xdc, 0xb8, 0x94, 0xf6, 0x87, 0x55, 0x83, 0x22, 0x3f,</div><div class='add'>+	0x67, 0xaa, 0x68, 0x98, 0xc6, 0xf5, 0x56, 0x6c, 0x18, 0xeb, 0x8f, 0xa5,</div><div class='add'>+	0x40, 0x37, 0x25, 0x41, 0xcf, 0x08, 0xdd, 0x52, 0x2c, 0x7a, 0x6c, 0x31,</div><div class='add'>+	0xbf, 0x98, 0xf6, 0x25, 0x5c, 0x39, 0xc7, 0x6d, 0xe0, 0x96, 0x95, 0xfd,</div><div class='add'>+	0x4a, 0xc1, 0xce, 0x03, 0xb2, 0x3e, 0xa3, 0x0a, 0xb3, 0xaf, 0x6f, 0xc1,</div><div class='add'>+	0xb8, 0xfc, 0x20, 0xf9, 0xa7, 0xff, 0xcf, 0x62, 0x7e, 0xfa, 0xfd, 0xf8,</div><div class='add'>+	0x15, 0xf6, 0x83, 0x96, 0x2f, 0xa2, 0x75, 0x27, 0xd3, 0x3f, 0x88, 0xf1,</div><div class='add'>+	0xde, 0x25, 0x32, 0x1f, 0x36, 0xf8, 0x18, 0x79, 0x41, 0x5c, 0x99, 0x58,</div><div class='add'>+	0xc7, 0x2a, 0x7d, 0xf2, 0x2b, 0x15, 0xe4, 0x2f, 0xc8, 0x2e, 0x35, 0xf2,</div><div class='add'>+	0x81, 0xfb, 0xfa, 0x16, 0xb2, 0x73, 0x4c, 0xc7, 0x01, 0xb8, 0xcd, 0x0a,</div><div class='add'>+	0x95, 0xb2, 0xdc, 0x7d, 0x83, 0x5e, 0x3d, 0x51, 0xad, 0x07, 0xfa, 0x54,</div><div class='add'>+	0xa5, 0xc5, 0x20, 0x65, 0x97, 0x81, 0xaa, 0x5a, 0xbf, 0x1f, 0x7b, 0x97,</div><div class='add'>+	0x18, 0x7b, 0x30, 0x9e, 0x9d, 0x01, 0xdd, 0x23, 0xf4, 0xaa, 0x3a, 0x26,</div><div class='add'>+	0xcb, 0x7f, 0xb8, 0xc1, 0x62, 0x0c, 0xb2, 0xb5, 0xde, 0x7c, 0x38, 0x32,</div><div class='add'>+	0x61, 0xf0, 0x52, 0x8b, 0x40, 0xce, 0x2e, 0x21, 0x3e, 0x1d, 0x9c, 0x4a,</div><div class='add'>+	0xc8, 0x5d, 0xdf, 0x32, 0x55, 0x1e, 0x7d, 0x30, 0x45, 0x1e, 0x61, 0xff,</div><div class='add'>+	0xb7, 0x2b, 0x7c, 0xf9, 0xa4, 0xda, 0x25, 0x4f, 0x36, 0x22, 0x8f, 0xac,</div><div class='add'>+	0xa7, 0x3e, 0x91, 0x85, 0x6b, 0x13, 0xfa, 0xcf, 0x84, 0x7a, 0x32, 0x4e,</div><div class='add'>+	0x01, 0x8a, 0x2b, 0x87, 0xfd, 0x53, 0xe2, 0xe7, 0x26, 0xed, 0x27, 0xd1,</div><div class='add'>+	0x8a, 0x50, 0xb6, 0x36, 0xc1, 0x38, 0x35, 0xc4, 0xa0, 0xaf, 0x61, 0x03,</div><div class='add'>+	0xb6, 0xaf, 0x46, 0x5c, 0x7b, 0x4f, 0x86, 0x8d, 0xfd, 0x51, 0xfa, 0x3b,</div><div class='add'>+	0xd0, 0xb6, 0x9d, 0x47, 0x03, 0xd1, 0x1d, 0x4c, 0xed, 0x63, 0x95, 0x58,</div><div class='add'>+	0xee, 0x8a, 0xf0, 0x7a, 0x72, 0x97, 0xcc, 0xf7, 0xec, 0xf0, 0xdb, 0xfd,</div><div class='add'>+	0x02, 0xf2, 0xdb, 0x7e, 0x7e, 0x47, 0x88, 0xa8, 0x13, 0x73, 0xf9, 0x98,</div><div class='add'>+	0x3a, 0x3b, 0xb7, 0x13, 0xff, 0x55, 0x6a, 0xd7, 0x20, 0x29, 0x4e, 0xab,</div><div class='add'>+	0x0d, 0x6b, 0xb1, 0x6f, 0x77, 0x2c, 0xc5, 0xb8, 0x36, 0xad, 0x05, 0xfd,</div><div class='add'>+	0x1e, 0xf3, 0xf3, 0x9d, 0x1e, 0xe2, 0x2f, 0x9d, 0xe7, 0x0c, 0x71, 0x5e,</div><div class='add'>+	0xa9, 0x11, 0xce, 0xc7, 0x04, 0x65, 0x06, 0xff, 0xda, 0xaa, 0xc1, 0xdf,</div><div class='add'>+	0xbc, 0x99, 0x15, 0xbf, 0xd9, 0x9a, 0xe7, 0x3c, 0x18, 0xe8, 0x18, 0x26,</div><div class='add'>+	0x3f, 0xe7, 0xaa, 0x91, 0x4e, 0xa2, 0x51, 0xd5, 0xb0, 0x90, 0xf0, 0x5e,</div><div class='add'>+	0x15, 0x36, 0x71, 0x3a, 0x7f, 0x33, 0xcd, 0xcf, 0xd3, 0xeb, 0x26, 0x1e,</div><div class='add'>+	0x24, 0xd7, 0x92, 0x78, 0x45, 0x5d, 0x7c, 0xf2, 0x61, 0xf8, 0xdb, 0xcd,</div><div class='add'>+	0x76, 0x5f, 0x97, 0xec, 0xe6, 0xfc, 0x4a, 0xaa, 0x26, 0x8e, 0x7f, 0xd4,</div><div class='add'>+	0x6a, 0x1b, 0xc6, 0xfa, 0xf9, 0x8f, 0x8d, 0x5c, 0xd2, 0x53, 0x23, 0x75,</div><div class='add'>+	0x44, 0xb9, 0x72, 0xa2, 0x37, 0x83, 0xee, 0x34, 0x7a, 0xeb, 0x88, 0x6f,</div><div class='add'>+	0xb1, 0x42, 0xfe, 0x26, 0x26, 0xc9, 0x69, 0x03, 0xce, 0xf6, 0x33, 0xec,</div><div class='add'>+	0xf7, 0x35, 0xf6, 0x85, 0x3e, 0x63, 0x2f, 0xe6, 0x2f, 0xfa, 0xf4, 0x95,</div><div class='add'>+	0x7b, 0xf4, 0x11, 0x7f, 0x51, 0xf2, 0x02, 0xef, 0x9b, 0x63, 0x3d, 0x3b,</div><div class='add'>+	0xcc, 0xb8, 0x58, 0xcf, 0x0c, 0x41, 0xfe, 0xc5, 0x21, 0xe2, 0x9f, 0x23,</div><div class='add'>+	0x7a, 0xed, 0xff, 0x88, 0xe7, 0x9c, 0x30, 0xe4, 0x4c, 0x8f, 0x5f, 0xc1,</div><div class='add'>+	0x6f, 0xe3, 0x17, 0xcb, 0xb5, 0x47, 0x73, 0x69, 0xe6, 0x33, 0xf1, 0xe8,</div><div class='add'>+	0x0e, 0x73, 0x02, 0xa6, 0x1b, 0x16, 0xfa, 0x71, 0x33, 0xf6, 0x9c, 0xdf,</div><div class='add'>+	0xcc, 0x79, 0x3e, 0xd1, 0x26, 0x75, 0x40, 0x71, 0x9d, 0xb9, 0x5d, 0xe2,</div><div class='add'>+	0xa1, 0xf3, 0x3a, 0x04, 0xff, 0x46, 0x73, 0x2c, 0x3f, 0xd9, 0xc5, 0x79,</div><div class='add'>+	0xb9, 0xd2, 0x8e, 0xe6, 0x38, 0x5e, 0xd6, 0xd9, 0x21, 0x6c, 0x2b, 0xd4,</div><div class='add'>+	0x4f, 0xc8, 0x6b, 0xb6, 0x41, 0x9b, 0xa4, 0x8e, 0x9e, 0x15, 0xda, 0x6d,</div><div class='add'>+	0x33, 0x3e, 0xba, 0x8e, 0x59, 0x2c, 0x3f, 0x9b, 0x32, 0xf7, 0x0c, 0xd6,</div><div class='add'>+	0x9f, 0x16, 0x39, 0x3f, 0x0a, 0x55, 0x22, 0xa7, 0x55, 0xf6, 0x9f, 0xf3,</div><div class='add'>+	0xc9, 0x89, 0x04, 0xe4, 0x84, 0x94, 0xc1, 0xcd, 0x9c, 0xef, 0x5d, 0x52,</div><div class='add'>+	0xbf, 0xf7, 0xc5, 0xa6, 0xab, 0xb7, 0x7c, 0x0e, 0xdc, 0xba, 0x5a, 0x8e,</div><div class='add'>+	0x3a, 0x53, 0x1f, 0x0d, 0xb3, 0xbf, 0x03, 0xdd, 0x3b, 0x80, 0x53, 0x8f,</div><div class='add'>+	0xe0, 0x14, 0x07, 0x4e, 0xf3, 0x0a, 0xf5, 0x59, 0x14, 0xd4, 0x90, 0xfe,</div><div class='add'>+	0x53, 0x21, 0xe3, 0xc7, 0xbe, 0x98, 0xaf, 0xfe, 0xf6, 0x9a, 0xfa, 0x5b,</div><div class='add'>+	0xa8, 0xd3, 0xc4, 0xff, 0xb3, 0xa9, 0x6f, 0x5a, 0x9f, 0xd1, 0xff, 0x6f,</div><div class='add'>+	0xf5, 0x72, 0x9c, 0x92, 0xdd, 0x7d, 0x26, 0xce, 0x98, 0x2e, 0xd4, 0xd9,</div><div class='add'>+	0x22, 0x22, 0xcb, 0x46, 0x3a, 0x99, 0x5e, 0xdf, 0xbc, 0x15, 0xf3, 0x65,</div><div class='add'>+	0x7c, 0x4e, 0x6e, 0x09, 0x01, 0xaf, 0xa8, 0x3a, 0xde, 0x87, 0xba, 0xae,</div><div class='add'>+	0xe2, 0x2c, 0xaf, 0xe2, 0x28, 0xc7, 0x3f, 0xaa, 0xe5, 0x12, 0xdf, 0x67,</div><div class='add'>+	0xa1, 0x42, 0x3e, 0x7a, 0xfd, 0xd9, 0xad, 0xf3, 0x84, 0xec, 0x88, 0xe9,</div><div class='add'>+	0xbc, 0xa5, 0xb1, 0x3e, 0x47, 0xb6, 0xe4, 0xf9, 0x1a, 0xe6, 0xb3, 0xc7,</div><div class='add'>+	0x22, 0x34, 0xff, 0x80, 0xd5, 0xd3, 0x87, 0xf9, 0x9f, 0x1a, 0x69, 0xbc,</div><div class='add'>+	0xce, 0x7e, 0x0d, 0xe7, 0xcc, 0x7e, 0x0d, 0xf5, 0xcb, 0x2a, 0x3a, 0x88,</div><div class='add'>+	0xba, 0xd6, 0x78, 0x10, 0xf2, 0x71, 0x4f, 0x7b, 0xfd, 0xf2, 0xe2, 0x47,</div><div class='add'>+	0xe7, 0xe1, 0xb2, 0x38, 0xd9, 0xcf, 0x09, 0x4e, 0x97, 0x7c, 0xf1, 0x39,</div><div class='add'>+	0x6c, 0xe2, 0xd3, 0x1b, 0x93, 0xf3, 0xd2, 0x7c, 0x29, 0xe8, 0x17, 0xf1,</div><div class='add'>+	0x9d, 0x71, 0xef, 0x9d, 0xae, 0x95, 0xa0, 0xdd, 0x2b, 0xe5, 0x9c, 0xd6,</div><div class='add'>+	0xf9, 0xf3, 0x6b, 0x3e, 0xea, 0xf2, 0xb8, 0x7b, 0x4f, 0x20, 0xbf, 0xac,</div><div class='add'>+	0x9d, 0xf0, 0x4b, 0xbd, 0x28, 0x79, 0x3c, 0x2e, 0xf4, 0x65, 0xc9, 0xdf,</div><div class='add'>+	0x6d, 0xd2, 0xb7, 0x98, 0xfe, 0xe2, 0x0f, 0xcc, 0x3b, 0xfd, 0x6e, 0x5f,</div><div class='add'>+	0x60, 0xea, 0x36, 0x8d, 0x43, 0xca, 0x89, 0x13, 0x83, 0x36, 0xeb, 0x33,</div><div class='add'>+	0x24, 0x4a, 0xcf, 0x1a, 0xe0, 0x35, 0x52, 0x07, 0xbe, 0xdd, 0x91, 0xb0,</div><div class='add'>+	0x8c, 0x21, 0x6f, 0xac, 0xda, 0x77, 0x0f, 0xd7, 0x4f, 0xc6, 0x93, 0xe4,</div><div class='add'>+	0xc6, 0xdc, 0xfa, 0x24, 0x79, 0xaf, 0x26, 0x84, 0x96, 0x2f, 0xbe, 0x2c,</div><div class='add'>+	0xbe, 0x85, 0xfe, 0x64, 0xa9, 0x17, 0xdf, 0x97, 0x34, 0xbe, 0xbc, 0xaf,</div><div class='add'>+	0xbe, 0xf9, 0x12, 0xa6, 0x4b, 0x6f, 0x05, 0xed, 0xbb, 0x95, 0xe7, 0x17,</div><div class='add'>+	0xa3, 0xee, 0x11, 0x7e, 0x9c, 0x5f, 0xf5, 0x6f, 0x0c, 0x9a, 0x7e, 0x42,</div><div class='add'>+	0xf0, 0x08, 0xf4, 0x41, 0x65, 0x77, 0x80, 0xbe, 0x29, 0x74, 0xce, 0x2a,</div><div class='add'>+	0xd0, 0xbd, 0xab, 0xfc, 0x71, 0x88, 0xa5, 0x7c, 0x71, 0xac, 0x47, 0x1c,</div><div class='add'>+	0x8f, 0x4c, 0x04, 0xeb, 0x81, 0xc4, 0x4b, 0xc7, 0x27, 0x70, 0xbf, 0x1b,</div><div class='add'>+	0xfd, 0xe2, 0xce, 0xdf, 0xc5, 0xed, 0x4a, 0xc7, 0xab, 0x7b, 0x25, 0xee,</div><div class='add'>+	0x93, 0x0e, 0xe9, 0x4b, 0xc7, 0xdc, 0xfb, 0xe2, 0x9f, 0xc4, 0x31, 0x7e,</div><div class='add'>+	0x85, 0xe3, 0x78, 0xf7, 0xff, 0x2c, 0x8e, 0x9d, 0x12, 0xc7, 0x22, 0xb9,</div><div class='add'>+	0x57, 0x4d, 0xbf, 0xd9, 0x2e, 0x7d, 0x18, 0xf5, 0x8d, 0x7e, 0xbd, 0x4f,</div><div class='add'>+	0x70, 0x1f, 0x78, 0xb5, 0x5b, 0x8f, 0xe7, 0x33, 0x7f, 0x4e, 0xf6, 0x95,</div><div class='add'>+	0xca, 0xbe, 0x7b, 0x26, 0xed, 0x3b, 0xc5, 0xf5, 0xee, 0xf1, 0xf1, 0xc9,</div><div class='add'>+	0xef, 0x15, 0x9f, 0x9d, 0x59, 0x95, 0x02, 0xee, 0xa8, 0xe3, 0xb1, 0x29,</div><div class='add'>+	0xde, 0x37, 0x86, 0x1f, 0xf9, 0xb5, 0x36, 0x85, 0xba, 0x05, 0xfe, 0xb9,</div><div class='add'>+	0x9e, 0x7a, 0x4a, 0xe3, 0xfb, 0xc7, 0xa7, 0xef, 0x57, 0x8d, 0x3c, 0xc4,</div><div class='add'>+	0x6d, 0x43, 0xb8, 0x84, 0xf9, 0x4e, 0xb7, 0xf3, 0x7d, 0xe7, 0xfa, 0xb7,</div><div class='add'>+	0x9a, 0xfd, 0x3a, 0x2a, 0xfe, 0x55, 0x88, 0x7f, 0x7a, 0xb9, 0x96, 0xeb,</div><div class='add'>+	0xbe, 0x75, 0xba, 0xdd, 0xeb, 0xdf, 0x9d, 0x97, 0xd1, 0xf7, 0x4f, 0xfb,</div><div class='add'>+	0x63, 0xd1, 0x9b, 0x32, 0xfa, 0x49, 0x5e, 0xb9, 0xf4, 0x7d, 0xd4, 0x4f,</div><div class='add'>+	0x62, 0x7e, 0x72, 0x9f, 0x41, 0xfa, 0x5b, 0x34, 0x5e, 0x72, 0xdf, 0x70,</div><div class='add'>+	0x3e, 0x47, 0xac, 0xa3, 0x6c, 0x57, 0x5e, 0xf9, 0x71, 0x39, 0x23, 0x7c,</div><div class='add'>+	0x53, 0xc5, 0x8d, 0xd6, 0x8b, 0x64, 0x7d, 0x2a, 0xbf, 0xc5, 0x4e, 0x37,</div><div class='add'>+	0x1f, 0x64, 0x1f, 0xf3, 0x35, 0x0b, 0x5f, 0x34, 0x34, 0x39, 0xfe, 0x18,</div><div class='add'>+	0xe5, 0xab, 0x38, 0xaf, 0xf7, 0x6f, 0xcb, 0x11, 0x9f, 0x76, 0x9e, 0xf3,</div><div class='add'>+	0xf0, 0xfb, 0x80, 0x7d, 0xe9, 0x2b, 0x80, 0x23, 0xf1, 0xcd, 0x50, 0x4d,</div><div class='add'>+	0xce, 0x74, 0x78, 0xe1, 0xdd, 0x30, 0x9a, 0x33, 0x78, 0xdb, 0xec, 0xe7,</div><div class='add'>+	0x48, 0x27, 0xe9, 0x5f, 0x1d, 0xc0, 0x31, 0x2c, 0x38, 0x9e, 0x50, 0x7f,</div><div class='add'>+	0x9f, 0xf7, 0xc6, 0x0f, 0x6f, 0x5e, 0x8c, 0xff, 0x19, 0xcc, 0xe3, 0x87,</div><div class='add'>+	0xe5, 0x5d, 0xdd, 0x18, 0x03, 0xfd, 0x2e, 0x62, 0xec, 0x46, 0x5e, 0xdf,</div><div class='add'>+	0xc3, 0xe7, 0xb5, 0x4a, 0xf5, 0xf2, 0xbb, 0xc3, 0x52, 0x0d, 0x6b, 0xc9,</div><div class='add'>+	0xee, 0x94, 0xae, 0x7f, 0xc8, 0x77, 0x27, 0xee, 0xbd, 0xb7, 0x75, 0x0d,</div><div class='add'>+	0x4c, 0xc4, 0x69, 0x58, 0x31, 0x33, 0xc1, 0x82, 0xde, 0xf8, 0xe2, 0x4b,</div><div class='add'>+	0x5e, 0x7e, 0xaf, 0xbf, 0x18, 0xf3, 0x65, 0xf7, 0x91, 0x9c, 0x88, 0xda,</div><div class='add'>+	0x8b, 0xba, 0xfb, 0xee, 0x1e, 0xd0, 0xb7, 0xd5, 0xbd, 0xd8, 0x3f, 0x73,</div><div class='add'>+	0x3b, 0xd7, 0x51, 0xab, 0x4c, 0xf2, 0x2b, 0x0d, 0x5c, 0xd3, 0xa8, 0xc3,</div><div class='add'>+	0x13, 0x13, 0xaa, 0x04, 0xf7, 0x9a, 0x79, 0x07, 0xab, 0x1a, 0xd1, 0x8b,</div><div class='add'>+	0xfa, 0x68, 0x17, 0xde, 0xc1, 0x44, 0x8b, 0x83, 0x7d, 0x9f, 0x55, 0xe8,</div><div class='add'>+	0xaf, 0x08, 0x8f, 0xf7, 0x5d, 0x1c, 0xd3, 0xe1, 0x60, 0x5d, 0xf2, 0xfa,</div><div class='add'>+	0x15, 0x93, 0x73, 0xfd, 0xab, 0xfb, 0x6e, 0xee, 0xe1, 0x7e, 0x2a, 0x19,</div><div class='add'>+	0xac, 0xcb, 0x01, 0xf9, 0xfb, 0x24, 0x7e, 0x49, 0x89, 0x5f, 0x54, 0xc7,</div><div class='add'>+	0x0f, 0xef, 0xed, 0x4f, 0x7d, 0xef, 0x7a, 0xaa, 0x1b, 0xde, 0xbc, 0xfb,</div><div class='add'>+	0xfc, 0x4f, 0x63, 0xd7, 0xf6, 0x98, 0xb7, 0x0e, 0x57, 0xbb, 0xe7, 0xae,</div><div class='add'>+	0x43, 0xde, 0x8b, 0x5d, 0x87, 0x30, 0xce, 0x73, 0xbf, 0xbc, 0x38, 0xd3,</div><div class='add'>+	0x21, 0x79, 0x74, 0x57, 0x44, 0xf2, 0x41, 0xec, 0xfb, 0x22, 0x62, 0xee,</div><div class='add'>+	0x1b, 0x8c, 0xbf, 0x92, 0xfb, 0xee, 0x97, 0x2a, 0xf4, 0xd9, 0x17, 0x87,</div><div class='add'>+	0xcc, 0xfb, 0xc4, 0xbc, 0x57, 0xb0, 0xbe, 0x3e, 0xae, 0x04, 0x67, 0xbe,</div><div class='add'>+	0xff, 0xb5, 0x3f, 0x9c, 0xaf, 0x99, 0x8e, 0x61, 0x1f, 0x5e, 0x2a, 0x16,</div><div class='add'>+	0x78, 0xbf, 0xc4, 0xe5, 0xfb, 0x45, 0xbf, 0xe0, 0xe1, 0xf0, 0xf9, 0x29,</div><div class='add'>+	0xd5, 0xf6, 0x13, 0x4d, 0x65, 0x3a, 0x73, 0xb0, 0xa7, 0xd5, 0xed, 0x23,</div><div class='add'>+	0xc1, 0x27, 0xd4, 0x79, 0x4b, 0xde, 0xc1, 0xf2, 0x5e, 0xd6, 0xef, 0x61,</div><div class='add'>+	0xf4, 0x73, 0xad, 0x79, 0x8c, 0xc7, 0xd0, 0xb7, 0x39, 0xbf, 0xca, 0xbd,</div><div class='add'>+	0xb5, 0x75, 0x9b, 0xe9, 0x4b, 0xa7, 0xde, 0x67, 0xee, 0xb9, 0xb6, 0x6a,</div><div class='add'>+	0xd0, 0x16, 0xee, 0x5b, 0x1f, 0xb2, 0xf3, 0x92, 0x1f, 0x85, 0x77, 0x89,</div><div class='add'>+	0xff, 0x3d, 0x62, 0xfa, 0x85, 0x73, 0xc5, 0xb8, 0x67, 0xf3, 0xbd, 0x34,</div><div class='add'>+	0xa1, 0xdf, 0x23, 0x09, 0x6f, 0x9e, 0x25, 0x32, 0x65, 0x82, 0xfb, 0xec,</div><div class='add'>+	0x9b, 0x40, 0xf7, 0xdc, 0x84, 0xbe, 0xbc, 0xb5, 0x4b, 0x70, 0xb8, 0x91,</div><div class='add'>+	0x71, 0x5b, 0x3e, 0x9a, 0x0b, 0x7e, 0x67, 0x21, 0x5c, 0x7f, 0x73, 0xfb,</div><div class='add'>+	0xd1, 0x73, 0x6c, 0xd7, 0xbc, 0x81, 0x3c, 0xf3, 0xcd, 0x55, 0xb3, 0xf8,</div><div class='add'>+	0xfc, 0xa6, 0x9d, 0x51, 0xd8, 0x99, 0xe9, 0x17, 0xbf, 0xda, 0x6f, 0x01,</div><div class='add'>+	0xed, 0x92, 0x3a, 0x73, 0xd2, 0x7d, 0x97, 0xc3, 0x4e, 0x53, 0x4f, 0x26,</div><div class='add'>+	0xbf, 0x13, 0x30, 0x9e, 0x5b, 0xc7, 0x63, 0xd5, 0xbc, 0x95, 0xe4, 0x97,</div><div class='add'>+	0x4c, 0x7a, 0xcf, 0x16, 0xe2, 0x6e, 0xf2, 0xc1, 0xe4, 0x8f, 0xf7, 0x1d,</div><div class='add'>+	0x7b, 0x9b, 0xa7, 0x5e, 0xfa, 0xe3, 0xef, 0x70, 0xbe, 0x84, 0x65, 0x3d,</div><div class='add'>+	0x96, 0xe9, 0xef, 0xbb, 0x3c, 0x3e, 0x6f, 0x01, 0x9f, 0x8c, 0xd8, 0x6d,</div><div class='add'>+	0xb7, 0xf0, 0x3b, 0x74, 0x96, 0xda, 0x25, 0xf1, 0x39, 0x57, 0x2d, 0x75,</div><div class='add'>+	0x50, 0xec, 0xfb, 0x49, 0xfa, 0x1f, 0xc4, 0x31, 0x6e, 0x6f, 0xc9, 0x49,</div><div class='add'>+	0xdc, 0x24, 0x8f, 0x9e, 0x16, 0xbf, 0x7f, 0x84, 0xdf, 0xb6, 0xf1, 0xbb,</div><div class='add'>+	0xc5, 0xf5, 0xdb, 0xd4, 0x59, 0xaf, 0x9c, 0x99, 0x3a, 0x1f, 0xb8, 0x5e,</div><div class='add'>+	0xdb, 0x27, 0xf9, 0xdd, 0x53, 0x24, 0xe7, 0xa1, 0x42, 0xbe, 0x3b, 0x38,</div><div class='add'>+	0xe2, 0x4f, 0x89, 0x6a, 0x5a, 0xee, 0xdd, 0x57, 0x2c, 0xfb, 0x92, 0x7a,</div><div class='add'>+	0x1f, 0xe6, 0x71, 0xfe, 0xec, 0x29, 0xf0, 0x34, 0xdf, 0x11, 0x8c, 0xdc,</div><div class='add'>+	0xe0, 0x39, 0xf2, 0xe2, 0xc7, 0x37, 0x13, 0xff, 0x50, 0x07, 0x74, 0x9c,</div><div class='add'>+	0x6a, 0xcd, 0xf7, 0x07, 0xcc, 0xe3, 0xfc, 0x26, 0xf7, 0xb7, 0xa1, 0xaf,</div><div class='add'>+	0xdc, 0xdf, 0x76, 0x48, 0xfa, 0x08, 0xc1, 0xe5, 0x81, 0x21, 0xb2, 0x43,</div><div class='add'>+	0xc7, 0xae, 0xd2, 0x7f, 0xfe, 0x61, 0x47, 0x54, 0xec, 0x28, 0xf7, 0xd8,</div><div class='add'>+	0x11, 0xd0, 0x7b, 0x1d, 0xcd, 0xaf, 0x50, 0x5f, 0x73, 0x1e, 0x2e, 0x57,</div><div class='add'>+	0xeb, 0x29, 0x47, 0xf4, 0xbd, 0xb0, 0xae, 0x88, 0xc6, 0xcb, 0xd4, 0xab,</div><div class='add'>+	0xf0, 0xb7, 0x37, 0x59, 0x84, 0x3a, 0x96, 0xdc, 0x49, 0xf3, 0x35, 0xea,</div><div class='add'>+	0xd5, 0x3e, 0x0e, 0xc4, 0x2b, 0xea, 0x18, 0xea, 0x73, 0xe3, 0x41, 0xb6,</div><div class='add'>+	0x47, 0x1d, 0x1f, 0x34, 0xf5, 0x7a, 0xca, 0xef, 0x98, 0xbd, 0xeb, 0xa4,</div><div class='add'>+	0x5e, 0x9c, 0xc0, 0x77, 0x51, 0xfd, 0x5e, 0x23, 0xfe, 0xd9, 0xe6, 0x3d,</div><div class='add'>+	0xb8, 0xfb, 0x98, 0xa1, 0x8b, 0x7c, 0xe3, 0xfd, 0x27, 0x96, 0x0a, 0xad,</div><div class='add'>+	0xf2, 0x8d, 0x07, 0xd6, 0x55, 0x09, 0xad, 0x36, 0xe3, 0xe9, 0xbe, 0x2b,</div><div class='add'>+	0x5e, 0x29, 0xf9, 0x62, 0xf7, 0x7b, 0xe2, 0xcf, 0x47, 0xe2, 0xcf, 0x59,</div><div class='add'>+	0xe0, 0x9f, 0xdc, 0x28, 0x78, 0x2c, 0x0a, 0xea, 0x17, 0xbb, 0xdc, 0x73,</div><div class='add'>+	0x63, 0xd6, 0x11, 0x8f, 0x47, 0xd5, 0x5f, 0x3f, 0x97, 0x8f, 0x31, 0xd8,</div><div class='add'>+	0x17, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static const int bnx2_TPAT_b06FwReleaseMajor = 0x1;</div><div class='ctx'> static const int bnx2_TPAT_b06FwReleaseMinor = 0x0;</div><div class='hunk'>@@ -2339,201 +1330,199 @@ static const u32 bnx2_TPAT_b06FwBssAddr = 0x08001aa0;</div><div class='ctx'> static const int bnx2_TPAT_b06FwBssLen = 0x250;</div><div class='ctx'> static const u32 bnx2_TPAT_b06FwSbssAddr = 0x08001a60;</div><div class='ctx'> static const int bnx2_TPAT_b06FwSbssLen = 0x34;</div><div class='del'>-static u32 bnx2_TPAT_b06FwText[(0x122c/4) + 1] = {</div><div class='del'>-	0x0a000218, 0x00000000, 0x00000000, 0x0000000d, 0x74706174, 0x20322e35,</div><div class='del'>-	0x2e313100, 0x02050b01, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800,</div><div class='del'>-	0x24421a60, 0x3c030800, 0x24631cf0, 0xac400000, 0x0043202b, 0x1480fffd,</div><div class='del'>-	0x24420004, 0x3c1d0800, 0x37bd2ffc, 0x03a0f021, 0x3c100800, 0x26100860,</div><div class='del'>-	0x3c1c0800, 0x279c1a60, 0x0e000546, 0x00000000, 0x0000000d, 0x8f820010,</div><div class='del'>-	0x8c450008, 0x24030800, 0xaf430178, 0x97430104, 0x3c020008, 0xaf420140,</div><div class='del'>-	0x8f820024, 0x30420001, 0x10400007, 0x3069ffff, 0x24020002, 0x2523fffe,</div><div class='del'>-	0xa7420146, 0xa7430148, 0x0a000242, 0x3c020800, 0xa7400146, 0x3c020800,</div><div class='del'>-	0x8c43083c, 0x1460000e, 0x24020f00, 0x8f820024, 0x30430020, 0x0003182b,</div><div class='del'>-	0x00031823, 0x30650009, 0x30420c00, 0x24030400, 0x14430002, 0x34a40001,</div><div class='del'>-	0x34a40005, 0xa744014a, 0x0a000264, 0x3c020800, 0x8f830014, 0x14620008,</div><div class='del'>-	0x00000000, 0x8f820024, 0x30420020, 0x0002102b, 0x00021023, 0x3042000d,</div><div class='del'>-	0x0a000262, 0x34420005, 0x8f820024, 0x30420020, 0x0002102b, 0x00021023,</div><div class='del'>-	0x30420009, 0x34420001, 0xa742014a, 0x3c020800, 0x8c430820, 0x8f840024,</div><div class='del'>-	0x3c020048, 0x00621825, 0x30840006, 0x24020002, 0x1082000d, 0x2c820003,</div><div class='del'>-	0x50400005, 0x24020004, 0x10800012, 0x3c020001, 0x0a000284, 0x00000000,</div><div class='del'>-	0x10820007, 0x24020006, 0x1482000f, 0x3c020111, 0x0a00027c, 0x00621025,</div><div class='del'>-	0x0a00027b, 0x3c020101, 0x3c020011, 0x00621025, 0x24030001, 0xaf421000,</div><div class='del'>-	0xaf830020, 0x0a000284, 0x00000000, 0x00621025, 0xaf421000, 0xaf800020,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8f830020, 0x1060003f,</div><div class='del'>-	0x3c048000, 0x8f421000, 0x00441024, 0x1040fffd, 0x00000000, 0x10600039,</div><div class='del'>-	0x00000000, 0x8f421000, 0x3c030020, 0x00431024, 0x10400034, 0x00000000,</div><div class='del'>-	0x97421014, 0x14400031, 0x00000000, 0x97421008, 0x8f840010, 0x24420006,</div><div class='del'>-	0x00024082, 0x00081880, 0x00643821, 0x8ce50000, 0x30430003, 0x30420001,</div><div class='del'>-	0x10400004, 0x00000000, 0x0000000d, 0x0a0002c3, 0x00081080, 0x5460000f,</div><div class='del'>-	0x30a5ffff, 0x3c06ffff, 0x00a62824, 0x0005182b, 0x00a61026, 0x0002102b,</div><div class='del'>-	0x00621824, 0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x240001fb,</div><div class='del'>-	0x8ce20000, 0x0a0002c2, 0x00462825, 0x0005182b, 0x38a2ffff, 0x0002102b,</div><div class='del'>-	0x00621824, 0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x24000205,</div><div class='del'>-	0x8ce20000, 0x3445ffff, 0x00081080, 0x00441021, 0x3c030800, 0xac450000,</div><div class='del'>-	0x8c620830, 0x24420001, 0xac620830, 0x8f840018, 0x01202821, 0x24820008,</div><div class='del'>-	0x30421fff, 0x24434000, 0x0343d821, 0x30a30007, 0xaf84000c, 0xaf820018,</div><div class='del'>-	0xaf420084, 0x10600002, 0x24a20007, 0x3045fff8, 0x8f820030, 0x8f840000,</div><div class='del'>-	0x00451821, 0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023,</div><div class='del'>-	0xaf820030, 0x8f840030, 0x34028000, 0x00821021, 0x03421821, 0x3c021000,</div><div class='del'>-	0xaf830010, 0xaf440080, 0x03e00008, 0xaf420178, 0x8f830024, 0x27bdffe0,</div><div class='del'>-	0xafbf0018, 0xafb10014, 0x30620200, 0x14400004, 0xafb00010, 0x0000000d,</div><div class='del'>-	0x00000000, 0x24000242, 0x00031a82, 0x30630003, 0x000310c0, 0x00431021,</div><div class='del'>-	0x00021080, 0x00431021, 0x00021080, 0x3c030800, 0x24631aa0, 0x00438821,</div><div class='del'>-	0x8e240000, 0x10800004, 0x00000000, 0x0000000d, 0x00000000, 0x2400024d,</div><div class='del'>-	0x8f850010, 0x24020001, 0xae220000, 0x8ca70008, 0xa2200007, 0x8f620004,</div><div class='del'>-	0x26300014, 0x02002021, 0x00021402, 0xa2220004, 0x304600ff, 0x24c60005,</div><div class='del'>-	0x0e000673, 0x00063082, 0x8f620004, 0xa6220008, 0x8f430108, 0x3c021000,</div><div class='del'>-	0x00621824, 0x10600008, 0x00000000, 0x97420104, 0x92230007, 0x2442ffec,</div><div class='del'>-	0x3045ffff, 0x34630002, 0x0a000321, 0xa2230007, 0x97420104, 0x2442fff0,</div><div class='del'>-	0x3045ffff, 0x8f620004, 0x3042ffff, 0x2c420013, 0x54400005, 0x92230007,</div><div class='del'>-	0x92220007, 0x34420001, 0xa2220007, 0x92230007, 0x24020001, 0x10620009,</div><div class='del'>-	0x28620002, 0x14400014, 0x24020002, 0x10620012, 0x24020003, 0x1062000a,</div><div class='del'>-	0x00000000, 0x0a000342, 0x00000000, 0x8f820010, 0x8c43000c, 0x3c04ffff,</div><div class='del'>-	0x00641824, 0x00651825, 0x0a000342, 0xac43000c, 0x8f820010, 0x8c430010,</div><div class='del'>-	0x3c04ffff, 0x00641824, 0x00651825, 0xac430010, 0x8f620004, 0x3042ffff,</div><div class='del'>-	0x24420002, 0x00021083, 0xa2220005, 0x304500ff, 0x8f820010, 0x3c04ffff,</div><div class='del'>-	0x00052880, 0x00a22821, 0x8ca70000, 0x96220008, 0x97430104, 0x00e42024,</div><div class='del'>-	0x24420002, 0x00621823, 0x00833825, 0xaca70000, 0x92240005, 0x00041080,</div><div class='del'>-	0x02021021, 0x90430000, 0x3c05fff6, 0x34a5ffff, 0x3063000f, 0x00832021,</div><div class='del'>-	0xa2240006, 0x308200ff, 0x24420003, 0x00021080, 0x02021021, 0x8c460000,</div><div class='del'>-	0x308300ff, 0x8f820010, 0x3c04ff3f, 0x00031880, 0x00c53824, 0x00621821,</div><div class='del'>-	0xae26000c, 0xac67000c, 0x8e22000c, 0x92230006, 0x3484ffff, 0x00441024,</div><div class='del'>-	0x24630003, 0x00031880, 0x02031821, 0x00e42024, 0xae22000c, 0xac640000,</div><div class='del'>-	0x92220006, 0x24420004, 0x00021080, 0x02021021, 0x94470002, 0xac470000,</div><div class='del'>-	0x92230006, 0x8f820010, 0x00031880, 0x00621821, 0x24020010, 0xac670010,</div><div class='del'>-	0x24030002, 0xa7420140, 0xa7400142, 0xa7400144, 0xa7430146, 0x97420104,</div><div class='del'>-	0x24030001, 0x2442fffe, 0xa7420148, 0xa743014a, 0x8f820024, 0x24030002,</div><div class='del'>-	0x30440006, 0x1083000d, 0x2c820003, 0x10400005, 0x24020004, 0x10800011,</div><div class='del'>-	0x3c020009, 0x0a0003a5, 0x00000000, 0x10820007, 0x24020006, 0x1482000d,</div><div class='del'>-	0x3c020119, 0x0a00039f, 0x24030001, 0x0a00039e, 0x3c020109, 0x3c020019,</div><div class='del'>-	0x24030001, 0xaf421000, 0xaf830020, 0x0a0003a5, 0x00000000, 0xaf421000,</div><div class='del'>-	0xaf800020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x92220004,</div><div class='del'>-	0x24030008, 0x8f840020, 0x24420002, 0x30420007, 0x00621823, 0x30630007,</div><div class='del'>-	0x10800006, 0xae230010, 0x3c038000, 0x8f421000, 0x00431024, 0x1040fffd,</div><div class='del'>-	0x00000000, 0x8f820018, 0xaf82000c, 0x24420010, 0x30421fff, 0xaf820018,</div><div class='del'>-	0xaf420084, 0x97430104, 0x24424000, 0x0342d821, 0x3063ffff, 0x30620007,</div><div class='del'>-	0x10400002, 0x24620007, 0x3043fff8, 0x8f820030, 0x8f840000, 0x00431821,</div><div class='del'>-	0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023, 0xaf820030,</div><div class='del'>-	0x8f840030, 0x34028000, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x00821021,</div><div class='del'>-	0x03421821, 0x3c021000, 0xaf830010, 0xaf440080, 0xaf420178, 0x03e00008,</div><div class='del'>-	0x27bd0020, 0x8f830024, 0x27bdffe0, 0xafbf0018, 0xafb10014, 0x30620200,</div><div class='del'>-	0x14400004, 0xafb00010, 0x0000000d, 0x00000000, 0x240002e4, 0x00031a82,</div><div class='del'>-	0x30630003, 0x000310c0, 0x00431021, 0x00021080, 0x00431021, 0x00021080,</div><div class='del'>-	0x3c030800, 0x24631aa0, 0x00438021, 0x8e040000, 0x14800004, 0x00000000,</div><div class='del'>-	0x0000000d, 0x00000000, 0x240002e9, 0x8f620004, 0x04410008, 0x26050014,</div><div class='del'>-	0x92020006, 0x8e03000c, 0x24420003, 0x00021080, 0x00a21021, 0xac430000,</div><div class='del'>-	0xae000000, 0x92020005, 0x24420001, 0x00021080, 0x00a21021, 0x8c430000,</div><div class='del'>-	0x3c040001, 0x00641821, 0xac430000, 0x92060004, 0x27710008, 0x02202021,</div><div class='del'>-	0x24c60005, 0x0e000673, 0x00063082, 0x92040006, 0x3c057fff, 0x8f620004,</div><div class='del'>-	0x00042080, 0x00912021, 0x8c830004, 0x34a5ffff, 0x00451024, 0x00621821,</div><div class='del'>-	0xac830004, 0x92050005, 0x3c07ffff, 0x92040004, 0x00052880, 0x00b12821,</div><div class='del'>-	0x8ca30000, 0x97420104, 0x96060008, 0x00671824, 0x00441021, 0x00461023,</div><div class='del'>-	0x3042ffff, 0x00621825, 0xaca30000, 0x92030007, 0x24020001, 0x1062000a,</div><div class='del'>-	0x28620002, 0x1440001d, 0x2402000a, 0x24020002, 0x10620019, 0x24020003,</div><div class='del'>-	0x1062000e, 0x2402000a, 0x0a000447, 0x00000000, 0x92020004, 0x97430104,</div><div class='del'>-	0x8e24000c, 0x00621821, 0x2463fff2, 0x3063ffff, 0x00872024, 0x00832025,</div><div class='del'>-	0xae24000c, 0x0a000447, 0x2402000a, 0x92020004, 0x97430104, 0x8e240010,</div><div class='del'>-	0x00621821, 0x2463ffee, 0x3063ffff, 0x00872024, 0x00832025, 0xae240010,</div><div class='del'>-	0x2402000a, 0xa7420140, 0x96030012, 0x8f840024, 0xa7430142, 0x92020004,</div><div class='del'>-	0xa7420144, 0xa7400146, 0x97430104, 0x30840006, 0x24020001, 0xa7430148,</div><div class='del'>-	0xa742014a, 0x24020002, 0x1082000d, 0x2c820003, 0x10400005, 0x24020004,</div><div class='del'>-	0x10800011, 0x3c020041, 0x0a00046c, 0x00000000, 0x10820007, 0x24020006,</div><div class='del'>-	0x1482000d, 0x3c020151, 0x0a000466, 0x24030001, 0x0a000465, 0x3c020141,</div><div class='del'>-	0x3c020051, 0x24030001, 0xaf421000, 0xaf830020, 0x0a00046c, 0x00000000,</div><div class='del'>-	0xaf421000, 0xaf800020, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x8f820020, 0x8f840018, 0x10400006, 0x92030004, 0x3c058000, 0x8f421000,</div><div class='del'>-	0x00451024, 0x1040fffd, 0x00000000, 0x2463000a, 0x30620007, 0x10400002,</div><div class='del'>-	0x24620007, 0x304303f8, 0x00831021, 0x30421fff, 0xaf84000c, 0xaf820018,</div><div class='del'>-	0xaf420084, 0x97430104, 0x24424000, 0x0342d821, 0x3063ffff, 0x30620007,</div><div class='del'>-	0x10400002, 0x24620007, 0x3043fff8, 0x8f820030, 0x8f840000, 0x00431821,</div><div class='del'>-	0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023, 0xaf820030,</div><div class='del'>-	0x8f840030, 0x34028000, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x00821021,</div><div class='del'>-	0x03421821, 0x3c021000, 0xaf830010, 0xaf440080, 0xaf420178, 0x03e00008,</div><div class='del'>-	0x27bd0020, 0x8f620000, 0x97430104, 0x3c048000, 0x3045ffff, 0x3066ffff,</div><div class='del'>-	0x8f420178, 0x00441024, 0x1440fffd, 0x2402000a, 0x30a30007, 0xa7420140,</div><div class='del'>-	0x24020008, 0x00431023, 0x30420007, 0x24a3fffe, 0xa7420142, 0xa7430144,</div><div class='del'>-	0xa7400146, 0xa7460148, 0x8f420108, 0x8f830024, 0x30420020, 0x0002102b,</div><div class='del'>-	0x00021023, 0x30420009, 0x34420001, 0x30630006, 0xa742014a, 0x24020002,</div><div class='del'>-	0x1062000d, 0x2c620003, 0x10400005, 0x24020004, 0x10600011, 0x3c020041,</div><div class='del'>-	0x0a0004d6, 0x00000000, 0x10620007, 0x24020006, 0x1462000d, 0x3c020151,</div><div class='del'>-	0x0a0004d0, 0x24030001, 0x0a0004cf, 0x3c020141, 0x3c020051, 0x24030001,</div><div class='del'>-	0xaf421000, 0xaf830020, 0x0a0004d6, 0x00000000, 0xaf421000, 0xaf800020,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8f820020, 0x24a30008,</div><div class='del'>-	0x8f850018, 0x10400006, 0x30c6ffff, 0x3c048000, 0x8f421000, 0x00441024,</div><div class='del'>-	0x1040fffd, 0x00000000, 0x3063ffff, 0x30620007, 0x10400002, 0x24620007,</div><div class='del'>-	0x3043fff8, 0x00a31021, 0x30421fff, 0x24434000, 0x0343d821, 0x00c02021,</div><div class='del'>-	0x30830007, 0xaf85000c, 0xaf820018, 0xaf420084, 0x10600002, 0x24820007,</div><div class='del'>-	0x3044fff8, 0x8f820030, 0x8f850000, 0x00441821, 0xaf82001c, 0x0065102b,</div><div class='del'>-	0xaf830030, 0x14400002, 0x00651023, 0xaf820030, 0x8f840030, 0x34028000,</div><div class='del'>-	0x3c030800, 0x8c650834, 0x00821021, 0x03421821, 0xaf830010, 0xaf440080,</div><div class='del'>-	0x10a00006, 0x2402000e, 0x9383002f, 0x14620004, 0x3c021000, 0x2402043f,</div><div class='del'>-	0xa7420148, 0x3c021000, 0x03e00008, 0xaf420178, 0x8f820024, 0x30424000,</div><div class='del'>-	0x10400005, 0x24020800, 0x0000000d, 0x00000000, 0x2400040e, 0x24020800,</div><div class='del'>-	0xaf420178, 0x97440104, 0x3c030008, 0xaf430140, 0x8f820024, 0x30420001,</div><div class='del'>-	0x10400006, 0x3085ffff, 0x24020002, 0x24a3fffe, 0xa7420146, 0x0a000526,</div><div class='del'>-	0xa7430148, 0xa7400146, 0x8f840018, 0x2402000d, 0xa742014a, 0x24830008,</div><div class='del'>-	0x30631fff, 0x24624000, 0x0342d821, 0x30a20007, 0xaf84000c, 0xaf830018,</div><div class='del'>-	0xaf430084, 0x10400002, 0x24a20007, 0x3045fff8, 0x8f820030, 0x8f840000,</div><div class='del'>-	0x00451821, 0xaf82001c, 0x0064102b, 0xaf830030, 0x14400002, 0x00641023,</div><div class='del'>-	0xaf820030, 0x8f840030, 0x34028000, 0x00821021, 0x03421821, 0x3c021000,</div><div class='del'>-	0xaf830010, 0xaf440080, 0x03e00008, 0xaf420178, 0x27bdffe8, 0x3c046008,</div><div class='del'>-	0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f, 0x375b4000,</div><div class='del'>-	0x00431024, 0x3442380c, 0xac825000, 0x8f430008, 0x3c100800, 0x37428000,</div><div class='del'>-	0x34630001, 0xaf430008, 0xaf820010, 0x3c02601c, 0xaf800018, 0xaf400080,</div><div class='del'>-	0xaf400084, 0x8c450008, 0x3c036000, 0x8c620808, 0x3c040800, 0x3c030080,</div><div class='del'>-	0xac830820, 0x3042fff0, 0x38420010, 0x2c420001, 0xaf850000, 0xaf820004,</div><div class='del'>-	0x0e000658, 0x00000000, 0x8f420000, 0x30420001, 0x1040fffb, 0x00000000,</div><div class='del'>-	0x8f430108, 0x8f440100, 0x30622000, 0xaf830024, 0xaf840014, 0x10400004,</div><div class='del'>-	0x8e02082c, 0x24420001, 0x0a0005c6, 0xae02082c, 0x30620200, 0x14400003,</div><div class='del'>-	0x24020f00, 0x14820027, 0x24020d00, 0x97420104, 0x1040001c, 0x30624000,</div><div class='del'>-	0x14400005, 0x00000000, 0x0e00022f, 0x00000000, 0x0a0005bb, 0x00000000,</div><div class='del'>-	0x8f620008, 0x8f630000, 0x24020030, 0x00031e02, 0x306300f0, 0x10620007,</div><div class='del'>-	0x28620031, 0x1440002f, 0x24020040, 0x10620007, 0x00000000, 0x0a0005bb,</div><div class='del'>-	0x00000000, 0x0e0002e8, 0x00000000, 0x0a0005bb, 0x00000000, 0x0e0003db,</div><div class='del'>-	0x00000000, 0x0a0005bb, 0x00000000, 0x30620040, 0x1440002b, 0x00000000,</div><div class='del'>-	0x0000000d, 0x00000000, 0x240004b2, 0x0a0005c6, 0x00000000, 0x1482000f,</div><div class='del'>-	0x30620006, 0x97420104, 0x10400005, 0x30620040, 0x0e000510, 0x00000000,</div><div class='del'>-	0x0a0005bb, 0x00000000, 0x1440001b, 0x00000000, 0x0000000d, 0x00000000,</div><div class='del'>-	0x240004c4, 0x0a0005c6, 0x00000000, 0x1040000e, 0x30621000, 0x10400005,</div><div class='del'>-	0x00000000, 0x0e000688, 0x00000000, 0x0a0005bb, 0x00000000, 0x0e0004a1,</div><div class='del'>-	0x00000000, 0x8f82002c, 0x24420001, 0xaf82002c, 0x0a0005c6, 0x00000000,</div><div class='del'>-	0x30620040, 0x14400004, 0x00000000, 0x0000000d, 0x00000000, 0x240004db,</div><div class='del'>-	0x8f420138, 0x3c034000, 0x00431025, 0xaf420138, 0x0a000566, 0x00000000,</div><div class='del'>-	0x3c046008, 0x8c835000, 0x3c1a8000, 0x2402ff7f, 0x375b4000, 0x00621824,</div><div class='del'>-	0x3463380c, 0xac835000, 0x8f420008, 0x3c056000, 0x3c03601c, 0x34420001,</div><div class='del'>-	0xaf420008, 0x37428000, 0xaf800018, 0xaf820010, 0xaf400080, 0xaf400084,</div><div class='del'>-	0x8c660008, 0x8ca20808, 0x3c040800, 0x3c030080, 0xac830820, 0x3042fff0,</div><div class='del'>-	0x38420010, 0x2c420001, 0xaf860000, 0xaf820004, 0x03e00008, 0x00000000,</div><div class='del'>-	0x3084ffff, 0x30820007, 0x10400002, 0x24820007, 0x3044fff8, 0x8f820018,</div><div class='del'>-	0x00441821, 0x30631fff, 0x24644000, 0x0344d821, 0xaf82000c, 0xaf830018,</div><div class='del'>-	0x03e00008, 0xaf430084, 0x3084ffff, 0x30820007, 0x10400002, 0x24820007,</div><div class='del'>-	0x3044fff8, 0x8f820030, 0x8f830000, 0x00442021, 0xaf82001c, 0x0083102b,</div><div class='del'>-	0xaf840030, 0x14400002, 0x00831023, 0xaf820030, 0x8f820030, 0x34038000,</div><div class='del'>-	0x00431821, 0x03432021, 0xaf840010, 0x03e00008, 0xaf420080, 0x8f830024,</div><div class='del'>-	0x24020002, 0x30630006, 0x1062000d, 0x2c620003, 0x50400005, 0x24020004,</div><div class='del'>-	0x10600012, 0x3c020001, 0x0a00062a, 0x00000000, 0x10620007, 0x24020006,</div><div class='del'>-	0x1462000f, 0x3c020111, 0x0a000622, 0x00821025, 0x0a000621, 0x3c020101,</div><div class='del'>-	0x3c020011, 0x00821025, 0x24030001, 0xaf421000, 0xaf830020, 0x0a00062a,</div><div class='del'>-	0x00000000, 0x00821025, 0xaf421000, 0xaf800020, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x03e00008, 0x00000000, 0x8f820020, 0x10400005, 0x3c038000,</div><div class='del'>-	0x8f421000, 0x00431024, 0x1040fffd, 0x00000000, 0x03e00008, 0x00000000,</div><div class='del'>-	0x8f820024, 0x27bdffe8, 0x30424000, 0x14400005, 0xafbf0010, 0x0e00022f,</div><div class='del'>-	0x00000000, 0x0a000656, 0x8fbf0010, 0x8f620008, 0x8f630000, 0x24020030,</div><div class='del'>-	0x00031e02, 0x306300f0, 0x10620008, 0x28620031, 0x1440000d, 0x8fbf0010,</div><div class='del'>-	0x24020040, 0x10620007, 0x00000000, 0x0a000656, 0x00000000, 0x0e0002e8,</div><div class='del'>-	0x00000000, 0x0a000656, 0x8fbf0010, 0x0e0003db, 0x00000000, 0x8fbf0010,</div><div class='del'>-	0x03e00008, 0x27bd0018, 0x8f840028, 0x1080000f, 0x3c026000, 0x8c430c3c,</div><div class='del'>-	0x30630fff, 0xaf830008, 0x14600011, 0x3082000f, 0x10400005, 0x308200f0,</div><div class='del'>-	0x10400003, 0x30820f00, 0x14400006, 0x00000000, 0x0000000d, 0x00000000,</div><div class='del'>-	0x2400051a, 0x03e00008, 0x00000000, 0x0000000d, 0x00000000, 0x2400051f,</div><div class='del'>-	0x03e00008, 0x00000000, 0xaf830028, 0x03e00008, 0x00000000, 0x10c00007,</div><div class='del'>-	0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000, 0x14c0fffb,</div><div class='del'>-	0x24840004, 0x03e00008, 0x00000000, 0x0a000684, 0x00a01021, 0xac860000,</div><div class='del'>-	0x00000000, 0x00000000, 0x24840004, 0x00a01021, 0x1440fffa, 0x24a5ffff,</div><div class='del'>-	0x03e00008, 0x00000000, 0x0000000d, 0x03e00008, 0x00000000, 0x00000000};</div><div class='add'>+static u8 bnx2_TPAT_b06FwText[] = {</div><div class='add'>+	0x1f, 0x8b, 0x08, 0x08, 0x47, 0xd2, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,</div><div class='add'>+	0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xc5, 0x57, 0x4d, 0x68,</div><div class='add'>+	0x1c, 0xe7, 0x19, 0x7e, 0xe7, 0x77, 0x47, 0x62, 0x25, 0x8d, 0x93, 0x3d,</div><div class='add'>+	0xac, 0x5d, 0xa5, 0x99, 0x91, 0x46, 0x3f, 0x54, 0x26, 0x9e, 0x84, 0xa5,</div><div class='add'>+	0x56, 0x61, 0x20, 0xe3, 0x99, 0x95, 0x2c, 0x0c, 0x05, 0x07, 0x42, 0x08,</div><div class='add'>+	0xe4, 0xb2, 0x1d, 0x49, 0x36, 0x85, 0x1e, 0x5a, 0x9a, 0x43, 0xa0, 0x05,</div><div class='add'>+	0x0f, 0x33, 0xeb, 0x34, 0x87, 0xc5, 0xdb, 0xaa, 0xc5, 0xbe, 0x94, 0xd6,</div><div class='add'>+	0x95, 0xea, 0xe8, 0xb2, 0x68, 0xe2, 0x53, 0x0f, 0xc5, 0xd8, 0xb4, 0x54,</div><div class='add'>+	0xd0, 0x53, 0x7b, 0x0a, 0x85, 0x5c, 0x4c, 0x69, 0x20, 0x85, 0x12, 0x44,</div><div class='add'>+	0x0f, 0x21, 0xd4, 0xad, 0xa7, 0xcf, 0xfb, 0xcd, 0x8c, 0xbc, 0xbb, 0x95,</div><div class='add'>+	0x5b, 0x1f, 0x02, 0x15, 0xac, 0x66, 0xe6, 0xfb, 0xde, 0xf7, 0xfb, 0x79,</div><div class='add'>+	0x9f, 0xe7, 0x79, 0xbf, 0xf7, 0x6b, 0xca, 0x34, 0x49, 0xe5, 0xdf, 0x14,</div><div class='add'>+	0x7e, 0x6f, 0x7f, 0xe3, 0xdb, 0x6f, 0x7f, 0xf5, 0xa5, 0x57, 0x2c, 0xa2,</div><div class='add'>+	0x57, 0x5e, 0x92, 0x64, 0x5d, 0xa6, 0x2f, 0xe0, 0x4f, 0x21, 0x32, 0xab,</div><div class='add'>+	0xf1, 0xf9, 0x47, 0x86, 0xec, 0x75, 0xce, 0x04, 0x0e, 0x19, 0x8a, 0x77,</div><div class='add'>+	0x34, 0xbb, 0xe9, 0x10, 0xf9, 0x83, 0x15, 0x2b, 0xa4, 0x7f, 0xe5, 0x71,</div><div class='add'>+	0x43, 0x25, 0x6e, 0x7f, 0xc1, 0xfb, 0xe7, 0xb9, 0x7b, 0xe7, 0xed, 0xa3,</div><div class='add'>+	0xdb, 0x0a, 0x19, 0xa6, 0xd7, 0x31, 0xcc, 0x45, 0x32, 0x66, 0xe1, 0xf3,</div><div class='add'>+	0xd3, 0xa5, 0x75, 0x8d, 0xa6, 0xab, 0xb1, 0x4c, 0x4a, 0xfa, 0x06, 0xad,</div><div class='add'>+	0xf5, 0x30, 0x8e, 0xf3, 0x8e, 0x14, 0x66, 0xaa, 0x14, 0xde, 0x32, 0x48,</div><div class='add'>+	0xf6, 0x7c, 0x29, 0xc8, 0x1c, 0xf4, 0x49, 0x14, 0xb8, 0x35, 0xf2, 0xcd,</div><div class='add'>+	0x3c, 0xff, 0xa6, 0x2b, 0x93, 0xec, 0x3c, 0xce, 0xe7, 0x17, 0xd6, 0xa5,</div><div class='add'>+	0x60, 0x7f, 0x43, 0x0a, 0xf7, 0x03, 0xde, 0x37, 0xd6, 0xb1, 0x2e, 0xf9,</div><div class='add'>+	0xfb, 0xfc, 0xf4, 0x8c, 0xb0, 0x37, 0x4d, 0x9d, 0x06, 0xcd, 0xc8, 0x0e,</div><div class='add'>+	0xfb, 0x5a, 0x14, 0xba, 0x2b, 0x4d, 0x85, 0xe6, 0xf1, 0x9b, 0xa0, 0x6d,</div><div class='add'>+	0x97, 0xea, 0x81, 0x4b, 0xaa, 0xe2, 0xc8, 0x14, 0x36, 0x24, 0xfa, 0x65,</div><div class='add'>+	0x4b, 0xc3, 0xef, 0x92, 0xd4, 0xde, 0xdf, 0x2a, 0xc7, 0x69, 0x50, 0x8a,</div><div class='add'>+	0xb5, 0x44, 0x0d, 0x5e, 0x5b, 0xe1, 0x1f, 0xb8, 0x2b, 0xa6, 0x4c, 0xf3,</div><div class='add'>+	0xf8, 0x4d, 0xe1, 0x3d, 0x82, 0x9d, 0x46, 0x41, 0x6b, 0xbc, 0x6f, 0x02,</div><div class='add'>+	0xef, 0x58, 0x27, 0xc6, 0x0a, 0xc4, 0x3a, 0x2c, 0xac, 0xc3, 0xa1, 0x6e,</div><div class='add'>+	0x7f, 0x03, 0xfb, 0x58, 0x68, 0x46, 0xa4, 0x53, 0x57, 0xac, 0x7d, 0x8a,</div><div class='add'>+	0x12, 0x53, 0xa1, 0xe4, 0xac, 0x46, 0xfe, 0x65, 0x15, 0xdf, 0xcf, 0x51,</div><div class='add'>+	0x6c, 0x4a, 0xb0, 0xe9, 0x96, 0xf8, 0xd5, 0xd0, 0xaf, 0xa3, 0x7d, 0x86,</div><div class='add'>+	0x92, 0xc6, 0x29, 0x49, 0xf6, 0xbe, 0x8f, 0xf6, 0x05, 0x33, 0xa2, 0xef,</div><div class='add'>+	0xe1, 0x29, 0xe1, 0xfb, 0x14, 0x8f, 0x87, 0x6f, 0x89, 0x14, 0x87, 0xcc,</div><div class='add'>+	0x20, 0xb3, 0x28, 0xcd, 0x2a, 0x5f, 0x6e, 0x2f, 0xda, 0xe2, 0x6c, 0x1c,</div><div class='add'>+	0x3b, 0xd8, 0xf5, 0x5f, 0xa5, 0x8e, 0x49, 0xb1, 0xea, 0xc1, 0xa6, 0xef,</div><div class='add'>+	0x98, 0x6d, 0xe0, 0xe4, 0x0b, 0x3c, 0xbf, 0xc6, 0xed, 0xfc, 0x87, 0x76,</div><div class='add'>+	0x8b, 0x14, 0xcf, 0x31, 0x43, 0x6a, 0x51, 0xd1, 0xd7, 0x30, 0x83, 0x5b,</div><div class='add'>+	0x2f, 0x93, 0x2f, 0xe2, 0x61, 0xe0, 0xdd, 0xc4, 0x9e, 0x74, 0x60, 0x9b,</div><div class='add'>+	0xf8, 0x32, 0xc5, 0x4d, 0x83, 0xec, 0xd5, 0x2d, 0xf4, 0x7c, 0xdc, 0x53,</div><div class='add'>+	0x10, 0x67, 0xc6, 0x49, 0x2d, 0xfd, 0x18, 0xd7, 0xdf, 0x62, 0x5d, 0xb1,</div><div class='add'>+	0x69, 0xd0, 0x0c, 0x75, 0x5e, 0xcf, 0xf3, 0x3b, 0x6e, 0x9e, 0xeb, 0x9e,</div><div class='add'>+	0xb3, 0xfc, 0x3e, 0xad, 0x34, 0x35, 0x5a, 0x34, 0xf1, 0x44, 0xdc, 0x1c,</div><div class='add'>+	0xc4, 0x46, 0x2d, 0xe7, 0x9f, 0x2a, 0xd7, 0xfa, 0x48, 0x42, 0xe8, 0xe9,</div><div class='add'>+	0xcf, 0xbd, 0xdf, 0xf0, 0xde, 0x97, 0xd7, 0x85, 0x7d, 0x9e, 0xef, 0xae,</div><div class='add'>+	0x3e, 0xcd, 0x5e, 0x93, 0x0b, 0xfb, 0x3c, 0x5f, 0x6b, 0xf1, 0x7c, 0x36,</div><div class='add'>+	0xf6, 0xc6, 0x9c, 0x24, 0x5a, 0x1b, 0xb8, 0x46, 0xd4, 0xc3, 0xba, 0x1c,</div><div class='add'>+	0x3c, 0x07, 0x4d, 0xac, 0xdd, 0x5e, 0xb6, 0x24, 0x83, 0x12, 0x27, 0x7f,</div><div class='add'>+	0x11, 0x3c, 0xf0, 0x43, 0xc7, 0xfe, 0x53, 0xa8, 0xd4, 0x68, 0xcf, 0xad,</div><div class='add'>+	0x53, 0x37, 0x6b, 0x52, 0x92, 0x75, 0x29, 0xc8, 0x64, 0x8c, 0x5f, 0xa3,</div><div class='add'>+	0x5d, 0xe7, 0xf3, 0x7c, 0xcd, 0x75, 0x81, 0x33, 0xb1, 0x5f, 0x73, 0x8d,</div><div class='add'>+	0x66, 0xd1, 0xbf, 0x62, 0x6e, 0x91, 0x8b, 0x98, 0xcb, 0x88, 0xc9, 0xbc,</div><div class='add'>+	0x78, 0x4f, 0x32, 0x17, 0xfd, 0x14, 0xcb, 0x2d, 0xdb, 0x4c, 0xc8, 0x6e,</div><div class='add'>+	0x06, 0x0a, 0x99, 0xb2, 0x67, 0xc2, 0x26, 0xa6, 0x76, 0x66, 0xd0, 0x43,</div><div class='add'>+	0xe5, 0x1d, 0xc1, 0xe3, 0xb4, 0xff, 0x30, 0xbf, 0xb7, 0xd4, 0xa4, 0xfb,</div><div class='add'>+	0x59, 0x83, 0xee, 0x66, 0x24, 0x47, 0x1c, 0xab, 0x86, 0x49, 0x1f, 0x64,</div><div class='add'>+	0xd5, 0x3e, 0xc0, 0x65, 0x27, 0x39, 0xa3, 0x40, 0x67, 0x9b, 0xee, 0x03,</div><div class='add'>+	0xb0, 0xc4, 0x06, 0x0e, 0x31, 0xf6, 0x5c, 0x3d, 0x79, 0x4f, 0xb7, 0xcf,</div><div class='add'>+	0x6c, 0x3a, 0xf6, 0x7b, 0x21, 0xb3, 0xf3, 0x86, 0x8a, 0xd6, 0xe1, 0x38,</div><div class='add'>+	0x7c, 0x1d, 0xfe, 0x26, 0x5d, 0x87, 0x5e, 0x64, 0xc4, 0x63, 0xee, 0xc0,</div><div class='add'>+	0xa0, 0xfd, 0x5e, 0x8d, 0xac, 0x5d, 0x95, 0xa2, 0x7e, 0x83, 0xdc, 0x45,</div><div class='add'>+	0xdb, 0x22, 0x59, 0x6e, 0xc8, 0x88, 0xdf, 0xdc, 0x6e, 0x4e, 0xeb, 0xae,</div><div class='add'>+	0x46, 0x87, 0xce, 0x77, 0x75, 0x9a, 0x4e, 0x5c, 0x9d, 0xd8, 0xc6, 0xa0,</div><div class='add'>+	0xb9, 0xf7, 0x0d, 0x29, 0xec, 0xf3, 0xfa, 0x39, 0xce, 0x46, 0x19, 0x67,</div><div class='add'>+	0x55, 0x0a, 0x6e, 0xd5, 0x68, 0x7e, 0xe7, 0x6f, 0x79, 0xe0, 0x20, 0xc6,</div><div class='add'>+	0xe0, 0xf1, 0x66, 0xcb, 0x56, 0x68, 0x12, 0x6d, 0xbb, 0xdc, 0x77, 0x54,</div><div class='add'>+	0xb6, 0xf3, 0x18, 0x79, 0x1e, 0xb8, 0xcf, 0x53, 0xc0, 0xfc, 0x7e, 0x9d,</div><div class='add'>+	0x7d, 0x6a, 0x34, 0xb7, 0xc3, 0xba, 0xc0, 0x73, 0x97, 0xbf, 0x79, 0x6d,</div><div class='add'>+	0x13, 0x14, 0x61, 0x37, 0xd1, 0x72, 0x03, 0xfb, 0x97, 0x85, 0x06, 0x22,</div><div class='add'>+	0xec, 0x56, 0x76, 0x26, 0xf1, 0x14, 0x71, 0x50, 0x0a, 0x3e, 0x73, 0x5e,</div><div class='add'>+	0xa8, 0x53, 0x08, 0x5c, 0x55, 0xac, 0x67, 0x8b, 0x16, 0x9a, 0xdb, 0xa2,</div><div class='add'>+	0x0f, 0x6d, 0x03, 0xee, 0x33, 0xc7, 0xfa, 0xf0, 0x3d, 0xa8, 0xd6, 0x20,</div><div class='add'>+	0x03, 0xf3, 0x14, 0xb3, 0x68, 0x62, 0xaf, 0x6b, 0x2e, 0xdb, 0xb3, 0x6d,</div><div class='add'>+	0xbc, 0xac, 0x91, 0xbd, 0xbc, 0x8b, 0xd1, 0xf7, 0x7b, 0xd8, 0xef, 0x4d,</div><div class='add'>+	0xce, 0x35, 0x8e, 0xf5, 0x17, 0x62, 0xfb, 0x79, 0xec, 0x79, 0x61, 0x35,</div><div class='add'>+	0xe5, 0xbe, 0x81, 0x46, 0xce, 0x4e, 0x6c, 0xaa, 0x88, 0xbd, 0x8c, 0xc0,</div><div class='add'>+	0x87, 0x3f, 0xfc, 0x2c, 0xd7, 0x3c, 0x70, 0xb8, 0x35, 0x03, 0x6c, 0x6c,</div><div class='add'>+	0x2b, 0x85, 0x9e, 0x1d, 0x8c, 0x9b, 0xb8, 0x0a, 0xfc, 0x0a, 0x8c, 0xd8,</div><div class='add'>+	0x6e, 0xbd, 0x97, 0x53, 0x2a, 0xe6, 0xba, 0xc6, 0x73, 0x21, 0xe7, 0x38,</div><div class='add'>+	0xab, 0xbf, 0x03, 0x27, 0x22, 0xaa, 0xd3, 0xe2, 0x41, 0x9d, 0xae, 0x0e,</div><div class='add'>+	0xea, 0x34, 0x77, 0x43, 0x47, 0x1c, 0xf2, 0xbc, 0xdb, 0x62, 0x0d, 0x02,</div><div class='add'>+	0x6b, 0x87, 0xed, 0xec, 0xa6, 0x22, 0xf3, 0x3a, 0xd0, 0x7f, 0x40, 0xb4,</div><div class='add'>+	0x35, 0xd0, 0x11, 0x37, 0x75, 0x68, 0x6c, 0x99, 0x2e, 0xfe, 0x84, 0xe8,</div><div class='add'>+	0xe2, 0x80, 0x7d, 0x79, 0xfc, 0xc2, 0x27, 0xc2, 0x9e, 0x65, 0x60, 0x7e,</div><div class='add'>+	0x75, 0x20, 0x23, 0x1f, 0x20, 0x5f, 0xee, 0x07, 0xc8, 0x83, 0x6d, 0xfc,</div><div class='add'>+	0xd6, 0x91, 0x1b, 0x19, 0x1b, 0xce, 0x13, 0x8f, 0x81, 0xcf, 0x06, 0xfa,</div><div class='add'>+	0x2e, 0xa1, 0x8d, 0xf3, 0x16, 0xdb, 0xea, 0xd4, 0x76, 0xa7, 0x28, 0xad,</div><div class='add'>+	0x72, 0x91, 0xc9, 0xb9, 0xe8, 0x14, 0xf8, 0x34, 0x81, 0xfc, 0x72, 0x47,</div><div class='add'>+	0x19, 0xcd, 0x45, 0xc8, 0x59, 0x8d, 0xd3, 0xc8, 0x3d, 0x3f, 0x47, 0x3b,</div><div class='add'>+	0x8f, 0xf7, 0x33, 0x3c, 0x27, 0xf0, 0x7d, 0x1a, 0xb6, 0xc3, 0x79, 0xa8,</div><div class='add'>+	0xf2, 0x7b, 0x5a, 0x0e, 0x02, 0xef, 0x76, 0x0c, 0xd8, 0x5b, 0xd0, 0x0b,</div><div class='add'>+	0xc7, 0xbb, 0x86, 0x7c, 0xc1, 0x31, 0xaf, 0x21, 0xa6, 0x3a, 0xe6, 0x36,</div><div class='add'>+	0x69, 0xfe, 0x80, 0x62, 0xa5, 0xcc, 0x4f, 0xe1, 0x71, 0x7e, 0x6a, 0x0a,</div><div class='add'>+	0x1e, 0x24, 0x99, 0x09, 0x1f, 0xd6, 0x6d, 0xa5, 0x53, 0xc6, 0x8e, 0xfc,</div><div class='add'>+	0x00, 0x1a, 0x0e, 0x94, 0x3c, 0xdf, 0xc4, 0x19, 0x11, 0x01, 0x77, 0x1f,</div><div class='add'>+	0xda, 0x8d, 0xa0, 0xdd, 0x70, 0x48, 0xbb, 0xe1, 0xff, 0xd4, 0x2e, 0x74,</div><div class='add'>+	0x09, 0x8d, 0xdc, 0x05, 0xa7, 0x3e, 0xe8, 0x9f, 0xa4, 0x63, 0xd6, 0x30,</div><div class='add'>+	0x6b, 0xd9, 0xa2, 0x7b, 0x4b, 0xcf, 0xa2, 0xe5, 0xbf, 0x3e, 0xab, 0x96,</div><div class='add'>+	0x63, 0xd6, 0xb2, 0xca, 0x5a, 0x6e, 0x0c, 0x6b, 0xf9, 0x53, 0xf8, 0x17,</div><div class='add'>+	0x9a, 0xbc, 0xa0, 0x36, 0x48, 0x5b, 0x04, 0x0e, 0x3b, 0x75, 0x52, 0x6e,</div><div class='add'>+	0x3c, 0xe1, 0x1b, 0x73, 0x38, 0x1c, 0xe0, 0xdf, 0x81, 0x86, 0x3e, 0x69,</div><div class='add'>+	0xb4, 0x1d, 0x39, 0x4f, 0xf5, 0xec, 0xe6, 0x96, 0xb0, 0x51, 0x49, 0x47,</div><div class='add'>+	0xdc, 0xbf, 0xb3, 0x64, 0x5b, 0x96, 0x3c, 0xac, 0x79, 0xa8, 0x7e, 0x27,</div><div class='add'>+	0xbf, 0xa6, 0x79, 0x3c, 0x4f, 0x6c, 0x81, 0xeb, 0xd6, 0x8f, 0x80, 0x51,</div><div class='add'>+	0xda, 0x63, 0x9e, 0x3b, 0xe6, 0x9a, 0xe0, 0x17, 0xbe, 0xa1, 0x05, 0x0d,</div><div class='add'>+	0x7c, 0xad, 0xc1, 0x4e, 0xdd, 0x29, 0xf4, 0x73, 0x17, 0xe3, 0xee, 0xf5,</div><div class='add'>+	0x98, 0x5f, 0x06, 0xe9, 0x37, 0x9d, 0xe6, 0x55, 0x91, 0x73, 0xe7, 0xcd,</div><div class='add'>+	0x75, 0x62, 0xed, 0xf1, 0x79, 0x87, 0xfe, 0x41, 0x8d, 0x14, 0xa1, 0xf7,</div><div class='add'>+	0xc9, 0x52, 0xef, 0x2f, 0x20, 0x46, 0x93, 0xf8, 0x66, 0xcd, 0x9f, 0x2e,</div><div class='add'>+	0x35, 0x3f, 0x8d, 0x27, 0xb7, 0x5d, 0x54, 0x0b, 0xee, 0x80, 0x87, 0x3b,</div><div class='add'>+	0x8c, 0x6b, 0x1d, 0xf9, 0x8d, 0xe7, 0xff, 0x7b, 0xbe, 0xe9, 0x30, 0xb6,</div><div class='add'>+	0x8e, 0xf5, 0x03, 0x5a, 0x80, 0xee, 0xd0, 0x7e, 0xc0, 0xb6, 0xec, 0x53,</div><div class='add'>+	0xd9, 0x9a, 0xa5, 0xed, 0xa7, 0x63, 0xb6, 0x68, 0x3f, 0x60, 0x3b, 0xd6,</div><div class='add'>+	0xc5, 0x73, 0xa4, 0xdc, 0xe4, 0xf3, 0x38, 0x60, 0x5d, 0xc0, 0xaf, 0x8d,</div><div class='add'>+	0x36, 0xae, 0x19, 0xd8, 0x9f, 0xcf, 0x66, 0x5e, 0x27, 0xd7, 0x13, 0x7c,</div><div class='add'>+	0x7e, 0x8f, 0x9d, 0xd3, 0xc7, 0xda, 0xb8, 0x00, 0xbe, 0x7f, 0x4b, 0xfd,</div><div class='add'>+	0x4f, 0x6d, 0xbc, 0x06, 0x2d, 0x5c, 0x51, 0x0b, 0x6d, 0x6c, 0xe3, 0x79,</div><div class='add'>+	0x01, 0xdf, 0xaf, 0x8d, 0x69, 0xa3, 0xf2, 0x7b, 0xfa, 0xf9, 0x9c, 0xf4,</div><div class='add'>+	0x9b, 0xe2, 0x6c, 0xe5, 0xf9, 0x94, 0x1d, 0x8a, 0xb5, 0x52, 0x07, 0x6b,</div><div class='add'>+	0xc7, 0x3a, 0x98, 0x44, 0xae, 0x18, 0xe1, 0xb8, 0x12, 0xba, 0xb6, 0x99,</div><div class='add'>+	0x12, 0x6b, 0x62, 0xf8, 0xfc, 0xfa, 0x7f, 0xe9, 0x82, 0xc0, 0x23, 0x31,</div><div class='add'>+	0x37, 0x6a, 0x0c, 0x3e, 0x0f, 0xf2, 0xfc, 0x8a, 0x8b, 0xfe, 0xaa, 0xd6,</div><div class='add'>+	0x10, 0xd8, 0xf3, 0x59, 0xcb, 0x78, 0xa0, 0xbe, 0x73, 0xe6, 0xa1, 0x05,</div><div class='add'>+	0xce, 0x01, 0x8f, 0xf3, 0x3d, 0x27, 0x40, 0x5b, 0x1b, 0xf1, 0x67, 0x4c,</div><div class='add'>+	0x36, 0xa4, 0xf5, 0x7d, 0x83, 0xfd, 0xa0, 0xb3, 0x93, 0x6a, 0x2c, 0x1d,</div><div class='add'>+	0x9a, 0x7a, 0x82, 0x13, 0xf3, 0x28, 0x1a, 0xc2, 0xa9, 0x23, 0x70, 0xfa,</div><div class='add'>+	0xf0, 0x18, 0xa7, 0xa8, 0xc4, 0x29, 0x12, 0x38, 0xfd, 0xb1, 0xc4, 0xe9,</div><div class='add'>+	0x0f, 0x4f, 0xc1, 0xe9, 0xc3, 0x67, 0xc0, 0xc9, 0xa0, 0x3d, 0xa7, 0x89,</div><div class='add'>+	0x73, 0x56, 0x17, 0x35, 0xe9, 0xa1, 0x7b, 0x52, 0x4d, 0x75, 0x52, 0xdc,</div><div class='add'>+	0x6d, 0x73, 0x8f, 0x86, 0xeb, 0x0e, 0xdb, 0x7a, 0x80, 0xf5, 0xa5, 0xc0,</div><div class='add'>+	0xee, 0xfa, 0x58, 0xed, 0x91, 0xc0, 0xbe, 0x5d, 0xe2, 0x74, 0x1d, 0x38,</div><div class='add'>+	0xb5, 0x4b, 0x9c, 0xb6, 0x87, 0x70, 0xda, 0x1e, 0xc1, 0x89, 0xf3, 0x49,</div><div class='add'>+	0xcb, 0xd8, 0xee, 0x55, 0x18, 0x55, 0xf8, 0xe8, 0x74, 0xdb, 0x9c, 0xc6,</div><div class='add'>+	0xfe, 0xcf, 0x51, 0xfa, 0x63, 0x95, 0xeb, 0x5a, 0x60, 0xf7, 0xaa, 0x2a,</div><div class='add'>+	0x8b, 0xf3, 0x80, 0xdf, 0x9f, 0xd4, 0x27, 0x98, 0xcb, 0x0f, 0x5c, 0x8e,</div><div class='add'>+	0x23, 0xea, 0x57, 0xa7, 0xca, 0x43, 0xcf, 0xab, 0xa8, 0xad, 0xf0, 0xcd,</div><div class='add'>+	0x36, 0xaa, 0xd4, 0x86, 0xde, 0x15, 0xd4, 0xe5, 0xe1, 0x71, 0x5d, 0x5e,</div><div class='add'>+	0xc4, 0xe0, 0x7a, 0x59, 0x97, 0xef, 0x39, 0x5c, 0x97, 0x2f, 0x6a, 0x34,</div><div class='add'>+	0xb9, 0x51, 0x62, 0xc9, 0x9c, 0x9e, 0x42, 0xdf, 0x25, 0x81, 0x79, 0x8a,</div><div class='add'>+	0xfc, 0xbd, 0x89, 0xfd, 0x47, 0x82, 0x9b, 0xa8, 0xb1, 0x4a, 0xde, 0xa2,</div><div class='add'>+	0x86, 0xa5, 0x30, 0x2b, 0x62, 0xf5, 0xc5, 0xd6, 0x5d, 0x9f, 0x20, 0x4f,</div><div class='add'>+	0x1b, 0x1d, 0x15, 0x75, 0xfd, 0xfd, 0x8c, 0xf3, 0x33, 0x5d, 0x4e, 0x7a,</div><div class='add'>+	0x14, 0x9f, 0xf1, 0xae, 0xe5, 0xc0, 0xdc, 0x7f, 0xeb, 0x3c, 0x9f, 0x33,</div><div class='add'>+	0xf5, 0xd5, 0xa0, 0x85, 0xf6, 0x81, 0x41, 0xa8, 0x7d, 0x70, 0x4f, 0xa1,</div><div class='add'>+	0x38, 0x38, 0x2f, 0xa1, 0xc6, 0xc1, 0x37, 0x7c, 0x92, 0x6c, 0xb6, 0x23,</div><div class='add'>+	0x7b, 0x4d, 0x70, 0x21, 0x26, 0x1f, 0xeb, 0xf4, 0x33, 0x71, 0x57, 0xe9,</div><div class='add'>+	0x28, 0x9e, 0x81, 0xda, 0x92, 0x0c, 0x9c, 0xf3, 0x88, 0x89, 0x65, 0xa4,</div><div class='add'>+	0x03, 0xd4, 0x41, 0x38, 0xfb, 0x83, 0x55, 0xc4, 0xe5, 0x2c, 0x70, 0xcb,</div><div class='add'>+	0x54, 0xf8, 0xbe, 0xa9, 0x17, 0xf7, 0x1c, 0x54, 0x35, 0x22, 0x5e, 0x8f,</div><div class='add'>+	0x4a, 0x7e, 0x88, 0x3a, 0x4b, 0x6a, 0xf7, 0xc9, 0x8a, 0x5c, 0xf0, 0x1c,</div><div class='add'>+	0xe7, 0x48, 0x37, 0xe3, 0xda, 0xf9, 0xac, 0x21, 0xdf, 0xe0, 0x5c, 0x7e,</div><div class='add'>+	0x88, 0x18, 0xe2, 0xfd, 0x80, 0xcf, 0x16, 0x85, 0xeb, 0x6f, 0xdc, 0x67,</div><div class='add'>+	0x96, 0x90, 0x6b, 0x68, 0x0a, 0x79, 0x0f, 0x79, 0x77, 0x96, 0x71, 0xf2,</div><div class='add'>+	0x23, 0xc6, 0x4b, 0x9c, 0x1b, 0xe7, 0xe4, 0x62, 0x9e, 0x5f, 0x6b, 0x05,</div><div class='add'>+	0x7f, 0x71, 0x87, 0x41, 0xfc, 0x36, 0xfb, 0x2e, 0xe7, 0xdb, 0x2f, 0x2b,</div><div class='add'>+	0x74, 0x44, 0x82, 0x8f, 0xe6, 0xcb, 0xc8, 0xc3, 0xe7, 0xe0, 0xe3, 0x0b,</div><div class='add'>+	0x2d, 0x16, 0xf5, 0x56, 0xe5, 0xf3, 0xc9, 0xd8, 0x18, 0x1f, 0x29, 0xa3,</div><div class='add'>+	0xdf, 0x3e, 0xf8, 0xbc, 0x52, 0xce, 0x57, 0xf1, 0xe3, 0x57, 0xe0, 0xc7,</div><div class='add'>+	0x61, 0xd9, 0xcf, 0x77, 0x16, 0x1d, 0x36, 0xbc, 0x3e, 0xe6, 0x11, 0xdb,</div><div class='add'>+	0x9b, 0xda, 0xe8, 0x18, 0x5f, 0x1a, 0xf3, 0xff, 0xfd, 0x90, 0xff, 0x34,</div><div class='add'>+	0xef, 0xc9, 0x8c, 0x0a, 0x0e, 0xe2, 0xef, 0x3d, 0x7d, 0xd4, 0xf7, 0x17,</div><div class='add'>+	0x6a, 0xf1, 0x7d, 0xb6, 0xe0, 0x9e, 0x83, 0x67, 0x76, 0x38, 0xb4, 0x36,</div><div class='add'>+	0x75, 0x6c, 0xec, 0x87, 0x18, 0x7b, 0x15, 0x79, 0x84, 0x7c, 0x05, 0x77,</div><div class='add'>+	0xa6, 0x90, 0xf0, 0x9e, 0x5d, 0xa9, 0xe2, 0x03, 0x4e, 0xd0, 0xe5, 0xb4,</div><div class='add'>+	0xe4, 0x82, 0x5c, 0x70, 0x81, 0xeb, 0xb4, 0xd5, 0x4d, 0x70, 0x21, 0x05,</div><div class='add'>+	0x17, 0xe0, 0xd7, 0xd1, 0xbc, 0x59, 0xe0, 0xcc, 0x39, 0x07, 0xdf, 0x19,</div><div class='add'>+	0xf3, 0x82, 0x79, 0xc0, 0x9c, 0x78, 0xc2, 0x85, 0x2b, 0x3d, 0xc3, 0xd8,</div><div class='add'>+	0xfd, 0x2f, 0x3c, 0x78, 0x57, 0xf0, 0x80, 0xf9, 0x58, 0xe4, 0x85, 0x2e,</div><div class='add'>+	0x70, 0x48, 0xca, 0xbc, 0x50, 0xe8, 0x9c, 0xeb, 0x1b, 0xd6, 0x78, 0xa1,</div><div class='add'>+	0x8d, 0x2d, 0x68, 0xa3, 0xad, 0x70, 0xbd, 0xc3, 0xba, 0x60, 0x3f, 0xd6,</div><div class='add'>+	0xc6, 0x49, 0x7e, 0x85, 0x46, 0xd2, 0xbe, 0x6d, 0x55, 0xf9, 0x21, 0x85,</div><div class='add'>+	0x2e, 0xba, 0xa5, 0x46, 0xd2, 0x52, 0x23, 0xb0, 0x89, 0x95, 0x16, 0xe7,</div><div class='add'>+	0x7a, 0xdb, 0x0a, 0x91, 0x17, 0xba, 0x62, 0xcc, 0x98, 0x8a, 0x3b, 0x09,</div><div class='add'>+	0xeb, 0x96, 0xf3, 0xe9, 0x50, 0x1e, 0x2d, 0xef, 0xa5, 0x1d, 0x71, 0x2f,</div><div class='add'>+	0xfd, 0x8a, 0x3e, 0x9a, 0x47, 0x67, 0x90, 0x43, 0xf8, 0x5e, 0x3a, 0xa7,</div><div class='add'>+	0xf3, 0xbd, 0x14, 0xba, 0xd3, 0x87, 0xef, 0xa5, 0xc9, 0xc8, 0xbd, 0xb4,</div><div class='add'>+	0xf2, 0xe5, 0xf6, 0x93, 0xf2, 0x69, 0x15, 0x13, 0xce, 0xa9, 0x02, 0xf3,</div><div class='add'>+	0x13, 0x6a, 0xbf, 0xca, 0x86, 0xf3, 0x0d, 0x6b, 0xb9, 0xcc, 0x51, 0xa8,</div><div class='add'>+	0xb5, 0xee, 0x67, 0x15, 0xe7, 0xdf, 0xc0, 0x3c, 0xf8, 0xee, 0x9f, 0xc4,</div><div class='add'>+	0x79, 0xa3, 0xe4, 0xfc, 0x54, 0xe1, 0xd3, 0x1f, 0xe6, 0xfd, 0x1b, 0xfa,</div><div class='add'>+	0x28, 0xef, 0xab, 0x71, 0x2a, 0xde, 0x17, 0x63, 0x3e, 0x54, 0x9a, 0x38,</div><div class='add'>+	0xdb, 0x96, 0x91, 0x6b, 0x66, 0xf8, 0xbe, 0x85, 0x5c, 0xe0, 0xd5, 0x71,</div><div class='add'>+	0xef, 0x98, 0xe1, 0xb1, 0xd3, 0x0c, 0xe7, 0x4d, 0x03, 0xbc, 0x17, 0x9c,</div><div class='add'>+	0x3d, 0x12, 0xf7, 0x01, 0xac, 0x7b, 0x86, 0xab, 0xab, 0x51, 0x2e, 0xbe,</div><div class='add'>+	0x88, 0x0b, 0x45, 0xb5, 0x97, 0xaa, 0xcd, 0x19, 0x6a, 0x5b, 0x2e, 0xb1,</div><div class='add'>+	0x2e, 0x62, 0xfd, 0xa0, 0xb8, 0x8f, 0xd3, 0x2e, 0x6a, 0xb1, 0x43, 0xd4,</div><div class='add'>+	0x39, 0x77, 0x70, 0x9f, 0x4b, 0x06, 0x8f, 0xf2, 0x07, 0x0d, 0x95, 0xba,</div><div class='add'>+	0xc7, 0x3e, 0x5d, 0xac, 0xd7, 0x36, 0x6f, 0xe3, 0xed, 0xdd, 0x41, 0x15,</div><div class='add'>+	0x53, 0xee, 0xe7, 0xb6, 0x7f, 0xe0, 0xbc, 0x45, 0x1d, 0x37, 0x32, 0x67,</div><div class='add'>+	0xf5, 0xce, 0x7f, 0xff, 0x06, 0x63, 0xe1, 0x4b, 0x7b, 0x30, 0x12, 0x00,</div><div class='add'>+	0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static u32 bnx2_TPAT_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x0 };</div><div class='hunk'>@@ -2554,939 +1543,422 @@ static const u32 bnx2_TXP_b06FwBssAddr = 0x080057a0;</div><div class='ctx'> static const int bnx2_TXP_b06FwBssLen = 0x1c4;</div><div class='ctx'> static const u32 bnx2_TXP_b06FwSbssAddr = 0x08005760;</div><div class='ctx'> static const int bnx2_TXP_b06FwSbssLen = 0x38;</div><div class='del'>-static u32 bnx2_TXP_b06FwText[(0x5748/4) + 1] = {</div><div class='del'>-	0x0a000d2c, 0x00000000, 0x00000000, 0x0000000d, 0x74787020, 0x322e352e,</div><div class='del'>-	0x38000000, 0x02050800, 0x0000000a, 0x000003e8, 0x0000ea60, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800,</div><div class='del'>-	0x24425760, 0x3c030800, 0x24635964, 0xac400000, 0x0043202b, 0x1480fffd,</div><div class='del'>-	0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800, 0x261034b0,</div><div class='del'>-	0x3c1c0800, 0x279c5760, 0x0e000f5b, 0x00000000, 0x0000000d, 0x8f840014,</div><div class='del'>-	0x27bdffe8, 0xafb10014, 0xafb00010, 0x8f460104, 0x8f830008, 0x8c8500ac,</div><div class='del'>-	0xaf430080, 0x948200a8, 0xa7420e10, 0x948300aa, 0xa7430e12, 0x8c8200ac,</div><div class='del'>-	0xaf420e18, 0x97430e10, 0xa7430e14, 0x97420e12, 0x00008021, 0xa7420e16,</div><div class='del'>-	0x8f430e18, 0x00006021, 0x00c53023, 0xaf430e1c, 0x10c001a2, 0x2d820001,</div><div class='del'>-	0x3c0e1000, 0x2419fff8, 0x24110010, 0x240f0f00, 0x3c188100, 0x93620008,</div><div class='del'>-	0x10400009, 0x00000000, 0x97620010, 0x00c2102b, 0x14400005, 0x00000000,</div><div class='del'>-	0x97620010, 0x3042ffff, 0x0a000d6d, 0xaf420e00, 0xaf460e00, 0x8f420000,</div><div class='del'>-	0x30420008, 0x1040fffd, 0x00000000, 0x97420e08, 0x8f450e04, 0x3044ffff,</div><div class='del'>-	0x30820001, 0x14400005, 0x00000000, 0x14a00005, 0x3083a040, 0x0a000f34,</div><div class='del'>-	0x00000000, 0x0000000d, 0x3083a040, 0x24020040, 0x1462004f, 0x3082a000,</div><div class='del'>-	0x308a0036, 0x8f88000c, 0x30890008, 0x24020800, 0xaf420178, 0x01001821,</div><div class='del'>-	0x9742008a, 0x00431023, 0x2442ffff, 0x30421fff, 0x2c420008, 0x1440fffa,</div><div class='del'>-	0x00a06021, 0x8f820018, 0x00cc3023, 0x24070001, 0x8f830008, 0x304b00ff,</div><div class='del'>-	0x24420001, 0xaf820018, 0x25024000, 0x106f0005, 0x03422021, 0x93820012,</div><div class='del'>-	0x30420007, 0x00021240, 0x34470001, 0x000b1400, 0x3c030100, 0x00431025,</div><div class='del'>-	0xac820000, 0x8f830018, 0x00ea3825, 0x1120000f, 0xac830004, 0x97430e0a,</div><div class='del'>-	0x8f84000c, 0x00ee3825, 0x2402000e, 0x00781825, 0xaf430160, 0x25830006,</div><div class='del'>-	0x24840008, 0x30841fff, 0xa742015a, 0xa7430158, 0xaf84000c, 0x0a000db7,</div><div class='del'>-	0x00000000, 0x8f83000c, 0x25820002, 0xa7420158, 0x24630008, 0x30631fff,</div><div class='del'>-	0xaf83000c, 0x54c0000f, 0x8f420e14, 0x8f820008, 0x504f0002, 0x24100001,</div><div class='del'>-	0x34e70040, 0x97420e10, 0x97430e12, 0x8f850014, 0x00021400, 0x00621825,</div><div class='del'>-	0xaca300a8, 0x8f840014, 0x8f420e18, 0xac8200ac, 0x8f420e14, 0x8f430e1c,</div><div class='del'>-	0xaf420144, 0xaf430148, 0xa34b0152, 0xaf470154, 0x0a000efb, 0xaf4e0178,</div><div class='del'>-	0x10400165, 0x00000000, 0x93620008, 0x50400008, 0xafa60008, 0x97620010,</div><div class='del'>-	0x00a2102b, 0x10400003, 0x30820040, 0x1040015c, 0x00000000, 0xafa60008,</div><div class='del'>-	0xa7840010, 0xaf850004, 0x93620008, 0x1440005f, 0x27ac0008, 0xaf60000c,</div><div class='del'>-	0x97820010, 0x30424000, 0x10400002, 0x2403000e, 0x24030016, 0xa363000a,</div><div class='del'>-	0x24034007, 0xaf630014, 0x93820012, 0x8f630014, 0x30420007, 0x00021240,</div><div class='del'>-	0x00621825, 0xaf630014, 0x97820010, 0x8f630014, 0x30420010, 0x00621825,</div><div class='del'>-	0xaf630014, 0x97820010, 0x30420008, 0x5040000e, 0x00002821, 0x8f620014,</div><div class='del'>-	0x004e1025, 0xaf620014, 0x97430e0a, 0x2402000e, 0x00781825, 0xaf630004,</div><div class='del'>-	0xa3620002, 0x9363000a, 0x3405fffc, 0x24630004, 0x0a000e06, 0xa363000a,</div><div class='del'>-	0xaf600004, 0xa3600002, 0x97820010, 0x9363000a, 0x30421f00, 0x00021182,</div><div class='del'>-	0x24420028, 0x00621821, 0xa3630009, 0x97420e0c, 0xa7620010, 0x93630009,</div><div class='del'>-	0x24020008, 0x24630002, 0x30630007, 0x00431023, 0x30420007, 0xa362000b,</div><div class='del'>-	0x93640009, 0x97620010, 0x8f890004, 0x97830010, 0x00441021, 0x00a21021,</div><div class='del'>-	0x30630040, 0x10600007, 0x3045ffff, 0x00a9102b, 0x14400005, 0x0125102b,</div><div class='del'>-	0x3c068000, 0x0a000e3a, 0x00005821, 0x0125102b, 0x544000c7, 0x00006021,</div><div class='del'>-	0x97420e14, 0xa7420e10, 0x97430e16, 0xa7430e12, 0x8f420e1c, 0xaf420e18,</div><div class='del'>-	0xaf450e00, 0x8f420000, 0x30420008, 0x1040fffd, 0x00000000, 0x97420e08,</div><div class='del'>-	0x00a04821, 0xa7820010, 0x8f430e04, 0x00003021, 0x240b0001, 0xaf830004,</div><div class='del'>-	0x97620010, 0x0a000e4c, 0x304dffff, 0x8f890004, 0x97820010, 0x30420040,</div><div class='del'>-	0x10400004, 0x01206821, 0x3c068000, 0x0a000e4c, 0x00005821, 0x97630010,</div><div class='del'>-	0x8f820004, 0x10430003, 0x00003021, 0x0a000eee, 0x00006021, 0x240b0001,</div><div class='del'>-	0x8d820000, 0x00491023, 0x1440000d, 0xad820000, 0x8f620014, 0x34420040,</div><div class='del'>-	0xaf620014, 0x97430e10, 0x97420e12, 0x8f840014, 0x00031c00, 0x00431025,</div><div class='del'>-	0xac8200a8, 0x8f830014, 0x8f420e18, 0xac6200ac, 0x93620008, 0x1440003e,</div><div class='del'>-	0x00000000, 0x25260002, 0x8f84000c, 0x9743008a, 0x3063ffff, 0xafa30000,</div><div class='del'>-	0x8fa20000, 0x00441023, 0x2442ffff, 0x30421fff, 0x2c420010, 0x1440fff7,</div><div class='del'>-	0x00000000, 0x8f82000c, 0x8f830018, 0x00021082, 0x00021080, 0x24424000,</div><div class='del'>-	0x03422821, 0x00605021, 0x24630001, 0x314200ff, 0x00021400, 0xaf830018,</div><div class='del'>-	0x3c033200, 0x00431025, 0xaca20000, 0x93630009, 0x9362000a, 0x00031c00,</div><div class='del'>-	0x00431025, 0xaca20004, 0x8f830018, 0xaca30008, 0x97820010, 0x30420008,</div><div class='del'>-	0x10400002, 0x00c04021, 0x25280006, 0x97430e14, 0x93640002, 0x8f450e1c,</div><div class='del'>-	0x8f660004, 0x8f670014, 0x3063ffff, 0xa7430144, 0x97420e16, 0xa7420146,</div><div class='del'>-	0xaf450148, 0xa34a0152, 0x8f82000c, 0x308400ff, 0xa744015a, 0xaf460160,</div><div class='del'>-	0xa7480158, 0xaf470154, 0xaf4e0178, 0x00511021, 0x30421fff, 0xaf82000c,</div><div class='del'>-	0x0a000ed9, 0x8d820000, 0x93620009, 0x9363000b, 0x8f85000c, 0x2463000a,</div><div class='del'>-	0x00435021, 0x25440007, 0x00992024, 0x9743008a, 0x3063ffff, 0xafa30000,</div><div class='del'>-	0x8fa20000, 0x00451023, 0x2442ffff, 0x30421fff, 0x0044102b, 0x1440fff7,</div><div class='del'>-	0x00000000, 0x8f82000c, 0x8f840018, 0x00021082, 0x00021080, 0x24424000,</div><div class='del'>-	0x03422821, 0x00804021, 0x24840001, 0xaf840018, 0x93630009, 0x310200ff,</div><div class='del'>-	0x00022400, 0x3c024100, 0x24630002, 0x00621825, 0x00832025, 0xaca40000,</div><div class='del'>-	0x8f62000c, 0x00461025, 0xaca20004, 0x97430e14, 0x93640002, 0x8f450e1c,</div><div class='del'>-	0x8f660004, 0x8f670014, 0x3063ffff, 0xa7430144, 0x97420e16, 0x308400ff,</div><div class='del'>-	0xa7420146, 0xaf450148, 0xa3480152, 0x8f83000c, 0x25420007, 0x00591024,</div><div class='del'>-	0xa744015a, 0xaf460160, 0xa7490158, 0xaf470154, 0xaf4e0178, 0x00621821,</div><div class='del'>-	0x30631fff, 0xaf83000c, 0x8d820000, 0x14400005, 0x00000000, 0x8f620014,</div><div class='del'>-	0x2403ffbf, 0x00431024, 0xaf620014, 0x8f62000c, 0x004d1021, 0xaf62000c,</div><div class='del'>-	0x93630008, 0x14600008, 0x00000000, 0x11600006, 0x00000000, 0x8f630014,</div><div class='del'>-	0x3c02efff, 0x3442fffe, 0x00621824, 0xaf630014, 0xa36b0008, 0x01206021,</div><div class='del'>-	0x1580000c, 0x8fa60008, 0x97420e14, 0x97430e16, 0x8f850014, 0x00021400,</div><div class='del'>-	0x00621825, 0xaca300a8, 0x8f840014, 0x8f420e1c, 0xac8200ac, 0x0a000efd,</div><div class='del'>-	0x2d820001, 0x14c0fe65, 0x2d820001, 0x00501025, 0x10400058, 0x24020f00,</div><div class='del'>-	0x8f830008, 0x14620023, 0x3c048000, 0x11800009, 0x3c038000, 0x97420e08,</div><div class='del'>-	0x30420040, 0x14400005, 0x00000000, 0x0000000d, 0x00000000, 0x2400032c,</div><div class='del'>-	0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x00000000, 0x97420e10,</div><div class='del'>-	0x3c030500, 0x00431025, 0xaf42014c, 0x97430e14, 0xa7430144, 0x97420e16,</div><div class='del'>-	0xa7420146, 0x8f430e1c, 0x24022000, 0xaf430148, 0x3c031000, 0xa3400152,</div><div class='del'>-	0xa740015a, 0xaf400160, 0xa7400158, 0xaf420154, 0xaf430178, 0x8f830008,</div><div class='del'>-	0x3c048000, 0x8f420178, 0x00441024, 0x1440fffd, 0x24020f00, 0x10620016,</div><div class='del'>-	0x00000000, 0x97420e14, 0xa7420144, 0x97430e16, 0xa7430146, 0x8f420e1c,</div><div class='del'>-	0x3c031000, 0xaf420148, 0x0a000f51, 0x24020240, 0x97420e14, 0x97430e16,</div><div class='del'>-	0x8f840014, 0x00021400, 0x00621825, 0xac8300a8, 0x8f850014, 0x8f420e1c,</div><div class='del'>-	0x00006021, 0xaca200ac, 0x0a000efd, 0x2d820001, 0xaf40014c, 0x11800007,</div><div class='del'>-	0x00000000, 0x97420e10, 0xa7420144, 0x97430e12, 0xa7430146, 0x0a000f4e,</div><div class='del'>-	0x8f420e18, 0x97420e14, 0xa7420144, 0x97430e16, 0xa7430146, 0x8f420e1c,</div><div class='del'>-	0xaf420148, 0x24020040, 0x3c031000, 0xa3400152, 0xa740015a, 0xaf400160,</div><div class='del'>-	0xa7400158, 0xaf420154, 0xaf430178, 0x8fb10014, 0x8fb00010, 0x03e00008,</div><div class='del'>-	0x27bd0018, 0x27bdffd0, 0x3c1a8000, 0x3c0420ff, 0x3484fffd, 0x3c020008,</div><div class='del'>-	0x03421821, 0xafbf002c, 0xafb60028, 0xafb50024, 0xafb40020, 0xafb3001c,</div><div class='del'>-	0xafb20018, 0xafb10014, 0xafb00010, 0xaf830014, 0xaf440e00, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3c0200ff, 0x3442fffd,</div><div class='del'>-	0x3c046004, 0xaf420e00, 0x8c835000, 0x24160800, 0x24150d00, 0x3c140800,</div><div class='del'>-	0x24130f00, 0x3c120800, 0x3c114000, 0x2402ff7f, 0x00621824, 0x3463380c,</div><div class='del'>-	0x24020009, 0xac835000, 0xaf420008, 0xaf800018, 0xaf80000c, 0x0e001559,</div><div class='del'>-	0x00000000, 0x0e000ff0, 0x00000000, 0x3c020800, 0x245057c0, 0x8f420000,</div><div class='del'>-	0x30420001, 0x1040fffd, 0x00000000, 0x8f440100, 0xaf840008, 0xaf440020,</div><div class='del'>-	0xaf560178, 0x93430108, 0xa3830012, 0x93820012, 0x30420001, 0x10400008,</div><div class='del'>-	0x00000000, 0x93820012, 0x30420006, 0x00021100, 0x0e000d43, 0x0050d821,</div><div class='del'>-	0x0a000fac, 0x00000000, 0x14950005, 0x00000000, 0x0e000d43, 0x269b5840,</div><div class='del'>-	0x0a000fac, 0x00000000, 0x14930005, 0x00000000, 0x0e000d43, 0x265b5860,</div><div class='del'>-	0x0a000fac, 0x00000000, 0x0e0010ea, 0x00000000, 0xaf510138, 0x0a000f89,</div><div class='del'>-	0x00000000, 0x27bdfff8, 0x3084ffff, 0x24820007, 0x3044fff8, 0x8f85000c,</div><div class='del'>-	0x9743008a, 0x3063ffff, 0xafa30000, 0x8fa20000, 0x00451023, 0x2442ffff,</div><div class='del'>-	0x30421fff, 0x0044102b, 0x1440fff7, 0x00000000, 0x8f82000c, 0x00021082,</div><div class='del'>-	0x00021080, 0x24424000, 0x03421021, 0x03e00008, 0x27bd0008, 0x3084ffff,</div><div class='del'>-	0x8f82000c, 0x24840007, 0x3084fff8, 0x00441021, 0x30421fff, 0xaf82000c,</div><div class='del'>-	0x03e00008, 0x00000000, 0x27bdffe8, 0x3c1a8000, 0x3c0420ff, 0x3484fffd,</div><div class='del'>-	0x3c020008, 0x03421821, 0xafbf0010, 0xaf830014, 0xaf440e00, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3c0200ff, 0x3442fffd,</div><div class='del'>-	0x3c046004, 0xaf420e00, 0x8c825000, 0x2403ff7f, 0x00431024, 0x3442380c,</div><div class='del'>-	0x24030009, 0xac825000, 0xaf430008, 0xaf800018, 0xaf80000c, 0x0e001559,</div><div class='del'>-	0x00000000, 0x0e000ff0, 0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018,</div><div class='del'>-	0x27bdffe8, 0x3c02000a, 0x03421821, 0x3c040800, 0x24845880, 0x24050019,</div><div class='del'>-	0xafbf0010, 0xaf830024, 0x0e001565, 0x00003021, 0x3c050800, 0x3c020800,</div><div class='del'>-	0x24425330, 0xaca258e8, 0x24a558e8, 0x3c020800, 0x244254f8, 0x3c030800,</div><div class='del'>-	0x2463550c, 0x3c040800, 0xaca20004, 0x3c020800, 0x24425338, 0xaca30008,</div><div class='del'>-	0xac825900, 0x24845900, 0x3c020800, 0x244253c4, 0x3c070800, 0x24e75404,</div><div class='del'>-	0x3c060800, 0x24c65520, 0x3c050800, 0x24a55438, 0x3c030800, 0xac820004,</div><div class='del'>-	0x3c020800, 0x24425528, 0xac870008, 0xac86000c, 0xac850010, 0xac625920,</div><div class='del'>-	0x24635920, 0x8fbf0010, 0x3c020800, 0x24425540, 0xac620004, 0x3c020800,</div><div class='del'>-	0xac670008, 0xac66000c, 0xac650010, 0xac400048, 0x03e00008, 0x27bd0018,</div><div class='del'>-	0x974309da, 0x00804021, 0xad030000, 0x8f4209dc, 0xad020004, 0x8f4309e0,</div><div class='del'>-	0xad030008, 0x934409d9, 0x24020001, 0x30840003, 0x1082001f, 0x30a900ff,</div><div class='del'>-	0x28820002, 0x10400005, 0x24020002, 0x10800009, 0x3c0a0800, 0x0a001078,</div><div class='del'>-	0x93420934, 0x1082000b, 0x24020003, 0x10820026, 0x3c0a0800, 0x0a001078,</div><div class='del'>-	0x93420934, 0x974209e4, 0x00021400, 0x34420800, 0xad02000c, 0x0a001077,</div><div class='del'>-	0x25080010, 0x974209e4, 0x00021400, 0x34428100, 0xad02000c, 0x974309e8,</div><div class='del'>-	0x3c0a0800, 0x00031c00, 0x34630800, 0xad030010, 0x0a001077, 0x25080014,</div><div class='del'>-	0x974409e4, 0x3c050800, 0x24a25880, 0x9443001c, 0x94460014, 0x94470010,</div><div class='del'>-	0x00a05021, 0x24020800, 0xad000010, 0xad020014, 0x00042400, 0x00661821,</div><div class='del'>-	0x00671823, 0x2463fff2, 0x00832025, 0xad04000c, 0x0a001077, 0x25080018,</div><div class='del'>-	0x974209e4, 0x3c050800, 0x00021400, 0x34428100, 0xad02000c, 0x974409e8,</div><div class='del'>-	0x24a25880, 0x9443001c, 0x94460014, 0x94470010, 0x00a05021, 0x24020800,</div><div class='del'>-	0xad000014, 0xad020018, 0x00042400, 0x00661821, 0x00671823, 0x2463ffee,</div><div class='del'>-	0x00832025, 0xad040010, 0x2508001c, 0x93420934, 0x93450921, 0x3c074000,</div><div class='del'>-	0x25445880, 0x94830018, 0x94860014, 0x00021082, 0x00021600, 0x00052c00,</div><div class='del'>-	0x00a72825, 0x00451025, 0x00661821, 0x00431025, 0xad020000, 0x9783002c,</div><div class='del'>-	0x974209ea, 0x00621821, 0x00031c00, 0xad030004, 0x9782002c, 0x24420001,</div><div class='del'>-	0x30427fff, 0xa782002c, 0x93430920, 0x3c020006, 0x00031e00, 0x00621825,</div><div class='del'>-	0xad030008, 0x8f42092c, 0xad02000c, 0x8f430930, 0xad030010, 0x8f440938,</div><div class='del'>-	0x25080014, 0xad040000, 0x8f820020, 0x11200004, 0xad020004, 0x8f420940,</div><div class='del'>-	0x0a0010a1, 0x2442ffff, 0x8f420940, 0xad020008, 0x8f440948, 0x8f420940,</div><div class='del'>-	0x93430936, 0x00823023, 0x00663006, 0x3402ffff, 0x0046102b, 0x54400001,</div><div class='del'>-	0x3406ffff, 0x93420937, 0x25445880, 0x90830024, 0xad000010, 0x00021700,</div><div class='del'>-	0x34630010, 0x00031c00, 0x00431025, 0x00461025, 0xad02000c, 0x8c830008,</div><div class='del'>-	0x14600031, 0x25080014, 0x3c020800, 0x8c430048, 0x1060002d, 0x00000000,</div><div class='del'>-	0x9342010b, 0xad020000, 0x8f830000, 0x8c6200b0, 0xad020004, 0x8f830000,</div><div class='del'>-	0x8c6200b4, 0xad020008, 0x8f830000, 0x8c6200c0, 0xad02000c, 0x8f830000,</div><div class='del'>-	0x8c6200c4, 0xad020010, 0x8f830000, 0x8c6200c8, 0xad020014, 0x8f830000,</div><div class='del'>-	0x8c6200cc, 0xad020018, 0x8f830000, 0x8c6200e0, 0xad02001c, 0x8f830000,</div><div class='del'>-	0x8c6200e8, 0xad020020, 0x8f830000, 0x8c6200f0, 0x3c04600e, 0xad020024,</div><div class='del'>-	0x8c8200d0, 0xad020028, 0x8c8300d4, 0xad03002c, 0x8f820028, 0x3c046012,</div><div class='del'>-	0xad020030, 0x8c8200a8, 0xad020034, 0x8c8300ac, 0x3c026000, 0xad030038,</div><div class='del'>-	0x8c434448, 0xad03003c, 0x03e00008, 0x01001021, 0x27bdffa8, 0x3c020008,</div><div class='del'>-	0x03423021, 0xafbf0054, 0xafbe0050, 0xafb7004c, 0xafb60048, 0xafb50044,</div><div class='del'>-	0xafb40040, 0xafb3003c, 0xafb20038, 0xafb10034, 0xafb00030, 0xaf860000,</div><div class='del'>-	0x24020040, 0xaf420814, 0xaf400810, 0x8f420944, 0x8f430950, 0x8f440954,</div><div class='del'>-	0x8f45095c, 0xaf820034, 0xaf830020, 0xaf84001c, 0xaf850030, 0x90c20000,</div><div class='del'>-	0x24030020, 0x304400ff, 0x10830005, 0x24020030, 0x10820022, 0x3c030800,</div><div class='del'>-	0x0a001139, 0x8c62002c, 0x24020088, 0xaf420818, 0x3c020800, 0x244258e8,</div><div class='del'>-	0xafa20020, 0x93430109, 0x3c020800, 0x10600009, 0x24575900, 0x3c026000,</div><div class='del'>-	0x24030100, 0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000,</div><div class='del'>-	0x24000376, 0x9342010a, 0x30420080, 0x14400021, 0x24020800, 0x3c026000,</div><div class='del'>-	0x24030100, 0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000,</div><div class='del'>-	0x2400037d, 0x0a001141, 0x24020800, 0x93430109, 0x3063007f, 0x00031140,</div><div class='del'>-	0x000318c0, 0x00431021, 0x24430088, 0xaf430818, 0x0000000d, 0x3c020800,</div><div class='del'>-	0x24425940, 0x3c030800, 0x24775950, 0x0a001140, 0xafa20020, 0x24420001,</div><div class='del'>-	0xac62002c, 0x0000000d, 0x00000000, 0x24000395, 0x0a0014c1, 0x8fbf0054,</div><div class='del'>-	0x24020800, 0xaf420178, 0x8f450104, 0x8f420988, 0x00a21023, 0x58400005,</div><div class='del'>-	0x8f4309a0, 0x0000000d, 0x00000000, 0x240003b1, 0x8f4309a0, 0x3c100800,</div><div class='del'>-	0xae0358b0, 0x8f4209a4, 0x8f830020, 0x260458b0, 0x2491ffd0, 0xae220034,</div><div class='del'>-	0x00a21023, 0xae230028, 0xac82ffd0, 0x8fa30020, 0x8c620000, 0x0040f809,</div><div class='del'>-	0x0200b021, 0x00409021, 0x32440010, 0x32420002, 0x10400007, 0xafa40024,</div><div class='del'>-	0x8e220020, 0x32530040, 0x2403ffbf, 0x00431024, 0x0a001493, 0xae220020,</div><div class='del'>-	0x32420020, 0x10400002, 0x3c020800, 0x24575920, 0x32420001, 0x14400007,</div><div class='del'>-	0x00000000, 0x8f820008, 0xaf420080, 0x8ec358b0, 0xaf430e10, 0x8e220034,</div><div class='del'>-	0xaf420e18, 0x9343010b, 0x93420905, 0x30420008, 0x1040003c, 0x307400ff,</div><div class='del'>-	0x8f820000, 0x8c430074, 0x0460000a, 0x00000000, 0x3c026000, 0x24030100,</div><div class='del'>-	0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x240003ed,</div><div class='del'>-	0x8f820000, 0x9044007b, 0x9343010a, 0x14830027, 0x32530040, 0x00003821,</div><div class='del'>-	0x24052000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x8ec258b0, 0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034, 0x3c030100,</div><div class='del'>-	0xaf420148, 0x24020047, 0xaf43014c, 0xa3420152, 0x8d230030, 0x3c021000,</div><div class='del'>-	0xa7470158, 0xaf450154, 0xaf420178, 0x8c860034, 0x24630001, 0xad230030,</div><div class='del'>-	0x9342010a, 0x3c030047, 0xafa50014, 0x00021600, 0x00431025, 0x00471025,</div><div class='del'>-	0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b,</div><div class='del'>-	0x3c070100, 0x3c050800, 0x24a25880, 0x0a001250, 0x8c430020, 0x32820002,</div><div class='del'>-	0x10400050, 0x00000000, 0x0e0015b9, 0x32530040, 0x3c039000, 0x34630001,</div><div class='del'>-	0x8f820008, 0x3c048000, 0x00431025, 0xaf420020, 0x8f420020, 0x00441024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x8f830000, 0x90620005, 0x34420008, 0xa0620005,</div><div class='del'>-	0x8f840000, 0x8c820074, 0x3c038000, 0x00431025, 0xac820074, 0x90830000,</div><div class='del'>-	0x24020020, 0x10620004, 0x00000000, 0x0000000d, 0x00000000, 0x2400040b,</div><div class='del'>-	0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020, 0x9084007b,</div><div class='del'>-	0x9342010a, 0x14820028, 0x3c030800, 0x00003821, 0x24052000, 0x3c090800,</div><div class='del'>-	0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec258b0, 0x26c458b0,</div><div class='del'>-	0x2484ffd0, 0xaf420144, 0x8c820034, 0x3c030100, 0xaf420148, 0x24020046,</div><div class='del'>-	0xaf43014c, 0xa3420152, 0x8d230030, 0x3c021000, 0xa7470158, 0xaf450154,</div><div class='del'>-	0xaf420178, 0x8c860034, 0x24630001, 0xad230030, 0x9342010a, 0x3c030046,</div><div class='del'>-	0xafa50014, 0x00021600, 0x00431025, 0x00471025, 0xafa20010, 0x9343010b,</div><div class='del'>-	0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b, 0x3c070100, 0x3c030800,</div><div class='del'>-	0x24625880, 0x0a001250, 0x8c430020, 0x93420108, 0x30420010, 0x50400056,</div><div class='del'>-	0x9343093f, 0x8f860000, 0x90c2007f, 0x8cc30178, 0x304800ff, 0x15030004,</div><div class='del'>-	0x00000000, 0x0000000d, 0x00000000, 0x24000425, 0x90c2007e, 0x90c40080,</div><div class='del'>-	0x00081c00, 0x00021600, 0x00431025, 0x00042200, 0x90c3007a, 0x90c5000a,</div><div class='del'>-	0x00441025, 0x11050028, 0x00623825, 0xa0c8000a, 0x00004021, 0x24056000,</div><div class='del'>-	0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec258b0,</div><div class='del'>-	0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034, 0xaf420148, 0x24020052,</div><div class='del'>-	0xaf47014c, 0xa3420152, 0x8d230030, 0x3c021000, 0xa7480158, 0xaf450154,</div><div class='del'>-	0xaf420178, 0x8c860034, 0x24630001, 0xad230030, 0x9342010a, 0x3c030052,</div><div class='del'>-	0xafa50014, 0x00021600, 0x00431025, 0x00481025, 0xafa20010, 0x9343010b,</div><div class='del'>-	0xafa30018, 0x8f440100, 0x0e00159b, 0x8f450104, 0x0a00124a, 0x00000000,</div><div class='del'>-	0x3c026000, 0x24030100, 0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d,</div><div class='del'>-	0x00000000, 0x2400043e, 0x16800009, 0x3c050800, 0x3c040800, 0x24825880,</div><div class='del'>-	0x8c430020, 0x32530040, 0x2404ffbf, 0x00641824, 0x0a001493, 0xac430020,</div><div class='del'>-	0x8ca25880, 0x10400005, 0x3c030800, 0x8c620034, 0xaca05880, 0x24420001,</div><div class='del'>-	0xac620034, 0x9343093f, 0x24020012, 0x5462000e, 0x97420908, 0x32820038,</div><div class='del'>-	0x14400009, 0x3c030800, 0x8f830000, 0x8c62004c, 0xac62005c, 0x3c020800,</div><div class='del'>-	0x24445880, 0x8c820020, 0x0a001285, 0x32530040, 0xac605880, 0x97420908,</div><div class='del'>-	0x5440001c, 0x97420908, 0x3c039000, 0x34630001, 0x8f820008, 0x32530040,</div><div class='del'>-	0x3c048000, 0x00431025, 0xaf420020, 0x8f420020, 0x00441024, 0x1440fffd,</div><div class='del'>-	0x3c028000, 0x8f840000, 0x8f850008, 0x8c830050, 0x34420001, 0x00a22825,</div><div class='del'>-	0xaf830020, 0xac830070, 0xac83005c, 0xaf450020, 0x3c050800, 0x24a45880,</div><div class='del'>-	0x8c820020, 0x2403ffbf, 0x00431024, 0x0a001493, 0xac820020, 0x000211c0,</div><div class='del'>-	0xaf420024, 0x97420908, 0x3c030080, 0x34630003, 0x000211c0, 0xaf42080c,</div><div class='del'>-	0xaf43081c, 0x974209ec, 0x8f4309a4, 0xa782002c, 0x3c020800, 0x24445880,</div><div class='del'>-	0xac83002c, 0x93420937, 0x93430934, 0x00021080, 0x00621821, 0xa4830018,</div><div class='del'>-	0x934209d8, 0x32850038, 0xafa50028, 0x00621821, 0xa483001a, 0x934209d8,</div><div class='del'>-	0x93430934, 0x3c1e0800, 0x00809821, 0x00431021, 0x24420010, 0xa4820016,</div><div class='del'>-	0x24020006, 0xae620020, 0x8fa20028, 0x10400003, 0x0000a821, 0x0a0012f0,</div><div class='del'>-	0x24120008, 0x8f420958, 0x8f830020, 0x8f840030, 0x00431023, 0x00832023,</div><div class='del'>-	0x04800003, 0xae620004, 0x04410003, 0x0082102b, 0x0a0012bc, 0xae600004,</div><div class='del'>-	0x54400001, 0xae640004, 0x8ee20000, 0x0040f809, 0x00000000, 0x00409021,</div><div class='del'>-	0x32420001, 0x5440001e, 0x8ee20004, 0x8e630008, 0x1060002b, 0x3c02c000,</div><div class='del'>-	0x00621025, 0xaf420e00, 0x8f420000, 0x30420008, 0x1040fffd, 0x00000000,</div><div class='del'>-	0x97420e08, 0xa7820010, 0x8f430e04, 0x8e620008, 0xaf830004, 0x8f840004,</div><div class='del'>-	0x0044102b, 0x1040000b, 0x24150001, 0x24020100, 0x3c016000, 0xac22081c,</div><div class='del'>-	0x3c020001, 0x3c016000, 0xac22081c, 0x0000000d, 0x00000000, 0x240004cd,</div><div class='del'>-	0x24150001, 0x8ee20004, 0x0040f809, 0x00000000, 0x02429025, 0x32420002,</div><div class='del'>-	0x5040001d, 0x8f470940, 0x12a00006, 0x8ec258b0, 0x8f830000, 0xac6200a8,</div><div class='del'>-	0x8f840000, 0x8e620034, 0xac8200ac, 0x32420004, 0x50400013, 0x8f470940,</div><div class='del'>-	0x3c020800, 0x3283007d, 0x10600110, 0x24575920, 0x32820001, 0x50400006,</div><div class='del'>-	0x36520002, 0x8f830034, 0x8f420940, 0x10620109, 0x00000000, 0x36520002,</div><div class='del'>-	0x24020008, 0xa6600010, 0xa6620012, 0xae600008, 0xa2600024, 0x8f470940,</div><div class='del'>-	0x3c030800, 0x24685880, 0x8d02002c, 0x8d050008, 0x95040010, 0x9506000a,</div><div class='del'>-	0x95030026, 0x00451021, 0x00862021, 0x00641821, 0xaf870034, 0xad02002c,</div><div class='del'>-	0x32820030, 0x10400008, 0xa5030014, 0x91020024, 0x32910040, 0x34420004,</div><div class='del'>-	0xa1020024, 0xaf400048, 0x0a001345, 0x3c040800, 0x93420923, 0x30420002,</div><div class='del'>-	0x10400029, 0x32910040, 0x8f830000, 0x8f840020, 0x8c620084, 0x00441023,</div><div class='del'>-	0x0442000a, 0x3c039000, 0x95020014, 0x8c630084, 0x00821021, 0x00621823,</div><div class='del'>-	0x1c600004, 0x3c039000, 0x91020024, 0x34420001, 0xa1020024, 0x34630001,</div><div class='del'>-	0x8f820008, 0x32910040, 0x3c048000, 0x00431025, 0xaf420020, 0x8f420020,</div><div class='del'>-	0x00441024, 0x1440fffd, 0x00000000, 0x8f840000, 0x9083003f, 0x2402000a,</div><div class='del'>-	0x10620005, 0x2402000c, 0x9083003f, 0x24020008, 0x14620002, 0x24020014,</div><div class='del'>-	0xa082003f, 0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020,</div><div class='del'>-	0x3c040800, 0x24865880, 0x94c20010, 0x94c3001a, 0x8cc40008, 0x00432821,</div><div class='del'>-	0x14800006, 0xa4c5001c, 0x3c020800, 0x8c430048, 0x10600002, 0x24a20040,</div><div class='del'>-	0xa4c2001c, 0x27d05880, 0x9604001c, 0x96020012, 0x00822021, 0x24840002,</div><div class='del'>-	0x0e000faf, 0x3084ffff, 0x8f850018, 0x00a01821, 0xa2030025, 0x8ee60008,</div><div class='del'>-	0x00402021, 0x24a50001, 0xaf850018, 0x00c0f809, 0x00000000, 0x00402021,</div><div class='del'>-	0x0e001026, 0x02202821, 0x8ee3000c, 0x0060f809, 0x00402021, 0x9604001c,</div><div class='del'>-	0x96020012, 0x00822021, 0x24840002, 0x0e000fc5, 0x3084ffff, 0x8fc25880,</div><div class='del'>-	0x8e030008, 0x00431023, 0x14400012, 0xafc25880, 0x54600006, 0x8e020020,</div><div class='del'>-	0x3243004a, 0x24020002, 0x14620005, 0x00000000, 0x8e020020, 0x34420040,</div><div class='del'>-	0x0a001382, 0xae020020, 0x52a00006, 0x36520002, 0x8e020030, 0xaf420e10,</div><div class='del'>-	0x8e030034, 0xaf430e18, 0x36520002, 0x52a00008, 0x96670014, 0x8f830000,</div><div class='del'>-	0x8f420e10, 0xac6200a8, 0x8f840000, 0x8f420e18, 0xac8200ac, 0x96670014,</div><div class='del'>-	0x92680024, 0x24020040, 0xaf420814, 0x8f830020, 0x8f82001c, 0x00671821,</div><div class='del'>-	0x00621023, 0xaf830020, 0x18400008, 0x00000000, 0x8f820000, 0xaf83001c,</div><div class='del'>-	0xac430054, 0x54e00005, 0xaf400040, 0x0a0013a0, 0x8f42095c, 0x54e00001,</div><div class='del'>-	0xaf400044, 0x8f42095c, 0x31030008, 0xaf820030, 0x1060001a, 0x00000000,</div><div class='del'>-	0x8f840000, 0x90820120, 0x90830121, 0x304600ff, 0x00c31823, 0x30630007,</div><div class='del'>-	0x24020007, 0x1062000e, 0x00000000, 0x90820122, 0x304200fe, 0xa0820122,</div><div class='del'>-	0x8f850000, 0x00061880, 0x8f840020, 0x24a20100, 0x00431021, 0x24c30001,</div><div class='del'>-	0x30630007, 0xac440000, 0x0a0013bd, 0xa0a30120, 0x90820122, 0x34420001,</div><div class='del'>-	0xa0820122, 0x14e00003, 0x31020001, 0x10400031, 0x32510002, 0x8f820000,</div><div class='del'>-	0x8c43000c, 0x30630001, 0x1060002c, 0x32510002, 0x3c029000, 0x8f830008,</div><div class='del'>-	0x34420001, 0x3c048000, 0x00621825, 0xaf430020, 0x8f420020, 0x00441024,</div><div class='del'>-	0x1440fffd, 0x00000000, 0x8f870000, 0x8ce2000c, 0x30420001, 0x10400018,</div><div class='del'>-	0x00000000, 0x94e2006a, 0x00022880, 0x50a00001, 0x24050001, 0x94e30068,</div><div class='del'>-	0x90e40081, 0x3c020800, 0x8c460024, 0x00652821, 0x00852804, 0x00c5102b,</div><div class='del'>-	0x54400001, 0x00a03021, 0x3c020800, 0x8c440028, 0x00c4182b, 0x54600001,</div><div class='del'>-	0x00c02021, 0x8f430074, 0x2402fffe, 0x00822824, 0x00a31821, 0xace3000c,</div><div class='del'>-	0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020, 0x8f820020,</div><div class='del'>-	0x3c050800, 0x24b05880, 0xae020028, 0x8ee30010, 0x0060f809, 0x00000000,</div><div class='del'>-	0x8f820028, 0x24420001, 0xaf820028, 0x12a00005, 0xaf40004c, 0x8f420e10,</div><div class='del'>-	0xae020030, 0x8f430e18, 0xae030034, 0x1220fea7, 0x24020006, 0x8f870024,</div><div class='del'>-	0x9786002c, 0x8f830000, 0x8f820034, 0x8f840020, 0x8f85001c, 0x32530040,</div><div class='del'>-	0xa4e6002c, 0xac620044, 0x32420008, 0xac640050, 0xac650054, 0x1040007a,</div><div class='del'>-	0x32820020, 0x10400027, 0x32910010, 0x00003821, 0x24052000, 0x3c090800,</div><div class='del'>-	0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec258b0, 0x26c458b0,</div><div class='del'>-	0x2484ffd0, 0xaf420144, 0x8c820034, 0x3c030400, 0xaf420148, 0x24020041,</div><div class='del'>-	0xaf43014c, 0xa3420152, 0x8d230030, 0x3c021000, 0xa7470158, 0xaf450154,</div><div class='del'>-	0xaf420178, 0x8c860034, 0x24630001, 0xad230030, 0x9342010a, 0x3c030041,</div><div class='del'>-	0xafa50014, 0x00021600, 0x00431025, 0x00471025, 0xafa20010, 0x9343010b,</div><div class='del'>-	0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b, 0x3c070400, 0x12200028,</div><div class='del'>-	0x00003821, 0x24052000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x8ec258b0, 0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034,</div><div class='del'>-	0x3c030300, 0xaf420148, 0x2402004e, 0xaf43014c, 0xa3420152, 0x8d230030,</div><div class='del'>-	0x3c021000, 0xa7470158, 0xaf450154, 0xaf420178, 0x8c860034, 0x24630001,</div><div class='del'>-	0xad230030, 0x9342010a, 0x3c03004e, 0xafa50014, 0x00021600, 0x00431025,</div><div class='del'>-	0x00471025, 0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100, 0x8f450104,</div><div class='del'>-	0x0e00159b, 0x3c070300, 0x0a00148b, 0x8fa20024, 0x32820008, 0x10400026,</div><div class='del'>-	0x24052000, 0x00003821, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024,</div><div class='del'>-	0x1440fffd, 0x8ec258b0, 0x26c458b0, 0x2484ffd0, 0xaf420144, 0x8c820034,</div><div class='del'>-	0x3c030200, 0xaf420148, 0x2402004b, 0xaf43014c, 0xa3420152, 0x8d230030,</div><div class='del'>-	0x3c021000, 0xa7470158, 0xaf450154, 0xaf420178, 0x8c860034, 0x24630001,</div><div class='del'>-	0xad230030, 0x9342010a, 0x3c03004b, 0xafa50014, 0x00021600, 0x00431025,</div><div class='del'>-	0x00471025, 0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100, 0x8f450104,</div><div class='del'>-	0x0e00159b, 0x3c070200, 0x8fa20024, 0x14400004, 0x8fa30020, 0x32420010,</div><div class='del'>-	0x10400004, 0x00000000, 0x8c620004, 0x0040f809, 0x00000000, 0x12600006,</div><div class='del'>-	0x8fa40020, 0x8c820008, 0x0040f809, 0x00000000, 0x0a0014c1, 0x8fbf0054,</div><div class='del'>-	0x3c030800, 0x8c6258a0, 0x30420040, 0x14400023, 0x8fbf0054, 0x00002821,</div><div class='del'>-	0x24040040, 0x8f870020, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd,</div><div class='del'>-	0x8ec258b0, 0x26c358b0, 0x2463ffd0, 0xaf420144, 0x8c620034, 0xaf420148,</div><div class='del'>-	0x24020049, 0xaf47014c, 0xa3420152, 0x3c021000, 0xa7450158, 0xaf440154,</div><div class='del'>-	0xaf420178, 0x8c660034, 0x9342010a, 0x3c030049, 0xafa40014, 0x00021600,</div><div class='del'>-	0x00431025, 0x00451025, 0xafa20010, 0x9343010b, 0xafa30018, 0x8f440100,</div><div class='del'>-	0x0e00159b, 0x8f450104, 0x8fbf0054, 0x8fbe0050, 0x8fb7004c, 0x8fb60048,</div><div class='del'>-	0x8fb50044, 0x8fb40040, 0x8fb3003c, 0x8fb20038, 0x8fb10034, 0x8fb00030,</div><div class='del'>-	0x03e00008, 0x27bd0058, 0x03e00008, 0x00001021, 0x3c020800, 0x24435880,</div><div class='del'>-	0x8c650004, 0x8c445880, 0x0085182b, 0x10600002, 0x00403021, 0x00802821,</div><div class='del'>-	0x9744093c, 0x00a4102b, 0x54400001, 0x00a02021, 0x93420923, 0x0004182b,</div><div class='del'>-	0x00021042, 0x30420001, 0x00431024, 0x1040000d, 0x24c25880, 0x8f850000,</div><div class='del'>-	0x8f830020, 0x8ca20084, 0x00431023, 0x04420007, 0x24c25880, 0x8ca20084,</div><div class='del'>-	0x00641821, 0x00431023, 0x28420001, 0x00822023, 0x24c25880, 0xac440008,</div><div class='del'>-	0xa4400026, 0x03e00008, 0x00001021, 0x8f850004, 0x97840010, 0x3c030800,</div><div class='del'>-	0x24635880, 0x24020008, 0xa4620012, 0x8f820004, 0xa4600010, 0x000420c2,</div><div class='del'>-	0x30840008, 0x2c420001, 0x00021023, 0x30420006, 0xac650008, 0x03e00008,</div><div class='del'>-	0xa0640024, 0x3c020800, 0x24425880, 0x90450025, 0x9443001c, 0x3c021100,</div><div class='del'>-	0xac800004, 0x00052c00, 0x24630002, 0x00621825, 0x00a32825, 0x24820008,</div><div class='del'>-	0x03e00008, 0xac850000, 0x27bdffd8, 0x3c020800, 0x24425880, 0xafbf0020,</div><div class='del'>-	0x90480025, 0x8c440008, 0x8c460020, 0x8f870020, 0x3c030800, 0x3c058000,</div><div class='del'>-	0x8f420178, 0x00451024, 0x1440fffd, 0x8c6258b0, 0x246358b0, 0x2469ffd0,</div><div class='del'>-	0xaf420144, 0x8d220034, 0x30c32000, 0xaf420148, 0x3c021000, 0xaf47014c,</div><div class='del'>-	0xa3480152, 0xa7440158, 0xaf460154, 0xaf420178, 0x10600004, 0x3c030800,</div><div class='del'>-	0x8c620030, 0x24420001, 0xac620030, 0x9342010a, 0x00081c00, 0x3084ffff,</div><div class='del'>-	0xafa60014, 0x00021600, 0x00431025, 0x00441025, 0xafa20010, 0x9343010b,</div><div class='del'>-	0xafa30018, 0x8f440100, 0x8f450104, 0x0e00159b, 0x8d260034, 0x8fbf0020,</div><div class='del'>-	0x03e00008, 0x27bd0028, 0x0000000d, 0x00000000, 0x2400019d, 0x03e00008,</div><div class='del'>-	0x00000000, 0x0000000d, 0x00000000, 0x240001a9, 0x03e00008, 0x00000000,</div><div class='del'>-	0x03e00008, 0x00000000, 0x3c020800, 0x24425880, 0xac400008, 0xa4400026,</div><div class='del'>-	0x03e00008, 0x24020001, 0x3c020800, 0x24425880, 0x24030008, 0xac400008,</div><div class='del'>-	0xa4400010, 0xa4430012, 0xa0400024, 0x03e00008, 0x24020004, 0x03e00008,</div><div class='del'>-	0x00001021, 0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004,</div><div class='del'>-	0xac820000, 0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a00156c,</div><div class='del'>-	0x00a01021, 0xac860000, 0x00000000, 0x00000000, 0x24840004, 0x00a01021,</div><div class='del'>-	0x1440fffa, 0x24a5ffff, 0x03e00008, 0x00000000, 0x3c0a0800, 0x8d490068,</div><div class='del'>-	0x3c050800, 0x24a52098, 0x00093140, 0x00c51021, 0xac440000, 0x8f440e04,</div><div class='del'>-	0x00a61021, 0xac440004, 0x97430e08, 0x97420e0c, 0x00a62021, 0x00031c00,</div><div class='del'>-	0x00431025, 0xac820008, 0x8f430e10, 0x00801021, 0xac43000c, 0x8f440e14,</div><div class='del'>-	0xac440010, 0x8f430e18, 0x3c0800ff, 0xac430014, 0x8f470e1c, 0x3508ffff,</div><div class='del'>-	0x25290001, 0xac470018, 0x3c070800, 0x8ce3006c, 0x9344010a, 0x3c026000,</div><div class='del'>-	0x24630001, 0xace3006c, 0x8c434448, 0x3129007f, 0x00a62821, 0xad490068,</div><div class='del'>-	0x00042600, 0x00681824, 0x00832025, 0x03e00008, 0xaca4001c, 0x8fac0010,</div><div class='del'>-	0x8fad0014, 0x8fae0018, 0x3c0b0800, 0x8d6a0060, 0x3c080800, 0x25080080,</div><div class='del'>-	0x000a4940, 0x01281021, 0x01091821, 0xac440000, 0x00601021, 0xac650004,</div><div class='del'>-	0xac460008, 0xac67000c, 0xac4c0010, 0xac6d0014, 0x3c036000, 0xac4e0018,</div><div class='del'>-	0x8c654448, 0x3c040800, 0x8c820064, 0x254a0001, 0x314a00ff, 0x01094021,</div><div class='del'>-	0xad6a0060, 0x24420001, 0xac820064, 0x03e00008, 0xad05001c, 0x3c030800,</div><div class='del'>-	0x3c090800, 0x8d250070, 0x246330b0, 0x8f460100, 0x00053900, 0x00e31021,</div><div class='del'>-	0xac460000, 0x8f440104, 0x00671021, 0xac440004, 0x8f460108, 0x8f840014,</div><div class='del'>-	0x24a50001, 0xac460008, 0x8c880074, 0x3c060800, 0x8cc20074, 0x30a5003f,</div><div class='del'>-	0x00671821, 0xad250070, 0x24420001, 0xacc20074, 0x03e00008, 0xac68000c,</div><div class='del'>-	0x00000000 };</div><div class='add'>+static u8 bnx2_TXP_b06FwText[] = {</div><div class='add'>+	0x1f, 0x8b, 0x08, 0x08, 0x21, 0xd3, 0x41, 0x44, 0x00, 0x03, 0x74, 0x65,</div><div class='add'>+	0x73, 0x74, 0x31, 0x2e, 0x62, 0x69, 0x6e, 0x00, 0xed, 0x5c, 0x6d, 0x6c,</div><div class='add'>+	0x1b, 0xf7, 0x79, 0x7f, 0xee, 0x85, 0xd2, 0x51, 0x96, 0xe9, 0x93, 0xc2,</div><div class='add'>+	0x78, 0x6c, 0xc0, 0xa6, 0x77, 0xd6, 0x51, 0x66, 0x20, 0xb5, 0xa0, 0x05,</div><div class='add'>+	0x36, 0x55, 0x87, 0x43, 0x73, 0x3e, 0x52, 0x2f, 0x4e, 0x5c, 0x57, 0x71,</div><div class='add'>+	0x94, 0x86, 0x6e, 0x0d, 0x8c, 0xa0, 0xec, 0xd8, 0xeb, 0x5a, 0x2c, 0x1f,</div><div class='add'>+	0x8c, 0xd5, 0x68, 0xd1, 0x99, 0xa1, 0x68, 0xc7, 0xc9, 0x68, 0x51, 0xa9,</div><div class='add'>+	0xe5, 0xa8, 0x43, 0x57, 0x80, 0x95, 0x64, 0xcb, 0x29, 0x4e, 0x3a, 0x65,</div><div class='add'>+	0xcb, 0x16, 0x0c, 0x58, 0x16, 0xcd, 0x2f, 0x5d, 0x3f, 0x74, 0x80, 0x3f,</div><div class='add'>+	0xec, 0x43, 0x3a, 0xec, 0x83, 0x91, 0x14, 0xad, 0x11, 0x6c, 0x59, 0xb0,</div><div class='add'>+	0x2f, 0x33, 0xd6, 0x26, 0xb7, 0xdf, 0x73, 0x77, 0x94, 0x95, 0xc4, 0x4e,</div><div class='add'>+	0xab, 0x7d, 0xbe, 0x07, 0x20, 0xee, 0x7f, 0xff, 0xd7, 0xe7, 0xfd, 0xe5,</div><div class='add'>+	0x7f, 0x90, 0x06, 0xb7, 0x53, 0x17, 0x85, 0xb0, 0x1d, 0x3f, 0xed, 0x99,</div><div class='add'>+	0x93, 0x27, 0x3e, 0xf7, 0xf9, 0xcf, 0x0d, 0xa1, 0x39, 0x4c, 0x4a, 0x4c,</div><div class='add'>+	0xe4, 0xc1, 0x5b, 0x12, 0x51, 0xf9, 0x1d, 0x8a, 0x20, 0x82, 0x08, 0x22,</div><div class='add'>+	0x88, 0x20, 0x82, 0x08, 0x22, 0x88, 0x20, 0x82, 0x08, 0x22, 0x88, 0x20,</div><div class='add'>+	0x82, 0x08, 0x22, 0x88, 0x20, 0x82, 0x08, 0x22, 0x88, 0x20, 0x82, 0x08,</div><div class='add'>+	0x22, 0x88, 0x20, 0x82, 0x08, 0x22, 0x88, 0x20, 0x82, 0x08, 0x22, 0x88,</div><div class='add'>+	0x20, 0x82, 0x08, 0x22, 0x88, 0x20, 0x82, 0x08, 0x22, 0x88, 0x20, 0x82,</div><div class='add'>+	0x08, 0x22, 0x88, 0x20, 0x82, 0x08, 0x22, 0x88, 0x20, 0x82, 0x08, 0x22,</div><div class='add'>+	0xf8, 0x9d, 0x20, 0x11, 0xa9, 0xfc, 0xdc, 0x1e, 0xfe, 0x48, 0x11, 0xcd,</div><div class='add'>+	0xf2, 0x53, 0xb6, 0x41, 0x8a, 0x64, 0x1e, 0x39, 0x34, 0x65, 0x10, 0x59,</div><div class='add'>+	0xce, 0x80, 0x56, 0xa0, 0xf7, 0xbd, 0x6a, 0x52, 0x26, 0xee, 0xff, 0xb4,</div><div class='add'>+	0xf9, 0xdb, 0x53, 0xaf, 0x7f, 0x41, 0x7f, 0xaf, 0x25, 0x91, 0xa2, 0x9a,</div><div class='add'>+	0x6b, 0x79, 0xb5, 0x9f, 0x94, 0x34, 0xd6, 0xfc, 0xd5, 0xee, 0xaf, 0xef,</div><div class='add'>+	0xa0, 0x44, 0x7b, 0xaf, 0x24, 0xd5, 0x9b, 0xb7, 0xbc, 0xd7, 0x77, 0x27,</div><div class='add'>+	0xe9, 0x15, 0x57, 0xa5, 0x35, 0x57, 0x16, 0x46, 0x9b, 0x0a, 0x4d, 0x37,</div><div class='add'>+	0x1d, 0x3a, 0xdd, 0xa8, 0x52, 0xc1, 0xbd, 0x4c, 0xb5, 0x39, 0x35, 0x61,</div><div class='add'>+	0x2f, 0xff, 0x84, 0xa6, 0xe7, 0x7a, 0x13, 0x85, 0x65, 0x87, 0x6a, 0x8d,</div><div class='add'>+	0x54, 0xc2, 0x76, 0xd5, 0x44, 0x61, 0x3e, 0x89, 0xf7, 0xde, 0x84, 0x3d,</div><div class='add'>+	0xaf, 0x57, 0x89, 0x76, 0x62, 0x4e, 0x2a, 0x51, 0x68, 0xea, 0x65, 0xa2,</div><div class='add'>+	0xbe, 0xdc, 0x75, 0x4a, 0x27, 0x0a, 0xee, 0x82, 0xb0, 0xae, 0x0a, 0x54,</div><div class='add'>+	0xfb, 0x2c, 0xa9, 0x09, 0xf3, 0xb6, 0xf7, 0x29, 0x43, 0xa5, 0x1e, 0x83,</div><div class='add'>+	0x76, 0xec, 0x30, 0xe8, 0xd9, 0x94, 0xa9, 0x50, 0xe5, 0x7c, 0x9c, 0x2c,</div><div class='add'>+	0x9f, 0x26, 0x95, 0x2a, 0xf3, 0x03, 0xea, 0x15, 0x8a, 0x91, 0x95, 0x6c,</div><div class='add'>+	0xbf, 0x7b, 0x9e, 0x9d, 0xfb, 0x16, 0xff, 0x9d, 0x16, 0xce, 0xa2, 0xc4,</div><div class='add'>+	0xa8, 0x4b, 0x64, 0x03, 0x2f, 0x3b, 0xf7, 0xbe, 0x17, 0xac, 0x51, 0x70,</div><div class='add'>+	0xae, 0x9c, 0x18, 0x69, 0x7a, 0x5e, 0x31, 0x87, 0x33, 0x72, 0xed, 0xb5,</div><div class='add'>+	0x31, 0x6a, 0x25, 0xad, 0xd6, 0x74, 0x2e, 0xbf, 0x23, 0xf8, 0x1b, 0x2f,</div><div class='add'>+	0xa6, 0x91, 0xdf, 0x2d, 0x12, 0x8d, 0xaf, 0x50, 0x25, 0x49, 0xad, 0x5a,</div><div class='add'>+	0xee, 0x61, 0x7a, 0x21, 0xd7, 0x4d, 0x67, 0xb1, 0xdf, 0xf3, 0x39, 0xf0,</div><div class='add'>+	0xd1, 0x38, 0x29, 0xd8, 0xae, 0x9e, 0x22, 0xe1, 0x05, 0xb2, 0xe7, 0xfb,</div><div class='add'>+	0xd4, 0x02, 0xe1, 0x6c, 0xc3, 0xfb, 0x8c, 0x9d, 0xc3, 0x79, 0x83, 0xff,</div><div class='add'>+	0xeb, 0x59, 0x49, 0xbd, 0xdc, 0xa2, 0x14, 0xd5, 0x9a, 0x7d, 0xb9, 0x9f,</div><div class='add'>+	0x93, 0x40, 0x9d, 0x06, 0xf3, 0xc7, 0xa3, 0xc7, 0x70, 0xae, 0x6d, 0xa0,</div><div class='add'>+	0xdf, 0x25, 0x4b, 0xcc, 0xc4, 0xe8, 0x4f, 0x55, 0x5d, 0xb3, 0xa5, 0x5e,</div><div class='add'>+	0xaa, 0x9d, 0xef, 0x04, 0x9e, 0x56, 0xaf, 0x88, 0xb9, 0x63, 0x79, 0x4a,</div><div class='add'>+	0x6e, 0x23, 0x12, 0x24, 0x33, 0x83, 0x7d, 0x89, 0x6a, 0x4e, 0x0a, 0x6b,</div><div class='add'>+	0x33, 0xc3, 0xef, 0xd0, 0x0e, 0xd2, 0x7a, 0x64, 0x9a, 0x76, 0xba, 0xc0,</div><div class='add'>+	0xc7, 0x6e, 0xc8, 0x20, 0x33, 0xfc, 0x2e, 0x84, 0x22, 0x1a, 0x99, 0xd4,</div><div class='add'>+	0x49, 0x2a, 0x0b, 0x05, 0xb7, 0x83, 0xa6, 0x33, 0x0a, 0xd5, 0x81, 0x47,</div><div class='add'>+	0x3d, 0xf7, 0x35, 0xc1, 0x5e, 0x2e, 0x09, 0x85, 0x65, 0xcc, 0x73, 0x5f,</div><div class='add'>+	0x0b, 0xff, 0x76, 0xad, 0x1b, 0xfb, 0x88, 0x54, 0xcb, 0x94, 0x30, 0xa6,</div><div class='add'>+	0xd0, 0x14, 0xe6, 0x4d, 0x81, 0xa6, 0x69, 0x77, 0x07, 0xad, 0x4f, 0x26,</div><div class='add'>+	0x13, 0xcc, 0xab, 0x1a, 0xc6, 0xbf, 0x32, 0x21, 0x90, 0x6a, 0x58, 0xf4,</div><div class='add'>+	0xeb, 0x3c, 0x64, 0x38, 0xdf, 0xcb, 0x32, 0xa3, 0xd3, 0x4d, 0x4a, 0x8a,</div><div class='add'>+	0x94, 0x49, 0x55, 0xe8, 0x32, 0x2d, 0x3a, 0x2c, 0x7f, 0xc8, 0x13, 0xf2,</div><div class='add'>+	0xae, 0x39, 0xbc, 0x0e, 0x72, 0x6b, 0x16, 0xc1, 0x8f, 0x71, 0xe0, 0x70,</div><div class='add'>+	0x50, 0x78, 0x6c, 0x71, 0x52, 0x18, 0x73, 0x7f, 0x93, 0xa0, 0xae, 0x93,</div><div class='add'>+	0xc2, 0x01, 0xf7, 0xa8, 0x10, 0xf2, 0x1e, 0xb2, 0x53, 0xc8, 0x9a, 0x50,</div><div class='add'>+	0xe8, 0x92, 0x1b, 0xc8, 0x6e, 0x01, 0xfa, 0x69, 0xa9, 0x16, 0xe4, 0x70,</div><div class='add'>+	0x78, 0x63, 0x0e, 0x8f, 0xd5, 0x97, 0x65, 0x3a, 0xed, 0xf2, 0xfc, 0x3f,</div><div class='add'>+	0x82, 0x7c, 0x14, 0x72, 0x76, 0x77, 0x53, 0x19, 0xfd, 0xb5, 0x79, 0xb2,</div><div class='add'>+	0xec, 0x9c, 0x88, 0x35, 0x09, 0x92, 0x8c, 0x9d, 0xf8, 0x75, 0xd1, 0xd4,</div><div class='add'>+	0x62, 0xa7, 0x25, 0x19, 0x49, 0x9a, 0x72, 0x99, 0x87, 0x78, 0x36, 0xdb,</div><div class='add'>+	0x7c, 0x64, 0x5c, 0xb9, 0x9f, 0xd7, 0x71, 0xbf, 0x8a, 0xfe, 0xcd, 0x7d,</div><div class='add'>+	0xac, 0x17, 0x09, 0xe0, 0xa3, 0x67, 0x59, 0x9f, 0x2b, 0xcd, 0x8c, 0x7a,</div><div class='add'>+	0x80, 0x9f, 0x2e, 0xf3, 0xb6, 0xcd, 0x53, 0x19, 0x73, 0x45, 0xaa, 0x2c,</div><div class='add'>+	0xe2, 0x9c, 0xf3, 0xbf, 0xf5, 0x62, 0x79, 0xbc, 0x1b, 0x1d, 0xa0, 0x8b,</div><div class='add'>+	0xcf, 0x95, 0x81, 0x93, 0x48, 0xe5, 0x45, 0xde, 0x8b, 0xc7, 0x09, 0xb2,</div><div class='add'>+	0xaf, 0xf5, 0x88, 0x94, 0x85, 0x7c, 0x75, 0x9c, 0x13, 0xc7, 0x9c, 0x6e,</div><div class='add'>+	0xf0, 0x0f, 0xb4, 0x2e, 0xa3, 0x0d, 0xda, 0x45, 0x43, 0xc4, 0xfa, 0x4e,</div><div class='add'>+	0x9a, 0xca, 0xb1, 0xbe, 0x30, 0x9e, 0xdb, 0xb0, 0x77, 0x9c, 0x8e, 0x9c,</div><div class='add'>+	0x67, 0x7e, 0xc8, 0xf4, 0x3c, 0x70, 0x9c, 0x9e, 0xd7, 0xd5, 0x22, 0xe9,</div><div class='add'>+	0xe0, 0x8d, 0x85, 0x79, 0x9d, 0x54, 0x56, 0x3d, 0x6f, 0x24, 0x37, 0xa0,</div><div class='add'>+	0xbe, 0xec, 0xeb, 0xf9, 0x80, 0x9a, 0x11, 0xa8, 0xda, 0x61, 0xfe, 0x21,</div><div class='add'>+	0x70, 0xd0, 0x4b, 0x44, 0xfc, 0xfe, 0xcf, 0x64, 0x4d, 0xb2, 0xfd, 0x24,</div><div class='add'>+	0xf9, 0x2c, 0xd8, 0xd3, 0x4e, 0xe0, 0xcf, 0x36, 0x97, 0x86, 0x5c, 0x52,</div><div class='add'>+	0xbe, 0x1d, 0x8c, 0xdc, 0xd5, 0x0e, 0xf4, 0xf1, 0x16, 0x6c, 0xa6, 0xb6,</div><div class='add'>+	0x2c, 0xb3, 0xfd, 0xe5, 0xa0, 0x6e, 0xb4, 0xcd, 0x80, 0x6e, 0xf9, 0xb2,</div><div class='add'>+	0xd9, 0x8f, 0xfd, 0x3d, 0xef, 0xcb, 0xb9, 0x00, 0xa7, 0xda, 0xbc, 0x85,</div><div class='add'>+	0xb5, 0x32, 0xf8, 0xae, 0x1f, 0xd7, 0xfc, 0xf3, 0xf7, 0x87, 0xe7, 0xab,</div><div class='add'>+	0x34, 0x05, 0xbc, 0x6b, 0x4d, 0x89, 0x0a, 0x2a, 0xef, 0xf1, 0x2e, 0xf7,</div><div class='add'>+	0x97, 0x83, 0xbd, 0xa0, 0xb7, 0xe7, 0xfa, 0xd4, 0x7d, 0xb0, 0x25, 0xb6,</div><div class='add'>+	0xb1, 0xda, 0x0a, 0xf3, 0x18, 0xfb, 0xe4, 0x99, 0xc7, 0xaa, 0x8f, 0xa3,</div><div class='add'>+	0x3d, 0xcf, 0x7a, 0x44, 0x69, 0x89, 0x58, 0xcf, 0x2f, 0xb3, 0x2e, 0x41,</div><div class='add'>+	0x3f, 0x03, 0xbd, 0xaa, 0x38, 0x2c, 0xff, 0x2f, 0x85, 0xf6, 0x29, 0x52,</div><div class='add'>+	0x7f, 0x86, 0xf5, 0xfd, 0x05, 0x2a, 0xc0, 0xc6, 0xa7, 0x70, 0xd2, 0x22,</div><div class='add'>+	0x68, 0x5a, 0x68, 0xf6, 0x81, 0x57, 0x6d, 0xbb, 0x83, 0x7c, 0x07, 0xff,</div><div class='add'>+	0xc7, 0x0b, 0xe6, 0x77, 0x03, 0x27, 0xb6, 0x99, 0x9a, 0x2a, 0x52, 0x15,</div><div class='add'>+	0x3f, 0xe8, 0x8d, 0xa1, 0x67, 0x6d, 0x49, 0x9f, 0x28, 0x03, 0x37, 0xe8,</div><div class='add'>+	0x3d, 0xd9, 0x7b, 0x58, 0x9f, 0x31, 0xc7, 0xa5, 0xa1, 0xb6, 0x9d, 0x2d,</div><div class='add'>+	0x38, 0x2c, 0xa7, 0x2e, 0x9c, 0xdb, 0xc6, 0x49, 0x46, 0x1f, 0xef, 0xa3,</div><div class='add'>+	0x40, 0xe7, 0xdb, 0x3a, 0xc3, 0xfa, 0xa7, 0x5b, 0xeb, 0xd4, 0x41, 0xd9,</div><div class='add'>+	0x0c, 0x7c, 0xd9, 0xbc, 0x08, 0xf9, 0xa5, 0xe1, 0x53, 0x64, 0x7a, 0xba,</div><div class='add'>+	0x99, 0xa4, 0x63, 0x4d, 0xc6, 0xaf, 0x08, 0xbb, 0x83, 0x6f, 0x9b, 0x1f,</div><div class='add'>+	0x85, 0x9d, 0x8d, 0x0b, 0x23, 0xb0, 0x89, 0x47, 0x17, 0x19, 0x27, 0x8f,</div><div class='add'>+	0xd8, 0x2e, 0x8b, 0xcb, 0x65, 0x61, 0xd4, 0x2d, 0x09, 0xe3, 0xcb, 0x6c,</div><div class='add'>+	0x27, 0x6c, 0x23, 0xba, 0xfa, 0x38, 0x31, 0x0d, 0x98, 0xe3, 0xfe, 0x22,</div><div class='add'>+	0xc1, 0xb6, 0x5a, 0x3b, 0x17, 0x07, 0x1e, 0xdb, 0x80, 0x4f, 0x37, 0x6c,</div><div class='add'>+	0x0f, 0xfa, 0x65, 0xe8, 0x13, 0xac, 0x33, 0xc5, 0x8c, 0xa1, 0xfd, 0x25,</div><div class='add'>+	0x7d, 0x9c, 0x0f, 0x23, 0x1b, 0x7c, 0x18, 0x00, 0x4f, 0x3e, 0xcc, 0x87,</div><div class='add'>+	0xfa, 0xc7, 0xf9, 0x60, 0x55, 0xc1, 0x87, 0x3a, 0xfc, 0x50, 0xdd, 0x65,</div><div class='add'>+	0x9a, 0x3d, 0x12, 0xf7, 0x10, 0xb4, 0x93, 0xf6, 0x8a, 0x26, 0xeb, 0x28,</div><div class='add'>+	0xdb, 0x49, 0x46, 0x9b, 0xc6, 0x0e, 0x4b, 0x4e, 0xb7, 0x6f, 0x1b, 0xa3,</div><div class='add'>+	0x3e, 0x2f, 0x7e, 0x17, 0xbd, 0x4c, 0xdf, 0x1d, 0x9a, 0xc7, 0x17, 0xd9,</div><div class='add'>+	0xdf, 0x40, 0xcf, 0x33, 0x86, 0x7a, 0x88, 0xee, 0xd0, 0xbd, 0xef, 0x0e,</div><div class='add'>+	0xdd, 0x38, 0xa7, 0xed, 0x83, 0x98, 0xe6, 0xb6, 0x3f, 0x66, 0x5d, 0x79,</div><div class='add'>+	0xc3, 0x93, 0x0c, 0x03, 0x32, 0x60, 0x7d, 0x61, 0x1c, 0x74, 0xf5, 0xcb,</div><div class='add'>+	0xa0, 0xa7, 0x02, 0xbf, 0xc0, 0xb6, 0x54, 0xf6, 0xe7, 0x75, 0x50, 0xb9,</div><div class='add'>+	0x27, 0x98, 0x3f, 0xd5, 0xf4, 0xfe, 0x4b, 0x34, 0x3f, 0xf0, 0xec, 0xbc,</div><div class='add'>+	0x11, 0xda, 0xb8, 0x42, 0x7f, 0xb2, 0xa8, 0x97, 0x35, 0xa1, 0x9b, 0xaa,</div><div class='add'>+	0xf7, 0xc3, 0xaf, 0x34, 0xd9, 0x3e, 0x76, 0xde, 0xc3, 0x97, 0xa5, 0x43,</div><div class='add'>+	0x5f, 0xf6, 0x3e, 0x78, 0xcf, 0xb1, 0xe7, 0xe8, 0x07, 0xeb, 0x49, 0x7e,</div><div class='add'>+	0x66, 0xd4, 0x09, 0x2a, 0x71, 0xbc, 0xd9, 0x21, 0xfa, 0xfe, 0xbb, 0x8f,</div><div class='add'>+	0x63, 0x41, 0x55, 0x36, 0xe3, 0x54, 0xed, 0xa1, 0xaa, 0x64, 0xb2, 0x1d,</div><div class='add'>+	0xb1, 0x6d, 0xb4, 0xf1, 0xde, 0x1e, 0xc6, 0xdd, 0x41, 0x89, 0x0c, 0x1e,</div><div class='add'>+	0x47, 0x8c, 0x68, 0x32, 0x0d, 0xef, 0x87, 0xf2, 0x60, 0x7f, 0x4a, 0xb1,</div><div class='add'>+	0x40, 0xdf, 0xf6, 0xc3, 0x5f, 0x32, 0x3f, 0x37, 0xeb, 0x0a, 0xfb, 0x51,</div><div class='add'>+	0xd2, 0x44, 0x83, 0xfd, 0x28, 0xa9, 0x92, 0x79, 0x50, 0xb0, 0x16, 0xbf,</div><div class='add'>+	0x26, 0x58, 0xe0, 0x9b, 0x05, 0xbe, 0x59, 0xe0, 0x9b, 0x0d, 0xbe, 0x15,</div><div class='add'>+	0x5c, 0xc6, 0x85, 0xf1, 0x08, 0xf6, 0x2f, 0x06, 0xfb, 0x03, 0xc7, 0x9d,</div><div class='add'>+	0x54, 0xf1, 0xed, 0x9b, 0x69, 0x85, 0x3f, 0xf6, 0x7d, 0xc1, 0xa8, 0x10,</div><div class='add'>+	0xf8, 0x02, 0xde, 0x6f, 0x1c, 0xeb, 0x1f, 0x47, 0x8c, 0xb3, 0x44, 0xd1,</div><div class='add'>+	0xb8, 0xc3, 0x8f, 0xfa, 0x26, 0x7e, 0x4c, 0x3b, 0xcc, 0x1f, 0x9e, 0xcf,</div><div class='add'>+	0x76, 0xec, 0x40, 0xe6, 0x6d, 0x9e, 0xec, 0x07, 0x0e, 0x9d, 0x4c, 0x77,</div><div class='add'>+	0x48, 0x07, 0xef, 0xdf, 0x1b, 0xee, 0x7f, 0x00, 0x7b, 0xb2, 0xdd, 0xde,</div><div class='add'>+	0xed, 0x5c, 0x3e, 0x93, 0xe3, 0xe8, 0x27, 0xd1, 0x83, 0x3c, 0x02, 0x7e,</div><div class='add'>+	0x66, 0x0d, 0x76, 0x76, 0x53, 0x4a, 0xd1, 0xeb, 0xbb, 0x6f, 0x20, 0xb7,</div><div class='add'>+	0xa0, 0xea, 0x03, 0xa6, 0xa7, 0xc9, 0xe6, 0xfb, 0x5e, 0x3d, 0x0f, 0xdf,</div><div class='add'>+	0x69, 0xea, 0x29, 0x5b, 0x1a, 0xa4, 0x37, 0xdc, 0x2c, 0xfd, 0x9d, 0x6b,</div><div class='add'>+	0xd0, 0xdf, 0xba, 0x1a, 0xbd, 0xea, 0xa6, 0xe9, 0x6f, 0xdc, 0x14, 0xfd,</div><div class='add'>+	0xb5, 0xdb, 0xce, 0x43, 0x92, 0xac, 0x47, 0x89, 0xa2, 0x7b, 0xb7, 0x5c,</div><div class='add'>+	0x08, 0x3a, 0x8e, 0xbd, 0xec, 0xbc, 0x5c, 0x96, 0x4d, 0x3f, 0x3f, 0x98,</div><div class='add'>+	0x98, 0x6e, 0x90, 0xb2, 0xd3, 0xa0, 0xed, 0xf7, 0x23, 0xef, 0x49, 0x9a,</div><div class='add'>+	0xb4, 0xe3, 0x3e, 0x3c, 0x7b, 0x4d, 0xb2, 0x7a, 0xcc, 0x53, 0x9e, 0x68,</div><div class='add'>+	0xb0, 0x1e, 0x75, 0x0f, 0x4f, 0xe5, 0xe3, 0x8c, 0xfb, 0xc4, 0x34, 0xfc,</div><div class='add'>+	0x91, 0x8d, 0xb3, 0xaa, 0xd0, 0xc5, 0xaa, 0x7b, 0xe8, 0xfe, 0x20, 0x17,</div><div class='add'>+	0x7a, 0x2f, 0xcc, 0x89, 0x38, 0xaf, 0x5a, 0x7f, 0x6a, 0xc2, 0x60, 0x3f,</div><div class='add'>+	0x2b, 0x6c, 0xf2, 0xb3, 0x24, 0x14, 0x41, 0x53, 0x1d, 0xb8, 0x16, 0x41,</div><div class='add'>+	0xe7, 0x57, 0x5d, 0x45, 0x28, 0x9c, 0xef, 0xa5, 0xe9, 0x45, 0x8e, 0x55,</div><div class='add'>+	0x3c, 0x4f, 0x09, 0x73, 0x19, 0x7e, 0xef, 0xc0, 0x3b, 0x21, 0x7e, 0x14,</div><div class='add'>+	0xb6, 0x53, 0x42, 0x7f, 0x73, 0x82, 0x9c, 0x30, 0x17, 0x89, 0xd1, 0x05,</div><div class='add'>+	0x5f, 0x77, 0xb8, 0xdf, 0x2a, 0xfd, 0xb0, 0xff, 0x4e, 0xff, 0xf9, 0x8d,</div><div class='add'>+	0xfe, 0x72, 0xe9, 0xeb, 0x1b, 0xfd, 0xef, 0xa8, 0x01, 0x4e, 0xc3, 0xc2,</div><div class='add'>+	0xe3, 0xee, 0xf3, 0x61, 0xdf, 0x6d, 0xf0, 0xd3, 0xf3, 0xea, 0x88, 0x27,</div><div class='add'>+	0x35, 0xe3, 0x36, 0x72, 0x1f, 0xf6, 0x29, 0x5b, 0xf1, 0x21, 0x1f, 0xf2,</div><div class='add'>+	0x1f, 0xaa, 0x2d, 0xb1, 0x9c, 0x14, 0x0a, 0xf6, 0xe4, 0xf1, 0x4e, 0xf8,</div><div class='add'>+	0x92, 0xdb, 0x68, 0x73, 0xec, 0x6a, 0xfb, 0x31, 0x9e, 0xc3, 0xeb, 0x6f,</div><div class='add'>+	0xdd, 0x43, 0x96, 0x2a, 0x64, 0xb9, 0x35, 0x79, 0xd5, 0x1a, 0xa7, 0x42,</div><div class='add'>+	0x9f, 0xd0, 0x3d, 0x6c, 0x43, 0x2e, 0x12, 0xe4, 0x52, 0x83, 0x5c, 0x0a,</div><div class='add'>+	0xf7, 0x94, 0x0b, 0xce, 0xd8, 0xd0, 0x29, 0xc6, 0xa3, 0x2b, 0x3c, 0x9b,</div><div class='add'>+	0x14, 0xd9, 0xac, 0x96, 0xea, 0xc6, 0xa7, 0x28, 0x66, 0x30, 0x1e, 0x06,</div><div class='add'>+	0xf0, 0x38, 0x8a, 0xb5, 0x1c, 0xc3, 0x48, 0x89, 0x99, 0x2c, 0xcf, 0xdc,</div><div class='add'>+	0x13, 0xb6, 0x71, 0xab, 0xb4, 0xe0, 0xdc, 0x2a, 0x5d, 0x34, 0xf8, 0xfd,</div><div class='add'>+	0xf6, 0x64, 0x90, 0x37, 0x77, 0x3f, 0x89, 0xbc, 0x19, 0xeb, 0xd9, 0x1f,</div><div class='add'>+	0x72, 0xff, 0x30, 0xe6, 0x71, 0x7c, 0xa0, 0x43, 0x35, 0xfc, 0xea, 0xfe,</div><div class='add'>+	0xdc, 0x6b, 0x4f, 0xf0, 0xdc, 0x4e, 0x53, 0x9e, 0xfc, 0x35, 0x9e, 0x1d,</div><div class='add'>+	0xa6, 0xf6, 0xe4, 0x4f, 0x0d, 0xde, 0x77, 0x78, 0xf2, 0xa2, 0xbf, 0x07,</div><div class='add'>+	0x62, 0xa6, 0xbf, 0x36, 0xfb, 0x24, 0xaf, 0x7d, 0x0e, 0x3e, 0xf6, 0x0c,</div><div class='add'>+	0xe2, 0xcb, 0x69, 0x47, 0x3b, 0x54, 0xc1, 0x6f, 0x8a, 0x71, 0x6a, 0xf2,</div><div class='add'>+	0xb8, 0x85, 0x71, 0x19, 0xb1, 0x90, 0xdb, 0x0a, 0x1d, 0xc3, 0xbc, 0xa7,</div><div class='add'>+	0x31, 0xef, 0xa8, 0x33, 0x8e, 0xbc, 0xbd, 0x4d, 0xd7, 0xbf, 0xc5, 0x0b,</div><div class='add'>+	0xf3, 0xec, 0xcf, 0x91, 0xed, 0xaf, 0xfc, 0x7b, 0xdc, 0x86, 0x5f, 0x16,</div><div class='add'>+	0x57, 0x6e, 0xc6, 0x0b, 0xa0, 0x5b, 0x5a, 0xf9, 0x45, 0xbc, 0x08, 0x3d,</div><div class='add'>+	0x13, 0x0d, 0x09, 0x7e, 0xf9, 0x33, 0x54, 0x53, 0x3d, 0x7a, 0x19, 0xf1,</div><div class='add'>+	0xab, 0x96, 0x85, 0xbf, 0x82, 0x34, 0x45, 0x03, 0x7e, 0x4c, 0x25, 0xa5,</div><div class='add'>+	0xcb, 0x3c, 0xa9, 0x52, 0x57, 0x3e, 0x6e, 0x23, 0xde, 0xd4, 0x54, 0x09,</div><div class='add'>+	0xfd, 0xfd, 0x78, 0x6e, 0xee, 0xff, 0x65, 0x1c, 0x7e, 0x0b, 0x3e, 0x82,</div><div class='add'>+	0x14, 0x3b, 0xdf, 0x8d, 0xfd, 0xbf, 0x8d, 0x7e, 0x4c, 0xc8, 0x6c, 0xf4,</div><div class='add'>+	0x3f, 0x1b, 0xf4, 0xdf, 0x02, 0x2e, 0xbc, 0x8e, 0xe3, 0x27, 0x29, 0x53,</div><div class='add'>+	0x79, 0x15, 0x38, 0xf0, 0xdc, 0xa4, 0x3f, 0xb7, 0x38, 0xcf, 0x3c, 0xa8,</div><div class='add'>+	0x96, 0x16, 0x8c, 0x34, 0x15, 0xe6, 0x92, 0x34, 0x3a, 0xa7, 0xd2, 0xd8,</div><div class='add'>+	0x9c, 0x3e, 0xd1, 0x62, 0xfb, 0x01, 0xcd, 0x84, 0x1c, 0x41, 0x5c, 0x21,</div><div class='add'>+	0x50, 0xac, 0xa7, 0x9e, 0xa6, 0xbe, 0xd4, 0x31, 0xfa, 0x6f, 0x0f, 0xb1,</div><div class='add'>+	0x08, 0x71, 0xa8, 0x9b, 0x64, 0x7f, 0x9f, 0x54, 0xfb, 0x4c, 0x96, 0xd1,</div><div class='add'>+	0x87, 0xce, 0x2d, 0xce, 0xdf, 0x6b, 0x5f, 0x28, 0xf1, 0x4a, 0xea, 0x23,</div><div class='add'>+	0xfb, 0xbe, 0x1b, 0xee, 0xab, 0x62, 0xdf, 0x34, 0xf6, 0x64, 0x1a, 0xf5,</div><div class='add'>+	0xf8, 0xc8, 0x79, 0xb2, 0x3a, 0x81, 0x5f, 0x31, 0x83, 0x98, 0x8f, 0x7d,</div><div class='add'>+	0xce, 0xcc, 0xb1, 0xde, 0xd3, 0x4e, 0xfc, 0x06, 0x63, 0x94, 0xc9, 0x2e,</div><div class='add'>+	0x23, 0x27, 0x18, 0xf1, 0xf7, 0x08, 0xf2, 0x05, 0x71, 0x65, 0x10, 0xf9,</div><div class='add'>+	0xda, 0x3b, 0xc0, 0x87, 0xe3, 0x18, 0xd3, 0x2c, 0x83, 0xde, 0x41, 0xe4,</div><div class='add'>+	0x09, 0x9c, 0xe3, 0x7b, 0xa7, 0xec, 0x1c, 0xda, 0xcb, 0x5a, 0xbc, 0x00,</div><div class='add'>+	0xdb, 0x16, 0x4d, 0x7a, 0x50, 0xf2, 0x7d, 0x2c, 0xcb, 0x65, 0x10, 0x72,</div><div class='add'>+	0x62, 0xbc, 0x73, 0x90, 0x13, 0xf3, 0x68, 0x38, 0x5e, 0x6c, 0x32, 0x8f,</div><div class='add'>+	0x08, 0xf8, 0x68, 0xb0, 0x27, 0xd9, 0xcf, 0xf3, 0xc5, 0x15, 0x0b, 0xf3,</div><div class='add'>+	0x7e, 0xac, 0x72, 0x2e, 0x66, 0x1b, 0xdc, 0x86, 0xed, 0xac, 0x8c, 0x63,</div><div class='add'>+	0x2e, 0xb7, 0x1f, 0xc6, 0xbe, 0x7d, 0xb9, 0x1a, 0x75, 0xe4, 0x9e, 0x86,</div><div class='add'>+	0xdd, 0x8a, 0xf9, 0x01, 0xc4, 0x68, 0x01, 0xb9, 0xa0, 0xe7, 0x75, 0xe4,</div><div class='add'>+	0xbf, 0x00, 0x7a, 0x98, 0x0e, 0xe8, 0xf5, 0x2c, 0xf3, 0x95, 0xfe, 0x40,</div><div class='add'>+	0xe4, 0x5c, 0x2d, 0xdf, 0xce, 0x6b, 0x38, 0x9e, 0xf3, 0xf9, 0x88, 0x23,</div><div class='add'>+	0x8d, 0x3d, 0x88, 0xa5, 0xfe, 0xd9, 0xd0, 0xb1, 0x71, 0x2a, 0x34, 0x3e,</div><div class='add'>+	0x8b, 0x9c, 0x93, 0x6d, 0x67, 0x9b, 0x60, 0x9f, 0x67, 0x1a, 0x09, 0xb1,</div><div class='add'>+	0x66, 0x8d, 0x2a, 0x0d, 0x39, 0x6c, 0xbf, 0x8a, 0xb6, 0x12, 0xb6, 0xd7,</div><div class='add'>+	0xd1, 0xee, 0x0e, 0xdb, 0xd7, 0xd0, 0x56, 0xc3, 0xf6, 0xcf, 0xd0, 0x4e,</div><div class='add'>+	0x86, 0xed, 0x9f, 0xa3, 0x9d, 0x0a, 0xdb, 0x37, 0xd1, 0x4e, 0x87, 0xed,</div><div class='add'>+	0x5b, 0x68, 0x6b, 0x61, 0xfb, 0x3d, 0xb4, 0x13, 0xb0, 0x73, 0x03, 0xef,</div><div class='add'>+	0x37, 0x50, 0x2b, 0x66, 0xf1, 0xfc, 0x57, 0xe0, 0x36, 0x08, 0xde, 0x64,</div><div class='add'>+	0xc1, 0x8f, 0x5e, 0x8c, 0xe5, 0xd0, 0x87, 0x1c, 0xb1, 0x91, 0xc7, 0xd3,</div><div class='add'>+	0xc1, 0x18, 0x95, 0x61, 0x7b, 0x18, 0x1f, 0x2f, 0x16, 0x1a, 0x26, 0x9e,</div><div class='add'>+	0x6c, 0x0f, 0xba, 0x4a, 0xc2, 0x65, 0xd8, 0xb9, 0xef, 0x63, 0x72, 0xb6,</div><div class='add'>+	0x34, 0x09, 0xdb, 0x9e, 0xa0, 0x7f, 0x74, 0xf7, 0xd3, 0x6b, 0xee, 0x38,</div><div class='add'>+	0xe2, 0x46, 0x11, 0x71, 0xc3, 0x42, 0xdc, 0x30, 0x11, 0x37, 0x86, 0x11,</div><div class='add'>+	0x37, 0xf2, 0x88, 0x1b, 0x39, 0xc4, 0x0d, 0xa2, 0x33, 0x7e, 0x8c, 0x4a,</div><div class='add'>+	0x2a, 0xa8, 0x51, 0x15, 0xcb, 0x2d, 0x82, 0xbf, 0x13, 0x90, 0xcd, 0x24,</div><div class='add'>+	0x78, 0x7d, 0x38, 0x3e, 0xd2, 0xcc, 0xc3, 0x9f, 0x69, 0xf0, 0x11, 0x69,</div><div class='add'>+	0xf8, 0xf2, 0x1c, 0x6a, 0x13, 0xa2, 0x2b, 0xb3, 0x1a, 0xfc, 0x8f, 0x47,</div><div class='add'>+	0x45, 0xc4, 0xfe, 0x69, 0x15, 0xb8, 0x19, 0xbb, 0x7c, 0x9b, 0x91, 0xcc,</div><div class='add'>+	0x2f, 0xf6, 0x50, 0xd7, 0x20, 0xe8, 0x39, 0x8b, 0xbe, 0x14, 0xf6, 0x63,</div><div class='add'>+	0xbe, 0xde, 0x2a, 0xd9, 0x86, 0x46, 0x0b, 0x6e, 0x1c, 0xfe, 0x9f, 0xdf,</div><div class='add'>+	0xe3, 0xcc, 0xe3, 0x43, 0x4f, 0x19, 0x4c, 0x03, 0xea, 0x3c, 0x23, 0xad,</div><div class='add'>+	0x14, 0x1c, 0x81, 0x24, 0x93, 0x9f, 0xed, 0x1c, 0xe2, 0xcf, 0x90, 0x43,</div><div class='add'>+	0x74, 0x41, 0x06, 0x55, 0xc4, 0x05, 0x9d, 0xf3, 0x0b, 0xe8, 0xf2, 0x27,</div><div class='add'>+	0xcd, 0xff, 0x1e, 0xe6, 0xef, 0xc5, 0xd9, 0x3c, 0x8f, 0xcf, 0x39, 0x85,</div><div class='add'>+	0xfa, 0xc1, 0xea, 0x91, 0x68, 0x3d, 0x25, 0xa1, 0x9e, 0x28, 0xd0, 0x59,</div><div class='add'>+	0x2a, 0x00, 0x9f, 0x82, 0xdb, 0xbe, 0x07, 0xb0, 0x0e, 0x05, 0xfe, 0x6c,</div><div class='add'>+	0xe2, 0xd0, 0xb7, 0x0d, 0x0b, 0xeb, 0x18, 0x3f, 0xd6, 0x5b, 0xe0, 0xbe,</div><div class='add'>+	0xb1, 0xe7, 0x05, 0xec, 0xf9, 0x4f, 0x49, 0xea, 0x9a, 0x0c, 0xfc, 0x91,</div><div class='add'>+	0x5f, 0xf3, 0xca, 0xc2, 0x48, 0xf3, 0x2c, 0xf8, 0xd3, 0x87, 0x1a, 0x05,</div><div class='add'>+	0x7e, 0xa4, 0xd4, 0x02, 0x9f, 0xda, 0xf3, 0x5f, 0xc1, 0x7c, 0x7e, 0xf7,</div><div class='add'>+	0xef, 0x0e, 0x4a, 0xd2, 0xea, 0x12, 0xe6, 0x69, 0xac, 0x3f, 0x25, 0xb9,</div><div class='add'>+	0xff, 0x86, 0xf7, 0xa2, 0x91, 0xa7, 0x5d, 0xab, 0xbc, 0x2e, 0x4b, 0x7d,</div><div class='add'>+	0xab, 0x37, 0xbc, 0x9a, 0xa3, 0xd1, 0x62, 0x93, 0xc0, 0xab, 0xf8, 0x6d,</div><div class='add'>+	0x8b, 0xf4, 0x35, 0x12, 0xf5, 0x59, 0x0b, 0x7a, 0x5a, 0x1c, 0x12, 0xc9,</div><div class='add'>+	0x1e, 0xea, 0x84, 0x8f, 0x32, 0x68, 0x09, 0x7c, 0xdf, 0x35, 0x63, 0xd1,</div><div class='add'>+	0x13, 0x43, 0xed, 0x7c, 0x10, 0x51, 0x0f, 0xb8, 0xee, 0x5a, 0xd5, 0x30,</div><div class='add'>+	0x87, 0x73, 0x71, 0xa6, 0x45, 0x03, 0x2f, 0x85, 0x60, 0x8d, 0x1f, 0xb3,</div><div class='add'>+	0xb8, 0x8e, 0x05, 0xdf, 0xdc, 0xb5, 0xd2, 0xd5, 0x19, 0xd4, 0x1a, 0x90,</div><div class='add'>+	0xf3, 0xae, 0x19, 0xae, 0x85, 0xb6, 0x81, 0x2f, 0x31, 0xd8, 0x06, 0xe7,</div><div class='add'>+	0xf1, 0x08, 0xf4, 0xf0, 0x87, 0x27, 0xe0, 0xf1, 0x6b, 0xcd, 0x13, 0xd0,</div><div class='add'>+	0xfb, 0x2e, 0x2a, 0xcb, 0x3e, 0x11, 0x9f, 0xc0, 0xe3, 0xff, 0xe4, 0xbc,</div><div class='add'>+	0x0e, 0xf3, 0xbf, 0x4b, 0xc5, 0xd9, 0x2e, 0xec, 0xb5, 0x9b, 0xa6, 0x93,</div><div class='add'>+	0x8c, 0x9b, 0x3e, 0x8c, 0x41, 0x2d, 0x06, 0x7e, 0xc6, 0xcd, 0x8f, 0xe6,</div><div class='add'>+	0x7d, 0x6b, 0xa5, 0x2b, 0x33, 0x6b, 0xa5, 0x6b, 0xa0, 0xbf, 0x6e, 0x70,</div><div class='add'>+	0x8d, 0x0c, 0x5d, 0x6a, 0x70, 0x6d, 0xcf, 0x79, 0xd1, 0x18, 0x74, 0x64,</div><div class='add'>+	0xbf, 0x5f, 0x33, 0xdb, 0x8b, 0x39, 0xea, 0x3b, 0x47, 0xaa, 0x68, 0x96,</div><div class='add'>+	0x84, 0x31, 0xe4, 0x45, 0x23, 0xee, 0x49, 0x7f, 0xee, 0x99, 0x06, 0xd7,</div><div class='add'>+	0x2b, 0x18, 0x5b, 0x61, 0x5d, 0x18, 0x03, 0x3e, 0x49, 0xba, 0xe8, 0xb2,</div><div class='add'>+	0x4f, 0x0a, 0xec, 0x78, 0x0c, 0xfc, 0x5a, 0xf0, 0xe9, 0x4a, 0x71, 0x1c,</div><div class='add'>+	0x47, 0xbe, 0xc1, 0xf2, 0xf9, 0x21, 0xc7, 0x41, 0xa1, 0xd3, 0x6c, 0xfb,</div><div class='add'>+	0xdb, 0x89, 0x5e, 0xe6, 0x59, 0xa1, 0x01, 0xdf, 0x3f, 0x34, 0x11, 0xe6,</div><div class='add'>+	0x1c, 0x7f, 0x8f, 0x39, 0x8c, 0x3b, 0xcd, 0x4a, 0x26, 0xce, 0xc8, 0x33,</div><div class='add'>+	0xcf, 0x38, 0xa7, 0xe4, 0x7d, 0xc1, 0x5b, 0xf0, 0x7d, 0x53, 0x6e, 0xe9,</div><div class='add'>+	0xc3, 0x74, 0x33, 0x46, 0x95, 0x59, 0xf0, 0x2e, 0x8f, 0x27, 0x9c, 0x6b,</div><div class='add'>+	0x1d, 0x7c, 0x03, 0x2d, 0xd5, 0x20, 0x9f, 0x3d, 0xc1, 0x31, 0x0d, 0xfe,</div><div class='add'>+	0x06, 0x36, 0xcd, 0x31, 0x6b, 0xe3, 0xde, 0xc9, 0xf7, 0x25, 0x32, 0x19,</div><div class='add'>+	0x41, 0xce, 0x2a, 0xe2, 0x2c, 0x3b, 0xcf, 0x7e, 0x10, 0xf8, 0xb8, 0xdf,</div><div class='add'>+	0xa5, 0xfa, 0x2c, 0xd3, 0x05, 0x1b, 0x4f, 0xb2, 0x2e, 0xfe, 0x7f, 0xf9,</div><div class='add'>+	0x38, 0xba, 0x45, 0x3e, 0x8e, 0x6e, 0x99, 0x8f, 0x12, 0xf8, 0x58, 0xd9,</div><div class='add'>+	0xe0, 0xa3, 0x82, 0x3d, 0xf8, 0x3e, 0xe1, 0xab, 0x64, 0x4d, 0x3c, 0x02,</div><div class='add'>+	0x3f, 0x0c, 0xff, 0xd1, 0x3c, 0x05, 0x9f, 0x70, 0x52, 0xb8, 0xda, 0xf0,</div><div class='add'>+	0x68, 0x1c, 0xb5, 0xb2, 0x74, 0xff, 0x66, 0xfa, 0x33, 0xa0, 0xff, 0xcf,</div><div class='add'>+	0x31, 0x5e, 0xa5, 0x6b, 0xb3, 0x94, 0x56, 0xa8, 0x7d, 0x2e, 0xed, 0x92,</div><div class='add'>+	0xe9, 0x3b, 0x74, 0x75, 0xb6, 0x8b, 0xae, 0xcf, 0x66, 0xc0, 0xeb, 0x2c,</div><div class='add'>+	0xc5, 0x7a, 0x32, 0xc3, 0x15, 0x18, 0xf1, 0xcf, 0x5a, 0xba, 0xc5, 0xba,</div><div class='add'>+	0xf8, 0xfb, 0xf3, 0x82, 0xf9, 0x70, 0xd0, 0xe7, 0xc3, 0xd8, 0x47, 0xf8,</div><div class='add'>+	0x30, 0x7e, 0x4f, 0x3e, 0x1c, 0xfc, 0x18, 0x1f, 0xc6, 0x3f, 0xc6, 0x07,</div><div class='add'>+	0xe6, 0x01, 0xf3, 0xe2, 0xd1, 0xde, 0xf0, 0xff, 0x1f, 0x7d, 0x82, 0x7d,</div><div class='add'>+	0x7c, 0x09, 0x74, 0x22, 0xa7, 0xd8, 0x19, 0xe4, 0x50, 0x9c, 0x63, 0xd5,</div><div class='add'>+	0x0c, 0xe6, 0x57, 0x60, 0xbf, 0x32, 0x72, 0xea, 0x23, 0xa1, 0xfd, 0x16,</div><div class='add'>+	0x1c, 0xe8, 0x65, 0x23, 0xe6, 0xdb, 0xaf, 0x64, 0xe6, 0xe1, 0x03, 0xaa,</div><div class='add'>+	0xa5, 0x96, 0xc3, 0xfe, 0x07, 0x6d, 0x87, 0x79, 0xda, 0x0b, 0x5a, 0x12,</div><div class='add'>+	0x54, 0x99, 0x54, 0x10, 0x5f, 0x87, 0xa1, 0xb7, 0x71, 0xdf, 0x07, 0x4a,</div><div class='add'>+	0x26, 0xeb, 0xe1, 0x7e, 0xcc, 0x3f, 0x1c, 0xe6, 0x45, 0x88, 0x73, 0x38,</div><div class='add'>+	0xa3, 0xd6, 0x38, 0x0d, 0xfc, 0xf8, 0x9c, 0x6a, 0xa9, 0xec, 0xf0, 0x9a,</div><div class='add'>+	0x34, 0x62, 0x21, 0x3f, 0x37, 0xeb, 0xb7, 0xaf, 0xef, 0xf7, 0xd2, 0x71,</div><div class='add'>+	0xe8, 0x26, 0xeb, 0xb4, 0x82, 0xdc, 0x78, 0x02, 0xf1, 0xc5, 0xd7, 0xd3,</div><div class='add'>+	0xec, 0x02, 0xb1, 0xdf, 0x7f, 0x06, 0x75, 0xd1, 0x61, 0xfc, 0x34, 0x1a,</div><div class='add'>+	0x71, 0x03, 0x9b, 0x5a, 0xf2, 0xcf, 0xfc, 0xb0, 0x4f, 0xaa, 0x39, 0xeb,</div><div class='add'>+	0xc8, 0xdf, 0x0d, 0xec, 0xcb, 0xe7, 0x56, 0xc1, 0x1b, 0x09, 0xe7, 0x72,</div><div class='add'>+	0x5f, 0x37, 0xe2, 0x00, 0xf8, 0xe4, 0xfe, 0x07, 0xfa, 0x97, 0xe0, 0x1f,</div><div class='add'>+	0x39, 0x2f, 0x68, 0xe3, 0x8e, 0x1c, 0xc2, 0xe1, 0x78, 0x9d, 0x07, 0xcd,</div><div class='add'>+	0x9c, 0x63, 0x73, 0x2e, 0x81, 0xfc, 0x63, 0xe9, 0x4d, 0xf4, 0x0d, 0xd3,</div><div class='add'>+	0xe9, 0xa1, 0x2c, 0xe4, 0xc3, 0x7d, 0x0f, 0x84, 0x7d, 0x3c, 0x8f, 0x94,</div><div class='add'>+	0x07, 0x4d, 0xfd, 0x07, 0x55, 0xdf, 0xaf, 0x43, 0x0f, 0x51, 0xf7, 0xd5,</div><div class='add'>+	0x96, 0x90, 0x63, 0x00, 0xa7, 0xca, 0x6a, 0x16, 0xb9, 0x3c, 0xdf, 0xab,</div><div class='add'>+	0xe9, 0x97, 0x91, 0x07, 0x83, 0x27, 0x0a, 0xf5, 0x1a, 0xa5, 0xd0, 0x0f,</div><div class='add'>+	0xe7, 0x40, 0x1f, 0xdf, 0x3d, 0xf5, 0x21, 0xf7, 0x91, 0xc0, 0x08, 0xd8,</div><div class='add'>+	0xe9, 0xaa, 0x44, 0x7b, 0xe5, 0x01, 0xb5, 0x46, 0xff, 0x80, 0xb9, 0x32,</div><div class='add'>+	0x95, 0x57, 0x39, 0x87, 0x90, 0xe9, 0xc8, 0x2a, 0xd1, 0x5b, 0x33, 0xec,</div><div class='add'>+	0x97, 0x19, 0xd8, 0x2f, 0xb3, 0x7f, 0x7d, 0xd0, 0x1f, 0x7b, 0x6b, 0x06,</div><div class='add'>+	0x35, 0xf8, 0xcc, 0x00, 0xc7, 0xb0, 0x75, 0x11, 0xbc, 0x44, 0xee, 0xc3,</div><div class='add'>+	0xf9, 0xf9, 0x5d, 0xee, 0x98, 0xda, 0xf7, 0x4b, 0x0a, 0x55, 0x66, 0xf8,</div><div class='add'>+	0x6e, 0x49, 0xc6, 0xf9, 0x5c, 0x5b, 0x6c, 0x03, 0x7e, 0x02, 0xa1, 0xee,</div><div class='add'>+	0x12, 0x38, 0xa6, 0x09, 0xd0, 0xa1, 0x5d, 0x90, 0x3d, 0xf8, 0x1f, 0xb6,</div><div class='add'>+	0xdb, 0xfa, 0xf4, 0x2f, 0xd0, 0x27, 0x9e, 0x27, 0x6f, 0xc2, 0x25, 0x33,</div><div class='add'>+	0x6b, 0x8b, 0x1c, 0x1f, 0x3e, 0x0d, 0xdb, 0xb3, 0xe2, 0x63, 0xcd, 0x0e,</div><div class='add'>+	0x6a, 0xf5, 0xb2, 0x3d, 0xb0, 0x5e, 0x5c, 0x66, 0x9d, 0xc0, 0x19, 0xd0,</div><div class='add'>+	0xa1, 0x19, 0xae, 0xe7, 0x65, 0xcc, 0xbb, 0x2f, 0x9c, 0xc7, 0xfc, 0xfe,</div><div class='add'>+	0x1e, 0x4d, 0x0f, 0xa9, 0x42, 0x59, 0x0d, 0xe2, 0x45, 0x6d, 0xa8, 0x03,</div><div class='add'>+	0x63, 0x22, 0x1d, 0x7c, 0x38, 0x8f, 0xb5, 0x9c, 0x53, 0xc5, 0x85, 0xc0,</div><div class='add'>+	0x6f, 0x71, 0x1f, 0xdf, 0xd7, 0xa9, 0x54, 0xbe, 0xd4, 0x4b, 0x95, 0x4b,</div><div class='add'>+	0x0a, 0xf8, 0x02, 0x44, 0x17, 0x82, 0x7d, 0xd8, 0x17, 0x1c, 0x87, 0xdc,</div><div class='add'>+	0xc4, 0x73, 0x0a, 0xc5, 0xce, 0x21, 0x87, 0xbc, 0xd0, 0x45, 0x1d, 0x17,</div><div class='add'>+	0xfa, 0x49, 0xba, 0xa0, 0x73, 0x7e, 0xa8, 0x9d, 0x81, 0x0c, 0x8f, 0x50,</div><div class='add'>+	0x9e, 0x9e, 0x73, 0x07, 0x39, 0xc7, 0xc3, 0x39, 0x5c, 0xe7, 0x25, 0x49,</div><div class='add'>+	0x42, 0xf2, 0x2f, 0xbe, 0x68, 0xd1, 0x8b, 0x43, 0xc0, 0x2b, 0x8f, 0xf6,</div><div class='add'>+	0x8f, 0x91, 0xc7, 0xbb, 0x23, 0xf7, 0x71, 0xcc, 0x96, 0xcd, 0x3e, 0xc8,</div><div class='add'>+	0x16, 0x74, 0xe5, 0x1e, 0xf2, 0xef, 0x44, 0x5f, 0x1c, 0x62, 0x7a, 0x34,</div><div class='add'>+	0xd0, 0x52, 0x87, 0xae, 0xf3, 0x3d, 0x57, 0x17, 0xd9, 0x32, 0xeb, 0x32,</div><div class='add'>+	0xf2, 0xaa, 0x0b, 0x75, 0x9a, 0x6a, 0xe8, 0x90, 0x59, 0x1f, 0xf4, 0x02,</div><div class='add'>+	0x32, 0x4b, 0x73, 0x3f, 0xef, 0x2d, 0x84, 0xfb, 0xde, 0xd1, 0xf7, 0x17,</div><div class='add'>+	0xef, 0xad, 0xef, 0x3e, 0xd4, 0x9b, 0x8f, 0xc0, 0x67, 0xa3, 0x2e, 0x32,</div><div class='add'>+	0xe0, 0xd3, 0x55, 0xe4, 0x72, 0x06, 0xbf, 0x07, 0x77, 0x95, 0x15, 0xe4,</div><div class='add'>+	0x85, 0xfc, 0x5e, 0x6b, 0xdd, 0xcd, 0x77, 0x07, 0xf6, 0x7d, 0x06, 0x3c,</div><div class='add'>+	0xba, 0x32, 0xf7, 0x00, 0x5d, 0x9d, 0x53, 0xe8, 0x5a, 0x43, 0xcf, 0x16,</div><div class='add'>+	0xa8, 0x83, 0xaa, 0xc9, 0x34, 0x5d, 0x5f, 0x6a, 0xe7, 0x93, 0x22, 0xf4,</div><div class='add'>+	0xc4, 0x22, 0xce, 0xcd, 0xaf, 0x2c, 0x55, 0x4b, 0x37, 0x76, 0xa7, 0x49,</div><div class='add'>+	0x7e, 0x09, 0xb6, 0xfd, 0x92, 0xae, 0xd5, 0xc0, 0xe7, 0xba, 0xe1, 0xa2,</div><div class='add'>+	0x56, 0xe3, 0x3a, 0x32, 0x05, 0xbb, 0xd3, 0x53, 0x2d, 0xca, 0x90, 0xb4,</div><div class='add'>+	0xa0, 0xd0, 0xaf, 0x66, 0x74, 0x8d, 0x75, 0xee, 0xa2, 0x81, 0x7e, 0x37,</div><div class='add'>+	0x7e, 0x7b, 0x3d, 0xd0, 0x43, 0xf4, 0xf5, 0xa3, 0xbe, 0xd5, 0xb3, 0x9a,</div><div class='add'>+	0xd8, 0x4d, 0x6f, 0x43, 0x27, 0xca, 0x7e, 0xdf, 0x47, 0xf7, 0xbc, 0x1e,</div><div class='add'>+	0xee, 0x59, 0x2d, 0x5d, 0xe1, 0x3a, 0x68, 0x86, 0x75, 0xbe, 0x17, 0xfe,</div><div class='add'>+	0x03, 0xef, 0x6e, 0x07, 0x95, 0x27, 0x11, 0xa3, 0x66, 0x1e, 0xa5, 0xc2,</div><div class='add'>+	0x90, 0x18, 0xd0, 0xed, 0xf3, 0x82, 0xfb, 0xf8, 0x7e, 0xb2, 0x76, 0x1f,</div><div class='add'>+	0xdb, 0xb2, 0xb8, 0x0a, 0xbd, 0x3a, 0xc8, 0x7a, 0x80, 0xdc, 0x0e, 0x39,</div><div class='add'>+	0x04, 0xfb, 0x4e, 0x09, 0x39, 0x44, 0xc1, 0x0d, 0x74, 0xa3, 0x75, 0x30,</div><div class='add'>+	0x49, 0xc7, 0x5e, 0x62, 0x19, 0x61, 0x6c, 0x43, 0xef, 0x36, 0xee, 0xc4,</div><div class='add'>+	0x31, 0x66, 0xd0, 0xf1, 0xef, 0xb7, 0x73, 0x4a, 0xb6, 0xbd, 0x34, 0xe4,</div><div class='add'>+	0xa1, 0xa3, 0xf6, 0xe8, 0x53, 0x2b, 0xbe, 0x4f, 0x81, 0x4e, 0xa4, 0x02,</div><div class='add'>+	0x19, 0xd4, 0x30, 0x36, 0xed, 0x4e, 0xc2, 0x27, 0xc6, 0xe8, 0xe6, 0xa4,</div><div class='add'>+	0x05, 0x9d, 0x68, 0x01, 0x87, 0xc3, 0x71, 0xbe, 0x4b, 0xb8, 0x39, 0x59,</div><div class='add'>+	0xc4, 0xfb, 0x61, 0x3f, 0xf7, 0x97, 0xf6, 0x40, 0x97, 0xdc, 0x07, 0xc2,</div><div class='add'>+	0xfc, 0x9c, 0xcf, 0xd3, 0x84, 0xda, 0xac, 0x2e, 0x4c, 0xcf, 0x7a, 0x34,</div><div class='add'>+	0x9a, 0xeb, 0x4b, 0x5d, 0xa5, 0x4e, 0xff, 0xce, 0xd8, 0xf7, 0x9b, 0xfe,</div><div class='add'>+	0x9c, 0x5d, 0x18, 0xff, 0x00, 0x3a, 0x85, 0x27, 0xe2, 0xf5, 0xe9, 0x66,</div><div class='add'>+	0x35, 0xd5, 0x41, 0xac, 0x53, 0x24, 0x2c, 0x18, 0xec, 0x3b, 0x04, 0xba,</div><div class='add'>+	0xea, 0xdf, 0x47, 0x13, 0x15, 0x9d, 0xd7, 0x99, 0x6e, 0x61, 0xb1, 0xc5,</div><div class='add'>+	0x6b, 0x58, 0xce, 0xbc, 0x46, 0xa2, 0x9b, 0x49, 0xd8, 0xe5, 0x9e, 0x3d,</div><div class='add'>+	0x7e, 0xbd, 0xf8, 0xf8, 0x10, 0xe3, 0xda, 0x0d, 0x99, 0x42, 0xbf, 0x50,</div><div class='add'>+	0xdb, 0x94, 0x83, 0xbe, 0x59, 0xae, 0x4d, 0xa7, 0xf9, 0xde, 0x23, 0xef,</div><div class='add'>+	0xeb, 0x5a, 0xa8, 0x1f, 0x1f, 0xd7, 0xb5, 0xe7, 0xb0, 0xf6, 0x2d, 0xf6,</div><div class='add'>+	0xab, 0x90, 0x75, 0xe0, 0x23, 0xbe, 0x41, 0x6f, 0xcd, 0x55, 0xb3, 0xfc,</div><div class='add'>+	0xcd, 0xa3, 0x35, 0x21, 0xa0, 0x16, 0x3f, 0x4e, 0x6f, 0xcf, 0x3d, 0x4b,</div><div class='add'>+	0xbf, 0x9c, 0x65, 0xdd, 0x31, 0x68, 0x14, 0xfa, 0x74, 0x94, 0xe4, 0xec,</div><div class='add'>+	0x69, 0x1a, 0x50, 0xaf, 0xfb, 0xb5, 0x8d, 0x9e, 0xf3, 0x6b, 0x3a, 0x33,</div><div class='add'>+	0x4b, 0xc5, 0xc6, 0x40, 0xea, 0x1a, 0xfa, 0xca, 0x93, 0xba, 0xb6, 0x8e,</div><div class='add'>+	0xdc, 0xa3, 0xd0, 0xfc, 0x80, 0xef, 0x6c, 0xb2, 0x35, 0xd8, 0xde, 0x22,</div><div class='add'>+	0x6a, 0x9b, 0xb7, 0x9d, 0xbb, 0xe9, 0x2c, 0xd7, 0x56, 0x81, 0xff, 0x5e,</div><div class='add'>+	0x33, 0x50, 0x63, 0xac, 0xaa, 0xa1, 0x0e, 0x31, 0x70, 0x9d, 0xc1, 0xf1,</div><div class='add'>+	0x07, 0x4f, 0x37, 0x06, 0x9f, 0xb2, 0x1f, 0x7c, 0x67, 0xd9, 0x42, 0xfe,</div><div class='add'>+	0xab, 0xfc, 0x8d, 0x0a, 0xf2, 0x5f, 0x5d, 0xfe, 0x40, 0xeb, 0x65, 0x3f,</div><div class='add'>+	0x6b, 0x80, 0x96, 0x41, 0x3a, 0x33, 0xcf, 0xf2, 0x47, 0xec, 0xf5, 0xed,</div><div class='add'>+	0x34, 0x0d, 0xfe, 0x72, 0x7c, 0x19, 0xa4, 0x5f, 0x2d, 0x15, 0xfd, 0xfb,</div><div class='add'>+	0x6b, 0x1b, 0xb9, 0xd6, 0x11, 0x67, 0x12, 0xf5, 0xfa, 0x77, 0x40, 0x2f,</div><div class='add'>+	0xce, 0x1e, 0xda, 0x8d, 0xa7, 0x0a, 0x9b, 0xdc, 0x72, 0x9e, 0x23, 0x07,</div><div class='add'>+	0x79, 0xce, 0xde, 0x2d, 0xe6, 0x39, 0x7b, 0xb7, 0x92, 0xe7, 0xc8, 0x9d,</div><div class='add'>+	0xe0, 0xab, 0xd6, 0xbb, 0x65, 0xdc, 0xa4, 0x00, 0xb7, 0x03, 0x5b, 0xc4,</div><div class='add'>+	0xed, 0xc0, 0x56, 0x70, 0x93, 0x3a, 0xcd, 0xbf, 0x40, 0x8c, 0x35, 0x10,</div><div class='add'>+	0xdb, 0xe0, 0xd7, 0x86, 0xfa, 0x59, 0x7f, 0x80, 0xa3, 0x8f, 0xeb, 0xef,</div><div class='add'>+	0x8b, 0xa7, 0x18, 0xe0, 0xf9, 0xd8, 0x16, 0xf1, 0x7c, 0x6c, 0x2b, 0x78,</div><div class='add'>+	0x8a, 0x9d, 0x26, 0xe3, 0x28, 0xc3, 0xd7, 0x70, 0x6d, 0x83, 0xd8, 0x3c,</div><div class='add'>+	0x24, 0x87, 0xba, 0x2e, 0x87, 0x75, 0x0e, 0x03, 0x7c, 0x50, 0xaf, 0x46,</div><div class='add'>+	0x4b, 0x4c, 0xcb, 0x46, 0xdf, 0x9d, 0x3a, 0x4b, 0x32, 0x5b, 0xa5, 0x4a,</div><div class='add'>+	0x83, 0xef, 0x95, 0xfb, 0xb0, 0x0f, 0xf7, 0xf1, 0x37, 0x2a, 0x8b, 0x64,</div><div class='add'>+	0xc4, 0xf7, 0xe7, 0x9a, 0x77, 0xa7, 0xf5, 0x2a, 0x68, 0x9d, 0x0a, 0x69,</div><div class='add'>+	0xad, 0xf8, 0xb9, 0xe0, 0xbe, 0x4d, 0xb9, 0x60, 0x40, 0xe3, 0x08, 0x68,</div><div class='add'>+	0x2c, 0x86, 0x34, 0x3e, 0xdd, 0x60, 0xda, 0xf6, 0xf9, 0xb4, 0x2d, 0x6d,</div><div class='add'>+	0xa2, 0x6d, 0xe4, 0x9e, 0xf9, 0x1f, 0xe3, 0x81, 0x5a, 0x1a, 0xb9, 0xd7,</div><div class='add'>+	0x6b, 0x4d, 0xd4, 0xd2, 0x4d, 0xd4, 0xd2, 0xd0, 0xf7, 0x57, 0x9b, 0xa8,</div><div class='add'>+	0xa5, 0x9b, 0xa8, 0xa5, 0x61, 0x07, 0xaf, 0xc0, 0x56, 0x82, 0x3b, 0xdc,</div><div class='add'>+	0x12, 0x71, 0x0d, 0xee, 0xd7, 0xe3, 0x14, 0xe4, 0x39, 0x05, 0xc4, 0xf0,</div><div class='add'>+	0xa3, 0xc8, 0xf1, 0xd8, 0x6e, 0x4f, 0x13, 0xc7, 0x04, 0x3d, 0x87, 0x9a,</div><div class='add'>+	0x2f, 0x5b, 0x25, 0x33, 0x5e, 0x9c, 0x1f, 0x50, 0x97, 0x02, 0xfb, 0xd6,</div><div class='add'>+	0x5a, 0xc4, 0x71, 0x70, 0x20, 0x85, 0x08, 0xa9, 0xb2, 0x5f, 0xb0, 0x73,</div><div class='add'>+	0x4c, 0xe7, 0x76, 0xf0, 0x10, 0xbe, 0xdb, 0x60, 0x1f, 0xc6, 0xbe, 0xb4,</div><div class='add'>+	0x4e, 0x0b, 0x8d, 0xf0, 0x1b, 0x9a, 0xcc, 0xfd, 0xfc, 0xce, 0x31, 0xb7,</div><div class='add'>+	0xcf, 0xf7, 0x69, 0x76, 0xb6, 0x0f, 0x71, 0x80, 0xfb, 0x15, 0xf8, 0x35,</div><div class='add'>+	0xe8, 0xca, 0x52, 0x1b, 0x17, 0x19, 0xeb, 0x55, 0xaa, 0xcf, 0x07, 0x31,</div><div class='add'>+	0x7c, 0xca, 0xe0, 0x38, 0x87, 0xf8, 0xbe, 0xc4, 0xdf, 0xb0, 0x10, 0xeb,</div><div class='add'>+	0x97, 0xae, 0x68, 0x32, 0x6a, 0xc7, 0x3a, 0x7f, 0xa3, 0x1d, 0xec, 0xc3,</div><div class='add'>+	0xf9, 0x1d, 0xfe, 0x1d, 0xed, 0x51, 0xff, 0xae, 0xcd, 0xa0, 0x23, 0xad,</div><div class='add'>+	0x80, 0x16, 0xdb, 0xc8, 0xd0, 0xc8, 0x2c, 0xdf, 0x35, 0x51, 0x8f, 0x68,</div><div class='add'>+	0xca, 0x54, 0x75, 0xf8, 0x7e, 0x68, 0xe3, 0xbb, 0x49, 0x76, 0x91, 0xeb,</div><div class='add'>+	0x4f, 0x23, 0xb8, 0xff, 0x3c, 0xed, 0xbc, 0xc9, 0xf7, 0x9f, 0xe1, 0x3a,</div><div class='add'>+	0x8d, 0xde, 0x70, 0x33, 0x34, 0x8e, 0xf8, 0x5a, 0x6c, 0x68, 0xf0, 0x6f,</div><div class='add'>+	0xbe, 0x3c, 0x39, 0xa7, 0xad, 0xc6, 0x42, 0x99, 0x8e, 0x84, 0x32, 0xad,</div><div class='add'>+	0x34, 0xd6, 0x80, 0xdf, 0x0d, 0xef, 0x8f, 0x43, 0x99, 0xee, 0x3a, 0x47,</div><div class='add'>+	0xda, 0xd5, 0x1c, 0xcb, 0x95, 0x65, 0x19, 0xc8, 0x75, 0x7c, 0xb1, 0x24,</div><div class='add'>+	0x14, 0x21, 0xd3, 0x51, 0x5f, 0xa6, 0x32, 0xc7, 0x05, 0xec, 0x95, 0x83,</div><div class='add'>+	0xfc, 0xd9, 0x8f, 0xe1, 0xe9, 0xb0, 0x8c, 0xb9, 0xde, 0xe0, 0x58, 0x98,</div><div class='add'>+	0xa4, 0x4b, 0x9b, 0xe4, 0x5c, 0xbc, 0xa7, 0x0e, 0xe7, 0xa9, 0xff, 0x9c,</div><div class='add'>+	0x16, 0xde, 0x9b, 0x66, 0x21, 0xc7, 0x76, 0x2e, 0xf6, 0x23, 0x81, 0x8c,</div><div class='add'>+	0xf6, 0x9d, 0x6e, 0xbb, 0xef, 0xe5, 0x4d, 0x7d, 0xed, 0x67, 0x9b, 0x56,</div><div class='add'>+	0xc4, 0xb7, 0x0d, 0xde, 0xf3, 0x1d, 0xe4, 0x9d, 0x7e, 0xc9, 0x1f, 0x53,</div><div class='add'>+	0x31, 0xd6, 0x4b, 0x85, 0x25, 0x83, 0xac, 0x16, 0xcf, 0x91, 0x49, 0x34,</div><div class='add'>+	0xda, 0x72, 0xea, 0xa4, 0xf5, 0x30, 0xc6, 0x2d, 0x34, 0x3c, 0xef, 0xa7,</div><div class='add'>+	0xd0, 0x9d, 0x8b, 0x5c, 0x77, 0x3b, 0xbf, 0xf1, 0xd6, 0x93, 0xc8, 0x21,</div><div class='add'>+	0x37, 0xce, 0xfc, 0xe6, 0xfd, 0xd4, 0xa5, 0xab, 0x88, 0x09, 0x74, 0xc6,</div><div class='add'>+	0x09, 0x51, 0x22, 0x1e, 0xe7, 0x3e, 0xfe, 0x06, 0xef, 0x79, 0x17, 0x8d,</div><div class='add'>+	0x3b, 0x78, 0x75, 0x99, 0xc7, 0x69, 0xdf, 0x39, 0xf6, 0xff, 0x3f, 0xd0,</div><div class='add'>+	0x2e, 0x1a, 0xd6, 0x9e, 0x38, 0xf2, 0xe7, 0xeb, 0xc4, 0xb1, 0x4f, 0x4e,</div><div class='add'>+	0x14, 0x9b, 0xba, 0x7a, 0x09, 0x6b, 0x8b, 0x8e, 0xc2, 0xdf, 0xd6, 0xf9,</div><div class='add'>+	0xfb, 0xa8, 0x76, 0x89, 0xda, 0xf7, 0x65, 0x90, 0xa7, 0xa3, 0xf2, 0x77,</div><div class='add'>+	0x52, 0xb5, 0x8a, 0xd8, 0x52, 0x70, 0x92, 0x98, 0xaf, 0x62, 0x2e, 0xc7,</div><div class='add'>+	0x05, 0x8f, 0x14, 0xd8, 0x50, 0xc1, 0x49, 0x27, 0xc6, 0x9a, 0x9e, 0xa7,</div><div class='add'>+	0x7c, 0x5e, 0xa0, 0x87, 0x32, 0x29, 0x1a, 0x73, 0xf8, 0xfe, 0xf7, 0x9b,</div><div class='add'>+	0xf4, 0x36, 0xec, 0xac, 0x78, 0x9e, 0x6b, 0x26, 0xf6, 0x29, 0x78, 0x77,</div><div class='add'>+	0xf8, 0xbe, 0xea, 0x14, 0x3d, 0xb4, 0x47, 0xcf, 0x5e, 0x22, 0xe0, 0xb3,</div><div class='add'>+	0x42, 0xfd, 0x48, 0x72, 0x53, 0xc7, 0xfd, 0xef, 0x6d, 0x8c, 0x6b, 0x9a,</div><div class='add'>+	0x96, 0xc0, 0x1b, 0xa7, 0x99, 0xa4, 0x95, 0x66, 0x8a, 0x56, 0xa1, 0x1f,</div><div class='add'>+	0xdb, 0xcc, 0x32, 0x7d, 0x03, 0x78, 0x2b, 0x66, 0x95, 0x94, 0x8c, 0xb5,</div><div class='add'>+	0xaf, 0x0b, 0x78, 0x67, 0x05, 0x3d, 0x15, 0x17, 0x18, 0x77, 0x5d, 0x2d,</div><div class='add'>+	0x03, 0x6f, 0xd6, 0xd1, 0x51, 0xa7, 0x9b, 0x8e, 0x61, 0xed, 0x7e, 0xe4,</div><div class='add'>+	0x1f, 0xdf, 0x72, 0xa8, 0x2c, 0x99, 0x29, 0x3a, 0x80, 0xf3, 0x8e, 0x36,</div><div class='add'>+	0x38, 0x57, 0x3b, 0x02, 0x5f, 0x23, 0xd0, 0xa3, 0x19, 0x8f, 0x1e, 0xdd,</div><div class='add'>+	0xa3, 0x5b, 0x71, 0x01, 0x7b, 0xae, 0xb0, 0x9e, 0xa0, 0xdf, 0x09, 0xce,</div><div class='add'>+	0x8d, 0xad, 0xf8, 0xba, 0x08, 0x7f, 0xfa, 0x0c, 0x65, 0xce, 0xad, 0xe5,</div><div class='add'>+	0xa6, 0x90, 0x9f, 0x8f, 0x36, 0xe9, 0x8b, 0x31, 0x9c, 0xf7, 0x36, 0xf8,</div><div class='add'>+	0x34, 0xea, 0xc8, 0x02, 0xf3, 0xe9, 0x58, 0xc0, 0x27, 0x8c, 0xf1, 0xb7,</div><div class='add'>+	0x23, 0xce, 0xd1, 0xf8, 0xec, 0x13, 0x74, 0xb6, 0xc1, 0x77, 0xdd, 0x27,</div><div class='add'>+	0xe8, 0x4a, 0xe3, 0x11, 0xba, 0x98, 0xe3, 0x5c, 0x07, 0xfb, 0xf8, 0x67,</div><div class='add'>+	0xa0, 0xcf, 0x3f, 0xa3, 0x9b, 0x8e, 0xfb, 0x72, 0xfa, 0x3f, 0xc3, 0x06,</div><div class='add'>+	0xd0, 0x70, 0x4c, 0x57, 0x00, 0x00, 0x00 };</div><div class='ctx'> </div><div class='ctx'> static u32 bnx2_TXP_b06FwData[(0x0/4) + 1] = { 0x0 };</div><div class='ctx'> static u32 bnx2_TXP_b06FwRodata[(0x0/4) + 1] = { 0x0 };</div><div class='head'>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c<br/>index 55d236726d11..8b951238f3a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bonding/bond_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/bonding/bond_main.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> //#define BONDING_DEBUG 1</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -1199,8 +1198,7 @@ int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BOND_INTERSECT_FEATURES \</div><div class='del'>-	(NETIF_F_SG|NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM|\</div><div class='del'>-	NETIF_F_TSO|NETIF_F_UFO)</div><div class='add'>+	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_TSO | NETIF_F_UFO)</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * Compute the common dev-&gt;feature set available to all slaves.  Some</div><div class='hunk'>@@ -1218,9 +1216,7 @@ static int bond_compute_features(struct bonding *bond)</div><div class='ctx'> 		features &amp;= (slave-&gt;dev-&gt;features &amp; BOND_INTERSECT_FEATURES);</div><div class='ctx'> </div><div class='ctx'> 	if ((features &amp; NETIF_F_SG) &amp;&amp; </div><div class='del'>-	    !(features &amp; (NETIF_F_IP_CSUM |</div><div class='del'>-			  NETIF_F_NO_CSUM |</div><div class='del'>-			  NETIF_F_HW_CSUM)))</div><div class='add'>+	    !(features &amp; NETIF_F_ALL_CSUM))</div><div class='ctx'> 		features &amp;= ~NETIF_F_SG;</div><div class='ctx'> </div><div class='ctx'> 	/* </div><div class='hunk'>@@ -4191,7 +4187,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)</div><div class='ctx'> 	 */</div><div class='ctx'> 	bond_dev-&gt;features |= NETIF_F_VLAN_CHALLENGED;</div><div class='ctx'> </div><div class='del'>-	/* don't acquire bond device's xmit_lock when </div><div class='add'>+	/* don't acquire bond device's netif_tx_lock when</div><div class='ctx'> 	 * transmitting */</div><div class='ctx'> 	bond_dev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c<br/>index 5a9bd95884be..cfe4dc3a93a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/bonding/bond_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/bonding/bond_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/bonding/bond_sysfs.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * file called LICENSE.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c<br/>index ac48f7543500..a31544ccb3c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cassini.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cassini.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cassini.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/cassini.c</a></div><div class='hunk'>@@ -66,7 +66,6 @@</div><div class='ctx'>  * by default, the selective clear mask is set up to process rx packets.  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -2915,8 +2914,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	static int ring; </div><div class='ctx'> </div><div class='del'>-	skb = skb_padto(skb, cp-&gt;min_frame_size);</div><div class='del'>-	if (!skb)</div><div class='add'>+	if (skb_padto(skb, cp-&gt;min_frame_size))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: we need some higher-level QoS hooks to steer packets to</div><div class='hunk'>@@ -4351,7 +4349,7 @@ static int cas_open(struct net_device *dev)</div><div class='ctx'> 	 * mapping to expose them</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (request_irq(cp-&gt;pdev-&gt;irq, cas_interrupt,</div><div class='del'>-			SA_SHIRQ, dev-&gt;name, (void *) dev)) {</div><div class='add'>+			IRQF_SHARED, dev-&gt;name, (void *) dev)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: failed to request irq !\n", </div><div class='ctx'> 		       cp-&gt;dev-&gt;name);</div><div class='ctx'> 		err = -EAGAIN;</div><div class='hunk'>@@ -4877,7 +4875,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 				  const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	static int cas_version_printed = 0;</div><div class='del'>-	unsigned long casreg_base, casreg_len;</div><div class='add'>+	unsigned long casreg_len;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct cas *cp;</div><div class='ctx'> 	int i, err, pci_using_dac;</div><div class='hunk'>@@ -4889,13 +4887,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot enable PCI device, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot enable PCI device, aborting.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find proper PCI device "</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot find proper PCI device "</div><div class='ctx'> 		       "base address, aborting.\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out_disable_pdev;</div><div class='hunk'>@@ -4903,7 +4900,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*cp));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Etherdev alloc failed, aborting.\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_disable_pdev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4912,8 +4909,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, dev-&gt;name);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot obtain PCI resources, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot obtain PCI resources, aborting.\n");</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='hunk'>@@ -4943,7 +4939,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		if (pci_write_config_byte(pdev, </div><div class='ctx'> 					  PCI_CACHE_LINE_SIZE, </div><div class='ctx'> 					  cas_cacheline_size)) {</div><div class='del'>-			printk(KERN_ERR PFX "Could not set PCI cache "</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Could not set PCI cache "</div><div class='ctx'> 			       "line size\n");</div><div class='ctx'> 			goto err_write_cacheline;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4957,7 +4953,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		err = pci_set_consistent_dma_mask(pdev,</div><div class='ctx'> 						  DMA_64BIT_MASK);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_ERR PFX "Unable to obtain 64-bit DMA "</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Unable to obtain 64-bit DMA "</div><div class='ctx'> 			       "for consistent allocations\n");</div><div class='ctx'> 			goto err_out_free_res;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4965,14 +4961,13 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR PFX "No usable DMA configuration, "</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration, "</div><div class='ctx'> 			       "aborting.\n");</div><div class='ctx'> 			goto err_out_free_res;</div><div class='ctx'> 		}</div><div class='ctx'> 		pci_using_dac = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	casreg_base = pci_resource_start(pdev, 0);</div><div class='ctx'> 	casreg_len = pci_resource_len(pdev, 0);</div><div class='ctx'> </div><div class='ctx'> 	cp = netdev_priv(dev);</div><div class='hunk'>@@ -5024,10 +5019,9 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	cp-&gt;timer_ticks = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* give us access to cassini registers */</div><div class='del'>-	cp-&gt;regs = ioremap(casreg_base, casreg_len);</div><div class='add'>+	cp-&gt;regs = pci_iomap(pdev, 0, casreg_len);</div><div class='ctx'> 	if (cp-&gt;regs == 0UL) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map device registers, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot map device registers, aborting.\n");</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	cp-&gt;casreg_len = casreg_len;</div><div class='hunk'>@@ -5043,8 +5037,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		pci_alloc_consistent(pdev, sizeof(struct cas_init_block),</div><div class='ctx'> 				     &amp;cp-&gt;block_dvma);</div><div class='ctx'> 	if (!cp-&gt;init_block) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot allocate init block, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot allocate init block, aborting.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5088,8 +5081,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 	if (register_netdev(dev)) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot register net device, "</div><div class='del'>-		       "aborting.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot register net device, aborting.\n");</div><div class='ctx'> 		goto err_out_free_consistent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5123,7 +5115,7 @@ err_out_iounmap:</div><div class='ctx'> 		cas_shutdown(cp);</div><div class='ctx'> 	mutex_unlock(&amp;cp-&gt;pm_mutex);</div><div class='ctx'> </div><div class='del'>-	iounmap(cp-&gt;regs);</div><div class='add'>+	pci_iounmap(pdev, cp-&gt;regs);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> err_out_free_res:</div><div class='hunk'>@@ -5171,7 +5163,7 @@ static void __devexit cas_remove_one(struct pci_dev *pdev)</div><div class='ctx'> #endif</div><div class='ctx'> 	pci_free_consistent(pdev, sizeof(struct cas_init_block),</div><div class='ctx'> 			    cp-&gt;init_block, cp-&gt;block_dvma);</div><div class='del'>-	iounmap(cp-&gt;regs);</div><div class='add'>+	pci_iounmap(pdev, cp-&gt;regs);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='head'>diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h<br/>index bf3e7b6a7a18..5d9dd14427c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/chelsio/common.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/chelsio/common.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/chelsio/common.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/chelsio/common.h</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #ifndef _CXGB_COMMON_H_</div><div class='ctx'> #define _CXGB_COMMON_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c<br/>index 7fe2638ae06d..e67872433e92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/chelsio/cxgb2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/chelsio/cxgb2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/chelsio/cxgb2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/chelsio/cxgb2.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -219,7 +218,7 @@ static int cxgb_up(struct adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	t1_interrupts_clear(adapter);</div><div class='ctx'> 	if ((err = request_irq(adapter-&gt;pdev-&gt;irq,</div><div class='del'>-			       t1_select_intr_handler(adapter), SA_SHIRQ,</div><div class='add'>+			       t1_select_intr_handler(adapter), IRQF_SHARED,</div><div class='ctx'> 			       adapter-&gt;name, adapter))) {</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c<br/>index 4391bf4bf573..61b3754f50ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/chelsio/sge.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/chelsio/sge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/chelsio/sge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/chelsio/sge.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "common.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -1418,7 +1417,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct cpl_tx_pkt *cpl;</div><div class='ctx'> </div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='del'>-	if (skb_shinfo(skb)-&gt;tso_size) {</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='ctx'> 		int eth_type;</div><div class='ctx'> 		struct cpl_tx_pkt_lso *hdr;</div><div class='ctx'> </div><div class='hunk'>@@ -1433,7 +1432,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		hdr-&gt;ip_hdr_words = skb-&gt;nh.iph-&gt;ihl;</div><div class='ctx'> 		hdr-&gt;tcp_hdr_words = skb-&gt;h.th-&gt;doff;</div><div class='ctx'> 		hdr-&gt;eth_type_mss = htons(MK_ETH_TYPE_MSS(eth_type,</div><div class='del'>-						skb_shinfo(skb)-&gt;tso_size));</div><div class='add'>+						skb_shinfo(skb)-&gt;gso_size));</div><div class='ctx'> 		hdr-&gt;len = htonl(skb-&gt;len - sizeof(*hdr));</div><div class='ctx'> 		cpl = (struct cpl_tx_pkt *)hdr;</div><div class='ctx'> 		sge-&gt;stats.tx_lso_pkts++;</div><div class='head'>diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c<br/>index 64105e4eaf31..0eb1f8787ed7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cris/eth_v10.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cris/eth_v10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cris/eth_v10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/cris/eth_v10.c</a></div><div class='hunk'>@@ -218,7 +218,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -672,7 +671,7 @@ e100_open(struct net_device *dev)</div><div class='ctx'> 	/* allocate the irq corresponding to the receiving DMA */</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,</div><div class='del'>-			SA_SAMPLE_RANDOM, cardname, (void *)dev)) {</div><div class='add'>+			IRQF_SAMPLE_RANDOM, cardname, (void *)dev)) {</div><div class='ctx'> 		goto grace_exit0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c<br/>index ef54ebeb29b8..47eecce35fa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cs89x0.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cs89x0.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cs89x0.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/cs89x0.c</a></div><div class='hunk'>@@ -100,7 +100,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Always include 'config.h' first in case the user wants to turn on</div><div class='ctx'>    or override something. */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h<br/>index bd954aaa636f..968fe11a0bf0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/cs89x0.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/cs89x0.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/cs89x0.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/cs89x0.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>    */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PP_ChipID 0x0000	/* offset   0h -&gt; Corp -ID              */</div><div class='ctx'> 				/* offset   2h -&gt; Model/Product Number  */</div><div class='head'>diff --git a/drivers/net/declance.c b/drivers/net/declance.c<br/>index f130bdab3fd3..6ad5796121c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/declance.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/declance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/declance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/declance.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  *              bits. macro</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -704,8 +703,8 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id,</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t</div><div class='del'>-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+static irqreturn_t lance_interrupt(const int irq, void *dev_id,</div><div class='add'>+				   struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = (struct net_device *) dev_id;</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -885,8 +884,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	len = skblen;</div><div class='ctx'> 	</div><div class='ctx'> 	if (len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		len = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1255,7 +1253,7 @@ static int __init dec_lance_init(const int type, const int slot)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_free_dev:</div><div class='del'>-	kfree(dev);</div><div class='add'>+	free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1301,6 +1299,7 @@ static void __exit dec_lance_cleanup(void)</div><div class='ctx'> 	while (root_lance_dev) {</div><div class='ctx'> 		struct net_device *dev = root_lance_dev;</div><div class='ctx'> 		struct lance_private *lp = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> #ifdef CONFIG_TC</div><div class='ctx'> 		if (lp-&gt;slot &gt;= 0)</div><div class='head'>diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c<br/>index 5acd35c312ac..91cc8cbdd440 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/defxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/defxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/defxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/defxx.c</a></div><div class='hunk'>@@ -1228,7 +1228,7 @@ static int dfx_open(struct net_device *dev)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Register IRQ - support shared interrupts by passing device ptr */</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, dfx_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	ret = request_irq(dev-&gt;irq, dfx_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		return ret;</div><div class='head'>diff --git a/drivers/net/depca.c b/drivers/net/depca.c<br/>index 0941d40f046f..b1cbe99249c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/depca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/depca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/depca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/depca.c</a></div><div class='hunk'>@@ -235,7 +235,6 @@</div><div class='ctx'>     =========================================================================</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -938,11 +937,8 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (skb-&gt;len &lt; 1)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	if (skb_padto(skb, ETH_ZLEN))</div><div class='add'>+		goto out;</div><div class='ctx'> 	</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c<br/>index e175d4876682..fa4f09432975 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dgrs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dgrs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dgrs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/dgrs.c</a></div><div class='hunk'>@@ -1191,7 +1191,7 @@ dgrs_probe1(struct net_device *dev)</div><div class='ctx'> 	if (priv-&gt;plxreg)</div><div class='ctx'> 		OUTL(dev-&gt;base_addr + PLX_LCL2PCI_DOORBELL, 1);</div><div class='ctx'> 	</div><div class='del'>-	rc = request_irq(dev-&gt;irq, &amp;dgrs_intr, SA_SHIRQ, "RightSwitch", dev);</div><div class='add'>+	rc = request_irq(dev-&gt;irq, &amp;dgrs_intr, IRQF_SHARED, "RightSwitch", dev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c<br/>index 038447fb5c5e..402961e68c89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dl2k.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dl2k.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dl2k.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/dl2k.c</a></div><div class='hunk'>@@ -9,49 +9,10 @@</div><div class='ctx'>     the Free Software Foundation; either version 2 of the License, or</div><div class='ctx'>     (at your option) any later version.</div><div class='ctx'> */</div><div class='del'>-/*</div><div class='del'>-    Rev		Date		Description</div><div class='del'>-    ==========================================================================</div><div class='del'>-    0.01	2001/05/03	Created DL2000-based linux driver</div><div class='del'>-    0.02	2001/05/21	Added VLAN and hardware checksum support.</div><div class='del'>-    1.00	2001/06/26	Added jumbo frame support.</div><div class='del'>-    1.01	2001/08/21	Added two parameters, rx_coalesce and rx_timeout.</div><div class='del'>-    1.02	2001/10/08	Supported fiber media.</div><div class='del'>-    				Added flow control parameters.</div><div class='del'>-    1.03	2001/10/12	Changed the default media to 1000mbps_fd for </div><div class='del'>-    				the fiber devices.</div><div class='del'>-    1.04	2001/11/08	Fixed Tx stopped when tx very busy.</div><div class='del'>-    1.05	2001/11/22	Fixed Tx stopped when unidirectional tx busy.</div><div class='del'>-    1.06	2001/12/13	Fixed disconnect bug at 10Mbps mode.</div><div class='del'>-    				Fixed tx_full flag incorrect.</div><div class='del'>-				Added tx_coalesce paramter.</div><div class='del'>-    1.07	2002/01/03	Fixed miscount of RX frame error.</div><div class='del'>-    1.08	2002/01/17	Fixed the multicast bug.</div><div class='del'>-    1.09	2002/03/07	Move rx-poll-now to re-fill loop.	</div><div class='del'>-    				Added rio_timer() to watch rx buffers. </div><div class='del'>-    1.10	2002/04/16	Fixed miscount of carrier error.</div><div class='del'>-    1.11	2002/05/23	Added ISR schedule scheme</div><div class='del'>-    				Fixed miscount of rx frame error for DGE-550SX.</div><div class='del'>-    				Fixed VLAN bug.</div><div class='del'>-    1.12	2002/06/13	Lock tx_coalesce=1 on 10/100Mbps mode.</div><div class='del'>-    1.13	2002/08/13	1. Fix disconnection (many tx:carrier/rx:frame</div><div class='del'>-    				   errs) with some mainboards.</div><div class='del'>-    				2. Use definition "DRV_NAME" "DRV_VERSION" </div><div class='del'>-				   "DRV_RELDATE" for flexibility.	</div><div class='del'>-    1.14	2002/08/14	Support ethtool.	</div><div class='del'>-    1.15	2002/08/27	Changed the default media to Auto-Negotiation</div><div class='del'>-				for the fiber devices.    </div><div class='del'>-    1.16	2002/09/04      More power down time for fiber devices auto-</div><div class='del'>-    				negotiation.</div><div class='del'>-				Fix disconnect bug after ifup and ifdown.</div><div class='del'>-    1.17	2002/10/03	Fix RMON statistics overflow. </div><div class='del'>-			     	Always use I/O mapping to access eeprom, </div><div class='del'>-				avoid system freezing with some chipsets.</div><div class='ctx'> </div><div class='del'>-*/</div><div class='ctx'> #define DRV_NAME	"D-Link DL2000-based linux driver"</div><div class='del'>-#define DRV_VERSION	"v1.17b"</div><div class='del'>-#define DRV_RELDATE	"2006/03/10"</div><div class='add'>+#define DRV_VERSION	"v1.18"</div><div class='add'>+#define DRV_RELDATE	"2006/06/27"</div><div class='ctx'> #include "dl2k.h"</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -390,7 +351,7 @@ parse_eeprom (struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		dev-&gt;dev_addr[i] = psrom-&gt;mac_addr[i];</div><div class='ctx'> </div><div class='del'>-	/* Parse Software Infomation Block */</div><div class='add'>+	/* Parse Software Information Block */</div><div class='ctx'> 	i = 0x30;</div><div class='ctx'> 	psib = (u8 *) sromdata;</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -440,7 +401,7 @@ rio_open (struct net_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 macctrl;</div><div class='ctx'> 	</div><div class='del'>-	i = request_irq (dev-&gt;irq, &amp;rio_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq (dev-&gt;irq, &amp;rio_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return i;</div><div class='ctx'> 	</div><div class='head'>diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h<br/>index 6e75482d75f2..53449207e53b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dl2k.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dl2k.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dl2k.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/dl2k.h</a></div><div class='hunk'>@@ -683,11 +683,6 @@ struct netdev_private {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The station address location in the EEPROM. */</div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)</div><div class='del'>-#else</div><div class='del'>-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO  | PCI_ADDR0)</div><div class='del'>-#endif</div><div class='ctx'> /* The struct pci_device_id consist of:</div><div class='ctx'>         vendor, device          Vendor and device ID to match (or PCI_ANY_ID)</div><div class='ctx'>         subvendor, subdevice    Subsystem vendor and device ID to match (or PCI_ANY_ID)</div><div class='hunk'>@@ -695,9 +690,10 @@ struct netdev_private {</div><div class='ctx'>         class_mask              of the class are honored during the comparison.</div><div class='ctx'>         driver_data             Data private to the driver.</div><div class='ctx'> */</div><div class='del'>-static struct pci_device_id rio_pci_tbl[] = {</div><div class='del'>-	{0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0,}</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id rio_pci_tbl[] = {</div><div class='add'>+	{0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE (pci, rio_pci_tbl);</div><div class='ctx'> #define TX_TIMEOUT  (4*HZ)</div><div class='head'>diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c<br/>index 24996da4c1c4..1b758b707134 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dm9000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dm9000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dm9000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/dm9000.c</a></div><div class='hunk'>@@ -410,10 +410,7 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (pdev-&gt;num_resources &lt; 2) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (pdev-&gt;num_resources) {</div><div class='del'>-	case 2:</div><div class='add'>+	} else if (pdev-&gt;num_resources == 2) {</div><div class='ctx'> 		base = pdev-&gt;resource[0].start;</div><div class='ctx'> </div><div class='ctx'> 		if (!request_mem_region(base, 4, ndev-&gt;name)) {</div><div class='hunk'>@@ -423,17 +420,16 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		ndev-&gt;base_addr = base;</div><div class='ctx'> 		ndev-&gt;irq = pdev-&gt;resource[1].start;</div><div class='del'>-		db-&gt;io_addr = (void *)base;</div><div class='del'>-		db-&gt;io_data = (void *)(base + 4);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='add'>+		db-&gt;io_addr = (void __iomem *)base;</div><div class='add'>+		db-&gt;io_data = (void __iomem *)(base + 4);</div><div class='ctx'> </div><div class='del'>-	case 3:</div><div class='add'>+	} else {</div><div class='ctx'> 		db-&gt;addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 		db-&gt;data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='ctx'> 		db-&gt;irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='ctx'> </div><div class='del'>-		if (db-&gt;addr_res == NULL || db-&gt;data_res == NULL) {</div><div class='add'>+		if (db-&gt;addr_res == NULL || db-&gt;data_res == NULL ||</div><div class='add'>+		    db-&gt;irq_res == NULL) {</div><div class='ctx'> 			printk(KERN_ERR PFX "insufficient resources\n");</div><div class='ctx'> 			ret = -ENOENT;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -482,7 +478,6 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		/* ensure at least we have a default set of IO routines */</div><div class='ctx'> 		dm9000_set_io(db, iosize);</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* check to see if anything is being over-ridden */</div><div class='hunk'>@@ -564,6 +559,13 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		ndev-&gt;dev_addr[i] = db-&gt;srom[i];</div><div class='ctx'> </div><div class='add'>+	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='add'>+		/* try reading from mac */</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 6; i++)</div><div class='add'>+			ndev-&gt;dev_addr[i] = ior(db, i+DM9000_PAR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='ctx'> 		printk("%s: Invalid ethernet MAC address.  Please "</div><div class='ctx'> 		       "set using ifconfig\n", ndev-&gt;name);</div><div class='hunk'>@@ -601,7 +603,7 @@ dm9000_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	PRINTK2("entering dm9000_open\n");</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, &amp;dm9000_interrupt, SA_SHIRQ, dev-&gt;name, dev))</div><div class='add'>+	if (request_irq(dev-&gt;irq, &amp;dm9000_interrupt, IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize DM9000 board */</div><div class='hunk'>@@ -663,7 +665,6 @@ dm9000_init_dm9000(struct net_device *dev)</div><div class='ctx'> 	db-&gt;tx_pkt_cnt = 0;</div><div class='ctx'> 	db-&gt;queue_pkt_len = 0;</div><div class='ctx'> 	dev-&gt;trans_start = 0;</div><div class='del'>-	spin_lock_init(&amp;db-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -767,7 +768,7 @@ dm9000_stop(struct net_device *ndev)</div><div class='ctx'>  * receive the packet to upper layer, free the transmitted packet</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> dm9000_tx_done(struct net_device *dev, board_info_t * db)</div><div class='ctx'> {</div><div class='ctx'> 	int tx_status = ior(db, DM9000_NSR);	/* Got TX status */</div><div class='hunk'>@@ -1187,13 +1188,14 @@ dm9000_drv_remove(struct platform_device *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver dm9000_driver = {</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name    = "dm9000",</div><div class='add'>+		.owner	 = THIS_MODULE,</div><div class='add'>+	},</div><div class='ctx'> 	.probe   = dm9000_probe,</div><div class='ctx'> 	.remove  = dm9000_drv_remove,</div><div class='ctx'> 	.suspend = dm9000_drv_suspend,</div><div class='ctx'> 	.resume  = dm9000_drv_resume,</div><div class='del'>-	.driver	= {</div><div class='del'>-		.name	= "dm9000",</div><div class='del'>-	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='head'>diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c<br/>index dd8c15ac5c77..36d511729f71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/dummy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/dummy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/dummy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/dummy.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> 			Alan Cox, 30th May 1994</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/e100.c b/drivers/net/e100.c<br/>index 31ac001f5517..91ef5f2fd768 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e100.c</a></div><div class='hunk'>@@ -138,7 +138,6 @@</div><div class='ctx'>  *	- Stratus87247: protect MDI control register manipulations</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -2064,7 +2063,7 @@ static int e100_up(struct nic *nic)</div><div class='ctx'> 	e100_set_multicast_list(nic-&gt;netdev);</div><div class='ctx'> 	e100_start_receiver(nic, NULL);</div><div class='ctx'> 	mod_timer(&amp;nic-&gt;watchdog, jiffies);</div><div class='del'>-	if((err = request_irq(nic-&gt;pdev-&gt;irq, e100_intr, SA_SHIRQ,</div><div class='add'>+	if((err = request_irq(nic-&gt;pdev-&gt;irq, e100_intr, IRQF_SHARED,</div><div class='ctx'> 		nic-&gt;netdev-&gt;name, nic-&gt;netdev)))</div><div class='ctx'> 		goto err_no_irq;</div><div class='ctx'> 	netif_wake_queue(nic-&gt;netdev);</div><div class='hunk'>@@ -2678,9 +2677,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DPRINTK(PROBE, INFO, "addr 0x%lx, irq %d, "</div><div class='add'>+	DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "</div><div class='ctx'> 		"MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='del'>-		pci_resource_start(pdev, 0), pdev-&gt;irq,</div><div class='add'>+		(unsigned long long)pci_resource_start(pdev, 0), pdev-&gt;irq,</div><div class='ctx'> 		netdev-&gt;dev_addr[0], netdev-&gt;dev_addr[1], netdev-&gt;dev_addr[2],</div><div class='ctx'> 		netdev-&gt;dev_addr[3], netdev-&gt;dev_addr[4], netdev-&gt;dev_addr[5]);</div><div class='ctx'> </div><div class='hunk'>@@ -2780,6 +2779,80 @@ static void e100_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 		DPRINTK(PROBE,ERR, "Error enabling wake\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* ------------------ PCI Error Recovery infrastructure  -------------- */</div><div class='add'>+/**</div><div class='add'>+ * e100_io_error_detected - called when PCI error is detected.</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ * @state: The current pci conneection state</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/* Similar to calling e100_down(), but avoids adpater I/O. */</div><div class='add'>+	netdev-&gt;stop(netdev);</div><div class='add'>+</div><div class='add'>+	/* Detach; put netif into state similar to hotplug unplug. */</div><div class='add'>+	netif_poll_enable(netdev);</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+</div><div class='add'>+	/* Request a slot reset. */</div><div class='add'>+	return PCI_ERS_RESULT_NEED_RESET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e100_io_slot_reset - called after the pci bus has been reset.</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ *</div><div class='add'>+ * Restart the card from scratch.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t e100_io_slot_reset(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct nic *nic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		printk(KERN_ERR "e100: Cannot re-enable PCI device after reset.\n");</div><div class='add'>+		return PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	/* Only one device per card can do a reset */</div><div class='add'>+	if (0 != PCI_FUNC(pdev-&gt;devfn))</div><div class='add'>+		return PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+	e100_hw_reset(nic);</div><div class='add'>+	e100_phy_init(nic);</div><div class='add'>+</div><div class='add'>+	return PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e100_io_resume - resume normal operations</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ *</div><div class='add'>+ * Resume normal operations after an error recovery</div><div class='add'>+ * sequence has been completed.</div><div class='add'>+ */</div><div class='add'>+static void e100_io_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct nic *nic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* ack any pending wake events, disable PME */</div><div class='add'>+	pci_enable_wake(pdev, 0, 0);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(netdev);</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		e100_open(netdev);</div><div class='add'>+		mod_timer(&amp;nic-&gt;watchdog, jiffies);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_error_handlers e100_err_handler = {</div><div class='add'>+	.error_detected = e100_io_error_detected,</div><div class='add'>+	.slot_reset = e100_io_slot_reset,</div><div class='add'>+	.resume = e100_io_resume,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver e100_driver = {</div><div class='ctx'> 	.name =         DRV_NAME,</div><div class='hunk'>@@ -2791,6 +2864,7 @@ static struct pci_driver e100_driver = {</div><div class='ctx'> 	.resume =       e100_resume,</div><div class='ctx'> #endif</div><div class='ctx'> 	.shutdown =     e100_shutdown,</div><div class='add'>+	.err_handler = &amp;e100_err_handler,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init e100_init_module(void)</div><div class='head'>diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile<br/>index ca9f89552da3..5dea2b7dea4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> ################################################################################</div><div class='ctx'> #</div><div class='ctx'> # </div><div class='del'>-# Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.</div><div class='add'>+# Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'> # </div><div class='ctx'> # This program is free software; you can redistribute it and/or modify it </div><div class='ctx'> # under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> # </div><div class='ctx'> # Contact Information:</div><div class='ctx'> # Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+# e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'> # Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> #</div><div class='ctx'> ################################################################################</div><div class='head'>diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h<br/>index 281de41d030a..f411bbb44f86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='hunk'>@@ -33,7 +34,6 @@</div><div class='ctx'> #define _E1000_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='hunk'>@@ -68,7 +68,6 @@</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='hunk'>@@ -114,6 +113,8 @@ struct e1000_adapter;</div><div class='ctx'> /* Supported Rx Buffer Sizes */</div><div class='ctx'> #define E1000_RXBUFFER_128   128    /* Used for packet split */</div><div class='ctx'> #define E1000_RXBUFFER_256   256    /* Used for packet split */</div><div class='add'>+#define E1000_RXBUFFER_512   512</div><div class='add'>+#define E1000_RXBUFFER_1024  1024</div><div class='ctx'> #define E1000_RXBUFFER_2048  2048</div><div class='ctx'> #define E1000_RXBUFFER_4096  4096</div><div class='ctx'> #define E1000_RXBUFFER_8192  8192</div><div class='hunk'>@@ -141,6 +142,7 @@ struct e1000_adapter;</div><div class='ctx'> </div><div class='ctx'> #define AUTO_ALL_MODES            0</div><div class='ctx'> #define E1000_EEPROM_82544_APM    0x0004</div><div class='add'>+#define E1000_EEPROM_ICH8_APME    0x0004</div><div class='ctx'> #define E1000_EEPROM_APME         0x0400</div><div class='ctx'> </div><div class='ctx'> #ifndef E1000_MASTER_SLAVE</div><div class='hunk'>@@ -252,7 +254,6 @@ struct e1000_adapter {</div><div class='ctx'> 	spinlock_t tx_queue_lock;</div><div class='ctx'> #endif</div><div class='ctx'> 	atomic_t irq_sem;</div><div class='del'>-	struct work_struct watchdog_task;</div><div class='ctx'> 	struct work_struct reset_task;</div><div class='ctx'> 	uint8_t fc_autoneg;</div><div class='ctx'> </div><div class='hunk'>@@ -334,12 +335,17 @@ struct e1000_adapter {</div><div class='ctx'> 	boolean_t have_msi;</div><div class='ctx'> #endif</div><div class='ctx'> 	/* to not mess up cache alignment, always add to the bottom */</div><div class='del'>-	boolean_t txb2b;</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='ctx'> 	boolean_t tso_force;</div><div class='ctx'> #endif</div><div class='add'>+	boolean_t smart_power_down;	/* phy smart power down */</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum e1000_state_t {</div><div class='add'>+	__E1000_DRIVER_TESTING,</div><div class='add'>+	__E1000_RESETTING,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*  e1000_main.c  */</div><div class='ctx'> extern char e1000_driver_name[];</div><div class='hunk'>@@ -347,6 +353,7 @@ extern char e1000_driver_version[];</div><div class='ctx'> int e1000_up(struct e1000_adapter *adapter);</div><div class='ctx'> void e1000_down(struct e1000_adapter *adapter);</div><div class='ctx'> void e1000_reset(struct e1000_adapter *adapter);</div><div class='add'>+void e1000_reinit_locked(struct e1000_adapter *adapter);</div><div class='ctx'> int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);</div><div class='ctx'> void e1000_free_all_tx_resources(struct e1000_adapter *adapter);</div><div class='ctx'> int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);</div><div class='head'>diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c<br/>index ecccca35c6f4..88a82ba88f57 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_ethtool.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000_ethtool.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='hunk'>@@ -108,7 +109,8 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		                   SUPPORTED_1000baseT_Full|</div><div class='ctx'> 		                   SUPPORTED_Autoneg |</div><div class='ctx'> 		                   SUPPORTED_TP);</div><div class='del'>-</div><div class='add'>+		if (hw-&gt;phy_type == e1000_phy_ife)</div><div class='add'>+			ecmd-&gt;supported &amp;= ~SUPPORTED_1000baseT_Full;</div><div class='ctx'> 		ecmd-&gt;advertising = ADVERTISED_TP;</div><div class='ctx'> </div><div class='ctx'> 		if (hw-&gt;autoneg == 1) {</div><div class='hunk'>@@ -202,11 +204,9 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> </div><div class='ctx'> 	/* reset the link */</div><div class='ctx'> </div><div class='del'>-	if (netif_running(adapter-&gt;netdev)) {</div><div class='del'>-		e1000_down(adapter);</div><div class='del'>-		e1000_reset(adapter);</div><div class='del'>-		e1000_up(adapter);</div><div class='del'>-	} else</div><div class='add'>+	if (netif_running(adapter-&gt;netdev))</div><div class='add'>+		e1000_reinit_locked(adapter);</div><div class='add'>+	else</div><div class='ctx'> 		e1000_reset(adapter);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -253,10 +253,9 @@ e1000_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	hw-&gt;original_fc = hw-&gt;fc;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;fc_autoneg == AUTONEG_ENABLE) {</div><div class='del'>-		if (netif_running(adapter-&gt;netdev)) {</div><div class='del'>-			e1000_down(adapter);</div><div class='del'>-			e1000_up(adapter);</div><div class='del'>-		} else</div><div class='add'>+		if (netif_running(adapter-&gt;netdev))</div><div class='add'>+			e1000_reinit_locked(adapter);</div><div class='add'>+		else</div><div class='ctx'> 			e1000_reset(adapter);</div><div class='ctx'> 	} else</div><div class='ctx'> 		return ((hw-&gt;media_type == e1000_media_type_fiber) ?</div><div class='hunk'>@@ -278,10 +277,9 @@ e1000_set_rx_csum(struct net_device *netdev, uint32_t data)</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	adapter-&gt;rx_csum = data;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		e1000_down(adapter);</div><div class='del'>-		e1000_up(adapter);</div><div class='del'>-	} else</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		e1000_reinit_locked(adapter);</div><div class='add'>+	else</div><div class='ctx'> 		e1000_reset(adapter);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -576,6 +574,7 @@ e1000_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	case e1000_82572:</div><div class='ctx'> 	case e1000_82573:</div><div class='ctx'> 	case e1000_80003es2lan:</div><div class='add'>+	case e1000_ich8lan:</div><div class='ctx'> 		sprintf(firmware_version, "%d.%d-%d",</div><div class='ctx'> 			(eeprom_data &amp; 0xF000) &gt;&gt; 12,</div><div class='ctx'> 			(eeprom_data &amp; 0x0FF0) &gt;&gt; 4,</div><div class='hunk'>@@ -630,6 +629,9 @@ e1000_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 	tx_ring_size = sizeof(struct e1000_tx_ring) * adapter-&gt;num_tx_queues;</div><div class='ctx'> 	rx_ring_size = sizeof(struct e1000_rx_ring) * adapter-&gt;num_rx_queues;</div><div class='ctx'> </div><div class='add'>+	while (test_and_set_bit(__E1000_RESETTING, &amp;adapter-&gt;flags))</div><div class='add'>+		msleep(1);</div><div class='add'>+</div><div class='ctx'> 	if (netif_running(adapter-&gt;netdev))</div><div class='ctx'> 		e1000_down(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -690,9 +692,11 @@ e1000_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 		adapter-&gt;rx_ring = rx_new;</div><div class='ctx'> 		adapter-&gt;tx_ring = tx_new;</div><div class='ctx'> 		if ((err = e1000_up(adapter)))</div><div class='del'>-			return err;</div><div class='add'>+			goto err_setup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	clear_bit(__E1000_RESETTING, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> err_setup_tx:</div><div class='ctx'> 	e1000_free_all_rx_resources(adapter);</div><div class='hunk'>@@ -700,6 +704,8 @@ err_setup_rx:</div><div class='ctx'> 	adapter-&gt;rx_ring = rx_old;</div><div class='ctx'> 	adapter-&gt;tx_ring = tx_old;</div><div class='ctx'> 	e1000_up(adapter);</div><div class='add'>+err_setup:</div><div class='add'>+	clear_bit(__E1000_RESETTING, &amp;adapter-&gt;flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -753,6 +759,7 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> 		toggle = 0x7FFFF3FF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case e1000_82573:</div><div class='add'>+	case e1000_ich8lan:</div><div class='ctx'> 		toggle = 0x7FFFF033;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -772,11 +779,12 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* restore previous status */</div><div class='ctx'> 	E1000_WRITE_REG(&amp;adapter-&gt;hw, STATUS, before);</div><div class='del'>-</div><div class='del'>-	REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF);</div><div class='del'>-	REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF);</div><div class='del'>-	REG_PATTERN_TEST(FCT, 0x0000FFFF, 0xFFFFFFFF);</div><div class='del'>-	REG_PATTERN_TEST(VET, 0x0000FFFF, 0xFFFFFFFF);</div><div class='add'>+	if (adapter-&gt;hw.mac_type != e1000_ich8lan) {</div><div class='add'>+		REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF);</div><div class='add'>+		REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF);</div><div class='add'>+		REG_PATTERN_TEST(FCT, 0x0000FFFF, 0xFFFFFFFF);</div><div class='add'>+		REG_PATTERN_TEST(VET, 0x0000FFFF, 0xFFFFFFFF);</div><div class='add'>+	}</div><div class='ctx'> 	REG_PATTERN_TEST(RDTR, 0x0000FFFF, 0xFFFFFFFF);</div><div class='ctx'> 	REG_PATTERN_TEST(RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);</div><div class='ctx'> 	REG_PATTERN_TEST(RDLEN, 0x000FFF80, 0x000FFFFF);</div><div class='hunk'>@@ -789,20 +797,22 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> 	REG_PATTERN_TEST(TDLEN, 0x000FFF80, 0x000FFFFF);</div><div class='ctx'> </div><div class='ctx'> 	REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x00000000);</div><div class='del'>-	REG_SET_AND_CHECK(RCTL, 0x06DFB3FE, 0x003FFFFB);</div><div class='add'>+	before = (adapter-&gt;hw.mac_type == e1000_ich8lan ?</div><div class='add'>+			0x06C3B33E : 0x06DFB3FE);</div><div class='add'>+	REG_SET_AND_CHECK(RCTL, before, 0x003FFFFB);</div><div class='ctx'> 	REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;hw.mac_type &gt;= e1000_82543) {</div><div class='ctx'> </div><div class='del'>-		REG_SET_AND_CHECK(RCTL, 0x06DFB3FE, 0xFFFFFFFF);</div><div class='add'>+		REG_SET_AND_CHECK(RCTL, before, 0xFFFFFFFF);</div><div class='ctx'> 		REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);</div><div class='del'>-		REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);</div><div class='add'>+		if (adapter-&gt;hw.mac_type != e1000_ich8lan)</div><div class='add'>+			REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);</div><div class='ctx'> 		REG_PATTERN_TEST(TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);</div><div class='ctx'> 		REG_PATTERN_TEST(TIDV, 0x0000FFFF, 0x0000FFFF);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; E1000_RAR_ENTRIES; i++) {</div><div class='del'>-			REG_PATTERN_TEST(RA + ((i &lt;&lt; 1) &lt;&lt; 2), 0xFFFFFFFF,</div><div class='del'>-					 0xFFFFFFFF);</div><div class='add'>+		value = (adapter-&gt;hw.mac_type == e1000_ich8lan ?</div><div class='add'>+				E1000_RAR_ENTRIES_ICH8LAN : E1000_RAR_ENTRIES);</div><div class='add'>+		for (i = 0; i &lt; value; i++) {</div><div class='ctx'> 			REG_PATTERN_TEST(RA + (((i &lt;&lt; 1) + 1) &lt;&lt; 2), 0x8003FFFF,</div><div class='ctx'> 					 0xFFFFFFFF);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -816,7 +826,9 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; E1000_MC_TBL_SIZE; i++)</div><div class='add'>+	value = (adapter-&gt;hw.mac_type == e1000_ich8lan ?</div><div class='add'>+			E1000_MC_TBL_SIZE_ICH8LAN : E1000_MC_TBL_SIZE);</div><div class='add'>+	for (i = 0; i &lt; value; i++)</div><div class='ctx'> 		REG_PATTERN_TEST(MTA + (i &lt;&lt; 2), 0xFFFFFFFF, 0xFFFFFFFF);</div><div class='ctx'> </div><div class='ctx'> 	*data = 0;</div><div class='hunk'>@@ -864,19 +876,22 @@ static int</div><div class='ctx'> e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>- 	uint32_t mask, i=0, shared_int = TRUE;</div><div class='del'>- 	uint32_t irq = adapter-&gt;pdev-&gt;irq;</div><div class='add'>+	uint32_t mask, i=0, shared_int = TRUE;</div><div class='add'>+	uint32_t irq = adapter-&gt;pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Hook up test interrupt handler just for this test */</div><div class='del'>- 	if (!request_irq(irq, &amp;e1000_test_intr, 0, netdev-&gt;name, netdev)) {</div><div class='add'>+	if (!request_irq(irq, &amp;e1000_test_intr, IRQF_PROBE_SHARED,</div><div class='add'>+			 netdev-&gt;name, netdev)) {</div><div class='ctx'>  		shared_int = FALSE;</div><div class='del'>- 	} else if (request_irq(irq, &amp;e1000_test_intr, SA_SHIRQ,</div><div class='add'>+ 	} else if (request_irq(irq, &amp;e1000_test_intr, IRQF_SHARED,</div><div class='ctx'> 			      netdev-&gt;name, netdev)){</div><div class='ctx'> 		*data = 1;</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='add'>+	DPRINTK(PROBE,INFO, "testing %s interrupt\n",</div><div class='add'>+	        (shared_int ? "shared" : "unshared"));</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all the interrupts */</div><div class='ctx'> 	E1000_WRITE_REG(&amp;adapter-&gt;hw, IMC, 0xFFFFFFFF);</div><div class='hunk'>@@ -885,25 +900,27 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> 	/* Test each interrupt */</div><div class='ctx'> 	for (; i &lt; 10; i++) {</div><div class='ctx'> </div><div class='add'>+		if (adapter-&gt;hw.mac_type == e1000_ich8lan &amp;&amp; i == 8)</div><div class='add'>+			continue;</div><div class='ctx'> 		/* Interrupt to test */</div><div class='ctx'> 		mask = 1 &lt;&lt; i;</div><div class='ctx'> </div><div class='del'>- 		if (!shared_int) {</div><div class='del'>- 			/* Disable the interrupt to be reported in</div><div class='del'>- 			 * the cause register and then force the same</div><div class='del'>- 			 * interrupt and see if one gets posted.  If</div><div class='del'>- 			 * an interrupt was posted to the bus, the</div><div class='del'>- 			 * test failed.</div><div class='del'>- 			 */</div><div class='del'>- 			adapter-&gt;test_icr = 0;</div><div class='del'>- 			E1000_WRITE_REG(&amp;adapter-&gt;hw, IMC, mask);</div><div class='del'>- 			E1000_WRITE_REG(&amp;adapter-&gt;hw, ICS, mask);</div><div class='del'>- 			msec_delay(10);</div><div class='del'>-</div><div class='del'>- 			if (adapter-&gt;test_icr &amp; mask) {</div><div class='del'>- 				*data = 3;</div><div class='del'>- 				break;</div><div class='del'>- 			}</div><div class='add'>+		if (!shared_int) {</div><div class='add'>+			/* Disable the interrupt to be reported in</div><div class='add'>+			 * the cause register and then force the same</div><div class='add'>+			 * interrupt and see if one gets posted.  If</div><div class='add'>+			 * an interrupt was posted to the bus, the</div><div class='add'>+			 * test failed.</div><div class='add'>+			 */</div><div class='add'>+			adapter-&gt;test_icr = 0;</div><div class='add'>+			E1000_WRITE_REG(&amp;adapter-&gt;hw, IMC, mask);</div><div class='add'>+			E1000_WRITE_REG(&amp;adapter-&gt;hw, ICS, mask);</div><div class='add'>+			msec_delay(10);</div><div class='add'>+</div><div class='add'>+			if (adapter-&gt;test_icr &amp; mask) {</div><div class='add'>+				*data = 3;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Enable the interrupt to be reported in</div><div class='hunk'>@@ -922,7 +939,7 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>- 		if (!shared_int) {</div><div class='add'>+		if (!shared_int) {</div><div class='ctx'> 			/* Disable the other interrupts to be reported in</div><div class='ctx'> 			 * the cause register and then force the other</div><div class='ctx'> 			 * interrupts and see if any get posted.  If</div><div class='hunk'>@@ -1242,18 +1259,33 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)</div><div class='ctx'> 	} else if (adapter-&gt;hw.phy_type == e1000_phy_gg82563) {</div><div class='ctx'> 		e1000_write_phy_reg(&amp;adapter-&gt;hw,</div><div class='ctx'> 		                    GG82563_PHY_KMRN_MODE_CTRL,</div><div class='del'>-		                    0x1CE);</div><div class='add'>+		                    0x1CC);</div><div class='ctx'> 	}</div><div class='del'>-	/* force 1000, set loopback */</div><div class='del'>-	e1000_write_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, 0x4140);</div><div class='ctx'> </div><div class='del'>-	/* Now set up the MAC to the same speed/duplex as the PHY. */</div><div class='ctx'> 	ctrl_reg = E1000_READ_REG(&amp;adapter-&gt;hw, CTRL);</div><div class='del'>-	ctrl_reg &amp;= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */</div><div class='del'>-	ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */</div><div class='del'>-		     E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */</div><div class='del'>-		     E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */</div><div class='del'>-		     E1000_CTRL_FD);	 /* Force Duplex to FULL */</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.phy_type == e1000_phy_ife) {</div><div class='add'>+		/* force 100, set loopback */</div><div class='add'>+		e1000_write_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, 0x6100);</div><div class='add'>+</div><div class='add'>+		/* Now set up the MAC to the same speed/duplex as the PHY. */</div><div class='add'>+		ctrl_reg &amp;= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */</div><div class='add'>+		ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */</div><div class='add'>+			     E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */</div><div class='add'>+			     E1000_CTRL_SPD_100 |/* Force Speed to 100 */</div><div class='add'>+			     E1000_CTRL_FD);	 /* Force Duplex to FULL */</div><div class='add'>+	} else {</div><div class='add'>+		/* force 1000, set loopback */</div><div class='add'>+		e1000_write_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, 0x4140);</div><div class='add'>+</div><div class='add'>+		/* Now set up the MAC to the same speed/duplex as the PHY. */</div><div class='add'>+		ctrl_reg = E1000_READ_REG(&amp;adapter-&gt;hw, CTRL);</div><div class='add'>+		ctrl_reg &amp;= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */</div><div class='add'>+		ctrl_reg |= (E1000_CTRL_FRCSPD | /* Set the Force Speed Bit */</div><div class='add'>+			     E1000_CTRL_FRCDPX | /* Set the Force Duplex Bit */</div><div class='add'>+			     E1000_CTRL_SPD_1000 |/* Force Speed to 1000 */</div><div class='add'>+			     E1000_CTRL_FD);	 /* Force Duplex to FULL */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;hw.media_type == e1000_media_type_copper &amp;&amp;</div><div class='ctx'> 	   adapter-&gt;hw.phy_type == e1000_phy_m88) {</div><div class='hunk'>@@ -1313,6 +1345,7 @@ e1000_set_phy_loopback(struct e1000_adapter *adapter)</div><div class='ctx'> 	case e1000_82572:</div><div class='ctx'> 	case e1000_82573:</div><div class='ctx'> 	case e1000_80003es2lan:</div><div class='add'>+	case e1000_ich8lan:</div><div class='ctx'> 		return e1000_integrated_phy_loopback(adapter);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1564,6 +1597,7 @@ e1000_diag_test(struct net_device *netdev,</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	boolean_t if_running = netif_running(netdev);</div><div class='ctx'> </div><div class='add'>+	set_bit(__E1000_DRIVER_TESTING, &amp;adapter-&gt;flags);</div><div class='ctx'> 	if (eth_test-&gt;flags == ETH_TEST_FL_OFFLINE) {</div><div class='ctx'> 		/* Offline tests */</div><div class='ctx'> </div><div class='hunk'>@@ -1578,7 +1612,8 @@ e1000_diag_test(struct net_device *netdev,</div><div class='ctx'> 			eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> </div><div class='ctx'> 		if (if_running)</div><div class='del'>-			e1000_down(adapter);</div><div class='add'>+			/* indicate we're in test mode */</div><div class='add'>+			dev_close(netdev);</div><div class='ctx'> 		else</div><div class='ctx'> 			e1000_reset(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1603,8 +1638,9 @@ e1000_diag_test(struct net_device *netdev,</div><div class='ctx'> 		adapter-&gt;hw.autoneg = autoneg;</div><div class='ctx'> </div><div class='ctx'> 		e1000_reset(adapter);</div><div class='add'>+		clear_bit(__E1000_DRIVER_TESTING, &amp;adapter-&gt;flags);</div><div class='ctx'> 		if (if_running)</div><div class='del'>-			e1000_up(adapter);</div><div class='add'>+			dev_open(netdev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Online tests */</div><div class='ctx'> 		if (e1000_link_test(adapter, &amp;data[4]))</div><div class='hunk'>@@ -1615,6 +1651,8 @@ e1000_diag_test(struct net_device *netdev,</div><div class='ctx'> 		data[1] = 0;</div><div class='ctx'> 		data[2] = 0;</div><div class='ctx'> 		data[3] = 0;</div><div class='add'>+</div><div class='add'>+		clear_bit(__E1000_DRIVER_TESTING, &amp;adapter-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	msleep_interruptible(4 * 1000);</div><div class='ctx'> }</div><div class='hunk'>@@ -1774,21 +1812,18 @@ e1000_phys_id(struct net_device *netdev, uint32_t data)</div><div class='ctx'> 		mod_timer(&amp;adapter-&gt;blink_timer, jiffies);</div><div class='ctx'> 		msleep_interruptible(data * 1000);</div><div class='ctx'> 		del_timer_sync(&amp;adapter-&gt;blink_timer);</div><div class='del'>-	} else if (adapter-&gt;hw.mac_type &lt; e1000_82573) {</div><div class='del'>-		E1000_WRITE_REG(&amp;adapter-&gt;hw, LEDCTL,</div><div class='del'>-			(E1000_LEDCTL_LED2_BLINK_RATE |</div><div class='del'>-			 E1000_LEDCTL_LED0_BLINK | E1000_LEDCTL_LED2_BLINK |</div><div class='del'>-			 (E1000_LEDCTL_MODE_LED_ON &lt;&lt; E1000_LEDCTL_LED2_MODE_SHIFT) |</div><div class='del'>-			 (E1000_LEDCTL_MODE_LINK_ACTIVITY &lt;&lt; E1000_LEDCTL_LED0_MODE_SHIFT) |</div><div class='del'>-			 (E1000_LEDCTL_MODE_LED_OFF &lt;&lt; E1000_LEDCTL_LED1_MODE_SHIFT)));</div><div class='add'>+	} else if (adapter-&gt;hw.phy_type == e1000_phy_ife) {</div><div class='add'>+		if (!adapter-&gt;blink_timer.function) {</div><div class='add'>+			init_timer(&amp;adapter-&gt;blink_timer);</div><div class='add'>+			adapter-&gt;blink_timer.function = e1000_led_blink_callback;</div><div class='add'>+			adapter-&gt;blink_timer.data = (unsigned long) adapter;</div><div class='add'>+		}</div><div class='add'>+		mod_timer(&amp;adapter-&gt;blink_timer, jiffies);</div><div class='ctx'> 		msleep_interruptible(data * 1000);</div><div class='add'>+		del_timer_sync(&amp;adapter-&gt;blink_timer);</div><div class='add'>+		e1000_write_phy_reg(&amp;(adapter-&gt;hw), IFE_PHY_SPECIAL_CONTROL_LED, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		E1000_WRITE_REG(&amp;adapter-&gt;hw, LEDCTL,</div><div class='del'>-			(E1000_LEDCTL_LED2_BLINK_RATE |</div><div class='del'>-			 E1000_LEDCTL_LED1_BLINK | E1000_LEDCTL_LED2_BLINK |</div><div class='del'>-			 (E1000_LEDCTL_MODE_LED_ON &lt;&lt; E1000_LEDCTL_LED2_MODE_SHIFT) |</div><div class='del'>-			 (E1000_LEDCTL_MODE_LINK_ACTIVITY &lt;&lt; E1000_LEDCTL_LED1_MODE_SHIFT) |</div><div class='del'>-			 (E1000_LEDCTL_MODE_LED_OFF &lt;&lt; E1000_LEDCTL_LED0_MODE_SHIFT)));</div><div class='add'>+		e1000_blink_led_start(&amp;adapter-&gt;hw);</div><div class='ctx'> 		msleep_interruptible(data * 1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1803,10 +1838,8 @@ static int</div><div class='ctx'> e1000_nway_reset(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		e1000_down(adapter);</div><div class='del'>-		e1000_up(adapter);</div><div class='del'>-	}</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		e1000_reinit_locked(adapter);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c<br/>index 523c2c9fc0ac..583518ae49ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_hw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000_hw.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='hunk'>@@ -100,7 +101,8 @@ static void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset,</div><div class='ctx'> </div><div class='ctx'> #define E1000_WRITE_REG_IO(a, reg, val) \</div><div class='ctx'> 	    e1000_write_reg_io((a), E1000_##reg, val)</div><div class='del'>-static int32_t e1000_configure_kmrn_for_10_100(struct e1000_hw *hw);</div><div class='add'>+static int32_t e1000_configure_kmrn_for_10_100(struct e1000_hw *hw,</div><div class='add'>+                                               uint16_t duplex);</div><div class='ctx'> static int32_t e1000_configure_kmrn_for_1000(struct e1000_hw *hw);</div><div class='ctx'> </div><div class='ctx'> /* IGP cable length table */</div><div class='hunk'>@@ -155,6 +157,14 @@ e1000_set_phy_type(struct e1000_hw *hw)</div><div class='ctx'>             hw-&gt;phy_type = e1000_phy_igp;</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='add'>+    case IGP03E1000_E_PHY_ID:</div><div class='add'>+        hw-&gt;phy_type = e1000_phy_igp_3;</div><div class='add'>+        break;</div><div class='add'>+    case IFE_E_PHY_ID:</div><div class='add'>+    case IFE_PLUS_E_PHY_ID:</div><div class='add'>+    case IFE_C_E_PHY_ID:</div><div class='add'>+        hw-&gt;phy_type = e1000_phy_ife;</div><div class='add'>+        break;</div><div class='ctx'>     case GG82563_E_PHY_ID:</div><div class='ctx'>         if (hw-&gt;mac_type == e1000_80003es2lan) {</div><div class='ctx'>             hw-&gt;phy_type = e1000_phy_gg82563;</div><div class='hunk'>@@ -331,6 +341,7 @@ e1000_set_mac_type(struct e1000_hw *hw)</div><div class='ctx'>         break;</div><div class='ctx'>     case E1000_DEV_ID_82541EI:</div><div class='ctx'>     case E1000_DEV_ID_82541EI_MOBILE:</div><div class='add'>+    case E1000_DEV_ID_82541ER_LOM:</div><div class='ctx'>         hw-&gt;mac_type = e1000_82541;</div><div class='ctx'>         break;</div><div class='ctx'>     case E1000_DEV_ID_82541ER:</div><div class='hunk'>@@ -340,6 +351,7 @@ e1000_set_mac_type(struct e1000_hw *hw)</div><div class='ctx'>         hw-&gt;mac_type = e1000_82541_rev_2;</div><div class='ctx'>         break;</div><div class='ctx'>     case E1000_DEV_ID_82547EI:</div><div class='add'>+    case E1000_DEV_ID_82547EI_MOBILE:</div><div class='ctx'>         hw-&gt;mac_type = e1000_82547;</div><div class='ctx'>         break;</div><div class='ctx'>     case E1000_DEV_ID_82547GI:</div><div class='hunk'>@@ -353,6 +365,7 @@ e1000_set_mac_type(struct e1000_hw *hw)</div><div class='ctx'>     case E1000_DEV_ID_82572EI_COPPER:</div><div class='ctx'>     case E1000_DEV_ID_82572EI_FIBER:</div><div class='ctx'>     case E1000_DEV_ID_82572EI_SERDES:</div><div class='add'>+    case E1000_DEV_ID_82572EI:</div><div class='ctx'>         hw-&gt;mac_type = e1000_82572;</div><div class='ctx'>         break;</div><div class='ctx'>     case E1000_DEV_ID_82573E:</div><div class='hunk'>@@ -360,16 +373,29 @@ e1000_set_mac_type(struct e1000_hw *hw)</div><div class='ctx'>     case E1000_DEV_ID_82573L:</div><div class='ctx'>         hw-&gt;mac_type = e1000_82573;</div><div class='ctx'>         break;</div><div class='add'>+    case E1000_DEV_ID_80003ES2LAN_COPPER_SPT:</div><div class='add'>+    case E1000_DEV_ID_80003ES2LAN_SERDES_SPT:</div><div class='ctx'>     case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:</div><div class='ctx'>     case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:</div><div class='ctx'>         hw-&gt;mac_type = e1000_80003es2lan;</div><div class='ctx'>         break;</div><div class='add'>+    case E1000_DEV_ID_ICH8_IGP_M_AMT:</div><div class='add'>+    case E1000_DEV_ID_ICH8_IGP_AMT:</div><div class='add'>+    case E1000_DEV_ID_ICH8_IGP_C:</div><div class='add'>+    case E1000_DEV_ID_ICH8_IFE:</div><div class='add'>+    case E1000_DEV_ID_ICH8_IGP_M:</div><div class='add'>+        hw-&gt;mac_type = e1000_ich8lan;</div><div class='add'>+        break;</div><div class='ctx'>     default:</div><div class='ctx'>         /* Should never have loaded on this device */</div><div class='ctx'>         return -E1000_ERR_MAC_TYPE;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     switch(hw-&gt;mac_type) {</div><div class='add'>+    case e1000_ich8lan:</div><div class='add'>+        hw-&gt;swfwhw_semaphore_present = TRUE;</div><div class='add'>+        hw-&gt;asf_firmware_present = TRUE;</div><div class='add'>+        break;</div><div class='ctx'>     case e1000_80003es2lan:</div><div class='ctx'>         hw-&gt;swfw_sync_present = TRUE;</div><div class='ctx'>         /* fall through */</div><div class='hunk'>@@ -422,6 +448,7 @@ e1000_set_media_type(struct e1000_hw *hw)</div><div class='ctx'>         case e1000_82542_rev2_1:</div><div class='ctx'>             hw-&gt;media_type = e1000_media_type_fiber;</div><div class='ctx'>             break;</div><div class='add'>+        case e1000_ich8lan:</div><div class='ctx'>         case e1000_82573:</div><div class='ctx'>             /* The STATUS_TBIMODE bit is reserved or reused for the this</div><div class='ctx'>              * device.</div><div class='hunk'>@@ -526,6 +553,14 @@ e1000_reset_hw(struct e1000_hw *hw)</div><div class='ctx'>         } while(timeout);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    /* Workaround for ICH8 bit corruption issue in FIFO memory */</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        /* Set Tx and Rx buffer allocation to 8k apiece. */</div><div class='add'>+        E1000_WRITE_REG(hw, PBA, E1000_PBA_8K);</div><div class='add'>+        /* Set Packet Buffer Size to 16k. */</div><div class='add'>+        E1000_WRITE_REG(hw, PBS, E1000_PBS_16K);</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     /* Issue a global reset to the MAC.  This will reset the chip's</div><div class='ctx'>      * transmit, receive, DMA, and link units.  It will not effect</div><div class='ctx'>      * the current PCI configuration.  The global reset bit is self-</div><div class='hunk'>@@ -549,6 +584,20 @@ e1000_reset_hw(struct e1000_hw *hw)</div><div class='ctx'>             /* Reset is performed on a shadow of the control register */</div><div class='ctx'>             E1000_WRITE_REG(hw, CTRL_DUP, (ctrl | E1000_CTRL_RST));</div><div class='ctx'>             break;</div><div class='add'>+        case e1000_ich8lan:</div><div class='add'>+            if (!hw-&gt;phy_reset_disable &amp;&amp;</div><div class='add'>+                e1000_check_phy_reset_block(hw) == E1000_SUCCESS) {</div><div class='add'>+                /* e1000_ich8lan PHY HW reset requires MAC CORE reset</div><div class='add'>+                 * at the same time to make sure the interface between</div><div class='add'>+                 * MAC and the external PHY is reset.</div><div class='add'>+                 */</div><div class='add'>+                ctrl |= E1000_CTRL_PHY_RST;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            e1000_get_software_flag(hw);</div><div class='add'>+            E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));</div><div class='add'>+            msec_delay(5);</div><div class='add'>+            break;</div><div class='ctx'>         default:</div><div class='ctx'>             E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));</div><div class='ctx'>             break;</div><div class='hunk'>@@ -590,6 +639,7 @@ e1000_reset_hw(struct e1000_hw *hw)</div><div class='ctx'>             /* fall through */</div><div class='ctx'>         case e1000_82571:</div><div class='ctx'>         case e1000_82572:</div><div class='add'>+        case e1000_ich8lan:</div><div class='ctx'>         case e1000_80003es2lan:</div><div class='ctx'>             ret_val = e1000_get_auto_rd_done(hw);</div><div class='ctx'>             if(ret_val)</div><div class='hunk'>@@ -632,6 +682,12 @@ e1000_reset_hw(struct e1000_hw *hw)</div><div class='ctx'>             e1000_pci_set_mwi(hw);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        uint32_t kab = E1000_READ_REG(hw, KABGTXD);</div><div class='add'>+        kab |= E1000_KABGTXD_BGSQLBIAS;</div><div class='add'>+        E1000_WRITE_REG(hw, KABGTXD, kab);</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     return E1000_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -674,9 +730,12 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     /* Disabling VLAN filtering. */</div><div class='ctx'>     DEBUGOUT("Initializing the IEEE VLAN\n");</div><div class='del'>-    if (hw-&gt;mac_type &lt; e1000_82545_rev_3)</div><div class='del'>-        E1000_WRITE_REG(hw, VET, 0);</div><div class='del'>-    e1000_clear_vfta(hw);</div><div class='add'>+    /* VET hardcoded to standard value and VFTA removed in ICH8 LAN */</div><div class='add'>+    if (hw-&gt;mac_type != e1000_ich8lan) {</div><div class='add'>+        if (hw-&gt;mac_type &lt; e1000_82545_rev_3)</div><div class='add'>+            E1000_WRITE_REG(hw, VET, 0);</div><div class='add'>+        e1000_clear_vfta(hw);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     /* For 82542 (rev 2.0), disable MWI and put the receiver into reset */</div><div class='ctx'>     if(hw-&gt;mac_type == e1000_82542_rev2_0) {</div><div class='hunk'>@@ -704,8 +763,14 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'>     /* Zero out the Multicast HASH table */</div><div class='ctx'>     DEBUGOUT("Zeroing the MTA\n");</div><div class='ctx'>     mta_size = E1000_MC_TBL_SIZE;</div><div class='del'>-    for(i = 0; i &lt; mta_size; i++)</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        mta_size = E1000_MC_TBL_SIZE_ICH8LAN;</div><div class='add'>+    for(i = 0; i &lt; mta_size; i++) {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);</div><div class='add'>+        /* use write flush to prevent Memory Write Block (MWB) from</div><div class='add'>+         * occuring when accessing our register space */</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     /* Set the PCI priority bit correctly in the CTRL register.  This</div><div class='ctx'>      * determines if the adapter gives priority to receives, or if it</div><div class='hunk'>@@ -743,6 +808,10 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    /* More time needed for PHY to initialize */</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        msec_delay(15);</div><div class='add'>+</div><div class='ctx'>     /* Call a subroutine to configure the link and setup flow control. */</div><div class='ctx'>     ret_val = e1000_setup_link(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -756,6 +825,7 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'>         case e1000_82571:</div><div class='ctx'>         case e1000_82572:</div><div class='ctx'>         case e1000_82573:</div><div class='add'>+        case e1000_ich8lan:</div><div class='ctx'>         case e1000_80003es2lan:</div><div class='ctx'>             ctrl |= E1000_TXDCTL_COUNT_DESC;</div><div class='ctx'>             break;</div><div class='hunk'>@@ -764,7 +834,7 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (hw-&gt;mac_type == e1000_82573) {</div><div class='del'>-        e1000_enable_tx_pkt_filtering(hw); </div><div class='add'>+        e1000_enable_tx_pkt_filtering(hw);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     switch (hw-&gt;mac_type) {</div><div class='hunk'>@@ -794,6 +864,7 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'>         /* Fall through */</div><div class='ctx'>     case e1000_82571:</div><div class='ctx'>     case e1000_82572:</div><div class='add'>+    case e1000_ich8lan:</div><div class='ctx'>         ctrl = E1000_READ_REG(hw, TXDCTL1);</div><div class='ctx'>         ctrl = (ctrl &amp; ~E1000_TXDCTL_WTHRESH) | E1000_TXDCTL_FULL_TX_DESC_WB;</div><div class='ctx'>         if(hw-&gt;mac_type &gt;= e1000_82571)</div><div class='hunk'>@@ -817,6 +888,11 @@ e1000_init_hw(struct e1000_hw *hw)</div><div class='ctx'>      */</div><div class='ctx'>     e1000_clear_hw_cntrs(hw);</div><div class='ctx'> </div><div class='add'>+    /* ICH8 No-snoop bits are opposite polarity.</div><div class='add'>+     * Set to snoop by default after reset. */</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        e1000_set_pci_ex_no_snoop(hw, PCI_EX_82566_SNOOP_ALL);</div><div class='add'>+</div><div class='ctx'>     if (hw-&gt;device_id == E1000_DEV_ID_82546GB_QUAD_COPPER ||</div><div class='ctx'>         hw-&gt;device_id == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3) {</div><div class='ctx'>         ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);</div><div class='hunk'>@@ -860,7 +936,7 @@ e1000_adjust_serdes_amplitude(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     if(eeprom_data != EEPROM_RESERVED_WORD) {</div><div class='ctx'>         /* Adjust SERDES output amplitude only. */</div><div class='del'>-        eeprom_data &amp;= EEPROM_SERDES_AMPLITUDE_MASK; </div><div class='add'>+        eeprom_data &amp;= EEPROM_SERDES_AMPLITUDE_MASK;</div><div class='ctx'>         ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_EXT_CTRL, eeprom_data);</div><div class='ctx'>         if(ret_val)</div><div class='ctx'>             return ret_val;</div><div class='hunk'>@@ -904,6 +980,7 @@ e1000_setup_link(struct e1000_hw *hw)</div><div class='ctx'>      */</div><div class='ctx'>     if (hw-&gt;fc == e1000_fc_default) {</div><div class='ctx'>         switch (hw-&gt;mac_type) {</div><div class='add'>+        case e1000_ich8lan:</div><div class='ctx'>         case e1000_82573:</div><div class='ctx'>             hw-&gt;fc = e1000_fc_full;</div><div class='ctx'>             break;</div><div class='hunk'>@@ -970,9 +1047,12 @@ e1000_setup_link(struct e1000_hw *hw)</div><div class='ctx'>      */</div><div class='ctx'>     DEBUGOUT("Initializing the Flow Control address, type and timer regs\n");</div><div class='ctx'> </div><div class='del'>-    E1000_WRITE_REG(hw, FCAL, FLOW_CONTROL_ADDRESS_LOW);</div><div class='del'>-    E1000_WRITE_REG(hw, FCAH, FLOW_CONTROL_ADDRESS_HIGH);</div><div class='del'>-    E1000_WRITE_REG(hw, FCT, FLOW_CONTROL_TYPE);</div><div class='add'>+    /* FCAL/H and FCT are hardcoded to standard values in e1000_ich8lan. */</div><div class='add'>+    if (hw-&gt;mac_type != e1000_ich8lan) {</div><div class='add'>+        E1000_WRITE_REG(hw, FCT, FLOW_CONTROL_TYPE);</div><div class='add'>+        E1000_WRITE_REG(hw, FCAH, FLOW_CONTROL_ADDRESS_HIGH);</div><div class='add'>+        E1000_WRITE_REG(hw, FCAL, FLOW_CONTROL_ADDRESS_LOW);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     E1000_WRITE_REG(hw, FCTTV, hw-&gt;fc_pause_time);</div><div class='ctx'> </div><div class='hunk'>@@ -1227,7 +1307,7 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     if (hw-&gt;phy_reset_disable)</div><div class='ctx'>         return E1000_SUCCESS;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     ret_val = e1000_phy_reset(hw);</div><div class='ctx'>     if (ret_val) {</div><div class='ctx'>         DEBUGOUT("Error Resetting the PHY\n");</div><div class='hunk'>@@ -1236,12 +1316,13 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     /* Wait 10ms for MAC to configure PHY from eeprom settings */</div><div class='ctx'>     msec_delay(15);</div><div class='del'>-</div><div class='add'>+    if (hw-&gt;mac_type != e1000_ich8lan) {</div><div class='ctx'>     /* Configure activity LED after PHY reset */</div><div class='ctx'>     led_ctrl = E1000_READ_REG(hw, LEDCTL);</div><div class='ctx'>     led_ctrl &amp;= IGP_ACTIVITY_LED_MASK;</div><div class='ctx'>     led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);</div><div class='ctx'>     E1000_WRITE_REG(hw, LEDCTL, led_ctrl);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     /* disable lplu d3 during driver init */</div><div class='ctx'>     ret_val = e1000_set_d3_lplu_state(hw, FALSE);</div><div class='hunk'>@@ -1369,7 +1450,7 @@ e1000_copper_link_ggp_setup(struct e1000_hw *hw)</div><div class='ctx'>     DEBUGFUNC("e1000_copper_link_ggp_setup");</div><div class='ctx'> </div><div class='ctx'>     if(!hw-&gt;phy_reset_disable) {</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         /* Enable CRS on TX for half-duplex operation. */</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, GG82563_PHY_MAC_SPEC_CTRL,</div><div class='ctx'>                                      &amp;phy_data);</div><div class='hunk'>@@ -1477,8 +1558,7 @@ e1000_copper_link_ggp_setup(struct e1000_hw *hw)</div><div class='ctx'>             if (ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='ctx'> </div><div class='del'>-            /* Enable Pass False Carrier on the PHY */</div><div class='del'>-            phy_data |= GG82563_KMCR_PASS_FALSE_CARRIER;</div><div class='add'>+            phy_data &amp;= ~GG82563_KMCR_PASS_FALSE_CARRIER;</div><div class='ctx'> </div><div class='ctx'>             ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,</div><div class='ctx'>                                           phy_data);</div><div class='hunk'>@@ -1518,7 +1598,7 @@ e1000_copper_link_mgp_setup(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     if(hw-&gt;phy_reset_disable)</div><div class='ctx'>         return E1000_SUCCESS;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Enable CRS on TX. This must be set for half-duplex operation. */</div><div class='ctx'>     ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &amp;phy_data);</div><div class='ctx'>     if(ret_val)</div><div class='hunk'>@@ -1560,28 +1640,40 @@ e1000_copper_link_mgp_setup(struct e1000_hw *hw)</div><div class='ctx'>     phy_data &amp;= ~M88E1000_PSCR_POLARITY_REVERSAL;</div><div class='ctx'>     if(hw-&gt;disable_polarity_correction == 1)</div><div class='ctx'>         phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;</div><div class='del'>-        ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);</div><div class='del'>-        if(ret_val)</div><div class='del'>-            return ret_val;</div><div class='del'>-</div><div class='del'>-    /* Force TX_CLK in the Extended PHY Specific Control Register</div><div class='del'>-     * to 25MHz clock.</div><div class='del'>-     */</div><div class='del'>-    ret_val = e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &amp;phy_data);</div><div class='del'>-    if(ret_val)</div><div class='add'>+    ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);</div><div class='add'>+    if (ret_val)</div><div class='ctx'>         return ret_val;</div><div class='ctx'> </div><div class='del'>-    phy_data |= M88E1000_EPSCR_TX_CLK_25;</div><div class='del'>-</div><div class='ctx'>     if (hw-&gt;phy_revision &lt; M88E1011_I_REV_4) {</div><div class='del'>-        /* Configure Master and Slave downshift values */</div><div class='del'>-        phy_data &amp;= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |</div><div class='add'>+        /* Force TX_CLK in the Extended PHY Specific Control Register</div><div class='add'>+         * to 25MHz clock.</div><div class='add'>+         */</div><div class='add'>+        ret_val = e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &amp;phy_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        phy_data |= M88E1000_EPSCR_TX_CLK_25;</div><div class='add'>+</div><div class='add'>+        if ((hw-&gt;phy_revision == E1000_REVISION_2) &amp;&amp;</div><div class='add'>+            (hw-&gt;phy_id == M88E1111_I_PHY_ID)) {</div><div class='add'>+            /* Vidalia Phy, set the downshift counter to 5x */</div><div class='add'>+            phy_data &amp;= ~(M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK);</div><div class='add'>+            phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;</div><div class='add'>+            ret_val = e1000_write_phy_reg(hw,</div><div class='add'>+                                        M88E1000_EXT_PHY_SPEC_CTRL, phy_data);</div><div class='add'>+            if (ret_val)</div><div class='add'>+                return ret_val;</div><div class='add'>+        } else {</div><div class='add'>+            /* Configure Master and Slave downshift values */</div><div class='add'>+            phy_data &amp;= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |</div><div class='ctx'>                               M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);</div><div class='del'>-        phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |</div><div class='add'>+            phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |</div><div class='ctx'>                              M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);</div><div class='del'>-        ret_val = e1000_write_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, phy_data);</div><div class='del'>-        if(ret_val)</div><div class='del'>-            return ret_val;</div><div class='add'>+            ret_val = e1000_write_phy_reg(hw,</div><div class='add'>+                                        M88E1000_EXT_PHY_SPEC_CTRL, phy_data);</div><div class='add'>+            if (ret_val)</div><div class='add'>+               return ret_val;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* SW Reset the PHY so all changes take effect */</div><div class='hunk'>@@ -1619,6 +1711,10 @@ e1000_copper_link_autoneg(struct e1000_hw *hw)</div><div class='ctx'>     if(hw-&gt;autoneg_advertised == 0)</div><div class='ctx'>         hw-&gt;autoneg_advertised = AUTONEG_ADVERTISE_SPEED_DEFAULT;</div><div class='ctx'> </div><div class='add'>+    /* IFE phy only supports 10/100 */</div><div class='add'>+    if (hw-&gt;phy_type == e1000_phy_ife)</div><div class='add'>+        hw-&gt;autoneg_advertised &amp;= AUTONEG_ADVERTISE_10_100_ALL;</div><div class='add'>+</div><div class='ctx'>     DEBUGOUT("Reconfiguring auto-neg advertisement params\n");</div><div class='ctx'>     ret_val = e1000_phy_setup_autoneg(hw);</div><div class='ctx'>     if(ret_val) {</div><div class='hunk'>@@ -1664,7 +1760,7 @@ e1000_copper_link_autoneg(struct e1000_hw *hw)</div><div class='ctx'> *      collision distance in the Transmit Control Register.</div><div class='ctx'> *   2) Set up flow control on the MAC to that established with</div><div class='ctx'> *      the link partner.</div><div class='del'>-*   3) Config DSP to improve Gigabit link quality for some PHY revisions.    </div><div class='add'>+*   3) Config DSP to improve Gigabit link quality for some PHY revisions.</div><div class='ctx'> *</div><div class='ctx'> * hw - Struct containing variables accessed by shared code</div><div class='ctx'> ******************************************************************************/</div><div class='hunk'>@@ -1673,7 +1769,7 @@ e1000_copper_link_postconfig(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'>     int32_t ret_val;</div><div class='ctx'>     DEBUGFUNC("e1000_copper_link_postconfig");</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if(hw-&gt;mac_type &gt;= e1000_82544) {</div><div class='ctx'>         e1000_config_collision_dist(hw);</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -1697,7 +1793,7 @@ e1000_copper_link_postconfig(struct e1000_hw *hw)</div><div class='ctx'>             return ret_val;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-                </div><div class='add'>+</div><div class='ctx'>     return E1000_SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1716,6 +1812,26 @@ e1000_setup_copper_link(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     DEBUGFUNC("e1000_setup_copper_link");</div><div class='ctx'> </div><div class='add'>+    switch (hw-&gt;mac_type) {</div><div class='add'>+    case e1000_80003es2lan:</div><div class='add'>+    case e1000_ich8lan:</div><div class='add'>+        /* Set the mac to wait the maximum time between each</div><div class='add'>+         * iteration and increase the max iterations when</div><div class='add'>+         * polling the phy; this fixes erroneous timeouts at 10Mbps. */</div><div class='add'>+        ret_val = e1000_write_kmrn_reg(hw, GG82563_REG(0x34, 4), 0xFFFF);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+        ret_val = e1000_read_kmrn_reg(hw, GG82563_REG(0x34, 9), &amp;reg_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+        reg_data |= 0x3F;</div><div class='add'>+        ret_val = e1000_write_kmrn_reg(hw, GG82563_REG(0x34, 9), reg_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+    default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     /* Check if it is a valid PHY and set PHY mode if necessary. */</div><div class='ctx'>     ret_val = e1000_copper_link_preconfig(hw);</div><div class='ctx'>     if(ret_val)</div><div class='hunk'>@@ -1723,10 +1839,8 @@ e1000_setup_copper_link(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     switch (hw-&gt;mac_type) {</div><div class='ctx'>     case e1000_80003es2lan:</div><div class='del'>-        ret_val = e1000_read_kmrn_reg(hw, E1000_KUMCTRLSTA_OFFSET_INB_CTRL,</div><div class='del'>-                                      &amp;reg_data);</div><div class='del'>-        if (ret_val)</div><div class='del'>-            return ret_val;</div><div class='add'>+        /* Kumeran registers are written-only */</div><div class='add'>+        reg_data = E1000_KUMCTRLSTA_INB_CTRL_LINK_STATUS_TX_TIMEOUT_DEFAULT;</div><div class='ctx'>         reg_data |= E1000_KUMCTRLSTA_INB_CTRL_DIS_PADDING;</div><div class='ctx'>         ret_val = e1000_write_kmrn_reg(hw, E1000_KUMCTRLSTA_OFFSET_INB_CTRL,</div><div class='ctx'>                                        reg_data);</div><div class='hunk'>@@ -1738,6 +1852,7 @@ e1000_setup_copper_link(struct e1000_hw *hw)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+        hw-&gt;phy_type == e1000_phy_igp_3 ||</div><div class='ctx'>         hw-&gt;phy_type == e1000_phy_igp_2) {</div><div class='ctx'>         ret_val = e1000_copper_link_igp_setup(hw);</div><div class='ctx'>         if(ret_val)</div><div class='hunk'>@@ -1753,11 +1868,11 @@ e1000_setup_copper_link(struct e1000_hw *hw)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if(hw-&gt;autoneg) {</div><div class='del'>-        /* Setup autoneg and flow control advertisement </div><div class='del'>-          * and perform autonegotiation */   </div><div class='add'>+        /* Setup autoneg and flow control advertisement</div><div class='add'>+          * and perform autonegotiation */</div><div class='ctx'>         ret_val = e1000_copper_link_autoneg(hw);</div><div class='ctx'>         if(ret_val)</div><div class='del'>-            return ret_val;           </div><div class='add'>+            return ret_val;</div><div class='ctx'>     } else {</div><div class='ctx'>         /* PHY will be set to 10H, 10F, 100H,or 100F</div><div class='ctx'>           * depending on value from forced_speed_duplex. */</div><div class='hunk'>@@ -1785,7 +1900,7 @@ e1000_setup_copper_link(struct e1000_hw *hw)</div><div class='ctx'>             ret_val = e1000_copper_link_postconfig(hw);</div><div class='ctx'>             if(ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='del'>-            </div><div class='add'>+</div><div class='ctx'>             DEBUGOUT("Valid link established!!!\n");</div><div class='ctx'>             return E1000_SUCCESS;</div><div class='ctx'>         }</div><div class='hunk'>@@ -1802,7 +1917,7 @@ e1000_setup_copper_link(struct e1000_hw *hw)</div><div class='ctx'> * hw - Struct containing variables accessed by shared code</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> static int32_t</div><div class='del'>-e1000_configure_kmrn_for_10_100(struct e1000_hw *hw)</div><div class='add'>+e1000_configure_kmrn_for_10_100(struct e1000_hw *hw, uint16_t duplex)</div><div class='ctx'> {</div><div class='ctx'>     int32_t ret_val = E1000_SUCCESS;</div><div class='ctx'>     uint32_t tipg;</div><div class='hunk'>@@ -1822,6 +1937,18 @@ e1000_configure_kmrn_for_10_100(struct e1000_hw *hw)</div><div class='ctx'>     tipg |= DEFAULT_80003ES2LAN_TIPG_IPGT_10_100;</div><div class='ctx'>     E1000_WRITE_REG(hw, TIPG, tipg);</div><div class='ctx'> </div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, &amp;reg_data);</div><div class='add'>+</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+</div><div class='add'>+    if (duplex == HALF_DUPLEX)</div><div class='add'>+        reg_data |= GG82563_KMCR_PASS_FALSE_CARRIER;</div><div class='add'>+    else</div><div class='add'>+        reg_data &amp;= ~GG82563_KMCR_PASS_FALSE_CARRIER;</div><div class='add'>+</div><div class='add'>+    ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);</div><div class='add'>+</div><div class='ctx'>     return ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1846,6 +1973,14 @@ e1000_configure_kmrn_for_1000(struct e1000_hw *hw)</div><div class='ctx'>     tipg |= DEFAULT_80003ES2LAN_TIPG_IPGT_1000;</div><div class='ctx'>     E1000_WRITE_REG(hw, TIPG, tipg);</div><div class='ctx'> </div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, &amp;reg_data);</div><div class='add'>+</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+</div><div class='add'>+    reg_data &amp;= ~GG82563_KMCR_PASS_FALSE_CARRIER;</div><div class='add'>+    ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);</div><div class='add'>+</div><div class='ctx'>     return ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1868,10 +2003,13 @@ e1000_phy_setup_autoneg(struct e1000_hw *hw)</div><div class='ctx'>     if(ret_val)</div><div class='ctx'>         return ret_val;</div><div class='ctx'> </div><div class='del'>-    /* Read the MII 1000Base-T Control Register (Address 9). */</div><div class='del'>-    ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &amp;mii_1000t_ctrl_reg);</div><div class='del'>-    if(ret_val)</div><div class='del'>-        return ret_val;</div><div class='add'>+    if (hw-&gt;phy_type != e1000_phy_ife) {</div><div class='add'>+        /* Read the MII 1000Base-T Control Register (Address 9). */</div><div class='add'>+        ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &amp;mii_1000t_ctrl_reg);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+    } else</div><div class='add'>+        mii_1000t_ctrl_reg=0;</div><div class='ctx'> </div><div class='ctx'>     /* Need to parse both autoneg_advertised and fc and set up</div><div class='ctx'>      * the appropriate PHY registers.  First we will parse for</div><div class='hunk'>@@ -1922,6 +2060,9 @@ e1000_phy_setup_autoneg(struct e1000_hw *hw)</div><div class='ctx'>     if(hw-&gt;autoneg_advertised &amp; ADVERTISE_1000_FULL) {</div><div class='ctx'>         DEBUGOUT("Advertise 1000mb Full duplex\n");</div><div class='ctx'>         mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;</div><div class='add'>+        if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+            DEBUGOUT("e1000_phy_ife is a 10/100 PHY. Gigabit speed is not supported.\n");</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* Check for a software override of the flow control settings, and</div><div class='hunk'>@@ -1983,9 +2124,11 @@ e1000_phy_setup_autoneg(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);</div><div class='ctx'> </div><div class='del'>-    ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg);    </div><div class='del'>-    if(ret_val)</div><div class='del'>-        return ret_val;</div><div class='add'>+    if (hw-&gt;phy_type != e1000_phy_ife) {</div><div class='add'>+        ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     return E1000_SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -2088,6 +2231,18 @@ e1000_phy_force_speed_duplex(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>         /* Need to reset the PHY or these changes will be ignored */</div><div class='ctx'>         mii_ctrl_reg |= MII_CR_RESET;</div><div class='add'>+    /* Disable MDI-X support for 10/100 */</div><div class='add'>+    } else if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+        ret_val = e1000_read_phy_reg(hw, IFE_PHY_MDIX_CONTROL, &amp;phy_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        phy_data &amp;= ~IFE_PMC_AUTO_MDIX;</div><div class='add'>+        phy_data &amp;= ~IFE_PMC_FORCE_MDIX;</div><div class='add'>+</div><div class='add'>+        ret_val = e1000_write_phy_reg(hw, IFE_PHY_MDIX_CONTROL, phy_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='ctx'>     } else {</div><div class='ctx'>         /* Clear Auto-Crossover to force MDI manually.  IGP requires MDI</div><div class='ctx'>          * forced whenever speed or duplex are forced.</div><div class='hunk'>@@ -2272,7 +2427,7 @@ e1000_config_mac_to_phy(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     DEBUGFUNC("e1000_config_mac_to_phy");</div><div class='ctx'> </div><div class='del'>-    /* 82544 or newer MAC, Auto Speed Detection takes care of </div><div class='add'>+    /* 82544 or newer MAC, Auto Speed Detection takes care of</div><div class='ctx'>     * MAC speed/duplex configuration.*/</div><div class='ctx'>     if (hw-&gt;mac_type &gt;= e1000_82544)</div><div class='ctx'>         return E1000_SUCCESS;</div><div class='hunk'>@@ -2291,9 +2446,9 @@ e1000_config_mac_to_phy(struct e1000_hw *hw)</div><div class='ctx'>     if(ret_val)</div><div class='ctx'>         return ret_val;</div><div class='ctx'> </div><div class='del'>-    if(phy_data &amp; M88E1000_PSSR_DPLX) </div><div class='add'>+    if(phy_data &amp; M88E1000_PSSR_DPLX)</div><div class='ctx'>         ctrl |= E1000_CTRL_FD;</div><div class='del'>-    else </div><div class='add'>+    else</div><div class='ctx'>         ctrl &amp;= ~E1000_CTRL_FD;</div><div class='ctx'> </div><div class='ctx'>     e1000_config_collision_dist(hw);</div><div class='hunk'>@@ -2492,10 +2647,10 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)</div><div class='ctx'>                  */</div><div class='ctx'>                 if(hw-&gt;original_fc == e1000_fc_full) {</div><div class='ctx'>                     hw-&gt;fc = e1000_fc_full;</div><div class='del'>-                    DEBUGOUT("Flow Control = FULL.\r\n");</div><div class='add'>+                    DEBUGOUT("Flow Control = FULL.\n");</div><div class='ctx'>                 } else {</div><div class='ctx'>                     hw-&gt;fc = e1000_fc_rx_pause;</div><div class='del'>-                    DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");</div><div class='add'>+                    DEBUGOUT("Flow Control = RX PAUSE frames only.\n");</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>             /* For receiving PAUSE frames ONLY.</div><div class='hunk'>@@ -2511,7 +2666,7 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)</div><div class='ctx'>                     (mii_nway_lp_ability_reg &amp; NWAY_LPAR_PAUSE) &amp;&amp;</div><div class='ctx'>                     (mii_nway_lp_ability_reg &amp; NWAY_LPAR_ASM_DIR)) {</div><div class='ctx'>                 hw-&gt;fc = e1000_fc_tx_pause;</div><div class='del'>-                DEBUGOUT("Flow Control = TX PAUSE frames only.\r\n");</div><div class='add'>+                DEBUGOUT("Flow Control = TX PAUSE frames only.\n");</div><div class='ctx'>             }</div><div class='ctx'>             /* For transmitting PAUSE frames ONLY.</div><div class='ctx'>              *</div><div class='hunk'>@@ -2526,7 +2681,7 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)</div><div class='ctx'>                     !(mii_nway_lp_ability_reg &amp; NWAY_LPAR_PAUSE) &amp;&amp;</div><div class='ctx'>                     (mii_nway_lp_ability_reg &amp; NWAY_LPAR_ASM_DIR)) {</div><div class='ctx'>                 hw-&gt;fc = e1000_fc_rx_pause;</div><div class='del'>-                DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");</div><div class='add'>+                DEBUGOUT("Flow Control = RX PAUSE frames only.\n");</div><div class='ctx'>             }</div><div class='ctx'>             /* Per the IEEE spec, at this point flow control should be</div><div class='ctx'>              * disabled.  However, we want to consider that we could</div><div class='hunk'>@@ -2552,10 +2707,10 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)</div><div class='ctx'>                      hw-&gt;original_fc == e1000_fc_tx_pause) ||</div><div class='ctx'>                     hw-&gt;fc_strict_ieee) {</div><div class='ctx'>                 hw-&gt;fc = e1000_fc_none;</div><div class='del'>-                DEBUGOUT("Flow Control = NONE.\r\n");</div><div class='add'>+                DEBUGOUT("Flow Control = NONE.\n");</div><div class='ctx'>             } else {</div><div class='ctx'>                 hw-&gt;fc = e1000_fc_rx_pause;</div><div class='del'>-                DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");</div><div class='add'>+                DEBUGOUT("Flow Control = RX PAUSE frames only.\n");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             /* Now we need to do one last check...  If we auto-</div><div class='hunk'>@@ -2580,7 +2735,7 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)</div><div class='ctx'>                 return ret_val;</div><div class='ctx'>             }</div><div class='ctx'>         } else {</div><div class='del'>-            DEBUGOUT("Copper PHY and Auto Neg has not completed.\r\n");</div><div class='add'>+            DEBUGOUT("Copper PHY and Auto Neg has not completed.\n");</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     return E1000_SUCCESS;</div><div class='hunk'>@@ -2720,8 +2875,12 @@ e1000_check_for_link(struct e1000_hw *hw)</div><div class='ctx'>          */</div><div class='ctx'>         if(hw-&gt;tbi_compatibility_en) {</div><div class='ctx'>             uint16_t speed, duplex;</div><div class='del'>-            e1000_get_speed_and_duplex(hw, &amp;speed, &amp;duplex);</div><div class='del'>-            if(speed != SPEED_1000) {</div><div class='add'>+            ret_val = e1000_get_speed_and_duplex(hw, &amp;speed, &amp;duplex);</div><div class='add'>+            if (ret_val) {</div><div class='add'>+                DEBUGOUT("Error getting link speed and duplex\n");</div><div class='add'>+                return ret_val;</div><div class='add'>+            }</div><div class='add'>+            if (speed != SPEED_1000) {</div><div class='ctx'>                 /* If link speed is not set to gigabit speed, we do not need</div><div class='ctx'>                  * to enable TBI compatibility.</div><div class='ctx'>                  */</div><div class='hunk'>@@ -2763,7 +2922,7 @@ e1000_check_for_link(struct e1000_hw *hw)</div><div class='ctx'>             hw-&gt;autoneg_failed = 1;</div><div class='ctx'>             return 0;</div><div class='ctx'>         }</div><div class='del'>-        DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\r\n");</div><div class='add'>+        DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");</div><div class='ctx'> </div><div class='ctx'>         /* Disable auto-negotiation in the TXCW register */</div><div class='ctx'>         E1000_WRITE_REG(hw, TXCW, (hw-&gt;txcw &amp; ~E1000_TXCW_ANE));</div><div class='hunk'>@@ -2788,7 +2947,7 @@ e1000_check_for_link(struct e1000_hw *hw)</div><div class='ctx'>     else if(((hw-&gt;media_type == e1000_media_type_fiber) ||</div><div class='ctx'>              (hw-&gt;media_type == e1000_media_type_internal_serdes)) &amp;&amp;</div><div class='ctx'>             (ctrl &amp; E1000_CTRL_SLU) &amp;&amp; (rxcw &amp; E1000_RXCW_C)) {</div><div class='del'>-        DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\r\n");</div><div class='add'>+        DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");</div><div class='ctx'>         E1000_WRITE_REG(hw, TXCW, hw-&gt;txcw);</div><div class='ctx'>         E1000_WRITE_REG(hw, CTRL, (ctrl &amp; ~E1000_CTRL_SLU));</div><div class='ctx'> </div><div class='hunk'>@@ -2851,13 +3010,13 @@ e1000_get_speed_and_duplex(struct e1000_hw *hw,</div><div class='ctx'> </div><div class='ctx'>         if(status &amp; E1000_STATUS_FD) {</div><div class='ctx'>             *duplex = FULL_DUPLEX;</div><div class='del'>-            DEBUGOUT("Full Duplex\r\n");</div><div class='add'>+            DEBUGOUT("Full Duplex\n");</div><div class='ctx'>         } else {</div><div class='ctx'>             *duplex = HALF_DUPLEX;</div><div class='del'>-            DEBUGOUT(" Half Duplex\r\n");</div><div class='add'>+            DEBUGOUT(" Half Duplex\n");</div><div class='ctx'>         }</div><div class='ctx'>     } else {</div><div class='del'>-        DEBUGOUT("1000 Mbs, Full Duplex\r\n");</div><div class='add'>+        DEBUGOUT("1000 Mbs, Full Duplex\n");</div><div class='ctx'>         *speed = SPEED_1000;</div><div class='ctx'>         *duplex = FULL_DUPLEX;</div><div class='ctx'>     }</div><div class='hunk'>@@ -2883,12 +3042,18 @@ e1000_get_speed_and_duplex(struct e1000_hw *hw,</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if ((hw-&gt;mac_type == e1000_80003es2lan) &amp;&amp; </div><div class='add'>+    if ((hw-&gt;mac_type == e1000_80003es2lan) &amp;&amp;</div><div class='ctx'>         (hw-&gt;media_type == e1000_media_type_copper)) {</div><div class='ctx'>         if (*speed == SPEED_1000)</div><div class='ctx'>             ret_val = e1000_configure_kmrn_for_1000(hw);</div><div class='ctx'>         else</div><div class='del'>-            ret_val = e1000_configure_kmrn_for_10_100(hw);</div><div class='add'>+            ret_val = e1000_configure_kmrn_for_10_100(hw, *duplex);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ((hw-&gt;phy_type == e1000_phy_igp_3) &amp;&amp; (*speed == SPEED_1000)) {</div><div class='add'>+        ret_val = e1000_kumeran_lock_loss_workaround(hw);</div><div class='ctx'>         if (ret_val)</div><div class='ctx'>             return ret_val;</div><div class='ctx'>     }</div><div class='hunk'>@@ -3078,6 +3243,9 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask)</div><div class='ctx'> </div><div class='ctx'>     DEBUGFUNC("e1000_swfw_sync_acquire");</div><div class='ctx'> </div><div class='add'>+    if (hw-&gt;swfwhw_semaphore_present)</div><div class='add'>+        return e1000_get_software_flag(hw);</div><div class='add'>+</div><div class='ctx'>     if (!hw-&gt;swfw_sync_present)</div><div class='ctx'>         return e1000_get_hw_eeprom_semaphore(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -3117,6 +3285,11 @@ e1000_swfw_sync_release(struct e1000_hw *hw, uint16_t mask)</div><div class='ctx'> </div><div class='ctx'>     DEBUGFUNC("e1000_swfw_sync_release");</div><div class='ctx'> </div><div class='add'>+    if (hw-&gt;swfwhw_semaphore_present) {</div><div class='add'>+        e1000_release_software_flag(hw);</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     if (!hw-&gt;swfw_sync_present) {</div><div class='ctx'>         e1000_put_hw_eeprom_semaphore(hw);</div><div class='ctx'>         return;</div><div class='hunk'>@@ -3159,7 +3332,8 @@ e1000_read_phy_reg(struct e1000_hw *hw,</div><div class='ctx'>     if (e1000_swfw_sync_acquire(hw, swfw))</div><div class='ctx'>         return -E1000_ERR_SWFW_SYNC;</div><div class='ctx'> </div><div class='del'>-    if((hw-&gt;phy_type == e1000_phy_igp || </div><div class='add'>+    if ((hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+        hw-&gt;phy_type == e1000_phy_igp_3 ||</div><div class='ctx'>         hw-&gt;phy_type == e1000_phy_igp_2) &amp;&amp;</div><div class='ctx'>        (reg_addr &gt; MAX_PHY_MULTI_PAGE_REG)) {</div><div class='ctx'>         ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,</div><div class='hunk'>@@ -3298,7 +3472,8 @@ e1000_write_phy_reg(struct e1000_hw *hw,</div><div class='ctx'>     if (e1000_swfw_sync_acquire(hw, swfw))</div><div class='ctx'>         return -E1000_ERR_SWFW_SYNC;</div><div class='ctx'> </div><div class='del'>-    if((hw-&gt;phy_type == e1000_phy_igp || </div><div class='add'>+    if ((hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+        hw-&gt;phy_type == e1000_phy_igp_3 ||</div><div class='ctx'>         hw-&gt;phy_type == e1000_phy_igp_2) &amp;&amp;</div><div class='ctx'>        (reg_addr &gt; MAX_PHY_MULTI_PAGE_REG)) {</div><div class='ctx'>         ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,</div><div class='hunk'>@@ -3496,24 +3671,24 @@ e1000_phy_hw_reset(struct e1000_hw *hw)</div><div class='ctx'>         }</div><div class='ctx'>         /* Read the device control register and assert the E1000_CTRL_PHY_RST</div><div class='ctx'>          * bit. Then, take it out of reset.</div><div class='del'>-         * For pre-e1000_82571 hardware, we delay for 10ms between the assert </div><div class='add'>+         * For pre-e1000_82571 hardware, we delay for 10ms between the assert</div><div class='ctx'>          * and deassert.  For e1000_82571 hardware and later, we instead delay</div><div class='ctx'>          * for 50us between and 10ms after the deassertion.</div><div class='ctx'>          */</div><div class='ctx'>         ctrl = E1000_READ_REG(hw, CTRL);</div><div class='ctx'>         E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PHY_RST);</div><div class='ctx'>         E1000_WRITE_FLUSH(hw);</div><div class='del'>-        </div><div class='del'>-        if (hw-&gt;mac_type &lt; e1000_82571) </div><div class='add'>+</div><div class='add'>+        if (hw-&gt;mac_type &lt; e1000_82571)</div><div class='ctx'>             msec_delay(10);</div><div class='ctx'>         else</div><div class='ctx'>             udelay(100);</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         E1000_WRITE_REG(hw, CTRL, ctrl);</div><div class='ctx'>         E1000_WRITE_FLUSH(hw);</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         if (hw-&gt;mac_type &gt;= e1000_82571)</div><div class='del'>-            msec_delay(10);</div><div class='add'>+            msec_delay_irq(10);</div><div class='ctx'>         e1000_swfw_sync_release(hw, swfw);</div><div class='ctx'>     } else {</div><div class='ctx'>         /* Read the Extended Device Control Register, assert the PHY_RESET_DIR</div><div class='hunk'>@@ -3543,6 +3718,12 @@ e1000_phy_hw_reset(struct e1000_hw *hw)</div><div class='ctx'>     ret_val = e1000_get_phy_cfg_done(hw);</div><div class='ctx'>     e1000_release_software_semaphore(hw);</div><div class='ctx'> </div><div class='add'>+        if ((hw-&gt;mac_type == e1000_ich8lan) &amp;&amp;</div><div class='add'>+            (hw-&gt;phy_type == e1000_phy_igp_3)) {</div><div class='add'>+            ret_val = e1000_init_lcd_from_nvm(hw);</div><div class='add'>+            if (ret_val)</div><div class='add'>+                return ret_val;</div><div class='add'>+        }</div><div class='ctx'>     return ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3571,9 +3752,11 @@ e1000_phy_reset(struct e1000_hw *hw)</div><div class='ctx'>     case e1000_82541_rev_2:</div><div class='ctx'>     case e1000_82571:</div><div class='ctx'>     case e1000_82572:</div><div class='add'>+    case e1000_ich8lan:</div><div class='ctx'>         ret_val = e1000_phy_hw_reset(hw);</div><div class='ctx'>         if(ret_val)</div><div class='ctx'>             return ret_val;</div><div class='add'>+</div><div class='ctx'>         break;</div><div class='ctx'>     default:</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &amp;phy_data);</div><div class='hunk'>@@ -3596,11 +3779,120 @@ e1000_phy_reset(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='add'>+* Work-around for 82566 power-down: on D3 entry-</div><div class='add'>+* 1) disable gigabit link</div><div class='add'>+* 2) write VR power-down enable</div><div class='add'>+* 3) read it back</div><div class='add'>+* if successful continue, else issue LCD reset and repeat</div><div class='add'>+*</div><div class='add'>+* hw - struct containing variables accessed by shared code</div><div class='add'>+******************************************************************************/</div><div class='add'>+void</div><div class='add'>+e1000_phy_powerdown_workaround(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    int32_t reg;</div><div class='add'>+    uint16_t phy_data;</div><div class='add'>+    int32_t retry = 0;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_phy_powerdown_workaround");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;phy_type != e1000_phy_igp_3)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    do {</div><div class='add'>+        /* Disable link */</div><div class='add'>+        reg = E1000_READ_REG(hw, PHY_CTRL);</div><div class='add'>+        E1000_WRITE_REG(hw, PHY_CTRL, reg | E1000_PHY_CTRL_GBE_DISABLE |</div><div class='add'>+                        E1000_PHY_CTRL_NOND0A_GBE_DISABLE);</div><div class='add'>+</div><div class='add'>+        /* Write VR power-down enable */</div><div class='add'>+        e1000_read_phy_reg(hw, IGP3_VR_CTRL, &amp;phy_data);</div><div class='add'>+        e1000_write_phy_reg(hw, IGP3_VR_CTRL, phy_data |</div><div class='add'>+                            IGP3_VR_CTRL_MODE_SHUT);</div><div class='add'>+</div><div class='add'>+        /* Read it back and test */</div><div class='add'>+        e1000_read_phy_reg(hw, IGP3_VR_CTRL, &amp;phy_data);</div><div class='add'>+        if ((phy_data &amp; IGP3_VR_CTRL_MODE_SHUT) || retry)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+        /* Issue PHY reset and repeat at most one more time */</div><div class='add'>+        reg = E1000_READ_REG(hw, CTRL);</div><div class='add'>+        E1000_WRITE_REG(hw, CTRL, reg | E1000_CTRL_PHY_RST);</div><div class='add'>+        retry++;</div><div class='add'>+    } while (retry);</div><div class='add'>+</div><div class='add'>+    return;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+* Work-around for 82566 Kumeran PCS lock loss:</div><div class='add'>+* On link status change (i.e. PCI reset, speed change) and link is up and</div><div class='add'>+* speed is gigabit-</div><div class='add'>+* 0) if workaround is optionally disabled do nothing</div><div class='add'>+* 1) wait 1ms for Kumeran link to come up</div><div class='add'>+* 2) check Kumeran Diagnostic register PCS lock loss bit</div><div class='add'>+* 3) if not set the link is locked (all is good), otherwise...</div><div class='add'>+* 4) reset the PHY</div><div class='add'>+* 5) repeat up to 10 times</div><div class='add'>+* Note: this is only called for IGP3 copper when speed is 1gb.</div><div class='add'>+*</div><div class='add'>+* hw - struct containing variables accessed by shared code</div><div class='add'>+******************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    int32_t ret_val;</div><div class='add'>+    int32_t reg;</div><div class='add'>+    int32_t cnt;</div><div class='add'>+    uint16_t phy_data;</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;kmrn_lock_loss_workaround_disabled)</div><div class='add'>+        return E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    /* Make sure link is up before proceeding. If not just return.</div><div class='add'>+     * Attempting this while link is negotiating fouls up link</div><div class='add'>+     * stability */</div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &amp;phy_data);</div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &amp;phy_data);</div><div class='add'>+</div><div class='add'>+    if (phy_data &amp; MII_SR_LINK_STATUS) {</div><div class='add'>+        for (cnt = 0; cnt &lt; 10; cnt++) {</div><div class='add'>+            /* read once to clear */</div><div class='add'>+            ret_val = e1000_read_phy_reg(hw, IGP3_KMRN_DIAG, &amp;phy_data);</div><div class='add'>+            if (ret_val)</div><div class='add'>+                return ret_val;</div><div class='add'>+            /* and again to get new status */</div><div class='add'>+            ret_val = e1000_read_phy_reg(hw, IGP3_KMRN_DIAG, &amp;phy_data);</div><div class='add'>+            if (ret_val)</div><div class='add'>+                return ret_val;</div><div class='add'>+</div><div class='add'>+            /* check for PCS lock */</div><div class='add'>+            if (!(phy_data &amp; IGP3_KMRN_DIAG_PCS_LOCK_LOSS))</div><div class='add'>+                return E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+            /* Issue PHY reset */</div><div class='add'>+            e1000_phy_hw_reset(hw);</div><div class='add'>+            msec_delay_irq(5);</div><div class='add'>+        }</div><div class='add'>+        /* Disable GigE link negotiation */</div><div class='add'>+        reg = E1000_READ_REG(hw, PHY_CTRL);</div><div class='add'>+        E1000_WRITE_REG(hw, PHY_CTRL, reg | E1000_PHY_CTRL_GBE_DISABLE |</div><div class='add'>+                        E1000_PHY_CTRL_NOND0A_GBE_DISABLE);</div><div class='add'>+</div><div class='add'>+        /* unable to acquire PCS lock */</div><div class='add'>+        return E1000_ERR_PHY;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return E1000_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='ctx'> * Probes the expected PHY address for known PHY IDs</div><div class='ctx'> *</div><div class='ctx'> * hw - Struct containing variables accessed by shared code</div><div class='ctx'> ******************************************************************************/</div><div class='del'>-static int32_t</div><div class='add'>+int32_t</div><div class='ctx'> e1000_detect_gig_phy(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'>     int32_t phy_init_status, ret_val;</div><div class='hunk'>@@ -3612,8 +3904,8 @@ e1000_detect_gig_phy(struct e1000_hw *hw)</div><div class='ctx'>     /* The 82571 firmware may still be configuring the PHY.  In this</div><div class='ctx'>      * case, we cannot access the PHY until the configuration is done.  So</div><div class='ctx'>      * we explicitly set the PHY values. */</div><div class='del'>-    if(hw-&gt;mac_type == e1000_82571 ||</div><div class='del'>-       hw-&gt;mac_type == e1000_82572) {</div><div class='add'>+    if (hw-&gt;mac_type == e1000_82571 ||</div><div class='add'>+        hw-&gt;mac_type == e1000_82572) {</div><div class='ctx'>         hw-&gt;phy_id = IGP01E1000_I_PHY_ID;</div><div class='ctx'>         hw-&gt;phy_type = e1000_phy_igp_2;</div><div class='ctx'>         return E1000_SUCCESS;</div><div class='hunk'>@@ -3630,7 +3922,7 @@ e1000_detect_gig_phy(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     /* Read the PHY ID Registers to identify which PHY is onboard. */</div><div class='ctx'>     ret_val = e1000_read_phy_reg(hw, PHY_ID1, &amp;phy_id_high);</div><div class='del'>-    if(ret_val)</div><div class='add'>+    if (ret_val)</div><div class='ctx'>         return ret_val;</div><div class='ctx'> </div><div class='ctx'>     hw-&gt;phy_id = (uint32_t) (phy_id_high &lt;&lt; 16);</div><div class='hunk'>@@ -3668,6 +3960,12 @@ e1000_detect_gig_phy(struct e1000_hw *hw)</div><div class='ctx'>     case e1000_80003es2lan:</div><div class='ctx'>         if (hw-&gt;phy_id == GG82563_E_PHY_ID) match = TRUE;</div><div class='ctx'>         break;</div><div class='add'>+    case e1000_ich8lan:</div><div class='add'>+        if (hw-&gt;phy_id == IGP03E1000_E_PHY_ID) match = TRUE;</div><div class='add'>+        if (hw-&gt;phy_id == IFE_E_PHY_ID) match = TRUE;</div><div class='add'>+        if (hw-&gt;phy_id == IFE_PLUS_E_PHY_ID) match = TRUE;</div><div class='add'>+        if (hw-&gt;phy_id == IFE_C_E_PHY_ID) match = TRUE;</div><div class='add'>+        break;</div><div class='ctx'>     default:</div><div class='ctx'>         DEBUGOUT1("Invalid MAC type %d\n", hw-&gt;mac_type);</div><div class='ctx'>         return -E1000_ERR_CONFIG;</div><div class='hunk'>@@ -3783,6 +4081,53 @@ e1000_phy_igp_get_info(struct e1000_hw *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='add'>+* Get PHY information from various PHY registers for ife PHY only.</div><div class='add'>+*</div><div class='add'>+* hw - Struct containing variables accessed by shared code</div><div class='add'>+* phy_info - PHY information structure</div><div class='add'>+******************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_phy_ife_get_info(struct e1000_hw *hw,</div><div class='add'>+                       struct e1000_phy_info *phy_info)</div><div class='add'>+{</div><div class='add'>+    int32_t ret_val;</div><div class='add'>+    uint16_t phy_data, polarity;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_phy_ife_get_info");</div><div class='add'>+</div><div class='add'>+    phy_info-&gt;downshift = (e1000_downshift)hw-&gt;speed_downgraded;</div><div class='add'>+    phy_info-&gt;extended_10bt_distance = e1000_10bt_ext_dist_enable_normal;</div><div class='add'>+</div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL, &amp;phy_data);</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+    phy_info-&gt;polarity_correction =</div><div class='add'>+                        (phy_data &amp; IFE_PSC_AUTO_POLARITY_DISABLE) &gt;&gt;</div><div class='add'>+                        IFE_PSC_AUTO_POLARITY_DISABLE_SHIFT;</div><div class='add'>+</div><div class='add'>+    if (phy_info-&gt;polarity_correction == e1000_polarity_reversal_enabled) {</div><div class='add'>+        ret_val = e1000_check_polarity(hw, &amp;polarity);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+    } else {</div><div class='add'>+        /* Polarity is forced. */</div><div class='add'>+        polarity = (phy_data &amp; IFE_PSC_FORCE_POLARITY) &gt;&gt;</div><div class='add'>+                       IFE_PSC_FORCE_POLARITY_SHIFT;</div><div class='add'>+    }</div><div class='add'>+    phy_info-&gt;cable_polarity = polarity;</div><div class='add'>+</div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, IFE_PHY_MDIX_CONTROL, &amp;phy_data);</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+</div><div class='add'>+    phy_info-&gt;mdix_mode =</div><div class='add'>+                     (phy_data &amp; (IFE_PMC_AUTO_MDIX | IFE_PMC_FORCE_MDIX)) &gt;&gt;</div><div class='add'>+                     IFE_PMC_MDIX_MODE_SHIFT;</div><div class='add'>+</div><div class='add'>+    return E1000_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='ctx'> * Get PHY information from various PHY registers fot m88 PHY only.</div><div class='ctx'> *</div><div class='ctx'> * hw - Struct containing variables accessed by shared code</div><div class='hunk'>@@ -3815,7 +4160,7 @@ e1000_phy_m88_get_info(struct e1000_hw *hw,</div><div class='ctx'>     /* Check polarity status */</div><div class='ctx'>     ret_val = e1000_check_polarity(hw, &amp;polarity);</div><div class='ctx'>     if(ret_val)</div><div class='del'>-        return ret_val; </div><div class='add'>+        return ret_val;</div><div class='ctx'>     phy_info-&gt;cable_polarity = polarity;</div><div class='ctx'> </div><div class='ctx'>     ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &amp;phy_data);</div><div class='hunk'>@@ -3897,9 +4242,12 @@ e1000_phy_get_info(struct e1000_hw *hw,</div><div class='ctx'>         return -E1000_ERR_CONFIG;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if(hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+    if (hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+        hw-&gt;phy_type == e1000_phy_igp_3 ||</div><div class='ctx'>         hw-&gt;phy_type == e1000_phy_igp_2)</div><div class='ctx'>         return e1000_phy_igp_get_info(hw, phy_info);</div><div class='add'>+    else if (hw-&gt;phy_type == e1000_phy_ife)</div><div class='add'>+        return e1000_phy_ife_get_info(hw, phy_info);</div><div class='ctx'>     else</div><div class='ctx'>         return e1000_phy_m88_get_info(hw, phy_info);</div><div class='ctx'> }</div><div class='hunk'>@@ -4048,6 +4396,35 @@ e1000_init_eeprom_params(struct e1000_hw *hw)</div><div class='ctx'>         eeprom-&gt;use_eerd = TRUE;</div><div class='ctx'>         eeprom-&gt;use_eewr = FALSE;</div><div class='ctx'>         break;</div><div class='add'>+    case e1000_ich8lan:</div><div class='add'>+    {</div><div class='add'>+        int32_t  i = 0;</div><div class='add'>+        uint32_t flash_size = E1000_READ_ICH8_REG(hw, ICH8_FLASH_GFPREG);</div><div class='add'>+</div><div class='add'>+        eeprom-&gt;type = e1000_eeprom_ich8;</div><div class='add'>+        eeprom-&gt;use_eerd = FALSE;</div><div class='add'>+        eeprom-&gt;use_eewr = FALSE;</div><div class='add'>+        eeprom-&gt;word_size = E1000_SHADOW_RAM_WORDS;</div><div class='add'>+</div><div class='add'>+        /* Zero the shadow RAM structure. But don't load it from NVM</div><div class='add'>+         * so as to save time for driver init */</div><div class='add'>+        if (hw-&gt;eeprom_shadow_ram != NULL) {</div><div class='add'>+            for (i = 0; i &lt; E1000_SHADOW_RAM_WORDS; i++) {</div><div class='add'>+                hw-&gt;eeprom_shadow_ram[i].modified = FALSE;</div><div class='add'>+                hw-&gt;eeprom_shadow_ram[i].eeprom_word = 0xFFFF;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        hw-&gt;flash_base_addr = (flash_size &amp; ICH8_GFPREG_BASE_MASK) *</div><div class='add'>+                              ICH8_FLASH_SECTOR_SIZE;</div><div class='add'>+</div><div class='add'>+        hw-&gt;flash_bank_size = ((flash_size &gt;&gt; 16) &amp; ICH8_GFPREG_BASE_MASK) + 1;</div><div class='add'>+        hw-&gt;flash_bank_size -= (flash_size &amp; ICH8_GFPREG_BASE_MASK);</div><div class='add'>+        hw-&gt;flash_bank_size *= ICH8_FLASH_SECTOR_SIZE;</div><div class='add'>+        hw-&gt;flash_bank_size /= 2 * sizeof(uint16_t);</div><div class='add'>+</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='ctx'>     default:</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='hunk'>@@ -4468,7 +4845,10 @@ e1000_read_eeprom(struct e1000_hw *hw,</div><div class='ctx'>         return ret_val;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if(eeprom-&gt;type == e1000_eeprom_spi) {</div><div class='add'>+    if (eeprom-&gt;type == e1000_eeprom_ich8)</div><div class='add'>+        return e1000_read_eeprom_ich8(hw, offset, words, data);</div><div class='add'>+</div><div class='add'>+    if (eeprom-&gt;type == e1000_eeprom_spi) {</div><div class='ctx'>         uint16_t word_in;</div><div class='ctx'>         uint8_t read_opcode = EEPROM_READ_OPCODE_SPI;</div><div class='ctx'> </div><div class='hunk'>@@ -4540,14 +4920,14 @@ e1000_read_eeprom_eerd(struct e1000_hw *hw,</div><div class='ctx'> </div><div class='ctx'>         E1000_WRITE_REG(hw, EERD, eerd);</div><div class='ctx'>         error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_READ);</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         if(error) {</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>         data[i] = (E1000_READ_REG(hw, EERD) &gt;&gt; E1000_EEPROM_RW_REG_DATA);</div><div class='del'>-      </div><div class='add'>+</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4573,24 +4953,24 @@ e1000_write_eeprom_eewr(struct e1000_hw *hw,</div><div class='ctx'>         return -E1000_ERR_SWFW_SYNC;</div><div class='ctx'> </div><div class='ctx'>     for (i = 0; i &lt; words; i++) {</div><div class='del'>-        register_value = (data[i] &lt;&lt; E1000_EEPROM_RW_REG_DATA) | </div><div class='del'>-                         ((offset+i) &lt;&lt; E1000_EEPROM_RW_ADDR_SHIFT) | </div><div class='add'>+        register_value = (data[i] &lt;&lt; E1000_EEPROM_RW_REG_DATA) |</div><div class='add'>+                         ((offset+i) &lt;&lt; E1000_EEPROM_RW_ADDR_SHIFT) |</div><div class='ctx'>                          E1000_EEPROM_RW_REG_START;</div><div class='ctx'> </div><div class='ctx'>         error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_WRITE);</div><div class='ctx'>         if(error) {</div><div class='ctx'>             break;</div><div class='del'>-        }       </div><div class='add'>+        }</div><div class='ctx'> </div><div class='ctx'>         E1000_WRITE_REG(hw, EEWR, register_value);</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_WRITE);</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         if(error) {</div><div class='ctx'>             break;</div><div class='del'>-        }       </div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     e1000_swfw_sync_release(hw, E1000_SWFW_EEP_SM);</div><div class='ctx'>     return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -4610,7 +4990,7 @@ e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)</div><div class='ctx'>     for(i = 0; i &lt; attempts; i++) {</div><div class='ctx'>         if(eerd == E1000_EEPROM_POLL_READ)</div><div class='ctx'>             reg = E1000_READ_REG(hw, EERD);</div><div class='del'>-        else </div><div class='add'>+        else</div><div class='ctx'>             reg = E1000_READ_REG(hw, EEWR);</div><div class='ctx'> </div><div class='ctx'>         if(reg &amp; E1000_EEPROM_RW_REG_DONE) {</div><div class='hunk'>@@ -4635,7 +5015,10 @@ e1000_is_onboard_nvm_eeprom(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     DEBUGFUNC("e1000_is_onboard_nvm_eeprom");</div><div class='ctx'> </div><div class='del'>-    if(hw-&gt;mac_type == e1000_82573) {</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        return FALSE;</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type == e1000_82573) {</div><div class='ctx'>         eecd = E1000_READ_REG(hw, EECD);</div><div class='ctx'> </div><div class='ctx'>         /* Isolate bits 15 &amp; 16 */</div><div class='hunk'>@@ -4685,8 +5068,22 @@ e1000_validate_eeprom_checksum(struct e1000_hw *hw)</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    for(i = 0; i &lt; (EEPROM_CHECKSUM_REG + 1); i++) {</div><div class='del'>-        if(e1000_read_eeprom(hw, i, 1, &amp;eeprom_data) &lt; 0) {</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        /* Drivers must allocate the shadow ram structure for the</div><div class='add'>+         * EEPROM checksum to be updated.  Otherwise, this bit as well</div><div class='add'>+         * as the checksum must both be set correctly for this</div><div class='add'>+         * validation to pass.</div><div class='add'>+         */</div><div class='add'>+        e1000_read_eeprom(hw, 0x19, 1, &amp;eeprom_data);</div><div class='add'>+        if ((eeprom_data &amp; 0x40) == 0) {</div><div class='add'>+            eeprom_data |= 0x40;</div><div class='add'>+            e1000_write_eeprom(hw, 0x19, 1, &amp;eeprom_data);</div><div class='add'>+            e1000_update_eeprom_checksum(hw);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    for (i = 0; i &lt; (EEPROM_CHECKSUM_REG + 1); i++) {</div><div class='add'>+        if (e1000_read_eeprom(hw, i, 1, &amp;eeprom_data) &lt; 0) {</div><div class='ctx'>             DEBUGOUT("EEPROM Read Error\n");</div><div class='ctx'>             return -E1000_ERR_EEPROM;</div><div class='ctx'>         }</div><div class='hunk'>@@ -4712,6 +5109,7 @@ e1000_validate_eeprom_checksum(struct e1000_hw *hw)</div><div class='ctx'> int32_t</div><div class='ctx'> e1000_update_eeprom_checksum(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='add'>+    uint32_t ctrl_ext;</div><div class='ctx'>     uint16_t checksum = 0;</div><div class='ctx'>     uint16_t i, eeprom_data;</div><div class='ctx'> </div><div class='hunk'>@@ -4730,6 +5128,14 @@ e1000_update_eeprom_checksum(struct e1000_hw *hw)</div><div class='ctx'>         return -E1000_ERR_EEPROM;</div><div class='ctx'>     } else if (hw-&gt;eeprom.type == e1000_eeprom_flash) {</div><div class='ctx'>         e1000_commit_shadow_ram(hw);</div><div class='add'>+    } else if (hw-&gt;eeprom.type == e1000_eeprom_ich8) {</div><div class='add'>+        e1000_commit_shadow_ram(hw);</div><div class='add'>+        /* Reload the EEPROM, or else modifications will not appear</div><div class='add'>+         * until after next adapter reset. */</div><div class='add'>+        ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);</div><div class='add'>+        ctrl_ext |= E1000_CTRL_EXT_EE_RST;</div><div class='add'>+        E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);</div><div class='add'>+        msec_delay(10);</div><div class='ctx'>     }</div><div class='ctx'>     return E1000_SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -4769,6 +5175,9 @@ e1000_write_eeprom(struct e1000_hw *hw,</div><div class='ctx'>     if(eeprom-&gt;use_eewr == TRUE)</div><div class='ctx'>         return e1000_write_eeprom_eewr(hw, offset, words, data);</div><div class='ctx'> </div><div class='add'>+    if (eeprom-&gt;type == e1000_eeprom_ich8)</div><div class='add'>+        return e1000_write_eeprom_ich8(hw, offset, words, data);</div><div class='add'>+</div><div class='ctx'>     /* Prepare the EEPROM for writing  */</div><div class='ctx'>     if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)</div><div class='ctx'>         return -E1000_ERR_EEPROM;</div><div class='hunk'>@@ -4956,11 +5365,17 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)</div><div class='ctx'>     uint32_t flop = 0;</div><div class='ctx'>     uint32_t i = 0;</div><div class='ctx'>     int32_t error = E1000_SUCCESS;</div><div class='del'>-</div><div class='del'>-    /* The flop register will be used to determine if flash type is STM */</div><div class='del'>-    flop = E1000_READ_REG(hw, FLOP);</div><div class='add'>+    uint32_t old_bank_offset = 0;</div><div class='add'>+    uint32_t new_bank_offset = 0;</div><div class='add'>+    uint32_t sector_retries = 0;</div><div class='add'>+    uint8_t low_byte = 0;</div><div class='add'>+    uint8_t high_byte = 0;</div><div class='add'>+    uint8_t temp_byte = 0;</div><div class='add'>+    boolean_t sector_write_failed = FALSE;</div><div class='ctx'> </div><div class='ctx'>     if (hw-&gt;mac_type == e1000_82573) {</div><div class='add'>+        /* The flop register will be used to determine if flash type is STM */</div><div class='add'>+        flop = E1000_READ_REG(hw, FLOP);</div><div class='ctx'>         for (i=0; i &lt; attempts; i++) {</div><div class='ctx'>             eecd = E1000_READ_REG(hw, EECD);</div><div class='ctx'>             if ((eecd &amp; E1000_EECD_FLUPD) == 0) {</div><div class='hunk'>@@ -4994,6 +5409,106 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan &amp;&amp; hw-&gt;eeprom_shadow_ram != NULL) {</div><div class='add'>+        /* We're writing to the opposite bank so if we're on bank 1,</div><div class='add'>+         * write to bank 0 etc.  We also need to erase the segment that</div><div class='add'>+         * is going to be written */</div><div class='add'>+        if (!(E1000_READ_REG(hw, EECD) &amp; E1000_EECD_SEC1VAL)) {</div><div class='add'>+            new_bank_offset = hw-&gt;flash_bank_size * 2;</div><div class='add'>+            old_bank_offset = 0;</div><div class='add'>+            e1000_erase_ich8_4k_segment(hw, 1);</div><div class='add'>+        } else {</div><div class='add'>+            old_bank_offset = hw-&gt;flash_bank_size * 2;</div><div class='add'>+            new_bank_offset = 0;</div><div class='add'>+            e1000_erase_ich8_4k_segment(hw, 0);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        do {</div><div class='add'>+            sector_write_failed = FALSE;</div><div class='add'>+            /* Loop for every byte in the shadow RAM,</div><div class='add'>+             * which is in units of words. */</div><div class='add'>+            for (i = 0; i &lt; E1000_SHADOW_RAM_WORDS; i++) {</div><div class='add'>+                /* Determine whether to write the value stored</div><div class='add'>+                 * in the other NVM bank or a modified value stored</div><div class='add'>+                 * in the shadow RAM */</div><div class='add'>+                if (hw-&gt;eeprom_shadow_ram[i].modified == TRUE) {</div><div class='add'>+                    low_byte = (uint8_t)hw-&gt;eeprom_shadow_ram[i].eeprom_word;</div><div class='add'>+                    e1000_read_ich8_byte(hw, (i &lt;&lt; 1) + old_bank_offset,</div><div class='add'>+                                         &amp;temp_byte);</div><div class='add'>+                    udelay(100);</div><div class='add'>+                    error = e1000_verify_write_ich8_byte(hw,</div><div class='add'>+                                                 (i &lt;&lt; 1) + new_bank_offset,</div><div class='add'>+                                                 low_byte);</div><div class='add'>+                    if (error != E1000_SUCCESS)</div><div class='add'>+                        sector_write_failed = TRUE;</div><div class='add'>+                    high_byte =</div><div class='add'>+                        (uint8_t)(hw-&gt;eeprom_shadow_ram[i].eeprom_word &gt;&gt; 8);</div><div class='add'>+                    e1000_read_ich8_byte(hw, (i &lt;&lt; 1) + old_bank_offset + 1,</div><div class='add'>+                                         &amp;temp_byte);</div><div class='add'>+                    udelay(100);</div><div class='add'>+                } else {</div><div class='add'>+                    e1000_read_ich8_byte(hw, (i &lt;&lt; 1) + old_bank_offset,</div><div class='add'>+                                         &amp;low_byte);</div><div class='add'>+                    udelay(100);</div><div class='add'>+                    error = e1000_verify_write_ich8_byte(hw,</div><div class='add'>+                                 (i &lt;&lt; 1) + new_bank_offset, low_byte);</div><div class='add'>+                    if (error != E1000_SUCCESS)</div><div class='add'>+                        sector_write_failed = TRUE;</div><div class='add'>+                    e1000_read_ich8_byte(hw, (i &lt;&lt; 1) + old_bank_offset + 1,</div><div class='add'>+                                         &amp;high_byte);</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+                /* If the word is 0x13, then make sure the signature bits</div><div class='add'>+                 * (15:14) are 11b until the commit has completed.</div><div class='add'>+                 * This will allow us to write 10b which indicates the</div><div class='add'>+                 * signature is valid.  We want to do this after the write</div><div class='add'>+                 * has completed so that we don't mark the segment valid</div><div class='add'>+                 * while the write is still in progress */</div><div class='add'>+                if (i == E1000_ICH8_NVM_SIG_WORD)</div><div class='add'>+                    high_byte = E1000_ICH8_NVM_SIG_MASK | high_byte;</div><div class='add'>+</div><div class='add'>+                error = e1000_verify_write_ich8_byte(hw,</div><div class='add'>+                             (i &lt;&lt; 1) + new_bank_offset + 1, high_byte);</div><div class='add'>+                if (error != E1000_SUCCESS)</div><div class='add'>+                    sector_write_failed = TRUE;</div><div class='add'>+</div><div class='add'>+                if (sector_write_failed == FALSE) {</div><div class='add'>+                    /* Clear the now not used entry in the cache */</div><div class='add'>+                    hw-&gt;eeprom_shadow_ram[i].modified = FALSE;</div><div class='add'>+                    hw-&gt;eeprom_shadow_ram[i].eeprom_word = 0xFFFF;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Don't bother writing the segment valid bits if sector</div><div class='add'>+             * programming failed. */</div><div class='add'>+            if (sector_write_failed == FALSE) {</div><div class='add'>+                /* Finally validate the new segment by setting bit 15:14</div><div class='add'>+                 * to 10b in word 0x13 , this can be done without an</div><div class='add'>+                 * erase as well since these bits are 11 to start with</div><div class='add'>+                 * and we need to change bit 14 to 0b */</div><div class='add'>+                e1000_read_ich8_byte(hw,</div><div class='add'>+                    E1000_ICH8_NVM_SIG_WORD * 2 + 1 + new_bank_offset,</div><div class='add'>+                    &amp;high_byte);</div><div class='add'>+                high_byte &amp;= 0xBF;</div><div class='add'>+                error = e1000_verify_write_ich8_byte(hw,</div><div class='add'>+                            E1000_ICH8_NVM_SIG_WORD * 2 + 1 + new_bank_offset,</div><div class='add'>+                            high_byte);</div><div class='add'>+                if (error != E1000_SUCCESS)</div><div class='add'>+                    sector_write_failed = TRUE;</div><div class='add'>+</div><div class='add'>+                /* And invalidate the previously valid segment by setting</div><div class='add'>+                 * its signature word (0x13) high_byte to 0b. This can be</div><div class='add'>+                 * done without an erase because flash erase sets all bits</div><div class='add'>+                 * to 1's. We can write 1's to 0's without an erase */</div><div class='add'>+                error = e1000_verify_write_ich8_byte(hw,</div><div class='add'>+                            E1000_ICH8_NVM_SIG_WORD * 2 + 1 + old_bank_offset,</div><div class='add'>+                            0);</div><div class='add'>+                if (error != E1000_SUCCESS)</div><div class='add'>+                    sector_write_failed = TRUE;</div><div class='add'>+            }</div><div class='add'>+        } while (++sector_retries &lt; 10 &amp;&amp; sector_write_failed == TRUE);</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5101,15 +5616,19 @@ e1000_init_rx_addrs(struct e1000_hw *hw)</div><div class='ctx'>      * the other port. */</div><div class='ctx'>     if ((hw-&gt;mac_type == e1000_82571) &amp;&amp; (hw-&gt;laa_is_present == TRUE))</div><div class='ctx'>         rar_num -= 1;</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        rar_num = E1000_RAR_ENTRIES_ICH8LAN;</div><div class='add'>+</div><div class='ctx'>     /* Zero out the other 15 receive addresses. */</div><div class='ctx'>     DEBUGOUT("Clearing RAR[1-15]\n");</div><div class='ctx'>     for(i = 1; i &lt; rar_num; i++) {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, RA, (i &lt;&lt; 1), 0);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, RA, ((i &lt;&lt; 1) + 1), 0);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Updates the MAC's list of multicast addresses.</div><div class='ctx'>  *</div><div class='hunk'>@@ -5135,7 +5654,7 @@ e1000_mc_addr_list_update(struct e1000_hw *hw,</div><div class='ctx'>     uint32_t i;</div><div class='ctx'>     uint32_t num_rar_entry;</div><div class='ctx'>     uint32_t num_mta_entry;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     DEBUGFUNC("e1000_mc_addr_list_update");</div><div class='ctx'> </div><div class='ctx'>     /* Set the new number of MC addresses that we are being requested to use. */</div><div class='hunk'>@@ -5144,6 +5663,8 @@ e1000_mc_addr_list_update(struct e1000_hw *hw,</div><div class='ctx'>     /* Clear RAR[1-15] */</div><div class='ctx'>     DEBUGOUT(" Clearing RAR[1-15]\n");</div><div class='ctx'>     num_rar_entry = E1000_RAR_ENTRIES;</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        num_rar_entry = E1000_RAR_ENTRIES_ICH8LAN;</div><div class='ctx'>     /* Reserve a spot for the Locally Administered Address to work around</div><div class='ctx'>      * an 82571 issue in which a reset on one port will reload the MAC on</div><div class='ctx'>      * the other port. */</div><div class='hunk'>@@ -5152,14 +5673,19 @@ e1000_mc_addr_list_update(struct e1000_hw *hw,</div><div class='ctx'> </div><div class='ctx'>     for(i = rar_used_count; i &lt; num_rar_entry; i++) {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, RA, (i &lt;&lt; 1), 0);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, RA, ((i &lt;&lt; 1) + 1), 0);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* Clear the MTA */</div><div class='ctx'>     DEBUGOUT(" Clearing MTA\n");</div><div class='ctx'>     num_mta_entry = E1000_NUM_MTA_REGISTERS;</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        num_mta_entry = E1000_NUM_MTA_REGISTERS_ICH8LAN;</div><div class='ctx'>     for(i = 0; i &lt; num_mta_entry; i++) {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* Add the new addresses */</div><div class='hunk'>@@ -5193,7 +5719,6 @@ e1000_mc_addr_list_update(struct e1000_hw *hw,</div><div class='ctx'>     }</div><div class='ctx'>     DEBUGOUT("MC Update Complete\n");</div><div class='ctx'> }</div><div class='del'>-#endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Hashes an address to determine its location in the multicast table</div><div class='hunk'>@@ -5216,24 +5741,46 @@ e1000_hash_mc_addr(struct e1000_hw *hw,</div><div class='ctx'>      * LSB                 MSB</div><div class='ctx'>      */</div><div class='ctx'>     case 0:</div><div class='del'>-        /* [47:36] i.e. 0x563 for above example address */</div><div class='del'>-        hash_value = ((mc_addr[4] &gt;&gt; 4) | (((uint16_t) mc_addr[5]) &lt;&lt; 4));</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+            /* [47:38] i.e. 0x158 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 6) | (((uint16_t) mc_addr[5]) &lt;&lt; 2));</div><div class='add'>+        } else {</div><div class='add'>+            /* [47:36] i.e. 0x563 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 4) | (((uint16_t) mc_addr[5]) &lt;&lt; 4));</div><div class='add'>+        }</div><div class='ctx'>         break;</div><div class='ctx'>     case 1:</div><div class='del'>-        /* [46:35] i.e. 0xAC6 for above example address */</div><div class='del'>-        hash_value = ((mc_addr[4] &gt;&gt; 3) | (((uint16_t) mc_addr[5]) &lt;&lt; 5));</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+            /* [46:37] i.e. 0x2B1 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 5) | (((uint16_t) mc_addr[5]) &lt;&lt; 3));</div><div class='add'>+        } else {</div><div class='add'>+            /* [46:35] i.e. 0xAC6 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 3) | (((uint16_t) mc_addr[5]) &lt;&lt; 5));</div><div class='add'>+        }</div><div class='ctx'>         break;</div><div class='ctx'>     case 2:</div><div class='del'>-        /* [45:34] i.e. 0x5D8 for above example address */</div><div class='del'>-        hash_value = ((mc_addr[4] &gt;&gt; 2) | (((uint16_t) mc_addr[5]) &lt;&lt; 6));</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+            /*[45:36] i.e. 0x163 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 4) | (((uint16_t) mc_addr[5]) &lt;&lt; 4));</div><div class='add'>+        } else {</div><div class='add'>+            /* [45:34] i.e. 0x5D8 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 2) | (((uint16_t) mc_addr[5]) &lt;&lt; 6));</div><div class='add'>+        }</div><div class='ctx'>         break;</div><div class='ctx'>     case 3:</div><div class='del'>-        /* [43:32] i.e. 0x634 for above example address */</div><div class='del'>-        hash_value = ((mc_addr[4]) | (((uint16_t) mc_addr[5]) &lt;&lt; 8));</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+            /* [43:34] i.e. 0x18D for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4] &gt;&gt; 2) | (((uint16_t) mc_addr[5]) &lt;&lt; 6));</div><div class='add'>+        } else {</div><div class='add'>+            /* [43:32] i.e. 0x634 for above example address */</div><div class='add'>+            hash_value = ((mc_addr[4]) | (((uint16_t) mc_addr[5]) &lt;&lt; 8));</div><div class='add'>+        }</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     hash_value &amp;= 0xFFF;</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        hash_value &amp;= 0x3FF;</div><div class='ctx'> </div><div class='ctx'>     return hash_value;</div><div class='ctx'> }</div><div class='hunk'>@@ -5261,6 +5808,8 @@ e1000_mta_set(struct e1000_hw *hw,</div><div class='ctx'>      * register are determined by the lower 5 bits of the value.</div><div class='ctx'>      */</div><div class='ctx'>     hash_reg = (hash_value &gt;&gt; 5) &amp; 0x7F;</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        hash_reg &amp;= 0x1F;</div><div class='ctx'>     hash_bit = hash_value &amp; 0x1F;</div><div class='ctx'> </div><div class='ctx'>     mta = E1000_READ_REG_ARRAY(hw, MTA, hash_reg);</div><div class='hunk'>@@ -5274,9 +5823,12 @@ e1000_mta_set(struct e1000_hw *hw,</div><div class='ctx'>     if((hw-&gt;mac_type == e1000_82544) &amp;&amp; ((hash_reg &amp; 0x1) == 1)) {</div><div class='ctx'>         temp = E1000_READ_REG_ARRAY(hw, MTA, (hash_reg - 1));</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, MTA, (hash_reg - 1), temp);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     } else {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5333,7 +5885,9 @@ e1000_rar_set(struct e1000_hw *hw,</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     E1000_WRITE_REG_ARRAY(hw, RA, (index &lt;&lt; 1), rar_low);</div><div class='add'>+    E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     E1000_WRITE_REG_ARRAY(hw, RA, ((index &lt;&lt; 1) + 1), rar_high);</div><div class='add'>+    E1000_WRITE_FLUSH(hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -5350,12 +5904,18 @@ e1000_write_vfta(struct e1000_hw *hw,</div><div class='ctx'> {</div><div class='ctx'>     uint32_t temp;</div><div class='ctx'> </div><div class='del'>-    if((hw-&gt;mac_type == e1000_82544) &amp;&amp; ((offset &amp; 0x1) == 1)) {</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    if ((hw-&gt;mac_type == e1000_82544) &amp;&amp; ((offset &amp; 0x1) == 1)) {</div><div class='ctx'>         temp = E1000_READ_REG_ARRAY(hw, VFTA, (offset - 1));</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, VFTA, (offset - 1), temp);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     } else {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, VFTA, offset, value);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5372,6 +5932,9 @@ e1000_clear_vfta(struct e1000_hw *hw)</div><div class='ctx'>     uint32_t vfta_offset = 0;</div><div class='ctx'>     uint32_t vfta_bit_in_reg = 0;</div><div class='ctx'> </div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='ctx'>     if (hw-&gt;mac_type == e1000_82573) {</div><div class='ctx'>         if (hw-&gt;mng_cookie.vlan_id != 0) {</div><div class='ctx'>             /* The VFTA is a 4096b bit-field, each identifying a single VLAN</div><div class='hunk'>@@ -5391,6 +5954,7 @@ e1000_clear_vfta(struct e1000_hw *hw)</div><div class='ctx'>          * manageability unit */</div><div class='ctx'>         vfta_value = (offset == vfta_offset) ? vfta_bit_in_reg : 0;</div><div class='ctx'>         E1000_WRITE_REG_ARRAY(hw, VFTA, offset, vfta_value);</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5420,9 +5984,18 @@ e1000_id_led_init(struct e1000_hw * hw)</div><div class='ctx'>         DEBUGOUT("EEPROM Read Error\n");</div><div class='ctx'>         return -E1000_ERR_EEPROM;</div><div class='ctx'>     }</div><div class='del'>-    if((eeprom_data== ID_LED_RESERVED_0000) ||</div><div class='del'>-       (eeprom_data == ID_LED_RESERVED_FFFF)) eeprom_data = ID_LED_DEFAULT;</div><div class='del'>-    for(i = 0; i &lt; 4; i++) {</div><div class='add'>+</div><div class='add'>+    if ((hw-&gt;mac_type == e1000_82573) &amp;&amp;</div><div class='add'>+        (eeprom_data == ID_LED_RESERVED_82573))</div><div class='add'>+        eeprom_data = ID_LED_DEFAULT_82573;</div><div class='add'>+    else if ((eeprom_data == ID_LED_RESERVED_0000) ||</div><div class='add'>+            (eeprom_data == ID_LED_RESERVED_FFFF)) {</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan)</div><div class='add'>+            eeprom_data = ID_LED_DEFAULT_ICH8LAN;</div><div class='add'>+        else</div><div class='add'>+            eeprom_data = ID_LED_DEFAULT;</div><div class='add'>+    }</div><div class='add'>+    for (i = 0; i &lt; 4; i++) {</div><div class='ctx'>         temp = (eeprom_data &gt;&gt; (i &lt;&lt; 2)) &amp; led_mask;</div><div class='ctx'>         switch(temp) {</div><div class='ctx'>         case ID_LED_ON1_DEF2:</div><div class='hunk'>@@ -5518,6 +6091,44 @@ e1000_setup_led(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='add'>+ * Used on 82571 and later Si that has LED blink bits.</div><div class='add'>+ * Callers must use their own timer and should have already called</div><div class='add'>+ * e1000_id_led_init()</div><div class='add'>+ * Call e1000_cleanup led() to stop blinking</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_blink_led_start(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    int16_t  i;</div><div class='add'>+    uint32_t ledctl_blink = 0;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_id_led_blink_on");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type &lt; e1000_82571) {</div><div class='add'>+        /* Nothing to do */</div><div class='add'>+        return E1000_SUCCESS;</div><div class='add'>+    }</div><div class='add'>+    if (hw-&gt;media_type == e1000_media_type_fiber) {</div><div class='add'>+        /* always blink LED0 for PCI-E fiber */</div><div class='add'>+        ledctl_blink = E1000_LEDCTL_LED0_BLINK |</div><div class='add'>+                     (E1000_LEDCTL_MODE_LED_ON &lt;&lt; E1000_LEDCTL_LED0_MODE_SHIFT);</div><div class='add'>+    } else {</div><div class='add'>+        /* set the blink bit for each LED that's "on" (0x0E) in ledctl_mode2 */</div><div class='add'>+        ledctl_blink = hw-&gt;ledctl_mode2;</div><div class='add'>+        for (i=0; i &lt; 4; i++)</div><div class='add'>+            if (((hw-&gt;ledctl_mode2 &gt;&gt; (i * 8)) &amp; 0xFF) ==</div><div class='add'>+                E1000_LEDCTL_MODE_LED_ON)</div><div class='add'>+                ledctl_blink |= (E1000_LEDCTL_LED0_BLINK &lt;&lt; (i * 8));</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    E1000_WRITE_REG(hw, LEDCTL, ledctl_blink);</div><div class='add'>+</div><div class='add'>+    return E1000_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='ctx'>  * Restores the saved state of the SW controlable LED.</div><div class='ctx'>  *</div><div class='ctx'>  * hw - Struct containing variables accessed by shared code</div><div class='hunk'>@@ -5547,6 +6158,10 @@ e1000_cleanup_led(struct e1000_hw *hw)</div><div class='ctx'>             return ret_val;</div><div class='ctx'>         /* Fall Through */</div><div class='ctx'>     default:</div><div class='add'>+        if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+            e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='ctx'>         /* Restore LEDCTL settings */</div><div class='ctx'>         E1000_WRITE_REG(hw, LEDCTL, hw-&gt;ledctl_default);</div><div class='ctx'>         break;</div><div class='hunk'>@@ -5591,7 +6206,10 @@ e1000_led_on(struct e1000_hw *hw)</div><div class='ctx'>             /* Clear SW Defineable Pin 0 to turn on the LED */</div><div class='ctx'>             ctrl &amp;= ~E1000_CTRL_SWDPIN0;</div><div class='ctx'>             ctrl |= E1000_CTRL_SWDPIO0;</div><div class='del'>-        } else if(hw-&gt;media_type == e1000_media_type_copper) {</div><div class='add'>+        } else if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+            e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL_LED,</div><div class='add'>+                 (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_ON));</div><div class='add'>+        } else if (hw-&gt;media_type == e1000_media_type_copper) {</div><div class='ctx'>             E1000_WRITE_REG(hw, LEDCTL, hw-&gt;ledctl_mode2);</div><div class='ctx'>             return E1000_SUCCESS;</div><div class='ctx'>         }</div><div class='hunk'>@@ -5639,7 +6257,10 @@ e1000_led_off(struct e1000_hw *hw)</div><div class='ctx'>             /* Set SW Defineable Pin 0 to turn off the LED */</div><div class='ctx'>             ctrl |= E1000_CTRL_SWDPIN0;</div><div class='ctx'>             ctrl |= E1000_CTRL_SWDPIO0;</div><div class='del'>-        } else if(hw-&gt;media_type == e1000_media_type_copper) {</div><div class='add'>+        } else if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+            e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL_LED,</div><div class='add'>+                 (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_OFF));</div><div class='add'>+        } else if (hw-&gt;media_type == e1000_media_type_copper) {</div><div class='ctx'>             E1000_WRITE_REG(hw, LEDCTL, hw-&gt;ledctl_mode1);</div><div class='ctx'>             return E1000_SUCCESS;</div><div class='ctx'>         }</div><div class='hunk'>@@ -5677,12 +6298,16 @@ e1000_clear_hw_cntrs(struct e1000_hw *hw)</div><div class='ctx'>     temp = E1000_READ_REG(hw, XOFFRXC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, XOFFTXC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, FCRUC);</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type != e1000_ich8lan) {</div><div class='ctx'>     temp = E1000_READ_REG(hw, PRC64);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PRC127);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PRC255);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PRC511);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PRC1023);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PRC1522);</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     temp = E1000_READ_REG(hw, GPRC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, BPRC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, MPRC);</div><div class='hunk'>@@ -5702,12 +6327,16 @@ e1000_clear_hw_cntrs(struct e1000_hw *hw)</div><div class='ctx'>     temp = E1000_READ_REG(hw, TOTH);</div><div class='ctx'>     temp = E1000_READ_REG(hw, TPR);</div><div class='ctx'>     temp = E1000_READ_REG(hw, TPT);</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type != e1000_ich8lan) {</div><div class='ctx'>     temp = E1000_READ_REG(hw, PTC64);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PTC127);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PTC255);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PTC511);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PTC1023);</div><div class='ctx'>     temp = E1000_READ_REG(hw, PTC1522);</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     temp = E1000_READ_REG(hw, MPTC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, BPTC);</div><div class='ctx'> </div><div class='hunk'>@@ -5730,6 +6359,9 @@ e1000_clear_hw_cntrs(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     temp = E1000_READ_REG(hw, IAC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, ICRXOC);</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) return;</div><div class='add'>+</div><div class='ctx'>     temp = E1000_READ_REG(hw, ICRXPTC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, ICRXATC);</div><div class='ctx'>     temp = E1000_READ_REG(hw, ICTXPTC);</div><div class='hunk'>@@ -5910,6 +6542,7 @@ e1000_get_bus_info(struct e1000_hw *hw)</div><div class='ctx'>         hw-&gt;bus_width = e1000_bus_width_pciex_1;</div><div class='ctx'>         break;</div><div class='ctx'>     case e1000_82571:</div><div class='add'>+    case e1000_ich8lan:</div><div class='ctx'>     case e1000_80003es2lan:</div><div class='ctx'>         hw-&gt;bus_type = e1000_bus_type_pci_express;</div><div class='ctx'>         hw-&gt;bus_speed = e1000_bus_speed_2500;</div><div class='hunk'>@@ -5947,8 +6580,6 @@ e1000_get_bus_info(struct e1000_hw *hw)</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Reads a value from one of the devices registers using port I/O (as opposed</div><div class='ctx'>  * memory mapped I/O). Only 82544 and newer devices support port I/O.</div><div class='hunk'>@@ -5966,7 +6597,6 @@ e1000_read_reg_io(struct e1000_hw *hw,</div><div class='ctx'>     e1000_io_write(hw, io_addr, offset);</div><div class='ctx'>     return e1000_io_read(hw, io_data);</div><div class='ctx'> }</div><div class='del'>-#endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Writes a value to one of the devices registers using port I/O (as opposed to</div><div class='hunk'>@@ -6011,8 +6641,6 @@ e1000_get_cable_length(struct e1000_hw *hw,</div><div class='ctx'> {</div><div class='ctx'>     int32_t ret_val;</div><div class='ctx'>     uint16_t agc_value = 0;</div><div class='del'>-    uint16_t cur_agc, min_agc = IGP01E1000_AGC_LENGTH_TABLE_SIZE;</div><div class='del'>-    uint16_t max_agc = 0;</div><div class='ctx'>     uint16_t i, phy_data;</div><div class='ctx'>     uint16_t cable_length;</div><div class='ctx'> </div><div class='hunk'>@@ -6085,6 +6713,8 @@ e1000_get_cable_length(struct e1000_hw *hw,</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>     } else if(hw-&gt;phy_type == e1000_phy_igp) { /* For IGP PHY */</div><div class='add'>+        uint16_t cur_agc_value;</div><div class='add'>+        uint16_t min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;</div><div class='ctx'>         uint16_t agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =</div><div class='ctx'>                                                          {IGP01E1000_PHY_AGC_A,</div><div class='ctx'>                                                           IGP01E1000_PHY_AGC_B,</div><div class='hunk'>@@ -6097,23 +6727,23 @@ e1000_get_cable_length(struct e1000_hw *hw,</div><div class='ctx'>             if(ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='ctx'> </div><div class='del'>-            cur_agc = phy_data &gt;&gt; IGP01E1000_AGC_LENGTH_SHIFT;</div><div class='add'>+            cur_agc_value = phy_data &gt;&gt; IGP01E1000_AGC_LENGTH_SHIFT;</div><div class='ctx'> </div><div class='del'>-            /* Array bound check. */</div><div class='del'>-            if((cur_agc &gt;= IGP01E1000_AGC_LENGTH_TABLE_SIZE - 1) ||</div><div class='del'>-               (cur_agc == 0))</div><div class='add'>+            /* Value bound check. */</div><div class='add'>+            if ((cur_agc_value &gt;= IGP01E1000_AGC_LENGTH_TABLE_SIZE - 1) ||</div><div class='add'>+                (cur_agc_value == 0))</div><div class='ctx'>                 return -E1000_ERR_PHY;</div><div class='ctx'> </div><div class='del'>-            agc_value += cur_agc;</div><div class='add'>+            agc_value += cur_agc_value;</div><div class='ctx'> </div><div class='ctx'>             /* Update minimal AGC value. */</div><div class='del'>-            if(min_agc &gt; cur_agc)</div><div class='del'>-                min_agc = cur_agc;</div><div class='add'>+            if (min_agc_value &gt; cur_agc_value)</div><div class='add'>+                min_agc_value = cur_agc_value;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* Remove the minimal AGC result for length &lt; 50m */</div><div class='del'>-        if(agc_value &lt; IGP01E1000_PHY_CHANNEL_NUM * e1000_igp_cable_length_50) {</div><div class='del'>-            agc_value -= min_agc;</div><div class='add'>+        if (agc_value &lt; IGP01E1000_PHY_CHANNEL_NUM * e1000_igp_cable_length_50) {</div><div class='add'>+            agc_value -= min_agc_value;</div><div class='ctx'> </div><div class='ctx'>             /* Get the average length of the remaining 3 channels */</div><div class='ctx'>             agc_value /= (IGP01E1000_PHY_CHANNEL_NUM - 1);</div><div class='hunk'>@@ -6129,7 +6759,10 @@ e1000_get_cable_length(struct e1000_hw *hw,</div><div class='ctx'>                        IGP01E1000_AGC_RANGE) : 0;</div><div class='ctx'>         *max_length = e1000_igp_cable_length_table[agc_value] +</div><div class='ctx'>                       IGP01E1000_AGC_RANGE;</div><div class='del'>-    } else if (hw-&gt;phy_type == e1000_phy_igp_2) {</div><div class='add'>+    } else if (hw-&gt;phy_type == e1000_phy_igp_2 ||</div><div class='add'>+               hw-&gt;phy_type == e1000_phy_igp_3) {</div><div class='add'>+        uint16_t cur_agc_index, max_agc_index = 0;</div><div class='add'>+        uint16_t min_agc_index = IGP02E1000_AGC_LENGTH_TABLE_SIZE - 1;</div><div class='ctx'>         uint16_t agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =</div><div class='ctx'>                                                          {IGP02E1000_PHY_AGC_A,</div><div class='ctx'>                                                           IGP02E1000_PHY_AGC_B,</div><div class='hunk'>@@ -6144,19 +6777,27 @@ e1000_get_cable_length(struct e1000_hw *hw,</div><div class='ctx'> 	    /* Getting bits 15:9, which represent the combination of course and</div><div class='ctx'>              * fine gain values.  The result is a number that can be put into</div><div class='ctx'>              * the lookup table to obtain the approximate cable length. */</div><div class='del'>-            cur_agc = (phy_data &gt;&gt; IGP02E1000_AGC_LENGTH_SHIFT) &amp;</div><div class='del'>-                      IGP02E1000_AGC_LENGTH_MASK;</div><div class='add'>+            cur_agc_index = (phy_data &gt;&gt; IGP02E1000_AGC_LENGTH_SHIFT) &amp;</div><div class='add'>+                            IGP02E1000_AGC_LENGTH_MASK;</div><div class='ctx'> </div><div class='del'>-            /* Remove min &amp; max AGC values from calculation. */</div><div class='del'>-            if (e1000_igp_2_cable_length_table[min_agc] &gt; e1000_igp_2_cable_length_table[cur_agc])</div><div class='del'>-                min_agc = cur_agc;</div><div class='del'>-	    if (e1000_igp_2_cable_length_table[max_agc] &lt; e1000_igp_2_cable_length_table[cur_agc])</div><div class='del'>-                max_agc = cur_agc;</div><div class='add'>+            /* Array index bound check. */</div><div class='add'>+            if ((cur_agc_index &gt;= IGP02E1000_AGC_LENGTH_TABLE_SIZE) ||</div><div class='add'>+                (cur_agc_index == 0))</div><div class='add'>+                return -E1000_ERR_PHY;</div><div class='ctx'> </div><div class='del'>-            agc_value += e1000_igp_2_cable_length_table[cur_agc];</div><div class='add'>+            /* Remove min &amp; max AGC values from calculation. */</div><div class='add'>+            if (e1000_igp_2_cable_length_table[min_agc_index] &gt;</div><div class='add'>+                e1000_igp_2_cable_length_table[cur_agc_index])</div><div class='add'>+                min_agc_index = cur_agc_index;</div><div class='add'>+            if (e1000_igp_2_cable_length_table[max_agc_index] &lt;</div><div class='add'>+                e1000_igp_2_cable_length_table[cur_agc_index])</div><div class='add'>+                max_agc_index = cur_agc_index;</div><div class='add'>+</div><div class='add'>+            agc_value += e1000_igp_2_cable_length_table[cur_agc_index];</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        agc_value -= (e1000_igp_2_cable_length_table[min_agc] + e1000_igp_2_cable_length_table[max_agc]);</div><div class='add'>+        agc_value -= (e1000_igp_2_cable_length_table[min_agc_index] +</div><div class='add'>+                      e1000_igp_2_cable_length_table[max_agc_index]);</div><div class='ctx'>         agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);</div><div class='ctx'> </div><div class='ctx'>         /* Calculate cable length with the error range of +/- 10 meters. */</div><div class='hunk'>@@ -6202,7 +6843,8 @@ e1000_check_polarity(struct e1000_hw *hw,</div><div class='ctx'>             return ret_val;</div><div class='ctx'>         *polarity = (phy_data &amp; M88E1000_PSSR_REV_POLARITY) &gt;&gt;</div><div class='ctx'>                     M88E1000_PSSR_REV_POLARITY_SHIFT;</div><div class='del'>-    } else if(hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+    } else if (hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+              hw-&gt;phy_type == e1000_phy_igp_3 ||</div><div class='ctx'>               hw-&gt;phy_type == e1000_phy_igp_2) {</div><div class='ctx'>         /* Read the Status register to check the speed */</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS,</div><div class='hunk'>@@ -6228,6 +6870,13 @@ e1000_check_polarity(struct e1000_hw *hw,</div><div class='ctx'>              * 100 Mbps this bit is always 0) */</div><div class='ctx'>             *polarity = phy_data &amp; IGP01E1000_PSSR_POLARITY_REVERSED;</div><div class='ctx'>         }</div><div class='add'>+    } else if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+        ret_val = e1000_read_phy_reg(hw, IFE_PHY_EXTENDED_STATUS_CONTROL,</div><div class='add'>+                                     &amp;phy_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+        *polarity = (phy_data &amp; IFE_PESC_POLARITY_REVERSED) &gt;&gt;</div><div class='add'>+                           IFE_PESC_POLARITY_REVERSED_SHIFT;</div><div class='ctx'>     }</div><div class='ctx'>     return E1000_SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -6240,7 +6889,7 @@ e1000_check_polarity(struct e1000_hw *hw,</div><div class='ctx'>  *                                1 - Downshift ocured.</div><div class='ctx'>  *</div><div class='ctx'>  * returns: - E1000_ERR_XXX</div><div class='del'>- *            E1000_SUCCESS </div><div class='add'>+ *            E1000_SUCCESS</div><div class='ctx'>  *</div><div class='ctx'>  * For phy's older then IGP, this function reads the Downshift bit in the Phy</div><div class='ctx'>  * Specific Status register.  For IGP phy's, it reads the Downgrade bit in the</div><div class='hunk'>@@ -6255,7 +6904,8 @@ e1000_check_downshift(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     DEBUGFUNC("e1000_check_downshift");</div><div class='ctx'> </div><div class='del'>-    if(hw-&gt;phy_type == e1000_phy_igp || </div><div class='add'>+    if (hw-&gt;phy_type == e1000_phy_igp ||</div><div class='add'>+        hw-&gt;phy_type == e1000_phy_igp_3 ||</div><div class='ctx'>         hw-&gt;phy_type == e1000_phy_igp_2) {</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_LINK_HEALTH,</div><div class='ctx'>                                      &amp;phy_data);</div><div class='hunk'>@@ -6272,6 +6922,9 @@ e1000_check_downshift(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>         hw-&gt;speed_downgraded = (phy_data &amp; M88E1000_PSSR_DOWNSHIFT) &gt;&gt;</div><div class='ctx'>                                M88E1000_PSSR_DOWNSHIFT_SHIFT;</div><div class='add'>+    } else if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+        /* e1000_phy_ife supports 10/100 speed only */</div><div class='add'>+        hw-&gt;speed_downgraded = FALSE;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     return E1000_SUCCESS;</div><div class='hunk'>@@ -6316,7 +6969,9 @@ e1000_config_dsp_after_link_change(struct e1000_hw *hw,</div><div class='ctx'> </div><div class='ctx'>         if(speed == SPEED_1000) {</div><div class='ctx'> </div><div class='del'>-            e1000_get_cable_length(hw, &amp;min_length, &amp;max_length);</div><div class='add'>+            ret_val = e1000_get_cable_length(hw, &amp;min_length, &amp;max_length);</div><div class='add'>+            if (ret_val)</div><div class='add'>+                return ret_val;</div><div class='ctx'> </div><div class='ctx'>             if((hw-&gt;dsp_config_state == e1000_dsp_config_enabled) &amp;&amp;</div><div class='ctx'>                 min_length &gt;= e1000_igp_cable_length_50) {</div><div class='hunk'>@@ -6524,20 +7179,27 @@ static int32_t</div><div class='ctx'> e1000_set_d3_lplu_state(struct e1000_hw *hw,</div><div class='ctx'>                         boolean_t active)</div><div class='ctx'> {</div><div class='add'>+    uint32_t phy_ctrl = 0;</div><div class='ctx'>     int32_t ret_val;</div><div class='ctx'>     uint16_t phy_data;</div><div class='ctx'>     DEBUGFUNC("e1000_set_d3_lplu_state");</div><div class='ctx'> </div><div class='del'>-    if(hw-&gt;phy_type != e1000_phy_igp &amp;&amp; hw-&gt;phy_type != e1000_phy_igp_2)</div><div class='add'>+    if (hw-&gt;phy_type != e1000_phy_igp &amp;&amp; hw-&gt;phy_type != e1000_phy_igp_2</div><div class='add'>+        &amp;&amp; hw-&gt;phy_type != e1000_phy_igp_3)</div><div class='ctx'>         return E1000_SUCCESS;</div><div class='ctx'> </div><div class='ctx'>     /* During driver activity LPLU should not be used or it will attain link</div><div class='ctx'>      * from the lowest speeds starting from 10Mbps. The capability is used for</div><div class='ctx'>      * Dx transitions and states */</div><div class='del'>-    if(hw-&gt;mac_type == e1000_82541_rev_2 || hw-&gt;mac_type == e1000_82547_rev_2) {</div><div class='add'>+    if (hw-&gt;mac_type == e1000_82541_rev_2 || hw-&gt;mac_type == e1000_82547_rev_2) {</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, IGP01E1000_GMII_FIFO, &amp;phy_data);</div><div class='del'>-        if(ret_val)</div><div class='add'>+        if (ret_val)</div><div class='ctx'>             return ret_val;</div><div class='add'>+    } else if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        /* MAC writes into PHY register based on the state transition</div><div class='add'>+         * and start auto-negotiation. SW driver can overwrite the settings</div><div class='add'>+         * in CSR PHY power control E1000_PHY_CTRL register. */</div><div class='add'>+        phy_ctrl = E1000_READ_REG(hw, PHY_CTRL);</div><div class='ctx'>     } else {</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, &amp;phy_data);</div><div class='ctx'>         if(ret_val)</div><div class='hunk'>@@ -6552,11 +7214,16 @@ e1000_set_d3_lplu_state(struct e1000_hw *hw,</div><div class='ctx'>             if(ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='ctx'>         } else {</div><div class='add'>+            if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+                phy_ctrl &amp;= ~E1000_PHY_CTRL_NOND0A_LPLU;</div><div class='add'>+                E1000_WRITE_REG(hw, PHY_CTRL, phy_ctrl);</div><div class='add'>+            } else {</div><div class='ctx'>                 phy_data &amp;= ~IGP02E1000_PM_D3_LPLU;</div><div class='ctx'>                 ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,</div><div class='ctx'>                                               phy_data);</div><div class='ctx'>                 if (ret_val)</div><div class='ctx'>                     return ret_val;</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used during</div><div class='hunk'>@@ -6592,17 +7259,22 @@ e1000_set_d3_lplu_state(struct e1000_hw *hw,</div><div class='ctx'>               (hw-&gt;autoneg_advertised == AUTONEG_ADVERTISE_10_100_ALL)) {</div><div class='ctx'> </div><div class='ctx'>         if(hw-&gt;mac_type == e1000_82541_rev_2 ||</div><div class='del'>-           hw-&gt;mac_type == e1000_82547_rev_2) {</div><div class='add'>+            hw-&gt;mac_type == e1000_82547_rev_2) {</div><div class='ctx'>             phy_data |= IGP01E1000_GMII_FLEX_SPD;</div><div class='ctx'>             ret_val = e1000_write_phy_reg(hw, IGP01E1000_GMII_FIFO, phy_data);</div><div class='ctx'>             if(ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='ctx'>         } else {</div><div class='add'>+            if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+                phy_ctrl |= E1000_PHY_CTRL_NOND0A_LPLU;</div><div class='add'>+                E1000_WRITE_REG(hw, PHY_CTRL, phy_ctrl);</div><div class='add'>+            } else {</div><div class='ctx'>                 phy_data |= IGP02E1000_PM_D3_LPLU;</div><div class='ctx'>                 ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,</div><div class='ctx'>                                               phy_data);</div><div class='ctx'>                 if (ret_val)</div><div class='ctx'>                     return ret_val;</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* When LPLU is enabled we should disable SmartSpeed */</div><div class='hunk'>@@ -6637,6 +7309,7 @@ static int32_t</div><div class='ctx'> e1000_set_d0_lplu_state(struct e1000_hw *hw,</div><div class='ctx'>                         boolean_t active)</div><div class='ctx'> {</div><div class='add'>+    uint32_t phy_ctrl = 0;</div><div class='ctx'>     int32_t ret_val;</div><div class='ctx'>     uint16_t phy_data;</div><div class='ctx'>     DEBUGFUNC("e1000_set_d0_lplu_state");</div><div class='hunk'>@@ -6644,15 +7317,24 @@ e1000_set_d0_lplu_state(struct e1000_hw *hw,</div><div class='ctx'>     if(hw-&gt;mac_type &lt;= e1000_82547_rev_2)</div><div class='ctx'>         return E1000_SUCCESS;</div><div class='ctx'> </div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        phy_ctrl = E1000_READ_REG(hw, PHY_CTRL);</div><div class='add'>+    } else {</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, &amp;phy_data);</div><div class='ctx'>         if(ret_val)</div><div class='ctx'>             return ret_val;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     if (!active) {</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+            phy_ctrl &amp;= ~E1000_PHY_CTRL_D0A_LPLU;</div><div class='add'>+            E1000_WRITE_REG(hw, PHY_CTRL, phy_ctrl);</div><div class='add'>+        } else {</div><div class='ctx'>             phy_data &amp;= ~IGP02E1000_PM_D0_LPLU;</div><div class='ctx'>             ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);</div><div class='ctx'>             if (ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='add'>+        }</div><div class='ctx'> </div><div class='ctx'>         /* LPLU and SmartSpeed are mutually exclusive.  LPLU is used during</div><div class='ctx'>          * Dx states where the power conservation is most important.  During</div><div class='hunk'>@@ -6684,11 +7366,16 @@ e1000_set_d0_lplu_state(struct e1000_hw *hw,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>     } else {</div><div class='del'>- </div><div class='del'>-            phy_data |= IGP02E1000_PM_D0_LPLU;   </div><div class='add'>+</div><div class='add'>+        if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+            phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU;</div><div class='add'>+            E1000_WRITE_REG(hw, PHY_CTRL, phy_ctrl);</div><div class='add'>+        } else {</div><div class='add'>+            phy_data |= IGP02E1000_PM_D0_LPLU;</div><div class='ctx'>             ret_val = e1000_write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);</div><div class='ctx'>             if (ret_val)</div><div class='ctx'>                 return ret_val;</div><div class='add'>+        }</div><div class='ctx'> </div><div class='ctx'>         /* When LPLU is enabled we should disable SmartSpeed */</div><div class='ctx'>         ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, &amp;phy_data);</div><div class='hunk'>@@ -6777,7 +7464,7 @@ int32_t</div><div class='ctx'> e1000_host_if_read_cookie(struct e1000_hw * hw, uint8_t *buffer)</div><div class='ctx'> {</div><div class='ctx'>     uint8_t i;</div><div class='del'>-    uint32_t offset = E1000_MNG_DHCP_COOKIE_OFFSET; </div><div class='add'>+    uint32_t offset = E1000_MNG_DHCP_COOKIE_OFFSET;</div><div class='ctx'>     uint8_t length = E1000_MNG_DHCP_COOKIE_LENGTH;</div><div class='ctx'> </div><div class='ctx'>     length = (length &gt;&gt; 2);</div><div class='hunk'>@@ -6796,7 +7483,7 @@ e1000_host_if_read_cookie(struct e1000_hw * hw, uint8_t *buffer)</div><div class='ctx'>  * and also checks whether the previous command is completed.</div><div class='ctx'>  * It busy waits in case of previous command is not completed.</div><div class='ctx'>  *</div><div class='del'>- * returns: - E1000_ERR_HOST_INTERFACE_COMMAND in case if is not ready or </div><div class='add'>+ * returns: - E1000_ERR_HOST_INTERFACE_COMMAND in case if is not ready or</div><div class='ctx'>  *            timeout</div><div class='ctx'>  *          - E1000_SUCCESS for success.</div><div class='ctx'>  ****************************************************************************/</div><div class='hunk'>@@ -6820,7 +7507,7 @@ e1000_mng_enable_host_if(struct e1000_hw * hw)</div><div class='ctx'>         msec_delay_irq(1);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) { </div><div class='add'>+    if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {</div><div class='ctx'>         DEBUGOUT("Previous command timeout failed .\n");</div><div class='ctx'>         return -E1000_ERR_HOST_INTERFACE_COMMAND;</div><div class='ctx'>     }</div><div class='hunk'>@@ -6927,8 +7614,10 @@ e1000_mng_write_cmd_header(struct e1000_hw * hw,</div><div class='ctx'> </div><div class='ctx'>     length &gt;&gt;= 2;</div><div class='ctx'>     /* The device driver writes the relevant command block into the ram area. */</div><div class='del'>-    for (i = 0; i &lt; length; i++)</div><div class='add'>+    for (i = 0; i &lt; length; i++) {</div><div class='ctx'>         E1000_WRITE_REG_ARRAY_DWORD(hw, HOST_IF, i, *((uint32_t *) hdr + i));</div><div class='add'>+        E1000_WRITE_FLUSH(hw);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     return E1000_SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -6960,15 +7649,18 @@ e1000_mng_write_commit(</div><div class='ctx'>  * returns  - TRUE when the mode is IAMT or FALSE.</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> boolean_t</div><div class='del'>-e1000_check_mng_mode(</div><div class='del'>-    struct e1000_hw *hw)</div><div class='add'>+e1000_check_mng_mode(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'>     uint32_t fwsm;</div><div class='ctx'> </div><div class='ctx'>     fwsm = E1000_READ_REG(hw, FWSM);</div><div class='ctx'> </div><div class='del'>-    if((fwsm &amp; E1000_FWSM_MODE_MASK) ==</div><div class='del'>-        (E1000_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT))</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        if ((fwsm &amp; E1000_FWSM_MODE_MASK) ==</div><div class='add'>+            (E1000_MNG_ICH_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT))</div><div class='add'>+            return TRUE;</div><div class='add'>+    } else if ((fwsm &amp; E1000_FWSM_MODE_MASK) ==</div><div class='add'>+               (E1000_MNG_IAMT_MODE &lt;&lt; E1000_FWSM_MODE_SHIFT))</div><div class='ctx'>         return TRUE;</div><div class='ctx'> </div><div class='ctx'>     return FALSE;</div><div class='hunk'>@@ -7208,7 +7900,6 @@ e1000_set_pci_express_master_disable(struct e1000_hw *hw)</div><div class='ctx'>     E1000_WRITE_REG(hw, CTRL, ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Enables PCI-Express master access.</div><div class='hunk'>@@ -7232,7 +7923,6 @@ e1000_enable_pciex_master(struct e1000_hw *hw)</div><div class='ctx'>     ctrl &amp;= ~E1000_CTRL_GIO_MASTER_DISABLE;</div><div class='ctx'>     E1000_WRITE_REG(hw, CTRL, ctrl);</div><div class='ctx'> }</div><div class='del'>-#endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> /*******************************************************************************</div><div class='ctx'>  *</div><div class='hunk'>@@ -7298,8 +7988,10 @@ e1000_get_auto_rd_done(struct e1000_hw *hw)</div><div class='ctx'>     case e1000_82572:</div><div class='ctx'>     case e1000_82573:</div><div class='ctx'>     case e1000_80003es2lan:</div><div class='del'>-        while(timeout) {</div><div class='del'>-            if (E1000_READ_REG(hw, EECD) &amp; E1000_EECD_AUTO_RD) break;</div><div class='add'>+    case e1000_ich8lan:</div><div class='add'>+        while (timeout) {</div><div class='add'>+            if (E1000_READ_REG(hw, EECD) &amp; E1000_EECD_AUTO_RD)</div><div class='add'>+                break;</div><div class='ctx'>             else msec_delay(1);</div><div class='ctx'>             timeout--;</div><div class='ctx'>         }</div><div class='hunk'>@@ -7339,7 +8031,7 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)</div><div class='ctx'> </div><div class='ctx'>     switch (hw-&gt;mac_type) {</div><div class='ctx'>     default:</div><div class='del'>-        msec_delay(10);</div><div class='add'>+        msec_delay_irq(10);</div><div class='ctx'>         break;</div><div class='ctx'>     case e1000_80003es2lan:</div><div class='ctx'>         /* Separate *_CFG_DONE_* bit for each port */</div><div class='hunk'>@@ -7522,6 +8214,13 @@ int32_t</div><div class='ctx'> e1000_check_phy_reset_block(struct e1000_hw *hw)</div><div class='ctx'> {</div><div class='ctx'>     uint32_t manc = 0;</div><div class='add'>+    uint32_t fwsm = 0;</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        fwsm = E1000_READ_REG(hw, FWSM);</div><div class='add'>+        return (fwsm &amp; E1000_FWSM_RSPCIPHY) ? E1000_SUCCESS</div><div class='add'>+                                            : E1000_BLK_PHY_RESET;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     if (hw-&gt;mac_type &gt; e1000_82547_rev_2)</div><div class='ctx'>         manc = E1000_READ_REG(hw, MANC);</div><div class='hunk'>@@ -7548,6 +8247,8 @@ e1000_arc_subsystem_valid(struct e1000_hw *hw)</div><div class='ctx'>         if((fwsm &amp; E1000_FWSM_MODE_MASK) != 0)</div><div class='ctx'>             return TRUE;</div><div class='ctx'>         break;</div><div class='add'>+    case e1000_ich8lan:</div><div class='add'>+        return TRUE;</div><div class='ctx'>     default:</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='hunk'>@@ -7555,4 +8256,846 @@ e1000_arc_subsystem_valid(struct e1000_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Configure PCI-Ex no-snoop</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code.</div><div class='add'>+ * no_snoop - Bitmap of no-snoop events.</div><div class='add'>+ *</div><div class='add'>+ * returns: E1000_SUCCESS</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, uint32_t no_snoop)</div><div class='add'>+{</div><div class='add'>+    uint32_t gcr_reg = 0;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_set_pci_ex_no_snoop");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;bus_type == e1000_bus_type_unknown)</div><div class='add'>+        e1000_get_bus_info(hw);</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;bus_type != e1000_bus_type_pci_express)</div><div class='add'>+        return E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    if (no_snoop) {</div><div class='add'>+        gcr_reg = E1000_READ_REG(hw, GCR);</div><div class='add'>+        gcr_reg &amp;= ~(PCI_EX_NO_SNOOP_ALL);</div><div class='add'>+        gcr_reg |= no_snoop;</div><div class='add'>+        E1000_WRITE_REG(hw, GCR, gcr_reg);</div><div class='add'>+    }</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        uint32_t ctrl_ext;</div><div class='add'>+</div><div class='add'>+        E1000_WRITE_REG(hw, GCR, PCI_EX_82566_SNOOP_ALL);</div><div class='add'>+</div><div class='add'>+        ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);</div><div class='add'>+        ctrl_ext |= E1000_CTRL_EXT_RO_DIS;</div><div class='add'>+        E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return E1000_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Get software semaphore FLAG bit (SWFLAG).</div><div class='add'>+ * SWFLAG is used to synchronize the access to all shared resource between</div><div class='add'>+ * SW, FW and HW.</div><div class='add'>+ *</div><div class='add'>+ * hw: Struct containing variables accessed by shared code</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_get_software_flag(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    int32_t timeout = PHY_CFG_TIMEOUT;</div><div class='add'>+    uint32_t extcnf_ctrl;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_get_software_flag");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        while (timeout) {</div><div class='add'>+            extcnf_ctrl = E1000_READ_REG(hw, EXTCNF_CTRL);</div><div class='add'>+            extcnf_ctrl |= E1000_EXTCNF_CTRL_SWFLAG;</div><div class='add'>+            E1000_WRITE_REG(hw, EXTCNF_CTRL, extcnf_ctrl);</div><div class='add'>+</div><div class='add'>+            extcnf_ctrl = E1000_READ_REG(hw, EXTCNF_CTRL);</div><div class='add'>+            if (extcnf_ctrl &amp; E1000_EXTCNF_CTRL_SWFLAG)</div><div class='add'>+                break;</div><div class='add'>+            msec_delay_irq(1);</div><div class='add'>+            timeout--;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (!timeout) {</div><div class='add'>+            DEBUGOUT("FW or HW locks the resource too long.\n");</div><div class='add'>+            return -E1000_ERR_CONFIG;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return E1000_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Release software semaphore FLAG bit (SWFLAG).</div><div class='add'>+ * SWFLAG is used to synchronize the access to all shared resource between</div><div class='add'>+ * SW, FW and HW.</div><div class='add'>+ *</div><div class='add'>+ * hw: Struct containing variables accessed by shared code</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+void</div><div class='add'>+e1000_release_software_flag(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    uint32_t extcnf_ctrl;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_release_software_flag");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;mac_type == e1000_ich8lan) {</div><div class='add'>+        extcnf_ctrl= E1000_READ_REG(hw, EXTCNF_CTRL);</div><div class='add'>+        extcnf_ctrl &amp;= ~E1000_EXTCNF_CTRL_SWFLAG;</div><div class='add'>+        E1000_WRITE_REG(hw, EXTCNF_CTRL, extcnf_ctrl);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Disable dynamic power down mode in ife PHY.</div><div class='add'>+ * It can be used to workaround band-gap problem.</div><div class='add'>+ *</div><div class='add'>+ * hw: Struct containing variables accessed by shared code</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_ife_disable_dynamic_power_down(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    uint16_t phy_data;</div><div class='add'>+    int32_t ret_val = E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_ife_disable_dynamic_power_down");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+        ret_val = e1000_read_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL, &amp;phy_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        phy_data |=  IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN;</div><div class='add'>+        ret_val = e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL, phy_data);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Enable dynamic power down mode in ife PHY.</div><div class='add'>+ * It can be used to workaround band-gap problem.</div><div class='add'>+ *</div><div class='add'>+ * hw: Struct containing variables accessed by shared code</div><div class='add'>+ *</div><div class='add'>+ ***************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_ife_enable_dynamic_power_down(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    uint16_t phy_data;</div><div class='add'>+    int32_t ret_val = E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_ife_enable_dynamic_power_down");</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;phy_type == e1000_phy_ife) {</div><div class='add'>+        ret_val = e1000_read_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL, &amp;phy_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        phy_data &amp;=  ~IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN;</div><div class='add'>+        ret_val = e1000_write_phy_reg(hw, IFE_PHY_SPECIAL_CONTROL, phy_data);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Reads a 16 bit word or words from the EEPROM using the ICH8's flash access</div><div class='add'>+ * register.</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * offset - offset of word in the EEPROM to read</div><div class='add'>+ * data - word read from the EEPROM</div><div class='add'>+ * words - number of words to read</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_read_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,</div><div class='add'>+                       uint16_t *data)</div><div class='add'>+{</div><div class='add'>+    int32_t  error = E1000_SUCCESS;</div><div class='add'>+    uint32_t flash_bank = 0;</div><div class='add'>+    uint32_t act_offset = 0;</div><div class='add'>+    uint32_t bank_offset = 0;</div><div class='add'>+    uint16_t word = 0;</div><div class='add'>+    uint16_t i = 0;</div><div class='add'>+</div><div class='add'>+    /* We need to know which is the valid flash bank.  In the event</div><div class='add'>+     * that we didn't allocate eeprom_shadow_ram, we may not be</div><div class='add'>+     * managing flash_bank.  So it cannot be trusted and needs</div><div class='add'>+     * to be updated with each read.</div><div class='add'>+     */</div><div class='add'>+    /* Value of bit 22 corresponds to the flash bank we're on. */</div><div class='add'>+    flash_bank = (E1000_READ_REG(hw, EECD) &amp; E1000_EECD_SEC1VAL) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+    /* Adjust offset appropriately if we're on bank 1 - adjust for word size */</div><div class='add'>+    bank_offset = flash_bank * (hw-&gt;flash_bank_size * 2);</div><div class='add'>+</div><div class='add'>+    error = e1000_get_software_flag(hw);</div><div class='add'>+    if (error != E1000_SUCCESS)</div><div class='add'>+        return error;</div><div class='add'>+</div><div class='add'>+    for (i = 0; i &lt; words; i++) {</div><div class='add'>+        if (hw-&gt;eeprom_shadow_ram != NULL &amp;&amp;</div><div class='add'>+            hw-&gt;eeprom_shadow_ram[offset+i].modified == TRUE) {</div><div class='add'>+            data[i] = hw-&gt;eeprom_shadow_ram[offset+i].eeprom_word;</div><div class='add'>+        } else {</div><div class='add'>+            /* The NVM part needs a byte offset, hence * 2 */</div><div class='add'>+            act_offset = bank_offset + ((offset + i) * 2);</div><div class='add'>+            error = e1000_read_ich8_word(hw, act_offset, &amp;word);</div><div class='add'>+            if (error != E1000_SUCCESS)</div><div class='add'>+                break;</div><div class='add'>+            data[i] = word;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    e1000_release_software_flag(hw);</div><div class='add'>+</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Writes a 16 bit word or words to the EEPROM using the ICH8's flash access</div><div class='add'>+ * register.  Actually, writes are written to the shadow ram cache in the hw</div><div class='add'>+ * structure hw-&gt;e1000_shadow_ram.  e1000_commit_shadow_ram flushes this to</div><div class='add'>+ * the NVM, which occurs when the NVM checksum is updated.</div><div class='add'>+ *</div><div class='add'>+ * hw - Struct containing variables accessed by shared code</div><div class='add'>+ * offset - offset of word in the EEPROM to write</div><div class='add'>+ * words - number of words to write</div><div class='add'>+ * data - words to write to the EEPROM</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_write_eeprom_ich8(struct e1000_hw *hw, uint16_t offset, uint16_t words,</div><div class='add'>+                        uint16_t *data)</div><div class='add'>+{</div><div class='add'>+    uint32_t i = 0;</div><div class='add'>+    int32_t error = E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    error = e1000_get_software_flag(hw);</div><div class='add'>+    if (error != E1000_SUCCESS)</div><div class='add'>+        return error;</div><div class='add'>+</div><div class='add'>+    /* A driver can write to the NVM only if it has eeprom_shadow_ram</div><div class='add'>+     * allocated.  Subsequent reads to the modified words are read from</div><div class='add'>+     * this cached structure as well.  Writes will only go into this</div><div class='add'>+     * cached structure unless it's followed by a call to</div><div class='add'>+     * e1000_update_eeprom_checksum() where it will commit the changes</div><div class='add'>+     * and clear the "modified" field.</div><div class='add'>+     */</div><div class='add'>+    if (hw-&gt;eeprom_shadow_ram != NULL) {</div><div class='add'>+        for (i = 0; i &lt; words; i++) {</div><div class='add'>+            if ((offset + i) &lt; E1000_SHADOW_RAM_WORDS) {</div><div class='add'>+                hw-&gt;eeprom_shadow_ram[offset+i].modified = TRUE;</div><div class='add'>+                hw-&gt;eeprom_shadow_ram[offset+i].eeprom_word = data[i];</div><div class='add'>+            } else {</div><div class='add'>+                error = -E1000_ERR_EEPROM;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    } else {</div><div class='add'>+        /* Drivers have the option to not allocate eeprom_shadow_ram as long</div><div class='add'>+         * as they don't perform any NVM writes.  An attempt in doing so</div><div class='add'>+         * will result in this error.</div><div class='add'>+         */</div><div class='add'>+        error = -E1000_ERR_EEPROM;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    e1000_release_software_flag(hw);</div><div class='add'>+</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * This function does initial flash setup so that a new read/write/erase cycle</div><div class='add'>+ * can be started.</div><div class='add'>+ *</div><div class='add'>+ * hw - The pointer to the hw structure</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_ich8_cycle_init(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    union ich8_hws_flash_status hsfsts;</div><div class='add'>+    int32_t error = E1000_ERR_EEPROM;</div><div class='add'>+    int32_t i     = 0;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_ich8_cycle_init");</div><div class='add'>+</div><div class='add'>+    hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+</div><div class='add'>+    /* May be check the Flash Des Valid bit in Hw status */</div><div class='add'>+    if (hsfsts.hsf_status.fldesvalid == 0) {</div><div class='add'>+        DEBUGOUT("Flash descriptor invalid.  SW Sequencing must be used.");</div><div class='add'>+        return error;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Clear FCERR in Hw status by writing 1 */</div><div class='add'>+    /* Clear DAEL in Hw status by writing a 1 */</div><div class='add'>+    hsfsts.hsf_status.flcerr = 1;</div><div class='add'>+    hsfsts.hsf_status.dael = 1;</div><div class='add'>+</div><div class='add'>+    E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFSTS, hsfsts.regval);</div><div class='add'>+</div><div class='add'>+    /* Either we should have a hardware SPI cycle in progress bit to check</div><div class='add'>+     * against, in order to start a new cycle or FDONE bit should be changed</div><div class='add'>+     * in the hardware so that it is 1 after harware reset, which can then be</div><div class='add'>+     * used as an indication whether a cycle is in progress or has been</div><div class='add'>+     * completed .. we should also have some software semaphore mechanism to</div><div class='add'>+     * guard FDONE or the cycle in progress bit so that two threads access to</div><div class='add'>+     * those bits can be sequentiallized or a way so that 2 threads dont</div><div class='add'>+     * start the cycle at the same time */</div><div class='add'>+</div><div class='add'>+    if (hsfsts.hsf_status.flcinprog == 0) {</div><div class='add'>+        /* There is no cycle running at present, so we can start a cycle */</div><div class='add'>+        /* Begin by setting Flash Cycle Done. */</div><div class='add'>+        hsfsts.hsf_status.flcdone = 1;</div><div class='add'>+        E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFSTS, hsfsts.regval);</div><div class='add'>+        error = E1000_SUCCESS;</div><div class='add'>+    } else {</div><div class='add'>+        /* otherwise poll for sometime so the current cycle has a chance</div><div class='add'>+         * to end before giving up. */</div><div class='add'>+        for (i = 0; i &lt; ICH8_FLASH_COMMAND_TIMEOUT; i++) {</div><div class='add'>+            hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+            if (hsfsts.hsf_status.flcinprog == 0) {</div><div class='add'>+                error = E1000_SUCCESS;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+            udelay(1);</div><div class='add'>+        }</div><div class='add'>+        if (error == E1000_SUCCESS) {</div><div class='add'>+            /* Successful in waiting for previous cycle to timeout,</div><div class='add'>+             * now set the Flash Cycle Done. */</div><div class='add'>+            hsfsts.hsf_status.flcdone = 1;</div><div class='add'>+            E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFSTS, hsfsts.regval);</div><div class='add'>+        } else {</div><div class='add'>+            DEBUGOUT("Flash controller busy, cannot get access");</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * This function starts a flash cycle and waits for its completion</div><div class='add'>+ *</div><div class='add'>+ * hw - The pointer to the hw structure</div><div class='add'>+ ****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_ich8_flash_cycle(struct e1000_hw *hw, uint32_t timeout)</div><div class='add'>+{</div><div class='add'>+    union ich8_hws_flash_ctrl hsflctl;</div><div class='add'>+    union ich8_hws_flash_status hsfsts;</div><div class='add'>+    int32_t error = E1000_ERR_EEPROM;</div><div class='add'>+    uint32_t i = 0;</div><div class='add'>+</div><div class='add'>+    /* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */</div><div class='add'>+    hsflctl.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFCTL);</div><div class='add'>+    hsflctl.hsf_ctrl.flcgo = 1;</div><div class='add'>+    E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFCTL, hsflctl.regval);</div><div class='add'>+</div><div class='add'>+    /* wait till FDONE bit is set to 1 */</div><div class='add'>+    do {</div><div class='add'>+        hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+        if (hsfsts.hsf_status.flcdone == 1)</div><div class='add'>+            break;</div><div class='add'>+        udelay(1);</div><div class='add'>+        i++;</div><div class='add'>+    } while (i &lt; timeout);</div><div class='add'>+    if (hsfsts.hsf_status.flcdone == 1 &amp;&amp; hsfsts.hsf_status.flcerr == 0) {</div><div class='add'>+        error = E1000_SUCCESS;</div><div class='add'>+    }</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Reads a byte or word from the NVM using the ICH8 flash access registers.</div><div class='add'>+ *</div><div class='add'>+ * hw - The pointer to the hw structure</div><div class='add'>+ * index - The index of the byte or word to read.</div><div class='add'>+ * size - Size of data to read, 1=byte 2=word</div><div class='add'>+ * data - Pointer to the word to store the value read.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_read_ich8_data(struct e1000_hw *hw, uint32_t index,</div><div class='add'>+                     uint32_t size, uint16_t* data)</div><div class='add'>+{</div><div class='add'>+    union ich8_hws_flash_status hsfsts;</div><div class='add'>+    union ich8_hws_flash_ctrl hsflctl;</div><div class='add'>+    uint32_t flash_linear_address;</div><div class='add'>+    uint32_t flash_data = 0;</div><div class='add'>+    int32_t error = -E1000_ERR_EEPROM;</div><div class='add'>+    int32_t count = 0;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_read_ich8_data");</div><div class='add'>+</div><div class='add'>+    if (size &lt; 1  || size &gt; 2 || data == 0x0 ||</div><div class='add'>+        index &gt; ICH8_FLASH_LINEAR_ADDR_MASK)</div><div class='add'>+        return error;</div><div class='add'>+</div><div class='add'>+    flash_linear_address = (ICH8_FLASH_LINEAR_ADDR_MASK &amp; index) +</div><div class='add'>+                           hw-&gt;flash_base_addr;</div><div class='add'>+</div><div class='add'>+    do {</div><div class='add'>+        udelay(1);</div><div class='add'>+        /* Steps */</div><div class='add'>+        error = e1000_ich8_cycle_init(hw);</div><div class='add'>+        if (error != E1000_SUCCESS)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+        hsflctl.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFCTL);</div><div class='add'>+        /* 0b/1b corresponds to 1 or 2 byte size, respectively. */</div><div class='add'>+        hsflctl.hsf_ctrl.fldbcount = size - 1;</div><div class='add'>+        hsflctl.hsf_ctrl.flcycle = ICH8_CYCLE_READ;</div><div class='add'>+        E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFCTL, hsflctl.regval);</div><div class='add'>+</div><div class='add'>+        /* Write the last 24 bits of index into Flash Linear address field in</div><div class='add'>+         * Flash Address */</div><div class='add'>+        /* TODO: TBD maybe check the index against the size of flash */</div><div class='add'>+</div><div class='add'>+        E1000_WRITE_ICH8_REG(hw, ICH8_FLASH_FADDR, flash_linear_address);</div><div class='add'>+</div><div class='add'>+        error = e1000_ich8_flash_cycle(hw, ICH8_FLASH_COMMAND_TIMEOUT);</div><div class='add'>+</div><div class='add'>+        /* Check if FCERR is set to 1, if set to 1, clear it and try the whole</div><div class='add'>+         * sequence a few more times, else read in (shift in) the Flash Data0,</div><div class='add'>+         * the order is least significant byte first msb to lsb */</div><div class='add'>+        if (error == E1000_SUCCESS) {</div><div class='add'>+            flash_data = E1000_READ_ICH8_REG(hw, ICH8_FLASH_FDATA0);</div><div class='add'>+            if (size == 1) {</div><div class='add'>+                *data = (uint8_t)(flash_data &amp; 0x000000FF);</div><div class='add'>+            } else if (size == 2) {</div><div class='add'>+                *data = (uint16_t)(flash_data &amp; 0x0000FFFF);</div><div class='add'>+            }</div><div class='add'>+            break;</div><div class='add'>+        } else {</div><div class='add'>+            /* If we've gotten here, then things are probably completely hosed,</div><div class='add'>+             * but if the error condition is detected, it won't hurt to give</div><div class='add'>+             * it another try...ICH8_FLASH_CYCLE_REPEAT_COUNT times.</div><div class='add'>+             */</div><div class='add'>+            hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+            if (hsfsts.hsf_status.flcerr == 1) {</div><div class='add'>+                /* Repeat for some time before giving up. */</div><div class='add'>+                continue;</div><div class='add'>+            } else if (hsfsts.hsf_status.flcdone == 0) {</div><div class='add'>+                DEBUGOUT("Timeout error - flash cycle did not complete.");</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    } while (count++ &lt; ICH8_FLASH_CYCLE_REPEAT_COUNT);</div><div class='add'>+</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Writes One /two bytes to the NVM using the ICH8 flash access registers.</div><div class='add'>+ *</div><div class='add'>+ * hw - The pointer to the hw structure</div><div class='add'>+ * index - The index of the byte/word to read.</div><div class='add'>+ * size - Size of data to read, 1=byte 2=word</div><div class='add'>+ * data - The byte(s) to write to the NVM.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_write_ich8_data(struct e1000_hw *hw, uint32_t index, uint32_t size,</div><div class='add'>+                      uint16_t data)</div><div class='add'>+{</div><div class='add'>+    union ich8_hws_flash_status hsfsts;</div><div class='add'>+    union ich8_hws_flash_ctrl hsflctl;</div><div class='add'>+    uint32_t flash_linear_address;</div><div class='add'>+    uint32_t flash_data = 0;</div><div class='add'>+    int32_t error = -E1000_ERR_EEPROM;</div><div class='add'>+    int32_t count = 0;</div><div class='add'>+</div><div class='add'>+    DEBUGFUNC("e1000_write_ich8_data");</div><div class='add'>+</div><div class='add'>+    if (size &lt; 1  || size &gt; 2 || data &gt; size * 0xff ||</div><div class='add'>+        index &gt; ICH8_FLASH_LINEAR_ADDR_MASK)</div><div class='add'>+        return error;</div><div class='add'>+</div><div class='add'>+    flash_linear_address = (ICH8_FLASH_LINEAR_ADDR_MASK &amp; index) +</div><div class='add'>+                           hw-&gt;flash_base_addr;</div><div class='add'>+</div><div class='add'>+    do {</div><div class='add'>+        udelay(1);</div><div class='add'>+        /* Steps */</div><div class='add'>+        error = e1000_ich8_cycle_init(hw);</div><div class='add'>+        if (error != E1000_SUCCESS)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+        hsflctl.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFCTL);</div><div class='add'>+        /* 0b/1b corresponds to 1 or 2 byte size, respectively. */</div><div class='add'>+        hsflctl.hsf_ctrl.fldbcount = size -1;</div><div class='add'>+        hsflctl.hsf_ctrl.flcycle = ICH8_CYCLE_WRITE;</div><div class='add'>+        E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFCTL, hsflctl.regval);</div><div class='add'>+</div><div class='add'>+        /* Write the last 24 bits of index into Flash Linear address field in</div><div class='add'>+         * Flash Address */</div><div class='add'>+        E1000_WRITE_ICH8_REG(hw, ICH8_FLASH_FADDR, flash_linear_address);</div><div class='add'>+</div><div class='add'>+        if (size == 1)</div><div class='add'>+            flash_data = (uint32_t)data &amp; 0x00FF;</div><div class='add'>+        else</div><div class='add'>+            flash_data = (uint32_t)data;</div><div class='add'>+</div><div class='add'>+        E1000_WRITE_ICH8_REG(hw, ICH8_FLASH_FDATA0, flash_data);</div><div class='add'>+</div><div class='add'>+        /* check if FCERR is set to 1 , if set to 1, clear it and try the whole</div><div class='add'>+         * sequence a few more times else done */</div><div class='add'>+        error = e1000_ich8_flash_cycle(hw, ICH8_FLASH_COMMAND_TIMEOUT);</div><div class='add'>+        if (error == E1000_SUCCESS) {</div><div class='add'>+            break;</div><div class='add'>+        } else {</div><div class='add'>+            /* If we're here, then things are most likely completely hosed,</div><div class='add'>+             * but if the error condition is detected, it won't hurt to give</div><div class='add'>+             * it another try...ICH8_FLASH_CYCLE_REPEAT_COUNT times.</div><div class='add'>+             */</div><div class='add'>+            hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+            if (hsfsts.hsf_status.flcerr == 1) {</div><div class='add'>+                /* Repeat for some time before giving up. */</div><div class='add'>+                continue;</div><div class='add'>+            } else if (hsfsts.hsf_status.flcdone == 0) {</div><div class='add'>+                DEBUGOUT("Timeout error - flash cycle did not complete.");</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    } while (count++ &lt; ICH8_FLASH_CYCLE_REPEAT_COUNT);</div><div class='add'>+</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Reads a single byte from the NVM using the ICH8 flash access registers.</div><div class='add'>+ *</div><div class='add'>+ * hw - pointer to e1000_hw structure</div><div class='add'>+ * index - The index of the byte to read.</div><div class='add'>+ * data - Pointer to a byte to store the value read.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_read_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t* data)</div><div class='add'>+{</div><div class='add'>+    int32_t status = E1000_SUCCESS;</div><div class='add'>+    uint16_t word = 0;</div><div class='add'>+</div><div class='add'>+    status = e1000_read_ich8_data(hw, index, 1, &amp;word);</div><div class='add'>+    if (status == E1000_SUCCESS) {</div><div class='add'>+        *data = (uint8_t)word;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Writes a single byte to the NVM using the ICH8 flash access registers.</div><div class='add'>+ * Performs verification by reading back the value and then going through</div><div class='add'>+ * a retry algorithm before giving up.</div><div class='add'>+ *</div><div class='add'>+ * hw - pointer to e1000_hw structure</div><div class='add'>+ * index - The index of the byte to write.</div><div class='add'>+ * byte - The byte to write to the NVM.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte)</div><div class='add'>+{</div><div class='add'>+    int32_t error = E1000_SUCCESS;</div><div class='add'>+    int32_t program_retries;</div><div class='add'>+    uint8_t temp_byte;</div><div class='add'>+</div><div class='add'>+    e1000_write_ich8_byte(hw, index, byte);</div><div class='add'>+    udelay(100);</div><div class='add'>+</div><div class='add'>+    for (program_retries = 0; program_retries &lt; 100; program_retries++) {</div><div class='add'>+        e1000_read_ich8_byte(hw, index, &amp;temp_byte);</div><div class='add'>+        if (temp_byte == byte)</div><div class='add'>+            break;</div><div class='add'>+        udelay(10);</div><div class='add'>+        e1000_write_ich8_byte(hw, index, byte);</div><div class='add'>+        udelay(100);</div><div class='add'>+    }</div><div class='add'>+    if (program_retries == 100)</div><div class='add'>+        error = E1000_ERR_EEPROM;</div><div class='add'>+</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Writes a single byte to the NVM using the ICH8 flash access registers.</div><div class='add'>+ *</div><div class='add'>+ * hw - pointer to e1000_hw structure</div><div class='add'>+ * index - The index of the byte to read.</div><div class='add'>+ * data - The byte to write to the NVM.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t data)</div><div class='add'>+{</div><div class='add'>+    int32_t status = E1000_SUCCESS;</div><div class='add'>+    uint16_t word = (uint16_t)data;</div><div class='add'>+</div><div class='add'>+    status = e1000_write_ich8_data(hw, index, 1, word);</div><div class='add'>+</div><div class='add'>+    return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Reads a word from the NVM using the ICH8 flash access registers.</div><div class='add'>+ *</div><div class='add'>+ * hw - pointer to e1000_hw structure</div><div class='add'>+ * index - The starting byte index of the word to read.</div><div class='add'>+ * data - Pointer to a word to store the value read.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_read_ich8_word(struct e1000_hw *hw, uint32_t index, uint16_t *data)</div><div class='add'>+{</div><div class='add'>+    int32_t status = E1000_SUCCESS;</div><div class='add'>+    status = e1000_read_ich8_data(hw, index, 2, data);</div><div class='add'>+    return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Writes a word to the NVM using the ICH8 flash access registers.</div><div class='add'>+ *</div><div class='add'>+ * hw - pointer to e1000_hw structure</div><div class='add'>+ * index - The starting byte index of the word to read.</div><div class='add'>+ * data - The word to write to the NVM.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_write_ich8_word(struct e1000_hw *hw, uint32_t index, uint16_t data)</div><div class='add'>+{</div><div class='add'>+    int32_t status = E1000_SUCCESS;</div><div class='add'>+    status = e1000_write_ich8_data(hw, index, 2, data);</div><div class='add'>+    return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ * Erases the bank specified. Each bank is a 4k block. Segments are 0 based.</div><div class='add'>+ * segment N is 4096 * N + flash_reg_addr.</div><div class='add'>+ *</div><div class='add'>+ * hw - pointer to e1000_hw structure</div><div class='add'>+ * segment - 0 for first segment, 1 for second segment, etc.</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_erase_ich8_4k_segment(struct e1000_hw *hw, uint32_t segment)</div><div class='add'>+{</div><div class='add'>+    union ich8_hws_flash_status hsfsts;</div><div class='add'>+    union ich8_hws_flash_ctrl hsflctl;</div><div class='add'>+    uint32_t flash_linear_address;</div><div class='add'>+    int32_t  count = 0;</div><div class='add'>+    int32_t  error = E1000_ERR_EEPROM;</div><div class='add'>+    int32_t  iteration, seg_size;</div><div class='add'>+    int32_t  sector_size;</div><div class='add'>+    int32_t  j = 0;</div><div class='add'>+    int32_t  error_flag = 0;</div><div class='add'>+</div><div class='add'>+    hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+</div><div class='add'>+    /* Determine HW Sector size: Read BERASE bits of Hw flash Status register */</div><div class='add'>+    /* 00: The Hw sector is 256 bytes, hence we need to erase 16</div><div class='add'>+     *     consecutive sectors.  The start index for the nth Hw sector can be</div><div class='add'>+     *     calculated as = segment * 4096 + n * 256</div><div class='add'>+     * 01: The Hw sector is 4K bytes, hence we need to erase 1 sector.</div><div class='add'>+     *     The start index for the nth Hw sector can be calculated</div><div class='add'>+     *     as = segment * 4096</div><div class='add'>+     * 10: Error condition</div><div class='add'>+     * 11: The Hw sector size is much bigger than the size asked to</div><div class='add'>+     *     erase...error condition */</div><div class='add'>+    if (hsfsts.hsf_status.berasesz == 0x0) {</div><div class='add'>+        /* Hw sector size 256 */</div><div class='add'>+        sector_size = seg_size = ICH8_FLASH_SEG_SIZE_256;</div><div class='add'>+        iteration = ICH8_FLASH_SECTOR_SIZE / ICH8_FLASH_SEG_SIZE_256;</div><div class='add'>+    } else if (hsfsts.hsf_status.berasesz == 0x1) {</div><div class='add'>+        sector_size = seg_size = ICH8_FLASH_SEG_SIZE_4K;</div><div class='add'>+        iteration = 1;</div><div class='add'>+    } else if (hsfsts.hsf_status.berasesz == 0x3) {</div><div class='add'>+        sector_size = seg_size = ICH8_FLASH_SEG_SIZE_64K;</div><div class='add'>+        iteration = 1;</div><div class='add'>+    } else {</div><div class='add'>+        return error;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    for (j = 0; j &lt; iteration ; j++) {</div><div class='add'>+        do {</div><div class='add'>+            count++;</div><div class='add'>+            /* Steps */</div><div class='add'>+            error = e1000_ich8_cycle_init(hw);</div><div class='add'>+            if (error != E1000_SUCCESS) {</div><div class='add'>+                error_flag = 1;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Write a value 11 (block Erase) in Flash Cycle field in Hw flash</div><div class='add'>+             * Control */</div><div class='add'>+            hsflctl.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFCTL);</div><div class='add'>+            hsflctl.hsf_ctrl.flcycle = ICH8_CYCLE_ERASE;</div><div class='add'>+            E1000_WRITE_ICH8_REG16(hw, ICH8_FLASH_HSFCTL, hsflctl.regval);</div><div class='add'>+</div><div class='add'>+            /* Write the last 24 bits of an index within the block into Flash</div><div class='add'>+             * Linear address field in Flash Address.  This probably needs to</div><div class='add'>+             * be calculated here based off the on-chip segment size and the</div><div class='add'>+             * software segment size assumed (4K) */</div><div class='add'>+            /* TBD */</div><div class='add'>+            flash_linear_address = segment * sector_size + j * seg_size;</div><div class='add'>+            flash_linear_address &amp;= ICH8_FLASH_LINEAR_ADDR_MASK;</div><div class='add'>+            flash_linear_address += hw-&gt;flash_base_addr;</div><div class='add'>+</div><div class='add'>+            E1000_WRITE_ICH8_REG(hw, ICH8_FLASH_FADDR, flash_linear_address);</div><div class='add'>+</div><div class='add'>+            error = e1000_ich8_flash_cycle(hw, 1000000);</div><div class='add'>+            /* Check if FCERR is set to 1.  If 1, clear it and try the whole</div><div class='add'>+             * sequence a few more times else Done */</div><div class='add'>+            if (error == E1000_SUCCESS) {</div><div class='add'>+                break;</div><div class='add'>+            } else {</div><div class='add'>+                hsfsts.regval = E1000_READ_ICH8_REG16(hw, ICH8_FLASH_HSFSTS);</div><div class='add'>+                if (hsfsts.hsf_status.flcerr == 1) {</div><div class='add'>+                    /* repeat for some time before giving up */</div><div class='add'>+                    continue;</div><div class='add'>+                } else if (hsfsts.hsf_status.flcdone == 0) {</div><div class='add'>+                    error_flag = 1;</div><div class='add'>+                    break;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        } while ((count &lt; ICH8_FLASH_CYCLE_REPEAT_COUNT) &amp;&amp; !error_flag);</div><div class='add'>+        if (error_flag == 1)</div><div class='add'>+            break;</div><div class='add'>+    }</div><div class='add'>+    if (error_flag != 1)</div><div class='add'>+        error = E1000_SUCCESS;</div><div class='add'>+    return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Reverse duplex setting without breaking the link.</div><div class='add'>+ *</div><div class='add'>+ * hw: Struct containing variables accessed by shared code</div><div class='add'>+ *</div><div class='add'>+ *****************************************************************************/</div><div class='add'>+int32_t</div><div class='add'>+e1000_duplex_reversal(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    int32_t ret_val;</div><div class='add'>+    uint16_t phy_data;</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;phy_type != e1000_phy_igp_3)</div><div class='add'>+        return E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &amp;phy_data);</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+</div><div class='add'>+    phy_data ^= MII_CR_FULL_DUPLEX;</div><div class='add'>+</div><div class='add'>+    ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data);</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+</div><div class='add'>+    ret_val = e1000_read_phy_reg(hw, IGP3E1000_PHY_MISC_CTRL, &amp;phy_data);</div><div class='add'>+    if (ret_val)</div><div class='add'>+        return ret_val;</div><div class='add'>+</div><div class='add'>+    phy_data |= IGP3_PHY_MISC_DUPLEX_MANUAL_SET;</div><div class='add'>+    ret_val = e1000_write_phy_reg(hw, IGP3E1000_PHY_MISC_CTRL, phy_data);</div><div class='add'>+</div><div class='add'>+    return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int32_t</div><div class='add'>+e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw,</div><div class='add'>+                                      uint32_t cnf_base_addr, uint32_t cnf_size)</div><div class='add'>+{</div><div class='add'>+    uint32_t ret_val = E1000_SUCCESS;</div><div class='add'>+    uint16_t word_addr, reg_data, reg_addr;</div><div class='add'>+    uint16_t i;</div><div class='add'>+</div><div class='add'>+    /* cnf_base_addr is in DWORD */</div><div class='add'>+    word_addr = (uint16_t)(cnf_base_addr &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+    /* cnf_size is returned in size of dwords */</div><div class='add'>+    for (i = 0; i &lt; cnf_size; i++) {</div><div class='add'>+        ret_val = e1000_read_eeprom(hw, (word_addr + i*2), 1, &amp;reg_data);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        ret_val = e1000_read_eeprom(hw, (word_addr + i*2 + 1), 1, &amp;reg_addr);</div><div class='add'>+        if (ret_val)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        ret_val = e1000_get_software_flag(hw);</div><div class='add'>+        if (ret_val != E1000_SUCCESS)</div><div class='add'>+            return ret_val;</div><div class='add'>+</div><div class='add'>+        ret_val = e1000_write_phy_reg_ex(hw, (uint32_t)reg_addr, reg_data);</div><div class='add'>+</div><div class='add'>+        e1000_release_software_flag(hw);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return ret_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int32_t</div><div class='add'>+e1000_init_lcd_from_nvm(struct e1000_hw *hw)</div><div class='add'>+{</div><div class='add'>+    uint32_t reg_data, cnf_base_addr, cnf_size, ret_val, loop;</div><div class='add'>+</div><div class='add'>+    if (hw-&gt;phy_type != e1000_phy_igp_3)</div><div class='add'>+          return E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    /* Check if SW needs configure the PHY */</div><div class='add'>+    reg_data = E1000_READ_REG(hw, FEXTNVM);</div><div class='add'>+    if (!(reg_data &amp; FEXTNVM_SW_CONFIG))</div><div class='add'>+        return E1000_SUCCESS;</div><div class='add'>+</div><div class='add'>+    /* Wait for basic configuration completes before proceeding*/</div><div class='add'>+    loop = 0;</div><div class='add'>+    do {</div><div class='add'>+        reg_data = E1000_READ_REG(hw, STATUS) &amp; E1000_STATUS_LAN_INIT_DONE;</div><div class='add'>+        udelay(100);</div><div class='add'>+        loop++;</div><div class='add'>+    } while ((!reg_data) &amp;&amp; (loop &lt; 50));</div><div class='add'>+</div><div class='add'>+    /* Clear the Init Done bit for the next init event */</div><div class='add'>+    reg_data = E1000_READ_REG(hw, STATUS);</div><div class='add'>+    reg_data &amp;= ~E1000_STATUS_LAN_INIT_DONE;</div><div class='add'>+    E1000_WRITE_REG(hw, STATUS, reg_data);</div><div class='add'>+</div><div class='add'>+    /* Make sure HW does not configure LCD from PHY extended configuration</div><div class='add'>+       before SW configuration */</div><div class='add'>+    reg_data = E1000_READ_REG(hw, EXTCNF_CTRL);</div><div class='add'>+    if ((reg_data &amp; E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE) == 0x0000) {</div><div class='add'>+        reg_data = E1000_READ_REG(hw, EXTCNF_SIZE);</div><div class='add'>+        cnf_size = reg_data &amp; E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH;</div><div class='add'>+        cnf_size &gt;&gt;= 16;</div><div class='add'>+        if (cnf_size) {</div><div class='add'>+            reg_data = E1000_READ_REG(hw, EXTCNF_CTRL);</div><div class='add'>+            cnf_base_addr = reg_data &amp; E1000_EXTCNF_CTRL_EXT_CNF_POINTER;</div><div class='add'>+            /* cnf_base_addr is in DWORD */</div><div class='add'>+            cnf_base_addr &gt;&gt;= 16;</div><div class='add'>+</div><div class='add'>+            /* Configure LCD from extended configuration region. */</div><div class='add'>+            ret_val = e1000_init_lcd_from_nvm_config_region(hw, cnf_base_addr,</div><div class='add'>+                                                            cnf_size);</div><div class='add'>+            if (ret_val)</div><div class='add'>+                return ret_val;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return E1000_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h<br/>index 150e45e30f87..f9341e3276b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_hw.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000_hw.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='hunk'>@@ -61,6 +62,7 @@ typedef enum {</div><div class='ctx'>     e1000_82572,</div><div class='ctx'>     e1000_82573,</div><div class='ctx'>     e1000_80003es2lan,</div><div class='add'>+    e1000_ich8lan,</div><div class='ctx'>     e1000_num_macs</div><div class='ctx'> } e1000_mac_type;</div><div class='ctx'> </div><div class='hunk'>@@ -69,6 +71,7 @@ typedef enum {</div><div class='ctx'>     e1000_eeprom_spi,</div><div class='ctx'>     e1000_eeprom_microwire,</div><div class='ctx'>     e1000_eeprom_flash,</div><div class='add'>+    e1000_eeprom_ich8,</div><div class='ctx'>     e1000_eeprom_none, /* No NVM support */</div><div class='ctx'>     e1000_num_eeprom_types</div><div class='ctx'> } e1000_eeprom_type;</div><div class='hunk'>@@ -97,6 +100,11 @@ typedef enum {</div><div class='ctx'>     e1000_fc_default = 0xFF</div><div class='ctx'> } e1000_fc_type;</div><div class='ctx'> </div><div class='add'>+struct e1000_shadow_ram {</div><div class='add'>+    uint16_t    eeprom_word;</div><div class='add'>+    boolean_t   modified;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* PCI bus types */</div><div class='ctx'> typedef enum {</div><div class='ctx'>     e1000_bus_type_unknown = 0,</div><div class='hunk'>@@ -217,6 +225,8 @@ typedef enum {</div><div class='ctx'>     e1000_phy_igp,</div><div class='ctx'>     e1000_phy_igp_2,</div><div class='ctx'>     e1000_phy_gg82563,</div><div class='add'>+    e1000_phy_igp_3,</div><div class='add'>+    e1000_phy_ife,</div><div class='ctx'>     e1000_phy_undefined = 0xFF</div><div class='ctx'> } e1000_phy_type;</div><div class='ctx'> </div><div class='hunk'>@@ -312,6 +322,10 @@ int32_t e1000_read_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy</div><div class='ctx'> int32_t e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t data);</div><div class='ctx'> int32_t e1000_phy_hw_reset(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_phy_reset(struct e1000_hw *hw);</div><div class='add'>+void e1000_phy_powerdown_workaround(struct e1000_hw *hw);</div><div class='add'>+int32_t e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw);</div><div class='add'>+int32_t e1000_init_lcd_from_nvm_config_region(struct e1000_hw *hw, uint32_t cnf_base_addr, uint32_t cnf_size);</div><div class='add'>+int32_t e1000_init_lcd_from_nvm(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_phy_get_info(struct e1000_hw *hw, struct e1000_phy_info *phy_info);</div><div class='ctx'> int32_t e1000_validate_mdi_setting(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_read_kmrn_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *data);</div><div class='hunk'>@@ -330,6 +344,7 @@ uint32_t e1000_enable_mng_pass_thru(struct e1000_hw *hw);</div><div class='ctx'> #define E1000_MNG_DHCP_COOKIE_OFFSET	0x6F0   /* Cookie offset */</div><div class='ctx'> #define E1000_MNG_DHCP_COOKIE_LENGTH	0x10    /* Cookie length */</div><div class='ctx'> #define E1000_MNG_IAMT_MODE		0x3</div><div class='add'>+#define E1000_MNG_ICH_IAMT_MODE         0x2</div><div class='ctx'> #define E1000_IAMT_SIGNATURE            0x544D4149 /* Intel(R) Active Management Technology signature */</div><div class='ctx'> </div><div class='ctx'> #define E1000_MNG_DHCP_COOKIE_STATUS_PARSING_SUPPORT 0x1 /* DHCP parsing enabled */</div><div class='hunk'>@@ -374,7 +389,7 @@ struct e1000_host_mng_dhcp_cookie{</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int32_t e1000_mng_write_dhcp_info(struct e1000_hw *hw, uint8_t *buffer, </div><div class='add'>+int32_t e1000_mng_write_dhcp_info(struct e1000_hw *hw, uint8_t *buffer,</div><div class='ctx'> 							uint16_t length);</div><div class='ctx'> boolean_t e1000_check_mng_mode(struct e1000_hw *hw);</div><div class='ctx'> boolean_t e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);</div><div class='hunk'>@@ -387,6 +402,8 @@ int32_t e1000_read_part_num(struct e1000_hw *hw, uint32_t * part_num);</div><div class='ctx'> int32_t e1000_read_mac_addr(struct e1000_hw * hw);</div><div class='ctx'> int32_t e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask);</div><div class='ctx'> void e1000_swfw_sync_release(struct e1000_hw *hw, uint16_t mask);</div><div class='add'>+void e1000_release_software_flag(struct e1000_hw *hw);</div><div class='add'>+int32_t e1000_get_software_flag(struct e1000_hw *hw);</div><div class='ctx'> </div><div class='ctx'> /* Filters (multicast, vlan, receive) */</div><div class='ctx'> void e1000_mc_addr_list_update(struct e1000_hw *hw, uint8_t * mc_addr_list, uint32_t mc_addr_count, uint32_t pad, uint32_t rar_used_count);</div><div class='hunk'>@@ -400,6 +417,7 @@ int32_t e1000_setup_led(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_cleanup_led(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_led_on(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_led_off(struct e1000_hw *hw);</div><div class='add'>+int32_t e1000_blink_led_start(struct e1000_hw *hw);</div><div class='ctx'> </div><div class='ctx'> /* Adaptive IFS Functions */</div><div class='ctx'> </div><div class='hunk'>@@ -421,6 +439,29 @@ int32_t e1000_disable_pciex_master(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_get_software_semaphore(struct e1000_hw *hw);</div><div class='ctx'> void e1000_release_software_semaphore(struct e1000_hw *hw);</div><div class='ctx'> int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);</div><div class='add'>+int32_t e1000_set_pci_ex_no_snoop(struct e1000_hw *hw, uint32_t no_snoop);</div><div class='add'>+</div><div class='add'>+int32_t e1000_read_ich8_byte(struct e1000_hw *hw, uint32_t index,</div><div class='add'>+                             uint8_t *data);</div><div class='add'>+int32_t e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index,</div><div class='add'>+                                     uint8_t byte);</div><div class='add'>+int32_t e1000_write_ich8_byte(struct e1000_hw *hw, uint32_t index,</div><div class='add'>+                              uint8_t byte);</div><div class='add'>+int32_t e1000_read_ich8_word(struct e1000_hw *hw, uint32_t index,</div><div class='add'>+                             uint16_t *data);</div><div class='add'>+int32_t e1000_read_ich8_data(struct e1000_hw *hw, uint32_t index,</div><div class='add'>+                             uint32_t size, uint16_t *data);</div><div class='add'>+int32_t e1000_read_eeprom_ich8(struct e1000_hw *hw, uint16_t offset,</div><div class='add'>+                               uint16_t words, uint16_t *data);</div><div class='add'>+int32_t e1000_write_eeprom_ich8(struct e1000_hw *hw, uint16_t offset,</div><div class='add'>+                                uint16_t words, uint16_t *data);</div><div class='add'>+int32_t e1000_erase_ich8_4k_segment(struct e1000_hw *hw, uint32_t segment);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define E1000_READ_REG_IO(a, reg) \</div><div class='add'>+    e1000_read_reg_io((a), E1000_##reg)</div><div class='add'>+#define E1000_WRITE_REG_IO(a, reg, val) \</div><div class='add'>+    e1000_write_reg_io((a), E1000_##reg, val)</div><div class='ctx'> </div><div class='ctx'> /* PCI Device IDs */</div><div class='ctx'> #define E1000_DEV_ID_82542               0x1000</div><div class='hunk'>@@ -445,6 +486,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);</div><div class='ctx'> #define E1000_DEV_ID_82546EB_QUAD_COPPER 0x101D</div><div class='ctx'> #define E1000_DEV_ID_82541EI             0x1013</div><div class='ctx'> #define E1000_DEV_ID_82541EI_MOBILE      0x1018</div><div class='add'>+#define E1000_DEV_ID_82541ER_LOM         0x1014</div><div class='ctx'> #define E1000_DEV_ID_82541ER             0x1078</div><div class='ctx'> #define E1000_DEV_ID_82547GI             0x1075</div><div class='ctx'> #define E1000_DEV_ID_82541GI             0x1076</div><div class='hunk'>@@ -456,18 +498,28 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);</div><div class='ctx'> #define E1000_DEV_ID_82546GB_PCIE        0x108A</div><div class='ctx'> #define E1000_DEV_ID_82546GB_QUAD_COPPER 0x1099</div><div class='ctx'> #define E1000_DEV_ID_82547EI             0x1019</div><div class='add'>+#define E1000_DEV_ID_82547EI_MOBILE      0x101A</div><div class='ctx'> #define E1000_DEV_ID_82571EB_COPPER      0x105E</div><div class='ctx'> #define E1000_DEV_ID_82571EB_FIBER       0x105F</div><div class='ctx'> #define E1000_DEV_ID_82571EB_SERDES      0x1060</div><div class='ctx'> #define E1000_DEV_ID_82572EI_COPPER      0x107D</div><div class='ctx'> #define E1000_DEV_ID_82572EI_FIBER       0x107E</div><div class='ctx'> #define E1000_DEV_ID_82572EI_SERDES      0x107F</div><div class='add'>+#define E1000_DEV_ID_82572EI             0x10B9</div><div class='ctx'> #define E1000_DEV_ID_82573E              0x108B</div><div class='ctx'> #define E1000_DEV_ID_82573E_IAMT         0x108C</div><div class='ctx'> #define E1000_DEV_ID_82573L              0x109A</div><div class='ctx'> #define E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 0x10B5</div><div class='ctx'> #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT     0x1096</div><div class='ctx'> #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT     0x1098</div><div class='add'>+#define E1000_DEV_ID_80003ES2LAN_COPPER_SPT     0x10BA</div><div class='add'>+#define E1000_DEV_ID_80003ES2LAN_SERDES_SPT     0x10BB</div><div class='add'>+</div><div class='add'>+#define E1000_DEV_ID_ICH8_IGP_M_AMT      0x1049</div><div class='add'>+#define E1000_DEV_ID_ICH8_IGP_AMT        0x104A</div><div class='add'>+#define E1000_DEV_ID_ICH8_IGP_C          0x104B</div><div class='add'>+#define E1000_DEV_ID_ICH8_IFE            0x104C</div><div class='add'>+#define E1000_DEV_ID_ICH8_IGP_M          0x104D</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define NODE_ADDRESS_SIZE 6</div><div class='hunk'>@@ -538,6 +590,14 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);</div><div class='ctx'>     E1000_IMS_RXSEQ  |    \</div><div class='ctx'>     E1000_IMS_LSC)</div><div class='ctx'> </div><div class='add'>+/* Additional interrupts need to be handled for e1000_ich8lan:</div><div class='add'>+    DSW = The FW changed the status of the DISSW bit in FWSM</div><div class='add'>+    PHYINT = The LAN connected device generates an interrupt</div><div class='add'>+    EPRST = Manageability reset event */</div><div class='add'>+#define IMS_ICH8LAN_ENABLE_MASK (\</div><div class='add'>+    E1000_IMS_DSW   | \</div><div class='add'>+    E1000_IMS_PHYINT | \</div><div class='add'>+    E1000_IMS_EPRST)</div><div class='ctx'> </div><div class='ctx'> /* Number of high/low register pairs in the RAR. The RAR (Receive Address</div><div class='ctx'>  * Registers) holds the directed and multicast addresses that we monitor. We</div><div class='hunk'>@@ -545,6 +605,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);</div><div class='ctx'>  * E1000_RAR_ENTRIES - 1 multicast addresses.</div><div class='ctx'>  */</div><div class='ctx'> #define E1000_RAR_ENTRIES 15</div><div class='add'>+#define E1000_RAR_ENTRIES_ICH8LAN  7</div><div class='ctx'> </div><div class='ctx'> #define MIN_NUMBER_OF_DESCRIPTORS 8</div><div class='ctx'> #define MAX_NUMBER_OF_DESCRIPTORS 0xFFF8</div><div class='hunk'>@@ -766,6 +827,9 @@ struct e1000_data_desc {</div><div class='ctx'> #define E1000_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) */</div><div class='ctx'> #define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */</div><div class='ctx'> </div><div class='add'>+#define E1000_NUM_UNICAST_ICH8LAN  7</div><div class='add'>+#define E1000_MC_TBL_SIZE_ICH8LAN  32</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* Receive Address Register */</div><div class='ctx'> struct e1000_rar {</div><div class='hunk'>@@ -775,6 +839,7 @@ struct e1000_rar {</div><div class='ctx'> </div><div class='ctx'> /* Number of entries in the Multicast Table Array (MTA). */</div><div class='ctx'> #define E1000_NUM_MTA_REGISTERS 128</div><div class='add'>+#define E1000_NUM_MTA_REGISTERS_ICH8LAN 32</div><div class='ctx'> </div><div class='ctx'> /* IPv4 Address Table Entry */</div><div class='ctx'> struct e1000_ipv4_at_entry {</div><div class='hunk'>@@ -785,6 +850,7 @@ struct e1000_ipv4_at_entry {</div><div class='ctx'> /* Four wakeup IP addresses are supported */</div><div class='ctx'> #define E1000_WAKEUP_IP_ADDRESS_COUNT_MAX 4</div><div class='ctx'> #define E1000_IP4AT_SIZE                  E1000_WAKEUP_IP_ADDRESS_COUNT_MAX</div><div class='add'>+#define E1000_IP4AT_SIZE_ICH8LAN          3</div><div class='ctx'> #define E1000_IP6AT_SIZE                  1</div><div class='ctx'> </div><div class='ctx'> /* IPv6 Address Table Entry */</div><div class='hunk'>@@ -843,6 +909,7 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_FLA      0x0001C  /* Flash Access - RW */</div><div class='ctx'> #define E1000_MDIC     0x00020  /* MDI Control - RW */</div><div class='ctx'> #define E1000_SCTL     0x00024  /* SerDes Control - RW */</div><div class='add'>+#define E1000_FEXTNVM  0x00028  /* Future Extended NVM register */</div><div class='ctx'> #define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */</div><div class='ctx'> #define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */</div><div class='ctx'> #define E1000_FCT      0x00030  /* Flow Control Type - RW */</div><div class='hunk'>@@ -871,6 +938,8 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_LEDCTL   0x00E00  /* LED Control - RW */</div><div class='ctx'> #define E1000_EXTCNF_CTRL  0x00F00  /* Extended Configuration Control */</div><div class='ctx'> #define E1000_EXTCNF_SIZE  0x00F08  /* Extended Configuration Size */</div><div class='add'>+#define E1000_PHY_CTRL     0x00F10  /* PHY Control Register in CSR */</div><div class='add'>+#define FEXTNVM_SW_CONFIG  0x0001</div><div class='ctx'> #define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */</div><div class='ctx'> #define E1000_PBS      0x01008  /* Packet Buffer Size */</div><div class='ctx'> #define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */</div><div class='hunk'>@@ -898,11 +967,13 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_RDH0     E1000_RDH   /* RX Desc Head (0) - RW */</div><div class='ctx'> #define E1000_RDT0     E1000_RDT   /* RX Desc Tail (0) - RW */</div><div class='ctx'> #define E1000_RDTR0    E1000_RDTR  /* RX Delay Timer (0) - RW */</div><div class='del'>-#define E1000_RXDCTL   0x02828  /* RX Descriptor Control - RW */</div><div class='add'>+#define E1000_RXDCTL   0x02828  /* RX Descriptor Control queue 0 - RW */</div><div class='add'>+#define E1000_RXDCTL1  0x02928  /* RX Descriptor Control queue 1 - RW */</div><div class='ctx'> #define E1000_RADV     0x0282C  /* RX Interrupt Absolute Delay Timer - RW */</div><div class='ctx'> #define E1000_RSRPD    0x02C00  /* RX Small Packet Detect - RW */</div><div class='ctx'> #define E1000_RAID     0x02C08  /* Receive Ack Interrupt Delay - RW */</div><div class='ctx'> #define E1000_TXDMAC   0x03000  /* TX DMA Control - RW */</div><div class='add'>+#define E1000_KABGTXD  0x03004  /* AFE Band Gap Transmit Ref Data */</div><div class='ctx'> #define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */</div><div class='ctx'> #define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */</div><div class='ctx'> #define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */</div><div class='hunk'>@@ -1049,6 +1120,7 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_82542_FLA      E1000_FLA</div><div class='ctx'> #define E1000_82542_MDIC     E1000_MDIC</div><div class='ctx'> #define E1000_82542_SCTL     E1000_SCTL</div><div class='add'>+#define E1000_82542_FEXTNVM  E1000_FEXTNVM</div><div class='ctx'> #define E1000_82542_FCAL     E1000_FCAL</div><div class='ctx'> #define E1000_82542_FCAH     E1000_FCAH</div><div class='ctx'> #define E1000_82542_FCT      E1000_FCT</div><div class='hunk'>@@ -1072,6 +1144,19 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_82542_RDLEN0   E1000_82542_RDLEN</div><div class='ctx'> #define E1000_82542_RDH0     E1000_82542_RDH</div><div class='ctx'> #define E1000_82542_RDT0     E1000_82542_RDT</div><div class='add'>+#define E1000_82542_SRRCTL(_n) (0x280C + ((_n) &lt;&lt; 8)) /* Split and Replication</div><div class='add'>+                                                       * RX Control - RW */</div><div class='add'>+#define E1000_82542_DCA_RXCTRL(_n) (0x02814 + ((_n) &lt;&lt; 8))</div><div class='add'>+#define E1000_82542_RDBAH3   0x02B04 /* RX Desc Base High Queue 3 - RW */</div><div class='add'>+#define E1000_82542_RDBAL3   0x02B00 /* RX Desc Low Queue 3 - RW */</div><div class='add'>+#define E1000_82542_RDLEN3   0x02B08 /* RX Desc Length Queue 3 - RW */</div><div class='add'>+#define E1000_82542_RDH3     0x02B10 /* RX Desc Head Queue 3 - RW */</div><div class='add'>+#define E1000_82542_RDT3     0x02B18 /* RX Desc Tail Queue 3 - RW */</div><div class='add'>+#define E1000_82542_RDBAL2   0x02A00 /* RX Desc Base Low Queue 2 - RW */</div><div class='add'>+#define E1000_82542_RDBAH2   0x02A04 /* RX Desc Base High Queue 2 - RW */</div><div class='add'>+#define E1000_82542_RDLEN2   0x02A08 /* RX Desc Length Queue 2 - RW */</div><div class='add'>+#define E1000_82542_RDH2     0x02A10 /* RX Desc Head Queue 2 - RW */</div><div class='add'>+#define E1000_82542_RDT2     0x02A18 /* RX Desc Tail Queue 2 - RW */</div><div class='ctx'> #define E1000_82542_RDTR1    0x00130</div><div class='ctx'> #define E1000_82542_RDBAL1   0x00138</div><div class='ctx'> #define E1000_82542_RDBAH1   0x0013C</div><div class='hunk'>@@ -1109,11 +1194,14 @@ struct e1000_ffvt_entry {</div><div class='ctx'> #define E1000_82542_FLOP     E1000_FLOP</div><div class='ctx'> #define E1000_82542_EXTCNF_CTRL  E1000_EXTCNF_CTRL</div><div class='ctx'> #define E1000_82542_EXTCNF_SIZE  E1000_EXTCNF_SIZE</div><div class='add'>+#define E1000_82542_PHY_CTRL E1000_PHY_CTRL</div><div class='ctx'> #define E1000_82542_ERT      E1000_ERT</div><div class='ctx'> #define E1000_82542_RXDCTL   E1000_RXDCTL</div><div class='add'>+#define E1000_82542_RXDCTL1  E1000_RXDCTL1</div><div class='ctx'> #define E1000_82542_RADV     E1000_RADV</div><div class='ctx'> #define E1000_82542_RSRPD    E1000_RSRPD</div><div class='ctx'> #define E1000_82542_TXDMAC   E1000_TXDMAC</div><div class='add'>+#define E1000_82542_KABGTXD  E1000_KABGTXD</div><div class='ctx'> #define E1000_82542_TDFHS    E1000_TDFHS</div><div class='ctx'> #define E1000_82542_TDFTS    E1000_TDFTS</div><div class='ctx'> #define E1000_82542_TDFPC    E1000_TDFPC</div><div class='hunk'>@@ -1309,13 +1397,16 @@ struct e1000_hw_stats {</div><div class='ctx'> </div><div class='ctx'> /* Structure containing variables used by the shared code (e1000_hw.c) */</div><div class='ctx'> struct e1000_hw {</div><div class='del'>-    uint8_t __iomem *hw_addr;</div><div class='add'>+    uint8_t *hw_addr;</div><div class='ctx'>     uint8_t *flash_address;</div><div class='ctx'>     e1000_mac_type mac_type;</div><div class='ctx'>     e1000_phy_type phy_type;</div><div class='ctx'>     uint32_t phy_init_script;</div><div class='ctx'>     e1000_media_type media_type;</div><div class='ctx'>     void *back;</div><div class='add'>+    struct e1000_shadow_ram *eeprom_shadow_ram;</div><div class='add'>+    uint32_t flash_bank_size;</div><div class='add'>+    uint32_t flash_base_addr;</div><div class='ctx'>     e1000_fc_type fc;</div><div class='ctx'>     e1000_bus_speed bus_speed;</div><div class='ctx'>     e1000_bus_width bus_width;</div><div class='hunk'>@@ -1327,6 +1418,7 @@ struct e1000_hw {</div><div class='ctx'>     uint32_t asf_firmware_present;</div><div class='ctx'>     uint32_t eeprom_semaphore_present;</div><div class='ctx'>     uint32_t swfw_sync_present;</div><div class='add'>+    uint32_t swfwhw_semaphore_present;</div><div class='ctx'>     unsigned long io_base;</div><div class='ctx'>     uint32_t phy_id;</div><div class='ctx'>     uint32_t phy_revision;</div><div class='hunk'>@@ -1386,6 +1478,7 @@ struct e1000_hw {</div><div class='ctx'>     boolean_t in_ifs_mode;</div><div class='ctx'>     boolean_t mng_reg_access_disabled;</div><div class='ctx'>     boolean_t leave_av_bit_off;</div><div class='add'>+    boolean_t kmrn_lock_loss_workaround_disabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1434,6 +1527,7 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */</div><div class='ctx'> #define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */</div><div class='ctx'> #define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */</div><div class='add'>+#define E1000_CTRL_SW2FW_INT 0x02000000  /* Initiate an interrupt to manageability engine */</div><div class='ctx'> </div><div class='ctx'> /* Device Status */</div><div class='ctx'> #define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */</div><div class='hunk'>@@ -1448,6 +1542,8 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */</div><div class='ctx'> #define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */</div><div class='ctx'> #define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */</div><div class='add'>+#define E1000_STATUS_LAN_INIT_DONE 0x00000200   /* Lan Init Completion</div><div class='add'>+                                                   by EEPROM/Flash */</div><div class='ctx'> #define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */</div><div class='ctx'> #define E1000_STATUS_DOCK_CI    0x00000800      /* Change in Dock/Undock state. Clear on write '0'. */</div><div class='ctx'> #define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Status of Master requests. */</div><div class='hunk'>@@ -1505,6 +1601,10 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_STM_OPCODE     0xDB00</div><div class='ctx'> #define E1000_HICR_FW_RESET  0xC0</div><div class='ctx'> </div><div class='add'>+#define E1000_SHADOW_RAM_WORDS     2048</div><div class='add'>+#define E1000_ICH8_NVM_SIG_WORD    0x13</div><div class='add'>+#define E1000_ICH8_NVM_SIG_MASK    0xC0</div><div class='add'>+</div><div class='ctx'> /* EEPROM Read */</div><div class='ctx'> #define E1000_EERD_START      0x00000001 /* Start Read */</div><div class='ctx'> #define E1000_EERD_DONE       0x00000010 /* Read Done */</div><div class='hunk'>@@ -1550,7 +1650,6 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_CTRL_EXT_WR_WMARK_320   0x01000000</div><div class='ctx'> #define E1000_CTRL_EXT_WR_WMARK_384   0x02000000</div><div class='ctx'> #define E1000_CTRL_EXT_WR_WMARK_448   0x03000000</div><div class='del'>-#define E1000_CTRL_EXT_CANC           0x04000000  /* Interrupt delay cancellation */</div><div class='ctx'> #define E1000_CTRL_EXT_DRV_LOAD       0x10000000  /* Driver loaded bit for FW */</div><div class='ctx'> #define E1000_CTRL_EXT_IAME           0x08000000  /* Interrupt acknowledge Auto-mask */</div><div class='ctx'> #define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000  /* Clear Interrupt timers after IMS clear */</div><div class='hunk'>@@ -1590,12 +1689,31 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_KUMCTRLSTA_FIFO_CTRL_TX_BYPASS   0x00000800</div><div class='ctx'> </div><div class='ctx'> /* In-Band Control */</div><div class='add'>+#define E1000_KUMCTRLSTA_INB_CTRL_LINK_STATUS_TX_TIMEOUT_DEFAULT    0x00000500</div><div class='ctx'> #define E1000_KUMCTRLSTA_INB_CTRL_DIS_PADDING  0x00000010</div><div class='ctx'> </div><div class='ctx'> /* Half-Duplex Control */</div><div class='ctx'> #define E1000_KUMCTRLSTA_HD_CTRL_10_100_DEFAULT 0x00000004</div><div class='ctx'> #define E1000_KUMCTRLSTA_HD_CTRL_1000_DEFAULT  0x00000000</div><div class='ctx'> </div><div class='add'>+#define E1000_KUMCTRLSTA_OFFSET_K0S_CTRL       0x0000001E</div><div class='add'>+</div><div class='add'>+#define E1000_KUMCTRLSTA_DIAG_FELPBK           0x2000</div><div class='add'>+#define E1000_KUMCTRLSTA_DIAG_NELPBK           0x1000</div><div class='add'>+</div><div class='add'>+#define E1000_KUMCTRLSTA_K0S_100_EN            0x2000</div><div class='add'>+#define E1000_KUMCTRLSTA_K0S_GBE_EN            0x1000</div><div class='add'>+#define E1000_KUMCTRLSTA_K0S_ENTRY_LATENCY_MASK   0x0003</div><div class='add'>+</div><div class='add'>+#define E1000_KABGTXD_BGSQLBIAS                0x00050000</div><div class='add'>+</div><div class='add'>+#define E1000_PHY_CTRL_SPD_EN                  0x00000001</div><div class='add'>+#define E1000_PHY_CTRL_D0A_LPLU                0x00000002</div><div class='add'>+#define E1000_PHY_CTRL_NOND0A_LPLU             0x00000004</div><div class='add'>+#define E1000_PHY_CTRL_NOND0A_GBE_DISABLE      0x00000008</div><div class='add'>+#define E1000_PHY_CTRL_GBE_DISABLE             0x00000040</div><div class='add'>+#define E1000_PHY_CTRL_B2B_EN                  0x00000080</div><div class='add'>+</div><div class='ctx'> /* LED Control */</div><div class='ctx'> #define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F</div><div class='ctx'> #define E1000_LEDCTL_LED0_MODE_SHIFT      0</div><div class='hunk'>@@ -1665,6 +1783,9 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_ICR_RXD_FIFO_PAR1 0x01000000 /* queue 1 Rx descriptor FIFO parity error */</div><div class='ctx'> #define E1000_ICR_TXD_FIFO_PAR1 0x02000000 /* queue 1 Tx descriptor FIFO parity error */</div><div class='ctx'> #define E1000_ICR_ALL_PARITY    0x03F00000 /* all parity error bits */</div><div class='add'>+#define E1000_ICR_DSW           0x00000020 /* FW changed the status of DISSW bit in the FWSM */</div><div class='add'>+#define E1000_ICR_PHYINT        0x00001000 /* LAN connected device generates an interrupt */</div><div class='add'>+#define E1000_ICR_EPRST         0x00100000 /* ME handware reset occurs */</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Cause Set */</div><div class='ctx'> #define E1000_ICS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back */</div><div class='hunk'>@@ -1691,6 +1812,9 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_ICS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity error */</div><div class='ctx'> #define E1000_ICS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* queue 1 Rx descriptor FIFO parity error */</div><div class='ctx'> #define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* queue 1 Tx descriptor FIFO parity error */</div><div class='add'>+#define E1000_ICS_DSW       E1000_ICR_DSW</div><div class='add'>+#define E1000_ICS_PHYINT    E1000_ICR_PHYINT</div><div class='add'>+#define E1000_ICS_EPRST     E1000_ICR_EPRST</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Mask Set */</div><div class='ctx'> #define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Transmit desc written back */</div><div class='hunk'>@@ -1717,6 +1841,9 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_IMS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity error */</div><div class='ctx'> #define E1000_IMS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* queue 1 Rx descriptor FIFO parity error */</div><div class='ctx'> #define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* queue 1 Tx descriptor FIFO parity error */</div><div class='add'>+#define E1000_IMS_DSW       E1000_ICR_DSW</div><div class='add'>+#define E1000_IMS_PHYINT    E1000_ICR_PHYINT</div><div class='add'>+#define E1000_IMS_EPRST     E1000_ICR_EPRST</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Mask Clear */</div><div class='ctx'> #define E1000_IMC_TXDW      E1000_ICR_TXDW      /* Transmit desc written back */</div><div class='hunk'>@@ -1743,6 +1870,9 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_IMC_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity error */</div><div class='ctx'> #define E1000_IMC_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* queue 1 Rx descriptor FIFO parity error */</div><div class='ctx'> #define E1000_IMC_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* queue 1 Tx descriptor FIFO parity error */</div><div class='add'>+#define E1000_IMC_DSW       E1000_ICR_DSW</div><div class='add'>+#define E1000_IMC_PHYINT    E1000_ICR_PHYINT</div><div class='add'>+#define E1000_IMC_EPRST     E1000_ICR_EPRST</div><div class='ctx'> </div><div class='ctx'> /* Receive Control */</div><div class='ctx'> #define E1000_RCTL_RST            0x00000001    /* Software reset */</div><div class='hunk'>@@ -1801,7 +1931,7 @@ struct e1000_hw {</div><div class='ctx'>  *       value2 = [0..64512],    default=4096</div><div class='ctx'>  *       value3 = [0..64512],    default=0</div><div class='ctx'>  */</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> #define E1000_PSRCTL_BSIZE0_MASK   0x0000007F</div><div class='ctx'> #define E1000_PSRCTL_BSIZE1_MASK   0x00003F00</div><div class='ctx'> #define E1000_PSRCTL_BSIZE2_MASK   0x003F0000</div><div class='hunk'>@@ -1917,9 +2047,10 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_MRQC_RSS_FIELD_MASK           0xFFFF0000</div><div class='ctx'> #define E1000_MRQC_RSS_FIELD_IPV4_TCP       0x00010000</div><div class='ctx'> #define E1000_MRQC_RSS_FIELD_IPV4           0x00020000</div><div class='del'>-#define E1000_MRQC_RSS_FIELD_IPV6_TCP       0x00040000</div><div class='add'>+#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX    0x00040000</div><div class='ctx'> #define E1000_MRQC_RSS_FIELD_IPV6_EX        0x00080000</div><div class='ctx'> #define E1000_MRQC_RSS_FIELD_IPV6           0x00100000</div><div class='add'>+#define E1000_MRQC_RSS_FIELD_IPV6_TCP       0x00200000</div><div class='ctx'> </div><div class='ctx'> /* Definitions for power management and wakeup registers */</div><div class='ctx'> /* Wake Up Control */</div><div class='hunk'>@@ -2009,6 +2140,15 @@ struct e1000_hw {</div><div class='ctx'> #define E1000_FWSM_MODE_SHIFT            1</div><div class='ctx'> #define E1000_FWSM_FW_VALID     0x00008000 /* FW established a valid mode */</div><div class='ctx'> </div><div class='add'>+#define E1000_FWSM_RSPCIPHY        0x00000040 /* Reset PHY on PCI reset */</div><div class='add'>+#define E1000_FWSM_DISSW           0x10000000 /* FW disable SW Write Access */</div><div class='add'>+#define E1000_FWSM_SKUSEL_MASK     0x60000000 /* LAN SKU select */</div><div class='add'>+#define E1000_FWSM_SKUEL_SHIFT     29</div><div class='add'>+#define E1000_FWSM_SKUSEL_EMB      0x0 /* Embedded SKU */</div><div class='add'>+#define E1000_FWSM_SKUSEL_CONS     0x1 /* Consumer SKU */</div><div class='add'>+#define E1000_FWSM_SKUSEL_PERF_100 0x2 /* Perf &amp; Corp 10/100 SKU */</div><div class='add'>+#define E1000_FWSM_SKUSEL_PERF_GBE 0x3 /* Perf &amp; Copr GbE SKU */</div><div class='add'>+</div><div class='ctx'> /* FFLT Debug Register */</div><div class='ctx'> #define E1000_FFLT_DBG_INVC     0x00100000 /* Invalid /C/ code handling */</div><div class='ctx'> </div><div class='hunk'>@@ -2081,6 +2221,8 @@ struct e1000_host_command_info {</div><div class='ctx'>                              E1000_GCR_TXDSCW_NO_SNOOP      | \</div><div class='ctx'>                              E1000_GCR_TXDSCR_NO_SNOOP)</div><div class='ctx'> </div><div class='add'>+#define PCI_EX_82566_SNOOP_ALL PCI_EX_NO_SNOOP_ALL</div><div class='add'>+</div><div class='ctx'> #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000</div><div class='ctx'> /* Function Active and Power State to MNG */</div><div class='ctx'> #define E1000_FACTPS_FUNC0_POWER_STATE_MASK         0x00000003</div><div class='hunk'>@@ -2139,8 +2281,10 @@ struct e1000_host_command_info {</div><div class='ctx'> #define EEPROM_PHY_CLASS_WORD         0x0007</div><div class='ctx'> #define EEPROM_INIT_CONTROL1_REG      0x000A</div><div class='ctx'> #define EEPROM_INIT_CONTROL2_REG      0x000F</div><div class='add'>+#define EEPROM_SWDEF_PINS_CTRL_PORT_1 0x0010</div><div class='ctx'> #define EEPROM_INIT_CONTROL3_PORT_B   0x0014</div><div class='ctx'> #define EEPROM_INIT_3GIO_3            0x001A</div><div class='add'>+#define EEPROM_SWDEF_PINS_CTRL_PORT_0 0x0020</div><div class='ctx'> #define EEPROM_INIT_CONTROL3_PORT_A   0x0024</div><div class='ctx'> #define EEPROM_CFG                    0x0012</div><div class='ctx'> #define EEPROM_FLASH_VERSION          0x0032</div><div class='hunk'>@@ -2152,10 +2296,16 @@ struct e1000_host_command_info {</div><div class='ctx'> /* Word definitions for ID LED Settings */</div><div class='ctx'> #define ID_LED_RESERVED_0000 0x0000</div><div class='ctx'> #define ID_LED_RESERVED_FFFF 0xFFFF</div><div class='add'>+#define ID_LED_RESERVED_82573  0xF746</div><div class='add'>+#define ID_LED_DEFAULT_82573   0x1811</div><div class='ctx'> #define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2 &lt;&lt; 12) | \</div><div class='ctx'>                               (ID_LED_OFF1_OFF2 &lt;&lt; 8) | \</div><div class='ctx'>                               (ID_LED_DEF1_DEF2 &lt;&lt; 4) | \</div><div class='ctx'>                               (ID_LED_DEF1_DEF2))</div><div class='add'>+#define ID_LED_DEFAULT_ICH8LAN  ((ID_LED_DEF1_DEF2 &lt;&lt; 12) | \</div><div class='add'>+                                 (ID_LED_DEF1_OFF2 &lt;&lt;  8) | \</div><div class='add'>+                                 (ID_LED_DEF1_ON2  &lt;&lt;  4) | \</div><div class='add'>+                                 (ID_LED_DEF1_DEF2))</div><div class='ctx'> #define ID_LED_DEF1_DEF2     0x1</div><div class='ctx'> #define ID_LED_DEF1_ON2      0x2</div><div class='ctx'> #define ID_LED_DEF1_OFF2     0x3</div><div class='hunk'>@@ -2190,6 +2340,11 @@ struct e1000_host_command_info {</div><div class='ctx'> #define EEPROM_WORD0F_ASM_DIR    0x2000</div><div class='ctx'> #define EEPROM_WORD0F_ANE        0x0800</div><div class='ctx'> #define EEPROM_WORD0F_SWPDIO_EXT 0x00F0</div><div class='add'>+#define EEPROM_WORD0F_LPLU       0x0001</div><div class='add'>+</div><div class='add'>+/* Mask bits for fields in Word 0x10/0x20 of the EEPROM */</div><div class='add'>+#define EEPROM_WORD1020_GIGA_DISABLE         0x0010</div><div class='add'>+#define EEPROM_WORD1020_GIGA_DISABLE_NON_D0A 0x0008</div><div class='ctx'> </div><div class='ctx'> /* Mask bits for fields in Word 0x1a of the EEPROM */</div><div class='ctx'> #define EEPROM_WORD1A_ASPM_MASK  0x000C</div><div class='hunk'>@@ -2264,23 +2419,29 @@ struct e1000_host_command_info {</div><div class='ctx'> #define E1000_EXTCNF_CTRL_D_UD_OWNER        0x00000010</div><div class='ctx'> #define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP 0x00000020</div><div class='ctx'> #define E1000_EXTCNF_CTRL_MDIO_HW_OWNERSHIP 0x00000040</div><div class='del'>-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER   0x1FFF0000</div><div class='add'>+#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER   0x0FFF0000</div><div class='ctx'> </div><div class='ctx'> #define E1000_EXTCNF_SIZE_EXT_PHY_LENGTH    0x000000FF</div><div class='ctx'> #define E1000_EXTCNF_SIZE_EXT_DOCK_LENGTH   0x0000FF00</div><div class='ctx'> #define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH   0x00FF0000</div><div class='add'>+#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE  0x00000001</div><div class='add'>+#define E1000_EXTCNF_CTRL_SWFLAG            0x00000020</div><div class='ctx'> </div><div class='ctx'> /* PBA constants */</div><div class='add'>+#define E1000_PBA_8K 0x0008    /* 8KB, default Rx allocation */</div><div class='ctx'> #define E1000_PBA_12K 0x000C    /* 12KB, default Rx allocation */</div><div class='ctx'> #define E1000_PBA_16K 0x0010    /* 16KB, default TX allocation */</div><div class='ctx'> #define E1000_PBA_22K 0x0016</div><div class='ctx'> #define E1000_PBA_24K 0x0018</div><div class='ctx'> #define E1000_PBA_30K 0x001E</div><div class='ctx'> #define E1000_PBA_32K 0x0020</div><div class='add'>+#define E1000_PBA_34K 0x0022</div><div class='ctx'> #define E1000_PBA_38K 0x0026</div><div class='ctx'> #define E1000_PBA_40K 0x0028</div><div class='ctx'> #define E1000_PBA_48K 0x0030    /* 48KB, default RX allocation */</div><div class='ctx'> </div><div class='add'>+#define E1000_PBS_16K E1000_PBA_16K</div><div class='add'>+</div><div class='ctx'> /* Flow Control Constants */</div><div class='ctx'> #define FLOW_CONTROL_ADDRESS_LOW  0x00C28001</div><div class='ctx'> #define FLOW_CONTROL_ADDRESS_HIGH 0x00000100</div><div class='hunk'>@@ -2335,7 +2496,7 @@ struct e1000_host_command_info {</div><div class='ctx'> /* Number of milliseconds we wait for Eeprom auto read bit done after MAC reset */</div><div class='ctx'> #define AUTO_READ_DONE_TIMEOUT      10</div><div class='ctx'> /* Number of milliseconds we wait for PHY configuration done after MAC reset */</div><div class='del'>-#define PHY_CFG_TIMEOUT             40</div><div class='add'>+#define PHY_CFG_TIMEOUT             100</div><div class='ctx'> </div><div class='ctx'> #define E1000_TX_BUFFER_SIZE ((uint32_t)1514)</div><div class='ctx'> </div><div class='hunk'>@@ -2763,6 +2924,17 @@ struct e1000_host_command_info {</div><div class='ctx'> #define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */</div><div class='ctx'> #define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */</div><div class='ctx'> </div><div class='add'>+/* M88EC018 Rev 2 specific DownShift settings */</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_1X    0x0000</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_2X    0x0200</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_3X    0x0400</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_4X    0x0600</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_6X    0x0A00</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_7X    0x0C00</div><div class='add'>+#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_8X    0x0E00</div><div class='add'>+</div><div class='ctx'> /* IGP01E1000 Specific Port Config Register - R/W */</div><div class='ctx'> #define IGP01E1000_PSCFR_AUTO_MDIX_PAR_DETECT  0x0010</div><div class='ctx'> #define IGP01E1000_PSCFR_PRE_EN                0x0020</div><div class='hunk'>@@ -2989,6 +3161,221 @@ struct e1000_host_command_info {</div><div class='ctx'> #define L1LXT971A_PHY_ID   0x001378E0</div><div class='ctx'> #define GG82563_E_PHY_ID   0x01410CA0</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Bits...</div><div class='add'>+ * 15-5: page</div><div class='add'>+ * 4-0: register offset</div><div class='add'>+ */</div><div class='add'>+#define PHY_PAGE_SHIFT        5</div><div class='add'>+#define PHY_REG(page, reg)    \</div><div class='add'>+        (((page) &lt;&lt; PHY_PAGE_SHIFT) | ((reg) &amp; MAX_PHY_REG_ADDRESS))</div><div class='add'>+</div><div class='add'>+#define IGP3_PHY_PORT_CTRL           \</div><div class='add'>+        PHY_REG(769, 17) /* Port General Configuration */</div><div class='add'>+#define IGP3_PHY_RATE_ADAPT_CTRL \</div><div class='add'>+        PHY_REG(769, 25) /* Rate Adapter Control Register */</div><div class='add'>+</div><div class='add'>+#define IGP3_KMRN_FIFO_CTRL_STATS \</div><div class='add'>+        PHY_REG(770, 16) /* KMRN FIFO's control/status register */</div><div class='add'>+#define IGP3_KMRN_POWER_MNG_CTRL \</div><div class='add'>+        PHY_REG(770, 17) /* KMRN Power Management Control Register */</div><div class='add'>+#define IGP3_KMRN_INBAND_CTRL \</div><div class='add'>+        PHY_REG(770, 18) /* KMRN Inband Control Register */</div><div class='add'>+#define IGP3_KMRN_DIAG \</div><div class='add'>+        PHY_REG(770, 19) /* KMRN Diagnostic register */</div><div class='add'>+#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS 0x0002 /* RX PCS is not synced */</div><div class='add'>+#define IGP3_KMRN_ACK_TIMEOUT \</div><div class='add'>+        PHY_REG(770, 20) /* KMRN Acknowledge Timeouts register */</div><div class='add'>+</div><div class='add'>+#define IGP3_VR_CTRL \</div><div class='add'>+        PHY_REG(776, 18) /* Voltage regulator control register */</div><div class='add'>+#define IGP3_VR_CTRL_MODE_SHUT       0x0200 /* Enter powerdown, shutdown VRs */</div><div class='add'>+</div><div class='add'>+#define IGP3_CAPABILITY \</div><div class='add'>+        PHY_REG(776, 19) /* IGP3 Capability Register */</div><div class='add'>+</div><div class='add'>+/* Capabilities for SKU Control  */</div><div class='add'>+#define IGP3_CAP_INITIATE_TEAM       0x0001 /* Able to initiate a team */</div><div class='add'>+#define IGP3_CAP_WFM                 0x0002 /* Support WoL and PXE */</div><div class='add'>+#define IGP3_CAP_ASF                 0x0004 /* Support ASF */</div><div class='add'>+#define IGP3_CAP_LPLU                0x0008 /* Support Low Power Link Up */</div><div class='add'>+#define IGP3_CAP_DC_AUTO_SPEED       0x0010 /* Support AC/DC Auto Link Speed */</div><div class='add'>+#define IGP3_CAP_SPD                 0x0020 /* Support Smart Power Down */</div><div class='add'>+#define IGP3_CAP_MULT_QUEUE          0x0040 /* Support 2 tx &amp; 2 rx queues */</div><div class='add'>+#define IGP3_CAP_RSS                 0x0080 /* Support RSS */</div><div class='add'>+#define IGP3_CAP_8021PQ              0x0100 /* Support 802.1Q &amp; 802.1p */</div><div class='add'>+#define IGP3_CAP_AMT_CB              0x0200 /* Support active manageability and circuit breaker */</div><div class='add'>+</div><div class='add'>+#define IGP3_PPC_JORDAN_EN           0x0001</div><div class='add'>+#define IGP3_PPC_JORDAN_GIGA_SPEED   0x0002</div><div class='add'>+</div><div class='add'>+#define IGP3_KMRN_PMC_EE_IDLE_LINK_DIS         0x0001</div><div class='add'>+#define IGP3_KMRN_PMC_K0S_ENTRY_LATENCY_MASK   0x001E</div><div class='add'>+#define IGP3_KMRN_PMC_K0S_MODE1_EN_GIGA        0x0020</div><div class='add'>+#define IGP3_KMRN_PMC_K0S_MODE1_EN_100         0x0040</div><div class='add'>+</div><div class='add'>+#define IGP3E1000_PHY_MISC_CTRL                0x1B   /* Misc. Ctrl register */</div><div class='add'>+#define IGP3_PHY_MISC_DUPLEX_MANUAL_SET        0x1000 /* Duplex Manual Set */</div><div class='add'>+</div><div class='add'>+#define IGP3_KMRN_EXT_CTRL  PHY_REG(770, 18)</div><div class='add'>+#define IGP3_KMRN_EC_DIS_INBAND    0x0080</div><div class='add'>+</div><div class='add'>+#define IGP03E1000_E_PHY_ID  0x02A80390</div><div class='add'>+#define IFE_E_PHY_ID         0x02A80330 /* 10/100 PHY */</div><div class='add'>+#define IFE_PLUS_E_PHY_ID    0x02A80320</div><div class='add'>+#define IFE_C_E_PHY_ID       0x02A80310</div><div class='add'>+</div><div class='add'>+#define IFE_PHY_EXTENDED_STATUS_CONTROL   0x10  /* 100BaseTx Extended Status, Control and Address */</div><div class='add'>+#define IFE_PHY_SPECIAL_CONTROL           0x11  /* 100BaseTx PHY special control register */</div><div class='add'>+#define IFE_PHY_RCV_FALSE_CARRIER         0x13  /* 100BaseTx Receive False Carrier Counter */</div><div class='add'>+#define IFE_PHY_RCV_DISCONNECT            0x14  /* 100BaseTx Receive Disconnet Counter */</div><div class='add'>+#define IFE_PHY_RCV_ERROT_FRAME           0x15  /* 100BaseTx Receive Error Frame Counter */</div><div class='add'>+#define IFE_PHY_RCV_SYMBOL_ERR            0x16  /* Receive Symbol Error Counter */</div><div class='add'>+#define IFE_PHY_PREM_EOF_ERR              0x17  /* 100BaseTx Receive Premature End Of Frame Error Counter */</div><div class='add'>+#define IFE_PHY_RCV_EOF_ERR               0x18  /* 10BaseT Receive End Of Frame Error Counter */</div><div class='add'>+#define IFE_PHY_TX_JABBER_DETECT          0x19  /* 10BaseT Transmit Jabber Detect Counter */</div><div class='add'>+#define IFE_PHY_EQUALIZER                 0x1A  /* PHY Equalizer Control and Status */</div><div class='add'>+#define IFE_PHY_SPECIAL_CONTROL_LED       0x1B  /* PHY special control and LED configuration */</div><div class='add'>+#define IFE_PHY_MDIX_CONTROL              0x1C  /* MDI/MDI-X Control register */</div><div class='add'>+#define IFE_PHY_HWI_CONTROL               0x1D  /* Hardware Integrity Control (HWI) */</div><div class='add'>+</div><div class='add'>+#define IFE_PESC_REDUCED_POWER_DOWN_DISABLE  0x2000  /* Defaut 1 = Disable auto reduced power down */</div><div class='add'>+#define IFE_PESC_100BTX_POWER_DOWN           0x0400  /* Indicates the power state of 100BASE-TX */</div><div class='add'>+#define IFE_PESC_10BTX_POWER_DOWN            0x0200  /* Indicates the power state of 10BASE-T */</div><div class='add'>+#define IFE_PESC_POLARITY_REVERSED           0x0100  /* Indicates 10BASE-T polarity */</div><div class='add'>+#define IFE_PESC_PHY_ADDR_MASK               0x007C  /* Bit 6:2 for sampled PHY address */</div><div class='add'>+#define IFE_PESC_SPEED                       0x0002  /* Auto-negotiation speed result 1=100Mbs, 0=10Mbs */</div><div class='add'>+#define IFE_PESC_DUPLEX                      0x0001  /* Auto-negotiation duplex result 1=Full, 0=Half */</div><div class='add'>+#define IFE_PESC_POLARITY_REVERSED_SHIFT     8</div><div class='add'>+</div><div class='add'>+#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN   0x0100  /* 1 = Dyanmic Power Down disabled */</div><div class='add'>+#define IFE_PSC_FORCE_POLARITY               0x0020  /* 1=Reversed Polarity, 0=Normal */</div><div class='add'>+#define IFE_PSC_AUTO_POLARITY_DISABLE        0x0010  /* 1=Auto Polarity Disabled, 0=Enabled */</div><div class='add'>+#define IFE_PSC_JABBER_FUNC_DISABLE          0x0001  /* 1=Jabber Disabled, 0=Normal Jabber Operation */</div><div class='add'>+#define IFE_PSC_FORCE_POLARITY_SHIFT         5</div><div class='add'>+#define IFE_PSC_AUTO_POLARITY_DISABLE_SHIFT  4</div><div class='add'>+</div><div class='add'>+#define IFE_PMC_AUTO_MDIX                    0x0080  /* 1=enable MDI/MDI-X feature, default 0=disabled */</div><div class='add'>+#define IFE_PMC_FORCE_MDIX                   0x0040  /* 1=force MDIX-X, 0=force MDI */</div><div class='add'>+#define IFE_PMC_MDIX_STATUS                  0x0020  /* 1=MDI-X, 0=MDI */</div><div class='add'>+#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010  /* Resolution algorthm is completed */</div><div class='add'>+#define IFE_PMC_MDIX_MODE_SHIFT              6</div><div class='add'>+#define IFE_PHC_MDIX_RESET_ALL_MASK          0x0000  /* Disable auto MDI-X */</div><div class='add'>+</div><div class='add'>+#define IFE_PHC_HWI_ENABLE                   0x8000  /* Enable the HWI feature */</div><div class='add'>+#define IFE_PHC_ABILITY_CHECK                0x4000  /* 1= Test Passed, 0=failed */</div><div class='add'>+#define IFE_PHC_TEST_EXEC                    0x2000  /* PHY launch test pulses on the wire */</div><div class='add'>+#define IFE_PHC_HIGHZ                        0x0200  /* 1 = Open Circuit */</div><div class='add'>+#define IFE_PHC_LOWZ                         0x0400  /* 1 = Short Circuit */</div><div class='add'>+#define IFE_PHC_LOW_HIGH_Z_MASK              0x0600  /* Mask for indication type of problem on the line */</div><div class='add'>+#define IFE_PHC_DISTANCE_MASK                0x01FF  /* Mask for distance to the cable problem, in 80cm granularity */</div><div class='add'>+#define IFE_PHC_RESET_ALL_MASK               0x0000  /* Disable HWI */</div><div class='add'>+#define IFE_PSCL_PROBE_MODE                  0x0020  /* LED Probe mode */</div><div class='add'>+#define IFE_PSCL_PROBE_LEDS_OFF              0x0006  /* Force LEDs 0 and 2 off */</div><div class='add'>+#define IFE_PSCL_PROBE_LEDS_ON               0x0007  /* Force LEDs 0 and 2 on */</div><div class='add'>+</div><div class='add'>+#define ICH8_FLASH_COMMAND_TIMEOUT           500   /* 500 ms , should be adjusted */</div><div class='add'>+#define ICH8_FLASH_CYCLE_REPEAT_COUNT        10    /* 10 cycles , should be adjusted */</div><div class='add'>+#define ICH8_FLASH_SEG_SIZE_256              256</div><div class='add'>+#define ICH8_FLASH_SEG_SIZE_4K               4096</div><div class='add'>+#define ICH8_FLASH_SEG_SIZE_64K              65536</div><div class='add'>+</div><div class='add'>+#define ICH8_CYCLE_READ                      0x0</div><div class='add'>+#define ICH8_CYCLE_RESERVED                  0x1</div><div class='add'>+#define ICH8_CYCLE_WRITE                     0x2</div><div class='add'>+#define ICH8_CYCLE_ERASE                     0x3</div><div class='add'>+</div><div class='add'>+#define ICH8_FLASH_GFPREG   0x0000</div><div class='add'>+#define ICH8_FLASH_HSFSTS   0x0004</div><div class='add'>+#define ICH8_FLASH_HSFCTL   0x0006</div><div class='add'>+#define ICH8_FLASH_FADDR    0x0008</div><div class='add'>+#define ICH8_FLASH_FDATA0   0x0010</div><div class='add'>+#define ICH8_FLASH_FRACC    0x0050</div><div class='add'>+#define ICH8_FLASH_FREG0    0x0054</div><div class='add'>+#define ICH8_FLASH_FREG1    0x0058</div><div class='add'>+#define ICH8_FLASH_FREG2    0x005C</div><div class='add'>+#define ICH8_FLASH_FREG3    0x0060</div><div class='add'>+#define ICH8_FLASH_FPR0     0x0074</div><div class='add'>+#define ICH8_FLASH_FPR1     0x0078</div><div class='add'>+#define ICH8_FLASH_SSFSTS   0x0090</div><div class='add'>+#define ICH8_FLASH_SSFCTL   0x0092</div><div class='add'>+#define ICH8_FLASH_PREOP    0x0094</div><div class='add'>+#define ICH8_FLASH_OPTYPE   0x0096</div><div class='add'>+#define ICH8_FLASH_OPMENU   0x0098</div><div class='add'>+</div><div class='add'>+#define ICH8_FLASH_REG_MAPSIZE      0x00A0</div><div class='add'>+#define ICH8_FLASH_SECTOR_SIZE      4096</div><div class='add'>+#define ICH8_GFPREG_BASE_MASK       0x1FFF</div><div class='add'>+#define ICH8_FLASH_LINEAR_ADDR_MASK 0x00FFFFFF</div><div class='add'>+</div><div class='add'>+/* ICH8 GbE Flash Hardware Sequencing Flash Status Register bit breakdown */</div><div class='add'>+/* Offset 04h HSFSTS */</div><div class='add'>+union ich8_hws_flash_status {</div><div class='add'>+    struct ich8_hsfsts {</div><div class='add'>+#ifdef E1000_BIG_ENDIAN</div><div class='add'>+        uint16_t reserved2      :6;</div><div class='add'>+        uint16_t fldesvalid     :1;</div><div class='add'>+        uint16_t flockdn        :1;</div><div class='add'>+        uint16_t flcdone        :1;</div><div class='add'>+        uint16_t flcerr         :1;</div><div class='add'>+        uint16_t dael           :1;</div><div class='add'>+        uint16_t berasesz       :2;</div><div class='add'>+        uint16_t flcinprog      :1;</div><div class='add'>+        uint16_t reserved1      :2;</div><div class='add'>+#else</div><div class='add'>+        uint16_t flcdone        :1;   /* bit 0 Flash Cycle Done */</div><div class='add'>+        uint16_t flcerr         :1;   /* bit 1 Flash Cycle Error */</div><div class='add'>+        uint16_t dael           :1;   /* bit 2 Direct Access error Log */</div><div class='add'>+        uint16_t berasesz       :2;   /* bit 4:3 Block/Sector Erase Size */</div><div class='add'>+        uint16_t flcinprog      :1;   /* bit 5 flash SPI cycle in Progress */</div><div class='add'>+        uint16_t reserved1      :2;   /* bit 13:6 Reserved */</div><div class='add'>+        uint16_t reserved2      :6;   /* bit 13:6 Reserved */</div><div class='add'>+        uint16_t fldesvalid     :1;   /* bit 14 Flash Descriptor Valid */</div><div class='add'>+        uint16_t flockdn        :1;   /* bit 15 Flash Configuration Lock-Down */</div><div class='add'>+#endif</div><div class='add'>+    } hsf_status;</div><div class='add'>+    uint16_t regval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ICH8 GbE Flash Hardware Sequencing Flash control Register bit breakdown */</div><div class='add'>+/* Offset 06h FLCTL */</div><div class='add'>+union ich8_hws_flash_ctrl {</div><div class='add'>+    struct ich8_hsflctl {</div><div class='add'>+#ifdef E1000_BIG_ENDIAN</div><div class='add'>+        uint16_t fldbcount      :2;</div><div class='add'>+        uint16_t flockdn        :6;</div><div class='add'>+        uint16_t flcgo          :1;</div><div class='add'>+        uint16_t flcycle        :2;</div><div class='add'>+        uint16_t reserved       :5;</div><div class='add'>+#else</div><div class='add'>+        uint16_t flcgo          :1;   /* 0 Flash Cycle Go */</div><div class='add'>+        uint16_t flcycle        :2;   /* 2:1 Flash Cycle */</div><div class='add'>+        uint16_t reserved       :5;   /* 7:3 Reserved  */</div><div class='add'>+        uint16_t fldbcount      :2;   /* 9:8 Flash Data Byte Count */</div><div class='add'>+        uint16_t flockdn        :6;   /* 15:10 Reserved */</div><div class='add'>+#endif</div><div class='add'>+    } hsf_ctrl;</div><div class='add'>+    uint16_t regval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ICH8 Flash Region Access Permissions */</div><div class='add'>+union ich8_hws_flash_regacc {</div><div class='add'>+    struct ich8_flracc {</div><div class='add'>+#ifdef E1000_BIG_ENDIAN</div><div class='add'>+        uint32_t gmwag          :8;</div><div class='add'>+        uint32_t gmrag          :8;</div><div class='add'>+        uint32_t grwa           :8;</div><div class='add'>+        uint32_t grra           :8;</div><div class='add'>+#else</div><div class='add'>+        uint32_t grra           :8;   /* 0:7 GbE region Read Access */</div><div class='add'>+        uint32_t grwa           :8;   /* 8:15 GbE region Write Access */</div><div class='add'>+        uint32_t gmrag          :8;   /* 23:16 GbE Master Read Access Grant  */</div><div class='add'>+        uint32_t gmwag          :8;   /* 31:24 GbE Master Write Access Grant */</div><div class='add'>+#endif</div><div class='add'>+    } hsf_flregacc;</div><div class='add'>+    uint16_t regval;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Miscellaneous PHY bit definitions. */</div><div class='ctx'> #define PHY_PREAMBLE        0xFFFFFFFF</div><div class='ctx'> #define PHY_SOF             0x01</div><div class='head'>diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c<br/>index ed15fcaedaf9..6d3d41934503 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000_main.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,51 +22,13 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "e1000.h"</div><div class='ctx'> </div><div class='del'>-/* Change Log</div><div class='del'>- * 7.0.33      3-Feb-2006</div><div class='del'>- *   o Added another fix for the pass false carrier bit</div><div class='del'>- * 7.0.32      24-Jan-2006</div><div class='del'>- *   o Need to rebuild with noew version number for the pass false carrier </div><div class='del'>- *     fix in e1000_hw.c</div><div class='del'>- * 7.0.30      18-Jan-2006</div><div class='del'>- *   o fixup for tso workaround to disable it for pci-x</div><div class='del'>- *   o fix mem leak on 82542</div><div class='del'>- *   o fixes for 10 Mb/s connections and incorrect stats</div><div class='del'>- * 7.0.28      01/06/2006</div><div class='del'>- *   o hardware workaround to only set "speed mode" bit for 1G link.</div><div class='del'>- * 7.0.26      12/23/2005</div><div class='del'>- *   o wake on lan support modified for device ID 10B5</div><div class='del'>- *   o fix dhcp + vlan issue not making it to the iAMT firmware</div><div class='del'>- * 7.0.24      12/9/2005</div><div class='del'>- *   o New hardware support for the Gigabit NIC embedded in the south bridge</div><div class='del'>- *   o Fixes to the recycling logic (skb-&gt;tail) from IBM LTC</div><div class='del'>- * 6.3.9	12/16/2005</div><div class='del'>- *   o incorporate fix for recycled skbs from IBM LTC</div><div class='del'>- * 6.3.7	11/18/2005</div><div class='del'>- *   o Honor eeprom setting for enabling/disabling Wake On Lan</div><div class='del'>- * 6.3.5 	11/17/2005</div><div class='del'>- *   o Fix memory leak in rx ring handling for PCI Express adapters</div><div class='del'>- * 6.3.4	11/8/05</div><div class='del'>- *   o Patch from Jesper Juhl to remove redundant NULL checks for kfree</div><div class='del'>- * 6.3.2	9/20/05</div><div class='del'>- *   o Render logic that sets/resets DRV_LOAD as inline functions to </div><div class='del'>- *     avoid code replication. If f/w is AMT then set DRV_LOAD only when</div><div class='del'>- *     network interface is open.</div><div class='del'>- *   o Handle DRV_LOAD set/reset in cases where AMT uses VLANs.</div><div class='del'>- *   o Adjust PBA partioning for Jumbo frames using MTU size and not</div><div class='del'>- *     rx_buffer_len</div><div class='del'>- * 6.3.1	9/19/05</div><div class='del'>- *   o Use adapter-&gt;tx_timeout_factor in Tx Hung Detect logic </div><div class='del'>- *      (e1000_clean_tx_irq)</div><div class='del'>- *   o Support for 8086:10B5 device (Quad Port)</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> char e1000_driver_name[] = "e1000";</div><div class='ctx'> static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";</div><div class='ctx'> #ifndef CONFIG_E1000_NAPI</div><div class='hunk'>@@ -74,9 +36,9 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";</div><div class='ctx'> #else</div><div class='ctx'> #define DRIVERNAPI "-NAPI"</div><div class='ctx'> #endif</div><div class='del'>-#define DRV_VERSION "7.0.33-k2"DRIVERNAPI</div><div class='add'>+#define DRV_VERSION "7.1.9-k2"DRIVERNAPI</div><div class='ctx'> char e1000_driver_version[] = DRV_VERSION;</div><div class='del'>-static char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";</div><div class='add'>+static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";</div><div class='ctx'> </div><div class='ctx'> /* e1000_pci_tbl - PCI Device ID Table</div><div class='ctx'>  *</div><div class='hunk'>@@ -111,6 +73,11 @@ static struct pci_device_id e1000_pci_tbl[] = {</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x1026),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x1027),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x1028),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x1049),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x104A),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x104B),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x104C),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x104D),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x105E),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x105F),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x1060),</div><div class='hunk'>@@ -134,6 +101,8 @@ static struct pci_device_id e1000_pci_tbl[] = {</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x109A),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x10B5),</div><div class='ctx'> 	INTEL_E1000_ETHERNET_DEVICE(0x10B9),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x10BA),</div><div class='add'>+	INTEL_E1000_ETHERNET_DEVICE(0x10BB),</div><div class='ctx'> 	/* required last entry */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='hunk'>@@ -171,7 +140,6 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter,</div><div class='ctx'> static void e1000_set_multi(struct net_device *netdev);</div><div class='ctx'> static void e1000_update_phy_info(unsigned long data);</div><div class='ctx'> static void e1000_watchdog(unsigned long data);</div><div class='del'>-static void e1000_watchdog_task(struct e1000_adapter *adapter);</div><div class='ctx'> static void e1000_82547_tx_fifo_stall(unsigned long data);</div><div class='ctx'> static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev);</div><div class='ctx'> static struct net_device_stats * e1000_get_stats(struct net_device *netdev);</div><div class='hunk'>@@ -208,16 +176,16 @@ static void e1000_leave_82542_rst(struct e1000_adapter *adapter);</div><div class='ctx'> static void e1000_tx_timeout(struct net_device *dev);</div><div class='ctx'> static void e1000_reset_task(struct net_device *dev);</div><div class='ctx'> static void e1000_smartspeed(struct e1000_adapter *adapter);</div><div class='del'>-static inline int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,</div><div class='del'>-					      struct sk_buff *skb);</div><div class='add'>+static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,</div><div class='add'>+                                       struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> static void e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp);</div><div class='ctx'> static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);</div><div class='ctx'> static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);</div><div class='ctx'> static void e1000_restore_vlan(struct e1000_adapter *adapter);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='ctx'> static int e1000_resume(struct pci_dev *pdev);</div><div class='ctx'> #endif</div><div class='ctx'> static void e1000_shutdown(struct pci_dev *pdev);</div><div class='hunk'>@@ -227,6 +195,16 @@ static void e1000_shutdown(struct pci_dev *pdev);</div><div class='ctx'> static void e1000_netpoll (struct net_device *netdev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,</div><div class='add'>+                     pci_channel_state_t state);</div><div class='add'>+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);</div><div class='add'>+static void e1000_io_resume(struct pci_dev *pdev);</div><div class='add'>+</div><div class='add'>+static struct pci_error_handlers e1000_err_handler = {</div><div class='add'>+	.error_detected = e1000_io_error_detected,</div><div class='add'>+	.slot_reset = e1000_io_slot_reset,</div><div class='add'>+	.resume = e1000_io_resume,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver e1000_driver = {</div><div class='ctx'> 	.name     = e1000_driver_name,</div><div class='hunk'>@@ -234,11 +212,12 @@ static struct pci_driver e1000_driver = {</div><div class='ctx'> 	.probe    = e1000_probe,</div><div class='ctx'> 	.remove   = __devexit_p(e1000_remove),</div><div class='ctx'> 	/* Power Managment Hooks */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	.suspend  = e1000_suspend,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='ctx'> 	.resume   = e1000_resume,</div><div class='ctx'> #endif</div><div class='del'>-	.shutdown = e1000_shutdown</div><div class='add'>+	.shutdown = e1000_shutdown,</div><div class='add'>+	.err_handler = &amp;e1000_err_handler</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Intel Corporation, &lt;linux.nics@intel.com&gt;");</div><div class='hunk'>@@ -288,12 +267,50 @@ e1000_exit_module(void)</div><div class='ctx'> </div><div class='ctx'> module_exit(e1000_exit_module);</div><div class='ctx'> </div><div class='add'>+static int e1000_request_irq(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int flags, err = 0;</div><div class='add'>+</div><div class='add'>+	flags = IRQF_SHARED;</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+	if (adapter-&gt;hw.mac_type &gt; e1000_82547_rev_2) {</div><div class='add'>+		adapter-&gt;have_msi = TRUE;</div><div class='add'>+		if ((err = pci_enable_msi(adapter-&gt;pdev))) {</div><div class='add'>+			DPRINTK(PROBE, ERR,</div><div class='add'>+			 "Unable to allocate MSI interrupt Error: %d\n", err);</div><div class='add'>+			adapter-&gt;have_msi = FALSE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (adapter-&gt;have_msi)</div><div class='add'>+		flags &amp;= ~IRQF_SHARED;</div><div class='add'>+#endif</div><div class='add'>+	if ((err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;e1000_intr, flags,</div><div class='add'>+	                       netdev-&gt;name, netdev)))</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='add'>+		        "Unable to allocate interrupt Error: %d\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void e1000_free_irq(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI_MSI</div><div class='add'>+	if (adapter-&gt;have_msi)</div><div class='add'>+		pci_disable_msi(adapter-&gt;pdev);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * e1000_irq_disable - Mask off interrupt generation on the NIC</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> e1000_irq_disable(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;adapter-&gt;irq_sem);</div><div class='hunk'>@@ -307,7 +324,7 @@ e1000_irq_disable(struct e1000_adapter *adapter)</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> e1000_irq_enable(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely(atomic_dec_and_test(&amp;adapter-&gt;irq_sem))) {</div><div class='hunk'>@@ -348,19 +365,21 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)</div><div class='ctx'>  * For ASF and Pass Through versions of f/w this means that the</div><div class='ctx'>  * driver is no longer loaded. For AMT version (only with 82573) i</div><div class='ctx'>  * of the f/w this means that the netowrk i/f is closed.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void </div><div class='add'>+static void</div><div class='ctx'> e1000_release_hw_control(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t ctrl_ext;</div><div class='ctx'> 	uint32_t swsm;</div><div class='add'>+	uint32_t extcnf;</div><div class='ctx'> </div><div class='ctx'> 	/* Let firmware taken over control of h/w */</div><div class='ctx'> 	switch (adapter-&gt;hw.mac_type) {</div><div class='ctx'> 	case e1000_82571:</div><div class='ctx'> 	case e1000_82572:</div><div class='add'>+	case e1000_80003es2lan:</div><div class='ctx'> 		ctrl_ext = E1000_READ_REG(&amp;adapter-&gt;hw, CTRL_EXT);</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, CTRL_EXT,</div><div class='ctx'> 				ctrl_ext &amp; ~E1000_CTRL_EXT_DRV_LOAD);</div><div class='hunk'>@@ -369,6 +388,11 @@ e1000_release_hw_control(struct e1000_adapter *adapter)</div><div class='ctx'> 		swsm = E1000_READ_REG(&amp;adapter-&gt;hw, SWSM);</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, SWSM,</div><div class='ctx'> 				swsm &amp; ~E1000_SWSM_DRV_LOAD);</div><div class='add'>+	case e1000_ich8lan:</div><div class='add'>+		extcnf = E1000_READ_REG(&amp;adapter-&gt;hw, CTRL_EXT);</div><div class='add'>+		E1000_WRITE_REG(&amp;adapter-&gt;hw, CTRL_EXT,</div><div class='add'>+				extcnf &amp; ~E1000_CTRL_EXT_DRV_LOAD);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -379,21 +403,23 @@ e1000_release_hw_control(struct e1000_adapter *adapter)</div><div class='ctx'>  * @adapter: address of board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * e1000_get_hw_control sets {CTRL_EXT|FWSM}:DRV_LOAD bit.</div><div class='del'>- * For ASF and Pass Through versions of f/w this means that </div><div class='del'>- * the driver is loaded. For AMT version (only with 82573) </div><div class='add'>+ * For ASF and Pass Through versions of f/w this means that</div><div class='add'>+ * the driver is loaded. For AMT version (only with 82573)</div><div class='ctx'>  * of the f/w this means that the netowrk i/f is open.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void </div><div class='add'>+static void</div><div class='ctx'> e1000_get_hw_control(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t ctrl_ext;</div><div class='ctx'> 	uint32_t swsm;</div><div class='add'>+	uint32_t extcnf;</div><div class='ctx'> 	/* Let firmware know the driver has taken over */</div><div class='ctx'> 	switch (adapter-&gt;hw.mac_type) {</div><div class='ctx'> 	case e1000_82571:</div><div class='ctx'> 	case e1000_82572:</div><div class='add'>+	case e1000_80003es2lan:</div><div class='ctx'> 		ctrl_ext = E1000_READ_REG(&amp;adapter-&gt;hw, CTRL_EXT);</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, CTRL_EXT,</div><div class='ctx'> 				ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);</div><div class='hunk'>@@ -403,6 +429,11 @@ e1000_get_hw_control(struct e1000_adapter *adapter)</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, SWSM,</div><div class='ctx'> 				swsm | E1000_SWSM_DRV_LOAD);</div><div class='ctx'> 		break;</div><div class='add'>+	case e1000_ich8lan:</div><div class='add'>+		extcnf = E1000_READ_REG(&amp;adapter-&gt;hw, EXTCNF_CTRL);</div><div class='add'>+		E1000_WRITE_REG(&amp;adapter-&gt;hw, EXTCNF_CTRL,</div><div class='add'>+				extcnf | E1000_EXTCNF_CTRL_SWFLAG);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -412,18 +443,10 @@ int</div><div class='ctx'> e1000_up(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	int i, err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* hardware has been reset, we need to reload some things */</div><div class='ctx'> </div><div class='del'>-	/* Reset the PHY if it was previously powered down */</div><div class='del'>-	if (adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='del'>-		uint16_t mii_reg;</div><div class='del'>-		e1000_read_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, &amp;mii_reg);</div><div class='del'>-		if (mii_reg &amp; MII_CR_POWER_DOWN)</div><div class='del'>-			e1000_phy_reset(&amp;adapter-&gt;hw);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	e1000_set_multi(netdev);</div><div class='ctx'> </div><div class='ctx'> 	e1000_restore_vlan(adapter);</div><div class='hunk'>@@ -440,24 +463,6 @@ e1000_up(struct e1000_adapter *adapter)</div><div class='ctx'> 		                      E1000_DESC_UNUSED(ring));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI_MSI</div><div class='del'>-	if (adapter-&gt;hw.mac_type &gt; e1000_82547_rev_2) {</div><div class='del'>-		adapter-&gt;have_msi = TRUE;</div><div class='del'>-		if ((err = pci_enable_msi(adapter-&gt;pdev))) {</div><div class='del'>-			DPRINTK(PROBE, ERR,</div><div class='del'>-			 "Unable to allocate MSI interrupt Error: %d\n", err);</div><div class='del'>-			adapter-&gt;have_msi = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if ((err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;e1000_intr,</div><div class='del'>-		              SA_SHIRQ | SA_SAMPLE_RANDOM,</div><div class='del'>-		              netdev-&gt;name, netdev))) {</div><div class='del'>-		DPRINTK(PROBE, ERR,</div><div class='del'>-		    "Unable to allocate interrupt Error: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	adapter-&gt;tx_queue_len = netdev-&gt;tx_queue_len;</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='hunk'>@@ -470,21 +475,60 @@ e1000_up(struct e1000_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * e1000_power_up_phy - restore link in case the phy was powered down</div><div class='add'>+ * @adapter: address of board private structure</div><div class='add'>+ *</div><div class='add'>+ * The phy may be powered down to save power and turn off link when the</div><div class='add'>+ * driver is unloaded and wake on lan is not enabled (among others)</div><div class='add'>+ * *** this routine MUST be followed by a call to e1000_reset ***</div><div class='add'>+ *</div><div class='add'>+ **/</div><div class='add'>+</div><div class='add'>+static void e1000_power_up_phy(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	uint16_t mii_reg = 0;</div><div class='add'>+</div><div class='add'>+	/* Just clear the power down bit to wake the phy back up */</div><div class='add'>+	if (adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='add'>+		/* according to the manual, the phy will retain its</div><div class='add'>+		 * settings across a power-down/up cycle */</div><div class='add'>+		e1000_read_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, &amp;mii_reg);</div><div class='add'>+		mii_reg &amp;= ~MII_CR_POWER_DOWN;</div><div class='add'>+		e1000_write_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, mii_reg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void e1000_power_down_phy(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	boolean_t mng_mode_enabled = (adapter-&gt;hw.mac_type &gt;= e1000_82571) &amp;&amp;</div><div class='add'>+	                              e1000_check_mng_mode(&amp;adapter-&gt;hw);</div><div class='add'>+	/* Power down the PHY so no link is implied when interface is down</div><div class='add'>+	 * The PHY cannot be powered down if any of the following is TRUE</div><div class='add'>+	 * (a) WoL is enabled</div><div class='add'>+	 * (b) AMT is active</div><div class='add'>+	 * (c) SoL/IDER session is active */</div><div class='add'>+	if (!adapter-&gt;wol &amp;&amp; adapter-&gt;hw.mac_type &gt;= e1000_82540 &amp;&amp;</div><div class='add'>+	    adapter-&gt;hw.mac_type != e1000_ich8lan &amp;&amp;</div><div class='add'>+	    adapter-&gt;hw.media_type == e1000_media_type_copper &amp;&amp;</div><div class='add'>+	    !(E1000_READ_REG(&amp;adapter-&gt;hw, MANC) &amp; E1000_MANC_SMBUS_EN) &amp;&amp;</div><div class='add'>+	    !mng_mode_enabled &amp;&amp;</div><div class='add'>+	    !e1000_check_phy_reset_block(&amp;adapter-&gt;hw)) {</div><div class='add'>+		uint16_t mii_reg = 0;</div><div class='add'>+		e1000_read_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, &amp;mii_reg);</div><div class='add'>+		mii_reg |= MII_CR_POWER_DOWN;</div><div class='add'>+		e1000_write_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, mii_reg);</div><div class='add'>+		mdelay(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> e1000_down(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='del'>-	boolean_t mng_mode_enabled = (adapter-&gt;hw.mac_type &gt;= e1000_82571) &amp;&amp;</div><div class='del'>-				     e1000_check_mng_mode(&amp;adapter-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	e1000_irq_disable(adapter);</div><div class='ctx'> </div><div class='del'>-	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='del'>-#ifdef CONFIG_PCI_MSI</div><div class='del'>-	if (adapter-&gt;hw.mac_type &gt; e1000_82547_rev_2 &amp;&amp;</div><div class='del'>-	   adapter-&gt;have_msi == TRUE)</div><div class='del'>-		pci_disable_msi(adapter-&gt;pdev);</div><div class='del'>-#endif</div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;tx_fifo_stall_timer);</div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='ctx'> 	del_timer_sync(&amp;adapter-&gt;phy_info_timer);</div><div class='hunk'>@@ -501,23 +545,17 @@ e1000_down(struct e1000_adapter *adapter)</div><div class='ctx'> 	e1000_reset(adapter);</div><div class='ctx'> 	e1000_clean_all_tx_rings(adapter);</div><div class='ctx'> 	e1000_clean_all_rx_rings(adapter);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Power down the PHY so no link is implied when interface is down *</div><div class='del'>-	 * The PHY cannot be powered down if any of the following is TRUE *</div><div class='del'>-	 * (a) WoL is enabled</div><div class='del'>-	 * (b) AMT is active</div><div class='del'>-	 * (c) SoL/IDER session is active */</div><div class='del'>-	if (!adapter-&gt;wol &amp;&amp; adapter-&gt;hw.mac_type &gt;= e1000_82540 &amp;&amp;</div><div class='del'>-	   adapter-&gt;hw.media_type == e1000_media_type_copper &amp;&amp;</div><div class='del'>-	   !(E1000_READ_REG(&amp;adapter-&gt;hw, MANC) &amp; E1000_MANC_SMBUS_EN) &amp;&amp;</div><div class='del'>-	   !mng_mode_enabled &amp;&amp;</div><div class='del'>-	   !e1000_check_phy_reset_block(&amp;adapter-&gt;hw)) {</div><div class='del'>-		uint16_t mii_reg;</div><div class='del'>-		e1000_read_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, &amp;mii_reg);</div><div class='del'>-		mii_reg |= MII_CR_POWER_DOWN;</div><div class='del'>-		e1000_write_phy_reg(&amp;adapter-&gt;hw, PHY_CTRL, mii_reg);</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='add'>+void</div><div class='add'>+e1000_reinit_locked(struct e1000_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(in_interrupt());</div><div class='add'>+	while (test_and_set_bit(__E1000_RESETTING, &amp;adapter-&gt;flags))</div><div class='add'>+		msleep(1);</div><div class='add'>+	e1000_down(adapter);</div><div class='add'>+	e1000_up(adapter);</div><div class='add'>+	clear_bit(__E1000_RESETTING, &amp;adapter-&gt;flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -543,6 +581,9 @@ e1000_reset(struct e1000_adapter *adapter)</div><div class='ctx'> 	case e1000_82573:</div><div class='ctx'> 		pba = E1000_PBA_12K;</div><div class='ctx'> 		break;</div><div class='add'>+	case e1000_ich8lan:</div><div class='add'>+		pba = E1000_PBA_8K;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		pba = E1000_PBA_48K;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -567,6 +608,12 @@ e1000_reset(struct e1000_adapter *adapter)</div><div class='ctx'> 	/* Set the FC high water mark to 90% of the FIFO size.</div><div class='ctx'> 	 * Required to clear last 3 LSB */</div><div class='ctx'> 	fc_high_water_mark = ((pba * 9216)/10) &amp; 0xFFF8;</div><div class='add'>+	/* We can't use 90% on small FIFOs because the remainder</div><div class='add'>+	 * would be less than 1 full frame.  In this case, we size</div><div class='add'>+	 * it to allow at least a full frame above the high water</div><div class='add'>+	 *  mark. */</div><div class='add'>+	if (pba &lt; E1000_PBA_16K)</div><div class='add'>+		fc_high_water_mark = (pba * 1024) - 1600;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;hw.fc_high_water = fc_high_water_mark;</div><div class='ctx'> 	adapter-&gt;hw.fc_low_water = fc_high_water_mark - 8;</div><div class='hunk'>@@ -589,6 +636,23 @@ e1000_reset(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	e1000_reset_adaptive(&amp;adapter-&gt;hw);</div><div class='ctx'> 	e1000_phy_get_info(&amp;adapter-&gt;hw, &amp;adapter-&gt;phy_info);</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;smart_power_down &amp;&amp;</div><div class='add'>+	    (adapter-&gt;hw.mac_type == e1000_82571 ||</div><div class='add'>+	     adapter-&gt;hw.mac_type == e1000_82572)) {</div><div class='add'>+		uint16_t phy_data = 0;</div><div class='add'>+		/* speed up time to link by disabling smart power down, ignore</div><div class='add'>+		 * the return value of this function because there is nothing</div><div class='add'>+		 * different we would do if it failed */</div><div class='add'>+		e1000_read_phy_reg(&amp;adapter-&gt;hw, IGP02E1000_PHY_POWER_MGMT,</div><div class='add'>+		                   &amp;phy_data);</div><div class='add'>+		phy_data &amp;= ~IGP02E1000_PM_SPD;</div><div class='add'>+		e1000_write_phy_reg(&amp;adapter-&gt;hw, IGP02E1000_PHY_POWER_MGMT,</div><div class='add'>+		                    phy_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.mac_type &lt; e1000_ich8lan)</div><div class='add'>+	/* FIXME: this code is duplicate and wrong for PCI Express */</div><div class='ctx'> 	if (adapter-&gt;en_mng_pt) {</div><div class='ctx'> 		manc = E1000_READ_REG(&amp;adapter-&gt;hw, MANC);</div><div class='ctx'> 		manc |= (E1000_MANC_ARP_EN | E1000_MANC_EN_MNG2HOST);</div><div class='hunk'>@@ -615,6 +679,7 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct e1000_adapter *adapter;</div><div class='ctx'> 	unsigned long mmio_start, mmio_len;</div><div class='add'>+	unsigned long flash_start, flash_len;</div><div class='ctx'> </div><div class='ctx'> 	static int cards_found = 0;</div><div class='ctx'> 	static int e1000_ksp3_port_a = 0; /* global ksp3 port a indication */</div><div class='hunk'>@@ -624,10 +689,12 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if ((err = pci_enable_device(pdev)))</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {</div><div class='add'>+	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &amp;&amp;</div><div class='add'>+	    !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {</div><div class='ctx'> 		pci_using_dac = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {</div><div class='add'>+		if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) &amp;&amp;</div><div class='add'>+		    (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {</div><div class='ctx'> 			E1000_ERR("No usable DMA configuration, aborting\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -707,12 +774,25 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if ((err = e1000_sw_init(adapter)))</div><div class='ctx'> 		goto err_sw_init;</div><div class='ctx'> </div><div class='add'>+	/* Flash BAR mapping must happen after e1000_sw_init</div><div class='add'>+	 * because it depends on mac_type */</div><div class='add'>+	if ((adapter-&gt;hw.mac_type == e1000_ich8lan) &amp;&amp;</div><div class='add'>+	   (pci_resource_flags(pdev, 1) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		flash_start = pci_resource_start(pdev, 1);</div><div class='add'>+		flash_len = pci_resource_len(pdev, 1);</div><div class='add'>+		adapter-&gt;hw.flash_address = ioremap(flash_start, flash_len);</div><div class='add'>+		if (!adapter-&gt;hw.flash_address) {</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto err_flashmap;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((err = e1000_check_phy_reset_block(&amp;adapter-&gt;hw)))</div><div class='ctx'> 		DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER session.\n");</div><div class='ctx'> </div><div class='ctx'> 	/* if ksp3, indicate if it's port a being setup */</div><div class='del'>-	if (pdev-&gt;device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 &amp;&amp; </div><div class='del'>-			e1000_ksp3_port_a == 0) </div><div class='add'>+	if (pdev-&gt;device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 &amp;&amp;</div><div class='add'>+			e1000_ksp3_port_a == 0)</div><div class='ctx'> 		adapter-&gt;ksp3_port_a = 1;</div><div class='ctx'> 	e1000_ksp3_port_a++;</div><div class='ctx'> 	/* Reset for multiple KP3 adapters */</div><div class='hunk'>@@ -725,6 +805,8 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 				   NETIF_F_HW_VLAN_TX |</div><div class='ctx'> 				   NETIF_F_HW_VLAN_RX |</div><div class='ctx'> 				   NETIF_F_HW_VLAN_FILTER;</div><div class='add'>+		if (adapter-&gt;hw.mac_type == e1000_ich8lan)</div><div class='add'>+			netdev-&gt;features &amp;= ~NETIF_F_HW_VLAN_FILTER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='hunk'>@@ -740,11 +822,17 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (pci_using_dac)</div><div class='ctx'> 		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='del'>- 	/* hard_start_xmit is safe against parallel locking */</div><div class='del'>- 	netdev-&gt;features |= NETIF_F_LLTX; </div><div class='del'>- </div><div class='add'>+	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;en_mng_pt = e1000_enable_mng_pass_thru(&amp;adapter-&gt;hw);</div><div class='ctx'> </div><div class='add'>+	/* initialize eeprom parameters */</div><div class='add'>+</div><div class='add'>+	if (e1000_init_eeprom_params(&amp;adapter-&gt;hw)) {</div><div class='add'>+		E1000_ERR("EEPROM initialization failed\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* before reading the EEPROM, reset the controller to</div><div class='ctx'> 	 * put the device in a known good starting state */</div><div class='ctx'> </div><div class='hunk'>@@ -783,9 +871,6 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	adapter-&gt;watchdog_timer.function = &amp;e1000_watchdog;</div><div class='ctx'> 	adapter-&gt;watchdog_timer.data = (unsigned long) adapter;</div><div class='ctx'> </div><div class='del'>-	INIT_WORK(&amp;adapter-&gt;watchdog_task,</div><div class='del'>-		(void (*)(void *))e1000_watchdog_task, adapter);</div><div class='del'>-</div><div class='ctx'> 	init_timer(&amp;adapter-&gt;phy_info_timer);</div><div class='ctx'> 	adapter-&gt;phy_info_timer.function = &amp;e1000_update_phy_info;</div><div class='ctx'> 	adapter-&gt;phy_info_timer.data = (unsigned long) adapter;</div><div class='hunk'>@@ -815,6 +900,11 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 			EEPROM_INIT_CONTROL2_REG, 1, &amp;eeprom_data);</div><div class='ctx'> 		eeprom_apme_mask = E1000_EEPROM_82544_APM;</div><div class='ctx'> 		break;</div><div class='add'>+	case e1000_ich8lan:</div><div class='add'>+		e1000_read_eeprom(&amp;adapter-&gt;hw,</div><div class='add'>+			EEPROM_INIT_CONTROL1_REG, 1, &amp;eeprom_data);</div><div class='add'>+		eeprom_apme_mask = E1000_EEPROM_ICH8_APME;</div><div class='add'>+		break;</div><div class='ctx'> 	case e1000_82546:</div><div class='ctx'> 	case e1000_82546_rev_3:</div><div class='ctx'> 	case e1000_82571:</div><div class='hunk'>@@ -874,6 +964,9 @@ e1000_probe(struct pci_dev *pdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_register:</div><div class='add'>+	if (adapter-&gt;hw.flash_address)</div><div class='add'>+		iounmap(adapter-&gt;hw.flash_address);</div><div class='add'>+err_flashmap:</div><div class='ctx'> err_sw_init:</div><div class='ctx'> err_eeprom:</div><div class='ctx'> 	iounmap(adapter-&gt;hw.hw_addr);</div><div class='hunk'>@@ -907,6 +1000,7 @@ e1000_remove(struct pci_dev *pdev)</div><div class='ctx'> 	flush_scheduled_work();</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;hw.mac_type &gt;= e1000_82540 &amp;&amp;</div><div class='add'>+	   adapter-&gt;hw.mac_type != e1000_ich8lan &amp;&amp;</div><div class='ctx'> 	   adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='ctx'> 		manc = E1000_READ_REG(&amp;adapter-&gt;hw, MANC);</div><div class='ctx'> 		if (manc &amp; E1000_MANC_SMBUS_EN) {</div><div class='hunk'>@@ -935,6 +1029,8 @@ e1000_remove(struct pci_dev *pdev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	iounmap(adapter-&gt;hw.hw_addr);</div><div class='add'>+	if (adapter-&gt;hw.flash_address)</div><div class='add'>+		iounmap(adapter-&gt;hw.flash_address);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(netdev);</div><div class='hunk'>@@ -972,8 +1068,8 @@ e1000_sw_init(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(pdev, PCI_COMMAND, &amp;hw-&gt;pci_cmd_word);</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;rx_buffer_len = E1000_RXBUFFER_2048;</div><div class='del'>-	adapter-&gt;rx_ps_bsize0 = E1000_RXBUFFER_256;</div><div class='add'>+	adapter-&gt;rx_buffer_len = MAXIMUM_ETHERNET_FRAME_SIZE;</div><div class='add'>+	adapter-&gt;rx_ps_bsize0 = E1000_RXBUFFER_128;</div><div class='ctx'> 	hw-&gt;max_frame_size = netdev-&gt;mtu +</div><div class='ctx'> 			     ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;</div><div class='ctx'> 	hw-&gt;min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;</div><div class='hunk'>@@ -985,13 +1081,6 @@ e1000_sw_init(struct e1000_adapter *adapter)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* initialize eeprom parameters */</div><div class='del'>-</div><div class='del'>-	if (e1000_init_eeprom_params(hw)) {</div><div class='del'>-		E1000_ERR("EEPROM initialization failed\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	switch (hw-&gt;mac_type) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1103,6 +1192,10 @@ e1000_open(struct net_device *netdev)</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* disallow open during test */</div><div class='add'>+	if (test_bit(__E1000_DRIVER_TESTING, &amp;adapter-&gt;flags))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='ctx'> 	/* allocate transmit descriptors */</div><div class='ctx'> </div><div class='ctx'> 	if ((err = e1000_setup_all_tx_resources(adapter)))</div><div class='hunk'>@@ -1113,6 +1206,12 @@ e1000_open(struct net_device *netdev)</div><div class='ctx'> 	if ((err = e1000_setup_all_rx_resources(adapter)))</div><div class='ctx'> 		goto err_setup_rx;</div><div class='ctx'> </div><div class='add'>+	err = e1000_request_irq(adapter);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_up;</div><div class='add'>+</div><div class='add'>+	e1000_power_up_phy(adapter);</div><div class='add'>+</div><div class='ctx'> 	if ((err = e1000_up(adapter)))</div><div class='ctx'> 		goto err_up;</div><div class='ctx'> 	adapter-&gt;mng_vlan_id = E1000_MNG_VLAN_NONE;</div><div class='hunk'>@@ -1156,7 +1255,10 @@ e1000_close(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='add'>+	WARN_ON(test_bit(__E1000_RESETTING, &amp;adapter-&gt;flags));</div><div class='ctx'> 	e1000_down(adapter);</div><div class='add'>+	e1000_power_down_phy(adapter);</div><div class='add'>+	e1000_free_irq(adapter);</div><div class='ctx'> </div><div class='ctx'> 	e1000_free_all_tx_resources(adapter);</div><div class='ctx'> 	e1000_free_all_rx_resources(adapter);</div><div class='hunk'>@@ -1181,7 +1283,7 @@ e1000_close(struct net_device *netdev)</div><div class='ctx'>  * @start: address of beginning of memory</div><div class='ctx'>  * @len: length of memory</div><div class='ctx'>  **/</div><div class='del'>-static inline boolean_t</div><div class='add'>+static boolean_t</div><div class='ctx'> e1000_check_64k_bound(struct e1000_adapter *adapter,</div><div class='ctx'> 		      void *start, unsigned long len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1214,8 +1316,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct e1000_buffer) * txdr-&gt;count;</div><div class='del'>-</div><div class='del'>-	txdr-&gt;buffer_info = vmalloc_node(size, pcibus_to_node(pdev-&gt;bus));</div><div class='add'>+	txdr-&gt;buffer_info = vmalloc(size);</div><div class='ctx'> 	if (!txdr-&gt;buffer_info) {</div><div class='ctx'> 		DPRINTK(PROBE, ERR,</div><div class='ctx'> 		"Unable to allocate memory for the transmit descriptor ring\n");</div><div class='hunk'>@@ -1327,11 +1428,11 @@ e1000_configure_tx(struct e1000_adapter *adapter)</div><div class='ctx'> 		tdba = adapter-&gt;tx_ring[0].dma;</div><div class='ctx'> 		tdlen = adapter-&gt;tx_ring[0].count *</div><div class='ctx'> 			sizeof(struct e1000_tx_desc);</div><div class='del'>-		E1000_WRITE_REG(hw, TDBAL, (tdba &amp; 0x00000000ffffffffULL));</div><div class='del'>-		E1000_WRITE_REG(hw, TDBAH, (tdba &gt;&gt; 32));</div><div class='ctx'> 		E1000_WRITE_REG(hw, TDLEN, tdlen);</div><div class='del'>-		E1000_WRITE_REG(hw, TDH, 0);</div><div class='add'>+		E1000_WRITE_REG(hw, TDBAH, (tdba &gt;&gt; 32));</div><div class='add'>+		E1000_WRITE_REG(hw, TDBAL, (tdba &amp; 0x00000000ffffffffULL));</div><div class='ctx'> 		E1000_WRITE_REG(hw, TDT, 0);</div><div class='add'>+		E1000_WRITE_REG(hw, TDH, 0);</div><div class='ctx'> 		adapter-&gt;tx_ring[0].tdh = E1000_TDH;</div><div class='ctx'> 		adapter-&gt;tx_ring[0].tdt = E1000_TDT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1443,7 +1544,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,</div><div class='ctx'> 	int size, desc_len;</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(struct e1000_buffer) * rxdr-&gt;count;</div><div class='del'>-	rxdr-&gt;buffer_info = vmalloc_node(size, pcibus_to_node(pdev-&gt;bus));</div><div class='add'>+	rxdr-&gt;buffer_info = vmalloc(size);</div><div class='ctx'> 	if (!rxdr-&gt;buffer_info) {</div><div class='ctx'> 		DPRINTK(PROBE, ERR,</div><div class='ctx'> 		"Unable to allocate memory for the receive descriptor ring\n");</div><div class='hunk'>@@ -1585,9 +1686,6 @@ e1000_setup_rctl(struct e1000_adapter *adapter)</div><div class='ctx'> 		E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |</div><div class='ctx'> 		(adapter-&gt;hw.mc_filter_type &lt;&lt; E1000_RCTL_MO_SHIFT);</div><div class='ctx'> </div><div class='del'>-	if (adapter-&gt;hw.mac_type &gt; e1000_82543)</div><div class='del'>-		rctl |= E1000_RCTL_SECRC;</div><div class='del'>-</div><div class='ctx'> 	if (adapter-&gt;hw.tbi_compatibility_on == 1)</div><div class='ctx'> 		rctl |= E1000_RCTL_SBP;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1599,14 +1697,21 @@ e1000_setup_rctl(struct e1000_adapter *adapter)</div><div class='ctx'> 		rctl |= E1000_RCTL_LPE;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup buffer sizes */</div><div class='del'>-	if (adapter-&gt;hw.mac_type &gt;= e1000_82571) {</div><div class='del'>-		/* We can now specify buffers in 1K increments.</div><div class='del'>-		 * BSIZE and BSEX are ignored in this case. */</div><div class='del'>-		rctl |= adapter-&gt;rx_buffer_len &lt;&lt; 0x11;</div><div class='del'>-	} else {</div><div class='del'>-		rctl &amp;= ~E1000_RCTL_SZ_4096;</div><div class='del'>-		rctl |= E1000_RCTL_BSEX; </div><div class='del'>-		switch (adapter-&gt;rx_buffer_len) {</div><div class='add'>+	rctl &amp;= ~E1000_RCTL_SZ_4096;</div><div class='add'>+	rctl |= E1000_RCTL_BSEX;</div><div class='add'>+	switch (adapter-&gt;rx_buffer_len) {</div><div class='add'>+		case E1000_RXBUFFER_256:</div><div class='add'>+			rctl |= E1000_RCTL_SZ_256;</div><div class='add'>+			rctl &amp;= ~E1000_RCTL_BSEX;</div><div class='add'>+			break;</div><div class='add'>+		case E1000_RXBUFFER_512:</div><div class='add'>+			rctl |= E1000_RCTL_SZ_512;</div><div class='add'>+			rctl &amp;= ~E1000_RCTL_BSEX;</div><div class='add'>+			break;</div><div class='add'>+		case E1000_RXBUFFER_1024:</div><div class='add'>+			rctl |= E1000_RCTL_SZ_1024;</div><div class='add'>+			rctl &amp;= ~E1000_RCTL_BSEX;</div><div class='add'>+			break;</div><div class='ctx'> 		case E1000_RXBUFFER_2048:</div><div class='ctx'> 		default:</div><div class='ctx'> 			rctl |= E1000_RCTL_SZ_2048;</div><div class='hunk'>@@ -1621,7 +1726,6 @@ e1000_setup_rctl(struct e1000_adapter *adapter)</div><div class='ctx'> 		case E1000_RXBUFFER_16384:</div><div class='ctx'> 			rctl |= E1000_RCTL_SZ_16384;</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT</div><div class='hunk'>@@ -1647,7 +1751,7 @@ e1000_setup_rctl(struct e1000_adapter *adapter)</div><div class='ctx'> 		rfctl |= E1000_RFCTL_IPV6_DIS;</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, RFCTL, rfctl);</div><div class='ctx'> </div><div class='del'>-		rctl |= E1000_RCTL_DTYP_PS | E1000_RCTL_SECRC;</div><div class='add'>+		rctl |= E1000_RCTL_DTYP_PS;</div><div class='ctx'> </div><div class='ctx'> 		psrctl |= adapter-&gt;rx_ps_bsize0 &gt;&gt;</div><div class='ctx'> 			E1000_PSRCTL_BSIZE0_SHIFT;</div><div class='hunk'>@@ -1715,7 +1819,7 @@ e1000_configure_rx(struct e1000_adapter *adapter)</div><div class='ctx'> 	if (hw-&gt;mac_type &gt;= e1000_82571) {</div><div class='ctx'> 		ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);</div><div class='ctx'> 		/* Reset delay timers after every interrupt */</div><div class='del'>-		ctrl_ext |= E1000_CTRL_EXT_CANC;</div><div class='add'>+		ctrl_ext |= E1000_CTRL_EXT_INT_TIMER_CLR;</div><div class='ctx'> #ifdef CONFIG_E1000_NAPI</div><div class='ctx'> 		/* Auto-Mask interrupts upon ICR read. */</div><div class='ctx'> 		ctrl_ext |= E1000_CTRL_EXT_IAME;</div><div class='hunk'>@@ -1731,11 +1835,11 @@ e1000_configure_rx(struct e1000_adapter *adapter)</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	default:</div><div class='ctx'> 		rdba = adapter-&gt;rx_ring[0].dma;</div><div class='del'>-		E1000_WRITE_REG(hw, RDBAL, (rdba &amp; 0x00000000ffffffffULL));</div><div class='del'>-		E1000_WRITE_REG(hw, RDBAH, (rdba &gt;&gt; 32));</div><div class='ctx'> 		E1000_WRITE_REG(hw, RDLEN, rdlen);</div><div class='del'>-		E1000_WRITE_REG(hw, RDH, 0);</div><div class='add'>+		E1000_WRITE_REG(hw, RDBAH, (rdba &gt;&gt; 32));</div><div class='add'>+		E1000_WRITE_REG(hw, RDBAL, (rdba &amp; 0x00000000ffffffffULL));</div><div class='ctx'> 		E1000_WRITE_REG(hw, RDT, 0);</div><div class='add'>+		E1000_WRITE_REG(hw, RDH, 0);</div><div class='ctx'> 		adapter-&gt;rx_ring[0].rdh = E1000_RDH;</div><div class='ctx'> 		adapter-&gt;rx_ring[0].rdt = E1000_RDT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1760,9 +1864,6 @@ e1000_configure_rx(struct e1000_adapter *adapter)</div><div class='ctx'> 		E1000_WRITE_REG(hw, RXCSUM, rxcsum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hw-&gt;mac_type == e1000_82573)</div><div class='del'>-		E1000_WRITE_REG(hw, ERT, 0x0100);</div><div class='del'>-</div><div class='ctx'> 	/* Enable Receives */</div><div class='ctx'> 	E1000_WRITE_REG(hw, RCTL, rctl);</div><div class='ctx'> }</div><div class='hunk'>@@ -1807,7 +1908,7 @@ e1000_free_all_tx_resources(struct e1000_adapter *adapter)</div><div class='ctx'> 		e1000_free_tx_resources(adapter, &amp;adapter-&gt;tx_ring[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> e1000_unmap_and_free_tx_resource(struct e1000_adapter *adapter,</div><div class='ctx'> 			struct e1000_buffer *buffer_info)</div><div class='ctx'> {</div><div class='hunk'>@@ -2102,6 +2203,12 @@ e1000_set_multi(struct net_device *netdev)</div><div class='ctx'> 	uint32_t rctl;</div><div class='ctx'> 	uint32_t hash_value;</div><div class='ctx'> 	int i, rar_entries = E1000_RAR_ENTRIES;</div><div class='add'>+	int mta_reg_count = (hw-&gt;mac_type == e1000_ich8lan) ?</div><div class='add'>+				E1000_NUM_MTA_REGISTERS_ICH8LAN :</div><div class='add'>+				E1000_NUM_MTA_REGISTERS;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.mac_type == e1000_ich8lan)</div><div class='add'>+		rar_entries = E1000_RAR_ENTRIES_ICH8LAN;</div><div class='ctx'> </div><div class='ctx'> 	/* reserve RAR[14] for LAA over-write work-around */</div><div class='ctx'> 	if (adapter-&gt;hw.mac_type == e1000_82571)</div><div class='hunk'>@@ -2140,14 +2247,18 @@ e1000_set_multi(struct net_device *netdev)</div><div class='ctx'> 			mc_ptr = mc_ptr-&gt;next;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			E1000_WRITE_REG_ARRAY(hw, RA, i &lt;&lt; 1, 0);</div><div class='add'>+			E1000_WRITE_FLUSH(hw);</div><div class='ctx'> 			E1000_WRITE_REG_ARRAY(hw, RA, (i &lt;&lt; 1) + 1, 0);</div><div class='add'>+			E1000_WRITE_FLUSH(hw);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear the old settings from the multicast hash table */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; E1000_NUM_MTA_REGISTERS; i++)</div><div class='add'>+	for (i = 0; i &lt; mta_reg_count; i++) {</div><div class='ctx'> 		E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);</div><div class='add'>+		E1000_WRITE_FLUSH(hw);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* load any remaining addresses into the hash table */</div><div class='ctx'> </div><div class='hunk'>@@ -2220,19 +2331,19 @@ static void</div><div class='ctx'> e1000_watchdog(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = (struct e1000_adapter *) data;</div><div class='del'>-</div><div class='del'>-	/* Do the rest outside of interrupt context */</div><div class='del'>-	schedule_work(&amp;adapter-&gt;watchdog_task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e1000_watchdog_task(struct e1000_adapter *adapter)</div><div class='del'>-{</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	struct e1000_tx_ring *txdr = adapter-&gt;tx_ring;</div><div class='ctx'> 	uint32_t link, tctl;</div><div class='del'>-</div><div class='del'>-	e1000_check_for_link(&amp;adapter-&gt;hw);</div><div class='add'>+	int32_t ret_val;</div><div class='add'>+</div><div class='add'>+	ret_val = e1000_check_for_link(&amp;adapter-&gt;hw);</div><div class='add'>+	if ((ret_val == E1000_ERR_PHY) &amp;&amp;</div><div class='add'>+	    (adapter-&gt;hw.phy_type == e1000_phy_igp_3) &amp;&amp;</div><div class='add'>+	    (E1000_READ_REG(&amp;adapter-&gt;hw, CTRL) &amp; E1000_PHY_CTRL_GBE_DISABLE)) {</div><div class='add'>+		/* See e1000_kumeran_lock_loss_workaround() */</div><div class='add'>+		DPRINTK(LINK, INFO,</div><div class='add'>+			"Gigabit has been disabled, downgrading speed\n");</div><div class='add'>+	}</div><div class='ctx'> 	if (adapter-&gt;hw.mac_type == e1000_82573) {</div><div class='ctx'> 		e1000_enable_tx_pkt_filtering(&amp;adapter-&gt;hw);</div><div class='ctx'> 		if (adapter-&gt;mng_vlan_id != adapter-&gt;hw.mng_cookie.vlan_id)</div><div class='hunk'>@@ -2247,6 +2358,7 @@ e1000_watchdog_task(struct e1000_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	if (link) {</div><div class='ctx'> 		if (!netif_carrier_ok(netdev)) {</div><div class='add'>+			boolean_t txb2b = 1;</div><div class='ctx'> 			e1000_get_speed_and_duplex(&amp;adapter-&gt;hw,</div><div class='ctx'> 			                           &amp;adapter-&gt;link_speed,</div><div class='ctx'> 			                           &amp;adapter-&gt;link_duplex);</div><div class='hunk'>@@ -2260,23 +2372,22 @@ e1000_watchdog_task(struct e1000_adapter *adapter)</div><div class='ctx'> 			 * and adjust the timeout factor */</div><div class='ctx'> 			netdev-&gt;tx_queue_len = adapter-&gt;tx_queue_len;</div><div class='ctx'> 			adapter-&gt;tx_timeout_factor = 1;</div><div class='del'>-			adapter-&gt;txb2b = 1;</div><div class='ctx'> 			switch (adapter-&gt;link_speed) {</div><div class='ctx'> 			case SPEED_10:</div><div class='del'>-				adapter-&gt;txb2b = 0;</div><div class='add'>+				txb2b = 0;</div><div class='ctx'> 				netdev-&gt;tx_queue_len = 10;</div><div class='ctx'> 				adapter-&gt;tx_timeout_factor = 8;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case SPEED_100:</div><div class='del'>-				adapter-&gt;txb2b = 0;</div><div class='add'>+				txb2b = 0;</div><div class='ctx'> 				netdev-&gt;tx_queue_len = 100;</div><div class='ctx'> 				/* maybe add some timeout factor ? */</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if ((adapter-&gt;hw.mac_type == e1000_82571 || </div><div class='add'>+			if ((adapter-&gt;hw.mac_type == e1000_82571 ||</div><div class='ctx'> 			     adapter-&gt;hw.mac_type == e1000_82572) &amp;&amp;</div><div class='del'>-			    adapter-&gt;txb2b == 0) {</div><div class='add'>+			    txb2b == 0) {</div><div class='ctx'> #define SPEED_MODE_BIT (1 &lt;&lt; 21)</div><div class='ctx'> 				uint32_t tarc0;</div><div class='ctx'> 				tarc0 = E1000_READ_REG(&amp;adapter-&gt;hw, TARC0);</div><div class='hunk'>@@ -2400,7 +2511,7 @@ e1000_watchdog_task(struct e1000_adapter *adapter)</div><div class='ctx'> #define E1000_TX_FLAGS_VLAN_MASK	0xffff0000</div><div class='ctx'> #define E1000_TX_FLAGS_VLAN_SHIFT	16</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'>           struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -2413,7 +2524,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> 	uint8_t ipcss, ipcso, tucss, tucso, hdr_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (skb_shinfo(skb)-&gt;tso_size) {</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='ctx'> 		if (skb_header_cloned(skb)) {</div><div class='ctx'> 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='ctx'> 			if (err)</div><div class='hunk'>@@ -2421,8 +2532,8 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hdr_len = ((skb-&gt;h.raw - skb-&gt;data) + (skb-&gt;h.th-&gt;doff &lt;&lt; 2));</div><div class='del'>-		mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='del'>-		if (skb-&gt;protocol == ntohs(ETH_P_IP)) {</div><div class='add'>+		mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='ctx'> 			skb-&gt;nh.iph-&gt;tot_len = 0;</div><div class='ctx'> 			skb-&gt;nh.iph-&gt;check = 0;</div><div class='ctx'> 			skb-&gt;h.th-&gt;check =</div><div class='hunk'>@@ -2480,7 +2591,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> 	return FALSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline boolean_t</div><div class='add'>+static boolean_t</div><div class='ctx'> e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'>               struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -2516,7 +2627,7 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> #define E1000_MAX_TXD_PWR	12</div><div class='ctx'> #define E1000_MAX_DATA_PER_TXD	(1&lt;&lt;E1000_MAX_TXD_PWR)</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'>              struct sk_buff *skb, unsigned int first, unsigned int max_per_txd,</div><div class='ctx'>              unsigned int nr_frags, unsigned int mss)</div><div class='hunk'>@@ -2538,7 +2649,7 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> 		 * tso gets written back prematurely before the data is fully</div><div class='ctx'> 		 * DMA'd to the controller */</div><div class='ctx'> 		if (!skb-&gt;data_len &amp;&amp; tx_ring-&gt;last_tx_tso &amp;&amp;</div><div class='del'>-		    !skb_shinfo(skb)-&gt;tso_size) {</div><div class='add'>+		    !skb_is_gso(skb)) {</div><div class='ctx'> 			tx_ring-&gt;last_tx_tso = 0;</div><div class='ctx'> 			size -= 4;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2625,7 +2736,7 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'>                int tx_flags, int count)</div><div class='ctx'> {</div><div class='hunk'>@@ -2689,7 +2800,7 @@ e1000_tx_queue(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,</div><div class='ctx'> #define E1000_FIFO_HDR			0x10</div><div class='ctx'> #define E1000_82547_PAD_LEN		0x3E0</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t fifo_space = adapter-&gt;tx_fifo_size - adapter-&gt;tx_fifo_head;</div><div class='hunk'>@@ -2716,7 +2827,7 @@ no_fifo_stall_required:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MINIMUM_DHCP_PACKET_SIZE 282</div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw =  &amp;adapter-&gt;hw;</div><div class='hunk'>@@ -2764,7 +2875,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	unsigned int nr_frags = 0;</div><div class='ctx'> 	unsigned int mss = 0;</div><div class='ctx'> 	int count = 0;</div><div class='del'>- 	int tso;</div><div class='add'>+	int tso;</div><div class='ctx'> 	unsigned int f;</div><div class='ctx'> 	len -= skb-&gt;data_len;</div><div class='ctx'> </div><div class='hunk'>@@ -2776,8 +2887,8 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='del'>-	mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='del'>-	/* The controller does a simple calculation to </div><div class='add'>+	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	/* The controller does a simple calculation to</div><div class='ctx'> 	 * make sure there is enough room in the FIFO before</div><div class='ctx'> 	 * initiating the DMA for each buffer.  The calc is:</div><div class='ctx'> 	 * 4 = ceil(buffer len/mss).  To make sure we don't</div><div class='hunk'>@@ -2798,9 +2909,10 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 			case e1000_82571:</div><div class='ctx'> 			case e1000_82572:</div><div class='ctx'> 			case e1000_82573:</div><div class='add'>+			case e1000_ich8lan:</div><div class='ctx'> 				pull_size = min((unsigned int)4, skb-&gt;data_len);</div><div class='ctx'> 				if (!__pskb_pull_tail(skb, pull_size)) {</div><div class='del'>-					printk(KERN_ERR </div><div class='add'>+					DPRINTK(DRV, ERR,</div><div class='ctx'> 						"__pskb_pull_tail failed.\n");</div><div class='ctx'> 					dev_kfree_skb_any(skb);</div><div class='ctx'> 					return NETDEV_TX_OK;</div><div class='hunk'>@@ -2825,8 +2937,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='ctx'> 	/* Controller Erratum workaround */</div><div class='del'>-	if (!skb-&gt;data_len &amp;&amp; tx_ring-&gt;last_tx_tso &amp;&amp;</div><div class='del'>-	    !skb_shinfo(skb)-&gt;tso_size)</div><div class='add'>+	if (!skb-&gt;data_len &amp;&amp; tx_ring-&gt;last_tx_tso &amp;&amp; !skb_is_gso(skb))</div><div class='ctx'> 		count++;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2901,7 +3012,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	/* Old method was to assume IPv4 packet by default if TSO was enabled.</div><div class='ctx'> 	 * 82571 hardware supports TSO capabilities for IPv6 as well...</div><div class='ctx'> 	 * no longer assume, we must. */</div><div class='del'>-	if (likely(skb-&gt;protocol == ntohs(ETH_P_IP)))</div><div class='add'>+	if (likely(skb-&gt;protocol == htons(ETH_P_IP)))</div><div class='ctx'> 		tx_flags |= E1000_TX_FLAGS_IPV4;</div><div class='ctx'> </div><div class='ctx'> 	e1000_tx_queue(adapter, tx_ring, tx_flags,</div><div class='hunk'>@@ -2938,8 +3049,7 @@ e1000_reset_task(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	e1000_down(adapter);</div><div class='del'>-	e1000_up(adapter);</div><div class='add'>+	e1000_reinit_locked(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2982,8 +3092,8 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	/* Adapter-specific max frame size limits. */</div><div class='ctx'> 	switch (adapter-&gt;hw.mac_type) {</div><div class='del'>-	case e1000_82542_rev2_0:</div><div class='del'>-	case e1000_82542_rev2_1:</div><div class='add'>+	case e1000_undefined ... e1000_82542_rev2_1:</div><div class='add'>+	case e1000_ich8lan:</div><div class='ctx'> 		if (max_frame &gt; MAXIMUM_ETHERNET_FRAME_SIZE) {</div><div class='ctx'> 			DPRINTK(PROBE, ERR, "Jumbo Frames not supported.\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -3017,34 +3127,37 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;hw.mac_type &gt; e1000_82547_rev_2) {</div><div class='del'>-		adapter-&gt;rx_buffer_len = max_frame;</div><div class='del'>-		E1000_ROUNDUP(adapter-&gt;rx_buffer_len, 1024);</div><div class='del'>-	} else {</div><div class='del'>-		if(unlikely((adapter-&gt;hw.mac_type &lt; e1000_82543) &amp;&amp;</div><div class='del'>-		   (max_frame &gt; MAXIMUM_ETHERNET_FRAME_SIZE))) {</div><div class='del'>-			DPRINTK(PROBE, ERR, "Jumbo Frames not supported "</div><div class='del'>-					    "on 82542\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		} else {</div><div class='del'>-			if(max_frame &lt;= E1000_RXBUFFER_2048)</div><div class='del'>-				adapter-&gt;rx_buffer_len = E1000_RXBUFFER_2048;</div><div class='del'>-			else if(max_frame &lt;= E1000_RXBUFFER_4096)</div><div class='del'>-				adapter-&gt;rx_buffer_len = E1000_RXBUFFER_4096;</div><div class='del'>-			else if(max_frame &lt;= E1000_RXBUFFER_8192)</div><div class='del'>-				adapter-&gt;rx_buffer_len = E1000_RXBUFFER_8192;</div><div class='del'>-			else if(max_frame &lt;= E1000_RXBUFFER_16384)</div><div class='del'>-				adapter-&gt;rx_buffer_len = E1000_RXBUFFER_16384;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* NOTE: dev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN</div><div class='add'>+	 * means we reserve 2 more, this pushes us to allocate from the next</div><div class='add'>+	 * larger slab size</div><div class='add'>+	 * i.e. RXBUFFER_2048 --&gt; size-4096 slab */</div><div class='add'>+</div><div class='add'>+	if (max_frame &lt;= E1000_RXBUFFER_256)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_256;</div><div class='add'>+	else if (max_frame &lt;= E1000_RXBUFFER_512)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_512;</div><div class='add'>+	else if (max_frame &lt;= E1000_RXBUFFER_1024)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_1024;</div><div class='add'>+	else if (max_frame &lt;= E1000_RXBUFFER_2048)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_2048;</div><div class='add'>+	else if (max_frame &lt;= E1000_RXBUFFER_4096)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_4096;</div><div class='add'>+	else if (max_frame &lt;= E1000_RXBUFFER_8192)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_8192;</div><div class='add'>+	else if (max_frame &lt;= E1000_RXBUFFER_16384)</div><div class='add'>+		adapter-&gt;rx_buffer_len = E1000_RXBUFFER_16384;</div><div class='add'>+</div><div class='add'>+	/* adjust allocation if LPE protects us, and we aren't using SBP */</div><div class='add'>+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522</div><div class='add'>+	if (!adapter-&gt;hw.tbi_compatibility_on &amp;&amp;</div><div class='add'>+	    ((max_frame == MAXIMUM_ETHERNET_FRAME_SIZE) ||</div><div class='add'>+	     (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))</div><div class='add'>+		adapter-&gt;rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev)) {</div><div class='del'>-		e1000_down(adapter);</div><div class='del'>-		e1000_up(adapter);</div><div class='del'>-	}</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		e1000_reinit_locked(adapter);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;hw.max_frame_size = max_frame;</div><div class='ctx'> </div><div class='hunk'>@@ -3060,11 +3173,21 @@ void</div><div class='ctx'> e1000_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct e1000_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	uint16_t phy_tmp;</div><div class='ctx'> </div><div class='ctx'> #define PHY_IDLE_ERROR_COUNT_MASK 0x00FF</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Prevent stats update while adapter is being reset, or if the pci</div><div class='add'>+	 * connection is down.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;link_speed == 0)</div><div class='add'>+		return;</div><div class='add'>+	if (pdev-&gt;error_state &amp;&amp; pdev-&gt;error_state != pci_channel_io_normal)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;adapter-&gt;stats_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* these counters are modified from e1000_adjust_tbi_stats,</div><div class='hunk'>@@ -3079,12 +3202,15 @@ e1000_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;stats.bprc += E1000_READ_REG(hw, BPRC);</div><div class='ctx'> 	adapter-&gt;stats.mprc += E1000_READ_REG(hw, MPRC);</div><div class='ctx'> 	adapter-&gt;stats.roc += E1000_READ_REG(hw, ROC);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.mac_type != e1000_ich8lan) {</div><div class='ctx'> 	adapter-&gt;stats.prc64 += E1000_READ_REG(hw, PRC64);</div><div class='ctx'> 	adapter-&gt;stats.prc127 += E1000_READ_REG(hw, PRC127);</div><div class='ctx'> 	adapter-&gt;stats.prc255 += E1000_READ_REG(hw, PRC255);</div><div class='ctx'> 	adapter-&gt;stats.prc511 += E1000_READ_REG(hw, PRC511);</div><div class='ctx'> 	adapter-&gt;stats.prc1023 += E1000_READ_REG(hw, PRC1023);</div><div class='ctx'> 	adapter-&gt;stats.prc1522 += E1000_READ_REG(hw, PRC1522);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;stats.symerrs += E1000_READ_REG(hw, SYMERRS);</div><div class='ctx'> 	adapter-&gt;stats.mpc += E1000_READ_REG(hw, MPC);</div><div class='hunk'>@@ -3112,12 +3238,16 @@ e1000_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;stats.totl += E1000_READ_REG(hw, TOTL);</div><div class='ctx'> 	adapter-&gt;stats.toth += E1000_READ_REG(hw, TOTH);</div><div class='ctx'> 	adapter-&gt;stats.tpr += E1000_READ_REG(hw, TPR);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.mac_type != e1000_ich8lan) {</div><div class='ctx'> 	adapter-&gt;stats.ptc64 += E1000_READ_REG(hw, PTC64);</div><div class='ctx'> 	adapter-&gt;stats.ptc127 += E1000_READ_REG(hw, PTC127);</div><div class='ctx'> 	adapter-&gt;stats.ptc255 += E1000_READ_REG(hw, PTC255);</div><div class='ctx'> 	adapter-&gt;stats.ptc511 += E1000_READ_REG(hw, PTC511);</div><div class='ctx'> 	adapter-&gt;stats.ptc1023 += E1000_READ_REG(hw, PTC1023);</div><div class='ctx'> 	adapter-&gt;stats.ptc1522 += E1000_READ_REG(hw, PTC1522);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;stats.mptc += E1000_READ_REG(hw, MPTC);</div><div class='ctx'> 	adapter-&gt;stats.bptc += E1000_READ_REG(hw, BPTC);</div><div class='ctx'> </div><div class='hunk'>@@ -3139,6 +3269,8 @@ e1000_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> 	if (hw-&gt;mac_type &gt; e1000_82547_rev_2) {</div><div class='ctx'> 		adapter-&gt;stats.iac += E1000_READ_REG(hw, IAC);</div><div class='ctx'> 		adapter-&gt;stats.icrxoc += E1000_READ_REG(hw, ICRXOC);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;hw.mac_type != e1000_ich8lan) {</div><div class='ctx'> 		adapter-&gt;stats.icrxptc += E1000_READ_REG(hw, ICRXPTC);</div><div class='ctx'> 		adapter-&gt;stats.icrxatc += E1000_READ_REG(hw, ICRXATC);</div><div class='ctx'> 		adapter-&gt;stats.ictxptc += E1000_READ_REG(hw, ICTXPTC);</div><div class='hunk'>@@ -3146,6 +3278,7 @@ e1000_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;stats.ictxqec += E1000_READ_REG(hw, ICTXQEC);</div><div class='ctx'> 		adapter-&gt;stats.ictxqmtc += E1000_READ_REG(hw, ICTXQMTC);</div><div class='ctx'> 		adapter-&gt;stats.icrxdmtc += E1000_READ_REG(hw, ICRXDMTC);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill out the OS statistics structure */</div><div class='hunk'>@@ -3165,7 +3298,6 @@ e1000_update_stats(struct e1000_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;stats.crcerrs + adapter-&gt;stats.algnerrc +</div><div class='ctx'> 		adapter-&gt;stats.ruc + adapter-&gt;stats.roc +</div><div class='ctx'> 		adapter-&gt;stats.cexterr;</div><div class='del'>-	adapter-&gt;net_stats.rx_dropped = 0;</div><div class='ctx'> 	adapter-&gt;net_stats.rx_length_errors = adapter-&gt;stats.ruc +</div><div class='ctx'> 	                                      adapter-&gt;stats.roc;</div><div class='ctx'> 	adapter-&gt;net_stats.rx_crc_errors = adapter-&gt;stats.crcerrs;</div><div class='hunk'>@@ -3391,13 +3523,15 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	tx_ring-&gt;next_to_clean = i;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;tx_ring-&gt;tx_lock);</div><div class='del'>-</div><div class='add'>+#define TX_WAKE_THRESHOLD 32</div><div class='ctx'> 	if (unlikely(cleaned &amp;&amp; netif_queue_stopped(netdev) &amp;&amp;</div><div class='del'>-		    netif_carrier_ok(netdev)))</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;tx_ring-&gt;tx_lock);</div><div class='add'>+	             netif_carrier_ok(netdev))) {</div><div class='add'>+		spin_lock(&amp;tx_ring-&gt;tx_lock);</div><div class='add'>+		if (netif_queue_stopped(netdev) &amp;&amp;</div><div class='add'>+		    (E1000_DESC_UNUSED(tx_ring) &gt;= TX_WAKE_THRESHOLD))</div><div class='add'>+			netif_wake_queue(netdev);</div><div class='add'>+		spin_unlock(&amp;tx_ring-&gt;tx_lock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;detect_tx_hung) {</div><div class='ctx'> 		/* Detect a transmit hang in hardware, this serializes the</div><div class='hunk'>@@ -3445,7 +3579,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,</div><div class='ctx'>  * @sk_buff:     socket buffer with received data</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> e1000_rx_checksum(struct e1000_adapter *adapter,</div><div class='ctx'> 		  uint32_t status_err, uint32_t csum,</div><div class='ctx'> 		  struct sk_buff *skb)</div><div class='hunk'>@@ -3519,7 +3653,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 	buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> </div><div class='ctx'> 	while (rx_desc-&gt;status &amp; E1000_RXD_STAT_DD) {</div><div class='del'>-		struct sk_buff *skb, *next_skb;</div><div class='add'>+		struct sk_buff *skb;</div><div class='ctx'> 		u8 status;</div><div class='ctx'> #ifdef CONFIG_E1000_NAPI</div><div class='ctx'> 		if (*work_done &gt;= work_to_do)</div><div class='hunk'>@@ -3537,8 +3671,6 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 		prefetch(next_rxd);</div><div class='ctx'> </div><div class='ctx'> 		next_buffer = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-		next_skb = next_buffer-&gt;skb;</div><div class='del'>-		prefetch(next_skb-&gt;data - NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		cleaned = TRUE;</div><div class='ctx'> 		cleaned_count++;</div><div class='hunk'>@@ -3553,7 +3685,8 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 			/* All receives must fit into a single buffer */</div><div class='ctx'> 			E1000_DBG("%s: Receive packet consumed multiple"</div><div class='ctx'> 				  " buffers\n", netdev-&gt;name);</div><div class='del'>-			dev_kfree_skb_irq(skb);</div><div class='add'>+			/* recycle */</div><div class='add'>+			buffer_info-&gt; skb = skb;</div><div class='ctx'> 			goto next_desc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3569,7 +3702,8 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,</div><div class='ctx'> 				                       flags);</div><div class='ctx'> 				length--;</div><div class='ctx'> 			} else {</div><div class='del'>-				dev_kfree_skb_irq(skb);</div><div class='add'>+				/* recycle */</div><div class='add'>+				buffer_info-&gt;skb = skb;</div><div class='ctx'> 				goto next_desc;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3668,7 +3802,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 	struct e1000_buffer *buffer_info, *next_buffer;</div><div class='ctx'> 	struct e1000_ps_page *ps_page;</div><div class='ctx'> 	struct e1000_ps_page_dma *ps_page_dma;</div><div class='del'>-	struct sk_buff *skb, *next_skb;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	uint32_t length, staterr;</div><div class='ctx'> 	int cleaned_count = 0;</div><div class='hunk'>@@ -3677,9 +3811,9 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 	i = rx_ring-&gt;next_to_clean;</div><div class='ctx'> 	rx_desc = E1000_RX_DESC_PS(*rx_ring, i);</div><div class='ctx'> 	staterr = le32_to_cpu(rx_desc-&gt;wb.middle.status_error);</div><div class='add'>+	buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> </div><div class='ctx'> 	while (staterr &amp; E1000_RXD_STAT_DD) {</div><div class='del'>-		buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> 		ps_page = &amp;rx_ring-&gt;ps_page[i];</div><div class='ctx'> 		ps_page_dma = &amp;rx_ring-&gt;ps_page_dma[i];</div><div class='ctx'> #ifdef CONFIG_E1000_NAPI</div><div class='hunk'>@@ -3697,8 +3831,6 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> 		prefetch(next_rxd);</div><div class='ctx'> </div><div class='ctx'> 		next_buffer = &amp;rx_ring-&gt;buffer_info[i];</div><div class='del'>-		next_skb = next_buffer-&gt;skb;</div><div class='del'>-		prefetch(next_skb-&gt;data - NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		cleaned = TRUE;</div><div class='ctx'> 		cleaned_count++;</div><div class='hunk'>@@ -3737,9 +3869,9 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 		/* page alloc/put takes too long and effects small packet</div><div class='ctx'> 		 * throughput, so unsplit small packets and save the alloc/put*/</div><div class='del'>-		if (l1 &amp;&amp; ((length + l1) &lt; E1000_CB_LENGTH)) {</div><div class='add'>+		if (l1 &amp;&amp; ((length + l1) &lt;= adapter-&gt;rx_ps_bsize0)) {</div><div class='ctx'> 			u8 *vaddr;</div><div class='del'>-			/* there is no documentation about how to call </div><div class='add'>+			/* there is no documentation about how to call</div><div class='ctx'> 			 * kmap_atomic, so we can't hold the mapping</div><div class='ctx'> 			 * very long */</div><div class='ctx'> 			pci_dma_sync_single_for_cpu(pdev,</div><div class='hunk'>@@ -4159,7 +4291,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;adapter-&gt;stats_lock, flags);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='del'>-		if (adapter-&gt;hw.phy_type == e1000_media_type_copper) {</div><div class='add'>+		if (adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='ctx'> 			switch (data-&gt;reg_num) {</div><div class='ctx'> 			case PHY_CTRL:</div><div class='ctx'> 				if (mii_reg &amp; MII_CR_POWER_DOWN)</div><div class='hunk'>@@ -4186,10 +4318,9 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 						return retval;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='del'>-				if (netif_running(adapter-&gt;netdev)) {</div><div class='del'>-					e1000_down(adapter);</div><div class='del'>-					e1000_up(adapter);</div><div class='del'>-				} else</div><div class='add'>+				if (netif_running(adapter-&gt;netdev))</div><div class='add'>+					e1000_reinit_locked(adapter);</div><div class='add'>+				else</div><div class='ctx'> 					e1000_reset(adapter);</div><div class='ctx'> 				break;</div><div class='ctx'> 			case M88E1000_PHY_SPEC_CTRL:</div><div class='hunk'>@@ -4206,10 +4337,9 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 			case PHY_CTRL:</div><div class='ctx'> 				if (mii_reg &amp; MII_CR_POWER_DOWN)</div><div class='ctx'> 					break;</div><div class='del'>-				if (netif_running(adapter-&gt;netdev)) {</div><div class='del'>-					e1000_down(adapter);</div><div class='del'>-					e1000_up(adapter);</div><div class='del'>-				} else</div><div class='add'>+				if (netif_running(adapter-&gt;netdev))</div><div class='add'>+					e1000_reinit_locked(adapter);</div><div class='add'>+				else</div><div class='ctx'> 					e1000_reset(adapter);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -4283,18 +4413,21 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)</div><div class='ctx'> 		ctrl |= E1000_CTRL_VME;</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, CTRL, ctrl);</div><div class='ctx'> </div><div class='add'>+		if (adapter-&gt;hw.mac_type != e1000_ich8lan) {</div><div class='ctx'> 		/* enable VLAN receive filtering */</div><div class='ctx'> 		rctl = E1000_READ_REG(&amp;adapter-&gt;hw, RCTL);</div><div class='ctx'> 		rctl |= E1000_RCTL_VFE;</div><div class='ctx'> 		rctl &amp;= ~E1000_RCTL_CFIEN;</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, RCTL, rctl);</div><div class='ctx'> 		e1000_update_mng_vlan(adapter);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* disable VLAN tag insert/strip */</div><div class='ctx'> 		ctrl = E1000_READ_REG(&amp;adapter-&gt;hw, CTRL);</div><div class='ctx'> 		ctrl &amp;= ~E1000_CTRL_VME;</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, CTRL, ctrl);</div><div class='ctx'> </div><div class='add'>+		if (adapter-&gt;hw.mac_type != e1000_ich8lan) {</div><div class='ctx'> 		/* disable VLAN filtering */</div><div class='ctx'> 		rctl = E1000_READ_REG(&amp;adapter-&gt;hw, RCTL);</div><div class='ctx'> 		rctl &amp;= ~E1000_RCTL_VFE;</div><div class='hunk'>@@ -4303,6 +4436,7 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)</div><div class='ctx'> 			e1000_vlan_rx_kill_vid(netdev, adapter-&gt;mng_vlan_id);</div><div class='ctx'> 			adapter-&gt;mng_vlan_id = E1000_MNG_VLAN_NONE;</div><div class='ctx'> 		}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	e1000_irq_enable(adapter);</div><div class='hunk'>@@ -4464,12 +4598,16 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	uint32_t ctrl, ctrl_ext, rctl, manc, status;</div><div class='ctx'> 	uint32_t wufc = adapter-&gt;wol;</div><div class='add'>+#ifdef CONFIG_PM</div><div class='ctx'> 	int retval = 0;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev))</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		WARN_ON(test_bit(__E1000_RESETTING, &amp;adapter-&gt;flags));</div><div class='ctx'> 		e1000_down(adapter);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	/* Implement our own version of pci_save_state(pdev) because pci-</div><div class='hunk'>@@ -4518,48 +4656,38 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, WUC, E1000_WUC_PME_EN);</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, WUFC, wufc);</div><div class='del'>-		retval = pci_enable_wake(pdev, PCI_D3hot, 1);</div><div class='del'>-		if (retval)</div><div class='del'>-			DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");</div><div class='del'>-		retval = pci_enable_wake(pdev, PCI_D3cold, 1);</div><div class='del'>-		if (retval)</div><div class='del'>-			DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");</div><div class='add'>+		pci_enable_wake(pdev, PCI_D3hot, 1);</div><div class='add'>+		pci_enable_wake(pdev, PCI_D3cold, 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, WUC, 0);</div><div class='ctx'> 		E1000_WRITE_REG(&amp;adapter-&gt;hw, WUFC, 0);</div><div class='del'>-		retval = pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-		if (retval)</div><div class='del'>-			DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");</div><div class='del'>-		retval = pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='del'>-		if (retval)</div><div class='del'>-			DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");</div><div class='add'>+		pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='add'>+		pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* FIXME: this code is incorrect for PCI Express */</div><div class='ctx'> 	if (adapter-&gt;hw.mac_type &gt;= e1000_82540 &amp;&amp;</div><div class='add'>+	   adapter-&gt;hw.mac_type != e1000_ich8lan &amp;&amp;</div><div class='ctx'> 	   adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='ctx'> 		manc = E1000_READ_REG(&amp;adapter-&gt;hw, MANC);</div><div class='ctx'> 		if (manc &amp; E1000_MANC_SMBUS_EN) {</div><div class='ctx'> 			manc |= E1000_MANC_ARP_EN;</div><div class='ctx'> 			E1000_WRITE_REG(&amp;adapter-&gt;hw, MANC, manc);</div><div class='del'>-			retval = pci_enable_wake(pdev, PCI_D3hot, 1);</div><div class='del'>-			if (retval)</div><div class='del'>-				DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");</div><div class='del'>-			retval = pci_enable_wake(pdev, PCI_D3cold, 1);</div><div class='del'>-			if (retval)</div><div class='del'>-				DPRINTK(PROBE, ERR,</div><div class='del'>-				        "Error enabling D3 cold wake\n");</div><div class='add'>+			pci_enable_wake(pdev, PCI_D3hot, 1);</div><div class='add'>+			pci_enable_wake(pdev, PCI_D3cold, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;hw.phy_type == e1000_phy_igp_3)</div><div class='add'>+		e1000_phy_powerdown_workaround(&amp;adapter-&gt;hw);</div><div class='add'>+</div><div class='ctx'> 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this</div><div class='ctx'> 	 * would have already happened in close and is redundant. */</div><div class='ctx'> 	e1000_release_hw_control(adapter);</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	retval = pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='del'>-	if (retval)</div><div class='del'>-		DPRINTK(PROBE, ERR, "Error in setting power state\n");</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4570,22 +4698,15 @@ e1000_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct e1000_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	int retval;</div><div class='ctx'> 	uint32_t manc, ret_val;</div><div class='ctx'> </div><div class='del'>-	retval = pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	if (retval)</div><div class='del'>-		DPRINTK(PROBE, ERR, "Error in setting power state\n");</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='ctx'> 	e1000_pci_restore_state(adapter);</div><div class='ctx'> 	ret_val = pci_enable_device(pdev);</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	retval = pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-	if (retval)</div><div class='del'>-		DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");</div><div class='del'>-	retval = pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='del'>-	if (retval)</div><div class='del'>-		DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='add'>+	pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='ctx'> </div><div class='ctx'> 	e1000_reset(adapter);</div><div class='ctx'> 	E1000_WRITE_REG(&amp;adapter-&gt;hw, WUS, ~0);</div><div class='hunk'>@@ -4595,7 +4716,9 @@ e1000_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(netdev);</div><div class='ctx'> </div><div class='add'>+	/* FIXME: this code is incorrect for PCI Express */</div><div class='ctx'> 	if (adapter-&gt;hw.mac_type &gt;= e1000_82540 &amp;&amp;</div><div class='add'>+	   adapter-&gt;hw.mac_type != e1000_ich8lan &amp;&amp;</div><div class='ctx'> 	   adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='ctx'> 		manc = E1000_READ_REG(&amp;adapter-&gt;hw, MANC);</div><div class='ctx'> 		manc &amp;= ~(E1000_MANC_ARP_EN);</div><div class='hunk'>@@ -4639,4 +4762,101 @@ e1000_netpoll(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * e1000_io_error_detected - called when PCI error is detected</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ * @state: The current pci conneection state</div><div class='add'>+ *</div><div class='add'>+ * This function is called after a PCI bus error affecting</div><div class='add'>+ * this device has been detected.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct e1000_adapter *adapter = netdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		e1000_down(adapter);</div><div class='add'>+</div><div class='add'>+	/* Request a slot slot reset. */</div><div class='add'>+	return PCI_ERS_RESULT_NEED_RESET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000_io_slot_reset - called after the pci bus has been reset.</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ *</div><div class='add'>+ * Restart the card from scratch, as if from a cold-boot. Implementation</div><div class='add'>+ * resembles the first-half of the e1000_resume routine.</div><div class='add'>+ */</div><div class='add'>+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct e1000_adapter *adapter = netdev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");</div><div class='add'>+		return PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	pci_enable_wake(pdev, 3, 0);</div><div class='add'>+	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */</div><div class='add'>+</div><div class='add'>+	/* Perform card reset only on one instance of the card */</div><div class='add'>+	if (PCI_FUNC (pdev-&gt;devfn) != 0)</div><div class='add'>+		return PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+</div><div class='add'>+	e1000_reset(adapter);</div><div class='add'>+	E1000_WRITE_REG(&amp;adapter-&gt;hw, WUS, ~0);</div><div class='add'>+</div><div class='add'>+	return PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * e1000_io_resume - called when traffic can start flowing again.</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ *</div><div class='add'>+ * This callback is called when the error recovery driver tells us that</div><div class='add'>+ * its OK to resume normal operation. Implementation resembles the</div><div class='add'>+ * second-half of the e1000_resume routine.</div><div class='add'>+ */</div><div class='add'>+static void e1000_io_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct e1000_adapter *adapter = netdev-&gt;priv;</div><div class='add'>+	uint32_t manc, swsm;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		if (e1000_up(adapter)) {</div><div class='add'>+			printk("e1000: can't bring device back up after reset\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_attach(netdev);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.mac_type &gt;= e1000_82540 &amp;&amp;</div><div class='add'>+	    adapter-&gt;hw.media_type == e1000_media_type_copper) {</div><div class='add'>+		manc = E1000_READ_REG(&amp;adapter-&gt;hw, MANC);</div><div class='add'>+		manc &amp;= ~(E1000_MANC_ARP_EN);</div><div class='add'>+		E1000_WRITE_REG(&amp;adapter-&gt;hw, MANC, manc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;hw.mac_type) {</div><div class='add'>+	case e1000_82573:</div><div class='add'>+		swsm = E1000_READ_REG(&amp;adapter-&gt;hw, SWSM);</div><div class='add'>+		E1000_WRITE_REG(&amp;adapter-&gt;hw, SWSM,</div><div class='add'>+				swsm | E1000_SWSM_DRV_LOAD);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* e1000_main.c */</div><div class='head'>diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h<br/>index 9790db974dc1..2d3e8b06cab0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_osdep.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_osdep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_osdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000_osdep.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='hunk'>@@ -126,4 +127,17 @@ typedef enum {</div><div class='ctx'> </div><div class='ctx'> #define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS)</div><div class='ctx'> </div><div class='add'>+#define E1000_WRITE_ICH8_REG(a, reg, value) ( \</div><div class='add'>+    writel((value), ((a)-&gt;flash_address + reg)))</div><div class='add'>+</div><div class='add'>+#define E1000_READ_ICH8_REG(a, reg) ( \</div><div class='add'>+    readl((a)-&gt;flash_address + reg))</div><div class='add'>+</div><div class='add'>+#define E1000_WRITE_ICH8_REG16(a, reg, value) ( \</div><div class='add'>+    writew((value), ((a)-&gt;flash_address + reg)))</div><div class='add'>+</div><div class='add'>+#define E1000_READ_ICH8_REG16(a, reg) ( \</div><div class='add'>+    readw((a)-&gt;flash_address + reg))</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif /* _E1000_OSDEP_H_ */</div><div class='head'>diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c<br/>index e0a4d37d1b85..0ef413172c68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_param.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/e1000/e1000_param.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/e1000/e1000_param.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/e1000/e1000_param.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'>   </div><div class='ctx'>   Contact Information:</div><div class='ctx'>   Linux NICS &lt;linux.nics@intel.com&gt;</div><div class='add'>+  e1000-devel Mailing List &lt;e1000-devel@lists.sourceforge.net&gt;</div><div class='ctx'>   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497</div><div class='ctx'> </div><div class='ctx'> *******************************************************************************/</div><div class='hunk'>@@ -44,6 +45,16 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }</div><div class='add'>+/* Module Parameters are always initialized to -1, so that the driver</div><div class='add'>+ * can tell the difference between no user specified value or the</div><div class='add'>+ * user asking for the default value.</div><div class='add'>+ * The true default values are loaded in when e1000_check_options is called.</div><div class='add'>+ *</div><div class='add'>+ * This is a GCC extension to ANSI C.</div><div class='add'>+ * See the item "Labeled Elements in Initializers" in the section</div><div class='add'>+ * "Extensions to the C Language Family" of the GCC documentation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #define E1000_PARAM(X, desc) \</div><div class='ctx'> 	static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \</div><div class='ctx'> 	static int num_##X = 0; \</div><div class='hunk'>@@ -182,6 +193,24 @@ E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");</div><div class='ctx'> </div><div class='ctx'> E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");</div><div class='ctx'> </div><div class='add'>+/* Enable Smart Power Down of the PHY</div><div class='add'>+ *</div><div class='add'>+ * Valid Range: 0, 1</div><div class='add'>+ *</div><div class='add'>+ * Default Value: 0 (disabled)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+E1000_PARAM(SmartPowerDownEnable, "Enable PHY smart power down");</div><div class='add'>+</div><div class='add'>+/* Enable Kumeran Lock Loss workaround</div><div class='add'>+ *</div><div class='add'>+ * Valid Range: 0, 1</div><div class='add'>+ *</div><div class='add'>+ * Default Value: 1 (enabled)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+E1000_PARAM(KumeranLockLoss, "Enable Kumeran lock loss workaround");</div><div class='add'>+</div><div class='ctx'> #define AUTONEG_ADV_DEFAULT  0x2F</div><div class='ctx'> #define AUTONEG_ADV_MASK     0x2F</div><div class='ctx'> #define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL</div><div class='hunk'>@@ -295,6 +324,7 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		DPRINTK(PROBE, NOTICE,</div><div class='ctx'> 		       "Warning: no configuration for board #%i\n", bd);</div><div class='ctx'> 		DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");</div><div class='add'>+		bd = E1000_MAX_NIC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	{ /* Transmit Descriptor Count */</div><div class='hunk'>@@ -312,14 +342,9 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		opt.arg.r.max = mac_type &lt; e1000_82544 ?</div><div class='ctx'> 			E1000_MAX_TXD : E1000_MAX_82544_TXD;</div><div class='ctx'> </div><div class='del'>-		if (num_TxDescriptors &gt; bd) {</div><div class='del'>-			tx_ring-&gt;count = TxDescriptors[bd];</div><div class='del'>-			e1000_validate_option(&amp;tx_ring-&gt;count, &amp;opt, adapter);</div><div class='del'>-			E1000_ROUNDUP(tx_ring-&gt;count,</div><div class='del'>-						REQ_TX_DESCRIPTOR_MULTIPLE);</div><div class='del'>-		} else {</div><div class='del'>-			tx_ring-&gt;count = opt.def;</div><div class='del'>-		}</div><div class='add'>+		tx_ring-&gt;count = TxDescriptors[bd];</div><div class='add'>+		e1000_validate_option(&amp;tx_ring-&gt;count, &amp;opt, adapter);</div><div class='add'>+		E1000_ROUNDUP(tx_ring-&gt;count, REQ_TX_DESCRIPTOR_MULTIPLE);</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++)</div><div class='ctx'> 			tx_ring[i].count = tx_ring-&gt;count;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -338,14 +363,9 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 		opt.arg.r.max = mac_type &lt; e1000_82544 ? E1000_MAX_RXD :</div><div class='ctx'> 			E1000_MAX_82544_RXD;</div><div class='ctx'> </div><div class='del'>-		if (num_RxDescriptors &gt; bd) {</div><div class='del'>-			rx_ring-&gt;count = RxDescriptors[bd];</div><div class='del'>-			e1000_validate_option(&amp;rx_ring-&gt;count, &amp;opt, adapter);</div><div class='del'>-			E1000_ROUNDUP(rx_ring-&gt;count,</div><div class='del'>-						REQ_RX_DESCRIPTOR_MULTIPLE);</div><div class='del'>-		} else {</div><div class='del'>-			rx_ring-&gt;count = opt.def;</div><div class='del'>-		}</div><div class='add'>+		rx_ring-&gt;count = RxDescriptors[bd];</div><div class='add'>+		e1000_validate_option(&amp;rx_ring-&gt;count, &amp;opt, adapter);</div><div class='add'>+		E1000_ROUNDUP(rx_ring-&gt;count, REQ_RX_DESCRIPTOR_MULTIPLE);</div><div class='ctx'> 		for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++)</div><div class='ctx'> 			rx_ring[i].count = rx_ring-&gt;count;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -357,13 +377,9 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			.def  = OPTION_ENABLED</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_XsumRX &gt; bd) {</div><div class='del'>-			int rx_csum = XsumRX[bd];</div><div class='del'>-			e1000_validate_option(&amp;rx_csum, &amp;opt, adapter);</div><div class='del'>-			adapter-&gt;rx_csum = rx_csum;</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;rx_csum = opt.def;</div><div class='del'>-		}</div><div class='add'>+		int rx_csum = XsumRX[bd];</div><div class='add'>+		e1000_validate_option(&amp;rx_csum, &amp;opt, adapter);</div><div class='add'>+		adapter-&gt;rx_csum = rx_csum;</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Flow Control */</div><div class='ctx'> </div><div class='hunk'>@@ -383,13 +399,9 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .p = fc_list }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_FlowControl &gt; bd) {</div><div class='del'>-			int fc = FlowControl[bd];</div><div class='del'>-			e1000_validate_option(&amp;fc, &amp;opt, adapter);</div><div class='del'>-			adapter-&gt;hw.fc = adapter-&gt;hw.original_fc = fc;</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;hw.fc = adapter-&gt;hw.original_fc = opt.def;</div><div class='del'>-		}</div><div class='add'>+		int fc = FlowControl[bd];</div><div class='add'>+		e1000_validate_option(&amp;fc, &amp;opt, adapter);</div><div class='add'>+		adapter-&gt;hw.fc = adapter-&gt;hw.original_fc = fc;</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Transmit Interrupt Delay */</div><div class='ctx'> 		struct e1000_option opt = {</div><div class='hunk'>@@ -401,13 +413,8 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .max = MAX_TXDELAY }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_TxIntDelay &gt; bd) {</div><div class='del'>-			adapter-&gt;tx_int_delay = TxIntDelay[bd];</div><div class='del'>-			e1000_validate_option(&amp;adapter-&gt;tx_int_delay, &amp;opt,</div><div class='del'>-								adapter);</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;tx_int_delay = opt.def;</div><div class='del'>-		}</div><div class='add'>+		adapter-&gt;tx_int_delay = TxIntDelay[bd];</div><div class='add'>+		e1000_validate_option(&amp;adapter-&gt;tx_int_delay, &amp;opt, adapter);</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Transmit Absolute Interrupt Delay */</div><div class='ctx'> 		struct e1000_option opt = {</div><div class='hunk'>@@ -419,13 +426,9 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .max = MAX_TXABSDELAY }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_TxAbsIntDelay &gt; bd) {</div><div class='del'>-			adapter-&gt;tx_abs_int_delay = TxAbsIntDelay[bd];</div><div class='del'>-			e1000_validate_option(&amp;adapter-&gt;tx_abs_int_delay, &amp;opt,</div><div class='del'>-								adapter);</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;tx_abs_int_delay = opt.def;</div><div class='del'>-		}</div><div class='add'>+		adapter-&gt;tx_abs_int_delay = TxAbsIntDelay[bd];</div><div class='add'>+		e1000_validate_option(&amp;adapter-&gt;tx_abs_int_delay, &amp;opt,</div><div class='add'>+		                      adapter);</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Receive Interrupt Delay */</div><div class='ctx'> 		struct e1000_option opt = {</div><div class='hunk'>@@ -437,13 +440,8 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .max = MAX_RXDELAY }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_RxIntDelay &gt; bd) {</div><div class='del'>-			adapter-&gt;rx_int_delay = RxIntDelay[bd];</div><div class='del'>-			e1000_validate_option(&amp;adapter-&gt;rx_int_delay, &amp;opt,</div><div class='del'>-								adapter);</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;rx_int_delay = opt.def;</div><div class='del'>-		}</div><div class='add'>+		adapter-&gt;rx_int_delay = RxIntDelay[bd];</div><div class='add'>+		e1000_validate_option(&amp;adapter-&gt;rx_int_delay, &amp;opt, adapter);</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Receive Absolute Interrupt Delay */</div><div class='ctx'> 		struct e1000_option opt = {</div><div class='hunk'>@@ -455,13 +453,9 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .max = MAX_RXABSDELAY }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_RxAbsIntDelay &gt; bd) {</div><div class='del'>-			adapter-&gt;rx_abs_int_delay = RxAbsIntDelay[bd];</div><div class='del'>-			e1000_validate_option(&amp;adapter-&gt;rx_abs_int_delay, &amp;opt,</div><div class='del'>-								adapter);</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;rx_abs_int_delay = opt.def;</div><div class='del'>-		}</div><div class='add'>+		adapter-&gt;rx_abs_int_delay = RxAbsIntDelay[bd];</div><div class='add'>+		e1000_validate_option(&amp;adapter-&gt;rx_abs_int_delay, &amp;opt,</div><div class='add'>+		                      adapter);</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Interrupt Throttling Rate */</div><div class='ctx'> 		struct e1000_option opt = {</div><div class='hunk'>@@ -473,26 +467,44 @@ e1000_check_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .max = MAX_ITR }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_InterruptThrottleRate &gt; bd) {</div><div class='del'>-			adapter-&gt;itr = InterruptThrottleRate[bd];</div><div class='del'>-			switch (adapter-&gt;itr) {</div><div class='del'>-			case 0:</div><div class='del'>-				DPRINTK(PROBE, INFO, "%s turned off\n",</div><div class='del'>-					opt.name);</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",</div><div class='del'>-					opt.name);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				e1000_validate_option(&amp;adapter-&gt;itr, &amp;opt,</div><div class='del'>-					adapter);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			adapter-&gt;itr = opt.def;</div><div class='add'>+		adapter-&gt;itr = InterruptThrottleRate[bd];</div><div class='add'>+		switch (adapter-&gt;itr) {</div><div class='add'>+		case 0:</div><div class='add'>+			DPRINTK(PROBE, INFO, "%s turned off\n", opt.name);</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",</div><div class='add'>+				opt.name);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			e1000_validate_option(&amp;adapter-&gt;itr, &amp;opt, adapter);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	{ /* Smart Power Down */</div><div class='add'>+		struct e1000_option opt = {</div><div class='add'>+			.type = enable_option,</div><div class='add'>+			.name = "PHY Smart Power Down",</div><div class='add'>+			.err  = "defaulting to Disabled",</div><div class='add'>+			.def  = OPTION_DISABLED</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		int spd = SmartPowerDownEnable[bd];</div><div class='add'>+		e1000_validate_option(&amp;spd, &amp;opt, adapter);</div><div class='add'>+		adapter-&gt;smart_power_down = spd;</div><div class='add'>+	}</div><div class='add'>+	{ /* Kumeran Lock Loss Workaround */</div><div class='add'>+		struct e1000_option opt = {</div><div class='add'>+			.type = enable_option,</div><div class='add'>+			.name = "Kumeran Lock Loss Workaround",</div><div class='add'>+			.err  = "defaulting to Enabled",</div><div class='add'>+			.def  = OPTION_ENABLED</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+			int kmrn_lock_loss = KumeranLockLoss[bd];</div><div class='add'>+			e1000_validate_option(&amp;kmrn_lock_loss, &amp;opt, adapter);</div><div class='add'>+			adapter-&gt;hw.kmrn_lock_loss_workaround_disabled = !kmrn_lock_loss;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	switch (adapter-&gt;hw.media_type) {</div><div class='ctx'> 	case e1000_media_type_fiber:</div><div class='hunk'>@@ -518,17 +530,18 @@ static void __devinit</div><div class='ctx'> e1000_check_fiber_options(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int bd = adapter-&gt;bd_number;</div><div class='del'>-	if (num_Speed &gt; bd) {</div><div class='add'>+	bd = bd &gt; E1000_MAX_NIC ? E1000_MAX_NIC : bd;</div><div class='add'>+	if ((Speed[bd] != OPTION_UNSET)) {</div><div class='ctx'> 		DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "</div><div class='ctx'> 		       "parameter ignored\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (num_Duplex &gt; bd) {</div><div class='add'>+	if ((Duplex[bd] != OPTION_UNSET)) {</div><div class='ctx'> 		DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "</div><div class='ctx'> 		       "parameter ignored\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((num_AutoNeg &gt; bd) &amp;&amp; (AutoNeg[bd] != 0x20)) {</div><div class='add'>+	if ((AutoNeg[bd] != OPTION_UNSET) &amp;&amp; (AutoNeg[bd] != 0x20)) {</div><div class='ctx'> 		DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "</div><div class='ctx'> 				 "not valid for fiber adapters, "</div><div class='ctx'> 				 "parameter ignored\n");</div><div class='hunk'>@@ -547,6 +560,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int speed, dplx, an;</div><div class='ctx'> 	int bd = adapter-&gt;bd_number;</div><div class='add'>+	bd = bd &gt; E1000_MAX_NIC ? E1000_MAX_NIC : bd;</div><div class='ctx'> </div><div class='ctx'> 	{ /* Speed */</div><div class='ctx'> 		struct e1000_opt_list speed_list[] = {{          0, "" },</div><div class='hunk'>@@ -563,12 +577,8 @@ e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .p = speed_list }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_Speed &gt; bd) {</div><div class='del'>-			speed = Speed[bd];</div><div class='del'>-			e1000_validate_option(&amp;speed, &amp;opt, adapter);</div><div class='del'>-		} else {</div><div class='del'>-			speed = opt.def;</div><div class='del'>-		}</div><div class='add'>+		speed = Speed[bd];</div><div class='add'>+		e1000_validate_option(&amp;speed, &amp;opt, adapter);</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Duplex */</div><div class='ctx'> 		struct e1000_opt_list dplx_list[] = {{           0, "" },</div><div class='hunk'>@@ -590,15 +600,11 @@ e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> 			        "Speed/Duplex/AutoNeg parameter ignored.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		if (num_Duplex &gt; bd) {</div><div class='del'>-			dplx = Duplex[bd];</div><div class='del'>-			e1000_validate_option(&amp;dplx, &amp;opt, adapter);</div><div class='del'>-		} else {</div><div class='del'>-			dplx = opt.def;</div><div class='del'>-		}</div><div class='add'>+		dplx = Duplex[bd];</div><div class='add'>+		e1000_validate_option(&amp;dplx, &amp;opt, adapter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((num_AutoNeg &gt; bd) &amp;&amp; (speed != 0 || dplx != 0)) {</div><div class='add'>+	if (AutoNeg[bd] != OPTION_UNSET &amp;&amp; (speed != 0 || dplx != 0)) {</div><div class='ctx'> 		DPRINTK(PROBE, INFO,</div><div class='ctx'> 		       "AutoNeg specified along with Speed or Duplex, "</div><div class='ctx'> 		       "parameter ignored\n");</div><div class='hunk'>@@ -647,19 +653,15 @@ e1000_check_copper_options(struct e1000_adapter *adapter)</div><div class='ctx'> 					 .p = an_list }}</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if (num_AutoNeg &gt; bd) {</div><div class='del'>-			an = AutoNeg[bd];</div><div class='del'>-			e1000_validate_option(&amp;an, &amp;opt, adapter);</div><div class='del'>-		} else {</div><div class='del'>-			an = opt.def;</div><div class='del'>-		}</div><div class='add'>+		an = AutoNeg[bd];</div><div class='add'>+		e1000_validate_option(&amp;an, &amp;opt, adapter);</div><div class='ctx'> 		adapter-&gt;hw.autoneg_advertised = an;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (speed + dplx) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		adapter-&gt;hw.autoneg = adapter-&gt;fc_autoneg = 1;</div><div class='del'>-		if ((num_Speed &gt; bd) &amp;&amp; (speed != 0 || dplx != 0))</div><div class='add'>+		if (Speed[bd] != OPTION_UNSET || Duplex[bd] != OPTION_UNSET)</div><div class='ctx'> 			DPRINTK(PROBE, INFO,</div><div class='ctx'> 			       "Speed and duplex autonegotiation enabled\n");</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c<br/>index a806dfe54d23..20d31430c74f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/eepro.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eepro.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/eepro.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/eepro.c</a></div><div class='hunk'>@@ -920,7 +920,7 @@ static int	eepro_grab_irq(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		eepro_sw2bank0(ioaddr); /* Switch back to Bank 0 */</div><div class='ctx'> </div><div class='del'>-		if (request_irq (*irqp, NULL, SA_SHIRQ, "bogus", dev) != EBUSY) {</div><div class='add'>+		if (request_irq (*irqp, NULL, IRQF_SHARED, "bogus", dev) != EBUSY) {</div><div class='ctx'> 			unsigned long irq_mask;</div><div class='ctx'> 			/* Twinkle the interrupt, and check if it's seen */</div><div class='ctx'> 			irq_mask = probe_irq_on();</div><div class='hunk'>@@ -1154,8 +1154,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		printk(KERN_DEBUG  "%s: entering eepro_send_packet routine.\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c<br/>index 467fc861360d..e445988c92ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/eepro100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eepro100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/eepro100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/eepro100.c</a></div><div class='hunk'>@@ -87,7 +87,6 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};</div><div class='ctx'> /* Size of an pre-allocated Rx buffer: &lt;Ethernet MTU&gt; + slack.*/</div><div class='ctx'> #define PKT_BUF_SZ		1536</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -278,11 +277,6 @@ having to sign an Intel NDA when I'm helping Intel sell their own product!</div><div class='ctx'> </div><div class='ctx'> static int speedo_found1(struct pci_dev *pdev, void __iomem *ioaddr, int fnd_cnt, int acpi_idle_state);</div><div class='ctx'> </div><div class='del'>-enum pci_flags_bit {</div><div class='del'>-	PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,</div><div class='del'>-	PCI_ADDR0=0x10&lt;&lt;0, PCI_ADDR1=0x10&lt;&lt;1, PCI_ADDR2=0x10&lt;&lt;2, PCI_ADDR3=0x10&lt;&lt;3,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Offsets to the various registers.</div><div class='ctx'>    All accesses need not be longword aligned. */</div><div class='ctx'> enum speedo_offsets {</div><div class='hunk'>@@ -561,12 +555,12 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(pci_resource_start(pdev, 1),</div><div class='ctx'> 			pci_resource_len(pdev, 1), "eepro100")) {</div><div class='del'>-		printk (KERN_ERR "eepro100: cannot reserve I/O ports\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "eepro100: cannot reserve I/O ports\n");</div><div class='ctx'> 		goto err_out_none;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!request_mem_region(pci_resource_start(pdev, 0),</div><div class='ctx'> 			pci_resource_len(pdev, 0), "eepro100")) {</div><div class='del'>-		printk (KERN_ERR "eepro100: cannot reserve MMIO region\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "eepro100: cannot reserve MMIO region\n");</div><div class='ctx'> 		goto err_out_free_pio_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -579,7 +573,7 @@ static int __devinit eepro100_init_one (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	ioaddr = pci_iomap(pdev, pci_bar, 0);</div><div class='ctx'> 	if (!ioaddr) {</div><div class='del'>-		printk (KERN_ERR "eepro100: cannot remap IO\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "eepro100: cannot remap IO\n");</div><div class='ctx'> 		goto err_out_free_mmio_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -983,7 +977,7 @@ speedo_open(struct net_device *dev)</div><div class='ctx'> 	sp-&gt;in_interrupt = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* .. we can safely take handler calls during init. */</div><div class='del'>-	retval = request_irq(dev-&gt;irq, &amp;speedo_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	retval = request_irq(dev-&gt;irq, &amp;speedo_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c<br/>index 82bd356e4f3a..33291bcf6d4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/eexpress.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eexpress.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/eexpress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/eexpress.c</a></div><div class='hunk'>@@ -97,7 +97,6 @@</div><div class='ctx'> #define LOCKUP16 0</div><div class='ctx'> #endif</div><div class='ctx'>   </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -677,8 +676,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (buf-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		buf = skb_padto(buf, ETH_ZLEN);</div><div class='del'>-		if (buf == NULL)</div><div class='add'>+		if (skb_padto(buf, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c<br/>index 2f7b86837fe8..a67650ccf084 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/epic100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/epic100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/epic100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/epic100.c</a></div><div class='hunk'>@@ -19,62 +19,15 @@</div><div class='ctx'> </div><div class='ctx'> 	Information and updates available at</div><div class='ctx'> 	http://www.scyld.com/network/epic100.html</div><div class='add'>+	[this link no longer provides anything useful -jgarzik]</div><div class='ctx'> </div><div class='ctx'> 	---------------------------------------------------------------------</div><div class='del'>-	</div><div class='del'>-	Linux kernel-specific changes:</div><div class='del'>-	</div><div class='del'>-	LK1.1.2 (jgarzik):</div><div class='del'>-	* Merge becker version 1.09 (4/08/2000)</div><div class='del'>-</div><div class='del'>-	LK1.1.3:</div><div class='del'>-	* Major bugfix to 1.09 driver (Francis Romieu)</div><div class='del'>-	</div><div class='del'>-	LK1.1.4 (jgarzik):</div><div class='del'>-	* Merge becker test version 1.09 (5/29/2000)</div><div class='del'>-</div><div class='del'>-	LK1.1.5:</div><div class='del'>-	* Fix locking (jgarzik)</div><div class='del'>-	* Limit 83c175 probe to ethernet-class PCI devices (rgooch)</div><div class='del'>-</div><div class='del'>-	LK1.1.6:</div><div class='del'>-	* Merge becker version 1.11</div><div class='del'>-	* Move pci_enable_device before any PCI BAR len checks</div><div class='del'>-</div><div class='del'>-	LK1.1.7:</div><div class='del'>-	* { fill me in }</div><div class='del'>-</div><div class='del'>-	LK1.1.8:</div><div class='del'>-	* ethtool driver info support (jgarzik)</div><div class='del'>-</div><div class='del'>-	LK1.1.9:</div><div class='del'>-	* ethtool media get/set support (jgarzik)</div><div class='del'>-</div><div class='del'>-	LK1.1.10:</div><div class='del'>-	* revert MII transceiver init change (jgarzik)</div><div class='del'>-</div><div class='del'>-	LK1.1.11:</div><div class='del'>-	* implement ETHTOOL_[GS]SET, _NWAY_RST, _[GS]MSGLVL, _GLINK (jgarzik)</div><div class='del'>-	* replace some MII-related magic numbers with constants</div><div class='del'>-</div><div class='del'>-	LK1.1.12:</div><div class='del'>-	* fix power-up sequence</div><div class='del'>-</div><div class='del'>-	LK1.1.13:</div><div class='del'>-	* revert version 1.1.12, power-up sequence "fix"</div><div class='del'>-</div><div class='del'>-	LK1.1.14 (Kryzsztof Halasa):</div><div class='del'>-	* fix spurious bad initializations</div><div class='del'>-	* pound phy a la SMSC's app note on the subject</div><div class='del'>-	</div><div class='del'>-	AC1.1.14ac</div><div class='del'>-	* fix power up/down for ethtool that broke in 1.11</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME        "epic100"</div><div class='del'>-#define DRV_VERSION     "1.11+LK1.1.14+AC1.1.14"</div><div class='del'>-#define DRV_RELDATE     "June 2, 2004"</div><div class='add'>+#define DRV_VERSION     "2.0"</div><div class='add'>+#define DRV_RELDATE     "June 27, 2006"</div><div class='ctx'> </div><div class='ctx'> /* The user-configurable values.</div><div class='ctx'>    These may be modified when a driver module is loaded.*/</div><div class='hunk'>@@ -114,7 +67,6 @@ static int rx_copybreak;</div><div class='ctx'> #define TX_FIFO_THRESH 256</div><div class='ctx'> #define RX_FIFO_THRESH 1		/* 0-3, 0==32, 64,96, or 3==128 bytes  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -191,23 +143,10 @@ IVc. Errata</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-enum pci_id_flags_bits {</div><div class='del'>-        /* Set PCI command register bits before calling probe1(). */</div><div class='del'>-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,</div><div class='del'>-        /* Read and map the single following PCI BAR. */</div><div class='del'>-        PCI_ADDR0=0&lt;&lt;4, PCI_ADDR1=1&lt;&lt;4, PCI_ADDR2=2&lt;&lt;4, PCI_ADDR3=3&lt;&lt;4,</div><div class='del'>-        PCI_ADDR_64BITS=0x100, PCI_NO_ACPI_WAKE=0x200, PCI_NO_MIN_LATENCY=0x400,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum chip_capability_flags { MII_PWRDWN=1, TYPE2_INTR=2, NO_MII=4 };</div><div class='ctx'> </div><div class='ctx'> #define EPIC_TOTAL_SIZE 0x100</div><div class='ctx'> #define USE_IO_OPS 1</div><div class='del'>-#ifdef USE_IO_OPS</div><div class='del'>-#define EPIC_IOTYPE PCI_USES_MASTER|PCI_USES_IO|PCI_ADDR0</div><div class='del'>-#else</div><div class='del'>-#define EPIC_IOTYPE PCI_USES_MASTER|PCI_USES_MEM|PCI_ADDR1</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> typedef enum {</div><div class='ctx'> 	SMSC_83C170_0,</div><div class='hunk'>@@ -218,20 +157,15 @@ typedef enum {</div><div class='ctx'> </div><div class='ctx'> struct epic_chip_info {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	enum pci_id_flags_bits pci_flags;</div><div class='del'>-        int io_size;                            /* Needed for I/O region check or ioremap(). */</div><div class='ctx'>         int drv_flags;                          /* Driver use, intended as capability flags. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* indexed by chip_t */</div><div class='ctx'> static const struct epic_chip_info pci_id_tbl[] = {</div><div class='del'>-	{ "SMSC EPIC/100 83c170",</div><div class='del'>-	 EPIC_IOTYPE, EPIC_TOTAL_SIZE, TYPE2_INTR | NO_MII | MII_PWRDWN },</div><div class='del'>-	{ "SMSC EPIC/100 83c170",</div><div class='del'>-	 EPIC_IOTYPE, EPIC_TOTAL_SIZE, TYPE2_INTR },</div><div class='del'>-	{ "SMSC EPIC/C 83c175",</div><div class='del'>-	 EPIC_IOTYPE, EPIC_TOTAL_SIZE, TYPE2_INTR | MII_PWRDWN },</div><div class='add'>+	{ "SMSC EPIC/100 83c170",	TYPE2_INTR | NO_MII | MII_PWRDWN },</div><div class='add'>+	{ "SMSC EPIC/100 83c170",	TYPE2_INTR },</div><div class='add'>+	{ "SMSC EPIC/C 83c175",		TYPE2_INTR | MII_PWRDWN },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -244,7 +178,7 @@ static struct pci_device_id epic_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE (pci, epic_pci_tbl);</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> #ifndef USE_IO_OPS</div><div class='ctx'> #undef inb</div><div class='ctx'> #undef inw</div><div class='hunk'>@@ -370,7 +304,7 @@ static int epic_close(struct net_device *dev);</div><div class='ctx'> static struct net_device_stats *epic_get_stats(struct net_device *dev);</div><div class='ctx'> static void set_rx_mode(struct net_device *dev);</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 				    const struct pci_device_id *ent)</div><div class='hunk'>@@ -392,20 +326,20 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		printk (KERN_INFO "%s" KERN_INFO "%s" KERN_INFO "%s",</div><div class='ctx'> 			version, version2, version3);</div><div class='ctx'> #endif</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	card_idx++;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ret = pci_enable_device(pdev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	if (pci_resource_len(pdev, 0) &lt; pci_id_tbl[chip_idx].io_size) {</div><div class='del'>-		printk (KERN_ERR "card %d: no PCI region space\n", card_idx);</div><div class='add'>+	if (pci_resource_len(pdev, 0) &lt; EPIC_TOTAL_SIZE) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no PCI region space\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err_out_disable;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_request_regions(pdev, DRV_NAME);</div><div class='hunk'>@@ -416,7 +350,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof (*ep));</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk (KERN_ERR "card %d: no memory for eth device\n", card_idx);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no memory for eth device\n");</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='hunk'>@@ -428,7 +362,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	ioaddr = pci_resource_start (pdev, 1);</div><div class='ctx'> 	ioaddr = (long) ioremap (ioaddr, pci_resource_len (pdev, 1));</div><div class='ctx'> 	if (!ioaddr) {</div><div class='del'>-		printk (KERN_ERR DRV_NAME " %d: ioremap failed\n", card_idx);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ioremap failed\n");</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -488,8 +422,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		((u16 *)dev-&gt;dev_addr)[i] = le16_to_cpu(inw(ioaddr + LAN0 + i*4));</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt; 2) {</div><div class='del'>-		printk(KERN_DEBUG DRV_NAME "(%s): EEPROM contents\n",</div><div class='del'>-		       pci_name(pdev));</div><div class='add'>+		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "EEPROM contents:\n");</div><div class='ctx'> 		for (i = 0; i &lt; 64; i++)</div><div class='ctx'> 			printk(" %4.4x%s", read_eeprom(ioaddr, i),</div><div class='ctx'> 				   i % 16 == 15 ? "\n" : "");</div><div class='hunk'>@@ -498,7 +431,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	ep-&gt;pci_dev = pdev;</div><div class='ctx'> 	ep-&gt;chip_id = chip_idx;</div><div class='ctx'> 	ep-&gt;chip_flags = pci_id_tbl[chip_idx].drv_flags;</div><div class='del'>-	ep-&gt;irq_mask = </div><div class='add'>+	ep-&gt;irq_mask =</div><div class='ctx'> 		(ep-&gt;chip_flags &amp; TYPE2_INTR ?  PCIBusErr175 : PCIBusErr170)</div><div class='ctx'> 		 | CntFull | TxUnderrun | EpicNapiEvent;</div><div class='ctx'> </div><div class='hunk'>@@ -511,21 +444,23 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 			int mii_status = mdio_read(dev, phy, MII_BMSR);</div><div class='ctx'> 			if (mii_status != 0xffff  &amp;&amp;  mii_status != 0x0000) {</div><div class='ctx'> 				ep-&gt;phys[phy_idx++] = phy;</div><div class='del'>-				printk(KERN_INFO DRV_NAME "(%s): MII transceiver #%d control "</div><div class='del'>-					   "%4.4x status %4.4x.\n",</div><div class='del'>-					   pci_name(pdev), phy, mdio_read(dev, phy, 0), mii_status);</div><div class='add'>+				dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+					"MII transceiver #%d control "</div><div class='add'>+					"%4.4x status %4.4x.\n",</div><div class='add'>+					phy, mdio_read(dev, phy, 0), mii_status);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		ep-&gt;mii_phy_cnt = phy_idx;</div><div class='ctx'> 		if (phy_idx != 0) {</div><div class='ctx'> 			phy = ep-&gt;phys[0];</div><div class='ctx'> 			ep-&gt;mii.advertising = mdio_read(dev, phy, MII_ADVERTISE);</div><div class='del'>-			printk(KERN_INFO DRV_NAME "(%s): Autonegotiation advertising %4.4x link "</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+				"Autonegotiation advertising %4.4x link "</div><div class='ctx'> 				   "partner %4.4x.\n",</div><div class='del'>-				   pci_name(pdev), ep-&gt;mii.advertising, mdio_read(dev, phy, 5));</div><div class='add'>+				   ep-&gt;mii.advertising, mdio_read(dev, phy, 5));</div><div class='ctx'> 		} else if ( ! (ep-&gt;chip_flags &amp; NO_MII)) {</div><div class='del'>-			printk(KERN_WARNING DRV_NAME "(%s): ***WARNING***: No MII transceiver found!\n",</div><div class='del'>-			       pci_name(pdev));</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+				"***WARNING***: No MII transceiver found!\n");</div><div class='ctx'> 			/* Use the known PHY address of the EPII. */</div><div class='ctx'> 			ep-&gt;phys[0] = 3;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -540,8 +475,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	/* The lower four bits are the media type. */</div><div class='ctx'> 	if (duplex) {</div><div class='ctx'> 		ep-&gt;mii.force_media = ep-&gt;mii.full_duplex = 1;</div><div class='del'>-		printk(KERN_INFO DRV_NAME "(%s):  Forced full duplex operation requested.\n",</div><div class='del'>-		       pci_name(pdev));</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Forced full duplex requested.\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;if_port = ep-&gt;default_port = option;</div><div class='ctx'> </div><div class='hunk'>@@ -587,7 +521,7 @@ err_out_disable:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	goto out;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> /* Serial EEPROM section. */</div><div class='ctx'> </div><div class='ctx'> /*  EEPROM_Ctrl bits. */</div><div class='hunk'>@@ -709,7 +643,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)</div><div class='ctx'> </div><div class='ctx'> 	outw(value, ioaddr + MIIData);</div><div class='ctx'> 	outl((phy_id &lt;&lt; 9) | (loc &lt;&lt; 4) | MII_WRITEOP, ioaddr + MIICtrl);</div><div class='del'>-	for (i = 10000; i &gt; 0; i--) { </div><div class='add'>+	for (i = 10000; i &gt; 0; i--) {</div><div class='ctx'> 		barrier();</div><div class='ctx'> 		if ((inl(ioaddr + MIICtrl) &amp; MII_WRITEOP) == 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -717,7 +651,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> static int epic_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct epic_private *ep = dev-&gt;priv;</div><div class='hunk'>@@ -728,7 +662,7 @@ static int epic_open(struct net_device *dev)</div><div class='ctx'> 	/* Soft reset the chip. */</div><div class='ctx'> 	outl(0x4001, ioaddr + GENCTL);</div><div class='ctx'> </div><div class='del'>-	if ((retval = request_irq(dev-&gt;irq, &amp;epic_interrupt, SA_SHIRQ, dev-&gt;name, dev)))</div><div class='add'>+	if ((retval = request_irq(dev-&gt;irq, &amp;epic_interrupt, IRQF_SHARED, dev-&gt;name, dev)))</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	epic_init_ring(dev);</div><div class='hunk'>@@ -760,7 +694,7 @@ static int epic_open(struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	udelay(20); /* Looks like EPII needs that if you want reliable RX init. FIXME: pci posting bug? */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 		outl(cpu_to_le16(((u16*)dev-&gt;dev_addr)[i]), ioaddr + LAN0 + i*4);</div><div class='ctx'> </div><div class='hunk'>@@ -803,7 +737,7 @@ static int epic_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupts by setting the interrupt mask. */</div><div class='ctx'> 	outl((ep-&gt;chip_flags &amp; TYPE2_INTR ? PCIBusErr175 : PCIBusErr170)</div><div class='del'>-		 | CntFull | TxUnderrun </div><div class='add'>+		 | CntFull | TxUnderrun</div><div class='ctx'> 		 | RxError | RxHeader | EpicNapiEvent, ioaddr + INTMASK);</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt; 1)</div><div class='hunk'>@@ -831,7 +765,7 @@ static void epic_pause(struct net_device *dev)</div><div class='ctx'> 	struct epic_private *ep = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue (dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Disable interrupts by clearing the interrupt mask. */</div><div class='ctx'> 	outl(0x00000000, ioaddr + INTMASK);</div><div class='ctx'> 	/* Stop the chip's Tx and Rx DMA processes. */</div><div class='hunk'>@@ -987,7 +921,7 @@ static void epic_init_ring(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='ctx'> 		ep-&gt;rx_ring[i].rxstatus = 0;</div><div class='ctx'> 		ep-&gt;rx_ring[i].buflength = cpu_to_le32(ep-&gt;rx_buf_sz);</div><div class='del'>-		ep-&gt;rx_ring[i].next = ep-&gt;rx_ring_dma + </div><div class='add'>+		ep-&gt;rx_ring[i].next = ep-&gt;rx_ring_dma +</div><div class='ctx'> 				      (i+1)*sizeof(struct epic_rx_desc);</div><div class='ctx'> 		ep-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1002,7 +936,7 @@ static void epic_init_ring(struct net_device *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		skb-&gt;dev = dev;			/* Mark as being used by this device. */</div><div class='ctx'> 		skb_reserve(skb, 2);	/* 16 byte align the IP header. */</div><div class='del'>-		ep-&gt;rx_ring[i].bufaddr = pci_map_single(ep-&gt;pci_dev, </div><div class='add'>+		ep-&gt;rx_ring[i].bufaddr = pci_map_single(ep-&gt;pci_dev,</div><div class='ctx'> 			skb-&gt;data, ep-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		ep-&gt;rx_ring[i].rxstatus = cpu_to_le32(DescOwn);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1013,7 +947,7 @@ static void epic_init_ring(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; TX_RING_SIZE; i++) {</div><div class='ctx'> 		ep-&gt;tx_skbuff[i] = NULL;</div><div class='ctx'> 		ep-&gt;tx_ring[i].txstatus = 0x0000;</div><div class='del'>-		ep-&gt;tx_ring[i].next = ep-&gt;tx_ring_dma + </div><div class='add'>+		ep-&gt;tx_ring[i].next = ep-&gt;tx_ring_dma +</div><div class='ctx'> 			(i+1)*sizeof(struct epic_tx_desc);</div><div class='ctx'> 	}</div><div class='ctx'> 	ep-&gt;tx_ring[i-1].next = ep-&gt;tx_ring_dma;</div><div class='hunk'>@@ -1026,12 +960,9 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int entry, free_count;</div><div class='ctx'> 	u32 ctrl_word;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (skb_padto(skb, ETH_ZLEN))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Caution: the write order is important here, set the field with the</div><div class='ctx'> 	   "ownership" bit last. */</div><div class='hunk'>@@ -1042,7 +973,7 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	entry = ep-&gt;cur_tx % TX_RING_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	ep-&gt;tx_skbuff[entry] = skb;</div><div class='del'>-	ep-&gt;tx_ring[entry].bufaddr = pci_map_single(ep-&gt;pci_dev, skb-&gt;data, </div><div class='add'>+	ep-&gt;tx_ring[entry].bufaddr = pci_map_single(ep-&gt;pci_dev, skb-&gt;data,</div><div class='ctx'> 		 			            skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='ctx'> 	if (free_count &lt; TX_QUEUE_LEN/2) {/* Typical path */</div><div class='ctx'> 		ctrl_word = cpu_to_le32(0x100000); /* No interrupt */</div><div class='hunk'>@@ -1126,7 +1057,7 @@ static void epic_tx(struct net_device *dev, struct epic_private *ep)</div><div class='ctx'> </div><div class='ctx'> 		/* Free the original skb. */</div><div class='ctx'> 		skb = ep-&gt;tx_skbuff[entry];</div><div class='del'>-		pci_unmap_single(ep-&gt;pci_dev, ep-&gt;tx_ring[entry].bufaddr, </div><div class='add'>+		pci_unmap_single(ep-&gt;pci_dev, ep-&gt;tx_ring[entry].bufaddr,</div><div class='ctx'> 				 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='ctx'> 		dev_kfree_skb_irq(skb);</div><div class='ctx'> 		ep-&gt;tx_skbuff[entry] = NULL;</div><div class='hunk'>@@ -1281,8 +1212,8 @@ static int epic_rx(struct net_device *dev, int budget)</div><div class='ctx'> 							       ep-&gt;rx_buf_sz,</div><div class='ctx'> 							       PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			} else {</div><div class='del'>-				pci_unmap_single(ep-&gt;pci_dev, </div><div class='del'>-					ep-&gt;rx_ring[entry].bufaddr, </div><div class='add'>+				pci_unmap_single(ep-&gt;pci_dev,</div><div class='add'>+					ep-&gt;rx_ring[entry].bufaddr,</div><div class='ctx'> 					ep-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 				skb_put(skb = ep-&gt;rx_skbuff[entry], pkt_len);</div><div class='ctx'> 				ep-&gt;rx_skbuff[entry] = NULL;</div><div class='hunk'>@@ -1307,7 +1238,7 @@ static int epic_rx(struct net_device *dev, int budget)</div><div class='ctx'> 				break;</div><div class='ctx'> 			skb-&gt;dev = dev;			/* Mark as being used by this device. */</div><div class='ctx'> 			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */</div><div class='del'>-			ep-&gt;rx_ring[entry].bufaddr = pci_map_single(ep-&gt;pci_dev, </div><div class='add'>+			ep-&gt;rx_ring[entry].bufaddr = pci_map_single(ep-&gt;pci_dev,</div><div class='ctx'> 				skb-&gt;data, ep-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			work_done++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1403,7 +1334,7 @@ static int epic_close(struct net_device *dev)</div><div class='ctx'> 		ep-&gt;rx_ring[i].rxstatus = 0;		/* Not owned by Epic chip. */</div><div class='ctx'> 		ep-&gt;rx_ring[i].buflength = 0;</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			pci_unmap_single(ep-&gt;pci_dev, ep-&gt;rx_ring[i].bufaddr, </div><div class='add'>+			pci_unmap_single(ep-&gt;pci_dev, ep-&gt;rx_ring[i].bufaddr,</div><div class='ctx'> 				 	 ep-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1414,7 +1345,7 @@ static int epic_close(struct net_device *dev)</div><div class='ctx'> 		ep-&gt;tx_skbuff[i] = NULL;</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			continue;</div><div class='del'>-		pci_unmap_single(ep-&gt;pci_dev, ep-&gt;tx_ring[i].bufaddr, </div><div class='add'>+		pci_unmap_single(ep-&gt;pci_dev, ep-&gt;tx_ring[i].bufaddr,</div><div class='ctx'> 				 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1607,7 +1538,7 @@ static void __devexit epic_remove_one (struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct epic_private *ep = dev-&gt;priv;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	pci_free_consistent(pdev, TX_TOTAL_SIZE, ep-&gt;tx_ring, ep-&gt;tx_ring_dma);</div><div class='ctx'> 	pci_free_consistent(pdev, RX_TOTAL_SIZE, ep-&gt;rx_ring, ep-&gt;rx_ring_dma);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='head'>diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c<br/>index b67545be2caa..4bf76f86d8e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/eth16i.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/eth16i.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/eth16i.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/eth16i.c</a></div><div class='hunk'>@@ -1064,8 +1064,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c<br/>index a8449265e5fd..97d34fee8c1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fealnx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fealnx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fealnx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fealnx.c</a></div><div class='hunk'>@@ -124,16 +124,8 @@ MODULE_PARM_DESC(multicast_filter_limit, "fealnx maximum number of filtered mult</div><div class='ctx'> MODULE_PARM_DESC(options, "fealnx: Bits 0-3: media type, bit 17: full duplex");</div><div class='ctx'> MODULE_PARM_DESC(full_duplex, "fealnx full duplex setting(s) (1)");</div><div class='ctx'> </div><div class='del'>-#define MIN_REGION_SIZE 136</div><div class='del'>-</div><div class='del'>-enum pci_flags_bit {</div><div class='del'>-	PCI_USES_IO = 1,</div><div class='del'>-	PCI_USES_MEM = 2,</div><div class='del'>-	PCI_USES_MASTER = 4,</div><div class='del'>-	PCI_ADDR0 = 0x10 &lt;&lt; 0,</div><div class='del'>-	PCI_ADDR1 = 0x10 &lt;&lt; 1,</div><div class='del'>-	PCI_ADDR2 = 0x10 &lt;&lt; 2,</div><div class='del'>-	PCI_ADDR3 = 0x10 &lt;&lt; 3,</div><div class='add'>+enum {</div><div class='add'>+	MIN_REGION_SIZE		= 136,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* A chip capabilities table, matching the entries in pci_tbl[] above. */</div><div class='hunk'>@@ -156,14 +148,13 @@ enum phy_type_flags {</div><div class='ctx'> </div><div class='ctx'> struct chip_info {</div><div class='ctx'> 	char *chip_name;</div><div class='del'>-	int io_size;</div><div class='ctx'> 	int flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct chip_info skel_netdrv_tbl[] = {</div><div class='del'>-	{"100/10M Ethernet PCI Adapter", 136, HAS_MII_XCVR},</div><div class='del'>-	{"100/10M Ethernet PCI Adapter", 136, HAS_CHIP_XCVR},</div><div class='del'>-	{"1000/100/10M Ethernet PCI Adapter", 136, HAS_MII_XCVR},</div><div class='add'>+static const struct chip_info skel_netdrv_tbl[] __devinitdata = {</div><div class='add'>+ 	{ "100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },</div><div class='add'>+	{ "100/10M Ethernet PCI Adapter",	HAS_CHIP_XCVR },</div><div class='add'>+	{ "1000/100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Offsets to the Command and Status Registers. */</div><div class='hunk'>@@ -514,13 +505,14 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	</div><div class='ctx'> 	len = pci_resource_len(pdev, bar);</div><div class='ctx'> 	if (len &lt; MIN_REGION_SIZE) {</div><div class='del'>-		printk(KERN_ERR "%s: region size %ld too small, aborting\n",</div><div class='del'>-		       boardname, len);</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			   "region size %ld too small, aborting\n", len);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = pci_request_regions(pdev, boardname);</div><div class='del'>-	if (i) return i;</div><div class='add'>+	if (i)</div><div class='add'>+		return i;</div><div class='ctx'> 	</div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='hunk'>@@ -586,9 +578,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 			if (mii_status != 0xffff &amp;&amp; mii_status != 0x0000) {</div><div class='ctx'> 				np-&gt;phys[phy_idx++] = phy;</div><div class='del'>-				printk(KERN_INFO</div><div class='del'>-				       "%s: MII PHY found at address %d, status "</div><div class='del'>-				       "0x%4.4x.\n", dev-&gt;name, phy, mii_status);</div><div class='add'>+				dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+				       "MII PHY found at address %d, status "</div><div class='add'>+				       "0x%4.4x.\n", phy, mii_status);</div><div class='ctx'> 				/* get phy type */</div><div class='ctx'> 				{</div><div class='ctx'> 					unsigned int data;</div><div class='hunk'>@@ -611,10 +603,10 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;mii_cnt = phy_idx;</div><div class='del'>-		if (phy_idx == 0) {</div><div class='del'>-			printk(KERN_WARNING "%s: MII PHY not found -- this device may "</div><div class='del'>-			       "not operate correctly.\n", dev-&gt;name);</div><div class='del'>-		}</div><div class='add'>+		if (phy_idx == 0)</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+				"MII PHY not found -- this device may "</div><div class='add'>+			       "not operate correctly.\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		np-&gt;phys[0] = 32;</div><div class='ctx'> /* 89/6/23 add, (begin) */</div><div class='hunk'>@@ -640,7 +632,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		np-&gt;mii.full_duplex = full_duplex[card_idx];</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;mii.full_duplex) {</div><div class='del'>-		printk(KERN_INFO "%s: Media type forced to Full Duplex.\n", dev-&gt;name);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Media type forced to Full Duplex.\n");</div><div class='ctx'> /* 89/6/13 add, (begin) */</div><div class='ctx'> //      if (np-&gt;PHYType==MarvellPHY)</div><div class='ctx'> 		if ((np-&gt;PHYType == MarvellPHY) || (np-&gt;PHYType == LevelOnePHY)) {</div><div class='hunk'>@@ -844,7 +836,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(0x00000001, ioaddr + BCR);	/* Reset */</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, &amp;intr_handler, SA_SHIRQ, dev-&gt;name, dev))</div><div class='add'>+	if (request_irq(dev-&gt;irq, &amp;intr_handler, IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='head'>diff --git a/drivers/net/fec.c b/drivers/net/fec.c<br/>index bd6983d1afba..9b4030031744 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fec.c</a></div><div class='hunk'>@@ -22,10 +22,9 @@</div><div class='ctx'>  * Copyright (c) 2001-2005 Greg Ungerer (gerg@snapgear.com)</div><div class='ctx'>  *</div><div class='ctx'>  * Bug fixes and cleanup by Philippe De Muyter (phdm@macqel.be)</div><div class='del'>- * Copyright (c) 2004-2005 Macq Electronique SA.</div><div class='add'>+ * Copyright (c) 2004-2006 Macq Electronique SA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -51,7 +50,7 @@</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \</div><div class='ctx'>     defined(CONFIG_M5272) || defined(CONFIG_M528x) || \</div><div class='del'>-    defined(CONFIG_M520x)</div><div class='add'>+    defined(CONFIG_M520x) || defined(CONFIG_M532x)</div><div class='ctx'> #include &lt;asm/coldfire.h&gt;</div><div class='ctx'> #include &lt;asm/mcfsim.h&gt;</div><div class='ctx'> #include "fec.h"</div><div class='hunk'>@@ -80,6 +79,8 @@ static unsigned int fec_hw[] = {</div><div class='ctx'> 	(MCF_MBAR + 0x1000),</div><div class='ctx'> #elif defined(CONFIG_M520x)</div><div class='ctx'> 	(MCF_MBAR+0x30000),</div><div class='add'>+#elif defined(CONFIG_M532x)</div><div class='add'>+	(MCF_MBAR+0xfc030000),</div><div class='ctx'> #else</div><div class='ctx'> 	&amp;(((immap_t *)IMAP_ADDR)-&gt;im_cpm.cp_fec),</div><div class='ctx'> #endif</div><div class='hunk'>@@ -143,7 +144,7 @@ typedef struct {</div><div class='ctx'> #define TX_RING_MOD_MASK	15	/*   for this to work */</div><div class='ctx'> </div><div class='ctx'> #if (((RX_RING_SIZE + TX_RING_SIZE) * 8) &gt; PAGE_SIZE)</div><div class='del'>-#error "FEC: descriptor ring size contants too large"</div><div class='add'>+#error "FEC: descriptor ring size constants too large"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Interrupt events/masks.</div><div class='hunk'>@@ -167,12 +168,12 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * The 5270/5271/5280/5282 RX control register also contains maximum frame</div><div class='add'>+ * The 5270/5271/5280/5282/532x RX control register also contains maximum frame</div><div class='ctx'>  * size bits. Other FEC hardware does not, so we need to take that into</div><div class='ctx'>  * account when setting it.</div><div class='ctx'>  */</div><div class='ctx'> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \</div><div class='del'>-    defined(CONFIG_M520x)</div><div class='add'>+    defined(CONFIG_M520x) || defined(CONFIG_M532x)</div><div class='ctx'> #define	OPT_FRAME_SIZE	(PKT_MAXBUF_SIZE &lt;&lt; 16)</div><div class='ctx'> #else</div><div class='ctx'> #define	OPT_FRAME_SIZE	0</div><div class='hunk'>@@ -308,6 +309,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct fec_enet_private *fep;</div><div class='ctx'> 	volatile fec_t	*fecp;</div><div class='ctx'> 	volatile cbd_t	*bdp;</div><div class='add'>+	unsigned short	status;</div><div class='ctx'> </div><div class='ctx'> 	fep = netdev_priv(dev);</div><div class='ctx'> 	fecp = (volatile fec_t*)dev-&gt;base_addr;</div><div class='hunk'>@@ -320,8 +322,9 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Fill in a Tx ring entry */</div><div class='ctx'> 	bdp = fep-&gt;cur_tx;</div><div class='ctx'> </div><div class='add'>+	status = bdp-&gt;cbd_sc;</div><div class='ctx'> #ifndef final_version</div><div class='del'>-	if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_READY) {</div><div class='add'>+	if (status &amp; BD_ENET_TX_READY) {</div><div class='ctx'> 		/* Ooops.  All transmit buffers are full.  Bail out.</div><div class='ctx'> 		 * This should not happen, since dev-&gt;tbusy should be set.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -332,7 +335,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Clear all of the status flags.</div><div class='ctx'> 	 */</div><div class='del'>-	bdp-&gt;cbd_sc &amp;= ~BD_ENET_TX_STATS;</div><div class='add'>+	status &amp;= ~BD_ENET_TX_STATS;</div><div class='ctx'> </div><div class='ctx'> 	/* Set buffer length and buffer pointer.</div><div class='ctx'> 	*/</div><div class='hunk'>@@ -366,21 +369,22 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;fep-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	/* Send it on its way.  Tell FEC its ready, interrupt when done,</div><div class='del'>-	 * its the last BD of the frame, and to put the CRC on the end.</div><div class='add'>+	/* Send it on its way.  Tell FEC it's ready, interrupt when done,</div><div class='add'>+	 * it's the last BD of the frame, and to put the CRC on the end.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	bdp-&gt;cbd_sc |= (BD_ENET_TX_READY | BD_ENET_TX_INTR</div><div class='add'>+	status |= (BD_ENET_TX_READY | BD_ENET_TX_INTR</div><div class='ctx'> 			| BD_ENET_TX_LAST | BD_ENET_TX_TC);</div><div class='add'>+	bdp-&gt;cbd_sc = status;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger transmission start */</div><div class='del'>-	fecp-&gt;fec_x_des_active = 0x01000000;</div><div class='add'>+	fecp-&gt;fec_x_des_active = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If this was the last BD in the ring, start at the beginning again.</div><div class='ctx'> 	*/</div><div class='del'>-	if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_WRAP) {</div><div class='add'>+	if (status &amp; BD_ENET_TX_WRAP) {</div><div class='ctx'> 		bdp = fep-&gt;tx_bd_base;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bdp++;</div><div class='hunk'>@@ -491,43 +495,44 @@ fec_enet_tx(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct	fec_enet_private *fep;</div><div class='ctx'> 	volatile cbd_t	*bdp;</div><div class='add'>+	unsigned short status;</div><div class='ctx'> 	struct	sk_buff	*skb;</div><div class='ctx'> </div><div class='ctx'> 	fep = netdev_priv(dev);</div><div class='ctx'> 	spin_lock(&amp;fep-&gt;lock);</div><div class='ctx'> 	bdp = fep-&gt;dirty_tx;</div><div class='ctx'> </div><div class='del'>-	while ((bdp-&gt;cbd_sc&amp;BD_ENET_TX_READY) == 0) {</div><div class='add'>+	while (((status = bdp-&gt;cbd_sc) &amp; BD_ENET_TX_READY) == 0) {</div><div class='ctx'> 		if (bdp == fep-&gt;cur_tx &amp;&amp; fep-&gt;tx_full == 0) break;</div><div class='ctx'> </div><div class='ctx'> 		skb = fep-&gt;tx_skbuff[fep-&gt;skb_dirty];</div><div class='ctx'> 		/* Check for errors. */</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; (BD_ENET_TX_HB | BD_ENET_TX_LC |</div><div class='add'>+		if (status &amp; (BD_ENET_TX_HB | BD_ENET_TX_LC |</div><div class='ctx'> 				   BD_ENET_TX_RL | BD_ENET_TX_UN |</div><div class='ctx'> 				   BD_ENET_TX_CSL)) {</div><div class='ctx'> 			fep-&gt;stats.tx_errors++;</div><div class='del'>-			if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_HB)  /* No heartbeat */</div><div class='add'>+			if (status &amp; BD_ENET_TX_HB)  /* No heartbeat */</div><div class='ctx'> 				fep-&gt;stats.tx_heartbeat_errors++;</div><div class='del'>-			if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_LC)  /* Late collision */</div><div class='add'>+			if (status &amp; BD_ENET_TX_LC)  /* Late collision */</div><div class='ctx'> 				fep-&gt;stats.tx_window_errors++;</div><div class='del'>-			if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_RL)  /* Retrans limit */</div><div class='add'>+			if (status &amp; BD_ENET_TX_RL)  /* Retrans limit */</div><div class='ctx'> 				fep-&gt;stats.tx_aborted_errors++;</div><div class='del'>-			if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_UN)  /* Underrun */</div><div class='add'>+			if (status &amp; BD_ENET_TX_UN)  /* Underrun */</div><div class='ctx'> 				fep-&gt;stats.tx_fifo_errors++;</div><div class='del'>-			if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_CSL) /* Carrier lost */</div><div class='add'>+			if (status &amp; BD_ENET_TX_CSL) /* Carrier lost */</div><div class='ctx'> 				fep-&gt;stats.tx_carrier_errors++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			fep-&gt;stats.tx_packets++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #ifndef final_version</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_READY)</div><div class='add'>+		if (status &amp; BD_ENET_TX_READY)</div><div class='ctx'> 			printk("HEY! Enet xmit interrupt and TX_READY.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		/* Deferred means some collisions occurred during transmit,</div><div class='ctx'> 		 * but we eventually sent the packet OK.</div><div class='ctx'> 		 */</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_DEF)</div><div class='add'>+		if (status &amp; BD_ENET_TX_DEF)</div><div class='ctx'> 			fep-&gt;stats.collisions++;</div><div class='ctx'> 	    </div><div class='ctx'> 		/* Free the sk buffer associated with this last transmit.</div><div class='hunk'>@@ -538,7 +543,7 @@ fec_enet_tx(struct net_device *dev)</div><div class='ctx'> 	    </div><div class='ctx'> 		/* Update pointer to next buffer descriptor to be transmitted.</div><div class='ctx'> 		 */</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; BD_ENET_TX_WRAP)</div><div class='add'>+		if (status &amp; BD_ENET_TX_WRAP)</div><div class='ctx'> 			bdp = fep-&gt;tx_bd_base;</div><div class='ctx'> 		else</div><div class='ctx'> 			bdp++;</div><div class='hunk'>@@ -568,9 +573,14 @@ fec_enet_rx(struct net_device *dev)</div><div class='ctx'> 	struct	fec_enet_private *fep;</div><div class='ctx'> 	volatile fec_t	*fecp;</div><div class='ctx'> 	volatile cbd_t *bdp;</div><div class='add'>+	unsigned short status;</div><div class='ctx'> 	struct	sk_buff	*skb;</div><div class='ctx'> 	ushort	pkt_len;</div><div class='ctx'> 	__u8 *data;</div><div class='add'>+	</div><div class='add'>+#ifdef CONFIG_M532x</div><div class='add'>+	flush_cache_all();</div><div class='add'>+#endif	</div><div class='ctx'> </div><div class='ctx'> 	fep = netdev_priv(dev);</div><div class='ctx'> 	fecp = (volatile fec_t*)dev-&gt;base_addr;</div><div class='hunk'>@@ -580,13 +590,13 @@ fec_enet_rx(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	bdp = fep-&gt;cur_rx;</div><div class='ctx'> </div><div class='del'>-while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) {</div><div class='add'>+while (!((status = bdp-&gt;cbd_sc) &amp; BD_ENET_RX_EMPTY)) {</div><div class='ctx'> </div><div class='ctx'> #ifndef final_version</div><div class='ctx'> 	/* Since we have allocated space to hold a complete frame,</div><div class='ctx'> 	 * the last indicator should be set.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((bdp-&gt;cbd_sc &amp; BD_ENET_RX_LAST) == 0)</div><div class='add'>+	if ((status &amp; BD_ENET_RX_LAST) == 0)</div><div class='ctx'> 		printk("FEC ENET: rcv is not +last\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -594,26 +604,26 @@ while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) {</div><div class='ctx'> 		goto rx_processing_done;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for errors. */</div><div class='del'>-	if (bdp-&gt;cbd_sc &amp; (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |</div><div class='add'>+	if (status &amp; (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |</div><div class='ctx'> 			   BD_ENET_RX_CR | BD_ENET_RX_OV)) {</div><div class='ctx'> 		fep-&gt;stats.rx_errors++;       </div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; (BD_ENET_RX_LG | BD_ENET_RX_SH)) {</div><div class='add'>+		if (status &amp; (BD_ENET_RX_LG | BD_ENET_RX_SH)) {</div><div class='ctx'> 		/* Frame too long or too short. */</div><div class='ctx'> 			fep-&gt;stats.rx_length_errors++;</div><div class='ctx'> 		}</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; BD_ENET_RX_NO)	/* Frame alignment */</div><div class='add'>+		if (status &amp; BD_ENET_RX_NO)	/* Frame alignment */</div><div class='ctx'> 			fep-&gt;stats.rx_frame_errors++;</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; BD_ENET_RX_CR)	/* CRC Error */</div><div class='del'>-			fep-&gt;stats.rx_crc_errors++;</div><div class='del'>-		if (bdp-&gt;cbd_sc &amp; BD_ENET_RX_OV)	/* FIFO overrun */</div><div class='add'>+		if (status &amp; BD_ENET_RX_CR)	/* CRC Error */</div><div class='ctx'> 			fep-&gt;stats.rx_crc_errors++;</div><div class='add'>+		if (status &amp; BD_ENET_RX_OV)	/* FIFO overrun */</div><div class='add'>+			fep-&gt;stats.rx_fifo_errors++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Report late collisions as a frame error.</div><div class='ctx'> 	 * On this error, the BD is closed, but we don't know what we</div><div class='ctx'> 	 * have in the buffer.  So, just drop this frame on the floor.</div><div class='ctx'> 	 */</div><div class='del'>-	if (bdp-&gt;cbd_sc &amp; BD_ENET_RX_CL) {</div><div class='add'>+	if (status &amp; BD_ENET_RX_CL) {</div><div class='ctx'> 		fep-&gt;stats.rx_errors++;</div><div class='ctx'> 		fep-&gt;stats.rx_frame_errors++;</div><div class='ctx'> 		goto rx_processing_done;</div><div class='hunk'>@@ -639,9 +649,7 @@ while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) {</div><div class='ctx'> 	} else {</div><div class='ctx'> 		skb-&gt;dev = dev;</div><div class='ctx'> 		skb_put(skb,pkt_len-4);	/* Make room */</div><div class='del'>-		eth_copy_and_sum(skb,</div><div class='del'>-				 (unsigned char *)__va(bdp-&gt;cbd_bufaddr),</div><div class='del'>-				 pkt_len-4, 0);</div><div class='add'>+		eth_copy_and_sum(skb, data, pkt_len-4, 0);</div><div class='ctx'> 		skb-&gt;protocol=eth_type_trans(skb,dev);</div><div class='ctx'> 		netif_rx(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -649,15 +657,16 @@ while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) {</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the status flags for this buffer.</div><div class='ctx'> 	*/</div><div class='del'>-	bdp-&gt;cbd_sc &amp;= ~BD_ENET_RX_STATS;</div><div class='add'>+	status &amp;= ~BD_ENET_RX_STATS;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the buffer empty.</div><div class='ctx'> 	*/</div><div class='del'>-	bdp-&gt;cbd_sc |= BD_ENET_RX_EMPTY;</div><div class='add'>+	status |= BD_ENET_RX_EMPTY;</div><div class='add'>+	bdp-&gt;cbd_sc = status;</div><div class='ctx'> </div><div class='ctx'> 	/* Update BD pointer to next entry.</div><div class='ctx'> 	*/</div><div class='del'>-	if (bdp-&gt;cbd_sc &amp; BD_ENET_RX_WRAP)</div><div class='add'>+	if (status &amp; BD_ENET_RX_WRAP)</div><div class='ctx'> 		bdp = fep-&gt;rx_bd_base;</div><div class='ctx'> 	else</div><div class='ctx'> 		bdp++;</div><div class='hunk'>@@ -667,9 +676,9 @@ while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) {</div><div class='ctx'> 	 * incoming frames.  On a heavily loaded network, we should be</div><div class='ctx'> 	 * able to keep up at the expense of system resources.</div><div class='ctx'> 	 */</div><div class='del'>-	fecp-&gt;fec_r_des_active = 0x01000000;</div><div class='add'>+	fecp-&gt;fec_r_des_active = 0;</div><div class='ctx'> #endif</div><div class='del'>-   } /* while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) */</div><div class='add'>+   } /* while (!((status = bdp-&gt;cbd_sc) &amp; BD_ENET_RX_EMPTY)) */</div><div class='ctx'> 	fep-&gt;cur_rx = (cbd_t *)bdp;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -680,11 +689,12 @@ while (!(bdp-&gt;cbd_sc &amp; BD_ENET_RX_EMPTY)) {</div><div class='ctx'> 	 * our way back to the interrupt return only to come right back</div><div class='ctx'> 	 * here.</div><div class='ctx'> 	 */</div><div class='del'>-	fecp-&gt;fec_r_des_active = 0x01000000;</div><div class='add'>+	fecp-&gt;fec_r_des_active = 0;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* called from interrupt context */</div><div class='ctx'> static void</div><div class='ctx'> fec_enet_mii(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -696,10 +706,12 @@ fec_enet_mii(struct net_device *dev)</div><div class='ctx'> 	fep = netdev_priv(dev);</div><div class='ctx'> 	ep = fep-&gt;hwp;</div><div class='ctx'> 	mii_reg = ep-&gt;fec_mii_data;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;fep-&gt;lock);</div><div class='ctx'> 	</div><div class='ctx'> 	if ((mip = mii_head) == NULL) {</div><div class='ctx'> 		printk("MII and no head!\n");</div><div class='del'>-		return;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mip-&gt;mii_func != NULL)</div><div class='hunk'>@@ -711,6 +723,9 @@ fec_enet_mii(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if ((mip = mii_head) != NULL)</div><div class='ctx'> 		ep-&gt;fec_mii_data = mip-&gt;mii_regval;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock(&amp;fep-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -728,8 +743,7 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi</div><div class='ctx'> </div><div class='ctx'> 	retval = 0;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='del'>-	cli();</div><div class='add'>+	spin_lock_irqsave(&amp;fep-&gt;lock,flags);</div><div class='ctx'> </div><div class='ctx'> 	if ((mip = mii_free) != NULL) {</div><div class='ctx'> 		mii_free = mip-&gt;mii_next;</div><div class='hunk'>@@ -749,7 +763,7 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi</div><div class='ctx'> 		retval = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;fep-&gt;lock,flags);</div><div class='ctx'> </div><div class='ctx'> 	return(retval);</div><div class='ctx'> }</div><div class='hunk'>@@ -1216,7 +1230,7 @@ static phy_info_t const * const phy_info[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='add'>+#if !defined(CONFIG_M532x)</div><div class='ctx'> #ifdef CONFIG_RPXCLASSIC</div><div class='ctx'> static void</div><div class='ctx'> mii_link_interrupt(void *dev_id);</div><div class='hunk'>@@ -1224,6 +1238,7 @@ mii_link_interrupt(void *dev_id);</div><div class='ctx'> static irqreturn_t</div><div class='ctx'> mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs);</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_M5272)</div><div class='ctx'> </div><div class='hunk'>@@ -1384,13 +1399,13 @@ static void __inline__ fec_request_intrs(struct net_device *dev)</div><div class='ctx'> 	{</div><div class='ctx'> 		volatile unsigned char  *icrp;</div><div class='ctx'> 		volatile unsigned long  *imrp;</div><div class='del'>-		int i;</div><div class='add'>+		int i, ilip;</div><div class='ctx'> </div><div class='ctx'> 		b = (fep-&gt;index) ? MCFICM_INTC1 : MCFICM_INTC0;</div><div class='ctx'> 		icrp = (volatile unsigned char *) (MCF_IPSBAR + b +</div><div class='ctx'> 			MCFINTC_ICR0);</div><div class='del'>-		for (i = 23; (i &lt; 36); i++)</div><div class='del'>-			icrp[i] = 0x23;</div><div class='add'>+		for (i = 23, ilip = 0x28; (i &lt; 36); i++)</div><div class='add'>+			icrp[i] = ilip--;</div><div class='ctx'> </div><div class='ctx'> 		imrp = (volatile unsigned long *) (MCF_IPSBAR + b +</div><div class='ctx'> 			MCFINTC_IMRH);</div><div class='hunk'>@@ -1618,6 +1633,159 @@ static void __inline__ fec_uncache(unsigned long addr)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+#elif defined(CONFIG_M532x)</div><div class='add'>+/*</div><div class='add'>+ * Code specific for M532x</div><div class='add'>+ */</div><div class='add'>+static void __inline__ fec_request_intrs(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fec_enet_private *fep;</div><div class='add'>+	int b;</div><div class='add'>+	static const struct idesc {</div><div class='add'>+		char *name;</div><div class='add'>+		unsigned short irq;</div><div class='add'>+	} *idp, id[] = {</div><div class='add'>+	    { "fec(TXF)", 36 },</div><div class='add'>+	    { "fec(TXB)", 37 },</div><div class='add'>+	    { "fec(TXFIFO)", 38 },</div><div class='add'>+	    { "fec(TXCR)", 39 },</div><div class='add'>+	    { "fec(RXF)", 40 },</div><div class='add'>+	    { "fec(RXB)", 41 },</div><div class='add'>+	    { "fec(MII)", 42 },</div><div class='add'>+	    { "fec(LC)", 43 },</div><div class='add'>+	    { "fec(HBERR)", 44 },</div><div class='add'>+	    { "fec(GRA)", 45 },</div><div class='add'>+	    { "fec(EBERR)", 46 },</div><div class='add'>+	    { "fec(BABT)", 47 },</div><div class='add'>+	    { "fec(BABR)", 48 },</div><div class='add'>+	    { NULL },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fep = netdev_priv(dev);</div><div class='add'>+	b = (fep-&gt;index) ? 128 : 64;</div><div class='add'>+</div><div class='add'>+	/* Setup interrupt handlers. */</div><div class='add'>+	for (idp = id; idp-&gt;name; idp++) {</div><div class='add'>+		if (request_irq(b+idp-&gt;irq,fec_enet_interrupt,0,idp-&gt;name,dev)!=0)</div><div class='add'>+			printk("FEC: Could not allocate %s IRQ(%d)!\n", </div><div class='add'>+				idp-&gt;name, b+idp-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unmask interrupts */</div><div class='add'>+	MCF_INTC0_ICR36 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR37 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR38 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR39 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR40 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR41 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR42 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR43 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR44 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR45 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR46 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR47 = 0x2;</div><div class='add'>+	MCF_INTC0_ICR48 = 0x2;</div><div class='add'>+</div><div class='add'>+	MCF_INTC0_IMRH &amp;= ~(</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK36 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK37 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK38 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK39 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK40 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK41 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK42 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK43 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK44 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK45 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK46 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK47 |</div><div class='add'>+		MCF_INTC_IMRH_INT_MASK48 );</div><div class='add'>+</div><div class='add'>+	/* Set up gpio outputs for MII lines */</div><div class='add'>+	MCF_GPIO_PAR_FECI2C |= (0 |</div><div class='add'>+		MCF_GPIO_PAR_FECI2C_PAR_MDC_EMDC |</div><div class='add'>+		MCF_GPIO_PAR_FECI2C_PAR_MDIO_EMDIO);</div><div class='add'>+	MCF_GPIO_PAR_FEC = (0 |</div><div class='add'>+		MCF_GPIO_PAR_FEC_PAR_FEC_7W_FEC |</div><div class='add'>+		MCF_GPIO_PAR_FEC_PAR_FEC_MII_FEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)</div><div class='add'>+{</div><div class='add'>+	volatile fec_t *fecp;</div><div class='add'>+</div><div class='add'>+	fecp = fep-&gt;hwp;</div><div class='add'>+	fecp-&gt;fec_r_cntrl = OPT_FRAME_SIZE | 0x04;</div><div class='add'>+	fecp-&gt;fec_x_cntrl = 0x00;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set MII speed to 2.5 MHz</div><div class='add'>+	 */</div><div class='add'>+	fep-&gt;phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2;</div><div class='add'>+	fecp-&gt;fec_mii_speed = fep-&gt;phy_speed;</div><div class='add'>+</div><div class='add'>+	fec_restart(dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __inline__ fec_get_mac(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fec_enet_private *fep = netdev_priv(dev);</div><div class='add'>+	volatile fec_t *fecp;</div><div class='add'>+	unsigned char *iap, tmpaddr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	fecp = fep-&gt;hwp;</div><div class='add'>+</div><div class='add'>+	if (FEC_FLASHMAC) {</div><div class='add'>+		/*</div><div class='add'>+		 * Get MAC address from FLASH.</div><div class='add'>+		 * If it is all 1's or 0's, use the default.</div><div class='add'>+		 */</div><div class='add'>+		iap = FEC_FLASHMAC;</div><div class='add'>+		if ((iap[0] == 0) &amp;&amp; (iap[1] == 0) &amp;&amp; (iap[2] == 0) &amp;&amp;</div><div class='add'>+		    (iap[3] == 0) &amp;&amp; (iap[4] == 0) &amp;&amp; (iap[5] == 0))</div><div class='add'>+			iap = fec_mac_default;</div><div class='add'>+		if ((iap[0] == 0xff) &amp;&amp; (iap[1] == 0xff) &amp;&amp; (iap[2] == 0xff) &amp;&amp;</div><div class='add'>+		    (iap[3] == 0xff) &amp;&amp; (iap[4] == 0xff) &amp;&amp; (iap[5] == 0xff))</div><div class='add'>+			iap = fec_mac_default;</div><div class='add'>+	} else {</div><div class='add'>+		*((unsigned long *) &amp;tmpaddr[0]) = fecp-&gt;fec_addr_low;</div><div class='add'>+		*((unsigned short *) &amp;tmpaddr[4]) = (fecp-&gt;fec_addr_high &gt;&gt; 16);</div><div class='add'>+		iap = &amp;tmpaddr[0];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(dev-&gt;dev_addr, iap, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	/* Adjust MAC if using default MAC address */</div><div class='add'>+	if (iap == fec_mac_default)</div><div class='add'>+		dev-&gt;dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __inline__ fec_enable_phy_intr(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __inline__ fec_disable_phy_intr(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __inline__ fec_phy_ack_intr(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __inline__ fec_localhw_setup(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Do not need to make region uncached on 532x.</div><div class='add'>+ */</div><div class='add'>+static void __inline__ fec_uncache(unsigned long addr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1985,9 +2153,12 @@ fec_enet_open(struct net_device *dev)</div><div class='ctx'> 		mii_do_cmd(dev, fep-&gt;phy-&gt;config);</div><div class='ctx'> 		mii_do_cmd(dev, phy_cmd_config);  /* display configuration */</div><div class='ctx'> </div><div class='del'>-		/* FIXME: use netif_carrier_{on,off} ; this polls</div><div class='del'>-		 * until link is up which is wrong...  could be</div><div class='del'>-		 * 30 seconds or more we are trapped in here. -jgarzik</div><div class='add'>+		/* Poll until the PHY tells us its configuration</div><div class='add'>+		 * (not link state).</div><div class='add'>+		 * Request is initiated by mii_do_cmd above, but answer</div><div class='add'>+		 * comes by interrupt.</div><div class='add'>+		 * This should take about 25 usec per register at 2.5 MHz,</div><div class='add'>+		 * and we read approximately 5 registers.</div><div class='ctx'> 		 */</div><div class='ctx'> 		while(!fep-&gt;sequence_done)</div><div class='ctx'> 			schedule();</div><div class='hunk'>@@ -2253,15 +2424,11 @@ int __init fec_enet_init(struct net_device *dev)</div><div class='ctx'> 	*/</div><div class='ctx'> 	fec_request_intrs(dev);</div><div class='ctx'> </div><div class='del'>-	/* Clear and enable interrupts */</div><div class='del'>-	fecp-&gt;fec_ievent = 0xffc00000;</div><div class='del'>-	fecp-&gt;fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |</div><div class='del'>-		FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);</div><div class='ctx'> 	fecp-&gt;fec_hash_table_high = 0;</div><div class='ctx'> 	fecp-&gt;fec_hash_table_low = 0;</div><div class='ctx'> 	fecp-&gt;fec_r_buff_size = PKT_MAXBLR_SIZE;</div><div class='ctx'> 	fecp-&gt;fec_ecntrl = 2;</div><div class='del'>-	fecp-&gt;fec_r_des_active = 0x01000000;</div><div class='add'>+	fecp-&gt;fec_r_des_active = 0;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long)fecp;</div><div class='ctx'> </div><div class='hunk'>@@ -2281,6 +2448,11 @@ int __init fec_enet_init(struct net_device *dev)</div><div class='ctx'> 	/* setup MII interface */</div><div class='ctx'> 	fec_set_mii(dev, fep);</div><div class='ctx'> </div><div class='add'>+	/* Clear and enable interrupts */</div><div class='add'>+	fecp-&gt;fec_ievent = 0xffc00000;</div><div class='add'>+	fecp-&gt;fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |</div><div class='add'>+		FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);</div><div class='add'>+</div><div class='ctx'> 	/* Queue up command to detect the PHY and initialize the</div><div class='ctx'> 	 * remainder of the interface.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2312,11 +2484,6 @@ fec_restart(struct net_device *dev, int duplex)</div><div class='ctx'> 	fecp-&gt;fec_ecntrl = 1;</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='del'>-	/* Enable interrupts we wish to service.</div><div class='del'>-	*/</div><div class='del'>-	fecp-&gt;fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |</div><div class='del'>-				FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);</div><div class='del'>-</div><div class='ctx'> 	/* Clear any outstanding interrupt.</div><div class='ctx'> 	*/</div><div class='ctx'> 	fecp-&gt;fec_ievent = 0xffc00000;</div><div class='hunk'>@@ -2408,7 +2575,12 @@ fec_restart(struct net_device *dev, int duplex)</div><div class='ctx'> 	/* And last, enable the transmit and receive processing.</div><div class='ctx'> 	*/</div><div class='ctx'> 	fecp-&gt;fec_ecntrl = 2;</div><div class='del'>-	fecp-&gt;fec_r_des_active = 0x01000000;</div><div class='add'>+	fecp-&gt;fec_r_des_active = 0;</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts we wish to service.</div><div class='add'>+	*/</div><div class='add'>+	fecp-&gt;fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB |</div><div class='add'>+		FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2420,9 +2592,16 @@ fec_stop(struct net_device *dev)</div><div class='ctx'> 	fep = netdev_priv(dev);</div><div class='ctx'> 	fecp = fep-&gt;hwp;</div><div class='ctx'> </div><div class='del'>-	fecp-&gt;fec_x_cntrl = 0x01;	/* Graceful transmit stop */</div><div class='del'>-</div><div class='del'>-	while(!(fecp-&gt;fec_ievent &amp; FEC_ENET_GRA));</div><div class='add'>+	/*</div><div class='add'>+	** We cannot expect a graceful transmit stop without link !!!</div><div class='add'>+	*/</div><div class='add'>+	if (fep-&gt;link)</div><div class='add'>+		{</div><div class='add'>+		fecp-&gt;fec_x_cntrl = 0x01;	/* Graceful transmit stop */</div><div class='add'>+		udelay(10);</div><div class='add'>+		if (!(fecp-&gt;fec_ievent &amp; FEC_ENET_GRA))</div><div class='add'>+			printk("fec_stop : Graceful transmit stop did not complete !\n");</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 	/* Whack a reset.  We should wait for this.</div><div class='ctx'> 	*/</div><div class='head'>diff --git a/drivers/net/fec.h b/drivers/net/fec.h<br/>index 965c5c49fcdc..1d421606984f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fec.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fec.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fec.h</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \</div><div class='del'>-    defined(CONFIG_M520x)</div><div class='add'>+    defined(CONFIG_M520x) || defined(CONFIG_M532x)</div><div class='ctx'> /*</div><div class='ctx'>  *	Just figures, Motorola would have to change the offsets for</div><div class='ctx'>  *	registers in the same peripheral device on different models</div><div class='head'>diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c<br/>index 29c275e1d566..790d9dbe42dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fec_8xx/fec_8xx-netta.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec_8xx/fec_8xx-netta.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fec_8xx/fec_8xx-netta.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fec_8xx/fec_8xx-netta.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * FEC instantatiation file for NETTA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c<br/>index 7e4338097139..282b1452c39a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fec_8xx/fec_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec_8xx/fec_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fec_8xx/fec_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fec_8xx/fec_main.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Released under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c<br/>index 3b44ac1a7bfe..d3c16b85d9a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fec_8xx/fec_mii.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fec_8xx/fec_mii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fec_8xx/fec_mii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fec_8xx/fec_mii.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Released under the GPL</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c<br/>index 705e1229d89d..11b8f1b43dd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/forcedeth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/forcedeth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/forcedeth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/forcedeth.c</a></div><div class='hunk'>@@ -107,6 +107,8 @@</div><div class='ctx'>  *	0.52: 20 Jan 2006: Add MSI/MSIX support.</div><div class='ctx'>  *	0.53: 19 Mar 2006: Fix init from low power mode and add hw reset.</div><div class='ctx'>  *	0.54: 21 Mar 2006: Fix spin locks for multi irqs and cleanup.</div><div class='add'>+ *	0.55: 22 Mar 2006: Add flow control (pause frame).</div><div class='add'>+ *	0.56: 22 Mar 2006: Additional ethtool config and moduleparam support.</div><div class='ctx'>  *</div><div class='ctx'>  * Known bugs:</div><div class='ctx'>  * We suspect that on some hardware no TX done interrupts are generated.</div><div class='hunk'>@@ -118,7 +120,7 @@</div><div class='ctx'>  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few</div><div class='ctx'>  * superfluous timer interrupts from the nic.</div><div class='ctx'>  */</div><div class='del'>-#define FORCEDETH_VERSION		"0.54"</div><div class='add'>+#define FORCEDETH_VERSION		"0.56"</div><div class='ctx'> #define DRV_NAME			"forcedeth"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -163,6 +165,9 @@</div><div class='ctx'> #define DEV_HAS_MSI             0x0040  /* device supports MSI */</div><div class='ctx'> #define DEV_HAS_MSI_X           0x0080  /* device supports MSI-X */</div><div class='ctx'> #define DEV_HAS_POWER_CNTRL     0x0100  /* device supports power savings */</div><div class='add'>+#define DEV_HAS_PAUSEFRAME_TX   0x0200  /* device supports tx pause frames */</div><div class='add'>+#define DEV_HAS_STATISTICS      0x0400  /* device supports hw statistics */</div><div class='add'>+#define DEV_HAS_TEST_EXTENDED   0x0800  /* device supports extended diagnostic test */</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	NvRegIrqStatus = 0x000,</div><div class='hunk'>@@ -203,6 +208,7 @@ enum {</div><div class='ctx'> 	NvRegMSIIrqMask = 0x030,</div><div class='ctx'> #define NVREG_MSI_VECTOR_0_ENABLED 0x01</div><div class='ctx'> 	NvRegMisc1 = 0x080,</div><div class='add'>+#define NVREG_MISC1_PAUSE_TX	0x01</div><div class='ctx'> #define NVREG_MISC1_HD		0x02</div><div class='ctx'> #define NVREG_MISC1_FORCE	0x3b0f3c</div><div class='ctx'> </div><div class='hunk'>@@ -214,9 +220,11 @@ enum {</div><div class='ctx'> #define NVREG_XMITSTAT_BUSY	0x01</div><div class='ctx'> </div><div class='ctx'> 	NvRegPacketFilterFlags = 0x8c,</div><div class='del'>-#define NVREG_PFF_ALWAYS	0x7F0008</div><div class='add'>+#define NVREG_PFF_PAUSE_RX	0x08</div><div class='add'>+#define NVREG_PFF_ALWAYS	0x7F0000</div><div class='ctx'> #define NVREG_PFF_PROMISC	0x80</div><div class='ctx'> #define NVREG_PFF_MYADDR	0x20</div><div class='add'>+#define NVREG_PFF_LOOPBACK	0x10</div><div class='ctx'> </div><div class='ctx'> 	NvRegOffloadConfig = 0x90,</div><div class='ctx'> #define NVREG_OFFLOAD_HOMEPHY	0x601</div><div class='hunk'>@@ -232,10 +240,12 @@ enum {</div><div class='ctx'> #define NVREG_RNDSEED_FORCE2	0x2d00</div><div class='ctx'> #define NVREG_RNDSEED_FORCE3	0x7400</div><div class='ctx'> </div><div class='del'>-	NvRegUnknownSetupReg1 = 0xA0,</div><div class='del'>-#define NVREG_UNKSETUP1_VAL	0x16070f</div><div class='del'>-	NvRegUnknownSetupReg2 = 0xA4,</div><div class='del'>-#define NVREG_UNKSETUP2_VAL	0x16</div><div class='add'>+	NvRegTxDeferral = 0xA0,</div><div class='add'>+#define NVREG_TX_DEFERRAL_DEFAULT	0x15050f</div><div class='add'>+#define NVREG_TX_DEFERRAL_RGMII_10_100	0x16070f</div><div class='add'>+#define NVREG_TX_DEFERRAL_RGMII_1000	0x14050f</div><div class='add'>+	NvRegRxDeferral = 0xA4,</div><div class='add'>+#define NVREG_RX_DEFERRAL_DEFAULT	0x16</div><div class='ctx'> 	NvRegMacAddrA = 0xA8,</div><div class='ctx'> 	NvRegMacAddrB = 0xAC,</div><div class='ctx'> 	NvRegMulticastAddrA = 0xB0,</div><div class='hunk'>@@ -261,8 +271,10 @@ enum {</div><div class='ctx'> #define NVREG_LINKSPEED_MASK	(0xFFF)</div><div class='ctx'> 	NvRegUnknownSetupReg5 = 0x130,</div><div class='ctx'> #define NVREG_UNKSETUP5_BIT31	(1&lt;&lt;31)</div><div class='del'>-	NvRegUnknownSetupReg3 = 0x13c,</div><div class='del'>-#define NVREG_UNKSETUP3_VAL1	0x200010</div><div class='add'>+	NvRegTxWatermark = 0x13c,</div><div class='add'>+#define NVREG_TX_WM_DESC1_DEFAULT	0x0200010</div><div class='add'>+#define NVREG_TX_WM_DESC2_3_DEFAULT	0x1e08000</div><div class='add'>+#define NVREG_TX_WM_DESC2_3_1000	0xfe08000</div><div class='ctx'> 	NvRegTxRxControl = 0x144,</div><div class='ctx'> #define NVREG_TXRXCTL_KICK	0x0001</div><div class='ctx'> #define NVREG_TXRXCTL_BIT1	0x0002</div><div class='hunk'>@@ -277,6 +289,9 @@ enum {</div><div class='ctx'> #define NVREG_TXRXCTL_VLANINS	0x00080</div><div class='ctx'> 	NvRegTxRingPhysAddrHigh = 0x148,</div><div class='ctx'> 	NvRegRxRingPhysAddrHigh = 0x14C,</div><div class='add'>+	NvRegTxPauseFrame = 0x170,</div><div class='add'>+#define NVREG_TX_PAUSEFRAME_DISABLE	0x1ff0080</div><div class='add'>+#define NVREG_TX_PAUSEFRAME_ENABLE	0x0c00030</div><div class='ctx'> 	NvRegMIIStatus = 0x180,</div><div class='ctx'> #define NVREG_MIISTAT_ERROR		0x0001</div><div class='ctx'> #define NVREG_MIISTAT_LINKCHANGE	0x0008</div><div class='hunk'>@@ -326,6 +341,33 @@ enum {</div><div class='ctx'> #define NVREG_POWERSTATE_D1		0x0001</div><div class='ctx'> #define NVREG_POWERSTATE_D2		0x0002</div><div class='ctx'> #define NVREG_POWERSTATE_D3		0x0003</div><div class='add'>+	NvRegTxCnt = 0x280,</div><div class='add'>+	NvRegTxZeroReXmt = 0x284,</div><div class='add'>+	NvRegTxOneReXmt = 0x288,</div><div class='add'>+	NvRegTxManyReXmt = 0x28c,</div><div class='add'>+	NvRegTxLateCol = 0x290,</div><div class='add'>+	NvRegTxUnderflow = 0x294,</div><div class='add'>+	NvRegTxLossCarrier = 0x298,</div><div class='add'>+	NvRegTxExcessDef = 0x29c,</div><div class='add'>+	NvRegTxRetryErr = 0x2a0,</div><div class='add'>+	NvRegRxFrameErr = 0x2a4,</div><div class='add'>+	NvRegRxExtraByte = 0x2a8,</div><div class='add'>+	NvRegRxLateCol = 0x2ac,</div><div class='add'>+	NvRegRxRunt = 0x2b0,</div><div class='add'>+	NvRegRxFrameTooLong = 0x2b4,</div><div class='add'>+	NvRegRxOverflow = 0x2b8,</div><div class='add'>+	NvRegRxFCSErr = 0x2bc,</div><div class='add'>+	NvRegRxFrameAlignErr = 0x2c0,</div><div class='add'>+	NvRegRxLenErr = 0x2c4,</div><div class='add'>+	NvRegRxUnicast = 0x2c8,</div><div class='add'>+	NvRegRxMulticast = 0x2cc,</div><div class='add'>+	NvRegRxBroadcast = 0x2d0,</div><div class='add'>+	NvRegTxDef = 0x2d4,</div><div class='add'>+	NvRegTxFrame = 0x2d8,</div><div class='add'>+	NvRegRxCnt = 0x2dc,</div><div class='add'>+	NvRegTxPause = 0x2e0,</div><div class='add'>+	NvRegRxPause = 0x2e4,</div><div class='add'>+	NvRegRxDropFrame = 0x2e8,</div><div class='ctx'> 	NvRegVlanControl = 0x300,</div><div class='ctx'> #define NVREG_VLANCONTROL_ENABLE	0x2000</div><div class='ctx'> 	NvRegMSIXMap0 = 0x3e0,</div><div class='hunk'>@@ -449,16 +491,18 @@ typedef union _ring_type {</div><div class='ctx'> /* General driver defaults */</div><div class='ctx'> #define NV_WATCHDOG_TIMEO	(5*HZ)</div><div class='ctx'> </div><div class='del'>-#define RX_RING		128</div><div class='del'>-#define TX_RING		256</div><div class='del'>-/* </div><div class='del'>- * If your nic mysteriously hangs then try to reduce the limits</div><div class='del'>- * to 1/0: It might be required to set NV_TX_LASTPACKET in the</div><div class='del'>- * last valid ring entry. But this would be impossible to</div><div class='del'>- * implement - probably a disassembly error.</div><div class='add'>+#define RX_RING_DEFAULT		128</div><div class='add'>+#define TX_RING_DEFAULT		256</div><div class='add'>+#define RX_RING_MIN		128</div><div class='add'>+#define TX_RING_MIN		64</div><div class='add'>+#define RING_MAX_DESC_VER_1	1024</div><div class='add'>+#define RING_MAX_DESC_VER_2_3	16384</div><div class='add'>+/*</div><div class='add'>+ * Difference between the get and put pointers for the tx ring.</div><div class='add'>+ * This is used to throttle the amount of data outstanding in the</div><div class='add'>+ * tx ring.</div><div class='ctx'>  */</div><div class='del'>-#define TX_LIMIT_STOP	255</div><div class='del'>-#define TX_LIMIT_START	254</div><div class='add'>+#define TX_LIMIT_DIFFERENCE	1</div><div class='ctx'> </div><div class='ctx'> /* rx/tx mac addr + type + vlan + align + slack*/</div><div class='ctx'> #define NV_RX_HEADERS		(64)</div><div class='hunk'>@@ -472,8 +516,9 @@ typedef union _ring_type {</div><div class='ctx'> #define OOM_REFILL	(1+HZ/20)</div><div class='ctx'> #define POLL_WAIT	(1+HZ/100)</div><div class='ctx'> #define LINK_TIMEOUT	(3*HZ)</div><div class='add'>+#define STATS_INTERVAL	(10*HZ)</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * desc_ver values:</div><div class='ctx'>  * The nic supports three different descriptor types:</div><div class='ctx'>  * - DESC_VER_1: Original</div><div class='hunk'>@@ -506,13 +551,13 @@ typedef union _ring_type {</div><div class='ctx'> #define PHY_1000	0x2</div><div class='ctx'> #define PHY_HALF	0x100</div><div class='ctx'> </div><div class='del'>-/* FIXME: MII defines that should be added to &lt;linux/mii.h&gt; */</div><div class='del'>-#define MII_1000BT_CR	0x09</div><div class='del'>-#define MII_1000BT_SR	0x0a</div><div class='del'>-#define ADVERTISE_1000FULL	0x0200</div><div class='del'>-#define ADVERTISE_1000HALF	0x0100</div><div class='del'>-#define LPA_1000FULL	0x0800</div><div class='del'>-#define LPA_1000HALF	0x0400</div><div class='add'>+#define NV_PAUSEFRAME_RX_CAPABLE 0x0001</div><div class='add'>+#define NV_PAUSEFRAME_TX_CAPABLE 0x0002</div><div class='add'>+#define NV_PAUSEFRAME_RX_ENABLE  0x0004</div><div class='add'>+#define NV_PAUSEFRAME_TX_ENABLE  0x0008</div><div class='add'>+#define NV_PAUSEFRAME_RX_REQ     0x0010</div><div class='add'>+#define NV_PAUSEFRAME_TX_REQ     0x0020</div><div class='add'>+#define NV_PAUSEFRAME_AUTONEG    0x0040</div><div class='ctx'> </div><div class='ctx'> /* MSI/MSI-X defines */</div><div class='ctx'> #define NV_MSI_X_MAX_VECTORS  8</div><div class='hunk'>@@ -527,15 +572,110 @@ typedef union _ring_type {</div><div class='ctx'> #define NV_MSI_X_VECTOR_TX    0x1</div><div class='ctx'> #define NV_MSI_X_VECTOR_OTHER 0x2</div><div class='ctx'> </div><div class='add'>+/* statistics */</div><div class='add'>+struct nv_ethtool_str {</div><div class='add'>+	char name[ETH_GSTRING_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nv_ethtool_str nv_estats_str[] = {</div><div class='add'>+	{ "tx_bytes" },</div><div class='add'>+	{ "tx_zero_rexmt" },</div><div class='add'>+	{ "tx_one_rexmt" },</div><div class='add'>+	{ "tx_many_rexmt" },</div><div class='add'>+	{ "tx_late_collision" },</div><div class='add'>+	{ "tx_fifo_errors" },</div><div class='add'>+	{ "tx_carrier_errors" },</div><div class='add'>+	{ "tx_excess_deferral" },</div><div class='add'>+	{ "tx_retry_error" },</div><div class='add'>+	{ "tx_deferral" },</div><div class='add'>+	{ "tx_packets" },</div><div class='add'>+	{ "tx_pause" },</div><div class='add'>+	{ "rx_frame_error" },</div><div class='add'>+	{ "rx_extra_byte" },</div><div class='add'>+	{ "rx_late_collision" },</div><div class='add'>+	{ "rx_runt" },</div><div class='add'>+	{ "rx_frame_too_long" },</div><div class='add'>+	{ "rx_over_errors" },</div><div class='add'>+	{ "rx_crc_errors" },</div><div class='add'>+	{ "rx_frame_align_error" },</div><div class='add'>+	{ "rx_length_error" },</div><div class='add'>+	{ "rx_unicast" },</div><div class='add'>+	{ "rx_multicast" },</div><div class='add'>+	{ "rx_broadcast" },</div><div class='add'>+	{ "rx_bytes" },</div><div class='add'>+	{ "rx_pause" },</div><div class='add'>+	{ "rx_drop_frame" },</div><div class='add'>+	{ "rx_packets" },</div><div class='add'>+	{ "rx_errors_total" }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nv_ethtool_stats {</div><div class='add'>+	u64 tx_bytes;</div><div class='add'>+	u64 tx_zero_rexmt;</div><div class='add'>+	u64 tx_one_rexmt;</div><div class='add'>+	u64 tx_many_rexmt;</div><div class='add'>+	u64 tx_late_collision;</div><div class='add'>+	u64 tx_fifo_errors;</div><div class='add'>+	u64 tx_carrier_errors;</div><div class='add'>+	u64 tx_excess_deferral;</div><div class='add'>+	u64 tx_retry_error;</div><div class='add'>+	u64 tx_deferral;</div><div class='add'>+	u64 tx_packets;</div><div class='add'>+	u64 tx_pause;</div><div class='add'>+	u64 rx_frame_error;</div><div class='add'>+	u64 rx_extra_byte;</div><div class='add'>+	u64 rx_late_collision;</div><div class='add'>+	u64 rx_runt;</div><div class='add'>+	u64 rx_frame_too_long;</div><div class='add'>+	u64 rx_over_errors;</div><div class='add'>+	u64 rx_crc_errors;</div><div class='add'>+	u64 rx_frame_align_error;</div><div class='add'>+	u64 rx_length_error;</div><div class='add'>+	u64 rx_unicast;</div><div class='add'>+	u64 rx_multicast;</div><div class='add'>+	u64 rx_broadcast;</div><div class='add'>+	u64 rx_bytes;</div><div class='add'>+	u64 rx_pause;</div><div class='add'>+	u64 rx_drop_frame;</div><div class='add'>+	u64 rx_packets;</div><div class='add'>+	u64 rx_errors_total;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* diagnostics */</div><div class='add'>+#define NV_TEST_COUNT_BASE 3</div><div class='add'>+#define NV_TEST_COUNT_EXTENDED 4</div><div class='add'>+</div><div class='add'>+static const struct nv_ethtool_str nv_etests_str[] = {</div><div class='add'>+	{ "link      (online/offline)" },</div><div class='add'>+	{ "register  (offline)       " },</div><div class='add'>+	{ "interrupt (offline)       " },</div><div class='add'>+	{ "loopback  (offline)       " }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct register_test {</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct register_test nv_registers_test[] = {</div><div class='add'>+	{ NvRegUnknownSetupReg6, 0x01 },</div><div class='add'>+	{ NvRegMisc1, 0x03c },</div><div class='add'>+	{ NvRegOffloadConfig, 0x03ff },</div><div class='add'>+	{ NvRegMulticastAddrA, 0xffffffff },</div><div class='add'>+	{ NvRegTxWatermark, 0x0ff },</div><div class='add'>+	{ NvRegWakeUpFlags, 0x07777 },</div><div class='add'>+	{ 0,0 }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * SMP locking:</div><div class='ctx'>  * All hardware access under dev-&gt;priv-&gt;lock, except the performance</div><div class='ctx'>  * critical parts:</div><div class='ctx'>  * - rx is (pseudo-) lockless: it relies on the single-threading provided</div><div class='ctx'>  *	by the arch code for interrupts.</div><div class='del'>- * - tx setup is lockless: it relies on dev-&gt;xmit_lock. Actual submission</div><div class='add'>+ * - tx setup is lockless: it relies on netif_tx_lock. Actual submission</div><div class='ctx'>  *	needs dev-&gt;priv-&gt;lock :-(</div><div class='del'>- * - set_multicast_list: preparation lockless, relies on dev-&gt;xmit_lock.</div><div class='add'>+ * - set_multicast_list: preparation lockless, relies on netif_tx_lock.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* in dev: base, irq */</div><div class='hunk'>@@ -545,6 +685,7 @@ struct fe_priv {</div><div class='ctx'> 	/* General data:</div><div class='ctx'> 	 * Locking: spin_lock(&amp;np-&gt;lock); */</div><div class='ctx'> 	struct net_device_stats stats;</div><div class='add'>+	struct nv_ethtool_stats estats;</div><div class='ctx'> 	int in_shutdown;</div><div class='ctx'> 	u32 linkspeed;</div><div class='ctx'> 	int duplex;</div><div class='hunk'>@@ -554,6 +695,7 @@ struct fe_priv {</div><div class='ctx'> 	int wolenabled;</div><div class='ctx'> 	unsigned int phy_oui;</div><div class='ctx'> 	u16 gigabit;</div><div class='add'>+	int intr_test;</div><div class='ctx'> </div><div class='ctx'> 	/* General data: RO fields */</div><div class='ctx'> 	dma_addr_t ring_addr;</div><div class='hunk'>@@ -573,13 +715,15 @@ struct fe_priv {</div><div class='ctx'> 	 */</div><div class='ctx'> 	ring_type rx_ring;</div><div class='ctx'> 	unsigned int cur_rx, refill_rx;</div><div class='del'>-	struct sk_buff *rx_skbuff[RX_RING];</div><div class='del'>-	dma_addr_t rx_dma[RX_RING];</div><div class='add'>+	struct sk_buff **rx_skbuff;</div><div class='add'>+	dma_addr_t *rx_dma;</div><div class='ctx'> 	unsigned int rx_buf_sz;</div><div class='ctx'> 	unsigned int pkt_limit;</div><div class='ctx'> 	struct timer_list oom_kick;</div><div class='ctx'> 	struct timer_list nic_poll;</div><div class='add'>+	struct timer_list stats_poll;</div><div class='ctx'> 	u32 nic_poll_irq;</div><div class='add'>+	int rx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 	/* media detection workaround.</div><div class='ctx'> 	 * Locking: Within irq hander or disable_irq+spin_lock(&amp;np-&gt;lock);</div><div class='hunk'>@@ -591,10 +735,13 @@ struct fe_priv {</div><div class='ctx'> 	 */</div><div class='ctx'> 	ring_type tx_ring;</div><div class='ctx'> 	unsigned int next_tx, nic_tx;</div><div class='del'>-	struct sk_buff *tx_skbuff[TX_RING];</div><div class='del'>-	dma_addr_t tx_dma[TX_RING];</div><div class='del'>-	unsigned int tx_dma_len[TX_RING];</div><div class='add'>+	struct sk_buff **tx_skbuff;</div><div class='add'>+	dma_addr_t *tx_dma;</div><div class='add'>+	unsigned int *tx_dma_len;</div><div class='ctx'> 	u32 tx_flags;</div><div class='add'>+	int tx_ring_size;</div><div class='add'>+	int tx_limit_start;</div><div class='add'>+	int tx_limit_stop;</div><div class='ctx'> </div><div class='ctx'> 	/* vlan fields */</div><div class='ctx'> 	struct vlan_group *vlangrp;</div><div class='hunk'>@@ -602,6 +749,9 @@ struct fe_priv {</div><div class='ctx'> 	/* msi/msi-x fields */</div><div class='ctx'> 	u32 msi_flags;</div><div class='ctx'> 	struct msix_entry msi_x_entry[NV_MSI_X_MAX_VECTORS];</div><div class='add'>+</div><div class='add'>+	/* flow control */</div><div class='add'>+	u32 pause_flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -612,12 +762,14 @@ static int max_interrupt_work = 5;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Optimization can be either throuput mode or cpu mode</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Throughput Mode: Every tx and rx packet will generate an interrupt.</div><div class='ctx'>  * CPU Mode: Interrupts are controlled by a timer.</div><div class='ctx'>  */</div><div class='del'>-#define NV_OPTIMIZATION_MODE_THROUGHPUT 0</div><div class='del'>-#define NV_OPTIMIZATION_MODE_CPU        1</div><div class='add'>+enum {</div><div class='add'>+	NV_OPTIMIZATION_MODE_THROUGHPUT,</div><div class='add'>+	NV_OPTIMIZATION_MODE_CPU</div><div class='add'>+};</div><div class='ctx'> static int optimization_mode = NV_OPTIMIZATION_MODE_THROUGHPUT;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -630,14 +782,31 @@ static int optimization_mode = NV_OPTIMIZATION_MODE_THROUGHPUT;</div><div class='ctx'> static int poll_interval = -1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Disable MSI interrupts</div><div class='add'>+ * MSI interrupts</div><div class='ctx'>  */</div><div class='del'>-static int disable_msi = 0;</div><div class='add'>+enum {</div><div class='add'>+	NV_MSI_INT_DISABLED,</div><div class='add'>+	NV_MSI_INT_ENABLED</div><div class='add'>+};</div><div class='add'>+static int msi = NV_MSI_INT_ENABLED;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Disable MSIX interrupts</div><div class='add'>+ * MSIX interrupts</div><div class='ctx'>  */</div><div class='del'>-static int disable_msix = 0;</div><div class='add'>+enum {</div><div class='add'>+	NV_MSIX_INT_DISABLED,</div><div class='add'>+	NV_MSIX_INT_ENABLED</div><div class='add'>+};</div><div class='add'>+static int msix = NV_MSIX_INT_ENABLED;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DMA 64bit</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	NV_DMA_64BIT_DISABLED,</div><div class='add'>+	NV_DMA_64BIT_ENABLED</div><div class='add'>+};</div><div class='add'>+static int dma_64bit = NV_DMA_64BIT_ENABLED;</div><div class='ctx'> </div><div class='ctx'> static inline struct fe_priv *get_nvpriv(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -697,7 +866,7 @@ static void setup_hw_rings(struct net_device *dev, int rxtx_flags)</div><div class='ctx'> 			writel((u32) cpu_to_le64(np-&gt;ring_addr), base + NvRegRxRingPhysAddr);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rxtx_flags &amp; NV_SETUP_TX_RING) {</div><div class='del'>-			writel((u32) cpu_to_le64(np-&gt;ring_addr + RX_RING*sizeof(struct ring_desc)), base + NvRegTxRingPhysAddr);</div><div class='add'>+			writel((u32) cpu_to_le64(np-&gt;ring_addr + np-&gt;rx_ring_size*sizeof(struct ring_desc)), base + NvRegTxRingPhysAddr);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (rxtx_flags &amp; NV_SETUP_RX_RING) {</div><div class='hunk'>@@ -705,12 +874,37 @@ static void setup_hw_rings(struct net_device *dev, int rxtx_flags)</div><div class='ctx'> 			writel((u32) (cpu_to_le64(np-&gt;ring_addr) &gt;&gt; 32), base + NvRegRxRingPhysAddrHigh);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rxtx_flags &amp; NV_SETUP_TX_RING) {</div><div class='del'>-			writel((u32) cpu_to_le64(np-&gt;ring_addr + RX_RING*sizeof(struct ring_desc_ex)), base + NvRegTxRingPhysAddr);</div><div class='del'>-			writel((u32) (cpu_to_le64(np-&gt;ring_addr + RX_RING*sizeof(struct ring_desc_ex)) &gt;&gt; 32), base + NvRegTxRingPhysAddrHigh);</div><div class='add'>+			writel((u32) cpu_to_le64(np-&gt;ring_addr + np-&gt;rx_ring_size*sizeof(struct ring_desc_ex)), base + NvRegTxRingPhysAddr);</div><div class='add'>+			writel((u32) (cpu_to_le64(np-&gt;ring_addr + np-&gt;rx_ring_size*sizeof(struct ring_desc_ex)) &gt;&gt; 32), base + NvRegTxRingPhysAddrHigh);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void free_rings(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = get_nvpriv(dev);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='add'>+		if(np-&gt;rx_ring.orig)</div><div class='add'>+			pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc) * (np-&gt;rx_ring_size + np-&gt;tx_ring_size),</div><div class='add'>+					    np-&gt;rx_ring.orig, np-&gt;ring_addr);</div><div class='add'>+	} else {</div><div class='add'>+		if (np-&gt;rx_ring.ex)</div><div class='add'>+			pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc_ex) * (np-&gt;rx_ring_size + np-&gt;tx_ring_size),</div><div class='add'>+					    np-&gt;rx_ring.ex, np-&gt;ring_addr);</div><div class='add'>+	}</div><div class='add'>+	if (np-&gt;rx_skbuff)</div><div class='add'>+		kfree(np-&gt;rx_skbuff);</div><div class='add'>+	if (np-&gt;rx_dma)</div><div class='add'>+		kfree(np-&gt;rx_dma);</div><div class='add'>+	if (np-&gt;tx_skbuff)</div><div class='add'>+		kfree(np-&gt;tx_skbuff);</div><div class='add'>+	if (np-&gt;tx_dma)</div><div class='add'>+		kfree(np-&gt;tx_dma);</div><div class='add'>+	if (np-&gt;tx_dma_len)</div><div class='add'>+		kfree(np-&gt;tx_dma_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int using_multi_irqs(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = get_nvpriv(dev);</div><div class='hunk'>@@ -860,7 +1054,7 @@ static int phy_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* set advertise register */</div><div class='ctx'> 	reg = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='del'>-	reg |= (ADVERTISE_10HALF|ADVERTISE_10FULL|ADVERTISE_100HALF|ADVERTISE_100FULL|0x800|0x400);</div><div class='add'>+	reg |= (ADVERTISE_10HALF|ADVERTISE_10FULL|ADVERTISE_100HALF|ADVERTISE_100FULL|ADVERTISE_PAUSE_ASYM|ADVERTISE_PAUSE_CAP);</div><div class='ctx'> 	if (mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, reg)) {</div><div class='ctx'> 		printk(KERN_INFO "%s: phy write to advertise failed.\n", pci_name(np-&gt;pci_dev));</div><div class='ctx'> 		return PHY_ERROR;</div><div class='hunk'>@@ -873,14 +1067,14 @@ static int phy_init(struct net_device *dev)</div><div class='ctx'> 	mii_status = mii_rw(dev, np-&gt;phyaddr, MII_BMSR, MII_READ);</div><div class='ctx'> 	if (mii_status &amp; PHY_GIGABIT) {</div><div class='ctx'> 		np-&gt;gigabit = PHY_GIGABIT;</div><div class='del'>-		mii_control_1000 = mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, MII_READ);</div><div class='add'>+		mii_control_1000 = mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, MII_READ);</div><div class='ctx'> 		mii_control_1000 &amp;= ~ADVERTISE_1000HALF;</div><div class='ctx'> 		if (phyinterface &amp; PHY_RGMII)</div><div class='ctx'> 			mii_control_1000 |= ADVERTISE_1000FULL;</div><div class='ctx'> 		else</div><div class='ctx'> 			mii_control_1000 &amp;= ~ADVERTISE_1000FULL;</div><div class='ctx'> </div><div class='del'>-		if (mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, mii_control_1000)) {</div><div class='add'>+		if (mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, mii_control_1000)) {</div><div class='ctx'> 			printk(KERN_INFO "%s: phy init failed.\n", pci_name(np-&gt;pci_dev));</div><div class='ctx'> 			return PHY_ERROR;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -918,6 +1112,8 @@ static int phy_init(struct net_device *dev)</div><div class='ctx'> 			return PHY_ERROR;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	/* some phys clear out pause advertisment on reset, set it back */</div><div class='add'>+	mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, reg);</div><div class='ctx'> </div><div class='ctx'> 	/* restart auto negotiation */</div><div class='ctx'> 	mii_control = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='hunk'>@@ -1047,7 +1243,7 @@ static int nv_alloc_rx(struct net_device *dev)</div><div class='ctx'> 	while (np-&gt;cur_rx != refill_rx) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-		nr = refill_rx % RX_RING;</div><div class='add'>+		nr = refill_rx % np-&gt;rx_ring_size;</div><div class='ctx'> 		if (np-&gt;rx_skbuff[nr] == NULL) {</div><div class='ctx'> </div><div class='ctx'> 			skb = dev_alloc_skb(np-&gt;rx_buf_sz + NV_RX_ALLOC_PAD);</div><div class='hunk'>@@ -1076,7 +1272,7 @@ static int nv_alloc_rx(struct net_device *dev)</div><div class='ctx'> 		refill_rx++;</div><div class='ctx'> 	}</div><div class='ctx'> 	np-&gt;refill_rx = refill_rx;</div><div class='del'>-	if (np-&gt;cur_rx - refill_rx == RX_RING)</div><div class='add'>+	if (np-&gt;cur_rx - refill_rx == np-&gt;rx_ring_size)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1110,14 +1306,14 @@ static void nv_do_rx_refill(unsigned long data)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_init_rx(struct net_device *dev) </div><div class='add'>+static void nv_init_rx(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	np-&gt;cur_rx = RX_RING;</div><div class='add'>+	np-&gt;cur_rx = np-&gt;rx_ring_size;</div><div class='ctx'> 	np-&gt;refill_rx = 0;</div><div class='del'>-	for (i = 0; i &lt; RX_RING; i++)</div><div class='add'>+	for (i = 0; i &lt; np-&gt;rx_ring_size; i++)</div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='ctx'> 			np-&gt;rx_ring.orig[i].FlagLen = 0;</div><div class='ctx'> 	        else</div><div class='hunk'>@@ -1130,7 +1326,7 @@ static void nv_init_tx(struct net_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	np-&gt;next_tx = np-&gt;nic_tx = 0;</div><div class='del'>-	for (i = 0; i &lt; TX_RING; i++) {</div><div class='add'>+	for (i = 0; i &lt; np-&gt;tx_ring_size; i++) {</div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='ctx'> 			np-&gt;tx_ring.orig[i].FlagLen = 0;</div><div class='ctx'> 	        else</div><div class='hunk'>@@ -1174,8 +1370,8 @@ static void nv_drain_tx(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; TX_RING; i++) {</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; np-&gt;tx_ring_size; i++) {</div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='ctx'> 			np-&gt;tx_ring.orig[i].FlagLen = 0;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1189,7 +1385,7 @@ static void nv_drain_rx(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	int i;</div><div class='del'>-	for (i = 0; i &lt; RX_RING; i++) {</div><div class='add'>+	for (i = 0; i &lt; np-&gt;rx_ring_size; i++) {</div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='ctx'> 			np-&gt;rx_ring.orig[i].FlagLen = 0;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1213,7 +1409,7 @@ static void drain_ring(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * nv_start_xmit: dev-&gt;hard_start_xmit function</div><div class='del'>- * Called with dev-&gt;xmit_lock held.</div><div class='add'>+ * Called with netif_tx_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1221,8 +1417,8 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	u32 tx_flags = 0;</div><div class='ctx'> 	u32 tx_flags_extra = (np-&gt;desc_ver == DESC_VER_1 ? NV_TX_LASTPACKET : NV_TX2_LASTPACKET);</div><div class='ctx'> 	unsigned int fragments = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	unsigned int nr = (np-&gt;next_tx - 1) % TX_RING;</div><div class='del'>-	unsigned int start_nr = np-&gt;next_tx % TX_RING;</div><div class='add'>+	unsigned int nr = (np-&gt;next_tx - 1) % np-&gt;tx_ring_size;</div><div class='add'>+	unsigned int start_nr = np-&gt;next_tx % np-&gt;tx_ring_size;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 offset = 0;</div><div class='ctx'> 	u32 bcnt;</div><div class='hunk'>@@ -1238,7 +1434,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if ((np-&gt;next_tx - np-&gt;nic_tx + entries - 1) &gt; TX_LIMIT_STOP) {</div><div class='add'>+	if ((np-&gt;next_tx - np-&gt;nic_tx + entries - 1) &gt; np-&gt;tx_limit_stop) {</div><div class='ctx'> 		spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='hunk'>@@ -1247,7 +1443,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* setup the header buffer */</div><div class='ctx'> 	do {</div><div class='ctx'> 		bcnt = (size &gt; NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;</div><div class='del'>-		nr = (nr + 1) % TX_RING;</div><div class='add'>+		nr = (nr + 1) % np-&gt;tx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;tx_dma[nr] = pci_map_single(np-&gt;pci_dev, skb-&gt;data + offset, bcnt,</div><div class='ctx'> 						PCI_DMA_TODEVICE);</div><div class='hunk'>@@ -1274,7 +1470,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='ctx'> 			bcnt = (size &gt; NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;</div><div class='del'>-			nr = (nr + 1) % TX_RING;</div><div class='add'>+			nr = (nr + 1) % np-&gt;tx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 			np-&gt;tx_dma[nr] = pci_map_page(np-&gt;pci_dev, frag-&gt;page, frag-&gt;page_offset+offset, bcnt,</div><div class='ctx'> 						      PCI_DMA_TODEVICE);</div><div class='hunk'>@@ -1303,8 +1499,8 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	np-&gt;tx_skbuff[nr] = skb;</div><div class='ctx'> </div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='del'>-	if (skb_shinfo(skb)-&gt;tso_size)</div><div class='del'>-		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)-&gt;tso_size &lt;&lt; NV_TX2_TSO_SHIFT);</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='add'>+		tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)-&gt;gso_size &lt;&lt; NV_TX2_TSO_SHIFT);</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='ctx'> 	tx_flags_extra = (skb-&gt;ip_summed == CHECKSUM_HW ? (NV_TX2_CHECKSUM_L3|NV_TX2_CHECKSUM_L4) : 0);</div><div class='hunk'>@@ -1320,7 +1516,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		np-&gt;tx_ring.ex[start_nr].TxVlan = cpu_to_le32(tx_flags_vlan);</div><div class='ctx'> 		np-&gt;tx_ring.ex[start_nr].FlagLen |= cpu_to_le32(tx_flags | tx_flags_extra);</div><div class='del'>-	}	</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dprintk(KERN_DEBUG "%s: nv_start_xmit: packet %d (entries %d) queued for transmission. tx_flags_extra: %x\n",</div><div class='ctx'> 		dev-&gt;name, np-&gt;next_tx, entries, tx_flags_extra);</div><div class='hunk'>@@ -1356,7 +1552,7 @@ static void nv_tx_done(struct net_device *dev)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	while (np-&gt;nic_tx != np-&gt;next_tx) {</div><div class='del'>-		i = np-&gt;nic_tx % TX_RING;</div><div class='add'>+		i = np-&gt;nic_tx % np-&gt;tx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='ctx'> 			Flags = le32_to_cpu(np-&gt;tx_ring.orig[i].FlagLen);</div><div class='hunk'>@@ -1395,19 +1591,19 @@ static void nv_tx_done(struct net_device *dev)</div><div class='ctx'> 				} else {</div><div class='ctx'> 					np-&gt;stats.tx_packets++;</div><div class='ctx'> 					np-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-				}				</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		nv_release_txskb(dev, i);</div><div class='ctx'> 		np-&gt;nic_tx++;</div><div class='ctx'> 	}</div><div class='del'>-	if (np-&gt;next_tx - np-&gt;nic_tx &lt; TX_LIMIT_START)</div><div class='add'>+	if (np-&gt;next_tx - np-&gt;nic_tx &lt; np-&gt;tx_limit_start)</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * nv_tx_timeout: dev-&gt;tx_timeout function</div><div class='del'>- * Called with dev-&gt;xmit_lock held.</div><div class='add'>+ * Called with netif_tx_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static void nv_tx_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1438,10 +1634,10 @@ static void nv_tx_timeout(struct net_device *dev)</div><div class='ctx'> 					readl(base + i + 24), readl(base + i + 28));</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_INFO "%s: Dumping tx ring\n", dev-&gt;name);</div><div class='del'>-		for (i=0;i&lt;TX_RING;i+= 4) {</div><div class='add'>+		for (i=0;i&lt;np-&gt;tx_ring_size;i+= 4) {</div><div class='ctx'> 			if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='ctx'> 				printk(KERN_INFO "%03x: %08x %08x // %08x %08x // %08x %08x // %08x %08x\n",</div><div class='del'>-				       i, </div><div class='add'>+				       i,</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.orig[i].PacketBuffer),</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.orig[i].FlagLen),</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.orig[i+1].PacketBuffer),</div><div class='hunk'>@@ -1452,7 +1648,7 @@ static void nv_tx_timeout(struct net_device *dev)</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.orig[i+3].FlagLen));</div><div class='ctx'> 			} else {</div><div class='ctx'> 				printk(KERN_INFO "%03x: %08x %08x %08x // %08x %08x %08x // %08x %08x %08x // %08x %08x %08x\n",</div><div class='del'>-				       i, </div><div class='add'>+				       i,</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.ex[i].PacketBufferHigh),</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.ex[i].PacketBufferLow),</div><div class='ctx'> 				       le32_to_cpu(np-&gt;tx_ring.ex[i].FlagLen),</div><div class='hunk'>@@ -1550,15 +1746,14 @@ static void nv_rx_process(struct net_device *dev)</div><div class='ctx'> 	u32 Flags;</div><div class='ctx'> 	u32 vlanflags = 0;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		int len;</div><div class='ctx'> 		int i;</div><div class='del'>-		if (np-&gt;cur_rx - np-&gt;refill_rx &gt;= RX_RING)</div><div class='add'>+		if (np-&gt;cur_rx - np-&gt;refill_rx &gt;= np-&gt;rx_ring_size)</div><div class='ctx'> 			break;	/* we scanned the whole ring - do not continue */</div><div class='ctx'> </div><div class='del'>-		i = np-&gt;cur_rx % RX_RING;</div><div class='add'>+		i = np-&gt;cur_rx % np-&gt;rx_ring_size;</div><div class='ctx'> 		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='ctx'> 			Flags = le32_to_cpu(np-&gt;rx_ring.orig[i].FlagLen);</div><div class='ctx'> 			len = nv_descr_getlength(&amp;np-&gt;rx_ring.orig[i], np-&gt;desc_ver);</div><div class='hunk'>@@ -1665,14 +1860,16 @@ static void nv_rx_process(struct net_device *dev)</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			Flags &amp;= NV_RX2_CHECKSUMMASK;</div><div class='del'>-			if (Flags == NV_RX2_CHECKSUMOK1 ||</div><div class='del'>-					Flags == NV_RX2_CHECKSUMOK2 ||</div><div class='del'>-					Flags == NV_RX2_CHECKSUMOK3) {</div><div class='del'>-				dprintk(KERN_DEBUG "%s: hw checksum hit!.\n", dev-&gt;name);</div><div class='del'>-				np-&gt;rx_skbuff[i]-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-			} else {</div><div class='del'>-				dprintk(KERN_DEBUG "%s: hwchecksum miss!.\n", dev-&gt;name);</div><div class='add'>+			if (np-&gt;txrxctl_bits &amp; NVREG_TXRXCTL_RXCHECK) {</div><div class='add'>+				Flags &amp;= NV_RX2_CHECKSUMMASK;</div><div class='add'>+				if (Flags == NV_RX2_CHECKSUMOK1 ||</div><div class='add'>+				    Flags == NV_RX2_CHECKSUMOK2 ||</div><div class='add'>+				    Flags == NV_RX2_CHECKSUMOK3) {</div><div class='add'>+					dprintk(KERN_DEBUG "%s: hw checksum hit!.\n", dev-&gt;name);</div><div class='add'>+					np-&gt;rx_skbuff[i]-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+				} else {</div><div class='add'>+					dprintk(KERN_DEBUG "%s: hwchecksum miss!.\n", dev-&gt;name);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* got a valid packet - forward it to the network core */</div><div class='hunk'>@@ -1737,7 +1934,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		 * Changing the MTU is a rare event, it shouldn't matter.</div><div class='ctx'> 		 */</div><div class='ctx'> 		nv_disable_irq(dev);</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='ctx'> 		spin_lock(&amp;np-&gt;lock);</div><div class='ctx'> 		/* stop engines */</div><div class='ctx'> 		nv_stop_rx(dev);</div><div class='hunk'>@@ -1747,18 +1944,15 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		nv_drain_rx(dev);</div><div class='ctx'> 		nv_drain_tx(dev);</div><div class='ctx'> 		/* reinit driver view of the rx queue */</div><div class='del'>-		nv_init_rx(dev);</div><div class='del'>-		nv_init_tx(dev);</div><div class='del'>-		/* alloc new rx buffers */</div><div class='ctx'> 		set_bufsize(dev);</div><div class='del'>-		if (nv_alloc_rx(dev)) {</div><div class='add'>+		if (nv_init_ring(dev)) {</div><div class='ctx'> 			if (!np-&gt;in_shutdown)</div><div class='ctx'> 				mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* reinit nic view of the rx queue */</div><div class='ctx'> 		writel(np-&gt;rx_buf_sz, base + NvRegOffloadConfig);</div><div class='ctx'> 		setup_hw_rings(dev, NV_SETUP_RX_RING | NV_SETUP_TX_RING);</div><div class='del'>-		writel( ((RX_RING-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((TX_RING-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='add'>+		writel( ((np-&gt;rx_ring_size-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((np-&gt;tx_ring_size-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='ctx'> 			base + NvRegRingSizes);</div><div class='ctx'> 		pci_push(base);</div><div class='ctx'> 		writel(NVREG_TXRXCTL_KICK|np-&gt;txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);</div><div class='hunk'>@@ -1768,7 +1962,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		nv_start_rx(dev);</div><div class='ctx'> 		nv_start_tx(dev);</div><div class='ctx'> 		spin_unlock(&amp;np-&gt;lock);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> 		nv_enable_irq(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1803,7 +1997,7 @@ static int nv_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, macaddr-&gt;sa_data, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='del'>-		spin_lock_bh(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='ctx'> 		spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/* stop rx engine */</div><div class='hunk'>@@ -1815,7 +2009,7 @@ static int nv_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 		/* restart rx engine */</div><div class='ctx'> 		nv_start_rx(dev);</div><div class='ctx'> 		spin_unlock_irq(&amp;np-&gt;lock);</div><div class='del'>-		spin_unlock_bh(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		nv_copy_mac_to_hw(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1824,7 +2018,7 @@ static int nv_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * nv_set_multicast: dev-&gt;set_multicast function</div><div class='del'>- * Called with dev-&gt;xmit_lock held.</div><div class='add'>+ * Called with netif_tx_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static void nv_set_multicast(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1832,16 +2026,16 @@ static void nv_set_multicast(struct net_device *dev)</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='ctx'> 	u32 addr[2];</div><div class='ctx'> 	u32 mask[2];</div><div class='del'>-	u32 pff;</div><div class='add'>+	u32 pff = readl(base + NvRegPacketFilterFlags) &amp; NVREG_PFF_PAUSE_RX;</div><div class='ctx'> </div><div class='ctx'> 	memset(addr, 0, sizeof(addr));</div><div class='ctx'> 	memset(mask, 0, sizeof(mask));</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev-&gt;name);</div><div class='del'>-		pff = NVREG_PFF_PROMISC;</div><div class='add'>+		pff |= NVREG_PFF_PROMISC;</div><div class='ctx'> 	} else {</div><div class='del'>-		pff = NVREG_PFF_MYADDR;</div><div class='add'>+		pff |= NVREG_PFF_MYADDR;</div><div class='ctx'> </div><div class='ctx'> 		if (dev-&gt;flags &amp; IFF_ALLMULTI || dev-&gt;mc_list) {</div><div class='ctx'> 			u32 alwaysOff[2];</div><div class='hunk'>@@ -1886,6 +2080,35 @@ static void nv_set_multicast(struct net_device *dev)</div><div class='ctx'> 	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nv_update_pause(struct net_device *dev, u32 pause_flags)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+</div><div class='add'>+	np-&gt;pause_flags &amp;= ~(NV_PAUSEFRAME_TX_ENABLE | NV_PAUSEFRAME_RX_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_RX_CAPABLE) {</div><div class='add'>+		u32 pff = readl(base + NvRegPacketFilterFlags) &amp; ~NVREG_PFF_PAUSE_RX;</div><div class='add'>+		if (pause_flags &amp; NV_PAUSEFRAME_RX_ENABLE) {</div><div class='add'>+			writel(pff|NVREG_PFF_PAUSE_RX, base + NvRegPacketFilterFlags);</div><div class='add'>+			np-&gt;pause_flags |= NV_PAUSEFRAME_RX_ENABLE;</div><div class='add'>+		} else {</div><div class='add'>+			writel(pff, base + NvRegPacketFilterFlags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_CAPABLE) {</div><div class='add'>+		u32 regmisc = readl(base + NvRegMisc1) &amp; ~NVREG_MISC1_PAUSE_TX;</div><div class='add'>+		if (pause_flags &amp; NV_PAUSEFRAME_TX_ENABLE) {</div><div class='add'>+			writel(NVREG_TX_PAUSEFRAME_ENABLE,  base + NvRegTxPauseFrame);</div><div class='add'>+			writel(regmisc|NVREG_MISC1_PAUSE_TX, base + NvRegMisc1);</div><div class='add'>+			np-&gt;pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='add'>+		} else {</div><div class='add'>+			writel(NVREG_TX_PAUSEFRAME_DISABLE,  base + NvRegTxPauseFrame);</div><div class='add'>+			writel(regmisc, base + NvRegMisc1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * nv_update_linkspeed: Setup the MAC according to the link partner</div><div class='ctx'>  * @dev: Network device to be configured</div><div class='hunk'>@@ -1901,12 +2124,14 @@ static int nv_update_linkspeed(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='del'>-	int adv, lpa;</div><div class='add'>+	int adv = 0;</div><div class='add'>+	int lpa = 0;</div><div class='add'>+	int adv_lpa, adv_pause, lpa_pause;</div><div class='ctx'> 	int newls = np-&gt;linkspeed;</div><div class='ctx'> 	int newdup = np-&gt;duplex;</div><div class='ctx'> 	int mii_status;</div><div class='ctx'> 	int retval = 0;</div><div class='del'>-	u32 control_1000, status_1000, phyreg;</div><div class='add'>+	u32 control_1000, status_1000, phyreg, pause_flags, txreg;</div><div class='ctx'> </div><div class='ctx'> 	/* BMSR_LSTATUS is latched, read it twice:</div><div class='ctx'> 	 * we want the current value.</div><div class='hunk'>@@ -1952,10 +2177,15 @@ static int nv_update_linkspeed(struct net_device *dev)</div><div class='ctx'> 		goto set_speed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	adv = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='add'>+	lpa = mii_rw(dev, np-&gt;phyaddr, MII_LPA, MII_READ);</div><div class='add'>+	dprintk(KERN_DEBUG "%s: nv_update_linkspeed: PHY advertises 0x%04x, lpa 0x%04x.\n",</div><div class='add'>+				dev-&gt;name, adv, lpa);</div><div class='add'>+</div><div class='ctx'> 	retval = 1;</div><div class='ctx'> 	if (np-&gt;gigabit == PHY_GIGABIT) {</div><div class='del'>-		control_1000 = mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, MII_READ);</div><div class='del'>-		status_1000 = mii_rw(dev, np-&gt;phyaddr, MII_1000BT_SR, MII_READ);</div><div class='add'>+		control_1000 = mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, MII_READ);</div><div class='add'>+		status_1000 = mii_rw(dev, np-&gt;phyaddr, MII_STAT1000, MII_READ);</div><div class='ctx'> </div><div class='ctx'> 		if ((control_1000 &amp; ADVERTISE_1000FULL) &amp;&amp;</div><div class='ctx'> 			(status_1000 &amp; LPA_1000FULL)) {</div><div class='hunk'>@@ -1967,27 +2197,22 @@ static int nv_update_linkspeed(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adv = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='del'>-	lpa = mii_rw(dev, np-&gt;phyaddr, MII_LPA, MII_READ);</div><div class='del'>-	dprintk(KERN_DEBUG "%s: nv_update_linkspeed: PHY advertises 0x%04x, lpa 0x%04x.\n",</div><div class='del'>-				dev-&gt;name, adv, lpa);</div><div class='del'>-</div><div class='ctx'> 	/* FIXME: handle parallel detection properly */</div><div class='del'>-	lpa = lpa &amp; adv;</div><div class='del'>-	if (lpa &amp; LPA_100FULL) {</div><div class='add'>+	adv_lpa = lpa &amp; adv;</div><div class='add'>+	if (adv_lpa &amp; LPA_100FULL) {</div><div class='ctx'> 		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_100;</div><div class='ctx'> 		newdup = 1;</div><div class='del'>-	} else if (lpa &amp; LPA_100HALF) {</div><div class='add'>+	} else if (adv_lpa &amp; LPA_100HALF) {</div><div class='ctx'> 		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_100;</div><div class='ctx'> 		newdup = 0;</div><div class='del'>-	} else if (lpa &amp; LPA_10FULL) {</div><div class='add'>+	} else if (adv_lpa &amp; LPA_10FULL) {</div><div class='ctx'> 		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;</div><div class='ctx'> 		newdup = 1;</div><div class='del'>-	} else if (lpa &amp; LPA_10HALF) {</div><div class='add'>+	} else if (adv_lpa &amp; LPA_10HALF) {</div><div class='ctx'> 		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;</div><div class='ctx'> 		newdup = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		dprintk(KERN_DEBUG "%s: bad ability %04x - falling back to 10HD.\n", dev-&gt;name, lpa);</div><div class='add'>+		dprintk(KERN_DEBUG "%s: bad ability %04x - falling back to 10HD.\n", dev-&gt;name, adv_lpa);</div><div class='ctx'> 		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;</div><div class='ctx'> 		newdup = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2024,12 +2249,72 @@ set_speed:</div><div class='ctx'> 		phyreg |= PHY_1000;</div><div class='ctx'> 	writel(phyreg, base + NvRegPhyInterface);</div><div class='ctx'> </div><div class='add'>+	if (phyreg &amp; PHY_RGMII) {</div><div class='add'>+		if ((np-&gt;linkspeed &amp; NVREG_LINKSPEED_MASK) == NVREG_LINKSPEED_1000)</div><div class='add'>+			txreg = NVREG_TX_DEFERRAL_RGMII_1000;</div><div class='add'>+		else</div><div class='add'>+			txreg = NVREG_TX_DEFERRAL_RGMII_10_100;</div><div class='add'>+	} else {</div><div class='add'>+		txreg = NVREG_TX_DEFERRAL_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+	writel(txreg, base + NvRegTxDeferral);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1) {</div><div class='add'>+		txreg = NVREG_TX_WM_DESC1_DEFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		if ((np-&gt;linkspeed &amp; NVREG_LINKSPEED_MASK) == NVREG_LINKSPEED_1000)</div><div class='add'>+			txreg = NVREG_TX_WM_DESC2_3_1000;</div><div class='add'>+		else</div><div class='add'>+			txreg = NVREG_TX_WM_DESC2_3_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+	writel(txreg, base + NvRegTxWatermark);</div><div class='add'>+</div><div class='ctx'> 	writel(NVREG_MISC1_FORCE | ( np-&gt;duplex ? 0 : NVREG_MISC1_HD),</div><div class='ctx'> 		base + NvRegMisc1);</div><div class='ctx'> 	pci_push(base);</div><div class='ctx'> 	writel(np-&gt;linkspeed, base + NvRegLinkSpeed);</div><div class='ctx'> 	pci_push(base);</div><div class='ctx'> </div><div class='add'>+	pause_flags = 0;</div><div class='add'>+	/* setup pause frame */</div><div class='add'>+	if (np-&gt;duplex != 0) {</div><div class='add'>+		if (np-&gt;autoneg &amp;&amp; np-&gt;pause_flags &amp; NV_PAUSEFRAME_AUTONEG) {</div><div class='add'>+			adv_pause = adv &amp; (ADVERTISE_PAUSE_CAP| ADVERTISE_PAUSE_ASYM);</div><div class='add'>+			lpa_pause = lpa &amp; (LPA_PAUSE_CAP| LPA_PAUSE_ASYM);</div><div class='add'>+</div><div class='add'>+			switch (adv_pause) {</div><div class='add'>+			case (ADVERTISE_PAUSE_CAP):</div><div class='add'>+				if (lpa_pause &amp; LPA_PAUSE_CAP) {</div><div class='add'>+					pause_flags |= NV_PAUSEFRAME_RX_ENABLE;</div><div class='add'>+					if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_REQ)</div><div class='add'>+						pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case (ADVERTISE_PAUSE_ASYM):</div><div class='add'>+				if (lpa_pause == (LPA_PAUSE_CAP| LPA_PAUSE_ASYM))</div><div class='add'>+				{</div><div class='add'>+					pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case (ADVERTISE_PAUSE_CAP| ADVERTISE_PAUSE_ASYM):</div><div class='add'>+				if (lpa_pause &amp; LPA_PAUSE_CAP)</div><div class='add'>+				{</div><div class='add'>+					pause_flags |=  NV_PAUSEFRAME_RX_ENABLE;</div><div class='add'>+					if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_REQ)</div><div class='add'>+						pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='add'>+				}</div><div class='add'>+				if (lpa_pause == LPA_PAUSE_ASYM)</div><div class='add'>+				{</div><div class='add'>+					pause_flags |= NV_PAUSEFRAME_RX_ENABLE;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			pause_flags = np-&gt;pause_flags;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	nv_update_pause(dev, pause_flags);</div><div class='add'>+</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2090,7 +2375,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 		spin_lock(&amp;np-&gt;lock);</div><div class='ctx'> 		nv_tx_done(dev);</div><div class='ctx'> 		spin_unlock(&amp;np-&gt;lock);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		nv_rx_process(dev);</div><div class='ctx'> 		if (nv_alloc_rx(dev)) {</div><div class='ctx'> 			spin_lock(&amp;np-&gt;lock);</div><div class='hunk'>@@ -2098,7 +2383,7 @@ static irqreturn_t nv_nic_irq(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 				mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='ctx'> 			spin_unlock(&amp;np-&gt;lock);</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if (events &amp; NVREG_IRQ_LINK) {</div><div class='ctx'> 			spin_lock(&amp;np-&gt;lock);</div><div class='ctx'> 			nv_link_irq(dev);</div><div class='hunk'>@@ -2163,7 +2448,7 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 		spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 		nv_tx_done(dev);</div><div class='ctx'> 		spin_unlock_irq(&amp;np-&gt;lock);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if (events &amp; (NVREG_IRQ_TX_ERR)) {</div><div class='ctx'> 			dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n",</div><div class='ctx'> 						dev-&gt;name, events);</div><div class='hunk'>@@ -2206,7 +2491,7 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 		dprintk(KERN_DEBUG "%s: rx irq: %08x\n", dev-&gt;name, events);</div><div class='ctx'> 		if (!(events &amp; np-&gt;irqmask))</div><div class='ctx'> 			break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		nv_rx_process(dev);</div><div class='ctx'> 		if (nv_alloc_rx(dev)) {</div><div class='ctx'> 			spin_lock_irq(&amp;np-&gt;lock);</div><div class='hunk'>@@ -2214,7 +2499,7 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 				mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='ctx'> 			spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if (i &gt; max_interrupt_work) {</div><div class='ctx'> 			spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 			/* disable interrupts on the nic */</div><div class='hunk'>@@ -2253,7 +2538,7 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 		dprintk(KERN_DEBUG "%s: irq: %08x\n", dev-&gt;name, events);</div><div class='ctx'> 		if (!(events &amp; np-&gt;irqmask))</div><div class='ctx'> 			break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if (events &amp; NVREG_IRQ_LINK) {</div><div class='ctx'> 			spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 			nv_link_irq(dev);</div><div class='hunk'>@@ -2290,6 +2575,175 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> 	return IRQ_RETVAL(i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static irqreturn_t nv_nic_irq_test(int foo, void *data, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *) data;</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	u32 events;</div><div class='add'>+</div><div class='add'>+	dprintk(KERN_DEBUG "%s: nv_nic_irq_test\n", dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (!(np-&gt;msi_flags &amp; NV_MSI_X_ENABLED)) {</div><div class='add'>+		events = readl(base + NvRegIrqStatus) &amp; NVREG_IRQSTAT_MASK;</div><div class='add'>+		writel(NVREG_IRQ_TIMER, base + NvRegIrqStatus);</div><div class='add'>+	} else {</div><div class='add'>+		events = readl(base + NvRegMSIXIrqStatus) &amp; NVREG_IRQSTAT_MASK;</div><div class='add'>+		writel(NVREG_IRQ_TIMER, base + NvRegMSIXIrqStatus);</div><div class='add'>+	}</div><div class='add'>+	pci_push(base);</div><div class='add'>+	dprintk(KERN_DEBUG "%s: irq: %08x\n", dev-&gt;name, events);</div><div class='add'>+	if (!(events &amp; NVREG_IRQ_TIMER))</div><div class='add'>+		return IRQ_RETVAL(0);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;np-&gt;lock);</div><div class='add'>+	np-&gt;intr_test = 1;</div><div class='add'>+	spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dprintk(KERN_DEBUG "%s: nv_nic_irq_test completed\n", dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return IRQ_RETVAL(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_msix_vector_map(struct net_device *dev, u32 vector, u32 irqmask)</div><div class='add'>+{</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	int i;</div><div class='add'>+	u32 msixmap = 0;</div><div class='add'>+</div><div class='add'>+	/* Each interrupt bit can be mapped to a MSIX vector (4 bits).</div><div class='add'>+	 * MSIXMap0 represents the first 8 interrupts and MSIXMap1 represents</div><div class='add'>+	 * the remaining 8 interrupts.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if ((irqmask &gt;&gt; i) &amp; 0x1) {</div><div class='add'>+			msixmap |= vector &lt;&lt; (i &lt;&lt; 2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	writel(readl(base + NvRegMSIXMap0) | msixmap, base + NvRegMSIXMap0);</div><div class='add'>+</div><div class='add'>+	msixmap = 0;</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if ((irqmask &gt;&gt; (i + 8)) &amp; 0x1) {</div><div class='add'>+			msixmap |= vector &lt;&lt; (i &lt;&lt; 2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	writel(readl(base + NvRegMSIXMap1) | msixmap, base + NvRegMSIXMap1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_request_irq(struct net_device *dev, int intr_test)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = get_nvpriv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	int ret = 1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (np-&gt;msi_flags &amp; NV_MSI_X_CAPABLE) {</div><div class='add'>+		for (i = 0; i &lt; (np-&gt;msi_flags &amp; NV_MSI_X_VECTORS_MASK); i++) {</div><div class='add'>+			np-&gt;msi_x_entry[i].entry = i;</div><div class='add'>+		}</div><div class='add'>+		if ((ret = pci_enable_msix(np-&gt;pci_dev, np-&gt;msi_x_entry, (np-&gt;msi_flags &amp; NV_MSI_X_VECTORS_MASK))) == 0) {</div><div class='add'>+			np-&gt;msi_flags |= NV_MSI_X_ENABLED;</div><div class='add'>+			if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT &amp;&amp; !intr_test) {</div><div class='add'>+				/* Request irq for rx handling */</div><div class='add'>+				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector, &amp;nv_nic_irq_rx, IRQF_SHARED, dev-&gt;name, dev) != 0) {</div><div class='add'>+					printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);</div><div class='add'>+					pci_disable_msix(np-&gt;pci_dev);</div><div class='add'>+					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='add'>+					goto out_err;</div><div class='add'>+				}</div><div class='add'>+				/* Request irq for tx handling */</div><div class='add'>+				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector, &amp;nv_nic_irq_tx, IRQF_SHARED, dev-&gt;name, dev) != 0) {</div><div class='add'>+					printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);</div><div class='add'>+					pci_disable_msix(np-&gt;pci_dev);</div><div class='add'>+					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='add'>+					goto out_free_rx;</div><div class='add'>+				}</div><div class='add'>+				/* Request irq for link and timer handling */</div><div class='add'>+				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, &amp;nv_nic_irq_other, IRQF_SHARED, dev-&gt;name, dev) != 0) {</div><div class='add'>+					printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);</div><div class='add'>+					pci_disable_msix(np-&gt;pci_dev);</div><div class='add'>+					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='add'>+					goto out_free_tx;</div><div class='add'>+				}</div><div class='add'>+				/* map interrupts to their respective vector */</div><div class='add'>+				writel(0, base + NvRegMSIXMap0);</div><div class='add'>+				writel(0, base + NvRegMSIXMap1);</div><div class='add'>+				set_msix_vector_map(dev, NV_MSI_X_VECTOR_RX, NVREG_IRQ_RX_ALL);</div><div class='add'>+				set_msix_vector_map(dev, NV_MSI_X_VECTOR_TX, NVREG_IRQ_TX_ALL);</div><div class='add'>+				set_msix_vector_map(dev, NV_MSI_X_VECTOR_OTHER, NVREG_IRQ_OTHER);</div><div class='add'>+			} else {</div><div class='add'>+				/* Request irq for all interrupts */</div><div class='add'>+				if ((!intr_test &amp;&amp;</div><div class='add'>+				     request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &amp;nv_nic_irq, IRQF_SHARED, dev-&gt;name, dev) != 0) ||</div><div class='add'>+				    (intr_test &amp;&amp;</div><div class='add'>+				     request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &amp;nv_nic_irq_test, IRQF_SHARED, dev-&gt;name, dev) != 0)) {</div><div class='add'>+					printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);</div><div class='add'>+					pci_disable_msix(np-&gt;pci_dev);</div><div class='add'>+					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='add'>+					goto out_err;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* map interrupts to vector 0 */</div><div class='add'>+				writel(0, base + NvRegMSIXMap0);</div><div class='add'>+				writel(0, base + NvRegMSIXMap1);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ret != 0 &amp;&amp; np-&gt;msi_flags &amp; NV_MSI_CAPABLE) {</div><div class='add'>+		if ((ret = pci_enable_msi(np-&gt;pci_dev)) == 0) {</div><div class='add'>+			np-&gt;msi_flags |= NV_MSI_ENABLED;</div><div class='add'>+			if ((!intr_test &amp;&amp; request_irq(np-&gt;pci_dev-&gt;irq, &amp;nv_nic_irq, IRQF_SHARED, dev-&gt;name, dev) != 0) ||</div><div class='add'>+			    (intr_test &amp;&amp; request_irq(np-&gt;pci_dev-&gt;irq, &amp;nv_nic_irq_test, IRQF_SHARED, dev-&gt;name, dev) != 0)) {</div><div class='add'>+				printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);</div><div class='add'>+				pci_disable_msi(np-&gt;pci_dev);</div><div class='add'>+				np-&gt;msi_flags &amp;= ~NV_MSI_ENABLED;</div><div class='add'>+				goto out_err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* map interrupts to vector 0 */</div><div class='add'>+			writel(0, base + NvRegMSIMap0);</div><div class='add'>+			writel(0, base + NvRegMSIMap1);</div><div class='add'>+			/* enable msi vector 0 */</div><div class='add'>+			writel(NVREG_MSI_VECTOR_0_ENABLED, base + NvRegMSIIrqMask);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		if ((!intr_test &amp;&amp; request_irq(np-&gt;pci_dev-&gt;irq, &amp;nv_nic_irq, IRQF_SHARED, dev-&gt;name, dev) != 0) ||</div><div class='add'>+		    (intr_test &amp;&amp; request_irq(np-&gt;pci_dev-&gt;irq, &amp;nv_nic_irq_test, IRQF_SHARED, dev-&gt;name, dev) != 0))</div><div class='add'>+			goto out_err;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out_free_tx:</div><div class='add'>+	free_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector, dev);</div><div class='add'>+out_free_rx:</div><div class='add'>+	free_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector, dev);</div><div class='add'>+out_err:</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_free_irq(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = get_nvpriv(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (np-&gt;msi_flags &amp; NV_MSI_X_ENABLED) {</div><div class='add'>+		for (i = 0; i &lt; (np-&gt;msi_flags &amp; NV_MSI_X_VECTORS_MASK); i++) {</div><div class='add'>+			free_irq(np-&gt;msi_x_entry[i].vector, dev);</div><div class='add'>+		}</div><div class='add'>+		pci_disable_msix(np-&gt;pci_dev);</div><div class='add'>+		np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='add'>+	} else {</div><div class='add'>+		free_irq(np-&gt;pci_dev-&gt;irq, dev);</div><div class='add'>+		if (np-&gt;msi_flags &amp; NV_MSI_ENABLED) {</div><div class='add'>+			pci_disable_msi(np-&gt;pci_dev);</div><div class='add'>+			np-&gt;msi_flags &amp;= ~NV_MSI_ENABLED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nv_do_nic_poll(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = (struct net_device *) data;</div><div class='hunk'>@@ -2305,49 +2759,49 @@ static void nv_do_nic_poll(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	if (!using_multi_irqs(dev)) {</div><div class='ctx'> 		if (np-&gt;msi_flags &amp; NV_MSI_X_ENABLED)</div><div class='del'>-			disable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);</div><div class='add'>+			disable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);</div><div class='ctx'> 		else</div><div class='del'>-			disable_irq(dev-&gt;irq);</div><div class='add'>+			disable_irq_lockdep(dev-&gt;irq);</div><div class='ctx'> 		mask = np-&gt;irqmask;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (np-&gt;nic_poll_irq &amp; NVREG_IRQ_RX_ALL) {</div><div class='del'>-			disable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector);</div><div class='add'>+			disable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector);</div><div class='ctx'> 			mask |= NVREG_IRQ_RX_ALL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (np-&gt;nic_poll_irq &amp; NVREG_IRQ_TX_ALL) {</div><div class='del'>-			disable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector);</div><div class='add'>+			disable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector);</div><div class='ctx'> 			mask |= NVREG_IRQ_TX_ALL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (np-&gt;nic_poll_irq &amp; NVREG_IRQ_OTHER) {</div><div class='del'>-			disable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);</div><div class='add'>+			disable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);</div><div class='ctx'> 			mask |= NVREG_IRQ_OTHER;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	np-&gt;nic_poll_irq = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Do we need synchronize_irq(dev-&gt;irq) here? */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	writel(mask, base + NvRegIrqMask);</div><div class='ctx'> 	pci_push(base);</div><div class='ctx'> </div><div class='ctx'> 	if (!using_multi_irqs(dev)) {</div><div class='del'>-		nv_nic_irq((int) 0, (void *) data, (struct pt_regs *) NULL);</div><div class='add'>+		nv_nic_irq(0, dev, NULL);</div><div class='ctx'> 		if (np-&gt;msi_flags &amp; NV_MSI_X_ENABLED)</div><div class='del'>-			enable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);</div><div class='add'>+			enable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);</div><div class='ctx'> 		else</div><div class='del'>-			enable_irq(dev-&gt;irq);</div><div class='add'>+			enable_irq_lockdep(dev-&gt;irq);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (np-&gt;nic_poll_irq &amp; NVREG_IRQ_RX_ALL) {</div><div class='del'>-			nv_nic_irq_rx((int) 0, (void *) data, (struct pt_regs *) NULL);</div><div class='del'>-			enable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector);</div><div class='add'>+			nv_nic_irq_rx(0, dev, NULL);</div><div class='add'>+			enable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (np-&gt;nic_poll_irq &amp; NVREG_IRQ_TX_ALL) {</div><div class='del'>-			nv_nic_irq_tx((int) 0, (void *) data, (struct pt_regs *) NULL);</div><div class='del'>-			enable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector);</div><div class='add'>+			nv_nic_irq_tx(0, dev, NULL);</div><div class='add'>+			enable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (np-&gt;nic_poll_irq &amp; NVREG_IRQ_OTHER) {</div><div class='del'>-			nv_nic_irq_other((int) 0, (void *) data, (struct pt_regs *) NULL);</div><div class='del'>-			enable_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);</div><div class='add'>+			nv_nic_irq_other(0, dev, NULL);</div><div class='add'>+			enable_irq_lockdep(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2359,6 +2813,56 @@ static void nv_poll_controller(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void nv_do_stats_poll(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *) data;</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+</div><div class='add'>+	np-&gt;estats.tx_bytes += readl(base + NvRegTxCnt);</div><div class='add'>+	np-&gt;estats.tx_zero_rexmt += readl(base + NvRegTxZeroReXmt);</div><div class='add'>+	np-&gt;estats.tx_one_rexmt += readl(base + NvRegTxOneReXmt);</div><div class='add'>+	np-&gt;estats.tx_many_rexmt += readl(base + NvRegTxManyReXmt);</div><div class='add'>+	np-&gt;estats.tx_late_collision += readl(base + NvRegTxLateCol);</div><div class='add'>+	np-&gt;estats.tx_fifo_errors += readl(base + NvRegTxUnderflow);</div><div class='add'>+	np-&gt;estats.tx_carrier_errors += readl(base + NvRegTxLossCarrier);</div><div class='add'>+	np-&gt;estats.tx_excess_deferral += readl(base + NvRegTxExcessDef);</div><div class='add'>+	np-&gt;estats.tx_retry_error += readl(base + NvRegTxRetryErr);</div><div class='add'>+	np-&gt;estats.tx_deferral += readl(base + NvRegTxDef);</div><div class='add'>+	np-&gt;estats.tx_packets += readl(base + NvRegTxFrame);</div><div class='add'>+	np-&gt;estats.tx_pause += readl(base + NvRegTxPause);</div><div class='add'>+	np-&gt;estats.rx_frame_error += readl(base + NvRegRxFrameErr);</div><div class='add'>+	np-&gt;estats.rx_extra_byte += readl(base + NvRegRxExtraByte);</div><div class='add'>+	np-&gt;estats.rx_late_collision += readl(base + NvRegRxLateCol);</div><div class='add'>+	np-&gt;estats.rx_runt += readl(base + NvRegRxRunt);</div><div class='add'>+	np-&gt;estats.rx_frame_too_long += readl(base + NvRegRxFrameTooLong);</div><div class='add'>+	np-&gt;estats.rx_over_errors += readl(base + NvRegRxOverflow);</div><div class='add'>+	np-&gt;estats.rx_crc_errors += readl(base + NvRegRxFCSErr);</div><div class='add'>+	np-&gt;estats.rx_frame_align_error += readl(base + NvRegRxFrameAlignErr);</div><div class='add'>+	np-&gt;estats.rx_length_error += readl(base + NvRegRxLenErr);</div><div class='add'>+	np-&gt;estats.rx_unicast += readl(base + NvRegRxUnicast);</div><div class='add'>+	np-&gt;estats.rx_multicast += readl(base + NvRegRxMulticast);</div><div class='add'>+	np-&gt;estats.rx_broadcast += readl(base + NvRegRxBroadcast);</div><div class='add'>+	np-&gt;estats.rx_bytes += readl(base + NvRegRxCnt);</div><div class='add'>+	np-&gt;estats.rx_pause += readl(base + NvRegRxPause);</div><div class='add'>+	np-&gt;estats.rx_drop_frame += readl(base + NvRegRxDropFrame);</div><div class='add'>+	np-&gt;estats.rx_packets =</div><div class='add'>+		np-&gt;estats.rx_unicast +</div><div class='add'>+		np-&gt;estats.rx_multicast +</div><div class='add'>+		np-&gt;estats.rx_broadcast;</div><div class='add'>+	np-&gt;estats.rx_errors_total =</div><div class='add'>+		np-&gt;estats.rx_crc_errors +</div><div class='add'>+		np-&gt;estats.rx_over_errors +</div><div class='add'>+		np-&gt;estats.rx_frame_error +</div><div class='add'>+		(np-&gt;estats.rx_frame_align_error - np-&gt;estats.rx_extra_byte) +</div><div class='add'>+		np-&gt;estats.rx_late_collision +</div><div class='add'>+		np-&gt;estats.rx_runt +</div><div class='add'>+		np-&gt;estats.rx_frame_too_long;</div><div class='add'>+</div><div class='add'>+	if (!np-&gt;in_shutdown)</div><div class='add'>+		mod_timer(&amp;np-&gt;stats_poll, jiffies + STATS_INTERVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='hunk'>@@ -2382,17 +2886,19 @@ static int nv_set_wol(struct net_device *dev, struct ethtool_wolinfo *wolinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	u32 flags = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 	if (wolinfo-&gt;wolopts == 0) {</div><div class='del'>-		writel(0, base + NvRegWakeUpFlags);</div><div class='ctx'> 		np-&gt;wolenabled = 0;</div><div class='del'>-	}</div><div class='del'>-	if (wolinfo-&gt;wolopts &amp; WAKE_MAGIC) {</div><div class='del'>-		writel(NVREG_WAKEUPFLAGS_ENABLE, base + NvRegWakeUpFlags);</div><div class='add'>+	} else if (wolinfo-&gt;wolopts &amp; WAKE_MAGIC) {</div><div class='ctx'> 		np-&gt;wolenabled = 1;</div><div class='add'>+		flags = NVREG_WAKEUPFLAGS_ENABLE;</div><div class='add'>+	}</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+		writel(flags, base + NvRegWakeUpFlags);</div><div class='add'>+		spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2406,9 +2912,17 @@ static int nv_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		/* We do not track link speed / duplex setting if the</div><div class='ctx'> 		 * interface is disabled. Force a link check */</div><div class='del'>-		nv_update_linkspeed(dev);</div><div class='add'>+		if (nv_update_linkspeed(dev)) {</div><div class='add'>+			if (!netif_carrier_ok(dev))</div><div class='add'>+				netif_carrier_on(dev);</div><div class='add'>+		} else {</div><div class='add'>+			if (netif_carrier_ok(dev))</div><div class='add'>+				netif_carrier_off(dev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	switch(np-&gt;linkspeed &amp; (NVREG_LINKSPEED_MASK)) {</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(dev)) {</div><div class='add'>+		switch(np-&gt;linkspeed &amp; (NVREG_LINKSPEED_MASK)) {</div><div class='ctx'> 		case NVREG_LINKSPEED_10:</div><div class='ctx'> 			ecmd-&gt;speed = SPEED_10;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2418,10 +2932,14 @@ static int nv_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		case NVREG_LINKSPEED_1000:</div><div class='ctx'> 			ecmd-&gt;speed = SPEED_1000;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='add'>+		ecmd-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+		if (np-&gt;duplex)</div><div class='add'>+			ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	} else {</div><div class='add'>+		ecmd-&gt;speed = -1;</div><div class='add'>+		ecmd-&gt;duplex = -1;</div><div class='ctx'> 	}</div><div class='del'>-	ecmd-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-	if (np-&gt;duplex)</div><div class='del'>-		ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> </div><div class='ctx'> 	ecmd-&gt;autoneg = np-&gt;autoneg;</div><div class='ctx'> </div><div class='hunk'>@@ -2429,23 +2947,20 @@ static int nv_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	if (np-&gt;autoneg) {</div><div class='ctx'> 		ecmd-&gt;advertising |= ADVERTISED_Autoneg;</div><div class='ctx'> 		adv = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='del'>-	} else {</div><div class='del'>-		adv = np-&gt;fixed_mode;</div><div class='del'>-	}</div><div class='del'>-	if (adv &amp; ADVERTISE_10HALF)</div><div class='del'>-		ecmd-&gt;advertising |= ADVERTISED_10baseT_Half;</div><div class='del'>-	if (adv &amp; ADVERTISE_10FULL)</div><div class='del'>-		ecmd-&gt;advertising |= ADVERTISED_10baseT_Full;</div><div class='del'>-	if (adv &amp; ADVERTISE_100HALF)</div><div class='del'>-		ecmd-&gt;advertising |= ADVERTISED_100baseT_Half;</div><div class='del'>-	if (adv &amp; ADVERTISE_100FULL)</div><div class='del'>-		ecmd-&gt;advertising |= ADVERTISED_100baseT_Full;</div><div class='del'>-	if (np-&gt;autoneg &amp;&amp; np-&gt;gigabit == PHY_GIGABIT) {</div><div class='del'>-		adv = mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, MII_READ);</div><div class='del'>-		if (adv &amp; ADVERTISE_1000FULL)</div><div class='del'>-			ecmd-&gt;advertising |= ADVERTISED_1000baseT_Full;</div><div class='add'>+		if (adv &amp; ADVERTISE_10HALF)</div><div class='add'>+			ecmd-&gt;advertising |= ADVERTISED_10baseT_Half;</div><div class='add'>+		if (adv &amp; ADVERTISE_10FULL)</div><div class='add'>+			ecmd-&gt;advertising |= ADVERTISED_10baseT_Full;</div><div class='add'>+		if (adv &amp; ADVERTISE_100HALF)</div><div class='add'>+			ecmd-&gt;advertising |= ADVERTISED_100baseT_Half;</div><div class='add'>+		if (adv &amp; ADVERTISE_100FULL)</div><div class='add'>+			ecmd-&gt;advertising |= ADVERTISED_100baseT_Full;</div><div class='add'>+		if (np-&gt;gigabit == PHY_GIGABIT) {</div><div class='add'>+			adv = mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, MII_READ);</div><div class='add'>+			if (adv &amp; ADVERTISE_1000FULL)</div><div class='add'>+				ecmd-&gt;advertising |= ADVERTISED_1000baseT_Full;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	ecmd-&gt;supported = (SUPPORTED_Autoneg |</div><div class='ctx'> 		SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |</div><div class='ctx'> 		SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |</div><div class='hunk'>@@ -2497,7 +3012,18 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		nv_disable_irq(dev);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock(&amp;np-&gt;lock);</div><div class='add'>+		/* stop engines */</div><div class='add'>+		nv_stop_rx(dev);</div><div class='add'>+		nv_stop_tx(dev);</div><div class='add'>+		spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ecmd-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 		int adv, bmcr;</div><div class='ctx'> </div><div class='hunk'>@@ -2505,7 +3031,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> </div><div class='ctx'> 		/* advertise only what has been requested */</div><div class='ctx'> 		adv = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='del'>-		adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);</div><div class='add'>+		adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='ctx'> 		if (ecmd-&gt;advertising &amp; ADVERTISED_10baseT_Half)</div><div class='ctx'> 			adv |= ADVERTISE_10HALF;</div><div class='ctx'> 		if (ecmd-&gt;advertising &amp; ADVERTISED_10baseT_Full)</div><div class='hunk'>@@ -2514,16 +3040,22 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 			adv |= ADVERTISE_100HALF;</div><div class='ctx'> 		if (ecmd-&gt;advertising &amp; ADVERTISED_100baseT_Full)</div><div class='ctx'> 			adv |= ADVERTISE_100FULL;</div><div class='add'>+		if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_RX_REQ)  /* for rx we set both advertisments but disable tx pause */</div><div class='add'>+			adv |=  ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='add'>+		if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_REQ)</div><div class='add'>+			adv |=  ADVERTISE_PAUSE_ASYM;</div><div class='ctx'> 		mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, adv);</div><div class='ctx'> </div><div class='ctx'> 		if (np-&gt;gigabit == PHY_GIGABIT) {</div><div class='del'>-			adv = mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, MII_READ);</div><div class='add'>+			adv = mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, MII_READ);</div><div class='ctx'> 			adv &amp;= ~ADVERTISE_1000FULL;</div><div class='ctx'> 			if (ecmd-&gt;advertising &amp; ADVERTISED_1000baseT_Full)</div><div class='ctx'> 				adv |= ADVERTISE_1000FULL;</div><div class='del'>-			mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, adv);</div><div class='add'>+			mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, adv);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (netif_running(dev))</div><div class='add'>+			printk(KERN_INFO "%s: link down.\n", dev-&gt;name);</div><div class='ctx'> 		bmcr = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='ctx'> 		bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);</div><div class='ctx'> 		mii_rw(dev, np-&gt;phyaddr, MII_BMCR, bmcr);</div><div class='hunk'>@@ -2534,7 +3066,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		np-&gt;autoneg = 0;</div><div class='ctx'> </div><div class='ctx'> 		adv = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='del'>-		adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);</div><div class='add'>+		adv &amp;= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='ctx'> 		if (ecmd-&gt;speed == SPEED_10 &amp;&amp; ecmd-&gt;duplex == DUPLEX_HALF)</div><div class='ctx'> 			adv |= ADVERTISE_10HALF;</div><div class='ctx'> 		if (ecmd-&gt;speed == SPEED_10 &amp;&amp; ecmd-&gt;duplex == DUPLEX_FULL)</div><div class='hunk'>@@ -2543,30 +3075,49 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 			adv |= ADVERTISE_100HALF;</div><div class='ctx'> 		if (ecmd-&gt;speed == SPEED_100 &amp;&amp; ecmd-&gt;duplex == DUPLEX_FULL)</div><div class='ctx'> 			adv |= ADVERTISE_100FULL;</div><div class='add'>+		np-&gt;pause_flags &amp;= ~(NV_PAUSEFRAME_AUTONEG|NV_PAUSEFRAME_RX_ENABLE|NV_PAUSEFRAME_TX_ENABLE);</div><div class='add'>+		if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_RX_REQ) {/* for rx we set both advertisments but disable tx pause */</div><div class='add'>+			adv |=  ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='add'>+			np-&gt;pause_flags |= NV_PAUSEFRAME_RX_ENABLE;</div><div class='add'>+		}</div><div class='add'>+		if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_REQ) {</div><div class='add'>+			adv |=  ADVERTISE_PAUSE_ASYM;</div><div class='add'>+			np-&gt;pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='add'>+		}</div><div class='ctx'> 		mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, adv);</div><div class='ctx'> 		np-&gt;fixed_mode = adv;</div><div class='ctx'> </div><div class='ctx'> 		if (np-&gt;gigabit == PHY_GIGABIT) {</div><div class='del'>-			adv = mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, MII_READ);</div><div class='add'>+			adv = mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, MII_READ);</div><div class='ctx'> 			adv &amp;= ~ADVERTISE_1000FULL;</div><div class='del'>-			mii_rw(dev, np-&gt;phyaddr, MII_1000BT_CR, adv);</div><div class='add'>+			mii_rw(dev, np-&gt;phyaddr, MII_CTRL1000, adv);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bmcr = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='del'>-		bmcr |= ~(BMCR_ANENABLE|BMCR_SPEED100|BMCR_FULLDPLX);</div><div class='del'>-		if (adv &amp; (ADVERTISE_10FULL|ADVERTISE_100FULL))</div><div class='add'>+		bmcr &amp;= ~(BMCR_ANENABLE|BMCR_SPEED100|BMCR_SPEED1000|BMCR_FULLDPLX);</div><div class='add'>+		if (np-&gt;fixed_mode &amp; (ADVERTISE_10FULL|ADVERTISE_100FULL))</div><div class='ctx'> 			bmcr |= BMCR_FULLDPLX;</div><div class='del'>-		if (adv &amp; (ADVERTISE_100HALF|ADVERTISE_100FULL))</div><div class='add'>+		if (np-&gt;fixed_mode &amp; (ADVERTISE_100HALF|ADVERTISE_100FULL))</div><div class='ctx'> 			bmcr |= BMCR_SPEED100;</div><div class='ctx'> 		mii_rw(dev, np-&gt;phyaddr, MII_BMCR, bmcr);</div><div class='del'>-</div><div class='del'>-		if (netif_running(dev)) {</div><div class='add'>+		if (np-&gt;phy_oui == PHY_OUI_MARVELL) {</div><div class='add'>+			/* reset the phy */</div><div class='add'>+			if (phy_reset(dev)) {</div><div class='add'>+				printk(KERN_INFO "%s: phy reset failed\n", dev-&gt;name);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		} else if (netif_running(dev)) {</div><div class='ctx'> 			/* Wait a bit and then reconfigure the nic. */</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 			nv_linkchange(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		nv_start_rx(dev);</div><div class='add'>+		nv_start_tx(dev);</div><div class='add'>+		nv_enable_irq(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2598,196 +3149,742 @@ static int nv_nway_reset(struct net_device *dev)</div><div class='ctx'> 	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 	if (np-&gt;autoneg) {</div><div class='ctx'> 		int bmcr;</div><div class='ctx'> </div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+		if (netif_running(dev)) {</div><div class='add'>+			nv_disable_irq(dev);</div><div class='add'>+			netif_tx_lock_bh(dev);</div><div class='add'>+			spin_lock(&amp;np-&gt;lock);</div><div class='add'>+			/* stop engines */</div><div class='add'>+			nv_stop_rx(dev);</div><div class='add'>+			nv_stop_tx(dev);</div><div class='add'>+			spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+			netif_tx_unlock_bh(dev);</div><div class='add'>+			printk(KERN_INFO "%s: link down.\n", dev-&gt;name);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		bmcr = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='ctx'> 		bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);</div><div class='ctx'> 		mii_rw(dev, np-&gt;phyaddr, MII_BMCR, bmcr);</div><div class='ctx'> </div><div class='add'>+		if (netif_running(dev)) {</div><div class='add'>+			nv_start_rx(dev);</div><div class='add'>+			nv_start_tx(dev);</div><div class='add'>+			nv_enable_irq(dev);</div><div class='add'>+		}</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ethtool_ops ops = {</div><div class='del'>-	.get_drvinfo = nv_get_drvinfo,</div><div class='del'>-	.get_link = ethtool_op_get_link,</div><div class='del'>-	.get_wol = nv_get_wol,</div><div class='del'>-	.set_wol = nv_set_wol,</div><div class='del'>-	.get_settings = nv_get_settings,</div><div class='del'>-	.set_settings = nv_set_settings,</div><div class='del'>-	.get_regs_len = nv_get_regs_len,</div><div class='del'>-	.get_regs = nv_get_regs,</div><div class='del'>-	.nway_reset = nv_nway_reset,</div><div class='del'>-	.get_perm_addr = ethtool_op_get_perm_addr,</div><div class='del'>-};</div><div class='add'>+static int nv_set_tso(struct net_device *dev, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)</div><div class='add'>+	if ((np-&gt;driver_data &amp; DEV_HAS_CHECKSUM))</div><div class='add'>+		return ethtool_op_set_tso(dev, value);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_get_ringparam(struct net_device *dev, struct ethtool_ringparam* ring)</div><div class='ctx'> {</div><div class='del'>-	struct fe_priv *np = get_nvpriv(dev);</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+	ring-&gt;rx_max_pending = (np-&gt;desc_ver == DESC_VER_1) ? RING_MAX_DESC_VER_1 : RING_MAX_DESC_VER_2_3;</div><div class='add'>+	ring-&gt;rx_mini_max_pending = 0;</div><div class='add'>+	ring-&gt;rx_jumbo_max_pending = 0;</div><div class='add'>+	ring-&gt;tx_max_pending = (np-&gt;desc_ver == DESC_VER_1) ? RING_MAX_DESC_VER_1 : RING_MAX_DESC_VER_2_3;</div><div class='ctx'> </div><div class='del'>-	/* save vlan group */</div><div class='del'>-	np-&gt;vlangrp = grp;</div><div class='add'>+	ring-&gt;rx_pending = np-&gt;rx_ring_size;</div><div class='add'>+	ring-&gt;rx_mini_pending = 0;</div><div class='add'>+	ring-&gt;rx_jumbo_pending = 0;</div><div class='add'>+	ring-&gt;tx_pending = np-&gt;tx_ring_size;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (grp) {</div><div class='del'>-		/* enable vlan on MAC */</div><div class='del'>-		np-&gt;txrxctl_bits |= NVREG_TXRXCTL_VLANSTRIP | NVREG_TXRXCTL_VLANINS;</div><div class='add'>+static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ring)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	u8 *rxtx_ring, *rx_skbuff, *tx_skbuff, *rx_dma, *tx_dma, *tx_dma_len;</div><div class='add'>+	dma_addr_t ring_addr;</div><div class='add'>+</div><div class='add'>+	if (ring-&gt;rx_pending &lt; RX_RING_MIN ||</div><div class='add'>+	    ring-&gt;tx_pending &lt; TX_RING_MIN ||</div><div class='add'>+	    ring-&gt;rx_mini_pending != 0 ||</div><div class='add'>+	    ring-&gt;rx_jumbo_pending != 0 ||</div><div class='add'>+	    (np-&gt;desc_ver == DESC_VER_1 &amp;&amp;</div><div class='add'>+	     (ring-&gt;rx_pending &gt; RING_MAX_DESC_VER_1 ||</div><div class='add'>+	      ring-&gt;tx_pending &gt; RING_MAX_DESC_VER_1)) ||</div><div class='add'>+	    (np-&gt;desc_ver != DESC_VER_1 &amp;&amp;</div><div class='add'>+	     (ring-&gt;rx_pending &gt; RING_MAX_DESC_VER_2_3 ||</div><div class='add'>+	      ring-&gt;tx_pending &gt; RING_MAX_DESC_VER_2_3))) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate new rings */</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='add'>+		rxtx_ring = pci_alloc_consistent(np-&gt;pci_dev,</div><div class='add'>+					    sizeof(struct ring_desc) * (ring-&gt;rx_pending + ring-&gt;tx_pending),</div><div class='add'>+					    &amp;ring_addr);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* disable vlan on MAC */</div><div class='del'>-		np-&gt;txrxctl_bits &amp;= ~NVREG_TXRXCTL_VLANSTRIP;</div><div class='del'>-		np-&gt;txrxctl_bits &amp;= ~NVREG_TXRXCTL_VLANINS;</div><div class='add'>+		rxtx_ring = pci_alloc_consistent(np-&gt;pci_dev,</div><div class='add'>+					    sizeof(struct ring_desc_ex) * (ring-&gt;rx_pending + ring-&gt;tx_pending),</div><div class='add'>+					    &amp;ring_addr);</div><div class='add'>+	}</div><div class='add'>+	rx_skbuff = kmalloc(sizeof(struct sk_buff*) * ring-&gt;rx_pending, GFP_KERNEL);</div><div class='add'>+	rx_dma = kmalloc(sizeof(dma_addr_t) * ring-&gt;rx_pending, GFP_KERNEL);</div><div class='add'>+	tx_skbuff = kmalloc(sizeof(struct sk_buff*) * ring-&gt;tx_pending, GFP_KERNEL);</div><div class='add'>+	tx_dma = kmalloc(sizeof(dma_addr_t) * ring-&gt;tx_pending, GFP_KERNEL);</div><div class='add'>+	tx_dma_len = kmalloc(sizeof(unsigned int) * ring-&gt;tx_pending, GFP_KERNEL);</div><div class='add'>+	if (!rxtx_ring || !rx_skbuff || !rx_dma || !tx_skbuff || !tx_dma || !tx_dma_len) {</div><div class='add'>+		/* fall back to old rings */</div><div class='add'>+		if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='add'>+			if(rxtx_ring)</div><div class='add'>+				pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc) * (ring-&gt;rx_pending + ring-&gt;tx_pending),</div><div class='add'>+						    rxtx_ring, ring_addr);</div><div class='add'>+		} else {</div><div class='add'>+			if (rxtx_ring)</div><div class='add'>+				pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc_ex) * (ring-&gt;rx_pending + ring-&gt;tx_pending),</div><div class='add'>+						    rxtx_ring, ring_addr);</div><div class='add'>+		}</div><div class='add'>+		if (rx_skbuff)</div><div class='add'>+			kfree(rx_skbuff);</div><div class='add'>+		if (rx_dma)</div><div class='add'>+			kfree(rx_dma);</div><div class='add'>+		if (tx_skbuff)</div><div class='add'>+			kfree(tx_skbuff);</div><div class='add'>+		if (tx_dma)</div><div class='add'>+			kfree(tx_dma);</div><div class='add'>+		if (tx_dma_len)</div><div class='add'>+			kfree(tx_dma_len);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	writel(np-&gt;txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		nv_disable_irq(dev);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock(&amp;np-&gt;lock);</div><div class='add'>+		/* stop engines */</div><div class='add'>+		nv_stop_rx(dev);</div><div class='add'>+		nv_stop_tx(dev);</div><div class='add'>+		nv_txrx_reset(dev);</div><div class='add'>+		/* drain queues */</div><div class='add'>+		nv_drain_rx(dev);</div><div class='add'>+		nv_drain_tx(dev);</div><div class='add'>+		/* delete queues */</div><div class='add'>+		free_rings(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='del'>-};</div><div class='add'>+	/* set new values */</div><div class='add'>+	np-&gt;rx_ring_size = ring-&gt;rx_pending;</div><div class='add'>+	np-&gt;tx_ring_size = ring-&gt;tx_pending;</div><div class='add'>+	np-&gt;tx_limit_stop = ring-&gt;tx_pending - TX_LIMIT_DIFFERENCE;</div><div class='add'>+	np-&gt;tx_limit_start = ring-&gt;tx_pending - TX_LIMIT_DIFFERENCE - 1;</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='add'>+		np-&gt;rx_ring.orig = (struct ring_desc*)rxtx_ring;</div><div class='add'>+		np-&gt;tx_ring.orig = &amp;np-&gt;rx_ring.orig[np-&gt;rx_ring_size];</div><div class='add'>+	} else {</div><div class='add'>+		np-&gt;rx_ring.ex = (struct ring_desc_ex*)rxtx_ring;</div><div class='add'>+		np-&gt;tx_ring.ex = &amp;np-&gt;rx_ring.ex[np-&gt;rx_ring_size];</div><div class='add'>+	}</div><div class='add'>+	np-&gt;rx_skbuff = (struct sk_buff**)rx_skbuff;</div><div class='add'>+	np-&gt;rx_dma = (dma_addr_t*)rx_dma;</div><div class='add'>+	np-&gt;tx_skbuff = (struct sk_buff**)tx_skbuff;</div><div class='add'>+	np-&gt;tx_dma = (dma_addr_t*)tx_dma;</div><div class='add'>+	np-&gt;tx_dma_len = (unsigned int*)tx_dma_len;</div><div class='add'>+	np-&gt;ring_addr = ring_addr;</div><div class='add'>+</div><div class='add'>+	memset(np-&gt;rx_skbuff, 0, sizeof(struct sk_buff*) * np-&gt;rx_ring_size);</div><div class='add'>+	memset(np-&gt;rx_dma, 0, sizeof(dma_addr_t) * np-&gt;rx_ring_size);</div><div class='add'>+	memset(np-&gt;tx_skbuff, 0, sizeof(struct sk_buff*) * np-&gt;tx_ring_size);</div><div class='add'>+	memset(np-&gt;tx_dma, 0, sizeof(dma_addr_t) * np-&gt;tx_ring_size);</div><div class='add'>+	memset(np-&gt;tx_dma_len, 0, sizeof(unsigned int) * np-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='del'>-static void nv_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		/* reinit driver view of the queues */</div><div class='add'>+		set_bufsize(dev);</div><div class='add'>+		if (nv_init_ring(dev)) {</div><div class='add'>+			if (!np-&gt;in_shutdown)</div><div class='add'>+				mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* reinit nic view of the queues */</div><div class='add'>+		writel(np-&gt;rx_buf_sz, base + NvRegOffloadConfig);</div><div class='add'>+		setup_hw_rings(dev, NV_SETUP_RX_RING | NV_SETUP_TX_RING);</div><div class='add'>+		writel( ((np-&gt;rx_ring_size-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((np-&gt;tx_ring_size-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='add'>+			base + NvRegRingSizes);</div><div class='add'>+		pci_push(base);</div><div class='add'>+		writel(NVREG_TXRXCTL_KICK|np-&gt;txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);</div><div class='add'>+		pci_push(base);</div><div class='add'>+</div><div class='add'>+		/* restart engines */</div><div class='add'>+		nv_start_rx(dev);</div><div class='add'>+		nv_start_tx(dev);</div><div class='add'>+		spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='add'>+		nv_enable_irq(dev);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+exit:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam* pause)</div><div class='ctx'> {</div><div class='del'>-	/* nothing to do */</div><div class='del'>-};</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-static void set_msix_vector_map(struct net_device *dev, u32 vector, u32 irqmask)</div><div class='add'>+	pause-&gt;autoneg = (np-&gt;pause_flags &amp; NV_PAUSEFRAME_AUTONEG) != 0;</div><div class='add'>+	pause-&gt;rx_pause = (np-&gt;pause_flags &amp; NV_PAUSEFRAME_RX_ENABLE) != 0;</div><div class='add'>+	pause-&gt;tx_pause = (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_ENABLE) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam* pause)</div><div class='ctx'> {</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	int adv, bmcr;</div><div class='add'>+</div><div class='add'>+	if ((!np-&gt;autoneg &amp;&amp; np-&gt;duplex == 0) ||</div><div class='add'>+	    (np-&gt;autoneg &amp;&amp; !pause-&gt;autoneg &amp;&amp; np-&gt;duplex == 0)) {</div><div class='add'>+		printk(KERN_INFO "%s: can not set pause settings when forced link is in half duplex.\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (pause-&gt;tx_pause &amp;&amp; !(np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_CAPABLE)) {</div><div class='add'>+		printk(KERN_INFO "%s: hardware does not support tx pause frames.\n", dev-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		nv_disable_irq(dev);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='add'>+		spin_lock(&amp;np-&gt;lock);</div><div class='add'>+		/* stop engines */</div><div class='add'>+		nv_stop_rx(dev);</div><div class='add'>+		nv_stop_tx(dev);</div><div class='add'>+		spin_unlock(&amp;np-&gt;lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	np-&gt;pause_flags &amp;= ~(NV_PAUSEFRAME_RX_REQ|NV_PAUSEFRAME_TX_REQ);</div><div class='add'>+	if (pause-&gt;rx_pause)</div><div class='add'>+		np-&gt;pause_flags |= NV_PAUSEFRAME_RX_REQ;</div><div class='add'>+	if (pause-&gt;tx_pause)</div><div class='add'>+		np-&gt;pause_flags |= NV_PAUSEFRAME_TX_REQ;</div><div class='add'>+</div><div class='add'>+	if (np-&gt;autoneg &amp;&amp; pause-&gt;autoneg) {</div><div class='add'>+		np-&gt;pause_flags |= NV_PAUSEFRAME_AUTONEG;</div><div class='add'>+</div><div class='add'>+		adv = mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, MII_READ);</div><div class='add'>+		adv &amp;= ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);</div><div class='add'>+		if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisments but disable tx pause */</div><div class='add'>+			adv |=  ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='add'>+		if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_REQ)</div><div class='add'>+			adv |=  ADVERTISE_PAUSE_ASYM;</div><div class='add'>+		mii_rw(dev, np-&gt;phyaddr, MII_ADVERTISE, adv);</div><div class='add'>+</div><div class='add'>+		if (netif_running(dev))</div><div class='add'>+			printk(KERN_INFO "%s: link down.\n", dev-&gt;name);</div><div class='add'>+		bmcr = mii_rw(dev, np-&gt;phyaddr, MII_BMCR, MII_READ);</div><div class='add'>+		bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);</div><div class='add'>+		mii_rw(dev, np-&gt;phyaddr, MII_BMCR, bmcr);</div><div class='add'>+	} else {</div><div class='add'>+		np-&gt;pause_flags &amp;= ~(NV_PAUSEFRAME_AUTONEG|NV_PAUSEFRAME_RX_ENABLE|NV_PAUSEFRAME_TX_ENABLE);</div><div class='add'>+		if (pause-&gt;rx_pause)</div><div class='add'>+			np-&gt;pause_flags |= NV_PAUSEFRAME_RX_ENABLE;</div><div class='add'>+		if (pause-&gt;tx_pause)</div><div class='add'>+			np-&gt;pause_flags |= NV_PAUSEFRAME_TX_ENABLE;</div><div class='add'>+</div><div class='add'>+		if (!netif_running(dev))</div><div class='add'>+			nv_update_linkspeed(dev);</div><div class='add'>+		else</div><div class='add'>+			nv_update_pause(dev, np-&gt;pause_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		nv_start_rx(dev);</div><div class='add'>+		nv_start_tx(dev);</div><div class='add'>+		nv_enable_irq(dev);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 nv_get_rx_csum(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	return (np-&gt;txrxctl_bits &amp; NVREG_TXRXCTL_RXCHECK) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_set_rx_csum(struct net_device *dev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='del'>-	int i;</div><div class='del'>-	u32 msixmap = 0;</div><div class='add'>+	int retcode = 0;</div><div class='ctx'> </div><div class='del'>-	/* Each interrupt bit can be mapped to a MSIX vector (4 bits).</div><div class='del'>-	 * MSIXMap0 represents the first 8 interrupts and MSIXMap1 represents</div><div class='del'>-	 * the remaining 8 interrupts.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if ((irqmask &gt;&gt; i) &amp; 0x1) {</div><div class='del'>-			msixmap |= vector &lt;&lt; (i &lt;&lt; 2);</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_CHECKSUM) {</div><div class='add'>+</div><div class='add'>+		if (((np-&gt;txrxctl_bits &amp; NVREG_TXRXCTL_RXCHECK) &amp;&amp; data) ||</div><div class='add'>+		    (!(np-&gt;txrxctl_bits &amp; NVREG_TXRXCTL_RXCHECK) &amp;&amp; !data)) {</div><div class='add'>+			/* already set or unset */</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	writel(readl(base + NvRegMSIXMap0) | msixmap, base + NvRegMSIXMap0);</div><div class='ctx'> </div><div class='del'>-	msixmap = 0;</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if ((irqmask &gt;&gt; (i + 8)) &amp; 0x1) {</div><div class='del'>-			msixmap |= vector &lt;&lt; (i &lt;&lt; 2);</div><div class='add'>+		if (data) {</div><div class='add'>+			np-&gt;txrxctl_bits |= NVREG_TXRXCTL_RXCHECK;</div><div class='add'>+		} else if (!(np-&gt;vlanctl_bits &amp; NVREG_VLANCONTROL_ENABLE)) {</div><div class='add'>+			np-&gt;txrxctl_bits &amp;= ~NVREG_TXRXCTL_RXCHECK;</div><div class='add'>+		} else {</div><div class='add'>+			printk(KERN_INFO "Can not disable rx checksum if vlan is enabled\n");</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (netif_running(dev)) {</div><div class='add'>+			spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+			writel(np-&gt;txrxctl_bits, base + NvRegTxRxControl);</div><div class='add'>+			spin_unlock_irq(&amp;np-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	writel(readl(base + NvRegMSIXMap1) | msixmap, base + NvRegMSIXMap1);</div><div class='add'>+</div><div class='add'>+	return retcode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nv_request_irq(struct net_device *dev)</div><div class='add'>+static int nv_set_tx_csum(struct net_device *dev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_CHECKSUM)</div><div class='add'>+		return ethtool_op_set_tx_hw_csum(dev, data);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_set_sg(struct net_device *dev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_CHECKSUM)</div><div class='add'>+		return ethtool_op_set_sg(dev, data);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_get_stats_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_STATISTICS)</div><div class='add'>+		return (sizeof(struct nv_ethtool_stats)/sizeof(u64));</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *estats, u64 *buffer)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* update stats */</div><div class='add'>+	nv_do_stats_poll((unsigned long)dev);</div><div class='add'>+</div><div class='add'>+	memcpy(buffer, &amp;np-&gt;estats, nv_get_stats_count(dev)*sizeof(u64));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_self_test_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_TEST_EXTENDED)</div><div class='add'>+		return NV_TEST_COUNT_EXTENDED;</div><div class='add'>+	else</div><div class='add'>+		return NV_TEST_COUNT_BASE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_link_test(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	int mii_status;</div><div class='add'>+</div><div class='add'>+	mii_rw(dev, np-&gt;phyaddr, MII_BMSR, MII_READ);</div><div class='add'>+	mii_status = mii_rw(dev, np-&gt;phyaddr, MII_BMSR, MII_READ);</div><div class='add'>+</div><div class='add'>+	/* check phy link status */</div><div class='add'>+	if (!(mii_status &amp; BMSR_LSTATUS))</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_register_test(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct fe_priv *np = get_nvpriv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	int i = 0;</div><div class='add'>+	u32 orig_read, new_read;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		orig_read = readl(base + nv_registers_test[i].reg);</div><div class='add'>+</div><div class='add'>+		/* xor with mask to toggle bits */</div><div class='add'>+		orig_read ^= nv_registers_test[i].mask;</div><div class='add'>+</div><div class='add'>+		writel(orig_read, base + nv_registers_test[i].reg);</div><div class='add'>+</div><div class='add'>+		new_read = readl(base + nv_registers_test[i].reg);</div><div class='add'>+</div><div class='add'>+		if ((new_read &amp; nv_registers_test[i].mask) != (orig_read &amp; nv_registers_test[i].mask))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* restore original value */</div><div class='add'>+		orig_read ^= nv_registers_test[i].mask;</div><div class='add'>+		writel(orig_read, base + nv_registers_test[i].reg);</div><div class='add'>+</div><div class='add'>+	} while (nv_registers_test[++i].reg != 0);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_interrupt_test(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> 	u8 __iomem *base = get_hwbase(dev);</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	int i;</div><div class='add'>+	int testcnt;</div><div class='add'>+	u32 save_msi_flags, save_poll_interval = 0;</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;msi_flags &amp; NV_MSI_X_CAPABLE) {</div><div class='del'>-		for (i = 0; i &lt; (np-&gt;msi_flags &amp; NV_MSI_X_VECTORS_MASK); i++) {</div><div class='del'>-			np-&gt;msi_x_entry[i].entry = i;</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		/* free current irq */</div><div class='add'>+		nv_free_irq(dev);</div><div class='add'>+		save_poll_interval = readl(base+NvRegPollingInterval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flag to test interrupt handler */</div><div class='add'>+	np-&gt;intr_test = 0;</div><div class='add'>+</div><div class='add'>+	/* setup test irq */</div><div class='add'>+	save_msi_flags = np-&gt;msi_flags;</div><div class='add'>+	np-&gt;msi_flags &amp;= ~NV_MSI_X_VECTORS_MASK;</div><div class='add'>+	np-&gt;msi_flags |= 0x001; /* setup 1 vector */</div><div class='add'>+	if (nv_request_irq(dev, 1))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* setup timer interrupt */</div><div class='add'>+	writel(NVREG_POLL_DEFAULT_CPU, base + NvRegPollingInterval);</div><div class='add'>+	writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);</div><div class='add'>+</div><div class='add'>+	nv_enable_hw_interrupts(dev, NVREG_IRQ_TIMER);</div><div class='add'>+</div><div class='add'>+	/* wait for at least one interrupt */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* flag should be set within ISR */</div><div class='add'>+	testcnt = np-&gt;intr_test;</div><div class='add'>+	if (!testcnt)</div><div class='add'>+		ret = 2;</div><div class='add'>+</div><div class='add'>+	nv_disable_hw_interrupts(dev, NVREG_IRQ_TIMER);</div><div class='add'>+	if (!(np-&gt;msi_flags &amp; NV_MSI_X_ENABLED))</div><div class='add'>+		writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);</div><div class='add'>+	else</div><div class='add'>+		writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	nv_free_irq(dev);</div><div class='add'>+</div><div class='add'>+	np-&gt;msi_flags = save_msi_flags;</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		writel(save_poll_interval, base + NvRegPollingInterval);</div><div class='add'>+		writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);</div><div class='add'>+		/* restore original irq */</div><div class='add'>+		if (nv_request_irq(dev, 0))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_loopback_test(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	struct sk_buff *tx_skb, *rx_skb;</div><div class='add'>+	dma_addr_t test_dma_addr;</div><div class='add'>+	u32 tx_flags_extra = (np-&gt;desc_ver == DESC_VER_1 ? NV_TX_LASTPACKET : NV_TX2_LASTPACKET);</div><div class='add'>+	u32 Flags;</div><div class='add'>+	int len, i, pkt_len;</div><div class='add'>+	u8 *pkt_data;</div><div class='add'>+	u32 filter_flags = 0;</div><div class='add'>+	u32 misc1_flags = 0;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		nv_disable_irq(dev);</div><div class='add'>+		filter_flags = readl(base + NvRegPacketFilterFlags);</div><div class='add'>+		misc1_flags = readl(base + NvRegMisc1);</div><div class='add'>+	} else {</div><div class='add'>+		nv_txrx_reset(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reinit driver view of the rx queue */</div><div class='add'>+	set_bufsize(dev);</div><div class='add'>+	nv_init_ring(dev);</div><div class='add'>+</div><div class='add'>+	/* setup hardware for loopback */</div><div class='add'>+	writel(NVREG_MISC1_FORCE, base + NvRegMisc1);</div><div class='add'>+	writel(NVREG_PFF_ALWAYS | NVREG_PFF_LOOPBACK, base + NvRegPacketFilterFlags);</div><div class='add'>+</div><div class='add'>+	/* reinit nic view of the rx queue */</div><div class='add'>+	writel(np-&gt;rx_buf_sz, base + NvRegOffloadConfig);</div><div class='add'>+	setup_hw_rings(dev, NV_SETUP_RX_RING | NV_SETUP_TX_RING);</div><div class='add'>+	writel( ((np-&gt;rx_ring_size-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((np-&gt;tx_ring_size-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='add'>+		base + NvRegRingSizes);</div><div class='add'>+	pci_push(base);</div><div class='add'>+</div><div class='add'>+	/* restart rx engine */</div><div class='add'>+	nv_start_rx(dev);</div><div class='add'>+	nv_start_tx(dev);</div><div class='add'>+</div><div class='add'>+	/* setup packet for tx */</div><div class='add'>+	pkt_len = ETH_DATA_LEN;</div><div class='add'>+	tx_skb = dev_alloc_skb(pkt_len);</div><div class='add'>+	pkt_data = skb_put(tx_skb, pkt_len);</div><div class='add'>+	for (i = 0; i &lt; pkt_len; i++)</div><div class='add'>+		pkt_data[i] = (u8)(i &amp; 0xff);</div><div class='add'>+	test_dma_addr = pci_map_single(np-&gt;pci_dev, tx_skb-&gt;data,</div><div class='add'>+				       tx_skb-&gt;end-tx_skb-&gt;data, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='add'>+		np-&gt;tx_ring.orig[0].PacketBuffer = cpu_to_le32(test_dma_addr);</div><div class='add'>+		np-&gt;tx_ring.orig[0].FlagLen = cpu_to_le32((pkt_len-1) | np-&gt;tx_flags | tx_flags_extra);</div><div class='add'>+	} else {</div><div class='add'>+		np-&gt;tx_ring.ex[0].PacketBufferHigh = cpu_to_le64(test_dma_addr) &gt;&gt; 32;</div><div class='add'>+		np-&gt;tx_ring.ex[0].PacketBufferLow = cpu_to_le64(test_dma_addr) &amp; 0x0FFFFFFFF;</div><div class='add'>+		np-&gt;tx_ring.ex[0].FlagLen = cpu_to_le32((pkt_len-1) | np-&gt;tx_flags | tx_flags_extra);</div><div class='add'>+	}</div><div class='add'>+	writel(NVREG_TXRXCTL_KICK|np-&gt;txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);</div><div class='add'>+	pci_push(get_hwbase(dev));</div><div class='add'>+</div><div class='add'>+	msleep(500);</div><div class='add'>+</div><div class='add'>+	/* check for rx of the packet */</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='add'>+		Flags = le32_to_cpu(np-&gt;rx_ring.orig[0].FlagLen);</div><div class='add'>+		len = nv_descr_getlength(&amp;np-&gt;rx_ring.orig[0], np-&gt;desc_ver);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		Flags = le32_to_cpu(np-&gt;rx_ring.ex[0].FlagLen);</div><div class='add'>+		len = nv_descr_getlength_ex(&amp;np-&gt;rx_ring.ex[0], np-&gt;desc_ver);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (Flags &amp; NV_RX_AVAIL) {</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else if (np-&gt;desc_ver == DESC_VER_1) {</div><div class='add'>+		if (Flags &amp; NV_RX_ERROR)</div><div class='add'>+			ret = 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (Flags &amp; NV_RX2_ERROR) {</div><div class='add'>+			ret = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if ((ret = pci_enable_msix(np-&gt;pci_dev, np-&gt;msi_x_entry, (np-&gt;msi_flags &amp; NV_MSI_X_VECTORS_MASK))) == 0) {</div><div class='del'>-			np-&gt;msi_flags |= NV_MSI_X_ENABLED;</div><div class='del'>-			if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT) {</div><div class='del'>-				/* Request irq for rx handling */</div><div class='del'>-				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector, &amp;nv_nic_irq_rx, SA_SHIRQ, dev-&gt;name, dev) != 0) {</div><div class='del'>-					printk(KERN_INFO "forcedeth: request_irq failed for rx %d\n", ret);</div><div class='del'>-					pci_disable_msix(np-&gt;pci_dev);</div><div class='del'>-					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='del'>-					goto out_err;</div><div class='del'>-				}</div><div class='del'>-				/* Request irq for tx handling */</div><div class='del'>-				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector, &amp;nv_nic_irq_tx, SA_SHIRQ, dev-&gt;name, dev) != 0) {</div><div class='del'>-					printk(KERN_INFO "forcedeth: request_irq failed for tx %d\n", ret);</div><div class='del'>-					pci_disable_msix(np-&gt;pci_dev);</div><div class='del'>-					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='del'>-					goto out_free_rx;</div><div class='del'>-				}</div><div class='del'>-				/* Request irq for link and timer handling */</div><div class='del'>-				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector, &amp;nv_nic_irq_other, SA_SHIRQ, dev-&gt;name, dev) != 0) {</div><div class='del'>-					printk(KERN_INFO "forcedeth: request_irq failed for link %d\n", ret);</div><div class='del'>-					pci_disable_msix(np-&gt;pci_dev);</div><div class='del'>-					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='del'>-					goto out_free_tx;</div><div class='del'>-				}</div><div class='del'>-				/* map interrupts to their respective vector */</div><div class='del'>-				writel(0, base + NvRegMSIXMap0);</div><div class='del'>-				writel(0, base + NvRegMSIXMap1);</div><div class='del'>-				set_msix_vector_map(dev, NV_MSI_X_VECTOR_RX, NVREG_IRQ_RX_ALL);</div><div class='del'>-				set_msix_vector_map(dev, NV_MSI_X_VECTOR_TX, NVREG_IRQ_TX_ALL);</div><div class='del'>-				set_msix_vector_map(dev, NV_MSI_X_VECTOR_OTHER, NVREG_IRQ_OTHER);</div><div class='del'>-			} else {</div><div class='del'>-				/* Request irq for all interrupts */</div><div class='del'>-				if (request_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, &amp;nv_nic_irq, SA_SHIRQ, dev-&gt;name, dev) != 0) {</div><div class='del'>-					printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);</div><div class='del'>-					pci_disable_msix(np-&gt;pci_dev);</div><div class='del'>-					np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='del'>-					goto out_err;</div><div class='del'>-				}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-				/* map interrupts to vector 0 */</div><div class='del'>-				writel(0, base + NvRegMSIXMap0);</div><div class='del'>-				writel(0, base + NvRegMSIXMap1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (len != pkt_len) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			dprintk(KERN_DEBUG "%s: loopback len mismatch %d vs %d\n",</div><div class='add'>+				dev-&gt;name, len, pkt_len);</div><div class='add'>+		} else {</div><div class='add'>+			rx_skb = np-&gt;rx_skbuff[0];</div><div class='add'>+			for (i = 0; i &lt; pkt_len; i++) {</div><div class='add'>+				if (rx_skb-&gt;data[i] != (u8)(i &amp; 0xff)) {</div><div class='add'>+					ret = 0;</div><div class='add'>+					dprintk(KERN_DEBUG "%s: loopback pattern check failed on byte %d\n",</div><div class='add'>+						dev-&gt;name, i);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		dprintk(KERN_DEBUG "%s: loopback - did not receive test packet\n", dev-&gt;name);</div><div class='ctx'> 	}</div><div class='del'>-	if (ret != 0 &amp;&amp; np-&gt;msi_flags &amp; NV_MSI_CAPABLE) {</div><div class='del'>-		if ((ret = pci_enable_msi(np-&gt;pci_dev)) == 0) {</div><div class='del'>-			np-&gt;msi_flags |= NV_MSI_ENABLED;</div><div class='del'>-			if (request_irq(np-&gt;pci_dev-&gt;irq, &amp;nv_nic_irq, SA_SHIRQ, dev-&gt;name, dev) != 0) {</div><div class='del'>-				printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);</div><div class='del'>-				pci_disable_msi(np-&gt;pci_dev);</div><div class='del'>-				np-&gt;msi_flags &amp;= ~NV_MSI_ENABLED;</div><div class='del'>-				goto out_err;</div><div class='add'>+</div><div class='add'>+	pci_unmap_page(np-&gt;pci_dev, test_dma_addr,</div><div class='add'>+		       tx_skb-&gt;end-tx_skb-&gt;data,</div><div class='add'>+		       PCI_DMA_TODEVICE);</div><div class='add'>+	dev_kfree_skb_any(tx_skb);</div><div class='add'>+</div><div class='add'>+	/* stop engines */</div><div class='add'>+	nv_stop_rx(dev);</div><div class='add'>+	nv_stop_tx(dev);</div><div class='add'>+	nv_txrx_reset(dev);</div><div class='add'>+	/* drain rx queue */</div><div class='add'>+	nv_drain_rx(dev);</div><div class='add'>+	nv_drain_tx(dev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		writel(misc1_flags, base + NvRegMisc1);</div><div class='add'>+		writel(filter_flags, base + NvRegPacketFilterFlags);</div><div class='add'>+		nv_enable_irq(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64 *buffer)</div><div class='add'>+{</div><div class='add'>+	struct fe_priv *np = netdev_priv(dev);</div><div class='add'>+	u8 __iomem *base = get_hwbase(dev);</div><div class='add'>+	int result;</div><div class='add'>+	memset(buffer, 0, nv_self_test_count(dev)*sizeof(u64));</div><div class='add'>+</div><div class='add'>+	if (!nv_link_test(dev)) {</div><div class='add'>+		test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		buffer[0] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test-&gt;flags &amp; ETH_TEST_FL_OFFLINE) {</div><div class='add'>+		if (netif_running(dev)) {</div><div class='add'>+			netif_stop_queue(dev);</div><div class='add'>+			netif_tx_lock_bh(dev);</div><div class='add'>+			spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+			nv_disable_hw_interrupts(dev, np-&gt;irqmask);</div><div class='add'>+			if (!(np-&gt;msi_flags &amp; NV_MSI_X_ENABLED)) {</div><div class='add'>+				writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);</div><div class='add'>+			} else {</div><div class='add'>+				writel(NVREG_IRQSTAT_MASK, base + NvRegMSIXIrqStatus);</div><div class='ctx'> 			}</div><div class='add'>+			/* stop engines */</div><div class='add'>+			nv_stop_rx(dev);</div><div class='add'>+			nv_stop_tx(dev);</div><div class='add'>+			nv_txrx_reset(dev);</div><div class='add'>+			/* drain rx queue */</div><div class='add'>+			nv_drain_rx(dev);</div><div class='add'>+			nv_drain_tx(dev);</div><div class='add'>+			spin_unlock_irq(&amp;np-&gt;lock);</div><div class='add'>+			netif_tx_unlock_bh(dev);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			/* map interrupts to vector 0 */</div><div class='del'>-			writel(0, base + NvRegMSIMap0);</div><div class='del'>-			writel(0, base + NvRegMSIMap1);</div><div class='del'>-			/* enable msi vector 0 */</div><div class='del'>-			writel(NVREG_MSI_VECTOR_0_ENABLED, base + NvRegMSIIrqMask);</div><div class='add'>+		if (!nv_register_test(dev)) {</div><div class='add'>+			test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+			buffer[1] = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		result = nv_interrupt_test(dev);</div><div class='add'>+		if (result != 1) {</div><div class='add'>+			test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+			buffer[2] = 1;</div><div class='add'>+		}</div><div class='add'>+		if (result == 0) {</div><div class='add'>+			/* bail out */</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!nv_loopback_test(dev)) {</div><div class='add'>+			test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+			buffer[3] = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (netif_running(dev)) {</div><div class='add'>+			/* reinit driver view of the rx queue */</div><div class='add'>+			set_bufsize(dev);</div><div class='add'>+			if (nv_init_ring(dev)) {</div><div class='add'>+				if (!np-&gt;in_shutdown)</div><div class='add'>+					mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='add'>+			}</div><div class='add'>+			/* reinit nic view of the rx queue */</div><div class='add'>+			writel(np-&gt;rx_buf_sz, base + NvRegOffloadConfig);</div><div class='add'>+			setup_hw_rings(dev, NV_SETUP_RX_RING | NV_SETUP_TX_RING);</div><div class='add'>+			writel( ((np-&gt;rx_ring_size-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((np-&gt;tx_ring_size-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='add'>+				base + NvRegRingSizes);</div><div class='add'>+			pci_push(base);</div><div class='add'>+			writel(NVREG_TXRXCTL_KICK|np-&gt;txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);</div><div class='add'>+			pci_push(base);</div><div class='add'>+			/* restart rx engine */</div><div class='add'>+			nv_start_rx(dev);</div><div class='add'>+			nv_start_tx(dev);</div><div class='add'>+			netif_start_queue(dev);</div><div class='add'>+			nv_enable_hw_interrupts(dev, np-&gt;irqmask);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		if (request_irq(np-&gt;pci_dev-&gt;irq, &amp;nv_nic_irq, SA_SHIRQ, dev-&gt;name, dev) != 0)</div><div class='del'>-			goto out_err;</div><div class='del'>-	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-out_free_tx:</div><div class='del'>-	free_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_TX].vector, dev);</div><div class='del'>-out_free_rx:</div><div class='del'>-	free_irq(np-&gt;msi_x_entry[NV_MSI_X_VECTOR_RX].vector, dev);</div><div class='del'>-out_err:</div><div class='del'>-	return 1;</div><div class='add'>+static void nv_get_strings(struct net_device *dev, u32 stringset, u8 *buffer)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		memcpy(buffer, &amp;nv_estats_str, nv_get_stats_count(dev)*sizeof(struct nv_ethtool_str));</div><div class='add'>+		break;</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		memcpy(buffer, &amp;nv_etests_str, nv_self_test_count(dev)*sizeof(struct nv_ethtool_str));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_free_irq(struct net_device *dev)</div><div class='add'>+static struct ethtool_ops ops = {</div><div class='add'>+	.get_drvinfo = nv_get_drvinfo,</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='add'>+	.get_wol = nv_get_wol,</div><div class='add'>+	.set_wol = nv_set_wol,</div><div class='add'>+	.get_settings = nv_get_settings,</div><div class='add'>+	.set_settings = nv_set_settings,</div><div class='add'>+	.get_regs_len = nv_get_regs_len,</div><div class='add'>+	.get_regs = nv_get_regs,</div><div class='add'>+	.nway_reset = nv_nway_reset,</div><div class='add'>+	.get_perm_addr = ethtool_op_get_perm_addr,</div><div class='add'>+	.get_tso = ethtool_op_get_tso,</div><div class='add'>+	.set_tso = nv_set_tso,</div><div class='add'>+	.get_ringparam = nv_get_ringparam,</div><div class='add'>+	.set_ringparam = nv_set_ringparam,</div><div class='add'>+	.get_pauseparam = nv_get_pauseparam,</div><div class='add'>+	.set_pauseparam = nv_set_pauseparam,</div><div class='add'>+	.get_rx_csum = nv_get_rx_csum,</div><div class='add'>+	.set_rx_csum = nv_set_rx_csum,</div><div class='add'>+	.get_tx_csum = ethtool_op_get_tx_csum,</div><div class='add'>+	.set_tx_csum = nv_set_tx_csum,</div><div class='add'>+	.get_sg = ethtool_op_get_sg,</div><div class='add'>+	.set_sg = nv_set_sg,</div><div class='add'>+	.get_strings = nv_get_strings,</div><div class='add'>+	.get_stats_count = nv_get_stats_count,</div><div class='add'>+	.get_ethtool_stats = nv_get_ethtool_stats,</div><div class='add'>+	.self_test_count = nv_self_test_count,</div><div class='add'>+	.self_test = nv_self_test,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)</div><div class='ctx'> {</div><div class='ctx'> 	struct fe_priv *np = get_nvpriv(dev);</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (np-&gt;msi_flags &amp; NV_MSI_X_ENABLED) {</div><div class='del'>-		for (i = 0; i &lt; (np-&gt;msi_flags &amp; NV_MSI_X_VECTORS_MASK); i++) {</div><div class='del'>-			free_irq(np-&gt;msi_x_entry[i].vector, dev);</div><div class='del'>-		}</div><div class='del'>-		pci_disable_msix(np-&gt;pci_dev);</div><div class='del'>-		np-&gt;msi_flags &amp;= ~NV_MSI_X_ENABLED;</div><div class='add'>+	spin_lock_irq(&amp;np-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* save vlan group */</div><div class='add'>+	np-&gt;vlangrp = grp;</div><div class='add'>+</div><div class='add'>+	if (grp) {</div><div class='add'>+		/* enable vlan on MAC */</div><div class='add'>+		np-&gt;txrxctl_bits |= NVREG_TXRXCTL_VLANSTRIP | NVREG_TXRXCTL_VLANINS;</div><div class='ctx'> 	} else {</div><div class='del'>-		free_irq(np-&gt;pci_dev-&gt;irq, dev);</div><div class='del'>-		if (np-&gt;msi_flags &amp; NV_MSI_ENABLED) {</div><div class='del'>-			pci_disable_msi(np-&gt;pci_dev);</div><div class='del'>-			np-&gt;msi_flags &amp;= ~NV_MSI_ENABLED;</div><div class='del'>-		}</div><div class='add'>+		/* disable vlan on MAC */</div><div class='add'>+		np-&gt;txrxctl_bits &amp;= ~NVREG_TXRXCTL_VLANSTRIP;</div><div class='add'>+		np-&gt;txrxctl_bits &amp;= ~NVREG_TXRXCTL_VLANINS;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='add'>+</div><div class='add'>+	writel(np-&gt;txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nv_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='add'>+{</div><div class='add'>+	/* nothing to do */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int nv_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2813,6 +3910,9 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	writel(0, base + NvRegAdapterControl);</div><div class='ctx'> </div><div class='add'>+	if (np-&gt;pause_flags &amp; NV_PAUSEFRAME_TX_CAPABLE)</div><div class='add'>+		writel(NVREG_TX_PAUSEFRAME_DISABLE,  base + NvRegTxPauseFrame);</div><div class='add'>+</div><div class='ctx'> 	/* 2) initialize descriptor rings */</div><div class='ctx'> 	set_bufsize(dev);</div><div class='ctx'> 	oom = nv_init_ring(dev);</div><div class='hunk'>@@ -2829,12 +3929,15 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* 4) give hw rings */</div><div class='ctx'> 	setup_hw_rings(dev, NV_SETUP_RX_RING | NV_SETUP_TX_RING);</div><div class='del'>-	writel( ((RX_RING-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((TX_RING-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='add'>+	writel( ((np-&gt;rx_ring_size-1) &lt;&lt; NVREG_RINGSZ_RXSHIFT) + ((np-&gt;tx_ring_size-1) &lt;&lt; NVREG_RINGSZ_TXSHIFT),</div><div class='ctx'> 		base + NvRegRingSizes);</div><div class='ctx'> </div><div class='ctx'> 	/* 5) continue setup */</div><div class='ctx'> 	writel(np-&gt;linkspeed, base + NvRegLinkSpeed);</div><div class='del'>-	writel(NVREG_UNKSETUP3_VAL1, base + NvRegUnknownSetupReg3);</div><div class='add'>+	if (np-&gt;desc_ver == DESC_VER_1)</div><div class='add'>+		writel(NVREG_TX_WM_DESC1_DEFAULT, base + NvRegTxWatermark);</div><div class='add'>+	else</div><div class='add'>+		writel(NVREG_TX_WM_DESC2_3_DEFAULT, base + NvRegTxWatermark);</div><div class='ctx'> 	writel(np-&gt;txrxctl_bits, base + NvRegTxRxControl);</div><div class='ctx'> 	writel(np-&gt;vlanctl_bits, base + NvRegVlanControl);</div><div class='ctx'> 	pci_push(base);</div><div class='hunk'>@@ -2856,8 +3959,8 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> 	writel(readl(base + NvRegReceiverStatus), base + NvRegReceiverStatus);</div><div class='ctx'> 	get_random_bytes(&amp;i, sizeof(i));</div><div class='ctx'> 	writel(NVREG_RNDSEED_FORCE | (i&amp;NVREG_RNDSEED_MASK), base + NvRegRandomSeed);</div><div class='del'>-	writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);</div><div class='del'>-	writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);</div><div class='add'>+	writel(NVREG_TX_DEFERRAL_DEFAULT, base + NvRegTxDeferral);</div><div class='add'>+	writel(NVREG_RX_DEFERRAL_DEFAULT, base + NvRegRxDeferral);</div><div class='ctx'> 	if (poll_interval == -1) {</div><div class='ctx'> 		if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)</div><div class='ctx'> 			writel(NVREG_POLL_DEFAULT_THROUGHPUT, base + NvRegPollingInterval);</div><div class='hunk'>@@ -2871,7 +3974,8 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> 			base + NvRegAdapterControl);</div><div class='ctx'> 	writel(NVREG_MIISPEED_BIT8|NVREG_MIIDELAY, base + NvRegMIISpeed);</div><div class='ctx'> 	writel(NVREG_UNKSETUP4_VAL, base + NvRegUnknownSetupReg4);</div><div class='del'>-	writel(NVREG_WAKEUPFLAGS_VAL, base + NvRegWakeUpFlags);</div><div class='add'>+	if (np-&gt;wolenabled)</div><div class='add'>+		writel(NVREG_WAKEUPFLAGS_ENABLE , base + NvRegWakeUpFlags);</div><div class='ctx'> </div><div class='ctx'> 	i = readl(base + NvRegPowerState);</div><div class='ctx'> 	if ( (i &amp; NVREG_POWERSTATE_POWEREDUP) == 0)</div><div class='hunk'>@@ -2887,7 +3991,7 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> 	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);</div><div class='ctx'> 	pci_push(base);</div><div class='ctx'> </div><div class='del'>-	if (nv_request_irq(dev)) {</div><div class='add'>+	if (nv_request_irq(dev, 0)) {</div><div class='ctx'> 		goto out_drain;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2924,6 +4028,11 @@ static int nv_open(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (oom)</div><div class='ctx'> 		mod_timer(&amp;np-&gt;oom_kick, jiffies + OOM_REFILL);</div><div class='add'>+</div><div class='add'>+	/* start statistics timer */</div><div class='add'>+	if (np-&gt;driver_data &amp; DEV_HAS_STATISTICS)</div><div class='add'>+		mod_timer(&amp;np-&gt;stats_poll, jiffies + STATS_INTERVAL);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2944,6 +4053,7 @@ static int nv_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;np-&gt;oom_kick);</div><div class='ctx'> 	del_timer_sync(&amp;np-&gt;nic_poll);</div><div class='add'>+	del_timer_sync(&amp;np-&gt;stats_poll);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	spin_lock_irq(&amp;np-&gt;lock);</div><div class='hunk'>@@ -3003,6 +4113,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	init_timer(&amp;np-&gt;nic_poll);</div><div class='ctx'> 	np-&gt;nic_poll.data = (unsigned long) dev;</div><div class='ctx'> 	np-&gt;nic_poll.function = &amp;nv_do_nic_poll;	/* timer handler */</div><div class='add'>+	init_timer(&amp;np-&gt;stats_poll);</div><div class='add'>+	np-&gt;stats_poll.data = (unsigned long) dev;</div><div class='add'>+	np-&gt;stats_poll.function = &amp;nv_do_stats_poll;	/* timer handler */</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pci_dev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -3017,7 +4130,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out_disable;</div><div class='ctx'> </div><div class='del'>-	if (id-&gt;driver_data &amp; (DEV_HAS_VLAN|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL))</div><div class='add'>+	if (id-&gt;driver_data &amp; (DEV_HAS_VLAN|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_STATISTICS))</div><div class='ctx'> 		np-&gt;register_size = NV_PCI_REGSZ_VER2;</div><div class='ctx'> 	else</div><div class='ctx'> 		np-&gt;register_size = NV_PCI_REGSZ_VER1;</div><div class='hunk'>@@ -3049,16 +4162,18 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 		/* packet format 3: supports 40-bit addressing */</div><div class='ctx'> 		np-&gt;desc_ver = DESC_VER_3;</div><div class='ctx'> 		np-&gt;txrxctl_bits = NVREG_TXRXCTL_DESC_3;</div><div class='del'>-		if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) {</div><div class='del'>-			printk(KERN_INFO "forcedeth: 64-bit DMA failed, using 32-bit addressing for device %s.\n",</div><div class='del'>-					pci_name(pci_dev));</div><div class='del'>-		} else {</div><div class='del'>-			dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='del'>-			printk(KERN_INFO "forcedeth: using HIGHDMA\n");</div><div class='del'>-		}</div><div class='del'>-		if (pci_set_consistent_dma_mask(pci_dev, 0x0000007fffffffffULL)) {</div><div class='del'>-			printk(KERN_INFO "forcedeth: 64-bit DMA (consistent) failed for device %s.\n",</div><div class='del'>-			       pci_name(pci_dev));</div><div class='add'>+		if (dma_64bit) {</div><div class='add'>+			if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) {</div><div class='add'>+				printk(KERN_INFO "forcedeth: 64-bit DMA failed, using 32-bit addressing for device %s.\n",</div><div class='add'>+				       pci_name(pci_dev));</div><div class='add'>+			} else {</div><div class='add'>+				dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+				printk(KERN_INFO "forcedeth: using HIGHDMA\n");</div><div class='add'>+			}</div><div class='add'>+			if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) {</div><div class='add'>+				printk(KERN_INFO "forcedeth: 64-bit DMA (consistent) failed, using 32-bit ring buffers for device %s.\n",</div><div class='add'>+				       pci_name(pci_dev));</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (id-&gt;driver_data &amp; DEV_HAS_LARGEDESC) {</div><div class='ctx'> 		/* packet format 2: supports jumbo frames */</div><div class='hunk'>@@ -3091,13 +4206,19 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	np-&gt;msi_flags = 0;</div><div class='del'>-	if ((id-&gt;driver_data &amp; DEV_HAS_MSI) &amp;&amp; !disable_msi) {</div><div class='add'>+	if ((id-&gt;driver_data &amp; DEV_HAS_MSI) &amp;&amp; msi) {</div><div class='ctx'> 		np-&gt;msi_flags |= NV_MSI_CAPABLE;</div><div class='ctx'> 	}</div><div class='del'>-	if ((id-&gt;driver_data &amp; DEV_HAS_MSI_X) &amp;&amp; !disable_msix) {</div><div class='add'>+	if ((id-&gt;driver_data &amp; DEV_HAS_MSI_X) &amp;&amp; msix) {</div><div class='ctx'> 		np-&gt;msi_flags |= NV_MSI_X_CAPABLE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	np-&gt;pause_flags = NV_PAUSEFRAME_RX_CAPABLE | NV_PAUSEFRAME_RX_REQ | NV_PAUSEFRAME_AUTONEG;</div><div class='add'>+	if (id-&gt;driver_data &amp; DEV_HAS_PAUSEFRAME_TX) {</div><div class='add'>+		np-&gt;pause_flags |= NV_PAUSEFRAME_TX_CAPABLE | NV_PAUSEFRAME_TX_REQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	np-&gt;base = ioremap(addr, np-&gt;register_size);</div><div class='ctx'> 	if (!np-&gt;base)</div><div class='hunk'>@@ -3106,21 +4227,38 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = pci_dev-&gt;irq;</div><div class='ctx'> </div><div class='add'>+	np-&gt;rx_ring_size = RX_RING_DEFAULT;</div><div class='add'>+	np-&gt;tx_ring_size = TX_RING_DEFAULT;</div><div class='add'>+	np-&gt;tx_limit_stop = np-&gt;tx_ring_size - TX_LIMIT_DIFFERENCE;</div><div class='add'>+	np-&gt;tx_limit_start = np-&gt;tx_ring_size - TX_LIMIT_DIFFERENCE - 1;</div><div class='add'>+</div><div class='ctx'> 	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2) {</div><div class='ctx'> 		np-&gt;rx_ring.orig = pci_alloc_consistent(pci_dev,</div><div class='del'>-					sizeof(struct ring_desc) * (RX_RING + TX_RING),</div><div class='add'>+					sizeof(struct ring_desc) * (np-&gt;rx_ring_size + np-&gt;tx_ring_size),</div><div class='ctx'> 					&amp;np-&gt;ring_addr);</div><div class='ctx'> 		if (!np-&gt;rx_ring.orig)</div><div class='ctx'> 			goto out_unmap;</div><div class='del'>-		np-&gt;tx_ring.orig = &amp;np-&gt;rx_ring.orig[RX_RING];</div><div class='add'>+		np-&gt;tx_ring.orig = &amp;np-&gt;rx_ring.orig[np-&gt;rx_ring_size];</div><div class='ctx'> 	} else {</div><div class='ctx'> 		np-&gt;rx_ring.ex = pci_alloc_consistent(pci_dev,</div><div class='del'>-					sizeof(struct ring_desc_ex) * (RX_RING + TX_RING),</div><div class='add'>+					sizeof(struct ring_desc_ex) * (np-&gt;rx_ring_size + np-&gt;tx_ring_size),</div><div class='ctx'> 					&amp;np-&gt;ring_addr);</div><div class='ctx'> 		if (!np-&gt;rx_ring.ex)</div><div class='ctx'> 			goto out_unmap;</div><div class='del'>-		np-&gt;tx_ring.ex = &amp;np-&gt;rx_ring.ex[RX_RING];</div><div class='add'>+		np-&gt;tx_ring.ex = &amp;np-&gt;rx_ring.ex[np-&gt;rx_ring_size];</div><div class='ctx'> 	}</div><div class='add'>+	np-&gt;rx_skbuff = kmalloc(sizeof(struct sk_buff*) * np-&gt;rx_ring_size, GFP_KERNEL);</div><div class='add'>+	np-&gt;rx_dma = kmalloc(sizeof(dma_addr_t) * np-&gt;rx_ring_size, GFP_KERNEL);</div><div class='add'>+	np-&gt;tx_skbuff = kmalloc(sizeof(struct sk_buff*) * np-&gt;tx_ring_size, GFP_KERNEL);</div><div class='add'>+	np-&gt;tx_dma = kmalloc(sizeof(dma_addr_t) * np-&gt;tx_ring_size, GFP_KERNEL);</div><div class='add'>+	np-&gt;tx_dma_len = kmalloc(sizeof(unsigned int) * np-&gt;tx_ring_size, GFP_KERNEL);</div><div class='add'>+	if (!np-&gt;rx_skbuff || !np-&gt;rx_dma || !np-&gt;tx_skbuff || !np-&gt;tx_dma || !np-&gt;tx_dma_len)</div><div class='add'>+		goto out_freering;</div><div class='add'>+	memset(np-&gt;rx_skbuff, 0, sizeof(struct sk_buff*) * np-&gt;rx_ring_size);</div><div class='add'>+	memset(np-&gt;rx_dma, 0, sizeof(dma_addr_t) * np-&gt;rx_ring_size);</div><div class='add'>+	memset(np-&gt;tx_skbuff, 0, sizeof(struct sk_buff*) * np-&gt;tx_ring_size);</div><div class='add'>+	memset(np-&gt;tx_dma, 0, sizeof(dma_addr_t) * np-&gt;tx_ring_size);</div><div class='add'>+	memset(np-&gt;tx_dma_len, 0, sizeof(unsigned int) * np-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;open = nv_open;</div><div class='ctx'> 	dev-&gt;stop = nv_close;</div><div class='hunk'>@@ -3242,9 +4380,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	if (i == 33) {</div><div class='ctx'> 		printk(KERN_INFO "%s: open: Could not find a valid PHY.\n",</div><div class='ctx'> 		       pci_name(pci_dev));</div><div class='del'>-		goto out_freering;</div><div class='add'>+		goto out_error;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* reset it */</div><div class='ctx'> 	phy_init(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3256,7 +4394,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_INFO "forcedeth: unable to register netdev: %d\n", err);</div><div class='del'>-		goto out_freering;</div><div class='add'>+		goto out_error;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_INFO "%s: forcedeth.c: subsystem: %05x:%04x bound to %s\n",</div><div class='ctx'> 			dev-&gt;name, pci_dev-&gt;subsystem_vendor, pci_dev-&gt;subsystem_device,</div><div class='hunk'>@@ -3264,14 +4402,10 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_freering:</div><div class='del'>-	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='del'>-		pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING),</div><div class='del'>-				    np-&gt;rx_ring.orig, np-&gt;ring_addr);</div><div class='del'>-	else</div><div class='del'>-		pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc_ex) * (RX_RING + TX_RING),</div><div class='del'>-				    np-&gt;rx_ring.ex, np-&gt;ring_addr);</div><div class='add'>+out_error:</div><div class='ctx'> 	pci_set_drvdata(pci_dev, NULL);</div><div class='add'>+out_freering:</div><div class='add'>+	free_rings(dev);</div><div class='ctx'> out_unmap:</div><div class='ctx'> 	iounmap(get_hwbase(dev));</div><div class='ctx'> out_relreg:</div><div class='hunk'>@@ -3287,15 +4421,11 @@ out:</div><div class='ctx'> static void __devexit nv_remove(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='del'>-	struct fe_priv *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* free all structures */</div><div class='del'>-	if (np-&gt;desc_ver == DESC_VER_1 || np-&gt;desc_ver == DESC_VER_2)</div><div class='del'>-		pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING), np-&gt;rx_ring.orig, np-&gt;ring_addr);</div><div class='del'>-	else</div><div class='del'>-		pci_free_consistent(np-&gt;pci_dev, sizeof(struct ring_desc_ex) * (RX_RING + TX_RING), np-&gt;rx_ring.ex, np-&gt;ring_addr);</div><div class='add'>+	free_rings(dev);</div><div class='ctx'> 	iounmap(get_hwbase(dev));</div><div class='ctx'> 	pci_release_regions(pci_dev);</div><div class='ctx'> 	pci_disable_device(pci_dev);</div><div class='hunk'>@@ -3358,11 +4488,43 @@ static struct pci_device_id pci_tbl[] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP55 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_14),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='ctx'> 	},</div><div class='ctx'> 	{	/* MCP55 Ethernet Controller */</div><div class='ctx'> 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_15),</div><div class='del'>-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL,</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_VLAN|DEV_HAS_MSI|DEV_HAS_MSI_X|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP61 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_16),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP61 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_17),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP61 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_18),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP61 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_19),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP65 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_20),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP65 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_21),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP65 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_22),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='add'>+	},</div><div class='add'>+	{	/* MCP65 Ethernet Controller */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_23),</div><div class='add'>+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_LARGEDESC|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_POWER_CNTRL|DEV_HAS_MSI|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS|DEV_HAS_TEST_EXTENDED,</div><div class='ctx'> 	},</div><div class='ctx'> 	{0,},</div><div class='ctx'> };</div><div class='hunk'>@@ -3392,10 +4554,12 @@ module_param(optimization_mode, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(optimization_mode, "In throughput mode (0), every tx &amp; rx packet will generate an interrupt. In CPU mode (1), interrupts are controlled by a timer.");</div><div class='ctx'> module_param(poll_interval, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(poll_interval, "Interval determines how frequent timer interrupt is generated by [(time_in_micro_secs * 100) / (2^10)]. Min is 0 and Max is 65535.");</div><div class='del'>-module_param(disable_msi, int, 0);</div><div class='del'>-MODULE_PARM_DESC(disable_msi, "Disable MSI interrupts by setting to 1.");</div><div class='del'>-module_param(disable_msix, int, 0);</div><div class='del'>-MODULE_PARM_DESC(disable_msix, "Disable MSIX interrupts by setting to 1.");</div><div class='add'>+module_param(msi, int, 0);</div><div class='add'>+MODULE_PARM_DESC(msi, "MSI interrupts are enabled by setting to 1 and disabled by setting to 0.");</div><div class='add'>+module_param(msix, int, 0);</div><div class='add'>+MODULE_PARM_DESC(msix, "MSIX interrupts are enabled by setting to 1 and disabled by setting to 0.");</div><div class='add'>+module_param(dma_64bit, int, 0);</div><div class='add'>+MODULE_PARM_DESC(dma_64bit, "High DMA is enabled by setting to 1 and disabled by setting to 0.");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Manfred Spraul &lt;manfred@colorfullife.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");</div><div class='head'>diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c<br/>index 196298f33db8..f6abff5846b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/fs_enet-main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/fs_enet-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/fs_enet-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/fs_enet-main.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -672,7 +671,7 @@ static int fs_request_irq(struct net_device *dev, int irq, const char *name,</div><div class='ctx'> 	struct fs_enet_private *fep = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	(*fep-&gt;ops-&gt;pre_request_irq)(dev, irq);</div><div class='del'>-	return request_irq(irq, irqf, SA_SHIRQ, name, dev);</div><div class='add'>+	return request_irq(irq, irqf, IRQF_SHARED, name, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fs_free_irq(struct net_device *dev, int irq)</div><div class='head'>diff --git a/drivers/net/fs_enet/fs_enet-mii.c b/drivers/net/fs_enet/fs_enet-mii.c<br/>index c6770377ef87..b7e6e21725cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/fs_enet-mii.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/fs_enet-mii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/fs_enet-mii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/fs_enet-mii.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -431,8 +430,7 @@ static struct fs_enet_mii_bus *create_bus(const struct fs_mii_bus_info *bi)</div><div class='ctx'> 	return bus;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	if (bus)</div><div class='del'>-		kfree(bus);</div><div class='add'>+	kfree(bus);</div><div class='ctx'> 	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c<br/>index 95e2bb8dd7b4..64e20982c1fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-fcc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mac-fcc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-fcc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/mac-fcc.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c<br/>index 3dad69dfdb2c..e09547077529 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-fec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mac-fec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-fec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/mac-fec.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c<br/>index a772b286f96d..eaa24fab645f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-scc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mac-scc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mac-scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/mac-scc.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * kind, whether express or implied.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c<br/>index 24a5e2e23d18..48f9cf83ab6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mii-bitbang.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mii-bitbang.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mii-bitbang.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/mii-bitbang.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/fs_enet/mii-fixed.c b/drivers/net/fs_enet/mii-fixed.c<br/>index b3e192d612e5..ae4a9c3bb393 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mii-fixed.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/fs_enet/mii-fixed.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/fs_enet/mii-fixed.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/fs_enet/mii-fixed.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c<br/>index 218d31764c52..ebbbd6ca6204 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gianfar.c</a></div><div class='hunk'>@@ -64,7 +64,6 @@</div><div class='ctx'>  *  The driver then cleans up the buffer.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h<br/>index 127c98cf3336..f87bbc408dae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gianfar.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifndef __GIANFAR_H</div><div class='ctx'> #define __GIANFAR_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c<br/>index d69698c695ef..e0f505285e50 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar_ethtool.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gianfar_ethtool.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  by reference.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c<br/>index c6b725529af5..c92e65984fd0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar_mii.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar_mii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar_mii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gianfar_mii.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c<br/>index a6d5c43199cb..e8a18f18d08c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gianfar_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gianfar_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gianfar_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gianfar_sysfs.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Sysfs file creation and management</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c<br/>index 2d2435404614..2b4db7414475 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gt96100eth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gt96100eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gt96100eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gt96100eth.c</a></div><div class='hunk'>@@ -699,7 +699,6 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)</div><div class='ctx'> 	memset(gp, 0, sizeof(*gp)); // clear it</div><div class='ctx'> </div><div class='ctx'> 	gp-&gt;port_num = port_num;</div><div class='del'>-	gp-&gt;io_size = GT96100_ETH_IO_SIZE;</div><div class='ctx'> 	gp-&gt;port_offset = port_num * GT96100_ETH_IO_SIZE;</div><div class='ctx'> 	gp-&gt;phy_addr = phy_addr;</div><div class='ctx'> 	gp-&gt;chip_rev = chip_rev;</div><div class='hunk'>@@ -1030,7 +1029,7 @@ gt96100_open(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((retval = request_irq(dev-&gt;irq, &amp;gt96100_interrupt,</div><div class='del'>-				  SA_SHIRQ, dev-&gt;name, dev))) {</div><div class='add'>+				  IRQF_SHARED, dev-&gt;name, dev))) {</div><div class='ctx'> 		err("unable to get IRQ %d\n", dev-&gt;irq);</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1531,7 +1530,7 @@ static void gt96100_cleanup_module(void)</div><div class='ctx'> 				+ sizeof(gt96100_td_t) * TX_RING_SIZE,</div><div class='ctx'> 				gp-&gt;rx_ring);</div><div class='ctx'> 			free_netdev(gtif-&gt;dev);</div><div class='del'>-			release_region(gtif-&gt;iobase, gp-&gt;io_size);</div><div class='add'>+			release_region(gtif-&gt;iobase, GT96100_ETH_IO_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h<br/>index 395869c5ed3e..3b62a87c7d7f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/gt96100eth.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/gt96100eth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/gt96100eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/gt96100eth.h</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #ifndef _GT96100ETH_H</div><div class='ctx'> #define _GT96100ETH_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/galileo-boards/gt96100.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define dbg(lvl, format, arg...) \</div><div class='hunk'>@@ -332,7 +331,6 @@ struct gt96100_private {</div><div class='ctx'> 	mib_counters_t mib;</div><div class='ctx'> 	struct net_device_stats stats;</div><div class='ctx'> </div><div class='del'>-	int io_size;</div><div class='ctx'> 	int port_num;  // 0 or 1</div><div class='ctx'> 	int chip_rev;</div><div class='ctx'> 	u32 port_offset;</div><div class='hunk'>@@ -341,7 +339,6 @@ struct gt96100_private {</div><div class='ctx'> 	u32 last_psr; // last value of the port status register</div><div class='ctx'> </div><div class='ctx'> 	int options;     /* User-settable misc. driver options. */</div><div class='del'>-	int drv_flags;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	spinlock_t lock; /* Serialise access to device */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c<br/>index 0ea4cb4a0d80..409c6aab0411 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamachi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamachi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamachi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamachi.c</a></div><div class='hunk'>@@ -20,22 +20,15 @@</div><div class='ctx'> </div><div class='ctx'> 	Support and updates available at</div><div class='ctx'> 	http://www.scyld.com/network/hamachi.html</div><div class='add'>+	[link no longer provides useful info -jgarzik]</div><div class='ctx'> 	or</div><div class='ctx'> 	http://www.parl.clemson.edu/~keithu/hamachi.html</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	Linux kernel changelog:</div><div class='del'>-</div><div class='del'>-	LK1.0.1:</div><div class='del'>-	- fix lack of pci_dev&lt;-&gt;dev association</div><div class='del'>-	- ethtool support (jgarzik)</div><div class='del'>-</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"hamachi"</div><div class='del'>-#define DRV_VERSION	"1.01+LK1.0.1"</div><div class='del'>-#define DRV_RELDATE	"5/18/2001"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='add'>+#define DRV_RELDATE	"June 27, 2006"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* A few user-configurable values. */</div><div class='hunk'>@@ -608,7 +601,8 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	i = pci_request_regions(pdev, DRV_NAME);</div><div class='del'>-	if (i) return i;</div><div class='add'>+	if (i)</div><div class='add'>+		return i;</div><div class='ctx'> </div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> 	ioaddr = ioremap(base, 0x400);</div><div class='hunk'>@@ -871,7 +865,7 @@ static int hamachi_open(struct net_device *dev)</div><div class='ctx'> 	u32 rx_int_var, tx_int_var;</div><div class='ctx'> 	u16 fifo_info;</div><div class='ctx'> </div><div class='del'>-	i = request_irq(dev-&gt;irq, &amp;hamachi_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq(dev-&gt;irq, &amp;hamachi_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c<br/>index 102c1f0b90da..86b3bb9bec2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/6pack.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/6pack.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/6pack.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/6pack.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *		Fred N. van Kempen, &lt;waltje@uwalt.nl.mugnet.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -308,9 +307,9 @@ static int sp_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_ax25 *sa = addr;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, &amp;sa-&gt;sax25_call, AX25_ADDR_LEN);</div><div class='del'>-	spin_unlock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -767,9 +766,9 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, &amp;addr, AX25_ADDR_LEN);</div><div class='del'>-		spin_unlock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c<br/>index 232793d2ce6b..55906c7b4bb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/baycom_ser_fdx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/baycom_ser_fdx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/baycom_ser_fdx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/baycom_ser_fdx.c</a></div><div class='hunk'>@@ -434,7 +434,7 @@ static int ser12_open(struct net_device *dev)</div><div class='ctx'> 	outb(0, FCR(dev-&gt;base_addr));  /* disable FIFOs */</div><div class='ctx'> 	outb(0x0d, MCR(dev-&gt;base_addr));</div><div class='ctx'> 	outb(0, IER(dev-&gt;base_addr));</div><div class='del'>-	if (request_irq(dev-&gt;irq, ser12_interrupt, SA_INTERRUPT | SA_SHIRQ,</div><div class='add'>+	if (request_irq(dev-&gt;irq, ser12_interrupt, IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'> 			"baycom_ser_fdx", dev)) {</div><div class='ctx'> 		release_region(dev-&gt;base_addr, SER12_EXTENT);</div><div class='ctx'> 		return -EBUSY;</div><div class='head'>diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c<br/>index be596a3eb3fd..de95de8983da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/baycom_ser_hdx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/baycom_ser_hdx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/baycom_ser_hdx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/baycom_ser_hdx.c</a></div><div class='hunk'>@@ -488,7 +488,7 @@ static int ser12_open(struct net_device *dev)</div><div class='ctx'> 	outb(0, FCR(dev-&gt;base_addr));  /* disable FIFOs */</div><div class='ctx'> 	outb(0x0d, MCR(dev-&gt;base_addr));</div><div class='ctx'> 	outb(0, IER(dev-&gt;base_addr));</div><div class='del'>-	if (request_irq(dev-&gt;irq, ser12_interrupt, SA_INTERRUPT | SA_SHIRQ,</div><div class='add'>+	if (request_irq(dev-&gt;irq, ser12_interrupt, IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'> 			"baycom_ser12", dev)) {</div><div class='ctx'> 		release_region(dev-&gt;base_addr, SER12_EXTENT);       </div><div class='ctx'> 		return -EBUSY;</div><div class='head'>diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c<br/>index cb43a9d28774..889f338132fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/bpqether.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/bpqether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/bpqether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/bpqether.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'>  *	BPQ   004	Joerg(DL1BKE)		Fixed to not lock up on ifconfig.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='hunk'>@@ -123,6 +122,12 @@ struct bpqdev {</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(bpq_devices);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * bpqether network devices are paired with ethernet devices below them, so</div><div class='add'>+ * form a special "super class" of normal ethernet devices; split their locks</div><div class='add'>+ * off into a separate class since they always nest.</div><div class='add'>+ */</div><div class='add'>+static struct lock_class_key bpq_netdev_xmit_lock_key;</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------ */</div><div class='ctx'> </div><div class='hunk'>@@ -529,6 +534,7 @@ static int bpq_new_device(struct net_device *edev)</div><div class='ctx'> 	err = register_netdevice(ndev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='add'>+	lockdep_set_class(&amp;ndev-&gt;_xmit_lock, &amp;bpq_netdev_xmit_lock_key);</div><div class='ctx'> </div><div class='ctx'> 	/* List protected by RTNL */</div><div class='ctx'> 	list_add_rcu(&amp;bpq-&gt;bpq_list, &amp;bpq_devices);</div><div class='head'>diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c<br/>index 0d5fccc984bb..c9a46b89942a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/dmascc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/dmascc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/dmascc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/dmascc.c</a></div><div class='hunk'>@@ -436,7 +436,7 @@ static int __init dmascc_init(void)</div><div class='ctx'> module_init(dmascc_init);</div><div class='ctx'> module_exit(dmascc_exit);</div><div class='ctx'> </div><div class='del'>-static void dev_setup(struct net_device *dev)</div><div class='add'>+static void __init dev_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;type = ARPHRD_AX25;</div><div class='ctx'> 	dev-&gt;hard_header_len = AX25_MAX_HEADER_LEN;</div><div class='head'>diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c<br/>index d81a8e1eeb8d..d8715b200c17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/mkiss.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/mkiss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/mkiss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/mkiss.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Copyright (C) 2004, 05 Ralf Baechle DL5RB &lt;ralf@linux-mips.org&gt;</div><div class='ctx'>  * Copyright (C) 2004, 05 Thomas Osterried DL9SAU &lt;thomas@x-berg.in-berlin.de&gt;</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -357,9 +356,9 @@ static int ax_set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr_ax25 *sa = addr;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, &amp;sa-&gt;sax25_call, AX25_ADDR_LEN);</div><div class='del'>-	spin_unlock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -886,9 +885,9 @@ static int mkiss_ioctl(struct tty_struct *tty, struct file *file,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_lock_bh(dev);</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, addr, AX25_ADDR_LEN);</div><div class='del'>-		spin_unlock_irq(&amp;dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_unlock_bh(dev);</div><div class='ctx'> </div><div class='ctx'> 		err = 0;</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c<br/>index 5927784df3f9..df4b68142ac7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/scc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/scc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/scc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/scc.c</a></div><div class='hunk'>@@ -148,7 +148,6 @@</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -1737,7 +1736,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 				</div><div class='ctx'> 			if (!Ivec[hwcfg.irq].used &amp;&amp; hwcfg.irq)</div><div class='ctx'> 			{</div><div class='del'>-				if (request_irq(hwcfg.irq, scc_isr, SA_INTERRUPT, "AX.25 SCC", NULL))</div><div class='add'>+				if (request_irq(hwcfg.irq, scc_isr, IRQF_DISABLED, "AX.25 SCC", NULL))</div><div class='ctx'> 					printk(KERN_WARNING "z8530drv: warning, cannot get IRQ %d\n", hwcfg.irq);</div><div class='ctx'> 				else</div><div class='ctx'> 					Ivec[hwcfg.irq].used = 1;</div><div class='head'>diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c<br/>index b49884048caa..f98f5777dfbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hamradio/yam.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hamradio/yam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hamradio/yam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hamradio/yam.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -874,7 +873,7 @@ static int yam_open(struct net_device *dev)</div><div class='ctx'> 		goto out_release_base;</div><div class='ctx'> 	}</div><div class='ctx'> 	outb(0, IER(dev-&gt;base_addr));</div><div class='del'>-	if (request_irq(dev-&gt;irq, yam_interrupt, SA_INTERRUPT | SA_SHIRQ, dev-&gt;name, dev)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, yam_interrupt, IRQF_DISABLED | IRQF_SHARED, dev-&gt;name, dev)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: irq %d busy\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto out_release_base;</div><div class='head'>diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c<br/>index 0d7a6250e346..e26a3e407d70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hp-plus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hp-plus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hp-plus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hp-plus.c</a></div><div class='hunk'>@@ -446,7 +446,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* This is set up so that only a single autoprobe takes place per call.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended. */</div><div class='del'>-int</div><div class='add'>+int __init</div><div class='ctx'> init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='head'>diff --git a/drivers/net/hp.c b/drivers/net/hp.c<br/>index cf9fb3698a6b..551a71b3c5fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hp.c</a></div><div class='hunk'>@@ -384,7 +384,7 @@ hp_block_output(struct net_device *dev, int count,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function resets the ethercard if something screws up. */</div><div class='del'>-static void</div><div class='add'>+static void __init</div><div class='ctx'> hp_init_card(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int irq = dev-&gt;irq;</div><div class='hunk'>@@ -409,7 +409,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* This is set up so that only a single autoprobe takes place per call.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended. */</div><div class='del'>-int</div><div class='add'>+int __init</div><div class='ctx'> init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='head'>diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c<br/>index 247c8ca86033..e7d9bf330287 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hp100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hp100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hp100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hp100.c</a></div><div class='hunk'>@@ -1079,7 +1079,7 @@ static int hp100_open(struct net_device *dev)</div><div class='ctx'> 	/* New: if bus is PCI or EISA, interrupts might be shared interrupts */</div><div class='ctx'> 	if (request_irq(dev-&gt;irq, hp100_interrupt,</div><div class='ctx'> 			lp-&gt;bus == HP100_BUS_PCI || lp-&gt;bus ==</div><div class='del'>-			HP100_BUS_EISA ? SA_SHIRQ : SA_INTERRUPT,</div><div class='add'>+			HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED,</div><div class='ctx'> 			"hp100", dev)) {</div><div class='ctx'> 		printk("hp100: %s: unable to get IRQ %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -1487,11 +1487,8 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (skb-&gt;len &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 		</div><div class='del'>-	if (skb-&gt;len &lt; ETH_ZLEN &amp;&amp; lp-&gt;chip == HP100_CHIPID_SHASTA) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='add'>+	if (lp-&gt;chip == HP100_CHIPID_SHASTA &amp;&amp; skb_padto(skb, ETH_ZLEN))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Get Tx ring tail pointer */</div><div class='ctx'> 	if (lp-&gt;txrtail-&gt;next == lp-&gt;txrhead) {</div><div class='head'>diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c<br/>index d9fb8e74e631..91326ea3e12b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/hydra.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/hydra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/hydra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/hydra.c</a></div><div class='hunk'>@@ -117,7 +117,7 @@ static int __devinit hydra_init(struct zorro_dev *z)</div><div class='ctx'>     dev-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='ctx'> </div><div class='ctx'>     /* Install the Interrupt handler */</div><div class='del'>-    if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, "Hydra Ethernet",</div><div class='add'>+    if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt, IRQF_SHARED, "Hydra Ethernet",</div><div class='ctx'> 		    dev)) {</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	return -EAGAIN;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac.h b/drivers/net/ibm_emac/ibm_emac.h<br/>index c2dae6092c4c..97ed22bb4320 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac.h</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #ifndef __IBM_EMAC_H_</div><div class='ctx'> #define __IBM_EMAC_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* This is a simple check to prevent use of this driver on non-tested SoCs */</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c<br/>index 7e49522b8b3c..82468e2dc799 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_core.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h<br/>index f61273b2e94f..dabb94afeb98 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_core.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_core.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_core.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_core.h</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #ifndef __IBM_EMAC_CORE_H_</div><div class='ctx'> #define __IBM_EMAC_CORE_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;asm/ocp.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_debug.c b/drivers/net/ibm_emac/ibm_emac_debug.c<br/>index c7e1ecfa08fe..c3645908034d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_debug.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_debug.h b/drivers/net/ibm_emac/ibm_emac_debug.h<br/>index e85fbe0a8da9..5761389495d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_debug.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef __IBM_EMAC_DEBUG_H_</div><div class='ctx'> #define __IBM_EMAC_DEBUG_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "ibm_emac_core.h"</div><div class='ctx'> #include "ibm_emac_mal.h"</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_mal.c b/drivers/net/ibm_emac/ibm_emac_mal.c<br/>index da88d43081cc..af50e7b2e0d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_mal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_mal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_mal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_mal.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h<br/>index 2a2d3b24b037..f73f10a0a562 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_mal.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_mal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_mal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_mal.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #ifndef __IBM_EMAC_MAL_H_</div><div class='ctx'> #define __IBM_EMAC_MAL_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_phy.c b/drivers/net/ibm_emac/ibm_emac_phy.c<br/>index 67935dd33a65..4a97024061e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_phy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_phy.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * (c) 2004-2005, Eugene Surovegin &lt;ebs@ebshome.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.c b/drivers/net/ibm_emac/ibm_emac_rgmii.c<br/>index f0b1ffb2dbbf..53d281cb9a16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_rgmii.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_rgmii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_rgmii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_rgmii.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h<br/>index 7f03d536c9a3..94abde55e2e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_rgmii.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_rgmii.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_rgmii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_rgmii.h</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #ifndef _IBM_EMAC_RGMII_H_</div><div class='ctx'> #define _IBM_EMAC_RGMII_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* RGMII bridge */</div><div class='ctx'> struct rgmii_regs {</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_tah.c b/drivers/net/ibm_emac/ibm_emac_tah.c<br/>index af08afc22f9f..e287b451bb44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_tah.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_tah.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_tah.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_tah.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ibm_emac_core.h"</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_tah.h b/drivers/net/ibm_emac/ibm_emac_tah.h<br/>index 9299b5dd7eb1..38153945a240 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_tah.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_tah.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_tah.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_tah.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #ifndef _IBM_EMAC_TAH_H</div><div class='ctx'> #define _IBM_EMAC_TAH_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ocp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.c b/drivers/net/ibm_emac/ibm_emac_zmii.c<br/>index e129e0aaa045..37dc8f342868 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_zmii.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_zmii.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_zmii.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_zmii.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.h b/drivers/net/ibm_emac/ibm_emac_zmii.h<br/>index 92c854410753..972e3a44a09f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_zmii.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibm_emac/ibm_emac_zmii.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibm_emac/ibm_emac_zmii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibm_emac/ibm_emac_zmii.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #ifndef _IBM_EMAC_ZMII_H_</div><div class='ctx'> #define _IBM_EMAC_ZMII_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/ocp.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c<br/>index 01ad904215a1..2a95d72fa593 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibmlana.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmlana.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibmlana.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibmlana.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'> net-3-driver for the IBM LAN Adapter/A</div><div class='ctx'> </div><div class='ctx'> This is an extension to the Linux operating system, and is covered by the</div><div class='hunk'>@@ -11,9 +11,9 @@ This driver is based both on the SK_MCA driver, which is itself based on the</div><div class='ctx'> SK_G16 and 3C523 driver.</div><div class='ctx'> </div><div class='ctx'> paper sources:</div><div class='del'>-  'PC Hardware: Aufbau, Funktionsweise, Programmierung' by </div><div class='add'>+  'PC Hardware: Aufbau, Funktionsweise, Programmierung' by</div><div class='ctx'>   Hans-Peter Messmer for the basic Microchannel stuff</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   'Linux Geraetetreiber' by Allesandro Rubini, Kalle Dalheimer</div><div class='ctx'>   for help on Ethernet driver programming</div><div class='ctx'> </div><div class='hunk'>@@ -27,14 +27,14 @@ paper sources:</div><div class='ctx'> </div><div class='ctx'> special acknowledgements to:</div><div class='ctx'>   - Bob Eager for helping me out with documentation from IBM</div><div class='del'>-  - Jim Shorney for his endless patience with me while I was using </div><div class='add'>+  - Jim Shorney for his endless patience with me while I was using</div><div class='ctx'>     him as a beta tester to trace down the address filter bug ;-)</div><div class='ctx'> </div><div class='ctx'>   Missing things:</div><div class='ctx'> </div><div class='ctx'>   -&gt; set debug level via ioctl instead of compile-time switches</div><div class='ctx'>   -&gt; I didn't follow the development of the 2.1.x kernels, so my</div><div class='del'>-     assumptions about which things changed with which kernel version </div><div class='add'>+     assumptions about which things changed with which kernel version</div><div class='ctx'>      are probably nonsense</div><div class='ctx'> </div><div class='ctx'> History:</div><div class='hunk'>@@ -275,7 +275,7 @@ static void InitDscrs(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;rrastart = raddr = priv-&gt;txbufstart + (TXBUFCNT * PKTSIZE);</div><div class='ctx'> 	priv-&gt;rdastart = addr = priv-&gt;rrastart + (priv-&gt;rxbufcnt * sizeof(rra_t));</div><div class='ctx'> 	priv-&gt;rxbufstart = baddr = priv-&gt;rdastart + (priv-&gt;rxbufcnt * sizeof(rda_t));</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (z = 0; z &lt; priv-&gt;rxbufcnt; z++) {</div><div class='ctx'> 		rra.startlo = baddr;</div><div class='ctx'> 		rra.starthi = 0;</div><div class='hunk'>@@ -570,7 +570,7 @@ static void irqrx_handler(struct net_device *dev)</div><div class='ctx'> 		lrdaaddr = priv-&gt;rdastart + (priv-&gt;lastrxdescr * sizeof(rda_t));</div><div class='ctx'> 		memcpy_fromio(&amp;rda, priv-&gt;base + rdaaddr, sizeof(rda_t));</div><div class='ctx'> </div><div class='del'>-		/* iron out upper word halves of fields we use - SONIC will duplicate </div><div class='add'>+		/* iron out upper word halves of fields we use - SONIC will duplicate</div><div class='ctx'> 		   bits 0..15 to 16..31 */</div><div class='ctx'> </div><div class='ctx'> 		rda.status &amp;= 0xffff;</div><div class='hunk'>@@ -782,7 +782,7 @@ static int ibmlana_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* register resources - only necessary for IRQ */</div><div class='ctx'> </div><div class='del'>-	result = request_irq(priv-&gt;realirq, irq_handler, SA_SHIRQ | SA_SAMPLE_RANDOM, dev-&gt;name, dev);</div><div class='add'>+	result = request_irq(priv-&gt;realirq, irq_handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev-&gt;name, dev);</div><div class='ctx'> 	if (result != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: failed to register irq %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -836,9 +836,9 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	baddr = priv-&gt;txbufstart + (priv-&gt;nexttxdescr * PKTSIZE);</div><div class='ctx'> 	memcpy_toio(priv-&gt;base + baddr, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* copy filler into RAM - in case we're filling up... </div><div class='add'>+	/* copy filler into RAM - in case we're filling up...</div><div class='ctx'> 	   we're filling a bit more than necessary, but that doesn't harm</div><div class='del'>-	   since the buffer is far larger... </div><div class='add'>+	   since the buffer is far larger...</div><div class='ctx'> 	   Sorry Linus for the filler string but I couldn't resist ;-) */</div><div class='ctx'> </div><div class='ctx'> 	if (tmplen &gt; skb-&gt;len) {</div><div class='hunk'>@@ -952,7 +952,7 @@ static int ibmlana_probe(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;realirq = irq;</div><div class='ctx'> 	priv-&gt;medium = medium;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	/* set base + irq for this device (irq not allocated so far) */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ibmlana.h b/drivers/net/ibmlana.h<br/>index 458ee226e537..6b58bab9e308 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibmlana.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmlana.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibmlana.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibmlana.h</a></div><div class='hunk'>@@ -17,7 +17,7 @@</div><div class='ctx'> /* media enumeration - defined in a way that it fits onto the LAN/A's</div><div class='ctx'>    POS registers... */</div><div class='ctx'> </div><div class='del'>-typedef enum { </div><div class='add'>+typedef enum {</div><div class='ctx'> 	Media_10BaseT, Media_10Base5,</div><div class='ctx'> 	Media_Unknown, Media_10Base2, Media_Count</div><div class='ctx'> } ibmlana_medium;</div><div class='hunk'>@@ -27,7 +27,7 @@ typedef enum {</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	unsigned int slot;		/* MCA-Slot-#                       */</div><div class='ctx'> 	struct net_device_stats stat;	/* packet statistics            */</div><div class='del'>-	int realirq;			/* memorizes actual IRQ, even when </div><div class='add'>+	int realirq;			/* memorizes actual IRQ, even when</div><div class='ctx'> 					   currently not allocated          */</div><div class='ctx'> 	ibmlana_medium medium;		/* physical cannector               */</div><div class='ctx'> 	u32 	tdastart, txbufstart,	/* addresses                        */</div><div class='hunk'>@@ -41,7 +41,7 @@ typedef struct {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> } ibmlana_priv;</div><div class='ctx'> </div><div class='del'>-/* this card uses quite a lot of I/O ports...luckily the MCA bus decodes </div><div class='add'>+/* this card uses quite a lot of I/O ports...luckily the MCA bus decodes</div><div class='ctx'>    a full 64K I/O range... */</div><div class='ctx'> </div><div class='ctx'> #define IBM_LANA_IORANGE 0xa0</div><div class='head'>diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c<br/>index 52d01027d9e7..0464e78f733a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibmveth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmveth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibmveth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibmveth.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> /* for use with IBM i/pSeries LPAR Linux.  It utilizes the logical LAN    */</div><div class='ctx'> /* option of the RS/6000 Platform Architechture to interface with virtual */</div><div class='ctx'> /* ethernet NICs that are presented to the partition by the hypervisor.   */</div><div class='del'>-/*                                                                        */ </div><div class='add'>+/*                                                                        */</div><div class='ctx'> /**************************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>   TODO:</div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>   - possibly remove procfs support</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -61,7 +60,7 @@</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='ctx'> #define ibmveth_printk(fmt, args...) \</div><div class='del'>-  printk(KERN_INFO "%s: " fmt, __FILE__, ## args)</div><div class='add'>+  printk(KERN_DEBUG "%s: " fmt, __FILE__, ## args)</div><div class='ctx'> </div><div class='ctx'> #define ibmveth_error_printk(fmt, args...) \</div><div class='ctx'>   printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__ , adapter-&gt;vdev-&gt;unit_address, ## args)</div><div class='hunk'>@@ -79,7 +78,7 @@</div><div class='ctx'> #else</div><div class='ctx'> #define ibmveth_debug_printk_no_adapter(fmt, args...)</div><div class='ctx'> #define ibmveth_debug_printk(fmt, args...)</div><div class='del'>-#define ibmveth_assert(expr) </div><div class='add'>+#define ibmveth_assert(expr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int ibmveth_open(struct net_device *dev);</div><div class='hunk'>@@ -96,6 +95,7 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter);</div><div class='ctx'> static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter);</div><div class='ctx'> static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs);</div><div class='ctx'> static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);</div><div class='add'>+static struct kobj_type ktype_veth_pool;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> #define IBMVETH_PROC_DIR "net/ibmveth"</div><div class='hunk'>@@ -133,12 +133,13 @@ static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* setup the initial settings for a buffer pool */</div><div class='del'>-static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool, u32 pool_index, u32 pool_size, u32 buff_size)</div><div class='add'>+static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool, u32 pool_index, u32 pool_size, u32 buff_size, u32 pool_active)</div><div class='ctx'> {</div><div class='ctx'> 	pool-&gt;size = pool_size;</div><div class='ctx'> 	pool-&gt;index = pool_index;</div><div class='ctx'> 	pool-&gt;buff_size = buff_size;</div><div class='ctx'> 	pool-&gt;threshold = pool_size / 2;</div><div class='add'>+	pool-&gt;active = pool_active;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* allocate and setup an buffer pool - called during open */</div><div class='hunk'>@@ -146,13 +147,13 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pool-&gt;free_map = kmalloc(sizeof(u16) * pool-&gt;size, GFP_KERNEL); </div><div class='add'>+	pool-&gt;free_map = kmalloc(sizeof(u16) * pool-&gt;size, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if(!pool-&gt;free_map) {</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pool-&gt;dma_addr = kmalloc(sizeof(dma_addr_t) * pool-&gt;size, GFP_KERNEL); </div><div class='add'>+	pool-&gt;dma_addr = kmalloc(sizeof(dma_addr_t) * pool-&gt;size, GFP_KERNEL);</div><div class='ctx'> 	if(!pool-&gt;dma_addr) {</div><div class='ctx'> 		kfree(pool-&gt;free_map);</div><div class='ctx'> 		pool-&gt;free_map = NULL;</div><div class='hunk'>@@ -180,7 +181,6 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)</div><div class='ctx'> 	atomic_set(&amp;pool-&gt;available, 0);</div><div class='ctx'> 	pool-&gt;producer_index = 0;</div><div class='ctx'> 	pool-&gt;consumer_index = 0;</div><div class='del'>-	pool-&gt;active = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -214,7 +214,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc</div><div class='ctx'> </div><div class='ctx'> 		free_index = pool-&gt;consumer_index++ % pool-&gt;size;</div><div class='ctx'> 		index = pool-&gt;free_map[free_index];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 		ibmveth_assert(index != IBM_VETH_INVALID_MAP);</div><div class='ctx'> 		ibmveth_assert(pool-&gt;skbuff[index] == NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -231,10 +231,10 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc</div><div class='ctx'> 		desc.desc = 0;</div><div class='ctx'> 		desc.fields.valid = 1;</div><div class='ctx'> 		desc.fields.length = pool-&gt;buff_size;</div><div class='del'>-		desc.fields.address = dma_addr; </div><div class='add'>+		desc.fields.address = dma_addr;</div><div class='ctx'> </div><div class='ctx'> 		lpar_rc = h_add_logical_lan_buffer(adapter-&gt;vdev-&gt;unit_address, desc.desc);</div><div class='del'>-		    </div><div class='add'>+</div><div class='ctx'> 		if(lpar_rc != H_SUCCESS) {</div><div class='ctx'> 			pool-&gt;free_map[free_index] = index;</div><div class='ctx'> 			pool-&gt;skbuff[index] = NULL;</div><div class='hunk'>@@ -250,13 +250,13 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc</div><div class='ctx'> 			adapter-&gt;replenish_add_buff_success++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	mb();</div><div class='ctx'> 	atomic_add(buffers_added, &amp;(pool-&gt;available));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* replenish routine */</div><div class='del'>-static void ibmveth_replenish_task(struct ibmveth_adapter *adapter) </div><div class='add'>+static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -264,7 +264,7 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i &lt; IbmVethNumBufferPools; i++)</div><div class='ctx'> 		if(adapter-&gt;rx_buff_pool[i].active)</div><div class='del'>-			ibmveth_replenish_buffer_pool(adapter, </div><div class='add'>+			ibmveth_replenish_buffer_pool(adapter,</div><div class='ctx'> 						     &amp;adapter-&gt;rx_buff_pool[i]);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;rx_no_buffer = *(u64*)(((char*)adapter-&gt;buffer_list_addr) + 4096 - 8);</div><div class='hunk'>@@ -301,7 +301,6 @@ static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter, struct ibm</div><div class='ctx'> 		kfree(pool-&gt;skbuff);</div><div class='ctx'> 		pool-&gt;skbuff = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	pool-&gt;active = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* remove a buffer from a pool */</div><div class='hunk'>@@ -372,7 +371,7 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)</div><div class='ctx'> 	desc.fields.address = adapter-&gt;rx_buff_pool[pool].dma_addr[index];</div><div class='ctx'> </div><div class='ctx'> 	lpar_rc = h_add_logical_lan_buffer(adapter-&gt;vdev-&gt;unit_address, desc.desc);</div><div class='del'>-		    </div><div class='add'>+</div><div class='ctx'> 	if(lpar_rc != H_SUCCESS) {</div><div class='ctx'> 		ibmveth_debug_printk("h_add_logical_lan_buffer failed during recycle rc=%ld", lpar_rc);</div><div class='ctx'> 		ibmveth_remove_buffer_from_pool(adapter, adapter-&gt;rx_queue.queue_addr[adapter-&gt;rx_queue.index].correlator);</div><div class='hunk'>@@ -407,7 +406,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> 		free_page((unsigned long)adapter-&gt;buffer_list_addr);</div><div class='ctx'> 		adapter-&gt;buffer_list_addr = NULL;</div><div class='del'>-	} </div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if(adapter-&gt;filter_list_addr != NULL) {</div><div class='ctx'> 		if(!dma_mapping_error(adapter-&gt;filter_list_dma)) {</div><div class='hunk'>@@ -433,7 +432,9 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i&lt;IbmVethNumBufferPools; i++)</div><div class='del'>-		ibmveth_free_buffer_pool(adapter, &amp;adapter-&gt;rx_buff_pool[i]);</div><div class='add'>+		if (adapter-&gt;rx_buff_pool[i].active)</div><div class='add'>+			ibmveth_free_buffer_pool(adapter,</div><div class='add'>+						 &amp;adapter-&gt;rx_buff_pool[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ibmveth_open(struct net_device *netdev)</div><div class='hunk'>@@ -450,10 +451,10 @@ static int ibmveth_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i&lt;IbmVethNumBufferPools; i++)</div><div class='ctx'> 		rxq_entries += adapter-&gt;rx_buff_pool[i].size;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;buffer_list_addr = (void*) get_zeroed_page(GFP_KERNEL);</div><div class='ctx'> 	adapter-&gt;filter_list_addr = (void*) get_zeroed_page(GFP_KERNEL);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	if(!adapter-&gt;buffer_list_addr || !adapter-&gt;filter_list_addr) {</div><div class='ctx'> 		ibmveth_error_printk("unable to allocate filter or buffer list pages\n");</div><div class='ctx'> 		ibmveth_cleanup(adapter);</div><div class='hunk'>@@ -489,9 +490,6 @@ static int ibmveth_open(struct net_device *netdev)</div><div class='ctx'> 	adapter-&gt;rx_queue.num_slots = rxq_entries;</div><div class='ctx'> 	adapter-&gt;rx_queue.toggle = 1;</div><div class='ctx'> </div><div class='del'>-	/* call change_mtu to init the buffer pools based in initial mtu */</div><div class='del'>-	ibmveth_change_mtu(netdev, netdev-&gt;mtu);</div><div class='del'>-</div><div class='ctx'> 	memcpy(&amp;mac_address, netdev-&gt;dev_addr, netdev-&gt;addr_len);</div><div class='ctx'> 	mac_address = mac_address &gt;&gt; 16;</div><div class='ctx'> </div><div class='hunk'>@@ -504,7 +502,7 @@ static int ibmveth_open(struct net_device *netdev)</div><div class='ctx'> 	ibmveth_debug_printk("filter list @ 0x%p\n", adapter-&gt;filter_list_addr);</div><div class='ctx'> 	ibmveth_debug_printk("receive q   @ 0x%p\n", adapter-&gt;rx_queue.queue_addr);</div><div class='ctx'> </div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	lpar_rc = h_register_logical_lan(adapter-&gt;vdev-&gt;unit_address,</div><div class='ctx'> 					 adapter-&gt;buffer_list_dma,</div><div class='ctx'> 					 rxq_desc.desc,</div><div class='hunk'>@@ -519,7 +517,18 @@ static int ibmveth_open(struct net_device *netdev)</div><div class='ctx'> 				     rxq_desc.desc,</div><div class='ctx'> 				     mac_address);</div><div class='ctx'> 		ibmveth_cleanup(adapter);</div><div class='del'>-		return -ENONET; </div><div class='add'>+		return -ENONET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for(i = 0; i&lt;IbmVethNumBufferPools; i++) {</div><div class='add'>+		if(!adapter-&gt;rx_buff_pool[i].active)</div><div class='add'>+			continue;</div><div class='add'>+		if (ibmveth_alloc_buffer_pool(&amp;adapter-&gt;rx_buff_pool[i])) {</div><div class='add'>+			ibmveth_error_printk("unable to alloc pool\n");</div><div class='add'>+			adapter-&gt;rx_buff_pool[i].active = 0;</div><div class='add'>+			ibmveth_cleanup(adapter);</div><div class='add'>+			return -ENOMEM ;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ibmveth_debug_printk("registering irq 0x%x\n", netdev-&gt;irq);</div><div class='hunk'>@@ -547,10 +556,11 @@ static int ibmveth_close(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibmveth_adapter *adapter = netdev-&gt;priv;</div><div class='ctx'> 	long lpar_rc;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	ibmveth_debug_printk("close starting\n");</div><div class='ctx'> </div><div class='del'>-	netif_stop_queue(netdev);</div><div class='add'>+	if (!adapter-&gt;pool_config)</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(netdev-&gt;irq, netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -694,7 +704,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 					     desc[5].desc,</div><div class='ctx'> 					     correlator);</div><div class='ctx'> 	} while ((lpar_rc == H_BUSY) &amp;&amp; (retry_count--));</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	if(lpar_rc != H_SUCCESS &amp;&amp; lpar_rc != H_DROPPED) {</div><div class='ctx'> 		int i;</div><div class='ctx'> 		ibmveth_error_printk("tx: h_send_logical_lan failed with rc=%ld\n", lpar_rc);</div><div class='hunk'>@@ -780,7 +790,7 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)</div><div class='ctx'> 		/* more work to do - return that we are not done yet */</div><div class='ctx'> 		netdev-&gt;quota -= frames_processed;</div><div class='ctx'> 		*budget -= frames_processed;</div><div class='del'>-		return 1; </div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* we think we are done - reenable interrupts, then check once more to make sure we are done */</div><div class='hunk'>@@ -806,7 +816,7 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='del'>-{   </div><div class='add'>+{</div><div class='ctx'> 	struct net_device *netdev = dev_instance;</div><div class='ctx'> 	struct ibmveth_adapter *adapter = netdev-&gt;priv;</div><div class='ctx'> 	unsigned long lpar_rc;</div><div class='hunk'>@@ -862,7 +872,7 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> 				ibmveth_error_printk("h_multicast_ctrl rc=%ld when adding an entry to the filter table\n", lpar_rc);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 		/* re-enable filtering */</div><div class='ctx'> 		lpar_rc = h_multicast_ctrl(adapter-&gt;vdev-&gt;unit_address,</div><div class='ctx'> 					   IbmVethMcastEnableFiltering,</div><div class='hunk'>@@ -876,46 +886,22 @@ static void ibmveth_set_multicast_list(struct net_device *netdev)</div><div class='ctx'> static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibmveth_adapter *adapter = dev-&gt;priv;</div><div class='add'>+	int new_mtu_oh = new_mtu + IBMVETH_BUFF_OH;</div><div class='ctx'> 	int i;</div><div class='del'>-	int prev_smaller = 1;</div><div class='ctx'> </div><div class='del'>-	if ((new_mtu &lt; 68) || </div><div class='del'>-	    (new_mtu &gt; (pool_size[IbmVethNumBufferPools-1]) - IBMVETH_BUFF_OH))</div><div class='add'>+	if (new_mtu &lt; IBMVETH_MAX_MTU)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	/* Look for an active buffer pool that can hold the new MTU */</div><div class='ctx'> 	for(i = 0; i&lt;IbmVethNumBufferPools; i++) {</div><div class='del'>-		int activate = 0;</div><div class='del'>-		if (new_mtu &gt; (pool_size[i]  - IBMVETH_BUFF_OH)) { </div><div class='del'>-			activate = 1;</div><div class='del'>-			prev_smaller= 1;</div><div class='del'>-		} else {</div><div class='del'>-			if (prev_smaller)</div><div class='del'>-				activate = 1;</div><div class='del'>-			prev_smaller= 0;</div><div class='add'>+		if (!adapter-&gt;rx_buff_pool[i].active)</div><div class='add'>+			continue;</div><div class='add'>+		if (new_mtu_oh &lt; adapter-&gt;rx_buff_pool[i].buff_size) {</div><div class='add'>+			dev-&gt;mtu = new_mtu;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (activate &amp;&amp; !adapter-&gt;rx_buff_pool[i].active) {</div><div class='del'>-			struct ibmveth_buff_pool *pool = </div><div class='del'>-						&amp;adapter-&gt;rx_buff_pool[i];</div><div class='del'>-			if(ibmveth_alloc_buffer_pool(pool)) {</div><div class='del'>-				ibmveth_error_printk("unable to alloc pool\n");</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-			adapter-&gt;rx_buff_pool[i].active = 1;</div><div class='del'>-		} else if (!activate &amp;&amp; adapter-&gt;rx_buff_pool[i].active) {</div><div class='del'>-			adapter-&gt;rx_buff_pool[i].active = 0;</div><div class='del'>-			h_free_logical_lan_buffer(adapter-&gt;vdev-&gt;unit_address,</div><div class='del'>-					  (u64)pool_size[i]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* kick the interrupt handler so that the new buffer pools get</div><div class='del'>-	   replenished or deallocated */</div><div class='del'>-	ibmveth_interrupt(dev-&gt;irq, dev, NULL);</div><div class='del'>-</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='del'>-	return 0;	</div><div class='add'>+	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)</div><div class='hunk'>@@ -928,7 +914,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_</div><div class='ctx'> 	unsigned int *mcastFilterSize_p;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n", </div><div class='add'>+	ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",</div><div class='ctx'> 					dev-&gt;unit_address);</div><div class='ctx'> </div><div class='ctx'> 	mac_addr_p = (unsigned char *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);</div><div class='hunk'>@@ -937,7 +923,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_</div><div class='ctx'> 				"attribute\n", __FILE__, __LINE__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	mcastFilterSize_p= (unsigned int *) vio_get_attribute(dev, VETH_MCAST_FILTER_SIZE, 0);</div><div class='ctx'> 	if(!mcastFilterSize_p) {</div><div class='ctx'> 		printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "</div><div class='hunk'>@@ -945,7 +931,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_</div><div class='ctx'> 				__FILE__, __LINE__);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	netdev = alloc_etherdev(sizeof(struct ibmveth_adapter));</div><div class='ctx'> </div><div class='ctx'> 	if(!netdev)</div><div class='hunk'>@@ -960,13 +946,14 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_</div><div class='ctx'> 	adapter-&gt;vdev = dev;</div><div class='ctx'> 	adapter-&gt;netdev = netdev;</div><div class='ctx'> 	adapter-&gt;mcastFilterSize= *mcastFilterSize_p;</div><div class='del'>-	</div><div class='add'>+	adapter-&gt;pool_config = 0;</div><div class='add'>+</div><div class='ctx'> 	/* 	Some older boxes running PHYP non-natively have an OF that</div><div class='del'>-		returns a 8-byte local-mac-address field (and the first </div><div class='add'>+		returns a 8-byte local-mac-address field (and the first</div><div class='ctx'> 		2 bytes have to be ignored) while newer boxes' OF return</div><div class='del'>-		a 6-byte field. Note that IEEE 1275 specifies that </div><div class='add'>+		a 6-byte field. Note that IEEE 1275 specifies that</div><div class='ctx'> 		local-mac-address must be a 6-byte field.</div><div class='del'>-		The RPA doc specifies that the first byte must be 10b, so </div><div class='add'>+		The RPA doc specifies that the first byte must be 10b, so</div><div class='ctx'> 		we'll just look for it to solve this 8 vs. 6 byte field issue */</div><div class='ctx'> </div><div class='ctx'> 	if ((*mac_addr_p &amp; 0x3) != 0x02)</div><div class='hunk'>@@ -976,7 +963,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_</div><div class='ctx'> 	memcpy(&amp;adapter-&gt;mac_addr, mac_addr_p, 6);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;liobn = dev-&gt;iommu_table-&gt;it_index;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	netdev-&gt;irq = dev-&gt;irq;</div><div class='ctx'> 	netdev-&gt;open               = ibmveth_open;</div><div class='ctx'> 	netdev-&gt;poll               = ibmveth_poll;</div><div class='hunk'>@@ -989,14 +976,21 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_</div><div class='ctx'> 	netdev-&gt;ethtool_ops           = &amp;netdev_ethtool_ops;</div><div class='ctx'> 	netdev-&gt;change_mtu         = ibmveth_change_mtu;</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;dev-&gt;dev);</div><div class='del'>- 	netdev-&gt;features |= NETIF_F_LLTX; </div><div class='add'>+ 	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;stats_lock);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;netdev-&gt;dev_addr, &amp;adapter-&gt;mac_addr, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i&lt;IbmVethNumBufferPools; i++)</div><div class='del'>-		ibmveth_init_buffer_pool(&amp;adapter-&gt;rx_buff_pool[i], i, </div><div class='del'>-					 pool_count[i], pool_size[i]);</div><div class='add'>+	for(i = 0; i&lt;IbmVethNumBufferPools; i++) {</div><div class='add'>+		struct kobject *kobj = &amp;adapter-&gt;rx_buff_pool[i].kobj;</div><div class='add'>+		ibmveth_init_buffer_pool(&amp;adapter-&gt;rx_buff_pool[i], i,</div><div class='add'>+					 pool_count[i], pool_size[i],</div><div class='add'>+					 pool_active[i]);</div><div class='add'>+		kobj-&gt;parent = &amp;dev-&gt;dev.kobj;</div><div class='add'>+		sprintf(kobj-&gt;name, "pool%d", i);</div><div class='add'>+		kobj-&gt;ktype = &amp;ktype_veth_pool;</div><div class='add'>+		kobject_register(kobj);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ibmveth_debug_printk("adapter @ 0x%p\n", adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -1025,6 +1019,10 @@ static int __devexit ibmveth_remove(struct vio_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = dev-&gt;dev.driver_data;</div><div class='ctx'> 	struct ibmveth_adapter *adapter = netdev-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for(i = 0; i&lt;IbmVethNumBufferPools; i++)</div><div class='add'>+		kobject_unregister(&amp;adapter-&gt;rx_buff_pool[i].kobj);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1048,7 +1046,7 @@ static void ibmveth_proc_unregister_driver(void)</div><div class='ctx'> 	remove_proc_entry(IBMVETH_PROC_DIR, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos) </div><div class='add'>+static void *ibmveth_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	if (*pos == 0) {</div><div class='ctx'> 		return (void *)1;</div><div class='hunk'>@@ -1063,18 +1061,18 @@ static void *ibmveth_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ibmveth_seq_stop(struct seq_file *seq, void *v) </div><div class='add'>+static void ibmveth_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ibmveth_seq_show(struct seq_file *seq, void *v) </div><div class='add'>+static int ibmveth_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	struct ibmveth_adapter *adapter = seq-&gt;private;</div><div class='ctx'> 	char *current_mac = ((char*) &amp;adapter-&gt;netdev-&gt;dev_addr);</div><div class='ctx'> 	char *firmware_mac = ((char*) &amp;adapter-&gt;mac_addr) ;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	seq_printf(seq, "Unit Address:    0x%x\n", adapter-&gt;vdev-&gt;unit_address);</div><div class='ctx'> 	seq_printf(seq, "LIOBN:           0x%lx\n", adapter-&gt;liobn);</div><div class='ctx'> 	seq_printf(seq, "Current MAC:     %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='hunk'>@@ -1083,7 +1081,7 @@ static int ibmveth_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "Firmware MAC:    %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='ctx'> 		   firmware_mac[0], firmware_mac[1], firmware_mac[2],</div><div class='ctx'> 		   firmware_mac[3], firmware_mac[4], firmware_mac[5]);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	seq_printf(seq, "\nAdapter Statistics:\n");</div><div class='ctx'> 	seq_printf(seq, "  TX:  skbuffs linearized:          %ld\n", adapter-&gt;tx_linearized);</div><div class='ctx'> 	seq_printf(seq, "       multi-descriptor sends:      %ld\n", adapter-&gt;tx_multidesc_send);</div><div class='hunk'>@@ -1095,7 +1093,7 @@ static int ibmveth_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> 	seq_printf(seq, "       add buffer failures:         %ld\n", adapter-&gt;replenish_add_buff_failure);</div><div class='ctx'> 	seq_printf(seq, "       invalid buffers:             %ld\n", adapter-&gt;rx_invalid_buffer);</div><div class='ctx'> 	seq_printf(seq, "       no buffers:                  %ld\n", adapter-&gt;rx_no_buffer);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> static struct seq_operations ibmveth_seq_ops = {</div><div class='hunk'>@@ -1153,11 +1151,11 @@ static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_PROC_FS */</div><div class='del'>-static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter) </div><div class='add'>+static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter) </div><div class='add'>+static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> static void ibmveth_proc_register_driver(void)</div><div class='hunk'>@@ -1169,6 +1167,132 @@ static void ibmveth_proc_unregister_driver(void)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PROC_FS */</div><div class='ctx'> </div><div class='add'>+static struct attribute veth_active_attr;</div><div class='add'>+static struct attribute veth_num_attr;</div><div class='add'>+static struct attribute veth_size_attr;</div><div class='add'>+</div><div class='add'>+static ssize_t veth_pool_show(struct kobject * kobj,</div><div class='add'>+                              struct attribute * attr, char * buf)</div><div class='add'>+{</div><div class='add'>+	struct ibmveth_buff_pool *pool = container_of(kobj,</div><div class='add'>+						      struct ibmveth_buff_pool,</div><div class='add'>+						      kobj);</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;veth_active_attr)</div><div class='add'>+		return sprintf(buf, "%d\n", pool-&gt;active);</div><div class='add'>+	else if (attr == &amp;veth_num_attr)</div><div class='add'>+		return sprintf(buf, "%d\n", pool-&gt;size);</div><div class='add'>+	else if (attr == &amp;veth_size_attr)</div><div class='add'>+		return sprintf(buf, "%d\n", pool-&gt;buff_size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t veth_pool_store(struct kobject * kobj, struct attribute * attr,</div><div class='add'>+const char * buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ibmveth_buff_pool *pool = container_of(kobj,</div><div class='add'>+						      struct ibmveth_buff_pool,</div><div class='add'>+						      kobj);</div><div class='add'>+	struct net_device *netdev =</div><div class='add'>+	    container_of(kobj-&gt;parent, struct device, kobj)-&gt;driver_data;</div><div class='add'>+	struct ibmveth_adapter *adapter = netdev-&gt;priv;</div><div class='add'>+	long value = simple_strtol(buf, NULL, 10);</div><div class='add'>+	long rc;</div><div class='add'>+</div><div class='add'>+	if (attr == &amp;veth_active_attr) {</div><div class='add'>+		if (value &amp;&amp; !pool-&gt;active) {</div><div class='add'>+			if(ibmveth_alloc_buffer_pool(pool)) {</div><div class='add'>+                                ibmveth_error_printk("unable to alloc pool\n");</div><div class='add'>+                                return -ENOMEM;</div><div class='add'>+                        }</div><div class='add'>+			pool-&gt;active = 1;</div><div class='add'>+			adapter-&gt;pool_config = 1;</div><div class='add'>+			ibmveth_close(netdev);</div><div class='add'>+			adapter-&gt;pool_config = 0;</div><div class='add'>+			if ((rc = ibmveth_open(netdev)))</div><div class='add'>+				return rc;</div><div class='add'>+		} else if (!value &amp;&amp; pool-&gt;active) {</div><div class='add'>+			int mtu = netdev-&gt;mtu + IBMVETH_BUFF_OH;</div><div class='add'>+			int i;</div><div class='add'>+			/* Make sure there is a buffer pool with buffers that</div><div class='add'>+			   can hold a packet of the size of the MTU */</div><div class='add'>+			for(i = 0; i&lt;IbmVethNumBufferPools; i++) {</div><div class='add'>+				if (pool == &amp;adapter-&gt;rx_buff_pool[i])</div><div class='add'>+					continue;</div><div class='add'>+				if (!adapter-&gt;rx_buff_pool[i].active)</div><div class='add'>+					continue;</div><div class='add'>+				if (mtu &lt; adapter-&gt;rx_buff_pool[i].buff_size) {</div><div class='add'>+					pool-&gt;active = 0;</div><div class='add'>+					h_free_logical_lan_buffer(adapter-&gt;</div><div class='add'>+								  vdev-&gt;</div><div class='add'>+								  unit_address,</div><div class='add'>+								  pool-&gt;</div><div class='add'>+								  buff_size);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (pool-&gt;active) {</div><div class='add'>+				ibmveth_error_printk("no active pool &gt;= MTU\n");</div><div class='add'>+				return -EPERM;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (attr == &amp;veth_num_attr) {</div><div class='add'>+		if (value &lt;= 0 || value &gt; IBMVETH_MAX_POOL_COUNT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		else {</div><div class='add'>+			adapter-&gt;pool_config = 1;</div><div class='add'>+			ibmveth_close(netdev);</div><div class='add'>+			adapter-&gt;pool_config = 0;</div><div class='add'>+			pool-&gt;size = value;</div><div class='add'>+			if ((rc = ibmveth_open(netdev)))</div><div class='add'>+				return rc;</div><div class='add'>+		}</div><div class='add'>+	} else if (attr == &amp;veth_size_attr) {</div><div class='add'>+		if (value &lt;= IBMVETH_BUFF_OH || value &gt; IBMVETH_MAX_BUF_SIZE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		else {</div><div class='add'>+			adapter-&gt;pool_config = 1;</div><div class='add'>+			ibmveth_close(netdev);</div><div class='add'>+			adapter-&gt;pool_config = 0;</div><div class='add'>+			pool-&gt;buff_size = value;</div><div class='add'>+			if ((rc = ibmveth_open(netdev)))</div><div class='add'>+				return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* kick the interrupt handler to allocate/deallocate pools */</div><div class='add'>+	ibmveth_interrupt(netdev-&gt;irq, netdev, NULL);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define ATTR(_name, _mode)      \</div><div class='add'>+        struct attribute veth_##_name##_attr = {               \</div><div class='add'>+        .name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE \</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+static ATTR(active, 0644);</div><div class='add'>+static ATTR(num, 0644);</div><div class='add'>+static ATTR(size, 0644);</div><div class='add'>+</div><div class='add'>+static struct attribute * veth_pool_attrs[] = {</div><div class='add'>+	&amp;veth_active_attr,</div><div class='add'>+	&amp;veth_num_attr,</div><div class='add'>+	&amp;veth_size_attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sysfs_ops veth_pool_ops = {</div><div class='add'>+	.show   = veth_pool_show,</div><div class='add'>+	.store  = veth_pool_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kobj_type ktype_veth_pool = {</div><div class='add'>+	.release        = NULL,</div><div class='add'>+	.sysfs_ops      = &amp;veth_pool_ops,</div><div class='add'>+	.default_attrs  = veth_pool_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct vio_device_id ibmveth_device_table[] __devinitdata= {</div><div class='ctx'> 	{ "network", "IBM,l-lan"},</div><div class='ctx'> 	{ "", "" }</div><div class='hunk'>@@ -1198,7 +1322,7 @@ static void __exit ibmveth_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	vio_unregister_driver(&amp;ibmveth_driver);</div><div class='ctx'> 	ibmveth_proc_unregister_driver();</div><div class='del'>-}	</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> module_init(ibmveth_module_init);</div><div class='ctx'> module_exit(ibmveth_module_exit);</div><div class='head'>diff --git a/drivers/net/ibmveth.h b/drivers/net/ibmveth.h<br/>index 46919a814fca..8385bf836507 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ibmveth.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ibmveth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ibmveth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ibmveth.h</a></div><div class='hunk'>@@ -75,10 +75,13 @@</div><div class='ctx'> </div><div class='ctx'> #define IbmVethNumBufferPools 5</div><div class='ctx'> #define IBMVETH_BUFF_OH 22 /* Overhead: 14 ethernet header + 8 opaque handle */</div><div class='add'>+#define IBMVETH_MAX_MTU 68</div><div class='add'>+#define IBMVETH_MAX_POOL_COUNT 4096</div><div class='add'>+#define IBMVETH_MAX_BUF_SIZE (1024 * 128)</div><div class='ctx'> </div><div class='del'>-/* pool_size should be sorted */</div><div class='ctx'> static int pool_size[] = { 512, 1024 * 2, 1024 * 16, 1024 * 32, 1024 * 64 };</div><div class='ctx'> static int pool_count[] = { 256, 768, 256, 256, 256 };</div><div class='add'>+static int pool_active[] = { 1, 1, 0, 0, 0};</div><div class='ctx'> </div><div class='ctx'> #define IBM_VETH_INVALID_MAP ((u16)0xffff)</div><div class='ctx'> </div><div class='hunk'>@@ -94,6 +97,7 @@ struct ibmveth_buff_pool {</div><div class='ctx'>     dma_addr_t *dma_addr;</div><div class='ctx'>     struct sk_buff **skbuff;</div><div class='ctx'>     int active;</div><div class='add'>+    struct kobject kobj;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ibmveth_rx_q {</div><div class='hunk'>@@ -118,6 +122,7 @@ struct ibmveth_adapter {</div><div class='ctx'>     dma_addr_t filter_list_dma;</div><div class='ctx'>     struct ibmveth_buff_pool rx_buff_pool[IbmVethNumBufferPools];</div><div class='ctx'>     struct ibmveth_rx_q rx_queue;</div><div class='add'>+    int pool_config;</div><div class='ctx'> </div><div class='ctx'>     /* adapter specific stats */</div><div class='ctx'>     u64 replenish_task_cycles;</div><div class='hunk'>@@ -134,7 +139,7 @@ struct ibmveth_adapter {</div><div class='ctx'>     spinlock_t stats_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ibmveth_buf_desc_fields {	</div><div class='add'>+struct ibmveth_buf_desc_fields {</div><div class='ctx'>     u32 valid : 1;</div><div class='ctx'>     u32 toggle : 1;</div><div class='ctx'>     u32 reserved : 6;</div><div class='hunk'>@@ -143,7 +148,7 @@ struct ibmveth_buf_desc_fields {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union ibmveth_buf_desc {</div><div class='del'>-    u64 desc;	</div><div class='add'>+    u64 desc;</div><div class='ctx'>     struct ibmveth_buf_desc_fields fields;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c<br/>index 31fb2d75dc44..3a42afab5036 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ifb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ifb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ifb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ifb.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -76,13 +75,13 @@ static void ri_tasklet(unsigned long dev)</div><div class='ctx'> 	dp-&gt;st_task_enter++;</div><div class='ctx'> 	if ((skb = skb_peek(&amp;dp-&gt;tq)) == NULL) {</div><div class='ctx'> 		dp-&gt;st_txq_refl_try++;</div><div class='del'>-		if (spin_trylock(&amp;_dev-&gt;xmit_lock)) {</div><div class='add'>+		if (netif_tx_trylock(_dev)) {</div><div class='ctx'> 			dp-&gt;st_rxq_enter++;</div><div class='ctx'> 			while ((skb = skb_dequeue(&amp;dp-&gt;rq)) != NULL) {</div><div class='ctx'> 				skb_queue_tail(&amp;dp-&gt;tq, skb);</div><div class='ctx'> 				dp-&gt;st_rx2tx_tran++;</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock(&amp;_dev-&gt;xmit_lock);</div><div class='add'>+			netif_tx_unlock(_dev);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* reschedule */</div><div class='ctx'> 			dp-&gt;st_rxq_notenter++;</div><div class='hunk'>@@ -110,7 +109,7 @@ static void ri_tasklet(unsigned long dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (spin_trylock(&amp;_dev-&gt;xmit_lock)) {</div><div class='add'>+	if (netif_tx_trylock(_dev)) {</div><div class='ctx'> 		dp-&gt;st_rxq_check++;</div><div class='ctx'> 		if ((skb = skb_peek(&amp;dp-&gt;rq)) == NULL) {</div><div class='ctx'> 			dp-&gt;tasklet_pending = 0;</div><div class='hunk'>@@ -118,10 +117,10 @@ static void ri_tasklet(unsigned long dev)</div><div class='ctx'> 				netif_wake_queue(_dev);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dp-&gt;st_rxq_rsch++;</div><div class='del'>-			spin_unlock(&amp;_dev-&gt;xmit_lock);</div><div class='add'>+			netif_tx_unlock(_dev);</div><div class='ctx'> 			goto resched;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;_dev-&gt;xmit_lock);</div><div class='add'>+		netif_tx_unlock(_dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> resched:</div><div class='ctx'> 		dp-&gt;tasklet_pending = 1;</div><div class='head'>diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c<br/>index ae71ed57c12d..68d8af7df08e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ioc3-eth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ioc3-eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ioc3-eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ioc3-eth.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #define IOC3_NAME	"ioc3-eth"</div><div class='ctx'> #define IOC3_VERSION	"2.6.3-3"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -145,7 +144,7 @@ static inline struct sk_buff * ioc3_alloc_skb(unsigned long length,</div><div class='ctx'> static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_SGI_IP27</div><div class='del'>-	vdev &lt;&lt;= 58;   /* Shift to PCI64_ATTR_VIRTUAL */</div><div class='add'>+	vdev &lt;&lt;= 57;   /* Shift to PCI64_ATTR_VIRTUAL */</div><div class='ctx'> </div><div class='ctx'> 	return vdev | (0xaUL &lt;&lt; PCI64_ATTR_TARG_SHFT) | PCI64_ATTR_PREF |</div><div class='ctx'> 	       ((unsigned long)ptr &amp; TO_PHYS_MASK);</div><div class='hunk'>@@ -1064,7 +1063,7 @@ static int ioc3_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ioc3_private *ip = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, ioc3_interrupt, SA_SHIRQ, ioc3_str, dev)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, ioc3_interrupt, IRQF_SHARED, ioc3_str, dev)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Can't get irq %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 		return -EAGAIN;</div><div class='head'>diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig<br/>index cff8598aa800..e9e6d99a9add 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/Kconfig</a></div><div class='hunk'>@@ -350,7 +350,7 @@ config TOSHIBA_FIR</div><div class='ctx'> </div><div class='ctx'> config AU1000_FIR</div><div class='ctx'> 	tristate "Alchemy Au1000 SIR/FIR"</div><div class='del'>-	depends on MIPS_AU1000 &amp;&amp; IRDA</div><div class='add'>+	depends on SOC_AU1000 &amp;&amp; IRDA</div><div class='ctx'> </div><div class='ctx'> config SMC_IRCC_FIR</div><div class='ctx'> 	tristate "SMSC IrCC (EXPERIMENTAL)"</div><div class='hunk'>@@ -417,5 +417,20 @@ config PXA_FICP</div><div class='ctx'> 	  available capabilities may vary from one PXA2xx target to</div><div class='ctx'> 	  another.</div><div class='ctx'> </div><div class='add'>+config MCS_FIR</div><div class='add'>+	tristate "MosChip MCS7780 IrDA-USB dongle"</div><div class='add'>+	depends on IRDA &amp;&amp; USB &amp;&amp; EXPERIMENTAL</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here if you want to build support for the MosChip</div><div class='add'>+	  MCS7780 IrDA-USB bridge device driver.</div><div class='add'>+</div><div class='add'>+	  USB bridge based on the MosChip MCS7780 don't conform to the</div><div class='add'>+	  IrDA-USB device class specification, and therefore need their</div><div class='add'>+	  own specific driver. Those dongles support SIR and FIR (4Mbps)</div><div class='add'>+	  speeds.</div><div class='add'>+</div><div class='add'>+	  To compile it as a module, choose M here: the module will be called</div><div class='add'>+	  mcs7780.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile<br/>index c1ce2398efea..5be09f1b9ee2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/Makefile</a></div><div class='hunk'>@@ -19,6 +19,7 @@ obj-$(CONFIG_ALI_FIR)		+= ali-ircc.o</div><div class='ctx'> obj-$(CONFIG_VLSI_FIR)		+= vlsi_ir.o</div><div class='ctx'> obj-$(CONFIG_VIA_FIR)		+= via-ircc.o</div><div class='ctx'> obj-$(CONFIG_PXA_FICP)	        += pxaficp_ir.o</div><div class='add'>+obj-$(CONFIG_MCS_FIR)	        += mcs7780.o</div><div class='ctx'> # Old dongle drivers for old SIR drivers</div><div class='ctx'> obj-$(CONFIG_ESI_DONGLE_OLD)		+= esi.o</div><div class='ctx'> obj-$(CONFIG_TEKRAM_DONGLE_OLD)	+= tekram.o</div><div class='head'>diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c<br/>index 2e7882eb7d6f..e3c8cd5eca67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/ali-ircc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/ali-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/ali-ircc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/ali-ircc.c</a></div><div class='hunk'>@@ -34,14 +34,12 @@</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/pm.h&gt;</div><div class='del'>-#include &lt;linux/pm_legacy.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;net/irda/wrapper.h&gt;</div><div class='ctx'> #include &lt;net/irda/irda.h&gt;</div><div class='ctx'> #include &lt;net/irda/irda_device.h&gt;</div><div class='hunk'>@@ -51,7 +49,19 @@</div><div class='ctx'> #define CHIP_IO_EXTENT 8</div><div class='ctx'> #define BROKEN_DONGLE_ID</div><div class='ctx'> </div><div class='del'>-static char *driver_name = "ali-ircc";</div><div class='add'>+#define ALI_IRCC_DRIVER_NAME "ali-ircc"</div><div class='add'>+</div><div class='add'>+/* Power Management */</div><div class='add'>+static int ali_ircc_suspend(struct platform_device *dev, pm_message_t state);</div><div class='add'>+static int ali_ircc_resume(struct platform_device *dev);</div><div class='add'>+</div><div class='add'>+static struct platform_driver ali_ircc_driver = {</div><div class='add'>+	.suspend	= ali_ircc_suspend,</div><div class='add'>+	.resume		= ali_ircc_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= ALI_IRCC_DRIVER_NAME,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Module parameters */</div><div class='ctx'> static int qos_mtt_bits = 0x07;  /* 1 ms or more */</div><div class='hunk'>@@ -97,10 +107,7 @@ static int  ali_ircc_is_receiving(struct ali_ircc_cb *self);</div><div class='ctx'> static int  ali_ircc_net_open(struct net_device *dev);</div><div class='ctx'> static int  ali_ircc_net_close(struct net_device *dev);</div><div class='ctx'> static int  ali_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='del'>-static int  ali_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data);</div><div class='ctx'> static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud);</div><div class='del'>-static void ali_ircc_suspend(struct ali_ircc_cb *self);</div><div class='del'>-static void ali_ircc_wakeup(struct ali_ircc_cb *self);</div><div class='ctx'> static struct net_device_stats *ali_ircc_net_get_stats(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /* SIR function */</div><div class='hunk'>@@ -139,12 +146,21 @@ static int __init ali_ircc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	ali_chip_t *chip;</div><div class='ctx'> 	chipio_t info;</div><div class='del'>-	int ret = -ENODEV;</div><div class='add'>+	int ret;</div><div class='ctx'> 	int cfg, cfg_base;</div><div class='ctx'> 	int reg, revision;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	</div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;ali_ircc_driver);</div><div class='add'>+        if (ret) {</div><div class='add'>+                IRDA_ERROR("%s, Can't register driver!\n",</div><div class='add'>+			   ALI_IRCC_DRIVER_NAME);</div><div class='add'>+                return ret;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+	ret = -ENODEV;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Probe for all the ALi chipsets we know about */</div><div class='ctx'> 	for (chip= chips; chip-&gt;name; chip++, i++) </div><div class='hunk'>@@ -214,6 +230,10 @@ static int __init ali_ircc_init(void)</div><div class='ctx'> 	}		</div><div class='ctx'> 		</div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);					   		</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		platform_driver_unregister(&amp;ali_ircc_driver);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,14 +248,14 @@ static void __exit ali_ircc_cleanup(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);	</div><div class='del'>-	</div><div class='del'>-	pm_unregister_all(ali_ircc_pmproc);</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i &lt; 4; i++) {</div><div class='ctx'> 		if (dev_self[i])</div><div class='ctx'> 			ali_ircc_close(dev_self[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='add'>+	platform_driver_unregister(&amp;ali_ircc_driver);</div><div class='add'>+</div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -249,7 +269,6 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct ali_ircc_cb *self;</div><div class='del'>-	struct pm_dev *pmdev;</div><div class='ctx'> 	int dongle_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> 			</div><div class='hunk'>@@ -284,7 +303,8 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'>         self-&gt;io.fifo_size = 16;		/* SIR: 16, FIR: 32 Benjamin 2000/11/1 */</div><div class='ctx'> 	</div><div class='ctx'> 	/* Reserve the ioports that we need */</div><div class='del'>-	if (!request_region(self-&gt;io.fir_base, self-&gt;io.fir_ext, driver_name)) {</div><div class='add'>+	if (!request_region(self-&gt;io.fir_base, self-&gt;io.fir_ext,</div><div class='add'>+			    ALI_IRCC_DRIVER_NAME)) {</div><div class='ctx'> 		IRDA_WARNING("%s(), can't get iobase of 0x%03x\n", __FUNCTION__,</div><div class='ctx'> 			self-&gt;io.fir_base);</div><div class='ctx'> 		err = -ENODEV;</div><div class='hunk'>@@ -354,13 +374,10 @@ static int ali_ircc_open(int i, chipio_t *info)</div><div class='ctx'> </div><div class='ctx'> 	/* Check dongle id */</div><div class='ctx'> 	dongle_id = ali_ircc_read_dongle_id(i, info);</div><div class='del'>-	IRDA_MESSAGE("%s(), %s, Found dongle: %s\n", __FUNCTION__, driver_name, dongle_types[dongle_id]);</div><div class='add'>+	IRDA_MESSAGE("%s(), %s, Found dongle: %s\n", __FUNCTION__,</div><div class='add'>+		     ALI_IRCC_DRIVER_NAME, dongle_types[dongle_id]);</div><div class='ctx'> 		</div><div class='ctx'> 	self-&gt;io.dongle_id = dongle_id;</div><div class='del'>-	</div><div class='del'>-        pmdev = pm_register(PM_SYS_DEV, PM_SYS_IRDA, ali_ircc_pmproc);</div><div class='del'>-        if (pmdev)</div><div class='del'>-                pmdev-&gt;data = self;</div><div class='ctx'> </div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __FUNCTION__);</div><div class='ctx'> 	</div><div class='hunk'>@@ -548,12 +565,11 @@ static int ali_ircc_setup(chipio_t *info)</div><div class='ctx'> 	/* Should be 0x00 in the M1535/M1535D */</div><div class='ctx'> 	if(version != 0x00)</div><div class='ctx'> 	{</div><div class='del'>-		IRDA_ERROR("%s, Wrong chip version %02x\n", driver_name, version);</div><div class='add'>+		IRDA_ERROR("%s, Wrong chip version %02x\n",</div><div class='add'>+			   ALI_IRCC_DRIVER_NAME, version);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	// IRDA_MESSAGE("%s, Found chip at base=0x%03x\n", driver_name, info-&gt;cfg_base);</div><div class='del'>-	</div><div class='ctx'> 	/* Set FIR FIFO Threshold Register */</div><div class='ctx'> 	switch_bank(iobase, BANK1);</div><div class='ctx'> 	outb(RX_FIFO_Threshold, iobase+FIR_FIFO_TR);</div><div class='hunk'>@@ -583,7 +599,8 @@ static int ali_ircc_setup(chipio_t *info)</div><div class='ctx'> 	/* Switch to SIR space */</div><div class='ctx'> 	FIR2SIR(iobase);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_MESSAGE("%s, driver loaded (Benjamin Kong)\n", driver_name);</div><div class='add'>+	IRDA_MESSAGE("%s, driver loaded (Benjamin Kong)\n",</div><div class='add'>+		     ALI_IRCC_DRIVER_NAME);</div><div class='ctx'> 	</div><div class='ctx'> 	/* Enable receive interrupts */ </div><div class='ctx'> 	// outb(UART_IER_RDI, iobase+UART_IER); //benjamin 2000/11/23 01:25PM</div><div class='hunk'>@@ -647,7 +664,8 @@ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id,</div><div class='ctx'> 	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__);</div><div class='ctx'> 		</div><div class='ctx'>  	if (!dev) {</div><div class='del'>-		IRDA_WARNING("%s: irq %d for unknown device.\n", driver_name, irq);</div><div class='add'>+		IRDA_WARNING("%s: irq %d for unknown device.\n",</div><div class='add'>+			     ALI_IRCC_DRIVER_NAME, irq);</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}	</div><div class='ctx'> 	</div><div class='hunk'>@@ -1328,7 +1346,8 @@ static int ali_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	/* Request IRQ and install Interrupt Handler */</div><div class='ctx'> 	if (request_irq(self-&gt;io.irq, ali_ircc_interrupt, 0, dev-&gt;name, dev)) </div><div class='ctx'> 	{</div><div class='del'>-		IRDA_WARNING("%s, unable to allocate irq=%d\n", driver_name,</div><div class='add'>+		IRDA_WARNING("%s, unable to allocate irq=%d\n",</div><div class='add'>+			     ALI_IRCC_DRIVER_NAME,</div><div class='ctx'> 			     self-&gt;io.irq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1338,7 +1357,8 @@ static int ali_ircc_net_open(struct net_device *dev)</div><div class='ctx'> 	 * failure.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (request_dma(self-&gt;io.dma, dev-&gt;name)) {</div><div class='del'>-		IRDA_WARNING("%s, unable to allocate dma=%d\n", driver_name,</div><div class='add'>+		IRDA_WARNING("%s, unable to allocate dma=%d\n",</div><div class='add'>+			     ALI_IRCC_DRIVER_NAME,</div><div class='ctx'> 			     self-&gt;io.dma);</div><div class='ctx'> 		free_irq(self-&gt;io.irq, self);</div><div class='ctx'> 		return -EAGAIN;</div><div class='hunk'>@@ -2108,61 +2128,38 @@ static struct net_device_stats *ali_ircc_net_get_stats(struct net_device *dev)</div><div class='ctx'> 	return &amp;self-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ali_ircc_suspend(struct ali_ircc_cb *self)</div><div class='add'>+static int ali_ircc_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	struct ali_ircc_cb *self = platform_get_drvdata(dev);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_MESSAGE("%s, Suspending\n", driver_name);</div><div class='add'>+	IRDA_MESSAGE("%s, Suspending\n", ALI_IRCC_DRIVER_NAME);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;io.suspended)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ali_ircc_net_close(self-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;io.suspended = 1;</div><div class='ctx'> 	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ali_ircc_wakeup(struct ali_ircc_cb *self)</div><div class='add'>+static int ali_ircc_resume(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='add'>+	struct ali_ircc_cb *self = platform_get_drvdata(dev);</div><div class='ctx'> 	</div><div class='ctx'> 	if (!self-&gt;io.suspended)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	</div><div class='ctx'> 	ali_ircc_net_open(self-&gt;netdev);</div><div class='ctx'> 	</div><div class='del'>-	IRDA_MESSAGE("%s, Waking up\n", driver_name);</div><div class='add'>+	IRDA_MESSAGE("%s, Waking up\n", ALI_IRCC_DRIVER_NAME);</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;io.suspended = 0;</div><div class='del'>-	</div><div class='del'>-	IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int ali_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data)</div><div class='del'>-{</div><div class='del'>-        struct ali_ircc_cb *self = (struct ali_ircc_cb*) dev-&gt;data;</div><div class='del'>-        </div><div class='del'>-        IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );</div><div class='del'>-	</div><div class='del'>-        if (self) {</div><div class='del'>-                switch (rqst) {</div><div class='del'>-                case PM_SUSPEND:</div><div class='del'>-                        ali_ircc_suspend(self);</div><div class='del'>-                        break;</div><div class='del'>-                case PM_RESUME:</div><div class='del'>-                        ali_ircc_wakeup(self);</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-        </div><div class='del'>-        IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __FUNCTION__ );	</div><div class='del'>-        </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* ALi Chip Function */</div><div class='ctx'> </div><div class='ctx'> static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable)</div><div class='head'>diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c<br/>index e6b1985767c2..7b2b4135bb23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/au1k_ir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/au1k_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/au1k_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/au1k_ir.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c<br/>index 910c0cab35b0..33c07d5275da 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/donauboe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/donauboe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/donauboe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/donauboe.c</a></div><div class='hunk'>@@ -1372,7 +1372,7 @@ toshoboe_net_open (struct net_device *dev)</div><div class='ctx'>     return 0;</div><div class='ctx'> </div><div class='ctx'>   if (request_irq (self-&gt;io.irq, toshoboe_interrupt,</div><div class='del'>-                   SA_SHIRQ | SA_INTERRUPT, dev-&gt;name, (void *) self))</div><div class='add'>+                   IRQF_SHARED | IRQF_DISABLED, dev-&gt;name, (void *) self))</div><div class='ctx'>     {</div><div class='ctx'>       return -EAGAIN;</div><div class='ctx'>     }</div><div class='hunk'>@@ -1573,7 +1573,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)</div><div class='ctx'>   self-&gt;io.fir_base = self-&gt;base;</div><div class='ctx'>   self-&gt;io.fir_ext = OBOE_IO_EXTENT;</div><div class='ctx'>   self-&gt;io.irq = pci_dev-&gt;irq;</div><div class='del'>-  self-&gt;io.irqflags = SA_SHIRQ | SA_INTERRUPT;</div><div class='add'>+  self-&gt;io.irqflags = IRQF_SHARED | IRQF_DISABLED;</div><div class='ctx'> </div><div class='ctx'>   self-&gt;speed = self-&gt;io.speed = 9600;</div><div class='ctx'>   self-&gt;async = 0;</div><div class='head'>diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c<br/>index cd87593e4e8a..2a0d538b387f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/irda-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/irda-usb.c</a></div><div class='hunk'>@@ -83,9 +83,9 @@ static struct usb_device_id dongles[] = {</div><div class='ctx'> 	/* Extended Systems, Inc.,  XTNDAccess IrDA USB (ESI-9685) */</div><div class='ctx'> 	{ USB_DEVICE(0x8e9, 0x100), .driver_info = IUC_SPEED_BUG | IUC_NO_WINDOW },</div><div class='ctx'> 	/* SigmaTel STIR4210/4220/4116 USB IrDA (VFIR) Bridge */</div><div class='del'>-	{ USB_DEVICE(0x66f, 0x4210), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },</div><div class='del'>-	{ USB_DEVICE(0x66f, 0x4220), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },</div><div class='del'>-	{ USB_DEVICE(0x66f, 0x4116), .driver_info = IUC_STIR_4210 | IUC_SPEED_BUG },</div><div class='add'>+	{ USB_DEVICE(0x66f, 0x4210), .driver_info = IUC_STIR421X | IUC_SPEED_BUG },</div><div class='add'>+	{ USB_DEVICE(0x66f, 0x4220), .driver_info = IUC_STIR421X | IUC_SPEED_BUG },</div><div class='add'>+	{ USB_DEVICE(0x66f, 0x4116), .driver_info = IUC_STIR421X | IUC_SPEED_BUG },</div><div class='ctx'> 	{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |</div><div class='ctx'> 	  USB_DEVICE_ID_MATCH_INT_SUBCLASS,</div><div class='ctx'> 	  .bInterfaceClass = USB_CLASS_APP_SPEC,</div><div class='hunk'>@@ -154,7 +154,7 @@ static void irda_usb_build_header(struct irda_usb_cb *self,</div><div class='ctx'> 	 * and if either speed or xbofs (or both) needs</div><div class='ctx'> 	 * to be changed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (self-&gt;capability &amp; IUC_STIR_4210 &amp;&amp;</div><div class='add'>+	if (self-&gt;capability &amp; IUC_STIR421X &amp;&amp;</div><div class='ctx'> 	    ((self-&gt;new_speed != -1) || (self-&gt;new_xbofs != -1))) {</div><div class='ctx'> </div><div class='ctx'> 		/* With STIR421x, speed and xBOFs must be set at the same</div><div class='hunk'>@@ -318,7 +318,7 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)</div><div class='ctx'> 	/* Set the new speed and xbofs in this fake frame */</div><div class='ctx'> 	irda_usb_build_header(self, frame, 1);</div><div class='ctx'> </div><div class='del'>-	if ( self-&gt;capability &amp; IUC_STIR_4210 ) {</div><div class='add'>+	if (self-&gt;capability &amp; IUC_STIR421X) {</div><div class='ctx'> 		if (frame[0] == 0) return ; // do nothing if no change</div><div class='ctx'> 		frame[1] = 0; // other parameters don't change here</div><div class='ctx'> 		frame[2] = 0;</div><div class='hunk'>@@ -455,7 +455,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Change setting for next frame */</div><div class='ctx'> </div><div class='del'>-	if ( self-&gt;capability &amp; IUC_STIR_4210 ) {</div><div class='add'>+	if (self-&gt;capability &amp; IUC_STIR421X) {</div><div class='ctx'> 		__u8 turnaround_time;</div><div class='ctx'> 		__u8* frame;</div><div class='ctx'> 		turnaround_time = get_turnaround_time( skb );</div><div class='hunk'>@@ -897,10 +897,13 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	docopy = (urb-&gt;actual_length &lt; IRDA_RX_COPY_THRESHOLD);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new skb */</div><div class='del'>-	if ( self-&gt;capability &amp; IUC_STIR_4210 )</div><div class='del'>-		newskb = dev_alloc_skb(docopy ? urb-&gt;actual_length : IRDA_SKB_MAX_MTU + USB_IRDA_SIGMATEL_HEADER);</div><div class='add'>+	if (self-&gt;capability &amp; IUC_STIR421X)</div><div class='add'>+		newskb = dev_alloc_skb(docopy ? urb-&gt;actual_length :</div><div class='add'>+				       IRDA_SKB_MAX_MTU +</div><div class='add'>+				       USB_IRDA_STIR421X_HEADER);</div><div class='ctx'> 	else</div><div class='del'>-		newskb = dev_alloc_skb(docopy ? urb-&gt;actual_length : IRDA_SKB_MAX_MTU);</div><div class='add'>+		newskb = dev_alloc_skb(docopy ? urb-&gt;actual_length :</div><div class='add'>+				       IRDA_SKB_MAX_MTU);</div><div class='ctx'> </div><div class='ctx'> 	if (!newskb)  {</div><div class='ctx'> 		self-&gt;stats.rx_dropped++;</div><div class='hunk'>@@ -1022,188 +1025,140 @@ static int irda_usb_is_receiving(struct irda_usb_cb *self)</div><div class='ctx'> 	return 0; /* For now */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#define STIR421X_PATCH_PRODUCT_VERSION_STR       "Product Version: "</div><div class='del'>-#define STIR421X_PATCH_COMPONENT_VERSION_STR     "Component Version: "</div><div class='del'>-#define STIR421X_PATCH_DATA_TAG_STR              "STMP"</div><div class='del'>-#define STIR421X_PATCH_FILE_VERSION_MAX_OFFSET   512     /* version info is before here */</div><div class='del'>-#define STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET     512     /* patch image starts before here */</div><div class='del'>-#define STIR421X_PATCH_FILE_END_OF_HEADER_TAG    0x1A    /* marks end of patch file header (PC DOS text file EOF character) */</div><div class='add'>+#define STIR421X_PATCH_PRODUCT_VER     "Product Version: "</div><div class='add'>+#define STIR421X_PATCH_STMP_TAG        "STMP"</div><div class='add'>+#define STIR421X_PATCH_CODE_OFFSET     512 /* patch image starts before here */</div><div class='add'>+/* marks end of patch file header (PC DOS text file EOF character) */</div><div class='add'>+#define STIR421X_PATCH_END_OF_HDR_TAG  0x1A</div><div class='add'>+#define STIR421X_PATCH_BLOCK_SIZE      1023</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Known firmware patches for STIR421x dongles</div><div class='add'>+ * Function stir421x_fwupload (struct irda_usb_cb *self,</div><div class='add'>+ *                             unsigned char *patch,</div><div class='add'>+ *                             const unsigned int patch_len)</div><div class='add'>+ *</div><div class='add'>+ *   Upload firmware code to SigmaTel 421X IRDA-USB dongle</div><div class='ctx'>  */</div><div class='del'>-static char * stir421x_patches[] = {</div><div class='del'>-	"42101001.sb",</div><div class='del'>-	"42101002.sb",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stir421x_get_patch_version(unsigned char * patch, const unsigned long patch_len)</div><div class='add'>+static int stir421x_fw_upload(struct irda_usb_cb *self,</div><div class='add'>+			     unsigned char *patch,</div><div class='add'>+			     const unsigned int patch_len)</div><div class='ctx'> {</div><div class='del'>-	unsigned int version_offset;</div><div class='del'>-	unsigned long version_major, version_minor, version_build;</div><div class='del'>-	unsigned char * version_start;</div><div class='del'>-	int version_found = 0;</div><div class='del'>-</div><div class='del'>-	for (version_offset = 0;</div><div class='del'>-	     version_offset &lt; STIR421X_PATCH_FILE_END_OF_HEADER_TAG;</div><div class='del'>-	     version_offset++) {</div><div class='del'>-		if (!memcmp(patch + version_offset,</div><div class='del'>-			    STIR421X_PATCH_PRODUCT_VERSION_STR,</div><div class='del'>-			    sizeof(STIR421X_PATCH_PRODUCT_VERSION_STR) - 1)) {</div><div class='del'>-				    version_found = 1;</div><div class='del'>-				    version_start = patch +</div><div class='del'>-					    version_offset +</div><div class='del'>-					    sizeof(STIR421X_PATCH_PRODUCT_VERSION_STR) - 1;</div><div class='del'>-				    break;</div><div class='del'>-		}</div><div class='add'>+        int ret = -ENOMEM;</div><div class='add'>+        int actual_len = 0;</div><div class='add'>+        unsigned int i;</div><div class='add'>+        unsigned int block_size = 0;</div><div class='add'>+        unsigned char *patch_block;</div><div class='add'>+</div><div class='add'>+        patch_block = kzalloc(STIR421X_PATCH_BLOCK_SIZE, GFP_KERNEL);</div><div class='add'>+	if (patch_block == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* break up patch into 1023-byte sections */</div><div class='add'>+	for (i = 0; i &lt; patch_len; i += block_size) {</div><div class='add'>+		block_size = patch_len - i;</div><div class='add'>+</div><div class='add'>+		if (block_size &gt; STIR421X_PATCH_BLOCK_SIZE)</div><div class='add'>+			block_size = STIR421X_PATCH_BLOCK_SIZE;</div><div class='add'>+</div><div class='add'>+		/* upload the patch section */</div><div class='add'>+		memcpy(patch_block, patch + i, block_size);</div><div class='add'>+</div><div class='add'>+		ret = usb_bulk_msg(self-&gt;usbdev,</div><div class='add'>+				   usb_sndbulkpipe(self-&gt;usbdev,</div><div class='add'>+						   self-&gt;bulk_out_ep),</div><div class='add'>+				   patch_block, block_size,</div><div class='add'>+				   &amp;actual_len, msecs_to_jiffies(500));</div><div class='add'>+		IRDA_DEBUG(3,"%s(): Bulk send %u bytes, ret=%d\n",</div><div class='add'>+			   __FUNCTION__, actual_len, ret);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* We couldn't find a product version on this patch */</div><div class='del'>-	if (!version_found)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Let's check if the product version is dotted */</div><div class='del'>-	if (version_start[3] != '.' ||</div><div class='del'>-	    version_start[7] != '.')</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	version_major = simple_strtoul(version_start, NULL, 10);</div><div class='del'>-	version_minor = simple_strtoul(version_start + 4, NULL, 10);</div><div class='del'>-	version_build = simple_strtoul(version_start + 8, NULL, 10);</div><div class='del'>-</div><div class='del'>-	IRDA_DEBUG(2, "%s(), Major: %ld Minor: %ld Build: %ld\n",</div><div class='del'>-		   __FUNCTION__,</div><div class='del'>-		   version_major, version_minor, version_build);</div><div class='del'>-</div><div class='del'>-	return (((version_major) &lt;&lt; 12) +</div><div class='del'>-		((version_minor) &lt;&lt; 8) +</div><div class='del'>-		((version_build / 10) &lt;&lt; 4) +</div><div class='del'>-		(version_build % 10));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int stir421x_upload_patch (struct irda_usb_cb *self,</div><div class='del'>-				  unsigned char * patch,</div><div class='del'>-				  const unsigned int patch_len)</div><div class='del'>-{</div><div class='del'>-    int retval = 0;</div><div class='del'>-    int actual_len;</div><div class='del'>-    unsigned int i = 0, download_amount = 0;</div><div class='del'>-    unsigned char * patch_chunk;</div><div class='del'>-</div><div class='del'>-    IRDA_DEBUG (2, "%s(), Uploading STIR421x Patch\n", __FUNCTION__);</div><div class='del'>-</div><div class='del'>-    patch_chunk = kzalloc(STIR421X_MAX_PATCH_DOWNLOAD_SIZE, GFP_KERNEL);</div><div class='del'>-    if (patch_chunk == NULL)</div><div class='del'>-	    return -ENOMEM;</div><div class='del'>-</div><div class='del'>-    /* break up patch into 1023-byte sections */</div><div class='del'>-    for (i = 0; retval &gt;= 0 &amp;&amp; i &lt; patch_len; i += download_amount) {</div><div class='del'>-	    download_amount = patch_len - i;</div><div class='del'>-	    if (download_amount &gt; STIR421X_MAX_PATCH_DOWNLOAD_SIZE)</div><div class='del'>-		    download_amount = STIR421X_MAX_PATCH_DOWNLOAD_SIZE;</div><div class='del'>-</div><div class='del'>-	    /* download the patch section */</div><div class='del'>-	    memcpy(patch_chunk, patch + i, download_amount);</div><div class='del'>-</div><div class='del'>-	    retval = usb_bulk_msg (self-&gt;usbdev,</div><div class='del'>-				   usb_sndbulkpipe (self-&gt;usbdev,</div><div class='del'>-						    self-&gt;bulk_out_ep),</div><div class='del'>-				   patch_chunk, download_amount,</div><div class='del'>-				   &amp;actual_len, msecs_to_jiffies (500));</div><div class='del'>-	    IRDA_DEBUG (2, "%s(), Sent %u bytes\n", __FUNCTION__,</div><div class='del'>-			actual_len);</div><div class='del'>-	    if (retval == 0)</div><div class='del'>-		    mdelay(10);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    kfree(patch_chunk);</div><div class='del'>-</div><div class='del'>-    if (i != patch_len) {</div><div class='del'>-	    IRDA_ERROR ("%s(), Pushed %d bytes (!= patch_len (%d))\n",</div><div class='del'>-		       __FUNCTION__, i, patch_len);</div><div class='del'>-	    retval = -EIO;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (retval &lt; 0)</div><div class='del'>-	    /* todo - mark device as not ready */</div><div class='del'>-	    IRDA_ERROR ("%s(), STIR421x patch upload failed (%d)\n",</div><div class='del'>-			__FUNCTION__, retval);</div><div class='del'>-</div><div class='del'>-    return retval;</div><div class='del'>-}</div><div class='add'>+	kfree(patch_block);</div><div class='ctx'> </div><div class='add'>+        return ret;</div><div class='add'>+ }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Function stir421x_patch_device(struct irda_usb_cb *self)</div><div class='add'>+ *</div><div class='add'>+ * Get a firmware code from userspase using hotplug request_firmware() call</div><div class='add'>+  */</div><div class='ctx'> static int stir421x_patch_device(struct irda_usb_cb *self)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i, patch_found = 0, data_found = 0, data_offset;</div><div class='del'>-	int patch_version, ret = 0;</div><div class='del'>-	const struct firmware *fw_entry;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(stir421x_patches); i++) {</div><div class='del'>-		if(request_firmware(&amp;fw_entry, stir421x_patches[i], &amp;self-&gt;usbdev-&gt;dev) != 0) {</div><div class='del'>-			IRDA_ERROR( "%s(), Patch %s is not available\n", __FUNCTION__, stir421x_patches[i]);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-                /* We found a patch from userspace */</div><div class='del'>-		patch_version = stir421x_get_patch_version (fw_entry-&gt;data, fw_entry-&gt;size);</div><div class='del'>-</div><div class='del'>-		if (patch_version &lt; 0) {</div><div class='del'>-			/* Couldn't fetch a version, let's move on to the next file */</div><div class='del'>-			IRDA_ERROR("%s(), version parsing failed\n", __FUNCTION__);</div><div class='del'>-			ret = patch_version;</div><div class='del'>-			release_firmware(fw_entry);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (patch_version != self-&gt;usbdev-&gt;descriptor.bcdDevice) {</div><div class='del'>-			/* Patch version and device don't match */</div><div class='del'>-			IRDA_ERROR ("%s(), wrong patch version (%d &lt;-&gt; %d)\n",</div><div class='del'>-				    __FUNCTION__,</div><div class='del'>-				    patch_version, self-&gt;usbdev-&gt;descriptor.bcdDevice);</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			release_firmware(fw_entry);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If we're here, we've found a correct patch */</div><div class='del'>-		patch_found = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We couldn't find a valid firmware, let's leave */</div><div class='del'>-	if (!patch_found)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* The actual image starts after the "STMP" keyword */</div><div class='del'>-	for (data_offset = 0; data_offset &lt; STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET; data_offset++) {</div><div class='del'>-		if (!memcmp(fw_entry-&gt;data + data_offset,</div><div class='del'>-			    STIR421X_PATCH_DATA_TAG_STR,</div><div class='del'>-			    sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET))) {</div><div class='del'>-			IRDA_DEBUG(2, "%s(), found patch data for STIR421x at offset %d\n",</div><div class='del'>-				   __FUNCTION__, data_offset);</div><div class='del'>-			data_found = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We couldn't find "STMP" from the header */</div><div class='del'>-	if (!data_found)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Let's upload the patch to the target */</div><div class='del'>-	ret = stir421x_upload_patch(self,</div><div class='del'>-				    &amp;fw_entry-&gt;data[data_offset + sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET)],</div><div class='del'>-				    fw_entry-&gt;size - (data_offset + sizeof(STIR421X_PATCH_FILE_IMAGE_MAX_OFFSET)));</div><div class='del'>-</div><div class='del'>-	release_firmware(fw_entry);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='add'>+        unsigned int i;</div><div class='add'>+        int ret;</div><div class='add'>+        char stir421x_fw_name[11];</div><div class='add'>+        const struct firmware *fw;</div><div class='add'>+        unsigned char *fw_version_ptr; /* pointer to version string */</div><div class='add'>+	unsigned long fw_version = 0;</div><div class='add'>+</div><div class='add'>+        /*</div><div class='add'>+         * Known firmware patch file names for STIR421x dongles</div><div class='add'>+         * are "42101001.sb" or "42101002.sb"</div><div class='add'>+         */</div><div class='add'>+        sprintf(stir421x_fw_name, "4210%4X.sb",</div><div class='add'>+                self-&gt;usbdev-&gt;descriptor.bcdDevice);</div><div class='add'>+        ret = request_firmware(&amp;fw, stir421x_fw_name, &amp;self-&gt;usbdev-&gt;dev);</div><div class='add'>+        if (ret &lt; 0)</div><div class='add'>+                return ret;</div><div class='add'>+</div><div class='add'>+        /* We get a patch from userspace */</div><div class='add'>+        IRDA_MESSAGE("%s(): Received firmware %s (%zu bytes)\n",</div><div class='add'>+                     __FUNCTION__, stir421x_fw_name, fw-&gt;size);</div><div class='add'>+</div><div class='add'>+        ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Get the bcd product version */</div><div class='add'>+        if (!memcmp(fw-&gt;data, STIR421X_PATCH_PRODUCT_VER,</div><div class='add'>+                    sizeof(STIR421X_PATCH_PRODUCT_VER) - 1)) {</div><div class='add'>+                fw_version_ptr = fw-&gt;data +</div><div class='add'>+			sizeof(STIR421X_PATCH_PRODUCT_VER) - 1;</div><div class='add'>+</div><div class='add'>+                /* Let's check if the product version is dotted */</div><div class='add'>+                if (fw_version_ptr[3] == '.' &amp;&amp;</div><div class='add'>+		    fw_version_ptr[7] == '.') {</div><div class='add'>+			unsigned long major, minor, build;</div><div class='add'>+			major = simple_strtoul(fw_version_ptr, NULL, 10);</div><div class='add'>+			minor = simple_strtoul(fw_version_ptr + 4, NULL, 10);</div><div class='add'>+			build = simple_strtoul(fw_version_ptr + 8, NULL, 10);</div><div class='add'>+</div><div class='add'>+			fw_version = (major &lt;&lt; 12)</div><div class='add'>+				+ (minor &lt;&lt; 8)</div><div class='add'>+				+ ((build / 10) &lt;&lt; 4)</div><div class='add'>+				+ (build % 10);</div><div class='add'>+</div><div class='add'>+			IRDA_DEBUG(3, "%s(): Firmware Product version %ld\n",</div><div class='add'>+                                   __FUNCTION__, fw_version);</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (self-&gt;usbdev-&gt;descriptor.bcdDevice == fw_version) {</div><div class='add'>+                /*</div><div class='add'>+		 * If we're here, we've found a correct patch</div><div class='add'>+                 * The actual image starts after the "STMP" keyword</div><div class='add'>+                 * so forward to the firmware header tag</div><div class='add'>+                 */</div><div class='add'>+                for (i = 0; (fw-&gt;data[i] != STIR421X_PATCH_END_OF_HDR_TAG)</div><div class='add'>+			     &amp;&amp; (i &lt; fw-&gt;size); i++) ;</div><div class='add'>+                /* here we check for the out of buffer case */</div><div class='add'>+                if ((STIR421X_PATCH_END_OF_HDR_TAG == fw-&gt;data[i])</div><div class='add'>+                    &amp;&amp; (i &lt; STIR421X_PATCH_CODE_OFFSET)) {</div><div class='add'>+                        if (!memcmp(fw-&gt;data + i + 1, STIR421X_PATCH_STMP_TAG,</div><div class='add'>+                                    sizeof(STIR421X_PATCH_STMP_TAG) - 1)) {</div><div class='add'>+</div><div class='add'>+				/* We can upload the patch to the target */</div><div class='add'>+				i += sizeof(STIR421X_PATCH_STMP_TAG);</div><div class='add'>+                                ret = stir421x_fw_upload(self, &amp;fw-&gt;data[i],</div><div class='add'>+							 fw-&gt;size - i);</div><div class='add'>+                        }</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        release_firmware(fw);</div><div class='add'>+</div><div class='add'>+        return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1702,12 +1657,12 @@ static int irda_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	init_timer(&amp;self-&gt;rx_defer_timer);</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;capability = id-&gt;driver_info;</div><div class='del'>-	self-&gt;needspatch = ((self-&gt;capability &amp; IUC_STIR_4210) != 0) ;</div><div class='add'>+	self-&gt;needspatch = ((self-&gt;capability &amp; IUC_STIR421X) != 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Create all of the needed urbs */</div><div class='del'>-	if (self-&gt;capability &amp; IUC_STIR_4210) {</div><div class='add'>+	if (self-&gt;capability &amp; IUC_STIR421X) {</div><div class='ctx'> 		self-&gt;max_rx_urb = IU_SIGMATEL_MAX_RX_URBS;</div><div class='del'>-		self-&gt;header_length = USB_IRDA_SIGMATEL_HEADER;</div><div class='add'>+		self-&gt;header_length = USB_IRDA_STIR421X_HEADER;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		self-&gt;max_rx_urb = IU_MAX_RX_URBS;</div><div class='ctx'> 		self-&gt;header_length = USB_IRDA_HEADER;</div><div class='hunk'>@@ -1813,8 +1768,8 @@ static int irda_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 		/* Now we fetch and upload the firmware patch */</div><div class='ctx'> 		ret = stir421x_patch_device(self);</div><div class='ctx'> 		self-&gt;needspatch = (ret &lt; 0);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			printk("patch_device failed\n");</div><div class='add'>+		if (self-&gt;needspatch) {</div><div class='add'>+			IRDA_ERROR("STIR421X: Couldn't upload patch\n");</div><div class='ctx'> 			goto err_out_5;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h<br/>index d833db52cebf..6b2271f18e77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/irda-usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/irda-usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/irda-usb.h</a></div><div class='hunk'>@@ -34,9 +34,6 @@</div><div class='ctx'> #include &lt;net/irda/irda.h&gt;</div><div class='ctx'> #include &lt;net/irda/irda_device.h&gt;      /* struct irlap_cb */</div><div class='ctx'> </div><div class='del'>-#define PATCH_FILE_SIZE_MAX     65536</div><div class='del'>-#define PATCH_FILE_SIZE_MIN     80</div><div class='del'>-</div><div class='ctx'> #define RX_COPY_THRESHOLD 200</div><div class='ctx'> #define IRDA_USB_MAX_MTU 2051</div><div class='ctx'> #define IRDA_USB_SPEED_MTU 64		/* Weird, but work like this */</div><div class='hunk'>@@ -107,14 +104,15 @@</div><div class='ctx'> #define IUC_SMALL_PKT	0x10	/* Device doesn't behave with big Rx packets */</div><div class='ctx'> #define IUC_MAX_WINDOW	0x20	/* Device underestimate the Rx window */</div><div class='ctx'> #define IUC_MAX_XBOFS	0x40	/* Device need more xbofs than advertised */</div><div class='del'>-#define IUC_STIR_4210	0x80	/* SigmaTel 4210/4220/4116 VFIR */</div><div class='add'>+#define IUC_STIR421X	0x80	/* SigmaTel 4210/4220/4116 VFIR */</div><div class='ctx'> </div><div class='ctx'> /* USB class definitions */</div><div class='ctx'> #define USB_IRDA_HEADER            0x01</div><div class='ctx'> #define USB_CLASS_IRDA             0x02 /* USB_CLASS_APP_SPEC subclass */</div><div class='ctx'> #define USB_DT_IRDA                0x21</div><div class='del'>-#define USB_IRDA_SIGMATEL_HEADER   0x03</div><div class='del'>-#define IU_SIGMATEL_MAX_RX_URBS    (IU_MAX_ACTIVE_RX_URBS + USB_IRDA_SIGMATEL_HEADER)</div><div class='add'>+#define USB_IRDA_STIR421X_HEADER   0x03</div><div class='add'>+#define IU_SIGMATEL_MAX_RX_URBS    (IU_MAX_ACTIVE_RX_URBS + \</div><div class='add'>+                                    USB_IRDA_STIR421X_HEADER)</div><div class='ctx'> </div><div class='ctx'> struct irda_class_desc {</div><div class='ctx'> 	__u8  bLength;</div><div class='head'>diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c<br/>index 98fa5319e5cc..44efd49bf4a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/irport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/irport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/irport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/irport.c</a></div><div class='hunk'>@@ -386,7 +386,7 @@ static int __irport_change_speed(struct irda_task *task)</div><div class='ctx'> 	/* Locking notes : this function may be called from irq context with</div><div class='ctx'> 	 * spinlock, via irport_write_wakeup(), or from non-interrupt without</div><div class='ctx'> 	 * spinlock (from the task timer). Yuck !</div><div class='del'>-	 * This is ugly, and unsafe is the spinlock is not already aquired.</div><div class='add'>+	 * This is ugly, and unsafe is the spinlock is not already acquired.</div><div class='ctx'> 	 * This will be fixed when irda-task get rewritten.</div><div class='ctx'> 	 * Jean II */</div><div class='ctx'> 	if (!spin_is_locked(&amp;self-&gt;lock)) {</div><div class='head'>diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c<br/>new file mode 100644<br/>index 000000000000..47f6f64d604c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/mcs7780.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/mcs7780.c</a></div><div class='hunk'>@@ -0,0 +1,1009 @@</div><div class='add'>+/*****************************************************************************</div><div class='add'>+*</div><div class='add'>+* Filename:      mcs7780.c</div><div class='add'>+* Version:       0.4-alpha</div><div class='add'>+* Description:   Irda MosChip USB Dongle Driver</div><div class='add'>+* Authors:       Lukasz Stelmach &lt;stlman@poczta.fm&gt;</div><div class='add'>+* 		 Brian Pugh &lt;bpugh@cs.pdx.edu&gt;</div><div class='add'>+*		 Judy Fischbach &lt;jfisch@cs.pdx.edu&gt;</div><div class='add'>+*</div><div class='add'>+*       Based on stir4200 driver, but some things done differently.</div><div class='add'>+*       Based on earlier driver by Paul Stewart &lt;stewart@parc.com&gt;</div><div class='add'>+*</div><div class='add'>+*       Copyright (C) 2000, Roman Weissgaerber &lt;weissg@vienna.at&gt;</div><div class='add'>+*       Copyright (C) 2001, Dag Brattli &lt;dag@brattli.net&gt;</div><div class='add'>+*       Copyright (C) 2001, Jean Tourrilhes &lt;jt@hpl.hp.com&gt;</div><div class='add'>+*       Copyright (C) 2004, Stephen Hemminger &lt;shemminger@osdl.org&gt;</div><div class='add'>+*       Copyright (C) 2005, Lukasz Stelmach &lt;stlman@poczta.fm&gt;</div><div class='add'>+*       Copyright (C) 2005, Brian Pugh &lt;bpugh@cs.pdx.edu&gt;</div><div class='add'>+*       Copyright (C) 2005, Judy Fischbach &lt;jfisch@cs.pdx.edu&gt;</div><div class='add'>+*</div><div class='add'>+*       This program is free software; you can redistribute it and/or modify</div><div class='add'>+*       it under the terms of the GNU General Public License as published by</div><div class='add'>+*       the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+*       (at your option) any later version.</div><div class='add'>+*</div><div class='add'>+*       This program is distributed in the hope that it will be useful,</div><div class='add'>+*       but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+*       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+*       GNU General Public License for more details.</div><div class='add'>+*</div><div class='add'>+*       You should have received a copy of the GNU General Public License</div><div class='add'>+*       along with this program; if not, write to the Free Software</div><div class='add'>+*       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*</div><div class='add'>+*****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MCS7780 is a simple USB to IrDA bridge by MosChip. It is neither</div><div class='add'>+ * compatibile with irda-usb nor with stir4200. Although it is quite</div><div class='add'>+ * similar to the later as far as general idea of operation is concerned.</div><div class='add'>+ * That is it requires the software to do all the framing job at SIR speeds.</div><div class='add'>+ * The hardware does take care of the framing at MIR and FIR speeds.</div><div class='add'>+ * It supports all speeds from 2400 through 4Mbps</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kref.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/irda/irda.h&gt;</div><div class='add'>+#include &lt;net/irda/wrapper.h&gt;</div><div class='add'>+#include &lt;net/irda/crc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcs7780.h"</div><div class='add'>+</div><div class='add'>+#define MCS_VENDOR_ID 0x9710</div><div class='add'>+#define MCS_PRODUCT_ID 0x7780</div><div class='add'>+</div><div class='add'>+static struct usb_device_id mcs_table[] = {</div><div class='add'>+	/* MosChip Corp.,  MCS7780 FIR-USB Adapter */</div><div class='add'>+	{USB_DEVICE(MCS_VENDOR_ID, MCS_PRODUCT_ID)},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Brian Pugh &lt;bpugh@cs.pdx.edu&gt;");</div><div class='add'>+MODULE_DESCRIPTION("IrDA-USB Dongle Driver for MosChip MCS7780");</div><div class='add'>+MODULE_VERSION("0.3alpha");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, mcs_table);</div><div class='add'>+</div><div class='add'>+static int qos_mtt_bits = 0x07 /* &gt; 1ms */ ;</div><div class='add'>+module_param(qos_mtt_bits, int, 0);</div><div class='add'>+MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time");</div><div class='add'>+</div><div class='add'>+static int receive_mode = 0x1;</div><div class='add'>+module_param(receive_mode, int, 0);</div><div class='add'>+MODULE_PARM_DESC(receive_mode,</div><div class='add'>+		 "Receive mode of the device (1:fast, 0:slow, default:1)");</div><div class='add'>+</div><div class='add'>+static int sir_tweak = 1;</div><div class='add'>+module_param(sir_tweak, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(sir_tweak,</div><div class='add'>+		 "Default pulse width (1:1.6us, 0:3/16 bit, default:1).");</div><div class='add'>+</div><div class='add'>+static int transceiver_type = MCS_TSC_VISHAY;</div><div class='add'>+module_param(transceiver_type, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(transceiver_type, "IR transceiver type, see mcs7780.h.");</div><div class='add'>+</div><div class='add'>+static struct usb_driver mcs_driver = {</div><div class='add'>+	.name = "mcs7780",</div><div class='add'>+	.probe = mcs_probe,</div><div class='add'>+	.disconnect = mcs_disconnect,</div><div class='add'>+	.id_table = mcs_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* speed flag selection by direct addressing.</div><div class='add'>+addr = (speed &gt;&gt; 8) &amp; 0x0f</div><div class='add'>+</div><div class='add'>+0x1   57600	 0x2  115200	 0x4 1152000	 0x5    9600</div><div class='add'>+0x6   38400	 0x9    2400	 0xa  576000	 0xb   19200</div><div class='add'>+</div><div class='add'>+4Mbps (or 2400) must be checked separately. Since it also has</div><div class='add'>+to be programmed in a different manner that is not a big problem.</div><div class='add'>+*/</div><div class='add'>+static __u16 mcs_speed_set[16] = { 0,</div><div class='add'>+	MCS_SPEED_57600,</div><div class='add'>+	MCS_SPEED_115200,</div><div class='add'>+	0,</div><div class='add'>+	MCS_SPEED_1152000,</div><div class='add'>+	MCS_SPEED_9600,</div><div class='add'>+	MCS_SPEED_38400,</div><div class='add'>+	0, 0,</div><div class='add'>+	MCS_SPEED_2400,</div><div class='add'>+	MCS_SPEED_576000,</div><div class='add'>+	MCS_SPEED_19200,</div><div class='add'>+	0, 0, 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Set given 16 bit register with a 16 bit value. Send control message</div><div class='add'>+ * to set dongle register. */</div><div class='add'>+static int mcs_set_reg(struct mcs_cb *mcs, __u16 reg, __u16 val)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *dev = mcs-&gt;usbdev;</div><div class='add'>+	return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), MCS_WRREQ,</div><div class='add'>+			       MCS_WR_RTYPE, val, reg, NULL, 0,</div><div class='add'>+			       msecs_to_jiffies(MCS_CTRL_TIMEOUT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get 16 bit register value. Send contol message to read dongle register. */</div><div class='add'>+static int mcs_get_reg(struct mcs_cb *mcs, __u16 reg, __u16 * val)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *dev = mcs-&gt;usbdev;</div><div class='add'>+	int ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ,</div><div class='add'>+				  MCS_RD_RTYPE, 0, reg, val, 2,</div><div class='add'>+				  msecs_to_jiffies(MCS_CTRL_TIMEOUT));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup a communication between mcs7780 and TFDU chips.  It is described</div><div class='add'>+ * in more detail in the data sheet.  The setup sequence puts the the</div><div class='add'>+ * vishay tranceiver into high speed mode.  It will also receive SIR speed</div><div class='add'>+ * packets but at reduced sensitivity.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* 0: OK 1:ERROR */</div><div class='add'>+static inline int mcs_setup_transceiver_vishay(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	__u16 rval;</div><div class='add'>+</div><div class='add'>+	/* mcs_get_reg should read exactly two bytes from the dongle */</div><div class='add'>+	ret = mcs_get_reg(mcs, MCS_XCVR_REG, &amp;rval);</div><div class='add'>+	if (unlikely(ret != 2)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The MCS_XCVR_CONF bit puts the transceiver into configuration</div><div class='add'>+	 * mode.  The MCS_MODE0 bit must start out high (1) and then</div><div class='add'>+	 * transition to low and the MCS_STFIR and MCS_MODE1 bits must</div><div class='add'>+	 * be low.</div><div class='add'>+	 */</div><div class='add'>+	rval |= (MCS_MODE0 | MCS_XCVR_CONF);</div><div class='add'>+	rval &amp;= ~MCS_STFIR;</div><div class='add'>+	rval &amp;= ~MCS_MODE1;</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_XCVR_REG, rval);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	rval &amp;= ~MCS_MODE0;</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_XCVR_REG, rval);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	rval &amp;= ~MCS_XCVR_CONF;</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_XCVR_REG, rval);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	error:</div><div class='add'>+		return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup a communication between mcs7780 and agilent chip. */</div><div class='add'>+static inline int mcs_setup_transceiver_agilent(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	IRDA_WARNING("This transceiver type is not supported yet.");</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup a communication between mcs7780 and sharp chip. */</div><div class='add'>+static inline int mcs_setup_transceiver_sharp(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	IRDA_WARNING("This transceiver type is not supported yet.");</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common setup for all transceivers */</div><div class='add'>+static inline int mcs_setup_transceiver(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	__u16 rval;</div><div class='add'>+	char *msg;</div><div class='add'>+</div><div class='add'>+	msg = "Basic transceiver setup error.";</div><div class='add'>+</div><div class='add'>+	/* read value of MODE Register, set the DRIVER and RESET bits</div><div class='add'>+	* and write value back out to MODE Register</div><div class='add'>+	*/</div><div class='add'>+	ret = mcs_get_reg(mcs, MCS_MODE_REG, &amp;rval);</div><div class='add'>+	if(unlikely(ret != 2))</div><div class='add'>+		goto error;</div><div class='add'>+	rval |= MCS_DRIVER;	/* put the mcs7780 into configuration mode. */</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_MODE_REG, rval);</div><div class='add'>+	if(unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	rval = 0;		/* set min pulse width to 0 initially. */</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_MINRXPW_REG, rval);</div><div class='add'>+	if(unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = mcs_get_reg(mcs, MCS_MODE_REG, &amp;rval);</div><div class='add'>+	if(unlikely(ret != 2))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	rval &amp;= ~MCS_FIR;	/* turn off fir mode. */</div><div class='add'>+	if(mcs-&gt;sir_tweak)</div><div class='add'>+		rval |= MCS_SIR16US;	/* 1.6us pulse width */</div><div class='add'>+	else</div><div class='add'>+		rval &amp;= ~MCS_SIR16US;	/* 3/16 bit time pulse width */</div><div class='add'>+</div><div class='add'>+	/* make sure ask mode and back to back packets are off. */</div><div class='add'>+	rval &amp;= ~(MCS_BBTG | MCS_ASK);</div><div class='add'>+</div><div class='add'>+	rval &amp;= ~MCS_SPEED_MASK;</div><div class='add'>+	rval |= MCS_SPEED_9600;		/* make sure initial speed is 9600. */</div><div class='add'>+	mcs-&gt;speed = 9600;</div><div class='add'>+	mcs-&gt;new_speed = 0;		/* new_speed is set to 0 */</div><div class='add'>+	rval &amp;= ~MCS_PLLPWDN;		/* disable power down. */</div><div class='add'>+</div><div class='add'>+	/* make sure device determines direction and that the auto send sip</div><div class='add'>+	 * pulse are on.</div><div class='add'>+	 */</div><div class='add'>+	rval |= MCS_DTD | MCS_SIPEN;</div><div class='add'>+</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_MODE_REG, rval);</div><div class='add'>+	if(unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	msg = "transceiver model specific setup error.";</div><div class='add'>+	switch (mcs-&gt;transceiver_type) {</div><div class='add'>+	case MCS_TSC_VISHAY:</div><div class='add'>+		ret = mcs_setup_transceiver_vishay(mcs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCS_TSC_SHARP:</div><div class='add'>+		ret = mcs_setup_transceiver_sharp(mcs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCS_TSC_AGILENT:</div><div class='add'>+		ret = mcs_setup_transceiver_agilent(mcs);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		IRDA_WARNING("Unknown transceiver type: %d",</div><div class='add'>+			     mcs-&gt;transceiver_type);</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* If transceiver is not SHARP, then if receive mode set</div><div class='add'>+	* on the RXFAST bit in the XCVR Register otherwise unset it</div><div class='add'>+	*/</div><div class='add'>+	if (mcs-&gt;transceiver_type != MCS_TSC_SHARP) {</div><div class='add'>+</div><div class='add'>+		ret = mcs_get_reg(mcs, MCS_XCVR_REG, &amp;rval);</div><div class='add'>+		if (unlikely(ret != 2))</div><div class='add'>+			goto error;</div><div class='add'>+		if (mcs-&gt;receive_mode)</div><div class='add'>+			rval |= MCS_RXFAST;</div><div class='add'>+		else</div><div class='add'>+			rval &amp;= ~MCS_RXFAST;</div><div class='add'>+		ret = mcs_set_reg(mcs, MCS_XCVR_REG, rval);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = "transceiver reset.";</div><div class='add'>+</div><div class='add'>+	ret = mcs_get_reg(mcs, MCS_MODE_REG, &amp;rval);</div><div class='add'>+	if (unlikely(ret != 2))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* reset the mcs7780 so all changes take effect. */</div><div class='add'>+	rval &amp;= ~MCS_RESET;</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_MODE_REG, rval);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+	else</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	IRDA_ERROR("%s", msg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wraps the data in format for SIR */</div><div class='add'>+static inline int mcs_wrap_sir_skb(struct sk_buff *skb, __u8 * buf)</div><div class='add'>+{</div><div class='add'>+	int wraplen;</div><div class='add'>+</div><div class='add'>+	/* 2: full frame length, including "the length" */</div><div class='add'>+	wraplen = async_wrap_skb(skb, buf + 2, 4094);</div><div class='add'>+</div><div class='add'>+	wraplen += 2;</div><div class='add'>+	buf[0] = wraplen &amp; 0xff;</div><div class='add'>+	buf[1] = (wraplen &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return wraplen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wraps the data in format for FIR */</div><div class='add'>+static unsigned mcs_wrap_fir_skb(const struct sk_buff *skb, __u8 *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = 0;</div><div class='add'>+	__u32 fcs = ~(crc32_le(~0, skb-&gt;data, skb-&gt;len));</div><div class='add'>+</div><div class='add'>+	/* add 2 bytes for length value and 4 bytes for fcs. */</div><div class='add'>+	len = skb-&gt;len + 6;</div><div class='add'>+</div><div class='add'>+	/* The mcs7780 requires that the first two bytes are the packet</div><div class='add'>+	 * length in little endian order.  Note: the length value includes</div><div class='add'>+	 * the two bytes for the length value itself.</div><div class='add'>+	 */</div><div class='add'>+	buf[0] = len &amp; 0xff;</div><div class='add'>+	buf[1] = (len &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	/* copy the data into the tx buffer. */</div><div class='add'>+	memcpy(buf+2, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	/* put the fcs in the last four bytes in little endian order. */</div><div class='add'>+	buf[len - 4] = fcs &amp; 0xff;</div><div class='add'>+	buf[len - 3] = (fcs &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	buf[len - 2] = (fcs &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	buf[len - 1] = (fcs &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Wraps the data in format for MIR */</div><div class='add'>+static unsigned mcs_wrap_mir_skb(const struct sk_buff *skb, __u8 *buf)</div><div class='add'>+{</div><div class='add'>+	__u16 fcs = 0;</div><div class='add'>+	int len = skb-&gt;len + 4;</div><div class='add'>+</div><div class='add'>+	fcs = ~(irda_calc_crc16(~fcs, skb-&gt;data, skb-&gt;len));</div><div class='add'>+	/* put the total packet length in first.  Note: packet length</div><div class='add'>+	 * value includes the two bytes that hold the packet length</div><div class='add'>+	 * itself.</div><div class='add'>+	 */</div><div class='add'>+	buf[0] = len &amp; 0xff;</div><div class='add'>+	buf[1] = (len &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	/* copy the data */</div><div class='add'>+	memcpy(buf+2, skb-&gt;data, skb-&gt;len);</div><div class='add'>+	/* put the fcs in last two bytes in little endian order. */</div><div class='add'>+	buf[len - 2] = fcs &amp; 0xff;</div><div class='add'>+	buf[len - 1] = (fcs &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Unwrap received packets at MIR speed.  A 16 bit crc_ccitt checksum is</div><div class='add'>+ * used for the fcs.  When performed over the entire packet the result</div><div class='add'>+ * should be GOOD_FCS = 0xf0b8.  Hands the unwrapped data off to the IrDA</div><div class='add'>+ * layer via a sk_buff.</div><div class='add'>+ */</div><div class='add'>+static void mcs_unwrap_mir(struct mcs_cb *mcs, __u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	__u16 fcs;</div><div class='add'>+	int new_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* Assume that the frames are going to fill a single packet</div><div class='add'>+	 * rather than span multiple packets.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	new_len = len - 2;</div><div class='add'>+	if(unlikely(new_len &lt;= 0)) {</div><div class='add'>+		IRDA_ERROR("%s short frame length %d\n",</div><div class='add'>+			     mcs-&gt;netdev-&gt;name, new_len);</div><div class='add'>+		++mcs-&gt;stats.rx_errors;</div><div class='add'>+		++mcs-&gt;stats.rx_length_errors;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	fcs = 0;</div><div class='add'>+	fcs = irda_calc_crc16(~fcs, buf, len);</div><div class='add'>+</div><div class='add'>+	if(fcs != GOOD_FCS) {</div><div class='add'>+		IRDA_ERROR("crc error calc 0x%x len %d\n",</div><div class='add'>+			   fcs, new_len);</div><div class='add'>+		mcs-&gt;stats.rx_errors++;</div><div class='add'>+		mcs-&gt;stats.rx_crc_errors++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(new_len + 1);</div><div class='add'>+	if(unlikely(!skb)) {</div><div class='add'>+		++mcs-&gt;stats.rx_dropped;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, 1);</div><div class='add'>+	memcpy(skb-&gt;data, buf, new_len);</div><div class='add'>+	skb_put(skb, new_len);</div><div class='add'>+	skb-&gt;mac.raw = skb-&gt;data;</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IRDA);</div><div class='add'>+	skb-&gt;dev = mcs-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;stats.rx_packets++;</div><div class='add'>+	mcs-&gt;stats.rx_bytes += new_len;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Unwrap received packets at FIR speed.  A 32 bit crc_ccitt checksum is</div><div class='add'>+ * used for the fcs.  Hands the unwrapped data off to the IrDA</div><div class='add'>+ * layer via a sk_buff.</div><div class='add'>+ */</div><div class='add'>+static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	__u32 fcs;</div><div class='add'>+	int new_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* Assume that the frames are going to fill a single packet</div><div class='add'>+	 * rather than span multiple packets.  This is most likely a false</div><div class='add'>+	 * assumption.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	new_len = len - 4;</div><div class='add'>+	if(unlikely(new_len &lt;= 0)) {</div><div class='add'>+		IRDA_ERROR("%s short frame length %d\n",</div><div class='add'>+			   mcs-&gt;netdev-&gt;name, new_len);</div><div class='add'>+		++mcs-&gt;stats.rx_errors;</div><div class='add'>+		++mcs-&gt;stats.rx_length_errors;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fcs = ~(crc32_le(~0, buf, new_len));</div><div class='add'>+	if(fcs != le32_to_cpu(get_unaligned((u32 *)(buf+new_len)))) {</div><div class='add'>+		IRDA_ERROR("crc error calc 0x%x len %d\n", fcs, new_len);</div><div class='add'>+		mcs-&gt;stats.rx_errors++;</div><div class='add'>+		mcs-&gt;stats.rx_crc_errors++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(new_len + 1);</div><div class='add'>+	if(unlikely(!skb)) {</div><div class='add'>+		++mcs-&gt;stats.rx_dropped;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, 1);</div><div class='add'>+	memcpy(skb-&gt;data, buf, new_len);</div><div class='add'>+	skb_put(skb, new_len);</div><div class='add'>+	skb-&gt;mac.raw = skb-&gt;data;</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IRDA);</div><div class='add'>+	skb-&gt;dev = mcs-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;stats.rx_packets++;</div><div class='add'>+	mcs-&gt;stats.rx_bytes += new_len;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Allocates urbs for both receive and transmit.</div><div class='add'>+ * If alloc fails return error code 0 (fail) otherwise</div><div class='add'>+ * return error code 1 (success).</div><div class='add'>+ */</div><div class='add'>+static inline int mcs_setup_urbs(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	mcs-&gt;rx_urb = NULL;</div><div class='add'>+</div><div class='add'>+	mcs-&gt;tx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!mcs-&gt;tx_urb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mcs-&gt;rx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!mcs-&gt;rx_urb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sets up state to be initially outside frame, gets receive urb,</div><div class='add'>+ * sets status to successful and then submits the urb to start</div><div class='add'>+ * receiving the data.</div><div class='add'>+ */</div><div class='add'>+static inline int mcs_receive_start(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	mcs-&gt;rx_buff.in_frame = FALSE;</div><div class='add'>+	mcs-&gt;rx_buff.state = OUTSIDE_FRAME;</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(mcs-&gt;rx_urb, mcs-&gt;usbdev,</div><div class='add'>+			  usb_rcvbulkpipe(mcs-&gt;usbdev, mcs-&gt;ep_in),</div><div class='add'>+			  mcs-&gt;in_buf, 4096, mcs_receive_irq, mcs);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;rx_urb-&gt;status = 0;</div><div class='add'>+	return usb_submit_urb(mcs-&gt;rx_urb, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Finds the in and out endpoints for the mcs control block */</div><div class='add'>+static inline int mcs_find_endpoints(struct mcs_cb *mcs,</div><div class='add'>+				     struct usb_host_endpoint *ep, int epnum)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* If no place to store the endpoints just return */</div><div class='add'>+	if (!ep)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* cycle through all endpoints, find the first two that are DIR_IN */</div><div class='add'>+	for (i = 0; i &lt; epnum; i++) {</div><div class='add'>+		if (ep[i].desc.bEndpointAddress &amp; USB_DIR_IN)</div><div class='add'>+			mcs-&gt;ep_in = ep[i].desc.bEndpointAddress;</div><div class='add'>+		else</div><div class='add'>+			mcs-&gt;ep_out = ep[i].desc.bEndpointAddress;</div><div class='add'>+</div><div class='add'>+		/* MosChip says that the chip has only two bulk</div><div class='add'>+		 * endpoints. Find one for each direction and move on.</div><div class='add'>+		 */</div><div class='add'>+		if ((mcs-&gt;ep_in != 0) &amp;&amp; (mcs-&gt;ep_out != 0)) {</div><div class='add'>+			ret = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcs_speed_work(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct mcs_cb *mcs = arg;</div><div class='add'>+	struct net_device *netdev = mcs-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	mcs_speed_change(mcs);</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Function to change the speed of the mcs7780.  Fully supports SIR,</div><div class='add'>+ * MIR, and FIR speeds.</div><div class='add'>+ */</div><div class='add'>+static int mcs_speed_change(struct mcs_cb *mcs)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int rst = 0;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	__u16 nspeed;</div><div class='add'>+	__u16 rval;</div><div class='add'>+</div><div class='add'>+	nspeed = mcs_speed_set[(mcs-&gt;new_speed &gt;&gt; 8) &amp; 0x0f];</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		mcs_get_reg(mcs, MCS_RESV_REG, &amp;rval);</div><div class='add'>+	} while(cnt++ &lt; 100 &amp;&amp; (rval &amp; MCS_IRINTX));</div><div class='add'>+</div><div class='add'>+	if(cnt &gt;= 100) {</div><div class='add'>+		IRDA_ERROR("unable to change speed");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcs_get_reg(mcs, MCS_MODE_REG, &amp;rval);</div><div class='add'>+</div><div class='add'>+	/* MINRXPW values recomended by MosChip */</div><div class='add'>+	if (mcs-&gt;new_speed &lt;= 115200) {</div><div class='add'>+		rval &amp;= ~MCS_FIR;</div><div class='add'>+</div><div class='add'>+		if ((rst = (mcs-&gt;speed &gt; 115200)))</div><div class='add'>+			mcs_set_reg(mcs, MCS_MINRXPW_REG, 0);</div><div class='add'>+</div><div class='add'>+	} else if (mcs-&gt;new_speed &lt;= 1152000) {</div><div class='add'>+		rval &amp;= ~MCS_FIR;</div><div class='add'>+</div><div class='add'>+		if ((rst = !(mcs-&gt;speed == 576000 || mcs-&gt;speed == 1152000)))</div><div class='add'>+			mcs_set_reg(mcs, MCS_MINRXPW_REG, 5);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		rval |= MCS_FIR;</div><div class='add'>+</div><div class='add'>+		if ((rst = (mcs-&gt;speed != 4000000)))</div><div class='add'>+			mcs_set_reg(mcs, MCS_MINRXPW_REG, 5);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rval &amp;= ~MCS_SPEED_MASK;</div><div class='add'>+	rval |= nspeed;</div><div class='add'>+</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_MODE_REG, rval);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (rst)</div><div class='add'>+		switch (mcs-&gt;transceiver_type) {</div><div class='add'>+		case MCS_TSC_VISHAY:</div><div class='add'>+			ret = mcs_setup_transceiver_vishay(mcs);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MCS_TSC_SHARP:</div><div class='add'>+			ret = mcs_setup_transceiver_sharp(mcs);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MCS_TSC_AGILENT:</div><div class='add'>+			ret = mcs_setup_transceiver_agilent(mcs);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			ret = 1;</div><div class='add'>+			IRDA_WARNING("Unknown transceiver type: %d",</div><div class='add'>+				     mcs-&gt;transceiver_type);</div><div class='add'>+		}</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	mcs_get_reg(mcs, MCS_MODE_REG, &amp;rval);</div><div class='add'>+	rval &amp;= ~MCS_RESET;</div><div class='add'>+	ret = mcs_set_reg(mcs, MCS_MODE_REG, rval);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;speed = mcs-&gt;new_speed;</div><div class='add'>+	error:</div><div class='add'>+		mcs-&gt;new_speed = 0;</div><div class='add'>+		return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Ioctl calls not supported at this time.  Can be an area of future work. */</div><div class='add'>+static int mcs_net_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	/* struct if_irda_req *irq = (struct if_irda_req *)rq; */</div><div class='add'>+	/* struct mcs_cb *mcs = netdev_priv(netdev); */</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Network device is taken down, done by "ifconfig irda0 down" */</div><div class='add'>+static int mcs_net_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct mcs_cb *mcs = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Stop transmit processing */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/* kill and free the receive and transmit URBs */</div><div class='add'>+	usb_kill_urb(mcs-&gt;rx_urb);</div><div class='add'>+	usb_free_urb(mcs-&gt;rx_urb);</div><div class='add'>+	usb_kill_urb(mcs-&gt;tx_urb);</div><div class='add'>+	usb_free_urb(mcs-&gt;tx_urb);</div><div class='add'>+</div><div class='add'>+	/* Stop and remove instance of IrLAP */</div><div class='add'>+	if (mcs-&gt;irlap)</div><div class='add'>+		irlap_close(mcs-&gt;irlap);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;irlap = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Network device is taken up, done by "ifconfig irda0 up" */</div><div class='add'>+static int mcs_net_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct mcs_cb *mcs = netdev_priv(netdev);</div><div class='add'>+	char hwname[16];</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = usb_clear_halt(mcs-&gt;usbdev,</div><div class='add'>+			     usb_sndbulkpipe(mcs-&gt;usbdev, mcs-&gt;ep_in));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error1;</div><div class='add'>+	ret = usb_clear_halt(mcs-&gt;usbdev,</div><div class='add'>+			     usb_rcvbulkpipe(mcs-&gt;usbdev, mcs-&gt;ep_out));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error1;</div><div class='add'>+</div><div class='add'>+	ret = mcs_setup_transceiver(mcs);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error1;</div><div class='add'>+</div><div class='add'>+	ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Initialize for SIR/FIR to copy data directly into skb.  */</div><div class='add'>+	mcs-&gt;receiving = 0;</div><div class='add'>+	mcs-&gt;rx_buff.truesize = IRDA_SKB_MAX_MTU;</div><div class='add'>+	mcs-&gt;rx_buff.skb = dev_alloc_skb(IRDA_SKB_MAX_MTU);</div><div class='add'>+	if (!mcs-&gt;rx_buff.skb)</div><div class='add'>+		goto error1;</div><div class='add'>+</div><div class='add'>+	skb_reserve(mcs-&gt;rx_buff.skb, 1);</div><div class='add'>+	mcs-&gt;rx_buff.head = mcs-&gt;rx_buff.skb-&gt;data;</div><div class='add'>+	do_gettimeofday(&amp;mcs-&gt;rx_time);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now that everything should be initialized properly,</div><div class='add'>+	 * Open new IrLAP layer instance to take care of us...</div><div class='add'>+	 * Note : will send immediately a speed change...</div><div class='add'>+	 */</div><div class='add'>+	sprintf(hwname, "usb#%d", mcs-&gt;usbdev-&gt;devnum);</div><div class='add'>+	mcs-&gt;irlap = irlap_open(netdev, &amp;mcs-&gt;qos, hwname);</div><div class='add'>+	if (!mcs-&gt;irlap) {</div><div class='add'>+		IRDA_ERROR("mcs7780: irlap_open failed");</div><div class='add'>+		goto error2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mcs_setup_urbs(mcs))</div><div class='add'>+	goto error3;</div><div class='add'>+</div><div class='add'>+	ret = mcs_receive_start(mcs);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error3;</div><div class='add'>+</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+	error3:</div><div class='add'>+		irlap_close(mcs-&gt;irlap);</div><div class='add'>+	error2:</div><div class='add'>+		kfree_skb(mcs-&gt;rx_buff.skb);</div><div class='add'>+	error1:</div><div class='add'>+		return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Get device stats for /proc/net/dev and ifconfig */</div><div class='add'>+static struct net_device_stats *mcs_net_get_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct mcs_cb *mcs = netdev_priv(netdev);</div><div class='add'>+	return &amp;mcs-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Receive callback function.  */</div><div class='add'>+static void mcs_receive_irq(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	__u8 *bytes;</div><div class='add'>+	struct mcs_cb *mcs = urb-&gt;context;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(mcs-&gt;netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;actual_length &gt; 0) {</div><div class='add'>+		bytes = urb-&gt;transfer_buffer;</div><div class='add'>+</div><div class='add'>+		/* MCS returns frames without BOF and EOF</div><div class='add'>+		 * I assume it returns whole frames.</div><div class='add'>+		 */</div><div class='add'>+		/* SIR speed */</div><div class='add'>+		if(mcs-&gt;speed &lt; 576000) {</div><div class='add'>+			async_unwrap_char(mcs-&gt;netdev, &amp;mcs-&gt;stats,</div><div class='add'>+				  &amp;mcs-&gt;rx_buff, 0xc0);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; urb-&gt;actual_length; i++)</div><div class='add'>+				async_unwrap_char(mcs-&gt;netdev, &amp;mcs-&gt;stats,</div><div class='add'>+					  &amp;mcs-&gt;rx_buff, bytes[i]);</div><div class='add'>+</div><div class='add'>+			async_unwrap_char(mcs-&gt;netdev, &amp;mcs-&gt;stats,</div><div class='add'>+				  &amp;mcs-&gt;rx_buff, 0xc1);</div><div class='add'>+		}</div><div class='add'>+		/* MIR speed */</div><div class='add'>+		else if(mcs-&gt;speed == 576000 || mcs-&gt;speed == 1152000) {</div><div class='add'>+			mcs_unwrap_mir(mcs, urb-&gt;transfer_buffer,</div><div class='add'>+				urb-&gt;actual_length);</div><div class='add'>+		}</div><div class='add'>+		/* FIR speed */</div><div class='add'>+		else {</div><div class='add'>+			mcs_unwrap_fir(mcs, urb-&gt;transfer_buffer,</div><div class='add'>+				urb-&gt;actual_length);</div><div class='add'>+		}</div><div class='add'>+		mcs-&gt;netdev-&gt;last_rx = jiffies;</div><div class='add'>+		do_gettimeofday(&amp;mcs-&gt;rx_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Transmit callback funtion.  */</div><div class='add'>+static void mcs_send_irq(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct mcs_cb *mcs = urb-&gt;context;</div><div class='add'>+	struct net_device *ndev = mcs-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	if (unlikely(mcs-&gt;new_speed))</div><div class='add'>+		schedule_work(&amp;mcs-&gt;work);</div><div class='add'>+	else</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Transmit callback funtion.  */</div><div class='add'>+static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct mcs_cb *mcs;</div><div class='add'>+	int wraplen;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (skb == NULL || ndev == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	mcs = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mcs-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;new_speed = irda_get_next_speed(skb);</div><div class='add'>+	if (likely(mcs-&gt;new_speed == mcs-&gt;speed))</div><div class='add'>+		mcs-&gt;new_speed = 0;</div><div class='add'>+</div><div class='add'>+	/* SIR speed */</div><div class='add'>+	if(mcs-&gt;speed &lt; 576000) {</div><div class='add'>+		wraplen = mcs_wrap_sir_skb(skb, mcs-&gt;out_buf);</div><div class='add'>+	}</div><div class='add'>+	/* MIR speed */</div><div class='add'>+	else if(mcs-&gt;speed == 576000 || mcs-&gt;speed == 1152000) {</div><div class='add'>+		wraplen = mcs_wrap_mir_skb(skb, mcs-&gt;out_buf);</div><div class='add'>+	}</div><div class='add'>+	/* FIR speed */</div><div class='add'>+	else {</div><div class='add'>+		wraplen = mcs_wrap_fir_skb(skb, mcs-&gt;out_buf);</div><div class='add'>+	}</div><div class='add'>+	usb_fill_bulk_urb(mcs-&gt;tx_urb, mcs-&gt;usbdev,</div><div class='add'>+			  usb_sndbulkpipe(mcs-&gt;usbdev, mcs-&gt;ep_out),</div><div class='add'>+			  mcs-&gt;out_buf, wraplen, mcs_send_irq, mcs);</div><div class='add'>+</div><div class='add'>+	if ((ret = usb_submit_urb(mcs-&gt;tx_urb, GFP_ATOMIC))) {</div><div class='add'>+		IRDA_ERROR("failed tx_urb: %d", ret);</div><div class='add'>+		switch (ret) {</div><div class='add'>+		case -ENODEV:</div><div class='add'>+		case -EPIPE:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			mcs-&gt;stats.tx_errors++;</div><div class='add'>+			netif_start_queue(ndev);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		mcs-&gt;stats.tx_packets++;</div><div class='add'>+		mcs-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	spin_unlock_irqrestore(&amp;mcs-&gt;lock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is called by the USB subsystem for each new device in the</div><div class='add'>+ * system.  Need to verify the device and if it is, then start handling it.</div><div class='add'>+ */</div><div class='add'>+static int mcs_probe(struct usb_interface *intf,</div><div class='add'>+		     const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct net_device *ndev = NULL;</div><div class='add'>+	struct mcs_cb *mcs;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_irdadev(sizeof(*mcs));</div><div class='add'>+	if (!ndev)</div><div class='add'>+		goto error1;</div><div class='add'>+</div><div class='add'>+	IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.", udev-&gt;devnum);</div><div class='add'>+</div><div class='add'>+	/* what is it realy for? */</div><div class='add'>+	SET_MODULE_OWNER(ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;intf-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = usb_reset_configuration(udev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		IRDA_ERROR("mcs7780: usb reset configuration failed");</div><div class='add'>+		goto error2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcs = netdev_priv(ndev);</div><div class='add'>+	mcs-&gt;usbdev = udev;</div><div class='add'>+	mcs-&gt;netdev = ndev;</div><div class='add'>+	spin_lock_init(&amp;mcs-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Initialize QoS for this device */</div><div class='add'>+	irda_init_max_qos_capabilies(&amp;mcs-&gt;qos);</div><div class='add'>+</div><div class='add'>+	/* That's the Rx capability. */</div><div class='add'>+	mcs-&gt;qos.baud_rate.bits &amp;=</div><div class='add'>+	    IR_2400 | IR_9600 | IR_19200 | IR_38400 | IR_57600 | IR_115200</div><div class='add'>+		| IR_576000 | IR_1152000 | (IR_4000000 &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	mcs-&gt;qos.min_turn_time.bits &amp;= qos_mtt_bits;</div><div class='add'>+	irda_qos_bits_to_value(&amp;mcs-&gt;qos);</div><div class='add'>+</div><div class='add'>+	/* Speed change work initialisation*/</div><div class='add'>+	INIT_WORK(&amp;mcs-&gt;work, mcs_speed_work, mcs);</div><div class='add'>+</div><div class='add'>+	/* Override the network functions we need to use */</div><div class='add'>+	ndev-&gt;hard_start_xmit = mcs_hard_xmit;</div><div class='add'>+	ndev-&gt;open = mcs_net_open;</div><div class='add'>+	ndev-&gt;stop = mcs_net_close;</div><div class='add'>+	ndev-&gt;get_stats = mcs_net_get_stats;</div><div class='add'>+	ndev-&gt;do_ioctl = mcs_net_ioctl;</div><div class='add'>+</div><div class='add'>+	if (!intf-&gt;cur_altsetting)</div><div class='add'>+		goto error2;</div><div class='add'>+</div><div class='add'>+	ret = mcs_find_endpoints(mcs, intf-&gt;cur_altsetting-&gt;endpoint,</div><div class='add'>+				 intf-&gt;cur_altsetting-&gt;desc.bNumEndpoints);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto error2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = register_netdev(ndev);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		goto error2;</div><div class='add'>+</div><div class='add'>+	IRDA_DEBUG(1, "IrDA: Registered MosChip MCS7780 device as %s",</div><div class='add'>+		   ndev-&gt;name);</div><div class='add'>+</div><div class='add'>+	mcs-&gt;transceiver_type = transceiver_type;</div><div class='add'>+	mcs-&gt;sir_tweak = sir_tweak;</div><div class='add'>+	mcs-&gt;receive_mode = receive_mode;</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, mcs);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+	error2:</div><div class='add'>+		free_netdev(ndev);</div><div class='add'>+</div><div class='add'>+	error1:</div><div class='add'>+		return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The current device is removed, the USB layer tells us to shut down. */</div><div class='add'>+static void mcs_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct mcs_cb *mcs = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	if (!mcs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	flush_scheduled_work();</div><div class='add'>+</div><div class='add'>+	unregister_netdev(mcs-&gt;netdev);</div><div class='add'>+	free_netdev(mcs-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+	IRDA_DEBUG(0, "MCS7780 now disconnected.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Module insertion */</div><div class='add'>+static int __init mcs_init(void)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	/* register this driver with the USB subsystem */</div><div class='add'>+	result = usb_register(&amp;mcs_driver);</div><div class='add'>+	if (result)</div><div class='add'>+		IRDA_ERROR("usb_register failed. Error number %d", result);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+module_init(mcs_init);</div><div class='add'>+</div><div class='add'>+/* Module removal */</div><div class='add'>+static void __exit mcs_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* deregister this driver with the USB subsystem */</div><div class='add'>+	usb_deregister(&amp;mcs_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(mcs_exit);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/irda/mcs7780.h b/drivers/net/irda/mcs7780.h<br/>new file mode 100644<br/>index 000000000000..1a723d725c2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/mcs7780.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/mcs7780.h</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+/*****************************************************************************</div><div class='add'>+*</div><div class='add'>+* Filename:      mcs7780.h</div><div class='add'>+* Version:       0.2-alpha</div><div class='add'>+* Description:   Irda MosChip USB Dongle</div><div class='add'>+* Status:        Experimental</div><div class='add'>+* Authors:       Lukasz Stelmach &lt;stlman@poczta.fm&gt;</div><div class='add'>+*		 Brian Pugh &lt;bpugh@cs.pdx.edu&gt;</div><div class='add'>+*</div><div class='add'>+*       Copyright (C) 2005, Lukasz Stelmach &lt;stlman@poczta.fm&gt;</div><div class='add'>+*       Copyright (C) 2005, Brian Pugh &lt;bpugh@cs.pdx.edu&gt;</div><div class='add'>+*</div><div class='add'>+*       This program is free software; you can redistribute it and/or modify</div><div class='add'>+*       it under the terms of the GNU General Public License as published by</div><div class='add'>+*       the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+*       (at your option) any later version.</div><div class='add'>+*</div><div class='add'>+*       This program is distributed in the hope that it will be useful,</div><div class='add'>+*       but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+*       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+*       GNU General Public License for more details.</div><div class='add'>+*</div><div class='add'>+*       You should have received a copy of the GNU General Public License</div><div class='add'>+*       along with this program; if not, write to the Free Software</div><div class='add'>+*       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='add'>+*</div><div class='add'>+*****************************************************************************/</div><div class='add'>+#ifndef _MCS7780_H</div><div class='add'>+#define _MCS7780_H</div><div class='add'>+</div><div class='add'>+#define MCS_MODE_SIR		0</div><div class='add'>+#define MCS_MODE_MIR		1</div><div class='add'>+#define MCS_MODE_FIR		2</div><div class='add'>+</div><div class='add'>+#define MCS_CTRL_TIMEOUT	500</div><div class='add'>+#define MCS_XMIT_TIMEOUT	500</div><div class='add'>+/* Possible transceiver types */</div><div class='add'>+#define MCS_TSC_VISHAY		0	/* Vishay TFD, default choice */</div><div class='add'>+#define MCS_TSC_AGILENT		1	/* Agilent 3602/3600 */</div><div class='add'>+#define MCS_TSC_SHARP		2	/* Sharp GP2W1000YP */</div><div class='add'>+</div><div class='add'>+/* Requests */</div><div class='add'>+#define MCS_RD_RTYPE 0xC0</div><div class='add'>+#define MCS_WR_RTYPE 0x40</div><div class='add'>+#define MCS_RDREQ    0x0F</div><div class='add'>+#define MCS_WRREQ    0x0E</div><div class='add'>+</div><div class='add'>+/* Register 0x00 */</div><div class='add'>+#define MCS_MODE_REG	0</div><div class='add'>+#define MCS_FIR		((__u16)0x0001)</div><div class='add'>+#define MCS_SIR16US	((__u16)0x0002)</div><div class='add'>+#define MCS_BBTG	((__u16)0x0004)</div><div class='add'>+#define MCS_ASK		((__u16)0x0008)</div><div class='add'>+#define MCS_PARITY	((__u16)0x0010)</div><div class='add'>+</div><div class='add'>+/* SIR/MIR speed constants */</div><div class='add'>+#define MCS_SPEED_SHIFT	    5</div><div class='add'>+#define MCS_SPEED_MASK	    ((__u16)0x00E0)</div><div class='add'>+#define MCS_SPEED(x)	    ((x &amp; MCS_SPEED_MASK) &gt;&gt; MCS_SPEED_SHIFT)</div><div class='add'>+#define MCS_SPEED_2400	    ((0 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_9600	    ((1 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_19200	    ((2 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_38400	    ((3 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_57600	    ((4 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_115200    ((5 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_576000    ((6 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+#define MCS_SPEED_1152000   ((7 &lt;&lt; MCS_SPEED_SHIFT) &amp; MCS_SPEED_MASK)</div><div class='add'>+</div><div class='add'>+#define MCS_PLLPWDN	((__u16)0x0100)</div><div class='add'>+#define MCS_DRIVER	((__u16)0x0200)</div><div class='add'>+#define MCS_DTD		((__u16)0x0400)</div><div class='add'>+#define MCS_DIR		((__u16)0x0800)</div><div class='add'>+#define MCS_SIPEN	((__u16)0x1000)</div><div class='add'>+#define MCS_SENDSIP	((__u16)0x2000)</div><div class='add'>+#define MCS_CHGDIR	((__u16)0x4000)</div><div class='add'>+#define MCS_RESET	((__u16)0x8000)</div><div class='add'>+</div><div class='add'>+/* Register 0x02 */</div><div class='add'>+#define MCS_XCVR_REG	2</div><div class='add'>+#define MCS_MODE0	((__u16)0x0001)</div><div class='add'>+#define MCS_STFIR	((__u16)0x0002)</div><div class='add'>+#define MCS_XCVR_CONF	((__u16)0x0004)</div><div class='add'>+#define MCS_RXFAST	((__u16)0x0008)</div><div class='add'>+/* TXCUR [6:4] */</div><div class='add'>+#define MCS_TXCUR_SHIFT	4</div><div class='add'>+#define MCS_TXCUR_MASK	((__u16)0x0070)</div><div class='add'>+#define MCS_TXCUR(x)	((x &amp; MCS_TXCUR_MASK) &gt;&gt; MCS_TXCUR_SHIFT)</div><div class='add'>+#define MCS_SETTXCUR(x,y) \</div><div class='add'>+	((x &amp; ~MCS_TXCUR_MASK) | (y &lt;&lt; MCS_TXCUR_SHIFT) &amp; MCS_TXCUR_MASK)</div><div class='add'>+</div><div class='add'>+#define MCS_MODE1	((__u16)0x0080)</div><div class='add'>+#define MCS_SMODE0	((__u16)0x0100)</div><div class='add'>+#define MCS_SMODE1	((__u16)0x0200)</div><div class='add'>+#define MCS_INVTX	((__u16)0x0400)</div><div class='add'>+#define MCS_INVRX	((__u16)0x0800)</div><div class='add'>+</div><div class='add'>+#define MCS_MINRXPW_REG	4</div><div class='add'>+</div><div class='add'>+#define MCS_RESV_REG 7</div><div class='add'>+#define MCS_IRINTX	((__u16)0x0001)</div><div class='add'>+#define MCS_IRINRX	((__u16)0x0002)</div><div class='add'>+</div><div class='add'>+struct mcs_cb {</div><div class='add'>+	struct usb_device *usbdev;	/* init: probe_irda */</div><div class='add'>+	struct net_device *netdev;	/* network layer */</div><div class='add'>+	struct irlap_cb *irlap;	/* The link layer we are binded to */</div><div class='add'>+	struct net_device_stats stats;	/* network statistics */</div><div class='add'>+	struct qos_info qos;</div><div class='add'>+	unsigned int speed;	/* Current speed */</div><div class='add'>+	unsigned int new_speed;	/* new speed */</div><div class='add'>+</div><div class='add'>+	struct work_struct work; /* Change speed work */</div><div class='add'>+</div><div class='add'>+	struct sk_buff *tx_pending;</div><div class='add'>+	char in_buf[4096];	/* transmit/receive buffer */</div><div class='add'>+	char out_buf[4096];	/* transmit/receive buffer */</div><div class='add'>+	__u8 *fifo_status;</div><div class='add'>+</div><div class='add'>+	iobuff_t rx_buff;	/* receive unwrap state machine */</div><div class='add'>+	struct timeval rx_time;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	int receiving;</div><div class='add'>+</div><div class='add'>+	__u8 ep_in;</div><div class='add'>+	__u8 ep_out;</div><div class='add'>+</div><div class='add'>+	struct urb *rx_urb;</div><div class='add'>+	struct urb *tx_urb;</div><div class='add'>+</div><div class='add'>+	int transceiver_type;</div><div class='add'>+	int sir_tweak;</div><div class='add'>+	int receive_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mcs_set_reg(struct mcs_cb *mcs, __u16 reg, __u16 val);</div><div class='add'>+static int mcs_get_reg(struct mcs_cb *mcs, __u16 reg, __u16 * val);</div><div class='add'>+</div><div class='add'>+static inline int mcs_setup_transceiver_vishay(struct mcs_cb *mcs);</div><div class='add'>+static inline int mcs_setup_transceiver_agilent(struct mcs_cb *mcs);</div><div class='add'>+static inline int mcs_setup_transceiver_sharp(struct mcs_cb *mcs);</div><div class='add'>+static inline int mcs_setup_transceiver(struct mcs_cb *mcs);</div><div class='add'>+static inline int mcs_wrap_sir_skb(struct sk_buff *skb, __u8 * buf);</div><div class='add'>+static unsigned mcs_wrap_fir_skb(const struct sk_buff *skb, __u8 *buf);</div><div class='add'>+static unsigned mcs_wrap_mir_skb(const struct sk_buff *skb, __u8 *buf);</div><div class='add'>+static void mcs_unwrap_mir(struct mcs_cb *mcs, __u8 *buf, int len);</div><div class='add'>+static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len);</div><div class='add'>+static inline int mcs_setup_urbs(struct mcs_cb *mcs);</div><div class='add'>+static inline int mcs_receive_start(struct mcs_cb *mcs);</div><div class='add'>+static inline int mcs_find_endpoints(struct mcs_cb *mcs,</div><div class='add'>+				     struct usb_host_endpoint *ep, int epnum);</div><div class='add'>+</div><div class='add'>+static int mcs_speed_change(struct mcs_cb *mcs);</div><div class='add'>+</div><div class='add'>+static int mcs_net_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd);</div><div class='add'>+static int mcs_net_close(struct net_device *netdev);</div><div class='add'>+static int mcs_net_open(struct net_device *netdev);</div><div class='add'>+static struct net_device_stats *mcs_net_get_stats(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+static void mcs_receive_irq(struct urb *urb, struct pt_regs *regs);</div><div class='add'>+static void mcs_send_irq(struct urb *urb, struct pt_regs *regs);</div><div class='add'>+static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+static int mcs_probe(struct usb_interface *intf,</div><div class='add'>+		     const struct usb_device_id *id);</div><div class='add'>+static void mcs_disconnect(struct usb_interface *intf);</div><div class='add'>+</div><div class='add'>+#endif				/* _MCS7780_H */</div><div class='head'>diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c<br/>index cc7ff8f00e42..cb62f2a9676a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/nsc-ircc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/nsc-ircc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/nsc-ircc.c</a></div><div class='hunk'>@@ -115,8 +115,12 @@ static nsc_chip_t chips[] = {</div><div class='ctx'> 	/* Contributed by Jan Frey - IBM A30/A31 */</div><div class='ctx'> 	{ "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, </div><div class='ctx'> 	  nsc_ircc_probe_39x, nsc_ircc_init_39x },</div><div class='del'>-	{ "IBM", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,</div><div class='del'>- 	  nsc_ircc_probe_39x, nsc_ircc_init_39x },</div><div class='add'>+	/* IBM ThinkPads using PC8738x (T60/X60/Z60) */</div><div class='add'>+	{ "IBM-PC8738x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,</div><div class='add'>+	  nsc_ircc_probe_39x, nsc_ircc_init_39x },</div><div class='add'>+	/* IBM ThinkPads using PC8394T (T43/R52/?) */</div><div class='add'>+	{ "IBM-PC8394T", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf9, 0xff,</div><div class='add'>+	  nsc_ircc_probe_39x, nsc_ircc_init_39x },</div><div class='ctx'> 	{ NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c<br/>index e1aa9910503b..afb19e8d95c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/pxaficp_ir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/pxaficp_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/pxaficp_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/pxaficp_ir.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Infra-red driver (SIR/FIR) for the PXA2xx embedded microprocessor</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c<br/>index f530686bd09f..8d5a288d7976 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/sa1100_ir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/sa1100_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/sa1100_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/sa1100_ir.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *	power_leve:level	- set the transmitter power level</div><div class='ctx'>  *	tx_lpm:0|1		- set transmit low power mode</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c<br/>index a4674044bd6f..2eff45bedc7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/smsc-ircc2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/smsc-ircc2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/smsc-ircc2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/smsc-ircc2.c</a></div><div class='hunk'>@@ -2353,7 +2353,7 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> #define PCIID_VENDOR_INTEL 0x8086</div><div class='ctx'> #define PCIID_VENDOR_ALI 0x10b9</div><div class='del'>-static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __devinitdata = {</div><div class='add'>+static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */</div><div class='ctx'> 		.device = 0x24cc,</div><div class='head'>diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c<br/>index 31867e4b891b..d61b208b52a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/stir4200.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/stir4200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/stir4200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/stir4200.c</a></div><div class='hunk'>@@ -50,6 +50,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;net/irda/irda.h&gt;</div><div class='ctx'> #include &lt;net/irda/irlap.h&gt;</div><div class='ctx'> #include &lt;net/irda/irda_device.h&gt;</div><div class='hunk'>@@ -173,9 +174,7 @@ struct stir_cb {</div><div class='ctx'>         struct qos_info   qos;</div><div class='ctx'> 	unsigned 	  speed;	/* Current speed */</div><div class='ctx'> </div><div class='del'>-	wait_queue_head_t thr_wait;	/* transmit thread wakeup */</div><div class='del'>-	struct completion thr_exited;</div><div class='del'>-	pid_t		  thr_pid;</div><div class='add'>+        struct task_struct *thread;     /* transmit thread */</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff	  *tx_pending;</div><div class='ctx'> 	void		  *io_buf;	/* transmit/receive buffer */</div><div class='hunk'>@@ -577,7 +576,7 @@ static int stir_hard_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	SKB_LINEAR_ASSERT(skb);</div><div class='ctx'> </div><div class='ctx'> 	skb = xchg(&amp;stir-&gt;tx_pending, skb);</div><div class='del'>-	wake_up(&amp;stir-&gt;thr_wait);</div><div class='add'>+        wake_up_process(stir-&gt;thread);</div><div class='ctx'> 	</div><div class='ctx'> 	/* this should never happen unless stop/wakeup problem */</div><div class='ctx'> 	if (unlikely(skb)) {</div><div class='hunk'>@@ -753,13 +752,7 @@ static int stir_transmit_thread(void *arg)</div><div class='ctx'> 	struct net_device *dev = stir-&gt;netdev;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	daemonize("%s", dev-&gt;name);</div><div class='del'>-	allow_signal(SIGTERM);</div><div class='del'>-</div><div class='del'>-	while (netif_running(dev)</div><div class='del'>-	       &amp;&amp; netif_device_present(dev)</div><div class='del'>-	       &amp;&amp; !signal_pending(current))</div><div class='del'>-	{</div><div class='add'>+        while (!kthread_should_stop()) {</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 		/* if suspending, then power off and wait */</div><div class='ctx'> 		if (unlikely(freezing(current))) {</div><div class='hunk'>@@ -813,10 +806,11 @@ static int stir_transmit_thread(void *arg)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* sleep if nothing to send */</div><div class='del'>-		wait_event_interruptible(stir-&gt;thr_wait, stir-&gt;tx_pending);</div><div class='del'>-	}</div><div class='add'>+                set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+                schedule();</div><div class='ctx'> </div><div class='del'>-	complete_and_exit (&amp;stir-&gt;thr_exited, 0);</div><div class='add'>+	}</div><div class='add'>+        return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -859,7 +853,7 @@ static void stir_rcv_irq(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		warn("%s: usb receive submit error: %d",</div><div class='ctx'> 			stir-&gt;netdev-&gt;name, err);</div><div class='ctx'> 		stir-&gt;receiving = 0;</div><div class='del'>-		wake_up(&amp;stir-&gt;thr_wait);</div><div class='add'>+		wake_up_process(stir-&gt;thread);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -928,10 +922,10 @@ static int stir_net_open(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/** Start kernel thread for transmit.  */</div><div class='del'>-	stir-&gt;thr_pid = kernel_thread(stir_transmit_thread, stir,</div><div class='del'>-				      CLONE_FS|CLONE_FILES);</div><div class='del'>-	if (stir-&gt;thr_pid &lt; 0) {</div><div class='del'>-		err = stir-&gt;thr_pid;</div><div class='add'>+	stir-&gt;thread = kthread_run(stir_transmit_thread, stir,</div><div class='add'>+				   "%s", stir-&gt;netdev-&gt;name);</div><div class='add'>+        if (IS_ERR(stir-&gt;thread)) {</div><div class='add'>+                err = PTR_ERR(stir-&gt;thread);</div><div class='ctx'> 		err("stir4200: unable to start kernel thread");</div><div class='ctx'> 		goto err_out6;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -968,8 +962,7 @@ static int stir_net_close(struct net_device *netdev)</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Kill transmit thread */</div><div class='del'>-	kill_proc(stir-&gt;thr_pid, SIGTERM, 1);</div><div class='del'>-	wait_for_completion(&amp;stir-&gt;thr_exited);</div><div class='add'>+	kthread_stop(stir-&gt;thread);</div><div class='ctx'> 	kfree(stir-&gt;fifo_status);</div><div class='ctx'> </div><div class='ctx'> 	/* Mop up receive urb's */</div><div class='hunk'>@@ -1084,9 +1077,6 @@ static int stir_probe(struct usb_interface *intf,</div><div class='ctx'> 	stir-&gt;qos.min_turn_time.bits   &amp;= qos_mtt_bits;</div><div class='ctx'> 	irda_qos_bits_to_value(&amp;stir-&gt;qos);</div><div class='ctx'> </div><div class='del'>-	init_completion (&amp;stir-&gt;thr_exited);</div><div class='del'>-	init_waitqueue_head (&amp;stir-&gt;thr_wait);</div><div class='del'>-</div><div class='ctx'> 	/* Override the network functions we need to use */</div><div class='ctx'> 	net-&gt;hard_start_xmit = stir_hard_xmit;</div><div class='ctx'> 	net-&gt;open            = stir_net_open;</div><div class='head'>diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c<br/>index 97a49e0be76b..92d646cc9edc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/irda/vlsi_ir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/irda/vlsi_ir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/irda/vlsi_ir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/irda/vlsi_ir.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  ********************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'>  </div><div class='ctx'> #define DRIVER_NAME 		"vlsi_ir"</div><div class='hunk'>@@ -959,7 +958,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 			    ||  (now.tv_sec==ready.tv_sec &amp;&amp; now.tv_usec&gt;=ready.tv_usec))</div><div class='ctx'> 			    	break;</div><div class='ctx'> 			udelay(100);</div><div class='del'>-			/* must not sleep here - we are called under xmit_lock! */</div><div class='add'>+			/* must not sleep here - called under netif_tx_lock! */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1518,7 +1517,7 @@ static int vlsi_open(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	outb(IRINTR_INT_MASK, ndev-&gt;base_addr+VLSI_PIO_IRINTR);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(ndev-&gt;irq, vlsi_interrupt, SA_SHIRQ,</div><div class='add'>+	if (request_irq(ndev-&gt;irq, vlsi_interrupt, IRQF_SHARED,</div><div class='ctx'> 			drivername, ndev)) {</div><div class='ctx'> 		IRDA_WARNING("%s: couldn't get IRQ: %d\n",</div><div class='ctx'> 			     __FUNCTION__, ndev-&gt;irq);</div><div class='head'>diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c<br/>index f0f04be989d6..cdc14401cdbe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/iseries_veth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/iseries_veth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/iseries_veth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/iseries_veth.c</a></div><div class='hunk'>@@ -56,7 +56,6 @@</div><div class='ctx'>  * number of packets outstanding to a remote partition at a time.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -69,6 +68,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/abs_addr.h&gt;</div><div class='ctx'> #include &lt;asm/iseries/mf.h&gt;</div><div class='hunk'>@@ -1035,11 +1035,22 @@ static struct ethtool_ops ops = {</div><div class='ctx'> 	.get_link = veth_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)</div><div class='add'>+static struct net_device * __init veth_probe_one(int vlan,</div><div class='add'>+		struct vio_dev *vio_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct veth_port *port;</div><div class='add'>+	struct device *vdev = &amp;vio_dev-&gt;dev;</div><div class='ctx'> 	int i, rc;</div><div class='add'>+	const unsigned char *mac_addr;</div><div class='add'>+</div><div class='add'>+	mac_addr = vio_get_attribute(vio_dev, "local-mac-address", NULL);</div><div class='add'>+	if (mac_addr == NULL)</div><div class='add'>+		mac_addr = vio_get_attribute(vio_dev, "mac-address", NULL);</div><div class='add'>+	if (mac_addr == NULL) {</div><div class='add'>+		veth_error("Unable to fetch MAC address from device tree.\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof (struct veth_port));</div><div class='ctx'> 	if (! dev) {</div><div class='hunk'>@@ -1064,16 +1075,11 @@ static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	port-&gt;dev = vdev;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_addr[0] = 0x02;</div><div class='del'>-	dev-&gt;dev_addr[1] = 0x01;</div><div class='del'>-	dev-&gt;dev_addr[2] = 0xff;</div><div class='del'>-	dev-&gt;dev_addr[3] = vlan;</div><div class='del'>-	dev-&gt;dev_addr[4] = 0xff;</div><div class='del'>-	dev-&gt;dev_addr[5] = this_lp;</div><div class='add'>+	memcpy(dev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mtu = VETH_MAX_MTU;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;port-&gt;mac_addr, dev-&gt;dev_addr, 6);</div><div class='add'>+	memcpy(&amp;port-&gt;mac_addr, mac_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;open = veth_open;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = veth_start_xmit;</div><div class='hunk'>@@ -1608,7 +1614,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct veth_port *port;</div><div class='ctx'> </div><div class='del'>-	dev = veth_probe_one(i, &amp;vdev-&gt;dev);</div><div class='add'>+	dev = veth_probe_one(i, vdev);</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		veth_remove(vdev);</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1641,7 +1647,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'>  * support.</div><div class='ctx'>  */</div><div class='ctx'> static struct vio_device_id veth_device_table[] __devinitdata = {</div><div class='del'>-	{ "vlan", "" },</div><div class='add'>+	{ "network", "IBM,iSeries-l-lan" },</div><div class='ctx'> 	{ "", "" }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(vio, veth_device_table);</div><div class='head'>diff --git a/drivers/net/ixgb/Makefile b/drivers/net/ixgb/Makefile<br/>index 7c7aff1ea7d5..a8a2d3d03567 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/Makefile</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> ################################################################################</div><div class='ctx'> #</div><div class='ctx'> # </div><div class='del'>-# Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved.</div><div class='add'>+# Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'> # </div><div class='ctx'> # This program is free software; you can redistribute it and/or modify it </div><div class='ctx'> # under the terms of the GNU General Public License as published by the Free </div><div class='head'>diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h<br/>index c83271b38621..82b67af54c94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #define _IXGB_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='hunk'>@@ -84,7 +83,12 @@ struct ixgb_adapter;</div><div class='ctx'> #define IXGB_DBG(args...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define IXGB_ERR(args...) printk(KERN_ERR "ixgb: " args)</div><div class='add'>+#define PFX "ixgb: "</div><div class='add'>+#define DPRINTK(nlevel, klevel, fmt, args...) \</div><div class='add'>+	(void)((NETIF_MSG_##nlevel &amp; adapter-&gt;msg_enable) &amp;&amp; \</div><div class='add'>+	printk(KERN_##klevel PFX "%s: %s: " fmt, adapter-&gt;netdev-&gt;name, \</div><div class='add'>+		__FUNCTION__ , ## args))</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* TX/RX descriptor defines */</div><div class='ctx'> #define DEFAULT_TXD	 256</div><div class='hunk'>@@ -175,6 +179,7 @@ struct ixgb_adapter {</div><div class='ctx'> 	uint64_t hw_csum_tx_good;</div><div class='ctx'> 	uint64_t hw_csum_tx_error;</div><div class='ctx'> 	uint32_t tx_int_delay;</div><div class='add'>+	uint32_t tx_timeout_count;</div><div class='ctx'> 	boolean_t tx_int_delay_enable;</div><div class='ctx'> 	boolean_t detect_tx_hung;</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +197,9 @@ struct ixgb_adapter {</div><div class='ctx'> </div><div class='ctx'> 	/* structs defined in ixgb_hw.h */</div><div class='ctx'> 	struct ixgb_hw hw;</div><div class='add'>+	u16 msg_enable;</div><div class='ctx'> 	struct ixgb_hw_stats stats;</div><div class='add'>+	uint32_t alloc_rx_buff_failed;</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='ctx'> 	boolean_t have_msi;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c<br/>index 661a46b95a61..8357c5590bfb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ee.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ee.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ee.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_ee.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ixgb/ixgb_ee.h<br/>index 5190aa8761a2..bf6fa220f38e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ee.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ee.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ee.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_ee.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c<br/>index d38ade5f2f4e..cf19b898ba9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ethtool.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_ethtool.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -44,6 +44,8 @@ extern void ixgb_free_rx_resources(struct ixgb_adapter *adapter);</div><div class='ctx'> extern void ixgb_free_tx_resources(struct ixgb_adapter *adapter);</div><div class='ctx'> extern void ixgb_update_stats(struct ixgb_adapter *adapter);</div><div class='ctx'> </div><div class='add'>+#define IXGB_ALL_RAR_ENTRIES 16</div><div class='add'>+</div><div class='ctx'> struct ixgb_stats {</div><div class='ctx'> 	char stat_string[ETH_GSTRING_LEN];</div><div class='ctx'> 	int sizeof_stat;</div><div class='hunk'>@@ -76,6 +78,7 @@ static struct ixgb_stats ixgb_gstrings_stats[] = {</div><div class='ctx'> 	{"tx_heartbeat_errors", IXGB_STAT(net_stats.tx_heartbeat_errors)},</div><div class='ctx'> 	{"tx_window_errors", IXGB_STAT(net_stats.tx_window_errors)},</div><div class='ctx'> 	{"tx_deferred_ok", IXGB_STAT(stats.dc)},</div><div class='add'>+	{"tx_timeout_count", IXGB_STAT(tx_timeout_count) },</div><div class='ctx'> 	{"rx_long_length_errors", IXGB_STAT(stats.roc)},</div><div class='ctx'> 	{"rx_short_length_errors", IXGB_STAT(stats.ruc)},</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='hunk'>@@ -117,6 +120,16 @@ ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ixgb_set_speed_duplex(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	/* be optimistic about our link, since we were up before */</div><div class='add'>+	adapter-&gt;link_speed = 10000;</div><div class='add'>+	adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='add'>+	netif_carrier_on(netdev);</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -130,12 +143,7 @@ ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		ixgb_down(adapter, TRUE);</div><div class='ctx'> 		ixgb_reset(adapter);</div><div class='ctx'> 		ixgb_up(adapter);</div><div class='del'>-		/* be optimistic about our link, since we were up before */</div><div class='del'>-		adapter-&gt;link_speed = 10000;</div><div class='del'>-		adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='del'>-		netif_carrier_on(netdev);</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='del'>-		</div><div class='add'>+		ixgb_set_speed_duplex(netdev);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ixgb_reset(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -183,11 +191,7 @@ ixgb_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	if(netif_running(adapter-&gt;netdev)) {</div><div class='ctx'> 		ixgb_down(adapter, TRUE);</div><div class='ctx'> 		ixgb_up(adapter);</div><div class='del'>-		/* be optimistic about our link, since we were up before */</div><div class='del'>-		adapter-&gt;link_speed = 10000;</div><div class='del'>-		adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='del'>-		netif_carrier_on(netdev);</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='add'>+		ixgb_set_speed_duplex(netdev);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ixgb_reset(adapter);</div><div class='ctx'> 		</div><div class='hunk'>@@ -212,11 +216,7 @@ ixgb_set_rx_csum(struct net_device *netdev, uint32_t data)</div><div class='ctx'> 	if(netif_running(netdev)) {</div><div class='ctx'> 		ixgb_down(adapter,TRUE);</div><div class='ctx'> 		ixgb_up(adapter);</div><div class='del'>-		/* be optimistic about our link, since we were up before */</div><div class='del'>-		adapter-&gt;link_speed = 10000;</div><div class='del'>-		adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='del'>-		netif_carrier_on(netdev);</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='add'>+		ixgb_set_speed_duplex(netdev);</div><div class='ctx'> 	} else</div><div class='ctx'> 		ixgb_reset(adapter);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -251,6 +251,19 @@ ixgb_set_tso(struct net_device *netdev, uint32_t data)</div><div class='ctx'> } </div><div class='ctx'> #endif /* NETIF_F_TSO */</div><div class='ctx'> </div><div class='add'>+static uint32_t</div><div class='add'>+ixgb_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	return adapter-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ixgb_set_msglevel(struct net_device *netdev, uint32_t data)</div><div class='add'>+{</div><div class='add'>+	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	adapter-&gt;msg_enable = data;</div><div class='add'>+}</div><div class='ctx'> #define IXGB_GET_STAT(_A_, _R_) _A_-&gt;stats._R_</div><div class='ctx'> </div><div class='ctx'> static int </div><div class='hunk'>@@ -303,7 +316,7 @@ ixgb_get_regs(struct net_device *netdev,</div><div class='ctx'> 	*reg++ = IXGB_READ_REG(hw, RXCSUM);	/*  20 */</div><div class='ctx'> </div><div class='ctx'> 	/* there are 16 RAR entries in hardware, we only use 3 */</div><div class='del'>-	for(i = 0; i &lt; 16; i++) {</div><div class='add'>+	for(i = 0; i &lt; IXGB_ALL_RAR_ENTRIES; i++) {</div><div class='ctx'> 		*reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i &lt;&lt; 1)); /*21,...,51 */</div><div class='ctx'> 		*reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i &lt;&lt; 1)); /*22,...,52 */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -593,11 +606,7 @@ ixgb_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 		adapter-&gt;tx_ring = tx_new;</div><div class='ctx'> 		if((err = ixgb_up(adapter)))</div><div class='ctx'> 			return err;</div><div class='del'>-		/* be optimistic about our link, since we were up before */</div><div class='del'>-		adapter-&gt;link_speed = 10000;</div><div class='del'>-		adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='del'>-		netif_carrier_on(netdev);</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='add'>+		ixgb_set_speed_duplex(netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -714,6 +723,8 @@ static struct ethtool_ops ixgb_ethtool_ops = {</div><div class='ctx'> 	.set_tx_csum = ixgb_set_tx_csum,</div><div class='ctx'> 	.get_sg	= ethtool_op_get_sg,</div><div class='ctx'> 	.set_sg	= ethtool_op_set_sg,</div><div class='add'>+	.get_msglevel = ixgb_get_msglevel,</div><div class='add'>+	.set_msglevel = ixgb_set_msglevel,</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='ctx'> 	.get_tso = ethtool_op_get_tso,</div><div class='ctx'> 	.set_tso = ixgb_set_tso,</div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c<br/>index 620cad48bdea..f7fa10e47fa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_hw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_hw.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h<br/>index 382c6300ccc2..cb4568915ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_hw.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_hw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_hw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_hw.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -57,6 +57,7 @@ typedef enum {</div><div class='ctx'> typedef enum {</div><div class='ctx'> 	ixgb_media_type_unknown = 0,</div><div class='ctx'> 	ixgb_media_type_fiber = 1,</div><div class='add'>+	ixgb_media_type_copper = 2,</div><div class='ctx'> 	ixgb_num_media_types</div><div class='ctx'> } ixgb_media_type;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h<br/>index aee207eaa287..40a085f94c7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ids.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_ids.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_ids.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_ids.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -43,6 +43,8 @@</div><div class='ctx'> #define IXGB_SUBDEVICE_ID_A11F      0xA11F   </div><div class='ctx'> #define IXGB_SUBDEVICE_ID_A01F      0xA01F   </div><div class='ctx'> </div><div class='del'>-#endif /* #ifndef _IXGB_IDS_H_ */</div><div class='add'>+#define IXGB_DEVICE_ID_82597EX_CX4   0x109E</div><div class='add'>+#define IXGB_SUBDEVICE_ID_A00C  0xA00C</div><div class='ctx'> </div><div class='add'>+#endif /* #ifndef _IXGB_IDS_H_ */</div><div class='ctx'> /* End of File */</div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c<br/>index cfd67d812f0d..7bbd447289b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_main.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -28,22 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "ixgb.h"</div><div class='ctx'> </div><div class='del'>-/* Change Log</div><div class='del'>- * 1.0.96 04/19/05</div><div class='del'>- * - Make needlessly global code static -- bunk@stusta.de</div><div class='del'>- * - ethtool cleanup -- shemminger@osdl.org</div><div class='del'>- * - Support for MODULE_VERSION -- linville@tuxdriver.com</div><div class='del'>- * - add skb_header_cloned check to the tso path -- herbert@apana.org.au</div><div class='del'>- * 1.0.88 01/05/05</div><div class='del'>- * - include fix to the condition that determines when to quit NAPI - Robert Olsson</div><div class='del'>- * - use netif_poll_{disable/enable} to synchronize between NAPI and i/f up/down</div><div class='del'>- * 1.0.84 10/26/04</div><div class='del'>- * - reset buffer_info-&gt;dma in Tx resource cleanup logic</div><div class='del'>- * 1.0.83 10/12/04</div><div class='del'>- * - sparse cleanup - shemminger@osdl.org</div><div class='del'>- * - fix tx resource cleanup logic</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> char ixgb_driver_name[] = "ixgb";</div><div class='ctx'> static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";</div><div class='ctx'> </div><div class='hunk'>@@ -52,9 +36,9 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";</div><div class='ctx'> #else</div><div class='ctx'> #define DRIVERNAPI "-NAPI"</div><div class='ctx'> #endif</div><div class='del'>-#define DRV_VERSION		"1.0.100-k2"DRIVERNAPI</div><div class='add'>+#define DRV_VERSION		"1.0.109-k2"DRIVERNAPI</div><div class='ctx'> char ixgb_driver_version[] = DRV_VERSION;</div><div class='del'>-static char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";</div><div class='add'>+static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";</div><div class='ctx'> </div><div class='ctx'> /* ixgb_pci_tbl - PCI Device ID Table</div><div class='ctx'>  *</div><div class='hunk'>@@ -67,6 +51,8 @@ static char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";</div><div class='ctx'> static struct pci_device_id ixgb_pci_tbl[] = {</div><div class='ctx'> 	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,</div><div class='ctx'> 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,</div><div class='add'>+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='ctx'> 	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,</div><div class='ctx'> 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='ctx'> 	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,  </div><div class='hunk'>@@ -148,6 +134,11 @@ MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='add'>+#define DEFAULT_DEBUG_LEVEL_SHIFT 3</div><div class='add'>+static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;</div><div class='add'>+module_param(debug, int, 0);</div><div class='add'>+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");</div><div class='add'>+</div><div class='ctx'> /* some defines for controlling descriptor fetches in h/w */</div><div class='ctx'> #define RXDCTL_WTHRESH_DEFAULT 16	/* chip writes back at this many or RXT0 */</div><div class='ctx'> #define RXDCTL_PTHRESH_DEFAULT 0		/* chip considers prefech below</div><div class='hunk'>@@ -196,7 +187,7 @@ module_exit(ixgb_exit_module);</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ixgb_irq_disable(struct ixgb_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;adapter-&gt;irq_sem);</div><div class='hunk'>@@ -210,7 +201,7 @@ ixgb_irq_disable(struct ixgb_adapter *adapter)</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ixgb_irq_enable(struct ixgb_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if(atomic_dec_and_test(&amp;adapter-&gt;irq_sem)) {</div><div class='hunk'>@@ -231,6 +222,7 @@ ixgb_up(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* hardware has been reset, we need to reload some things */</div><div class='ctx'> </div><div class='add'>+	ixgb_rar_set(hw, netdev-&gt;dev_addr, 0);</div><div class='ctx'> 	ixgb_set_multi(netdev);</div><div class='ctx'> </div><div class='ctx'> 	ixgb_restore_vlan(adapter);</div><div class='hunk'>@@ -240,6 +232,9 @@ ixgb_up(struct ixgb_adapter *adapter)</div><div class='ctx'> 	ixgb_configure_rx(adapter);</div><div class='ctx'> 	ixgb_alloc_rx_buffers(adapter);</div><div class='ctx'> </div><div class='add'>+	/* disable interrupts and get the hardware into a known state */</div><div class='add'>+	IXGB_WRITE_REG(&amp;adapter-&gt;hw, IMC, 0xffffffff);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='ctx'> 	{</div><div class='ctx'> 	boolean_t pcix = (IXGB_READ_REG(&amp;adapter-&gt;hw, STATUS) &amp; </div><div class='hunk'>@@ -249,7 +244,7 @@ ixgb_up(struct ixgb_adapter *adapter)</div><div class='ctx'> 	if (!pcix)</div><div class='ctx'> 	   adapter-&gt;have_msi = FALSE;</div><div class='ctx'> 	else if((err = pci_enable_msi(adapter-&gt;pdev))) {</div><div class='del'>-		printk (KERN_ERR</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='ctx'> 		 "Unable to allocate MSI interrupt Error: %d\n", err);</div><div class='ctx'> 		adapter-&gt;have_msi = FALSE;</div><div class='ctx'> 		/* proceed to try to request regular interrupt */</div><div class='hunk'>@@ -258,12 +253,12 @@ ixgb_up(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> 	if((err = request_irq(adapter-&gt;pdev-&gt;irq, &amp;ixgb_intr,</div><div class='del'>-				  SA_SHIRQ | SA_SAMPLE_RANDOM,</div><div class='del'>-				  netdev-&gt;name, netdev)))</div><div class='add'>+				  IRQF_SHARED | IRQF_SAMPLE_RANDOM,</div><div class='add'>+			          netdev-&gt;name, netdev))) {</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='add'>+		 "Unable to allocate interrupt Error: %d\n", err);</div><div class='ctx'> 		return err;</div><div class='del'>-</div><div class='del'>-	/* disable interrupts and get the hardware into a known state */</div><div class='del'>-	IXGB_WRITE_REG(&amp;adapter-&gt;hw, IMC, 0xffffffff);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if((hw-&gt;max_frame_size != max_frame) ||</div><div class='ctx'> 		(hw-&gt;max_frame_size !=</div><div class='hunk'>@@ -285,11 +280,12 @@ ixgb_up(struct ixgb_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;adapter-&gt;watchdog_timer, jiffies);</div><div class='del'>-	ixgb_irq_enable(adapter);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IXGB_NAPI</div><div class='ctx'> 	netif_poll_enable(netdev);</div><div class='ctx'> #endif</div><div class='add'>+	ixgb_irq_enable(adapter);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -326,7 +322,7 @@ ixgb_reset(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	ixgb_adapter_stop(&amp;adapter-&gt;hw);</div><div class='ctx'> 	if(!ixgb_init_hw(&amp;adapter-&gt;hw))</div><div class='del'>-		IXGB_DBG("ixgb_init_hw failed.\n");</div><div class='add'>+		DPRINTK(PROBE, ERR, "ixgb_init_hw failed.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -363,7 +359,8 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) ||</div><div class='ctx'> 		   (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {</div><div class='del'>-			IXGB_ERR("No usable DMA configuration, aborting\n");</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			 "ixgb: No usable DMA configuration, aborting\n");</div><div class='ctx'> 			goto err_dma_mask;</div><div class='ctx'> 		}</div><div class='ctx'> 		pci_using_dac = 0;</div><div class='hunk'>@@ -388,6 +385,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	adapter-&gt;netdev = netdev;</div><div class='ctx'> 	adapter-&gt;pdev = pdev;</div><div class='ctx'> 	adapter-&gt;hw.back = adapter;</div><div class='add'>+	adapter-&gt;msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	mmio_start = pci_resource_start(pdev, BAR_0);</div><div class='ctx'> 	mmio_len = pci_resource_len(pdev, BAR_0);</div><div class='hunk'>@@ -416,7 +414,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	netdev-&gt;change_mtu = &amp;ixgb_change_mtu;</div><div class='ctx'> 	ixgb_set_ethtool_ops(netdev);</div><div class='ctx'> 	netdev-&gt;tx_timeout = &amp;ixgb_tx_timeout;</div><div class='del'>-	netdev-&gt;watchdog_timeo = HZ;</div><div class='add'>+	netdev-&gt;watchdog_timeo = 5 * HZ;</div><div class='ctx'> #ifdef CONFIG_IXGB_NAPI</div><div class='ctx'> 	netdev-&gt;poll = &amp;ixgb_clean;</div><div class='ctx'> 	netdev-&gt;weight = 64;</div><div class='hunk'>@@ -428,6 +426,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	netdev-&gt;poll_controller = ixgb_netpoll;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	strcpy(netdev-&gt;name, pci_name(pdev));</div><div class='ctx'> 	netdev-&gt;mem_start = mmio_start;</div><div class='ctx'> 	netdev-&gt;mem_end = mmio_start + mmio_len;</div><div class='ctx'> 	netdev-&gt;base_addr = adapter-&gt;hw.io_base;</div><div class='hunk'>@@ -449,6 +448,9 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_TSO;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef NETIF_F_LLTX</div><div class='add'>+	netdev-&gt;features |= NETIF_F_LLTX;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if(pci_using_dac)</div><div class='ctx'> 		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='hunk'>@@ -456,7 +458,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	/* make sure the EEPROM is good */</div><div class='ctx'> </div><div class='ctx'> 	if(!ixgb_validate_eeprom_checksum(&amp;adapter-&gt;hw)) {</div><div class='del'>-		printk(KERN_ERR "The EEPROM Checksum Is Not Valid\n");</div><div class='add'>+		DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_eeprom;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -465,6 +467,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	memcpy(netdev-&gt;perm_addr, netdev-&gt;dev_addr, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	if(!is_valid_ether_addr(netdev-&gt;perm_addr)) {</div><div class='add'>+		DPRINTK(PROBE, ERR, "Invalid MAC Address\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_eeprom;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -478,6 +481,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;tx_timeout_task,</div><div class='ctx'> 		  (void (*)(void *))ixgb_tx_timeout_task, netdev);</div><div class='ctx'> </div><div class='add'>+	strcpy(netdev-&gt;name, "eth%d");</div><div class='ctx'> 	if((err = register_netdev(netdev)))</div><div class='ctx'> 		goto err_register;</div><div class='ctx'> </div><div class='hunk'>@@ -486,8 +490,7 @@ ixgb_probe(struct pci_dev *pdev,</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: Intel(R) PRO/10GbE Network Connection\n",</div><div class='del'>-		   netdev-&gt;name);</div><div class='add'>+	DPRINTK(PROBE, INFO, "Intel(R) PRO/10GbE Network Connection\n");</div><div class='ctx'> 	ixgb_check_options(adapter);</div><div class='ctx'> 	/* reset the hardware with the new settings */</div><div class='ctx'> </div><div class='hunk'>@@ -557,17 +560,17 @@ ixgb_sw_init(struct ixgb_adapter *adapter)</div><div class='ctx'> 	hw-&gt;subsystem_vendor_id = pdev-&gt;subsystem_vendor;</div><div class='ctx'> 	hw-&gt;subsystem_id = pdev-&gt;subsystem_device;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;rx_buffer_len = IXGB_RXBUFFER_2048;</div><div class='del'>-</div><div class='ctx'> 	hw-&gt;max_frame_size = netdev-&gt;mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;</div><div class='add'>+	adapter-&gt;rx_buffer_len = hw-&gt;max_frame_size;</div><div class='ctx'> </div><div class='ctx'> 	if((hw-&gt;device_id == IXGB_DEVICE_ID_82597EX)</div><div class='del'>-	   ||(hw-&gt;device_id == IXGB_DEVICE_ID_82597EX_LR)</div><div class='del'>-	   ||(hw-&gt;device_id == IXGB_DEVICE_ID_82597EX_SR))</div><div class='add'>+	   || (hw-&gt;device_id == IXGB_DEVICE_ID_82597EX_CX4)</div><div class='add'>+	   || (hw-&gt;device_id == IXGB_DEVICE_ID_82597EX_LR)</div><div class='add'>+	   || (hw-&gt;device_id == IXGB_DEVICE_ID_82597EX_SR))</div><div class='ctx'> 			hw-&gt;mac_type = ixgb_82597;</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* should never have loaded on this device */</div><div class='del'>-		printk(KERN_ERR "ixgb: unsupported device id\n");</div><div class='add'>+		DPRINTK(PROBE, ERR, "unsupported device id\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable flow control to be programmed */</div><div class='hunk'>@@ -665,6 +668,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)</div><div class='ctx'> 	size = sizeof(struct ixgb_buffer) * txdr-&gt;count;</div><div class='ctx'> 	txdr-&gt;buffer_info = vmalloc(size);</div><div class='ctx'> 	if(!txdr-&gt;buffer_info) {</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='add'>+		 "Unable to allocate transmit descriptor ring memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(txdr-&gt;buffer_info, 0, size);</div><div class='hunk'>@@ -677,6 +682,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)</div><div class='ctx'> 	txdr-&gt;desc = pci_alloc_consistent(pdev, txdr-&gt;size, &amp;txdr-&gt;dma);</div><div class='ctx'> 	if(!txdr-&gt;desc) {</div><div class='ctx'> 		vfree(txdr-&gt;buffer_info);</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='add'>+		 "Unable to allocate transmit descriptor memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(txdr-&gt;desc, 0, txdr-&gt;size);</div><div class='hunk'>@@ -750,6 +757,8 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)</div><div class='ctx'> 	size = sizeof(struct ixgb_buffer) * rxdr-&gt;count;</div><div class='ctx'> 	rxdr-&gt;buffer_info = vmalloc(size);</div><div class='ctx'> 	if(!rxdr-&gt;buffer_info) {</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='add'>+		 "Unable to allocate receive descriptor ring\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(rxdr-&gt;buffer_info, 0, size);</div><div class='hunk'>@@ -763,6 +772,8 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	if(!rxdr-&gt;desc) {</div><div class='ctx'> 		vfree(rxdr-&gt;buffer_info);</div><div class='add'>+		DPRINTK(PROBE, ERR,</div><div class='add'>+		 "Unable to allocate receive descriptors\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(rxdr-&gt;desc, 0, rxdr-&gt;size);</div><div class='hunk'>@@ -794,21 +805,14 @@ ixgb_setup_rctl(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	rctl |= IXGB_RCTL_SECRC;</div><div class='ctx'> </div><div class='del'>-	switch (adapter-&gt;rx_buffer_len) {</div><div class='del'>-	case IXGB_RXBUFFER_2048:</div><div class='del'>-	default:</div><div class='add'>+	if (adapter-&gt;rx_buffer_len &lt;= IXGB_RXBUFFER_2048)</div><div class='ctx'> 		rctl |= IXGB_RCTL_BSIZE_2048;</div><div class='del'>-		break;</div><div class='del'>-	case IXGB_RXBUFFER_4096:</div><div class='add'>+	else if (adapter-&gt;rx_buffer_len &lt;= IXGB_RXBUFFER_4096)</div><div class='ctx'> 		rctl |= IXGB_RCTL_BSIZE_4096;</div><div class='del'>-		break;</div><div class='del'>-	case IXGB_RXBUFFER_8192:</div><div class='add'>+	else if (adapter-&gt;rx_buffer_len &lt;= IXGB_RXBUFFER_8192)</div><div class='ctx'> 		rctl |= IXGB_RCTL_BSIZE_8192;</div><div class='del'>-		break;</div><div class='del'>-	case IXGB_RXBUFFER_16384:</div><div class='add'>+	else if (adapter-&gt;rx_buffer_len &lt;= IXGB_RXBUFFER_16384)</div><div class='ctx'> 		rctl |= IXGB_RCTL_BSIZE_16384;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	IXGB_WRITE_REG(&amp;adapter-&gt;hw, RCTL, rctl);</div><div class='ctx'> }</div><div class='hunk'>@@ -898,22 +902,25 @@ ixgb_free_tx_resources(struct ixgb_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;tx_ring.desc = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter,</div><div class='ctx'> 					struct ixgb_buffer *buffer_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='del'>-	if(buffer_info-&gt;dma) {</div><div class='del'>-		pci_unmap_page(pdev,</div><div class='del'>-			   buffer_info-&gt;dma,</div><div class='del'>-			   buffer_info-&gt;length,</div><div class='del'>-			   PCI_DMA_TODEVICE);</div><div class='del'>-		buffer_info-&gt;dma = 0;</div><div class='del'>-	}</div><div class='del'>-	if(buffer_info-&gt;skb) {</div><div class='add'>+</div><div class='add'>+	if (buffer_info-&gt;dma)</div><div class='add'>+		pci_unmap_page(pdev, buffer_info-&gt;dma, buffer_info-&gt;length,</div><div class='add'>+		               PCI_DMA_TODEVICE);</div><div class='add'>+</div><div class='add'>+	if (buffer_info-&gt;skb)</div><div class='ctx'> 		dev_kfree_skb_any(buffer_info-&gt;skb);</div><div class='del'>-		buffer_info-&gt;skb = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	buffer_info-&gt;skb = NULL;</div><div class='add'>+	buffer_info-&gt;dma = 0;</div><div class='add'>+	buffer_info-&gt;time_stamp = 0;</div><div class='add'>+	/* these fields must always be initialized in tx</div><div class='add'>+	 * buffer_info-&gt;length = 0;</div><div class='add'>+	 * buffer_info-&gt;next_to_watch = 0; */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1112,8 +1119,8 @@ ixgb_watchdog(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	if(adapter-&gt;hw.link_up) {</div><div class='ctx'> 		if(!netif_carrier_ok(netdev)) {</div><div class='del'>-			printk(KERN_INFO "ixgb: %s NIC Link is Up %d Mbps %s\n",</div><div class='del'>-				   netdev-&gt;name, 10000, "Full Duplex");</div><div class='add'>+			DPRINTK(LINK, INFO,</div><div class='add'>+			        "NIC Link is Up 10000 Mbps Full Duplex\n");</div><div class='ctx'> 			adapter-&gt;link_speed = 10000;</div><div class='ctx'> 			adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='ctx'> 			netif_carrier_on(netdev);</div><div class='hunk'>@@ -1123,9 +1130,7 @@ ixgb_watchdog(unsigned long data)</div><div class='ctx'> 		if(netif_carrier_ok(netdev)) {</div><div class='ctx'> 			adapter-&gt;link_speed = 0;</div><div class='ctx'> 			adapter-&gt;link_duplex = 0;</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-				   "ixgb: %s NIC Link is Down\n",</div><div class='del'>-				   netdev-&gt;name);</div><div class='add'>+			DPRINTK(LINK, INFO, "NIC Link is Down\n");</div><div class='ctx'> 			netif_carrier_off(netdev);</div><div class='ctx'> 			netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1158,7 +1163,7 @@ ixgb_watchdog(unsigned long data)</div><div class='ctx'> #define IXGB_TX_FLAGS_VLAN		0x00000002</div><div class='ctx'> #define IXGB_TX_FLAGS_TSO		0x00000004</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='hunk'>@@ -1168,7 +1173,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> 	uint16_t ipcse, tucse, mss;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if(likely(skb_shinfo(skb)-&gt;tso_size)) {</div><div class='add'>+	if (likely(skb_is_gso(skb))) {</div><div class='ctx'> 		if (skb_header_cloned(skb)) {</div><div class='ctx'> 			err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);</div><div class='ctx'> 			if (err)</div><div class='hunk'>@@ -1176,7 +1181,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hdr_len = ((skb-&gt;h.raw - skb-&gt;data) + (skb-&gt;h.th-&gt;doff &lt;&lt; 2));</div><div class='del'>-		mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='add'>+		mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 		skb-&gt;nh.iph-&gt;tot_len = 0;</div><div class='ctx'> 		skb-&gt;nh.iph-&gt;check = 0;</div><div class='ctx'> 		skb-&gt;h.th-&gt;check = ~csum_tcpudp_magic(skb-&gt;nh.iph-&gt;saddr,</div><div class='hunk'>@@ -1220,7 +1225,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline boolean_t</div><div class='add'>+static boolean_t</div><div class='ctx'> ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_context_desc *context_desc;</div><div class='hunk'>@@ -1258,7 +1263,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)</div><div class='ctx'> #define IXGB_MAX_TXD_PWR	14</div><div class='ctx'> #define IXGB_MAX_DATA_PER_TXD	(1&lt;&lt;IXGB_MAX_TXD_PWR)</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='add'>+static int</div><div class='ctx'> ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	    unsigned int first)</div><div class='ctx'> {</div><div class='hunk'>@@ -1276,7 +1281,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	while(len) {</div><div class='ctx'> 		buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='del'>-		size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);</div><div class='add'>+		size = min(len, IXGB_MAX_DATA_PER_TXD);</div><div class='ctx'> 		buffer_info-&gt;length = size;</div><div class='ctx'> 		buffer_info-&gt;dma =</div><div class='ctx'> 			pci_map_single(adapter-&gt;pdev,</div><div class='hunk'>@@ -1284,6 +1289,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 				size,</div><div class='ctx'> 				PCI_DMA_TODEVICE);</div><div class='ctx'> 		buffer_info-&gt;time_stamp = jiffies;</div><div class='add'>+		buffer_info-&gt;next_to_watch = 0;</div><div class='ctx'> </div><div class='ctx'> 		len -= size;</div><div class='ctx'> 		offset += size;</div><div class='hunk'>@@ -1300,7 +1306,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		while(len) {</div><div class='ctx'> 			buffer_info = &amp;tx_ring-&gt;buffer_info[i];</div><div class='del'>-			size = min(len, IXGB_MAX_JUMBO_FRAME_SIZE);</div><div class='add'>+			size = min(len, IXGB_MAX_DATA_PER_TXD);</div><div class='ctx'> 			buffer_info-&gt;length = size;</div><div class='ctx'> 			buffer_info-&gt;dma =</div><div class='ctx'> 				pci_map_page(adapter-&gt;pdev,</div><div class='hunk'>@@ -1309,6 +1315,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 					size,</div><div class='ctx'> 					PCI_DMA_TODEVICE);</div><div class='ctx'> 			buffer_info-&gt;time_stamp = jiffies;</div><div class='add'>+			buffer_info-&gt;next_to_watch = 0;</div><div class='ctx'> </div><div class='ctx'> 			len -= size;</div><div class='ctx'> 			offset += size;</div><div class='hunk'>@@ -1323,7 +1330,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ixgb_tx_queue(struct ixgb_adapter *adapter, int count, int vlan_id,int tx_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_desc_ring *tx_ring = &amp;adapter-&gt;tx_ring;</div><div class='hunk'>@@ -1395,13 +1402,26 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef NETIF_F_LLTX</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	if (!spin_trylock(&amp;adapter-&gt;tx_lock)) {</div><div class='add'>+		/* Collision - tell upper layer to requeue */</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+		return NETDEV_TX_LOCKED;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='ctx'> 	spin_lock_irqsave(&amp;adapter-&gt;tx_lock, flags);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if(unlikely(IXGB_DESC_UNUSED(&amp;adapter-&gt;tx_ring) &lt; DESC_NEEDED)) {</div><div class='ctx'> 		netif_stop_queue(netdev);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;adapter-&gt;tx_lock, flags);</div><div class='del'>-		return 1;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+#ifndef NETIF_F_LLTX</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;tx_lock, flags);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if(adapter-&gt;vlgrp &amp;&amp; vlan_tx_tag_present(skb)) {</div><div class='ctx'> 		tx_flags |= IXGB_TX_FLAGS_VLAN;</div><div class='hunk'>@@ -1413,10 +1433,13 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	tso = ixgb_tso(adapter, skb);</div><div class='ctx'> 	if (tso &lt; 0) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='add'>+#ifdef NETIF_F_LLTX</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;tx_lock, flags);</div><div class='add'>+#endif</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tso)</div><div class='add'>+	if (likely(tso))</div><div class='ctx'> 		tx_flags |= IXGB_TX_FLAGS_TSO;</div><div class='ctx'> 	else if(ixgb_tx_csum(adapter, skb))</div><div class='ctx'> 		tx_flags |= IXGB_TX_FLAGS_CSUM;</div><div class='hunk'>@@ -1426,7 +1449,15 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+#ifdef NETIF_F_LLTX</div><div class='add'>+	/* Make sure there is space in the ring for the next send. */</div><div class='add'>+	if(unlikely(IXGB_DESC_UNUSED(&amp;adapter-&gt;tx_ring) &lt; DESC_NEEDED))</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1448,6 +1479,7 @@ ixgb_tx_timeout_task(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ixgb_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;tx_timeout_count++;</div><div class='ctx'> 	ixgb_down(adapter, TRUE);</div><div class='ctx'> 	ixgb_up(adapter);</div><div class='ctx'> }</div><div class='hunk'>@@ -1486,28 +1518,15 @@ ixgb_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	if((max_frame &lt; IXGB_MIN_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)</div><div class='ctx'> 	   || (max_frame &gt; IXGB_MAX_JUMBO_FRAME_SIZE + ENET_FCS_LENGTH)) {</div><div class='del'>-		IXGB_ERR("Invalid MTU setting\n");</div><div class='add'>+		DPRINTK(PROBE, ERR, "Invalid MTU setting %d\n", new_mtu);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if((max_frame &lt;= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH)</div><div class='del'>-	   || (max_frame &lt;= IXGB_RXBUFFER_2048)) {</div><div class='del'>-		adapter-&gt;rx_buffer_len = IXGB_RXBUFFER_2048;</div><div class='del'>-</div><div class='del'>-	} else if(max_frame &lt;= IXGB_RXBUFFER_4096) {</div><div class='del'>-		adapter-&gt;rx_buffer_len = IXGB_RXBUFFER_4096;</div><div class='del'>-</div><div class='del'>-	} else if(max_frame &lt;= IXGB_RXBUFFER_8192) {</div><div class='del'>-		adapter-&gt;rx_buffer_len = IXGB_RXBUFFER_8192;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		adapter-&gt;rx_buffer_len = IXGB_RXBUFFER_16384;</div><div class='del'>-	}</div><div class='add'>+	adapter-&gt;rx_buffer_len = max_frame;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='del'>-	if(old_max_frame != max_frame &amp;&amp; netif_running(netdev)) {</div><div class='del'>-</div><div class='add'>+	if ((old_max_frame != max_frame) &amp;&amp; netif_running(netdev)) {</div><div class='ctx'> 		ixgb_down(adapter, TRUE);</div><div class='ctx'> 		ixgb_up(adapter);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1765,23 +1784,43 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	tx_ring-&gt;next_to_clean = i;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;adapter-&gt;tx_lock);</div><div class='del'>-	if(cleaned &amp;&amp; netif_queue_stopped(netdev) &amp;&amp; netif_carrier_ok(netdev) &amp;&amp;</div><div class='del'>-	   (IXGB_DESC_UNUSED(tx_ring) &gt; IXGB_TX_QUEUE_WAKE)) {</div><div class='del'>-</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='add'>+	if (unlikely(netif_queue_stopped(netdev))) {</div><div class='add'>+		spin_lock(&amp;adapter-&gt;tx_lock);</div><div class='add'>+		if (netif_queue_stopped(netdev) &amp;&amp; netif_carrier_ok(netdev) &amp;&amp;</div><div class='add'>+		    (IXGB_DESC_UNUSED(tx_ring) &gt; IXGB_TX_QUEUE_WAKE))</div><div class='add'>+			netif_wake_queue(netdev);</div><div class='add'>+		spin_unlock(&amp;adapter-&gt;tx_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	if(adapter-&gt;detect_tx_hung) {</div><div class='ctx'> 		/* detect a transmit hang in hardware, this serializes the</div><div class='ctx'> 		 * check with the clearing of time_stamp and movement of i */</div><div class='ctx'> 		adapter-&gt;detect_tx_hung = FALSE;</div><div class='del'>-		if(tx_ring-&gt;buffer_info[i].dma &amp;&amp;</div><div class='del'>-		   time_after(jiffies, tx_ring-&gt;buffer_info[i].time_stamp + HZ)</div><div class='add'>+		if (tx_ring-&gt;buffer_info[eop].dma &amp;&amp;</div><div class='add'>+		   time_after(jiffies, tx_ring-&gt;buffer_info[eop].time_stamp + HZ)</div><div class='ctx'> 		   &amp;&amp; !(IXGB_READ_REG(&amp;adapter-&gt;hw, STATUS) &amp;</div><div class='del'>-			IXGB_STATUS_TXOFF))</div><div class='add'>+		        IXGB_STATUS_TXOFF)) {</div><div class='add'>+			/* detected Tx unit hang */</div><div class='add'>+			DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n"</div><div class='add'>+					"  TDH                  &lt;%x&gt;\n"</div><div class='add'>+					"  TDT                  &lt;%x&gt;\n"</div><div class='add'>+					"  next_to_use          &lt;%x&gt;\n"</div><div class='add'>+					"  next_to_clean        &lt;%x&gt;\n"</div><div class='add'>+					"buffer_info[next_to_clean]\n"</div><div class='add'>+					"  time_stamp           &lt;%lx&gt;\n"</div><div class='add'>+					"  next_to_watch        &lt;%x&gt;\n"</div><div class='add'>+					"  jiffies              &lt;%lx&gt;\n"</div><div class='add'>+					"  next_to_watch.status &lt;%x&gt;\n",</div><div class='add'>+				IXGB_READ_REG(&amp;adapter-&gt;hw, TDH),</div><div class='add'>+				IXGB_READ_REG(&amp;adapter-&gt;hw, TDT),</div><div class='add'>+				tx_ring-&gt;next_to_use,</div><div class='add'>+				tx_ring-&gt;next_to_clean,</div><div class='add'>+				tx_ring-&gt;buffer_info[eop].time_stamp,</div><div class='add'>+				eop,</div><div class='add'>+				jiffies,</div><div class='add'>+				eop_desc-&gt;status);</div><div class='ctx'> 			netif_stop_queue(netdev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return cleaned;</div><div class='hunk'>@@ -1794,7 +1833,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)</div><div class='ctx'>  * @sk_buff: socket buffer with received data</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static void</div><div class='ctx'> ixgb_rx_checksum(struct ixgb_adapter *adapter,</div><div class='ctx'> 		 struct ixgb_rx_desc *rx_desc,</div><div class='ctx'> 		 struct sk_buff *skb)</div><div class='hunk'>@@ -1858,6 +1897,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)</div><div class='ctx'> #endif</div><div class='ctx'> 		status = rx_desc-&gt;status;</div><div class='ctx'> 		skb = buffer_info-&gt;skb;</div><div class='add'>+		buffer_info-&gt;skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 		prefetch(skb-&gt;data);</div><div class='ctx'> </div><div class='hunk'>@@ -1902,6 +1942,26 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)</div><div class='ctx'> 			goto rxdesc_done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* code added for copybreak, this should improve</div><div class='add'>+		 * performance for small packets with large amounts</div><div class='add'>+		 * of reassembly being done in the stack */</div><div class='add'>+#define IXGB_CB_LENGTH 256</div><div class='add'>+		if (length &lt; IXGB_CB_LENGTH) {</div><div class='add'>+			struct sk_buff *new_skb =</div><div class='add'>+			    dev_alloc_skb(length + NET_IP_ALIGN);</div><div class='add'>+			if (new_skb) {</div><div class='add'>+				skb_reserve(new_skb, NET_IP_ALIGN);</div><div class='add'>+				new_skb-&gt;dev = netdev;</div><div class='add'>+				memcpy(new_skb-&gt;data - NET_IP_ALIGN,</div><div class='add'>+				       skb-&gt;data - NET_IP_ALIGN,</div><div class='add'>+				       length + NET_IP_ALIGN);</div><div class='add'>+				/* save the skb in buffer_info as good */</div><div class='add'>+				buffer_info-&gt;skb = skb;</div><div class='add'>+				skb = new_skb;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* end copybreak code */</div><div class='add'>+</div><div class='ctx'> 		/* Good Receive */</div><div class='ctx'> 		skb_put(skb, length);</div><div class='ctx'> </div><div class='hunk'>@@ -1931,7 +1991,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)</div><div class='ctx'> rxdesc_done:</div><div class='ctx'> 		/* clean up descriptor, might be written over by hw */</div><div class='ctx'> 		rx_desc-&gt;status = 0;</div><div class='del'>-		buffer_info-&gt;skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 		/* use prefetched values */</div><div class='ctx'> 		rx_desc = next_rxd;</div><div class='hunk'>@@ -1971,12 +2030,18 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* leave three descriptors unused */</div><div class='ctx'> 	while(--cleancount &gt; 2) {</div><div class='del'>-		rx_desc = IXGB_RX_DESC(*rx_ring, i);</div><div class='del'>-</div><div class='del'>-		skb = dev_alloc_skb(adapter-&gt;rx_buffer_len + NET_IP_ALIGN);</div><div class='add'>+		/* recycle! its good for you */</div><div class='add'>+		if (!(skb = buffer_info-&gt;skb))</div><div class='add'>+			skb = dev_alloc_skb(adapter-&gt;rx_buffer_len</div><div class='add'>+			                    + NET_IP_ALIGN);</div><div class='add'>+		else {</div><div class='add'>+			skb_trim(skb, 0);</div><div class='add'>+			goto map_skb;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if(unlikely(!skb)) {</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='ctx'> 			/* Better luck next round */</div><div class='add'>+			adapter-&gt;alloc_rx_buff_failed++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1990,33 +2055,36 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 		buffer_info-&gt;skb = skb;</div><div class='ctx'> 		buffer_info-&gt;length = adapter-&gt;rx_buffer_len;</div><div class='del'>-		buffer_info-&gt;dma =</div><div class='del'>-			pci_map_single(pdev,</div><div class='del'>-				   skb-&gt;data,</div><div class='del'>-				   adapter-&gt;rx_buffer_len,</div><div class='del'>-				   PCI_DMA_FROMDEVICE);</div><div class='add'>+map_skb:</div><div class='add'>+		buffer_info-&gt;dma = pci_map_single(pdev,</div><div class='add'>+		                                  skb-&gt;data,</div><div class='add'>+		                                  adapter-&gt;rx_buffer_len,</div><div class='add'>+		                                  PCI_DMA_FROMDEVICE);</div><div class='ctx'> </div><div class='add'>+		rx_desc = IXGB_RX_DESC(*rx_ring, i);</div><div class='ctx'> 		rx_desc-&gt;buff_addr = cpu_to_le64(buffer_info-&gt;dma);</div><div class='ctx'> 		/* guarantee DD bit not set now before h/w gets descriptor</div><div class='ctx'> 		 * this is the rest of the workaround for h/w double </div><div class='ctx'> 		 * writeback. */</div><div class='ctx'> 		rx_desc-&gt;status = 0;</div><div class='ctx'> </div><div class='del'>-		if((i &amp; ~(num_group_tail_writes- 1)) == i) {</div><div class='del'>-			/* Force memory writes to complete before letting h/w</div><div class='del'>-			 * know there are new descriptors to fetch.  (Only</div><div class='del'>-			 * applicable for weak-ordered memory model archs,</div><div class='del'>-			 * such as IA-64). */</div><div class='del'>-			wmb();</div><div class='del'>-</div><div class='del'>-			IXGB_WRITE_REG(&amp;adapter-&gt;hw, RDT, i);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		if(++i == rx_ring-&gt;count) i = 0;</div><div class='ctx'> 		buffer_info = &amp;rx_ring-&gt;buffer_info[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rx_ring-&gt;next_to_use = i;</div><div class='add'>+	if (likely(rx_ring-&gt;next_to_use != i)) {</div><div class='add'>+		rx_ring-&gt;next_to_use = i;</div><div class='add'>+		if (unlikely(i-- == 0))</div><div class='add'>+			i = (rx_ring-&gt;count - 1);</div><div class='add'>+</div><div class='add'>+		/* Force memory writes to complete before letting h/w</div><div class='add'>+		 * know there are new descriptors to fetch.  (Only</div><div class='add'>+		 * applicable for weak-ordered memory model archs, such</div><div class='add'>+		 * as IA-64). */</div><div class='add'>+		wmb();</div><div class='add'>+		IXGB_WRITE_REG(&amp;adapter-&gt;hw, RDT, i);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h<br/>index dba20481ee80..ee982feac64d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_osdep.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_osdep.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_osdep.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_osdep.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='head'>diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c<br/>index 8a83dfdf746d..39fbed29a3df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_param.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixgb/ixgb_param.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixgb/ixgb_param.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixgb/ixgb_param.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>   </div><div class='del'>-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.</div><div class='add'>+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.</div><div class='ctx'>   </div><div class='ctx'>   This program is free software; you can redistribute it and/or modify it </div><div class='ctx'>   under the terms of the GNU General Public License as published by the Free </div><div class='hunk'>@@ -76,7 +76,7 @@ IXGB_PARAM(RxDescriptors, "Number of receive descriptors");</div><div class='ctx'>  *  - 2 - Tx only, generate PAUSE frames but ignore them on receive</div><div class='ctx'>  *  - 3 - Full Flow Control Support</div><div class='ctx'>  *</div><div class='del'>- * Default Value: Read flow control settings from the EEPROM</div><div class='add'>+ * Default Value: 2 - Tx only (silicon bug avoidance)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> IXGB_PARAM(FlowControl, "Flow Control setting");</div><div class='hunk'>@@ -137,7 +137,7 @@ IXGB_PARAM(RxFCLowThresh, "Receive Flow Control Low Threshold");</div><div class='ctx'>  *</div><div class='ctx'>  * Valid Range: 1 - 65535 </div><div class='ctx'>  *</div><div class='del'>- * Default Value:  256 (0x100)</div><div class='add'>+ * Default Value:  65535 (0xffff) (we'll send an xon if we recover)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> IXGB_PARAM(FCReqTimeout, "Flow Control Request Timeout");</div><div class='hunk'>@@ -165,8 +165,6 @@ IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");</div><div class='ctx'> </div><div class='ctx'> #define XSUMRX_DEFAULT		 OPTION_ENABLED</div><div class='ctx'> </div><div class='del'>-#define FLOW_CONTROL_FULL	   ixgb_fc_full</div><div class='del'>-#define FLOW_CONTROL_DEFAULT  FLOW_CONTROL_FULL</div><div class='ctx'> #define DEFAULT_FCRTL	  		0x28000</div><div class='ctx'> #define DEFAULT_FCRTH			0x30000</div><div class='ctx'> #define MIN_FCRTL			      0</div><div class='hunk'>@@ -174,9 +172,9 @@ IXGB_PARAM(IntDelayEnable, "Transmit Interrupt Delay Enable");</div><div class='ctx'> #define MIN_FCRTH			      8</div><div class='ctx'> #define MAX_FCRTH			0x3FFF0</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_FCPAUSE		  	0x100	/* this may be too long */</div><div class='ctx'> #define MIN_FCPAUSE			      1</div><div class='ctx'> #define MAX_FCPAUSE			 0xffff</div><div class='add'>+#define DEFAULT_FCPAUSE		  	 0xFFFF /* this may be too long */</div><div class='ctx'> </div><div class='ctx'> struct ixgb_option {</div><div class='ctx'> 	enum { enable_option, range_option, list_option } type;</div><div class='hunk'>@@ -336,7 +334,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)</div><div class='ctx'> 			.type = list_option,</div><div class='ctx'> 			.name = "Flow Control",</div><div class='ctx'> 			.err  = "reading default settings from EEPROM",</div><div class='del'>-			.def  = ixgb_fc_full,</div><div class='add'>+			.def  = ixgb_fc_tx_pause,</div><div class='ctx'> 			.arg  = { .l = { .nr = LIST_LEN(fc_list),</div><div class='ctx'> 					 .p = fc_list }}</div><div class='ctx'> 		};</div><div class='hunk'>@@ -365,8 +363,8 @@ ixgb_check_options(struct ixgb_adapter *adapter)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			adapter-&gt;hw.fc.high_water = opt.def;</div><div class='ctx'> 		}</div><div class='del'>-		if(!(adapter-&gt;hw.fc.type &amp; ixgb_fc_rx_pause) )</div><div class='del'>-			printk (KERN_INFO </div><div class='add'>+		if (!(adapter-&gt;hw.fc.type &amp; ixgb_fc_tx_pause) )</div><div class='add'>+			printk (KERN_INFO</div><div class='ctx'> 				"Ignoring RxFCHighThresh when no RxFC\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Receive Flow Control Low Threshold */</div><div class='hunk'>@@ -385,8 +383,8 @@ ixgb_check_options(struct ixgb_adapter *adapter)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			adapter-&gt;hw.fc.low_water = opt.def;</div><div class='ctx'> 		}</div><div class='del'>-		if(!(adapter-&gt;hw.fc.type &amp; ixgb_fc_rx_pause) )</div><div class='del'>-			printk (KERN_INFO </div><div class='add'>+		if (!(adapter-&gt;hw.fc.type &amp; ixgb_fc_tx_pause) )</div><div class='add'>+			printk (KERN_INFO</div><div class='ctx'> 				"Ignoring RxFCLowThresh when no RxFC\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	{ /* Flow Control Pause Time Request*/</div><div class='hunk'>@@ -406,12 +404,12 @@ ixgb_check_options(struct ixgb_adapter *adapter)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			adapter-&gt;hw.fc.pause_time = opt.def;</div><div class='ctx'> 		}</div><div class='del'>-		if(!(adapter-&gt;hw.fc.type &amp; ixgb_fc_rx_pause) )</div><div class='del'>-			printk (KERN_INFO </div><div class='add'>+		if (!(adapter-&gt;hw.fc.type &amp; ixgb_fc_tx_pause) )</div><div class='add'>+			printk (KERN_INFO</div><div class='ctx'> 				"Ignoring FCReqTimeout when no RxFC\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	/* high low and spacing check for rx flow control thresholds */</div><div class='del'>-	if (adapter-&gt;hw.fc.type &amp; ixgb_fc_rx_pause) {</div><div class='add'>+	if (adapter-&gt;hw.fc.type &amp; ixgb_fc_tx_pause) {</div><div class='ctx'> 		/* high must be greater than low */</div><div class='ctx'> 		if (adapter-&gt;hw.fc.high_water &lt; (adapter-&gt;hw.fc.low_water + 8)) {</div><div class='ctx'> 			/* set defaults */</div><div class='head'>diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ixp2000/caleb.c<br/>index 3595e107df22..7dea5b95012c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/caleb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/caleb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/caleb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixp2000/caleb.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c<br/>index b67f586d7392..d3f4235c585d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/enp2611.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/enp2611.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/enp2611.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixp2000/enp2611.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c<br/>index 48a3a891d3a4..9ec38eebfb56 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixp2400-msf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/ixp2400-msf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixp2400-msf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixp2000/ixp2400-msf.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * License, or (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='head'>diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c<br/>index fbc2d21020f4..6eeb965b4d72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixpdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/ixpdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/ixpdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixp2000/ixpdev.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -236,7 +235,7 @@ static int ixpdev_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (!nds_open++) {</div><div class='ctx'> 		err = request_irq(IRQ_IXP2000_THDA0, ixpdev_interrupt,</div><div class='del'>-					SA_SHIRQ, "ixp2000_eth", nds);</div><div class='add'>+					IRQF_SHARED, "ixp2000_eth", nds);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			nds_open--;</div><div class='ctx'> 			return err;</div><div class='head'>diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ixp2000/pm3386.c<br/>index 5224651c9aac..e08d3f9863b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/pm3386.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ixp2000/pm3386.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ixp2000/pm3386.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ixp2000/pm3386.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c<br/>index 272d331d29cd..661d75b4cad2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/jazzsonic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/jazzsonic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/jazzsonic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/jazzsonic.c</a></div><div class='hunk'>@@ -260,7 +260,7 @@ MODULE_DESCRIPTION("Jazz SONIC ethernet driver");</div><div class='ctx'> module_param(sonic_debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");</div><div class='ctx'> </div><div class='del'>-#define SONIC_IRQ_FLAG SA_INTERRUPT</div><div class='add'>+#define SONIC_IRQ_FLAG IRQF_DISABLED</div><div class='ctx'> </div><div class='ctx'> #include "sonic.c"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/lance.c b/drivers/net/lance.c<br/>index bb5ad479210b..c1c3452c90ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/lance.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/lance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/lance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/lance.c</a></div><div class='hunk'>@@ -968,8 +968,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* The old LANCE chips doesn't automatically pad buffers to min. size. */</div><div class='ctx'> 	if (chip_table[lp-&gt;chip_version].flags &amp; LANCE_MUST_PAD) {</div><div class='ctx'> 		if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-			skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-			if (skb == NULL)</div><div class='add'>+			if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			lp-&gt;tx_ring[entry].length = -ETH_ZLEN;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c<br/>index 957888de3d7e..1ab09447baa5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/lasi_82596.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/lasi_82596.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/lasi_82596.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/lasi_82596.c</a></div><div class='hunk'>@@ -1083,8 +1083,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				skb-&gt;len, skb-&gt;data));</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c<br/>index b79d6e8d3045..997cbce9af6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/loopback.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/loopback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/loopback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/loopback.c</a></div><div class='hunk'>@@ -74,7 +74,7 @@ static void emulate_large_send_offload(struct sk_buff *skb)</div><div class='ctx'> 	struct iphdr *iph = skb-&gt;nh.iph;</div><div class='ctx'> 	struct tcphdr *th = (struct tcphdr*)(skb-&gt;nh.raw + (iph-&gt;ihl * 4));</div><div class='ctx'> 	unsigned int doffset = (iph-&gt;ihl + th-&gt;doff) * 4;</div><div class='del'>-	unsigned int mtu = skb_shinfo(skb)-&gt;tso_size + doffset;</div><div class='add'>+	unsigned int mtu = skb_shinfo(skb)-&gt;gso_size + doffset;</div><div class='ctx'> 	unsigned int offset = 0;</div><div class='ctx'> 	u32 seq = ntohl(th-&gt;seq);</div><div class='ctx'> 	u16 id  = ntohs(iph-&gt;id);</div><div class='hunk'>@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef LOOPBACK_TSO</div><div class='del'>-	if (skb_shinfo(skb)-&gt;tso_size) {</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='ctx'> 		BUG_ON(skb-&gt;protocol != htons(ETH_P_IP));</div><div class='ctx'> 		BUG_ON(skb-&gt;nh.iph-&gt;protocol != IPPROTO_TCP);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c<br/>index 94d5ea1ce8bd..b783a6984abc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/lp486e.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/lp486e.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/lp486e.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/lp486e.c</a></div><div class='hunk'>@@ -851,7 +851,7 @@ static int i596_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	i = request_irq(dev-&gt;irq, &amp;i596_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq(dev-&gt;irq, &amp;i596_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i) {</div><div class='ctx'> 		printk(KERN_ERR "%s: IRQ %d not free\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		return i;</div><div class='hunk'>@@ -877,8 +877,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {</div><div class='ctx'> 	length = skb-&gt;len;</div><div class='ctx'> 	</div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/mace.c b/drivers/net/mace.c<br/>index 77792b286027..29e4b5aa6ead 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/mace.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * Copyright (C) 1996 Paul Mackerras.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -243,12 +242,12 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = request_irq(mp-&gt;tx_dma_intr, mace_txdma_intr, 0, "MACE-txdma", dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_ERR "MACE: can't get irq %d\n", mace-&gt;intrs[1].line);</div><div class='add'>+		printk(KERN_ERR "MACE: can't get irq %d\n", mp-&gt;tx_dma_intr);</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = request_irq(mp-&gt;rx_dma_intr, mace_rxdma_intr, 0, "MACE-rxdma", dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		printk(KERN_ERR "MACE: can't get irq %d\n", mace-&gt;intrs[2].line);</div><div class='add'>+		printk(KERN_ERR "MACE: can't get irq %d\n", mp-&gt;rx_dma_intr);</div><div class='ctx'> 		goto err_free_tx_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c<br/>index bbffb585b3b3..07e58f4a2916 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mipsnet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mipsnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mipsnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/mipsnet.c</a></div><div class='hunk'>@@ -179,7 +179,7 @@ static int mipsnet_open(struct net_device *dev)</div><div class='ctx'> 	pr_debug("%s: mipsnet_open\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(dev-&gt;irq, &amp;mipsnet_interrupt,</div><div class='del'>-			  SA_SHIRQ, dev-&gt;name, (void *) dev);</div><div class='add'>+			  IRQF_SHARED, dev-&gt;name, (void *) dev);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		pr_debug("%s: %s(): can't get irq %d\n",</div><div class='head'>diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c<br/>index 411f4d809c47..760c61b98867 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mv643xx_eth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mv643xx_eth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mv643xx_eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/mv643xx_eth.c</a></div><div class='hunk'>@@ -778,7 +778,7 @@ static int mv643xx_eth_open(struct net_device *dev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(dev-&gt;irq, mv643xx_eth_int_handler,</div><div class='del'>-			SA_SHIRQ | SA_SAMPLE_RANDOM, dev-&gt;name, dev);</div><div class='add'>+			IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",</div><div class='ctx'> 								port_num);</div><div class='hunk'>@@ -1200,7 +1200,7 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (has_tiny_unaligned_frags(skb)) {</div><div class='del'>-		if ((skb_linearize(skb, GFP_ATOMIC) != 0)) {</div><div class='add'>+		if (__skb_linearize(skb)) {</div><div class='ctx'> 			stats-&gt;tx_dropped++;</div><div class='ctx'> 			printk(KERN_DEBUG "%s: failed to linearize tiny "</div><div class='ctx'> 					"unaligned fragment\n", dev-&gt;name);</div><div class='head'>diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h<br/>index 4262c1da6d4a..33c5fafdbbd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/mv643xx_eth.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/mv643xx_eth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/mv643xx_eth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/mv643xx_eth.h</a></div><div class='hunk'>@@ -258,7 +258,7 @@ struct pkt_info {</div><div class='ctx'> 	struct sk_buff *return_info;	/* User resource return information */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Ethernet port specific infomation */</div><div class='add'>+/* Ethernet port specific information */</div><div class='ctx'> </div><div class='ctx'> struct mv643xx_mib_counters {</div><div class='ctx'> 	u64 good_octets_received;</div><div class='head'>diff --git a/drivers/net/myri10ge/Makefile b/drivers/net/myri10ge/Makefile<br/>new file mode 100644<br/>index 000000000000..5df891647aee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/myri10ge/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the Myricom Myri-10G ethernet driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_MYRI10GE) += myri10ge.o</div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c<br/>new file mode 100644<br/>index 000000000000..07ca9480a6fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/myri10ge/myri10ge.c</a></div><div class='hunk'>@@ -0,0 +1,2868 @@</div><div class='add'>+/*************************************************************************</div><div class='add'>+ * myri10ge.c: Myricom Myri-10G Ethernet driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005, 2006 Myricom, Inc.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *    documentation and/or other materials provided with the distribution.</div><div class='add'>+ * 3. Neither the name of Myricom, Inc. nor the names of its contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND</div><div class='add'>+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='add'>+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='add'>+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='add'>+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='add'>+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * If the eeprom on your board is not recent enough, you will need to get a</div><div class='add'>+ * newer firmware image at:</div><div class='add'>+ *   http://www.myri.com/scs/download-Myri10GE.html</div><div class='add'>+ *</div><div class='add'>+ * Contact Information:</div><div class='add'>+ *   &lt;help@myri.com&gt;</div><div class='add'>+ *   Myricom, Inc., 325N Santa Anita Avenue, Arcadia, CA 91006</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/processor.h&gt;</div><div class='add'>+#ifdef CONFIG_MTRR</div><div class='add'>+#include &lt;asm/mtrr.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "myri10ge_mcp.h"</div><div class='add'>+#include "myri10ge_mcp_gen_header.h"</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_VERSION_STR "1.0.0"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");</div><div class='add'>+MODULE_AUTHOR("Maintainer: help@myri.com");</div><div class='add'>+MODULE_VERSION(MYRI10GE_VERSION_STR);</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_MAX_ETHER_MTU 9014</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_ETH_STOPPED 0</div><div class='add'>+#define MYRI10GE_ETH_STOPPING 1</div><div class='add'>+#define MYRI10GE_ETH_STARTING 2</div><div class='add'>+#define MYRI10GE_ETH_RUNNING 3</div><div class='add'>+#define MYRI10GE_ETH_OPEN_FAILED 4</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_EEPROM_STRINGS_SIZE 256</div><div class='add'>+#define MYRI10GE_MAX_SEND_DESC_TSO ((65536 / 2048) * 2)</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_NO_CONFIRM_DATA 0xffffffff</div><div class='add'>+#define MYRI10GE_NO_RESPONSE_RESULT 0xffffffff</div><div class='add'>+</div><div class='add'>+struct myri10ge_rx_buffer_state {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	 DECLARE_PCI_UNMAP_ADDR(bus)</div><div class='add'>+	 DECLARE_PCI_UNMAP_LEN(len)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct myri10ge_tx_buffer_state {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int last;</div><div class='add'>+	 DECLARE_PCI_UNMAP_ADDR(bus)</div><div class='add'>+	 DECLARE_PCI_UNMAP_LEN(len)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct myri10ge_cmd {</div><div class='add'>+	u32 data0;</div><div class='add'>+	u32 data1;</div><div class='add'>+	u32 data2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct myri10ge_rx_buf {</div><div class='add'>+	struct mcp_kreq_ether_recv __iomem *lanai;	/* lanai ptr for recv ring */</div><div class='add'>+	u8 __iomem *wc_fifo;	/* w/c rx dma addr fifo address */</div><div class='add'>+	struct mcp_kreq_ether_recv *shadow;	/* host shadow of recv ring */</div><div class='add'>+	struct myri10ge_rx_buffer_state *info;</div><div class='add'>+	int cnt;</div><div class='add'>+	int alloc_fail;</div><div class='add'>+	int mask;		/* number of rx slots -1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct myri10ge_tx_buf {</div><div class='add'>+	struct mcp_kreq_ether_send __iomem *lanai;	/* lanai ptr for sendq */</div><div class='add'>+	u8 __iomem *wc_fifo;	/* w/c send fifo address */</div><div class='add'>+	struct mcp_kreq_ether_send *req_list;	/* host shadow of sendq */</div><div class='add'>+	char *req_bytes;</div><div class='add'>+	struct myri10ge_tx_buffer_state *info;</div><div class='add'>+	int mask;		/* number of transmit slots -1  */</div><div class='add'>+	int boundary;		/* boundary transmits cannot cross */</div><div class='add'>+	int req ____cacheline_aligned;	/* transmit slots submitted     */</div><div class='add'>+	int pkt_start;		/* packets started */</div><div class='add'>+	int done ____cacheline_aligned;	/* transmit slots completed     */</div><div class='add'>+	int pkt_done;		/* packets completed */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct myri10ge_rx_done {</div><div class='add'>+	struct mcp_slot *entry;</div><div class='add'>+	dma_addr_t bus;</div><div class='add'>+	int cnt;</div><div class='add'>+	int idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct myri10ge_priv {</div><div class='add'>+	int running;		/* running?             */</div><div class='add'>+	int csum_flag;		/* rx_csums?            */</div><div class='add'>+	struct myri10ge_tx_buf tx;	/* transmit ring        */</div><div class='add'>+	struct myri10ge_rx_buf rx_small;</div><div class='add'>+	struct myri10ge_rx_buf rx_big;</div><div class='add'>+	struct myri10ge_rx_done rx_done;</div><div class='add'>+	int small_bytes;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct net_device_stats stats;</div><div class='add'>+	u8 __iomem *sram;</div><div class='add'>+	int sram_size;</div><div class='add'>+	unsigned long board_span;</div><div class='add'>+	unsigned long iomem_base;</div><div class='add'>+	u32 __iomem *irq_claim;</div><div class='add'>+	u32 __iomem *irq_deassert;</div><div class='add'>+	char *mac_addr_string;</div><div class='add'>+	struct mcp_cmd_response *cmd;</div><div class='add'>+	dma_addr_t cmd_bus;</div><div class='add'>+	struct mcp_irq_data *fw_stats;</div><div class='add'>+	dma_addr_t fw_stats_bus;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	int msi_enabled;</div><div class='add'>+	unsigned int link_state;</div><div class='add'>+	unsigned int rdma_tags_available;</div><div class='add'>+	int intr_coal_delay;</div><div class='add'>+	u32 __iomem *intr_coal_delay_ptr;</div><div class='add'>+	int mtrr;</div><div class='add'>+	int wake_queue;</div><div class='add'>+	int stop_queue;</div><div class='add'>+	int down_cnt;</div><div class='add'>+	wait_queue_head_t down_wq;</div><div class='add'>+	struct work_struct watchdog_work;</div><div class='add'>+	struct timer_list watchdog_timer;</div><div class='add'>+	int watchdog_tx_done;</div><div class='add'>+	int watchdog_resets;</div><div class='add'>+	int tx_linearized;</div><div class='add'>+	int pause;</div><div class='add'>+	char *fw_name;</div><div class='add'>+	char eeprom_strings[MYRI10GE_EEPROM_STRINGS_SIZE];</div><div class='add'>+	char fw_version[128];</div><div class='add'>+	u8 mac_addr[6];		/* eeprom mac address */</div><div class='add'>+	unsigned long serial_number;</div><div class='add'>+	int vendor_specific_offset;</div><div class='add'>+	u32 devctl;</div><div class='add'>+	u16 msi_flags;</div><div class='add'>+	u32 read_dma;</div><div class='add'>+	u32 write_dma;</div><div class='add'>+	u32 read_write_dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *myri10ge_fw_unaligned = "myri10ge_ethp_z8e.dat";</div><div class='add'>+static char *myri10ge_fw_aligned = "myri10ge_eth_z8e.dat";</div><div class='add'>+</div><div class='add'>+static char *myri10ge_fw_name = NULL;</div><div class='add'>+module_param(myri10ge_fw_name, charp, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_fw_name, "Firmware image name\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_ecrc_enable = 1;</div><div class='add'>+module_param(myri10ge_ecrc_enable, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_ecrc_enable, "Enable Extended CRC on PCI-E\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_max_intr_slots = 1024;</div><div class='add'>+module_param(myri10ge_max_intr_slots, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_max_intr_slots, "Interrupt queue slots\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_small_bytes = -1;	/* -1 == auto */</div><div class='add'>+module_param(myri10ge_small_bytes, int, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_small_bytes, "Threshold of small packets\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_msi = 1;	/* enable msi by default */</div><div class='add'>+module_param(myri10ge_msi, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_msi, "Enable Message Signalled Interrupts\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_intr_coal_delay = 25;</div><div class='add'>+module_param(myri10ge_intr_coal_delay, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_intr_coal_delay, "Interrupt coalescing delay\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_flow_control = 1;</div><div class='add'>+module_param(myri10ge_flow_control, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_flow_control, "Pause parameter\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_deassert_wait = 1;</div><div class='add'>+module_param(myri10ge_deassert_wait, int, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_deassert_wait,</div><div class='add'>+		 "Wait when deasserting legacy interrupts\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_force_firmware = 0;</div><div class='add'>+module_param(myri10ge_force_firmware, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_force_firmware,</div><div class='add'>+		 "Force firmware to assume aligned completions\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_skb_cross_4k = 0;</div><div class='add'>+module_param(myri10ge_skb_cross_4k, int, S_IRUGO | S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_skb_cross_4k,</div><div class='add'>+		 "Can a small skb cross a 4KB boundary?\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_initial_mtu = MYRI10GE_MAX_ETHER_MTU - ETH_HLEN;</div><div class='add'>+module_param(myri10ge_initial_mtu, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_initial_mtu, "Initial MTU\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_napi_weight = 64;</div><div class='add'>+module_param(myri10ge_napi_weight, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_napi_weight, "Set NAPI weight\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_watchdog_timeout = 1;</div><div class='add'>+module_param(myri10ge_watchdog_timeout, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_watchdog_timeout, "Set watchdog timeout\n");</div><div class='add'>+</div><div class='add'>+static int myri10ge_max_irq_loops = 1048576;</div><div class='add'>+module_param(myri10ge_max_irq_loops, int, S_IRUGO);</div><div class='add'>+MODULE_PARM_DESC(myri10ge_max_irq_loops,</div><div class='add'>+		 "Set stuck legacy IRQ detection threshold\n");</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_FW_OFFSET 1024*1024</div><div class='add'>+#define MYRI10GE_HIGHPART_TO_U32(X) \</div><div class='add'>+(sizeof (X) == 8) ? ((u32)((u64)(X) &gt;&gt; 32)) : (0)</div><div class='add'>+#define MYRI10GE_LOWPART_TO_U32(X) ((u32)(X))</div><div class='add'>+</div><div class='add'>+#define myri10ge_pio_copy(to,from,size) __iowrite64_copy(to,from,size/8)</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,</div><div class='add'>+		  struct myri10ge_cmd *data, int atomic)</div><div class='add'>+{</div><div class='add'>+	struct mcp_cmd *buf;</div><div class='add'>+	char buf_bytes[sizeof(*buf) + 8];</div><div class='add'>+	struct mcp_cmd_response *response = mgp-&gt;cmd;</div><div class='add'>+	char __iomem *cmd_addr = mgp-&gt;sram + MXGEFW_CMD_OFFSET;</div><div class='add'>+	u32 dma_low, dma_high, result, value;</div><div class='add'>+	int sleep_total = 0;</div><div class='add'>+</div><div class='add'>+	/* ensure buf is aligned to 8 bytes */</div><div class='add'>+	buf = (struct mcp_cmd *)ALIGN((unsigned long)buf_bytes, 8);</div><div class='add'>+</div><div class='add'>+	buf-&gt;data0 = htonl(data-&gt;data0);</div><div class='add'>+	buf-&gt;data1 = htonl(data-&gt;data1);</div><div class='add'>+	buf-&gt;data2 = htonl(data-&gt;data2);</div><div class='add'>+	buf-&gt;cmd = htonl(cmd);</div><div class='add'>+	dma_low = MYRI10GE_LOWPART_TO_U32(mgp-&gt;cmd_bus);</div><div class='add'>+	dma_high = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;cmd_bus);</div><div class='add'>+</div><div class='add'>+	buf-&gt;response_addr.low = htonl(dma_low);</div><div class='add'>+	buf-&gt;response_addr.high = htonl(dma_high);</div><div class='add'>+	response-&gt;result = MYRI10GE_NO_RESPONSE_RESULT;</div><div class='add'>+	mb();</div><div class='add'>+	myri10ge_pio_copy(cmd_addr, buf, sizeof(*buf));</div><div class='add'>+</div><div class='add'>+	/* wait up to 15ms. Longest command is the DMA benchmark,</div><div class='add'>+	 * which is capped at 5ms, but runs from a timeout handler</div><div class='add'>+	 * that runs every 7.8ms. So a 15ms timeout leaves us with</div><div class='add'>+	 * a 2.2ms margin</div><div class='add'>+	 */</div><div class='add'>+	if (atomic) {</div><div class='add'>+		/* if atomic is set, do not sleep,</div><div class='add'>+		 * and try to get the completion quickly</div><div class='add'>+		 * (1ms will be enough for those commands) */</div><div class='add'>+		for (sleep_total = 0;</div><div class='add'>+		     sleep_total &lt; 1000</div><div class='add'>+		     &amp;&amp; response-&gt;result == MYRI10GE_NO_RESPONSE_RESULT;</div><div class='add'>+		     sleep_total += 10)</div><div class='add'>+			udelay(10);</div><div class='add'>+	} else {</div><div class='add'>+		/* use msleep for most command */</div><div class='add'>+		for (sleep_total = 0;</div><div class='add'>+		     sleep_total &lt; 15</div><div class='add'>+		     &amp;&amp; response-&gt;result == MYRI10GE_NO_RESPONSE_RESULT;</div><div class='add'>+		     sleep_total++)</div><div class='add'>+			msleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = ntohl(response-&gt;result);</div><div class='add'>+	value = ntohl(response-&gt;data);</div><div class='add'>+	if (result != MYRI10GE_NO_RESPONSE_RESULT) {</div><div class='add'>+		if (result == 0) {</div><div class='add'>+			data-&gt;data0 = value;</div><div class='add'>+			return 0;</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				"command %d failed, result = %d\n",</div><div class='add'>+				cmd, result);</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(&amp;mgp-&gt;pdev-&gt;dev, "command %d timed out, result = %d\n",</div><div class='add'>+		cmd, result);</div><div class='add'>+	return -EAGAIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The eeprom strings on the lanaiX have the format</div><div class='add'>+ * SN=x\0</div><div class='add'>+ * MAC=x:x:x:x:x:x\0</div><div class='add'>+ * PT:ddd mmm xx xx:xx:xx xx\0</div><div class='add'>+ * PV:ddd mmm xx xx:xx:xx xx\0</div><div class='add'>+ */</div><div class='add'>+static int myri10ge_read_mac_addr(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	char *ptr, *limit;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ptr = mgp-&gt;eeprom_strings;</div><div class='add'>+	limit = mgp-&gt;eeprom_strings + MYRI10GE_EEPROM_STRINGS_SIZE;</div><div class='add'>+</div><div class='add'>+	while (*ptr != '\0' &amp;&amp; ptr &lt; limit) {</div><div class='add'>+		if (memcmp(ptr, "MAC=", 4) == 0) {</div><div class='add'>+			ptr += 4;</div><div class='add'>+			mgp-&gt;mac_addr_string = ptr;</div><div class='add'>+			for (i = 0; i &lt; 6; i++) {</div><div class='add'>+				if ((ptr + 2) &gt; limit)</div><div class='add'>+					goto abort;</div><div class='add'>+				mgp-&gt;mac_addr[i] =</div><div class='add'>+				    simple_strtoul(ptr, &amp;ptr, 16);</div><div class='add'>+				ptr += 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (memcmp((const void *)ptr, "SN=", 3) == 0) {</div><div class='add'>+			ptr += 3;</div><div class='add'>+			mgp-&gt;serial_number = simple_strtoul(ptr, &amp;ptr, 10);</div><div class='add'>+		}</div><div class='add'>+		while (ptr &lt; limit &amp;&amp; *ptr++) ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abort:</div><div class='add'>+	dev_err(&amp;mgp-&gt;pdev-&gt;dev, "failed to parse eeprom_strings\n");</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable or disable periodic RDMAs from the host to make certain</div><div class='add'>+ * chipsets resend dropped PCIe messages</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void myri10ge_dummy_rdma(struct myri10ge_priv *mgp, int enable)</div><div class='add'>+{</div><div class='add'>+	char __iomem *submit;</div><div class='add'>+	u32 buf[16];</div><div class='add'>+	u32 dma_low, dma_high;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* clear confirmation addr */</div><div class='add'>+	mgp-&gt;cmd-&gt;data = 0;</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/* send a rdma command to the PCIe engine, and wait for the</div><div class='add'>+	 * response in the confirmation address.  The firmware should</div><div class='add'>+	 * write a -1 there to indicate it is alive and well</div><div class='add'>+	 */</div><div class='add'>+	dma_low = MYRI10GE_LOWPART_TO_U32(mgp-&gt;cmd_bus);</div><div class='add'>+	dma_high = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;cmd_bus);</div><div class='add'>+</div><div class='add'>+	buf[0] = htonl(dma_high);	/* confirm addr MSW */</div><div class='add'>+	buf[1] = htonl(dma_low);	/* confirm addr LSW */</div><div class='add'>+	buf[2] = htonl(MYRI10GE_NO_CONFIRM_DATA);	/* confirm data */</div><div class='add'>+	buf[3] = htonl(dma_high);	/* dummy addr MSW */</div><div class='add'>+	buf[4] = htonl(dma_low);	/* dummy addr LSW */</div><div class='add'>+	buf[5] = htonl(enable);	/* enable? */</div><div class='add'>+</div><div class='add'>+	submit = mgp-&gt;sram + 0xfc01c0;</div><div class='add'>+</div><div class='add'>+	myri10ge_pio_copy(submit, &amp;buf, sizeof(buf));</div><div class='add'>+	for (i = 0; mgp-&gt;cmd-&gt;data != MYRI10GE_NO_CONFIRM_DATA &amp;&amp; i &lt; 20; i++)</div><div class='add'>+		msleep(1);</div><div class='add'>+	if (mgp-&gt;cmd-&gt;data != MYRI10GE_NO_CONFIRM_DATA)</div><div class='add'>+		dev_err(&amp;mgp-&gt;pdev-&gt;dev, "dummy rdma %s failed\n",</div><div class='add'>+			(enable ? "enable" : "disable"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+myri10ge_validate_firmware(struct myri10ge_priv *mgp,</div><div class='add'>+			   struct mcp_gen_header *hdr)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;mgp-&gt;pdev-&gt;dev;</div><div class='add'>+	int major, minor;</div><div class='add'>+</div><div class='add'>+	/* check firmware type */</div><div class='add'>+	if (ntohl(hdr-&gt;mcp_type) != MCP_TYPE_ETH) {</div><div class='add'>+		dev_err(dev, "Bad firmware type: 0x%x\n", ntohl(hdr-&gt;mcp_type));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* save firmware version for ethtool */</div><div class='add'>+	strncpy(mgp-&gt;fw_version, hdr-&gt;version, sizeof(mgp-&gt;fw_version));</div><div class='add'>+</div><div class='add'>+	sscanf(mgp-&gt;fw_version, "%d.%d", &amp;major, &amp;minor);</div><div class='add'>+</div><div class='add'>+	if (!(major == MXGEFW_VERSION_MAJOR &amp;&amp; minor == MXGEFW_VERSION_MINOR)) {</div><div class='add'>+		dev_err(dev, "Found firmware version %s\n", mgp-&gt;fw_version);</div><div class='add'>+		dev_err(dev, "Driver needs %d.%d\n", MXGEFW_VERSION_MAJOR,</div><div class='add'>+			MXGEFW_VERSION_MINOR);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size)</div><div class='add'>+{</div><div class='add'>+	unsigned crc, reread_crc;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	struct device *dev = &amp;mgp-&gt;pdev-&gt;dev;</div><div class='add'>+	struct mcp_gen_header *hdr;</div><div class='add'>+	size_t hdr_offset;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if ((status = request_firmware(&amp;fw, mgp-&gt;fw_name, dev)) &lt; 0) {</div><div class='add'>+		dev_err(dev, "Unable to load %s firmware image via hotplug\n",</div><div class='add'>+			mgp-&gt;fw_name);</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto abort_with_nothing;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check size */</div><div class='add'>+</div><div class='add'>+	if (fw-&gt;size &gt;= mgp-&gt;sram_size - MYRI10GE_FW_OFFSET ||</div><div class='add'>+	    fw-&gt;size &lt; MCP_HEADER_PTR_OFFSET + 4) {</div><div class='add'>+		dev_err(dev, "Firmware size invalid:%d\n", (int)fw-&gt;size);</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto abort_with_fw;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check id */</div><div class='add'>+	hdr_offset = ntohl(*(u32 *) (fw-&gt;data + MCP_HEADER_PTR_OFFSET));</div><div class='add'>+	if ((hdr_offset &amp; 3) || hdr_offset + sizeof(*hdr) &gt; fw-&gt;size) {</div><div class='add'>+		dev_err(dev, "Bad firmware file\n");</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		goto abort_with_fw;</div><div class='add'>+	}</div><div class='add'>+	hdr = (void *)(fw-&gt;data + hdr_offset);</div><div class='add'>+</div><div class='add'>+	status = myri10ge_validate_firmware(mgp, hdr);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		goto abort_with_fw;</div><div class='add'>+</div><div class='add'>+	crc = crc32(~0, fw-&gt;data, fw-&gt;size);</div><div class='add'>+	if (mgp-&gt;tx.boundary == 2048) {</div><div class='add'>+		/* Avoid PCI burst on chipset with unaligned completions. */</div><div class='add'>+		int i;</div><div class='add'>+		__iomem u32 *ptr = (__iomem u32 *) (mgp-&gt;sram +</div><div class='add'>+						    MYRI10GE_FW_OFFSET);</div><div class='add'>+		for (i = 0; i &lt; fw-&gt;size / 4; i++) {</div><div class='add'>+			__raw_writel(((u32 *) fw-&gt;data)[i], ptr + i);</div><div class='add'>+			wmb();</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		myri10ge_pio_copy(mgp-&gt;sram + MYRI10GE_FW_OFFSET, fw-&gt;data,</div><div class='add'>+				  fw-&gt;size);</div><div class='add'>+	}</div><div class='add'>+	/* corruption checking is good for parity recovery and buggy chipset */</div><div class='add'>+	memcpy_fromio(fw-&gt;data, mgp-&gt;sram + MYRI10GE_FW_OFFSET, fw-&gt;size);</div><div class='add'>+	reread_crc = crc32(~0, fw-&gt;data, fw-&gt;size);</div><div class='add'>+	if (crc != reread_crc) {</div><div class='add'>+		dev_err(dev, "CRC failed(fw-len=%u), got 0x%x (expect 0x%x)\n",</div><div class='add'>+			(unsigned)fw-&gt;size, reread_crc, crc);</div><div class='add'>+		status = -EIO;</div><div class='add'>+		goto abort_with_fw;</div><div class='add'>+	}</div><div class='add'>+	*size = (u32) fw-&gt;size;</div><div class='add'>+</div><div class='add'>+abort_with_fw:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+abort_with_nothing:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_adopt_running_firmware(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct mcp_gen_header *hdr;</div><div class='add'>+	struct device *dev = &amp;mgp-&gt;pdev-&gt;dev;</div><div class='add'>+	const size_t bytes = sizeof(struct mcp_gen_header);</div><div class='add'>+	size_t hdr_offset;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* find running firmware header */</div><div class='add'>+	hdr_offset = ntohl(__raw_readl(mgp-&gt;sram + MCP_HEADER_PTR_OFFSET));</div><div class='add'>+</div><div class='add'>+	if ((hdr_offset &amp; 3) || hdr_offset + sizeof(*hdr) &gt; mgp-&gt;sram_size) {</div><div class='add'>+		dev_err(dev, "Running firmware has bad header offset (%d)\n",</div><div class='add'>+			(int)hdr_offset);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy header of running firmware from SRAM to host memory to</div><div class='add'>+	 * validate firmware */</div><div class='add'>+	hdr = kmalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (hdr == NULL) {</div><div class='add'>+		dev_err(dev, "could not malloc firmware hdr\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	memcpy_fromio(hdr, mgp-&gt;sram + hdr_offset, bytes);</div><div class='add'>+	status = myri10ge_validate_firmware(mgp, hdr);</div><div class='add'>+	kfree(hdr);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_load_firmware(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	char __iomem *submit;</div><div class='add'>+	u32 buf[16];</div><div class='add'>+	u32 dma_low, dma_high, size;</div><div class='add'>+	int status, i;</div><div class='add'>+</div><div class='add'>+	size = 0;</div><div class='add'>+	status = myri10ge_load_hotplug_firmware(mgp, &amp;size);</div><div class='add'>+	if (status) {</div><div class='add'>+		dev_warn(&amp;mgp-&gt;pdev-&gt;dev, "hotplug firmware loading failed\n");</div><div class='add'>+</div><div class='add'>+		/* Do not attempt to adopt firmware if there</div><div class='add'>+		 * was a bad crc */</div><div class='add'>+		if (status == -EIO)</div><div class='add'>+			return status;</div><div class='add'>+</div><div class='add'>+		status = myri10ge_adopt_running_firmware(mgp);</div><div class='add'>+		if (status != 0) {</div><div class='add'>+			dev_err(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				"failed to adopt running firmware\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+		dev_info(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+			 "Successfully adopted running firmware\n");</div><div class='add'>+		if (mgp-&gt;tx.boundary == 4096) {</div><div class='add'>+			dev_warn(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Using firmware currently running on NIC"</div><div class='add'>+				 ".  For optimal\n");</div><div class='add'>+			dev_warn(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				 "performance consider loading optimized "</div><div class='add'>+				 "firmware\n");</div><div class='add'>+			dev_warn(&amp;mgp-&gt;pdev-&gt;dev, "via hotplug\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mgp-&gt;fw_name = "adopted";</div><div class='add'>+		mgp-&gt;tx.boundary = 2048;</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear confirmation addr */</div><div class='add'>+	mgp-&gt;cmd-&gt;data = 0;</div><div class='add'>+	mb();</div><div class='add'>+</div><div class='add'>+	/* send a reload command to the bootstrap MCP, and wait for the</div><div class='add'>+	 *  response in the confirmation address.  The firmware should</div><div class='add'>+	 * write a -1 there to indicate it is alive and well</div><div class='add'>+	 */</div><div class='add'>+	dma_low = MYRI10GE_LOWPART_TO_U32(mgp-&gt;cmd_bus);</div><div class='add'>+	dma_high = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;cmd_bus);</div><div class='add'>+</div><div class='add'>+	buf[0] = htonl(dma_high);	/* confirm addr MSW */</div><div class='add'>+	buf[1] = htonl(dma_low);	/* confirm addr LSW */</div><div class='add'>+	buf[2] = htonl(MYRI10GE_NO_CONFIRM_DATA);	/* confirm data */</div><div class='add'>+</div><div class='add'>+	/* FIX: All newest firmware should un-protect the bottom of</div><div class='add'>+	 * the sram before handoff. However, the very first interfaces</div><div class='add'>+	 * do not. Therefore the handoff copy must skip the first 8 bytes</div><div class='add'>+	 */</div><div class='add'>+	buf[3] = htonl(MYRI10GE_FW_OFFSET + 8);	/* where the code starts */</div><div class='add'>+	buf[4] = htonl(size - 8);	/* length of code */</div><div class='add'>+	buf[5] = htonl(8);	/* where to copy to */</div><div class='add'>+	buf[6] = htonl(0);	/* where to jump to */</div><div class='add'>+</div><div class='add'>+	submit = mgp-&gt;sram + 0xfc0000;</div><div class='add'>+</div><div class='add'>+	myri10ge_pio_copy(submit, &amp;buf, sizeof(buf));</div><div class='add'>+	mb();</div><div class='add'>+	msleep(1);</div><div class='add'>+	mb();</div><div class='add'>+	i = 0;</div><div class='add'>+	while (mgp-&gt;cmd-&gt;data != MYRI10GE_NO_CONFIRM_DATA &amp;&amp; i &lt; 20) {</div><div class='add'>+		msleep(1);</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	if (mgp-&gt;cmd-&gt;data != MYRI10GE_NO_CONFIRM_DATA) {</div><div class='add'>+		dev_err(&amp;mgp-&gt;pdev-&gt;dev, "handoff failed\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	dev_info(&amp;mgp-&gt;pdev-&gt;dev, "handoff confirmed\n");</div><div class='add'>+	myri10ge_dummy_rdma(mgp, mgp-&gt;tx.boundary != 4096);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_update_mac_address(struct myri10ge_priv *mgp, u8 * addr)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	cmd.data0 = ((addr[0] &lt;&lt; 24) | (addr[1] &lt;&lt; 16)</div><div class='add'>+		     | (addr[2] &lt;&lt; 8) | addr[3]);</div><div class='add'>+</div><div class='add'>+	cmd.data1 = ((addr[4] &lt;&lt; 8) | (addr[5]));</div><div class='add'>+</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_SET_MAC_ADDRESS, &amp;cmd, 0);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_change_pause(struct myri10ge_priv *mgp, int pause)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int status, ctl;</div><div class='add'>+</div><div class='add'>+	ctl = pause ? MXGEFW_ENABLE_FLOW_CONTROL : MXGEFW_DISABLE_FLOW_CONTROL;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, ctl, &amp;cmd, 0);</div><div class='add'>+</div><div class='add'>+	if (status) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "myri10ge: %s: Failed to set flow control mode\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	mgp-&gt;pause = pause;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+myri10ge_change_promisc(struct myri10ge_priv *mgp, int promisc, int atomic)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int status, ctl;</div><div class='add'>+</div><div class='add'>+	ctl = promisc ? MXGEFW_ENABLE_PROMISC : MXGEFW_DISABLE_PROMISC;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, ctl, &amp;cmd, atomic);</div><div class='add'>+	if (status)</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: Failed to set promisc mode\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_reset(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int status;</div><div class='add'>+	size_t bytes;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	/* try to send a reset command to the card to see if it</div><div class='add'>+	 * is alive */</div><div class='add'>+	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_RESET, &amp;cmd, 0);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;mgp-&gt;pdev-&gt;dev, "failed reset\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now exchange information about interrupts  */</div><div class='add'>+</div><div class='add'>+	bytes = myri10ge_max_intr_slots * sizeof(*mgp-&gt;rx_done.entry);</div><div class='add'>+	memset(mgp-&gt;rx_done.entry, 0, bytes);</div><div class='add'>+	cmd.data0 = (u32) bytes;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_SIZE, &amp;cmd, 0);</div><div class='add'>+	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_DMA, &amp;cmd, 0);</div><div class='add'>+</div><div class='add'>+	status |=</div><div class='add'>+	    myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &amp;cmd, 0);</div><div class='add'>+	mgp-&gt;irq_claim = (__iomem u32 *) (mgp-&gt;sram + cmd.data0);</div><div class='add'>+	if (!mgp-&gt;msi_enabled) {</div><div class='add'>+		status |= myri10ge_send_cmd</div><div class='add'>+		    (mgp, MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET, &amp;cmd, 0);</div><div class='add'>+		mgp-&gt;irq_deassert = (__iomem u32 *) (mgp-&gt;sram + cmd.data0);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	status |= myri10ge_send_cmd</div><div class='add'>+	    (mgp, MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET, &amp;cmd, 0);</div><div class='add'>+	mgp-&gt;intr_coal_delay_ptr = (__iomem u32 *) (mgp-&gt;sram + cmd.data0);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;mgp-&gt;pdev-&gt;dev, "failed set interrupt parameters\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	__raw_writel(htonl(mgp-&gt;intr_coal_delay), mgp-&gt;intr_coal_delay_ptr);</div><div class='add'>+</div><div class='add'>+	/* Run a small DMA test.</div><div class='add'>+	 * The magic multipliers to the length tell the firmware</div><div class='add'>+	 * to do DMA read, write, or read+write tests.  The</div><div class='add'>+	 * results are returned in cmd.data0.  The upper 16</div><div class='add'>+	 * bits or the return is the number of transfers completed.</div><div class='add'>+	 * The lower 16 bits is the time in 0.5us ticks that the</div><div class='add'>+	 * transfers took to complete.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	len = mgp-&gt;tx.boundary;</div><div class='add'>+</div><div class='add'>+	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data2 = len * 0x10000;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &amp;cmd, 0);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		mgp-&gt;read_dma = ((cmd.data0 &gt;&gt; 16) * len * 2) /</div><div class='add'>+		    (cmd.data0 &amp; 0xffff);</div><div class='add'>+	else</div><div class='add'>+		dev_warn(&amp;mgp-&gt;pdev-&gt;dev, "DMA read benchmark failed: %d\n",</div><div class='add'>+			 status);</div><div class='add'>+	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data2 = len * 0x1;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &amp;cmd, 0);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		mgp-&gt;write_dma = ((cmd.data0 &gt;&gt; 16) * len * 2) /</div><div class='add'>+		    (cmd.data0 &amp; 0xffff);</div><div class='add'>+	else</div><div class='add'>+		dev_warn(&amp;mgp-&gt;pdev-&gt;dev, "DMA write benchmark failed: %d\n",</div><div class='add'>+			 status);</div><div class='add'>+</div><div class='add'>+	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;rx_done.bus);</div><div class='add'>+	cmd.data2 = len * 0x10001;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &amp;cmd, 0);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		mgp-&gt;read_write_dma = ((cmd.data0 &gt;&gt; 16) * len * 2 * 2) /</div><div class='add'>+		    (cmd.data0 &amp; 0xffff);</div><div class='add'>+	else</div><div class='add'>+		dev_warn(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+			 "DMA read/write benchmark failed: %d\n", status);</div><div class='add'>+</div><div class='add'>+	memset(mgp-&gt;rx_done.entry, 0, bytes);</div><div class='add'>+</div><div class='add'>+	/* reset mcp/driver shared state back to 0 */</div><div class='add'>+	mgp-&gt;tx.req = 0;</div><div class='add'>+	mgp-&gt;tx.done = 0;</div><div class='add'>+	mgp-&gt;tx.pkt_start = 0;</div><div class='add'>+	mgp-&gt;tx.pkt_done = 0;</div><div class='add'>+	mgp-&gt;rx_big.cnt = 0;</div><div class='add'>+	mgp-&gt;rx_small.cnt = 0;</div><div class='add'>+	mgp-&gt;rx_done.idx = 0;</div><div class='add'>+	mgp-&gt;rx_done.cnt = 0;</div><div class='add'>+	status = myri10ge_update_mac_address(mgp, mgp-&gt;dev-&gt;dev_addr);</div><div class='add'>+	myri10ge_change_promisc(mgp, 0, 0);</div><div class='add'>+	myri10ge_change_pause(mgp, mgp-&gt;pause);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+myri10ge_submit_8rx(struct mcp_kreq_ether_recv __iomem * dst,</div><div class='add'>+		    struct mcp_kreq_ether_recv *src)</div><div class='add'>+{</div><div class='add'>+	u32 low;</div><div class='add'>+</div><div class='add'>+	low = src-&gt;addr_low;</div><div class='add'>+	src-&gt;addr_low = DMA_32BIT_MASK;</div><div class='add'>+	myri10ge_pio_copy(dst, src, 8 * sizeof(*src));</div><div class='add'>+	mb();</div><div class='add'>+	src-&gt;addr_low = low;</div><div class='add'>+	__raw_writel(low, &amp;dst-&gt;addr_low);</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set of routines to get a new receive buffer.  Any buffer which</div><div class='add'>+ * crosses a 4KB boundary must start on a 4KB boundary due to PCIe</div><div class='add'>+ * wdma restrictions. We also try to align any smaller allocation to</div><div class='add'>+ * at least a 16 byte boundary for efficiency.  We assume the linux</div><div class='add'>+ * memory allocator works by powers of 2, and will not return memory</div><div class='add'>+ * smaller than 2KB which crosses a 4KB boundary.  If it does, we fall</div><div class='add'>+ * back to allocating 2x as much space as required.</div><div class='add'>+ *</div><div class='add'>+ * We intend to replace large (&gt;4KB) skb allocations by using</div><div class='add'>+ * pages directly and building a fraglist in the near future.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline struct sk_buff *myri10ge_alloc_big(int bytes)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned long data, roundup;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(bytes + 4096 + MXGEFW_PAD);</div><div class='add'>+	if (skb == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Correct skb-&gt;truesize so that socket buffer</div><div class='add'>+	 * accounting is not confused the rounding we must</div><div class='add'>+	 * do to satisfy alignment constraints.</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;truesize -= 4096;</div><div class='add'>+</div><div class='add'>+	data = (unsigned long)(skb-&gt;data);</div><div class='add'>+	roundup = (-data) &amp; (4095);</div><div class='add'>+	skb_reserve(skb, roundup);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate 2x as much space as required and use whichever portion</div><div class='add'>+ * does not cross a 4KB boundary */</div><div class='add'>+static inline struct sk_buff *myri10ge_alloc_small_safe(unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned long data, boundary;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(2 * (bytes + MXGEFW_PAD) - 1);</div><div class='add'>+	if (unlikely(skb == NULL))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Correct skb-&gt;truesize so that socket buffer</div><div class='add'>+	 * accounting is not confused the rounding we must</div><div class='add'>+	 * do to satisfy alignment constraints.</div><div class='add'>+	 */</div><div class='add'>+	skb-&gt;truesize -= bytes + MXGEFW_PAD;</div><div class='add'>+</div><div class='add'>+	data = (unsigned long)(skb-&gt;data);</div><div class='add'>+	boundary = (data + 4095UL) &amp; ~4095UL;</div><div class='add'>+	if ((boundary - data) &gt;= (bytes + MXGEFW_PAD))</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, boundary - data);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate just enough space, and verify that the allocated</div><div class='add'>+ * space does not cross a 4KB boundary */</div><div class='add'>+static inline struct sk_buff *myri10ge_alloc_small(int bytes)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned long roundup, data, end;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(bytes + 16 + MXGEFW_PAD);</div><div class='add'>+	if (unlikely(skb == NULL))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Round allocated buffer to 16 byte boundary */</div><div class='add'>+	data = (unsigned long)(skb-&gt;data);</div><div class='add'>+	roundup = (-data) &amp; 15UL;</div><div class='add'>+	skb_reserve(skb, roundup);</div><div class='add'>+	/* Verify that the data buffer does not cross a page boundary */</div><div class='add'>+	data = (unsigned long)(skb-&gt;data);</div><div class='add'>+	end = data + bytes + MXGEFW_PAD - 1;</div><div class='add'>+	if (unlikely(((end &gt;&gt; 12) != (data &gt;&gt; 12)) &amp;&amp; (data &amp; 4095UL))) {</div><div class='add'>+		printk(KERN_NOTICE</div><div class='add'>+		       "myri10ge_alloc_small: small skb crossed 4KB boundary\n");</div><div class='add'>+		myri10ge_skb_cross_4k = 1;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		skb = myri10ge_alloc_small_safe(bytes);</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+myri10ge_getbuf(struct myri10ge_rx_buf *rx, struct pci_dev *pdev, int bytes,</div><div class='add'>+		int idx)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t bus;</div><div class='add'>+	int len, retval = 0;</div><div class='add'>+</div><div class='add'>+	bytes += VLAN_HLEN;	/* account for 802.1q vlan tag */</div><div class='add'>+</div><div class='add'>+	if ((bytes + MXGEFW_PAD) &gt; (4096 - 16) /* linux overhead */ )</div><div class='add'>+		skb = myri10ge_alloc_big(bytes);</div><div class='add'>+	else if (myri10ge_skb_cross_4k)</div><div class='add'>+		skb = myri10ge_alloc_small_safe(bytes);</div><div class='add'>+	else</div><div class='add'>+		skb = myri10ge_alloc_small(bytes);</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb == NULL)) {</div><div class='add'>+		rx-&gt;alloc_fail++;</div><div class='add'>+		retval = -ENOBUFS;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set len so that it only covers the area we</div><div class='add'>+	 * need mapped for DMA */</div><div class='add'>+	len = bytes + MXGEFW_PAD;</div><div class='add'>+</div><div class='add'>+	bus = pci_map_single(pdev, skb-&gt;data, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+	rx-&gt;info[idx].skb = skb;</div><div class='add'>+	pci_unmap_addr_set(&amp;rx-&gt;info[idx], bus, bus);</div><div class='add'>+	pci_unmap_len_set(&amp;rx-&gt;info[idx], len, len);</div><div class='add'>+	rx-&gt;shadow[idx].addr_low = htonl(MYRI10GE_LOWPART_TO_U32(bus));</div><div class='add'>+	rx-&gt;shadow[idx].addr_high = htonl(MYRI10GE_HIGHPART_TO_U32(bus));</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	/* copy 8 descriptors (64-bytes) to the mcp at a time */</div><div class='add'>+	if ((idx &amp; 7) == 7) {</div><div class='add'>+		if (rx-&gt;wc_fifo == NULL)</div><div class='add'>+			myri10ge_submit_8rx(&amp;rx-&gt;lanai[idx - 7],</div><div class='add'>+					    &amp;rx-&gt;shadow[idx - 7]);</div><div class='add'>+		else {</div><div class='add'>+			mb();</div><div class='add'>+			myri10ge_pio_copy(rx-&gt;wc_fifo,</div><div class='add'>+					  &amp;rx-&gt;shadow[idx - 7], 64);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void myri10ge_vlan_ip_csum(struct sk_buff *skb, u16 hw_csum)</div><div class='add'>+{</div><div class='add'>+	struct vlan_hdr *vh = (struct vlan_hdr *)(skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	if ((skb-&gt;protocol == ntohs(ETH_P_8021Q)) &amp;&amp;</div><div class='add'>+	    (vh-&gt;h_vlan_encapsulated_proto == htons(ETH_P_IP) ||</div><div class='add'>+	     vh-&gt;h_vlan_encapsulated_proto == htons(ETH_P_IPV6))) {</div><div class='add'>+		skb-&gt;csum = hw_csum;</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_HW;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long</div><div class='add'>+myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,</div><div class='add'>+		 int bytes, int len, int csum)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t bus;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int idx, unmap_len;</div><div class='add'>+</div><div class='add'>+	idx = rx-&gt;cnt &amp; rx-&gt;mask;</div><div class='add'>+	rx-&gt;cnt++;</div><div class='add'>+</div><div class='add'>+	/* save a pointer to the received skb */</div><div class='add'>+	skb = rx-&gt;info[idx].skb;</div><div class='add'>+	bus = pci_unmap_addr(&amp;rx-&gt;info[idx], bus);</div><div class='add'>+	unmap_len = pci_unmap_len(&amp;rx-&gt;info[idx], len);</div><div class='add'>+</div><div class='add'>+	/* try to replace the received skb */</div><div class='add'>+	if (myri10ge_getbuf(rx, mgp-&gt;pdev, bytes, idx)) {</div><div class='add'>+		/* drop the frame -- the old skbuf is re-cycled */</div><div class='add'>+		mgp-&gt;stats.rx_dropped += 1;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unmap the recvd skb */</div><div class='add'>+	pci_unmap_single(mgp-&gt;pdev, bus, unmap_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+</div><div class='add'>+	/* mcp implicitly skips 1st bytes so that packet is properly</div><div class='add'>+	 * aligned */</div><div class='add'>+	skb_reserve(skb, MXGEFW_PAD);</div><div class='add'>+</div><div class='add'>+	/* set the length of the frame */</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, mgp-&gt;dev);</div><div class='add'>+	skb-&gt;dev = mgp-&gt;dev;</div><div class='add'>+	if (mgp-&gt;csum_flag) {</div><div class='add'>+		if ((skb-&gt;protocol == ntohs(ETH_P_IP)) ||</div><div class='add'>+		    (skb-&gt;protocol == ntohs(ETH_P_IPV6))) {</div><div class='add'>+			skb-&gt;csum = ntohs((u16) csum);</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_HW;</div><div class='add'>+		} else</div><div class='add'>+			myri10ge_vlan_ip_csum(skb, ntohs((u16) csum));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_receive_skb(skb);</div><div class='add'>+	mgp-&gt;dev-&gt;last_rx = jiffies;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void myri10ge_tx_done(struct myri10ge_priv *mgp, int mcp_index)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = mgp-&gt;pdev;</div><div class='add'>+	struct myri10ge_tx_buf *tx = &amp;mgp-&gt;tx;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int idx, len;</div><div class='add'>+	int limit = 0;</div><div class='add'>+</div><div class='add'>+	while (tx-&gt;pkt_done != mcp_index) {</div><div class='add'>+		idx = tx-&gt;done &amp; tx-&gt;mask;</div><div class='add'>+		skb = tx-&gt;info[idx].skb;</div><div class='add'>+</div><div class='add'>+		/* Mark as free */</div><div class='add'>+		tx-&gt;info[idx].skb = NULL;</div><div class='add'>+		if (tx-&gt;info[idx].last) {</div><div class='add'>+			tx-&gt;pkt_done++;</div><div class='add'>+			tx-&gt;info[idx].last = 0;</div><div class='add'>+		}</div><div class='add'>+		tx-&gt;done++;</div><div class='add'>+		len = pci_unmap_len(&amp;tx-&gt;info[idx], len);</div><div class='add'>+		pci_unmap_len_set(&amp;tx-&gt;info[idx], len, 0);</div><div class='add'>+		if (skb) {</div><div class='add'>+			mgp-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+			mgp-&gt;stats.tx_packets++;</div><div class='add'>+			dev_kfree_skb_irq(skb);</div><div class='add'>+			if (len)</div><div class='add'>+				pci_unmap_single(pdev,</div><div class='add'>+						 pci_unmap_addr(&amp;tx-&gt;info[idx],</div><div class='add'>+								bus), len,</div><div class='add'>+						 PCI_DMA_TODEVICE);</div><div class='add'>+		} else {</div><div class='add'>+			if (len)</div><div class='add'>+				pci_unmap_page(pdev,</div><div class='add'>+					       pci_unmap_addr(&amp;tx-&gt;info[idx],</div><div class='add'>+							      bus), len,</div><div class='add'>+					       PCI_DMA_TODEVICE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* limit potential for livelock by only handling</div><div class='add'>+		 * 2 full tx rings per call */</div><div class='add'>+		if (unlikely(++limit &gt; 2 * tx-&gt;mask))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	/* start the queue if we've stopped it */</div><div class='add'>+	if (netif_queue_stopped(mgp-&gt;dev)</div><div class='add'>+	    &amp;&amp; tx-&gt;req - tx-&gt;done &lt; (tx-&gt;mask &gt;&gt; 1)) {</div><div class='add'>+		mgp-&gt;wake_queue++;</div><div class='add'>+		netif_wake_queue(mgp-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void myri10ge_clean_rx_done(struct myri10ge_priv *mgp, int *limit)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_rx_done *rx_done = &amp;mgp-&gt;rx_done;</div><div class='add'>+	unsigned long rx_bytes = 0;</div><div class='add'>+	unsigned long rx_packets = 0;</div><div class='add'>+	unsigned long rx_ok;</div><div class='add'>+</div><div class='add'>+	int idx = rx_done-&gt;idx;</div><div class='add'>+	int cnt = rx_done-&gt;cnt;</div><div class='add'>+	u16 length;</div><div class='add'>+	u16 checksum;</div><div class='add'>+</div><div class='add'>+	while (rx_done-&gt;entry[idx].length != 0 &amp;&amp; *limit != 0) {</div><div class='add'>+		length = ntohs(rx_done-&gt;entry[idx].length);</div><div class='add'>+		rx_done-&gt;entry[idx].length = 0;</div><div class='add'>+		checksum = ntohs(rx_done-&gt;entry[idx].checksum);</div><div class='add'>+		if (length &lt;= mgp-&gt;small_bytes)</div><div class='add'>+			rx_ok = myri10ge_rx_done(mgp, &amp;mgp-&gt;rx_small,</div><div class='add'>+						 mgp-&gt;small_bytes,</div><div class='add'>+						 length, checksum);</div><div class='add'>+		else</div><div class='add'>+			rx_ok = myri10ge_rx_done(mgp, &amp;mgp-&gt;rx_big,</div><div class='add'>+						 mgp-&gt;dev-&gt;mtu + ETH_HLEN,</div><div class='add'>+						 length, checksum);</div><div class='add'>+		rx_packets += rx_ok;</div><div class='add'>+		rx_bytes += rx_ok * (unsigned long)length;</div><div class='add'>+		cnt++;</div><div class='add'>+		idx = cnt &amp; (myri10ge_max_intr_slots - 1);</div><div class='add'>+</div><div class='add'>+		/* limit potential for livelock by only handling a</div><div class='add'>+		 * limited number of frames. */</div><div class='add'>+		(*limit)--;</div><div class='add'>+	}</div><div class='add'>+	rx_done-&gt;idx = idx;</div><div class='add'>+	rx_done-&gt;cnt = cnt;</div><div class='add'>+	mgp-&gt;stats.rx_packets += rx_packets;</div><div class='add'>+	mgp-&gt;stats.rx_bytes += rx_bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct mcp_irq_data *stats = mgp-&gt;fw_stats;</div><div class='add'>+</div><div class='add'>+	if (unlikely(stats-&gt;stats_updated)) {</div><div class='add'>+		if (mgp-&gt;link_state != stats-&gt;link_up) {</div><div class='add'>+			mgp-&gt;link_state = stats-&gt;link_up;</div><div class='add'>+			if (mgp-&gt;link_state) {</div><div class='add'>+				printk(KERN_INFO "myri10ge: %s: link up\n",</div><div class='add'>+				       mgp-&gt;dev-&gt;name);</div><div class='add'>+				netif_carrier_on(mgp-&gt;dev);</div><div class='add'>+			} else {</div><div class='add'>+				printk(KERN_INFO "myri10ge: %s: link down\n",</div><div class='add'>+				       mgp-&gt;dev-&gt;name);</div><div class='add'>+				netif_carrier_off(mgp-&gt;dev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (mgp-&gt;rdma_tags_available !=</div><div class='add'>+		    ntohl(mgp-&gt;fw_stats-&gt;rdma_tags_available)) {</div><div class='add'>+			mgp-&gt;rdma_tags_available =</div><div class='add'>+			    ntohl(mgp-&gt;fw_stats-&gt;rdma_tags_available);</div><div class='add'>+			printk(KERN_WARNING "myri10ge: %s: RDMA timed out! "</div><div class='add'>+			       "%d tags left\n", mgp-&gt;dev-&gt;name,</div><div class='add'>+			       mgp-&gt;rdma_tags_available);</div><div class='add'>+		}</div><div class='add'>+		mgp-&gt;down_cnt += stats-&gt;link_down;</div><div class='add'>+		if (stats-&gt;link_down)</div><div class='add'>+			wake_up(&amp;mgp-&gt;down_wq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_poll(struct net_device *netdev, int *budget)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+	struct myri10ge_rx_done *rx_done = &amp;mgp-&gt;rx_done;</div><div class='add'>+	int limit, orig_limit, work_done;</div><div class='add'>+</div><div class='add'>+	/* process as many rx events as NAPI will allow */</div><div class='add'>+	limit = min(*budget, netdev-&gt;quota);</div><div class='add'>+	orig_limit = limit;</div><div class='add'>+	myri10ge_clean_rx_done(mgp, &amp;limit);</div><div class='add'>+	work_done = orig_limit - limit;</div><div class='add'>+	*budget -= work_done;</div><div class='add'>+	netdev-&gt;quota -= work_done;</div><div class='add'>+</div><div class='add'>+	if (rx_done-&gt;entry[rx_done-&gt;idx].length == 0 || !netif_running(netdev)) {</div><div class='add'>+		netif_rx_complete(netdev);</div><div class='add'>+		__raw_writel(htonl(3), mgp-&gt;irq_claim);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t myri10ge_intr(int irq, void *arg, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = arg;</div><div class='add'>+	struct mcp_irq_data *stats = mgp-&gt;fw_stats;</div><div class='add'>+	struct myri10ge_tx_buf *tx = &amp;mgp-&gt;tx;</div><div class='add'>+	u32 send_done_count;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* make sure it is our IRQ, and that the DMA has finished */</div><div class='add'>+	if (unlikely(!stats-&gt;valid))</div><div class='add'>+		return (IRQ_NONE);</div><div class='add'>+</div><div class='add'>+	/* low bit indicates receives are present, so schedule</div><div class='add'>+	 * napi poll handler */</div><div class='add'>+	if (stats-&gt;valid &amp; 1)</div><div class='add'>+		netif_rx_schedule(mgp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!mgp-&gt;msi_enabled) {</div><div class='add'>+		__raw_writel(0, mgp-&gt;irq_deassert);</div><div class='add'>+		if (!myri10ge_deassert_wait)</div><div class='add'>+			stats-&gt;valid = 0;</div><div class='add'>+		mb();</div><div class='add'>+	} else</div><div class='add'>+		stats-&gt;valid = 0;</div><div class='add'>+</div><div class='add'>+	/* Wait for IRQ line to go low, if using INTx */</div><div class='add'>+	i = 0;</div><div class='add'>+	while (1) {</div><div class='add'>+		i++;</div><div class='add'>+		/* check for transmit completes and receives */</div><div class='add'>+		send_done_count = ntohl(stats-&gt;send_done_count);</div><div class='add'>+		if (send_done_count != tx-&gt;pkt_done)</div><div class='add'>+			myri10ge_tx_done(mgp, (int)send_done_count);</div><div class='add'>+		if (unlikely(i &gt; myri10ge_max_irq_loops)) {</div><div class='add'>+			printk(KERN_WARNING "myri10ge: %s: irq stuck?\n",</div><div class='add'>+			       mgp-&gt;dev-&gt;name);</div><div class='add'>+			stats-&gt;valid = 0;</div><div class='add'>+			schedule_work(&amp;mgp-&gt;watchdog_work);</div><div class='add'>+		}</div><div class='add'>+		if (likely(stats-&gt;valid == 0))</div><div class='add'>+			break;</div><div class='add'>+		cpu_relax();</div><div class='add'>+		barrier();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	myri10ge_check_statblock(mgp);</div><div class='add'>+</div><div class='add'>+	__raw_writel(htonl(3), mgp-&gt;irq_claim + 1);</div><div class='add'>+	return (IRQ_HANDLED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+myri10ge_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;autoneg = AUTONEG_DISABLE;</div><div class='add'>+	cmd-&gt;speed = SPEED_10000;</div><div class='add'>+	cmd-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+myri10ge_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	strlcpy(info-&gt;driver, "myri10ge", sizeof(info-&gt;driver));</div><div class='add'>+	strlcpy(info-&gt;version, MYRI10GE_VERSION_STR, sizeof(info-&gt;version));</div><div class='add'>+	strlcpy(info-&gt;fw_version, mgp-&gt;fw_version, sizeof(info-&gt;fw_version));</div><div class='add'>+	strlcpy(info-&gt;bus_info, pci_name(mgp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+myri10ge_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coal)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+	coal-&gt;rx_coalesce_usecs = mgp-&gt;intr_coal_delay;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+myri10ge_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coal)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	mgp-&gt;intr_coal_delay = coal-&gt;rx_coalesce_usecs;</div><div class='add'>+	__raw_writel(htonl(mgp-&gt;intr_coal_delay), mgp-&gt;intr_coal_delay_ptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+myri10ge_get_pauseparam(struct net_device *netdev,</div><div class='add'>+			struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	pause-&gt;autoneg = 0;</div><div class='add'>+	pause-&gt;rx_pause = mgp-&gt;pause;</div><div class='add'>+	pause-&gt;tx_pause = mgp-&gt;pause;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+myri10ge_set_pauseparam(struct net_device *netdev,</div><div class='add'>+			struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (pause-&gt;tx_pause != mgp-&gt;pause)</div><div class='add'>+		return myri10ge_change_pause(mgp, pause-&gt;tx_pause);</div><div class='add'>+	if (pause-&gt;rx_pause != mgp-&gt;pause)</div><div class='add'>+		return myri10ge_change_pause(mgp, pause-&gt;tx_pause);</div><div class='add'>+	if (pause-&gt;autoneg != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+myri10ge_get_ringparam(struct net_device *netdev,</div><div class='add'>+		       struct ethtool_ringparam *ring)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ring-&gt;rx_mini_max_pending = mgp-&gt;rx_small.mask + 1;</div><div class='add'>+	ring-&gt;rx_max_pending = mgp-&gt;rx_big.mask + 1;</div><div class='add'>+	ring-&gt;rx_jumbo_max_pending = 0;</div><div class='add'>+	ring-&gt;tx_max_pending = mgp-&gt;rx_small.mask + 1;</div><div class='add'>+	ring-&gt;rx_mini_pending = ring-&gt;rx_mini_max_pending;</div><div class='add'>+	ring-&gt;rx_pending = ring-&gt;rx_max_pending;</div><div class='add'>+	ring-&gt;rx_jumbo_pending = ring-&gt;rx_jumbo_max_pending;</div><div class='add'>+	ring-&gt;tx_pending = ring-&gt;tx_max_pending;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 myri10ge_get_rx_csum(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+	if (mgp-&gt;csum_flag)</div><div class='add'>+		return 1;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+	if (csum_enabled)</div><div class='add'>+		mgp-&gt;csum_flag = MXGEFW_FLAGS_CKSUM;</div><div class='add'>+	else</div><div class='add'>+		mgp-&gt;csum_flag = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char myri10ge_gstrings_stats[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",</div><div class='add'>+	"tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",</div><div class='add'>+	"rx_length_errors", "rx_over_errors", "rx_crc_errors",</div><div class='add'>+	"rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",</div><div class='add'>+	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",</div><div class='add'>+	"tx_heartbeat_errors", "tx_window_errors",</div><div class='add'>+	/* device-specific stats */</div><div class='add'>+	"tx_boundary", "WC", "irq", "MSI",</div><div class='add'>+	"read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",</div><div class='add'>+	"serial_number", "tx_pkt_start", "tx_pkt_done",</div><div class='add'>+	"tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",</div><div class='add'>+	"wake_queue", "stop_queue", "watchdog_resets", "tx_linearized",</div><div class='add'>+	"link_up", "dropped_link_overflow", "dropped_link_error_or_filtered",</div><div class='add'>+	"dropped_runt", "dropped_overrun", "dropped_no_small_buffer",</div><div class='add'>+	"dropped_no_big_buffer"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MYRI10GE_NET_STATS_LEN      21</div><div class='add'>+#define MYRI10GE_STATS_LEN  sizeof(myri10ge_gstrings_stats) / ETH_GSTRING_LEN</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+myri10ge_get_strings(struct net_device *netdev, u32 stringset, u8 * data)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		memcpy(data, *myri10ge_gstrings_stats,</div><div class='add'>+		       sizeof(myri10ge_gstrings_stats));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_get_stats_count(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return MYRI10GE_STATS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+myri10ge_get_ethtool_stats(struct net_device *netdev,</div><div class='add'>+			   struct ethtool_stats *stats, u64 * data)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(netdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MYRI10GE_NET_STATS_LEN; i++)</div><div class='add'>+		data[i] = ((unsigned long *)&amp;mgp-&gt;stats)[i];</div><div class='add'>+</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;tx.boundary;</div><div class='add'>+	data[i++] = (unsigned int)(mgp-&gt;mtrr &gt;= 0);</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;pdev-&gt;irq;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;msi_enabled;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;read_dma;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;write_dma;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;read_write_dma;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;serial_number;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;tx.pkt_start;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;tx.pkt_done;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;tx.req;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;tx.done;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;rx_small.cnt;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;rx_big.cnt;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;wake_queue;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;stop_queue;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;watchdog_resets;</div><div class='add'>+	data[i++] = (unsigned int)mgp-&gt;tx_linearized;</div><div class='add'>+	data[i++] = (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;link_up);</div><div class='add'>+	data[i++] = (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;dropped_link_overflow);</div><div class='add'>+	data[i++] =</div><div class='add'>+	    (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;dropped_link_error_or_filtered);</div><div class='add'>+	data[i++] = (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;dropped_runt);</div><div class='add'>+	data[i++] = (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;dropped_overrun);</div><div class='add'>+	data[i++] = (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;dropped_no_small_buffer);</div><div class='add'>+	data[i++] = (unsigned int)ntohl(mgp-&gt;fw_stats-&gt;dropped_no_big_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethtool_ops myri10ge_ethtool_ops = {</div><div class='add'>+	.get_settings = myri10ge_get_settings,</div><div class='add'>+	.get_drvinfo = myri10ge_get_drvinfo,</div><div class='add'>+	.get_coalesce = myri10ge_get_coalesce,</div><div class='add'>+	.set_coalesce = myri10ge_set_coalesce,</div><div class='add'>+	.get_pauseparam = myri10ge_get_pauseparam,</div><div class='add'>+	.set_pauseparam = myri10ge_set_pauseparam,</div><div class='add'>+	.get_ringparam = myri10ge_get_ringparam,</div><div class='add'>+	.get_rx_csum = myri10ge_get_rx_csum,</div><div class='add'>+	.set_rx_csum = myri10ge_set_rx_csum,</div><div class='add'>+	.get_tx_csum = ethtool_op_get_tx_csum,</div><div class='add'>+	.set_tx_csum = ethtool_op_set_tx_hw_csum,</div><div class='add'>+	.get_sg = ethtool_op_get_sg,</div><div class='add'>+	.set_sg = ethtool_op_set_sg,</div><div class='add'>+#ifdef NETIF_F_TSO</div><div class='add'>+	.get_tso = ethtool_op_get_tso,</div><div class='add'>+	.set_tso = ethtool_op_set_tso,</div><div class='add'>+#endif</div><div class='add'>+	.get_strings = myri10ge_get_strings,</div><div class='add'>+	.get_stats_count = myri10ge_get_stats_count,</div><div class='add'>+	.get_ethtool_stats = myri10ge_get_ethtool_stats</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int myri10ge_allocate_rings(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int tx_ring_size, rx_ring_size;</div><div class='add'>+	int tx_ring_entries, rx_ring_entries;</div><div class='add'>+	int i, status;</div><div class='add'>+	size_t bytes;</div><div class='add'>+</div><div class='add'>+	mgp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* get ring sizes */</div><div class='add'>+</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_RING_SIZE, &amp;cmd, 0);</div><div class='add'>+	tx_ring_size = cmd.data0;</div><div class='add'>+	status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &amp;cmd, 0);</div><div class='add'>+	rx_ring_size = cmd.data0;</div><div class='add'>+</div><div class='add'>+	tx_ring_entries = tx_ring_size / sizeof(struct mcp_kreq_ether_send);</div><div class='add'>+	rx_ring_entries = rx_ring_size / sizeof(struct mcp_dma_addr);</div><div class='add'>+	mgp-&gt;tx.mask = tx_ring_entries - 1;</div><div class='add'>+	mgp-&gt;rx_small.mask = mgp-&gt;rx_big.mask = rx_ring_entries - 1;</div><div class='add'>+</div><div class='add'>+	/* allocate the host shadow rings */</div><div class='add'>+</div><div class='add'>+	bytes = 8 + (MYRI10GE_MAX_SEND_DESC_TSO + 4)</div><div class='add'>+	    * sizeof(*mgp-&gt;tx.req_list);</div><div class='add'>+	mgp-&gt;tx.req_bytes = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;tx.req_bytes == NULL)</div><div class='add'>+		goto abort_with_nothing;</div><div class='add'>+</div><div class='add'>+	/* ensure req_list entries are aligned to 8 bytes */</div><div class='add'>+	mgp-&gt;tx.req_list = (struct mcp_kreq_ether_send *)</div><div class='add'>+	    ALIGN((unsigned long)mgp-&gt;tx.req_bytes, 8);</div><div class='add'>+</div><div class='add'>+	bytes = rx_ring_entries * sizeof(*mgp-&gt;rx_small.shadow);</div><div class='add'>+	mgp-&gt;rx_small.shadow = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;rx_small.shadow == NULL)</div><div class='add'>+		goto abort_with_tx_req_bytes;</div><div class='add'>+</div><div class='add'>+	bytes = rx_ring_entries * sizeof(*mgp-&gt;rx_big.shadow);</div><div class='add'>+	mgp-&gt;rx_big.shadow = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;rx_big.shadow == NULL)</div><div class='add'>+		goto abort_with_rx_small_shadow;</div><div class='add'>+</div><div class='add'>+	/* allocate the host info rings */</div><div class='add'>+</div><div class='add'>+	bytes = tx_ring_entries * sizeof(*mgp-&gt;tx.info);</div><div class='add'>+	mgp-&gt;tx.info = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;tx.info == NULL)</div><div class='add'>+		goto abort_with_rx_big_shadow;</div><div class='add'>+</div><div class='add'>+	bytes = rx_ring_entries * sizeof(*mgp-&gt;rx_small.info);</div><div class='add'>+	mgp-&gt;rx_small.info = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;rx_small.info == NULL)</div><div class='add'>+		goto abort_with_tx_info;</div><div class='add'>+</div><div class='add'>+	bytes = rx_ring_entries * sizeof(*mgp-&gt;rx_big.info);</div><div class='add'>+	mgp-&gt;rx_big.info = kzalloc(bytes, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;rx_big.info == NULL)</div><div class='add'>+		goto abort_with_rx_small_info;</div><div class='add'>+</div><div class='add'>+	/* Fill the receive rings */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= mgp-&gt;rx_small.mask; i++) {</div><div class='add'>+		status = myri10ge_getbuf(&amp;mgp-&gt;rx_small, mgp-&gt;pdev,</div><div class='add'>+					 mgp-&gt;small_bytes, i);</div><div class='add'>+		if (status) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "myri10ge: %s: alloced only %d small bufs\n",</div><div class='add'>+			       dev-&gt;name, i);</div><div class='add'>+			goto abort_with_rx_small_ring;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= mgp-&gt;rx_big.mask; i++) {</div><div class='add'>+		status =</div><div class='add'>+		    myri10ge_getbuf(&amp;mgp-&gt;rx_big, mgp-&gt;pdev,</div><div class='add'>+				    dev-&gt;mtu + ETH_HLEN, i);</div><div class='add'>+		if (status) {</div><div class='add'>+			printk(KERN_ERR</div><div class='add'>+			       "myri10ge: %s: alloced only %d big bufs\n",</div><div class='add'>+			       dev-&gt;name, i);</div><div class='add'>+			goto abort_with_rx_big_ring;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abort_with_rx_big_ring:</div><div class='add'>+	for (i = 0; i &lt;= mgp-&gt;rx_big.mask; i++) {</div><div class='add'>+		if (mgp-&gt;rx_big.info[i].skb != NULL)</div><div class='add'>+			dev_kfree_skb_any(mgp-&gt;rx_big.info[i].skb);</div><div class='add'>+		if (pci_unmap_len(&amp;mgp-&gt;rx_big.info[i], len))</div><div class='add'>+			pci_unmap_single(mgp-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(&amp;mgp-&gt;rx_big.info[i],</div><div class='add'>+							bus),</div><div class='add'>+					 pci_unmap_len(&amp;mgp-&gt;rx_big.info[i],</div><div class='add'>+						       len),</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+abort_with_rx_small_ring:</div><div class='add'>+	for (i = 0; i &lt;= mgp-&gt;rx_small.mask; i++) {</div><div class='add'>+		if (mgp-&gt;rx_small.info[i].skb != NULL)</div><div class='add'>+			dev_kfree_skb_any(mgp-&gt;rx_small.info[i].skb);</div><div class='add'>+		if (pci_unmap_len(&amp;mgp-&gt;rx_small.info[i], len))</div><div class='add'>+			pci_unmap_single(mgp-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(&amp;mgp-&gt;rx_small.info[i],</div><div class='add'>+							bus),</div><div class='add'>+					 pci_unmap_len(&amp;mgp-&gt;rx_small.info[i],</div><div class='add'>+						       len),</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+	}</div><div class='add'>+	kfree(mgp-&gt;rx_big.info);</div><div class='add'>+</div><div class='add'>+abort_with_rx_small_info:</div><div class='add'>+	kfree(mgp-&gt;rx_small.info);</div><div class='add'>+</div><div class='add'>+abort_with_tx_info:</div><div class='add'>+	kfree(mgp-&gt;tx.info);</div><div class='add'>+</div><div class='add'>+abort_with_rx_big_shadow:</div><div class='add'>+	kfree(mgp-&gt;rx_big.shadow);</div><div class='add'>+</div><div class='add'>+abort_with_rx_small_shadow:</div><div class='add'>+	kfree(mgp-&gt;rx_small.shadow);</div><div class='add'>+</div><div class='add'>+abort_with_tx_req_bytes:</div><div class='add'>+	kfree(mgp-&gt;tx.req_bytes);</div><div class='add'>+	mgp-&gt;tx.req_bytes = NULL;</div><div class='add'>+	mgp-&gt;tx.req_list = NULL;</div><div class='add'>+</div><div class='add'>+abort_with_nothing:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void myri10ge_free_rings(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct myri10ge_tx_buf *tx;</div><div class='add'>+	int i, len, idx;</div><div class='add'>+</div><div class='add'>+	mgp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= mgp-&gt;rx_big.mask; i++) {</div><div class='add'>+		if (mgp-&gt;rx_big.info[i].skb != NULL)</div><div class='add'>+			dev_kfree_skb_any(mgp-&gt;rx_big.info[i].skb);</div><div class='add'>+		if (pci_unmap_len(&amp;mgp-&gt;rx_big.info[i], len))</div><div class='add'>+			pci_unmap_single(mgp-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(&amp;mgp-&gt;rx_big.info[i],</div><div class='add'>+							bus),</div><div class='add'>+					 pci_unmap_len(&amp;mgp-&gt;rx_big.info[i],</div><div class='add'>+						       len),</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= mgp-&gt;rx_small.mask; i++) {</div><div class='add'>+		if (mgp-&gt;rx_small.info[i].skb != NULL)</div><div class='add'>+			dev_kfree_skb_any(mgp-&gt;rx_small.info[i].skb);</div><div class='add'>+		if (pci_unmap_len(&amp;mgp-&gt;rx_small.info[i], len))</div><div class='add'>+			pci_unmap_single(mgp-&gt;pdev,</div><div class='add'>+					 pci_unmap_addr(&amp;mgp-&gt;rx_small.info[i],</div><div class='add'>+							bus),</div><div class='add'>+					 pci_unmap_len(&amp;mgp-&gt;rx_small.info[i],</div><div class='add'>+						       len),</div><div class='add'>+					 PCI_DMA_FROMDEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx = &amp;mgp-&gt;tx;</div><div class='add'>+	while (tx-&gt;done != tx-&gt;req) {</div><div class='add'>+		idx = tx-&gt;done &amp; tx-&gt;mask;</div><div class='add'>+		skb = tx-&gt;info[idx].skb;</div><div class='add'>+</div><div class='add'>+		/* Mark as free */</div><div class='add'>+		tx-&gt;info[idx].skb = NULL;</div><div class='add'>+		tx-&gt;done++;</div><div class='add'>+		len = pci_unmap_len(&amp;tx-&gt;info[idx], len);</div><div class='add'>+		pci_unmap_len_set(&amp;tx-&gt;info[idx], len, 0);</div><div class='add'>+		if (skb) {</div><div class='add'>+			mgp-&gt;stats.tx_dropped++;</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			if (len)</div><div class='add'>+				pci_unmap_single(mgp-&gt;pdev,</div><div class='add'>+						 pci_unmap_addr(&amp;tx-&gt;info[idx],</div><div class='add'>+								bus), len,</div><div class='add'>+						 PCI_DMA_TODEVICE);</div><div class='add'>+		} else {</div><div class='add'>+			if (len)</div><div class='add'>+				pci_unmap_page(mgp-&gt;pdev,</div><div class='add'>+					       pci_unmap_addr(&amp;tx-&gt;info[idx],</div><div class='add'>+							      bus), len,</div><div class='add'>+					       PCI_DMA_TODEVICE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(mgp-&gt;rx_big.info);</div><div class='add'>+</div><div class='add'>+	kfree(mgp-&gt;rx_small.info);</div><div class='add'>+</div><div class='add'>+	kfree(mgp-&gt;tx.info);</div><div class='add'>+</div><div class='add'>+	kfree(mgp-&gt;rx_big.shadow);</div><div class='add'>+</div><div class='add'>+	kfree(mgp-&gt;rx_small.shadow);</div><div class='add'>+</div><div class='add'>+	kfree(mgp-&gt;tx.req_bytes);</div><div class='add'>+	mgp-&gt;tx.req_bytes = NULL;</div><div class='add'>+	mgp-&gt;tx.req_list = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int status, big_pow2;</div><div class='add'>+</div><div class='add'>+	mgp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (mgp-&gt;running != MYRI10GE_ETH_STOPPED)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	mgp-&gt;running = MYRI10GE_ETH_STARTING;</div><div class='add'>+	status = myri10ge_reset(mgp);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: failed reset\n", dev-&gt;name);</div><div class='add'>+		mgp-&gt;running = MYRI10GE_ETH_STOPPED;</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* decide what small buffer size to use.  For good TCP rx</div><div class='add'>+	 * performance, it is important to not receive 1514 byte</div><div class='add'>+	 * frames into jumbo buffers, as it confuses the socket buffer</div><div class='add'>+	 * accounting code, leading to drops and erratic performance.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;mtu &lt;= ETH_DATA_LEN)</div><div class='add'>+		mgp-&gt;small_bytes = 128;	/* enough for a TCP header */</div><div class='add'>+	else</div><div class='add'>+		mgp-&gt;small_bytes = ETH_FRAME_LEN;	/* enough for an ETH_DATA_LEN frame */</div><div class='add'>+</div><div class='add'>+	/* Override the small buffer size? */</div><div class='add'>+	if (myri10ge_small_bytes &gt; 0)</div><div class='add'>+		mgp-&gt;small_bytes = myri10ge_small_bytes;</div><div class='add'>+</div><div class='add'>+	/* If the user sets an obscenely small MTU, adjust the small</div><div class='add'>+	 * bytes down to nearly nothing */</div><div class='add'>+	if (mgp-&gt;small_bytes &gt;= (dev-&gt;mtu + ETH_HLEN))</div><div class='add'>+		mgp-&gt;small_bytes = 64;</div><div class='add'>+</div><div class='add'>+	/* get the lanai pointers to the send and receive rings */</div><div class='add'>+</div><div class='add'>+	status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_OFFSET, &amp;cmd, 0);</div><div class='add'>+	mgp-&gt;tx.lanai =</div><div class='add'>+	    (struct mcp_kreq_ether_send __iomem *)(mgp-&gt;sram + cmd.data0);</div><div class='add'>+</div><div class='add'>+	status |=</div><div class='add'>+	    myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SMALL_RX_OFFSET, &amp;cmd, 0);</div><div class='add'>+	mgp-&gt;rx_small.lanai =</div><div class='add'>+	    (struct mcp_kreq_ether_recv __iomem *)(mgp-&gt;sram + cmd.data0);</div><div class='add'>+</div><div class='add'>+	status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_BIG_RX_OFFSET, &amp;cmd, 0);</div><div class='add'>+	mgp-&gt;rx_big.lanai =</div><div class='add'>+	    (struct mcp_kreq_ether_recv __iomem *)(mgp-&gt;sram + cmd.data0);</div><div class='add'>+</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "myri10ge: %s: failed to get ring sizes or locations\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		mgp-&gt;running = MYRI10GE_ETH_STOPPED;</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mgp-&gt;mtrr &gt;= 0) {</div><div class='add'>+		mgp-&gt;tx.wc_fifo = (u8 __iomem *) mgp-&gt;sram + 0x200000;</div><div class='add'>+		mgp-&gt;rx_small.wc_fifo = (u8 __iomem *) mgp-&gt;sram + 0x300000;</div><div class='add'>+		mgp-&gt;rx_big.wc_fifo = (u8 __iomem *) mgp-&gt;sram + 0x340000;</div><div class='add'>+	} else {</div><div class='add'>+		mgp-&gt;tx.wc_fifo = NULL;</div><div class='add'>+		mgp-&gt;rx_small.wc_fifo = NULL;</div><div class='add'>+		mgp-&gt;rx_big.wc_fifo = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = myri10ge_allocate_rings(dev);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		goto abort_with_nothing;</div><div class='add'>+</div><div class='add'>+	/* Firmware needs the big buff size as a power of 2.  Lie and</div><div class='add'>+	 * tell him the buffer is larger, because we only use 1</div><div class='add'>+	 * buffer/pkt, and the mtu will prevent overruns.</div><div class='add'>+	 */</div><div class='add'>+	big_pow2 = dev-&gt;mtu + ETH_HLEN + MXGEFW_PAD;</div><div class='add'>+	while ((big_pow2 &amp; (big_pow2 - 1)) != 0)</div><div class='add'>+		big_pow2++;</div><div class='add'>+</div><div class='add'>+	/* now give firmware buffers sizes, and MTU */</div><div class='add'>+	cmd.data0 = dev-&gt;mtu + ETH_HLEN + VLAN_HLEN;</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_MTU, &amp;cmd, 0);</div><div class='add'>+	cmd.data0 = mgp-&gt;small_bytes;</div><div class='add'>+	status |=</div><div class='add'>+	    myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_SMALL_BUFFER_SIZE, &amp;cmd, 0);</div><div class='add'>+	cmd.data0 = big_pow2;</div><div class='add'>+	status |=</div><div class='add'>+	    myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_BIG_BUFFER_SIZE, &amp;cmd, 0);</div><div class='add'>+	if (status) {</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: Couldn't set buffer sizes\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		goto abort_with_rings;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp-&gt;fw_stats_bus);</div><div class='add'>+	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp-&gt;fw_stats_bus);</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_STATS_DMA, &amp;cmd, 0);</div><div class='add'>+	if (status) {</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: Couldn't set stats DMA\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		goto abort_with_rings;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgp-&gt;link_state = -1;</div><div class='add'>+	mgp-&gt;rdma_tags_available = 15;</div><div class='add'>+</div><div class='add'>+	netif_poll_enable(mgp-&gt;dev);	/* must happen prior to any irq */</div><div class='add'>+</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_ETHERNET_UP, &amp;cmd, 0);</div><div class='add'>+	if (status) {</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: Couldn't bring up link\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		goto abort_with_rings;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgp-&gt;wake_queue = 0;</div><div class='add'>+	mgp-&gt;stop_queue = 0;</div><div class='add'>+	mgp-&gt;running = MYRI10GE_ETH_RUNNING;</div><div class='add'>+	mgp-&gt;watchdog_timer.expires = jiffies + myri10ge_watchdog_timeout * HZ;</div><div class='add'>+	add_timer(&amp;mgp-&gt;watchdog_timer);</div><div class='add'>+	netif_wake_queue(dev);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abort_with_rings:</div><div class='add'>+	myri10ge_free_rings(dev);</div><div class='add'>+</div><div class='add'>+abort_with_nothing:</div><div class='add'>+	mgp-&gt;running = MYRI10GE_ETH_STOPPED;</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct myri10ge_cmd cmd;</div><div class='add'>+	int status, old_down_cnt;</div><div class='add'>+</div><div class='add'>+	mgp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (mgp-&gt;running != MYRI10GE_ETH_RUNNING)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mgp-&gt;tx.req_bytes == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;mgp-&gt;watchdog_timer);</div><div class='add'>+	mgp-&gt;running = MYRI10GE_ETH_STOPPING;</div><div class='add'>+	netif_poll_disable(mgp-&gt;dev);</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	old_down_cnt = mgp-&gt;down_cnt;</div><div class='add'>+	mb();</div><div class='add'>+	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_ETHERNET_DOWN, &amp;cmd, 0);</div><div class='add'>+	if (status)</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: Couldn't bring down link\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(mgp-&gt;down_wq, old_down_cnt != mgp-&gt;down_cnt, HZ);</div><div class='add'>+	if (old_down_cnt == mgp-&gt;down_cnt)</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s never got down irq\n", dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	netif_tx_disable(dev);</div><div class='add'>+</div><div class='add'>+	myri10ge_free_rings(dev);</div><div class='add'>+</div><div class='add'>+	mgp-&gt;running = MYRI10GE_ETH_STOPPED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copy an array of struct mcp_kreq_ether_send's to the mcp.  Copy</div><div class='add'>+ * backwards one at a time and handle ring wraps */</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+myri10ge_submit_req_backwards(struct myri10ge_tx_buf *tx,</div><div class='add'>+			      struct mcp_kreq_ether_send *src, int cnt)</div><div class='add'>+{</div><div class='add'>+	int idx, starting_slot;</div><div class='add'>+	starting_slot = tx-&gt;req;</div><div class='add'>+	while (cnt &gt; 1) {</div><div class='add'>+		cnt--;</div><div class='add'>+		idx = (starting_slot + cnt) &amp; tx-&gt;mask;</div><div class='add'>+		myri10ge_pio_copy(&amp;tx-&gt;lanai[idx], &amp;src[cnt], sizeof(*src));</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * copy an array of struct mcp_kreq_ether_send's to the mcp.  Copy</div><div class='add'>+ * at most 32 bytes at a time, so as to avoid involving the software</div><div class='add'>+ * pio handler in the nic.   We re-write the first segment's flags</div><div class='add'>+ * to mark them valid only after writing the entire chain.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+myri10ge_submit_req(struct myri10ge_tx_buf *tx, struct mcp_kreq_ether_send *src,</div><div class='add'>+		    int cnt)</div><div class='add'>+{</div><div class='add'>+	int idx, i;</div><div class='add'>+	struct mcp_kreq_ether_send __iomem *dstp, *dst;</div><div class='add'>+	struct mcp_kreq_ether_send *srcp;</div><div class='add'>+	u8 last_flags;</div><div class='add'>+</div><div class='add'>+	idx = tx-&gt;req &amp; tx-&gt;mask;</div><div class='add'>+</div><div class='add'>+	last_flags = src-&gt;flags;</div><div class='add'>+	src-&gt;flags = 0;</div><div class='add'>+	mb();</div><div class='add'>+	dst = dstp = &amp;tx-&gt;lanai[idx];</div><div class='add'>+	srcp = src;</div><div class='add'>+</div><div class='add'>+	if ((idx + cnt) &lt; tx-&gt;mask) {</div><div class='add'>+		for (i = 0; i &lt; (cnt - 1); i += 2) {</div><div class='add'>+			myri10ge_pio_copy(dstp, srcp, 2 * sizeof(*src));</div><div class='add'>+			mb();	/* force write every 32 bytes */</div><div class='add'>+			srcp += 2;</div><div class='add'>+			dstp += 2;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* submit all but the first request, and ensure</div><div class='add'>+		 * that it is submitted below */</div><div class='add'>+		myri10ge_submit_req_backwards(tx, src, cnt);</div><div class='add'>+		i = 0;</div><div class='add'>+	}</div><div class='add'>+	if (i &lt; cnt) {</div><div class='add'>+		/* submit the first request */</div><div class='add'>+		myri10ge_pio_copy(dstp, srcp, sizeof(*src));</div><div class='add'>+		mb();		/* barrier before setting valid flag */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* re-write the last 32-bits with the valid flags */</div><div class='add'>+	src-&gt;flags = last_flags;</div><div class='add'>+	__raw_writel(*((u32 *) src + 3), (u32 __iomem *) dst + 3);</div><div class='add'>+	tx-&gt;req += cnt;</div><div class='add'>+	mb();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+myri10ge_submit_req_wc(struct myri10ge_tx_buf *tx,</div><div class='add'>+		       struct mcp_kreq_ether_send *src, int cnt)</div><div class='add'>+{</div><div class='add'>+	tx-&gt;req += cnt;</div><div class='add'>+	mb();</div><div class='add'>+	while (cnt &gt;= 4) {</div><div class='add'>+		myri10ge_pio_copy(tx-&gt;wc_fifo, src, 64);</div><div class='add'>+		mb();</div><div class='add'>+		src += 4;</div><div class='add'>+		cnt -= 4;</div><div class='add'>+	}</div><div class='add'>+	if (cnt &gt; 0) {</div><div class='add'>+		/* pad it to 64 bytes.  The src is 64 bytes bigger than it</div><div class='add'>+		 * needs to be so that we don't overrun it */</div><div class='add'>+		myri10ge_pio_copy(tx-&gt;wc_fifo + (cnt &lt;&lt; 18), src, 64);</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Transmit a packet.  We need to split the packet so that a single</div><div class='add'>+ * segment does not cross myri10ge-&gt;tx.boundary, so this makes segment</div><div class='add'>+ * counting tricky.  So rather than try to count segments up front, we</div><div class='add'>+ * just give up if there are too few segments to hold a reasonably</div><div class='add'>+ * fragmented packet currently available.  If we run</div><div class='add'>+ * out of segments while preparing a packet for DMA, we just linearize</div><div class='add'>+ * it and try again.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(dev);</div><div class='add'>+	struct mcp_kreq_ether_send *req;</div><div class='add'>+	struct myri10ge_tx_buf *tx = &amp;mgp-&gt;tx;</div><div class='add'>+	struct skb_frag_struct *frag;</div><div class='add'>+	dma_addr_t bus;</div><div class='add'>+	u32 low, high_swapped;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int idx, last_idx, avail, frag_cnt, frag_idx, count, mss, max_segments;</div><div class='add'>+	u16 pseudo_hdr_offset, cksum_offset;</div><div class='add'>+	int cum_len, seglen, boundary, rdma_count;</div><div class='add'>+	u8 flags, odd_flag;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	req = tx-&gt;req_list;</div><div class='add'>+	avail = tx-&gt;mask - 1 - (tx-&gt;req - tx-&gt;done);</div><div class='add'>+</div><div class='add'>+	mss = 0;</div><div class='add'>+	max_segments = MXGEFW_MAX_SEND_DESC;</div><div class='add'>+</div><div class='add'>+#ifdef NETIF_F_TSO</div><div class='add'>+	if (skb-&gt;len &gt; (dev-&gt;mtu + ETH_HLEN)) {</div><div class='add'>+		mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+		if (mss != 0)</div><div class='add'>+			max_segments = MYRI10GE_MAX_SEND_DESC_TSO;</div><div class='add'>+	}</div><div class='add'>+#endif				/*NETIF_F_TSO */</div><div class='add'>+</div><div class='add'>+	if ((unlikely(avail &lt; max_segments))) {</div><div class='add'>+		/* we are out of transmit resources */</div><div class='add'>+		mgp-&gt;stop_queue++;</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup checksum offloading, if needed */</div><div class='add'>+	cksum_offset = 0;</div><div class='add'>+	pseudo_hdr_offset = 0;</div><div class='add'>+	odd_flag = 0;</div><div class='add'>+	flags = (MXGEFW_FLAGS_NO_TSO | MXGEFW_FLAGS_FIRST);</div><div class='add'>+	if (likely(skb-&gt;ip_summed == CHECKSUM_HW)) {</div><div class='add'>+		cksum_offset = (skb-&gt;h.raw - skb-&gt;data);</div><div class='add'>+		pseudo_hdr_offset = (skb-&gt;h.raw + skb-&gt;csum) - skb-&gt;data;</div><div class='add'>+		/* If the headers are excessively large, then we must</div><div class='add'>+		 * fall back to a software checksum */</div><div class='add'>+		if (unlikely(cksum_offset &gt; 255 || pseudo_hdr_offset &gt; 127)) {</div><div class='add'>+			if (skb_checksum_help(skb, 0))</div><div class='add'>+				goto drop;</div><div class='add'>+			cksum_offset = 0;</div><div class='add'>+			pseudo_hdr_offset = 0;</div><div class='add'>+		} else {</div><div class='add'>+			pseudo_hdr_offset = htons(pseudo_hdr_offset);</div><div class='add'>+			odd_flag = MXGEFW_FLAGS_ALIGN_ODD;</div><div class='add'>+			flags |= MXGEFW_FLAGS_CKSUM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cum_len = 0;</div><div class='add'>+</div><div class='add'>+#ifdef NETIF_F_TSO</div><div class='add'>+	if (mss) {		/* TSO */</div><div class='add'>+		/* this removes any CKSUM flag from before */</div><div class='add'>+		flags = (MXGEFW_FLAGS_TSO_HDR | MXGEFW_FLAGS_FIRST);</div><div class='add'>+</div><div class='add'>+		/* negative cum_len signifies to the</div><div class='add'>+		 * send loop that we are still in the</div><div class='add'>+		 * header portion of the TSO packet.</div><div class='add'>+		 * TSO header must be at most 134 bytes long */</div><div class='add'>+		cum_len = -((skb-&gt;h.raw - skb-&gt;data) + (skb-&gt;h.th-&gt;doff &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+		/* for TSO, pseudo_hdr_offset holds mss.</div><div class='add'>+		 * The firmware figures out where to put</div><div class='add'>+		 * the checksum by parsing the header. */</div><div class='add'>+		pseudo_hdr_offset = htons(mss);</div><div class='add'>+	} else</div><div class='add'>+#endif				/*NETIF_F_TSO */</div><div class='add'>+		/* Mark small packets, and pad out tiny packets */</div><div class='add'>+	if (skb-&gt;len &lt;= MXGEFW_SEND_SMALL_SIZE) {</div><div class='add'>+		flags |= MXGEFW_FLAGS_SMALL;</div><div class='add'>+</div><div class='add'>+		/* pad frames to at least ETH_ZLEN bytes */</div><div class='add'>+		if (unlikely(skb-&gt;len &lt; ETH_ZLEN)) {</div><div class='add'>+			if (skb_padto(skb, ETH_ZLEN)) {</div><div class='add'>+				/* The packet is gone, so we must</div><div class='add'>+				 * return 0 */</div><div class='add'>+				mgp-&gt;stats.tx_dropped += 1;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			/* adjust the len to account for the zero pad</div><div class='add'>+			 * so that the nic can know how long it is */</div><div class='add'>+			skb-&gt;len = ETH_ZLEN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* map the skb for DMA */</div><div class='add'>+	len = skb-&gt;len - skb-&gt;data_len;</div><div class='add'>+	idx = tx-&gt;req &amp; tx-&gt;mask;</div><div class='add'>+	tx-&gt;info[idx].skb = skb;</div><div class='add'>+	bus = pci_map_single(mgp-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	pci_unmap_addr_set(&amp;tx-&gt;info[idx], bus, bus);</div><div class='add'>+	pci_unmap_len_set(&amp;tx-&gt;info[idx], len, len);</div><div class='add'>+</div><div class='add'>+	frag_cnt = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	frag_idx = 0;</div><div class='add'>+	count = 0;</div><div class='add'>+	rdma_count = 0;</div><div class='add'>+</div><div class='add'>+	/* "rdma_count" is the number of RDMAs belonging to the</div><div class='add'>+	 * current packet BEFORE the current send request. For</div><div class='add'>+	 * non-TSO packets, this is equal to "count".</div><div class='add'>+	 * For TSO packets, rdma_count needs to be reset</div><div class='add'>+	 * to 0 after a segment cut.</div><div class='add'>+	 *</div><div class='add'>+	 * The rdma_count field of the send request is</div><div class='add'>+	 * the number of RDMAs of the packet starting at</div><div class='add'>+	 * that request. For TSO send requests with one ore more cuts</div><div class='add'>+	 * in the middle, this is the number of RDMAs starting</div><div class='add'>+	 * after the last cut in the request. All previous</div><div class='add'>+	 * segments before the last cut implicitly have 1 RDMA.</div><div class='add'>+	 *</div><div class='add'>+	 * Since the number of RDMAs is not known beforehand,</div><div class='add'>+	 * it must be filled-in retroactively - after each</div><div class='add'>+	 * segmentation cut or at the end of the entire packet.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		/* Break the SKB or Fragment up into pieces which</div><div class='add'>+		 * do not cross mgp-&gt;tx.boundary */</div><div class='add'>+		low = MYRI10GE_LOWPART_TO_U32(bus);</div><div class='add'>+		high_swapped = htonl(MYRI10GE_HIGHPART_TO_U32(bus));</div><div class='add'>+		while (len) {</div><div class='add'>+			u8 flags_next;</div><div class='add'>+			int cum_len_next;</div><div class='add'>+</div><div class='add'>+			if (unlikely(count == max_segments))</div><div class='add'>+				goto abort_linearize;</div><div class='add'>+</div><div class='add'>+			boundary = (low + tx-&gt;boundary) &amp; ~(tx-&gt;boundary - 1);</div><div class='add'>+			seglen = boundary - low;</div><div class='add'>+			if (seglen &gt; len)</div><div class='add'>+				seglen = len;</div><div class='add'>+			flags_next = flags &amp; ~MXGEFW_FLAGS_FIRST;</div><div class='add'>+			cum_len_next = cum_len + seglen;</div><div class='add'>+#ifdef NETIF_F_TSO</div><div class='add'>+			if (mss) {	/* TSO */</div><div class='add'>+				(req - rdma_count)-&gt;rdma_count = rdma_count + 1;</div><div class='add'>+</div><div class='add'>+				if (likely(cum_len &gt;= 0)) {	/* payload */</div><div class='add'>+					int next_is_first, chop;</div><div class='add'>+</div><div class='add'>+					chop = (cum_len_next &gt; mss);</div><div class='add'>+					cum_len_next = cum_len_next % mss;</div><div class='add'>+					next_is_first = (cum_len_next == 0);</div><div class='add'>+					flags |= chop * MXGEFW_FLAGS_TSO_CHOP;</div><div class='add'>+					flags_next |= next_is_first *</div><div class='add'>+					    MXGEFW_FLAGS_FIRST;</div><div class='add'>+					rdma_count |= -(chop | next_is_first);</div><div class='add'>+					rdma_count += chop &amp; !next_is_first;</div><div class='add'>+				} else if (likely(cum_len_next &gt;= 0)) {	/* header ends */</div><div class='add'>+					int small;</div><div class='add'>+</div><div class='add'>+					rdma_count = -1;</div><div class='add'>+					cum_len_next = 0;</div><div class='add'>+					seglen = -cum_len;</div><div class='add'>+					small = (mss &lt;= MXGEFW_SEND_SMALL_SIZE);</div><div class='add'>+					flags_next = MXGEFW_FLAGS_TSO_PLD |</div><div class='add'>+					    MXGEFW_FLAGS_FIRST |</div><div class='add'>+					    (small * MXGEFW_FLAGS_SMALL);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+#endif				/* NETIF_F_TSO */</div><div class='add'>+			req-&gt;addr_high = high_swapped;</div><div class='add'>+			req-&gt;addr_low = htonl(low);</div><div class='add'>+			req-&gt;pseudo_hdr_offset = pseudo_hdr_offset;</div><div class='add'>+			req-&gt;pad = 0;	/* complete solid 16-byte block; does this matter? */</div><div class='add'>+			req-&gt;rdma_count = 1;</div><div class='add'>+			req-&gt;length = htons(seglen);</div><div class='add'>+			req-&gt;cksum_offset = cksum_offset;</div><div class='add'>+			req-&gt;flags = flags | ((cum_len &amp; 1) * odd_flag);</div><div class='add'>+</div><div class='add'>+			low += seglen;</div><div class='add'>+			len -= seglen;</div><div class='add'>+			cum_len = cum_len_next;</div><div class='add'>+			flags = flags_next;</div><div class='add'>+			req++;</div><div class='add'>+			count++;</div><div class='add'>+			rdma_count++;</div><div class='add'>+			if (unlikely(cksum_offset &gt; seglen))</div><div class='add'>+				cksum_offset -= seglen;</div><div class='add'>+			else</div><div class='add'>+				cksum_offset = 0;</div><div class='add'>+		}</div><div class='add'>+		if (frag_idx == frag_cnt)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* map next fragment for DMA */</div><div class='add'>+		idx = (count + tx-&gt;req) &amp; tx-&gt;mask;</div><div class='add'>+		frag = &amp;skb_shinfo(skb)-&gt;frags[frag_idx];</div><div class='add'>+		frag_idx++;</div><div class='add'>+		len = frag-&gt;size;</div><div class='add'>+		bus = pci_map_page(mgp-&gt;pdev, frag-&gt;page, frag-&gt;page_offset,</div><div class='add'>+				   len, PCI_DMA_TODEVICE);</div><div class='add'>+		pci_unmap_addr_set(&amp;tx-&gt;info[idx], bus, bus);</div><div class='add'>+		pci_unmap_len_set(&amp;tx-&gt;info[idx], len, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(req - rdma_count)-&gt;rdma_count = rdma_count;</div><div class='add'>+#ifdef NETIF_F_TSO</div><div class='add'>+	if (mss)</div><div class='add'>+		do {</div><div class='add'>+			req--;</div><div class='add'>+			req-&gt;flags |= MXGEFW_FLAGS_TSO_LAST;</div><div class='add'>+		} while (!(req-&gt;flags &amp; (MXGEFW_FLAGS_TSO_CHOP |</div><div class='add'>+					 MXGEFW_FLAGS_FIRST)));</div><div class='add'>+#endif</div><div class='add'>+	idx = ((count - 1) + tx-&gt;req) &amp; tx-&gt;mask;</div><div class='add'>+	tx-&gt;info[idx].last = 1;</div><div class='add'>+	if (tx-&gt;wc_fifo == NULL)</div><div class='add'>+		myri10ge_submit_req(tx, tx-&gt;req_list, count);</div><div class='add'>+	else</div><div class='add'>+		myri10ge_submit_req_wc(tx, tx-&gt;req_list, count);</div><div class='add'>+	tx-&gt;pkt_start++;</div><div class='add'>+	if ((avail - count) &lt; MXGEFW_MAX_SEND_DESC) {</div><div class='add'>+		mgp-&gt;stop_queue++;</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;trans_start = jiffies;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abort_linearize:</div><div class='add'>+	/* Free any DMA resources we've alloced and clear out the skb</div><div class='add'>+	 * slot so as to not trip up assertions, and to avoid a</div><div class='add'>+	 * double-free if linearizing fails */</div><div class='add'>+</div><div class='add'>+	last_idx = (idx + 1) &amp; tx-&gt;mask;</div><div class='add'>+	idx = tx-&gt;req &amp; tx-&gt;mask;</div><div class='add'>+	tx-&gt;info[idx].skb = NULL;</div><div class='add'>+	do {</div><div class='add'>+		len = pci_unmap_len(&amp;tx-&gt;info[idx], len);</div><div class='add'>+		if (len) {</div><div class='add'>+			if (tx-&gt;info[idx].skb != NULL)</div><div class='add'>+				pci_unmap_single(mgp-&gt;pdev,</div><div class='add'>+						 pci_unmap_addr(&amp;tx-&gt;info[idx],</div><div class='add'>+								bus), len,</div><div class='add'>+						 PCI_DMA_TODEVICE);</div><div class='add'>+			else</div><div class='add'>+				pci_unmap_page(mgp-&gt;pdev,</div><div class='add'>+					       pci_unmap_addr(&amp;tx-&gt;info[idx],</div><div class='add'>+							      bus), len,</div><div class='add'>+					       PCI_DMA_TODEVICE);</div><div class='add'>+			pci_unmap_len_set(&amp;tx-&gt;info[idx], len, 0);</div><div class='add'>+			tx-&gt;info[idx].skb = NULL;</div><div class='add'>+		}</div><div class='add'>+		idx = (idx + 1) &amp; tx-&gt;mask;</div><div class='add'>+	} while (idx != last_idx);</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "myri10ge: %s: TSO but wanted to linearize?!?!?\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	mgp-&gt;tx_linearized++;</div><div class='add'>+	goto again;</div><div class='add'>+</div><div class='add'>+drop:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	mgp-&gt;stats.tx_dropped += 1;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *myri10ge_get_stats(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(dev);</div><div class='add'>+	return &amp;mgp-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void myri10ge_set_multicast_list(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* can be called from atomic contexts,</div><div class='add'>+	 * pass 1 to force atomicity in myri10ge_send_cmd() */</div><div class='add'>+	myri10ge_change_promisc(netdev_priv(dev), dev-&gt;flags &amp; IFF_PROMISC, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_set_mac_address(struct net_device *dev, void *addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *sa = addr;</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(dev);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(sa-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	status = myri10ge_update_mac_address(mgp, sa-&gt;sa_data);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "myri10ge: %s: changing mac address failed with %d\n",</div><div class='add'>+		       dev-&gt;name, status);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* change the dev structure */</div><div class='add'>+	memcpy(dev-&gt;dev_addr, sa-&gt;sa_data, 6);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_change_mtu(struct net_device *dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = netdev_priv(dev);</div><div class='add'>+	int error = 0;</div><div class='add'>+</div><div class='add'>+	if ((new_mtu &lt; 68) || (ETH_HLEN + new_mtu &gt; MYRI10GE_MAX_ETHER_MTU)) {</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: new mtu (%d) is not valid\n",</div><div class='add'>+		       dev-&gt;name, new_mtu);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "%s: changing mtu from %d to %d\n",</div><div class='add'>+	       dev-&gt;name, dev-&gt;mtu, new_mtu);</div><div class='add'>+	if (mgp-&gt;running) {</div><div class='add'>+		/* if we change the mtu on an active device, we must</div><div class='add'>+		 * reset the device so the firmware sees the change */</div><div class='add'>+		myri10ge_close(dev);</div><div class='add'>+		dev-&gt;mtu = new_mtu;</div><div class='add'>+		myri10ge_open(dev);</div><div class='add'>+	} else</div><div class='add'>+		dev-&gt;mtu = new_mtu;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable ECRC to align PCI-E Completion packets on an 8-byte boundary.</div><div class='add'>+ * Only do it if the bridge is a root port since we don't want to disturb</div><div class='add'>+ * any other device, except if forced with myri10ge_ecrc_enable &gt; 1.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *bridge = mgp-&gt;pdev-&gt;bus-&gt;self;</div><div class='add'>+	struct device *dev = &amp;mgp-&gt;pdev-&gt;dev;</div><div class='add'>+	unsigned cap;</div><div class='add'>+	unsigned err_cap;</div><div class='add'>+	u16 val;</div><div class='add'>+	u8 ext_type;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!myri10ge_ecrc_enable || !bridge)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* check that the bridge is a root port */</div><div class='add'>+	cap = pci_find_capability(bridge, PCI_CAP_ID_EXP);</div><div class='add'>+	pci_read_config_word(bridge, cap + PCI_CAP_FLAGS, &amp;val);</div><div class='add'>+	ext_type = (val &amp; PCI_EXP_FLAGS_TYPE) &gt;&gt; 4;</div><div class='add'>+	if (ext_type != PCI_EXP_TYPE_ROOT_PORT) {</div><div class='add'>+		if (myri10ge_ecrc_enable &gt; 1) {</div><div class='add'>+			struct pci_dev *old_bridge = bridge;</div><div class='add'>+</div><div class='add'>+			/* Walk the hierarchy up to the root port</div><div class='add'>+			 * where ECRC has to be enabled */</div><div class='add'>+			do {</div><div class='add'>+				bridge = bridge-&gt;bus-&gt;self;</div><div class='add'>+				if (!bridge) {</div><div class='add'>+					dev_err(dev,</div><div class='add'>+						"Failed to find root port"</div><div class='add'>+						" to force ECRC\n");</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+				cap =</div><div class='add'>+				    pci_find_capability(bridge, PCI_CAP_ID_EXP);</div><div class='add'>+				pci_read_config_word(bridge,</div><div class='add'>+						     cap + PCI_CAP_FLAGS, &amp;val);</div><div class='add'>+				ext_type = (val &amp; PCI_EXP_FLAGS_TYPE) &gt;&gt; 4;</div><div class='add'>+			} while (ext_type != PCI_EXP_TYPE_ROOT_PORT);</div><div class='add'>+</div><div class='add'>+			dev_info(dev,</div><div class='add'>+				 "Forcing ECRC on non-root port %s"</div><div class='add'>+				 " (enabling on root port %s)\n",</div><div class='add'>+				 pci_name(old_bridge), pci_name(bridge));</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"Not enabling ECRC on non-root port %s\n",</div><div class='add'>+				pci_name(bridge));</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR);</div><div class='add'>+	if (!cap)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = pci_read_config_dword(bridge, cap + PCI_ERR_CAP, &amp;err_cap);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed reading ext-conf-space of %s\n",</div><div class='add'>+			pci_name(bridge));</div><div class='add'>+		dev_err(dev, "\t pci=nommconf in use? "</div><div class='add'>+			"or buggy/incomplete/absent ACPI MCFG attr?\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (!(err_cap &amp; PCI_ERR_CAP_ECRC_GENC))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err_cap |= PCI_ERR_CAP_ECRC_GENE;</div><div class='add'>+	pci_write_config_dword(bridge, cap + PCI_ERR_CAP, err_cap);</div><div class='add'>+	dev_info(dev, "Enabled ECRC on upstream bridge %s\n", pci_name(bridge));</div><div class='add'>+	mgp-&gt;tx.boundary = 4096;</div><div class='add'>+	mgp-&gt;fw_name = myri10ge_fw_aligned;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Lanai Z8E PCI-E interface achieves higher Read-DMA throughput</div><div class='add'>+ * when the PCI-E Completion packets are aligned on an 8-byte</div><div class='add'>+ * boundary.  Some PCI-E chip sets always align Completion packets; on</div><div class='add'>+ * the ones that do not, the alignment can be enforced by enabling</div><div class='add'>+ * ECRC generation (if supported).</div><div class='add'>+ *</div><div class='add'>+ * When PCI-E Completion packets are not aligned, it is actually more</div><div class='add'>+ * efficient to limit Read-DMA transactions to 2KB, rather than 4KB.</div><div class='add'>+ *</div><div class='add'>+ * If the driver can neither enable ECRC nor verify that it has</div><div class='add'>+ * already been enabled, then it must use a firmware image which works</div><div class='add'>+ * around unaligned completion packets (myri10ge_ethp_z8e.dat), and it</div><div class='add'>+ * should also ensure that it never gives the device a Read-DMA which is</div><div class='add'>+ * larger than 2KB by setting the tx.boundary to 2KB.  If ECRC is</div><div class='add'>+ * enabled, then the driver should use the aligned (myri10ge_eth_z8e.dat)</div><div class='add'>+ * firmware image, and set tx.boundary to 4KB.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE	0x0132</div><div class='add'>+</div><div class='add'>+static void myri10ge_select_firmware(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *bridge = mgp-&gt;pdev-&gt;bus-&gt;self;</div><div class='add'>+</div><div class='add'>+	mgp-&gt;tx.boundary = 2048;</div><div class='add'>+	mgp-&gt;fw_name = myri10ge_fw_unaligned;</div><div class='add'>+</div><div class='add'>+	if (myri10ge_force_firmware == 0) {</div><div class='add'>+		myri10ge_enable_ecrc(mgp);</div><div class='add'>+</div><div class='add'>+		/* Check to see if the upstream bridge is known to</div><div class='add'>+		 * provide aligned completions */</div><div class='add'>+		if (bridge</div><div class='add'>+		    /* ServerWorks HT2000/HT1000 */</div><div class='add'>+		    &amp;&amp; bridge-&gt;vendor == PCI_VENDOR_ID_SERVERWORKS</div><div class='add'>+		    &amp;&amp; bridge-&gt;device ==</div><div class='add'>+		    PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE) {</div><div class='add'>+			dev_info(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Assuming aligned completions (0x%x:0x%x)\n",</div><div class='add'>+				 bridge-&gt;vendor, bridge-&gt;device);</div><div class='add'>+			mgp-&gt;tx.boundary = 4096;</div><div class='add'>+			mgp-&gt;fw_name = myri10ge_fw_aligned;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (myri10ge_force_firmware == 1) {</div><div class='add'>+			dev_info(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Assuming aligned completions (forced)\n");</div><div class='add'>+			mgp-&gt;tx.boundary = 4096;</div><div class='add'>+			mgp-&gt;fw_name = myri10ge_fw_aligned;</div><div class='add'>+		} else {</div><div class='add'>+			dev_info(&amp;mgp-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Assuming unaligned completions (forced)\n");</div><div class='add'>+			mgp-&gt;tx.boundary = 2048;</div><div class='add'>+			mgp-&gt;fw_name = myri10ge_fw_unaligned;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (myri10ge_fw_name != NULL) {</div><div class='add'>+		dev_info(&amp;mgp-&gt;pdev-&gt;dev, "overriding firmware to %s\n",</div><div class='add'>+			 myri10ge_fw_name);</div><div class='add'>+		mgp-&gt;fw_name = myri10ge_fw_name;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void myri10ge_save_state(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = mgp-&gt;pdev;</div><div class='add'>+	int cap;</div><div class='add'>+</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	/* now save PCIe and MSI state that Linux will not</div><div class='add'>+	 * save for us */</div><div class='add'>+	cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);</div><div class='add'>+	pci_read_config_dword(pdev, cap + PCI_EXP_DEVCTL, &amp;mgp-&gt;devctl);</div><div class='add'>+	cap = pci_find_capability(pdev, PCI_CAP_ID_MSI);</div><div class='add'>+	pci_read_config_word(pdev, cap + PCI_MSI_FLAGS, &amp;mgp-&gt;msi_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void myri10ge_restore_state(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = mgp-&gt;pdev;</div><div class='add'>+	int cap;</div><div class='add'>+</div><div class='add'>+	/* restore PCIe and MSI state that linux will not */</div><div class='add'>+	cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);</div><div class='add'>+	pci_write_config_dword(pdev, cap + PCI_CAP_ID_EXP, mgp-&gt;devctl);</div><div class='add'>+	cap = pci_find_capability(pdev, PCI_CAP_ID_MSI);</div><div class='add'>+	pci_write_config_word(pdev, cap + PCI_MSI_FLAGS, mgp-&gt;msi_flags);</div><div class='add'>+</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+</div><div class='add'>+	mgp = pci_get_drvdata(pdev);</div><div class='add'>+	if (mgp == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	netdev = mgp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		printk(KERN_INFO "myri10ge: closing %s\n", netdev-&gt;name);</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		myri10ge_close(netdev);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='add'>+	myri10ge_dummy_rdma(mgp, 0);</div><div class='add'>+	free_irq(pdev-&gt;irq, mgp);</div><div class='add'>+	myri10ge_save_state(mgp);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int status;</div><div class='add'>+	u16 vendor;</div><div class='add'>+</div><div class='add'>+	mgp = pci_get_drvdata(pdev);</div><div class='add'>+	if (mgp == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	netdev = mgp-&gt;dev;</div><div class='add'>+	pci_set_power_state(pdev, 0);	/* zeros conf space as a side effect */</div><div class='add'>+	msleep(5);		/* give card time to respond */</div><div class='add'>+	pci_read_config_word(mgp-&gt;pdev, PCI_VENDOR_ID, &amp;vendor);</div><div class='add'>+	if (vendor == 0xffff) {</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: device disappeared!\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	myri10ge_restore_state(mgp);</div><div class='add'>+</div><div class='add'>+	status = pci_enable_device(pdev);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to enable device\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	status = request_irq(pdev-&gt;irq, myri10ge_intr, IRQF_SHARED,</div><div class='add'>+			     netdev-&gt;name, mgp);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to allocate IRQ\n");</div><div class='add'>+		goto abort_with_enabled;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	myri10ge_reset(mgp);</div><div class='add'>+	myri10ge_dummy_rdma(mgp, mgp-&gt;tx.boundary != 4096);</div><div class='add'>+</div><div class='add'>+	/* Save configuration space to be restored if the</div><div class='add'>+	 * nic resets due to a parity error */</div><div class='add'>+	myri10ge_save_state(mgp);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		myri10ge_open(netdev);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='add'>+	netif_device_attach(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abort_with_enabled:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return -EIO;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif				/* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = mgp-&gt;pdev;</div><div class='add'>+	int vs = mgp-&gt;vendor_specific_offset;</div><div class='add'>+	u32 reboot;</div><div class='add'>+</div><div class='add'>+	/*enter read32 mode */</div><div class='add'>+	pci_write_config_byte(pdev, vs + 0x10, 0x3);</div><div class='add'>+</div><div class='add'>+	/*read REBOOT_STATUS (0xfffffff0) */</div><div class='add'>+	pci_write_config_dword(pdev, vs + 0x18, 0xfffffff0);</div><div class='add'>+	pci_read_config_dword(pdev, vs + 0x14, &amp;reboot);</div><div class='add'>+	return reboot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This watchdog is used to check whether the board has suffered</div><div class='add'>+ * from a parity error and needs to be recovered.</div><div class='add'>+ */</div><div class='add'>+static void myri10ge_watchdog(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp = arg;</div><div class='add'>+	u32 reboot;</div><div class='add'>+	int status;</div><div class='add'>+	u16 cmd, vendor;</div><div class='add'>+</div><div class='add'>+	mgp-&gt;watchdog_resets++;</div><div class='add'>+	pci_read_config_word(mgp-&gt;pdev, PCI_COMMAND, &amp;cmd);</div><div class='add'>+	if ((cmd &amp; PCI_COMMAND_MASTER) == 0) {</div><div class='add'>+		/* Bus master DMA disabled?  Check to see</div><div class='add'>+		 * if the card rebooted due to a parity error</div><div class='add'>+		 * For now, just report it */</div><div class='add'>+		reboot = myri10ge_read_reboot(mgp);</div><div class='add'>+		printk(KERN_ERR</div><div class='add'>+		       "myri10ge: %s: NIC rebooted (0x%x), resetting\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name, reboot);</div><div class='add'>+		/*</div><div class='add'>+		 * A rebooted nic will come back with config space as</div><div class='add'>+		 * it was after power was applied to PCIe bus.</div><div class='add'>+		 * Attempt to restore config space which was saved</div><div class='add'>+		 * when the driver was loaded, or the last time the</div><div class='add'>+		 * nic was resumed from power saving mode.</div><div class='add'>+		 */</div><div class='add'>+		myri10ge_restore_state(mgp);</div><div class='add'>+	} else {</div><div class='add'>+		/* if we get back -1's from our slot, perhaps somebody</div><div class='add'>+		 * powered off our card.  Don't try to reset it in</div><div class='add'>+		 * this case */</div><div class='add'>+		if (cmd == 0xffff) {</div><div class='add'>+			pci_read_config_word(mgp-&gt;pdev, PCI_VENDOR_ID, &amp;vendor);</div><div class='add'>+			if (vendor == 0xffff) {</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "myri10ge: %s: device disappeared!\n",</div><div class='add'>+				       mgp-&gt;dev-&gt;name);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* Perhaps it is a software error.  Try to reset */</div><div class='add'>+</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: device timeout, resetting\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name);</div><div class='add'>+		printk(KERN_INFO "myri10ge: %s: %d %d %d %d %d\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name, mgp-&gt;tx.req, mgp-&gt;tx.done,</div><div class='add'>+		       mgp-&gt;tx.pkt_start, mgp-&gt;tx.pkt_done,</div><div class='add'>+		       (int)ntohl(mgp-&gt;fw_stats-&gt;send_done_count));</div><div class='add'>+		msleep(2000);</div><div class='add'>+		printk(KERN_INFO "myri10ge: %s: %d %d %d %d %d\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name, mgp-&gt;tx.req, mgp-&gt;tx.done,</div><div class='add'>+		       mgp-&gt;tx.pkt_start, mgp-&gt;tx.pkt_done,</div><div class='add'>+		       (int)ntohl(mgp-&gt;fw_stats-&gt;send_done_count));</div><div class='add'>+	}</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	myri10ge_close(mgp-&gt;dev);</div><div class='add'>+	status = myri10ge_load_firmware(mgp);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		printk(KERN_ERR "myri10ge: %s: failed to load firmware\n",</div><div class='add'>+		       mgp-&gt;dev-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		myri10ge_open(mgp-&gt;dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * We use our own timer routine rather than relying upon</div><div class='add'>+ * netdev-&gt;tx_timeout because we have a very large hardware transmit</div><div class='add'>+ * queue.  Due to the large queue, the netdev-&gt;tx_timeout function</div><div class='add'>+ * cannot detect a NIC with a parity error in a timely fashion if the</div><div class='add'>+ * NIC is lightly loaded.</div><div class='add'>+ */</div><div class='add'>+static void myri10ge_watchdog_timer(unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+</div><div class='add'>+	mgp = (struct myri10ge_priv *)arg;</div><div class='add'>+	if (mgp-&gt;tx.req != mgp-&gt;tx.done &amp;&amp;</div><div class='add'>+	    mgp-&gt;tx.done == mgp-&gt;watchdog_tx_done)</div><div class='add'>+		/* nic seems like it might be stuck.. */</div><div class='add'>+		schedule_work(&amp;mgp-&gt;watchdog_work);</div><div class='add'>+	else</div><div class='add'>+		/* rearm timer */</div><div class='add'>+		mod_timer(&amp;mgp-&gt;watchdog_timer,</div><div class='add'>+			  jiffies + myri10ge_watchdog_timeout * HZ);</div><div class='add'>+</div><div class='add'>+	mgp-&gt;watchdog_tx_done = mgp-&gt;tx.done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	size_t bytes;</div><div class='add'>+	int i;</div><div class='add'>+	int status = -ENXIO;</div><div class='add'>+	int cap;</div><div class='add'>+	int dac_enabled;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_etherdev(sizeof(*mgp));</div><div class='add'>+	if (netdev == NULL) {</div><div class='add'>+		dev_err(dev, "Could not allocate ethernet device\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mgp = netdev_priv(netdev);</div><div class='add'>+	memset(mgp, 0, sizeof(*mgp));</div><div class='add'>+	mgp-&gt;dev = netdev;</div><div class='add'>+	mgp-&gt;pdev = pdev;</div><div class='add'>+	mgp-&gt;csum_flag = MXGEFW_FLAGS_CKSUM;</div><div class='add'>+	mgp-&gt;pause = myri10ge_flow_control;</div><div class='add'>+	mgp-&gt;intr_coal_delay = myri10ge_intr_coal_delay;</div><div class='add'>+	init_waitqueue_head(&amp;mgp-&gt;down_wq);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pdev)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "pci_enable_device call failed\n");</div><div class='add'>+		status = -ENODEV;</div><div class='add'>+		goto abort_with_netdev;</div><div class='add'>+	}</div><div class='add'>+	myri10ge_select_firmware(mgp);</div><div class='add'>+</div><div class='add'>+	/* Find the vendor-specific cap so we can check</div><div class='add'>+	 * the reboot register later on */</div><div class='add'>+	mgp-&gt;vendor_specific_offset</div><div class='add'>+	    = pci_find_capability(pdev, PCI_CAP_ID_VNDR);</div><div class='add'>+</div><div class='add'>+	/* Set our max read request to 4KB */</div><div class='add'>+	cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);</div><div class='add'>+	if (cap &lt; 64) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Bad PCI_CAP_ID_EXP location %d\n", cap);</div><div class='add'>+		goto abort_with_netdev;</div><div class='add'>+	}</div><div class='add'>+	status = pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &amp;val);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error %d reading PCI_EXP_DEVCTL\n",</div><div class='add'>+			status);</div><div class='add'>+		goto abort_with_netdev;</div><div class='add'>+	}</div><div class='add'>+	val = (val &amp; ~PCI_EXP_DEVCTL_READRQ) | (5 &lt;&lt; 12);</div><div class='add'>+	status = pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, val);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error %d writing PCI_EXP_DEVCTL\n",</div><div class='add'>+			status);</div><div class='add'>+		goto abort_with_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+	dac_enabled = 1;</div><div class='add'>+	status = pci_set_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dac_enabled = 0;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"64-bit pci address mask was refused, trying 32-bit");</div><div class='add'>+		status = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+	}</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error %d setting DMA mask\n", status);</div><div class='add'>+		goto abort_with_netdev;</div><div class='add'>+	}</div><div class='add'>+	mgp-&gt;cmd = dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;cmd),</div><div class='add'>+				      &amp;mgp-&gt;cmd_bus, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;cmd == NULL)</div><div class='add'>+		goto abort_with_netdev;</div><div class='add'>+</div><div class='add'>+	mgp-&gt;fw_stats = dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;fw_stats),</div><div class='add'>+					   &amp;mgp-&gt;fw_stats_bus, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;fw_stats == NULL)</div><div class='add'>+		goto abort_with_cmd;</div><div class='add'>+</div><div class='add'>+	mgp-&gt;board_span = pci_resource_len(pdev, 0);</div><div class='add'>+	mgp-&gt;iomem_base = pci_resource_start(pdev, 0);</div><div class='add'>+	mgp-&gt;mtrr = -1;</div><div class='add'>+#ifdef CONFIG_MTRR</div><div class='add'>+	mgp-&gt;mtrr = mtrr_add(mgp-&gt;iomem_base, mgp-&gt;board_span,</div><div class='add'>+			     MTRR_TYPE_WRCOMB, 1);</div><div class='add'>+#endif</div><div class='add'>+	/* Hack.  need to get rid of these magic numbers */</div><div class='add'>+	mgp-&gt;sram_size =</div><div class='add'>+	    2 * 1024 * 1024 - (2 * (48 * 1024) + (32 * 1024)) - 0x100;</div><div class='add'>+	if (mgp-&gt;sram_size &gt; mgp-&gt;board_span) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "board span %ld bytes too small\n",</div><div class='add'>+			mgp-&gt;board_span);</div><div class='add'>+		goto abort_with_wc;</div><div class='add'>+	}</div><div class='add'>+	mgp-&gt;sram = ioremap(mgp-&gt;iomem_base, mgp-&gt;board_span);</div><div class='add'>+	if (mgp-&gt;sram == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ioremap failed for %ld bytes at 0x%lx\n",</div><div class='add'>+			mgp-&gt;board_span, mgp-&gt;iomem_base);</div><div class='add'>+		status = -ENXIO;</div><div class='add'>+		goto abort_with_wc;</div><div class='add'>+	}</div><div class='add'>+	memcpy_fromio(mgp-&gt;eeprom_strings,</div><div class='add'>+		      mgp-&gt;sram + mgp-&gt;sram_size - MYRI10GE_EEPROM_STRINGS_SIZE,</div><div class='add'>+		      MYRI10GE_EEPROM_STRINGS_SIZE);</div><div class='add'>+	memset(mgp-&gt;eeprom_strings + MYRI10GE_EEPROM_STRINGS_SIZE - 2, 0, 2);</div><div class='add'>+	status = myri10ge_read_mac_addr(mgp);</div><div class='add'>+	if (status)</div><div class='add'>+		goto abort_with_ioremap;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		netdev-&gt;dev_addr[i] = mgp-&gt;mac_addr[i];</div><div class='add'>+</div><div class='add'>+	/* allocate rx done ring */</div><div class='add'>+	bytes = myri10ge_max_intr_slots * sizeof(*mgp-&gt;rx_done.entry);</div><div class='add'>+	mgp-&gt;rx_done.entry = dma_alloc_coherent(&amp;pdev-&gt;dev, bytes,</div><div class='add'>+						&amp;mgp-&gt;rx_done.bus, GFP_KERNEL);</div><div class='add'>+	if (mgp-&gt;rx_done.entry == NULL)</div><div class='add'>+		goto abort_with_ioremap;</div><div class='add'>+	memset(mgp-&gt;rx_done.entry, 0, bytes);</div><div class='add'>+</div><div class='add'>+	status = myri10ge_load_firmware(mgp);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to load firmware\n");</div><div class='add'>+		goto abort_with_rx_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = myri10ge_reset(mgp);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed reset\n");</div><div class='add'>+		goto abort_with_firmware;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (myri10ge_msi) {</div><div class='add'>+		status = pci_enable_msi(pdev);</div><div class='add'>+		if (status != 0)</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"Error %d setting up MSI; falling back to xPIC\n",</div><div class='add'>+				status);</div><div class='add'>+		else</div><div class='add'>+			mgp-&gt;msi_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = request_irq(pdev-&gt;irq, myri10ge_intr, IRQF_SHARED,</div><div class='add'>+			     netdev-&gt;name, mgp);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to allocate IRQ\n");</div><div class='add'>+		goto abort_with_firmware;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, mgp);</div><div class='add'>+	if ((myri10ge_initial_mtu + ETH_HLEN) &gt; MYRI10GE_MAX_ETHER_MTU)</div><div class='add'>+		myri10ge_initial_mtu = MYRI10GE_MAX_ETHER_MTU - ETH_HLEN;</div><div class='add'>+	if ((myri10ge_initial_mtu + ETH_HLEN) &lt; 68)</div><div class='add'>+		myri10ge_initial_mtu = 68;</div><div class='add'>+	netdev-&gt;mtu = myri10ge_initial_mtu;</div><div class='add'>+	netdev-&gt;open = myri10ge_open;</div><div class='add'>+	netdev-&gt;stop = myri10ge_close;</div><div class='add'>+	netdev-&gt;hard_start_xmit = myri10ge_xmit;</div><div class='add'>+	netdev-&gt;get_stats = myri10ge_get_stats;</div><div class='add'>+	netdev-&gt;base_addr = mgp-&gt;iomem_base;</div><div class='add'>+	netdev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+	netdev-&gt;change_mtu = myri10ge_change_mtu;</div><div class='add'>+	netdev-&gt;set_multicast_list = myri10ge_set_multicast_list;</div><div class='add'>+	netdev-&gt;set_mac_address = myri10ge_set_mac_address;</div><div class='add'>+	netdev-&gt;features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO;</div><div class='add'>+	if (dac_enabled)</div><div class='add'>+		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+	netdev-&gt;poll = myri10ge_poll;</div><div class='add'>+	netdev-&gt;weight = myri10ge_napi_weight;</div><div class='add'>+</div><div class='add'>+	/* Save configuration space to be restored if the</div><div class='add'>+	 * nic resets due to a parity error */</div><div class='add'>+	myri10ge_save_state(mgp);</div><div class='add'>+</div><div class='add'>+	/* Setup the watchdog timer */</div><div class='add'>+	setup_timer(&amp;mgp-&gt;watchdog_timer, myri10ge_watchdog_timer,</div><div class='add'>+		    (unsigned long)mgp);</div><div class='add'>+</div><div class='add'>+	SET_ETHTOOL_OPS(netdev, &amp;myri10ge_ethtool_ops);</div><div class='add'>+	INIT_WORK(&amp;mgp-&gt;watchdog_work, myri10ge_watchdog, mgp);</div><div class='add'>+	status = register_netdev(netdev);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "register_netdev failed: %d\n", status);</div><div class='add'>+		goto abort_with_irq;</div><div class='add'>+	}</div><div class='add'>+	dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",</div><div class='add'>+		 (mgp-&gt;msi_enabled ? "MSI" : "xPIC"),</div><div class='add'>+		 pdev-&gt;irq, mgp-&gt;tx.boundary, mgp-&gt;fw_name,</div><div class='add'>+		 (mgp-&gt;mtrr &gt;= 0 ? "Enabled" : "Disabled"));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+abort_with_irq:</div><div class='add'>+	free_irq(pdev-&gt;irq, mgp);</div><div class='add'>+	if (mgp-&gt;msi_enabled)</div><div class='add'>+		pci_disable_msi(pdev);</div><div class='add'>+</div><div class='add'>+abort_with_firmware:</div><div class='add'>+	myri10ge_dummy_rdma(mgp, 0);</div><div class='add'>+</div><div class='add'>+abort_with_rx_done:</div><div class='add'>+	bytes = myri10ge_max_intr_slots * sizeof(*mgp-&gt;rx_done.entry);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, bytes,</div><div class='add'>+			  mgp-&gt;rx_done.entry, mgp-&gt;rx_done.bus);</div><div class='add'>+</div><div class='add'>+abort_with_ioremap:</div><div class='add'>+	iounmap(mgp-&gt;sram);</div><div class='add'>+</div><div class='add'>+abort_with_wc:</div><div class='add'>+#ifdef CONFIG_MTRR</div><div class='add'>+	if (mgp-&gt;mtrr &gt;= 0)</div><div class='add'>+		mtrr_del(mgp-&gt;mtrr, mgp-&gt;iomem_base, mgp-&gt;board_span);</div><div class='add'>+#endif</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;fw_stats),</div><div class='add'>+			  mgp-&gt;fw_stats, mgp-&gt;fw_stats_bus);</div><div class='add'>+</div><div class='add'>+abort_with_cmd:</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;cmd),</div><div class='add'>+			  mgp-&gt;cmd, mgp-&gt;cmd_bus);</div><div class='add'>+</div><div class='add'>+abort_with_netdev:</div><div class='add'>+</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * myri10ge_remove</div><div class='add'>+ *</div><div class='add'>+ * Does what is necessary to shutdown one Myrinet device. Called</div><div class='add'>+ *   once for each Myrinet card by the kernel when a module is</div><div class='add'>+ *   unloaded.</div><div class='add'>+ */</div><div class='add'>+static void myri10ge_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct myri10ge_priv *mgp;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	size_t bytes;</div><div class='add'>+</div><div class='add'>+	mgp = pci_get_drvdata(pdev);</div><div class='add'>+	if (mgp == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	flush_scheduled_work();</div><div class='add'>+	netdev = mgp-&gt;dev;</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+	free_irq(pdev-&gt;irq, mgp);</div><div class='add'>+	if (mgp-&gt;msi_enabled)</div><div class='add'>+		pci_disable_msi(pdev);</div><div class='add'>+</div><div class='add'>+	myri10ge_dummy_rdma(mgp, 0);</div><div class='add'>+</div><div class='add'>+	bytes = myri10ge_max_intr_slots * sizeof(*mgp-&gt;rx_done.entry);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, bytes,</div><div class='add'>+			  mgp-&gt;rx_done.entry, mgp-&gt;rx_done.bus);</div><div class='add'>+</div><div class='add'>+	iounmap(mgp-&gt;sram);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MTRR</div><div class='add'>+	if (mgp-&gt;mtrr &gt;= 0)</div><div class='add'>+		mtrr_del(mgp-&gt;mtrr, mgp-&gt;iomem_base, mgp-&gt;board_span);</div><div class='add'>+#endif</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;fw_stats),</div><div class='add'>+			  mgp-&gt;fw_stats, mgp-&gt;fw_stats_bus);</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(*mgp-&gt;cmd),</div><div class='add'>+			  mgp-&gt;cmd, mgp-&gt;cmd_bus);</div><div class='add'>+</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E 	0x0008</div><div class='add'>+</div><div class='add'>+static struct pci_device_id myri10ge_pci_tbl[] = {</div><div class='add'>+	{PCI_DEVICE(PCI_VENDOR_ID_MYRICOM, PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E)},</div><div class='add'>+	{0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver myri10ge_driver = {</div><div class='add'>+	.name = "myri10ge",</div><div class='add'>+	.probe = myri10ge_probe,</div><div class='add'>+	.remove = myri10ge_remove,</div><div class='add'>+	.id_table = myri10ge_pci_tbl,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend = myri10ge_suspend,</div><div class='add'>+	.resume = myri10ge_resume,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int myri10ge_init_module(void)</div><div class='add'>+{</div><div class='add'>+	printk(KERN_INFO "%s: Version %s\n", myri10ge_driver.name,</div><div class='add'>+	       MYRI10GE_VERSION_STR);</div><div class='add'>+	return pci_register_driver(&amp;myri10ge_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(myri10ge_init_module);</div><div class='add'>+</div><div class='add'>+static __exit void myri10ge_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;myri10ge_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_exit(myri10ge_cleanup_module);</div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/myri10ge/myri10ge_mcp.h<br/>new file mode 100644<br/>index 000000000000..0a6cae6cb186<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge_mcp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/myri10ge/myri10ge_mcp.h</a></div><div class='hunk'>@@ -0,0 +1,205 @@</div><div class='add'>+#ifndef __MYRI10GE_MCP_H__</div><div class='add'>+#define __MYRI10GE_MCP_H__</div><div class='add'>+</div><div class='add'>+#define MXGEFW_VERSION_MAJOR	1</div><div class='add'>+#define MXGEFW_VERSION_MINOR	4</div><div class='add'>+</div><div class='add'>+/* 8 Bytes */</div><div class='add'>+struct mcp_dma_addr {</div><div class='add'>+	u32 high;</div><div class='add'>+	u32 low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 4 Bytes */</div><div class='add'>+struct mcp_slot {</div><div class='add'>+	u16 checksum;</div><div class='add'>+	u16 length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 64 Bytes */</div><div class='add'>+struct mcp_cmd {</div><div class='add'>+	u32 cmd;</div><div class='add'>+	u32 data0;		/* will be low portion if data &gt; 32 bits */</div><div class='add'>+	/* 8 */</div><div class='add'>+	u32 data1;		/* will be high portion if data &gt; 32 bits */</div><div class='add'>+	u32 data2;		/* currently unused.. */</div><div class='add'>+	/* 16 */</div><div class='add'>+	struct mcp_dma_addr response_addr;</div><div class='add'>+	/* 24 */</div><div class='add'>+	u8 pad[40];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 8 Bytes */</div><div class='add'>+struct mcp_cmd_response {</div><div class='add'>+	u32 data;</div><div class='add'>+	u32 result;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * flags used in mcp_kreq_ether_send_t:</div><div class='add'>+ *</div><div class='add'>+ * The SMALL flag is only needed in the first segment. It is raised</div><div class='add'>+ * for packets that are total less or equal 512 bytes.</div><div class='add'>+ *</div><div class='add'>+ * The CKSUM flag must be set in all segments.</div><div class='add'>+ *</div><div class='add'>+ * The PADDED flags is set if the packet needs to be padded, and it</div><div class='add'>+ * must be set for all segments.</div><div class='add'>+ *</div><div class='add'>+ * The  MXGEFW_FLAGS_ALIGN_ODD must be set if the cumulative</div><div class='add'>+ * length of all previous segments was odd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MXGEFW_FLAGS_SMALL      0x1</div><div class='add'>+#define MXGEFW_FLAGS_TSO_HDR    0x1</div><div class='add'>+#define MXGEFW_FLAGS_FIRST      0x2</div><div class='add'>+#define MXGEFW_FLAGS_ALIGN_ODD  0x4</div><div class='add'>+#define MXGEFW_FLAGS_CKSUM      0x8</div><div class='add'>+#define MXGEFW_FLAGS_TSO_LAST   0x8</div><div class='add'>+#define MXGEFW_FLAGS_NO_TSO     0x10</div><div class='add'>+#define MXGEFW_FLAGS_TSO_CHOP   0x10</div><div class='add'>+#define MXGEFW_FLAGS_TSO_PLD    0x20</div><div class='add'>+</div><div class='add'>+#define MXGEFW_SEND_SMALL_SIZE  1520</div><div class='add'>+#define MXGEFW_MAX_MTU          9400</div><div class='add'>+</div><div class='add'>+union mcp_pso_or_cumlen {</div><div class='add'>+	u16 pseudo_hdr_offset;</div><div class='add'>+	u16 cum_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define	MXGEFW_MAX_SEND_DESC 12</div><div class='add'>+#define MXGEFW_PAD	    2</div><div class='add'>+</div><div class='add'>+/* 16 Bytes */</div><div class='add'>+struct mcp_kreq_ether_send {</div><div class='add'>+	u32 addr_high;</div><div class='add'>+	u32 addr_low;</div><div class='add'>+	u16 pseudo_hdr_offset;</div><div class='add'>+	u16 length;</div><div class='add'>+	u8 pad;</div><div class='add'>+	u8 rdma_count;</div><div class='add'>+	u8 cksum_offset;	/* where to start computing cksum */</div><div class='add'>+	u8 flags;		/* as defined above */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 8 Bytes */</div><div class='add'>+struct mcp_kreq_ether_recv {</div><div class='add'>+	u32 addr_high;</div><div class='add'>+	u32 addr_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Commands */</div><div class='add'>+</div><div class='add'>+#define MXGEFW_CMD_OFFSET 0xf80000</div><div class='add'>+</div><div class='add'>+enum myri10ge_mcp_cmd_type {</div><div class='add'>+	MXGEFW_CMD_NONE = 0,</div><div class='add'>+	/* Reset the mcp, it is left in a safe state, waiting</div><div class='add'>+	 * for the driver to set all its parameters */</div><div class='add'>+	MXGEFW_CMD_RESET,</div><div class='add'>+</div><div class='add'>+	/* get the version number of the current firmware..</div><div class='add'>+	 * (may be available in the eeprom strings..? */</div><div class='add'>+	MXGEFW_GET_MCP_VERSION,</div><div class='add'>+</div><div class='add'>+	/* Parameters which must be set by the driver before it can</div><div class='add'>+	 * issue MXGEFW_CMD_ETHERNET_UP. They persist until the next</div><div class='add'>+	 * MXGEFW_CMD_RESET is issued */</div><div class='add'>+</div><div class='add'>+	MXGEFW_CMD_SET_INTRQ_DMA,</div><div class='add'>+	MXGEFW_CMD_SET_BIG_BUFFER_SIZE,	/* in bytes, power of 2 */</div><div class='add'>+	MXGEFW_CMD_SET_SMALL_BUFFER_SIZE,	/* in bytes */</div><div class='add'>+</div><div class='add'>+	/* Parameters which refer to lanai SRAM addresses where the</div><div class='add'>+	 * driver must issue PIO writes for various things */</div><div class='add'>+</div><div class='add'>+	MXGEFW_CMD_GET_SEND_OFFSET,</div><div class='add'>+	MXGEFW_CMD_GET_SMALL_RX_OFFSET,</div><div class='add'>+	MXGEFW_CMD_GET_BIG_RX_OFFSET,</div><div class='add'>+	MXGEFW_CMD_GET_IRQ_ACK_OFFSET,</div><div class='add'>+	MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET,</div><div class='add'>+</div><div class='add'>+	/* Parameters which refer to rings stored on the MCP,</div><div class='add'>+	 * and whose size is controlled by the mcp */</div><div class='add'>+</div><div class='add'>+	MXGEFW_CMD_GET_SEND_RING_SIZE,	/* in bytes */</div><div class='add'>+	MXGEFW_CMD_GET_RX_RING_SIZE,	/* in bytes */</div><div class='add'>+</div><div class='add'>+	/* Parameters which refer to rings stored in the host,</div><div class='add'>+	 * and whose size is controlled by the host.  Note that</div><div class='add'>+	 * all must be physically contiguous and must contain</div><div class='add'>+	 * a power of 2 number of entries.  */</div><div class='add'>+</div><div class='add'>+	MXGEFW_CMD_SET_INTRQ_SIZE,	/* in bytes */</div><div class='add'>+</div><div class='add'>+	/* command to bring ethernet interface up.  Above parameters</div><div class='add'>+	 * (plus mtu &amp; mac address) must have been exchanged prior</div><div class='add'>+	 * to issuing this command  */</div><div class='add'>+	MXGEFW_CMD_ETHERNET_UP,</div><div class='add'>+</div><div class='add'>+	/* command to bring ethernet interface down.  No further sends</div><div class='add'>+	 * or receives may be processed until an MXGEFW_CMD_ETHERNET_UP</div><div class='add'>+	 * is issued, and all interrupt queues must be flushed prior</div><div class='add'>+	 * to ack'ing this command */</div><div class='add'>+</div><div class='add'>+	MXGEFW_CMD_ETHERNET_DOWN,</div><div class='add'>+</div><div class='add'>+	/* commands the driver may issue live, without resetting</div><div class='add'>+	 * the nic.  Note that increasing the mtu "live" should</div><div class='add'>+	 * only be done if the driver has already supplied buffers</div><div class='add'>+	 * sufficiently large to handle the new mtu.  Decreasing</div><div class='add'>+	 * the mtu live is safe */</div><div class='add'>+</div><div class='add'>+	MXGEFW_CMD_SET_MTU,</div><div class='add'>+	MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET,	/* in microseconds */</div><div class='add'>+	MXGEFW_CMD_SET_STATS_INTERVAL,	/* in microseconds */</div><div class='add'>+	MXGEFW_CMD_SET_STATS_DMA,</div><div class='add'>+</div><div class='add'>+	MXGEFW_ENABLE_PROMISC,</div><div class='add'>+	MXGEFW_DISABLE_PROMISC,</div><div class='add'>+	MXGEFW_SET_MAC_ADDRESS,</div><div class='add'>+</div><div class='add'>+	MXGEFW_ENABLE_FLOW_CONTROL,</div><div class='add'>+	MXGEFW_DISABLE_FLOW_CONTROL,</div><div class='add'>+</div><div class='add'>+	/* do a DMA test</div><div class='add'>+	 * data0,data1 = DMA address</div><div class='add'>+	 * data2       = RDMA length (MSH), WDMA length (LSH)</div><div class='add'>+	 * command return data = repetitions (MSH), 0.5-ms ticks (LSH)</div><div class='add'>+	 */</div><div class='add'>+	MXGEFW_DMA_TEST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum myri10ge_mcp_cmd_status {</div><div class='add'>+	MXGEFW_CMD_OK = 0,</div><div class='add'>+	MXGEFW_CMD_UNKNOWN,</div><div class='add'>+	MXGEFW_CMD_ERROR_RANGE,</div><div class='add'>+	MXGEFW_CMD_ERROR_BUSY,</div><div class='add'>+	MXGEFW_CMD_ERROR_EMPTY,</div><div class='add'>+	MXGEFW_CMD_ERROR_CLOSED,</div><div class='add'>+	MXGEFW_CMD_ERROR_HASH_ERROR,</div><div class='add'>+	MXGEFW_CMD_ERROR_BAD_PORT,</div><div class='add'>+	MXGEFW_CMD_ERROR_RESOURCES</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* 40 Bytes */</div><div class='add'>+struct mcp_irq_data {</div><div class='add'>+	u32 send_done_count;</div><div class='add'>+</div><div class='add'>+	u32 link_up;</div><div class='add'>+	u32 dropped_link_overflow;</div><div class='add'>+	u32 dropped_link_error_or_filtered;</div><div class='add'>+	u32 dropped_runt;</div><div class='add'>+	u32 dropped_overrun;</div><div class='add'>+	u32 dropped_no_small_buffer;</div><div class='add'>+	u32 dropped_no_big_buffer;</div><div class='add'>+	u32 rdma_tags_available;</div><div class='add'>+</div><div class='add'>+	u8 tx_stopped;</div><div class='add'>+	u8 link_down;</div><div class='add'>+	u8 stats_updated;</div><div class='add'>+	u8 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif				/* __MYRI10GE_MCP_H__ */</div><div class='head'>diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h<br/>new file mode 100644<br/>index 000000000000..487f7792fd46<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri10ge/myri10ge_mcp_gen_header.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/myri10ge/myri10ge_mcp_gen_header.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+#ifndef __MYRI10GE_MCP_GEN_HEADER_H__</div><div class='add'>+#define __MYRI10GE_MCP_GEN_HEADER_H__</div><div class='add'>+</div><div class='add'>+/* this file define a standard header used as a first entry point to</div><div class='add'>+ * exchange information between firmware/driver and driver.  The</div><div class='add'>+ * header structure can be anywhere in the mcp. It will usually be in</div><div class='add'>+ * the .data section, because some fields needs to be initialized at</div><div class='add'>+ * compile time.</div><div class='add'>+ * The 32bit word at offset MX_HEADER_PTR_OFFSET in the mcp must</div><div class='add'>+ * contains the location of the header.</div><div class='add'>+ *</div><div class='add'>+ * Typically a MCP will start with the following:</div><div class='add'>+ * .text</div><div class='add'>+ * .space 52    ! to help catch MEMORY_INT errors</div><div class='add'>+ * bt start     ! jump to real code</div><div class='add'>+ * nop</div><div class='add'>+ * .long _gen_mcp_header</div><div class='add'>+ *</div><div class='add'>+ * The source will have a definition like:</div><div class='add'>+ *</div><div class='add'>+ * mcp_gen_header_t gen_mcp_header = {</div><div class='add'>+ * .header_length = sizeof(mcp_gen_header_t),</div><div class='add'>+ * .mcp_type = MCP_TYPE_XXX,</div><div class='add'>+ * .version = "something $Id: mcp_gen_header.h,v 1.2 2006/05/13 10:04:35 bgoglin Exp $",</div><div class='add'>+ * .mcp_globals = (unsigned)&amp;Globals</div><div class='add'>+ * };</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MCP_HEADER_PTR_OFFSET  0x3c</div><div class='add'>+</div><div class='add'>+#define MCP_TYPE_MX 0x4d582020	/* "MX  " */</div><div class='add'>+#define MCP_TYPE_PCIE 0x70636965	/* "PCIE" pcie-only MCP */</div><div class='add'>+#define MCP_TYPE_ETH 0x45544820	/* "ETH " */</div><div class='add'>+#define MCP_TYPE_MCP0 0x4d435030	/* "MCP0" */</div><div class='add'>+</div><div class='add'>+struct mcp_gen_header {</div><div class='add'>+	/* the first 4 fields are filled at compile time */</div><div class='add'>+	unsigned header_length;</div><div class='add'>+	unsigned mcp_type;</div><div class='add'>+	char version[128];</div><div class='add'>+	unsigned mcp_globals;	/* pointer to mcp-type specific structure */</div><div class='add'>+</div><div class='add'>+	/* filled by the MCP at run-time */</div><div class='add'>+	unsigned sram_size;</div><div class='add'>+	unsigned string_specs;	/* either the original STRING_SPECS or a superset */</div><div class='add'>+	unsigned string_specs_len;</div><div class='add'>+</div><div class='add'>+	/* Fields above this comment are guaranteed to be present.</div><div class='add'>+	 *</div><div class='add'>+	 * Fields below this comment are extensions added in later versions</div><div class='add'>+	 * of this struct, drivers should compare the header_length against</div><div class='add'>+	 * offsetof(field) to check wether a given MCP implements them.</div><div class='add'>+	 *</div><div class='add'>+	 * Never remove any field.  Keep everything naturally align.</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif				/* __MYRI10GE_MCP_GEN_HEADER_H__ */</div><div class='head'>diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c<br/>index 6c86dca62e2a..1b965a2b56e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/myri_sbus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri_sbus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri_sbus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/myri_sbus.c</a></div><div class='hunk'>@@ -1,13 +1,12 @@</div><div class='del'>-/* myri_sbus.h: MyriCOM MyriNET SBUS card driver.</div><div class='add'>+/* myri_sbus.c: MyriCOM MyriNET SBUS card driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 1999 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 1996, 1999, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='del'>-        "myri_sbus.c:v1.9 12/Sep/99 David S. Miller (davem@redhat.com)\n";</div><div class='add'>+        "myri_sbus.c:v2.0 June 23, 2006 David S. Miller (davem@davemloft.net)\n";</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -81,10 +80,6 @@ static char version[] =</div><div class='ctx'> #define DHDR(x)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-static struct myri_eth *root_myri_dev;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void myri_reset_off(void __iomem *lp, void __iomem *cregs)</div><div class='ctx'> {</div><div class='ctx'> 	/* Clear IRQ mask. */</div><div class='hunk'>@@ -896,8 +891,9 @@ static void dump_eeprom(struct myri_eth *mp)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init myri_ether_init(struct sbus_dev *sdev, int num)</div><div class='add'>+static int __init myri_ether_init(struct sbus_dev *sdev)</div><div class='ctx'> {</div><div class='add'>+	static int num;</div><div class='ctx'> 	static unsigned version_printed;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct myri_eth *mp;</div><div class='hunk'>@@ -913,6 +909,9 @@ static int __init myri_ether_init(struct sbus_dev *sdev, int num)</div><div class='ctx'> 	if (version_printed++ == 0)</div><div class='ctx'> 		printk(version);</div><div class='ctx'> </div><div class='add'>+	SET_MODULE_OWNER(dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='add'>+</div><div class='ctx'> 	mp = (struct myri_eth *) dev-&gt;priv;</div><div class='ctx'> 	spin_lock_init(&amp;mp-&gt;irq_lock);</div><div class='ctx'> 	mp-&gt;myri_sdev = sdev;</div><div class='hunk'>@@ -1070,7 +1069,7 @@ static int __init myri_ether_init(struct sbus_dev *sdev, int num)</div><div class='ctx'> 	/* Register interrupt handler now. */</div><div class='ctx'> 	DET(("Requesting MYRIcom IRQ line.\n"));</div><div class='ctx'> 	if (request_irq(dev-&gt;irq, &amp;myri_interrupt,</div><div class='del'>-			SA_SHIRQ, "MyriCOM Ethernet", (void *) dev)) {</div><div class='add'>+			IRQF_SHARED, "MyriCOM Ethernet", (void *) dev)) {</div><div class='ctx'> 		printk("MyriCOM: Cannot register interrupt handler.\n");</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1092,10 +1091,9 @@ static int __init myri_ether_init(struct sbus_dev *sdev, int num)</div><div class='ctx'> 		goto err_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-	mp-&gt;next_module = root_myri_dev;</div><div class='del'>-	root_myri_dev = mp;</div><div class='del'>-#endif</div><div class='add'>+	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, mp);</div><div class='add'>+</div><div class='add'>+	num++;</div><div class='ctx'> </div><div class='ctx'> 	printk("%s: MyriCOM MyriNET Ethernet ", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -1114,61 +1112,68 @@ err:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init myri_sbus_match(struct sbus_dev *sdev)</div><div class='del'>-{</div><div class='del'>-	char *name = sdev-&gt;prom_name;</div><div class='ctx'> </div><div class='del'>-	if (!strcmp(name, "MYRICOM,mlanai") ||</div><div class='del'>-	    !strcmp(name, "myri"))</div><div class='del'>-		return 1;</div><div class='add'>+static int __devinit myri_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return myri_ether_init(sdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init myri_sbus_probe(void)</div><div class='add'>+static int __devexit myri_sbus_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *bus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	static int called;</div><div class='del'>-	int cards = 0, v;</div><div class='add'>+	struct myri_eth *mp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = mp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-	root_myri_dev = NULL;</div><div class='del'>-#endif</div><div class='add'>+	unregister_netdevice(net_dev);</div><div class='ctx'> </div><div class='del'>-	if (called)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	called++;</div><div class='del'>-</div><div class='del'>-	for_each_sbus(bus) {</div><div class='del'>-		for_each_sbusdev(sdev, bus) {</div><div class='del'>-			if (myri_sbus_match(sdev)) {</div><div class='del'>-				cards++;</div><div class='del'>-				DET(("Found myricom myrinet as %s\n", sdev-&gt;prom_name));</div><div class='del'>-				if ((v = myri_ether_init(sdev, (cards - 1))))</div><div class='del'>-					return v;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	free_irq(net_dev-&gt;irq, net_dev);</div><div class='add'>+</div><div class='add'>+	if (mp-&gt;eeprom.cpuvers &lt; CPUVERS_4_0) {</div><div class='add'>+		sbus_iounmap(mp-&gt;regs, mp-&gt;reg_size);</div><div class='add'>+	} else {</div><div class='add'>+		sbus_iounmap(mp-&gt;cregs, PAGE_SIZE);</div><div class='add'>+		sbus_iounmap(mp-&gt;lregs, (256 * 1024));</div><div class='add'>+		sbus_iounmap(mp-&gt;lanai, (512 * 1024));</div><div class='ctx'> 	}</div><div class='del'>-	if (!cards)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit myri_sbus_cleanup(void)</div><div class='add'>+static struct of_device_id myri_sbus_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "MYRICOM,mlanai",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "myri",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, myri_sbus_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver myri_sbus_driver = {</div><div class='add'>+	.name		= "myri",</div><div class='add'>+	.match_table	= myri_sbus_match,</div><div class='add'>+	.probe		= myri_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(myri_sbus_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init myri_sbus_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;myri_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit myri_sbus_exit(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	while (root_myri_dev) {</div><div class='del'>-		struct myri_eth *next = root_myri_dev-&gt;next_module;</div><div class='del'>-</div><div class='del'>-		unregister_netdev(root_myri_dev-&gt;dev);</div><div class='del'>-		/* this will also free the co-allocated 'root_myri_dev' */</div><div class='del'>-		free_netdev(root_myri_dev-&gt;dev);</div><div class='del'>-		root_myri_dev = next;</div><div class='del'>-	}</div><div class='del'>-#endif /* MODULE */</div><div class='add'>+	of_unregister_driver(&amp;myri_sbus_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(myri_sbus_probe);</div><div class='del'>-module_exit(myri_sbus_cleanup);</div><div class='add'>+module_init(myri_sbus_init);</div><div class='add'>+module_exit(myri_sbus_exit);</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/myri_sbus.h b/drivers/net/myri_sbus.h<br/>index 47722f708a41..2f69ef7cdccb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/myri_sbus.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/myri_sbus.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/myri_sbus.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/myri_sbus.h</a></div><div class='hunk'>@@ -290,7 +290,6 @@ struct myri_eth {</div><div class='ctx'> 	unsigned int			reg_size;	/* Size of register space.    */</div><div class='ctx'> 	unsigned int			shmem_base;	/* Offset to shared ram.      */</div><div class='ctx'> 	struct sbus_dev			*myri_sdev;	/* Our SBUS device struct.    */</div><div class='del'>-	struct myri_eth			*next_module;	/* Next in adapter chain.     */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* We use this to acquire receive skb's that we can DMA directly into. */</div><div class='head'>diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c<br/>index 90627756d6fa..db0475a1102f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/natsemi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/natsemi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/natsemi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/natsemi.c</a></div><div class='hunk'>@@ -20,125 +20,13 @@</div><div class='ctx'> </div><div class='ctx'> 	Support information and updates available at</div><div class='ctx'> 	http://www.scyld.com/network/netsemi.html</div><div class='add'>+	[link no longer provides useful info -jgarzik]</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	Linux kernel modifications:</div><div class='del'>-</div><div class='del'>-	Version 1.0.1:</div><div class='del'>-		- Spinlock fixes</div><div class='del'>-		- Bug fixes and better intr performance (Tjeerd)</div><div class='del'>-	Version 1.0.2:</div><div class='del'>-		- Now reads correct MAC address from eeprom</div><div class='del'>-	Version 1.0.3:</div><div class='del'>-		- Eliminate redundant priv-&gt;tx_full flag</div><div class='del'>-		- Call netif_start_queue from dev-&gt;tx_timeout</div><div class='del'>-		- wmb() in start_tx() to flush data</div><div class='del'>-		- Update Tx locking</div><div class='del'>-		- Clean up PCI enable (davej)</div><div class='del'>-	Version 1.0.4:</div><div class='del'>-		- Merge Donald Becker's natsemi.c version 1.07</div><div class='del'>-	Version 1.0.5:</div><div class='del'>-		- { fill me in }</div><div class='del'>-	Version 1.0.6:</div><div class='del'>-		* ethtool support (jgarzik)</div><div class='del'>-		* Proper initialization of the card (which sometimes</div><div class='del'>-		fails to occur and leaves the card in a non-functional</div><div class='del'>-		state). (uzi)</div><div class='del'>-</div><div class='del'>-		* Some documented register settings to optimize some</div><div class='del'>-		of the 100Mbit autodetection circuitry in rev C cards. (uzi)</div><div class='del'>-</div><div class='del'>-		* Polling of the PHY intr for stuff like link state</div><div class='del'>-		change and auto- negotiation to finally work properly. (uzi)</div><div class='del'>-</div><div class='del'>-		* One-liner removal of a duplicate declaration of</div><div class='del'>-		netdev_error(). (uzi)</div><div class='del'>-</div><div class='del'>-	Version 1.0.7: (Manfred Spraul)</div><div class='del'>-		* pci dma</div><div class='del'>-		* SMP locking update</div><div class='del'>-		* full reset added into tx_timeout</div><div class='del'>-		* correct multicast hash generation (both big and little endian)</div><div class='del'>-			[copied from a natsemi driver version</div><div class='del'>-			 from Myrio Corporation, Greg Smith]</div><div class='del'>-		* suspend/resume</div><div class='del'>-</div><div class='del'>-	version 1.0.8 (Tim Hockin &lt;thockin@sun.com&gt;)</div><div class='del'>-		* ETHTOOL_* support</div><div class='del'>-		* Wake on lan support (Erik Gilling)</div><div class='del'>-		* MXDMA fixes for serverworks</div><div class='del'>-		* EEPROM reload</div><div class='del'>-</div><div class='del'>-	version 1.0.9 (Manfred Spraul)</div><div class='del'>-		* Main change: fix lack of synchronize</div><div class='del'>-		netif_close/netif_suspend against a last interrupt</div><div class='del'>-		or packet.</div><div class='del'>-		* do not enable superflous interrupts (e.g. the</div><div class='del'>-		drivers relies on TxDone - TxIntr not needed)</div><div class='del'>-		* wait that the hardware has really stopped in close</div><div class='del'>-		and suspend.</div><div class='del'>-		* workaround for the (at least) gcc-2.95.1 compiler</div><div class='del'>-		problem. Also simplifies the code a bit.</div><div class='del'>-		* disable_irq() in tx_timeout - needed to protect</div><div class='del'>-		against rx interrupts.</div><div class='del'>-		* stop the nic before switching into silent rx mode</div><div class='del'>-		for wol (required according to docu).</div><div class='del'>-</div><div class='del'>-	version 1.0.10:</div><div class='del'>-		* use long for ee_addr (various)</div><div class='del'>-		* print pointers properly (DaveM)</div><div class='del'>-		* include asm/irq.h (?)</div><div class='del'>-</div><div class='del'>-	version 1.0.11:</div><div class='del'>-		* check and reset if PHY errors appear (Adrian Sun)</div><div class='del'>-		* WoL cleanup (Tim Hockin)</div><div class='del'>-		* Magic number cleanup (Tim Hockin)</div><div class='del'>-		* Don't reload EEPROM on every reset (Tim Hockin)</div><div class='del'>-		* Save and restore EEPROM state across reset (Tim Hockin)</div><div class='del'>-		* MDIO Cleanup (Tim Hockin)</div><div class='del'>-		* Reformat register offsets/bits (jgarzik)</div><div class='del'>-</div><div class='del'>-	version 1.0.12:</div><div class='del'>-		* ETHTOOL_* further support (Tim Hockin)</div><div class='del'>-</div><div class='del'>-	version 1.0.13:</div><div class='del'>-		* ETHTOOL_[G]EEPROM support (Tim Hockin)</div><div class='del'>-</div><div class='del'>-	version 1.0.13:</div><div class='del'>-		* crc cleanup (Matt Domsch &lt;Matt_Domsch@dell.com&gt;)</div><div class='del'>-</div><div class='del'>-	version 1.0.14:</div><div class='del'>-		* Cleanup some messages and autoneg in ethtool (Tim Hockin)</div><div class='del'>-</div><div class='del'>-	version 1.0.15:</div><div class='del'>-		* Get rid of cable_magic flag</div><div class='del'>-		* use new (National provided) solution for cable magic issue</div><div class='del'>-</div><div class='del'>-	version 1.0.16:</div><div class='del'>-		* call netdev_rx() for RxErrors (Manfred Spraul)</div><div class='del'>-		* formatting and cleanups</div><div class='del'>-		* change options and full_duplex arrays to be zero</div><div class='del'>-		  initialized</div><div class='del'>-		* enable only the WoL and PHY interrupts in wol mode</div><div class='del'>-</div><div class='del'>-	version 1.0.17:</div><div class='del'>-		* only do cable_magic on 83815 and early 83816 (Tim Hockin)</div><div class='del'>-		* create a function for rx refill (Manfred Spraul)</div><div class='del'>-		* combine drain_ring and init_ring (Manfred Spraul)</div><div class='del'>-		* oom handling (Manfred Spraul)</div><div class='del'>-		* hands_off instead of playing with netif_device_{de,a}ttach</div><div class='del'>-		  (Manfred Spraul)</div><div class='del'>-		* be sure to write the MAC back to the chip (Manfred Spraul)</div><div class='del'>-		* lengthen EEPROM timeout, and always warn about timeouts</div><div class='del'>-		  (Manfred Spraul)</div><div class='del'>-		* comments update (Manfred)</div><div class='del'>-		* do the right thing on a phy-reset (Manfred and Tim)</div><div class='del'>-</div><div class='ctx'> 	TODO:</div><div class='ctx'> 	* big endian support with CFG:BEM instead of cpu_to_le32</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -166,8 +54,8 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"natsemi"</div><div class='del'>-#define DRV_VERSION	"1.07+LK1.0.17"</div><div class='del'>-#define DRV_RELDATE	"Sep 27, 2002"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='add'>+#define DRV_RELDATE	"June 27, 2006"</div><div class='ctx'> </div><div class='ctx'> #define RX_OFFSET	2</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +114,6 @@ static int full_duplex[MAX_UNITS];</div><div class='ctx'> 				 NATSEMI_PG1_NREGS)</div><div class='ctx'> #define NATSEMI_REGS_VER	1 /* v1 added RFDR registers */</div><div class='ctx'> #define NATSEMI_REGS_SIZE	(NATSEMI_NREGS * sizeof(u32))</div><div class='del'>-#define NATSEMI_DEF_EEPROM_SIZE	24 /* 12 16-bit values */</div><div class='ctx'> </div><div class='ctx'> /* Buffer sizes:</div><div class='ctx'>  * The nic writes 32-bit values, even if the upper bytes of</div><div class='hunk'>@@ -318,12 +205,12 @@ performance critical codepaths:</div><div class='ctx'> The rx process only runs in the interrupt handler. Access from outside</div><div class='ctx'> the interrupt handler is only permitted after disable_irq().</div><div class='ctx'> </div><div class='del'>-The rx process usually runs under the dev-&gt;xmit_lock. If np-&gt;intr_tx_reap</div><div class='add'>+The rx process usually runs under the netif_tx_lock. If np-&gt;intr_tx_reap</div><div class='ctx'> is set, then access is permitted under spin_lock_irq(&amp;np-&gt;lock).</div><div class='ctx'> </div><div class='ctx'> Thus configuration functions that want to access everything must call</div><div class='ctx'> 	disable_irq(dev-&gt;irq);</div><div class='del'>-	spin_lock_bh(dev-&gt;xmit_lock);</div><div class='add'>+	netif_tx_lock_bh(dev);</div><div class='ctx'> 	spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> IV. Notes</div><div class='hunk'>@@ -344,18 +231,6 @@ None characterised.</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-enum pcistuff {</div><div class='del'>-	PCI_USES_IO = 0x01,</div><div class='del'>-	PCI_USES_MEM = 0x02,</div><div class='del'>-	PCI_USES_MASTER = 0x04,</div><div class='del'>-	PCI_ADDR0 = 0x08,</div><div class='del'>-	PCI_ADDR1 = 0x10,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* MMIO operations required */</div><div class='del'>-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Support for fibre connections on Am79C874:</div><div class='ctx'>  * This phy needs a special setup when connected to a fibre cable.</div><div class='hunk'>@@ -363,22 +238,25 @@ enum pcistuff {</div><div class='ctx'>  */</div><div class='ctx'> #define PHYID_AM79C874	0x0022561b</div><div class='ctx'> </div><div class='del'>-#define MII_MCTRL	0x15	/* mode control register */</div><div class='del'>-#define MII_FX_SEL	0x0001	/* 100BASE-FX (fiber) */</div><div class='del'>-#define MII_EN_SCRM	0x0004	/* enable scrambler (tp) */</div><div class='add'>+enum {</div><div class='add'>+	MII_MCTRL	= 0x15,		/* mode control register */</div><div class='add'>+	MII_FX_SEL	= 0x0001,	/* 100BASE-FX (fiber) */</div><div class='add'>+	MII_EN_SCRM	= 0x0004,	/* enable scrambler (tp) */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'>  </div><div class='ctx'> /* array of board data directly indexed by pci_tbl[x].driver_data */</div><div class='ctx'> static const struct {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	unsigned int eeprom_size;</div><div class='ctx'> } natsemi_pci_info[] __devinitdata = {</div><div class='del'>-	{ "NatSemi DP8381[56]", PCI_IOTYPE },</div><div class='add'>+	{ "NatSemi DP8381[56]", 0, 24 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id natsemi_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_83815, PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ 0, },</div><div class='add'>+static const struct pci_device_id natsemi_pci_tbl[] __devinitdata = {</div><div class='add'>+	{ PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='add'>+	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);</div><div class='ctx'> </div><div class='hunk'>@@ -813,6 +691,42 @@ static void move_int_phy(struct net_device *dev, int addr)</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __devinit natsemi_init_media (struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_private *np = netdev_priv(dev);</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	/* get the initial settings from hardware */</div><div class='add'>+	tmp            = mdio_read(dev, MII_BMCR);</div><div class='add'>+	np-&gt;speed      = (tmp &amp; BMCR_SPEED100)? SPEED_100     : SPEED_10;</div><div class='add'>+	np-&gt;duplex     = (tmp &amp; BMCR_FULLDPLX)? DUPLEX_FULL   : DUPLEX_HALF;</div><div class='add'>+	np-&gt;autoneg    = (tmp &amp; BMCR_ANENABLE)? AUTONEG_ENABLE: AUTONEG_DISABLE;</div><div class='add'>+	np-&gt;advertising= mdio_read(dev, MII_ADVERTISE);</div><div class='add'>+</div><div class='add'>+	if ((np-&gt;advertising &amp; ADVERTISE_ALL) != ADVERTISE_ALL</div><div class='add'>+	 &amp;&amp; netif_msg_probe(np)) {</div><div class='add'>+		printk(KERN_INFO "natsemi %s: Transceiver default autonegotiation %s "</div><div class='add'>+			"10%s %s duplex.\n",</div><div class='add'>+			pci_name(np-&gt;pci_dev),</div><div class='add'>+			(mdio_read(dev, MII_BMCR) &amp; BMCR_ANENABLE)?</div><div class='add'>+			  "enabled, advertise" : "disabled, force",</div><div class='add'>+			(np-&gt;advertising &amp;</div><div class='add'>+			  (ADVERTISE_100FULL|ADVERTISE_100HALF))?</div><div class='add'>+			    "0" : "",</div><div class='add'>+			(np-&gt;advertising &amp;</div><div class='add'>+			  (ADVERTISE_100FULL|ADVERTISE_10FULL))?</div><div class='add'>+			    "full" : "half");</div><div class='add'>+	}</div><div class='add'>+	if (netif_msg_probe(np))</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+			"natsemi %s: Transceiver status %#04x advertising %#04x.\n",</div><div class='add'>+			pci_name(np-&gt;pci_dev), mdio_read(dev, MII_BMSR),</div><div class='add'>+			np-&gt;advertising);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __devinit natsemi_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 	const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='hunk'>@@ -852,8 +766,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 	iosize = pci_resource_len(pdev, pcibar);</div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	if (natsemi_pci_info[chip_idx].flags &amp; PCI_USES_MASTER)</div><div class='del'>-		pci_set_master(pdev);</div><div class='add'>+	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof (struct netdev_private));</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -892,7 +805,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 	np-&gt;msg_enable = (debug &gt;= 0) ? (1&lt;&lt;debug)-1 : NATSEMI_DEF_MSG;</div><div class='ctx'> 	np-&gt;hands_off = 0;</div><div class='ctx'> 	np-&gt;intr_status = 0;</div><div class='del'>-	np-&gt;eeprom_size = NATSEMI_DEF_EEPROM_SIZE;</div><div class='add'>+	np-&gt;eeprom_size = natsemi_pci_info[chip_idx].eeprom_size;</div><div class='ctx'> </div><div class='ctx'> 	/* Initial port:</div><div class='ctx'> 	 * - If the nic was configured to use an external phy and if find_mii</div><div class='hunk'>@@ -957,34 +870,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 	if (mtu)</div><div class='ctx'> 		dev-&gt;mtu = mtu;</div><div class='ctx'> </div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	/* get the initial settings from hardware */</div><div class='del'>-	tmp            = mdio_read(dev, MII_BMCR);</div><div class='del'>-	np-&gt;speed      = (tmp &amp; BMCR_SPEED100)? SPEED_100     : SPEED_10;</div><div class='del'>-	np-&gt;duplex     = (tmp &amp; BMCR_FULLDPLX)? DUPLEX_FULL   : DUPLEX_HALF;</div><div class='del'>-	np-&gt;autoneg    = (tmp &amp; BMCR_ANENABLE)? AUTONEG_ENABLE: AUTONEG_DISABLE;</div><div class='del'>-	np-&gt;advertising= mdio_read(dev, MII_ADVERTISE);</div><div class='del'>-</div><div class='del'>-	if ((np-&gt;advertising &amp; ADVERTISE_ALL) != ADVERTISE_ALL</div><div class='del'>-	 &amp;&amp; netif_msg_probe(np)) {</div><div class='del'>-		printk(KERN_INFO "natsemi %s: Transceiver default autonegotiation %s "</div><div class='del'>-			"10%s %s duplex.\n",</div><div class='del'>-			pci_name(np-&gt;pci_dev),</div><div class='del'>-			(mdio_read(dev, MII_BMCR) &amp; BMCR_ANENABLE)?</div><div class='del'>-			  "enabled, advertise" : "disabled, force",</div><div class='del'>-			(np-&gt;advertising &amp;</div><div class='del'>-			  (ADVERTISE_100FULL|ADVERTISE_100HALF))?</div><div class='del'>-			    "0" : "",</div><div class='del'>-			(np-&gt;advertising &amp;</div><div class='del'>-			  (ADVERTISE_100FULL|ADVERTISE_10FULL))?</div><div class='del'>-			    "full" : "half");</div><div class='del'>-	}</div><div class='del'>-	if (netif_msg_probe(np))</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-			"natsemi %s: Transceiver status %#04x advertising %#04x.\n",</div><div class='del'>-			pci_name(np-&gt;pci_dev), mdio_read(dev, MII_BMSR),</div><div class='del'>-			np-&gt;advertising);</div><div class='add'>+	natsemi_init_media(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* save the silicon revision for later querying */</div><div class='ctx'> 	np-&gt;srr = readl(ioaddr + SiliconRev);</div><div class='hunk'>@@ -1577,7 +1463,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 	/* Reset the chip, just in case. */</div><div class='ctx'> 	natsemi_reset(dev);</div><div class='ctx'> </div><div class='del'>-	i = request_irq(dev-&gt;irq, &amp;intr_handler, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq(dev-&gt;irq, &amp;intr_handler, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i) return i;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_ifup(np))</div><div class='head'>diff --git a/drivers/net/ne.c b/drivers/net/ne.c<br/>index b32765215f75..963a11fa9fe2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ne.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ne.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ne.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ne.c</a></div><div class='hunk'>@@ -829,7 +829,7 @@ that the ne2k probe is the last 8390 based probe to take place (as it</div><div class='ctx'> is at boot) and so the probe will get confused by any other 8390 cards.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended anyway. */</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c<br/>index 2aa7b77f84f8..eebf5f02b476 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ne2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ne2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ne2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ne2.c</a></div><div class='hunk'>@@ -780,7 +780,7 @@ MODULE_PARM_DESC(bad, "(ignored)");</div><div class='ctx'> </div><div class='ctx'> /* Module code fixed by David Weinehall */</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='head'>diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c<br/>index ced9fdb8335c..34bdba9eec79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ne2k-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ne2k-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ne2k-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ne2k-pci.c</a></div><div class='hunk'>@@ -231,12 +231,12 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	if (!ioaddr || ((pci_resource_flags (pdev, 0) &amp; IORESOURCE_IO) == 0)) {</div><div class='del'>-		printk (KERN_ERR PFX "no I/O resource at PCI BAR #0\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no I/O resource at PCI BAR #0\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) {</div><div class='del'>-		printk (KERN_ERR PFX "I/O resource 0x%x @ 0x%lx busy\n",</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "I/O resource 0x%x @ 0x%lx busy\n",</div><div class='ctx'> 			NE_IO_EXTENT, ioaddr);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -263,7 +263,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	/* Allocate net_device, dev-&gt;priv; fill in 8390 specific dev fields. */</div><div class='ctx'> 	dev = alloc_ei_netdev();</div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		printk (KERN_ERR PFX "cannot allocate ethernet device\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot allocate ethernet device\n");</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='hunk'>@@ -281,7 +281,8 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		while ((inb(ioaddr + EN0_ISR) &amp; ENISR_RESET) == 0)</div><div class='ctx'> 			/* Limit wait: '2' avoids jiffy roll-over. */</div><div class='ctx'> 			if (jiffies - reset_start_time &gt; 2) {</div><div class='del'>-				printk(KERN_ERR PFX "Card failure (no reset ack).\n");</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+					"Card failure (no reset ack).\n");</div><div class='ctx'> 				goto err_out_free_netdev;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -420,7 +421,7 @@ static int ne2k_pci_set_fdx(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int ne2k_pci_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret = request_irq(dev-&gt;irq, ei_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	int ret = request_irq(dev-&gt;irq, ei_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c<br/>index 66e74f740261..bf58db29e2ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/netconsole.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/netconsole.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netconsole.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/netconsole.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ static int init_netconsole(void)</div><div class='ctx'> </div><div class='ctx'> 	if(!configured) {</div><div class='ctx'> 		printk("netconsole: not configured, aborting\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if(netpoll_setup(&amp;np))</div><div class='head'>diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c<br/>new file mode 100644<br/>index 000000000000..b1311ae82675<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/netx-eth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/netx-eth.c</a></div><div class='hunk'>@@ -0,0 +1,516 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/net/netx-eth.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+#include &lt;asm/arch/pfifo.h&gt;</div><div class='add'>+#include &lt;asm/arch/xc.h&gt;</div><div class='add'>+#include &lt;asm/arch/eth.h&gt;</div><div class='add'>+</div><div class='add'>+/* XC Fifo Offsets */</div><div class='add'>+#define EMPTY_PTR_FIFO(xcno)    (0 + ((xcno) &lt;&lt; 3))	/* Index of the empty pointer FIFO */</div><div class='add'>+#define IND_FIFO_PORT_HI(xcno)  (1 + ((xcno) &lt;&lt; 3))	/* Index of the FIFO where received */</div><div class='add'>+							/* Data packages are indicated by XC */</div><div class='add'>+#define IND_FIFO_PORT_LO(xcno)  (2 + ((xcno) &lt;&lt; 3))	/* Index of the FIFO where received */</div><div class='add'>+							/* Data packages are indicated by XC */</div><div class='add'>+#define REQ_FIFO_PORT_HI(xcno)  (3 + ((xcno) &lt;&lt; 3))	/* Index of the FIFO where Data packages */</div><div class='add'>+							/* have to be indicated by ARM which */</div><div class='add'>+							/* shall be sent */</div><div class='add'>+#define REQ_FIFO_PORT_LO(xcno)  (4 + ((xcno) &lt;&lt; 3))	/* Index of the FIFO where Data packages */</div><div class='add'>+							/* have to be indicated by ARM which shall */</div><div class='add'>+							/* be sent */</div><div class='add'>+#define CON_FIFO_PORT_HI(xcno)  (5 + ((xcno) &lt;&lt; 3))	/* Index of the FIFO where sent Data packages */</div><div class='add'>+							/* are confirmed */</div><div class='add'>+#define CON_FIFO_PORT_LO(xcno)  (6 + ((xcno) &lt;&lt; 3))	/* Index of the FIFO where sent Data */</div><div class='add'>+							/* packages are confirmed */</div><div class='add'>+#define PFIFO_MASK(xcno)        (0x7f &lt;&lt; (xcno*8))</div><div class='add'>+</div><div class='add'>+#define FIFO_PTR_FRAMELEN_SHIFT 0</div><div class='add'>+#define FIFO_PTR_FRAMELEN_MASK  (0x7ff &lt;&lt; 0)</div><div class='add'>+#define FIFO_PTR_FRAMELEN(len)  (((len) &lt;&lt; 0) &amp; FIFO_PTR_FRAMELEN_MASK)</div><div class='add'>+#define FIFO_PTR_TIMETRIG       (1&lt;&lt;11)</div><div class='add'>+#define FIFO_PTR_MULTI_REQ</div><div class='add'>+#define FIFO_PTR_ORIGIN         (1&lt;&lt;14)</div><div class='add'>+#define FIFO_PTR_VLAN           (1&lt;&lt;15)</div><div class='add'>+#define FIFO_PTR_FRAMENO_SHIFT  16</div><div class='add'>+#define FIFO_PTR_FRAMENO_MASK   (0x3f &lt;&lt; 16)</div><div class='add'>+#define FIFO_PTR_FRAMENO(no)    (((no) &lt;&lt; 16) &amp; FIFO_PTR_FRAMENO_MASK)</div><div class='add'>+#define FIFO_PTR_SEGMENT_SHIFT  22</div><div class='add'>+#define FIFO_PTR_SEGMENT_MASK   (0xf &lt;&lt; 22)</div><div class='add'>+#define FIFO_PTR_SEGMENT(seg)   (((seg) &amp; 0xf) &lt;&lt; 22)</div><div class='add'>+#define FIFO_PTR_ERROR_SHIFT    28</div><div class='add'>+#define FIFO_PTR_ERROR_MASK     (0xf &lt;&lt; 28)</div><div class='add'>+</div><div class='add'>+#define ISR_LINK_STATUS_CHANGE (1&lt;&lt;4)</div><div class='add'>+#define ISR_IND_LO             (1&lt;&lt;3)</div><div class='add'>+#define ISR_CON_LO             (1&lt;&lt;2)</div><div class='add'>+#define ISR_IND_HI             (1&lt;&lt;1)</div><div class='add'>+#define ISR_CON_HI             (1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+#define ETH_MAC_LOCAL_CONFIG 0x1560</div><div class='add'>+#define ETH_MAC_4321         0x1564</div><div class='add'>+#define ETH_MAC_65           0x1568</div><div class='add'>+</div><div class='add'>+#define MAC_TRAFFIC_CLASS_ARRANGEMENT_SHIFT 16</div><div class='add'>+#define MAC_TRAFFIC_CLASS_ARRANGEMENT_MASK (0xf&lt;&lt;MAC_TRAFFIC_CLASS_ARRANGEMENT_SHIFT)</div><div class='add'>+#define MAC_TRAFFIC_CLASS_ARRANGEMENT(x) (((x)&lt;&lt;MAC_TRAFFIC_CLASS_ARRANGEMENT_SHIFT) &amp; MAC_TRAFFIC_CLASS_ARRANGEMENT_MASK)</div><div class='add'>+#define LOCAL_CONFIG_LINK_STATUS_IRQ_EN (1&lt;&lt;24)</div><div class='add'>+#define LOCAL_CONFIG_CON_LO_IRQ_EN (1&lt;&lt;23)</div><div class='add'>+#define LOCAL_CONFIG_CON_HI_IRQ_EN (1&lt;&lt;22)</div><div class='add'>+#define LOCAL_CONFIG_IND_LO_IRQ_EN (1&lt;&lt;21)</div><div class='add'>+#define LOCAL_CONFIG_IND_HI_IRQ_EN (1&lt;&lt;20)</div><div class='add'>+</div><div class='add'>+#define CARDNAME "netx-eth"</div><div class='add'>+</div><div class='add'>+/* LSB must be zero */</div><div class='add'>+#define INTERNAL_PHY_ADR 0x1c</div><div class='add'>+</div><div class='add'>+struct netx_eth_priv {</div><div class='add'>+	void                    __iomem *sram_base, *xpec_base, *xmac_base;</div><div class='add'>+	int                     id;</div><div class='add'>+	struct net_device_stats stats;</div><div class='add'>+	struct mii_if_info      mii;</div><div class='add'>+	u32                     msg_enable;</div><div class='add'>+	struct xc               *xc;</div><div class='add'>+	spinlock_t              lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void netx_eth_set_multicast_list(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	/* implement me */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netx_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+	unsigned char *buf = skb-&gt;data;</div><div class='add'>+	unsigned int len = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='add'>+	memcpy_toio(priv-&gt;sram_base + 1560, (void *)buf, len);</div><div class='add'>+	if (len &lt; 60) {</div><div class='add'>+		memset_io(priv-&gt;sram_base + 1560 + len, 0, 60 - len);</div><div class='add'>+		len = 60;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pfifo_push(REQ_FIFO_PORT_LO(priv-&gt;id),</div><div class='add'>+	           FIFO_PTR_SEGMENT(priv-&gt;id) |</div><div class='add'>+	           FIFO_PTR_FRAMENO(1) |</div><div class='add'>+	           FIFO_PTR_FRAMELEN(len));</div><div class='add'>+</div><div class='add'>+	ndev-&gt;trans_start = jiffies;</div><div class='add'>+	priv-&gt;stats.tx_packets++;</div><div class='add'>+	priv-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_eth_receive(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+	unsigned int val, frameno, seg, len;</div><div class='add'>+	unsigned char *data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	val = pfifo_pop(IND_FIFO_PORT_LO(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+	frameno = (val &amp; FIFO_PTR_FRAMENO_MASK) &gt;&gt; FIFO_PTR_FRAMENO_SHIFT;</div><div class='add'>+	seg = (val &amp; FIFO_PTR_SEGMENT_MASK) &gt;&gt; FIFO_PTR_SEGMENT_SHIFT;</div><div class='add'>+	len = (val &amp; FIFO_PTR_FRAMELEN_MASK) &gt;&gt; FIFO_PTR_FRAMELEN_SHIFT;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(len);</div><div class='add'>+	if (unlikely(skb == NULL)) {</div><div class='add'>+		printk(KERN_NOTICE "%s: Low memory, packet dropped.\n",</div><div class='add'>+			ndev-&gt;name);</div><div class='add'>+		priv-&gt;stats.rx_dropped++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+	memcpy_fromio(data, priv-&gt;sram_base + frameno * 1560, len);</div><div class='add'>+</div><div class='add'>+	pfifo_push(EMPTY_PTR_FIFO(priv-&gt;id),</div><div class='add'>+		FIFO_PTR_SEGMENT(seg) | FIFO_PTR_FRAMENO(frameno));</div><div class='add'>+</div><div class='add'>+	ndev-&gt;last_rx = jiffies;</div><div class='add'>+	skb-&gt;dev = ndev;</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+	priv-&gt;stats.rx_packets++;</div><div class='add'>+	priv-&gt;stats.rx_bytes += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t</div><div class='add'>+netx_eth_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_id;</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int status;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	status = readl(NETX_PFIFO_XPEC_ISR(priv-&gt;id));</div><div class='add'>+	while (status) {</div><div class='add'>+		int fill_level;</div><div class='add'>+		writel(status, NETX_PFIFO_XPEC_ISR(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+		if ((status &amp; ISR_CON_HI) || (status &amp; ISR_IND_HI))</div><div class='add'>+			printk("%s: unexpected status: 0x%08x\n",</div><div class='add'>+			    __FUNCTION__, status);</div><div class='add'>+</div><div class='add'>+		fill_level =</div><div class='add'>+		    readl(NETX_PFIFO_FILL_LEVEL(IND_FIFO_PORT_LO(priv-&gt;id)));</div><div class='add'>+		while (fill_level--)</div><div class='add'>+			netx_eth_receive(ndev);</div><div class='add'>+</div><div class='add'>+		if (status &amp; ISR_CON_LO)</div><div class='add'>+			netif_wake_queue(ndev);</div><div class='add'>+</div><div class='add'>+		if (status &amp; ISR_LINK_STATUS_CHANGE)</div><div class='add'>+			mii_check_media(&amp;priv-&gt;mii, netif_msg_link(priv), 1);</div><div class='add'>+</div><div class='add'>+		status = readl(NETX_PFIFO_XPEC_ISR(priv-&gt;id));</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *netx_eth_query_statistics(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+	return &amp;priv-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (request_irq</div><div class='add'>+	    (ndev-&gt;irq, &amp;netx_eth_interrupt, IRQF_SHARED, ndev-&gt;name, ndev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	writel(ndev-&gt;dev_addr[0] |</div><div class='add'>+	       ndev-&gt;dev_addr[1]&lt;&lt;8 |</div><div class='add'>+	       ndev-&gt;dev_addr[2]&lt;&lt;16 |</div><div class='add'>+	       ndev-&gt;dev_addr[3]&lt;&lt;24,</div><div class='add'>+	       priv-&gt;xpec_base + NETX_XPEC_RAM_START_OFS + ETH_MAC_4321);</div><div class='add'>+	writel(ndev-&gt;dev_addr[4] |</div><div class='add'>+	       ndev-&gt;dev_addr[5]&lt;&lt;8,</div><div class='add'>+	       priv-&gt;xpec_base + NETX_XPEC_RAM_START_OFS + ETH_MAC_65);</div><div class='add'>+</div><div class='add'>+	writel(LOCAL_CONFIG_LINK_STATUS_IRQ_EN |</div><div class='add'>+		LOCAL_CONFIG_CON_LO_IRQ_EN |</div><div class='add'>+		LOCAL_CONFIG_CON_HI_IRQ_EN |</div><div class='add'>+		LOCAL_CONFIG_IND_LO_IRQ_EN |</div><div class='add'>+		LOCAL_CONFIG_IND_HI_IRQ_EN,</div><div class='add'>+		priv-&gt;xpec_base + NETX_XPEC_RAM_START_OFS +</div><div class='add'>+		ETH_MAC_LOCAL_CONFIG);</div><div class='add'>+</div><div class='add'>+	mii_check_media(&amp;priv-&gt;mii, netif_msg_link(priv), 1);</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_close(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	writel(0,</div><div class='add'>+	    priv-&gt;xpec_base + NETX_XPEC_RAM_START_OFS + ETH_MAC_LOCAL_CONFIG);</div><div class='add'>+</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_eth_timeout(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	printk(KERN_ERR "%s: transmit timed out, resetting\n", ndev-&gt;name);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	xc_reset(priv-&gt;xc);</div><div class='add'>+	xc_start(priv-&gt;xc);</div><div class='add'>+</div><div class='add'>+	for (i=2; i&lt;=18; i++)</div><div class='add'>+		pfifo_push(EMPTY_PTR_FIFO(priv-&gt;id),</div><div class='add'>+			FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netx_eth_phy_read(struct net_device *ndev, int phy_id, int reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = MIIMU_SNRDY | MIIMU_PREAMBLE | MIIMU_PHYADDR(phy_id) |</div><div class='add'>+	      MIIMU_REGADDR(reg) | MIIMU_PHY_NRES;</div><div class='add'>+</div><div class='add'>+	writel(val, NETX_MIIMU);</div><div class='add'>+	while (readl(NETX_MIIMU) &amp; MIIMU_SNRDY);</div><div class='add'>+</div><div class='add'>+	return readl(NETX_MIIMU) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_eth_phy_write(struct net_device *ndev, int phy_id, int reg, int value)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = MIIMU_SNRDY | MIIMU_PREAMBLE | MIIMU_PHYADDR(phy_id) |</div><div class='add'>+	      MIIMU_REGADDR(reg) | MIIMU_PHY_NRES | MIIMU_OPMODE_WRITE |</div><div class='add'>+	      MIIMU_DATA(value);</div><div class='add'>+</div><div class='add'>+	writel(val, NETX_MIIMU);</div><div class='add'>+	while (readl(NETX_MIIMU) &amp; MIIMU_SNRDY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_enable(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+	unsigned int mac4321, mac65;</div><div class='add'>+	int running, i;</div><div class='add'>+</div><div class='add'>+	ether_setup(ndev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;open = netx_eth_open;</div><div class='add'>+	ndev-&gt;stop = netx_eth_close;</div><div class='add'>+	ndev-&gt;hard_start_xmit = netx_eth_hard_start_xmit;</div><div class='add'>+	ndev-&gt;tx_timeout = netx_eth_timeout;</div><div class='add'>+	ndev-&gt;watchdog_timeo = msecs_to_jiffies(5000);</div><div class='add'>+	ndev-&gt;get_stats = netx_eth_query_statistics;</div><div class='add'>+	ndev-&gt;set_multicast_list = netx_eth_set_multicast_list;</div><div class='add'>+</div><div class='add'>+	priv-&gt;msg_enable       = NETIF_MSG_LINK;</div><div class='add'>+	priv-&gt;mii.phy_id_mask  = 0x1f;</div><div class='add'>+	priv-&gt;mii.reg_num_mask = 0x1f;</div><div class='add'>+	priv-&gt;mii.force_media  = 0;</div><div class='add'>+	priv-&gt;mii.full_duplex  = 0;</div><div class='add'>+	priv-&gt;mii.dev	     = ndev;</div><div class='add'>+	priv-&gt;mii.mdio_read    = netx_eth_phy_read;</div><div class='add'>+	priv-&gt;mii.mdio_write   = netx_eth_phy_write;</div><div class='add'>+	priv-&gt;mii.phy_id = INTERNAL_PHY_ADR + priv-&gt;id;</div><div class='add'>+</div><div class='add'>+	running = xc_running(priv-&gt;xc);</div><div class='add'>+	xc_stop(priv-&gt;xc);</div><div class='add'>+</div><div class='add'>+	/* if the xc engine is already running, assume the bootloader has</div><div class='add'>+	 * loaded the firmware for us</div><div class='add'>+	 */</div><div class='add'>+	if (running) {</div><div class='add'>+		/* get Node Address from hardware */</div><div class='add'>+		mac4321 = readl(priv-&gt;xpec_base +</div><div class='add'>+			NETX_XPEC_RAM_START_OFS + ETH_MAC_4321);</div><div class='add'>+		mac65 = readl(priv-&gt;xpec_base +</div><div class='add'>+			NETX_XPEC_RAM_START_OFS + ETH_MAC_65);</div><div class='add'>+</div><div class='add'>+		ndev-&gt;dev_addr[0] = mac4321 &amp; 0xff;</div><div class='add'>+		ndev-&gt;dev_addr[1] = (mac4321 &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		ndev-&gt;dev_addr[2] = (mac4321 &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		ndev-&gt;dev_addr[3] = (mac4321 &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		ndev-&gt;dev_addr[4] = mac65 &amp; 0xff;</div><div class='add'>+		ndev-&gt;dev_addr[5] = (mac65 &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	} else {</div><div class='add'>+		if (xc_request_firmware(priv-&gt;xc)) {</div><div class='add'>+			printk(CARDNAME ": requesting firmware failed\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xc_reset(priv-&gt;xc);</div><div class='add'>+	xc_start(priv-&gt;xc);</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='add'>+		printk("%s: Invalid ethernet MAC address.  Please "</div><div class='add'>+		       "set using ifconfig\n", ndev-&gt;name);</div><div class='add'>+</div><div class='add'>+	for (i=2; i&lt;=18; i++)</div><div class='add'>+		pfifo_push(EMPTY_PTR_FIFO(priv-&gt;id),</div><div class='add'>+			FIFO_PTR_FRAMENO(i) | FIFO_PTR_SEGMENT(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+	return register_netdev(ndev);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_drv_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct netx_eth_priv *priv;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct netxeth_platform_data *pdata;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_etherdev(sizeof (struct netx_eth_priv));</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		printk("%s: could not allocate device.\n", CARDNAME);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	SET_MODULE_OWNER(ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	pdata = (struct netxeth_platform_data *)pdev-&gt;dev.platform_data;</div><div class='add'>+	priv-&gt;xc = request_xc(pdata-&gt;xcno, &amp;pdev-&gt;dev);</div><div class='add'>+	if (!priv-&gt;xc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "unable to request xc engine\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto exit_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = priv-&gt;xc-&gt;irq;</div><div class='add'>+	priv-&gt;id = pdev-&gt;id;</div><div class='add'>+	priv-&gt;xpec_base = priv-&gt;xc-&gt;xpec_base;</div><div class='add'>+	priv-&gt;xmac_base = priv-&gt;xc-&gt;xmac_base;</div><div class='add'>+	priv-&gt;sram_base = priv-&gt;xc-&gt;sram_base;</div><div class='add'>+</div><div class='add'>+	ret = pfifo_request(PFIFO_MASK(priv-&gt;id));</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk("unable to request PFIFO\n");</div><div class='add'>+		goto exit_free_xc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = netx_eth_enable(ndev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_free_pfifo;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+exit_free_pfifo:</div><div class='add'>+	pfifo_free(PFIFO_MASK(priv-&gt;id));</div><div class='add'>+exit_free_xc:</div><div class='add'>+	free_xc(priv-&gt;xc);</div><div class='add'>+exit_free_netdev:</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_drv_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct netx_eth_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(ndev);</div><div class='add'>+	xc_stop(priv-&gt;xc);</div><div class='add'>+	free_xc(priv-&gt;xc);</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+	pfifo_free(PFIFO_MASK(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_drv_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "suspend not implemented\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_eth_drv_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "resume not implemented\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver netx_eth_driver = {</div><div class='add'>+	.probe		= netx_eth_drv_probe,</div><div class='add'>+	.remove		= netx_eth_drv_remove,</div><div class='add'>+	.suspend	= netx_eth_drv_suspend,</div><div class='add'>+	.resume		= netx_eth_drv_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= CARDNAME,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init netx_eth_init(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int phy_control, val;</div><div class='add'>+</div><div class='add'>+	printk("NetX Ethernet driver\n");</div><div class='add'>+</div><div class='add'>+	phy_control = PHY_CONTROL_PHY_ADDRESS(INTERNAL_PHY_ADR&gt;&gt;1) |</div><div class='add'>+		      PHY_CONTROL_PHY1_MODE(PHY_MODE_ALL) |</div><div class='add'>+		      PHY_CONTROL_PHY1_AUTOMDIX |</div><div class='add'>+		      PHY_CONTROL_PHY1_EN |</div><div class='add'>+		      PHY_CONTROL_PHY0_MODE(PHY_MODE_ALL) |</div><div class='add'>+		      PHY_CONTROL_PHY0_AUTOMDIX |</div><div class='add'>+		      PHY_CONTROL_PHY0_EN |</div><div class='add'>+		      PHY_CONTROL_CLK_XLATIN;</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+	writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+</div><div class='add'>+	writel(phy_control | PHY_CONTROL_RESET, NETX_SYSTEM_PHY_CONTROL);</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='add'>+	val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+	writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);</div><div class='add'>+</div><div class='add'>+	writel(phy_control, NETX_SYSTEM_PHY_CONTROL);</div><div class='add'>+</div><div class='add'>+	return platform_driver_register(&amp;netx_eth_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit netx_eth_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;netx_eth_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(netx_eth_init);</div><div class='add'>+module_exit(netx_eth_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sascha Hauer, Pengutronix");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c<br/>index a68bf474f6ed..d4be207d321a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ni5010.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ni5010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ni5010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ni5010.c</a></div><div class='hunk'>@@ -1,17 +1,12 @@</div><div class='ctx'> /*	ni5010.c: A network driver for the MiCom-Interlan NI5010 ethercard.</div><div class='ctx'>  *</div><div class='del'>- *	Copyright 1996,1997 Jan-Pascal van Best and Andreas Mohr.</div><div class='add'>+ *	Copyright 1996,1997,2006 Jan-Pascal van Best and Andreas Mohr.</div><div class='ctx'>  *</div><div class='ctx'>  *	This software may be used and distributed according to the terms</div><div class='ctx'>  *	of the GNU General Public License, incorporated herein by reference.</div><div class='ctx'>  *</div><div class='ctx'>  * 	The authors may be reached as:</div><div class='del'>- *		jvbest@wi.leidenuniv.nl		a.mohr@mailto.de</div><div class='del'>- * 	or by snail mail as</div><div class='del'>- * 		Jan-Pascal van Best		Andreas Mohr</div><div class='del'>- *		Klikspaanweg 58-4		Stauferstr. 6</div><div class='del'>- *		2324 LZ  Leiden			D-71272 Renningen</div><div class='del'>- *		The Netherlands			Germany</div><div class='add'>+ *		janpascal@vanbest.org		andi@lisas.de</div><div class='ctx'>  *</div><div class='ctx'>  *	Sources:</div><div class='ctx'>  * 	 	Donald Becker's "skeleton.c"</div><div class='hunk'>@@ -27,8 +22,9 @@</div><div class='ctx'>  *	970503	v0.93: Fixed auto-irq failure on warm reboot (JB)</div><div class='ctx'>  *	970623	v1.00: First kernel version (AM)</div><div class='ctx'>  *	970814	v1.01: Added detection of onboard receive buffer size (AM)</div><div class='add'>+ *	060611	v1.02: slight cleanup: email addresses, driver modernization.</div><div class='ctx'>  *	Bugs:</div><div class='del'>- *		- None known...</div><div class='add'>+ *		- not SMP-safe (no locking of I/O accesses)</div><div class='ctx'>  *		- Note that you have to patch ifconfig for the new /proc/net/dev</div><div class='ctx'>  *		format. It gives incorrect stats otherwise.</div><div class='ctx'>  *</div><div class='hunk'>@@ -39,7 +35,7 @@</div><div class='ctx'>  *		Complete merge with Andreas' driver</div><div class='ctx'>  *		Implement ring buffers (Is this useful? You can't squeeze</div><div class='ctx'>  *			too many packet in a 2k buffer!)</div><div class='del'>- *		Implement DMA (Again, is this useful? Some docs says DMA is</div><div class='add'>+ *		Implement DMA (Again, is this useful? Some docs say DMA is</div><div class='ctx'>  *			slower than programmed I/O)</div><div class='ctx'>  *</div><div class='ctx'>  *	Compile with:</div><div class='hunk'>@@ -47,7 +43,7 @@</div><div class='ctx'>  *			-DMODULE -c ni5010.c </div><div class='ctx'>  *</div><div class='ctx'>  *	Insert with e.g.:</div><div class='del'>- *		insmod ni5010.o io=0x300 irq=5 	</div><div class='add'>+ *		insmod ni5010.ko io=0x300 irq=5</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -69,15 +65,15 @@</div><div class='ctx'> </div><div class='ctx'> #include "ni5010.h"</div><div class='ctx'> </div><div class='del'>-static const char *boardname = "NI5010";</div><div class='del'>-static char *version =</div><div class='del'>-	"ni5010.c: v1.00 06/23/97 Jan-Pascal van Best and Andreas Mohr\n";</div><div class='add'>+static const char boardname[] = "NI5010";</div><div class='add'>+static char version[] __initdata =</div><div class='add'>+	"ni5010.c: v1.02 20060611 Jan-Pascal van Best and Andreas Mohr\n";</div><div class='ctx'> 	</div><div class='ctx'> /* bufsize_rcv == 0 means autoprobing */</div><div class='ctx'> static unsigned int bufsize_rcv;</div><div class='ctx'> </div><div class='del'>-#define jumpered_interrupts	/* IRQ line jumpered on board */</div><div class='del'>-#undef jumpered_dma		/* No DMA used */</div><div class='add'>+#define JUMPERED_INTERRUPTS	/* IRQ line jumpered on board */</div><div class='add'>+#undef JUMPERED_DMA		/* No DMA used */</div><div class='ctx'> #undef FULL_IODETECT		/* Only detect in portlist */</div><div class='ctx'> </div><div class='ctx'> #ifndef FULL_IODETECT</div><div class='hunk'>@@ -281,7 +277,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> </div><div class='ctx'> 	PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev-&gt;name));</div><div class='ctx'> </div><div class='del'>-#ifdef jumpered_interrupts</div><div class='add'>+#ifdef JUMPERED_INTERRUPTS</div><div class='ctx'> 	if (dev-&gt;irq == 0xff)</div><div class='ctx'> 		;</div><div class='ctx'> 	else if (dev-&gt;irq &lt; 2) {</div><div class='hunk'>@@ -305,7 +301,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 	} else if (dev-&gt;irq == 2) {</div><div class='ctx'> 		dev-&gt;irq = 9;</div><div class='ctx'> 	}</div><div class='del'>-#endif	/* jumpered_irq */</div><div class='add'>+#endif	/* JUMPERED_INTERRUPTS */</div><div class='ctx'> 	PRINTK2((KERN_DEBUG "%s: I/O #9 passed!\n", dev-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	/* DMA is not supported (yet?), so no use detecting it */</div><div class='hunk'>@@ -334,7 +330,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'>         	outw(0, IE_GP);		/* Point GP at start of packet */</div><div class='ctx'>         	outb(0, IE_RBUF);	/* set buffer byte 0 to 0 again */</div><div class='ctx'> 	}</div><div class='del'>-        printk("// bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);</div><div class='add'>+        printk("-&gt; bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);</div><div class='ctx'> 	memset(dev-&gt;priv, 0, sizeof(struct ni5010_local));</div><div class='ctx'> 	</div><div class='ctx'> 	dev-&gt;open		= ni5010_open;</div><div class='hunk'>@@ -354,11 +350,9 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 	outb(0xff, EDLC_XCLR); 	/* Kill all pending xmt interrupts */</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: NI5010 found at 0x%x, using IRQ %d", dev-&gt;name, ioaddr, dev-&gt;irq);</div><div class='del'>-	if (dev-&gt;dma) printk(" &amp; DMA %d", dev-&gt;dma);</div><div class='add'>+	if (dev-&gt;dma)</div><div class='add'>+		printk(" &amp; DMA %d", dev-&gt;dma);</div><div class='ctx'> 	printk(".\n");</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "Join the NI5010 driver development team!\n");</div><div class='del'>-	printk(KERN_INFO "Mail to a.mohr@mailto.de or jvbest@wi.leidenuniv.nl\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='ctx'> 	release_region(dev-&gt;base_addr, NI5010_IO_EXTENT);</div><div class='hunk'>@@ -371,7 +365,7 @@ out:</div><div class='ctx'>  *</div><div class='ctx'>  * This routine should set everything up anew at each open, even</div><div class='ctx'>  * registers that "should" only need to be set once at boot, so that</div><div class='del'>- * there is non-reboot way to recover if something goes wrong.</div><div class='add'>+ * there is a non-reboot way to recover if something goes wrong.</div><div class='ctx'>  */</div><div class='ctx'>    </div><div class='ctx'> static int ni5010_open(struct net_device *dev)</div><div class='hunk'>@@ -390,13 +384,13 @@ static int ni5010_open(struct net_device *dev)</div><div class='ctx'>          * Always allocate the DMA channel after the IRQ,</div><div class='ctx'>          * and clean up on failure.</div><div class='ctx'>          */</div><div class='del'>-#ifdef jumpered_dma</div><div class='add'>+#ifdef JUMPERED_DMA</div><div class='ctx'>         if (request_dma(dev-&gt;dma, cardname)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Cannot get dma %#2x\n", dev-&gt;name, dev-&gt;dma);</div><div class='ctx'>                 free_irq(dev-&gt;irq, NULL);</div><div class='ctx'>                 return -EAGAIN;</div><div class='ctx'>         }</div><div class='del'>-#endif	/* jumpered_dma */</div><div class='add'>+#endif	/* JUMPERED_DMA */</div><div class='ctx'> </div><div class='ctx'> 	PRINTK3((KERN_DEBUG "%s: passed open() #2\n", dev-&gt;name));</div><div class='ctx'> 	/* Reset the hardware here.  Don't forget to set the station address. */</div><div class='hunk'>@@ -633,7 +627,7 @@ static int ni5010_close(struct net_device *dev)</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> </div><div class='ctx'> 	PRINTK2((KERN_DEBUG "%s: entering ni5010_close\n", dev-&gt;name));</div><div class='del'>-#ifdef jumpered_interrupts	</div><div class='add'>+#ifdef JUMPERED_INTERRUPTS</div><div class='ctx'> 	free_irq(dev-&gt;irq, NULL);</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Put card in held-RESET state */</div><div class='hunk'>@@ -771,7 +765,7 @@ module_param(irq, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(io, "ni5010 I/O base address");</div><div class='ctx'> MODULE_PARM_DESC(irq, "ni5010 IRQ number");</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+static int __init ni5010_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	PRINTK2((KERN_DEBUG "%s: entering init_module\n", boardname));</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -792,13 +786,15 @@ int init_module(void)</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void cleanup_module(void)</div><div class='add'>+static void __exit ni5010_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	PRINTK2((KERN_DEBUG "%s: entering cleanup_module\n", boardname));</div><div class='ctx'> 	unregister_netdev(dev_ni5010);</div><div class='ctx'> 	release_region(dev_ni5010-&gt;base_addr, NI5010_IO_EXTENT);</div><div class='ctx'> 	free_netdev(dev_ni5010);</div><div class='ctx'> }</div><div class='add'>+module_init(ni5010_init_module);</div><div class='add'>+module_exit(ni5010_cleanup_module);</div><div class='ctx'> #endif /* MODULE */</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c<br/>index 706aed7d717f..0e76859c90a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ns83820.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ns83820.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ns83820.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ns83820.c</a></div><div class='hunk'>@@ -96,7 +96,6 @@</div><div class='ctx'> //#define dprintk		printk</div><div class='ctx'> #define dprintk(x...)		do { } while (0)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -804,7 +803,7 @@ static int ns83820_setup_rx(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		writel(dev-&gt;IMR_cache, dev-&gt;base + IMR);</div><div class='ctx'> 		writel(1, dev-&gt;base + IER);</div><div class='del'>-		spin_unlock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+		spin_unlock(&amp;dev-&gt;misc_lock);</div><div class='ctx'> </div><div class='ctx'> 		kick_rx(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -1013,8 +1012,6 @@ static void do_tx_done(struct net_device *ndev)</div><div class='ctx'> 	struct ns83820 *dev = PRIV(ndev);</div><div class='ctx'> 	u32 cmdsts, tx_done_idx, *desc;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;dev-&gt;tx_lock);</div><div class='del'>-</div><div class='ctx'> 	dprintk("do_tx_done(%p)\n", ndev);</div><div class='ctx'> 	tx_done_idx = dev-&gt;tx_done_idx;</div><div class='ctx'> 	desc = dev-&gt;tx_descs + (tx_done_idx * DESC_SIZE);</div><div class='hunk'>@@ -1070,7 +1067,6 @@ static void do_tx_done(struct net_device *ndev)</div><div class='ctx'> 		netif_start_queue(ndev);</div><div class='ctx'> 		netif_wake_queue(ndev);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;dev-&gt;tx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ns83820_cleanup_tx(struct ns83820 *dev)</div><div class='hunk'>@@ -1282,11 +1278,13 @@ static struct ethtool_ops ops = {</div><div class='ctx'> 	.get_link = ns83820_get_link</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* this function is called in irq context from the ISR */</div><div class='ctx'> static void ns83820_mib_isr(struct ns83820 *dev)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;dev-&gt;misc_lock);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> 	ns83820_update_stats(dev);</div><div class='del'>-	spin_unlock(&amp;dev-&gt;misc_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ns83820_do_isr(struct net_device *ndev, u32 isr);</div><div class='hunk'>@@ -1308,6 +1306,8 @@ static irqreturn_t ns83820_irq(int foo, void *data, struct pt_regs *regs)</div><div class='ctx'> static void ns83820_do_isr(struct net_device *ndev, u32 isr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ns83820 *dev = PRIV(ndev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> 	if (isr &amp; ~(ISR_PHY | ISR_RXDESC | ISR_RXEARLY | ISR_RXOK | ISR_RXERR | ISR_TXIDLE | ISR_TXOK | ISR_TXDESC))</div><div class='ctx'> 		Dprintk("odd isr? 0x%08x\n", isr);</div><div class='hunk'>@@ -1322,10 +1322,10 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)</div><div class='ctx'> 	if ((ISR_RXDESC | ISR_RXOK) &amp; isr) {</div><div class='ctx'> 		prefetch(dev-&gt;rx_info.next_rx_desc);</div><div class='ctx'> </div><div class='del'>-		spin_lock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+		spin_lock_irqsave(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> 		dev-&gt;IMR_cache &amp;= ~(ISR_RXDESC | ISR_RXOK);</div><div class='ctx'> 		writel(dev-&gt;IMR_cache, dev-&gt;base + IMR);</div><div class='del'>-		spin_unlock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		tasklet_schedule(&amp;dev-&gt;rx_tasklet);</div><div class='ctx'> 		//rx_irq(ndev);</div><div class='hunk'>@@ -1371,16 +1371,18 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)</div><div class='ctx'> 	 * work has accumulated</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ISR_TXDESC | ISR_TXIDLE | ISR_TXOK | ISR_TXERR) &amp; isr) {</div><div class='add'>+		spin_lock_irqsave(&amp;dev-&gt;tx_lock, flags);</div><div class='ctx'> 		do_tx_done(ndev);</div><div class='add'>+		spin_unlock_irqrestore(&amp;dev-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* Disable TxOk if there are no outstanding tx packets.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((dev-&gt;tx_done_idx == dev-&gt;tx_free_idx) &amp;&amp;</div><div class='ctx'> 		    (dev-&gt;IMR_cache &amp; ISR_TXOK)) {</div><div class='del'>-			spin_lock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+			spin_lock_irqsave(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> 			dev-&gt;IMR_cache &amp;= ~ISR_TXOK;</div><div class='ctx'> 			writel(dev-&gt;IMR_cache, dev-&gt;base + IMR);</div><div class='del'>-			spin_unlock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+			spin_unlock_irqrestore(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1391,10 +1393,10 @@ static void ns83820_do_isr(struct net_device *ndev, u32 isr)</div><div class='ctx'> 	 * nature are expected, we must enable TxOk.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((ISR_TXIDLE &amp; isr) &amp;&amp; (dev-&gt;tx_done_idx != dev-&gt;tx_free_idx)) {</div><div class='del'>-		spin_lock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+		spin_lock_irqsave(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> 		dev-&gt;IMR_cache |= ISR_TXOK;</div><div class='ctx'> 		writel(dev-&gt;IMR_cache, dev-&gt;base + IMR);</div><div class='del'>-		spin_unlock_irq(&amp;dev-&gt;misc_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;dev-&gt;misc_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MIB interrupt: one of the statistics counters is about to overflow */</div><div class='hunk'>@@ -1456,7 +1458,7 @@ static void ns83820_tx_timeout(struct net_device *ndev)</div><div class='ctx'>         u32 tx_done_idx, *desc;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	local_irq_save(flags);</div><div class='add'>+	spin_lock_irqsave(&amp;dev-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	tx_done_idx = dev-&gt;tx_done_idx;</div><div class='ctx'> 	desc = dev-&gt;tx_descs + (tx_done_idx * DESC_SIZE);</div><div class='hunk'>@@ -1483,7 +1485,7 @@ static void ns83820_tx_timeout(struct net_device *ndev)</div><div class='ctx'> 		ndev-&gt;name,</div><div class='ctx'> 		tx_done_idx, dev-&gt;tx_free_idx, le32_to_cpu(desc[DESC_CMDSTS]));</div><div class='ctx'> </div><div class='del'>-	local_irq_restore(flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;dev-&gt;tx_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ns83820_tx_watch(unsigned long data)</div><div class='hunk'>@@ -1833,7 +1835,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_</div><div class='ctx'> 	} else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {</div><div class='ctx'> 		using_dac = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_WARNING "ns83820.c: pci_set_dma_mask failed!\n");</div><div class='add'>+		dev_warn(&amp;pci_dev-&gt;dev, "pci_set_dma_mask failed!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1856,7 +1858,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pci_dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_INFO "ns83820: pci_enable_dev failed: %d\n", err);</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev, "pci_enable_dev failed: %d\n", err);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1882,11 +1884,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;IMR_cache = 0;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pci_dev-&gt;irq, ns83820_irq, SA_SHIRQ,</div><div class='add'>+	err = request_irq(pci_dev-&gt;irq, ns83820_irq, IRQF_SHARED,</div><div class='ctx'> 			  DRV_NAME, ndev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_INFO "ns83820: unable to register irq %d\n",</div><div class='del'>-			pci_dev-&gt;irq);</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev, "unable to register irq %d, err %d\n",</div><div class='add'>+			pci_dev-&gt;irq, err);</div><div class='ctx'> 		goto out_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1900,7 +1902,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	err = dev_alloc_name(ndev, ndev-&gt;name);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "ns83820: unable to get netdev name: %d\n", err);</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev, "unable to get netdev name: %d\n", err);</div><div class='ctx'> 		goto out_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c<br/>index a7bb54df75a8..e0e293964042 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pci-skeleton.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pci-skeleton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pci-skeleton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pci-skeleton.c</a></div><div class='hunk'>@@ -85,7 +85,6 @@ IVc. Errata</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -602,7 +601,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,</div><div class='ctx'> 	/* dev zeroed in alloc_etherdev */</div><div class='ctx'> 	dev = alloc_etherdev (sizeof (*tp));</div><div class='ctx'> 	if (dev == NULL) {</div><div class='del'>-		printk (KERN_ERR PFX "unable to alloc new ethernet\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "unable to alloc new ethernet\n");</div><div class='ctx'> 		DPRINTK ("EXIT, returning -ENOMEM\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -632,14 +631,14 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* make sure PCI base addr 0 is PIO */</div><div class='ctx'> 	if (!(pio_flags &amp; IORESOURCE_IO)) {</div><div class='del'>-		printk (KERN_ERR PFX "region #0 not a PIO resource, aborting\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "region #0 not a PIO resource, aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* make sure PCI base addr 1 is MMIO */</div><div class='ctx'> 	if (!(mmio_flags &amp; IORESOURCE_MEM)) {</div><div class='del'>-		printk (KERN_ERR PFX "region #1 not an MMIO resource, aborting\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "region #1 not an MMIO resource, aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -647,12 +646,12 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,</div><div class='ctx'> 	/* check for weird/broken PCI region reporting */</div><div class='ctx'> 	if ((pio_len &lt; NETDRV_MIN_IO_SIZE) ||</div><div class='ctx'> 	    (mmio_len &lt; NETDRV_MIN_IO_SIZE)) {</div><div class='del'>-		printk (KERN_ERR PFX "Invalid PCI region size(s), aborting\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid PCI region size(s), aborting\n");</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = pci_request_regions (pdev, "pci-skeleton");</div><div class='add'>+	rc = pci_request_regions (pdev, MODNAME);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +663,7 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,</div><div class='ctx'> 	/* ioremap MMIO region */</div><div class='ctx'> 	ioaddr = ioremap (mmio_start, mmio_len);</div><div class='ctx'> 	if (ioaddr == NULL) {</div><div class='del'>-		printk (KERN_ERR PFX "cannot remap MMIO, aborting\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot remap MMIO, aborting\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -700,9 +699,10 @@ static int __devinit netdrv_init_board (struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	/* if unknown chip, assume array element #0, original RTL-8139 in this case */</div><div class='del'>-	printk (KERN_DEBUG PFX "PCI device %s: unknown chip version, assuming RTL-8139\n",</div><div class='del'>-		pci_name(pdev));</div><div class='del'>-	printk (KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n", pci_name(pdev), NETDRV_R32 (TxConfig));</div><div class='add'>+	dev_printk (KERN_DEBUG, &amp;pdev-&gt;dev,</div><div class='add'>+		"unknown chip version, assuming RTL-8139\n");</div><div class='add'>+	dev_printk (KERN_DEBUG, &amp;pdev-&gt;dev, "TxConfig = 0x%lx\n",</div><div class='add'>+		NETDRV_R32 (TxConfig));</div><div class='ctx'> 	tp-&gt;chipset = 0;</div><div class='ctx'> </div><div class='ctx'> match:</div><div class='hunk'>@@ -1076,7 +1076,7 @@ static int netdrv_open (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK ("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	retval = request_irq (dev-&gt;irq, netdrv_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	retval = request_irq (dev-&gt;irq, netdrv_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		DPRINTK ("EXIT, returning %d\n", retval);</div><div class='ctx'> 		return retval;</div><div class='head'>diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c<br/>index 2ea66aca648b..297e9f805366 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/axnet_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/axnet_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/axnet_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/axnet_cs.c</a></div><div class='hunk'>@@ -535,7 +535,7 @@ static int axnet_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     link-&gt;open++;</div><div class='ctx'> </div><div class='del'>-    request_irq(dev-&gt;irq, ei_irq_wrapper, SA_SHIRQ, "axnet_cs", dev);</div><div class='add'>+    request_irq(dev-&gt;irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev);</div><div class='ctx'> </div><div class='ctx'>     info-&gt;link_status = 0x00;</div><div class='ctx'>     init_timer(&amp;info-&gt;watchdog);</div><div class='head'>diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c<br/>index 441de824ab6b..48434d7924eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/com20020_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/com20020_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/com20020_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/com20020_cs.c</a></div><div class='hunk'>@@ -387,7 +387,10 @@ static int com20020_resume(struct pcmcia_device *link)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_device_id com20020_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.",</div><div class='add'>+			"PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("SoHard AG",</div><div class='add'>+			"SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),</div><div class='ctx'> 	PCMCIA_DEVICE_NULL</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pcmcia, com20020_ids);</div><div class='head'>diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c<br/>index 09b11761cdfa..ea93b8f18605 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/fmvj18x_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/fmvj18x_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/fmvj18x_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/fmvj18x_cs.c</a></div><div class='hunk'>@@ -831,8 +831,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>     </div><div class='ctx'>     if (length &lt; ETH_ZLEN)</div><div class='ctx'>     {</div><div class='del'>-    	skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-    	if (skb == NULL)</div><div class='add'>+    	if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'>     		return 0;</div><div class='ctx'>     	length = ETH_ZLEN;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c<br/>index 4260c2128f47..a8f6bfc96fd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/nmclan_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/nmclan_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/nmclan_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/nmclan_cs.c</a></div><div class='hunk'>@@ -1204,7 +1204,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;last_rx = jiffies;</div><div class='ctx'> 	lp-&gt;linux_stats.rx_packets++;</div><div class='del'>-	lp-&gt;linux_stats.rx_bytes += skb-&gt;len;</div><div class='add'>+	lp-&gt;linux_stats.rx_bytes += pkt_len;</div><div class='ctx'> 	outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */</div><div class='ctx'> 	continue;</div><div class='ctx'>       } else {</div><div class='head'>diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c<br/>index d090df413049..0ecebfc31f07 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/pcnet_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/pcnet_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/pcnet_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/pcnet_cs.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>     Copyright (C) 1999 David A. Hinds -- dahinds@users.sourceforge.net</div><div class='ctx'> </div><div class='ctx'>     pcnet_cs.c 1.153 2003/11/09 18:53:09</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     The network driver code is based on Donald Becker's NE2000 code:</div><div class='ctx'> </div><div class='ctx'>     Written 1992,1993 by Donald Becker.</div><div class='hunk'>@@ -146,7 +146,7 @@ typedef struct hw_info_t {</div><div class='ctx'> #define MII_PHYID_REG2		0x03</div><div class='ctx'> </div><div class='ctx'> static hw_info_t hw_info[] = {</div><div class='del'>-    { /* Accton EN2212 */ 0x0ff0, 0x00, 0x00, 0xe8, DELAY_OUTPUT }, </div><div class='add'>+    { /* Accton EN2212 */ 0x0ff0, 0x00, 0x00, 0xe8, DELAY_OUTPUT },</div><div class='ctx'>     { /* Allied Telesis LA-PCM */ 0x0ff0, 0x00, 0x00, 0xf4, 0 },</div><div class='ctx'>     { /* APEX MultiCard */ 0x03f4, 0x00, 0x20, 0xe5, 0 },</div><div class='ctx'>     { /* ASANTE FriendlyNet */ 0x4910, 0x00, 0x00, 0x94,</div><div class='hunk'>@@ -193,7 +193,7 @@ static hw_info_t hw_info[] = {</div><div class='ctx'>     { /* NE2000 Compatible */ 0x0ff0, 0x00, 0xa0, 0x0c, 0 },</div><div class='ctx'>     { /* Network General Sniffer */ 0x0ff0, 0x00, 0x00, 0x65,</div><div class='ctx'>       HAS_MISC_REG | HAS_IBM_MISC },</div><div class='del'>-    { /* Panasonic VEL211 */ 0x0ff0, 0x00, 0x80, 0x45, </div><div class='add'>+    { /* Panasonic VEL211 */ 0x0ff0, 0x00, 0x80, 0x45,</div><div class='ctx'>       HAS_MISC_REG | HAS_IBM_MISC },</div><div class='ctx'>     { /* PreMax PE-200 */ 0x07f0, 0x00, 0x20, 0xe0, 0 },</div><div class='ctx'>     { /* RPTI EP400 */ 0x0110, 0x00, 0x40, 0x95, 0 },</div><div class='hunk'>@@ -330,7 +330,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link)</div><div class='ctx'> 	for (j = 0; j &lt; 6; j++)</div><div class='ctx'> 	    dev-&gt;dev_addr[j] = readb(base + (j&lt;&lt;1));</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     iounmap(virt);</div><div class='ctx'>     j = pcmcia_release_window(link-&gt;win);</div><div class='ctx'>     if (j != CS_SUCCESS)</div><div class='hunk'>@@ -490,7 +490,7 @@ static int try_io_port(struct pcmcia_device *link)</div><div class='ctx'> 	if (link-&gt;io.NumPorts2 &gt; 0) {</div><div class='ctx'> 	    /* for master/slave multifunction cards */</div><div class='ctx'> 	    link-&gt;io.Attributes2 = IO_DATA_PATH_WIDTH_8;</div><div class='del'>-	    link-&gt;irq.Attributes = </div><div class='add'>+	    link-&gt;irq.Attributes =</div><div class='ctx'> 		IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;</div><div class='ctx'> 	}</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -543,19 +543,19 @@ static int pcnet_config(struct pcmcia_device *link)</div><div class='ctx'> 	manfid = le16_to_cpu(buf[0]);</div><div class='ctx'> 	prodid = le16_to_cpu(buf[1]);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;</div><div class='ctx'>     tuple.Attributes = 0;</div><div class='ctx'>     CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &amp;tuple));</div><div class='ctx'>     while (last_ret == CS_SUCCESS) {</div><div class='ctx'> 	cistpl_cftable_entry_t *cfg = &amp;(parse.cftable_entry);</div><div class='ctx'> 	cistpl_io_t *io = &amp;(parse.cftable_entry.io);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (pcmcia_get_tuple_data(link, &amp;tuple) != 0 ||</div><div class='ctx'> 			pcmcia_parse_tuple(link, &amp;tuple, &amp;parse) != 0 ||</div><div class='ctx'> 			cfg-&gt;index == 0 || cfg-&gt;io.nwin == 0)</div><div class='ctx'> 		goto next_entry;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='ctx'> 	/* For multifunction cards, by convention, we configure the</div><div class='ctx'> 	   network function with window 0, and serial with window 1 */</div><div class='hunk'>@@ -584,7 +584,7 @@ static int pcnet_config(struct pcmcia_device *link)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &amp;link-&gt;irq));</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (link-&gt;io.NumPorts2 == 8) {</div><div class='ctx'> 	link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='ctx'> 	link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='hunk'>@@ -592,7 +592,7 @@ static int pcnet_config(struct pcmcia_device *link)</div><div class='ctx'>     if ((manfid == MANFID_IBM) &amp;&amp;</div><div class='ctx'> 	(prodid == PRODID_IBM_HOME_AND_AWAY))</div><div class='ctx'> 	link-&gt;conf.ConfigIndex |= 0x10;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &amp;link-&gt;conf));</div><div class='ctx'>     dev-&gt;irq = link-&gt;irq.AssignedIRQ;</div><div class='ctx'>     dev-&gt;base_addr = link-&gt;io.BasePort1;</div><div class='hunk'>@@ -614,7 +614,7 @@ static int pcnet_config(struct pcmcia_device *link)</div><div class='ctx'> 	hw_info = get_ax88190(link);</div><div class='ctx'>     if (hw_info == NULL)</div><div class='ctx'> 	hw_info = get_hwired(link);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (hw_info == NULL) {</div><div class='ctx'> 	printk(KERN_NOTICE "pcnet_cs: unable to read hardware net"</div><div class='ctx'> 	       " address for io base %#3lx\n", dev-&gt;base_addr);</div><div class='hunk'>@@ -631,7 +631,7 @@ static int pcnet_config(struct pcmcia_device *link)</div><div class='ctx'> 	info-&gt;flags &amp;= ~USE_BIG_BUF;</div><div class='ctx'>     if (!use_big_buf)</div><div class='ctx'> 	info-&gt;flags &amp;= ~USE_BIG_BUF;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (info-&gt;flags &amp; USE_BIG_BUF) {</div><div class='ctx'> 	start_pg = SOCKET_START_PG;</div><div class='ctx'> 	stop_pg = SOCKET_STOP_PG;</div><div class='hunk'>@@ -929,7 +929,7 @@ static void set_misc_reg(struct net_device *dev)</div><div class='ctx'>     kio_addr_t nic_base = dev-&gt;base_addr;</div><div class='ctx'>     pcnet_dev_t *info = PRIV(dev);</div><div class='ctx'>     u_char tmp;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (info-&gt;flags &amp; HAS_MISC_REG) {</div><div class='ctx'> 	tmp = inb_p(nic_base + PCNET_MISC) &amp; ~3;</div><div class='ctx'> 	if (dev-&gt;if_port == 2)</div><div class='hunk'>@@ -998,7 +998,7 @@ static int pcnet_open(struct net_device *dev)</div><div class='ctx'>     link-&gt;open++;</div><div class='ctx'> </div><div class='ctx'>     set_misc_reg(dev);</div><div class='del'>-    request_irq(dev-&gt;irq, ei_irq_wrapper, SA_SHIRQ, dev_info, dev);</div><div class='add'>+    request_irq(dev-&gt;irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev);</div><div class='ctx'> </div><div class='ctx'>     info-&gt;phy_id = info-&gt;eth_phy;</div><div class='ctx'>     info-&gt;link_status = 0x00;</div><div class='hunk'>@@ -1022,7 +1022,7 @@ static int pcnet_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     ei_close(dev);</div><div class='ctx'>     free_irq(dev-&gt;irq, dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     link-&gt;open--;</div><div class='ctx'>     netif_stop_queue(dev);</div><div class='ctx'>     del_timer_sync(&amp;info-&gt;watchdog);</div><div class='hunk'>@@ -1054,12 +1054,12 @@ static void pcnet_reset_8390(struct net_device *dev)</div><div class='ctx'> 	udelay(100);</div><div class='ctx'>     }</div><div class='ctx'>     outb_p(ENISR_RESET, nic_base + EN0_ISR); /* Ack intr. */</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (i == 100)</div><div class='ctx'> 	printk(KERN_ERR "%s: pcnet_reset_8390() did not complete.\n",</div><div class='ctx'> 	       dev-&gt;name);</div><div class='ctx'>     set_misc_reg(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> } /* pcnet_reset_8390 */</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -1233,7 +1233,7 @@ static void dma_get_8390_hdr(struct net_device *dev,</div><div class='ctx'> 	       dev-&gt;name, ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 	return;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     ei_status.dmaing |= 0x01;</div><div class='ctx'>     outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base + PCNET_CMD);</div><div class='ctx'>     outb_p(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);</div><div class='hunk'>@@ -1458,7 +1458,7 @@ static void shmem_get_8390_hdr(struct net_device *dev,</div><div class='ctx'>     void __iomem *xfer_start = ei_status.mem + (TX_PAGES&lt;&lt;8)</div><div class='ctx'> 				+ (ring_page &lt;&lt; 8)</div><div class='ctx'> 				- (ei_status.rx_start_page &lt;&lt; 8);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     copyin(hdr, xfer_start, sizeof(struct e8390_pkt_hdr));</div><div class='ctx'>     /* Fix for big endian systems */</div><div class='ctx'>     hdr-&gt;count = le16_to_cpu(hdr-&gt;count);</div><div class='hunk'>@@ -1473,7 +1473,7 @@ static void shmem_block_input(struct net_device *dev, int count,</div><div class='ctx'>     unsigned long offset = (TX_PAGES&lt;&lt;8) + ring_offset</div><div class='ctx'> 				- (ei_status.rx_start_page &lt;&lt; 8);</div><div class='ctx'>     char *buf = skb-&gt;data;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (offset + count &gt; ei_status.priv) {</div><div class='ctx'> 	/* We must wrap the input move. */</div><div class='ctx'> 	int semi_count = ei_status.priv - offset;</div><div class='hunk'>@@ -1541,7 +1541,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg,</div><div class='ctx'> 	info-&gt;base = NULL; link-&gt;win = NULL;</div><div class='ctx'> 	goto failed;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     ei_status.mem = info-&gt;base + offset;</div><div class='ctx'>     ei_status.priv = req.Size;</div><div class='ctx'>     dev-&gt;mem_start = (u_long)ei_status.mem;</div><div class='hunk'>@@ -1768,6 +1768,8 @@ static struct pcmcia_device_id pcnet_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"),</div><div class='ctx'> 	PCMCIA_DEVICE_CIS_PROD_ID12("PMX   ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),</div><div class='ctx'> 	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",</div><div class='add'>+		0xb4be14e3, 0x43ac239b, 0x0877b627),</div><div class='ctx'> 	PCMCIA_DEVICE_NULL</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pcmcia, pcnet_ids);</div><div class='head'>diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c<br/>index e74bf5014ef6..a73d54553030 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/smc91c92_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/smc91c92_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/smc91c92_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/smc91c92_cs.c</a></div><div class='hunk'>@@ -1883,7 +1883,7 @@ static void smc_reset(struct net_device *dev)</div><div class='ctx'>     /* Set the Window 1 control, configuration and station addr registers.</div><div class='ctx'>        No point in writing the I/O base register ;-&gt; */</div><div class='ctx'>     SMC_SELECT_BANK(1);</div><div class='del'>-    /* Automatically release succesfully transmitted packets,</div><div class='add'>+    /* Automatically release successfully transmitted packets,</div><div class='ctx'>        Accept link errors, counter and Tx error interrupts. */</div><div class='ctx'>     outw(CTL_AUTO_RELEASE | CTL_TE_ENABLE | CTL_CR_ENABLE,</div><div class='ctx'> 	 ioaddr + CONTROL);</div><div class='head'>diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c<br/>index 71f45056a70c..9bae77ce1314 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/xirc2ps_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcmcia/xirc2ps_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcmcia/xirc2ps_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcmcia/xirc2ps_cs.c</a></div><div class='hunk'>@@ -1359,7 +1359,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>     kio_addr_t ioaddr = dev-&gt;base_addr;</div><div class='ctx'>     int okay;</div><div class='ctx'>     unsigned freespace;</div><div class='del'>-    unsigned pktlen = skb? skb-&gt;len : 0;</div><div class='add'>+    unsigned pktlen = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'>     DEBUG(1, "do_start_xmit(skb=%p, dev=%p) len=%u\n",</div><div class='ctx'> 	  skb, dev, pktlen);</div><div class='hunk'>@@ -1374,8 +1374,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>      */</div><div class='ctx'>     if (pktlen &lt; ETH_ZLEN)</div><div class='ctx'>     {</div><div class='del'>-        skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-        if (skb == NULL)</div><div class='add'>+        if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'>         	return 0;</div><div class='ctx'> 	pktlen = ETH_ZLEN;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c<br/>index fc08c4af506c..4daafe303358 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pcnet32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pcnet32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pcnet32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pcnet32.c</a></div><div class='hunk'>@@ -58,18 +58,15 @@ static const char *const version =</div><div class='ctx'>  * PCI device identifiers for "new style" Linux PCI Device Drivers</div><div class='ctx'>  */</div><div class='ctx'> static struct pci_device_id pcnet32_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME,</div><div class='del'>-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE,</div><div class='del'>-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Adapters that were sold with IBM's RS/6000 or pSeries hardware have</div><div class='ctx'> 	 * the incorrect vendor id.</div><div class='ctx'> 	 */</div><div class='del'>-	{ PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE,</div><div class='del'>-	  PCI_ANY_ID, PCI_ANY_ID,</div><div class='del'>-	  PCI_CLASS_NETWORK_ETHERNET &lt;&lt; 8, 0xffff00, 0},</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_AMD_LANCE),</div><div class='add'>+	  .class = (PCI_CLASS_NETWORK_ETHERNET &lt;&lt; 8), .class_mask = 0xffff00, },</div><div class='ctx'> </div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='hunk'>@@ -188,6 +185,23 @@ static int homepna[MAX_UNITS];</div><div class='ctx'> </div><div class='ctx'> #define PCNET32_TOTAL_SIZE	0x20</div><div class='ctx'> </div><div class='add'>+#define CSR0		0</div><div class='add'>+#define CSR0_INIT	0x1</div><div class='add'>+#define CSR0_START	0x2</div><div class='add'>+#define CSR0_STOP	0x4</div><div class='add'>+#define CSR0_TXPOLL	0x8</div><div class='add'>+#define CSR0_INTEN	0x40</div><div class='add'>+#define CSR0_IDON	0x0100</div><div class='add'>+#define CSR0_NORMAL	(CSR0_START | CSR0_INTEN)</div><div class='add'>+#define PCNET32_INIT_LOW	1</div><div class='add'>+#define PCNET32_INIT_HIGH	2</div><div class='add'>+#define CSR3		3</div><div class='add'>+#define CSR4		4</div><div class='add'>+#define CSR5		5</div><div class='add'>+#define CSR5_SUSPEND	0x0001</div><div class='add'>+#define CSR15		15</div><div class='add'>+#define PCNET32_MC_FILTER	8</div><div class='add'>+</div><div class='ctx'> /* The PCNET32 Rx and Tx ring descriptors. */</div><div class='ctx'> struct pcnet32_rx_head {</div><div class='ctx'> 	u32	base;</div><div class='hunk'>@@ -277,7 +291,6 @@ struct pcnet32_private {</div><div class='ctx'> 	u32			phymask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void pcnet32_probe_vlbus(void);</div><div class='ctx'> static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);</div><div class='ctx'> static int pcnet32_probe1(unsigned long, int, struct pci_dev *);</div><div class='ctx'> static int pcnet32_open(struct net_device *);</div><div class='hunk'>@@ -309,12 +322,6 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name);</div><div class='ctx'> static void pcnet32_free_ring(struct net_device *dev);</div><div class='ctx'> static void pcnet32_check_media(struct net_device *dev, int verbose);</div><div class='ctx'> </div><div class='del'>-enum pci_flags_bit {</div><div class='del'>-	PCI_USES_IO = 1, PCI_USES_MEM = 2, PCI_USES_MASTER = 4,</div><div class='del'>-	PCI_ADDR0 = 0x10 &lt;&lt; 0, PCI_ADDR1 = 0x10 &lt;&lt; 1, PCI_ADDR2 =</div><div class='del'>-	    0x10 &lt;&lt; 2, PCI_ADDR3 = 0x10 &lt;&lt; 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static u16 pcnet32_wio_read_csr(unsigned long addr, int index)</div><div class='ctx'> {</div><div class='ctx'> 	outw(index, addr + PCNET32_WIO_RAP);</div><div class='hunk'>@@ -425,6 +432,238 @@ static struct pcnet32_access pcnet32_dwio = {</div><div class='ctx'> 	.reset = pcnet32_dwio_reset</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void pcnet32_netif_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;trans_start = jiffies;</div><div class='add'>+	netif_poll_disable(dev);</div><div class='add'>+	netif_tx_disable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pcnet32_netif_start(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netif_wake_queue(dev);</div><div class='add'>+	netif_poll_enable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate space for the new sized tx ring.</div><div class='add'>+ * Free old resources</div><div class='add'>+ * Save new resources.</div><div class='add'>+ * Any failure keeps old resources.</div><div class='add'>+ * Must be called with lp-&gt;lock held.</div><div class='add'>+ */</div><div class='add'>+static void pcnet32_realloc_tx_ring(struct net_device *dev,</div><div class='add'>+				    struct pcnet32_private *lp,</div><div class='add'>+				    unsigned int size)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t new_ring_dma_addr;</div><div class='add'>+	dma_addr_t *new_dma_addr_list;</div><div class='add'>+	struct pcnet32_tx_head *new_tx_ring;</div><div class='add'>+	struct sk_buff **new_skb_list;</div><div class='add'>+</div><div class='add'>+	pcnet32_purge_tx_ring(dev);</div><div class='add'>+</div><div class='add'>+	new_tx_ring = pci_alloc_consistent(lp-&gt;pci_dev,</div><div class='add'>+					   sizeof(struct pcnet32_tx_head) *</div><div class='add'>+					   (1 &lt;&lt; size),</div><div class='add'>+					   &amp;new_ring_dma_addr);</div><div class='add'>+	if (new_tx_ring == NULL) {</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='add'>+			printk("\n" KERN_ERR</div><div class='add'>+			       "%s: Consistent memory allocation failed.\n",</div><div class='add'>+			       dev-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 &lt;&lt; size));</div><div class='add'>+</div><div class='add'>+	new_dma_addr_list = kcalloc((1 &lt;&lt; size), sizeof(dma_addr_t),</div><div class='add'>+				GFP_ATOMIC);</div><div class='add'>+	if (!new_dma_addr_list) {</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='add'>+			printk("\n" KERN_ERR</div><div class='add'>+			       "%s: Memory allocation failed.\n", dev-&gt;name);</div><div class='add'>+		goto free_new_tx_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_skb_list = kcalloc((1 &lt;&lt; size), sizeof(struct sk_buff *),</div><div class='add'>+				GFP_ATOMIC);</div><div class='add'>+	if (!new_skb_list) {</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='add'>+			printk("\n" KERN_ERR</div><div class='add'>+			       "%s: Memory allocation failed.\n", dev-&gt;name);</div><div class='add'>+		goto free_new_lists;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(lp-&gt;tx_skbuff);</div><div class='add'>+	kfree(lp-&gt;tx_dma_addr);</div><div class='add'>+	pci_free_consistent(lp-&gt;pci_dev,</div><div class='add'>+			    sizeof(struct pcnet32_tx_head) *</div><div class='add'>+			    lp-&gt;tx_ring_size, lp-&gt;tx_ring,</div><div class='add'>+			    lp-&gt;tx_ring_dma_addr);</div><div class='add'>+</div><div class='add'>+	lp-&gt;tx_ring_size = (1 &lt;&lt; size);</div><div class='add'>+	lp-&gt;tx_mod_mask = lp-&gt;tx_ring_size - 1;</div><div class='add'>+	lp-&gt;tx_len_bits = (size &lt;&lt; 12);</div><div class='add'>+	lp-&gt;tx_ring = new_tx_ring;</div><div class='add'>+	lp-&gt;tx_ring_dma_addr = new_ring_dma_addr;</div><div class='add'>+	lp-&gt;tx_dma_addr = new_dma_addr_list;</div><div class='add'>+	lp-&gt;tx_skbuff = new_skb_list;</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+    free_new_lists:</div><div class='add'>+	kfree(new_dma_addr_list);</div><div class='add'>+    free_new_tx_ring:</div><div class='add'>+	pci_free_consistent(lp-&gt;pci_dev,</div><div class='add'>+			    sizeof(struct pcnet32_tx_head) *</div><div class='add'>+			    (1 &lt;&lt; size),</div><div class='add'>+			    new_tx_ring,</div><div class='add'>+			    new_ring_dma_addr);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate space for the new sized rx ring.</div><div class='add'>+ * Re-use old receive buffers.</div><div class='add'>+ *   alloc extra buffers</div><div class='add'>+ *   free unneeded buffers</div><div class='add'>+ *   free unneeded buffers</div><div class='add'>+ * Save new resources.</div><div class='add'>+ * Any failure keeps old resources.</div><div class='add'>+ * Must be called with lp-&gt;lock held.</div><div class='add'>+ */</div><div class='add'>+static void pcnet32_realloc_rx_ring(struct net_device *dev,</div><div class='add'>+				    struct pcnet32_private *lp,</div><div class='add'>+				    unsigned int size)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t new_ring_dma_addr;</div><div class='add'>+	dma_addr_t *new_dma_addr_list;</div><div class='add'>+	struct pcnet32_rx_head *new_rx_ring;</div><div class='add'>+	struct sk_buff **new_skb_list;</div><div class='add'>+	int new, overlap;</div><div class='add'>+</div><div class='add'>+	new_rx_ring = pci_alloc_consistent(lp-&gt;pci_dev,</div><div class='add'>+					   sizeof(struct pcnet32_rx_head) *</div><div class='add'>+					   (1 &lt;&lt; size),</div><div class='add'>+					   &amp;new_ring_dma_addr);</div><div class='add'>+	if (new_rx_ring == NULL) {</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='add'>+			printk("\n" KERN_ERR</div><div class='add'>+			       "%s: Consistent memory allocation failed.\n",</div><div class='add'>+			       dev-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 &lt;&lt; size));</div><div class='add'>+</div><div class='add'>+	new_dma_addr_list = kcalloc((1 &lt;&lt; size), sizeof(dma_addr_t),</div><div class='add'>+				GFP_ATOMIC);</div><div class='add'>+	if (!new_dma_addr_list) {</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='add'>+			printk("\n" KERN_ERR</div><div class='add'>+			       "%s: Memory allocation failed.\n", dev-&gt;name);</div><div class='add'>+		goto free_new_rx_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_skb_list = kcalloc((1 &lt;&lt; size), sizeof(struct sk_buff *),</div><div class='add'>+				GFP_ATOMIC);</div><div class='add'>+	if (!new_skb_list) {</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='add'>+			printk("\n" KERN_ERR</div><div class='add'>+			       "%s: Memory allocation failed.\n", dev-&gt;name);</div><div class='add'>+		goto free_new_lists;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* first copy the current receive buffers */</div><div class='add'>+	overlap = min(size, lp-&gt;rx_ring_size);</div><div class='add'>+	for (new = 0; new &lt; overlap; new++) {</div><div class='add'>+		new_rx_ring[new] = lp-&gt;rx_ring[new];</div><div class='add'>+		new_dma_addr_list[new] = lp-&gt;rx_dma_addr[new];</div><div class='add'>+		new_skb_list[new] = lp-&gt;rx_skbuff[new];</div><div class='add'>+	}</div><div class='add'>+	/* now allocate any new buffers needed */</div><div class='add'>+	for (; new &lt; size; new++ ) {</div><div class='add'>+		struct sk_buff *rx_skbuff;</div><div class='add'>+		new_skb_list[new] = dev_alloc_skb(PKT_BUF_SZ);</div><div class='add'>+		if (!(rx_skbuff = new_skb_list[new])) {</div><div class='add'>+			/* keep the original lists and buffers */</div><div class='add'>+			if (netif_msg_drv(lp))</div><div class='add'>+				printk(KERN_ERR</div><div class='add'>+				       "%s: pcnet32_realloc_rx_ring dev_alloc_skb failed.\n",</div><div class='add'>+				       dev-&gt;name);</div><div class='add'>+			goto free_all_new;</div><div class='add'>+		}</div><div class='add'>+		skb_reserve(rx_skbuff, 2);</div><div class='add'>+</div><div class='add'>+		new_dma_addr_list[new] =</div><div class='add'>+			    pci_map_single(lp-&gt;pci_dev, rx_skbuff-&gt;data,</div><div class='add'>+					   PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);</div><div class='add'>+		new_rx_ring[new].base = (u32) le32_to_cpu(new_dma_addr_list[new]);</div><div class='add'>+		new_rx_ring[new].buf_length = le16_to_cpu(2 - PKT_BUF_SZ);</div><div class='add'>+		new_rx_ring[new].status = le16_to_cpu(0x8000);</div><div class='add'>+	}</div><div class='add'>+	/* and free any unneeded buffers */</div><div class='add'>+	for (; new &lt; lp-&gt;rx_ring_size; new++) {</div><div class='add'>+		if (lp-&gt;rx_skbuff[new]) {</div><div class='add'>+			pci_unmap_single(lp-&gt;pci_dev, lp-&gt;rx_dma_addr[new],</div><div class='add'>+					 PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dev_kfree_skb(lp-&gt;rx_skbuff[new]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(lp-&gt;rx_skbuff);</div><div class='add'>+	kfree(lp-&gt;rx_dma_addr);</div><div class='add'>+	pci_free_consistent(lp-&gt;pci_dev,</div><div class='add'>+			    sizeof(struct pcnet32_rx_head) *</div><div class='add'>+			    lp-&gt;rx_ring_size, lp-&gt;rx_ring,</div><div class='add'>+			    lp-&gt;rx_ring_dma_addr);</div><div class='add'>+</div><div class='add'>+	lp-&gt;rx_ring_size = (1 &lt;&lt; size);</div><div class='add'>+	lp-&gt;rx_mod_mask = lp-&gt;rx_ring_size - 1;</div><div class='add'>+	lp-&gt;rx_len_bits = (size &lt;&lt; 4);</div><div class='add'>+	lp-&gt;rx_ring = new_rx_ring;</div><div class='add'>+	lp-&gt;rx_ring_dma_addr = new_ring_dma_addr;</div><div class='add'>+	lp-&gt;rx_dma_addr = new_dma_addr_list;</div><div class='add'>+	lp-&gt;rx_skbuff = new_skb_list;</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+    free_all_new:</div><div class='add'>+	for (; --new &gt;= lp-&gt;rx_ring_size; ) {</div><div class='add'>+		if (new_skb_list[new]) {</div><div class='add'>+			pci_unmap_single(lp-&gt;pci_dev, new_dma_addr_list[new],</div><div class='add'>+					 PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dev_kfree_skb(new_skb_list[new]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(new_skb_list);</div><div class='add'>+    free_new_lists:</div><div class='add'>+	kfree(new_dma_addr_list);</div><div class='add'>+    free_new_rx_ring:</div><div class='add'>+	pci_free_consistent(lp-&gt;pci_dev,</div><div class='add'>+			    sizeof(struct pcnet32_rx_head) *</div><div class='add'>+			    (1 &lt;&lt; size),</div><div class='add'>+			    new_rx_ring,</div><div class='add'>+			    new_ring_dma_addr);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pcnet32_purge_rx_ring(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* free all allocated skbuffs */</div><div class='add'>+	for (i = 0; i &lt; lp-&gt;rx_ring_size; i++) {</div><div class='add'>+		lp-&gt;rx_ring[i].status = 0;	/* CPU owns buffer */</div><div class='add'>+		wmb();		/* Make sure adapter sees owner change */</div><div class='add'>+		if (lp-&gt;rx_skbuff[i]) {</div><div class='add'>+			pci_unmap_single(lp-&gt;pci_dev, lp-&gt;rx_dma_addr[i],</div><div class='add'>+					 PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dev_kfree_skb_any(lp-&gt;rx_skbuff[i]);</div><div class='add'>+		}</div><div class='add'>+		lp-&gt;rx_skbuff[i] = NULL;</div><div class='add'>+		lp-&gt;rx_dma_addr[i] = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> static void pcnet32_poll_controller(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -525,10 +764,10 @@ static void pcnet32_get_ringparam(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	ering-&gt;tx_max_pending = TX_MAX_RING_SIZE - 1;</div><div class='del'>-	ering-&gt;tx_pending = lp-&gt;tx_ring_size - 1;</div><div class='del'>-	ering-&gt;rx_max_pending = RX_MAX_RING_SIZE - 1;</div><div class='del'>-	ering-&gt;rx_pending = lp-&gt;rx_ring_size - 1;</div><div class='add'>+	ering-&gt;tx_max_pending = TX_MAX_RING_SIZE;</div><div class='add'>+	ering-&gt;tx_pending = lp-&gt;tx_ring_size;</div><div class='add'>+	ering-&gt;rx_max_pending = RX_MAX_RING_SIZE;</div><div class='add'>+	ering-&gt;rx_pending = lp-&gt;rx_ring_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pcnet32_set_ringparam(struct net_device *dev,</div><div class='hunk'>@@ -536,56 +775,53 @@ static int pcnet32_set_ringparam(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	ulong ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ering-&gt;rx_mini_pending || ering-&gt;rx_jumbo_pending)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='del'>-		pcnet32_close(dev);</div><div class='add'>+		pcnet32_netif_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-	pcnet32_free_ring(dev);</div><div class='del'>-	lp-&gt;tx_ring_size =</div><div class='del'>-	    min(ering-&gt;tx_pending, (unsigned int)TX_MAX_RING_SIZE);</div><div class='del'>-	lp-&gt;rx_ring_size =</div><div class='del'>-	    min(ering-&gt;rx_pending, (unsigned int)RX_MAX_RING_SIZE);</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */</div><div class='add'>+</div><div class='add'>+	size = min(ering-&gt;tx_pending, (unsigned int)TX_MAX_RING_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* set the minimum ring size to 4, to allow the loopback test to work</div><div class='ctx'> 	 * unchanged.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 2; i &lt;= PCNET32_LOG_MAX_TX_BUFFERS; i++) {</div><div class='del'>-		if (lp-&gt;tx_ring_size &lt;= (1 &lt;&lt; i))</div><div class='add'>+		if (size &lt;= (1 &lt;&lt; i))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	lp-&gt;tx_ring_size = (1 &lt;&lt; i);</div><div class='del'>-	lp-&gt;tx_mod_mask = lp-&gt;tx_ring_size - 1;</div><div class='del'>-	lp-&gt;tx_len_bits = (i &lt;&lt; 12);</div><div class='del'>-</div><div class='add'>+	if ((1 &lt;&lt; i) != lp-&gt;tx_ring_size)</div><div class='add'>+		pcnet32_realloc_tx_ring(dev, lp, i);</div><div class='add'>+	</div><div class='add'>+	size = min(ering-&gt;rx_pending, (unsigned int)RX_MAX_RING_SIZE);</div><div class='ctx'> 	for (i = 2; i &lt;= PCNET32_LOG_MAX_RX_BUFFERS; i++) {</div><div class='del'>-		if (lp-&gt;rx_ring_size &lt;= (1 &lt;&lt; i))</div><div class='add'>+		if (size &lt;= (1 &lt;&lt; i))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	lp-&gt;rx_ring_size = (1 &lt;&lt; i);</div><div class='del'>-	lp-&gt;rx_mod_mask = lp-&gt;rx_ring_size - 1;</div><div class='del'>-	lp-&gt;rx_len_bits = (i &lt;&lt; 4);</div><div class='add'>+	if ((1 &lt;&lt; i) != lp-&gt;rx_ring_size)</div><div class='add'>+		pcnet32_realloc_rx_ring(dev, lp, i);</div><div class='add'>+	</div><div class='add'>+	dev-&gt;weight = lp-&gt;rx_ring_size / 2;</div><div class='ctx'> </div><div class='del'>-	if (pcnet32_alloc_ring(dev, dev-&gt;name)) {</div><div class='del'>-		pcnet32_free_ring(dev);</div><div class='del'>-		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		pcnet32_netif_start(dev);</div><div class='add'>+		pcnet32_restart(dev, CSR0_NORMAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='del'>-		printk(KERN_INFO PFX</div><div class='add'>+	if (netif_msg_drv(lp))</div><div class='add'>+		printk(KERN_INFO</div><div class='ctx'> 		       "%s: Ring Param Settings: RX: %d, TX: %d\n", dev-&gt;name,</div><div class='ctx'> 		       lp-&gt;rx_ring_size, lp-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		pcnet32_open(dev);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -639,29 +875,27 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned long ticks;</div><div class='ctx'> </div><div class='del'>-	*data1 = 1;		/* status of test, default to fail */</div><div class='ctx'> 	rc = 1;			/* default to fail */</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		pcnet32_close(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */</div><div class='add'>+</div><div class='add'>+	numbuffs = min(numbuffs, (int)min(lp-&gt;rx_ring_size, lp-&gt;tx_ring_size));</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the PCNET32 */</div><div class='ctx'> 	lp-&gt;a.reset(ioaddr);</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR4, 0x0915);</div><div class='ctx'> </div><div class='ctx'> 	/* switch pcnet32 to 32bit mode */</div><div class='ctx'> 	lp-&gt;a.write_bcr(ioaddr, 20, 2);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;init_block.mode =</div><div class='del'>-	    le16_to_cpu((lp-&gt;options &amp; PCNET32_PORT_PORTSEL) &lt;&lt; 7);</div><div class='del'>-	lp-&gt;init_block.filter[0] = 0;</div><div class='del'>-	lp-&gt;init_block.filter[1] = 0;</div><div class='del'>-</div><div class='ctx'> 	/* purge &amp; init rings but don't actually restart */</div><div class='ctx'> 	pcnet32_restart(dev, 0x0000);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;a.write_csr(ioaddr, 0, 0x0004);	/* Set STOP bit */</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Transmit buffers. */</div><div class='ctx'> 	size = data_len + 15;</div><div class='hunk'>@@ -703,14 +937,15 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	x = a-&gt;read_bcr(ioaddr, 32);	/* set internal loopback in BSR32 */</div><div class='del'>-	x = x | 0x0002;</div><div class='del'>-	a-&gt;write_bcr(ioaddr, 32, x);</div><div class='add'>+	x = a-&gt;read_bcr(ioaddr, 32);	/* set internal loopback in BCR32 */</div><div class='add'>+	a-&gt;write_bcr(ioaddr, 32, x | 0x0002);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;a.write_csr(ioaddr, 15, 0x0044);	/* set int loopback in CSR15 */</div><div class='add'>+	/* set int loopback in CSR15 */</div><div class='add'>+	x = a-&gt;read_csr(ioaddr, CSR15) &amp; 0xfffc;</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR15, x | 0x0044);</div><div class='ctx'> </div><div class='ctx'> 	teststatus = le16_to_cpu(0x8000);</div><div class='del'>-	lp-&gt;a.write_csr(ioaddr, 0, 0x0002);	/* Set STRT bit */</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR0, CSR0_START);	/* Set STRT bit */</div><div class='ctx'> </div><div class='ctx'> 	/* Check status of descriptors */</div><div class='ctx'> 	for (x = 0; x &lt; numbuffs; x++) {</div><div class='hunk'>@@ -718,7 +953,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 		rmb();</div><div class='ctx'> 		while ((lp-&gt;rx_ring[x].status &amp; teststatus) &amp;&amp; (ticks &lt; 200)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-			mdelay(1);</div><div class='add'>+			msleep(1);</div><div class='ctx'> 			spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 			rmb();</div><div class='ctx'> 			ticks++;</div><div class='hunk'>@@ -731,7 +966,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;a.write_csr(ioaddr, 0, 0x0004);	/* Set STOP bit */</div><div class='add'>+	lp-&gt;a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	if (netif_msg_hw(lp) &amp;&amp; netif_msg_pktdata(lp)) {</div><div class='ctx'> 		printk(KERN_DEBUG "%s: RX loopback packets:\n", dev-&gt;name);</div><div class='hunk'>@@ -764,25 +999,24 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 		}</div><div class='ctx'> 		x++;</div><div class='ctx'> 	}</div><div class='del'>-	if (!rc) {</div><div class='del'>-		*data1 = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'>       clean_up:</div><div class='add'>+	*data1 = rc;</div><div class='ctx'> 	pcnet32_purge_tx_ring(dev);</div><div class='del'>-	x = a-&gt;read_csr(ioaddr, 15) &amp; 0xFFFF;</div><div class='del'>-	a-&gt;write_csr(ioaddr, 15, (x &amp; ~0x0044));	/* reset bits 6 and 2 */</div><div class='ctx'> </div><div class='del'>-	x = a-&gt;read_bcr(ioaddr, 32);	/* reset internal loopback */</div><div class='del'>-	x = x &amp; ~0x0002;</div><div class='del'>-	a-&gt;write_bcr(ioaddr, 32, x);</div><div class='add'>+	x = a-&gt;read_csr(ioaddr, CSR15);</div><div class='add'>+	a-&gt;write_csr(ioaddr, CSR15, (x &amp; ~0x0044));	/* reset bits 6 and 2 */</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	x = a-&gt;read_bcr(ioaddr, 32);	/* reset internal loopback */</div><div class='add'>+	a-&gt;write_bcr(ioaddr, 32, (x &amp; ~0x0002));</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 		pcnet32_open(dev);</div><div class='ctx'> 	} else {</div><div class='add'>+		pcnet32_purge_rx_ring(dev);</div><div class='ctx'> 		lp-&gt;a.write_bcr(ioaddr, 20, 4);	/* return to 16bit mode */</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (rc);</div><div class='hunk'>@@ -845,6 +1079,43 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * lp-&gt;lock must be held.</div><div class='add'>+ */</div><div class='add'>+static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,</div><div class='add'>+		int can_sleep)</div><div class='add'>+{</div><div class='add'>+	int csr5;</div><div class='add'>+	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='add'>+	struct pcnet32_access *a = &amp;lp-&gt;a;</div><div class='add'>+	ulong ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int ticks;</div><div class='add'>+</div><div class='add'>+	/* set SUSPEND (SPND) - CSR5 bit 0 */</div><div class='add'>+	csr5 = a-&gt;read_csr(ioaddr, CSR5);</div><div class='add'>+	a-&gt;write_csr(ioaddr, CSR5, csr5 | CSR5_SUSPEND);</div><div class='add'>+</div><div class='add'>+	/* poll waiting for bit to be set */</div><div class='add'>+	ticks = 0;</div><div class='add'>+	while (!(a-&gt;read_csr(ioaddr, CSR5) &amp; CSR5_SUSPEND)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, *flags);</div><div class='add'>+		if (can_sleep)</div><div class='add'>+			msleep(1);</div><div class='add'>+		else</div><div class='add'>+			mdelay(1);</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, *flags);</div><div class='add'>+		ticks++;</div><div class='add'>+		if (ticks &gt; 200) {</div><div class='add'>+			if (netif_msg_hw(lp))</div><div class='add'>+				printk(KERN_DEBUG</div><div class='add'>+				       "%s: Error getting into suspend!\n",</div><div class='add'>+				       dev-&gt;name);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define PCNET32_REGS_PER_PHY	32</div><div class='ctx'> #define PCNET32_MAX_PHYS	32</div><div class='ctx'> static int pcnet32_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -863,32 +1134,13 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='ctx'> 	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='ctx'> 	struct pcnet32_access *a = &amp;lp-&gt;a;</div><div class='ctx'> 	ulong ioaddr = dev-&gt;base_addr;</div><div class='del'>-	int ticks;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	csr0 = a-&gt;read_csr(ioaddr, 0);</div><div class='del'>-	if (!(csr0 &amp; 0x0004)) {	/* If not stopped */</div><div class='del'>-		/* set SUSPEND (SPND) - CSR5 bit 0 */</div><div class='del'>-		a-&gt;write_csr(ioaddr, 5, 0x0001);</div><div class='del'>-</div><div class='del'>-		/* poll waiting for bit to be set */</div><div class='del'>-		ticks = 0;</div><div class='del'>-		while (!(a-&gt;read_csr(ioaddr, 5) &amp; 0x0001)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-			mdelay(1);</div><div class='del'>-			spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-			ticks++;</div><div class='del'>-			if (ticks &gt; 200) {</div><div class='del'>-				if (netif_msg_hw(lp))</div><div class='del'>-					printk(KERN_DEBUG</div><div class='del'>-					       "%s: Error getting into suspend!\n",</div><div class='del'>-					       dev-&gt;name);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	csr0 = a-&gt;read_csr(ioaddr, CSR0);</div><div class='add'>+	if (!(csr0 &amp; CSR0_STOP))	/* If not stopped */</div><div class='add'>+		pcnet32_suspend(dev, &amp;flags, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* read address PROM */</div><div class='ctx'> 	for (i = 0; i &lt; 16; i += 2)</div><div class='hunk'>@@ -925,9 +1177,12 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(csr0 &amp; 0x0004)) {	/* If not stopped */</div><div class='add'>+	if (!(csr0 &amp; CSR0_STOP)) {	/* If not stopped */</div><div class='add'>+		int csr5;</div><div class='add'>+</div><div class='ctx'> 		/* clear SUSPEND (SPND) - CSR5 bit 0 */</div><div class='del'>-		a-&gt;write_csr(ioaddr, 5, 0x0000);</div><div class='add'>+		csr5 = a-&gt;read_csr(ioaddr, CSR5);</div><div class='add'>+		a-&gt;write_csr(ioaddr, CSR5, csr5 &amp; (~CSR5_SUSPEND));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='hunk'>@@ -958,7 +1213,7 @@ static struct ethtool_ops pcnet32_ethtool_ops = {</div><div class='ctx'> /* only probes for non-PCI devices, the rest are handled by</div><div class='ctx'>  * pci_register_driver via pcnet32_probe_pci */</div><div class='ctx'> </div><div class='del'>-static void __devinit pcnet32_probe_vlbus(void)</div><div class='add'>+static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int *port, ioaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -1442,7 +1697,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)</div><div class='ctx'> 					   lp-&gt;tx_ring_size,</div><div class='ctx'> 					   &amp;lp-&gt;tx_ring_dma_addr);</div><div class='ctx'> 	if (lp-&gt;tx_ring == NULL) {</div><div class='del'>-		if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='ctx'> 			printk("\n" KERN_ERR PFX</div><div class='ctx'> 			       "%s: Consistent memory allocation failed.\n",</div><div class='ctx'> 			       name);</div><div class='hunk'>@@ -1454,52 +1709,48 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)</div><div class='ctx'> 					   lp-&gt;rx_ring_size,</div><div class='ctx'> 					   &amp;lp-&gt;rx_ring_dma_addr);</div><div class='ctx'> 	if (lp-&gt;rx_ring == NULL) {</div><div class='del'>-		if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='ctx'> 			printk("\n" KERN_ERR PFX</div><div class='ctx'> 			       "%s: Consistent memory allocation failed.\n",</div><div class='ctx'> 			       name);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;tx_dma_addr = kmalloc(sizeof(dma_addr_t) * lp-&gt;tx_ring_size,</div><div class='add'>+	lp-&gt;tx_dma_addr = kcalloc(lp-&gt;tx_ring_size, sizeof(dma_addr_t),</div><div class='ctx'> 				  GFP_ATOMIC);</div><div class='ctx'> 	if (!lp-&gt;tx_dma_addr) {</div><div class='del'>-		if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='ctx'> 			printk("\n" KERN_ERR PFX</div><div class='ctx'> 			       "%s: Memory allocation failed.\n", name);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset(lp-&gt;tx_dma_addr, 0, sizeof(dma_addr_t) * lp-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;rx_dma_addr = kmalloc(sizeof(dma_addr_t) * lp-&gt;rx_ring_size,</div><div class='add'>+	lp-&gt;rx_dma_addr = kcalloc(lp-&gt;rx_ring_size, sizeof(dma_addr_t),</div><div class='ctx'> 				  GFP_ATOMIC);</div><div class='ctx'> 	if (!lp-&gt;rx_dma_addr) {</div><div class='del'>-		if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='ctx'> 			printk("\n" KERN_ERR PFX</div><div class='ctx'> 			       "%s: Memory allocation failed.\n", name);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset(lp-&gt;rx_dma_addr, 0, sizeof(dma_addr_t) * lp-&gt;rx_ring_size);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;tx_skbuff = kmalloc(sizeof(struct sk_buff *) * lp-&gt;tx_ring_size,</div><div class='add'>+	lp-&gt;tx_skbuff = kcalloc(lp-&gt;tx_ring_size, sizeof(struct sk_buff *),</div><div class='ctx'> 				GFP_ATOMIC);</div><div class='ctx'> 	if (!lp-&gt;tx_skbuff) {</div><div class='del'>-		if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='ctx'> 			printk("\n" KERN_ERR PFX</div><div class='ctx'> 			       "%s: Memory allocation failed.\n", name);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset(lp-&gt;tx_skbuff, 0, sizeof(struct sk_buff *) * lp-&gt;tx_ring_size);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;rx_skbuff = kmalloc(sizeof(struct sk_buff *) * lp-&gt;rx_ring_size,</div><div class='add'>+	lp-&gt;rx_skbuff = kcalloc(lp-&gt;rx_ring_size, sizeof(struct sk_buff *),</div><div class='ctx'> 				GFP_ATOMIC);</div><div class='ctx'> 	if (!lp-&gt;rx_skbuff) {</div><div class='del'>-		if (pcnet32_debug &amp; NETIF_MSG_DRV)</div><div class='add'>+		if (netif_msg_drv(lp))</div><div class='ctx'> 			printk("\n" KERN_ERR PFX</div><div class='ctx'> 			       "%s: Memory allocation failed.\n", name);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset(lp-&gt;rx_skbuff, 0, sizeof(struct sk_buff *) * lp-&gt;rx_ring_size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1547,7 +1798,7 @@ static int pcnet32_open(struct net_device *dev)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(dev-&gt;irq, &amp;pcnet32_interrupt,</div><div class='del'>-			lp-&gt;shared_irq ? SA_SHIRQ : 0, dev-&gt;name,</div><div class='add'>+			lp-&gt;shared_irq ? IRQF_SHARED : 0, dev-&gt;name,</div><div class='ctx'> 			(void *)dev)) {</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1763,16 +2014,7 @@ static int pcnet32_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>       err_free_ring:</div><div class='ctx'> 	/* free any allocated skbuffs */</div><div class='del'>-	for (i = 0; i &lt; lp-&gt;rx_ring_size; i++) {</div><div class='del'>-		lp-&gt;rx_ring[i].status = 0;</div><div class='del'>-		if (lp-&gt;rx_skbuff[i]) {</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev, lp-&gt;rx_dma_addr[i],</div><div class='del'>-					 PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);</div><div class='del'>-			dev_kfree_skb(lp-&gt;rx_skbuff[i]);</div><div class='del'>-		}</div><div class='del'>-		lp-&gt;rx_skbuff[i] = NULL;</div><div class='del'>-		lp-&gt;rx_dma_addr[i] = 0;</div><div class='del'>-	}</div><div class='add'>+	pcnet32_purge_rx_ring(dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Switch back to 16bit mode to avoid problems with dumb</div><div class='hunk'>@@ -2354,7 +2596,6 @@ static int pcnet32_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='del'>-	int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	del_timer_sync(&amp;lp-&gt;watchdog_timer);</div><div class='hunk'>@@ -2385,31 +2626,8 @@ static int pcnet32_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	/* free all allocated skbuffs */</div><div class='del'>-	for (i = 0; i &lt; lp-&gt;rx_ring_size; i++) {</div><div class='del'>-		lp-&gt;rx_ring[i].status = 0;</div><div class='del'>-		wmb();		/* Make sure adapter sees owner change */</div><div class='del'>-		if (lp-&gt;rx_skbuff[i]) {</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev, lp-&gt;rx_dma_addr[i],</div><div class='del'>-					 PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);</div><div class='del'>-			dev_kfree_skb(lp-&gt;rx_skbuff[i]);</div><div class='del'>-		}</div><div class='del'>-		lp-&gt;rx_skbuff[i] = NULL;</div><div class='del'>-		lp-&gt;rx_dma_addr[i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; lp-&gt;tx_ring_size; i++) {</div><div class='del'>-		lp-&gt;tx_ring[i].status = 0;	/* CPU owns buffer */</div><div class='del'>-		wmb();		/* Make sure adapter sees owner change */</div><div class='del'>-		if (lp-&gt;tx_skbuff[i]) {</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev, lp-&gt;tx_dma_addr[i],</div><div class='del'>-					 lp-&gt;tx_skbuff[i]-&gt;len,</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='del'>-			dev_kfree_skb(lp-&gt;tx_skbuff[i]);</div><div class='del'>-		}</div><div class='del'>-		lp-&gt;tx_skbuff[i] = NULL;</div><div class='del'>-		lp-&gt;tx_dma_addr[i] = 0;</div><div class='del'>-	}</div><div class='add'>+	pcnet32_purge_rx_ring(dev);</div><div class='add'>+	pcnet32_purge_tx_ring(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -2439,6 +2657,7 @@ static void pcnet32_load_multicast(struct net_device *dev)</div><div class='ctx'> 	volatile struct pcnet32_init_block *ib = &amp;lp-&gt;init_block;</div><div class='ctx'> 	volatile u16 *mcast_table = (u16 *) &amp; ib-&gt;filter;</div><div class='ctx'> 	struct dev_mc_list *dmi = dev-&gt;mc_list;</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	char *addrs;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 crc;</div><div class='hunk'>@@ -2447,6 +2666,10 @@ static void pcnet32_load_multicast(struct net_device *dev)</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 		ib-&gt;filter[0] = 0xffffffff;</div><div class='ctx'> 		ib-&gt;filter[1] = 0xffffffff;</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* clear the multicast filter */</div><div class='hunk'>@@ -2468,6 +2691,9 @@ static void pcnet32_load_multicast(struct net_device *dev)</div><div class='ctx'> 		    le16_to_cpu(le16_to_cpu(mcast_table[crc &gt;&gt; 4]) |</div><div class='ctx'> 				(1 &lt;&lt; (crc &amp; 0xf)));</div><div class='ctx'> 	}</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, PCNET32_MC_FILTER + i,</div><div class='add'>+				le16_to_cpu(mcast_table[i]));</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2478,8 +2704,11 @@ static void pcnet32_set_multicast_list(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ioaddr = dev-&gt;base_addr, flags;</div><div class='ctx'> 	struct pcnet32_private *lp = dev-&gt;priv;</div><div class='add'>+	int csr15, suspended;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	suspended = pcnet32_suspend(dev, &amp;flags, 0);</div><div class='add'>+	csr15 = lp-&gt;a.read_csr(ioaddr, CSR15);</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		/* Log any net taps. */</div><div class='ctx'> 		if (netif_msg_hw(lp))</div><div class='hunk'>@@ -2488,15 +2717,24 @@ static void pcnet32_set_multicast_list(struct net_device *dev)</div><div class='ctx'> 		lp-&gt;init_block.mode =</div><div class='ctx'> 		    le16_to_cpu(0x8000 | (lp-&gt;options &amp; PCNET32_PORT_PORTSEL) &lt;&lt;</div><div class='ctx'> 				7);</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, CSR15, csr15 | 0x8000);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lp-&gt;init_block.mode =</div><div class='ctx'> 		    le16_to_cpu((lp-&gt;options &amp; PCNET32_PORT_PORTSEL) &lt;&lt; 7);</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, CSR15, csr15 &amp; 0x7fff);</div><div class='ctx'> 		pcnet32_load_multicast(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;a.write_csr(ioaddr, 0, 0x0004);	/* Temporarily stop the lance. */</div><div class='del'>-	pcnet32_restart(dev, 0x0042);	/*  Resume normal operation */</div><div class='del'>-	netif_wake_queue(dev);</div><div class='add'>+	if (suspended) {</div><div class='add'>+		int csr5;</div><div class='add'>+		/* clear SUSPEND (SPND) - CSR5 bit 0 */</div><div class='add'>+		csr5 = lp-&gt;a.read_csr(ioaddr, CSR5);</div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, CSR5, csr5 &amp; (~CSR5_SUSPEND));</div><div class='add'>+	} else { </div><div class='add'>+		lp-&gt;a.write_csr(ioaddr, CSR0, CSR0_STOP);</div><div class='add'>+		pcnet32_restart(dev, CSR0_NORMAL);</div><div class='add'>+		netif_wake_queue(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -2736,7 +2974,7 @@ static int __init pcnet32_init_module(void)</div><div class='ctx'> </div><div class='ctx'> 	/* should we find any remaining VLbus devices ? */</div><div class='ctx'> 	if (pcnet32vlb)</div><div class='del'>-		pcnet32_probe_vlbus();</div><div class='add'>+		pcnet32_probe_vlbus(pcnet32_portlist);</div><div class='ctx'> </div><div class='ctx'> 	if (cards_found &amp;&amp; (pcnet32_debug &amp; NETIF_MSG_PROBE))</div><div class='ctx'> 		printk(KERN_INFO PFX "%d cards_found.\n", cards_found);</div><div class='head'>diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig<br/>index fa39b944bc46..2ba6d3a40e2e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/Kconfig</a></div><div class='hunk'>@@ -44,6 +44,17 @@ config CICADA_PHY</div><div class='ctx'> 	depends on PHYLIB</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Currently supports the cis8204</div><div class='add'>+config VITESSE_PHY</div><div class='add'>+        tristate "Drivers for the Vitesse PHYs"</div><div class='add'>+        depends on PHYLIB</div><div class='add'>+        ---help---</div><div class='add'>+          Currently supports the vsc8244</div><div class='add'>+</div><div class='add'>+config SMSC_PHY</div><div class='add'>+	tristate "Drivers for SMSC PHYs"</div><div class='add'>+	depends on PHYLIB</div><div class='add'>+	---help---</div><div class='add'>+	  Currently supports the LAN83C185 PHY</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile<br/>index e4116a5fbb4c..a00e61942525 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/Makefile</a></div><div class='hunk'>@@ -8,3 +8,5 @@ obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o</div><div class='ctx'> obj-$(CONFIG_CICADA_PHY)	+= cicada.o</div><div class='ctx'> obj-$(CONFIG_LXT_PHY)		+= lxt.o</div><div class='ctx'> obj-$(CONFIG_QSEMI_PHY)		+= qsemi.o</div><div class='add'>+obj-$(CONFIG_SMSC_PHY)		+= smsc.o</div><div class='add'>+obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o</div><div class='head'>diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c<br/>index 7d8d534255c0..ae60e6e4107c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/cicada.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/cicada.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/cicada.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/cicada.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -104,7 +103,22 @@ static int cis820x_config_intr(struct phy_device *phydev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Cicada 820x */</div><div class='add'>+/* Cicada 8201, a.k.a Vitesse VSC8201 */</div><div class='add'>+static struct phy_driver cis8201_driver = {</div><div class='add'>+	.phy_id		= 0x000fc410,</div><div class='add'>+	.name		= "Cicada Cis8201",</div><div class='add'>+	.phy_id_mask	= 0x000ffff0,</div><div class='add'>+	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	.flags		= PHY_HAS_INTERRUPT,</div><div class='add'>+	.config_init	= &amp;cis820x_config_init,</div><div class='add'>+	.config_aneg	= &amp;genphy_config_aneg,</div><div class='add'>+	.read_status	= &amp;genphy_read_status,</div><div class='add'>+	.ack_interrupt	= &amp;cis820x_ack_interrupt,</div><div class='add'>+	.config_intr	= &amp;cis820x_config_intr,</div><div class='add'>+	.driver 	= { .owner = THIS_MODULE,},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Cicada 8204 */</div><div class='ctx'> static struct phy_driver cis8204_driver = {</div><div class='ctx'> 	.phy_id		= 0x000fc440,</div><div class='ctx'> 	.name		= "Cicada Cis8204",</div><div class='hunk'>@@ -119,15 +133,30 @@ static struct phy_driver cis8204_driver = {</div><div class='ctx'> 	.driver 	= { .owner = THIS_MODULE,},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init cis8204_init(void)</div><div class='add'>+static int __init cicada_init(void)</div><div class='ctx'> {</div><div class='del'>-	return phy_driver_register(&amp;cis8204_driver);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = phy_driver_register(&amp;cis8204_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err1;</div><div class='add'>+</div><div class='add'>+	ret = phy_driver_register(&amp;cis8201_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err2;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err2:</div><div class='add'>+	phy_driver_unregister(&amp;cis8204_driver);</div><div class='add'>+err1:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit cis8204_exit(void)</div><div class='add'>+static void __exit cicada_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	phy_driver_unregister(&amp;cis8204_driver);</div><div class='add'>+	phy_driver_unregister(&amp;cis8201_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(cis8204_init);</div><div class='del'>-module_exit(cis8204_exit);</div><div class='add'>+module_init(cicada_init);</div><div class='add'>+module_exit(cicada_exit);</div><div class='head'>diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c<br/>index 5e9002e444c5..aa7983f55838 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/davicom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/davicom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/davicom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/davicom.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c<br/>index bef79e454c33..69d2325f848c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/lxt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/lxt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/lxt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/lxt.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -123,9 +122,9 @@ static int lxt971_config_intr(struct phy_device *phydev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct phy_driver lxt970_driver = {</div><div class='del'>-	.phy_id		= 0x07810000,</div><div class='add'>+	.phy_id		= 0x78100000,</div><div class='ctx'> 	.name		= "LXT970",</div><div class='del'>-	.phy_id_mask	= 0x0fffffff,</div><div class='add'>+	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.features	= PHY_BASIC_FEATURES,</div><div class='ctx'> 	.flags		= PHY_HAS_INTERRUPT,</div><div class='ctx'> 	.config_init	= lxt970_config_init,</div><div class='hunk'>@@ -137,9 +136,9 @@ static struct phy_driver lxt970_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct phy_driver lxt971_driver = {</div><div class='del'>-	.phy_id		= 0x0001378e,</div><div class='add'>+	.phy_id		= 0x001378e0,</div><div class='ctx'> 	.name		= "LXT971",</div><div class='del'>-	.phy_id_mask	= 0x0fffffff,</div><div class='add'>+	.phy_id_mask	= 0xfffffff0,</div><div class='ctx'> 	.features	= PHY_BASIC_FEATURES,</div><div class='ctx'> 	.flags		= PHY_HAS_INTERRUPT,</div><div class='ctx'> 	.config_aneg	= genphy_config_aneg,</div><div class='head'>diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c<br/>index a2d6386d13bc..0ad253282d0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/marvell.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/marvell.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/marvell.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/marvell.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c<br/>index 1b236bdf6b92..1dde390c164d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio_bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/mdio_bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/mdio_bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/mdio_bus.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c<br/>index 33cec2dab942..7d5c2233c252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/phy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/phy.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -557,7 +556,7 @@ int phy_start_interrupts(struct phy_device *phydev)</div><div class='ctx'> 	INIT_WORK(&amp;phydev-&gt;phy_queue, phy_change, phydev);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(phydev-&gt;irq, phy_interrupt,</div><div class='del'>-				SA_SHIRQ,</div><div class='add'>+				IRQF_SHARED,</div><div class='ctx'> 				"phy_interrupt",</div><div class='ctx'> 				phydev) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",</div><div class='head'>diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c<br/>index 7da0e3dd5fe3..1bc1e032c5d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/phy_device.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/phy_device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/phy_device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/phy_device.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c<br/>index 65d995b02b25..2b50e1739aa5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/phy/qsemi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/phy/qsemi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/qsemi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/qsemi.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c<br/>new file mode 100644<br/>index 000000000000..25e31fb5cb31<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/smsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/smsc.c</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/net/phy/smsc.c</div><div class='add'>+ *</div><div class='add'>+ * Driver for SMSC PHYs</div><div class='add'>+ *</div><div class='add'>+ * Author: Herbert Valerio Riedel</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Herbert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#define MII_LAN83C185_ISF 29 /* Interrupt Source Flags */</div><div class='add'>+#define MII_LAN83C185_IM  30 /* Interrupt Mask */</div><div class='add'>+</div><div class='add'>+#define MII_LAN83C185_ISF_INT1 (1&lt;&lt;1) /* Auto-Negotiation Page Received */</div><div class='add'>+#define MII_LAN83C185_ISF_INT2 (1&lt;&lt;2) /* Parallel Detection Fault */</div><div class='add'>+#define MII_LAN83C185_ISF_INT3 (1&lt;&lt;3) /* Auto-Negotiation LP Ack */</div><div class='add'>+#define MII_LAN83C185_ISF_INT4 (1&lt;&lt;4) /* Link Down */</div><div class='add'>+#define MII_LAN83C185_ISF_INT5 (1&lt;&lt;5) /* Remote Fault Detected */</div><div class='add'>+#define MII_LAN83C185_ISF_INT6 (1&lt;&lt;6) /* Auto-Negotiation complete */</div><div class='add'>+#define MII_LAN83C185_ISF_INT7 (1&lt;&lt;7) /* ENERGYON */</div><div class='add'>+</div><div class='add'>+#define MII_LAN83C185_ISF_INT_ALL (0x0e)</div><div class='add'>+</div><div class='add'>+#define MII_LAN83C185_ISF_INT_PHYLIB_EVENTS \</div><div class='add'>+	(MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int lan83c185_config_intr(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int rc = phy_write (phydev, MII_LAN83C185_IM,</div><div class='add'>+			((PHY_INTERRUPT_ENABLED == phydev-&gt;interrupts)</div><div class='add'>+			? MII_LAN83C185_ISF_INT_PHYLIB_EVENTS</div><div class='add'>+			: 0));</div><div class='add'>+</div><div class='add'>+	return rc &lt; 0 ? rc : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lan83c185_ack_interrupt(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int rc = phy_read (phydev, MII_LAN83C185_ISF);</div><div class='add'>+</div><div class='add'>+	return rc &lt; 0 ? rc : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lan83c185_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	return lan83c185_ack_interrupt (phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct phy_driver lan83c185_driver = {</div><div class='add'>+	.phy_id		= 0x0007c0a0, /* OUI=0x00800f, Model#=0x0a */</div><div class='add'>+	.phy_id_mask	= 0xfffffff0,</div><div class='add'>+	.name		= "SMSC LAN83C185",</div><div class='add'>+</div><div class='add'>+	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause</div><div class='add'>+				| SUPPORTED_Asym_Pause),</div><div class='add'>+	.flags		= PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG,</div><div class='add'>+</div><div class='add'>+	/* basic functions */</div><div class='add'>+	.config_aneg	= genphy_config_aneg,</div><div class='add'>+	.read_status	= genphy_read_status,</div><div class='add'>+	.config_init	= lan83c185_config_init,</div><div class='add'>+</div><div class='add'>+	/* IRQ related */</div><div class='add'>+	.ack_interrupt	= lan83c185_ack_interrupt,</div><div class='add'>+	.config_intr	= lan83c185_config_intr,</div><div class='add'>+</div><div class='add'>+	.driver		= { .owner = THIS_MODULE, }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init smsc_init(void)</div><div class='add'>+{</div><div class='add'>+	return phy_driver_register (&amp;lan83c185_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit smsc_exit(void)</div><div class='add'>+{</div><div class='add'>+	phy_driver_unregister (&amp;lan83c185_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("SMSC PHY driver");</div><div class='add'>+MODULE_AUTHOR("Herbert Valerio Riedel");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+module_init(smsc_init);</div><div class='add'>+module_exit(smsc_exit);</div><div class='head'>diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c<br/>new file mode 100644<br/>index 000000000000..ffd215d9a9be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/phy/vitesse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/phy/vitesse.c</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/*</div><div class='add'>+ * Driver for Vitesse PHYs</div><div class='add'>+ *</div><div class='add'>+ * Author: Kriston Carson</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Freescale Semiconductor, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ * under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ * Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+</div><div class='add'>+/* Vitesse Extended Control Register 1 */</div><div class='add'>+#define MII_VSC8244_EXT_CON1           0x17</div><div class='add'>+#define MII_VSC8244_EXTCON1_INIT       0x0000</div><div class='add'>+</div><div class='add'>+/* Vitesse Interrupt Mask Register */</div><div class='add'>+#define MII_VSC8244_IMASK		0x19</div><div class='add'>+#define MII_VSC8244_IMASK_IEN		0x8000</div><div class='add'>+#define MII_VSC8244_IMASK_SPEED		0x4000</div><div class='add'>+#define MII_VSC8244_IMASK_LINK		0x2000</div><div class='add'>+#define MII_VSC8244_IMASK_DUPLEX	0x1000</div><div class='add'>+#define MII_VSC8244_IMASK_MASK		0xf000</div><div class='add'>+</div><div class='add'>+/* Vitesse Interrupt Status Register */</div><div class='add'>+#define MII_VSC8244_ISTAT		0x1a</div><div class='add'>+#define MII_VSC8244_ISTAT_STATUS	0x8000</div><div class='add'>+#define MII_VSC8244_ISTAT_SPEED		0x4000</div><div class='add'>+#define MII_VSC8244_ISTAT_LINK		0x2000</div><div class='add'>+#define MII_VSC8244_ISTAT_DUPLEX	0x1000</div><div class='add'>+</div><div class='add'>+/* Vitesse Auxiliary Control/Status Register */</div><div class='add'>+#define MII_VSC8244_AUX_CONSTAT        	0x1c</div><div class='add'>+#define MII_VSC8244_AUXCONSTAT_INIT    	0x0004</div><div class='add'>+#define MII_VSC8244_AUXCONSTAT_DUPLEX  	0x0020</div><div class='add'>+#define MII_VSC8244_AUXCONSTAT_SPEED   	0x0018</div><div class='add'>+#define MII_VSC8244_AUXCONSTAT_GBIT    	0x0010</div><div class='add'>+#define MII_VSC8244_AUXCONSTAT_100     	0x0008</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Vitesse PHY driver");</div><div class='add'>+MODULE_AUTHOR("Kriston Carson");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int vsc824x_config_init(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = phy_write(phydev, MII_VSC8244_AUX_CONSTAT,</div><div class='add'>+			MII_VSC8244_AUXCONSTAT_INIT);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = phy_write(phydev, MII_VSC8244_EXT_CON1,</div><div class='add'>+			MII_VSC8244_EXTCON1_INIT);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc824x_ack_interrupt(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int err = phy_read(phydev, MII_VSC8244_ISTAT);</div><div class='add'>+</div><div class='add'>+	return (err &lt; 0) ? err : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc824x_config_intr(struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;interrupts == PHY_INTERRUPT_ENABLED)</div><div class='add'>+		err = phy_write(phydev, MII_VSC8244_IMASK,</div><div class='add'>+				MII_VSC8244_IMASK_MASK);</div><div class='add'>+	else</div><div class='add'>+		err = phy_write(phydev, MII_VSC8244_IMASK, 0);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Vitesse 824x */</div><div class='add'>+static struct phy_driver vsc8244_driver = {</div><div class='add'>+	.phy_id		= 0x000fc6c2,</div><div class='add'>+	.name		= "Vitesse VSC8244",</div><div class='add'>+	.phy_id_mask	= 0x000fffc0,</div><div class='add'>+	.features	= PHY_GBIT_FEATURES,</div><div class='add'>+	.flags		= PHY_HAS_INTERRUPT,</div><div class='add'>+	.config_init	= &amp;vsc824x_config_init,</div><div class='add'>+	.config_aneg	= &amp;genphy_config_aneg,</div><div class='add'>+	.read_status	= &amp;genphy_read_status,</div><div class='add'>+	.ack_interrupt	= &amp;vsc824x_ack_interrupt,</div><div class='add'>+	.config_intr	= &amp;vsc824x_config_intr,</div><div class='add'>+	.driver 	= { .owner = THIS_MODULE,},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init vsc8244_init(void)</div><div class='add'>+{</div><div class='add'>+	return phy_driver_register(&amp;vsc8244_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit vsc8244_exit(void)</div><div class='add'>+{</div><div class='add'>+	phy_driver_unregister(&amp;vsc8244_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(vsc8244_init);</div><div class='add'>+module_exit(vsc8244_exit);</div><div class='head'>diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c<br/>index b2073fce8216..0ec6e9d57b94 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ppp_generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ppp_generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ppp_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ppp_generic.c</a></div><div class='hunk'>@@ -22,13 +22,11 @@</div><div class='ctx'>  * ==FILEVERSION 20041108==</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/ppp_defs.h&gt;</div><div class='hunk'>@@ -863,10 +861,6 @@ static int __init ppp_init(void)</div><div class='ctx'> 			goto out_chrdev;</div><div class='ctx'> 		}</div><div class='ctx'> 		class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp");</div><div class='del'>-		err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),</div><div class='del'>-				S_IFCHR|S_IRUSR|S_IWUSR, "ppp");</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_class;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -874,9 +868,6 @@ out:</div><div class='ctx'> 		printk(KERN_ERR "failed to register PPP device (%d)\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>-out_class:</div><div class='del'>-	class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));</div><div class='del'>-	class_destroy(ppp_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(PPP_MAJOR, "ppp");</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -1609,8 +1600,6 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)</div><div class='ctx'> 			kfree_skb(skb);</div><div class='ctx'> 			skb = ns;</div><div class='ctx'> 		}</div><div class='del'>-		else if (!pskb_may_pull(skb, skb-&gt;len))</div><div class='del'>-			goto err;</div><div class='ctx'> 		else</div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> </div><div class='hunk'>@@ -2580,8 +2569,7 @@ ppp_find_channel(int unit)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(pch, &amp;new_channels, list) {</div><div class='ctx'> 		if (pch-&gt;file.index == unit) {</div><div class='del'>-			list_del(&amp;pch-&gt;list);</div><div class='del'>-			list_add(&amp;pch-&gt;list, &amp;all_channels);</div><div class='add'>+			list_move(&amp;pch-&gt;list, &amp;all_channels);</div><div class='ctx'> 			return pch;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2684,7 +2672,6 @@ static void __exit ppp_cleanup(void)</div><div class='ctx'> 	cardmap_destroy(&amp;all_ppp_units);</div><div class='ctx'> 	if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)</div><div class='ctx'> 		printk(KERN_ERR "PPP: failed to unregister PPP device\n");</div><div class='del'>-	devfs_remove("ppp");</div><div class='ctx'> 	class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));</div><div class='ctx'> 	class_destroy(ppp_class);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c<br/>index 1985d1b57c45..51ff9a9d1bb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/ppp_mppe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/ppp_mppe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/ppp_mppe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/ppp_mppe.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'>  *                    deprecated in 2.6</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='head'>diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c<br/>index 475dc930380f..0d101a18026a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/pppoe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/pppoe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/pppoe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/pppoe.c</a></div><div class='hunk'>@@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)</div><div class='ctx'> 		 * give dev_queue_xmit something it can free.</div><div class='ctx'> 		 */</div><div class='ctx'> 		skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (skb2 == NULL)</div><div class='add'>+			goto abort;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));</div><div class='head'>diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c<br/>index 0ad3310290f1..4c2f575faad7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/r8169.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/r8169.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/r8169.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/r8169.c</a></div><div class='hunk'>@@ -184,6 +184,7 @@ static const struct {</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id rtl8169_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8169), },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8129), },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), },</div><div class='ctx'> 	{ PCI_DEVICE(0x16ec,			0x0116), },</div><div class='ctx'> 	{ PCI_VENDOR_ID_LINKSYS,		0x1032, PCI_ANY_ID, 0x0024, },</div><div class='hunk'>@@ -1405,7 +1406,7 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,</div><div class='ctx'> 	dev = alloc_etherdev(sizeof (*tp));</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		if (netif_msg_drv(&amp;debug))</div><div class='del'>-			printk(KERN_ERR PFX "unable to alloc new ethernet\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "unable to alloc new ethernet\n");</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1417,10 +1418,8 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,</div><div class='ctx'> 	/* enable device (incl. PCI PM wakeup and hotplug setup) */</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		if (netif_msg_probe(tp)) {</div><div class='del'>-			printk(KERN_ERR PFX "%s: enable failure\n",</div><div class='del'>-			       pci_name(pdev));</div><div class='del'>-		}</div><div class='add'>+		if (netif_msg_probe(tp))</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "enable failure\n");</div><div class='ctx'> 		goto err_out_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1436,37 +1435,32 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,</div><div class='ctx'> 		pci_read_config_word(pdev, pm_cap + PCI_PM_CTRL, &amp;pwr_command);</div><div class='ctx'> 		acpi_idle_state = pwr_command &amp; PCI_PM_CTRL_STATE_MASK;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (netif_msg_probe(tp)) {</div><div class='del'>-			printk(KERN_ERR PFX</div><div class='add'>+		if (netif_msg_probe(tp))</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			       "PowerManagement capability not found.\n");</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* make sure PCI base addr 1 is MMIO */</div><div class='ctx'> 	if (!(pci_resource_flags(pdev, 1) &amp; IORESOURCE_MEM)) {</div><div class='del'>-		if (netif_msg_probe(tp)) {</div><div class='del'>-			printk(KERN_ERR PFX</div><div class='add'>+		if (netif_msg_probe(tp))</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			       "region #1 not an MMIO resource, aborting\n");</div><div class='del'>-		}</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out_mwi;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* check for weird/broken PCI region reporting */</div><div class='ctx'> 	if (pci_resource_len(pdev, 1) &lt; R8169_REGS_SIZE) {</div><div class='del'>-		if (netif_msg_probe(tp)) {</div><div class='del'>-			printk(KERN_ERR PFX</div><div class='add'>+		if (netif_msg_probe(tp))</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			       "Invalid PCI region size(s), aborting\n");</div><div class='del'>-		}</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_out_mwi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = pci_request_regions(pdev, MODULENAME);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		if (netif_msg_probe(tp)) {</div><div class='del'>-			printk(KERN_ERR PFX "%s: could not request regions.\n",</div><div class='del'>-			       pci_name(pdev));</div><div class='del'>-		}</div><div class='add'>+		if (netif_msg_probe(tp))</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "could not request regions.\n");</div><div class='ctx'> 		goto err_out_mwi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1479,10 +1473,9 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='ctx'> 		if (rc &lt; 0) {</div><div class='del'>-			if (netif_msg_probe(tp)) {</div><div class='del'>-				printk(KERN_ERR PFX</div><div class='add'>+			if (netif_msg_probe(tp))</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 				       "DMA configuration failed.\n");</div><div class='del'>-			}</div><div class='ctx'> 			goto err_out_free_res;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1493,7 +1486,7 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,</div><div class='ctx'> 	ioaddr = ioremap(pci_resource_start(pdev, 1), R8169_REGS_SIZE);</div><div class='ctx'> 	if (ioaddr == NULL) {</div><div class='ctx'> 		if (netif_msg_probe(tp))</div><div class='del'>-			printk(KERN_ERR PFX "cannot remap MMIO, aborting\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "cannot remap MMIO, aborting\n");</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1525,9 +1518,9 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,</div><div class='ctx'> 	if (i &lt; 0) {</div><div class='ctx'> 		/* Unknown chip: assume array element #0, original RTL-8169 */</div><div class='ctx'> 		if (netif_msg_probe(tp)) {</div><div class='del'>-			printk(KERN_DEBUG PFX "PCI device %s: "</div><div class='add'>+			dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev,</div><div class='ctx'> 			       "unknown chip version, assuming %s\n",</div><div class='del'>-			       pci_name(pdev), rtl_chip_info[0].name);</div><div class='add'>+			       rtl_chip_info[0].name);</div><div class='ctx'> 		}</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1725,7 +1718,7 @@ static int rtl8169_open(struct net_device *dev)</div><div class='ctx'> 	rtl8169_set_rxbufsize(tp, dev);</div><div class='ctx'> </div><div class='ctx'> 	retval =</div><div class='del'>-	    request_irq(dev-&gt;irq, rtl8169_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	    request_irq(dev-&gt;irq, rtl8169_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -2171,7 +2164,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,</div><div class='ctx'> static inline u32 rtl8169_tso_csum(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;features &amp; NETIF_F_TSO) {</div><div class='del'>-		u32 mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='add'>+		u32 mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> </div><div class='ctx'> 		if (mss)</div><div class='ctx'> 			return LargeSend | ((mss &amp; MSSMask) &lt;&lt; MSSShift);</div><div class='hunk'>@@ -2221,8 +2214,7 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		len = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(len &lt; ETH_ZLEN)) {</div><div class='del'>-			skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-			if (!skb)</div><div class='add'>+			if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 				goto err_update_stats;</div><div class='ctx'> 			len = ETH_ZLEN;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c<br/>index 19c2df9c86fe..c3ed734cbe39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/rrunner.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/rrunner.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/rrunner.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/rrunner.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #define RX_DMA_SKBUFF 1</div><div class='ctx'> #define PKT_COPY_THRESHOLD 512</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -1253,7 +1252,7 @@ static int rr_open(struct net_device *dev)</div><div class='ctx'> 	readl(&amp;regs-&gt;HostCtrl);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rrpriv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, rr_interrupt, SA_SHIRQ, dev-&gt;name, dev)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, rr_interrupt, IRQF_SHARED, dev-&gt;name, dev)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",</div><div class='ctx'> 		       dev-&gt;name, dev-&gt;irq);</div><div class='ctx'> 		ecode = -EAGAIN;</div><div class='head'>diff --git a/drivers/net/rrunner.h b/drivers/net/rrunner.h<br/>index 10baae55953a..2c3c91ebd99f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/rrunner.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/rrunner.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/rrunner.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/rrunner.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _RRUNNER_H_</div><div class='ctx'> #define _RRUNNER_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if ((BITS_PER_LONG != 32) &amp;&amp; (BITS_PER_LONG != 64))</div><div class='head'>diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h<br/>index 00179bc3437f..0ef525899566 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/s2io-regs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/s2io-regs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/s2io-regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/s2io-regs.h</a></div><div class='hunk'>@@ -167,6 +167,7 @@ typedef struct _XENA_dev_config {</div><div class='ctx'> 	u8 unused4[0x08];</div><div class='ctx'> </div><div class='ctx'> 	u64 gpio_int_reg;</div><div class='add'>+#define GPIO_INT_REG_DP_ERR_INT                BIT(0)</div><div class='ctx'> #define GPIO_INT_REG_LINK_DOWN                 BIT(1)</div><div class='ctx'> #define GPIO_INT_REG_LINK_UP                   BIT(2)</div><div class='ctx'> 	u64 gpio_int_mask;</div><div class='hunk'>@@ -187,7 +188,7 @@ typedef struct _XENA_dev_config {</div><div class='ctx'> /* PIC Control registers */</div><div class='ctx'> 	u64 pic_control;</div><div class='ctx'> #define PIC_CNTL_RX_ALARM_MAP_1                BIT(0)</div><div class='del'>-#define PIC_CNTL_SHARED_SPLITS(n)              vBIT(n,11,4)</div><div class='add'>+#define PIC_CNTL_SHARED_SPLITS(n)              vBIT(n,11,5)</div><div class='ctx'> </div><div class='ctx'> 	u64 swapper_ctrl;</div><div class='ctx'> #define SWAPPER_CTRL_PIF_R_FE                  BIT(0)</div><div class='hunk'>@@ -267,6 +268,21 @@ typedef struct _XENA_dev_config {</div><div class='ctx'> </div><div class='ctx'> 	/* General Configuration */</div><div class='ctx'> 	u64 mdio_control;</div><div class='add'>+#define MDIO_MMD_INDX_ADDR(val)		vBIT(val, 0, 16)</div><div class='add'>+#define MDIO_MMD_DEV_ADDR(val)		vBIT(val, 19, 5)</div><div class='add'>+#define MDIO_MMD_PMA_DEV_ADDR		0x1</div><div class='add'>+#define MDIO_MMD_PMD_DEV_ADDR		0x1</div><div class='add'>+#define MDIO_MMD_WIS_DEV_ADDR		0x2</div><div class='add'>+#define MDIO_MMD_PCS_DEV_ADDR		0x3</div><div class='add'>+#define MDIO_MMD_PHYXS_DEV_ADDR		0x4</div><div class='add'>+#define MDIO_MMS_PRT_ADDR(val)		vBIT(val, 27, 5)</div><div class='add'>+#define MDIO_CTRL_START_TRANS(val)	vBIT(val, 56, 4)</div><div class='add'>+#define MDIO_OP(val)			vBIT(val, 60, 2)</div><div class='add'>+#define MDIO_OP_ADDR_TRANS		0x0</div><div class='add'>+#define MDIO_OP_WRITE_TRANS		0x1</div><div class='add'>+#define MDIO_OP_READ_POST_INC_TRANS	0x2</div><div class='add'>+#define MDIO_OP_READ_TRANS		0x3</div><div class='add'>+#define MDIO_MDIO_DATA(val)		vBIT(val, 32, 16)</div><div class='ctx'> </div><div class='ctx'> 	u64 dtx_control;</div><div class='ctx'> </div><div class='hunk'>@@ -284,9 +300,13 @@ typedef struct _XENA_dev_config {</div><div class='ctx'> 	u64 gpio_control;</div><div class='ctx'> #define GPIO_CTRL_GPIO_0		BIT(8)</div><div class='ctx'> 	u64 misc_control;</div><div class='add'>+#define EXT_REQ_EN			BIT(1)</div><div class='ctx'> #define MISC_LINK_STABILITY_PRD(val)   vBIT(val,29,3)</div><div class='ctx'> </div><div class='del'>-	u8 unused7_1[0x240 - 0x208];</div><div class='add'>+	u8 unused7_1[0x230 - 0x208];</div><div class='add'>+</div><div class='add'>+	u64 pic_control2;</div><div class='add'>+	u64 ini_dperr_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	u64 wreq_split_mask;</div><div class='ctx'> #define	WREQ_SPLIT_MASK_SET_MASK(val)	vBIT(val, 52, 12)</div><div class='hunk'>@@ -493,6 +513,7 @@ typedef struct _XENA_dev_config {</div><div class='ctx'> #define PRC_CTRL_NO_SNOOP_DESC                 BIT(22)</div><div class='ctx'> #define PRC_CTRL_NO_SNOOP_BUFF                 BIT(23)</div><div class='ctx'> #define PRC_CTRL_BIMODAL_INTERRUPT             BIT(37)</div><div class='add'>+#define PRC_CTRL_GROUP_READS                   BIT(38)</div><div class='ctx'> #define PRC_CTRL_RXD_BACKOFF_INTERVAL(val)     vBIT(val,40,24)</div><div class='ctx'> </div><div class='ctx'> 	u64 prc_alarm_action;</div><div class='hunk'>@@ -541,7 +562,12 @@ typedef struct _XENA_dev_config {</div><div class='ctx'> #define RX_PA_CFG_IGNORE_LLC_CTRL          BIT(3)</div><div class='ctx'> #define RX_PA_CFG_IGNORE_L2_ERR            BIT(6)</div><div class='ctx'> </div><div class='del'>-	u8 unused12[0x700 - 0x1D8];</div><div class='add'>+	u64 unused_11_1;</div><div class='add'>+</div><div class='add'>+	u64 ring_bump_counter1;</div><div class='add'>+	u64 ring_bump_counter2;</div><div class='add'>+</div><div class='add'>+	u8 unused12[0x700 - 0x1F0];</div><div class='ctx'> </div><div class='ctx'> 	u64 rxdma_debug_ctrl;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c<br/>index 79208f434ac1..e1fe3a0a7b0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/s2io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/s2io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/s2io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/s2io.c</a></div><div class='hunk'>@@ -26,18 +26,24 @@</div><div class='ctx'>  *</div><div class='ctx'>  * The module loadable parameters that are supported by the driver and a brief</div><div class='ctx'>  * explaination of all the variables.</div><div class='add'>+ *</div><div class='ctx'>  * rx_ring_num : This can be used to program the number of receive rings used</div><div class='ctx'>  * in the driver.</div><div class='del'>- * rx_ring_sz: This defines the number of descriptors each ring can have. This</div><div class='del'>- * is also an array of size 8.</div><div class='add'>+ * rx_ring_sz: This defines the number of receive blocks each ring can have.</div><div class='add'>+ *     This is also an array of size 8.</div><div class='ctx'>  * rx_ring_mode: This defines the operation mode of all 8 rings. The valid</div><div class='ctx'>  *		values are 1, 2 and 3.</div><div class='ctx'>  * tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver.</div><div class='ctx'>  * tx_fifo_len: This too is an array of 8. Each element defines the number of</div><div class='ctx'>  * Tx descriptors that can be associated with each corresponding FIFO.</div><div class='add'>+ * intr_type: This defines the type of interrupt. The values can be 0(INTA),</div><div class='add'>+ *     1(MSI), 2(MSI_X). Default value is '0(INTA)'</div><div class='add'>+ * lro: Specifies whether to enable Large Receive Offload (LRO) or not.</div><div class='add'>+ *     Possible values '1' for enable '0' for disable. Default is '0'</div><div class='add'>+ * lro_max_pkts: This parameter defines maximum number of packets can be</div><div class='add'>+ *     aggregated as a single large packet</div><div class='ctx'>  ************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -70,7 +76,7 @@</div><div class='ctx'> #include "s2io.h"</div><div class='ctx'> #include "s2io-regs.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION "2.0.11.2"</div><div class='add'>+#define DRV_VERSION "2.0.14.2"</div><div class='ctx'> </div><div class='ctx'> /* S2io Driver name &amp; version. */</div><div class='ctx'> static char s2io_driver_name[] = "Neterion";</div><div class='hunk'>@@ -106,18 +112,14 @@ static inline int RXD_IS_UP2DT(RxD_t *rxdp)</div><div class='ctx'> #define LOW	2</div><div class='ctx'> static inline int rx_buffer_level(nic_t * sp, int rxb_size, int ring)</div><div class='ctx'> {</div><div class='del'>-	int level = 0;</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> </div><div class='ctx'> 	mac_control = &amp;sp-&gt;mac_control;</div><div class='del'>-	if ((mac_control-&gt;rings[ring].pkt_cnt - rxb_size) &gt; 16) {</div><div class='del'>-		level = LOW;</div><div class='del'>-		if (rxb_size &lt;= rxd_count[sp-&gt;rxd_mode]) {</div><div class='del'>-			level = PANIC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return level;</div><div class='add'>+	if (rxb_size &lt;= rxd_count[sp-&gt;rxd_mode])</div><div class='add'>+		return PANIC;</div><div class='add'>+	else if ((mac_control-&gt;rings[ring].pkt_cnt - rxb_size) &gt; 16)</div><div class='add'>+		return  LOW;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Ethtool related variables and Macros. */</div><div class='hunk'>@@ -136,7 +138,11 @@ static char ethtool_stats_keys[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	{"tmac_mcst_frms"},</div><div class='ctx'> 	{"tmac_bcst_frms"},</div><div class='ctx'> 	{"tmac_pause_ctrl_frms"},</div><div class='add'>+	{"tmac_ttl_octets"},</div><div class='add'>+	{"tmac_ucst_frms"},</div><div class='add'>+	{"tmac_nucst_frms"},</div><div class='ctx'> 	{"tmac_any_err_frms"},</div><div class='add'>+	{"tmac_ttl_less_fb_octets"},</div><div class='ctx'> 	{"tmac_vld_ip_octets"},</div><div class='ctx'> 	{"tmac_vld_ip"},</div><div class='ctx'> 	{"tmac_drop_ip"},</div><div class='hunk'>@@ -151,13 +157,27 @@ static char ethtool_stats_keys[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	{"rmac_vld_mcst_frms"},</div><div class='ctx'> 	{"rmac_vld_bcst_frms"},</div><div class='ctx'> 	{"rmac_in_rng_len_err_frms"},</div><div class='add'>+	{"rmac_out_rng_len_err_frms"},</div><div class='ctx'> 	{"rmac_long_frms"},</div><div class='ctx'> 	{"rmac_pause_ctrl_frms"},</div><div class='add'>+	{"rmac_unsup_ctrl_frms"},</div><div class='add'>+	{"rmac_ttl_octets"},</div><div class='add'>+	{"rmac_accepted_ucst_frms"},</div><div class='add'>+	{"rmac_accepted_nucst_frms"},</div><div class='ctx'> 	{"rmac_discarded_frms"},</div><div class='add'>+	{"rmac_drop_events"},</div><div class='add'>+	{"rmac_ttl_less_fb_octets"},</div><div class='add'>+	{"rmac_ttl_frms"},</div><div class='ctx'> 	{"rmac_usized_frms"},</div><div class='ctx'> 	{"rmac_osized_frms"},</div><div class='ctx'> 	{"rmac_frag_frms"},</div><div class='ctx'> 	{"rmac_jabber_frms"},</div><div class='add'>+	{"rmac_ttl_64_frms"},</div><div class='add'>+	{"rmac_ttl_65_127_frms"},</div><div class='add'>+	{"rmac_ttl_128_255_frms"},</div><div class='add'>+	{"rmac_ttl_256_511_frms"},</div><div class='add'>+	{"rmac_ttl_512_1023_frms"},</div><div class='add'>+	{"rmac_ttl_1024_1518_frms"},</div><div class='ctx'> 	{"rmac_ip"},</div><div class='ctx'> 	{"rmac_ip_octets"},</div><div class='ctx'> 	{"rmac_hdr_err_ip"},</div><div class='hunk'>@@ -166,12 +186,82 @@ static char ethtool_stats_keys[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	{"rmac_tcp"},</div><div class='ctx'> 	{"rmac_udp"},</div><div class='ctx'> 	{"rmac_err_drp_udp"},</div><div class='add'>+	{"rmac_xgmii_err_sym"},</div><div class='add'>+	{"rmac_frms_q0"},</div><div class='add'>+	{"rmac_frms_q1"},</div><div class='add'>+	{"rmac_frms_q2"},</div><div class='add'>+	{"rmac_frms_q3"},</div><div class='add'>+	{"rmac_frms_q4"},</div><div class='add'>+	{"rmac_frms_q5"},</div><div class='add'>+	{"rmac_frms_q6"},</div><div class='add'>+	{"rmac_frms_q7"},</div><div class='add'>+	{"rmac_full_q0"},</div><div class='add'>+	{"rmac_full_q1"},</div><div class='add'>+	{"rmac_full_q2"},</div><div class='add'>+	{"rmac_full_q3"},</div><div class='add'>+	{"rmac_full_q4"},</div><div class='add'>+	{"rmac_full_q5"},</div><div class='add'>+	{"rmac_full_q6"},</div><div class='add'>+	{"rmac_full_q7"},</div><div class='ctx'> 	{"rmac_pause_cnt"},</div><div class='add'>+	{"rmac_xgmii_data_err_cnt"},</div><div class='add'>+	{"rmac_xgmii_ctrl_err_cnt"},</div><div class='ctx'> 	{"rmac_accepted_ip"},</div><div class='ctx'> 	{"rmac_err_tcp"},</div><div class='add'>+	{"rd_req_cnt"},</div><div class='add'>+	{"new_rd_req_cnt"},</div><div class='add'>+	{"new_rd_req_rtry_cnt"},</div><div class='add'>+	{"rd_rtry_cnt"},</div><div class='add'>+	{"wr_rtry_rd_ack_cnt"},</div><div class='add'>+	{"wr_req_cnt"},</div><div class='add'>+	{"new_wr_req_cnt"},</div><div class='add'>+	{"new_wr_req_rtry_cnt"},</div><div class='add'>+	{"wr_rtry_cnt"},</div><div class='add'>+	{"wr_disc_cnt"},</div><div class='add'>+	{"rd_rtry_wr_ack_cnt"},</div><div class='add'>+	{"txp_wr_cnt"},</div><div class='add'>+	{"txd_rd_cnt"},</div><div class='add'>+	{"txd_wr_cnt"},</div><div class='add'>+	{"rxd_rd_cnt"},</div><div class='add'>+	{"rxd_wr_cnt"},</div><div class='add'>+	{"txf_rd_cnt"},</div><div class='add'>+	{"rxf_wr_cnt"},</div><div class='add'>+	{"rmac_ttl_1519_4095_frms"},</div><div class='add'>+	{"rmac_ttl_4096_8191_frms"},</div><div class='add'>+	{"rmac_ttl_8192_max_frms"},</div><div class='add'>+	{"rmac_ttl_gt_max_frms"},</div><div class='add'>+	{"rmac_osized_alt_frms"},</div><div class='add'>+	{"rmac_jabber_alt_frms"},</div><div class='add'>+	{"rmac_gt_max_alt_frms"},</div><div class='add'>+	{"rmac_vlan_frms"},</div><div class='add'>+	{"rmac_len_discard"},</div><div class='add'>+	{"rmac_fcs_discard"},</div><div class='add'>+	{"rmac_pf_discard"},</div><div class='add'>+	{"rmac_da_discard"},</div><div class='add'>+	{"rmac_red_discard"},</div><div class='add'>+	{"rmac_rts_discard"},</div><div class='add'>+	{"rmac_ingm_full_discard"},</div><div class='add'>+	{"link_fault_cnt"},</div><div class='ctx'> 	{"\n DRIVER STATISTICS"},</div><div class='ctx'> 	{"single_bit_ecc_errs"},</div><div class='ctx'> 	{"double_bit_ecc_errs"},</div><div class='add'>+	{"parity_err_cnt"},</div><div class='add'>+	{"serious_err_cnt"},</div><div class='add'>+	{"soft_reset_cnt"},</div><div class='add'>+	{"fifo_full_cnt"},</div><div class='add'>+	{"ring_full_cnt"},</div><div class='add'>+	("alarm_transceiver_temp_high"),</div><div class='add'>+	("alarm_transceiver_temp_low"),</div><div class='add'>+	("alarm_laser_bias_current_high"),</div><div class='add'>+	("alarm_laser_bias_current_low"),</div><div class='add'>+	("alarm_laser_output_power_high"),</div><div class='add'>+	("alarm_laser_output_power_low"),</div><div class='add'>+	("warn_transceiver_temp_high"),</div><div class='add'>+	("warn_transceiver_temp_low"),</div><div class='add'>+	("warn_laser_bias_current_high"),</div><div class='add'>+	("warn_laser_bias_current_low"),</div><div class='add'>+	("warn_laser_output_power_high"),</div><div class='add'>+	("warn_laser_output_power_low"),</div><div class='ctx'> 	("lro_aggregated_pkts"),</div><div class='ctx'> 	("lro_flush_both_count"),</div><div class='ctx'> 	("lro_out_of_sequence_pkts"),</div><div class='hunk'>@@ -220,9 +310,7 @@ static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)</div><div class='ctx'>  * the XAUI.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SWITCH_SIGN	0xA5A5A5A5A5A5A5A5ULL</div><div class='ctx'> #define	END_SIGN	0x0</div><div class='del'>-</div><div class='ctx'> static const u64 herc_act_dtx_cfg[] = {</div><div class='ctx'> 	/* Set address */</div><div class='ctx'> 	0x8000051536750000ULL, 0x80000515367500E0ULL,</div><div class='hunk'>@@ -244,37 +332,19 @@ static const u64 herc_act_dtx_cfg[] = {</div><div class='ctx'> 	END_SIGN</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u64 xena_mdio_cfg[] = {</div><div class='del'>-	/* Reset PMA PLL */</div><div class='del'>-	0xC001010000000000ULL, 0xC0010100000000E0ULL,</div><div class='del'>-	0xC0010100008000E4ULL,</div><div class='del'>-	/* Remove Reset from PMA PLL */</div><div class='del'>-	0xC001010000000000ULL, 0xC0010100000000E0ULL,</div><div class='del'>-	0xC0010100000000E4ULL,</div><div class='del'>-	END_SIGN</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const u64 xena_dtx_cfg[] = {</div><div class='add'>+	/* Set address */</div><div class='ctx'> 	0x8000051500000000ULL, 0x80000515000000E0ULL,</div><div class='del'>-	0x80000515D93500E4ULL, 0x8001051500000000ULL,</div><div class='del'>-	0x80010515000000E0ULL, 0x80010515001E00E4ULL,</div><div class='del'>-	0x8002051500000000ULL, 0x80020515000000E0ULL,</div><div class='del'>-	0x80020515F21000E4ULL,</div><div class='del'>-	/* Set PADLOOPBACKN */</div><div class='del'>-	0x8002051500000000ULL, 0x80020515000000E0ULL,</div><div class='del'>-	0x80020515B20000E4ULL, 0x8003051500000000ULL,</div><div class='del'>-	0x80030515000000E0ULL, 0x80030515B20000E4ULL,</div><div class='del'>-	0x8004051500000000ULL, 0x80040515000000E0ULL,</div><div class='del'>-	0x80040515B20000E4ULL, 0x8005051500000000ULL,</div><div class='del'>-	0x80050515000000E0ULL, 0x80050515B20000E4ULL,</div><div class='del'>-	SWITCH_SIGN,</div><div class='del'>-	/* Remove PADLOOPBACKN */</div><div class='add'>+	/* Write data */</div><div class='add'>+	0x80000515D9350004ULL, 0x80000515D93500E4ULL,</div><div class='add'>+	/* Set address */</div><div class='add'>+	0x8001051500000000ULL, 0x80010515000000E0ULL,</div><div class='add'>+	/* Write data */</div><div class='add'>+	0x80010515001E0004ULL, 0x80010515001E00E4ULL,</div><div class='add'>+	/* Set address */</div><div class='ctx'> 	0x8002051500000000ULL, 0x80020515000000E0ULL,</div><div class='del'>-	0x80020515F20000E4ULL, 0x8003051500000000ULL,</div><div class='del'>-	0x80030515000000E0ULL, 0x80030515F20000E4ULL,</div><div class='del'>-	0x8004051500000000ULL, 0x80040515000000E0ULL,</div><div class='del'>-	0x80040515F20000E4ULL, 0x8005051500000000ULL,</div><div class='del'>-	0x80050515000000E0ULL, 0x80050515F20000E4ULL,</div><div class='add'>+	/* Write data */</div><div class='add'>+	0x80020515F2100004ULL, 0x80020515F21000E4ULL,</div><div class='ctx'> 	END_SIGN</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -303,15 +373,15 @@ static const u64 fix_mac[] = {</div><div class='ctx'> /* Module Loadable parameters. */</div><div class='ctx'> static unsigned int tx_fifo_num = 1;</div><div class='ctx'> static unsigned int tx_fifo_len[MAX_TX_FIFOS] =</div><div class='del'>-    {[0 ...(MAX_TX_FIFOS - 1)] = 0 };</div><div class='add'>+    {DEFAULT_FIFO_0_LEN, [1 ...(MAX_TX_FIFOS - 1)] = DEFAULT_FIFO_1_7_LEN};</div><div class='ctx'> static unsigned int rx_ring_num = 1;</div><div class='ctx'> static unsigned int rx_ring_sz[MAX_RX_RINGS] =</div><div class='del'>-    {[0 ...(MAX_RX_RINGS - 1)] = 0 };</div><div class='add'>+    {[0 ...(MAX_RX_RINGS - 1)] = SMALL_BLK_CNT};</div><div class='ctx'> static unsigned int rts_frm_len[MAX_RX_RINGS] =</div><div class='ctx'>     {[0 ...(MAX_RX_RINGS - 1)] = 0 };</div><div class='ctx'> static unsigned int rx_ring_mode = 1;</div><div class='ctx'> static unsigned int use_continuous_tx_intrs = 1;</div><div class='del'>-static unsigned int rmac_pause_time = 65535;</div><div class='add'>+static unsigned int rmac_pause_time = 0x100;</div><div class='ctx'> static unsigned int mc_pause_threshold_q0q3 = 187;</div><div class='ctx'> static unsigned int mc_pause_threshold_q4q7 = 187;</div><div class='ctx'> static unsigned int shared_splits;</div><div class='hunk'>@@ -549,11 +619,6 @@ static int init_shared_mem(struct s2io_nic *nic)</div><div class='ctx'> 					rx_blocks-&gt;block_dma_addr +</div><div class='ctx'> 					(rxd_size[nic-&gt;rxd_mode] * l);</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			mac_control-&gt;rings[i].rx_blocks[j].block_virt_addr =</div><div class='del'>-				tmp_v_addr;</div><div class='del'>-			mac_control-&gt;rings[i].rx_blocks[j].block_dma_addr =</div><div class='del'>-				tmp_p_addr;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Interlinking all Rx Blocks */</div><div class='ctx'> 		for (j = 0; j &lt; blk_cnt; j++) {</div><div class='hunk'>@@ -772,7 +837,21 @@ static int s2io_verify_pci_mode(nic_t *nic)</div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define NEC_VENID   0x1033</div><div class='add'>+#define NEC_DEVID   0x0125</div><div class='add'>+static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *tdev = NULL;</div><div class='add'>+	while ((tdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, tdev)) != NULL) {</div><div class='add'>+		if ((tdev-&gt;vendor == NEC_VENID) &amp;&amp; (tdev-&gt;device == NEC_DEVID)){</div><div class='add'>+			if (tdev-&gt;bus == s2io_pdev-&gt;bus-&gt;parent)</div><div class='add'>+				return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int bus_speed[8] = {33, 133, 133, 200, 266, 133, 200, 266};</div><div class='ctx'> /**</div><div class='ctx'>  * s2io_print_pci_mode -</div><div class='ctx'>  */</div><div class='hunk'>@@ -789,6 +868,14 @@ static int s2io_print_pci_mode(nic_t *nic)</div><div class='ctx'> 	if ( val64 &amp; PCI_MODE_UNKNOWN_MODE)</div><div class='ctx'> 		return -1;	/* Unknown PCI mode */</div><div class='ctx'> </div><div class='add'>+	config-&gt;bus_speed = bus_speed[mode];</div><div class='add'>+</div><div class='add'>+	if (s2io_on_nec_bridge(nic-&gt;pdev)) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "%s: Device is on PCI-E bus\n",</div><div class='add'>+							nic-&gt;dev-&gt;name);</div><div class='add'>+		return mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (val64 &amp; PCI_MODE_32_BITS) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: Device is on 32 bit ", nic-&gt;dev-&gt;name);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -798,35 +885,27 @@ static int s2io_print_pci_mode(nic_t *nic)</div><div class='ctx'> 	switch(mode) {</div><div class='ctx'> 		case PCI_MODE_PCI_33:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "33MHz PCI bus\n");</div><div class='del'>-			config-&gt;bus_speed = 33;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCI_66:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "66MHz PCI bus\n");</div><div class='del'>-			config-&gt;bus_speed = 133;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCIX_M1_66:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "66MHz PCIX(M1) bus\n");</div><div class='del'>-			config-&gt;bus_speed = 133; /* Herc doubles the clock rate */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCIX_M1_100:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "100MHz PCIX(M1) bus\n");</div><div class='del'>-			config-&gt;bus_speed = 200;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCIX_M1_133:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "133MHz PCIX(M1) bus\n");</div><div class='del'>-			config-&gt;bus_speed = 266;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCIX_M2_66:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "133MHz PCIX(M2) bus\n");</div><div class='del'>-			config-&gt;bus_speed = 133;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCIX_M2_100:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "200MHz PCIX(M2) bus\n");</div><div class='del'>-			config-&gt;bus_speed = 200;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PCI_MODE_PCIX_M2_133:</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "266MHz PCIX(M2) bus\n");</div><div class='del'>-			config-&gt;bus_speed = 266;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -1;	/* Unsupported bus speed */</div><div class='hunk'>@@ -854,7 +933,7 @@ static int init_nic(struct s2io_nic *nic)</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> 	struct config_param *config;</div><div class='del'>-	int mdio_cnt = 0, dtx_cnt = 0;</div><div class='add'>+	int dtx_cnt = 0;</div><div class='ctx'> 	unsigned long long mem_share;</div><div class='ctx'> 	int mem_size;</div><div class='ctx'> </div><div class='hunk'>@@ -901,20 +980,6 @@ static int init_nic(struct s2io_nic *nic)</div><div class='ctx'> 	val64 = dev-&gt;mtu;</div><div class='ctx'> 	writeq(vBIT(val64, 2, 14), &amp;bar0-&gt;rmac_max_pyld_len);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Configuring the XAUI Interface of Xena.</div><div class='del'>-	 * ***************************************</div><div class='del'>-	 * To Configure the Xena's XAUI, one has to write a series</div><div class='del'>-	 * of 64 bit values into two registers in a particular</div><div class='del'>-	 * sequence. Hence a macro 'SWITCH_SIGN' has been defined</div><div class='del'>-	 * which will be defined in the array of configuration values</div><div class='del'>-	 * (xena_dtx_cfg &amp; xena_mdio_cfg) at appropriate places</div><div class='del'>-	 * to switch writing from one regsiter to another. We continue</div><div class='del'>-	 * writing these values until we encounter the 'END_SIGN' macro.</div><div class='del'>-	 * For example, After making a series of 21 writes into</div><div class='del'>-	 * dtx_control register the 'SWITCH_SIGN' appears and hence we</div><div class='del'>-	 * start writing into mdio_control until we encounter END_SIGN.</div><div class='del'>-	 */</div><div class='ctx'> 	if (nic-&gt;device_type &amp; XFRAME_II_DEVICE) {</div><div class='ctx'> 		while (herc_act_dtx_cfg[dtx_cnt] != END_SIGN) {</div><div class='ctx'> 			SPECIAL_REG_WRITE(herc_act_dtx_cfg[dtx_cnt],</div><div class='hunk'>@@ -924,35 +989,11 @@ static int init_nic(struct s2io_nic *nic)</div><div class='ctx'> 			dtx_cnt++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		while (1) {</div><div class='del'>-		      dtx_cfg:</div><div class='del'>-			while (xena_dtx_cfg[dtx_cnt] != END_SIGN) {</div><div class='del'>-				if (xena_dtx_cfg[dtx_cnt] == SWITCH_SIGN) {</div><div class='del'>-					dtx_cnt++;</div><div class='del'>-					goto mdio_cfg;</div><div class='del'>-				}</div><div class='del'>-				SPECIAL_REG_WRITE(xena_dtx_cfg[dtx_cnt],</div><div class='del'>-						  &amp;bar0-&gt;dtx_control, UF);</div><div class='del'>-				val64 = readq(&amp;bar0-&gt;dtx_control);</div><div class='del'>-				dtx_cnt++;</div><div class='del'>-			}</div><div class='del'>-		      mdio_cfg:</div><div class='del'>-			while (xena_mdio_cfg[mdio_cnt] != END_SIGN) {</div><div class='del'>-				if (xena_mdio_cfg[mdio_cnt] == SWITCH_SIGN) {</div><div class='del'>-					mdio_cnt++;</div><div class='del'>-					goto dtx_cfg;</div><div class='del'>-				}</div><div class='del'>-				SPECIAL_REG_WRITE(xena_mdio_cfg[mdio_cnt],</div><div class='del'>-						  &amp;bar0-&gt;mdio_control, UF);</div><div class='del'>-				val64 = readq(&amp;bar0-&gt;mdio_control);</div><div class='del'>-				mdio_cnt++;</div><div class='del'>-			}</div><div class='del'>-			if ((xena_dtx_cfg[dtx_cnt] == END_SIGN) &amp;&amp;</div><div class='del'>-			    (xena_mdio_cfg[mdio_cnt] == END_SIGN)) {</div><div class='del'>-				break;</div><div class='del'>-			} else {</div><div class='del'>-				goto dtx_cfg;</div><div class='del'>-			}</div><div class='add'>+		while (xena_dtx_cfg[dtx_cnt] != END_SIGN) {</div><div class='add'>+			SPECIAL_REG_WRITE(xena_dtx_cfg[dtx_cnt],</div><div class='add'>+					  &amp;bar0-&gt;dtx_control, UF);</div><div class='add'>+			val64 = readq(&amp;bar0-&gt;dtx_control);</div><div class='add'>+			dtx_cnt++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -994,11 +1035,6 @@ static int init_nic(struct s2io_nic *nic)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable Tx FIFO partition 0. */</div><div class='del'>-	val64 = readq(&amp;bar0-&gt;tx_fifo_partition_0);</div><div class='del'>-	val64 |= BIT(0);	/* To enable the FIFO partition. */</div><div class='del'>-	writeq(val64, &amp;bar0-&gt;tx_fifo_partition_0);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable 4 PCCs for Xena1, 2 and 3 as per H/W bug</div><div class='ctx'> 	 * SXE-008 TRANSMIT DMA ARBITRATION ISSUE.</div><div class='hunk'>@@ -1177,6 +1213,11 @@ static int init_nic(struct s2io_nic *nic)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Enable Tx FIFO partition 0. */</div><div class='add'>+	val64 = readq(&amp;bar0-&gt;tx_fifo_partition_0);</div><div class='add'>+	val64 |= (TX_FIFO_PARTITION_EN);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;tx_fifo_partition_0);</div><div class='add'>+</div><div class='ctx'> 	/* Filling the Rx round robin registers as per the</div><div class='ctx'> 	 * number of Rings and steering based on QoS.</div><div class='ctx'>          */</div><div class='hunk'>@@ -1545,19 +1586,26 @@ static int init_nic(struct s2io_nic *nic)</div><div class='ctx'> 	val64 |= PIC_CNTL_SHARED_SPLITS(shared_splits);</div><div class='ctx'> 	writeq(val64, &amp;bar0-&gt;pic_control);</div><div class='ctx'> </div><div class='add'>+	if (nic-&gt;config.bus_speed == 266) {</div><div class='add'>+		writeq(TXREQTO_VAL(0x7f) | TXREQTO_EN, &amp;bar0-&gt;txreqtimeout);</div><div class='add'>+		writeq(0x0, &amp;bar0-&gt;read_retry_delay);</div><div class='add'>+		writeq(0x0, &amp;bar0-&gt;write_retry_delay);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Programming the Herc to split every write transaction</div><div class='ctx'> 	 * that does not start on an ADB to reduce disconnects.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (nic-&gt;device_type == XFRAME_II_DEVICE) {</div><div class='del'>-		val64 = WREQ_SPLIT_MASK_SET_MASK(255);</div><div class='del'>-		writeq(val64, &amp;bar0-&gt;wreq_split_mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setting Link stability period to 64 ms */ </div><div class='del'>-	if (nic-&gt;device_type == XFRAME_II_DEVICE) {</div><div class='del'>-		val64 = MISC_LINK_STABILITY_PRD(3);</div><div class='add'>+		val64 = EXT_REQ_EN | MISC_LINK_STABILITY_PRD(3);</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;misc_control);</div><div class='add'>+		val64 = readq(&amp;bar0-&gt;pic_control2);</div><div class='add'>+		val64 &amp;= ~(BIT(13)|BIT(14)|BIT(15));</div><div class='add'>+		writeq(val64, &amp;bar0-&gt;pic_control2);</div><div class='add'>+	}</div><div class='add'>+	if (strstr(nic-&gt;product_name, "CX4")) {</div><div class='add'>+		val64 = TMAC_AVG_IPG(0x17);</div><div class='add'>+		writeq(val64, &amp;bar0-&gt;tmac_avg_ipg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return SUCCESS;</div><div class='hunk'>@@ -1928,7 +1976,6 @@ static int start_nic(struct s2io_nic *nic)</div><div class='ctx'> 	XENA_dev_config_t __iomem *bar0 = nic-&gt;bar0;</div><div class='ctx'> 	struct net_device *dev = nic-&gt;dev;</div><div class='ctx'> 	register u64 val64 = 0;</div><div class='del'>-	u16 interruptible;</div><div class='ctx'> 	u16 subid, i;</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> 	struct config_param *config;</div><div class='hunk'>@@ -1948,6 +1995,10 @@ static int start_nic(struct s2io_nic *nic)</div><div class='ctx'> 			val64 |= PRC_CTRL_RC_ENABLED;</div><div class='ctx'> 		else</div><div class='ctx'> 			val64 |= PRC_CTRL_RC_ENABLED | PRC_CTRL_RING_MODE_3;</div><div class='add'>+		if (nic-&gt;device_type == XFRAME_II_DEVICE)</div><div class='add'>+			val64 |= PRC_CTRL_GROUP_READS;</div><div class='add'>+		val64 &amp;= ~PRC_CTRL_RXD_BACKOFF_INTERVAL(0xFFFFFF);</div><div class='add'>+		val64 |= PRC_CTRL_RXD_BACKOFF_INTERVAL(0x1000);</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;prc_ctrl_n[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1995,16 +2046,6 @@ static int start_nic(struct s2io_nic *nic)</div><div class='ctx'> 		return FAILURE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*  Enable select interrupts */</div><div class='del'>-	if (nic-&gt;intr_type != INTA)</div><div class='del'>-		en_dis_able_nic_intrs(nic, ENA_ALL_INTRS, DISABLE_INTRS);</div><div class='del'>-	else {</div><div class='del'>-		interruptible = TX_TRAFFIC_INTR | RX_TRAFFIC_INTR;</div><div class='del'>-		interruptible |= TX_PIC_INTR | RX_PIC_INTR;</div><div class='del'>-		interruptible |= TX_MAC_INTR | RX_MAC_INTR;</div><div class='del'>-		en_dis_able_nic_intrs(nic, interruptible, ENABLE_INTRS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * With some switches, link might be already up at this point.</div><div class='ctx'> 	 * Because of this weird behavior, when we enable laser,</div><div class='hunk'>@@ -2018,6 +2059,13 @@ static int start_nic(struct s2io_nic *nic)</div><div class='ctx'> 	val64 |= ADAPTER_EOI_TX_ON;</div><div class='ctx'> 	writeq(val64, &amp;bar0-&gt;adapter_control);</div><div class='ctx'> </div><div class='add'>+	if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER) {</div><div class='add'>+		/*</div><div class='add'>+		 * Dont see link state interrupts initally on some switches,</div><div class='add'>+		 * so directly scheduling the link state task here.</div><div class='add'>+		 */</div><div class='add'>+		schedule_work(&amp;nic-&gt;set_link_task);</div><div class='add'>+	}</div><div class='ctx'> 	/* SXE-002: Initialize link and activity LED */</div><div class='ctx'> 	subid = nic-&gt;pdev-&gt;subsystem_device;</div><div class='ctx'> 	if (((subid &amp; 0xFF) &gt;= 0x07) &amp;&amp;</div><div class='hunk'>@@ -2029,12 +2077,6 @@ static int start_nic(struct s2io_nic *nic)</div><div class='ctx'> 		writeq(val64, (void __iomem *)bar0 + 0x2700);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Don't see link state interrupts on certain switches, so</div><div class='del'>-	 * directly scheduling a link state task from here.</div><div class='del'>-	 */</div><div class='del'>-	schedule_work(&amp;nic-&gt;set_link_task);</div><div class='del'>-</div><div class='ctx'> 	return SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> /**</div><div class='hunk'>@@ -2134,7 +2176,7 @@ static void stop_nic(struct s2io_nic *nic)</div><div class='ctx'> {</div><div class='ctx'> 	XENA_dev_config_t __iomem *bar0 = nic-&gt;bar0;</div><div class='ctx'> 	register u64 val64 = 0;</div><div class='del'>-	u16 interruptible, i;</div><div class='add'>+	u16 interruptible;</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> 	struct config_param *config;</div><div class='ctx'> </div><div class='hunk'>@@ -2147,12 +2189,10 @@ static void stop_nic(struct s2io_nic *nic)</div><div class='ctx'> 	interruptible |= TX_MAC_INTR | RX_MAC_INTR;</div><div class='ctx'> 	en_dis_able_nic_intrs(nic, interruptible, DISABLE_INTRS);</div><div class='ctx'> </div><div class='del'>-	/*  Disable PRCs */</div><div class='del'>-	for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='del'>-		val64 = readq(&amp;bar0-&gt;prc_ctrl_n[i]);</div><div class='del'>-		val64 &amp;= ~((u64) PRC_CTRL_RC_ENABLED);</div><div class='del'>-		writeq(val64, &amp;bar0-&gt;prc_ctrl_n[i]);</div><div class='del'>-	}</div><div class='add'>+	/* Clearing Adapter_En bit of ADAPTER_CONTROL Register */</div><div class='add'>+	val64 = readq(&amp;bar0-&gt;adapter_control);</div><div class='add'>+	val64 &amp;= ~(ADAPTER_CNTL_EN);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;adapter_control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int fill_rxd_3buf(nic_t *nic, RxD_t *rxdp, struct sk_buff *skb)</div><div class='hunk'>@@ -2231,13 +2271,12 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)</div><div class='ctx'> 	alloc_cnt = mac_control-&gt;rings[ring_no].pkt_cnt -</div><div class='ctx'> 	    atomic_read(&amp;nic-&gt;rx_bufs_left[ring_no]);</div><div class='ctx'> </div><div class='add'>+	block_no1 = mac_control-&gt;rings[ring_no].rx_curr_get_info.block_index;</div><div class='add'>+	off1 = mac_control-&gt;rings[ring_no].rx_curr_get_info.offset;</div><div class='ctx'> 	while (alloc_tab &lt; alloc_cnt) {</div><div class='ctx'> 		block_no = mac_control-&gt;rings[ring_no].rx_curr_put_info.</div><div class='ctx'> 		    block_index;</div><div class='del'>-		block_no1 = mac_control-&gt;rings[ring_no].rx_curr_get_info.</div><div class='del'>-		    block_index;</div><div class='ctx'> 		off = mac_control-&gt;rings[ring_no].rx_curr_put_info.offset;</div><div class='del'>-		off1 = mac_control-&gt;rings[ring_no].rx_curr_get_info.offset;</div><div class='ctx'> </div><div class='ctx'> 		rxdp = mac_control-&gt;rings[ring_no].</div><div class='ctx'> 				rx_blocks[block_no].rxds[off].virt_addr;</div><div class='hunk'>@@ -2307,9 +2346,9 @@ static int fill_rx_buffers(struct s2io_nic *nic, int ring_no)</div><div class='ctx'> 			memset(rxdp, 0, sizeof(RxD1_t));</div><div class='ctx'> 			skb_reserve(skb, NET_IP_ALIGN);</div><div class='ctx'> 			((RxD1_t*)rxdp)-&gt;Buffer0_ptr = pci_map_single</div><div class='del'>-			    (nic-&gt;pdev, skb-&gt;data, size, PCI_DMA_FROMDEVICE);</div><div class='del'>-			rxdp-&gt;Control_2 &amp;= (~MASK_BUFFER0_SIZE_1);</div><div class='del'>-			rxdp-&gt;Control_2 |= SET_BUFFER0_SIZE_1(size);</div><div class='add'>+			    (nic-&gt;pdev, skb-&gt;data, size - NET_IP_ALIGN,</div><div class='add'>+				PCI_DMA_FROMDEVICE);</div><div class='add'>+			rxdp-&gt;Control_2 = SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		} else if (nic-&gt;rxd_mode &gt;= RXD_MODE_3A) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -2516,7 +2555,7 @@ static int s2io_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> 	struct config_param *config;</div><div class='ctx'> 	XENA_dev_config_t __iomem *bar0 = nic-&gt;bar0;</div><div class='del'>-	u64 val64;</div><div class='add'>+	u64 val64 = 0xFFFFFFFFFFFFFFFFULL;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;nic-&gt;isr_cnt);</div><div class='hunk'>@@ -2528,8 +2567,8 @@ static int s2io_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 		nic-&gt;pkts_to_process = dev-&gt;quota;</div><div class='ctx'> 	org_pkts_to_process = nic-&gt;pkts_to_process;</div><div class='ctx'> </div><div class='del'>-	val64 = readq(&amp;bar0-&gt;rx_traffic_int);</div><div class='ctx'> 	writeq(val64, &amp;bar0-&gt;rx_traffic_int);</div><div class='add'>+	val64 = readl(&amp;bar0-&gt;rx_traffic_int);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='ctx'> 		rx_intr_handler(&amp;mac_control-&gt;rings[i]);</div><div class='hunk'>@@ -2554,7 +2593,8 @@ static int s2io_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Re enable the Rx interrupts. */</div><div class='del'>-	en_dis_able_nic_intrs(nic, RX_TRAFFIC_INTR, ENABLE_INTRS);</div><div class='add'>+	writeq(0x0, &amp;bar0-&gt;rx_traffic_mask);</div><div class='add'>+	val64 = readl(&amp;bar0-&gt;rx_traffic_mask);</div><div class='ctx'> 	atomic_dec(&amp;nic-&gt;isr_cnt);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2575,6 +2615,50 @@ no_rx:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * s2io_netpoll - Rx interrupt service handler for netpoll support</div><div class='add'>+ * @dev : pointer to the device structure.</div><div class='add'>+ * Description:</div><div class='add'>+ * Polling 'interrupt' - used by things like netconsole to send skbs</div><div class='add'>+ * without having to re-enable interrupts. It's not called while</div><div class='add'>+ * the interrupt routine is executing.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+static void s2io_netpoll(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	nic_t *nic = dev-&gt;priv;</div><div class='add'>+	mac_info_t *mac_control;</div><div class='add'>+	struct config_param *config;</div><div class='add'>+	XENA_dev_config_t __iomem *bar0 = nic-&gt;bar0;</div><div class='add'>+	u64 val64;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	disable_irq(dev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;nic-&gt;isr_cnt);</div><div class='add'>+	mac_control = &amp;nic-&gt;mac_control;</div><div class='add'>+	config = &amp;nic-&gt;config;</div><div class='add'>+</div><div class='add'>+	val64 = readq(&amp;bar0-&gt;rx_traffic_int);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;rx_traffic_int);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; config-&gt;rx_ring_num; i++)</div><div class='add'>+		rx_intr_handler(&amp;mac_control-&gt;rings[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='add'>+		if (fill_rx_buffers(nic, i) == -ENOMEM) {</div><div class='add'>+			DBG_PRINT(ERR_DBG, "%s:Out of memory", dev-&gt;name);</div><div class='add'>+			DBG_PRINT(ERR_DBG, " in Rx Netpoll!!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	atomic_dec(&amp;nic-&gt;isr_cnt);</div><div class='add'>+	enable_irq(dev-&gt;irq);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  rx_intr_handler - Rx interrupt handler</div><div class='ctx'>  *  @nic: device private variable.</div><div class='ctx'>  *  Description:</div><div class='hunk'>@@ -2666,6 +2750,7 @@ static void rx_intr_handler(ring_info_t *ring_data)</div><div class='ctx'> 					 ((RxD3_t*)rxdp)-&gt;Buffer2_ptr,</div><div class='ctx'> 					 dev-&gt;mtu, PCI_DMA_FROMDEVICE);</div><div class='ctx'> 		}</div><div class='add'>+		prefetch(skb-&gt;data);</div><div class='ctx'> 		rx_osm_handler(ring_data, rxdp);</div><div class='ctx'> 		get_info.offset++;</div><div class='ctx'> 		ring_data-&gt;rx_curr_get_info.offset = get_info.offset;</div><div class='hunk'>@@ -2737,6 +2822,10 @@ static void tx_intr_handler(fifo_info_t *fifo_data)</div><div class='ctx'> 		if (txdlp-&gt;Control_1 &amp; TXD_T_CODE) {</div><div class='ctx'> 			unsigned long long err;</div><div class='ctx'> 			err = txdlp-&gt;Control_1 &amp; TXD_T_CODE;</div><div class='add'>+			if (err &amp; 0x1) {</div><div class='add'>+				nic-&gt;mac_control.stats_info-&gt;sw_stat.</div><div class='add'>+						parity_err_cnt++;</div><div class='add'>+			}</div><div class='ctx'> 			if ((err &gt;&gt; 48) == 0xA) {</div><div class='ctx'> 				DBG_PRINT(TX_DBG, "TxD returned due \</div><div class='ctx'> to loss of link\n");</div><div class='hunk'>@@ -2760,7 +2849,8 @@ to loss of link\n");</div><div class='ctx'> 		dev_kfree_skb_irq(skb);</div><div class='ctx'> </div><div class='ctx'> 		get_info.offset++;</div><div class='del'>-		get_info.offset %= get_info.fifo_len + 1;</div><div class='add'>+		if (get_info.offset == get_info.fifo_len + 1)</div><div class='add'>+			get_info.offset = 0;</div><div class='ctx'> 		txdlp = (TxD_t *) fifo_data-&gt;list_info</div><div class='ctx'> 		    [get_info.offset].list_virt_addr;</div><div class='ctx'> 		fifo_data-&gt;tx_curr_get_info.offset =</div><div class='hunk'>@@ -2774,6 +2864,256 @@ to loss of link\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *  s2io_mdio_write - Function to write in to MDIO registers</div><div class='add'>+ *  @mmd_type : MMD type value (PMA/PMD/WIS/PCS/PHYXS)</div><div class='add'>+ *  @addr     : address value</div><div class='add'>+ *  @value    : data value</div><div class='add'>+ *  @dev      : pointer to net_device structure</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This function is used to write values to the MDIO registers</div><div class='add'>+ *  NONE</div><div class='add'>+ */</div><div class='add'>+static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u64 val64 = 0x0;</div><div class='add'>+	nic_t *sp = dev-&gt;priv;</div><div class='add'>+	XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp-&gt;bar0;</div><div class='add'>+</div><div class='add'>+	//address transaction</div><div class='add'>+	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)</div><div class='add'>+			| MDIO_MMD_DEV_ADDR(mmd_type)</div><div class='add'>+			| MDIO_MMS_PRT_ADDR(0x0);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	val64 = val64 | MDIO_CTRL_START_TRANS(0xE);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='add'>+	//Data transaction</div><div class='add'>+	val64 = 0x0;</div><div class='add'>+	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)</div><div class='add'>+			| MDIO_MMD_DEV_ADDR(mmd_type)</div><div class='add'>+			| MDIO_MMS_PRT_ADDR(0x0)</div><div class='add'>+			| MDIO_MDIO_DATA(value)</div><div class='add'>+			| MDIO_OP(MDIO_OP_WRITE_TRANS);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	val64 = val64 | MDIO_CTRL_START_TRANS(0xE);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='add'>+	val64 = 0x0;</div><div class='add'>+	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)</div><div class='add'>+	| MDIO_MMD_DEV_ADDR(mmd_type)</div><div class='add'>+	| MDIO_MMS_PRT_ADDR(0x0)</div><div class='add'>+	| MDIO_OP(MDIO_OP_READ_TRANS);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	val64 = val64 | MDIO_CTRL_START_TRANS(0xE);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  s2io_mdio_read - Function to write in to MDIO registers</div><div class='add'>+ *  @mmd_type : MMD type value (PMA/PMD/WIS/PCS/PHYXS)</div><div class='add'>+ *  @addr     : address value</div><div class='add'>+ *  @dev      : pointer to net_device structure</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This function is used to read values to the MDIO registers</div><div class='add'>+ *  NONE</div><div class='add'>+ */</div><div class='add'>+static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u64 val64 = 0x0;</div><div class='add'>+	u64 rval64 = 0x0;</div><div class='add'>+	nic_t *sp = dev-&gt;priv;</div><div class='add'>+	XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp-&gt;bar0;</div><div class='add'>+</div><div class='add'>+	/* address transaction */</div><div class='add'>+	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)</div><div class='add'>+			| MDIO_MMD_DEV_ADDR(mmd_type)</div><div class='add'>+			| MDIO_MMS_PRT_ADDR(0x0);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	val64 = val64 | MDIO_CTRL_START_TRANS(0xE);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='add'>+	/* Data transaction */</div><div class='add'>+	val64 = 0x0;</div><div class='add'>+	val64 = val64 | MDIO_MMD_INDX_ADDR(addr)</div><div class='add'>+			| MDIO_MMD_DEV_ADDR(mmd_type)</div><div class='add'>+			| MDIO_MMS_PRT_ADDR(0x0)</div><div class='add'>+			| MDIO_OP(MDIO_OP_READ_TRANS);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	val64 = val64 | MDIO_CTRL_START_TRANS(0xE);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;mdio_control);</div><div class='add'>+	udelay(100);</div><div class='add'>+</div><div class='add'>+	/* Read the value from regs */</div><div class='add'>+	rval64 = readq(&amp;bar0-&gt;mdio_control);</div><div class='add'>+	rval64 = rval64 &amp; 0xFFFF0000;</div><div class='add'>+	rval64 = rval64 &gt;&gt; 16;</div><div class='add'>+	return rval64;</div><div class='add'>+}</div><div class='add'>+/**</div><div class='add'>+ *  s2io_chk_xpak_counter - Function to check the status of the xpak counters</div><div class='add'>+ *  @counter      : couter value to be updated</div><div class='add'>+ *  @flag         : flag to indicate the status</div><div class='add'>+ *  @type         : counter type</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This function is to check the status of the xpak counters value</div><div class='add'>+ *  NONE</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void s2io_chk_xpak_counter(u64 *counter, u64 * regs_stat, u32 index, u16 flag, u16 type)</div><div class='add'>+{</div><div class='add'>+	u64 mask = 0x3;</div><div class='add'>+	u64 val64;</div><div class='add'>+	int i;</div><div class='add'>+	for(i = 0; i &lt;index; i++)</div><div class='add'>+		mask = mask &lt;&lt; 0x2;</div><div class='add'>+</div><div class='add'>+	if(flag &gt; 0)</div><div class='add'>+	{</div><div class='add'>+		*counter = *counter + 1;</div><div class='add'>+		val64 = *regs_stat &amp; mask;</div><div class='add'>+		val64 = val64 &gt;&gt; (index * 0x2);</div><div class='add'>+		val64 = val64 + 1;</div><div class='add'>+		if(val64 == 3)</div><div class='add'>+		{</div><div class='add'>+			switch(type)</div><div class='add'>+			{</div><div class='add'>+			case 1:</div><div class='add'>+				DBG_PRINT(ERR_DBG, "Take Xframe NIC out of "</div><div class='add'>+					  "service. Excessive temperatures may "</div><div class='add'>+					  "result in premature transceiver "</div><div class='add'>+					  "failure \n");</div><div class='add'>+			break;</div><div class='add'>+			case 2:</div><div class='add'>+				DBG_PRINT(ERR_DBG, "Take Xframe NIC out of "</div><div class='add'>+					  "service Excessive bias currents may "</div><div class='add'>+					  "indicate imminent laser diode "</div><div class='add'>+					  "failure \n");</div><div class='add'>+			break;</div><div class='add'>+			case 3:</div><div class='add'>+				DBG_PRINT(ERR_DBG, "Take Xframe NIC out of "</div><div class='add'>+					  "service Excessive laser output "</div><div class='add'>+					  "power may saturate far-end "</div><div class='add'>+					  "receiver\n");</div><div class='add'>+			break;</div><div class='add'>+			default:</div><div class='add'>+				DBG_PRINT(ERR_DBG, "Incorrect XPAK Alarm "</div><div class='add'>+					  "type \n");</div><div class='add'>+			}</div><div class='add'>+			val64 = 0x0;</div><div class='add'>+		}</div><div class='add'>+		val64 = val64 &lt;&lt; (index * 0x2);</div><div class='add'>+		*regs_stat = (*regs_stat &amp; (~mask)) | (val64);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		*regs_stat = *regs_stat &amp; (~mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *  s2io_updt_xpak_counter - Function to update the xpak counters</div><div class='add'>+ *  @dev         : pointer to net_device struct</div><div class='add'>+ *  Description:</div><div class='add'>+ *  This function is to upate the status of the xpak counters value</div><div class='add'>+ *  NONE</div><div class='add'>+ */</div><div class='add'>+static void s2io_updt_xpak_counter(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u16 flag  = 0x0;</div><div class='add'>+	u16 type  = 0x0;</div><div class='add'>+	u16 val16 = 0x0;</div><div class='add'>+	u64 val64 = 0x0;</div><div class='add'>+	u64 addr  = 0x0;</div><div class='add'>+</div><div class='add'>+	nic_t *sp = dev-&gt;priv;</div><div class='add'>+	StatInfo_t *stat_info = sp-&gt;mac_control.stats_info;</div><div class='add'>+</div><div class='add'>+	/* Check the communication with the MDIO slave */</div><div class='add'>+	addr = 0x0000;</div><div class='add'>+	val64 = 0x0;</div><div class='add'>+	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);</div><div class='add'>+	if((val64 == 0xFFFF) || (val64 == 0x0000))</div><div class='add'>+	{</div><div class='add'>+		DBG_PRINT(ERR_DBG, "ERR: MDIO slave access failed - "</div><div class='add'>+			  "Returned %llx\n", (unsigned long long)val64);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for the expecte value of 2040 at PMA address 0x0000 */</div><div class='add'>+	if(val64 != 0x2040)</div><div class='add'>+	{</div><div class='add'>+		DBG_PRINT(ERR_DBG, "Incorrect value at PMA address 0x0000 - ");</div><div class='add'>+		DBG_PRINT(ERR_DBG, "Returned: %llx- Expected: 0x2040\n",</div><div class='add'>+			  (unsigned long long)val64);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Loading the DOM register to MDIO register */</div><div class='add'>+	addr = 0xA100;</div><div class='add'>+	s2io_mdio_write(MDIO_MMD_PMA_DEV_ADDR, addr, val16, dev);</div><div class='add'>+	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);</div><div class='add'>+</div><div class='add'>+	/* Reading the Alarm flags */</div><div class='add'>+	addr = 0xA070;</div><div class='add'>+	val64 = 0x0;</div><div class='add'>+	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);</div><div class='add'>+</div><div class='add'>+	flag = CHECKBIT(val64, 0x7);</div><div class='add'>+	type = 1;</div><div class='add'>+	s2io_chk_xpak_counter(&amp;stat_info-&gt;xpak_stat.alarm_transceiver_temp_high,</div><div class='add'>+				&amp;stat_info-&gt;xpak_stat.xpak_regs_stat,</div><div class='add'>+				0x0, flag, type);</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x6))</div><div class='add'>+		stat_info-&gt;xpak_stat.alarm_transceiver_temp_low++;</div><div class='add'>+</div><div class='add'>+	flag = CHECKBIT(val64, 0x3);</div><div class='add'>+	type = 2;</div><div class='add'>+	s2io_chk_xpak_counter(&amp;stat_info-&gt;xpak_stat.alarm_laser_bias_current_high,</div><div class='add'>+				&amp;stat_info-&gt;xpak_stat.xpak_regs_stat,</div><div class='add'>+				0x2, flag, type);</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x2))</div><div class='add'>+		stat_info-&gt;xpak_stat.alarm_laser_bias_current_low++;</div><div class='add'>+</div><div class='add'>+	flag = CHECKBIT(val64, 0x1);</div><div class='add'>+	type = 3;</div><div class='add'>+	s2io_chk_xpak_counter(&amp;stat_info-&gt;xpak_stat.alarm_laser_output_power_high,</div><div class='add'>+				&amp;stat_info-&gt;xpak_stat.xpak_regs_stat,</div><div class='add'>+				0x4, flag, type);</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x0))</div><div class='add'>+		stat_info-&gt;xpak_stat.alarm_laser_output_power_low++;</div><div class='add'>+</div><div class='add'>+	/* Reading the Warning flags */</div><div class='add'>+	addr = 0xA074;</div><div class='add'>+	val64 = 0x0;</div><div class='add'>+	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x7))</div><div class='add'>+		stat_info-&gt;xpak_stat.warn_transceiver_temp_high++;</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x6))</div><div class='add'>+		stat_info-&gt;xpak_stat.warn_transceiver_temp_low++;</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x3))</div><div class='add'>+		stat_info-&gt;xpak_stat.warn_laser_bias_current_high++;</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x2))</div><div class='add'>+		stat_info-&gt;xpak_stat.warn_laser_bias_current_low++;</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x1))</div><div class='add'>+		stat_info-&gt;xpak_stat.warn_laser_output_power_high++;</div><div class='add'>+</div><div class='add'>+	if(CHECKBIT(val64, 0x0))</div><div class='add'>+		stat_info-&gt;xpak_stat.warn_laser_output_power_low++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *  alarm_intr_handler - Alarm Interrrupt handler</div><div class='ctx'>  *  @nic: device private variable</div><div class='ctx'>  *  Description: If the interrupt was neither because of Rx packet or Tx</div><div class='hunk'>@@ -2790,6 +3130,18 @@ static void alarm_intr_handler(struct s2io_nic *nic)</div><div class='ctx'> 	struct net_device *dev = (struct net_device *) nic-&gt;dev;</div><div class='ctx'> 	XENA_dev_config_t __iomem *bar0 = nic-&gt;bar0;</div><div class='ctx'> 	register u64 val64 = 0, err_reg = 0;</div><div class='add'>+	u64 cnt;</div><div class='add'>+	int i;</div><div class='add'>+	nic-&gt;mac_control.stats_info-&gt;sw_stat.ring_full_cnt = 0;</div><div class='add'>+	/* Handling the XPAK counters update */</div><div class='add'>+	if(nic-&gt;mac_control.stats_info-&gt;xpak_stat.xpak_timer_count &lt; 72000) {</div><div class='add'>+		/* waiting for an hour */</div><div class='add'>+		nic-&gt;mac_control.stats_info-&gt;xpak_stat.xpak_timer_count++;</div><div class='add'>+	} else {</div><div class='add'>+		s2io_updt_xpak_counter(dev);</div><div class='add'>+		/* reset the count to zero */</div><div class='add'>+		nic-&gt;mac_control.stats_info-&gt;xpak_stat.xpak_timer_count = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Handling link status change error Intr */</div><div class='ctx'> 	if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER) {</div><div class='hunk'>@@ -2816,6 +3168,8 @@ static void alarm_intr_handler(struct s2io_nic *nic)</div><div class='ctx'> 					     MC_ERR_REG_MIRI_ECC_DB_ERR_1)) {</div><div class='ctx'> 					netif_stop_queue(dev);</div><div class='ctx'> 					schedule_work(&amp;nic-&gt;rst_timer_task);</div><div class='add'>+					nic-&gt;mac_control.stats_info-&gt;sw_stat.</div><div class='add'>+							soft_reset_cnt++;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2827,11 +3181,13 @@ static void alarm_intr_handler(struct s2io_nic *nic)</div><div class='ctx'> 	/* In case of a serious error, the device will be Reset. */</div><div class='ctx'> 	val64 = readq(&amp;bar0-&gt;serr_source);</div><div class='ctx'> 	if (val64 &amp; SERR_SOURCE_ANY) {</div><div class='add'>+		nic-&gt;mac_control.stats_info-&gt;sw_stat.serious_err_cnt++;</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: Device indicates ", dev-&gt;name);</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "serious error %llx!!\n", </div><div class='ctx'> 			  (unsigned long long)val64);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		schedule_work(&amp;nic-&gt;rst_timer_task);</div><div class='add'>+		nic-&gt;mac_control.stats_info-&gt;sw_stat.soft_reset_cnt++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2849,6 +3205,35 @@ static void alarm_intr_handler(struct s2io_nic *nic)</div><div class='ctx'> 		ac = readq(&amp;bar0-&gt;adapter_control);</div><div class='ctx'> 		schedule_work(&amp;nic-&gt;set_link_task);</div><div class='ctx'> 	}</div><div class='add'>+	/* Check for data parity error */</div><div class='add'>+	val64 = readq(&amp;bar0-&gt;pic_int_status);</div><div class='add'>+	if (val64 &amp; PIC_INT_GPIO) {</div><div class='add'>+		val64 = readq(&amp;bar0-&gt;gpio_int_reg);</div><div class='add'>+		if (val64 &amp; GPIO_INT_REG_DP_ERR_INT) {</div><div class='add'>+			nic-&gt;mac_control.stats_info-&gt;sw_stat.parity_err_cnt++;</div><div class='add'>+			schedule_work(&amp;nic-&gt;rst_timer_task);</div><div class='add'>+			nic-&gt;mac_control.stats_info-&gt;sw_stat.soft_reset_cnt++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for ring full counter */</div><div class='add'>+	if (nic-&gt;device_type &amp; XFRAME_II_DEVICE) {</div><div class='add'>+		val64 = readq(&amp;bar0-&gt;ring_bump_counter1);</div><div class='add'>+		for (i=0; i&lt;4; i++) {</div><div class='add'>+			cnt = ( val64 &amp; vBIT(0xFFFF,(i*16),16));</div><div class='add'>+			cnt &gt;&gt;= 64 - ((i+1)*16);</div><div class='add'>+			nic-&gt;mac_control.stats_info-&gt;sw_stat.ring_full_cnt</div><div class='add'>+				+= cnt;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val64 = readq(&amp;bar0-&gt;ring_bump_counter2);</div><div class='add'>+		for (i=0; i&lt;4; i++) {</div><div class='add'>+			cnt = ( val64 &amp; vBIT(0xFFFF,(i*16),16));</div><div class='add'>+			cnt &gt;&gt;= 64 - ((i+1)*16);</div><div class='add'>+			nic-&gt;mac_control.stats_info-&gt;sw_stat.ring_full_cnt</div><div class='add'>+				+= cnt;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Other type of interrupts are not being handled now,  TODO */</div><div class='ctx'> }</div><div class='hunk'>@@ -2864,23 +3249,26 @@ static void alarm_intr_handler(struct s2io_nic *nic)</div><div class='ctx'>  *   SUCCESS on success and FAILURE on failure.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int wait_for_cmd_complete(nic_t * sp)</div><div class='add'>+static int wait_for_cmd_complete(void *addr, u64 busy_bit)</div><div class='ctx'> {</div><div class='del'>-	XENA_dev_config_t __iomem *bar0 = sp-&gt;bar0;</div><div class='ctx'> 	int ret = FAILURE, cnt = 0;</div><div class='ctx'> 	u64 val64;</div><div class='ctx'> </div><div class='ctx'> 	while (TRUE) {</div><div class='del'>-		val64 = readq(&amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='del'>-		if (!(val64 &amp; RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING)) {</div><div class='add'>+		val64 = readq(addr);</div><div class='add'>+		if (!(val64 &amp; busy_bit)) {</div><div class='ctx'> 			ret = SUCCESS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		msleep(50);</div><div class='add'>+</div><div class='add'>+		if(in_interrupt())</div><div class='add'>+			mdelay(50);</div><div class='add'>+		else</div><div class='add'>+			msleep(50);</div><div class='add'>+</div><div class='ctx'> 		if (cnt++ &gt; 10)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2919,6 +3307,9 @@ static void s2io_reset(nic_t * sp)</div><div class='ctx'> 	 * PCI write to sw_reset register is done by this time.</div><div class='ctx'> 	 */</div><div class='ctx'> 	msleep(250);</div><div class='add'>+	if (strstr(sp-&gt;product_name, "CX4")) {</div><div class='add'>+		msleep(750);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Restore the PCI state saved during initialization. */</div><div class='ctx'> 	pci_restore_state(sp-&gt;pdev);</div><div class='hunk'>@@ -3137,7 +3528,7 @@ static void restore_xmsi_data(nic_t *nic)</div><div class='ctx'> 	u64 val64;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt; MAX_REQUESTED_MSI_X; i++) {</div><div class='add'>+	for (i=0; i&lt; nic-&gt;avail_msix_vectors; i++) {</div><div class='ctx'> 		writeq(nic-&gt;msix_info[i].addr, &amp;bar0-&gt;xmsi_address);</div><div class='ctx'> 		writeq(nic-&gt;msix_info[i].data, &amp;bar0-&gt;xmsi_data);</div><div class='ctx'> 		val64 = (BIT(7) | BIT(15) | vBIT(i, 26, 6));</div><div class='hunk'>@@ -3156,7 +3547,7 @@ static void store_xmsi_data(nic_t *nic)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Store and display */</div><div class='del'>-	for (i=0; i&lt; MAX_REQUESTED_MSI_X; i++) {</div><div class='add'>+	for (i=0; i&lt; nic-&gt;avail_msix_vectors; i++) {</div><div class='ctx'> 		val64 = (BIT(15) | vBIT(i, 26, 6));</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;xmsi_access);</div><div class='ctx'> 		if (wait_for_msix_trans(nic, i)) {</div><div class='hunk'>@@ -3284,15 +3675,24 @@ static int s2io_enable_msi_x(nic_t *nic)</div><div class='ctx'> 		writeq(tx_mat, &amp;bar0-&gt;tx_mat0_n[7]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	nic-&gt;avail_msix_vectors = 0;</div><div class='ctx'> 	ret = pci_enable_msix(nic-&gt;pdev, nic-&gt;entries, MAX_REQUESTED_MSI_X);</div><div class='add'>+	/* We fail init if error or we get less vectors than min required */</div><div class='add'>+	if (ret &gt;= (nic-&gt;config.tx_fifo_num + nic-&gt;config.rx_ring_num + 1)) {</div><div class='add'>+		nic-&gt;avail_msix_vectors = ret;</div><div class='add'>+		ret = pci_enable_msix(nic-&gt;pdev, nic-&gt;entries, ret);</div><div class='add'>+	}</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: Enabling MSIX failed\n", nic-&gt;dev-&gt;name);</div><div class='ctx'> 		kfree(nic-&gt;entries);</div><div class='ctx'> 		kfree(nic-&gt;s2io_entries);</div><div class='ctx'> 		nic-&gt;entries = NULL;</div><div class='ctx'> 		nic-&gt;s2io_entries = NULL;</div><div class='add'>+		nic-&gt;avail_msix_vectors = 0;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	if (!nic-&gt;avail_msix_vectors)</div><div class='add'>+		nic-&gt;avail_msix_vectors = MAX_REQUESTED_MSI_X;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * To enable MSI-X, MSI also needs to be enabled, due to a bug</div><div class='hunk'>@@ -3325,8 +3725,6 @@ static int s2io_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	nic_t *sp = dev-&gt;priv;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	int i;</div><div class='del'>-	u16 msi_control; /* Temp variable */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure you have link off by default every time</div><div class='hunk'>@@ -3336,98 +3734,23 @@ static int s2io_open(struct net_device *dev)</div><div class='ctx'> 	sp-&gt;last_link_state = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize H/W and enable interrupts */</div><div class='del'>-	if (s2io_card_up(sp)) {</div><div class='add'>+	err = s2io_card_up(sp);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: H/W initialization failed\n",</div><div class='ctx'> 			  dev-&gt;name);</div><div class='del'>-		err = -ENODEV;</div><div class='ctx'> 		goto hw_init_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Store the values of the MSIX table in the nic_t structure */</div><div class='del'>-	store_xmsi_data(sp);</div><div class='del'>-</div><div class='del'>-	/* After proper initialization of H/W, register ISR */</div><div class='del'>-	if (sp-&gt;intr_type == MSI) {</div><div class='del'>-		err = request_irq((int) sp-&gt;pdev-&gt;irq, s2io_msi_handle, </div><div class='del'>-			SA_SHIRQ, sp-&gt;name, dev);</div><div class='del'>-		if (err) {</div><div class='del'>-			DBG_PRINT(ERR_DBG, "%s: MSI registration \</div><div class='del'>-failed\n", dev-&gt;name);</div><div class='del'>-			goto isr_registration_failed;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (sp-&gt;intr_type == MSI_X) {</div><div class='del'>-		for (i=1; (sp-&gt;s2io_entries[i].in_use == MSIX_FLG); i++) {</div><div class='del'>-			if (sp-&gt;s2io_entries[i].type == MSIX_FIFO_TYPE) {</div><div class='del'>-				sprintf(sp-&gt;desc1, "%s:MSI-X-%d-TX",</div><div class='del'>-					dev-&gt;name, i);</div><div class='del'>-				err = request_irq(sp-&gt;entries[i].vector,</div><div class='del'>-					  s2io_msix_fifo_handle, 0, sp-&gt;desc1,</div><div class='del'>-					  sp-&gt;s2io_entries[i].arg);</div><div class='del'>-				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp-&gt;desc1, </div><div class='del'>-				    (unsigned long long)sp-&gt;msix_info[i].addr);</div><div class='del'>-			} else {</div><div class='del'>-				sprintf(sp-&gt;desc2, "%s:MSI-X-%d-RX",</div><div class='del'>-					dev-&gt;name, i);</div><div class='del'>-				err = request_irq(sp-&gt;entries[i].vector,</div><div class='del'>-					  s2io_msix_ring_handle, 0, sp-&gt;desc2,</div><div class='del'>-					  sp-&gt;s2io_entries[i].arg);</div><div class='del'>-				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp-&gt;desc2, </div><div class='del'>-				     (unsigned long long)sp-&gt;msix_info[i].addr);</div><div class='del'>-			}</div><div class='del'>-			if (err) {</div><div class='del'>-				DBG_PRINT(ERR_DBG, "%s: MSI-X-%d registration \</div><div class='del'>-failed\n", dev-&gt;name, i);</div><div class='del'>-				DBG_PRINT(ERR_DBG, "Returned: %d\n", err);</div><div class='del'>-				goto isr_registration_failed;</div><div class='del'>-			}</div><div class='del'>-			sp-&gt;s2io_entries[i].in_use = MSIX_REGISTERED_SUCCESS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (sp-&gt;intr_type == INTA) {</div><div class='del'>-		err = request_irq((int) sp-&gt;pdev-&gt;irq, s2io_isr, SA_SHIRQ,</div><div class='del'>-				sp-&gt;name, dev);</div><div class='del'>-		if (err) {</div><div class='del'>-			DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",</div><div class='del'>-				  dev-&gt;name);</div><div class='del'>-			goto isr_registration_failed;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (s2io_set_mac_addr(dev, dev-&gt;dev_addr) == FAILURE) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "Set Mac Address Failed\n");</div><div class='add'>+		s2io_card_down(sp);</div><div class='ctx'> 		err = -ENODEV;</div><div class='del'>-		goto setting_mac_address_failed;</div><div class='add'>+		goto hw_init_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-setting_mac_address_failed:</div><div class='del'>-	if (sp-&gt;intr_type != MSI_X)</div><div class='del'>-		free_irq(sp-&gt;pdev-&gt;irq, dev);</div><div class='del'>-isr_registration_failed:</div><div class='del'>-	del_timer_sync(&amp;sp-&gt;alarm_timer);</div><div class='del'>-	if (sp-&gt;intr_type == MSI_X) {</div><div class='del'>-		if (sp-&gt;device_type == XFRAME_II_DEVICE) {</div><div class='del'>-			for (i=1; (sp-&gt;s2io_entries[i].in_use == </div><div class='del'>-				MSIX_REGISTERED_SUCCESS); i++) {</div><div class='del'>-				int vector = sp-&gt;entries[i].vector;</div><div class='del'>-				void *arg = sp-&gt;s2io_entries[i].arg;</div><div class='del'>-</div><div class='del'>-				free_irq(vector, arg);</div><div class='del'>-			}</div><div class='del'>-			pci_disable_msix(sp-&gt;pdev);</div><div class='del'>-</div><div class='del'>-			/* Temp */</div><div class='del'>-			pci_read_config_word(sp-&gt;pdev, 0x42, &amp;msi_control);</div><div class='del'>-			msi_control &amp;= 0xFFFE; /* Disable MSI */</div><div class='del'>-			pci_write_config_word(sp-&gt;pdev, 0x42, msi_control);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (sp-&gt;intr_type == MSI)</div><div class='del'>-		pci_disable_msi(sp-&gt;pdev);</div><div class='del'>-	s2io_reset(sp);</div><div class='ctx'> hw_init_failed:</div><div class='ctx'> 	if (sp-&gt;intr_type == MSI_X) {</div><div class='ctx'> 		if (sp-&gt;entries)</div><div class='hunk'>@@ -3454,35 +3777,12 @@ hw_init_failed:</div><div class='ctx'> static int s2io_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	nic_t *sp = dev-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-	u16 msi_control;</div><div class='ctx'> </div><div class='ctx'> 	flush_scheduled_work();</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	/* Reset card, kill tasklet and free Tx and Rx buffers. */</div><div class='ctx'> 	s2io_card_down(sp);</div><div class='ctx'> </div><div class='del'>-	if (sp-&gt;intr_type == MSI_X) {</div><div class='del'>-		if (sp-&gt;device_type == XFRAME_II_DEVICE) {</div><div class='del'>-			for (i=1; (sp-&gt;s2io_entries[i].in_use == </div><div class='del'>-					MSIX_REGISTERED_SUCCESS); i++) {</div><div class='del'>-				int vector = sp-&gt;entries[i].vector;</div><div class='del'>-				void *arg = sp-&gt;s2io_entries[i].arg;</div><div class='del'>-</div><div class='del'>-				free_irq(vector, arg);</div><div class='del'>-			}</div><div class='del'>-			pci_read_config_word(sp-&gt;pdev, 0x42, &amp;msi_control);</div><div class='del'>-			msi_control &amp;= 0xFFFE; /* Disable MSI */</div><div class='del'>-			pci_write_config_word(sp-&gt;pdev, 0x42, msi_control);</div><div class='del'>-</div><div class='del'>-			pci_disable_msix(sp-&gt;pdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		free_irq(sp-&gt;pdev-&gt;irq, dev);</div><div class='del'>-		if (sp-&gt;intr_type == MSI)</div><div class='del'>-			pci_disable_msi(sp-&gt;pdev);</div><div class='del'>-	}	</div><div class='ctx'> 	sp-&gt;device_close_flag = TRUE;	/* Device is shut down. */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3545,7 +3845,8 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	queue_len = mac_control-&gt;fifos[queue].tx_curr_put_info.fifo_len + 1;</div><div class='ctx'> 	/* Avoid "put" pointer going beyond "get" pointer */</div><div class='del'>-	if (txdp-&gt;Host_Control || (((put_off + 1) % queue_len) == get_off)) {</div><div class='add'>+	if (txdp-&gt;Host_Control ||</div><div class='add'>+		   ((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {</div><div class='ctx'> 		DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -3564,8 +3865,8 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	txdp-&gt;Control_1 = 0;</div><div class='ctx'> 	txdp-&gt;Control_2 = 0;</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='del'>-	mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='del'>-	if (mss) {</div><div class='add'>+	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type &amp; (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {</div><div class='ctx'> 		txdp-&gt;Control_1 |= TXD_TCP_LSO_EN;</div><div class='ctx'> 		txdp-&gt;Control_1 |= TXD_TCP_LSO_MSS(mss);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3585,10 +3886,10 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	frg_len = skb-&gt;len - skb-&gt;data_len;</div><div class='del'>-	if (skb_shinfo(skb)-&gt;ufo_size) {</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_UDP) {</div><div class='ctx'> 		int ufo_size;</div><div class='ctx'> </div><div class='del'>-		ufo_size = skb_shinfo(skb)-&gt;ufo_size;</div><div class='add'>+		ufo_size = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 		ufo_size &amp;= ~7;</div><div class='ctx'> 		txdp-&gt;Control_1 |= TXD_UFO_EN;</div><div class='ctx'> 		txdp-&gt;Control_1 |= TXD_UFO_MSS(ufo_size);</div><div class='hunk'>@@ -3614,7 +3915,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	txdp-&gt;Host_Control = (unsigned long) skb;</div><div class='ctx'> 	txdp-&gt;Control_1 |= TXD_BUFFER0_SIZE(frg_len);</div><div class='ctx'> </div><div class='del'>-	if (skb_shinfo(skb)-&gt;ufo_size)</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_UDP)</div><div class='ctx'> 		txdp-&gt;Control_1 |= TXD_UFO_EN;</div><div class='ctx'> </div><div class='ctx'> 	frg_cnt = skb_shinfo(skb)-&gt;nr_frags;</div><div class='hunk'>@@ -3629,12 +3930,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		    (sp-&gt;pdev, frag-&gt;page, frag-&gt;page_offset,</div><div class='ctx'> 		     frag-&gt;size, PCI_DMA_TODEVICE);</div><div class='ctx'> 		txdp-&gt;Control_1 = TXD_BUFFER0_SIZE(frag-&gt;size);</div><div class='del'>-		if (skb_shinfo(skb)-&gt;ufo_size)</div><div class='add'>+		if (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_UDP)</div><div class='ctx'> 			txdp-&gt;Control_1 |= TXD_UFO_EN;</div><div class='ctx'> 	}</div><div class='ctx'> 	txdp-&gt;Control_1 |= TXD_GATHER_CODE_LAST;</div><div class='ctx'> </div><div class='del'>-	if (skb_shinfo(skb)-&gt;ufo_size)</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_UDP)</div><div class='ctx'> 		frg_cnt++; /* as Txd0 was used for inband header */</div><div class='ctx'> </div><div class='ctx'> 	tx_fifo = mac_control-&gt;tx_FIFO_start[queue];</div><div class='hunk'>@@ -3648,18 +3949,20 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (mss)</div><div class='ctx'> 		val64 |= TX_FIFO_SPECIAL_FUNC;</div><div class='ctx'> #endif</div><div class='del'>-	if (skb_shinfo(skb)-&gt;ufo_size)</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_UDP)</div><div class='ctx'> 		val64 |= TX_FIFO_SPECIAL_FUNC;</div><div class='ctx'> 	writeq(val64, &amp;tx_fifo-&gt;List_Control);</div><div class='ctx'> </div><div class='ctx'> 	mmiowb();</div><div class='ctx'> </div><div class='ctx'> 	put_off++;</div><div class='del'>-	put_off %= mac_control-&gt;fifos[queue].tx_curr_put_info.fifo_len + 1;</div><div class='add'>+	if (put_off == mac_control-&gt;fifos[queue].tx_curr_put_info.fifo_len + 1)</div><div class='add'>+		put_off = 0;</div><div class='ctx'> 	mac_control-&gt;fifos[queue].tx_curr_put_info.offset = put_off;</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid "put" pointer going beyond "get" pointer */</div><div class='del'>-	if (((put_off + 1) % queue_len) == get_off) {</div><div class='add'>+	if (((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {</div><div class='add'>+		sp-&gt;mac_control.stats_info-&gt;sw_stat.fifo_full_cnt++;</div><div class='ctx'> 		DBG_PRINT(TX_DBG,</div><div class='ctx'> 			  "No free TxDs for xmit, Put: 0x%x Get:0x%x\n",</div><div class='ctx'> 			  put_off, get_off);</div><div class='hunk'>@@ -3795,7 +4098,6 @@ s2io_msix_fifo_handle(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	atomic_dec(&amp;sp-&gt;isr_cnt);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static void s2io_txpic_intr_handle(nic_t *sp)</div><div class='ctx'> {</div><div class='ctx'> 	XENA_dev_config_t __iomem *bar0 = sp-&gt;bar0;</div><div class='hunk'>@@ -3806,41 +4108,56 @@ static void s2io_txpic_intr_handle(nic_t *sp)</div><div class='ctx'> 		val64 = readq(&amp;bar0-&gt;gpio_int_reg);</div><div class='ctx'> 		if ((val64 &amp; GPIO_INT_REG_LINK_DOWN) &amp;&amp;</div><div class='ctx'> 		    (val64 &amp; GPIO_INT_REG_LINK_UP)) {</div><div class='add'>+			/*</div><div class='add'>+			 * This is unstable state so clear both up/down</div><div class='add'>+			 * interrupt and adapter to re-evaluate the link state.</div><div class='add'>+			 */</div><div class='ctx'> 			val64 |=  GPIO_INT_REG_LINK_DOWN;</div><div class='ctx'> 			val64 |= GPIO_INT_REG_LINK_UP;</div><div class='ctx'> 			writeq(val64, &amp;bar0-&gt;gpio_int_reg);</div><div class='del'>-			goto masking;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (((sp-&gt;last_link_state == LINK_UP) &amp;&amp;</div><div class='del'>-			(val64 &amp; GPIO_INT_REG_LINK_DOWN)) ||</div><div class='del'>-		((sp-&gt;last_link_state == LINK_DOWN) &amp;&amp;</div><div class='del'>-		(val64 &amp; GPIO_INT_REG_LINK_UP))) {</div><div class='ctx'> 			val64 = readq(&amp;bar0-&gt;gpio_int_mask);</div><div class='del'>-			val64 |=  GPIO_INT_MASK_LINK_DOWN;</div><div class='del'>-			val64 |= GPIO_INT_MASK_LINK_UP;</div><div class='add'>+			val64 &amp;= ~(GPIO_INT_MASK_LINK_UP |</div><div class='add'>+				   GPIO_INT_MASK_LINK_DOWN);</div><div class='ctx'> 			writeq(val64, &amp;bar0-&gt;gpio_int_mask);</div><div class='del'>-			s2io_set_link((unsigned long)sp);</div><div class='ctx'> 		}</div><div class='del'>-masking:</div><div class='del'>-		if (sp-&gt;last_link_state == LINK_UP) {</div><div class='del'>-			/*enable down interrupt */</div><div class='del'>-			val64 = readq(&amp;bar0-&gt;gpio_int_mask);</div><div class='del'>-			/* unmasks link down intr */</div><div class='del'>-			val64 &amp;=  ~GPIO_INT_MASK_LINK_DOWN;</div><div class='del'>-			/* masks link up intr */</div><div class='del'>-			val64 |= GPIO_INT_MASK_LINK_UP;</div><div class='del'>-			writeq(val64, &amp;bar0-&gt;gpio_int_mask);</div><div class='del'>-		} else {</div><div class='del'>-			/*enable UP Interrupt */</div><div class='del'>-			val64 = readq(&amp;bar0-&gt;gpio_int_mask);</div><div class='del'>-			/* unmasks link up interrupt */</div><div class='del'>-			val64 &amp;= ~GPIO_INT_MASK_LINK_UP;</div><div class='del'>-			/* masks link down interrupt */</div><div class='del'>-			val64 |=  GPIO_INT_MASK_LINK_DOWN;</div><div class='del'>-			writeq(val64, &amp;bar0-&gt;gpio_int_mask);</div><div class='add'>+		else if (val64 &amp; GPIO_INT_REG_LINK_UP) {</div><div class='add'>+			val64 = readq(&amp;bar0-&gt;adapter_status);</div><div class='add'>+			if (verify_xena_quiescence(sp, val64,</div><div class='add'>+						   sp-&gt;device_enabled_once)) {</div><div class='add'>+				/* Enable Adapter */</div><div class='add'>+				val64 = readq(&amp;bar0-&gt;adapter_control);</div><div class='add'>+				val64 |= ADAPTER_CNTL_EN;</div><div class='add'>+				writeq(val64, &amp;bar0-&gt;adapter_control);</div><div class='add'>+				val64 |= ADAPTER_LED_ON;</div><div class='add'>+				writeq(val64, &amp;bar0-&gt;adapter_control);</div><div class='add'>+				if (!sp-&gt;device_enabled_once)</div><div class='add'>+					sp-&gt;device_enabled_once = 1;</div><div class='add'>+</div><div class='add'>+				s2io_link(sp, LINK_UP);</div><div class='add'>+				/*</div><div class='add'>+				 * unmask link down interrupt and mask link-up</div><div class='add'>+				 * intr</div><div class='add'>+				 */</div><div class='add'>+				val64 = readq(&amp;bar0-&gt;gpio_int_mask);</div><div class='add'>+				val64 &amp;= ~GPIO_INT_MASK_LINK_DOWN;</div><div class='add'>+				val64 |= GPIO_INT_MASK_LINK_UP;</div><div class='add'>+				writeq(val64, &amp;bar0-&gt;gpio_int_mask);</div><div class='add'>+</div><div class='add'>+			}</div><div class='add'>+		}else if (val64 &amp; GPIO_INT_REG_LINK_DOWN) {</div><div class='add'>+			val64 = readq(&amp;bar0-&gt;adapter_status);</div><div class='add'>+			if (verify_xena_quiescence(sp, val64,</div><div class='add'>+						   sp-&gt;device_enabled_once)) {</div><div class='add'>+				s2io_link(sp, LINK_DOWN);</div><div class='add'>+				/* Link is down so unmaks link up interrupt */</div><div class='add'>+				val64 = readq(&amp;bar0-&gt;gpio_int_mask);</div><div class='add'>+				val64 &amp;= ~GPIO_INT_MASK_LINK_UP;</div><div class='add'>+				val64 |= GPIO_INT_MASK_LINK_DOWN;</div><div class='add'>+				writeq(val64, &amp;bar0-&gt;gpio_int_mask);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	val64 = readq(&amp;bar0-&gt;gpio_int_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3863,7 +4180,7 @@ static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	nic_t *sp = dev-&gt;priv;</div><div class='ctx'> 	XENA_dev_config_t __iomem *bar0 = sp-&gt;bar0;</div><div class='ctx'> 	int i;</div><div class='del'>-	u64 reason = 0, val64;</div><div class='add'>+	u64 reason = 0, val64, org_mask;</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> 	struct config_param *config;</div><div class='ctx'> </div><div class='hunk'>@@ -3887,43 +4204,41 @@ static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	val64 = 0xFFFFFFFFFFFFFFFFULL;</div><div class='add'>+	/* Store current mask before masking all interrupts */</div><div class='add'>+	org_mask = readq(&amp;bar0-&gt;general_int_mask);</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;general_int_mask);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_S2IO_NAPI</div><div class='ctx'> 	if (reason &amp; GEN_INTR_RXTRAFFIC) {</div><div class='ctx'> 		if (netif_rx_schedule_prep(dev)) {</div><div class='del'>-			en_dis_able_nic_intrs(sp, RX_TRAFFIC_INTR,</div><div class='del'>-					      DISABLE_INTRS);</div><div class='add'>+			writeq(val64, &amp;bar0-&gt;rx_traffic_mask);</div><div class='ctx'> 			__netif_rx_schedule(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	/* If Intr is because of Rx Traffic */</div><div class='del'>-	if (reason &amp; GEN_INTR_RXTRAFFIC) {</div><div class='del'>-		/*</div><div class='del'>-		 * rx_traffic_int reg is an R1 register, writing all 1's</div><div class='del'>-		 * will ensure that the actual interrupt causing bit get's</div><div class='del'>-		 * cleared and hence a read can be avoided.</div><div class='del'>-		 */</div><div class='del'>-		val64 = 0xFFFFFFFFFFFFFFFFULL;</div><div class='del'>-		writeq(val64, &amp;bar0-&gt;rx_traffic_int);</div><div class='del'>-		for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='del'>-			rx_intr_handler(&amp;mac_control-&gt;rings[i]);</div><div class='del'>-		}</div><div class='add'>+	/*</div><div class='add'>+	 * Rx handler is called by default, without checking for the</div><div class='add'>+	 * cause of interrupt.</div><div class='add'>+	 * rx_traffic_int reg is an R1 register, writing all 1's</div><div class='add'>+	 * will ensure that the actual interrupt causing bit get's</div><div class='add'>+	 * cleared and hence a read can be avoided.</div><div class='add'>+	 */</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;rx_traffic_int);</div><div class='add'>+	for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='add'>+		rx_intr_handler(&amp;mac_control-&gt;rings[i]);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* If Intr is because of Tx Traffic */</div><div class='del'>-	if (reason &amp; GEN_INTR_TXTRAFFIC) {</div><div class='del'>-		/*</div><div class='del'>-		 * tx_traffic_int reg is an R1 register, writing all 1's</div><div class='del'>-		 * will ensure that the actual interrupt causing bit get's</div><div class='del'>-		 * cleared and hence a read can be avoided.</div><div class='del'>-		 */</div><div class='del'>-		val64 = 0xFFFFFFFFFFFFFFFFULL;</div><div class='del'>-		writeq(val64, &amp;bar0-&gt;tx_traffic_int);</div><div class='add'>+	/*</div><div class='add'>+	 * tx_traffic_int reg is an R1 register, writing all 1's</div><div class='add'>+	 * will ensure that the actual interrupt causing bit get's</div><div class='add'>+	 * cleared and hence a read can be avoided.</div><div class='add'>+	 */</div><div class='add'>+	writeq(val64, &amp;bar0-&gt;tx_traffic_int);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; config-&gt;tx_fifo_num; i++)</div><div class='del'>-			tx_intr_handler(&amp;mac_control-&gt;fifos[i]);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; config-&gt;tx_fifo_num; i++)</div><div class='add'>+		tx_intr_handler(&amp;mac_control-&gt;fifos[i]);</div><div class='ctx'> </div><div class='ctx'> 	if (reason &amp; GEN_INTR_TXPIC)</div><div class='ctx'> 		s2io_txpic_intr_handle(sp);</div><div class='hunk'>@@ -3949,6 +4264,7 @@ static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 					DBG_PRINT(ERR_DBG, " in ISR!!\n");</div><div class='ctx'> 					clear_bit(0, (&amp;sp-&gt;tasklet_status));</div><div class='ctx'> 					atomic_dec(&amp;sp-&gt;isr_cnt);</div><div class='add'>+					writeq(org_mask, &amp;bar0-&gt;general_int_mask);</div><div class='ctx'> 					return IRQ_HANDLED;</div><div class='ctx'> 				}</div><div class='ctx'> 				clear_bit(0, (&amp;sp-&gt;tasklet_status));</div><div class='hunk'>@@ -3964,7 +4280,7 @@ static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+	writeq(org_mask, &amp;bar0-&gt;general_int_mask);</div><div class='ctx'> 	atomic_dec(&amp;sp-&gt;isr_cnt);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -4067,7 +4383,8 @@ static void s2io_set_multicast(struct net_device *dev)</div><div class='ctx'> 		    RMAC_ADDR_CMD_MEM_OFFSET(MAC_MC_ALL_MC_ADDR_OFFSET);</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='ctx'> 		/* Wait till command completes */</div><div class='del'>-		wait_for_cmd_complete(sp);</div><div class='add'>+		wait_for_cmd_complete(&amp;bar0-&gt;rmac_addr_cmd_mem,</div><div class='add'>+				      RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING);</div><div class='ctx'> </div><div class='ctx'> 		sp-&gt;m_cast_flg = 1;</div><div class='ctx'> 		sp-&gt;all_multi_pos = MAC_MC_ALL_MC_ADDR_OFFSET;</div><div class='hunk'>@@ -4082,7 +4399,8 @@ static void s2io_set_multicast(struct net_device *dev)</div><div class='ctx'> 		    RMAC_ADDR_CMD_MEM_OFFSET(sp-&gt;all_multi_pos);</div><div class='ctx'> 		writeq(val64, &amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='ctx'> 		/* Wait till command completes */</div><div class='del'>-		wait_for_cmd_complete(sp);</div><div class='add'>+		wait_for_cmd_complete(&amp;bar0-&gt;rmac_addr_cmd_mem,</div><div class='add'>+				      RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING);</div><div class='ctx'> </div><div class='ctx'> 		sp-&gt;m_cast_flg = 0;</div><div class='ctx'> 		sp-&gt;all_multi_pos = 0;</div><div class='hunk'>@@ -4147,7 +4465,8 @@ static void s2io_set_multicast(struct net_device *dev)</div><div class='ctx'> 			writeq(val64, &amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='ctx'> </div><div class='ctx'> 			/* Wait for command completes */</div><div class='del'>-			if (wait_for_cmd_complete(sp)) {</div><div class='add'>+			if (wait_for_cmd_complete(&amp;bar0-&gt;rmac_addr_cmd_mem,</div><div class='add'>+				      RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING)) {</div><div class='ctx'> 				DBG_PRINT(ERR_DBG, "%s: Adding ",</div><div class='ctx'> 					  dev-&gt;name);</div><div class='ctx'> 				DBG_PRINT(ERR_DBG, "Multicasts failed\n");</div><div class='hunk'>@@ -4177,7 +4496,8 @@ static void s2io_set_multicast(struct net_device *dev)</div><div class='ctx'> 			writeq(val64, &amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='ctx'> </div><div class='ctx'> 			/* Wait for command completes */</div><div class='del'>-			if (wait_for_cmd_complete(sp)) {</div><div class='add'>+			if (wait_for_cmd_complete(&amp;bar0-&gt;rmac_addr_cmd_mem,</div><div class='add'>+				      RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING)) {</div><div class='ctx'> 				DBG_PRINT(ERR_DBG, "%s: Adding ",</div><div class='ctx'> 					  dev-&gt;name);</div><div class='ctx'> 				DBG_PRINT(ERR_DBG, "Multicasts failed\n");</div><div class='hunk'>@@ -4222,7 +4542,8 @@ static int s2io_set_mac_addr(struct net_device *dev, u8 * addr)</div><div class='ctx'> 	    RMAC_ADDR_CMD_MEM_OFFSET(0);</div><div class='ctx'> 	writeq(val64, &amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='ctx'> 	/* Wait till command completes */</div><div class='del'>-	if (wait_for_cmd_complete(sp)) {</div><div class='add'>+	if (wait_for_cmd_complete(&amp;bar0-&gt;rmac_addr_cmd_mem,</div><div class='add'>+		      RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING)) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: set_mac_addr failed\n", dev-&gt;name);</div><div class='ctx'> 		return FAILURE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4619,6 +4940,44 @@ static int write_eeprom(nic_t * sp, int off, u64 data, int cnt)</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+static void s2io_vpd_read(nic_t *nic)</div><div class='add'>+{</div><div class='add'>+	u8 vpd_data[256],data;</div><div class='add'>+	int i=0, cnt, fail = 0;</div><div class='add'>+	int vpd_addr = 0x80;</div><div class='add'>+</div><div class='add'>+	if (nic-&gt;device_type == XFRAME_II_DEVICE) {</div><div class='add'>+		strcpy(nic-&gt;product_name, "Xframe II 10GbE network adapter");</div><div class='add'>+		vpd_addr = 0x80;</div><div class='add'>+	}</div><div class='add'>+	else {</div><div class='add'>+		strcpy(nic-&gt;product_name, "Xframe I 10GbE network adapter");</div><div class='add'>+		vpd_addr = 0x50;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 256; i +=4 ) {</div><div class='add'>+		pci_write_config_byte(nic-&gt;pdev, (vpd_addr + 2), i);</div><div class='add'>+		pci_read_config_byte(nic-&gt;pdev,  (vpd_addr + 2), &amp;data);</div><div class='add'>+		pci_write_config_byte(nic-&gt;pdev, (vpd_addr + 3), 0);</div><div class='add'>+		for (cnt = 0; cnt &lt;5; cnt++) {</div><div class='add'>+			msleep(2);</div><div class='add'>+			pci_read_config_byte(nic-&gt;pdev, (vpd_addr + 3), &amp;data);</div><div class='add'>+			if (data == 0x80)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (cnt &gt;= 5) {</div><div class='add'>+			DBG_PRINT(ERR_DBG, "Read of VPD data failed\n");</div><div class='add'>+			fail = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		pci_read_config_dword(nic-&gt;pdev,  (vpd_addr + 4),</div><div class='add'>+				      (u32 *)&amp;vpd_data[i]);</div><div class='add'>+	}</div><div class='add'>+	if ((!fail) &amp;&amp; (vpd_data[1] &lt; VPD_PRODUCT_NAME_LEN)) {</div><div class='add'>+		memset(nic-&gt;product_name, 0, vpd_data[1]);</div><div class='add'>+		memcpy(nic-&gt;product_name, &amp;vpd_data[3], vpd_data[1]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  s2io_ethtool_geeprom  - reads the value stored in the Eeprom.</div><div class='hunk'>@@ -4931,8 +5290,10 @@ static int s2io_link_test(nic_t * sp, uint64_t * data)</div><div class='ctx'> 	u64 val64;</div><div class='ctx'> </div><div class='ctx'> 	val64 = readq(&amp;bar0-&gt;adapter_status);</div><div class='del'>-	if (val64 &amp; ADAPTER_STATUS_RMAC_LOCAL_FAULT)</div><div class='add'>+	if(!(LINK_IS_UP(val64)))</div><div class='ctx'> 		*data = 1;</div><div class='add'>+	else</div><div class='add'>+		*data = 0;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5112,7 +5473,6 @@ static void s2io_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	nic_t *sp = dev-&gt;priv;</div><div class='ctx'> 	StatInfo_t *stat_info = sp-&gt;mac_control.stats_info;</div><div class='del'>-	u64 tmp;</div><div class='ctx'> </div><div class='ctx'> 	s2io_updt_stats(sp);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='hunk'>@@ -5129,9 +5489,19 @@ static void s2io_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;tmac_bcst_frms_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;tmac_bcst_frms);</div><div class='ctx'> 	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;tmac_pause_ctrl_frms);</div><div class='add'>+        tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;tmac_ttl_octets_oflow) &lt;&lt; 32 |</div><div class='add'>+                le32_to_cpu(stat_info-&gt;tmac_ttl_octets);</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;tmac_ucst_frms_oflow) &lt;&lt; 32 |</div><div class='add'>+                le32_to_cpu(stat_info-&gt;tmac_ucst_frms);</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;tmac_nucst_frms_oflow) &lt;&lt; 32 |</div><div class='add'>+                le32_to_cpu(stat_info-&gt;tmac_nucst_frms);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;tmac_any_err_frms_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;tmac_any_err_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;tmac_ttl_less_fb_octets);</div><div class='ctx'> 	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;tmac_vld_ip_octets);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;tmac_vld_ip_oflow) &lt;&lt; 32 |</div><div class='hunk'>@@ -5163,11 +5533,27 @@ static void s2io_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_vld_bcst_frms_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_vld_bcst_frms);</div><div class='ctx'> 	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_in_rng_len_err_frms);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_out_rng_len_err_frms);</div><div class='ctx'> 	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_long_frms);</div><div class='ctx'> 	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_pause_ctrl_frms);</div><div class='add'>+	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_unsup_ctrl_frms);</div><div class='add'>+        tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;rmac_ttl_octets_oflow) &lt;&lt; 32 |</div><div class='add'>+		le32_to_cpu(stat_info-&gt;rmac_ttl_octets);</div><div class='add'>+        tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;rmac_accepted_ucst_frms_oflow)</div><div class='add'>+		&lt;&lt; 32 | le32_to_cpu(stat_info-&gt;rmac_accepted_ucst_frms);</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;rmac_accepted_nucst_frms_oflow)</div><div class='add'>+                 &lt;&lt; 32 | le32_to_cpu(stat_info-&gt;rmac_accepted_nucst_frms);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_discarded_frms_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_discarded_frms);</div><div class='add'>+        tmp_stats[i++] =</div><div class='add'>+                (u64)le32_to_cpu(stat_info-&gt;rmac_drop_events_oflow)</div><div class='add'>+                 &lt;&lt; 32 | le32_to_cpu(stat_info-&gt;rmac_drop_events);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_less_fb_octets);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_frms);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_usized_frms_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_usized_frms);</div><div class='hunk'>@@ -5180,40 +5566,129 @@ static void s2io_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_jabber_frms_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_jabber_frms);</div><div class='del'>-	tmp_stats[i++] = (u64)le32_to_cpu(stat_info-&gt;rmac_ip_oflow) &lt;&lt; 32 |</div><div class='add'>+	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_64_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_65_127_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_128_255_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_256_511_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_512_1023_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_1024_1518_frms);</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+		(u64)le32_to_cpu(stat_info-&gt;rmac_ip_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_ip);</div><div class='ctx'> 	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ip_octets);</div><div class='ctx'> 	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_hdr_err_ip);</div><div class='del'>-	tmp_stats[i++] = (u64)le32_to_cpu(stat_info-&gt;rmac_drop_ip_oflow) &lt;&lt; 32 |</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+		(u64)le32_to_cpu(stat_info-&gt;rmac_drop_ip_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_drop_ip);</div><div class='del'>-	tmp_stats[i++] = (u64)le32_to_cpu(stat_info-&gt;rmac_icmp_oflow) &lt;&lt; 32 |</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+		(u64)le32_to_cpu(stat_info-&gt;rmac_icmp_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_icmp);</div><div class='ctx'> 	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_tcp);</div><div class='del'>-	tmp_stats[i++] = (u64)le32_to_cpu(stat_info-&gt;rmac_udp_oflow) &lt;&lt; 32 |</div><div class='add'>+	tmp_stats[i++] =</div><div class='add'>+		(u64)le32_to_cpu(stat_info-&gt;rmac_udp_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_udp);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_err_drp_udp_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_err_drp_udp);</div><div class='add'>+	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_xgmii_err_sym);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q0);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q1);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q2);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q3);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q4);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q5);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q6);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_frms_q7);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q0);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q1);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q2);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q3);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q4);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q5);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q6);</div><div class='add'>+        tmp_stats[i++] = le16_to_cpu(stat_info-&gt;rmac_full_q7);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_pause_cnt_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_pause_cnt);</div><div class='add'>+	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_xgmii_data_err_cnt);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_xgmii_ctrl_err_cnt);</div><div class='ctx'> 	tmp_stats[i++] =</div><div class='ctx'> 		(u64)le32_to_cpu(stat_info-&gt;rmac_accepted_ip_oflow) &lt;&lt; 32 |</div><div class='ctx'> 		le32_to_cpu(stat_info-&gt;rmac_accepted_ip);</div><div class='ctx'> 	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_err_tcp);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rd_req_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;new_rd_req_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;new_rd_req_rtry_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rd_rtry_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;wr_rtry_rd_ack_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;wr_req_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;new_wr_req_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;new_wr_req_rtry_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;wr_rtry_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;wr_disc_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rd_rtry_wr_ack_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;txp_wr_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;txd_rd_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;txd_wr_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rxd_rd_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rxd_wr_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;txf_rd_cnt);</div><div class='add'>+	tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rxf_wr_cnt);</div><div class='add'>+	tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_1519_4095_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_4096_8191_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_8192_max_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_ttl_gt_max_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_osized_alt_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_jabber_alt_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_gt_max_alt_frms);</div><div class='add'>+        tmp_stats[i++] = le64_to_cpu(stat_info-&gt;rmac_vlan_frms);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_len_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_fcs_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_pf_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_da_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_red_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_rts_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;rmac_ingm_full_discard);</div><div class='add'>+        tmp_stats[i++] = le32_to_cpu(stat_info-&gt;link_fault_cnt);</div><div class='ctx'> 	tmp_stats[i++] = 0;</div><div class='ctx'> 	tmp_stats[i++] = stat_info-&gt;sw_stat.single_ecc_errs;</div><div class='ctx'> 	tmp_stats[i++] = stat_info-&gt;sw_stat.double_ecc_errs;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;sw_stat.parity_err_cnt;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;sw_stat.serious_err_cnt;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;sw_stat.soft_reset_cnt;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;sw_stat.fifo_full_cnt;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;sw_stat.ring_full_cnt;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.alarm_transceiver_temp_high;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.alarm_transceiver_temp_low;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.alarm_laser_bias_current_high;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.alarm_laser_bias_current_low;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.alarm_laser_output_power_high;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.alarm_laser_output_power_low;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.warn_transceiver_temp_high;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.warn_transceiver_temp_low;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.warn_laser_bias_current_high;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.warn_laser_bias_current_low;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.warn_laser_output_power_high;</div><div class='add'>+	tmp_stats[i++] = stat_info-&gt;xpak_stat.warn_laser_output_power_low;</div><div class='ctx'> 	tmp_stats[i++] = stat_info-&gt;sw_stat.clubbed_frms_cnt;</div><div class='ctx'> 	tmp_stats[i++] = stat_info-&gt;sw_stat.sending_both;</div><div class='ctx'> 	tmp_stats[i++] = stat_info-&gt;sw_stat.outof_sequence_pkts;</div><div class='ctx'> 	tmp_stats[i++] = stat_info-&gt;sw_stat.flush_max_pkts;</div><div class='del'>-	tmp = 0;</div><div class='ctx'> 	if (stat_info-&gt;sw_stat.num_aggregations) {</div><div class='del'>-		tmp = stat_info-&gt;sw_stat.sum_avg_pkts_aggregated;</div><div class='del'>-		do_div(tmp, stat_info-&gt;sw_stat.num_aggregations);</div><div class='add'>+		u64 tmp = stat_info-&gt;sw_stat.sum_avg_pkts_aggregated;</div><div class='add'>+		int count = 0;</div><div class='add'>+		/* </div><div class='add'>+		 * Since 64-bit divide does not work on all platforms,</div><div class='add'>+		 * do repeated subtraction.</div><div class='add'>+		 */</div><div class='add'>+		while (tmp &gt;= stat_info-&gt;sw_stat.num_aggregations) {</div><div class='add'>+			tmp -= stat_info-&gt;sw_stat.num_aggregations;</div><div class='add'>+			count++;</div><div class='add'>+		}</div><div class='add'>+		tmp_stats[i++] = count;</div><div class='ctx'> 	}</div><div class='del'>-	tmp_stats[i++] = tmp;</div><div class='add'>+	else</div><div class='add'>+		tmp_stats[i++] = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int s2io_ethtool_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -5489,6 +5964,277 @@ static void s2io_set_link(unsigned long data)</div><div class='ctx'> 	clear_bit(0, &amp;(nic-&gt;link_state));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int set_rxd_buffer_pointer(nic_t *sp, RxD_t *rxdp, buffAdd_t *ba,</div><div class='add'>+			   struct sk_buff **skb, u64 *temp0, u64 *temp1,</div><div class='add'>+			   u64 *temp2, int size)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = sp-&gt;dev;</div><div class='add'>+	struct sk_buff *frag_list;</div><div class='add'>+</div><div class='add'>+	if ((sp-&gt;rxd_mode == RXD_MODE_1) &amp;&amp; (rxdp-&gt;Host_Control == 0)) {</div><div class='add'>+		/* allocate skb */</div><div class='add'>+		if (*skb) {</div><div class='add'>+			DBG_PRINT(INFO_DBG, "SKB is not NULL\n");</div><div class='add'>+			/*</div><div class='add'>+			 * As Rx frame are not going to be processed,</div><div class='add'>+			 * using same mapped address for the Rxd</div><div class='add'>+			 * buffer pointer</div><div class='add'>+			 */</div><div class='add'>+			((RxD1_t*)rxdp)-&gt;Buffer0_ptr = *temp0;</div><div class='add'>+		} else {</div><div class='add'>+			*skb = dev_alloc_skb(size);</div><div class='add'>+			if (!(*skb)) {</div><div class='add'>+				DBG_PRINT(ERR_DBG, "%s: Out of ", dev-&gt;name);</div><div class='add'>+				DBG_PRINT(ERR_DBG, "memory to allocate SKBs\n");</div><div class='add'>+				return -ENOMEM ;</div><div class='add'>+			}</div><div class='add'>+			/* storing the mapped addr in a temp variable</div><div class='add'>+			 * such it will be used for next rxd whose</div><div class='add'>+			 * Host Control is NULL</div><div class='add'>+			 */</div><div class='add'>+			((RxD1_t*)rxdp)-&gt;Buffer0_ptr = *temp0 =</div><div class='add'>+				pci_map_single( sp-&gt;pdev, (*skb)-&gt;data,</div><div class='add'>+					size - NET_IP_ALIGN,</div><div class='add'>+					PCI_DMA_FROMDEVICE);</div><div class='add'>+			rxdp-&gt;Host_Control = (unsigned long) (*skb);</div><div class='add'>+		}</div><div class='add'>+	} else if ((sp-&gt;rxd_mode == RXD_MODE_3B) &amp;&amp; (rxdp-&gt;Host_Control == 0)) {</div><div class='add'>+		/* Two buffer Mode */</div><div class='add'>+		if (*skb) {</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer2_ptr = *temp2;</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer0_ptr = *temp0;</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer1_ptr = *temp1;</div><div class='add'>+		} else {</div><div class='add'>+			*skb = dev_alloc_skb(size);</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer2_ptr = *temp2 =</div><div class='add'>+				pci_map_single(sp-&gt;pdev, (*skb)-&gt;data,</div><div class='add'>+					       dev-&gt;mtu + 4,</div><div class='add'>+					       PCI_DMA_FROMDEVICE);</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer0_ptr = *temp0 =</div><div class='add'>+				pci_map_single( sp-&gt;pdev, ba-&gt;ba_0, BUF0_LEN,</div><div class='add'>+						PCI_DMA_FROMDEVICE);</div><div class='add'>+			rxdp-&gt;Host_Control = (unsigned long) (*skb);</div><div class='add'>+</div><div class='add'>+			/* Buffer-1 will be dummy buffer not used */</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer1_ptr = *temp1 =</div><div class='add'>+				pci_map_single(sp-&gt;pdev, ba-&gt;ba_1, BUF1_LEN,</div><div class='add'>+					       PCI_DMA_FROMDEVICE);</div><div class='add'>+		}</div><div class='add'>+	} else if ((rxdp-&gt;Host_Control == 0)) {</div><div class='add'>+		/* Three buffer mode */</div><div class='add'>+		if (*skb) {</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer0_ptr = *temp0;</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer1_ptr = *temp1;</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer2_ptr = *temp2;</div><div class='add'>+		} else {</div><div class='add'>+			*skb = dev_alloc_skb(size);</div><div class='add'>+</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer0_ptr = *temp0 =</div><div class='add'>+				pci_map_single(sp-&gt;pdev, ba-&gt;ba_0, BUF0_LEN,</div><div class='add'>+					       PCI_DMA_FROMDEVICE);</div><div class='add'>+			/* Buffer-1 receives L3/L4 headers */</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer1_ptr = *temp1 =</div><div class='add'>+				pci_map_single( sp-&gt;pdev, (*skb)-&gt;data,</div><div class='add'>+						l3l4hdr_size + 4,</div><div class='add'>+						PCI_DMA_FROMDEVICE);</div><div class='add'>+			/*</div><div class='add'>+			 * skb_shinfo(skb)-&gt;frag_list will have L4</div><div class='add'>+			 * data payload</div><div class='add'>+			 */</div><div class='add'>+			skb_shinfo(*skb)-&gt;frag_list = dev_alloc_skb(dev-&gt;mtu +</div><div class='add'>+								   ALIGN_SIZE);</div><div class='add'>+			if (skb_shinfo(*skb)-&gt;frag_list == NULL) {</div><div class='add'>+				DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb \</div><div class='add'>+					  failed\n ", dev-&gt;name);</div><div class='add'>+				return -ENOMEM ;</div><div class='add'>+			}</div><div class='add'>+			frag_list = skb_shinfo(*skb)-&gt;frag_list;</div><div class='add'>+			frag_list-&gt;next = NULL;</div><div class='add'>+			/*</div><div class='add'>+			 * Buffer-2 receives L4 data payload</div><div class='add'>+			 */</div><div class='add'>+			((RxD3_t*)rxdp)-&gt;Buffer2_ptr = *temp2 =</div><div class='add'>+				pci_map_single( sp-&gt;pdev, frag_list-&gt;data,</div><div class='add'>+						dev-&gt;mtu, PCI_DMA_FROMDEVICE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static void set_rxd_buffer_size(nic_t *sp, RxD_t *rxdp, int size)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = sp-&gt;dev;</div><div class='add'>+	if (sp-&gt;rxd_mode == RXD_MODE_1) {</div><div class='add'>+		rxdp-&gt;Control_2 = SET_BUFFER0_SIZE_1( size - NET_IP_ALIGN);</div><div class='add'>+	} else if (sp-&gt;rxd_mode == RXD_MODE_3B) {</div><div class='add'>+		rxdp-&gt;Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);</div><div class='add'>+		rxdp-&gt;Control_2 |= SET_BUFFER1_SIZE_3(1);</div><div class='add'>+		rxdp-&gt;Control_2 |= SET_BUFFER2_SIZE_3( dev-&gt;mtu + 4);</div><div class='add'>+	} else {</div><div class='add'>+		rxdp-&gt;Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);</div><div class='add'>+		rxdp-&gt;Control_2 |= SET_BUFFER1_SIZE_3(l3l4hdr_size + 4);</div><div class='add'>+		rxdp-&gt;Control_2 |= SET_BUFFER2_SIZE_3(dev-&gt;mtu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static  int rxd_owner_bit_reset(nic_t *sp)</div><div class='add'>+{</div><div class='add'>+	int i, j, k, blk_cnt = 0, size;</div><div class='add'>+	mac_info_t * mac_control = &amp;sp-&gt;mac_control;</div><div class='add'>+	struct config_param *config = &amp;sp-&gt;config;</div><div class='add'>+	struct net_device *dev = sp-&gt;dev;</div><div class='add'>+	RxD_t *rxdp = NULL;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	buffAdd_t *ba = NULL;</div><div class='add'>+	u64 temp0_64 = 0, temp1_64 = 0, temp2_64 = 0;</div><div class='add'>+</div><div class='add'>+	/* Calculate the size based on ring mode */</div><div class='add'>+	size = dev-&gt;mtu + HEADER_ETHERNET_II_802_3_SIZE +</div><div class='add'>+		HEADER_802_2_SIZE + HEADER_SNAP_SIZE;</div><div class='add'>+	if (sp-&gt;rxd_mode == RXD_MODE_1)</div><div class='add'>+		size += NET_IP_ALIGN;</div><div class='add'>+	else if (sp-&gt;rxd_mode == RXD_MODE_3B)</div><div class='add'>+		size = dev-&gt;mtu + ALIGN_SIZE + BUF0_LEN + 4;</div><div class='add'>+	else</div><div class='add'>+		size = l3l4hdr_size + ALIGN_SIZE + BUF0_LEN + 4;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; config-&gt;rx_ring_num; i++) {</div><div class='add'>+		blk_cnt = config-&gt;rx_cfg[i].num_rxd /</div><div class='add'>+			(rxd_count[sp-&gt;rxd_mode] +1);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; blk_cnt; j++) {</div><div class='add'>+			for (k = 0; k &lt; rxd_count[sp-&gt;rxd_mode]; k++) {</div><div class='add'>+				rxdp = mac_control-&gt;rings[i].</div><div class='add'>+					rx_blocks[j].rxds[k].virt_addr;</div><div class='add'>+				if(sp-&gt;rxd_mode &gt;= RXD_MODE_3A)</div><div class='add'>+					ba = &amp;mac_control-&gt;rings[i].ba[j][k];</div><div class='add'>+				set_rxd_buffer_pointer(sp, rxdp, ba,</div><div class='add'>+						       &amp;skb,(u64 *)&amp;temp0_64,</div><div class='add'>+						       (u64 *)&amp;temp1_64,</div><div class='add'>+						       (u64 *)&amp;temp2_64, size);</div><div class='add'>+</div><div class='add'>+				set_rxd_buffer_size(sp, rxdp, size);</div><div class='add'>+				wmb();</div><div class='add'>+				/* flip the Ownership bit to Hardware */</div><div class='add'>+				rxdp-&gt;Control_1 |= RXD_OWN_XENA;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s2io_add_isr(nic_t * sp)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct net_device *dev = sp-&gt;dev;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;intr_type == MSI)</div><div class='add'>+		ret = s2io_enable_msi(sp);</div><div class='add'>+	else if (sp-&gt;intr_type == MSI_X)</div><div class='add'>+		ret = s2io_enable_msi_x(sp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "%s: Defaulting to INTA\n", dev-&gt;name);</div><div class='add'>+		sp-&gt;intr_type = INTA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store the values of the MSIX table in the nic_t structure */</div><div class='add'>+	store_xmsi_data(sp);</div><div class='add'>+</div><div class='add'>+	/* After proper initialization of H/W, register ISR */</div><div class='add'>+	if (sp-&gt;intr_type == MSI) {</div><div class='add'>+		err = request_irq((int) sp-&gt;pdev-&gt;irq, s2io_msi_handle,</div><div class='add'>+			IRQF_SHARED, sp-&gt;name, dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			pci_disable_msi(sp-&gt;pdev);</div><div class='add'>+			DBG_PRINT(ERR_DBG, "%s: MSI registration failed\n",</div><div class='add'>+				  dev-&gt;name);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sp-&gt;intr_type == MSI_X) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i=1; (sp-&gt;s2io_entries[i].in_use == MSIX_FLG); i++) {</div><div class='add'>+			if (sp-&gt;s2io_entries[i].type == MSIX_FIFO_TYPE) {</div><div class='add'>+				sprintf(sp-&gt;desc[i], "%s:MSI-X-%d-TX",</div><div class='add'>+					dev-&gt;name, i);</div><div class='add'>+				err = request_irq(sp-&gt;entries[i].vector,</div><div class='add'>+					  s2io_msix_fifo_handle, 0, sp-&gt;desc[i],</div><div class='add'>+						  sp-&gt;s2io_entries[i].arg);</div><div class='add'>+				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp-&gt;desc[i],</div><div class='add'>+				(unsigned long long)sp-&gt;msix_info[i].addr);</div><div class='add'>+			} else {</div><div class='add'>+				sprintf(sp-&gt;desc[i], "%s:MSI-X-%d-RX",</div><div class='add'>+					dev-&gt;name, i);</div><div class='add'>+				err = request_irq(sp-&gt;entries[i].vector,</div><div class='add'>+					  s2io_msix_ring_handle, 0, sp-&gt;desc[i],</div><div class='add'>+						  sp-&gt;s2io_entries[i].arg);</div><div class='add'>+				DBG_PRINT(ERR_DBG, "%s @ 0x%llx\n", sp-&gt;desc[i],</div><div class='add'>+				(unsigned long long)sp-&gt;msix_info[i].addr);</div><div class='add'>+			}</div><div class='add'>+			if (err) {</div><div class='add'>+				DBG_PRINT(ERR_DBG,"%s:MSI-X-%d registration "</div><div class='add'>+					  "failed\n", dev-&gt;name, i);</div><div class='add'>+				DBG_PRINT(ERR_DBG, "Returned: %d\n", err);</div><div class='add'>+				return -1;</div><div class='add'>+			}</div><div class='add'>+			sp-&gt;s2io_entries[i].in_use = MSIX_REGISTERED_SUCCESS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sp-&gt;intr_type == INTA) {</div><div class='add'>+		err = request_irq((int) sp-&gt;pdev-&gt;irq, s2io_isr, IRQF_SHARED,</div><div class='add'>+				sp-&gt;name, dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",</div><div class='add'>+				  dev-&gt;name);</div><div class='add'>+			return -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static void s2io_rem_isr(nic_t * sp)</div><div class='add'>+{</div><div class='add'>+	int cnt = 0;</div><div class='add'>+	struct net_device *dev = sp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (sp-&gt;intr_type == MSI_X) {</div><div class='add'>+		int i;</div><div class='add'>+		u16 msi_control;</div><div class='add'>+</div><div class='add'>+		for (i=1; (sp-&gt;s2io_entries[i].in_use ==</div><div class='add'>+			MSIX_REGISTERED_SUCCESS); i++) {</div><div class='add'>+			int vector = sp-&gt;entries[i].vector;</div><div class='add'>+			void *arg = sp-&gt;s2io_entries[i].arg;</div><div class='add'>+</div><div class='add'>+			free_irq(vector, arg);</div><div class='add'>+		}</div><div class='add'>+		pci_read_config_word(sp-&gt;pdev, 0x42, &amp;msi_control);</div><div class='add'>+		msi_control &amp;= 0xFFFE; /* Disable MSI */</div><div class='add'>+		pci_write_config_word(sp-&gt;pdev, 0x42, msi_control);</div><div class='add'>+</div><div class='add'>+		pci_disable_msix(sp-&gt;pdev);</div><div class='add'>+	} else {</div><div class='add'>+		free_irq(sp-&gt;pdev-&gt;irq, dev);</div><div class='add'>+		if (sp-&gt;intr_type == MSI) {</div><div class='add'>+			u16 val;</div><div class='add'>+</div><div class='add'>+			pci_disable_msi(sp-&gt;pdev);</div><div class='add'>+			pci_read_config_word(sp-&gt;pdev, 0x4c, &amp;val);</div><div class='add'>+			val ^= 0x1;</div><div class='add'>+			pci_write_config_word(sp-&gt;pdev, 0x4c, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* Waiting till all Interrupt handlers are complete */</div><div class='add'>+	cnt = 0;</div><div class='add'>+	do {</div><div class='add'>+		msleep(10);</div><div class='add'>+		if (!atomic_read(&amp;sp-&gt;isr_cnt))</div><div class='add'>+			break;</div><div class='add'>+		cnt++;</div><div class='add'>+	} while(cnt &lt; 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void s2io_card_down(nic_t * sp)</div><div class='ctx'> {</div><div class='ctx'> 	int cnt = 0;</div><div class='hunk'>@@ -5506,11 +6252,22 @@ static void s2io_card_down(nic_t * sp)</div><div class='ctx'> 	/* disable Tx and Rx traffic on the NIC */</div><div class='ctx'> 	stop_nic(sp);</div><div class='ctx'> </div><div class='add'>+	s2io_rem_isr(sp);</div><div class='add'>+</div><div class='ctx'> 	/* Kill tasklet. */</div><div class='ctx'> 	tasklet_kill(&amp;sp-&gt;task);</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the device is Quiescent and then Reset the NIC */</div><div class='ctx'> 	do {</div><div class='add'>+		/* As per the HW requirement we need to replenish the</div><div class='add'>+		 * receive buffer to avoid the ring bump. Since there is</div><div class='add'>+		 * no intention of processing the Rx frame at this pointwe are</div><div class='add'>+		 * just settting the ownership bit of rxd in Each Rx</div><div class='add'>+		 * ring to HW and set the appropriate buffer size</div><div class='add'>+		 * based on the ring mode</div><div class='add'>+		 */</div><div class='add'>+		rxd_owner_bit_reset(sp);</div><div class='add'>+</div><div class='ctx'> 		val64 = readq(&amp;bar0-&gt;adapter_status);</div><div class='ctx'> 		if (verify_xena_quiescence(sp, val64, sp-&gt;device_enabled_once)) {</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -5528,15 +6285,6 @@ static void s2io_card_down(nic_t * sp)</div><div class='ctx'> 	} while (1);</div><div class='ctx'> 	s2io_reset(sp);</div><div class='ctx'> </div><div class='del'>-	/* Waiting till all Interrupt handlers are complete */</div><div class='del'>-	cnt = 0;</div><div class='del'>-	do {</div><div class='del'>-		msleep(10);</div><div class='del'>-		if (!atomic_read(&amp;sp-&gt;isr_cnt))</div><div class='del'>-			break;</div><div class='del'>-		cnt++;</div><div class='del'>-	} while(cnt &lt; 5);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;sp-&gt;tx_lock, flags);</div><div class='ctx'> 	/* Free all Tx buffers */</div><div class='ctx'> 	free_tx_buffers(sp);</div><div class='hunk'>@@ -5556,23 +6304,16 @@ static int s2io_card_up(nic_t * sp)</div><div class='ctx'> 	mac_info_t *mac_control;</div><div class='ctx'> 	struct config_param *config;</div><div class='ctx'> 	struct net_device *dev = (struct net_device *) sp-&gt;dev;</div><div class='add'>+	u16 interruptible;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the H/W I/O registers */</div><div class='ctx'> 	if (init_nic(sp) != 0) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: H/W initialization failed\n",</div><div class='ctx'> 			  dev-&gt;name);</div><div class='add'>+		s2io_reset(sp);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sp-&gt;intr_type == MSI)</div><div class='del'>-		ret = s2io_enable_msi(sp);</div><div class='del'>-	else if (sp-&gt;intr_type == MSI_X)</div><div class='del'>-		ret = s2io_enable_msi_x(sp);</div><div class='del'>-	if (ret) {</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: Defaulting to INTA\n", dev-&gt;name);</div><div class='del'>-		sp-&gt;intr_type = INTA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initializing the Rx buffers. For now we are considering only 1</div><div class='ctx'> 	 * Rx ring and initializing buffers into 30 Rx blocks</div><div class='hunk'>@@ -5603,21 +6344,39 @@ static int s2io_card_up(nic_t * sp)</div><div class='ctx'> 			sp-&gt;lro_max_aggr_per_sess = lro_max_pkts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enable tasklet for the device */</div><div class='del'>-	tasklet_init(&amp;sp-&gt;task, s2io_tasklet, (unsigned long) dev);</div><div class='del'>-</div><div class='ctx'> 	/* Enable Rx Traffic and interrupts on the NIC */</div><div class='ctx'> 	if (start_nic(sp)) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: Starting NIC failed\n", dev-&gt;name);</div><div class='del'>-		tasklet_kill(&amp;sp-&gt;task);</div><div class='ctx'> 		s2io_reset(sp);</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='add'>+		free_rx_buffers(sp);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add interrupt service routine */</div><div class='add'>+	if (s2io_add_isr(sp) != 0) {</div><div class='add'>+		if (sp-&gt;intr_type == MSI_X)</div><div class='add'>+			s2io_rem_isr(sp);</div><div class='add'>+		s2io_reset(sp);</div><div class='ctx'> 		free_rx_buffers(sp);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	S2IO_TIMER_CONF(sp-&gt;alarm_timer, s2io_alarm_handle, sp, (HZ/2));</div><div class='ctx'> </div><div class='add'>+	/* Enable tasklet for the device */</div><div class='add'>+	tasklet_init(&amp;sp-&gt;task, s2io_tasklet, (unsigned long) dev);</div><div class='add'>+</div><div class='add'>+	/*  Enable select interrupts */</div><div class='add'>+	if (sp-&gt;intr_type != INTA)</div><div class='add'>+		en_dis_able_nic_intrs(sp, ENA_ALL_INTRS, DISABLE_INTRS);</div><div class='add'>+	else {</div><div class='add'>+		interruptible = TX_TRAFFIC_INTR | RX_TRAFFIC_INTR;</div><div class='add'>+		interruptible |= TX_PIC_INTR | RX_PIC_INTR;</div><div class='add'>+		interruptible |= TX_MAC_INTR | RX_MAC_INTR;</div><div class='add'>+		en_dis_able_nic_intrs(sp, interruptible, ENABLE_INTRS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	atomic_set(&amp;sp-&gt;card_state, CARD_UP);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -5667,6 +6426,7 @@ static void s2io_tx_watchdog(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (netif_carrier_ok(dev)) {</div><div class='ctx'> 		schedule_work(&amp;sp-&gt;rst_timer_task);</div><div class='add'>+		sp-&gt;mac_control.stats_info-&gt;sw_stat.soft_reset_cnt++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5695,18 +6455,33 @@ static int rx_osm_handler(ring_info_t *ring_data, RxD_t * rxdp)</div><div class='ctx'> 		((unsigned long) rxdp-&gt;Host_Control);</div><div class='ctx'> 	int ring_no = ring_data-&gt;ring_no;</div><div class='ctx'> 	u16 l3_csum, l4_csum;</div><div class='add'>+	unsigned long long err = rxdp-&gt;Control_1 &amp; RXD_T_CODE;</div><div class='ctx'> 	lro_t *lro;</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;dev = dev;</div><div class='del'>-	if (rxdp-&gt;Control_1 &amp; RXD_T_CODE) {</div><div class='del'>-		unsigned long long err = rxdp-&gt;Control_1 &amp; RXD_T_CODE;</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%llx\n",</div><div class='del'>-			  dev-&gt;name, err);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		sp-&gt;stats.rx_crc_errors++;</div><div class='del'>-		atomic_dec(&amp;sp-&gt;rx_bufs_left[ring_no]);</div><div class='del'>-		rxdp-&gt;Host_Control = 0;</div><div class='del'>-		return 0;</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Check for parity error */</div><div class='add'>+		if (err &amp; 0x1) {</div><div class='add'>+			sp-&gt;mac_control.stats_info-&gt;sw_stat.parity_err_cnt++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		* Drop the packet if bad transfer code. Exception being</div><div class='add'>+		* 0x5, which could be due to unsupported IPv6 extension header.</div><div class='add'>+		* In this case, we let stack handle the packet.</div><div class='add'>+		* Note that in this case, since checksum will be incorrect,</div><div class='add'>+		* stack will validate the same.</div><div class='add'>+		*/</div><div class='add'>+		if (err &amp;&amp; ((err &gt;&gt; 48) != 0x5)) {</div><div class='add'>+			DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%llx\n",</div><div class='add'>+				dev-&gt;name, err);</div><div class='add'>+			sp-&gt;stats.rx_crc_errors++;</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			atomic_dec(&amp;sp-&gt;rx_bufs_left[ring_no]);</div><div class='add'>+			rxdp-&gt;Host_Control = 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Updating statistics */</div><div class='hunk'>@@ -5792,6 +6567,9 @@ static int rx_osm_handler(ring_info_t *ring_data, RxD_t * rxdp)</div><div class='ctx'> 						clear_lro_session(lro);</div><div class='ctx'> 						goto send_up;</div><div class='ctx'> 					case 0: /* sessions exceeded */</div><div class='add'>+					case -1: /* non-TCP or not</div><div class='add'>+						  * L2 aggregatable</div><div class='add'>+						  */</div><div class='ctx'> 					case 5: /*</div><div class='ctx'> 						 * First pkt in session not</div><div class='ctx'> 						 * L3/L4 aggregatable</div><div class='hunk'>@@ -5918,13 +6696,6 @@ static void s2io_init_pci(nic_t * sp)</div><div class='ctx'> 	pci_write_config_word(sp-&gt;pdev, PCI_COMMAND,</div><div class='ctx'> 			      (pci_cmd | PCI_COMMAND_PARITY));</div><div class='ctx'> 	pci_read_config_word(sp-&gt;pdev, PCI_COMMAND, &amp;pci_cmd);</div><div class='del'>-</div><div class='del'>-	/* Forcibly disabling relaxed ordering capability of the card. */</div><div class='del'>-	pcix_cmd &amp;= 0xfffd;</div><div class='del'>-	pci_write_config_word(sp-&gt;pdev, PCIX_COMMAND_REGISTER,</div><div class='del'>-			      pcix_cmd);</div><div class='del'>-	pci_read_config_word(sp-&gt;pdev, PCIX_COMMAND_REGISTER,</div><div class='del'>-			     &amp;(pcix_cmd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Raghavendra Koushik &lt;raghavendra.koushik@neterion.com&gt;");</div><div class='hunk'>@@ -5954,6 +6725,55 @@ module_param(intr_type, int, 0);</div><div class='ctx'> module_param(lro, int, 0);</div><div class='ctx'> module_param(lro_max_pkts, int, 0);</div><div class='ctx'> </div><div class='add'>+static int s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type)</div><div class='add'>+{</div><div class='add'>+	if ( tx_fifo_num &gt; 8) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Requested number of Tx fifos not "</div><div class='add'>+			 "supported\n");</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Default to 8 Tx fifos\n");</div><div class='add'>+		tx_fifo_num = 8;</div><div class='add'>+	}</div><div class='add'>+	if ( rx_ring_num &gt; 8) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Requested number of Rx rings not "</div><div class='add'>+			 "supported\n");</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Default to 8 Rx rings\n");</div><div class='add'>+		rx_ring_num = 8;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_S2IO_NAPI</div><div class='add'>+	if (*dev_intr_type != INTA) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: NAPI cannot be enabled when "</div><div class='add'>+			  "MSI/MSI-X is enabled. Defaulting to INTA\n");</div><div class='add'>+		*dev_intr_type = INTA;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+#ifndef CONFIG_PCI_MSI</div><div class='add'>+	if (*dev_intr_type != INTA) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: This kernel does not support"</div><div class='add'>+			  "MSI/MSI-X. Defaulting to INTA\n");</div><div class='add'>+		*dev_intr_type = INTA;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (*dev_intr_type &gt; MSI_X) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Wrong intr_type requested. "</div><div class='add'>+			  "Defaulting to INTA\n");</div><div class='add'>+		*dev_intr_type = INTA;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	if ((*dev_intr_type == MSI_X) &amp;&amp;</div><div class='add'>+			((pdev-&gt;device != PCI_DEVICE_ID_HERC_WIN) &amp;&amp;</div><div class='add'>+			(pdev-&gt;device != PCI_DEVICE_ID_HERC_UNI))) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Xframe I does not support MSI_X. " </div><div class='add'>+					"Defaulting to INTA\n");</div><div class='add'>+		*dev_intr_type = INTA;</div><div class='add'>+	}</div><div class='add'>+	if (rx_ring_mode &gt; 3) {</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Requested ring mode not supported\n");</div><div class='add'>+		DBG_PRINT(ERR_DBG, "s2io: Defaulting to 3-buffer mode\n");</div><div class='add'>+		rx_ring_mode = 3;</div><div class='add'>+	}</div><div class='add'>+	return SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *  s2io_init_nic - Initialization of the adapter .</div><div class='ctx'>  *  @pdev : structure containing the PCI related information of the device.</div><div class='hunk'>@@ -5984,15 +6804,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)</div><div class='ctx'> 	int mode;</div><div class='ctx'> 	u8 dev_intr_type = intr_type;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_S2IO_NAPI</div><div class='del'>-	if (dev_intr_type != INTA) {</div><div class='del'>-		DBG_PRINT(ERR_DBG, "NAPI cannot be enabled when MSI/MSI-X \</div><div class='del'>-is enabled. Defaulting to INTA\n");</div><div class='del'>-		dev_intr_type = INTA;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		DBG_PRINT(ERR_DBG, "NAPI support has been enabled\n");</div><div class='del'>-#endif</div><div class='add'>+	if ((ret = s2io_verify_parm(pdev, &amp;dev_intr_type)))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = pci_enable_device(pdev))) {</div><div class='ctx'> 		DBG_PRINT(ERR_DBG,</div><div class='hunk'>@@ -6017,14 +6830,6 @@ is enabled. Defaulting to INTA\n");</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if ((dev_intr_type == MSI_X) &amp;&amp; </div><div class='del'>-			((pdev-&gt;device != PCI_DEVICE_ID_HERC_WIN) &amp;&amp;</div><div class='del'>-			(pdev-&gt;device != PCI_DEVICE_ID_HERC_UNI))) {</div><div class='del'>-		DBG_PRINT(ERR_DBG, "Xframe I does not support MSI_X. \</div><div class='del'>-Defaulting to INTA\n");</div><div class='del'>-		dev_intr_type = INTA;</div><div class='del'>-	}</div><div class='ctx'> 	if (dev_intr_type != MSI_X) {</div><div class='ctx'> 		if (pci_request_regions(pdev, s2io_driver_name)) {</div><div class='ctx'> 			DBG_PRINT(ERR_DBG, "Request Regions failed\n"),</div><div class='hunk'>@@ -6100,8 +6905,6 @@ Defaulting to INTA\n");</div><div class='ctx'> 	config = &amp;sp-&gt;config;</div><div class='ctx'> </div><div class='ctx'> 	/* Tx side parameters. */</div><div class='del'>-	if (tx_fifo_len[0] == 0)</div><div class='del'>-		tx_fifo_len[0] = DEFAULT_FIFO_LEN; /* Default value. */</div><div class='ctx'> 	config-&gt;tx_fifo_num = tx_fifo_num;</div><div class='ctx'> 	for (i = 0; i &lt; MAX_TX_FIFOS; i++) {</div><div class='ctx'> 		config-&gt;tx_cfg[i].fifo_len = tx_fifo_len[i];</div><div class='hunk'>@@ -6125,8 +6928,6 @@ Defaulting to INTA\n");</div><div class='ctx'> 	config-&gt;max_txds = MAX_SKB_FRAGS + 2;</div><div class='ctx'> </div><div class='ctx'> 	/* Rx side parameters. */</div><div class='del'>-	if (rx_ring_sz[0] == 0)</div><div class='del'>-		rx_ring_sz[0] = SMALL_BLK_CNT; /* Default value. */</div><div class='ctx'> 	config-&gt;rx_ring_num = rx_ring_num;</div><div class='ctx'> 	for (i = 0; i &lt; MAX_RX_RINGS; i++) {</div><div class='ctx'> 		config-&gt;rx_cfg[i].num_rxd = rx_ring_sz[i] *</div><div class='hunk'>@@ -6210,12 +7011,19 @@ Defaulting to INTA\n");</div><div class='ctx'> 	dev-&gt;weight = 32;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	dev-&gt;poll_controller = s2io_netpoll;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_SG | NETIF_F_IP_CSUM;</div><div class='ctx'> 	if (sp-&gt;high_dma_flag == TRUE)</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> #ifdef NETIF_F_TSO</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_TSO;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef NETIF_F_TSO6</div><div class='add'>+	dev-&gt;features |= NETIF_F_TSO6;</div><div class='add'>+#endif</div><div class='ctx'> 	if (sp-&gt;device_type &amp; XFRAME_II_DEVICE) {</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_UFO;</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_HW_CSUM;</div><div class='hunk'>@@ -6267,8 +7075,8 @@ Defaulting to INTA\n");</div><div class='ctx'> 	val64 = RMAC_ADDR_CMD_MEM_RD | RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |</div><div class='ctx'> 	    RMAC_ADDR_CMD_MEM_OFFSET(0 + MAC_MAC_ADDR_START_OFFSET);</div><div class='ctx'> 	writeq(val64, &amp;bar0-&gt;rmac_addr_cmd_mem);</div><div class='del'>-	wait_for_cmd_complete(sp);</div><div class='del'>-</div><div class='add'>+	wait_for_cmd_complete(&amp;bar0-&gt;rmac_addr_cmd_mem,</div><div class='add'>+		      RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING);</div><div class='ctx'> 	tmp64 = readq(&amp;bar0-&gt;rmac_addr_data0_mem);</div><div class='ctx'> 	mac_down = (u32) tmp64;</div><div class='ctx'> 	mac_up = (u32) (tmp64 &gt;&gt; 32);</div><div class='hunk'>@@ -6322,82 +7130,63 @@ Defaulting to INTA\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto register_failed;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (sp-&gt;device_type &amp; XFRAME_II_DEVICE) {</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: Neterion Xframe II 10GbE adapter ",</div><div class='del'>-			  dev-&gt;name);</div><div class='del'>-		DBG_PRINT(ERR_DBG, "(rev %d), Version %s",</div><div class='add'>+	s2io_vpd_read(sp);</div><div class='add'>+	DBG_PRINT(ERR_DBG, "%s: Neterion %s",dev-&gt;name, sp-&gt;product_name);</div><div class='add'>+	DBG_PRINT(ERR_DBG, "(rev %d), Driver version %s\n",</div><div class='ctx'> 				get_xena_rev_id(sp-&gt;pdev),</div><div class='ctx'> 				s2io_driver_version);</div><div class='del'>-		switch(sp-&gt;intr_type) {</div><div class='del'>-			case INTA:</div><div class='del'>-				DBG_PRINT(ERR_DBG, ", Intr type INTA");</div><div class='del'>-				break;</div><div class='del'>-			case MSI:</div><div class='del'>-				DBG_PRINT(ERR_DBG, ", Intr type MSI");</div><div class='del'>-				break;</div><div class='del'>-			case MSI_X:</div><div class='del'>-				DBG_PRINT(ERR_DBG, ", Intr type MSI-X");</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");</div><div class='del'>-		DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='add'>+	DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2005 Neterion Inc.\n");</div><div class='add'>+	DBG_PRINT(ERR_DBG, "%s: MAC ADDR: "</div><div class='add'>+			  "%02x:%02x:%02x:%02x:%02x:%02x\n", dev-&gt;name,</div><div class='ctx'> 			  sp-&gt;def_mac_addr[0].mac_addr[0],</div><div class='ctx'> 			  sp-&gt;def_mac_addr[0].mac_addr[1],</div><div class='ctx'> 			  sp-&gt;def_mac_addr[0].mac_addr[2],</div><div class='ctx'> 			  sp-&gt;def_mac_addr[0].mac_addr[3],</div><div class='ctx'> 			  sp-&gt;def_mac_addr[0].mac_addr[4],</div><div class='ctx'> 			  sp-&gt;def_mac_addr[0].mac_addr[5]);</div><div class='add'>+	if (sp-&gt;device_type &amp; XFRAME_II_DEVICE) {</div><div class='ctx'> 		mode = s2io_print_pci_mode(sp);</div><div class='ctx'> 		if (mode &lt; 0) {</div><div class='del'>-			DBG_PRINT(ERR_DBG, " Unsupported PCI bus mode ");</div><div class='add'>+			DBG_PRINT(ERR_DBG, " Unsupported PCI bus mode\n");</div><div class='ctx'> 			ret = -EBADSLT;</div><div class='add'>+			unregister_netdev(dev);</div><div class='ctx'> 			goto set_swap_failed;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: Neterion Xframe I 10GbE adapter ",</div><div class='del'>-			  dev-&gt;name);</div><div class='del'>-		DBG_PRINT(ERR_DBG, "(rev %d), Version %s",</div><div class='del'>-					get_xena_rev_id(sp-&gt;pdev),</div><div class='del'>-					s2io_driver_version);</div><div class='del'>-		switch(sp-&gt;intr_type) {</div><div class='del'>-			case INTA:</div><div class='del'>-				DBG_PRINT(ERR_DBG, ", Intr type INTA");</div><div class='del'>-				break;</div><div class='del'>-			case MSI:</div><div class='del'>-				DBG_PRINT(ERR_DBG, ", Intr type MSI");</div><div class='del'>-				break;</div><div class='del'>-			case MSI_X:</div><div class='del'>-				DBG_PRINT(ERR_DBG, ", Intr type MSI-X");</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");</div><div class='del'>-		DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-			  sp-&gt;def_mac_addr[0].mac_addr[0],</div><div class='del'>-			  sp-&gt;def_mac_addr[0].mac_addr[1],</div><div class='del'>-			  sp-&gt;def_mac_addr[0].mac_addr[2],</div><div class='del'>-			  sp-&gt;def_mac_addr[0].mac_addr[3],</div><div class='del'>-			  sp-&gt;def_mac_addr[0].mac_addr[4],</div><div class='del'>-			  sp-&gt;def_mac_addr[0].mac_addr[5]);</div><div class='ctx'> 	}</div><div class='del'>-	if (sp-&gt;rxd_mode == RXD_MODE_3B)</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: 2-Buffer mode support has been "</div><div class='del'>-			  "enabled\n",dev-&gt;name);</div><div class='del'>-	if (sp-&gt;rxd_mode == RXD_MODE_3A)</div><div class='del'>-		DBG_PRINT(ERR_DBG, "%s: 3-Buffer mode support has been "</div><div class='del'>-			  "enabled\n",dev-&gt;name);</div><div class='del'>-</div><div class='add'>+	switch(sp-&gt;rxd_mode) {</div><div class='add'>+		case RXD_MODE_1:</div><div class='add'>+		    DBG_PRINT(ERR_DBG, "%s: 1-Buffer receive mode enabled\n",</div><div class='add'>+						dev-&gt;name);</div><div class='add'>+		    break;</div><div class='add'>+		case RXD_MODE_3B:</div><div class='add'>+		    DBG_PRINT(ERR_DBG, "%s: 2-Buffer receive mode enabled\n",</div><div class='add'>+						dev-&gt;name);</div><div class='add'>+		    break;</div><div class='add'>+		case RXD_MODE_3A:</div><div class='add'>+		    DBG_PRINT(ERR_DBG, "%s: 3-Buffer receive mode enabled\n",</div><div class='add'>+						dev-&gt;name);</div><div class='add'>+		    break;</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_S2IO_NAPI</div><div class='add'>+	DBG_PRINT(ERR_DBG, "%s: NAPI enabled\n", dev-&gt;name);</div><div class='add'>+#endif</div><div class='add'>+	switch(sp-&gt;intr_type) {</div><div class='add'>+		case INTA:</div><div class='add'>+		    DBG_PRINT(ERR_DBG, "%s: Interrupt type INTA\n", dev-&gt;name);</div><div class='add'>+		    break;</div><div class='add'>+		case MSI:</div><div class='add'>+		    DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI\n", dev-&gt;name);</div><div class='add'>+		    break;</div><div class='add'>+		case MSI_X:</div><div class='add'>+		    DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI-X\n", dev-&gt;name);</div><div class='add'>+		    break;</div><div class='add'>+	}</div><div class='ctx'> 	if (sp-&gt;lro)</div><div class='ctx'> 		DBG_PRINT(ERR_DBG, "%s: Large receive offload enabled\n",</div><div class='del'>-			dev-&gt;name);</div><div class='add'>+			  dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize device name */</div><div class='del'>-	strcpy(sp-&gt;name, dev-&gt;name);</div><div class='del'>-	if (sp-&gt;device_type &amp; XFRAME_II_DEVICE)</div><div class='del'>-		strcat(sp-&gt;name, ": Neterion Xframe II 10GbE adapter");</div><div class='del'>-	else</div><div class='del'>-		strcat(sp-&gt;name, ": Neterion Xframe I 10GbE adapter");</div><div class='add'>+	sprintf(sp-&gt;name, "%s Neterion %s", dev-&gt;name, sp-&gt;product_name);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize bimodal Interrupts */</div><div class='ctx'> 	sp-&gt;config.bimodal = bimodal;</div><div class='head'>diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h<br/>index 0a0b5b29d81e..217097bc22f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/s2io.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/s2io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/s2io.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/s2io.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'> #define SUCCESS 0</div><div class='ctx'> #define FAILURE -1</div><div class='ctx'> </div><div class='add'>+#define CHECKBIT(value, nbit) (value &amp; (1 &lt;&lt; nbit))</div><div class='add'>+</div><div class='ctx'> /* Maximum time to flicker LED when asked to identify NIC using ethtool */</div><div class='ctx'> #define MAX_FLICKER_TIME	60000 /* 60 Secs */</div><div class='ctx'> </div><div class='hunk'>@@ -78,6 +80,11 @@ static int debug_level = ERR_DBG;</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	unsigned long long single_ecc_errs;</div><div class='ctx'> 	unsigned long long double_ecc_errs;</div><div class='add'>+	unsigned long long parity_err_cnt;</div><div class='add'>+	unsigned long long serious_err_cnt;</div><div class='add'>+	unsigned long long soft_reset_cnt;</div><div class='add'>+	unsigned long long fifo_full_cnt;</div><div class='add'>+	unsigned long long ring_full_cnt;</div><div class='ctx'> 	/* LRO statistics */</div><div class='ctx'> 	unsigned long long clubbed_frms_cnt;</div><div class='ctx'> 	unsigned long long sending_both;</div><div class='hunk'>@@ -87,6 +94,25 @@ typedef struct {</div><div class='ctx'> 	unsigned long long num_aggregations;</div><div class='ctx'> } swStat_t;</div><div class='ctx'> </div><div class='add'>+/* Xpak releated alarm and warnings */</div><div class='add'>+typedef struct {</div><div class='add'>+	u64 alarm_transceiver_temp_high;</div><div class='add'>+	u64 alarm_transceiver_temp_low;</div><div class='add'>+	u64 alarm_laser_bias_current_high;</div><div class='add'>+	u64 alarm_laser_bias_current_low;</div><div class='add'>+	u64 alarm_laser_output_power_high;</div><div class='add'>+	u64 alarm_laser_output_power_low;</div><div class='add'>+	u64 warn_transceiver_temp_high;</div><div class='add'>+	u64 warn_transceiver_temp_low;</div><div class='add'>+	u64 warn_laser_bias_current_high;</div><div class='add'>+	u64 warn_laser_bias_current_low;</div><div class='add'>+	u64 warn_laser_output_power_high;</div><div class='add'>+	u64 warn_laser_output_power_low;</div><div class='add'>+	u64 xpak_regs_stat;</div><div class='add'>+	u32 xpak_timer_count;</div><div class='add'>+} xpakStat_t;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* The statistics block of Xena */</div><div class='ctx'> typedef struct stat_block {</div><div class='ctx'> /* Tx MAC statistics counters. */</div><div class='hunk'>@@ -263,7 +289,9 @@ typedef struct stat_block {</div><div class='ctx'> 	u32 rmac_accepted_ip_oflow;</div><div class='ctx'> 	u32 reserved_14;</div><div class='ctx'> 	u32 link_fault_cnt;</div><div class='add'>+	u8  buffer[20];</div><div class='ctx'> 	swStat_t sw_stat;</div><div class='add'>+	xpakStat_t xpak_stat;</div><div class='ctx'> } StatInfo_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -624,7 +652,7 @@ typedef struct fifo_info {</div><div class='ctx'> 	nic_t *nic;</div><div class='ctx'> }fifo_info_t;</div><div class='ctx'> </div><div class='del'>-/* Infomation related to the Tx and Rx FIFOs and Rings of Xena</div><div class='add'>+/* Information related to the Tx and Rx FIFOs and Rings of Xena</div><div class='ctx'>  * is maintained in this structure.</div><div class='ctx'>  */</div><div class='ctx'> typedef struct mac_info {</div><div class='hunk'>@@ -659,7 +687,8 @@ typedef struct {</div><div class='ctx'> } usr_addr_t;</div><div class='ctx'> </div><div class='ctx'> /* Default Tunable parameters of the NIC. */</div><div class='del'>-#define DEFAULT_FIFO_LEN 4096</div><div class='add'>+#define DEFAULT_FIFO_0_LEN 4096</div><div class='add'>+#define DEFAULT_FIFO_1_7_LEN 512</div><div class='ctx'> #define SMALL_BLK_CNT	30</div><div class='ctx'> #define LARGE_BLK_CNT	100</div><div class='ctx'> </div><div class='hunk'>@@ -732,7 +761,7 @@ struct s2io_nic {</div><div class='ctx'> 	int device_close_flag;</div><div class='ctx'> 	int device_enabled_once;</div><div class='ctx'> </div><div class='del'>-	char name[50];</div><div class='add'>+	char name[60];</div><div class='ctx'> 	struct tasklet_struct task;</div><div class='ctx'> 	volatile unsigned long tasklet_status;</div><div class='ctx'> </div><div class='hunk'>@@ -800,8 +829,9 @@ struct s2io_nic {</div><div class='ctx'> #define MSIX_FLG                0xA5</div><div class='ctx'> 	struct msix_entry *entries;</div><div class='ctx'> 	struct s2io_msix_entry *s2io_entries;</div><div class='del'>-	char desc1[35];</div><div class='del'>-	char desc2[35];</div><div class='add'>+	char desc[MAX_REQUESTED_MSI_X][25];</div><div class='add'>+</div><div class='add'>+	int avail_msix_vectors; /* No. of MSI-X vectors granted by system */</div><div class='ctx'> </div><div class='ctx'> 	struct msix_info_st msix_info[0x3f];</div><div class='ctx'> </div><div class='hunk'>@@ -824,6 +854,8 @@ struct s2io_nic {</div><div class='ctx'> 	spinlock_t	rx_lock;</div><div class='ctx'> 	atomic_t	isr_cnt;</div><div class='ctx'> 	u64 *ufo_in_band_v;</div><div class='add'>+#define VPD_PRODUCT_NAME_LEN 50</div><div class='add'>+	u8  product_name[VPD_PRODUCT_NAME_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define RESET_ERROR 1;</div><div class='hunk'>@@ -848,28 +880,32 @@ static inline void writeq(u64 val, void __iomem *addr)</div><div class='ctx'> 	writel((u32) (val), addr);</div><div class='ctx'> 	writel((u32) (val &gt;&gt; 32), (addr + 4));</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-/* In 32 bit modes, some registers have to be written in a</div><div class='del'>- * particular order to expect correct hardware operation. The</div><div class='del'>- * macro SPECIAL_REG_WRITE is used to perform such ordered</div><div class='del'>- * writes. Defines UF (Upper First) and LF (Lower First) will</div><div class='del'>- * be used to specify the required write order.</div><div class='add'>+/* </div><div class='add'>+ * Some registers have to be written in a particular order to </div><div class='add'>+ * expect correct hardware operation. The macro SPECIAL_REG_WRITE </div><div class='add'>+ * is used to perform such ordered writes. Defines UF (Upper First) </div><div class='add'>+ * and LF (Lower First) will be used to specify the required write order.</div><div class='ctx'>  */</div><div class='ctx'> #define UF	1</div><div class='ctx'> #define LF	2</div><div class='ctx'> static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)</div><div class='ctx'> {</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='ctx'> 	if (order == LF) {</div><div class='ctx'> 		writel((u32) (val), addr);</div><div class='add'>+		ret = readl(addr);</div><div class='ctx'> 		writel((u32) (val &gt;&gt; 32), (addr + 4));</div><div class='add'>+		ret = readl(addr + 4);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		writel((u32) (val &gt;&gt; 32), (addr + 4));</div><div class='add'>+		ret = readl(addr + 4);</div><div class='ctx'> 		writel((u32) (val), addr);</div><div class='add'>+		ret = readl(addr);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define SPECIAL_REG_WRITE(val, addr, dummy) writeq(val, addr)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*  Interrupt related values of Xena */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c<br/>index f2be9f83f091..9ab1618e82a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sb1250-mac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sb1250-mac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sb1250-mac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sb1250-mac.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;asm/processor.h&gt;		/* Processor type for cache alignment. */</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -2451,7 +2450,7 @@ static int sbmac_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	__raw_readq(sc-&gt;sbm_isr);</div><div class='del'>-	if (request_irq(dev-&gt;irq, &amp;sbmac_intr, SA_SHIRQ, dev-&gt;name, dev))</div><div class='add'>+	if (request_irq(dev-&gt;irq, &amp;sbmac_intr, IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c<br/>index bcef03feb2fc..efd0f235020f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/seeq8005.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/seeq8005.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/seeq8005.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/seeq8005.c</a></div><div class='hunk'>@@ -396,8 +396,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c<br/>index 88e212043a43..c7832e69f177 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/shaper.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/shaper.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/shaper.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/shaper.c</a></div><div class='hunk'>@@ -69,7 +69,6 @@</div><div class='ctx'>  *				 2000/03 Andi Kleen</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='head'>diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c<br/>index 31dd3f036fa8..df0cbebb3277 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sis190.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sis190.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sis190.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sis190.c</a></div><div class='hunk'>@@ -1054,7 +1054,7 @@ static int sis190_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	sis190_request_timer(dev);</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(dev-&gt;irq, sis190_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	rc = request_irq(dev-&gt;irq, sis190_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto err_release_timer_2;</div><div class='ctx'> </div><div class='hunk'>@@ -1156,8 +1156,7 @@ static int sis190_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb-&gt;len &lt; ETH_ZLEN)) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (!skb) {</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN)) {</div><div class='ctx'> 			tp-&gt;stats.tx_dropped++;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c<br/>index f5a3bf4d959a..29ee7ffedfff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sis900.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sis900.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sis900.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sis900.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.</div><div class='ctx'>    Copyright 1999 Silicon Integrated System Corporation </div><div class='del'>-   Revision:	1.08.09 Sep. 19 2005</div><div class='add'>+   Revision:	1.08.10 Apr. 2 2006</div><div class='ctx'>    </div><div class='ctx'>    Modified from the driver which is originally written by Donald Becker.</div><div class='ctx'>    </div><div class='hunk'>@@ -17,9 +17,10 @@</div><div class='ctx'>    SiS 7014 Single Chip 100BASE-TX/10BASE-T Physical Layer Solution,</div><div class='ctx'>    preliminary Rev. 1.0 Jan. 18, 1998</div><div class='ctx'> </div><div class='add'>+   Rev 1.08.10 Apr.  2 2006 Daniele Venzano add vlan (jumbo packets) support</div><div class='ctx'>    Rev 1.08.09 Sep. 19 2005 Daniele Venzano add Wake on LAN support</div><div class='ctx'>    Rev 1.08.08 Jan. 22 2005 Daniele Venzano use netif_msg for debugging messages</div><div class='del'>-   Rev 1.08.07 Nov.  2 2003 Daniele Venzano &lt;webvenza@libero.it&gt; add suspend/resume support</div><div class='add'>+   Rev 1.08.07 Nov.  2 2003 Daniele Venzano &lt;venza@brownhat.org&gt; add suspend/resume support</div><div class='ctx'>    Rev 1.08.06 Sep. 24 2002 Mufasa Yang bug fix for Tx timeout &amp; add SiS963 support</div><div class='ctx'>    Rev 1.08.05 Jun.  6 2002 Mufasa Yang bug fix for read_eeprom &amp; Tx descriptor over-boundary</div><div class='ctx'>    Rev 1.08.04 Apr. 25 2002 Mufasa Yang &lt;mufasa@sis.com.tw&gt; added SiS962 support</div><div class='hunk'>@@ -77,7 +78,7 @@</div><div class='ctx'> #include "sis900.h"</div><div class='ctx'> </div><div class='ctx'> #define SIS900_MODULE_NAME "sis900"</div><div class='del'>-#define SIS900_DRV_VERSION "v1.08.09 Sep. 19 2005"</div><div class='add'>+#define SIS900_DRV_VERSION "v1.08.10 Apr. 2 2006"</div><div class='ctx'> </div><div class='ctx'> static char version[] __devinitdata =</div><div class='ctx'> KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n";</div><div class='hunk'>@@ -1012,7 +1013,7 @@ sis900_open(struct net_device *net_dev)</div><div class='ctx'> 	/* Equalizer workaround Rule */</div><div class='ctx'> 	sis630_set_eq(net_dev, sis_priv-&gt;chipset_rev);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(net_dev-&gt;irq, &amp;sis900_interrupt, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(net_dev-&gt;irq, &amp;sis900_interrupt, IRQF_SHARED,</div><div class='ctx'> 						net_dev-&gt;name, net_dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1402,6 +1403,11 @@ static void sis900_set_mode (long ioaddr, int speed, int duplex)</div><div class='ctx'> 		rx_flags |= RxATX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)</div><div class='add'>+	/* Can accept Jumbo packet */</div><div class='add'>+	rx_flags |= RxAJAB;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	outl (tx_flags, ioaddr + txcfg);</div><div class='ctx'> 	outl (rx_flags, ioaddr + rxcfg);</div><div class='ctx'> }</div><div class='hunk'>@@ -1714,18 +1720,26 @@ static int sis900_rx(struct net_device *net_dev)</div><div class='ctx'> </div><div class='ctx'> 	while (rx_status &amp; OWN) {</div><div class='ctx'> 		unsigned int rx_size;</div><div class='add'>+		unsigned int data_size;</div><div class='ctx'> </div><div class='ctx'> 		if (--rx_work_limit &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		rx_size = (rx_status &amp; DSIZE) - CRC_SIZE;</div><div class='add'>+		data_size = rx_status &amp; DSIZE;</div><div class='add'>+		rx_size = data_size - CRC_SIZE;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)</div><div class='add'>+		/* ``TOOLONG'' flag means jumbo packet recived. */</div><div class='add'>+		if ((rx_status &amp; TOOLONG) &amp;&amp; data_size &lt;= MAX_FRAME_SIZE)</div><div class='add'>+			rx_status &amp;= (~ ((unsigned int)TOOLONG));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 		if (rx_status &amp; (ABORT|OVERRUN|TOOLONG|RUNT|RXISERR|CRCERR|FAERR)) {</div><div class='ctx'> 			/* corrupted packet received */</div><div class='ctx'> 			if (netif_msg_rx_err(sis_priv))</div><div class='ctx'> 				printk(KERN_DEBUG "%s: Corrupted packet "</div><div class='del'>-				       "received, buffer status = 0x%8.8x.\n",</div><div class='del'>-				       net_dev-&gt;name, rx_status);</div><div class='add'>+				       "received, buffer status = 0x%8.8x/%d.\n",</div><div class='add'>+				       net_dev-&gt;name, rx_status, data_size);</div><div class='ctx'> 			sis_priv-&gt;stats.rx_errors++;</div><div class='ctx'> 			if (rx_status &amp; OVERRUN)</div><div class='ctx'> 				sis_priv-&gt;stats.rx_over_errors++;</div><div class='head'>diff --git a/drivers/net/sis900.h b/drivers/net/sis900.h<br/>index 50323941e3c0..4834e3a15694 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sis900.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sis900.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sis900.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sis900.h</a></div><div class='hunk'>@@ -310,8 +310,14 @@ enum sis630_revision_id {</div><div class='ctx'> #define CRC_SIZE                4</div><div class='ctx'> #define MAC_HEADER_SIZE         14</div><div class='ctx'> </div><div class='del'>-#define TX_BUF_SIZE     1536</div><div class='del'>-#define RX_BUF_SIZE     1536</div><div class='add'>+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)</div><div class='add'>+#define MAX_FRAME_SIZE  (1518 + 4)</div><div class='add'>+#else</div><div class='add'>+#define MAX_FRAME_SIZE  1518</div><div class='add'>+#endif /* CONFIG_VLAN_802_1Q */</div><div class='add'>+</div><div class='add'>+#define TX_BUF_SIZE     (MAX_FRAME_SIZE+18)</div><div class='add'>+#define RX_BUF_SIZE     (MAX_FRAME_SIZE+18)</div><div class='ctx'> </div><div class='ctx'> #define NUM_TX_DESC     16      	/* Number of Tx descriptor registers. */</div><div class='ctx'> #define NUM_RX_DESC     16       	/* Number of Rx descriptor registers. */</div><div class='head'>diff --git a/drivers/net/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h<br/>index 2b19f8ad0318..7f8e6d0084c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sk98lin/h/xmac_ii.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk98lin/h/xmac_ii.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sk98lin/h/xmac_ii.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sk98lin/h/xmac_ii.h</a></div><div class='hunk'>@@ -1473,7 +1473,7 @@ extern "C" {</div><div class='ctx'> #define GM_TXCR_FORCE_JAM	(1&lt;&lt;15)	/* Bit 15:	Force Jam / Flow-Control */</div><div class='ctx'> #define GM_TXCR_CRC_DIS		(1&lt;&lt;14)	/* Bit 14:	Disable insertion of CRC */</div><div class='ctx'> #define GM_TXCR_PAD_DIS		(1&lt;&lt;13)	/* Bit 13:	Disable padding of packets */</div><div class='del'>-#define GM_TXCR_COL_THR_MSK	(1&lt;&lt;10)	/* Bit 12..10:	Collision Threshold */</div><div class='add'>+#define GM_TXCR_COL_THR_MSK	(7&lt;&lt;10)	/* Bit 12..10:	Collision Threshold */</div><div class='ctx'> </div><div class='ctx'> #define TX_COL_THR(x)		(SHIFT10(x) &amp; GM_TXCR_COL_THR_MSK)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c<br/>index 38a26df4095f..ee62845d3ac9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sk98lin/skge.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk98lin/skge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sk98lin/skge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sk98lin/skge.c</a></div><div class='hunk'>@@ -570,9 +570,9 @@ SK_BOOL	DualNet;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pAC-&gt;SlowPathLock, Flags);</div><div class='ctx'> </div><div class='ctx'> 	if (pAC-&gt;GIni.GIMacsFound == 2) {</div><div class='del'>-		 Ret = request_irq(dev-&gt;irq, SkGeIsr, SA_SHIRQ, "sk98lin", dev);</div><div class='add'>+		 Ret = request_irq(dev-&gt;irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);</div><div class='ctx'> 	} else if (pAC-&gt;GIni.GIMacsFound == 1) {</div><div class='del'>-		Ret = request_irq(dev-&gt;irq, SkGeIsrOnePort, SA_SHIRQ,</div><div class='add'>+		Ret = request_irq(dev-&gt;irq, SkGeIsrOnePort, IRQF_SHARED,</div><div class='ctx'> 			"sk98lin", dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",</div><div class='hunk'>@@ -1525,7 +1525,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */</div><div class='ctx'> 	** This is to resolve faulty padding by the HW with 0xaa bytes.</div><div class='ctx'> 	*/</div><div class='ctx'> 	if (BytesSend &lt; C_LEN_ETHERNET_MINSIZE) {</div><div class='del'>-		if ((pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL) {</div><div class='add'>+		if (skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;pTxPort-&gt;TxDesRingLock, Flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5073,9 +5073,9 @@ static int skge_resume(struct pci_dev *pdev)</div><div class='ctx'> 	pci_enable_device(pdev);</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	if (pAC-&gt;GIni.GIMacsFound == 2)</div><div class='del'>-		ret = request_irq(dev-&gt;irq, SkGeIsr, SA_SHIRQ, "sk98lin", dev);</div><div class='add'>+		ret = request_irq(dev-&gt;irq, SkGeIsr, IRQF_SHARED, "sk98lin", dev);</div><div class='ctx'> 	else</div><div class='del'>-		ret = request_irq(dev-&gt;irq, SkGeIsrOnePort, SA_SHIRQ, "sk98lin", dev);</div><div class='add'>+		ret = request_irq(dev-&gt;irq, SkGeIsrOnePort, IRQF_SHARED, "sk98lin", dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "sk98lin: unable to acquire IRQ %d\n", dev-&gt;irq);</div><div class='ctx'> 		pAC-&gt;AllocFlag &amp;= ~SK_ALLOC_IRQ;</div><div class='head'>diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c<br/>index 17786056c66a..1e662aaebf84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sk98lin/skvpd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk98lin/skvpd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sk98lin/skvpd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sk98lin/skvpd.c</a></div><div class='hunk'>@@ -22,7 +22,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-	Please refer skvpd.txt for infomation how to include this module</div><div class='add'>+	Please refer skvpd.txt for information how to include this module</div><div class='ctx'>  */</div><div class='ctx'> static const char SysKonnectFileId[] =</div><div class='ctx'> 	"@(#)$Id: skvpd.c,v 1.37 2003/01/13 10:42:45 rschmidt Exp $ (C) SK";</div><div class='head'>diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c<br/>index e5d6d95960c7..799e09801934 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sk_mca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sk_mca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sk_mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sk_mca.c</a></div><div class='hunk'>@@ -824,7 +824,7 @@ static int skmca_open(struct net_device *dev)</div><div class='ctx'> 	/* register resources - only necessary for IRQ */</div><div class='ctx'> 	result =</div><div class='ctx'> 	    request_irq(priv-&gt;realirq, irq_handler,</div><div class='del'>-			SA_SHIRQ | SA_SAMPLE_RANDOM, "sk_mca", dev);</div><div class='add'>+			IRQF_SHARED | IRQF_SAMPLE_RANDOM, "sk_mca", dev);</div><div class='ctx'> 	if (result != 0) {</div><div class='ctx'> 		printk("%s: failed to register irq %d\n", dev-&gt;name,</div><div class='ctx'> 		       dev-&gt;irq);</div><div class='head'>diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/skfp/h/sba.h<br/>index df716cd5784a..638cf0283bc4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/skfp/h/sba.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skfp/h/sba.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/skfp/h/sba.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/skfp/h/sba.h</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Synchronous Bandwith Allocation (SBA) structs</div><div class='add'>+ * Synchronous Bandwidth Allocation (SBA) structs</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> #ifndef _SBA_</div><div class='head'>diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c<br/>index c7fb6133047e..b5714a60237d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/skfp/skfddi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skfp/skfddi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/skfp/skfddi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/skfp/skfddi.c</a></div><div class='hunk'>@@ -497,7 +497,7 @@ static int skfp_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	PRINTK(KERN_INFO "entering skfp_open\n");</div><div class='ctx'> 	/* Register IRQ - support shared interrupts by passing device ptr */</div><div class='del'>-	err = request_irq(dev-&gt;irq, (void *) skfp_interrupt, SA_SHIRQ,</div><div class='add'>+	err = request_irq(dev-&gt;irq, (void *) skfp_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='head'>diff --git a/drivers/net/skge.c b/drivers/net/skge.c<br/>index 5ca5a1b546a1..82200bfaa8ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/skge.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skge.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/skge.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/skge.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -44,12 +43,13 @@</div><div class='ctx'> #include "skge.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"skge"</div><div class='del'>-#define DRV_VERSION		"1.5"</div><div class='add'>+#define DRV_VERSION		"1.6"</div><div class='ctx'> #define PFX			DRV_NAME " "</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_TX_RING_SIZE	128</div><div class='ctx'> #define DEFAULT_RX_RING_SIZE	512</div><div class='ctx'> #define MAX_TX_RING_SIZE	1024</div><div class='add'>+#define TX_LOW_WATER		(MAX_SKB_FRAGS + 1)</div><div class='ctx'> #define MAX_RX_RING_SIZE	4096</div><div class='ctx'> #define RX_COPY_THRESHOLD	128</div><div class='ctx'> #define RX_BUF_SIZE		1536</div><div class='hunk'>@@ -401,7 +401,7 @@ static int skge_set_ring_param(struct net_device *dev,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;rx_pending == 0 || p-&gt;rx_pending &gt; MAX_RX_RING_SIZE ||</div><div class='del'>-	    p-&gt;tx_pending &lt; MAX_SKB_FRAGS+1 || p-&gt;tx_pending &gt; MAX_TX_RING_SIZE)</div><div class='add'>+	    p-&gt;tx_pending &lt; TX_LOW_WATER || p-&gt;tx_pending &gt; MAX_TX_RING_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	skge-&gt;rx_ring.count = p-&gt;rx_pending;</div><div class='hunk'>@@ -603,7 +603,7 @@ static void skge_led(struct skge_port *skge, enum led_mode mode)</div><div class='ctx'> 	struct skge_hw *hw = skge-&gt;hw;</div><div class='ctx'> 	int port = skge-&gt;port;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 	if (hw-&gt;chip_id == CHIP_ID_GENESIS) {</div><div class='ctx'> 		switch (mode) {</div><div class='ctx'> 		case LED_MODE_OFF:</div><div class='hunk'>@@ -663,7 +663,7 @@ static void skge_led(struct skge_port *skge, enum led_mode mode)</div><div class='ctx'> 				     PHY_M_LED_MO_RX(MO_LED_ON));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* blink LED's for finding board */</div><div class='hunk'>@@ -2038,7 +2038,7 @@ static void skge_phy_reset(struct skge_port *skge)</div><div class='ctx'> 	netif_stop_queue(skge-&gt;netdev);</div><div class='ctx'> 	netif_carrier_off(skge-&gt;netdev);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 	if (hw-&gt;chip_id == CHIP_ID_GENESIS) {</div><div class='ctx'> 		genesis_reset(hw, port);</div><div class='ctx'> 		genesis_mac_init(hw, port);</div><div class='hunk'>@@ -2046,7 +2046,7 @@ static void skge_phy_reset(struct skge_port *skge)</div><div class='ctx'> 		yukon_reset(hw, port);</div><div class='ctx'> 		yukon_init(hw, port);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Basic MII support */</div><div class='hunk'>@@ -2067,12 +2067,12 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		/* fallthru */</div><div class='ctx'> 	case SIOCGMIIREG: {</div><div class='ctx'> 		u16 val = 0;</div><div class='del'>-		spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+		mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 		if (hw-&gt;chip_id == CHIP_ID_GENESIS)</div><div class='ctx'> 			err = __xm_phy_read(hw, skge-&gt;port, data-&gt;reg_num &amp; 0x1f, &amp;val);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = __gm_phy_read(hw, skge-&gt;port, data-&gt;reg_num &amp; 0x1f, &amp;val);</div><div class='del'>-		spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+		mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 		data-&gt;val_out = val;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2081,14 +2081,14 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> </div><div class='del'>-		spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+		mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 		if (hw-&gt;chip_id == CHIP_ID_GENESIS)</div><div class='ctx'> 			err = xm_phy_write(hw, skge-&gt;port, data-&gt;reg_num &amp; 0x1f,</div><div class='ctx'> 				   data-&gt;val_in);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = gm_phy_write(hw, skge-&gt;port, data-&gt;reg_num &amp; 0x1f,</div><div class='ctx'> 				   data-&gt;val_in);</div><div class='del'>-		spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+		mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -2191,12 +2191,12 @@ static int skge_up(struct net_device *dev)</div><div class='ctx'> 		goto free_rx_ring;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize MAC */</div><div class='del'>-	spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 	if (hw-&gt;chip_id == CHIP_ID_GENESIS)</div><div class='ctx'> 		genesis_mac_init(hw, port);</div><div class='ctx'> 	else</div><div class='ctx'> 		yukon_mac_init(hw, port);</div><div class='del'>-	spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure RAMbuffers */</div><div class='ctx'> 	chunk = hw-&gt;ram_size / ((hw-&gt;ports + 1)*2);</div><div class='hunk'>@@ -2302,21 +2302,19 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct skge_port *skge = netdev_priv(dev);</div><div class='ctx'> 	struct skge_hw *hw = skge-&gt;hw;</div><div class='del'>-	struct skge_ring *ring = &amp;skge-&gt;tx_ring;</div><div class='ctx'> 	struct skge_element *e;</div><div class='ctx'> 	struct skge_tx_desc *td;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 control, len;</div><div class='ctx'> 	u64 map;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-	if (!skb)</div><div class='add'>+	if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>-	if (!spin_trylock(&amp;skge-&gt;tx_lock)) {</div><div class='add'>+	if (!spin_trylock_irqsave(&amp;skge-&gt;tx_lock, flags))</div><div class='ctx'> 		/* Collision - tell upper layer to requeue */</div><div class='ctx'> 		return NETDEV_TX_LOCKED;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skge_avail(&amp;skge-&gt;tx_ring) &lt; skb_shinfo(skb)-&gt;nr_frags + 1)) {</div><div class='ctx'> 		if (!netif_queue_stopped(dev)) {</div><div class='hunk'>@@ -2325,12 +2323,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",</div><div class='ctx'> 			       dev-&gt;name);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;skge-&gt;tx_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;skge-&gt;tx_lock, flags);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	e = ring-&gt;to_use;</div><div class='add'>+	e = skge-&gt;tx_ring.to_use;</div><div class='ctx'> 	td = e-&gt;desc;</div><div class='add'>+	BUG_ON(td-&gt;control &amp; BMU_OWN);</div><div class='ctx'> 	e-&gt;skb = skb;</div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> 	map = pci_map_single(hw-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='hunk'>@@ -2371,8 +2370,10 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 					   frag-&gt;size, PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='ctx'> 			e = e-&gt;next;</div><div class='del'>-			e-&gt;skb = NULL;</div><div class='add'>+			e-&gt;skb = skb;</div><div class='ctx'> 			tf = e-&gt;desc;</div><div class='add'>+			BUG_ON(tf-&gt;control &amp; BMU_OWN);</div><div class='add'>+</div><div class='ctx'> 			tf-&gt;dma_lo = map;</div><div class='ctx'> 			tf-&gt;dma_hi = (u64) map &gt;&gt; 32;</div><div class='ctx'> 			pci_unmap_addr_set(e, mapaddr, map);</div><div class='hunk'>@@ -2389,56 +2390,68 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	skge_write8(hw, Q_ADDR(txqaddr[skge-&gt;port], Q_CSR), CSR_START);</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_tx_queued(skge))</div><div class='add'>+	if (unlikely(netif_msg_tx_queued(skge)))</div><div class='ctx'> 		printk(KERN_DEBUG "%s: tx queued, slot %td, len %d\n",</div><div class='del'>-		       dev-&gt;name, e - ring-&gt;start, skb-&gt;len);</div><div class='add'>+		       dev-&gt;name, e - skge-&gt;tx_ring.start, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;to_use = e-&gt;next;</div><div class='del'>-	if (skge_avail(&amp;skge-&gt;tx_ring) &lt;= MAX_SKB_FRAGS + 1) {</div><div class='add'>+	skge-&gt;tx_ring.to_use = e-&gt;next;</div><div class='add'>+	if (skge_avail(&amp;skge-&gt;tx_ring) &lt;= TX_LOW_WATER) {</div><div class='ctx'> 		pr_debug("%s: transmit queue full\n", dev-&gt;name);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mmiowb();</div><div class='del'>-	spin_unlock(&amp;skge-&gt;tx_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;skge-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void skge_tx_complete(struct skge_port *skge, struct skge_element *last)</div><div class='add'>+</div><div class='add'>+/* Free resources associated with this reing element */</div><div class='add'>+static void skge_tx_free(struct skge_port *skge, struct skge_element *e,</div><div class='add'>+			 u32 control)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = skge-&gt;hw-&gt;pdev;</div><div class='del'>-	struct skge_element *e;</div><div class='ctx'> </div><div class='del'>-	for (e = skge-&gt;tx_ring.to_clean; e != last; e = e-&gt;next) {</div><div class='del'>-		struct sk_buff *skb = e-&gt;skb;</div><div class='del'>-		int i;</div><div class='add'>+	BUG_ON(!e-&gt;skb);</div><div class='ctx'> </div><div class='del'>-		e-&gt;skb = NULL;</div><div class='add'>+	/* skb header vs. fragment */</div><div class='add'>+	if (control &amp; BMU_STF)</div><div class='ctx'> 		pci_unmap_single(pdev, pci_unmap_addr(e, mapaddr),</div><div class='del'>-				 skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+				 pci_unmap_len(e, maplen),</div><div class='add'>+				 PCI_DMA_TODEVICE);</div><div class='add'>+	else</div><div class='add'>+		pci_unmap_page(pdev, pci_unmap_addr(e, mapaddr),</div><div class='add'>+			       pci_unmap_len(e, maplen),</div><div class='add'>+			       PCI_DMA_TODEVICE);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-			e = e-&gt;next;</div><div class='del'>-			pci_unmap_page(pdev, pci_unmap_addr(e, mapaddr),</div><div class='del'>-				       skb_shinfo(skb)-&gt;frags[i].size,</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='del'>-		}</div><div class='add'>+	if (control &amp; BMU_EOF) {</div><div class='add'>+		if (unlikely(netif_msg_tx_done(skge)))</div><div class='add'>+			printk(KERN_DEBUG PFX "%s: tx done slot %td\n",</div><div class='add'>+			       skge-&gt;netdev-&gt;name, e - skge-&gt;tx_ring.start);</div><div class='ctx'> </div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		dev_kfree_skb_any(e-&gt;skb);</div><div class='ctx'> 	}</div><div class='del'>-	skge-&gt;tx_ring.to_clean = e;</div><div class='add'>+	e-&gt;skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Free all buffers in transmit ring */</div><div class='ctx'> static void skge_tx_clean(struct skge_port *skge)</div><div class='ctx'> {</div><div class='add'>+	struct skge_element *e;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;skge-&gt;tx_lock, flags);</div><div class='add'>+	for (e = skge-&gt;tx_ring.to_clean; e != skge-&gt;tx_ring.to_use; e = e-&gt;next) {</div><div class='add'>+		struct skge_tx_desc *td = e-&gt;desc;</div><div class='add'>+		skge_tx_free(skge, e, td-&gt;control);</div><div class='add'>+		td-&gt;control = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;skge-&gt;tx_lock);</div><div class='del'>-	skge_tx_complete(skge, skge-&gt;tx_ring.to_use);</div><div class='add'>+	skge-&gt;tx_ring.to_clean = e;</div><div class='ctx'> 	netif_wake_queue(skge-&gt;netdev);</div><div class='del'>-	spin_unlock_bh(&amp;skge-&gt;tx_lock);</div><div class='add'>+	spin_unlock_irqrestore(&amp;skge-&gt;tx_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void skge_tx_timeout(struct net_device *dev)</div><div class='hunk'>@@ -2664,32 +2677,28 @@ resubmit:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void skge_tx_done(struct skge_port *skge)</div><div class='add'>+/* Free all buffers in Tx ring which are no longer owned by device */</div><div class='add'>+static void skge_txirq(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct skge_port *skge = netdev_priv(dev);</div><div class='ctx'> 	struct skge_ring *ring = &amp;skge-&gt;tx_ring;</div><div class='del'>-	struct skge_element *e, *last;</div><div class='add'>+	struct skge_element *e;</div><div class='add'>+</div><div class='add'>+	rmb();</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;skge-&gt;tx_lock);</div><div class='del'>-	last = ring-&gt;to_clean;</div><div class='ctx'> 	for (e = ring-&gt;to_clean; e != ring-&gt;to_use; e = e-&gt;next) {</div><div class='ctx'> 		struct skge_tx_desc *td = e-&gt;desc;</div><div class='ctx'> </div><div class='ctx'> 		if (td-&gt;control &amp; BMU_OWN)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (td-&gt;control &amp; BMU_EOF) {</div><div class='del'>-			last = e-&gt;next;</div><div class='del'>-			if (unlikely(netif_msg_tx_done(skge)))</div><div class='del'>-				printk(KERN_DEBUG PFX "%s: tx done slot %td\n",</div><div class='del'>-				       skge-&gt;netdev-&gt;name, e - ring-&gt;start);</div><div class='del'>-		}</div><div class='add'>+		skge_tx_free(skge, e, td-&gt;control);</div><div class='ctx'> 	}</div><div class='add'>+	skge-&gt;tx_ring.to_clean = e;</div><div class='ctx'> </div><div class='del'>-	skge_tx_complete(skge, last);</div><div class='del'>-</div><div class='del'>-	skge_write8(skge-&gt;hw, Q_ADDR(txqaddr[skge-&gt;port], Q_CSR), CSR_IRQ_CL_F);</div><div class='del'>-</div><div class='del'>-	if (skge_avail(&amp;skge-&gt;tx_ring) &gt; MAX_SKB_FRAGS + 1)</div><div class='add'>+	if (netif_queue_stopped(skge-&gt;netdev)</div><div class='add'>+	    &amp;&amp; skge_avail(&amp;skge-&gt;tx_ring) &gt; TX_LOW_WATER)</div><div class='ctx'> 		netif_wake_queue(skge-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;skge-&gt;tx_lock);</div><div class='hunk'>@@ -2704,8 +2713,6 @@ static int skge_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 	int to_do = min(dev-&gt;quota, *budget);</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='del'>-	skge_tx_done(skge);</div><div class='del'>-</div><div class='ctx'> 	for (e = ring-&gt;to_clean; prefetch(e-&gt;next), work_done &lt; to_do; e = e-&gt;next) {</div><div class='ctx'> 		struct skge_rx_desc *rd = e-&gt;desc;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='hunk'>@@ -2737,10 +2744,12 @@ static int skge_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 		return 1; /* not done */</div><div class='ctx'> </div><div class='ctx'> 	netif_rx_complete(dev);</div><div class='del'>-	mmiowb();</div><div class='ctx'> </div><div class='del'>-  	hw-&gt;intr_mask |= skge-&gt;port == 0 ? (IS_R1_F|IS_XA1_F) : (IS_R2_F|IS_XA2_F);</div><div class='add'>+	spin_lock_irq(&amp;hw-&gt;hw_lock);</div><div class='add'>+	hw-&gt;intr_mask |= rxirqmask[skge-&gt;port];</div><div class='ctx'>   	skge_write32(hw, B0_IMSK, hw-&gt;intr_mask);</div><div class='add'>+	mmiowb();</div><div class='add'>+	spin_unlock_irq(&amp;hw-&gt;hw_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2847,16 +2856,16 @@ static void skge_error_irq(struct skge_hw *hw)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Interrupt from PHY are handled in tasklet (soft irq)</div><div class='add'>+ * Interrupt from PHY are handled in work queue</div><div class='ctx'>  * because accessing phy registers requires spin wait which might</div><div class='ctx'>  * cause excess interrupt latency.</div><div class='ctx'>  */</div><div class='del'>-static void skge_extirq(unsigned long data)</div><div class='add'>+static void skge_extirq(void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct skge_hw *hw = (struct skge_hw *) data;</div><div class='add'>+	struct skge_hw *hw = arg;</div><div class='ctx'> 	int port;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 	for (port = 0; port &lt; hw-&gt;ports; port++) {</div><div class='ctx'> 		struct net_device *dev = hw-&gt;dev[port];</div><div class='ctx'> 		struct skge_port *skge = netdev_priv(dev);</div><div class='hunk'>@@ -2868,10 +2877,12 @@ static void skge_extirq(unsigned long data)</div><div class='ctx'> 				bcom_phy_intr(skge);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irq(&amp;hw-&gt;hw_lock);</div><div class='ctx'> 	hw-&gt;intr_mask |= IS_EXT_REG;</div><div class='ctx'> 	skge_write32(hw, B0_IMSK, hw-&gt;intr_mask);</div><div class='add'>+	spin_unlock_irq(&amp;hw-&gt;hw_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='hunk'>@@ -2884,54 +2895,68 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;hw-&gt;hw_lock);</div><div class='add'>+	status &amp;= hw-&gt;intr_mask;</div><div class='ctx'> 	if (status &amp; IS_EXT_REG) {</div><div class='ctx'> 		hw-&gt;intr_mask &amp;= ~IS_EXT_REG;</div><div class='del'>-		tasklet_schedule(&amp;hw-&gt;ext_tasklet);</div><div class='add'>+		schedule_work(&amp;hw-&gt;phy_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status &amp; (IS_R1_F|IS_XA1_F)) {</div><div class='del'>-		skge_write8(hw, Q_ADDR(Q_R1, Q_CSR), CSR_IRQ_CL_F);</div><div class='del'>-		hw-&gt;intr_mask &amp;= ~(IS_R1_F|IS_XA1_F);</div><div class='del'>-		netif_rx_schedule(hw-&gt;dev[0]);</div><div class='add'>+	if (status &amp; IS_XA1_F) {</div><div class='add'>+		skge_write8(hw, Q_ADDR(Q_XA1, Q_CSR), CSR_IRQ_CL_F);</div><div class='add'>+		skge_txirq(hw-&gt;dev[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status &amp; (IS_R2_F|IS_XA2_F)) {</div><div class='del'>-		skge_write8(hw, Q_ADDR(Q_R2, Q_CSR), CSR_IRQ_CL_F);</div><div class='del'>-		hw-&gt;intr_mask &amp;= ~(IS_R2_F|IS_XA2_F);</div><div class='del'>-		netif_rx_schedule(hw-&gt;dev[1]);</div><div class='add'>+	if (status &amp; IS_R1_F) {</div><div class='add'>+		skge_write8(hw, Q_ADDR(Q_R1, Q_CSR), CSR_IRQ_CL_F);</div><div class='add'>+		hw-&gt;intr_mask &amp;= ~IS_R1_F;</div><div class='add'>+		netif_rx_schedule(hw-&gt;dev[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (likely((status &amp; hw-&gt;intr_mask) == 0))</div><div class='del'>-		return IRQ_HANDLED;</div><div class='add'>+	if (status &amp; IS_PA_TO_TX1)</div><div class='add'>+		skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX1);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; IS_PA_TO_RX1) {</div><div class='ctx'> 		struct skge_port *skge = netdev_priv(hw-&gt;dev[0]);</div><div class='del'>-		++skge-&gt;net_stats.rx_over_errors;</div><div class='del'>-		skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX1);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (status &amp; IS_PA_TO_RX2) {</div><div class='del'>-		struct skge_port *skge = netdev_priv(hw-&gt;dev[1]);</div><div class='ctx'> 		++skge-&gt;net_stats.rx_over_errors;</div><div class='del'>-		skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX2);</div><div class='add'>+		skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status &amp; IS_PA_TO_TX1)</div><div class='del'>-		skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX1);</div><div class='del'>-</div><div class='del'>-	if (status &amp; IS_PA_TO_TX2)</div><div class='del'>-		skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX2);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; IS_MAC1)</div><div class='ctx'> 		skge_mac_intr(hw, 0);</div><div class='ctx'> </div><div class='del'>-	if (status &amp; IS_MAC2)</div><div class='del'>-		skge_mac_intr(hw, 1);</div><div class='add'>+	if (hw-&gt;dev[1]) {</div><div class='add'>+		if (status &amp; IS_XA2_F) {</div><div class='add'>+			skge_write8(hw, Q_ADDR(Q_XA2, Q_CSR), CSR_IRQ_CL_F);</div><div class='add'>+			skge_txirq(hw-&gt;dev[1]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; IS_R2_F) {</div><div class='add'>+			skge_write8(hw, Q_ADDR(Q_R2, Q_CSR), CSR_IRQ_CL_F);</div><div class='add'>+			hw-&gt;intr_mask &amp;= ~IS_R2_F;</div><div class='add'>+			netif_rx_schedule(hw-&gt;dev[1]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; IS_PA_TO_RX2) {</div><div class='add'>+			struct skge_port *skge = netdev_priv(hw-&gt;dev[1]);</div><div class='add'>+			++skge-&gt;net_stats.rx_over_errors;</div><div class='add'>+			skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_RX2);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; IS_PA_TO_TX2)</div><div class='add'>+			skge_write16(hw, B3_PA_CTRL, PA_CLR_TO_TX2);</div><div class='add'>+</div><div class='add'>+		if (status &amp; IS_MAC2)</div><div class='add'>+			skge_mac_intr(hw, 1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; IS_HW_ERR)</div><div class='ctx'> 		skge_error_irq(hw);</div><div class='ctx'> </div><div class='ctx'> 	skge_write32(hw, B0_IMSK, hw-&gt;intr_mask);</div><div class='add'>+	spin_unlock(&amp;hw-&gt;hw_lock);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -2957,7 +2982,7 @@ static int skge_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='ctx'> 	memcpy_toio(hw-&gt;regs + B2_MAC_1 + port*8,</div><div class='ctx'> 		    dev-&gt;dev_addr, ETH_ALEN);</div><div class='hunk'>@@ -2970,7 +2995,7 @@ static int skge_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 		gma_set_addr(hw, port, GM_SRC_ADDR_1L, dev-&gt;dev_addr);</div><div class='ctx'> 		gma_set_addr(hw, port, GM_SRC_ADDR_2L, dev-&gt;dev_addr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3082,6 +3107,7 @@ static int skge_reset(struct skge_hw *hw)</div><div class='ctx'> 	else</div><div class='ctx'> 		hw-&gt;ram_size = t8 * 4096;</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;hw-&gt;hw_lock);</div><div class='ctx'> 	hw-&gt;intr_mask = IS_HW_ERR | IS_EXT_REG | IS_PORT_1;</div><div class='ctx'> 	if (hw-&gt;ports &gt; 1)</div><div class='ctx'> 		hw-&gt;intr_mask |= IS_PORT_2;</div><div class='hunk'>@@ -3150,14 +3176,14 @@ static int skge_reset(struct skge_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	skge_write32(hw, B0_IMSK, hw-&gt;intr_mask);</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_lock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; hw-&gt;ports; i++) {</div><div class='ctx'> 		if (hw-&gt;chip_id == CHIP_ID_GENESIS)</div><div class='ctx'> 			genesis_reset(hw, i);</div><div class='ctx'> 		else</div><div class='ctx'> 			yukon_reset(hw, i);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;hw-&gt;phy_lock);</div><div class='add'>+	mutex_unlock(&amp;hw-&gt;phy_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3305,8 +3331,8 @@ static int __devinit skge_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;pdev = pdev;</div><div class='del'>-	spin_lock_init(&amp;hw-&gt;phy_lock);</div><div class='del'>-	tasklet_init(&amp;hw-&gt;ext_tasklet, skge_extirq, (unsigned long) hw);</div><div class='add'>+	mutex_init(&amp;hw-&gt;phy_mutex);</div><div class='add'>+	INIT_WORK(&amp;hw-&gt;phy_work, skge_extirq, hw);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);</div><div class='ctx'> 	if (!hw-&gt;regs) {</div><div class='hunk'>@@ -3315,7 +3341,7 @@ static int __devinit skge_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_out_free_hw;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pdev-&gt;irq, skge_intr, SA_SHIRQ, DRV_NAME, hw);</div><div class='add'>+	err = request_irq(pdev-&gt;irq, skge_intr, IRQF_SHARED, DRV_NAME, hw);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",</div><div class='ctx'> 		       pci_name(pdev), pdev-&gt;irq);</div><div class='hunk'>@@ -3327,13 +3353,21 @@ static int __devinit skge_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_free_irq;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX DRV_VERSION " addr 0x%lx irq %d chip %s rev %d\n",</div><div class='del'>-	       pci_resource_start(pdev, 0), pdev-&gt;irq,</div><div class='add'>+	printk(KERN_INFO PFX DRV_VERSION " addr 0x%llx irq %d chip %s rev %d\n",</div><div class='add'>+	       (unsigned long long)pci_resource_start(pdev, 0), pdev-&gt;irq,</div><div class='ctx'> 	       skge_board_name(hw), hw-&gt;chip_rev);</div><div class='ctx'> </div><div class='ctx'> 	if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)</div><div class='ctx'> 		goto err_out_led_off;</div><div class='ctx'> </div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='add'>+		printk(KERN_ERR PFX "%s: bad (zero?) ethernet address in rom\n",</div><div class='add'>+		       pci_name(pdev));</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_out_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "%s: cannot register net device\n",</div><div class='hunk'>@@ -3388,11 +3422,15 @@ static void __devexit skge_remove(struct pci_dev *pdev)</div><div class='ctx'> 	dev0 = hw-&gt;dev[0];</div><div class='ctx'> 	unregister_netdev(dev0);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irq(&amp;hw-&gt;hw_lock);</div><div class='add'>+	hw-&gt;intr_mask = 0;</div><div class='ctx'> 	skge_write32(hw, B0_IMSK, 0);</div><div class='add'>+	spin_unlock_irq(&amp;hw-&gt;hw_lock);</div><div class='add'>+</div><div class='ctx'> 	skge_write16(hw, B0_LED, LED_STAT_OFF);</div><div class='ctx'> 	skge_write8(hw, B0_CTST, CS_RST_SET);</div><div class='ctx'> </div><div class='del'>-	tasklet_kill(&amp;hw-&gt;ext_tasklet);</div><div class='add'>+	flush_scheduled_work();</div><div class='ctx'> </div><div class='ctx'> 	free_irq(pdev-&gt;irq, hw);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='head'>diff --git a/drivers/net/skge.h b/drivers/net/skge.h<br/>index 1f1ce88c8186..593387b3c0dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/skge.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/skge.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/skge.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/skge.h</a></div><div class='hunk'>@@ -1734,11 +1734,11 @@ enum {</div><div class='ctx'> 	GM_TXCR_FORCE_JAM	= 1&lt;&lt;15, /* Bit 15:	Force Jam / Flow-Control */</div><div class='ctx'> 	GM_TXCR_CRC_DIS		= 1&lt;&lt;14, /* Bit 14:	Disable insertion of CRC */</div><div class='ctx'> 	GM_TXCR_PAD_DIS		= 1&lt;&lt;13, /* Bit 13:	Disable padding of packets */</div><div class='del'>-	GM_TXCR_COL_THR_MSK	= 1&lt;&lt;10, /* Bit 12..10:	Collision Threshold */</div><div class='add'>+	GM_TXCR_COL_THR_MSK	= 7&lt;&lt;10, /* Bit 12..10:	Collision Threshold */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TX_COL_THR(x)		(((x)&lt;&lt;10) &amp; GM_TXCR_COL_THR_MSK)</div><div class='del'>-#define TX_COL_DEF		0x04</div><div class='add'>+#define TX_COL_DEF		0x04	/* late collision after 64 byte */</div><div class='ctx'> </div><div class='ctx'> /*	GM_RX_CTRL			16 bit r/w	Receive Control Register */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -2388,6 +2388,7 @@ struct skge_ring {</div><div class='ctx'> struct skge_hw {</div><div class='ctx'> 	void __iomem  	     *regs;</div><div class='ctx'> 	struct pci_dev	     *pdev;</div><div class='add'>+	spinlock_t	     hw_lock;</div><div class='ctx'> 	u32		     intr_mask;</div><div class='ctx'> 	struct net_device    *dev[2];</div><div class='ctx'> </div><div class='hunk'>@@ -2399,9 +2400,8 @@ struct skge_hw {</div><div class='ctx'> 	u32	     	     ram_size;</div><div class='ctx'> 	u32	     	     ram_offset;</div><div class='ctx'> 	u16		     phy_addr;</div><div class='del'>-</div><div class='del'>-	struct tasklet_struct ext_tasklet;</div><div class='del'>-	spinlock_t	     phy_lock;</div><div class='add'>+	struct work_struct   phy_work;</div><div class='add'>+	struct mutex	     phy_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='head'>diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c<br/>index 959109609d85..d98f28c34e5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sky2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sky2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sky2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sky2.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='hunk'>@@ -66,6 +65,7 @@</div><div class='ctx'> #define RX_MAX_PENDING		(RX_LE_SIZE/2 - 2)</div><div class='ctx'> #define RX_DEF_PENDING		RX_MAX_PENDING</div><div class='ctx'> #define RX_SKB_ALIGN		8</div><div class='add'>+#define RX_BUF_WRITE		16</div><div class='ctx'> </div><div class='ctx'> #define TX_RING_SIZE		512</div><div class='ctx'> #define TX_DEF_PENDING		(TX_RING_SIZE - 1)</div><div class='hunk'>@@ -187,12 +187,11 @@ static u16 gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg)</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='add'>+static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='ctx'> {</div><div class='ctx'> 	u16 power_control;</div><div class='ctx'> 	u32 reg1;</div><div class='ctx'> 	int vaux;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("sky2_set_power_state %d\n", state);</div><div class='ctx'> 	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);</div><div class='hunk'>@@ -236,7 +235,6 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (hw-&gt;chip_id == CHIP_ID_YUKON_EC_U) {</div><div class='del'>-			sky2_write16(hw, B0_CTST, Y2_HW_WOL_ON);</div><div class='ctx'> 			sky2_pci_write32(hw, PCI_DEV_REG3, 0);</div><div class='ctx'> 			reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);</div><div class='ctx'> 			reg1 &amp;= P_ASPM_CONTROL_MSK;</div><div class='hunk'>@@ -245,6 +243,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);</div><div class='add'>+		udelay(100);</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -257,6 +256,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='ctx'> 		else</div><div class='ctx'> 			reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);</div><div class='ctx'> 		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);</div><div class='add'>+		udelay(100);</div><div class='ctx'> </div><div class='ctx'> 		if (hw-&gt;chip_id == CHIP_ID_YUKON_XL &amp;&amp; hw-&gt;chip_rev &gt; 1)</div><div class='ctx'> 			sky2_write8(hw, B2_Y2_CLK_GATE, 0);</div><div class='hunk'>@@ -275,12 +275,10 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		printk(KERN_ERR PFX "Unknown power state %d\n", state);</div><div class='del'>-		ret = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sky2_pci_write16(hw, hw-&gt;pm_cap + PCI_PM_CTRL, power_control);</div><div class='ctx'> 	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sky2_phy_reset(struct sky2_hw *hw, unsigned port)</div><div class='hunk'>@@ -1163,7 +1161,7 @@ static unsigned tx_le_req(const struct sk_buff *skb)</div><div class='ctx'> 	count = sizeof(dma_addr_t) / sizeof(u32);</div><div class='ctx'> 	count += skb_shinfo(skb)-&gt;nr_frags * count;</div><div class='ctx'> </div><div class='del'>-	if (skb_shinfo(skb)-&gt;tso_size)</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='ctx'> 		++count;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_HW)</div><div class='hunk'>@@ -1235,7 +1233,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for TCP Segmentation Offload */</div><div class='del'>-	mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='add'>+	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 	if (mss != 0) {</div><div class='ctx'> 		/* just drop the packet if non-linear expansion fails */</div><div class='ctx'> 		if (skb_header_cloned(skb) &amp;&amp;</div><div class='hunk'>@@ -1393,7 +1391,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sky2-&gt;tx_cons = put;</div><div class='del'>-	if (tx_avail(sky2) &gt; MAX_SKB_TX_LE)</div><div class='add'>+	if (tx_avail(sky2) &gt; MAX_SKB_TX_LE + 4)</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1892,9 +1890,6 @@ resubmit:</div><div class='ctx'> 	re-&gt;skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 	sky2_rx_add(sky2, re-&gt;mapaddr);</div><div class='ctx'> </div><div class='del'>-	/* Tell receiver about new buffers. */</div><div class='del'>-	sky2_put_idx(sky2-&gt;hw, rxqaddr[sky2-&gt;port], sky2-&gt;rx_put);</div><div class='del'>-</div><div class='ctx'> 	return skb;</div><div class='ctx'> </div><div class='ctx'> oversize:</div><div class='hunk'>@@ -1941,7 +1936,9 @@ static inline int sky2_more_work(const struct sky2_hw *hw)</div><div class='ctx'> /* Process status response ring */</div><div class='ctx'> static int sky2_status_intr(struct sky2_hw *hw, int to_do)</div><div class='ctx'> {</div><div class='add'>+	struct sky2_port *sky2;</div><div class='ctx'> 	int work_done = 0;</div><div class='add'>+	unsigned buf_write[2] = { 0, 0 };</div><div class='ctx'> 	u16 hwidx = sky2_read16(hw, STAT_PUT_IDX);</div><div class='ctx'> </div><div class='ctx'> 	rmb();</div><div class='hunk'>@@ -1949,7 +1946,6 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)</div><div class='ctx'> 	while (hw-&gt;st_idx != hwidx) {</div><div class='ctx'> 		struct sky2_status_le *le  = hw-&gt;st_le + hw-&gt;st_idx;</div><div class='ctx'> 		struct net_device *dev;</div><div class='del'>-		struct sky2_port *sky2;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		u32 status;</div><div class='ctx'> 		u16 length;</div><div class='hunk'>@@ -1982,6 +1978,14 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)</div><div class='ctx'> #endif</div><div class='ctx'> 				netif_receive_skb(skb);</div><div class='ctx'> </div><div class='add'>+			/* Update receiver after 16 frames */</div><div class='add'>+			if (++buf_write[le-&gt;link] == RX_BUF_WRITE) {</div><div class='add'>+				sky2_put_idx(hw, rxqaddr[le-&gt;link],</div><div class='add'>+					     sky2-&gt;rx_put);</div><div class='add'>+				buf_write[le-&gt;link] = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Stop after net poll weight */</div><div class='ctx'> 			if (++work_done &gt;= to_do)</div><div class='ctx'> 				goto exit_loop;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2020,6 +2024,16 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> exit_loop:</div><div class='add'>+	if (buf_write[0]) {</div><div class='add'>+		sky2 = netdev_priv(hw-&gt;dev[0]);</div><div class='add'>+		sky2_put_idx(hw, Q_R1, sky2-&gt;rx_put);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buf_write[1]) {</div><div class='add'>+		sky2 = netdev_priv(hw-&gt;dev[1]);</div><div class='add'>+		sky2_put_idx(hw, Q_R2, sky2-&gt;rx_put);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2164,6 +2178,13 @@ static void sky2_descriptor_error(struct sky2_hw *hw, unsigned port,</div><div class='ctx'> /* If idle then force a fake soft NAPI poll once a second</div><div class='ctx'>  * to work around cases where sharing an edge triggered interrupt.</div><div class='ctx'>  */</div><div class='add'>+static inline void sky2_idle_start(struct sky2_hw *hw)</div><div class='add'>+{</div><div class='add'>+	if (idle_timeout &gt; 0)</div><div class='add'>+		mod_timer(&amp;hw-&gt;idle_timer,</div><div class='add'>+			  jiffies + msecs_to_jiffies(idle_timeout));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sky2_idle(unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_hw *hw = (struct sky2_hw *) arg;</div><div class='hunk'>@@ -2183,6 +2204,9 @@ static int sky2_poll(struct net_device *dev0, int *budget)</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> 	u32 status = sky2_read32(hw, B0_Y2_SP_EISR);</div><div class='ctx'> </div><div class='add'>+	if (!~status)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	if (status &amp; Y2_IS_HW_ERR)</div><div class='ctx'> 		sky2_hw_intr(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -2219,7 +2243,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)</div><div class='ctx'> </div><div class='ctx'> 	if (sky2_more_work(hw))</div><div class='ctx'> 		return 1;</div><div class='del'>-</div><div class='add'>+out:</div><div class='ctx'> 	netif_rx_complete(dev0);</div><div class='ctx'> </div><div class='ctx'> 	sky2_read32(hw, B0_Y2_SP_LISR);</div><div class='hunk'>@@ -2248,8 +2272,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static void sky2_netpoll(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_port *sky2 = netdev_priv(dev);</div><div class='add'>+	struct net_device *dev0 = sky2-&gt;hw-&gt;dev[0];</div><div class='ctx'> </div><div class='del'>-	sky2_intr(sky2-&gt;hw-&gt;pdev-&gt;irq, sky2-&gt;hw, NULL);</div><div class='add'>+	if (netif_running(dev) &amp;&amp; __netif_rx_schedule_prep(dev0))</div><div class='add'>+		__netif_rx_schedule(dev0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2278,7 +2304,7 @@ static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit sky2_reset(struct sky2_hw *hw)</div><div class='add'>+static int sky2_reset(struct sky2_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u16 status;</div><div class='ctx'> 	u8 t8, pmd_type;</div><div class='hunk'>@@ -3180,7 +3206,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pdev-&gt;irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw);</div><div class='add'>+	err = request_irq(pdev-&gt;irq, sky2_test_intr, IRQF_SHARED, DRV_NAME, hw);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",</div><div class='ctx'> 		       pci_name(pdev), pdev-&gt;irq);</div><div class='hunk'>@@ -3302,9 +3328,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO PFX "v%s addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n",</div><div class='del'>-	       DRV_VERSION, pci_resource_start(pdev, 0), pdev-&gt;irq,</div><div class='del'>-	       yukon2_name[hw-&gt;chip_id - CHIP_ID_YUKON_XL],</div><div class='add'>+	printk(KERN_INFO PFX "v%s addr 0x%llx irq %d Yukon-%s (0x%x) rev %d\n",</div><div class='add'>+	       DRV_VERSION, (unsigned long long)pci_resource_start(pdev, 0),</div><div class='add'>+	       pdev-&gt;irq, yukon2_name[hw-&gt;chip_id - CHIP_ID_YUKON_XL],</div><div class='ctx'> 	       hw-&gt;chip_id, hw-&gt;chip_rev);</div><div class='ctx'> </div><div class='ctx'> 	dev = sky2_init_netdev(hw, 0, using_dac);</div><div class='hunk'>@@ -3340,7 +3366,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,</div><div class='ctx'> 			goto err_out_unregister;</div><div class='ctx'>  	}</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pdev-&gt;irq,  sky2_intr, SA_SHIRQ, DRV_NAME, hw);</div><div class='add'>+	err = request_irq(pdev-&gt;irq,  sky2_intr, IRQF_SHARED, DRV_NAME, hw);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",</div><div class='ctx'> 		       pci_name(pdev), pdev-&gt;irq);</div><div class='hunk'>@@ -3350,9 +3376,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,</div><div class='ctx'> 	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);</div><div class='ctx'> </div><div class='ctx'> 	setup_timer(&amp;hw-&gt;idle_timer, sky2_idle, (unsigned long) hw);</div><div class='del'>-	if (idle_timeout &gt; 0)</div><div class='del'>-		mod_timer(&amp;hw-&gt;idle_timer,</div><div class='del'>-			  jiffies + msecs_to_jiffies(idle_timeout));</div><div class='add'>+	sky2_idle_start(hw);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, hw);</div><div class='ctx'> </div><div class='hunk'>@@ -3425,20 +3449,27 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct sky2_hw *hw = pci_get_drvdata(pdev);</div><div class='ctx'> 	int i;</div><div class='add'>+	pci_power_t pstate = pci_choose_state(pdev, state);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct net_device *dev = hw-&gt;dev[i];</div><div class='add'>+	if (!(pstate == PCI_D3hot || pstate == PCI_D3cold))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;hw-&gt;idle_timer);</div><div class='add'>+	netif_poll_disable(hw-&gt;dev[0]);</div><div class='ctx'> </div><div class='del'>-		if (dev) {</div><div class='del'>-			if (!netif_running(dev))</div><div class='del'>-				continue;</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;ports; i++) {</div><div class='add'>+		struct net_device *dev = hw-&gt;dev[i];</div><div class='ctx'> </div><div class='add'>+		if (netif_running(dev)) {</div><div class='ctx'> 			sky2_down(dev);</div><div class='ctx'> 			netif_device_detach(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sky2_set_power_state(hw, pci_choose_state(pdev, state));</div><div class='add'>+	sky2_write32(hw, B0_IMSK, 0);</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	sky2_set_power_state(hw, pstate);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sky2_resume(struct pci_dev *pdev)</div><div class='hunk'>@@ -3448,27 +3479,31 @@ static int sky2_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> 	pci_enable_wake(pdev, PCI_D0, 0);</div><div class='del'>-	err = sky2_set_power_state(hw, PCI_D0);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+	sky2_set_power_state(hw, PCI_D0);</div><div class='ctx'> </div><div class='ctx'> 	err = sky2_reset(hw);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hw-&gt;ports; i++) {</div><div class='ctx'> 		struct net_device *dev = hw-&gt;dev[i];</div><div class='del'>-		if (dev &amp;&amp; netif_running(dev)) {</div><div class='add'>+		if (netif_running(dev)) {</div><div class='ctx'> 			netif_device_attach(dev);</div><div class='add'>+</div><div class='ctx'> 			err = sky2_up(dev);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				printk(KERN_ERR PFX "%s: could not up: %d\n",</div><div class='ctx'> 				       dev-&gt;name, err);</div><div class='ctx'> 				dev_close(dev);</div><div class='del'>-				break;</div><div class='add'>+				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	netif_poll_enable(hw-&gt;dev[0]);</div><div class='add'>+	sky2_idle_start(hw);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h<br/>index 8a0bc5525f0a..2db8d19b22d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sky2.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sky2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sky2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sky2.h</a></div><div class='hunk'>@@ -1480,7 +1480,7 @@ enum {</div><div class='ctx'> 	GM_TXCR_FORCE_JAM	= 1&lt;&lt;15, /* Bit 15:	Force Jam / Flow-Control */</div><div class='ctx'> 	GM_TXCR_CRC_DIS		= 1&lt;&lt;14, /* Bit 14:	Disable insertion of CRC */</div><div class='ctx'> 	GM_TXCR_PAD_DIS		= 1&lt;&lt;13, /* Bit 13:	Disable padding of packets */</div><div class='del'>-	GM_TXCR_COL_THR_MSK	= 1&lt;&lt;10, /* Bit 12..10:	Collision Threshold */</div><div class='add'>+	GM_TXCR_COL_THR_MSK	= 7&lt;&lt;10, /* Bit 12..10:	Collision Threshold */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TX_COL_THR(x)		(((x)&lt;&lt;10) &amp; GM_TXCR_COL_THR_MSK)</div><div class='head'>diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c<br/>index c6fbb1ede0ed..3a1b7131681c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/slhc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/slhc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/slhc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/slhc.c</a></div><div class='hunk'>@@ -50,7 +50,6 @@</div><div class='ctx'>  *	driver code belonging close to PPP and SLIP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/net/slip.c b/drivers/net/slip.c<br/>index b2e18d28850d..1588cb7f6c83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/slip.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/slip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/slip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/slip.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define SL_CHECK_TRANSMIT</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/slip.h b/drivers/net/slip.h<br/>index ab3efe66a642..29d87dd45a24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/slip.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/slip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/slip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/slip.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifndef _LINUX_SLIP_H</div><div class='ctx'> #define _LINUX_SLIP_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_INET) &amp;&amp; defined(CONFIG_SLIP_COMPRESSED)</div><div class='ctx'> # define SL_INCLUDE_CSLIP</div><div class='head'>diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c<br/>index 3db30cd0625e..45449353a958 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc-ultra.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc-ultra.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc-ultra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc-ultra.c</a></div><div class='hunk'>@@ -57,7 +57,6 @@</div><div class='ctx'> static const char version[] =</div><div class='ctx'> 	"smc-ultra.c:v2.02 2/3/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -553,7 +552,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* This is set up so that only a single autoprobe takes place per call.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended. */</div><div class='del'>-int</div><div class='add'>+int __init</div><div class='ctx'> init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='head'>diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c<br/>index b3e397d7ca85..85be22a05973 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc-ultra32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc-ultra32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc-ultra32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc-ultra32.c</a></div><div class='hunk'>@@ -290,7 +290,7 @@ out:</div><div class='ctx'> static int ultra32_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */</div><div class='del'>-	int irq_flags = (inb(ioaddr + ULTRA32_CFG5) &amp; 0x08) ? 0 : SA_SHIRQ;</div><div class='add'>+	int irq_flags = (inb(ioaddr + ULTRA32_CFG5) &amp; 0x08) ? 0 : IRQF_SHARED;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	retval = request_irq(dev-&gt;irq, ei_interrupt, irq_flags, dev-&gt;name, dev);</div><div class='hunk'>@@ -421,7 +421,7 @@ static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];</div><div class='ctx'> MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c<br/>new file mode 100644<br/>index 000000000000..d37bd860b336<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc911x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc911x.c</a></div><div class='hunk'>@@ -0,0 +1,2307 @@</div><div class='add'>+/*</div><div class='add'>+ * smc911x.c</div><div class='add'>+ * This is a driver for SMSC's LAN911{5,6,7,8} single-chip Ethernet devices.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 Sensoria Corp</div><div class='add'>+ *	   Derived from the unified SMC91x driver by Nicolas Pitre</div><div class='add'>+ *	   and the smsc911x.c reference driver by SMSC</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ *</div><div class='add'>+ * Arguments:</div><div class='add'>+ *	 watchdog  = TX watchdog timeout</div><div class='add'>+ *	 tx_fifo_kb = Size of TX FIFO in KB</div><div class='add'>+ *</div><div class='add'>+ * History:</div><div class='add'>+ *	  04/16/05	Dustin McIntire		 Initial version</div><div class='add'>+ */</div><div class='add'>+static const char version[] =</div><div class='add'>+	 "smc911x.c: v1.0 04-16-2005 by Dustin McIntire &lt;dustin@sensoria.com&gt;\n";</div><div class='add'>+</div><div class='add'>+/* Debugging options */</div><div class='add'>+#define ENABLE_SMC_DEBUG_RX		0</div><div class='add'>+#define ENABLE_SMC_DEBUG_TX		0</div><div class='add'>+#define ENABLE_SMC_DEBUG_DMA		0</div><div class='add'>+#define ENABLE_SMC_DEBUG_PKTS		0</div><div class='add'>+#define ENABLE_SMC_DEBUG_MISC		0</div><div class='add'>+#define ENABLE_SMC_DEBUG_FUNC		0</div><div class='add'>+</div><div class='add'>+#define SMC_DEBUG_RX		((ENABLE_SMC_DEBUG_RX	? 1 : 0) &lt;&lt; 0)</div><div class='add'>+#define SMC_DEBUG_TX		((ENABLE_SMC_DEBUG_TX	? 1 : 0) &lt;&lt; 1)</div><div class='add'>+#define SMC_DEBUG_DMA		((ENABLE_SMC_DEBUG_DMA	? 1 : 0) &lt;&lt; 2)</div><div class='add'>+#define SMC_DEBUG_PKTS		((ENABLE_SMC_DEBUG_PKTS ? 1 : 0) &lt;&lt; 3)</div><div class='add'>+#define SMC_DEBUG_MISC		((ENABLE_SMC_DEBUG_MISC ? 1 : 0) &lt;&lt; 4)</div><div class='add'>+#define SMC_DEBUG_FUNC		((ENABLE_SMC_DEBUG_FUNC ? 1 : 0) &lt;&lt; 5)</div><div class='add'>+</div><div class='add'>+#ifndef SMC_DEBUG</div><div class='add'>+#define SMC_DEBUG	 ( SMC_DEBUG_RX	  | \</div><div class='add'>+			   SMC_DEBUG_TX	  | \</div><div class='add'>+			   SMC_DEBUG_DMA  | \</div><div class='add'>+			   SMC_DEBUG_PKTS | \</div><div class='add'>+			   SMC_DEBUG_MISC | \</div><div class='add'>+			   SMC_DEBUG_FUNC   \</div><div class='add'>+			 )</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#include "smc911x.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Transmit timeout, default 5 seconds.</div><div class='add'>+ */</div><div class='add'>+static int watchdog = 5000;</div><div class='add'>+module_param(watchdog, int, 0400);</div><div class='add'>+MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");</div><div class='add'>+</div><div class='add'>+static int tx_fifo_kb=8;</div><div class='add'>+module_param(tx_fifo_kb, int, 0400);</div><div class='add'>+MODULE_PARM_DESC(tx_fifo_kb,"transmit FIFO size in KB (1&lt;x&lt;15)(default=8)");</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The internal workings of the driver.  If you are changing anything</div><div class='add'>+ * here with the SMC stuff, you should have the datasheet and know</div><div class='add'>+ * what you are doing.</div><div class='add'>+ */</div><div class='add'>+#define CARDNAME "smc911x"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use power-down feature of the chip</div><div class='add'>+ */</div><div class='add'>+#define POWER_DOWN		 1</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* store this information for the driver.. */</div><div class='add'>+struct smc911x_local {</div><div class='add'>+	/*</div><div class='add'>+	 * If I have to wait until the DMA is finished and ready to reload a</div><div class='add'>+	 * packet, I will store the skbuff here. Then, the DMA will send it</div><div class='add'>+	 * out and free it.</div><div class='add'>+	 */</div><div class='add'>+	struct sk_buff *pending_tx_skb;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * these are things that the kernel wants me to keep, so users</div><div class='add'>+	 * can find out semi-useless statistics of how well the card is</div><div class='add'>+	 * performing</div><div class='add'>+	 */</div><div class='add'>+	struct net_device_stats stats;</div><div class='add'>+</div><div class='add'>+	/* version/revision of the SMC911x chip */</div><div class='add'>+	u16 version;</div><div class='add'>+	u16 revision;</div><div class='add'>+</div><div class='add'>+	/* FIFO sizes */</div><div class='add'>+	int tx_fifo_kb;</div><div class='add'>+	int tx_fifo_size;</div><div class='add'>+	int rx_fifo_size;</div><div class='add'>+	int afc_cfg;</div><div class='add'>+</div><div class='add'>+	/* Contains the current active receive/phy mode */</div><div class='add'>+	int ctl_rfduplx;</div><div class='add'>+	int ctl_rspeed;</div><div class='add'>+</div><div class='add'>+	u32 msg_enable;</div><div class='add'>+	u32 phy_type;</div><div class='add'>+	struct mii_if_info mii;</div><div class='add'>+</div><div class='add'>+	/* work queue */</div><div class='add'>+	struct work_struct phy_configure;</div><div class='add'>+	int work_pending;</div><div class='add'>+</div><div class='add'>+	int tx_throttle;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	/* DMA needs the physical address of the chip */</div><div class='add'>+	u_long physaddr;</div><div class='add'>+	int rxdma;</div><div class='add'>+	int txdma;</div><div class='add'>+	int rxdma_active;</div><div class='add'>+	int txdma_active;</div><div class='add'>+	struct sk_buff *current_rx_skb;</div><div class='add'>+	struct sk_buff *current_tx_skb;</div><div class='add'>+	struct device *dev;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if SMC_DEBUG &gt; 0</div><div class='add'>+#define DBG(n, args...)				 \</div><div class='add'>+	do {					 \</div><div class='add'>+		if (SMC_DEBUG &amp; (n))		 \</div><div class='add'>+			printk(args);		 \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define PRINTK(args...)   printk(args)</div><div class='add'>+#else</div><div class='add'>+#define DBG(n, args...)   do { } while (0)</div><div class='add'>+#define PRINTK(args...)   printk(KERN_DEBUG args)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if SMC_DEBUG_PKTS &gt; 0</div><div class='add'>+static void PRINT_PKT(u_char *buf, int length)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int remainder;</div><div class='add'>+	int lines;</div><div class='add'>+</div><div class='add'>+	lines = length / 16;</div><div class='add'>+	remainder = length % 16;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; lines ; i ++) {</div><div class='add'>+		int cur;</div><div class='add'>+		for (cur = 0; cur &lt; 8; cur++) {</div><div class='add'>+			u_char a, b;</div><div class='add'>+			a = *buf++;</div><div class='add'>+			b = *buf++;</div><div class='add'>+			printk("%02x%02x ", a, b);</div><div class='add'>+		}</div><div class='add'>+		printk("\n");</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; remainder/2 ; i++) {</div><div class='add'>+		u_char a, b;</div><div class='add'>+		a = *buf++;</div><div class='add'>+		b = *buf++;</div><div class='add'>+		printk("%02x%02x ", a, b);</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define PRINT_PKT(x...)  do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* this enables an interrupt in the interrupt mask register */</div><div class='add'>+#define SMC_ENABLE_INT(x) do {				\</div><div class='add'>+	unsigned int  __mask;				\</div><div class='add'>+	unsigned long __flags;				\</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, __flags);		\</div><div class='add'>+	__mask = SMC_GET_INT_EN();			\</div><div class='add'>+	__mask |= (x);					\</div><div class='add'>+	SMC_SET_INT_EN(__mask);				\</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, __flags);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/* this disables an interrupt from the interrupt mask register */</div><div class='add'>+#define SMC_DISABLE_INT(x) do {				\</div><div class='add'>+	unsigned int  __mask;				\</div><div class='add'>+	unsigned long __flags;				\</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, __flags);		\</div><div class='add'>+	__mask = SMC_GET_INT_EN();			\</div><div class='add'>+	__mask &amp;= ~(x);					\</div><div class='add'>+	SMC_SET_INT_EN(__mask);				\</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, __flags);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * this does a soft reset on the device</div><div class='add'>+ */</div><div class='add'>+static void smc911x_reset(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned int reg, timeout=0, resets=1;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/*	 Take out of PM setting first */</div><div class='add'>+	if ((SMC_GET_PMT_CTRL() &amp; PMT_CTRL_READY_) == 0) {</div><div class='add'>+		/* Write to the bytetest will take out of powerdown */</div><div class='add'>+		SMC_SET_BYTE_TEST(0);</div><div class='add'>+		timeout=10;</div><div class='add'>+		do {</div><div class='add'>+			udelay(10);</div><div class='add'>+			reg = SMC_GET_PMT_CTRL() &amp; PMT_CTRL_READY_;</div><div class='add'>+		} while ( timeout-- &amp;&amp; !reg);</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			PRINTK("%s: smc911x_reset timeout waiting for PM restore\n", dev-&gt;name);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts */</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_SET_INT_EN(0);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	while (resets--) {</div><div class='add'>+		SMC_SET_HW_CFG(HW_CFG_SRST_);</div><div class='add'>+		timeout=10;</div><div class='add'>+		do {</div><div class='add'>+			udelay(10);</div><div class='add'>+			reg = SMC_GET_HW_CFG();</div><div class='add'>+			/* If chip indicates reset timeout then try again */</div><div class='add'>+			if (reg &amp; HW_CFG_SRST_TO_) {</div><div class='add'>+				PRINTK("%s: chip reset timeout, retrying...\n", dev-&gt;name);</div><div class='add'>+				resets++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} while ( timeout-- &amp;&amp; (reg &amp; HW_CFG_SRST_));</div><div class='add'>+	}</div><div class='add'>+	if (timeout == 0) {</div><div class='add'>+		PRINTK("%s: smc911x_reset timeout waiting for reset\n", dev-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure EEPROM has finished loading before setting GPIO_CFG */</div><div class='add'>+	timeout=1000;</div><div class='add'>+	while ( timeout-- &amp;&amp; (SMC_GET_E2P_CMD() &amp; E2P_CMD_EPC_BUSY_)) {</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	if (timeout == 0){</div><div class='add'>+		PRINTK("%s: smc911x_reset timeout waiting for EEPROM busy\n", dev-&gt;name);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize interrupts */</div><div class='add'>+	SMC_SET_INT_EN(0);</div><div class='add'>+	SMC_ACK_INT(-1);</div><div class='add'>+</div><div class='add'>+	/* Reset the FIFO level and flow control settings */</div><div class='add'>+	SMC_SET_HW_CFG((lp-&gt;tx_fifo_kb &amp; 0xF) &lt;&lt; 16);</div><div class='add'>+//TODO: Figure out what appropriate pause time is</div><div class='add'>+	SMC_SET_FLOW(FLOW_FCPT_ | FLOW_FCEN_);</div><div class='add'>+	SMC_SET_AFC_CFG(lp-&gt;afc_cfg);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Set to LED outputs */</div><div class='add'>+	SMC_SET_GPIO_CFG(0x70070000);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Deassert IRQ for 1*10us for edge type interrupts</div><div class='add'>+	 * and drive IRQ pin push-pull</div><div class='add'>+	 */</div><div class='add'>+	SMC_SET_IRQ_CFG( (1 &lt;&lt; 24) | INT_CFG_IRQ_EN_ | INT_CFG_IRQ_TYPE_ );</div><div class='add'>+</div><div class='add'>+	/* clear anything saved */</div><div class='add'>+	if (lp-&gt;pending_tx_skb != NULL) {</div><div class='add'>+		dev_kfree_skb (lp-&gt;pending_tx_skb);</div><div class='add'>+		lp-&gt;pending_tx_skb = NULL;</div><div class='add'>+		lp-&gt;stats.tx_errors++;</div><div class='add'>+		lp-&gt;stats.tx_aborted_errors++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable Interrupts, Receive, and Transmit</div><div class='add'>+ */</div><div class='add'>+static void smc911x_enable(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned mask, cfg, cr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	SMC_SET_MAC_ADDR(dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	/* Enable TX */</div><div class='add'>+	cfg = SMC_GET_HW_CFG();</div><div class='add'>+	cfg &amp;= HW_CFG_TX_FIF_SZ_ | 0xFFF;</div><div class='add'>+	cfg |= HW_CFG_SF_;</div><div class='add'>+	SMC_SET_HW_CFG(cfg);</div><div class='add'>+	SMC_SET_FIFO_TDA(0xFF);</div><div class='add'>+	/* Update TX stats on every 64 packets received or every 1 sec */</div><div class='add'>+	SMC_SET_FIFO_TSL(64);</div><div class='add'>+	SMC_SET_GPT_CFG(GPT_CFG_TIMER_EN_ | 10000);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_GET_MAC_CR(cr);</div><div class='add'>+	cr |= MAC_CR_TXEN_ | MAC_CR_HBDIS_;</div><div class='add'>+	SMC_SET_MAC_CR(cr);</div><div class='add'>+	SMC_SET_TX_CFG(TX_CFG_TX_ON_);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Add 2 byte padding to start of packets */</div><div class='add'>+	SMC_SET_RX_CFG((2&lt;&lt;8) &amp; RX_CFG_RXDOFF_);</div><div class='add'>+</div><div class='add'>+	/* Turn on receiver and enable RX */</div><div class='add'>+	if (cr &amp; MAC_CR_RXEN_)</div><div class='add'>+		DBG(SMC_DEBUG_RX, "%s: Receiver already enabled\n", dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_SET_MAC_CR( cr | MAC_CR_RXEN_ );</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Interrupt on every received packet */</div><div class='add'>+	SMC_SET_FIFO_RSA(0x01);</div><div class='add'>+	SMC_SET_FIFO_RSL(0x00);</div><div class='add'>+</div><div class='add'>+	/* now, enable interrupts */</div><div class='add'>+	mask = INT_EN_TDFA_EN_ | INT_EN_TSFL_EN_ | INT_EN_RSFL_EN_ |</div><div class='add'>+		INT_EN_GPT_INT_EN_ | INT_EN_RXDFH_INT_EN_ | INT_EN_RXE_EN_ |</div><div class='add'>+		INT_EN_PHY_INT_EN_;</div><div class='add'>+	if (IS_REV_A(lp-&gt;revision))</div><div class='add'>+		mask|=INT_EN_RDFL_EN_;</div><div class='add'>+	else {</div><div class='add'>+		mask|=INT_EN_RDFO_EN_;</div><div class='add'>+	}</div><div class='add'>+	SMC_ENABLE_INT(mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * this puts the device in an inactive state</div><div class='add'>+ */</div><div class='add'>+static void smc911x_shutdown(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned cr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* Disable IRQ's */</div><div class='add'>+	SMC_SET_INT_EN(0);</div><div class='add'>+</div><div class='add'>+	/* Turn of Rx and TX */</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_GET_MAC_CR(cr);</div><div class='add'>+	cr &amp;= ~(MAC_CR_TXEN_ | MAC_CR_RXEN_ | MAC_CR_HBDIS_);</div><div class='add'>+	SMC_SET_MAC_CR(cr);</div><div class='add'>+	SMC_SET_TX_CFG(TX_CFG_STOP_TX_);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void smc911x_drop_pkt(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int fifo_count, timeout, reg;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --&gt; %s\n", CARDNAME, __FUNCTION__);</div><div class='add'>+	fifo_count = SMC_GET_RX_FIFO_INF() &amp; 0xFFFF;</div><div class='add'>+	if (fifo_count &lt;= 4) {</div><div class='add'>+		/* Manually dump the packet data */</div><div class='add'>+		while (fifo_count--)</div><div class='add'>+			SMC_GET_RX_FIFO();</div><div class='add'>+	} else	 {</div><div class='add'>+		/* Fast forward through the bad packet */</div><div class='add'>+		SMC_SET_RX_DP_CTRL(RX_DP_CTRL_FFWD_BUSY_);</div><div class='add'>+		timeout=50;</div><div class='add'>+		do {</div><div class='add'>+			udelay(10);</div><div class='add'>+			reg = SMC_GET_RX_DP_CTRL() &amp; RX_DP_CTRL_FFWD_BUSY_;</div><div class='add'>+		} while ( timeout-- &amp;&amp; reg);</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			PRINTK("%s: timeout waiting for RX fast forward\n", dev-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the procedure to handle the receipt of a packet.</div><div class='add'>+ * It should be called after checking for packet presence in</div><div class='add'>+ * the RX status FIFO.	 It must be called with the spin lock</div><div class='add'>+ * already held.</div><div class='add'>+ */</div><div class='add'>+static inline void	 smc911x_rcv(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int pkt_len, status;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned char *data;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --&gt; %s\n",</div><div class='add'>+		dev-&gt;name, __FUNCTION__);</div><div class='add'>+	status = SMC_GET_RX_STS_FIFO();</div><div class='add'>+	DBG(SMC_DEBUG_RX, "%s: Rx pkt len %d status 0x%08x \n",</div><div class='add'>+		dev-&gt;name, (status &amp; 0x3fff0000) &gt;&gt; 16, status &amp; 0xc000ffff);</div><div class='add'>+	pkt_len = (status &amp; RX_STS_PKT_LEN_) &gt;&gt; 16;</div><div class='add'>+	if (status &amp; RX_STS_ES_) {</div><div class='add'>+		/* Deal with a bad packet */</div><div class='add'>+		lp-&gt;stats.rx_errors++;</div><div class='add'>+		if (status &amp; RX_STS_CRC_ERR_)</div><div class='add'>+			lp-&gt;stats.rx_crc_errors++;</div><div class='add'>+		else {</div><div class='add'>+			if (status &amp; RX_STS_LEN_ERR_)</div><div class='add'>+				lp-&gt;stats.rx_length_errors++;</div><div class='add'>+			if (status &amp; RX_STS_MCAST_)</div><div class='add'>+				lp-&gt;stats.multicast++;</div><div class='add'>+		}</div><div class='add'>+		/* Remove the bad packet data from the RX FIFO */</div><div class='add'>+		smc911x_drop_pkt(dev);</div><div class='add'>+	} else {</div><div class='add'>+		/* Receive a valid packet */</div><div class='add'>+		/* Alloc a buffer with extra room for DMA alignment */</div><div class='add'>+		skb=dev_alloc_skb(pkt_len+32);</div><div class='add'>+		if (unlikely(skb == NULL)) {</div><div class='add'>+			PRINTK( "%s: Low memory, rcvd packet dropped.\n",</div><div class='add'>+				dev-&gt;name);</div><div class='add'>+			lp-&gt;stats.rx_dropped++;</div><div class='add'>+			smc911x_drop_pkt(dev);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/* Align IP header to 32 bits</div><div class='add'>+		 * Note that the device is configured to add a 2</div><div class='add'>+		 * byte padding to the packet start, so we really</div><div class='add'>+		 * want to write to the orignal data pointer */</div><div class='add'>+		data = skb-&gt;data;</div><div class='add'>+		skb_reserve(skb, 2);</div><div class='add'>+		skb_put(skb,pkt_len-4);</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+		{</div><div class='add'>+		unsigned int fifo;</div><div class='add'>+		/* Lower the FIFO threshold if possible */</div><div class='add'>+		fifo = SMC_GET_FIFO_INT();</div><div class='add'>+		if (fifo &amp; 0xFF) fifo--;</div><div class='add'>+		DBG(SMC_DEBUG_RX, "%s: Setting RX stat FIFO threshold to %d\n",</div><div class='add'>+			dev-&gt;name, fifo &amp; 0xff);</div><div class='add'>+		SMC_SET_FIFO_INT(fifo);</div><div class='add'>+		/* Setup RX DMA */</div><div class='add'>+		SMC_SET_RX_CFG(RX_CFG_RX_END_ALGN16_ | ((2&lt;&lt;8) &amp; RX_CFG_RXDOFF_));</div><div class='add'>+		lp-&gt;rxdma_active = 1;</div><div class='add'>+		lp-&gt;current_rx_skb = skb;</div><div class='add'>+		SMC_PULL_DATA(data, (pkt_len+2+15) &amp; ~15);</div><div class='add'>+		/* Packet processing deferred to DMA RX interrupt */</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		SMC_SET_RX_CFG(RX_CFG_RX_END_ALGN4_ | ((2&lt;&lt;8) &amp; RX_CFG_RXDOFF_));</div><div class='add'>+		SMC_PULL_DATA(data, pkt_len+2+3);</div><div class='add'>+</div><div class='add'>+		DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev-&gt;name,);</div><div class='add'>+		PRINT_PKT(data, ((pkt_len - 4) &lt;= 64) ? pkt_len - 4 : 64);</div><div class='add'>+		dev-&gt;last_rx = jiffies;</div><div class='add'>+		skb-&gt;dev = dev;</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+		lp-&gt;stats.rx_packets++;</div><div class='add'>+		lp-&gt;stats.rx_bytes += pkt_len-4;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is called to actually send a packet to the chip.</div><div class='add'>+ */</div><div class='add'>+static void smc911x_hardware_send_pkt(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int cmdA, cmdB, len;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	BUG_ON(lp-&gt;pending_tx_skb == NULL);</div><div class='add'>+</div><div class='add'>+	skb = lp-&gt;pending_tx_skb;</div><div class='add'>+	lp-&gt;pending_tx_skb = NULL;</div><div class='add'>+</div><div class='add'>+	/* cmdA {25:24] data alignment [20:16] start offset [10:0] buffer length */</div><div class='add'>+	/* cmdB {31:16] pkt tag [10:0] length */</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	/* 16 byte buffer alignment mode */</div><div class='add'>+	buf = (char*)((u32)(skb-&gt;data) &amp; ~0xF);</div><div class='add'>+	len = (skb-&gt;len + 0xF + ((u32)skb-&gt;data &amp; 0xF)) &amp; ~0xF;</div><div class='add'>+	cmdA = (1&lt;&lt;24) | (((u32)skb-&gt;data &amp; 0xF)&lt;&lt;16) |</div><div class='add'>+			TX_CMD_A_INT_FIRST_SEG_ | TX_CMD_A_INT_LAST_SEG_ |</div><div class='add'>+			skb-&gt;len;</div><div class='add'>+#else</div><div class='add'>+	buf = (char*)((u32)skb-&gt;data &amp; ~0x3);</div><div class='add'>+	len = (skb-&gt;len + 3 + ((u32)skb-&gt;data &amp; 3)) &amp; ~0x3;</div><div class='add'>+	cmdA = (((u32)skb-&gt;data &amp; 0x3) &lt;&lt; 16) |</div><div class='add'>+			TX_CMD_A_INT_FIRST_SEG_ | TX_CMD_A_INT_LAST_SEG_ |</div><div class='add'>+			skb-&gt;len;</div><div class='add'>+#endif</div><div class='add'>+	/* tag is packet length so we can use this in stats update later */</div><div class='add'>+	cmdB = (skb-&gt;len  &lt;&lt; 16) | (skb-&gt;len &amp; 0x7FF);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_TX, "%s: TX PKT LENGTH 0x%04x (%d) BUF 0x%p CMDA 0x%08x CMDB 0x%08x\n",</div><div class='add'>+		 dev-&gt;name, len, len, buf, cmdA, cmdB);</div><div class='add'>+	SMC_SET_TX_FIFO(cmdA);</div><div class='add'>+	SMC_SET_TX_FIFO(cmdB);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_PKTS, "%s: Transmitted packet\n", dev-&gt;name);</div><div class='add'>+	PRINT_PKT(buf, len &lt;= 64 ? len : 64);</div><div class='add'>+</div><div class='add'>+	/* Send pkt via PIO or DMA */</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	lp-&gt;current_tx_skb = skb;</div><div class='add'>+	SMC_PUSH_DATA(buf, len);</div><div class='add'>+	/* DMA complete IRQ will free buffer and set jiffies */</div><div class='add'>+#else</div><div class='add'>+	SMC_PUSH_DATA(buf, len);</div><div class='add'>+	dev-&gt;trans_start = jiffies;</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+#endif</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	if (!lp-&gt;tx_throttle) {</div><div class='add'>+		netif_wake_queue(dev);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_ENABLE_INT(INT_EN_TDFA_EN_ | INT_EN_TSFL_EN_);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Since I am not sure if I will have enough room in the chip's ram</div><div class='add'>+ * to store the packet, I call this routine which either sends it</div><div class='add'>+ * now, or set the card to generates an interrupt when ready</div><div class='add'>+ * for the packet.</div><div class='add'>+ */</div><div class='add'>+static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int free;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n",</div><div class='add'>+		dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	BUG_ON(lp-&gt;pending_tx_skb != NULL);</div><div class='add'>+</div><div class='add'>+	free = SMC_GET_TX_FIFO_INF() &amp; TX_FIFO_INF_TDFREE_;</div><div class='add'>+	DBG(SMC_DEBUG_TX, "%s: TX free space %d\n", dev-&gt;name, free);</div><div class='add'>+</div><div class='add'>+	/* Turn off the flow when running out of space in FIFO */</div><div class='add'>+	if (free &lt;= SMC911X_TX_FIFO_LOW_THRESHOLD) {</div><div class='add'>+		DBG(SMC_DEBUG_TX, "%s: Disabling data flow due to low FIFO space (%d)\n",</div><div class='add'>+			dev-&gt;name, free);</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		/* Reenable when at least 1 packet of size MTU present */</div><div class='add'>+		SMC_SET_FIFO_TDA((SMC911X_TX_FIFO_LOW_THRESHOLD)/64);</div><div class='add'>+		lp-&gt;tx_throttle = 1;</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Drop packets when we run out of space in TX FIFO</div><div class='add'>+	 * Account for overhead required for:</div><div class='add'>+	 *</div><div class='add'>+	 *	  Tx command words			 8 bytes</div><div class='add'>+	 *	  Start offset				 15 bytes</div><div class='add'>+	 *	  End padding				 15 bytes</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(free &lt; (skb-&gt;len + 8 + 15 + 15))) {</div><div class='add'>+		printk("%s: No Tx free space %d &lt; %d\n",</div><div class='add'>+			dev-&gt;name, free, skb-&gt;len);</div><div class='add'>+		lp-&gt;pending_tx_skb = NULL;</div><div class='add'>+		lp-&gt;stats.tx_errors++;</div><div class='add'>+		lp-&gt;stats.tx_dropped++;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	{</div><div class='add'>+		/* If the DMA is already running then defer this packet Tx until</div><div class='add'>+		 * the DMA IRQ starts it</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		if (lp-&gt;txdma_active) {</div><div class='add'>+			DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: Tx DMA running, deferring packet\n", dev-&gt;name);</div><div class='add'>+			lp-&gt;pending_tx_skb = skb;</div><div class='add'>+			netif_stop_queue(dev);</div><div class='add'>+			spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+			return 0;</div><div class='add'>+		} else {</div><div class='add'>+			DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: Activating Tx DMA\n", dev-&gt;name);</div><div class='add'>+			lp-&gt;txdma_active = 1;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	lp-&gt;pending_tx_skb = skb;</div><div class='add'>+	smc911x_hardware_send_pkt(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This handles a TX status interrupt, which is only called when:</div><div class='add'>+ * - a TX error occurred, or</div><div class='add'>+ * - TX of a packet completed.</div><div class='add'>+ */</div><div class='add'>+static void smc911x_tx(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned int tx_status;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --&gt; %s\n",</div><div class='add'>+		dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* Collect the TX status */</div><div class='add'>+	while (((SMC_GET_TX_FIFO_INF() &amp; TX_FIFO_INF_TSUSED_) &gt;&gt; 16) != 0) {</div><div class='add'>+		DBG(SMC_DEBUG_TX, "%s: Tx stat FIFO used 0x%04x\n",</div><div class='add'>+			dev-&gt;name,</div><div class='add'>+			(SMC_GET_TX_FIFO_INF() &amp; TX_FIFO_INF_TSUSED_) &gt;&gt; 16);</div><div class='add'>+		tx_status = SMC_GET_TX_STS_FIFO();</div><div class='add'>+		lp-&gt;stats.tx_packets++;</div><div class='add'>+		lp-&gt;stats.tx_bytes+=tx_status&gt;&gt;16;</div><div class='add'>+		DBG(SMC_DEBUG_TX, "%s: Tx FIFO tag 0x%04x status 0x%04x\n",</div><div class='add'>+			dev-&gt;name, (tx_status &amp; 0xffff0000) &gt;&gt; 16,</div><div class='add'>+			tx_status &amp; 0x0000ffff);</div><div class='add'>+		/* count Tx errors, but ignore lost carrier errors when in</div><div class='add'>+		 * full-duplex mode */</div><div class='add'>+		if ((tx_status &amp; TX_STS_ES_) &amp;&amp; !(lp-&gt;ctl_rfduplx &amp;&amp;</div><div class='add'>+		    !(tx_status &amp; 0x00000306))) {</div><div class='add'>+			lp-&gt;stats.tx_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (tx_status &amp; TX_STS_MANY_COLL_) {</div><div class='add'>+			lp-&gt;stats.collisions+=16;</div><div class='add'>+			lp-&gt;stats.tx_aborted_errors++;</div><div class='add'>+		} else {</div><div class='add'>+			lp-&gt;stats.collisions+=(tx_status &amp; TX_STS_COLL_CNT_) &gt;&gt; 3;</div><div class='add'>+		}</div><div class='add'>+		/* carrier error only has meaning for half-duplex communication */</div><div class='add'>+		if ((tx_status &amp; (TX_STS_LOC_ | TX_STS_NO_CARR_)) &amp;&amp;</div><div class='add'>+		    !lp-&gt;ctl_rfduplx) {</div><div class='add'>+			lp-&gt;stats.tx_carrier_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (tx_status &amp; TX_STS_LATE_COLL_) {</div><div class='add'>+			lp-&gt;stats.collisions++;</div><div class='add'>+			lp-&gt;stats.tx_aborted_errors++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*---PHY CONTROL AND CONFIGURATION-----------------------------------------*/</div><div class='add'>+/*</div><div class='add'>+ * Reads a register from the MII Management serial interface</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int smc911x_phy_read(struct net_device *dev, int phyaddr, int phyreg)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int phydata;</div><div class='add'>+</div><div class='add'>+	SMC_GET_MII(phyreg, phyaddr, phydata);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: phyaddr=0x%x, phyreg=0x%02x, phydata=0x%04x\n",</div><div class='add'>+		__FUNCTION__, phyaddr, phyreg, phydata);</div><div class='add'>+	return phydata;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writes a register to the MII Management serial interface</div><div class='add'>+ */</div><div class='add'>+static void smc911x_phy_write(struct net_device *dev, int phyaddr, int phyreg,</div><div class='add'>+			int phydata)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",</div><div class='add'>+		__FUNCTION__, phyaddr, phyreg, phydata);</div><div class='add'>+</div><div class='add'>+	SMC_SET_MII(phyreg, phyaddr, phydata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Finds and reports the PHY address (115 and 117 have external</div><div class='add'>+ * PHY interface 118 has internal only</div><div class='add'>+ */</div><div class='add'>+static void smc911x_phy_detect(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	int phyaddr;</div><div class='add'>+	unsigned int cfg, id1, id2;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	lp-&gt;phy_type = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Scan all 32 PHY addresses if necessary, starting at</div><div class='add'>+	 * PHY#1 to PHY#31, and then PHY#0 last.</div><div class='add'>+	 */</div><div class='add'>+	switch(lp-&gt;version) {</div><div class='add'>+		case 0x115:</div><div class='add'>+		case 0x117:</div><div class='add'>+			cfg = SMC_GET_HW_CFG();</div><div class='add'>+			if (cfg &amp; HW_CFG_EXT_PHY_DET_) {</div><div class='add'>+				cfg &amp;= ~HW_CFG_PHY_CLK_SEL_;</div><div class='add'>+				cfg |= HW_CFG_PHY_CLK_SEL_CLK_DIS_;</div><div class='add'>+				SMC_SET_HW_CFG(cfg);</div><div class='add'>+				udelay(10); /* Wait for clocks to stop */</div><div class='add'>+</div><div class='add'>+				cfg |= HW_CFG_EXT_PHY_EN_;</div><div class='add'>+				SMC_SET_HW_CFG(cfg);</div><div class='add'>+				udelay(10); /* Wait for clocks to stop */</div><div class='add'>+</div><div class='add'>+				cfg &amp;= ~HW_CFG_PHY_CLK_SEL_;</div><div class='add'>+				cfg |= HW_CFG_PHY_CLK_SEL_EXT_PHY_;</div><div class='add'>+				SMC_SET_HW_CFG(cfg);</div><div class='add'>+				udelay(10); /* Wait for clocks to stop */</div><div class='add'>+</div><div class='add'>+				cfg |= HW_CFG_SMI_SEL_;</div><div class='add'>+				SMC_SET_HW_CFG(cfg);</div><div class='add'>+</div><div class='add'>+				for (phyaddr = 1; phyaddr &lt; 32; ++phyaddr) {</div><div class='add'>+</div><div class='add'>+					/* Read the PHY identifiers */</div><div class='add'>+					SMC_GET_PHY_ID1(phyaddr &amp; 31, id1);</div><div class='add'>+					SMC_GET_PHY_ID2(phyaddr &amp; 31, id2);</div><div class='add'>+</div><div class='add'>+					/* Make sure it is a valid identifier */</div><div class='add'>+					if (id1 != 0x0000 &amp;&amp; id1 != 0xffff &amp;&amp;</div><div class='add'>+					    id1 != 0x8000 &amp;&amp; id2 != 0x0000 &amp;&amp;</div><div class='add'>+					    id2 != 0xffff &amp;&amp; id2 != 0x8000) {</div><div class='add'>+						/* Save the PHY's address */</div><div class='add'>+						lp-&gt;mii.phy_id = phyaddr &amp; 31;</div><div class='add'>+						lp-&gt;phy_type = id1 &lt;&lt; 16 | id2;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		default:</div><div class='add'>+			/* Internal media only */</div><div class='add'>+			SMC_GET_PHY_ID1(1, id1);</div><div class='add'>+			SMC_GET_PHY_ID2(1, id2);</div><div class='add'>+			/* Save the PHY's address */</div><div class='add'>+			lp-&gt;mii.phy_id = 1;</div><div class='add'>+			lp-&gt;phy_type = id1 &lt;&lt; 16 | id2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: phy_id1=0x%x, phy_id2=0x%x phyaddr=0x%d\n",</div><div class='add'>+		dev-&gt;name, id1, id2, lp-&gt;mii.phy_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets the PHY to a configuration as determined by the user.</div><div class='add'>+ * Called with spin_lock held.</div><div class='add'>+ */</div><div class='add'>+static int smc911x_phy_fixed(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int phyaddr = lp-&gt;mii.phy_id;</div><div class='add'>+	int bmcr;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* Enter Link Disable state */</div><div class='add'>+	SMC_GET_PHY_BMCR(phyaddr, bmcr);</div><div class='add'>+	bmcr |= BMCR_PDOWN;</div><div class='add'>+	SMC_SET_PHY_BMCR(phyaddr, bmcr);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set our fixed capabilities</div><div class='add'>+	 * Disable auto-negotiation</div><div class='add'>+	 */</div><div class='add'>+	bmcr &amp;= ~BMCR_ANENABLE;</div><div class='add'>+	if (lp-&gt;ctl_rfduplx)</div><div class='add'>+		bmcr |= BMCR_FULLDPLX;</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;ctl_rspeed == 100)</div><div class='add'>+		bmcr |= BMCR_SPEED100;</div><div class='add'>+</div><div class='add'>+	/* Write our capabilities to the phy control register */</div><div class='add'>+	SMC_SET_PHY_BMCR(phyaddr, bmcr);</div><div class='add'>+</div><div class='add'>+	/* Re-Configure the Receive/Phy Control register */</div><div class='add'>+	bmcr &amp;= ~BMCR_PDOWN;</div><div class='add'>+	SMC_SET_PHY_BMCR(phyaddr, bmcr);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_phy_reset - reset the phy</div><div class='add'>+ * @dev: net device</div><div class='add'>+ * @phy: phy address</div><div class='add'>+ *</div><div class='add'>+ * Issue a software reset for the specified PHY and</div><div class='add'>+ * wait up to 100ms for the reset to complete.	 We should</div><div class='add'>+ * not access the PHY for 50ms after issuing the reset.</div><div class='add'>+ *</div><div class='add'>+ * The time to wait appears to be dependent on the PHY.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static int smc911x_phy_reset(struct net_device *dev, int phy)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int timeout;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s()\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	reg = SMC_GET_PMT_CTRL();</div><div class='add'>+	reg &amp;= ~0xfffff030;</div><div class='add'>+	reg |= PMT_CTRL_PHY_RST_;</div><div class='add'>+	SMC_SET_PMT_CTRL(reg);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	for (timeout = 2; timeout; timeout--) {</div><div class='add'>+		msleep(50);</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		reg = SMC_GET_PMT_CTRL();</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+		if (!(reg &amp; PMT_CTRL_PHY_RST_)) {</div><div class='add'>+			/* extra delay required because the phy may</div><div class='add'>+			 * not be completed with its reset</div><div class='add'>+			 * when PHY_BCR_RESET_ is cleared. 256us</div><div class='add'>+			 * should suffice, but use 500us to be safe</div><div class='add'>+			 */</div><div class='add'>+			udelay(500);</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return reg &amp; PMT_CTRL_PHY_RST_;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_phy_powerdown - powerdown phy</div><div class='add'>+ * @dev: net device</div><div class='add'>+ * @phy: phy address</div><div class='add'>+ *</div><div class='add'>+ * Power down the specified PHY</div><div class='add'>+ */</div><div class='add'>+static void smc911x_phy_powerdown(struct net_device *dev, int phy)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int bmcr;</div><div class='add'>+</div><div class='add'>+	/* Enter Link Disable state */</div><div class='add'>+	SMC_GET_PHY_BMCR(phy, bmcr);</div><div class='add'>+	bmcr |= BMCR_PDOWN;</div><div class='add'>+	SMC_SET_PHY_BMCR(phy, bmcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_phy_check_media - check the media status and adjust BMCR</div><div class='add'>+ * @dev: net device</div><div class='add'>+ * @init: set true for initialisation</div><div class='add'>+ *</div><div class='add'>+ * Select duplex mode depending on negotiation state.	This</div><div class='add'>+ * also updates our carrier state.</div><div class='add'>+ */</div><div class='add'>+static void smc911x_phy_check_media(struct net_device *dev, int init)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int phyaddr = lp-&gt;mii.phy_id;</div><div class='add'>+	unsigned int bmcr, cr;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	if (mii_check_media(&amp;lp-&gt;mii, netif_msg_link(lp), init)) {</div><div class='add'>+		/* duplex state has changed */</div><div class='add'>+		SMC_GET_PHY_BMCR(phyaddr, bmcr);</div><div class='add'>+		SMC_GET_MAC_CR(cr);</div><div class='add'>+		if (lp-&gt;mii.full_duplex) {</div><div class='add'>+			DBG(SMC_DEBUG_MISC, "%s: Configuring for full-duplex mode\n", dev-&gt;name);</div><div class='add'>+			bmcr |= BMCR_FULLDPLX;</div><div class='add'>+			cr |= MAC_CR_RCVOWN_;</div><div class='add'>+		} else {</div><div class='add'>+			DBG(SMC_DEBUG_MISC, "%s: Configuring for half-duplex mode\n", dev-&gt;name);</div><div class='add'>+			bmcr &amp;= ~BMCR_FULLDPLX;</div><div class='add'>+			cr &amp;= ~MAC_CR_RCVOWN_;</div><div class='add'>+		}</div><div class='add'>+		SMC_SET_PHY_BMCR(phyaddr, bmcr);</div><div class='add'>+		SMC_SET_MAC_CR(cr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Configures the specified PHY through the MII management interface</div><div class='add'>+ * using Autonegotiation.</div><div class='add'>+ * Calls smc911x_phy_fixed() if the user has requested a certain config.</div><div class='add'>+ * If RPC ANEG bit is set, the media selection is dependent purely on</div><div class='add'>+ * the selection by the MII (either in the MII BMCR reg or the result</div><div class='add'>+ * of autonegotiation.)  If the RPC ANEG bit is cleared, the selection</div><div class='add'>+ * is controlled by the RPC SPEED and RPC DPLX bits.</div><div class='add'>+ */</div><div class='add'>+static void smc911x_phy_configure(void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = data;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int phyaddr = lp-&gt;mii.phy_id;</div><div class='add'>+	int my_phy_caps; /* My PHY capabilities */</div><div class='add'>+	int my_ad_caps; /* My Advertised capabilities */</div><div class='add'>+	int status;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s()\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We should not be called if phy_type is zero.</div><div class='add'>+	 */</div><div class='add'>+	if (lp-&gt;phy_type == 0)</div><div class='add'>+		 goto smc911x_phy_configure_exit;</div><div class='add'>+</div><div class='add'>+	if (smc911x_phy_reset(dev, phyaddr)) {</div><div class='add'>+		printk("%s: PHY reset timed out\n", dev-&gt;name);</div><div class='add'>+		goto smc911x_phy_configure_exit;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable PHY Interrupts (for register 18)</div><div class='add'>+	 * Interrupts listed here are enabled</div><div class='add'>+	 */</div><div class='add'>+	SMC_SET_PHY_INT_MASK(phyaddr, PHY_INT_MASK_ENERGY_ON_ |</div><div class='add'>+		 PHY_INT_MASK_ANEG_COMP_ | PHY_INT_MASK_REMOTE_FAULT_ |</div><div class='add'>+		 PHY_INT_MASK_LINK_DOWN_);</div><div class='add'>+</div><div class='add'>+	/* If the user requested no auto neg, then go set his request */</div><div class='add'>+	if (lp-&gt;mii.force_media) {</div><div class='add'>+		smc911x_phy_fixed(dev);</div><div class='add'>+		goto smc911x_phy_configure_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy our capabilities from MII_BMSR to MII_ADVERTISE */</div><div class='add'>+	SMC_GET_PHY_BMSR(phyaddr, my_phy_caps);</div><div class='add'>+	if (!(my_phy_caps &amp; BMSR_ANEGCAPABLE)) {</div><div class='add'>+		printk(KERN_INFO "Auto negotiation NOT supported\n");</div><div class='add'>+		smc911x_phy_fixed(dev);</div><div class='add'>+		goto smc911x_phy_configure_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CSMA capable w/ both pauses */</div><div class='add'>+	my_ad_caps = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;</div><div class='add'>+</div><div class='add'>+	if (my_phy_caps &amp; BMSR_100BASE4)</div><div class='add'>+		my_ad_caps |= ADVERTISE_100BASE4;</div><div class='add'>+	if (my_phy_caps &amp; BMSR_100FULL)</div><div class='add'>+		my_ad_caps |= ADVERTISE_100FULL;</div><div class='add'>+	if (my_phy_caps &amp; BMSR_100HALF)</div><div class='add'>+		my_ad_caps |= ADVERTISE_100HALF;</div><div class='add'>+	if (my_phy_caps &amp; BMSR_10FULL)</div><div class='add'>+		my_ad_caps |= ADVERTISE_10FULL;</div><div class='add'>+	if (my_phy_caps &amp; BMSR_10HALF)</div><div class='add'>+		my_ad_caps |= ADVERTISE_10HALF;</div><div class='add'>+</div><div class='add'>+	/* Disable capabilities not selected by our user */</div><div class='add'>+	if (lp-&gt;ctl_rspeed != 100)</div><div class='add'>+		my_ad_caps &amp;= ~(ADVERTISE_100BASE4|ADVERTISE_100FULL|ADVERTISE_100HALF);</div><div class='add'>+</div><div class='add'>+	 if (!lp-&gt;ctl_rfduplx)</div><div class='add'>+		my_ad_caps &amp;= ~(ADVERTISE_100FULL|ADVERTISE_10FULL);</div><div class='add'>+</div><div class='add'>+	/* Update our Auto-Neg Advertisement Register */</div><div class='add'>+	SMC_SET_PHY_MII_ADV(phyaddr, my_ad_caps);</div><div class='add'>+	lp-&gt;mii.advertising = my_ad_caps;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Read the register back.	 Without this, it appears that when</div><div class='add'>+	 * auto-negotiation is restarted, sometimes it isn't ready and</div><div class='add'>+	 * the link does not come up.</div><div class='add'>+	 */</div><div class='add'>+	udelay(10);</div><div class='add'>+	SMC_GET_PHY_MII_ADV(phyaddr, status);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: phy caps=0x%04x\n", dev-&gt;name, my_phy_caps);</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: phy advertised caps=0x%04x\n", dev-&gt;name, my_ad_caps);</div><div class='add'>+</div><div class='add'>+	/* Restart auto-negotiation process in order to advertise my caps */</div><div class='add'>+	SMC_SET_PHY_BMCR(phyaddr, BMCR_ANENABLE | BMCR_ANRESTART);</div><div class='add'>+</div><div class='add'>+	smc911x_phy_check_media(dev, 1);</div><div class='add'>+</div><div class='add'>+smc911x_phy_configure_exit:</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	lp-&gt;work_pending = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_phy_interrupt</div><div class='add'>+ *</div><div class='add'>+ * Purpose:  Handle interrupts relating to PHY register 18. This is</div><div class='add'>+ *	 called from the "hard" interrupt handler under our private spinlock.</div><div class='add'>+ */</div><div class='add'>+static void smc911x_phy_interrupt(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int phyaddr = lp-&gt;mii.phy_id;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;phy_type == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	smc911x_phy_check_media(dev, 0);</div><div class='add'>+	/* read to clear status bits */</div><div class='add'>+	SMC_GET_PHY_INT_SRC(phyaddr,status);</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: PHY interrupt status 0x%04x\n",</div><div class='add'>+		dev-&gt;name, status &amp; 0xffff);</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: AFC_CFG 0x%08x\n",</div><div class='add'>+		dev-&gt;name, SMC_GET_AFC_CFG());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*--- END PHY CONTROL AND CONFIGURATION-------------------------------------*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the main routine of the driver, to handle the device when</div><div class='add'>+ * it needs some attention.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t smc911x_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_id;</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned int status, mask, timeout;</div><div class='add'>+	unsigned int rx_overrun=0, cr, pkts;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Spurious interrupt check */</div><div class='add'>+	if ((SMC_GET_IRQ_CFG() &amp; (INT_CFG_IRQ_INT_ | INT_CFG_IRQ_EN_)) !=</div><div class='add'>+		(INT_CFG_IRQ_INT_ | INT_CFG_IRQ_EN_)) {</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask = SMC_GET_INT_EN();</div><div class='add'>+	SMC_SET_INT_EN(0);</div><div class='add'>+</div><div class='add'>+	/* set a timeout value, so I don't stay here forever */</div><div class='add'>+	timeout = 8;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = SMC_GET_INT();</div><div class='add'>+</div><div class='add'>+		DBG(SMC_DEBUG_MISC, "%s: INT 0x%08x MASK 0x%08x OUTSIDE MASK 0x%08x\n",</div><div class='add'>+			dev-&gt;name, status, mask, status &amp; ~mask);</div><div class='add'>+</div><div class='add'>+		status &amp;= mask;</div><div class='add'>+		if (!status)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Handle SW interrupt condition */</div><div class='add'>+		if (status &amp; INT_STS_SW_INT_) {</div><div class='add'>+			SMC_ACK_INT(INT_STS_SW_INT_);</div><div class='add'>+			mask &amp;= ~INT_EN_SW_INT_EN_;</div><div class='add'>+		}</div><div class='add'>+		/* Handle various error conditions */</div><div class='add'>+		if (status &amp; INT_STS_RXE_) {</div><div class='add'>+			SMC_ACK_INT(INT_STS_RXE_);</div><div class='add'>+			lp-&gt;stats.rx_errors++;</div><div class='add'>+		}</div><div class='add'>+		if (status &amp; INT_STS_RXDFH_INT_) {</div><div class='add'>+			SMC_ACK_INT(INT_STS_RXDFH_INT_);</div><div class='add'>+			lp-&gt;stats.rx_dropped+=SMC_GET_RX_DROP();</div><div class='add'>+		 }</div><div class='add'>+		/* Undocumented interrupt-what is the right thing to do here? */</div><div class='add'>+		if (status &amp; INT_STS_RXDF_INT_) {</div><div class='add'>+			SMC_ACK_INT(INT_STS_RXDF_INT_);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Rx Data FIFO exceeds set level */</div><div class='add'>+		if (status &amp; INT_STS_RDFL_) {</div><div class='add'>+			if (IS_REV_A(lp-&gt;revision)) {</div><div class='add'>+				rx_overrun=1;</div><div class='add'>+				SMC_GET_MAC_CR(cr);</div><div class='add'>+				cr &amp;= ~MAC_CR_RXEN_;</div><div class='add'>+				SMC_SET_MAC_CR(cr);</div><div class='add'>+				DBG(SMC_DEBUG_RX, "%s: RX overrun\n", dev-&gt;name);</div><div class='add'>+				lp-&gt;stats.rx_errors++;</div><div class='add'>+				lp-&gt;stats.rx_fifo_errors++;</div><div class='add'>+			}</div><div class='add'>+			SMC_ACK_INT(INT_STS_RDFL_);</div><div class='add'>+		}</div><div class='add'>+		if (status &amp; INT_STS_RDFO_) {</div><div class='add'>+			if (!IS_REV_A(lp-&gt;revision)) {</div><div class='add'>+				SMC_GET_MAC_CR(cr);</div><div class='add'>+				cr &amp;= ~MAC_CR_RXEN_;</div><div class='add'>+				SMC_SET_MAC_CR(cr);</div><div class='add'>+				rx_overrun=1;</div><div class='add'>+				DBG(SMC_DEBUG_RX, "%s: RX overrun\n", dev-&gt;name);</div><div class='add'>+				lp-&gt;stats.rx_errors++;</div><div class='add'>+				lp-&gt;stats.rx_fifo_errors++;</div><div class='add'>+			}</div><div class='add'>+			SMC_ACK_INT(INT_STS_RDFO_);</div><div class='add'>+		}</div><div class='add'>+		/* Handle receive condition */</div><div class='add'>+		if ((status &amp; INT_STS_RSFL_) || rx_overrun) {</div><div class='add'>+			unsigned int fifo;</div><div class='add'>+			DBG(SMC_DEBUG_RX, "%s: RX irq\n", dev-&gt;name);</div><div class='add'>+			fifo = SMC_GET_RX_FIFO_INF();</div><div class='add'>+			pkts = (fifo &amp; RX_FIFO_INF_RXSUSED_) &gt;&gt; 16;</div><div class='add'>+			DBG(SMC_DEBUG_RX, "%s: Rx FIFO pkts %d, bytes %d\n",</div><div class='add'>+				dev-&gt;name, pkts, fifo &amp; 0xFFFF );</div><div class='add'>+			if (pkts != 0) {</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+				unsigned int fifo;</div><div class='add'>+				if (lp-&gt;rxdma_active){</div><div class='add'>+					DBG(SMC_DEBUG_RX | SMC_DEBUG_DMA,</div><div class='add'>+						"%s: RX DMA active\n", dev-&gt;name);</div><div class='add'>+					/* The DMA is already running so up the IRQ threshold */</div><div class='add'>+					fifo = SMC_GET_FIFO_INT() &amp; ~0xFF;</div><div class='add'>+					fifo |= pkts &amp; 0xFF;</div><div class='add'>+					DBG(SMC_DEBUG_RX,</div><div class='add'>+						"%s: Setting RX stat FIFO threshold to %d\n",</div><div class='add'>+						dev-&gt;name, fifo &amp; 0xff);</div><div class='add'>+					SMC_SET_FIFO_INT(fifo);</div><div class='add'>+				} else</div><div class='add'>+#endif</div><div class='add'>+				smc911x_rcv(dev);</div><div class='add'>+			}</div><div class='add'>+			SMC_ACK_INT(INT_STS_RSFL_);</div><div class='add'>+		}</div><div class='add'>+		/* Handle transmit FIFO available */</div><div class='add'>+		if (status &amp; INT_STS_TDFA_) {</div><div class='add'>+			DBG(SMC_DEBUG_TX, "%s: TX data FIFO space available irq\n", dev-&gt;name);</div><div class='add'>+			SMC_SET_FIFO_TDA(0xFF);</div><div class='add'>+			lp-&gt;tx_throttle = 0;</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+			if (!lp-&gt;txdma_active)</div><div class='add'>+#endif</div><div class='add'>+				netif_wake_queue(dev);</div><div class='add'>+			SMC_ACK_INT(INT_STS_TDFA_);</div><div class='add'>+		}</div><div class='add'>+		/* Handle transmit done condition */</div><div class='add'>+#if 1</div><div class='add'>+		if (status &amp; (INT_STS_TSFL_ | INT_STS_GPT_INT_)) {</div><div class='add'>+			DBG(SMC_DEBUG_TX | SMC_DEBUG_MISC,</div><div class='add'>+				"%s: Tx stat FIFO limit (%d) /GPT irq\n",</div><div class='add'>+				dev-&gt;name, (SMC_GET_FIFO_INT() &amp; 0x00ff0000) &gt;&gt; 16);</div><div class='add'>+			smc911x_tx(dev);</div><div class='add'>+			SMC_SET_GPT_CFG(GPT_CFG_TIMER_EN_ | 10000);</div><div class='add'>+			SMC_ACK_INT(INT_STS_TSFL_);</div><div class='add'>+			SMC_ACK_INT(INT_STS_TSFL_ | INT_STS_GPT_INT_);</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		if (status &amp; INT_STS_TSFL_) {</div><div class='add'>+			DBG(SMC_DEBUG_TX, "%s: TX status FIFO limit (%d) irq \n", dev-&gt;name, );</div><div class='add'>+			smc911x_tx(dev);</div><div class='add'>+			SMC_ACK_INT(INT_STS_TSFL_);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; INT_STS_GPT_INT_) {</div><div class='add'>+			DBG(SMC_DEBUG_RX, "%s: IRQ_CFG 0x%08x FIFO_INT 0x%08x RX_CFG 0x%08x\n",</div><div class='add'>+				dev-&gt;name,</div><div class='add'>+				SMC_GET_IRQ_CFG(),</div><div class='add'>+				SMC_GET_FIFO_INT(),</div><div class='add'>+				SMC_GET_RX_CFG());</div><div class='add'>+			DBG(SMC_DEBUG_RX, "%s: Rx Stat FIFO Used 0x%02x "</div><div class='add'>+				"Data FIFO Used 0x%04x Stat FIFO 0x%08x\n",</div><div class='add'>+				dev-&gt;name,</div><div class='add'>+				(SMC_GET_RX_FIFO_INF() &amp; 0x00ff0000) &gt;&gt; 16,</div><div class='add'>+				SMC_GET_RX_FIFO_INF() &amp; 0xffff,</div><div class='add'>+				SMC_GET_RX_STS_FIFO_PEEK());</div><div class='add'>+			SMC_SET_GPT_CFG(GPT_CFG_TIMER_EN_ | 10000);</div><div class='add'>+			SMC_ACK_INT(INT_STS_GPT_INT_);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		/* Handle PHY interupt condition */</div><div class='add'>+		if (status &amp; INT_STS_PHY_INT_) {</div><div class='add'>+			DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev-&gt;name);</div><div class='add'>+			smc911x_phy_interrupt(dev);</div><div class='add'>+			SMC_ACK_INT(INT_STS_PHY_INT_);</div><div class='add'>+		}</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+	/* restore mask state */</div><div class='add'>+	SMC_SET_INT_EN(mask);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: Interrupt done (%d loops)\n",</div><div class='add'>+		dev-&gt;name, 8-timeout);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	DBG(3, "%s: Interrupt done (%d loops)\n", dev-&gt;name, 8-timeout);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+static void</div><div class='add'>+smc911x_tx_dma_irq(int dma, void *data, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *)data;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	struct sk_buff *skb = lp-&gt;current_tx_skb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: TX DMA irq handler\n", dev-&gt;name);</div><div class='add'>+	/* Clear the DMA interrupt sources */</div><div class='add'>+	SMC_DMA_ACK_IRQ(dev, dma);</div><div class='add'>+	BUG_ON(skb == NULL);</div><div class='add'>+	dma_unmap_single(NULL, tx_dmabuf, tx_dmalen, DMA_TO_DEVICE);</div><div class='add'>+	dev-&gt;trans_start = jiffies;</div><div class='add'>+	dev_kfree_skb_irq(skb);</div><div class='add'>+	lp-&gt;current_tx_skb = NULL;</div><div class='add'>+	if (lp-&gt;pending_tx_skb != NULL)</div><div class='add'>+		smc911x_hardware_send_pkt(dev);</div><div class='add'>+	else {</div><div class='add'>+		DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA,</div><div class='add'>+			"%s: No pending Tx packets. DMA disabled\n", dev-&gt;name);</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		lp-&gt;txdma_active = 0;</div><div class='add'>+		if (!lp-&gt;tx_throttle) {</div><div class='add'>+			netif_wake_queue(dev);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA,</div><div class='add'>+		"%s: TX DMA irq completed\n", dev-&gt;name);</div><div class='add'>+}</div><div class='add'>+static void</div><div class='add'>+smc911x_rx_dma_irq(int dma, void *data, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *)data;</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	struct sk_buff *skb = lp-&gt;current_rx_skb;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int pkts;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	DBG(SMC_DEBUG_RX | SMC_DEBUG_DMA, "%s: RX DMA irq handler\n", dev-&gt;name);</div><div class='add'>+	/* Clear the DMA interrupt sources */</div><div class='add'>+	SMC_DMA_ACK_IRQ(dev, dma);</div><div class='add'>+	dma_unmap_single(NULL, rx_dmabuf, rx_dmalen, DMA_FROM_DEVICE);</div><div class='add'>+	BUG_ON(skb == NULL);</div><div class='add'>+	lp-&gt;current_rx_skb = NULL;</div><div class='add'>+	PRINT_PKT(skb-&gt;data, skb-&gt;len);</div><div class='add'>+	dev-&gt;last_rx = jiffies;</div><div class='add'>+	skb-&gt;dev = dev;</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+	lp-&gt;stats.rx_packets++;</div><div class='add'>+	lp-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	pkts = (SMC_GET_RX_FIFO_INF() &amp; RX_FIFO_INF_RXSUSED_) &gt;&gt; 16;</div><div class='add'>+	if (pkts != 0) {</div><div class='add'>+		smc911x_rcv(dev);</div><div class='add'>+	}else {</div><div class='add'>+		lp-&gt;rxdma_active = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	DBG(SMC_DEBUG_RX | SMC_DEBUG_DMA,</div><div class='add'>+		"%s: RX DMA irq completed. DMA RX FIFO PKTS %d\n",</div><div class='add'>+		dev-&gt;name, pkts);</div><div class='add'>+}</div><div class='add'>+#endif	 /* SMC_USE_DMA */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+/*</div><div class='add'>+ * Polling receive - used by netconsole and other diagnostic tools</div><div class='add'>+ * to allow network i/o with interrupts disabled.</div><div class='add'>+ */</div><div class='add'>+static void smc911x_poll_controller(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	disable_irq(dev-&gt;irq);</div><div class='add'>+	smc911x_interrupt(dev-&gt;irq, dev, NULL);</div><div class='add'>+	enable_irq(dev-&gt;irq);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Our watchdog timed out. Called by the networking layer */</div><div class='add'>+static void smc911x_timeout(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int status, mask;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	status = SMC_GET_INT();</div><div class='add'>+	mask = SMC_GET_INT_EN();</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: INT 0x%02x MASK 0x%02x \n",</div><div class='add'>+		dev-&gt;name, status, mask);</div><div class='add'>+</div><div class='add'>+	/* Dump the current TX FIFO contents and restart */</div><div class='add'>+	mask = SMC_GET_TX_CFG();</div><div class='add'>+	SMC_SET_TX_CFG(mask | TX_CFG_TXS_DUMP_ | TX_CFG_TXD_DUMP_);</div><div class='add'>+	/*</div><div class='add'>+	 * Reconfiguring the PHY doesn't seem like a bad idea here, but</div><div class='add'>+	 * smc911x_phy_configure() calls msleep() which calls schedule_timeout()</div><div class='add'>+	 * which calls schedule().	 Hence we use a work queue.</div><div class='add'>+	 */</div><div class='add'>+	if (lp-&gt;phy_type != 0) {</div><div class='add'>+		if (schedule_work(&amp;lp-&gt;phy_configure)) {</div><div class='add'>+			lp-&gt;work_pending = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We can accept TX packets again */</div><div class='add'>+	dev-&gt;trans_start = jiffies;</div><div class='add'>+	netif_wake_queue(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This routine will, depending on the values passed to it,</div><div class='add'>+ * either make it accept multicast packets, go into</div><div class='add'>+ * promiscuous mode (for TCPDUMP and cousins) or accept</div><div class='add'>+ * a select set of multicast packets</div><div class='add'>+ */</div><div class='add'>+static void smc911x_set_multicast_list(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int multicast_table[2];</div><div class='add'>+	unsigned int mcr, update_multicast = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	/* table for flipping the order of 5 bits */</div><div class='add'>+	static const unsigned char invert5[] =</div><div class='add'>+		{0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0C, 0x1C,</div><div class='add'>+		 0x02, 0x12, 0x0A, 0x1A, 0x06, 0x16, 0x0E, 0x1E,</div><div class='add'>+		 0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0D, 0x1D,</div><div class='add'>+		 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_GET_MAC_CR(mcr);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+</div><div class='add'>+		DBG(SMC_DEBUG_MISC, "%s: RCR_PRMS\n", dev-&gt;name);</div><div class='add'>+		mcr |= MAC_CR_PRMS_;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Here, I am setting this to accept all multicast packets.</div><div class='add'>+	 * I don't need to zero the multicast table, because the flag is</div><div class='add'>+	 * checked before the table is</div><div class='add'>+	 */</div><div class='add'>+	else if (dev-&gt;flags &amp; IFF_ALLMULTI || dev-&gt;mc_count &gt; 16) {</div><div class='add'>+		DBG(SMC_DEBUG_MISC, "%s: RCR_ALMUL\n", dev-&gt;name);</div><div class='add'>+		mcr |= MAC_CR_MCPAS_;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This sets the internal hardware table to filter out unwanted</div><div class='add'>+	 * multicast packets before they take up memory.</div><div class='add'>+	 *</div><div class='add'>+	 * The SMC chip uses a hash table where the high 6 bits of the CRC of</div><div class='add'>+	 * address are the offset into the table.	If that bit is 1, then the</div><div class='add'>+	 * multicast packet is accepted.  Otherwise, it's dropped silently.</div><div class='add'>+	 *</div><div class='add'>+	 * To use the 6 bits as an offset into the table, the high 1 bit is</div><div class='add'>+	 * the number of the 32 bit register, while the low 5 bits are the bit</div><div class='add'>+	 * within that register.</div><div class='add'>+	 */</div><div class='add'>+	else if (dev-&gt;mc_count)  {</div><div class='add'>+		int i;</div><div class='add'>+		struct dev_mc_list *cur_addr;</div><div class='add'>+</div><div class='add'>+		/* Set the Hash perfec mode */</div><div class='add'>+		mcr |= MAC_CR_HPFILT_;</div><div class='add'>+</div><div class='add'>+		/* start with a table of all zeros: reject all */</div><div class='add'>+		memset(multicast_table, 0, sizeof(multicast_table));</div><div class='add'>+</div><div class='add'>+		cur_addr = dev-&gt;mc_list;</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;mc_count; i++, cur_addr = cur_addr-&gt;next) {</div><div class='add'>+			int position;</div><div class='add'>+</div><div class='add'>+			/* do we have a pointer here? */</div><div class='add'>+			if (!cur_addr)</div><div class='add'>+				break;</div><div class='add'>+			/* make sure this is a multicast address -</div><div class='add'>+				shouldn't this be a given if we have it here ? */</div><div class='add'>+			if (!(*cur_addr-&gt;dmi_addr &amp; 1))</div><div class='add'>+				 continue;</div><div class='add'>+</div><div class='add'>+			/* only use the low order bits */</div><div class='add'>+			position = crc32_le(~0, cur_addr-&gt;dmi_addr, 6) &amp; 0x3f;</div><div class='add'>+</div><div class='add'>+			/* do some messy swapping to put the bit in the right spot */</div><div class='add'>+			multicast_table[invert5[position&amp;0x1F]&amp;0x1] |=</div><div class='add'>+				(1&lt;&lt;invert5[(position&gt;&gt;1)&amp;0x1F]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* be sure I get rid of flags I might have set */</div><div class='add'>+		mcr &amp;= ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_);</div><div class='add'>+</div><div class='add'>+		/* now, the table can be loaded into the chipset */</div><div class='add'>+		update_multicast = 1;</div><div class='add'>+	} else	 {</div><div class='add'>+		DBG(SMC_DEBUG_MISC, "%s: ~(MAC_CR_PRMS_|MAC_CR_MCPAS_)\n",</div><div class='add'>+			dev-&gt;name);</div><div class='add'>+		mcr &amp;= ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * since I'm disabling all multicast entirely, I need to</div><div class='add'>+		 * clear the multicast list</div><div class='add'>+		 */</div><div class='add'>+		memset(multicast_table, 0, sizeof(multicast_table));</div><div class='add'>+		update_multicast = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+	SMC_SET_MAC_CR(mcr);</div><div class='add'>+	if (update_multicast) {</div><div class='add'>+		DBG(SMC_DEBUG_MISC,</div><div class='add'>+			"%s: update mcast hash table 0x%08x 0x%08x\n",</div><div class='add'>+			dev-&gt;name, multicast_table[0], multicast_table[1]);</div><div class='add'>+		SMC_SET_HASHL(multicast_table[0]);</div><div class='add'>+		SMC_SET_HASHH(multicast_table[1]);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Open and Initialize the board</div><div class='add'>+ *</div><div class='add'>+ * Set up everything, reset the card, etc..</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+smc911x_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check that the address is valid.  If its not, refuse</div><div class='add'>+	 * to bring the device up.	 The user must specify an</div><div class='add'>+	 * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx</div><div class='add'>+	 */</div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='add'>+		PRINTK("%s: no valid ethernet hw addr\n", __FUNCTION__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* reset the hardware */</div><div class='add'>+	smc911x_reset(dev);</div><div class='add'>+</div><div class='add'>+	/* Configure the PHY, initialize the link state */</div><div class='add'>+	smc911x_phy_configure(dev);</div><div class='add'>+</div><div class='add'>+	/* Turn on Tx + Rx */</div><div class='add'>+	smc911x_enable(dev);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_close</div><div class='add'>+ *</div><div class='add'>+ * this makes the board clean up everything that it can</div><div class='add'>+ * and not talk to the outside world.	 Caused by</div><div class='add'>+ * an 'ifconfig ethX down'</div><div class='add'>+ */</div><div class='add'>+static int smc911x_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	/* clear everything */</div><div class='add'>+	smc911x_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;phy_type != 0) {</div><div class='add'>+		/* We need to ensure that no calls to</div><div class='add'>+		 * smc911x_phy_configure are pending.</div><div class='add'>+</div><div class='add'>+		 * flush_scheduled_work() cannot be called because we</div><div class='add'>+		 * are running with the netlink semaphore held (from</div><div class='add'>+		 * devinet_ioctl()) and the pending work queue</div><div class='add'>+		 * contains linkwatch_event() (scheduled by</div><div class='add'>+		 * netif_carrier_off() above). linkwatch_event() also</div><div class='add'>+		 * wants the netlink semaphore.</div><div class='add'>+		 */</div><div class='add'>+		while (lp-&gt;work_pending)</div><div class='add'>+			schedule();</div><div class='add'>+		smc911x_phy_powerdown(dev, lp-&gt;mii.phy_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;pending_tx_skb) {</div><div class='add'>+		dev_kfree_skb(lp-&gt;pending_tx_skb);</div><div class='add'>+		lp-&gt;pending_tx_skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the current statistics.</div><div class='add'>+ * This may be called with the card open or closed.</div><div class='add'>+ */</div><div class='add'>+static struct net_device_stats *smc911x_query_statistics(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	return &amp;lp-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ethtool support</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+smc911x_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int ret, status;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+	cmd-&gt;maxtxpkt = 1;</div><div class='add'>+	cmd-&gt;maxrxpkt = 1;</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;phy_type != 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		ret = mii_ethtool_gset(&amp;lp-&gt;mii, cmd);</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;supported = SUPPORTED_10baseT_Half |</div><div class='add'>+				SUPPORTED_10baseT_Full |</div><div class='add'>+				SUPPORTED_TP | SUPPORTED_AUI;</div><div class='add'>+</div><div class='add'>+		if (lp-&gt;ctl_rspeed == 10)</div><div class='add'>+			cmd-&gt;speed = SPEED_10;</div><div class='add'>+		else if (lp-&gt;ctl_rspeed == 100)</div><div class='add'>+			cmd-&gt;speed = SPEED_100;</div><div class='add'>+</div><div class='add'>+		cmd-&gt;autoneg = AUTONEG_DISABLE;</div><div class='add'>+		if (lp-&gt;mii.phy_id==1)</div><div class='add'>+			cmd-&gt;transceiver = XCVR_INTERNAL;</div><div class='add'>+		else</div><div class='add'>+			cmd-&gt;transceiver = XCVR_EXTERNAL;</div><div class='add'>+		cmd-&gt;port = 0;</div><div class='add'>+		SMC_GET_PHY_SPECIAL(lp-&gt;mii.phy_id, status);</div><div class='add'>+		cmd-&gt;duplex =</div><div class='add'>+			(status &amp; (PHY_SPECIAL_SPD_10FULL_ | PHY_SPECIAL_SPD_100FULL_)) ?</div><div class='add'>+				DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+smc911x_ethtool_setsettings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;phy_type != 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		ret = mii_ethtool_sset(&amp;lp-&gt;mii, cmd);</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		if (cmd-&gt;autoneg != AUTONEG_DISABLE ||</div><div class='add'>+			cmd-&gt;speed != SPEED_10 ||</div><div class='add'>+			(cmd-&gt;duplex != DUPLEX_HALF &amp;&amp; cmd-&gt;duplex != DUPLEX_FULL) ||</div><div class='add'>+			(cmd-&gt;port != PORT_TP &amp;&amp; cmd-&gt;port != PORT_AUI))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		lp-&gt;ctl_rfduplx = cmd-&gt;duplex == DUPLEX_FULL;</div><div class='add'>+</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+smc911x_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	strncpy(info-&gt;driver, CARDNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strncpy(info-&gt;version, version, sizeof(info-&gt;version));</div><div class='add'>+	strncpy(info-&gt;bus_info, dev-&gt;class_dev.dev-&gt;bus_id, sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_ethtool_nwayreset(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (lp-&gt;phy_type != 0) {</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		ret = mii_nway_restart(&amp;lp-&gt;mii);</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 smc911x_ethtool_getmsglevel(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	return lp-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smc911x_ethtool_setmsglevel(struct net_device *dev, u32 level)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	lp-&gt;msg_enable = level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_ethtool_getregslen(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* System regs + MAC regs + PHY regs */</div><div class='add'>+	return (((E2P_CMD - ID_REV)/4 + 1) +</div><div class='add'>+			(WUCSR - MAC_CR)+1 + 32) * sizeof(u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void smc911x_ethtool_getregs(struct net_device *dev,</div><div class='add'>+										 struct ethtool_regs* regs, void *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 reg,i,j=0;</div><div class='add'>+	u32 *data = (u32*)buf;</div><div class='add'>+</div><div class='add'>+	regs-&gt;version = lp-&gt;version;</div><div class='add'>+	for(i=ID_REV;i&lt;=E2P_CMD;i+=4) {</div><div class='add'>+		data[j++] = SMC_inl(ioaddr,i);</div><div class='add'>+	}</div><div class='add'>+	for(i=MAC_CR;i&lt;=WUCSR;i++) {</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		SMC_GET_MAC_CSR(i, reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+		data[j++] = reg;</div><div class='add'>+	}</div><div class='add'>+	for(i=0;i&lt;=31;i++) {</div><div class='add'>+		spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='add'>+		SMC_GET_MII(i, lp-&gt;mii.phy_id, reg);</div><div class='add'>+		spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+		data[j++] = reg &amp; 0xFFFF;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_ethtool_wait_eeprom_ready(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	unsigned int timeout;</div><div class='add'>+	int e2p_cmd;</div><div class='add'>+</div><div class='add'>+	e2p_cmd = SMC_GET_E2P_CMD();</div><div class='add'>+	for(timeout=10;(e2p_cmd &amp; E2P_CMD_EPC_BUSY_) &amp;&amp; timeout; timeout--) {</div><div class='add'>+		if (e2p_cmd &amp; E2P_CMD_EPC_TIMEOUT_) {</div><div class='add'>+			PRINTK("%s: %s timeout waiting for EEPROM to respond\n",</div><div class='add'>+				dev-&gt;name, __FUNCTION__);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='add'>+		mdelay(1);</div><div class='add'>+		e2p_cmd = SMC_GET_E2P_CMD();</div><div class='add'>+	}</div><div class='add'>+	if (timeout == 0) {</div><div class='add'>+		PRINTK("%s: %s timeout waiting for EEPROM CMD not busy\n",</div><div class='add'>+			dev-&gt;name, __FUNCTION__);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int smc911x_ethtool_write_eeprom_cmd(struct net_device *dev,</div><div class='add'>+													int cmd, int addr)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = smc911x_ethtool_wait_eeprom_ready(dev))!=0)</div><div class='add'>+		return ret;</div><div class='add'>+	SMC_SET_E2P_CMD(E2P_CMD_EPC_BUSY_ |</div><div class='add'>+		((cmd) &amp; (0x7&lt;&lt;28)) |</div><div class='add'>+		((addr) &amp; 0xFF));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int smc911x_ethtool_read_eeprom_byte(struct net_device *dev,</div><div class='add'>+													u8 *data)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = smc911x_ethtool_wait_eeprom_ready(dev))!=0)</div><div class='add'>+		return ret;</div><div class='add'>+	*data = SMC_GET_E2P_DATA();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int smc911x_ethtool_write_eeprom_byte(struct net_device *dev,</div><div class='add'>+													 u8 data)</div><div class='add'>+{</div><div class='add'>+	unsigned long ioaddr = dev-&gt;base_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = smc911x_ethtool_wait_eeprom_ready(dev))!=0)</div><div class='add'>+		return ret;</div><div class='add'>+	SMC_SET_E2P_DATA(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_ethtool_geteeprom(struct net_device *dev,</div><div class='add'>+									  struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u8 eebuf[SMC911X_EEPROM_LEN];</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for(i=0;i&lt;SMC911X_EEPROM_LEN;i++) {</div><div class='add'>+		if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_READ_, i ))!=0)</div><div class='add'>+			return ret;</div><div class='add'>+		if ((ret=smc911x_ethtool_read_eeprom_byte(dev, &amp;eebuf[i]))!=0)</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	memcpy(data, eebuf+eeprom-&gt;offset, eeprom-&gt;len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_ethtool_seteeprom(struct net_device *dev,</div><div class='add'>+									   struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* Enable erase */</div><div class='add'>+	if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_EWEN_, 0 ))!=0)</div><div class='add'>+		return ret;</div><div class='add'>+	for(i=eeprom-&gt;offset;i&lt;(eeprom-&gt;offset+eeprom-&gt;len);i++) {</div><div class='add'>+		/* erase byte */</div><div class='add'>+		if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_ERASE_, i ))!=0)</div><div class='add'>+			return ret;</div><div class='add'>+		/* write byte */</div><div class='add'>+		if ((ret=smc911x_ethtool_write_eeprom_byte(dev, *data))!=0)</div><div class='add'>+			 return ret;</div><div class='add'>+		if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_WRITE_, i ))!=0)</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	 return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_ethtool_geteeprom_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	 return SMC911X_EEPROM_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ethtool_ops smc911x_ethtool_ops = {</div><div class='add'>+	.get_settings	 = smc911x_ethtool_getsettings,</div><div class='add'>+	.set_settings	 = smc911x_ethtool_setsettings,</div><div class='add'>+	.get_drvinfo	 = smc911x_ethtool_getdrvinfo,</div><div class='add'>+	.get_msglevel	 = smc911x_ethtool_getmsglevel,</div><div class='add'>+	.set_msglevel	 = smc911x_ethtool_setmsglevel,</div><div class='add'>+	.nway_reset = smc911x_ethtool_nwayreset,</div><div class='add'>+	.get_link	 = ethtool_op_get_link,</div><div class='add'>+	.get_regs_len	 = smc911x_ethtool_getregslen,</div><div class='add'>+	.get_regs	 = smc911x_ethtool_getregs,</div><div class='add'>+	.get_eeprom_len = smc911x_ethtool_geteeprom_len,</div><div class='add'>+	.get_eeprom = smc911x_ethtool_geteeprom,</div><div class='add'>+	.set_eeprom = smc911x_ethtool_seteeprom,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_findirq</div><div class='add'>+ *</div><div class='add'>+ * This routine has a simple purpose -- make the SMC chip generate an</div><div class='add'>+ * interrupt, so an auto-detect routine can detect it, and find the IRQ,</div><div class='add'>+ */</div><div class='add'>+static int __init smc911x_findirq(unsigned long ioaddr)</div><div class='add'>+{</div><div class='add'>+	int timeout = 20;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	cookie = probe_irq_on();</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force a SW interrupt</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	SMC_SET_INT_EN(INT_EN_SW_INT_EN_);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Wait until positive that the interrupt has been generated</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		int int_status;</div><div class='add'>+		udelay(10);</div><div class='add'>+		int_status = SMC_GET_INT_EN();</div><div class='add'>+		if (int_status &amp; INT_EN_SW_INT_EN_)</div><div class='add'>+			 break;		/* got the interrupt */</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * there is really nothing that I can do here if timeout fails,</div><div class='add'>+	 * as autoirq_report will return a 0 anyway, which is what I</div><div class='add'>+	 * want in this case.	 Plus, the clean up is needed in both</div><div class='add'>+	 * cases.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* and disable all interrupts again */</div><div class='add'>+	SMC_SET_INT_EN(0);</div><div class='add'>+</div><div class='add'>+	/* and return what I found */</div><div class='add'>+	return probe_irq_off(cookie);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Function: smc911x_probe(unsigned long ioaddr)</div><div class='add'>+ *</div><div class='add'>+ * Purpose:</div><div class='add'>+ *	 Tests to see if a given ioaddr points to an SMC911x chip.</div><div class='add'>+ *	 Returns a 0 on success</div><div class='add'>+ *</div><div class='add'>+ * Algorithm:</div><div class='add'>+ *	 (1) see if the endian word is OK</div><div class='add'>+ *	 (1) see if I recognize the chip ID in the appropriate register</div><div class='add'>+ *</div><div class='add'>+ * Here I do typical initialization tasks.</div><div class='add'>+ *</div><div class='add'>+ * o  Initialize the structure if needed</div><div class='add'>+ * o  print out my vanity message if not done so already</div><div class='add'>+ * o  print out what type of hardware is detected</div><div class='add'>+ * o  print out the ethernet address</div><div class='add'>+ * o  find the IRQ</div><div class='add'>+ * o  set up my private data</div><div class='add'>+ * o  configure the dev structure with my subroutines</div><div class='add'>+ * o  actually GRAB the irq.</div><div class='add'>+ * o  GRAB the region</div><div class='add'>+ */</div><div class='add'>+static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)</div><div class='add'>+{</div><div class='add'>+	struct smc911x_local *lp = netdev_priv(dev);</div><div class='add'>+	int i, retval;</div><div class='add'>+	unsigned int val, chip_id, revision;</div><div class='add'>+	const char *version_string;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "%s: --&gt; %s\n", dev-&gt;name, __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* First, see if the endian word is recognized */</div><div class='add'>+	val = SMC_GET_BYTE_TEST();</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: endian probe returned 0x%04x\n", CARDNAME, val);</div><div class='add'>+	if (val != 0x87654321) {</div><div class='add'>+		printk(KERN_ERR "Invalid chip endian 0x08%x\n",val);</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * check if the revision register is something that I</div><div class='add'>+	 * recognize.	These might need to be added to later,</div><div class='add'>+	 * as future revisions could be added.</div><div class='add'>+	 */</div><div class='add'>+	chip_id = SMC_GET_PN();</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: id probe returned 0x%04x\n", CARDNAME, chip_id);</div><div class='add'>+	for(i=0;chip_ids[i].id != 0; i++) {</div><div class='add'>+		if (chip_ids[i].id == chip_id) break;</div><div class='add'>+	}</div><div class='add'>+	if (!chip_ids[i].id) {</div><div class='add'>+		printk(KERN_ERR "Unknown chip ID %04x\n", chip_id);</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	version_string = chip_ids[i].name;</div><div class='add'>+</div><div class='add'>+	revision = SMC_GET_REV();</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: revision = 0x%04x\n", CARDNAME, revision);</div><div class='add'>+</div><div class='add'>+	/* At this point I'll assume that the chip is an SMC911x. */</div><div class='add'>+	DBG(SMC_DEBUG_MISC, "%s: Found a %s\n", CARDNAME, chip_ids[i].name);</div><div class='add'>+</div><div class='add'>+	/* Validate the TX FIFO size requested */</div><div class='add'>+	if ((tx_fifo_kb &lt; 2) || (tx_fifo_kb &gt; 14)) {</div><div class='add'>+		printk(KERN_ERR "Invalid TX FIFO size requested %d\n", tx_fifo_kb);</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fill in some of the fields */</div><div class='add'>+	dev-&gt;base_addr = ioaddr;</div><div class='add'>+	lp-&gt;version = chip_ids[i].id;</div><div class='add'>+	lp-&gt;revision = revision;</div><div class='add'>+	lp-&gt;tx_fifo_kb = tx_fifo_kb;</div><div class='add'>+	/* Reverse calculate the RX FIFO size from the TX */</div><div class='add'>+	lp-&gt;tx_fifo_size=(lp-&gt;tx_fifo_kb&lt;&lt;10) - 512;</div><div class='add'>+	lp-&gt;rx_fifo_size= ((0x4000 - 512 - lp-&gt;tx_fifo_size) / 16) * 15;</div><div class='add'>+</div><div class='add'>+	/* Set the automatic flow control values */</div><div class='add'>+	switch(lp-&gt;tx_fifo_kb) {</div><div class='add'>+		/*</div><div class='add'>+		 *	 AFC_HI is about ((Rx Data Fifo Size)*2/3)/64</div><div class='add'>+		 *	 AFC_LO is AFC_HI/2</div><div class='add'>+		 *	 BACK_DUR is about 5uS*(AFC_LO) rounded down</div><div class='add'>+		 */</div><div class='add'>+		case 2:/* 13440 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x008C46AF;break;</div><div class='add'>+		case 3:/* 12480 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0082419F;break;</div><div class='add'>+		case 4:/* 11520 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x00783C9F;break;</div><div class='add'>+		case 5:/* 10560 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x006E374F;break;</div><div class='add'>+		case 6:/* 9600 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0064328F;break;</div><div class='add'>+		case 7:/* 8640 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x005A2D7F;break;</div><div class='add'>+		case 8:/* 7680 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0050287F;break;</div><div class='add'>+		case 9:/* 6720 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0046236F;break;</div><div class='add'>+		case 10:/* 5760 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x003C1E6F;break;</div><div class='add'>+		case 11:/* 4800 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0032195F;break;</div><div class='add'>+		/*</div><div class='add'>+		 *	 AFC_HI is ~1520 bytes less than RX Data Fifo Size</div><div class='add'>+		 *	 AFC_LO is AFC_HI/2</div><div class='add'>+		 *	 BACK_DUR is about 5uS*(AFC_LO) rounded down</div><div class='add'>+		 */</div><div class='add'>+		case 12:/* 3840 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0024124F;break;</div><div class='add'>+		case 13:/* 2880 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0015073F;break;</div><div class='add'>+		case 14:/* 1920 Rx Data Fifo Size */</div><div class='add'>+			lp-&gt;afc_cfg=0x0006032F;break;</div><div class='add'>+		 default:</div><div class='add'>+			 PRINTK("%s: ERROR -- no AFC_CFG setting found",</div><div class='add'>+				dev-&gt;name);</div><div class='add'>+			 break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_MISC | SMC_DEBUG_TX | SMC_DEBUG_RX,</div><div class='add'>+		"%s: tx_fifo %d rx_fifo %d afc_cfg 0x%08x\n", CARDNAME,</div><div class='add'>+		lp-&gt;tx_fifo_size, lp-&gt;rx_fifo_size, lp-&gt;afc_cfg);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;lp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Get the MAC address */</div><div class='add'>+	SMC_GET_MAC_ADDR(dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	/* now, reset the chip, and put it into a known state */</div><div class='add'>+	smc911x_reset(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If dev-&gt;irq is 0, then the device has to be banged on to see</div><div class='add'>+	 * what the IRQ is.</div><div class='add'>+	 *</div><div class='add'>+	 * Specifying an IRQ is done with the assumption that the user knows</div><div class='add'>+	 * what (s)he is doing.  No checking is done!!!!</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;irq &lt; 1) {</div><div class='add'>+		int trials;</div><div class='add'>+</div><div class='add'>+		trials = 3;</div><div class='add'>+		while (trials--) {</div><div class='add'>+			dev-&gt;irq = smc911x_findirq(ioaddr);</div><div class='add'>+			if (dev-&gt;irq)</div><div class='add'>+				break;</div><div class='add'>+			/* kick the card and try again */</div><div class='add'>+			smc911x_reset(dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dev-&gt;irq == 0) {</div><div class='add'>+		printk("%s: Couldn't autodetect your IRQ. Use irq=xx.\n",</div><div class='add'>+			dev-&gt;name);</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;irq = irq_canonicalize(dev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	/* Fill in the fields of the device structure with ethernet values. */</div><div class='add'>+	ether_setup(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;open = smc911x_open;</div><div class='add'>+	dev-&gt;stop = smc911x_close;</div><div class='add'>+	dev-&gt;hard_start_xmit = smc911x_hard_start_xmit;</div><div class='add'>+	dev-&gt;tx_timeout = smc911x_timeout;</div><div class='add'>+	dev-&gt;watchdog_timeo = msecs_to_jiffies(watchdog);</div><div class='add'>+	dev-&gt;get_stats = smc911x_query_statistics;</div><div class='add'>+	dev-&gt;set_multicast_list = smc911x_set_multicast_list;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;smc911x_ethtool_ops;</div><div class='add'>+#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='add'>+	dev-&gt;poll_controller = smc911x_poll_controller;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;lp-&gt;phy_configure, smc911x_phy_configure, dev);</div><div class='add'>+	lp-&gt;mii.phy_id_mask = 0x1f;</div><div class='add'>+	lp-&gt;mii.reg_num_mask = 0x1f;</div><div class='add'>+	lp-&gt;mii.force_media = 0;</div><div class='add'>+	lp-&gt;mii.full_duplex = 0;</div><div class='add'>+	lp-&gt;mii.dev = dev;</div><div class='add'>+	lp-&gt;mii.mdio_read = smc911x_phy_read;</div><div class='add'>+	lp-&gt;mii.mdio_write = smc911x_phy_write;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Locate the phy, if any.</div><div class='add'>+	 */</div><div class='add'>+	smc911x_phy_detect(dev);</div><div class='add'>+</div><div class='add'>+	/* Set default parameters */</div><div class='add'>+	lp-&gt;msg_enable = NETIF_MSG_LINK;</div><div class='add'>+	lp-&gt;ctl_rfduplx = 1;</div><div class='add'>+	lp-&gt;ctl_rspeed = 100;</div><div class='add'>+</div><div class='add'>+	/* Grab the IRQ */</div><div class='add'>+	retval = request_irq(dev-&gt;irq, &amp;smc911x_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	set_irq_type(dev-&gt;irq, IRQT_FALLING);</div><div class='add'>+</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	lp-&gt;rxdma = SMC_DMA_REQUEST(dev, smc911x_rx_dma_irq);</div><div class='add'>+	lp-&gt;txdma = SMC_DMA_REQUEST(dev, smc911x_tx_dma_irq);</div><div class='add'>+	lp-&gt;rxdma_active = 0;</div><div class='add'>+	lp-&gt;txdma_active = 0;</div><div class='add'>+	dev-&gt;dma = lp-&gt;rxdma;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	retval = register_netdev(dev);</div><div class='add'>+	if (retval == 0) {</div><div class='add'>+		/* now, print out the card info, in a short format.. */</div><div class='add'>+		printk("%s: %s (rev %d) at %#lx IRQ %d",</div><div class='add'>+			dev-&gt;name, version_string, lp-&gt;revision,</div><div class='add'>+			dev-&gt;base_addr, dev-&gt;irq);</div><div class='add'>+</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+		if (lp-&gt;rxdma != -1)</div><div class='add'>+			printk(" RXDMA %d ", lp-&gt;rxdma);</div><div class='add'>+</div><div class='add'>+		if (lp-&gt;txdma != -1)</div><div class='add'>+			printk("TXDMA %d", lp-&gt;txdma);</div><div class='add'>+#endif</div><div class='add'>+		printk("\n");</div><div class='add'>+		if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='add'>+			printk("%s: Invalid ethernet MAC address. Please "</div><div class='add'>+					"set using ifconfig\n", dev-&gt;name);</div><div class='add'>+		} else {</div><div class='add'>+			/* Print the Ethernet address */</div><div class='add'>+			printk("%s: Ethernet addr: ", dev-&gt;name);</div><div class='add'>+			for (i = 0; i &lt; 5; i++)</div><div class='add'>+				printk("%2.2x:", dev-&gt;dev_addr[i]);</div><div class='add'>+			printk("%2.2x\n", dev-&gt;dev_addr[5]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (lp-&gt;phy_type == 0) {</div><div class='add'>+			PRINTK("%s: No PHY found\n", dev-&gt;name);</div><div class='add'>+		} else if ((lp-&gt;phy_type &amp; ~0xff) == LAN911X_INTERNAL_PHY_ID) {</div><div class='add'>+			PRINTK("%s: LAN911x Internal PHY\n", dev-&gt;name);</div><div class='add'>+		} else {</div><div class='add'>+			PRINTK("%s: External PHY 0x%08x\n", dev-&gt;name, lp-&gt;phy_type);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	if (retval) {</div><div class='add'>+		if (lp-&gt;rxdma != -1) {</div><div class='add'>+			SMC_DMA_FREE(dev, lp-&gt;rxdma);</div><div class='add'>+		}</div><div class='add'>+		if (lp-&gt;txdma != -1) {</div><div class='add'>+			SMC_DMA_FREE(dev, lp-&gt;txdma);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * smc911x_init(void)</div><div class='add'>+ *</div><div class='add'>+ *	  Output:</div><div class='add'>+ *	 0 --&gt; there is a device</div><div class='add'>+ *	 anything else, error</div><div class='add'>+ */</div><div class='add'>+static int smc911x_drv_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned int *addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n",  __FUNCTION__);</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Request the regions.</div><div class='add'>+	 */</div><div class='add'>+	if (!request_mem_region(res-&gt;start, SMC911X_IO_EXTENT, CARDNAME)) {</div><div class='add'>+		 ret = -EBUSY;</div><div class='add'>+		 goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev = alloc_etherdev(sizeof(struct smc911x_local));</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		printk("%s: could not allocate device.\n", CARDNAME);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto release_1;</div><div class='add'>+	}</div><div class='add'>+	SET_MODULE_OWNER(ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;dma = (unsigned char)-1;</div><div class='add'>+	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+</div><div class='add'>+	addr = ioremap(res-&gt;start, SMC911X_IO_EXTENT);</div><div class='add'>+	if (!addr) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto release_both;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+	ret = smc911x_probe(ndev, (unsigned long)addr);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		platform_set_drvdata(pdev, NULL);</div><div class='add'>+		iounmap(addr);</div><div class='add'>+release_both:</div><div class='add'>+		free_netdev(ndev);</div><div class='add'>+release_1:</div><div class='add'>+		release_mem_region(res-&gt;start, SMC911X_IO_EXTENT);</div><div class='add'>+out:</div><div class='add'>+		printk("%s: not found (%d).\n", CARDNAME, ret);</div><div class='add'>+	}</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	else {</div><div class='add'>+		struct smc911x_local *lp = netdev_priv(ndev);</div><div class='add'>+		lp-&gt;physaddr = res-&gt;start;</div><div class='add'>+		lp-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_drv_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(ndev);</div><div class='add'>+</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+</div><div class='add'>+#ifdef SMC_USE_DMA</div><div class='add'>+	{</div><div class='add'>+		struct smc911x_local *lp = netdev_priv(ndev);</div><div class='add'>+		if (lp-&gt;rxdma != -1) {</div><div class='add'>+			SMC_DMA_FREE(dev, lp-&gt;rxdma);</div><div class='add'>+		}</div><div class='add'>+		if (lp-&gt;txdma != -1) {</div><div class='add'>+			SMC_DMA_FREE(dev, lp-&gt;txdma);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	iounmap((void *)ndev-&gt;base_addr);</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	release_mem_region(res-&gt;start, SMC911X_IO_EXTENT);</div><div class='add'>+</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_drv_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(dev);</div><div class='add'>+	unsigned long ioaddr = ndev-&gt;base_addr;</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	if (ndev) {</div><div class='add'>+		if (netif_running(ndev)) {</div><div class='add'>+			netif_device_detach(ndev);</div><div class='add'>+			smc911x_shutdown(ndev);</div><div class='add'>+#if POWER_DOWN</div><div class='add'>+			/* Set D2 - Energy detect only setting */</div><div class='add'>+			SMC_SET_PMT_CTRL(2&lt;&lt;12);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int smc911x_drv_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	DBG(SMC_DEBUG_FUNC, "--&gt; %s\n", __FUNCTION__);</div><div class='add'>+	if (ndev) {</div><div class='add'>+		struct smc911x_local *lp = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+		if (netif_running(ndev)) {</div><div class='add'>+			smc911x_reset(ndev);</div><div class='add'>+			smc911x_enable(ndev);</div><div class='add'>+			if (lp-&gt;phy_type != 0)</div><div class='add'>+				smc911x_phy_configure(ndev);</div><div class='add'>+			netif_device_attach(ndev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver smc911x_driver = {</div><div class='add'>+	.probe		 = smc911x_drv_probe,</div><div class='add'>+	.remove	 = smc911x_drv_remove,</div><div class='add'>+	.suspend	 = smc911x_drv_suspend,</div><div class='add'>+	.resume	 = smc911x_drv_resume,</div><div class='add'>+	.driver	 = {</div><div class='add'>+		.name	 = CARDNAME,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init smc911x_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;smc911x_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit smc911x_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;smc911x_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(smc911x_init);</div><div class='add'>+module_exit(smc911x_cleanup);</div><div class='head'>diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h<br/>new file mode 100644<br/>index 000000000000..962a710459fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc911x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc911x.h</a></div><div class='hunk'>@@ -0,0 +1,835 @@</div><div class='add'>+/*------------------------------------------------------------------------</div><div class='add'>+ . smc911x.h - macros for SMSC's LAN911{5,6,7,8} single-chip Ethernet device.</div><div class='add'>+ .</div><div class='add'>+ . Copyright (C) 2005 Sensoria Corp.</div><div class='add'>+ . Derived from the unified SMC91x driver by Nicolas Pitre</div><div class='add'>+ .</div><div class='add'>+ . This program is free software; you can redistribute it and/or modify</div><div class='add'>+ . it under the terms of the GNU General Public License as published by</div><div class='add'>+ . the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ . (at your option) any later version.</div><div class='add'>+ .</div><div class='add'>+ . This program is distributed in the hope that it will be useful,</div><div class='add'>+ . but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ . MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ . GNU General Public License for more details.</div><div class='add'>+ .</div><div class='add'>+ . You should have received a copy of the GNU General Public License</div><div class='add'>+ . along with this program; if not, write to the Free Software</div><div class='add'>+ . Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ .</div><div class='add'>+ . Information contained in this file was obtained from the LAN9118</div><div class='add'>+ . manual from SMC.  To get a copy, if you really want one, you can find</div><div class='add'>+ . information under www.smsc.com.</div><div class='add'>+ .</div><div class='add'>+ . Authors</div><div class='add'>+ .	 Dustin McIntire		 &lt;dustin@sensoria.com&gt;</div><div class='add'>+ .</div><div class='add'>+ ---------------------------------------------------------------------------*/</div><div class='add'>+#ifndef _SMC911X_H_</div><div class='add'>+#define _SMC911X_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use the DMA feature on PXA chips</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_ARCH_PXA</div><div class='add'>+  #define SMC_USE_PXA_DMA	1</div><div class='add'>+  #define SMC_USE_16BIT		0</div><div class='add'>+  #define SMC_USE_32BIT		1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define the bus width specific IO macros</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if	SMC_USE_16BIT</div><div class='add'>+#define SMC_inb(a, r)			 readb((a) + (r))</div><div class='add'>+#define SMC_inw(a, r)			 readw((a) + (r))</div><div class='add'>+#define SMC_inl(a, r)			 ((SMC_inw(a, r) &amp; 0xFFFF)+(SMC_inw(a+2, r)&lt;&lt;16))</div><div class='add'>+#define SMC_outb(v, a, r)		 writeb(v, (a) + (r))</div><div class='add'>+#define SMC_outw(v, a, r)		 writew(v, (a) + (r))</div><div class='add'>+#define SMC_outl(v, a, r) 			 \</div><div class='add'>+	do{					 \</div><div class='add'>+		 writel(v &amp; 0xFFFF, (a) + (r));	 \</div><div class='add'>+		 writel(v &gt;&gt; 16, (a) + (r) + 2); \</div><div class='add'>+	 } while (0)</div><div class='add'>+#define SMC_insl(a, r, p, l)	 readsw((short*)((a) + (r)), p, l*2)</div><div class='add'>+#define SMC_outsl(a, r, p, l)	 writesw((short*)((a) + (r)), p, l*2)</div><div class='add'>+</div><div class='add'>+#elif	SMC_USE_32BIT</div><div class='add'>+#define SMC_inb(a, r)		 readb((a) + (r))</div><div class='add'>+#define SMC_inw(a, r)		 readw((a) + (r))</div><div class='add'>+#define SMC_inl(a, r)		 readl((a) + (r))</div><div class='add'>+#define SMC_outb(v, a, r)	 writeb(v, (a) + (r))</div><div class='add'>+#define SMC_outl(v, a, r)	 writel(v, (a) + (r))</div><div class='add'>+#define SMC_insl(a, r, p, l)	 readsl((int*)((a) + (r)), p, l)</div><div class='add'>+#define SMC_outsl(a, r, p, l)	 writesl((int*)((a) + (r)), p, l)</div><div class='add'>+</div><div class='add'>+#endif /* SMC_USE_16BIT */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if	 SMC_USE_PXA_DMA</div><div class='add'>+#define SMC_USE_DMA</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Define the request and free functions</div><div class='add'>+ * These are unfortunately architecture specific as no generic allocation</div><div class='add'>+ * mechanism exits</div><div class='add'>+ */</div><div class='add'>+#define SMC_DMA_REQUEST(dev, handler) \</div><div class='add'>+	 pxa_request_dma(dev-&gt;name, DMA_PRIO_LOW, handler, dev)</div><div class='add'>+</div><div class='add'>+#define SMC_DMA_FREE(dev, dma) \</div><div class='add'>+	 pxa_free_dma(dma)</div><div class='add'>+</div><div class='add'>+#define SMC_DMA_ACK_IRQ(dev, dma)					\</div><div class='add'>+{									\</div><div class='add'>+	if (DCSR(dma) &amp; DCSR_BUSERR) {					\</div><div class='add'>+		printk("%s: DMA %d bus error!\n", dev-&gt;name, dma);	\</div><div class='add'>+	}								\</div><div class='add'>+	DCSR(dma) = DCSR_STARTINTR|DCSR_ENDINTR|DCSR_BUSERR;		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use a DMA for RX and TX packets.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+</div><div class='add'>+static dma_addr_t rx_dmabuf, tx_dmabuf;</div><div class='add'>+static int rx_dmalen, tx_dmalen;</div><div class='add'>+</div><div class='add'>+#ifdef SMC_insl</div><div class='add'>+#undef SMC_insl</div><div class='add'>+#define SMC_insl(a, r, p, l) \</div><div class='add'>+	smc_pxa_dma_insl(lp-&gt;dev, a, lp-&gt;physaddr, r, lp-&gt;rxdma, p, l)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+smc_pxa_dma_insl(struct device *dev, u_long ioaddr, u_long physaddr,</div><div class='add'>+		int reg, int dma, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	/* 64 bit alignment is required for memory to memory DMA */</div><div class='add'>+	if ((long)buf &amp; 4) {</div><div class='add'>+		*((u32 *)buf) = SMC_inl(ioaddr, reg);</div><div class='add'>+		buf += 4;</div><div class='add'>+		len--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len *= 4;</div><div class='add'>+	rx_dmabuf = dma_map_single(dev, buf, len, DMA_FROM_DEVICE);</div><div class='add'>+	rx_dmalen = len;</div><div class='add'>+	DCSR(dma) = DCSR_NODESC;</div><div class='add'>+	DTADR(dma) = rx_dmabuf;</div><div class='add'>+	DSADR(dma) = physaddr + reg;</div><div class='add'>+	DCMD(dma) = (DCMD_INCTRGADDR | DCMD_BURST32 |</div><div class='add'>+		DCMD_WIDTH4 | DCMD_ENDIRQEN | (DCMD_LENGTH &amp; rx_dmalen));</div><div class='add'>+	DCSR(dma) = DCSR_NODESC | DCSR_RUN;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef SMC_insw</div><div class='add'>+#undef SMC_insw</div><div class='add'>+#define SMC_insw(a, r, p, l) \</div><div class='add'>+	smc_pxa_dma_insw(lp-&gt;dev, a, lp-&gt;physaddr, r, lp-&gt;rxdma, p, l)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+smc_pxa_dma_insw(struct device *dev, u_long ioaddr, u_long physaddr,</div><div class='add'>+		int reg, int dma, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	/* 64 bit alignment is required for memory to memory DMA */</div><div class='add'>+	while ((long)buf &amp; 6) {</div><div class='add'>+		*((u16 *)buf) = SMC_inw(ioaddr, reg);</div><div class='add'>+		buf += 2;</div><div class='add'>+		len--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len *= 2;</div><div class='add'>+	rx_dmabuf = dma_map_single(dev, buf, len, DMA_FROM_DEVICE);</div><div class='add'>+	rx_dmalen = len;</div><div class='add'>+	DCSR(dma) = DCSR_NODESC;</div><div class='add'>+	DTADR(dma) = rx_dmabuf;</div><div class='add'>+	DSADR(dma) = physaddr + reg;</div><div class='add'>+	DCMD(dma) = (DCMD_INCTRGADDR | DCMD_BURST32 |</div><div class='add'>+		DCMD_WIDTH2 | DCMD_ENDIRQEN | (DCMD_LENGTH &amp; rx_dmalen));</div><div class='add'>+	DCSR(dma) = DCSR_NODESC | DCSR_RUN;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef SMC_outsl</div><div class='add'>+#undef SMC_outsl</div><div class='add'>+#define SMC_outsl(a, r, p, l) \</div><div class='add'>+	 smc_pxa_dma_outsl(lp-&gt;dev, a, lp-&gt;physaddr, r, lp-&gt;txdma, p, l)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+smc_pxa_dma_outsl(struct device *dev, u_long ioaddr, u_long physaddr,</div><div class='add'>+		int reg, int dma, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	/* 64 bit alignment is required for memory to memory DMA */</div><div class='add'>+	if ((long)buf &amp; 4) {</div><div class='add'>+		SMC_outl(*((u32 *)buf), ioaddr, reg);</div><div class='add'>+		buf += 4;</div><div class='add'>+		len--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len *= 4;</div><div class='add'>+	tx_dmabuf = dma_map_single(dev, buf, len, DMA_TO_DEVICE);</div><div class='add'>+	tx_dmalen = len;</div><div class='add'>+	DCSR(dma) = DCSR_NODESC;</div><div class='add'>+	DSADR(dma) = tx_dmabuf;</div><div class='add'>+	DTADR(dma) = physaddr + reg;</div><div class='add'>+	DCMD(dma) = (DCMD_INCSRCADDR | DCMD_BURST32 |</div><div class='add'>+		DCMD_WIDTH4 | DCMD_ENDIRQEN | (DCMD_LENGTH &amp; tx_dmalen));</div><div class='add'>+	DCSR(dma) = DCSR_NODESC | DCSR_RUN;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef SMC_outsw</div><div class='add'>+#undef SMC_outsw</div><div class='add'>+#define SMC_outsw(a, r, p, l) \</div><div class='add'>+	smc_pxa_dma_outsw(lp-&gt;dev, a, lp-&gt;physaddr, r, lp-&gt;txdma, p, l)</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+smc_pxa_dma_outsw(struct device *dev, u_long ioaddr, u_long physaddr,</div><div class='add'>+		  int reg, int dma, u_char *buf, int len)</div><div class='add'>+{</div><div class='add'>+	/* 64 bit alignment is required for memory to memory DMA */</div><div class='add'>+	while ((long)buf &amp; 6) {</div><div class='add'>+		SMC_outw(*((u16 *)buf), ioaddr, reg);</div><div class='add'>+		buf += 2;</div><div class='add'>+		len--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len *= 2;</div><div class='add'>+	tx_dmabuf = dma_map_single(dev, buf, len, DMA_TO_DEVICE);</div><div class='add'>+	tx_dmalen = len;</div><div class='add'>+	DCSR(dma) = DCSR_NODESC;</div><div class='add'>+	DSADR(dma) = tx_dmabuf;</div><div class='add'>+	DTADR(dma) = physaddr + reg;</div><div class='add'>+	DCMD(dma) = (DCMD_INCSRCADDR | DCMD_BURST32 |</div><div class='add'>+		DCMD_WIDTH2 | DCMD_ENDIRQEN | (DCMD_LENGTH &amp; tx_dmalen));</div><div class='add'>+	DCSR(dma) = DCSR_NODESC | DCSR_RUN;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif	 /* SMC_USE_PXA_DMA */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Chip Parameters and Register Definitions */</div><div class='add'>+</div><div class='add'>+#define SMC911X_TX_FIFO_LOW_THRESHOLD	(1536*2)</div><div class='add'>+</div><div class='add'>+#define SMC911X_IO_EXTENT	 0x100</div><div class='add'>+</div><div class='add'>+#define SMC911X_EEPROM_LEN	 7</div><div class='add'>+</div><div class='add'>+/* Below are the register offsets and bit definitions</div><div class='add'>+ * of the Lan911x memory space</div><div class='add'>+ */</div><div class='add'>+#define RX_DATA_FIFO		 (0x00)</div><div class='add'>+</div><div class='add'>+#define TX_DATA_FIFO		 (0x20)</div><div class='add'>+#define	TX_CMD_A_INT_ON_COMP_		(0x80000000)</div><div class='add'>+#define	TX_CMD_A_INT_BUF_END_ALGN_	(0x03000000)</div><div class='add'>+#define	TX_CMD_A_INT_4_BYTE_ALGN_	(0x00000000)</div><div class='add'>+#define	TX_CMD_A_INT_16_BYTE_ALGN_	(0x01000000)</div><div class='add'>+#define	TX_CMD_A_INT_32_BYTE_ALGN_	(0x02000000)</div><div class='add'>+#define	TX_CMD_A_INT_DATA_OFFSET_	(0x001F0000)</div><div class='add'>+#define	TX_CMD_A_INT_FIRST_SEG_		(0x00002000)</div><div class='add'>+#define	TX_CMD_A_INT_LAST_SEG_		(0x00001000)</div><div class='add'>+#define	TX_CMD_A_BUF_SIZE_		(0x000007FF)</div><div class='add'>+#define	TX_CMD_B_PKT_TAG_		(0xFFFF0000)</div><div class='add'>+#define	TX_CMD_B_ADD_CRC_DISABLE_	(0x00002000)</div><div class='add'>+#define	TX_CMD_B_DISABLE_PADDING_	(0x00001000)</div><div class='add'>+#define	TX_CMD_B_PKT_BYTE_LENGTH_	(0x000007FF)</div><div class='add'>+</div><div class='add'>+#define RX_STATUS_FIFO		(0x40)</div><div class='add'>+#define	RX_STS_PKT_LEN_			(0x3FFF0000)</div><div class='add'>+#define	RX_STS_ES_			(0x00008000)</div><div class='add'>+#define	RX_STS_BCST_			(0x00002000)</div><div class='add'>+#define	RX_STS_LEN_ERR_			(0x00001000)</div><div class='add'>+#define	RX_STS_RUNT_ERR_		(0x00000800)</div><div class='add'>+#define	RX_STS_MCAST_			(0x00000400)</div><div class='add'>+#define	RX_STS_TOO_LONG_		(0x00000080)</div><div class='add'>+#define	RX_STS_COLL_			(0x00000040)</div><div class='add'>+#define	RX_STS_ETH_TYPE_		(0x00000020)</div><div class='add'>+#define	RX_STS_WDOG_TMT_		(0x00000010)</div><div class='add'>+#define	RX_STS_MII_ERR_			(0x00000008)</div><div class='add'>+#define	RX_STS_DRIBBLING_		(0x00000004)</div><div class='add'>+#define	RX_STS_CRC_ERR_			(0x00000002)</div><div class='add'>+#define RX_STATUS_FIFO_PEEK 	(0x44)</div><div class='add'>+#define TX_STATUS_FIFO		(0x48)</div><div class='add'>+#define	TX_STS_TAG_			(0xFFFF0000)</div><div class='add'>+#define	TX_STS_ES_			(0x00008000)</div><div class='add'>+#define	TX_STS_LOC_			(0x00000800)</div><div class='add'>+#define	TX_STS_NO_CARR_			(0x00000400)</div><div class='add'>+#define	TX_STS_LATE_COLL_		(0x00000200)</div><div class='add'>+#define	TX_STS_MANY_COLL_		(0x00000100)</div><div class='add'>+#define	TX_STS_COLL_CNT_		(0x00000078)</div><div class='add'>+#define	TX_STS_MANY_DEFER_		(0x00000004)</div><div class='add'>+#define	TX_STS_UNDERRUN_		(0x00000002)</div><div class='add'>+#define	TX_STS_DEFERRED_		(0x00000001)</div><div class='add'>+#define TX_STATUS_FIFO_PEEK	(0x4C)</div><div class='add'>+#define ID_REV			(0x50)</div><div class='add'>+#define	ID_REV_CHIP_ID_			(0xFFFF0000)  /* RO */</div><div class='add'>+#define	ID_REV_REV_ID_			(0x0000FFFF)  /* RO */</div><div class='add'>+</div><div class='add'>+#define INT_CFG			(0x54)</div><div class='add'>+#define	INT_CFG_INT_DEAS_		(0xFF000000)  /* R/W */</div><div class='add'>+#define	INT_CFG_INT_DEAS_CLR_		(0x00004000)</div><div class='add'>+#define	INT_CFG_INT_DEAS_STS_		(0x00002000)</div><div class='add'>+#define	INT_CFG_IRQ_INT_		(0x00001000)  /* RO */</div><div class='add'>+#define	INT_CFG_IRQ_EN_			(0x00000100)  /* R/W */</div><div class='add'>+#define	INT_CFG_IRQ_POL_		(0x00000010)  /* R/W Not Affected by SW Reset */</div><div class='add'>+#define	INT_CFG_IRQ_TYPE_		(0x00000001)  /* R/W Not Affected by SW Reset */</div><div class='add'>+</div><div class='add'>+#define INT_STS			(0x58)</div><div class='add'>+#define	INT_STS_SW_INT_			(0x80000000)  /* R/WC */</div><div class='add'>+#define	INT_STS_TXSTOP_INT_		(0x02000000)  /* R/WC */</div><div class='add'>+#define	INT_STS_RXSTOP_INT_		(0x01000000)  /* R/WC */</div><div class='add'>+#define	INT_STS_RXDFH_INT_		(0x00800000)  /* R/WC */</div><div class='add'>+#define	INT_STS_RXDF_INT_		(0x00400000)  /* R/WC */</div><div class='add'>+#define	INT_STS_TX_IOC_			(0x00200000)  /* R/WC */</div><div class='add'>+#define	INT_STS_RXD_INT_		(0x00100000)  /* R/WC */</div><div class='add'>+#define	INT_STS_GPT_INT_		(0x00080000)  /* R/WC */</div><div class='add'>+#define	INT_STS_PHY_INT_		(0x00040000)  /* RO */</div><div class='add'>+#define	INT_STS_PME_INT_		(0x00020000)  /* R/WC */</div><div class='add'>+#define	INT_STS_TXSO_			(0x00010000)  /* R/WC */</div><div class='add'>+#define	INT_STS_RWT_			(0x00008000)  /* R/WC */</div><div class='add'>+#define	INT_STS_RXE_			(0x00004000)  /* R/WC */</div><div class='add'>+#define	INT_STS_TXE_			(0x00002000)  /* R/WC */</div><div class='add'>+//#define	INT_STS_ERX_		(0x00001000)  /* R/WC */</div><div class='add'>+#define	INT_STS_TDFU_			(0x00000800)  /* R/WC */</div><div class='add'>+#define	INT_STS_TDFO_			(0x00000400)  /* R/WC */</div><div class='add'>+#define	INT_STS_TDFA_			(0x00000200)  /* R/WC */</div><div class='add'>+#define	INT_STS_TSFF_			(0x00000100)  /* R/WC */</div><div class='add'>+#define	INT_STS_TSFL_			(0x00000080)  /* R/WC */</div><div class='add'>+//#define	INT_STS_RXDF_		(0x00000040)  /* R/WC */</div><div class='add'>+#define	INT_STS_RDFO_			(0x00000040)  /* R/WC */</div><div class='add'>+#define	INT_STS_RDFL_			(0x00000020)  /* R/WC */</div><div class='add'>+#define	INT_STS_RSFF_			(0x00000010)  /* R/WC */</div><div class='add'>+#define	INT_STS_RSFL_			(0x00000008)  /* R/WC */</div><div class='add'>+#define	INT_STS_GPIO2_INT_		(0x00000004)  /* R/WC */</div><div class='add'>+#define	INT_STS_GPIO1_INT_		(0x00000002)  /* R/WC */</div><div class='add'>+#define	INT_STS_GPIO0_INT_		(0x00000001)  /* R/WC */</div><div class='add'>+</div><div class='add'>+#define INT_EN			(0x5C)</div><div class='add'>+#define	INT_EN_SW_INT_EN_		(0x80000000)  /* R/W */</div><div class='add'>+#define	INT_EN_TXSTOP_INT_EN_		(0x02000000)  /* R/W */</div><div class='add'>+#define	INT_EN_RXSTOP_INT_EN_		(0x01000000)  /* R/W */</div><div class='add'>+#define	INT_EN_RXDFH_INT_EN_		(0x00800000)  /* R/W */</div><div class='add'>+//#define	INT_EN_RXDF_INT_EN_		(0x00400000)  /* R/W */</div><div class='add'>+#define	INT_EN_TIOC_INT_EN_		(0x00200000)  /* R/W */</div><div class='add'>+#define	INT_EN_RXD_INT_EN_		(0x00100000)  /* R/W */</div><div class='add'>+#define	INT_EN_GPT_INT_EN_		(0x00080000)  /* R/W */</div><div class='add'>+#define	INT_EN_PHY_INT_EN_		(0x00040000)  /* R/W */</div><div class='add'>+#define	INT_EN_PME_INT_EN_		(0x00020000)  /* R/W */</div><div class='add'>+#define	INT_EN_TXSO_EN_			(0x00010000)  /* R/W */</div><div class='add'>+#define	INT_EN_RWT_EN_			(0x00008000)  /* R/W */</div><div class='add'>+#define	INT_EN_RXE_EN_			(0x00004000)  /* R/W */</div><div class='add'>+#define	INT_EN_TXE_EN_			(0x00002000)  /* R/W */</div><div class='add'>+//#define	INT_EN_ERX_EN_			(0x00001000)  /* R/W */</div><div class='add'>+#define	INT_EN_TDFU_EN_			(0x00000800)  /* R/W */</div><div class='add'>+#define	INT_EN_TDFO_EN_			(0x00000400)  /* R/W */</div><div class='add'>+#define	INT_EN_TDFA_EN_			(0x00000200)  /* R/W */</div><div class='add'>+#define	INT_EN_TSFF_EN_			(0x00000100)  /* R/W */</div><div class='add'>+#define	INT_EN_TSFL_EN_			(0x00000080)  /* R/W */</div><div class='add'>+//#define	INT_EN_RXDF_EN_			(0x00000040)  /* R/W */</div><div class='add'>+#define	INT_EN_RDFO_EN_			(0x00000040)  /* R/W */</div><div class='add'>+#define	INT_EN_RDFL_EN_			(0x00000020)  /* R/W */</div><div class='add'>+#define	INT_EN_RSFF_EN_			(0x00000010)  /* R/W */</div><div class='add'>+#define	INT_EN_RSFL_EN_			(0x00000008)  /* R/W */</div><div class='add'>+#define	INT_EN_GPIO2_INT_		(0x00000004)  /* R/W */</div><div class='add'>+#define	INT_EN_GPIO1_INT_		(0x00000002)  /* R/W */</div><div class='add'>+#define	INT_EN_GPIO0_INT_		(0x00000001)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define BYTE_TEST		(0x64)</div><div class='add'>+#define FIFO_INT		(0x68)</div><div class='add'>+#define	FIFO_INT_TX_AVAIL_LEVEL_	(0xFF000000)  /* R/W */</div><div class='add'>+#define	FIFO_INT_TX_STS_LEVEL_		(0x00FF0000)  /* R/W */</div><div class='add'>+#define	FIFO_INT_RX_AVAIL_LEVEL_	(0x0000FF00)  /* R/W */</div><div class='add'>+#define	FIFO_INT_RX_STS_LEVEL_		(0x000000FF)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define RX_CFG			(0x6C)</div><div class='add'>+#define	RX_CFG_RX_END_ALGN_		(0xC0000000)  /* R/W */</div><div class='add'>+#define		RX_CFG_RX_END_ALGN4_		(0x00000000)  /* R/W */</div><div class='add'>+#define		RX_CFG_RX_END_ALGN16_		(0x40000000)  /* R/W */</div><div class='add'>+#define		RX_CFG_RX_END_ALGN32_		(0x80000000)  /* R/W */</div><div class='add'>+#define	RX_CFG_RX_DMA_CNT_		(0x0FFF0000)  /* R/W */</div><div class='add'>+#define	RX_CFG_RX_DUMP_			(0x00008000)  /* R/W */</div><div class='add'>+#define	RX_CFG_RXDOFF_			(0x00001F00)  /* R/W */</div><div class='add'>+//#define	RX_CFG_RXBAD_			(0x00000001)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define TX_CFG			(0x70)</div><div class='add'>+//#define	TX_CFG_TX_DMA_LVL_		(0xE0000000)	 /* R/W */</div><div class='add'>+//#define	TX_CFG_TX_DMA_CNT_		(0x0FFF0000)	 /* R/W Self Clearing */</div><div class='add'>+#define	TX_CFG_TXS_DUMP_		(0x00008000)  /* Self Clearing */</div><div class='add'>+#define	TX_CFG_TXD_DUMP_		(0x00004000)  /* Self Clearing */</div><div class='add'>+#define	TX_CFG_TXSAO_			(0x00000004)  /* R/W */</div><div class='add'>+#define	TX_CFG_TX_ON_			(0x00000002)  /* R/W */</div><div class='add'>+#define	TX_CFG_STOP_TX_			(0x00000001)  /* Self Clearing */</div><div class='add'>+</div><div class='add'>+#define HW_CFG			(0x74)</div><div class='add'>+#define	HW_CFG_TTM_			(0x00200000)  /* R/W */</div><div class='add'>+#define	HW_CFG_SF_			(0x00100000)  /* R/W */</div><div class='add'>+#define	HW_CFG_TX_FIF_SZ_		(0x000F0000)  /* R/W */</div><div class='add'>+#define	HW_CFG_TR_			(0x00003000)  /* R/W */</div><div class='add'>+#define	HW_CFG_PHY_CLK_SEL_		(0x00000060)  /* R/W */</div><div class='add'>+#define		 HW_CFG_PHY_CLK_SEL_INT_PHY_ 	(0x00000000) /* R/W */</div><div class='add'>+#define		 HW_CFG_PHY_CLK_SEL_EXT_PHY_ 	(0x00000020) /* R/W */</div><div class='add'>+#define		 HW_CFG_PHY_CLK_SEL_CLK_DIS_ 	(0x00000040) /* R/W */</div><div class='add'>+#define	HW_CFG_SMI_SEL_			(0x00000010)  /* R/W */</div><div class='add'>+#define	HW_CFG_EXT_PHY_DET_		(0x00000008)  /* RO */</div><div class='add'>+#define	HW_CFG_EXT_PHY_EN_		(0x00000004)  /* R/W */</div><div class='add'>+#define	HW_CFG_32_16_BIT_MODE_		(0x00000004)  /* RO */</div><div class='add'>+#define	HW_CFG_SRST_TO_			(0x00000002)  /* RO */</div><div class='add'>+#define	HW_CFG_SRST_			(0x00000001)  /* Self Clearing */</div><div class='add'>+</div><div class='add'>+#define RX_DP_CTRL		(0x78)</div><div class='add'>+#define	RX_DP_CTRL_RX_FFWD_		(0x80000000)  /* R/W */</div><div class='add'>+#define	RX_DP_CTRL_FFWD_BUSY_		(0x80000000)  /* RO */</div><div class='add'>+</div><div class='add'>+#define RX_FIFO_INF		(0x7C)</div><div class='add'>+#define	 RX_FIFO_INF_RXSUSED_		(0x00FF0000)  /* RO */</div><div class='add'>+#define	 RX_FIFO_INF_RXDUSED_		(0x0000FFFF)  /* RO */</div><div class='add'>+</div><div class='add'>+#define TX_FIFO_INF		(0x80)</div><div class='add'>+#define	TX_FIFO_INF_TSUSED_		(0x00FF0000)  /* RO */</div><div class='add'>+#define	TX_FIFO_INF_TDFREE_		(0x0000FFFF)  /* RO */</div><div class='add'>+</div><div class='add'>+#define PMT_CTRL		(0x84)</div><div class='add'>+#define	PMT_CTRL_PM_MODE_		(0x00003000)  /* Self Clearing */</div><div class='add'>+#define	PMT_CTRL_PHY_RST_		(0x00000400)  /* Self Clearing */</div><div class='add'>+#define	PMT_CTRL_WOL_EN_		(0x00000200)  /* R/W */</div><div class='add'>+#define	PMT_CTRL_ED_EN_			(0x00000100)  /* R/W */</div><div class='add'>+#define	PMT_CTRL_PME_TYPE_		(0x00000040)  /* R/W Not Affected by SW Reset */</div><div class='add'>+#define	PMT_CTRL_WUPS_			(0x00000030)  /* R/WC */</div><div class='add'>+#define		PMT_CTRL_WUPS_NOWAKE_		(0x00000000)  /* R/WC */</div><div class='add'>+#define		PMT_CTRL_WUPS_ED_		(0x00000010)  /* R/WC */</div><div class='add'>+#define		PMT_CTRL_WUPS_WOL_		(0x00000020)  /* R/WC */</div><div class='add'>+#define		PMT_CTRL_WUPS_MULTI_		(0x00000030)  /* R/WC */</div><div class='add'>+#define	PMT_CTRL_PME_IND_		(0x00000008)  /* R/W */</div><div class='add'>+#define	PMT_CTRL_PME_POL_		(0x00000004)  /* R/W */</div><div class='add'>+#define	PMT_CTRL_PME_EN_		(0x00000002)  /* R/W Not Affected by SW Reset */</div><div class='add'>+#define	PMT_CTRL_READY_			(0x00000001)  /* RO */</div><div class='add'>+</div><div class='add'>+#define GPIO_CFG		(0x88)</div><div class='add'>+#define	GPIO_CFG_LED3_EN_		(0x40000000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_LED2_EN_		(0x20000000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_LED1_EN_		(0x10000000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIO2_INT_POL_		(0x04000000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIO1_INT_POL_		(0x02000000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIO0_INT_POL_		(0x01000000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_EEPR_EN_		(0x00700000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOBUF2_		(0x00040000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOBUF1_		(0x00020000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOBUF0_		(0x00010000)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIODIR2_		(0x00000400)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIODIR1_		(0x00000200)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIODIR0_		(0x00000100)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOD4_		(0x00000010)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOD3_		(0x00000008)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOD2_		(0x00000004)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOD1_		(0x00000002)  /* R/W */</div><div class='add'>+#define	GPIO_CFG_GPIOD0_		(0x00000001)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define GPT_CFG			(0x8C)</div><div class='add'>+#define	GPT_CFG_TIMER_EN_		(0x20000000)  /* R/W */</div><div class='add'>+#define	GPT_CFG_GPT_LOAD_		(0x0000FFFF)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define GPT_CNT			(0x90)</div><div class='add'>+#define	GPT_CNT_GPT_CNT_		(0x0000FFFF)  /* RO */</div><div class='add'>+</div><div class='add'>+#define ENDIAN			(0x98)</div><div class='add'>+#define FREE_RUN		(0x9C)</div><div class='add'>+#define RX_DROP			(0xA0)</div><div class='add'>+#define MAC_CSR_CMD		(0xA4)</div><div class='add'>+#define	 MAC_CSR_CMD_CSR_BUSY_		(0x80000000)  /* Self Clearing */</div><div class='add'>+#define	 MAC_CSR_CMD_R_NOT_W_		(0x40000000)  /* R/W */</div><div class='add'>+#define	 MAC_CSR_CMD_CSR_ADDR_		(0x000000FF)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define MAC_CSR_DATA		(0xA8)</div><div class='add'>+#define AFC_CFG			(0xAC)</div><div class='add'>+#define		AFC_CFG_AFC_HI_			(0x00FF0000)  /* R/W */</div><div class='add'>+#define		AFC_CFG_AFC_LO_			(0x0000FF00)  /* R/W */</div><div class='add'>+#define		AFC_CFG_BACK_DUR_		(0x000000F0)  /* R/W */</div><div class='add'>+#define		AFC_CFG_FCMULT_			(0x00000008)  /* R/W */</div><div class='add'>+#define		AFC_CFG_FCBRD_			(0x00000004)  /* R/W */</div><div class='add'>+#define		AFC_CFG_FCADD_			(0x00000002)  /* R/W */</div><div class='add'>+#define		AFC_CFG_FCANY_			(0x00000001)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define E2P_CMD			(0xB0)</div><div class='add'>+#define	E2P_CMD_EPC_BUSY_		(0x80000000)  /* Self Clearing */</div><div class='add'>+#define	E2P_CMD_EPC_CMD_			(0x70000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_READ_		(0x00000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_EWDS_		(0x10000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_EWEN_		(0x20000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_WRITE_		(0x30000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_WRAL_		(0x40000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_ERASE_		(0x50000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_ERAL_		(0x60000000)  /* R/W */</div><div class='add'>+#define		E2P_CMD_EPC_CMD_RELOAD_		(0x70000000)  /* R/W */</div><div class='add'>+#define	E2P_CMD_EPC_TIMEOUT_		(0x00000200)  /* RO */</div><div class='add'>+#define	E2P_CMD_MAC_ADDR_LOADED_	(0x00000100)  /* RO */</div><div class='add'>+#define	E2P_CMD_EPC_ADDR_		(0x000000FF)  /* R/W */</div><div class='add'>+</div><div class='add'>+#define E2P_DATA		(0xB4)</div><div class='add'>+#define	E2P_DATA_EEPROM_DATA_		(0x000000FF)  /* R/W */</div><div class='add'>+/* end of LAN register offsets and bit definitions */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ ****************************************************************************</div><div class='add'>+ ****************************************************************************</div><div class='add'>+ * MAC Control and Status Register (Indirect Address)</div><div class='add'>+ * Offset (through the MAC_CSR CMD and DATA port)</div><div class='add'>+ ****************************************************************************</div><div class='add'>+ ****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#define MAC_CR			(0x01)  /* R/W */</div><div class='add'>+</div><div class='add'>+/* MAC_CR - MAC Control Register */</div><div class='add'>+#define MAC_CR_RXALL_			(0x80000000)</div><div class='add'>+// TODO: delete this bit? It is not described in the data sheet.</div><div class='add'>+#define MAC_CR_HBDIS_			(0x10000000)</div><div class='add'>+#define MAC_CR_RCVOWN_			(0x00800000)</div><div class='add'>+#define MAC_CR_LOOPBK_			(0x00200000)</div><div class='add'>+#define MAC_CR_FDPX_			(0x00100000)</div><div class='add'>+#define MAC_CR_MCPAS_			(0x00080000)</div><div class='add'>+#define MAC_CR_PRMS_			(0x00040000)</div><div class='add'>+#define MAC_CR_INVFILT_			(0x00020000)</div><div class='add'>+#define MAC_CR_PASSBAD_			(0x00010000)</div><div class='add'>+#define MAC_CR_HFILT_			(0x00008000)</div><div class='add'>+#define MAC_CR_HPFILT_			(0x00002000)</div><div class='add'>+#define MAC_CR_LCOLL_			(0x00001000)</div><div class='add'>+#define MAC_CR_BCAST_			(0x00000800)</div><div class='add'>+#define MAC_CR_DISRTY_			(0x00000400)</div><div class='add'>+#define MAC_CR_PADSTR_			(0x00000100)</div><div class='add'>+#define MAC_CR_BOLMT_MASK_		(0x000000C0)</div><div class='add'>+#define MAC_CR_DFCHK_			(0x00000020)</div><div class='add'>+#define MAC_CR_TXEN_			(0x00000008)</div><div class='add'>+#define MAC_CR_RXEN_			(0x00000004)</div><div class='add'>+</div><div class='add'>+#define ADDRH			(0x02)	  /* R/W mask 0x0000FFFFUL */</div><div class='add'>+#define ADDRL			(0x03)	  /* R/W mask 0xFFFFFFFFUL */</div><div class='add'>+#define HASHH			(0x04)	  /* R/W */</div><div class='add'>+#define HASHL			(0x05)	  /* R/W */</div><div class='add'>+</div><div class='add'>+#define MII_ACC			(0x06)	  /* R/W */</div><div class='add'>+#define MII_ACC_PHY_ADDR_		(0x0000F800)</div><div class='add'>+#define MII_ACC_MIIRINDA_		(0x000007C0)</div><div class='add'>+#define MII_ACC_MII_WRITE_		(0x00000002)</div><div class='add'>+#define MII_ACC_MII_BUSY_		(0x00000001)</div><div class='add'>+</div><div class='add'>+#define MII_DATA		(0x07)	  /* R/W mask 0x0000FFFFUL */</div><div class='add'>+</div><div class='add'>+#define FLOW			(0x08)	  /* R/W */</div><div class='add'>+#define FLOW_FCPT_			(0xFFFF0000)</div><div class='add'>+#define FLOW_FCPASS_			(0x00000004)</div><div class='add'>+#define FLOW_FCEN_			(0x00000002)</div><div class='add'>+#define FLOW_FCBSY_			(0x00000001)</div><div class='add'>+</div><div class='add'>+#define VLAN1			(0x09)	  /* R/W mask 0x0000FFFFUL */</div><div class='add'>+#define VLAN1_VTI1_			(0x0000ffff)</div><div class='add'>+</div><div class='add'>+#define VLAN2			(0x0A)	  /* R/W mask 0x0000FFFFUL */</div><div class='add'>+#define VLAN2_VTI2_			(0x0000ffff)</div><div class='add'>+</div><div class='add'>+#define WUFF			(0x0B)	  /* WO */</div><div class='add'>+</div><div class='add'>+#define WUCSR			(0x0C)	  /* R/W */</div><div class='add'>+#define WUCSR_GUE_			(0x00000200)</div><div class='add'>+#define WUCSR_WUFR_			(0x00000040)</div><div class='add'>+#define WUCSR_MPR_			(0x00000020)</div><div class='add'>+#define WUCSR_WAKE_EN_			(0x00000004)</div><div class='add'>+#define WUCSR_MPEN_			(0x00000002)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ ****************************************************************************</div><div class='add'>+ * Chip Specific MII Defines</div><div class='add'>+ ****************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * Phy register offsets and bit definitions</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define PHY_MODE_CTRL_STS	((u32)17)	/* Mode Control/Status Register */</div><div class='add'>+//#define MODE_CTRL_STS_FASTRIP_	  ((u16)0x4000)</div><div class='add'>+#define MODE_CTRL_STS_EDPWRDOWN_	 ((u16)0x2000)</div><div class='add'>+//#define MODE_CTRL_STS_LOWSQEN_	   ((u16)0x0800)</div><div class='add'>+//#define MODE_CTRL_STS_MDPREBP_	   ((u16)0x0400)</div><div class='add'>+//#define MODE_CTRL_STS_FARLOOPBACK_  ((u16)0x0200)</div><div class='add'>+//#define MODE_CTRL_STS_FASTEST_	   ((u16)0x0100)</div><div class='add'>+//#define MODE_CTRL_STS_REFCLKEN_	   ((u16)0x0010)</div><div class='add'>+//#define MODE_CTRL_STS_PHYADBP_	   ((u16)0x0008)</div><div class='add'>+//#define MODE_CTRL_STS_FORCE_G_LINK_ ((u16)0x0004)</div><div class='add'>+#define MODE_CTRL_STS_ENERGYON_	 	((u16)0x0002)</div><div class='add'>+</div><div class='add'>+#define PHY_INT_SRC			((u32)29)</div><div class='add'>+#define PHY_INT_SRC_ENERGY_ON_			((u16)0x0080)</div><div class='add'>+#define PHY_INT_SRC_ANEG_COMP_			((u16)0x0040)</div><div class='add'>+#define PHY_INT_SRC_REMOTE_FAULT_		((u16)0x0020)</div><div class='add'>+#define PHY_INT_SRC_LINK_DOWN_			((u16)0x0010)</div><div class='add'>+#define PHY_INT_SRC_ANEG_LP_ACK_		((u16)0x0008)</div><div class='add'>+#define PHY_INT_SRC_PAR_DET_FAULT_		((u16)0x0004)</div><div class='add'>+#define PHY_INT_SRC_ANEG_PGRX_			((u16)0x0002)</div><div class='add'>+</div><div class='add'>+#define PHY_INT_MASK			((u32)30)</div><div class='add'>+#define PHY_INT_MASK_ENERGY_ON_			((u16)0x0080)</div><div class='add'>+#define PHY_INT_MASK_ANEG_COMP_			((u16)0x0040)</div><div class='add'>+#define PHY_INT_MASK_REMOTE_FAULT_		((u16)0x0020)</div><div class='add'>+#define PHY_INT_MASK_LINK_DOWN_			((u16)0x0010)</div><div class='add'>+#define PHY_INT_MASK_ANEG_LP_ACK_		((u16)0x0008)</div><div class='add'>+#define PHY_INT_MASK_PAR_DET_FAULT_		((u16)0x0004)</div><div class='add'>+#define PHY_INT_MASK_ANEG_PGRX_			((u16)0x0002)</div><div class='add'>+</div><div class='add'>+#define PHY_SPECIAL			((u32)31)</div><div class='add'>+#define PHY_SPECIAL_ANEG_DONE_			((u16)0x1000)</div><div class='add'>+#define PHY_SPECIAL_RES_			((u16)0x0040)</div><div class='add'>+#define PHY_SPECIAL_RES_MASK_			((u16)0x0FE1)</div><div class='add'>+#define PHY_SPECIAL_SPD_			((u16)0x001C)</div><div class='add'>+#define PHY_SPECIAL_SPD_10HALF_			((u16)0x0004)</div><div class='add'>+#define PHY_SPECIAL_SPD_10FULL_			((u16)0x0014)</div><div class='add'>+#define PHY_SPECIAL_SPD_100HALF_		((u16)0x0008)</div><div class='add'>+#define PHY_SPECIAL_SPD_100FULL_		((u16)0x0018)</div><div class='add'>+</div><div class='add'>+#define LAN911X_INTERNAL_PHY_ID		(0x0007C000)</div><div class='add'>+</div><div class='add'>+/* Chip ID values */</div><div class='add'>+#define CHIP_9115	0x115</div><div class='add'>+#define CHIP_9116	0x116</div><div class='add'>+#define CHIP_9117	0x117</div><div class='add'>+#define CHIP_9118	0x118</div><div class='add'>+</div><div class='add'>+struct chip_id {</div><div class='add'>+	u16 id;</div><div class='add'>+	char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct chip_id chip_ids[] =  {</div><div class='add'>+	{ CHIP_9115, "LAN9115" },</div><div class='add'>+	{ CHIP_9116, "LAN9116" },</div><div class='add'>+	{ CHIP_9117, "LAN9117" },</div><div class='add'>+	{ CHIP_9118, "LAN9118" },</div><div class='add'>+	{ 0, NULL },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IS_REV_A(x)	((x &amp; 0xFFFF)==0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Macros to abstract register access according to the data bus</div><div class='add'>+ * capabilities.  Please use those and not the in/out primitives.</div><div class='add'>+ */</div><div class='add'>+/* FIFO read/write macros */</div><div class='add'>+#define SMC_PUSH_DATA(p, l)	SMC_outsl( ioaddr, TX_DATA_FIFO, p, (l) &gt;&gt; 2 )</div><div class='add'>+#define SMC_PULL_DATA(p, l)	SMC_insl ( ioaddr, RX_DATA_FIFO, p, (l) &gt;&gt; 2 )</div><div class='add'>+#define SMC_SET_TX_FIFO(x) 	SMC_outl( x, ioaddr, TX_DATA_FIFO )</div><div class='add'>+#define SMC_GET_RX_FIFO()	SMC_inl( ioaddr, RX_DATA_FIFO )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* I/O mapped register read/write macros */</div><div class='add'>+#define SMC_GET_TX_STS_FIFO()		SMC_inl( ioaddr, TX_STATUS_FIFO )</div><div class='add'>+#define SMC_GET_RX_STS_FIFO()		SMC_inl( ioaddr, RX_STATUS_FIFO )</div><div class='add'>+#define SMC_GET_RX_STS_FIFO_PEEK()	SMC_inl( ioaddr, RX_STATUS_FIFO_PEEK )</div><div class='add'>+#define SMC_GET_PN()			(SMC_inl( ioaddr, ID_REV ) &gt;&gt; 16)</div><div class='add'>+#define SMC_GET_REV()			(SMC_inl( ioaddr, ID_REV ) &amp; 0xFFFF)</div><div class='add'>+#define SMC_GET_IRQ_CFG()		SMC_inl( ioaddr, INT_CFG )</div><div class='add'>+#define SMC_SET_IRQ_CFG(x)		SMC_outl( x, ioaddr, INT_CFG )</div><div class='add'>+#define SMC_GET_INT()			SMC_inl( ioaddr, INT_STS )</div><div class='add'>+#define SMC_ACK_INT(x)			SMC_outl( x, ioaddr, INT_STS )</div><div class='add'>+#define SMC_GET_INT_EN()		SMC_inl( ioaddr, INT_EN )</div><div class='add'>+#define SMC_SET_INT_EN(x)		SMC_outl( x, ioaddr, INT_EN )</div><div class='add'>+#define SMC_GET_BYTE_TEST()		SMC_inl( ioaddr, BYTE_TEST )</div><div class='add'>+#define SMC_SET_BYTE_TEST(x)		SMC_outl( x, ioaddr, BYTE_TEST )</div><div class='add'>+#define SMC_GET_FIFO_INT()		SMC_inl( ioaddr, FIFO_INT )</div><div class='add'>+#define SMC_SET_FIFO_INT(x)		SMC_outl( x, ioaddr, FIFO_INT )</div><div class='add'>+#define SMC_SET_FIFO_TDA(x)					\</div><div class='add'>+	do {							\</div><div class='add'>+		unsigned long __flags;				\</div><div class='add'>+		int __mask;					\</div><div class='add'>+		local_irq_save(__flags);			\</div><div class='add'>+		__mask = SMC_GET_FIFO_INT() &amp; ~(0xFF&lt;&lt;24);	\</div><div class='add'>+		SMC_SET_FIFO_INT( __mask | (x)&lt;&lt;24 );		\</div><div class='add'>+		local_irq_restore(__flags);			\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_SET_FIFO_TSL(x)					\</div><div class='add'>+	do {							\</div><div class='add'>+		unsigned long __flags;				\</div><div class='add'>+		int __mask;					\</div><div class='add'>+		local_irq_save(__flags);			\</div><div class='add'>+		__mask = SMC_GET_FIFO_INT() &amp; ~(0xFF&lt;&lt;16);	\</div><div class='add'>+		SMC_SET_FIFO_INT( __mask | (((x) &amp; 0xFF)&lt;&lt;16));	\</div><div class='add'>+		local_irq_restore(__flags);			\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_SET_FIFO_RSA(x)					\</div><div class='add'>+	do {							\</div><div class='add'>+		unsigned long __flags;				\</div><div class='add'>+		int __mask;					\</div><div class='add'>+		local_irq_save(__flags);			\</div><div class='add'>+		__mask = SMC_GET_FIFO_INT() &amp; ~(0xFF&lt;&lt;8);	\</div><div class='add'>+		SMC_SET_FIFO_INT( __mask | (((x) &amp; 0xFF)&lt;&lt;8));	\</div><div class='add'>+		local_irq_restore(__flags);			\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_SET_FIFO_RSL(x)					\</div><div class='add'>+	do {							\</div><div class='add'>+		unsigned long __flags;				\</div><div class='add'>+		int __mask;					\</div><div class='add'>+		local_irq_save(__flags);			\</div><div class='add'>+		__mask = SMC_GET_FIFO_INT() &amp; ~0xFF;		\</div><div class='add'>+		SMC_SET_FIFO_INT( __mask | ((x) &amp; 0xFF));	\</div><div class='add'>+		local_irq_restore(__flags);			\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_GET_RX_CFG()		SMC_inl( ioaddr, RX_CFG )</div><div class='add'>+#define SMC_SET_RX_CFG(x)		SMC_outl( x, ioaddr, RX_CFG )</div><div class='add'>+#define SMC_GET_TX_CFG()		SMC_inl( ioaddr, TX_CFG )</div><div class='add'>+#define SMC_SET_TX_CFG(x)		SMC_outl( x, ioaddr, TX_CFG )</div><div class='add'>+#define SMC_GET_HW_CFG()		SMC_inl( ioaddr, HW_CFG )</div><div class='add'>+#define SMC_SET_HW_CFG(x)		SMC_outl( x, ioaddr, HW_CFG )</div><div class='add'>+#define SMC_GET_RX_DP_CTRL()		SMC_inl( ioaddr, RX_DP_CTRL )</div><div class='add'>+#define SMC_SET_RX_DP_CTRL(x)		SMC_outl( x, ioaddr, RX_DP_CTRL )</div><div class='add'>+#define SMC_GET_PMT_CTRL()		SMC_inl( ioaddr, PMT_CTRL )</div><div class='add'>+#define SMC_SET_PMT_CTRL(x)		SMC_outl( x, ioaddr, PMT_CTRL )</div><div class='add'>+#define SMC_GET_GPIO_CFG()		SMC_inl( ioaddr, GPIO_CFG )</div><div class='add'>+#define SMC_SET_GPIO_CFG(x)		SMC_outl( x, ioaddr, GPIO_CFG )</div><div class='add'>+#define SMC_GET_RX_FIFO_INF()		SMC_inl( ioaddr, RX_FIFO_INF )</div><div class='add'>+#define SMC_SET_RX_FIFO_INF(x)		SMC_outl( x, ioaddr, RX_FIFO_INF )</div><div class='add'>+#define SMC_GET_TX_FIFO_INF()		SMC_inl( ioaddr, TX_FIFO_INF )</div><div class='add'>+#define SMC_SET_TX_FIFO_INF(x)		SMC_outl( x, ioaddr, TX_FIFO_INF )</div><div class='add'>+#define SMC_GET_GPT_CFG()		SMC_inl( ioaddr, GPT_CFG )</div><div class='add'>+#define SMC_SET_GPT_CFG(x)		SMC_outl( x, ioaddr, GPT_CFG )</div><div class='add'>+#define SMC_GET_RX_DROP()		SMC_inl( ioaddr, RX_DROP )</div><div class='add'>+#define SMC_SET_RX_DROP(x)		SMC_outl( x, ioaddr, RX_DROP )</div><div class='add'>+#define SMC_GET_MAC_CMD()		SMC_inl( ioaddr, MAC_CSR_CMD )</div><div class='add'>+#define SMC_SET_MAC_CMD(x)		SMC_outl( x, ioaddr, MAC_CSR_CMD )</div><div class='add'>+#define SMC_GET_MAC_DATA()		SMC_inl( ioaddr, MAC_CSR_DATA )</div><div class='add'>+#define SMC_SET_MAC_DATA(x)		SMC_outl( x, ioaddr, MAC_CSR_DATA )</div><div class='add'>+#define SMC_GET_AFC_CFG()		SMC_inl( ioaddr, AFC_CFG )</div><div class='add'>+#define SMC_SET_AFC_CFG(x)		SMC_outl( x, ioaddr, AFC_CFG )</div><div class='add'>+#define SMC_GET_E2P_CMD()		SMC_inl( ioaddr, E2P_CMD )</div><div class='add'>+#define SMC_SET_E2P_CMD(x)		SMC_outl( x, ioaddr, E2P_CMD )</div><div class='add'>+#define SMC_GET_E2P_DATA()		SMC_inl( ioaddr, E2P_DATA )</div><div class='add'>+#define SMC_SET_E2P_DATA(x)		SMC_outl( x, ioaddr, E2P_DATA )</div><div class='add'>+</div><div class='add'>+/* MAC register read/write macros */</div><div class='add'>+#define SMC_GET_MAC_CSR(a,v)						\</div><div class='add'>+	do {								\</div><div class='add'>+		while (SMC_GET_MAC_CMD() &amp; MAC_CSR_CMD_CSR_BUSY_);	\</div><div class='add'>+		SMC_SET_MAC_CMD(MAC_CSR_CMD_CSR_BUSY_ |			\</div><div class='add'>+			MAC_CSR_CMD_R_NOT_W_ | (a) );			\</div><div class='add'>+		while (SMC_GET_MAC_CMD() &amp; MAC_CSR_CMD_CSR_BUSY_);	\</div><div class='add'>+		v = SMC_GET_MAC_DATA();					\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_SET_MAC_CSR(a,v)						\</div><div class='add'>+	do {								\</div><div class='add'>+		while (SMC_GET_MAC_CMD() &amp; MAC_CSR_CMD_CSR_BUSY_);	\</div><div class='add'>+		SMC_SET_MAC_DATA(v);					\</div><div class='add'>+		SMC_SET_MAC_CMD(MAC_CSR_CMD_CSR_BUSY_ | (a) );		\</div><div class='add'>+		while (SMC_GET_MAC_CMD() &amp; MAC_CSR_CMD_CSR_BUSY_);	\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_GET_MAC_CR(x)	SMC_GET_MAC_CSR( MAC_CR, x )</div><div class='add'>+#define SMC_SET_MAC_CR(x)	SMC_SET_MAC_CSR( MAC_CR, x )</div><div class='add'>+#define SMC_GET_ADDRH(x)	SMC_GET_MAC_CSR( ADDRH, x )</div><div class='add'>+#define SMC_SET_ADDRH(x)	SMC_SET_MAC_CSR( ADDRH, x )</div><div class='add'>+#define SMC_GET_ADDRL(x)	SMC_GET_MAC_CSR( ADDRL, x )</div><div class='add'>+#define SMC_SET_ADDRL(x)	SMC_SET_MAC_CSR( ADDRL, x )</div><div class='add'>+#define SMC_GET_HASHH(x)	SMC_GET_MAC_CSR( HASHH, x )</div><div class='add'>+#define SMC_SET_HASHH(x)	SMC_SET_MAC_CSR( HASHH, x )</div><div class='add'>+#define SMC_GET_HASHL(x)	SMC_GET_MAC_CSR( HASHL, x )</div><div class='add'>+#define SMC_SET_HASHL(x)	SMC_SET_MAC_CSR( HASHL, x )</div><div class='add'>+#define SMC_GET_MII_ACC(x)	SMC_GET_MAC_CSR( MII_ACC, x )</div><div class='add'>+#define SMC_SET_MII_ACC(x)	SMC_SET_MAC_CSR( MII_ACC, x )</div><div class='add'>+#define SMC_GET_MII_DATA(x)	SMC_GET_MAC_CSR( MII_DATA, x )</div><div class='add'>+#define SMC_SET_MII_DATA(x)	SMC_SET_MAC_CSR( MII_DATA, x )</div><div class='add'>+#define SMC_GET_FLOW(x)		SMC_GET_MAC_CSR( FLOW, x )</div><div class='add'>+#define SMC_SET_FLOW(x)		SMC_SET_MAC_CSR( FLOW, x )</div><div class='add'>+#define SMC_GET_VLAN1(x)	SMC_GET_MAC_CSR( VLAN1, x )</div><div class='add'>+#define SMC_SET_VLAN1(x)	SMC_SET_MAC_CSR( VLAN1, x )</div><div class='add'>+#define SMC_GET_VLAN2(x)	SMC_GET_MAC_CSR( VLAN2, x )</div><div class='add'>+#define SMC_SET_VLAN2(x)	SMC_SET_MAC_CSR( VLAN2, x )</div><div class='add'>+#define SMC_SET_WUFF(x)		SMC_SET_MAC_CSR( WUFF, x )</div><div class='add'>+#define SMC_GET_WUCSR(x)	SMC_GET_MAC_CSR( WUCSR, x )</div><div class='add'>+#define SMC_SET_WUCSR(x)	SMC_SET_MAC_CSR( WUCSR, x )</div><div class='add'>+</div><div class='add'>+/* PHY register read/write macros */</div><div class='add'>+#define SMC_GET_MII(a,phy,v)					\</div><div class='add'>+	do {							\</div><div class='add'>+		u32 __v;					\</div><div class='add'>+		do {						\</div><div class='add'>+			SMC_GET_MII_ACC(__v);			\</div><div class='add'>+		} while ( __v &amp; MII_ACC_MII_BUSY_ );		\</div><div class='add'>+		SMC_SET_MII_ACC( ((phy)&lt;&lt;11) | ((a)&lt;&lt;6) |	\</div><div class='add'>+			MII_ACC_MII_BUSY_);			\</div><div class='add'>+		do {						\</div><div class='add'>+			SMC_GET_MII_ACC(__v);			\</div><div class='add'>+		} while ( __v &amp; MII_ACC_MII_BUSY_ );		\</div><div class='add'>+		SMC_GET_MII_DATA(v);				\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_SET_MII(a,phy,v)					\</div><div class='add'>+	do {							\</div><div class='add'>+		u32 __v;					\</div><div class='add'>+		do {						\</div><div class='add'>+			SMC_GET_MII_ACC(__v);			\</div><div class='add'>+		} while ( __v &amp; MII_ACC_MII_BUSY_ );		\</div><div class='add'>+		SMC_SET_MII_DATA(v);				\</div><div class='add'>+		SMC_SET_MII_ACC( ((phy)&lt;&lt;11) | ((a)&lt;&lt;6) |	\</div><div class='add'>+			MII_ACC_MII_BUSY_	 |		\</div><div class='add'>+			MII_ACC_MII_WRITE_  );			\</div><div class='add'>+		do {						\</div><div class='add'>+			SMC_GET_MII_ACC(__v);			\</div><div class='add'>+		} while ( __v &amp; MII_ACC_MII_BUSY_ );		\</div><div class='add'>+	} while (0)</div><div class='add'>+#define SMC_GET_PHY_BMCR(phy,x)		SMC_GET_MII( MII_BMCR, phy, x )</div><div class='add'>+#define SMC_SET_PHY_BMCR(phy,x)		SMC_SET_MII( MII_BMCR, phy, x )</div><div class='add'>+#define SMC_GET_PHY_BMSR(phy,x)		SMC_GET_MII( MII_BMSR, phy, x )</div><div class='add'>+#define SMC_GET_PHY_ID1(phy,x)		SMC_GET_MII( MII_PHYSID1, phy, x )</div><div class='add'>+#define SMC_GET_PHY_ID2(phy,x)		SMC_GET_MII( MII_PHYSID2, phy, x )</div><div class='add'>+#define SMC_GET_PHY_MII_ADV(phy,x)	SMC_GET_MII( MII_ADVERTISE, phy, x )</div><div class='add'>+#define SMC_SET_PHY_MII_ADV(phy,x)	SMC_SET_MII( MII_ADVERTISE, phy, x )</div><div class='add'>+#define SMC_GET_PHY_MII_LPA(phy,x)	SMC_GET_MII( MII_LPA, phy, x )</div><div class='add'>+#define SMC_SET_PHY_MII_LPA(phy,x)	SMC_SET_MII( MII_LPA, phy, x )</div><div class='add'>+#define SMC_GET_PHY_CTRL_STS(phy,x)	SMC_GET_MII( PHY_MODE_CTRL_STS, phy, x )</div><div class='add'>+#define SMC_SET_PHY_CTRL_STS(phy,x)	SMC_SET_MII( PHY_MODE_CTRL_STS, phy, x )</div><div class='add'>+#define SMC_GET_PHY_INT_SRC(phy,x)	SMC_GET_MII( PHY_INT_SRC, phy, x )</div><div class='add'>+#define SMC_SET_PHY_INT_SRC(phy,x)	SMC_SET_MII( PHY_INT_SRC, phy, x )</div><div class='add'>+#define SMC_GET_PHY_INT_MASK(phy,x)	SMC_GET_MII( PHY_INT_MASK, phy, x )</div><div class='add'>+#define SMC_SET_PHY_INT_MASK(phy,x)	SMC_SET_MII( PHY_INT_MASK, phy, x )</div><div class='add'>+#define SMC_GET_PHY_SPECIAL(phy,x)	SMC_GET_MII( PHY_SPECIAL, phy, x )</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Misc read/write macros */</div><div class='add'>+</div><div class='add'>+#ifndef SMC_GET_MAC_ADDR</div><div class='add'>+#define SMC_GET_MAC_ADDR(addr)					\</div><div class='add'>+	do {							\</div><div class='add'>+		unsigned int __v;				\</div><div class='add'>+								\</div><div class='add'>+		SMC_GET_MAC_CSR(ADDRL, __v);			\</div><div class='add'>+		addr[0] = __v; addr[1] = __v &gt;&gt; 8;		\</div><div class='add'>+		addr[2] = __v &gt;&gt; 16; addr[3] = __v &gt;&gt; 24;	\</div><div class='add'>+		SMC_GET_MAC_CSR(ADDRH, __v);			\</div><div class='add'>+		addr[4] = __v; addr[5] = __v &gt;&gt; 8;		\</div><div class='add'>+	} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define SMC_SET_MAC_ADDR(addr)					\</div><div class='add'>+	do {							\</div><div class='add'>+		 SMC_SET_MAC_CSR(ADDRL,				\</div><div class='add'>+				 addr[0] |			\</div><div class='add'>+				(addr[1] &lt;&lt; 8) |		\</div><div class='add'>+				(addr[2] &lt;&lt; 16) |		\</div><div class='add'>+				(addr[3] &lt;&lt; 24));		\</div><div class='add'>+		 SMC_SET_MAC_CSR(ADDRH, addr[4]|(addr[5] &lt;&lt; 8));\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define SMC_WRITE_EEPROM_CMD(cmd, addr)					\</div><div class='add'>+	do {								\</div><div class='add'>+		while (SMC_GET_E2P_CMD() &amp; MAC_CSR_CMD_CSR_BUSY_);	\</div><div class='add'>+		SMC_SET_MAC_CMD(MAC_CSR_CMD_R_NOT_W_ | a );		\</div><div class='add'>+		while (SMC_GET_MAC_CMD() &amp; MAC_CSR_CMD_CSR_BUSY_);	\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#endif	 /* _SMC911X_H_ */</div><div class='head'>diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c<br/>index f86697da04d6..8b0321f1976c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc9194.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc9194.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc9194.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc9194.c</a></div><div class='hunk'>@@ -523,8 +523,7 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de</div><div class='ctx'> 	length = skb-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL) {</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN)) {</div><div class='ctx'> 			netif_wake_queue(dev);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -732,12 +731,9 @@ static int ifport;</div><div class='ctx'> struct net_device * __init smc_init(int unit)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));</div><div class='del'>-	static struct devlist *smcdev = smc_devlist;</div><div class='add'>+	struct devlist *smcdev = smc_devlist;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-#ifndef NO_AUTOPROBE</div><div class='del'>-	smcdev = smc_devlist;</div><div class='del'>-#endif</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='hunk'>@@ -1607,7 +1603,7 @@ MODULE_PARM_DESC(io, "SMC 99194 I/O base address");</div><div class='ctx'> MODULE_PARM_DESC(irq, "SMC 99194 IRQ number");</div><div class='ctx'> MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)");</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+int __init init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (io == 0)</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='head'>diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c<br/>index 0e9833adf9fe..3d8dcb6c8758 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc91x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc91x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc91x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc91x.c</a></div><div class='hunk'>@@ -66,7 +66,6 @@ static const char version[] =</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h<br/>index e1be1af51201..4ec4b4d23ae5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/smc91x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/smc91x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/smc91x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/smc91x.h</a></div><div class='hunk'>@@ -129,6 +129,24 @@</div><div class='ctx'> #define SMC_insb(a, r, p, l)	readsb((a) + (r), p, (l))</div><div class='ctx'> #define SMC_outsb(a, r, p, l)	writesb((a) + (r), p, (l))</div><div class='ctx'> </div><div class='add'>+#elif	defined(CONFIG_MACH_LOGICPD_PXA270)</div><div class='add'>+</div><div class='add'>+#define SMC_CAN_USE_8BIT	0</div><div class='add'>+#define SMC_CAN_USE_16BIT	1</div><div class='add'>+#define SMC_CAN_USE_32BIT	0</div><div class='add'>+#define SMC_IO_SHIFT		0</div><div class='add'>+#define SMC_NOWAIT		1</div><div class='add'>+#define SMC_USE_PXA_DMA		1</div><div class='add'>+</div><div class='add'>+#define SMC_inb(a, r)		readb((a) + (r))</div><div class='add'>+#define SMC_inw(a, r)		readw((a) + (r))</div><div class='add'>+#define SMC_inl(a, r)		readl((a) + (r))</div><div class='add'>+#define SMC_outb(v, a, r)	writeb(v, (a) + (r))</div><div class='add'>+#define SMC_outw(v, a, r)	writew(v, (a) + (r))</div><div class='add'>+#define SMC_outl(v, a, r)	writel(v, (a) + (r))</div><div class='add'>+#define SMC_insw(a, r, p, l)	readsw((a) + (r), p, l)</div><div class='add'>+#define SMC_outsw(a, r, p, l)	writesw((a) + (r), p, l)</div><div class='add'>+</div><div class='ctx'> #elif	defined(CONFIG_ARCH_INNOKOM) || \</div><div class='ctx'> 	defined(CONFIG_MACH_MAINSTONE) || \</div><div class='ctx'> 	defined(CONFIG_ARCH_PXA_IDP) || \</div><div class='hunk'>@@ -189,7 +207,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)</div><div class='ctx'> 		   machine_is_omap_h2() \</div><div class='ctx'> 		|| machine_is_omap_h3() \</div><div class='ctx'> 		|| (machine_is_omap_innovator() &amp;&amp; !cpu_is_omap1510()) \</div><div class='del'>-	) ? SA_TRIGGER_FALLING : SA_TRIGGER_RISING)</div><div class='add'>+	) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #elif	defined(CONFIG_SH_SH4202_MICRODEV)</div><div class='hunk'>@@ -242,15 +260,17 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)</div><div class='ctx'> #define RPC_LSA_DEFAULT		RPC_LED_TX_RX</div><div class='ctx'> #define RPC_LSB_DEFAULT		RPC_LED_100_10</div><div class='ctx'> </div><div class='del'>-#elif	defined(CONFIG_MACH_LPD7A400) || defined(CONFIG_MACH_LPD7A404)</div><div class='add'>+#elif   defined(CONFIG_MACH_LPD79520) \</div><div class='add'>+     || defined(CONFIG_MACH_LPD7A400) \</div><div class='add'>+     || defined(CONFIG_MACH_LPD7A404)</div><div class='ctx'> </div><div class='del'>-/* The LPD7A40X_IOBARRIER is necessary to overcome a mismatch between</div><div class='del'>- * the way that the CPU handles chip selects and the way that the SMC</div><div class='del'>- * chip expects the chip select to operate.  Refer to</div><div class='add'>+/* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the</div><div class='add'>+ * way that the CPU handles chip selects and the way that the SMC chip</div><div class='add'>+ * expects the chip select to operate.  Refer to</div><div class='ctx'>  * Documentation/arm/Sharp-LH/IOBarrier for details.  The read from</div><div class='del'>- * IOBARRIER is a byte as a least-common denominator of possible</div><div class='del'>- * regions to use as the barrier.  It would be wasteful to read 32</div><div class='del'>- * bits from a byte oriented region.</div><div class='add'>+ * IOBARRIER is a byte, in order that we read the least-common</div><div class='add'>+ * denominator.  It would be wasteful to read 32 bits from an 8-bit</div><div class='add'>+ * accessible region.</div><div class='ctx'>  *</div><div class='ctx'>  * There is no explicit protection against interrupts intervening</div><div class='ctx'>  * between the writew and the IOBARRIER.  In SMC ISR there is a</div><div class='hunk'>@@ -269,25 +289,35 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)</div><div class='ctx'> #define SMC_CAN_USE_16BIT	1</div><div class='ctx'> #define SMC_CAN_USE_32BIT	0</div><div class='ctx'> #define SMC_NOWAIT		0</div><div class='del'>-#define LPD7A40X_IOBARRIER	readb (IOBARRIER_VIRT)</div><div class='add'>+#define LPD7X_IOBARRIER		readb (IOBARRIER_VIRT)</div><div class='ctx'> </div><div class='del'>-#define SMC_inw(a,r)		readw ((void*) ((a) + (r)))</div><div class='del'>-#define SMC_insw(a,r,p,l)	readsw ((void*) ((a) + (r)), p, l)</div><div class='del'>-#define SMC_outw(v,a,r)	     ({ writew ((v), (a) + (r)); LPD7A40X_IOBARRIER; })</div><div class='add'>+#define SMC_inw(a,r)\</div><div class='add'>+   ({ unsigned short v = readw ((void*) ((a) + (r))); LPD7X_IOBARRIER; v; })</div><div class='add'>+#define SMC_outw(v,a,r)	  ({ writew ((v), (a) + (r)); LPD7X_IOBARRIER; })</div><div class='ctx'> </div><div class='del'>-#define SMC_outsw		LPD7A40X_SMC_outsw</div><div class='add'>+#define SMC_insw		LPD7_SMC_insw</div><div class='add'>+static inline void LPD7_SMC_insw (unsigned char* a, int r,</div><div class='add'>+				  unsigned char* p, int l)</div><div class='add'>+{</div><div class='add'>+	unsigned short* ps = (unsigned short*) p;</div><div class='add'>+	while (l-- &gt; 0) {</div><div class='add'>+		*ps++ = readw (a + r);</div><div class='add'>+		LPD7X_IOBARRIER;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static inline void LPD7A40X_SMC_outsw(unsigned long a, int r,</div><div class='del'>-				     unsigned char* p, int l)</div><div class='add'>+#define SMC_outsw		LPD7_SMC_outsw</div><div class='add'>+static inline void LPD7_SMC_outsw (unsigned char* a, int r,</div><div class='add'>+				   unsigned char* p, int l)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short* ps = (unsigned short*) p;</div><div class='ctx'> 	while (l-- &gt; 0) {</div><div class='ctx'> 		writew (*ps++, a + r);</div><div class='del'>-		LPD7A40X_IOBARRIER;</div><div class='add'>+		LPD7X_IOBARRIER;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SMC_INTERRUPT_PREAMBLE	LPD7A40X_IOBARRIER</div><div class='add'>+#define SMC_INTERRUPT_PREAMBLE	LPD7X_IOBARRIER</div><div class='ctx'> </div><div class='ctx'> #define RPC_LSA_DEFAULT		RPC_LED_TX_RX</div><div class='ctx'> #define RPC_LSB_DEFAULT		RPC_LED_100_10</div><div class='hunk'>@@ -324,6 +354,24 @@ static inline void LPD7A40X_SMC_outsw(unsigned long a, int r,</div><div class='ctx'> </div><div class='ctx'> #define SMC_IRQ_FLAGS		(0)</div><div class='ctx'> </div><div class='add'>+#elif	defined(CONFIG_ARCH_VERSATILE)</div><div class='add'>+</div><div class='add'>+#define SMC_CAN_USE_8BIT	1</div><div class='add'>+#define SMC_CAN_USE_16BIT	1</div><div class='add'>+#define SMC_CAN_USE_32BIT	1</div><div class='add'>+#define SMC_NOWAIT		1</div><div class='add'>+</div><div class='add'>+#define SMC_inb(a, r)		readb((a) + (r))</div><div class='add'>+#define SMC_inw(a, r)		readw((a) + (r))</div><div class='add'>+#define SMC_inl(a, r)		readl((a) + (r))</div><div class='add'>+#define SMC_outb(v, a, r)	writeb(v, (a) + (r))</div><div class='add'>+#define SMC_outw(v, a, r)	writew(v, (a) + (r))</div><div class='add'>+#define SMC_outl(v, a, r)	writel(v, (a) + (r))</div><div class='add'>+#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)</div><div class='add'>+#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)</div><div class='add'>+</div><div class='add'>+#define SMC_IRQ_FLAGS		(0)</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> #define SMC_CAN_USE_8BIT	1</div><div class='hunk'>@@ -510,7 +558,7 @@ smc_pxa_dma_irq(int dma, void *dummy, struct pt_regs *regs)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef	SMC_IRQ_FLAGS</div><div class='del'>-#define	SMC_IRQ_FLAGS		SA_TRIGGER_RISING</div><div class='add'>+#define	SMC_IRQ_FLAGS		IRQF_TRIGGER_RISING</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef SMC_INTERRUPT_PREAMBLE</div><div class='head'>diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c<br/>index 90b818a8de6e..cab0dd958492 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sonic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sonic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sonic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sonic.c</a></div><div class='hunk'>@@ -231,8 +231,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	length = skb-&gt;len;</div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/sonic.h b/drivers/net/sonic.h<br/>index cede969a8baa..7f5c4ebcc17a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sonic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sonic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sonic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sonic.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifndef SONIC_H</div><div class='ctx'> #define SONIC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SONIC register offsets</div><div class='head'>diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c<br/>index 394339d5e87c..fb1d5a8a45cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/spider_net.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/spider_net.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/spider_net.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/spider_net.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -1745,7 +1744,7 @@ spider_net_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	result = -EBUSY;</div><div class='ctx'> 	if (request_irq(netdev-&gt;irq, spider_net_interrupt,</div><div class='del'>-			     SA_SHIRQ, netdev-&gt;name, netdev))</div><div class='add'>+			     IRQF_SHARED, netdev-&gt;name, netdev))</div><div class='ctx'> 		goto register_int_failed;</div><div class='ctx'> </div><div class='ctx'> 	spider_net_enable_card(card);</div><div class='head'>diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c<br/>index 9b7805be21da..c0a62b00ffc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/starfire.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/starfire.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/starfire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/starfire.c</a></div><div class='hunk'>@@ -22,131 +22,14 @@</div><div class='ctx'> </div><div class='ctx'> 	Support and updates available at</div><div class='ctx'> 	http://www.scyld.com/network/starfire.html</div><div class='add'>+	[link no longer provides useful info -jgarzik]</div><div class='ctx'> </div><div class='del'>-	-----------------------------------------------------------</div><div class='del'>-</div><div class='del'>-	Linux kernel-specific changes:</div><div class='del'>-</div><div class='del'>-	LK1.1.1 (jgarzik):</div><div class='del'>-	- Use PCI driver interface</div><div class='del'>-	- Fix MOD_xxx races</div><div class='del'>-	- softnet fixups</div><div class='del'>-</div><div class='del'>-	LK1.1.2 (jgarzik):</div><div class='del'>-	- Merge Becker version 0.15</div><div class='del'>-</div><div class='del'>-	LK1.1.3 (Andrew Morton)</div><div class='del'>-	- Timer cleanups</div><div class='del'>-</div><div class='del'>-	LK1.1.4 (jgarzik):</div><div class='del'>-	- Merge Becker version 1.03</div><div class='del'>-</div><div class='del'>-	LK1.2.1 (Ion Badulescu &lt;ionut@cs.columbia.edu&gt;)</div><div class='del'>-	- Support hardware Rx/Tx checksumming</div><div class='del'>-	- Use the GFP firmware taken from Adaptec's Netware driver</div><div class='del'>-</div><div class='del'>-	LK1.2.2 (Ion Badulescu)</div><div class='del'>-	- Backported to 2.2.x</div><div class='del'>-</div><div class='del'>-	LK1.2.3 (Ion Badulescu)</div><div class='del'>-	- Fix the flaky mdio interface</div><div class='del'>-	- More compat clean-ups</div><div class='del'>-</div><div class='del'>-	LK1.2.4 (Ion Badulescu)</div><div class='del'>-	- More 2.2.x initialization fixes</div><div class='del'>-</div><div class='del'>-	LK1.2.5 (Ion Badulescu)</div><div class='del'>-	- Several fixes from Manfred Spraul</div><div class='del'>-</div><div class='del'>-	LK1.2.6 (Ion Badulescu)</div><div class='del'>-	- Fixed ifup/ifdown/ifup problem in 2.4.x</div><div class='del'>-</div><div class='del'>-	LK1.2.7 (Ion Badulescu)</div><div class='del'>-	- Removed unused code</div><div class='del'>-	- Made more functions static and __init</div><div class='del'>-</div><div class='del'>-	LK1.2.8 (Ion Badulescu)</div><div class='del'>-	- Quell bogus error messages, inform about the Tx threshold</div><div class='del'>-	- Removed #ifdef CONFIG_PCI, this driver is PCI only</div><div class='del'>-</div><div class='del'>-	LK1.2.9 (Ion Badulescu)</div><div class='del'>-	- Merged Jeff Garzik's changes from 2.4.4-pre5</div><div class='del'>-	- Added 2.2.x compatibility stuff required by the above changes</div><div class='del'>-</div><div class='del'>-	LK1.2.9a (Ion Badulescu)</div><div class='del'>-	- More updates from Jeff Garzik</div><div class='del'>-</div><div class='del'>-	LK1.3.0 (Ion Badulescu)</div><div class='del'>-	- Merged zerocopy support</div><div class='del'>-</div><div class='del'>-	LK1.3.1 (Ion Badulescu)</div><div class='del'>-	- Added ethtool support</div><div class='del'>-	- Added GPIO (media change) interrupt support</div><div class='del'>-</div><div class='del'>-	LK1.3.2 (Ion Badulescu)</div><div class='del'>-	- Fixed 2.2.x compatibility issues introduced in 1.3.1</div><div class='del'>-	- Fixed ethtool ioctl returning uninitialized memory</div><div class='del'>-</div><div class='del'>-	LK1.3.3 (Ion Badulescu)</div><div class='del'>-	- Initialize the TxMode register properly</div><div class='del'>-	- Don't dereference dev-&gt;priv after freeing it</div><div class='del'>-</div><div class='del'>-	LK1.3.4 (Ion Badulescu)</div><div class='del'>-	- Fixed initialization timing problems</div><div class='del'>-	- Fixed interrupt mask definitions</div><div class='del'>-</div><div class='del'>-	LK1.3.5 (jgarzik)</div><div class='del'>-	- ethtool NWAY_RST, GLINK, [GS]MSGLVL support</div><div class='del'>-</div><div class='del'>-	LK1.3.6:</div><div class='del'>-	- Sparc64 support and fixes (Ion Badulescu)</div><div class='del'>-	- Better stats and error handling (Ion Badulescu)</div><div class='del'>-	- Use new pci_set_mwi() PCI API function (jgarzik)</div><div class='del'>-</div><div class='del'>-	LK1.3.7 (Ion Badulescu)</div><div class='del'>-	- minimal implementation of tx_timeout()</div><div class='del'>-	- correctly shutdown the Rx/Tx engines in netdev_close()</div><div class='del'>-	- added calls to netif_carrier_on/off</div><div class='del'>-	(patch from Stefan Rompf &lt;srompf@isg.de&gt;)</div><div class='del'>-	- VLAN support</div><div class='del'>-</div><div class='del'>-	LK1.3.8 (Ion Badulescu)</div><div class='del'>-	- adjust DMA burst size on sparc64</div><div class='del'>-	- 64-bit support</div><div class='del'>-	- reworked zerocopy support for 64-bit buffers</div><div class='del'>-	- working and usable interrupt mitigation/latency</div><div class='del'>-	- reduced Tx interrupt frequency for lower interrupt overhead</div><div class='del'>-</div><div class='del'>-	LK1.3.9 (Ion Badulescu)</div><div class='del'>-	- bugfix for mcast filter</div><div class='del'>-	- enable the right kind of Tx interrupts (TxDMADone, not TxDone)</div><div class='del'>-</div><div class='del'>-	LK1.4.0 (Ion Badulescu)</div><div class='del'>-	- NAPI support</div><div class='del'>-</div><div class='del'>-	LK1.4.1 (Ion Badulescu)</div><div class='del'>-	- flush PCI posting buffers after disabling Rx interrupts</div><div class='del'>-	- put the chip to a D3 slumber on driver unload</div><div class='del'>-	- added config option to enable/disable NAPI</div><div class='del'>-</div><div class='del'>-	LK1.4.2 (Ion Badulescu)</div><div class='del'>-	- finally added firmware (GPL'ed by Adaptec)</div><div class='del'>-	- removed compatibility code for 2.2.x</div><div class='del'>-</div><div class='del'>-	LK1.4.2.1 (Ion Badulescu)</div><div class='del'>-	- fixed 32/64 bit issues on i386 + CONFIG_HIGHMEM</div><div class='del'>-	- added 32-bit padding to outgoing skb's, removed previous workaround</div><div class='del'>-</div><div class='del'>-TODO:	- fix forced speed/duplexing code (broken a long time ago, when</div><div class='del'>-	somebody converted the driver to use the generic MII code)</div><div class='del'>-	- fix VLAN support</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"starfire"</div><div class='del'>-#define DRV_VERSION	"1.03+LK1.4.2.1"</div><div class='del'>-#define DRV_RELDATE	"October 3, 2005"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='add'>+#define DRV_RELDATE	"June 27, 2006"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -847,7 +730,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* ioremap is borken in Linux-2.2.x/sparc64 */</div><div class='ctx'> 	base = ioremap(ioaddr, io_size);</div><div class='ctx'> 	if (!base) {</div><div class='ctx'> 		printk(KERN_ERR DRV_NAME " %d: cannot remap %#x @ %#lx, aborting\n",</div><div class='hunk'>@@ -1071,7 +953,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Do we ever need to reset the chip??? */</div><div class='ctx'> </div><div class='del'>-	retval = request_irq(dev-&gt;irq, &amp;intr_handler, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	retval = request_irq(dev-&gt;irq, &amp;intr_handler, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -1349,8 +1231,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> #if defined(ZEROCOPY) &amp;&amp; defined(HAS_BROKEN_FIRMWARE)</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_HW) {</div><div class='del'>-		skb = skb_padto(skb, (skb-&gt;len + PADDING_MASK) &amp; ~PADDING_MASK);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, (skb-&gt;len + PADDING_MASK) &amp; ~PADDING_MASK))</div><div class='ctx'> 			return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* ZEROCOPY &amp;&amp; HAS_BROKEN_FIRMWARE */</div><div class='head'>diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c<br/>index b6dfdf8f44da..74228348995d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/stnic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/stnic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/stnic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/stnic.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1999 kaz Kojima</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c<br/>index d4c0002b43db..2dcadb169a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sun3lance.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sun3lance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sun3lance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sun3lance.c</a></div><div class='hunk'>@@ -55,7 +55,7 @@ static char *version = "sun3lance.c: v1.2 1/12/2001  Sam Creasey (sammy@sammy.ne</div><div class='ctx'> /* sun3/60 addr/irq for the lance chip.  If your sun is different,</div><div class='ctx'>    change this. */</div><div class='ctx'> #define LANCE_OBIO 0x120000</div><div class='del'>-#define LANCE_IRQ IRQ3</div><div class='add'>+#define LANCE_IRQ IRQ_AUTO_3</div><div class='ctx'> </div><div class='ctx'> /* Debug level:</div><div class='ctx'>  *  0 = silent, print only serious errors</div><div class='hunk'>@@ -341,7 +341,7 @@ static int __init lance_probe( struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	REGA(CSR0) = CSR0_STOP; </div><div class='ctx'> </div><div class='del'>-	request_irq(LANCE_IRQ, lance_interrupt, SA_INTERRUPT, "SUN3 Lance", dev);</div><div class='add'>+	request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev);</div><div class='ctx'> 	dev-&gt;irq = (unsigned short)LANCE_IRQ;</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c<br/>index cfaf47c63c58..d46891510767 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sunbmac.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunbmac.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sunbmac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sunbmac.c</a></div><div class='hunk'>@@ -72,8 +72,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define DIRQ(x)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct bigmac *root_bigmac_dev;</div><div class='del'>-</div><div class='ctx'> #define DEFAULT_JAMSIZE    4 /* Toe jam */</div><div class='ctx'> </div><div class='ctx'> #define QEC_RESET_TRIES 200</div><div class='hunk'>@@ -491,7 +489,7 @@ static void bigmac_tcvr_init(struct bigmac *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bigmac_init(struct bigmac *, int);</div><div class='add'>+static int bigmac_init_hw(struct bigmac *, int);</div><div class='ctx'> </div><div class='ctx'> static int try_next_permutation(struct bigmac *bp, void __iomem *tregs)</div><div class='ctx'> {</div><div class='hunk'>@@ -551,7 +549,7 @@ static void bigmac_timer(unsigned long data)</div><div class='ctx'> 				if (ret == -1) {</div><div class='ctx'> 					printk(KERN_ERR "%s: Link down, cable problem?\n",</div><div class='ctx'> 					       bp-&gt;dev-&gt;name);</div><div class='del'>-					ret = bigmac_init(bp, 0);</div><div class='add'>+					ret = bigmac_init_hw(bp, 0);</div><div class='ctx'> 					if (ret) {</div><div class='ctx'> 						printk(KERN_ERR "%s: Error, cannot re-init the "</div><div class='ctx'> 						       "BigMAC.\n", bp-&gt;dev-&gt;name);</div><div class='hunk'>@@ -621,7 +619,7 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp)</div><div class='ctx'> 	add_timer(&amp;bp-&gt;bigmac_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bigmac_init(struct bigmac *bp, int from_irq)</div><div class='add'>+static int bigmac_init_hw(struct bigmac *bp, int from_irq)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *gregs        = bp-&gt;gregs;</div><div class='ctx'> 	void __iomem *cregs        = bp-&gt;creg;</div><div class='hunk'>@@ -752,7 +750,7 @@ static void bigmac_is_medium_rare(struct bigmac *bp, u32 qec_status, u32 bmac_st</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(" RESET\n");</div><div class='del'>-	bigmac_init(bp, 1);</div><div class='add'>+	bigmac_init_hw(bp, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* BigMAC transmit complete service routines. */</div><div class='hunk'>@@ -920,13 +918,13 @@ static int bigmac_open(struct net_device *dev)</div><div class='ctx'> 	struct bigmac *bp = (struct bigmac *) dev-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, &amp;bigmac_interrupt, SA_SHIRQ, dev-&gt;name, bp);</div><div class='add'>+	ret = request_irq(dev-&gt;irq, &amp;bigmac_interrupt, IRQF_SHARED, dev-&gt;name, bp);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "BIGMAC: Can't order irq %d to go.\n", dev-&gt;irq);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	init_timer(&amp;bp-&gt;bigmac_timer);</div><div class='del'>-	ret = bigmac_init(bp, 0);</div><div class='add'>+	ret = bigmac_init_hw(bp, 0);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		free_irq(dev-&gt;irq, bp);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -950,7 +948,7 @@ static void bigmac_tx_timeout(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bigmac *bp = (struct bigmac *) dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	bigmac_init(bp, 0);</div><div class='add'>+	bigmac_init_hw(bp, 0);</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1104,6 +1102,8 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 	bp-&gt;qec_sdev = qec_sdev;</div><div class='ctx'> 	bp-&gt;bigmac_sdev = qec_sdev-&gt;child;</div><div class='ctx'> </div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;bp-&gt;bigmac_sdev-&gt;ofdev.dev);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Verify the registers we expect, are actually there. */</div><div class='hunk'>@@ -1226,11 +1226,7 @@ static int __init bigmac_ether_init(struct sbus_dev *qec_sdev)</div><div class='ctx'> 		goto fail_and_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Put us into the list of instances attached for later driver</div><div class='del'>-	 * exit.</div><div class='del'>-	 */</div><div class='del'>-	bp-&gt;next_module = root_bigmac_dev;</div><div class='del'>-	root_bigmac_dev = bp;</div><div class='add'>+	dev_set_drvdata(&amp;bp-&gt;bigmac_sdev-&gt;ofdev.dev, bp);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: BigMAC 100baseT Ethernet ", dev-&gt;name);</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='hunk'>@@ -1266,69 +1262,68 @@ fail_and_cleanup:</div><div class='ctx'> /* QEC can be the parent of either QuadEthernet or</div><div class='ctx'>  * a BigMAC.  We want the latter.</div><div class='ctx'>  */</div><div class='del'>-static int __init bigmac_match(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit bigmac_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *child = sdev-&gt;child;</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='ctx'> </div><div class='del'>-	if (strcmp(sdev-&gt;prom_name, "qec") != 0)</div><div class='del'>-		return 0;</div><div class='add'>+	if (!strcmp(dp-&gt;name, "be"))</div><div class='add'>+		sdev = sdev-&gt;parent;</div><div class='ctx'> </div><div class='del'>-	if (child == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (strcmp(child-&gt;prom_name, "be") != 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='add'>+	return bigmac_ether_init(sdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init bigmac_probe(void)</div><div class='add'>+static int __devexit bigmac_sbus_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	static int called;</div><div class='del'>-	int cards = 0, v;</div><div class='del'>-</div><div class='del'>-	root_bigmac_dev = NULL;</div><div class='del'>-</div><div class='del'>-	if (called)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	called++;</div><div class='del'>-</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			if (bigmac_match(sdev)) {</div><div class='del'>-				cards++;</div><div class='del'>-				if ((v = bigmac_ether_init(sdev)))</div><div class='del'>-					return v;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!cards)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	struct bigmac *bp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = bp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	unregister_netdevice(net_dev);</div><div class='add'>+</div><div class='add'>+	sbus_iounmap(bp-&gt;gregs, GLOB_REG_SIZE);</div><div class='add'>+	sbus_iounmap(bp-&gt;creg, CREG_REG_SIZE);</div><div class='add'>+	sbus_iounmap(bp-&gt;bregs, BMAC_REG_SIZE);</div><div class='add'>+	sbus_iounmap(bp-&gt;tregs, TCVR_REG_SIZE);</div><div class='add'>+	sbus_free_consistent(bp-&gt;bigmac_sdev,</div><div class='add'>+			     PAGE_SIZE,</div><div class='add'>+			     bp-&gt;bmac_block,</div><div class='add'>+			     bp-&gt;bblock_dvma);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit bigmac_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	while (root_bigmac_dev) {</div><div class='del'>-		struct bigmac *bp = root_bigmac_dev;</div><div class='del'>-		struct bigmac *bp_nxt = root_bigmac_dev-&gt;next_module;</div><div class='add'>+static struct of_device_id bigmac_sbus_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "qec",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "be",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		sbus_iounmap(bp-&gt;gregs, GLOB_REG_SIZE);</div><div class='del'>-		sbus_iounmap(bp-&gt;creg, CREG_REG_SIZE);</div><div class='del'>-		sbus_iounmap(bp-&gt;bregs, BMAC_REG_SIZE);</div><div class='del'>-		sbus_iounmap(bp-&gt;tregs, TCVR_REG_SIZE);</div><div class='del'>-		sbus_free_consistent(bp-&gt;bigmac_sdev,</div><div class='del'>-				     PAGE_SIZE,</div><div class='del'>-				     bp-&gt;bmac_block,</div><div class='del'>-				     bp-&gt;bblock_dvma);</div><div class='add'>+MODULE_DEVICE_TABLE(of, bigmac_sbus_match);</div><div class='ctx'> </div><div class='del'>-		unregister_netdev(bp-&gt;dev);</div><div class='del'>-		free_netdev(bp-&gt;dev);</div><div class='del'>-		root_bigmac_dev = bp_nxt;</div><div class='del'>-	}</div><div class='add'>+static struct of_platform_driver bigmac_sbus_driver = {</div><div class='add'>+	.name		= "sunbmac",</div><div class='add'>+	.match_table	= bigmac_sbus_match,</div><div class='add'>+	.probe		= bigmac_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(bigmac_sbus_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bigmac_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;bigmac_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit bigmac_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;bigmac_sbus_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(bigmac_probe);</div><div class='del'>-module_exit(bigmac_cleanup);</div><div class='add'>+module_init(bigmac_init);</div><div class='add'>+module_exit(bigmac_exit);</div><div class='head'>diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h<br/>index b0dbc5187143..b563d3c2993e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sunbmac.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunbmac.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sunbmac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sunbmac.h</a></div><div class='hunk'>@@ -332,7 +332,6 @@ struct bigmac {</div><div class='ctx'> 	struct sbus_dev		*qec_sdev;</div><div class='ctx'> 	struct sbus_dev		*bigmac_sdev;</div><div class='ctx'> 	struct net_device	*dev;</div><div class='del'>-	struct bigmac		*next_module;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* We use this to acquire receive skb's that we can DMA directly into. */</div><div class='head'>diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c<br/>index 61eec46cb111..ac17377b3e9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sundance.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sundance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sundance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sundance.c</a></div><div class='hunk'>@@ -16,89 +16,13 @@</div><div class='ctx'> </div><div class='ctx'> 	Support and updates available at</div><div class='ctx'> 	http://www.scyld.com/network/sundance.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	Version LK1.01a (jgarzik):</div><div class='del'>-	- Replace some MII-related magic numbers with constants</div><div class='del'>-</div><div class='del'>-	Version LK1.02 (D-Link):</div><div class='del'>-	- Add new board to PCI ID list</div><div class='del'>-	- Fix multicast bug</div><div class='del'>-</div><div class='del'>-	Version LK1.03 (D-Link):</div><div class='del'>-	- New Rx scheme, reduce Rx congestion</div><div class='del'>-	- Option to disable flow control</div><div class='del'>-</div><div class='del'>-	Version LK1.04 (D-Link):</div><div class='del'>-	- Tx timeout recovery</div><div class='del'>-	- More support for ethtool.</div><div class='del'>-</div><div class='del'>-	Version LK1.04a:</div><div class='del'>-	- Remove unused/constant members from struct pci_id_info</div><div class='del'>-	(which then allows removal of 'drv_flags' from private struct)</div><div class='del'>-	(jgarzik)</div><div class='del'>-	- If no phy is found, fail to load that board (jgarzik)</div><div class='del'>-	- Always start phy id scan at id 1 to avoid problems (Donald Becker)</div><div class='del'>-	- Autodetect where mii_preable_required is needed,</div><div class='del'>-	default to not needed.  (Donald Becker)</div><div class='del'>-</div><div class='del'>-	Version LK1.04b:</div><div class='del'>-	- Remove mii_preamble_required module parameter (Donald Becker)</div><div class='del'>-	- Add per-interface mii_preamble_required (setting is autodetected)</div><div class='del'>-	  (Donald Becker)</div><div class='del'>-	- Remove unnecessary cast from void pointer (jgarzik)</div><div class='del'>-	- Re-align comments in private struct (jgarzik)</div><div class='del'>-</div><div class='del'>-	Version LK1.04c (jgarzik):</div><div class='del'>-	- Support bitmapped message levels (NETIF_MSG_xxx), and the</div><div class='del'>-	  two ethtool ioctls that get/set them</div><div class='del'>-	- Don't hand-code MII ethtool support, use standard API/lib</div><div class='del'>-</div><div class='del'>-	Version LK1.04d:</div><div class='del'>-	- Merge from Donald Becker's sundance.c: (Jason Lunz)</div><div class='del'>-		* proper support for variably-sized MTUs</div><div class='del'>-		* default to PIO, to fix chip bugs</div><div class='del'>-	- Add missing unregister_netdev (Jason Lunz)</div><div class='del'>-	- Add CONFIG_SUNDANCE_MMIO config option (jgarzik)</div><div class='del'>-	- Better rx buf size calculation (Donald Becker)</div><div class='del'>-</div><div class='del'>-	Version LK1.05 (D-Link):</div><div class='del'>-	- Fix DFE-580TX packet drop issue (for DL10050C)</div><div class='del'>-	- Fix reset_tx logic</div><div class='del'>-</div><div class='del'>-	Version LK1.06 (D-Link):</div><div class='del'>-	- Fix crash while unloading driver</div><div class='del'>-</div><div class='del'>-	Versin LK1.06b (D-Link):</div><div class='del'>-	- New tx scheme, adaptive tx_coalesce</div><div class='del'>-	</div><div class='del'>-	Version LK1.07 (D-Link):</div><div class='del'>-	- Fix tx bugs in big-endian machines</div><div class='del'>-	- Remove unused max_interrupt_work module parameter, the new </div><div class='del'>-	  NAPI-like rx scheme doesn't need it.</div><div class='del'>-	- Remove redundancy get_stats() in intr_handler(), those </div><div class='del'>-	  I/O access could affect performance in ARM-based system</div><div class='del'>-	- Add Linux software VLAN support</div><div class='del'>-	</div><div class='del'>-	Version LK1.08 (Philippe De Muyter phdm@macqel.be):</div><div class='del'>-	- Fix bug of custom mac address </div><div class='del'>-	(StationAddr register only accept word write) </div><div class='del'>-</div><div class='del'>-	Version LK1.09 (D-Link):</div><div class='del'>-	- Fix the flowctrl bug.	</div><div class='del'>-	- Set Pause bit in MII ANAR if flow control enabled.	</div><div class='del'>-</div><div class='del'>-	Version LK1.09a (ICPlus):</div><div class='del'>-	- Add the delay time in reading the contents of EEPROM</div><div class='del'>-</div><div class='del'>-	Version LK1.10 (Philippe De Muyter phdm@macqel.be):</div><div class='del'>-	- Make 'unblock interface after Tx underrun' work</div><div class='add'>+	[link no longer provides useful info -jgarzik]</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sundance"</div><div class='del'>-#define DRV_VERSION	"1.01+LK1.10"</div><div class='del'>-#define DRV_RELDATE	"28-Oct-2005"</div><div class='add'>+#define DRV_VERSION	"1.1"</div><div class='add'>+#define DRV_RELDATE	"27-Jun-2006"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* The user-configurable values.</div><div class='hunk'>@@ -280,14 +204,15 @@ IVc. Errata</div><div class='ctx'> #define USE_IO_OPS 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id sundance_pci_tbl[] = {</div><div class='del'>-	{0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0},</div><div class='del'>-	{0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1},</div><div class='del'>-	{0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2},</div><div class='del'>-	{0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3},</div><div class='del'>-	{0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},</div><div class='del'>-	{0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},</div><div class='del'>-	{0,}</div><div class='add'>+static const struct pci_device_id sundance_pci_tbl[] = {</div><div class='add'>+	{ 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 },</div><div class='add'>+	{ 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },</div><div class='add'>+	{ 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },</div><div class='add'>+	{ 0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3 },</div><div class='add'>+	{ 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },</div><div class='add'>+	{ 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },</div><div class='add'>+	{ 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);</div><div class='ctx'> </div><div class='hunk'>@@ -298,14 +223,15 @@ enum {</div><div class='ctx'> struct pci_id_info {</div><div class='ctx'>         const char *name;</div><div class='ctx'> };</div><div class='del'>-static const struct pci_id_info pci_id_tbl[] = {</div><div class='add'>+static const struct pci_id_info pci_id_tbl[] __devinitdata = {</div><div class='ctx'> 	{"D-Link DFE-550TX FAST Ethernet Adapter"},</div><div class='ctx'> 	{"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},</div><div class='ctx'> 	{"D-Link DFE-580TX 4 port Server Adapter"},</div><div class='ctx'> 	{"D-Link DFE-530TXS FAST Ethernet Adapter"},</div><div class='ctx'> 	{"D-Link DL10050-based FAST Ethernet Adapter"},</div><div class='ctx'> 	{"Sundance Technology Alta"},</div><div class='del'>-	{NULL,},			/* 0 terminated list. */</div><div class='add'>+	{"IC Plus Corporation IP100A FAST Ethernet Adapter"},</div><div class='add'>+	{ }	/* terminate list. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This driver was written to use PCI memory space, however x86-oriented</div><div class='hunk'>@@ -866,7 +792,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Do we need to reset the chip??? */</div><div class='ctx'> </div><div class='del'>-	i = request_irq(dev-&gt;irq, &amp;intr_handler, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq(dev-&gt;irq, &amp;intr_handler, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return i;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c<br/>index 38cd30cb7c75..b70bbd748978 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sungem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sungem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sungem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sungem.c</a></div><div class='hunk'>@@ -2220,7 +2220,7 @@ static int gem_do_start(struct net_device *dev)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(gp-&gt;pdev-&gt;irq, gem_interrupt,</div><div class='del'>-				   SA_SHIRQ, dev-&gt;name, (void *)dev)) {</div><div class='add'>+				   IRQF_SHARED, dev-&gt;name, (void *)dev)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: failed to request irq !\n", gp-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;gp-&gt;lock, flags);</div><div class='hunk'>@@ -2880,17 +2880,20 @@ static int __devinit gem_get_device_address(struct gem *gp)</div><div class='ctx'> #if defined(__sparc__)</div><div class='ctx'> 	struct pci_dev *pdev = gp-&gt;pdev;</div><div class='ctx'> 	struct pcidev_cookie *pcp = pdev-&gt;sysdata;</div><div class='del'>-	int node = -1;</div><div class='add'>+	int use_idprom = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (pcp != NULL) {</div><div class='del'>-		node = pcp-&gt;prom_node;</div><div class='del'>-		if (prom_getproplen(node, "local-mac-address") == 6)</div><div class='del'>-			prom_getproperty(node, "local-mac-address",</div><div class='del'>-					 dev-&gt;dev_addr, 6);</div><div class='del'>-		else</div><div class='del'>-			node = -1;</div><div class='add'>+		unsigned char *addr;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		addr = of_get_property(pcp-&gt;prom_node, "local-mac-address",</div><div class='add'>+				       &amp;len);</div><div class='add'>+		if (addr &amp;&amp; len == 6) {</div><div class='add'>+			use_idprom = 0;</div><div class='add'>+			memcpy(dev-&gt;dev_addr, addr, 6);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (node == -1)</div><div class='add'>+	if (use_idprom)</div><div class='ctx'> 		memcpy(dev-&gt;dev_addr, idprom-&gt;id_ethaddr, 6);</div><div class='ctx'> #elif defined(CONFIG_PPC_PMAC)</div><div class='ctx'> 	unsigned char *addr;</div><div class='head'>diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c<br/>index b2ddd5e79303..278c7cb22216 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sungem_phy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sungem_phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sungem_phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sungem_phy.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *    of darwin, still need to reverse engineer that</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -345,9 +344,9 @@ static int bcm5421_enable_fiber(struct mii_phy* phy)</div><div class='ctx'> </div><div class='ctx'> static int bcm5461_enable_fiber(struct mii_phy* phy)</div><div class='ctx'> {</div><div class='del'>-        phy_write(phy, MII_NCONFIG, 0xfc0c);</div><div class='del'>-        phy_write(phy, MII_BMCR, 0x4140);</div><div class='del'>-        phy_write(phy, MII_NCONFIG, 0xfc0b);</div><div class='add'>+	phy_write(phy, MII_NCONFIG, 0xfc0c);</div><div class='add'>+	phy_write(phy, MII_BMCR, 0x4140);</div><div class='add'>+	phy_write(phy, MII_NCONFIG, 0xfc0b);</div><div class='ctx'> 	phy_write(phy, MII_BMCR, 0x0140);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c<br/>index 9f046cae2f71..8673fd4c08c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sunhme.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunhme.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sunhme.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sunhme.c</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='del'>-/* $Id: sunhme.c,v 1.124 2002/01/15 06:25:51 davem Exp $</div><div class='del'>- * sunhme.c: Sparc HME/BigMac 10/100baseT half/full duplex auto switching,</div><div class='add'>+/* sunhme.c: Sparc HME/BigMac 10/100baseT half/full duplex auto switching,</div><div class='ctx'>  *           auto carrier detecting ethernet driver.  Also known as the</div><div class='ctx'>  *           "Happy Meal Ethernet" found on SunSwift SBUS cards.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 1998, 1999, 2002, 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 1996, 1998, 1999, 2002, 2003,</div><div class='add'>+		 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  *</div><div class='ctx'>  * Changes :</div><div class='ctx'>  * 2000/11/11 Willy Tarreau &lt;willy AT meta-x.org&gt;</div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *     argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -40,15 +39,13 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef __sparc__</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/openprom.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/auxio.h&gt;</div><div class='del'>-#ifndef __sparc_v9__</div><div class='del'>-#include &lt;asm/io-unit.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> #endif</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +54,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#ifdef __sparc__</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='ctx'> #include &lt;asm/pbm.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='hunk'>@@ -65,9 +62,9 @@</div><div class='ctx'> #include "sunhme.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sunhme"</div><div class='del'>-#define DRV_VERSION	"2.02"</div><div class='del'>-#define DRV_RELDATE	"8/24/03"</div><div class='del'>-#define DRV_AUTHOR	"David S. Miller (davem@redhat.com)"</div><div class='add'>+#define DRV_VERSION	"3.00"</div><div class='add'>+#define DRV_RELDATE	"June 23, 2006"</div><div class='add'>+#define DRV_AUTHOR	"David S. Miller (davem@davemloft.net)"</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='ctx'> 	DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";</div><div class='hunk'>@@ -83,8 +80,6 @@ static int macaddr[6];</div><div class='ctx'> module_param_array(macaddr, int, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set");</div><div class='ctx'> </div><div class='del'>-static struct happy_meal *root_happy_dev;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='ctx'> static struct quattro *qfe_sbus_list;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -181,26 +176,6 @@ static __inline__ void tx_dump_ring(struct happy_meal *hp)</div><div class='ctx'> #define DEFAULT_IPG2       4 /* For all modes */</div><div class='ctx'> #define DEFAULT_JAMSIZE    4 /* Toe jam */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PCI) &amp;&amp; defined(MODULE)</div><div class='del'>-/* This happy_pci_ids is declared __initdata because it is only used</div><div class='del'>-   as an advisory to depmod.  If this is ported to the new PCI interface</div><div class='del'>-   where it could be referenced at any time due to hot plugging,</div><div class='del'>-   the __initdata reference should be removed. */</div><div class='del'>-</div><div class='del'>-static struct pci_device_id happymeal_pci_ids[] = {</div><div class='del'>-	{</div><div class='del'>-	  .vendor	= PCI_VENDOR_ID_SUN,</div><div class='del'>-	  .device	= PCI_DEVICE_ID_SUN_HAPPYMEAL,</div><div class='del'>-	  .subvendor	= PCI_ANY_ID,</div><div class='del'>-	  .subdevice	= PCI_ANY_ID,</div><div class='del'>-	},</div><div class='del'>-	{ }			/* Terminating entry */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, happymeal_pci_ids);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* NOTE: In the descriptor writes one _must_ write the address</div><div class='ctx'>  *	 member _first_.  The card must not be allowed to see</div><div class='ctx'>  *	 the updated descriptor flags until the address is</div><div class='hunk'>@@ -1610,7 +1585,7 @@ static int happy_meal_init(struct happy_meal *hp)</div><div class='ctx'> 	HMD(("happy_meal_init: old[%08x] bursts&lt;",</div><div class='ctx'> 	     hme_read32(hp, gregs + GREG_CFG)));</div><div class='ctx'> </div><div class='del'>-#ifndef __sparc__</div><div class='add'>+#ifndef CONFIG_SPARC</div><div class='ctx'> 	/* It is always PCI and can handle 64byte bursts. */</div><div class='ctx'> 	hme_write32(hp, gregs + GREG_CFG, GREG_CFG_BURST64);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1647,7 +1622,7 @@ static int happy_meal_init(struct happy_meal *hp)</div><div class='ctx'> 		HMD(("XXX&gt;"));</div><div class='ctx'> 		hme_write32(hp, gregs + GREG_CFG, 0);</div><div class='ctx'> 	}</div><div class='del'>-#endif /* __sparc__ */</div><div class='add'>+#endif /* CONFIG_SPARC */</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off interrupts we do not want to hear. */</div><div class='ctx'> 	HMD((", enable global interrupts, "));</div><div class='hunk'>@@ -2219,15 +2194,10 @@ static int happy_meal_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((hp-&gt;happy_flags &amp; (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) {</div><div class='ctx'> 		if (request_irq(dev-&gt;irq, &amp;happy_meal_interrupt,</div><div class='del'>-				SA_SHIRQ, dev-&gt;name, (void *)dev)) {</div><div class='add'>+				IRQF_SHARED, dev-&gt;name, (void *)dev)) {</div><div class='ctx'> 			HMD(("EAGAIN\n"));</div><div class='del'>-#ifdef __sparc__</div><div class='del'>-			printk(KERN_ERR "happy_meal(SBUS): Can't order irq %s to go.\n",</div><div class='del'>-			       __irq_itoa(dev-&gt;irq));</div><div class='del'>-#else</div><div class='ctx'> 			printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",</div><div class='ctx'> 			       dev-&gt;irq);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2552,7 +2522,7 @@ static struct ethtool_ops hme_ethtool_ops = {</div><div class='ctx'> static int hme_version_printed;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-void __init quattro_get_ranges(struct quattro *qp)</div><div class='add'>+void __devinit quattro_get_ranges(struct quattro *qp)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbus_dev *sdev = qp-&gt;quattro_dev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2568,7 +2538,7 @@ void __init quattro_get_ranges(struct quattro *qp)</div><div class='ctx'> 	qp-&gt;nranges = (err / sizeof(struct linux_prom_ranges));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp)</div><div class='add'>+static void __devinit quattro_apply_ranges(struct quattro *qp, struct happy_meal *hp)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbus_dev *sdev = hp-&gt;happy_dev;</div><div class='ctx'> 	int rng;</div><div class='hunk'>@@ -2595,16 +2565,12 @@ static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *h</div><div class='ctx'>  *</div><div class='ctx'>  * Return NULL on failure.</div><div class='ctx'>  */</div><div class='del'>-static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev)</div><div class='add'>+static struct quattro * __devinit quattro_sbus_find(struct sbus_dev *goal_sdev)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='ctx'> 	struct sbus_dev *sdev;</div><div class='ctx'> 	struct quattro *qp;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (qfe_sbus_list == NULL)</div><div class='del'>-		goto found;</div><div class='del'>-</div><div class='ctx'> 	for (qp = qfe_sbus_list; qp != NULL; qp = qp-&gt;next) {</div><div class='ctx'> 		for (i = 0, sdev = qp-&gt;quattro_dev;</div><div class='ctx'> 		     (sdev != NULL) &amp;&amp; (i &lt; 4);</div><div class='hunk'>@@ -2613,17 +2579,7 @@ static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev)</div><div class='ctx'> 				return qp;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			if (sdev == goal_sdev)</div><div class='del'>-				goto found;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* Cannot find quattro parent, fail. */</div><div class='del'>-	return NULL;</div><div class='del'>-</div><div class='del'>-found:</div><div class='ctx'> 	qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);</div><div class='ctx'> 	if (qp != NULL) {</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -2652,7 +2608,7 @@ static void __init quattro_sbus_register_irqs(void)</div><div class='ctx'> </div><div class='ctx'> 		err = request_irq(sdev-&gt;irqs[0],</div><div class='ctx'> 				  quattro_sbus_interrupt,</div><div class='del'>-				  SA_SHIRQ, "Quattro",</div><div class='add'>+				  IRQF_SHARED, "Quattro",</div><div class='ctx'> 				  qp);</div><div class='ctx'> 		if (err != 0) {</div><div class='ctx'> 			printk(KERN_ERR "Quattro: Fatal IRQ registery error %d.\n", err);</div><div class='hunk'>@@ -2660,6 +2616,17 @@ static void __init quattro_sbus_register_irqs(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void quattro_sbus_free_irqs(void)</div><div class='add'>+{</div><div class='add'>+	struct quattro *qp;</div><div class='add'>+</div><div class='add'>+	for (qp = qfe_sbus_list; qp != NULL; qp = qp-&gt;next) {</div><div class='add'>+		struct sbus_dev *sdev = qp-&gt;quattro_dev;</div><div class='add'>+</div><div class='add'>+		free_irq(sdev-&gt;irqs[0], qp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_SBUS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='hunk'>@@ -2694,8 +2661,9 @@ static struct quattro * __init quattro_pci_find(struct pci_dev *pdev)</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SBUS</div><div class='del'>-static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='add'>+static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='ctx'> 	struct quattro *qp = NULL;</div><div class='ctx'> 	struct happy_meal *hp;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -2718,6 +2686,7 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='ctx'> </div><div class='ctx'> 	if (hme_version_printed++ == 0)</div><div class='ctx'> 		printk(KERN_INFO "%s", version);</div><div class='hunk'>@@ -2733,13 +2702,16 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> 		for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 			dev-&gt;dev_addr[i] = macaddr[i];</div><div class='ctx'> 		macaddr[5]++;</div><div class='del'>-	} else if (qfe_slot != -1 &amp;&amp;</div><div class='del'>-		   prom_getproplen(sdev-&gt;prom_node,</div><div class='del'>-				   "local-mac-address") == 6) {</div><div class='del'>-		prom_getproperty(sdev-&gt;prom_node, "local-mac-address",</div><div class='del'>-				 dev-&gt;dev_addr, 6);</div><div class='ctx'> 	} else {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, idprom-&gt;id_ethaddr, 6);</div><div class='add'>+		unsigned char *addr;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		addr = of_get_property(dp, "local-mac-address", &amp;len);</div><div class='add'>+</div><div class='add'>+		if (qfe_slot != -1 &amp;&amp; addr &amp;&amp; len == 6)</div><div class='add'>+			memcpy(dev-&gt;dev_addr, addr, 6);</div><div class='add'>+		else</div><div class='add'>+			memcpy(dev-&gt;dev_addr, idprom-&gt;id_ethaddr, 6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hp = dev-&gt;priv;</div><div class='hunk'>@@ -2750,9 +2722,8 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> </div><div class='ctx'> 	err = -ENODEV;</div><div class='ctx'> 	if (sdev-&gt;num_registers != 5) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Device does not have 5 regs, it has %d.\n",</div><div class='add'>+		printk(KERN_ERR "happymeal: Device needs 5 regs, has %d.\n",</div><div class='ctx'> 		       sdev-&gt;num_registers);</div><div class='del'>-		printk(KERN_ERR "happymeal: Would you like that for here or to go?\n");</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2766,39 +2737,39 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> 	hp-&gt;gregs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='ctx'> 				 GREG_REG_SIZE, "HME Global Regs");</div><div class='ctx'> 	if (!hp-&gt;gregs) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Cannot map Happy Meal global registers.\n");</div><div class='add'>+		printk(KERN_ERR "happymeal: Cannot map global registers.\n");</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;etxregs = sbus_ioremap(&amp;sdev-&gt;resource[1], 0,</div><div class='ctx'> 				   ETX_REG_SIZE, "HME TX Regs");</div><div class='ctx'> 	if (!hp-&gt;etxregs) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Cannot map Happy Meal MAC Transmit registers.\n");</div><div class='add'>+		printk(KERN_ERR "happymeal: Cannot map MAC TX registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;erxregs = sbus_ioremap(&amp;sdev-&gt;resource[2], 0,</div><div class='ctx'> 				   ERX_REG_SIZE, "HME RX Regs");</div><div class='ctx'> 	if (!hp-&gt;erxregs) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Cannot map Happy Meal MAC Receive registers.\n");</div><div class='add'>+		printk(KERN_ERR "happymeal: Cannot map MAC RX registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;bigmacregs = sbus_ioremap(&amp;sdev-&gt;resource[3], 0,</div><div class='ctx'> 				      BMAC_REG_SIZE, "HME BIGMAC Regs");</div><div class='ctx'> 	if (!hp-&gt;bigmacregs) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Cannot map Happy Meal BIGMAC registers.\n");</div><div class='add'>+		printk(KERN_ERR "happymeal: Cannot map BIGMAC registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;tcvregs = sbus_ioremap(&amp;sdev-&gt;resource[4], 0,</div><div class='ctx'> 				   TCVR_REG_SIZE, "HME Tranceiver Regs");</div><div class='ctx'> 	if (!hp-&gt;tcvregs) {</div><div class='del'>-		printk(KERN_ERR "happymeal: Cannot map Happy Meal Tranceiver registers.\n");</div><div class='add'>+		printk(KERN_ERR "happymeal: Cannot map TCVR registers.\n");</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hp-&gt;hm_revision = prom_getintdefault(sdev-&gt;prom_node, "hm-rev", 0xff);</div><div class='add'>+	hp-&gt;hm_revision = of_getintprop_default(dp, "hm-rev", 0xff);</div><div class='ctx'> 	if (hp-&gt;hm_revision == 0xff)</div><div class='ctx'> 		hp-&gt;hm_revision = 0xa0;</div><div class='ctx'> </div><div class='hunk'>@@ -2812,8 +2783,8 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> 		hp-&gt;happy_flags |= HFLAG_QUATTRO;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the supported DVMA burst sizes from our Happy SBUS. */</div><div class='del'>-	hp-&gt;happy_bursts = prom_getintdefault(sdev-&gt;bus-&gt;prom_node,</div><div class='del'>-					      "burst-sizes", 0x00);</div><div class='add'>+	hp-&gt;happy_bursts = of_getintprop_default(sdev-&gt;bus-&gt;ofdev.node,</div><div class='add'>+						 "burst-sizes", 0x00);</div><div class='ctx'> </div><div class='ctx'> 	hp-&gt;happy_block = sbus_alloc_consistent(hp-&gt;happy_dev,</div><div class='ctx'> 						PAGE_SIZE,</div><div class='hunk'>@@ -2876,6 +2847,8 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> 		goto err_out_free_consistent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, hp);</div><div class='add'>+</div><div class='ctx'> 	if (qfe_slot != -1)</div><div class='ctx'> 		printk(KERN_INFO "%s: Quattro HME slot %d (SBUS) 10/100baseT Ethernet ",</div><div class='ctx'> 		       dev-&gt;name, qfe_slot);</div><div class='hunk'>@@ -2888,12 +2861,6 @@ static int __init happy_meal_sbus_init(struct sbus_dev *sdev, int is_qfe)</div><div class='ctx'> 		       dev-&gt;dev_addr[i], i == 5 ? ' ' : ':');</div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='del'>-	/* We are home free at this point, link us in to the happy</div><div class='del'>-	 * device list.</div><div class='del'>-	 */</div><div class='del'>-	hp-&gt;next_module = root_happy_dev;</div><div class='del'>-	root_happy_dev = hp;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_free_consistent:</div><div class='hunk'>@@ -2923,7 +2890,7 @@ err_out:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-#ifndef __sparc__</div><div class='add'>+#ifndef CONFIG_SPARC</div><div class='ctx'> static int is_quattro_p(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *busdev = pdev-&gt;bus-&gt;self;</div><div class='hunk'>@@ -3011,14 +2978,14 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)</div><div class='ctx'> 	get_random_bytes(&amp;dev_addr[3], 3);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='del'>-#endif /* !(__sparc__) */</div><div class='add'>+#endif /* !(CONFIG_SPARC) */</div><div class='ctx'> </div><div class='del'>-static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='add'>+static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,</div><div class='add'>+					  const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct quattro *qp = NULL;</div><div class='del'>-#ifdef __sparc__</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='ctx'> 	struct pcidev_cookie *pcp;</div><div class='del'>-	int node;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct happy_meal *hp;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -3029,15 +2996,14 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Now make sure pci_dev cookie is there. */</div><div class='del'>-#ifdef __sparc__</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='ctx'> 	pcp = pdev-&gt;sysdata;</div><div class='del'>-	if (pcp == NULL || pcp-&gt;prom_node == -1) {</div><div class='add'>+	if (pcp == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	node = pcp-&gt;prom_node;</div><div class='ctx'> 	</div><div class='del'>-	prom_getstring(node, "name", prom_name, sizeof(prom_name));</div><div class='add'>+	strcpy(prom_name, pcp-&gt;prom_node-&gt;name);</div><div class='ctx'> #else</div><div class='ctx'> 	if (is_quattro_p(pdev))</div><div class='ctx'> 		strcpy(prom_name, "SUNW,qfe");</div><div class='hunk'>@@ -3108,11 +3074,15 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='ctx'> 			dev-&gt;dev_addr[i] = macaddr[i];</div><div class='ctx'> 		macaddr[5]++;</div><div class='ctx'> 	} else {</div><div class='del'>-#ifdef __sparc__</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='add'>+		unsigned char *addr;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='ctx'> 		if (qfe_slot != -1 &amp;&amp;</div><div class='del'>-		    prom_getproplen(node, "local-mac-address") == 6) {</div><div class='del'>-			prom_getproperty(node, "local-mac-address",</div><div class='del'>-					 dev-&gt;dev_addr, 6);</div><div class='add'>+		    (addr = of_get_property(pcp-&gt;prom_node,</div><div class='add'>+					    "local-mac-address", &amp;len)) != NULL</div><div class='add'>+		    &amp;&amp; len == 6) {</div><div class='add'>+			memcpy(dev-&gt;dev_addr, addr, 6);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memcpy(dev-&gt;dev_addr, idprom-&gt;id_ethaddr, 6);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3128,8 +3098,8 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='ctx'> 	hp-&gt;bigmacregs = (hpreg_base + 0x6000UL);</div><div class='ctx'> 	hp-&gt;tcvregs    = (hpreg_base + 0x7000UL);</div><div class='ctx'> </div><div class='del'>-#ifdef __sparc__</div><div class='del'>-	hp-&gt;hm_revision = prom_getintdefault(node, "hm-rev", 0xff);</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='add'>+	hp-&gt;hm_revision = of_getintprop_default(pcp-&gt;prom_node, "hm-rev", 0xff);</div><div class='ctx'> 	if (hp-&gt;hm_revision == 0xff) {</div><div class='ctx'> 		unsigned char prev;</div><div class='ctx'> </div><div class='hunk'>@@ -3153,7 +3123,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='ctx'> 	/* And of course, indicate this is PCI. */</div><div class='ctx'> 	hp-&gt;happy_flags |= HFLAG_PCI;</div><div class='ctx'> </div><div class='del'>-#ifdef __sparc__</div><div class='add'>+#ifdef CONFIG_SPARC</div><div class='ctx'> 	/* Assume PCI happy meals can handle all burst sizes. */</div><div class='ctx'> 	hp-&gt;happy_bursts = DMA_BURSTBITS;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3216,6 +3186,8 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, hp);</div><div class='add'>+</div><div class='ctx'> 	if (!qfe_slot) {</div><div class='ctx'> 		struct pci_dev *qpdev = qp-&gt;quattro_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -3245,12 +3217,6 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	printk("\n");</div><div class='ctx'> </div><div class='del'>-	/* We are home free at this point, link us in to the happy</div><div class='del'>-	 * device list.</div><div class='del'>-	 */</div><div class='del'>-	hp-&gt;next_module = root_happy_dev;</div><div class='del'>-	root_happy_dev = hp;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_iounmap:</div><div class='hunk'>@@ -3268,136 +3234,146 @@ err_out_clear_quattro:</div><div class='ctx'> err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-static int __init happy_meal_sbus_probe(void)</div><div class='add'>+static void __devexit happy_meal_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='del'>-	int cards = 0;</div><div class='del'>-	char model[128];</div><div class='del'>-</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			char *name = sdev-&gt;prom_name;</div><div class='del'>-</div><div class='del'>-			if (!strcmp(name, "SUNW,hme")) {</div><div class='del'>-				cards++;</div><div class='del'>-				prom_getstring(sdev-&gt;prom_node, "model",</div><div class='del'>-					       model, sizeof(model));</div><div class='del'>-				if (!strcmp(model, "SUNW,sbus-qfe"))</div><div class='del'>-					happy_meal_sbus_init(sdev, 1);</div><div class='del'>-				else</div><div class='del'>-					happy_meal_sbus_init(sdev, 0);</div><div class='del'>-			} else if (!strcmp(name, "qfe") ||</div><div class='del'>-				   !strcmp(name, "SUNW,qfe")) {</div><div class='del'>-				cards++;</div><div class='del'>-				happy_meal_sbus_init(sdev, 1);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (cards != 0)</div><div class='del'>-		quattro_sbus_register_irqs();</div><div class='del'>-	return cards;</div><div class='add'>+	struct happy_meal *hp = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = hp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	unregister_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	pci_free_consistent(hp-&gt;happy_dev,</div><div class='add'>+			    PAGE_SIZE,</div><div class='add'>+			    hp-&gt;happy_block,</div><div class='add'>+			    hp-&gt;hblock_dvma);</div><div class='add'>+	iounmap(hp-&gt;gregs);</div><div class='add'>+	pci_release_regions(hp-&gt;happy_dev);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-static int __init happy_meal_pci_probe(void)</div><div class='add'>+static struct pci_device_id happymeal_pci_ids[] = {</div><div class='add'>+	{</div><div class='add'>+	  .vendor	= PCI_VENDOR_ID_SUN,</div><div class='add'>+	  .device	= PCI_DEVICE_ID_SUN_HAPPYMEAL,</div><div class='add'>+	  .subvendor	= PCI_ANY_ID,</div><div class='add'>+	  .subdevice	= PCI_ANY_ID,</div><div class='add'>+	},</div><div class='add'>+	{ }			/* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, happymeal_pci_ids);</div><div class='add'>+</div><div class='add'>+static struct pci_driver hme_pci_driver = {</div><div class='add'>+	.name		= "hme",</div><div class='add'>+	.id_table	= happymeal_pci_ids,</div><div class='add'>+	.probe		= happy_meal_pci_probe,</div><div class='add'>+	.remove		= __devexit_p(happy_meal_pci_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init happy_meal_pci_init(void)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = NULL;</div><div class='del'>-	int cards = 0;</div><div class='add'>+	return pci_module_init(&amp;hme_pci_driver);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	while ((pdev = pci_find_device(PCI_VENDOR_ID_SUN,</div><div class='del'>-				       PCI_DEVICE_ID_SUN_HAPPYMEAL, pdev)) != NULL) {</div><div class='del'>-		if (pci_enable_device(pdev))</div><div class='del'>-			continue;</div><div class='del'>-		pci_set_master(pdev);</div><div class='del'>-		cards++;</div><div class='del'>-		happy_meal_pci_init(pdev);</div><div class='add'>+static void happy_meal_pci_exit(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;hme_pci_driver);</div><div class='add'>+</div><div class='add'>+	while (qfe_pci_list) {</div><div class='add'>+		struct quattro *qfe = qfe_pci_list;</div><div class='add'>+		struct quattro *next = qfe-&gt;next;</div><div class='add'>+</div><div class='add'>+		kfree(qfe);</div><div class='add'>+</div><div class='add'>+		qfe_pci_list = next;</div><div class='ctx'> 	}</div><div class='del'>-	return cards;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init happy_meal_probe(void)</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	static int called = 0;</div><div class='del'>-	int cards;</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	char *model = of_get_property(dp, "model", NULL);</div><div class='add'>+	int is_qfe = (match-&gt;data != NULL);</div><div class='ctx'> </div><div class='del'>-	root_happy_dev = NULL;</div><div class='add'>+	if (!is_qfe &amp;&amp; model &amp;&amp; !strcmp(model, "SUNW,sbus-qfe"))</div><div class='add'>+		is_qfe = 1;</div><div class='ctx'> </div><div class='del'>-	if (called)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	called++;</div><div class='add'>+	return happy_meal_sbus_probe_one(sdev, is_qfe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit hme_sbus_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct happy_meal *hp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = hp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	unregister_netdevice(net_dev);</div><div class='add'>+</div><div class='add'>+	/* XXX qfe parent interrupt... */</div><div class='add'>+</div><div class='add'>+	sbus_iounmap(hp-&gt;gregs, GREG_REG_SIZE);</div><div class='add'>+	sbus_iounmap(hp-&gt;etxregs, ETX_REG_SIZE);</div><div class='add'>+	sbus_iounmap(hp-&gt;erxregs, ERX_REG_SIZE);</div><div class='add'>+	sbus_iounmap(hp-&gt;bigmacregs, BMAC_REG_SIZE);</div><div class='add'>+	sbus_iounmap(hp-&gt;tcvregs, TCVR_REG_SIZE);</div><div class='add'>+	sbus_free_consistent(hp-&gt;happy_dev,</div><div class='add'>+			     PAGE_SIZE,</div><div class='add'>+			     hp-&gt;happy_block,</div><div class='add'>+			     hp-&gt;hblock_dvma);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='del'>-	cards = 0;</div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-	cards += happy_meal_sbus_probe();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	cards += happy_meal_pci_probe();</div><div class='del'>-#endif</div><div class='del'>-	if (!cards)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct of_device_id hme_sbus_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,hme",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,qfe",</div><div class='add'>+		.data = (void *) 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "qfe",</div><div class='add'>+		.data = (void *) 1,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void __exit happy_meal_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-	struct quattro *last_seen_qfe = NULL;</div><div class='del'>-#endif</div><div class='add'>+MODULE_DEVICE_TABLE(of, hme_sbus_match);</div><div class='ctx'> </div><div class='del'>-	while (root_happy_dev) {</div><div class='del'>-		struct happy_meal *hp = root_happy_dev;</div><div class='del'>-		struct happy_meal *next = root_happy_dev-&gt;next_module;</div><div class='del'>-		struct net_device *dev = hp-&gt;dev;</div><div class='add'>+static struct of_platform_driver hme_sbus_driver = {</div><div class='add'>+	.name		= "hme",</div><div class='add'>+	.match_table	= hme_sbus_match,</div><div class='add'>+	.probe		= hme_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(hme_sbus_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		/* Unregister netdev before unmapping registers as this</div><div class='del'>-		 * call can end up trying to access those registers.</div><div class='del'>-		 */</div><div class='del'>-		unregister_netdev(dev);</div><div class='add'>+static int __init happy_meal_sbus_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='del'>-		if (!(hp-&gt;happy_flags &amp; HFLAG_PCI)) {</div><div class='del'>-			if (hp-&gt;happy_flags &amp; HFLAG_QUATTRO) {</div><div class='del'>-				if (hp-&gt;qfe_parent != last_seen_qfe) {</div><div class='del'>-					free_irq(dev-&gt;irq, hp-&gt;qfe_parent);</div><div class='del'>-					last_seen_qfe = hp-&gt;qfe_parent;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+	err = of_register_driver(&amp;hme_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+	if (!err)</div><div class='add'>+		quattro_sbus_register_irqs();</div><div class='ctx'> </div><div class='del'>-			sbus_iounmap(hp-&gt;gregs, GREG_REG_SIZE);</div><div class='del'>-			sbus_iounmap(hp-&gt;etxregs, ETX_REG_SIZE);</div><div class='del'>-			sbus_iounmap(hp-&gt;erxregs, ERX_REG_SIZE);</div><div class='del'>-			sbus_iounmap(hp-&gt;bigmacregs, BMAC_REG_SIZE);</div><div class='del'>-			sbus_iounmap(hp-&gt;tcvregs, TCVR_REG_SIZE);</div><div class='del'>-			sbus_free_consistent(hp-&gt;happy_dev,</div><div class='del'>-					     PAGE_SIZE,</div><div class='del'>-					     hp-&gt;happy_block,</div><div class='del'>-					     hp-&gt;hblock_dvma);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-		if ((hp-&gt;happy_flags &amp; HFLAG_PCI)) {</div><div class='del'>-			pci_free_consistent(hp-&gt;happy_dev,</div><div class='del'>-					    PAGE_SIZE,</div><div class='del'>-					    hp-&gt;happy_block,</div><div class='del'>-					    hp-&gt;hblock_dvma);</div><div class='del'>-			iounmap(hp-&gt;gregs);</div><div class='del'>-			pci_release_regions(hp-&gt;happy_dev);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		free_netdev(dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		root_happy_dev = next;</div><div class='del'>-	}</div><div class='add'>+static void happy_meal_sbus_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;hme_sbus_driver);</div><div class='add'>+	quattro_sbus_free_irqs();</div><div class='ctx'> </div><div class='del'>-	/* Now cleanup the quattro lists. */</div><div class='del'>-#ifdef CONFIG_SBUS</div><div class='ctx'> 	while (qfe_sbus_list) {</div><div class='ctx'> 		struct quattro *qfe = qfe_sbus_list;</div><div class='ctx'> 		struct quattro *next = qfe-&gt;next;</div><div class='hunk'>@@ -3406,18 +3382,39 @@ static void __exit happy_meal_cleanup_module(void)</div><div class='ctx'> </div><div class='ctx'> 		qfe_sbus_list = next;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	while (qfe_pci_list) {</div><div class='del'>-		struct quattro *qfe = qfe_pci_list;</div><div class='del'>-		struct quattro *next = qfe-&gt;next;</div><div class='ctx'> </div><div class='del'>-		kfree(qfe);</div><div class='add'>+static int __init happy_meal_probe(void)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-		qfe_pci_list = next;</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	err = happy_meal_sbus_init();</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = happy_meal_pci_init();</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+		if (err)</div><div class='add'>+			happy_meal_sbus_exit();</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __exit happy_meal_exit(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SBUS</div><div class='add'>+	happy_meal_sbus_exit();</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	happy_meal_pci_exit();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(happy_meal_probe);</div><div class='del'>-module_exit(happy_meal_cleanup_module);</div><div class='add'>+module_exit(happy_meal_exit);</div><div class='head'>diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h<br/>index 34e9f953cea4..90f446db9ba2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sunhme.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunhme.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sunhme.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sunhme.h</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'> #ifndef _SUNHME_H</div><div class='ctx'> #define _SUNHME_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Happy Meal global registers. */</div><div class='hunk'>@@ -461,7 +460,6 @@ struct happy_meal {</div><div class='ctx'> 	struct net_device	 *dev;		/* Backpointer                       */</div><div class='ctx'> 	struct quattro		 *qfe_parent;	/* For Quattro cards                 */</div><div class='ctx'> 	int			  qfe_ent;	/* Which instance on quattro         */</div><div class='del'>-	struct happy_meal         *next_module;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Here are the happy flags. */</div><div class='head'>diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c<br/>index b7d87d4690b4..1ef9fd39a79a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sunlance.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunlance.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sunlance.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sunlance.c</a></div><div class='hunk'>@@ -71,7 +71,6 @@</div><div class='ctx'> </div><div class='ctx'> static char lancestr[] = "LANCE";</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -266,7 +265,6 @@ struct lance_private {</div><div class='ctx'> 	char	       	       *name;</div><div class='ctx'> 	dma_addr_t		init_block_dvma;</div><div class='ctx'> 	struct net_device      *dev;		  /* Backpointer	*/</div><div class='del'>-	struct lance_private   *next_module;</div><div class='ctx'> 	struct sbus_dev	       *sdev;</div><div class='ctx'> 	struct timer_list       multicast_timer;</div><div class='ctx'> };</div><div class='hunk'>@@ -298,8 +296,6 @@ int sparc_lance_debug = 2;</div><div class='ctx'> </div><div class='ctx'> #define LANCE_ADDR(x) ((long)(x) &amp; ~0xff000000)</div><div class='ctx'> </div><div class='del'>-static struct lance_private *root_lance_dev;</div><div class='del'>-</div><div class='ctx'> /* Load the CSR registers */</div><div class='ctx'> static void load_csrs(struct lance_private *lp)</div><div class='ctx'> {</div><div class='hunk'>@@ -934,9 +930,9 @@ static int lance_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	STOP_LANCE(lp);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, &amp;lance_interrupt, SA_SHIRQ,</div><div class='add'>+	if (request_irq(dev-&gt;irq, &amp;lance_interrupt, IRQF_SHARED,</div><div class='ctx'> 			lancestr, (void *) dev)) {</div><div class='del'>-		printk(KERN_ERR "Lance: Can't get irq %s\n", __irq_itoa(dev-&gt;irq));</div><div class='add'>+		printk(KERN_ERR "Lance: Can't get irq %d\n", dev-&gt;irq);</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1327,9 +1323,9 @@ static struct ethtool_ops sparc_lance_ethtool_ops = {</div><div class='ctx'> 	.get_link		= sparc_lance_get_link,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sparc_lance_init(struct sbus_dev *sdev,</div><div class='del'>-				   struct sbus_dma *ledma,</div><div class='del'>-				   struct sbus_dev *lebuffer)</div><div class='add'>+static int __init sparc_lance_probe_one(struct sbus_dev *sdev,</div><div class='add'>+					struct sbus_dma *ledma,</div><div class='add'>+					struct sbus_dev *lebuffer)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned version_printed;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -1473,6 +1469,7 @@ no_link_test:</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;dev = dev;</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='ctx'> 	dev-&gt;open = &amp;lance_open;</div><div class='ctx'> 	dev-&gt;stop = &amp;lance_close;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = &amp;lance_start_xmit;</div><div class='hunk'>@@ -1500,8 +1497,7 @@ no_link_test:</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;next_module = root_lance_dev;</div><div class='del'>-	root_lance_dev = lp;</div><div class='add'>+	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, lp);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: LANCE ", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -1536,88 +1532,112 @@ static inline struct sbus_dma *find_ledma(struct sbus_dev *sdev)</div><div class='ctx'> #include &lt;asm/machines.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Find all the lance cards on the system and initialize them */</div><div class='del'>-static int __init sparc_lance_probe(void)</div><div class='add'>+static struct sbus_dev sun4_sdev;</div><div class='add'>+static int __init sparc_lance_init(void)</div><div class='ctx'> {</div><div class='del'>-	static struct sbus_dev sdev;</div><div class='del'>-	static int called;</div><div class='del'>-</div><div class='del'>-	root_lance_dev = NULL;</div><div class='del'>-</div><div class='del'>-	if (called)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	called++;</div><div class='del'>-</div><div class='ctx'> 	if ((idprom-&gt;id_machtype == (SM_SUN4|SM_4_330)) ||</div><div class='ctx'> 	    (idprom-&gt;id_machtype == (SM_SUN4|SM_4_470))) {</div><div class='del'>-		memset(&amp;sdev, 0, sizeof(sdev));</div><div class='del'>-		sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;</div><div class='del'>-		sdev.irqs[0] = 6;</div><div class='del'>-		return sparc_lance_init(&amp;sdev, NULL, NULL);</div><div class='add'>+		memset(&amp;sun4_sdev, 0, sizeof(sdev));</div><div class='add'>+		sun4_sdev.reg_addrs[0].phys_addr = sun4_eth_physaddr;</div><div class='add'>+		sun4_sdev.irqs[0] = 6;</div><div class='add'>+		return sparc_lance_probe_one(&amp;sun4_sdev, NULL, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_SUN4 */</div><div class='del'>-</div><div class='del'>-/* Find all the lance cards on the system and initialize them */</div><div class='del'>-static int __init sparc_lance_probe(void)</div><div class='add'>+static int __exit sunlance_sun4_remove(void)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *bus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	struct sbus_dma *ledma = NULL;</div><div class='del'>-	static int called;</div><div class='del'>-	int cards = 0, v;</div><div class='del'>-</div><div class='del'>-	root_lance_dev = NULL;</div><div class='del'>-</div><div class='del'>-	if (called)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	called++;</div><div class='del'>-</div><div class='del'>-	for_each_sbus (bus) {</div><div class='del'>-		for_each_sbusdev (sdev, bus) {</div><div class='del'>-			if (strcmp(sdev-&gt;prom_name, "le") == 0) {</div><div class='del'>-				cards++;</div><div class='del'>-				if ((v = sparc_lance_init(sdev, NULL, NULL)))</div><div class='del'>-					return v;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (strcmp(sdev-&gt;prom_name, "ledma") == 0) {</div><div class='del'>-				cards++;</div><div class='del'>-				ledma = find_ledma(sdev);</div><div class='del'>-				if ((v = sparc_lance_init(sdev-&gt;child,</div><div class='del'>-							  ledma, NULL)))</div><div class='del'>-					return v;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (strcmp(sdev-&gt;prom_name, "lebuffer") == 0){</div><div class='del'>-				cards++;</div><div class='del'>-				if ((v = sparc_lance_init(sdev-&gt;child,</div><div class='del'>-							  NULL, sdev)))</div><div class='del'>-					return v;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		} /* for each sbusdev */</div><div class='del'>-	} /* for each sbus */</div><div class='del'>-	if (!cards)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	struct lance_private *lp = dev_get_drvdata(&amp;sun4_sdev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = lp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	unregister_netdevice(net_dev);</div><div class='add'>+</div><div class='add'>+	lance_free_hwresources(root_lance_dev);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;sun4_sdev-&gt;dev, NULL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* !CONFIG_SUN4 */</div><div class='ctx'> </div><div class='del'>-static void __exit sparc_lance_cleanup(void)</div><div class='add'>+#else /* !CONFIG_SUN4 */</div><div class='add'>+</div><div class='add'>+static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp;</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(dp-&gt;name, "le")) {</div><div class='add'>+		err = sparc_lance_probe_one(sdev, NULL, NULL);</div><div class='add'>+	} else if (!strcmp(dp-&gt;name, "ledma")) {</div><div class='add'>+		struct sbus_dma *ledma = find_ledma(sdev);</div><div class='ctx'> </div><div class='del'>-	while (root_lance_dev) {</div><div class='del'>-		lp = root_lance_dev-&gt;next_module;</div><div class='add'>+		err = sparc_lance_probe_one(sdev-&gt;child, ledma, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		BUG_ON(strcmp(dp-&gt;name, "lebuffer"));</div><div class='ctx'> </div><div class='del'>-		unregister_netdev(root_lance_dev-&gt;dev);</div><div class='del'>-		lance_free_hwresources(root_lance_dev);</div><div class='del'>-		free_netdev(root_lance_dev-&gt;dev);</div><div class='del'>-		root_lance_dev = lp;</div><div class='add'>+		err = sparc_lance_probe_one(sdev-&gt;child, NULL, sdev);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit sunlance_sbus_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct lance_private *lp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = lp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	unregister_netdevice(net_dev);</div><div class='add'>+</div><div class='add'>+	lance_free_hwresources(lp);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id sunlance_sbus_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "le",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "ledma",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "lebuffer",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, sunlance_sbus_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver sunlance_sbus_driver = {</div><div class='add'>+	.name		= "sunlance",</div><div class='add'>+	.match_table	= sunlance_sbus_match,</div><div class='add'>+	.probe		= sunlance_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(sunlance_sbus_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Find all the lance cards on the system and initialize them */</div><div class='add'>+static int __init sparc_lance_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;sunlance_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+}</div><div class='add'>+#endif /* !CONFIG_SUN4 */</div><div class='add'>+</div><div class='add'>+static void __exit sparc_lance_exit(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SUN4</div><div class='add'>+	sunlance_sun4_remove();</div><div class='add'>+#else</div><div class='add'>+	of_unregister_driver(&amp;sunlance_sbus_driver);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sparc_lance_probe);</div><div class='del'>-module_exit(sparc_lance_cleanup);</div><div class='add'>+module_init(sparc_lance_init);</div><div class='add'>+module_exit(sparc_lance_exit);</div><div class='head'>diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c<br/>index 1f2323be60d4..817a40b66638 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/sunqe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/sunqe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/sunqe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/sunqe.c</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='del'>-/* $Id: sunqe.c,v 1.55 2002/01/15 06:48:55 davem Exp $</div><div class='del'>- * sunqe.c: Sparc QuadEthernet 10baseT SBUS card driver.</div><div class='add'>+/* sunqe.c: Sparc QuadEthernet 10baseT SBUS card driver.</div><div class='ctx'>  *          Once again I am out to prove that every ethernet</div><div class='ctx'>  *          controller out there can be most efficiently programmed</div><div class='ctx'>  *          if you make it look like a LANCE.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996, 1999, 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 1996, 1999, 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -41,9 +40,9 @@</div><div class='ctx'> #include "sunqe.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sunqe"</div><div class='del'>-#define DRV_VERSION	"3.0"</div><div class='del'>-#define DRV_RELDATE	"8/24/03"</div><div class='del'>-#define DRV_AUTHOR	"David S. Miller (davem@redhat.com)"</div><div class='add'>+#define DRV_VERSION	"4.0"</div><div class='add'>+#define DRV_RELDATE	"June 23, 2006"</div><div class='add'>+#define DRV_AUTHOR	"David S. Miller (davem@davemloft.net)"</div><div class='ctx'> </div><div class='ctx'> static char version[] =</div><div class='ctx'> 	DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";</div><div class='hunk'>@@ -755,298 +754,269 @@ static inline void qec_init_once(struct sunqec *qecp, struct sbus_dev *qsdev)</div><div class='ctx'> 		    qecp-&gt;gregs + GLOB_RSIZE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Four QE's per QEC card. */</div><div class='del'>-static int __init qec_ether_init(struct net_device *dev, struct sbus_dev *sdev)</div><div class='add'>+static u8 __init qec_get_burst(struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	static unsigned version_printed;</div><div class='del'>-	struct net_device *qe_devs[4];</div><div class='del'>-	struct sunqe *qeps[4];</div><div class='del'>-	struct sbus_dev *qesdevs[4];</div><div class='del'>-	struct sbus_dev *child;</div><div class='del'>-	struct sunqec *qecp = NULL;</div><div class='ctx'> 	u8 bsizes, bsizes_more;</div><div class='del'>-	int i, j, res = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		qe_devs[i] = alloc_etherdev(sizeof(struct sunqe));</div><div class='del'>-		if (!qe_devs[i])</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='add'>+	/* Find and set the burst sizes for the QEC, since it</div><div class='add'>+	 * does the actual dma for all 4 channels.</div><div class='add'>+	 */</div><div class='add'>+	bsizes = of_getintprop_default(dp, "burst-sizes", 0xff);</div><div class='add'>+	bsizes &amp;= 0xff;</div><div class='add'>+	bsizes_more = of_getintprop_default(dp-&gt;parent, "burst-sizes", 0xff);</div><div class='ctx'> </div><div class='del'>-	if (version_printed++ == 0)</div><div class='del'>-		printk(KERN_INFO "%s", version);</div><div class='add'>+	if (bsizes_more != 0xff)</div><div class='add'>+		bsizes &amp;= bsizes_more;</div><div class='add'>+	if (bsizes == 0xff || (bsizes &amp; DMA_BURST16) == 0 ||</div><div class='add'>+	    (bsizes &amp; DMA_BURST32)==0)</div><div class='add'>+		bsizes = (DMA_BURST32 - 1);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		qeps[i] = (struct sunqe *) qe_devs[i]-&gt;priv;</div><div class='del'>-		for (j = 0; j &lt; 6; j++)</div><div class='del'>-			qe_devs[i]-&gt;dev_addr[j] = idprom-&gt;id_ethaddr[j];</div><div class='del'>-		qeps[i]-&gt;channel = i;</div><div class='del'>-		spin_lock_init(&amp;qeps[i]-&gt;lock);</div><div class='del'>-	}</div><div class='add'>+	return bsizes;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	qecp = kmalloc(sizeof(struct sunqec), GFP_KERNEL);</div><div class='del'>-	if (qecp == NULL)</div><div class='del'>-		goto out1;</div><div class='del'>-	qecp-&gt;qec_sdev = sdev;</div><div class='add'>+static struct sunqec * __init get_qec(struct sbus_dev *child_sdev)</div><div class='add'>+{</div><div class='add'>+	struct sbus_dev *qec_sdev = child_sdev-&gt;parent;</div><div class='add'>+	struct sunqec *qecp;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		qecp-&gt;qes[i] = qeps[i];</div><div class='del'>-		qeps[i]-&gt;dev = qe_devs[i];</div><div class='del'>-		qeps[i]-&gt;parent = qecp;</div><div class='add'>+	for (qecp = root_qec_dev; qecp; qecp = qecp-&gt;next_module) {</div><div class='add'>+		if (qecp-&gt;qec_sdev == qec_sdev)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='add'>+	if (!qecp) {</div><div class='add'>+		qecp = kzalloc(sizeof(struct sunqec), GFP_KERNEL);</div><div class='add'>+		if (qecp) {</div><div class='add'>+			u32 ctrl;</div><div class='add'>+</div><div class='add'>+			qecp-&gt;qec_sdev = qec_sdev;</div><div class='add'>+			qecp-&gt;gregs = sbus_ioremap(&amp;qec_sdev-&gt;resource[0], 0,</div><div class='add'>+						   GLOB_REG_SIZE,</div><div class='add'>+						   "QEC Global Registers");</div><div class='add'>+			if (!qecp-&gt;gregs)</div><div class='add'>+				goto fail;</div><div class='add'>+</div><div class='add'>+			/* Make sure the QEC is in MACE mode. */</div><div class='add'>+			ctrl = sbus_readl(qecp-&gt;gregs + GLOB_CTRL);</div><div class='add'>+			ctrl &amp;= 0xf0000000;</div><div class='add'>+			if (ctrl != GLOB_CTRL_MMODE) {</div><div class='add'>+				printk(KERN_ERR "qec: Not in MACE mode!\n");</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	res = -ENODEV;</div><div class='add'>+			if (qec_global_reset(qecp-&gt;gregs))</div><div class='add'>+				goto fail;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, child = sdev-&gt;child; i &lt; 4; i++, child = child-&gt;next) {</div><div class='del'>-		/* Link in channel */</div><div class='del'>-		j = prom_getintdefault(child-&gt;prom_node, "channel#", -1);</div><div class='del'>-		if (j == -1)</div><div class='del'>-			goto out2;</div><div class='del'>-		qesdevs[j] = child;</div><div class='del'>-	}</div><div class='add'>+			qecp-&gt;qec_bursts = qec_get_burst(qec_sdev-&gt;ofdev.node);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		qeps[i]-&gt;qe_sdev = qesdevs[i];</div><div class='add'>+			qec_init_once(qecp, qec_sdev);</div><div class='ctx'> </div><div class='del'>-	/* Now map in the registers, QEC globals first. */</div><div class='del'>-	qecp-&gt;gregs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				   GLOB_REG_SIZE, "QEC Global Registers");</div><div class='del'>-	if (!qecp-&gt;gregs) {</div><div class='del'>-		printk(KERN_ERR "QuadEther: Cannot map QEC global registers.\n");</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='add'>+			if (request_irq(qec_sdev-&gt;irqs[0], &amp;qec_interrupt,</div><div class='add'>+					IRQF_SHARED, "qec", (void *) qecp)) {</div><div class='add'>+				printk(KERN_ERR "qec: Can't register irq.\n");</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	/* Make sure the QEC is in MACE mode. */</div><div class='del'>-	if ((sbus_readl(qecp-&gt;gregs + GLOB_CTRL) &amp; 0xf0000000) != GLOB_CTRL_MMODE) {</div><div class='del'>-		printk(KERN_ERR "QuadEther: AIEEE, QEC is not in MACE mode!\n");</div><div class='del'>-		goto out3;</div><div class='add'>+			qecp-&gt;next_module = root_qec_dev;</div><div class='add'>+			root_qec_dev = qecp;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Reset the QEC. */</div><div class='del'>-	if (qec_global_reset(qecp-&gt;gregs))</div><div class='del'>-		goto out3;</div><div class='add'>+	return qecp;</div><div class='ctx'> </div><div class='del'>-	/* Find and set the burst sizes for the QEC, since it does</div><div class='del'>-	 * the actual dma for all 4 channels.</div><div class='del'>-	 */</div><div class='del'>-	bsizes = prom_getintdefault(sdev-&gt;prom_node, "burst-sizes", 0xff);</div><div class='del'>-	bsizes &amp;= 0xff;</div><div class='del'>-	bsizes_more = prom_getintdefault(sdev-&gt;bus-&gt;prom_node, "burst-sizes", 0xff);</div><div class='add'>+fail:</div><div class='add'>+	if (qecp-&gt;gregs)</div><div class='add'>+		sbus_iounmap(qecp-&gt;gregs, GLOB_REG_SIZE);</div><div class='add'>+	kfree(qecp);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (bsizes_more != 0xff)</div><div class='del'>-		bsizes &amp;= bsizes_more;</div><div class='del'>-	if (bsizes == 0xff || (bsizes &amp; DMA_BURST16) == 0 ||</div><div class='del'>-	   (bsizes &amp; DMA_BURST32)==0)</div><div class='del'>-		bsizes = (DMA_BURST32 - 1);</div><div class='add'>+static int __init qec_ether_init(struct sbus_dev *sdev)</div><div class='add'>+{</div><div class='add'>+	static unsigned version_printed;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct sunqe *qe;</div><div class='add'>+	struct sunqec *qecp;</div><div class='add'>+	int i, res;</div><div class='ctx'> </div><div class='del'>-	qecp-&gt;qec_bursts = bsizes;</div><div class='add'>+	if (version_printed++ == 0)</div><div class='add'>+		printk(KERN_INFO "%s", version);</div><div class='ctx'> </div><div class='del'>-	/* Perform one time QEC initialization, we never touch the QEC</div><div class='del'>-	 * globals again after this.</div><div class='del'>-	 */</div><div class='del'>-	qec_init_once(qecp, sdev);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		struct sunqe *qe = qeps[i];</div><div class='del'>-		/* Map in QEC per-channel control registers. */</div><div class='del'>-		qe-&gt;qcregs = sbus_ioremap(&amp;qe-&gt;qe_sdev-&gt;resource[0], 0,</div><div class='del'>-				       CREG_REG_SIZE, "QEC Channel Registers");</div><div class='del'>-		if (!qe-&gt;qcregs) {</div><div class='del'>-			printk(KERN_ERR "QuadEther: Cannot map QE %d's channel registers.\n", i);</div><div class='del'>-			goto out4;</div><div class='del'>-		}</div><div class='add'>+	dev = alloc_etherdev(sizeof(struct sunqe));</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		/* Map in per-channel AMD MACE registers. */</div><div class='del'>-		qe-&gt;mregs = sbus_ioremap(&amp;qe-&gt;qe_sdev-&gt;resource[1], 0,</div><div class='del'>-				      MREGS_REG_SIZE, "QE MACE Registers");</div><div class='del'>-		if (!qe-&gt;mregs) {</div><div class='del'>-			printk(KERN_ERR "QuadEther: Cannot map QE %d's MACE registers.\n", i);</div><div class='del'>-			goto out4;</div><div class='del'>-		}</div><div class='add'>+	qe = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-		qe-&gt;qe_block = sbus_alloc_consistent(qe-&gt;qe_sdev,</div><div class='del'>-						  PAGE_SIZE,</div><div class='del'>-						  &amp;qe-&gt;qblock_dvma);</div><div class='del'>-		qe-&gt;buffers = sbus_alloc_consistent(qe-&gt;qe_sdev,</div><div class='del'>-						 sizeof(struct sunqe_buffers),</div><div class='del'>-						 &amp;qe-&gt;buffers_dvma);</div><div class='del'>-		if (qe-&gt;qe_block == NULL || qe-&gt;qblock_dvma == 0 ||</div><div class='del'>-		    qe-&gt;buffers == NULL || qe-&gt;buffers_dvma == 0) {</div><div class='del'>-			goto out4;</div><div class='add'>+	i = of_getintprop_default(sdev-&gt;ofdev.node, "channel#", -1);</div><div class='add'>+	if (i == -1) {</div><div class='add'>+		struct sbus_dev *td = sdev-&gt;parent-&gt;child;</div><div class='add'>+		i = 0;</div><div class='add'>+		while (td != sdev) {</div><div class='add'>+			td = td-&gt;next;</div><div class='add'>+			i++;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Stop this QE. */</div><div class='del'>-		qe_stop(qe);</div><div class='ctx'> 	}</div><div class='add'>+	qe-&gt;channel = i;</div><div class='add'>+	spin_lock_init(&amp;qe-&gt;lock);</div><div class='add'>+	</div><div class='add'>+	res = -ENODEV;</div><div class='add'>+	qecp = get_qec(sdev);</div><div class='add'>+	if (!qecp)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		SET_MODULE_OWNER(qe_devs[i]);</div><div class='del'>-		qe_devs[i]-&gt;open = qe_open;</div><div class='del'>-		qe_devs[i]-&gt;stop = qe_close;</div><div class='del'>-		qe_devs[i]-&gt;hard_start_xmit = qe_start_xmit;</div><div class='del'>-		qe_devs[i]-&gt;get_stats = qe_get_stats;</div><div class='del'>-		qe_devs[i]-&gt;set_multicast_list = qe_set_multicast;</div><div class='del'>-		qe_devs[i]-&gt;tx_timeout = qe_tx_timeout;</div><div class='del'>-		qe_devs[i]-&gt;watchdog_timeo = 5*HZ;</div><div class='del'>-		qe_devs[i]-&gt;irq = sdev-&gt;irqs[0];</div><div class='del'>-		qe_devs[i]-&gt;dma = 0;</div><div class='del'>-		qe_devs[i]-&gt;ethtool_ops = &amp;qe_ethtool_ops;</div><div class='del'>-	}</div><div class='add'>+	qecp-&gt;qes[qe-&gt;channel] = qe;</div><div class='add'>+	qe-&gt;dev = dev;</div><div class='add'>+	qe-&gt;parent = qecp;</div><div class='add'>+	qe-&gt;qe_sdev = sdev;</div><div class='ctx'> </div><div class='del'>-	/* QEC receives interrupts from each QE, then it sends the actual</div><div class='del'>-	 * IRQ to the cpu itself.  Since QEC is the single point of</div><div class='del'>-	 * interrupt for all QE channels we register the IRQ handler</div><div class='del'>-	 * for it now.</div><div class='del'>-	 */</div><div class='del'>-	if (request_irq(sdev-&gt;irqs[0], &amp;qec_interrupt,</div><div class='del'>-			SA_SHIRQ, "QuadEther", (void *) qecp)) {</div><div class='del'>-		printk(KERN_ERR "QuadEther: Can't register QEC master irq handler.\n");</div><div class='del'>-		res = -EAGAIN;</div><div class='del'>-		goto out4;</div><div class='add'>+	res = -ENOMEM;</div><div class='add'>+	qe-&gt;qcregs = sbus_ioremap(&amp;qe-&gt;qe_sdev-&gt;resource[0], 0,</div><div class='add'>+				  CREG_REG_SIZE, "QEC Channel Registers");</div><div class='add'>+	if (!qe-&gt;qcregs) {</div><div class='add'>+		printk(KERN_ERR "qe: Cannot map channel registers.\n");</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		if (register_netdev(qe_devs[i]) != 0)</div><div class='del'>-			goto out5;</div><div class='add'>+	qe-&gt;mregs = sbus_ioremap(&amp;qe-&gt;qe_sdev-&gt;resource[1], 0,</div><div class='add'>+				 MREGS_REG_SIZE, "QE MACE Registers");</div><div class='add'>+	if (!qe-&gt;mregs) {</div><div class='add'>+		printk(KERN_ERR "qe: Cannot map MACE registers.\n");</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Report the QE channels. */</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		printk(KERN_INFO "%s: QuadEthernet channel[%d] ", qe_devs[i]-&gt;name, i);</div><div class='del'>-		for (j = 0; j &lt; 6; j++)</div><div class='del'>-			printk ("%2.2x%c",</div><div class='del'>-				qe_devs[i]-&gt;dev_addr[j],</div><div class='del'>-				j == 5 ? ' ': ':');</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='add'>+	qe-&gt;qe_block = sbus_alloc_consistent(qe-&gt;qe_sdev,</div><div class='add'>+					     PAGE_SIZE,</div><div class='add'>+					     &amp;qe-&gt;qblock_dvma);</div><div class='add'>+	qe-&gt;buffers = sbus_alloc_consistent(qe-&gt;qe_sdev,</div><div class='add'>+					    sizeof(struct sunqe_buffers),</div><div class='add'>+					    &amp;qe-&gt;buffers_dvma);</div><div class='add'>+	if (qe-&gt;qe_block == NULL || qe-&gt;qblock_dvma == 0 ||</div><div class='add'>+	    qe-&gt;buffers == NULL || qe-&gt;buffers_dvma == 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* Stop this QE. */</div><div class='add'>+	qe_stop(qe);</div><div class='add'>+</div><div class='add'>+	SET_MODULE_OWNER(dev);</div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;sdev-&gt;ofdev.dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;open = qe_open;</div><div class='add'>+	dev-&gt;stop = qe_close;</div><div class='add'>+	dev-&gt;hard_start_xmit = qe_start_xmit;</div><div class='add'>+	dev-&gt;get_stats = qe_get_stats;</div><div class='add'>+	dev-&gt;set_multicast_list = qe_set_multicast;</div><div class='add'>+	dev-&gt;tx_timeout = qe_tx_timeout;</div><div class='add'>+	dev-&gt;watchdog_timeo = 5*HZ;</div><div class='add'>+	dev-&gt;irq = sdev-&gt;irqs[0];</div><div class='add'>+	dev-&gt;dma = 0;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;qe_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	res = register_netdev(dev);</div><div class='add'>+	if (res)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, qe);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s: qe channel[%d] ", dev-&gt;name, qe-&gt;channel);</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		printk ("%2.2x%c",</div><div class='add'>+			dev-&gt;dev_addr[i],</div><div class='add'>+			i == 5 ? ' ': ':');</div><div class='add'>+	printk("\n");</div><div class='ctx'> </div><div class='del'>-	/* We are home free at this point, link the qe's into</div><div class='del'>-	 * the master list for later driver exit.</div><div class='del'>-	 */</div><div class='del'>-	qecp-&gt;next_module = root_qec_dev;</div><div class='del'>-	root_qec_dev = qecp;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out5:</div><div class='del'>-	while (i--)</div><div class='del'>-		unregister_netdev(qe_devs[i]);</div><div class='del'>-	free_irq(sdev-&gt;irqs[0], (void *)qecp);</div><div class='del'>-out4:</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		struct sunqe *qe = (struct sunqe *)qe_devs[i]-&gt;priv;</div><div class='del'>-</div><div class='del'>-		if (qe-&gt;qcregs)</div><div class='del'>-			sbus_iounmap(qe-&gt;qcregs, CREG_REG_SIZE);</div><div class='del'>-		if (qe-&gt;mregs)</div><div class='del'>-			sbus_iounmap(qe-&gt;mregs, MREGS_REG_SIZE);</div><div class='del'>-		if (qe-&gt;qe_block)</div><div class='del'>-			sbus_free_consistent(qe-&gt;qe_sdev,</div><div class='del'>-					     PAGE_SIZE,</div><div class='del'>-					     qe-&gt;qe_block,</div><div class='del'>-					     qe-&gt;qblock_dvma);</div><div class='del'>-		if (qe-&gt;buffers)</div><div class='del'>-			sbus_free_consistent(qe-&gt;qe_sdev,</div><div class='del'>-					     sizeof(struct sunqe_buffers),</div><div class='del'>-					     qe-&gt;buffers,</div><div class='del'>-					     qe-&gt;buffers_dvma);</div><div class='del'>-	}</div><div class='del'>-out3:</div><div class='del'>-	sbus_iounmap(qecp-&gt;gregs, GLOB_REG_SIZE);</div><div class='del'>-out2:</div><div class='del'>-	kfree(qecp);</div><div class='del'>-out1:</div><div class='del'>-	i = 4;</div><div class='del'>-out:</div><div class='del'>-	while (i--)</div><div class='del'>-		free_netdev(qe_devs[i]);</div><div class='add'>+fail:</div><div class='add'>+	if (qe-&gt;qcregs)</div><div class='add'>+		sbus_iounmap(qe-&gt;qcregs, CREG_REG_SIZE);</div><div class='add'>+	if (qe-&gt;mregs)</div><div class='add'>+		sbus_iounmap(qe-&gt;mregs, MREGS_REG_SIZE);</div><div class='add'>+	if (qe-&gt;qe_block)</div><div class='add'>+		sbus_free_consistent(qe-&gt;qe_sdev,</div><div class='add'>+				     PAGE_SIZE,</div><div class='add'>+				     qe-&gt;qe_block,</div><div class='add'>+				     qe-&gt;qblock_dvma);</div><div class='add'>+	if (qe-&gt;buffers)</div><div class='add'>+		sbus_free_consistent(qe-&gt;qe_sdev,</div><div class='add'>+				     sizeof(struct sunqe_buffers),</div><div class='add'>+				     qe-&gt;buffers,</div><div class='add'>+				     qe-&gt;buffers_dvma);</div><div class='add'>+</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init qec_match(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit qec_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_dev *sibling;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (strcmp(sdev-&gt;prom_name, "qec") != 0)</div><div class='del'>-		return 0;</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	/* QEC can be parent of either QuadEthernet or BigMAC</div><div class='del'>-	 * children.  Do not confuse this with qfe/SUNW,qfe</div><div class='del'>-	 * which is a quad-happymeal card and handled by</div><div class='del'>-	 * a different driver.</div><div class='del'>-	 */</div><div class='del'>-	sibling = sdev-&gt;child;</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		if (sibling == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-		if (strcmp(sibling-&gt;prom_name, "qe") != 0)</div><div class='del'>-			return 0;</div><div class='del'>-		sibling = sibling-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='add'>+	return qec_ether_init(sdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init qec_probe(void)</div><div class='add'>+static int __devexit qec_sbus_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	struct sbus_bus *bus;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	static int called;</div><div class='del'>-	int cards = 0, v;</div><div class='del'>-</div><div class='del'>-	root_qec_dev = NULL;</div><div class='del'>-</div><div class='del'>-	if (called)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	called++;</div><div class='del'>-</div><div class='del'>-	for_each_sbus(bus) {</div><div class='del'>-		for_each_sbusdev(sdev, bus) {</div><div class='del'>-			if (cards)</div><div class='del'>-				dev = NULL;</div><div class='del'>-</div><div class='del'>-			if (qec_match(sdev)) {</div><div class='del'>-				cards++;</div><div class='del'>-				if ((v = qec_ether_init(dev, sdev)))</div><div class='del'>-					return v;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!cards)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	struct sunqe *qp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct net_device *net_dev = qp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	unregister_netdevice(net_dev);</div><div class='add'>+</div><div class='add'>+	sbus_iounmap(qp-&gt;qcregs, CREG_REG_SIZE);</div><div class='add'>+	sbus_iounmap(qp-&gt;mregs, MREGS_REG_SIZE);</div><div class='add'>+	sbus_free_consistent(qp-&gt;qe_sdev,</div><div class='add'>+			     PAGE_SIZE,</div><div class='add'>+			     qp-&gt;qe_block,</div><div class='add'>+			     qp-&gt;qblock_dvma);</div><div class='add'>+	sbus_free_consistent(qp-&gt;qe_sdev,</div><div class='add'>+			     sizeof(struct sunqe_buffers),</div><div class='add'>+			     qp-&gt;buffers,</div><div class='add'>+			     qp-&gt;buffers_dvma);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit qec_cleanup(void)</div><div class='add'>+static struct of_device_id qec_sbus_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "qe",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, qec_sbus_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver qec_sbus_driver = {</div><div class='add'>+	.name		= "qec",</div><div class='add'>+	.match_table	= qec_sbus_match,</div><div class='add'>+	.probe		= qec_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(qec_sbus_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init qec_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;qec_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit qec_exit(void)</div><div class='ctx'> {</div><div class='del'>-	struct sunqec *next_qec;</div><div class='del'>-	int i;</div><div class='add'>+	of_unregister_driver(&amp;qec_sbus_driver);</div><div class='ctx'> </div><div class='ctx'> 	while (root_qec_dev) {</div><div class='del'>-		next_qec = root_qec_dev-&gt;next_module;</div><div class='del'>-</div><div class='del'>-		/* Release all four QE channels, then the QEC itself. */</div><div class='del'>-		for (i = 0; i &lt; 4; i++) {</div><div class='del'>-			unregister_netdev(root_qec_dev-&gt;qes[i]-&gt;dev);</div><div class='del'>-			sbus_iounmap(root_qec_dev-&gt;qes[i]-&gt;qcregs, CREG_REG_SIZE);</div><div class='del'>-			sbus_iounmap(root_qec_dev-&gt;qes[i]-&gt;mregs, MREGS_REG_SIZE);</div><div class='del'>-			sbus_free_consistent(root_qec_dev-&gt;qes[i]-&gt;qe_sdev,</div><div class='del'>-					     PAGE_SIZE,</div><div class='del'>-					     root_qec_dev-&gt;qes[i]-&gt;qe_block,</div><div class='del'>-					     root_qec_dev-&gt;qes[i]-&gt;qblock_dvma);</div><div class='del'>-			sbus_free_consistent(root_qec_dev-&gt;qes[i]-&gt;qe_sdev,</div><div class='del'>-					     sizeof(struct sunqe_buffers),</div><div class='del'>-					     root_qec_dev-&gt;qes[i]-&gt;buffers,</div><div class='del'>-					     root_qec_dev-&gt;qes[i]-&gt;buffers_dvma);</div><div class='del'>-			free_netdev(root_qec_dev-&gt;qes[i]-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-		free_irq(root_qec_dev-&gt;qec_sdev-&gt;irqs[0], (void *)root_qec_dev);</div><div class='add'>+		struct sunqec *next = root_qec_dev-&gt;next_module;</div><div class='add'>+</div><div class='add'>+		free_irq(root_qec_dev-&gt;qec_sdev-&gt;irqs[0],</div><div class='add'>+			 (void *) root_qec_dev);</div><div class='ctx'> 		sbus_iounmap(root_qec_dev-&gt;gregs, GLOB_REG_SIZE);</div><div class='add'>+</div><div class='ctx'> 		kfree(root_qec_dev);</div><div class='del'>-		root_qec_dev = next_qec;</div><div class='add'>+</div><div class='add'>+		root_qec_dev = next;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(qec_probe);</div><div class='del'>-module_exit(qec_cleanup);</div><div class='add'>+module_init(qec_init);</div><div class='add'>+module_exit(qec_exit);</div><div class='head'>diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c<br/>index c2ec9fd8c31d..8b53ded66d37 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tc35815.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tc35815.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tc35815.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tc35815.c</a></div><div class='hunk'>@@ -880,7 +880,7 @@ tc35815_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;irq == 0  ||</div><div class='del'>-	    request_irq(dev-&gt;irq, &amp;tc35815_interrupt, SA_SHIRQ, cardname, dev)) {</div><div class='add'>+	    request_irq(dev-&gt;irq, &amp;tc35815_interrupt, IRQF_SHARED, cardname, dev)) {</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c<br/>index 49ad60b72657..ce6f3be86da0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tg3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tg3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tg3.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *	notice is accompanying it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -69,8 +68,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"tg3"</div><div class='ctx'> #define PFX DRV_MODULE_NAME	": "</div><div class='del'>-#define DRV_MODULE_VERSION	"3.58"</div><div class='del'>-#define DRV_MODULE_RELDATE	"May 22, 2006"</div><div class='add'>+#define DRV_MODULE_VERSION	"3.62"</div><div class='add'>+#define DRV_MODULE_RELDATE	"June 30, 2006"</div><div class='ctx'> </div><div class='ctx'> #define TG3_DEF_MAC_MODE	0</div><div class='ctx'> #define TG3_DEF_RX_MODE		0</div><div class='hunk'>@@ -229,6 +228,8 @@ static struct pci_device_id tg3_pci_tbl[] = {</div><div class='ctx'> 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755M,</div><div class='ctx'> 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },</div><div class='add'>+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786,</div><div class='add'>+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787,</div><div class='ctx'> 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M,</div><div class='hunk'>@@ -2965,6 +2966,27 @@ static int tg3_setup_phy(struct tg3 *tp, int force_reset)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This is called whenever we suspect that the system chipset is re-</div><div class='add'>+ * ordering the sequence of MMIO to the tx send mailbox. The symptom</div><div class='add'>+ * is bogus tx completions. We try to recover by setting the</div><div class='add'>+ * TG3_FLAG_MBOX_WRITE_REORDER flag and resetting the chip later</div><div class='add'>+ * in the workqueue.</div><div class='add'>+ */</div><div class='add'>+static void tg3_tx_recover(struct tg3 *tp)</div><div class='add'>+{</div><div class='add'>+	BUG_ON((tp-&gt;tg3_flags &amp; TG3_FLAG_MBOX_WRITE_REORDER) ||</div><div class='add'>+	       tp-&gt;write32_tx_mbox == tg3_write_indirect_mbox);</div><div class='add'>+</div><div class='add'>+	printk(KERN_WARNING PFX "%s: The system may be re-ordering memory-"</div><div class='add'>+	       "mapped I/O cycles to the network device, attempting to "</div><div class='add'>+	       "recover. Please report the problem to the driver maintainer "</div><div class='add'>+	       "and include system chipset information.\n", tp-&gt;dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tp-&gt;lock);</div><div class='add'>+	tp-&gt;tg3_flags |= TG3_FLAG_TX_RECOVERY_PENDING;</div><div class='add'>+	spin_unlock(&amp;tp-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Tigon3 never reports partial packet sends.  So we do not</div><div class='ctx'>  * need special logic to handle SKBs that have not had all</div><div class='ctx'>  * of their frags sent yet, like SunGEM does.</div><div class='hunk'>@@ -2977,9 +2999,13 @@ static void tg3_tx(struct tg3 *tp)</div><div class='ctx'> 	while (sw_idx != hw_idx) {</div><div class='ctx'> 		struct tx_ring_info *ri = &amp;tp-&gt;tx_buffers[sw_idx];</div><div class='ctx'> 		struct sk_buff *skb = ri-&gt;skb;</div><div class='del'>-		int i;</div><div class='add'>+		int i, tx_bug = 0;</div><div class='add'>+</div><div class='add'>+		if (unlikely(skb == NULL)) {</div><div class='add'>+			tg3_tx_recover(tp);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		BUG_ON(skb == NULL);</div><div class='ctx'> 		pci_unmap_single(tp-&gt;pdev,</div><div class='ctx'> 				 pci_unmap_addr(ri, mapping),</div><div class='ctx'> 				 skb_headlen(skb),</div><div class='hunk'>@@ -2990,10 +3016,9 @@ static void tg3_tx(struct tg3 *tp)</div><div class='ctx'> 		sw_idx = NEXT_TX(sw_idx);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-			BUG_ON(sw_idx == hw_idx);</div><div class='del'>-</div><div class='ctx'> 			ri = &amp;tp-&gt;tx_buffers[sw_idx];</div><div class='del'>-			BUG_ON(ri-&gt;skb != NULL);</div><div class='add'>+			if (unlikely(ri-&gt;skb != NULL || sw_idx == hw_idx))</div><div class='add'>+				tx_bug = 1;</div><div class='ctx'> </div><div class='ctx'> 			pci_unmap_page(tp-&gt;pdev,</div><div class='ctx'> 				       pci_unmap_addr(ri, mapping),</div><div class='hunk'>@@ -3004,6 +3029,11 @@ static void tg3_tx(struct tg3 *tp)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+		if (unlikely(tx_bug)) {</div><div class='add'>+			tg3_tx_recover(tp);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_cons = sw_idx;</div><div class='hunk'>@@ -3164,7 +3194,7 @@ static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)</div><div class='ctx'>  */</div><div class='ctx'> static int tg3_rx(struct tg3 *tp, int budget)</div><div class='ctx'> {</div><div class='del'>-	u32 work_mask;</div><div class='add'>+	u32 work_mask, rx_std_posted = 0;</div><div class='ctx'> 	u32 sw_idx = tp-&gt;rx_rcb_ptr;</div><div class='ctx'> 	u16 hw_idx;</div><div class='ctx'> 	int received;</div><div class='hunk'>@@ -3191,6 +3221,7 @@ static int tg3_rx(struct tg3 *tp, int budget)</div><div class='ctx'> 						  mapping);</div><div class='ctx'> 			skb = tp-&gt;rx_std_buffers[desc_idx].skb;</div><div class='ctx'> 			post_ptr = &amp;tp-&gt;rx_std_ptr;</div><div class='add'>+			rx_std_posted++;</div><div class='ctx'> 		} else if (opaque_key == RXD_OPAQUE_RING_JUMBO) {</div><div class='ctx'> 			dma_addr = pci_unmap_addr(&amp;tp-&gt;rx_jumbo_buffers[desc_idx],</div><div class='ctx'> 						  mapping);</div><div class='hunk'>@@ -3278,6 +3309,15 @@ static int tg3_rx(struct tg3 *tp, int budget)</div><div class='ctx'> </div><div class='ctx'> next_pkt:</div><div class='ctx'> 		(*post_ptr)++;</div><div class='add'>+</div><div class='add'>+		if (unlikely(rx_std_posted &gt;= tp-&gt;rx_std_max_post)) {</div><div class='add'>+			u32 idx = *post_ptr % TG3_RX_RING_SIZE;</div><div class='add'>+</div><div class='add'>+			tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX +</div><div class='add'>+				     TG3_64BIT_REG_LOW, idx);</div><div class='add'>+			work_mask &amp;= ~RXD_OPAQUE_RING_STD;</div><div class='add'>+			rx_std_posted = 0;</div><div class='add'>+		}</div><div class='ctx'> next_pkt_nopost:</div><div class='ctx'> 		sw_idx++;</div><div class='ctx'> 		sw_idx %= TG3_RX_RCB_RING_SIZE(tp);</div><div class='hunk'>@@ -3331,6 +3371,11 @@ static int tg3_poll(struct net_device *netdev, int *budget)</div><div class='ctx'> 	/* run TX completion thread */</div><div class='ctx'> 	if (sblk-&gt;idx[0].tx_consumer != tp-&gt;tx_cons) {</div><div class='ctx'> 		tg3_tx(tp);</div><div class='add'>+		if (unlikely(tp-&gt;tg3_flags &amp; TG3_FLAG_TX_RECOVERY_PENDING)) {</div><div class='add'>+			netif_rx_complete(netdev);</div><div class='add'>+			schedule_work(&amp;tp-&gt;reset_task);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* run RX thread, within the bounds set by NAPI.</div><div class='hunk'>@@ -3391,12 +3436,10 @@ static inline void tg3_full_lock(struct tg3 *tp, int irq_sync)</div><div class='ctx'> 	if (irq_sync)</div><div class='ctx'> 		tg3_irq_quiesce(tp);</div><div class='ctx'> 	spin_lock_bh(&amp;tp-&gt;lock);</div><div class='del'>-	spin_lock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void tg3_full_unlock(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 	spin_unlock_bh(&amp;tp-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3579,6 +3622,13 @@ static void tg3_reset_task(void *_data)</div><div class='ctx'> 	restart_timer = tp-&gt;tg3_flags2 &amp; TG3_FLG2_RESTART_TIMER;</div><div class='ctx'> 	tp-&gt;tg3_flags2 &amp;= ~TG3_FLG2_RESTART_TIMER;</div><div class='ctx'> </div><div class='add'>+	if (tp-&gt;tg3_flags &amp; TG3_FLAG_TX_RECOVERY_PENDING) {</div><div class='add'>+		tp-&gt;write32_tx_mbox = tg3_write32_tx_mbox;</div><div class='add'>+		tp-&gt;write32_rx_mbox = tg3_write_flush_reg32;</div><div class='add'>+		tp-&gt;tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;</div><div class='add'>+		tp-&gt;tg3_flags &amp;= ~TG3_FLAG_TX_RECOVERY_PENDING;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);</div><div class='ctx'> 	tg3_init_hw(tp, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -3718,14 +3768,11 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='del'>-	/* No BH disabling for tx_lock here.  We are running in BH disabled</div><div class='del'>-	 * context and TX reclaim runs via tp-&gt;poll inside of a software</div><div class='add'>+	/* We are running in BH disabled context with netif_tx_lock</div><div class='add'>+	 * and TX reclaim runs via tp-&gt;poll inside of a software</div><div class='ctx'> 	 * interrupt.  Furthermore, IRQ processing runs lockless so we have</div><div class='ctx'> 	 * no IRQ context deadlocks to worry about either.  Rejoice!</div><div class='ctx'> 	 */</div><div class='del'>-	if (!spin_trylock(&amp;tp-&gt;tx_lock))</div><div class='del'>-		return NETDEV_TX_LOCKED;</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(TX_BUFFS_AVAIL(tp) &lt;= (skb_shinfo(skb)-&gt;nr_frags + 1))) {</div><div class='ctx'> 		if (!netif_queue_stopped(dev)) {</div><div class='ctx'> 			netif_stop_queue(dev);</div><div class='hunk'>@@ -3734,7 +3781,6 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "</div><div class='ctx'> 			       "queue awake!\n", dev-&gt;name);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3743,7 +3789,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> #if TG3_TSO_SUPPORT != 0</div><div class='ctx'> 	mss = 0;</div><div class='ctx'> 	if (skb-&gt;len &gt; (tp-&gt;dev-&gt;mtu + ETH_HLEN) &amp;&amp;</div><div class='del'>-	    (mss = skb_shinfo(skb)-&gt;tso_size) != 0) {</div><div class='add'>+	    (mss = skb_shinfo(skb)-&gt;gso_size) != 0) {</div><div class='ctx'> 		int tcp_opt_len, ip_tcp_len;</div><div class='ctx'> </div><div class='ctx'> 		if (skb_header_cloned(skb) &amp;&amp;</div><div class='hunk'>@@ -3752,18 +3798,24 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tcp_opt_len = ((skb-&gt;h.th-&gt;doff - 5) * 4);</div><div class='del'>-		ip_tcp_len = (skb-&gt;nh.iph-&gt;ihl * 4) + sizeof(struct tcphdr);</div><div class='add'>+		if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_TCPV6)</div><div class='add'>+			mss |= (skb_headlen(skb) - ETH_HLEN) &lt;&lt; 9;</div><div class='add'>+		else {</div><div class='add'>+			tcp_opt_len = ((skb-&gt;h.th-&gt;doff - 5) * 4);</div><div class='add'>+			ip_tcp_len = (skb-&gt;nh.iph-&gt;ihl * 4) +</div><div class='add'>+				     sizeof(struct tcphdr);</div><div class='add'>+</div><div class='add'>+			skb-&gt;nh.iph-&gt;check = 0;</div><div class='add'>+			skb-&gt;nh.iph-&gt;tot_len = htons(mss + ip_tcp_len +</div><div class='add'>+						     tcp_opt_len);</div><div class='add'>+			mss |= (ip_tcp_len + tcp_opt_len) &lt;&lt; 9;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		base_flags |= (TXD_FLAG_CPU_PRE_DMA |</div><div class='ctx'> 			       TXD_FLAG_CPU_POST_DMA);</div><div class='ctx'> </div><div class='del'>-		skb-&gt;nh.iph-&gt;check = 0;</div><div class='del'>-		skb-&gt;nh.iph-&gt;tot_len = htons(mss + ip_tcp_len + tcp_opt_len);</div><div class='del'>-</div><div class='ctx'> 		skb-&gt;h.th-&gt;check = 0;</div><div class='ctx'> </div><div class='del'>-		mss |= (ip_tcp_len + tcp_opt_len) &lt;&lt; 9;</div><div class='ctx'> 	}</div><div class='ctx'> 	else if (skb-&gt;ip_summed == CHECKSUM_HW)</div><div class='ctx'> 		base_flags |= TXD_FLAG_TCPUDP_CSUM;</div><div class='hunk'>@@ -3817,21 +3869,56 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_prod = entry;</div><div class='del'>-	if (TX_BUFFS_AVAIL(tp) &lt;= (MAX_SKB_FRAGS + 1)) {</div><div class='add'>+	if (unlikely(TX_BUFFS_AVAIL(tp) &lt;= (MAX_SKB_FRAGS + 1))) {</div><div class='add'>+		spin_lock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		if (TX_BUFFS_AVAIL(tp) &gt; TG3_TX_WAKEUP_THRESH)</div><div class='ctx'> 			netif_wake_queue(tp-&gt;dev);</div><div class='add'>+		spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'>     	mmiowb();</div><div class='del'>-	spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if TG3_TSO_SUPPORT != 0</div><div class='add'>+static int tg3_start_xmit_dma_bug(struct sk_buff *, struct net_device *);</div><div class='add'>+</div><div class='add'>+/* Use GSO to workaround a rare TSO bug that may be triggered when the</div><div class='add'>+ * TSO header is greater than 80 bytes.</div><div class='add'>+ */</div><div class='add'>+static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *segs, *nskb;</div><div class='add'>+</div><div class='add'>+	/* Estimate the number of fragments in the worst case */</div><div class='add'>+	if (unlikely(TX_BUFFS_AVAIL(tp) &lt;= (skb_shinfo(skb)-&gt;gso_segs * 3))) {</div><div class='add'>+		netif_stop_queue(tp-&gt;dev);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	segs = skb_gso_segment(skb, tp-&gt;dev-&gt;features &amp; ~NETIF_F_TSO);</div><div class='add'>+	if (unlikely(IS_ERR(segs)))</div><div class='add'>+		goto tg3_tso_bug_end;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		nskb = segs;</div><div class='add'>+		segs = segs-&gt;next;</div><div class='add'>+		nskb-&gt;next = NULL;</div><div class='add'>+		tg3_start_xmit_dma_bug(nskb, tp-&gt;dev);</div><div class='add'>+	} while (segs);</div><div class='add'>+</div><div class='add'>+tg3_tso_bug_end:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and</div><div class='ctx'>  * support TG3_FLG2_HW_TSO_1 or firmware TSO only.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3844,14 +3931,11 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='del'>-	/* No BH disabling for tx_lock here.  We are running in BH disabled</div><div class='del'>-	 * context and TX reclaim runs via tp-&gt;poll inside of a software</div><div class='add'>+	/* We are running in BH disabled context with netif_tx_lock</div><div class='add'>+	 * and TX reclaim runs via tp-&gt;poll inside of a software</div><div class='ctx'> 	 * interrupt.  Furthermore, IRQ processing runs lockless so we have</div><div class='ctx'> 	 * no IRQ context deadlocks to worry about either.  Rejoice!</div><div class='ctx'> 	 */</div><div class='del'>-	if (!spin_trylock(&amp;tp-&gt;tx_lock))</div><div class='del'>-		return NETDEV_TX_LOCKED; </div><div class='del'>-</div><div class='ctx'> 	if (unlikely(TX_BUFFS_AVAIL(tp) &lt;= (skb_shinfo(skb)-&gt;nr_frags + 1))) {</div><div class='ctx'> 		if (!netif_queue_stopped(dev)) {</div><div class='ctx'> 			netif_stop_queue(dev);</div><div class='hunk'>@@ -3860,7 +3944,6 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "</div><div class='ctx'> 			       "queue awake!\n", dev-&gt;name);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3871,8 +3954,8 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> #if TG3_TSO_SUPPORT != 0</div><div class='ctx'> 	mss = 0;</div><div class='ctx'> 	if (skb-&gt;len &gt; (tp-&gt;dev-&gt;mtu + ETH_HLEN) &amp;&amp;</div><div class='del'>-	    (mss = skb_shinfo(skb)-&gt;tso_size) != 0) {</div><div class='del'>-		int tcp_opt_len, ip_tcp_len;</div><div class='add'>+	    (mss = skb_shinfo(skb)-&gt;gso_size) != 0) {</div><div class='add'>+		int tcp_opt_len, ip_tcp_len, hdr_len;</div><div class='ctx'> </div><div class='ctx'> 		if (skb_header_cloned(skb) &amp;&amp;</div><div class='ctx'> 		    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {</div><div class='hunk'>@@ -3883,11 +3966,16 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		tcp_opt_len = ((skb-&gt;h.th-&gt;doff - 5) * 4);</div><div class='ctx'> 		ip_tcp_len = (skb-&gt;nh.iph-&gt;ihl * 4) + sizeof(struct tcphdr);</div><div class='ctx'> </div><div class='add'>+		hdr_len = ip_tcp_len + tcp_opt_len;</div><div class='add'>+		if (unlikely((ETH_HLEN + hdr_len) &gt; 80) &amp;&amp;</div><div class='add'>+			     (tp-&gt;tg3_flags2 &amp; TG3_FLG2_HW_TSO_1_BUG))</div><div class='add'>+			return (tg3_tso_bug(tp, skb));</div><div class='add'>+</div><div class='ctx'> 		base_flags |= (TXD_FLAG_CPU_PRE_DMA |</div><div class='ctx'> 			       TXD_FLAG_CPU_POST_DMA);</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;nh.iph-&gt;check = 0;</div><div class='del'>-		skb-&gt;nh.iph-&gt;tot_len = htons(mss + ip_tcp_len + tcp_opt_len);</div><div class='add'>+		skb-&gt;nh.iph-&gt;tot_len = htons(mss + hdr_len);</div><div class='ctx'> 		if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_HW_TSO) {</div><div class='ctx'> 			skb-&gt;h.th-&gt;check = 0;</div><div class='ctx'> 			base_flags &amp;= ~TXD_FLAG_TCPUDP_CSUM;</div><div class='hunk'>@@ -3998,15 +4086,16 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_prod = entry;</div><div class='del'>-	if (TX_BUFFS_AVAIL(tp) &lt;= (MAX_SKB_FRAGS + 1)) {</div><div class='add'>+	if (unlikely(TX_BUFFS_AVAIL(tp) &lt;= (MAX_SKB_FRAGS + 1))) {</div><div class='add'>+		spin_lock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		if (TX_BUFFS_AVAIL(tp) &gt; TG3_TX_WAKEUP_THRESH)</div><div class='ctx'> 			netif_wake_queue(tp-&gt;dev);</div><div class='add'>+		spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='ctx'>     	mmiowb();</div><div class='del'>-	spin_unlock(&amp;tp-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='ctx'> </div><div class='hunk'>@@ -4485,9 +4574,8 @@ static void tg3_disable_nvram_access(struct tg3 *tp)</div><div class='ctx'> /* tp-&gt;lock is held. */</div><div class='ctx'> static void tg3_write_sig_pre_reset(struct tg3 *tp, int kind)</div><div class='ctx'> {</div><div class='del'>-	if (!(tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X))</div><div class='del'>-		tg3_write_mem(tp, NIC_SRAM_FIRMWARE_MBOX,</div><div class='del'>-			      NIC_SRAM_FIRMWARE_MBOX_MAGIC1);</div><div class='add'>+	tg3_write_mem(tp, NIC_SRAM_FIRMWARE_MBOX,</div><div class='add'>+		      NIC_SRAM_FIRMWARE_MBOX_MAGIC1);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_ASF_NEW_HANDSHAKE) {</div><div class='ctx'> 		switch (kind) {</div><div class='hunk'>@@ -4568,13 +4656,12 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> 	void (*write_op)(struct tg3 *, u32, u32);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!(tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X)) {</div><div class='del'>-		tg3_nvram_lock(tp);</div><div class='del'>-		/* No matching tg3_nvram_unlock() after this because</div><div class='del'>-		 * chip reset below will undo the nvram lock.</div><div class='del'>-		 */</div><div class='del'>-		tp-&gt;nvram_lock_cnt = 0;</div><div class='del'>-	}</div><div class='add'>+	tg3_nvram_lock(tp);</div><div class='add'>+</div><div class='add'>+	/* No matching tg3_nvram_unlock() after this because</div><div class='add'>+	 * chip reset below will undo the nvram lock.</div><div class='add'>+	 */</div><div class='add'>+	tp-&gt;nvram_lock_cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5752 ||</div><div class='ctx'> 	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5755 ||</div><div class='hunk'>@@ -4727,20 +4814,25 @@ static int tg3_chip_reset(struct tg3 *tp)</div><div class='ctx'> 		tw32_f(MAC_MODE, 0);</div><div class='ctx'> 	udelay(40);</div><div class='ctx'> </div><div class='del'>-	if (!(tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X)) {</div><div class='del'>-		/* Wait for firmware initialization to complete. */</div><div class='del'>-		for (i = 0; i &lt; 100000; i++) {</div><div class='del'>-			tg3_read_mem(tp, NIC_SRAM_FIRMWARE_MBOX, &amp;val);</div><div class='del'>-			if (val == ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)</div><div class='del'>-				break;</div><div class='del'>-			udelay(10);</div><div class='del'>-		}</div><div class='del'>-		if (i &gt;= 100000) {</div><div class='del'>-			printk(KERN_ERR PFX "tg3_reset_hw timed out for %s, "</div><div class='del'>-			       "firmware will not restart magic=%08x\n",</div><div class='del'>-			       tp-&gt;dev-&gt;name, val);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='add'>+	/* Wait for firmware initialization to complete. */</div><div class='add'>+	for (i = 0; i &lt; 100000; i++) {</div><div class='add'>+		tg3_read_mem(tp, NIC_SRAM_FIRMWARE_MBOX, &amp;val);</div><div class='add'>+		if (val == ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)</div><div class='add'>+			break;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Chip might not be fitted with firmare.  Some Sun onboard</div><div class='add'>+	 * parts are configured like that.  So don't signal the timeout</div><div class='add'>+	 * of the above loop as an error, but do report the lack of</div><div class='add'>+	 * running firmware once.</div><div class='add'>+	 */</div><div class='add'>+	if (i &gt;= 100000 &amp;&amp;</div><div class='add'>+	    !(tp-&gt;tg3_flags2 &amp; TG3_FLG2_NO_FWARE_REPORTED)) {</div><div class='add'>+		tp-&gt;tg3_flags2 |= TG3_FLG2_NO_FWARE_REPORTED;</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO PFX "%s: No firmware running.\n",</div><div class='add'>+		       tp-&gt;dev-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((tp-&gt;tg3_flags2 &amp; TG3_FLG2_PCI_EXPRESS) &amp;&amp;</div><div class='hunk'>@@ -5943,7 +6035,13 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup replenish threshold. */</div><div class='del'>-	tw32(RCVBDI_STD_THRESH, tp-&gt;rx_pending / 8);</div><div class='add'>+	val = tp-&gt;rx_pending / 8;</div><div class='add'>+	if (val == 0)</div><div class='add'>+		val = 1;</div><div class='add'>+	else if (val &gt; tp-&gt;rx_std_max_post)</div><div class='add'>+		val = tp-&gt;rx_std_max_post;</div><div class='add'>+</div><div class='add'>+	tw32(RCVBDI_STD_THRESH, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize TG3_BDINFO's at:</div><div class='ctx'> 	 *  RCVDBDI_STD_BD:	standard eth size rx ring</div><div class='hunk'>@@ -6103,8 +6201,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Receive/send statistics. */</div><div class='del'>-	if ((rdmac_mode &amp; RDMAC_MODE_FIFO_SIZE_128) &amp;&amp;</div><div class='del'>-	    (tp-&gt;tg3_flags2 &amp; TG3_FLG2_TSO_CAPABLE)) {</div><div class='add'>+	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_5750_PLUS) {</div><div class='add'>+		val = tr32(RCVLPC_STATS_ENABLE);</div><div class='add'>+		val &amp;= ~RCVLPC_STATSENAB_DACK_FIX;</div><div class='add'>+		tw32(RCVLPC_STATS_ENABLE, val);</div><div class='add'>+	} else if ((rdmac_mode &amp; RDMAC_MODE_FIFO_SIZE_128) &amp;&amp;</div><div class='add'>+		   (tp-&gt;tg3_flags2 &amp; TG3_FLG2_TSO_CAPABLE)) {</div><div class='ctx'> 		val = tr32(RCVLPC_STATS_ENABLE);</div><div class='ctx'> 		val &amp;= ~RCVLPC_STATSENAB_LNGBRST_RFIX;</div><div class='ctx'> 		tw32(RCVLPC_STATS_ENABLE, val);</div><div class='hunk'>@@ -6606,12 +6708,12 @@ static int tg3_request_irq(struct tg3 *tp)</div><div class='ctx'> 		fn = tg3_msi;</div><div class='ctx'> 		if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_1SHOT_MSI)</div><div class='ctx'> 			fn = tg3_msi_1shot;</div><div class='del'>-		flags = SA_SAMPLE_RANDOM;</div><div class='add'>+		flags = IRQF_SAMPLE_RANDOM;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		fn = tg3_interrupt;</div><div class='ctx'> 		if (tp-&gt;tg3_flags &amp; TG3_FLAG_TAGGED_STATUS)</div><div class='ctx'> 			fn = tg3_interrupt_tagged;</div><div class='del'>-		flags = SA_SHIRQ | SA_SAMPLE_RANDOM;</div><div class='add'>+		flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;</div><div class='ctx'> 	}</div><div class='ctx'> 	return (request_irq(tp-&gt;pdev-&gt;irq, fn, flags, dev-&gt;name, dev));</div><div class='ctx'> }</div><div class='hunk'>@@ -6630,7 +6732,7 @@ static int tg3_test_interrupt(struct tg3 *tp)</div><div class='ctx'> 	free_irq(tp-&gt;pdev-&gt;irq, dev);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(tp-&gt;pdev-&gt;irq, tg3_test_isr,</div><div class='del'>-			  SA_SHIRQ | SA_SAMPLE_RANDOM, dev-&gt;name, dev);</div><div class='add'>+			  IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev-&gt;name, dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -7791,6 +7893,12 @@ static int tg3_set_tso(struct net_device *dev, u32 value)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_HW_TSO_2) {</div><div class='add'>+		if (value)</div><div class='add'>+			dev-&gt;features |= NETIF_F_TSO6;</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;features &amp;= ~NETIF_F_TSO6;</div><div class='add'>+	}</div><div class='ctx'> 	return ethtool_op_set_tso(dev, value);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -8700,6 +8808,9 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		tg3_netif_stop(tp);</div><div class='add'>+</div><div class='ctx'> 	tg3_full_lock(tp, 0);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;vlgrp = grp;</div><div class='hunk'>@@ -8708,16 +8819,25 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)</div><div class='ctx'> 	__tg3_set_rx_mode(dev);</div><div class='ctx'> </div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		tg3_netif_start(tp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		tg3_netif_stop(tp);</div><div class='add'>+</div><div class='ctx'> 	tg3_full_lock(tp, 0);</div><div class='ctx'> 	if (tp-&gt;vlgrp)</div><div class='ctx'> 		tp-&gt;vlgrp-&gt;vlan_devices[vid] = NULL;</div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		tg3_netif_start(tp);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -9075,9 +9195,6 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	tw32_f(GRC_EEPROM_ADDR,</div><div class='ctx'> 	     (EEPROM_ADDR_FSM_RESET |</div><div class='ctx'> 	      (EEPROM_DEFAULT_CLOCK_PERIOD &lt;&lt;</div><div class='hunk'>@@ -9210,11 +9327,6 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X) {</div><div class='del'>-		printk(KERN_ERR PFX "Attempt to do nvram_read on Sun 570X\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!(tp-&gt;tg3_flags &amp; TG3_FLAG_NVRAM))</div><div class='ctx'> 		return tg3_nvram_read_using_eeprom(tp, offset, val);</div><div class='ctx'> </div><div class='hunk'>@@ -9447,11 +9559,6 @@ static int tg3_nvram_write_block(struct tg3 *tp, u32 offset, u32 len, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X) {</div><div class='del'>-		printk(KERN_ERR PFX "Attempt to do nvram_write on Sun 570X\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (tp-&gt;tg3_flags &amp; TG3_FLAG_EEPROM_WRITE_PROT) {</div><div class='ctx'> 		tw32_f(GRC_LOCAL_CTRL, tp-&gt;grc_local_ctrl &amp;</div><div class='ctx'> 		       ~GRC_LCLCTRL_GPIO_OUTPUT1);</div><div class='hunk'>@@ -9578,15 +9685,19 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)</div><div class='ctx'> 	pci_write_config_dword(tp-&gt;pdev, TG3PCI_MISC_HOST_CTRL,</div><div class='ctx'> 			       tp-&gt;misc_host_ctrl);</div><div class='ctx'> </div><div class='add'>+	/* The memory arbiter has to be enabled in order for SRAM accesses</div><div class='add'>+	 * to succeed.  Normally on powerup the tg3 chip firmware will make</div><div class='add'>+	 * sure it is enabled, but other entities such as system netboot</div><div class='add'>+	 * code might disable it.</div><div class='add'>+	 */</div><div class='add'>+	val = tr32(MEMARB_MODE);</div><div class='add'>+	tw32(MEMARB_MODE, val | MEMARB_MODE_ENABLE);</div><div class='add'>+</div><div class='ctx'> 	tp-&gt;phy_id = PHY_ID_INVALID;</div><div class='ctx'> 	tp-&gt;led_ctrl = LED_CTRL_MODE_PHY_1;</div><div class='ctx'> </div><div class='del'>-	/* Do not even try poking around in here on Sun parts.  */</div><div class='del'>-	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X) {</div><div class='del'>-		/* All SUN chips are built-in LOMs. */</div><div class='del'>-		tp-&gt;tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	/* Assume an onboard device by default.  */</div><div class='add'>+	tp-&gt;tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;</div><div class='ctx'> </div><div class='ctx'> 	tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &amp;val);</div><div class='ctx'> 	if (val == NIC_SRAM_DATA_SIG_MAGIC) {</div><div class='hunk'>@@ -9686,6 +9797,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 		if (nic_cfg &amp; NIC_SRAM_DATA_CFG_EEPROM_WP)</div><div class='ctx'> 			tp-&gt;tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;</div><div class='add'>+		else</div><div class='add'>+			tp-&gt;tg3_flags &amp;= ~TG3_FLAG_EEPROM_WRITE_PROT;</div><div class='ctx'> </div><div class='ctx'> 		if (nic_cfg &amp; NIC_SRAM_DATA_CFG_ASF_ENABLE) {</div><div class='ctx'> 			tp-&gt;tg3_flags |= TG3_FLAG_ENABLE_ASF;</div><div class='hunk'>@@ -9834,16 +9947,8 @@ static void __devinit tg3_read_partno(struct tg3 *tp)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 magic;</div><div class='ctx'> </div><div class='del'>-	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X) {</div><div class='del'>-		/* Sun decided not to put the necessary bits in the</div><div class='del'>-		 * NVRAM of their onboard tg3 parts :(</div><div class='del'>-		 */</div><div class='del'>-		strcpy(tp-&gt;board_part_number, "Sun 570X");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (tg3_nvram_read_swab(tp, 0x0, &amp;magic))</div><div class='del'>-		return;</div><div class='add'>+		goto out_not_found;</div><div class='ctx'> </div><div class='ctx'> 	if (magic == TG3_EEPROM_MAGIC) {</div><div class='ctx'> 		for (i = 0; i &lt; 256; i += 4) {</div><div class='hunk'>@@ -9874,6 +9979,9 @@ static void __devinit tg3_read_partno(struct tg3 *tp)</div><div class='ctx'> 					break;</div><div class='ctx'> 				msleep(1);</div><div class='ctx'> 			}</div><div class='add'>+			if (!(tmp16 &amp; 0x8000))</div><div class='add'>+				goto out_not_found;</div><div class='add'>+</div><div class='ctx'> 			pci_read_config_dword(tp-&gt;pdev, vpd_cap + PCI_VPD_DATA,</div><div class='ctx'> 					      &amp;tmp);</div><div class='ctx'> 			tmp = cpu_to_le32(tmp);</div><div class='hunk'>@@ -9965,42 +10073,13 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-static int __devinit tg3_is_sun_570X(struct tg3 *tp)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = tp-&gt;pdev;</div><div class='del'>-	struct pcidev_cookie *pcp = pdev-&gt;sysdata;</div><div class='del'>-</div><div class='del'>-	if (pcp != NULL) {</div><div class='del'>-		int node = pcp-&gt;prom_node;</div><div class='del'>-		u32 venid;</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='del'>-		err = prom_getproperty(node, "subsystem-vendor-id",</div><div class='del'>-				       (char *) &amp;venid, sizeof(venid));</div><div class='del'>-		if (err == 0 || err == -1)</div><div class='del'>-			return 0;</div><div class='del'>-		if (venid == PCI_VENDOR_ID_SUN)</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		/* TG3 chips onboard the SunBlade-2500 don't have the</div><div class='del'>-		 * subsystem-vendor-id set to PCI_VENDOR_ID_SUN but they</div><div class='del'>-		 * are distinguishable from non-Sun variants by being</div><div class='del'>-		 * named "network" by the firmware.  Non-Sun cards will</div><div class='del'>-		 * show up as being named "ethernet".</div><div class='del'>-		 */</div><div class='del'>-		if (!strcmp(pcp-&gt;prom_name, "network"))</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	static struct pci_device_id write_reorder_chipsets[] = {</div><div class='ctx'> 		{ PCI_DEVICE(PCI_VENDOR_ID_AMD,</div><div class='ctx'> 		             PCI_DEVICE_ID_AMD_FE_GATE_700C) },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_AMD,</div><div class='add'>+		             PCI_DEVICE_ID_AMD_8131_BRIDGE) },</div><div class='ctx'> 		{ PCI_DEVICE(PCI_VENDOR_ID_VIA,</div><div class='ctx'> 			     PCI_DEVICE_ID_VIA_8385_0) },</div><div class='ctx'> 		{ },</div><div class='hunk'>@@ -10012,11 +10091,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 	u16 pci_cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	if (tg3_is_sun_570X(tp))</div><div class='del'>-		tp-&gt;tg3_flags2 |= TG3_FLG2_SUN_570X;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* Force memory write invalidate off.  If we leave it on,</div><div class='ctx'> 	 * then on 5700_BX chips we have to enable a workaround.</div><div class='ctx'> 	 * The workaround is to set the TG3PCI_DMA_RW_CTRL boundary</div><div class='hunk'>@@ -10170,8 +10244,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 		    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5787) {</div><div class='ctx'> 			tp-&gt;tg3_flags2 |= TG3_FLG2_HW_TSO_2;</div><div class='ctx'> 			tp-&gt;tg3_flags2 |= TG3_FLG2_1SHOT_MSI;</div><div class='del'>-		} else</div><div class='del'>-			tp-&gt;tg3_flags2 |= TG3_FLG2_HW_TSO_1;</div><div class='add'>+		} else {</div><div class='add'>+			tp-&gt;tg3_flags2 |= TG3_FLG2_HW_TSO_1 |</div><div class='add'>+					  TG3_FLG2_HW_TSO_1_BUG;</div><div class='add'>+			if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) ==</div><div class='add'>+				ASIC_REV_5750 &amp;&amp;</div><div class='add'>+	     		    tp-&gt;pci_chip_rev_id &gt;= CHIPREV_ID_5750_C2)</div><div class='add'>+				tp-&gt;tg3_flags2 &amp;= ~TG3_FLG2_HW_TSO_1_BUG;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) != ASIC_REV_5705 &amp;&amp;</div><div class='hunk'>@@ -10312,8 +10392,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 	if (tp-&gt;write32 == tg3_write_indirect_reg32 ||</div><div class='ctx'> 	    ((tp-&gt;tg3_flags &amp; TG3_FLAG_PCIX_MODE) &amp;&amp;</div><div class='ctx'> 	     (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5700 ||</div><div class='del'>-	      GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5701)) ||</div><div class='del'>-	    (tp-&gt;tg3_flags2 &amp; TG3_FLG2_SUN_570X))</div><div class='add'>+	      GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5701)))</div><div class='ctx'> 		tp-&gt;tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;</div><div class='ctx'> </div><div class='ctx'> 	/* Get eeprom hw config before calling tg3_set_power_state().</div><div class='hunk'>@@ -10544,6 +10623,16 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)</div><div class='ctx'> 	    (tp-&gt;tg3_flags &amp; TG3_FLAG_PCIX_MODE) != 0)</div><div class='ctx'> 		tp-&gt;rx_offset = 0;</div><div class='ctx'> </div><div class='add'>+	tp-&gt;rx_std_max_post = TG3_RX_RING_SIZE;</div><div class='add'>+</div><div class='add'>+	/* Increment the rx prod index on the rx std ring by at most</div><div class='add'>+	 * 8 for these chips to workaround hw errata.</div><div class='add'>+	 */</div><div class='add'>+	if (GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5750 ||</div><div class='add'>+	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5752 ||</div><div class='add'>+	    GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5755)</div><div class='add'>+		tp-&gt;rx_std_max_post = 8;</div><div class='add'>+</div><div class='ctx'> 	/* By default, disable wake-on-lan.  User can change this</div><div class='ctx'> 	 * using ETHTOOL_SWOL.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -10560,11 +10649,13 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)</div><div class='ctx'> 	struct pcidev_cookie *pcp = pdev-&gt;sysdata;</div><div class='ctx'> </div><div class='ctx'> 	if (pcp != NULL) {</div><div class='del'>-		int node = pcp-&gt;prom_node;</div><div class='add'>+		unsigned char *addr;</div><div class='add'>+		int len;</div><div class='ctx'> </div><div class='del'>-		if (prom_getproplen(node, "local-mac-address") == 6) {</div><div class='del'>-			prom_getproperty(node, "local-mac-address",</div><div class='del'>-					 dev-&gt;dev_addr, 6);</div><div class='add'>+		addr = of_get_property(pcp-&gt;prom_node, "local-mac-address",</div><div class='add'>+					&amp;len);</div><div class='add'>+		if (addr &amp;&amp; len == 6) {</div><div class='add'>+			memcpy(dev-&gt;dev_addr, addr, 6);</div><div class='ctx'> 			memcpy(dev-&gt;perm_addr, dev-&gt;dev_addr, 6);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -10594,8 +10685,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	mac_offset = 0x7c;</div><div class='del'>-	if ((GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5704 &amp;&amp;</div><div class='del'>-	     !(tp-&gt;tg3_flags &amp; TG3_FLG2_SUN_570X)) ||</div><div class='add'>+	if ((GET_ASIC_REV(tp-&gt;pci_chip_rev_id) == ASIC_REV_5704) ||</div><div class='ctx'> 	    (tp-&gt;tg3_flags2 &amp; TG3_FLG2_5780_CLASS)) {</div><div class='ctx'> 		if (tr32(TG3PCI_DUAL_MAC_CTRL) &amp; DUAL_MAC_CTRL_ID)</div><div class='ctx'> 			mac_offset = 0xcc;</div><div class='hunk'>@@ -10622,8 +10712,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!addr_ok) {</div><div class='ctx'> 		/* Next, try NVRAM. */</div><div class='del'>-		if (!(tp-&gt;tg3_flags &amp; TG3_FLG2_SUN_570X) &amp;&amp;</div><div class='del'>-		    !tg3_nvram_read(tp, mac_offset + 0, &amp;hi) &amp;&amp;</div><div class='add'>+		if (!tg3_nvram_read(tp, mac_offset + 0, &amp;hi) &amp;&amp;</div><div class='ctx'> 		    !tg3_nvram_read(tp, mac_offset + 4, &amp;lo)) {</div><div class='ctx'> 			dev-&gt;dev_addr[0] = ((hi &gt;&gt; 16) &amp; 0xff);</div><div class='ctx'> 			dev-&gt;dev_addr[1] = ((hi &gt;&gt; 24) &amp; 0xff);</div><div class='hunk'>@@ -11291,7 +11380,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;features |= NETIF_F_LLTX;</div><div class='ctx'> #if TG3_VLAN_TAG_USED</div><div class='ctx'> 	dev-&gt;features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;</div><div class='ctx'> 	dev-&gt;vlan_rx_register = tg3_vlan_rx_register;</div><div class='hunk'>@@ -11433,8 +11521,11 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	 * Firmware TSO on older chips gives lower performance, so it</div><div class='ctx'> 	 * is off by default, but can be enabled using ethtool.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_HW_TSO)</div><div class='add'>+	if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_HW_TSO) {</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_TSO;</div><div class='add'>+		if (tp-&gt;tg3_flags2 &amp; TG3_FLG2_HW_TSO_2)</div><div class='add'>+			dev-&gt;features |= NETIF_F_TSO6;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h<br/>index 0e29b885d449..ba2c98711c88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tg3.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tg3.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tg3.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tg3.h</a></div><div class='hunk'>@@ -125,6 +125,7 @@</div><div class='ctx'> #define  CHIPREV_ID_5750_A0		 0x4000</div><div class='ctx'> #define  CHIPREV_ID_5750_A1		 0x4001</div><div class='ctx'> #define  CHIPREV_ID_5750_A3		 0x4003</div><div class='add'>+#define  CHIPREV_ID_5750_C2		 0x4202</div><div class='ctx'> #define  CHIPREV_ID_5752_A0_HW		 0x5000</div><div class='ctx'> #define  CHIPREV_ID_5752_A0		 0x6000</div><div class='ctx'> #define  CHIPREV_ID_5752_A1		 0x6001</div><div class='hunk'>@@ -760,6 +761,7 @@</div><div class='ctx'> #define  RCVLPC_STATSCTRL_ENABLE	 0x00000001</div><div class='ctx'> #define  RCVLPC_STATSCTRL_FASTUPD	 0x00000002</div><div class='ctx'> #define RCVLPC_STATS_ENABLE		0x00002018</div><div class='add'>+#define  RCVLPC_STATSENAB_DACK_FIX	 0x00040000</div><div class='ctx'> #define  RCVLPC_STATSENAB_LNGBRST_RFIX	 0x00400000</div><div class='ctx'> #define RCVLPC_STATS_INCMASK		0x0000201c</div><div class='ctx'> /* 0x2020 --&gt; 0x2100 unused */</div><div class='hunk'>@@ -2074,12 +2076,22 @@ struct tg3 {</div><div class='ctx'> </div><div class='ctx'> 	/* SMP locking strategy:</div><div class='ctx'> 	 *</div><div class='del'>-	 * lock: Held during all operations except TX packet</div><div class='del'>-	 *       processing.</div><div class='add'>+	 * lock: Held during reset, PHY access, timer, and when</div><div class='add'>+	 *       updating tg3_flags and tg3_flags2.</div><div class='ctx'> 	 *</div><div class='del'>-	 * tx_lock: Held during tg3_start_xmit and tg3_tx</div><div class='add'>+	 * tx_lock: Held during tg3_start_xmit and tg3_tx only</div><div class='add'>+	 *          when calling netif_[start|stop]_queue.</div><div class='add'>+	 *          tg3_start_xmit is protected by netif_tx_lock.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Both of these locks are to be held with BH safety.</div><div class='add'>+	 *</div><div class='add'>+	 * Because the IRQ handler, tg3_poll, and tg3_start_xmit</div><div class='add'>+	 * are running lockless, it is necessary to completely</div><div class='add'>+	 * quiesce the chip with tg3_netif_stop and tg3_full_lock</div><div class='add'>+	 * before reconfiguring the device.</div><div class='add'>+	 *</div><div class='add'>+	 * indirect_lock: Held when accessing registers indirectly</div><div class='add'>+	 *                with IRQ disabling.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t			lock;</div><div class='ctx'> 	spinlock_t			indirect_lock;</div><div class='hunk'>@@ -2127,6 +2139,7 @@ struct tg3 {</div><div class='ctx'> 	struct tg3_rx_buffer_desc	*rx_std;</div><div class='ctx'> 	struct ring_info		*rx_std_buffers;</div><div class='ctx'> 	dma_addr_t			rx_std_mapping;</div><div class='add'>+	u32				rx_std_max_post;</div><div class='ctx'> </div><div class='ctx'> 	struct tg3_rx_buffer_desc	*rx_jumbo;</div><div class='ctx'> 	struct ring_info		*rx_jumbo_buffers;</div><div class='hunk'>@@ -2155,11 +2168,7 @@ struct tg3 {</div><div class='ctx'> #define TG3_FLAG_ENABLE_ASF		0x00000020</div><div class='ctx'> #define TG3_FLAG_5701_REG_WRITE_BUG	0x00000040</div><div class='ctx'> #define TG3_FLAG_POLL_SERDES		0x00000080</div><div class='del'>-#if defined(CONFIG_X86)</div><div class='ctx'> #define TG3_FLAG_MBOX_WRITE_REORDER	0x00000100</div><div class='del'>-#else</div><div class='del'>-#define TG3_FLAG_MBOX_WRITE_REORDER	0	/* disables code too */</div><div class='del'>-#endif</div><div class='ctx'> #define TG3_FLAG_PCIX_TARGET_HWBUG	0x00000200</div><div class='ctx'> #define TG3_FLAG_WOL_SPEED_100MB	0x00000400</div><div class='ctx'> #define TG3_FLAG_WOL_ENABLE		0x00000800</div><div class='hunk'>@@ -2172,6 +2181,7 @@ struct tg3 {</div><div class='ctx'> #define TG3_FLAG_PCI_HIGH_SPEED		0x00040000</div><div class='ctx'> #define TG3_FLAG_PCI_32BIT		0x00080000</div><div class='ctx'> #define TG3_FLAG_SRAM_USE_CONFIG	0x00100000</div><div class='add'>+#define TG3_FLAG_TX_RECOVERY_PENDING	0x00200000</div><div class='ctx'> #define TG3_FLAG_SERDES_WOL_CAP		0x00400000</div><div class='ctx'> #define TG3_FLAG_JUMBO_RING_ENABLE	0x00800000</div><div class='ctx'> #define TG3_FLAG_10_100_ONLY		0x01000000</div><div class='hunk'>@@ -2184,7 +2194,7 @@ struct tg3 {</div><div class='ctx'> #define TG3_FLAG_INIT_COMPLETE		0x80000000</div><div class='ctx'> 	u32				tg3_flags2;</div><div class='ctx'> #define TG3_FLG2_RESTART_TIMER		0x00000001</div><div class='del'>-#define TG3_FLG2_SUN_570X		0x00000002</div><div class='add'>+#define TG3_FLG2_HW_TSO_1_BUG		0x00000002</div><div class='ctx'> #define TG3_FLG2_NO_ETH_WIRE_SPEED	0x00000004</div><div class='ctx'> #define TG3_FLG2_IS_5788		0x00000008</div><div class='ctx'> #define TG3_FLG2_MAX_RXPEND_64		0x00000010</div><div class='hunk'>@@ -2216,6 +2226,7 @@ struct tg3 {</div><div class='ctx'> #define TG3_FLG2_HW_TSO			(TG3_FLG2_HW_TSO_1 | TG3_FLG2_HW_TSO_2)</div><div class='ctx'> #define TG3_FLG2_1SHOT_MSI		0x10000000</div><div class='ctx'> #define TG3_FLG2_PHY_JITTER_BUG		0x20000000</div><div class='add'>+#define TG3_FLG2_NO_FWARE_REPORTED	0x40000000</div><div class='ctx'> </div><div class='ctx'> 	u32				split_mode_max_reqs;</div><div class='ctx'> #define SPLIT_MODE_5704_MAX_REQ		3</div><div class='head'>diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c<br/>index 12076f8f942c..23c0017f25a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tlan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tlan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tlan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tlan.c</a></div><div class='hunk'>@@ -943,7 +943,7 @@ static int TLan_Open( struct net_device *dev )</div><div class='ctx'> 	int		err;</div><div class='ctx'> 	</div><div class='ctx'> 	priv-&gt;tlanRev = TLan_DioRead8( dev-&gt;base_addr, TLAN_DEF_REVISION );</div><div class='del'>-	err = request_irq( dev-&gt;irq, TLan_HandleInterrupt, SA_SHIRQ, TLanSignature, dev );</div><div class='add'>+	err = request_irq( dev-&gt;irq, TLan_HandleInterrupt, IRQF_SHARED, TLanSignature, dev );</div><div class='ctx'> 	</div><div class='ctx'> 	if ( err ) {</div><div class='ctx'> 		printk(KERN_ERR "TLAN:  Cannot open %s because IRQ %d is already in use.\n", dev-&gt;name, dev-&gt;irq );</div><div class='head'>diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c<br/>index 41e0cd8f4786..465921e3874c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/3c359.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/3c359.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/3c359.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/3c359.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> </div><div class='ctx'> #define XL_DEBUG 0</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -577,7 +576,7 @@ static int xl_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	u16 switchsettings, switchsettings_eeprom  ;</div><div class='ctx'>  </div><div class='del'>-	if(request_irq(dev-&gt;irq, &amp;xl_interrupt, SA_SHIRQ , "3c359", dev)) {</div><div class='add'>+	if(request_irq(dev-&gt;irq, &amp;xl_interrupt, IRQF_SHARED , "3c359", dev)) {</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c<br/>index 649d8ea354f5..1bdd3beefbe5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/abyss.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/abyss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/abyss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/abyss.c</a></div><div class='hunk'>@@ -123,7 +123,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 		goto err_out_trdev;</div><div class='ctx'> 	}</div><div class='ctx'> 		</div><div class='del'>-	ret = request_irq(pdev-&gt;irq, tms380tr_interrupt, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(pdev-&gt;irq, tms380tr_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_out_region;</div><div class='head'>diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c<br/>index c58a4c31d0dd..28d968ffd5d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/lanstreamer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/lanstreamer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/lanstreamer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/lanstreamer.c</a></div><div class='hunk'>@@ -100,7 +100,6 @@</div><div class='ctx'> </div><div class='ctx'> #define STREAMER_IOCTL 0</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -602,7 +601,7 @@ static int streamer_open(struct net_device *dev)</div><div class='ctx'> 	        rc=streamer_reset(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, &amp;streamer_interrupt, SA_SHIRQ, "lanstreamer", dev)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, &amp;streamer_interrupt, IRQF_SHARED, "lanstreamer", dev)) {</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> #if STREAMER_DEBUG</div><div class='head'>diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c<br/>index 19e6f4dfd69c..666bbaaae82f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/madgemc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/madgemc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/madgemc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/madgemc.c</a></div><div class='hunk'>@@ -311,7 +311,7 @@ static int __devinit madgemc_probe(struct device *device)</div><div class='ctx'> 	 */ </div><div class='ctx'> 	outb(0, dev-&gt;base_addr + MC_CONTROL_REG0); /* sanity */</div><div class='ctx'> 	madgemc_setsifsel(dev, 1);</div><div class='del'>-	if (request_irq(dev-&gt;irq, madgemc_interrupt, SA_SHIRQ,</div><div class='add'>+	if (request_irq(dev-&gt;irq, madgemc_interrupt, IRQF_SHARED,</div><div class='ctx'> 		       "madgemc", dev)) {</div><div class='ctx'> 		ret = -EBUSY;</div><div class='ctx'> 		goto getout3;</div><div class='head'>diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c<br/>index 23032a7bc0a9..85831484bc40 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/olympic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/olympic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/olympic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/olympic.c</a></div><div class='hunk'>@@ -80,7 +80,6 @@</div><div class='ctx'> #define OLYMPIC_DEBUG 0</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -217,7 +216,7 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device</div><div class='ctx'> 	dev = alloc_trdev(sizeof(struct olympic_private)) ; </div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		i = -ENOMEM; </div><div class='del'>-		goto op_free_dev;</div><div class='add'>+		goto op_release_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	olympic_priv = dev-&gt;priv ;</div><div class='hunk'>@@ -282,8 +281,8 @@ op_free_iomap:</div><div class='ctx'> 	if (olympic_priv-&gt;olympic_lap)</div><div class='ctx'> 		iounmap(olympic_priv-&gt;olympic_lap);</div><div class='ctx'> </div><div class='del'>-op_free_dev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='add'>+op_release_dev:</div><div class='ctx'> 	pci_release_regions(pdev); </div><div class='ctx'> </div><div class='ctx'> op_disable_dev:</div><div class='hunk'>@@ -446,7 +445,7 @@ static int olympic_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	olympic_init(dev);</div><div class='ctx'> </div><div class='del'>-	if(request_irq(dev-&gt;irq, &amp;olympic_interrupt, SA_SHIRQ , "olympic", dev)) {</div><div class='add'>+	if(request_irq(dev-&gt;irq, &amp;olympic_interrupt, IRQF_SHARED , "olympic", dev)) {</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c<br/>index 67d2b596ce22..cd2e0251e2bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/smctr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/smctr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/smctr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/smctr.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='hunk'>@@ -532,7 +531,7 @@ static int __init smctr_chk_mca(struct net_device *dev)</div><div class='ctx'> 			dev-&gt;irq = 15;</div><div class='ctx'>                		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (request_irq(dev-&gt;irq, smctr_interrupt, SA_SHIRQ, smctr_name, dev)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, smctr_interrupt, IRQF_SHARED, smctr_name, dev)) {</div><div class='ctx'> 		release_region(dev-&gt;base_addr, SMCTR_IO_EXTENT);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1062,7 +1061,7 @@ static int __init smctr_chk_isa(struct net_device *dev)</div><div class='ctx'>                         goto out2;</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='del'>-        if (request_irq(dev-&gt;irq, smctr_interrupt, SA_SHIRQ, smctr_name, dev))</div><div class='add'>+        if (request_irq(dev-&gt;irq, smctr_interrupt, IRQF_SHARED, smctr_name, dev))</div><div class='ctx'>                 goto out2;</div><div class='ctx'> </div><div class='ctx'>         /* Get 58x Rom Base */</div><div class='head'>diff --git a/drivers/net/tokenring/smctr_firmware.h b/drivers/net/tokenring/smctr_firmware.h<br/>index 48994b043b7c..292e50ddf01a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/smctr_firmware.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/smctr_firmware.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/smctr_firmware.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/smctr_firmware.h</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *  - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SMCTR) || defined(CONFIG_SMCTR_MODULE)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c<br/>index ab47c0547a3b..7d3e270c4f45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tokenring/tmspci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tokenring/tmspci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tokenring/tmspci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tokenring/tmspci.c</a></div><div class='hunk'>@@ -122,7 +122,7 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic</div><div class='ctx'> 		goto err_out_trdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(pdev-&gt;irq, tms380tr_interrupt, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(pdev-&gt;irq, tms380tr_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_out_region;</div><div class='head'>diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c<br/>index e3dd144d326b..d05c5aa254ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/de2104x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/de2104x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/de2104x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/de2104x.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #define DRV_VERSION		"0.7"</div><div class='ctx'> #define DRV_RELDATE		"Mar 17, 2004"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -227,12 +226,12 @@ enum {</div><div class='ctx'> 	SROMC0InfoLeaf		= 27,</div><div class='ctx'> 	MediaBlockMask		= 0x3f,</div><div class='ctx'> 	MediaCustomCSRs		= (1 &lt;&lt; 6),</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* PCIPM bits */</div><div class='ctx'> 	PM_Sleep		= (1 &lt;&lt; 31),</div><div class='ctx'> 	PM_Snooze		= (1 &lt;&lt; 30),</div><div class='ctx'> 	PM_Mask			= PM_Sleep | PM_Snooze,</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* SIAStatus bits */</div><div class='ctx'> 	NWayState		= (1 &lt;&lt; 14) | (1 &lt;&lt; 13) | (1 &lt;&lt; 12),</div><div class='ctx'> 	NWayRestart		= (1 &lt;&lt; 12),</div><div class='hunk'>@@ -858,7 +857,7 @@ static void de_stop_rxtx (struct de_private *de)</div><div class='ctx'> 			return;</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_WARNING "%s: timeout expired stopping DMA\n", de-&gt;dev-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -931,7 +930,7 @@ static void de_set_media (struct de_private *de)</div><div class='ctx'> 		macmode |= FullDuplex;</div><div class='ctx'> 	else</div><div class='ctx'> 		macmode &amp;= ~FullDuplex;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (netif_msg_link(de)) {</div><div class='ctx'> 		printk(KERN_INFO "%s: set link %s\n"</div><div class='ctx'> 		       KERN_INFO "%s:    mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n"</div><div class='hunk'>@@ -966,9 +965,9 @@ static void de21040_media_timer (unsigned long data)</div><div class='ctx'> 	u32 status = dr32(SIAStatus);</div><div class='ctx'> 	unsigned int carrier;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	carrier = (status &amp; NetCxnErr) ? 0 : 1;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	if (carrier) {</div><div class='ctx'> 		if (de-&gt;media_type != DE_MEDIA_AUI &amp;&amp; (status &amp; LinkFailStatus))</div><div class='ctx'> 			goto no_link_yet;</div><div class='hunk'>@@ -985,7 +984,7 @@ static void de21040_media_timer (unsigned long data)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	de_link_down(de);	</div><div class='add'>+	de_link_down(de);</div><div class='ctx'> </div><div class='ctx'> 	if (de-&gt;media_lock)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1039,7 +1038,7 @@ static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1050,9 +1049,9 @@ static void de21041_media_timer (unsigned long data)</div><div class='ctx'> 	u32 status = dr32(SIAStatus);</div><div class='ctx'> 	unsigned int carrier;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	carrier = (status &amp; NetCxnErr) ? 0 : 1;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	if (carrier) {</div><div class='ctx'> 		if ((de-&gt;media_type == DE_MEDIA_TP_AUTO ||</div><div class='ctx'> 		     de-&gt;media_type == DE_MEDIA_TP ||</div><div class='hunk'>@@ -1072,7 +1071,7 @@ static void de21041_media_timer (unsigned long data)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	de_link_down(de);	</div><div class='add'>+	de_link_down(de);</div><div class='ctx'> </div><div class='ctx'> 	/* if media type locked, don't switch media */</div><div class='ctx'> 	if (de-&gt;media_lock)</div><div class='hunk'>@@ -1124,7 +1123,7 @@ static void de21041_media_timer (unsigned long data)</div><div class='ctx'> 		u32 next_states[] = { DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO };</div><div class='ctx'> 		de_next_media(de, next_states, ARRAY_SIZE(next_states));</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> set_media:</div><div class='ctx'> 	spin_lock_irqsave(&amp;de-&gt;lock, flags);</div><div class='ctx'> 	de_stop_rxtx(de);</div><div class='hunk'>@@ -1148,7 +1147,7 @@ static void de_media_interrupt (struct de_private *de, u32 status)</div><div class='ctx'> 		mod_timer(&amp;de-&gt;media_timer, jiffies + DE_TIMER_LINK);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!(status &amp; LinkFail));</div><div class='ctx'> </div><div class='ctx'> 	if (netif_carrier_ok(de-&gt;dev)) {</div><div class='hunk'>@@ -1227,7 +1226,7 @@ static int de_init_hw (struct de_private *de)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	de_adapter_wake(de);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	macmode = dr32(MacMode) &amp; ~MacModeClear;</div><div class='ctx'> </div><div class='ctx'> 	rc = de_reset_mac(de);</div><div class='hunk'>@@ -1372,7 +1371,7 @@ static int de_open (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dw32(IntrMask, 0);</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(dev-&gt;irq, de_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	rc = request_irq(dev-&gt;irq, de_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",</div><div class='ctx'> 		       dev-&gt;name, dev-&gt;irq, rc);</div><div class='hunk'>@@ -1413,7 +1412,7 @@ static int de_close (struct net_device *dev)</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;de-&gt;lock, flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='ctx'> 	de_free_rings(de);</div><div class='hunk'>@@ -1441,7 +1440,7 @@ static void de_tx_timeout (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;de-&gt;lock);</div><div class='ctx'> 	enable_irq(dev-&gt;irq);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* Update the error counts. */</div><div class='ctx'> 	__de_get_stats(de);</div><div class='ctx'> </div><div class='hunk'>@@ -1451,7 +1450,7 @@ static void de_tx_timeout (struct net_device *dev)</div><div class='ctx'> 	de_init_rings(de);</div><div class='ctx'> </div><div class='ctx'> 	de_init_hw(de);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1459,7 +1458,7 @@ static void __de_get_regs(struct de_private *de, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 *rbuf = (u32 *)buf;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* read all CSRs */</div><div class='ctx'> 	for (i = 0; i &lt; DE_NUM_REGS; i++)</div><div class='ctx'> 		rbuf[i] = dr32(i * 8);</div><div class='hunk'>@@ -1474,7 +1473,7 @@ static int __de_get_settings(struct de_private *de, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	ecmd-&gt;transceiver = XCVR_INTERNAL;</div><div class='ctx'> 	ecmd-&gt;phy_address = 0;</div><div class='ctx'> 	ecmd-&gt;advertising = de-&gt;media_advertise;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch (de-&gt;media_type) {</div><div class='ctx'> 	case DE_MEDIA_AUI:</div><div class='ctx'> 		ecmd-&gt;port = PORT_AUI;</div><div class='hunk'>@@ -1489,7 +1488,7 @@ static int __de_get_settings(struct de_private *de, struct ethtool_cmd *ecmd)</div><div class='ctx'> 		ecmd-&gt;speed = SPEED_10;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (dr32(MacMode) &amp; FullDuplex)</div><div class='ctx'> 		ecmd-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1529,7 +1528,7 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	if (ecmd-&gt;autoneg == AUTONEG_ENABLE &amp;&amp;</div><div class='ctx'> 	    (!(ecmd-&gt;advertising &amp; ADVERTISED_Autoneg)))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	switch (ecmd-&gt;port) {</div><div class='ctx'> 	case PORT_AUI:</div><div class='ctx'> 		new_media = DE_MEDIA_AUI;</div><div class='hunk'>@@ -1554,22 +1553,22 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	media_lock = (ecmd-&gt;autoneg == AUTONEG_ENABLE) ? 0 : 1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if ((new_media == de-&gt;media_type) &amp;&amp;</div><div class='ctx'> 	    (media_lock == de-&gt;media_lock) &amp;&amp;</div><div class='ctx'> 	    (ecmd-&gt;advertising == de-&gt;media_advertise))</div><div class='ctx'> 		return 0; /* nothing to change */</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	de_link_down(de);</div><div class='ctx'> 	de_stop_rxtx(de);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	de-&gt;media_type = new_media;</div><div class='ctx'> 	de-&gt;media_lock = media_lock;</div><div class='ctx'> 	de-&gt;media_advertise = ecmd-&gt;advertising;</div><div class='ctx'> 	de_set_media(de);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1817,7 +1816,7 @@ static void __init de21041_get_srom_info (struct de_private *de)</div><div class='ctx'> 	case 0x0204:  de-&gt;media_type = DE_MEDIA_TP_FD; break;</div><div class='ctx'> 	default: de-&gt;media_type = DE_MEDIA_TP_AUTO; break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (netif_msg_probe(de))</div><div class='ctx'> 		printk(KERN_INFO "de%d: SROM leaf offset %u, default media %s\n",</div><div class='ctx'> 		       de-&gt;board_idx, ofs,</div><div class='hunk'>@@ -1886,7 +1885,7 @@ static void __init de21041_get_srom_info (struct de_private *de)</div><div class='ctx'> 				       de-&gt;media[idx].csr13,</div><div class='ctx'> 				       de-&gt;media[idx].csr14,</div><div class='ctx'> 				       de-&gt;media[idx].csr15);</div><div class='del'>-				       </div><div class='add'>+</div><div class='ctx'> 		} else if (netif_msg_probe(de))</div><div class='ctx'> 			printk("\n");</div><div class='ctx'> </div><div class='hunk'>@@ -2007,8 +2006,8 @@ static int __init de_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pci_resource_len(pdev, 1) &lt; DE_REGS_SIZE) {</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n",</div><div class='del'>-		       pci_resource_len(pdev, 1), pci_name(pdev));</div><div class='add'>+		printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n",</div><div class='add'>+		       (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev));</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2016,8 +2015,9 @@ static int __init de_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);</div><div class='ctx'> 	if (!regs) {</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n",</div><div class='del'>-		       pci_resource_len(pdev, 1), pciaddr, pci_name(pdev));</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",</div><div class='add'>+			(unsigned long long)pci_resource_len(pdev, 1),</div><div class='add'>+			pciaddr, pci_name(pdev));</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long) regs;</div><div class='hunk'>@@ -2118,7 +2118,7 @@ static int de_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irq(&amp;de-&gt;lock);</div><div class='ctx'> 		enable_irq(dev-&gt;irq);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* Update the error counts. */</div><div class='ctx'> 		__de_get_stats(de);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c<br/>index f56094102042..75ff14a55239 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/de4x5.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/de4x5.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/de4x5.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/de4x5.c</a></div><div class='hunk'>@@ -41,11 +41,11 @@</div><div class='ctx'>     Digital Semiconductor   SROM   Specification.    The  driver   currently</div><div class='ctx'>     recognises the following chips:</div><div class='ctx'> </div><div class='del'>-        DC21040  (no SROM) </div><div class='del'>-	DC21041[A]  </div><div class='del'>-	DC21140[A] </div><div class='del'>-	DC21142 </div><div class='del'>-	DC21143 </div><div class='add'>+        DC21040  (no SROM)</div><div class='add'>+	DC21041[A]</div><div class='add'>+	DC21140[A]</div><div class='add'>+	DC21142</div><div class='add'>+	DC21143</div><div class='ctx'> </div><div class='ctx'>     So far the driver is known to work with the following cards:</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> 	SMC8432</div><div class='ctx'> 	SMC9332 (w/new SROM)</div><div class='ctx'> 	ZNYX31[45]</div><div class='del'>-	ZNYX346 10/100 4 port (can act as a 10/100 bridge!) </div><div class='add'>+	ZNYX346 10/100 4 port (can act as a 10/100 bridge!)</div><div class='ctx'> </div><div class='ctx'>     The driver has been tested on a relatively busy network using the DE425,</div><div class='ctx'>     DE434, DE435 and DE500 cards and benchmarked with 'ttcp': it transferred</div><div class='hunk'>@@ -106,7 +106,7 @@</div><div class='ctx'>     loading by:</div><div class='ctx'> </div><div class='ctx'>                    insmod de4x5 io=0xghh           where g = bus number</div><div class='del'>-		                                        hh = device number   </div><div class='add'>+		                                        hh = device number</div><div class='ctx'> </div><div class='ctx'>        NB: autoprobing for modules is now supported by default. You may just</div><div class='ctx'>            use:</div><div class='hunk'>@@ -120,11 +120,11 @@</div><div class='ctx'>     4) if you are wanting to add a new  card, goto 5. Otherwise, recompile a</div><div class='ctx'>     kernel with the de4x5 configuration turned off and reboot.</div><div class='ctx'>     5) insmod de4x5 [io=0xghh]</div><div class='del'>-    6) run the net startup bits for your new eth?? interface(s) manually </div><div class='del'>-    (usually /etc/rc.inet[12] at boot time). </div><div class='add'>+    6) run the net startup bits for your new eth?? interface(s) manually</div><div class='add'>+    (usually /etc/rc.inet[12] at boot time).</div><div class='ctx'>     7) enjoy!</div><div class='ctx'> </div><div class='del'>-    To unload a module, turn off the associated interface(s) </div><div class='add'>+    To unload a module, turn off the associated interface(s)</div><div class='ctx'>     'ifconfig eth?? down' then 'rmmod de4x5'.</div><div class='ctx'> </div><div class='ctx'>     Automedia detection is included so that in  principal you can disconnect</div><div class='hunk'>@@ -135,7 +135,7 @@</div><div class='ctx'>     By  default,  the driver will  now   autodetect any  DECchip based card.</div><div class='ctx'>     Should you have a need to restrict the driver to DIGITAL only cards, you</div><div class='ctx'>     can compile with a  DEC_ONLY define, or if  loading as a module, use the</div><div class='del'>-    'dec_only=1'  parameter. </div><div class='add'>+    'dec_only=1'  parameter.</div><div class='ctx'> </div><div class='ctx'>     I've changed the timing routines to  use the kernel timer and scheduling</div><div class='ctx'>     functions  so that the  hangs  and other assorted problems that occurred</div><div class='hunk'>@@ -204,7 +204,7 @@</div><div class='ctx'>     following parameters are allowed:</div><div class='ctx'> </div><div class='ctx'>             fdx        for full duplex</div><div class='del'>-	    autosense  to set the media/speed; with the following </div><div class='add'>+	    autosense  to set the media/speed; with the following</div><div class='ctx'> 	               sub-parameters:</div><div class='ctx'> 		       TP, TP_NW, BNC, AUI, BNC_AUI, 100Mb, 10Mb, AUTO</div><div class='ctx'> </div><div class='hunk'>@@ -235,14 +235,14 @@</div><div class='ctx'>     this  automatically  or include  #define DE4X5_FORCE_EISA  on or  before</div><div class='ctx'>     line 1040 in the driver.</div><div class='ctx'> </div><div class='del'>-    TO DO: </div><div class='add'>+    TO DO:</div><div class='ctx'>     ------</div><div class='ctx'> </div><div class='ctx'>     Revision History</div><div class='ctx'>     ----------------</div><div class='ctx'> </div><div class='ctx'>     Version   Date        Description</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>       0.1     17-Nov-94   Initial writing. ALPHA code release.</div><div class='ctx'>       0.2     13-Jan-95   Added PCI support for DE435's.</div><div class='ctx'>       0.21    19-Jan-95   Added auto media detection.</div><div class='hunk'>@@ -251,7 +251,7 @@</div><div class='ctx'> 			  Add request/release_region code.</div><div class='ctx'> 			  Add loadable modules support for PCI.</div><div class='ctx'> 			  Clean up loadable modules support.</div><div class='del'>-      0.23    28-Feb-95   Added DC21041 and DC21140 support. </div><div class='add'>+      0.23    28-Feb-95   Added DC21041 and DC21140 support.</div><div class='ctx'>                           Fix missed frame counter value and initialisation.</div><div class='ctx'> 			  Fixed EISA probe.</div><div class='ctx'>       0.24    11-Apr-95   Change delay routine to use &lt;linux/udelay&gt;.</div><div class='hunk'>@@ -280,7 +280,7 @@</div><div class='ctx'>                           Add kernel timer code (h/w is too flaky).</div><div class='ctx'> 			  Add MII based PHY autosense.</div><div class='ctx'> 			  Add new multicasting code.</div><div class='del'>-			  Add new autosense algorithms for media/mode </div><div class='add'>+			  Add new autosense algorithms for media/mode</div><div class='ctx'> 			  selection using kernel scheduling/timing.</div><div class='ctx'> 			  Re-formatted.</div><div class='ctx'> 			  Made changes suggested by &lt;jeff@router.patch.net&gt;:</div><div class='hunk'>@@ -292,7 +292,7 @@</div><div class='ctx'>       0.41    21-Mar-96   Don't check for get_hw_addr checksum unless DEC card</div><div class='ctx'>                           only &lt;niles@axp745gsfc.nasa.gov&gt;</div><div class='ctx'> 			  Fix for multiple PCI cards reported by &lt;jos@xos.nl&gt;</div><div class='del'>-			  Duh, put the SA_SHIRQ flag into request_interrupt().</div><div class='add'>+			  Duh, put the IRQF_SHARED flag into request_interrupt().</div><div class='ctx'> 			  Fix SMC ethernet address in enet_det[].</div><div class='ctx'> 			  Print chip name instead of "UNKNOWN" during boot.</div><div class='ctx'>       0.42    26-Apr-96   Fix MII write TA bit error.</div><div class='hunk'>@@ -307,10 +307,10 @@</div><div class='ctx'>                           Add Accton to the list of broken cards.</div><div class='ctx'> 			  Fix TX under-run bug for non DC21140 chips.</div><div class='ctx'> 			  Fix boot command probe bug in alloc_device() as</div><div class='del'>-			   reported by &lt;koen.gadeyne@barco.com&gt; and </div><div class='add'>+			   reported by &lt;koen.gadeyne@barco.com&gt; and</div><div class='ctx'> 			   &lt;orava@nether.tky.hut.fi&gt;.</div><div class='ctx'> 			  Add cache locks to prevent a race condition as</div><div class='del'>-			   reported by &lt;csd@microplex.com&gt; and </div><div class='add'>+			   reported by &lt;csd@microplex.com&gt; and</div><div class='ctx'> 			   &lt;baba@beckman.uiuc.edu&gt;.</div><div class='ctx'> 			  Upgraded alloc_device() code.</div><div class='ctx'>       0.431  28-Jun-96    Fix potential bug in queue_pkt() from discussion</div><div class='hunk'>@@ -322,7 +322,7 @@</div><div class='ctx'>                            with a loopback packet.</div><div class='ctx'>       0.442   9-Sep-96    Include AUI in dc21041 media printout. Bug reported</div><div class='ctx'>                            by &lt;bhat@mundook.cs.mu.OZ.AU&gt;</div><div class='del'>-      0.45    8-Dec-96    Include endian functions for PPC use, from work </div><div class='add'>+      0.45    8-Dec-96    Include endian functions for PPC use, from work</div><div class='ctx'>                            by &lt;cort@cs.nmt.edu&gt; and &lt;g.thomas@opengroup.org&gt;.</div><div class='ctx'>       0.451  28-Dec-96    Added fix to allow autoprobe for modules after</div><div class='ctx'>                            suggestion from &lt;mjacob@feral.com&gt;.</div><div class='hunk'>@@ -346,14 +346,14 @@</div><div class='ctx'> 			   &lt;paubert@iram.es&gt;.</div><div class='ctx'>       0.52   26-Apr-97    Some changes may not credit the right people -</div><div class='ctx'>                            a disk crash meant I lost some mail.</div><div class='del'>-			  Change RX interrupt routine to drop rather than </div><div class='del'>-			   defer packets to avoid hang reported by </div><div class='add'>+			  Change RX interrupt routine to drop rather than</div><div class='add'>+			   defer packets to avoid hang reported by</div><div class='ctx'> 			   &lt;g.thomas@opengroup.org&gt;.</div><div class='ctx'> 			  Fix srom_exec() to return for COMPACT and type 1</div><div class='ctx'> 			   infoblocks.</div><div class='ctx'> 			  Added DC21142 and DC21143 functions.</div><div class='ctx'> 			  Added byte counters from &lt;phil@tazenda.demon.co.uk&gt;</div><div class='del'>-			  Added SA_INTERRUPT temporary fix from </div><div class='add'>+			  Added IRQF_DISABLED temporary fix from</div><div class='ctx'> 			   &lt;mjacob@feral.com&gt;.</div><div class='ctx'>       0.53   12-Nov-97    Fix the *_probe() to include 'eth??' name during</div><div class='ctx'>                            module load: bug reported by</div><div class='hunk'>@@ -363,10 +363,10 @@</div><div class='ctx'> 			  Make above search independent of BIOS device scan</div><div class='ctx'> 			   direction.</div><div class='ctx'> 			  Completed DC2114[23] autosense functions.</div><div class='del'>-      0.531  21-Dec-97    Fix DE500-XA 100Mb/s bug reported by </div><div class='add'>+      0.531  21-Dec-97    Fix DE500-XA 100Mb/s bug reported by</div><div class='ctx'>                            &lt;robin@intercore.com</div><div class='ctx'> 			  Fix type1_infoblock() bug introduced in 0.53, from</div><div class='del'>-			   problem reports by </div><div class='add'>+			   problem reports by</div><div class='ctx'> 			   &lt;parmee@postecss.ncrfran.france.ncr.com&gt; and</div><div class='ctx'> 			   &lt;jo@ice.dillingen.baynet.de&gt;.</div><div class='ctx'> 			  Added argument list to set up each board from either</div><div class='hunk'>@@ -374,7 +374,7 @@</div><div class='ctx'> 			  Added generic MII PHY functionality to deal with</div><div class='ctx'> 			   newer PHY chips.</div><div class='ctx'> 			  Fix the mess in 2.1.67.</div><div class='del'>-      0.532   5-Jan-98    Fix bug in mii_get_phy() reported by </div><div class='add'>+      0.532   5-Jan-98    Fix bug in mii_get_phy() reported by</div><div class='ctx'>                            &lt;redhat@cococo.net&gt;.</div><div class='ctx'>                           Fix bug in pci_probe() for 64 bit systems reported</div><div class='ctx'> 			   by &lt;belliott@accessone.com&gt;.</div><div class='hunk'>@@ -398,7 +398,7 @@</div><div class='ctx'> 			   version. I hope nothing is broken...</div><div class='ctx'>           		  Add TX done interrupt modification from suggestion</div><div class='ctx'> 			   by &lt;Austin.Donnelly@cl.cam.ac.uk&gt;.</div><div class='del'>-			  Fix is_anc_capable() bug reported by </div><div class='add'>+			  Fix is_anc_capable() bug reported by</div><div class='ctx'> 			   &lt;Austin.Donnelly@cl.cam.ac.uk&gt;.</div><div class='ctx'> 			  Fix type[13]_infoblock() bug: during MII search, PHY</div><div class='ctx'> 			   lp-&gt;rst not run because lp-&gt;ibn not initialised -</div><div class='hunk'>@@ -413,7 +413,7 @@</div><div class='ctx'> 			  Add an_exception() for old ZYNX346 and fix compile</div><div class='ctx'> 			   warning on PPC &amp; SPARC, from &lt;ecd@skynet.be&gt;.</div><div class='ctx'> 			  Fix lastPCI to correctly work with compiled in</div><div class='del'>-			   kernels and modules from bug report by </div><div class='add'>+			   kernels and modules from bug report by</div><div class='ctx'> 			   &lt;Zlatko.Calusic@CARNet.hr&gt; et al.</div><div class='ctx'>       0.542  15-Sep-98    Fix dc2114x_autoconf() to stop multiple messages</div><div class='ctx'>                            when media is unconnected.</div><div class='hunk'>@@ -425,7 +425,7 @@</div><div class='ctx'>       0.544   8-May-99    Fix for buggy SROM in Motorola embedded boards using</div><div class='ctx'>                            a 21143 by &lt;mmporter@home.com&gt;.</div><div class='ctx'> 			  Change PCI/EISA bus probing order.</div><div class='del'>-      0.545  28-Nov-99    Further Moto SROM bug fix from </div><div class='add'>+      0.545  28-Nov-99    Further Moto SROM bug fix from</div><div class='ctx'>                            &lt;mporter@eng.mcd.mot.com&gt;</div><div class='ctx'>                           Remove double checking for DEBUG_RX in de4x5_dbg_rx()</div><div class='ctx'> 			   from report by &lt;geert@linux-m68k.org&gt;</div><div class='hunk'>@@ -434,8 +434,8 @@</div><div class='ctx'>                            variable 'pb', on a non de4x5 PCI device, in this</div><div class='ctx'>                            case a PCI bridge (DEC chip 21152). The value of</div><div class='ctx'>                            'pb' is now only initialized if a de4x5 chip is</div><div class='del'>-                           present. </div><div class='del'>-                           &lt;france@handhelds.org&gt;  </div><div class='add'>+                           present.</div><div class='add'>+                           &lt;france@handhelds.org&gt;</div><div class='ctx'>       0.547  08-Nov-01    Use library crc32 functions by &lt;Matt_Domsch@dell.com&gt;</div><div class='ctx'>       0.548  30-Aug-03    Big 2.6 cleanup. Ported to PCI/EISA probing and</div><div class='ctx'>                            generic DMA APIs. Fixed DE425 support on Alpha.</div><div class='hunk'>@@ -443,7 +443,6 @@</div><div class='ctx'>     =========================================================================</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -584,7 +583,7 @@ static int de4x5_debug = (DEBUG_MEDIA | DEBUG_VERSION);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> ** Allow per adapter set up. For modules this is simply a command line</div><div class='del'>-** parameter, e.g.: </div><div class='add'>+** parameter, e.g.:</div><div class='ctx'> ** insmod de4x5 args='eth1:fdx autosense=BNC eth0:autosense=100Mb'.</div><div class='ctx'> **</div><div class='ctx'> ** For a compiled in driver, place e.g.</div><div class='hunk'>@@ -655,7 +654,7 @@ static c_char *de4x5_signatures[] = DE4X5_SIGNATURE;</div><div class='ctx'> ** Memory Alignment. Each descriptor is 4 longwords long. To force a</div><div class='ctx'> ** particular alignment on the TX descriptor, adjust DESC_SKIP_LEN and</div><div class='ctx'> ** DESC_ALIGN. ALIGN aligns the start address of the private memory area</div><div class='del'>-** and hence the RX descriptor ring's first entry. </div><div class='add'>+** and hence the RX descriptor ring's first entry.</div><div class='ctx'> */</div><div class='ctx'> #define DE4X5_ALIGN4      ((u_long)4 - 1)     /* 1 longword align */</div><div class='ctx'> #define DE4X5_ALIGN8      ((u_long)8 - 1)     /* 2 longword align */</div><div class='hunk'>@@ -1081,8 +1080,8 @@ static int (*dc_infoblock[])(struct net_device *dev, u_char, u_char *) = {</div><div class='ctx'>     mdelay(2);                           /* Wait for 2ms */\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __devinit </div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='ctx'> de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> {</div><div class='ctx'>     char name[DE4X5_NAME_LENGTH + 1];</div><div class='hunk'>@@ -1102,12 +1101,12 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'>     mdelay(10);</div><div class='ctx'> </div><div class='ctx'>     RESET_DE4X5;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if ((inl(DE4X5_STS) &amp; (STS_TS | STS_RS)) != 0) {</div><div class='ctx'> 	return -ENXIO;                       /* Hardware could not reset */</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='del'>-    /* </div><div class='add'>+</div><div class='add'>+    /*</div><div class='ctx'>     ** Now find out what kind of DC21040/DC21041/DC21140 board we have.</div><div class='ctx'>     */</div><div class='ctx'>     lp-&gt;useSROM = FALSE;</div><div class='hunk'>@@ -1116,21 +1115,21 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'>     } else {</div><div class='ctx'> 	EISA_signature(name, gendev);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (*name == '\0') {                     /* Not found a board signature */</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     dev-&gt;base_addr = iobase;</div><div class='ctx'>     printk ("%s: %s at 0x%04lx", gendev-&gt;bus_id, name, iobase);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     printk(", h/w address ");</div><div class='ctx'>     status = get_hw_addr(dev);</div><div class='ctx'>     for (i = 0; i &lt; ETH_ALEN - 1; i++) {     /* get the ethernet addr. */</div><div class='ctx'> 	printk("%2.2x:", dev-&gt;dev_addr[i]);</div><div class='ctx'>     }</div><div class='ctx'>     printk("%2.2x,\n", dev-&gt;dev_addr[i]);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (status != 0) {</div><div class='ctx'> 	printk("      which has an Ethernet PROM CRC error.\n");</div><div class='ctx'> 	return -ENXIO;</div><div class='hunk'>@@ -1171,10 +1170,10 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;tx_ring = lp-&gt;rx_ring + NUM_RX_DESC;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	** Set up the RX descriptor ring (Intels)</div><div class='del'>-	** Allocate contiguous receive buffers, long word aligned (Alphas) </div><div class='add'>+	** Allocate contiguous receive buffers, long word aligned (Alphas)</div><div class='ctx'> 	*/</div><div class='ctx'> #if !defined(__alpha__) &amp;&amp; !defined(__powerpc__) &amp;&amp; !defined(__sparc_v9__) &amp;&amp; !defined(DE4X5_DO_MEMCPY)</div><div class='ctx'> 	for (i=0; i&lt;NUM_RX_DESC; i++) {</div><div class='hunk'>@@ -1210,7 +1209,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;rxRingSize = NUM_RX_DESC;</div><div class='ctx'> 	lp-&gt;txRingSize = NUM_TX_DESC;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/* Write the end of list marker to the descriptor lists */</div><div class='ctx'> 	lp-&gt;rx_ring[lp-&gt;rxRingSize - 1].des1 |= cpu_to_le32(RD_RER);</div><div class='ctx'> 	lp-&gt;tx_ring[lp-&gt;txRingSize - 1].des1 |= cpu_to_le32(TD_TER);</div><div class='hunk'>@@ -1219,7 +1218,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> 	outl(lp-&gt;dma_rings, DE4X5_RRBA);</div><div class='ctx'> 	outl(lp-&gt;dma_rings + NUM_RX_DESC * sizeof(struct de4x5_desc),</div><div class='ctx'> 	     DE4X5_TRBA);</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/* Initialise the IRQ mask and Enable/Disable */</div><div class='ctx'> 	lp-&gt;irq_mask = IMR_RIM | IMR_TIM | IMR_TUM | IMR_UNM;</div><div class='ctx'> 	lp-&gt;irq_en   = IMR_NIM | IMR_AIM;</div><div class='hunk'>@@ -1252,7 +1251,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> 	if ((lp-&gt;chipset != DC21040) &amp;&amp; (lp-&gt;chipset != DC21041)) {</div><div class='ctx'> 	    mii_get_phy(dev);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> #ifndef __sparc_v9__</div><div class='ctx'> 	printk("      and requires IRQ%d (provided by %s).\n", dev-&gt;irq,</div><div class='ctx'> #else</div><div class='hunk'>@@ -1260,11 +1259,11 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'> #endif</div><div class='ctx'> 	       ((lp-&gt;bus == PCI) ? "PCI BIOS" : "EISA CNFG"));</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (de4x5_debug &amp; DEBUG_VERSION) {</div><div class='ctx'> 	printk(version);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* The DE4X5-specific entries in the device structure. */</div><div class='ctx'>     SET_MODULE_OWNER(dev);</div><div class='ctx'>     SET_NETDEV_DEV(dev, gendev);</div><div class='hunk'>@@ -1274,23 +1273,23 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='ctx'>     dev-&gt;get_stats = &amp;de4x5_get_stats;</div><div class='ctx'>     dev-&gt;set_multicast_list = &amp;set_multicast_list;</div><div class='ctx'>     dev-&gt;do_ioctl = &amp;de4x5_ioctl;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     dev-&gt;mem_start = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Fill in the generic fields of the device structure. */</div><div class='ctx'>     if ((status = register_netdev (dev))) {</div><div class='ctx'> 	    dma_free_coherent (gendev, lp-&gt;dma_size,</div><div class='ctx'> 			       lp-&gt;rx_ring, lp-&gt;dma_rings);</div><div class='ctx'> 	    return status;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Let the adapter sleep to save power */</div><div class='ctx'>     yawn(dev, SLEEP);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> de4x5_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1312,18 +1311,18 @@ de4x5_open(struct net_device *dev)</div><div class='ctx'>     */</div><div class='ctx'>     yawn(dev, WAKEUP);</div><div class='ctx'> </div><div class='del'>-    /* </div><div class='del'>-    ** Re-initialize the DE4X5... </div><div class='add'>+    /*</div><div class='add'>+    ** Re-initialize the DE4X5...</div><div class='ctx'>     */</div><div class='ctx'>     status = de4x5_init(dev);</div><div class='ctx'>     spin_lock_init(&amp;lp-&gt;lock);</div><div class='ctx'>     lp-&gt;state = OPEN;</div><div class='ctx'>     de4x5_dbg_open(dev);</div><div class='del'>-    </div><div class='del'>-    if (request_irq(dev-&gt;irq, (void *)de4x5_interrupt, SA_SHIRQ, </div><div class='add'>+</div><div class='add'>+    if (request_irq(dev-&gt;irq, (void *)de4x5_interrupt, IRQF_SHARED,</div><div class='ctx'> 		                                     lp-&gt;adapter_name, dev)) {</div><div class='ctx'> 	printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev-&gt;irq);</div><div class='del'>-	if (request_irq(dev-&gt;irq, de4x5_interrupt, SA_INTERRUPT | SA_SHIRQ,</div><div class='add'>+	if (request_irq(dev-&gt;irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'> 			                             lp-&gt;adapter_name, dev)) {</div><div class='ctx'> 	    printk("\n              Cannot get IRQ- reconfigure your hardware.\n");</div><div class='ctx'> 	    disable_ast(dev);</div><div class='hunk'>@@ -1340,11 +1339,11 @@ de4x5_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     lp-&gt;interrupt = UNMASK_INTERRUPTS;</div><div class='ctx'>     dev-&gt;trans_start = jiffies;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     START_DE4X5;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     de4x5_setup_intr(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (de4x5_debug &amp; DEBUG_OPEN) {</div><div class='ctx'> 	printk("\tsts:  0x%08x\n", inl(DE4X5_STS));</div><div class='ctx'> 	printk("\tbmr:  0x%08x\n", inl(DE4X5_BMR));</div><div class='hunk'>@@ -1355,7 +1354,7 @@ de4x5_open(struct net_device *dev)</div><div class='ctx'> 	printk("\tstrr: 0x%08x\n", inl(DE4X5_STRR));</div><div class='ctx'> 	printk("\tsigr: 0x%08x\n", inl(DE4X5_SIGR));</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1369,15 +1368,15 @@ de4x5_open(struct net_device *dev)</div><div class='ctx'> */</div><div class='ctx'> static int</div><div class='ctx'> de4x5_init(struct net_device *dev)</div><div class='del'>-{  </div><div class='add'>+{</div><div class='ctx'>     /* Lock out other processes whilst setting up the hardware */</div><div class='ctx'>     netif_stop_queue(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     de4x5_sw_reset(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Autoconfigure the connected port */</div><div class='ctx'>     autoconf_media(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1388,7 +1387,7 @@ de4x5_sw_reset(struct net_device *dev)</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int i, j, status = 0;</div><div class='ctx'>     s32 bmr, omr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Select the MII or SRL port now and RESET the MAC */</div><div class='ctx'>     if (!lp-&gt;useSROM) {</div><div class='ctx'> 	if (lp-&gt;phy[lp-&gt;active].id != 0) {</div><div class='hunk'>@@ -1399,7 +1398,7 @@ de4x5_sw_reset(struct net_device *dev)</div><div class='ctx'> 	de4x5_switch_mac_port(dev);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    /* </div><div class='add'>+    /*</div><div class='ctx'>     ** Set the programmable burst length to 8 longwords for all the DC21140</div><div class='ctx'>     ** Fasternet chips and 4 longwords for all others: DMA errors result</div><div class='ctx'>     ** without these values. Cache align 16 long.</div><div class='hunk'>@@ -1416,23 +1415,23 @@ de4x5_sw_reset(struct net_device *dev)</div><div class='ctx'>     outl(lp-&gt;dma_rings, DE4X5_RRBA);</div><div class='ctx'>     outl(lp-&gt;dma_rings + NUM_RX_DESC * sizeof(struct de4x5_desc),</div><div class='ctx'> 	 DE4X5_TRBA);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     lp-&gt;rx_new = lp-&gt;rx_old = 0;</div><div class='ctx'>     lp-&gt;tx_new = lp-&gt;tx_old = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i = 0; i &lt; lp-&gt;rxRingSize; i++) {</div><div class='ctx'> 	lp-&gt;rx_ring[i].status = cpu_to_le32(R_OWN);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i = 0; i &lt; lp-&gt;txRingSize; i++) {</div><div class='ctx'> 	lp-&gt;tx_ring[i].status = cpu_to_le32(0);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     barrier();</div><div class='ctx'> </div><div class='ctx'>     /* Build the setup frame depending on filtering mode */</div><div class='ctx'>     SetMulticastFilter(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     load_packet(dev, lp-&gt;setup_frame, PERFECT_F|TD_SET|SETUP_FRAME_LEN, (struct sk_buff *)1);</div><div class='ctx'>     outl(omr|OMR_ST, DE4X5_OMR);</div><div class='ctx'> </div><div class='hunk'>@@ -1445,18 +1444,18 @@ de4x5_sw_reset(struct net_device *dev)</div><div class='ctx'>     outl(omr, DE4X5_OMR);                        /* Stop everything! */</div><div class='ctx'> </div><div class='ctx'>     if (j == 0) {</div><div class='del'>-	printk("%s: Setup frame timed out, status %08x\n", dev-&gt;name, </div><div class='add'>+	printk("%s: Setup frame timed out, status %08x\n", dev-&gt;name,</div><div class='ctx'> 	       inl(DE4X5_STS));</div><div class='ctx'> 	status = -EIO;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     lp-&gt;tx_new = (++lp-&gt;tx_new) % lp-&gt;txRingSize;</div><div class='ctx'>     lp-&gt;tx_old = lp-&gt;tx_new;</div><div class='ctx'> </div><div class='ctx'>     return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'> ** Writes a socket buffer address to the next available transmit descriptor.</div><div class='ctx'> */</div><div class='ctx'> static int</div><div class='hunk'>@@ -1469,9 +1468,9 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     netif_stop_queue(dev);</div><div class='ctx'>     if (lp-&gt;tx_enable == NO) {                   /* Cannot send for now */</div><div class='del'>-	return -1;                                </div><div class='add'>+	return -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /*</div><div class='ctx'>     ** Clean out the TX ring asynchronously to interrupts - sometimes the</div><div class='ctx'>     ** interrupts are lost by delayed descriptor status updates relative to</div><div class='hunk'>@@ -1482,7 +1481,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>     spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'>     /* Test if cache is already locked - requeue skb if so */</div><div class='del'>-    if (test_and_set_bit(0, (void *)&amp;lp-&gt;cache.lock) &amp;&amp; !lp-&gt;interrupt) </div><div class='add'>+    if (test_and_set_bit(0, (void *)&amp;lp-&gt;cache.lock) &amp;&amp; !lp-&gt;interrupt)</div><div class='ctx'> 	return -1;</div><div class='ctx'> </div><div class='ctx'>     /* Transmit descriptor ring full or stale skb */</div><div class='hunk'>@@ -1509,10 +1508,10 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	    load_packet(dev, skb-&gt;data, TD_IC | TD_LS | TD_FS | skb-&gt;len, skb);</div><div class='ctx'>  	    lp-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 	    outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	    lp-&gt;tx_new = (++lp-&gt;tx_new) % lp-&gt;txRingSize;</div><div class='ctx'> 	    dev-&gt;trans_start = jiffies;</div><div class='del'>-		    </div><div class='add'>+</div><div class='ctx'> 	    if (TX_BUFFS_AVAIL) {</div><div class='ctx'> 		netif_start_queue(dev);         /* Another pkt may be queued */</div><div class='ctx'> 	    }</div><div class='hunk'>@@ -1521,15 +1520,15 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (skb) de4x5_putb_cache(dev, skb);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     lp-&gt;cache.lock = 0;</div><div class='ctx'> </div><div class='ctx'>     return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-** The DE4X5 interrupt handler. </div><div class='del'>-** </div><div class='add'>+** The DE4X5 interrupt handler.</div><div class='add'>+**</div><div class='ctx'> ** I/O Read/Writes through intermediate PCI bridges are never 'posted',</div><div class='ctx'> ** so that the asserted interrupt always has some real data to work with -</div><div class='ctx'> ** if these I/O accesses are ever changed to memory accesses, ensure the</div><div class='hunk'>@@ -1546,7 +1545,7 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>     s32 imr, omr, sts, limit;</div><div class='ctx'>     u_long iobase;</div><div class='ctx'>     unsigned int handled = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (dev == NULL) {</div><div class='ctx'> 	printk ("de4x5_interrupt(): irq %d for unknown device.\n", irq);</div><div class='ctx'> 	return IRQ_NONE;</div><div class='hunk'>@@ -1554,35 +1553,35 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>     lp = netdev_priv(dev);</div><div class='ctx'>     spin_lock(&amp;lp-&gt;lock);</div><div class='ctx'>     iobase = dev-&gt;base_addr;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     DISABLE_IRQs;                        /* Ensure non re-entrancy */</div><div class='ctx'> </div><div class='ctx'>     if (test_and_set_bit(MASK_INTERRUPTS, (void*) &amp;lp-&gt;interrupt))</div><div class='ctx'> 	printk("%s: Re-entering the interrupt handler.\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'>     synchronize_irq(dev-&gt;irq);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     for (limit=0; limit&lt;8; limit++) {</div><div class='ctx'> 	sts = inl(DE4X5_STS);            /* Read IRQ status */</div><div class='ctx'> 	outl(sts, DE4X5_STS);            /* Reset the board interrupts */</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	if (!(sts &amp; lp-&gt;irq_mask)) break;/* All done */</div><div class='ctx'> 	handled = 1;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	if (sts &amp; (STS_RI | STS_RU))     /* Rx interrupt (packet[s] arrived) */</div><div class='ctx'> 	  de4x5_rx(dev);</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	if (sts &amp; (STS_TI | STS_TU))     /* Tx interrupt (packet sent) */</div><div class='del'>-	  de4x5_tx(dev); </div><div class='del'>-	    </div><div class='add'>+	  de4x5_tx(dev);</div><div class='add'>+</div><div class='ctx'> 	if (sts &amp; STS_LNF) {             /* TP Link has failed */</div><div class='ctx'> 	    lp-&gt;irq_mask &amp;= ~IMR_LFM;</div><div class='ctx'> 	}</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	if (sts &amp; STS_UNF) {             /* Transmit underrun */</div><div class='ctx'> 	    de4x5_txur(dev);</div><div class='ctx'> 	}</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	if (sts &amp; STS_SE) {              /* Bus Error */</div><div class='ctx'> 	    STOP_DE4X5;</div><div class='ctx'> 	    printk("%s: Fatal bus error occurred, sts=%#8x, device stopped.\n",</div><div class='hunk'>@@ -1603,7 +1602,7 @@ de4x5_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>     lp-&gt;interrupt = UNMASK_INTERRUPTS;</div><div class='ctx'>     ENABLE_IRQs;</div><div class='ctx'>     spin_unlock(&amp;lp-&gt;lock);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1614,11 +1613,11 @@ de4x5_rx(struct net_device *dev)</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int entry;</div><div class='ctx'>     s32 status;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (entry=lp-&gt;rx_new; (s32)le32_to_cpu(lp-&gt;rx_ring[entry].status)&gt;=0;</div><div class='ctx'> 	                                                    entry=lp-&gt;rx_new) {</div><div class='ctx'> 	status = (s32)le32_to_cpu(lp-&gt;rx_ring[entry].status);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (lp-&gt;rx_ovf) {</div><div class='ctx'> 	    if (inl(DE4X5_MFC) &amp; MFC_FOCM) {</div><div class='ctx'> 		de4x5_rx_ovfc(dev);</div><div class='hunk'>@@ -1629,7 +1628,7 @@ de4x5_rx(struct net_device *dev)</div><div class='ctx'> 	if (status &amp; RD_FS) {                 /* Remember the start of frame */</div><div class='ctx'> 	    lp-&gt;rx_old = entry;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (status &amp; RD_LS) {                 /* Valid frame status */</div><div class='ctx'> 	    if (lp-&gt;tx_enable) lp-&gt;linkOK++;</div><div class='ctx'> 	    if (status &amp; RD_ES) {	      /* There was an error. */</div><div class='hunk'>@@ -1646,9 +1645,9 @@ de4x5_rx(struct net_device *dev)</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='ctx'> 		short pkt_len = (short)(le32_to_cpu(lp-&gt;rx_ring[entry].status)</div><div class='ctx'> 					                            &gt;&gt; 16) - 4;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if ((skb = de4x5_alloc_rx_buff(dev, entry, pkt_len)) == NULL) {</div><div class='del'>-		    printk("%s: Insufficient memory; nuking packet.\n", </div><div class='add'>+		    printk("%s: Insufficient memory; nuking packet.\n",</div><div class='ctx'> 			                                            dev-&gt;name);</div><div class='ctx'> 		    lp-&gt;stats.rx_dropped++;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1658,14 +1657,14 @@ de4x5_rx(struct net_device *dev)</div><div class='ctx'> 		    skb-&gt;protocol=eth_type_trans(skb,dev);</div><div class='ctx'> 		    de4x5_local_stats(dev, skb-&gt;data, pkt_len);</div><div class='ctx'> 		    netif_rx(skb);</div><div class='del'>-		    </div><div class='add'>+</div><div class='ctx'> 		    /* Update stats */</div><div class='ctx'> 		    dev-&gt;last_rx = jiffies;</div><div class='ctx'> 		    lp-&gt;stats.rx_packets++;</div><div class='ctx'>  		    lp-&gt;stats.rx_bytes += pkt_len;</div><div class='ctx'> 		}</div><div class='ctx'> 	    }</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	    /* Change buffer ownership for this frame, back to the adapter */</div><div class='ctx'> 	    for (;lp-&gt;rx_old!=entry;lp-&gt;rx_old=(++lp-&gt;rx_old)%lp-&gt;rxRingSize) {</div><div class='ctx'> 		lp-&gt;rx_ring[lp-&gt;rx_old].status = cpu_to_le32(R_OWN);</div><div class='hunk'>@@ -1674,13 +1673,13 @@ de4x5_rx(struct net_device *dev)</div><div class='ctx'> 	    lp-&gt;rx_ring[entry].status = cpu_to_le32(R_OWN);</div><div class='ctx'> 	    barrier();</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	** Update entry information</div><div class='ctx'> 	*/</div><div class='ctx'> 	lp-&gt;rx_new = (++lp-&gt;rx_new) % lp-&gt;rxRingSize;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1705,20 +1704,20 @@ de4x5_tx(struct net_device *dev)</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int entry;</div><div class='ctx'>     s32 status;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (entry = lp-&gt;tx_old; entry != lp-&gt;tx_new; entry = lp-&gt;tx_old) {</div><div class='ctx'> 	status = (s32)le32_to_cpu(lp-&gt;tx_ring[entry].status);</div><div class='ctx'> 	if (status &lt; 0) {                     /* Buffer not sent yet */</div><div class='ctx'> 	    break;</div><div class='ctx'> 	} else if (status != 0x7fffffff) {    /* Not setup frame */</div><div class='ctx'> 	    if (status &amp; TD_ES) {             /* An error happened */</div><div class='del'>-		lp-&gt;stats.tx_errors++; </div><div class='add'>+		lp-&gt;stats.tx_errors++;</div><div class='ctx'> 		if (status &amp; TD_NC) lp-&gt;stats.tx_carrier_errors++;</div><div class='ctx'> 		if (status &amp; TD_LC) lp-&gt;stats.tx_window_errors++;</div><div class='ctx'> 		if (status &amp; TD_UF) lp-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 		if (status &amp; TD_EC) lp-&gt;pktStats.excessive_collisions++;</div><div class='ctx'> 		if (status &amp; TD_DE) lp-&gt;stats.tx_aborted_errors++;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 		if (TX_PKT_PENDING) {</div><div class='ctx'> 		    outl(POLL_DEMAND, DE4X5_TPD);/* Restart a stalled TX */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1727,14 +1726,14 @@ de4x5_tx(struct net_device *dev)</div><div class='ctx'> 		if (lp-&gt;tx_enable) lp-&gt;linkOK++;</div><div class='ctx'> 	    }</div><div class='ctx'> 	    /* Update the collision counter */</div><div class='del'>-	    lp-&gt;stats.collisions += ((status &amp; TD_EC) ? 16 : </div><div class='add'>+	    lp-&gt;stats.collisions += ((status &amp; TD_EC) ? 16 :</div><div class='ctx'> 				                      ((status &amp; TD_CC) &gt;&gt; 3));</div><div class='ctx'> </div><div class='ctx'> 	    /* Free the buffer. */</div><div class='ctx'> 	    if (lp-&gt;tx_skb[entry] != NULL)</div><div class='ctx'> 	    	de4x5_free_tx_buff(lp, entry);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Update all the pointers */</div><div class='ctx'> 	lp-&gt;tx_old = (++lp-&gt;tx_old) % lp-&gt;txRingSize;</div><div class='ctx'>     }</div><div class='hunk'>@@ -1746,7 +1745,7 @@ de4x5_tx(struct net_device *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 	    netif_start_queue(dev);</div><div class='ctx'>     }</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1755,9 +1754,9 @@ de4x5_ast(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     disable_ast(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;useSROM) {</div><div class='ctx'> 	next_tick = srom_autoconf(dev);</div><div class='ctx'>     } else if (lp-&gt;chipset == DC21140) {</div><div class='hunk'>@@ -1769,7 +1768,7 @@ de4x5_ast(struct net_device *dev)</div><div class='ctx'>     }</div><div class='ctx'>     lp-&gt;linkOK = 0;</div><div class='ctx'>     enable_ast(dev, next_tick);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1792,11 +1791,11 @@ de4x5_txur(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(omr | OMR_ST | OMR_SR, DE4X5_OMR);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> de4x5_rx_ovfc(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -1813,7 +1812,7 @@ de4x5_rx_ovfc(struct net_device *dev)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     outl(omr, DE4X5_OMR);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1823,22 +1822,22 @@ de4x5_close(struct net_device *dev)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     s32 imr, omr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     disable_ast(dev);</div><div class='ctx'> </div><div class='ctx'>     netif_stop_queue(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (de4x5_debug &amp; DEBUG_CLOSE) {</div><div class='ctx'> 	printk("%s: Shutting down ethercard, status was %8.8x.\n",</div><div class='ctx'> 	       dev-&gt;name, inl(DE4X5_STS));</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='del'>-    /* </div><div class='add'>+</div><div class='add'>+    /*</div><div class='ctx'>     ** We stop the DE4X5 here... mask interrupts and stop TX &amp; RX</div><div class='ctx'>     */</div><div class='ctx'>     DISABLE_IRQs;</div><div class='ctx'>     STOP_DE4X5;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Free the associated irq */</div><div class='ctx'>     free_irq(dev-&gt;irq, dev);</div><div class='ctx'>     lp-&gt;state = CLOSED;</div><div class='hunk'>@@ -1846,10 +1845,10 @@ de4x5_close(struct net_device *dev)</div><div class='ctx'>     /* Free any socket buffers */</div><div class='ctx'>     de4x5_free_rx_buffs(dev);</div><div class='ctx'>     de4x5_free_tx_buffs(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Put the adapter to sleep to save power */</div><div class='ctx'>     yawn(dev, SLEEP);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1858,9 +1857,9 @@ de4x5_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     lp-&gt;stats.rx_missed_errors = (int)(inl(DE4X5_MFC) &amp; (MFC_OVFL | MFC_CNTR));</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return &amp;lp-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1886,7 +1885,7 @@ de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len)</div><div class='ctx'> 	       (*(s16 *)&amp;buf[4] == *(s16 *)&amp;dev-&gt;dev_addr[4])) {</div><div class='ctx'>         lp-&gt;pktStats.unicast++;</div><div class='ctx'>     }</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'>     lp-&gt;pktStats.bins[0]++;       /* Duplicates stats.rx_packets */</div><div class='ctx'>     if (lp-&gt;pktStats.bins[0] == 0) { /* Reset counters */</div><div class='ctx'>         memset((char *)&amp;lp-&gt;pktStats, 0, sizeof(lp-&gt;pktStats));</div><div class='hunk'>@@ -1937,11 +1936,11 @@ set_multicast_list(struct net_device *dev)</div><div class='ctx'> 	    omr = inl(DE4X5_OMR);</div><div class='ctx'> 	    omr |= OMR_PR;</div><div class='ctx'> 	    outl(omr, DE4X5_OMR);</div><div class='del'>-	} else { </div><div class='add'>+	} else {</div><div class='ctx'> 	    SetMulticastFilter(dev);</div><div class='del'>-	    load_packet(dev, lp-&gt;setup_frame, TD_IC | PERFECT_F | TD_SET | </div><div class='add'>+	    load_packet(dev, lp-&gt;setup_frame, TD_IC | PERFECT_F | TD_SET |</div><div class='ctx'> 			                                SETUP_FRAME_LEN, (struct sk_buff *)1);</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	    lp-&gt;tx_new = (++lp-&gt;tx_new) % lp-&gt;txRingSize;</div><div class='ctx'> 	    outl(POLL_DEMAND, DE4X5_TPD);       /* Start the TX */</div><div class='ctx'> 	    dev-&gt;trans_start = jiffies;</div><div class='hunk'>@@ -1969,20 +1968,20 @@ SetMulticastFilter(struct net_device *dev)</div><div class='ctx'>     omr = inl(DE4X5_OMR);</div><div class='ctx'>     omr &amp;= ~(OMR_PR | OMR_PM);</div><div class='ctx'>     pa = build_setup_frame(dev, ALL);        /* Build the basic frame */</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if ((dev-&gt;flags &amp; IFF_ALLMULTI) || (dev-&gt;mc_count &gt; 14)) {</div><div class='ctx'> 	omr |= OMR_PM;                       /* Pass all multicasts */</div><div class='ctx'>     } else if (lp-&gt;setup_f == HASH_PERF) {   /* Hash Filtering */</div><div class='ctx'> 	for (i=0;i&lt;dev-&gt;mc_count;i++) {      /* for each address in the list */</div><div class='ctx'> 	    addrs=dmi-&gt;dmi_addr;</div><div class='ctx'> 	    dmi=dmi-&gt;next;</div><div class='del'>-	    if ((*addrs &amp; 0x01) == 1) {      /* multicast address? */ </div><div class='add'>+	    if ((*addrs &amp; 0x01) == 1) {      /* multicast address? */</div><div class='ctx'> 		crc = ether_crc_le(ETH_ALEN, addrs);</div><div class='ctx'> 		hashcode = crc &amp; HASH_BITS;  /* hashcode is 9 LSb of CRC */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		byte = hashcode &gt;&gt; 3;        /* bit[3-8] -&gt; byte in filter */</div><div class='ctx'> 		bit = 1 &lt;&lt; (hashcode &amp; 0x07);/* bit[0-2] -&gt; bit in byte */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		byte &lt;&lt;= 1;                  /* calc offset into setup frame */</div><div class='ctx'> 		if (byte &amp; 0x02) {</div><div class='ctx'> 		    byte -= 1;</div><div class='hunk'>@@ -1994,14 +1993,14 @@ SetMulticastFilter(struct net_device *dev)</div><div class='ctx'> 	for (j=0; j&lt;dev-&gt;mc_count; j++) {</div><div class='ctx'> 	    addrs=dmi-&gt;dmi_addr;</div><div class='ctx'> 	    dmi=dmi-&gt;next;</div><div class='del'>-	    for (i=0; i&lt;ETH_ALEN; i++) { </div><div class='add'>+	    for (i=0; i&lt;ETH_ALEN; i++) {</div><div class='ctx'> 		*(pa + (i&amp;1)) = *addrs++;</div><div class='ctx'> 		if (i &amp; 0x01) pa += 4;</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='ctx'>     outl(omr, DE4X5_OMR);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2031,18 +2030,18 @@ static int __init de4x5_eisa_probe (struct device *gendev)</div><div class='ctx'> 		status = -EBUSY;</div><div class='ctx'> 		goto release_reg_1;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!(dev = alloc_etherdev (sizeof (struct de4x5_private)))) {</div><div class='ctx'> 		status = -ENOMEM;</div><div class='ctx'> 		goto release_reg_2;</div><div class='ctx'> 	}</div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	cfid = (u32) inl(PCI_CFID);</div><div class='ctx'> 	lp-&gt;cfrv = (u_short) inl(PCI_CFRV);</div><div class='ctx'> 	device = (cfid &gt;&gt; 8) &amp; 0x00ffff00;</div><div class='ctx'> 	vendor = (u_short) cfid;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/* Read the EISA Configuration Registers */</div><div class='ctx'> 	regval = inb(EISA_REG0) &amp; (ER0_INTL | ER0_INTT);</div><div class='ctx'> #ifdef CONFIG_ALPHA</div><div class='hunk'>@@ -2050,7 +2049,7 @@ static int __init de4x5_eisa_probe (struct device *gendev)</div><div class='ctx'> 	 * care about the EISA configuration, and thus doesn't</div><div class='ctx'> 	 * configure the PLX bridge properly. Oh well... Simply mimic</div><div class='ctx'> 	 * the EISA config file to sort it out. */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* EISA REG1: Assert DecChip 21040 HW Reset */</div><div class='ctx'> 	outb (ER1_IAM | 1, EISA_REG1);</div><div class='ctx'> 	mdelay (1);</div><div class='hunk'>@@ -2061,12 +2060,12 @@ static int __init de4x5_eisa_probe (struct device *gendev)</div><div class='ctx'> </div><div class='ctx'> 	/* EISA REG3: R/W Burst Transfer Enable */</div><div class='ctx'> 	outb (ER3_BWE | ER3_BRE, EISA_REG3);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* 32_bit slave/master, Preempt Time=23 bclks, Unlatched Interrupt */</div><div class='ctx'> 	outb (ER0_BSW | ER0_BMW | ER0_EPT | regval, EISA_REG0);</div><div class='ctx'> #endif</div><div class='ctx'> 	irq = de4x5_irq[(regval &gt;&gt; 1) &amp; 0x03];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (is_DC2114x) {</div><div class='ctx'> 	    device = ((lp-&gt;cfrv &amp; CFRV_RN) &lt; DC2114x_BRK ? DC21142 : DC21143);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2077,7 +2076,7 @@ static int __init de4x5_eisa_probe (struct device *gendev)</div><div class='ctx'> 	outl(PCI_COMMAND_IO | PCI_COMMAND_MASTER, PCI_CFCS);</div><div class='ctx'> 	outl(0x00006000, PCI_CFLT);</div><div class='ctx'> 	outl(iobase, PCI_CBIO);</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	DevicePresent(dev, EISA_APROM);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='hunk'>@@ -2102,7 +2101,7 @@ static int __devexit de4x5_eisa_remove (struct device *device)</div><div class='ctx'> </div><div class='ctx'> 	dev = device-&gt;driver_data;</div><div class='ctx'> 	iobase = dev-&gt;base_addr;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	unregister_netdev (dev);</div><div class='ctx'> 	free_netdev (dev);</div><div class='ctx'> 	release_region (iobase + DE4X5_EISA_IO_PORTS, DE4X5_EISA_TOTAL_SIZE);</div><div class='hunk'>@@ -2131,11 +2130,11 @@ MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> ** This function searches the current bus (which is &gt;0) for a DECchip with an</div><div class='del'>-** SROM, so that in multiport cards that have one SROM shared between multiple </div><div class='add'>+** SROM, so that in multiport cards that have one SROM shared between multiple</div><div class='ctx'> ** DECchips, we can find the base SROM irrespective of the BIOS scan direction.</div><div class='ctx'> ** For single port cards this is a time waster...</div><div class='ctx'> */</div><div class='del'>-static void __devinit </div><div class='add'>+static void __devinit</div><div class='ctx'> srom_search(struct net_device *dev, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'>     u_char pb;</div><div class='hunk'>@@ -2163,7 +2162,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)</div><div class='ctx'> 	/* Set the device number information */</div><div class='ctx'> 	lp-&gt;device = PCI_SLOT(this_dev-&gt;devfn);</div><div class='ctx'> 	lp-&gt;bus_num = pb;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/* Set the chipset information */</div><div class='ctx'> 	if (is_DC2114x) {</div><div class='ctx'> 	    device = ((cfrv &amp; CFRV_RN) &lt; DC2114x_BRK ? DC21142 : DC21143);</div><div class='hunk'>@@ -2176,7 +2175,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)</div><div class='ctx'> 	/* Fetch the IRQ to be used */</div><div class='ctx'> 	irq = this_dev-&gt;irq;</div><div class='ctx'> 	if ((irq == 0) || (irq == 0xff) || ((int)irq == -1)) continue;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/* Check if I/O accesses are enabled */</div><div class='ctx'> 	pci_read_config_word(this_dev, PCI_COMMAND, &amp;status);</div><div class='ctx'> 	if (!(status &amp; PCI_COMMAND_IO)) continue;</div><div class='hunk'>@@ -2254,7 +2253,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,</div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='ctx'> 	lp-&gt;bus = PCI;</div><div class='ctx'> 	lp-&gt;bus_num = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Search for an SROM on this bus */</div><div class='ctx'> 	if (lp-&gt;bus_num != pb) {</div><div class='ctx'> 	    lp-&gt;bus_num = pb;</div><div class='hunk'>@@ -2267,7 +2266,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,</div><div class='ctx'> 	/* Set the device number information */</div><div class='ctx'> 	lp-&gt;device = dev_num;</div><div class='ctx'> 	lp-&gt;bus_num = pb;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Set the chipset information */</div><div class='ctx'> 	if (is_DC2114x) {</div><div class='ctx'> 	    device = ((lp-&gt;cfrv &amp; CFRV_RN) &lt; DC2114x_BRK ? DC21142 : DC21143);</div><div class='hunk'>@@ -2283,7 +2282,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,</div><div class='ctx'> 		error = -ENODEV;</div><div class='ctx'> 		goto free_dev;</div><div class='ctx'> 	}</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	/* Check if I/O accesses and Bus Mastering are enabled */</div><div class='ctx'> 	pci_read_config_word(pdev, PCI_COMMAND, &amp;status);</div><div class='ctx'> #ifdef __powerpc__</div><div class='hunk'>@@ -2322,7 +2321,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if ((error = de4x5_hw_init(dev, iobase, &amp;pdev-&gt;dev))) {</div><div class='ctx'> 		goto release;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2377,7 +2376,7 @@ static struct pci_driver de4x5_pci_driver = {</div><div class='ctx'> ** Auto configure the media here rather than setting the port at compile</div><div class='ctx'> ** time. This routine is called by de4x5_init() and when a loss of media is</div><div class='ctx'> ** detected (excessive collisions, loss of carrier, no carrier or link fail</div><div class='del'>-** [TP] or no recent receive activity) to check whether the user has been </div><div class='add'>+** [TP] or no recent receive activity) to check whether the user has been</div><div class='ctx'> ** sneaky and changed the port on us.</div><div class='ctx'> */</div><div class='ctx'> static int</div><div class='hunk'>@@ -2405,7 +2404,7 @@ autoconf_media(struct net_device *dev)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     enable_ast(dev, next_tick);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return (lp-&gt;media);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2428,7 +2427,7 @@ dc21040_autoconf(struct net_device *dev)</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='ctx'>     s32 imr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     switch (lp-&gt;media) {</div><div class='ctx'>     case INIT:</div><div class='ctx'> 	DISABLE_IRQs;</div><div class='hunk'>@@ -2447,36 +2446,36 @@ dc21040_autoconf(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;local_state = 0;</div><div class='ctx'> 	next_tick = dc21040_autoconf(dev);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case TP:</div><div class='del'>-	next_tick = dc21040_state(dev, 0x8f01, 0xffff, 0x0000, 3000, BNC_AUI, </div><div class='add'>+	next_tick = dc21040_state(dev, 0x8f01, 0xffff, 0x0000, 3000, BNC_AUI,</div><div class='ctx'> 		                                         TP_SUSPECT, test_tp);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case TP_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, TP, test_tp, dc21040_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case BNC:</div><div class='ctx'>     case AUI:</div><div class='ctx'>     case BNC_AUI:</div><div class='del'>-	next_tick = dc21040_state(dev, 0x8f09, 0x0705, 0x0006, 3000, EXT_SIA, </div><div class='add'>+	next_tick = dc21040_state(dev, 0x8f09, 0x0705, 0x0006, 3000, EXT_SIA,</div><div class='ctx'> 		                                  BNC_AUI_SUSPECT, ping_media);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case BNC_AUI_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, BNC_AUI, ping_media, dc21040_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case EXT_SIA:</div><div class='del'>-	next_tick = dc21040_state(dev, 0x3041, 0x0000, 0x0006, 3000, </div><div class='add'>+	next_tick = dc21040_state(dev, 0x3041, 0x0000, 0x0006, 3000,</div><div class='ctx'> 		                              NC, EXT_SIA_SUSPECT, ping_media);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case EXT_SIA_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, EXT_SIA, ping_media, dc21040_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case NC:</div><div class='ctx'> 	/* default to TP for all */</div><div class='ctx'> 	reset_init_sia(dev, 0x8f01, 0xffff, 0x0000);</div><div class='hunk'>@@ -2488,13 +2487,13 @@ dc21040_autoconf(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;tx_enable = NO;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return next_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> dc21040_state(struct net_device *dev, int csr13, int csr14, int csr15, int timeout,</div><div class='del'>-	      int next_state, int suspect_state, </div><div class='add'>+	      int next_state, int suspect_state,</div><div class='ctx'> 	      int (*fn)(struct net_device *, int))</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -2507,7 +2506,7 @@ dc21040_state(struct net_device *dev, int csr13, int csr14, int csr15, int timeo</div><div class='ctx'> 	lp-&gt;local_state++;</div><div class='ctx'> 	next_tick = 500;</div><div class='ctx'> 	break;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'>     case 1:</div><div class='ctx'> 	if (!lp-&gt;tx_enable) {</div><div class='ctx'> 	    linkBad = fn(dev, timeout);</div><div class='hunk'>@@ -2527,7 +2526,7 @@ dc21040_state(struct net_device *dev, int csr13, int csr14, int csr15, int timeo</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return next_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2582,7 +2581,7 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     s32 sts, irqs, irq_mask, imr, omr;</div><div class='ctx'>     int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     switch (lp-&gt;media) {</div><div class='ctx'>     case INIT:</div><div class='ctx'> 	DISABLE_IRQs;</div><div class='hunk'>@@ -2603,7 +2602,7 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;local_state = 0;</div><div class='ctx'> 	next_tick = dc21041_autoconf(dev);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case TP_NW:</div><div class='ctx'> 	if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	    omr = inl(DE4X5_OMR);/* Set up full duplex for the autonegotiate */</div><div class='hunk'>@@ -2623,7 +2622,7 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = dc21041_autoconf(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case ANS:</div><div class='ctx'> 	if (!lp-&gt;tx_enable) {</div><div class='ctx'> 	    irqs = STS_LNP;</div><div class='hunk'>@@ -2645,11 +2644,11 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = 3000;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case ANS_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, ANS, test_tp, dc21041_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case TP:</div><div class='ctx'> 	if (!lp-&gt;tx_enable) {</div><div class='ctx'> 	    if (lp-&gt;timeout &lt; 0) {</div><div class='hunk'>@@ -2679,11 +2678,11 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = 3000;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case TP_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, TP, test_tp, dc21041_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case AUI:</div><div class='ctx'> 	if (!lp-&gt;tx_enable) {</div><div class='ctx'> 	    if (lp-&gt;timeout &lt; 0) {</div><div class='hunk'>@@ -2709,11 +2708,11 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = 3000;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case AUI_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, AUI, ping_media, dc21041_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case BNC:</div><div class='ctx'> 	switch (lp-&gt;local_state) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -2731,7 +2730,7 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 		next_tick = dc21041_autoconf(dev);</div><div class='ctx'> 	    }</div><div class='ctx'> 	    break;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	    if (!lp-&gt;tx_enable) {</div><div class='ctx'> 		if ((sts = ping_media(dev, 3000)) &lt; 0) {</div><div class='hunk'>@@ -2751,11 +2750,11 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	    break;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case BNC_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, BNC, ping_media, dc21041_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case NC:</div><div class='ctx'> 	omr = inl(DE4X5_OMR);    /* Set up full duplex for the autonegotiate */</div><div class='ctx'> 	outl(omr | OMR_FDX, DE4X5_OMR);</div><div class='hunk'>@@ -2768,7 +2767,7 @@ dc21041_autoconf(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;tx_enable = NO;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return next_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2784,9 +2783,9 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'>     int ana, anlpa, cap, cr, slnk, sr;</div><div class='ctx'>     int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='ctx'>     u_long imr, omr, iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     switch(lp-&gt;media) {</div><div class='del'>-    case INIT: </div><div class='add'>+    case INIT:</div><div class='ctx'>         if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	    DISABLE_IRQs;</div><div class='ctx'> 	    lp-&gt;tx_enable = FALSE;</div><div class='hunk'>@@ -2813,7 +2812,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 		    lp-&gt;media = _100Mb;</div><div class='ctx'> 		} else if (lp-&gt;autosense == _10Mb) {</div><div class='ctx'> 		    lp-&gt;media = _10Mb;</div><div class='del'>-		} else if ((lp-&gt;autosense == AUTO) &amp;&amp; </div><div class='add'>+		} else if ((lp-&gt;autosense == AUTO) &amp;&amp;</div><div class='ctx'> 			            ((sr=is_anc_capable(dev)) &amp; MII_SR_ANC)) {</div><div class='ctx'> 		    ana = (((sr &gt;&gt; 6) &amp; MII_ANA_TAF) | MII_ANA_CSMA);</div><div class='ctx'> 		    ana &amp;= (lp-&gt;fdx ? ~0 : ~MII_ANA_FDAM);</div><div class='hunk'>@@ -2831,7 +2830,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = dc21140m_autoconf(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case ANS:</div><div class='ctx'> 	switch (lp-&gt;local_state) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -2851,7 +2850,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 		next_tick = dc21140m_autoconf(dev);</div><div class='ctx'> 	    }</div><div class='ctx'> 	    break;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	    if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, TRUE, 2000)) &lt; 0) {</div><div class='ctx'> 		next_tick = sr &amp; ~TIMER_CB;</div><div class='hunk'>@@ -2862,7 +2861,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 		    lp-&gt;tmp = MII_SR_ASSC;</div><div class='ctx'> 		    anlpa = mii_rd(MII_ANLPA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='ctx'> 		    ana = mii_rd(MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    if (!(anlpa &amp; MII_ANLPA_RF) &amp;&amp; </div><div class='add'>+		    if (!(anlpa &amp; MII_ANLPA_RF) &amp;&amp;</div><div class='ctx'> 			 (cap = anlpa &amp; MII_ANLPA_TAF &amp; ana)) {</div><div class='ctx'> 			if (cap &amp; MII_ANA_100M) {</div><div class='ctx'> 			    lp-&gt;fdx = ((ana &amp; anlpa &amp; MII_ANA_FDAM &amp; MII_ANA_100M) ? TRUE : FALSE);</div><div class='hunk'>@@ -2879,10 +2878,10 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 	    break;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case SPD_DET:                              /* Choose 10Mb/s or 100Mb/s */</div><div class='ctx'>         if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	    lp-&gt;tmp = (lp-&gt;phy[lp-&gt;active].id ? MII_SR_LKS : </div><div class='add'>+	    lp-&gt;tmp = (lp-&gt;phy[lp-&gt;active].id ? MII_SR_LKS :</div><div class='ctx'> 		                                  (~gep_rd(dev) &amp; GEP_LNP));</div><div class='ctx'> 	    SET_100Mb_PDET;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2899,7 +2898,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = dc21140m_autoconf(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case _100Mb:                               /* Set 100Mb/s */</div><div class='ctx'>         next_tick = 3000;</div><div class='ctx'> 	if (!lp-&gt;tx_enable) {</div><div class='hunk'>@@ -2933,7 +2932,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case NC:</div><div class='ctx'>         if (lp-&gt;media != lp-&gt;c_media) {</div><div class='ctx'> 	    de4x5_dbg_media(dev);</div><div class='hunk'>@@ -2943,7 +2942,7 @@ dc21140m_autoconf(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;tx_enable = FALSE;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return next_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3002,7 +3001,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 		lp-&gt;media = AUI;</div><div class='ctx'> 	    } else {</div><div class='ctx'> 		lp-&gt;media = SPD_DET;</div><div class='del'>-		if ((lp-&gt;infoblock_media == ANS) &amp;&amp; </div><div class='add'>+		if ((lp-&gt;infoblock_media == ANS) &amp;&amp;</div><div class='ctx'> 		                    ((sr=is_anc_capable(dev)) &amp; MII_SR_ANC)) {</div><div class='ctx'> 		    ana = (((sr &gt;&gt; 6) &amp; MII_ANA_TAF) | MII_ANA_CSMA);</div><div class='ctx'> 		    ana &amp;= (lp-&gt;fdx ? ~0 : ~MII_ANA_FDAM);</div><div class='hunk'>@@ -3014,7 +3013,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = dc2114x_autoconf(dev);</div><div class='ctx'>         }</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case ANS:</div><div class='ctx'> 	switch (lp-&gt;local_state) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -3034,7 +3033,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 		next_tick = dc2114x_autoconf(dev);</div><div class='ctx'> 	    }</div><div class='ctx'> 	    break;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	    if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, TRUE, 2000)) &lt; 0) {</div><div class='ctx'> 		next_tick = sr &amp; ~TIMER_CB;</div><div class='hunk'>@@ -3045,7 +3044,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 		    lp-&gt;tmp = MII_SR_ASSC;</div><div class='ctx'> 		    anlpa = mii_rd(MII_ANLPA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='ctx'> 		    ana = mii_rd(MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    if (!(anlpa &amp; MII_ANLPA_RF) &amp;&amp; </div><div class='add'>+		    if (!(anlpa &amp; MII_ANLPA_RF) &amp;&amp;</div><div class='ctx'> 			 (cap = anlpa &amp; MII_ANLPA_TAF &amp; ana)) {</div><div class='ctx'> 			if (cap &amp; MII_ANA_100M) {</div><div class='ctx'> 			    lp-&gt;fdx = ((ana &amp; anlpa &amp; MII_ANA_FDAM &amp; MII_ANA_100M) ? TRUE : FALSE);</div><div class='hunk'>@@ -3087,11 +3086,11 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 	    next_tick = 3000;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case AUI_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, AUI, ping_media, dc2114x_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case BNC:</div><div class='ctx'> 	switch (lp-&gt;local_state) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -3109,7 +3108,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 		next_tick = dc2114x_autoconf(dev);</div><div class='ctx'> 	    }</div><div class='ctx'> 	    break;</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	    if (!lp-&gt;tx_enable) {</div><div class='ctx'> 		if ((sts = ping_media(dev, 3000)) &lt; 0) {</div><div class='hunk'>@@ -3130,11 +3129,11 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 	    break;</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case BNC_SUSPECT:</div><div class='ctx'> 	next_tick = de4x5_suspect_state(dev, 1000, BNC, ping_media, dc2114x_autoconf);</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case SPD_DET:                              /* Choose 10Mb/s or 100Mb/s */</div><div class='ctx'> 	  if (srom_map_media(dev) &lt; 0) {</div><div class='ctx'> 	      lp-&gt;tcount++;</div><div class='hunk'>@@ -3161,7 +3160,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 	      next_tick = dc2114x_autoconf(dev);</div><div class='ctx'> 	  } else if (((lp-&gt;media == _100Mb) &amp;&amp; is_100_up(dev)) ||</div><div class='ctx'> 		     (((lp-&gt;media == _10Mb) || (lp-&gt;media == TP) ||</div><div class='del'>-		       (lp-&gt;media == BNC)   || (lp-&gt;media == AUI)) &amp;&amp; </div><div class='add'>+		       (lp-&gt;media == BNC)   || (lp-&gt;media == AUI)) &amp;&amp;</div><div class='ctx'> 		      is_10_up(dev))) {</div><div class='ctx'> 	      next_tick = dc2114x_autoconf(dev);</div><div class='ctx'> 	  } else {</div><div class='hunk'>@@ -3169,7 +3168,7 @@ dc2114x_autoconf(struct net_device *dev)</div><div class='ctx'> 	      lp-&gt;media = INIT;</div><div class='ctx'> 	  }</div><div class='ctx'> 	  break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>     case _10Mb:</div><div class='ctx'>         next_tick = 3000;</div><div class='ctx'> 	if (!lp-&gt;tx_enable) {</div><div class='hunk'>@@ -3208,7 +3207,7 @@ printk("Huh?: media:%02x\n", lp-&gt;media);</div><div class='ctx'> 	lp-&gt;media = INIT;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return next_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3231,7 +3230,7 @@ srom_map_media(struct net_device *dev)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'>     lp-&gt;fdx = 0;</div><div class='del'>-    if (lp-&gt;infoblock_media == lp-&gt;media) </div><div class='add'>+    if (lp-&gt;infoblock_media == lp-&gt;media)</div><div class='ctx'>       return 0;</div><div class='ctx'> </div><div class='ctx'>     switch(lp-&gt;infoblock_media) {</div><div class='hunk'>@@ -3270,7 +3269,7 @@ srom_map_media(struct net_device *dev)</div><div class='ctx'>       case SROM_100BASEFF:</div><div class='ctx'> 	if (!lp-&gt;params.fdx) return -1;</div><div class='ctx'> 	lp-&gt;fdx = TRUE;</div><div class='del'>-      case SROM_100BASEF: </div><div class='add'>+      case SROM_100BASEF:</div><div class='ctx'> 	if (lp-&gt;params.fdx &amp;&amp; !lp-&gt;fdx) return -1;</div><div class='ctx'> 	lp-&gt;media = _100Mb;</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -3280,8 +3279,8 @@ srom_map_media(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;fdx = lp-&gt;params.fdx;</div><div class='ctx'> 	break;</div><div class='ctx'> </div><div class='del'>-      default: </div><div class='del'>-	printk("%s: Bad media code [%d] detected in SROM!\n", dev-&gt;name, </div><div class='add'>+      default:</div><div class='add'>+	printk("%s: Bad media code [%d] detected in SROM!\n", dev-&gt;name,</div><div class='ctx'> 	                                                  lp-&gt;infoblock_media);</div><div class='ctx'> 	return -1;</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -3359,7 +3358,7 @@ test_media(struct net_device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14,</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     s32 sts, csr12;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	lp-&gt;timeout = msec/100;</div><div class='ctx'> 	if (!lp-&gt;useSROM) {      /* Already done if by SROM, else dc2104[01] */</div><div class='hunk'>@@ -3372,22 +3371,22 @@ test_media(struct net_device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14,</div><div class='ctx'> 	/* clear all pending interrupts */</div><div class='ctx'> 	sts = inl(DE4X5_STS);</div><div class='ctx'> 	outl(sts, DE4X5_STS);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* clear csr12 NRA and SRA bits */</div><div class='ctx'> 	if ((lp-&gt;chipset == DC21041) || lp-&gt;useSROM) {</div><div class='ctx'> 	    csr12 = inl(DE4X5_SISR);</div><div class='ctx'> 	    outl(csr12, DE4X5_SISR);</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     sts = inl(DE4X5_STS) &amp; ~TIMER_CB;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (!(sts &amp; irqs) &amp;&amp; --lp-&gt;timeout) {</div><div class='ctx'> 	sts = 100 | TIMER_CB;</div><div class='ctx'>     } else {</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return sts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3397,11 +3396,11 @@ test_tp(struct net_device *dev, s32 msec)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int sisr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	lp-&gt;timeout = msec/100;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     sisr = (inl(DE4X5_SISR) &amp; ~TIMER_CB) &amp; (SISR_LKF | SISR_NCR);</div><div class='ctx'> </div><div class='ctx'>     if (sisr &amp;&amp; --lp-&gt;timeout) {</div><div class='hunk'>@@ -3409,7 +3408,7 @@ test_tp(struct net_device *dev, s32 msec)</div><div class='ctx'>     } else {</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return sisr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3436,7 +3435,7 @@ test_for_100Mb(struct net_device *dev, int msec)</div><div class='ctx'> 	    lp-&gt;timeout = msec/SAMPLE_INTERVAL;</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;phy[lp-&gt;active].id || lp-&gt;useSROM) {</div><div class='ctx'> 	gep = is_100_up(dev) | is_spd_100(dev);</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -3447,7 +3446,7 @@ test_for_100Mb(struct net_device *dev, int msec)</div><div class='ctx'>     } else {</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return gep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3459,13 +3458,13 @@ wait_for_link(struct net_device *dev)</div><div class='ctx'>     if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	lp-&gt;timeout = 1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;timeout--) {</div><div class='ctx'> 	return TIMER_CB;</div><div class='ctx'>     } else {</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3479,21 +3478,21 @@ test_mii_reg(struct net_device *dev, int reg, int mask, int pol, long msec)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     int test;</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	lp-&gt;timeout = msec/100;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (pol) pol = ~0;</div><div class='ctx'>     reg = mii_rd((u_char)reg, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII) &amp; mask;</div><div class='ctx'>     test = (reg ^ pol) &amp; mask;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (test &amp;&amp; --lp-&gt;timeout) {</div><div class='ctx'> 	reg = 100 | TIMER_CB;</div><div class='ctx'>     } else {</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3503,7 +3502,7 @@ is_spd_100(struct net_device *dev)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int spd;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;useMII) {</div><div class='ctx'> 	spd = mii_rd(lp-&gt;phy[lp-&gt;active].spd.reg, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='ctx'> 	spd = ~(spd ^ lp-&gt;phy[lp-&gt;active].spd.value);</div><div class='hunk'>@@ -3517,7 +3516,7 @@ is_spd_100(struct net_device *dev)</div><div class='ctx'> 	spd = (lp-&gt;asBitValid &amp; (lp-&gt;asPolarity ^ (gep_rd(dev) &amp; lp-&gt;asBit))) |</div><div class='ctx'> 	          (lp-&gt;linkOK &amp; ~lp-&gt;asBitValid);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return spd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3526,7 +3525,7 @@ is_100_up(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;useMII) {</div><div class='ctx'> 	/* Double read for sticky bits &amp; temporary drops */</div><div class='ctx'> 	mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='hunk'>@@ -3547,7 +3546,7 @@ is_10_up(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;useMII) {</div><div class='ctx'> 	/* Double read for sticky bits &amp; temporary drops */</div><div class='ctx'> 	mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='hunk'>@@ -3570,7 +3569,7 @@ is_anc_capable(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;phy[lp-&gt;active].id &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {</div><div class='ctx'> 	return (mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII));</div><div class='ctx'>     } else if ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) {</div><div class='hunk'>@@ -3590,24 +3589,24 @@ ping_media(struct net_device *dev, int msec)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int sisr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	lp-&gt;timeout = msec/100;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	lp-&gt;tmp = lp-&gt;tx_new;                /* Remember the ring position */</div><div class='ctx'> 	load_packet(dev, lp-&gt;frame, TD_LS | TD_FS | sizeof(lp-&gt;frame), (struct sk_buff *)1);</div><div class='ctx'> 	lp-&gt;tx_new = (++lp-&gt;tx_new) % lp-&gt;txRingSize;</div><div class='ctx'> 	outl(POLL_DEMAND, DE4X5_TPD);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     sisr = inl(DE4X5_SISR);</div><div class='ctx'> </div><div class='del'>-    if ((!(sisr &amp; SISR_NCR)) &amp;&amp; </div><div class='del'>-	((s32)le32_to_cpu(lp-&gt;tx_ring[lp-&gt;tmp].status) &lt; 0) &amp;&amp; </div><div class='add'>+    if ((!(sisr &amp; SISR_NCR)) &amp;&amp;</div><div class='add'>+	((s32)le32_to_cpu(lp-&gt;tx_ring[lp-&gt;tmp].status) &lt; 0) &amp;&amp;</div><div class='ctx'> 	 (--lp-&gt;timeout)) {</div><div class='ctx'> 	sisr = 100 | TIMER_CB;</div><div class='ctx'>     } else {</div><div class='del'>-	if ((!(sisr &amp; SISR_NCR)) &amp;&amp; </div><div class='add'>+	if ((!(sisr &amp; SISR_NCR)) &amp;&amp;</div><div class='ctx'> 	    !(le32_to_cpu(lp-&gt;tx_ring[lp-&gt;tmp].status) &amp; (T_OWN | TD_ES)) &amp;&amp;</div><div class='ctx'> 	    lp-&gt;timeout) {</div><div class='ctx'> 	    sisr = 0;</div><div class='hunk'>@@ -3616,7 +3615,7 @@ ping_media(struct net_device *dev, int msec)</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return sisr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3668,7 +3667,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)</div><div class='ctx'>     } else {                                           /* Linear buffer */</div><div class='ctx'> 	memcpy(skb_put(p,len),lp-&gt;rx_bufs + lp-&gt;rx_old * RX_BUFF_SZ,len);</div><div class='ctx'>     }</div><div class='del'>-		    </div><div class='add'>+</div><div class='ctx'>     return p;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -3751,23 +3750,23 @@ de4x5_rst_desc_ring(struct net_device *dev)</div><div class='ctx'> 	outl(lp-&gt;dma_rings, DE4X5_RRBA);</div><div class='ctx'> 	outl(lp-&gt;dma_rings + NUM_RX_DESC * sizeof(struct de4x5_desc),</div><div class='ctx'> 	     DE4X5_TRBA);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	lp-&gt;rx_new = lp-&gt;rx_old = 0;</div><div class='ctx'> 	lp-&gt;tx_new = lp-&gt;tx_old = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; lp-&gt;rxRingSize; i++) {</div><div class='ctx'> 	    lp-&gt;rx_ring[i].status = cpu_to_le32(R_OWN);</div><div class='ctx'> 	}</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; lp-&gt;txRingSize; i++) {</div><div class='ctx'> 	    lp-&gt;tx_ring[i].status = cpu_to_le32(0);</div><div class='ctx'> 	}</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	barrier();</div><div class='ctx'> 	lp-&gt;cache.save_cnt--;</div><div class='ctx'> 	START_DE4X5;</div><div class='ctx'>     }</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3792,7 +3791,7 @@ de4x5_cache_state(struct net_device *dev, int flag)</div><div class='ctx'> 	    gep_wr(lp-&gt;cache.gepc, dev);</div><div class='ctx'> 	    gep_wr(lp-&gt;cache.gep, dev);</div><div class='ctx'> 	} else {</div><div class='del'>-	    reset_init_sia(dev, lp-&gt;cache.csr13, lp-&gt;cache.csr14, </div><div class='add'>+	    reset_init_sia(dev, lp-&gt;cache.csr13, lp-&gt;cache.csr14,</div><div class='ctx'> 			                                      lp-&gt;cache.csr15);</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -3854,25 +3853,25 @@ test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     s32 sts, ans;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;timeout &lt; 0) {</div><div class='ctx'> 	lp-&gt;timeout = msec/100;</div><div class='ctx'> 	outl(irq_mask, DE4X5_IMR);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* clear all pending interrupts */</div><div class='ctx'> 	sts = inl(DE4X5_STS);</div><div class='ctx'> 	outl(sts, DE4X5_STS);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     ans = inl(DE4X5_SISR) &amp; SISR_ANS;</div><div class='ctx'>     sts = inl(DE4X5_STS) &amp; ~TIMER_CB;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (!(sts &amp; irqs) &amp;&amp; (ans ^ ANS_NWOK) &amp;&amp; --lp-&gt;timeout) {</div><div class='ctx'> 	sts = 100 | TIMER_CB;</div><div class='ctx'>     } else {</div><div class='ctx'> 	lp-&gt;timeout = -1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return sts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3882,7 +3881,7 @@ de4x5_setup_intr(struct net_device *dev)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     s32 imr, sts;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (inl(DE4X5_OMR) &amp; OMR_SR) {   /* Only unmask if TX/RX is enabled */</div><div class='ctx'> 	imr = 0;</div><div class='ctx'> 	UNMASK_IRQs;</div><div class='hunk'>@@ -3890,7 +3889,7 @@ de4x5_setup_intr(struct net_device *dev)</div><div class='ctx'> 	outl(sts, DE4X5_STS);</div><div class='ctx'> 	ENABLE_IRQs;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3936,17 +3935,17 @@ create_packet(struct net_device *dev, char *frame, int len)</div><div class='ctx'> {</div><div class='ctx'>     int i;</div><div class='ctx'>     char *buf = frame;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i=0; i&lt;ETH_ALEN; i++) {             /* Use this source address */</div><div class='ctx'> 	*buf++ = dev-&gt;dev_addr[i];</div><div class='ctx'>     }</div><div class='ctx'>     for (i=0; i&lt;ETH_ALEN; i++) {             /* Use this destination address */</div><div class='ctx'> 	*buf++ = dev-&gt;dev_addr[i];</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     *buf++ = 0;                              /* Packet length (2 bytes) */</div><div class='ctx'>     *buf++ = 1;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3978,7 +3977,7 @@ static int</div><div class='ctx'> PCI_signature(char *name, struct de4x5_private *lp)</div><div class='ctx'> {</div><div class='ctx'>     int i, status = 0, siglen = sizeof(de4x5_signatures)/sizeof(c_char *);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;chipset == DC21040) {</div><div class='ctx'> 	strcpy(name, "DE434/5");</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -4007,7 +4006,7 @@ PCI_signature(char *name, struct de4x5_private *lp)</div><div class='ctx'>     } else if ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) {</div><div class='ctx'> 	lp-&gt;useSROM = TRUE;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4024,7 +4023,7 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)</div><div class='ctx'> {</div><div class='ctx'>     int i, j=0;</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;chipset == DC21040) {</div><div class='ctx'> 	if (lp-&gt;bus == EISA) {</div><div class='ctx'> 	    enet_addr_rst(aprom_addr); /* Reset Ethernet Address ROM Pointer */</div><div class='hunk'>@@ -4049,7 +4048,7 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)</div><div class='ctx'> 	}</div><div class='ctx'> 	de4x5_dbg_srom((struct de4x5_srom *)&amp;lp-&gt;srom);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4071,11 +4070,11 @@ enet_addr_rst(u_long aprom_addr)</div><div class='ctx'>     short sigLength=0;</div><div class='ctx'>     s8 data;</div><div class='ctx'>     int i, j;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     dev.llsig.a = ETH_PROM_SIG;</div><div class='ctx'>     dev.llsig.b = ETH_PROM_SIG;</div><div class='ctx'>     sigLength = sizeof(u32) &lt;&lt; 1;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i=0,j=0;j&lt;sigLength &amp;&amp; i&lt;PROBE_LENGTH+sigLength-1;i++) {</div><div class='ctx'> 	data = inb(aprom_addr);</div><div class='ctx'> 	if (dev.Sig[j] == data) {    /* track signature */</div><div class='hunk'>@@ -4088,7 +4087,7 @@ enet_addr_rst(u_long aprom_addr)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4111,7 +4110,7 @@ get_hw_addr(struct net_device *dev)</div><div class='ctx'>     for (i=0,k=0,j=0;j&lt;3;j++) {</div><div class='ctx'> 	k &lt;&lt;= 1;</div><div class='ctx'> 	if (k &gt; 0xffff) k-=0xffff;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (lp-&gt;bus == PCI) {</div><div class='ctx'> 	    if (lp-&gt;chipset == DC21040) {</div><div class='ctx'> 		while ((tmp = inl(DE4X5_APROM)) &lt; 0);</div><div class='hunk'>@@ -4133,11 +4132,11 @@ get_hw_addr(struct net_device *dev)</div><div class='ctx'> 	    k += (u_short) ((tmp = inb(EISA_APROM)) &lt;&lt; 8);</div><div class='ctx'> 	    dev-&gt;dev_addr[i++] = (u_char) tmp;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (k &gt; 0xffff) k-=0xffff;</div><div class='ctx'>     }</div><div class='ctx'>     if (k == 0xffff) k=0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;bus == PCI) {</div><div class='ctx'> 	if (lp-&gt;chipset == DC21040) {</div><div class='ctx'> 	    while ((tmp = inl(DE4X5_APROM)) &lt; 0);</div><div class='hunk'>@@ -4156,7 +4155,7 @@ get_hw_addr(struct net_device *dev)</div><div class='ctx'>     srom_repair(dev, broken);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_MULTIPLATFORM</div><div class='del'>-    /* </div><div class='add'>+    /*</div><div class='ctx'>     ** If the address starts with 00 a0, we have to bit-reverse</div><div class='ctx'>     ** each byte of the address.</div><div class='ctx'>     */</div><div class='hunk'>@@ -4245,7 +4244,7 @@ test_bad_enet(struct net_device *dev, int status)</div><div class='ctx'> </div><div class='ctx'>     for (tmp=0,i=0; i&lt;ETH_ALEN; i++) tmp += (u_char)dev-&gt;dev_addr[i];</div><div class='ctx'>     if ((tmp == 0) || (tmp == 0x5fa)) {</div><div class='del'>-	if ((lp-&gt;chipset == last.chipset) &amp;&amp; </div><div class='add'>+	if ((lp-&gt;chipset == last.chipset) &amp;&amp;</div><div class='ctx'> 	    (lp-&gt;bus_num == last.bus) &amp;&amp; (lp-&gt;bus_num &gt; 0)) {</div><div class='ctx'> 	    for (i=0; i&lt;ETH_ALEN; i++) dev-&gt;dev_addr[i] = last.addr[i];</div><div class='ctx'> 	    for (i=ETH_ALEN-1; i&gt;2; --i) {</div><div class='hunk'>@@ -4275,7 +4274,7 @@ test_bad_enet(struct net_device *dev, int status)</div><div class='ctx'> static int</div><div class='ctx'> an_exception(struct de4x5_private *lp)</div><div class='ctx'> {</div><div class='del'>-    if ((*(u_short *)lp-&gt;srom.sub_vendor_id == 0x00c0) &amp;&amp; </div><div class='add'>+    if ((*(u_short *)lp-&gt;srom.sub_vendor_id == 0x00c0) &amp;&amp;</div><div class='ctx'> 	(*(u_short *)lp-&gt;srom.sub_system_id == 0x95e0)) {</div><div class='ctx'> 	return -1;</div><div class='ctx'>     }</div><div class='hunk'>@@ -4290,11 +4289,11 @@ static short</div><div class='ctx'> srom_rd(u_long addr, u_char offset)</div><div class='ctx'> {</div><div class='ctx'>     sendto_srom(SROM_RD | SROM_SR, addr);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     srom_latch(SROM_RD | SROM_SR | DT_CS, addr);</div><div class='ctx'>     srom_command(SROM_RD | SROM_SR | DT_IN | DT_CS, addr);</div><div class='ctx'>     srom_address(SROM_RD | SROM_SR | DT_CS, addr, offset);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return srom_data(SROM_RD | SROM_SR | DT_CS, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4304,7 +4303,7 @@ srom_latch(u_int command, u_long addr)</div><div class='ctx'>     sendto_srom(command, addr);</div><div class='ctx'>     sendto_srom(command | DT_CLK, addr);</div><div class='ctx'>     sendto_srom(command, addr);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4314,7 +4313,7 @@ srom_command(u_int command, u_long addr)</div><div class='ctx'>     srom_latch(command, addr);</div><div class='ctx'>     srom_latch(command, addr);</div><div class='ctx'>     srom_latch((command &amp; 0x0000ff00) | DT_CS, addr);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4322,15 +4321,15 @@ static void</div><div class='ctx'> srom_address(u_int command, u_long addr, u_char offset)</div><div class='ctx'> {</div><div class='ctx'>     int i, a;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     a = offset &lt;&lt; 2;</div><div class='ctx'>     for (i=0; i&lt;6; i++, a &lt;&lt;= 1) {</div><div class='ctx'> 	srom_latch(command | ((a &amp; 0x80) ? DT_IN : 0), addr);</div><div class='ctx'>     }</div><div class='ctx'>     udelay(1);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     i = (getfrom_srom(addr) &gt;&gt; 3) &amp; 0x01;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4340,17 +4339,17 @@ srom_data(u_int command, u_long addr)</div><div class='ctx'>     int i;</div><div class='ctx'>     short word = 0;</div><div class='ctx'>     s32 tmp;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i=0; i&lt;16; i++) {</div><div class='ctx'> 	sendto_srom(command  | DT_CLK, addr);</div><div class='ctx'> 	tmp = getfrom_srom(addr);</div><div class='ctx'> 	sendto_srom(command, addr);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	word = (word &lt;&lt; 1) | ((tmp &gt;&gt; 3) &amp; 0x01);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     sendto_srom(command &amp; 0x0000ff00, addr);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return word;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4359,13 +4358,13 @@ static void</div><div class='ctx'> srom_busy(u_int command, u_long addr)</div><div class='ctx'> {</div><div class='ctx'>    sendto_srom((command &amp; 0x0000ff00) | DT_CS, addr);</div><div class='del'>-   </div><div class='add'>+</div><div class='ctx'>    while (!((getfrom_srom(addr) &gt;&gt; 3) &amp; 0x01)) {</div><div class='ctx'>        mdelay(1);</div><div class='ctx'>    }</div><div class='del'>-   </div><div class='add'>+</div><div class='ctx'>    sendto_srom(command &amp; 0x0000ff00, addr);</div><div class='del'>-   </div><div class='add'>+</div><div class='ctx'>    return;</div><div class='ctx'> }</div><div class='ctx'> */</div><div class='hunk'>@@ -4375,7 +4374,7 @@ sendto_srom(u_int command, u_long addr)</div><div class='ctx'> {</div><div class='ctx'>     outl(command, addr);</div><div class='ctx'>     udelay(1);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4383,10 +4382,10 @@ static int</div><div class='ctx'> getfrom_srom(u_long addr)</div><div class='ctx'> {</div><div class='ctx'>     s32 tmp;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     tmp = inl(addr);</div><div class='ctx'>     udelay(1);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4403,7 +4402,7 @@ srom_infoleaf_info(struct net_device *dev)</div><div class='ctx'>     }</div><div class='ctx'>     if (i == INFOLEAF_SIZE) {</div><div class='ctx'> 	lp-&gt;useSROM = FALSE;</div><div class='del'>-	printk("%s: Cannot find correct chipset for SROM decoding!\n", </div><div class='add'>+	printk("%s: Cannot find correct chipset for SROM decoding!\n",</div><div class='ctx'> 	                                                          dev-&gt;name);</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'>     }</div><div class='hunk'>@@ -4420,7 +4419,7 @@ srom_infoleaf_info(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == 0) {</div><div class='ctx'> 	    lp-&gt;useSROM = FALSE;</div><div class='del'>-	    printk("%s: Cannot find correct PCI device [%d] for SROM decoding!\n", </div><div class='add'>+	    printk("%s: Cannot find correct PCI device [%d] for SROM decoding!\n",</div><div class='ctx'> 	                                               dev-&gt;name, lp-&gt;device);</div><div class='ctx'> 	    return -ENXIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4494,9 +4493,9 @@ srom_exec(struct net_device *dev, u_char *p)</div><div class='ctx'>     if (((lp-&gt;ibn != 1) &amp;&amp; (lp-&gt;ibn != 3) &amp;&amp; (lp-&gt;ibn != 5)) || !count) return;</div><div class='ctx'> </div><div class='ctx'>     if (lp-&gt;chipset != DC21140) RESET_SIA;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>     while (count--) {</div><div class='del'>-	gep_wr(((lp-&gt;chipset==DC21140) &amp;&amp; (lp-&gt;ibn!=5) ? </div><div class='add'>+	gep_wr(((lp-&gt;chipset==DC21140) &amp;&amp; (lp-&gt;ibn!=5) ?</div><div class='ctx'> 		                                   *p++ : TWIDDLE(w++)), dev);</div><div class='ctx'> 	mdelay(2);                          /* 2ms per action */</div><div class='ctx'>     }</div><div class='hunk'>@@ -4514,13 +4513,13 @@ srom_exec(struct net_device *dev, u_char *p)</div><div class='ctx'> ** unless I implement the DC21041 SROM functions. There's no need</div><div class='ctx'> ** since the existing code will be satisfactory for all boards.</div><div class='ctx'> */</div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> dc21041_infoleaf(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     return DE4X5_AUTOSENSE_MS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> dc21140_infoleaf(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4558,7 +4557,7 @@ dc21140_infoleaf(struct net_device *dev)</div><div class='ctx'>     return next_tick &amp; ~TIMER_CB;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> dc21142_infoleaf(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4593,7 +4592,7 @@ dc21142_infoleaf(struct net_device *dev)</div><div class='ctx'>     return next_tick &amp; ~TIMER_CB;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> dc21143_infoleaf(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4631,7 +4630,7 @@ dc21143_infoleaf(struct net_device *dev)</div><div class='ctx'> ** The compact infoblock is only designed for DC21140[A] chips, so</div><div class='ctx'> ** we'll reuse the dc21140m_autoconf function. Non MII media only.</div><div class='ctx'> */</div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> compact_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4671,7 +4670,7 @@ compact_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> /*</div><div class='ctx'> ** This block describes non MII media for the DC21140[A] only.</div><div class='ctx'> */</div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> type0_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4711,7 +4710,7 @@ type0_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> </div><div class='ctx'> /* These functions are under construction! */</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> type1_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4750,7 +4749,7 @@ type1_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'>     return dc21140m_autoconf(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> type2_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4791,7 +4790,7 @@ type2_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'>     return dc2114x_autoconf(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> type3_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4833,7 +4832,7 @@ type3_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'>     return dc2114x_autoconf(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> type4_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4878,7 +4877,7 @@ type4_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> ** This block type provides information for resetting external devices</div><div class='ctx'> ** (chips) through the General Purpose Register.</div><div class='ctx'> */</div><div class='del'>-static int </div><div class='add'>+static int</div><div class='ctx'> type5_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='hunk'>@@ -4916,7 +4915,7 @@ mii_rd(u_char phyreg, u_char phyaddr, u_long ioaddr)</div><div class='ctx'>     mii_address(phyaddr, ioaddr);          /* PHY address to be accessed     */</div><div class='ctx'>     mii_address(phyreg, ioaddr);           /* PHY Register to read           */</div><div class='ctx'>     mii_ta(MII_STRD, ioaddr);              /* Turn around time - 2 MDC       */</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return mii_rdata(ioaddr);              /* Read data                      */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4931,7 +4930,7 @@ mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr)</div><div class='ctx'>     mii_ta(MII_STWR, ioaddr);              /* Turn around time - 2 MDC       */</div><div class='ctx'>     data = mii_swap(data, 16);             /* Swap data bit ordering         */</div><div class='ctx'>     mii_wdata(data, 16, ioaddr);           /* Write data                     */</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4940,12 +4939,12 @@ mii_rdata(u_long ioaddr)</div><div class='ctx'> {</div><div class='ctx'>     int i;</div><div class='ctx'>     s32 tmp = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i=0; i&lt;16; i++) {</div><div class='ctx'> 	tmp &lt;&lt;= 1;</div><div class='ctx'> 	tmp |= getfrom_mii(MII_MRD | MII_RD, ioaddr);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4953,12 +4952,12 @@ static void</div><div class='ctx'> mii_wdata(int data, int len, u_long ioaddr)</div><div class='ctx'> {</div><div class='ctx'>     int i;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i=0; i&lt;len; i++) {</div><div class='ctx'> 	sendto_mii(MII_MWR | MII_WR, data, ioaddr);</div><div class='ctx'> 	data &gt;&gt;= 1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4966,13 +4965,13 @@ static void</div><div class='ctx'> mii_address(u_char addr, u_long ioaddr)</div><div class='ctx'> {</div><div class='ctx'>     int i;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     addr = mii_swap(addr, 5);</div><div class='ctx'>     for (i=0; i&lt;5; i++) {</div><div class='ctx'> 	sendto_mii(MII_MWR | MII_WR, addr, ioaddr);</div><div class='ctx'> 	addr &gt;&gt;= 1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4980,12 +4979,12 @@ static void</div><div class='ctx'> mii_ta(u_long rw, u_long ioaddr)</div><div class='ctx'> {</div><div class='ctx'>     if (rw == MII_STWR) {</div><div class='del'>-	sendto_mii(MII_MWR | MII_WR, 1, ioaddr);  </div><div class='del'>-	sendto_mii(MII_MWR | MII_WR, 0, ioaddr);  </div><div class='add'>+	sendto_mii(MII_MWR | MII_WR, 1, ioaddr);</div><div class='add'>+	sendto_mii(MII_MWR | MII_WR, 0, ioaddr);</div><div class='ctx'>     } else {</div><div class='ctx'> 	getfrom_mii(MII_MRD | MII_RD, ioaddr);        /* Tri-state MDIO */</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4993,13 +4992,13 @@ static int</div><div class='ctx'> mii_swap(int data, int len)</div><div class='ctx'> {</div><div class='ctx'>     int i, tmp = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     for (i=0; i&lt;len; i++) {</div><div class='ctx'> 	tmp &lt;&lt;= 1;</div><div class='ctx'> 	tmp |= (data &amp; 1);</div><div class='ctx'> 	data &gt;&gt;= 1;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5007,13 +5006,13 @@ static void</div><div class='ctx'> sendto_mii(u32 command, int data, u_long ioaddr)</div><div class='ctx'> {</div><div class='ctx'>     u32 j;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     j = (data &amp; 1) &lt;&lt; 17;</div><div class='ctx'>     outl(command | j, ioaddr);</div><div class='ctx'>     udelay(1);</div><div class='ctx'>     outl(command | MII_MDC | j, ioaddr);</div><div class='ctx'>     udelay(1);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5024,7 +5023,7 @@ getfrom_mii(u32 command, u_long ioaddr)</div><div class='ctx'>     udelay(1);</div><div class='ctx'>     outl(command | MII_MDC, ioaddr);</div><div class='ctx'>     udelay(1);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return ((inl(ioaddr) &gt;&gt; 19) &amp; 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5085,7 +5084,7 @@ mii_get_phy(struct net_device *dev)</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='ctx'>     int i, j, k, n, limit=sizeof(phy_info)/sizeof(struct phy_table);</div><div class='ctx'>     int id;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     lp-&gt;active = 0;</div><div class='ctx'>     lp-&gt;useMII = TRUE;</div><div class='ctx'> </div><div class='hunk'>@@ -5094,7 +5093,7 @@ mii_get_phy(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;phy[lp-&gt;active].addr = i;</div><div class='ctx'> 	if (i==0) n++;                             /* Count cycles */</div><div class='ctx'> 	while (de4x5_reset_phy(dev)&lt;0) udelay(100);/* Wait for reset */</div><div class='del'>-	id = mii_get_oui(i, DE4X5_MII); </div><div class='add'>+	id = mii_get_oui(i, DE4X5_MII);</div><div class='ctx'> 	if ((id == 0) || (id == 65535)) continue;  /* Valid ID? */</div><div class='ctx'> 	for (j=0; j&lt;limit; j++) {                  /* Search PHY table */</div><div class='ctx'> 	    if (id != phy_info[j].id) continue;    /* ID match? */</div><div class='hunk'>@@ -5133,7 +5132,7 @@ mii_get_phy(struct net_device *dev)</div><div class='ctx'> 	for (k=0; lp-&gt;phy[k].id &amp;&amp; (k &lt; DE4X5_MAX_PHY); k++) { /*For each PHY*/</div><div class='ctx'> 	    mii_wr(MII_CR_RST, MII_CR, lp-&gt;phy[k].addr, DE4X5_MII);</div><div class='ctx'> 	    while (mii_rd(MII_CR, lp-&gt;phy[k].addr, DE4X5_MII) &amp; MII_CR_RST);</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	    de4x5_dbg_mii(dev, k);</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='hunk'>@@ -5148,12 +5147,12 @@ build_setup_frame(struct net_device *dev, int mode)</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     int i;</div><div class='ctx'>     char *pa = lp-&gt;setup_frame;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Initialise the setup frame */</div><div class='ctx'>     if (mode == ALL) {</div><div class='ctx'> 	memset(lp-&gt;setup_frame, 0, SETUP_FRAME_LEN);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;setup_f == HASH_PERF) {</div><div class='ctx'> 	for (pa=lp-&gt;setup_frame+IMPERF_PA_OFFSET, i=0; i&lt;ETH_ALEN; i++) {</div><div class='ctx'> 	    *(pa + i) = dev-&gt;dev_addr[i];                 /* Host address */</div><div class='hunk'>@@ -5170,7 +5169,7 @@ build_setup_frame(struct net_device *dev, int mode)</div><div class='ctx'> 	    if (i &amp; 0x01) pa += 4;</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return pa;                     /* Points to the next entry */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5178,7 +5177,7 @@ static void</div><div class='ctx'> enable_ast(struct net_device *dev, u32 time_out)</div><div class='ctx'> {</div><div class='ctx'>     timeout(dev, (void *)&amp;de4x5_ast, (u_long)dev, time_out);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5186,9 +5185,9 @@ static void</div><div class='ctx'> disable_ast(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     del_timer(&amp;lp-&gt;timer);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5207,10 +5206,10 @@ de4x5_switch_mac_port(struct net_device *dev)</div><div class='ctx'>     omr |= lp-&gt;infoblock_csr6;</div><div class='ctx'>     if (omr &amp; OMR_PS) omr |= OMR_HBD;</div><div class='ctx'>     outl(omr, DE4X5_OMR);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Soft Reset */</div><div class='ctx'>     RESET_DE4X5;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Restore the GEP - especially for COMPACT and Type 0 Infoblocks */</div><div class='ctx'>     if (lp-&gt;chipset == DC21140) {</div><div class='ctx'> 	gep_wr(lp-&gt;cache.gepc, dev);</div><div class='hunk'>@@ -5263,21 +5262,21 @@ timeout(struct net_device *dev, void (*fn)(u_long data), u_long data, u_long mse</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     int dt;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* First, cancel any pending timer events */</div><div class='ctx'>     del_timer(&amp;lp-&gt;timer);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Convert msec to ticks */</div><div class='ctx'>     dt = (msec * HZ) / 1000;</div><div class='ctx'>     if (dt==0) dt=1;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     /* Set up timer */</div><div class='ctx'>     init_timer(&amp;lp-&gt;timer);</div><div class='ctx'>     lp-&gt;timer.expires = jiffies + dt;</div><div class='ctx'>     lp-&gt;timer.function = fn;</div><div class='ctx'>     lp-&gt;timer.data = data;</div><div class='ctx'>     add_timer(&amp;lp-&gt;timer);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5375,7 +5374,7 @@ de4x5_dbg_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     int i;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (de4x5_debug &amp; DEBUG_OPEN) {</div><div class='ctx'> 	printk("%s: de4x5 opening with irq %d\n",dev-&gt;name,dev-&gt;irq);</div><div class='ctx'> 	printk("\tphysical address: ");</div><div class='hunk'>@@ -5413,11 +5412,11 @@ de4x5_dbg_open(struct net_device *dev)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("...0x%8.8x\n", le32_to_cpu(lp-&gt;tx_ring[i].buf));</div><div class='del'>-	printk("Ring size: \nRX: %d\nTX: %d\n", </div><div class='del'>-	       (short)lp-&gt;rxRingSize, </div><div class='del'>-	       (short)lp-&gt;txRingSize); </div><div class='add'>+	printk("Ring size: \nRX: %d\nTX: %d\n",</div><div class='add'>+	       (short)lp-&gt;rxRingSize,</div><div class='add'>+	       (short)lp-&gt;txRingSize);</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5426,7 +5425,7 @@ de4x5_dbg_mii(struct net_device *dev, int k)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='ctx'>     u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (de4x5_debug &amp; DEBUG_MII) {</div><div class='ctx'> 	printk("\nMII device address: %d\n", lp-&gt;phy[k].addr);</div><div class='ctx'> 	printk("MII CR:  %x\n",mii_rd(MII_CR,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='hunk'>@@ -5445,7 +5444,7 @@ de4x5_dbg_mii(struct net_device *dev, int k)</div><div class='ctx'> 	    printk("MII 20:  %x\n",mii_rd(0x14,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5453,17 +5452,17 @@ static void</div><div class='ctx'> de4x5_dbg_media(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>     struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     if (lp-&gt;media != lp-&gt;c_media) {</div><div class='ctx'> 	if (de4x5_debug &amp; DEBUG_MEDIA) {</div><div class='ctx'> 	    printk("%s: media is %s%s\n", dev-&gt;name,</div><div class='ctx'> 		   (lp-&gt;media == NC  ? "unconnected, link down or incompatible connection" :</div><div class='ctx'> 		    (lp-&gt;media == TP  ? "TP" :</div><div class='ctx'> 		     (lp-&gt;media == ANS ? "TP/Nway" :</div><div class='del'>-		      (lp-&gt;media == BNC ? "BNC" : </div><div class='del'>-		       (lp-&gt;media == AUI ? "AUI" : </div><div class='del'>-			(lp-&gt;media == BNC_AUI ? "BNC/AUI" : </div><div class='del'>-			 (lp-&gt;media == EXT_SIA ? "EXT SIA" : </div><div class='add'>+		      (lp-&gt;media == BNC ? "BNC" :</div><div class='add'>+		       (lp-&gt;media == AUI ? "AUI" :</div><div class='add'>+			(lp-&gt;media == BNC_AUI ? "BNC/AUI" :</div><div class='add'>+			 (lp-&gt;media == EXT_SIA ? "EXT SIA" :</div><div class='ctx'> 			  (lp-&gt;media == _100Mb  ? "100Mb/s" :</div><div class='ctx'> 			   (lp-&gt;media == _10Mb   ? "10Mb/s" :</div><div class='ctx'> 			    "???"</div><div class='hunk'>@@ -5471,7 +5470,7 @@ de4x5_dbg_media(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	lp-&gt;c_media = lp-&gt;media;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5554,7 +5553,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	u32 lval[36];</div><div class='ctx'>     } tmp;</div><div class='ctx'>     u_long flags = 0;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     switch(ioc-&gt;cmd) {</div><div class='ctx'>     case DE4X5_GET_HWADDR:           /* Get the hardware address */</div><div class='ctx'> 	ioc-&gt;len = ETH_ALEN;</div><div class='hunk'>@@ -5575,7 +5574,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	}</div><div class='ctx'> 	build_setup_frame(dev, PHYS_ADDR_ONLY);</div><div class='ctx'> 	/* Set up the descriptor and give ownership to the card */</div><div class='del'>-	load_packet(dev, lp-&gt;setup_frame, TD_IC | PERFECT_F | TD_SET | </div><div class='add'>+	load_packet(dev, lp-&gt;setup_frame, TD_IC | PERFECT_F | TD_SET |</div><div class='ctx'> 		                                       SETUP_FRAME_LEN, (struct sk_buff *)1);</div><div class='ctx'> 	lp-&gt;tx_new = (++lp-&gt;tx_new) % lp-&gt;txRingSize;</div><div class='ctx'> 	outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */</div><div class='hunk'>@@ -5617,8 +5616,8 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	memcpy(&amp;statbuf, &amp;lp-&gt;pktStats, ioc-&gt;len);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-	if (copy_to_user(ioc-&gt;data, &amp;statbuf, ioc-&gt;len)) </div><div class='del'>-		return -EFAULT; </div><div class='add'>+	if (copy_to_user(ioc-&gt;data, &amp;statbuf, ioc-&gt;len))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	break;</div><div class='ctx'>     }</div><div class='ctx'>     case DE4X5_CLR_STATS:            /* Zero out the driver statistics */</div><div class='hunk'>@@ -5652,9 +5651,9 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	ioc-&gt;len = j;</div><div class='ctx'> 	if (copy_to_user(ioc-&gt;data, tmp.addr, ioc-&gt;len)) return -EFAULT;</div><div class='ctx'> 	break;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */</div><div class='del'>-/*	</div><div class='add'>+/*</div><div class='ctx'>       case DE4X5_DUMP:</div><div class='ctx'> 	j = 0;</div><div class='ctx'> 	tmp.addr[j++] = dev-&gt;irq;</div><div class='hunk'>@@ -5664,7 +5663,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	tmp.addr[j++] = lp-&gt;rxRingSize;</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = (long)lp-&gt;rx_ring; j+=4;</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = (long)lp-&gt;tx_ring; j+=4;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i=0;i&lt;lp-&gt;rxRingSize-1;i++){</div><div class='ctx'> 	    if (i &lt; 3) {</div><div class='ctx'> 		tmp.lval[j&gt;&gt;2] = (long)&amp;lp-&gt;rx_ring[i].status; j+=4;</div><div class='hunk'>@@ -5677,7 +5676,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = (long)&amp;lp-&gt;tx_ring[i].status; j+=4;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i=0;i&lt;lp-&gt;rxRingSize-1;i++){</div><div class='ctx'> 	    if (i &lt; 3) {</div><div class='ctx'> 		tmp.lval[j&gt;&gt;2] = (s32)le32_to_cpu(lp-&gt;rx_ring[i].buf); j+=4;</div><div class='hunk'>@@ -5690,14 +5689,14 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = (s32)le32_to_cpu(lp-&gt;tx_ring[i].buf); j+=4;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i=0;i&lt;lp-&gt;rxRingSize;i++){</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2] = le32_to_cpu(lp-&gt;rx_ring[i].status); j+=4;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i=0;i&lt;lp-&gt;txRingSize;i++){</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2] = le32_to_cpu(lp-&gt;tx_ring[i].status); j+=4;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = inl(DE4X5_BMR);  j+=4;</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = inl(DE4X5_TPD);  j+=4;</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = inl(DE4X5_RPD);  j+=4;</div><div class='hunk'>@@ -5706,18 +5705,18 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = inl(DE4X5_STS);  j+=4;</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = inl(DE4X5_OMR);  j+=4;</div><div class='ctx'> 	tmp.lval[j&gt;&gt;2] = inl(DE4X5_IMR);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = lp-&gt;chipset; j+=4; </div><div class='add'>+	tmp.lval[j&gt;&gt;2] = lp-&gt;chipset; j+=4;</div><div class='ctx'> 	if (lp-&gt;chipset == DC21140) {</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2] = gep_rd(dev);  j+=4;</div><div class='ctx'> 	} else {</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SISR); j+=4;</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SICR); j+=4;</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_STRR); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SIGR); j+=4; </div><div class='add'>+	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SIGR); j+=4;</div><div class='ctx'> 	}</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = lp-&gt;phy[lp-&gt;active].id; j+=4; </div><div class='add'>+	tmp.lval[j&gt;&gt;2] = lp-&gt;phy[lp-&gt;active].id; j+=4;</div><div class='ctx'> 	if (lp-&gt;phy[lp-&gt;active].id &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = lp-&gt;active; j+=4; </div><div class='add'>+	    tmp.lval[j&gt;&gt;2] = lp-&gt;active; j+=4;</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_CR,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_SR,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='ctx'> 	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_ID0,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='hunk'>@@ -5734,10 +5733,10 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		tmp.lval[j&gt;&gt;2]=mii_rd(0x14,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='ctx'> 	    }</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	tmp.addr[j++] = lp-&gt;txRingSize;</div><div class='ctx'> 	tmp.addr[j++] = netif_queue_stopped(dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ioc-&gt;len = j;</div><div class='ctx'> 	if (copy_to_user(ioc-&gt;data, tmp.addr, ioc-&gt;len)) return -EFAULT;</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -5746,7 +5745,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'>     default:</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tulip/de4x5.h b/drivers/net/tulip/de4x5.h<br/>index ad37a4074302..57226e5eb8a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/de4x5.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/de4x5.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/de4x5.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/de4x5.h</a></div><div class='hunk'>@@ -38,11 +38,11 @@</div><div class='ctx'> /*</div><div class='ctx'> ** EISA Register Address Map</div><div class='ctx'> */</div><div class='del'>-#define EISA_ID      iobase+0x0c80   /* EISA ID Registers */ </div><div class='del'>-#define EISA_ID0     iobase+0x0c80   /* EISA ID Register 0 */ </div><div class='del'>-#define EISA_ID1     iobase+0x0c81   /* EISA ID Register 1 */ </div><div class='del'>-#define EISA_ID2     iobase+0x0c82   /* EISA ID Register 2 */ </div><div class='del'>-#define EISA_ID3     iobase+0x0c83   /* EISA ID Register 3 */ </div><div class='add'>+#define EISA_ID      iobase+0x0c80   /* EISA ID Registers */</div><div class='add'>+#define EISA_ID0     iobase+0x0c80   /* EISA ID Register 0 */</div><div class='add'>+#define EISA_ID1     iobase+0x0c81   /* EISA ID Register 1 */</div><div class='add'>+#define EISA_ID2     iobase+0x0c82   /* EISA ID Register 2 */</div><div class='add'>+#define EISA_ID3     iobase+0x0c83   /* EISA ID Register 3 */</div><div class='ctx'> #define EISA_CR      iobase+0x0c84   /* EISA Control Register */</div><div class='ctx'> #define EISA_REG0    iobase+0x0c88   /* EISA Configuration Register 0 */</div><div class='ctx'> #define EISA_REG1    iobase+0x0c89   /* EISA Configuration Register 1 */</div><div class='hunk'>@@ -1008,8 +1008,8 @@ struct de4x5_ioctl {</div><div class='ctx'> 	unsigned char  __user *data;       /* Pointer to the data buffer */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>-** Recognised commands for the driver </div><div class='add'>+/*</div><div class='add'>+** Recognised commands for the driver</div><div class='ctx'> */</div><div class='ctx'> #define DE4X5_GET_HWADDR	0x01 /* Get the hardware address */</div><div class='ctx'> #define DE4X5_SET_HWADDR	0x02 /* Set the hardware address */</div><div class='head'>diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c<br/>index 74e9075d9c48..4e5b0f2acc39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/dmfe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/dmfe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/dmfe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/dmfe.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@</div><div class='ctx'>     forget to unmap PCI mapped skbs.</div><div class='ctx'> </div><div class='ctx'>     Alan Cox &lt;alan@redhat.com&gt;</div><div class='del'>-    Added new PCI identifiers provided by Clear Zhang at ALi </div><div class='add'>+    Added new PCI identifiers provided by Clear Zhang at ALi</div><div class='ctx'>     for their 1563 ethernet device.</div><div class='ctx'> </div><div class='ctx'>     TODO</div><div class='hunk'>@@ -506,7 +506,7 @@ static int dmfe_open(struct DEVICE *dev)</div><div class='ctx'> </div><div class='ctx'> 	DMFE_DBUG(0, "dmfe_open", 0);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, &amp;dmfe_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	ret = request_irq(dev-&gt;irq, &amp;dmfe_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c<br/>index fbd9ab60b052..5ffbd5b300c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/eeprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/eeprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/eeprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/eeprom.c</a></div><div class='hunk'>@@ -96,11 +96,11 @@ static const char *block_name[] __devinitdata = {</div><div class='ctx'>  * tulip_build_fake_mediatable - Build a fake mediatable entry.</div><div class='ctx'>  * @tp: Ptr to the tulip private data.</div><div class='ctx'>  *</div><div class='del'>- * Some cards like the 3x5 HSC cards (J3514A) do not have a standard </div><div class='add'>+ * Some cards like the 3x5 HSC cards (J3514A) do not have a standard</div><div class='ctx'>  * srom and can not be handled under the fixup routine.  These cards</div><div class='del'>- * still need a valid mediatable entry for correct csr12 setup and </div><div class='add'>+ * still need a valid mediatable entry for correct csr12 setup and</div><div class='ctx'>  * mii handling.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Since this is currently a parisc-linux specific function, the</div><div class='ctx'>  * #ifdef __hppa__ should completely optimize this function away for</div><div class='ctx'>  * non-parisc hardware.</div><div class='hunk'>@@ -140,7 +140,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)</div><div class='ctx'> 		tp-&gt;flags |= HAS_PHY_IRQ;</div><div class='ctx'> 		tp-&gt;csr12_shadow = -1;</div><div class='ctx'> 	}</div><div class='del'>-#endif </div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __devinit tulip_parse_eeprom(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c<br/>index bb3558164a5b..99ccf2ebb342 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/interrupt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/interrupt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/interrupt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/interrupt.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include "tulip.h"</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> int tulip_rx_copybreak;</div><div class='hunk'>@@ -139,22 +138,22 @@ int tulip_poll(struct net_device *dev, int *budget)</div><div class='ctx'> 		}</div><div class='ctx'>                /* Acknowledge current RX interrupt sources. */</div><div class='ctx'>                iowrite32((RxIntr | RxNoBuf), tp-&gt;base_addr + CSR5);</div><div class='del'>- </div><div class='del'>- </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>                /* If we own the next entry, it is a new packet. Send it up. */</div><div class='ctx'>                while ( ! (tp-&gt;rx_ring[entry].status &amp; cpu_to_le32(DescOwned))) {</div><div class='ctx'>                        s32 status = le32_to_cpu(tp-&gt;rx_ring[entry].status);</div><div class='del'>- </div><div class='del'>- </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>                        if (tp-&gt;dirty_rx + RX_RING_SIZE == tp-&gt;cur_rx)</div><div class='ctx'>                                break;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>                        if (tulip_debug &gt; 5)</div><div class='ctx'>                                printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n",</div><div class='ctx'>                                       dev-&gt;name, entry, status);</div><div class='ctx'>                        if (--rx_work_limit &lt; 0)</div><div class='ctx'>                                goto not_done;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>                        if ((status &amp; 0x38008300) != 0x0300) {</div><div class='ctx'>                                if ((status &amp; 0x38000300) != 0x0300) {</div><div class='ctx'>                                 /* Ingore earlier buffers. */</div><div class='hunk'>@@ -180,7 +179,7 @@ int tulip_poll(struct net_device *dev, int *budget)</div><div class='ctx'>                                /* Omit the four octet CRC from the length. */</div><div class='ctx'>                                short pkt_len = ((status &gt;&gt; 16) &amp; 0x7ff) - 4;</div><div class='ctx'>                                struct sk_buff *skb;</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> #ifndef final_version</div><div class='ctx'>                                if (pkt_len &gt; 1518) {</div><div class='ctx'>                                        printk(KERN_WARNING "%s: Bogus packet size of %d (%#x).\n",</div><div class='hunk'>@@ -213,7 +212,7 @@ int tulip_poll(struct net_device *dev, int *budget)</div><div class='ctx'>                                } else {        /* Pass up the skb already on the Rx ring. */</div><div class='ctx'>                                        char *temp = skb_put(skb = tp-&gt;rx_buffers[entry].skb,</div><div class='ctx'>                                                             pkt_len);</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> #ifndef final_version</div><div class='ctx'>                                        if (tp-&gt;rx_buffers[entry].mapping !=</div><div class='ctx'>                                            le32_to_cpu(tp-&gt;rx_ring[entry].buffer1)) {</div><div class='hunk'>@@ -225,17 +224,17 @@ int tulip_poll(struct net_device *dev, int *budget)</div><div class='ctx'>                                                       skb-&gt;head, temp);</div><div class='ctx'>                                        }</div><div class='ctx'> #endif</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>                                        pci_unmap_single(tp-&gt;pdev, tp-&gt;rx_buffers[entry].mapping,</div><div class='ctx'>                                                         PKT_BUF_SZ, PCI_DMA_FROMDEVICE);</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>                                        tp-&gt;rx_buffers[entry].skb = NULL;</div><div class='ctx'>                                        tp-&gt;rx_buffers[entry].mapping = 0;</div><div class='ctx'>                                }</div><div class='ctx'>                                skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>                                netif_receive_skb(skb);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>                                dev-&gt;last_rx = jiffies;</div><div class='ctx'>                                tp-&gt;stats.rx_packets++;</div><div class='ctx'>                                tp-&gt;stats.rx_bytes += pkt_len;</div><div class='hunk'>@@ -245,12 +244,12 @@ int tulip_poll(struct net_device *dev, int *budget)</div><div class='ctx'>                        entry = (++tp-&gt;cur_rx) % RX_RING_SIZE;</div><div class='ctx'>                        if (tp-&gt;cur_rx - tp-&gt;dirty_rx &gt; RX_RING_SIZE/4)</div><div class='ctx'>                                tulip_refill_rx(dev);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>                 }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>                /* New ack strategy... irq does not ack Rx any longer</div><div class='ctx'>                   hopefully this helps */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>                /* Really bad things can happen here... If new packet arrives</div><div class='ctx'>                 * and an irq arrives (tx or just due to occasionally unset</div><div class='ctx'>                 * mask), it will be acked by irq handler, but new thread</div><div class='hunk'>@@ -259,28 +258,28 @@ int tulip_poll(struct net_device *dev, int *budget)</div><div class='ctx'>                 * tomorrow (night 011029). If it will not fail, we won</div><div class='ctx'>                 * finally: amount of IO did not increase at all. */</div><div class='ctx'>        } while ((ioread32(tp-&gt;base_addr + CSR5) &amp; RxIntr));</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> done:</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>  #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>           /* We use this simplistic scheme for IM. It's proven by</div><div class='ctx'>              real life installations. We can have IM enabled</div><div class='del'>-            continuesly but this would cause unnecessary latency. </div><div class='del'>-            Unfortunely we can't use all the NET_RX_* feedback here. </div><div class='del'>-            This would turn on IM for devices that is not contributing </div><div class='del'>-            to backlog congestion with unnecessary latency. </div><div class='del'>-  </div><div class='add'>+            continuesly but this would cause unnecessary latency.</div><div class='add'>+            Unfortunely we can't use all the NET_RX_* feedback here.</div><div class='add'>+            This would turn on IM for devices that is not contributing</div><div class='add'>+            to backlog congestion with unnecessary latency.</div><div class='add'>+</div><div class='ctx'>              We monitor the the device RX-ring and have:</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>              HW Interrupt Mitigation either ON or OFF.</div><div class='del'>-  </div><div class='del'>-            ON:  More then 1 pkt received (per intr.) OR we are dropping </div><div class='add'>+</div><div class='add'>+            ON:  More then 1 pkt received (per intr.) OR we are dropping</div><div class='ctx'>              OFF: Only 1 pkt received</div><div class='del'>-            </div><div class='add'>+</div><div class='ctx'>              Note. We only use min and max (0, 15) settings from mit_table */</div><div class='del'>-  </div><div class='del'>-  </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>           if( tp-&gt;flags &amp;  HAS_INTR_MITIGATION) {</div><div class='ctx'>                  if( received &gt; 1 ) {</div><div class='ctx'>                          if( ! tp-&gt;mit_on ) {</div><div class='hunk'>@@ -297,20 +296,20 @@ done:</div><div class='ctx'>           }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_TULIP_NAPI_HW_MITIGATION */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          dev-&gt;quota -= received;</div><div class='ctx'>          *budget -= received;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          tulip_refill_rx(dev);</div><div class='del'>-         </div><div class='add'>+</div><div class='ctx'>          /* If RX ring is not full we are out of memory. */</div><div class='ctx'>          if (tp-&gt;rx_buffers[tp-&gt;dirty_rx % RX_RING_SIZE].skb == NULL) goto oom;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          /* Remove us from polling list and enable RX intr. */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          netif_rx_complete(dev);</div><div class='ctx'>          iowrite32(tulip_tbl[tp-&gt;chip_id].valid_intrs, tp-&gt;base_addr+CSR7);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          /* The last op happens after poll completion. Which means the following:</div><div class='ctx'>           * 1. it can race with disabling irqs in irq handler</div><div class='ctx'>           * 2. it can race with dise/enabling irqs in other poll threads</div><div class='hunk'>@@ -321,9 +320,9 @@ done:</div><div class='ctx'>           * due to races in masking and due to too late acking of already</div><div class='ctx'>           * processed irqs. But it must not result in losing events.</div><div class='ctx'>           */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          return 0;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>  not_done:</div><div class='ctx'>          if (!received) {</div><div class='ctx'> </div><div class='hunk'>@@ -331,29 +330,29 @@ done:</div><div class='ctx'>          }</div><div class='ctx'>          dev-&gt;quota -= received;</div><div class='ctx'>          *budget -= received;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          if (tp-&gt;cur_rx - tp-&gt;dirty_rx &gt; RX_RING_SIZE/2 ||</div><div class='ctx'>              tp-&gt;rx_buffers[tp-&gt;dirty_rx % RX_RING_SIZE].skb == NULL)</div><div class='ctx'>                  tulip_refill_rx(dev);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          if (tp-&gt;rx_buffers[tp-&gt;dirty_rx % RX_RING_SIZE].skb == NULL) goto oom;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          return 1;</div><div class='del'>- </div><div class='del'>- </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>  oom:    /* Executed with RX ints disabled */</div><div class='del'>- </div><div class='del'>-         </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'>          /* Start timer, stop polling, but do not enable rx interrupts. */</div><div class='ctx'>          mod_timer(&amp;tp-&gt;oom_timer, jiffies+1);</div><div class='del'>-       </div><div class='add'>+</div><div class='ctx'>          /* Think: timer_pending() was an explicit signature of bug.</div><div class='ctx'>           * Timer can be pending now but fired and completed</div><div class='ctx'>           * before we did netif_rx_complete(). See? We would lose it. */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          /* remove ourselves from the polling list */</div><div class='ctx'>          netif_rx_complete(dev);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>          return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -521,9 +520,9 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> 	/* Let's see whether the interrupt really is for us */</div><div class='ctx'> 	csr5 = ioread32(ioaddr + CSR5);</div><div class='ctx'> </div><div class='del'>-        if (tp-&gt;flags &amp; HAS_PHY_IRQ) </div><div class='add'>+        if (tp-&gt;flags &amp; HAS_PHY_IRQ)</div><div class='ctx'> 	        handled = phy_interrupt (dev);</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> 	if ((csr5 &amp; (NormalIntr|AbnormalIntr)) == 0)</div><div class='ctx'> 		return IRQ_RETVAL(handled);</div><div class='ctx'> </div><div class='hunk'>@@ -538,17 +537,17 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> 			/* Mask RX intrs and add the device to poll list. */</div><div class='ctx'> 			iowrite32(tulip_tbl[tp-&gt;chip_id].valid_intrs&amp;~RxPollInt, ioaddr + CSR7);</div><div class='ctx'> 			netif_rx_schedule(dev);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if (!(csr5&amp;~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass)))</div><div class='ctx'>                                break;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'>                /* Acknowledge the interrupt sources we handle here ASAP</div><div class='ctx'>                   the poll function does Rx and RxNoBuf acking */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		iowrite32(csr5 &amp; 0x0001ff3f, ioaddr + CSR5);</div><div class='ctx'> </div><div class='del'>-#else </div><div class='add'>+#else</div><div class='ctx'> 		/* Acknowledge all of the current interrupt sources ASAP. */</div><div class='ctx'> 		iowrite32(csr5 &amp; 0x0001ffff, ioaddr + CSR5);</div><div class='ctx'> </div><div class='hunk'>@@ -559,11 +558,11 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #endif /*  CONFIG_TULIP_NAPI */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if (tulip_debug &gt; 4)</div><div class='ctx'> 			printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x.\n",</div><div class='ctx'> 			       dev-&gt;name, csr5, ioread32(ioaddr + CSR5));</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 		if (csr5 &amp; (TxNoBuf | TxDied | TxIntr | TimerInt)) {</div><div class='ctx'> 			unsigned int dirty_tx;</div><div class='hunk'>@@ -737,17 +736,17 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> #ifdef CONFIG_TULIP_NAPI</div><div class='ctx'> 		if (rxd)</div><div class='ctx'> 			csr5 &amp;= ~RxPollInt;</div><div class='del'>-	} while ((csr5 &amp; (TxNoBuf | </div><div class='del'>-			  TxDied | </div><div class='del'>-			  TxIntr | </div><div class='add'>+	} while ((csr5 &amp; (TxNoBuf |</div><div class='add'>+			  TxDied |</div><div class='add'>+			  TxIntr |</div><div class='ctx'> 			  TimerInt |</div><div class='ctx'> 			  /* Abnormal intr. */</div><div class='del'>-			  RxDied | </div><div class='del'>-			  TxFIFOUnderflow | </div><div class='del'>-			  TxJabber | </div><div class='del'>-			  TPLnkFail |  </div><div class='add'>+			  RxDied |</div><div class='add'>+			  TxFIFOUnderflow |</div><div class='add'>+			  TxJabber |</div><div class='add'>+			  TPLnkFail |</div><div class='ctx'> 			  SytemError )) != 0);</div><div class='del'>-#else </div><div class='add'>+#else</div><div class='ctx'> 	} while ((csr5 &amp; (NormalIntr|AbnormalIntr)) != 0);</div><div class='ctx'> </div><div class='ctx'> 	tulip_refill_rx(dev);</div><div class='head'>diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c<br/>index f53396fe79c9..e9bc2a958c14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/media.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/media.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/media.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/media.c</a></div><div class='hunk'>@@ -140,7 +140,7 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;tp-&gt;mii_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* Establish sync by sending 32 logic ones. */</div><div class='ctx'> 	for (i = 32; i &gt;= 0; i--) {</div><div class='ctx'> 		iowrite32(MDIO_ENB | MDIO_DATA_WRITE1, mdio_addr);</div><div class='head'>diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h<br/>index 05d2d96f7be2..3bcfbf3d23ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/tulip.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/tulip.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/tulip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/tulip.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #ifndef __NET_TULIP_H__</div><div class='ctx'> #define __NET_TULIP_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -259,7 +258,7 @@ enum t21143_csr6_bits {</div><div class='ctx'>    There are no ill effects from too-large receive rings. */</div><div class='ctx'> </div><div class='ctx'> #define TX_RING_SIZE	32</div><div class='del'>-#define RX_RING_SIZE	128 </div><div class='add'>+#define RX_RING_SIZE	128</div><div class='ctx'> #define MEDIA_MASK     31</div><div class='ctx'> </div><div class='ctx'> #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */</div><div class='head'>diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c<br/>index c67c91251d04..7351831f57ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/tulip_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/tulip_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/tulip_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/tulip_core.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"tulip"</div><div class='ctx'> #ifdef CONFIG_TULIP_NAPI</div><div class='hunk'>@@ -490,7 +489,7 @@ tulip_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='del'>-	if ((retval = request_irq(dev-&gt;irq, &amp;tulip_interrupt, SA_SHIRQ, dev-&gt;name, dev)))</div><div class='add'>+	if ((retval = request_irq(dev-&gt;irq, &amp;tulip_interrupt, IRQF_SHARED, dev-&gt;name, dev)))</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='ctx'> 	tulip_init_ring (dev);</div><div class='hunk'>@@ -1224,7 +1223,7 @@ out:</div><div class='ctx'>  *	Chips that have the MRM/reserved bit quirk and the burst quirk. That</div><div class='ctx'>  *	is the DM910X and the on chip ULi devices</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static int tulip_uli_dm_quirk(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (pdev-&gt;vendor == 0x1282 &amp;&amp; pdev-&gt;device == 0x9102)</div><div class='hunk'>@@ -1297,7 +1296,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* 1. Intel Saturn. Switch to 8 long words burst, 8 long word cache</div><div class='del'>-	      aligned.  Aries might need this too. The Saturn errata are not </div><div class='add'>+	      aligned.  Aries might need this too. The Saturn errata are not</div><div class='ctx'> 	      pretty reading but thankfully it's an old 486 chipset.</div><div class='ctx'> </div><div class='ctx'> 	   2. The dreaded SiS496 486 chipset. Same workaround as Intel</div><div class='hunk'>@@ -1350,10 +1349,10 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	if (pci_resource_len (pdev, 0) &lt; tulip_tbl[chip_idx].io_size) {</div><div class='del'>-		printk (KERN_ERR PFX "%s: I/O region (0x%lx@0x%lx) too small, "</div><div class='add'>+		printk (KERN_ERR PFX "%s: I/O region (0x%llx@0x%llx) too small, "</div><div class='ctx'> 			"aborting\n", pci_name(pdev),</div><div class='del'>-			pci_resource_len (pdev, 0),</div><div class='del'>-			pci_resource_start (pdev, 0));</div><div class='add'>+			(unsigned long long)pci_resource_len (pdev, 0),</div><div class='add'>+			(unsigned long long)pci_resource_start (pdev, 0));</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1483,14 +1482,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,</div><div class='ctx'> 			sa_offset = 2;		/* Grrr, damn Matrox boards. */</div><div class='ctx'> 			multiport_cnt = 4;</div><div class='ctx'> 		}</div><div class='del'>-#ifdef CONFIG_DDB5476</div><div class='del'>-		if ((pdev-&gt;bus-&gt;number == 0) &amp;&amp; (PCI_SLOT(pdev-&gt;devfn) == 6)) {</div><div class='del'>-			/* DDB5476 MAC address in first EEPROM locations. */</div><div class='del'>-                       sa_offset = 0;</div><div class='del'>-                       /* No media table either */</div><div class='del'>-                       tp-&gt;flags &amp;= ~HAS_MEDIA_TABLE;</div><div class='del'>-               }</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_DDB5477</div><div class='ctx'>                if ((pdev-&gt;bus-&gt;number == 0) &amp;&amp; (PCI_SLOT(pdev-&gt;devfn) == 4)) {</div><div class='ctx'>                        /* DDB5477 MAC address in first EEPROM locations. */</div><div class='hunk'>@@ -1500,7 +1491,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,</div><div class='ctx'>                }</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_MIPS_COBALT</div><div class='del'>-               if ((pdev-&gt;bus-&gt;number == 0) &amp;&amp; </div><div class='add'>+               if ((pdev-&gt;bus-&gt;number == 0) &amp;&amp;</div><div class='ctx'>                    ((PCI_SLOT(pdev-&gt;devfn) == 7) ||</div><div class='ctx'>                     (PCI_SLOT(pdev-&gt;devfn) == 12))) {</div><div class='ctx'>                        /* Cobalt MAC address in first EEPROM locations. */</div><div class='hunk'>@@ -1558,10 +1549,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,</div><div class='ctx'> 			dev-&gt;dev_addr[i] = last_phys_addr[i];</div><div class='ctx'> 		dev-&gt;dev_addr[i] = last_phys_addr[i] + 1;</div><div class='ctx'> #if defined(__sparc__)</div><div class='del'>-		if ((pcp != NULL) &amp;&amp; prom_getproplen(pcp-&gt;prom_node,</div><div class='del'>-			"local-mac-address") == 6) {</div><div class='del'>-			prom_getproperty(pcp-&gt;prom_node, "local-mac-address",</div><div class='del'>-			    dev-&gt;dev_addr, 6);</div><div class='add'>+		if (pcp) {</div><div class='add'>+			unsigned char *addr;</div><div class='add'>+			int len;</div><div class='add'>+		  </div><div class='add'>+			addr = of_get_property(pcp-&gt;prom_node,</div><div class='add'>+					       "local-mac-address", &amp;len);</div><div class='add'>+			if (addr &amp;&amp; len == 6)</div><div class='add'>+				memcpy(dev-&gt;dev_addr, addr, 6);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(__i386__) || defined(__x86_64__)	/* Patch up x86 BIOS bug. */</div><div class='hunk'>@@ -1775,7 +1770,7 @@ static int tulip_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_enable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	if ((retval = request_irq(dev-&gt;irq, &amp;tulip_interrupt, SA_SHIRQ, dev-&gt;name, dev))) {</div><div class='add'>+	if ((retval = request_irq(dev-&gt;irq, &amp;tulip_interrupt, IRQF_SHARED, dev-&gt;name, dev))) {</div><div class='ctx'> 		printk (KERN_ERR "tulip: request_irq failed in resume\n");</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c<br/>index 238e9c72cb3a..fd64b2b3e99c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/uli526x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/uli526x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/uli526x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/uli526x.c</a></div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'>     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='ctx'>     GNU General Public License for more details.</div><div class='ctx'> </div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"uli526x"</div><div class='hunk'>@@ -185,7 +185,7 @@ struct uli526x_board_info {</div><div class='ctx'> </div><div class='ctx'> 	/* NIC SROM data */</div><div class='ctx'> 	unsigned char srom[128];</div><div class='del'>-	u8 init;	</div><div class='add'>+	u8 init;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum uli526x_offsets {</div><div class='hunk'>@@ -258,7 +258,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	struct uli526x_board_info *db;	/* board information structure */</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int i, err;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ULI526X_DBUG(0, "uli526x_init_one()", 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!printed_version++)</div><div class='hunk'>@@ -316,7 +316,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_nomem;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	db-&gt;first_tx_desc = (struct tx_desc *) db-&gt;desc_pool_ptr;</div><div class='ctx'> 	db-&gt;first_tx_desc_dma = db-&gt;desc_pool_dma_ptr;</div><div class='ctx'> 	db-&gt;buf_pool_start = db-&gt;buf_pool_ptr;</div><div class='hunk'>@@ -324,14 +324,14 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	db-&gt;chip_id = ent-&gt;driver_data;</div><div class='ctx'> 	db-&gt;ioaddr = pci_resource_start(pdev, 0);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	db-&gt;pdev = pdev;</div><div class='ctx'> 	db-&gt;init = 1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;base_addr = db-&gt;ioaddr;</div><div class='ctx'> 	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Register some necessary functions */</div><div class='ctx'> 	dev-&gt;open = &amp;uli526x_open;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = &amp;uli526x_start_xmit;</div><div class='hunk'>@@ -341,7 +341,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;netdev_ethtool_ops;</div><div class='ctx'> 	spin_lock_init(&amp;db-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* read 64 word srom data */</div><div class='ctx'> 	for (i = 0; i &lt; 64; i++)</div><div class='ctx'> 		((u16 *) db-&gt;srom)[i] = cpu_to_le16(read_srom_word(db-&gt;ioaddr, i));</div><div class='hunk'>@@ -374,7 +374,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: ULi M%04lx at pci%s,",dev-&gt;name,ent-&gt;driver_data &gt;&gt; 16,pci_name(pdev));</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		printk("%c%02x", i ? ':' : ' ', dev-&gt;dev_addr[i]);</div><div class='ctx'> 	printk(", irq %d.\n", dev-&gt;irq);</div><div class='hunk'>@@ -389,7 +389,7 @@ err_out_nomem:</div><div class='ctx'> 	if(db-&gt;desc_pool_ptr)</div><div class='ctx'> 		pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='ctx'> 			db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 	if(db-&gt;buf_pool_ptr != NULL)</div><div class='ctx'> 		pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='ctx'> 			db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='hunk'>@@ -433,10 +433,10 @@ static int uli526x_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct uli526x_board_info *db = netdev_priv(dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ULI526X_DBUG(0, "uli526x_open", 0);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, &amp;uli526x_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	ret = request_irq(dev-&gt;irq, &amp;uli526x_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -454,7 +454,7 @@ static int uli526x_open(struct net_device *dev)</div><div class='ctx'> 	/* CR6 operation mode decision */</div><div class='ctx'> 	db-&gt;cr6_data |= ULI526X_TXTH_256;</div><div class='ctx'> 	db-&gt;cr0_data = CR0_DEFAULT;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Initialize ULI526X board */</div><div class='ctx'> 	uli526x_init(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -604,7 +604,7 @@ static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Restore CR7 to enable interrupt */</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;db-&gt;lock, flags);</div><div class='ctx'> 	outl(db-&gt;cr7_data, dev-&gt;base_addr + DCR7);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* free this SKB */</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -782,7 +782,7 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int rxlen;</div><div class='ctx'> 	u32 rdes0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	rxptr = db-&gt;rx_ready_ptr;</div><div class='ctx'> </div><div class='ctx'> 	while(db-&gt;rx_avail_cnt) {</div><div class='hunk'>@@ -821,7 +821,7 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info</div><div class='ctx'> 			if ( !(rdes0 &amp; 0x8000) ||</div><div class='ctx'> 				((db-&gt;cr6_data &amp; CR6_PM) &amp;&amp; (rxlen&gt;6)) ) {</div><div class='ctx'> 				skb = rxptr-&gt;rx_skb_ptr;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 				/* Good packet, send to upper layer */</div><div class='ctx'> 				/* Shorst packet used new SKB */</div><div class='ctx'> 				if ( (rxlen &lt; RX_COPY_SIZE) &amp;&amp;</div><div class='hunk'>@@ -841,7 +841,7 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info</div><div class='ctx'> 				dev-&gt;last_rx = jiffies;</div><div class='ctx'> 				db-&gt;stats.rx_packets++;</div><div class='ctx'> 				db-&gt;stats.rx_bytes += rxlen;</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Reuse SKB buffer when the packet is error */</div><div class='ctx'> 				ULI526X_DBUG(0, "Reuse SK buffer, rdes0", rdes0);</div><div class='hunk'>@@ -911,7 +911,7 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	                   SUPPORTED_100baseT_Full |</div><div class='ctx'> 	                   SUPPORTED_Autoneg |</div><div class='ctx'> 	                   SUPPORTED_MII);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	ecmd-&gt;advertising = (ADVERTISED_10baseT_Half |</div><div class='ctx'> 	                   ADVERTISED_10baseT_Full |</div><div class='ctx'> 	                   ADVERTISED_100baseT_Half |</div><div class='hunk'>@@ -924,13 +924,13 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	ecmd-&gt;phy_address = db-&gt;phy_addr;</div><div class='ctx'> </div><div class='ctx'> 	ecmd-&gt;transceiver = XCVR_EXTERNAL;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	ecmd-&gt;speed = 10;</div><div class='ctx'> 	ecmd-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(db-&gt;op_mode==ULI526X_100MHF || db-&gt;op_mode==ULI526X_100MFD)</div><div class='ctx'> 	{</div><div class='del'>-		ecmd-&gt;speed = 100;               </div><div class='add'>+		ecmd-&gt;speed = 100;</div><div class='ctx'> 	}</div><div class='ctx'> 	if(db-&gt;op_mode==ULI526X_10MFD || db-&gt;op_mode==ULI526X_100MFD)</div><div class='ctx'> 	{</div><div class='hunk'>@@ -939,11 +939,11 @@ ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)</div><div class='ctx'> 	if(db-&gt;link_failed)</div><div class='ctx'> 	{</div><div class='ctx'> 		ecmd-&gt;speed = -1;</div><div class='del'>-		ecmd-&gt;duplex = -1;	</div><div class='add'>+		ecmd-&gt;duplex = -1;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (db-&gt;media_mode &amp; ULI526X_AUTO)</div><div class='del'>-	{	</div><div class='add'>+	{</div><div class='ctx'> 		ecmd-&gt;autoneg = AUTONEG_ENABLE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -964,15 +964,15 @@ static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) {</div><div class='ctx'> 	struct uli526x_board_info *np = netdev_priv(dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ULi_ethtool_gset(np, cmd);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 netdev_get_link(struct net_device *dev) {</div><div class='ctx'> 	struct uli526x_board_info *np = netdev_priv(dev);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	if(np-&gt;link_failed)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1005,11 +1005,11 @@ static void uli526x_timer(unsigned long data)</div><div class='ctx'> 	struct uli526x_board_info *db = netdev_priv(dev);</div><div class='ctx'>  	unsigned long flags;</div><div class='ctx'> 	u8 TmpSpeed=10;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	//ULI526X_DBUG(0, "uli526x_timer()", 0);</div><div class='ctx'> 	spin_lock_irqsave(&amp;db-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Dynamic reset ULI526X : system error or transmit time-out */</div><div class='ctx'> 	tmp_cr8 = inl(db-&gt;ioaddr + DCR8);</div><div class='ctx'> 	if ( (db-&gt;interval_rx_cnt==0) &amp;&amp; (tmp_cr8) ) {</div><div class='hunk'>@@ -1021,9 +1021,9 @@ static void uli526x_timer(unsigned long data)</div><div class='ctx'> 	/* TX polling kick monitor */</div><div class='ctx'> 	if ( db-&gt;tx_packet_cnt &amp;&amp;</div><div class='ctx'> 	     time_after(jiffies, dev-&gt;trans_start + ULI526X_TX_KICK) ) {</div><div class='del'>-		outl(0x1, dev-&gt;base_addr + DCR1);   // Tx polling again </div><div class='add'>+		outl(0x1, dev-&gt;base_addr + DCR1);   // Tx polling again</div><div class='ctx'> </div><div class='del'>-		// TX Timeout </div><div class='add'>+		// TX Timeout</div><div class='ctx'> 		if ( time_after(jiffies, dev-&gt;trans_start + ULI526X_TX_TIMEOUT) ) {</div><div class='ctx'> 			db-&gt;reset_TXtimeout++;</div><div class='ctx'> 			db-&gt;wait_reset = 1;</div><div class='hunk'>@@ -1073,7 +1073,7 @@ static void uli526x_timer(unsigned long data)</div><div class='ctx'> 				uli526x_sense_speed(db) )</div><div class='ctx'> 				db-&gt;link_failed = 1;</div><div class='ctx'> 			uli526x_process_mode(db);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if(db-&gt;link_failed==0)</div><div class='ctx'> 			{</div><div class='ctx'> 				if(db-&gt;op_mode==ULI526X_100MHF || db-&gt;op_mode==ULI526X_100MFD)</div><div class='hunk'>@@ -1404,7 +1404,7 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)</div><div class='ctx'> 	phy_mode = phy_read(db-&gt;ioaddr, db-&gt;phy_addr, 1, db-&gt;chip_id);</div><div class='ctx'> </div><div class='ctx'> 	if ( (phy_mode &amp; 0x24) == 0x24 ) {</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		phy_mode = ((phy_read(db-&gt;ioaddr, db-&gt;phy_addr, 5, db-&gt;chip_id) &amp; 0x01e0)&lt;&lt;7);</div><div class='ctx'> 		if(phy_mode&amp;0x8000)</div><div class='ctx'> 			phy_mode = 0x8000;</div><div class='hunk'>@@ -1414,7 +1414,7 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)</div><div class='ctx'> 			phy_mode = 0x2000;</div><div class='ctx'> 		else</div><div class='ctx'> 			phy_mode = 0x1000;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* printk(DRV_NAME ": Phy_mode %x ",phy_mode); */</div><div class='ctx'> 		switch (phy_mode) {</div><div class='ctx'> 		case 0x1000: db-&gt;op_mode = ULI526X_10MHF; break;</div><div class='hunk'>@@ -1442,7 +1442,7 @@ static u8 uli526x_sense_speed(struct uli526x_board_info * db)</div><div class='ctx'> static void uli526x_set_phyxcer(struct uli526x_board_info *db)</div><div class='ctx'> {</div><div class='ctx'> 	u16 phy_reg;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Phyxcer capability setting */</div><div class='ctx'> 	phy_reg = phy_read(db-&gt;ioaddr, db-&gt;phy_addr, 4, db-&gt;chip_id) &amp; ~0x01e0;</div><div class='ctx'> </div><div class='hunk'>@@ -1457,7 +1457,7 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)</div><div class='ctx'> 		case ULI526X_100MHF: phy_reg |= 0x80; break;</div><div class='ctx'> 		case ULI526X_100MFD: phy_reg |= 0x100; break;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>   	/* Write new capability to Phyxcer Reg4 */</div><div class='hunk'>@@ -1556,7 +1556,7 @@ static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data</div><div class='ctx'> 	/* Write a word data to PHY controller */</div><div class='ctx'> 	for ( i = 0x8000; i &gt; 0; i &gt;&gt;= 1)</div><div class='ctx'> 		phy_write_1bit(ioaddr, phy_data &amp; i ? PHY_DATA_1 : PHY_DATA_0, chip_id);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1574,7 +1574,7 @@ static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id)</div><div class='ctx'> 		return phy_readby_cr10(iobase, phy_addr, offset);</div><div class='ctx'> 	/* M5261/M5263 Chip */</div><div class='ctx'> 	ioaddr = iobase + DCR9;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Send 33 synchronization clock to Phy controller */</div><div class='ctx'> 	for (i = 0; i &lt; 35; i++)</div><div class='ctx'> 		phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);</div><div class='hunk'>@@ -1610,7 +1610,7 @@ static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id)</div><div class='ctx'> static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ioaddr,cr10_value;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ioaddr = iobase + DCR10;</div><div class='ctx'> 	cr10_value = phy_addr;</div><div class='ctx'> 	cr10_value = (cr10_value&lt;&lt;5) + offset;</div><div class='hunk'>@@ -1629,7 +1629,7 @@ static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)</div><div class='ctx'> static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long ioaddr,cr10_value;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	ioaddr = iobase + DCR10;</div><div class='ctx'> 	cr10_value = phy_addr;</div><div class='ctx'> 	cr10_value = (cr10_value&lt;&lt;5) + offset;</div><div class='hunk'>@@ -1659,7 +1659,7 @@ static void phy_write_1bit(unsigned long ioaddr, u32 phy_data, u32 chip_id)</div><div class='ctx'> static u16 phy_read_1bit(unsigned long ioaddr, u32 chip_id)</div><div class='ctx'> {</div><div class='ctx'> 	u16 phy_data;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	outl(0x50000 , ioaddr);</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> 	phy_data = ( inl(ioaddr) &gt;&gt; 19 ) &amp; 0x1;</div><div class='head'>diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c<br/>index 136a70c4d5e4..7f414815cc62 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/winbond-840.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/winbond-840.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/winbond-840.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/winbond-840.c</a></div><div class='hunk'>@@ -38,12 +38,12 @@</div><div class='ctx'> 			Copyright (C) 2001 Manfred Spraul</div><div class='ctx'>   	* ethtool support (jgarzik)</div><div class='ctx'> 	* Replace some MII-related magic numbers with constants (jgarzik)</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> 	TODO:</div><div class='ctx'> 	* enable pci_power_off</div><div class='ctx'> 	* Wake-On-LAN</div><div class='ctx'> */</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'> #define DRV_NAME	"winbond-840"</div><div class='ctx'> #define DRV_VERSION	"1.01-d"</div><div class='ctx'> #define DRV_RELDATE	"Nov-17-2001"</div><div class='hunk'>@@ -57,7 +57,7 @@ c-help-name: Winbond W89c840 PCI Ethernet support</div><div class='ctx'> c-help-symbol: CONFIG_WINBOND_840</div><div class='ctx'> c-help: This driver is for the Winbond W89c840 chip.  It also works with</div><div class='ctx'> c-help: the TX9882 chip on the Compex RL100-ATX board.</div><div class='del'>-c-help: More specific information and updates are available from </div><div class='add'>+c-help: More specific information and updates are available from</div><div class='ctx'> c-help: http://www.scyld.com/network/drivers.html</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -207,53 +207,38 @@ Test with 'ping -s 10000' on a fast computer.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>   PCI probe table.</div><div class='ctx'> */</div><div class='del'>-enum pci_id_flags_bits {</div><div class='del'>-        /* Set PCI command register bits before calling probe1(). */</div><div class='del'>-        PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,</div><div class='del'>-        /* Read and map the single following PCI BAR. */</div><div class='del'>-        PCI_ADDR0=0&lt;&lt;4, PCI_ADDR1=1&lt;&lt;4, PCI_ADDR2=2&lt;&lt;4, PCI_ADDR3=3&lt;&lt;4,</div><div class='del'>-        PCI_ADDR_64BITS=0x100, PCI_NO_ACPI_WAKE=0x200, PCI_NO_MIN_LATENCY=0x400,</div><div class='del'>-};</div><div class='ctx'> enum chip_capability_flags {</div><div class='del'>-	CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8,};</div><div class='del'>-#ifdef USE_IO_OPS</div><div class='del'>-#define W840_FLAGS (PCI_USES_IO | PCI_ADDR0 | PCI_USES_MASTER)</div><div class='del'>-#else</div><div class='del'>-#define W840_FLAGS (PCI_USES_MEM | PCI_ADDR1 | PCI_USES_MASTER)</div><div class='del'>-#endif</div><div class='add'>+	CanHaveMII=1, HasBrokenTx=2, AlwaysFDX=4, FDXOnNoMII=8,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id w840_pci_tbl[] = {</div><div class='add'>+static const struct pci_device_id w840_pci_tbl[] = {</div><div class='ctx'> 	{ 0x1050, 0x0840, PCI_ANY_ID, 0x8153,     0, 0, 0 },</div><div class='ctx'> 	{ 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },</div><div class='ctx'> 	{ 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },</div><div class='del'>-	{ 0, }</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, w840_pci_tbl);</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	netdev_res_size		= 128,	/* size of PCI BAR resource */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct pci_id_info {</div><div class='ctx'>         const char *name;</div><div class='del'>-        struct match_info {</div><div class='del'>-                int     pci, pci_mask, subsystem, subsystem_mask;</div><div class='del'>-                int revision, revision_mask;                            /* Only 8 bits. */</div><div class='del'>-        } id;</div><div class='del'>-        enum pci_id_flags_bits pci_flags;</div><div class='del'>-        int io_size;                            /* Needed for I/O region check or ioremap(). */</div><div class='del'>-        int drv_flags;                          /* Driver use, intended as capability flags. */</div><div class='add'>+        int drv_flags;		/* Driver use, intended as capability flags. */</div><div class='ctx'> };</div><div class='del'>-static struct pci_id_info pci_id_tbl[] = {</div><div class='del'>-	{"Winbond W89c840",			/* Sometime a Level-One switch card. */</div><div class='del'>-	 { 0x08401050, 0xffffffff, 0x81530000, 0xffff0000 },</div><div class='del'>-	 W840_FLAGS, 128, CanHaveMII | HasBrokenTx | FDXOnNoMII},</div><div class='del'>-	{"Winbond W89c840", { 0x08401050, 0xffffffff, },</div><div class='del'>-	 W840_FLAGS, 128, CanHaveMII | HasBrokenTx},</div><div class='del'>-	{"Compex RL100-ATX", { 0x201111F6, 0xffffffff,},</div><div class='del'>-	 W840_FLAGS, 128, CanHaveMII | HasBrokenTx},</div><div class='del'>-	{NULL,},					/* 0 terminated list. */</div><div class='add'>+</div><div class='add'>+static const struct pci_id_info pci_id_tbl[] __devinitdata = {</div><div class='add'>+	{ 				/* Sometime a Level-One switch card. */</div><div class='add'>+	  "Winbond W89c840",	CanHaveMII | HasBrokenTx | FDXOnNoMII},</div><div class='add'>+	{ "Winbond W89c840",	CanHaveMII | HasBrokenTx},</div><div class='add'>+	{ "Compex RL100-ATX",	CanHaveMII | HasBrokenTx},</div><div class='add'>+	{ }	/* terminate list. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This driver was written to use PCI memory space, however some x86 systems</div><div class='hunk'>@@ -374,7 +359,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='ctx'> static struct ethtool_ops netdev_ethtool_ops;</div><div class='ctx'> static int  netdev_close(struct net_device *dev);</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static int __devinit w840_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 				  const struct pci_device_id *ent)</div><div class='hunk'>@@ -411,7 +396,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,</div><div class='ctx'> #ifdef USE_IO_OPS</div><div class='ctx'> 	bar = 0;</div><div class='ctx'> #endif</div><div class='del'>-	ioaddr = pci_iomap(pdev, bar, pci_id_tbl[chip_idx].io_size);</div><div class='add'>+	ioaddr = pci_iomap(pdev, bar, netdev_res_size);</div><div class='ctx'> 	if (!ioaddr)</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> </div><div class='hunk'>@@ -434,7 +419,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,</div><div class='ctx'> 	np-&gt;mii_if.mdio_read = mdio_read;</div><div class='ctx'> 	np-&gt;mii_if.mdio_write = mdio_write;</div><div class='ctx'> 	np-&gt;base_addr = ioaddr;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;mem_start)</div><div class='hunk'>@@ -510,7 +495,7 @@ err_out_netdev:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.  These are</div><div class='ctx'>    often serial bit streams generated by the host processor.</div><div class='ctx'>    The example below is for the common 93c46 EEPROM, 64 16 bit words. */</div><div class='hunk'>@@ -660,7 +645,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+</div><div class='ctx'> static int netdev_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='hunk'>@@ -670,7 +655,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 	iowrite32(0x00000001, ioaddr + PCIBusCfg);		/* Reset */</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='del'>-	i = request_irq(dev-&gt;irq, &amp;intr_handler, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq(dev-&gt;irq, &amp;intr_handler, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='hunk'>@@ -731,7 +716,7 @@ static int update_link(struct net_device *dev)</div><div class='ctx'> 				dev-&gt;name, np-&gt;phys[0]);</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if ((np-&gt;mii &amp; ~0xf) == MII_DAVICOM_DM9101) {</div><div class='ctx'> 		/* If the link partner doesn't support autonegotiation</div><div class='ctx'> 		 * the MII detects it's abilities with the "parallel detection".</div><div class='hunk'>@@ -761,7 +746,7 @@ static int update_link(struct net_device *dev)</div><div class='ctx'> 		result |= 0x20000000;</div><div class='ctx'> 	if (result != np-&gt;csr6 &amp;&amp; debug)</div><div class='ctx'> 		printk(KERN_INFO "%s: Setting %dMBit-%s-duplex based on MII#%d\n",</div><div class='del'>-				 dev-&gt;name, fasteth ? 100 : 10, </div><div class='add'>+				 dev-&gt;name, fasteth ? 100 : 10,</div><div class='ctx'> 			   	duplex ? "full" : "half", np-&gt;phys[0]);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -947,7 +932,7 @@ static void init_registers(struct net_device *dev)</div><div class='ctx'> 	iowrite32(i, ioaddr + PCIBusCfg);</div><div class='ctx'> </div><div class='ctx'> 	np-&gt;csr6 = 0;</div><div class='del'>-	/* 128 byte Tx threshold; </div><div class='add'>+	/* 128 byte Tx threshold;</div><div class='ctx'> 		Transmit on; Receive on; */</div><div class='ctx'> 	update_csr6(dev, 0x00022002 | update_link(dev) | __set_rx_mode(dev));</div><div class='ctx'> </div><div class='hunk'>@@ -1584,7 +1569,7 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> static void __devexit w840_remove1 (struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='hunk'>@@ -1605,11 +1590,11 @@ static void __devexit w840_remove1 (struct pci_dev *pdev)</div><div class='ctx'>  * - get_stats:</div><div class='ctx'>  * 	spin_lock_irq(np-&gt;lock), doesn't touch hw if not present</div><div class='ctx'>  * - hard_start_xmit:</div><div class='del'>- * 	netif_stop_queue + spin_unlock_wait(&amp;dev-&gt;xmit_lock);</div><div class='add'>+ * 	synchronize_irq + netif_tx_disable;</div><div class='ctx'>  * - tx_timeout:</div><div class='del'>- * 	netif_device_detach + spin_unlock_wait(&amp;dev-&gt;xmit_lock);</div><div class='add'>+ * 	netif_device_detach + netif_tx_disable;</div><div class='ctx'>  * - set_multicast_list</div><div class='del'>- * 	netif_device_detach + spin_unlock_wait(&amp;dev-&gt;xmit_lock);</div><div class='add'>+ * 	netif_device_detach + netif_tx_disable;</div><div class='ctx'>  * - interrupt handler</div><div class='ctx'>  * 	doesn't touch hw if not present, synchronize_irq waits for</div><div class='ctx'>  * 	running instances of the interrupt handler.</div><div class='hunk'>@@ -1635,11 +1620,10 @@ static int w840_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='ctx'> 		update_csr6(dev, 0);</div><div class='ctx'> 		iowrite32(0, ioaddr + IntrEnable);</div><div class='del'>-		netif_stop_queue(dev);</div><div class='ctx'> 		spin_unlock_irq(&amp;np-&gt;lock);</div><div class='ctx'> </div><div class='del'>-		spin_unlock_wait(&amp;dev-&gt;xmit_lock);</div><div class='ctx'> 		synchronize_irq(dev-&gt;irq);</div><div class='add'>+		netif_tx_disable(dev);</div><div class='ctx'> 	</div><div class='ctx'> 		np-&gt;stats.rx_missed_errors += ioread32(ioaddr + RxMissed) &amp; 0xffff;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c<br/>index 56344103ac23..f874e4f6ccf6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/xircom_cb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/xircom_cb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/xircom_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/xircom_cb.c</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /*</div><div class='del'>- * xircom_cb: A driver for the (tulip-like) Xircom Cardbus ethernet cards </div><div class='add'>+ * xircom_cb: A driver for the (tulip-like) Xircom Cardbus ethernet cards</div><div class='ctx'>  *</div><div class='ctx'>  * This software is (C) by the respective authors, and licensed under the GPL</div><div class='ctx'>  * License.</div><div class='ctx'>  *</div><div class='ctx'>  * Written by Arjan van de Ven for Red Hat, Inc.</div><div class='del'>- * Based on work by Jeff Garzik, Doug Ledford and Donald Becker </div><div class='add'>+ * Based on work by Jeff Garzik, Doug Ledford and Donald Becker</div><div class='ctx'>  *</div><div class='ctx'>  *  	This software may be used and distributed according to the terms</div><div class='ctx'>  *      of the GNU General Public License, incorporated herein by reference.</div><div class='hunk'>@@ -93,7 +93,7 @@ struct xircom_private {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long io_port;</div><div class='ctx'> 	int open;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* transmit_used is the rotating counter that indicates which transmit</div><div class='ctx'> 	   descriptor has to be used next */</div><div class='ctx'> 	int transmit_used;</div><div class='hunk'>@@ -153,10 +153,10 @@ static struct pci_device_id xircom_pci_table[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, xircom_pci_table);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver xircom_ops = {</div><div class='del'>-	.name		= "xircom_cb", </div><div class='del'>-	.id_table	= xircom_pci_table, </div><div class='del'>-	.probe		= xircom_probe, </div><div class='del'>-	.remove		= xircom_remove, </div><div class='add'>+	.name		= "xircom_cb",</div><div class='add'>+	.id_table	= xircom_pci_table,</div><div class='add'>+	.probe		= xircom_probe,</div><div class='add'>+	.remove		= xircom_remove,</div><div class='ctx'> 	.suspend =NULL,</div><div class='ctx'> 	.resume =NULL</div><div class='ctx'> };</div><div class='hunk'>@@ -174,7 +174,7 @@ static void print_binary(unsigned int number)</div><div class='ctx'> 			buffer[i2++]='1';</div><div class='ctx'> 		else</div><div class='ctx'> 			buffer[i2++]='0';</div><div class='del'>-		if ((i&amp;3)==0) </div><div class='add'>+		if ((i&amp;3)==0)</div><div class='ctx'> 			buffer[i2++]=' ';</div><div class='ctx'> 	}</div><div class='ctx'> 	printk("%s\n",buffer);</div><div class='hunk'>@@ -196,10 +196,10 @@ static struct ethtool_ops netdev_ethtool_ops = {</div><div class='ctx'> </div><div class='ctx'> /* xircom_probe is the code that gets called on device insertion.</div><div class='ctx'>    it sets up the hardware and registers the device to the networklayer.</div><div class='del'>-   </div><div class='add'>+</div><div class='ctx'>    TODO: Send 1 or 2 "dummy" packets here as the card seems to discard the</div><div class='ctx'>          first two packets that get send, and pump hates that.</div><div class='del'>-         </div><div class='add'>+</div><div class='ctx'>  */</div><div class='ctx'> static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -209,7 +209,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned short tmp16;</div><div class='ctx'> 	enter("xircom_probe");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* First do the PCI initialisation */</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(pdev))</div><div class='hunk'>@@ -217,24 +217,24 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> </div><div class='ctx'> 	/* disable all powermanagement */</div><div class='ctx'> 	pci_write_config_dword(pdev, PCI_POWERMGMT, 0x0000);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	pci_set_master(pdev); /* Why isn't this done by pci_enable_device ?*/</div><div class='ctx'> </div><div class='del'>-	/* clear PCI status, if any */ </div><div class='del'>-	pci_read_config_word (pdev,PCI_STATUS, &amp;tmp16); </div><div class='add'>+	/* clear PCI status, if any */</div><div class='add'>+	pci_read_config_word (pdev,PCI_STATUS, &amp;tmp16);</div><div class='ctx'> 	pci_write_config_word (pdev, PCI_STATUS,tmp16);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	pci_read_config_byte(pdev, PCI_REVISION_ID, &amp;chip_rev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!request_region(pci_resource_start(pdev, 0), 128, "xircom_cb")) {</div><div class='ctx'> 		printk(KERN_ERR "xircom_probe: failed to allocate io-region\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='add'>+	/*</div><div class='ctx'> 	   Before changing the hardware, allocate the memory.</div><div class='ctx'> 	   This way, we can fail gracefully if not enough memory</div><div class='del'>-	   is available. </div><div class='add'>+	   is available.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct xircom_private));</div><div class='ctx'> 	if (!dev) {</div><div class='hunk'>@@ -242,13 +242,13 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 		goto device_fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	private = netdev_priv(dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Allocate the send/receive buffers */</div><div class='ctx'> 	private-&gt;rx_buffer = pci_alloc_consistent(pdev,8192,&amp;private-&gt;rx_dma_handle);</div><div class='ctx'> 	if (private-&gt;rx_buffer == NULL) {</div><div class='ctx'>  		printk(KERN_ERR "xircom_probe: no memory for rx buffer \n");</div><div class='ctx'> 		goto rx_buf_fail;</div><div class='del'>-	}	</div><div class='add'>+	}</div><div class='ctx'> 	private-&gt;tx_buffer = pci_alloc_consistent(pdev,8192,&amp;private-&gt;tx_dma_handle);</div><div class='ctx'> 	if (private-&gt;tx_buffer == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "xircom_probe: no memory for tx buffer \n");</div><div class='hunk'>@@ -265,11 +265,11 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 	spin_lock_init(&amp;private-&gt;lock);</div><div class='ctx'> 	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> 	dev-&gt;base_addr = private-&gt;io_port;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	initialize_card(private);</div><div class='ctx'> 	read_mac_address(private);</div><div class='ctx'> 	setup_descriptors(private);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;open = &amp;xircom_open;</div><div class='ctx'> 	dev-&gt;hard_start_xmit = &amp;xircom_start_xmit;</div><div class='ctx'> 	dev-&gt;stop = &amp;xircom_close;</div><div class='hunk'>@@ -285,19 +285,19 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_</div><div class='ctx'> 		printk(KERN_ERR "xircom_probe: netdevice registration failed.\n");</div><div class='ctx'> 		goto reg_fail;</div><div class='ctx'> 	}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n", dev-&gt;name, chip_rev, pdev-&gt;irq);</div><div class='ctx'> 	/* start the transmitter to get a heartbeat */</div><div class='ctx'> 	/* TODO: send 2 dummy packets here */</div><div class='ctx'> 	transceiver_voodoo(private);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;private-&gt;lock,flags);</div><div class='ctx'> 	activate_transmitter(private);</div><div class='ctx'> 	activate_receiver(private);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;private-&gt;lock,flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	trigger_receive(private);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	leave("xircom_probe");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -332,7 +332,7 @@ static void __devexit xircom_remove(struct pci_dev *pdev)</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	leave("xircom_remove");</div><div class='del'>-} </div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t xircom_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -346,11 +346,11 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance, struct pt_regs</div><div class='ctx'> 	spin_lock(&amp;card-&gt;lock);</div><div class='ctx'> 	status = inl(card-&gt;io_port+CSR5);</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG	</div><div class='add'>+#ifdef DEBUG</div><div class='ctx'> 	print_binary(status);</div><div class='ctx'> 	printk("tx status 0x%08x 0x%08x \n",card-&gt;tx_buffer[0],card-&gt;tx_buffer[4]);</div><div class='ctx'> 	printk("rx status 0x%08x 0x%08x \n",card-&gt;rx_buffer[0],card-&gt;rx_buffer[4]);</div><div class='del'>-#endif	</div><div class='add'>+#endif</div><div class='ctx'> 	/* Handle shared irq and hotplug */</div><div class='ctx'> 	if (status == 0 || status == 0xffffffff) {</div><div class='ctx'> 		spin_unlock(&amp;card-&gt;lock);</div><div class='hunk'>@@ -366,21 +366,21 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance, struct pt_regs</div><div class='ctx'> 			netif_carrier_on(dev);</div><div class='ctx'> 		else</div><div class='ctx'> 			netif_carrier_off(dev);</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Clear all remaining interrupts */	</div><div class='add'>+	/* Clear all remaining interrupts */</div><div class='ctx'> 	status |= 0xffffffff; /* FIXME: make this clear only the</div><div class='ctx'> 				        real existing bits */</div><div class='ctx'> 	outl(status,card-&gt;io_port+CSR5);</div><div class='del'>-	</div><div class='ctx'> </div><div class='del'>-	for (i=0;i&lt;NUMDESCRIPTORS;i++) </div><div class='add'>+</div><div class='add'>+	for (i=0;i&lt;NUMDESCRIPTORS;i++)</div><div class='ctx'> 		investigate_write_descriptor(dev,card,i,bufferoffsets[i]);</div><div class='del'>-	for (i=0;i&lt;NUMDESCRIPTORS;i++) </div><div class='add'>+	for (i=0;i&lt;NUMDESCRIPTORS;i++)</div><div class='ctx'> 		investigate_read_descriptor(dev,card,i,bufferoffsets[i]);</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_unlock(&amp;card-&gt;lock);</div><div class='ctx'> 	leave("xircom_interrupt");</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -393,38 +393,38 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int nextdescriptor;</div><div class='ctx'> 	int desc;</div><div class='ctx'> 	enter("xircom_start_xmit");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	card = netdev_priv(dev);</div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock,flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* First see if we can free some descriptors */</div><div class='del'>-	for (desc=0;desc&lt;NUMDESCRIPTORS;desc++) </div><div class='add'>+	for (desc=0;desc&lt;NUMDESCRIPTORS;desc++)</div><div class='ctx'> 		investigate_write_descriptor(dev,card,desc,bufferoffsets[desc]);</div><div class='del'>-	</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	nextdescriptor = (card-&gt;transmit_used +1) % (NUMDESCRIPTORS);</div><div class='ctx'> 	desc = card-&gt;transmit_used;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* only send the packet if the descriptor is free */</div><div class='ctx'> 	if (card-&gt;tx_buffer[4*desc]==0) {</div><div class='ctx'> 			/* Copy the packet data; zero the memory first as the card</div><div class='ctx'> 			   sometimes sends more than you ask it to. */</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			memset(&amp;card-&gt;tx_buffer[bufferoffsets[desc]/4],0,1536);</div><div class='ctx'> 			memcpy(&amp;(card-&gt;tx_buffer[bufferoffsets[desc]/4]),skb-&gt;data,skb-&gt;len);</div><div class='del'>-	</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 			/* FIXME: The specification tells us that the length we send HAS to be a multiple of</div><div class='ctx'> 			   4 bytes. */</div><div class='del'>-			   </div><div class='add'>+</div><div class='ctx'> 			card-&gt;tx_buffer[4*desc+1] = skb-&gt;len;</div><div class='ctx'> 			if (desc == NUMDESCRIPTORS-1)</div><div class='ctx'> 				card-&gt;tx_buffer[4*desc+1] |= (1&lt;&lt;25);  /* bit 25: last descriptor of the ring */</div><div class='ctx'> </div><div class='ctx'> 			card-&gt;tx_buffer[4*desc+1] |= 0xF0000000;</div><div class='del'>-						 /* 0xF0... means want interrupts*/ </div><div class='add'>+						 /* 0xF0... means want interrupts*/</div><div class='ctx'> 			card-&gt;tx_skb[desc] = skb;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			wmb();</div><div class='ctx'> 			/* This gives the descriptor to the card */</div><div class='ctx'> 			card-&gt;tx_buffer[4*desc] = 0x80000000;</div><div class='hunk'>@@ -433,18 +433,18 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				netif_stop_queue(dev);</div><div class='ctx'> 			}</div><div class='ctx'> 			card-&gt;transmit_used = nextdescriptor;</div><div class='del'>-			leave("xircom-start_xmit - sent");	</div><div class='add'>+			leave("xircom-start_xmit - sent");</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;card-&gt;lock,flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* Uh oh... no free descriptor... drop the packet */</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;card-&gt;lock,flags);</div><div class='ctx'> 	trigger_transmit(card);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -457,12 +457,12 @@ static int xircom_open(struct net_device *dev)</div><div class='ctx'> 	int retval;</div><div class='ctx'> 	enter("xircom_open");</div><div class='ctx'> 	printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev-&gt;name,dev-&gt;irq);</div><div class='del'>-	retval = request_irq(dev-&gt;irq, &amp;xircom_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	retval = request_irq(dev-&gt;irq, &amp;xircom_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		leave("xircom_open - No IRQ");</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	xircom_up(xp);</div><div class='ctx'> 	xp-&gt;open = 1;</div><div class='ctx'> 	leave("xircom_open");</div><div class='hunk'>@@ -473,31 +473,31 @@ static int xircom_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xircom_private *card;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	enter("xircom_close");</div><div class='ctx'> 	card = netdev_priv(dev);</div><div class='ctx'> 	netif_stop_queue(dev); /* we don't want new packets */</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock,flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	disable_all_interrupts(card);</div><div class='del'>-#if 0	</div><div class='add'>+#if 0</div><div class='ctx'> 	/* We can enable this again once we send dummy packets on ifconfig ethX up */</div><div class='ctx'> 	deactivate_receiver(card);</div><div class='ctx'> 	deactivate_transmitter(card);</div><div class='del'>-#endif	</div><div class='add'>+#endif</div><div class='ctx'> 	remove_descriptors(card);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;card-&gt;lock,flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	card-&gt;open = 0;</div><div class='ctx'> 	free_irq(dev-&gt;irq,dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	leave("xircom_close");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -506,8 +506,8 @@ static struct net_device_stats *xircom_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'>         struct xircom_private *card = netdev_priv(dev);</div><div class='ctx'>         return &amp;card-&gt;stats;</div><div class='del'>-} </div><div class='del'>-                                                 </div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> static void xircom_poll_controller(struct net_device *dev)</div><div class='hunk'>@@ -540,7 +540,7 @@ static void initialize_card(struct xircom_private *card)</div><div class='ctx'> 	outl(val, card-&gt;io_port + CSR0);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	val = 0;		/* Value 0x00 is a safe and conservative value </div><div class='add'>+	val = 0;		/* Value 0x00 is a safe and conservative value</div><div class='ctx'> 				   for the PCI configuration settings */</div><div class='ctx'> 	outl(val, card-&gt;io_port + CSR0);</div><div class='ctx'> </div><div class='hunk'>@@ -617,23 +617,23 @@ static void setup_descriptors(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> 		/* Rx Descr2: address of the buffer</div><div class='ctx'> 		   we store the buffer at the 2nd half of the page */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 		address = (unsigned long) card-&gt;rx_dma_handle;</div><div class='ctx'> 		card-&gt;rx_buffer[i*4 + 2] = cpu_to_le32(address + bufferoffsets[i]);</div><div class='ctx'> 		/* Rx Desc3: address of 2nd buffer -&gt; 0 */</div><div class='ctx'> 		card-&gt;rx_buffer[i*4 + 3] = 0;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	/* Write the receive descriptor ring address to the card */</div><div class='ctx'> 	address = (unsigned long) card-&gt;rx_dma_handle;</div><div class='del'>-	val = cpu_to_le32(address); </div><div class='add'>+	val = cpu_to_le32(address);</div><div class='ctx'> 	outl(val, card-&gt;io_port + CSR3);	/* Receive descr list address */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* transmit descriptors */</div><div class='ctx'> 	memset(card-&gt;tx_buffer, 0, 128);	/* clear the descriptors */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i=0;i&lt;NUMDESCRIPTORS;i++ ) {</div><div class='ctx'> 		/* Tx Descr0: Empty, we own it, no errors -&gt; 0x00000000 */</div><div class='ctx'> 		card-&gt;tx_buffer[i*4 + 0] = 0x00000000;</div><div class='hunk'>@@ -641,7 +641,7 @@ static void setup_descriptors(struct xircom_private *card)</div><div class='ctx'> 		card-&gt;tx_buffer[i*4 + 1] = 1536;</div><div class='ctx'> 		if (i==NUMDESCRIPTORS-1)</div><div class='ctx'> 			card-&gt;tx_buffer[i*4 + 1] |= (1 &lt;&lt; 25); /* bit 25 is "last descriptor" */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* Tx Descr2: address of the buffer</div><div class='ctx'> 		   we store the buffer at the 2nd half of the page */</div><div class='ctx'> 		address = (unsigned long) card-&gt;tx_dma_handle;</div><div class='hunk'>@@ -748,7 +748,7 @@ static int receive_active(struct xircom_private *card)</div><div class='ctx'> activate_receiver enables the receiver on the card.</div><div class='ctx'> Before being allowed to active the receiver, the receiver</div><div class='ctx'> must be completely de-activated. To achieve this,</div><div class='del'>-this code actually disables the receiver first; then it waits for the </div><div class='add'>+this code actually disables the receiver first; then it waits for the</div><div class='ctx'> receiver to become inactive, then it activates the receiver and then</div><div class='ctx'> it waits for the receiver to be active.</div><div class='ctx'> </div><div class='hunk'>@@ -762,13 +762,13 @@ static void activate_receiver(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	val = inl(card-&gt;io_port + CSR6);	/* Operation mode */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* If the "active" bit is set and the receiver is already</div><div class='ctx'> 	   active, no need to do the expensive thing */</div><div class='ctx'> 	if ((val&amp;2) &amp;&amp; (receive_active(card)))</div><div class='ctx'> 		return;</div><div class='del'>-	</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	val = val &amp; ~2;		/* disable the receiver */</div><div class='ctx'> 	outl(val, card-&gt;io_port + CSR6);</div><div class='ctx'> </div><div class='hunk'>@@ -805,7 +805,7 @@ static void activate_receiver(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> deactivate_receiver disables the receiver on the card.</div><div class='del'>-To achieve this this code disables the receiver first; </div><div class='add'>+To achieve this this code disables the receiver first;</div><div class='ctx'> then it waits for the receiver to become inactive.</div><div class='ctx'> </div><div class='ctx'> must be called with the lock held and interrupts disabled.</div><div class='hunk'>@@ -840,7 +840,7 @@ static void deactivate_receiver(struct xircom_private *card)</div><div class='ctx'> activate_transmitter enables the transmitter on the card.</div><div class='ctx'> Before being allowed to active the transmitter, the transmitter</div><div class='ctx'> must be completely de-activated. To achieve this,</div><div class='del'>-this code actually disables the transmitter first; then it waits for the </div><div class='add'>+this code actually disables the transmitter first; then it waits for the</div><div class='ctx'> transmitter to become inactive, then it activates the transmitter and then</div><div class='ctx'> it waits for the transmitter to be active again.</div><div class='ctx'> </div><div class='hunk'>@@ -856,7 +856,7 @@ static void activate_transmitter(struct xircom_private *card)</div><div class='ctx'> 	val = inl(card-&gt;io_port + CSR6);	/* Operation mode */</div><div class='ctx'> </div><div class='ctx'> 	/* If the "active" bit is set and the receiver is already</div><div class='del'>-	   active, no need to do the expensive thing */	 </div><div class='add'>+	   active, no need to do the expensive thing */</div><div class='ctx'> 	if ((val&amp;(1&lt;&lt;13)) &amp;&amp; (transmit_active(card)))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -896,7 +896,7 @@ static void activate_transmitter(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> deactivate_transmitter disables the transmitter on the card.</div><div class='del'>-To achieve this this code disables the transmitter first; </div><div class='add'>+To achieve this this code disables the transmitter first;</div><div class='ctx'> then it waits for the transmitter to become inactive.</div><div class='ctx'> </div><div class='ctx'> must be called with the lock held and interrupts disabled.</div><div class='hunk'>@@ -990,7 +990,7 @@ static void disable_all_interrupts(struct xircom_private *card)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	enter("enable_all_interrupts");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	val = 0;				/* disable all interrupts */</div><div class='ctx'> 	outl(val, card-&gt;io_port + CSR7);</div><div class='ctx'> </div><div class='hunk'>@@ -1031,8 +1031,8 @@ static int enable_promisc(struct xircom_private *card)</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	enter("enable_promisc");</div><div class='ctx'> </div><div class='del'>-	val = inl(card-&gt;io_port + CSR6);	</div><div class='del'>-	val = val | (1 &lt;&lt; 6);	</div><div class='add'>+	val = inl(card-&gt;io_port + CSR6);</div><div class='add'>+	val = val | (1 &lt;&lt; 6);</div><div class='ctx'> 	outl(val, card-&gt;io_port + CSR6);</div><div class='ctx'> </div><div class='ctx'> 	leave("enable_promisc");</div><div class='hunk'>@@ -1042,7 +1042,7 @@ static int enable_promisc(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'> link_status() checks the the links status and will return 0 for no link, 10 for 10mbit link and 100 for.. guess what.</div><div class='ctx'> </div><div class='ctx'> Must be called in locked state with interrupts disabled</div><div class='hunk'>@@ -1051,15 +1051,15 @@ static int link_status(struct xircom_private *card)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	enter("link_status");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	val = inb(card-&gt;io_port + CSR12);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!(val&amp;(1&lt;&lt;2)))  /* bit 2 is 0 for 10mbit link, 1 for not an 10mbit link */</div><div class='ctx'> 		return 10;</div><div class='ctx'> 	if (!(val&amp;(1&lt;&lt;1)))  /* bit 1 is 0 for 100mbit link, 1 for not an 100mbit link */</div><div class='ctx'> 		return 100;</div><div class='del'>-		</div><div class='del'>-	/* If we get here -&gt; no link at all */	</div><div class='add'>+</div><div class='add'>+	/* If we get here -&gt; no link at all */</div><div class='ctx'> </div><div class='ctx'> 	leave("link_status");</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1071,7 +1071,7 @@ static int link_status(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>   read_mac_address() reads the MAC address from the NIC and stores it in the "dev" structure.</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>   This function will take the spinlock itself and can, as a result, not be called with the lock helt.</div><div class='ctx'>  */</div><div class='ctx'> static void read_mac_address(struct xircom_private *card)</div><div class='hunk'>@@ -1081,7 +1081,7 @@ static void read_mac_address(struct xircom_private *card)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	enter("read_mac_address");</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	outl(1 &lt;&lt; 12, card-&gt;io_port + CSR9);	/* enable boot rom access */</div><div class='hunk'>@@ -1095,7 +1095,7 @@ static void read_mac_address(struct xircom_private *card)</div><div class='ctx'> 		outl(i + 3, card-&gt;io_port + CSR10);</div><div class='ctx'> 		data_count = inl(card-&gt;io_port + CSR9) &amp; 0xff;</div><div class='ctx'> 		if ((tuple == 0x22) &amp;&amp; (data_id == 0x04) &amp;&amp; (data_count == 0x06)) {</div><div class='del'>-			/* </div><div class='add'>+			/*</div><div class='ctx'> 			 * This is it.  We have the data we want.</div><div class='ctx'> 			 */</div><div class='ctx'> 			for (j = 0; j &lt; 6; j++) {</div><div class='hunk'>@@ -1136,12 +1136,12 @@ static void transceiver_voodoo(struct xircom_private *card)</div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	outl(0x0008, card-&gt;io_port + CSR15);</div><div class='del'>-        udelay(25);  </div><div class='add'>+        udelay(25);</div><div class='ctx'>         outl(0xa8050000, card-&gt;io_port + CSR15);</div><div class='ctx'>         udelay(25);</div><div class='ctx'>         outl(0xa00f0000, card-&gt;io_port + CSR15);</div><div class='ctx'>         udelay(25);</div><div class='del'>-        </div><div class='add'>+</div><div class='ctx'>         spin_unlock_irqrestore(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(card-&gt;dev);</div><div class='hunk'>@@ -1163,15 +1163,15 @@ static void xircom_up(struct xircom_private *card)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	enable_link_interrupt(card);</div><div class='ctx'> 	enable_transmit_interrupt(card);</div><div class='ctx'> 	enable_receive_interrupt(card);</div><div class='ctx'> 	enable_common_interrupts(card);</div><div class='ctx'> 	enable_promisc(card);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* The card can have received packets already, read them away now */</div><div class='del'>-	for (i=0;i&lt;NUMDESCRIPTORS;i++) </div><div class='add'>+	for (i=0;i&lt;NUMDESCRIPTORS;i++)</div><div class='ctx'> 		investigate_read_descriptor(card-&gt;dev,card,i,bufferoffsets[i]);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1185,15 +1185,15 @@ static void xircom_up(struct xircom_private *card)</div><div class='ctx'> /* Bufferoffset is in BYTES */</div><div class='ctx'> static void investigate_read_descriptor(struct net_device *dev,struct xircom_private *card, int descnr, unsigned int bufferoffset)</div><div class='ctx'> {</div><div class='del'>-		int status;		</div><div class='del'>-		</div><div class='add'>+		int status;</div><div class='add'>+</div><div class='ctx'> 		enter("investigate_read_descriptor");</div><div class='ctx'> 		status = card-&gt;rx_buffer[4*descnr];</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if ((status &gt; 0)) {	/* packet received */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 			/* TODO: discard error packets */</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			short pkt_len = ((status &gt;&gt; 16) &amp; 0x7ff) - 4;	/* minus 4, we don't want the CRC */</div><div class='ctx'> 			struct sk_buff *skb;</div><div class='ctx'> </div><div class='hunk'>@@ -1216,7 +1216,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri</div><div class='ctx'> 			dev-&gt;last_rx = jiffies;</div><div class='ctx'> 			card-&gt;stats.rx_packets++;</div><div class='ctx'> 			card-&gt;stats.rx_bytes += pkt_len;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		      out:</div><div class='ctx'> 			/* give the buffer back to the card */</div><div class='ctx'> 			card-&gt;rx_buffer[4*descnr] =  0x80000000;</div><div class='hunk'>@@ -1234,9 +1234,9 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p</div><div class='ctx'> 		int status;</div><div class='ctx'> </div><div class='ctx'> 		enter("investigate_write_descriptor");</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		status = card-&gt;tx_buffer[4*descnr];</div><div class='del'>-#if 0		</div><div class='add'>+#if 0</div><div class='ctx'> 		if (status &amp; 0x8000) {	/* Major error */</div><div class='ctx'> 			printk(KERN_ERR "Major transmit error status %x \n", status);</div><div class='ctx'> 			card-&gt;tx_buffer[4*descnr] = 0;</div><div class='hunk'>@@ -1258,7 +1258,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		leave("investigate_write_descriptor");</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1271,8 +1271,8 @@ static int __init xircom_init(void)</div><div class='ctx'> static void __exit xircom_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;xircom_ops);</div><div class='del'>-} </div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-module_init(xircom_init) </div><div class='add'>+module_init(xircom_init)</div><div class='ctx'> module_exit(xircom_exit)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c<br/>index 887d7245fe7b..17ca7dc42e6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tulip/xircom_tulip_cb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tulip/xircom_tulip_cb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tulip/xircom_tulip_cb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tulip/xircom_tulip_cb.c</a></div><div class='hunk'>@@ -10,26 +10,11 @@</div><div class='ctx'> 	410 Severn Ave., Suite 210</div><div class='ctx'> 	Annapolis MD 21403</div><div class='ctx'> </div><div class='del'>-	-----------------------------------------------------------</div><div class='del'>-</div><div class='del'>-	Linux kernel-specific changes:</div><div class='del'>-</div><div class='del'>-	LK1.0 (Ion Badulescu)</div><div class='del'>-	- Major cleanup</div><div class='del'>-	- Use 2.4 PCI API</div><div class='del'>-	- Support ethtool</div><div class='del'>-	- Rewrite perfect filter/hash code</div><div class='del'>-	- Use interrupts for media changes</div><div class='del'>-</div><div class='del'>-	LK1.1 (Ion Badulescu)</div><div class='del'>-	- Disallow negotiation of unsupported full-duplex modes</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"xircom_tulip_cb"</div><div class='del'>-#define DRV_VERSION	"0.91+LK1.1"</div><div class='del'>-#define DRV_RELDATE	"October 11, 2001"</div><div class='del'>-</div><div class='del'>-#define CARDBUS 1</div><div class='add'>+#define DRV_VERSION	"0.92"</div><div class='add'>+#define DRV_RELDATE	"June 27, 2006"</div><div class='ctx'> </div><div class='ctx'> /* A few user-configurable values. */</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +83,6 @@ static int csr0 = 0x00A00000 | 0x4800;</div><div class='ctx'> /* PCI registers */</div><div class='ctx'> #define PCI_POWERMGMT 	0x40</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -307,10 +291,10 @@ struct xircom_private {</div><div class='ctx'> 	struct xircom_tx_desc tx_ring[TX_RING_SIZE];</div><div class='ctx'> 	/* The saved address of a sent-in-place packet/buffer, for skfree(). */</div><div class='ctx'> 	struct sk_buff* tx_skbuff[TX_RING_SIZE];</div><div class='del'>-#ifdef CARDBUS</div><div class='add'>+</div><div class='ctx'> 	/* The X3201-3 requires 4-byte aligned tx bufs */</div><div class='ctx'> 	struct sk_buff* tx_aligned_skbuff[TX_RING_SIZE];</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	/* The addresses of receive-in-place skbuffs. */</div><div class='ctx'> 	struct sk_buff* rx_skbuff[RX_RING_SIZE];</div><div class='ctx'> 	u16 setup_frame[PKT_SETUP_SZ / sizeof(u16)];	/* Pseudo-Tx frame to init address table. */</div><div class='hunk'>@@ -808,7 +792,7 @@ xircom_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xircom_private *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, &amp;xircom_interrupt, SA_SHIRQ, dev-&gt;name, dev))</div><div class='add'>+	if (request_irq(dev-&gt;irq, &amp;xircom_interrupt, IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	xircom_up(dev);</div><div class='hunk'>@@ -909,10 +893,8 @@ static void xircom_init_ring(struct net_device *dev)</div><div class='ctx'> 		tp-&gt;tx_skbuff[i] = NULL;</div><div class='ctx'> 		tp-&gt;tx_ring[i].status = 0;</div><div class='ctx'> 		tp-&gt;tx_ring[i].buffer2 = virt_to_bus(&amp;tp-&gt;tx_ring[i+1]);</div><div class='del'>-#ifdef CARDBUS</div><div class='ctx'> 		if (tp-&gt;chip_id == X3201_3)</div><div class='ctx'> 			tp-&gt;tx_aligned_skbuff[i] = dev_alloc_skb(PKT_BUF_SZ);</div><div class='del'>-#endif /* CARDBUS */</div><div class='ctx'> 	}</div><div class='ctx'> 	tp-&gt;tx_ring[i-1].buffer2 = virt_to_bus(&amp;tp-&gt;tx_ring[0]);</div><div class='ctx'> }</div><div class='hunk'>@@ -932,12 +914,10 @@ xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	entry = tp-&gt;cur_tx % TX_RING_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_skbuff[entry] = skb;</div><div class='del'>-#ifdef CARDBUS</div><div class='ctx'> 	if (tp-&gt;chip_id == X3201_3) {</div><div class='ctx'> 		memcpy(tp-&gt;tx_aligned_skbuff[entry]-&gt;data,skb-&gt;data,skb-&gt;len);</div><div class='ctx'> 		tp-&gt;tx_ring[entry].buffer1 = virt_to_bus(tp-&gt;tx_aligned_skbuff[entry]-&gt;data);</div><div class='ctx'> 	} else</div><div class='del'>-#endif</div><div class='ctx'> 		tp-&gt;tx_ring[entry].buffer1 = virt_to_bus(skb-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;cur_tx - tp-&gt;dirty_tx &lt; TX_RING_SIZE/2) {/* Typical path */</div><div class='head'>diff --git a/drivers/net/tun.c b/drivers/net/tun.c<br/>index a1ed2d983740..329d9feb9b89 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/tun.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/tun.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/tun.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/tun.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #define DRV_DESCRIPTION	"Universal TUN/TAP device driver"</div><div class='ctx'> #define DRV_COPYRIGHT	"(C) 1999-2004 Max Krasnyansky &lt;maxk@qualcomm.com&gt;"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -490,6 +489,9 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)</div><div class='ctx'> </div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> </div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='add'>+</div><div class='ctx'> 		/* Set dev type */</div><div class='ctx'> 		if (ifr-&gt;ifr_flags &amp; IFF_TUN) {</div><div class='ctx'> 			/* TUN device */</div><div class='hunk'>@@ -777,7 +779,6 @@ static struct miscdevice tun_miscdev = {</div><div class='ctx'> 	.minor = TUN_MINOR,</div><div class='ctx'> 	.name = "tun",</div><div class='ctx'> 	.fops = &amp;tun_fops,</div><div class='del'>-	.devfs_name = "net/tun",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ethtool interface */</div><div class='head'>diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c<br/>index d9258d42090c..4103c37172f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/typhoon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/typhoon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/typhoon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/typhoon.c</a></div><div class='hunk'>@@ -340,7 +340,7 @@ enum state_values {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(NETIF_F_TSO)</div><div class='del'>-#define skb_tso_size(x)		(skb_shinfo(x)-&gt;tso_size)</div><div class='add'>+#define skb_tso_size(x)		(skb_shinfo(x)-&gt;gso_size)</div><div class='ctx'> #define TSO_NUM_DESCRIPTORS	2</div><div class='ctx'> #define TSO_OFFLOAD_ON		TYPHOON_OFFLOAD_TCP_SEGMENT</div><div class='ctx'> #else</div><div class='hunk'>@@ -805,7 +805,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 * If problems develop with TSO, check this first.</div><div class='ctx'> 	 */</div><div class='ctx'> 	numDesc = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='del'>-	if(skb_tso_size(skb))</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='ctx'> 		numDesc++;</div><div class='ctx'> </div><div class='ctx'> 	/* When checking for free space in the ring, we need to also</div><div class='hunk'>@@ -845,7 +845,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 				TYPHOON_TX_PF_VLAN_TAG_SHIFT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(skb_tso_size(skb)) {</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='ctx'> 		first_txd-&gt;processFlags |= TYPHOON_TX_PF_TCP_SEGMENT;</div><div class='ctx'> 		first_txd-&gt;numDesc++;</div><div class='ctx'> </div><div class='hunk'>@@ -2131,7 +2131,7 @@ typhoon_open(struct net_device *dev)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = request_irq(dev-&gt;irq, &amp;typhoon_interrupt, SA_SHIRQ,</div><div class='add'>+	err = request_irq(dev-&gt;irq, &amp;typhoon_interrupt, IRQF_SHARED,</div><div class='ctx'> 				dev-&gt;name, dev);</div><div class='ctx'> 	if(err &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='hunk'>@@ -2568,9 +2568,10 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "%s: %s at %s 0x%lx, ",</div><div class='add'>+	printk(KERN_INFO "%s: %s at %s 0x%llx, ",</div><div class='ctx'> 	       dev-&gt;name, typhoon_card_info[card_id].name,</div><div class='del'>-	       use_mmio ? "MMIO" : "IO", pci_resource_start(pdev, use_mmio));</div><div class='add'>+	       use_mmio ? "MMIO" : "IO",</div><div class='add'>+	       (unsigned long long)pci_resource_start(pdev, use_mmio));</div><div class='ctx'> 	for(i = 0; i &lt; 5; i++)</div><div class='ctx'> 		printk("%2.2x:", dev-&gt;dev_addr[i]);</div><div class='ctx'> 	printk("%2.2x\n", dev-&gt;dev_addr[i]);</div><div class='head'>diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c<br/>index fdc21037f6dc..d3d0ec970318 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/via-rhine.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/via-rhine.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/via-rhine.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/via-rhine.c</a></div><div class='hunk'>@@ -25,117 +25,13 @@</div><div class='ctx'> 	version. He may or may not be interested in bug reports on this</div><div class='ctx'> 	code. You can find his versions at:</div><div class='ctx'> 	http://www.scyld.com/network/via-rhine.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	Linux kernel version history:</div><div class='del'>-</div><div class='del'>-	LK1.1.0:</div><div class='del'>-	- Jeff Garzik: softnet 'n stuff</div><div class='del'>-</div><div class='del'>-	LK1.1.1:</div><div class='del'>-	- Justin Guyett: softnet and locking fixes</div><div class='del'>-	- Jeff Garzik: use PCI interface</div><div class='del'>-</div><div class='del'>-	LK1.1.2:</div><div class='del'>-	- Urban Widmark: minor cleanups, merges from Becker 1.03a/1.04 versions</div><div class='del'>-</div><div class='del'>-	LK1.1.3:</div><div class='del'>-	- Urban Widmark: use PCI DMA interface (with thanks to the eepro100.c</div><div class='del'>-			 code) update "Theory of Operation" with</div><div class='del'>-			 softnet/locking changes</div><div class='del'>-	- Dave Miller: PCI DMA and endian fixups</div><div class='del'>-	- Jeff Garzik: MOD_xxx race fixes, updated PCI resource allocation</div><div class='del'>-</div><div class='del'>-	LK1.1.4:</div><div class='del'>-	- Urban Widmark: fix gcc 2.95.2 problem and</div><div class='del'>-	                 remove writel's to fixed address 0x7c</div><div class='del'>-</div><div class='del'>-	LK1.1.5:</div><div class='del'>-	- Urban Widmark: mdio locking, bounce buffer changes</div><div class='del'>-	                 merges from Beckers 1.05 version</div><div class='del'>-	                 added netif_running_on/off support</div><div class='del'>-</div><div class='del'>-	LK1.1.6:</div><div class='del'>-	- Urban Widmark: merges from Beckers 1.08b version (VT6102 + mdio)</div><div class='del'>-	                 set netif_running_on/off on startup, del_timer_sync</div><div class='del'>-</div><div class='del'>-	LK1.1.7:</div><div class='del'>-	- Manfred Spraul: added reset into tx_timeout</div><div class='del'>-</div><div class='del'>-	LK1.1.9:</div><div class='del'>-	- Urban Widmark: merges from Beckers 1.10 version</div><div class='del'>-	                 (media selection + eeprom reload)</div><div class='del'>-	- David Vrabel:  merges from D-Link "1.11" version</div><div class='del'>-	                 (disable WOL and PME on startup)</div><div class='del'>-</div><div class='del'>-	LK1.1.10:</div><div class='del'>-	- Manfred Spraul: use "singlecopy" for unaligned buffers</div><div class='del'>-	                  don't allocate bounce buffers for !ReqTxAlign cards</div><div class='del'>-</div><div class='del'>-	LK1.1.11:</div><div class='del'>-	- David Woodhouse: Set dev-&gt;base_addr before the first time we call</div><div class='del'>-			   wait_for_reset(). It's a lot happier that way.</div><div class='del'>-			   Free np-&gt;tx_bufs only if we actually allocated it.</div><div class='del'>-</div><div class='del'>-	LK1.1.12:</div><div class='del'>-	- Martin Eriksson: Allow Memory-Mapped IO to be enabled.</div><div class='del'>-</div><div class='del'>-	LK1.1.13 (jgarzik):</div><div class='del'>-	- Add ethtool support</div><div class='del'>-	- Replace some MII-related magic numbers with constants</div><div class='del'>-</div><div class='del'>-	LK1.1.14 (Ivan G.):</div><div class='del'>-	- fixes comments for Rhine-III</div><div class='del'>-	- removes W_MAX_TIMEOUT (unused)</div><div class='del'>-	- adds HasDavicomPhy for Rhine-I (basis: linuxfet driver; my card</div><div class='del'>-	  is R-I and has Davicom chip, flag is referenced in kernel driver)</div><div class='del'>-	- sends chip_id as a parameter to wait_for_reset since np is not</div><div class='del'>-	  initialized on first call</div><div class='del'>-	- changes mmio "else if (chip_id==VT6102)" to "else" so it will work</div><div class='del'>-	  for Rhine-III's (documentation says same bit is correct)</div><div class='del'>-	- transmit frame queue message is off by one - fixed</div><div class='del'>-	- adds IntrNormalSummary to "Something Wicked" exclusion list</div><div class='del'>-	  so normal interrupts will not trigger the message (src: Donald Becker)</div><div class='del'>-	(Roger Luethi)</div><div class='del'>-	- show confused chip where to continue after Tx error</div><div class='del'>-	- location of collision counter is chip specific</div><div class='del'>-	- allow selecting backoff algorithm (module parameter)</div><div class='del'>-</div><div class='del'>-	LK1.1.15 (jgarzik):</div><div class='del'>-	- Use new MII lib helper generic_mii_ioctl</div><div class='del'>-</div><div class='del'>-	LK1.1.16 (Roger Luethi)</div><div class='del'>-	- Etherleak fix</div><div class='del'>-	- Handle Tx buffer underrun</div><div class='del'>-	- Fix bugs in full duplex handling</div><div class='del'>-	- New reset code uses "force reset" cmd on Rhine-II</div><div class='del'>-	- Various clean ups</div><div class='del'>-</div><div class='del'>-	LK1.1.17 (Roger Luethi)</div><div class='del'>-	- Fix race in via_rhine_start_tx()</div><div class='del'>-	- On errors, wait for Tx engine to turn off before scavenging</div><div class='del'>-	- Handle Tx descriptor write-back race on Rhine-II</div><div class='del'>-	- Force flushing for PCI posted writes</div><div class='del'>-	- More reset code changes</div><div class='del'>-</div><div class='del'>-	LK1.1.18 (Roger Luethi)</div><div class='del'>-	- No filtering multicast in promisc mode (Edward Peng)</div><div class='del'>-	- Fix for Rhine-I Tx timeouts</div><div class='del'>-</div><div class='del'>-	LK1.1.19 (Roger Luethi)</div><div class='del'>-	- Increase Tx threshold for unspecified errors</div><div class='del'>-</div><div class='del'>-	LK1.2.0-2.6 (Roger Luethi)</div><div class='del'>-	- Massive clean-up</div><div class='del'>-	- Rewrite PHY, media handling (remove options, full_duplex, backoff)</div><div class='del'>-	- Fix Tx engine race for good</div><div class='del'>-	- Craig Brind: Zero padded aligned buffers for short packets.</div><div class='add'>+	[link no longer provides useful info -jgarzik]</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"via-rhine"</div><div class='del'>-#define DRV_VERSION	"1.2.0-2.6"</div><div class='del'>-#define DRV_RELDATE	"June-10-2004"</div><div class='add'>+#define DRV_VERSION	"1.4.0"</div><div class='add'>+#define DRV_RELDATE	"June-27-2006"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* A few user-configurable values.</div><div class='hunk'>@@ -356,12 +252,11 @@ enum rhine_quirks {</div><div class='ctx'> /* Beware of PCI posted writes */</div><div class='ctx'> #define IOSYNC	do { ioread8(ioaddr + StationAddr); } while (0)</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id rhine_pci_tbl[] =</div><div class='del'>-{</div><div class='del'>-	{0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT86C100A */</div><div class='del'>-	{0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6102 */</div><div class='del'>-	{0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* 6105{,L,LOM} */</div><div class='del'>-	{0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, /* VT6105M */</div><div class='add'>+static const struct pci_device_id rhine_pci_tbl[] = {</div><div class='add'>+	{ 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, },	/* VT86C100A */</div><div class='add'>+	{ 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, },	/* VT6102 */</div><div class='add'>+	{ 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, },	/* 6105{,L,LOM} */</div><div class='add'>+	{ 0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, },	/* VT6105M */</div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);</div><div class='hunk'>@@ -1210,7 +1105,7 @@ static int rhine_open(struct net_device *dev)</div><div class='ctx'> 	void __iomem *ioaddr = rp-&gt;base;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(rp-&gt;pdev-&gt;irq, &amp;rhine_interrupt, SA_SHIRQ, dev-&gt;name,</div><div class='add'>+	rc = request_irq(rp-&gt;pdev-&gt;irq, &amp;rhine_interrupt, IRQF_SHARED, dev-&gt;name,</div><div class='ctx'> 			dev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -1284,11 +1179,8 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Calculate the next Tx descriptor entry. */</div><div class='ctx'> 	entry = rp-&gt;cur_tx % TX_RING_SIZE;</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='add'>+	if (skb_padto(skb, ETH_ZLEN))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;tx_skbuff[entry] = skb;</div><div class='ctx'> </div><div class='hunk'>@@ -2002,7 +1894,7 @@ static int rhine_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-        if (request_irq(dev-&gt;irq, rhine_interrupt, SA_SHIRQ, dev-&gt;name, dev))</div><div class='add'>+        if (request_irq(dev-&gt;irq, rhine_interrupt, IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		printk(KERN_ERR "via-rhine %s: request_irq failed\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_set_power_state(pdev, PCI_D0);</div><div class='head'>diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c<br/>index ed1f837c8fda..f5b0078eb4ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/via-velocity.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/via-velocity.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -65,7 +64,6 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='hunk'>@@ -231,7 +229,8 @@ static int rx_copybreak = 200;</div><div class='ctx'> module_param(rx_copybreak, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");</div><div class='ctx'> </div><div class='del'>-static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, struct velocity_info_tbl *info);</div><div class='add'>+static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr,</div><div class='add'>+			       const struct velocity_info_tbl *info);</div><div class='ctx'> static int velocity_get_pci_info(struct velocity_info *, struct pci_dev *pdev);</div><div class='ctx'> static void velocity_print_info(struct velocity_info *vptr);</div><div class='ctx'> static int velocity_open(struct net_device *dev);</div><div class='hunk'>@@ -248,6 +247,7 @@ static void velocity_free_rd_ring(struct velocity_info *vptr);</div><div class='ctx'> static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);</div><div class='ctx'> static int velocity_soft_reset(struct velocity_info *vptr);</div><div class='ctx'> static void mii_init(struct velocity_info *vptr, u32 mii_status);</div><div class='add'>+static u32 velocity_get_link(struct net_device *dev);</div><div class='ctx'> static u32 velocity_get_opt_media_mode(struct velocity_info *vptr);</div><div class='ctx'> static void velocity_print_link_status(struct velocity_info *vptr);</div><div class='ctx'> static void safe_disable_mii_autopoll(struct mac_regs __iomem * regs);</div><div class='hunk'>@@ -295,9 +295,9 @@ static void velocity_unregister_notifier(void)</div><div class='ctx'>  *	Internal board variants. At the moment we have only one</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct velocity_info_tbl chip_info_table[] = {</div><div class='del'>-	{CHIP_TYPE_VT6110, "VIA Networking Velocity Family Gigabit Ethernet Adapter", 256, 1, 0x00FFFFFFUL},</div><div class='del'>-	{0, NULL}</div><div class='add'>+static const struct velocity_info_tbl chip_info_table[] __devinitdata = {</div><div class='add'>+	{CHIP_TYPE_VT6110, "VIA Networking Velocity Family Gigabit Ethernet Adapter", 1, 0x00FFFFFFUL},</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -305,10 +305,9 @@ static struct velocity_info_tbl chip_info_table[] = {</div><div class='ctx'>  *	device driver. Used for hotplug autoloading.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id velocity_id_table[] __devinitdata = {</div><div class='del'>-	{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) chip_info_table},</div><div class='del'>-	{0, }</div><div class='add'>+static const struct pci_device_id velocity_id_table[] __devinitdata = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X) },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, velocity_id_table);</div><div class='hunk'>@@ -342,7 +341,7 @@ static char __devinit *get_chip_name(enum chip_type chip_id)</div><div class='ctx'> static void __devexit velocity_remove1(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -687,21 +686,23 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> 	static int first = 1;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int i;</div><div class='del'>-	struct velocity_info_tbl *info = (struct velocity_info_tbl *) ent-&gt;driver_data;</div><div class='add'>+	const struct velocity_info_tbl *info = &amp;chip_info_table[ent-&gt;driver_data];</div><div class='ctx'> 	struct velocity_info *vptr;</div><div class='ctx'> 	struct mac_regs __iomem * regs;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	/* FIXME: this driver, like almost all other ethernet drivers,</div><div class='add'>+	 * can support more than MAX_UNITS.</div><div class='add'>+	 */</div><div class='ctx'> 	if (velocity_nics &gt;= MAX_UNITS) {</div><div class='del'>-		printk(KERN_NOTICE VELOCITY_NAME ": already found %d NICs.\n", </div><div class='del'>-				velocity_nics);</div><div class='add'>+		dev_notice(&amp;pdev-&gt;dev, "already found %d NICs.\n", </div><div class='add'>+			   velocity_nics);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct velocity_info));</div><div class='del'>-</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		printk(KERN_ERR VELOCITY_NAME ": allocate net device failed.\n");</div><div class='add'>+	if (!dev) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "allocate net device failed.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -709,7 +710,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> 	</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='del'>-	vptr = dev-&gt;priv;</div><div class='add'>+	vptr = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (first) {</div><div class='hunk'>@@ -732,17 +733,17 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> </div><div class='ctx'> 	ret = velocity_get_pci_info(vptr, pdev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR VELOCITY_NAME ": Failed to find PCI device.\n");</div><div class='add'>+		/* error message already printed */</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_request_regions(pdev, VELOCITY_NAME);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR VELOCITY_NAME ": Failed to find PCI device.\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "No PCI resources.\n");</div><div class='ctx'> 		goto err_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	regs = ioremap(vptr-&gt;memaddr, vptr-&gt;io_size);</div><div class='add'>+	regs = ioremap(vptr-&gt;memaddr, VELOCITY_IO_SIZE);</div><div class='ctx'> 	if (regs == NULL) {</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 		goto err_release_res;</div><div class='hunk'>@@ -798,6 +799,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_iounmap;</div><div class='ctx'> </div><div class='add'>+	if (velocity_get_link(dev))</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+</div><div class='ctx'> 	velocity_print_info(vptr);</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> 	</div><div class='hunk'>@@ -857,13 +861,14 @@ static void __devinit velocity_print_info(struct velocity_info *vptr)</div><div class='ctx'>  *	discovered.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __devinit velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, struct velocity_info_tbl *info)</div><div class='add'>+static void __devinit velocity_init_info(struct pci_dev *pdev,</div><div class='add'>+					 struct velocity_info *vptr,</div><div class='add'>+					 const struct velocity_info_tbl *info)</div><div class='ctx'> {</div><div class='ctx'> 	memset(vptr, 0, sizeof(struct velocity_info));</div><div class='ctx'> </div><div class='ctx'> 	vptr-&gt;pdev = pdev;</div><div class='ctx'> 	vptr-&gt;chip_id = info-&gt;chip_id;</div><div class='del'>-	vptr-&gt;io_size = info-&gt;io_size;</div><div class='ctx'> 	vptr-&gt;num_txq = info-&gt;txqueue;</div><div class='ctx'> 	vptr-&gt;multicast_limit = MCAM_SIZE;</div><div class='ctx'> 	spin_lock_init(&amp;vptr-&gt;lock);</div><div class='hunk'>@@ -881,8 +886,7 @@ static void __devinit velocity_init_info(struct pci_dev *pdev, struct velocity_i</div><div class='ctx'> </div><div class='ctx'> static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	if(pci_read_config_byte(pdev, PCI_REVISION_ID, &amp;vptr-&gt;rev_id) &lt; 0)</div><div class='add'>+	if (pci_read_config_byte(pdev, PCI_REVISION_ID, &amp;vptr-&gt;rev_id) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 		</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='hunk'>@@ -890,24 +894,20 @@ static int __devinit velocity_get_pci_info(struct velocity_info *vptr, struct pc</div><div class='ctx'> 	vptr-&gt;ioaddr = pci_resource_start(pdev, 0);</div><div class='ctx'> 	vptr-&gt;memaddr = pci_resource_start(pdev, 1);</div><div class='ctx'> 	</div><div class='del'>-	if(!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_IO))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "%s: region #0 is not an I/O resource, aborting.\n",</div><div class='del'>-				pci_name(pdev));</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_IO)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			   "region #0 is not an I/O resource, aborting.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if((pci_resource_flags(pdev, 1) &amp; IORESOURCE_IO))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "%s: region #1 is an I/O resource, aborting.\n",</div><div class='del'>-				pci_name(pdev));</div><div class='add'>+	if ((pci_resource_flags(pdev, 1) &amp; IORESOURCE_IO)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			   "region #1 is an I/O resource, aborting.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(pci_resource_len(pdev, 1) &lt; 256)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "%s: region #1 is too small.\n", </div><div class='del'>-				pci_name(pdev));</div><div class='add'>+	if (pci_resource_len(pdev, 1) &lt; VELOCITY_IO_SIZE) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "region #1 is too small.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	vptr-&gt;pdev = pdev;</div><div class='hunk'>@@ -1653,8 +1653,10 @@ static void velocity_error(struct velocity_info *vptr, int status)</div><div class='ctx'> </div><div class='ctx'> 		if (linked) {</div><div class='ctx'> 			vptr-&gt;mii_status &amp;= ~VELOCITY_LINK_FAIL;</div><div class='add'>+			netif_carrier_on(vptr-&gt;dev);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			vptr-&gt;mii_status |= VELOCITY_LINK_FAIL;</div><div class='add'>+			netif_carrier_off(vptr-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		velocity_print_link_status(vptr);</div><div class='hunk'>@@ -1724,7 +1726,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_</div><div class='ctx'>  </div><div class='ctx'> static int velocity_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	vptr-&gt;rx_buf_sz = (dev-&gt;mtu &lt;= 1504 ? PKT_BUF_SZ : dev-&gt;mtu + 32);</div><div class='hunk'>@@ -1746,7 +1748,7 @@ static int velocity_open(struct net_device *dev)</div><div class='ctx'> 	</div><div class='ctx'> 	velocity_init_registers(vptr, VELOCITY_INIT_COLD);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(vptr-&gt;pdev-&gt;irq, &amp;velocity_intr, SA_SHIRQ,</div><div class='add'>+	ret = request_irq(vptr-&gt;pdev-&gt;irq, &amp;velocity_intr, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		/* Power down the chip */</div><div class='hunk'>@@ -1781,7 +1783,7 @@ err_free_desc_rings:</div><div class='ctx'>  </div><div class='ctx'> static int velocity_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int oldmtu = dev-&gt;mtu;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -1857,7 +1859,7 @@ static void velocity_shutdown(struct velocity_info *vptr)</div><div class='ctx'> </div><div class='ctx'> static int velocity_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	velocity_shutdown(vptr);</div><div class='hunk'>@@ -1890,7 +1892,7 @@ static int velocity_close(struct net_device *dev)</div><div class='ctx'>  </div><div class='ctx'> static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	int qnum = 0;</div><div class='ctx'> 	struct tx_desc *td_ptr;</div><div class='ctx'> 	struct velocity_td_info *tdinfo;</div><div class='hunk'>@@ -1899,6 +1901,13 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	int pktlen = skb-&gt;len;</div><div class='ctx'> </div><div class='add'>+#ifdef VELOCITY_ZERO_COPY_SUPPORT</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags &gt; 6 &amp;&amp; __skb_linearize(skb)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;vptr-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	index = vptr-&gt;td_curr[qnum];</div><div class='hunk'>@@ -1914,8 +1923,6 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (pktlen &lt; ETH_ZLEN) {</div><div class='ctx'> 		/* Cannot occur until ZC support */</div><div class='del'>-		if(skb_linearize(skb, GFP_ATOMIC))</div><div class='del'>-			return 0; </div><div class='ctx'> 		pktlen = ETH_ZLEN;</div><div class='ctx'> 		memcpy(tdinfo-&gt;buf, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 		memset(tdinfo-&gt;buf + skb-&gt;len, 0, ETH_ZLEN - skb-&gt;len);</div><div class='hunk'>@@ -1933,7 +1940,6 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		int nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 		tdinfo-&gt;skb = skb;</div><div class='ctx'> 		if (nfrags &gt; 6) {</div><div class='del'>-			skb_linearize(skb, GFP_ATOMIC);</div><div class='ctx'> 			memcpy(tdinfo-&gt;buf, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> 			tdinfo-&gt;skb_dma[0] = tdinfo-&gt;buf_dma;</div><div class='ctx'> 			td_ptr-&gt;tdesc0.pktsize = </div><div class='hunk'>@@ -2041,7 +2047,7 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> static int velocity_intr(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_instance;</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	u32 isr_status;</div><div class='ctx'> 	int max_count = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2096,7 +2102,7 @@ static int velocity_intr(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'>  </div><div class='ctx'> static void velocity_set_multi(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	struct mac_regs __iomem * regs = vptr-&gt;mac_regs;</div><div class='ctx'> 	u8 rx_mode;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2145,7 +2151,7 @@ static void velocity_set_multi(struct net_device *dev)</div><div class='ctx'>  </div><div class='ctx'> static struct net_device_stats *velocity_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	</div><div class='ctx'> 	/* If the hardware is down, don't touch MII */</div><div class='ctx'> 	if(!netif_running(dev))</div><div class='hunk'>@@ -2188,7 +2194,7 @@ static struct net_device_stats *velocity_get_stats(struct net_device *dev)</div><div class='ctx'>  </div><div class='ctx'> static int velocity_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* If we are asked for information and the device is power</div><div class='hunk'>@@ -2817,7 +2823,7 @@ static void enable_flow_control_ability(struct velocity_info *vptr)</div><div class='ctx'>  </div><div class='ctx'> static int velocity_ethtool_up(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		pci_set_power_state(vptr-&gt;pdev, PCI_D0);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2833,14 +2839,14 @@ static int velocity_ethtool_up(struct net_device *dev)</div><div class='ctx'>  </div><div class='ctx'> static void velocity_ethtool_down(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		pci_set_power_state(vptr-&gt;pdev, PCI_D3hot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	struct mac_regs __iomem * regs = vptr-&gt;mac_regs;</div><div class='ctx'> 	u32 status;</div><div class='ctx'> 	status = check_connection_type(vptr-&gt;mac_regs);</div><div class='hunk'>@@ -2865,7 +2871,7 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd</div><div class='ctx'> </div><div class='ctx'> static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	u32 curr_status;</div><div class='ctx'> 	u32 new_status = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -2888,14 +2894,14 @@ static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd</div><div class='ctx'> </div><div class='ctx'> static u32 velocity_get_link(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	struct mac_regs __iomem * regs = vptr-&gt;mac_regs;</div><div class='ctx'> 	return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, &amp;regs-&gt;PHYSR0)  ? 0 : 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	strcpy(info-&gt;driver, VELOCITY_NAME);</div><div class='ctx'> 	strcpy(info-&gt;version, VELOCITY_VERSION);</div><div class='ctx'> 	strcpy(info-&gt;bus_info, pci_name(vptr-&gt;pdev));</div><div class='hunk'>@@ -2903,7 +2909,7 @@ static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo</div><div class='ctx'> </div><div class='ctx'> static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	wol-&gt;supported = WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_ARP;</div><div class='ctx'> 	wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -2919,7 +2925,7 @@ static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_woli</div><div class='ctx'> </div><div class='ctx'> static int velocity_ethtool_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!(wol-&gt;wolopts &amp; (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_ARP)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -2984,7 +2990,7 @@ static struct ethtool_ops velocity_ethtool_ops = {</div><div class='ctx'>  </div><div class='ctx'> static int velocity_mii_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct velocity_info *vptr = dev-&gt;priv;</div><div class='add'>+	struct velocity_info *vptr = netdev_priv(dev);</div><div class='ctx'> 	struct mac_regs __iomem * regs = vptr-&gt;mac_regs;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct mii_ioctl_data *miidata = if_mii(ifr);</div><div class='head'>diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h<br/>index d9a774b91ddc..496c3d597444 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/via-velocity.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/via-velocity.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/via-velocity.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'> #define VELOCITY_FULL_DRV_NAM  "VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"</div><div class='ctx'> #define VELOCITY_VERSION       "1.13"</div><div class='ctx'> </div><div class='add'>+#define VELOCITY_IO_SIZE	256</div><div class='add'>+</div><div class='ctx'> #define PKT_BUF_SZ          1540</div><div class='ctx'> </div><div class='ctx'> #define MAX_UNITS           8</div><div class='hunk'>@@ -307,7 +309,7 @@ enum  velocity_owner {</div><div class='ctx'> #define TX_QUEUE_NO         4</div><div class='ctx'> </div><div class='ctx'> #define MAX_HW_MIB_COUNTER  32</div><div class='del'>-#define VELOCITY_MIN_MTU    (1514-14)</div><div class='add'>+#define VELOCITY_MIN_MTU    (64)</div><div class='ctx'> #define VELOCITY_MAX_MTU    (9000)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1191,7 +1193,6 @@ enum chip_type {</div><div class='ctx'> struct velocity_info_tbl {</div><div class='ctx'> 	enum chip_type chip_id;</div><div class='ctx'> 	char *name;</div><div class='del'>-	int io_size;</div><div class='ctx'> 	int txqueue;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> };</div><div class='hunk'>@@ -1751,7 +1752,6 @@ struct velocity_info {</div><div class='ctx'> 	struct mac_regs __iomem * mac_regs;</div><div class='ctx'> 	unsigned long memaddr;</div><div class='ctx'> 	unsigned long ioaddr;</div><div class='del'>-	u32 io_size;</div><div class='ctx'> </div><div class='ctx'> 	u8 rev_id;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig<br/>index b5328b0ff927..54b8e492ef97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/Kconfig</a></div><div class='hunk'>@@ -134,18 +134,6 @@ config SEALEVEL_4021</div><div class='ctx'> 	  The driver will be compiled as a module: the</div><div class='ctx'> 	  module will be called sealevel.</div><div class='ctx'> </div><div class='del'>-config SYNCLINK_SYNCPPP</div><div class='del'>-	tristate "SyncLink HDLC/SYNCPPP support"</div><div class='del'>-	depends on WAN</div><div class='del'>-	help</div><div class='del'>-	  Enables HDLC/SYNCPPP support for the SyncLink WAN driver.</div><div class='del'>-</div><div class='del'>-	  Normally the SyncLink WAN driver works with the main PPP driver</div><div class='del'>-	  &lt;file:drivers/net/ppp_generic.c&gt; and pppd program.</div><div class='del'>-	  HDLC/SYNCPPP support allows use of the Cisco HDLC/PPP driver</div><div class='del'>-	  &lt;file:drivers/net/wan/syncppp.c&gt;. The SyncLink WAN driver (in</div><div class='del'>-	  character devices) must also be enabled.</div><div class='del'>-</div><div class='ctx'> # Generic HDLC</div><div class='ctx'> config HDLC</div><div class='ctx'> 	tristate "Generic HDLC layer"</div><div class='head'>diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile<br/>index 823c6d5ab90d..316ca6869d5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/Makefile</a></div><div class='hunk'>@@ -28,7 +28,6 @@ obj-$(CONFIG_COSA)		+=		syncppp.o	cosa.o</div><div class='ctx'> obj-$(CONFIG_FARSYNC)		+=		syncppp.o	farsync.o</div><div class='ctx'> obj-$(CONFIG_DSCC4)             +=				dscc4.o</div><div class='ctx'> obj-$(CONFIG_LANMEDIA)		+=		syncppp.o</div><div class='del'>-obj-$(CONFIG_SYNCLINK_SYNCPPP)	+=		syncppp.o</div><div class='ctx'> obj-$(CONFIG_X25_ASY)		+= x25_asy.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LANMEDIA)		+= lmc/</div><div class='head'>diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c<br/>index 43d854ace233..2c09ec908a3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/c101.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/c101.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/c101.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/c101.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * under the terms of version 2 of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- * For information see http://hq.pm.waw.pl/hdlc/</div><div class='add'>+ * For information see &lt;http://www.kernel.org/pub/linux/utils/net/hdlc/&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Sources of information:</div><div class='ctx'>  *    Hitachi HD64570 SCA User's Manual</div><div class='hunk'>@@ -116,27 +116,33 @@ static inline void openwin(card_t *card, u8 page)</div><div class='ctx'> #include "hd6457x.c"</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static inline void set_carrier(port_t *port)</div><div class='add'>+{</div><div class='add'>+	if (!sca_in(MSCI1_OFFSET + ST3, port) &amp; ST3_DCD)</div><div class='add'>+		netif_carrier_on(port_to_dev(port));</div><div class='add'>+	else</div><div class='add'>+		netif_carrier_off(port_to_dev(port));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static void sca_msci_intr(port_t *port)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = port_to_dev(port);</div><div class='del'>-	card_t* card = port_to_card(port);</div><div class='del'>-	u8 stat = sca_in(MSCI1_OFFSET + ST1, card); /* read MSCI ST1 status */</div><div class='add'>+	u8 stat = sca_in(MSCI1_OFFSET + ST1, port); /* read MSCI ST1 status */</div><div class='ctx'> </div><div class='ctx'> 	/* Reset MSCI TX underrun status bit */</div><div class='del'>-	sca_out(stat &amp; ST1_UDRN, MSCI0_OFFSET + ST1, card);</div><div class='add'>+	sca_out(stat &amp; ST1_UDRN, MSCI0_OFFSET + ST1, port);</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; ST1_UDRN) {</div><div class='del'>-		struct net_device_stats *stats = hdlc_stats(dev);</div><div class='add'>+		struct net_device_stats *stats = hdlc_stats(port_to_dev(port));</div><div class='ctx'> 		stats-&gt;tx_errors++; /* TX Underrun error detected */</div><div class='ctx'> 		stats-&gt;tx_fifo_errors++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset MSCI CDCD status bit - uses ch#2 DCD input */</div><div class='del'>-	sca_out(stat &amp; ST1_CDCD, MSCI1_OFFSET + ST1, card);</div><div class='add'>+	sca_out(stat &amp; ST1_CDCD, MSCI1_OFFSET + ST1, port);</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; ST1_CDCD)</div><div class='del'>-		hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, card) &amp; ST3_DCD),</div><div class='del'>-				 dev);</div><div class='add'>+		set_carrier(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -190,7 +196,7 @@ static int c101_open(struct net_device *dev)</div><div class='ctx'> 	sca_out(IE1_UDRN, MSCI0_OFFSET + IE1, port);</div><div class='ctx'> 	sca_out(IE0_TXINT, MSCI0_OFFSET + IE0, port);</div><div class='ctx'> </div><div class='del'>-	hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, port) &amp; ST3_DCD), dev);</div><div class='add'>+	set_carrier(port);</div><div class='ctx'> 	printk(KERN_DEBUG "0x%X\n", sca_in(MSCI1_OFFSET + ST3, port));</div><div class='ctx'> </div><div class='ctx'> 	/* enable MSCI1 CDCD interrupt */</div><div class='hunk'>@@ -326,21 +332,21 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)</div><div class='ctx'> 	if (request_irq(irq, sca_intr, 0, devname, card)) {</div><div class='ctx'> 		printk(KERN_ERR "c101: could not allocate IRQ\n");</div><div class='ctx'> 		c101_destroy_card(card);</div><div class='del'>-		return(-EBUSY);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;irq = irq;</div><div class='ctx'> </div><div class='ctx'> 	if (!request_mem_region(winbase, C101_MAPPED_RAM_SIZE, devname)) {</div><div class='ctx'> 		printk(KERN_ERR "c101: could not request RAM window\n");</div><div class='ctx'> 		c101_destroy_card(card);</div><div class='del'>-		return(-EBUSY);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;phy_winbase = winbase;</div><div class='ctx'> 	card-&gt;win0base = ioremap(winbase, C101_MAPPED_RAM_SIZE);</div><div class='ctx'> 	if (!card-&gt;win0base) {</div><div class='ctx'> 		printk(KERN_ERR "c101: could not map I/O address\n");</div><div class='ctx'> 		c101_destroy_card(card);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;tx_ring_buffers = TX_RING_BUFFERS;</div><div class='hunk'>@@ -378,7 +384,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sca_init_sync_port(card); /* Set up C101 memory */</div><div class='del'>-	hdlc_set_carrier(!(sca_in(MSCI1_OFFSET + ST3, card) &amp; ST3_DCD), dev);</div><div class='add'>+	set_carrier(card);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: Moxa C101 on IRQ%u,"</div><div class='ctx'> 	       " using %u TX + %u RX packets rings\n",</div><div class='head'>diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c<br/>index e392ee8b37a1..1f95b4864ea1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/cosa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/cosa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/cosa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/cosa.c</a></div><div class='hunk'>@@ -79,13 +79,11 @@</div><div class='ctx'> </div><div class='ctx'> /* ---------- Headers, macros, data structures ---------- */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -393,7 +391,6 @@ static int __init cosa_init(void)</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_dir("cosa");</div><div class='ctx'> 	cosa_class = class_create(THIS_MODULE, "cosa");</div><div class='ctx'> 	if (IS_ERR(cosa_class)) {</div><div class='ctx'> 		err = PTR_ERR(cosa_class);</div><div class='hunk'>@@ -402,13 +399,6 @@ static int __init cosa_init(void)</div><div class='ctx'> 	for (i=0; i&lt;nr_cards; i++) {</div><div class='ctx'> 		class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),</div><div class='ctx'> 				NULL, "cosa%d", i);</div><div class='del'>-		err = devfs_mk_cdev(MKDEV(cosa_major, i),</div><div class='del'>-				S_IFCHR|S_IRUSR|S_IWUSR,</div><div class='del'>-				"cosa/%d", i);</div><div class='del'>-		if (err) {</div><div class='del'>-			class_device_destroy(cosa_class, MKDEV(cosa_major, i));</div><div class='del'>-			goto out_chrdev;		</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	goto out;</div><div class='hunk'>@@ -426,12 +416,9 @@ static void __exit cosa_exit(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	printk(KERN_INFO "Unloading the cosa module\n");</div><div class='ctx'> </div><div class='del'>-	for (i=0; i&lt;nr_cards; i++) {</div><div class='add'>+	for (i=0; i&lt;nr_cards; i++)</div><div class='ctx'> 		class_device_destroy(cosa_class, MKDEV(cosa_major, i));</div><div class='del'>-		devfs_remove("cosa/%d", i);</div><div class='del'>-	}</div><div class='ctx'> 	class_destroy(cosa_class);</div><div class='del'>-	devfs_remove("cosa");</div><div class='ctx'> 	for (cosa=cosa_cards; nr_cards--; cosa++) {</div><div class='ctx'> 		/* Clean up the per-channel data */</div><div class='ctx'> 		for (i=0; i&lt;cosa-&gt;nchannels; i++) {</div><div class='head'>diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c<br/>index 4505540e3c59..684af4316ffd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/dscc4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/dscc4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/dscc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/dscc4.c</a></div><div class='hunk'>@@ -732,15 +732,15 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	ioaddr = ioremap(pci_resource_start(pdev, 0),</div><div class='ctx'> 					pci_resource_len(pdev, 0));</div><div class='ctx'> 	if (!ioaddr) {</div><div class='del'>-		printk(KERN_ERR "%s: cannot remap MMIO region %lx @ %lx\n",</div><div class='del'>-			DRV_NAME, pci_resource_len(pdev, 0),</div><div class='del'>-			pci_resource_start(pdev, 0));</div><div class='add'>+		printk(KERN_ERR "%s: cannot remap MMIO region %llx @ %llx\n",</div><div class='add'>+			DRV_NAME, (unsigned long long)pci_resource_len(pdev, 0),</div><div class='add'>+			(unsigned long long)pci_resource_start(pdev, 0));</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		goto err_free_mmio_regions_2;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_DEBUG "Siemens DSCC4, MMIO at %#lx (regs), %#lx (lbi), IRQ %d\n",</div><div class='del'>-	        pci_resource_start(pdev, 0),</div><div class='del'>-	        pci_resource_start(pdev, 1), pdev-&gt;irq);</div><div class='add'>+	printk(KERN_DEBUG "Siemens DSCC4, MMIO at %#llx (regs), %#llx (lbi), IRQ %d\n",</div><div class='add'>+	        (unsigned long long)pci_resource_start(pdev, 0),</div><div class='add'>+	        (unsigned long long)pci_resource_start(pdev, 1), pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Cf errata DS5 p.2 */</div><div class='ctx'> 	pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xf8);</div><div class='hunk'>@@ -752,7 +752,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	priv = pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	rc = request_irq(pdev-&gt;irq, dscc4_irq, SA_SHIRQ, DRV_NAME, priv-&gt;root);</div><div class='add'>+	rc = request_irq(pdev-&gt;irq, dscc4_irq, IRQF_SHARED, DRV_NAME, priv-&gt;root);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: IRQ %d busy\n", DRV_NAME, pdev-&gt;irq);</div><div class='ctx'> 		goto err_release_4;</div><div class='head'>diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c<br/>index 7981a2c7906e..3705db04a343 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/farsync.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/farsync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/farsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/farsync.c</a></div><div class='hunk'>@@ -2519,7 +2519,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	dbg(DBG_PCI, "kernel mem %p, ctlmem %p\n", card-&gt;mem, card-&gt;ctlmem);</div><div class='ctx'> </div><div class='ctx'> 	/* Register the interrupt handler */</div><div class='del'>-	if (request_irq(pdev-&gt;irq, fst_intr, SA_SHIRQ, FST_DEV_NAME, card)) {</div><div class='add'>+	if (request_irq(pdev-&gt;irq, fst_intr, IRQF_SHARED, FST_DEV_NAME, card)) {</div><div class='ctx'> 		printk_err("Unable to register interrupt %d\n", card-&gt;irq);</div><div class='ctx'> 		pci_release_regions(pdev);</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='head'>diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c<br/>index d3743321a977..dce2bb317b82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hd6457x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hd6457x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hd6457x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/hd6457x.c</a></div><div class='hunk'>@@ -168,6 +168,23 @@ static inline u32 buffer_offset(port_t *port, u16 desc, int transmit)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static inline void sca_set_carrier(port_t *port)</div><div class='add'>+{</div><div class='add'>+	if (!(sca_in(get_msci(port) + ST3, port_to_card(port)) &amp; ST3_DCD)) {</div><div class='add'>+#ifdef DEBUG_LINK</div><div class='add'>+		printk(KERN_DEBUG "%s: sca_set_carrier on\n",</div><div class='add'>+		       port_to_dev(port)-&gt;name);</div><div class='add'>+#endif</div><div class='add'>+		netif_carrier_on(port_to_dev(port));</div><div class='add'>+	} else {</div><div class='add'>+#ifdef DEBUG_LINK</div><div class='add'>+		printk(KERN_DEBUG "%s: sca_set_carrier off\n",</div><div class='add'>+		       port_to_dev(port)-&gt;name);</div><div class='add'>+#endif</div><div class='add'>+		netif_carrier_off(port_to_dev(port));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static void sca_init_sync_port(port_t *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -237,9 +254,7 @@ static void sca_init_sync_port(port_t *port)</div><div class='ctx'> 			sca_out(DIR_BOFE, DIR_TX(phy_node(port)), card);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	hdlc_set_carrier(!(sca_in(get_msci(port) + ST3, card) &amp; ST3_DCD),</div><div class='del'>-			 port_to_dev(port));</div><div class='add'>+	sca_set_carrier(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -262,8 +277,7 @@ static inline void sca_msci_intr(port_t *port)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (stat &amp; ST1_CDCD)</div><div class='del'>-		hdlc_set_carrier(!(sca_in(msci + ST3, card) &amp; ST3_DCD),</div><div class='del'>-				 port_to_dev(port));</div><div class='add'>+		sca_set_carrier(port);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +580,7 @@ static void sca_open(struct net_device *dev)</div><div class='ctx'>    - all DMA interrupts</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-	hdlc_set_carrier(!(sca_in(msci + ST3, card) &amp; ST3_DCD), dev);</div><div class='add'>+	sca_set_carrier(port);</div><div class='ctx'> </div><div class='ctx'> #ifdef __HD64570_H</div><div class='ctx'> 	/* MSCI TX INT and RX INT A IRQ enable */</div><div class='head'>diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c<br/>index 1fd04662c4fc..f289daba0c7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_cisco.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hdlc_cisco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_cisco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/hdlc_cisco.c</a></div><div class='hunk'>@@ -192,9 +192,7 @@ static int cisco_rx(struct sk_buff *skb)</div><div class='ctx'> 					       "uptime %ud%uh%um%us)\n",</div><div class='ctx'> 					       dev-&gt;name, days, hrs,</div><div class='ctx'> 					       min, sec);</div><div class='del'>-#if 0</div><div class='del'>-					netif_carrier_on(dev);</div><div class='del'>-#endif</div><div class='add'>+					netif_dormant_off(dev);</div><div class='ctx'> 					hdlc-&gt;state.cisco.up = 1;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -227,9 +225,7 @@ static void cisco_timer(unsigned long arg)</div><div class='ctx'> 		       hdlc-&gt;state.cisco.settings.timeout * HZ)) {</div><div class='ctx'> 		hdlc-&gt;state.cisco.up = 0;</div><div class='ctx'> 		printk(KERN_INFO "%s: Link down\n", dev-&gt;name);</div><div class='del'>-#if 0</div><div class='del'>-		netif_carrier_off(dev);</div><div class='del'>-#endif</div><div class='add'>+		netif_dormant_on(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ,</div><div class='hunk'>@@ -265,10 +261,7 @@ static void cisco_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	hdlc_device *hdlc = dev_to_hdlc(dev);</div><div class='ctx'> 	del_timer_sync(&amp;hdlc-&gt;state.cisco.timer);</div><div class='del'>-#if 0</div><div class='del'>-	if (netif_carrier_ok(dev))</div><div class='del'>-		netif_carrier_off(dev);</div><div class='del'>-#endif</div><div class='add'>+	netif_dormant_on(dev);</div><div class='ctx'> 	hdlc-&gt;state.cisco.up = 0;</div><div class='ctx'> 	hdlc-&gt;state.cisco.request_sent = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -328,6 +321,7 @@ int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr)</div><div class='ctx'> 		dev-&gt;type = ARPHRD_CISCO;</div><div class='ctx'> 		dev-&gt;flags = IFF_POINTOPOINT | IFF_NOARP;</div><div class='ctx'> 		dev-&gt;addr_len = 0;</div><div class='add'>+		netif_dormant_on(dev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c<br/>index 523afe17564e..7bb737bbdeb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_fr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hdlc_fr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_fr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/hdlc_fr.c</a></div><div class='hunk'>@@ -301,7 +301,7 @@ static int pvc_open(struct net_device *dev)</div><div class='ctx'> 	if (pvc-&gt;open_count++ == 0) {</div><div class='ctx'> 		hdlc_device *hdlc = dev_to_hdlc(pvc-&gt;master);</div><div class='ctx'> 		if (hdlc-&gt;state.fr.settings.lmi == LMI_NONE)</div><div class='del'>-			pvc-&gt;state.active = hdlc-&gt;carrier;</div><div class='add'>+			pvc-&gt;state.active = netif_carrier_ok(pvc-&gt;master);</div><div class='ctx'> </div><div class='ctx'> 		pvc_carrier(pvc-&gt;state.active, pvc);</div><div class='ctx'> 		hdlc-&gt;state.fr.dce_changed = 1;</div><div class='hunk'>@@ -545,11 +545,7 @@ static void fr_set_link_state(int reliable, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	hdlc-&gt;state.fr.reliable = reliable;</div><div class='ctx'> 	if (reliable) {</div><div class='del'>-#if 0</div><div class='del'>-		if (!netif_carrier_ok(dev))</div><div class='del'>-			netif_carrier_on(dev);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+		netif_dormant_off(dev);</div><div class='ctx'> 		hdlc-&gt;state.fr.n391cnt = 0; /* Request full status */</div><div class='ctx'> 		hdlc-&gt;state.fr.dce_changed = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -562,11 +558,7 @@ static void fr_set_link_state(int reliable, struct net_device *dev)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-#if 0</div><div class='del'>-		if (netif_carrier_ok(dev))</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+		netif_dormant_on(dev);</div><div class='ctx'> 		while (pvc) {		/* Deactivate all PVCs */</div><div class='ctx'> 			pvc_carrier(0, pvc);</div><div class='ctx'> 			pvc-&gt;state.exist = pvc-&gt;state.active = 0;</div><div class='head'>diff --git a/drivers/net/wan/hdlc_generic.c b/drivers/net/wan/hdlc_generic.c<br/>index 46cef8f92133..04ca1f7b6424 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hdlc_generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hdlc_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/hdlc_generic.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * - proto.start() and stop() are called with spin_lock_irq held.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -35,10 +34,11 @@</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/lapb.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/hdlc.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static const char* version = "HDLC support module revision 1.18";</div><div class='add'>+static const char* version = "HDLC support module revision 1.19";</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_LINK</div><div class='ctx'> </div><div class='hunk'>@@ -74,57 +74,51 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void __hdlc_set_carrier_on(struct net_device *dev)</div><div class='add'>+static inline void hdlc_proto_start(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	hdlc_device *hdlc = dev_to_hdlc(dev);</div><div class='ctx'> 	if (hdlc-&gt;proto.start)</div><div class='ctx'> 		return hdlc-&gt;proto.start(dev);</div><div class='del'>-#if 0</div><div class='del'>-#ifdef DEBUG_LINK</div><div class='del'>-	if (netif_carrier_ok(dev))</div><div class='del'>-		printk(KERN_ERR "hdlc_set_carrier_on(): already on\n");</div><div class='del'>-#endif</div><div class='del'>-	netif_carrier_on(dev);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void __hdlc_set_carrier_off(struct net_device *dev)</div><div class='add'>+static inline void hdlc_proto_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	hdlc_device *hdlc = dev_to_hdlc(dev);</div><div class='ctx'> 	if (hdlc-&gt;proto.stop)</div><div class='ctx'> 		return hdlc-&gt;proto.stop(dev);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#ifdef DEBUG_LINK</div><div class='del'>-	if (!netif_carrier_ok(dev))</div><div class='del'>-		printk(KERN_ERR "hdlc_set_carrier_off(): already off\n");</div><div class='del'>-#endif</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void hdlc_set_carrier(int on, struct net_device *dev)</div><div class='add'>+static int hdlc_device_event(struct notifier_block *this, unsigned long event,</div><div class='add'>+			     void *ptr)</div><div class='ctx'> {</div><div class='del'>-	hdlc_device *hdlc = dev_to_hdlc(dev);</div><div class='add'>+	struct net_device *dev = ptr;</div><div class='add'>+	hdlc_device *hdlc;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	on = on ? 1 : 0;</div><div class='add'>+	int on;</div><div class='add'>+ </div><div class='add'>+	if (dev-&gt;get_stats != hdlc_get_stats)</div><div class='add'>+		return NOTIFY_DONE; /* not an HDLC device */</div><div class='add'>+ </div><div class='add'>+	if (event != NETDEV_CHANGE)</div><div class='add'>+		return NOTIFY_DONE; /* Only interrested in carrier changes */</div><div class='add'>+</div><div class='add'>+	on = netif_carrier_ok(dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_LINK</div><div class='del'>-	printk(KERN_DEBUG "hdlc_set_carrier %i\n", on);</div><div class='add'>+	printk(KERN_DEBUG "%s: hdlc_device_event NETDEV_CHANGE, carrier %i\n",</div><div class='add'>+	       dev-&gt;name, on);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	hdlc = dev_to_hdlc(dev);</div><div class='ctx'> 	spin_lock_irqsave(&amp;hdlc-&gt;state_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (hdlc-&gt;carrier == on)</div><div class='ctx'> 		goto carrier_exit; /* no change in DCD line level */</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_LINK</div><div class='del'>-	printk(KERN_INFO "%s: carrier %s\n", dev-&gt;name, on ? "ON" : "off");</div><div class='del'>-#endif</div><div class='ctx'> 	hdlc-&gt;carrier = on;</div><div class='ctx'> </div><div class='ctx'> 	if (!hdlc-&gt;open)</div><div class='hunk'>@@ -132,14 +126,15 @@ void hdlc_set_carrier(int on, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (hdlc-&gt;carrier) {</div><div class='ctx'> 		printk(KERN_INFO "%s: Carrier detected\n", dev-&gt;name);</div><div class='del'>-		__hdlc_set_carrier_on(dev);</div><div class='add'>+		hdlc_proto_start(dev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_INFO "%s: Carrier lost\n", dev-&gt;name);</div><div class='del'>-		__hdlc_set_carrier_off(dev);</div><div class='add'>+		hdlc_proto_stop(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> carrier_exit:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;hdlc-&gt;state_lock, flags);</div><div class='add'>+	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -166,7 +161,7 @@ int hdlc_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (hdlc-&gt;carrier) {</div><div class='ctx'> 		printk(KERN_INFO "%s: Carrier detected\n", dev-&gt;name);</div><div class='del'>-		__hdlc_set_carrier_on(dev);</div><div class='add'>+		hdlc_proto_start(dev);</div><div class='ctx'> 	} else</div><div class='ctx'> 		printk(KERN_INFO "%s: No carrier\n", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -191,7 +186,7 @@ void hdlc_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	hdlc-&gt;open = 0;</div><div class='ctx'> 	if (hdlc-&gt;carrier)</div><div class='del'>-		__hdlc_set_carrier_off(dev);</div><div class='add'>+		hdlc_proto_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;hdlc-&gt;state_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -259,7 +254,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hdlc_setup(struct net_device *dev)</div><div class='add'>+void hdlc_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	hdlc_device *hdlc = dev_to_hdlc(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -288,26 +283,6 @@ struct net_device *alloc_hdlcdev(void *priv)</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int register_hdlc_device(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int result = dev_alloc_name(dev, "hdlc%d");</div><div class='del'>-	if (result &lt; 0)</div><div class='del'>-		return result;</div><div class='del'>-</div><div class='del'>-	result = register_netdev(dev);</div><div class='del'>-	if (result != 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (netif_carrier_ok(dev))</div><div class='del'>-		netif_carrier_off(dev); /* no carrier until DCD goes up */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> void unregister_hdlc_device(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	rtnl_lock();</div><div class='hunk'>@@ -324,10 +299,9 @@ MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(hdlc_open);</div><div class='ctx'> EXPORT_SYMBOL(hdlc_close);</div><div class='del'>-EXPORT_SYMBOL(hdlc_set_carrier);</div><div class='ctx'> EXPORT_SYMBOL(hdlc_ioctl);</div><div class='add'>+EXPORT_SYMBOL(hdlc_setup);</div><div class='ctx'> EXPORT_SYMBOL(alloc_hdlcdev);</div><div class='del'>-EXPORT_SYMBOL(register_hdlc_device);</div><div class='ctx'> EXPORT_SYMBOL(unregister_hdlc_device);</div><div class='ctx'> </div><div class='ctx'> static struct packet_type hdlc_packet_type = {</div><div class='hunk'>@@ -336,9 +310,18 @@ static struct packet_type hdlc_packet_type = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static struct notifier_block hdlc_notifier = {</div><div class='add'>+        .notifier_call = hdlc_device_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int __init hdlc_module_init(void)</div><div class='ctx'> {</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "%s\n", version);</div><div class='add'>+	if ((result = register_netdevice_notifier(&amp;hdlc_notifier)) != 0)</div><div class='add'>+                return result;</div><div class='ctx'>         dev_add_pack(&amp;hdlc_packet_type);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -348,6 +331,7 @@ static int __init hdlc_module_init(void)</div><div class='ctx'> static void __exit hdlc_module_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	dev_remove_pack(&amp;hdlc_packet_type);</div><div class='add'>+	unregister_netdevice_notifier(&amp;hdlc_notifier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c<br/>index cf5c805452a3..a4f735723c41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/hostess_sv11.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/hostess_sv11.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/hostess_sv11.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/hostess_sv11.c</a></div><div class='hunk'>@@ -264,7 +264,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)</div><div class='ctx'> 	/* We want a fast IRQ for this device. Actually we'd like an even faster</div><div class='ctx'> 	   IRQ ;) - This is one driver RtLinux is made for */</div><div class='ctx'> 	   </div><div class='del'>-	if(request_irq(irq, &amp;z8530_interrupt, SA_INTERRUPT, "Hostess SV11", dev)&lt;0)</div><div class='add'>+	if(request_irq(irq, &amp;z8530_interrupt, IRQF_DISABLED, "Hostess SV11", dev)&lt;0)</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);</div><div class='ctx'> 		goto fail1;</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c<br/>index 40926d779161..39f44241a728 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/lmc/lmc_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/lmc/lmc_main.c</a></div><div class='hunk'>@@ -1058,7 +1058,7 @@ static int lmc_open (struct net_device *dev) /*fold00*/</div><div class='ctx'>     lmc_softreset (sc);</div><div class='ctx'> </div><div class='ctx'>     /* Since we have to use PCI bus, this should work on x86,alpha,ppc */</div><div class='del'>-    if (request_irq (dev-&gt;irq, &amp;lmc_interrupt, SA_SHIRQ, dev-&gt;name, dev)){</div><div class='add'>+    if (request_irq (dev-&gt;irq, &amp;lmc_interrupt, IRQF_SHARED, dev-&gt;name, dev)){</div><div class='ctx'>         printk(KERN_WARNING "%s: could not get irq: %d\n", dev-&gt;name, dev-&gt;irq);</div><div class='ctx'>         lmc_trace(dev, "lmc_open irq failed out");</div><div class='ctx'>         return -EAGAIN;</div><div class='head'>diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c<br/>index af8b55fdd9d9..ae01555d24cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_media.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/lmc/lmc_media.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/lmc/lmc_media.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/lmc/lmc_media.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /* $Id: lmc_media.c,v 1.13 2000/04/11 05:25:26 asj Exp $ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='head'>diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c<br/>index cd32751b64eb..e013b817cab8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/n2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/n2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/n2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/n2.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * under the terms of version 2 of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- * For information see http://hq.pm.waw.pl/hdlc/</div><div class='add'>+ * For information see &lt;http://www.kernel.org/pub/linux/utils/net/hdlc/&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Note: integrated CSU/DSU/DDS are not supported by this driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -387,6 +387,11 @@ static int __init n2_run(unsigned long io, unsigned long irq,</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;phy_winbase = winbase;</div><div class='ctx'> 	card-&gt;winbase = ioremap(winbase, USE_WINDOWSIZE);</div><div class='add'>+	if (!card-&gt;winbase) {</div><div class='add'>+		printk(KERN_ERR "n2: ioremap() failed\n");</div><div class='add'>+		n2_destroy_card(card);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	outb(0, io + N2_PCR);</div><div class='ctx'> 	outb(winbase &gt;&gt; 12, io + N2_BAR);</div><div class='head'>diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c<br/>index a3e65d1bc19b..567effff4a3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/pc300_drv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/pc300_drv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/pc300_drv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/pc300_drv.c</a></div><div class='hunk'>@@ -3445,9 +3445,9 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	card = (pc300_t *) kmalloc(sizeof(pc300_t), GFP_KERNEL);</div><div class='ctx'> 	if (card == NULL) {</div><div class='del'>-		printk("PC300 found at RAM 0x%08lx, "</div><div class='add'>+		printk("PC300 found at RAM 0x%016llx, "</div><div class='ctx'> 		       "but could not allocate card structure.\n",</div><div class='del'>-		       pci_resource_start(pdev, 3));</div><div class='add'>+		       (unsigned long long)pci_resource_start(pdev, 3));</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_disable_dev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3600,7 +3600,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate IRQ */</div><div class='del'>-	if (request_irq(card-&gt;hw.irq, cpc_intr, SA_SHIRQ, "Cyclades-PC300", card)) {</div><div class='add'>+	if (request_irq(card-&gt;hw.irq, cpc_intr, IRQF_SHARED, "Cyclades-PC300", card)) {</div><div class='ctx'> 		printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",</div><div class='ctx'> 			 card-&gt;hw.ramphys, card-&gt;hw.irq);</div><div class='ctx'> 		goto err_io_unmap;</div><div class='head'>diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c<br/>index eba8e5cfacc2..4df61fa3214b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/pci200syn.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/pci200syn.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/pci200syn.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/pci200syn.c</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * under the terms of version 2 of the GNU General Public License</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  *</div><div class='del'>- * For information see http://hq.pm.waw.pl/hdlc/</div><div class='add'>+ * For information see &lt;http://www.kernel.org/pub/linux/utils/net/hdlc/&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Sources of information:</div><div class='ctx'>  *    Hitachi HD64572 SCA-II User's Manual</div><div class='hunk'>@@ -50,10 +50,6 @@ static const char* devname = "PCI200SYN";</div><div class='ctx'> static int pci_clock_freq = 33000000;</div><div class='ctx'> #define CLOCK_BASE pci_clock_freq</div><div class='ctx'> </div><div class='del'>-#define PCI_VENDOR_ID_GORAMO	0x10B5	/* uses PLX:9050 ID - this card	*/</div><div class='del'>-#define PCI_DEVICE_ID_PCI200SYN	0x9050	/* doesn't have its own ID	*/</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *      PLX PCI9052 local configuration and shared runtime registers.</div><div class='ctx'>  *      This structure can be used to access 9052 registers (memory mapped).</div><div class='hunk'>@@ -262,7 +258,7 @@ static void pci200_pci_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	card_t *card = pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; 2; i++)</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='ctx'> 		if (card-&gt;ports[i].card) {</div><div class='ctx'> 			struct net_device *dev = port_to_dev(&amp;card-&gt;ports[i]);</div><div class='ctx'> 			unregister_hdlc_device(dev);</div><div class='hunk'>@@ -358,6 +354,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	    card-&gt;rambase == NULL) {</div><div class='ctx'> 		printk(KERN_ERR "pci200syn: ioremap() failed\n");</div><div class='ctx'> 		pci200_pci_remove_one(pdev);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset PLX */</div><div class='hunk'>@@ -385,6 +382,15 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	       " %u RX packets rings\n", ramsize / 1024, ramphys,</div><div class='ctx'> 	       pdev-&gt;irq, card-&gt;tx_ring_buffers, card-&gt;rx_ring_buffers);</div><div class='ctx'> </div><div class='add'>+	if (pdev-&gt;subsystem_device == PCI_DEVICE_ID_PLX_9050) {</div><div class='add'>+		printk(KERN_ERR "Detected PCI200SYN card with old "</div><div class='add'>+		       "configuration data.\n");</div><div class='add'>+		printk(KERN_ERR "See &lt;http://www.kernel.org/pub/"</div><div class='add'>+		       "linux/utils/net/hdlc/pci200syn/&gt; for update.\n");</div><div class='add'>+		printk(KERN_ERR "The card will stop working with"</div><div class='add'>+		       " future versions of Linux if not updated.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (card-&gt;tx_ring_buffers &lt; 1) {</div><div class='ctx'> 		printk(KERN_ERR "pci200syn: RAM test failed\n");</div><div class='ctx'> 		pci200_pci_remove_one(pdev);</div><div class='hunk'>@@ -396,7 +402,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	writew(readw(p) | 0x0040, p);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate IRQ */</div><div class='del'>-	if(request_irq(pdev-&gt;irq, sca_intr, SA_SHIRQ, devname, card)) {</div><div class='add'>+	if (request_irq(pdev-&gt;irq, sca_intr, IRQF_SHARED, devname, card)) {</div><div class='ctx'> 		printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",</div><div class='ctx'> 		       pdev-&gt;irq);</div><div class='ctx'> 		pci200_pci_remove_one(pdev);</div><div class='hunk'>@@ -406,7 +412,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	sca_init(card, 0);</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; 2; i++) {</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		port_t *port = &amp;card-&gt;ports[i];</div><div class='ctx'> 		struct net_device *dev = port_to_dev(port);</div><div class='ctx'> 		hdlc_device *hdlc = dev_to_hdlc(dev);</div><div class='hunk'>@@ -425,7 +431,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		hdlc-&gt;xmit = sca_xmit;</div><div class='ctx'> 		port-&gt;settings.clock_type = CLOCK_EXT;</div><div class='ctx'> 		port-&gt;card = card;</div><div class='del'>-		if(register_hdlc_device(dev)) {</div><div class='add'>+		if (register_hdlc_device(dev)) {</div><div class='ctx'> 			printk(KERN_ERR "pci200syn: unable to register hdlc "</div><div class='ctx'> 			       "device\n");</div><div class='ctx'> 			port-&gt;card = NULL;</div><div class='hunk'>@@ -445,8 +451,10 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id pci200_pci_tbl[] __devinitdata = {</div><div class='del'>-	{ PCI_VENDOR_ID_GORAMO, PCI_DEVICE_ID_PCI200SYN, PCI_ANY_ID,</div><div class='del'>-	  PCI_ANY_ID, 0, 0, 0 },</div><div class='add'>+	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,</div><div class='add'>+	  PCI_DEVICE_ID_PLX_9050, 0, 0, 0 },</div><div class='add'>+	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,</div><div class='add'>+	  PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c<br/>index 175ba13bce41..fc75bec19029 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sbni.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/sbni.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sbni.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/sbni.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'>  *	Known problem: this driver wasn't tested on multiprocessor machine.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='hunk'>@@ -1193,7 +1192,7 @@ sbni_open( struct net_device  *dev )</div><div class='ctx'> 			}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if( request_irq(dev-&gt;irq, sbni_interrupt, SA_SHIRQ, dev-&gt;name, dev) ) {</div><div class='add'>+	if( request_irq(dev-&gt;irq, sbni_interrupt, IRQF_SHARED, dev-&gt;name, dev) ) {</div><div class='ctx'> 		printk( KERN_ERR "%s: unable to get IRQ %d.\n",</div><div class='ctx'> 			dev-&gt;name, dev-&gt;irq );</div><div class='ctx'> 		return  -EAGAIN;</div><div class='head'>diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c<br/>index 22e794071cf4..7628c2d81f45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sdla.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/sdla.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sdla.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/sdla.c</a></div><div class='hunk'>@@ -60,9 +60,9 @@</div><div class='ctx'> </div><div class='ctx'> static const char* version = "SDLA driver v0.30, 12 Sep 1996, mike.mclagan@linux.org";</div><div class='ctx'> </div><div class='del'>-static unsigned int valid_port[] __initdata = { 0x250, 0x270, 0x280, 0x300, 0x350, 0x360, 0x380, 0x390};</div><div class='add'>+static unsigned int valid_port[] = { 0x250, 0x270, 0x280, 0x300, 0x350, 0x360, 0x380, 0x390};</div><div class='ctx'> </div><div class='del'>-static unsigned int valid_mem[]  __initdata = {</div><div class='add'>+static unsigned int valid_mem[] = {</div><div class='ctx'> 				    0xA0000, 0xA2000, 0xA4000, 0xA6000, 0xA8000, 0xAA000, 0xAC000, 0xAE000, </div><div class='ctx'>                                     0xB0000, 0xB2000, 0xB4000, 0xB6000, 0xB8000, 0xBA000, 0xBC000, 0xBE000,</div><div class='ctx'>                                     0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000,</div><div class='head'>diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c<br/>index 050e854e7774..70fb1b98b1dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/sealevel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/sealevel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/sealevel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/sealevel.c</a></div><div class='hunk'>@@ -322,7 +322,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,</div><div class='ctx'> 	/* We want a fast IRQ for this device. Actually we'd like an even faster</div><div class='ctx'> 	   IRQ ;) - This is one driver RtLinux is made for */</div><div class='ctx'>    </div><div class='del'>-	if(request_irq(irq, &amp;z8530_interrupt, SA_INTERRUPT, "SeaLevel", dev)&lt;0)</div><div class='add'>+	if(request_irq(irq, &amp;z8530_interrupt, IRQF_DISABLED, "SeaLevel", dev)&lt;0)</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);</div><div class='ctx'> 		goto fail1_1;</div><div class='head'>diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c<br/>index 2d1bba06a085..c13b459a0137 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/syncppp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/syncppp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/syncppp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/syncppp.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c<br/>index 29a756dd979b..b2031dfc4bb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wan/wanxl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wan/wanxl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wan/wanxl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wan/wanxl.c</a></div><div class='hunk'>@@ -149,7 +149,10 @@ static inline void wanxl_cable_intr(port_t *port)</div><div class='ctx'> 	printk(KERN_INFO "%s: %s%s module, %s cable%s%s\n",</div><div class='ctx'> 	       port-&gt;dev-&gt;name, pm, dte, cable, dsr, dcd);</div><div class='ctx'> </div><div class='del'>-	hdlc_set_carrier(value &amp; STATUS_CABLE_DCD, port-&gt;dev);</div><div class='add'>+	if (value &amp; STATUS_CABLE_DCD)</div><div class='add'>+		netif_carrier_on(port-&gt;dev);</div><div class='add'>+	else</div><div class='add'>+		netif_carrier_off(port-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -634,7 +637,13 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* set up PLX mapping */</div><div class='ctx'> 	plx_phy = pci_resource_start(pdev, 0);</div><div class='add'>+</div><div class='ctx'> 	card-&gt;plx = ioremap_nocache(plx_phy, 0x70);</div><div class='add'>+	if (!card-&gt;plx) {</div><div class='add'>+		printk(KERN_ERR "wanxl: ioremap() failed\n");</div><div class='add'>+ 		wanxl_pci_remove_one(pdev);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #if RESET_WHILE_LOADING</div><div class='ctx'> 	wanxl_reset(card);</div><div class='hunk'>@@ -700,6 +709,12 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mem = ioremap_nocache(mem_phy, PDM_OFFSET + sizeof(firmware));</div><div class='add'>+	if (!mem) {</div><div class='add'>+		printk(KERN_ERR "wanxl: ioremap() failed\n");</div><div class='add'>+ 		wanxl_pci_remove_one(pdev);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; sizeof(firmware); i += 4)</div><div class='ctx'> 		writel(htonl(*(u32*)(firmware + i)), mem + PDM_OFFSET + i);</div><div class='ctx'> </div><div class='hunk'>@@ -743,7 +758,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	       pci_name(pdev), plx_phy, ramsize / 1024, mem_phy, pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate IRQ */</div><div class='del'>-	if (request_irq(pdev-&gt;irq, wanxl_intr, SA_SHIRQ, "wanXL", card)) {</div><div class='add'>+	if (request_irq(pdev-&gt;irq, wanxl_intr, IRQF_SHARED, "wanXL", card)) {</div><div class='ctx'> 		printk(KERN_WARNING "wanXL %s: could not allocate IRQ%i.\n",</div><div class='ctx'> 		       pci_name(pdev), pdev-&gt;irq);</div><div class='ctx'> 		wanxl_pci_remove_one(pdev);</div><div class='head'>diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig<br/>index e0874cbfefea..fa9d2c4edc93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/Kconfig</a></div><div class='hunk'>@@ -235,7 +235,35 @@ config IPW2200_MONITOR</div><div class='ctx'> 	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this</div><div class='ctx'> 	  mode, no packets can be sent.</div><div class='ctx'> </div><div class='del'>-config IPW_QOS</div><div class='add'>+config IPW2200_RADIOTAP</div><div class='add'>+	bool "Enable radiotap format 802.11 raw packet support"</div><div class='add'>+	depends on IPW2200_MONITOR</div><div class='add'>+</div><div class='add'>+config IPW2200_PROMISCUOUS</div><div class='add'>+	bool "Enable creation of a RF radiotap promiscuous interface"</div><div class='add'>+	depends on IPW2200_MONITOR</div><div class='add'>+	select IPW2200_RADIOTAP</div><div class='add'>+	---help---</div><div class='add'>+          Enables the creation of a second interface prefixed 'rtap'. </div><div class='add'>+          This second interface will provide every received in radiotap</div><div class='add'>+	  format.</div><div class='add'>+</div><div class='add'>+          This is useful for performing wireless network analysis while</div><div class='add'>+          maintaining an active association.</div><div class='add'>+</div><div class='add'>+          Example usage:</div><div class='add'>+</div><div class='add'>+            % modprobe ipw2200 rtap_iface=1</div><div class='add'>+            % ifconfig rtap0 up</div><div class='add'>+            % tethereal -i rtap0</div><div class='add'>+</div><div class='add'>+          If you do not specify 'rtap_iface=1' as a module parameter then </div><div class='add'>+          the rtap interface will not be created and you will need to turn </div><div class='add'>+          it on via sysfs:</div><div class='add'>+	</div><div class='add'>+            % echo 1 &gt; /sys/bus/pci/drivers/ipw2200/*/rtap_iface</div><div class='add'>+</div><div class='add'>+config IPW2200_QOS</div><div class='ctx'>         bool "Enable QoS support"</div><div class='ctx'>         depends on IPW2200 &amp;&amp; EXPERIMENTAL</div><div class='ctx'> </div><div class='hunk'>@@ -503,8 +531,26 @@ config PRISM54</div><div class='ctx'> 	  say M here and read &lt;file:Documentation/modules.txt&gt;.  The module</div><div class='ctx'> 	  will be called prism54.ko.</div><div class='ctx'> </div><div class='add'>+config USB_ZD1201</div><div class='add'>+	tristate "USB ZD1201 based Wireless device support"</div><div class='add'>+	depends on USB &amp;&amp; NET_RADIO</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y if you want to use wireless LAN adapters based on the ZyDAS</div><div class='add'>+	  ZD1201 chip.</div><div class='add'>+</div><div class='add'>+	  This driver makes the adapter appear as a normal Ethernet interface,</div><div class='add'>+	  typically on wlan0.</div><div class='add'>+</div><div class='add'>+	  The zd1201 device requires external firmware to be loaded.</div><div class='add'>+	  This can be found at http://linux-lc100020.sourceforge.net/</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called zd1201.</div><div class='add'>+</div><div class='ctx'> source "drivers/net/wireless/hostap/Kconfig"</div><div class='ctx'> source "drivers/net/wireless/bcm43xx/Kconfig"</div><div class='add'>+source "drivers/net/wireless/zd1211rw/Kconfig"</div><div class='ctx'> </div><div class='ctx'> # yes, this works even when no drivers are selected</div><div class='ctx'> config NET_WIRELESS</div><div class='head'>diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile<br/>index c86779879361..c613af17a159 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/Makefile</a></div><div class='hunk'>@@ -36,7 +36,10 @@ obj-$(CONFIG_PRISM54)		+= prism54/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_HOSTAP)		+= hostap/</div><div class='ctx'> obj-$(CONFIG_BCM43XX)		+= bcm43xx/</div><div class='add'>+obj-$(CONFIG_ZD1211RW)		+= zd1211rw/</div><div class='ctx'> </div><div class='ctx'> # 16-bit wireless PCMCIA client drivers</div><div class='ctx'> obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_USB_ZD1201)	+= zd1201.o</div><div class='head'>diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c<br/>index 00764ddd74d8..a4dd13942714 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/airo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/airo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/airo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/airo.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -47,6 +46,7 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "airo.h"</div><div class='ctx'> </div><div class='hunk'>@@ -467,6 +467,8 @@ static int do8bitIO = 0;</div><div class='ctx'> #define RID_ECHOTEST_RESULTS 0xFF71</div><div class='ctx'> #define RID_BSSLISTFIRST 0xFF72</div><div class='ctx'> #define RID_BSSLISTNEXT  0xFF73</div><div class='add'>+#define RID_WPA_BSSLISTFIRST 0xFF74</div><div class='add'>+#define RID_WPA_BSSLISTNEXT  0xFF75</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> 	u16 cmd;</div><div class='hunk'>@@ -739,6 +741,14 @@ typedef struct {</div><div class='ctx'> 	u16 extSoftCap;</div><div class='ctx'> } CapabilityRid;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/* Only present on firmware &gt;= 5.30.17 */</div><div class='add'>+typedef struct {</div><div class='add'>+  u16 unknown[4];</div><div class='add'>+  u8 fixed[12]; /* WLAN management frame */</div><div class='add'>+  u8 iep[624];</div><div class='add'>+} BSSListRidExtra;</div><div class='add'>+</div><div class='ctx'> typedef struct {</div><div class='ctx'>   u16 len;</div><div class='ctx'>   u16 index; /* First is 0 and 0xffff means end of list */</div><div class='hunk'>@@ -767,6 +777,9 @@ typedef struct {</div><div class='ctx'>   } fh;</div><div class='ctx'>   u16 dsChannel;</div><div class='ctx'>   u16 atimWindow;</div><div class='add'>+</div><div class='add'>+  /* Only present on firmware &gt;= 5.30.17 */</div><div class='add'>+  BSSListRidExtra extra;</div><div class='ctx'> } BSSListRid;</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='hunk'>@@ -1140,8 +1153,6 @@ struct airo_info {</div><div class='ctx'> 	char defindex; // Used with auto wep</div><div class='ctx'> 	struct proc_dir_entry *proc_entry;</div><div class='ctx'>         spinlock_t aux_lock;</div><div class='del'>-        unsigned long flags;</div><div class='del'>-#define FLAG_PROMISC	8	/* IFF_PROMISC 0x100 - include/linux/if.h */</div><div class='ctx'> #define FLAG_RADIO_OFF	0	/* User disabling of MAC */</div><div class='ctx'> #define FLAG_RADIO_DOWN	1	/* ifup/ifdown disabling of MAC */</div><div class='ctx'> #define FLAG_RADIO_MASK 0x03</div><div class='hunk'>@@ -1151,6 +1162,7 @@ struct airo_info {</div><div class='ctx'> #define FLAG_UPDATE_MULTI 5</div><div class='ctx'> #define FLAG_UPDATE_UNI 6</div><div class='ctx'> #define FLAG_802_11	7</div><div class='add'>+#define FLAG_PROMISC	8	/* IFF_PROMISC 0x100 - include/linux/if.h */</div><div class='ctx'> #define FLAG_PENDING_XMIT 9</div><div class='ctx'> #define FLAG_PENDING_XMIT11 10</div><div class='ctx'> #define FLAG_MPI	11</div><div class='hunk'>@@ -1158,17 +1170,19 @@ struct airo_info {</div><div class='ctx'> #define FLAG_COMMIT	13</div><div class='ctx'> #define FLAG_RESET	14</div><div class='ctx'> #define FLAG_FLASHING	15</div><div class='del'>-#define JOB_MASK	0x2ff0000</div><div class='del'>-#define JOB_DIE		16</div><div class='del'>-#define JOB_XMIT	17</div><div class='del'>-#define JOB_XMIT11	18</div><div class='del'>-#define JOB_STATS	19</div><div class='del'>-#define JOB_PROMISC	20</div><div class='del'>-#define JOB_MIC		21</div><div class='del'>-#define JOB_EVENT	22</div><div class='del'>-#define JOB_AUTOWEP	23</div><div class='del'>-#define JOB_WSTATS	24</div><div class='del'>-#define JOB_SCAN_RESULTS  25</div><div class='add'>+#define FLAG_WPA_CAPABLE	16</div><div class='add'>+	unsigned long flags;</div><div class='add'>+#define JOB_DIE	0</div><div class='add'>+#define JOB_XMIT	1</div><div class='add'>+#define JOB_XMIT11	2</div><div class='add'>+#define JOB_STATS	3</div><div class='add'>+#define JOB_PROMISC	4</div><div class='add'>+#define JOB_MIC	5</div><div class='add'>+#define JOB_EVENT	6</div><div class='add'>+#define JOB_AUTOWEP	7</div><div class='add'>+#define JOB_WSTATS	8</div><div class='add'>+#define JOB_SCAN_RESULTS  9</div><div class='add'>+	unsigned long jobs;</div><div class='ctx'> 	int (*bap_read)(struct airo_info*, u16 *pu16Dst, int bytelen,</div><div class='ctx'> 			int whichbap);</div><div class='ctx'> 	unsigned short *flash;</div><div class='hunk'>@@ -1208,6 +1222,11 @@ struct airo_info {</div><div class='ctx'> #define	PCI_SHARED_LEN		2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE</div><div class='ctx'> 	char			proc_name[IFNAMSIZ];</div><div class='ctx'> </div><div class='add'>+	/* WPA-related stuff */</div><div class='add'>+	unsigned int bssListFirst;</div><div class='add'>+	unsigned int bssListNext;</div><div class='add'>+	unsigned int bssListRidLen;</div><div class='add'>+</div><div class='ctx'> 	struct list_head network_list;</div><div class='ctx'> 	struct list_head network_free_list;</div><div class='ctx'> 	BSSListElement *networks;</div><div class='hunk'>@@ -1264,7 +1283,7 @@ static void micinit(struct airo_info *ai)</div><div class='ctx'> {</div><div class='ctx'> 	MICRid mic_rid;</div><div class='ctx'> </div><div class='del'>-	clear_bit(JOB_MIC, &amp;ai-&gt;flags);</div><div class='add'>+	clear_bit(JOB_MIC, &amp;ai-&gt;jobs);</div><div class='ctx'> 	PC4500_readrid(ai, RID_MIC, &amp;mic_rid, sizeof(mic_rid), 0);</div><div class='ctx'> 	up(&amp;ai-&gt;sem);</div><div class='ctx'> </div><div class='hunk'>@@ -1705,24 +1724,24 @@ static void emmh32_final(emmh32_context *context, u8 digest[4])</div><div class='ctx'> static int readBSSListRid(struct airo_info *ai, int first,</div><div class='ctx'> 		      BSSListRid *list) {</div><div class='ctx'> 	int rc;</div><div class='del'>-			Cmd cmd;</div><div class='del'>-			Resp rsp;</div><div class='add'>+	Cmd cmd;</div><div class='add'>+	Resp rsp;</div><div class='ctx'> </div><div class='ctx'> 	if (first == 1) {</div><div class='del'>-			if (ai-&gt;flags &amp; FLAG_RADIO_MASK) return -ENETDOWN;</div><div class='del'>-			memset(&amp;cmd, 0, sizeof(cmd));</div><div class='del'>-			cmd.cmd=CMD_LISTBSS;</div><div class='del'>-			if (down_interruptible(&amp;ai-&gt;sem))</div><div class='del'>-				return -ERESTARTSYS;</div><div class='del'>-			issuecommand(ai, &amp;cmd, &amp;rsp);</div><div class='del'>-			up(&amp;ai-&gt;sem);</div><div class='del'>-			/* Let the command take effect */</div><div class='del'>-			ai-&gt;task = current;</div><div class='del'>-			ssleep(3);</div><div class='del'>-			ai-&gt;task = NULL;</div><div class='del'>-		}</div><div class='del'>-	rc = PC4500_readrid(ai, first ? RID_BSSLISTFIRST : RID_BSSLISTNEXT,</div><div class='del'>-			    list, sizeof(*list), 1);</div><div class='add'>+		if (ai-&gt;flags &amp; FLAG_RADIO_MASK) return -ENETDOWN;</div><div class='add'>+		memset(&amp;cmd, 0, sizeof(cmd));</div><div class='add'>+		cmd.cmd=CMD_LISTBSS;</div><div class='add'>+		if (down_interruptible(&amp;ai-&gt;sem))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		issuecommand(ai, &amp;cmd, &amp;rsp);</div><div class='add'>+		up(&amp;ai-&gt;sem);</div><div class='add'>+		/* Let the command take effect */</div><div class='add'>+		ai-&gt;task = current;</div><div class='add'>+		ssleep(3);</div><div class='add'>+		ai-&gt;task = NULL;</div><div class='add'>+	}</div><div class='add'>+	rc = PC4500_readrid(ai, first ? ai-&gt;bssListFirst : ai-&gt;bssListNext,</div><div class='add'>+			    list, ai-&gt;bssListRidLen, 1);</div><div class='ctx'> </div><div class='ctx'> 	list-&gt;len = le16_to_cpu(list-&gt;len);</div><div class='ctx'> 	list-&gt;index = le16_to_cpu(list-&gt;index);</div><div class='hunk'>@@ -2112,7 +2131,7 @@ static void airo_end_xmit(struct net_device *dev) {</div><div class='ctx'> 	int fid = priv-&gt;xmit.fid;</div><div class='ctx'> 	u32 *fids = priv-&gt;fids;</div><div class='ctx'> </div><div class='del'>-	clear_bit(JOB_XMIT, &amp;priv-&gt;flags);</div><div class='add'>+	clear_bit(JOB_XMIT, &amp;priv-&gt;jobs);</div><div class='ctx'> 	clear_bit(FLAG_PENDING_XMIT, &amp;priv-&gt;flags);</div><div class='ctx'> 	status = transmit_802_3_packet (priv, fids[fid], skb-&gt;data);</div><div class='ctx'> 	up(&amp;priv-&gt;sem);</div><div class='hunk'>@@ -2162,7 +2181,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {</div><div class='ctx'> 	if (down_trylock(&amp;priv-&gt;sem) != 0) {</div><div class='ctx'> 		set_bit(FLAG_PENDING_XMIT, &amp;priv-&gt;flags);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-		set_bit(JOB_XMIT, &amp;priv-&gt;flags);</div><div class='add'>+		set_bit(JOB_XMIT, &amp;priv-&gt;jobs);</div><div class='ctx'> 		wake_up_interruptible(&amp;priv-&gt;thr_wait);</div><div class='ctx'> 	} else</div><div class='ctx'> 		airo_end_xmit(dev);</div><div class='hunk'>@@ -2177,7 +2196,7 @@ static void airo_end_xmit11(struct net_device *dev) {</div><div class='ctx'> 	int fid = priv-&gt;xmit11.fid;</div><div class='ctx'> 	u32 *fids = priv-&gt;fids;</div><div class='ctx'> </div><div class='del'>-	clear_bit(JOB_XMIT11, &amp;priv-&gt;flags);</div><div class='add'>+	clear_bit(JOB_XMIT11, &amp;priv-&gt;jobs);</div><div class='ctx'> 	clear_bit(FLAG_PENDING_XMIT11, &amp;priv-&gt;flags);</div><div class='ctx'> 	status = transmit_802_11_packet (priv, fids[fid], skb-&gt;data);</div><div class='ctx'> 	up(&amp;priv-&gt;sem);</div><div class='hunk'>@@ -2233,7 +2252,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {</div><div class='ctx'> 	if (down_trylock(&amp;priv-&gt;sem) != 0) {</div><div class='ctx'> 		set_bit(FLAG_PENDING_XMIT11, &amp;priv-&gt;flags);</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-		set_bit(JOB_XMIT11, &amp;priv-&gt;flags);</div><div class='add'>+		set_bit(JOB_XMIT11, &amp;priv-&gt;jobs);</div><div class='ctx'> 		wake_up_interruptible(&amp;priv-&gt;thr_wait);</div><div class='ctx'> 	} else</div><div class='ctx'> 		airo_end_xmit11(dev);</div><div class='hunk'>@@ -2244,7 +2263,7 @@ static void airo_read_stats(struct airo_info *ai) {</div><div class='ctx'> 	StatsRid stats_rid;</div><div class='ctx'> 	u32 *vals = stats_rid.vals;</div><div class='ctx'> </div><div class='del'>-	clear_bit(JOB_STATS, &amp;ai-&gt;flags);</div><div class='add'>+	clear_bit(JOB_STATS, &amp;ai-&gt;jobs);</div><div class='ctx'> 	if (ai-&gt;power.event) {</div><div class='ctx'> 		up(&amp;ai-&gt;sem);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2272,10 +2291,10 @@ static struct net_device_stats *airo_get_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct airo_info *local =  dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(JOB_STATS, &amp;local-&gt;flags)) {</div><div class='add'>+	if (!test_bit(JOB_STATS, &amp;local-&gt;jobs)) {</div><div class='ctx'> 		/* Get stats out of the card if available */</div><div class='ctx'> 		if (down_trylock(&amp;local-&gt;sem) != 0) {</div><div class='del'>-			set_bit(JOB_STATS, &amp;local-&gt;flags);</div><div class='add'>+			set_bit(JOB_STATS, &amp;local-&gt;jobs);</div><div class='ctx'> 			wake_up_interruptible(&amp;local-&gt;thr_wait);</div><div class='ctx'> 		} else</div><div class='ctx'> 			airo_read_stats(local);</div><div class='hunk'>@@ -2290,7 +2309,7 @@ static void airo_set_promisc(struct airo_info *ai) {</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;cmd, 0, sizeof(cmd));</div><div class='ctx'> 	cmd.cmd=CMD_SETMODE;</div><div class='del'>-	clear_bit(JOB_PROMISC, &amp;ai-&gt;flags);</div><div class='add'>+	clear_bit(JOB_PROMISC, &amp;ai-&gt;jobs);</div><div class='ctx'> 	cmd.parm0=(ai-&gt;flags&amp;IFF_PROMISC) ? PROMISC : NOPROMISC;</div><div class='ctx'> 	issuecommand(ai, &amp;cmd, &amp;rsp);</div><div class='ctx'> 	up(&amp;ai-&gt;sem);</div><div class='hunk'>@@ -2302,7 +2321,7 @@ static void airo_set_multicast_list(struct net_device *dev) {</div><div class='ctx'> 	if ((dev-&gt;flags ^ ai-&gt;flags) &amp; IFF_PROMISC) {</div><div class='ctx'> 		change_bit(FLAG_PROMISC, &amp;ai-&gt;flags);</div><div class='ctx'> 		if (down_trylock(&amp;ai-&gt;sem) != 0) {</div><div class='del'>-			set_bit(JOB_PROMISC, &amp;ai-&gt;flags);</div><div class='add'>+			set_bit(JOB_PROMISC, &amp;ai-&gt;jobs);</div><div class='ctx'> 			wake_up_interruptible(&amp;ai-&gt;thr_wait);</div><div class='ctx'> 		} else</div><div class='ctx'> 			airo_set_promisc(ai);</div><div class='hunk'>@@ -2380,7 +2399,7 @@ void stop_airo_card( struct net_device *dev, int freeres )</div><div class='ctx'> 		}</div><div class='ctx'> 		clear_bit(FLAG_REGISTERED, &amp;ai-&gt;flags);</div><div class='ctx'> 	}</div><div class='del'>-	set_bit(JOB_DIE, &amp;ai-&gt;flags);</div><div class='add'>+	set_bit(JOB_DIE, &amp;ai-&gt;jobs);</div><div class='ctx'> 	kill_proc(ai-&gt;thr_pid, SIGTERM, 1);</div><div class='ctx'> 	wait_for_completion(&amp;ai-&gt;thr_exited);</div><div class='ctx'> </div><div class='hunk'>@@ -2701,14 +2720,14 @@ static int reset_card( struct net_device *dev , int lock) {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MAX_NETWORK_COUNT	64</div><div class='add'>+#define AIRO_MAX_NETWORK_COUNT	64</div><div class='ctx'> static int airo_networks_allocate(struct airo_info *ai)</div><div class='ctx'> {</div><div class='ctx'> 	if (ai-&gt;networks)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ai-&gt;networks =</div><div class='del'>-	    kzalloc(MAX_NETWORK_COUNT * sizeof(BSSListElement),</div><div class='add'>+	    kzalloc(AIRO_MAX_NETWORK_COUNT * sizeof(BSSListElement),</div><div class='ctx'> 		    GFP_KERNEL);</div><div class='ctx'> 	if (!ai-&gt;networks) {</div><div class='ctx'> 		airo_print_warn(ai-&gt;dev-&gt;name, "Out of memory allocating beacons");</div><div class='hunk'>@@ -2732,11 +2751,33 @@ static void airo_networks_initialize(struct airo_info *ai)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ai-&gt;network_free_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ai-&gt;network_list);</div><div class='del'>-	for (i = 0; i &lt; MAX_NETWORK_COUNT; i++)</div><div class='add'>+	for (i = 0; i &lt; AIRO_MAX_NETWORK_COUNT; i++)</div><div class='ctx'> 		list_add_tail(&amp;ai-&gt;networks[i].list,</div><div class='ctx'> 			      &amp;ai-&gt;network_free_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int airo_test_wpa_capable(struct airo_info *ai)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	CapabilityRid cap_rid;</div><div class='add'>+	const char *name = ai-&gt;dev-&gt;name;</div><div class='add'>+</div><div class='add'>+	status = readCapabilityRid(ai, &amp;cap_rid, 1);</div><div class='add'>+	if (status != SUCCESS) return 0;</div><div class='add'>+</div><div class='add'>+	/* Only firmware versions 5.30.17 or better can do WPA */</div><div class='add'>+	if ((cap_rid.softVer &gt; 0x530)</div><div class='add'>+	  || ((cap_rid.softVer == 0x530) &amp;&amp; (cap_rid.softSubVer &gt;= 17))) {</div><div class='add'>+		airo_print_info(name, "WPA is supported.");</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No WPA support */</div><div class='add'>+	airo_print_info(name, "WPA unsupported (only firmware versions 5.30.17"</div><div class='add'>+		" and greater support WPA.  Detected %s)", cap_rid.prodVer);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct net_device *_init_airo_card( unsigned short irq, int port,</div><div class='ctx'> 					   int is_pcmcia, struct pci_dev *pci,</div><div class='ctx'> 					   struct device *dmdev )</div><div class='hunk'>@@ -2759,6 +2800,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,</div><div class='ctx'> 	ai = dev-&gt;priv;</div><div class='ctx'> 	ai-&gt;wifidev = NULL;</div><div class='ctx'> 	ai-&gt;flags = 0;</div><div class='add'>+	ai-&gt;jobs = 0;</div><div class='ctx'> 	ai-&gt;dev = dev;</div><div class='ctx'> 	if (pci &amp;&amp; (pci-&gt;device == 0x5000 || pci-&gt;device == 0xa504)) {</div><div class='ctx'> 		airo_print_dbg(dev-&gt;name, "Found an MPI350 card");</div><div class='hunk'>@@ -2806,7 +2848,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,</div><div class='ctx'> 	reset_card (dev, 1);</div><div class='ctx'> 	msleep(400);</div><div class='ctx'> </div><div class='del'>-	rc = request_irq( dev-&gt;irq, airo_interrupt, SA_SHIRQ, dev-&gt;name, dev );</div><div class='add'>+	rc = request_irq( dev-&gt;irq, airo_interrupt, IRQF_SHARED, dev-&gt;name, dev );</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		airo_print_err(dev-&gt;name, "register interrupt %d failed, rc %d",</div><div class='ctx'> 				irq, rc);</div><div class='hunk'>@@ -2838,6 +2880,18 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,</div><div class='ctx'> 		set_bit(FLAG_FLASHING, &amp;ai-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Test for WPA support */</div><div class='add'>+	if (airo_test_wpa_capable(ai)) {</div><div class='add'>+		set_bit(FLAG_WPA_CAPABLE, &amp;ai-&gt;flags);</div><div class='add'>+		ai-&gt;bssListFirst = RID_WPA_BSSLISTFIRST;</div><div class='add'>+		ai-&gt;bssListNext = RID_WPA_BSSLISTNEXT;</div><div class='add'>+		ai-&gt;bssListRidLen = sizeof(BSSListRid);</div><div class='add'>+	} else {</div><div class='add'>+		ai-&gt;bssListFirst = RID_BSSLISTFIRST;</div><div class='add'>+		ai-&gt;bssListNext = RID_BSSLISTNEXT;</div><div class='add'>+		ai-&gt;bssListRidLen = sizeof(BSSListRid) - sizeof(BSSListRidExtra);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = register_netdev(dev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		airo_print_err(dev-&gt;name, "Couldn't register_netdev");</div><div class='hunk'>@@ -2875,7 +2929,7 @@ err_out_irq:</div><div class='ctx'> err_out_unlink:</div><div class='ctx'> 	del_airo_dev(dev);</div><div class='ctx'> err_out_thr:</div><div class='del'>-	set_bit(JOB_DIE, &amp;ai-&gt;flags);</div><div class='add'>+	set_bit(JOB_DIE, &amp;ai-&gt;jobs);</div><div class='ctx'> 	kill_proc(ai-&gt;thr_pid, SIGTERM, 1);</div><div class='ctx'> 	wait_for_completion(&amp;ai-&gt;thr_exited);</div><div class='ctx'> err_out_free:</div><div class='hunk'>@@ -2933,7 +2987,7 @@ static void airo_send_event(struct net_device *dev) {</div><div class='ctx'> 	union iwreq_data wrqu;</div><div class='ctx'> 	StatusRid status_rid;</div><div class='ctx'> </div><div class='del'>-	clear_bit(JOB_EVENT, &amp;ai-&gt;flags);</div><div class='add'>+	clear_bit(JOB_EVENT, &amp;ai-&gt;jobs);</div><div class='ctx'> 	PC4500_readrid(ai, RID_STATUS, &amp;status_rid, sizeof(status_rid), 0);</div><div class='ctx'> 	up(&amp;ai-&gt;sem);</div><div class='ctx'> 	wrqu.data.length = 0;</div><div class='hunk'>@@ -2947,7 +3001,7 @@ static void airo_send_event(struct net_device *dev) {</div><div class='ctx'> </div><div class='ctx'> static void airo_process_scan_results (struct airo_info *ai) {</div><div class='ctx'> 	union iwreq_data	wrqu;</div><div class='del'>-	BSSListRid BSSList;</div><div class='add'>+	BSSListRid bss;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	BSSListElement * loop_net;</div><div class='ctx'> 	BSSListElement * tmp_net;</div><div class='hunk'>@@ -2960,15 +3014,15 @@ static void airo_process_scan_results (struct airo_info *ai) {</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Try to read the first entry of the scan result */</div><div class='del'>-	rc = PC4500_readrid(ai, RID_BSSLISTFIRST, &amp;BSSList, sizeof(BSSList), 0);</div><div class='del'>-	if((rc) || (BSSList.index == 0xffff)) {</div><div class='add'>+	rc = PC4500_readrid(ai, ai-&gt;bssListFirst, &amp;bss, ai-&gt;bssListRidLen, 0);</div><div class='add'>+	if((rc) || (bss.index == 0xffff)) {</div><div class='ctx'> 		/* No scan results */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read and parse all entries */</div><div class='ctx'> 	tmp_net = NULL;</div><div class='del'>-	while((!rc) &amp;&amp; (BSSList.index != 0xffff)) {</div><div class='add'>+	while((!rc) &amp;&amp; (bss.index != 0xffff)) {</div><div class='ctx'> 		/* Grab a network off the free list */</div><div class='ctx'> 		if (!list_empty(&amp;ai-&gt;network_free_list)) {</div><div class='ctx'> 			tmp_net = list_entry(ai-&gt;network_free_list.next,</div><div class='hunk'>@@ -2977,19 +3031,19 @@ static void airo_process_scan_results (struct airo_info *ai) {</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (tmp_net != NULL) {</div><div class='del'>-			memcpy(tmp_net, &amp;BSSList, sizeof(tmp_net-&gt;bss));</div><div class='add'>+			memcpy(tmp_net, &amp;bss, sizeof(tmp_net-&gt;bss));</div><div class='ctx'> 			list_add_tail(&amp;tmp_net-&gt;list, &amp;ai-&gt;network_list);</div><div class='ctx'> 			tmp_net = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Read next entry */</div><div class='del'>-		rc = PC4500_readrid(ai, RID_BSSLISTNEXT,</div><div class='del'>-				    &amp;BSSList, sizeof(BSSList), 0);</div><div class='add'>+		rc = PC4500_readrid(ai, ai-&gt;bssListNext,</div><div class='add'>+				    &amp;bss, ai-&gt;bssListRidLen, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	ai-&gt;scan_timeout = 0;</div><div class='del'>-	clear_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;flags);</div><div class='add'>+	clear_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;jobs);</div><div class='ctx'> 	up(&amp;ai-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> 	/* Send an empty event to user space.</div><div class='hunk'>@@ -3019,10 +3073,10 @@ static int airo_thread(void *data) {</div><div class='ctx'> 		/* make swsusp happy with our thread */</div><div class='ctx'> 		try_to_freeze();</div><div class='ctx'> </div><div class='del'>-		if (test_bit(JOB_DIE, &amp;ai-&gt;flags))</div><div class='add'>+		if (test_bit(JOB_DIE, &amp;ai-&gt;jobs))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (ai-&gt;flags &amp; JOB_MASK) {</div><div class='add'>+		if (ai-&gt;jobs) {</div><div class='ctx'> 			locked = down_interruptible(&amp;ai-&gt;sem);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			wait_queue_t wait;</div><div class='hunk'>@@ -3031,16 +3085,16 @@ static int airo_thread(void *data) {</div><div class='ctx'> 			add_wait_queue(&amp;ai-&gt;thr_wait, &amp;wait);</div><div class='ctx'> 			for (;;) {</div><div class='ctx'> 				set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-				if (ai-&gt;flags &amp; JOB_MASK)</div><div class='add'>+				if (ai-&gt;jobs)</div><div class='ctx'> 					break;</div><div class='ctx'> 				if (ai-&gt;expires || ai-&gt;scan_timeout) {</div><div class='ctx'> 					if (ai-&gt;scan_timeout &amp;&amp;</div><div class='ctx'> 							time_after_eq(jiffies,ai-&gt;scan_timeout)){</div><div class='del'>-						set_bit(JOB_SCAN_RESULTS,&amp;ai-&gt;flags);</div><div class='add'>+						set_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;jobs);</div><div class='ctx'> 						break;</div><div class='ctx'> 					} else if (ai-&gt;expires &amp;&amp;</div><div class='ctx'> 							time_after_eq(jiffies,ai-&gt;expires)){</div><div class='del'>-						set_bit(JOB_AUTOWEP,&amp;ai-&gt;flags);</div><div class='add'>+						set_bit(JOB_AUTOWEP, &amp;ai-&gt;jobs);</div><div class='ctx'> 						break;</div><div class='ctx'> 					}</div><div class='ctx'> 					if (!signal_pending(current)) {</div><div class='hunk'>@@ -3069,7 +3123,7 @@ static int airo_thread(void *data) {</div><div class='ctx'> 		if (locked)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (test_bit(JOB_DIE, &amp;ai-&gt;flags)) {</div><div class='add'>+		if (test_bit(JOB_DIE, &amp;ai-&gt;jobs)) {</div><div class='ctx'> 			up(&amp;ai-&gt;sem);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3079,23 +3133,23 @@ static int airo_thread(void *data) {</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (test_bit(JOB_XMIT, &amp;ai-&gt;flags))</div><div class='add'>+		if (test_bit(JOB_XMIT, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_end_xmit(dev);</div><div class='del'>-		else if (test_bit(JOB_XMIT11, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_XMIT11, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_end_xmit11(dev);</div><div class='del'>-		else if (test_bit(JOB_STATS, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_STATS, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_read_stats(ai);</div><div class='del'>-		else if (test_bit(JOB_WSTATS, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_WSTATS, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_read_wireless_stats(ai);</div><div class='del'>-		else if (test_bit(JOB_PROMISC, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_PROMISC, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_set_promisc(ai);</div><div class='del'>-		else if (test_bit(JOB_MIC, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_MIC, &amp;ai-&gt;jobs))</div><div class='ctx'> 			micinit(ai);</div><div class='del'>-		else if (test_bit(JOB_EVENT, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_EVENT, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_send_event(dev);</div><div class='del'>-		else if (test_bit(JOB_AUTOWEP, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_AUTOWEP, &amp;ai-&gt;jobs))</div><div class='ctx'> 			timer_func(dev);</div><div class='del'>-		else if (test_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;flags))</div><div class='add'>+		else if (test_bit(JOB_SCAN_RESULTS, &amp;ai-&gt;jobs))</div><div class='ctx'> 			airo_process_scan_results(ai);</div><div class='ctx'> 		else  /* Shouldn't get here, but we make sure to unlock */</div><div class='ctx'> 			up(&amp;ai-&gt;sem);</div><div class='hunk'>@@ -3133,7 +3187,7 @@ static irqreturn_t airo_interrupt ( int irq, void* dev_id, struct pt_regs *regs)</div><div class='ctx'> 		if ( status &amp; EV_MIC ) {</div><div class='ctx'> 			OUT4500( apriv, EVACK, EV_MIC );</div><div class='ctx'> 			if (test_bit(FLAG_MIC_CAPABLE, &amp;apriv-&gt;flags)) {</div><div class='del'>-				set_bit(JOB_MIC, &amp;apriv-&gt;flags);</div><div class='add'>+				set_bit(JOB_MIC, &amp;apriv-&gt;jobs);</div><div class='ctx'> 				wake_up_interruptible(&amp;apriv-&gt;thr_wait);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3187,7 +3241,7 @@ static irqreturn_t airo_interrupt ( int irq, void* dev_id, struct pt_regs *regs)</div><div class='ctx'> 				set_bit(FLAG_UPDATE_MULTI, &amp;apriv-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 				if (down_trylock(&amp;apriv-&gt;sem) != 0) {</div><div class='del'>-					set_bit(JOB_EVENT, &amp;apriv-&gt;flags);</div><div class='add'>+					set_bit(JOB_EVENT, &amp;apriv-&gt;jobs);</div><div class='ctx'> 					wake_up_interruptible(&amp;apriv-&gt;thr_wait);</div><div class='ctx'> 				} else</div><div class='ctx'> 					airo_send_event(dev);</div><div class='hunk'>@@ -5485,7 +5539,7 @@ static void timer_func( struct net_device *dev ) {</div><div class='ctx'> 	up(&amp;apriv-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> /* Schedule check to see if the change worked */</div><div class='del'>-	clear_bit(JOB_AUTOWEP, &amp;apriv-&gt;flags);</div><div class='add'>+	clear_bit(JOB_AUTOWEP, &amp;apriv-&gt;jobs);</div><div class='ctx'> 	apriv-&gt;expires = RUN_AT(HZ*3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6876,7 +6930,7 @@ static int airo_get_range(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	range-&gt;num_txpower = i;</div><div class='ctx'> 	range-&gt;txpower_capa = IW_TXPOW_MWATT;</div><div class='del'>-	range-&gt;we_version_source = 12;</div><div class='add'>+	range-&gt;we_version_source = 19;</div><div class='ctx'> 	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='ctx'> 	range-&gt;retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME;</div><div class='ctx'> 	range-&gt;retry_flags = IW_RETRY_LIMIT;</div><div class='hunk'>@@ -7152,6 +7206,7 @@ static inline char *airo_translate_scan(struct net_device *dev,</div><div class='ctx'> 	u16			capabilities;</div><div class='ctx'> 	char *			current_val;	/* For rates */</div><div class='ctx'> 	int			i;</div><div class='add'>+	char *		buf;</div><div class='ctx'> </div><div class='ctx'> 	/* First entry *MUST* be the AP MAC address */</div><div class='ctx'> 	iwe.cmd = SIOCGIWAP;</div><div class='hunk'>@@ -7238,8 +7293,69 @@ static inline char *airo_translate_scan(struct net_device *dev,</div><div class='ctx'> 	if((current_val - current_ev) &gt; IW_EV_LCP_LEN)</div><div class='ctx'> 		current_ev = current_val;</div><div class='ctx'> </div><div class='del'>-	/* The other data in the scan result are not really</div><div class='del'>-	 * interesting, so for now drop it - Jean II */</div><div class='add'>+	/* Beacon interval */</div><div class='add'>+	buf = kmalloc(30, GFP_KERNEL);</div><div class='add'>+	if (buf) {</div><div class='add'>+		iwe.cmd = IWEVCUSTOM;</div><div class='add'>+		sprintf(buf, "bcn_int=%d", bss-&gt;beaconInterval);</div><div class='add'>+		iwe.u.data.length = strlen(buf);</div><div class='add'>+		current_ev = iwe_stream_add_point(current_ev, end_buf, &amp;iwe, buf);</div><div class='add'>+		kfree(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Put WPA/RSN Information Elements into the event stream */</div><div class='add'>+	if (test_bit(FLAG_WPA_CAPABLE, &amp;ai-&gt;flags)) {</div><div class='add'>+		unsigned int num_null_ies = 0;</div><div class='add'>+		u16 length = sizeof (bss-&gt;extra.iep);</div><div class='add'>+		struct ieee80211_info_element *info_element =</div><div class='add'>+			(struct ieee80211_info_element *) &amp;bss-&gt;extra.iep;</div><div class='add'>+</div><div class='add'>+		while ((length &gt;= sizeof(*info_element)) &amp;&amp; (num_null_ies &lt; 2)) {</div><div class='add'>+			if (sizeof(*info_element) + info_element-&gt;len &gt; length) {</div><div class='add'>+				/* Invalid element, don't continue parsing IE */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			switch (info_element-&gt;id) {</div><div class='add'>+			case MFIE_TYPE_SSID:</div><div class='add'>+				/* Two zero-length SSID elements</div><div class='add'>+				 * mean we're done parsing elements */</div><div class='add'>+				if (!info_element-&gt;len)</div><div class='add'>+					num_null_ies++;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case MFIE_TYPE_GENERIC:</div><div class='add'>+				if (info_element-&gt;len &gt;= 4 &amp;&amp;</div><div class='add'>+				    info_element-&gt;data[0] == 0x00 &amp;&amp;</div><div class='add'>+				    info_element-&gt;data[1] == 0x50 &amp;&amp;</div><div class='add'>+				    info_element-&gt;data[2] == 0xf2 &amp;&amp;</div><div class='add'>+				    info_element-&gt;data[3] == 0x01) {</div><div class='add'>+					iwe.cmd = IWEVGENIE;</div><div class='add'>+					iwe.u.data.length = min(info_element-&gt;len + 2,</div><div class='add'>+								  MAX_WPA_IE_LEN);</div><div class='add'>+					current_ev = iwe_stream_add_point(current_ev, end_buf,</div><div class='add'>+							&amp;iwe, (char *) info_element);</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case MFIE_TYPE_RSN:</div><div class='add'>+				iwe.cmd = IWEVGENIE;</div><div class='add'>+				iwe.u.data.length = min(info_element-&gt;len + 2,</div><div class='add'>+							  MAX_WPA_IE_LEN);</div><div class='add'>+				current_ev = iwe_stream_add_point(current_ev, end_buf,</div><div class='add'>+						&amp;iwe, (char *) info_element);</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			length -= sizeof(*info_element) + info_element-&gt;len;</div><div class='add'>+			info_element =</div><div class='add'>+			    (struct ieee80211_info_element *)&amp;info_element-&gt;</div><div class='add'>+			    data[info_element-&gt;len];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return current_ev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7521,7 +7637,7 @@ static void airo_read_wireless_stats(struct airo_info *local)</div><div class='ctx'> 	u32 *vals = stats_rid.vals;</div><div class='ctx'> </div><div class='ctx'> 	/* Get stats out of the card */</div><div class='del'>-	clear_bit(JOB_WSTATS, &amp;local-&gt;flags);</div><div class='add'>+	clear_bit(JOB_WSTATS, &amp;local-&gt;jobs);</div><div class='ctx'> 	if (local-&gt;power.event) {</div><div class='ctx'> 		up(&amp;local-&gt;sem);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -7565,10 +7681,10 @@ static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct airo_info *local =  dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!test_bit(JOB_WSTATS, &amp;local-&gt;flags)) {</div><div class='add'>+	if (!test_bit(JOB_WSTATS, &amp;local-&gt;jobs)) {</div><div class='ctx'> 		/* Get stats out of the card if available */</div><div class='ctx'> 		if (down_trylock(&amp;local-&gt;sem) != 0) {</div><div class='del'>-			set_bit(JOB_WSTATS, &amp;local-&gt;flags);</div><div class='add'>+			set_bit(JOB_WSTATS, &amp;local-&gt;jobs);</div><div class='ctx'> 			wake_up_interruptible(&amp;local-&gt;thr_wait);</div><div class='ctx'> 		} else</div><div class='ctx'> 			airo_read_wireless_stats(local);</div><div class='head'>diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c<br/>index af0cbb6c5c0c..ac9437d497f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/airo_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/airo_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/airo_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/airo_cs.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>     </div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef __IN_PCMCIA_PACKAGE__</div><div class='ctx'> #include &lt;pcmcia/k_compat.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c<br/>index 7b321f7cf358..38fac3bbcd82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/airport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/airport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/airport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/airport.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #define DRIVER_NAME "airport"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c<br/>index bed6823d9809..bb6bea4f3233 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/arlan-main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/arlan-main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/arlan-main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/arlan-main.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * This module provides support for the Arlan 655 card made by Aironet</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "arlan.h"</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG != 32</div><div class='head'>diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c<br/>index a2cca521f444..5fa985435ffa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/arlan-proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/arlan-proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/arlan-proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/arlan-proc.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "arlan.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/arlan.h b/drivers/net/wireless/arlan.h<br/>index 70a6d7b83c4a..3ed1df75900f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/arlan.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/arlan.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/arlan.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/arlan.h</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c<br/>index 8606c88886fc..995c7bea5897 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/atmel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/atmel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/atmel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/atmel.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> </div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1578,7 +1577,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, sys_dev);</div><div class='ctx'> </div><div class='del'>-	if ((rc = request_irq(dev-&gt;irq, service_interrupt, SA_SHIRQ, dev-&gt;name, dev))) {</div><div class='add'>+	if ((rc = request_irq(dev-&gt;irq, service_interrupt, IRQF_SHARED, dev-&gt;name, dev))) {</div><div class='ctx'> 		printk(KERN_ERR "%s: register interrupt %d failed, rc %d\n", dev-&gt;name, irq, rc);</div><div class='ctx'> 		goto err_out_free;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c<br/>index 26bf1127524d..785664090bb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/atmel_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/atmel_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/atmel_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/atmel_cs.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef __IN_PCMCIA_PACKAGE__</div><div class='ctx'> #include &lt;pcmcia/k_compat.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c<br/>index a61b3bc6cccf..d425c3cefded 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/atmel_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/atmel_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/atmel_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/atmel_pci.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> ******************************************************************************/</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig<br/>index 25ea4748f0b9..533993f538fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/Kconfig</a></div><div class='hunk'>@@ -2,6 +2,7 @@ config BCM43XX</div><div class='ctx'> 	tristate "Broadcom BCM43xx wireless support"</div><div class='ctx'> 	depends on PCI &amp;&amp; IEEE80211 &amp;&amp; IEEE80211_SOFTMAC &amp;&amp; NET_RADIO &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	select FW_LOADER</div><div class='add'>+	select HW_RANDOM</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  This is an experimental driver for the Broadcom 43xx wireless chip,</div><div class='ctx'> 	  found in the Apple Airport Extreme and various other devices.</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h<br/>index 2e83083935e1..17a56828e232 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> #ifndef BCM43xx_H_</div><div class='ctx'> #define BCM43xx_H_</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/hw_random.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -82,6 +83,7 @@</div><div class='ctx'> #define BCM43xx_MMIO_TSF_1		0x634 /* core rev &lt; 3 only */</div><div class='ctx'> #define BCM43xx_MMIO_TSF_2		0x636 /* core rev &lt; 3 only */</div><div class='ctx'> #define BCM43xx_MMIO_TSF_3		0x638 /* core rev &lt; 3 only */</div><div class='add'>+#define BCM43xx_MMIO_RNG		0x65A</div><div class='ctx'> #define BCM43xx_MMIO_POWERUP_DELAY	0x6A8</div><div class='ctx'> </div><div class='ctx'> /* SPROM offsets. */</div><div class='hunk'>@@ -636,6 +638,17 @@ struct bcm43xx_key {</div><div class='ctx'> 	u8 algorithm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Driver initialization status. */</div><div class='add'>+enum {</div><div class='add'>+	BCM43xx_STAT_UNINIT,		/* Uninitialized. */</div><div class='add'>+	BCM43xx_STAT_INITIALIZING,	/* init_board() in progress. */</div><div class='add'>+	BCM43xx_STAT_INITIALIZED,	/* Fully operational. */</div><div class='add'>+	BCM43xx_STAT_SHUTTINGDOWN,	/* free_board() in progress. */</div><div class='add'>+	BCM43xx_STAT_RESTARTING,	/* controller_restart() called. */</div><div class='add'>+};</div><div class='add'>+#define bcm43xx_status(bcm)		atomic_read(&amp;(bcm)-&gt;init_status)</div><div class='add'>+#define bcm43xx_set_status(bcm, stat)	atomic_set(&amp;(bcm)-&gt;init_status, (stat))</div><div class='add'>+</div><div class='ctx'> struct bcm43xx_private {</div><div class='ctx'> 	struct ieee80211_device *ieee;</div><div class='ctx'> 	struct ieee80211softmac_device *softmac;</div><div class='hunk'>@@ -645,20 +658,18 @@ struct bcm43xx_private {</div><div class='ctx'> 	unsigned int irq;</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *mmio_addr;</div><div class='del'>-	unsigned int mmio_len;</div><div class='ctx'> </div><div class='del'>-	/* Do not use the lock directly. Use the bcm43xx_lock* helper</div><div class='del'>-	 * functions, to be MMIO-safe. */</div><div class='del'>-	spinlock_t _lock;</div><div class='add'>+	/* Locking, see "theory of locking" text below. */</div><div class='add'>+	spinlock_t irq_lock;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/* Driver initialization status BCM43xx_STAT_*** */</div><div class='add'>+	atomic_t init_status;</div><div class='ctx'> </div><div class='del'>-	/* Driver status flags. */</div><div class='del'>-	u32 initialized:1,		/* init_board() succeed */</div><div class='del'>-	    was_initialized:1,		/* for PCI suspend/resume. */</div><div class='del'>-	    shutting_down:1,		/* free_board() in progress */</div><div class='add'>+	u16 was_initialized:1,		/* for PCI suspend/resume. */</div><div class='ctx'> 	    __using_pio:1,		/* Internal, use bcm43xx_using_pio(). */</div><div class='ctx'> 	    bad_frames_preempt:1,	/* Use "Bad Frames Preemption" (default off) */</div><div class='ctx'> 	    reg124_set_0x4:1,		/* Some variable to keep track of IRQ stuff. */</div><div class='del'>-	    powersaving:1,		/* TRUE if we are in PowerSaving mode. FALSE otherwise. */</div><div class='ctx'> 	    short_preamble:1,		/* TRUE, if short preamble is enabled. */</div><div class='ctx'> 	    firmware_norelease:1;	/* Do not release the firmware. Used on suspend. */</div><div class='ctx'> </div><div class='hunk'>@@ -722,7 +733,7 @@ struct bcm43xx_private {</div><div class='ctx'> 	struct tasklet_struct isr_tasklet;</div><div class='ctx'> </div><div class='ctx'> 	/* Periodic tasks */</div><div class='del'>-	struct timer_list periodic_tasks;</div><div class='add'>+	struct work_struct periodic_work;</div><div class='ctx'> 	unsigned int periodic_state;</div><div class='ctx'> </div><div class='ctx'> 	struct work_struct restart_work;</div><div class='hunk'>@@ -741,27 +752,65 @@ struct bcm43xx_private {</div><div class='ctx'> 	const struct firmware *initvals0;</div><div class='ctx'> 	const struct firmware *initvals1;</div><div class='ctx'> </div><div class='add'>+	/* Random Number Generator. */</div><div class='add'>+	struct hwrng rng;</div><div class='add'>+	char rng_name[20 + 1];</div><div class='add'>+</div><div class='ctx'> 	/* Debugging stuff follows. */</div><div class='ctx'> #ifdef CONFIG_BCM43XX_DEBUG</div><div class='ctx'> 	struct bcm43xx_dfsentry *dfsentry;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* bcm43xx_(un)lock() protect struct bcm43xx_private.</div><div class='del'>- * Note that _NO_ MMIO writes are allowed. If you want to</div><div class='del'>- * write to the device through MMIO in the critical section, use</div><div class='del'>- * the *_mmio lock functions.</div><div class='del'>- * MMIO read-access is allowed, though.</div><div class='del'>- */</div><div class='del'>-#define bcm43xx_lock(bcm, flags)	spin_lock_irqsave(&amp;(bcm)-&gt;_lock, flags)</div><div class='del'>-#define bcm43xx_unlock(bcm, flags)	spin_unlock_irqrestore(&amp;(bcm)-&gt;_lock, flags)</div><div class='del'>-/* bcm43xx_(un)lock_mmio() protect struct bcm43xx_private and MMIO.</div><div class='del'>- * MMIO write-access to the device is allowed.</div><div class='del'>- * All MMIO writes are flushed on unlock, so it is guaranteed to not</div><div class='del'>- * interfere with other threads writing MMIO registers.</div><div class='add'>+</div><div class='add'>+/*    *** THEORY OF LOCKING ***</div><div class='add'>+ *</div><div class='add'>+ * We have two different locks in the bcm43xx driver.</div><div class='add'>+ * =&gt; bcm-&gt;mutex:    General sleeping mutex. Protects struct bcm43xx_private</div><div class='add'>+ *                   and the device registers.</div><div class='add'>+ * =&gt; bcm-&gt;irq_lock: IRQ spinlock. Protects against IRQ handler concurrency.</div><div class='add'>+ *</div><div class='add'>+ * We have three types of helper function pairs to utilize these locks.</div><div class='add'>+ *     (Always use the helper functions.)</div><div class='add'>+ * 1) bcm43xx_{un}lock_noirq():</div><div class='add'>+ *     Takes bcm-&gt;mutex. Does _not_ protect against IRQ concurrency,</div><div class='add'>+ *     so it is almost always unsafe, if device IRQs are enabled.</div><div class='add'>+ *     So only use this, if device IRQs are masked.</div><div class='add'>+ *     Locking may sleep.</div><div class='add'>+ *     You can sleep within the critical section.</div><div class='add'>+ * 2) bcm43xx_{un}lock_irqonly():</div><div class='add'>+ *     Takes bcm-&gt;irq_lock. Does _not_ protect against</div><div class='add'>+ *     bcm43xx_lock_noirq() critical sections.</div><div class='add'>+ *     Does only protect against the IRQ handler path and other</div><div class='add'>+ *     irqonly() critical sections.</div><div class='add'>+ *     Locking does not sleep.</div><div class='add'>+ *     You must not sleep within the critical section.</div><div class='add'>+ * 3) bcm43xx_{un}lock_irqsafe():</div><div class='add'>+ *     This is the cummulative lock and takes both, mutex and irq_lock.</div><div class='add'>+ *     Protects against noirq() and irqonly() critical sections (and</div><div class='add'>+ *     the IRQ handler path).</div><div class='add'>+ *     Locking may sleep.</div><div class='add'>+ *     You must not sleep within the critical section.</div><div class='ctx'>  */</div><div class='del'>-#define bcm43xx_lock_mmio(bcm, flags)	bcm43xx_lock(bcm, flags)</div><div class='del'>-#define bcm43xx_unlock_mmio(bcm, flags)	do { mmiowb(); bcm43xx_unlock(bcm, flags); } while (0)</div><div class='add'>+</div><div class='add'>+/* Lock type 1 */</div><div class='add'>+#define bcm43xx_lock_noirq(bcm)		mutex_lock(&amp;(bcm)-&gt;mutex)</div><div class='add'>+#define bcm43xx_unlock_noirq(bcm)	mutex_unlock(&amp;(bcm)-&gt;mutex)</div><div class='add'>+/* Lock type 2 */</div><div class='add'>+#define bcm43xx_lock_irqonly(bcm, flags)	\</div><div class='add'>+	spin_lock_irqsave(&amp;(bcm)-&gt;irq_lock, flags)</div><div class='add'>+#define bcm43xx_unlock_irqonly(bcm, flags)	\</div><div class='add'>+	spin_unlock_irqrestore(&amp;(bcm)-&gt;irq_lock, flags)</div><div class='add'>+/* Lock type 3 */</div><div class='add'>+#define bcm43xx_lock_irqsafe(bcm, flags) do {	\</div><div class='add'>+	bcm43xx_lock_noirq(bcm);		\</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);	\</div><div class='add'>+		} while (0)</div><div class='add'>+#define bcm43xx_unlock_irqsafe(bcm, flags) do {	\</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);	\</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);		\</div><div class='add'>+		} while (0)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> struct bcm43xx_private * bcm43xx_priv(struct net_device *dev)</div><div class='hunk'>@@ -844,16 +893,6 @@ struct bcm43xx_radioinfo * bcm43xx_current_radio(struct bcm43xx_private *bcm)</div><div class='ctx'> 	return &amp;(bcm-&gt;core_80211_ext[bcm-&gt;current_80211_core_idx].radio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Are we running in init_board() context? */</div><div class='del'>-static inline</div><div class='del'>-int bcm43xx_is_initializing(struct bcm43xx_private *bcm)</div><div class='del'>-{</div><div class='del'>-	if (bcm-&gt;initialized)</div><div class='del'>-		return 0;</div><div class='del'>-	if (bcm-&gt;shutting_down)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static inline</div><div class='ctx'> struct bcm43xx_lopair * bcm43xx_get_lopair(struct bcm43xx_phyinfo *phy,</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c<br/>index 35a4fcb6d923..ce2e40b29b4f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c</a></div><div class='hunk'>@@ -77,8 +77,8 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;big_buffer_sem);</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (!bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		fappend("Board not initialized.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -92,7 +92,7 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 	fappend("subsystem_vendor: 0x%04x   subsystem_device: 0x%04x\n",</div><div class='ctx'> 		pci_dev-&gt;subsystem_vendor, pci_dev-&gt;subsystem_device);</div><div class='ctx'> 	fappend("IRQ: %d\n", bcm-&gt;irq);</div><div class='del'>-	fappend("mmio_addr: 0x%p   mmio_len: %u\n", bcm-&gt;mmio_addr, bcm-&gt;mmio_len);</div><div class='add'>+	fappend("mmio_addr: 0x%p\n", bcm-&gt;mmio_addr);</div><div class='ctx'> 	fappend("chip_id: 0x%04x   chip_rev: 0x%02x\n", bcm-&gt;chip_id, bcm-&gt;chip_rev);</div><div class='ctx'> 	if ((bcm-&gt;core_80211[0].rev &gt;= 3) &amp;&amp; (bcm43xx_read32(bcm, 0x0158) &amp; (1 &lt;&lt; 16)))</div><div class='ctx'> 		fappend("Radio disabled by hardware!\n");</div><div class='hunk'>@@ -121,7 +121,7 @@ static ssize_t devinfo_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 	fappend("\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);</div><div class='ctx'> 	up(&amp;big_buffer_sem);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -159,8 +159,8 @@ static ssize_t spromdump_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;big_buffer_sem);</div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (!bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		fappend("Board not initialized.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -169,7 +169,7 @@ static ssize_t spromdump_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 	fappend("boardflags: 0x%04x\n", bcm-&gt;sprom.boardflags);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);</div><div class='ctx'> 	up(&amp;big_buffer_sem);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -188,8 +188,8 @@ static ssize_t tsf_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 	u64 tsf;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;big_buffer_sem);</div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (!bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		fappend("Board not initialized.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -199,7 +199,7 @@ static ssize_t tsf_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 		(unsigned int)(tsf &amp; 0xFFFFFFFFULL));</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);</div><div class='ctx'> 	up(&amp;big_buffer_sem);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -221,8 +221,8 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,</div><div class='ctx'> 	        res = -EFAULT;</div><div class='ctx'> 		goto out_up;</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (!bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		printk(KERN_INFO PFX "debugfs: Board not initialized.\n");</div><div class='ctx'> 		res = -EFAULT;</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -233,10 +233,11 @@ static ssize_t tsf_write_file(struct file *file, const char __user *user_buf,</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	bcm43xx_tsf_write(bcm, tsf);</div><div class='add'>+	mmiowb();</div><div class='ctx'> 	res = buf_size;</div><div class='ctx'> 	</div><div class='ctx'> out_unlock:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> out_up:</div><div class='ctx'> 	up(&amp;big_buffer_sem);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -257,7 +258,7 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 	int i, cnt, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;big_buffer_sem);</div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	fappend("Last %d logged xmitstatus blobs (Latest first):\n\n",</div><div class='ctx'> 		BCM43xx_NR_LOGGED_XMITSTATUS);</div><div class='hunk'>@@ -293,14 +294,14 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf,</div><div class='ctx'> 			i = BCM43xx_NR_LOGGED_XMITSTATUS - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);</div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	if (*ppos == pos) {</div><div class='ctx'> 		/* Done. Drop the copied data. */</div><div class='ctx'> 		e-&gt;xmitstatus_printing = 0;</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	up(&amp;big_buffer_sem);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c<br/>index bbecba02e697..d0318e525ba7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_dma.c</a></div><div class='hunk'>@@ -624,25 +624,28 @@ err_destroy_tx0:</div><div class='ctx'> static u16 generate_cookie(struct bcm43xx_dmaring *ring,</div><div class='ctx'> 			   int slot)</div><div class='ctx'> {</div><div class='del'>-	u16 cookie = 0x0000;</div><div class='add'>+	u16 cookie = 0xF000;</div><div class='ctx'> </div><div class='ctx'> 	/* Use the upper 4 bits of the cookie as</div><div class='ctx'> 	 * DMA controller ID and store the slot number</div><div class='del'>-	 * in the lower 12 bits</div><div class='add'>+	 * in the lower 12 bits.</div><div class='add'>+	 * Note that the cookie must never be 0, as this</div><div class='add'>+	 * is a special value used in RX path.</div><div class='ctx'> 	 */</div><div class='ctx'> 	switch (ring-&gt;mmio_base) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		assert(0);</div><div class='ctx'> 	case BCM43xx_MMIO_DMA1_BASE:</div><div class='add'>+		cookie = 0xA000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BCM43xx_MMIO_DMA2_BASE:</div><div class='del'>-		cookie = 0x1000;</div><div class='add'>+		cookie = 0xB000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BCM43xx_MMIO_DMA3_BASE:</div><div class='del'>-		cookie = 0x2000;</div><div class='add'>+		cookie = 0xC000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BCM43xx_MMIO_DMA4_BASE:</div><div class='del'>-		cookie = 0x3000;</div><div class='add'>+		cookie = 0xD000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	assert(((u16)slot &amp; 0xF000) == 0x0000);</div><div class='hunk'>@@ -660,16 +663,16 @@ struct bcm43xx_dmaring * parse_cookie(struct bcm43xx_private *bcm,</div><div class='ctx'> 	struct bcm43xx_dmaring *ring = NULL;</div><div class='ctx'> </div><div class='ctx'> 	switch (cookie &amp; 0xF000) {</div><div class='del'>-	case 0x0000:</div><div class='add'>+	case 0xA000:</div><div class='ctx'> 		ring = dma-&gt;tx_ring0;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x1000:</div><div class='add'>+	case 0xB000:</div><div class='ctx'> 		ring = dma-&gt;tx_ring1;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x2000:</div><div class='add'>+	case 0xC000:</div><div class='ctx'> 		ring = dma-&gt;tx_ring2;</div><div class='ctx'> 		break;</div><div class='del'>-	case 0x3000:</div><div class='add'>+	case 0xD000:</div><div class='ctx'> 		ring = dma-&gt;tx_ring3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -839,8 +842,18 @@ static void dma_rx(struct bcm43xx_dmaring *ring,</div><div class='ctx'> 		/* We received an xmit status. */</div><div class='ctx'> 		struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb-&gt;data;</div><div class='ctx'> 		struct bcm43xx_xmitstatus stat;</div><div class='add'>+		int i = 0;</div><div class='ctx'> </div><div class='ctx'> 		stat.cookie = le16_to_cpu(hw-&gt;cookie);</div><div class='add'>+		while (stat.cookie == 0) {</div><div class='add'>+			if (unlikely(++i &gt;= 10000)) {</div><div class='add'>+				assert(0);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			udelay(2);</div><div class='add'>+			barrier();</div><div class='add'>+			stat.cookie = le16_to_cpu(hw-&gt;cookie);</div><div class='add'>+		}</div><div class='ctx'> 		stat.flags = hw-&gt;flags;</div><div class='ctx'> 		stat.cnt1 = hw-&gt;cnt1;</div><div class='ctx'> 		stat.cnt2 = hw-&gt;cnt2;</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c<br/>index b3ffcf501311..e386dcc32e8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c<br/>index 4b2c02c0b31e..ec80692d638a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_leds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_leds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_leds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_leds.c</a></div><div class='hunk'>@@ -51,12 +51,12 @@ static void bcm43xx_led_blink(unsigned long d)</div><div class='ctx'> 	struct bcm43xx_private *bcm = led-&gt;bcm;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='ctx'> 	if (led-&gt;blink_interval) {</div><div class='ctx'> 		bcm43xx_led_changestate(led);</div><div class='ctx'> 		mod_timer(&amp;led-&gt;blink_timer, jiffies + led-&gt;blink_interval);</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm43xx_led_blink_start(struct bcm43xx_led *led,</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c<br/>index 7ed18cad29f7..3889f79e7128 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_main.c</a></div><div class='hunk'>@@ -128,13 +128,15 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for .fw files. Useful for debugging.");</div><div class='ctx'> 	static struct pci_device_id bcm43xx_pci_tbl[] = {</div><div class='ctx'> 	/* Broadcom 4303 802.11b */</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='del'>-		/* Broadcom 4307 802.11b */</div><div class='add'>+	/* Broadcom 4307 802.11b */</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='del'>-		/* Broadcom 4318 802.11b/g */</div><div class='add'>+	/* Broadcom 4318 802.11b/g */</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='add'>+	/* Broadcom 4319 802.11a/b/g */</div><div class='add'>+	{ PCI_VENDOR_ID_BROADCOM, 0x4319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='ctx'> 	/* Broadcom 4306 802.11b/g */</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='del'>-		/* Broadcom 4306 802.11a */</div><div class='add'>+	/* Broadcom 4306 802.11a */</div><div class='ctx'> //	{ PCI_VENDOR_ID_BROADCOM, 0x4321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='ctx'> 	/* Broadcom 4309 802.11a/b/g */</div><div class='ctx'> 	{ PCI_VENDOR_ID_BROADCOM, 0x4324, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='hunk'>@@ -496,20 +498,31 @@ static inline u32 bcm43xx_interrupt_disable(struct bcm43xx_private *bcm, u32 mas</div><div class='ctx'> 	return old_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Synchronize IRQ top- and bottom-half.</div><div class='add'>+ * IRQs must be masked before calling this.</div><div class='add'>+ * This must not be called with the irq_lock held.</div><div class='add'>+ */</div><div class='add'>+static void bcm43xx_synchronize_irq(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+	synchronize_irq(bcm-&gt;irq);</div><div class='add'>+	tasklet_disable(&amp;bcm-&gt;isr_tasklet);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Make sure we don't receive more data from the device. */</div><div class='ctx'> static int bcm43xx_disable_interrupts_sync(struct bcm43xx_private *bcm, u32 *oldstate)</div><div class='ctx'> {</div><div class='del'>-	u32 old;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	u32 old;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (bcm43xx_is_initializing(bcm) || bcm-&gt;shutting_down) {</div><div class='del'>-		bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='add'>+	if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)) {</div><div class='add'>+		bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	old = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);</div><div class='del'>-	tasklet_disable(&amp;bcm-&gt;isr_tasklet);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='add'>+	bcm43xx_synchronize_irq(bcm);</div><div class='add'>+</div><div class='ctx'> 	if (oldstate)</div><div class='ctx'> 		*oldstate = old;</div><div class='ctx'> </div><div class='hunk'>@@ -1387,7 +1400,7 @@ void bcm43xx_wireless_core_reset(struct bcm43xx_private *bcm, int connect_phy)</div><div class='ctx'> 			bcm43xx_dmacontroller_rx_reset(bcm, BCM43xx_MMIO_DMA4_BASE);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	if (bcm-&gt;shutting_down) {</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_SHUTTINGDOWN) {</div><div class='ctx'> 		bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD,</div><div class='ctx'> 		                bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD)</div><div class='ctx'> 				&amp; ~(BCM43xx_SBF_MAC_ENABLED | 0x00000002));</div><div class='hunk'>@@ -1534,7 +1547,7 @@ static void handle_irq_noise(struct bcm43xx_private *bcm)</div><div class='ctx'> 		goto generate_new;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the noise samples. */</div><div class='del'>-	assert(bcm-&gt;noisecalc.nr_samples &lt;= 8);</div><div class='add'>+	assert(bcm-&gt;noisecalc.nr_samples &lt; 8);</div><div class='ctx'> 	i = bcm-&gt;noisecalc.nr_samples;</div><div class='ctx'> 	noise[0] = limit_value(noise[0], 0, ARRAY_SIZE(radio-&gt;nrssi_lt) - 1);</div><div class='ctx'> 	noise[1] = limit_value(noise[1], 0, ARRAY_SIZE(radio-&gt;nrssi_lt) - 1);</div><div class='hunk'>@@ -1707,7 +1720,7 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)</div><div class='ctx'> # define bcmirq_handled(irq)	do { /* nothing */ } while (0)</div><div class='ctx'> #endif /* CONFIG_BCM43XX_DEBUG*/</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='ctx'> 	reason = bcm-&gt;irq_reason;</div><div class='ctx'> 	dma_reason[0] = bcm-&gt;dma_reason[0];</div><div class='ctx'> 	dma_reason[1] = bcm-&gt;dma_reason[1];</div><div class='hunk'>@@ -1732,7 +1745,8 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)</div><div class='ctx'> 		        dma_reason[0], dma_reason[1],</div><div class='ctx'> 			dma_reason[2], dma_reason[3]);</div><div class='ctx'> 		bcm43xx_controller_restart(bcm, "DMA error");</div><div class='del'>-		bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+		mmiowb();</div><div class='add'>+		bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely((dma_reason[0] &amp; BCM43xx_DMAIRQ_NONFATALMASK) |</div><div class='hunk'>@@ -1819,7 +1833,8 @@ static void bcm43xx_interrupt_tasklet(struct bcm43xx_private *bcm)</div><div class='ctx'> 	if (!modparam_noleds)</div><div class='ctx'> 		bcm43xx_leds_update(bcm, activity);</div><div class='ctx'> 	bcm43xx_interrupt_enable(bcm, bcm-&gt;irq_savedstate);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	mmiowb();</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pio_irq_workaround(struct bcm43xx_private *bcm,</div><div class='hunk'>@@ -1868,7 +1883,16 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re</div><div class='ctx'> 	if (!bcm)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;bcm-&gt;_lock);</div><div class='add'>+	spin_lock(&amp;bcm-&gt;irq_lock);</div><div class='add'>+</div><div class='add'>+	/* Only accept IRQs, if we are initialized properly.</div><div class='add'>+	 * This avoids an RX race while initializing.</div><div class='add'>+	 * We should probably not enable IRQs before we are initialized</div><div class='add'>+	 * completely, but some careful work is needed to fix this. I think it</div><div class='add'>+	 * is best to stay with this cheap workaround for now... .</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);</div><div class='ctx'> 	if (reason == 0xffffffff) {</div><div class='hunk'>@@ -1891,23 +1915,15 @@ static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id, struct pt_re</div><div class='ctx'> </div><div class='ctx'> 	bcm43xx_interrupt_ack(bcm, reason);</div><div class='ctx'> </div><div class='del'>-	/* Only accept IRQs, if we are initialized properly.</div><div class='del'>-	 * This avoids an RX race while initializing.</div><div class='del'>-	 * We should probably not enable IRQs before we are initialized</div><div class='del'>-	 * completely, but some careful work is needed to fix this. I think it</div><div class='del'>-	 * is best to stay with this cheap workaround for now... .</div><div class='del'>-	 */</div><div class='del'>-	if (likely(bcm-&gt;initialized)) {</div><div class='del'>-		/* disable all IRQs. They are enabled again in the bottom half. */</div><div class='del'>-		bcm-&gt;irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);</div><div class='del'>-		/* save the reason code and call our bottom half. */</div><div class='del'>-		bcm-&gt;irq_reason = reason;</div><div class='del'>-		tasklet_schedule(&amp;bcm-&gt;isr_tasklet);</div><div class='del'>-	}</div><div class='add'>+	/* disable all IRQs. They are enabled again in the bottom half. */</div><div class='add'>+	bcm-&gt;irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);</div><div class='add'>+	/* save the reason code and call our bottom half. */</div><div class='add'>+	bcm-&gt;irq_reason = reason;</div><div class='add'>+	tasklet_schedule(&amp;bcm-&gt;isr_tasklet);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	mmiowb();</div><div class='del'>-	spin_unlock(&amp;bcm-&gt;_lock);</div><div class='add'>+	spin_unlock(&amp;bcm-&gt;irq_lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2131,6 +2147,13 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BCM947XX</div><div class='add'>+static struct pci_device_id bcm43xx_47xx_ids[] = {</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },</div><div class='add'>+	{ 0 }</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='hunk'>@@ -2140,16 +2163,20 @@ static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)</div><div class='ctx'> 	bcm-&gt;irq = bcm-&gt;pci_dev-&gt;irq;</div><div class='ctx'> #ifdef CONFIG_BCM947XX</div><div class='ctx'> 	if (bcm-&gt;pci_dev-&gt;bus-&gt;number == 0) {</div><div class='del'>-		struct pci_dev *d = NULL;</div><div class='del'>-		/* FIXME: we will probably need more device IDs here... */</div><div class='del'>-		d = pci_find_device(PCI_VENDOR_ID_BROADCOM, 0x4324, NULL);</div><div class='del'>-		if (d != NULL) {</div><div class='del'>-			bcm-&gt;irq = d-&gt;irq;</div><div class='add'>+		struct pci_dev *d;</div><div class='add'>+		struct pci_device_id *id;</div><div class='add'>+		for (id = bcm43xx_47xx_ids; id-&gt;vendor; id++) {</div><div class='add'>+			d = pci_get_device(id-&gt;vendor, id-&gt;device, NULL);</div><div class='add'>+			if (d != NULL) {</div><div class='add'>+				bcm-&gt;irq = d-&gt;irq;</div><div class='add'>+				pci_dev_put(d);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	res = request_irq(bcm-&gt;irq, bcm43xx_interrupt_handler,</div><div class='del'>-			  SA_SHIRQ, KBUILD_MODNAME, bcm);</div><div class='add'>+			  IRQF_SHARED, KBUILD_MODNAME, bcm);</div><div class='ctx'> 	if (res) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm-&gt;irq);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -3104,15 +3131,10 @@ static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm)</div><div class='ctx'> 	//TODO for APHY (temperature?)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm43xx_periodic_task_handler(unsigned long d)</div><div class='add'>+static void do_periodic_work(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='del'>-	struct bcm43xx_private *bcm = (struct bcm43xx_private *)d;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int state;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='ctx'> 	state = bcm-&gt;periodic_state;</div><div class='ctx'> 	if (state % 8 == 0)</div><div class='ctx'> 		bcm43xx_periodic_every120sec(bcm);</div><div class='hunk'>@@ -3120,29 +3142,93 @@ static void bcm43xx_periodic_task_handler(unsigned long d)</div><div class='ctx'> 		bcm43xx_periodic_every60sec(bcm);</div><div class='ctx'> 	if (state % 2 == 0)</div><div class='ctx'> 		bcm43xx_periodic_every30sec(bcm);</div><div class='del'>-	bcm43xx_periodic_every15sec(bcm);</div><div class='add'>+	if (state % 1 == 0)</div><div class='add'>+		bcm43xx_periodic_every15sec(bcm);</div><div class='ctx'> 	bcm-&gt;periodic_state = state + 1;</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;bcm-&gt;periodic_tasks, jiffies + (HZ * 15));</div><div class='add'>+	schedule_delayed_work(&amp;bcm-&gt;periodic_work, HZ * 15);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Estimate a "Badness" value based on the periodic work</div><div class='add'>+ * state-machine state. "Badness" is worse (bigger), if the</div><div class='add'>+ * periodic work will take longer.</div><div class='add'>+ */</div><div class='add'>+static int estimate_periodic_work_badness(unsigned int state)</div><div class='add'>+{</div><div class='add'>+	int badness = 0;</div><div class='add'>+</div><div class='add'>+	if (state % 8 == 0) /* every 120 sec */</div><div class='add'>+		badness += 10;</div><div class='add'>+	if (state % 4 == 0) /* every 60 sec */</div><div class='add'>+		badness += 5;</div><div class='add'>+	if (state % 2 == 0) /* every 30 sec */</div><div class='add'>+		badness += 1;</div><div class='add'>+	if (state % 1 == 0) /* every 15 sec */</div><div class='add'>+		badness += 1;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+#define BADNESS_LIMIT	4</div><div class='add'>+	return badness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm43xx_periodic_work_handler(void *d)</div><div class='add'>+{</div><div class='add'>+	struct bcm43xx_private *bcm = d;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 savedirqs = 0;</div><div class='add'>+	int badness;</div><div class='add'>+</div><div class='add'>+	badness = estimate_periodic_work_badness(bcm-&gt;periodic_state);</div><div class='add'>+	if (badness &gt; BADNESS_LIMIT) {</div><div class='add'>+		/* Periodic work will take a long time, so we want it to</div><div class='add'>+		 * be preemtible.</div><div class='add'>+		 */</div><div class='add'>+		bcm43xx_lock_irqonly(bcm, flags);</div><div class='add'>+		netif_stop_queue(bcm-&gt;net_dev);</div><div class='add'>+		if (bcm43xx_using_pio(bcm))</div><div class='add'>+			bcm43xx_pio_freeze_txqueues(bcm);</div><div class='add'>+		savedirqs = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);</div><div class='add'>+		bcm43xx_unlock_irqonly(bcm, flags);</div><div class='add'>+		bcm43xx_lock_noirq(bcm);</div><div class='add'>+		bcm43xx_synchronize_irq(bcm);</div><div class='add'>+	} else {</div><div class='add'>+		/* Periodic work should take short time, so we want low</div><div class='add'>+		 * locking overhead.</div><div class='add'>+		 */</div><div class='add'>+		bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do_periodic_work(bcm);</div><div class='add'>+</div><div class='add'>+	if (badness &gt; BADNESS_LIMIT) {</div><div class='add'>+		bcm43xx_lock_irqonly(bcm, flags);</div><div class='add'>+		if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)) {</div><div class='add'>+			tasklet_enable(&amp;bcm-&gt;isr_tasklet);</div><div class='add'>+			bcm43xx_interrupt_enable(bcm, savedirqs);</div><div class='add'>+			if (bcm43xx_using_pio(bcm))</div><div class='add'>+				bcm43xx_pio_thaw_txqueues(bcm);</div><div class='add'>+		}</div><div class='add'>+		netif_wake_queue(bcm-&gt;net_dev);</div><div class='add'>+		mmiowb();</div><div class='add'>+		bcm43xx_unlock_irqonly(bcm, flags);</div><div class='add'>+		bcm43xx_unlock_noirq(bcm);</div><div class='add'>+	} else {</div><div class='add'>+		mmiowb();</div><div class='add'>+		bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm43xx_periodic_tasks_delete(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;bcm-&gt;periodic_tasks);</div><div class='add'>+	cancel_rearming_delayed_work(&amp;bcm-&gt;periodic_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm43xx_periodic_tasks_setup(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='del'>-	struct timer_list *timer = &amp;(bcm-&gt;periodic_tasks);</div><div class='add'>+	struct work_struct *work = &amp;(bcm-&gt;periodic_work);</div><div class='ctx'> </div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='del'>-	setup_timer(timer,</div><div class='del'>-		    bcm43xx_periodic_task_handler,</div><div class='del'>-		    (unsigned long)bcm);</div><div class='del'>-	timer-&gt;expires = jiffies;</div><div class='del'>-	add_timer(timer);</div><div class='add'>+	assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);</div><div class='add'>+	INIT_WORK(work, bcm43xx_periodic_work_handler, bcm);</div><div class='add'>+	schedule_work(work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm43xx_security_init(struct bcm43xx_private *bcm)</div><div class='hunk'>@@ -3152,21 +3238,51 @@ static void bcm43xx_security_init(struct bcm43xx_private *bcm)</div><div class='ctx'> 	bcm43xx_clear_keys(bcm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bcm43xx_rng_read(struct hwrng *rng, u32 *data)</div><div class='add'>+{</div><div class='add'>+	struct bcm43xx_private *bcm = (struct bcm43xx_private *)rng-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='add'>+	*data = bcm43xx_read16(bcm, BCM43xx_MMIO_RNG);</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='add'>+</div><div class='add'>+	return (sizeof(u16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm43xx_rng_exit(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+	hwrng_unregister(&amp;bcm-&gt;rng);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm43xx_rng_init(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	snprintf(bcm-&gt;rng_name, ARRAY_SIZE(bcm-&gt;rng_name),</div><div class='add'>+		 "%s_%s", KBUILD_MODNAME, bcm-&gt;net_dev-&gt;name);</div><div class='add'>+	bcm-&gt;rng.name = bcm-&gt;rng_name;</div><div class='add'>+	bcm-&gt;rng.data_read = bcm43xx_rng_read;</div><div class='add'>+	bcm-&gt;rng.priv = (unsigned long)bcm;</div><div class='add'>+	err = hwrng_register(&amp;bcm-&gt;rng);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_ERR PFX "RNG init failed (%d)\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* This is the opposite of bcm43xx_init_board() */</div><div class='ctx'> static void bcm43xx_free_board(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	bcm43xx_lock_noirq(bcm);</div><div class='ctx'> 	bcm43xx_sysfs_unregister(bcm);</div><div class='del'>-</div><div class='ctx'> 	bcm43xx_periodic_tasks_delete(bcm);</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	bcm-&gt;initialized = 0;</div><div class='del'>-	bcm-&gt;shutting_down = 1;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_set_status(bcm, BCM43xx_STAT_SHUTTINGDOWN);</div><div class='ctx'> </div><div class='add'>+	bcm43xx_rng_exit(bcm);</div><div class='ctx'> 	for (i = 0; i &lt; BCM43xx_MAX_80211_CORES; i++) {</div><div class='ctx'> 		if (!bcm-&gt;core_80211[i].available)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -3180,23 +3296,19 @@ static void bcm43xx_free_board(struct bcm43xx_private *bcm)</div><div class='ctx'> </div><div class='ctx'> 	bcm43xx_pctl_set_crystal(bcm, 0);</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	bcm-&gt;shutting_down = 0;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm43xx_init_board(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	int connect_phy;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	might_sleep();</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	bcm-&gt;initialized = 0;</div><div class='del'>-	bcm-&gt;shutting_down = 0;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_noirq(bcm);</div><div class='add'>+	bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZING);</div><div class='ctx'> </div><div class='ctx'> 	err = bcm43xx_pctl_set_crystal(bcm, 1);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -3248,6 +3360,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)</div><div class='ctx'> 		bcm43xx_switch_core(bcm, &amp;bcm-&gt;core_80211[0]);</div><div class='ctx'> 		bcm43xx_mac_enable(bcm);</div><div class='ctx'> 	}</div><div class='add'>+	err = bcm43xx_rng_init(bcm);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_80211_unwind;</div><div class='ctx'> 	bcm43xx_macfilter_clear(bcm, BCM43xx_MACFILTER_ASSOC);</div><div class='ctx'> 	bcm43xx_macfilter_set(bcm, BCM43xx_MACFILTER_SELF, (u8 *)(bcm-&gt;net_dev-&gt;dev_addr));</div><div class='ctx'> 	dprintk(KERN_INFO PFX "80211 cores initialized\n");</div><div class='hunk'>@@ -3263,9 +3378,7 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialization of the board is done. Flag it as such. */</div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	bcm-&gt;initialized = 1;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_set_status(bcm, BCM43xx_STAT_INITIALIZED);</div><div class='ctx'> </div><div class='ctx'> 	bcm43xx_periodic_tasks_setup(bcm);</div><div class='ctx'> 	bcm43xx_sysfs_register(bcm);</div><div class='hunk'>@@ -3276,6 +3389,8 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)</div><div class='ctx'> </div><div class='ctx'> 	assert(err == 0);</div><div class='ctx'> out:</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> err_80211_unwind:</div><div class='hunk'>@@ -3299,8 +3414,7 @@ static void bcm43xx_detach_board(struct bcm43xx_private *bcm)</div><div class='ctx'> </div><div class='ctx'> 	bcm43xx_chipset_detach(bcm);</div><div class='ctx'> 	/* Do _not_ access the chip, after it is detached. */</div><div class='del'>-	iounmap(bcm-&gt;mmio_addr);</div><div class='del'>-	</div><div class='add'>+	pci_iounmap(pci_dev, bcm-&gt;mmio_addr);</div><div class='ctx'> 	pci_release_regions(pci_dev);</div><div class='ctx'> 	pci_disable_device(pci_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3390,40 +3504,26 @@ static int bcm43xx_attach_board(struct bcm43xx_private *bcm)</div><div class='ctx'> 	struct net_device *net_dev = bcm-&gt;net_dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long mmio_start, mmio_flags, mmio_len;</div><div class='ctx'> 	u32 coremask;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pci_dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "unable to wake up pci device (%i)\n", err);</div><div class='add'>+		printk(KERN_ERR PFX "pci_enable_device() failed\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	mmio_start = pci_resource_start(pci_dev, 0);</div><div class='del'>-	mmio_flags = pci_resource_flags(pci_dev, 0);</div><div class='del'>-	mmio_len = pci_resource_len(pci_dev, 0);</div><div class='del'>-	if (!(mmio_flags &amp; IORESOURCE_MEM)) {</div><div class='del'>-		printk(KERN_ERR PFX</div><div class='del'>-		       "%s, region #0 not an MMIO resource, aborting\n",</div><div class='del'>-		       pci_name(pci_dev));</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto err_pci_disable;</div><div class='del'>-	}</div><div class='ctx'> 	err = pci_request_regions(pci_dev, KBUILD_MODNAME);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX</div><div class='del'>-		       "could not access PCI resources (%i)\n", err);</div><div class='add'>+		printk(KERN_ERR PFX "pci_request_regions() failed\n");</div><div class='ctx'> 		goto err_pci_disable;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* enable PCI bus-mastering */</div><div class='ctx'> 	pci_set_master(pci_dev);</div><div class='del'>-	bcm-&gt;mmio_addr = ioremap(mmio_start, mmio_len);</div><div class='add'>+	bcm-&gt;mmio_addr = pci_iomap(pci_dev, 0, ~0UL);</div><div class='ctx'> 	if (!bcm-&gt;mmio_addr) {</div><div class='del'>-		printk(KERN_ERR PFX "%s: cannot remap MMIO, aborting\n",</div><div class='del'>-		       pci_name(pci_dev));</div><div class='add'>+		printk(KERN_ERR PFX "pci_iomap() failed\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_pci_release;</div><div class='ctx'> 	}</div><div class='del'>-	bcm-&gt;mmio_len = mmio_len;</div><div class='ctx'> 	net_dev-&gt;base_addr = (unsigned long)bcm-&gt;mmio_addr;</div><div class='ctx'> </div><div class='ctx'> 	bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID,</div><div class='hunk'>@@ -3517,7 +3617,7 @@ err_80211_unwind:</div><div class='ctx'> err_chipset_detach:</div><div class='ctx'> 	bcm43xx_chipset_detach(bcm);</div><div class='ctx'> err_iounmap:</div><div class='del'>-	iounmap(bcm-&gt;mmio_addr);</div><div class='add'>+	pci_iounmap(pci_dev, bcm-&gt;mmio_addr);</div><div class='ctx'> err_pci_release:</div><div class='ctx'> 	pci_release_regions(pci_dev);</div><div class='ctx'> err_pci_disable:</div><div class='hunk'>@@ -3547,8 +3647,8 @@ static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,</div><div class='ctx'> 	struct bcm43xx_radioinfo *radio;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		bcm43xx_mac_suspend(bcm);</div><div class='ctx'> 		bcm43xx_radio_selectchannel(bcm, channel, 0);</div><div class='ctx'> 		bcm43xx_mac_enable(bcm);</div><div class='hunk'>@@ -3556,7 +3656,7 @@ static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,</div><div class='ctx'> 		radio = bcm43xx_current_radio(bcm);</div><div class='ctx'> 		radio-&gt;initial_channel = channel;</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* set_security() callback in struct ieee80211_device */</div><div class='hunk'>@@ -3568,9 +3668,9 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int keyidx;</div><div class='ctx'> 	</div><div class='del'>-	dprintk(KERN_INFO PFX "set security called\n");</div><div class='add'>+	dprintk(KERN_INFO PFX "set security called");</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	for (keyidx = 0; keyidx&lt;WEP_KEYS; keyidx++)</div><div class='ctx'> 		if (sec-&gt;flags &amp; (1&lt;&lt;keyidx)) {</div><div class='hunk'>@@ -3581,25 +3681,31 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,</div><div class='ctx'> 	</div><div class='ctx'> 	if (sec-&gt;flags &amp; SEC_ACTIVE_KEY) {</div><div class='ctx'> 		secinfo-&gt;active_key = sec-&gt;active_key;</div><div class='del'>-		dprintk(KERN_INFO PFX "   .active_key = %d\n", sec-&gt;active_key);</div><div class='add'>+		dprintk(", .active_key = %d", sec-&gt;active_key);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sec-&gt;flags &amp; SEC_UNICAST_GROUP) {</div><div class='ctx'> 		secinfo-&gt;unicast_uses_group = sec-&gt;unicast_uses_group;</div><div class='del'>-		dprintk(KERN_INFO PFX "   .unicast_uses_group = %d\n", sec-&gt;unicast_uses_group);</div><div class='add'>+		dprintk(", .unicast_uses_group = %d", sec-&gt;unicast_uses_group);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sec-&gt;flags &amp; SEC_LEVEL) {</div><div class='ctx'> 		secinfo-&gt;level = sec-&gt;level;</div><div class='del'>-		dprintk(KERN_INFO PFX "   .level = %d\n", sec-&gt;level);</div><div class='add'>+		dprintk(", .level = %d", sec-&gt;level);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sec-&gt;flags &amp; SEC_ENABLED) {</div><div class='ctx'> 		secinfo-&gt;enabled = sec-&gt;enabled;</div><div class='del'>-		dprintk(KERN_INFO PFX "   .enabled = %d\n", sec-&gt;enabled);</div><div class='add'>+		dprintk(", .enabled = %d", sec-&gt;enabled);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sec-&gt;flags &amp; SEC_ENCRYPT) {</div><div class='ctx'> 		secinfo-&gt;encrypt = sec-&gt;encrypt;</div><div class='del'>-		dprintk(KERN_INFO PFX "   .encrypt = %d\n", sec-&gt;encrypt);</div><div class='add'>+		dprintk(", .encrypt = %d", sec-&gt;encrypt);</div><div class='ctx'> 	}</div><div class='del'>-	if (bcm-&gt;initialized &amp;&amp; !bcm-&gt;ieee-&gt;host_encrypt) {</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_AUTH_MODE) {</div><div class='add'>+		secinfo-&gt;auth_mode = sec-&gt;auth_mode;</div><div class='add'>+		dprintk(", .auth_mode = %d\n", sec-&gt;auth_mode);</div><div class='add'>+	}</div><div class='add'>+	dprintk("\n");</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &amp;&amp;</div><div class='add'>+	    !bcm-&gt;ieee-&gt;host_encrypt) {</div><div class='ctx'> 		if (secinfo-&gt;enabled) {</div><div class='ctx'> 			/* upload WEP keys to hardware */</div><div class='ctx'> 			char null_address[6] = { 0 };</div><div class='hunk'>@@ -3633,7 +3739,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,</div><div class='ctx'> 		} else</div><div class='ctx'> 				bcm43xx_clear_keys(bcm);</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* hard_start_xmit() callback in struct ieee80211_device */</div><div class='hunk'>@@ -3645,10 +3751,10 @@ static int bcm43xx_ieee80211_hard_start_xmit(struct ieee80211_txb *txb,</div><div class='ctx'> 	int err = -ENODEV;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (likely(bcm-&gt;initialized))</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='add'>+	if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED))</div><div class='ctx'> 		err = bcm43xx_tx(bcm, txb);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -3663,9 +3769,9 @@ static void bcm43xx_net_tx_timeout(struct net_device *net_dev)</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='ctx'> 	bcm43xx_controller_restart(bcm, "TX timeout");</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -3690,9 +3796,11 @@ static int bcm43xx_net_open(struct net_device *net_dev)</div><div class='ctx'> static int bcm43xx_net_stop(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	ieee80211softmac_stop(net_dev);</div><div class='del'>-	bcm43xx_disable_interrupts_sync(bcm, NULL);</div><div class='add'>+	err = bcm43xx_disable_interrupts_sync(bcm, NULL);</div><div class='add'>+	assert(!err);</div><div class='ctx'> 	bcm43xx_free_board(bcm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3704,6 +3812,7 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);</div><div class='ctx'> 	bcm-&gt;ieee = netdev_priv(net_dev);</div><div class='ctx'> 	bcm-&gt;softmac = ieee80211_priv(net_dev);</div><div class='ctx'> 	bcm-&gt;softmac-&gt;set_channel = bcm43xx_ieee80211_set_chan;</div><div class='hunk'>@@ -3712,7 +3821,8 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm,</div><div class='ctx'> 	bcm-&gt;pci_dev = pci_dev;</div><div class='ctx'> 	bcm-&gt;net_dev = net_dev;</div><div class='ctx'> 	bcm-&gt;bad_frames_preempt = modparam_bad_frames_preempt;</div><div class='del'>-	spin_lock_init(&amp;bcm-&gt;_lock);</div><div class='add'>+	spin_lock_init(&amp;bcm-&gt;irq_lock);</div><div class='add'>+	mutex_init(&amp;bcm-&gt;mutex);</div><div class='ctx'> 	tasklet_init(&amp;bcm-&gt;isr_tasklet,</div><div class='ctx'> 		     (void (*)(unsigned long))bcm43xx_interrupt_tasklet,</div><div class='ctx'> 		     (unsigned long)bcm);</div><div class='hunk'>@@ -3843,7 +3953,7 @@ static void bcm43xx_chip_reset(void *_bcm)</div><div class='ctx'> 	struct net_device *net_dev = bcm-&gt;net_dev;</div><div class='ctx'> 	struct pci_dev *pci_dev = bcm-&gt;pci_dev;</div><div class='ctx'> 	int err;</div><div class='del'>-	int was_initialized = bcm-&gt;initialized;</div><div class='add'>+	int was_initialized = (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(bcm-&gt;net_dev);</div><div class='ctx'> 	tasklet_disable(&amp;bcm-&gt;isr_tasklet);</div><div class='hunk'>@@ -3878,6 +3988,7 @@ failure:</div><div class='ctx'> */</div><div class='ctx'> void bcm43xx_controller_restart(struct bcm43xx_private *bcm, const char *reason)</div><div class='ctx'> {</div><div class='add'>+	bcm43xx_set_status(bcm, BCM43xx_STAT_RESTARTING);</div><div class='ctx'> 	bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);</div><div class='ctx'> 	bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* dummy read */</div><div class='ctx'> 	printk(KERN_ERR PFX "Controller RESET (%s) ...\n", reason);</div><div class='hunk'>@@ -3896,11 +4007,11 @@ static int bcm43xx_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	dprintk(KERN_INFO PFX "Suspending...\n");</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	bcm-&gt;was_initialized = bcm-&gt;initialized;</div><div class='del'>-	if (bcm-&gt;initialized)</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	bcm-&gt;was_initialized = (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);</div><div class='add'>+	if (bcm-&gt;was_initialized)</div><div class='ctx'> 		try_to_shutdown = 1;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(net_dev);</div><div class='ctx'> 	if (try_to_shutdown) {</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h<br/>index 30a202b258b5..116493671f88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_main.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_main.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_main.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_main.h</a></div><div class='hunk'>@@ -112,30 +112,6 @@ int bcm43xx_channel_to_freq(struct bcm43xx_private *bcm,</div><div class='ctx'> 	return bcm43xx_channel_to_freq_bg(channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Lightweight function to check if a channel number is valid.</div><div class='del'>- * Note that this does _NOT_ check for geographical restrictions!</div><div class='del'>- */</div><div class='del'>-static inline</div><div class='del'>-int bcm43xx_is_valid_channel_a(u8 channel)</div><div class='del'>-{</div><div class='del'>-	return (channel &gt;= IEEE80211_52GHZ_MIN_CHANNEL</div><div class='del'>-	       &amp;&amp; channel &lt;= IEEE80211_52GHZ_MAX_CHANNEL);</div><div class='del'>-}</div><div class='del'>-static inline</div><div class='del'>-int bcm43xx_is_valid_channel_bg(u8 channel)</div><div class='del'>-{</div><div class='del'>-	return (channel &gt;= IEEE80211_24GHZ_MIN_CHANNEL</div><div class='del'>-	       &amp;&amp; channel &lt;= IEEE80211_24GHZ_MAX_CHANNEL);</div><div class='del'>-}</div><div class='del'>-static inline</div><div class='del'>-int bcm43xx_is_valid_channel(struct bcm43xx_private *bcm,</div><div class='del'>-			     u8 channel)</div><div class='del'>-{</div><div class='del'>-	if (bcm43xx_current_phy(bcm)-&gt;type == BCM43xx_PHYTYPE_A)</div><div class='del'>-		return bcm43xx_is_valid_channel_a(channel);</div><div class='del'>-	return bcm43xx_is_valid_channel_bg(channel);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf);</div><div class='ctx'> void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c<br/>index b0abac515530..f8200deecc8a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_phy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_phy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_phy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_phy.c</a></div><div class='hunk'>@@ -1410,7 +1410,10 @@ static inline</div><div class='ctx'> u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);</div><div class='add'>+	u16 ret;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	if (phy-&gt;connected) {</div><div class='ctx'> 		bcm43xx_phy_write(bcm, 0x15, 0xE300);</div><div class='ctx'> 		control &lt;&lt;= 8;</div><div class='hunk'>@@ -1430,8 +1433,10 @@ u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)</div><div class='ctx'> 		bcm43xx_phy_write(bcm, 0x0015, control | 0xFFE0);</div><div class='ctx'> 		udelay(8);</div><div class='ctx'> 	}</div><div class='add'>+	ret = bcm43xx_phy_read(bcm, 0x002D);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> </div><div class='del'>-	return bcm43xx_phy_read(bcm, 0x002D);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bcm43xx_phy_lo_g_singledeviation(struct bcm43xx_private *bcm, u16 control)</div><div class='hunk'>@@ -1648,7 +1653,7 @@ void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,</div><div class='ctx'> void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm)</div><div class='ctx'> {</div><div class='ctx'> 	static const u8 pairorder[10] = { 3, 1, 5, 7, 9, 2, 0, 4, 6, 8 };</div><div class='del'>-	const int is_initializing = bcm43xx_is_initializing(bcm);</div><div class='add'>+	const int is_initializing = (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZING);</div><div class='ctx'> 	struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);</div><div class='ctx'> 	struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);</div><div class='ctx'> 	u16 h, i, oldi = 0, j;</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.c b/drivers/net/wireless/bcm43xx/bcm43xx_pio.c<br/>index 0aa1bd269a25..574085c46152 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_pio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_pio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_pio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_pio.c</a></div><div class='hunk'>@@ -262,8 +262,10 @@ static void tx_tasklet(unsigned long d)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 txctl;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqonly(bcm, flags);</div><div class='ctx'> </div><div class='add'>+	if (queue-&gt;tx_frozen)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	txctl = bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL);</div><div class='ctx'> 	if (txctl &amp; BCM43xx_PIO_TXCTL_SUSPEND)</div><div class='ctx'> 		goto out_unlock;</div><div class='hunk'>@@ -298,7 +300,7 @@ static void tx_tasklet(unsigned long d)</div><div class='ctx'> 		continue;</div><div class='ctx'> 	}</div><div class='ctx'> out_unlock:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqonly(bcm, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setup_txqueues(struct bcm43xx_pioqueue *queue)</div><div class='hunk'>@@ -374,7 +376,6 @@ static void cancel_transfers(struct bcm43xx_pioqueue *queue)</div><div class='ctx'> 	struct bcm43xx_pio_txpacket *packet, *tmp_packet;</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_disable(queue-&gt;bcm-&gt;net_dev);</div><div class='del'>-	assert(queue-&gt;bcm-&gt;shutting_down);</div><div class='ctx'> 	tasklet_disable(&amp;queue-&gt;txtask);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(packet, tmp_packet, &amp;queue-&gt;txrunning, list)</div><div class='hunk'>@@ -634,5 +635,40 @@ void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue)</div><div class='ctx'> 			  bcm43xx_pio_read(queue, BCM43xx_PIO_TXCTL)</div><div class='ctx'> 			  &amp; ~BCM43xx_PIO_TXCTL_SUSPEND);</div><div class='ctx'> 	bcm43xx_power_saving_ctl_bits(queue-&gt;bcm, -1, -1);</div><div class='del'>-	tasklet_schedule(&amp;queue-&gt;txtask);</div><div class='add'>+	if (!list_empty(&amp;queue-&gt;txqueue))</div><div class='add'>+		tasklet_schedule(&amp;queue-&gt;txtask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcm43xx_pio_freeze_txqueues(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+	struct bcm43xx_pio *pio;</div><div class='add'>+</div><div class='add'>+	assert(bcm43xx_using_pio(bcm));</div><div class='add'>+	pio = bcm43xx_current_pio(bcm);</div><div class='add'>+	pio-&gt;queue0-&gt;tx_frozen = 1;</div><div class='add'>+	pio-&gt;queue1-&gt;tx_frozen = 1;</div><div class='add'>+	pio-&gt;queue2-&gt;tx_frozen = 1;</div><div class='add'>+	pio-&gt;queue3-&gt;tx_frozen = 1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void bcm43xx_pio_thaw_txqueues(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+	struct bcm43xx_pio *pio;</div><div class='add'>+</div><div class='add'>+	assert(bcm43xx_using_pio(bcm));</div><div class='add'>+	pio = bcm43xx_current_pio(bcm);</div><div class='add'>+	pio-&gt;queue0-&gt;tx_frozen = 0;</div><div class='add'>+	pio-&gt;queue1-&gt;tx_frozen = 0;</div><div class='add'>+	pio-&gt;queue2-&gt;tx_frozen = 0;</div><div class='add'>+	pio-&gt;queue3-&gt;tx_frozen = 0;</div><div class='add'>+	if (!list_empty(&amp;pio-&gt;queue0-&gt;txqueue))</div><div class='add'>+		tasklet_schedule(&amp;pio-&gt;queue0-&gt;txtask);</div><div class='add'>+	if (!list_empty(&amp;pio-&gt;queue1-&gt;txqueue))</div><div class='add'>+		tasklet_schedule(&amp;pio-&gt;queue1-&gt;txtask);</div><div class='add'>+	if (!list_empty(&amp;pio-&gt;queue2-&gt;txqueue))</div><div class='add'>+		tasklet_schedule(&amp;pio-&gt;queue2-&gt;txtask);</div><div class='add'>+	if (!list_empty(&amp;pio-&gt;queue3-&gt;txqueue))</div><div class='add'>+		tasklet_schedule(&amp;pio-&gt;queue3-&gt;txtask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_pio.h b/drivers/net/wireless/bcm43xx/bcm43xx_pio.h<br/>index dfc78209e3a3..bc78a3c2cafb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_pio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_pio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_pio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_pio.h</a></div><div class='hunk'>@@ -54,6 +54,7 @@ struct bcm43xx_pioqueue {</div><div class='ctx'> 	u16 mmio_base;</div><div class='ctx'> </div><div class='ctx'> 	u8 tx_suspended:1,</div><div class='add'>+	   tx_frozen:1,</div><div class='ctx'> 	   need_workarounds:1; /* Workarounds needed for core.rev &lt; 3 */</div><div class='ctx'> </div><div class='ctx'> 	/* Adjusted size of the device internal TX buffer. */</div><div class='hunk'>@@ -108,8 +109,12 @@ void bcm43xx_pio_handle_xmitstatus(struct bcm43xx_private *bcm,</div><div class='ctx'> 				   struct bcm43xx_xmitstatus *status);</div><div class='ctx'> void bcm43xx_pio_rx(struct bcm43xx_pioqueue *queue);</div><div class='ctx'> </div><div class='add'>+/* Suspend a TX queue on hardware level. */</div><div class='ctx'> void bcm43xx_pio_tx_suspend(struct bcm43xx_pioqueue *queue);</div><div class='ctx'> void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue);</div><div class='add'>+/* Suspend (freeze) the TX tasklet (software level). */</div><div class='add'>+void bcm43xx_pio_freeze_txqueues(struct bcm43xx_private *bcm);</div><div class='add'>+void bcm43xx_pio_thaw_txqueues(struct bcm43xx_private *bcm);</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_BCM43XX_PIO */</div><div class='ctx'> </div><div class='hunk'>@@ -145,6 +150,14 @@ static inline</div><div class='ctx'> void bcm43xx_pio_tx_resume(struct bcm43xx_pioqueue *queue)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+static inline</div><div class='add'>+void bcm43xx_pio_freeze_txqueues(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline</div><div class='add'>+void bcm43xx_pio_thaw_txqueues(struct bcm43xx_private *bcm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_BCM43XX_PIO */</div><div class='ctx'> #endif /* BCM43xx_PIO_H_ */</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c<br/>index af5c0bff1696..bb9c484d7e19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_radio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_radio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_radio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_radio.c</a></div><div class='hunk'>@@ -1594,11 +1594,11 @@ int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,</div><div class='ctx'> 	u16 r8, tmp;</div><div class='ctx'> 	u16 freq;</div><div class='ctx'> </div><div class='add'>+	if (!ieee80211_is_valid_channel(bcm-&gt;ieee, channel))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if ((radio-&gt;manufact == 0x17F) &amp;&amp;</div><div class='ctx'> 	    (radio-&gt;version == 0x2060) &amp;&amp;</div><div class='ctx'> 	    (radio-&gt;revision == 1)) {</div><div class='del'>-		if (channel &gt; 200)</div><div class='del'>-			return -EINVAL;</div><div class='ctx'> 		freq = channel2freq_a(channel);</div><div class='ctx'> </div><div class='ctx'> 		r8 = bcm43xx_radio_read16(bcm, 0x0008);</div><div class='hunk'>@@ -1651,9 +1651,6 @@ int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,</div><div class='ctx'> 		TODO();	//TODO:	TSSI2dbm workaround</div><div class='ctx'> 		bcm43xx_phy_xmitpower(bcm);//FIXME correct?</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((channel &lt; 1) || (channel &gt; 14))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		if (synthetic_pu_workaround)</div><div class='ctx'> 			bcm43xx_synth_pu_workaround(bcm, channel);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c<br/>index b438f48e891d..6a23bdc75412 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c</a></div><div class='hunk'>@@ -120,12 +120,12 @@ static ssize_t bcm43xx_attr_sprom_show(struct device *dev,</div><div class='ctx'> 			GFP_KERNEL);</div><div class='ctx'> 	if (!sprom)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	err = bcm43xx_sprom_read(bcm, sprom);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = sprom2hex(sprom, buf, PAGE_SIZE);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	mmiowb();</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	kfree(sprom);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -150,10 +150,10 @@ static ssize_t bcm43xx_attr_sprom_store(struct device *dev,</div><div class='ctx'> 	err = hex2sprom(sprom, buf, count);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_kfree;</div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	err = bcm43xx_sprom_write(bcm, sprom);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	mmiowb();</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> out_kfree:</div><div class='ctx'> 	kfree(sprom);</div><div class='ctx'> </div><div class='hunk'>@@ -170,15 +170,13 @@ static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,</div><div class='ctx'> 					    char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_private *bcm = dev_to_bcm(dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	ssize_t count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	bcm43xx_lock_noirq(bcm);</div><div class='ctx'> </div><div class='ctx'> 	switch (bcm43xx_current_radio(bcm)-&gt;interfmode) {</div><div class='ctx'> 	case BCM43xx_RADIO_INTERFMODE_NONE:</div><div class='hunk'>@@ -195,7 +193,7 @@ static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : count;</div><div class='ctx'> </div><div class='hunk'>@@ -231,16 +229,15 @@ static ssize_t bcm43xx_attr_interfmode_store(struct device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	err = bcm43xx_radio_set_interference_mitigation(bcm, mode);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Interference Mitigation not "</div><div class='ctx'> 				    "supported by device\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	mmiowb();</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : count;</div><div class='ctx'> }</div><div class='hunk'>@@ -254,15 +251,13 @@ static ssize_t bcm43xx_attr_preamble_show(struct device *dev,</div><div class='ctx'> 					  char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_private *bcm = dev_to_bcm(dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='ctx'> 	if (!capable(CAP_NET_ADMIN))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	bcm43xx_lock_noirq(bcm);</div><div class='ctx'> </div><div class='ctx'> 	if (bcm-&gt;short_preamble)</div><div class='ctx'> 		count = snprintf(buf, PAGE_SIZE, "1 (Short Preamble enabled)\n");</div><div class='hunk'>@@ -270,7 +265,7 @@ static ssize_t bcm43xx_attr_preamble_show(struct device *dev,</div><div class='ctx'> 		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : count;</div><div class='ctx'> }</div><div class='hunk'>@@ -290,13 +285,12 @@ static ssize_t bcm43xx_attr_preamble_store(struct device *dev,</div><div class='ctx'> 	value = get_boolean(buf, count);</div><div class='ctx'> 	if (value &lt; 0)</div><div class='ctx'> 		return value;</div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	bcm-&gt;short_preamble = !!value;</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : count;</div><div class='ctx'> }</div><div class='hunk'>@@ -310,7 +304,7 @@ int bcm43xx_sysfs_register(struct bcm43xx_private *bcm)</div><div class='ctx'> 	struct device *dev = &amp;bcm-&gt;pci_dev-&gt;dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	assert(bcm-&gt;initialized);</div><div class='add'>+	assert(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED);</div><div class='ctx'> </div><div class='ctx'> 	err = device_create_file(dev, &amp;dev_attr_sprom);</div><div class='ctx'> 	if (err)</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c<br/>index b45063974ae9..5c36e29efff7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_wx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_wx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_wx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_wx.c</a></div><div class='hunk'>@@ -55,13 +55,13 @@ static int bcm43xx_wx_get_name(struct net_device *net_dev,</div><div class='ctx'> 			       char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct bcm43xx_phyinfo *phy;</div><div class='ctx'> 	char suffix[7] = { 0 };</div><div class='ctx'> 	int have_a = 0, have_b = 0, have_g = 0;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	for (i = 0; i &lt; bcm-&gt;nr_80211_available; i++) {</div><div class='ctx'> 		phy = &amp;(bcm-&gt;core_80211_ext[i].phy);</div><div class='ctx'> 		switch (phy-&gt;type) {</div><div class='hunk'>@@ -77,7 +77,7 @@ static int bcm43xx_wx_get_name(struct net_device *net_dev,</div><div class='ctx'> 			assert(0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	if (have_a) {</div><div class='hunk'>@@ -111,7 +111,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,</div><div class='ctx'> 	int freq;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	if ((data-&gt;freq.m &gt;= 0) &amp;&amp; (data-&gt;freq.m &lt;= 1000)) {</div><div class='ctx'> 		channel = data-&gt;freq.m;</div><div class='ctx'> 		freq = bcm43xx_channel_to_freq(bcm, channel);</div><div class='hunk'>@@ -119,9 +119,9 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,</div><div class='ctx'> 		channel = bcm43xx_freq_to_channel(bcm, data-&gt;freq.m);</div><div class='ctx'> 		freq = data-&gt;freq.m;</div><div class='ctx'> 	}</div><div class='del'>-	if (!bcm43xx_is_valid_channel(bcm, channel))</div><div class='add'>+	if (!ieee80211_is_valid_channel(bcm-&gt;ieee, channel))</div><div class='ctx'> 		goto out_unlock;</div><div class='del'>-	if (bcm-&gt;initialized) {</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		//ieee80211softmac_disassoc(softmac, $REASON);</div><div class='ctx'> 		bcm43xx_mac_suspend(bcm);</div><div class='ctx'> 		err = bcm43xx_radio_selectchannel(bcm, channel, 0);</div><div class='hunk'>@@ -131,7 +131,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> out_unlock:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -147,11 +147,10 @@ static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,</div><div class='ctx'> 	int err = -ENODEV;</div><div class='ctx'> 	u16 channel;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	radio = bcm43xx_current_radio(bcm);</div><div class='ctx'> 	channel = radio-&gt;channel;</div><div class='ctx'> 	if (channel == 0xFF) {</div><div class='del'>-		assert(!bcm-&gt;initialized);</div><div class='ctx'> 		channel = radio-&gt;initial_channel;</div><div class='ctx'> 		if (channel == 0xFF)</div><div class='ctx'> 			goto out_unlock;</div><div class='hunk'>@@ -163,7 +162,7 @@ static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> out_unlock:</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -181,13 +180,13 @@ static int bcm43xx_wx_set_mode(struct net_device *net_dev,</div><div class='ctx'> 	if (mode == IW_MODE_AUTO)</div><div class='ctx'> 		mode = BCM43xx_INITIAL_IWMODE;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		if (bcm-&gt;ieee-&gt;iw_mode != mode)</div><div class='ctx'> 			bcm43xx_set_iwmode(bcm, mode);</div><div class='ctx'> 	} else</div><div class='ctx'> 		bcm-&gt;ieee-&gt;iw_mode = mode;</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -200,9 +199,9 @@ static int bcm43xx_wx_get_mode(struct net_device *net_dev,</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	data-&gt;mode = bcm-&gt;ieee-&gt;iw_mode;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -255,7 +254,7 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,</div><div class='ctx'> 			  IW_ENC_CAPA_CIPHER_TKIP |</div><div class='ctx'> 			  IW_ENC_CAPA_CIPHER_CCMP;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	phy = bcm43xx_current_phy(bcm);</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;num_bitrates = 0;</div><div class='hunk'>@@ -302,7 +301,7 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,</div><div class='ctx'> 	}</div><div class='ctx'> 	range-&gt;num_frequency = j;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -313,14 +312,13 @@ static int bcm43xx_wx_set_nick(struct net_device *net_dev,</div><div class='ctx'> 			       char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_noirq(bcm);</div><div class='ctx'> 	len =  min((size_t)data-&gt;data.length, (size_t)IW_ESSID_MAX_SIZE);</div><div class='ctx'> 	memcpy(bcm-&gt;nick, extra, len);</div><div class='ctx'> 	bcm-&gt;nick[len] = '\0';</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -331,15 +329,14 @@ static int bcm43xx_wx_get_nick(struct net_device *net_dev,</div><div class='ctx'> 			       char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_noirq(bcm);</div><div class='ctx'> 	len = strlen(bcm-&gt;nick) + 1;</div><div class='ctx'> 	memcpy(extra, bcm-&gt;nick, len);</div><div class='ctx'> 	data-&gt;data.length = (__u16)len;</div><div class='ctx'> 	data-&gt;data.flags = 1;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_noirq(bcm);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -353,7 +350,7 @@ static int bcm43xx_wx_set_rts(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	if (data-&gt;rts.disabled) {</div><div class='ctx'> 		bcm-&gt;rts_threshold = BCM43xx_MAX_RTS_THRESHOLD;</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -364,7 +361,7 @@ static int bcm43xx_wx_set_rts(struct net_device *net_dev,</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -377,11 +374,11 @@ static int bcm43xx_wx_get_rts(struct net_device *net_dev,</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	data-&gt;rts.value = bcm-&gt;rts_threshold;</div><div class='ctx'> 	data-&gt;rts.fixed = 0;</div><div class='ctx'> 	data-&gt;rts.disabled = (bcm-&gt;rts_threshold == BCM43xx_MAX_RTS_THRESHOLD);</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -395,7 +392,7 @@ static int bcm43xx_wx_set_frag(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	if (data-&gt;frag.disabled) {</div><div class='ctx'> 		bcm-&gt;ieee-&gt;fts = MAX_FRAG_THRESHOLD;</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -406,7 +403,7 @@ static int bcm43xx_wx_set_frag(struct net_device *net_dev,</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -419,11 +416,11 @@ static int bcm43xx_wx_get_frag(struct net_device *net_dev,</div><div class='ctx'> 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	data-&gt;frag.value = bcm-&gt;ieee-&gt;fts;</div><div class='ctx'> 	data-&gt;frag.fixed = 0;</div><div class='ctx'> 	data-&gt;frag.disabled = (bcm-&gt;ieee-&gt;fts == MAX_FRAG_THRESHOLD);</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -445,8 +442,8 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (!bcm-&gt;initialized)</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	radio = bcm43xx_current_radio(bcm);</div><div class='ctx'> 	phy = bcm43xx_current_phy(bcm);</div><div class='hunk'>@@ -469,7 +466,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -484,8 +481,8 @@ static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='del'>-	if (!bcm-&gt;initialized)</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED)</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	radio = bcm43xx_current_radio(bcm);</div><div class='ctx'> 	/* desired dBm value is in Q5.2 */</div><div class='hunk'>@@ -496,7 +493,7 @@ static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> out_unlock:</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -583,8 +580,8 @@ static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='del'>-	if (bcm-&gt;initialized) {</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {</div><div class='ctx'> 		err = bcm43xx_radio_set_interference_mitigation(bcm, mode);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			printk(KERN_ERR PFX "Interference Mitigation not "</div><div class='hunk'>@@ -598,7 +595,7 @@ static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,</div><div class='ctx'> 		} else</div><div class='ctx'> 			bcm43xx_current_radio(bcm)-&gt;interfmode = mode;</div><div class='ctx'> 	}</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -612,9 +609,9 @@ static int bcm43xx_wx_get_interfmode(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int mode;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	mode = bcm43xx_current_radio(bcm)-&gt;interfmode;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case BCM43xx_RADIO_INTERFMODE_NONE:</div><div class='hunk'>@@ -644,9 +641,9 @@ static int bcm43xx_wx_set_shortpreamble(struct net_device *net_dev,</div><div class='ctx'> 	int on;</div><div class='ctx'> </div><div class='ctx'> 	on = *((int *)extra);</div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	bcm-&gt;short_preamble = !!on;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -660,9 +657,9 @@ static int bcm43xx_wx_get_shortpreamble(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int on;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	on = bcm-&gt;short_preamble;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (on)</div><div class='ctx'> 		strncpy(extra, "1 (Short Preamble enabled)", MAX_WX_STRING);</div><div class='hunk'>@@ -684,11 +681,11 @@ static int bcm43xx_wx_set_swencryption(struct net_device *net_dev,</div><div class='ctx'> 	</div><div class='ctx'> 	on = *((int *)extra);</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	bcm-&gt;ieee-&gt;host_encrypt = !!on;</div><div class='ctx'> 	bcm-&gt;ieee-&gt;host_decrypt = !!on;</div><div class='ctx'> 	bcm-&gt;ieee-&gt;host_build_iv = !on;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -702,9 +699,9 @@ static int bcm43xx_wx_get_swencryption(struct net_device *net_dev,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int on;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	on = bcm-&gt;ieee-&gt;host_encrypt;</div><div class='del'>-	bcm43xx_unlock(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (on)</div><div class='ctx'> 		strncpy(extra, "1 (SW encryption enabled) ", MAX_WX_STRING);</div><div class='hunk'>@@ -767,11 +764,11 @@ static int bcm43xx_wx_sprom_read(struct net_device *net_dev,</div><div class='ctx'> 	if (!sprom)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	err = -ENODEV;</div><div class='del'>-	if (bcm-&gt;initialized)</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)</div><div class='ctx'> 		err = bcm43xx_sprom_read(bcm, sprom);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		data-&gt;data.length = sprom2hex(sprom, extra);</div><div class='ctx'> 	kfree(sprom);</div><div class='hunk'>@@ -812,11 +809,11 @@ static int bcm43xx_wx_sprom_write(struct net_device *net_dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_kfree;</div><div class='ctx'> </div><div class='del'>-	bcm43xx_lock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_lock_irqsafe(bcm, flags);</div><div class='ctx'> 	err = -ENODEV;</div><div class='del'>-	if (bcm-&gt;initialized)</div><div class='add'>+	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)</div><div class='ctx'> 		err = bcm43xx_sprom_write(bcm, sprom);</div><div class='del'>-	bcm43xx_unlock_mmio(bcm, flags);</div><div class='add'>+	bcm43xx_unlock_irqsafe(bcm, flags);</div><div class='ctx'> out_kfree:</div><div class='ctx'> 	kfree(sprom);</div><div class='ctx'> out:</div><div class='head'>diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c<br/>index d8ece28c079f..6dbd855b3647 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/bcm43xx/bcm43xx_xmit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/bcm43xx/bcm43xx_xmit.c</a></div><div class='hunk'>@@ -296,11 +296,14 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,</div><div class='ctx'> 	u16 control = 0;</div><div class='ctx'> 	u16 wsec_rate = 0;</div><div class='ctx'> 	u16 encrypt_frame;</div><div class='add'>+	const u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(wireless_header-&gt;frame_ctl));</div><div class='add'>+	const int is_mgt = (ftype == IEEE80211_FTYPE_MGMT);</div><div class='ctx'> </div><div class='ctx'> 	/* Now construct the TX header. */</div><div class='ctx'> 	memset(txhdr, 0, sizeof(*txhdr));</div><div class='ctx'> </div><div class='del'>-	bitrate = bcm-&gt;softmac-&gt;txrates.default_rate;</div><div class='add'>+	bitrate = ieee80211softmac_suggest_txrate(bcm-&gt;softmac,</div><div class='add'>+		is_multicast_ether_addr(wireless_header-&gt;addr1), is_mgt);</div><div class='ctx'> 	ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));</div><div class='ctx'> 	fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);</div><div class='ctx'> 	fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));</div><div class='head'>diff --git a/drivers/net/wireless/hermes.c b/drivers/net/wireless/hermes.c<br/>index 346c6febb033..29d39105f5b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hermes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hermes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hermes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hermes.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  * under either the MPL or the GPL.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -121,12 +120,6 @@ void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing)</div><div class='ctx'> 	hw-&gt;iobase = address;</div><div class='ctx'> 	hw-&gt;reg_spacing = reg_spacing;</div><div class='ctx'> 	hw-&gt;inten = 0x0;</div><div class='del'>-</div><div class='del'>-#ifdef HERMES_DEBUG_BUFFER</div><div class='del'>-	hw-&gt;dbufp = 0;</div><div class='del'>-	memset(&amp;hw-&gt;dbuf, 0xff, sizeof(hw-&gt;dbuf));</div><div class='del'>-	memset(&amp;hw-&gt;profile, 0, sizeof(hw-&gt;profile));</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hermes_init(hermes_t *hw)</div><div class='hunk'>@@ -347,19 +340,6 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)</div><div class='ctx'> 		reg = hermes_read_reg(hw, oreg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef HERMES_DEBUG_BUFFER</div><div class='del'>-	hw-&gt;profile[HERMES_BAP_BUSY_TIMEOUT - k]++;</div><div class='del'>-</div><div class='del'>-	if (k &lt; HERMES_BAP_BUSY_TIMEOUT) {</div><div class='del'>-		struct hermes_debug_entry *e = </div><div class='del'>-			&amp;hw-&gt;dbuf[(hw-&gt;dbufp++) % HERMES_DEBUG_BUFSIZE];</div><div class='del'>-		e-&gt;bap = bap;</div><div class='del'>-		e-&gt;id = id;</div><div class='del'>-		e-&gt;offset = offset;</div><div class='del'>-		e-&gt;cycles = HERMES_BAP_BUSY_TIMEOUT - k;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (reg &amp; HERMES_OFFSET_BUSY)</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='hunk'>@@ -419,8 +399,7 @@ int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write a block of data to the chip's buffer, via the</div><div class='del'>- * BAP. Synchronization/serialization is the caller's problem. len</div><div class='del'>- * must be even.</div><div class='add'>+ * BAP. Synchronization/serialization is the caller's problem.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns: &lt; 0 on internal failure (errno), 0 on success, &gt; 0 on error from firmware</div><div class='ctx'>  */</div><div class='hunk'>@@ -430,7 +409,7 @@ int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,</div><div class='ctx'> 	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if ( (len &lt; 0) || (len % 2) )</div><div class='add'>+	if (len &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = hermes_bap_seek(hw, bap, id, offset);</div><div class='hunk'>@@ -438,49 +417,12 @@ int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Actually do the transfer */</div><div class='del'>-	hermes_write_words(hw, dreg, buf, len/2);</div><div class='add'>+	hermes_write_bytes(hw, dreg, buf, len);</div><div class='ctx'> </div><div class='ctx'>  out:	</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Write a block of data to the chip's buffer with padding if</div><div class='del'>- * neccessary, via the BAP. Synchronization/serialization is the</div><div class='del'>- * caller's problem. len must be even.</div><div class='del'>- *</div><div class='del'>- * Returns: &lt; 0 on internal failure (errno), 0 on success, &gt; 0 on error from firmware</div><div class='del'>- */</div><div class='del'>-int hermes_bap_pwrite_pad(hermes_t *hw, int bap, const void *buf, unsigned data_len, int len,</div><div class='del'>-		      u16 id, u16 offset)</div><div class='del'>-{</div><div class='del'>-	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (len &lt; 0 || len % 2 || data_len &gt; len)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	err = hermes_bap_seek(hw, bap, id, offset);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Transfer all the complete words of data */</div><div class='del'>-	hermes_write_words(hw, dreg, buf, data_len/2);</div><div class='del'>-	/* If there is an odd byte left over pad and transfer it */</div><div class='del'>-	if (data_len &amp; 1) {</div><div class='del'>-		u8 end[2];</div><div class='del'>-		end[1] = 0;</div><div class='del'>-		end[0] = ((unsigned char *)buf)[data_len - 1];</div><div class='del'>-		hermes_write_words(hw, dreg, end, 1);</div><div class='del'>-		data_len ++;</div><div class='del'>-	}</div><div class='del'>-	/* Now send zeros for the padding */</div><div class='del'>-	if (data_len &lt; len)</div><div class='del'>-		hermes_clear_words(hw, dreg, (len - data_len) / 2);</div><div class='del'>-	/* Complete */</div><div class='del'>- out:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Read a Length-Type-Value record from the card.</div><div class='ctx'>  *</div><div class='ctx'>  * If length is NULL, we ignore the length read from the card, and</div><div class='hunk'>@@ -553,7 +495,7 @@ int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,</div><div class='ctx'> </div><div class='ctx'> 	count = length - 1;</div><div class='ctx'> </div><div class='del'>-	hermes_write_words(hw, dreg, value, count);</div><div class='add'>+	hermes_write_bytes(hw, dreg, value, count &lt;&lt; 1);</div><div class='ctx'> </div><div class='ctx'> 	err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS | HERMES_CMD_WRITE, </div><div class='ctx'> 				rid, NULL);</div><div class='hunk'>@@ -568,7 +510,6 @@ EXPORT_SYMBOL(hermes_allocate);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(hermes_bap_pread);</div><div class='ctx'> EXPORT_SYMBOL(hermes_bap_pwrite);</div><div class='del'>-EXPORT_SYMBOL(hermes_bap_pwrite_pad);</div><div class='ctx'> EXPORT_SYMBOL(hermes_read_ltv);</div><div class='ctx'> EXPORT_SYMBOL(hermes_write_ltv);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/hermes.h b/drivers/net/wireless/hermes.h<br/>index 7644f72a9f4e..8e3f0e3edb58 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hermes.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hermes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hermes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hermes.h</a></div><div class='hunk'>@@ -328,16 +328,6 @@ struct hermes_multicast {</div><div class='ctx'> 	u8 addr[HERMES_MAX_MULTICAST][ETH_ALEN];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-// #define HERMES_DEBUG_BUFFER 1</div><div class='del'>-#define HERMES_DEBUG_BUFSIZE 4096</div><div class='del'>-struct hermes_debug_entry {</div><div class='del'>-	int bap;</div><div class='del'>-	u16 id, offset;</div><div class='del'>-	int cycles;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='ctx'> /* Timeouts */</div><div class='ctx'> #define HERMES_BAP_BUSY_TIMEOUT (10000) /* In iterations of ~1us */</div><div class='ctx'> </div><div class='hunk'>@@ -347,14 +337,7 @@ typedef struct hermes {</div><div class='ctx'> 	int reg_spacing;</div><div class='ctx'> #define HERMES_16BIT_REGSPACING	0</div><div class='ctx'> #define HERMES_32BIT_REGSPACING	1</div><div class='del'>-</div><div class='ctx'> 	u16 inten; /* Which interrupts should be enabled? */</div><div class='del'>-</div><div class='del'>-#ifdef HERMES_DEBUG_BUFFER</div><div class='del'>-	struct hermes_debug_entry dbuf[HERMES_DEBUG_BUFSIZE];</div><div class='del'>-	unsigned long dbufp;</div><div class='del'>-	unsigned long profile[HERMES_BAP_BUSY_TIMEOUT+1];</div><div class='del'>-#endif</div><div class='ctx'> } hermes_t;</div><div class='ctx'> </div><div class='ctx'> /* Register access convenience macros */</div><div class='hunk'>@@ -376,8 +359,6 @@ int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,</div><div class='ctx'> 		       u16 id, u16 offset);</div><div class='ctx'> int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,</div><div class='ctx'> 			u16 id, u16 offset);</div><div class='del'>-int hermes_bap_pwrite_pad(hermes_t *hw, int bap, const void *buf,</div><div class='del'>-			unsigned data_len, int len, u16 id, u16 offset);</div><div class='ctx'> int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned buflen,</div><div class='ctx'> 		    u16 *length, void *buf);</div><div class='ctx'> int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,</div><div class='hunk'>@@ -425,10 +406,13 @@ static inline void hermes_read_words(struct hermes *hw, int off, void *buf, unsi</div><div class='ctx'> 	ioread16_rep(hw-&gt;iobase + off, buf, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void hermes_write_words(struct hermes *hw, int off, const void *buf, unsigned count)</div><div class='add'>+static inline void hermes_write_bytes(struct hermes *hw, int off,</div><div class='add'>+				      const char *buf, unsigned count)</div><div class='ctx'> {</div><div class='ctx'> 	off = off &lt;&lt; hw-&gt;reg_spacing;</div><div class='del'>-	iowrite16_rep(hw-&gt;iobase + off, buf, count);</div><div class='add'>+	iowrite16_rep(hw-&gt;iobase + off, buf, count &gt;&gt; 1);</div><div class='add'>+	if (unlikely(count &amp; 1))</div><div class='add'>+		iowrite8(buf[count - 1], hw-&gt;iobase + off);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void hermes_clear_words(struct hermes *hw, int off, unsigned count)</div><div class='hunk'>@@ -462,21 +446,4 @@ static inline int hermes_write_wordrec(hermes_t *hw, int bap, u16 rid, u16 word)</div><div class='ctx'> 	return HERMES_WRITE_RECORD(hw, bap, rid, &amp;rec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* ! __KERNEL__ */</div><div class='del'>-</div><div class='del'>-/* These are provided for the benefit of userspace drivers and testing programs</div><div class='del'>-   which use ioperm() or iopl() */</div><div class='del'>-</div><div class='del'>-#define hermes_read_reg(base, off) (inw((base) + (off)))</div><div class='del'>-#define hermes_write_reg(base, off, val) (outw((val), (base) + (off)))</div><div class='del'>-</div><div class='del'>-#define hermes_read_regn(base, name) (hermes_read_reg((base), HERMES_##name))</div><div class='del'>-#define hermes_write_regn(base, name, val) (hermes_write_reg((base), HERMES_##name, (val)))</div><div class='del'>-</div><div class='del'>-/* Note that for the next two, the count is in 16-bit words, not bytes */</div><div class='del'>-#define hermes_read_data(base, off, buf, count) (insw((base) + (off), (buf), (count)))</div><div class='del'>-#define hermes_write_data(base, off, buf, count) (outsw((base) + (off), (buf), (count)))</div><div class='del'>-</div><div class='del'>-#endif /* ! __KERNEL__ */</div><div class='del'>-</div><div class='ctx'> #endif  /* _HERMES_H */</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c<br/>index 06a5214145e3..4a5be70c0419 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_80211_tx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_80211_tx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_80211_tx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_80211_tx.c</a></div><div class='hunk'>@@ -534,5 +534,4 @@ int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(hostap_dump_tx_80211);</div><div class='ctx'> EXPORT_SYMBOL(hostap_master_start_xmit);</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c<br/>index 06c3fa32b310..ba13125024cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_ap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_ap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_ap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_ap.c</a></div><div class='hunk'>@@ -3276,17 +3276,6 @@ EXPORT_SYMBOL(hostap_init_data);</div><div class='ctx'> EXPORT_SYMBOL(hostap_init_ap_proc);</div><div class='ctx'> EXPORT_SYMBOL(hostap_free_data);</div><div class='ctx'> EXPORT_SYMBOL(hostap_check_sta_fw_version);</div><div class='del'>-EXPORT_SYMBOL(hostap_handle_sta_tx);</div><div class='del'>-EXPORT_SYMBOL(hostap_handle_sta_release);</div><div class='ctx'> EXPORT_SYMBOL(hostap_handle_sta_tx_exc);</div><div class='del'>-EXPORT_SYMBOL(hostap_update_sta_ps);</div><div class='del'>-EXPORT_SYMBOL(hostap_handle_sta_rx);</div><div class='del'>-EXPORT_SYMBOL(hostap_is_sta_assoc);</div><div class='del'>-EXPORT_SYMBOL(hostap_is_sta_authorized);</div><div class='del'>-EXPORT_SYMBOL(hostap_add_sta);</div><div class='del'>-EXPORT_SYMBOL(hostap_update_rates);</div><div class='del'>-EXPORT_SYMBOL(hostap_add_wds_links);</div><div class='del'>-EXPORT_SYMBOL(hostap_wds_link_oper);</div><div class='ctx'> #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT</div><div class='del'>-EXPORT_SYMBOL(hostap_deauth_all_stas);</div><div class='ctx'> #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c<br/>index 55bed923fbe9..52e6df5c1a92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_cs.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> #define PRISM2_PCCARD</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='hunk'>@@ -844,7 +843,7 @@ static struct pcmcia_device_id hostap_cs_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),</div><div class='add'>+/*	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),</div><div class='hunk'>@@ -881,6 +880,12 @@ static struct pcmcia_device_id hostap_cs_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12(</div><div class='ctx'> 		"ZoomAir 11Mbps High", "Rate wireless Networking",</div><div class='ctx'> 		0x273fe3db, 0x32a1eaee),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123(</div><div class='add'>+		"Pretec", "CompactWLAN Card 802.11b", "2.5",</div><div class='add'>+		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID123(</div><div class='add'>+		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",</div><div class='add'>+		0xc7b8df9d, 0x1700d087, 0x4b74baa0),</div><div class='ctx'> 	PCMCIA_DEVICE_NULL</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c<br/>index 328e9a1d13b5..dafaa5ff5aa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_hw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_hw.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -3096,6 +3095,14 @@ static void prism2_clear_set_tim_queue(local_info_t *local)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * HostAP uses two layers of net devices, where the inner</div><div class='add'>+ * layer gets called all the time from the outer layer.</div><div class='add'>+ * This is a natural nesting, which needs a split lock type.</div><div class='add'>+ */</div><div class='add'>+static struct lock_class_key hostap_netdev_xmit_lock_key;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct net_device *</div><div class='ctx'> prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,</div><div class='ctx'> 		       struct device *sdev)</div><div class='hunk'>@@ -3260,6 +3267,8 @@ while (0)</div><div class='ctx'> 	SET_NETDEV_DEV(dev, sdev);</div><div class='ctx'> 	if (ret &gt;= 0)</div><div class='ctx'> 		ret = register_netdevice(dev);</div><div class='add'>+</div><div class='add'>+	lockdep_set_class(&amp;dev-&gt;_xmit_lock, &amp;hostap_netdev_xmit_lock_key);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: register netdevice failed!\n",</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c<br/>index 8dd4c4446a64..53374fcba77e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_main.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -1125,11 +1124,9 @@ EXPORT_SYMBOL(hostap_set_auth_algs);</div><div class='ctx'> EXPORT_SYMBOL(hostap_dump_rx_header);</div><div class='ctx'> EXPORT_SYMBOL(hostap_dump_tx_header);</div><div class='ctx'> EXPORT_SYMBOL(hostap_80211_header_parse);</div><div class='del'>-EXPORT_SYMBOL(hostap_80211_prism_header_parse);</div><div class='ctx'> EXPORT_SYMBOL(hostap_80211_get_hdrlen);</div><div class='ctx'> EXPORT_SYMBOL(hostap_get_stats);</div><div class='ctx'> EXPORT_SYMBOL(hostap_setup_dev);</div><div class='del'>-EXPORT_SYMBOL(hostap_proc);</div><div class='ctx'> EXPORT_SYMBOL(hostap_set_multicast_list_queue);</div><div class='ctx'> EXPORT_SYMBOL(hostap_set_hostapd);</div><div class='ctx'> EXPORT_SYMBOL(hostap_set_hostapd_sta);</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c<br/>index 194f07097581..c2fa011be291 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_pci.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * driver patches from Reyk Floeter &lt;reyk@vantronix.net&gt; and</div><div class='ctx'>  * Andy Warner &lt;andyw@pobox.com&gt; */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='hunk'>@@ -338,7 +337,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, prism2_interrupt, SA_SHIRQ, dev-&gt;name,</div><div class='add'>+	if (request_irq(dev-&gt;irq, prism2_interrupt, IRQF_SHARED, dev-&gt;name,</div><div class='ctx'> 			dev)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: request_irq failed\n", dev-&gt;name);</div><div class='ctx'> 		goto fail;</div><div class='head'>diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c<br/>index edaaa943eb8f..6dfa041be66d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_plx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/hostap/hostap_plx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/hostap/hostap_plx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/hostap/hostap_plx.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='hunk'>@@ -67,10 +66,12 @@ static struct pci_device_id prism2_plx_id_table[] __devinitdata = {</div><div class='ctx'> 	PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"),</div><div class='ctx'> 	PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"),</div><div class='ctx'> 	PLXDEV(0x126c, 0x8030, "Nortel emobility"),</div><div class='add'>+	PLXDEV(0x1562, 0x0001, "Symbol LA-4123"),</div><div class='ctx'> 	PLXDEV(0x1385, 0x4100, "Netgear MA301"),</div><div class='ctx'> 	PLXDEV(0x15e8, 0x0130, "National Datacomm NCP130 (PLX9052)"),</div><div class='ctx'> 	PLXDEV(0x15e8, 0x0131, "National Datacomm NCP130 (TMD7160)"),</div><div class='ctx'> 	PLXDEV(0x1638, 0x1100, "Eumitcom WL11000"),</div><div class='add'>+	PLXDEV(0x16ab, 0x1100, "Global Sun Tech GL24110P"),</div><div class='ctx'> 	PLXDEV(0x16ab, 0x1101, "Global Sun Tech GL24110P (?)"),</div><div class='ctx'> 	PLXDEV(0x16ab, 0x1102, "Linksys WPC11 with WDT11"),</div><div class='ctx'> 	PLXDEV(0x16ab, 0x1103, "Longshine 8031"),</div><div class='hunk'>@@ -551,7 +552,7 @@ static int prism2_plx_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, prism2_interrupt, SA_SHIRQ, dev-&gt;name,</div><div class='add'>+	if (request_irq(dev-&gt;irq, prism2_interrupt, IRQF_SHARED, dev-&gt;name,</div><div class='ctx'> 			dev)) {</div><div class='ctx'> 		printk(KERN_WARNING "%s: request_irq failed\n", dev-&gt;name);</div><div class='ctx'> 		goto fail;</div><div class='head'>diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c<br/>index 72335c8eb97f..e955db435b30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ipw2100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/ipw2100.c</a></div><div class='hunk'>@@ -134,7 +134,6 @@ that only one external action is invoked at a time.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/in6.h&gt;</div><div class='hunk'>@@ -1485,7 +1484,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Sending the PREPARE_FOR_POWER_DOWN will restrict the</div><div class='ctx'> 		 * hardware from going into standby mode and will transition</div><div class='del'>-		 * out of D0-standy if it is already in that state.</div><div class='add'>+		 * out of D0-standby if it is already in that state.</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the</div><div class='ctx'> 		 * driver upon completion.  Once received, the driver can</div><div class='hunk'>@@ -5358,7 +5357,7 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,</div><div class='ctx'> 		     idx, keylen, len);</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: We don't check cached values in case the firmware was reset</div><div class='del'>-	 * or some other problem is occuring.  If the user is setting the key,</div><div class='add'>+	 * or some other problem is occurring.  If the user is setting the key,</div><div class='ctx'> 	 * then we push the change */</div><div class='ctx'> </div><div class='ctx'> 	wep_key-&gt;idx = idx;</div><div class='hunk'>@@ -6230,7 +6229,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,</div><div class='ctx'> 	ipw2100_queues_initialize(priv);</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(pci_dev-&gt;irq,</div><div class='del'>-			  ipw2100_interrupt, SA_SHIRQ, dev-&gt;name, priv);</div><div class='add'>+			  ipw2100_interrupt, IRQF_SHARED, dev-&gt;name, priv);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_WARNING DRV_NAME</div><div class='ctx'> 		       "Error calling request_irq: %d.\n", pci_dev-&gt;irq);</div><div class='head'>diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c<br/>index bca89cff85a6..b3300ffe4eec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2200.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ipw2200.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2200.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/ipw2200.c</a></div><div class='hunk'>@@ -33,7 +33,44 @@</div><div class='ctx'> #include "ipw2200.h"</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='del'>-#define IPW2200_VERSION "git-1.1.1"</div><div class='add'>+</div><div class='add'>+#ifndef KBUILD_EXTMOD</div><div class='add'>+#define VK "k"</div><div class='add'>+#else</div><div class='add'>+#define VK</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_DEBUG</div><div class='add'>+#define VD "d"</div><div class='add'>+#else</div><div class='add'>+#define VD</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_MONITOR</div><div class='add'>+#define VM "m"</div><div class='add'>+#else</div><div class='add'>+#define VM</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+#define VP "p"</div><div class='add'>+#else</div><div class='add'>+#define VP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_RADIOTAP</div><div class='add'>+#define VR "r"</div><div class='add'>+#else</div><div class='add'>+#define VR</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='add'>+#define VQ "q"</div><div class='add'>+#else</div><div class='add'>+#define VQ</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define IPW2200_VERSION "1.1.2" VK VD VM VP VR VQ</div><div class='ctx'> #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2200/2915 Network Driver"</div><div class='ctx'> #define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"</div><div class='ctx'> #define DRV_VERSION     IPW2200_VERSION</div><div class='hunk'>@@ -46,7 +83,9 @@ MODULE_AUTHOR(DRV_COPYRIGHT);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int cmdlog = 0;</div><div class='add'>+#ifdef CONFIG_IPW2200_DEBUG</div><div class='ctx'> static int debug = 0;</div><div class='add'>+#endif</div><div class='ctx'> static int channel = 0;</div><div class='ctx'> static int mode = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -61,8 +100,14 @@ static int roaming = 1;</div><div class='ctx'> static const char ipw_modes[] = {</div><div class='ctx'> 	'a', 'b', 'g', '?'</div><div class='ctx'> };</div><div class='add'>+static int antenna = CFG_SYS_ANTENNA_BOTH;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+static int rtap_iface = 0;     /* def: 0 -- do not create rtap interface */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> static int qos_enable = 0;</div><div class='ctx'> static int qos_burst_enable = 0;</div><div class='ctx'> static int qos_no_ack_mask = 0;</div><div class='hunk'>@@ -126,7 +171,7 @@ static int ipw_send_qos_params_command(struct ipw_priv *priv, struct ieee80211_q</div><div class='ctx'> 				       *qos_param);</div><div class='ctx'> static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos_information_element</div><div class='ctx'> 				     *qos_param);</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev);</div><div class='ctx'> static void ipw_remove_current_network(struct ipw_priv *priv);</div><div class='hunk'>@@ -488,7 +533,7 @@ static inline void ipw_clear_bit(struct ipw_priv *priv, u32 reg, u32 mask)</div><div class='ctx'> 	ipw_write32(priv, reg, ipw_read32(priv, reg) &amp; ~mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ipw_enable_interrupts(struct ipw_priv *priv)</div><div class='add'>+static inline void __ipw_enable_interrupts(struct ipw_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (priv-&gt;status &amp; STATUS_INT_ENABLED)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -496,7 +541,7 @@ static inline void ipw_enable_interrupts(struct ipw_priv *priv)</div><div class='ctx'> 	ipw_write32(priv, IPW_INTA_MASK_R, IPW_INTA_MASK_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ipw_disable_interrupts(struct ipw_priv *priv)</div><div class='add'>+static inline void __ipw_disable_interrupts(struct ipw_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (!(priv-&gt;status &amp; STATUS_INT_ENABLED))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -504,6 +549,24 @@ static inline void ipw_disable_interrupts(struct ipw_priv *priv)</div><div class='ctx'> 	ipw_write32(priv, IPW_INTA_MASK_R, ~IPW_INTA_MASK_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void ipw_enable_interrupts(struct ipw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;irq_lock, flags);</div><div class='add'>+	__ipw_enable_interrupts(priv);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ipw_disable_interrupts(struct ipw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;irq_lock, flags);</div><div class='add'>+	__ipw_disable_interrupts(priv);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IPW2200_DEBUG</div><div class='ctx'> static char *ipw_error_desc(u32 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -1166,12 +1229,6 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ipw_free_error_log(struct ipw_fw_error *error)</div><div class='del'>-{</div><div class='del'>-	if (error)</div><div class='del'>-		kfree(error);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t show_event_log(struct device *d,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1233,10 +1290,9 @@ static ssize_t clear_error(struct device *d,</div><div class='ctx'> 			   const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='del'>-	if (priv-&gt;error) {</div><div class='del'>-		ipw_free_error_log(priv-&gt;error);</div><div class='del'>-		priv-&gt;error = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	kfree(priv-&gt;error);</div><div class='add'>+	priv-&gt;error = NULL;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1269,6 +1325,105 @@ static ssize_t show_cmd_log(struct device *d,</div><div class='ctx'> </div><div class='ctx'> static DEVICE_ATTR(cmd_log, S_IRUGO, show_cmd_log, NULL);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+static void ipw_prom_free(struct ipw_priv *priv);</div><div class='add'>+static int ipw_prom_alloc(struct ipw_priv *priv);</div><div class='add'>+static ssize_t store_rtap_iface(struct device *d,</div><div class='add'>+			 struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (count &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (buf[0]) {</div><div class='add'>+	case '0':</div><div class='add'>+		if (!rtap_iface)</div><div class='add'>+			return count;</div><div class='add'>+</div><div class='add'>+		if (netif_running(priv-&gt;prom_net_dev)) {</div><div class='add'>+			IPW_WARNING("Interface is up.  Cannot unregister.\n");</div><div class='add'>+			return count;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ipw_prom_free(priv);</div><div class='add'>+		rtap_iface = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case '1':</div><div class='add'>+		if (rtap_iface)</div><div class='add'>+			return count;</div><div class='add'>+</div><div class='add'>+		rc = ipw_prom_alloc(priv);</div><div class='add'>+		if (!rc)</div><div class='add'>+			rtap_iface = 1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		IPW_ERROR("Failed to register promiscuous network "</div><div class='add'>+			  "device (error %d).\n", rc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_rtap_iface(struct device *d,</div><div class='add'>+			struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='add'>+	if (rtap_iface)</div><div class='add'>+		return sprintf(buf, "%s", priv-&gt;prom_net_dev-&gt;name);</div><div class='add'>+	else {</div><div class='add'>+		buf[0] = '-';</div><div class='add'>+		buf[1] = '1';</div><div class='add'>+		buf[2] = '\0';</div><div class='add'>+		return 3;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(rtap_iface, S_IWUSR | S_IRUSR, show_rtap_iface,</div><div class='add'>+		   store_rtap_iface);</div><div class='add'>+</div><div class='add'>+static ssize_t store_rtap_filter(struct device *d,</div><div class='add'>+			 struct device_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;prom_priv) {</div><div class='add'>+		IPW_ERROR("Attempting to set filter without "</div><div class='add'>+			  "rtap_iface enabled.\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;prom_priv-&gt;filter = simple_strtol(buf, NULL, 0);</div><div class='add'>+</div><div class='add'>+	IPW_DEBUG_INFO("Setting rtap filter to " BIT_FMT16 "\n",</div><div class='add'>+		       BIT_ARG16(priv-&gt;prom_priv-&gt;filter));</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_rtap_filter(struct device *d,</div><div class='add'>+			struct device_attribute *attr,</div><div class='add'>+			char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ipw_priv *priv = dev_get_drvdata(d);</div><div class='add'>+	return sprintf(buf, "0x%04X",</div><div class='add'>+		       priv-&gt;prom_priv ? priv-&gt;prom_priv-&gt;filter : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(rtap_filter, S_IWUSR | S_IRUSR, show_rtap_filter,</div><div class='add'>+		   store_rtap_filter);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static ssize_t show_scan_age(struct device *d, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1712,7 +1867,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;irq_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	inta = ipw_read32(priv, IPW_INTA_RW);</div><div class='ctx'> 	inta_mask = ipw_read32(priv, IPW_INTA_MASK_R);</div><div class='hunk'>@@ -1721,6 +1876,10 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)</div><div class='ctx'> 	/* Add any cached INTA values that need to be handled */</div><div class='ctx'> 	inta |= priv-&gt;isr_inta;</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;irq_lock, flags);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	/* handle all the justifications for the interrupt */</div><div class='ctx'> 	if (inta &amp; IPW_INTA_BIT_RX_TRANSFER) {</div><div class='ctx'> 		ipw_rx(priv);</div><div class='hunk'>@@ -1804,8 +1963,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)</div><div class='ctx'> 				struct ipw_fw_error *error =</div><div class='ctx'> 				    ipw_alloc_error_log(priv);</div><div class='ctx'> 				ipw_dump_error_log(priv, error);</div><div class='del'>-				if (error)</div><div class='del'>-					ipw_free_error_log(error);</div><div class='add'>+				kfree(error);</div><div class='ctx'> 			}</div><div class='ctx'> #endif</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1849,10 +2007,10 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)</div><div class='ctx'> 		IPW_ERROR("Unhandled INTA bits 0x%08x\n", inta &amp; ~handled);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	/* enable all interrupts */</div><div class='ctx'> 	ipw_enable_interrupts(priv);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define IPW_CMD(x) case IPW_CMD_ ## x : return #x</div><div class='hunk'>@@ -2025,16 +2183,11 @@ static int ipw_send_host_complete(struct ipw_priv *priv)</div><div class='ctx'> 	return ipw_send_cmd_simple(priv, IPW_CMD_HOST_COMPLETE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ipw_send_system_config(struct ipw_priv *priv,</div><div class='del'>-				  struct ipw_sys_config *config)</div><div class='add'>+static int ipw_send_system_config(struct ipw_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (!priv || !config) {</div><div class='del'>-		IPW_ERROR("Invalid args\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ipw_send_cmd_pdu(priv, IPW_CMD_SYSTEM_CONFIG, sizeof(*config),</div><div class='del'>-				config);</div><div class='add'>+	return ipw_send_cmd_pdu(priv, IPW_CMD_SYSTEM_CONFIG,</div><div class='add'>+				sizeof(priv-&gt;sys_config),</div><div class='add'>+				&amp;priv-&gt;sys_config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipw_send_ssid(struct ipw_priv *priv, u8 * ssid, int len)</div><div class='hunk'>@@ -3104,10 +3257,10 @@ static int ipw_reset_nic(struct ipw_priv *priv)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct ipw_fw {</div><div class='del'>-	u32 ver;</div><div class='del'>-	u32 boot_size;</div><div class='del'>-	u32 ucode_size;</div><div class='del'>-	u32 fw_size;</div><div class='add'>+	__le32 ver;</div><div class='add'>+	__le32 boot_size;</div><div class='add'>+	__le32 ucode_size;</div><div class='add'>+	__le32 fw_size;</div><div class='ctx'> 	u8 data[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3131,8 +3284,8 @@ static int ipw_get_fw(struct ipw_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	fw = (void *)(*raw)-&gt;data;</div><div class='ctx'> </div><div class='del'>-	if ((*raw)-&gt;size &lt; sizeof(*fw) +</div><div class='del'>-	    fw-&gt;boot_size + fw-&gt;ucode_size + fw-&gt;fw_size) {</div><div class='add'>+	if ((*raw)-&gt;size &lt; sizeof(*fw) + le32_to_cpu(fw-&gt;boot_size) +</div><div class='add'>+	    le32_to_cpu(fw-&gt;ucode_size) + le32_to_cpu(fw-&gt;fw_size)) {</div><div class='ctx'> 		IPW_ERROR("%s is too small or corrupt (%zd)\n",</div><div class='ctx'> 			  name, (*raw)-&gt;size);</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3237,8 +3390,9 @@ static int ipw_load(struct ipw_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	fw = (void *)raw-&gt;data;</div><div class='ctx'> 	boot_img = &amp;fw-&gt;data[0];</div><div class='del'>-	ucode_img = &amp;fw-&gt;data[fw-&gt;boot_size];</div><div class='del'>-	fw_img = &amp;fw-&gt;data[fw-&gt;boot_size + fw-&gt;ucode_size];</div><div class='add'>+	ucode_img = &amp;fw-&gt;data[le32_to_cpu(fw-&gt;boot_size)];</div><div class='add'>+	fw_img = &amp;fw-&gt;data[le32_to_cpu(fw-&gt;boot_size) +</div><div class='add'>+			   le32_to_cpu(fw-&gt;ucode_size)];</div><div class='ctx'> </div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -3272,7 +3426,7 @@ static int ipw_load(struct ipw_priv *priv)</div><div class='ctx'> 			IPW_NIC_SRAM_UPPER_BOUND - IPW_NIC_SRAM_LOWER_BOUND);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA the initial boot firmware into the device */</div><div class='del'>-	rc = ipw_load_firmware(priv, boot_img, fw-&gt;boot_size);</div><div class='add'>+	rc = ipw_load_firmware(priv, boot_img, le32_to_cpu(fw-&gt;boot_size));</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		IPW_ERROR("Unable to load boot firmware: %d\n", rc);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -3294,7 +3448,7 @@ static int ipw_load(struct ipw_priv *priv)</div><div class='ctx'> 	ipw_write32(priv, IPW_INTA_RW, IPW_INTA_BIT_FW_INITIALIZATION_DONE);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA the ucode into the device */</div><div class='del'>-	rc = ipw_load_ucode(priv, ucode_img, fw-&gt;ucode_size);</div><div class='add'>+	rc = ipw_load_ucode(priv, ucode_img, le32_to_cpu(fw-&gt;ucode_size));</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		IPW_ERROR("Unable to load ucode: %d\n", rc);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -3304,7 +3458,7 @@ static int ipw_load(struct ipw_priv *priv)</div><div class='ctx'> 	ipw_stop_nic(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA bss firmware into the device */</div><div class='del'>-	rc = ipw_load_firmware(priv, fw_img, fw-&gt;fw_size);</div><div class='add'>+	rc = ipw_load_firmware(priv, fw_img, le32_to_cpu(fw-&gt;fw_size));</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		IPW_ERROR("Unable to load firmware: %d\n", rc);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -3700,7 +3854,17 @@ static void ipw_bg_disassociate(void *data)</div><div class='ctx'> static void ipw_system_config(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = data;</div><div class='del'>-	ipw_send_system_config(priv, &amp;priv-&gt;sys_config);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	if (priv-&gt;prom_net_dev &amp;&amp; netif_running(priv-&gt;prom_net_dev)) {</div><div class='add'>+		priv-&gt;sys_config.accept_all_data_frames = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_non_directed_frames = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_bcpr = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_frames = 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	ipw_send_system_config(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ipw_status_code {</div><div class='hunk'>@@ -3771,6 +3935,13 @@ static void inline average_init(struct average *avg)</div><div class='ctx'> 	memset(avg, 0, sizeof(*avg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define DEPTH_RSSI 8</div><div class='add'>+#define DEPTH_NOISE 16</div><div class='add'>+static s16 exponential_average(s16 prev_avg, s16 val, u8 depth)</div><div class='add'>+{</div><div class='add'>+	return ((depth-1)*prev_avg +  val)/depth;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void average_add(struct average *avg, s16 val)</div><div class='ctx'> {</div><div class='ctx'> 	avg-&gt;sum -= avg-&gt;entries[avg-&gt;pos];</div><div class='hunk'>@@ -3800,8 +3971,8 @@ static void ipw_reset_stats(struct ipw_priv *priv)</div><div class='ctx'> 	priv-&gt;quality = 0;</div><div class='ctx'> </div><div class='ctx'> 	average_init(&amp;priv-&gt;average_missed_beacons);</div><div class='del'>-	average_init(&amp;priv-&gt;average_rssi);</div><div class='del'>-	average_init(&amp;priv-&gt;average_noise);</div><div class='add'>+	priv-&gt;exp_avg_rssi = -60;</div><div class='add'>+	priv-&gt;exp_avg_noise = -85 + 0x100;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;last_rate = 0;</div><div class='ctx'> 	priv-&gt;last_missed_beacons = 0;</div><div class='hunk'>@@ -4008,7 +4179,7 @@ static void ipw_gather_stats(struct ipw_priv *priv)</div><div class='ctx'> 	IPW_DEBUG_STATS("Tx quality   : %3d%% (%u errors, %u packets)\n",</div><div class='ctx'> 			tx_quality, tx_failures_delta, tx_packets_delta);</div><div class='ctx'> </div><div class='del'>-	rssi = average_value(&amp;priv-&gt;average_rssi);</div><div class='add'>+	rssi = priv-&gt;exp_avg_rssi;</div><div class='ctx'> 	signal_quality =</div><div class='ctx'> 	    (100 *</div><div class='ctx'> 	     (priv-&gt;ieee-&gt;perfect_rssi - priv-&gt;ieee-&gt;worst_rssi) *</div><div class='hunk'>@@ -4185,7 +4356,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,</div><div class='ctx'> 					queue_work(priv-&gt;workqueue,</div><div class='ctx'> 						   &amp;priv-&gt;system_config);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> #define IPW_GET_PACKET_STYPE(x) WLAN_FC_GET_STYPE( \</div><div class='ctx'> 			 le16_to_cpu(((struct ieee80211_hdr *)(x))-&gt;frame_ctl))</div><div class='ctx'> 					if ((priv-&gt;status &amp; STATUS_AUTH) &amp;&amp;</div><div class='hunk'>@@ -4482,6 +4653,24 @@ static void ipw_rx_notification(struct ipw_priv *priv,</div><div class='ctx'> 				 &amp;&amp; priv-&gt;status &amp; STATUS_ASSOCIATED)</div><div class='ctx'> 				queue_delayed_work(priv-&gt;workqueue,</div><div class='ctx'> 						   &amp;priv-&gt;request_scan, HZ);</div><div class='add'>+</div><div class='add'>+			/* Send an empty event to user space.</div><div class='add'>+			 * We don't send the received data on the event because</div><div class='add'>+			 * it would require us to do complex transcoding, and</div><div class='add'>+			 * we want to minimise the work done in the irq handler</div><div class='add'>+			 * Use a request to extract the data.</div><div class='add'>+			 * Also, we generate this even for any scan, regardless</div><div class='add'>+			 * on how the scan was initiated. User space can just</div><div class='add'>+			 * sync on periodic scan to get fresh data...</div><div class='add'>+			 * Jean II */</div><div class='add'>+			if (x-&gt;status == SCAN_COMPLETED_STATUS_COMPLETE) {</div><div class='add'>+				union iwreq_data wrqu;</div><div class='add'>+</div><div class='add'>+				wrqu.data.length = 0;</div><div class='add'>+				wrqu.data.flags = 0;</div><div class='add'>+				wireless_send_event(priv-&gt;net_dev, SIOCGIWSCAN,</div><div class='add'>+						    &amp;wrqu, NULL);</div><div class='add'>+			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -4577,11 +4766,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	case HOST_NOTIFICATION_NOISE_STATS:{</div><div class='ctx'> 			if (notif-&gt;size == sizeof(u32)) {</div><div class='del'>-				priv-&gt;last_noise =</div><div class='del'>-				    (u8) (le32_to_cpu(notif-&gt;u.noise.value) &amp;</div><div class='del'>-					  0xff);</div><div class='del'>-				average_add(&amp;priv-&gt;average_noise,</div><div class='del'>-					    priv-&gt;last_noise);</div><div class='add'>+				priv-&gt;exp_avg_noise =</div><div class='add'>+				    exponential_average(priv-&gt;exp_avg_noise,</div><div class='add'>+				    (u8) (le32_to_cpu(notif-&gt;u.noise.value) &amp; 0xff),</div><div class='add'>+				    DEPTH_NOISE);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -6170,8 +6358,6 @@ static void ipw_wpa_assoc_frame(struct ipw_priv *priv, char *wpa_ie,</div><div class='ctx'> {</div><div class='ctx'> 	/* make sure WPA is enabled */</div><div class='ctx'> 	ipw_wpa_enable(priv, 1);</div><div class='del'>-</div><div class='del'>-	ipw_disassociate(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipw_set_rsn_capa(struct ipw_priv *priv,</div><div class='hunk'>@@ -6365,6 +6551,7 @@ static int ipw_wx_set_auth(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	case IW_AUTH_WPA_ENABLED:</div><div class='ctx'> 		ret = ipw_wpa_enable(priv, param-&gt;value);</div><div class='add'>+		ipw_disassociate(priv);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IW_AUTH_RX_UNENCRYPTED_EAPOL:</div><div class='hunk'>@@ -6506,7 +6693,7 @@ static int ipw_wx_set_mlme(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> </div><div class='ctx'> /* QoS */</div><div class='ctx'> /*</div><div class='hunk'>@@ -6853,61 +7040,55 @@ static int ipw_get_tx_queue_number(struct ipw_priv *priv, u16 priority)</div><div class='ctx'> 	return from_priority_to_tx_queue[priority] - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-* add QoS parameter to the TX command</div><div class='del'>-*/</div><div class='del'>-static int ipw_qos_set_tx_queue_command(struct ipw_priv *priv,</div><div class='del'>-					u16 priority,</div><div class='del'>-					struct tfd_data *tfd, u8 unicast)</div><div class='add'>+static int ipw_is_qos_active(struct net_device *dev,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int tx_queue_id = 0;</div><div class='add'>+	struct ipw_priv *priv = ieee80211_priv(dev);</div><div class='ctx'> 	struct ieee80211_qos_data *qos_data = NULL;</div><div class='ctx'> 	int active, supported;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	u8 *daddr = skb-&gt;data + ETH_ALEN;</div><div class='add'>+	int unicast = !is_multicast_ether_addr(daddr);</div><div class='ctx'> </div><div class='ctx'> 	if (!(priv-&gt;status &amp; STATUS_ASSOCIATED))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	qos_data = &amp;priv-&gt;assoc_network-&gt;qos_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;ieee-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	if (priv-&gt;ieee-&gt;iw_mode == IW_MODE_ADHOC) {</div><div class='ctx'> 		if (unicast == 0)</div><div class='ctx'> 			qos_data-&gt;active = 0;</div><div class='ctx'> 		else</div><div class='ctx'> 			qos_data-&gt;active = qos_data-&gt;supported;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> 	active = qos_data-&gt;active;</div><div class='ctx'> 	supported = qos_data-&gt;supported;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;ieee-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	IPW_DEBUG_QOS("QoS  %d network is QoS active %d  supported %d  "</div><div class='ctx'> 		      "unicast %d\n",</div><div class='ctx'> 		      priv-&gt;qos_data.qos_enable, active, supported, unicast);</div><div class='del'>-	if (active &amp;&amp; priv-&gt;qos_data.qos_enable) {</div><div class='del'>-		ret = from_priority_to_tx_queue[priority];</div><div class='del'>-		tx_queue_id = ret - 1;</div><div class='del'>-		IPW_DEBUG_QOS("QoS packet priority is %d \n", priority);</div><div class='del'>-		if (priority &lt;= 7) {</div><div class='del'>-			tfd-&gt;tx_flags_ext |= DCT_FLAG_EXT_QOS_ENABLED;</div><div class='del'>-			tfd-&gt;tfd.tfd_26.mchdr.qos_ctrl = priority;</div><div class='del'>-			tfd-&gt;tfd.tfd_26.mchdr.frame_ctl |=</div><div class='del'>-			    IEEE80211_STYPE_QOS_DATA;</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;qos_data.qos_no_ack_mask &amp;</div><div class='del'>-			    (1UL &lt;&lt; tx_queue_id)) {</div><div class='del'>-				tfd-&gt;tx_flags &amp;= ~DCT_FLAG_ACK_REQD;</div><div class='del'>-				tfd-&gt;tfd.tfd_26.mchdr.qos_ctrl |=</div><div class='del'>-				    CTRL_QOS_NO_ACK;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (active &amp;&amp; priv-&gt;qos_data.qos_enable)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+* add QoS parameter to the TX command</div><div class='add'>+*/</div><div class='add'>+static int ipw_qos_set_tx_queue_command(struct ipw_priv *priv,</div><div class='add'>+					u16 priority,</div><div class='add'>+					struct tfd_data *tfd)</div><div class='add'>+{</div><div class='add'>+	int tx_queue_id = 0;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	tx_queue_id = from_priority_to_tx_queue[priority] - 1;</div><div class='add'>+	tfd-&gt;tx_flags_ext |= DCT_FLAG_EXT_QOS_ENABLED;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;qos_data.qos_no_ack_mask &amp; (1UL &lt;&lt; tx_queue_id)) {</div><div class='add'>+		tfd-&gt;tx_flags &amp;= ~DCT_FLAG_ACK_REQD;</div><div class='add'>+		tfd-&gt;tfd.tfd_26.mchdr.qos_ctrl |= CTRL_QOS_NO_ACK;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -6977,7 +7158,7 @@ static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos</div><div class='ctx'> 				qos_param);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> static int ipw_associate_network(struct ipw_priv *priv,</div><div class='ctx'> 				 struct ieee80211_network *network,</div><div class='hunk'>@@ -7116,7 +7297,7 @@ static int ipw_associate_network(struct ipw_priv *priv,</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;sys_config.answer_broadcast_ssid_probe = 0;</div><div class='ctx'> </div><div class='del'>-	err = ipw_send_system_config(priv, &amp;priv-&gt;sys_config);</div><div class='add'>+	err = ipw_send_system_config(priv);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		IPW_DEBUG_HC("Attempt to send sys config command failed.\n");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -7141,7 +7322,7 @@ static int ipw_associate_network(struct ipw_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;assoc_network = network;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> 	ipw_qos_association(priv, network);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -7415,7 +7596,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IEEE80211_RADIOTAP</div><div class='add'>+#ifdef CONFIG_IPW2200_RADIOTAP</div><div class='ctx'> static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,</div><div class='ctx'> 					   struct ipw_rx_mem_buffer *rxb,</div><div class='ctx'> 					   struct ieee80211_rx_stats *stats)</div><div class='hunk'>@@ -7432,15 +7613,7 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,</div><div class='ctx'> 	/* Magic struct that slots into the radiotap header -- no reason</div><div class='ctx'> 	 * to build this manually element by element, we can write it much</div><div class='ctx'> 	 * more efficiently than we can parse it. ORDER MATTERS HERE */</div><div class='del'>-	struct ipw_rt_hdr {</div><div class='del'>-		struct ieee80211_radiotap_header rt_hdr;</div><div class='del'>-		u8 rt_flags;	/* radiotap packet flags */</div><div class='del'>-		u8 rt_rate;	/* rate in 500kb/s */</div><div class='del'>-		u16 rt_channel;	/* channel in mhz */</div><div class='del'>-		u16 rt_chbitmask;	/* channel bitfield */</div><div class='del'>-		s8 rt_dbmsignal;	/* signal in dbM, kluged to signed */</div><div class='del'>-		u8 rt_antenna;	/* antenna number */</div><div class='del'>-	} *ipw_rt;</div><div class='add'>+	struct ipw_rt_hdr *ipw_rt;</div><div class='ctx'> </div><div class='ctx'> 	short len = le16_to_cpu(pkt-&gt;u.frame.length);</div><div class='ctx'> </div><div class='hunk'>@@ -7494,9 +7667,11 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,</div><div class='ctx'> 	/* Big bitfield of all the fields we provide in radiotap */</div><div class='ctx'> 	ipw_rt-&gt;rt_hdr.it_present =</div><div class='ctx'> 	    ((1 &lt;&lt; IEEE80211_RADIOTAP_FLAGS) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_TSFT) |</div><div class='ctx'> 	     (1 &lt;&lt; IEEE80211_RADIOTAP_RATE) |</div><div class='ctx'> 	     (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL) |</div><div class='ctx'> 	     (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTNOISE) |</div><div class='ctx'> 	     (1 &lt;&lt; IEEE80211_RADIOTAP_ANTENNA));</div><div class='ctx'> </div><div class='ctx'> 	/* Zero the flags, we'll add to them as we go */</div><div class='hunk'>@@ -7582,6 +7757,217 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+#define ieee80211_is_probe_response(fc) \</div><div class='add'>+   ((fc &amp; IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &amp;&amp; \</div><div class='add'>+    (fc &amp; IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP )</div><div class='add'>+</div><div class='add'>+#define ieee80211_is_management(fc) \</div><div class='add'>+   ((fc &amp; IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)</div><div class='add'>+</div><div class='add'>+#define ieee80211_is_control(fc) \</div><div class='add'>+   ((fc &amp; IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL)</div><div class='add'>+</div><div class='add'>+#define ieee80211_is_data(fc) \</div><div class='add'>+   ((fc &amp; IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)</div><div class='add'>+</div><div class='add'>+#define ieee80211_is_assoc_request(fc) \</div><div class='add'>+   ((fc &amp; IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_ASSOC_REQ)</div><div class='add'>+</div><div class='add'>+#define ieee80211_is_reassoc_request(fc) \</div><div class='add'>+   ((fc &amp; IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_REASSOC_REQ)</div><div class='add'>+</div><div class='add'>+static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,</div><div class='add'>+				      struct ipw_rx_mem_buffer *rxb,</div><div class='add'>+				      struct ieee80211_rx_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb-&gt;skb-&gt;data;</div><div class='add'>+	struct ipw_rx_frame *frame = &amp;pkt-&gt;u.frame;</div><div class='add'>+	struct ipw_rt_hdr *ipw_rt;</div><div class='add'>+</div><div class='add'>+	/* First cache any information we need before we overwrite</div><div class='add'>+	 * the information provided in the skb from the hardware */</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u16 channel = frame-&gt;received_channel;</div><div class='add'>+	u8 phy_flags = frame-&gt;antennaAndPhy;</div><div class='add'>+	s8 signal = frame-&gt;rssi_dbm - IPW_RSSI_TO_DBM;</div><div class='add'>+	s8 noise = frame-&gt;noise;</div><div class='add'>+	u8 rate = frame-&gt;rate;</div><div class='add'>+	short len = le16_to_cpu(pkt-&gt;u.frame.length);</div><div class='add'>+	u64 tsf = 0;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int hdr_only = 0;</div><div class='add'>+	u16 filter = priv-&gt;prom_priv-&gt;filter;</div><div class='add'>+</div><div class='add'>+	/* If the filter is set to not include Rx frames then return */</div><div class='add'>+	if (filter &amp; IPW_PROM_NO_RX)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* We received data from the HW, so stop the watchdog */</div><div class='add'>+	priv-&gt;prom_net_dev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	if (unlikely((len + IPW_RX_FRAME_SIZE) &gt; skb_tailroom(rxb-&gt;skb))) {</div><div class='add'>+		priv-&gt;prom_priv-&gt;ieee-&gt;stats.rx_errors++;</div><div class='add'>+		IPW_DEBUG_DROP("Corruption detected! Oh no!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We only process data packets if the interface is open */</div><div class='add'>+	if (unlikely(!netif_running(priv-&gt;prom_net_dev))) {</div><div class='add'>+		priv-&gt;prom_priv-&gt;ieee-&gt;stats.rx_dropped++;</div><div class='add'>+		IPW_DEBUG_DROP("Dropping packet while interface is not up.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Libpcap 0.9.3+ can handle variable length radiotap, so we'll use</div><div class='add'>+	 * that now */</div><div class='add'>+	if (len &gt; IPW_RX_BUF_SIZE - sizeof(struct ipw_rt_hdr)) {</div><div class='add'>+		/* FIXME: Should alloc bigger skb instead */</div><div class='add'>+		priv-&gt;prom_priv-&gt;ieee-&gt;stats.rx_dropped++;</div><div class='add'>+		IPW_DEBUG_DROP("Dropping too large packet in monitor\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = (void *)rxb-&gt;skb-&gt;data + IPW_RX_FRAME_SIZE;</div><div class='add'>+	if (ieee80211_is_management(hdr-&gt;frame_ctl)) {</div><div class='add'>+		if (filter &amp; IPW_PROM_NO_MGMT)</div><div class='add'>+			return;</div><div class='add'>+		if (filter &amp; IPW_PROM_MGMT_HEADER_ONLY)</div><div class='add'>+			hdr_only = 1;</div><div class='add'>+	} else if (ieee80211_is_control(hdr-&gt;frame_ctl)) {</div><div class='add'>+		if (filter &amp; IPW_PROM_NO_CTL)</div><div class='add'>+			return;</div><div class='add'>+		if (filter &amp; IPW_PROM_CTL_HEADER_ONLY)</div><div class='add'>+			hdr_only = 1;</div><div class='add'>+	} else if (ieee80211_is_data(hdr-&gt;frame_ctl)) {</div><div class='add'>+		if (filter &amp; IPW_PROM_NO_DATA)</div><div class='add'>+			return;</div><div class='add'>+		if (filter &amp; IPW_PROM_DATA_HEADER_ONLY)</div><div class='add'>+			hdr_only = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the SKB since this is for the promiscuous side */</div><div class='add'>+	skb = skb_copy(rxb-&gt;skb, GFP_ATOMIC);</div><div class='add'>+	if (skb == NULL) {</div><div class='add'>+		IPW_ERROR("skb_clone failed for promiscuous copy.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy the frame data to write after where the radiotap header goes */</div><div class='add'>+	ipw_rt = (void *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (hdr_only)</div><div class='add'>+		len = ieee80211_get_hdrlen(hdr-&gt;frame_ctl);</div><div class='add'>+</div><div class='add'>+	memcpy(ipw_rt-&gt;payload, hdr, len);</div><div class='add'>+</div><div class='add'>+	/* Zero the radiotap static buffer  ...  We only need to zero the bytes</div><div class='add'>+	 * NOT part of our real header, saves a little time.</div><div class='add'>+	 *</div><div class='add'>+	 * No longer necessary since we fill in all our data.  Purge before</div><div class='add'>+	 * merging patch officially.</div><div class='add'>+	 * memset(rxb-&gt;skb-&gt;data + sizeof(struct ipw_rt_hdr), 0,</div><div class='add'>+	 *        IEEE80211_RADIOTAP_HDRLEN - sizeof(struct ipw_rt_hdr));</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ipw_rt-&gt;rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;</div><div class='add'>+	ipw_rt-&gt;rt_hdr.it_pad = 0;	/* always good to zero */</div><div class='add'>+	ipw_rt-&gt;rt_hdr.it_len = sizeof(*ipw_rt);	/* total header+data */</div><div class='add'>+</div><div class='add'>+	/* Set the size of the skb to the size of the frame */</div><div class='add'>+	skb_put(skb, ipw_rt-&gt;rt_hdr.it_len + len);</div><div class='add'>+</div><div class='add'>+	/* Big bitfield of all the fields we provide in radiotap */</div><div class='add'>+	ipw_rt-&gt;rt_hdr.it_present =</div><div class='add'>+	    ((1 &lt;&lt; IEEE80211_RADIOTAP_FLAGS) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_TSFT) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_RATE) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_DBM_ANTNOISE) |</div><div class='add'>+	     (1 &lt;&lt; IEEE80211_RADIOTAP_ANTENNA));</div><div class='add'>+</div><div class='add'>+	/* Zero the flags, we'll add to them as we go */</div><div class='add'>+	ipw_rt-&gt;rt_flags = 0;</div><div class='add'>+</div><div class='add'>+	ipw_rt-&gt;rt_tsf = tsf;</div><div class='add'>+</div><div class='add'>+	/* Convert to DBM */</div><div class='add'>+	ipw_rt-&gt;rt_dbmsignal = signal;</div><div class='add'>+	ipw_rt-&gt;rt_dbmnoise = noise;</div><div class='add'>+</div><div class='add'>+	/* Convert the channel data and set the flags */</div><div class='add'>+	ipw_rt-&gt;rt_channel = cpu_to_le16(ieee80211chan2mhz(channel));</div><div class='add'>+	if (channel &gt; 14) {	/* 802.11a */</div><div class='add'>+		ipw_rt-&gt;rt_chbitmask =</div><div class='add'>+		    cpu_to_le16((IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ));</div><div class='add'>+	} else if (phy_flags &amp; (1 &lt;&lt; 5)) {	/* 802.11b */</div><div class='add'>+		ipw_rt-&gt;rt_chbitmask =</div><div class='add'>+		    cpu_to_le16((IEEE80211_CHAN_CCK | IEEE80211_CHAN_2GHZ));</div><div class='add'>+	} else {		/* 802.11g */</div><div class='add'>+		ipw_rt-&gt;rt_chbitmask =</div><div class='add'>+		    (IEEE80211_CHAN_OFDM | IEEE80211_CHAN_2GHZ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set the rate in multiples of 500k/s */</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case IPW_TX_RATE_1MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 2;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_2MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 4;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_5MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 10;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_6MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 12;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_9MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 18;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_11MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 22;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_12MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 24;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_18MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 36;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_24MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 48;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_36MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 72;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_48MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 96;</div><div class='add'>+		break;</div><div class='add'>+	case IPW_TX_RATE_54MB:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 108;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ipw_rt-&gt;rt_rate = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* antenna number */</div><div class='add'>+	ipw_rt-&gt;rt_antenna = (phy_flags &amp; 3);</div><div class='add'>+</div><div class='add'>+	/* set the preamble flag if we have it */</div><div class='add'>+	if (phy_flags &amp; (1 &lt;&lt; 6))</div><div class='add'>+		ipw_rt-&gt;rt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;</div><div class='add'>+</div><div class='add'>+	IPW_DEBUG_RX("Rx packet of %d bytes.\n", skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (!ieee80211_rx(priv-&gt;prom_priv-&gt;ieee, skb, stats)) {</div><div class='add'>+		priv-&gt;prom_priv-&gt;ieee-&gt;stats.rx_errors++;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int is_network_packet(struct ipw_priv *priv,</div><div class='ctx'> 				    struct ieee80211_hdr_4addr *header)</div><div class='ctx'> {</div><div class='hunk'>@@ -7808,15 +8194,21 @@ static void ipw_rx(struct ipw_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 				priv-&gt;rx_packets++;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	if (priv-&gt;prom_net_dev &amp;&amp; netif_running(priv-&gt;prom_net_dev))</div><div class='add'>+		ipw_handle_promiscuous_rx(priv, rxb, &amp;stats);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IPW2200_MONITOR</div><div class='ctx'> 				if (priv-&gt;ieee-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='del'>-#ifdef CONFIG_IEEE80211_RADIOTAP</div><div class='del'>-					ipw_handle_data_packet_monitor(priv,</div><div class='del'>-								       rxb,</div><div class='del'>-								       &amp;stats);</div><div class='add'>+#ifdef CONFIG_IPW2200_RADIOTAP</div><div class='add'>+</div><div class='add'>+                ipw_handle_data_packet_monitor(priv,</div><div class='add'>+					       rxb,</div><div class='add'>+					       &amp;stats);</div><div class='ctx'> #else</div><div class='del'>-					ipw_handle_data_packet(priv, rxb,</div><div class='del'>-							       &amp;stats);</div><div class='add'>+		ipw_handle_data_packet(priv, rxb,</div><div class='add'>+				       &amp;stats);</div><div class='ctx'> #endif</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -7837,9 +8229,9 @@ static void ipw_rx(struct ipw_priv *priv)</div><div class='ctx'> 				if (network_packet &amp;&amp; priv-&gt;assoc_network) {</div><div class='ctx'> 					priv-&gt;assoc_network-&gt;stats.rssi =</div><div class='ctx'> 					    stats.rssi;</div><div class='del'>-					average_add(&amp;priv-&gt;average_rssi,</div><div class='del'>-						    stats.rssi);</div><div class='del'>-					priv-&gt;last_rx_rssi = stats.rssi;</div><div class='add'>+					priv-&gt;exp_avg_rssi =</div><div class='add'>+					    exponential_average(priv-&gt;exp_avg_rssi,</div><div class='add'>+					    stats.rssi, DEPTH_RSSI);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='ctx'> 				IPW_DEBUG_RX("Frame: len=%u\n",</div><div class='hunk'>@@ -7982,10 +8374,10 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)</div><div class='ctx'> 		IPW_DEBUG_INFO("Bind to static channel %d\n", channel);</div><div class='ctx'> 		/* TODO: Validate that provided channel is in range */</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> 	ipw_qos_init(priv, qos_enable, qos_burst_enable,</div><div class='ctx'> 		     burst_duration_CCK, burst_duration_OFDM);</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -7996,7 +8388,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)</div><div class='ctx'> #ifdef CONFIG_IPW2200_MONITOR</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		priv-&gt;ieee-&gt;iw_mode = IW_MODE_MONITOR;</div><div class='del'>-#ifdef CONFIG_IEEE80211_RADIOTAP</div><div class='add'>+#ifdef CONFIG_IPW2200_RADIOTAP</div><div class='ctx'> 		priv-&gt;net_dev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='ctx'> #else</div><div class='ctx'> 		priv-&gt;net_dev-&gt;type = ARPHRD_IEEE80211;</div><div class='hunk'>@@ -8251,7 +8643,7 @@ static int ipw_wx_set_mode(struct net_device *dev,</div><div class='ctx'> 		priv-&gt;net_dev-&gt;type = ARPHRD_ETHER;</div><div class='ctx'> </div><div class='ctx'> 	if (wrqu-&gt;mode == IW_MODE_MONITOR)</div><div class='del'>-#ifdef CONFIG_IEEE80211_RADIOTAP</div><div class='add'>+#ifdef CONFIG_IPW2200_RADIOTAP</div><div class='ctx'> 		priv-&gt;net_dev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='ctx'> #else</div><div class='ctx'> 		priv-&gt;net_dev-&gt;type = ARPHRD_IEEE80211;</div><div class='hunk'>@@ -8379,7 +8771,8 @@ static int ipw_wx_get_range(struct net_device *dev,</div><div class='ctx'> 	/* Event capability (kernel + driver) */</div><div class='ctx'> 	range-&gt;event_capa[0] = (IW_EVENT_CAPA_K_0 |</div><div class='ctx'> 				IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) |</div><div class='del'>-				IW_EVENT_CAPA_MASK(SIOCGIWAP));</div><div class='add'>+				IW_EVENT_CAPA_MASK(SIOCGIWAP) |</div><div class='add'>+				IW_EVENT_CAPA_MASK(SIOCGIWSCAN));</div><div class='ctx'> 	range-&gt;event_capa[1] = IW_EVENT_CAPA_K_1;</div><div class='ctx'> </div><div class='ctx'> 	range-&gt;enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |</div><div class='hunk'>@@ -8734,6 +9127,7 @@ static int ipw_wx_get_rate(struct net_device *dev,</div><div class='ctx'> 	struct ipw_priv *priv = ieee80211_priv(dev);</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	wrqu-&gt;bitrate.value = priv-&gt;last_rate;</div><div class='add'>+	wrqu-&gt;bitrate.fixed = (priv-&gt;config &amp; CFG_FIXED_RATE) ? 1 : 0;</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mutex);</div><div class='ctx'> 	IPW_DEBUG_WX("GET Rate -&gt; %d \n", wrqu-&gt;bitrate.value);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -9351,7 +9745,7 @@ static int ipw_wx_set_monitor(struct net_device *dev,</div><div class='ctx'> 	IPW_DEBUG_WX("SET MONITOR: %d %d\n", enable, parms[1]);</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		if (priv-&gt;ieee-&gt;iw_mode != IW_MODE_MONITOR) {</div><div class='del'>-#ifdef CONFIG_IEEE80211_RADIOTAP</div><div class='add'>+#ifdef CONFIG_IPW2200_RADIOTAP</div><div class='ctx'> 			priv-&gt;net_dev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='ctx'> #else</div><div class='ctx'> 			priv-&gt;net_dev-&gt;type = ARPHRD_IEEE80211;</div><div class='hunk'>@@ -9579,8 +9973,8 @@ static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wstats-&gt;qual.qual = priv-&gt;quality;</div><div class='del'>-	wstats-&gt;qual.level = average_value(&amp;priv-&gt;average_rssi);</div><div class='del'>-	wstats-&gt;qual.noise = average_value(&amp;priv-&gt;average_noise);</div><div class='add'>+	wstats-&gt;qual.level = priv-&gt;exp_avg_rssi;</div><div class='add'>+	wstats-&gt;qual.noise = priv-&gt;exp_avg_noise;</div><div class='ctx'> 	wstats-&gt;qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |</div><div class='ctx'> 	    IW_QUAL_NOISE_UPDATED | IW_QUAL_DBM;</div><div class='ctx'> </div><div class='hunk'>@@ -9608,7 +10002,9 @@ static  void init_sys_config(struct ipw_sys_config *sys_config)</div><div class='ctx'> 	sys_config-&gt;disable_unicast_decryption = 1;</div><div class='ctx'> 	sys_config-&gt;exclude_multicast_unencrypted = 0;</div><div class='ctx'> 	sys_config-&gt;disable_multicast_decryption = 1;</div><div class='del'>-	sys_config-&gt;antenna_diversity = CFG_SYS_ANTENNA_SLOW_DIV;</div><div class='add'>+	if (antenna &lt; CFG_SYS_ANTENNA_BOTH || antenna &gt; CFG_SYS_ANTENNA_B)</div><div class='add'>+		antenna = CFG_SYS_ANTENNA_BOTH;</div><div class='add'>+	sys_config-&gt;antenna_diversity = antenna;</div><div class='ctx'> 	sys_config-&gt;pass_crc_to_host = 0;	/* TODO: See if 1 gives us FCS */</div><div class='ctx'> 	sys_config-&gt;dot11g_auto_detection = 0;</div><div class='ctx'> 	sys_config-&gt;enable_cts_to_self = 0;</div><div class='hunk'>@@ -9647,11 +10043,11 @@ we need to heavily modify the ieee80211_skb_to_txb.</div><div class='ctx'> static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,</div><div class='ctx'> 			     int pri)</div><div class='ctx'> {</div><div class='del'>-	struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)</div><div class='add'>+	struct ieee80211_hdr_3addrqos *hdr = (struct ieee80211_hdr_3addrqos *)</div><div class='ctx'> 	    txb-&gt;fragments[0]-&gt;data;</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	struct tfd_frame *tfd;</div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> 	int tx_id = ipw_get_tx_queue_number(priv, pri);</div><div class='ctx'> 	struct clx2_tx_queue *txq = &amp;priv-&gt;txq[tx_id];</div><div class='ctx'> #else</div><div class='hunk'>@@ -9662,9 +10058,9 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,</div><div class='ctx'> 	u16 remaining_bytes;</div><div class='ctx'> 	int fc;</div><div class='ctx'> </div><div class='add'>+	hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr-&gt;frame_ctl));</div><div class='ctx'> 	switch (priv-&gt;ieee-&gt;iw_mode) {</div><div class='ctx'> 	case IW_MODE_ADHOC:</div><div class='del'>-		hdr_len = IEEE80211_3ADDR_LEN;</div><div class='ctx'> 		unicast = !is_multicast_ether_addr(hdr-&gt;addr1);</div><div class='ctx'> 		id = ipw_find_station(priv, hdr-&gt;addr1);</div><div class='ctx'> 		if (id == IPW_INVALID_STATION) {</div><div class='hunk'>@@ -9681,7 +10077,6 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,</div><div class='ctx'> 	case IW_MODE_INFRA:</div><div class='ctx'> 	default:</div><div class='ctx'> 		unicast = !is_multicast_ether_addr(hdr-&gt;addr3);</div><div class='del'>-		hdr_len = IEEE80211_3ADDR_LEN;</div><div class='ctx'> 		id = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -9759,9 +10154,10 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,</div><div class='ctx'> 		/* No hardware encryption */</div><div class='ctx'> 		tfd-&gt;u.data.tx_flags |= DCT_FLAG_NO_WEP;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='del'>-	ipw_qos_set_tx_queue_command(priv, pri, &amp;(tfd-&gt;u.data), unicast);</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='add'>+	if (fc &amp; IEEE80211_STYPE_QOS_DATA)</div><div class='add'>+		ipw_qos_set_tx_queue_command(priv, pri, &amp;(tfd-&gt;u.data));</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> 	/* payload */</div><div class='ctx'> 	tfd-&gt;u.data.num_chunks = cpu_to_le32(min((u8) (NUM_TFD_CHUNKS - 2),</div><div class='hunk'>@@ -9841,12 +10237,12 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,</div><div class='ctx'> static int ipw_net_is_queue_full(struct net_device *dev, int pri)</div><div class='ctx'> {</div><div class='ctx'> 	struct ipw_priv *priv = ieee80211_priv(dev);</div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> 	int tx_id = ipw_get_tx_queue_number(priv, pri);</div><div class='ctx'> 	struct clx2_tx_queue *txq = &amp;priv-&gt;txq[tx_id];</div><div class='ctx'> #else</div><div class='ctx'> 	struct clx2_tx_queue *txq = &amp;priv-&gt;txq[0];</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> 	if (ipw_queue_space(&amp;txq-&gt;q) &lt; txq-&gt;q.high_mark)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -9854,6 +10250,88 @@ static int ipw_net_is_queue_full(struct net_device *dev, int pri)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,</div><div class='add'>+				      struct ieee80211_txb *txb)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_rx_stats dummystats;</div><div class='add'>+	struct ieee80211_hdr *hdr;</div><div class='add'>+	u8 n;</div><div class='add'>+	u16 filter = priv-&gt;prom_priv-&gt;filter;</div><div class='add'>+	int hdr_only = 0;</div><div class='add'>+</div><div class='add'>+	if (filter &amp; IPW_PROM_NO_TX)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(&amp;dummystats, 0, sizeof(dummystats));</div><div class='add'>+</div><div class='add'>+	/* Filtering of fragment chains is done agains the first fragment */</div><div class='add'>+	hdr = (void *)txb-&gt;fragments[0]-&gt;data;</div><div class='add'>+	if (ieee80211_is_management(hdr-&gt;frame_ctl)) {</div><div class='add'>+		if (filter &amp; IPW_PROM_NO_MGMT)</div><div class='add'>+			return;</div><div class='add'>+		if (filter &amp; IPW_PROM_MGMT_HEADER_ONLY)</div><div class='add'>+			hdr_only = 1;</div><div class='add'>+	} else if (ieee80211_is_control(hdr-&gt;frame_ctl)) {</div><div class='add'>+		if (filter &amp; IPW_PROM_NO_CTL)</div><div class='add'>+			return;</div><div class='add'>+		if (filter &amp; IPW_PROM_CTL_HEADER_ONLY)</div><div class='add'>+			hdr_only = 1;</div><div class='add'>+	} else if (ieee80211_is_data(hdr-&gt;frame_ctl)) {</div><div class='add'>+		if (filter &amp; IPW_PROM_NO_DATA)</div><div class='add'>+			return;</div><div class='add'>+		if (filter &amp; IPW_PROM_DATA_HEADER_ONLY)</div><div class='add'>+			hdr_only = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for(n=0; n&lt;txb-&gt;nr_frags; ++n) {</div><div class='add'>+		struct sk_buff *src = txb-&gt;fragments[n];</div><div class='add'>+		struct sk_buff *dst;</div><div class='add'>+		struct ieee80211_radiotap_header *rt_hdr;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		if (hdr_only) {</div><div class='add'>+			hdr = (void *)src-&gt;data;</div><div class='add'>+			len = ieee80211_get_hdrlen(hdr-&gt;frame_ctl);</div><div class='add'>+		} else</div><div class='add'>+			len = src-&gt;len;</div><div class='add'>+</div><div class='add'>+		dst = alloc_skb(</div><div class='add'>+			len + IEEE80211_RADIOTAP_HDRLEN, GFP_ATOMIC);</div><div class='add'>+		if (!dst) continue;</div><div class='add'>+</div><div class='add'>+		rt_hdr = (void *)skb_put(dst, sizeof(*rt_hdr));</div><div class='add'>+</div><div class='add'>+		rt_hdr-&gt;it_version = PKTHDR_RADIOTAP_VERSION;</div><div class='add'>+		rt_hdr-&gt;it_pad = 0;</div><div class='add'>+		rt_hdr-&gt;it_present = 0; /* after all, it's just an idea */</div><div class='add'>+		rt_hdr-&gt;it_present |=  (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL);</div><div class='add'>+</div><div class='add'>+		*(u16*)skb_put(dst, sizeof(u16)) = cpu_to_le16(</div><div class='add'>+			ieee80211chan2mhz(priv-&gt;channel));</div><div class='add'>+		if (priv-&gt;channel &gt; 14) 	/* 802.11a */</div><div class='add'>+			*(u16*)skb_put(dst, sizeof(u16)) =</div><div class='add'>+				cpu_to_le16(IEEE80211_CHAN_OFDM |</div><div class='add'>+					     IEEE80211_CHAN_5GHZ);</div><div class='add'>+		else if (priv-&gt;ieee-&gt;mode == IEEE_B) /* 802.11b */</div><div class='add'>+			*(u16*)skb_put(dst, sizeof(u16)) =</div><div class='add'>+				cpu_to_le16(IEEE80211_CHAN_CCK |</div><div class='add'>+					     IEEE80211_CHAN_2GHZ);</div><div class='add'>+		else 		/* 802.11g */</div><div class='add'>+			*(u16*)skb_put(dst, sizeof(u16)) =</div><div class='add'>+				cpu_to_le16(IEEE80211_CHAN_OFDM |</div><div class='add'>+				 IEEE80211_CHAN_2GHZ);</div><div class='add'>+</div><div class='add'>+		rt_hdr-&gt;it_len = dst-&gt;len;</div><div class='add'>+</div><div class='add'>+		memcpy(skb_put(dst, len), src-&gt;data, len);</div><div class='add'>+</div><div class='add'>+		if (!ieee80211_rx(priv-&gt;prom_priv-&gt;ieee, dst, &amp;dummystats))</div><div class='add'>+			dev_kfree_skb_any(dst);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb,</div><div class='ctx'> 				   struct net_device *dev, int pri)</div><div class='ctx'> {</div><div class='hunk'>@@ -9871,6 +10349,11 @@ static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb,</div><div class='ctx'> 		goto fail_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	if (rtap_iface &amp;&amp; netif_running(priv-&gt;prom_net_dev))</div><div class='add'>+		ipw_handle_promiscuous_tx(priv, txb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	ret = ipw_tx_skb(priv, txb, pri);</div><div class='ctx'> 	if (ret == NETDEV_TX_OK)</div><div class='ctx'> 		__ipw_led_activity_on(priv);</div><div class='hunk'>@@ -9991,7 +10474,7 @@ static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock(&amp;priv-&gt;irq_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!(priv-&gt;status &amp; STATUS_INT_ENABLED)) {</div><div class='ctx'> 		/* Shared IRQ */</div><div class='hunk'>@@ -10013,7 +10496,7 @@ static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* tell the device to stop sending interrupts */</div><div class='del'>-	ipw_disable_interrupts(priv);</div><div class='add'>+	__ipw_disable_interrupts(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* ack current interrupts */</div><div class='ctx'> 	inta &amp;= (IPW_INTA_MASK_ALL &amp; inta_mask);</div><div class='hunk'>@@ -10024,11 +10507,11 @@ static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	tasklet_schedule(&amp;priv-&gt;irq_tasklet);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;irq_lock);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'>       none:</div><div class='del'>-	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;irq_lock);</div><div class='ctx'> 	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10169,10 +10652,10 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv)</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;merge_networks,</div><div class='ctx'> 		  (void (*)(void *))ipw_merge_adhoc_network, priv);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;qos_activate, (void (*)(void *))ipw_bg_qos_activate,</div><div class='ctx'> 		  priv);</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> 	tasklet_init(&amp;priv-&gt;irq_tasklet, (void (*)(unsigned long))</div><div class='ctx'> 		     ipw_irq_tasklet, (unsigned long)priv);</div><div class='hunk'>@@ -10318,12 +10801,21 @@ static int ipw_config(struct ipw_priv *priv)</div><div class='ctx'> 			    |= CFG_BT_COEXISTENCE_OOB;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	if (priv-&gt;prom_net_dev &amp;&amp; netif_running(priv-&gt;prom_net_dev)) {</div><div class='add'>+		priv-&gt;sys_config.accept_all_data_frames = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_non_directed_frames = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_bcpr = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_frames = 1;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;ieee-&gt;iw_mode == IW_MODE_ADHOC)</div><div class='ctx'> 		priv-&gt;sys_config.answer_broadcast_ssid_probe = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;sys_config.answer_broadcast_ssid_probe = 0;</div><div class='ctx'> </div><div class='del'>-	if (ipw_send_system_config(priv, &amp;priv-&gt;sys_config))</div><div class='add'>+	if (ipw_send_system_config(priv))</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	init_supported_rates(priv, &amp;priv-&gt;rates);</div><div class='hunk'>@@ -10335,10 +10827,10 @@ static int ipw_config(struct ipw_priv *priv)</div><div class='ctx'> 		if (ipw_send_rts_threshold(priv, priv-&gt;rts_threshold))</div><div class='ctx'> 			goto error;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> 	IPW_DEBUG_QOS("QoS: call ipw_qos_activate\n");</div><div class='ctx'> 	ipw_qos_activate(priv, NULL);</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> 	if (ipw_set_random_seed(priv))</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -10639,6 +11131,7 @@ static int ipw_up(struct ipw_priv *priv)</div><div class='ctx'> 		if (priv-&gt;cmdlog == NULL) {</div><div class='ctx'> 			IPW_ERROR("Error allocating %d command log entries.\n",</div><div class='ctx'> 				  cmdlog);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memset(priv-&gt;cmdlog, 0, sizeof(*priv-&gt;cmdlog) * cmdlog);</div><div class='ctx'> 			priv-&gt;cmdlog_len = cmdlog;</div><div class='hunk'>@@ -10860,6 +11353,10 @@ static struct attribute *ipw_sysfs_entries[] = {</div><div class='ctx'> 	&amp;dev_attr_led.attr,</div><div class='ctx'> 	&amp;dev_attr_speed_scan.attr,</div><div class='ctx'> 	&amp;dev_attr_net_stats.attr,</div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	&amp;dev_attr_rtap_iface.attr,</div><div class='add'>+	&amp;dev_attr_rtap_filter.attr,</div><div class='add'>+#endif</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -10868,6 +11365,109 @@ static struct attribute_group ipw_attribute_group = {</div><div class='ctx'> 	.attrs = ipw_sysfs_entries,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+static int ipw_prom_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ipw_prom_priv *prom_priv = ieee80211_priv(dev);</div><div class='add'>+	struct ipw_priv *priv = prom_priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	IPW_DEBUG_INFO("prom dev-&gt;open\n");</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ieee-&gt;iw_mode != IW_MODE_MONITOR) {</div><div class='add'>+		priv-&gt;sys_config.accept_all_data_frames = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_non_directed_frames = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_bcpr = 1;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_frames = 1;</div><div class='add'>+</div><div class='add'>+		ipw_send_system_config(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipw_prom_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ipw_prom_priv *prom_priv = ieee80211_priv(dev);</div><div class='add'>+	struct ipw_priv *priv = prom_priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	IPW_DEBUG_INFO("prom dev-&gt;stop\n");</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ieee-&gt;iw_mode != IW_MODE_MONITOR) {</div><div class='add'>+		priv-&gt;sys_config.accept_all_data_frames = 0;</div><div class='add'>+		priv-&gt;sys_config.accept_non_directed_frames = 0;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_bcpr = 0;</div><div class='add'>+		priv-&gt;sys_config.accept_all_mgmt_frames = 0;</div><div class='add'>+</div><div class='add'>+		ipw_send_system_config(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	IPW_DEBUG_INFO("prom dev-&gt;xmit\n");</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *ipw_prom_get_stats(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ipw_prom_priv *prom_priv = ieee80211_priv(dev);</div><div class='add'>+	return &amp;prom_priv-&gt;ieee-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ipw_prom_alloc(struct ipw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;prom_net_dev)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;prom_net_dev = alloc_ieee80211(sizeof(struct ipw_prom_priv));</div><div class='add'>+	if (priv-&gt;prom_net_dev == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;prom_priv = ieee80211_priv(priv-&gt;prom_net_dev);</div><div class='add'>+	priv-&gt;prom_priv-&gt;ieee = netdev_priv(priv-&gt;prom_net_dev);</div><div class='add'>+	priv-&gt;prom_priv-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	strcpy(priv-&gt;prom_net_dev-&gt;name, "rtap%d");</div><div class='add'>+</div><div class='add'>+	priv-&gt;prom_net_dev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='add'>+	priv-&gt;prom_net_dev-&gt;open = ipw_prom_open;</div><div class='add'>+	priv-&gt;prom_net_dev-&gt;stop = ipw_prom_stop;</div><div class='add'>+	priv-&gt;prom_net_dev-&gt;get_stats = ipw_prom_get_stats;</div><div class='add'>+	priv-&gt;prom_net_dev-&gt;hard_start_xmit = ipw_prom_hard_start_xmit;</div><div class='add'>+</div><div class='add'>+	priv-&gt;prom_priv-&gt;ieee-&gt;iw_mode = IW_MODE_MONITOR;</div><div class='add'>+</div><div class='add'>+	rc = register_netdev(priv-&gt;prom_net_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		free_ieee80211(priv-&gt;prom_net_dev);</div><div class='add'>+		priv-&gt;prom_net_dev = NULL;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ipw_prom_free(struct ipw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;prom_net_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	unregister_netdev(priv-&gt;prom_net_dev);</div><div class='add'>+	free_ieee80211(priv-&gt;prom_net_dev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;prom_net_dev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -10891,6 +11491,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> #ifdef CONFIG_IPW2200_DEBUG</div><div class='ctx'> 	ipw_debug_level = debug;</div><div class='ctx'> #endif</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;irq_lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='ctx'> 	for (i = 0; i &lt; IPW_IBSS_MAC_HASH_SIZE; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;priv-&gt;ibss_mac_hash[i]);</div><div class='hunk'>@@ -10944,7 +11545,7 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	ipw_sw_reset(priv, 1);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pdev-&gt;irq, ipw_isr, SA_SHIRQ, DRV_NAME, priv);</div><div class='add'>+	err = request_irq(pdev-&gt;irq, ipw_isr, IRQF_SHARED, DRV_NAME, priv);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		IPW_ERROR("Error allocating IRQ %d\n", pdev-&gt;irq);</div><div class='ctx'> 		goto out_destroy_workqueue;</div><div class='hunk'>@@ -10959,11 +11560,12 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	priv-&gt;ieee-&gt;set_security = shim__set_security;</div><div class='ctx'> 	priv-&gt;ieee-&gt;is_queue_full = ipw_net_is_queue_full;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='add'>+	priv-&gt;ieee-&gt;is_qos_active = ipw_is_qos_active;</div><div class='ctx'> 	priv-&gt;ieee-&gt;handle_probe_response = ipw_handle_beacon;</div><div class='ctx'> 	priv-&gt;ieee-&gt;handle_beacon = ipw_handle_probe_response;</div><div class='ctx'> 	priv-&gt;ieee-&gt;handle_assoc_response = ipw_handle_assoc_response;</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;ieee-&gt;perfect_rssi = -20;</div><div class='ctx'> 	priv-&gt;ieee-&gt;worst_rssi = -85;</div><div class='hunk'>@@ -10997,6 +11599,18 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_remove_sysfs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	if (rtap_iface) {</div><div class='add'>+	        err = ipw_prom_alloc(priv);</div><div class='add'>+		if (err) {</div><div class='add'>+			IPW_ERROR("Failed to register promiscuous network "</div><div class='add'>+				  "device (error %d).\n", err);</div><div class='add'>+			unregister_netdev(priv-&gt;net_dev);</div><div class='add'>+			goto out_remove_sysfs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO DRV_NAME ": Detected geography %s (%d 802.11bg "</div><div class='ctx'> 	       "channels, %d 802.11a channels)\n",</div><div class='ctx'> 	       priv-&gt;ieee-&gt;geo.name, priv-&gt;ieee-&gt;geo.bg_channels,</div><div class='hunk'>@@ -11071,10 +11685,12 @@ static void ipw_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;error) {</div><div class='del'>-		ipw_free_error_log(priv-&gt;error);</div><div class='del'>-		priv-&gt;error = NULL;</div><div class='del'>-	}</div><div class='add'>+	kfree(priv-&gt;error);</div><div class='add'>+	priv-&gt;error = NULL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	ipw_prom_free(priv);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	free_irq(pdev-&gt;irq, priv);</div><div class='ctx'> 	iounmap(priv-&gt;hw_base);</div><div class='hunk'>@@ -11200,7 +11816,12 @@ MODULE_PARM_DESC(debug, "debug output mask");</div><div class='ctx'> module_param(channel, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(channel, "channel to limit associate to (default 0 [ANY])");</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_IPW_QOS</div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+module_param(rtap_iface, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(rtap_iface, "create the rtap interface (1 - create, default 0)");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_IPW2200_QOS</div><div class='ctx'> module_param(qos_enable, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(qos_enable, "enable all QoS functionalitis");</div><div class='ctx'> </div><div class='hunk'>@@ -11215,7 +11836,7 @@ MODULE_PARM_DESC(burst_duration_CCK, "set CCK burst value");</div><div class='ctx'> </div><div class='ctx'> module_param(burst_duration_OFDM, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(burst_duration_OFDM, "set OFDM burst value");</div><div class='del'>-#endif				/* CONFIG_IPW_QOS */</div><div class='add'>+#endif				/* CONFIG_IPW2200_QOS */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_IPW2200_MONITOR</div><div class='ctx'> module_param(mode, int, 0444);</div><div class='hunk'>@@ -11238,5 +11859,8 @@ MODULE_PARM_DESC(cmdlog,</div><div class='ctx'> module_param(roaming, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(roaming, "enable roaming support (default on)");</div><div class='ctx'> </div><div class='add'>+module_param(antenna, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(antenna, "select antenna 1=Main, 3=Aux, default 0 [both], 2=slow_diversity (choose the one with lower background noise)");</div><div class='add'>+</div><div class='ctx'> module_exit(ipw_exit);</div><div class='ctx'> module_init(ipw_init);</div><div class='head'>diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h<br/>index 4b9804900702..8b1cd7c749a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2200.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ipw2200.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ipw2200.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/ipw2200.h</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -789,7 +788,7 @@ struct ipw_sys_config {</div><div class='ctx'> 	u8 bt_coexist_collision_thr;</div><div class='ctx'> 	u8 silence_threshold;</div><div class='ctx'> 	u8 accept_all_mgmt_bcpr;</div><div class='del'>-	u8 accept_all_mgtm_frames;</div><div class='add'>+	u8 accept_all_mgmt_frames;</div><div class='ctx'> 	u8 pass_noise_stats_to_host;</div><div class='ctx'> 	u8 reserved3;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='hunk'>@@ -1122,17 +1121,70 @@ struct ipw_fw_error {</div><div class='ctx'> 	u8 payload[0];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+</div><div class='add'>+enum ipw_prom_filter {</div><div class='add'>+	IPW_PROM_CTL_HEADER_ONLY = (1 &lt;&lt; 0),</div><div class='add'>+	IPW_PROM_MGMT_HEADER_ONLY = (1 &lt;&lt; 1),</div><div class='add'>+	IPW_PROM_DATA_HEADER_ONLY = (1 &lt;&lt; 2),</div><div class='add'>+	IPW_PROM_ALL_HEADER_ONLY = 0xf, /* bits 0..3 */</div><div class='add'>+	IPW_PROM_NO_TX = (1 &lt;&lt; 4),</div><div class='add'>+	IPW_PROM_NO_RX = (1 &lt;&lt; 5),</div><div class='add'>+	IPW_PROM_NO_CTL = (1 &lt;&lt; 6),</div><div class='add'>+	IPW_PROM_NO_MGMT = (1 &lt;&lt; 7),</div><div class='add'>+	IPW_PROM_NO_DATA = (1 &lt;&lt; 8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ipw_priv;</div><div class='add'>+struct ipw_prom_priv {</div><div class='add'>+	struct ipw_priv *priv;</div><div class='add'>+	struct ieee80211_device *ieee;</div><div class='add'>+	enum ipw_prom_filter filter;</div><div class='add'>+	int tx_packets;</div><div class='add'>+	int rx_packets;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_IPW2200_RADIOTAP) || defined(CONFIG_IPW2200_PROMISCUOUS)</div><div class='add'>+/* Magic struct that slots into the radiotap header -- no reason</div><div class='add'>+ * to build this manually element by element, we can write it much</div><div class='add'>+ * more efficiently than we can parse it. ORDER MATTERS HERE</div><div class='add'>+ *</div><div class='add'>+ * When sent to us via the simulated Rx interface in sysfs, the entire</div><div class='add'>+ * structure is provided regardless of any bits unset.</div><div class='add'>+ */</div><div class='add'>+struct ipw_rt_hdr {</div><div class='add'>+	struct ieee80211_radiotap_header rt_hdr;</div><div class='add'>+	u64 rt_tsf;      /* TSF */</div><div class='add'>+	u8 rt_flags;	/* radiotap packet flags */</div><div class='add'>+	u8 rt_rate;	/* rate in 500kb/s */</div><div class='add'>+	u16 rt_channel;	/* channel in mhz */</div><div class='add'>+	u16 rt_chbitmask;	/* channel bitfield */</div><div class='add'>+	s8 rt_dbmsignal;	/* signal in dbM, kluged to signed */</div><div class='add'>+	s8 rt_dbmnoise;</div><div class='add'>+	u8 rt_antenna;	/* antenna number */</div><div class='add'>+	u8 payload[0];  /* payload... */</div><div class='add'>+} __attribute__ ((packed));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct ipw_priv {</div><div class='ctx'> 	/* ieee device used by generic ieee processing code */</div><div class='ctx'> 	struct ieee80211_device *ieee;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='add'>+	spinlock_t irq_lock;</div><div class='ctx'> 	struct mutex mutex;</div><div class='ctx'> </div><div class='ctx'> 	/* basic pci-network driver stuff */</div><div class='ctx'> 	struct pci_dev *pci_dev;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_IPW2200_PROMISCUOUS</div><div class='add'>+	/* Promiscuous mode */</div><div class='add'>+	struct ipw_prom_priv *prom_priv;</div><div class='add'>+	struct net_device *prom_net_dev;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* pci hardware address support */</div><div class='ctx'> 	void __iomem *hw_base;</div><div class='ctx'> 	unsigned long hw_len;</div><div class='hunk'>@@ -1153,11 +1205,9 @@ struct ipw_priv {</div><div class='ctx'> 	u32 config;</div><div class='ctx'> 	u32 capability;</div><div class='ctx'> </div><div class='del'>-	u8 last_rx_rssi;</div><div class='del'>-	u8 last_noise;</div><div class='ctx'> 	struct average average_missed_beacons;</div><div class='del'>-	struct average average_rssi;</div><div class='del'>-	struct average average_noise;</div><div class='add'>+	s16 exp_avg_rssi;</div><div class='add'>+	s16 exp_avg_noise;</div><div class='ctx'> 	u32 port_type;</div><div class='ctx'> 	int rx_bufs_min;	  /**&lt; minimum number of bufs in Rx queue */</div><div class='ctx'> 	int rx_pend_max;	  /**&lt; maximum pending buffers for one IRQ */</div><div class='hunk'>@@ -1308,6 +1358,29 @@ struct ipw_priv {</div><div class='ctx'> </div><div class='ctx'> /* debug macros */</div><div class='ctx'> </div><div class='add'>+/* Debug and printf string expansion helpers for printing bitfields */</div><div class='add'>+#define BIT_FMT8 "%c%c%c%c-%c%c%c%c"</div><div class='add'>+#define BIT_FMT16 BIT_FMT8 ":" BIT_FMT8</div><div class='add'>+#define BIT_FMT32 BIT_FMT16 " " BIT_FMT16</div><div class='add'>+</div><div class='add'>+#define BITC(x,y) (((x&gt;&gt;y)&amp;1)?'1':'0')</div><div class='add'>+#define BIT_ARG8(x) \</div><div class='add'>+BITC(x,7),BITC(x,6),BITC(x,5),BITC(x,4),\</div><div class='add'>+BITC(x,3),BITC(x,2),BITC(x,1),BITC(x,0)</div><div class='add'>+</div><div class='add'>+#define BIT_ARG16(x) \</div><div class='add'>+BITC(x,15),BITC(x,14),BITC(x,13),BITC(x,12),\</div><div class='add'>+BITC(x,11),BITC(x,10),BITC(x,9),BITC(x,8),\</div><div class='add'>+BIT_ARG8(x)</div><div class='add'>+</div><div class='add'>+#define BIT_ARG32(x) \</div><div class='add'>+BITC(x,31),BITC(x,30),BITC(x,29),BITC(x,28),\</div><div class='add'>+BITC(x,27),BITC(x,26),BITC(x,25),BITC(x,24),\</div><div class='add'>+BITC(x,23),BITC(x,22),BITC(x,21),BITC(x,20),\</div><div class='add'>+BITC(x,19),BITC(x,18),BITC(x,17),BITC(x,16),\</div><div class='add'>+BIT_ARG16(x)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_IPW2200_DEBUG</div><div class='ctx'> #define IPW_DEBUG(level, fmt, args...) \</div><div class='ctx'> do { if (ipw_debug_level &amp; (level)) \</div><div class='head'>diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c<br/>index 9343d970537b..36b5e004305e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/netwave_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/netwave_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/netwave_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/netwave_cs.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> /* To have statistics (just packets sent) define this */</div><div class='ctx'> #undef NETWAVE_STATS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c<br/>index c2d0b09e0418..d6ed5781b93a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco.c</a></div><div class='hunk'>@@ -76,7 +76,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "orinoco"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -201,41 +200,12 @@ static struct {</div><div class='ctx'> /* Data types                                                       */</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> </div><div class='del'>-/* Used in Event handling.</div><div class='del'>- * We avoid nested structures as they break on ARM -- Moustafa */</div><div class='del'>-struct hermes_tx_descriptor_802_11 {</div><div class='del'>-	/* hermes_tx_descriptor */</div><div class='del'>-	__le16 status;</div><div class='del'>-	__le16 reserved1;</div><div class='del'>-	__le16 reserved2;</div><div class='del'>-	__le32 sw_support;</div><div class='del'>-	u8 retry_count;</div><div class='del'>-	u8 tx_rate;</div><div class='del'>-	__le16 tx_control;</div><div class='del'>-</div><div class='del'>-	/* ieee80211_hdr */</div><div class='add'>+/* Beginning of the Tx descriptor, used in TxExc handling */</div><div class='add'>+struct hermes_txexc_data {</div><div class='add'>+	struct hermes_tx_descriptor desc;</div><div class='ctx'> 	__le16 frame_ctl;</div><div class='ctx'> 	__le16 duration_id;</div><div class='ctx'> 	u8 addr1[ETH_ALEN];</div><div class='del'>-	u8 addr2[ETH_ALEN];</div><div class='del'>-	u8 addr3[ETH_ALEN];</div><div class='del'>-	__le16 seq_ctl;</div><div class='del'>-	u8 addr4[ETH_ALEN];</div><div class='del'>-</div><div class='del'>-	__le16 data_len;</div><div class='del'>-</div><div class='del'>-	/* ethhdr */</div><div class='del'>-	u8 h_dest[ETH_ALEN];	/* destination eth addr */</div><div class='del'>-	u8 h_source[ETH_ALEN];	/* source ether addr    */</div><div class='del'>-	__be16 h_proto;		/* packet type ID field */</div><div class='del'>-</div><div class='del'>-	/* p8022_hdr */</div><div class='del'>-	u8 dsap;</div><div class='del'>-	u8 ssap;</div><div class='del'>-	u8 ctrl;</div><div class='del'>-	u8 oui[3];</div><div class='del'>-</div><div class='del'>-	__be16 ethertype;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /* Rx frame header except compatibility 802.3 header */</div><div class='hunk'>@@ -450,53 +420,39 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u16 txfid = priv-&gt;txfid;</div><div class='del'>-	char *p;</div><div class='ctx'> 	struct ethhdr *eh;</div><div class='del'>-	int len, data_len, data_off;</div><div class='add'>+	int data_off;</div><div class='ctx'> 	struct hermes_tx_descriptor desc;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	TRACE_ENTER(dev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	if (! netif_running(dev)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Tx on stopped device!\n",</div><div class='ctx'> 		       dev-&gt;name);</div><div class='del'>-		TRACE_EXIT(dev-&gt;name);</div><div class='del'>-		return 1;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (netif_queue_stopped(dev)) {</div><div class='ctx'> 		printk(KERN_DEBUG "%s: Tx while transmitter busy!\n", </div><div class='ctx'> 		       dev-&gt;name);</div><div class='del'>-		TRACE_EXIT(dev-&gt;name);</div><div class='del'>-		return 1;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (orinoco_lock(priv, &amp;flags) != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n",</div><div class='ctx'> 		       dev-&gt;name);</div><div class='del'>-		TRACE_EXIT(dev-&gt;name);</div><div class='del'>-		return 1;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (! netif_carrier_ok(dev) || (priv-&gt;iw_mode == IW_MODE_MONITOR)) {</div><div class='ctx'> 		/* Oops, the firmware hasn't established a connection,</div><div class='ctx'>                    silently drop the packet (this seems to be the</div><div class='ctx'>                    safest approach). */</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='del'>-		orinoco_unlock(priv, &amp;flags);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		TRACE_EXIT(dev-&gt;name);</div><div class='del'>-		return 0;</div><div class='add'>+		goto drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Length of the packet body */</div><div class='del'>-	/* FIXME: what if the skb is smaller than this? */</div><div class='del'>-	len = max_t(int, ALIGN(skb-&gt;len, 2), ETH_ZLEN);</div><div class='del'>-	skb = skb_padto(skb, len);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-	len -= ETH_HLEN;</div><div class='add'>+	/* Check packet length */</div><div class='add'>+	if (skb-&gt;len &lt; ETH_HLEN)</div><div class='add'>+		goto drop;</div><div class='ctx'> </div><div class='ctx'> 	eh = (struct ethhdr *)skb-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -507,8 +463,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			printk(KERN_ERR "%s: Error %d writing Tx descriptor "</div><div class='ctx'> 			       "to BAP\n", dev-&gt;name, err);</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='del'>-		goto fail;</div><div class='add'>+		goto busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the 802.11 header and data length fields - some</div><div class='hunk'>@@ -519,50 +474,38 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Encapsulate Ethernet-II frames */</div><div class='ctx'> 	if (ntohs(eh-&gt;h_proto) &gt; ETH_DATA_LEN) { /* Ethernet-II frame */</div><div class='del'>-		struct header_struct hdr;</div><div class='del'>-		data_len = len;</div><div class='del'>-		data_off = HERMES_802_3_OFFSET + sizeof(hdr);</div><div class='del'>-		p = skb-&gt;data + ETH_HLEN;</div><div class='del'>-</div><div class='del'>-		/* 802.3 header */</div><div class='del'>-		memcpy(hdr.dest, eh-&gt;h_dest, ETH_ALEN);</div><div class='del'>-		memcpy(hdr.src, eh-&gt;h_source, ETH_ALEN);</div><div class='del'>-		hdr.len = htons(data_len + ENCAPS_OVERHEAD);</div><div class='del'>-		</div><div class='del'>-		/* 802.2 header */</div><div class='del'>-		memcpy(&amp;hdr.dsap, &amp;encaps_hdr, sizeof(encaps_hdr));</div><div class='del'>-			</div><div class='del'>-		hdr.ethertype = eh-&gt;h_proto;</div><div class='del'>-		err  = hermes_bap_pwrite(hw, USER_BAP, &amp;hdr, sizeof(hdr),</div><div class='del'>-					 txfid, HERMES_802_3_OFFSET);</div><div class='add'>+		struct header_struct {</div><div class='add'>+			struct ethhdr eth;	/* 802.3 header */</div><div class='add'>+			u8 encap[6];		/* 802.2 header */</div><div class='add'>+		} __attribute__ ((packed)) hdr;</div><div class='add'>+</div><div class='add'>+		/* Strip destination and source from the data */</div><div class='add'>+		skb_pull(skb, 2 * ETH_ALEN);</div><div class='add'>+		data_off = HERMES_802_2_OFFSET + sizeof(encaps_hdr);</div><div class='add'>+</div><div class='add'>+		/* And move them to a separate header */</div><div class='add'>+		memcpy(&amp;hdr.eth, eh, 2 * ETH_ALEN);</div><div class='add'>+		hdr.eth.h_proto = htons(sizeof(encaps_hdr) + skb-&gt;len);</div><div class='add'>+		memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));</div><div class='add'>+</div><div class='add'>+		err = hermes_bap_pwrite(hw, USER_BAP, &amp;hdr, sizeof(hdr),</div><div class='add'>+					txfid, HERMES_802_3_OFFSET);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			if (net_ratelimit())</div><div class='ctx'> 				printk(KERN_ERR "%s: Error %d writing packet "</div><div class='ctx'> 				       "header to BAP\n", dev-&gt;name, err);</div><div class='del'>-			stats-&gt;tx_errors++;</div><div class='del'>-			goto fail;</div><div class='add'>+			goto busy;</div><div class='ctx'> 		}</div><div class='del'>-		/* Actual xfer length - allow for padding */</div><div class='del'>-		len = ALIGN(data_len, 2);</div><div class='del'>-		if (len &lt; ETH_ZLEN - ETH_HLEN)</div><div class='del'>-			len = ETH_ZLEN - ETH_HLEN;</div><div class='ctx'> 	} else { /* IEEE 802.3 frame */</div><div class='del'>-		data_len = len + ETH_HLEN;</div><div class='ctx'> 		data_off = HERMES_802_3_OFFSET;</div><div class='del'>-		p = skb-&gt;data;</div><div class='del'>-		/* Actual xfer length - round up for odd length packets */</div><div class='del'>-		len = ALIGN(data_len, 2);</div><div class='del'>-		if (len &lt; ETH_ZLEN)</div><div class='del'>-			len = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hermes_bap_pwrite_pad(hw, USER_BAP, p, data_len, len,</div><div class='add'>+	err = hermes_bap_pwrite(hw, USER_BAP, skb-&gt;data, skb-&gt;len,</div><div class='ctx'> 				txfid, data_off);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Error %d writing packet to BAP\n",</div><div class='ctx'> 		       dev-&gt;name, err);</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='del'>-		goto fail;</div><div class='add'>+		goto busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Finally, we actually initiate the send */</div><div class='hunk'>@@ -575,25 +518,27 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			printk(KERN_ERR "%s: Error %d transmitting packet\n",</div><div class='ctx'> 				dev-&gt;name, err);</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='del'>-		goto fail;</div><div class='add'>+		goto busy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;trans_start = jiffies;</div><div class='del'>-	stats-&gt;tx_bytes += data_off + data_len;</div><div class='add'>+	stats-&gt;tx_bytes += data_off + skb-&gt;len;</div><div class='add'>+	goto ok;</div><div class='ctx'> </div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+ drop:</div><div class='add'>+	stats-&gt;tx_errors++;</div><div class='add'>+	stats-&gt;tx_dropped++;</div><div class='ctx'> </div><div class='add'>+ ok:</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>-	TRACE_EXIT(dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>- fail:</div><div class='del'>-	TRACE_EXIT(dev-&gt;name);</div><div class='del'>-</div><div class='add'>+ busy:</div><div class='add'>+	if (err == -EIO)</div><div class='add'>+		schedule_work(&amp;priv-&gt;reset_work);</div><div class='ctx'> 	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-	return err;</div><div class='add'>+	return NETDEV_TX_BUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw)</div><div class='hunk'>@@ -629,7 +574,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 	struct net_device_stats *stats = &amp;priv-&gt;stats;</div><div class='ctx'> 	u16 fid = hermes_read_regn(hw, TXCOMPLFID);</div><div class='ctx'> 	u16 status;</div><div class='del'>-	struct hermes_tx_descriptor_802_11 hdr;</div><div class='add'>+	struct hermes_txexc_data hdr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (fid == DUMMY_FID)</div><div class='hunk'>@@ -637,8 +582,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> </div><div class='ctx'> 	/* Read part of the frame header - we need status and addr1 */</div><div class='ctx'> 	err = hermes_bap_pread(hw, IRQ_BAP, &amp;hdr,</div><div class='del'>-			       offsetof(struct hermes_tx_descriptor_802_11,</div><div class='del'>-					addr2),</div><div class='add'>+			       sizeof(struct hermes_txexc_data),</div><div class='ctx'> 			       fid, 0);</div><div class='ctx'> </div><div class='ctx'> 	hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);</div><div class='hunk'>@@ -658,7 +602,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw)</div><div class='ctx'> 	 * exceeded, because that's the only status that really mean</div><div class='ctx'> 	 * that this particular node went away.</div><div class='ctx'> 	 * Other errors means that *we* screwed up. - Jean II */</div><div class='del'>-	status = le16_to_cpu(hdr.status);</div><div class='add'>+	status = le16_to_cpu(hdr.desc.status);</div><div class='ctx'> 	if (status &amp; (HERMES_TXSTAT_RETRYERR | HERMES_TXSTAT_AGEDERR)) {</div><div class='ctx'> 		union iwreq_data	wrqu;</div><div class='ctx'> </div><div class='hunk'>@@ -1398,16 +1342,12 @@ int __orinoco_down(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int orinoco_reinit_firmware(struct net_device *dev)</div><div class='add'>+static int orinoco_allocate_fid(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = hermes_init(hw);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	err = hermes_allocate(hw, priv-&gt;nicbuf_size, &amp;priv-&gt;txfid);</div><div class='ctx'> 	if (err == -EIO &amp;&amp; priv-&gt;nicbuf_size &gt; TX_NICBUF_SIZE_BUG) {</div><div class='ctx'> 		/* Try workaround for old Symbol firmware bug */</div><div class='hunk'>@@ -1426,6 +1366,19 @@ int orinoco_reinit_firmware(struct net_device *dev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int orinoco_reinit_firmware(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	struct hermes *hw = &amp;priv-&gt;hw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hermes_init(hw);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = orinoco_allocate_fid(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __orinoco_hw_set_bitrate(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='hunk'>@@ -1833,7 +1786,9 @@ static int __orinoco_program_rids(struct net_device *dev)</div><div class='ctx'> 	/* Set promiscuity / multicast*/</div><div class='ctx'> 	priv-&gt;promiscuous = 0;</div><div class='ctx'> 	priv-&gt;mc_count = 0;</div><div class='del'>-	__orinoco_set_multicast_list(dev); /* FIXME: what about the xmit_lock */</div><div class='add'>+</div><div class='add'>+	/* FIXME: what about netif_tx_lock */</div><div class='add'>+	__orinoco_set_multicast_list(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2272,14 +2227,12 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> 	u16 reclen;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	TRACE_ENTER(dev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	/* No need to lock, the hw_unavailable flag is already set in</div><div class='ctx'> 	 * alloc_orinocodev() */</div><div class='ctx'> 	priv-&gt;nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the firmware */</div><div class='del'>-	err = orinoco_reinit_firmware(dev);</div><div class='add'>+	err = hermes_init(hw);</div><div class='ctx'> 	if (err != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: failed to initialize firmware (err = %d)\n",</div><div class='ctx'> 		       dev-&gt;name, err);</div><div class='hunk'>@@ -2337,6 +2290,13 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "%s: Station name \"%s\"\n", dev-&gt;name, priv-&gt;nick);</div><div class='ctx'> </div><div class='add'>+	err = orinoco_allocate_fid(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: failed to allocate NIC buffer!\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Get allowed channels */</div><div class='ctx'> 	err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CHANNELLIST,</div><div class='ctx'> 				  &amp;priv-&gt;channel_mask);</div><div class='hunk'>@@ -2427,7 +2387,6 @@ static int orinoco_init(struct net_device *dev)</div><div class='ctx'> 	printk(KERN_DEBUG "%s: ready\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='del'>-	TRACE_EXIT(dev-&gt;name);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2795,8 +2754,6 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev,</div><div class='ctx'> 	int numrates;</div><div class='ctx'> 	int i, k;</div><div class='ctx'> </div><div class='del'>-	TRACE_ENTER(dev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	rrq-&gt;length = sizeof(struct iw_range);</div><div class='ctx'> 	memset(range, 0, sizeof(struct iw_range));</div><div class='ctx'> </div><div class='hunk'>@@ -2886,8 +2843,6 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev,</div><div class='ctx'> 	IW_EVENT_CAPA_SET(range-&gt;event_capa, SIOCGIWSCAN);</div><div class='ctx'> 	IW_EVENT_CAPA_SET(range-&gt;event_capa, IWEVTXDROP);</div><div class='ctx'> </div><div class='del'>-	TRACE_EXIT(dev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3069,8 +3024,6 @@ static int orinoco_ioctl_getessid(struct net_device *dev,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	TRACE_ENTER(dev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		err = orinoco_hw_get_essid(priv, &amp;active, essidbuf);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -3085,8 +3038,6 @@ static int orinoco_ioctl_getessid(struct net_device *dev,</div><div class='ctx'> 	erq-&gt;flags = 1;</div><div class='ctx'> 	erq-&gt;length = strlen(essidbuf) + 1;</div><div class='ctx'> </div><div class='del'>-	TRACE_EXIT(dev-&gt;name);</div><div class='del'>-	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4347,69 +4298,6 @@ static struct ethtool_ops orinoco_ethtool_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /********************************************************************/</div><div class='del'>-/* Debugging                                                        */</div><div class='del'>-/********************************************************************/</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void show_rx_frame(struct orinoco_rxframe_hdr *frame)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_DEBUG "RX descriptor:\n");</div><div class='del'>-	printk(KERN_DEBUG "  status      = 0x%04x\n", frame-&gt;desc.status);</div><div class='del'>-	printk(KERN_DEBUG "  time        = 0x%08x\n", frame-&gt;desc.time);</div><div class='del'>-	printk(KERN_DEBUG "  silence     = 0x%02x\n", frame-&gt;desc.silence);</div><div class='del'>-	printk(KERN_DEBUG "  signal      = 0x%02x\n", frame-&gt;desc.signal);</div><div class='del'>-	printk(KERN_DEBUG "  rate        = 0x%02x\n", frame-&gt;desc.rate);</div><div class='del'>-	printk(KERN_DEBUG "  rxflow      = 0x%02x\n", frame-&gt;desc.rxflow);</div><div class='del'>-	printk(KERN_DEBUG "  reserved    = 0x%08x\n", frame-&gt;desc.reserved);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "IEEE 802.11 header:\n");</div><div class='del'>-	printk(KERN_DEBUG "  frame_ctl   = 0x%04x\n",</div><div class='del'>-	       frame-&gt;p80211.frame_ctl);</div><div class='del'>-	printk(KERN_DEBUG "  duration_id = 0x%04x\n",</div><div class='del'>-	       frame-&gt;p80211.duration_id);</div><div class='del'>-	printk(KERN_DEBUG "  addr1       = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p80211.addr1[0], frame-&gt;p80211.addr1[1],</div><div class='del'>-	       frame-&gt;p80211.addr1[2], frame-&gt;p80211.addr1[3],</div><div class='del'>-	       frame-&gt;p80211.addr1[4], frame-&gt;p80211.addr1[5]);</div><div class='del'>-	printk(KERN_DEBUG "  addr2       = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p80211.addr2[0], frame-&gt;p80211.addr2[1],</div><div class='del'>-	       frame-&gt;p80211.addr2[2], frame-&gt;p80211.addr2[3],</div><div class='del'>-	       frame-&gt;p80211.addr2[4], frame-&gt;p80211.addr2[5]);</div><div class='del'>-	printk(KERN_DEBUG "  addr3       = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p80211.addr3[0], frame-&gt;p80211.addr3[1],</div><div class='del'>-	       frame-&gt;p80211.addr3[2], frame-&gt;p80211.addr3[3],</div><div class='del'>-	       frame-&gt;p80211.addr3[4], frame-&gt;p80211.addr3[5]);</div><div class='del'>-	printk(KERN_DEBUG "  seq_ctl     = 0x%04x\n",</div><div class='del'>-	       frame-&gt;p80211.seq_ctl);</div><div class='del'>-	printk(KERN_DEBUG "  addr4       = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p80211.addr4[0], frame-&gt;p80211.addr4[1],</div><div class='del'>-	       frame-&gt;p80211.addr4[2], frame-&gt;p80211.addr4[3],</div><div class='del'>-	       frame-&gt;p80211.addr4[4], frame-&gt;p80211.addr4[5]);</div><div class='del'>-	printk(KERN_DEBUG "  data_len    = 0x%04x\n",</div><div class='del'>-	       frame-&gt;p80211.data_len);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "IEEE 802.3 header:\n");</div><div class='del'>-	printk(KERN_DEBUG "  dest        = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p8023.h_dest[0], frame-&gt;p8023.h_dest[1],</div><div class='del'>-	       frame-&gt;p8023.h_dest[2], frame-&gt;p8023.h_dest[3],</div><div class='del'>-	       frame-&gt;p8023.h_dest[4], frame-&gt;p8023.h_dest[5]);</div><div class='del'>-	printk(KERN_DEBUG "  src         = %02x:%02x:%02x:%02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p8023.h_source[0], frame-&gt;p8023.h_source[1],</div><div class='del'>-	       frame-&gt;p8023.h_source[2], frame-&gt;p8023.h_source[3],</div><div class='del'>-	       frame-&gt;p8023.h_source[4], frame-&gt;p8023.h_source[5]);</div><div class='del'>-	printk(KERN_DEBUG "  len         = 0x%04x\n", frame-&gt;p8023.h_proto);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "IEEE 802.2 LLC/SNAP header:\n");</div><div class='del'>-	printk(KERN_DEBUG "  DSAP        = 0x%02x\n", frame-&gt;p8022.dsap);</div><div class='del'>-	printk(KERN_DEBUG "  SSAP        = 0x%02x\n", frame-&gt;p8022.ssap);</div><div class='del'>-	printk(KERN_DEBUG "  ctrl        = 0x%02x\n", frame-&gt;p8022.ctrl);</div><div class='del'>-	printk(KERN_DEBUG "  OUI         = %02x:%02x:%02x\n",</div><div class='del'>-	       frame-&gt;p8022.oui[0], frame-&gt;p8022.oui[1], frame-&gt;p8022.oui[2]);</div><div class='del'>-	printk(KERN_DEBUG "  ethertype  = 0x%04x\n", frame-&gt;ethertype);</div><div class='del'>-}</div><div class='del'>-#endif /* 0 */</div><div class='del'>-</div><div class='del'>-/********************************************************************/</div><div class='ctx'> /* Module initialization                                            */</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h<br/>index f5d856db92a1..16db3e14b7d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'> #ifndef _ORINOCO_H</div><div class='ctx'> #define _ORINOCO_H</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION "0.15rc3"</div><div class='add'>+#define DRIVER_VERSION "0.15"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/wireless.h&gt;</div><div class='hunk'>@@ -30,20 +30,6 @@ struct orinoco_key {</div><div class='ctx'> 	char data[ORINOCO_MAX_KEY_SIZE];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-struct header_struct {</div><div class='del'>-	/* 802.3 */</div><div class='del'>-	u8 dest[ETH_ALEN];</div><div class='del'>-	u8 src[ETH_ALEN];</div><div class='del'>-	__be16 len;</div><div class='del'>-	/* 802.2 */</div><div class='del'>-	u8 dsap;</div><div class='del'>-	u8 ssap;</div><div class='del'>-	u8 ctrl;</div><div class='del'>-	/* SNAP */</div><div class='del'>-	u8 oui[3];</div><div class='del'>-	unsigned short ethertype;</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> typedef enum {</div><div class='ctx'> 	FIRMWARE_TYPE_AGERE,</div><div class='ctx'> 	FIRMWARE_TYPE_INTERSIL,</div><div class='hunk'>@@ -132,9 +118,6 @@ extern int orinoco_debug;</div><div class='ctx'> #define DEBUG(n, args...) do { } while (0)</div><div class='ctx'> #endif	/* ORINOCO_DEBUG */</div><div class='ctx'> </div><div class='del'>-#define TRACE_ENTER(devname) DEBUG(2, "%s: -&gt; %s()\n", devname, __FUNCTION__);</div><div class='del'>-#define TRACE_EXIT(devname)  DEBUG(2, "%s: &lt;- %s()\n", devname, __FUNCTION__);</div><div class='del'>-</div><div class='ctx'> /********************************************************************/</div><div class='ctx'> /* Exported prototypes                                              */</div><div class='ctx'> /********************************************************************/</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c<br/>index 434f7d7ad841..bc14689cbf24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco_cs.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #define DRIVER_NAME "orinoco_cs"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -147,14 +146,11 @@ static void orinoco_cs_detach(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = link-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (link-&gt;dev_node)</div><div class='add'>+		unregister_netdev(dev);</div><div class='add'>+</div><div class='ctx'> 	orinoco_cs_release(link);</div><div class='ctx'> </div><div class='del'>-	DEBUG(0, PFX "detach: link=%p link-&gt;dev_node=%p\n", link, link-&gt;dev_node);</div><div class='del'>-	if (link-&gt;dev_node) {</div><div class='del'>-		DEBUG(0, PFX "About to unregister net device %p\n",</div><div class='del'>-		      dev);</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-	}</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> }				/* orinoco_cs_detach */</div><div class='ctx'> </div><div class='hunk'>@@ -178,13 +174,10 @@ orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='ctx'> 	u_char buf[64];</div><div class='ctx'> 	config_info_t conf;</div><div class='del'>-	cisinfo_t info;</div><div class='ctx'> 	tuple_t tuple;</div><div class='ctx'> 	cisparse_t parse;</div><div class='ctx'> 	void __iomem *mem;</div><div class='ctx'> </div><div class='del'>-	CS_CHECK(ValidateCIS, pcmcia_validate_cis(link, &amp;info));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This reads the card's CONFIG tuple to find its</div><div class='ctx'> 	 * configuration registers.</div><div class='hunk'>@@ -234,12 +227,6 @@ orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 			goto next_entry;</div><div class='ctx'> 		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='ctx'> </div><div class='del'>-		/* Does this card need audio output? */</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-			link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Use power settings for Vcc and Vpp if present */</div><div class='ctx'> 		/* Note that the CIS values need to be rescaled */</div><div class='ctx'> 		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='hunk'>@@ -355,19 +342,10 @@ orinoco_cs_config(struct pcmcia_device *link)</div><div class='ctx'>                                     net_device has been registered */</div><div class='ctx'> </div><div class='ctx'> 	/* Finally, report what we've done */</div><div class='del'>-	printk(KERN_DEBUG "%s: index 0x%02x: ",</div><div class='del'>-	       dev-&gt;name, link-&gt;conf.ConfigIndex);</div><div class='del'>-	if (link-&gt;conf.Vpp)</div><div class='del'>-		printk(", Vpp %d.%d", link-&gt;conf.Vpp / 10,</div><div class='del'>-		       link-&gt;conf.Vpp % 10);</div><div class='del'>-	printk(", irq %d", link-&gt;irq.AssignedIRQ);</div><div class='del'>-	if (link-&gt;io.NumPorts1)</div><div class='del'>-		printk(", io 0x%04x-0x%04x", link-&gt;io.BasePort1,</div><div class='del'>-		       link-&gt;io.BasePort1 + link-&gt;io.NumPorts1 - 1);</div><div class='del'>-	if (link-&gt;io.NumPorts2)</div><div class='del'>-		printk(" &amp; 0x%04x-0x%04x", link-&gt;io.BasePort2,</div><div class='del'>-		       link-&gt;io.BasePort2 + link-&gt;io.NumPorts2 - 1);</div><div class='del'>-	printk("\n");</div><div class='add'>+	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "</div><div class='add'>+	       "0x%04x-0x%04x\n", dev-&gt;name, dev-&gt;class_dev.dev-&gt;bus_id,</div><div class='add'>+	       link-&gt;irq.AssignedIRQ, link-&gt;io.BasePort1,</div><div class='add'>+	       link-&gt;io.BasePort1 + link-&gt;io.NumPorts1 - 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -436,7 +414,6 @@ static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct orinoco_pccard *card = priv-&gt;card;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (! test_bit(0, &amp;card-&gt;hard_reset_in_progress)) {</div><div class='ctx'> 		err = orinoco_reinit_firmware(dev);</div><div class='hunk'>@@ -446,7 +423,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+		spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		netif_device_attach(dev);</div><div class='ctx'> 		priv-&gt;hw_unavailable--;</div><div class='hunk'>@@ -458,10 +435,10 @@ static int orinoco_cs_resume(struct pcmcia_device *link)</div><div class='ctx'> 				       dev-&gt;name, err);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c<br/>index d1a670b35338..bf05b907747e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_nortel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_nortel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_nortel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco_nortel.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='ctx'> /* orinoco_nortel.c</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Driver for Prism II devices which would usually be driven by orinoco_cs,</div><div class='ctx'>  * but are connected to the PCI bus by a PCI-to-PCMCIA adapter used in</div><div class='ctx'>  * Nortel emobility, Symbol LA-4113 and Symbol LA-4123.</div><div class='del'>- * but are connected to the PCI bus by a Nortel PCI-PCMCIA-Adapter. </div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2002 Tobias Hoffmann</div><div class='ctx'>  *           (C) 2003 Christoph Jungegger &lt;disdos@traum404.de&gt;</div><div class='hunk'>@@ -41,7 +40,6 @@</div><div class='ctx'> #define DRIVER_NAME "orinoco_nortel"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -50,67 +48,62 @@</div><div class='ctx'> #include &lt;pcmcia/cisreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "orinoco.h"</div><div class='add'>+#include "orinoco_pci.h"</div><div class='ctx'> </div><div class='ctx'> #define COR_OFFSET    (0xe0)	/* COR attribute offset of Prism2 PC card */</div><div class='ctx'> #define COR_VALUE     (COR_LEVEL_REQ | COR_FUNC_ENA)	/* Enable PC card with interrupt in level trigger */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Nortel specific data */</div><div class='del'>-struct nortel_pci_card {</div><div class='del'>-	unsigned long iobase1;</div><div class='del'>-	unsigned long iobase2;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Do a soft reset of the PCI card using the Configuration Option Register</div><div class='add'>+ * Do a soft reset of the card using the Configuration Option Register</div><div class='ctx'>  * We need this to get going...</div><div class='ctx'>  * This is the part of the code that is strongly inspired from wlan-ng</div><div class='ctx'>  *</div><div class='ctx'>  * Note bis : Don't try to access HERMES_CMD during the reset phase.</div><div class='ctx'>  * It just won't work !</div><div class='ctx'>  */</div><div class='del'>-static int nortel_pci_cor_reset(struct orinoco_private *priv)</div><div class='add'>+static int orinoco_nortel_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='del'>-	struct nortel_pci_card *card = priv-&gt;card;</div><div class='add'>+	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> </div><div class='del'>-	/* Assert the reset until the card notice */</div><div class='del'>-	outw_p(8, card-&gt;iobase1 + 2);</div><div class='del'>-	inw(card-&gt;iobase2 + COR_OFFSET);</div><div class='del'>-	outw_p(0x80, card-&gt;iobase2 + COR_OFFSET);</div><div class='add'>+	/* Assert the reset until the card notices */</div><div class='add'>+	iowrite16(8, card-&gt;bridge_io + 2);</div><div class='add'>+	ioread16(card-&gt;attr_io + COR_OFFSET);</div><div class='add'>+	iowrite16(0x80, card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='ctx'> 	/* Give time for the card to recover from this hard effort */</div><div class='del'>-	outw_p(0, card-&gt;iobase2 + COR_OFFSET);</div><div class='del'>-	outw_p(0, card-&gt;iobase2 + COR_OFFSET);</div><div class='add'>+	iowrite16(0, card-&gt;attr_io + COR_OFFSET);</div><div class='add'>+	iowrite16(0, card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='del'>-	/* set COR as usual */</div><div class='del'>-	outw_p(COR_VALUE, card-&gt;iobase2 + COR_OFFSET);</div><div class='del'>-	outw_p(COR_VALUE, card-&gt;iobase2 + COR_OFFSET);</div><div class='add'>+	/* Set COR as usual */</div><div class='add'>+	iowrite16(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='add'>+	iowrite16(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='del'>-	outw_p(0x228, card-&gt;iobase1 + 2);</div><div class='add'>+	iowrite16(0x228, card-&gt;bridge_io + 2);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nortel_pci_hw_init(struct nortel_pci_card *card)</div><div class='add'>+static int orinoco_nortel_hw_init(struct orinoco_pci_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	/* setup bridge */</div><div class='del'>-	if (inw(card-&gt;iobase1) &amp; 1) {</div><div class='add'>+	/* Setup bridge */</div><div class='add'>+	if (ioread16(card-&gt;bridge_io) &amp; 1) {</div><div class='ctx'> 		printk(KERN_ERR PFX "brg1 answer1 wrong\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	outw_p(0x118, card-&gt;iobase1 + 2);</div><div class='del'>-	outw_p(0x108, card-&gt;iobase1 + 2);</div><div class='add'>+	iowrite16(0x118, card-&gt;bridge_io + 2);</div><div class='add'>+	iowrite16(0x108, card-&gt;bridge_io + 2);</div><div class='ctx'> 	mdelay(30);</div><div class='del'>-	outw_p(0x8, card-&gt;iobase1 + 2);</div><div class='add'>+	iowrite16(0x8, card-&gt;bridge_io + 2);</div><div class='ctx'> 	for (i = 0; i &lt; 30; i++) {</div><div class='ctx'> 		mdelay(30);</div><div class='del'>-		if (inw(card-&gt;iobase1) &amp; 0x10) {</div><div class='add'>+		if (ioread16(card-&gt;bridge_io) &amp; 0x10) {</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -118,42 +111,42 @@ static int nortel_pci_hw_init(struct nortel_pci_card *card)</div><div class='ctx'> 		printk(KERN_ERR PFX "brg1 timed out\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (inw(card-&gt;iobase2 + 0xe0) &amp; 1) {</div><div class='add'>+	if (ioread16(card-&gt;attr_io + COR_OFFSET) &amp; 1) {</div><div class='ctx'> 		printk(KERN_ERR PFX "brg2 answer1 wrong\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (inw(card-&gt;iobase2 + 0xe2) &amp; 1) {</div><div class='add'>+	if (ioread16(card-&gt;attr_io + COR_OFFSET + 2) &amp; 1) {</div><div class='ctx'> 		printk(KERN_ERR PFX "brg2 answer2 wrong\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (inw(card-&gt;iobase2 + 0xe4) &amp; 1) {</div><div class='add'>+	if (ioread16(card-&gt;attr_io + COR_OFFSET + 4) &amp; 1) {</div><div class='ctx'> 		printk(KERN_ERR PFX "brg2 answer3 wrong\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set the PCMCIA COR-Register */</div><div class='del'>-	outw_p(COR_VALUE, card-&gt;iobase2 + COR_OFFSET);</div><div class='add'>+	/* Set the PCMCIA COR register */</div><div class='add'>+	iowrite16(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	mdelay(1);</div><div class='del'>-	reg = inw(card-&gt;iobase2 + COR_OFFSET);</div><div class='add'>+	reg = ioread16(card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	if (reg != COR_VALUE) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Error setting COR value (reg=%x)\n",</div><div class='ctx'> 		       reg);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set leds */</div><div class='del'>-	outw_p(1, card-&gt;iobase1 + 10);</div><div class='add'>+	/* Set LEDs */</div><div class='add'>+	iowrite16(1, card-&gt;bridge_io + 10);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nortel_pci_init_one(struct pci_dev *pdev,</div><div class='del'>-			       const struct pci_device_id *ent)</div><div class='add'>+static int orinoco_nortel_init_one(struct pci_dev *pdev,</div><div class='add'>+				   const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct orinoco_private *priv;</div><div class='del'>-	struct nortel_pci_card *card;</div><div class='add'>+	struct orinoco_pci_card *card;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	void __iomem *iomem;</div><div class='add'>+	void __iomem *hermes_io, *bridge_io, *attr_io;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -162,19 +155,34 @@ static int nortel_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err != 0) {</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='ctx'> 		goto fail_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	iomem = pci_iomap(pdev, 2, 0);</div><div class='del'>-	if (!iomem) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_map_io;</div><div class='add'>+	bridge_io = pci_iomap(pdev, 0, 0);</div><div class='add'>+	if (!bridge_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map bridge registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_bridge;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	attr_io = pci_iomap(pdev, 1, 0);</div><div class='add'>+	if (!attr_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map PCMCIA attributes\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_attr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hermes_io = pci_iomap(pdev, 2, 0);</div><div class='add'>+	if (!hermes_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map chipset registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_hermes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='del'>-	dev = alloc_orinocodev(sizeof(*card), nortel_pci_cor_reset);</div><div class='add'>+	dev = alloc_orinocodev(sizeof(*card), orinoco_nortel_cor_reset);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -183,39 +191,33 @@ static int nortel_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	card = priv-&gt;card;</div><div class='del'>-	card-&gt;iobase1 = pci_resource_start(pdev, 0);</div><div class='del'>-	card-&gt;iobase2 = pci_resource_start(pdev, 1);</div><div class='del'>-	dev-&gt;base_addr = pci_resource_start(pdev, 2);</div><div class='add'>+	card-&gt;bridge_io = bridge_io;</div><div class='add'>+	card-&gt;attr_io = attr_io;</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, iomem, HERMES_16BIT_REGSPACING);</div><div class='add'>+	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_16BIT_REGSPACING);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG PFX "Detected Nortel PCI device at %s irq:%d, "</div><div class='del'>-	       "io addr:0x%lx\n", pci_name(pdev), pdev-&gt;irq, dev-&gt;base_addr);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, SA_SHIRQ,</div><div class='add'>+	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	err = nortel_pci_hw_init(card);</div><div class='add'>+	err = orinoco_nortel_hw_init(card);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Hardware initialization failed\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = nortel_pci_cor_reset(priv);</div><div class='add'>+	err = orinoco_nortel_cor_reset(priv);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Initial reset failed\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot register network device\n");</div><div class='hunk'>@@ -223,6 +225,8 @@ static int nortel_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='add'>+	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev-&gt;name,</div><div class='add'>+	       pci_name(pdev));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -234,9 +238,15 @@ static int nortel_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> </div><div class='ctx'>  fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, iomem);</div><div class='add'>+	pci_iounmap(pdev, hermes_io);</div><div class='ctx'> </div><div class='del'>- fail_map_io:</div><div class='add'>+ fail_map_hermes:</div><div class='add'>+	pci_iounmap(pdev, attr_io);</div><div class='add'>+</div><div class='add'>+ fail_map_attr:</div><div class='add'>+	pci_iounmap(pdev, bridge_io);</div><div class='add'>+</div><div class='add'>+ fail_map_bridge:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'>  fail_resources:</div><div class='hunk'>@@ -245,26 +255,27 @@ static int nortel_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit nortel_pci_remove_one(struct pci_dev *pdev)</div><div class='add'>+static void __devexit orinoco_nortel_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	struct nortel_pci_card *card = priv-&gt;card;</div><div class='add'>+	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> </div><div class='del'>-	/* clear leds */</div><div class='del'>-	outw_p(0, card-&gt;iobase1 + 10);</div><div class='add'>+	/* Clear LEDs */</div><div class='add'>+	iowrite16(0, card-&gt;bridge_io + 10);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	free_irq(pdev-&gt;irq, dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> 	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='add'>+	pci_iounmap(pdev, card-&gt;attr_io);</div><div class='add'>+	pci_iounmap(pdev, card-&gt;bridge_io);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct pci_device_id nortel_pci_id_table[] = {</div><div class='add'>+static struct pci_device_id orinoco_nortel_id_table[] = {</div><div class='ctx'> 	/* Nortel emobility PCI */</div><div class='ctx'> 	{0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='ctx'> 	/* Symbol LA-4123 PCI */</div><div class='hunk'>@@ -272,13 +283,15 @@ static struct pci_device_id nortel_pci_id_table[] = {</div><div class='ctx'> 	{0,},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(pci, nortel_pci_id_table);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, orinoco_nortel_id_table);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver nortel_pci_driver = {</div><div class='del'>-	.name = DRIVER_NAME,</div><div class='del'>-	.id_table = nortel_pci_id_table,</div><div class='del'>-	.probe = nortel_pci_init_one,</div><div class='del'>-	.remove = __devexit_p(nortel_pci_remove_one),</div><div class='add'>+static struct pci_driver orinoco_nortel_driver = {</div><div class='add'>+	.name		= DRIVER_NAME,</div><div class='add'>+	.id_table	= orinoco_nortel_id_table,</div><div class='add'>+	.probe		= orinoco_nortel_init_one,</div><div class='add'>+	.remove		= __devexit_p(orinoco_nortel_remove_one),</div><div class='add'>+	.suspend	= orinoco_pci_suspend,</div><div class='add'>+	.resume		= orinoco_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='hunk'>@@ -288,20 +301,19 @@ MODULE_DESCRIPTION</div><div class='ctx'>     ("Driver for wireless LAN cards using the Nortel PCI bridge");</div><div class='ctx'> MODULE_LICENSE("Dual MPL/GPL");</div><div class='ctx'> </div><div class='del'>-static int __init nortel_pci_init(void)</div><div class='add'>+static int __init orinoco_nortel_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_DEBUG "%s\n", version);</div><div class='del'>-	return pci_module_init(&amp;nortel_pci_driver);</div><div class='add'>+	return pci_module_init(&amp;orinoco_nortel_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit nortel_pci_exit(void)</div><div class='add'>+static void __exit orinoco_nortel_exit(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;nortel_pci_driver);</div><div class='del'>-	ssleep(1);</div><div class='add'>+	pci_unregister_driver(&amp;orinoco_nortel_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(nortel_pci_init);</div><div class='del'>-module_exit(nortel_pci_exit);</div><div class='add'>+module_init(orinoco_nortel_init);</div><div class='add'>+module_exit(orinoco_nortel_exit);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local variables:</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c<br/>index 5362c214fc8e..1759c543fbee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco_pci.c</a></div><div class='hunk'>@@ -1,11 +1,11 @@</div><div class='ctx'> /* orinoco_pci.c</div><div class='ctx'>  * </div><div class='del'>- * Driver for Prism II devices that have a direct PCI interface</div><div class='del'>- * (i.e., not in a Pcmcia or PLX bridge)</div><div class='del'>- *</div><div class='del'>- * Specifically here we're talking about the Linksys WMP11</div><div class='add'>+ * Driver for Prism 2.5/3 devices that have a direct PCI interface</div><div class='add'>+ * (i.e. these are not PCMCIA cards in a PCMCIA-to-PCI bridge).</div><div class='add'>+ * The card contains only one PCI region, which contains all the usual</div><div class='add'>+ * hermes registers, as well as the COR register.</div><div class='ctx'>  *</div><div class='del'>- * Current maintainers (as of 29 September 2003) are:</div><div class='add'>+ * Current maintainers are:</div><div class='ctx'>  * 	Pavel Roskin &lt;proski AT gnu.org&gt;</div><div class='ctx'>  * and	David Gibson &lt;hermes AT gibson.dropbear.id.au&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -41,58 +41,9 @@</div><div class='ctx'>  * under either the MPL or the GPL.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Theory of operation...</div><div class='del'>- * -------------------</div><div class='del'>- * Maybe you had a look in orinoco_plx. Well, this is totally different...</div><div class='del'>- *</div><div class='del'>- * The card contains only one PCI region, which contains all the usual</div><div class='del'>- * hermes registers.</div><div class='del'>- *</div><div class='del'>- * The driver will memory map this region in normal memory. Because</div><div class='del'>- * the hermes registers are mapped in normal memory and not in ISA I/O</div><div class='del'>- * post space, we can't use the usual inw/outw macros and we need to</div><div class='del'>- * use readw/writew.</div><div class='del'>- * This slight difference force us to compile our own version of</div><div class='del'>- * hermes.c with the register access macro changed. That's a bit</div><div class='del'>- * hackish but works fine.</div><div class='del'>- *</div><div class='del'>- * Note that the PCI region is pretty big (4K). That's much more than</div><div class='del'>- * the usual set of hermes register (0x0 -&gt; 0x3E). I've got a strong</div><div class='del'>- * suspicion that the whole memory space of the adapter is in fact in</div><div class='del'>- * this region. Accessing directly the adapter memory instead of going</div><div class='del'>- * through the usual register would speed up significantely the</div><div class='del'>- * operations...</div><div class='del'>- *</div><div class='del'>- * Finally, the card looks like this :</div><div class='del'>------------------------</div><div class='del'>-  Bus  0, device  14, function  0:</div><div class='del'>-    Network controller: PCI device 1260:3873 (Harris Semiconductor) (rev 1).</div><div class='del'>-      IRQ 11.</div><div class='del'>-      Master Capable.  Latency=248.  </div><div class='del'>-      Prefetchable 32 bit memory at 0xffbcc000 [0xffbccfff].</div><div class='del'>------------------------</div><div class='del'>-00:0e.0 Network controller: Harris Semiconductor: Unknown device 3873 (rev 01)</div><div class='del'>-        Subsystem: Unknown device 1737:3874</div><div class='del'>-        Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B-</div><div class='del'>-        Status: Cap+ 66Mhz- UDF- FastB2B+ ParErr- DEVSEL=medium &gt;TAbort- &lt;TAbort- &lt;MAbort- &gt;SERR- &lt;PERR-</div><div class='del'>-        Latency: 248 set, cache line size 08</div><div class='del'>-        Interrupt: pin A routed to IRQ 11</div><div class='del'>-        Region 0: Memory at ffbcc000 (32-bit, prefetchable) [size=4K]</div><div class='del'>-        Capabilities: [dc] Power Management version 2</div><div class='del'>-                Flags: PMEClk- AuxPwr- DSI- D1+ D2+ PME+</div><div class='del'>-                Status: D0 PME-Enable- DSel=0 DScale=0 PME-</div><div class='del'>------------------------</div><div class='del'>- *</div><div class='del'>- * That's all..</div><div class='del'>- *</div><div class='del'>- * Jean II</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> #define DRIVER_NAME "orinoco_pci"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -100,12 +51,14 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "orinoco.h"</div><div class='add'>+#include "orinoco_pci.h"</div><div class='ctx'> </div><div class='del'>-/* All the magic there is from wlan-ng */</div><div class='del'>-/* Magic offset of the reset register of the PCI card */</div><div class='add'>+/* Offset of the COR register of the PCI card */</div><div class='ctx'> #define HERMES_PCI_COR		(0x26)</div><div class='del'>-/* Magic bitmask to reset the card */</div><div class='add'>+</div><div class='add'>+/* Bitmask to reset the card */</div><div class='ctx'> #define HERMES_PCI_COR_MASK	(0x0080)</div><div class='add'>+</div><div class='ctx'> /* Magic timeouts for doing the reset.</div><div class='ctx'>  * Those times are straight from wlan-ng, and it is claimed that they</div><div class='ctx'>  * are necessary. Alan will kill me. Take your time and grab a coffee. */</div><div class='hunk'>@@ -113,13 +66,8 @@</div><div class='ctx'> #define HERMES_PCI_COR_OFFT	(500)		/* ms */</div><div class='ctx'> #define HERMES_PCI_COR_BUSYT	(500)		/* ms */</div><div class='ctx'> </div><div class='del'>-/* Orinoco PCI specific data */</div><div class='del'>-struct orinoco_pci_card {</div><div class='del'>-	void __iomem *pci_ioaddr;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='del'>- * Do a soft reset of the PCI card using the Configuration Option Register</div><div class='add'>+ * Do a soft reset of the card using the Configuration Option Register</div><div class='ctx'>  * We need this to get going...</div><div class='ctx'>  * This is the part of the code that is strongly inspired from wlan-ng</div><div class='ctx'>  *</div><div class='hunk'>@@ -131,14 +79,13 @@ struct orinoco_pci_card {</div><div class='ctx'>  * Note bis : Don't try to access HERMES_CMD during the reset phase.</div><div class='ctx'>  * It just won't work !</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-orinoco_pci_cor_reset(struct orinoco_private *priv)</div><div class='add'>+static int orinoco_pci_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='del'>-	unsigned long	timeout;</div><div class='del'>-	u16	reg;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	u16 reg;</div><div class='ctx'> </div><div class='del'>-	/* Assert the reset until the card notice */</div><div class='add'>+	/* Assert the reset until the card notices */</div><div class='ctx'> 	hermes_write_regn(hw, PCI_COR, HERMES_PCI_COR_MASK);</div><div class='ctx'> 	mdelay(HERMES_PCI_COR_ONT);</div><div class='ctx'> </div><div class='hunk'>@@ -163,19 +110,14 @@ orinoco_pci_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Initialise a card. Mostly similar to PLX code.</div><div class='del'>- */</div><div class='ctx'> static int orinoco_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 				const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned long pci_iorange;</div><div class='del'>-	u16 __iomem *pci_ioaddr = NULL;</div><div class='del'>-	unsigned long pci_iolen;</div><div class='del'>-	struct orinoco_private *priv = NULL;</div><div class='add'>+	int err;</div><div class='add'>+	struct orinoco_private *priv;</div><div class='ctx'> 	struct orinoco_pci_card *card;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	void __iomem *hermes_io;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -184,50 +126,41 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err != 0) {</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='ctx'> 		goto fail_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Resource 0 is mapped to the hermes registers */</div><div class='del'>-	pci_iorange = pci_resource_start(pdev, 0);</div><div class='del'>-	pci_iolen = pci_resource_len(pdev, 0);</div><div class='del'>-	pci_ioaddr = ioremap(pci_iorange, pci_iolen);</div><div class='del'>-	if (!pci_iorange) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot remap hardware registers\n");</div><div class='del'>-		goto fail_map;</div><div class='add'>+	hermes_io = pci_iomap(pdev, 0, 0);</div><div class='add'>+	if (!hermes_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot remap chipset registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_hermes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='ctx'> 	dev = alloc_orinocodev(sizeof(*card), orinoco_pci_cor_reset);</div><div class='del'>-	if (! dev) {</div><div class='add'>+	if (!dev) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto fail_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	card = priv-&gt;card;</div><div class='del'>-	card-&gt;pci_ioaddr = pci_ioaddr;</div><div class='del'>-	dev-&gt;mem_start = pci_iorange;</div><div class='del'>-	dev-&gt;mem_end = pci_iorange + pci_iolen - 1;</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, pci_ioaddr, HERMES_32BIT_REGSPACING);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG PFX "Detected device %s, mem:0x%lx-0x%lx, irq %d\n",</div><div class='del'>-	       pci_name(pdev), dev-&gt;mem_start, dev-&gt;mem_end, pdev-&gt;irq);</div><div class='add'>+	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_32BIT_REGSPACING);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, SA_SHIRQ,</div><div class='add'>+	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	/* Perform a COR reset to start the card */</div><div class='ctx'> 	err = orinoco_pci_cor_reset(priv);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Initial reset failed\n");</div><div class='hunk'>@@ -236,11 +169,13 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR PFX "Failed to register net device\n");</div><div class='add'>+		printk(KERN_ERR PFX "Cannot register network device\n");</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='add'>+	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev-&gt;name,</div><div class='add'>+	       pci_name(pdev));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -252,9 +187,9 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> </div><div class='ctx'>  fail_alloc:</div><div class='del'>-	iounmap(pci_ioaddr);</div><div class='add'>+	pci_iounmap(pdev, hermes_io);</div><div class='ctx'> </div><div class='del'>- fail_map:</div><div class='add'>+ fail_map_hermes:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'>  fail_resources:</div><div class='hunk'>@@ -267,87 +202,17 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	free_irq(pdev-&gt;irq, dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='del'>-	iounmap(card-&gt;pci_ioaddr);</div><div class='add'>+	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	err = orinoco_lock(priv, &amp;flags);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: hw_unavailable on orinoco_pci_suspend\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = __orinoco_down(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_WARNING "%s: orinoco_pci_suspend(): Error %d downing interface\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-	</div><div class='del'>-	netif_device_detach(dev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_unavailable++;</div><div class='del'>-	</div><div class='del'>-	orinoco_unlock(priv, &amp;flags);</div><div class='del'>-</div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_set_power_state(pdev, PCI_D3hot);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int orinoco_pci_resume(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "%s: Orinoco-PCI waking up\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, 0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='del'>-	err = orinoco_reinit_firmware(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "%s: Error %d re-initializing firmware on orinoco_pci_resume()\n",</div><div class='del'>-		       dev-&gt;name, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	netif_device_attach(dev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_unavailable--;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;open &amp;&amp; (! priv-&gt;hw_unavailable)) {</div><div class='del'>-		err = __orinoco_up(dev);</div><div class='del'>-		if (err)</div><div class='del'>-			printk(KERN_ERR "%s: Error %d restarting card on orinoco_pci_resume()\n",</div><div class='del'>-			       dev-&gt;name, err);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_device_id orinoco_pci_pci_id_table[] = {</div><div class='add'>+static struct pci_device_id orinoco_pci_id_table[] = {</div><div class='ctx'> 	/* Intersil Prism 3 */</div><div class='ctx'> 	{0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='ctx'> 	/* Intersil Prism 2.5 */</div><div class='hunk'>@@ -357,11 +222,11 @@ static struct pci_device_id orinoco_pci_pci_id_table[] = {</div><div class='ctx'> 	{0,},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_pci_pci_id_table);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, orinoco_pci_id_table);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver orinoco_pci_driver = {</div><div class='ctx'> 	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_pci_pci_id_table,</div><div class='add'>+	.id_table	= orinoco_pci_id_table,</div><div class='ctx'> 	.probe		= orinoco_pci_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(orinoco_pci_remove_one),</div><div class='ctx'> 	.suspend	= orinoco_pci_suspend,</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_pci.h b/drivers/net/wireless/orinoco_pci.h<br/>new file mode 100644<br/>index 000000000000..be1abea4b64f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco_pci.h</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+/* orinoco_pci.h</div><div class='add'>+ * </div><div class='add'>+ * Common code for all Orinoco drivers for PCI devices, including</div><div class='add'>+ * both native PCI and PCMCIA-to-PCI bridges.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005, Pavel Roskin.</div><div class='add'>+ * See orinoco.c for license.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ORINOCO_PCI_H</div><div class='add'>+#define _ORINOCO_PCI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+/* Driver specific data */</div><div class='add'>+struct orinoco_pci_card {</div><div class='add'>+	void __iomem *bridge_io;</div><div class='add'>+	void __iomem *attr_io;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = orinoco_lock(priv, &amp;flags);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: cannot lock hardware for suspend\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = __orinoco_down(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		printk(KERN_WARNING "%s: error %d bringing interface down "</div><div class='add'>+		       "for suspend\n", dev-&gt;name, err);</div><div class='add'>+	</div><div class='add'>+	netif_device_detach(dev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_unavailable++;</div><div class='add'>+	</div><div class='add'>+	orinoco_unlock(priv, &amp;flags);</div><div class='add'>+</div><div class='add'>+	free_irq(pdev-&gt;irq, dev);</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int orinoco_pci_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct orinoco_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, 0);</div><div class='add'>+	pci_enable_device(pdev);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='add'>+			  dev-&gt;name, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",</div><div class='add'>+		       dev-&gt;name);</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = orinoco_reinit_firmware(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR "%s: error %d re-initializing firmware "</div><div class='add'>+		       "on resume\n", dev-&gt;name, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(dev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_unavailable--;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;open &amp;&amp; (! priv-&gt;hw_unavailable)) {</div><div class='add'>+		err = __orinoco_up(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			printk(KERN_ERR "%s: Error %d restarting card on resume\n",</div><div class='add'>+			       dev-&gt;name, err);</div><div class='add'>+	}</div><div class='add'>+	</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define orinoco_pci_suspend NULL</div><div class='add'>+#define orinoco_pci_resume NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ORINOCO_PCI_H */</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c<br/>index 210e73776545..7f006f624171 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_plx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_plx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_plx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco_plx.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * Driver for Prism II devices which would usually be driven by orinoco_cs,</div><div class='ctx'>  * but are connected to the PCI bus by a PLX9052.</div><div class='ctx'>  *</div><div class='del'>- * Current maintainers (as of 29 September 2003) are:</div><div class='add'>+ * Current maintainers are:</div><div class='ctx'>  * 	Pavel Roskin &lt;proski AT gnu.org&gt;</div><div class='ctx'>  * and	David Gibson &lt;hermes AT gibson.dropbear.id.au&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -30,38 +30,18 @@</div><div class='ctx'>  * other provisions required by the GPL.  If you do not delete the</div><div class='ctx'>  * provisions above, a recipient may use your version of this file</div><div class='ctx'>  * under either the MPL or the GPL.</div><div class='del'>-</div><div class='del'>- * Caution: this is experimental and probably buggy.  For success and</div><div class='del'>- * failure reports for different cards and adaptors, see</div><div class='del'>- * orinoco_plx_pci_id_table near the end of the file.  If you have a</div><div class='del'>- * card we don't have the PCI id for, and looks like it should work,</div><div class='del'>- * drop me mail with the id and "it works"/"it doesn't work".</div><div class='del'>- *</div><div class='del'>- * Note: if everything gets detected fine but it doesn't actually send</div><div class='del'>- * or receive packets, your first port of call should probably be to</div><div class='del'>- * try newer firmware in the card.  Especially if you're doing Ad-Hoc</div><div class='del'>- * modes.</div><div class='del'>- *</div><div class='del'>- * The actual driving is done by orinoco.c, this is just resource</div><div class='del'>- * allocation stuff.  The explanation below is courtesy of Ryan Niemi</div><div class='del'>- * on the linux-wlan-ng list at</div><div class='del'>- * http://archives.neohapsis.com/archives/dev/linux-wlan/2001-q1/0026.html</div><div class='ctx'>  *</div><div class='del'>- * The PLX9052-based cards (WL11000 and several others) are a</div><div class='del'>- * different beast than the usual PCMCIA-based PRISM2 configuration</div><div class='del'>- * expected by wlan-ng.  Here's the general details on how the WL11000</div><div class='del'>- * PCI adapter works:</div><div class='add'>+ * Here's the general details on how the PLX9052 adapter works:</div><div class='ctx'>  *</div><div class='ctx'>  * - Two PCI I/O address spaces, one 0x80 long which contains the</div><div class='ctx'>  * PLX9052 registers, and one that's 0x40 long mapped to the PCMCIA</div><div class='ctx'>  * slot I/O address space.</div><div class='ctx'>  *</div><div class='del'>- * - One PCI memory address space, mapped to the PCMCIA memory space</div><div class='add'>+ * - One PCI memory address space, mapped to the PCMCIA attribute space</div><div class='ctx'>  * (containing the CIS).</div><div class='ctx'>  *</div><div class='del'>- * After identifying the I/O and memory space, you can read through</div><div class='del'>- * the memory space to confirm the CIS's device ID or manufacturer ID</div><div class='del'>- * to make sure it's the expected card.  qKeep in mind that the PCMCIA</div><div class='add'>+ * Using the later, you can read through the CIS data to make sure the</div><div class='add'>+ * card is compatible with the driver. Keep in mind that the PCMCIA</div><div class='ctx'>  * spec specifies the CIS as the lower 8 bits of each word read from</div><div class='ctx'>  * the CIS, so to read the bytes of the CIS, read every other byte</div><div class='ctx'>  * (0,2,4,...). Passing that test, you need to enable the I/O address</div><div class='hunk'>@@ -71,7 +51,7 @@</div><div class='ctx'>  * within the PCI memory space. Write 0x41 to the COR register to</div><div class='ctx'>  * enable I/O mode and to select level triggered interrupts. To</div><div class='ctx'>  * confirm you actually succeeded, read the COR register back and make</div><div class='del'>- * sure it actually got set to 0x41, incase you have an unexpected</div><div class='add'>+ * sure it actually got set to 0x41, in case you have an unexpected</div><div class='ctx'>  * card inserted.</div><div class='ctx'>  *</div><div class='ctx'>  * Following that, you can treat the second PCI I/O address space (the</div><div class='hunk'>@@ -101,22 +81,11 @@</div><div class='ctx'>  * that, I've hot-swapped a number of times during debugging and</div><div class='ctx'>  * driver development for various reasons (stuck WAIT# line after the</div><div class='ctx'>  * radio card's firmware locks up).</div><div class='del'>- *</div><div class='del'>- * Hope this is enough info for someone to add PLX9052 support to the</div><div class='del'>- * wlan-ng card. In the case of the WL11000, the PCI ID's are</div><div class='del'>- * 0x1639/0x0200, with matching subsystem ID's. Other PLX9052-based</div><div class='del'>- * manufacturers other than Eumitcom (or on cards other than the</div><div class='del'>- * WL11000) may have different PCI ID's.</div><div class='del'>- *</div><div class='del'>- * If anyone needs any more specific info, let me know. I haven't had</div><div class='del'>- * time to implement support myself yet, and with the way things are</div><div class='del'>- * going, might not have time for a while..</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "orinoco_plx"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -125,6 +94,7 @@</div><div class='ctx'> #include &lt;pcmcia/cisreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "orinoco.h"</div><div class='add'>+#include "orinoco_pci.h"</div><div class='ctx'> </div><div class='ctx'> #define COR_OFFSET	(0x3e0)	/* COR attribute offset of Prism2 PC card */</div><div class='ctx'> #define COR_VALUE	(COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */</div><div class='hunk'>@@ -134,30 +104,20 @@</div><div class='ctx'> #define PLX_INTCSR		0x4c /* Interrupt Control &amp; Status Register */</div><div class='ctx'> #define PLX_INTCSR_INTEN	(1&lt;&lt;6) /* Interrupt Enable bit */</div><div class='ctx'> </div><div class='del'>-static const u8 cis_magic[] = {</div><div class='del'>-	0x01, 0x03, 0x00, 0x00, 0xff, 0x17, 0x04, 0x67</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Orinoco PLX specific data */</div><div class='del'>-struct orinoco_plx_card {</div><div class='del'>-	void __iomem *attr_mem;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Do a soft reset of the card using the Configuration Option Register</div><div class='ctx'>  */</div><div class='ctx'> static int orinoco_plx_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct orinoco_plx_card *card = priv-&gt;card;</div><div class='del'>-	u8 __iomem *attr_mem = card-&gt;attr_mem;</div><div class='add'>+	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	writeb(COR_VALUE | COR_RESET, attr_mem + COR_OFFSET);</div><div class='add'>+	iowrite8(COR_VALUE | COR_RESET, card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='del'>-	writeb(COR_VALUE, attr_mem + COR_OFFSET);</div><div class='add'>+	iowrite8(COR_VALUE, card-&gt;attr_io + COR_OFFSET);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='ctx'> 	/* Just in case, wait more until the card is no longer busy */</div><div class='hunk'>@@ -168,7 +128,7 @@ static int orinoco_plx_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> 		reg = hermes_read_regn(hw, CMD);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Did we timeout ? */</div><div class='add'>+	/* Still busy? */</div><div class='ctx'> 	if (reg &amp; HERMES_CMD_BUSY) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Busy timeout\n");</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='hunk'>@@ -177,20 +137,55 @@ static int orinoco_plx_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int orinoco_plx_hw_init(struct orinoco_pci_card *card)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 csr_reg;</div><div class='add'>+	static const u8 cis_magic[] = {</div><div class='add'>+		0x01, 0x03, 0x00, 0x00, 0xff, 0x17, 0x04, 0x67</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	printk(KERN_DEBUG PFX "CIS: ");</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		printk("%02X:", ioread8(card-&gt;attr_io + (i &lt;&lt; 1)));</div><div class='add'>+	}</div><div class='add'>+	printk("\n");</div><div class='add'>+</div><div class='add'>+	/* Verify whether a supported PC card is present */</div><div class='add'>+	/* FIXME: we probably need to be smarted about this */</div><div class='add'>+	for (i = 0; i &lt; sizeof(cis_magic); i++) {</div><div class='add'>+		if (cis_magic[i] != ioread8(card-&gt;attr_io + (i &lt;&lt; 1))) {</div><div class='add'>+			printk(KERN_ERR PFX "The CIS value of Prism2 PC "</div><div class='add'>+			       "card is unexpected\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bjoern: We need to tell the card to enable interrupts, in</div><div class='add'>+	   case the serial eprom didn't do this already.  See the</div><div class='add'>+	   PLX9052 data book, p8-1 and 8-24 for reference. */</div><div class='add'>+	csr_reg = ioread32(card-&gt;bridge_io + PLX_INTCSR);</div><div class='add'>+	if (!(csr_reg &amp; PLX_INTCSR_INTEN)) {</div><div class='add'>+		csr_reg |= PLX_INTCSR_INTEN;</div><div class='add'>+		iowrite32(csr_reg, card-&gt;bridge_io + PLX_INTCSR);</div><div class='add'>+		csr_reg = ioread32(card-&gt;bridge_io + PLX_INTCSR);</div><div class='add'>+		if (!(csr_reg &amp; PLX_INTCSR_INTEN)) {</div><div class='add'>+			printk(KERN_ERR PFX "Cannot enable interrupts\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 				const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	u8 __iomem *attr_mem = NULL;</div><div class='del'>-	u32 csr_reg, plx_addr;</div><div class='del'>-	struct orinoco_private *priv = NULL;</div><div class='del'>-	struct orinoco_plx_card *card;</div><div class='del'>-	unsigned long pccard_ioaddr = 0;</div><div class='del'>-	unsigned long pccard_iolen = 0;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	void __iomem *mem;</div><div class='del'>-	int i;</div><div class='add'>+	int err;</div><div class='add'>+	struct orinoco_private *priv;</div><div class='add'>+	struct orinoco_pci_card *card;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	void __iomem *hermes_io, *attr_io, *bridge_io;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -199,30 +194,30 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err != 0) {</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='ctx'> 		goto fail_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Resource 1 is mapped to PLX-specific registers */</div><div class='del'>-	plx_addr = pci_resource_start(pdev, 1);</div><div class='add'>+	bridge_io = pci_iomap(pdev, 1, 0);</div><div class='add'>+	if (!bridge_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map bridge registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_bridge;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Resource 2 is mapped to the PCMCIA attribute memory */</div><div class='del'>-	attr_mem = ioremap(pci_resource_start(pdev, 2),</div><div class='del'>-			   pci_resource_len(pdev, 2));</div><div class='del'>-	if (!attr_mem) {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot remap PCMCIA space\n");</div><div class='add'>+	attr_io = pci_iomap(pdev, 2, 0);</div><div class='add'>+	if (!attr_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map PCMCIA attributes\n");</div><div class='add'>+		err = -EIO;</div><div class='ctx'> 		goto fail_map_attr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Resource 3 is mapped to the PCMCIA I/O address space */</div><div class='del'>-	pccard_ioaddr = pci_resource_start(pdev, 3);</div><div class='del'>-	pccard_iolen = pci_resource_len(pdev, 3);</div><div class='del'>-</div><div class='del'>-	mem = pci_iomap(pdev, 3, 0);</div><div class='del'>-	if (!mem) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_map_io;</div><div class='add'>+	hermes_io = pci_iomap(pdev, 3, 0);</div><div class='add'>+	if (!hermes_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map chipset registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_hermes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='hunk'>@@ -235,38 +230,25 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	card = priv-&gt;card;</div><div class='del'>-	card-&gt;attr_mem = attr_mem;</div><div class='del'>-	dev-&gt;base_addr = pccard_ioaddr;</div><div class='add'>+	card-&gt;bridge_io = bridge_io;</div><div class='add'>+	card-&gt;attr_io = attr_io;</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, mem, HERMES_16BIT_REGSPACING);</div><div class='add'>+	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_16BIT_REGSPACING);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG PFX "Detected Orinoco/Prism2 PLX device "</div><div class='del'>-	       "at %s irq:%d, io addr:0x%lx\n", pci_name(pdev), pdev-&gt;irq,</div><div class='del'>-	       pccard_ioaddr);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, SA_SHIRQ,</div><div class='add'>+	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	/* bjoern: We need to tell the card to enable interrupts, in</div><div class='del'>-	   case the serial eprom didn't do this already.  See the</div><div class='del'>-	   PLX9052 data book, p8-1 and 8-24 for reference. */</div><div class='del'>-	csr_reg = inl(plx_addr + PLX_INTCSR);</div><div class='del'>-	if (!(csr_reg &amp; PLX_INTCSR_INTEN)) {</div><div class='del'>-		csr_reg |= PLX_INTCSR_INTEN;</div><div class='del'>-		outl(csr_reg, plx_addr + PLX_INTCSR);</div><div class='del'>-		csr_reg = inl(plx_addr + PLX_INTCSR);</div><div class='del'>-		if (!(csr_reg &amp; PLX_INTCSR_INTEN)) {</div><div class='del'>-			printk(KERN_ERR PFX "Cannot enable interrupts\n");</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='add'>+	err = orinoco_plx_hw_init(card);</div><div class='add'>+	if (err) {</div><div class='add'>+		printk(KERN_ERR PFX "Hardware initialization failed\n");</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = orinoco_plx_cor_reset(priv);</div><div class='hunk'>@@ -275,23 +257,6 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG PFX "CIS: ");</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		printk("%02X:", readb(attr_mem + 2*i));</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-</div><div class='del'>-	/* Verify whether a supported PC card is present */</div><div class='del'>-	/* FIXME: we probably need to be smarted about this */</div><div class='del'>-	for (i = 0; i &lt; sizeof(cis_magic); i++) {</div><div class='del'>-		if (cis_magic[i] != readb(attr_mem +2*i)) {</div><div class='del'>-			printk(KERN_ERR PFX "The CIS value of Prism2 PC "</div><div class='del'>-			       "card is unexpected\n");</div><div class='del'>-			err = -EIO;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot register network device\n");</div><div class='hunk'>@@ -299,6 +264,8 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='add'>+	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev-&gt;name,</div><div class='add'>+	       pci_name(pdev));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -310,12 +277,15 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> </div><div class='ctx'>  fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, mem);</div><div class='add'>+	pci_iounmap(pdev, hermes_io);</div><div class='ctx'> </div><div class='del'>- fail_map_io:</div><div class='del'>-	iounmap(attr_mem);</div><div class='add'>+ fail_map_hermes:</div><div class='add'>+	pci_iounmap(pdev, attr_io);</div><div class='ctx'> </div><div class='ctx'>  fail_map_attr:</div><div class='add'>+	pci_iounmap(pdev, bridge_io);</div><div class='add'>+</div><div class='add'>+ fail_map_bridge:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'>  fail_resources:</div><div class='hunk'>@@ -328,23 +298,20 @@ static void __devexit orinoco_plx_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	struct orinoco_plx_card *card = priv-&gt;card;</div><div class='del'>-	u8 __iomem *attr_mem = card-&gt;attr_mem;</div><div class='del'>-</div><div class='del'>-	BUG_ON(! dev);</div><div class='add'>+	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	free_irq(pdev-&gt;irq, dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> 	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='del'>-	iounmap(attr_mem);</div><div class='add'>+	pci_iounmap(pdev, card-&gt;attr_io);</div><div class='add'>+	pci_iounmap(pdev, card-&gt;bridge_io);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct pci_device_id orinoco_plx_pci_id_table[] = {</div><div class='add'>+static struct pci_device_id orinoco_plx_id_table[] = {</div><div class='ctx'> 	{0x111a, 0x1023, PCI_ANY_ID, PCI_ANY_ID,},	/* Siemens SpeedStream SS1023 */</div><div class='ctx'> 	{0x1385, 0x4100, PCI_ANY_ID, PCI_ANY_ID,},	/* Netgear MA301 */</div><div class='ctx'> 	{0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,},	/* Correga  - does this work? */</div><div class='hunk'>@@ -362,13 +329,15 @@ static struct pci_device_id orinoco_plx_pci_id_table[] = {</div><div class='ctx'> 	{0,},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_plx_pci_id_table);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, orinoco_plx_id_table);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver orinoco_plx_driver = {</div><div class='ctx'> 	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_plx_pci_id_table,</div><div class='add'>+	.id_table	= orinoco_plx_id_table,</div><div class='ctx'> 	.probe		= orinoco_plx_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(orinoco_plx_remove_one),</div><div class='add'>+	.suspend	= orinoco_pci_suspend,</div><div class='add'>+	.resume		= orinoco_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='hunk'>@@ -388,7 +357,6 @@ static int __init orinoco_plx_init(void)</div><div class='ctx'> static void __exit orinoco_plx_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;orinoco_plx_driver);</div><div class='del'>-	ssleep(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(orinoco_plx_init);</div><div class='head'>diff --git a/drivers/net/wireless/orinoco_tmd.c b/drivers/net/wireless/orinoco_tmd.c<br/>index 5e68b7026186..0831721e4d6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_tmd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/orinoco_tmd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/orinoco_tmd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/orinoco_tmd.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* orinoco_tmd.c</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Driver for Prism II devices which would usually be driven by orinoco_cs,</div><div class='ctx'>  * but are connected to the PCI bus by a TMD7160. </div><div class='ctx'>  *</div><div class='hunk'>@@ -26,25 +26,13 @@</div><div class='ctx'>  * other provisions required by the GPL.  If you do not delete the</div><div class='ctx'>  * provisions above, a recipient may use your version of this file</div><div class='ctx'>  * under either the MPL or the GPL.</div><div class='del'>-</div><div class='del'>- * Caution: this is experimental and probably buggy.  For success and</div><div class='del'>- * failure reports for different cards and adaptors, see</div><div class='del'>- * orinoco_tmd_pci_id_table near the end of the file.  If you have a</div><div class='del'>- * card we don't have the PCI id for, and looks like it should work,</div><div class='del'>- * drop me mail with the id and "it works"/"it doesn't work".</div><div class='del'>- *</div><div class='del'>- * Note: if everything gets detected fine but it doesn't actually send</div><div class='del'>- * or receive packets, your first port of call should probably be to   </div><div class='del'>- * try newer firmware in the card.  Especially if you're doing Ad-Hoc</div><div class='del'>- * modes</div><div class='ctx'>  *</div><div class='ctx'>  * The actual driving is done by orinoco.c, this is just resource</div><div class='ctx'>  * allocation stuff.</div><div class='ctx'>  *</div><div class='ctx'>  * This driver is modeled after the orinoco_plx driver. The main</div><div class='del'>- * difference is that the TMD chip has only IO port ranges and no</div><div class='del'>- * memory space, i.e.  no access to the CIS. Compared to the PLX chip,</div><div class='del'>- * the io range functionalities are exchanged.</div><div class='add'>+ * difference is that the TMD chip has only IO port ranges and doesn't</div><div class='add'>+ * provide access to the PCMCIA attribute space.</div><div class='ctx'>  *</div><div class='ctx'>  * Pheecom sells cards with the TMD chip as "ASIC version"</div><div class='ctx'>  */</div><div class='hunk'>@@ -52,7 +40,6 @@</div><div class='ctx'> #define DRIVER_NAME "orinoco_tmd"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -61,32 +48,26 @@</div><div class='ctx'> #include &lt;pcmcia/cisreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "orinoco.h"</div><div class='add'>+#include "orinoco_pci.h"</div><div class='ctx'> </div><div class='ctx'> #define COR_VALUE	(COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */</div><div class='ctx'> #define COR_RESET     (0x80)	/* reset bit in the COR register */</div><div class='ctx'> #define TMD_RESET_TIME	(500)	/* milliseconds */</div><div class='ctx'> </div><div class='del'>-/* Orinoco TMD specific data */</div><div class='del'>-struct orinoco_tmd_card {</div><div class='del'>-	u32 tmd_io;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Do a soft reset of the card using the Configuration Option Register</div><div class='ctx'>  */</div><div class='ctx'> static int orinoco_tmd_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	hermes_t *hw = &amp;priv-&gt;hw;</div><div class='del'>-	struct orinoco_tmd_card *card = priv-&gt;card;</div><div class='del'>-	u32 addr = card-&gt;tmd_io;</div><div class='add'>+	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	outb(COR_VALUE | COR_RESET, addr);</div><div class='add'>+	iowrite8(COR_VALUE | COR_RESET, card-&gt;bridge_io);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='del'>-	outb(COR_VALUE, addr);</div><div class='add'>+	iowrite8(COR_VALUE, card-&gt;bridge_io);</div><div class='ctx'> 	mdelay(1);</div><div class='ctx'> </div><div class='ctx'> 	/* Just in case, wait more until the card is no longer busy */</div><div class='hunk'>@@ -97,7 +78,7 @@ static int orinoco_tmd_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> 		reg = hermes_read_regn(hw, CMD);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Did we timeout ? */</div><div class='add'>+	/* Still busy? */</div><div class='ctx'> 	if (reg &amp; HERMES_CMD_BUSY) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Busy timeout\n");</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='hunk'>@@ -110,11 +91,11 @@ static int orinoco_tmd_cor_reset(struct orinoco_private *priv)</div><div class='ctx'> static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='ctx'> 				const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct orinoco_private *priv = NULL;</div><div class='del'>-	struct orinoco_tmd_card *card;</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	void __iomem *mem;</div><div class='add'>+	int err;</div><div class='add'>+	struct orinoco_private *priv;</div><div class='add'>+	struct orinoco_pci_card *card;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	void __iomem *hermes_io, *bridge_io;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -123,20 +104,28 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRIVER_NAME);</div><div class='del'>-	if (err != 0) {</div><div class='add'>+	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot obtain PCI resources\n");</div><div class='ctx'> 		goto fail_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem = pci_iomap(pdev, 2, 0);</div><div class='del'>-	if (! mem) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_iomap;</div><div class='add'>+	bridge_io = pci_iomap(pdev, 1, 0);</div><div class='add'>+	if (!bridge_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map bridge registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_bridge;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hermes_io = pci_iomap(pdev, 2, 0);</div><div class='add'>+	if (!hermes_io) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot map chipset registers\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto fail_map_hermes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate network device */</div><div class='ctx'> 	dev = alloc_orinocodev(sizeof(*card), orinoco_tmd_cor_reset);</div><div class='del'>-	if (! dev) {</div><div class='add'>+	if (!dev) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate network device\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto fail_alloc;</div><div class='hunk'>@@ -144,25 +133,19 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	card = priv-&gt;card;</div><div class='del'>-	card-&gt;tmd_io = pci_resource_start(pdev, 1);</div><div class='del'>-	dev-&gt;base_addr = pci_resource_start(pdev, 2);</div><div class='add'>+	card-&gt;bridge_io = bridge_io;</div><div class='ctx'> 	SET_MODULE_OWNER(dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	hermes_struct_init(&amp;priv-&gt;hw, mem, HERMES_16BIT_REGSPACING);</div><div class='add'>+	hermes_struct_init(&amp;priv-&gt;hw, hermes_io, HERMES_16BIT_REGSPACING);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG PFX "Detected Orinoco/Prism2 TMD device "</div><div class='del'>-	       "at %s irq:%d, io addr:0x%lx\n", pci_name(pdev), pdev-&gt;irq,</div><div class='del'>-	       dev-&gt;base_addr);</div><div class='del'>-</div><div class='del'>-	err = request_irq(pdev-&gt;irq, orinoco_interrupt, SA_SHIRQ,</div><div class='add'>+	err = request_irq(pdev-&gt;irq, orinoco_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev-&gt;irq);</div><div class='ctx'> 		err = -EBUSY;</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	err = orinoco_tmd_cor_reset(priv);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -177,6 +160,8 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='add'>+	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev-&gt;name,</div><div class='add'>+	       pci_name(pdev));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -188,9 +173,12 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> </div><div class='ctx'>  fail_alloc:</div><div class='del'>-	pci_iounmap(pdev, mem);</div><div class='add'>+	pci_iounmap(pdev, hermes_io);</div><div class='add'>+</div><div class='add'>+ fail_map_hermes:</div><div class='add'>+	pci_iounmap(pdev, bridge_io);</div><div class='ctx'> </div><div class='del'>- fail_iomap:</div><div class='add'>+ fail_map_bridge:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> </div><div class='ctx'>  fail_resources:</div><div class='hunk'>@@ -203,31 +191,32 @@ static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct orinoco_private *priv = dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	BUG_ON(! dev);</div><div class='add'>+	struct orinoco_pci_card *card = priv-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	free_irq(pdev-&gt;irq, dev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> 	pci_iounmap(pdev, priv-&gt;hw.iobase);</div><div class='add'>+	pci_iounmap(pdev, card-&gt;bridge_io);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct pci_device_id orinoco_tmd_pci_id_table[] = {</div><div class='add'>+static struct pci_device_id orinoco_tmd_id_table[] = {</div><div class='ctx'> 	{0x15e8, 0x0131, PCI_ANY_ID, PCI_ANY_ID,},      /* NDC and OEMs, e.g. pheecom */</div><div class='ctx'> 	{0,},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-MODULE_DEVICE_TABLE(pci, orinoco_tmd_pci_id_table);</div><div class='add'>+MODULE_DEVICE_TABLE(pci, orinoco_tmd_id_table);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver orinoco_tmd_driver = {</div><div class='ctx'> 	.name		= DRIVER_NAME,</div><div class='del'>-	.id_table	= orinoco_tmd_pci_id_table,</div><div class='add'>+	.id_table	= orinoco_tmd_id_table,</div><div class='ctx'> 	.probe		= orinoco_tmd_init_one,</div><div class='ctx'> 	.remove		= __devexit_p(orinoco_tmd_remove_one),</div><div class='add'>+	.suspend	= orinoco_pci_suspend,</div><div class='add'>+	.resume		= orinoco_pci_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='hunk'>@@ -245,7 +234,6 @@ static int __init orinoco_tmd_init(void)</div><div class='ctx'> static void __exit orinoco_tmd_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	pci_unregister_driver(&amp;orinoco_tmd_driver);</div><div class='del'>-	ssleep(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(orinoco_tmd_init);</div><div class='head'>diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c<br/>index bfa0cc319a09..09fc17a0f029 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/islpci_hotplug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/prism54/islpci_hotplug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/islpci_hotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/prism54/islpci_hotplug.c</a></div><div class='hunk'>@@ -189,7 +189,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	/* request for the interrupt before uploading the firmware */</div><div class='ctx'> 	rvalue = request_irq(pdev-&gt;irq, &amp;islpci_interrupt,</div><div class='del'>-			     SA_SHIRQ, ndev-&gt;name, priv);</div><div class='add'>+			     IRQF_SHARED, ndev-&gt;name, priv);</div><div class='ctx'> </div><div class='ctx'> 	if (rvalue) {</div><div class='ctx'> 		/* error, could not hook the handler to the irq */</div><div class='head'>diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c<br/>index 6a60c5970cb5..2e061a80b294 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/islpci_mgt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/prism54/islpci_mgt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/islpci_mgt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/prism54/islpci_mgt.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/prism54/prismcompat.h b/drivers/net/wireless/prism54/prismcompat.h<br/>index 55541c01752e..d71eca55a302 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/prismcompat.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/prism54/prismcompat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/prism54/prismcompat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/prism54/prismcompat.h</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c<br/>index 879eb427607c..61b83a5e737a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/ray_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/ray_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/ray_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/ray_cs.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  * </div><div class='ctx'> =============================================================================*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -924,8 +923,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     if (length &lt; ETH_ZLEN)</div><div class='ctx'>     {</div><div class='del'>-    	skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-    	if (skb == NULL)</div><div class='add'>+    	if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'>     		return 0;</div><div class='ctx'>     	length = ETH_ZLEN;</div><div class='ctx'>     }</div><div class='head'>diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c<br/>index f7b77ce54d7b..7f78b7801fb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/spectrum_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/spectrum_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/spectrum_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/spectrum_cs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for 802.11b cards using RAM-loadable Symbol firmware, such as</div><div class='del'>- * Symbol Wireless Networker LA4100, CompactFlash cards by Socket</div><div class='add'>+ * Symbol Wireless Networker LA4137, CompactFlash cards by Socket</div><div class='ctx'>  * Communications and Intel PRO/Wireless 2011B.</div><div class='ctx'>  *</div><div class='ctx'>  * The driver implements Symbol firmware download.  The rest is handled</div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #define DRIVER_NAME "spectrum_cs"</div><div class='ctx'> #define PFX DRIVER_NAME ": "</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -35,8 +34,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "orinoco.h"</div><div class='ctx'> </div><div class='del'>-static unsigned char *primsym;</div><div class='del'>-static unsigned char *secsym;</div><div class='ctx'> static const char primary_fw_name[] = "symbol_sp24t_prim_fw";</div><div class='ctx'> static const char secondary_fw_name[] = "symbol_sp24t_sec_fw";</div><div class='ctx'> </div><div class='hunk'>@@ -120,8 +117,8 @@ static void spectrum_cs_release(struct pcmcia_device *link);</div><div class='ctx'>  * Each block has the following structure.</div><div class='ctx'>  */</div><div class='ctx'> struct dblock {</div><div class='del'>-	__le32 _addr;		/* adapter address where to write the block */</div><div class='del'>-	__le16 _len;		/* length of the data only, in bytes */</div><div class='add'>+	__le32 addr;		/* adapter address where to write the block */</div><div class='add'>+	__le16 len;		/* length of the data only, in bytes */</div><div class='ctx'> 	char data[0];		/* data to be written */</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='hunk'>@@ -131,9 +128,9 @@ struct dblock {</div><div class='ctx'>  * items with matching ID should be written.</div><div class='ctx'>  */</div><div class='ctx'> struct pdr {</div><div class='del'>-	__le32 _id;		/* record ID */</div><div class='del'>-	__le32 _addr;		/* adapter address where to write the data */</div><div class='del'>-	__le32 _len;		/* expected length of the data, in bytes */</div><div class='add'>+	__le32 id;		/* record ID */</div><div class='add'>+	__le32 addr;		/* adapter address where to write the data */</div><div class='add'>+	__le32 len;		/* expected length of the data, in bytes */</div><div class='ctx'> 	char next[0];		/* next PDR starts here */</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='hunk'>@@ -144,8 +141,8 @@ struct pdr {</div><div class='ctx'>  * be plugged into the secondary firmware.</div><div class='ctx'>  */</div><div class='ctx'> struct pdi {</div><div class='del'>-	__le16 _len;		/* length of ID and data, in words */</div><div class='del'>-	__le16 _id;		/* record ID */</div><div class='add'>+	__le16 len;		/* length of ID and data, in words */</div><div class='add'>+	__le16 id;		/* record ID */</div><div class='ctx'> 	char data[0];		/* plug data */</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='hunk'>@@ -154,44 +151,44 @@ struct pdi {</div><div class='ctx'> static inline u32</div><div class='ctx'> dblock_addr(const struct dblock *blk)</div><div class='ctx'> {</div><div class='del'>-	return le32_to_cpu(blk-&gt;_addr);</div><div class='add'>+	return le32_to_cpu(blk-&gt;addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='ctx'> dblock_len(const struct dblock *blk)</div><div class='ctx'> {</div><div class='del'>-	return le16_to_cpu(blk-&gt;_len);</div><div class='add'>+	return le16_to_cpu(blk-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='ctx'> pdr_id(const struct pdr *pdr)</div><div class='ctx'> {</div><div class='del'>-	return le32_to_cpu(pdr-&gt;_id);</div><div class='add'>+	return le32_to_cpu(pdr-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='ctx'> pdr_addr(const struct pdr *pdr)</div><div class='ctx'> {</div><div class='del'>-	return le32_to_cpu(pdr-&gt;_addr);</div><div class='add'>+	return le32_to_cpu(pdr-&gt;addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='ctx'> pdr_len(const struct pdr *pdr)</div><div class='ctx'> {</div><div class='del'>-	return le32_to_cpu(pdr-&gt;_len);</div><div class='add'>+	return le32_to_cpu(pdr-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='ctx'> pdi_id(const struct pdi *pdi)</div><div class='ctx'> {</div><div class='del'>-	return le16_to_cpu(pdi-&gt;_id);</div><div class='add'>+	return le16_to_cpu(pdi-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Return length of the data only, in bytes */</div><div class='ctx'> static inline u32</div><div class='ctx'> pdi_len(const struct pdi *pdi)</div><div class='ctx'> {</div><div class='del'>-	return 2 * (le16_to_cpu(pdi-&gt;_len) - 1);</div><div class='add'>+	return 2 * (le16_to_cpu(pdi-&gt;len) - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -343,8 +340,7 @@ spectrum_plug_pdi(hermes_t *hw, struct pdr *first_pdr, struct pdi *pdi)</div><div class='ctx'> </div><div class='ctx'> 	/* do the actual plugging */</div><div class='ctx'> 	spectrum_aux_setaddr(hw, pdr_addr(pdr));</div><div class='del'>-	hermes_write_words(hw, HERMES_AUXDATA, pdi-&gt;data,</div><div class='del'>-			   pdi_len(pdi) / 2);</div><div class='add'>+	hermes_write_bytes(hw, HERMES_AUXDATA, pdi-&gt;data, pdi_len(pdi));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -424,8 +420,8 @@ spectrum_load_blocks(hermes_t *hw, const struct dblock *first_block)</div><div class='ctx'> </div><div class='ctx'> 	while (dblock_addr(blk) != BLOCK_END) {</div><div class='ctx'> 		spectrum_aux_setaddr(hw, blkaddr);</div><div class='del'>-		hermes_write_words(hw, HERMES_AUXDATA, blk-&gt;data,</div><div class='del'>-				   blklen / 2);</div><div class='add'>+		hermes_write_bytes(hw, HERMES_AUXDATA, blk-&gt;data,</div><div class='add'>+				   blklen);</div><div class='ctx'> </div><div class='ctx'> 		blk = (struct dblock *) &amp;blk-&gt;data[blklen];</div><div class='ctx'> 		blkaddr = dblock_addr(blk);</div><div class='hunk'>@@ -442,7 +438,7 @@ spectrum_load_blocks(hermes_t *hw, const struct dblock *first_block)</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> spectrum_dl_image(hermes_t *hw, struct pcmcia_device *link,</div><div class='del'>-		  const unsigned char *image)</div><div class='add'>+		  const unsigned char *image, int secondary)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	const unsigned char *ptr;</div><div class='hunk'>@@ -457,7 +453,7 @@ spectrum_dl_image(hermes_t *hw, struct pcmcia_device *link,</div><div class='ctx'> 	first_block = (const struct dblock *) ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the PDA */</div><div class='del'>-	if (image != primsym) {</div><div class='add'>+	if (secondary) {</div><div class='ctx'> 		ret = spectrum_read_pda(hw, pda, sizeof(pda));</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -474,7 +470,7 @@ spectrum_dl_image(hermes_t *hw, struct pcmcia_device *link,</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Write the PDA to the adapter */</div><div class='del'>-	if (image != primsym) {</div><div class='add'>+	if (secondary) {</div><div class='ctx'> 		ret = spectrum_apply_pda(hw, first_block, pda);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='hunk'>@@ -489,7 +485,7 @@ spectrum_dl_image(hermes_t *hw, struct pcmcia_device *link,</div><div class='ctx'> 	ret = hermes_init(hw);</div><div class='ctx'> </div><div class='ctx'> 	/* hermes_reset() should return 0 with the secondary firmware */</div><div class='del'>-	if (image != primsym &amp;&amp; ret != 0)</div><div class='add'>+	if (secondary &amp;&amp; ret != 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* And this should work with any firmware */</div><div class='hunk'>@@ -511,33 +507,30 @@ spectrum_dl_firmware(hermes_t *hw, struct pcmcia_device *link)</div><div class='ctx'> 	const struct firmware *fw_entry;</div><div class='ctx'> </div><div class='ctx'> 	if (request_firmware(&amp;fw_entry, primary_fw_name,</div><div class='del'>-			     &amp;handle_to_dev(link)) == 0) {</div><div class='del'>-		primsym = fw_entry-&gt;data;</div><div class='del'>-	} else {</div><div class='add'>+			     &amp;handle_to_dev(link)) != 0) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Cannot find firmware: %s\n",</div><div class='ctx'> 		       primary_fw_name);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_firmware(&amp;fw_entry, secondary_fw_name,</div><div class='del'>-			     &amp;handle_to_dev(link)) == 0) {</div><div class='del'>-		secsym = fw_entry-&gt;data;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR PFX "Cannot find firmware: %s\n",</div><div class='del'>-		       secondary_fw_name);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Load primary firmware */</div><div class='del'>-	ret = spectrum_dl_image(hw, link, primsym);</div><div class='add'>+	ret = spectrum_dl_image(hw, link, fw_entry-&gt;data, 0);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Primary firmware download failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Load secondary firmware */</div><div class='del'>-	ret = spectrum_dl_image(hw, link, secsym);</div><div class='add'>+	if (request_firmware(&amp;fw_entry, secondary_fw_name,</div><div class='add'>+			     &amp;handle_to_dev(link)) != 0) {</div><div class='add'>+		printk(KERN_ERR PFX "Cannot find firmware: %s\n",</div><div class='add'>+		       secondary_fw_name);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* Load secondary firmware */</div><div class='add'>+	ret = spectrum_dl_image(hw, link, fw_entry-&gt;data, 1);</div><div class='add'>+	release_firmware(fw_entry);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR PFX "Secondary firmware download failed\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -626,14 +619,11 @@ static void spectrum_cs_detach(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = link-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (link-&gt;dev_node)</div><div class='add'>+		unregister_netdev(dev);</div><div class='add'>+</div><div class='ctx'> 	spectrum_cs_release(link);</div><div class='ctx'> </div><div class='del'>-	DEBUG(0, PFX "detach: link=%p link-&gt;dev_node=%p\n", link, link-&gt;dev_node);</div><div class='del'>-	if (link-&gt;dev_node) {</div><div class='del'>-		DEBUG(0, PFX "About to unregister net device %p\n",</div><div class='del'>-		      dev);</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-	}</div><div class='ctx'> 	free_orinocodev(dev);</div><div class='ctx'> }				/* spectrum_cs_detach */</div><div class='ctx'> </div><div class='hunk'>@@ -653,13 +643,10 @@ spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 	int last_fn, last_ret;</div><div class='ctx'> 	u_char buf[64];</div><div class='ctx'> 	config_info_t conf;</div><div class='del'>-	cisinfo_t info;</div><div class='ctx'> 	tuple_t tuple;</div><div class='ctx'> 	cisparse_t parse;</div><div class='ctx'> 	void __iomem *mem;</div><div class='ctx'> </div><div class='del'>-	CS_CHECK(ValidateCIS, pcmcia_validate_cis(link, &amp;info));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This reads the card's CONFIG tuple to find its</div><div class='ctx'> 	 * configuration registers.</div><div class='hunk'>@@ -709,12 +696,6 @@ spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'> 			goto next_entry;</div><div class='ctx'> 		link-&gt;conf.ConfigIndex = cfg-&gt;index;</div><div class='ctx'> </div><div class='del'>-		/* Does this card need audio output? */</div><div class='del'>-		if (cfg-&gt;flags &amp; CISTPL_CFTABLE_AUDIO) {</div><div class='del'>-			link-&gt;conf.Attributes |= CONF_ENABLE_SPKR;</div><div class='del'>-			link-&gt;conf.Status = CCSR_AUDIO_ENA;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Use power settings for Vcc and Vpp if present */</div><div class='ctx'> 		/* Note that the CIS values need to be rescaled */</div><div class='ctx'> 		if (cfg-&gt;vcc.present &amp; (1 &lt;&lt; CISTPL_POWER_VNOM)) {</div><div class='hunk'>@@ -835,19 +816,10 @@ spectrum_cs_config(struct pcmcia_device *link)</div><div class='ctx'>                                     net_device has been registered */</div><div class='ctx'> </div><div class='ctx'> 	/* Finally, report what we've done */</div><div class='del'>-	printk(KERN_DEBUG "%s: index 0x%02x: ",</div><div class='del'>-	       dev-&gt;name, link-&gt;conf.ConfigIndex);</div><div class='del'>-	if (link-&gt;conf.Vpp)</div><div class='del'>-		printk(", Vpp %d.%d", link-&gt;conf.Vpp / 10,</div><div class='del'>-		       link-&gt;conf.Vpp % 10);</div><div class='del'>-	printk(", irq %d", link-&gt;irq.AssignedIRQ);</div><div class='del'>-	if (link-&gt;io.NumPorts1)</div><div class='del'>-		printk(", io 0x%04x-0x%04x", link-&gt;io.BasePort1,</div><div class='del'>-		       link-&gt;io.BasePort1 + link-&gt;io.NumPorts1 - 1);</div><div class='del'>-	if (link-&gt;io.NumPorts2)</div><div class='del'>-		printk(" &amp; 0x%04x-0x%04x", link-&gt;io.BasePort2,</div><div class='del'>-		       link-&gt;io.BasePort2 + link-&gt;io.NumPorts2 - 1);</div><div class='del'>-	printk("\n");</div><div class='add'>+	printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "</div><div class='add'>+	       "0x%04x-0x%04x\n", dev-&gt;name, dev-&gt;class_dev.dev-&gt;bus_id,</div><div class='add'>+	       link-&gt;irq.AssignedIRQ, link-&gt;io.BasePort1,</div><div class='add'>+	       link-&gt;io.BasePort1 + link-&gt;io.NumPorts1 - 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -888,11 +860,10 @@ spectrum_cs_suspend(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = link-&gt;priv;</div><div class='ctx'> 	struct orinoco_private *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the device as stopped, to block IO until later */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_lock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	err = __orinoco_down(dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -902,9 +873,9 @@ spectrum_cs_suspend(struct pcmcia_device *link)</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> 	priv-&gt;hw_unavailable++;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -932,7 +903,7 @@ static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION</div><div class='ctx'> 	" David Gibson &lt;hermes@gibson.dropbear.id.au&gt;, et al)";</div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_device_id spectrum_cs_ids[] = {</div><div class='del'>-	PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4100 */</div><div class='add'>+	PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */</div><div class='ctx'> 	PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless LAN PC Card", 0x816cc815, 0x6fbf459a), /* 2011B, not 2011 */</div><div class='ctx'> 	PCMCIA_DEVICE_NULL,</div><div class='head'>diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c<br/>index 18a44580b53b..fd31885c6844 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/strip.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/strip.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/strip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/strip.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";</div><div class='ctx'> /************************************************************************/</div><div class='ctx'> /* Header files								*/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c<br/>index dade4b903579..5b69befdab74 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wavelan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wavelan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wavelan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/wavelan.c</a></div><div class='hunk'>@@ -1695,8 +1695,8 @@ static int wv_frequency_list(unsigned long ioaddr,	/* I/O port of the card */</div><div class='ctx'> 		/* Look in the table if the frequency is allowed */</div><div class='ctx'> 		if (table[9 - (freq / 16)] &amp; (1 &lt;&lt; (freq % 16))) {</div><div class='ctx'> 			/* Compute approximate channel number */</div><div class='del'>-			while ((((channel_bands[c] &gt;&gt; 1) - 24) &lt; freq) &amp;&amp;</div><div class='del'>-			       (c &lt; NELS(channel_bands)))</div><div class='add'>+			while ((c &lt; NELS(channel_bands)) &amp;&amp;</div><div class='add'>+				(((channel_bands[c] &gt;&gt; 1) - 24) &lt; freq)) </div><div class='ctx'> 				c++;</div><div class='ctx'> 			list[i].i = c;	/* Set the list index */</div><div class='ctx'> </div><div class='hunk'>@@ -2903,6 +2903,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	net_local *lp = (net_local *) dev-&gt;priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	char data[ETH_ZLEN];</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_TX_TRACE</div><div class='ctx'> 	printk(KERN_DEBUG "%s: -&gt;wavelan_packet_xmit(0x%X)\n", dev-&gt;name,</div><div class='hunk'>@@ -2937,15 +2938,16 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)</div><div class='ctx'> 	 * able to detect collisions, therefore in theory we don't really</div><div class='ctx'> 	 * need to pad. Jean II */</div><div class='ctx'> 	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return 0;</div><div class='add'>+		memset(data, 0, ETH_ZLEN);</div><div class='add'>+		memcpy(data, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		/* Write packet on the card */</div><div class='add'>+		if(wv_packet_write(dev, data, ETH_ZLEN))</div><div class='add'>+			return 1;	/* We failed */</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Write packet on the card */</div><div class='del'>-	if(wv_packet_write(dev, skb-&gt;data, skb-&gt;len))</div><div class='add'>+	else if(wv_packet_write(dev, skb-&gt;data, skb-&gt;len))</div><div class='ctx'> 		return 1;	/* We failed */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_TX_TRACE</div><div class='head'>diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c<br/>index f7724eb2fa7e..561250f73fd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wavelan_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wavelan_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wavelan_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/wavelan_cs.c</a></div><div class='hunk'>@@ -3194,11 +3194,8 @@ wavelan_packet_xmit(struct sk_buff *	skb,</div><div class='ctx'> 	 * and we don't have the Ethernet specific requirement of beeing</div><div class='ctx'> 	 * able to detect collisions, therefore in theory we don't really</div><div class='ctx'> 	 * need to pad. Jean II */</div><div class='del'>-	if (skb-&gt;len &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='add'>+	if (skb_padto(skb, ETH_ZLEN))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'>   wv_packet_write(dev, skb-&gt;data, skb-&gt;len);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h<br/>index c65fe7a391ec..f34a36b0c7b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wavelan_cs.p.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wavelan_cs.p.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wavelan_cs.p.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/wavelan_cs.p.h</a></div><div class='hunk'>@@ -411,7 +411,6 @@</div><div class='ctx'> /***************************** INCLUDES *****************************/</div><div class='ctx'> </div><div class='ctx'> /* Linux headers that we need */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c<br/>index e52a650f6737..c03e400facee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl3501_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/wireless/wl3501_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/wl3501_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/wl3501_cs.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef REALLY_SLOW_IO	/* most systems can safely undef this */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='head'>diff --git a/drivers/usb/net/zd1201.c b/drivers/net/wireless/zd1201.c<br/>index 9b1e4ed1d07e..662ecc8a33ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/zd1201.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/zd1201.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1201.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1201.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@ static struct usb_device_id zd1201_table[] = {</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int ap = 0;	/* Are we an AP or a normal station? */</div><div class='add'>+static int ap;	/* Are we an AP or a normal station? */</div><div class='ctx'> </div><div class='ctx'> #define ZD1201_VERSION	"0.15"</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table);</div><div class='ctx'> static int zd1201_fw_upload(struct usb_device *dev, int apfw)</div><div class='ctx'> {</div><div class='ctx'> 	const struct firmware *fw_entry;</div><div class='del'>-	char* data;</div><div class='add'>+	char *data;</div><div class='ctx'> 	unsigned long len;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char ret;</div><div class='hunk'>@@ -65,7 +65,7 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "Failed to load %s firmware file!\n", fwfile);</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "Make sure the hotplug firmware loader is installed.\n");</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "Goto http://linux-lc100020.sourceforge.net for more info\n");</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Goto http://linux-lc100020.sourceforge.net for more info.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -94,12 +94,12 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)</div><div class='ctx'> 	    USB_DIR_OUT | 0x40, 0, 0, NULL, 0, ZD1201_FW_TIMEOUT);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto exit;</div><div class='del'>-                                                                                                                                                                </div><div class='add'>+</div><div class='ctx'> 	err = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x4,</div><div class='ctx'> 	    USB_DIR_IN | 0x40, 0,0, &amp;ret, sizeof(ret), ZD1201_FW_TIMEOUT);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto exit;</div><div class='del'>-                                                                                                                                                                                                                                                                                        </div><div class='add'>+</div><div class='ctx'> 	if (ret &amp; 0x80) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -166,13 +166,13 @@ static int zd1201_docmd(struct zd1201 *zd, int cmd, int parm0,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_fill_bulk_urb(urb, zd-&gt;usb, usb_sndbulkpipe(zd-&gt;usb, zd-&gt;endp_out2),</div><div class='del'>-	     command, 16, zd1201_usbfree, zd);</div><div class='add'>+			  command, 16, zd1201_usbfree, zd);</div><div class='ctx'> 	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kfree(command);</div><div class='ctx'> 		usb_free_urb(urb);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -316,7 +316,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		fc = le16_to_cpu(*(__le16 *)&amp;data[datalen-16]);</div><div class='ctx'> 		seq = le16_to_cpu(*(__le16 *)&amp;data[datalen-24]);</div><div class='ctx'> </div><div class='del'>-		if(zd-&gt;monitor) {</div><div class='add'>+		if (zd-&gt;monitor) {</div><div class='ctx'> 			if (datalen &lt; 24)</div><div class='ctx'> 				goto resubmit;</div><div class='ctx'> 			if (!(skb = dev_alloc_skb(datalen+24)))</div><div class='hunk'>@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 				goto resubmit;</div><div class='ctx'> 			}</div><div class='ctx'> 			hlist_for_each_entry(frag, node, &amp;zd-&gt;fraglist, fnode)</div><div class='del'>-				if(frag-&gt;seq == (seq&amp;IEEE80211_SCTL_SEQ))</div><div class='add'>+				if (frag-&gt;seq == (seq&amp;IEEE80211_SCTL_SEQ))</div><div class='ctx'> 					break;</div><div class='ctx'> 			if (!frag)</div><div class='ctx'> 				goto resubmit;</div><div class='hunk'>@@ -376,7 +376,6 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 				goto resubmit;</div><div class='ctx'> 			hlist_del_init(&amp;frag-&gt;fnode);</div><div class='ctx'> 			kfree(frag);</div><div class='del'>-			/* Fallthrough */</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (datalen&lt;14)</div><div class='ctx'> 				goto resubmit;</div><div class='hunk'>@@ -422,7 +421,7 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,</div><div class='ctx'> 	int rid_fid;</div><div class='ctx'> 	int length;</div><div class='ctx'> 	unsigned char *pdata;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	zd-&gt;rxdatas = 0;</div><div class='ctx'> 	err = zd1201_docmd(zd, ZD1201_CMDCODE_ACCESS, rid, 0, 0);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -471,11 +470,11 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,</div><div class='ctx'> 	length = zd-&gt;rxlen;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		int  actual_length;</div><div class='add'>+		int actual_length;</div><div class='ctx'> </div><div class='ctx'> 		actual_length = (length &gt; 64) ? 64 : length;</div><div class='ctx'> </div><div class='del'>-		if(pdata[0] != 0x3) {</div><div class='add'>+		if (pdata[0] != 0x3) {</div><div class='ctx'> 			dev_dbg(&amp;zd-&gt;usb-&gt;dev, "Rx Resource packet type error: %02X\n",</div><div class='ctx'> 			    pdata[0]);</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -487,11 +486,10 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Skip the 4 bytes header (RID length and RID) */</div><div class='del'>-		if(i == 0) {</div><div class='add'>+		if (i == 0) {</div><div class='ctx'> 			pdata += 8;</div><div class='ctx'> 			actual_length -= 8;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='add'>+		} else {</div><div class='ctx'> 			pdata += 4;</div><div class='ctx'> 			actual_length -= 4;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -620,7 +618,7 @@ static int zd1201_drvr_start(struct zd1201 *zd)</div><div class='ctx'> 	short max;</div><div class='ctx'> 	__le16 zdmax;</div><div class='ctx'> 	unsigned char *buffer;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	buffer = kzalloc(ZD1201_RXSIZE, GFP_KERNEL);</div><div class='ctx'> 	if (!buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -632,7 +630,7 @@ static int zd1201_drvr_start(struct zd1201 *zd)</div><div class='ctx'> 	err = usb_submit_urb(zd-&gt;rx_urb, GFP_KERNEL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_buffer;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	err = zd1201_docmd(zd, ZD1201_CMDCODE_INIT, 0, 0, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_urb;</div><div class='hunk'>@@ -684,7 +682,7 @@ static int zd1201_enable(struct zd1201 *zd)</div><div class='ctx'> static int zd1201_disable(struct zd1201 *zd)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!zd-&gt;mac_enabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (zd-&gt;monitor) {</div><div class='hunk'>@@ -764,7 +762,6 @@ static int zd1201_net_open(struct net_device *dev)</div><div class='ctx'> static int zd1201_net_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -915,7 +912,6 @@ static int zd1201_get_name(struct net_device *dev,</div><div class='ctx'>     struct iw_request_info *info, char *name, char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	strcpy(name, "IEEE 802.11b");</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1013,11 +1009,10 @@ static int zd1201_set_mode(struct net_device *dev,</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 	}</div><div class='del'>-	zd-&gt;monitor=monitor;</div><div class='add'>+	zd-&gt;monitor = monitor;</div><div class='ctx'> 	/* If monitor mode is set we don't actually turn it on here since it</div><div class='ctx'> 	 * is done during mac reset anyway (see zd1201_mac_enable).</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	zd1201_mac_reset(zd);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1117,7 +1112,7 @@ static int zd1201_get_wap(struct net_device *dev,</div><div class='ctx'> 		zd-&gt;iwstats.qual.updated = 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return zd1201_getconfig(zd,ZD1201_RID_CURRENTBSSID,ap_addr-&gt;sa_data,6);</div><div class='add'>+	return zd1201_getconfig(zd, ZD1201_RID_CURRENTBSSID, ap_addr-&gt;sa_data, 6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int zd1201_set_scan(struct net_device *dev,</div><div class='hunk'>@@ -1275,7 +1270,7 @@ static int zd1201_set_rate(struct net_device *dev,</div><div class='ctx'> 	if (!rrq-&gt;fixed) { /* Also enable all lower bitrates */</div><div class='ctx'> 		rate |= rate-1;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	err = zd1201_setconfig16(zd, ZD1201_RID_TXRATECNTL, rate);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1486,7 +1481,7 @@ static int zd1201_get_encode(struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	erq-&gt;flags |= i+1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	erq-&gt;length = zd-&gt;encode_keylen[i];</div><div class='ctx'> 	memcpy(key, zd-&gt;encode_keys[i], erq-&gt;length);</div><div class='ctx'> </div><div class='hunk'>@@ -1529,11 +1524,7 @@ static int zd1201_set_power(struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='del'>-	err = zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int zd1201_get_power(struct net_device *dev,</div><div class='hunk'>@@ -1627,15 +1618,11 @@ static int zd1201_set_hostauth(struct net_device *dev,</div><div class='ctx'>     struct iw_request_info *info, struct iw_param *rrq, char *extra)</div><div class='ctx'> {</div><div class='ctx'> 	struct zd1201 *zd = (struct zd1201 *)dev-&gt;priv;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!zd-&gt;ap)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	err = zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq-&gt;value);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	return zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq-&gt;value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int zd1201_get_hostauth(struct net_device *dev,</div><div class='hunk'>@@ -1744,7 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface,</div><div class='ctx'> {</div><div class='ctx'> 	struct zd1201 *zd;</div><div class='ctx'> 	struct usb_device *usb;</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='ctx'> 	short porttype;</div><div class='ctx'> 	char buf[IW_ESSID_MAX_SIZE+2];</div><div class='ctx'> </div><div class='hunk'>@@ -1773,9 +1760,7 @@ static int zd1201_probe(struct usb_interface *interface,</div><div class='ctx'> 	if (!zd-&gt;rx_urb || !zd-&gt;tx_urb)</div><div class='ctx'> 		goto err_zd;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i&lt;100; i++)</div><div class='del'>-		udelay(1000);</div><div class='del'>-</div><div class='add'>+	mdelay(100);</div><div class='ctx'> 	err = zd1201_drvr_start(zd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_zd;</div><div class='hunk'>@@ -1833,7 +1818,7 @@ static int zd1201_probe(struct usb_interface *interface,</div><div class='ctx'> 		goto err_net;</div><div class='ctx'> 	dev_info(&amp;usb-&gt;dev, "%s: ZD1201 USB Wireless interface\n",</div><div class='ctx'> 	    zd-&gt;dev-&gt;name);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	usb_set_intfdata(interface, zd);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/net/zd1201.h b/drivers/net/wireless/zd1201.h<br/>index 235f0ee34b24..235f0ee34b24 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/zd1201.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/zd1201.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1201.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1201.h</a></div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/Kconfig b/drivers/net/wireless/zd1211rw/Kconfig<br/>new file mode 100644<br/>index 000000000000..66ed55bc5460<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+config ZD1211RW</div><div class='add'>+	tristate "ZyDAS ZD1211/ZD1211B USB-wireless support"</div><div class='add'>+	depends on USB &amp;&amp; IEEE80211 &amp;&amp; IEEE80211_SOFTMAC &amp;&amp; NET_RADIO &amp;&amp; EXPERIMENTAL</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	---help---</div><div class='add'>+	  This is an experimental driver for the ZyDAS ZD1211/ZD1211B wireless</div><div class='add'>+	  chip, present in many USB-wireless adapters.</div><div class='add'>+</div><div class='add'>+	  Device firmware is required alongside this driver. You can download the</div><div class='add'>+	  firmware distribution from http://zd1211.ath.cx/get-firmware</div><div class='add'>+</div><div class='add'>+config ZD1211RW_DEBUG</div><div class='add'>+	bool "ZyDAS ZD1211 debugging"</div><div class='add'>+	depends on ZD1211RW</div><div class='add'>+	---help---</div><div class='add'>+	  ZD1211 debugging messages. Choosing Y will result in additional debug</div><div class='add'>+	  messages being saved to your kernel logs, which may help debug any</div><div class='add'>+	  problems.</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile<br/>new file mode 100644<br/>index 000000000000..500314fc74d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/Makefile</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+obj-$(CONFIG_ZD1211RW) += zd1211rw.o</div><div class='add'>+</div><div class='add'>+zd1211rw-objs := zd_chip.o zd_ieee80211.o \</div><div class='add'>+		zd_mac.o zd_netdev.o \</div><div class='add'>+		zd_rf_al2230.o zd_rf_rf2959.o \</div><div class='add'>+		zd_rf.o zd_usb.o zd_util.o</div><div class='add'>+</div><div class='add'>+ifeq ($(CONFIG_ZD1211RW_DEBUG),y)</div><div class='add'>+EXTRA_CFLAGS += -DDEBUG</div><div class='add'>+endif</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c<br/>new file mode 100644<br/>index 000000000000..efc9c4bd826f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_chip.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_chip.c</a></div><div class='hunk'>@@ -0,0 +1,1615 @@</div><div class='add'>+/* zd_chip.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* This file implements all the hardware specific functions for the ZD1211</div><div class='add'>+ * and ZD1211B chips. Support for the ZD1211B was possible after Timothy</div><div class='add'>+ * Legge sent me a ZD1211B device. Thank you Tim. -- Uli</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_chip.h"</div><div class='add'>+#include "zd_ieee80211.h"</div><div class='add'>+#include "zd_mac.h"</div><div class='add'>+#include "zd_rf.h"</div><div class='add'>+#include "zd_util.h"</div><div class='add'>+</div><div class='add'>+void zd_chip_init(struct zd_chip *chip,</div><div class='add'>+	         struct net_device *netdev,</div><div class='add'>+		 struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	memset(chip, 0, sizeof(*chip));</div><div class='add'>+	mutex_init(&amp;chip-&gt;mutex);</div><div class='add'>+	zd_usb_init(&amp;chip-&gt;usb, netdev, intf);</div><div class='add'>+	zd_rf_init(&amp;chip-&gt;rf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_chip_clear(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	zd_usb_clear(&amp;chip-&gt;usb);</div><div class='add'>+	zd_rf_clear(&amp;chip-&gt;rf);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	mutex_destroy(&amp;chip-&gt;mutex);</div><div class='add'>+	memset(chip, 0, sizeof(*chip));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scnprint_mac_oui(const u8 *addr, char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buffer, size, "%02x-%02x-%02x",</div><div class='add'>+		         addr[0], addr[1], addr[2]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Prints an identifier line, which will support debugging. */</div><div class='add'>+static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	i = scnprintf(buffer, size, "zd1211%s chip ",</div><div class='add'>+		      chip-&gt;is_zd1211b ? "b" : "");</div><div class='add'>+	i += zd_usb_scnprint_id(&amp;chip-&gt;usb, buffer+i, size-i);</div><div class='add'>+	i += scnprintf(buffer+i, size-i, " ");</div><div class='add'>+	i += scnprint_mac_oui(chip-&gt;e2p_mac, buffer+i, size-i);</div><div class='add'>+	i += scnprintf(buffer+i, size-i, " ");</div><div class='add'>+	i += zd_rf_scnprint_id(&amp;chip-&gt;rf, buffer+i, size-i);</div><div class='add'>+	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c", chip-&gt;pa_type,</div><div class='add'>+		chip-&gt;patch_cck_gain ? 'g' : '-',</div><div class='add'>+		chip-&gt;patch_cr157 ? '7' : '-',</div><div class='add'>+		chip-&gt;patch_6m_band_edge ? '6' : '-');</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_id(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	char buffer[80];</div><div class='add'>+</div><div class='add'>+	scnprint_id(chip, buffer, sizeof(buffer));</div><div class='add'>+	buffer[sizeof(buffer)-1] = 0;</div><div class='add'>+	dev_info(zd_chip_dev(chip), "%s\n", buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read a variable number of 32-bit values. Parameter count is not allowed to</div><div class='add'>+ * exceed USB_MAX_IOREAD32_COUNT.</div><div class='add'>+ */</div><div class='add'>+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr,</div><div class='add'>+		 unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	int i;</div><div class='add'>+	zd_addr_t *a16 = (zd_addr_t *)NULL;</div><div class='add'>+	u16 *v16;</div><div class='add'>+	unsigned int count16;</div><div class='add'>+</div><div class='add'>+	if (count &gt; USB_MAX_IOREAD32_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Allocate a single memory block for values and addresses. */</div><div class='add'>+	count16 = 2*count;</div><div class='add'>+	a16 = (zd_addr_t *)kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),</div><div class='add'>+		                   GFP_NOFS);</div><div class='add'>+	if (!a16) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			  "error ENOMEM in allocation of a16\n");</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	v16 = (u16 *)(a16 + count16);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		int j = 2*i;</div><div class='add'>+		/* We read the high word always first. */</div><div class='add'>+		a16[j] = zd_inc_word(addr[i]);</div><div class='add'>+		a16[j+1] = addr[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = zd_ioread16v_locked(chip, v16, a16, count16);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			  "error: zd_ioread16v_locked. Error number %d\n", r);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		int j = 2*i;</div><div class='add'>+		values[i] = (v16[j] &lt;&lt; 16) | v16[j+1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree((void *)a16);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,</div><div class='add'>+	           unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int i, j, r;</div><div class='add'>+	struct zd_ioreq16 *ioreqs16;</div><div class='add'>+	unsigned int count16;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (count &gt; USB_MAX_IOWRITE32_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Allocate a single memory block for values and addresses. */</div><div class='add'>+	count16 = 2*count;</div><div class='add'>+	ioreqs16 = kmalloc(count16 * sizeof(struct zd_ioreq16), GFP_NOFS);</div><div class='add'>+	if (!ioreqs16) {</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			  "error %d in ioreqs16 allocation\n", r);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		j = 2*i;</div><div class='add'>+		/* We write the high word always first. */</div><div class='add'>+		ioreqs16[j].value   = ioreqs[i].value &gt;&gt; 16;</div><div class='add'>+		ioreqs16[j].addr    = zd_inc_word(ioreqs[i].addr);</div><div class='add'>+		ioreqs16[j+1].value = ioreqs[i].value;</div><div class='add'>+		ioreqs16[j+1].addr  = ioreqs[i].addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = zd_usb_iowrite16v(&amp;chip-&gt;usb, ioreqs16, count16);</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			  "error %d in zd_usb_write16v\n", r);</div><div class='add'>+	}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+out:</div><div class='add'>+	kfree(ioreqs16);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_iowrite16a_locked(struct zd_chip *chip,</div><div class='add'>+                  const struct zd_ioreq16 *ioreqs, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	unsigned int i, j, t, max;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	for (i = 0; i &lt; count; i += j + t) {</div><div class='add'>+		t = 0;</div><div class='add'>+		max = count-i;</div><div class='add'>+		if (max &gt; USB_MAX_IOWRITE16_COUNT)</div><div class='add'>+			max = USB_MAX_IOWRITE16_COUNT;</div><div class='add'>+		for (j = 0; j &lt; max; j++) {</div><div class='add'>+			if (!ioreqs[i+j].addr) {</div><div class='add'>+				t = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r = zd_usb_iowrite16v(&amp;chip-&gt;usb, &amp;ioreqs[i], j);</div><div class='add'>+		if (r) {</div><div class='add'>+			dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+				  "error zd_usb_iowrite16v. Error number %d\n",</div><div class='add'>+				  r);</div><div class='add'>+			return r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Writes a variable number of 32 bit registers. The functions will split</div><div class='add'>+ * that in several USB requests. A split can be forced by inserting an IO</div><div class='add'>+ * request with an zero address field.</div><div class='add'>+ */</div><div class='add'>+int zd_iowrite32a_locked(struct zd_chip *chip,</div><div class='add'>+	          const struct zd_ioreq32 *ioreqs, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	unsigned int i, j, t, max;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i += j + t) {</div><div class='add'>+		t = 0;</div><div class='add'>+		max = count-i;</div><div class='add'>+		if (max &gt; USB_MAX_IOWRITE32_COUNT)</div><div class='add'>+			max = USB_MAX_IOWRITE32_COUNT;</div><div class='add'>+		for (j = 0; j &lt; max; j++) {</div><div class='add'>+			if (!ioreqs[i+j].addr) {</div><div class='add'>+				t = 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r = _zd_iowrite32v_locked(chip, &amp;ioreqs[i], j);</div><div class='add'>+		if (r) {</div><div class='add'>+			dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+				"error _zd_iowrite32v_locked."</div><div class='add'>+				" Error number %d\n", r);</div><div class='add'>+			return r;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_ioread16(struct zd_chip *chip, zd_addr_t addr, u16 *value)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_ioread16_locked(chip, value, addr);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_ioread32(struct zd_chip *chip, zd_addr_t addr, u32 *value)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_ioread32_locked(chip, value, addr);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_iowrite16(struct zd_chip *chip, zd_addr_t addr, u16 value)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_iowrite16_locked(chip, value, addr);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_iowrite32(struct zd_chip *chip, zd_addr_t addr, u32 value)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_iowrite32_locked(chip, value, addr);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_ioread32v(struct zd_chip *chip, const zd_addr_t *addresses,</div><div class='add'>+	          u32 *values, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_ioread32v_locked(chip, values, addresses, count);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_iowrite32a(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,</div><div class='add'>+	          unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_iowrite32a_locked(chip, ioreqs, count);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_pod(struct zd_chip *chip, u8 *rf_type)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;value, E2P_POD);</div><div class='add'>+	if (r)</div><div class='add'>+		goto error;</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "E2P_POD %#010x\n", value);</div><div class='add'>+</div><div class='add'>+	/* FIXME: AL2230 handling (Bit 7 in POD) */</div><div class='add'>+	*rf_type = value &amp; 0x0f;</div><div class='add'>+	chip-&gt;pa_type = (value &gt;&gt; 16) &amp; 0x0f;</div><div class='add'>+	chip-&gt;patch_cck_gain = (value &gt;&gt; 8) &amp; 0x1;</div><div class='add'>+	chip-&gt;patch_cr157 = (value &gt;&gt; 13) &amp; 0x1;</div><div class='add'>+	chip-&gt;patch_6m_band_edge = (value &gt;&gt; 21) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+		"RF %s %#01x PA type %#01x patch CCK %d patch CR157 %d "</div><div class='add'>+		"patch 6M %d\n",</div><div class='add'>+		zd_rf_name(*rf_type), *rf_type,</div><div class='add'>+		chip-&gt;pa_type, chip-&gt;patch_cck_gain,</div><div class='add'>+		chip-&gt;patch_cr157, chip-&gt;patch_6m_band_edge);</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	*rf_type = 0;</div><div class='add'>+	chip-&gt;pa_type = 0;</div><div class='add'>+	chip-&gt;patch_cck_gain = 0;</div><div class='add'>+	chip-&gt;patch_cr157 = 0;</div><div class='add'>+	chip-&gt;patch_6m_band_edge = 0;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _read_mac_addr(struct zd_chip *chip, u8 *mac_addr,</div><div class='add'>+	                  const zd_addr_t *addr)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 parts[2];</div><div class='add'>+</div><div class='add'>+	r = zd_ioread32v_locked(chip, parts, (const zd_addr_t *)addr, 2);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			"error: couldn't read e2p macs. Error number %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac_addr[0] = parts[0];</div><div class='add'>+	mac_addr[1] = parts[0] &gt;&gt;  8;</div><div class='add'>+	mac_addr[2] = parts[0] &gt;&gt; 16;</div><div class='add'>+	mac_addr[3] = parts[0] &gt;&gt; 24;</div><div class='add'>+	mac_addr[4] = parts[1];</div><div class='add'>+	mac_addr[5] = parts[1] &gt;&gt;  8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_e2p_mac_addr(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	static const zd_addr_t addr[2] = { E2P_MAC_ADDR_P1, E2P_MAC_ADDR_P2 };</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	return _read_mac_addr(chip, chip-&gt;e2p_mac, (const zd_addr_t *)addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and</div><div class='add'>+ *              CR_MAC_ADDR_P2 must be overwritten</div><div class='add'>+ */</div><div class='add'>+void zd_get_e2p_mac_addr(struct zd_chip *chip, u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	memcpy(mac_addr, chip-&gt;e2p_mac, ETH_ALEN);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_mac_addr(struct zd_chip *chip, u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	static const zd_addr_t addr[2] = { CR_MAC_ADDR_P1, CR_MAC_ADDR_P2 };</div><div class='add'>+	return _read_mac_addr(chip, mac_addr, (const zd_addr_t *)addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = read_mac_addr(chip, mac_addr);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_ioreq32 reqs[2] = {</div><div class='add'>+		[0] = { .addr = CR_MAC_ADDR_P1 },</div><div class='add'>+		[1] = { .addr = CR_MAC_ADDR_P2 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	reqs[0].value = (mac_addr[3] &lt;&lt; 24)</div><div class='add'>+		      | (mac_addr[2] &lt;&lt; 16)</div><div class='add'>+		      | (mac_addr[1] &lt;&lt;  8)</div><div class='add'>+		      |  mac_addr[0];</div><div class='add'>+	reqs[1].value = (mac_addr[5] &lt;&lt;  8)</div><div class='add'>+		      |  mac_addr[4];</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+		"mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	{</div><div class='add'>+		u8 tmp[ETH_ALEN];</div><div class='add'>+		read_mac_addr(chip, tmp);</div><div class='add'>+	}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_read_regdomain(struct zd_chip *chip, u8 *regdomain)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;value, E2P_SUBID);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	*regdomain = value &gt;&gt; 16;</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "regdomain: %#04x\n", *regdomain);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_values(struct zd_chip *chip, u8 *values, size_t count,</div><div class='add'>+	               zd_addr_t e2p_addr, u32 guard)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	int i;</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	for (i = 0;;) {</div><div class='add'>+		r = zd_ioread32_locked(chip, &amp;v, e2p_addr+i/2);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		v -= guard;</div><div class='add'>+		if (i+4 &lt; count) {</div><div class='add'>+			values[i++] = v;</div><div class='add'>+			values[i++] = v &gt;&gt;  8;</div><div class='add'>+			values[i++] = v &gt;&gt; 16;</div><div class='add'>+			values[i++] = v &gt;&gt; 24;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		for (;i &lt; count; i++)</div><div class='add'>+			values[i] = v &gt;&gt; (8*(i%3));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_pwr_cal_values(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return read_values(chip, chip-&gt;pwr_cal_values,</div><div class='add'>+		        E2P_CHANNEL_COUNT, E2P_PWR_CAL_VALUE1,</div><div class='add'>+			0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_pwr_int_values(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return read_values(chip, chip-&gt;pwr_int_values,</div><div class='add'>+		        E2P_CHANNEL_COUNT, E2P_PWR_INT_VALUE1,</div><div class='add'>+			E2P_PWR_INT_GUARD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_ofdm_cal_values(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	int i;</div><div class='add'>+	static const zd_addr_t addresses[] = {</div><div class='add'>+		E2P_36M_CAL_VALUE1,</div><div class='add'>+		E2P_48M_CAL_VALUE1,</div><div class='add'>+		E2P_54M_CAL_VALUE1,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		r = read_values(chip, chip-&gt;ofdm_cal_values[i],</div><div class='add'>+				E2P_CHANNEL_COUNT, addresses[i], 0);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_cal_int_tables(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = read_pwr_cal_values(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = read_pwr_int_values(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = read_ofdm_cal_values(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* phy means physical registers */</div><div class='add'>+int zd_chip_lock_phy_regs(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;tmp, CR_REG1);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(zd_chip_dev(chip), "error ioread32(CR_REG1): %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+		"CR_REG1: 0x%02x -&gt; 0x%02x\n", tmp, tmp &amp; ~UNLOCK_PHY_REGS);</div><div class='add'>+	tmp &amp;= ~UNLOCK_PHY_REGS;</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite32_locked(chip, tmp, CR_REG1);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(zd_chip_dev(chip), "error iowrite32(CR_REG1): %d\n", r);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_unlock_phy_regs(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;tmp, CR_REG1);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(zd_chip_dev(chip),</div><div class='add'>+			"error ioread32(CR_REG1): %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+		"CR_REG1: 0x%02x -&gt; 0x%02x\n", tmp, tmp | UNLOCK_PHY_REGS);</div><div class='add'>+	tmp |= UNLOCK_PHY_REGS;</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite32_locked(chip, tmp, CR_REG1);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(zd_chip_dev(chip), "error iowrite32(CR_REG1): %d\n", r);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CR157 can be optionally patched by the EEPROM */</div><div class='add'>+static int patch_cr157(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;patch_cr157)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;value, E2P_PHY_REG);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "patching value %x\n", value &gt;&gt; 8);</div><div class='add'>+	return zd_iowrite32_locked(chip, value &gt;&gt; 8, CR157);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * 6M band edge can be optionally overwritten for certain RF's</div><div class='add'>+ * Vendor driver says: for FCC regulation, enabled per HWFeature 6M band edge</div><div class='add'>+ * bit (for AL2230, AL2230S)</div><div class='add'>+ */</div><div class='add'>+static int patch_6m_band_edge(struct zd_chip *chip, int channel)</div><div class='add'>+{</div><div class='add'>+	struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },</div><div class='add'>+		{ CR47,  0x1e },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;patch_6m_band_edge || !chip-&gt;rf.patch_6m_band_edge)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Channel 11 is not the edge for all regulatory domains. */</div><div class='add'>+	if (channel == 1 || channel == 11)</div><div class='add'>+		ioreqs[0].value = 0x12;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "patching for channel %d\n", channel);</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211_hw_reset_phy(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR0,   0x0a }, { CR1,   0x06 }, { CR2,   0x26 },</div><div class='add'>+		{ CR3,   0x38 }, { CR4,   0x80 }, { CR9,   0xa0 },</div><div class='add'>+		{ CR10,  0x81 }, { CR11,  0x00 }, { CR12,  0x7f },</div><div class='add'>+		{ CR13,  0x8c }, { CR14,  0x80 }, { CR15,  0x3d },</div><div class='add'>+		{ CR16,  0x20 }, { CR17,  0x1e }, { CR18,  0x0a },</div><div class='add'>+		{ CR19,  0x48 }, { CR20,  0x0c }, { CR21,  0x0c },</div><div class='add'>+		{ CR22,  0x23 }, { CR23,  0x90 }, { CR24,  0x14 },</div><div class='add'>+		{ CR25,  0x40 }, { CR26,  0x10 }, { CR27,  0x19 },</div><div class='add'>+		{ CR28,  0x7f }, { CR29,  0x80 }, { CR30,  0x4b },</div><div class='add'>+		{ CR31,  0x60 }, { CR32,  0x43 }, { CR33,  0x08 },</div><div class='add'>+		{ CR34,  0x06 }, { CR35,  0x0a }, { CR36,  0x00 },</div><div class='add'>+		{ CR37,  0x00 }, { CR38,  0x38 }, { CR39,  0x0c },</div><div class='add'>+		{ CR40,  0x84 }, { CR41,  0x2a }, { CR42,  0x80 },</div><div class='add'>+		{ CR43,  0x10 }, { CR44,  0x12 }, { CR46,  0xff },</div><div class='add'>+		{ CR47,  0x1E }, { CR48,  0x26 }, { CR49,  0x5b },</div><div class='add'>+		{ CR64,  0xd0 }, { CR65,  0x04 }, { CR66,  0x58 },</div><div class='add'>+		{ CR67,  0xc9 }, { CR68,  0x88 }, { CR69,  0x41 },</div><div class='add'>+		{ CR70,  0x23 }, { CR71,  0x10 }, { CR72,  0xff },</div><div class='add'>+		{ CR73,  0x32 }, { CR74,  0x30 }, { CR75,  0x65 },</div><div class='add'>+		{ CR76,  0x41 }, { CR77,  0x1b }, { CR78,  0x30 },</div><div class='add'>+		{ CR79,  0x68 }, { CR80,  0x64 }, { CR81,  0x64 },</div><div class='add'>+		{ CR82,  0x00 }, { CR83,  0x00 }, { CR84,  0x00 },</div><div class='add'>+		{ CR85,  0x02 }, { CR86,  0x00 }, { CR87,  0x00 },</div><div class='add'>+		{ CR88,  0xff }, { CR89,  0xfc }, { CR90,  0x00 },</div><div class='add'>+		{ CR91,  0x00 }, { CR92,  0x00 }, { CR93,  0x08 },</div><div class='add'>+		{ CR94,  0x00 }, { CR95,  0x00 }, { CR96,  0xff },</div><div class='add'>+		{ CR97,  0xe7 }, { CR98,  0x00 }, { CR99,  0x00 },</div><div class='add'>+		{ CR100, 0x00 }, { CR101, 0xae }, { CR102, 0x02 },</div><div class='add'>+		{ CR103, 0x00 }, { CR104, 0x03 }, { CR105, 0x65 },</div><div class='add'>+		{ CR106, 0x04 }, { CR107, 0x00 }, { CR108, 0x0a },</div><div class='add'>+		{ CR109, 0xaa }, { CR110, 0xaa }, { CR111, 0x25 },</div><div class='add'>+		{ CR112, 0x25 }, { CR113, 0x00 }, { CR119, 0x1e },</div><div class='add'>+		{ CR125, 0x90 }, { CR126, 0x00 }, { CR127, 0x00 },</div><div class='add'>+		{ },</div><div class='add'>+		{ CR5,   0x00 }, { CR6,   0x00 }, { CR7,   0x00 },</div><div class='add'>+		{ CR8,   0x00 }, { CR9,   0x20 }, { CR12,  0xf0 },</div><div class='add'>+		{ CR20,  0x0e }, { CR21,  0x0e }, { CR27,  0x10 },</div><div class='add'>+		{ CR44,  0x33 }, { CR47,  0x1E }, { CR83,  0x24 },</div><div class='add'>+		{ CR84,  0x04 }, { CR85,  0x00 }, { CR86,  0x0C },</div><div class='add'>+		{ CR87,  0x12 }, { CR88,  0x0C }, { CR89,  0x00 },</div><div class='add'>+		{ CR90,  0x10 }, { CR91,  0x08 }, { CR93,  0x00 },</div><div class='add'>+		{ CR94,  0x01 }, { CR95,  0x00 }, { CR96,  0x50 },</div><div class='add'>+		{ CR97,  0x37 }, { CR98,  0x35 }, { CR101, 0x13 },</div><div class='add'>+		{ CR102, 0x27 }, { CR103, 0x27 }, { CR104, 0x18 },</div><div class='add'>+		{ CR105, 0x12 }, { CR109, 0x27 }, { CR110, 0x27 },</div><div class='add'>+		{ CR111, 0x27 }, { CR112, 0x27 }, { CR113, 0x27 },</div><div class='add'>+		{ CR114, 0x27 }, { CR115, 0x26 }, { CR116, 0x24 },</div><div class='add'>+		{ CR117, 0xfc }, { CR118, 0xfa }, { CR120, 0x4f },</div><div class='add'>+		{ CR123, 0x27 }, { CR125, 0xaa }, { CR127, 0x03 },</div><div class='add'>+		{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },</div><div class='add'>+		{ CR131, 0x0C }, { CR136, 0xdf }, { CR137, 0x40 },</div><div class='add'>+		{ CR138, 0xa0 }, { CR139, 0xb0 }, { CR140, 0x99 },</div><div class='add'>+		{ CR141, 0x82 }, { CR142, 0x54 }, { CR143, 0x1c },</div><div class='add'>+		{ CR144, 0x6c }, { CR147, 0x07 }, { CR148, 0x4c },</div><div class='add'>+		{ CR149, 0x50 }, { CR150, 0x0e }, { CR151, 0x18 },</div><div class='add'>+		{ CR160, 0xfe }, { CR161, 0xee }, { CR162, 0xaa },</div><div class='add'>+		{ CR163, 0xfa }, { CR164, 0xfa }, { CR165, 0xea },</div><div class='add'>+		{ CR166, 0xbe }, { CR167, 0xbe }, { CR168, 0x6a },</div><div class='add'>+		{ CR169, 0xba }, { CR170, 0xba }, { CR171, 0xba },</div><div class='add'>+		/* Note: CR204 must lead the CR203 */</div><div class='add'>+		{ CR204, 0x7d },</div><div class='add'>+		{ },</div><div class='add'>+		{ CR203, 0x30 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int r, t;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+</div><div class='add'>+	r = zd_chip_lock_phy_regs(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+	if (r)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	r = patch_cr157(chip);</div><div class='add'>+unlock:</div><div class='add'>+	t = zd_chip_unlock_phy_regs(chip);</div><div class='add'>+	if (t &amp;&amp; !r)</div><div class='add'>+		r = t;</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211b_hw_reset_phy(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR0,   0x14 }, { CR1,   0x06 }, { CR2,   0x26 },</div><div class='add'>+		{ CR3,   0x38 }, { CR4,   0x80 }, { CR9,   0xe0 },</div><div class='add'>+		{ CR10,  0x81 },</div><div class='add'>+		/* power control { { CR11,  1 &lt;&lt; 6 }, */</div><div class='add'>+		{ CR11,  0x00 },</div><div class='add'>+		{ CR12,  0xf0 }, { CR13,  0x8c }, { CR14,  0x80 },</div><div class='add'>+		{ CR15,  0x3d }, { CR16,  0x20 }, { CR17,  0x1e },</div><div class='add'>+		{ CR18,  0x0a }, { CR19,  0x48 },</div><div class='add'>+		{ CR20,  0x10 }, /* Org:0x0E, ComTrend:RalLink AP */</div><div class='add'>+		{ CR21,  0x0e }, { CR22,  0x23 }, { CR23,  0x90 },</div><div class='add'>+		{ CR24,  0x14 }, { CR25,  0x40 }, { CR26,  0x10 },</div><div class='add'>+		{ CR27,  0x10 }, { CR28,  0x7f }, { CR29,  0x80 },</div><div class='add'>+		{ CR30,  0x49 }, /* jointly decoder, no ASIC */</div><div class='add'>+		{ CR31,  0x60 }, { CR32,  0x43 }, { CR33,  0x08 },</div><div class='add'>+		{ CR34,  0x06 }, { CR35,  0x0a }, { CR36,  0x00 },</div><div class='add'>+		{ CR37,  0x00 }, { CR38,  0x38 }, { CR39,  0x0c },</div><div class='add'>+		{ CR40,  0x84 }, { CR41,  0x2a }, { CR42,  0x80 },</div><div class='add'>+		{ CR43,  0x10 }, { CR44,  0x33 }, { CR46,  0xff },</div><div class='add'>+		{ CR47,  0x1E }, { CR48,  0x26 }, { CR49,  0x5b },</div><div class='add'>+		{ CR64,  0xd0 }, { CR65,  0x04 }, { CR66,  0x58 },</div><div class='add'>+		{ CR67,  0xc9 }, { CR68,  0x88 }, { CR69,  0x41 },</div><div class='add'>+		{ CR70,  0x23 }, { CR71,  0x10 }, { CR72,  0xff },</div><div class='add'>+		{ CR73,  0x32 }, { CR74,  0x30 }, { CR75,  0x65 },</div><div class='add'>+		{ CR76,  0x41 }, { CR77,  0x1b }, { CR78,  0x30 },</div><div class='add'>+		{ CR79,  0xf0 }, { CR80,  0x64 }, { CR81,  0x64 },</div><div class='add'>+		{ CR82,  0x00 }, { CR83,  0x24 }, { CR84,  0x04 },</div><div class='add'>+		{ CR85,  0x00 }, { CR86,  0x0c }, { CR87,  0x12 },</div><div class='add'>+		{ CR88,  0x0c }, { CR89,  0x00 }, { CR90,  0x58 },</div><div class='add'>+		{ CR91,  0x04 }, { CR92,  0x00 }, { CR93,  0x00 },</div><div class='add'>+		{ CR94,  0x01 },</div><div class='add'>+		{ CR95,  0x20 }, /* ZD1211B */</div><div class='add'>+		{ CR96,  0x50 }, { CR97,  0x37 }, { CR98,  0x35 },</div><div class='add'>+		{ CR99,  0x00 }, { CR100, 0x01 }, { CR101, 0x13 },</div><div class='add'>+		{ CR102, 0x27 }, { CR103, 0x27 }, { CR104, 0x18 },</div><div class='add'>+		{ CR105, 0x12 }, { CR106, 0x04 }, { CR107, 0x00 },</div><div class='add'>+		{ CR108, 0x0a }, { CR109, 0x27 }, { CR110, 0x27 },</div><div class='add'>+		{ CR111, 0x27 }, { CR112, 0x27 }, { CR113, 0x27 },</div><div class='add'>+		{ CR114, 0x27 }, { CR115, 0x26 }, { CR116, 0x24 },</div><div class='add'>+		{ CR117, 0xfc }, { CR118, 0xfa }, { CR119, 0x1e },</div><div class='add'>+		{ CR125, 0x90 }, { CR126, 0x00 }, { CR127, 0x00 },</div><div class='add'>+		{ CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },</div><div class='add'>+		{ CR131, 0x0c }, { CR136, 0xdf }, { CR137, 0xa0 },</div><div class='add'>+		{ CR138, 0xa8 }, { CR139, 0xb4 }, { CR140, 0x98 },</div><div class='add'>+		{ CR141, 0x82 }, { CR142, 0x53 }, { CR143, 0x1c },</div><div class='add'>+		{ CR144, 0x6c }, { CR147, 0x07 }, { CR148, 0x40 },</div><div class='add'>+		{ CR149, 0x40 }, /* Org:0x50 ComTrend:RalLink AP */</div><div class='add'>+		{ CR150, 0x14 }, /* Org:0x0E ComTrend:RalLink AP */</div><div class='add'>+		{ CR151, 0x18 }, { CR159, 0x70 }, { CR160, 0xfe },</div><div class='add'>+		{ CR161, 0xee }, { CR162, 0xaa }, { CR163, 0xfa },</div><div class='add'>+		{ CR164, 0xfa }, { CR165, 0xea }, { CR166, 0xbe },</div><div class='add'>+		{ CR167, 0xbe }, { CR168, 0x6a }, { CR169, 0xba },</div><div class='add'>+		{ CR170, 0xba }, { CR171, 0xba },</div><div class='add'>+		/* Note: CR204 must lead the CR203 */</div><div class='add'>+		{ CR204, 0x7d },</div><div class='add'>+		{},</div><div class='add'>+		{ CR203, 0x30 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int r, t;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+</div><div class='add'>+	r = zd_chip_lock_phy_regs(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+	if (r)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	r = patch_cr157(chip);</div><div class='add'>+unlock:</div><div class='add'>+	t = zd_chip_unlock_phy_regs(chip);</div><div class='add'>+	if (t &amp;&amp; !r)</div><div class='add'>+		r = t;</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_reset_phy(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;is_zd1211b ? zd1211b_hw_reset_phy(chip) :</div><div class='add'>+		                  zd1211_hw_reset_phy(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211_hw_init_hmac(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	static const struct zd_ioreq32 ioreqs[] = {</div><div class='add'>+		{ CR_ACK_TIMEOUT_EXT,		0x20 },</div><div class='add'>+		{ CR_ADDA_MBIAS_WARMTIME,	0x30000808 },</div><div class='add'>+		{ CR_ZD1211_RETRY_MAX,		0x2 },</div><div class='add'>+		{ CR_SNIFFER_ON,		0 },</div><div class='add'>+		{ CR_RX_FILTER,			AP_RX_FILTER },</div><div class='add'>+		{ CR_GROUP_HASH_P1,		0x00 },</div><div class='add'>+		{ CR_GROUP_HASH_P2,		0x80000000 },</div><div class='add'>+		{ CR_REG1,			0xa4 },</div><div class='add'>+		{ CR_ADDA_PWR_DWN,		0x7f },</div><div class='add'>+		{ CR_BCN_PLCP_CFG,		0x00f00401 },</div><div class='add'>+		{ CR_PHY_DELAY,			0x00 },</div><div class='add'>+		{ CR_ACK_TIMEOUT_EXT,		0x80 },</div><div class='add'>+		{ CR_ADDA_PWR_DWN,		0x00 },</div><div class='add'>+		{ CR_ACK_TIME_80211,		0x100 },</div><div class='add'>+		{ CR_IFS_VALUE,			0x547c032 },</div><div class='add'>+		{ CR_RX_PE_DELAY,		0x70 },</div><div class='add'>+		{ CR_PS_CTRL,			0x10000000 },</div><div class='add'>+		{ CR_RTS_CTS_RATE,		0x02030203 },</div><div class='add'>+		{ CR_RX_THRESHOLD,		0x000c0640 },</div><div class='add'>+		{ CR_AFTER_PNP,			0x1 },</div><div class='add'>+		{ CR_WEP_PROTECT,		0x114 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(zd_chip_dev(chip),</div><div class='add'>+			"error in zd_iowrite32a_locked. Error number %d\n", r);</div><div class='add'>+	}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211b_hw_init_hmac(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	static const struct zd_ioreq32 ioreqs[] = {</div><div class='add'>+		{ CR_ACK_TIMEOUT_EXT,		0x20 },</div><div class='add'>+		{ CR_ADDA_MBIAS_WARMTIME,	0x30000808 },</div><div class='add'>+		{ CR_ZD1211B_RETRY_MAX,		0x02020202 },</div><div class='add'>+		{ CR_ZD1211B_TX_PWR_CTL4,	0x007f003f },</div><div class='add'>+		{ CR_ZD1211B_TX_PWR_CTL3,	0x007f003f },</div><div class='add'>+		{ CR_ZD1211B_TX_PWR_CTL2,       0x003f001f },</div><div class='add'>+		{ CR_ZD1211B_TX_PWR_CTL1,       0x001f000f },</div><div class='add'>+		{ CR_ZD1211B_AIFS_CTL1,		0x00280028 },</div><div class='add'>+		{ CR_ZD1211B_AIFS_CTL2,		0x008C003C },</div><div class='add'>+		{ CR_ZD1211B_TXOP,		0x01800824 },</div><div class='add'>+		{ CR_SNIFFER_ON,		0 },</div><div class='add'>+		{ CR_RX_FILTER,			AP_RX_FILTER },</div><div class='add'>+		{ CR_GROUP_HASH_P1,		0x00 },</div><div class='add'>+		{ CR_GROUP_HASH_P2,		0x80000000 },</div><div class='add'>+		{ CR_REG1,			0xa4 },</div><div class='add'>+		{ CR_ADDA_PWR_DWN,		0x7f },</div><div class='add'>+		{ CR_BCN_PLCP_CFG,		0x00f00401 },</div><div class='add'>+		{ CR_PHY_DELAY,			0x00 },</div><div class='add'>+		{ CR_ACK_TIMEOUT_EXT,		0x80 },</div><div class='add'>+		{ CR_ADDA_PWR_DWN,		0x00 },</div><div class='add'>+		{ CR_ACK_TIME_80211,		0x100 },</div><div class='add'>+		{ CR_IFS_VALUE,			0x547c032 },</div><div class='add'>+		{ CR_RX_PE_DELAY,		0x70 },</div><div class='add'>+		{ CR_PS_CTRL,			0x10000000 },</div><div class='add'>+		{ CR_RTS_CTS_RATE,		0x02030203 },</div><div class='add'>+		{ CR_RX_THRESHOLD,		0x000c0640 },</div><div class='add'>+		{ CR_AFTER_PNP,			0x1 },</div><div class='add'>+		{ CR_WEP_PROTECT,		0x114 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			"error in zd_iowrite32a_locked. Error number %d\n", r);</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_init_hmac(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;is_zd1211b ?</div><div class='add'>+		zd1211b_hw_init_hmac(chip) : zd1211_hw_init_hmac(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct aw_pt_bi {</div><div class='add'>+	u32 atim_wnd_period;</div><div class='add'>+	u32 pre_tbtt;</div><div class='add'>+	u32 beacon_interval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	static const zd_addr_t aw_pt_bi_addr[] =</div><div class='add'>+		{ CR_ATIM_WND_PERIOD, CR_PRE_TBTT, CR_BCN_INTERVAL };</div><div class='add'>+	u32 values[3];</div><div class='add'>+</div><div class='add'>+	r = zd_ioread32v_locked(chip, values, (const zd_addr_t *)aw_pt_bi_addr,</div><div class='add'>+		         ARRAY_SIZE(aw_pt_bi_addr));</div><div class='add'>+	if (r) {</div><div class='add'>+		memset(s, 0, sizeof(*s));</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;atim_wnd_period = values[0];</div><div class='add'>+	s-&gt;pre_tbtt = values[1];</div><div class='add'>+	s-&gt;beacon_interval = values[2];</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "aw %u pt %u bi %u\n",</div><div class='add'>+		s-&gt;atim_wnd_period, s-&gt;pre_tbtt, s-&gt;beacon_interval);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_aw_pt_bi(struct zd_chip *chip, struct aw_pt_bi *s)</div><div class='add'>+{</div><div class='add'>+	struct zd_ioreq32 reqs[3];</div><div class='add'>+</div><div class='add'>+	if (s-&gt;beacon_interval &lt;= 5)</div><div class='add'>+		s-&gt;beacon_interval = 5;</div><div class='add'>+	if (s-&gt;pre_tbtt &lt; 4 || s-&gt;pre_tbtt &gt;= s-&gt;beacon_interval)</div><div class='add'>+		s-&gt;pre_tbtt = s-&gt;beacon_interval - 1;</div><div class='add'>+	if (s-&gt;atim_wnd_period &gt;= s-&gt;pre_tbtt)</div><div class='add'>+		s-&gt;atim_wnd_period = s-&gt;pre_tbtt - 1;</div><div class='add'>+</div><div class='add'>+	reqs[0].addr = CR_ATIM_WND_PERIOD;</div><div class='add'>+	reqs[0].value = s-&gt;atim_wnd_period;</div><div class='add'>+	reqs[1].addr = CR_PRE_TBTT;</div><div class='add'>+	reqs[1].value = s-&gt;pre_tbtt;</div><div class='add'>+	reqs[2].addr = CR_BCN_INTERVAL;</div><div class='add'>+	reqs[2].value = s-&gt;beacon_interval;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+		"aw %u pt %u bi %u\n", s-&gt;atim_wnd_period, s-&gt;pre_tbtt,</div><div class='add'>+		                       s-&gt;beacon_interval);</div><div class='add'>+	return zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int set_beacon_interval(struct zd_chip *chip, u32 interval)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct aw_pt_bi s;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = get_aw_pt_bi(chip, &amp;s);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	s.beacon_interval = interval;</div><div class='add'>+	return set_aw_pt_bi(chip, &amp;s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_set_beacon_interval(struct zd_chip *chip, u32 interval)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = set_beacon_interval(chip, interval);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_init(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = hw_reset_phy(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = hw_init_hmac(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = set_beacon_interval(chip, 100);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static int dump_cr(struct zd_chip *chip, const zd_addr_t addr,</div><div class='add'>+	           const char *addr_string)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;value, addr);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+			"error reading %s. Error number %d\n", addr_string, r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "%s %#010x\n",</div><div class='add'>+		addr_string, (unsigned int)value);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int test_init(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = dump_cr(chip, CR_AFTER_PNP, "CR_AFTER_PNP");</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = dump_cr(chip, CR_GPI_EN, "CR_GPI_EN");</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	return dump_cr(chip, CR_INTERRUPT, "CR_INTERRUPT");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_fw_registers(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	static const zd_addr_t addr[4] = {</div><div class='add'>+		FW_FIRMWARE_VER, FW_USB_SPEED, FW_FIX_TX_RATE,</div><div class='add'>+		FW_LINK_STATUS</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int r;</div><div class='add'>+	u16 values[4];</div><div class='add'>+</div><div class='add'>+	r = zd_ioread16v_locked(chip, values, (const zd_addr_t*)addr,</div><div class='add'>+		         ARRAY_SIZE(addr));</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_chip_dev(chip), "error %d zd_ioread16v_locked\n",</div><div class='add'>+			 r);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "FW_FIRMWARE_VER %#06hx\n", values[0]);</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "FW_USB_SPEED %#06hx\n", values[1]);</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "FW_FIX_TX_RATE %#06hx\n", values[2]);</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "FW_LINK_STATUS %#06hx\n", values[3]);</div><div class='add'>+}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+static int print_fw_version(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u16 version;</div><div class='add'>+</div><div class='add'>+	r = zd_ioread16_locked(chip, &amp;version, FW_FIRMWARE_VER);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	dev_info(zd_chip_dev(chip),"firmware version %04hx\n", version);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_mandatory_rates(struct zd_chip *chip, enum ieee80211_std std)</div><div class='add'>+{</div><div class='add'>+	u32 rates;</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	/* This sets the mandatory rates, which only depend from the standard</div><div class='add'>+	 * that the device is supporting. Until further notice we should try</div><div class='add'>+	 * to support 802.11g also for full speed USB.</div><div class='add'>+	 */</div><div class='add'>+	switch (std) {</div><div class='add'>+	case IEEE80211B:</div><div class='add'>+		rates = CR_RATE_1M|CR_RATE_2M|CR_RATE_5_5M|CR_RATE_11M;</div><div class='add'>+		break;</div><div class='add'>+	case IEEE80211G:</div><div class='add'>+		rates = CR_RATE_1M|CR_RATE_2M|CR_RATE_5_5M|CR_RATE_11M|</div><div class='add'>+			CR_RATE_6M|CR_RATE_12M|CR_RATE_24M;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return zd_iowrite32_locked(chip, rates, CR_MANDATORY_RATE_TBL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_enable_hwint(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_iowrite32_locked(chip, HWINT_ENABLED, CR_INTERRUPT);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int disable_hwint(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return zd_iowrite32_locked(chip, HWINT_DISABLED, CR_INTERRUPT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_disable_hwint(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = disable_hwint(chip);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_init_hw(struct zd_chip *chip, u8 device_type)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u8 rf_type;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	chip-&gt;is_zd1211b = (device_type == DEVICE_ZD1211B) != 0;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	r = test_init(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+#endif</div><div class='add'>+	r = zd_iowrite32_locked(chip, 1, CR_AFTER_PNP);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = zd_usb_init_hw(&amp;chip-&gt;usb);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* GPI is always disabled, also in the other driver.</div><div class='add'>+	 */</div><div class='add'>+	r = zd_iowrite32_locked(chip, 0, CR_GPI_EN);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	r = zd_iowrite32_locked(chip, CWIN_SIZE, CR_CWMIN_CWMAX);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Currently we support IEEE 802.11g for full and high speed USB.</div><div class='add'>+	 * It might be discussed, whether we should suppport pure b mode for</div><div class='add'>+	 * full speed USB.</div><div class='add'>+	 */</div><div class='add'>+	r = set_mandatory_rates(chip, IEEE80211G);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Disabling interrupts is certainly a smart thing here.</div><div class='add'>+	 */</div><div class='add'>+	r = disable_hwint(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	r = read_pod(chip, &amp;rf_type);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	r = hw_init(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	r = zd_rf_init_hw(&amp;chip-&gt;rf, rf_type);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = print_fw_version(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	dump_fw_registers(chip);</div><div class='add'>+	r = test_init(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+	r = read_e2p_mac_addr(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = read_cal_int_tables(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	print_id(chip);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_pwr_int(struct zd_chip *chip, u8 channel)</div><div class='add'>+{</div><div class='add'>+	u8 value = chip-&gt;pwr_int_values[channel - 1];</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "channel %d pwr_int %#04x\n",</div><div class='add'>+		 channel, value);</div><div class='add'>+	return zd_iowrite32_locked(chip, value, CR31);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_pwr_cal(struct zd_chip *chip, u8 channel)</div><div class='add'>+{</div><div class='add'>+	u8 value = chip-&gt;pwr_cal_values[channel-1];</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "channel %d pwr_cal %#04x\n",</div><div class='add'>+		 channel, value);</div><div class='add'>+	return zd_iowrite32_locked(chip, value, CR68);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_ofdm_cal(struct zd_chip *chip, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct zd_ioreq32 ioreqs[3];</div><div class='add'>+</div><div class='add'>+	ioreqs[0].addr = CR67;</div><div class='add'>+	ioreqs[0].value = chip-&gt;ofdm_cal_values[OFDM_36M_INDEX][channel-1];</div><div class='add'>+	ioreqs[1].addr = CR66;</div><div class='add'>+	ioreqs[1].value = chip-&gt;ofdm_cal_values[OFDM_48M_INDEX][channel-1];</div><div class='add'>+	ioreqs[2].addr = CR65;</div><div class='add'>+	ioreqs[2].value = chip-&gt;ofdm_cal_values[OFDM_54M_INDEX][channel-1];</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip),</div><div class='add'>+		"channel %d ofdm_cal 36M %#04x 48M %#04x 54M %#04x\n",</div><div class='add'>+		channel, ioreqs[0].value, ioreqs[1].value, ioreqs[2].value);</div><div class='add'>+	return zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_channel_integration_and_calibration(struct zd_chip *chip,</div><div class='add'>+	                                              u8 channel)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = update_pwr_int(chip, channel);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	if (chip-&gt;is_zd1211b) {</div><div class='add'>+		static const struct zd_ioreq32 ioreqs[] = {</div><div class='add'>+			{ CR69, 0x28 },</div><div class='add'>+			{},</div><div class='add'>+			{ CR69, 0x2a },</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		r = update_ofdm_cal(chip, channel);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		r = update_pwr_cal(chip, channel);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		r = zd_iowrite32a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The CCK baseband gain can be optionally patched by the EEPROM */</div><div class='add'>+static int patch_cck_gain(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;patch_cck_gain)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_ioread32_locked(chip, &amp;value, E2P_PHY_REG);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	dev_dbg_f(zd_chip_dev(chip), "patching value %x\n", value &amp; 0xff);</div><div class='add'>+	return zd_iowrite32_locked(chip, value &amp; 0xff, CR47);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_set_channel(struct zd_chip *chip, u8 channel)</div><div class='add'>+{</div><div class='add'>+	int r, t;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_chip_lock_phy_regs(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	r = zd_rf_set_channel(&amp;chip-&gt;rf, channel);</div><div class='add'>+	if (r)</div><div class='add'>+		goto unlock;</div><div class='add'>+	r = update_channel_integration_and_calibration(chip, channel);</div><div class='add'>+	if (r)</div><div class='add'>+		goto unlock;</div><div class='add'>+	r = patch_cck_gain(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto unlock;</div><div class='add'>+	r = patch_6m_band_edge(chip, channel);</div><div class='add'>+	if (r)</div><div class='add'>+		goto unlock;</div><div class='add'>+	r = zd_iowrite32_locked(chip, 0, CR_CONFIG_PHILIPS);</div><div class='add'>+unlock:</div><div class='add'>+	t = zd_chip_unlock_phy_regs(chip);</div><div class='add'>+	if (t &amp;&amp; !r)</div><div class='add'>+		r = t;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 zd_chip_get_channel(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	u8 channel;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	channel = chip-&gt;rf.channel;</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return channel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 led_mask(int led)</div><div class='add'>+{</div><div class='add'>+	switch (led) {</div><div class='add'>+	case 1:</div><div class='add'>+		return LED1;</div><div class='add'>+	case 2:</div><div class='add'>+		return LED2;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_led_reg(struct zd_chip *chip, u16 *status)</div><div class='add'>+{</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	return zd_ioread16_locked(chip, status, CR_LED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int write_led_reg(struct zd_chip *chip, u16 status)</div><div class='add'>+{</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	return zd_iowrite16_locked(chip, status, CR_LED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_led_status(struct zd_chip *chip, int led, enum led_status status)</div><div class='add'>+{</div><div class='add'>+	int r, ret;</div><div class='add'>+	u16 mask = led_mask(led);</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	if (!mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = read_led_reg(chip, &amp;reg);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	switch (status) {</div><div class='add'>+	case LED_STATUS:</div><div class='add'>+		return (reg &amp; mask) ? LED_ON : LED_OFF;</div><div class='add'>+	case LED_OFF:</div><div class='add'>+		reg &amp;= ~mask;</div><div class='add'>+		ret = LED_OFF;</div><div class='add'>+		break;</div><div class='add'>+	case LED_FLIP:</div><div class='add'>+		reg ^= mask;</div><div class='add'>+		ret = (reg&amp;mask) ? LED_ON : LED_OFF;</div><div class='add'>+		break;</div><div class='add'>+	case LED_ON:</div><div class='add'>+		reg |= mask;</div><div class='add'>+		ret = LED_ON;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	r = write_led_reg(chip, reg);</div><div class='add'>+	if (r) {</div><div class='add'>+		ret = r;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_led_flip(struct zd_chip *chip, int led,</div><div class='add'>+	const unsigned int *phases_msecs, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+	enum led_status status;</div><div class='add'>+</div><div class='add'>+	r = zd_chip_led_status(chip, led, LED_STATUS);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	status = r;</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		r = zd_chip_led_status(chip, led, LED_FLIP);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		msleep(phases_msecs[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	zd_chip_led_status(chip, led, status);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_set_basic_rates(struct zd_chip *chip, u16 cr_rates)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	if (cr_rates &amp; ~(CR_RATES_80211B|CR_RATES_80211G))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_iowrite32_locked(chip, cr_rates, CR_BASIC_RATE_TBL);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ofdm_qual_db(u8 status_quality, u8 rate, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	static const u16 constants[] = {</div><div class='add'>+		715, 655, 585, 540, 470, 410, 360, 315,</div><div class='add'>+		270, 235, 205, 175, 150, 125, 105,  85,</div><div class='add'>+		 65,  50,  40,  25,  15</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	int i;</div><div class='add'>+	u32 x;</div><div class='add'>+</div><div class='add'>+	/* It seems that their quality parameter is somehow per signal</div><div class='add'>+	 * and is now transferred per bit.</div><div class='add'>+	 */</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case ZD_OFDM_RATE_6M:</div><div class='add'>+	case ZD_OFDM_RATE_12M:</div><div class='add'>+	case ZD_OFDM_RATE_24M:</div><div class='add'>+		size *= 2;</div><div class='add'>+		break;</div><div class='add'>+	case ZD_OFDM_RATE_9M:</div><div class='add'>+	case ZD_OFDM_RATE_18M:</div><div class='add'>+	case ZD_OFDM_RATE_36M:</div><div class='add'>+	case ZD_OFDM_RATE_54M:</div><div class='add'>+		size *= 4;</div><div class='add'>+		size /= 3;</div><div class='add'>+		break;</div><div class='add'>+	case ZD_OFDM_RATE_48M:</div><div class='add'>+		size *= 3;</div><div class='add'>+		size /= 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	x = (10000 * status_quality)/size;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(constants); i++) {</div><div class='add'>+		if (x &gt; constants[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int log10times100(unsigned int x)</div><div class='add'>+{</div><div class='add'>+	static const u8 log10[] = {</div><div class='add'>+		  0,</div><div class='add'>+		  0,   30,   47,   60,   69,   77,   84,   90,   95,  100,</div><div class='add'>+		104,  107,  111,  114,  117,  120,  123,  125,  127,  130,</div><div class='add'>+		132,  134,  136,  138,  139,  141,  143,  144,  146,  147,</div><div class='add'>+		149,  150,  151,  153,  154,  155,  156,  157,  159,  160,</div><div class='add'>+		161,  162,  163,  164,  165,  166,  167,  168,  169,  169,</div><div class='add'>+		170,  171,  172,  173,  174,  174,  175,  176,  177,  177,</div><div class='add'>+		178,  179,  179,  180,  181,  181,  182,  183,  183,  184,</div><div class='add'>+		185,  185,  186,  186,  187,  188,  188,  189,  189,  190,</div><div class='add'>+		190,  191,  191,  192,  192,  193,  193,  194,  194,  195,</div><div class='add'>+		195,  196,  196,  197,  197,  198,  198,  199,  199,  200,</div><div class='add'>+		200,  200,  201,  201,  202,  202,  202,  203,  203,  204,</div><div class='add'>+		204,  204,  205,  205,  206,  206,  206,  207,  207,  207,</div><div class='add'>+		208,  208,  208,  209,  209,  210,  210,  210,  211,  211,</div><div class='add'>+		211,  212,  212,  212,  213,  213,  213,  213,  214,  214,</div><div class='add'>+		214,  215,  215,  215,  216,  216,  216,  217,  217,  217,</div><div class='add'>+		217,  218,  218,  218,  219,  219,  219,  219,  220,  220,</div><div class='add'>+		220,  220,  221,  221,  221,  222,  222,  222,  222,  223,</div><div class='add'>+		223,  223,  223,  224,  224,  224,  224,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return x &lt; ARRAY_SIZE(log10) ? log10[x] : 225;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MAX_CCK_EVM_DB = 45,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cck_evm_db(u8 status_quality)</div><div class='add'>+{</div><div class='add'>+	return (20 * log10times100(status_quality)) / 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cck_snr_db(u8 status_quality)</div><div class='add'>+{</div><div class='add'>+	int r = MAX_CCK_EVM_DB - cck_evm_db(status_quality);</div><div class='add'>+	ZD_ASSERT(r &gt;= 0);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rx_qual_db(const void *rx_frame, unsigned int size,</div><div class='add'>+	              const struct rx_status *status)</div><div class='add'>+{</div><div class='add'>+	return (status-&gt;frame_status&amp;ZD_RX_OFDM) ?</div><div class='add'>+		ofdm_qual_db(status-&gt;signal_quality_ofdm,</div><div class='add'>+			     zd_ofdm_plcp_header_rate(rx_frame),</div><div class='add'>+			     size) :</div><div class='add'>+		cck_snr_db(status-&gt;signal_quality_cck);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size,</div><div class='add'>+	              const struct rx_status *status)</div><div class='add'>+{</div><div class='add'>+	int r = rx_qual_db(rx_frame, size, status);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		r = 0;</div><div class='add'>+	r = (r * 100) / 14;</div><div class='add'>+	if (r &gt; 100)</div><div class='add'>+		r = 100;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 zd_rx_strength_percent(u8 rssi)</div><div class='add'>+{</div><div class='add'>+	int r = (rssi*100) / 30;</div><div class='add'>+	if (r &gt; 100)</div><div class='add'>+		r = 100;</div><div class='add'>+	return (u8) r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 zd_rx_rate(const void *rx_frame, const struct rx_status *status)</div><div class='add'>+{</div><div class='add'>+	static const u16 ofdm_rates[] = {</div><div class='add'>+		[ZD_OFDM_RATE_6M]  = 60,</div><div class='add'>+		[ZD_OFDM_RATE_9M]  = 90,</div><div class='add'>+		[ZD_OFDM_RATE_12M] = 120,</div><div class='add'>+		[ZD_OFDM_RATE_18M] = 180,</div><div class='add'>+		[ZD_OFDM_RATE_24M] = 240,</div><div class='add'>+		[ZD_OFDM_RATE_36M] = 360,</div><div class='add'>+		[ZD_OFDM_RATE_48M] = 480,</div><div class='add'>+		[ZD_OFDM_RATE_54M] = 540,</div><div class='add'>+	};</div><div class='add'>+	u16 rate;</div><div class='add'>+	if (status-&gt;frame_status &amp; ZD_RX_OFDM) {</div><div class='add'>+		u8 ofdm_rate = zd_ofdm_plcp_header_rate(rx_frame);</div><div class='add'>+		rate = ofdm_rates[ofdm_rate &amp; 0xf];</div><div class='add'>+	} else {</div><div class='add'>+		u8 cck_rate = zd_cck_plcp_header_rate(rx_frame);</div><div class='add'>+		switch (cck_rate) {</div><div class='add'>+		case ZD_CCK_SIGNAL_1M:</div><div class='add'>+			rate = 10;</div><div class='add'>+			break;</div><div class='add'>+		case ZD_CCK_SIGNAL_2M:</div><div class='add'>+			rate = 20;</div><div class='add'>+			break;</div><div class='add'>+		case ZD_CCK_SIGNAL_5M5:</div><div class='add'>+			rate = 55;</div><div class='add'>+			break;</div><div class='add'>+		case ZD_CCK_SIGNAL_11M:</div><div class='add'>+			rate = 110;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			rate = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_switch_radio_on(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_switch_radio_on(&amp;chip-&gt;rf);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_switch_radio_off(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_switch_radio_off(&amp;chip-&gt;rf);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_enable_int(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_usb_enable_int(&amp;chip-&gt;usb);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_chip_disable_int(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	zd_usb_disable_int(&amp;chip-&gt;usb);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_enable_rx(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	r = zd_usb_enable_rx(&amp;chip-&gt;usb);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_chip_disable_rx(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	zd_usb_disable_rx(&amp;chip-&gt;usb);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rfwritev_locked(struct zd_chip *chip,</div><div class='add'>+	               const u32* values, unsigned int count, u8 bits)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		r = zd_rfwrite_locked(chip, values[i], bits);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h<br/>new file mode 100644<br/>index 000000000000..805121093ab5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_chip.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_chip.h</a></div><div class='hunk'>@@ -0,0 +1,825 @@</div><div class='add'>+/* zd_chip.h</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_CHIP_H</div><div class='add'>+#define _ZD_CHIP_H</div><div class='add'>+</div><div class='add'>+#include "zd_types.h"</div><div class='add'>+#include "zd_rf.h"</div><div class='add'>+#include "zd_usb.h"</div><div class='add'>+</div><div class='add'>+/* Header for the Media Access Controller (MAC) and the Baseband Processor</div><div class='add'>+ * (BBP). It appears that the ZD1211 wraps the old ZD1205 with USB glue and</div><div class='add'>+ * adds a processor for handling the USB protocol.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* 8-bit hardware registers */</div><div class='add'>+#define CR0   CTL_REG(0x0000)</div><div class='add'>+#define CR1   CTL_REG(0x0004)</div><div class='add'>+#define CR2   CTL_REG(0x0008)</div><div class='add'>+#define CR3   CTL_REG(0x000C)</div><div class='add'>+</div><div class='add'>+#define CR5   CTL_REG(0x0010)</div><div class='add'>+/*	bit 5: if set short preamble used</div><div class='add'>+ *	bit 6: filter band - Japan channel 14 on, else off</div><div class='add'>+ */</div><div class='add'>+#define CR6   CTL_REG(0x0014)</div><div class='add'>+#define CR7   CTL_REG(0x0018)</div><div class='add'>+#define CR8   CTL_REG(0x001C)</div><div class='add'>+</div><div class='add'>+#define CR4   CTL_REG(0x0020)</div><div class='add'>+</div><div class='add'>+#define CR9   CTL_REG(0x0024)</div><div class='add'>+/*	bit 2: antenna switch (together with CR10) */</div><div class='add'>+#define CR10  CTL_REG(0x0028)</div><div class='add'>+/*	bit 1: antenna switch (together with CR9)</div><div class='add'>+ *	RF2959 controls with CR11 radion on and off</div><div class='add'>+ */</div><div class='add'>+#define CR11  CTL_REG(0x002C)</div><div class='add'>+/*	bit 6:  TX power control for OFDM</div><div class='add'>+ *	RF2959 controls with CR10 radio on and off</div><div class='add'>+ */</div><div class='add'>+#define CR12  CTL_REG(0x0030)</div><div class='add'>+#define CR13  CTL_REG(0x0034)</div><div class='add'>+#define CR14  CTL_REG(0x0038)</div><div class='add'>+#define CR15  CTL_REG(0x003C)</div><div class='add'>+#define CR16  CTL_REG(0x0040)</div><div class='add'>+#define CR17  CTL_REG(0x0044)</div><div class='add'>+#define CR18  CTL_REG(0x0048)</div><div class='add'>+#define CR19  CTL_REG(0x004C)</div><div class='add'>+#define CR20  CTL_REG(0x0050)</div><div class='add'>+#define CR21  CTL_REG(0x0054)</div><div class='add'>+#define CR22  CTL_REG(0x0058)</div><div class='add'>+#define CR23  CTL_REG(0x005C)</div><div class='add'>+#define CR24  CTL_REG(0x0060)	/* CCA threshold */</div><div class='add'>+#define CR25  CTL_REG(0x0064)</div><div class='add'>+#define CR26  CTL_REG(0x0068)</div><div class='add'>+#define CR27  CTL_REG(0x006C)</div><div class='add'>+#define CR28  CTL_REG(0x0070)</div><div class='add'>+#define CR29  CTL_REG(0x0074)</div><div class='add'>+#define CR30  CTL_REG(0x0078)</div><div class='add'>+#define CR31  CTL_REG(0x007C)	/* TX power control for RF in CCK mode */</div><div class='add'>+#define CR32  CTL_REG(0x0080)</div><div class='add'>+#define CR33  CTL_REG(0x0084)</div><div class='add'>+#define CR34  CTL_REG(0x0088)</div><div class='add'>+#define CR35  CTL_REG(0x008C)</div><div class='add'>+#define CR36  CTL_REG(0x0090)</div><div class='add'>+#define CR37  CTL_REG(0x0094)</div><div class='add'>+#define CR38  CTL_REG(0x0098)</div><div class='add'>+#define CR39  CTL_REG(0x009C)</div><div class='add'>+#define CR40  CTL_REG(0x00A0)</div><div class='add'>+#define CR41  CTL_REG(0x00A4)</div><div class='add'>+#define CR42  CTL_REG(0x00A8)</div><div class='add'>+#define CR43  CTL_REG(0x00AC)</div><div class='add'>+#define CR44  CTL_REG(0x00B0)</div><div class='add'>+#define CR45  CTL_REG(0x00B4)</div><div class='add'>+#define CR46  CTL_REG(0x00B8)</div><div class='add'>+#define CR47  CTL_REG(0x00BC)	/* CCK baseband gain</div><div class='add'>+	                         * (patch value might be in EEPROM)</div><div class='add'>+				 */</div><div class='add'>+#define CR48  CTL_REG(0x00C0)</div><div class='add'>+#define CR49  CTL_REG(0x00C4)</div><div class='add'>+#define CR50  CTL_REG(0x00C8)</div><div class='add'>+#define CR51  CTL_REG(0x00CC)	/* TX power control for RF in 6-36M modes */</div><div class='add'>+#define CR52  CTL_REG(0x00D0)	/* TX power control for RF in 48M mode */</div><div class='add'>+#define CR53  CTL_REG(0x00D4)	/* TX power control for RF in 54M mode */</div><div class='add'>+#define CR54  CTL_REG(0x00D8)</div><div class='add'>+#define CR55  CTL_REG(0x00DC)</div><div class='add'>+#define CR56  CTL_REG(0x00E0)</div><div class='add'>+#define CR57  CTL_REG(0x00E4)</div><div class='add'>+#define CR58  CTL_REG(0x00E8)</div><div class='add'>+#define CR59  CTL_REG(0x00EC)</div><div class='add'>+#define CR60  CTL_REG(0x00F0)</div><div class='add'>+#define CR61  CTL_REG(0x00F4)</div><div class='add'>+#define CR62  CTL_REG(0x00F8)</div><div class='add'>+#define CR63  CTL_REG(0x00FC)</div><div class='add'>+#define CR64  CTL_REG(0x0100)</div><div class='add'>+#define CR65  CTL_REG(0x0104) /* OFDM 54M calibration */</div><div class='add'>+#define CR66  CTL_REG(0x0108) /* OFDM 48M calibration */</div><div class='add'>+#define CR67  CTL_REG(0x010C) /* OFDM 36M calibration */</div><div class='add'>+#define CR68  CTL_REG(0x0110) /* CCK calibration */</div><div class='add'>+#define CR69  CTL_REG(0x0114)</div><div class='add'>+#define CR70  CTL_REG(0x0118)</div><div class='add'>+#define CR71  CTL_REG(0x011C)</div><div class='add'>+#define CR72  CTL_REG(0x0120)</div><div class='add'>+#define CR73  CTL_REG(0x0124)</div><div class='add'>+#define CR74  CTL_REG(0x0128)</div><div class='add'>+#define CR75  CTL_REG(0x012C)</div><div class='add'>+#define CR76  CTL_REG(0x0130)</div><div class='add'>+#define CR77  CTL_REG(0x0134)</div><div class='add'>+#define CR78  CTL_REG(0x0138)</div><div class='add'>+#define CR79  CTL_REG(0x013C)</div><div class='add'>+#define CR80  CTL_REG(0x0140)</div><div class='add'>+#define CR81  CTL_REG(0x0144)</div><div class='add'>+#define CR82  CTL_REG(0x0148)</div><div class='add'>+#define CR83  CTL_REG(0x014C)</div><div class='add'>+#define CR84  CTL_REG(0x0150)</div><div class='add'>+#define CR85  CTL_REG(0x0154)</div><div class='add'>+#define CR86  CTL_REG(0x0158)</div><div class='add'>+#define CR87  CTL_REG(0x015C)</div><div class='add'>+#define CR88  CTL_REG(0x0160)</div><div class='add'>+#define CR89  CTL_REG(0x0164)</div><div class='add'>+#define CR90  CTL_REG(0x0168)</div><div class='add'>+#define CR91  CTL_REG(0x016C)</div><div class='add'>+#define CR92  CTL_REG(0x0170)</div><div class='add'>+#define CR93  CTL_REG(0x0174)</div><div class='add'>+#define CR94  CTL_REG(0x0178)</div><div class='add'>+#define CR95  CTL_REG(0x017C)</div><div class='add'>+#define CR96  CTL_REG(0x0180)</div><div class='add'>+#define CR97  CTL_REG(0x0184)</div><div class='add'>+#define CR98  CTL_REG(0x0188)</div><div class='add'>+#define CR99  CTL_REG(0x018C)</div><div class='add'>+#define CR100 CTL_REG(0x0190)</div><div class='add'>+#define CR101 CTL_REG(0x0194)</div><div class='add'>+#define CR102 CTL_REG(0x0198)</div><div class='add'>+#define CR103 CTL_REG(0x019C)</div><div class='add'>+#define CR104 CTL_REG(0x01A0)</div><div class='add'>+#define CR105 CTL_REG(0x01A4)</div><div class='add'>+#define CR106 CTL_REG(0x01A8)</div><div class='add'>+#define CR107 CTL_REG(0x01AC)</div><div class='add'>+#define CR108 CTL_REG(0x01B0)</div><div class='add'>+#define CR109 CTL_REG(0x01B4)</div><div class='add'>+#define CR110 CTL_REG(0x01B8)</div><div class='add'>+#define CR111 CTL_REG(0x01BC)</div><div class='add'>+#define CR112 CTL_REG(0x01C0)</div><div class='add'>+#define CR113 CTL_REG(0x01C4)</div><div class='add'>+#define CR114 CTL_REG(0x01C8)</div><div class='add'>+#define CR115 CTL_REG(0x01CC)</div><div class='add'>+#define CR116 CTL_REG(0x01D0)</div><div class='add'>+#define CR117 CTL_REG(0x01D4)</div><div class='add'>+#define CR118 CTL_REG(0x01D8)</div><div class='add'>+#define CR119 CTL_REG(0x01DC)</div><div class='add'>+#define CR120 CTL_REG(0x01E0)</div><div class='add'>+#define CR121 CTL_REG(0x01E4)</div><div class='add'>+#define CR122 CTL_REG(0x01E8)</div><div class='add'>+#define CR123 CTL_REG(0x01EC)</div><div class='add'>+#define CR124 CTL_REG(0x01F0)</div><div class='add'>+#define CR125 CTL_REG(0x01F4)</div><div class='add'>+#define CR126 CTL_REG(0x01F8)</div><div class='add'>+#define CR127 CTL_REG(0x01FC)</div><div class='add'>+#define CR128 CTL_REG(0x0200)</div><div class='add'>+#define CR129 CTL_REG(0x0204)</div><div class='add'>+#define CR130 CTL_REG(0x0208)</div><div class='add'>+#define CR131 CTL_REG(0x020C)</div><div class='add'>+#define CR132 CTL_REG(0x0210)</div><div class='add'>+#define CR133 CTL_REG(0x0214)</div><div class='add'>+#define CR134 CTL_REG(0x0218)</div><div class='add'>+#define CR135 CTL_REG(0x021C)</div><div class='add'>+#define CR136 CTL_REG(0x0220)</div><div class='add'>+#define CR137 CTL_REG(0x0224)</div><div class='add'>+#define CR138 CTL_REG(0x0228)</div><div class='add'>+#define CR139 CTL_REG(0x022C)</div><div class='add'>+#define CR140 CTL_REG(0x0230)</div><div class='add'>+#define CR141 CTL_REG(0x0234)</div><div class='add'>+#define CR142 CTL_REG(0x0238)</div><div class='add'>+#define CR143 CTL_REG(0x023C)</div><div class='add'>+#define CR144 CTL_REG(0x0240)</div><div class='add'>+#define CR145 CTL_REG(0x0244)</div><div class='add'>+#define CR146 CTL_REG(0x0248)</div><div class='add'>+#define CR147 CTL_REG(0x024C)</div><div class='add'>+#define CR148 CTL_REG(0x0250)</div><div class='add'>+#define CR149 CTL_REG(0x0254)</div><div class='add'>+#define CR150 CTL_REG(0x0258)</div><div class='add'>+#define CR151 CTL_REG(0x025C)</div><div class='add'>+#define CR152 CTL_REG(0x0260)</div><div class='add'>+#define CR153 CTL_REG(0x0264)</div><div class='add'>+#define CR154 CTL_REG(0x0268)</div><div class='add'>+#define CR155 CTL_REG(0x026C)</div><div class='add'>+#define CR156 CTL_REG(0x0270)</div><div class='add'>+#define CR157 CTL_REG(0x0274)</div><div class='add'>+#define CR158 CTL_REG(0x0278)</div><div class='add'>+#define CR159 CTL_REG(0x027C)</div><div class='add'>+#define CR160 CTL_REG(0x0280)</div><div class='add'>+#define CR161 CTL_REG(0x0284)</div><div class='add'>+#define CR162 CTL_REG(0x0288)</div><div class='add'>+#define CR163 CTL_REG(0x028C)</div><div class='add'>+#define CR164 CTL_REG(0x0290)</div><div class='add'>+#define CR165 CTL_REG(0x0294)</div><div class='add'>+#define CR166 CTL_REG(0x0298)</div><div class='add'>+#define CR167 CTL_REG(0x029C)</div><div class='add'>+#define CR168 CTL_REG(0x02A0)</div><div class='add'>+#define CR169 CTL_REG(0x02A4)</div><div class='add'>+#define CR170 CTL_REG(0x02A8)</div><div class='add'>+#define CR171 CTL_REG(0x02AC)</div><div class='add'>+#define CR172 CTL_REG(0x02B0)</div><div class='add'>+#define CR173 CTL_REG(0x02B4)</div><div class='add'>+#define CR174 CTL_REG(0x02B8)</div><div class='add'>+#define CR175 CTL_REG(0x02BC)</div><div class='add'>+#define CR176 CTL_REG(0x02C0)</div><div class='add'>+#define CR177 CTL_REG(0x02C4)</div><div class='add'>+#define CR178 CTL_REG(0x02C8)</div><div class='add'>+#define CR179 CTL_REG(0x02CC)</div><div class='add'>+#define CR180 CTL_REG(0x02D0)</div><div class='add'>+#define CR181 CTL_REG(0x02D4)</div><div class='add'>+#define CR182 CTL_REG(0x02D8)</div><div class='add'>+#define CR183 CTL_REG(0x02DC)</div><div class='add'>+#define CR184 CTL_REG(0x02E0)</div><div class='add'>+#define CR185 CTL_REG(0x02E4)</div><div class='add'>+#define CR186 CTL_REG(0x02E8)</div><div class='add'>+#define CR187 CTL_REG(0x02EC)</div><div class='add'>+#define CR188 CTL_REG(0x02F0)</div><div class='add'>+#define CR189 CTL_REG(0x02F4)</div><div class='add'>+#define CR190 CTL_REG(0x02F8)</div><div class='add'>+#define CR191 CTL_REG(0x02FC)</div><div class='add'>+#define CR192 CTL_REG(0x0300)</div><div class='add'>+#define CR193 CTL_REG(0x0304)</div><div class='add'>+#define CR194 CTL_REG(0x0308)</div><div class='add'>+#define CR195 CTL_REG(0x030C)</div><div class='add'>+#define CR196 CTL_REG(0x0310)</div><div class='add'>+#define CR197 CTL_REG(0x0314)</div><div class='add'>+#define CR198 CTL_REG(0x0318)</div><div class='add'>+#define CR199 CTL_REG(0x031C)</div><div class='add'>+#define CR200 CTL_REG(0x0320)</div><div class='add'>+#define CR201 CTL_REG(0x0324)</div><div class='add'>+#define CR202 CTL_REG(0x0328)</div><div class='add'>+#define CR203 CTL_REG(0x032C)	/* I2C bus template value &amp; flash control */</div><div class='add'>+#define CR204 CTL_REG(0x0330)</div><div class='add'>+#define CR205 CTL_REG(0x0334)</div><div class='add'>+#define CR206 CTL_REG(0x0338)</div><div class='add'>+#define CR207 CTL_REG(0x033C)</div><div class='add'>+#define CR208 CTL_REG(0x0340)</div><div class='add'>+#define CR209 CTL_REG(0x0344)</div><div class='add'>+#define CR210 CTL_REG(0x0348)</div><div class='add'>+#define CR211 CTL_REG(0x034C)</div><div class='add'>+#define CR212 CTL_REG(0x0350)</div><div class='add'>+#define CR213 CTL_REG(0x0354)</div><div class='add'>+#define CR214 CTL_REG(0x0358)</div><div class='add'>+#define CR215 CTL_REG(0x035C)</div><div class='add'>+#define CR216 CTL_REG(0x0360)</div><div class='add'>+#define CR217 CTL_REG(0x0364)</div><div class='add'>+#define CR218 CTL_REG(0x0368)</div><div class='add'>+#define CR219 CTL_REG(0x036C)</div><div class='add'>+#define CR220 CTL_REG(0x0370)</div><div class='add'>+#define CR221 CTL_REG(0x0374)</div><div class='add'>+#define CR222 CTL_REG(0x0378)</div><div class='add'>+#define CR223 CTL_REG(0x037C)</div><div class='add'>+#define CR224 CTL_REG(0x0380)</div><div class='add'>+#define CR225 CTL_REG(0x0384)</div><div class='add'>+#define CR226 CTL_REG(0x0388)</div><div class='add'>+#define CR227 CTL_REG(0x038C)</div><div class='add'>+#define CR228 CTL_REG(0x0390)</div><div class='add'>+#define CR229 CTL_REG(0x0394)</div><div class='add'>+#define CR230 CTL_REG(0x0398)</div><div class='add'>+#define CR231 CTL_REG(0x039C)</div><div class='add'>+#define CR232 CTL_REG(0x03A0)</div><div class='add'>+#define CR233 CTL_REG(0x03A4)</div><div class='add'>+#define CR234 CTL_REG(0x03A8)</div><div class='add'>+#define CR235 CTL_REG(0x03AC)</div><div class='add'>+#define CR236 CTL_REG(0x03B0)</div><div class='add'>+</div><div class='add'>+#define CR240 CTL_REG(0x03C0)</div><div class='add'>+/*	bit 7:  host-controlled RF register writes</div><div class='add'>+ * CR241-CR245: for hardware controlled writing of RF bits, not needed for</div><div class='add'>+ *              USB</div><div class='add'>+ */</div><div class='add'>+#define CR241 CTL_REG(0x03C4)</div><div class='add'>+#define CR242 CTL_REG(0x03C8)</div><div class='add'>+#define CR243 CTL_REG(0x03CC)</div><div class='add'>+#define CR244 CTL_REG(0x03D0)</div><div class='add'>+#define CR245 CTL_REG(0x03D4)</div><div class='add'>+</div><div class='add'>+#define CR251 CTL_REG(0x03EC)	/* only used for activation and deactivation of</div><div class='add'>+				 * Airoha RFs AL2230 and AL7230B</div><div class='add'>+				 */</div><div class='add'>+#define CR252 CTL_REG(0x03F0)</div><div class='add'>+#define CR253 CTL_REG(0x03F4)</div><div class='add'>+#define CR254 CTL_REG(0x03F8)</div><div class='add'>+#define CR255 CTL_REG(0x03FC)</div><div class='add'>+</div><div class='add'>+#define CR_MAX_PHY_REG 255</div><div class='add'>+</div><div class='add'>+/* Taken from the ZYDAS driver, not all of them are relevant for the ZSD1211</div><div class='add'>+ * driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CR_RF_IF_CLK			CTL_REG(0x0400)</div><div class='add'>+#define CR_RF_IF_DATA			CTL_REG(0x0404)</div><div class='add'>+#define CR_PE1_PE2			CTL_REG(0x0408)</div><div class='add'>+#define CR_PE2_DLY			CTL_REG(0x040C)</div><div class='add'>+#define CR_LE1				CTL_REG(0x0410)</div><div class='add'>+#define CR_LE2				CTL_REG(0x0414)</div><div class='add'>+/* Seems to enable/disable GPI (General Purpose IO?) */</div><div class='add'>+#define CR_GPI_EN			CTL_REG(0x0418)</div><div class='add'>+#define CR_RADIO_PD			CTL_REG(0x042C)</div><div class='add'>+#define CR_RF2948_PD			CTL_REG(0x042C)</div><div class='add'>+#define CR_ENABLE_PS_MANUAL_AGC		CTL_REG(0x043C)</div><div class='add'>+#define CR_CONFIG_PHILIPS		CTL_REG(0x0440)</div><div class='add'>+#define CR_SA2400_SER_AP		CTL_REG(0x0444)</div><div class='add'>+#define CR_I2C_WRITE			CTL_REG(0x0444)</div><div class='add'>+#define CR_SA2400_SER_RP		CTL_REG(0x0448)</div><div class='add'>+#define CR_RADIO_PE			CTL_REG(0x0458)</div><div class='add'>+#define CR_RST_BUS_MASTER		CTL_REG(0x045C)</div><div class='add'>+#define CR_RFCFG			CTL_REG(0x0464)</div><div class='add'>+#define CR_HSTSCHG			CTL_REG(0x046C)</div><div class='add'>+#define CR_PHY_ON			CTL_REG(0x0474)</div><div class='add'>+#define CR_RX_DELAY			CTL_REG(0x0478)</div><div class='add'>+#define CR_RX_PE_DELAY			CTL_REG(0x047C)</div><div class='add'>+#define CR_GPIO_1			CTL_REG(0x0490)</div><div class='add'>+#define CR_GPIO_2			CTL_REG(0x0494)</div><div class='add'>+#define CR_EncryBufMux			CTL_REG(0x04A8)</div><div class='add'>+#define CR_PS_CTRL			CTL_REG(0x0500)</div><div class='add'>+#define CR_ADDA_PWR_DWN			CTL_REG(0x0504)</div><div class='add'>+#define CR_ADDA_MBIAS_WARMTIME		CTL_REG(0x0508)</div><div class='add'>+#define CR_MAC_PS_STATE			CTL_REG(0x050C)</div><div class='add'>+</div><div class='add'>+#define CR_INTERRUPT			CTL_REG(0x0510)</div><div class='add'>+#define INT_TX_COMPLETE			0x00000001</div><div class='add'>+#define INT_RX_COMPLETE			0x00000002</div><div class='add'>+#define INT_RETRY_FAIL			0x00000004</div><div class='add'>+#define INT_WAKEUP			0x00000008</div><div class='add'>+#define INT_DTIM_NOTIFY			0x00000020</div><div class='add'>+#define INT_CFG_NEXT_BCN		0x00000040</div><div class='add'>+#define INT_BUS_ABORT			0x00000080</div><div class='add'>+#define INT_TX_FIFO_READY		0x00000100</div><div class='add'>+#define INT_UART			0x00000200</div><div class='add'>+#define INT_TX_COMPLETE_EN		0x00010000</div><div class='add'>+#define INT_RX_COMPLETE_EN		0x00020000</div><div class='add'>+#define INT_RETRY_FAIL_EN		0x00040000</div><div class='add'>+#define INT_WAKEUP_EN			0x00080000</div><div class='add'>+#define INT_DTIM_NOTIFY_EN		0x00200000</div><div class='add'>+#define INT_CFG_NEXT_BCN_EN		0x00400000</div><div class='add'>+#define INT_BUS_ABORT_EN		0x00800000</div><div class='add'>+#define INT_TX_FIFO_READY_EN		0x01000000</div><div class='add'>+#define INT_UART_EN			0x02000000</div><div class='add'>+</div><div class='add'>+#define CR_TSF_LOW_PART			CTL_REG(0x0514)</div><div class='add'>+#define CR_TSF_HIGH_PART		CTL_REG(0x0518)</div><div class='add'>+</div><div class='add'>+/* Following three values are in time units (1024us)</div><div class='add'>+ * Following condition must be met:</div><div class='add'>+ * atim &lt; tbtt &lt; bcn</div><div class='add'>+ */</div><div class='add'>+#define CR_ATIM_WND_PERIOD		CTL_REG(0x051C)</div><div class='add'>+#define CR_BCN_INTERVAL			CTL_REG(0x0520)</div><div class='add'>+#define CR_PRE_TBTT			CTL_REG(0x0524)</div><div class='add'>+/* in units of TU(1024us) */</div><div class='add'>+</div><div class='add'>+/* for UART support */</div><div class='add'>+#define CR_UART_RBR_THR_DLL		CTL_REG(0x0540)</div><div class='add'>+#define CR_UART_DLM_IER			CTL_REG(0x0544)</div><div class='add'>+#define CR_UART_IIR_FCR			CTL_REG(0x0548)</div><div class='add'>+#define CR_UART_LCR			CTL_REG(0x054c)</div><div class='add'>+#define CR_UART_MCR			CTL_REG(0x0550)</div><div class='add'>+#define CR_UART_LSR			CTL_REG(0x0554)</div><div class='add'>+#define CR_UART_MSR			CTL_REG(0x0558)</div><div class='add'>+#define CR_UART_ECR			CTL_REG(0x055c)</div><div class='add'>+#define CR_UART_STATUS			CTL_REG(0x0560)</div><div class='add'>+</div><div class='add'>+#define CR_PCI_TX_ADDR_P1		CTL_REG(0x0600)</div><div class='add'>+#define CR_PCI_TX_AddR_P2		CTL_REG(0x0604)</div><div class='add'>+#define CR_PCI_RX_AddR_P1		CTL_REG(0x0608)</div><div class='add'>+#define CR_PCI_RX_AddR_P2		CTL_REG(0x060C)</div><div class='add'>+</div><div class='add'>+/* must be overwritten if custom MAC address will be used */</div><div class='add'>+#define CR_MAC_ADDR_P1			CTL_REG(0x0610)</div><div class='add'>+#define CR_MAC_ADDR_P2			CTL_REG(0x0614)</div><div class='add'>+#define CR_BSSID_P1			CTL_REG(0x0618)</div><div class='add'>+#define CR_BSSID_P2			CTL_REG(0x061C)</div><div class='add'>+#define CR_BCN_PLCP_CFG			CTL_REG(0x0620)</div><div class='add'>+#define CR_GROUP_HASH_P1		CTL_REG(0x0624)</div><div class='add'>+#define CR_GROUP_HASH_P2		CTL_REG(0x0628)</div><div class='add'>+#define CR_RX_TIMEOUT			CTL_REG(0x062C)</div><div class='add'>+</div><div class='add'>+/* Basic rates supported by the BSS. When producing ACK or CTS messages, the</div><div class='add'>+ * device will use a rate in this table that is less than or equal to the rate</div><div class='add'>+ * of the incoming frame which prompted the response */</div><div class='add'>+#define CR_BASIC_RATE_TBL		CTL_REG(0x0630)</div><div class='add'>+#define CR_RATE_1M	0x0001	/* 802.11b */</div><div class='add'>+#define CR_RATE_2M	0x0002	/* 802.11b */</div><div class='add'>+#define CR_RATE_5_5M	0x0004	/* 802.11b */</div><div class='add'>+#define CR_RATE_11M	0x0008	/* 802.11b */</div><div class='add'>+#define CR_RATE_6M      0x0100	/* 802.11g */</div><div class='add'>+#define CR_RATE_9M      0x0200	/* 802.11g */</div><div class='add'>+#define CR_RATE_12M	0x0400	/* 802.11g */</div><div class='add'>+#define CR_RATE_18M	0x0800	/* 802.11g */</div><div class='add'>+#define CR_RATE_24M     0x1000	/* 802.11g */</div><div class='add'>+#define CR_RATE_36M     0x2000	/* 802.11g */</div><div class='add'>+#define CR_RATE_48M     0x4000	/* 802.11g */</div><div class='add'>+#define CR_RATE_54M     0x8000	/* 802.11g */</div><div class='add'>+#define CR_RATES_80211G	0xff00</div><div class='add'>+#define CR_RATES_80211B	0x000f</div><div class='add'>+</div><div class='add'>+/* Mandatory rates required in the BSS. When producing ACK or CTS messages, if</div><div class='add'>+ * the device could not find an appropriate rate in CR_BASIC_RATE_TBL, it will</div><div class='add'>+ * look for a rate in this table that is less than or equal to the rate of</div><div class='add'>+ * the incoming frame. */</div><div class='add'>+#define CR_MANDATORY_RATE_TBL		CTL_REG(0x0634)</div><div class='add'>+#define CR_RTS_CTS_RATE			CTL_REG(0x0638)</div><div class='add'>+</div><div class='add'>+#define CR_WEP_PROTECT			CTL_REG(0x063C)</div><div class='add'>+#define CR_RX_THRESHOLD			CTL_REG(0x0640)</div><div class='add'>+</div><div class='add'>+/* register for controlling the LEDS */</div><div class='add'>+#define CR_LED				CTL_REG(0x0644)</div><div class='add'>+/* masks for controlling LEDs */</div><div class='add'>+#define LED1				0x0100</div><div class='add'>+#define LED2				0x0200</div><div class='add'>+</div><div class='add'>+/* Seems to indicate that the configuration is over.</div><div class='add'>+ */</div><div class='add'>+#define CR_AFTER_PNP			CTL_REG(0x0648)</div><div class='add'>+#define CR_ACK_TIME_80211		CTL_REG(0x0658)</div><div class='add'>+</div><div class='add'>+#define CR_RX_OFFSET			CTL_REG(0x065c)</div><div class='add'>+</div><div class='add'>+#define CR_PHY_DELAY			CTL_REG(0x066C)</div><div class='add'>+#define CR_BCN_FIFO			CTL_REG(0x0670)</div><div class='add'>+#define CR_SNIFFER_ON			CTL_REG(0x0674)</div><div class='add'>+</div><div class='add'>+#define CR_ENCRYPTION_TYPE		CTL_REG(0x0678)</div><div class='add'>+#define NO_WEP				0</div><div class='add'>+#define WEP64				1</div><div class='add'>+#define WEP128				5</div><div class='add'>+#define WEP256				6</div><div class='add'>+#define ENC_SNIFFER			8</div><div class='add'>+</div><div class='add'>+#define CR_ZD1211_RETRY_MAX		CTL_REG(0x067C)</div><div class='add'>+</div><div class='add'>+#define CR_REG1				CTL_REG(0x0680)</div><div class='add'>+/* Setting the bit UNLOCK_PHY_REGS disallows the write access to physical</div><div class='add'>+ * registers, so one could argue it is a LOCK bit. But calling it</div><div class='add'>+ * LOCK_PHY_REGS makes it confusing.</div><div class='add'>+ */</div><div class='add'>+#define UNLOCK_PHY_REGS			0x0080</div><div class='add'>+</div><div class='add'>+#define CR_DEVICE_STATE			CTL_REG(0x0684)</div><div class='add'>+#define CR_UNDERRUN_CNT			CTL_REG(0x0688)</div><div class='add'>+</div><div class='add'>+#define CR_RX_FILTER			CTL_REG(0x068c)</div><div class='add'>+#define RX_FILTER_ASSOC_RESPONSE	0x0002</div><div class='add'>+#define RX_FILTER_PROBE_RESPONSE	0x0020</div><div class='add'>+#define RX_FILTER_BEACON		0x0100</div><div class='add'>+#define RX_FILTER_AUTH			0x0800</div><div class='add'>+/* Sniff modus sets filter to 0xfffff */</div><div class='add'>+</div><div class='add'>+#define CR_ACK_TIMEOUT_EXT		CTL_REG(0x0690)</div><div class='add'>+#define CR_BCN_FIFO_SEMAPHORE		CTL_REG(0x0694)</div><div class='add'>+#define CR_IFS_VALUE			CTL_REG(0x0698)</div><div class='add'>+#define CR_RX_TIME_OUT			CTL_REG(0x069C)</div><div class='add'>+#define CR_TOTAL_RX_FRM			CTL_REG(0x06A0)</div><div class='add'>+#define CR_CRC32_CNT			CTL_REG(0x06A4)</div><div class='add'>+#define CR_CRC16_CNT			CTL_REG(0x06A8)</div><div class='add'>+#define CR_DECRYPTION_ERR_UNI		CTL_REG(0x06AC)</div><div class='add'>+#define CR_RX_FIFO_OVERRUN		CTL_REG(0x06B0)</div><div class='add'>+</div><div class='add'>+#define CR_DECRYPTION_ERR_MUL		CTL_REG(0x06BC)</div><div class='add'>+</div><div class='add'>+#define CR_NAV_CNT			CTL_REG(0x06C4)</div><div class='add'>+#define CR_NAV_CCA			CTL_REG(0x06C8)</div><div class='add'>+#define CR_RETRY_CNT			CTL_REG(0x06CC)</div><div class='add'>+</div><div class='add'>+#define CR_READ_TCB_ADDR		CTL_REG(0x06E8)</div><div class='add'>+#define CR_READ_RFD_ADDR		CTL_REG(0x06EC)</div><div class='add'>+#define CR_CWMIN_CWMAX			CTL_REG(0x06F0)</div><div class='add'>+#define CR_TOTAL_TX_FRM			CTL_REG(0x06F4)</div><div class='add'>+</div><div class='add'>+/* CAM: Continuous Access Mode (power management) */</div><div class='add'>+#define CR_CAM_MODE			CTL_REG(0x0700)</div><div class='add'>+#define CR_CAM_ROLL_TB_LOW		CTL_REG(0x0704)</div><div class='add'>+#define CR_CAM_ROLL_TB_HIGH		CTL_REG(0x0708)</div><div class='add'>+#define CR_CAM_ADDRESS			CTL_REG(0x070C)</div><div class='add'>+#define CR_CAM_DATA			CTL_REG(0x0710)</div><div class='add'>+</div><div class='add'>+#define CR_ROMDIR			CTL_REG(0x0714)</div><div class='add'>+</div><div class='add'>+#define CR_DECRY_ERR_FLG_LOW		CTL_REG(0x0714)</div><div class='add'>+#define CR_DECRY_ERR_FLG_HIGH		CTL_REG(0x0718)</div><div class='add'>+</div><div class='add'>+#define CR_WEPKEY0			CTL_REG(0x0720)</div><div class='add'>+#define CR_WEPKEY1			CTL_REG(0x0724)</div><div class='add'>+#define CR_WEPKEY2			CTL_REG(0x0728)</div><div class='add'>+#define CR_WEPKEY3			CTL_REG(0x072C)</div><div class='add'>+#define CR_WEPKEY4			CTL_REG(0x0730)</div><div class='add'>+#define CR_WEPKEY5			CTL_REG(0x0734)</div><div class='add'>+#define CR_WEPKEY6			CTL_REG(0x0738)</div><div class='add'>+#define CR_WEPKEY7			CTL_REG(0x073C)</div><div class='add'>+#define CR_WEPKEY8			CTL_REG(0x0740)</div><div class='add'>+#define CR_WEPKEY9			CTL_REG(0x0744)</div><div class='add'>+#define CR_WEPKEY10			CTL_REG(0x0748)</div><div class='add'>+#define CR_WEPKEY11			CTL_REG(0x074C)</div><div class='add'>+#define CR_WEPKEY12			CTL_REG(0x0750)</div><div class='add'>+#define CR_WEPKEY13			CTL_REG(0x0754)</div><div class='add'>+#define CR_WEPKEY14			CTL_REG(0x0758)</div><div class='add'>+#define CR_WEPKEY15			CTL_REG(0x075c)</div><div class='add'>+#define CR_TKIP_MODE			CTL_REG(0x0760)</div><div class='add'>+</div><div class='add'>+#define CR_EEPROM_PROTECT0		CTL_REG(0x0758)</div><div class='add'>+#define CR_EEPROM_PROTECT1		CTL_REG(0x075C)</div><div class='add'>+</div><div class='add'>+#define CR_DBG_FIFO_RD			CTL_REG(0x0800)</div><div class='add'>+#define CR_DBG_SELECT			CTL_REG(0x0804)</div><div class='add'>+#define CR_FIFO_Length			CTL_REG(0x0808)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define CR_RSSI_MGC			CTL_REG(0x0810)</div><div class='add'>+</div><div class='add'>+#define CR_PON				CTL_REG(0x0818)</div><div class='add'>+#define CR_RX_ON			CTL_REG(0x081C)</div><div class='add'>+#define CR_TX_ON			CTL_REG(0x0820)</div><div class='add'>+#define CR_CHIP_EN			CTL_REG(0x0824)</div><div class='add'>+#define CR_LO_SW			CTL_REG(0x0828)</div><div class='add'>+#define CR_TXRX_SW			CTL_REG(0x082C)</div><div class='add'>+#define CR_S_MD				CTL_REG(0x0830)</div><div class='add'>+</div><div class='add'>+#define CR_USB_DEBUG_PORT		CTL_REG(0x0888)</div><div class='add'>+</div><div class='add'>+#define CR_ZD1211B_TX_PWR_CTL1		CTL_REG(0x0b00)</div><div class='add'>+#define CR_ZD1211B_TX_PWR_CTL2		CTL_REG(0x0b04)</div><div class='add'>+#define CR_ZD1211B_TX_PWR_CTL3		CTL_REG(0x0b08)</div><div class='add'>+#define CR_ZD1211B_TX_PWR_CTL4		CTL_REG(0x0b0c)</div><div class='add'>+#define CR_ZD1211B_AIFS_CTL1		CTL_REG(0x0b10)</div><div class='add'>+#define CR_ZD1211B_AIFS_CTL2		CTL_REG(0x0b14)</div><div class='add'>+#define CR_ZD1211B_TXOP			CTL_REG(0x0b20)</div><div class='add'>+#define CR_ZD1211B_RETRY_MAX		CTL_REG(0x0b28)</div><div class='add'>+</div><div class='add'>+#define AP_RX_FILTER			0x0400feff</div><div class='add'>+#define STA_RX_FILTER			0x0000ffff</div><div class='add'>+</div><div class='add'>+#define CWIN_SIZE			0x007f043f</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HWINT_ENABLED			0x004f0000</div><div class='add'>+#define HWINT_DISABLED			0</div><div class='add'>+</div><div class='add'>+#define E2P_PWR_INT_GUARD		8</div><div class='add'>+#define E2P_CHANNEL_COUNT		14</div><div class='add'>+</div><div class='add'>+/* If you compare this addresses with the ZYDAS orignal driver, please notify</div><div class='add'>+ * that we use word mapping for the EEPROM.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Upper 16 bit contains the regulatory domain.</div><div class='add'>+ */</div><div class='add'>+#define E2P_SUBID		E2P_REG(0x00)</div><div class='add'>+#define E2P_POD			E2P_REG(0x02)</div><div class='add'>+#define E2P_MAC_ADDR_P1		E2P_REG(0x04)</div><div class='add'>+#define E2P_MAC_ADDR_P2		E2P_REG(0x06)</div><div class='add'>+#define E2P_PWR_CAL_VALUE1	E2P_REG(0x08)</div><div class='add'>+#define E2P_PWR_CAL_VALUE2	E2P_REG(0x0a)</div><div class='add'>+#define E2P_PWR_CAL_VALUE3	E2P_REG(0x0c)</div><div class='add'>+#define E2P_PWR_CAL_VALUE4      E2P_REG(0x0e)</div><div class='add'>+#define E2P_PWR_INT_VALUE1	E2P_REG(0x10)</div><div class='add'>+#define E2P_PWR_INT_VALUE2	E2P_REG(0x12)</div><div class='add'>+#define E2P_PWR_INT_VALUE3	E2P_REG(0x14)</div><div class='add'>+#define E2P_PWR_INT_VALUE4	E2P_REG(0x16)</div><div class='add'>+</div><div class='add'>+/* Contains a bit for each allowed channel. It gives for Europe (ETSI 0x30)</div><div class='add'>+ * also only 11 channels. */</div><div class='add'>+#define E2P_ALLOWED_CHANNEL	E2P_REG(0x18)</div><div class='add'>+</div><div class='add'>+#define E2P_PHY_REG		E2P_REG(0x1a)</div><div class='add'>+#define E2P_DEVICE_VER		E2P_REG(0x20)</div><div class='add'>+#define E2P_36M_CAL_VALUE1	E2P_REG(0x28)</div><div class='add'>+#define E2P_36M_CAL_VALUE2      E2P_REG(0x2a)</div><div class='add'>+#define E2P_36M_CAL_VALUE3      E2P_REG(0x2c)</div><div class='add'>+#define E2P_36M_CAL_VALUE4	E2P_REG(0x2e)</div><div class='add'>+#define E2P_11A_INT_VALUE1	E2P_REG(0x30)</div><div class='add'>+#define E2P_11A_INT_VALUE2	E2P_REG(0x32)</div><div class='add'>+#define E2P_11A_INT_VALUE3	E2P_REG(0x34)</div><div class='add'>+#define E2P_11A_INT_VALUE4	E2P_REG(0x36)</div><div class='add'>+#define E2P_48M_CAL_VALUE1	E2P_REG(0x38)</div><div class='add'>+#define E2P_48M_CAL_VALUE2	E2P_REG(0x3a)</div><div class='add'>+#define E2P_48M_CAL_VALUE3	E2P_REG(0x3c)</div><div class='add'>+#define E2P_48M_CAL_VALUE4	E2P_REG(0x3e)</div><div class='add'>+#define E2P_48M_INT_VALUE1	E2P_REG(0x40)</div><div class='add'>+#define E2P_48M_INT_VALUE2	E2P_REG(0x42)</div><div class='add'>+#define E2P_48M_INT_VALUE3	E2P_REG(0x44)</div><div class='add'>+#define E2P_48M_INT_VALUE4	E2P_REG(0x46)</div><div class='add'>+#define E2P_54M_CAL_VALUE1	E2P_REG(0x48)	/* ??? */</div><div class='add'>+#define E2P_54M_CAL_VALUE2	E2P_REG(0x4a)</div><div class='add'>+#define E2P_54M_CAL_VALUE3	E2P_REG(0x4c)</div><div class='add'>+#define E2P_54M_CAL_VALUE4	E2P_REG(0x4e)</div><div class='add'>+#define E2P_54M_INT_VALUE1	E2P_REG(0x50)</div><div class='add'>+#define E2P_54M_INT_VALUE2	E2P_REG(0x52)</div><div class='add'>+#define E2P_54M_INT_VALUE3	E2P_REG(0x54)</div><div class='add'>+#define E2P_54M_INT_VALUE4	E2P_REG(0x56)</div><div class='add'>+</div><div class='add'>+/* All 16 bit values */</div><div class='add'>+#define FW_FIRMWARE_VER         FW_REG(0)</div><div class='add'>+/* non-zero if USB high speed connection */</div><div class='add'>+#define FW_USB_SPEED            FW_REG(1)</div><div class='add'>+#define FW_FIX_TX_RATE          FW_REG(2)</div><div class='add'>+/* Seems to be able to control LEDs over the firmware */</div><div class='add'>+#define FW_LINK_STATUS          FW_REG(3)</div><div class='add'>+#define FW_SOFT_RESET           FW_REG(4)</div><div class='add'>+#define FW_FLASH_CHK            FW_REG(5)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CR_BASE_OFFSET			= 0x9000,</div><div class='add'>+	FW_START_OFFSET			= 0xee00,</div><div class='add'>+	FW_BASE_ADDR_OFFSET		= FW_START_OFFSET + 0x1d,</div><div class='add'>+	EEPROM_START_OFFSET		= 0xf800,</div><div class='add'>+	EEPROM_SIZE			= 0x800, /* words */</div><div class='add'>+	LOAD_CODE_SIZE			= 0xe, /* words */</div><div class='add'>+	LOAD_VECT_SIZE			= 0x10000 - 0xfff7, /* words */</div><div class='add'>+	EEPROM_REGS_OFFSET		= LOAD_CODE_SIZE + LOAD_VECT_SIZE,</div><div class='add'>+	E2P_BASE_OFFSET			= EEPROM_START_OFFSET +</div><div class='add'>+		                          EEPROM_REGS_OFFSET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FW_REG_TABLE_ADDR	USB_ADDR(FW_START_OFFSET + 0x1d)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	/* indices for ofdm_cal_values */</div><div class='add'>+	OFDM_36M_INDEX = 0,</div><div class='add'>+	OFDM_48M_INDEX = 1,</div><div class='add'>+	OFDM_54M_INDEX = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_chip {</div><div class='add'>+	struct zd_usb usb;</div><div class='add'>+	struct zd_rf rf;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	u8 e2p_mac[ETH_ALEN];</div><div class='add'>+	/* EepSetPoint in the vendor driver */</div><div class='add'>+	u8 pwr_cal_values[E2P_CHANNEL_COUNT];</div><div class='add'>+	/* integration values in the vendor driver */</div><div class='add'>+	u8 pwr_int_values[E2P_CHANNEL_COUNT];</div><div class='add'>+	/* SetPointOFDM in the vendor driver */</div><div class='add'>+	u8 ofdm_cal_values[3][E2P_CHANNEL_COUNT];</div><div class='add'>+	u8 pa_type:4, patch_cck_gain:1, patch_cr157:1, patch_6m_band_edge:1,</div><div class='add'>+	   is_zd1211b:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct zd_chip *zd_usb_to_chip(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	return container_of(usb, struct zd_chip, usb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct zd_chip *zd_rf_to_chip(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	return container_of(rf, struct zd_chip, rf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define zd_chip_dev(chip) (&amp;(chip)-&gt;usb.intf-&gt;dev)</div><div class='add'>+</div><div class='add'>+void zd_chip_init(struct zd_chip *chip,</div><div class='add'>+	         struct net_device *netdev,</div><div class='add'>+	         struct usb_interface *intf);</div><div class='add'>+void zd_chip_clear(struct zd_chip *chip);</div><div class='add'>+int zd_chip_init_hw(struct zd_chip *chip, u8 device_type);</div><div class='add'>+int zd_chip_reset(struct zd_chip *chip);</div><div class='add'>+</div><div class='add'>+static inline int zd_ioread16v_locked(struct zd_chip *chip, u16 *values,</div><div class='add'>+	                              const zd_addr_t *addresses,</div><div class='add'>+				      unsigned int count)</div><div class='add'>+{</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	return zd_usb_ioread16v(&amp;chip-&gt;usb, values, addresses, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zd_ioread16_locked(struct zd_chip *chip, u16 *value,</div><div class='add'>+	                             const zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	return zd_usb_ioread16(&amp;chip-&gt;usb, value, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_ioread32v_locked(struct zd_chip *chip, u32 *values,</div><div class='add'>+	                const zd_addr_t *addresses, unsigned int count);</div><div class='add'>+</div><div class='add'>+static inline int zd_ioread32_locked(struct zd_chip *chip, u32 *value,</div><div class='add'>+	                             const zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return zd_ioread32v_locked(chip, value, (const zd_addr_t *)&amp;addr, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zd_iowrite16_locked(struct zd_chip *chip, u16 value,</div><div class='add'>+	                              zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	struct zd_ioreq16 ioreq;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	ioreq.addr = addr;</div><div class='add'>+	ioreq.value = value;</div><div class='add'>+</div><div class='add'>+	return zd_usb_iowrite16v(&amp;chip-&gt;usb, &amp;ioreq, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_iowrite16a_locked(struct zd_chip *chip,</div><div class='add'>+                         const struct zd_ioreq16 *ioreqs, unsigned int count);</div><div class='add'>+</div><div class='add'>+int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,</div><div class='add'>+			  unsigned int count);</div><div class='add'>+</div><div class='add'>+static inline int zd_iowrite32_locked(struct zd_chip *chip, u32 value,</div><div class='add'>+	                              zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	struct zd_ioreq32 ioreq;</div><div class='add'>+</div><div class='add'>+	ioreq.addr = addr;</div><div class='add'>+	ioreq.value = value;</div><div class='add'>+</div><div class='add'>+	return _zd_iowrite32v_locked(chip, &amp;ioreq, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_iowrite32a_locked(struct zd_chip *chip,</div><div class='add'>+	                 const struct zd_ioreq32 *ioreqs, unsigned int count);</div><div class='add'>+</div><div class='add'>+static inline int zd_rfwrite_locked(struct zd_chip *chip, u32 value, u8 bits)</div><div class='add'>+{</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	return zd_usb_rfwrite(&amp;chip-&gt;usb, value, bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rfwritev_locked(struct zd_chip *chip,</div><div class='add'>+	               const u32* values, unsigned int count, u8 bits);</div><div class='add'>+</div><div class='add'>+/* Locking functions for reading and writing registers.</div><div class='add'>+ * The different parameters are intentional.</div><div class='add'>+ */</div><div class='add'>+int zd_ioread16(struct zd_chip *chip, zd_addr_t addr, u16 *value);</div><div class='add'>+int zd_iowrite16(struct zd_chip *chip, zd_addr_t addr, u16 value);</div><div class='add'>+int zd_ioread32(struct zd_chip *chip, zd_addr_t addr, u32 *value);</div><div class='add'>+int zd_iowrite32(struct zd_chip *chip, zd_addr_t addr, u32 value);</div><div class='add'>+int zd_ioread32v(struct zd_chip *chip, const zd_addr_t *addresses,</div><div class='add'>+	          u32 *values, unsigned int count);</div><div class='add'>+int zd_iowrite32a(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs,</div><div class='add'>+	           unsigned int count);</div><div class='add'>+</div><div class='add'>+int zd_chip_set_channel(struct zd_chip *chip, u8 channel);</div><div class='add'>+static inline u8 _zd_chip_get_channel(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;rf.channel;</div><div class='add'>+}</div><div class='add'>+u8  zd_chip_get_channel(struct zd_chip *chip);</div><div class='add'>+int zd_read_regdomain(struct zd_chip *chip, u8 *regdomain);</div><div class='add'>+void zd_get_e2p_mac_addr(struct zd_chip *chip, u8 *mac_addr);</div><div class='add'>+int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr);</div><div class='add'>+int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr);</div><div class='add'>+int zd_chip_switch_radio_on(struct zd_chip *chip);</div><div class='add'>+int zd_chip_switch_radio_off(struct zd_chip *chip);</div><div class='add'>+int zd_chip_enable_int(struct zd_chip *chip);</div><div class='add'>+void zd_chip_disable_int(struct zd_chip *chip);</div><div class='add'>+int zd_chip_enable_rx(struct zd_chip *chip);</div><div class='add'>+void zd_chip_disable_rx(struct zd_chip *chip);</div><div class='add'>+int zd_chip_enable_hwint(struct zd_chip *chip);</div><div class='add'>+int zd_chip_disable_hwint(struct zd_chip *chip);</div><div class='add'>+</div><div class='add'>+static inline int zd_get_encryption_type(struct zd_chip *chip, u32 *type)</div><div class='add'>+{</div><div class='add'>+	return zd_ioread32(chip, CR_ENCRYPTION_TYPE, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zd_set_encryption_type(struct zd_chip *chip, u32 type)</div><div class='add'>+{</div><div class='add'>+	return zd_iowrite32(chip, CR_ENCRYPTION_TYPE, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int zd_chip_get_basic_rates(struct zd_chip *chip, u16 *cr_rates)</div><div class='add'>+{</div><div class='add'>+	return zd_ioread16(chip, CR_BASIC_RATE_TBL, cr_rates);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_set_basic_rates(struct zd_chip *chip, u16 cr_rates);</div><div class='add'>+</div><div class='add'>+static inline int zd_chip_set_rx_filter(struct zd_chip *chip, u32 filter)</div><div class='add'>+{</div><div class='add'>+	return zd_iowrite32(chip, CR_RX_FILTER, filter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_chip_lock_phy_regs(struct zd_chip *chip);</div><div class='add'>+int zd_chip_unlock_phy_regs(struct zd_chip *chip);</div><div class='add'>+</div><div class='add'>+enum led_status {</div><div class='add'>+	LED_OFF	   = 0,</div><div class='add'>+	LED_ON     = 1,</div><div class='add'>+	LED_FLIP   = 2,</div><div class='add'>+	LED_STATUS = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int zd_chip_led_status(struct zd_chip *chip, int led, enum led_status status);</div><div class='add'>+int zd_chip_led_flip(struct zd_chip *chip, int led,</div><div class='add'>+	             const unsigned int *phases_msecs, unsigned int count);</div><div class='add'>+</div><div class='add'>+int zd_set_beacon_interval(struct zd_chip *chip, u32 interval);</div><div class='add'>+</div><div class='add'>+static inline int zd_get_beacon_interval(struct zd_chip *chip, u32 *interval)</div><div class='add'>+{</div><div class='add'>+	return zd_ioread32(chip, CR_BCN_INTERVAL, interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rx_status;</div><div class='add'>+</div><div class='add'>+u8 zd_rx_qual_percent(const void *rx_frame, unsigned int size,</div><div class='add'>+	               const struct rx_status *status);</div><div class='add'>+u8 zd_rx_strength_percent(u8 rssi);</div><div class='add'>+</div><div class='add'>+u16 zd_rx_rate(const void *rx_frame, const struct rx_status *status);</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_CHIP_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h<br/>new file mode 100644<br/>index 000000000000..465906812fc4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_def.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_def.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/* zd_def.h</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_DEF_H</div><div class='add'>+#define _ZD_DEF_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/stringify.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#define dev_printk_f(level, dev, fmt, args...) \</div><div class='add'>+	dev_printk(level, dev, "%s() " fmt, __func__, ##args)</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#  define dev_dbg_f(dev, fmt, args...) \</div><div class='add'>+	  dev_printk_f(KERN_DEBUG, dev, fmt, ## args)</div><div class='add'>+#else</div><div class='add'>+#  define dev_dbg_f(dev, fmt, args...) do { (void)(dev); } while (0)</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#  define ZD_ASSERT(x) \</div><div class='add'>+do { \</div><div class='add'>+	if (!(x)) { \</div><div class='add'>+		pr_debug("%s:%d ASSERT %s VIOLATED!\n", \</div><div class='add'>+			__FILE__, __LINE__, __stringify(x)); \</div><div class='add'>+	} \</div><div class='add'>+} while (0)</div><div class='add'>+#else</div><div class='add'>+#  define ZD_ASSERT(x) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_DEF_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.c b/drivers/net/wireless/zd1211rw/zd_ieee80211.c<br/>new file mode 100644<br/>index 000000000000..66905f7b61ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_ieee80211.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_ieee80211.c</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+/* zd_ieee80211.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A lot of this code is generic and should be moved into the upper layers</div><div class='add'>+ * at some point.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_ieee80211.h"</div><div class='add'>+#include "zd_mac.h"</div><div class='add'>+</div><div class='add'>+static const struct channel_range channel_ranges[] = {</div><div class='add'>+	[0]			 = { 0,  0},</div><div class='add'>+	[ZD_REGDOMAIN_FCC]	 = { 1, 12},</div><div class='add'>+	[ZD_REGDOMAIN_IC]	 = { 1, 12},</div><div class='add'>+	[ZD_REGDOMAIN_ETSI]	 = { 1, 14},</div><div class='add'>+	[ZD_REGDOMAIN_JAPAN]	 = { 1, 14},</div><div class='add'>+	[ZD_REGDOMAIN_SPAIN]	 = { 1, 14},</div><div class='add'>+	[ZD_REGDOMAIN_FRANCE]	 = { 1, 14},</div><div class='add'>+	[ZD_REGDOMAIN_JAPAN_ADD] = {14, 15},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct channel_range *zd_channel_range(u8 regdomain)</div><div class='add'>+{</div><div class='add'>+	if (regdomain &gt;= ARRAY_SIZE(channel_ranges))</div><div class='add'>+		regdomain = 0;</div><div class='add'>+	return &amp;channel_ranges[regdomain];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_regdomain_supports_channel(u8 regdomain, u8 channel)</div><div class='add'>+{</div><div class='add'>+	const struct channel_range *range = zd_channel_range(regdomain);</div><div class='add'>+	return range-&gt;start &lt;= channel &amp;&amp; channel &lt; range-&gt;end;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_regdomain_supported(u8 regdomain)</div><div class='add'>+{</div><div class='add'>+	const struct channel_range *range = zd_channel_range(regdomain);</div><div class='add'>+	return range-&gt;start != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stores channel frequencies in MHz. */</div><div class='add'>+static const u16 channel_frequencies[] = {</div><div class='add'>+	2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447,</div><div class='add'>+	2452, 2457, 2462, 2467, 2472, 2484,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_CHANNELS ARRAY_SIZE(channel_frequencies)</div><div class='add'>+</div><div class='add'>+static int compute_freq(struct iw_freq *freq, u32 mhz, u32 hz)</div><div class='add'>+{</div><div class='add'>+	u32 factor;</div><div class='add'>+</div><div class='add'>+	freq-&gt;e = 0;</div><div class='add'>+	if (mhz &gt;= 1000000000U) {</div><div class='add'>+		pr_debug("zd1211 mhz %u to large\n", mhz);</div><div class='add'>+		freq-&gt;m = 0;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	factor = 1000;</div><div class='add'>+	while (mhz &gt;= factor) {</div><div class='add'>+</div><div class='add'>+		freq-&gt;e += 1;</div><div class='add'>+		factor *= 10;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	factor /= 1000U;</div><div class='add'>+	freq-&gt;m = mhz * (1000000U/factor) + hz/factor;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_channel_to_freq(struct iw_freq *freq, u8 channel)</div><div class='add'>+{</div><div class='add'>+	if (channel &gt; NUM_CHANNELS) {</div><div class='add'>+		freq-&gt;m = 0;</div><div class='add'>+		freq-&gt;e = 0;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!channel) {</div><div class='add'>+		freq-&gt;m = 0;</div><div class='add'>+		freq-&gt;e = 0;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return compute_freq(freq, channel_frequencies[channel-1], 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int freq_to_mhz(const struct iw_freq *freq)</div><div class='add'>+{</div><div class='add'>+	u32 factor;</div><div class='add'>+	int e;</div><div class='add'>+</div><div class='add'>+	/* Such high frequencies are not supported. */</div><div class='add'>+	if (freq-&gt;e &gt; 6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	factor = 1;</div><div class='add'>+	for (e = freq-&gt;e; e &gt; 0; --e) {</div><div class='add'>+		factor *= 10;</div><div class='add'>+	}</div><div class='add'>+	factor = 1000000U / factor;</div><div class='add'>+</div><div class='add'>+	if (freq-&gt;m % factor) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return freq-&gt;m / factor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_find_channel(u8 *channel, const struct iw_freq *freq)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+	u32 mhz;</div><div class='add'>+</div><div class='add'>+	if (!(freq-&gt;flags &amp; IW_FREQ_FIXED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (freq-&gt;m &lt; 1000) {</div><div class='add'>+		if (freq-&gt;m  &gt; NUM_CHANNELS || freq-&gt;m == 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		*channel = freq-&gt;m;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = freq_to_mhz(freq);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	mhz = r;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='add'>+		if (mhz == channel_frequencies[i]) {</div><div class='add'>+			*channel = i+1;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_geo_init(struct ieee80211_device *ieee, u8 regdomain)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_geo geo;</div><div class='add'>+	const struct channel_range *range;</div><div class='add'>+	int i;</div><div class='add'>+	u8 channel;</div><div class='add'>+</div><div class='add'>+	dev_dbg(zd_mac_dev(zd_netdev_mac(ieee-&gt;dev)),</div><div class='add'>+		"regdomain %#04x\n", regdomain);</div><div class='add'>+</div><div class='add'>+	range = zd_channel_range(regdomain);</div><div class='add'>+	if (range-&gt;start == 0) {</div><div class='add'>+		dev_err(zd_mac_dev(zd_netdev_mac(ieee-&gt;dev)),</div><div class='add'>+			"zd1211 regdomain %#04x not supported\n",</div><div class='add'>+			regdomain);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;geo, 0, sizeof(geo));</div><div class='add'>+</div><div class='add'>+	for (i = 0, channel = range-&gt;start; channel &lt; range-&gt;end; channel++) {</div><div class='add'>+		struct ieee80211_channel *chan = &amp;geo.bg[i++];</div><div class='add'>+		chan-&gt;freq = channel_frequencies[channel - 1];</div><div class='add'>+		chan-&gt;channel = channel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	geo.bg_channels = i;</div><div class='add'>+	memcpy(geo.name, "XX ", 4);</div><div class='add'>+	ieee80211_set_geo(ieee, &amp;geo);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.h b/drivers/net/wireless/zd1211rw/zd_ieee80211.h<br/>new file mode 100644<br/>index 000000000000..36329890dfec<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_ieee80211.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_ieee80211.h</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+#ifndef _ZD_IEEE80211_H</div><div class='add'>+#define _ZD_IEEE80211_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+#include "zd_types.h"</div><div class='add'>+</div><div class='add'>+/* Additional definitions from the standards.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define ZD_REGDOMAIN_FCC	0x10</div><div class='add'>+#define ZD_REGDOMAIN_IC		0x20</div><div class='add'>+#define ZD_REGDOMAIN_ETSI	0x30</div><div class='add'>+#define ZD_REGDOMAIN_SPAIN	0x31</div><div class='add'>+#define ZD_REGDOMAIN_FRANCE	0x32</div><div class='add'>+#define ZD_REGDOMAIN_JAPAN_ADD	0x40</div><div class='add'>+#define ZD_REGDOMAIN_JAPAN	0x41</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MIN_CHANNEL24 = 1,</div><div class='add'>+	MAX_CHANNEL24 = 14,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct channel_range {</div><div class='add'>+	u8 start;</div><div class='add'>+	u8 end; /* exclusive (channel must be less than end) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct iw_freq;</div><div class='add'>+</div><div class='add'>+int zd_geo_init(struct ieee80211_device *ieee, u8 regdomain);</div><div class='add'>+</div><div class='add'>+const struct channel_range *zd_channel_range(u8 regdomain);</div><div class='add'>+int zd_regdomain_supports_channel(u8 regdomain, u8 channel);</div><div class='add'>+int zd_regdomain_supported(u8 regdomain);</div><div class='add'>+</div><div class='add'>+/* for 2.4 GHz band */</div><div class='add'>+int zd_channel_to_freq(struct iw_freq *freq, u8 channel);</div><div class='add'>+int zd_find_channel(u8 *channel, const struct iw_freq *freq);</div><div class='add'>+</div><div class='add'>+#define ZD_PLCP_SERVICE_LENGTH_EXTENSION 0x80</div><div class='add'>+</div><div class='add'>+struct ofdm_plcp_header {</div><div class='add'>+	u8 prefix[3];</div><div class='add'>+	__le16 service;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+static inline u8 zd_ofdm_plcp_header_rate(</div><div class='add'>+	const struct ofdm_plcp_header *header)</div><div class='add'>+{</div><div class='add'>+	return header-&gt;prefix[0] &amp; 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ZD_OFDM_RATE_6M		0xb</div><div class='add'>+#define ZD_OFDM_RATE_9M		0xf</div><div class='add'>+#define ZD_OFDM_RATE_12M	0xa</div><div class='add'>+#define ZD_OFDM_RATE_18M	0xe</div><div class='add'>+#define ZD_OFDM_RATE_24M	0x9</div><div class='add'>+#define ZD_OFDM_RATE_36M	0xd</div><div class='add'>+#define ZD_OFDM_RATE_48M	0x8</div><div class='add'>+#define ZD_OFDM_RATE_54M	0xc</div><div class='add'>+</div><div class='add'>+struct cck_plcp_header {</div><div class='add'>+	u8 signal;</div><div class='add'>+	u8 service;</div><div class='add'>+	__le16 length;</div><div class='add'>+	__le16 crc16;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+static inline u8 zd_cck_plcp_header_rate(const struct cck_plcp_header *header)</div><div class='add'>+{</div><div class='add'>+	return header-&gt;signal;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ZD_CCK_SIGNAL_1M	0x0a</div><div class='add'>+#define ZD_CCK_SIGNAL_2M	0x14</div><div class='add'>+#define ZD_CCK_SIGNAL_5M5	0x37</div><div class='add'>+#define ZD_CCK_SIGNAL_11M	0x6e</div><div class='add'>+</div><div class='add'>+enum ieee80211_std {</div><div class='add'>+	IEEE80211B = 0x01,</div><div class='add'>+	IEEE80211A = 0x02,</div><div class='add'>+	IEEE80211G = 0x04,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_IEEE80211_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c<br/>new file mode 100644<br/>index 000000000000..3bdc54d128d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_mac.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_mac.c</a></div><div class='hunk'>@@ -0,0 +1,1057 @@</div><div class='add'>+/* zd_mac.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;net/ieee80211_radiotap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_chip.h"</div><div class='add'>+#include "zd_mac.h"</div><div class='add'>+#include "zd_ieee80211.h"</div><div class='add'>+#include "zd_netdev.h"</div><div class='add'>+#include "zd_rf.h"</div><div class='add'>+#include "zd_util.h"</div><div class='add'>+</div><div class='add'>+static void ieee_init(struct ieee80211_device *ieee);</div><div class='add'>+static void softmac_init(struct ieee80211softmac_device *sm);</div><div class='add'>+</div><div class='add'>+int zd_mac_init(struct zd_mac *mac,</div><div class='add'>+	        struct net_device *netdev,</div><div class='add'>+	        struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev);</div><div class='add'>+</div><div class='add'>+	memset(mac, 0, sizeof(*mac));</div><div class='add'>+	spin_lock_init(&amp;mac-&gt;lock);</div><div class='add'>+	mac-&gt;netdev = netdev;</div><div class='add'>+</div><div class='add'>+	ieee_init(ieee);</div><div class='add'>+	softmac_init(ieee80211_priv(netdev));</div><div class='add'>+	zd_chip_init(&amp;mac-&gt;chip, netdev, intf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_channel(struct zd_mac *mac)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	const struct channel_range *range;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mac-&gt;lock, flags);</div><div class='add'>+	range = zd_channel_range(mac-&gt;regdomain);</div><div class='add'>+	if (!range-&gt;start) {</div><div class='add'>+		r = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	mac-&gt;requested_channel = range-&gt;start;</div><div class='add'>+	r = 0;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(&amp;mac-&gt;lock, flags);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_init_hw(struct zd_mac *mac, u8 device_type)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_chip *chip = &amp;mac-&gt;chip;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u8 default_regdomain;</div><div class='add'>+</div><div class='add'>+	r = zd_chip_enable_int(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		goto out;</div><div class='add'>+	r = zd_chip_init_hw(chip, device_type);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+</div><div class='add'>+	zd_get_e2p_mac_addr(chip, addr);</div><div class='add'>+	r = zd_write_mac_addr(chip, addr);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+	ZD_ASSERT(!irqs_disabled());</div><div class='add'>+	spin_lock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	memcpy(mac-&gt;netdev-&gt;dev_addr, addr, ETH_ALEN);</div><div class='add'>+	spin_unlock_irq(&amp;mac-&gt;lock);</div><div class='add'>+</div><div class='add'>+	r = zd_read_regdomain(chip, &amp;default_regdomain);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+	if (!zd_regdomain_supported(default_regdomain)) {</div><div class='add'>+		dev_dbg_f(zd_mac_dev(mac),</div><div class='add'>+			  "Regulatory Domain %#04x is not supported.\n",</div><div class='add'>+		          default_regdomain);</div><div class='add'>+		r = -EINVAL;</div><div class='add'>+		goto disable_int;</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	mac-&gt;regdomain = mac-&gt;default_regdomain = default_regdomain;</div><div class='add'>+	spin_unlock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	r = reset_channel(mac);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+</div><div class='add'>+	r = zd_set_encryption_type(chip, NO_WEP);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+</div><div class='add'>+	r = zd_geo_init(zd_mac_to_ieee80211(mac), mac-&gt;regdomain);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+</div><div class='add'>+	r = 0;</div><div class='add'>+disable_int:</div><div class='add'>+	zd_chip_disable_int(chip);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_mac_clear(struct zd_mac *mac)</div><div class='add'>+{</div><div class='add'>+	/* Aquire the lock. */</div><div class='add'>+	spin_lock(&amp;mac-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;mac-&gt;lock);</div><div class='add'>+	zd_chip_clear(&amp;mac-&gt;chip);</div><div class='add'>+	memset(mac, 0, sizeof(*mac));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reset_mode(struct zd_mac *mac)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);</div><div class='add'>+	struct zd_ioreq32 ioreqs[3] = {</div><div class='add'>+		{ CR_RX_FILTER, RX_FILTER_BEACON|RX_FILTER_PROBE_RESPONSE|</div><div class='add'>+			        RX_FILTER_AUTH|RX_FILTER_ASSOC_RESPONSE },</div><div class='add'>+		{ CR_SNIFFER_ON, 0U },</div><div class='add'>+		{ CR_ENCRYPTION_TYPE, NO_WEP },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (ieee-&gt;iw_mode == IW_MODE_MONITOR) {</div><div class='add'>+		ioreqs[0].value = 0xffffffff;</div><div class='add'>+		ioreqs[1].value = 0x1;</div><div class='add'>+		ioreqs[2].value = ENC_SNIFFER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return zd_iowrite32a(&amp;mac-&gt;chip, ioreqs, 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+	struct zd_chip *chip = &amp;mac-&gt;chip;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	r = zd_chip_enable_int(chip);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	r = zd_chip_set_basic_rates(chip, CR_RATES_80211B | CR_RATES_80211G);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto disable_int;</div><div class='add'>+	r = reset_mode(mac);</div><div class='add'>+	if (r)</div><div class='add'>+		goto disable_int;</div><div class='add'>+	r = zd_chip_switch_radio_on(chip);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto disable_int;</div><div class='add'>+	r = zd_chip_set_channel(chip, mac-&gt;requested_channel);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto disable_radio;</div><div class='add'>+	r = zd_chip_enable_rx(chip);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto disable_radio;</div><div class='add'>+	r = zd_chip_enable_hwint(chip);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		goto disable_rx;</div><div class='add'>+</div><div class='add'>+	ieee80211softmac_start(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+disable_rx:</div><div class='add'>+	zd_chip_disable_rx(chip);</div><div class='add'>+disable_radio:</div><div class='add'>+	zd_chip_switch_radio_off(chip);</div><div class='add'>+disable_int:</div><div class='add'>+	zd_chip_disable_int(chip);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+	struct zd_chip *chip = &amp;mac-&gt;chip;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The order here deliberately is a little different from the open()</div><div class='add'>+	 * method, since we need to make sure there is no opportunity for RX</div><div class='add'>+	 * frames to be processed by softmac after we have stopped it.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	zd_chip_disable_rx(chip);</div><div class='add'>+	ieee80211softmac_stop(netdev);</div><div class='add'>+</div><div class='add'>+	zd_chip_disable_hwint(chip);</div><div class='add'>+	zd_chip_switch_radio_off(chip);</div><div class='add'>+	zd_chip_disable_int(chip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_set_mac_address(struct net_device *netdev, void *p)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct sockaddr *addr = p;</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+	struct zd_chip *chip = &amp;mac-&gt;chip;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_mac_dev(mac),</div><div class='add'>+		  "Setting MAC to " MAC_FMT "\n", MAC_ARG(addr-&gt;sa_data));</div><div class='add'>+</div><div class='add'>+	r = zd_write_mac_addr(chip, addr-&gt;sa_data);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mac-&gt;lock, flags);</div><div class='add'>+	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	spin_unlock_irqrestore(&amp;mac-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_set_regdomain(struct zd_mac *mac, u8 regdomain)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u8 channel;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!irqs_disabled());</div><div class='add'>+	spin_lock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	if (regdomain == 0) {</div><div class='add'>+		regdomain = mac-&gt;default_regdomain;</div><div class='add'>+	}</div><div class='add'>+	if (!zd_regdomain_supported(regdomain)) {</div><div class='add'>+		spin_unlock_irq(&amp;mac-&gt;lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	mac-&gt;regdomain = regdomain;</div><div class='add'>+	channel = mac-&gt;requested_channel;</div><div class='add'>+	spin_unlock_irq(&amp;mac-&gt;lock);</div><div class='add'>+</div><div class='add'>+	r = zd_geo_init(zd_mac_to_ieee80211(mac), regdomain);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	if (!zd_regdomain_supports_channel(regdomain, channel)) {</div><div class='add'>+		r = reset_channel(mac);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u8 zd_mac_get_regdomain(struct zd_mac *mac)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 regdomain;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mac-&gt;lock, flags);</div><div class='add'>+	regdomain = mac-&gt;regdomain;</div><div class='add'>+	spin_unlock_irqrestore(&amp;mac-&gt;lock, flags);</div><div class='add'>+	return regdomain;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_channel(struct net_device *netdev, u8 channel)</div><div class='add'>+{</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_mac_dev(mac), "channel %d\n", channel);</div><div class='add'>+</div><div class='add'>+	zd_chip_set_channel(&amp;mac-&gt;chip, channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO: Should not work in Managed mode. */</div><div class='add'>+int zd_mac_request_channel(struct zd_mac *mac, u8 channel)</div><div class='add'>+{</div><div class='add'>+	unsigned long lock_flags;</div><div class='add'>+	struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);</div><div class='add'>+</div><div class='add'>+	if (ieee-&gt;iw_mode == IW_MODE_INFRA)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mac-&gt;lock, lock_flags);</div><div class='add'>+	if (!zd_regdomain_supports_channel(mac-&gt;regdomain, channel)) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;mac-&gt;lock, lock_flags);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	mac-&gt;requested_channel = channel;</div><div class='add'>+	spin_unlock_irqrestore(&amp;mac-&gt;lock, lock_flags);</div><div class='add'>+	if (netif_running(mac-&gt;netdev))</div><div class='add'>+		return zd_chip_set_channel(&amp;mac-&gt;chip, channel);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_get_channel(struct zd_mac *mac, u8 *channel, u8 *flags)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);</div><div class='add'>+</div><div class='add'>+	*channel = zd_chip_get_channel(&amp;mac-&gt;chip);</div><div class='add'>+	if (ieee-&gt;iw_mode != IW_MODE_INFRA) {</div><div class='add'>+		spin_lock_irq(&amp;mac-&gt;lock);</div><div class='add'>+		*flags = *channel == mac-&gt;requested_channel ?</div><div class='add'>+			MAC_FIXED_CHANNEL : 0;</div><div class='add'>+		spin_unlock(&amp;mac-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		*flags = 0;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg_f(zd_mac_dev(mac), "channel %u flags %u\n", *channel, *flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If wrong rate is given, we are falling back to the slowest rate: 1MBit/s */</div><div class='add'>+static u8 cs_typed_rate(u8 cs_rate)</div><div class='add'>+{</div><div class='add'>+	static const u8 typed_rates[16] = {</div><div class='add'>+		[ZD_CS_CCK_RATE_1M]	= ZD_CS_CCK|ZD_CS_CCK_RATE_1M,</div><div class='add'>+		[ZD_CS_CCK_RATE_2M]	= ZD_CS_CCK|ZD_CS_CCK_RATE_2M,</div><div class='add'>+		[ZD_CS_CCK_RATE_5_5M]	= ZD_CS_CCK|ZD_CS_CCK_RATE_5_5M,</div><div class='add'>+		[ZD_CS_CCK_RATE_11M]	= ZD_CS_CCK|ZD_CS_CCK_RATE_11M,</div><div class='add'>+		[ZD_OFDM_RATE_6M]	= ZD_CS_OFDM|ZD_OFDM_RATE_6M,</div><div class='add'>+		[ZD_OFDM_RATE_9M]	= ZD_CS_OFDM|ZD_OFDM_RATE_9M,</div><div class='add'>+		[ZD_OFDM_RATE_12M]	= ZD_CS_OFDM|ZD_OFDM_RATE_12M,</div><div class='add'>+		[ZD_OFDM_RATE_18M]	= ZD_CS_OFDM|ZD_OFDM_RATE_18M,</div><div class='add'>+		[ZD_OFDM_RATE_24M]	= ZD_CS_OFDM|ZD_OFDM_RATE_24M,</div><div class='add'>+		[ZD_OFDM_RATE_36M]	= ZD_CS_OFDM|ZD_OFDM_RATE_36M,</div><div class='add'>+		[ZD_OFDM_RATE_48M]	= ZD_CS_OFDM|ZD_OFDM_RATE_48M,</div><div class='add'>+		[ZD_OFDM_RATE_54M]	= ZD_CS_OFDM|ZD_OFDM_RATE_54M,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(ZD_CS_RATE_MASK == 0x0f);</div><div class='add'>+	return typed_rates[cs_rate &amp; ZD_CS_RATE_MASK];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fallback to lowest rate, if rate is unknown. */</div><div class='add'>+static u8 rate_to_cs_rate(u8 rate)</div><div class='add'>+{</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case IEEE80211_CCK_RATE_2MB:</div><div class='add'>+		return ZD_CS_CCK_RATE_2M;</div><div class='add'>+	case IEEE80211_CCK_RATE_5MB:</div><div class='add'>+		return ZD_CS_CCK_RATE_5_5M;</div><div class='add'>+	case IEEE80211_CCK_RATE_11MB:</div><div class='add'>+		return ZD_CS_CCK_RATE_11M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_6MB:</div><div class='add'>+		return ZD_OFDM_RATE_6M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_9MB:</div><div class='add'>+		return ZD_OFDM_RATE_9M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_12MB:</div><div class='add'>+		return ZD_OFDM_RATE_12M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_18MB:</div><div class='add'>+		return ZD_OFDM_RATE_18M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_24MB:</div><div class='add'>+		return ZD_OFDM_RATE_24M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_36MB:</div><div class='add'>+		return ZD_OFDM_RATE_36M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_48MB:</div><div class='add'>+		return ZD_OFDM_RATE_48M;</div><div class='add'>+	case IEEE80211_OFDM_RATE_54MB:</div><div class='add'>+		return ZD_OFDM_RATE_54M;</div><div class='add'>+	}</div><div class='add'>+	return ZD_CS_CCK_RATE_1M;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_set_mode(struct zd_mac *mac, u32 mode)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_device *ieee;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case IW_MODE_AUTO:</div><div class='add'>+	case IW_MODE_ADHOC:</div><div class='add'>+	case IW_MODE_INFRA:</div><div class='add'>+		mac-&gt;netdev-&gt;type = ARPHRD_ETHER;</div><div class='add'>+		break;</div><div class='add'>+	case IW_MODE_MONITOR:</div><div class='add'>+		mac-&gt;netdev-&gt;type = ARPHRD_IEEE80211_RADIOTAP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg_f(zd_mac_dev(mac), "wrong mode %u\n", mode);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ieee = zd_mac_to_ieee80211(mac);</div><div class='add'>+	ZD_ASSERT(!irqs_disabled());</div><div class='add'>+	spin_lock_irq(&amp;ieee-&gt;lock);</div><div class='add'>+	ieee-&gt;iw_mode = mode;</div><div class='add'>+	spin_unlock_irq(&amp;ieee-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (netif_running(mac-&gt;netdev))</div><div class='add'>+		return reset_mode(mac);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_get_mode(struct zd_mac *mac, u32 *mode)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct ieee80211_device *ieee;</div><div class='add'>+</div><div class='add'>+	ieee = zd_mac_to_ieee80211(mac);</div><div class='add'>+	spin_lock_irqsave(&amp;ieee-&gt;lock, flags);</div><div class='add'>+	*mode = ieee-&gt;iw_mode;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ieee-&gt;lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	const struct channel_range *channel_range;</div><div class='add'>+	u8 regdomain;</div><div class='add'>+</div><div class='add'>+	memset(range, 0, sizeof(*range));</div><div class='add'>+</div><div class='add'>+	/* FIXME: Not so important and depends on the mode. For 802.11g</div><div class='add'>+	 * usually this value is used. It seems to be that Bit/s number is</div><div class='add'>+	 * given here.</div><div class='add'>+	 */</div><div class='add'>+	range-&gt;throughput = 27 * 1000 * 1000;</div><div class='add'>+</div><div class='add'>+	range-&gt;max_qual.qual = 100;</div><div class='add'>+	range-&gt;max_qual.level = 100;</div><div class='add'>+</div><div class='add'>+	/* FIXME: Needs still to be tuned. */</div><div class='add'>+	range-&gt;avg_qual.qual = 71;</div><div class='add'>+	range-&gt;avg_qual.level = 80;</div><div class='add'>+</div><div class='add'>+	/* FIXME: depends on standard? */</div><div class='add'>+	range-&gt;min_rts = 256;</div><div class='add'>+	range-&gt;max_rts = 2346;</div><div class='add'>+</div><div class='add'>+	range-&gt;min_frag = MIN_FRAG_THRESHOLD;</div><div class='add'>+	range-&gt;max_frag = MAX_FRAG_THRESHOLD;</div><div class='add'>+</div><div class='add'>+	range-&gt;max_encoding_tokens = WEP_KEYS;</div><div class='add'>+	range-&gt;num_encoding_sizes = 2;</div><div class='add'>+	range-&gt;encoding_size[0] = 5;</div><div class='add'>+	range-&gt;encoding_size[1] = WEP_KEY_LEN;</div><div class='add'>+</div><div class='add'>+	range-&gt;we_version_compiled = WIRELESS_EXT;</div><div class='add'>+	range-&gt;we_version_source = 20;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!irqs_disabled());</div><div class='add'>+	spin_lock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	regdomain = mac-&gt;regdomain;</div><div class='add'>+	spin_unlock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	channel_range = zd_channel_range(regdomain);</div><div class='add'>+</div><div class='add'>+	range-&gt;num_channels = channel_range-&gt;end - channel_range-&gt;start;</div><div class='add'>+	range-&gt;old_num_channels = range-&gt;num_channels;</div><div class='add'>+	range-&gt;num_frequency = range-&gt;num_channels;</div><div class='add'>+	range-&gt;old_num_frequency = range-&gt;num_frequency;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; range-&gt;num_frequency; i++) {</div><div class='add'>+		struct iw_freq *freq = &amp;range-&gt;freq[i];</div><div class='add'>+		freq-&gt;i = channel_range-&gt;start + i;</div><div class='add'>+		zd_channel_to_freq(freq, freq-&gt;i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd_calc_tx_length_us(u8 *service, u8 cs_rate, u16 tx_length)</div><div class='add'>+{</div><div class='add'>+	static const u8 rate_divisor[] = {</div><div class='add'>+		[ZD_CS_CCK_RATE_1M]	=  1,</div><div class='add'>+		[ZD_CS_CCK_RATE_2M]	=  2,</div><div class='add'>+		[ZD_CS_CCK_RATE_5_5M]	= 11, /* bits must be doubled */</div><div class='add'>+		[ZD_CS_CCK_RATE_11M]	= 11,</div><div class='add'>+		[ZD_OFDM_RATE_6M]	=  6,</div><div class='add'>+		[ZD_OFDM_RATE_9M]	=  9,</div><div class='add'>+		[ZD_OFDM_RATE_12M]	= 12,</div><div class='add'>+		[ZD_OFDM_RATE_18M]	= 18,</div><div class='add'>+		[ZD_OFDM_RATE_24M]	= 24,</div><div class='add'>+		[ZD_OFDM_RATE_36M]	= 36,</div><div class='add'>+		[ZD_OFDM_RATE_48M]	= 48,</div><div class='add'>+		[ZD_OFDM_RATE_54M]	= 54,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u32 bits = (u32)tx_length * 8;</div><div class='add'>+	u32 divisor;</div><div class='add'>+</div><div class='add'>+	divisor = rate_divisor[cs_rate];</div><div class='add'>+	if (divisor == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (cs_rate) {</div><div class='add'>+	case ZD_CS_CCK_RATE_5_5M:</div><div class='add'>+		bits = (2*bits) + 10; /* round up to the next integer */</div><div class='add'>+		break;</div><div class='add'>+	case ZD_CS_CCK_RATE_11M:</div><div class='add'>+		if (service) {</div><div class='add'>+			u32 t = bits % 11;</div><div class='add'>+			*service &amp;= ~ZD_PLCP_SERVICE_LENGTH_EXTENSION;</div><div class='add'>+			if (0 &lt; t &amp;&amp; t &lt;= 3) {</div><div class='add'>+				*service |= ZD_PLCP_SERVICE_LENGTH_EXTENSION;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		bits += 10; /* round up to the next integer */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bits/divisor;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	R2M_SHORT_PREAMBLE = 0x01,</div><div class='add'>+	R2M_11A		   = 0x02,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 cs_rate_to_modulation(u8 cs_rate, int flags)</div><div class='add'>+{</div><div class='add'>+	u8 modulation;</div><div class='add'>+</div><div class='add'>+	modulation = cs_typed_rate(cs_rate);</div><div class='add'>+	if (flags &amp; R2M_SHORT_PREAMBLE) {</div><div class='add'>+		switch (ZD_CS_RATE(modulation)) {</div><div class='add'>+		case ZD_CS_CCK_RATE_2M:</div><div class='add'>+		case ZD_CS_CCK_RATE_5_5M:</div><div class='add'>+		case ZD_CS_CCK_RATE_11M:</div><div class='add'>+			modulation |= ZD_CS_CCK_PREA_SHORT;</div><div class='add'>+			return modulation;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (flags &amp; R2M_11A) {</div><div class='add'>+		if (ZD_CS_TYPE(modulation) == ZD_CS_OFDM)</div><div class='add'>+			modulation |= ZD_CS_OFDM_MODE_11A;</div><div class='add'>+	}</div><div class='add'>+	return modulation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs_set_modulation(struct zd_mac *mac, struct zd_ctrlset *cs,</div><div class='add'>+	                      struct ieee80211_hdr_4addr *hdr)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211softmac_device *softmac = ieee80211_priv(mac-&gt;netdev);</div><div class='add'>+	u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(hdr-&gt;frame_ctl));</div><div class='add'>+	u8 rate, cs_rate;</div><div class='add'>+	int is_mgt = (ftype == IEEE80211_FTYPE_MGMT) != 0;</div><div class='add'>+</div><div class='add'>+	/* FIXME: 802.11a? short preamble? */</div><div class='add'>+	rate = ieee80211softmac_suggest_txrate(softmac,</div><div class='add'>+		is_multicast_ether_addr(hdr-&gt;addr1), is_mgt);</div><div class='add'>+</div><div class='add'>+	cs_rate = rate_to_cs_rate(rate);</div><div class='add'>+	cs-&gt;modulation = cs_rate_to_modulation(cs_rate, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs,</div><div class='add'>+	                   struct ieee80211_hdr_4addr *header)</div><div class='add'>+{</div><div class='add'>+	unsigned int tx_length = le16_to_cpu(cs-&gt;tx_length);</div><div class='add'>+	u16 fctl = le16_to_cpu(header-&gt;frame_ctl);</div><div class='add'>+	u16 ftype = WLAN_FC_GET_TYPE(fctl);</div><div class='add'>+	u16 stype = WLAN_FC_GET_STYPE(fctl);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CONTROL:</div><div class='add'>+	 * - start at 0x00</div><div class='add'>+	 * - if fragment 0, enable bit 0</div><div class='add'>+	 * - if backoff needed, enable bit 0</div><div class='add'>+	 * - if burst (backoff not needed) disable bit 0</div><div class='add'>+	 * - if multicast, enable bit 1</div><div class='add'>+	 * - if PS-POLL frame, enable bit 2</div><div class='add'>+	 * - if in INDEPENDENT_BSS mode and zd1205_DestPowerSave, then enable</div><div class='add'>+	 *   bit 4 (FIXME: wtf)</div><div class='add'>+	 * - if frag_len &gt; RTS threshold, set bit 5 as long if it isnt</div><div class='add'>+	 *   multicast or mgt</div><div class='add'>+	 * - if bit 5 is set, and we are in OFDM mode, unset bit 5 and set bit</div><div class='add'>+	 *   7</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	cs-&gt;control = 0;</div><div class='add'>+</div><div class='add'>+	/* First fragment */</div><div class='add'>+	if (WLAN_GET_SEQ_FRAG(le16_to_cpu(header-&gt;seq_ctl)) == 0)</div><div class='add'>+		cs-&gt;control |= ZD_CS_NEED_RANDOM_BACKOFF;</div><div class='add'>+</div><div class='add'>+	/* Multicast */</div><div class='add'>+	if (is_multicast_ether_addr(header-&gt;addr1))</div><div class='add'>+		cs-&gt;control |= ZD_CS_MULTICAST;</div><div class='add'>+</div><div class='add'>+	/* PS-POLL */</div><div class='add'>+	if (stype == IEEE80211_STYPE_PSPOLL)</div><div class='add'>+		cs-&gt;control |= ZD_CS_PS_POLL_FRAME;</div><div class='add'>+</div><div class='add'>+	if (!is_multicast_ether_addr(header-&gt;addr1) &amp;&amp;</div><div class='add'>+	    ftype != IEEE80211_FTYPE_MGMT &amp;&amp;</div><div class='add'>+	    tx_length &gt; zd_netdev_ieee80211(mac-&gt;netdev)-&gt;rts)</div><div class='add'>+	{</div><div class='add'>+		/* FIXME: check the logic */</div><div class='add'>+		if (ZD_CS_TYPE(cs-&gt;modulation) == ZD_CS_OFDM) {</div><div class='add'>+			/* 802.11g */</div><div class='add'>+			cs-&gt;control |= ZD_CS_SELF_CTS;</div><div class='add'>+		} else { /* 802.11b */</div><div class='add'>+			cs-&gt;control |= ZD_CS_RTS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: Management frame? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_ctrlset(struct zd_mac *mac,</div><div class='add'>+	                struct ieee80211_txb *txb,</div><div class='add'>+			int frag_num)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct sk_buff *skb = txb-&gt;fragments[frag_num];</div><div class='add'>+	struct ieee80211_hdr_4addr *hdr =</div><div class='add'>+		(struct ieee80211_hdr_4addr *) skb-&gt;data;</div><div class='add'>+	unsigned int frag_len = skb-&gt;len + IEEE80211_FCS_LEN;</div><div class='add'>+	unsigned int next_frag_len;</div><div class='add'>+	unsigned int packet_length;</div><div class='add'>+	struct zd_ctrlset *cs = (struct zd_ctrlset *)</div><div class='add'>+		skb_push(skb, sizeof(struct zd_ctrlset));</div><div class='add'>+</div><div class='add'>+	if (frag_num+1  &lt; txb-&gt;nr_frags) {</div><div class='add'>+		next_frag_len = txb-&gt;fragments[frag_num+1]-&gt;len +</div><div class='add'>+			        IEEE80211_FCS_LEN;</div><div class='add'>+	} else {</div><div class='add'>+		next_frag_len = 0;</div><div class='add'>+	}</div><div class='add'>+	ZD_ASSERT(frag_len &lt;= 0xffff);</div><div class='add'>+	ZD_ASSERT(next_frag_len &lt;= 0xffff);</div><div class='add'>+</div><div class='add'>+	cs_set_modulation(mac, cs, hdr);</div><div class='add'>+</div><div class='add'>+	cs-&gt;tx_length = cpu_to_le16(frag_len);</div><div class='add'>+</div><div class='add'>+	cs_set_control(mac, cs, hdr);</div><div class='add'>+</div><div class='add'>+	packet_length = frag_len + sizeof(struct zd_ctrlset) + 10;</div><div class='add'>+	ZD_ASSERT(packet_length &lt;= 0xffff);</div><div class='add'>+	/* ZD1211B: Computing the length difference this way, gives us</div><div class='add'>+	 * flexibility to compute the packet length.</div><div class='add'>+	 */</div><div class='add'>+	cs-&gt;packet_length = cpu_to_le16(mac-&gt;chip.is_zd1211b ?</div><div class='add'>+			packet_length - frag_len : packet_length);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CURRENT LENGTH:</div><div class='add'>+	 * - transmit frame length in microseconds</div><div class='add'>+	 * - seems to be derived from frame length</div><div class='add'>+	 * - see Cal_Us_Service() in zdinlinef.h</div><div class='add'>+	 * - if macp-&gt;bTxBurstEnable is enabled, then multiply by 4</div><div class='add'>+	 *  - bTxBurstEnable is never set in the vendor driver</div><div class='add'>+	 *</div><div class='add'>+	 * SERVICE:</div><div class='add'>+	 * - "for PLCP configuration"</div><div class='add'>+	 * - always 0 except in some situations at 802.11b 11M</div><div class='add'>+	 * - see line 53 of zdinlinef.h</div><div class='add'>+	 */</div><div class='add'>+	cs-&gt;service = 0;</div><div class='add'>+	r = zd_calc_tx_length_us(&amp;cs-&gt;service, ZD_CS_RATE(cs-&gt;modulation),</div><div class='add'>+		                 le16_to_cpu(cs-&gt;tx_length));</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	cs-&gt;current_length = cpu_to_le16(r);</div><div class='add'>+</div><div class='add'>+	if (next_frag_len == 0) {</div><div class='add'>+		cs-&gt;next_frame_length = 0;</div><div class='add'>+	} else {</div><div class='add'>+		r = zd_calc_tx_length_us(NULL, ZD_CS_RATE(cs-&gt;modulation),</div><div class='add'>+			                 next_frag_len);</div><div class='add'>+		if (r &lt; 0)</div><div class='add'>+			return r;</div><div class='add'>+		cs-&gt;next_frame_length = cpu_to_le16(r);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd_mac_tx(struct zd_mac *mac, struct ieee80211_txb *txb, int pri)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; txb-&gt;nr_frags; i++) {</div><div class='add'>+		struct sk_buff *skb = txb-&gt;fragments[i];</div><div class='add'>+</div><div class='add'>+		r = fill_ctrlset(mac, txb, i);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		r = zd_usb_tx(&amp;mac-&gt;chip.usb, skb-&gt;data, skb-&gt;len);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: shouldn't this be handled by the upper layers? */</div><div class='add'>+	mac-&gt;netdev-&gt;trans_start = jiffies;</div><div class='add'>+</div><div class='add'>+	ieee80211_txb_free(txb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct zd_rt_hdr {</div><div class='add'>+	struct ieee80211_radiotap_header rt_hdr;</div><div class='add'>+	u8  rt_flags;</div><div class='add'>+	u16 rt_channel;</div><div class='add'>+	u16 rt_chbitmask;</div><div class='add'>+	u16 rt_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void fill_rt_header(void *buffer, struct zd_mac *mac,</div><div class='add'>+	                   const struct ieee80211_rx_stats *stats,</div><div class='add'>+			   const struct rx_status *status)</div><div class='add'>+{</div><div class='add'>+	struct zd_rt_hdr *hdr = buffer;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION;</div><div class='add'>+	hdr-&gt;rt_hdr.it_pad = 0;</div><div class='add'>+	hdr-&gt;rt_hdr.it_len = cpu_to_le16(sizeof(struct zd_rt_hdr));</div><div class='add'>+	hdr-&gt;rt_hdr.it_present = cpu_to_le32((1 &lt;&lt; IEEE80211_RADIOTAP_FLAGS) |</div><div class='add'>+		                 (1 &lt;&lt; IEEE80211_RADIOTAP_CHANNEL) |</div><div class='add'>+				 (1 &lt;&lt; IEEE80211_RADIOTAP_RATE));</div><div class='add'>+</div><div class='add'>+	hdr-&gt;rt_flags = 0;</div><div class='add'>+	if (status-&gt;decryption_type &amp; (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256))</div><div class='add'>+		hdr-&gt;rt_flags |= IEEE80211_RADIOTAP_F_WEP;</div><div class='add'>+</div><div class='add'>+	/* FIXME: 802.11a */</div><div class='add'>+	hdr-&gt;rt_channel = cpu_to_le16(ieee80211chan2mhz(</div><div class='add'>+		                             _zd_chip_get_channel(&amp;mac-&gt;chip)));</div><div class='add'>+	hdr-&gt;rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ |</div><div class='add'>+		((status-&gt;frame_status &amp; ZD_RX_FRAME_MODULATION_MASK) ==</div><div class='add'>+		ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK));</div><div class='add'>+</div><div class='add'>+	hdr-&gt;rt_rate = stats-&gt;rate / 5;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns 1 if the data packet is for us and 0 otherwise. */</div><div class='add'>+static int is_data_packet_for_us(struct ieee80211_device *ieee,</div><div class='add'>+	                         struct ieee80211_hdr_4addr *hdr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = ieee-&gt;dev;</div><div class='add'>+	u16 fc = le16_to_cpu(hdr-&gt;frame_ctl);</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA);</div><div class='add'>+</div><div class='add'>+	switch (ieee-&gt;iw_mode) {</div><div class='add'>+	case IW_MODE_ADHOC:</div><div class='add'>+		if ((fc &amp; (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 ||</div><div class='add'>+		    memcmp(hdr-&gt;addr3, ieee-&gt;bssid, ETH_ALEN) != 0)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	case IW_MODE_AUTO:</div><div class='add'>+	case IW_MODE_INFRA:</div><div class='add'>+		if ((fc &amp; (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) !=</div><div class='add'>+		    IEEE80211_FCTL_FROMDS ||</div><div class='add'>+		    memcmp(hdr-&gt;addr2, ieee-&gt;bssid, ETH_ALEN) != 0)</div><div class='add'>+			return 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ZD_ASSERT(ieee-&gt;iw_mode != IW_MODE_MONITOR);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return memcmp(hdr-&gt;addr1, netdev-&gt;dev_addr, ETH_ALEN) == 0 ||</div><div class='add'>+	       is_multicast_ether_addr(hdr-&gt;addr1) ||</div><div class='add'>+	       (netdev-&gt;flags &amp; IFF_PROMISC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Filters receiving packets. If it returns 1 send it to ieee80211_rx, if 0</div><div class='add'>+ * return. If an error is detected -EINVAL is returned. ieee80211_rx_mgt() is</div><div class='add'>+ * called here.</div><div class='add'>+ *</div><div class='add'>+ * It has been based on ieee80211_rx_any.</div><div class='add'>+ */</div><div class='add'>+static int filter_rx(struct ieee80211_device *ieee,</div><div class='add'>+	             const u8 *buffer, unsigned int length,</div><div class='add'>+		     struct ieee80211_rx_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_hdr_4addr *hdr;</div><div class='add'>+	u16 fc;</div><div class='add'>+</div><div class='add'>+	if (ieee-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	hdr = (struct ieee80211_hdr_4addr *)buffer;</div><div class='add'>+	fc = le16_to_cpu(hdr-&gt;frame_ctl);</div><div class='add'>+	if ((fc &amp; IEEE80211_FCTL_VERS) != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (WLAN_FC_GET_TYPE(fc)) {</div><div class='add'>+	case IEEE80211_FTYPE_MGMT:</div><div class='add'>+		if (length &lt; sizeof(struct ieee80211_hdr_3addr))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		ieee80211_rx_mgt(ieee, hdr, stats);</div><div class='add'>+		return 0;</div><div class='add'>+	case IEEE80211_FTYPE_CTL:</div><div class='add'>+		/* Ignore invalid short buffers */</div><div class='add'>+		return 0;</div><div class='add'>+	case IEEE80211_FTYPE_DATA:</div><div class='add'>+		if (length &lt; sizeof(struct ieee80211_hdr_3addr))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return is_data_packet_for_us(ieee, hdr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_qual_rssi(struct zd_mac *mac, u8 qual_percent, u8 rssi)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;mac-&gt;lock, flags);</div><div class='add'>+	mac-&gt;qual_average = (7 * mac-&gt;qual_average + qual_percent) / 8;</div><div class='add'>+	mac-&gt;rssi_average = (7 * mac-&gt;rssi_average + rssi) / 8;</div><div class='add'>+	spin_unlock_irqrestore(&amp;mac-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_rx_stats(struct ieee80211_rx_stats *stats,</div><div class='add'>+	                 const struct rx_status **pstatus,</div><div class='add'>+		         struct zd_mac *mac,</div><div class='add'>+			 const u8 *buffer, unsigned int length)</div><div class='add'>+{</div><div class='add'>+	const struct rx_status *status;</div><div class='add'>+</div><div class='add'>+	*pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status));</div><div class='add'>+	if (status-&gt;frame_status &amp; ZD_RX_ERROR) {</div><div class='add'>+		/* FIXME: update? */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	memset(stats, 0, sizeof(struct ieee80211_rx_stats));</div><div class='add'>+	stats-&gt;len = length - (ZD_PLCP_HEADER_SIZE + IEEE80211_FCS_LEN +</div><div class='add'>+		               + sizeof(struct rx_status));</div><div class='add'>+	/* FIXME: 802.11a */</div><div class='add'>+	stats-&gt;freq = IEEE80211_24GHZ_BAND;</div><div class='add'>+	stats-&gt;received_channel = _zd_chip_get_channel(&amp;mac-&gt;chip);</div><div class='add'>+	stats-&gt;rssi = zd_rx_strength_percent(status-&gt;signal_strength);</div><div class='add'>+	stats-&gt;signal = zd_rx_qual_percent(buffer,</div><div class='add'>+		                          length - sizeof(struct rx_status),</div><div class='add'>+		                          status);</div><div class='add'>+	stats-&gt;mask = IEEE80211_STATMASK_RSSI | IEEE80211_STATMASK_SIGNAL;</div><div class='add'>+	stats-&gt;rate = zd_rx_rate(buffer, status);</div><div class='add'>+	if (stats-&gt;rate)</div><div class='add'>+		stats-&gt;mask |= IEEE80211_STATMASK_RATE;</div><div class='add'>+</div><div class='add'>+	update_qual_rssi(mac, stats-&gt;signal, stats-&gt;rssi);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);</div><div class='add'>+	struct ieee80211_rx_stats stats;</div><div class='add'>+	const struct rx_status *status;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (length &lt; ZD_PLCP_HEADER_SIZE + IEEE80211_1ADDR_LEN +</div><div class='add'>+	             IEEE80211_FCS_LEN + sizeof(struct rx_status))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	r = fill_rx_stats(&amp;stats, &amp;status, mac, buffer, length);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	length -= ZD_PLCP_HEADER_SIZE+IEEE80211_FCS_LEN+</div><div class='add'>+		  sizeof(struct rx_status);</div><div class='add'>+	buffer += ZD_PLCP_HEADER_SIZE;</div><div class='add'>+</div><div class='add'>+	r = filter_rx(ieee, buffer, length, &amp;stats);</div><div class='add'>+	if (r &lt;= 0)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(sizeof(struct zd_rt_hdr) + length);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (ieee-&gt;iw_mode == IW_MODE_MONITOR)</div><div class='add'>+		fill_rt_header(skb_put(skb, sizeof(struct zd_rt_hdr)), mac,</div><div class='add'>+			       &amp;stats, status);</div><div class='add'>+	memcpy(skb_put(skb, length), buffer, length);</div><div class='add'>+</div><div class='add'>+	r = ieee80211_rx(ieee, skb, &amp;stats);</div><div class='add'>+	if (!r) {</div><div class='add'>+		ZD_ASSERT(in_irq());</div><div class='add'>+		dev_kfree_skb_irq(skb);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netdev_tx(struct ieee80211_txb *txb, struct net_device *netdev,</div><div class='add'>+		     int pri)</div><div class='add'>+{</div><div class='add'>+	return zd_mac_tx(zd_netdev_mac(netdev), txb, pri);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_security(struct net_device *netdev,</div><div class='add'>+			 struct ieee80211_security *sec)</div><div class='add'>+{</div><div class='add'>+	struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev);</div><div class='add'>+	struct ieee80211_security *secinfo = &amp;ieee-&gt;sec;</div><div class='add'>+	int keyidx;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), "\n");</div><div class='add'>+</div><div class='add'>+	for (keyidx = 0; keyidx&lt;WEP_KEYS; keyidx++)</div><div class='add'>+		if (sec-&gt;flags &amp; (1&lt;&lt;keyidx)) {</div><div class='add'>+			secinfo-&gt;encode_alg[keyidx] = sec-&gt;encode_alg[keyidx];</div><div class='add'>+			secinfo-&gt;key_sizes[keyidx] = sec-&gt;key_sizes[keyidx];</div><div class='add'>+			memcpy(secinfo-&gt;keys[keyidx], sec-&gt;keys[keyidx],</div><div class='add'>+			       SCM_KEY_LEN);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_ACTIVE_KEY) {</div><div class='add'>+		secinfo-&gt;active_key = sec-&gt;active_key;</div><div class='add'>+		dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),</div><div class='add'>+			"   .active_key = %d\n", sec-&gt;active_key);</div><div class='add'>+	}</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_UNICAST_GROUP) {</div><div class='add'>+		secinfo-&gt;unicast_uses_group = sec-&gt;unicast_uses_group;</div><div class='add'>+		dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),</div><div class='add'>+			"   .unicast_uses_group = %d\n",</div><div class='add'>+			sec-&gt;unicast_uses_group);</div><div class='add'>+	}</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_LEVEL) {</div><div class='add'>+		secinfo-&gt;level = sec-&gt;level;</div><div class='add'>+		dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),</div><div class='add'>+			"   .level = %d\n", sec-&gt;level);</div><div class='add'>+	}</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_ENABLED) {</div><div class='add'>+		secinfo-&gt;enabled = sec-&gt;enabled;</div><div class='add'>+		dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),</div><div class='add'>+			"   .enabled = %d\n", sec-&gt;enabled);</div><div class='add'>+	}</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_ENCRYPT) {</div><div class='add'>+		secinfo-&gt;encrypt = sec-&gt;encrypt;</div><div class='add'>+		dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),</div><div class='add'>+			"   .encrypt = %d\n", sec-&gt;encrypt);</div><div class='add'>+	}</div><div class='add'>+	if (sec-&gt;flags &amp; SEC_AUTH_MODE) {</div><div class='add'>+		secinfo-&gt;auth_mode = sec-&gt;auth_mode;</div><div class='add'>+		dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)),</div><div class='add'>+			"   .auth_mode = %d\n", sec-&gt;auth_mode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ieee_init(struct ieee80211_device *ieee)</div><div class='add'>+{</div><div class='add'>+	ieee-&gt;mode = IEEE_B | IEEE_G;</div><div class='add'>+	ieee-&gt;freq_band = IEEE80211_24GHZ_BAND;</div><div class='add'>+	ieee-&gt;modulation = IEEE80211_OFDM_MODULATION | IEEE80211_CCK_MODULATION;</div><div class='add'>+	ieee-&gt;tx_headroom = sizeof(struct zd_ctrlset);</div><div class='add'>+	ieee-&gt;set_security = set_security;</div><div class='add'>+	ieee-&gt;hard_start_xmit = netdev_tx;</div><div class='add'>+</div><div class='add'>+	/* Software encryption/decryption for now */</div><div class='add'>+	ieee-&gt;host_build_iv = 0;</div><div class='add'>+	ieee-&gt;host_encrypt = 1;</div><div class='add'>+	ieee-&gt;host_decrypt = 1;</div><div class='add'>+</div><div class='add'>+	/* FIXME: default to managed mode, until ieee80211 and zd1211rw can</div><div class='add'>+	 * correctly support AUTO */</div><div class='add'>+	ieee-&gt;iw_mode = IW_MODE_INFRA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void softmac_init(struct ieee80211softmac_device *sm)</div><div class='add'>+{</div><div class='add'>+	sm-&gt;set_channel = set_channel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct iw_statistics *zd_mac_get_wireless_stats(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(ndev);</div><div class='add'>+	struct iw_statistics *iw_stats = &amp;mac-&gt;iw_stats;</div><div class='add'>+</div><div class='add'>+	memset(iw_stats, 0, sizeof(struct iw_statistics));</div><div class='add'>+	/* We are not setting the status, because ieee-&gt;state is not updated</div><div class='add'>+	 * at all and this driver doesn't track authentication state.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	iw_stats-&gt;qual.qual = mac-&gt;qual_average;</div><div class='add'>+	iw_stats-&gt;qual.level = mac-&gt;rssi_average;</div><div class='add'>+	iw_stats-&gt;qual.updated = IW_QUAL_QUAL_UPDATED|IW_QUAL_LEVEL_UPDATED|</div><div class='add'>+		                 IW_QUAL_NOISE_INVALID;</div><div class='add'>+	spin_unlock_irq(&amp;mac-&gt;lock);</div><div class='add'>+	/* TODO: update counter */</div><div class='add'>+	return iw_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static const char* decryption_types[] = {</div><div class='add'>+	[ZD_RX_NO_WEP] = "none",</div><div class='add'>+	[ZD_RX_WEP64] = "WEP64",</div><div class='add'>+	[ZD_RX_TKIP] = "TKIP",</div><div class='add'>+	[ZD_RX_AES] = "AES",</div><div class='add'>+	[ZD_RX_WEP128] = "WEP128",</div><div class='add'>+	[ZD_RX_WEP256] = "WEP256",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *decryption_type_string(u8 type)</div><div class='add'>+{</div><div class='add'>+	const char *s;</div><div class='add'>+</div><div class='add'>+	if (type &lt; ARRAY_SIZE(decryption_types)) {</div><div class='add'>+		s = decryption_types[type];</div><div class='add'>+	} else {</div><div class='add'>+		s = NULL;</div><div class='add'>+	}</div><div class='add'>+	return s ? s : "unknown";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_ofdm(u8 frame_status)</div><div class='add'>+{</div><div class='add'>+	return (frame_status &amp; ZD_RX_OFDM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_dump_rx_status(const struct rx_status *status)</div><div class='add'>+{</div><div class='add'>+	const char* modulation;</div><div class='add'>+	u8 quality;</div><div class='add'>+</div><div class='add'>+	if (is_ofdm(status-&gt;frame_status)) {</div><div class='add'>+		modulation = "ofdm";</div><div class='add'>+		quality = status-&gt;signal_quality_ofdm;</div><div class='add'>+	} else {</div><div class='add'>+		modulation = "cck";</div><div class='add'>+		quality = status-&gt;signal_quality_cck;</div><div class='add'>+	}</div><div class='add'>+	pr_debug("rx status %s strength %#04x qual %#04x decryption %s\n",</div><div class='add'>+		modulation, status-&gt;signal_strength, quality,</div><div class='add'>+		decryption_type_string(status-&gt;decryption_type));</div><div class='add'>+	if (status-&gt;frame_status &amp; ZD_RX_ERROR) {</div><div class='add'>+		pr_debug("rx error %s%s%s%s%s%s\n",</div><div class='add'>+			(status-&gt;frame_status &amp; ZD_RX_TIMEOUT_ERROR) ?</div><div class='add'>+				"timeout " : "",</div><div class='add'>+			(status-&gt;frame_status &amp; ZD_RX_FIFO_OVERRUN_ERROR) ?</div><div class='add'>+				"fifo " : "",</div><div class='add'>+			(status-&gt;frame_status &amp; ZD_RX_DECRYPTION_ERROR) ?</div><div class='add'>+				"decryption " : "",</div><div class='add'>+			(status-&gt;frame_status &amp; ZD_RX_CRC32_ERROR) ?</div><div class='add'>+				"crc32 " : "",</div><div class='add'>+			(status-&gt;frame_status &amp; ZD_RX_NO_ADDR1_MATCH_ERROR) ?</div><div class='add'>+				"addr1 " : "",</div><div class='add'>+			(status-&gt;frame_status &amp; ZD_RX_CRC16_ERROR) ?</div><div class='add'>+				"crc16" : "");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* DEBUG */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h<br/>new file mode 100644<br/>index 000000000000..71e382c589ee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_mac.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_mac.h</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+/* zd_mac.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_MAC_H</div><div class='add'>+#define _ZD_MAC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/wireless.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+#include &lt;net/ieee80211softmac.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_chip.h"</div><div class='add'>+#include "zd_netdev.h"</div><div class='add'>+</div><div class='add'>+struct zd_ctrlset {</div><div class='add'>+	u8     modulation;</div><div class='add'>+	__le16 tx_length;</div><div class='add'>+	u8     control;</div><div class='add'>+	/* stores only the difference to tx_length on ZD1211B */</div><div class='add'>+	__le16 packet_length;</div><div class='add'>+	__le16 current_length;</div><div class='add'>+	u8     service;</div><div class='add'>+	__le16  next_frame_length;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define ZD_CS_RESERVED_SIZE	25</div><div class='add'>+</div><div class='add'>+/* zd_crtlset field modulation */</div><div class='add'>+#define ZD_CS_RATE_MASK		0x0f</div><div class='add'>+#define ZD_CS_TYPE_MASK		0x10</div><div class='add'>+#define ZD_CS_RATE(modulation) ((modulation) &amp; ZD_CS_RATE_MASK)</div><div class='add'>+#define ZD_CS_TYPE(modulation) ((modulation) &amp; ZD_CS_TYPE_MASK)</div><div class='add'>+</div><div class='add'>+#define ZD_CS_CCK		0x00</div><div class='add'>+#define ZD_CS_OFDM		0x10</div><div class='add'>+</div><div class='add'>+#define ZD_CS_CCK_RATE_1M	0x00</div><div class='add'>+#define ZD_CS_CCK_RATE_2M	0x01</div><div class='add'>+#define ZD_CS_CCK_RATE_5_5M	0x02</div><div class='add'>+#define ZD_CS_CCK_RATE_11M	0x03</div><div class='add'>+/* The rates for OFDM are encoded as in the PLCP header. Use ZD_OFDM_RATE_*.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* bit 5 is preamble (when in CCK mode), or a/g selection (when in OFDM mode) */</div><div class='add'>+#define ZD_CS_CCK_PREA_LONG	0x00</div><div class='add'>+#define ZD_CS_CCK_PREA_SHORT	0x20</div><div class='add'>+#define ZD_CS_OFDM_MODE_11G	0x00</div><div class='add'>+#define ZD_CS_OFDM_MODE_11A	0x20</div><div class='add'>+</div><div class='add'>+/* zd_ctrlset control field */</div><div class='add'>+#define ZD_CS_NEED_RANDOM_BACKOFF	0x01</div><div class='add'>+#define ZD_CS_MULTICAST			0x02</div><div class='add'>+</div><div class='add'>+#define ZD_CS_FRAME_TYPE_MASK		0x0c</div><div class='add'>+#define ZD_CS_DATA_FRAME		0x00</div><div class='add'>+#define ZD_CS_PS_POLL_FRAME		0x04</div><div class='add'>+#define ZD_CS_MANAGEMENT_FRAME		0x08</div><div class='add'>+#define ZD_CS_NO_SEQUENCE_CTL_FRAME	0x0c</div><div class='add'>+</div><div class='add'>+#define ZD_CS_WAKE_DESTINATION		0x10</div><div class='add'>+#define ZD_CS_RTS			0x20</div><div class='add'>+#define ZD_CS_ENCRYPT			0x40</div><div class='add'>+#define ZD_CS_SELF_CTS			0x80</div><div class='add'>+</div><div class='add'>+/* Incoming frames are prepended by a PLCP header */</div><div class='add'>+#define ZD_PLCP_HEADER_SIZE		5</div><div class='add'>+</div><div class='add'>+struct rx_length_info {</div><div class='add'>+	__le16 length[3];</div><div class='add'>+	__le16 tag;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+#define RX_LENGTH_INFO_TAG		0x697e</div><div class='add'>+</div><div class='add'>+struct rx_status {</div><div class='add'>+	/* rssi */</div><div class='add'>+	u8 signal_strength;</div><div class='add'>+	u8 signal_quality_cck;</div><div class='add'>+	u8 signal_quality_ofdm;</div><div class='add'>+	u8 decryption_type;</div><div class='add'>+	u8 frame_status;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* rx_status field decryption_type */</div><div class='add'>+#define ZD_RX_NO_WEP	0</div><div class='add'>+#define ZD_RX_WEP64	1</div><div class='add'>+#define ZD_RX_TKIP	2</div><div class='add'>+#define ZD_RX_AES	4</div><div class='add'>+#define ZD_RX_WEP128	5</div><div class='add'>+#define ZD_RX_WEP256	6</div><div class='add'>+</div><div class='add'>+/* rx_status field frame_status */</div><div class='add'>+#define ZD_RX_FRAME_MODULATION_MASK	0x01</div><div class='add'>+#define ZD_RX_CCK			0x00</div><div class='add'>+#define ZD_RX_OFDM			0x01</div><div class='add'>+</div><div class='add'>+#define ZD_RX_TIMEOUT_ERROR		0x02</div><div class='add'>+#define ZD_RX_FIFO_OVERRUN_ERROR	0x04</div><div class='add'>+#define ZD_RX_DECRYPTION_ERROR		0x08</div><div class='add'>+#define ZD_RX_CRC32_ERROR		0x10</div><div class='add'>+#define ZD_RX_NO_ADDR1_MATCH_ERROR	0x20</div><div class='add'>+#define ZD_RX_CRC16_ERROR		0x40</div><div class='add'>+#define ZD_RX_ERROR			0x80</div><div class='add'>+</div><div class='add'>+enum mac_flags {</div><div class='add'>+	MAC_FIXED_CHANNEL = 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_mac {</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct zd_chip chip;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	/* Unlocked reading possible */</div><div class='add'>+	struct iw_statistics iw_stats;</div><div class='add'>+	u8 qual_average;</div><div class='add'>+	u8 rssi_average;</div><div class='add'>+	u8 regdomain;</div><div class='add'>+	u8 default_regdomain;</div><div class='add'>+	u8 requested_channel;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_device *zd_mac_to_ieee80211(struct zd_mac *mac)</div><div class='add'>+{</div><div class='add'>+	return zd_netdev_ieee80211(mac-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct zd_mac *zd_netdev_mac(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return ieee80211softmac_priv(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct zd_mac *zd_chip_to_mac(struct zd_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return container_of(chip, struct zd_mac, chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct zd_mac *zd_usb_to_mac(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	return zd_chip_to_mac(zd_usb_to_chip(usb));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define zd_mac_dev(mac) (zd_chip_dev(&amp;(mac)-&gt;chip))</div><div class='add'>+</div><div class='add'>+int zd_mac_init(struct zd_mac *mac,</div><div class='add'>+                struct net_device *netdev,</div><div class='add'>+		struct usb_interface *intf);</div><div class='add'>+void zd_mac_clear(struct zd_mac *mac);</div><div class='add'>+</div><div class='add'>+int zd_mac_init_hw(struct zd_mac *mac, u8 device_type);</div><div class='add'>+</div><div class='add'>+int zd_mac_open(struct net_device *netdev);</div><div class='add'>+int zd_mac_stop(struct net_device *netdev);</div><div class='add'>+int zd_mac_set_mac_address(struct net_device *dev, void *p);</div><div class='add'>+</div><div class='add'>+int zd_mac_rx(struct zd_mac *mac, const u8 *buffer, unsigned int length);</div><div class='add'>+</div><div class='add'>+int zd_mac_set_regdomain(struct zd_mac *zd_mac, u8 regdomain);</div><div class='add'>+u8 zd_mac_get_regdomain(struct zd_mac *zd_mac);</div><div class='add'>+</div><div class='add'>+int zd_mac_request_channel(struct zd_mac *mac, u8 channel);</div><div class='add'>+int zd_mac_get_channel(struct zd_mac *mac, u8 *channel, u8 *flags);</div><div class='add'>+</div><div class='add'>+int zd_mac_set_mode(struct zd_mac *mac, u32 mode);</div><div class='add'>+int zd_mac_get_mode(struct zd_mac *mac, u32 *mode);</div><div class='add'>+</div><div class='add'>+int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range);</div><div class='add'>+</div><div class='add'>+struct iw_statistics *zd_mac_get_wireless_stats(struct net_device *ndev);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+void zd_dump_rx_status(const struct rx_status *status);</div><div class='add'>+#else</div><div class='add'>+#define zd_dump_rx_status(status)</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_MAC_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.c b/drivers/net/wireless/zd1211rw/zd_netdev.c<br/>new file mode 100644<br/>index 000000000000..9df232c2c863<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_netdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_netdev.c</a></div><div class='hunk'>@@ -0,0 +1,267 @@</div><div class='add'>+/* zd_netdev.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+#include &lt;net/ieee80211softmac.h&gt;</div><div class='add'>+#include &lt;net/ieee80211softmac_wx.h&gt;</div><div class='add'>+#include &lt;net/iw_handler.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_netdev.h"</div><div class='add'>+#include "zd_mac.h"</div><div class='add'>+#include "zd_ieee80211.h"</div><div class='add'>+</div><div class='add'>+/* Region 0 means reset regdomain to default. */</div><div class='add'>+static int zd_set_regdomain(struct net_device *netdev,</div><div class='add'>+	                    struct iw_request_info *info,</div><div class='add'>+			    union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	const u8 *regdomain = (u8 *)req;</div><div class='add'>+	return zd_mac_set_regdomain(zd_netdev_mac(netdev), *regdomain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd_get_regdomain(struct net_device *netdev,</div><div class='add'>+	                    struct iw_request_info *info,</div><div class='add'>+			    union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	u8 *regdomain = (u8 *)req;</div><div class='add'>+	if (!regdomain)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*regdomain = zd_mac_get_regdomain(zd_netdev_mac(netdev));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct iw_priv_args zd_priv_args[] = {</div><div class='add'>+	{</div><div class='add'>+		.cmd = ZD_PRIV_SET_REGDOMAIN,</div><div class='add'>+		.set_args = IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1,</div><div class='add'>+		.name = "set_regdomain",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.cmd = ZD_PRIV_GET_REGDOMAIN,</div><div class='add'>+		.get_args = IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1,</div><div class='add'>+		.name = "get_regdomain",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PRIV_OFFSET(x) [(x)-SIOCIWFIRSTPRIV]</div><div class='add'>+</div><div class='add'>+static const iw_handler zd_priv_handler[] = {</div><div class='add'>+	PRIV_OFFSET(ZD_PRIV_SET_REGDOMAIN) = zd_set_regdomain,</div><div class='add'>+	PRIV_OFFSET(ZD_PRIV_GET_REGDOMAIN) = zd_get_regdomain,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int iw_get_name(struct net_device *netdev,</div><div class='add'>+	               struct iw_request_info *info,</div><div class='add'>+		       union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: check whether 802.11a will also supported, add also</div><div class='add'>+	 *        zd1211B, if we support it.</div><div class='add'>+	 */</div><div class='add'>+	strlcpy(req-&gt;name, "802.11g zd1211", IFNAMSIZ);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_set_freq(struct net_device *netdev,</div><div class='add'>+	               struct iw_request_info *info,</div><div class='add'>+		       union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+	struct iw_freq *freq = &amp;req-&gt;freq;</div><div class='add'>+	u8 channel;</div><div class='add'>+</div><div class='add'>+	r = zd_find_channel(&amp;channel, freq);</div><div class='add'>+	if (r &lt; 0)</div><div class='add'>+		return r;</div><div class='add'>+	r = zd_mac_request_channel(mac, channel);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_get_freq(struct net_device *netdev,</div><div class='add'>+	           struct iw_request_info *info,</div><div class='add'>+		   union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+	struct iw_freq *freq = &amp;req-&gt;freq;</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 flags;</div><div class='add'>+</div><div class='add'>+	r = zd_mac_get_channel(mac, &amp;channel, &amp;flags);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	freq-&gt;flags = (flags &amp; MAC_FIXED_CHANNEL) ?</div><div class='add'>+		      IW_FREQ_FIXED : IW_FREQ_AUTO;</div><div class='add'>+	dev_dbg_f(zd_mac_dev(mac), "channel %s\n",</div><div class='add'>+		  (flags &amp; MAC_FIXED_CHANNEL) ? "fixed" : "auto");</div><div class='add'>+	return zd_channel_to_freq(freq, channel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_set_mode(struct net_device *netdev,</div><div class='add'>+	               struct iw_request_info *info,</div><div class='add'>+		       union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	return zd_mac_set_mode(zd_netdev_mac(netdev), req-&gt;mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_get_mode(struct net_device *netdev,</div><div class='add'>+	               struct iw_request_info *info,</div><div class='add'>+		       union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	return zd_mac_get_mode(zd_netdev_mac(netdev), &amp;req-&gt;mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_get_range(struct net_device *netdev,</div><div class='add'>+	               struct iw_request_info *info,</div><div class='add'>+		       union iwreq_data *req, char *extra)</div><div class='add'>+{</div><div class='add'>+	struct iw_range *range = (struct iw_range *)extra;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), "\n");</div><div class='add'>+	req-&gt;data.length = sizeof(*range);</div><div class='add'>+	return zd_mac_get_range(zd_netdev_mac(netdev), range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_set_encode(struct net_device *netdev,</div><div class='add'>+			 struct iw_request_info *info,</div><div class='add'>+			 union iwreq_data *data,</div><div class='add'>+			 char *extra)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_wx_set_encode(zd_netdev_ieee80211(netdev), info,</div><div class='add'>+		data, extra);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_get_encode(struct net_device *netdev,</div><div class='add'>+			 struct iw_request_info *info,</div><div class='add'>+			 union iwreq_data *data,</div><div class='add'>+			 char *extra)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_wx_get_encode(zd_netdev_ieee80211(netdev), info,</div><div class='add'>+		data, extra);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_set_encodeext(struct net_device *netdev,</div><div class='add'>+			 struct iw_request_info *info,</div><div class='add'>+			 union iwreq_data *data,</div><div class='add'>+			 char *extra)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_wx_set_encodeext(zd_netdev_ieee80211(netdev), info,</div><div class='add'>+		data, extra);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iw_get_encodeext(struct net_device *netdev,</div><div class='add'>+			 struct iw_request_info *info,</div><div class='add'>+			 union iwreq_data *data,</div><div class='add'>+			 char *extra)</div><div class='add'>+{</div><div class='add'>+	return ieee80211_wx_get_encodeext(zd_netdev_ieee80211(netdev), info,</div><div class='add'>+		data, extra);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WX(x) [(x)-SIOCIWFIRST]</div><div class='add'>+</div><div class='add'>+static const iw_handler zd_standard_iw_handlers[] = {</div><div class='add'>+	WX(SIOCGIWNAME)		= iw_get_name,</div><div class='add'>+	WX(SIOCSIWFREQ)		= iw_set_freq,</div><div class='add'>+	WX(SIOCGIWFREQ)		= iw_get_freq,</div><div class='add'>+	WX(SIOCSIWMODE)		= iw_set_mode,</div><div class='add'>+	WX(SIOCGIWMODE)		= iw_get_mode,</div><div class='add'>+	WX(SIOCGIWRANGE)	= iw_get_range,</div><div class='add'>+	WX(SIOCSIWENCODE)	= iw_set_encode,</div><div class='add'>+	WX(SIOCGIWENCODE)	= iw_get_encode,</div><div class='add'>+	WX(SIOCSIWENCODEEXT)	= iw_set_encodeext,</div><div class='add'>+	WX(SIOCGIWENCODEEXT)	= iw_get_encodeext,</div><div class='add'>+	WX(SIOCSIWAUTH)		= ieee80211_wx_set_auth,</div><div class='add'>+	WX(SIOCGIWAUTH)		= ieee80211_wx_get_auth,</div><div class='add'>+	WX(SIOCSIWSCAN)		= ieee80211softmac_wx_trigger_scan,</div><div class='add'>+	WX(SIOCGIWSCAN)		= ieee80211softmac_wx_get_scan_results,</div><div class='add'>+	WX(SIOCSIWESSID)	= ieee80211softmac_wx_set_essid,</div><div class='add'>+	WX(SIOCGIWESSID)	= ieee80211softmac_wx_get_essid,</div><div class='add'>+	WX(SIOCSIWAP)		= ieee80211softmac_wx_set_wap,</div><div class='add'>+	WX(SIOCGIWAP)		= ieee80211softmac_wx_get_wap,</div><div class='add'>+	WX(SIOCSIWRATE)		= ieee80211softmac_wx_set_rate,</div><div class='add'>+	WX(SIOCGIWRATE)		= ieee80211softmac_wx_get_rate,</div><div class='add'>+	WX(SIOCSIWGENIE)	= ieee80211softmac_wx_set_genie,</div><div class='add'>+	WX(SIOCGIWGENIE)	= ieee80211softmac_wx_get_genie,</div><div class='add'>+	WX(SIOCSIWMLME)		= ieee80211softmac_wx_set_mlme,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct iw_handler_def iw_handler_def = {</div><div class='add'>+	.standard		= zd_standard_iw_handlers,</div><div class='add'>+	.num_standard		= ARRAY_SIZE(zd_standard_iw_handlers),</div><div class='add'>+	.private		= zd_priv_handler,</div><div class='add'>+	.num_private		= ARRAY_SIZE(zd_priv_handler),</div><div class='add'>+	.private_args		= zd_priv_args,</div><div class='add'>+	.num_private_args	= ARRAY_SIZE(zd_priv_args),</div><div class='add'>+	.get_wireless_stats	= zd_mac_get_wireless_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct net_device *zd_netdev_alloc(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct zd_mac *mac;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_ieee80211softmac(sizeof(struct zd_mac));</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		dev_dbg_f(&amp;intf-&gt;dev, "out of memory\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac = zd_netdev_mac(netdev);</div><div class='add'>+	r = zd_mac_init(mac, netdev, intf);</div><div class='add'>+	if (r) {</div><div class='add'>+		usb_set_intfdata(intf, NULL);</div><div class='add'>+		free_ieee80211(netdev);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_MODULE_OWNER(netdev);</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(&amp;intf-&gt;dev, "netdev-&gt;flags %#06hx\n", netdev-&gt;flags);</div><div class='add'>+	dev_dbg_f(&amp;intf-&gt;dev, "netdev-&gt;features %#010lx\n", netdev-&gt;features);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;open = zd_mac_open;</div><div class='add'>+	netdev-&gt;stop = zd_mac_stop;</div><div class='add'>+	/* netdev-&gt;get_stats = */</div><div class='add'>+	/* netdev-&gt;set_multicast_list = */</div><div class='add'>+	netdev-&gt;set_mac_address = zd_mac_set_mac_address;</div><div class='add'>+	netdev-&gt;wireless_handlers = &amp;iw_handler_def;</div><div class='add'>+	/* netdev-&gt;ethtool_ops = */</div><div class='add'>+</div><div class='add'>+	return netdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_netdev_free(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	zd_mac_clear(zd_netdev_mac(netdev));</div><div class='add'>+	free_ieee80211(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_netdev_disconnect(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.h b/drivers/net/wireless/zd1211rw/zd_netdev.h<br/>new file mode 100644<br/>index 000000000000..374a957073c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_netdev.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_netdev.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* zd_netdev.h: Header for net device related functions.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_NETDEV_H</div><div class='add'>+#define _ZD_NETDEV_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+#define ZD_PRIV_SET_REGDOMAIN (SIOCIWFIRSTPRIV)</div><div class='add'>+#define ZD_PRIV_GET_REGDOMAIN (SIOCIWFIRSTPRIV+1)</div><div class='add'>+</div><div class='add'>+static inline struct ieee80211_device *zd_netdev_ieee80211(</div><div class='add'>+	struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return netdev_priv(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_device *zd_ieee80211_to_netdev(</div><div class='add'>+	struct ieee80211_device *ieee)</div><div class='add'>+{</div><div class='add'>+	return ieee-&gt;dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct net_device *zd_netdev_alloc(struct usb_interface *intf);</div><div class='add'>+void zd_netdev_free(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+void zd_netdev_disconnect(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_NETDEV_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c<br/>new file mode 100644<br/>index 000000000000..d3770d2c61bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_rf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_rf.c</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+/* zd_rf.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_rf.h"</div><div class='add'>+#include "zd_ieee80211.h"</div><div class='add'>+#include "zd_chip.h"</div><div class='add'>+</div><div class='add'>+static const char *rfs[] = {</div><div class='add'>+	[0]		= "unknown RF0",</div><div class='add'>+	[1]		= "unknown RF1",</div><div class='add'>+	[UW2451_RF]	= "UW2451_RF",</div><div class='add'>+	[UCHIP_RF]	= "UCHIP_RF",</div><div class='add'>+	[AL2230_RF]	= "AL2230_RF",</div><div class='add'>+	[AL7230B_RF]	= "AL7230B_RF",</div><div class='add'>+	[THETA_RF]	= "THETA_RF",</div><div class='add'>+	[AL2210_RF]	= "AL2210_RF",</div><div class='add'>+	[MAXIM_NEW_RF]	= "MAXIM_NEW_RF",</div><div class='add'>+	[UW2453_RF]	= "UW2453_RF",</div><div class='add'>+	[AL2230S_RF]	= "AL2230S_RF",</div><div class='add'>+	[RALINK_RF]	= "RALINK_RF",</div><div class='add'>+	[INTERSIL_RF]	= "INTERSIL_RF",</div><div class='add'>+	[RF2959_RF]	= "RF2959_RF",</div><div class='add'>+	[MAXIM_NEW2_RF]	= "MAXIM_NEW2_RF",</div><div class='add'>+	[PHILIPS_RF]	= "PHILIPS_RF",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *zd_rf_name(u8 type)</div><div class='add'>+{</div><div class='add'>+	if (type &amp; 0xf0)</div><div class='add'>+		type = 0;</div><div class='add'>+	return rfs[type];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_rf_init(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	memset(rf, 0, sizeof(*rf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_rf_clear(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	memset(rf, 0, sizeof(*rf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rf_init_hw(struct zd_rf *rf, u8 type)</div><div class='add'>+{</div><div class='add'>+	int r, t;</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RF2959_RF:</div><div class='add'>+		r = zd_rf_init_rf2959(rf);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		break;</div><div class='add'>+	case AL2230_RF:</div><div class='add'>+		r = zd_rf_init_al2230(rf);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(zd_chip_dev(chip),</div><div class='add'>+			"RF %s %#x is not supported\n", zd_rf_name(type), type);</div><div class='add'>+		rf-&gt;type = 0;</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rf-&gt;type = type;</div><div class='add'>+</div><div class='add'>+	r = zd_chip_lock_phy_regs(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	t = rf-&gt;init_hw(rf);</div><div class='add'>+	r = zd_chip_unlock_phy_regs(chip);</div><div class='add'>+	if (t)</div><div class='add'>+		r = t;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rf_scnprint_id(struct zd_rf *rf, char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buffer, size, "%s", zd_rf_name(rf-&gt;type));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rf_set_channel(struct zd_rf *rf, u8 channel)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;zd_rf_to_chip(rf)-&gt;mutex));</div><div class='add'>+	if (channel &lt; MIN_CHANNEL24)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (channel &gt; MAX_CHANNEL24)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	dev_dbg_f(zd_chip_dev(zd_rf_to_chip(rf)), "channel: %d\n", channel);</div><div class='add'>+</div><div class='add'>+	r = rf-&gt;set_channel(rf, channel);</div><div class='add'>+	if (r &gt;= 0)</div><div class='add'>+		rf-&gt;channel = channel;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_switch_radio_on(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	int r, t;</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_chip_lock_phy_regs(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	t = rf-&gt;switch_radio_on(rf);</div><div class='add'>+	r = zd_chip_unlock_phy_regs(chip);</div><div class='add'>+	if (t)</div><div class='add'>+		r = t;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_switch_radio_off(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	int r, t;</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	/* TODO: move phy regs handling to zd_chip */</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_chip_lock_phy_regs(chip);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	t = rf-&gt;switch_radio_off(rf);</div><div class='add'>+	r = zd_chip_unlock_phy_regs(chip);</div><div class='add'>+	if (t)</div><div class='add'>+		r = t;</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h<br/>new file mode 100644<br/>index 000000000000..ea30f693fcc8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_rf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_rf.h</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/* zd_rf.h</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_RF_H</div><div class='add'>+#define _ZD_RF_H</div><div class='add'>+</div><div class='add'>+#include "zd_types.h"</div><div class='add'>+</div><div class='add'>+#define UW2451_RF			0x2</div><div class='add'>+#define UCHIP_RF			0x3</div><div class='add'>+#define AL2230_RF			0x4</div><div class='add'>+#define AL7230B_RF			0x5	/* a,b,g */</div><div class='add'>+#define THETA_RF			0x6</div><div class='add'>+#define AL2210_RF			0x7</div><div class='add'>+#define MAXIM_NEW_RF			0x8</div><div class='add'>+#define UW2453_RF			0x9</div><div class='add'>+#define AL2230S_RF			0xa</div><div class='add'>+#define RALINK_RF			0xb</div><div class='add'>+#define INTERSIL_RF			0xc</div><div class='add'>+#define RF2959_RF			0xd</div><div class='add'>+#define MAXIM_NEW2_RF			0xe</div><div class='add'>+#define PHILIPS_RF			0xf</div><div class='add'>+</div><div class='add'>+#define RF_CHANNEL(ch) [(ch)-1]</div><div class='add'>+</div><div class='add'>+/* Provides functions of the RF transceiver. */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RF_REG_BITS = 6,</div><div class='add'>+	RF_VALUE_BITS = 18,</div><div class='add'>+	RF_RV_BITS = RF_REG_BITS + RF_VALUE_BITS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_rf {</div><div class='add'>+	u8 type;</div><div class='add'>+</div><div class='add'>+	u8 channel;</div><div class='add'>+	/*</div><div class='add'>+	 * Whether this RF should patch the 6M band edge</div><div class='add'>+	 * (assuming E2P_POD agrees)</div><div class='add'>+	 */</div><div class='add'>+	u8 patch_6m_band_edge:1;</div><div class='add'>+</div><div class='add'>+	/* RF-specific functions */</div><div class='add'>+	int (*init_hw)(struct zd_rf *rf);</div><div class='add'>+	int (*set_channel)(struct zd_rf *rf, u8 channel);</div><div class='add'>+	int (*switch_radio_on)(struct zd_rf *rf);</div><div class='add'>+	int (*switch_radio_off)(struct zd_rf *rf);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const char *zd_rf_name(u8 type);</div><div class='add'>+void zd_rf_init(struct zd_rf *rf);</div><div class='add'>+void zd_rf_clear(struct zd_rf *rf);</div><div class='add'>+int zd_rf_init_hw(struct zd_rf *rf, u8 type);</div><div class='add'>+</div><div class='add'>+int zd_rf_scnprint_id(struct zd_rf *rf, char *buffer, size_t size);</div><div class='add'>+</div><div class='add'>+int zd_rf_set_channel(struct zd_rf *rf, u8 channel);</div><div class='add'>+</div><div class='add'>+int zd_switch_radio_on(struct zd_rf *rf);</div><div class='add'>+int zd_switch_radio_off(struct zd_rf *rf);</div><div class='add'>+</div><div class='add'>+/* Functions for individual RF chips */</div><div class='add'>+</div><div class='add'>+int zd_rf_init_rf2959(struct zd_rf *rf);</div><div class='add'>+int zd_rf_init_al2230(struct zd_rf *rf);</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_RF_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c<br/>new file mode 100644<br/>index 000000000000..0948b25f660d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_rf_al2230.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_rf_al2230.c</a></div><div class='hunk'>@@ -0,0 +1,308 @@</div><div class='add'>+/* zd_rf_al2230.c: Functions for the AL2230 RF controller</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_rf.h"</div><div class='add'>+#include "zd_usb.h"</div><div class='add'>+#include "zd_chip.h"</div><div class='add'>+</div><div class='add'>+static const u32 al2230_table[][3] = {</div><div class='add'>+	RF_CHANNEL( 1) = { 0x03f790, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 2) = { 0x03f790, 0x0b3331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 3) = { 0x03e790, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 4) = { 0x03e790, 0x0b3331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 5) = { 0x03f7a0, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 6) = { 0x03f7a0, 0x0b3331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 7) = { 0x03e7a0, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 8) = { 0x03e7a0, 0x0b3331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL( 9) = { 0x03f7b0, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL(10) = { 0x03f7b0, 0x0b3331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL(11) = { 0x03e7b0, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL(12) = { 0x03e7b0, 0x0b3331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL(13) = { 0x03f7c0, 0x033331, 0x00000d, },</div><div class='add'>+	RF_CHANNEL(14) = { 0x03e7c0, 0x066661, 0x00000d, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int zd1211_al2230_init_hw(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR15,   0x20 }, { CR23,   0x40 }, { CR24,  0x20 },</div><div class='add'>+		{ CR26,   0x11 }, { CR28,   0x3e }, { CR29,  0x00 },</div><div class='add'>+		{ CR44,   0x33 }, { CR106,  0x2a }, { CR107, 0x1a },</div><div class='add'>+		{ CR109,  0x09 }, { CR110,  0x27 }, { CR111, 0x2b },</div><div class='add'>+		{ CR112,  0x2b }, { CR119,  0x0a }, { CR10,  0x89 },</div><div class='add'>+		/* for newest (3rd cut) AL2300 */</div><div class='add'>+		{ CR17,   0x28 },</div><div class='add'>+		{ CR26,   0x93 }, { CR34,   0x30 },</div><div class='add'>+		/* for newest (3rd cut) AL2300 */</div><div class='add'>+		{ CR35,   0x3e },</div><div class='add'>+		{ CR41,   0x24 }, { CR44,   0x32 },</div><div class='add'>+		/* for newest (3rd cut) AL2300 */</div><div class='add'>+		{ CR46,   0x96 },</div><div class='add'>+		{ CR47,   0x1e }, { CR79,   0x58 }, { CR80,  0x30 },</div><div class='add'>+		{ CR81,   0x30 }, { CR87,   0x0a }, { CR89,  0x04 },</div><div class='add'>+		{ CR92,   0x0a }, { CR99,   0x28 }, { CR100, 0x00 },</div><div class='add'>+		{ CR101,  0x13 }, { CR102,  0x27 }, { CR106, 0x24 },</div><div class='add'>+		{ CR107,  0x2a }, { CR109,  0x09 }, { CR110, 0x13 },</div><div class='add'>+		{ CR111,  0x1f }, { CR112,  0x1f }, { CR113, 0x27 },</div><div class='add'>+		{ CR114,  0x27 },</div><div class='add'>+		/* for newest (3rd cut) AL2300 */</div><div class='add'>+		{ CR115,  0x24 },</div><div class='add'>+		{ CR116,  0x24 }, { CR117,  0xf4 }, { CR118, 0xfc },</div><div class='add'>+		{ CR119,  0x10 }, { CR120,  0x4f }, { CR121, 0x77 },</div><div class='add'>+		{ CR122,  0xe0 }, { CR137,  0x88 }, { CR252, 0xff },</div><div class='add'>+		{ CR253,  0xff },</div><div class='add'>+</div><div class='add'>+		/* These following happen separately in the vendor driver */</div><div class='add'>+		{ },</div><div class='add'>+</div><div class='add'>+		/* shdnb(PLL_ON)=0 */</div><div class='add'>+		{ CR251,  0x2f },</div><div class='add'>+		/* shdnb(PLL_ON)=1 */</div><div class='add'>+		{ CR251,  0x3f },</div><div class='add'>+		{ CR138,  0x28 }, { CR203,  0x06 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const u32 rv[] = {</div><div class='add'>+		/* Channel 1 */</div><div class='add'>+		0x03f790,</div><div class='add'>+		0x033331,</div><div class='add'>+		0x00000d,</div><div class='add'>+</div><div class='add'>+		0x0b3331,</div><div class='add'>+		0x03b812,</div><div class='add'>+		0x00fff3,</div><div class='add'>+		0x000da4,</div><div class='add'>+		0x0f4dc5, /* fix freq shift, 0x04edc5 */</div><div class='add'>+		0x0805b6,</div><div class='add'>+		0x011687,</div><div class='add'>+		0x000688,</div><div class='add'>+		0x0403b9, /* external control TX power (CR31) */</div><div class='add'>+		0x00dbba,</div><div class='add'>+		0x00099b,</div><div class='add'>+		0x0bdffc,</div><div class='add'>+		0x00000d,</div><div class='add'>+		0x00500f,</div><div class='add'>+</div><div class='add'>+		/* These writes happen separately in the vendor driver */</div><div class='add'>+		0x00d00f,</div><div class='add'>+		0x004c0f,</div><div class='add'>+		0x00540f,</div><div class='add'>+		0x00700f,</div><div class='add'>+		0x00500f,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	r = zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211b_al2230_init_hw(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	static const struct zd_ioreq16 ioreqs1[] = {</div><div class='add'>+		{ CR10,  0x89 }, { CR15,  0x20 },</div><div class='add'>+		{ CR17,  0x2B }, /* for newest(3rd cut) AL2230 */</div><div class='add'>+		{ CR23,  0x40 }, { CR24,  0x20 }, { CR26,  0x93 },</div><div class='add'>+		{ CR28,  0x3e }, { CR29,  0x00 },</div><div class='add'>+		{ CR33,  0x28 }, /* 5621 */</div><div class='add'>+		{ CR34,  0x30 },</div><div class='add'>+		{ CR35,  0x3e }, /* for newest(3rd cut) AL2230 */</div><div class='add'>+		{ CR41,  0x24 }, { CR44,  0x32 },</div><div class='add'>+		{ CR46,  0x99 }, /* for newest(3rd cut) AL2230 */</div><div class='add'>+		{ CR47,  0x1e },</div><div class='add'>+</div><div class='add'>+		/* ZD1211B 05.06.10 */</div><div class='add'>+		{ CR48,  0x00 }, { CR49,  0x00 }, { CR51,  0x01 },</div><div class='add'>+		{ CR52,  0x80 }, { CR53,  0x7e }, { CR65,  0x00 },</div><div class='add'>+		{ CR66,  0x00 }, { CR67,  0x00 }, { CR68,  0x00 },</div><div class='add'>+		{ CR69,  0x28 },</div><div class='add'>+</div><div class='add'>+		{ CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },</div><div class='add'>+		{ CR87,  0x0a }, { CR89,  0x04 },</div><div class='add'>+		{ CR91,  0x00 }, /* 5621 */</div><div class='add'>+		{ CR92,  0x0a },</div><div class='add'>+		{ CR98,  0x8d }, /* 4804,  for 1212 new algorithm */</div><div class='add'>+		{ CR99,  0x00 }, /* 5621 */</div><div class='add'>+		{ CR101, 0x13 }, { CR102, 0x27 },</div><div class='add'>+		{ CR106, 0x24 }, /* for newest(3rd cut) AL2230 */</div><div class='add'>+		{ CR107, 0x2a },</div><div class='add'>+		{ CR109, 0x13 }, /* 4804, for 1212 new algorithm */</div><div class='add'>+		{ CR110, 0x1f }, /* 4804, for 1212 new algorithm */</div><div class='add'>+		{ CR111, 0x1f }, { CR112, 0x1f }, { CR113, 0x27 },</div><div class='add'>+		{ CR114, 0x27 },</div><div class='add'>+		{ CR115, 0x26 }, /* 24-&gt;26 at 4902 for newest(3rd cut) AL2230 */</div><div class='add'>+		{ CR116, 0x24 },</div><div class='add'>+		{ CR117, 0xfa }, /* for 1211b */</div><div class='add'>+		{ CR118, 0xfa }, /* for 1211b */</div><div class='add'>+		{ CR119, 0x10 },</div><div class='add'>+		{ CR120, 0x4f },</div><div class='add'>+		{ CR121, 0x6c }, /* for 1211b */</div><div class='add'>+		{ CR122, 0xfc }, /* E0-&gt;FC at 4902 */</div><div class='add'>+		{ CR123, 0x57 }, /* 5623 */</div><div class='add'>+		{ CR125, 0xad }, /* 4804, for 1212 new algorithm */</div><div class='add'>+		{ CR126, 0x6c }, /* 5614 */</div><div class='add'>+		{ CR127, 0x03 }, /* 4804, for 1212 new algorithm */</div><div class='add'>+		{ CR137, 0x50 }, /* 5614 */</div><div class='add'>+		{ CR138, 0xa8 },</div><div class='add'>+		{ CR144, 0xac }, /* 5621 */</div><div class='add'>+		{ CR150, 0x0d }, { CR252, 0x00 }, { CR253, 0x00 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const u32 rv1[] = {</div><div class='add'>+		/* channel 1 */</div><div class='add'>+		0x03f790,</div><div class='add'>+		0x033331,</div><div class='add'>+		0x00000d,</div><div class='add'>+</div><div class='add'>+		0x0b3331,</div><div class='add'>+		0x03b812,</div><div class='add'>+		0x00fff3,</div><div class='add'>+		0x0005a4,</div><div class='add'>+		0x0f4dc5, /* fix freq shift 0x044dc5 */</div><div class='add'>+		0x0805b6,</div><div class='add'>+		0x0146c7,</div><div class='add'>+		0x000688,</div><div class='add'>+		0x0403b9, /* External control TX power (CR31) */</div><div class='add'>+		0x00dbba,</div><div class='add'>+		0x00099b,</div><div class='add'>+		0x0bdffc,</div><div class='add'>+		0x00000d,</div><div class='add'>+		0x00580f,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct zd_ioreq16 ioreqs2[] = {</div><div class='add'>+		{ CR47,  0x1e }, { CR_RFCFG, 0x03 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const u32 rv2[] = {</div><div class='add'>+		0x00880f,</div><div class='add'>+		0x00080f,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct zd_ioreq16 ioreqs3[] = {</div><div class='add'>+		{ CR_RFCFG, 0x00 }, { CR47, 0x1e }, { CR251, 0x7f },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const u32 rv3[] = {</div><div class='add'>+		0x00d80f,</div><div class='add'>+		0x00780f,</div><div class='add'>+		0x00580f,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct zd_ioreq16 ioreqs4[] = {</div><div class='add'>+		{ CR138, 0x28 }, { CR203, 0x06 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs1, ARRAY_SIZE(ioreqs1));</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = zd_rfwritev_locked(chip, rv1, ARRAY_SIZE(rv1), RF_RV_BITS);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs2, ARRAY_SIZE(ioreqs2));</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = zd_rfwritev_locked(chip, rv2, ARRAY_SIZE(rv2), RF_RV_BITS);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs3, ARRAY_SIZE(ioreqs3));</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	r = zd_rfwritev_locked(chip, rv3, ARRAY_SIZE(rv3), RF_RV_BITS);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs4, ARRAY_SIZE(ioreqs4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int al2230_set_channel(struct zd_rf *rf, u8 channel)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	const u32 *rv = al2230_table[channel-1];</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR138, 0x28 },</div><div class='add'>+		{ CR203, 0x06 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	r = zd_rfwritev_locked(chip, rv, 3, RF_RV_BITS);</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211_al2230_switch_radio_on(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR11,  0x00 },</div><div class='add'>+		{ CR251, 0x3f },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zd1211b_al2230_switch_radio_on(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR11,  0x00 },</div><div class='add'>+		{ CR251, 0x7f },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int al2230_switch_radio_off(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR11,  0x04 },</div><div class='add'>+		{ CR251, 0x2f },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rf_init_al2230(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	rf-&gt;set_channel = al2230_set_channel;</div><div class='add'>+	rf-&gt;switch_radio_off = al2230_switch_radio_off;</div><div class='add'>+	if (chip-&gt;is_zd1211b) {</div><div class='add'>+		rf-&gt;init_hw = zd1211b_al2230_init_hw;</div><div class='add'>+		rf-&gt;switch_radio_on = zd1211b_al2230_switch_radio_on;</div><div class='add'>+	} else {</div><div class='add'>+		rf-&gt;init_hw = zd1211_al2230_init_hw;</div><div class='add'>+		rf-&gt;switch_radio_on = zd1211_al2230_switch_radio_on;</div><div class='add'>+	}</div><div class='add'>+	rf-&gt;patch_6m_band_edge = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c<br/>new file mode 100644<br/>index 000000000000..58247271cc24<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_rf_rf2959.c</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/* zd_rf_rfmd.c: Functions for the RFMD RF controller</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_rf.h"</div><div class='add'>+#include "zd_usb.h"</div><div class='add'>+#include "zd_chip.h"</div><div class='add'>+</div><div class='add'>+static u32 rf2959_table[][2] = {</div><div class='add'>+	RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 4) = { 0x1819a9, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 5) = { 0x1819b9, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 6) = { 0x1819c9, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 7) = { 0x1819d9, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 8) = { 0x1819e9, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL( 9) = { 0x1819f9, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL(10) = { 0x181a09, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL(11) = { 0x181a19, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL(12) = { 0x181a29, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL(13) = { 0x181a39, 0x1e6666 },</div><div class='add'>+	RF_CHANNEL(14) = { 0x181a60, 0x1c0000 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+static int bits(u32 rw, int from, int to)</div><div class='add'>+{</div><div class='add'>+	rw &amp;= ~(0xffffffffU &lt;&lt; (to+1));</div><div class='add'>+	rw &gt;&gt;= from;</div><div class='add'>+	return rw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bit(u32 rw, int bit)</div><div class='add'>+{</div><div class='add'>+	return bits(rw, bit, bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_regwrite(u32 rw)</div><div class='add'>+{</div><div class='add'>+	int reg = bits(rw, 18, 22);</div><div class='add'>+	int rw_flag = bits(rw, 23, 23);</div><div class='add'>+	PDEBUG("rf2959 %#010x reg %d rw %d", rw, reg, rw_flag);</div><div class='add'>+</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case 0:</div><div class='add'>+		PDEBUG("reg0 CFG1 ref_sel %d hybernate %d rf_vco_reg_en %d"</div><div class='add'>+		       " if_vco_reg_en %d if_vga_en %d",</div><div class='add'>+		       bits(rw, 14, 15), bit(rw, 3), bit(rw, 2), bit(rw, 1),</div><div class='add'>+		       bit(rw, 0));</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		PDEBUG("reg1 IFPLL1 pll_en1 %d kv_en1 %d vtc_en1 %d lpf1 %d"</div><div class='add'>+		       " cpl1 %d pdp1 %d autocal_en1 %d ld_en1 %d ifloopr %d"</div><div class='add'>+		       " ifloopc %d dac1 %d",</div><div class='add'>+		       bit(rw, 17), bit(rw, 16), bit(rw, 15), bit(rw, 14),</div><div class='add'>+		       bit(rw, 13), bit(rw, 12), bit(rw, 11), bit(rw, 10),</div><div class='add'>+		       bits(rw, 7, 9), bits(rw, 4, 6), bits(rw, 0, 3));</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		PDEBUG("reg2 IFPLL2 n1 %d num1 %d",</div><div class='add'>+		       bits(rw, 6, 17), bits(rw, 0, 5));</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		PDEBUG("reg3 IFPLL3 num %d", bits(rw, 0, 17));</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		PDEBUG("reg4 IFPLL4 dn1 %#04x ct_def1 %d kv_def1 %d",</div><div class='add'>+		       bits(rw, 8, 16), bits(rw, 4, 7), bits(rw, 0, 3));</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		PDEBUG("reg5 RFPLL1 pll_en %d kv_en %d vtc_en %d lpf %d cpl %d"</div><div class='add'>+		       " pdp %d autocal_en %d ld_en %d rfloopr %d rfloopc %d"</div><div class='add'>+		       " dac %d",</div><div class='add'>+		       bit(rw, 17), bit(rw, 16), bit(rw, 15), bit(rw, 14),</div><div class='add'>+		       bit(rw, 13), bit(rw, 12), bit(rw, 11), bit(rw, 10),</div><div class='add'>+		       bits(rw, 7, 9), bits(rw, 4, 6), bits(rw, 0,3));</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		PDEBUG("reg6 RFPLL2 n %d num %d",</div><div class='add'>+		       bits(rw, 6, 17), bits(rw, 0, 5));</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		PDEBUG("reg7 RFPLL3 num2 %d", bits(rw, 0, 17));</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		PDEBUG("reg8 RFPLL4 dn %#06x ct_def %d kv_def %d",</div><div class='add'>+		       bits(rw, 8, 16), bits(rw, 4, 7), bits(rw, 0, 3));</div><div class='add'>+		break;</div><div class='add'>+	case 9:</div><div class='add'>+		PDEBUG("reg9 CAL1 tvco %d tlock %d m_ct_value %d ld_window %d",</div><div class='add'>+		       bits(rw, 13, 17), bits(rw, 8, 12), bits(rw, 3, 7),</div><div class='add'>+		       bits(rw, 0, 2));</div><div class='add'>+		break;</div><div class='add'>+	case 10:</div><div class='add'>+		PDEBUG("reg10 TXRX1 rxdcfbbyps %d pcontrol %d txvgc %d"</div><div class='add'>+		       " rxlpfbw %d txlpfbw %d txdiffmode %d txenmode %d"</div><div class='add'>+		       " intbiasen %d tybypass %d",</div><div class='add'>+		       bit(rw, 17), bits(rw, 15, 16), bits(rw, 10, 14),</div><div class='add'>+		       bits(rw, 7, 9), bits(rw, 4, 6), bit(rw, 3), bit(rw, 2),</div><div class='add'>+		       bit(rw, 1), bit(rw, 0));</div><div class='add'>+		break;</div><div class='add'>+	case 11:</div><div class='add'>+		PDEBUG("reg11 PCNT1 mid_bias %d p_desired %d pc_offset %d"</div><div class='add'>+			" tx_delay %d",</div><div class='add'>+			bits(rw, 15, 17), bits(rw, 9, 14), bits(rw, 3, 8),</div><div class='add'>+			bits(rw, 0, 2));</div><div class='add'>+		break;</div><div class='add'>+	case 12:</div><div class='add'>+		PDEBUG("reg12 PCNT2 max_power %d mid_power %d min_power %d",</div><div class='add'>+		       bits(rw, 12, 17), bits(rw, 6, 11), bits(rw, 0, 5));</div><div class='add'>+		break;</div><div class='add'>+	case 13:</div><div class='add'>+		PDEBUG("reg13 VCOT1 rfpll vco comp %d ifpll vco comp %d"</div><div class='add'>+		       " lobias %d if_biasbuf %d if_biasvco %d rf_biasbuf %d"</div><div class='add'>+		       " rf_biasvco %d",</div><div class='add'>+		       bit(rw, 17), bit(rw, 16), bit(rw, 15),</div><div class='add'>+		       bits(rw, 8, 9), bits(rw, 5, 7), bits(rw, 3, 4),</div><div class='add'>+		       bits(rw, 0, 2));</div><div class='add'>+		break;</div><div class='add'>+	case 14:</div><div class='add'>+		PDEBUG("reg14 IQCAL rx_acal %d rx_pcal %d"</div><div class='add'>+		       " tx_acal %d tx_pcal %d",</div><div class='add'>+		       bits(rw, 13, 17), bits(rw, 9, 12), bits(rw, 4, 8),</div><div class='add'>+		       bits(rw, 0, 3));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* 0 */</div><div class='add'>+</div><div class='add'>+static int rf2959_init_hw(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR2,   0x1E }, { CR9,   0x20 }, { CR10,  0x89 },</div><div class='add'>+		{ CR11,  0x00 }, { CR15,  0xD0 }, { CR17,  0x68 },</div><div class='add'>+		{ CR19,  0x4a }, { CR20,  0x0c }, { CR21,  0x0E },</div><div class='add'>+		{ CR23,  0x48 },</div><div class='add'>+		/* normal size for cca threshold */</div><div class='add'>+		{ CR24,  0x14 },</div><div class='add'>+		/* { CR24,  0x20 }, */</div><div class='add'>+		{ CR26,  0x90 }, { CR27,  0x30 }, { CR29,  0x20 },</div><div class='add'>+		{ CR31,  0xb2 }, { CR32,  0x43 }, { CR33,  0x28 },</div><div class='add'>+		{ CR38,  0x30 }, { CR34,  0x0f }, { CR35,  0xF0 },</div><div class='add'>+		{ CR41,  0x2a }, { CR46,  0x7F }, { CR47,  0x1E },</div><div class='add'>+		{ CR51,  0xc5 }, { CR52,  0xc5 }, { CR53,  0xc5 },</div><div class='add'>+		{ CR79,  0x58 }, { CR80,  0x30 }, { CR81,  0x30 },</div><div class='add'>+		{ CR82,  0x00 }, { CR83,  0x24 }, { CR84,  0x04 },</div><div class='add'>+		{ CR85,  0x00 }, { CR86,  0x10 }, { CR87,  0x2A },</div><div class='add'>+		{ CR88,  0x10 }, { CR89,  0x24 }, { CR90,  0x18 },</div><div class='add'>+		/* { CR91,  0x18 }, */</div><div class='add'>+		/* should solve continous CTS frame problems */</div><div class='add'>+		{ CR91,  0x00 },</div><div class='add'>+		{ CR92,  0x0a }, { CR93,  0x00 }, { CR94,  0x01 },</div><div class='add'>+		{ CR95,  0x00 }, { CR96,  0x40 }, { CR97,  0x37 },</div><div class='add'>+		{ CR98,  0x05 }, { CR99,  0x28 }, { CR100, 0x00 },</div><div class='add'>+		{ CR101, 0x13 }, { CR102, 0x27 }, { CR103, 0x27 },</div><div class='add'>+		{ CR104, 0x18 }, { CR105, 0x12 },</div><div class='add'>+		/* normal size */</div><div class='add'>+		{ CR106, 0x1a },</div><div class='add'>+		/* { CR106, 0x22 }, */</div><div class='add'>+		{ CR107, 0x24 }, { CR108, 0x0a }, { CR109, 0x13 },</div><div class='add'>+		{ CR110, 0x2F }, { CR111, 0x27 }, { CR112, 0x27 },</div><div class='add'>+		{ CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x40 },</div><div class='add'>+		{ CR116, 0x40 }, { CR117, 0xF0 }, { CR118, 0xF0 },</div><div class='add'>+		{ CR119, 0x16 },</div><div class='add'>+		/* no TX continuation */</div><div class='add'>+		{ CR122, 0x00 },</div><div class='add'>+		/* { CR122, 0xff }, */</div><div class='add'>+		{ CR127, 0x03 }, { CR131, 0x08 }, { CR138, 0x28 },</div><div class='add'>+		{ CR148, 0x44 }, { CR150, 0x10 }, { CR169, 0xBB },</div><div class='add'>+		{ CR170, 0xBB },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const u32 rv[] = {</div><div class='add'>+		0x000007,  /* REG0(CFG1) */</div><div class='add'>+		0x07dd43,  /* REG1(IFPLL1) */</div><div class='add'>+		0x080959,  /* REG2(IFPLL2) */</div><div class='add'>+		0x0e6666,</div><div class='add'>+		0x116a57,  /* REG4 */</div><div class='add'>+		0x17dd43,  /* REG5 */</div><div class='add'>+		0x1819f9,  /* REG6 */</div><div class='add'>+		0x1e6666,</div><div class='add'>+		0x214554,</div><div class='add'>+		0x25e7fa,</div><div class='add'>+		0x27fffa,</div><div class='add'>+		/* The Zydas driver somehow forgets to set this value. It's</div><div class='add'>+		 * only set for Japan. We are using internal power control</div><div class='add'>+		 * for now.</div><div class='add'>+		 */</div><div class='add'>+		0x294128, /* internal power */</div><div class='add'>+		/* 0x28252c, */ /* External control TX power */</div><div class='add'>+		/* CR31_CCK, CR51_6-36M, CR52_48M, CR53_54M */</div><div class='add'>+		0x2c0000,</div><div class='add'>+		0x300000,</div><div class='add'>+		0x340000,  /* REG13(0xD) */</div><div class='add'>+		0x381e0f,  /* REG14(0xE) */</div><div class='add'>+		/* Bogus, RF2959's data sheet doesn't know register 27, which is</div><div class='add'>+		 * actually referenced here. The commented 0x11 is 17.</div><div class='add'>+		 */</div><div class='add'>+		0x6c180f,  /* REG27(0x11) */</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	r = zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+</div><div class='add'>+	return zd_rfwritev_locked(chip, rv, ARRAY_SIZE(rv), RF_RV_BITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rf2959_set_channel(struct zd_rf *rf, u8 channel)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+	u32 *rv = rf2959_table[channel-1];</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		r = zd_rfwrite_locked(chip, rv[i], RF_RV_BITS);</div><div class='add'>+		if (r)</div><div class='add'>+			return r;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rf2959_switch_radio_on(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR10, 0x89 },</div><div class='add'>+		{ CR11, 0x00 },</div><div class='add'>+	};</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rf2959_switch_radio_off(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	static const struct zd_ioreq16 ioreqs[] = {</div><div class='add'>+		{ CR10, 0x15 },</div><div class='add'>+		{ CR11, 0x81 },</div><div class='add'>+	};</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_rf_init_rf2959(struct zd_rf *rf)</div><div class='add'>+{</div><div class='add'>+	struct zd_chip *chip = zd_rf_to_chip(rf);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;is_zd1211b) {</div><div class='add'>+		dev_err(zd_chip_dev(chip),</div><div class='add'>+		       "RF2959 is currently not supported for ZD1211B"</div><div class='add'>+		       " devices\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	rf-&gt;init_hw = rf2959_init_hw;</div><div class='add'>+	rf-&gt;set_channel = rf2959_set_channel;</div><div class='add'>+	rf-&gt;switch_radio_on = rf2959_switch_radio_on;</div><div class='add'>+	rf-&gt;switch_radio_off = rf2959_switch_radio_off;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_types.h b/drivers/net/wireless/zd1211rw/zd_types.h<br/>new file mode 100644<br/>index 000000000000..0155a1584ed3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_types.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_types.h</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+/* zd_types.h</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_TYPES_H</div><div class='add'>+#define _ZD_TYPES_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* We have three register spaces mapped into the overall USB address space of</div><div class='add'>+ * 64K words (16-bit values). There is the control register space of</div><div class='add'>+ * double-word registers, the eeprom register space and the firmware register</div><div class='add'>+ * space. The control register space is byte mapped, the others are word</div><div class='add'>+ * mapped.</div><div class='add'>+ *</div><div class='add'>+ * For that reason, we are using byte offsets for control registers and word</div><div class='add'>+ * offsets for everything else.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef u32 __nocast zd_addr_t;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ADDR_BASE_MASK		= 0xff000000,</div><div class='add'>+	ADDR_OFFSET_MASK	= 0x0000ffff,</div><div class='add'>+	ADDR_ZERO_MASK		= 0x00ff0000,</div><div class='add'>+	NULL_BASE		= 0x00000000,</div><div class='add'>+	USB_BASE		= 0x01000000,</div><div class='add'>+	CR_BASE			= 0x02000000,</div><div class='add'>+	CR_MAX_OFFSET		= 0x0b30,</div><div class='add'>+	E2P_BASE		= 0x03000000,</div><div class='add'>+	E2P_MAX_OFFSET		= 0x007e,</div><div class='add'>+	FW_BASE			= 0x04000000,</div><div class='add'>+	FW_MAX_OFFSET		= 0x0005,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ZD_ADDR_BASE(addr) ((u32)(addr) &amp; ADDR_BASE_MASK)</div><div class='add'>+#define ZD_OFFSET(addr) ((u32)(addr) &amp; ADDR_OFFSET_MASK)</div><div class='add'>+</div><div class='add'>+#define ZD_ADDR(base, offset) \</div><div class='add'>+	((zd_addr_t)(((base) &amp; ADDR_BASE_MASK) | ((offset) &amp; ADDR_OFFSET_MASK)))</div><div class='add'>+</div><div class='add'>+#define ZD_NULL_ADDR    ((zd_addr_t)0)</div><div class='add'>+#define USB_REG(offset)  ZD_ADDR(USB_BASE, offset)	/* word addressing */</div><div class='add'>+#define CTL_REG(offset)  ZD_ADDR(CR_BASE, offset)	/* byte addressing */</div><div class='add'>+#define E2P_REG(offset)  ZD_ADDR(E2P_BASE, offset)	/* word addressing */</div><div class='add'>+#define FW_REG(offset)   ZD_ADDR(FW_BASE, offset)	/* word addressing */</div><div class='add'>+</div><div class='add'>+static inline zd_addr_t zd_inc_word(zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	u32 base = ZD_ADDR_BASE(addr);</div><div class='add'>+	u32 offset = ZD_OFFSET(addr);</div><div class='add'>+</div><div class='add'>+	offset += base == CR_BASE ? 2 : 1;</div><div class='add'>+</div><div class='add'>+	return base | offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_TYPES_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c<br/>new file mode 100644<br/>index 000000000000..72f90525bf68<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_usb.c</a></div><div class='hunk'>@@ -0,0 +1,1310 @@</div><div class='add'>+/* zd_usb.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;net/ieee80211.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_netdev.h"</div><div class='add'>+#include "zd_mac.h"</div><div class='add'>+#include "zd_usb.h"</div><div class='add'>+#include "zd_util.h"</div><div class='add'>+</div><div class='add'>+static struct usb_device_id usb_ids[] = {</div><div class='add'>+	/* ZD1211 */</div><div class='add'>+	{ USB_DEVICE(0x0ace, 0x1211), .driver_info = DEVICE_ZD1211 },</div><div class='add'>+	{ USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211 },</div><div class='add'>+	{ USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },</div><div class='add'>+	{ USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },</div><div class='add'>+	{ USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },</div><div class='add'>+	{ USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },</div><div class='add'>+	/* ZD1211B */</div><div class='add'>+	{ USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },</div><div class='add'>+	{ USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("USB driver for devices with the ZD1211 chip.");</div><div class='add'>+MODULE_AUTHOR("Ulrich Kunitz");</div><div class='add'>+MODULE_AUTHOR("Daniel Drake");</div><div class='add'>+MODULE_VERSION("1.0");</div><div class='add'>+MODULE_DEVICE_TABLE(usb, usb_ids);</div><div class='add'>+</div><div class='add'>+#define FW_ZD1211_PREFIX	"zd1211/zd1211_"</div><div class='add'>+#define FW_ZD1211B_PREFIX	"zd1211/zd1211b_"</div><div class='add'>+</div><div class='add'>+/* register address handling */</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static int check_addr(struct zd_usb *usb, zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	u32 base = ZD_ADDR_BASE(addr);</div><div class='add'>+	u32 offset = ZD_OFFSET(addr);</div><div class='add'>+</div><div class='add'>+	if ((u32)addr &amp; ADDR_ZERO_MASK)</div><div class='add'>+		goto invalid_address;</div><div class='add'>+	switch (base) {</div><div class='add'>+	case USB_BASE:</div><div class='add'>+		break;</div><div class='add'>+	case CR_BASE:</div><div class='add'>+		if (offset &gt; CR_MAX_OFFSET) {</div><div class='add'>+			dev_dbg(zd_usb_dev(usb),</div><div class='add'>+				"CR offset %#010x larger than"</div><div class='add'>+				" CR_MAX_OFFSET %#10x\n",</div><div class='add'>+				offset, CR_MAX_OFFSET);</div><div class='add'>+			goto invalid_address;</div><div class='add'>+		}</div><div class='add'>+		if (offset &amp; 1) {</div><div class='add'>+			dev_dbg(zd_usb_dev(usb),</div><div class='add'>+				"CR offset %#010x is not a multiple of 2\n",</div><div class='add'>+				offset);</div><div class='add'>+			goto invalid_address;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case E2P_BASE:</div><div class='add'>+		if (offset &gt; E2P_MAX_OFFSET) {</div><div class='add'>+			dev_dbg(zd_usb_dev(usb),</div><div class='add'>+				"E2P offset %#010x larger than"</div><div class='add'>+				" E2P_MAX_OFFSET %#010x\n",</div><div class='add'>+				offset, E2P_MAX_OFFSET);</div><div class='add'>+			goto invalid_address;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case FW_BASE:</div><div class='add'>+		if (!usb-&gt;fw_base_offset) {</div><div class='add'>+			dev_dbg(zd_usb_dev(usb),</div><div class='add'>+			       "ERROR: fw base offset has not been set\n");</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+		if (offset &gt; FW_MAX_OFFSET) {</div><div class='add'>+			dev_dbg(zd_usb_dev(usb),</div><div class='add'>+				"FW offset %#10x is larger than"</div><div class='add'>+				" FW_MAX_OFFSET %#010x\n",</div><div class='add'>+				offset, FW_MAX_OFFSET);</div><div class='add'>+			goto invalid_address;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(zd_usb_dev(usb),</div><div class='add'>+			"address has unsupported base %#010x\n", addr);</div><div class='add'>+		goto invalid_address;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+invalid_address:</div><div class='add'>+	dev_dbg(zd_usb_dev(usb),</div><div class='add'>+		"ERROR: invalid address: %#010x\n", addr);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+static u16 usb_addr(struct zd_usb *usb, zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	u32 base;</div><div class='add'>+	u16 offset;</div><div class='add'>+</div><div class='add'>+	base = ZD_ADDR_BASE(addr);</div><div class='add'>+	offset = ZD_OFFSET(addr);</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(check_addr(usb, addr) == 0);</div><div class='add'>+</div><div class='add'>+	switch (base) {</div><div class='add'>+	case CR_BASE:</div><div class='add'>+		offset += CR_BASE_OFFSET;</div><div class='add'>+		break;</div><div class='add'>+	case E2P_BASE:</div><div class='add'>+		offset += E2P_BASE_OFFSET;</div><div class='add'>+		break;</div><div class='add'>+	case FW_BASE:</div><div class='add'>+		offset += usb-&gt;fw_base_offset;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* USB device initialization */</div><div class='add'>+</div><div class='add'>+static int request_fw_file(</div><div class='add'>+	const struct firmware **fw, const char *name, struct device *device)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(device, "fw name %s\n", name);</div><div class='add'>+</div><div class='add'>+	r = request_firmware(fw, name, device);</div><div class='add'>+	if (r)</div><div class='add'>+		dev_err(device,</div><div class='add'>+		       "Could not load firmware file %s. Error number %d\n",</div><div class='add'>+		       name, r);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 get_bcdDevice(const struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	return le16_to_cpu(udev-&gt;descriptor.bcdDevice);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum upload_code_flags {</div><div class='add'>+	REBOOT = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ensures that MAX_TRANSFER_SIZE is even. */</div><div class='add'>+#define MAX_TRANSFER_SIZE (USB_MAX_TRANSFER_SIZE &amp; ~1)</div><div class='add'>+</div><div class='add'>+static int upload_code(struct usb_device *udev,</div><div class='add'>+	const u8 *data, size_t size, u16 code_offset, int flags)</div><div class='add'>+{</div><div class='add'>+	u8 *p;</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	/* USB request blocks need "kmalloced" buffers.</div><div class='add'>+	 */</div><div class='add'>+	p = kmalloc(MAX_TRANSFER_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		dev_err(&amp;udev-&gt;dev, "out of memory\n");</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size &amp;= ~1;</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		size_t transfer_size = size &lt;= MAX_TRANSFER_SIZE ?</div><div class='add'>+			size : MAX_TRANSFER_SIZE;</div><div class='add'>+</div><div class='add'>+		dev_dbg_f(&amp;udev-&gt;dev, "transfer size %zu\n", transfer_size);</div><div class='add'>+</div><div class='add'>+		memcpy(p, data, transfer_size);</div><div class='add'>+		r = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			USB_REQ_FIRMWARE_DOWNLOAD,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_VENDOR,</div><div class='add'>+			code_offset, 0, p, transfer_size, 1000 /* ms */);</div><div class='add'>+		if (r &lt; 0) {</div><div class='add'>+			dev_err(&amp;udev-&gt;dev,</div><div class='add'>+			       "USB control request for firmware upload"</div><div class='add'>+			       " failed. Error number %d\n", r);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		transfer_size = r &amp; ~1;</div><div class='add'>+</div><div class='add'>+		size -= transfer_size;</div><div class='add'>+		data += transfer_size;</div><div class='add'>+		code_offset += transfer_size/sizeof(u16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; REBOOT) {</div><div class='add'>+		u8 ret;</div><div class='add'>+</div><div class='add'>+		r = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),</div><div class='add'>+			USB_REQ_FIRMWARE_CONFIRM,</div><div class='add'>+			USB_DIR_IN | USB_TYPE_VENDOR,</div><div class='add'>+			0, 0, &amp;ret, sizeof(ret), 5000 /* ms */);</div><div class='add'>+		if (r != sizeof(ret)) {</div><div class='add'>+			dev_err(&amp;udev-&gt;dev,</div><div class='add'>+				"control request firmeware confirmation failed."</div><div class='add'>+				" Return value %d\n", r);</div><div class='add'>+			if (r &gt;= 0)</div><div class='add'>+				r = -ENODEV;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		if (ret &amp; 0x80) {</div><div class='add'>+			dev_err(&amp;udev-&gt;dev,</div><div class='add'>+				"Internal error while downloading."</div><div class='add'>+				" Firmware confirm return value %#04x\n",</div><div class='add'>+				(unsigned int)ret);</div><div class='add'>+			r = -ENODEV;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		dev_dbg_f(&amp;udev-&gt;dev, "firmware confirm return value %#04x\n",</div><div class='add'>+			(unsigned int)ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = 0;</div><div class='add'>+error:</div><div class='add'>+	kfree(p);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 get_word(const void *data, u16 offset)</div><div class='add'>+{</div><div class='add'>+	const __le16 *p = data;</div><div class='add'>+	return le16_to_cpu(p[offset]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *get_fw_name(char *buffer, size_t size, u8 device_type,</div><div class='add'>+	               const char* postfix)</div><div class='add'>+{</div><div class='add'>+	scnprintf(buffer, size, "%s%s",</div><div class='add'>+		device_type == DEVICE_ZD1211B ?</div><div class='add'>+			FW_ZD1211B_PREFIX : FW_ZD1211_PREFIX,</div><div class='add'>+		postfix);</div><div class='add'>+	return buffer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int upload_firmware(struct usb_device *udev, u8 device_type)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	u16 fw_bcdDevice;</div><div class='add'>+	u16 bcdDevice;</div><div class='add'>+	const struct firmware *ub_fw = NULL;</div><div class='add'>+	const struct firmware *uph_fw = NULL;</div><div class='add'>+	char fw_name[128];</div><div class='add'>+</div><div class='add'>+	bcdDevice = get_bcdDevice(udev);</div><div class='add'>+</div><div class='add'>+	r = request_fw_file(&amp;ub_fw,</div><div class='add'>+		get_fw_name(fw_name, sizeof(fw_name), device_type,  "ub"),</div><div class='add'>+		&amp;udev-&gt;dev);</div><div class='add'>+	if (r)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	fw_bcdDevice = get_word(ub_fw-&gt;data, EEPROM_REGS_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* FIXME: do we have any reason to perform the kludge that the vendor</div><div class='add'>+	 * driver does when there is a version mismatch? (their driver uploads</div><div class='add'>+	 * different firmwares and stuff)</div><div class='add'>+	 */</div><div class='add'>+	if (fw_bcdDevice != bcdDevice) {</div><div class='add'>+		dev_info(&amp;udev-&gt;dev,</div><div class='add'>+			"firmware device id %#06x and actual device id "</div><div class='add'>+			"%#06x differ, continuing anyway\n",</div><div class='add'>+			fw_bcdDevice, bcdDevice);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg_f(&amp;udev-&gt;dev,</div><div class='add'>+			"firmware device id %#06x is equal to the "</div><div class='add'>+			"actual device id\n", fw_bcdDevice);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	r = request_fw_file(&amp;uph_fw,</div><div class='add'>+		get_fw_name(fw_name, sizeof(fw_name), device_type, "uphr"),</div><div class='add'>+		&amp;udev-&gt;dev);</div><div class='add'>+	if (r)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	r = upload_code(udev, uph_fw-&gt;data, uph_fw-&gt;size, FW_START_OFFSET,</div><div class='add'>+		        REBOOT);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(&amp;udev-&gt;dev,</div><div class='add'>+			"Could not upload firmware code uph. Error number %d\n",</div><div class='add'>+			r);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FALL-THROUGH */</div><div class='add'>+error:</div><div class='add'>+	release_firmware(ub_fw);</div><div class='add'>+	release_firmware(uph_fw);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disable_read_regs_int(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(in_interrupt());</div><div class='add'>+	spin_lock(&amp;intr-&gt;lock);</div><div class='add'>+	intr-&gt;read_regs_enabled = 0;</div><div class='add'>+	spin_unlock(&amp;intr-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define urb_dev(urb) (&amp;(urb)-&gt;dev-&gt;dev)</div><div class='add'>+</div><div class='add'>+static inline void handle_regs_int(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct zd_usb *usb = urb-&gt;context;</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(in_interrupt());</div><div class='add'>+	spin_lock(&amp;intr-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (intr-&gt;read_regs_enabled) {</div><div class='add'>+		intr-&gt;read_regs.length = len = urb-&gt;actual_length;</div><div class='add'>+</div><div class='add'>+		if (len &gt; sizeof(intr-&gt;read_regs.buffer))</div><div class='add'>+			len = sizeof(intr-&gt;read_regs.buffer);</div><div class='add'>+		memcpy(intr-&gt;read_regs.buffer, urb-&gt;transfer_buffer, len);</div><div class='add'>+		intr-&gt;read_regs_enabled = 0;</div><div class='add'>+		complete(&amp;intr-&gt;read_regs.completion);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(urb_dev(urb), "regs interrupt ignored\n");</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;intr-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void handle_retry_failed_int(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	dev_dbg_f(urb_dev(urb), "retry failed interrupt\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void int_urb_complete(struct urb *urb, struct pt_regs *pt_regs)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct usb_int_header *hdr;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+	case -EINVAL:</div><div class='add'>+	case -ENODEV:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+		goto kfree;</div><div class='add'>+	default:</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;actual_length &lt; sizeof(hdr)) {</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "error: urb %p to small\n", urb);</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdr = urb-&gt;transfer_buffer;</div><div class='add'>+	if (hdr-&gt;type != USB_INT_TYPE) {</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "error: urb %p wrong type\n", urb);</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (hdr-&gt;id) {</div><div class='add'>+	case USB_INT_ID_REGS:</div><div class='add'>+		handle_regs_int(urb);</div><div class='add'>+		break;</div><div class='add'>+	case USB_INT_ID_RETRY_FAILED:</div><div class='add'>+		handle_retry_failed_int(urb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "error: urb %p unknown id %x\n", urb,</div><div class='add'>+			(unsigned int)hdr-&gt;id);</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+resubmit:</div><div class='add'>+	r = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "resubmit urb %p\n", urb);</div><div class='add'>+		goto kfree;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+kfree:</div><div class='add'>+	kfree(urb-&gt;transfer_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int int_urb_interval(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	switch (udev-&gt;speed) {</div><div class='add'>+	case USB_SPEED_HIGH:</div><div class='add'>+		return 4;</div><div class='add'>+	case USB_SPEED_LOW:</div><div class='add'>+		return 10;</div><div class='add'>+	case USB_SPEED_FULL:</div><div class='add'>+	default:</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int usb_int_enabled(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;intr-&gt;lock, flags);</div><div class='add'>+	urb = intr-&gt;urb;</div><div class='add'>+	spin_unlock_irqrestore(&amp;intr-&gt;lock, flags);</div><div class='add'>+	return urb != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_enable_int(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+	void *transfer_buffer = NULL;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "\n");</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_NOFS);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!irqs_disabled());</div><div class='add'>+	spin_lock_irq(&amp;intr-&gt;lock);</div><div class='add'>+	if (intr-&gt;urb) {</div><div class='add'>+		spin_unlock_irq(&amp;intr-&gt;lock);</div><div class='add'>+		r = 0;</div><div class='add'>+		goto error_free_urb;</div><div class='add'>+	}</div><div class='add'>+	intr-&gt;urb = urb;</div><div class='add'>+	spin_unlock_irq(&amp;intr-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* TODO: make it a DMA buffer */</div><div class='add'>+	r = -ENOMEM;</div><div class='add'>+	transfer_buffer = kmalloc(USB_MAX_EP_INT_BUFFER, GFP_NOFS);</div><div class='add'>+	if (!transfer_buffer) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"couldn't allocate transfer_buffer\n");</div><div class='add'>+		goto error_set_urb_null;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udev = zd_usb_to_usbdev(usb);</div><div class='add'>+	usb_fill_int_urb(urb, udev, usb_rcvintpipe(udev, EP_INT_IN),</div><div class='add'>+			 transfer_buffer, USB_MAX_EP_INT_BUFFER,</div><div class='add'>+			 int_urb_complete, usb,</div><div class='add'>+			 intr-&gt;interval);</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "submit urb %p\n", intr-&gt;urb);</div><div class='add'>+	r = usb_submit_urb(urb, GFP_NOFS);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			 "Couldn't submit urb. Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	kfree(transfer_buffer);</div><div class='add'>+error_set_urb_null:</div><div class='add'>+	spin_lock_irq(&amp;intr-&gt;lock);</div><div class='add'>+	intr-&gt;urb = NULL;</div><div class='add'>+	spin_unlock_irq(&amp;intr-&gt;lock);</div><div class='add'>+error_free_urb:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_usb_disable_int(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;intr-&gt;lock, flags);</div><div class='add'>+	urb = intr-&gt;urb;</div><div class='add'>+	if (!urb) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;intr-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	intr-&gt;urb = NULL;</div><div class='add'>+	spin_unlock_irqrestore(&amp;intr-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	usb_kill_urb(urb);</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "urb %p killed\n", urb);</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_rx_packet(struct zd_usb *usb, const u8 *buffer,</div><div class='add'>+			     unsigned int length)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct zd_mac *mac = zd_usb_to_mac(usb);</div><div class='add'>+	const struct rx_length_info *length_info;</div><div class='add'>+</div><div class='add'>+	if (length &lt; sizeof(struct rx_length_info)) {</div><div class='add'>+		/* It's not a complete packet anyhow. */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	length_info = (struct rx_length_info *)</div><div class='add'>+		(buffer + length - sizeof(struct rx_length_info));</div><div class='add'>+</div><div class='add'>+	/* It might be that three frames are merged into a single URB</div><div class='add'>+	 * transaction. We have to check for the length info tag.</div><div class='add'>+	 *</div><div class='add'>+	 * While testing we discovered that length_info might be unaligned,</div><div class='add'>+	 * because if USB transactions are merged, the last packet will not</div><div class='add'>+	 * be padded. Unaligned access might also happen if the length_info</div><div class='add'>+	 * structure is not present.</div><div class='add'>+	 */</div><div class='add'>+	if (get_unaligned(&amp;length_info-&gt;tag) == RX_LENGTH_INFO_TAG) {</div><div class='add'>+		unsigned int l, k, n;</div><div class='add'>+		for (i = 0, l = 0;; i++) {</div><div class='add'>+			k = le16_to_cpu(get_unaligned(</div><div class='add'>+				&amp;length_info-&gt;length[i]));</div><div class='add'>+			n = l+k;</div><div class='add'>+			if (n &gt; length)</div><div class='add'>+				return;</div><div class='add'>+			zd_mac_rx(mac, buffer+l, k);</div><div class='add'>+			if (i &gt;= 2)</div><div class='add'>+				return;</div><div class='add'>+			l = (n+3) &amp; ~3;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		zd_mac_rx(mac, buffer, length);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rx_urb_complete(struct urb *urb, struct pt_regs *pt_regs)</div><div class='add'>+{</div><div class='add'>+	struct zd_usb *usb;</div><div class='add'>+	struct zd_usb_rx *rx;</div><div class='add'>+	const u8 *buffer;</div><div class='add'>+	unsigned int length;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+	case -EINVAL:</div><div class='add'>+	case -ENODEV:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb-&gt;status);</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer = urb-&gt;transfer_buffer;</div><div class='add'>+	length = urb-&gt;actual_length;</div><div class='add'>+	usb = urb-&gt;context;</div><div class='add'>+	rx = &amp;usb-&gt;rx;</div><div class='add'>+</div><div class='add'>+	if (length%rx-&gt;usb_packet_size &gt; rx-&gt;usb_packet_size-4) {</div><div class='add'>+		/* If there is an old first fragment, we don't care. */</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "*** first fragment ***\n");</div><div class='add'>+		ZD_ASSERT(length &lt;= ARRAY_SIZE(rx-&gt;fragment));</div><div class='add'>+		spin_lock(&amp;rx-&gt;lock);</div><div class='add'>+		memcpy(rx-&gt;fragment, buffer, length);</div><div class='add'>+		rx-&gt;fragment_length = length;</div><div class='add'>+		spin_unlock(&amp;rx-&gt;lock);</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;rx-&gt;lock);</div><div class='add'>+	if (rx-&gt;fragment_length &gt; 0) {</div><div class='add'>+		/* We are on a second fragment, we believe */</div><div class='add'>+		ZD_ASSERT(length + rx-&gt;fragment_length &lt;=</div><div class='add'>+			  ARRAY_SIZE(rx-&gt;fragment));</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "*** second fragment ***\n");</div><div class='add'>+		memcpy(rx-&gt;fragment+rx-&gt;fragment_length, buffer, length);</div><div class='add'>+		handle_rx_packet(usb, rx-&gt;fragment,</div><div class='add'>+			         rx-&gt;fragment_length + length);</div><div class='add'>+		rx-&gt;fragment_length = 0;</div><div class='add'>+		spin_unlock(&amp;rx-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock(&amp;rx-&gt;lock);</div><div class='add'>+		handle_rx_packet(usb, buffer, length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+resubmit:</div><div class='add'>+	usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct urb *alloc_urb(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = zd_usb_to_usbdev(usb);</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	void *buffer;</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_NOFS);</div><div class='add'>+	if (!urb)</div><div class='add'>+		return NULL;</div><div class='add'>+	buffer = usb_buffer_alloc(udev, USB_MAX_RX_SIZE, GFP_NOFS,</div><div class='add'>+		                  &amp;urb-&gt;transfer_dma);</div><div class='add'>+	if (!buffer) {</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(urb, udev, usb_rcvbulkpipe(udev, EP_DATA_IN),</div><div class='add'>+		          buffer, USB_MAX_RX_SIZE,</div><div class='add'>+			  rx_urb_complete, usb);</div><div class='add'>+	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+</div><div class='add'>+	return urb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_urb(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	if (!urb)</div><div class='add'>+		return;</div><div class='add'>+	usb_buffer_free(urb-&gt;dev, urb-&gt;transfer_buffer_length,</div><div class='add'>+		        urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_enable_rx(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	int i, r;</div><div class='add'>+	struct zd_usb_rx *rx = &amp;usb-&gt;rx;</div><div class='add'>+	struct urb **urbs;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "\n");</div><div class='add'>+</div><div class='add'>+	r = -ENOMEM;</div><div class='add'>+	urbs = kcalloc(URBS_COUNT, sizeof(struct urb *), GFP_NOFS);</div><div class='add'>+	if (!urbs)</div><div class='add'>+		goto error;</div><div class='add'>+	for (i = 0; i &lt; URBS_COUNT; i++) {</div><div class='add'>+		urbs[i] = alloc_urb(usb);</div><div class='add'>+		if (!urbs[i])</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(!irqs_disabled());</div><div class='add'>+	spin_lock_irq(&amp;rx-&gt;lock);</div><div class='add'>+	if (rx-&gt;urbs) {</div><div class='add'>+		spin_unlock_irq(&amp;rx-&gt;lock);</div><div class='add'>+		r = 0;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	rx-&gt;urbs = urbs;</div><div class='add'>+	rx-&gt;urbs_count = URBS_COUNT;</div><div class='add'>+	spin_unlock_irq(&amp;rx-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; URBS_COUNT; i++) {</div><div class='add'>+		r = usb_submit_urb(urbs[i], GFP_NOFS);</div><div class='add'>+		if (r)</div><div class='add'>+			goto error_submit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error_submit:</div><div class='add'>+	for (i = 0; i &lt; URBS_COUNT; i++) {</div><div class='add'>+		usb_kill_urb(urbs[i]);</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irq(&amp;rx-&gt;lock);</div><div class='add'>+	rx-&gt;urbs = NULL;</div><div class='add'>+	rx-&gt;urbs_count = 0;</div><div class='add'>+	spin_unlock_irq(&amp;rx-&gt;lock);</div><div class='add'>+error:</div><div class='add'>+	if (urbs) {</div><div class='add'>+		for (i = 0; i &lt; URBS_COUNT; i++)</div><div class='add'>+			free_urb(urbs[i]);</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_usb_disable_rx(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct urb **urbs;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	struct zd_usb_rx *rx = &amp;usb-&gt;rx;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rx-&gt;lock, flags);</div><div class='add'>+	urbs = rx-&gt;urbs;</div><div class='add'>+	count = rx-&gt;urbs_count;</div><div class='add'>+	spin_unlock_irqrestore(&amp;rx-&gt;lock, flags);</div><div class='add'>+	if (!urbs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		usb_kill_urb(urbs[i]);</div><div class='add'>+		free_urb(urbs[i]);</div><div class='add'>+	}</div><div class='add'>+	kfree(urbs);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rx-&gt;lock, flags);</div><div class='add'>+	rx-&gt;urbs = NULL;</div><div class='add'>+	rx-&gt;urbs_count = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;rx-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tx_urb_complete(struct urb *urb, struct pt_regs *pt_regs)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+	case -EINVAL:</div><div class='add'>+	case -ENODEV:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb-&gt;status);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb-&gt;status);</div><div class='add'>+		goto resubmit;</div><div class='add'>+	}</div><div class='add'>+free_urb:</div><div class='add'>+	usb_buffer_free(urb-&gt;dev, urb-&gt;transfer_buffer_length,</div><div class='add'>+		        urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+	return;</div><div class='add'>+resubmit:</div><div class='add'>+	r = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(urb_dev(urb), "error resubmit urb %p %d\n", urb, r);</div><div class='add'>+		goto free_urb;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Puts the frame on the USB endpoint. It doesn't wait for</div><div class='add'>+ * completion. The frame must contain the control set.</div><div class='add'>+ */</div><div class='add'>+int zd_usb_tx(struct zd_usb *usb, const u8 *frame, unsigned int length)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct usb_device *udev = zd_usb_to_usbdev(usb);</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	void *buffer;</div><div class='add'>+</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer = usb_buffer_alloc(zd_usb_to_usbdev(usb), length, GFP_ATOMIC,</div><div class='add'>+		                  &amp;urb-&gt;transfer_dma);</div><div class='add'>+	if (!buffer) {</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto error_free_urb;</div><div class='add'>+	}</div><div class='add'>+	memcpy(buffer, frame, length);</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(urb, udev, usb_sndbulkpipe(udev, EP_DATA_OUT),</div><div class='add'>+		          buffer, length, tx_urb_complete, NULL);</div><div class='add'>+	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+</div><div class='add'>+	r = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (r)</div><div class='add'>+		goto error;</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	usb_buffer_free(zd_usb_to_usbdev(usb), length, buffer,</div><div class='add'>+		        urb-&gt;transfer_dma);</div><div class='add'>+error_free_urb:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+out:</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void init_usb_interrupt(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;intr-&gt;lock);</div><div class='add'>+	intr-&gt;interval = int_urb_interval(zd_usb_to_usbdev(usb));</div><div class='add'>+	init_completion(&amp;intr-&gt;read_regs.completion);</div><div class='add'>+	intr-&gt;read_regs.cr_int_addr = cpu_to_le16(usb_addr(usb, CR_INTERRUPT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void init_usb_rx(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	struct zd_usb_rx *rx = &amp;usb-&gt;rx;</div><div class='add'>+	spin_lock_init(&amp;rx-&gt;lock);</div><div class='add'>+	if (interface_to_usbdev(usb-&gt;intf)-&gt;speed == USB_SPEED_HIGH) {</div><div class='add'>+		rx-&gt;usb_packet_size = 512;</div><div class='add'>+	} else {</div><div class='add'>+		rx-&gt;usb_packet_size = 64;</div><div class='add'>+	}</div><div class='add'>+	ZD_ASSERT(rx-&gt;fragment_length == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void init_usb_tx(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: at this point we will allocate a fixed number of urb's for</div><div class='add'>+	 * use in a cyclic scheme */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_usb_init(struct zd_usb *usb, struct net_device *netdev,</div><div class='add'>+	         struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	memset(usb, 0, sizeof(*usb));</div><div class='add'>+	usb-&gt;intf = usb_get_intf(intf);</div><div class='add'>+	usb_set_intfdata(usb-&gt;intf, netdev);</div><div class='add'>+	init_usb_interrupt(usb);</div><div class='add'>+	init_usb_tx(usb);</div><div class='add'>+	init_usb_rx(usb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_init_hw(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct zd_chip *chip = zd_usb_to_chip(usb);</div><div class='add'>+</div><div class='add'>+	ZD_ASSERT(mutex_is_locked(&amp;chip-&gt;mutex));</div><div class='add'>+	r = zd_ioread16_locked(chip, &amp;usb-&gt;fw_base_offset,</div><div class='add'>+		        USB_REG((u16)FW_BASE_ADDR_OFFSET));</div><div class='add'>+	if (r)</div><div class='add'>+		return r;</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "fw_base_offset: %#06hx\n",</div><div class='add'>+		 usb-&gt;fw_base_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_usb_clear(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	usb_set_intfdata(usb-&gt;intf, NULL);</div><div class='add'>+	usb_put_intf(usb-&gt;intf);</div><div class='add'>+	memset(usb, 0, sizeof(*usb));</div><div class='add'>+	/* FIXME: usb_interrupt, usb_tx, usb_rx? */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *speed(enum usb_device_speed speed)</div><div class='add'>+{</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case USB_SPEED_LOW:</div><div class='add'>+		return "low";</div><div class='add'>+	case USB_SPEED_FULL:</div><div class='add'>+		return "full";</div><div class='add'>+	case USB_SPEED_HIGH:</div><div class='add'>+		return "high";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown speed";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int scnprint_id(struct usb_device *udev, char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buffer, size, "%04hx:%04hx v%04hx %s",</div><div class='add'>+		le16_to_cpu(udev-&gt;descriptor.idVendor),</div><div class='add'>+		le16_to_cpu(udev-&gt;descriptor.idProduct),</div><div class='add'>+		get_bcdDevice(udev),</div><div class='add'>+		speed(udev-&gt;speed));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_scnprint_id(struct zd_usb *usb, char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(usb-&gt;intf);</div><div class='add'>+	return scnprint_id(udev, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static void print_id(struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	char buffer[40];</div><div class='add'>+</div><div class='add'>+	scnprint_id(udev, buffer, sizeof(buffer));</div><div class='add'>+	buffer[sizeof(buffer)-1] = 0;</div><div class='add'>+	dev_dbg_f(&amp;udev-&gt;dev, "%s\n", buffer);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define print_id(udev) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct net_device *netdev = NULL;</div><div class='add'>+</div><div class='add'>+	print_id(udev);</div><div class='add'>+</div><div class='add'>+	switch (udev-&gt;speed) {</div><div class='add'>+	case USB_SPEED_LOW:</div><div class='add'>+	case USB_SPEED_FULL:</div><div class='add'>+	case USB_SPEED_HIGH:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg_f(&amp;intf-&gt;dev, "Unknown USB speed\n");</div><div class='add'>+		r = -ENODEV;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev = zd_netdev_alloc(intf);</div><div class='add'>+	if (netdev == NULL) {</div><div class='add'>+		r = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = upload_firmware(udev, id-&gt;driver_info);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+		       "couldn't load firmware. Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = usb_reset_configuration(udev);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(&amp;intf-&gt;dev,</div><div class='add'>+			"couldn't reset configuration. Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* At this point the interrupt endpoint is not generally enabled. We</div><div class='add'>+	 * save the USB bandwidth until the network device is opened. But</div><div class='add'>+	 * notify that the initialization of the MAC will require the</div><div class='add'>+	 * interrupts to be temporary enabled.</div><div class='add'>+	 */</div><div class='add'>+	r = zd_mac_init_hw(zd_netdev_mac(netdev), id-&gt;driver_info);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(&amp;intf-&gt;dev,</div><div class='add'>+		         "couldn't initialize mac. Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = register_netdev(netdev);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(&amp;intf-&gt;dev,</div><div class='add'>+			 "couldn't register netdev. Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(&amp;intf-&gt;dev, "successful\n");</div><div class='add'>+	dev_info(&amp;intf-&gt;dev,"%s\n", netdev-&gt;name);</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	usb_reset_device(interface_to_usbdev(intf));</div><div class='add'>+	zd_netdev_free(netdev);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = zd_intf_to_netdev(intf);</div><div class='add'>+	struct zd_mac *mac = zd_netdev_mac(netdev);</div><div class='add'>+	struct zd_usb *usb = &amp;mac-&gt;chip.usb;</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "\n");</div><div class='add'>+</div><div class='add'>+	zd_netdev_disconnect(netdev);</div><div class='add'>+</div><div class='add'>+	/* Just in case something has gone wrong! */</div><div class='add'>+	zd_usb_disable_rx(usb);</div><div class='add'>+	zd_usb_disable_int(usb);</div><div class='add'>+</div><div class='add'>+	/* If the disconnect has been caused by a removal of the</div><div class='add'>+	 * driver module, the reset allows reloading of the driver. If the</div><div class='add'>+	 * reset will not be executed here, the upload of the firmware in the</div><div class='add'>+	 * probe function caused by the reloading of the driver will fail.</div><div class='add'>+	 */</div><div class='add'>+	usb_reset_device(interface_to_usbdev(intf));</div><div class='add'>+</div><div class='add'>+	/* If somebody still waits on this lock now, this is an error. */</div><div class='add'>+	zd_netdev_free(netdev);</div><div class='add'>+	dev_dbg(&amp;intf-&gt;dev, "disconnected\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver driver = {</div><div class='add'>+	.name		= "zd1211rw",</div><div class='add'>+	.id_table	= usb_ids,</div><div class='add'>+	.probe		= probe,</div><div class='add'>+	.disconnect	= disconnect,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init usb_init(void)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+</div><div class='add'>+	pr_debug("usb_init()\n");</div><div class='add'>+</div><div class='add'>+	r = usb_register(&amp;driver);</div><div class='add'>+	if (r) {</div><div class='add'>+		printk(KERN_ERR "usb_register() failed. Error number %d\n", r);</div><div class='add'>+		return r;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("zd1211rw initialized\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit usb_exit(void)</div><div class='add'>+{</div><div class='add'>+	pr_debug("usb_exit()\n");</div><div class='add'>+	usb_deregister(&amp;driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(usb_init);</div><div class='add'>+module_exit(usb_exit);</div><div class='add'>+</div><div class='add'>+static int usb_int_regs_length(unsigned int count)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct usb_int_regs) + count * sizeof(struct reg_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void prepare_read_regs_int(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;intr-&gt;lock);</div><div class='add'>+	intr-&gt;read_regs_enabled = 1;</div><div class='add'>+	INIT_COMPLETION(intr-&gt;read_regs.completion);</div><div class='add'>+	spin_unlock(&amp;intr-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_results(struct zd_usb *usb, u16 *values,</div><div class='add'>+	               struct usb_req_read_regs *req, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	int i;</div><div class='add'>+	struct zd_usb_interrupt *intr = &amp;usb-&gt;intr;</div><div class='add'>+	struct read_regs_int *rr = &amp;intr-&gt;read_regs;</div><div class='add'>+	struct usb_int_regs *regs = (struct usb_int_regs *)rr-&gt;buffer;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;intr-&gt;lock);</div><div class='add'>+</div><div class='add'>+	r = -EIO;</div><div class='add'>+	/* The created block size seems to be larger than expected.</div><div class='add'>+	 * However results appear to be correct.</div><div class='add'>+	 */</div><div class='add'>+	if (rr-&gt;length &lt; usb_int_regs_length(count)) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			 "error: actual length %d less than expected %d\n",</div><div class='add'>+			 rr-&gt;length, usb_int_regs_length(count));</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+	if (rr-&gt;length &gt; sizeof(rr-&gt;buffer)) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			 "error: actual length %d exceeds buffer size %zu\n",</div><div class='add'>+			 rr-&gt;length, sizeof(rr-&gt;buffer));</div><div class='add'>+		goto error_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		struct reg_data *rd = &amp;regs-&gt;regs[i];</div><div class='add'>+		if (rd-&gt;addr != req-&gt;addr[i]) {</div><div class='add'>+			dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+				 "rd[%d] addr %#06hx expected %#06hx\n", i,</div><div class='add'>+				 le16_to_cpu(rd-&gt;addr),</div><div class='add'>+				 le16_to_cpu(req-&gt;addr[i]));</div><div class='add'>+			goto error_unlock;</div><div class='add'>+		}</div><div class='add'>+		values[i] = le16_to_cpu(rd-&gt;value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = 0;</div><div class='add'>+error_unlock:</div><div class='add'>+	spin_unlock(&amp;intr-&gt;lock);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,</div><div class='add'>+	             const zd_addr_t *addresses, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	int i, req_len, actual_req_len;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct usb_req_read_regs *req = NULL;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	if (count &lt; 1) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb), "error: count is zero\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (count &gt; USB_MAX_IOREAD16_COUNT) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			 "error: count %u exceeds possible max %u\n",</div><div class='add'>+			 count, USB_MAX_IOREAD16_COUNT);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (in_atomic()) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			 "error: io in atomic context not supported\n");</div><div class='add'>+		return -EWOULDBLOCK;</div><div class='add'>+	}</div><div class='add'>+	if (!usb_int_enabled(usb)) {</div><div class='add'>+		 dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			  "error: usb interrupt not enabled\n");</div><div class='add'>+		return -EWOULDBLOCK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_len = sizeof(struct usb_req_read_regs) + count * sizeof(__le16);</div><div class='add'>+	req = kmalloc(req_len, GFP_NOFS);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	req-&gt;id = cpu_to_le16(USB_REQ_READ_REGS);</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		req-&gt;addr[i] = cpu_to_le16(usb_addr(usb, addresses[i]));</div><div class='add'>+</div><div class='add'>+	udev = zd_usb_to_usbdev(usb);</div><div class='add'>+	prepare_read_regs_int(usb);</div><div class='add'>+	r = usb_bulk_msg(udev, usb_sndbulkpipe(udev, EP_REGS_OUT),</div><div class='add'>+		         req, req_len, &amp;actual_req_len, 1000 /* ms */);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error in usb_bulk_msg(). Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (req_len != actual_req_len) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb), "error in usb_bulk_msg()\n"</div><div class='add'>+			" req_len %d != actual_req_len %d\n",</div><div class='add'>+			req_len, actual_req_len);</div><div class='add'>+		r = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timeout = wait_for_completion_timeout(&amp;usb-&gt;intr.read_regs.completion,</div><div class='add'>+	                                      msecs_to_jiffies(1000));</div><div class='add'>+	if (!timeout) {</div><div class='add'>+		disable_read_regs_int(usb);</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb), "read timed out\n");</div><div class='add'>+		r = -ETIMEDOUT;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r = get_results(usb, values, req, count);</div><div class='add'>+error:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,</div><div class='add'>+	              unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct usb_req_write_regs *req = NULL;</div><div class='add'>+	int i, req_len, actual_req_len;</div><div class='add'>+</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (count &gt; USB_MAX_IOWRITE16_COUNT) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error: count %u exceeds possible max %u\n",</div><div class='add'>+			count, USB_MAX_IOWRITE16_COUNT);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (in_atomic()) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error: io in atomic context not supported\n");</div><div class='add'>+		return -EWOULDBLOCK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req_len = sizeof(struct usb_req_write_regs) +</div><div class='add'>+		  count * sizeof(struct reg_data);</div><div class='add'>+	req = kmalloc(req_len, GFP_NOFS);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	req-&gt;id = cpu_to_le16(USB_REQ_WRITE_REGS);</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		struct reg_data *rw  = &amp;req-&gt;reg_writes[i];</div><div class='add'>+		rw-&gt;addr = cpu_to_le16(usb_addr(usb, ioreqs[i].addr));</div><div class='add'>+		rw-&gt;value = cpu_to_le16(ioreqs[i].value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udev = zd_usb_to_usbdev(usb);</div><div class='add'>+	r = usb_bulk_msg(udev, usb_sndbulkpipe(udev, EP_REGS_OUT),</div><div class='add'>+		         req, req_len, &amp;actual_req_len, 1000 /* ms */);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error in usb_bulk_msg(). Error number %d\n", r);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (req_len != actual_req_len) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error in usb_bulk_msg()"</div><div class='add'>+			" req_len %d != actual_req_len %d\n",</div><div class='add'>+			req_len, actual_req_len);</div><div class='add'>+		r = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FALL-THROUGH with r == 0 */</div><div class='add'>+error:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits)</div><div class='add'>+{</div><div class='add'>+	int r;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct usb_req_rfwrite *req = NULL;</div><div class='add'>+	int i, req_len, actual_req_len;</div><div class='add'>+	u16 bit_value_template;</div><div class='add'>+</div><div class='add'>+	if (in_atomic()) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error: io in atomic context not supported\n");</div><div class='add'>+		return -EWOULDBLOCK;</div><div class='add'>+	}</div><div class='add'>+	if (bits &lt; USB_MIN_RFWRITE_BIT_COUNT) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error: bits %d are smaller than"</div><div class='add'>+			" USB_MIN_RFWRITE_BIT_COUNT %d\n",</div><div class='add'>+			bits, USB_MIN_RFWRITE_BIT_COUNT);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (bits &gt; USB_MAX_RFWRITE_BIT_COUNT) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error: bits %d exceed USB_MAX_RFWRITE_BIT_COUNT %d\n",</div><div class='add'>+			bits, USB_MAX_RFWRITE_BIT_COUNT);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	if (value &amp; (~0UL &lt;&lt; bits)) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error: value %#09x has bits &gt;= %d set\n",</div><div class='add'>+			value, bits);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+	dev_dbg_f(zd_usb_dev(usb), "value %#09x bits %d\n", value, bits);</div><div class='add'>+</div><div class='add'>+	r = zd_usb_ioread16(usb, &amp;bit_value_template, CR203);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error %d: Couldn't read CR203\n", r);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	bit_value_template &amp;= ~(RF_IF_LE|RF_CLK|RF_DATA);</div><div class='add'>+</div><div class='add'>+	req_len = sizeof(struct usb_req_rfwrite) + bits * sizeof(__le16);</div><div class='add'>+	req = kmalloc(req_len, GFP_NOFS);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	req-&gt;id = cpu_to_le16(USB_REQ_WRITE_RF);</div><div class='add'>+	/* 1: 3683a, but not used in ZYDAS driver */</div><div class='add'>+	req-&gt;value = cpu_to_le16(2);</div><div class='add'>+	req-&gt;bits = cpu_to_le16(bits);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bits; i++) {</div><div class='add'>+		u16 bv = bit_value_template;</div><div class='add'>+		if (value &amp; (1 &lt;&lt; (bits-1-i)))</div><div class='add'>+			bv |= RF_DATA;</div><div class='add'>+		req-&gt;bit_values[i] = cpu_to_le16(bv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	udev = zd_usb_to_usbdev(usb);</div><div class='add'>+	r = usb_bulk_msg(udev, usb_sndbulkpipe(udev, EP_REGS_OUT),</div><div class='add'>+		         req, req_len, &amp;actual_req_len, 1000 /* ms */);</div><div class='add'>+	if (r) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb),</div><div class='add'>+			"error in usb_bulk_msg(). Error number %d\n", r);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (req_len != actual_req_len) {</div><div class='add'>+		dev_dbg_f(zd_usb_dev(usb), "error in usb_bulk_msg()"</div><div class='add'>+			" req_len %d != actual_req_len %d\n",</div><div class='add'>+			req_len, actual_req_len);</div><div class='add'>+		r = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FALL-THROUGH with r == 0 */</div><div class='add'>+out:</div><div class='add'>+	kfree(req);</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h<br/>new file mode 100644<br/>index 000000000000..d6420283bd5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_usb.h</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+/* zd_usb.h: Header for USB interface implemented by ZD1211 chip</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ZD_USB_H</div><div class='add'>+#define _ZD_USB_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_types.h"</div><div class='add'>+</div><div class='add'>+enum devicetype {</div><div class='add'>+	DEVICE_ZD1211  = 0,</div><div class='add'>+	DEVICE_ZD1211B = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum endpoints {</div><div class='add'>+	EP_CTRL	    = 0,</div><div class='add'>+	EP_DATA_OUT = 1,</div><div class='add'>+	EP_DATA_IN  = 2,</div><div class='add'>+	EP_INT_IN   = 3,</div><div class='add'>+	EP_REGS_OUT = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	USB_MAX_TRANSFER_SIZE		= 4096, /* bytes */</div><div class='add'>+	/* FIXME: The original driver uses this value. We have to check,</div><div class='add'>+	 * whether the MAX_TRANSFER_SIZE is sufficient and this needs only be</div><div class='add'>+	 * used if one combined frame is split over two USB transactions.</div><div class='add'>+	 */</div><div class='add'>+	USB_MAX_RX_SIZE			= 4800, /* bytes */</div><div class='add'>+	USB_MAX_IOWRITE16_COUNT		= 15,</div><div class='add'>+	USB_MAX_IOWRITE32_COUNT		= USB_MAX_IOWRITE16_COUNT/2,</div><div class='add'>+	USB_MAX_IOREAD16_COUNT		= 15,</div><div class='add'>+	USB_MAX_IOREAD32_COUNT		= USB_MAX_IOREAD16_COUNT/2,</div><div class='add'>+	USB_MIN_RFWRITE_BIT_COUNT	= 16,</div><div class='add'>+	USB_MAX_RFWRITE_BIT_COUNT	= 28,</div><div class='add'>+	USB_MAX_EP_INT_BUFFER		= 64,</div><div class='add'>+	USB_ZD1211B_BCD_DEVICE		= 0x4810,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum control_requests {</div><div class='add'>+	USB_REQ_WRITE_REGS		= 0x21,</div><div class='add'>+	USB_REQ_READ_REGS		= 0x22,</div><div class='add'>+	USB_REQ_WRITE_RF		= 0x23,</div><div class='add'>+	USB_REQ_PROG_FLASH		= 0x24,</div><div class='add'>+	USB_REQ_EEPROM_START		= 0x0128, /* ? request is a byte */</div><div class='add'>+	USB_REQ_EEPROM_MID		= 0x28,</div><div class='add'>+	USB_REQ_EEPROM_END		= 0x0228, /* ? request is a byte */</div><div class='add'>+	USB_REQ_FIRMWARE_DOWNLOAD	= 0x30,</div><div class='add'>+	USB_REQ_FIRMWARE_CONFIRM	= 0x31,</div><div class='add'>+	USB_REQ_FIRMWARE_READ_DATA	= 0x32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct usb_req_read_regs {</div><div class='add'>+	__le16 id;</div><div class='add'>+	__le16 addr[0];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct reg_data {</div><div class='add'>+	__le16 addr;</div><div class='add'>+	__le16 value;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct usb_req_write_regs {</div><div class='add'>+	__le16 id;</div><div class='add'>+	struct reg_data reg_writes[0];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RF_IF_LE = 0x02,</div><div class='add'>+	RF_CLK   = 0x04,</div><div class='add'>+	RF_DATA	 = 0x08,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct usb_req_rfwrite {</div><div class='add'>+	__le16 id;</div><div class='add'>+	__le16 value;</div><div class='add'>+	/* 1: 3683a */</div><div class='add'>+	/* 2: other (default) */</div><div class='add'>+	__le16 bits;</div><div class='add'>+	/* RF2595: 24 */</div><div class='add'>+	__le16 bit_values[0];</div><div class='add'>+	/* (CR203 &amp; ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+/* USB interrupt */</div><div class='add'>+</div><div class='add'>+enum usb_int_id {</div><div class='add'>+	USB_INT_TYPE			= 0x01,</div><div class='add'>+	USB_INT_ID_REGS			= 0x90,</div><div class='add'>+	USB_INT_ID_RETRY_FAILED		= 0xa0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum usb_int_flags {</div><div class='add'>+	USB_INT_READ_REGS_EN		= 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct usb_int_header {</div><div class='add'>+	u8 type;	/* must always be 1 */</div><div class='add'>+	u8 id;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct usb_int_regs {</div><div class='add'>+	struct usb_int_header hdr;</div><div class='add'>+	struct reg_data regs[0];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct usb_int_retry_fail {</div><div class='add'>+	struct usb_int_header hdr;</div><div class='add'>+	u8 new_rate;</div><div class='add'>+	u8 _dummy;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u8 ibss_wakeup_dest;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct read_regs_int {</div><div class='add'>+	struct completion completion;</div><div class='add'>+	/* Stores the USB int structure and contains the USB address of the</div><div class='add'>+	 * first requested register before request.</div><div class='add'>+	 */</div><div class='add'>+	u8 buffer[USB_MAX_EP_INT_BUFFER];</div><div class='add'>+	int length;</div><div class='add'>+	__le16 cr_int_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_ioreq16 {</div><div class='add'>+	zd_addr_t addr;</div><div class='add'>+	u16 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_ioreq32 {</div><div class='add'>+	zd_addr_t addr;</div><div class='add'>+	u32 value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_usb_interrupt {</div><div class='add'>+	struct read_regs_int read_regs;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	int interval;</div><div class='add'>+	u8 read_regs_enabled:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct usb_int_regs *get_read_regs(struct zd_usb_interrupt *intr)</div><div class='add'>+{</div><div class='add'>+	return (struct usb_int_regs *)intr-&gt;read_regs.buffer;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define URBS_COUNT 5</div><div class='add'>+</div><div class='add'>+struct zd_usb_rx {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	u8 fragment[2*USB_MAX_RX_SIZE];</div><div class='add'>+	unsigned int fragment_length;</div><div class='add'>+	unsigned int usb_packet_size;</div><div class='add'>+	struct urb **urbs;</div><div class='add'>+	int urbs_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct zd_usb_tx {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Contains the usb parts. The structure doesn't require a lock, because intf</div><div class='add'>+ * and fw_base_offset, will not be changed after initialization.</div><div class='add'>+ */</div><div class='add'>+struct zd_usb {</div><div class='add'>+	struct zd_usb_interrupt intr;</div><div class='add'>+	struct zd_usb_rx rx;</div><div class='add'>+	struct zd_usb_tx tx;</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+	u16 fw_base_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define zd_usb_dev(usb) (&amp;usb-&gt;intf-&gt;dev)</div><div class='add'>+</div><div class='add'>+static inline struct usb_device *zd_usb_to_usbdev(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	return interface_to_usbdev(usb-&gt;intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_device *zd_intf_to_netdev(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	return usb_get_intfdata(intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct net_device *zd_usb_to_netdev(struct zd_usb *usb)</div><div class='add'>+{</div><div class='add'>+	return zd_intf_to_netdev(usb-&gt;intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_usb_init(struct zd_usb *usb, struct net_device *netdev,</div><div class='add'>+	         struct usb_interface *intf);</div><div class='add'>+int zd_usb_init_hw(struct zd_usb *usb);</div><div class='add'>+void zd_usb_clear(struct zd_usb *usb);</div><div class='add'>+</div><div class='add'>+int zd_usb_scnprint_id(struct zd_usb *usb, char *buffer, size_t size);</div><div class='add'>+</div><div class='add'>+int zd_usb_enable_int(struct zd_usb *usb);</div><div class='add'>+void zd_usb_disable_int(struct zd_usb *usb);</div><div class='add'>+</div><div class='add'>+int zd_usb_enable_rx(struct zd_usb *usb);</div><div class='add'>+void zd_usb_disable_rx(struct zd_usb *usb);</div><div class='add'>+</div><div class='add'>+int zd_usb_tx(struct zd_usb *usb, const u8 *frame, unsigned int length);</div><div class='add'>+</div><div class='add'>+int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,</div><div class='add'>+	         const zd_addr_t *addresses, unsigned int count);</div><div class='add'>+</div><div class='add'>+static inline int zd_usb_ioread16(struct zd_usb *usb, u16 *value,</div><div class='add'>+	                      const zd_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	return zd_usb_ioread16v(usb, value, (const zd_addr_t *)&amp;addr, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,</div><div class='add'>+	              unsigned int count);</div><div class='add'>+</div><div class='add'>+int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits);</div><div class='add'>+</div><div class='add'>+#endif /* _ZD_USB_H */</div><div class='head'>diff --git a/drivers/net/wireless/zd1211rw/zd_util.c b/drivers/net/wireless/zd1211rw/zd_util.c<br/>new file mode 100644<br/>index 000000000000..d20036c15d11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_util.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_util.c</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/* zd_util.c</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ *</div><div class='add'>+ * Utility program</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "zd_def.h"</div><div class='add'>+#include "zd_util.h"</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+static char hex(u8 v)</div><div class='add'>+{</div><div class='add'>+	v &amp;= 0xf;</div><div class='add'>+	return (v &lt; 10 ? '0' : 'a' - 10) + v;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char hex_print(u8 c)</div><div class='add'>+{</div><div class='add'>+	return (0x20 &lt;= c &amp;&amp; c &lt; 0x7f) ? c : '.';</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_line(const u8 *bytes, size_t size)</div><div class='add'>+{</div><div class='add'>+	char c;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	size = size &lt;= 8 ? size : 8;</div><div class='add'>+	printk(KERN_DEBUG "zd1211 %p ", bytes);</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 1:</div><div class='add'>+		case 5:</div><div class='add'>+			c = '.';</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			c = ':';</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			c = ' ';</div><div class='add'>+		}</div><div class='add'>+		if (i &lt; size) {</div><div class='add'>+			printk("%c%c%c", hex(bytes[i] &gt;&gt; 4), hex(bytes[i]), c);</div><div class='add'>+		} else {</div><div class='add'>+			printk("  %c", c);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		printk("%c", hex_print(bytes[i]));</div><div class='add'>+	printk("\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void zd_hexdump(const void *bytes, size_t size)</div><div class='add'>+{</div><div class='add'>+	size_t i = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		dump_line((u8 *)bytes + i, size-i);</div><div class='add'>+		i += 8;</div><div class='add'>+	} while (i &lt; size);</div><div class='add'>+}</div><div class='add'>+#endif /* DEBUG */</div><div class='add'>+</div><div class='add'>+void *zd_tail(const void *buffer, size_t buffer_size, size_t tail_size)</div><div class='add'>+{</div><div class='add'>+	if (buffer_size &lt; tail_size)</div><div class='add'>+		return NULL;</div><div class='add'>+	return (u8 *)buffer + (buffer_size - tail_size);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/w1/w1_io.h b/drivers/net/wireless/zd1211rw/zd_util.h<br/>index 232860184a29..ce26f7adea92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_io.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_io.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/wireless/zd1211rw/zd_util.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/wireless/zd1211rw/zd_util.h</a></div><div class='hunk'>@@ -1,8 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- *	w1_io.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;</div><div class='del'>- *</div><div class='add'>+/* zd_util.h</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -19,21 +15,15 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifndef __W1_IO_H</div><div class='del'>-#define __W1_IO_H</div><div class='add'>+#ifndef _ZD_UTIL_H</div><div class='add'>+#define _ZD_UTIL_H</div><div class='ctx'> </div><div class='del'>-#include "w1.h"</div><div class='add'>+void *zd_tail(const void *buffer, size_t buffer_size, size_t tail_size);</div><div class='ctx'> </div><div class='del'>-void w1_delay(unsigned long);</div><div class='del'>-u8 w1_touch_bit(struct w1_master *, int);</div><div class='del'>-u8 w1_triplet(struct w1_master *dev, int bdir);</div><div class='del'>-void w1_write_8(struct w1_master *, u8);</div><div class='del'>-u8 w1_read_8(struct w1_master *);</div><div class='del'>-int w1_reset_bus(struct w1_master *);</div><div class='del'>-u8 w1_calc_crc8(u8 *, int);</div><div class='del'>-void w1_write_block(struct w1_master *, const u8 *, int);</div><div class='del'>-u8 w1_read_block(struct w1_master *, u8 *, int);</div><div class='del'>-void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb);</div><div class='del'>-int w1_reset_select_slave(struct w1_slave *sl);</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+void zd_hexdump(const void *bytes, size_t size);</div><div class='add'>+#else</div><div class='add'>+#define zd_hexdump(bytes, size)</div><div class='add'>+#endif /* DEBUG */</div><div class='ctx'> </div><div class='del'>-#endif /* __W1_IO_H */</div><div class='add'>+#endif /* _ZD_UTIL_H */</div><div class='head'>diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c<br/>index fd0f43b7db5b..8459a18254a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/yellowfin.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/yellowfin.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/yellowfin.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/yellowfin.c</a></div><div class='hunk'>@@ -19,37 +19,13 @@</div><div class='ctx'> </div><div class='ctx'> 	Support and updates available at</div><div class='ctx'> 	http://www.scyld.com/network/yellowfin.html</div><div class='add'>+	[link no longer provides useful info -jgarzik]</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	Linux kernel changelog:</div><div class='del'>-	-----------------------</div><div class='del'>-</div><div class='del'>-	LK1.1.1 (jgarzik): Port to 2.4 kernel</div><div class='del'>-</div><div class='del'>-	LK1.1.2 (jgarzik):</div><div class='del'>-	* Merge in becker version 1.05</div><div class='del'>-</div><div class='del'>-	LK1.1.3 (jgarzik):</div><div class='del'>-	* Various cleanups</div><div class='del'>-	* Update yellowfin_timer to correctly calculate duplex.</div><div class='del'>-	(suggested by Manfred Spraul)</div><div class='del'>-</div><div class='del'>-	LK1.1.4 (val@nmt.edu):</div><div class='del'>-	* Fix three endian-ness bugs</div><div class='del'>-	* Support dual function SYM53C885E ethernet chip</div><div class='del'>-	</div><div class='del'>-	LK1.1.5 (val@nmt.edu):</div><div class='del'>-	* Fix forced full-duplex bug I introduced</div><div class='del'>-</div><div class='del'>-	LK1.1.6 (val@nmt.edu):</div><div class='del'>-	* Only print warning on truly "oversized" packets</div><div class='del'>-	* Fix theoretical bug on gigabit cards - return to 1.1.3 behavior</div><div class='del'>-	</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"yellowfin"</div><div class='del'>-#define DRV_VERSION	"1.05+LK1.1.6"</div><div class='del'>-#define DRV_RELDATE	"Feb 11, 2002"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='add'>+#define DRV_RELDATE	"Jun 27, 2006"</div><div class='ctx'> </div><div class='ctx'> #define PFX DRV_NAME ": "</div><div class='ctx'> </div><div class='hunk'>@@ -234,26 +210,16 @@ See Packet Engines confidential appendix (prototype chips only).</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-enum pci_id_flags_bits {</div><div class='del'>-	/* Set PCI command register bits before calling probe1(). */</div><div class='del'>-	PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4,</div><div class='del'>-	/* Read and map the single following PCI BAR. */</div><div class='del'>-	PCI_ADDR0=0&lt;&lt;4, PCI_ADDR1=1&lt;&lt;4, PCI_ADDR2=2&lt;&lt;4, PCI_ADDR3=3&lt;&lt;4,</div><div class='del'>-	PCI_ADDR_64BITS=0x100, PCI_NO_ACPI_WAKE=0x200, PCI_NO_MIN_LATENCY=0x400,</div><div class='del'>-	PCI_UNUSED_IRQ=0x800,</div><div class='del'>-};</div><div class='ctx'> enum capability_flags {</div><div class='ctx'> 	HasMII=1, FullTxStatus=2, IsGigabit=4, HasMulticastBug=8, FullRxStatus=16,</div><div class='ctx'> 	HasMACAddrBug=32, /* Only on early revs.  */</div><div class='ctx'> 	DontUseEeprom=64, /* Don't read the MAC from the EEPROm. */</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> /* The PCI I/O space extent. */</div><div class='del'>-#define YELLOWFIN_SIZE 0x100</div><div class='del'>-#ifdef USE_IO_OPS</div><div class='del'>-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_IO  | PCI_ADDR0)</div><div class='del'>-#else</div><div class='del'>-#define PCI_IOTYPE (PCI_USES_MASTER | PCI_USES_MEM | PCI_ADDR1)</div><div class='del'>-#endif</div><div class='add'>+enum {</div><div class='add'>+	YELLOWFIN_SIZE	= 0x100,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct pci_id_info {</div><div class='ctx'>         const char *name;</div><div class='hunk'>@@ -261,24 +227,21 @@ struct pci_id_info {</div><div class='ctx'>                 int     pci, pci_mask, subsystem, subsystem_mask;</div><div class='ctx'>                 int revision, revision_mask;                            /* Only 8 bits. */</div><div class='ctx'>         } id;</div><div class='del'>-        enum pci_id_flags_bits pci_flags;</div><div class='del'>-        int io_size;                            /* Needed for I/O region check or ioremap(). */</div><div class='ctx'>         int drv_flags;                          /* Driver use, intended as capability flags. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_id_info pci_id_tbl[] = {</div><div class='ctx'> 	{"Yellowfin G-NIC Gigabit Ethernet", { 0x07021000, 0xffffffff},</div><div class='del'>-	 PCI_IOTYPE, YELLOWFIN_SIZE,</div><div class='ctx'> 	 FullTxStatus | IsGigabit | HasMulticastBug | HasMACAddrBug | DontUseEeprom},</div><div class='ctx'> 	{"Symbios SYM83C885", { 0x07011000, 0xffffffff},</div><div class='del'>-	 PCI_IOTYPE, YELLOWFIN_SIZE, HasMII | DontUseEeprom },</div><div class='del'>-	{NULL,},</div><div class='add'>+	  HasMII | DontUseEeprom },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id yellowfin_pci_tbl[] = {</div><div class='add'>+static const struct pci_device_id yellowfin_pci_tbl[] = {</div><div class='ctx'> 	{ 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='ctx'> 	{ 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },</div><div class='del'>-	{ 0, }</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE (pci, yellowfin_pci_tbl);</div><div class='ctx'> </div><div class='hunk'>@@ -616,7 +579,7 @@ static int yellowfin_open(struct net_device *dev)</div><div class='ctx'> 	/* Reset the chip. */</div><div class='ctx'> 	iowrite32(0x80000000, ioaddr + DMACtrl);</div><div class='ctx'> </div><div class='del'>-	i = request_irq(dev-&gt;irq, &amp;yellowfin_interrupt, SA_SHIRQ, dev-&gt;name, dev);</div><div class='add'>+	i = request_irq(dev-&gt;irq, &amp;yellowfin_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='ctx'> 	if (i) return i;</div><div class='ctx'> </div><div class='ctx'> 	if (yellowfin_debug &gt; 1)</div><div class='hunk'>@@ -862,13 +825,11 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		/* Fix GX chipset errata. */</div><div class='ctx'> 		if (cacheline_end &gt; 24  || cacheline_end == 0) {</div><div class='ctx'> 			len = skb-&gt;len + 32 - cacheline_end + 1;</div><div class='del'>-			if (len != skb-&gt;len)</div><div class='del'>-				skb = skb_padto(skb, len);</div><div class='del'>-		}</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			yp-&gt;tx_skbuff[entry] = NULL;</div><div class='del'>-			netif_wake_queue(dev);</div><div class='del'>-			return 0;</div><div class='add'>+			if (skb_padto(skb, len)) {</div><div class='add'>+				yp-&gt;tx_skbuff[entry] = NULL;</div><div class='add'>+				netif_wake_queue(dev);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	yp-&gt;tx_skbuff[entry] = skb;</div><div class='head'>diff --git a/drivers/net/znet.c b/drivers/net/znet.c<br/>index 3ac047bc727d..9f0291f35290 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/znet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/znet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/znet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/znet.c</a></div><div class='hunk'>@@ -85,7 +85,6 @@</div><div class='ctx'>    - Understand why some traffic patterns add a 1s latency...</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -544,8 +543,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		printk(KERN_DEBUG "%s: ZNet_send_packet.\n", dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (length &lt; ETH_ZLEN) {</div><div class='del'>-		skb = skb_padto(skb, ETH_ZLEN);</div><div class='del'>-		if (skb == NULL)</div><div class='add'>+		if (skb_padto(skb, ETH_ZLEN))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		length = ETH_ZLEN;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c<br/>index 8037e5806d0a..df04e050c647 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/net/zorro8390.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/net/zorro8390.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/net/zorro8390.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/net/zorro8390.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ static int __devinit zorro8390_init(struct net_device *dev,</div><div class='ctx'>     dev-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='ctx'> </div><div class='ctx'>     /* Install the Interrupt handler */</div><div class='del'>-    i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, DRV_NAME, dev);</div><div class='add'>+    i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, IRQF_SHARED, DRV_NAME, dev);</div><div class='ctx'>     if (i) return i;</div><div class='ctx'> </div><div class='ctx'>     for(i = 0; i &lt; ETHER_ADDR_LEN; i++) {</div><div class='head'>diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c<br/>index 14cbe34eb897..3a0a3a734933 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/nubus/nubus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/nubus/nubus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/nubus/nubus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/nubus/nubus.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *      and others.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/nubus/nubus_syms.c b/drivers/nubus/nubus_syms.c<br/>index 22c1dc9f87b3..9204f04fbf0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/nubus/nubus_syms.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/nubus/nubus_syms.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/nubus/nubus_syms.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/nubus/nubus_syms.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> </div><div class='ctx'>    (c) 1999 David Huggins-Daines &lt;dhd@debian.org&gt; */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/nubus.h&gt;</div><div class='head'>diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c<br/>index b2e8e49c8659..43e521e99126 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/oprofile/buffer_sync.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/buffer_sync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/oprofile/buffer_sync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/oprofile/buffer_sync.c</a></div><div class='hunk'>@@ -108,10 +108,10 @@ static int module_load_notify(struct notifier_block * self, unsigned long val, v</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: should we process all CPU buffers ? */</div><div class='del'>-	down(&amp;buffer_sem);</div><div class='add'>+	mutex_lock(&amp;buffer_mutex);</div><div class='ctx'> 	add_event_entry(ESCAPE_CODE);</div><div class='ctx'> 	add_event_entry(MODULE_LOADED_CODE);</div><div class='del'>-	up(&amp;buffer_sem);</div><div class='add'>+	mutex_unlock(&amp;buffer_mutex);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -501,7 +501,7 @@ void sync_buffer(int cpu)</div><div class='ctx'> 	sync_buffer_state state = sb_buffer_start;</div><div class='ctx'> 	unsigned long available;</div><div class='ctx'> </div><div class='del'>-	down(&amp;buffer_sem);</div><div class='add'>+	mutex_lock(&amp;buffer_mutex);</div><div class='ctx'>  </div><div class='ctx'> 	add_cpu_switch(cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -550,5 +550,5 @@ void sync_buffer(int cpu)</div><div class='ctx'> </div><div class='ctx'> 	mark_done(cpu);</div><div class='ctx'> </div><div class='del'>-	up(&amp;buffer_sem);</div><div class='add'>+	mutex_unlock(&amp;buffer_mutex);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c<br/>index b80318f03420..04d641714d34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/oprofile/event_buffer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/event_buffer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/oprofile/event_buffer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/oprofile/event_buffer.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> #include "event_buffer.h"</div><div class='ctx'> #include "oprofile_stats.h"</div><div class='ctx'> </div><div class='del'>-DECLARE_MUTEX(buffer_sem);</div><div class='add'>+DEFINE_MUTEX(buffer_mutex);</div><div class='ctx'>  </div><div class='ctx'> static unsigned long buffer_opened;</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(buffer_wait);</div><div class='hunk'>@@ -32,7 +32,7 @@ static unsigned long * event_buffer;</div><div class='ctx'> static unsigned long buffer_size;</div><div class='ctx'> static unsigned long buffer_watershed;</div><div class='ctx'> static size_t buffer_pos;</div><div class='del'>-/* atomic_t because wait_event checks it outside of buffer_sem */</div><div class='add'>+/* atomic_t because wait_event checks it outside of buffer_mutex */</div><div class='ctx'> static atomic_t buffer_ready = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> /* Add an entry to the event buffer. When we</div><div class='hunk'>@@ -60,10 +60,10 @@ void add_event_entry(unsigned long value)</div><div class='ctx'>  */</div><div class='ctx'> void wake_up_buffer_waiter(void)</div><div class='ctx'> {</div><div class='del'>-	down(&amp;buffer_sem);</div><div class='add'>+	mutex_lock(&amp;buffer_mutex);</div><div class='ctx'> 	atomic_set(&amp;buffer_ready, 1);</div><div class='ctx'> 	wake_up(&amp;buffer_wait);</div><div class='del'>-	up(&amp;buffer_sem);</div><div class='add'>+	mutex_unlock(&amp;buffer_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'>  </div><div class='hunk'>@@ -162,7 +162,7 @@ static ssize_t event_buffer_read(struct file * file, char __user * buf,</div><div class='ctx'> 	if (!atomic_read(&amp;buffer_ready))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	down(&amp;buffer_sem);</div><div class='add'>+	mutex_lock(&amp;buffer_mutex);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;buffer_ready, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -177,7 +177,7 @@ static ssize_t event_buffer_read(struct file * file, char __user * buf,</div><div class='ctx'> 	buffer_pos = 0;</div><div class='ctx'>  </div><div class='ctx'> out:</div><div class='del'>-	up(&amp;buffer_sem);</div><div class='add'>+	mutex_unlock(&amp;buffer_mutex);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='head'>diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h<br/>index 018023630599..92416276e577 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/oprofile/event_buffer.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/event_buffer.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/oprofile/event_buffer.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/oprofile/event_buffer.h</a></div><div class='hunk'>@@ -11,7 +11,7 @@</div><div class='ctx'> #define EVENT_BUFFER_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt; </div><div class='del'>-#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;asm/mutex.h&gt;</div><div class='ctx'>  </div><div class='ctx'> int alloc_event_buffer(void);</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +46,6 @@ extern struct file_operations event_buffer_fops;</div><div class='ctx'> /* mutex between sync_cpu_buffers() and the</div><div class='ctx'>  * file reading code.</div><div class='ctx'>  */</div><div class='del'>-extern struct semaphore buffer_sem;</div><div class='add'>+extern struct mutex buffer_mutex;</div><div class='ctx'>  </div><div class='ctx'> #endif /* EVENT_BUFFER_H */</div><div class='head'>diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c<br/>index b3f1cd6a24c1..e5162a64018b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/oprofile/oprof.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/oprof.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/oprofile/oprof.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/oprofile/oprof.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/oprofile.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;asm/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "oprof.h"</div><div class='ctx'> #include "event_buffer.h"</div><div class='hunk'>@@ -25,7 +25,7 @@ struct oprofile_operations oprofile_ops;</div><div class='ctx'> unsigned long oprofile_started;</div><div class='ctx'> unsigned long backtrace_depth;</div><div class='ctx'> static unsigned long is_setup;</div><div class='del'>-static DECLARE_MUTEX(start_sem);</div><div class='add'>+static DEFINE_MUTEX(start_mutex);</div><div class='ctx'> </div><div class='ctx'> /* timer</div><div class='ctx'>    0 - use performance monitoring hardware if available</div><div class='hunk'>@@ -37,7 +37,7 @@ int oprofile_setup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'>  </div><div class='del'>-	down(&amp;start_sem);</div><div class='add'>+	mutex_lock(&amp;start_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if ((err = alloc_cpu_buffers()))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -57,7 +57,7 @@ int oprofile_setup(void)</div><div class='ctx'> 		goto out3;</div><div class='ctx'> </div><div class='ctx'> 	is_setup = 1;</div><div class='del'>-	up(&amp;start_sem);</div><div class='add'>+	mutex_unlock(&amp;start_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'>  </div><div class='ctx'> out3:</div><div class='hunk'>@@ -68,7 +68,7 @@ out2:</div><div class='ctx'> out1:</div><div class='ctx'> 	free_cpu_buffers();</div><div class='ctx'> out:</div><div class='del'>-	up(&amp;start_sem);</div><div class='add'>+	mutex_unlock(&amp;start_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -78,7 +78,7 @@ int oprofile_start(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'>  </div><div class='del'>-	down(&amp;start_sem);</div><div class='add'>+	mutex_lock(&amp;start_mutex);</div><div class='ctx'>  </div><div class='ctx'> 	if (!is_setup)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -95,7 +95,7 @@ int oprofile_start(void)</div><div class='ctx'> </div><div class='ctx'> 	oprofile_started = 1;</div><div class='ctx'> out:</div><div class='del'>-	up(&amp;start_sem); </div><div class='add'>+	mutex_unlock(&amp;start_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -103,7 +103,7 @@ out:</div><div class='ctx'> /* echo 0&gt;/dev/oprofile/enable */</div><div class='ctx'> void oprofile_stop(void)</div><div class='ctx'> {</div><div class='del'>-	down(&amp;start_sem);</div><div class='add'>+	mutex_lock(&amp;start_mutex);</div><div class='ctx'> 	if (!oprofile_started)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	oprofile_ops.stop();</div><div class='hunk'>@@ -111,20 +111,20 @@ void oprofile_stop(void)</div><div class='ctx'> 	/* wake up the daemon to read what remains */</div><div class='ctx'> 	wake_up_buffer_waiter();</div><div class='ctx'> out:</div><div class='del'>-	up(&amp;start_sem);</div><div class='add'>+	mutex_unlock(&amp;start_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> void oprofile_shutdown(void)</div><div class='ctx'> {</div><div class='del'>-	down(&amp;start_sem);</div><div class='add'>+	mutex_lock(&amp;start_mutex);</div><div class='ctx'> 	sync_stop();</div><div class='ctx'> 	if (oprofile_ops.shutdown)</div><div class='ctx'> 		oprofile_ops.shutdown();</div><div class='ctx'> 	is_setup = 0;</div><div class='ctx'> 	free_event_buffer();</div><div class='ctx'> 	free_cpu_buffers();</div><div class='del'>-	up(&amp;start_sem);</div><div class='add'>+	mutex_unlock(&amp;start_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -132,7 +132,7 @@ int oprofile_set_backtrace(unsigned long val)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	down(&amp;start_sem);</div><div class='add'>+	mutex_lock(&amp;start_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (oprofile_started) {</div><div class='ctx'> 		err = -EBUSY;</div><div class='hunk'>@@ -147,7 +147,7 @@ int oprofile_set_backtrace(unsigned long val)</div><div class='ctx'> 	backtrace_depth = val;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	up(&amp;start_sem);</div><div class='add'>+	mutex_unlock(&amp;start_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c<br/>index b62da9b0cbf0..71c2da277d6e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/oprofile/oprofilefs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/oprofile/oprofilefs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/oprofile/oprofilefs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/oprofile/oprofilefs.c</a></div><div class='hunk'>@@ -272,10 +272,10 @@ static int oprofilefs_fill_super(struct super_block * sb, void * data, int silen</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct super_block *oprofilefs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int oprofilefs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, oprofilefs_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, oprofilefs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig<br/>index 3f5de867acd7..1d3b84b4af3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/Kconfig</a></div><div class='hunk'>@@ -140,18 +140,37 @@ config CHASSIS_LCD_LED</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> config PDC_CHASSIS</div><div class='del'>-	bool "PDC chassis State Panel support"</div><div class='add'>+	bool "PDC chassis state codes support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you want to enable support for the LED State front</div><div class='del'>-	  panel as found on E class, and support for the GSP Virtual Front</div><div class='del'>-	  Panel (LED State and message logging)  as found on high end</div><div class='del'>-	  servers such as A, L and N-class.</div><div class='del'>-	  </div><div class='del'>-	  This has nothing to do with Chassis LCD and LED support.</div><div class='add'>+	  Say Y here if you want to enable support for Chassis codes.</div><div class='add'>+	  That includes support for LED State front panel as found on E</div><div class='add'>+	  class, and support for the GSP Virtual Front Panel (LED State and</div><div class='add'>+	  message logging)  as found on high end servers such as A, L and</div><div class='add'>+	  N-class.</div><div class='add'>+	  This driver will also display progress messages on LCD display,</div><div class='add'>+	  such as "INI", "RUN" and "FLT", and might thus clobber messages</div><div class='add'>+	  shown by the LED/LCD driver.</div><div class='add'>+	  This driver updates the state panel (LED and/or LCD) upon system</div><div class='add'>+	  state change (eg: boot, shutdown or panic).</div><div class='ctx'> 	  </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+config PDC_CHASSIS_WARN</div><div class='add'>+	bool "PDC chassis warnings support"</div><div class='add'>+	depends on PROC_FS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to enable support for Chassis warnings.</div><div class='add'>+	  This will add a proc entry '/proc/chassis' giving some information</div><div class='add'>+	  about the overall health state of the system.</div><div class='add'>+	  This includes NVRAM battery level, overtemp or failures such as</div><div class='add'>+	  fans or power units.</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> config PDC_STABLE</div><div class='ctx'> 	tristate "PDC Stable Storage support"</div><div class='ctx'> 	depends on SYSFS</div><div class='head'>diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c<br/>index a5d826237b26..68cb3a080050 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/ccio-dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/ccio-dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/ccio-dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/ccio-dma.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> **        the coherency design originally worked out. Only PCX-W does.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='head'>diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c<br/>index 6e8ed0c81a6c..0d96c50ffe9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/dino.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/dino.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/dino.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/dino.c</a></div><div class='hunk'>@@ -43,7 +43,6 @@</div><div class='ctx'> **       for PCI drivers devices which implement/use MMIO registers.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -299,7 +298,7 @@ struct pci_port_ops dino_port_ops = {</div><div class='ctx'> </div><div class='ctx'> static void dino_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	struct dino_device *dino_dev = irq_desc[irq].handler_data;</div><div class='add'>+	struct dino_device *dino_dev = irq_desc[irq].chip_data;</div><div class='ctx'> 	int local_irq = gsc_find_local_irq(irq, dino_dev-&gt;global_irq, DINO_LOCAL_IRQS);</div><div class='ctx'> </div><div class='ctx'> 	DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);</div><div class='hunk'>@@ -311,7 +310,7 @@ static void dino_disable_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> static void dino_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	struct dino_device *dino_dev = irq_desc[irq].handler_data;</div><div class='add'>+	struct dino_device *dino_dev = irq_desc[irq].chip_data;</div><div class='ctx'> 	int local_irq = gsc_find_local_irq(irq, dino_dev-&gt;global_irq, DINO_LOCAL_IRQS);</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c<br/>index 9d3bd15bf53b..884965cedec9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/eisa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/eisa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/eisa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/eisa.c</a></div><div class='hunk'>@@ -340,7 +340,7 @@ static int __devinit eisa_probe(struct parisc_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	pcibios_register_hba(&amp;eisa_dev.hba);</div><div class='ctx'> </div><div class='del'>-	result = request_irq(dev-&gt;irq, eisa_irq, SA_SHIRQ, "EISA", &amp;eisa_dev);</div><div class='add'>+	result = request_irq(dev-&gt;irq, eisa_irq, IRQF_SHARED, "EISA", &amp;eisa_dev);</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		printk(KERN_ERR "EISA: request_irq failed!\n");</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -350,7 +350,7 @@ static int __devinit eisa_probe(struct parisc_device *dev)</div><div class='ctx'> 	irq_desc[2].action = &amp;irq2_action;</div><div class='ctx'> 	</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;eisa_interrupt_type;</div><div class='add'>+		irq_desc[i].chip = &amp;eisa_interrupt_type;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	EISA_bus = 1;</div><div class='head'>diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c<br/>index 16d40f95978d..b45aa5c675a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/gsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/gsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/gsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/gsc.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -109,7 +108,7 @@ int gsc_find_local_irq(unsigned int irq, int *global_irqs, int limit)</div><div class='ctx'> </div><div class='ctx'> static void gsc_asic_disable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	struct gsc_asic *irq_dev = irq_desc[irq].handler_data;</div><div class='add'>+	struct gsc_asic *irq_dev = irq_desc[irq].chip_data;</div><div class='ctx'> 	int local_irq = gsc_find_local_irq(irq, irq_dev-&gt;global_irq, 32);</div><div class='ctx'> 	u32 imr;</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +123,7 @@ static void gsc_asic_disable_irq(unsigned int irq)</div><div class='ctx'> </div><div class='ctx'> static void gsc_asic_enable_irq(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	struct gsc_asic *irq_dev = irq_desc[irq].handler_data;</div><div class='add'>+	struct gsc_asic *irq_dev = irq_desc[irq].chip_data;</div><div class='ctx'> 	int local_irq = gsc_find_local_irq(irq, irq_dev-&gt;global_irq, 32);</div><div class='ctx'> 	u32 imr;</div><div class='ctx'> </div><div class='hunk'>@@ -164,8 +163,8 @@ int gsc_assign_irq(struct hw_interrupt_type *type, void *data)</div><div class='ctx'> 	if (irq &gt; GSC_IRQ_MAX)</div><div class='ctx'> 		return NO_IRQ;</div><div class='ctx'> </div><div class='del'>-	irq_desc[irq].handler = type;</div><div class='del'>-	irq_desc[irq].handler_data = data;</div><div class='add'>+	irq_desc[irq].chip = type;</div><div class='add'>+	irq_desc[irq].chip_data = data;</div><div class='ctx'> 	return irq++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c<br/>index 7a458d5bc751..1fbda77cefc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/iosapic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/iosapic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/iosapic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/iosapic.c</a></div><div class='hunk'>@@ -619,7 +619,7 @@ iosapic_set_irt_data( struct vector_info *vi, u32 *dp0, u32 *dp1)</div><div class='ctx'> </div><div class='ctx'> static struct vector_info *iosapic_get_vector(unsigned int irq)</div><div class='ctx'> {</div><div class='del'>-	return irq_desc[irq].handler_data;</div><div class='add'>+	return irq_desc[irq].chip_data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void iosapic_disable_irq(unsigned int irq)</div><div class='head'>diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c<br/>index 298f2ddb2c17..bf00fa2537bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/led.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/led.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/led.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/led.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *	  			  David Pye &lt;dmp@davidmpye.dyndns.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;	/* for offsetof() */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -411,16 +410,17 @@ static __inline__ int led_get_net_activity(void)</div><div class='ctx'> static __inline__ int led_get_diskio_activity(void)</div><div class='ctx'> {	</div><div class='ctx'> 	static unsigned long last_pgpgin, last_pgpgout;</div><div class='del'>-	struct page_state pgstat;</div><div class='add'>+	unsigned long events[NR_VM_EVENT_ITEMS];</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	get_full_page_state(&amp;pgstat); /* get no of sectors in &amp; out */</div><div class='add'>+	all_vm_events(events);</div><div class='ctx'> </div><div class='ctx'> 	/* Just use a very simple calculation here. Do not care about overflow,</div><div class='ctx'> 	   since we only want to know if there was activity or not. */</div><div class='del'>-	changed = (pgstat.pgpgin != last_pgpgin) || (pgstat.pgpgout != last_pgpgout);</div><div class='del'>-	last_pgpgin  = pgstat.pgpgin;</div><div class='del'>-	last_pgpgout = pgstat.pgpgout;</div><div class='add'>+	changed = (events[PGPGIN] != last_pgpgin) ||</div><div class='add'>+		  (events[PGPGOUT] != last_pgpgout);</div><div class='add'>+	last_pgpgin  = events[PGPGIN];</div><div class='add'>+	last_pgpgout = events[PGPGOUT];</div><div class='ctx'> </div><div class='ctx'> 	return (changed ? LED_DISK_IO : 0);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c<br/>index bbeabe3fc4c6..ea1b7a63598e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/pdc_stable.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/pdc_stable.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/pdc_stable.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/pdc_stable.c</a></div><div class='hunk'>@@ -28,8 +28,15 @@</div><div class='ctx'>  *    following code can deal with just 96 bytes of Stable Storage, and all</div><div class='ctx'>  *    sizes between 96 and 192 bytes (provided they are multiple of struct</div><div class='ctx'>  *    device_path size, eg: 128, 160 and 192) to provide full information.</div><div class='del'>- *    The code makes no use of data above 192 bytes. One last word: there's one</div><div class='del'>- *    path we can always count on: the primary path.</div><div class='add'>+ *    One last word: there's one path we can always count on: the primary path.</div><div class='add'>+ *    Anything above 224 bytes is used for 'osdep2' OS-dependent storage area.</div><div class='add'>+ *</div><div class='add'>+ *    The first OS-dependent area should always be available. Obviously, this is</div><div class='add'>+ *    not true for the other one. Also bear in mind that reading/writing from/to</div><div class='add'>+ *    osdep2 is much more expensive than from/to osdep1.</div><div class='add'>+ *    NOTE: We do not handle the 2 bytes OS-dep area at 0x5D, nor the first</div><div class='add'>+ *    2 bytes of storage available right after OSID. That's a total of 4 bytes</div><div class='add'>+ *    sacrificed: -ETOOLAZY :P</div><div class='ctx'>  *</div><div class='ctx'>  *    The current policy wrt file permissions is:</div><div class='ctx'>  *	- write: root only</div><div class='hunk'>@@ -64,15 +71,18 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PDCS_VERSION	"0.22"</div><div class='add'>+#define PDCS_VERSION	"0.30"</div><div class='ctx'> #define PDCS_PREFIX	"PDC Stable Storage"</div><div class='ctx'> </div><div class='ctx'> #define PDCS_ADDR_PPRI	0x00</div><div class='ctx'> #define PDCS_ADDR_OSID	0x40</div><div class='add'>+#define PDCS_ADDR_OSD1	0x48</div><div class='add'>+#define PDCS_ADDR_DIAG	0x58</div><div class='ctx'> #define PDCS_ADDR_FSIZ	0x5C</div><div class='ctx'> #define PDCS_ADDR_PCON	0x60</div><div class='ctx'> #define PDCS_ADDR_PALT	0x80</div><div class='ctx'> #define PDCS_ADDR_PKBD	0xA0</div><div class='add'>+#define PDCS_ADDR_OSD2	0xE0</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Thibaut VARENE &lt;varenet@parisc-linux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("sysfs interface to HP PDC Stable Storage data");</div><div class='hunk'>@@ -82,6 +92,9 @@ MODULE_VERSION(PDCS_VERSION);</div><div class='ctx'> /* holds Stable Storage size. Initialized once and for all, no lock needed */</div><div class='ctx'> static unsigned long pdcs_size __read_mostly;</div><div class='ctx'> </div><div class='add'>+/* holds OS ID. Initialized once and for all, hopefully to 0x0006 */</div><div class='add'>+static u16 pdcs_osid __read_mostly;</div><div class='add'>+</div><div class='ctx'> /* This struct defines what we need to deal with a parisc pdc path entry */</div><div class='ctx'> struct pdcspath_entry {</div><div class='ctx'> 	rwlock_t rw_lock;		/* to protect path entry access */</div><div class='hunk'>@@ -609,27 +622,64 @@ static ssize_t</div><div class='ctx'> pdcs_osid_read(struct subsystem *entry, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	char *out = buf;</div><div class='del'>-	__u32 result;</div><div class='del'>-	char *tmpstr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (!entry || !buf)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	/* get OSID */</div><div class='del'>-	if (pdc_stable_read(PDCS_ADDR_OSID, &amp;result, sizeof(result)) != PDC_OK)</div><div class='add'>+	out += sprintf(out, "%s dependent data (0x%.4x)\n",</div><div class='add'>+		os_id_to_string(pdcs_osid), pdcs_osid);</div><div class='add'>+</div><div class='add'>+	return out - buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pdcs_osdep1_read - Stable Storage OS-Dependent data area 1 output.</div><div class='add'>+ * @entry: An allocated and populated subsytem struct. We don't use it tho.</div><div class='add'>+ * @buf: The output buffer to write to.</div><div class='add'>+ *</div><div class='add'>+ * This can hold 16 bytes of OS-Dependent data.</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+pdcs_osdep1_read(struct subsystem *entry, char *buf)</div><div class='add'>+{</div><div class='add'>+	char *out = buf;</div><div class='add'>+	u32 result[4];</div><div class='add'>+</div><div class='add'>+	if (!entry || !buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pdc_stable_read(PDCS_ADDR_OSD1, &amp;result, sizeof(result)) != PDC_OK)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	/* the actual result is 16 bits away */</div><div class='del'>-	switch (result &gt;&gt; 16) {</div><div class='del'>-		case 0x0000:	tmpstr = "No OS-dependent data"; break;</div><div class='del'>-		case 0x0001:	tmpstr = "HP-UX dependent data"; break;</div><div class='del'>-		case 0x0002:	tmpstr = "MPE-iX dependent data"; break;</div><div class='del'>-		case 0x0003:	tmpstr = "OSF dependent data"; break;</div><div class='del'>-		case 0x0004:	tmpstr = "HP-RT dependent data"; break;</div><div class='del'>-		case 0x0005:	tmpstr = "Novell Netware dependent data"; break;</div><div class='del'>-		default:	tmpstr = "Unknown"; break;</div><div class='del'>-	}</div><div class='del'>-	out += sprintf(out, "%s (0x%.4x)\n", tmpstr, (result &gt;&gt; 16));</div><div class='add'>+	out += sprintf(out, "0x%.8x\n", result[0]);</div><div class='add'>+	out += sprintf(out, "0x%.8x\n", result[1]);</div><div class='add'>+	out += sprintf(out, "0x%.8x\n", result[2]);</div><div class='add'>+	out += sprintf(out, "0x%.8x\n", result[3]);</div><div class='add'>+</div><div class='add'>+	return out - buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pdcs_diagnostic_read - Stable Storage Diagnostic register output.</div><div class='add'>+ * @entry: An allocated and populated subsytem struct. We don't use it tho.</div><div class='add'>+ * @buf: The output buffer to write to.</div><div class='add'>+ *</div><div class='add'>+ * I have NFC how to interpret the content of that register ;-).</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+pdcs_diagnostic_read(struct subsystem *entry, char *buf)</div><div class='add'>+{</div><div class='add'>+	char *out = buf;</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	if (!entry || !buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* get diagnostic */</div><div class='add'>+	if (pdc_stable_read(PDCS_ADDR_DIAG, &amp;result, sizeof(result)) != PDC_OK)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	out += sprintf(out, "0x%.4x\n", (result &gt;&gt; 16));</div><div class='ctx'> </div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='hunk'>@@ -645,7 +695,7 @@ static ssize_t</div><div class='ctx'> pdcs_fastsize_read(struct subsystem *entry, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	char *out = buf;</div><div class='del'>-	__u32 result;</div><div class='add'>+	u32 result;</div><div class='ctx'> </div><div class='ctx'> 	if (!entry || !buf)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -664,6 +714,39 @@ pdcs_fastsize_read(struct subsystem *entry, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * pdcs_osdep2_read - Stable Storage OS-Dependent data area 2 output.</div><div class='add'>+ * @entry: An allocated and populated subsytem struct. We don't use it tho.</div><div class='add'>+ * @buf: The output buffer to write to.</div><div class='add'>+ *</div><div class='add'>+ * This can hold pdcs_size - 224 bytes of OS-Dependent data, when available.</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+pdcs_osdep2_read(struct subsystem *entry, char *buf)</div><div class='add'>+{</div><div class='add'>+	char *out = buf;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned short i;</div><div class='add'>+	u32 result;</div><div class='add'>+</div><div class='add'>+	if (unlikely(pdcs_size &lt;= 224))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	size = pdcs_size - 224;</div><div class='add'>+</div><div class='add'>+	if (!entry || !buf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;size; i+=4) {</div><div class='add'>+		if (unlikely(pdc_stable_read(PDCS_ADDR_OSD2 + i, &amp;result,</div><div class='add'>+					sizeof(result)) != PDC_OK))</div><div class='add'>+			return -EIO;</div><div class='add'>+		out += sprintf(out, "0x%.8x\n", result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return out - buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * pdcs_auto_write - This function handles autoboot/search flag modifying.</div><div class='ctx'>  * @entry: An allocated and populated subsytem struct. We don't use it tho.</div><div class='ctx'>  * @buf: The input buffer to read from.</div><div class='hunk'>@@ -770,13 +853,100 @@ pdcs_autosearch_write(struct subsystem *entry, const char *buf, size_t count)</div><div class='ctx'> 	return pdcs_auto_write(entry, buf, count, PF_AUTOSEARCH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * pdcs_osdep1_write - Stable Storage OS-Dependent data area 1 input.</div><div class='add'>+ * @entry: An allocated and populated subsytem struct. We don't use it tho.</div><div class='add'>+ * @buf: The input buffer to read from.</div><div class='add'>+ * @count: The number of bytes to be read.</div><div class='add'>+ *</div><div class='add'>+ * This can store 16 bytes of OS-Dependent data. We use a byte-by-byte</div><div class='add'>+ * write approach. It's up to userspace to deal with it when constructing</div><div class='add'>+ * its input buffer.</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	u8 in[16];</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (!entry || !buf || !count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(pdcs_osid != OS_ID_LINUX))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (count &gt; 16)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	/* We'll use a local copy of buf */</div><div class='add'>+	memset(in, 0, 16);</div><div class='add'>+	memcpy(in, buf, count);</div><div class='add'>+</div><div class='add'>+	if (pdc_stable_write(PDCS_ADDR_OSD1, &amp;in, sizeof(in)) != PDC_OK)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pdcs_osdep2_write - Stable Storage OS-Dependent data area 2 input.</div><div class='add'>+ * @entry: An allocated and populated subsytem struct. We don't use it tho.</div><div class='add'>+ * @buf: The input buffer to read from.</div><div class='add'>+ * @count: The number of bytes to be read.</div><div class='add'>+ *</div><div class='add'>+ * This can store pdcs_size - 224 bytes of OS-Dependent data. We use a</div><div class='add'>+ * byte-by-byte write approach. It's up to userspace to deal with it when</div><div class='add'>+ * constructing its input buffer.</div><div class='add'>+ */</div><div class='add'>+static ssize_t</div><div class='add'>+pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	unsigned long size;</div><div class='add'>+	unsigned short i;</div><div class='add'>+	u8 in[4];</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (!entry || !buf || !count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(pdcs_size &lt;= 224))</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+</div><div class='add'>+	if (unlikely(pdcs_osid != OS_ID_LINUX))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	size = pdcs_size - 224;</div><div class='add'>+</div><div class='add'>+	if (count &gt; size)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	/* We'll use a local copy of buf */</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;count; i+=4) {</div><div class='add'>+		memset(in, 0, 4);</div><div class='add'>+		memcpy(in, buf+i, (count-i &lt; 4) ? count-i : 4);</div><div class='add'>+		if (unlikely(pdc_stable_write(PDCS_ADDR_OSD2 + i, &amp;in,</div><div class='add'>+					sizeof(in)) != PDC_OK))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The remaining attributes. */</div><div class='ctx'> static PDCS_ATTR(size, 0444, pdcs_size_read, NULL);</div><div class='ctx'> static PDCS_ATTR(autoboot, 0644, pdcs_autoboot_read, pdcs_autoboot_write);</div><div class='ctx'> static PDCS_ATTR(autosearch, 0644, pdcs_autosearch_read, pdcs_autosearch_write);</div><div class='ctx'> static PDCS_ATTR(timer, 0444, pdcs_timer_read, NULL);</div><div class='del'>-static PDCS_ATTR(osid, 0400, pdcs_osid_read, NULL);</div><div class='add'>+static PDCS_ATTR(osid, 0444, pdcs_osid_read, NULL);</div><div class='add'>+static PDCS_ATTR(osdep1, 0600, pdcs_osdep1_read, pdcs_osdep1_write);</div><div class='add'>+static PDCS_ATTR(diagnostic, 0400, pdcs_diagnostic_read, NULL);</div><div class='ctx'> static PDCS_ATTR(fastsize, 0400, pdcs_fastsize_read, NULL);</div><div class='add'>+static PDCS_ATTR(osdep2, 0600, pdcs_osdep2_read, pdcs_osdep2_write);</div><div class='ctx'> </div><div class='ctx'> static struct subsys_attribute *pdcs_subsys_attrs[] = {</div><div class='ctx'> 	&amp;pdcs_attr_size,</div><div class='hunk'>@@ -784,7 +954,10 @@ static struct subsys_attribute *pdcs_subsys_attrs[] = {</div><div class='ctx'> 	&amp;pdcs_attr_autosearch,</div><div class='ctx'> 	&amp;pdcs_attr_timer,</div><div class='ctx'> 	&amp;pdcs_attr_osid,</div><div class='add'>+	&amp;pdcs_attr_osdep1,</div><div class='add'>+	&amp;pdcs_attr_diagnostic,</div><div class='ctx'> 	&amp;pdcs_attr_fastsize,</div><div class='add'>+	&amp;pdcs_attr_osdep2,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -865,6 +1038,7 @@ pdc_stable_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct subsys_attribute *attr;</div><div class='ctx'> 	int i, rc = 0, error = 0;</div><div class='add'>+	u32 result;</div><div class='ctx'> </div><div class='ctx'> 	/* find the size of the stable storage */</div><div class='ctx'> 	if (pdc_stable_get_size(&amp;pdcs_size) != PDC_OK) </div><div class='hunk'>@@ -876,6 +1050,13 @@ pdc_stable_init(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO PDCS_PREFIX " facility v%s\n", PDCS_VERSION);</div><div class='ctx'> </div><div class='add'>+	/* get OSID */</div><div class='add'>+	if (pdc_stable_read(PDCS_ADDR_OSID, &amp;result, sizeof(result)) != PDC_OK)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* the actual result is 16 bits away */</div><div class='add'>+	pdcs_osid = (u16)(result &gt;&gt; 16);</div><div class='add'>+</div><div class='ctx'> 	/* For now we'll register the stable subsys within this driver */</div><div class='ctx'> 	if ((rc = firmware_register(&amp;stable_subsys)))</div><div class='ctx'> 		goto fail_firmreg;</div><div class='hunk'>@@ -887,7 +1068,7 @@ pdc_stable_init(void)</div><div class='ctx'> 	</div><div class='ctx'> 	/* register the paths subsys as a subsystem of stable subsys */</div><div class='ctx'> 	kset_set_kset_s(&amp;paths_subsys, stable_subsys);</div><div class='del'>-	if ((rc= subsystem_register(&amp;paths_subsys)))</div><div class='add'>+	if ((rc = subsystem_register(&amp;paths_subsys)))</div><div class='ctx'> 		goto fail_subsysreg;</div><div class='ctx'> </div><div class='ctx'> 	/* now we create all "files" for the paths subsys */</div><div class='head'>diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c<br/>index 0bcab83b4080..fad5a33bf0fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/power.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/power.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/power.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/power.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  *  runtime through the "/proc/sys/kernel/power" procfs entry.</div><div class='ctx'>  */ </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c<br/>index 278f325021ee..8b4732815511 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/sba_iommu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/sba_iommu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/sba_iommu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/sba_iommu.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> ** FIXME: add DMA hint support programming in both sba and lba modules.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -316,10 +315,10 @@ static int reserve_sba_gart = 1;</div><div class='ctx'> **</div><div class='ctx'> ** Superdome (in particular, REO) allows only 64-bit CSR accesses.</div><div class='ctx'> */</div><div class='del'>-#define READ_REG32(addr)	 le32_to_cpu(__raw_readl(addr))</div><div class='del'>-#define READ_REG64(addr)	 le64_to_cpu(__raw_readq(addr))</div><div class='del'>-#define WRITE_REG32(val, addr) __raw_writel(cpu_to_le32(val), addr)</div><div class='del'>-#define WRITE_REG64(val, addr) __raw_writeq(cpu_to_le64(val), addr)</div><div class='add'>+#define READ_REG32(addr)	readl(addr)</div><div class='add'>+#define READ_REG64(addr)	readq(addr)</div><div class='add'>+#define WRITE_REG32(val, addr)	writel((val), (addr))</div><div class='add'>+#define WRITE_REG64(val, addr)	writeq((val), (addr))</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_64BIT</div><div class='ctx'> #define READ_REG(addr)		READ_REG64(addr)</div><div class='hunk'>@@ -1427,7 +1426,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)</div><div class='ctx'> 	iov_order = get_order(iova_space_size &gt;&gt; (IOVP_SHIFT - PAGE_SHIFT));</div><div class='ctx'> 	ioc-&gt;pdir_size = (iova_space_size / IOVP_SIZE) * sizeof(u64);</div><div class='ctx'> </div><div class='del'>-	DBG_INIT("%s() hpa 0x%lx IOV %dMB (%d bits)\n",</div><div class='add'>+	DBG_INIT("%s() hpa 0x%p IOV %dMB (%d bits)\n",</div><div class='ctx'> 		__FUNCTION__, ioc-&gt;ioc_hpa, iova_space_size &gt;&gt; 20,</div><div class='ctx'> 		iov_order + PAGE_SHIFT);</div><div class='ctx'> </div><div class='hunk'>@@ -1764,7 +1763,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0-&gt;mem_boot.hpa,</div><div class='ctx'> </div><div class='ctx'> 	sba_dev-&gt;num_ioc = num_ioc;</div><div class='ctx'> 	for (i = 0; i &lt; num_ioc; i++) {</div><div class='del'>-		unsigned long ioc_hpa = sba_dev-&gt;ioc[i].ioc_hpa;</div><div class='add'>+		void __iomem *ioc_hpa = sba_dev-&gt;ioc[i].ioc_hpa;</div><div class='ctx'> 		unsigned int j;</div><div class='ctx'> </div><div class='ctx'> 		for (j=0; j &lt; sizeof(u64) * ROPES_PER_IOC; j+=sizeof(u64)) {</div><div class='hunk'>@@ -1776,7 +1775,8 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0-&gt;mem_boot.hpa,</div><div class='ctx'> 			 * Improves netperf UDP_STREAM by ~10% for bcm5701.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (IS_PLUTO(sba_dev-&gt;iodc)) {</div><div class='del'>-				unsigned long rope_cfg, cfg_val;</div><div class='add'>+				void __iomem *rope_cfg;</div><div class='add'>+				unsigned long cfg_val;</div><div class='ctx'> </div><div class='ctx'> 				rope_cfg = ioc_hpa + IOC_ROPE0_CFG + j;</div><div class='ctx'> 				cfg_val = READ_REG(rope_cfg);</div><div class='hunk'>@@ -1902,7 +1902,7 @@ sba_common_init(struct sba_device *sba_dev)</div><div class='ctx'> 	 * (bit #61, big endian), we have to flush and sync every time</div><div class='ctx'> 	 * IO-PDIR is changed in Ike/Astro.</div><div class='ctx'> 	 */</div><div class='del'>-	if (boot_cpu_data.pdc.capabilities &amp; PDC_MODEL_IOPDIR_FDC) {</div><div class='add'>+	if (ioc_needs_fdc) {</div><div class='ctx'> 		printk(KERN_INFO MODULE_NAME " FDC/SYNC required.\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_INFO MODULE_NAME " IOC has cache coherent PDIR.\n");</div><div class='head'>diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c<br/>index 828eb45062de..4ee26a6d9e25 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parisc/superio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parisc/superio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parisc/superio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parisc/superio.c</a></div><div class='hunk'>@@ -271,7 +271,7 @@ superio_init(struct pci_dev *pcidev)</div><div class='ctx'> 	else</div><div class='ctx'> 		printk(KERN_ERR PFX "USB regulator not initialized!\n");</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pdev-&gt;irq, superio_interrupt, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(pdev-&gt;irq, superio_interrupt, IRQF_DISABLED,</div><div class='ctx'> 			SUPERIO, (void *)sio)) {</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_ERR PFX "could not get irq\n");</div><div class='hunk'>@@ -360,7 +360,7 @@ int superio_fixup_irq(struct pci_dev *pcidev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		irq_desc[i].handler = &amp;superio_interrupt_type;</div><div class='add'>+		irq_desc[i].chip = &amp;superio_interrupt_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig<br/>index f63c387976cf..c7fa28a28b9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/Kconfig</a></div><div class='hunk'>@@ -48,7 +48,7 @@ config PARPORT_PC</div><div class='ctx'> </div><div class='ctx'> config PARPORT_SERIAL</div><div class='ctx'> 	tristate "Multi-IO cards (parallel and serial)"</div><div class='del'>-	depends on SERIAL_8250 &amp;&amp; PARPORT_PC &amp;&amp; PCI</div><div class='add'>+	depends on SERIAL_8250_PCI &amp;&amp; PARPORT_PC &amp;&amp; PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This adds support for multi-IO PCI cards that have parallel and</div><div class='ctx'> 	  serial ports.  You should say Y or M here.  If you say M, the module</div><div class='hunk'>@@ -85,11 +85,6 @@ config PARPORT_PC_PCMCIA</div><div class='ctx'> config PARPORT_NOT_PC</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='del'>-config PARPORT_ARC</div><div class='del'>-	tristate "Archimedes hardware"</div><div class='del'>-	depends on ARM &amp;&amp; PARPORT</div><div class='del'>-	select PARPORT_NOT_PC</div><div class='del'>-</div><div class='ctx'> config PARPORT_IP32</div><div class='ctx'> 	tristate "SGI IP32 builtin port (EXPERIMENTAL)"</div><div class='ctx'> 	depends on SGI_IP32 &amp;&amp; PARPORT &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -141,6 +136,18 @@ config PARPORT_SUNBPP</div><div class='ctx'> 	  found on many Sun machines. Note that many of the newer Ultras</div><div class='ctx'> 	  actually have pc style hardware instead.</div><div class='ctx'> </div><div class='add'>+config PARPORT_AX88796</div><div class='add'>+	tristate "AX88796 Parallel Port"</div><div class='add'>+	depends on PARPORT</div><div class='add'>+	select PARPORT_NOT_PC</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you need support for the parallel port hardware on</div><div class='add'>+	  the AX88796 network controller chip. This code is also available</div><div class='add'>+	  as a module (say M), called parport_ax88796.</div><div class='add'>+</div><div class='add'>+	  The driver is not dependant on the AX88796 network driver, and</div><div class='add'>+	  should not interfere with the networking functions of the chip.</div><div class='add'>+</div><div class='ctx'> config PARPORT_1284</div><div class='ctx'> 	bool "IEEE 1284 transfer modes"</div><div class='ctx'> 	depends on PARPORT</div><div class='head'>diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile<br/>index a19de35f8de2..696b8d4ca887 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/Makefile</a></div><div class='hunk'>@@ -17,4 +17,5 @@ obj-$(CONFIG_PARPORT_MFC3)	+= parport_mfc3.o</div><div class='ctx'> obj-$(CONFIG_PARPORT_ATARI)	+= parport_atari.o</div><div class='ctx'> obj-$(CONFIG_PARPORT_SUNBPP)	+= parport_sunbpp.o</div><div class='ctx'> obj-$(CONFIG_PARPORT_GSC)	+= parport_gsc.o</div><div class='del'>-obj-$(CONFIG_PARPORT_IP32)	+= parport_ip32.o</div><div class='add'>+obj-$(CONFIG_PARPORT_AX88796)	+= parport_ax88796.o</div><div class='add'>+obj-$(CONFIG_PARPORT_IP32)	+= parport_ip32.o
\ No newline at end of file</div><div class='head'>diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c<br/>index 9ee67321b630..fd41e28101ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/daisy.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/daisy.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/daisy.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/daisy.c</a></div><div class='hunk'>@@ -283,7 +283,7 @@ void parport_close (struct pardevice *dev)</div><div class='ctx'>  *</div><div class='ctx'>  *	This tries to locate a device on the given parallel port,</div><div class='ctx'>  *	multiplexor port and daisy chain address, and returns its</div><div class='del'>- *	device number or -NXIO if no device with those coordinates</div><div class='add'>+ *	device number or %-ENXIO if no device with those coordinates</div><div class='ctx'>  *	exists.</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c<br/>index 690b239ad3a7..7ff09f0f858f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/ieee1284.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/ieee1284.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/ieee1284.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/ieee1284.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Various hacks, Fred Barnes &lt;frmb2@ukc.ac.uk&gt;, 04/2000</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='head'>diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c<br/>index d6c77658231e..525312f2fe9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/ieee1284_ops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/ieee1284_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/ieee1284_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/ieee1284_ops.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/parport/parport_arc.c b/drivers/parport/parport_arc.c<br/>deleted file mode 100644<br/>index b35bb4f48d62..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_arc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_arc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,139 +0,0 @@</div><div class='del'>-/* Low-level parallel port routines for Archimedes onboard hardware</div><div class='del'>- *</div><div class='del'>- * Author: Phil Blundell &lt;philb@gnu.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This driver is for the parallel port hardware found on Acorn's old</div><div class='del'>- * range of Archimedes machines.  The A5000 and newer systems have PC-style</div><div class='del'>- * I/O hardware and should use the parport_pc driver instead.</div><div class='del'>- *</div><div class='del'>- * The Acorn printer port hardware is very simple.  There is a single 8-bit</div><div class='del'>- * write-only latch for the data port and control/status bits are handled</div><div class='del'>- * with various auxilliary input and output lines.  The port is not</div><div class='del'>- * bidirectional, does not support any modes other than SPP, and has only</div><div class='del'>- * a subset of the standard printer control lines connected.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/threads.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/parport.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ptrace.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/arch/oldlatches.h&gt;</div><div class='del'>-#include &lt;asm/arch/irqs.h&gt;</div><div class='del'>-</div><div class='del'>-#define DATA_ADDRESS    0x3350010</div><div class='del'>-</div><div class='del'>-/* This is equivalent to the above and only used for request_region. */</div><div class='del'>-#define PORT_BASE       0x80000000 | ((DATA_ADDRESS - IO_BASE) &gt;&gt; 2)</div><div class='del'>-</div><div class='del'>-/* The hardware can't read from the data latch, so we must use a soft</div><div class='del'>-   copy. */</div><div class='del'>-static unsigned char data_copy;</div><div class='del'>-</div><div class='del'>-/* These are pretty simple. We know the irq is never shared and the</div><div class='del'>-   kernel does all the magic that's required. */</div><div class='del'>-static void arc_enable_irq(struct parport *p)</div><div class='del'>-{</div><div class='del'>-	enable_irq(p-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void arc_disable_irq(struct parport *p)</div><div class='del'>-{</div><div class='del'>-	disable_irq(p-&gt;irq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void arc_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='del'>-{</div><div class='del'>-	parport_generic_irq(irq, (struct parport *) dev_id, regs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void arc_write_data(struct parport *p, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	data_copy = data;</div><div class='del'>-	outb_t(data, DATA_LATCH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char arc_read_data(struct parport *p)</div><div class='del'>-{</div><div class='del'>-	return data_copy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct parport_operations parport_arc_ops = </div><div class='del'>-{</div><div class='del'>-	.write_data	= arc_write_data,</div><div class='del'>-	.read_data	= arc_read_data,</div><div class='del'>-</div><div class='del'>-	.write_control	= arc_write_control,</div><div class='del'>-	.read_control	= arc_read_control,</div><div class='del'>-	.frob_control	= arc_frob_control,</div><div class='del'>-</div><div class='del'>-	.read_status	= arc_read_status,</div><div class='del'>-</div><div class='del'>-	.enable_irq	= arc_enable_irq,</div><div class='del'>-	.disable_irq	= arc_disable_irq,</div><div class='del'>-</div><div class='del'>-	.data_forward	= arc_data_forward,</div><div class='del'>-	.data_reverse	= arc_data_reverse,</div><div class='del'>-</div><div class='del'>-	.init_state	= arc_init_state,</div><div class='del'>-	.save_state	= arc_save_state,</div><div class='del'>-	.restore_state	= arc_restore_state,</div><div class='del'>-</div><div class='del'>-	.epp_write_data	= parport_ieee1284_epp_write_data,</div><div class='del'>-	.epp_read_data	= parport_ieee1284_epp_read_data,</div><div class='del'>-	.epp_write_addr	= parport_ieee1284_epp_write_addr,</div><div class='del'>-	.epp_read_addr	= parport_ieee1284_epp_read_addr,</div><div class='del'>-</div><div class='del'>-	.ecp_write_data	= parport_ieee1284_ecp_write_data,</div><div class='del'>-	.ecp_read_data	= parport_ieee1284_ecp_read_data,</div><div class='del'>-	.ecp_write_addr	= parport_ieee1284_ecp_write_addr,</div><div class='del'>-	</div><div class='del'>-	.compat_write_data	= parport_ieee1284_write_compat,</div><div class='del'>-	.nibble_read_data	= parport_ieee1284_read_nibble,</div><div class='del'>-	.byte_read_data		= parport_ieee1284_read_byte,</div><div class='del'>-</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* --- Initialisation code -------------------------------- */</div><div class='del'>-</div><div class='del'>-static int parport_arc_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Archimedes hardware provides only one port, at a fixed address */</div><div class='del'>-	struct parport *p;</div><div class='del'>-	struct resource res;</div><div class='del'>-	char *fake_name = "parport probe");</div><div class='del'>-</div><div class='del'>-	res = request_region(PORT_BASE, 1, fake_name);</div><div class='del'>-	if (res == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	p = parport_register_port (PORT_BASE, IRQ_PRINTERACK,</div><div class='del'>-				   PARPORT_DMA_NONE, &amp;parport_arc_ops);</div><div class='del'>-</div><div class='del'>-	if (!p) {</div><div class='del'>-		release_region(PORT_BASE, 1);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p-&gt;modes = PARPORT_MODE_ARCSPP;</div><div class='del'>-	p-&gt;size = 1;</div><div class='del'>-	rename_region(res, p-&gt;name);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: Archimedes on-board port, using irq %d\n",</div><div class='del'>-	       p-&gt;irq);</div><div class='del'>-</div><div class='del'>-	/* Tell the high-level drivers about the port. */</div><div class='del'>-	parport_announce_port (p);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(parport_arc_init)</div><div class='head'>diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c<br/>new file mode 100644<br/>index 000000000000..1850632590fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_ax88796.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/parport_ax88796.c</a></div><div class='hunk'>@@ -0,0 +1,443 @@</div><div class='add'>+/* linux/drivers/parport/parport_ax88796.c</div><div class='add'>+ *</div><div class='add'>+ * (c) 2005,2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/parport.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+</div><div class='add'>+#define AX_SPR_BUSY		(1&lt;&lt;7)</div><div class='add'>+#define AX_SPR_ACK		(1&lt;&lt;6)</div><div class='add'>+#define AX_SPR_PE		(1&lt;&lt;5)</div><div class='add'>+#define AX_SPR_SLCT		(1&lt;&lt;4)</div><div class='add'>+#define AX_SPR_ERR		(1&lt;&lt;3)</div><div class='add'>+</div><div class='add'>+#define AX_CPR_nDOE		(1&lt;&lt;5)</div><div class='add'>+#define AX_CPR_SLCTIN		(1&lt;&lt;3)</div><div class='add'>+#define AX_CPR_nINIT		(1&lt;&lt;2)</div><div class='add'>+#define AX_CPR_ATFD		(1&lt;&lt;1)</div><div class='add'>+#define AX_CPR_STRB		(1&lt;&lt;0)</div><div class='add'>+</div><div class='add'>+struct ax_drvdata {</div><div class='add'>+	struct parport		*parport;</div><div class='add'>+	struct parport_state	 suspend;</div><div class='add'>+</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	struct resource		*io;</div><div class='add'>+</div><div class='add'>+	unsigned char		 irq_enabled;</div><div class='add'>+</div><div class='add'>+	void __iomem		*base;</div><div class='add'>+	void __iomem		*spp_data;</div><div class='add'>+	void __iomem		*spp_spr;</div><div class='add'>+	void __iomem		*spp_cpr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct ax_drvdata *pp_to_drv(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char</div><div class='add'>+parport_ax88796_read_data(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	return readb(dd-&gt;spp_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_write_data(struct parport *p, unsigned char data)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	writeb(data, dd-&gt;spp_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char</div><div class='add'>+parport_ax88796_read_control(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	unsigned int cpr = readb(dd-&gt;spp_cpr);</div><div class='add'>+	unsigned int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(cpr &amp; AX_CPR_STRB))</div><div class='add'>+		ret |= PARPORT_CONTROL_STROBE;</div><div class='add'>+</div><div class='add'>+	if (!(cpr &amp; AX_CPR_ATFD))</div><div class='add'>+		ret |= PARPORT_CONTROL_AUTOFD;</div><div class='add'>+</div><div class='add'>+	if (cpr &amp; AX_CPR_nINIT)</div><div class='add'>+		ret |= PARPORT_CONTROL_INIT;</div><div class='add'>+</div><div class='add'>+	if (!(cpr &amp; AX_CPR_SLCTIN))</div><div class='add'>+		ret |= PARPORT_CONTROL_SELECT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_write_control(struct parport *p, unsigned char control)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	unsigned int cpr = readb(dd-&gt;spp_cpr);</div><div class='add'>+</div><div class='add'>+	cpr &amp;= AX_CPR_nDOE;</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; PARPORT_CONTROL_STROBE))</div><div class='add'>+		cpr |= AX_CPR_STRB;</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; PARPORT_CONTROL_AUTOFD))</div><div class='add'>+		cpr |= AX_CPR_ATFD;</div><div class='add'>+</div><div class='add'>+	if (control &amp; PARPORT_CONTROL_INIT)</div><div class='add'>+		cpr |= AX_CPR_nINIT;</div><div class='add'>+</div><div class='add'>+	if (!(control &amp; PARPORT_CONTROL_SELECT))</div><div class='add'>+		cpr |= AX_CPR_SLCTIN;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dd-&gt;dev, "write_control: ctrl=%02x, cpr=%02x\n", control, cpr);</div><div class='add'>+	writeb(cpr, dd-&gt;spp_cpr);</div><div class='add'>+</div><div class='add'>+	if (parport_ax88796_read_control(p) != control) {</div><div class='add'>+		dev_err(dd-&gt;dev, "write_control: read != set (%02x, %02x)\n",</div><div class='add'>+			parport_ax88796_read_control(p), control);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char</div><div class='add'>+parport_ax88796_read_status(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	unsigned int status = readb(dd-&gt;spp_spr);</div><div class='add'>+	unsigned int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (status &amp; AX_SPR_BUSY)</div><div class='add'>+		ret |= PARPORT_STATUS_BUSY;</div><div class='add'>+</div><div class='add'>+	if (status &amp; AX_SPR_ACK)</div><div class='add'>+		ret |= PARPORT_STATUS_ACK;</div><div class='add'>+</div><div class='add'>+	if (status &amp; AX_SPR_ERR)</div><div class='add'>+		ret |= PARPORT_STATUS_ERROR;</div><div class='add'>+</div><div class='add'>+	if (status &amp; AX_SPR_SLCT)</div><div class='add'>+		ret |= PARPORT_STATUS_SELECT;</div><div class='add'>+</div><div class='add'>+	if (status &amp; AX_SPR_PE)</div><div class='add'>+		ret |= PARPORT_STATUS_PAPEROUT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char</div><div class='add'>+parport_ax88796_frob_control(struct parport *p, unsigned char mask,</div><div class='add'>+			     unsigned char val)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	unsigned char old = parport_ax88796_read_control(p);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dd-&gt;dev, "frob: mask=%02x, val=%02x, old=%02x\n",</div><div class='add'>+		mask, val, old);</div><div class='add'>+</div><div class='add'>+	parport_ax88796_write_control(p, (old &amp; ~mask) | val);</div><div class='add'>+	return old;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_enable_irq(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	if (!dd-&gt;irq_enabled) {</div><div class='add'>+		enable_irq(p-&gt;irq);</div><div class='add'>+		dd-&gt;irq_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_disable_irq(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	if (dd-&gt;irq_enabled) {</div><div class='add'>+		disable_irq(p-&gt;irq);</div><div class='add'>+		dd-&gt;irq_enabled = 0;</div><div class='add'>+	}</div><div class='add'>+	local_irq_restore(flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_data_forward(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	void __iomem *cpr = dd-&gt;spp_cpr;</div><div class='add'>+</div><div class='add'>+	writeb((readb(cpr) &amp; ~AX_CPR_nDOE), cpr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_data_reverse(struct parport *p)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+	void __iomem *cpr = dd-&gt;spp_cpr;</div><div class='add'>+</div><div class='add'>+	writeb(readb(cpr) | AX_CPR_nDOE, cpr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_init_state(struct pardevice *d, struct parport_state *s)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(d-&gt;port);</div><div class='add'>+</div><div class='add'>+	memset(s, 0, sizeof(struct parport_state));</div><div class='add'>+</div><div class='add'>+	dev_dbg(dd-&gt;dev, "init_state: %p: state=%p\n", d, s);</div><div class='add'>+	s-&gt;u.ax88796.cpr = readb(dd-&gt;spp_cpr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_save_state(struct parport *p, struct parport_state *s)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dd-&gt;dev, "save_state: %p: state=%p\n", p, s);</div><div class='add'>+	s-&gt;u.ax88796.cpr = readb(dd-&gt;spp_cpr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+parport_ax88796_restore_state(struct parport *p, struct parport_state *s)</div><div class='add'>+{</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dd-&gt;dev, "restore_state: %p: state=%p\n", p, s);</div><div class='add'>+	writeb(s-&gt;u.ax88796.cpr, dd-&gt;spp_cpr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t</div><div class='add'>+parport_ax88796_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+        parport_generic_irq(irq, dev_id, regs);</div><div class='add'>+        return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct parport_operations parport_ax88796_ops = {</div><div class='add'>+	.write_data	= parport_ax88796_write_data,</div><div class='add'>+	.read_data	= parport_ax88796_read_data,</div><div class='add'>+</div><div class='add'>+	.write_control	= parport_ax88796_write_control,</div><div class='add'>+	.read_control	= parport_ax88796_read_control,</div><div class='add'>+	.frob_control	= parport_ax88796_frob_control,</div><div class='add'>+</div><div class='add'>+	.read_status	= parport_ax88796_read_status,</div><div class='add'>+</div><div class='add'>+	.enable_irq	= parport_ax88796_enable_irq,</div><div class='add'>+	.disable_irq	= parport_ax88796_disable_irq,</div><div class='add'>+</div><div class='add'>+	.data_forward	= parport_ax88796_data_forward,</div><div class='add'>+	.data_reverse	= parport_ax88796_data_reverse,</div><div class='add'>+</div><div class='add'>+	.init_state	= parport_ax88796_init_state,</div><div class='add'>+	.save_state	= parport_ax88796_save_state,</div><div class='add'>+	.restore_state	= parport_ax88796_restore_state,</div><div class='add'>+</div><div class='add'>+	.epp_write_data	= parport_ieee1284_epp_write_data,</div><div class='add'>+	.epp_read_data	= parport_ieee1284_epp_read_data,</div><div class='add'>+	.epp_write_addr	= parport_ieee1284_epp_write_addr,</div><div class='add'>+	.epp_read_addr	= parport_ieee1284_epp_read_addr,</div><div class='add'>+</div><div class='add'>+	.ecp_write_data	= parport_ieee1284_ecp_write_data,</div><div class='add'>+	.ecp_read_data	= parport_ieee1284_ecp_read_data,</div><div class='add'>+	.ecp_write_addr	= parport_ieee1284_ecp_write_addr,</div><div class='add'>+</div><div class='add'>+	.compat_write_data	= parport_ieee1284_write_compat,</div><div class='add'>+	.nibble_read_data	= parport_ieee1284_read_nibble,</div><div class='add'>+	.byte_read_data		= parport_ieee1284_read_byte,</div><div class='add'>+</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int parport_ax88796_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *_dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct ax_drvdata *dd;</div><div class='add'>+	struct parport *pp = NULL;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	int spacing;</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dd = kzalloc(sizeof(struct ax_drvdata), GFP_KERNEL);</div><div class='add'>+	if (dd == NULL) {</div><div class='add'>+		dev_err(_dev, "no memory for private data\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (res == NULL) {</div><div class='add'>+		dev_err(_dev, "no MEM specified\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto exit_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = (res-&gt;end - res-&gt;start) + 1;</div><div class='add'>+	spacing = size / 3;</div><div class='add'>+</div><div class='add'>+	dd-&gt;io = request_mem_region(res-&gt;start, size, pdev-&gt;name);</div><div class='add'>+	if (dd-&gt;io == NULL) {</div><div class='add'>+		dev_err(_dev, "cannot reserve memory\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto exit_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dd-&gt;base = ioremap(res-&gt;start, size);</div><div class='add'>+	if (dd-&gt;base == NULL) {</div><div class='add'>+		dev_err(_dev, "cannot ioremap region\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		goto exit_res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt;= 0)</div><div class='add'>+		irq = PARPORT_IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	pp = parport_register_port((unsigned long)dd-&gt;base, irq,</div><div class='add'>+				   PARPORT_DMA_NONE,</div><div class='add'>+				   &amp;parport_ax88796_ops);</div><div class='add'>+</div><div class='add'>+	if (pp == NULL) {</div><div class='add'>+		dev_err(_dev, "failed to register parallel port\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto exit_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pp-&gt;private_data = dd;</div><div class='add'>+	dd-&gt;parport = pp;</div><div class='add'>+	dd-&gt;dev = _dev;</div><div class='add'>+</div><div class='add'>+	dd-&gt;spp_data = dd-&gt;base;</div><div class='add'>+	dd-&gt;spp_spr  = dd-&gt;base + (spacing * 1);</div><div class='add'>+	dd-&gt;spp_cpr  = dd-&gt;base + (spacing * 2);</div><div class='add'>+</div><div class='add'>+	/* initialise the port controls */</div><div class='add'>+	writeb(AX_CPR_STRB, dd-&gt;spp_cpr);</div><div class='add'>+</div><div class='add'>+	if (irq &gt;= 0) {</div><div class='add'>+		/* request irq */</div><div class='add'>+		ret = request_irq(irq, parport_ax88796_interrupt,</div><div class='add'>+				  IRQF_TRIGGER_FALLING, pdev-&gt;name, pp);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto exit_port;</div><div class='add'>+</div><div class='add'>+		dd-&gt;irq_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, pp);</div><div class='add'>+</div><div class='add'>+	dev_info(_dev, "attached parallel port driver\n");</div><div class='add'>+	parport_announce_port(pp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ exit_port:</div><div class='add'>+	parport_remove_port(pp);</div><div class='add'>+ exit_unmap:</div><div class='add'>+	iounmap(dd-&gt;base);</div><div class='add'>+ exit_res:</div><div class='add'>+	release_resource(dd-&gt;io);</div><div class='add'>+	kfree(dd-&gt;io);</div><div class='add'>+ exit_mem:</div><div class='add'>+	kfree(dd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parport_ax88796_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct parport *p = platform_get_drvdata(pdev);</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	free_irq(p-&gt;irq, p);</div><div class='add'>+	parport_remove_port(p);</div><div class='add'>+	iounmap(dd-&gt;base);</div><div class='add'>+	release_resource(dd-&gt;io);</div><div class='add'>+	kfree(dd-&gt;io);</div><div class='add'>+	kfree(dd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int parport_ax88796_suspend(struct platform_device *dev,</div><div class='add'>+				   pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct parport *p = platform_get_drvdata(dev);</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	parport_ax88796_save_state(p, &amp;dd-&gt;suspend);</div><div class='add'>+	writeb(AX_CPR_nDOE | AX_CPR_STRB, dd-&gt;spp_cpr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parport_ax88796_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct parport *p = platform_get_drvdata(dev);</div><div class='add'>+	struct ax_drvdata *dd = pp_to_drv(p);</div><div class='add'>+</div><div class='add'>+	parport_ax88796_restore_state(p, &amp;dd-&gt;suspend);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define parport_ax88796_suspend NULL</div><div class='add'>+#define parport_ax88796_resume  NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver axdrv = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ax88796-pp",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe		= parport_ax88796_probe,</div><div class='add'>+	.remove		= parport_ax88796_remove,</div><div class='add'>+	.suspend	= parport_ax88796_suspend,</div><div class='add'>+	.resume		= parport_ax88796_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init parport_ax88796_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;axdrv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit parport_ax88796_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;axdrv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(parport_ax88796_init)</div><div class='add'>+module_exit(parport_ax88796_exit)</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='add'>+MODULE_DESCRIPTION("AX88796 Parport parallel port driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c<br/>index 1de52d9febf9..7352104f7b30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_gsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_gsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_gsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/parport_gsc.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * 	    Phil Blundell &lt;philb@gnu.org&gt;</div><div class='ctx'>  *          Tim Waugh &lt;tim@cyberelk.demon.co.uk&gt;</div><div class='ctx'>  *	    Jose Renau &lt;renau@acm.org&gt;</div><div class='del'>- *          David Campbell &lt;campbell@torque.net&gt;</div><div class='add'>+ *          David Campbell</div><div class='ctx'>  *          Andrea Arcangeli</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/parport_gsc.h b/drivers/parport/parport_gsc.h<br/>index 662f6c1fee5d..fc9c37c54022 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_gsc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_gsc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_gsc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/parport_gsc.h</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'>  * 	    Phil Blundell &lt;Philip.Blundell@pobox.com&gt;</div><div class='ctx'>  *          Tim Waugh &lt;tim@cyberelk.demon.co.uk&gt;</div><div class='ctx'>  *	    Jose Renau &lt;renau@acm.org&gt;</div><div class='del'>- *          David Campbell &lt;campbell@torque.net&gt;</div><div class='add'>+ *          David Campbell</div><div class='ctx'>  *          Andrea Arcangeli</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c<br/>index c85364765ef8..b2b8092a2b39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_mfc3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_mfc3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_mfc3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/parport_mfc3.c</a></div><div class='hunk'>@@ -353,7 +353,7 @@ static int __init parport_mfc3_init(void)</div><div class='ctx'> </div><div class='ctx'> 		if (p-&gt;irq != PARPORT_IRQ_NONE) {</div><div class='ctx'> 			if (use_cnt++ == 0)</div><div class='del'>-				if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt, SA_SHIRQ, p-&gt;name, &amp;pp_mfc3_ops))</div><div class='add'>+				if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt, IRQF_SHARED, p-&gt;name, &amp;pp_mfc3_ops))</div><div class='ctx'> 					goto out_irq;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c<br/>index 48bbf32fd980..fe800dc0be9f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_pc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_pc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_pc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/parport_pc.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * Authors: Phil Blundell &lt;philb@gnu.org&gt;</div><div class='ctx'>  *          Tim Waugh &lt;tim@cyberelk.demon.co.uk&gt;</div><div class='ctx'>  *	    Jose Renau &lt;renau@acm.org&gt;</div><div class='del'>- *          David Campbell &lt;campbell@torque.net&gt;</div><div class='add'>+ *          David Campbell</div><div class='ctx'>  *          Andrea Arcangeli</div><div class='ctx'>  *</div><div class='ctx'>  * based on work by Grant Guenther &lt;grant@torque.net&gt; and Phil Blundell.</div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'>  * but rather will start at port-&gt;base_hi.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c<br/>index 36a1556e64c7..fac333b279bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/parport_sunbpp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/parport_sunbpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/parport_sunbpp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/parport_sunbpp.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/* $Id: parport_sunbpp.c,v 1.12 2001/05/26 03:01:42 davem Exp $</div><div class='del'>- * Parallel-port routines for Sun architecture</div><div class='add'>+/* parport_sunbpp.c: Parallel-port routines for SBUS</div><div class='ctx'>  * </div><div class='ctx'>  * Author: Derrick J. Brashear &lt;shadow@dementia.org&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,6 +13,9 @@</div><div class='ctx'>  *          Gus Baldauf (gbaldauf@ix.netcom.com)</div><div class='ctx'>  *          Peter Zaitcev</div><div class='ctx'>  *          Tom Dyas</div><div class='add'>+ *</div><div class='add'>+ * Updated to new SBUS device framework: David S. Miller &lt;davem@davemloft.net&gt;</div><div class='add'>+ * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -287,14 +289,7 @@ static struct parport_operations parport_sunbpp_ops =</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef struct {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	struct parport *port;</div><div class='del'>-} Node;</div><div class='del'>-/* no locks, everything's serialized */</div><div class='del'>-static LIST_HEAD(port_list);</div><div class='del'>-</div><div class='del'>-static int __init init_one_port(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit init_one_port(struct sbus_dev *sdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct parport *p;</div><div class='ctx'> 	/* at least in theory there may be a "we don't dma" case */</div><div class='hunk'>@@ -303,109 +298,120 @@ static int __init init_one_port(struct sbus_dev *sdev)</div><div class='ctx'> 	int irq, dma, err = 0, size;</div><div class='ctx'> 	struct bpp_regs __iomem *regs;</div><div class='ctx'> 	unsigned char value_tcr;</div><div class='del'>-	Node *node;</div><div class='del'>-</div><div class='del'>-	dprintk((KERN_DEBUG "init_one_port(%p): ranges, alloc_io, ", sdev));</div><div class='del'>-	node = kmalloc(sizeof(Node), GFP_KERNEL);</div><div class='del'>-	if (!node)</div><div class='del'>-		goto out0;</div><div class='ctx'> </div><div class='ctx'> 	irq = sdev-&gt;irqs[0];</div><div class='ctx'> 	base = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='ctx'> 			    sdev-&gt;reg_addrs[0].reg_size, </div><div class='ctx'> 			    "sunbpp");</div><div class='ctx'> 	if (!base)</div><div class='del'>-		goto out1;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	size = sdev-&gt;reg_addrs[0].reg_size;</div><div class='ctx'> 	dma = PARPORT_DMA_NONE;</div><div class='ctx'> </div><div class='del'>-	dprintk(("alloc(ppops), "));</div><div class='del'>-	ops = kmalloc (sizeof (struct parport_operations), GFP_KERNEL);</div><div class='add'>+	ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL);</div><div class='ctx'>         if (!ops)</div><div class='del'>-		goto out2;</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> </div><div class='ctx'>         memcpy (ops, &amp;parport_sunbpp_ops, sizeof (struct parport_operations));</div><div class='ctx'> </div><div class='ctx'> 	dprintk(("register_port\n"));</div><div class='ctx'> 	if (!(p = parport_register_port((unsigned long)base, irq, dma, ops)))</div><div class='del'>-		goto out3;</div><div class='add'>+		goto out_free_ops;</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;size = size;</div><div class='ctx'> </div><div class='del'>-	dprintk((KERN_DEBUG "init_one_port: request_irq(%08x:%p:%x:%s:%p) ",</div><div class='del'>-		p-&gt;irq, parport_sunbpp_interrupt, SA_SHIRQ, p-&gt;name, p));</div><div class='ctx'> 	if ((err = request_irq(p-&gt;irq, parport_sunbpp_interrupt,</div><div class='del'>-			       SA_SHIRQ, p-&gt;name, p)) != 0) {</div><div class='del'>-		dprintk(("ERROR %d\n", err));</div><div class='del'>-		goto out4;</div><div class='add'>+			       IRQF_SHARED, p-&gt;name, p)) != 0) {</div><div class='add'>+		goto out_put_port;</div><div class='ctx'> 	}</div><div class='del'>-	dprintk(("OK\n"));</div><div class='add'>+</div><div class='ctx'> 	parport_sunbpp_enable_irq(p);</div><div class='ctx'> </div><div class='ctx'> 	regs = (struct bpp_regs __iomem *)p-&gt;base;</div><div class='del'>-	dprintk((KERN_DEBUG "forward\n"));</div><div class='add'>+</div><div class='ctx'> 	value_tcr = sbus_readb(&amp;regs-&gt;p_tcr);</div><div class='ctx'> 	value_tcr &amp;= ~P_TCR_DIR;</div><div class='ctx'> 	sbus_writeb(value_tcr, &amp;regs-&gt;p_tcr);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s: sunbpp at 0x%lx\n", p-&gt;name, p-&gt;base);</div><div class='del'>-	node-&gt;port = p;</div><div class='del'>-	list_add(&amp;node-&gt;list, &amp;port_list);</div><div class='del'>-	parport_announce_port (p);</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, p);</div><div class='add'>+</div><div class='add'>+	parport_announce_port(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-out4:</div><div class='add'>+out_put_port:</div><div class='ctx'> 	parport_put_port(p);</div><div class='del'>-out3:</div><div class='add'>+</div><div class='add'>+out_free_ops:</div><div class='ctx'> 	kfree(ops);</div><div class='del'>-out2:</div><div class='add'>+</div><div class='add'>+out_unmap:</div><div class='ctx'> 	sbus_iounmap(base, size);</div><div class='del'>-out1:</div><div class='del'>-	kfree(node);</div><div class='del'>-out0:</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init parport_sunbpp_init(void)</div><div class='add'>+static int __devinit bpp_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-        struct sbus_bus *sbus;</div><div class='del'>-        struct sbus_dev *sdev;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			if (!strcmp(sdev-&gt;prom_name, "SUNW,bpp"))</div><div class='del'>-				count += init_one_port(sdev);</div><div class='del'>-		}</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return init_one_port(sdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit bpp_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct parport *p = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct parport_operations *ops = p-&gt;ops;</div><div class='add'>+</div><div class='add'>+	parport_remove_port(p);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;irq != PARPORT_IRQ_NONE) {</div><div class='add'>+		parport_sunbpp_disable_irq(p);</div><div class='add'>+		free_irq(p-&gt;irq, p);</div><div class='ctx'> 	}</div><div class='del'>-	return count ? 0 : -ENODEV;</div><div class='add'>+</div><div class='add'>+	sbus_iounmap((void __iomem *) p-&gt;base, p-&gt;size);</div><div class='add'>+	parport_put_port(p);</div><div class='add'>+	kfree(ops);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id bpp_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,bpp",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, bpp_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver bpp_sbus_driver = {</div><div class='add'>+	.name		= "bpp",</div><div class='add'>+	.match_table	= bpp_match,</div><div class='add'>+	.probe		= bpp_probe,</div><div class='add'>+	.remove		= __devexit_p(bpp_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init parport_sunbpp_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;bpp_sbus_driver, &amp;sbus_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit parport_sunbpp_exit(void)</div><div class='ctx'> {</div><div class='del'>-	while (!list_empty(&amp;port_list)) {</div><div class='del'>-		Node *node = list_entry(port_list.next, Node, list);</div><div class='del'>-		struct parport *p = node-&gt;port;</div><div class='del'>-		struct parport_operations *ops = p-&gt;ops;</div><div class='del'>-		parport_remove_port(p);</div><div class='del'>-</div><div class='del'>-		if (p-&gt;irq != PARPORT_IRQ_NONE) {</div><div class='del'>-			parport_sunbpp_disable_irq(p);</div><div class='del'>-			free_irq(p-&gt;irq, p);</div><div class='del'>-		}</div><div class='del'>-		sbus_iounmap((void __iomem *)p-&gt;base, p-&gt;size);</div><div class='del'>-		parport_put_port(p);</div><div class='del'>-		kfree (ops);</div><div class='del'>-		list_del(&amp;node-&gt;list);</div><div class='del'>-		kfree (node);</div><div class='del'>-	}</div><div class='add'>+	of_unregister_driver(&amp;bpp_sbus_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Derrick J Brashear");</div><div class='ctx'> MODULE_DESCRIPTION("Parport Driver for Sparc bidirectional Port");</div><div class='ctx'> MODULE_SUPPORTED_DEVICE("Sparc Bidirectional Parallel Port");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_init(parport_sunbpp_init)</div><div class='head'>diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c<br/>index cbe17184b9c7..2e744a274517 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/procfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/procfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/procfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/procfs.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* Sysctl interface for parport devices.</div><div class='ctx'>  * </div><div class='del'>- * Authors: David Campbell &lt;campbell@torque.net&gt;</div><div class='add'>+ * Authors: David Campbell</div><div class='ctx'>  *          Tim Waugh &lt;tim@cyberelk.demon.co.uk&gt;</div><div class='ctx'>  *          Philip Blundell &lt;philb@gnu.org&gt;</div><div class='ctx'>  *          Andrea Arcangeli</div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/parport/share.c b/drivers/parport/share.c<br/>index bbbfd79adbaf..94dc506b83d1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/parport/share.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/parport/share.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/parport/share.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/parport/share.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef PARPORT_DEBUG_SHARING		/* undef for production */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='hunk'>@@ -218,7 +217,7 @@ static void free_port (struct parport *port)</div><div class='ctx'>  *	parport_get_port - increment a port's reference count</div><div class='ctx'>  *	@port: the port</div><div class='ctx'>  *</div><div class='del'>- *	This ensure's that a struct parport pointer remains valid</div><div class='add'>+ *	This ensures that a struct parport pointer remains valid</div><div class='ctx'>  *	until the matching parport_put_port() call.</div><div class='ctx'>  **/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile<br/>index 6707df968934..f2d152b818f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/Makefile</a></div><div class='hunk'>@@ -26,7 +26,11 @@ obj-$(CONFIG_PPC32) += setup-irq.o</div><div class='ctx'> obj-$(CONFIG_PPC64) += setup-bus.o</div><div class='ctx'> obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o</div><div class='ctx'> obj-$(CONFIG_X86_VISWS) += setup-irq.o</div><div class='del'>-obj-$(CONFIG_PCI_MSI) += msi.o</div><div class='add'>+</div><div class='add'>+msiobj-y := msi.o msi-apic.o</div><div class='add'>+msiobj-$(CONFIG_IA64_GENERIC) += msi-altix.o</div><div class='add'>+msiobj-$(CONFIG_IA64_SGI_SN2) += msi-altix.o</div><div class='add'>+obj-$(CONFIG_PCI_MSI) += $(msiobj-y)</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # ACPI Related PCI FW Functions</div><div class='head'>diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c<br/>index eed67d9e73bc..5f7db9d2436e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/bus.c</a></div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,</div><div class='del'>-	unsigned long size, unsigned long align, unsigned long min,</div><div class='del'>-	unsigned int type_mask,</div><div class='del'>-	void (*alignf)(void *, struct resource *,</div><div class='del'>-			unsigned long, unsigned long),</div><div class='del'>-	void *alignf_data)</div><div class='add'>+		resource_size_t size, resource_size_t align,</div><div class='add'>+		resource_size_t min, unsigned int type_mask,</div><div class='add'>+		void (*alignf)(void *, struct resource *, resource_size_t,</div><div class='add'>+				resource_size_t),</div><div class='add'>+		void *alignf_data)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -81,9 +81,9 @@ void __devinit pci_bus_add_device(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	device_add(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_write(&amp;pci_bus_sem);</div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;global_list, &amp;pci_devices);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_write(&amp;pci_bus_sem);</div><div class='ctx'> </div><div class='ctx'> 	pci_proc_attach_device(dev);</div><div class='ctx'> 	pci_create_sysfs_dev_files(dev);</div><div class='hunk'>@@ -125,10 +125,10 @@ void __devinit pci_bus_add_devices(struct pci_bus *bus)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dev-&gt;subordinate) {</div><div class='ctx'> 		       if (list_empty(&amp;dev-&gt;subordinate-&gt;node)) {</div><div class='del'>-			       spin_lock(&amp;pci_bus_lock);</div><div class='add'>+			       down_write(&amp;pci_bus_sem);</div><div class='ctx'> 			       list_add_tail(&amp;dev-&gt;subordinate-&gt;node,</div><div class='ctx'> 					       &amp;dev-&gt;bus-&gt;children);</div><div class='del'>-			       spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+			       up_write(&amp;pci_bus_sem);</div><div class='ctx'> 		       }</div><div class='ctx'> 			pci_bus_add_devices(dev-&gt;subordinate);</div><div class='ctx'> </div><div class='hunk'>@@ -168,7 +168,7 @@ void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),</div><div class='ctx'> 	struct list_head *next;</div><div class='ctx'> </div><div class='ctx'> 	bus = top;</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	next = top-&gt;devices.next;</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (next == &amp;bus-&gt;devices) {</div><div class='hunk'>@@ -180,22 +180,19 @@ void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev = list_entry(next, struct pci_dev, bus_list);</div><div class='del'>-		pci_dev_get(dev);</div><div class='ctx'> 		if (dev-&gt;subordinate) {</div><div class='ctx'> 			/* this is a pci-pci bridge, do its devices next */</div><div class='ctx'> 			next = dev-&gt;subordinate-&gt;devices.next;</div><div class='ctx'> 			bus = dev-&gt;subordinate;</div><div class='ctx'> 		} else</div><div class='ctx'> 			next = dev-&gt;bus_list.next;</div><div class='del'>-		spin_unlock(&amp;pci_bus_lock);</div><div class='ctx'> </div><div class='del'>-		/* Run device routines with the bus unlocked */</div><div class='add'>+		/* Run device routines with the device locked */</div><div class='add'>+		down(&amp;dev-&gt;dev.sem);</div><div class='ctx'> 		cb(dev, userdata);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;pci_bus_lock);</div><div class='del'>-		pci_dev_put(dev);</div><div class='add'>+		up(&amp;dev-&gt;dev.sem);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pci_walk_bus);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig<br/>index 222a1cc4aa28..3fae77ffb2fa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/Kconfig</a></div><div class='hunk'>@@ -6,8 +6,7 @@ menu "PCI Hotplug Support"</div><div class='ctx'> </div><div class='ctx'> config HOTPLUG_PCI</div><div class='ctx'> 	tristate "Support for PCI Hotplug (EXPERIMENTAL)"</div><div class='del'>-	depends on PCI &amp;&amp; EXPERIMENTAL</div><div class='del'>-	select HOTPLUG</div><div class='add'>+	depends on PCI &amp;&amp; EXPERIMENTAL &amp;&amp; HOTPLUG</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Say Y here if you have a motherboard with a PCI Hotplug controller.</div><div class='ctx'> 	  This allows you to add and remove PCI cards while the machine is</div><div class='hunk'>@@ -77,7 +76,7 @@ config HOTPLUG_PCI_IBM</div><div class='ctx'> </div><div class='ctx'> config HOTPLUG_PCI_ACPI</div><div class='ctx'> 	tristate "ACPI PCI Hotplug driver"</div><div class='del'>-	depends on ACPI &amp;&amp; HOTPLUG_PCI</div><div class='add'>+	depends on ACPI_DOCK &amp;&amp; HOTPLUG_PCI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you have a system that supports PCI Hotplug using</div><div class='ctx'> 	  ACPI.</div><div class='head'>diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile<br/>index 421cfffb1756..34a1891191fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/Makefile</a></div><div class='hunk'>@@ -40,8 +40,7 @@ ibmphp-objs		:=	ibmphp_core.o	\</div><div class='ctx'> 				ibmphp_hpc.o</div><div class='ctx'> </div><div class='ctx'> acpiphp-objs		:=	acpiphp_core.o	\</div><div class='del'>-				acpiphp_glue.o  \</div><div class='del'>-				acpiphp_dock.o</div><div class='add'>+				acpiphp_glue.o</div><div class='ctx'> </div><div class='ctx'> rpaphp-objs		:=	rpaphp_core.o	\</div><div class='ctx'> 				rpaphp_pci.o	\</div><div class='head'>diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c<br/>index 39af9c325f35..51cb9f817c22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpi_pcihp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpi_pcihp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpi_pcihp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/acpi_pcihp.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -33,10 +34,184 @@</div><div class='ctx'> #include &lt;acpi/actypes.h&gt;</div><div class='ctx'> #include "pci_hotplug.h"</div><div class='ctx'> </div><div class='add'>+#define MY_NAME	"acpi_pcihp"</div><div class='add'>+</div><div class='add'>+#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)</div><div class='add'>+#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)</div><div class='add'>+#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)</div><div class='add'>+#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)</div><div class='add'>+</div><div class='ctx'> #define	METHOD_NAME__SUN	"_SUN"</div><div class='ctx'> #define	METHOD_NAME__HPP	"_HPP"</div><div class='ctx'> #define	METHOD_NAME_OSHP	"OSHP"</div><div class='ctx'> </div><div class='add'>+static int debug_acpi;</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+decode_type0_hpx_record(union acpi_object *record, struct hotplug_params *hpx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	union acpi_object *fields = record-&gt;package.elements;</div><div class='add'>+	u32 revision = fields[1].integer.value;</div><div class='add'>+</div><div class='add'>+	switch (revision) {</div><div class='add'>+	case 1:</div><div class='add'>+		if (record-&gt;package.count != 6)</div><div class='add'>+			return AE_ERROR;</div><div class='add'>+		for (i = 2; i &lt; 6; i++)</div><div class='add'>+			if (fields[i].type != ACPI_TYPE_INTEGER)</div><div class='add'>+				return AE_ERROR;</div><div class='add'>+		hpx-&gt;t0 = &amp;hpx-&gt;type0_data;</div><div class='add'>+		hpx-&gt;t0-&gt;revision        = revision;</div><div class='add'>+		hpx-&gt;t0-&gt;cache_line_size = fields[2].integer.value;</div><div class='add'>+		hpx-&gt;t0-&gt;latency_timer   = fields[3].integer.value;</div><div class='add'>+		hpx-&gt;t0-&gt;enable_serr     = fields[4].integer.value;</div><div class='add'>+		hpx-&gt;t0-&gt;enable_perr     = fields[5].integer.value;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "%s: Type 0 Revision %d record not supported\n",</div><div class='add'>+		       __FUNCTION__, revision);</div><div class='add'>+		return AE_ERROR;</div><div class='add'>+	}</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+decode_type1_hpx_record(union acpi_object *record, struct hotplug_params *hpx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	union acpi_object *fields = record-&gt;package.elements;</div><div class='add'>+	u32 revision = fields[1].integer.value;</div><div class='add'>+</div><div class='add'>+	switch (revision) {</div><div class='add'>+	case 1:</div><div class='add'>+		if (record-&gt;package.count != 5)</div><div class='add'>+			return AE_ERROR;</div><div class='add'>+		for (i = 2; i &lt; 5; i++)</div><div class='add'>+			if (fields[i].type != ACPI_TYPE_INTEGER)</div><div class='add'>+				return AE_ERROR;</div><div class='add'>+		hpx-&gt;t1 = &amp;hpx-&gt;type1_data;</div><div class='add'>+		hpx-&gt;t1-&gt;revision      = revision;</div><div class='add'>+		hpx-&gt;t1-&gt;max_mem_read  = fields[2].integer.value;</div><div class='add'>+		hpx-&gt;t1-&gt;avg_max_split = fields[3].integer.value;</div><div class='add'>+		hpx-&gt;t1-&gt;tot_max_split = fields[4].integer.value;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "%s: Type 1 Revision %d record not supported\n",</div><div class='add'>+		       __FUNCTION__, revision);</div><div class='add'>+		return AE_ERROR;</div><div class='add'>+	}</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+decode_type2_hpx_record(union acpi_object *record, struct hotplug_params *hpx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	union acpi_object *fields = record-&gt;package.elements;</div><div class='add'>+	u32 revision = fields[1].integer.value;</div><div class='add'>+</div><div class='add'>+	switch (revision) {</div><div class='add'>+	case 1:</div><div class='add'>+		if (record-&gt;package.count != 18)</div><div class='add'>+			return AE_ERROR;</div><div class='add'>+		for (i = 2; i &lt; 18; i++)</div><div class='add'>+			if (fields[i].type != ACPI_TYPE_INTEGER)</div><div class='add'>+				return AE_ERROR;</div><div class='add'>+		hpx-&gt;t2 = &amp;hpx-&gt;type2_data;</div><div class='add'>+		hpx-&gt;t2-&gt;revision      = revision;</div><div class='add'>+		hpx-&gt;t2-&gt;unc_err_mask_and      = fields[2].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;unc_err_mask_or       = fields[3].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;unc_err_sever_and     = fields[4].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;unc_err_sever_or      = fields[5].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;cor_err_mask_and      = fields[6].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;cor_err_mask_or       = fields[7].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;adv_err_cap_and       = fields[8].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;adv_err_cap_or        = fields[9].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;pci_exp_devctl_and    = fields[10].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;pci_exp_devctl_or     = fields[11].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;pci_exp_lnkctl_and    = fields[12].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;pci_exp_lnkctl_or     = fields[13].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;sec_unc_err_sever_and = fields[14].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;sec_unc_err_sever_or  = fields[15].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;sec_unc_err_mask_and  = fields[16].integer.value;</div><div class='add'>+		hpx-&gt;t2-&gt;sec_unc_err_mask_or   = fields[17].integer.value;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "%s: Type 2 Revision %d record not supported\n",</div><div class='add'>+		       __FUNCTION__, revision);</div><div class='add'>+		return AE_ERROR;</div><div class='add'>+	}</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status</div><div class='add'>+acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='add'>+	union acpi_object *package, *record, *fields;</div><div class='add'>+	u32 type;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Clear the return buffer with zeros */</div><div class='add'>+	memset(hpx, 0, sizeof(struct hotplug_params));</div><div class='add'>+</div><div class='add'>+	status = acpi_evaluate_object(handle, "_HPX", NULL, &amp;buffer);</div><div class='add'>+	if (ACPI_FAILURE(status))</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	package = (union acpi_object *)buffer.pointer;</div><div class='add'>+	if (package-&gt;type != ACPI_TYPE_PACKAGE) {</div><div class='add'>+		status = AE_ERROR;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; package-&gt;package.count; i++) {</div><div class='add'>+		record = &amp;package-&gt;package.elements[i];</div><div class='add'>+		if (record-&gt;type != ACPI_TYPE_PACKAGE) {</div><div class='add'>+			status = AE_ERROR;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		fields = record-&gt;package.elements;</div><div class='add'>+		if (fields[0].type != ACPI_TYPE_INTEGER ||</div><div class='add'>+		    fields[1].type != ACPI_TYPE_INTEGER) {</div><div class='add'>+			status = AE_ERROR;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		type = fields[0].integer.value;</div><div class='add'>+		switch (type) {</div><div class='add'>+		case 0:</div><div class='add'>+			status = decode_type0_hpx_record(record, hpx);</div><div class='add'>+			if (ACPI_FAILURE(status))</div><div class='add'>+				goto exit;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			status = decode_type1_hpx_record(record, hpx);</div><div class='add'>+			if (ACPI_FAILURE(status))</div><div class='add'>+				goto exit;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			status = decode_type2_hpx_record(record, hpx);</div><div class='add'>+			if (ACPI_FAILURE(status))</div><div class='add'>+				goto exit;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			printk(KERN_ERR "%s: Type %d record not supported\n",</div><div class='add'>+			       __FUNCTION__, type);</div><div class='add'>+			status = AE_ERROR;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+ exit:</div><div class='add'>+	kfree(buffer.pointer);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static acpi_status</div><div class='ctx'> acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)</div><div class='hunk'>@@ -50,6 +225,9 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)</div><div class='ctx'> </div><div class='ctx'> 	acpi_get_name(handle, ACPI_FULL_PATHNAME, &amp;string);</div><div class='ctx'> </div><div class='add'>+	/* Clear the return buffer with zeros */</div><div class='add'>+	memset(hpp, 0, sizeof(struct hotplug_params));</div><div class='add'>+</div><div class='ctx'> 	/* get _hpp */</div><div class='ctx'> 	status = acpi_evaluate_object(handle, METHOD_NAME__HPP, NULL, &amp;ret_buf);</div><div class='ctx'> 	switch (status) {</div><div class='hunk'>@@ -58,7 +236,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)</div><div class='ctx'> 		if (!ret_buf.pointer) {</div><div class='ctx'> 			printk(KERN_ERR "%s:%s alloc for _HPP fail\n",</div><div class='ctx'> 				__FUNCTION__, (char *)string.pointer);</div><div class='del'>-			acpi_os_free(string.pointer);</div><div class='add'>+			kfree(string.pointer);</div><div class='ctx'> 			return AE_NO_MEMORY;</div><div class='ctx'> 		}</div><div class='ctx'> 		status = acpi_evaluate_object(handle, METHOD_NAME__HPP,</div><div class='hunk'>@@ -69,7 +247,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)</div><div class='ctx'> 		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__,</div><div class='ctx'> 				(char *)string.pointer, status);</div><div class='del'>-			acpi_os_free(string.pointer);</div><div class='add'>+			kfree(string.pointer);</div><div class='ctx'> 			return status;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -98,19 +276,20 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hpp-&gt;cache_line_size = nui[0];</div><div class='del'>-	hpp-&gt;latency_timer = nui[1];</div><div class='del'>-	hpp-&gt;enable_serr = nui[2];</div><div class='del'>-	hpp-&gt;enable_perr = nui[3];</div><div class='add'>+	hpp-&gt;t0 = &amp;hpp-&gt;type0_data;</div><div class='add'>+	hpp-&gt;t0-&gt;cache_line_size = nui[0];</div><div class='add'>+	hpp-&gt;t0-&gt;latency_timer = nui[1];</div><div class='add'>+	hpp-&gt;t0-&gt;enable_serr = nui[2];</div><div class='add'>+	hpp-&gt;t0-&gt;enable_perr = nui[3];</div><div class='ctx'> </div><div class='del'>-	pr_debug("  _HPP: cache_line_size=0x%x\n", hpp-&gt;cache_line_size);</div><div class='del'>-	pr_debug("  _HPP: latency timer  =0x%x\n", hpp-&gt;latency_timer);</div><div class='del'>-	pr_debug("  _HPP: enable SERR    =0x%x\n", hpp-&gt;enable_serr);</div><div class='del'>-	pr_debug("  _HPP: enable PERR    =0x%x\n", hpp-&gt;enable_perr);</div><div class='add'>+	pr_debug("  _HPP: cache_line_size=0x%x\n", hpp-&gt;t0-&gt;cache_line_size);</div><div class='add'>+	pr_debug("  _HPP: latency timer  =0x%x\n", hpp-&gt;t0-&gt;latency_timer);</div><div class='add'>+	pr_debug("  _HPP: enable SERR    =0x%x\n", hpp-&gt;t0-&gt;enable_serr);</div><div class='add'>+	pr_debug("  _HPP: enable PERR    =0x%x\n", hpp-&gt;t0-&gt;enable_perr);</div><div class='ctx'> </div><div class='ctx'> free_and_return:</div><div class='del'>-	acpi_os_free(string.pointer);</div><div class='del'>-	acpi_os_free(ret_buf.pointer);</div><div class='add'>+	kfree(string.pointer);</div><div class='add'>+	kfree(ret_buf.pointer);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -130,13 +309,17 @@ acpi_status acpi_run_oshp(acpi_handle handle)</div><div class='ctx'> 	/* run OSHP */</div><div class='ctx'> 	status = acpi_evaluate_object(handle, METHOD_NAME_OSHP, NULL, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		printk(KERN_ERR "%s:%s OSHP fails=0x%x\n", __FUNCTION__,</div><div class='del'>-			(char *)string.pointer, status);</div><div class='add'>+		if (status != AE_NOT_FOUND)</div><div class='add'>+			printk(KERN_ERR "%s:%s OSHP fails=0x%x\n",</div><div class='add'>+			       __FUNCTION__, (char *)string.pointer, status);</div><div class='add'>+		else</div><div class='add'>+			dbg("%s:%s OSHP not found\n",</div><div class='add'>+			    __FUNCTION__, (char *)string.pointer);</div><div class='ctx'> 	else</div><div class='ctx'> 		pr_debug("%s:%s OSHP passes\n", __FUNCTION__,</div><div class='ctx'> 			(char *)string.pointer);</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(string.pointer);</div><div class='add'>+	kfree(string.pointer);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_run_oshp);</div><div class='hunk'>@@ -145,14 +328,27 @@ EXPORT_SYMBOL_GPL(acpi_run_oshp);</div><div class='ctx'> </div><div class='ctx'> /* acpi_get_hp_params_from_firmware</div><div class='ctx'>  *</div><div class='del'>- * @dev - the pci_dev of the newly added device</div><div class='add'>+ * @bus - the pci_bus of the bus on which the device is newly added</div><div class='ctx'>  * @hpp - allocated by the caller</div><div class='ctx'>  */</div><div class='del'>-acpi_status acpi_get_hp_params_from_firmware(struct pci_dev *dev,</div><div class='add'>+acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,</div><div class='ctx'> 		struct hotplug_params *hpp)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status = AE_NOT_FOUND;</div><div class='del'>-	struct pci_dev *pdev = dev;</div><div class='add'>+	acpi_handle handle, phandle;</div><div class='add'>+	struct pci_bus *pbus = bus;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		pdev = pbus-&gt;self;</div><div class='add'>+		if (!pdev) {</div><div class='add'>+			handle = acpi_get_pci_rootbridge_handle(</div><div class='add'>+				pci_domain_nr(pbus), pbus-&gt;number);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		handle = DEVICE_ACPI_HANDLE(&amp;(pdev-&gt;dev));</div><div class='add'>+		pbus = pbus-&gt;parent;</div><div class='add'>+	} while (!handle);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * _HPP settings apply to all child buses, until another _HPP is</div><div class='hunk'>@@ -160,15 +356,19 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_dev *dev,</div><div class='ctx'> 	 * look for it in the parent device scope since that would apply to</div><div class='ctx'> 	 * this pci dev. If we don't find any _HPP, use hardcoded defaults</div><div class='ctx'> 	 */</div><div class='del'>-	while (pdev &amp;&amp; (ACPI_FAILURE(status))) {</div><div class='del'>-		acpi_handle handle = DEVICE_ACPI_HANDLE(&amp;(pdev-&gt;dev));</div><div class='del'>-		if (!handle)</div><div class='add'>+	while (handle) {</div><div class='add'>+		status = acpi_run_hpx(handle, hpp);</div><div class='add'>+		if (ACPI_SUCCESS(status))</div><div class='ctx'> 			break;</div><div class='ctx'> 		status = acpi_run_hpp(handle, hpp);</div><div class='del'>-		if (!(pdev-&gt;bus-&gt;parent))</div><div class='add'>+		if (ACPI_SUCCESS(status))</div><div class='ctx'> 			break;</div><div class='del'>-		/* Check if a parent object supports _HPP */</div><div class='del'>-		pdev = pdev-&gt;bus-&gt;parent-&gt;self;</div><div class='add'>+		if (acpi_root_bridge(handle))</div><div class='add'>+			break;</div><div class='add'>+		status = acpi_get_parent(handle, &amp;phandle);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			break;</div><div class='add'>+		handle = phandle;</div><div class='ctx'> 	}</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -192,20 +392,23 @@ int acpi_root_bridge(acpi_handle handle)</div><div class='ctx'> 		if ((info-&gt;valid &amp; ACPI_VALID_HID) &amp;&amp;</div><div class='ctx'> 			!strcmp(PCI_ROOT_HID_STRING,</div><div class='ctx'> 					info-&gt;hardware_id.value)) {</div><div class='del'>-			acpi_os_free(buffer.pointer);</div><div class='add'>+			kfree(buffer.pointer);</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (info-&gt;valid &amp; ACPI_VALID_CID) {</div><div class='ctx'> 			for (i=0; i &lt; info-&gt;compatibility_id.count; i++) {</div><div class='ctx'> 				if (!strcmp(PCI_ROOT_HID_STRING,</div><div class='ctx'> 					info-&gt;compatibility_id.id[i].value)) {</div><div class='del'>-					acpi_os_free(buffer.pointer);</div><div class='add'>+					kfree(buffer.pointer);</div><div class='ctx'> 					return 1;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		acpi_os_free(buffer.pointer);</div><div class='add'>+		kfree(buffer.pointer);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(acpi_root_bridge);</div><div class='add'>+</div><div class='add'>+module_param(debug_acpi, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(debug_acpi, "Debugging mode for ACPI enabled or not");</div><div class='head'>diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h<br/>index 467ac70a46ff..be104eced34c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/acpiphp.h</a></div><div class='hunk'>@@ -75,6 +75,10 @@ struct acpiphp_bridge {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	acpi_handle handle;</div><div class='ctx'> 	struct acpiphp_slot *slots;</div><div class='add'>+</div><div class='add'>+	/* Ejectable PCI-to-PCI bridge (PCI bridge and PCI function) */</div><div class='add'>+	struct acpiphp_func *func;</div><div class='add'>+</div><div class='ctx'> 	int type;</div><div class='ctx'> 	int nr_slots;</div><div class='ctx'> </div><div class='hunk'>@@ -122,10 +126,11 @@ struct acpiphp_slot {</div><div class='ctx'>  */</div><div class='ctx'> struct acpiphp_func {</div><div class='ctx'> 	struct acpiphp_slot *slot;	/* parent */</div><div class='add'>+	struct acpiphp_bridge *bridge;	/* Ejectable PCI-to-PCI bridge */</div><div class='ctx'> </div><div class='ctx'> 	struct list_head sibling;</div><div class='ctx'> 	struct pci_dev *pci_dev;</div><div class='del'>-</div><div class='add'>+	struct notifier_block nb;</div><div class='ctx'> 	acpi_handle	handle;</div><div class='ctx'> </div><div class='ctx'> 	u8		function;	/* pci function# */</div><div class='hunk'>@@ -146,24 +151,6 @@ struct acpiphp_attention_info</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct dependent_device {</div><div class='del'>-	struct list_head device_list;</div><div class='del'>-	struct list_head pci_list;</div><div class='del'>-	acpi_handle handle;</div><div class='del'>-	struct acpiphp_func *func;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct acpiphp_dock_station {</div><div class='del'>-	acpi_handle handle;</div><div class='del'>-	u32 last_dock_time;</div><div class='del'>-	u32 flags;</div><div class='del'>-	struct acpiphp_func *dock_bridge;</div><div class='del'>-	struct list_head dependent_devices;</div><div class='del'>-	struct list_head pci_dependent_devices;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* PCI bus bridge HID */</div><div class='ctx'> #define ACPI_PCI_HOST_HID		"PNP0A03"</div><div class='ctx'> </div><div class='hunk'>@@ -202,11 +189,6 @@ struct acpiphp_dock_station {</div><div class='ctx'> #define FUNC_HAS_PS2		(0x00000040)</div><div class='ctx'> #define FUNC_HAS_PS3		(0x00000080)</div><div class='ctx'> #define FUNC_HAS_DCK            (0x00000100)</div><div class='del'>-#define FUNC_IS_DD              (0x00000200)</div><div class='del'>-</div><div class='del'>-/* dock station flags */</div><div class='del'>-#define DOCK_DOCKING            (0x00000001)</div><div class='del'>-#define DOCK_HAS_BRIDGE         (0x00000002)</div><div class='ctx'> </div><div class='ctx'> /* function prototypes */</div><div class='ctx'> </div><div class='hunk'>@@ -221,7 +203,6 @@ extern int acpiphp_glue_init (void);</div><div class='ctx'> extern void acpiphp_glue_exit (void);</div><div class='ctx'> extern int acpiphp_get_num_slots (void);</div><div class='ctx'> typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);</div><div class='del'>-void handle_hotplug_event_func(acpi_handle, u32, void*);</div><div class='ctx'> </div><div class='ctx'> extern int acpiphp_enable_slot (struct acpiphp_slot *slot);</div><div class='ctx'> extern int acpiphp_disable_slot (struct acpiphp_slot *slot);</div><div class='hunk'>@@ -231,16 +212,6 @@ extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);</div><div class='ctx'> extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);</div><div class='ctx'> extern u32 acpiphp_get_address (struct acpiphp_slot *slot);</div><div class='ctx'> </div><div class='del'>-/* acpiphp_dock.c */</div><div class='del'>-extern int find_dock_station(void);</div><div class='del'>-extern void remove_dock_station(void);</div><div class='del'>-extern void add_dependent_device(struct dependent_device *new_dd);</div><div class='del'>-extern void add_pci_dependent_device(struct dependent_device *new_dd);</div><div class='del'>-extern struct dependent_device *get_dependent_device(acpi_handle handle);</div><div class='del'>-extern int is_dependent_device(acpi_handle handle);</div><div class='del'>-extern int detect_dependent_devices(acpi_handle *bridge_handle);</div><div class='del'>-extern struct dependent_device *alloc_dependent_device(acpi_handle handle);</div><div class='del'>-</div><div class='ctx'> /* variables */</div><div class='ctx'> extern int acpiphp_debug;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c<br/>index 4f1b0da8e47e..34de5697983d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/acpiphp_core.c</a></div><div class='hunk'>@@ -416,27 +416,12 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot)</div><div class='ctx'> </div><div class='ctx'> static int __init acpiphp_init(void)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='del'>-	int docking_station;</div><div class='del'>-</div><div class='ctx'> 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");</div><div class='ctx'> </div><div class='ctx'> 	acpiphp_debug = debug;</div><div class='ctx'> </div><div class='del'>-	docking_station = find_dock_station();</div><div class='del'>-</div><div class='ctx'> 	/* read all the ACPI info from the system */</div><div class='del'>-	retval = init_acpi();</div><div class='del'>-</div><div class='del'>-	/* if we have found a docking station, we should</div><div class='del'>-	 * go ahead and load even if init_acpi has found</div><div class='del'>-	 * no slots.  This handles the case when the _DCK</div><div class='del'>-	 * method not defined under the actual dock bridge</div><div class='del'>-	 */</div><div class='del'>-	if (docking_station)</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return retval;</div><div class='add'>+	return init_acpi();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -444,8 +429,6 @@ static void __exit acpiphp_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	/* deallocate internal data structures etc. */</div><div class='ctx'> 	acpiphp_glue_exit();</div><div class='del'>-</div><div class='del'>-	remove_dock_station();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(acpiphp_init);</div><div class='head'>diff --git a/drivers/pci/hotplug/acpiphp_dock.c b/drivers/pci/hotplug/acpiphp_dock.c<br/>deleted file mode 100644<br/>index 4f1aaf128312..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_dock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp_dock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,438 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ACPI PCI HotPlug dock functions to ACPI CA subsystem</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006 Kristen Carlson Accardi (kristen.c.accardi@intel.com)</div><div class='del'>- * Copyright (C) 2006 Intel Corporation</div><div class='del'>- *</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or</div><div class='del'>- * NON INFRINGEMENT.  See the GNU General Public License for more</div><div class='del'>- * details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- * Send feedback to &lt;kristen.c.accardi@intel.com&gt;</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#include "../pci.h"</div><div class='del'>-#include "pci_hotplug.h"</div><div class='del'>-#include "acpiphp.h"</div><div class='del'>-</div><div class='del'>-static struct acpiphp_dock_station *ds;</div><div class='del'>-#define MY_NAME "acpiphp_dock"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int is_dependent_device(acpi_handle handle)</div><div class='del'>-{</div><div class='del'>-	return (get_dependent_device(handle) ? 1 : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-find_dependent_device(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='del'>-{</div><div class='del'>-	int *count = (int *)context;</div><div class='del'>-</div><div class='del'>-	if (is_dependent_device(handle)) {</div><div class='del'>-		(*count)++;</div><div class='del'>-		return AE_CTRL_TERMINATE;</div><div class='del'>-	} else {</div><div class='del'>-		return AE_OK;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void add_dependent_device(struct dependent_device *new_dd)</div><div class='del'>-{</div><div class='del'>-	list_add_tail(&amp;new_dd-&gt;device_list, &amp;ds-&gt;dependent_devices);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void add_pci_dependent_device(struct dependent_device *new_dd)</div><div class='del'>-{</div><div class='del'>-	list_add_tail(&amp;new_dd-&gt;pci_list, &amp;ds-&gt;pci_dependent_devices);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct dependent_device * get_dependent_device(acpi_handle handle)</div><div class='del'>-{</div><div class='del'>-	struct dependent_device *dd;</div><div class='del'>-</div><div class='del'>-	if (!ds)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(dd, &amp;ds-&gt;dependent_devices, device_list) {</div><div class='del'>-		if (handle == dd-&gt;handle)</div><div class='del'>-			return dd;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct dependent_device *alloc_dependent_device(acpi_handle handle)</div><div class='del'>-{</div><div class='del'>-	struct dependent_device *dd;</div><div class='del'>-</div><div class='del'>-	dd = kzalloc(sizeof(*dd), GFP_KERNEL);</div><div class='del'>-	if (dd) {</div><div class='del'>-		INIT_LIST_HEAD(&amp;dd-&gt;pci_list);</div><div class='del'>-		INIT_LIST_HEAD(&amp;dd-&gt;device_list);</div><div class='del'>-		dd-&gt;handle = handle;</div><div class='del'>-	}</div><div class='del'>-	return dd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int is_dock(acpi_handle handle)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	acpi_handle tmp;</div><div class='del'>-</div><div class='del'>-	status = acpi_get_handle(handle, "_DCK", &amp;tmp);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dock_present(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long sta;</div><div class='del'>-	acpi_status status;</div><div class='del'>-</div><div class='del'>-	if (ds) {</div><div class='del'>-		status = acpi_evaluate_integer(ds-&gt;handle, "_STA", NULL, &amp;sta);</div><div class='del'>-		if (ACPI_SUCCESS(status) &amp;&amp; sta)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void eject_dock(void)</div><div class='del'>-{</div><div class='del'>-	struct acpi_object_list arg_list;</div><div class='del'>-	union acpi_object arg;</div><div class='del'>-</div><div class='del'>-	arg_list.count = 1;</div><div class='del'>-	arg_list.pointer = &amp;arg;</div><div class='del'>-	arg.type = ACPI_TYPE_INTEGER;</div><div class='del'>-	arg.integer.value = 1;</div><div class='del'>-</div><div class='del'>-	if (ACPI_FAILURE(acpi_evaluate_object(ds-&gt;handle, "_EJ0",</div><div class='del'>-					&amp;arg_list, NULL)) || dock_present())</div><div class='del'>-		warn("%s: failed to eject dock!\n", __FUNCTION__);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static acpi_status handle_dock(int dock)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	struct acpi_object_list arg_list;</div><div class='del'>-	union acpi_object arg;</div><div class='del'>-	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='del'>-</div><div class='del'>-	dbg("%s: %s\n", __FUNCTION__, dock ? "docking" : "undocking");</div><div class='del'>-</div><div class='del'>-	/* _DCK method has one argument */</div><div class='del'>-	arg_list.count = 1;</div><div class='del'>-	arg_list.pointer = &amp;arg;</div><div class='del'>-	arg.type = ACPI_TYPE_INTEGER;</div><div class='del'>-	arg.integer.value = dock;</div><div class='del'>-	status = acpi_evaluate_object(ds-&gt;handle, "_DCK",</div><div class='del'>-					&amp;arg_list, &amp;buffer);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		err("%s: failed to execute _DCK\n", __FUNCTION__);</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void dock(void)</div><div class='del'>-{</div><div class='del'>-	handle_dock(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void undock(void)</div><div class='del'>-{</div><div class='del'>-	handle_dock(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the _DCK method can do funny things... and sometimes not</div><div class='del'>- * hah-hah funny.</div><div class='del'>- *</div><div class='del'>- * TBD - figure out a way to only call fixups for</div><div class='del'>- * systems that require them.</div><div class='del'>- */</div><div class='del'>-static void post_dock_fixups(void)</div><div class='del'>-{</div><div class='del'>-	struct pci_bus *bus;</div><div class='del'>-	u32 buses;</div><div class='del'>-	struct dependent_device *dd;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(dd, &amp;ds-&gt;pci_dependent_devices, pci_list) {</div><div class='del'>-		bus = dd-&gt;func-&gt;slot-&gt;bridge-&gt;pci_bus;</div><div class='del'>-</div><div class='del'>-		/* fixup bad _DCK function that rewrites</div><div class='del'>-	 	 * secondary bridge on slot</div><div class='del'>-	 	 */</div><div class='del'>-		pci_read_config_dword(bus-&gt;self,</div><div class='del'>-				PCI_PRIMARY_BUS,</div><div class='del'>-				&amp;buses);</div><div class='del'>-</div><div class='del'>-		if (((buses &gt;&gt; 8) &amp; 0xff) != bus-&gt;secondary) {</div><div class='del'>-			buses = (buses &amp; 0xff000000)</div><div class='del'>-	     			| ((unsigned int)(bus-&gt;primary)     &lt;&lt;  0)</div><div class='del'>-	     			| ((unsigned int)(bus-&gt;secondary)   &lt;&lt;  8)</div><div class='del'>-	     			| ((unsigned int)(bus-&gt;subordinate) &lt;&lt; 16);</div><div class='del'>-			pci_write_config_dword(bus-&gt;self,</div><div class='del'>-					PCI_PRIMARY_BUS,</div><div class='del'>-					buses);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hotplug_pci(u32 type)</div><div class='del'>-{</div><div class='del'>-	struct dependent_device *dd;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(dd, &amp;ds-&gt;pci_dependent_devices, pci_list)</div><div class='del'>-		handle_hotplug_event_func(dd-&gt;handle, type, dd-&gt;func);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void begin_dock(void)</div><div class='del'>-{</div><div class='del'>-	ds-&gt;flags |= DOCK_DOCKING;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline void complete_dock(void)</div><div class='del'>-{</div><div class='del'>-	ds-&gt;flags &amp;= ~(DOCK_DOCKING);</div><div class='del'>-	ds-&gt;last_dock_time = jiffies;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int dock_in_progress(void)</div><div class='del'>-{</div><div class='del'>-	if (ds-&gt;flags &amp; DOCK_DOCKING ||</div><div class='del'>-		ds-&gt;last_dock_time == jiffies) {</div><div class='del'>-		dbg("dock in progress\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-handle_hotplug_event_dock(acpi_handle handle, u32 type, void *context)</div><div class='del'>-{</div><div class='del'>-	dbg("%s: enter\n", __FUNCTION__);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-		case ACPI_NOTIFY_BUS_CHECK:</div><div class='del'>-			dbg("BUS Check\n");</div><div class='del'>-			if (!dock_in_progress() &amp;&amp; dock_present()) {</div><div class='del'>-				begin_dock();</div><div class='del'>-				dock();</div><div class='del'>-				if (!dock_present()) {</div><div class='del'>-					err("Unable to dock!\n");</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				post_dock_fixups();</div><div class='del'>-				hotplug_pci(type);</div><div class='del'>-				complete_dock();</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case ACPI_NOTIFY_EJECT_REQUEST:</div><div class='del'>-			dbg("EJECT request\n");</div><div class='del'>-			if (!dock_in_progress() &amp;&amp; dock_present()) {</div><div class='del'>-				hotplug_pci(type);</div><div class='del'>-				undock();</div><div class='del'>-				eject_dock();</div><div class='del'>-				if (dock_present())</div><div class='del'>-					err("Unable to undock!\n");</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-find_dock_ejd(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	acpi_handle tmp;</div><div class='del'>-	acpi_handle dck_handle = (acpi_handle) context;</div><div class='del'>-	char objname[64];</div><div class='del'>-	struct acpi_buffer buffer = { .length = sizeof(objname),</div><div class='del'>-				      .pointer = objname };</div><div class='del'>-	struct acpi_buffer ejd_buffer = {ACPI_ALLOCATE_BUFFER, NULL};</div><div class='del'>-	union acpi_object *ejd_obj;</div><div class='del'>-</div><div class='del'>-	status = acpi_get_handle(handle, "_EJD", &amp;tmp);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		return AE_OK;</div><div class='del'>-</div><div class='del'>-	/* make sure we are dependent on the dock device,</div><div class='del'>-	 * by executing the _EJD method, then getting a handle</div><div class='del'>-	 * to the device referenced by that name.  If that</div><div class='del'>-	 * device handle is the same handle as the dock station</div><div class='del'>-	 * handle, then we are a device dependent on the dock station</div><div class='del'>-	 */</div><div class='del'>-	acpi_get_name(dck_handle, ACPI_FULL_PATHNAME, &amp;buffer);</div><div class='del'>-	status = acpi_evaluate_object(handle, "_EJD", NULL, &amp;ejd_buffer);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='del'>-		err("Unable to execute _EJD!\n");</div><div class='del'>-		goto find_ejd_out;</div><div class='del'>-	}</div><div class='del'>-	ejd_obj = ejd_buffer.pointer;</div><div class='del'>-	status = acpi_get_handle(NULL, ejd_obj-&gt;string.pointer, &amp;tmp);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		goto find_ejd_out;</div><div class='del'>-</div><div class='del'>-	if (tmp == dck_handle) {</div><div class='del'>-		struct dependent_device *dd;</div><div class='del'>-		dbg("%s: found device dependent on dock\n", __FUNCTION__);</div><div class='del'>-		dd = alloc_dependent_device(handle);</div><div class='del'>-		if (!dd) {</div><div class='del'>-			err("Can't allocate memory for dependent device!\n");</div><div class='del'>-			goto find_ejd_out;</div><div class='del'>-		}</div><div class='del'>-		add_dependent_device(dd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-find_ejd_out:</div><div class='del'>-	acpi_os_free(ejd_buffer.pointer);</div><div class='del'>-	return AE_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int detect_dependent_devices(acpi_handle *bridge_handle)</div><div class='del'>-{</div><div class='del'>-	acpi_status status;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	count = 0;</div><div class='del'>-</div><div class='del'>-	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle,</div><div class='del'>-					(u32)1, find_dependent_device,</div><div class='del'>-					(void *)&amp;count, NULL);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static acpi_status</div><div class='del'>-find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='del'>-{</div><div class='del'>-	int *count = (int *)context;</div><div class='del'>-</div><div class='del'>-	if (is_dock(handle)) {</div><div class='del'>-		dbg("%s: found dock\n", __FUNCTION__);</div><div class='del'>-		ds = kzalloc(sizeof(*ds), GFP_KERNEL);</div><div class='del'>-		ds-&gt;handle = handle;</div><div class='del'>-		INIT_LIST_HEAD(&amp;ds-&gt;dependent_devices);</div><div class='del'>-		INIT_LIST_HEAD(&amp;ds-&gt;pci_dependent_devices);</div><div class='del'>-</div><div class='del'>-		/* look for devices dependent on dock station */</div><div class='del'>-		acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,</div><div class='del'>-			ACPI_UINT32_MAX, find_dock_ejd, handle, NULL);</div><div class='del'>-</div><div class='del'>-		acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,</div><div class='del'>-			handle_hotplug_event_dock, ds);</div><div class='del'>-		(*count)++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return AE_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int find_dock_station(void)</div><div class='del'>-{</div><div class='del'>-	int num = 0;</div><div class='del'>-</div><div class='del'>-	ds = NULL;</div><div class='del'>-</div><div class='del'>-	/* start from the root object, because some laptops define</div><div class='del'>-	 * _DCK methods outside the scope of PCI (IBM x-series laptop)</div><div class='del'>-	 */</div><div class='del'>-	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,</div><div class='del'>-			ACPI_UINT32_MAX, find_dock, &amp;num, NULL);</div><div class='del'>-</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void remove_dock_station(void)</div><div class='del'>-{</div><div class='del'>-	struct dependent_device *dd, *tmp;</div><div class='del'>-	if (ds) {</div><div class='del'>-		if (ACPI_FAILURE(acpi_remove_notify_handler(ds-&gt;handle,</div><div class='del'>-			ACPI_SYSTEM_NOTIFY, handle_hotplug_event_dock)))</div><div class='del'>-			err("failed to remove dock notify handler\n");</div><div class='del'>-</div><div class='del'>-		/* free all dependent devices */</div><div class='del'>-		list_for_each_entry_safe(dd, tmp, &amp;ds-&gt;dependent_devices,</div><div class='del'>-				device_list)</div><div class='del'>-			kfree(dd);</div><div class='del'>-</div><div class='del'>-		/* no need to touch the pci_dependent_device list,</div><div class='del'>-		 * cause all memory was freed above</div><div class='del'>-		 */</div><div class='del'>-		kfree(ds);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c<br/>index 053ee843863c..ef95d12fb32c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_glue.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/acpiphp_glue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/acpiphp_glue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/acpiphp_glue.c</a></div><div class='hunk'>@@ -59,6 +59,7 @@ static LIST_HEAD(bridge_list);</div><div class='ctx'> static void handle_hotplug_event_bridge (acpi_handle, u32, void *);</div><div class='ctx'> static void acpiphp_sanitize_bus(struct pci_bus *bus);</div><div class='ctx'> static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus);</div><div class='add'>+static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -116,6 +117,59 @@ is_ejectable_slot(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* callback routine to check for the existance of a pci dock device */</div><div class='add'>+static acpi_status</div><div class='add'>+is_pci_dock_device(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='add'>+{</div><div class='add'>+	int *count = (int *)context;</div><div class='add'>+</div><div class='add'>+	if (is_dock_device(handle)) {</div><div class='add'>+		(*count)++;</div><div class='add'>+		return AE_CTRL_TERMINATE;</div><div class='add'>+	} else {</div><div class='add'>+		return AE_OK;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the _DCK method can do funny things... and sometimes not</div><div class='add'>+ * hah-hah funny.</div><div class='add'>+ *</div><div class='add'>+ * TBD - figure out a way to only call fixups for</div><div class='add'>+ * systems that require them.</div><div class='add'>+ */</div><div class='add'>+static int post_dock_fixups(struct notifier_block *nb, unsigned long val,</div><div class='add'>+	void *v)</div><div class='add'>+{</div><div class='add'>+	struct acpiphp_func *func = container_of(nb, struct acpiphp_func, nb);</div><div class='add'>+	struct pci_bus *bus = func-&gt;slot-&gt;bridge-&gt;pci_bus;</div><div class='add'>+	u32 buses;</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;self)</div><div class='add'>+		return  NOTIFY_OK;</div><div class='add'>+</div><div class='add'>+	/* fixup bad _DCK function that rewrites</div><div class='add'>+	 * secondary bridge on slot</div><div class='add'>+	 */</div><div class='add'>+	pci_read_config_dword(bus-&gt;self,</div><div class='add'>+			PCI_PRIMARY_BUS,</div><div class='add'>+			&amp;buses);</div><div class='add'>+</div><div class='add'>+	if (((buses &gt;&gt; 8) &amp; 0xff) != bus-&gt;secondary) {</div><div class='add'>+		buses = (buses &amp; 0xff000000)</div><div class='add'>+	     		| ((unsigned int)(bus-&gt;primary)     &lt;&lt;  0)</div><div class='add'>+	     		| ((unsigned int)(bus-&gt;secondary)   &lt;&lt;  8)</div><div class='add'>+	     		| ((unsigned int)(bus-&gt;subordinate) &lt;&lt; 16);</div><div class='add'>+		pci_write_config_dword(bus-&gt;self, PCI_PRIMARY_BUS, buses);</div><div class='add'>+	}</div><div class='add'>+	return NOTIFY_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* callback routine to register each ACPI PCI slot object */</div><div class='ctx'> static acpi_status</div><div class='hunk'>@@ -124,7 +178,6 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 	struct acpiphp_bridge *bridge = (struct acpiphp_bridge *)context;</div><div class='ctx'> 	struct acpiphp_slot *slot;</div><div class='ctx'> 	struct acpiphp_func *newfunc;</div><div class='del'>-	struct dependent_device *dd;</div><div class='ctx'> 	acpi_handle tmp;</div><div class='ctx'> 	acpi_status status = AE_OK;</div><div class='ctx'> 	unsigned long adr, sun;</div><div class='hunk'>@@ -137,7 +190,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_get_handle(handle, "_EJ0", &amp;tmp);</div><div class='ctx'> </div><div class='del'>-	if (ACPI_FAILURE(status) &amp;&amp; !(is_dependent_device(handle)))</div><div class='add'>+	if (ACPI_FAILURE(status) &amp;&amp; !(is_dock_device(handle)))</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> </div><div class='ctx'> 	device = (adr &gt;&gt; 16) &amp; 0xffff;</div><div class='hunk'>@@ -162,22 +215,17 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 	if (ACPI_SUCCESS(acpi_get_handle(handle, "_PS3", &amp;tmp)))</div><div class='ctx'> 		newfunc-&gt;flags |= FUNC_HAS_PS3;</div><div class='ctx'> </div><div class='del'>-	if (ACPI_SUCCESS(acpi_get_handle(handle, "_DCK", &amp;tmp))) {</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(handle, "_DCK", &amp;tmp)))</div><div class='ctx'> 		newfunc-&gt;flags |= FUNC_HAS_DCK;</div><div class='del'>-		/* add to devices dependent on dock station,</div><div class='del'>-		 * because this may actually be the dock bridge</div><div class='del'>-		 */</div><div class='del'>-		dd = alloc_dependent_device(handle);</div><div class='del'>-                if (!dd)</div><div class='del'>-                        err("Can't allocate memory for "</div><div class='del'>-				"new dependent device!\n");</div><div class='del'>-		else</div><div class='del'>-			add_dependent_device(dd);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_evaluate_integer(handle, "_SUN", NULL, &amp;sun);</div><div class='del'>-	if (ACPI_FAILURE(status))</div><div class='del'>-		sun = -1;</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		/*</div><div class='add'>+		 * use the count of the number of slots we've found</div><div class='add'>+		 * for the number of the slot</div><div class='add'>+		 */</div><div class='add'>+		sun = bridge-&gt;nr_slots+1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* search for objects that share the same slot */</div><div class='ctx'> 	for (slot = bridge-&gt;slots; slot; slot = slot-&gt;next)</div><div class='hunk'>@@ -225,20 +273,23 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 		slot-&gt;flags |= (SLOT_ENABLED | SLOT_POWEREDON);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* if this is a device dependent on a dock station,</div><div class='del'>-	 * associate the acpiphp_func to the dependent_device</div><div class='del'>- 	 * struct.</div><div class='del'>-	 */</div><div class='del'>-	if ((dd = get_dependent_device(handle))) {</div><div class='del'>-		newfunc-&gt;flags |= FUNC_IS_DD;</div><div class='del'>-		/*</div><div class='del'>-		 * we don't want any devices which is dependent</div><div class='del'>-		 * on the dock to have it's _EJ0 method executed.</div><div class='del'>-		 * because we need to run _DCK first.</div><div class='add'>+	if (is_dock_device(handle)) {</div><div class='add'>+		/* we don't want to call this device's _EJ0</div><div class='add'>+		 * because we want the dock notify handler</div><div class='add'>+		 * to call it after it calls _DCK</div><div class='ctx'> 		 */</div><div class='ctx'> 		newfunc-&gt;flags &amp;= ~FUNC_HAS_EJ0;</div><div class='del'>-		dd-&gt;func = newfunc;</div><div class='del'>-		add_pci_dependent_device(dd);</div><div class='add'>+		if (register_hotplug_dock_device(handle,</div><div class='add'>+			handle_hotplug_event_func, newfunc))</div><div class='add'>+			dbg("failed to register dock device\n");</div><div class='add'>+</div><div class='add'>+		/* we need to be notified when dock events happen</div><div class='add'>+		 * outside of the hotplug operation, since we may</div><div class='add'>+		 * need to do fixups before we can hotplug.</div><div class='add'>+		 */</div><div class='add'>+		newfunc-&gt;nb.notifier_call = post_dock_fixups;</div><div class='add'>+		if (register_dock_notifier(&amp;newfunc-&gt;nb))</div><div class='add'>+			dbg("failed to register a dock notifier");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* install notify handler */</div><div class='hunk'>@@ -277,6 +328,15 @@ static int detect_ejectable_slots(acpi_handle *bridge_handle)</div><div class='ctx'> 	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,</div><div class='ctx'> 				     is_ejectable_slot, (void *)&amp;count, NULL);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * we also need to add this bridge if there is a dock bridge or</div><div class='add'>+	 * other pci device on a dock station (removable)</div><div class='add'>+	 */</div><div class='add'>+	if (!count)</div><div class='add'>+		status = acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle,</div><div class='add'>+				(u32)1, is_pci_dock_device, (void *)&amp;count,</div><div class='add'>+				NULL);</div><div class='add'>+</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -286,13 +346,19 @@ static void decode_hpp(struct acpiphp_bridge *bridge)</div><div class='ctx'> {</div><div class='ctx'> 	acpi_status status;</div><div class='ctx'> </div><div class='del'>-	status = acpi_get_hp_params_from_firmware(bridge-&gt;pci_dev, &amp;bridge-&gt;hpp);</div><div class='del'>-	if (ACPI_FAILURE(status)) {</div><div class='add'>+	status = acpi_get_hp_params_from_firmware(bridge-&gt;pci_bus, &amp;bridge-&gt;hpp);</div><div class='add'>+	if (ACPI_FAILURE(status) ||</div><div class='add'>+	    !bridge-&gt;hpp.t0 || (bridge-&gt;hpp.t0-&gt;revision &gt; 1)) {</div><div class='ctx'> 		/* use default numbers */</div><div class='del'>-		bridge-&gt;hpp.cache_line_size = 0x10;</div><div class='del'>-		bridge-&gt;hpp.latency_timer = 0x40;</div><div class='del'>-		bridge-&gt;hpp.enable_serr = 0;</div><div class='del'>-		bridge-&gt;hpp.enable_perr = 0;</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "%s: Could not get hotplug parameters. Use defaults\n",</div><div class='add'>+		       __FUNCTION__);</div><div class='add'>+		bridge-&gt;hpp.t0 = &amp;bridge-&gt;hpp.type0_data;</div><div class='add'>+		bridge-&gt;hpp.t0-&gt;revision = 0;</div><div class='add'>+		bridge-&gt;hpp.t0-&gt;cache_line_size = 0x10;</div><div class='add'>+		bridge-&gt;hpp.t0-&gt;latency_timer = 0x40;</div><div class='add'>+		bridge-&gt;hpp.t0-&gt;enable_serr = 0;</div><div class='add'>+		bridge-&gt;hpp.t0-&gt;enable_perr = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,6 +385,13 @@ static void init_bridge_misc(struct acpiphp_bridge *bridge)</div><div class='ctx'> </div><div class='ctx'> 	/* install notify handler */</div><div class='ctx'> 	if (bridge-&gt;type != BRIDGE_TYPE_HOST) {</div><div class='add'>+		if ((bridge-&gt;flags &amp; BRIDGE_HAS_EJ0) &amp;&amp; bridge-&gt;func) {</div><div class='add'>+			status = acpi_remove_notify_handler(bridge-&gt;func-&gt;handle,</div><div class='add'>+						ACPI_SYSTEM_NOTIFY,</div><div class='add'>+						handle_hotplug_event_func);</div><div class='add'>+			if (ACPI_FAILURE(status))</div><div class='add'>+				err("failed to remove notify handler\n");</div><div class='add'>+		}</div><div class='ctx'> 		status = acpi_install_notify_handler(bridge-&gt;handle,</div><div class='ctx'> 					     ACPI_SYSTEM_NOTIFY,</div><div class='ctx'> 					     handle_hotplug_event_bridge,</div><div class='hunk'>@@ -331,6 +404,66 @@ static void init_bridge_misc(struct acpiphp_bridge *bridge)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* find acpiphp_func from acpiphp_bridge */</div><div class='add'>+static struct acpiphp_func *acpiphp_bridge_handle_to_function(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct list_head *node, *l;</div><div class='add'>+	struct acpiphp_bridge *bridge;</div><div class='add'>+	struct acpiphp_slot *slot;</div><div class='add'>+	struct acpiphp_func *func;</div><div class='add'>+</div><div class='add'>+	list_for_each(node, &amp;bridge_list) {</div><div class='add'>+		bridge = list_entry(node, struct acpiphp_bridge, list);</div><div class='add'>+		for (slot = bridge-&gt;slots; slot; slot = slot-&gt;next) {</div><div class='add'>+			list_for_each(l, &amp;slot-&gt;funcs) {</div><div class='add'>+				func = list_entry(l, struct acpiphp_func,</div><div class='add'>+							sibling);</div><div class='add'>+				if (func-&gt;handle == handle)</div><div class='add'>+					return func;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline void config_p2p_bridge_flags(struct acpiphp_bridge *bridge)</div><div class='add'>+{</div><div class='add'>+	acpi_handle dummy_handle;</div><div class='add'>+</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(bridge-&gt;handle,</div><div class='add'>+					"_STA", &amp;dummy_handle)))</div><div class='add'>+		bridge-&gt;flags |= BRIDGE_HAS_STA;</div><div class='add'>+</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(bridge-&gt;handle,</div><div class='add'>+					"_EJ0", &amp;dummy_handle)))</div><div class='add'>+		bridge-&gt;flags |= BRIDGE_HAS_EJ0;</div><div class='add'>+</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(bridge-&gt;handle,</div><div class='add'>+					"_PS0", &amp;dummy_handle)))</div><div class='add'>+		bridge-&gt;flags |= BRIDGE_HAS_PS0;</div><div class='add'>+</div><div class='add'>+	if (ACPI_SUCCESS(acpi_get_handle(bridge-&gt;handle,</div><div class='add'>+					"_PS3", &amp;dummy_handle)))</div><div class='add'>+		bridge-&gt;flags |= BRIDGE_HAS_PS3;</div><div class='add'>+</div><div class='add'>+	/* is this ejectable p2p bridge? */</div><div class='add'>+	if (bridge-&gt;flags &amp; BRIDGE_HAS_EJ0) {</div><div class='add'>+		struct acpiphp_func *func;</div><div class='add'>+</div><div class='add'>+		dbg("found ejectable p2p bridge\n");</div><div class='add'>+</div><div class='add'>+		/* make link between PCI bridge and PCI function */</div><div class='add'>+		func = acpiphp_bridge_handle_to_function(bridge-&gt;handle);</div><div class='add'>+		if (!func)</div><div class='add'>+			return;</div><div class='add'>+		bridge-&gt;func = func;</div><div class='add'>+		func-&gt;bridge = bridge;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* allocate and initialize host bridge data structure */</div><div class='ctx'> static void add_host_bridge(acpi_handle *handle, struct pci_bus *pci_bus)</div><div class='ctx'> {</div><div class='hunk'>@@ -364,6 +497,7 @@ static void add_p2p_bridge(acpi_handle *handle, struct pci_dev *pci_dev)</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;type = BRIDGE_TYPE_P2P;</div><div class='ctx'> 	bridge-&gt;handle = handle;</div><div class='add'>+	config_p2p_bridge_flags(bridge);</div><div class='ctx'> </div><div class='ctx'> 	bridge-&gt;pci_dev = pci_dev_get(pci_dev);</div><div class='ctx'> 	bridge-&gt;pci_bus = pci_dev-&gt;subordinate;</div><div class='hunk'>@@ -413,8 +547,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* check if this bridge has ejectable slots */</div><div class='del'>-	if ((detect_ejectable_slots(handle) &gt; 0) ||</div><div class='del'>-		(detect_dependent_devices(handle) &gt; 0)) {</div><div class='add'>+	if ((detect_ejectable_slots(handle) &gt; 0)) {</div><div class='ctx'> 		dbg("found PCI-to-PCI bridge at PCI %s\n", pci_name(dev));</div><div class='ctx'> 		add_p2p_bridge(handle, dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -423,7 +556,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> 	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,</div><div class='ctx'> 				     find_p2p_bridge, dev-&gt;subordinate, NULL);</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		warn("find_p2p_bridge faied (error code = 0x%x)\n", status);</div><div class='add'>+		warn("find_p2p_bridge failed (error code = 0x%x)\n", status);</div><div class='ctx'> </div><div class='ctx'>  out:</div><div class='ctx'> 	pci_dev_put(dev);</div><div class='hunk'>@@ -478,7 +611,6 @@ static int add_bridge(acpi_handle handle)</div><div class='ctx'> 	if (detect_ejectable_slots(handle) &gt; 0) {</div><div class='ctx'> 		dbg("found PCI host-bus bridge with hot-pluggable slots\n");</div><div class='ctx'> 		add_host_bridge(handle, pci_bus);</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* search P2P bridges under this host bridge */</div><div class='hunk'>@@ -486,7 +618,7 @@ static int add_bridge(acpi_handle handle)</div><div class='ctx'> 				     find_p2p_bridge, pci_bus, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='del'>-		warn("find_p2p_bridge faied (error code = 0x%x)\n",status);</div><div class='add'>+		warn("find_p2p_bridge failed (error code = 0x%x)\n", status);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -516,12 +648,26 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)</div><div class='ctx'> 	if (ACPI_FAILURE(status))</div><div class='ctx'> 		err("failed to remove notify handler\n");</div><div class='ctx'> </div><div class='add'>+	if ((bridge-&gt;type != BRIDGE_TYPE_HOST) &amp;&amp;</div><div class='add'>+	    ((bridge-&gt;flags &amp; BRIDGE_HAS_EJ0) &amp;&amp; bridge-&gt;func)) {</div><div class='add'>+		status = acpi_install_notify_handler(bridge-&gt;func-&gt;handle,</div><div class='add'>+						ACPI_SYSTEM_NOTIFY,</div><div class='add'>+						handle_hotplug_event_func,</div><div class='add'>+						bridge-&gt;func);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			err("failed to install interrupt notify handler\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	slot = bridge-&gt;slots;</div><div class='ctx'> 	while (slot) {</div><div class='ctx'> 		struct acpiphp_slot *next = slot-&gt;next;</div><div class='ctx'> 		list_for_each_safe (list, tmp, &amp;slot-&gt;funcs) {</div><div class='ctx'> 			struct acpiphp_func *func;</div><div class='ctx'> 			func = list_entry(list, struct acpiphp_func, sibling);</div><div class='add'>+			if (is_dock_device(func-&gt;handle)) {</div><div class='add'>+				unregister_hotplug_dock_device(func-&gt;handle);</div><div class='add'>+				unregister_dock_notifier(&amp;func-&gt;nb);</div><div class='add'>+			}</div><div class='ctx'> 			if (!(func-&gt;flags &amp; FUNC_HAS_DCK)) {</div><div class='ctx'> 				status = acpi_remove_notify_handler(func-&gt;handle,</div><div class='ctx'> 						ACPI_SYSTEM_NOTIFY,</div><div class='hunk'>@@ -549,6 +695,11 @@ cleanup_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpiphp_bridge *bridge;</div><div class='ctx'> </div><div class='add'>+	/* cleanup p2p bridges under this P2P bridge</div><div class='add'>+	   in a depth-first manner */</div><div class='add'>+	acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,</div><div class='add'>+				cleanup_p2p_bridge, NULL, NULL);</div><div class='add'>+</div><div class='ctx'> 	if (!(bridge = acpiphp_handle_to_bridge(handle)))</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> 	cleanup_bridge(bridge);</div><div class='hunk'>@@ -559,15 +710,14 @@ static void remove_bridge(acpi_handle handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpiphp_bridge *bridge;</div><div class='ctx'> </div><div class='add'>+	/* cleanup p2p bridges under this host bridge</div><div class='add'>+	   in a depth-first manner */</div><div class='add'>+	acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,</div><div class='add'>+				(u32)1, cleanup_p2p_bridge, NULL, NULL);</div><div class='add'>+</div><div class='ctx'> 	bridge = acpiphp_handle_to_bridge(handle);</div><div class='del'>-	if (bridge) {</div><div class='add'>+	if (bridge)</div><div class='ctx'> 		cleanup_bridge(bridge);</div><div class='del'>-	} else {</div><div class='del'>-		/* clean-up p2p bridges under this host bridge */</div><div class='del'>-		acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,</div><div class='del'>-				    ACPI_UINT32_MAX, cleanup_p2p_bridge,</div><div class='del'>-				    NULL, NULL);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pci_dev * get_apic_pci_info(acpi_handle handle)</div><div class='hunk'>@@ -634,7 +784,7 @@ static int get_gsi_base(acpi_handle handle, u32 *gsi_base)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='del'>-	acpi_os_free(buffer.pointer);</div><div class='add'>+	kfree(buffer.pointer);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -797,36 +947,6 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *  get_func - get a pointer to acpiphp_func given a slot, device</div><div class='del'>- *  @slot: slot to search</div><div class='del'>- *  @dev:  pci_dev struct to match.</div><div class='del'>- *</div><div class='del'>- *  This function will increase the reference count of pci_dev,</div><div class='del'>- *  so callers should call pci_dev_put when complete.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static struct acpiphp_func *</div><div class='del'>-get_func(struct acpiphp_slot *slot, struct pci_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct acpiphp_func *func = NULL;</div><div class='del'>-	struct pci_bus *bus = slot-&gt;bridge-&gt;pci_bus;</div><div class='del'>-	struct pci_dev *pdev;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(func, &amp;slot-&gt;funcs, sibling) {</div><div class='del'>-		pdev = pci_get_slot(bus, PCI_DEVFN(slot-&gt;device,</div><div class='del'>-					func-&gt;function));</div><div class='del'>-		if (pdev) {</div><div class='del'>-			if (pdev == dev)</div><div class='del'>-				break;</div><div class='del'>-			pci_dev_put(pdev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return func;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * acpiphp_bus_add - add a new bus to acpi subsystem</div><div class='ctx'>  * @func: acpiphp_func of the bridge</div><div class='hunk'>@@ -872,6 +992,28 @@ acpiphp_bus_add_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * acpiphp_bus_trim - trim a bus from acpi subsystem</div><div class='add'>+ * @handle: handle to acpi namespace</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int acpiphp_bus_trim(acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *device;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = acpi_bus_get_device(handle, &amp;device);</div><div class='add'>+	if (retval) {</div><div class='add'>+		dbg("acpi_device not found\n");</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = acpi_bus_trim(device, 1);</div><div class='add'>+	if (retval)</div><div class='add'>+		err("cannot remove from acpi list\n");</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * enable_device - enable, configure a slot</div><div class='hunk'>@@ -889,6 +1031,7 @@ static int enable_device(struct acpiphp_slot *slot)</div><div class='ctx'> 	struct acpiphp_func *func;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	int num, max, pass;</div><div class='add'>+	acpi_status status;</div><div class='ctx'> </div><div class='ctx'> 	if (slot-&gt;flags &amp; SLOT_ENABLED)</div><div class='ctx'> 		goto err_exit;</div><div class='hunk'>@@ -918,19 +1061,17 @@ static int enable_device(struct acpiphp_slot *slot)</div><div class='ctx'> 			if (dev-&gt;hdr_type == PCI_HEADER_TYPE_BRIDGE ||</div><div class='ctx'> 			    dev-&gt;hdr_type == PCI_HEADER_TYPE_CARDBUS) {</div><div class='ctx'> 				max = pci_scan_bridge(bus, dev, max, pass);</div><div class='del'>-				if (pass &amp;&amp; dev-&gt;subordinate) {</div><div class='add'>+				if (pass &amp;&amp; dev-&gt;subordinate)</div><div class='ctx'> 					pci_bus_size_bridges(dev-&gt;subordinate);</div><div class='del'>-					func = get_func(slot, dev);</div><div class='del'>-					if (func) {</div><div class='del'>-						acpiphp_bus_add(func);</div><div class='del'>-						/* side effect of get_func */</div><div class='del'>-						pci_dev_put(dev);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	list_for_each (l, &amp;slot-&gt;funcs) {</div><div class='add'>+		func = list_entry(l, struct acpiphp_func, sibling);</div><div class='add'>+		acpiphp_bus_add(func);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pci_bus_assign_resources(bus);</div><div class='ctx'> 	acpiphp_sanitize_bus(bus);</div><div class='ctx'> 	pci_enable_bridges(bus);</div><div class='hunk'>@@ -943,6 +1084,17 @@ static int enable_device(struct acpiphp_slot *slot)</div><div class='ctx'> 		func = list_entry(l, struct acpiphp_func, sibling);</div><div class='ctx'> 		func-&gt;pci_dev = pci_get_slot(bus, PCI_DEVFN(slot-&gt;device,</div><div class='ctx'> 							func-&gt;function));</div><div class='add'>+		if (!func-&gt;pci_dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (func-&gt;pci_dev-&gt;hdr_type != PCI_HEADER_TYPE_BRIDGE &amp;&amp;</div><div class='add'>+		    func-&gt;pci_dev-&gt;hdr_type != PCI_HEADER_TYPE_CARDBUS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		status = find_p2p_bridge(func-&gt;handle, (u32)1, bus, NULL);</div><div class='add'>+		if (ACPI_FAILURE(status))</div><div class='add'>+			warn("find_p2p_bridge failed (error code = 0x%x)\n",</div><div class='add'>+				status);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	slot-&gt;flags |= SLOT_ENABLED;</div><div class='hunk'>@@ -967,6 +1119,18 @@ static int disable_device(struct acpiphp_slot *slot)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each (l, &amp;slot-&gt;funcs) {</div><div class='ctx'> 		func = list_entry(l, struct acpiphp_func, sibling);</div><div class='add'>+</div><div class='add'>+		if (func-&gt;bridge) {</div><div class='add'>+			/* cleanup p2p bridges under this P2P bridge */</div><div class='add'>+			cleanup_p2p_bridge(func-&gt;bridge-&gt;handle,</div><div class='add'>+						(u32)1, NULL, NULL);</div><div class='add'>+			func-&gt;bridge = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acpiphp_bus_trim(func-&gt;handle);</div><div class='add'>+		/* try to remove anyway.</div><div class='add'>+		 * acpiphp_bus_add might have been failed */</div><div class='add'>+</div><div class='ctx'> 		if (!func-&gt;pci_dev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -1111,16 +1275,17 @@ static void program_hpp(struct pci_dev *dev, struct acpiphp_bridge *bridge)</div><div class='ctx'> 			(dev-&gt;hdr_type == PCI_HEADER_TYPE_BRIDGE &amp;&amp;</div><div class='ctx'> 			(dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI)))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,</div><div class='del'>-			bridge-&gt;hpp.cache_line_size);</div><div class='add'>+			bridge-&gt;hpp.t0-&gt;cache_line_size);</div><div class='ctx'> 	pci_write_config_byte(dev, PCI_LATENCY_TIMER,</div><div class='del'>-			bridge-&gt;hpp.latency_timer);</div><div class='add'>+			bridge-&gt;hpp.t0-&gt;latency_timer);</div><div class='ctx'> 	pci_read_config_word(dev, PCI_COMMAND, &amp;pci_cmd);</div><div class='del'>-	if (bridge-&gt;hpp.enable_serr)</div><div class='add'>+	if (bridge-&gt;hpp.t0-&gt;enable_serr)</div><div class='ctx'> 		pci_cmd |= PCI_COMMAND_SERR;</div><div class='ctx'> 	else</div><div class='ctx'> 		pci_cmd &amp;= ~PCI_COMMAND_SERR;</div><div class='del'>-	if (bridge-&gt;hpp.enable_perr)</div><div class='add'>+	if (bridge-&gt;hpp.t0-&gt;enable_perr)</div><div class='ctx'> 		pci_cmd |= PCI_COMMAND_PARITY;</div><div class='ctx'> 	else</div><div class='ctx'> 		pci_cmd &amp;= ~PCI_COMMAND_PARITY;</div><div class='hunk'>@@ -1129,13 +1294,13 @@ static void program_hpp(struct pci_dev *dev, struct acpiphp_bridge *bridge)</div><div class='ctx'> 	/* Program bridge control value and child devices */</div><div class='ctx'> 	if ((dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI) {</div><div class='ctx'> 		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,</div><div class='del'>-				bridge-&gt;hpp.latency_timer);</div><div class='add'>+				bridge-&gt;hpp.t0-&gt;latency_timer);</div><div class='ctx'> 		pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &amp;pci_bctl);</div><div class='del'>-		if (bridge-&gt;hpp.enable_serr)</div><div class='add'>+		if (bridge-&gt;hpp.t0-&gt;enable_serr)</div><div class='ctx'> 			pci_bctl |= PCI_BRIDGE_CTL_SERR;</div><div class='ctx'> 		else</div><div class='ctx'> 			pci_bctl &amp;= ~PCI_BRIDGE_CTL_SERR;</div><div class='del'>-		if (bridge-&gt;hpp.enable_perr)</div><div class='add'>+		if (bridge-&gt;hpp.t0-&gt;enable_perr)</div><div class='ctx'> 			pci_bctl |= PCI_BRIDGE_CTL_PARITY;</div><div class='ctx'> 		else</div><div class='ctx'> 			pci_bctl &amp;= ~PCI_BRIDGE_CTL_PARITY;</div><div class='hunk'>@@ -1155,6 +1320,7 @@ static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;bridge, 0, sizeof(bridge));</div><div class='ctx'> 	bridge.handle = handle;</div><div class='add'>+	bridge.pci_bus = bus;</div><div class='ctx'> 	bridge.pci_dev = bus-&gt;self;</div><div class='ctx'> 	decode_hpp(&amp;bridge);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list)</div><div class='hunk'>@@ -1297,6 +1463,13 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont</div><div class='ctx'> 	case ACPI_NOTIFY_EJECT_REQUEST:</div><div class='ctx'> 		/* request device eject */</div><div class='ctx'> 		dbg("%s: Device eject notify on %s\n", __FUNCTION__, objname);</div><div class='add'>+		if ((bridge-&gt;type != BRIDGE_TYPE_HOST) &amp;&amp;</div><div class='add'>+		    (bridge-&gt;flags &amp; BRIDGE_HAS_EJ0)) {</div><div class='add'>+			struct acpiphp_slot *slot;</div><div class='add'>+			slot = bridge-&gt;func-&gt;slot;</div><div class='add'>+			if (!acpiphp_disable_slot(slot))</div><div class='add'>+				acpiphp_eject_slot(slot);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_NOTIFY_FREQUENCY_MISMATCH:</div><div class='hunk'>@@ -1330,7 +1503,7 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont</div><div class='ctx'>  * handles ACPI event notification on slots</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context)</div><div class='add'>+static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpiphp_func *func;</div><div class='ctx'> 	char objname[64];</div><div class='hunk'>@@ -1490,9 +1663,15 @@ int acpiphp_enable_slot(struct acpiphp_slot *slot)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	if (get_slot_status(slot) == ACPI_STA_ALL)</div><div class='add'>+	if (get_slot_status(slot) == ACPI_STA_ALL) {</div><div class='ctx'> 		/* configure all functions */</div><div class='ctx'> 		retval = enable_device(slot);</div><div class='add'>+		if (retval)</div><div class='add'>+			power_off_slot(slot);</div><div class='add'>+	} else {</div><div class='add'>+		dbg("%s: Slot status is not ACPI_STA_ALL\n", __FUNCTION__);</div><div class='add'>+		power_off_slot(slot);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>  err_exit:</div><div class='ctx'> 	mutex_unlock(&amp;slot-&gt;crit_sect);</div><div class='head'>diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c<br/>index 037ce4c91687..d5df5871cfa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpci_hotplug_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpci_hotplug_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpci_hotplug_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpci_hotplug_core.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * Send feedback to &lt;scottm@somanetworks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -348,7 +347,7 @@ cpci_hp_intr(int irq, void *data, struct pt_regs *regs)</div><div class='ctx'> 	dbg("entered cpci_hp_intr");</div><div class='ctx'> </div><div class='ctx'> 	/* Check to see if it was our interrupt */</div><div class='del'>-	if ((controller-&gt;irq_flags &amp; SA_SHIRQ) &amp;&amp;</div><div class='add'>+	if ((controller-&gt;irq_flags &amp; IRQF_SHARED) &amp;&amp;</div><div class='ctx'> 	    !controller-&gt;ops-&gt;check_irq(controller-&gt;dev_id)) {</div><div class='ctx'> 		dbg("exited cpci_hp_intr, not our interrupt");</div><div class='ctx'> 		return IRQ_NONE;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c<br/>index 225b5e551dd6..02be74caa89f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpci_hotplug_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpci_hotplug_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpci_hotplug_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpci_hotplug_pci.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * Send feedback to &lt;scottm@somanetworks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c<br/>index 2d4639d6841f..e847f0d6c7fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpcihp_generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpcihp_generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpcihp_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpcihp_generic.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  * Send feedback to &lt;scottm@somanetworks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c<br/>index f7cb00da38df..1c12e9171097 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpcihp_zt5550.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpcihp_zt5550.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpcihp_zt5550.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpcihp_zt5550.c</a></div><div class='hunk'>@@ -30,13 +30,13 @@</div><div class='ctx'>  * Send feedback to &lt;scottm@somanetworks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;	/* SA_SHIRQ */</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;	/* IRQF_SHARED */</div><div class='ctx'> #include "cpci_hotplug.h"</div><div class='ctx'> #include "cpcihp_zt5550.h"</div><div class='ctx'> </div><div class='hunk'>@@ -95,8 +95,8 @@ static int zt5550_hc_config(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	hc_dev = pdev;</div><div class='ctx'> 	dbg("hc_dev = %p", hc_dev);</div><div class='del'>-	dbg("pci resource start %lx", pci_resource_start(hc_dev, 1));</div><div class='del'>-	dbg("pci resource len %lx", pci_resource_len(hc_dev, 1));</div><div class='add'>+	dbg("pci resource start %llx", (unsigned long long)pci_resource_start(hc_dev, 1));</div><div class='add'>+	dbg("pci resource len %llx", (unsigned long long)pci_resource_len(hc_dev, 1));</div><div class='ctx'> </div><div class='ctx'> 	if(!request_mem_region(pci_resource_start(hc_dev, 1),</div><div class='ctx'> 				pci_resource_len(hc_dev, 1), MY_NAME)) {</div><div class='hunk'>@@ -108,8 +108,9 @@ static int zt5550_hc_config(struct pci_dev *pdev)</div><div class='ctx'> 	hc_registers =</div><div class='ctx'> 	    ioremap(pci_resource_start(hc_dev, 1), pci_resource_len(hc_dev, 1));</div><div class='ctx'> 	if(!hc_registers) {</div><div class='del'>-		err("cannot remap MMIO region %lx @ %lx",</div><div class='del'>-		    pci_resource_len(hc_dev, 1), pci_resource_start(hc_dev, 1));</div><div class='add'>+		err("cannot remap MMIO region %llx @ %llx",</div><div class='add'>+			(unsigned long long)pci_resource_len(hc_dev, 1),</div><div class='add'>+			(unsigned long long)pci_resource_start(hc_dev, 1));</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto exit_release_region;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -219,7 +220,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id</div><div class='ctx'> 	zt5550_hpc.ops = &amp;zt5550_hpc_ops;</div><div class='ctx'> 	if(!poll) {</div><div class='ctx'> 		zt5550_hpc.irq = hc_dev-&gt;irq;</div><div class='del'>-		zt5550_hpc.irq_flags = SA_SHIRQ;</div><div class='add'>+		zt5550_hpc.irq_flags = IRQF_SHARED;</div><div class='ctx'> 		zt5550_hpc.dev_id = hc_dev;</div><div class='ctx'> </div><div class='ctx'> 		zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c<br/>index 9bc1deb8df52..1fc259913b68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpqphp_core.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1089,8 +1088,8 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	dbg("pdev = %p\n", pdev);</div><div class='del'>-	dbg("pci resource start %lx\n", pci_resource_start(pdev, 0));</div><div class='del'>-	dbg("pci resource len %lx\n", pci_resource_len(pdev, 0));</div><div class='add'>+	dbg("pci resource start %llx\n", (unsigned long long)pci_resource_start(pdev, 0));</div><div class='add'>+	dbg("pci resource len %llx\n", (unsigned long long)pci_resource_len(pdev, 0));</div><div class='ctx'> </div><div class='ctx'> 	if (!request_mem_region(pci_resource_start(pdev, 0),</div><div class='ctx'> 				pci_resource_len(pdev, 0), MY_NAME)) {</div><div class='hunk'>@@ -1102,9 +1101,9 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	ctrl-&gt;hpc_reg = ioremap(pci_resource_start(pdev, 0),</div><div class='ctx'> 					pci_resource_len(pdev, 0));</div><div class='ctx'> 	if (!ctrl-&gt;hpc_reg) {</div><div class='del'>-		err("cannot remap MMIO region %lx @ %lx\n",</div><div class='del'>-				pci_resource_len(pdev, 0),</div><div class='del'>-				pci_resource_start(pdev, 0));</div><div class='add'>+		err("cannot remap MMIO region %llx @ %llx\n",</div><div class='add'>+		    (unsigned long long)pci_resource_len(pdev, 0),</div><div class='add'>+		    (unsigned long long)pci_resource_start(pdev, 0));</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto err_free_mem_region;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1189,7 +1188,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* set up the interrupt */</div><div class='ctx'> 	dbg("HPC interrupt = %d \n", ctrl-&gt;interrupt);</div><div class='ctx'> 	if (request_irq(ctrl-&gt;interrupt, cpqhp_ctrl_intr,</div><div class='del'>-			SA_SHIRQ, MY_NAME, ctrl)) {</div><div class='add'>+			IRQF_SHARED, MY_NAME, ctrl)) {</div><div class='ctx'> 		err("Can't get irq %d for the hotplug pci controller\n",</div><div class='ctx'> 			ctrl-&gt;interrupt);</div><div class='ctx'> 		rc = -ENODEV;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c<br/>index 55d2dc7e39ca..ae2dd36efef2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_ctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpqphp_ctrl.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c<br/>index ac98a11bd1eb..cf0878917537 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_nvram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_nvram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_nvram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpqphp_nvram.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c<br/>index 00b81a7bdd26..0d9688952f4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpqphp_pci.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c<br/>index bbfeed767ff1..8b3da007e859 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/cpqphp_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/cpqphp_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/cpqphp_sysfs.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c<br/>index 71b80c23e8ce..dd2b762777c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/fakephp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/fakephp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/fakephp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/fakephp.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  * Enabling PCI devices is left as an exercise for the reader...</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c<br/>index e13d5b87241a..59392946c2bd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/ibmphp_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/ibmphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/ibmphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/ibmphp_core.c</a></div><div class='hunk'>@@ -285,7 +285,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)</div><div class='ctx'> 					(ulong) hotplug_slot, (ulong) value);</div><div class='ctx'>         </div><div class='ctx'> 	ibmphp_lock_operations();</div><div class='del'>-	if (hotplug_slot &amp;&amp; value) {</div><div class='add'>+	if (hotplug_slot) {</div><div class='ctx'> 		pslot = hotplug_slot-&gt;private;</div><div class='ctx'> 		if (pslot) {</div><div class='ctx'> 			memcpy(&amp;myslot, pslot, sizeof(struct slot));</div><div class='hunk'>@@ -315,7 +315,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value)</div><div class='ctx'> 	debug("get_latch_status - Entry hotplug_slot[%lx] pvalue[%lx]\n",</div><div class='ctx'> 					(ulong) hotplug_slot, (ulong) value);</div><div class='ctx'> 	ibmphp_lock_operations();</div><div class='del'>-	if (hotplug_slot &amp;&amp; value) {</div><div class='add'>+	if (hotplug_slot) {</div><div class='ctx'> 		pslot = hotplug_slot-&gt;private;</div><div class='ctx'> 		if (pslot) {</div><div class='ctx'> 			memcpy(&amp;myslot, pslot, sizeof(struct slot));</div><div class='hunk'>@@ -342,7 +342,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)</div><div class='ctx'> 	debug("get_power_status - Entry hotplug_slot[%lx] pvalue[%lx]\n",</div><div class='ctx'> 					(ulong) hotplug_slot, (ulong) value);</div><div class='ctx'> 	ibmphp_lock_operations();</div><div class='del'>-	if (hotplug_slot &amp;&amp; value) {</div><div class='add'>+	if (hotplug_slot) {</div><div class='ctx'> 		pslot = hotplug_slot-&gt;private;</div><div class='ctx'> 		if (pslot) {</div><div class='ctx'> 			memcpy(&amp;myslot, pslot, sizeof(struct slot));</div><div class='hunk'>@@ -369,7 +369,7 @@ static int get_adapter_present(struct hotplug_slot *hotplug_slot, u8 * value)</div><div class='ctx'> 	debug("get_adapter_status - Entry hotplug_slot[%lx] pvalue[%lx]\n",</div><div class='ctx'> 					(ulong) hotplug_slot, (ulong) value);</div><div class='ctx'> 	ibmphp_lock_operations();</div><div class='del'>-	if (hotplug_slot &amp;&amp; value) {</div><div class='add'>+	if (hotplug_slot) {</div><div class='ctx'> 		pslot = hotplug_slot-&gt;private;</div><div class='ctx'> 		if (pslot) {</div><div class='ctx'> 			memcpy(&amp;myslot, pslot, sizeof(struct slot));</div><div class='hunk'>@@ -401,7 +401,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe</div><div class='ctx'> </div><div class='ctx'> 	ibmphp_lock_operations();</div><div class='ctx'> </div><div class='del'>-	if (hotplug_slot &amp;&amp; value) {</div><div class='add'>+	if (hotplug_slot) {</div><div class='ctx'> 		pslot = hotplug_slot-&gt;private;</div><div class='ctx'> 		if (pslot) {</div><div class='ctx'> 			rc = 0;</div><div class='hunk'>@@ -441,7 +441,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe</div><div class='ctx'> </div><div class='ctx'> 	ibmphp_lock_operations();</div><div class='ctx'> </div><div class='del'>-	if (hotplug_slot &amp;&amp; value) {</div><div class='add'>+	if (hotplug_slot) {</div><div class='ctx'> 		pslot = hotplug_slot-&gt;private;</div><div class='ctx'> 		if (pslot) {</div><div class='ctx'> 			rc = get_cur_bus_info(&amp;pslot);</div><div class='head'>diff --git a/drivers/pci/hotplug/pci_hotplug.h b/drivers/pci/hotplug/pci_hotplug.h<br/>index eb0d01d47236..e929b7c11429 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pci_hotplug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pci_hotplug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pci_hotplug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pci_hotplug.h</a></div><div class='hunk'>@@ -176,11 +176,51 @@ extern int pci_hp_change_slot_info	(struct hotplug_slot *slot,</div><div class='ctx'> 					 struct hotplug_slot_info *info);</div><div class='ctx'> extern struct subsystem pci_hotplug_slots_subsys;</div><div class='ctx'> </div><div class='add'>+/* PCI Setting Record (Type 0) */</div><div class='add'>+struct hpp_type0 {</div><div class='add'>+	u32 revision;</div><div class='add'>+	u8  cache_line_size;</div><div class='add'>+	u8  latency_timer;</div><div class='add'>+	u8  enable_serr;</div><div class='add'>+	u8  enable_perr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PCI-X Setting Record (Type 1) */</div><div class='add'>+struct hpp_type1 {</div><div class='add'>+	u32 revision;</div><div class='add'>+	u8  max_mem_read;</div><div class='add'>+	u8  avg_max_split;</div><div class='add'>+	u16 tot_max_split;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PCI Express Setting Record (Type 2) */</div><div class='add'>+struct hpp_type2 {</div><div class='add'>+	u32 revision;</div><div class='add'>+	u32 unc_err_mask_and;</div><div class='add'>+	u32 unc_err_mask_or;</div><div class='add'>+	u32 unc_err_sever_and;</div><div class='add'>+	u32 unc_err_sever_or;</div><div class='add'>+	u32 cor_err_mask_and;</div><div class='add'>+	u32 cor_err_mask_or;</div><div class='add'>+	u32 adv_err_cap_and;</div><div class='add'>+	u32 adv_err_cap_or;</div><div class='add'>+	u16 pci_exp_devctl_and;</div><div class='add'>+	u16 pci_exp_devctl_or;</div><div class='add'>+	u16 pci_exp_lnkctl_and;</div><div class='add'>+	u16 pci_exp_lnkctl_or;</div><div class='add'>+	u32 sec_unc_err_sever_and;</div><div class='add'>+	u32 sec_unc_err_sever_or;</div><div class='add'>+	u32 sec_unc_err_mask_and;</div><div class='add'>+	u32 sec_unc_err_mask_or;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hotplug_params {</div><div class='del'>-	u8 cache_line_size;</div><div class='del'>-	u8 latency_timer;</div><div class='del'>-	u8 enable_serr;</div><div class='del'>-	u8 enable_perr;</div><div class='add'>+	struct hpp_type0 *t0;		/* Type0: NULL if not available */</div><div class='add'>+	struct hpp_type1 *t1;		/* Type1: NULL if not available */</div><div class='add'>+	struct hpp_type2 *t2;		/* Type2: NULL if not available */</div><div class='add'>+	struct hpp_type0 type0_data;</div><div class='add'>+	struct hpp_type1 type1_data;</div><div class='add'>+	struct hpp_type2 type2_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='hunk'>@@ -188,7 +228,7 @@ struct hotplug_params {</div><div class='ctx'> #include &lt;acpi/acpi_bus.h&gt;</div><div class='ctx'> #include &lt;acpi/actypes.h&gt;</div><div class='ctx'> extern acpi_status acpi_run_oshp(acpi_handle handle);</div><div class='del'>-extern acpi_status acpi_get_hp_params_from_firmware(struct pci_dev *dev,</div><div class='add'>+extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,</div><div class='ctx'> 				struct hotplug_params *hpp);</div><div class='ctx'> int acpi_root_bridge(acpi_handle handle);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c<br/>index c4282902cb52..b7b378df89e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pci_hotplug_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pci_hotplug_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pci_hotplug_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pci_hotplug_core.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h<br/>index 92c1f0f1e1ad..ce89f5815861 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pciehp.h</a></div><div class='hunk'>@@ -284,7 +284,7 @@ struct hpc_ops {</div><div class='ctx'> static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,</div><div class='ctx'> 			struct hotplug_params *hpp)</div><div class='ctx'> {</div><div class='del'>-	if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev, hpp)))</div><div class='add'>+	if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev-&gt;bus, hpp)))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c<br/>index 601cf9045b20..c67b7c3f1ddf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pciehp_core.c</a></div><div class='hunk'>@@ -69,6 +69,7 @@ static int get_power_status	(struct hotplug_slot *slot, u8 *value);</div><div class='ctx'> static int get_attention_status	(struct hotplug_slot *slot, u8 *value);</div><div class='ctx'> static int get_latch_status	(struct hotplug_slot *slot, u8 *value);</div><div class='ctx'> static int get_adapter_status	(struct hotplug_slot *slot, u8 *value);</div><div class='add'>+static int get_address		(struct hotplug_slot *slot, u32 *value);</div><div class='ctx'> static int get_max_bus_speed	(struct hotplug_slot *slot, enum pci_bus_speed *value);</div><div class='ctx'> static int get_cur_bus_speed	(struct hotplug_slot *slot, enum pci_bus_speed *value);</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +82,7 @@ static struct hotplug_slot_ops pciehp_hotplug_slot_ops = {</div><div class='ctx'> 	.get_attention_status =	get_attention_status,</div><div class='ctx'> 	.get_latch_status =	get_latch_status,</div><div class='ctx'> 	.get_adapter_status =	get_adapter_status,</div><div class='add'>+	.get_address =		get_address,</div><div class='ctx'>   	.get_max_bus_speed =	get_max_bus_speed,</div><div class='ctx'>   	.get_cur_bus_speed =	get_cur_bus_speed,</div><div class='ctx'> };</div><div class='hunk'>@@ -331,6 +333,18 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)</div><div class='add'>+{</div><div class='add'>+	struct slot *slot = hotplug_slot-&gt;private;</div><div class='add'>+	struct pci_bus *bus = slot-&gt;ctrl-&gt;pci_dev-&gt;subordinate;</div><div class='add'>+</div><div class='add'>+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot-&gt;name);</div><div class='add'>+</div><div class='add'>+	*value = (pci_domain_nr(bus) &lt;&lt; 16) | (slot-&gt;bus &lt;&lt; 8) | slot-&gt;device;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)</div><div class='ctx'> {</div><div class='ctx'> 	struct slot *slot = hotplug_slot-&gt;private;</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c<br/>index 6c14d9e46b2e..0d8fb6e607a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_hpc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp_hpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_hpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pciehp_hpc.c</a></div><div class='hunk'>@@ -1288,7 +1288,7 @@ int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev)</div><div class='ctx'> 		if (ACPI_SUCCESS(status)) {</div><div class='ctx'> 			dbg("Gained control for hotplug HW for pci %s (%s)\n",</div><div class='ctx'> 				pci_name(dev), (char *)string.pointer);</div><div class='del'>-			acpi_os_free(string.pointer);</div><div class='add'>+			kfree(string.pointer);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (acpi_root_bridge(handle))</div><div class='hunk'>@@ -1302,7 +1302,7 @@ int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev)</div><div class='ctx'> 	err("Cannot get control of hotplug hardware for pci %s\n",</div><div class='ctx'> 			pci_name(dev));</div><div class='ctx'> </div><div class='del'>-	acpi_os_free(string.pointer);</div><div class='add'>+	kfree(string.pointer);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1398,15 +1398,13 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	for ( rc = 0; rc &lt; DEVICE_COUNT_RESOURCE; rc++)</div><div class='ctx'> 		if (pci_resource_len(pdev, rc) &gt; 0)</div><div class='del'>-			dbg("pci resource[%d] start=0x%lx(len=0x%lx)\n", rc,</div><div class='del'>-				pci_resource_start(pdev, rc), pci_resource_len(pdev, rc));</div><div class='add'>+			dbg("pci resource[%d] start=0x%llx(len=0x%llx)\n", rc,</div><div class='add'>+			    (unsigned long long)pci_resource_start(pdev, rc),</div><div class='add'>+			    (unsigned long long)pci_resource_len(pdev, rc));</div><div class='ctx'> </div><div class='ctx'> 	info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev-&gt;vendor, pdev-&gt;device, </div><div class='ctx'> 		pdev-&gt;subsystem_vendor, pdev-&gt;subsystem_device);</div><div class='ctx'> </div><div class='del'>-	if (pci_enable_device(pdev))</div><div class='del'>-		goto abort_free_ctlr;</div><div class='del'>-	</div><div class='ctx'> 	mutex_init(&amp;ctrl-&gt;crit_sect);</div><div class='ctx'> 	/* setup wait queue */</div><div class='ctx'> 	init_waitqueue_head(&amp;ctrl-&gt;queue);</div><div class='hunk'>@@ -1460,7 +1458,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)</div><div class='ctx'> 		start_int_poll_timer( php_ctlr, 10 );   /* start with 10 second delay */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Installs the interrupt handler */</div><div class='del'>-		rc = request_irq(php_ctlr-&gt;irq, pcie_isr, SA_SHIRQ, MY_NAME, (void *) ctrl);</div><div class='add'>+		rc = request_irq(php_ctlr-&gt;irq, pcie_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);</div><div class='ctx'> 		dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr-&gt;irq, ctlr_seq_num, rc);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			err("Can't get irq %d for the hotplug controller\n", php_ctlr-&gt;irq);</div><div class='hunk'>@@ -1474,7 +1472,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)</div><div class='ctx'> 	rc = hp_register_read_word(pdev, SLOT_CTRL(ctrl-&gt;cap_base), temp_word);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);</div><div class='del'>-		goto abort_free_ctlr;</div><div class='add'>+		goto abort_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	intr_enable = intr_enable | PRSN_DETECT_ENABLE;</div><div class='hunk'>@@ -1500,19 +1498,19 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)</div><div class='ctx'> 	rc = hp_register_write_word(pdev, SLOT_CTRL(ctrl-&gt;cap_base), temp_word);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);</div><div class='del'>-		goto abort_free_ctlr;</div><div class='add'>+		goto abort_free_irq;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = hp_register_read_word(php_ctlr-&gt;pci_dev, SLOT_STATUS(ctrl-&gt;cap_base), slot_status);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);</div><div class='del'>-		goto abort_free_ctlr;</div><div class='add'>+		goto abort_disable_intr;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	temp_word =  0x1F; /* Clear all events */</div><div class='ctx'> 	rc = hp_register_write_word(php_ctlr-&gt;pci_dev, SLOT_STATUS(ctrl-&gt;cap_base), temp_word);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);</div><div class='del'>-		goto abort_free_ctlr;</div><div class='add'>+		goto abort_disable_intr;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (pciehp_force) {</div><div class='hunk'>@@ -1521,7 +1519,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = pciehp_get_hp_hw_control_from_firmware(ctrl-&gt;pci_dev);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			goto abort_free_ctlr;</div><div class='add'>+			goto abort_disable_intr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*  Add this HPC instance into the HPC list */</div><div class='hunk'>@@ -1548,6 +1546,21 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* We end up here for the many possible ways to fail this API.  */</div><div class='add'>+abort_disable_intr:</div><div class='add'>+	rc = hp_register_read_word(pdev, SLOT_CTRL(ctrl-&gt;cap_base), temp_word);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		temp_word &amp;= ~(intr_enable | HP_INTR_ENABLE);</div><div class='add'>+		rc = hp_register_write_word(pdev, SLOT_CTRL(ctrl-&gt;cap_base), temp_word);</div><div class='add'>+	}</div><div class='add'>+	if (rc)</div><div class='add'>+		err("%s : disabling interrupts failed\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+abort_free_irq:</div><div class='add'>+	if (pciehp_poll_mode)</div><div class='add'>+		del_timer_sync(&amp;php_ctlr-&gt;int_poll_timer);</div><div class='add'>+	else</div><div class='add'>+		free_irq(php_ctlr-&gt;irq, ctrl);</div><div class='add'>+</div><div class='ctx'> abort_free_ctlr:</div><div class='ctx'> 	pcie_cap_base = saved_cap_base;</div><div class='ctx'> 	kfree(php_ctlr);</div><div class='head'>diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c<br/>index 4017fb03a0b8..854aaea09e4d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pciehp_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pciehp_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pciehp_pci.c</a></div><div class='hunk'>@@ -34,6 +34,144 @@</div><div class='ctx'> #include "../pci.h"</div><div class='ctx'> #include "pciehp.h"</div><div class='ctx'> </div><div class='add'>+static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp)</div><div class='add'>+{</div><div class='add'>+	u16 pci_cmd, pci_bctl;</div><div class='add'>+</div><div class='add'>+	if (hpp-&gt;revision &gt; 1) {</div><div class='add'>+		printk(KERN_WARNING "%s: Rev.%d type0 record not supported\n",</div><div class='add'>+		       __FUNCTION__, hpp-&gt;revision);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, hpp-&gt;cache_line_size);</div><div class='add'>+	pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp-&gt;latency_timer);</div><div class='add'>+	pci_read_config_word(dev, PCI_COMMAND, &amp;pci_cmd);</div><div class='add'>+	if (hpp-&gt;enable_serr)</div><div class='add'>+		pci_cmd |= PCI_COMMAND_SERR;</div><div class='add'>+	else</div><div class='add'>+		pci_cmd &amp;= ~PCI_COMMAND_SERR;</div><div class='add'>+	if (hpp-&gt;enable_perr)</div><div class='add'>+		pci_cmd |= PCI_COMMAND_PARITY;</div><div class='add'>+	else</div><div class='add'>+		pci_cmd &amp;= ~PCI_COMMAND_PARITY;</div><div class='add'>+	pci_write_config_word(dev, PCI_COMMAND, pci_cmd);</div><div class='add'>+</div><div class='add'>+	/* Program bridge control value */</div><div class='add'>+	if ((dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI) {</div><div class='add'>+		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,</div><div class='add'>+				      hpp-&gt;latency_timer);</div><div class='add'>+		pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &amp;pci_bctl);</div><div class='add'>+		if (hpp-&gt;enable_serr)</div><div class='add'>+			pci_bctl |= PCI_BRIDGE_CTL_SERR;</div><div class='add'>+		else</div><div class='add'>+			pci_bctl &amp;= ~PCI_BRIDGE_CTL_SERR;</div><div class='add'>+		if (hpp-&gt;enable_perr)</div><div class='add'>+			pci_bctl |= PCI_BRIDGE_CTL_PARITY;</div><div class='add'>+		else</div><div class='add'>+			pci_bctl &amp;= ~PCI_BRIDGE_CTL_PARITY;</div><div class='add'>+		pci_write_config_word(dev, PCI_BRIDGE_CONTROL, pci_bctl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)</div><div class='add'>+{</div><div class='add'>+	int pos;</div><div class='add'>+	u16 reg16;</div><div class='add'>+	u32 reg32;</div><div class='add'>+</div><div class='add'>+	if (hpp-&gt;revision &gt; 1) {</div><div class='add'>+		printk(KERN_WARNING "%s: Rev.%d type2 record not supported\n",</div><div class='add'>+		       __FUNCTION__, hpp-&gt;revision);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find PCI Express capability */</div><div class='add'>+	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);</div><div class='add'>+	if (!pos)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Initialize Device Control Register */</div><div class='add'>+	pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &amp;reg16);</div><div class='add'>+	reg16 = (reg16 &amp; hpp-&gt;pci_exp_devctl_and) | hpp-&gt;pci_exp_devctl_or;</div><div class='add'>+	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, reg16);</div><div class='add'>+</div><div class='add'>+	/* Initialize Link Control Register */</div><div class='add'>+	if (dev-&gt;subordinate) {</div><div class='add'>+		pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &amp;reg16);</div><div class='add'>+		reg16 = (reg16 &amp; hpp-&gt;pci_exp_lnkctl_and)</div><div class='add'>+			| hpp-&gt;pci_exp_lnkctl_or;</div><div class='add'>+		pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, reg16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find Advanced Error Reporting Enhanced Capability */</div><div class='add'>+	pos = 256;</div><div class='add'>+	do {</div><div class='add'>+		pci_read_config_dword(dev, pos, &amp;reg32);</div><div class='add'>+		if (PCI_EXT_CAP_ID(reg32) == PCI_EXT_CAP_ID_ERR)</div><div class='add'>+			break;</div><div class='add'>+	} while ((pos = PCI_EXT_CAP_NEXT(reg32)));</div><div class='add'>+	if (!pos)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Initialize Uncorrectable Error Mask Register */</div><div class='add'>+	pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_MASK, &amp;reg32);</div><div class='add'>+	reg32 = (reg32 &amp; hpp-&gt;unc_err_mask_and) | hpp-&gt;unc_err_mask_or;</div><div class='add'>+	pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_MASK, reg32);</div><div class='add'>+</div><div class='add'>+	/* Initialize Uncorrectable Error Severity Register */</div><div class='add'>+	pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, &amp;reg32);</div><div class='add'>+	reg32 = (reg32 &amp; hpp-&gt;unc_err_sever_and) | hpp-&gt;unc_err_sever_or;</div><div class='add'>+	pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, reg32);</div><div class='add'>+</div><div class='add'>+	/* Initialize Correctable Error Mask Register */</div><div class='add'>+	pci_read_config_dword(dev, pos + PCI_ERR_COR_MASK, &amp;reg32);</div><div class='add'>+	reg32 = (reg32 &amp; hpp-&gt;cor_err_mask_and) | hpp-&gt;cor_err_mask_or;</div><div class='add'>+	pci_write_config_dword(dev, pos + PCI_ERR_COR_MASK, reg32);</div><div class='add'>+</div><div class='add'>+	/* Initialize Advanced Error Capabilities and Control Register */</div><div class='add'>+	pci_read_config_dword(dev, pos + PCI_ERR_CAP, &amp;reg32);</div><div class='add'>+	reg32 = (reg32 &amp; hpp-&gt;adv_err_cap_and) | hpp-&gt;adv_err_cap_or;</div><div class='add'>+	pci_write_config_dword(dev, pos + PCI_ERR_CAP, reg32);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIXME: The following two registers are not supported yet.</div><div class='add'>+	 *</div><div class='add'>+	 *   o Secondary Uncorrectable Error Severity Register</div><div class='add'>+	 *   o Secondary Uncorrectable Error Mask Register</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void program_fw_provided_values(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *cdev;</div><div class='add'>+	struct hotplug_params hpp;</div><div class='add'>+</div><div class='add'>+	/* Program hpp values for this device */</div><div class='add'>+	if (!(dev-&gt;hdr_type == PCI_HEADER_TYPE_NORMAL ||</div><div class='add'>+			(dev-&gt;hdr_type == PCI_HEADER_TYPE_BRIDGE &amp;&amp;</div><div class='add'>+			(dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pciehp_get_hp_params_from_firmware(dev, &amp;hpp)) {</div><div class='add'>+		printk(KERN_WARNING "%s: Could not get hotplug parameters\n",</div><div class='add'>+		       __FUNCTION__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hpp.t2)</div><div class='add'>+		program_hpp_type2(dev, hpp.t2);</div><div class='add'>+	if (hpp.t0)</div><div class='add'>+		program_hpp_type0(dev, hpp.t0);</div><div class='add'>+</div><div class='add'>+	/* Program child devices */</div><div class='add'>+	if (dev-&gt;subordinate) {</div><div class='add'>+		list_for_each_entry(cdev, &amp;dev-&gt;subordinate-&gt;devices,</div><div class='add'>+				    bus_list)</div><div class='add'>+			program_fw_provided_values(cdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pciehp_add_bridge(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_bus *parent = dev-&gt;bus;</div><div class='hunk'>@@ -66,10 +204,11 @@ int pciehp_configure_device(struct slot *p_slot)</div><div class='ctx'> 	struct pci_bus *parent = p_slot-&gt;ctrl-&gt;pci_dev-&gt;subordinate;</div><div class='ctx'> 	int num, fn;</div><div class='ctx'> </div><div class='del'>-	dev = pci_find_slot(p_slot-&gt;bus, PCI_DEVFN(p_slot-&gt;device, 0));</div><div class='add'>+	dev = pci_get_slot(parent, PCI_DEVFN(p_slot-&gt;device, 0));</div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		err("Device %s already exists at %x:%x, cannot hot-add\n",</div><div class='ctx'> 				pci_name(dev), p_slot-&gt;bus, p_slot-&gt;device);</div><div class='add'>+		pci_dev_put(dev);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -86,14 +225,15 @@ int pciehp_configure_device(struct slot *p_slot)</div><div class='ctx'> 		if ((dev-&gt;class &gt;&gt; 16) == PCI_BASE_CLASS_DISPLAY) {</div><div class='ctx'> 			err("Cannot hot-add display device %s\n",</div><div class='ctx'> 					pci_name(dev));</div><div class='add'>+			pci_dev_put(dev);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((dev-&gt;hdr_type == PCI_HEADER_TYPE_BRIDGE) ||</div><div class='ctx'> 				(dev-&gt;hdr_type == PCI_HEADER_TYPE_CARDBUS)) {</div><div class='ctx'> 			pciehp_add_bridge(dev);</div><div class='ctx'> 		}</div><div class='del'>-		/* TBD: program firmware provided _HPP values */</div><div class='del'>-		/* program_fw_provided_values(dev); */</div><div class='add'>+		program_fw_provided_values(dev);</div><div class='add'>+		pci_dev_put(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_bus_assign_resources(parent);</div><div class='hunk'>@@ -106,18 +246,20 @@ int pciehp_unconfigure_device(struct slot *p_slot)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int j;</div><div class='ctx'> 	u8 bctl = 0;</div><div class='add'>+	struct pci_bus *parent = p_slot-&gt;ctrl-&gt;pci_dev-&gt;subordinate;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s: bus/dev = %x/%x\n", __FUNCTION__, p_slot-&gt;bus,</div><div class='ctx'> 				p_slot-&gt;device);</div><div class='ctx'> </div><div class='ctx'> 	for (j=0; j&lt;8 ; j++) {</div><div class='del'>-		struct pci_dev* temp = pci_find_slot(p_slot-&gt;bus,</div><div class='add'>+		struct pci_dev* temp = pci_get_slot(parent,</div><div class='ctx'> 				(p_slot-&gt;device &lt;&lt; 3) | j);</div><div class='ctx'> 		if (!temp)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if ((temp-&gt;class &gt;&gt; 16) == PCI_BASE_CLASS_DISPLAY) {</div><div class='ctx'> 			err("Cannot remove display device %s\n",</div><div class='ctx'> 					pci_name(temp));</div><div class='add'>+			pci_dev_put(temp);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (temp-&gt;hdr_type == PCI_HEADER_TYPE_BRIDGE) {</div><div class='hunk'>@@ -125,10 +267,12 @@ int pciehp_unconfigure_device(struct slot *p_slot)</div><div class='ctx'> 			if (bctl &amp; PCI_BRIDGE_CTL_VGA) {</div><div class='ctx'> 				err("Cannot remove display device %s\n",</div><div class='ctx'> 						pci_name(temp));</div><div class='add'>+				pci_dev_put(temp);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		pci_remove_bus_device(temp);</div><div class='add'>+		pci_dev_put(temp);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* </div><div class='ctx'> 	 * Some PCI Express root ports require fixup after hot-plug operation.</div><div class='head'>diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c<br/>index 0a46f549676a..8ad446605f75 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pcihp_skeleton.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/pcihp_skeleton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/pcihp_skeleton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/pcihp_skeleton.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c<br/>index 638004546700..076bd6dcafae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/rpaphp_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/rpaphp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/rpaphp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/rpaphp_core.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Send feedback to &lt;lxie@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='head'>diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c<br/>index 8cb9abde736b..f31d83c2c633 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/sgi_hotplug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/sgi_hotplug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/sgi_hotplug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/sgi_hotplug.c</a></div><div class='hunk'>@@ -18,11 +18,13 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sn/addrs.h&gt;</div><div class='add'>+#include &lt;asm/sn/geo.h&gt;</div><div class='ctx'> #include &lt;asm/sn/l1.h&gt;</div><div class='ctx'> #include &lt;asm/sn/module.h&gt;</div><div class='ctx'> #include &lt;asm/sn/pcibr_provider.h&gt;</div><div class='ctx'> #include &lt;asm/sn/pcibus_provider_defs.h&gt;</div><div class='ctx'> #include &lt;asm/sn/pcidev.h&gt;</div><div class='add'>+#include &lt;asm/sn/sn_feature_sets.h&gt;</div><div class='ctx'> #include &lt;asm/sn/sn_sal.h&gt;</div><div class='ctx'> #include &lt;asm/sn/types.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -102,8 +104,7 @@ static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path);</div><div class='ctx'> static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcibus_info *pcibus_info;</div><div class='del'>-	int bricktype;</div><div class='del'>-	int bus_num;</div><div class='add'>+	u16 busnum, segment, ioboard_type;</div><div class='ctx'> </div><div class='ctx'> 	pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);</div><div class='ctx'> </div><div class='hunk'>@@ -111,12 +112,14 @@ static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)</div><div class='ctx'> 	if (!(pcibus_info-&gt;pbi_valid_devices &amp; (1 &lt;&lt; device)))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	bricktype = MODULE_GET_BTYPE(pcibus_info-&gt;pbi_moduleid);</div><div class='del'>-	bus_num = pcibus_info-&gt;pbi_buscommon.bs_persist_busnum &amp; 0xf;</div><div class='add'>+	ioboard_type = sn_ioboard_to_pci_bus(pci_bus);</div><div class='add'>+	busnum = pcibus_info-&gt;pbi_buscommon.bs_persist_busnum;</div><div class='add'>+	segment = pci_domain_nr(pci_bus) &amp; 0xf;</div><div class='ctx'> </div><div class='ctx'> 	/* Do not allow hotplug operations on base I/O cards */</div><div class='del'>-	if ((bricktype == L1_BRICKTYPE_IX ||  bricktype == L1_BRICKTYPE_IA) &amp;&amp;</div><div class='del'>-	    (bus_num == 1 &amp;&amp; device != 1))</div><div class='add'>+	if ((ioboard_type == L1_BRICKTYPE_IX ||</div><div class='add'>+	     ioboard_type == L1_BRICKTYPE_IA) &amp;&amp;</div><div class='add'>+	    (segment == 1 &amp;&amp; busnum == 0 &amp;&amp; device != 1))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -125,23 +128,23 @@ static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)</div><div class='ctx'> static int sn_pci_bus_valid(struct pci_bus *pci_bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcibus_info *pcibus_info;</div><div class='del'>-	int asic_type;</div><div class='del'>-	int bricktype;</div><div class='del'>-</div><div class='del'>-	pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);</div><div class='add'>+	u32 asic_type;</div><div class='add'>+	u16 ioboard_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't register slots hanging off the TIOCA bus */</div><div class='add'>+	pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);</div><div class='ctx'> 	asic_type = pcibus_info-&gt;pbi_buscommon.bs_asic_type;</div><div class='ctx'> 	if (asic_type == PCIIO_ASIC_TYPE_TIOCA)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/* Only register slots in I/O Bricks that support hotplug */</div><div class='del'>-	bricktype = MODULE_GET_BTYPE(pcibus_info-&gt;pbi_moduleid);</div><div class='del'>-	switch (bricktype) {</div><div class='add'>+	ioboard_type = sn_ioboard_to_pci_bus(pci_bus);</div><div class='add'>+	switch (ioboard_type) {</div><div class='ctx'> 		case L1_BRICKTYPE_IX:</div><div class='ctx'> 		case L1_BRICKTYPE_PX:</div><div class='ctx'> 		case L1_BRICKTYPE_IA:</div><div class='ctx'> 		case L1_BRICKTYPE_PA:</div><div class='add'>+		case L1_BOARDTYPE_PCIX3SLOT:</div><div class='ctx'> 			return 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -175,14 +178,11 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,</div><div class='ctx'> 	slot-&gt;pci_bus = pci_bus;</div><div class='ctx'> 	sprintf(bss_hotplug_slot-&gt;name, "%04x:%02x:%02x",</div><div class='ctx'> 		pci_domain_nr(pci_bus),</div><div class='del'>-		((int)pcibus_info-&gt;pbi_buscommon.bs_persist_busnum) &amp; 0xf,</div><div class='add'>+		((u16)pcibus_info-&gt;pbi_buscommon.bs_persist_busnum),</div><div class='ctx'> 		device + 1);</div><div class='del'>-	sprintf(slot-&gt;physical_path, "module_%c%c%c%c%.2d",</div><div class='del'>-		'0'+RACK_GET_CLASS(MODULE_GET_RACK(pcibus_info-&gt;pbi_moduleid)),</div><div class='del'>-		'0'+RACK_GET_GROUP(MODULE_GET_RACK(pcibus_info-&gt;pbi_moduleid)),</div><div class='del'>-		'0'+RACK_GET_NUM(MODULE_GET_RACK(pcibus_info-&gt;pbi_moduleid)),</div><div class='del'>-		MODULE_GET_BTCHAR(pcibus_info-&gt;pbi_moduleid),</div><div class='del'>-		MODULE_GET_BPOS(pcibus_info-&gt;pbi_moduleid));</div><div class='add'>+</div><div class='add'>+	sn_generate_path(pci_bus, slot-&gt;physical_path);</div><div class='add'>+</div><div class='ctx'> 	slot-&gt;hotplug_slot = bss_hotplug_slot;</div><div class='ctx'> 	list_add(&amp;slot-&gt;hp_list, &amp;sn_hp_list);</div><div class='ctx'> </div><div class='hunk'>@@ -461,10 +461,12 @@ static inline int get_power_status(struct hotplug_slot *bss_hotplug_slot,</div><div class='ctx'> {</div><div class='ctx'> 	struct slot *slot = bss_hotplug_slot-&gt;private;</div><div class='ctx'> 	struct pcibus_info *pcibus_info;</div><div class='add'>+	u32 power;</div><div class='ctx'> </div><div class='ctx'> 	pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot-&gt;pci_bus);</div><div class='ctx'> 	mutex_lock(&amp;sn_hotplug_mutex);</div><div class='del'>-	*value = pcibus_info-&gt;pbi_enabled_devices &amp; (1 &lt;&lt; slot-&gt;device_num);</div><div class='add'>+	power = pcibus_info-&gt;pbi_enabled_devices &amp; (1 &lt;&lt; slot-&gt;device_num);</div><div class='add'>+	*value = power ? 1 : 0;</div><div class='ctx'> 	mutex_unlock(&amp;sn_hotplug_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -553,8 +555,8 @@ static int sn_pci_hotplug_init(void)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int registered = 0;</div><div class='ctx'> </div><div class='del'>-	if (sn_sal_rev() &lt; SGI_HOTPLUG_PROM_REV) {</div><div class='del'>-		printk(KERN_ERR "%s: PROM version must be greater than 4.30\n",</div><div class='add'>+	if (!sn_prom_feature_available(PRF_HOTPLUG_SUPPORT)) {</div><div class='add'>+		printk(KERN_ERR "%s: PROM version does not support hotplug.\n",</div><div class='ctx'> 		       __FUNCTION__);</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h<br/>index 5c70f43908c4..7208b95c6ee7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/shpchp.h</a></div><div class='hunk'>@@ -168,9 +168,9 @@ struct controller {</div><div class='ctx'>  * error Messages</div><div class='ctx'>  */</div><div class='ctx'> #define msg_initialization_err	"Initialization failure, error=%d\n"</div><div class='del'>-#define msg_button_on		"PCI slot #%d - powering on due to button press.\n"</div><div class='del'>-#define msg_button_off		"PCI slot #%d - powering off due to button press.\n"</div><div class='del'>-#define msg_button_cancel	"PCI slot #%d - action canceled due to button press.\n"</div><div class='add'>+#define msg_button_on		"PCI slot #%s - powering on due to button press.\n"</div><div class='add'>+#define msg_button_off		"PCI slot #%s - powering off due to button press.\n"</div><div class='add'>+#define msg_button_cancel	"PCI slot #%s - action canceled due to button press.\n"</div><div class='ctx'> </div><div class='ctx'> /* sysfs functions for the hotplug controller info */</div><div class='ctx'> extern void shpchp_create_ctrl_files	(struct controller *ctrl);</div><div class='hunk'>@@ -196,7 +196,7 @@ extern void	queue_pushbutton_work(void *data);</div><div class='ctx'> static inline int get_hp_params_from_firmware(struct pci_dev *dev,</div><div class='ctx'> 			struct hotplug_params *hpp)</div><div class='ctx'> {</div><div class='del'>-	if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev, hpp)))</div><div class='add'>+	if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev-&gt;bus, hpp)))</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c<br/>index 3be4d492ccc2..a14e7de19846 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/shpchp_core.c</a></div><div class='hunk'>@@ -491,16 +491,9 @@ static int __init shpcd_init(void)</div><div class='ctx'> 	shpchp_poll_mode = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	shpchp_wq = create_singlethread_workqueue("shpchpd");</div><div class='del'>-	if (!shpchp_wq)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	retval = pci_register_driver(&amp;shpc_driver);</div><div class='ctx'> 	dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval);</div><div class='ctx'> 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");</div><div class='del'>-	if (retval) {</div><div class='del'>-		destroy_workqueue(shpchp_wq);</div><div class='del'>-	}</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -508,7 +501,6 @@ static void __exit shpcd_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	dbg("unload_shpchpd()\n");</div><div class='ctx'> 	pci_unregister_driver(&amp;shpc_driver);</div><div class='del'>-	destroy_workqueue(shpchp_wq);</div><div class='ctx'> 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c<br/>index 4e6381481c55..c39901dbff20 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_ctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_ctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_ctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/shpchp_ctrl.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Button pressed - See if need to TAKE ACTION!!!</div><div class='ctx'> 	 */</div><div class='del'>-	info("Button pressed on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+	info("Button pressed on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 	event_type = INT_BUTTON_PRESS;</div><div class='ctx'> </div><div class='ctx'> 	queue_interrupt_event(p_slot, event_type);</div><div class='hunk'>@@ -101,7 +101,7 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Switch opened</div><div class='ctx'> 		 */</div><div class='del'>-		info("Latch open on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+		info("Latch open on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		event_type = INT_SWITCH_OPEN;</div><div class='ctx'> 		if (p_slot-&gt;pwr_save &amp;&amp; p_slot-&gt;presence_save) {</div><div class='ctx'> 			event_type = INT_POWER_FAULT;</div><div class='hunk'>@@ -111,7 +111,7 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *  Switch closed</div><div class='ctx'> 		 */</div><div class='del'>-		info("Latch close on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+		info("Latch close on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		event_type = INT_SWITCH_CLOSE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -139,13 +139,13 @@ u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Card Present</div><div class='ctx'> 		 */</div><div class='del'>-		info("Card present on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+		info("Card present on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		event_type = INT_PRESENCE_ON;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Not Present</div><div class='ctx'> 		 */</div><div class='del'>-		info("Card not present on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+		info("Card not present on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		event_type = INT_PRESENCE_OFF;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -169,14 +169,14 @@ u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Power fault Cleared</div><div class='ctx'> 		 */</div><div class='del'>-		info("Power fault cleared on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+		info("Power fault cleared on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		p_slot-&gt;status = 0x00;</div><div class='ctx'> 		event_type = INT_POWER_FAULT_CLEAR;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *   Power fault</div><div class='ctx'> 		 */</div><div class='del'>-		info("Power fault on Slot(%d)\n", ctrl-&gt;first_slot + hp_slot);</div><div class='add'>+		info("Power fault on Slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		event_type = INT_POWER_FAULT;</div><div class='ctx'> 		/* set power fault status for this board */</div><div class='ctx'> 		p_slot-&gt;status = 0xFF;</div><div class='hunk'>@@ -496,10 +496,10 @@ static void handle_button_press_event(struct slot *p_slot)</div><div class='ctx'> 		p_slot-&gt;hpc_ops-&gt;get_power_status(p_slot, &amp;getstatus);</div><div class='ctx'> 		if (getstatus) {</div><div class='ctx'> 			p_slot-&gt;state = BLINKINGOFF_STATE;</div><div class='del'>-			info(msg_button_off, p_slot-&gt;number);</div><div class='add'>+			info(msg_button_off, p_slot-&gt;name);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			p_slot-&gt;state = BLINKINGON_STATE;</div><div class='del'>-			info(msg_button_on, p_slot-&gt;number);</div><div class='add'>+			info(msg_button_on, p_slot-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* blink green LED and turn off amber */</div><div class='ctx'> 		p_slot-&gt;hpc_ops-&gt;green_led_blink(p_slot);</div><div class='hunk'>@@ -522,7 +522,7 @@ static void handle_button_press_event(struct slot *p_slot)</div><div class='ctx'> 		else</div><div class='ctx'> 			p_slot-&gt;hpc_ops-&gt;green_led_off(p_slot);</div><div class='ctx'> 		p_slot-&gt;hpc_ops-&gt;set_attention_status(p_slot, 0);</div><div class='del'>-		info(msg_button_cancel, p_slot-&gt;number);</div><div class='add'>+		info(msg_button_cancel, p_slot-&gt;name);</div><div class='ctx'> 		p_slot-&gt;state = STATIC_STATE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case POWEROFF_STATE:</div><div class='hunk'>@@ -575,17 +575,17 @@ static int shpchp_enable_slot (struct slot *p_slot)</div><div class='ctx'> 	mutex_lock(&amp;p_slot-&gt;ctrl-&gt;crit_sect);</div><div class='ctx'> 	rc = p_slot-&gt;hpc_ops-&gt;get_adapter_status(p_slot, &amp;getstatus);</div><div class='ctx'> 	if (rc || !getstatus) {</div><div class='del'>-		info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot-&gt;number);</div><div class='add'>+		info("No adapter on slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = p_slot-&gt;hpc_ops-&gt;get_latch_status(p_slot, &amp;getstatus);</div><div class='ctx'> 	if (rc || getstatus) {</div><div class='del'>-		info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot-&gt;number);</div><div class='add'>+		info("Latch open on slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = p_slot-&gt;hpc_ops-&gt;get_power_status(p_slot, &amp;getstatus);</div><div class='ctx'> 	if (rc || getstatus) {</div><div class='del'>-		info("%s: already enabled on slot(%x)\n", __FUNCTION__, p_slot-&gt;number);</div><div class='add'>+		info("Already enabled on slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -634,17 +634,17 @@ static int shpchp_disable_slot (struct slot *p_slot)</div><div class='ctx'> </div><div class='ctx'> 	rc = p_slot-&gt;hpc_ops-&gt;get_adapter_status(p_slot, &amp;getstatus);</div><div class='ctx'> 	if (rc || !getstatus) {</div><div class='del'>-		info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot-&gt;number);</div><div class='add'>+		info("No adapter on slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = p_slot-&gt;hpc_ops-&gt;get_latch_status(p_slot, &amp;getstatus);</div><div class='ctx'> 	if (rc || getstatus) {</div><div class='del'>-		info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot-&gt;number);</div><div class='add'>+		info("Latch open on slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = p_slot-&gt;hpc_ops-&gt;get_power_status(p_slot, &amp;getstatus);</div><div class='ctx'> 	if (rc || !getstatus) {</div><div class='del'>-		info("%s: already disabled slot(%x)\n", __FUNCTION__, p_slot-&gt;number);</div><div class='add'>+		info("Already disabled slot(%s)\n", p_slot-&gt;name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c<br/>index 66123cf4deaa..0f9798df4704 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_hpc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_hpc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_hpc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/shpchp_hpc.c</a></div><div class='hunk'>@@ -90,77 +90,94 @@</div><div class='ctx'> #define	MRLSENSOR		0x40000000</div><div class='ctx'> #define ATTN_BUTTON		0x80000000</div><div class='ctx'> </div><div class='del'>-/* Slot Status Field Definitions */</div><div class='del'>-/* Slot State */</div><div class='del'>-#define PWR_ONLY		0x0001</div><div class='del'>-#define ENABLED			0x0002</div><div class='del'>-#define DISABLED		0x0003</div><div class='del'>-</div><div class='del'>-/* Power Indicator State */</div><div class='del'>-#define PWR_LED_ON		0x0004</div><div class='del'>-#define PWR_LED_BLINK		0x0008</div><div class='del'>-#define PWR_LED_OFF		0x000c</div><div class='del'>-</div><div class='del'>-/* Attention Indicator State */</div><div class='del'>-#define ATTEN_LED_ON		0x0010</div><div class='del'>-#define	ATTEN_LED_BLINK		0x0020</div><div class='del'>-#define ATTEN_LED_OFF		0x0030</div><div class='del'>-</div><div class='del'>-/* Power Fault */</div><div class='del'>-#define pwr_fault		0x0040</div><div class='del'>-</div><div class='del'>-/* Attention Button */</div><div class='del'>-#define ATTEN_BUTTON		0x0080</div><div class='del'>-</div><div class='del'>-/* MRL Sensor */</div><div class='del'>-#define MRL_SENSOR		0x0100</div><div class='del'>-</div><div class='del'>-/* 66 MHz Capable */</div><div class='del'>-#define IS_66MHZ_CAP		0x0200</div><div class='del'>-</div><div class='del'>-/* PRSNT1#/PRSNT2# */</div><div class='del'>-#define SLOT_EMP		0x0c00</div><div class='del'>-</div><div class='del'>-/* PCI-X Capability */</div><div class='del'>-#define NON_PCIX		0x0000</div><div class='del'>-#define PCIX_66			0x1000</div><div class='del'>-#define PCIX_133		0x3000</div><div class='del'>-#define PCIX_266		0x4000  /* For PI = 2 only */</div><div class='del'>-#define PCIX_533		0x5000	/* For PI = 2 only */</div><div class='del'>-</div><div class='del'>-/* SHPC 'write' operations/commands */</div><div class='del'>-</div><div class='del'>-/* Slot operation - 0x00h to 0x3Fh */</div><div class='del'>-</div><div class='del'>-#define NO_CHANGE		0x00</div><div class='del'>-</div><div class='del'>-/* Slot state - Bits 0 &amp; 1 of controller command register */</div><div class='del'>-#define SET_SLOT_PWR		0x01	</div><div class='del'>-#define SET_SLOT_ENABLE		0x02	</div><div class='del'>-#define SET_SLOT_DISABLE	0x03	</div><div class='add'>+/*</div><div class='add'>+ * Interrupt Locator Register definitions</div><div class='add'>+ */</div><div class='add'>+#define CMD_INTR_PENDING	(1 &lt;&lt; 0)</div><div class='add'>+#define SLOT_INTR_PENDING(i)	(1 &lt;&lt; (i + 1))</div><div class='ctx'> </div><div class='del'>-/* Power indicator state - Bits 2 &amp; 3 of controller command register*/</div><div class='del'>-#define SET_PWR_ON		0x04	</div><div class='del'>-#define SET_PWR_BLINK		0x08	</div><div class='del'>-#define SET_PWR_OFF		0x0C	</div><div class='add'>+/*</div><div class='add'>+ * Controller SERR-INT Register</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_INTR_MASK	(1 &lt;&lt; 0)</div><div class='add'>+#define GLOBAL_SERR_MASK	(1 &lt;&lt; 1)</div><div class='add'>+#define COMMAND_INTR_MASK	(1 &lt;&lt; 2)</div><div class='add'>+#define ARBITER_SERR_MASK	(1 &lt;&lt; 3)</div><div class='add'>+#define COMMAND_DETECTED	(1 &lt;&lt; 16)</div><div class='add'>+#define ARBITER_DETECTED	(1 &lt;&lt; 17)</div><div class='add'>+#define SERR_INTR_RSVDZ_MASK	0xfffc0000</div><div class='ctx'> </div><div class='del'>-/* Attention indicator state - Bits 4 &amp; 5 of controller command register*/</div><div class='del'>-#define SET_ATTN_ON		0x010	</div><div class='del'>-#define SET_ATTN_BLINK		0x020</div><div class='del'>-#define SET_ATTN_OFF		0x030	</div><div class='add'>+/*</div><div class='add'>+ * Logical Slot Register definitions</div><div class='add'>+ */</div><div class='add'>+#define SLOT_REG(i)		(SLOT1 + (4 * i))</div><div class='add'>+</div><div class='add'>+#define SLOT_STATE_SHIFT	(0)</div><div class='add'>+#define SLOT_STATE_MASK		(3 &lt;&lt; 0)</div><div class='add'>+#define SLOT_STATE_PWRONLY	(1)</div><div class='add'>+#define SLOT_STATE_ENABLED	(2)</div><div class='add'>+#define SLOT_STATE_DISABLED	(3)</div><div class='add'>+#define PWR_LED_STATE_SHIFT	(2)</div><div class='add'>+#define PWR_LED_STATE_MASK	(3 &lt;&lt; 2)</div><div class='add'>+#define ATN_LED_STATE_SHIFT	(4)</div><div class='add'>+#define ATN_LED_STATE_MASK	(3 &lt;&lt; 4)</div><div class='add'>+#define ATN_LED_STATE_ON	(1)</div><div class='add'>+#define ATN_LED_STATE_BLINK	(2)</div><div class='add'>+#define ATN_LED_STATE_OFF	(3)</div><div class='add'>+#define POWER_FAULT		(1 &lt;&lt; 6)</div><div class='add'>+#define ATN_BUTTON		(1 &lt;&lt; 7)</div><div class='add'>+#define MRL_SENSOR		(1 &lt;&lt; 8)</div><div class='add'>+#define MHZ66_CAP		(1 &lt;&lt; 9)</div><div class='add'>+#define PRSNT_SHIFT		(10)</div><div class='add'>+#define PRSNT_MASK		(3 &lt;&lt; 10)</div><div class='add'>+#define PCIX_CAP_SHIFT		(12)</div><div class='add'>+#define PCIX_CAP_MASK_PI1	(3 &lt;&lt; 12)</div><div class='add'>+#define PCIX_CAP_MASK_PI2	(7 &lt;&lt; 12)</div><div class='add'>+#define PRSNT_CHANGE_DETECTED	(1 &lt;&lt; 16)</div><div class='add'>+#define ISO_PFAULT_DETECTED	(1 &lt;&lt; 17)</div><div class='add'>+#define BUTTON_PRESS_DETECTED	(1 &lt;&lt; 18)</div><div class='add'>+#define MRL_CHANGE_DETECTED	(1 &lt;&lt; 19)</div><div class='add'>+#define CON_PFAULT_DETECTED	(1 &lt;&lt; 20)</div><div class='add'>+#define PRSNT_CHANGE_INTR_MASK	(1 &lt;&lt; 24)</div><div class='add'>+#define ISO_PFAULT_INTR_MASK	(1 &lt;&lt; 25)</div><div class='add'>+#define BUTTON_PRESS_INTR_MASK	(1 &lt;&lt; 26)</div><div class='add'>+#define MRL_CHANGE_INTR_MASK	(1 &lt;&lt; 27)</div><div class='add'>+#define CON_PFAULT_INTR_MASK	(1 &lt;&lt; 28)</div><div class='add'>+#define MRL_CHANGE_SERR_MASK	(1 &lt;&lt; 29)</div><div class='add'>+#define CON_PFAULT_SERR_MASK	(1 &lt;&lt; 30)</div><div class='add'>+#define SLOT_REG_RSVDZ_MASK	(1 &lt;&lt; 15) | (7 &lt;&lt; 21)</div><div class='ctx'> </div><div class='del'>-/* Set bus speed/mode A - 0x40h to 0x47h */</div><div class='del'>-#define SETA_PCI_33MHZ		0x40</div><div class='add'>+/*</div><div class='add'>+ * SHPC Command Code definitnions</div><div class='add'>+ *</div><div class='add'>+ *     Slot Operation				00h - 3Fh</div><div class='add'>+ *     Set Bus Segment Speed/Mode A		40h - 47h</div><div class='add'>+ *     Power-Only All Slots			48h</div><div class='add'>+ *     Enable All Slots				49h</div><div class='add'>+ *     Set Bus Segment Speed/Mode B (PI=2)	50h - 5Fh</div><div class='add'>+ *     Reserved Command Codes			60h - BFh</div><div class='add'>+ *     Vendor Specific Commands			C0h - FFh</div><div class='add'>+ */</div><div class='add'>+#define SET_SLOT_PWR		0x01	/* Slot Operation */</div><div class='add'>+#define SET_SLOT_ENABLE		0x02</div><div class='add'>+#define SET_SLOT_DISABLE	0x03</div><div class='add'>+#define SET_PWR_ON		0x04</div><div class='add'>+#define SET_PWR_BLINK		0x08</div><div class='add'>+#define SET_PWR_OFF		0x0c</div><div class='add'>+#define SET_ATTN_ON		0x10</div><div class='add'>+#define SET_ATTN_BLINK		0x20</div><div class='add'>+#define SET_ATTN_OFF		0x30</div><div class='add'>+#define SETA_PCI_33MHZ		0x40	/* Set Bus Segment Speed/Mode A */</div><div class='ctx'> #define SETA_PCI_66MHZ		0x41</div><div class='ctx'> #define SETA_PCIX_66MHZ		0x42</div><div class='ctx'> #define SETA_PCIX_100MHZ	0x43</div><div class='ctx'> #define SETA_PCIX_133MHZ	0x44</div><div class='del'>-#define RESERV_1		0x45</div><div class='del'>-#define RESERV_2		0x46</div><div class='del'>-#define RESERV_3		0x47</div><div class='del'>-</div><div class='del'>-/* Set bus speed/mode B - 0x50h to 0x5fh */</div><div class='del'>-#define	SETB_PCI_33MHZ		0x50</div><div class='add'>+#define SETA_RESERVED1		0x45</div><div class='add'>+#define SETA_RESERVED2		0x46</div><div class='add'>+#define SETA_RESERVED3		0x47</div><div class='add'>+#define SET_PWR_ONLY_ALL	0x48	/* Power-Only All Slots */</div><div class='add'>+#define SET_ENABLE_ALL		0x49	/* Enable All Slots */</div><div class='add'>+#define	SETB_PCI_33MHZ		0x50	/* Set Bus Segment Speed/Mode B */</div><div class='ctx'> #define SETB_PCI_66MHZ		0x51</div><div class='ctx'> #define SETB_PCIX_66MHZ_PM	0x52</div><div class='ctx'> #define SETB_PCIX_100MHZ_PM	0x53</div><div class='hunk'>@@ -174,81 +191,115 @@</div><div class='ctx'> #define SETB_PCIX_66MHZ_533	0x5b</div><div class='ctx'> #define SETB_PCIX_100MHZ_533	0x5c</div><div class='ctx'> #define SETB_PCIX_133MHZ_533	0x5d</div><div class='add'>+#define SETB_RESERVED1		0x5e</div><div class='add'>+#define SETB_RESERVED2		0x5f</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Power-on all slots - 0x48h */</div><div class='del'>-#define SET_PWR_ON_ALL		0x48</div><div class='del'>-</div><div class='del'>-/* Enable all slots	- 0x49h */</div><div class='del'>-#define SET_ENABLE_ALL		0x49</div><div class='del'>-</div><div class='del'>-/*  SHPC controller command error code */</div><div class='add'>+/*</div><div class='add'>+ * SHPC controller command error code</div><div class='add'>+ */</div><div class='ctx'> #define SWITCH_OPEN		0x1</div><div class='ctx'> #define INVALID_CMD		0x2</div><div class='ctx'> #define INVALID_SPEED_MODE	0x4</div><div class='ctx'> </div><div class='del'>-/* For accessing SHPC Working Register Set */</div><div class='add'>+/*</div><div class='add'>+ * For accessing SHPC Working Register Set via PCI Configuration Space</div><div class='add'>+ */</div><div class='ctx'> #define DWORD_SELECT		0x2</div><div class='ctx'> #define DWORD_DATA		0x4</div><div class='del'>-#define BASE_OFFSET		0x0</div><div class='ctx'> </div><div class='ctx'> /* Field Offset in Logical Slot Register - byte boundary */</div><div class='ctx'> #define SLOT_EVENT_LATCH	0x2</div><div class='ctx'> #define SLOT_SERR_INT_MASK	0x3</div><div class='ctx'> </div><div class='del'>-static spinlock_t hpc_event_lock;</div><div class='del'>-</div><div class='ctx'> DEFINE_DBG_BUFFER		/* Debug string buffer for entire HPC defined here */</div><div class='ctx'> static struct php_ctlr_state_s *php_ctlr_list_head;	/* HPC state linked list */</div><div class='ctx'> static int ctlr_seq_num = 0;	/* Controller sequenc # */</div><div class='ctx'> static spinlock_t list_lock;</div><div class='ctx'> </div><div class='del'>-static irqreturn_t shpc_isr(int IRQ, void *dev_id, struct pt_regs *regs);</div><div class='add'>+static atomic_t shpchp_num_controllers = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='del'>-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int seconds);</div><div class='add'>+static irqreturn_t shpc_isr(int irq, void *dev_id, struct pt_regs *regs);</div><div class='add'>+static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec);</div><div class='ctx'> static int hpc_check_cmd_status(struct controller *ctrl);</div><div class='ctx'> </div><div class='del'>-/* This is the interrupt polling timeout function. */</div><div class='del'>-static void int_poll_timeout(unsigned long lphp_ctlr)</div><div class='add'>+static inline u8 shpc_readb(struct controller *ctrl, int reg)</div><div class='ctx'> {</div><div class='del'>-    struct php_ctlr_state_s *php_ctlr = (struct php_ctlr_state_s *)lphp_ctlr;</div><div class='add'>+	return readb(ctrl-&gt;hpc_ctlr_handle-&gt;creg + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    DBG_ENTER_ROUTINE</div><div class='add'>+static inline void shpc_writeb(struct controller *ctrl, int reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	writeb(val, ctrl-&gt;hpc_ctlr_handle-&gt;creg + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    if ( !php_ctlr ) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-    }</div><div class='add'>+static inline u16 shpc_readw(struct controller *ctrl, int reg)</div><div class='add'>+{</div><div class='add'>+	return readw(ctrl-&gt;hpc_ctlr_handle-&gt;creg + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    /* Poll for interrupt events.  regs == NULL =&gt; polling */</div><div class='del'>-    shpc_isr( 0, (void *)php_ctlr, NULL );</div><div class='add'>+static inline void shpc_writew(struct controller *ctrl, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	writew(val, ctrl-&gt;hpc_ctlr_handle-&gt;creg + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    init_timer(&amp;php_ctlr-&gt;int_poll_timer);</div><div class='del'>-	if (!shpchp_poll_time)</div><div class='del'>-		shpchp_poll_time = 2; /* reset timer to poll in 2 secs if user doesn't specify at module installation*/</div><div class='add'>+static inline u32 shpc_readl(struct controller *ctrl, int reg)</div><div class='add'>+{</div><div class='add'>+	return readl(ctrl-&gt;hpc_ctlr_handle-&gt;creg + reg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    start_int_poll_timer(php_ctlr, shpchp_poll_time);  </div><div class='del'>-	</div><div class='del'>-	return;</div><div class='add'>+static inline void shpc_writel(struct controller *ctrl, int reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, ctrl-&gt;hpc_ctlr_handle-&gt;creg + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This function starts the interrupt polling timer. */</div><div class='del'>-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int seconds)</div><div class='add'>+static inline int shpc_indirect_read(struct controller *ctrl, int index,</div><div class='add'>+				     u32 *value)</div><div class='ctx'> {</div><div class='del'>-    if (!php_ctlr) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	int rc;</div><div class='add'>+	u32 cap_offset = ctrl-&gt;cap_offset;</div><div class='add'>+	struct pci_dev *pdev = ctrl-&gt;pci_dev;</div><div class='add'>+</div><div class='add'>+	rc = pci_write_config_byte(pdev, cap_offset + DWORD_SELECT, index);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	return pci_read_config_dword(pdev, cap_offset + DWORD_DATA, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is the interrupt polling timeout function.</div><div class='add'>+ */</div><div class='add'>+static void int_poll_timeout(unsigned long lphp_ctlr)</div><div class='add'>+{</div><div class='add'>+	struct php_ctlr_state_s *php_ctlr =</div><div class='add'>+		(struct php_ctlr_state_s *)lphp_ctlr;</div><div class='add'>+</div><div class='add'>+	DBG_ENTER_ROUTINE</div><div class='add'>+</div><div class='add'>+	/* Poll for interrupt events.  regs == NULL =&gt; polling */</div><div class='add'>+	shpc_isr(0, php_ctlr-&gt;callback_instance_id, NULL);</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;php_ctlr-&gt;int_poll_timer);</div><div class='add'>+	if (!shpchp_poll_time)</div><div class='add'>+		shpchp_poll_time = 2; /* default polling interval is 2 sec */</div><div class='ctx'> </div><div class='del'>-    if ( ( seconds &lt;= 0 ) || ( seconds &gt; 60 ) )</div><div class='del'>-        seconds = 2;            /* Clamp to sane value */</div><div class='add'>+	start_int_poll_timer(php_ctlr, shpchp_poll_time);</div><div class='ctx'> </div><div class='del'>-    php_ctlr-&gt;int_poll_timer.function = &amp;int_poll_timeout;</div><div class='del'>-    php_ctlr-&gt;int_poll_timer.data = (unsigned long)php_ctlr;    /* Instance data */</div><div class='del'>-    php_ctlr-&gt;int_poll_timer.expires = jiffies + seconds * HZ;</div><div class='del'>-    add_timer(&amp;php_ctlr-&gt;int_poll_timer);</div><div class='add'>+	DBG_LEAVE_ROUTINE</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+/*</div><div class='add'>+ * This function starts the interrupt polling timer.</div><div class='add'>+ */</div><div class='add'>+static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec)</div><div class='add'>+{</div><div class='add'>+	/* Clamp to sane value */</div><div class='add'>+	if ((sec &lt;= 0) || (sec &gt; 60))</div><div class='add'>+		sec = 2;</div><div class='add'>+</div><div class='add'>+	php_ctlr-&gt;int_poll_timer.function = &amp;int_poll_timeout;</div><div class='add'>+	php_ctlr-&gt;int_poll_timer.data = (unsigned long)php_ctlr;</div><div class='add'>+	php_ctlr-&gt;int_poll_timer.expires = jiffies + sec * HZ;</div><div class='add'>+	add_timer(&amp;php_ctlr-&gt;int_poll_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int shpc_wait_cmd(struct controller *ctrl)</div><div class='hunk'>@@ -272,7 +323,7 @@ static inline int shpc_wait_cmd(struct controller *ctrl)</div><div class='ctx'> </div><div class='ctx'> static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u16 cmd_status;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	u16 temp_word;</div><div class='hunk'>@@ -282,14 +333,8 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;slot-&gt;ctrl-&gt;cmd_lock);</div><div class='ctx'> </div><div class='del'>-	if (!php_ctlr) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		cmd_status = readw(php_ctlr-&gt;creg + CMD_STATUS);</div><div class='add'>+		cmd_status = shpc_readw(ctrl, CMD_STATUS);</div><div class='ctx'> 		</div><div class='ctx'> 		if (!(cmd_status &amp; 0x1))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -297,7 +342,7 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)</div><div class='ctx'> 		msleep(100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd_status = readw(php_ctlr-&gt;creg + CMD_STATUS);</div><div class='add'>+	cmd_status = shpc_readw(ctrl, CMD_STATUS);</div><div class='ctx'> 	</div><div class='ctx'> 	if (cmd_status &amp; 0x1) { </div><div class='ctx'> 		/* After 1 sec and and the controller is still busy */</div><div class='hunk'>@@ -314,7 +359,7 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)</div><div class='ctx'> 	 * command. </div><div class='ctx'> 	 */</div><div class='ctx'> 	slot-&gt;ctrl-&gt;cmd_busy = 1;</div><div class='del'>-	writew(temp_word, php_ctlr-&gt;creg + CMD);</div><div class='add'>+	shpc_writew(ctrl, CMD, temp_word);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wait for command completion.</div><div class='hunk'>@@ -338,18 +383,12 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)</div><div class='ctx'> </div><div class='ctx'> static int hpc_check_cmd_status(struct controller *ctrl)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = ctrl-&gt;hpc_ctlr_handle;</div><div class='ctx'> 	u16 cmd_status;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='del'>-	</div><div class='del'>-	if (!ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cmd_status = readw(php_ctlr-&gt;creg + CMD_STATUS) &amp; 0x000F;</div><div class='add'>+	cmd_status = shpc_readw(ctrl, CMD_STATUS) &amp; 0x000F;</div><div class='ctx'> 	</div><div class='ctx'> 	switch (cmd_status &gt;&gt; 1) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -378,37 +417,27 @@ static int hpc_check_cmd_status(struct controller *ctrl)</div><div class='ctx'> </div><div class='ctx'> static int hpc_get_attention_status(struct slot *slot, u8 *status)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u32 slot_reg;</div><div class='del'>-	u16 slot_status;</div><div class='del'>-	u8 atten_led_state;</div><div class='add'>+	u8 state;</div><div class='ctx'> 	</div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*(slot-&gt;hp_slot));</div><div class='del'>-	slot_status = (u16) slot_reg;</div><div class='del'>-	atten_led_state = (slot_status &amp; 0x0030) &gt;&gt; 4;</div><div class='add'>+	slot_reg = shpc_readl(ctrl, SLOT_REG(slot-&gt;hp_slot));</div><div class='add'>+	state = (slot_reg &amp; ATN_LED_STATE_MASK) &gt;&gt; ATN_LED_STATE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	switch (atten_led_state) {</div><div class='del'>-	case 0:</div><div class='del'>-		*status = 0xFF;	/* Reserved */</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ATN_LED_STATE_ON:</div><div class='ctx'> 		*status = 1;	/* On */</div><div class='ctx'> 		break;</div><div class='del'>-	case 2:</div><div class='add'>+	case ATN_LED_STATE_BLINK:</div><div class='ctx'> 		*status = 2;	/* Blink */</div><div class='ctx'> 		break;</div><div class='del'>-	case 3:</div><div class='add'>+	case ATN_LED_STATE_OFF:</div><div class='ctx'> 		*status = 0;	/* Off */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		*status = 0xFF;</div><div class='add'>+		*status = 0xFF;	/* Reserved */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -418,64 +447,44 @@ static int hpc_get_attention_status(struct slot *slot, u8 *status)</div><div class='ctx'> </div><div class='ctx'> static int hpc_get_power_status(struct slot * slot, u8 *status)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u32 slot_reg;</div><div class='del'>-	u16 slot_status;</div><div class='del'>-	u8 slot_state;</div><div class='del'>-	int	retval = 0;</div><div class='add'>+	u8 state;</div><div class='ctx'> 	</div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*(slot-&gt;hp_slot));</div><div class='del'>-	slot_status = (u16) slot_reg;</div><div class='del'>-	slot_state = (slot_status &amp; 0x0003);</div><div class='add'>+	slot_reg = shpc_readl(ctrl, SLOT_REG(slot-&gt;hp_slot));</div><div class='add'>+	state = (slot_reg &amp; SLOT_STATE_MASK) &gt;&gt; SLOT_STATE_SHIFT;</div><div class='ctx'> </div><div class='del'>-	switch (slot_state) {</div><div class='del'>-	case 0:</div><div class='del'>-		*status = 0xFF;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='add'>+	switch (state) {</div><div class='add'>+	case SLOT_STATE_PWRONLY:</div><div class='ctx'> 		*status = 2;	/* Powered only */</div><div class='ctx'> 		break;</div><div class='del'>-	case 2:</div><div class='add'>+	case SLOT_STATE_ENABLED:</div><div class='ctx'> 		*status = 1;	/* Enabled */</div><div class='ctx'> 		break;</div><div class='del'>-	case 3:</div><div class='add'>+	case SLOT_STATE_DISABLED:</div><div class='ctx'> 		*status = 0;	/* Disabled */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		*status = 0xFF;</div><div class='add'>+		*status = 0xFF;	/* Reserved */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE </div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int hpc_get_latch_status(struct slot *slot, u8 *status)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u32 slot_reg;</div><div class='del'>-	u16 slot_status;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*(slot-&gt;hp_slot));</div><div class='del'>-	slot_status = (u16)slot_reg;</div><div class='del'>-</div><div class='del'>-	*status = ((slot_status &amp; 0x0100) == 0) ? 0 : 1;   /* 0 -&gt; close; 1 -&gt; open */</div><div class='del'>-</div><div class='add'>+	slot_reg = shpc_readl(ctrl, SLOT_REG(slot-&gt;hp_slot));</div><div class='add'>+	*status = !!(slot_reg &amp; MRL_SENSOR);	/* 0 -&gt; close; 1 -&gt; open */</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -483,22 +492,15 @@ static int hpc_get_latch_status(struct slot *slot, u8 *status)</div><div class='ctx'> </div><div class='ctx'> static int hpc_get_adapter_status(struct slot *slot, u8 *status)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u32 slot_reg;</div><div class='del'>-	u16 slot_status;</div><div class='del'>-	u8 card_state;</div><div class='add'>+	u8 state;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*(slot-&gt;hp_slot));</div><div class='del'>-	slot_status = (u16)slot_reg;</div><div class='del'>-	card_state = (u8)((slot_status &amp; 0x0C00) &gt;&gt; 10);</div><div class='del'>-	*status = (card_state != 0x3) ? 1 : 0;</div><div class='add'>+	slot_reg = shpc_readl(ctrl, SLOT_REG(slot-&gt;hp_slot));</div><div class='add'>+	state = (slot_reg &amp; PRSNT_MASK) &gt;&gt; PRSNT_SHIFT;</div><div class='add'>+	*status = (state != 0x3) ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -506,16 +508,11 @@ static int hpc_get_adapter_status(struct slot *slot, u8 *status)</div><div class='ctx'> </div><div class='ctx'> static int hpc_get_prog_int(struct slot *slot, u8 *prog_int)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='del'>-	</div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	*prog_int = readb(php_ctlr-&gt;creg + PROG_INTERFACE);</div><div class='add'>+	*prog_int = shpc_readb(ctrl, PROG_INTERFACE);</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -524,13 +521,27 @@ static int hpc_get_prog_int(struct slot *slot, u8 *prog_int)</div><div class='ctx'> static int hpc_get_adapter_speed(struct slot *slot, enum pci_bus_speed *value)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u32 slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4 * slot-&gt;hp_slot);</div><div class='del'>-	u8 pcix_cap = (slot_reg &gt;&gt; 12) &amp; 7;</div><div class='del'>-	u8 m66_cap  = (slot_reg &gt;&gt; 9) &amp; 1;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='add'>+	u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot-&gt;hp_slot));</div><div class='add'>+	u8 m66_cap  = !!(slot_reg &amp; MHZ66_CAP);</div><div class='add'>+	u8 pi, pcix_cap;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='add'>+	if ((retval = hpc_get_prog_int(slot, &amp;pi)))</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	switch (pi) {</div><div class='add'>+	case 1:</div><div class='add'>+		pcix_cap = (slot_reg &amp; PCIX_CAP_MASK_PI1) &gt;&gt; PCIX_CAP_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		pcix_cap = (slot_reg &amp; PCIX_CAP_MASK_PI2) &gt;&gt; PCIX_CAP_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dbg("%s: slot_reg = %x, pcix_cap = %x, m66_cap = %x\n",</div><div class='ctx'> 	    __FUNCTION__, slot_reg, pcix_cap, m66_cap);</div><div class='ctx'> </div><div class='hunk'>@@ -564,20 +575,15 @@ static int hpc_get_adapter_speed(struct slot *slot, enum pci_bus_speed *value)</div><div class='ctx'> </div><div class='ctx'> static int hpc_get_mode1_ECC_cap(struct slot *slot, u8 *mode)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u16 sec_bus_status;</div><div class='ctx'> 	u8 pi;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pi = readb(php_ctlr-&gt;creg + PROG_INTERFACE);</div><div class='del'>-	sec_bus_status = readw(php_ctlr-&gt;creg + SEC_BUS_CONFIG);</div><div class='add'>+	pi = shpc_readb(ctrl, PROG_INTERFACE);</div><div class='add'>+	sec_bus_status = shpc_readw(ctrl, SEC_BUS_CONFIG);</div><div class='ctx'> </div><div class='ctx'> 	if (pi == 2) {</div><div class='ctx'> 		*mode = (sec_bus_status &amp; 0x0100) &gt;&gt; 8;</div><div class='hunk'>@@ -593,128 +599,53 @@ static int hpc_get_mode1_ECC_cap(struct slot *slot, u8 *mode)</div><div class='ctx'> </div><div class='ctx'> static int hpc_query_power_fault(struct slot * slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u32 slot_reg;</div><div class='del'>-	u16 slot_status;</div><div class='del'>-	u8 pwr_fault_state, status;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*(slot-&gt;hp_slot));</div><div class='del'>-	slot_status = (u16) slot_reg;</div><div class='del'>-	pwr_fault_state = (slot_status &amp; 0x0040) &gt;&gt; 7;</div><div class='del'>-	status = (pwr_fault_state == 1) ? 0 : 1;</div><div class='add'>+	slot_reg = shpc_readl(ctrl, SLOT_REG(slot-&gt;hp_slot));</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE</div><div class='ctx'> 	/* Note: Logic 0 =&gt; fault */</div><div class='del'>-	return status;</div><div class='add'>+	return !(slot_reg &amp; POWER_FAULT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpc_set_attention_status(struct slot *slot, u8 value)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='ctx'> 	u8 slot_cmd = 0;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	switch (value) {</div><div class='ctx'> 		case 0 :	</div><div class='del'>-			slot_cmd = 0x30;	/* OFF */</div><div class='add'>+			slot_cmd = SET_ATTN_OFF;	/* OFF */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='del'>-			slot_cmd = 0x10;	/* ON */</div><div class='add'>+			slot_cmd = SET_ATTN_ON;		/* ON */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 2:</div><div class='del'>-			slot_cmd = 0x20;	/* BLINK */</div><div class='add'>+			slot_cmd = SET_ATTN_BLINK;	/* BLINK */</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-	</div><div class='del'>-	return rc;</div><div class='add'>+	return shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void hpc_set_green_led_on(struct slot *slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u8 slot_cmd;</div><div class='del'>-</div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_cmd = 0x04;</div><div class='del'>-</div><div class='del'>-	shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='add'>+	shpc_write_cmd(slot, slot-&gt;hp_slot, SET_PWR_ON);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hpc_set_green_led_off(struct slot *slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u8 slot_cmd;</div><div class='del'>-</div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_cmd = 0x0C;</div><div class='del'>-</div><div class='del'>-	shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='add'>+	shpc_write_cmd(slot, slot-&gt;hp_slot, SET_PWR_OFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hpc_set_green_led_blink(struct slot *slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u8 slot_cmd;</div><div class='del'>-</div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	slot_cmd = 0x08;</div><div class='del'>-</div><div class='del'>-	shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='add'>+	shpc_write_cmd(slot, slot-&gt;hp_slot, SET_PWR_BLINK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int shpc_get_ctlr_slot_config(struct controller *ctrl,</div><div class='hunk'>@@ -724,21 +655,17 @@ int shpc_get_ctlr_slot_config(struct controller *ctrl,</div><div class='ctx'> 	int *updown,		/* physical_slot_num increament: 1 or -1	*/</div><div class='ctx'> 	int *flags)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	u32 slot_config;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*first_device_num = php_ctlr-&gt;slot_device_offset;	/* Obtained in shpc_init() */</div><div class='del'>-	*num_ctlr_slots = php_ctlr-&gt;num_slots;			/* Obtained in shpc_init() */</div><div class='add'>+	slot_config = shpc_readl(ctrl, SLOT_CONFIG);</div><div class='add'>+	*first_device_num = (slot_config &amp; FIRST_DEV_NUM) &gt;&gt; 8;</div><div class='add'>+	*num_ctlr_slots = slot_config &amp; SLOT_NUM;</div><div class='add'>+	*physical_slot_num = (slot_config &amp; PSN) &gt;&gt; 16;</div><div class='add'>+	*updown = ((slot_config &amp; UPDOWN) &gt;&gt; 29) ? 1 : -1;</div><div class='ctx'> </div><div class='del'>-	*physical_slot_num = (readl(php_ctlr-&gt;creg + SLOT_CONFIG) &amp; PSN) &gt;&gt; 16;</div><div class='ctx'> 	dbg("%s: physical_slot_num = %x\n", __FUNCTION__, *physical_slot_num);</div><div class='del'>-	*updown = ((readl(php_ctlr-&gt;creg + SLOT_CONFIG) &amp; UPDOWN ) &gt;&gt; 29) ? 1 : -1;	</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -749,22 +676,34 @@ static void hpc_release_ctlr(struct controller *ctrl)</div><div class='ctx'> 	struct php_ctlr_state_s *php_ctlr = ctrl-&gt;hpc_ctlr_handle;</div><div class='ctx'> 	struct php_ctlr_state_s *p, *p_prev;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 slot_reg, serr_int;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Mask all slot event interrupts</div><div class='add'>+	 * Mask event interrupts and SERRs of all slots</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; ctrl-&gt;num_slots; i++)</div><div class='del'>-		writel(0xffff3fff, php_ctlr-&gt;creg + SLOT1 + (4 * i));</div><div class='add'>+	for (i = 0; i &lt; ctrl-&gt;num_slots; i++) {</div><div class='add'>+		slot_reg = shpc_readl(ctrl, SLOT_REG(i));</div><div class='add'>+		slot_reg |= (PRSNT_CHANGE_INTR_MASK | ISO_PFAULT_INTR_MASK |</div><div class='add'>+			     BUTTON_PRESS_INTR_MASK | MRL_CHANGE_INTR_MASK |</div><div class='add'>+			     CON_PFAULT_INTR_MASK   | MRL_CHANGE_SERR_MASK |</div><div class='add'>+			     CON_PFAULT_SERR_MASK);</div><div class='add'>+		slot_reg &amp;= ~SLOT_REG_RSVDZ_MASK;</div><div class='add'>+		shpc_writel(ctrl, SLOT_REG(i), slot_reg);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cleanup_slots(ctrl);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Mask SERR and System Interrut generation</div><div class='add'>+	 */</div><div class='add'>+	serr_int = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='add'>+	serr_int |= (GLOBAL_INTR_MASK  | GLOBAL_SERR_MASK |</div><div class='add'>+		     COMMAND_INTR_MASK | ARBITER_SERR_MASK);</div><div class='add'>+	serr_int &amp;= ~SERR_INTR_RSVDZ_MASK;</div><div class='add'>+	shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);</div><div class='add'>+</div><div class='ctx'> 	if (shpchp_poll_mode) {</div><div class='ctx'> 	    del_timer(&amp;php_ctlr-&gt;int_poll_timer);</div><div class='ctx'> 	} else {	</div><div class='hunk'>@@ -800,113 +739,79 @@ static void hpc_release_ctlr(struct controller *ctrl)</div><div class='ctx'> </div><div class='ctx'> 	kfree(php_ctlr);</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If this is the last controller to be released, destroy the</div><div class='add'>+	 * shpchpd work queue</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_dec_and_test(&amp;shpchp_num_controllers))</div><div class='add'>+		destroy_workqueue(shpchp_wq);</div><div class='add'>+</div><div class='ctx'> DBG_LEAVE_ROUTINE</div><div class='ctx'> 			  </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpc_power_on_slot(struct slot * slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u8 slot_cmd;</div><div class='del'>-	int retval = 0;</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	slot_cmd = 0x01;</div><div class='del'>-</div><div class='del'>-	retval = shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-</div><div class='add'>+	retval = shpc_write_cmd(slot, slot-&gt;hp_slot, SET_SLOT_PWR);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		err("%s: Write command failed!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='add'>+		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE</div><div class='ctx'> </div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpc_slot_enable(struct slot * slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u8 slot_cmd;</div><div class='del'>-	int retval = 0;</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	/* 3A =&gt; Slot - Enable, Power Indicator - Blink, Attention Indicator - Off */</div><div class='del'>-	slot_cmd = 0x3A;  </div><div class='del'>-</div><div class='del'>-	retval = shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-</div><div class='add'>+	/* Slot - Enable, Power Indicator - Blink, Attention Indicator - Off */</div><div class='add'>+	retval = shpc_write_cmd(slot, slot-&gt;hp_slot,</div><div class='add'>+			SET_SLOT_ENABLE | SET_PWR_BLINK | SET_ATTN_OFF);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		err("%s: Write command failed!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='add'>+		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE</div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpc_slot_disable(struct slot * slot)</div><div class='ctx'> {</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	u8 slot_cmd;</div><div class='del'>-	int retval = 0;</div><div class='add'>+	int retval;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	if (!slot-&gt;ctrl-&gt;hpc_ctlr_handle) {</div><div class='del'>-		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (slot-&gt;hp_slot &gt;= php_ctlr-&gt;num_slots) {</div><div class='del'>-		err("%s: Invalid HPC slot number!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 1F =&gt; Slot - Disable, Power Indicator - Off, Attention Indicator - On */</div><div class='del'>-	slot_cmd = 0x1F;</div><div class='del'>-</div><div class='del'>-	retval = shpc_write_cmd(slot, slot-&gt;hp_slot, slot_cmd);</div><div class='del'>-</div><div class='add'>+	/* Slot - Disable, Power Indicator - Off, Attention Indicator - On */</div><div class='add'>+	retval = shpc_write_cmd(slot, slot-&gt;hp_slot,</div><div class='add'>+			SET_SLOT_DISABLE | SET_PWR_OFF | SET_ATTN_ON);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		err("%s: Write command failed!\n", __FUNCTION__);</div><div class='del'>-		return -1;</div><div class='add'>+		return retval;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DBG_LEAVE_ROUTINE</div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hpc_set_bus_speed_mode(struct slot * slot, enum pci_bus_speed value)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	u8 pi, cmd;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='del'>-	pi = readb(php_ctlr-&gt;creg + PROG_INTERFACE);</div><div class='add'>+	pi = shpc_readb(ctrl, PROG_INTERFACE);</div><div class='ctx'> 	if ((pi == 1) &amp;&amp; (value &gt; PCI_SPEED_133MHz_PCIX))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -965,100 +870,86 @@ static int hpc_set_bus_speed_mode(struct slot * slot, enum pci_bus_speed value)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t shpc_isr(int IRQ, void *dev_id, struct pt_regs *regs)</div><div class='add'>+static irqreturn_t shpc_isr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct controller *ctrl = NULL;</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr;</div><div class='del'>-	u8 schedule_flag = 0;</div><div class='del'>-	u8 temp_byte;</div><div class='del'>-	u32 temp_dword, intr_loc, intr_loc2;</div><div class='add'>+	struct controller *ctrl = (struct controller *)dev_id;</div><div class='add'>+	struct php_ctlr_state_s *php_ctlr = ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	u32 serr_int, slot_reg, intr_loc, intr_loc2;</div><div class='ctx'> 	int hp_slot;</div><div class='ctx'> </div><div class='del'>-	if (!dev_id)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	if (!shpchp_poll_mode) { </div><div class='del'>-		ctrl = (struct controller *)dev_id;</div><div class='del'>-		php_ctlr = ctrl-&gt;hpc_ctlr_handle;</div><div class='del'>-	} else { </div><div class='del'>-		php_ctlr = (struct php_ctlr_state_s *) dev_id;</div><div class='del'>-		ctrl = (struct controller *)php_ctlr-&gt;callback_instance_id;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ctrl)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	</div><div class='del'>-	if (!php_ctlr || !php_ctlr-&gt;creg)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='ctx'> 	/* Check to see if it was our interrupt */</div><div class='del'>-	intr_loc = readl(php_ctlr-&gt;creg + INTR_LOC);  </div><div class='del'>-</div><div class='add'>+	intr_loc = shpc_readl(ctrl, INTR_LOC);</div><div class='ctx'> 	if (!intr_loc)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='add'>+</div><div class='ctx'> 	dbg("%s: intr_loc = %x\n",__FUNCTION__, intr_loc); </div><div class='ctx'> </div><div class='ctx'> 	if(!shpchp_poll_mode) {</div><div class='del'>-		/* Mask Global Interrupt Mask - see implementation note on p. 139 */</div><div class='del'>-		/* of SHPC spec rev 1.0*/</div><div class='del'>-		temp_dword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='del'>-		temp_dword |= 0x00000001;</div><div class='del'>-		writel(temp_dword, php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='add'>+		/*</div><div class='add'>+		 * Mask Global Interrupt Mask - see implementation</div><div class='add'>+		 * note on p. 139 of SHPC spec rev 1.0</div><div class='add'>+		 */</div><div class='add'>+		serr_int = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='add'>+		serr_int |= GLOBAL_INTR_MASK;</div><div class='add'>+		serr_int &amp;= ~SERR_INTR_RSVDZ_MASK;</div><div class='add'>+		shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);</div><div class='ctx'> </div><div class='del'>-		intr_loc2 = readl(php_ctlr-&gt;creg + INTR_LOC);  </div><div class='add'>+		intr_loc2 = shpc_readl(ctrl, INTR_LOC);</div><div class='ctx'> 		dbg("%s: intr_loc2 = %x\n",__FUNCTION__, intr_loc2); </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (intr_loc &amp; 0x0001) {</div><div class='add'>+	if (intr_loc &amp; CMD_INTR_PENDING) {</div><div class='ctx'> 		/* </div><div class='ctx'> 		 * Command Complete Interrupt Pending </div><div class='ctx'> 		 * RO only - clear by writing 1 to the Command Completion</div><div class='ctx'> 		 * Detect bit in Controller SERR-INT register</div><div class='ctx'> 		 */</div><div class='del'>-		temp_dword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='del'>-		temp_dword &amp;= 0xfffdffff;</div><div class='del'>-		writel(temp_dword, php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='add'>+		serr_int = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='add'>+		serr_int &amp;= ~SERR_INTR_RSVDZ_MASK;</div><div class='add'>+		shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);</div><div class='add'>+</div><div class='ctx'> 		ctrl-&gt;cmd_busy = 0;</div><div class='ctx'> 		wake_up_interruptible(&amp;ctrl-&gt;queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((intr_loc = (intr_loc &gt;&gt; 1)) == 0)</div><div class='add'>+	if (!(intr_loc &amp; ~CMD_INTR_PENDING))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	for (hp_slot = 0; hp_slot &lt; ctrl-&gt;num_slots; hp_slot++) { </div><div class='del'>-	/* To find out which slot has interrupt pending */</div><div class='del'>-		if ((intr_loc &gt;&gt; hp_slot) &amp; 0x01) {</div><div class='del'>-			temp_dword = readl(php_ctlr-&gt;creg + SLOT1 + (4*hp_slot));</div><div class='del'>-			dbg("%s: Slot %x with intr, slot register = %x\n",</div><div class='del'>-				__FUNCTION__, hp_slot, temp_dword);</div><div class='del'>-			temp_byte = (temp_dword &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-			if ((php_ctlr-&gt;switch_change_callback) &amp;&amp; (temp_byte &amp; 0x08))</div><div class='del'>-				schedule_flag += php_ctlr-&gt;switch_change_callback(</div><div class='del'>-					hp_slot, php_ctlr-&gt;callback_instance_id);</div><div class='del'>-			if ((php_ctlr-&gt;attention_button_callback) &amp;&amp; (temp_byte &amp; 0x04))</div><div class='del'>-				schedule_flag += php_ctlr-&gt;attention_button_callback(</div><div class='del'>-					hp_slot, php_ctlr-&gt;callback_instance_id);</div><div class='del'>-			if ((php_ctlr-&gt;presence_change_callback) &amp;&amp; (temp_byte &amp; 0x01))</div><div class='del'>-				schedule_flag += php_ctlr-&gt;presence_change_callback(</div><div class='del'>-					hp_slot , php_ctlr-&gt;callback_instance_id);</div><div class='del'>-			if ((php_ctlr-&gt;power_fault_callback) &amp;&amp; (temp_byte &amp; 0x12))</div><div class='del'>-				schedule_flag += php_ctlr-&gt;power_fault_callback(</div><div class='del'>-					hp_slot, php_ctlr-&gt;callback_instance_id);</div><div class='del'>-			</div><div class='del'>-			/* Clear all slot events */</div><div class='del'>-			temp_dword = 0xe01f3fff;</div><div class='del'>-			writel(temp_dword, php_ctlr-&gt;creg + SLOT1 + (4*hp_slot));</div><div class='del'>-</div><div class='del'>-			intr_loc2 = readl(php_ctlr-&gt;creg + INTR_LOC);  </div><div class='del'>-			dbg("%s: intr_loc2 = %x\n",__FUNCTION__, intr_loc2); </div><div class='del'>-		}</div><div class='add'>+		/* To find out which slot has interrupt pending */</div><div class='add'>+		if (!(intr_loc &amp; SLOT_INTR_PENDING(hp_slot)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));</div><div class='add'>+		dbg("%s: Slot %x with intr, slot register = %x\n",</div><div class='add'>+		    __FUNCTION__, hp_slot, slot_reg);</div><div class='add'>+</div><div class='add'>+		if (slot_reg &amp; MRL_CHANGE_DETECTED)</div><div class='add'>+			php_ctlr-&gt;switch_change_callback(</div><div class='add'>+				hp_slot, php_ctlr-&gt;callback_instance_id);</div><div class='add'>+</div><div class='add'>+		if (slot_reg &amp; BUTTON_PRESS_DETECTED)</div><div class='add'>+			php_ctlr-&gt;attention_button_callback(</div><div class='add'>+				hp_slot, php_ctlr-&gt;callback_instance_id);</div><div class='add'>+</div><div class='add'>+		if (slot_reg &amp; PRSNT_CHANGE_DETECTED)</div><div class='add'>+			php_ctlr-&gt;presence_change_callback(</div><div class='add'>+				hp_slot , php_ctlr-&gt;callback_instance_id);</div><div class='add'>+</div><div class='add'>+		if (slot_reg &amp; (ISO_PFAULT_DETECTED | CON_PFAULT_DETECTED))</div><div class='add'>+			php_ctlr-&gt;power_fault_callback(</div><div class='add'>+				hp_slot, php_ctlr-&gt;callback_instance_id);</div><div class='add'>+</div><div class='add'>+		/* Clear all slot events */</div><div class='add'>+		slot_reg &amp;= ~SLOT_REG_RSVDZ_MASK;</div><div class='add'>+		shpc_writel(ctrl, SLOT_REG(hp_slot), slot_reg);</div><div class='ctx'> 	}</div><div class='ctx'>  out:</div><div class='ctx'> 	if (!shpchp_poll_mode) {</div><div class='ctx'> 		/* Unmask Global Interrupt Mask */</div><div class='del'>-		temp_dword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='del'>-		temp_dword &amp;= 0xfffffffe;</div><div class='del'>-		writel(temp_dword, php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='add'>+		serr_int = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='add'>+		serr_int &amp;= ~(GLOBAL_INTR_MASK | SERR_INTR_RSVDZ_MASK);</div><div class='add'>+		shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -1067,11 +958,11 @@ static irqreturn_t shpc_isr(int IRQ, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static int hpc_get_max_bus_speed (struct slot *slot, enum pci_bus_speed *value)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	enum pci_bus_speed bus_speed = PCI_SPEED_UNKNOWN;</div><div class='del'>-	u8 pi = readb(php_ctlr-&gt;creg + PROG_INTERFACE);</div><div class='del'>-	u32 slot_avail1 = readl(php_ctlr-&gt;creg + SLOT_AVAIL1);</div><div class='del'>-	u32 slot_avail2 = readl(php_ctlr-&gt;creg + SLOT_AVAIL2);</div><div class='add'>+	u8 pi = shpc_readb(ctrl, PROG_INTERFACE);</div><div class='add'>+	u32 slot_avail1 = shpc_readl(ctrl, SLOT_AVAIL1);</div><div class='add'>+	u32 slot_avail2 = shpc_readl(ctrl, SLOT_AVAIL2);</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='ctx'> </div><div class='hunk'>@@ -1114,10 +1005,10 @@ static int hpc_get_max_bus_speed (struct slot *slot, enum pci_bus_speed *value)</div><div class='ctx'> static int hpc_get_cur_bus_speed (struct slot *slot, enum pci_bus_speed *value)</div><div class='ctx'> {</div><div class='ctx'> 	int retval = 0;</div><div class='del'>-	struct php_ctlr_state_s *php_ctlr = slot-&gt;ctrl-&gt;hpc_ctlr_handle;</div><div class='add'>+	struct controller *ctrl = slot-&gt;ctrl;</div><div class='ctx'> 	enum pci_bus_speed bus_speed = PCI_SPEED_UNKNOWN;</div><div class='del'>-	u16 sec_bus_reg = readw(php_ctlr-&gt;creg + SEC_BUS_CONFIG);</div><div class='del'>-	u8 pi = readb(php_ctlr-&gt;creg + PROG_INTERFACE);</div><div class='add'>+	u16 sec_bus_reg = shpc_readw(ctrl, SEC_BUS_CONFIG);</div><div class='add'>+	u8 pi = shpc_readb(ctrl, PROG_INTERFACE);</div><div class='ctx'> 	u8 speed_mode = (pi == 2) ? (sec_bus_reg &amp; 0xF) : (sec_bus_reg &amp; 0x7);</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE </div><div class='hunk'>@@ -1206,28 +1097,14 @@ static struct hpc_ops shpchp_hpc_ops = {</div><div class='ctx'> 	.release_ctlr			= hpc_release_ctlr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-inline static int shpc_indirect_creg_read(struct controller *ctrl, int index,</div><div class='del'>-					  u32 *value)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	u32 cap_offset = ctrl-&gt;cap_offset;</div><div class='del'>-	struct pci_dev *pdev = ctrl-&gt;pci_dev;</div><div class='del'>-</div><div class='del'>-	rc = pci_write_config_byte(pdev, cap_offset + DWORD_SELECT, index);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	return pci_read_config_dword(pdev, cap_offset + DWORD_DATA, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct php_ctlr_state_s *php_ctlr, *p;</div><div class='ctx'> 	void *instance_id = ctrl;</div><div class='ctx'> 	int rc, num_slots = 0;</div><div class='ctx'> 	u8 hp_slot;</div><div class='del'>-	static int first = 1;</div><div class='ctx'> 	u32 shpc_base_offset;</div><div class='del'>-	u32 tempdword, slot_reg;</div><div class='add'>+	u32 tempdword, slot_reg, slot_config;</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='ctx'> 	DBG_ENTER_ROUTINE</div><div class='hunk'>@@ -1257,13 +1134,13 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 		dbg("%s: cap_offset = %x\n", __FUNCTION__, ctrl-&gt;cap_offset);</div><div class='ctx'> </div><div class='del'>-		rc = shpc_indirect_creg_read(ctrl, 0, &amp;shpc_base_offset);</div><div class='add'>+		rc = shpc_indirect_read(ctrl, 0, &amp;shpc_base_offset);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			err("%s: cannot read base_offset\n", __FUNCTION__);</div><div class='ctx'> 			goto abort_free_ctlr;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = shpc_indirect_creg_read(ctrl, 3, &amp;tempdword);</div><div class='add'>+		rc = shpc_indirect_read(ctrl, 3, &amp;tempdword);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			err("%s: cannot read slot config\n", __FUNCTION__);</div><div class='ctx'> 			goto abort_free_ctlr;</div><div class='hunk'>@@ -1272,7 +1149,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> 		dbg("%s: num_slots (indirect) %x\n", __FUNCTION__, num_slots);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 9 + num_slots; i++) {</div><div class='del'>-			rc = shpc_indirect_creg_read(ctrl, i, &amp;tempdword);</div><div class='add'>+			rc = shpc_indirect_read(ctrl, i, &amp;tempdword);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				err("%s: cannot read creg (index = %d)\n",</div><div class='ctx'> 				    __FUNCTION__, i);</div><div class='hunk'>@@ -1287,11 +1164,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> 		ctrl-&gt;mmio_size = 0x24 + 0x4 * num_slots;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (first) {</div><div class='del'>-		spin_lock_init(&amp;hpc_event_lock);</div><div class='del'>-		first = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev-&gt;vendor, pdev-&gt;device, pdev-&gt;subsystem_vendor, </div><div class='ctx'> 		pdev-&gt;subsystem_device);</div><div class='ctx'> 	</div><div class='hunk'>@@ -1326,29 +1198,39 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> 	php_ctlr-&gt;power_fault_callback = shpchp_handle_power_fault;</div><div class='ctx'> 	php_ctlr-&gt;callback_instance_id = instance_id;</div><div class='ctx'> </div><div class='add'>+	ctrl-&gt;hpc_ctlr_handle = php_ctlr;</div><div class='add'>+	ctrl-&gt;hpc_ops = &amp;shpchp_hpc_ops;</div><div class='add'>+</div><div class='ctx'> 	/* Return PCI Controller Info */</div><div class='del'>-	php_ctlr-&gt;slot_device_offset = (readl(php_ctlr-&gt;creg + SLOT_CONFIG) &amp; FIRST_DEV_NUM ) &gt;&gt; 8;</div><div class='del'>-	php_ctlr-&gt;num_slots = readl(php_ctlr-&gt;creg + SLOT_CONFIG) &amp; SLOT_NUM;</div><div class='add'>+	slot_config = shpc_readl(ctrl, SLOT_CONFIG);</div><div class='add'>+	php_ctlr-&gt;slot_device_offset = (slot_config &amp; FIRST_DEV_NUM) &gt;&gt; 8;</div><div class='add'>+	php_ctlr-&gt;num_slots = slot_config &amp; SLOT_NUM;</div><div class='ctx'> 	dbg("%s: slot_device_offset %x\n", __FUNCTION__, php_ctlr-&gt;slot_device_offset);</div><div class='ctx'> 	dbg("%s: num_slots %x\n", __FUNCTION__, php_ctlr-&gt;num_slots);</div><div class='ctx'> </div><div class='ctx'> 	/* Mask Global Interrupt Mask &amp; Command Complete Interrupt Mask */</div><div class='del'>-	tempdword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='add'>+	tempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='ctx'> 	dbg("%s: SERR_INTR_ENABLE = %x\n", __FUNCTION__, tempdword);</div><div class='del'>-	tempdword = 0x0003000f;   </div><div class='del'>-	writel(tempdword, php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='del'>-	tempdword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='add'>+	tempdword |= (GLOBAL_INTR_MASK  | GLOBAL_SERR_MASK |</div><div class='add'>+		      COMMAND_INTR_MASK | ARBITER_SERR_MASK);</div><div class='add'>+	tempdword &amp;= ~SERR_INTR_RSVDZ_MASK;</div><div class='add'>+	shpc_writel(ctrl, SERR_INTR_ENABLE, tempdword);</div><div class='add'>+	tempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='ctx'> 	dbg("%s: SERR_INTR_ENABLE = %x\n", __FUNCTION__, tempdword);</div><div class='ctx'> </div><div class='ctx'> 	/* Mask the MRL sensor SERR Mask of individual slot in</div><div class='ctx'> 	 * Slot SERR-INT Mask &amp; clear all the existing event if any</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (hp_slot = 0; hp_slot &lt; php_ctlr-&gt;num_slots; hp_slot++) {</div><div class='del'>-		slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*hp_slot );</div><div class='add'>+		slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));</div><div class='ctx'> 		dbg("%s: Default Logical Slot Register %d value %x\n", __FUNCTION__,</div><div class='ctx'> 			hp_slot, slot_reg);</div><div class='del'>-		tempdword = 0xffff3fff;  </div><div class='del'>-		writel(tempdword, php_ctlr-&gt;creg + SLOT1 + (4*hp_slot));</div><div class='add'>+		slot_reg |= (PRSNT_CHANGE_INTR_MASK | ISO_PFAULT_INTR_MASK |</div><div class='add'>+			     BUTTON_PRESS_INTR_MASK | MRL_CHANGE_INTR_MASK |</div><div class='add'>+			     CON_PFAULT_INTR_MASK   | MRL_CHANGE_SERR_MASK |</div><div class='add'>+			     CON_PFAULT_SERR_MASK);</div><div class='add'>+		slot_reg &amp;= ~SLOT_REG_RSVDZ_MASK;</div><div class='add'>+		shpc_writel(ctrl, SLOT_REG(hp_slot), slot_reg);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (shpchp_poll_mode)  {/* Install interrupt polling code */</div><div class='hunk'>@@ -1364,7 +1246,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> 		} else</div><div class='ctx'> 			php_ctlr-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> 		</div><div class='del'>-		rc = request_irq(php_ctlr-&gt;irq, shpc_isr, SA_SHIRQ, MY_NAME, (void *) ctrl);</div><div class='add'>+		rc = request_irq(php_ctlr-&gt;irq, shpc_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);</div><div class='ctx'> 		dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr-&gt;irq, ctlr_seq_num, rc);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			err("Can't get irq %d for the hotplug controller\n", php_ctlr-&gt;irq);</div><div class='hunk'>@@ -1392,24 +1274,37 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;list_lock);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	ctlr_seq_num++;</div><div class='del'>-	ctrl-&gt;hpc_ctlr_handle = php_ctlr;</div><div class='del'>-	ctrl-&gt;hpc_ops = &amp;shpchp_hpc_ops;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If this is the first controller to be initialized,</div><div class='add'>+	 * initialize the shpchpd work queue</div><div class='add'>+	 */</div><div class='add'>+	if (atomic_add_return(1, &amp;shpchp_num_controllers) == 1) {</div><div class='add'>+		shpchp_wq = create_singlethread_workqueue("shpchpd");</div><div class='add'>+		if (!shpchp_wq)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unmask all event interrupts of all slots</div><div class='add'>+	 */</div><div class='ctx'> 	for (hp_slot = 0; hp_slot &lt; php_ctlr-&gt;num_slots; hp_slot++) {</div><div class='del'>-		slot_reg = readl(php_ctlr-&gt;creg + SLOT1 + 4*hp_slot );</div><div class='add'>+		slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));</div><div class='ctx'> 		dbg("%s: Default Logical Slot Register %d value %x\n", __FUNCTION__,</div><div class='ctx'> 			hp_slot, slot_reg);</div><div class='del'>-		tempdword = 0xe01f3fff;  </div><div class='del'>-		writel(tempdword, php_ctlr-&gt;creg + SLOT1 + (4*hp_slot));</div><div class='add'>+		slot_reg &amp;= ~(PRSNT_CHANGE_INTR_MASK | ISO_PFAULT_INTR_MASK |</div><div class='add'>+			      BUTTON_PRESS_INTR_MASK | MRL_CHANGE_INTR_MASK |</div><div class='add'>+			      CON_PFAULT_INTR_MASK | SLOT_REG_RSVDZ_MASK);</div><div class='add'>+		shpc_writel(ctrl, SLOT_REG(hp_slot), slot_reg);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!shpchp_poll_mode) {</div><div class='ctx'> 		/* Unmask all general input interrupts and SERR */</div><div class='del'>-		tempdword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='del'>-		tempdword = 0x0000000a;</div><div class='del'>-		writel(tempdword, php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='del'>-		tempdword = readl(php_ctlr-&gt;creg + SERR_INTR_ENABLE);</div><div class='add'>+		tempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='add'>+		tempdword &amp;= ~(GLOBAL_INTR_MASK | COMMAND_INTR_MASK |</div><div class='add'>+			       SERR_INTR_RSVDZ_MASK);</div><div class='add'>+		shpc_writel(ctrl, SERR_INTR_ENABLE, tempdword);</div><div class='add'>+		tempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);</div><div class='ctx'> 		dbg("%s: SERR_INTR_ENABLE = %x\n", __FUNCTION__, tempdword);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c<br/>index 257adc233996..0a6b25ef194c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/shpchp_pci.c</a></div><div class='hunk'>@@ -47,21 +47,28 @@ static void program_fw_provided_values(struct pci_dev *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* use default values if we can't get them from firmware */</div><div class='del'>-	if (get_hp_params_from_firmware(dev, &amp;hpp)) {</div><div class='del'>-		hpp.cache_line_size = 8;</div><div class='del'>-		hpp.latency_timer = 0x40;</div><div class='del'>-		hpp.enable_serr = 0;</div><div class='del'>-		hpp.enable_perr = 0;</div><div class='add'>+	if (get_hp_params_from_firmware(dev, &amp;hpp) ||</div><div class='add'>+	    !hpp.t0 || (hpp.t0-&gt;revision &gt; 1)) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "%s: Could not get hotplug parameters. Use defaults\n",</div><div class='add'>+		       __FUNCTION__);</div><div class='add'>+		hpp.t0 = &amp;hpp.type0_data;</div><div class='add'>+		hpp.t0-&gt;revision = 0;</div><div class='add'>+		hpp.t0-&gt;cache_line_size = 8;</div><div class='add'>+		hpp.t0-&gt;latency_timer = 0x40;</div><div class='add'>+		hpp.t0-&gt;enable_serr = 0;</div><div class='add'>+		hpp.t0-&gt;enable_perr = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, hpp.cache_line_size);</div><div class='del'>-	pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp.latency_timer);</div><div class='add'>+	pci_write_config_byte(dev,</div><div class='add'>+			      PCI_CACHE_LINE_SIZE, hpp.t0-&gt;cache_line_size);</div><div class='add'>+	pci_write_config_byte(dev, PCI_LATENCY_TIMER, hpp.t0-&gt;latency_timer);</div><div class='ctx'> 	pci_read_config_word(dev, PCI_COMMAND, &amp;pci_cmd);</div><div class='del'>-	if (hpp.enable_serr)</div><div class='add'>+	if (hpp.t0-&gt;enable_serr)</div><div class='ctx'> 		pci_cmd |= PCI_COMMAND_SERR;</div><div class='ctx'> 	else</div><div class='ctx'> 		pci_cmd &amp;= ~PCI_COMMAND_SERR;</div><div class='del'>-	if (hpp.enable_perr)</div><div class='add'>+	if (hpp.t0-&gt;enable_perr)</div><div class='ctx'> 		pci_cmd |= PCI_COMMAND_PARITY;</div><div class='ctx'> 	else</div><div class='ctx'> 		pci_cmd &amp;= ~PCI_COMMAND_PARITY;</div><div class='hunk'>@@ -70,13 +77,13 @@ static void program_fw_provided_values(struct pci_dev *dev)</div><div class='ctx'> 	/* Program bridge control value and child devices */</div><div class='ctx'> 	if ((dev-&gt;class &gt;&gt; 8) == PCI_CLASS_BRIDGE_PCI) {</div><div class='ctx'> 		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,</div><div class='del'>-				hpp.latency_timer);</div><div class='add'>+				hpp.t0-&gt;latency_timer);</div><div class='ctx'> 		pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &amp;pci_bctl);</div><div class='del'>-		if (hpp.enable_serr)</div><div class='add'>+		if (hpp.t0-&gt;enable_serr)</div><div class='ctx'> 			pci_bctl |= PCI_BRIDGE_CTL_SERR;</div><div class='ctx'> 		else</div><div class='ctx'> 			pci_bctl &amp;= ~PCI_BRIDGE_CTL_SERR;</div><div class='del'>-		if (hpp.enable_perr)</div><div class='add'>+		if (hpp.t0-&gt;enable_perr)</div><div class='ctx'> 			pci_bctl |= PCI_BRIDGE_CTL_PARITY;</div><div class='ctx'> 		else</div><div class='ctx'> 			pci_bctl &amp;= ~PCI_BRIDGE_CTL_PARITY;</div><div class='head'>diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c<br/>index f5cfbf2c047c..620e1139e607 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/hotplug/shpchp_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/hotplug/shpchp_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/hotplug/shpchp_sysfs.c</a></div><div class='hunk'>@@ -51,8 +51,10 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha</div><div class='ctx'> 		res = bus-&gt;resource[index];</div><div class='ctx'> 		if (res &amp;&amp; (res-&gt;flags &amp; IORESOURCE_MEM) &amp;&amp;</div><div class='ctx'> 				!(res-&gt;flags &amp; IORESOURCE_PREFETCH)) {</div><div class='del'>-			out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",</div><div class='del'>-					res-&gt;start, (res-&gt;end - res-&gt;start));</div><div class='add'>+			out += sprintf(out, "start = %8.8llx, "</div><div class='add'>+					"length = %8.8llx\n",</div><div class='add'>+					(unsigned long long)res-&gt;start,</div><div class='add'>+					(unsigned long long)(res-&gt;end - res-&gt;start));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	out += sprintf(out, "Free resources: prefetchable memory\n");</div><div class='hunk'>@@ -60,16 +62,20 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha</div><div class='ctx'> 		res = bus-&gt;resource[index];</div><div class='ctx'> 		if (res &amp;&amp; (res-&gt;flags &amp; IORESOURCE_MEM) &amp;&amp;</div><div class='ctx'> 			       (res-&gt;flags &amp; IORESOURCE_PREFETCH)) {</div><div class='del'>-			out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",</div><div class='del'>-					res-&gt;start, (res-&gt;end - res-&gt;start));</div><div class='add'>+			out += sprintf(out, "start = %8.8llx, "</div><div class='add'>+					"length = %8.8llx\n",</div><div class='add'>+					(unsigned long long)res-&gt;start,</div><div class='add'>+					(unsigned long long)(res-&gt;end - res-&gt;start));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	out += sprintf(out, "Free resources: IO\n");</div><div class='ctx'> 	for (index = 0; index &lt; PCI_BUS_NUM_RESOURCES; index++) {</div><div class='ctx'> 		res = bus-&gt;resource[index];</div><div class='ctx'> 		if (res &amp;&amp; (res-&gt;flags &amp; IORESOURCE_IO)) {</div><div class='del'>-			out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",</div><div class='del'>-					res-&gt;start, (res-&gt;end - res-&gt;start));</div><div class='add'>+			out += sprintf(out, "start = %8.8llx, "</div><div class='add'>+					"length = %8.8llx\n",</div><div class='add'>+					(unsigned long long)res-&gt;start,</div><div class='add'>+					(unsigned long long)(res-&gt;end - res-&gt;start));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	out += sprintf(out, "Free resources: bus numbers\n");</div><div class='head'>diff --git a/drivers/pci/msi-altix.c b/drivers/pci/msi-altix.c<br/>new file mode 100644<br/>index 000000000000..bed4183a5e39<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/msi-altix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/msi-altix.c</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file "COPYING" in the main directory of this archive</div><div class='add'>+ * for more details.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Silicon Graphics, Inc.  All Rights Reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/cpumask.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/sn/addrs.h&gt;</div><div class='add'>+#include &lt;asm/sn/intr.h&gt;</div><div class='add'>+#include &lt;asm/sn/pcibus_provider_defs.h&gt;</div><div class='add'>+#include &lt;asm/sn/pcidev.h&gt;</div><div class='add'>+#include &lt;asm/sn/nodepda.h&gt;</div><div class='add'>+</div><div class='add'>+#include "msi.h"</div><div class='add'>+</div><div class='add'>+struct sn_msi_info {</div><div class='add'>+	u64 pci_addr;</div><div class='add'>+	struct sn_irq_info *sn_irq_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sn_msi_info *sn_msi_info;</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sn_msi_teardown(unsigned int vector)</div><div class='add'>+{</div><div class='add'>+	nasid_t nasid;</div><div class='add'>+	int widget;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct pcidev_info *sn_pdev;</div><div class='add'>+	struct sn_irq_info *sn_irq_info;</div><div class='add'>+	struct pcibus_bussoft *bussoft;</div><div class='add'>+	struct sn_pcibus_provider *provider;</div><div class='add'>+</div><div class='add'>+	sn_irq_info = sn_msi_info[vector].sn_irq_info;</div><div class='add'>+	if (sn_irq_info == NULL || sn_irq_info-&gt;irq_int_bit &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sn_pdev = (struct pcidev_info *)sn_irq_info-&gt;irq_pciioinfo;</div><div class='add'>+	pdev = sn_pdev-&gt;pdi_linux_pcidev;</div><div class='add'>+	provider = SN_PCIDEV_BUSPROVIDER(pdev);</div><div class='add'>+</div><div class='add'>+	(*provider-&gt;dma_unmap)(pdev,</div><div class='add'>+			       sn_msi_info[vector].pci_addr,</div><div class='add'>+			       PCI_DMA_FROMDEVICE);</div><div class='add'>+	sn_msi_info[vector].pci_addr = 0;</div><div class='add'>+</div><div class='add'>+	bussoft = SN_PCIDEV_BUSSOFT(pdev);</div><div class='add'>+	nasid = NASID_GET(bussoft-&gt;bs_base);</div><div class='add'>+	widget = (nasid &amp; 1) ?</div><div class='add'>+			TIO_SWIN_WIDGETNUM(bussoft-&gt;bs_base) :</div><div class='add'>+			SWIN_WIDGETNUM(bussoft-&gt;bs_base);</div><div class='add'>+</div><div class='add'>+	sn_intr_free(nasid, widget, sn_irq_info);</div><div class='add'>+	sn_msi_info[vector].sn_irq_info = NULL;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+sn_msi_setup(struct pci_dev *pdev, unsigned int vector,</div><div class='add'>+	     u32 *addr_hi, u32 *addr_lo, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int widget;</div><div class='add'>+	int status;</div><div class='add'>+	nasid_t nasid;</div><div class='add'>+	u64 bus_addr;</div><div class='add'>+	struct sn_irq_info *sn_irq_info;</div><div class='add'>+	struct pcibus_bussoft *bussoft = SN_PCIDEV_BUSSOFT(pdev);</div><div class='add'>+	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);</div><div class='add'>+</div><div class='add'>+	if (bussoft == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (provider == NULL || provider-&gt;dma_map_consistent == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the vector plumbing.  Let the prom (via sn_intr_alloc)</div><div class='add'>+	 * decide which cpu to direct this msi at by default.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	nasid = NASID_GET(bussoft-&gt;bs_base);</div><div class='add'>+	widget = (nasid &amp; 1) ?</div><div class='add'>+			TIO_SWIN_WIDGETNUM(bussoft-&gt;bs_base) :</div><div class='add'>+			SWIN_WIDGETNUM(bussoft-&gt;bs_base);</div><div class='add'>+</div><div class='add'>+	sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);</div><div class='add'>+	if (! sn_irq_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	status = sn_intr_alloc(nasid, widget, sn_irq_info, vector, -1, -1);</div><div class='add'>+	if (status) {</div><div class='add'>+		kfree(sn_irq_info);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sn_irq_info-&gt;irq_int_bit = -1;		/* mark this as an MSI irq */</div><div class='add'>+	sn_irq_fixup(pdev, sn_irq_info);</div><div class='add'>+</div><div class='add'>+	/* Prom probably should fill these in, but doesn't ... */</div><div class='add'>+	sn_irq_info-&gt;irq_bridge_type = bussoft-&gt;bs_asic_type;</div><div class='add'>+	sn_irq_info-&gt;irq_bridge = (void *)bussoft-&gt;bs_base;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Map the xio address into bus space</div><div class='add'>+	 */</div><div class='add'>+	bus_addr = (*provider-&gt;dma_map_consistent)(pdev,</div><div class='add'>+					sn_irq_info-&gt;irq_xtalkaddr,</div><div class='add'>+					sizeof(sn_irq_info-&gt;irq_xtalkaddr),</div><div class='add'>+					SN_DMA_MSI|SN_DMA_ADDR_XIO);</div><div class='add'>+	if (! bus_addr) {</div><div class='add'>+		sn_intr_free(nasid, widget, sn_irq_info);</div><div class='add'>+		kfree(sn_irq_info);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sn_msi_info[vector].sn_irq_info = sn_irq_info;</div><div class='add'>+	sn_msi_info[vector].pci_addr = bus_addr;</div><div class='add'>+</div><div class='add'>+	*addr_hi = (u32)(bus_addr &gt;&gt; 32);</div><div class='add'>+	*addr_lo = (u32)(bus_addr &amp; 0x00000000ffffffff);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In the SN platform, bit 16 is a "send vector" bit which</div><div class='add'>+	 * must be present in order to move the vector through the system.</div><div class='add'>+	 */</div><div class='add'>+	*data = 0x100 + (unsigned int)vector;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	set_irq_affinity_info((vector &amp; 0xff), sn_irq_info-&gt;irq_cpuid, 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sn_msi_target(unsigned int vector, unsigned int cpu,</div><div class='add'>+	      u32 *addr_hi, u32 *addr_lo)</div><div class='add'>+{</div><div class='add'>+	int slice;</div><div class='add'>+	nasid_t nasid;</div><div class='add'>+	u64 bus_addr;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct pcidev_info *sn_pdev;</div><div class='add'>+	struct sn_irq_info *sn_irq_info;</div><div class='add'>+	struct sn_irq_info *new_irq_info;</div><div class='add'>+	struct sn_pcibus_provider *provider;</div><div class='add'>+</div><div class='add'>+	sn_irq_info = sn_msi_info[vector].sn_irq_info;</div><div class='add'>+	if (sn_irq_info == NULL || sn_irq_info-&gt;irq_int_bit &gt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Release XIO resources for the old MSI PCI address</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+        sn_pdev = (struct pcidev_info *)sn_irq_info-&gt;irq_pciioinfo;</div><div class='add'>+	pdev = sn_pdev-&gt;pdi_linux_pcidev;</div><div class='add'>+	provider = SN_PCIDEV_BUSPROVIDER(pdev);</div><div class='add'>+</div><div class='add'>+	bus_addr = (u64)(*addr_hi) &lt;&lt; 32 | (u64)(*addr_lo);</div><div class='add'>+	(*provider-&gt;dma_unmap)(pdev, bus_addr, PCI_DMA_FROMDEVICE);</div><div class='add'>+	sn_msi_info[vector].pci_addr = 0;</div><div class='add'>+</div><div class='add'>+	nasid = cpuid_to_nasid(cpu);</div><div class='add'>+	slice = cpuid_to_slice(cpu);</div><div class='add'>+</div><div class='add'>+	new_irq_info = sn_retarget_vector(sn_irq_info, nasid, slice);</div><div class='add'>+	sn_msi_info[vector].sn_irq_info = new_irq_info;</div><div class='add'>+	if (new_irq_info == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Map the xio address into bus space</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	bus_addr = (*provider-&gt;dma_map_consistent)(pdev,</div><div class='add'>+					new_irq_info-&gt;irq_xtalkaddr,</div><div class='add'>+					sizeof(new_irq_info-&gt;irq_xtalkaddr),</div><div class='add'>+					SN_DMA_MSI|SN_DMA_ADDR_XIO);</div><div class='add'>+</div><div class='add'>+	sn_msi_info[vector].pci_addr = bus_addr;</div><div class='add'>+	*addr_hi = (u32)(bus_addr &gt;&gt; 32);</div><div class='add'>+	*addr_lo = (u32)(bus_addr &amp; 0x00000000ffffffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct msi_ops sn_msi_ops = {</div><div class='add'>+	.setup = sn_msi_setup,</div><div class='add'>+	.teardown = sn_msi_teardown,</div><div class='add'>+#ifdef CONFIG_SMP</div><div class='add'>+	.target = sn_msi_target,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+sn_msi_init(void)</div><div class='add'>+{</div><div class='add'>+	sn_msi_info =</div><div class='add'>+		kzalloc(sizeof(struct sn_msi_info) * NR_VECTORS, GFP_KERNEL);</div><div class='add'>+	if (! sn_msi_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	msi_register(&amp;sn_msi_ops);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/pci/msi-apic.c b/drivers/pci/msi-apic.c<br/>new file mode 100644<br/>index 000000000000..5ed798b319c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/msi-apic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/msi-apic.c</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/*</div><div class='add'>+ * MSI hooks for standard x86 apic</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;asm/smp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "msi.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shifts for APIC-based data</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_VECTOR_SHIFT		0</div><div class='add'>+#define	    MSI_DATA_VECTOR(v)		(((u8)v) &lt;&lt; MSI_DATA_VECTOR_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_DELIVERY_SHIFT		8</div><div class='add'>+#define     MSI_DATA_DELIVERY_FIXED	(0 &lt;&lt; MSI_DATA_DELIVERY_SHIFT)</div><div class='add'>+#define     MSI_DATA_DELIVERY_LOWPRI	(1 &lt;&lt; MSI_DATA_DELIVERY_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_LEVEL_SHIFT		14</div><div class='add'>+#define     MSI_DATA_LEVEL_DEASSERT	(0 &lt;&lt; MSI_DATA_LEVEL_SHIFT)</div><div class='add'>+#define     MSI_DATA_LEVEL_ASSERT	(1 &lt;&lt; MSI_DATA_LEVEL_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_DATA_TRIGGER_SHIFT		15</div><div class='add'>+#define     MSI_DATA_TRIGGER_EDGE	(0 &lt;&lt; MSI_DATA_TRIGGER_SHIFT)</div><div class='add'>+#define     MSI_DATA_TRIGGER_LEVEL	(1 &lt;&lt; MSI_DATA_TRIGGER_SHIFT)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Shift/mask fields for APIC-based bus address</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_HEADER			0xfee00000</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_DESTID_MASK		0xfff0000f</div><div class='add'>+#define     MSI_ADDR_DESTID_CPU(cpu)	((cpu) &lt;&lt; MSI_TARGET_CPU_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_DESTMODE_SHIFT		2</div><div class='add'>+#define     MSI_ADDR_DESTMODE_PHYS	(0 &lt;&lt; MSI_ADDR_DESTMODE_SHIFT)</div><div class='add'>+#define	    MSI_ADDR_DESTMODE_LOGIC	(1 &lt;&lt; MSI_ADDR_DESTMODE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define MSI_ADDR_REDIRECTION_SHIFT	3</div><div class='add'>+#define     MSI_ADDR_REDIRECTION_CPU	(0 &lt;&lt; MSI_ADDR_REDIRECTION_SHIFT)</div><div class='add'>+#define     MSI_ADDR_REDIRECTION_LOWPRI	(1 &lt;&lt; MSI_ADDR_REDIRECTION_SHIFT)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+msi_target_apic(unsigned int vector,</div><div class='add'>+		unsigned int dest_cpu,</div><div class='add'>+		u32 *address_hi,	/* in/out */</div><div class='add'>+		u32 *address_lo)	/* in/out */</div><div class='add'>+{</div><div class='add'>+	u32 addr = *address_lo;</div><div class='add'>+</div><div class='add'>+	addr &amp;= MSI_ADDR_DESTID_MASK;</div><div class='add'>+	addr |= MSI_ADDR_DESTID_CPU(cpu_physical_id(dest_cpu));</div><div class='add'>+</div><div class='add'>+	*address_lo = addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+msi_setup_apic(struct pci_dev *pdev,	/* unused in generic */</div><div class='add'>+		unsigned int vector,</div><div class='add'>+		u32 *address_hi,</div><div class='add'>+		u32 *address_lo,</div><div class='add'>+		u32 *data)</div><div class='add'>+{</div><div class='add'>+	unsigned long	dest_phys_id;</div><div class='add'>+</div><div class='add'>+	dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map));</div><div class='add'>+</div><div class='add'>+	*address_hi = 0;</div><div class='add'>+	*address_lo =	MSI_ADDR_HEADER |</div><div class='add'>+			MSI_ADDR_DESTMODE_PHYS |</div><div class='add'>+			MSI_ADDR_REDIRECTION_CPU |</div><div class='add'>+			MSI_ADDR_DESTID_CPU(dest_phys_id);</div><div class='add'>+</div><div class='add'>+	*data = MSI_DATA_TRIGGER_EDGE |</div><div class='add'>+		MSI_DATA_LEVEL_ASSERT |</div><div class='add'>+		MSI_DATA_DELIVERY_FIXED |</div><div class='add'>+		MSI_DATA_VECTOR(vector);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+msi_teardown_apic(unsigned int vector)</div><div class='add'>+{</div><div class='add'>+	return;		/* no-op */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generic ops used on most IA archs/platforms.  Set with msi_register()</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct msi_ops msi_apic_ops = {</div><div class='add'>+	.setup = msi_setup_apic,</div><div class='add'>+	.teardown = msi_teardown_apic,</div><div class='add'>+	.target = msi_target_apic,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c<br/>index 9855c4c920b8..a83c1f5735d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/msi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/msi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/msi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/msi.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -23,8 +22,6 @@</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> #include "msi.h"</div><div class='ctx'> </div><div class='del'>-#define MSI_TARGET_CPU		first_cpu(cpu_online_map)</div><div class='del'>-</div><div class='ctx'> static DEFINE_SPINLOCK(msi_lock);</div><div class='ctx'> static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };</div><div class='ctx'> static kmem_cache_t* msi_cachep;</div><div class='hunk'>@@ -37,18 +34,26 @@ static int nr_msix_devices;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_X86_IO_APIC</div><div class='ctx'> int vector_irq[NR_VECTORS] = { [0 ... NR_VECTORS - 1] = -1};</div><div class='del'>-u8 irq_vector[NR_IRQ_VECTORS] = { FIRST_DEVICE_VECTOR , 0 };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static struct msi_ops *msi_ops;</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+msi_register(struct msi_ops *ops)</div><div class='add'>+{</div><div class='add'>+	msi_ops = ops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void msi_cache_ctor(void *p, kmem_cache_t *cache, unsigned long flags)</div><div class='ctx'> {</div><div class='del'>-	memset(p, 0, NR_IRQS * sizeof(struct msi_desc));</div><div class='add'>+	memset(p, 0, sizeof(struct msi_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int msi_cache_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	msi_cachep = kmem_cache_create("msi_cache",</div><div class='del'>-			NR_IRQS * sizeof(struct msi_desc),</div><div class='add'>+			sizeof(struct msi_desc),</div><div class='ctx'> 		       	0, SLAB_HWCACHE_ALIGN, msi_cache_ctor, NULL);</div><div class='ctx'> 	if (!msi_cachep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -92,7 +97,7 @@ static void msi_set_mask_bit(unsigned int vector, int flag)</div><div class='ctx'> static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)</div><div class='ctx'> {</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='del'>-	struct msg_address address;</div><div class='add'>+	u32 address_hi, address_lo;</div><div class='ctx'> 	unsigned int irq = vector;</div><div class='ctx'> 	unsigned int dest_cpu = first_cpu(cpu_mask);</div><div class='ctx'> </div><div class='hunk'>@@ -108,28 +113,36 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)</div><div class='ctx'> 		if (!pos)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='add'>+		pci_read_config_dword(entry-&gt;dev, msi_upper_address_reg(pos),</div><div class='add'>+			&amp;address_hi);</div><div class='ctx'> 		pci_read_config_dword(entry-&gt;dev, msi_lower_address_reg(pos),</div><div class='del'>-			&amp;address.lo_address.value);</div><div class='del'>-		address.lo_address.value &amp;= MSI_ADDRESS_DEST_ID_MASK;</div><div class='del'>-		address.lo_address.value |= (cpu_physical_id(dest_cpu) &lt;&lt;</div><div class='del'>-									MSI_TARGET_CPU_SHIFT);</div><div class='del'>-		entry-&gt;msi_attrib.current_cpu = cpu_physical_id(dest_cpu);</div><div class='add'>+			&amp;address_lo);</div><div class='add'>+</div><div class='add'>+		msi_ops-&gt;target(vector, dest_cpu, &amp;address_hi, &amp;address_lo);</div><div class='add'>+</div><div class='add'>+		pci_write_config_dword(entry-&gt;dev, msi_upper_address_reg(pos),</div><div class='add'>+			address_hi);</div><div class='ctx'> 		pci_write_config_dword(entry-&gt;dev, msi_lower_address_reg(pos),</div><div class='del'>-			address.lo_address.value);</div><div class='add'>+			address_lo);</div><div class='ctx'> 		set_native_irq_info(irq, cpu_mask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case PCI_CAP_ID_MSIX:</div><div class='ctx'> 	{</div><div class='del'>-		int offset = entry-&gt;msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +</div><div class='del'>-			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;</div><div class='del'>-</div><div class='del'>-		address.lo_address.value = readl(entry-&gt;mask_base + offset);</div><div class='del'>-		address.lo_address.value &amp;= MSI_ADDRESS_DEST_ID_MASK;</div><div class='del'>-		address.lo_address.value |= (cpu_physical_id(dest_cpu) &lt;&lt;</div><div class='del'>-									MSI_TARGET_CPU_SHIFT);</div><div class='del'>-		entry-&gt;msi_attrib.current_cpu = cpu_physical_id(dest_cpu);</div><div class='del'>-		writel(address.lo_address.value, entry-&gt;mask_base + offset);</div><div class='add'>+		int offset_hi =</div><div class='add'>+			entry-&gt;msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +</div><div class='add'>+				PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET;</div><div class='add'>+		int offset_lo =</div><div class='add'>+			entry-&gt;msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +</div><div class='add'>+				PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;</div><div class='add'>+</div><div class='add'>+		address_hi = readl(entry-&gt;mask_base + offset_hi);</div><div class='add'>+		address_lo = readl(entry-&gt;mask_base + offset_lo);</div><div class='add'>+</div><div class='add'>+		msi_ops-&gt;target(vector, dest_cpu, &amp;address_hi, &amp;address_lo);</div><div class='add'>+</div><div class='add'>+		writel(address_hi, entry-&gt;mask_base + offset_hi);</div><div class='add'>+		writel(address_lo, entry-&gt;mask_base + offset_lo);</div><div class='ctx'> 		set_native_irq_info(irq, cpu_mask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -251,30 +264,6 @@ static struct hw_interrupt_type msi_irq_wo_maskbit_type = {</div><div class='ctx'> 	.set_affinity	= set_msi_affinity</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void msi_data_init(struct msg_data *msi_data,</div><div class='del'>-			  unsigned int vector)</div><div class='del'>-{</div><div class='del'>-	memset(msi_data, 0, sizeof(struct msg_data));</div><div class='del'>-	msi_data-&gt;vector = (u8)vector;</div><div class='del'>-	msi_data-&gt;delivery_mode = MSI_DELIVERY_MODE;</div><div class='del'>-	msi_data-&gt;level = MSI_LEVEL_MODE;</div><div class='del'>-	msi_data-&gt;trigger = MSI_TRIGGER_MODE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void msi_address_init(struct msg_address *msi_address)</div><div class='del'>-{</div><div class='del'>-	unsigned int	dest_id;</div><div class='del'>-	unsigned long	dest_phys_id = cpu_physical_id(MSI_TARGET_CPU);</div><div class='del'>-</div><div class='del'>-	memset(msi_address, 0, sizeof(struct msg_address));</div><div class='del'>-	msi_address-&gt;hi_address = (u32)0;</div><div class='del'>-	dest_id = (MSI_ADDRESS_HEADER &lt;&lt; MSI_ADDRESS_HEADER_SHIFT);</div><div class='del'>-	msi_address-&gt;lo_address.u.dest_mode = MSI_PHYSICAL_MODE;</div><div class='del'>-	msi_address-&gt;lo_address.u.redirection_hint = MSI_REDIRECTION_HINT_MODE;</div><div class='del'>-	msi_address-&gt;lo_address.u.dest_id = dest_id;</div><div class='del'>-	msi_address-&gt;lo_address.value |= (dest_phys_id &lt;&lt; MSI_TARGET_CPU_SHIFT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int msi_free_vector(struct pci_dev* dev, int vector, int reassign);</div><div class='ctx'> static int assign_msi_vector(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -369,13 +358,29 @@ static int msi_init(void)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	status = msi_arch_init();</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		pci_msi_enable = 0;</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "PCI: MSI arch init failed.  MSI disabled.\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (! msi_ops) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "PCI: MSI ops not registered. MSI disabled.\n");</div><div class='add'>+		status = -EINVAL;</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_alloc_vector = assign_irq_vector(AUTO_ASSIGN);</div><div class='ctx'> 	status = msi_cache_init();</div><div class='ctx'> 	if (status &lt; 0) {</div><div class='ctx'> 		pci_msi_enable = 0;</div><div class='ctx'> 		printk(KERN_WARNING "PCI: MSI cache init failed\n");</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='del'>-	last_alloc_vector = assign_irq_vector(AUTO_ASSIGN);</div><div class='add'>+</div><div class='ctx'> 	if (last_alloc_vector &lt; 0) {</div><div class='ctx'> 		pci_msi_enable = 0;</div><div class='ctx'> 		printk(KERN_WARNING "PCI: No interrupt vectors available for MSI\n");</div><div class='hunk'>@@ -423,12 +428,12 @@ static void irq_handler_init(int cap_id, int pos, int mask)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;irq_desc[pos].lock, flags);</div><div class='ctx'> 	if (cap_id == PCI_CAP_ID_MSIX)</div><div class='del'>-		irq_desc[pos].handler = &amp;msix_irq_type;</div><div class='add'>+		irq_desc[pos].chip = &amp;msix_irq_type;</div><div class='ctx'> 	else {</div><div class='ctx'> 		if (!mask)</div><div class='del'>-			irq_desc[pos].handler = &amp;msi_irq_wo_maskbit_type;</div><div class='add'>+			irq_desc[pos].chip = &amp;msi_irq_wo_maskbit_type;</div><div class='ctx'> 		else</div><div class='del'>-			irq_desc[pos].handler = &amp;msi_irq_w_maskbit_type;</div><div class='add'>+			irq_desc[pos].chip = &amp;msi_irq_w_maskbit_type;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;irq_desc[pos].lock, flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -442,9 +447,11 @@ static void enable_msi_mode(struct pci_dev *dev, int pos, int type)</div><div class='ctx'> 		/* Set enabled bits to single MSI &amp; enable MSI_enable bit */</div><div class='ctx'> 		msi_enable(control, 1);</div><div class='ctx'> 		pci_write_config_word(dev, msi_control_reg(pos), control);</div><div class='add'>+		dev-&gt;msi_enabled = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		msix_enable(control);</div><div class='ctx'> 		pci_write_config_word(dev, msi_control_reg(pos), control);</div><div class='add'>+		dev-&gt;msix_enabled = 1;</div><div class='ctx'> 	}</div><div class='ctx'>     	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {</div><div class='ctx'> 		/* PCI Express Endpoint device detected */</div><div class='hunk'>@@ -461,9 +468,11 @@ void disable_msi_mode(struct pci_dev *dev, int pos, int type)</div><div class='ctx'> 		/* Set enabled bits to single MSI &amp; enable MSI_enable bit */</div><div class='ctx'> 		msi_disable(control);</div><div class='ctx'> 		pci_write_config_word(dev, msi_control_reg(pos), control);</div><div class='add'>+		dev-&gt;msi_enabled = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		msix_disable(control);</div><div class='ctx'> 		pci_write_config_word(dev, msi_control_reg(pos), control);</div><div class='add'>+		dev-&gt;msix_enabled = 0;</div><div class='ctx'> 	}</div><div class='ctx'>     	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {</div><div class='ctx'> 		/* PCI Express Endpoint device detected */</div><div class='hunk'>@@ -538,7 +547,6 @@ int pci_save_msi_state(struct pci_dev *dev)</div><div class='ctx'> 		pci_read_config_dword(dev, pos + PCI_MSI_DATA_32, &amp;cap[i++]);</div><div class='ctx'> 	if (control &amp; PCI_MSI_FLAGS_MASKBIT)</div><div class='ctx'> 		pci_read_config_dword(dev, pos + PCI_MSI_MASK_BIT, &amp;cap[i++]);</div><div class='del'>-	disable_msi_mode(dev, pos, PCI_CAP_ID_MSI);</div><div class='ctx'> 	save_state-&gt;cap_nr = PCI_CAP_ID_MSI;</div><div class='ctx'> 	pci_add_saved_cap(dev, save_state);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -575,6 +583,8 @@ void pci_restore_msi_state(struct pci_dev *dev)</div><div class='ctx'> int pci_save_msix_state(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int pos;</div><div class='add'>+	int temp;</div><div class='add'>+	int vector, head, tail = 0;</div><div class='ctx'> 	u16 control;</div><div class='ctx'> 	struct pci_cap_saved_state *save_state;</div><div class='ctx'> </div><div class='hunk'>@@ -582,6 +592,7 @@ int pci_save_msix_state(struct pci_dev *dev)</div><div class='ctx'> 	if (pos &lt;= 0 || dev-&gt;no_msi)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	/* save the capability */</div><div class='ctx'> 	pci_read_config_word(dev, msi_control_reg(pos), &amp;control);</div><div class='ctx'> 	if (!(control &amp; PCI_MSIX_FLAGS_ENABLE))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -593,7 +604,38 @@ int pci_save_msix_state(struct pci_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	*((u16 *)&amp;save_state-&gt;data[0]) = control;</div><div class='ctx'> </div><div class='del'>-	disable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);</div><div class='add'>+	/* save the table */</div><div class='add'>+	temp = dev-&gt;irq;</div><div class='add'>+	if (msi_lookup_vector(dev, PCI_CAP_ID_MSIX)) {</div><div class='add'>+		kfree(save_state);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vector = head = dev-&gt;irq;</div><div class='add'>+	while (head != tail) {</div><div class='add'>+		int j;</div><div class='add'>+		void __iomem *base;</div><div class='add'>+		struct msi_desc *entry;</div><div class='add'>+</div><div class='add'>+		entry = msi_desc[vector];</div><div class='add'>+		base = entry-&gt;mask_base;</div><div class='add'>+		j = entry-&gt;msi_attrib.entry_nr;</div><div class='add'>+</div><div class='add'>+		entry-&gt;address_lo_save =</div><div class='add'>+			readl(base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='add'>+			      PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);</div><div class='add'>+		entry-&gt;address_hi_save =</div><div class='add'>+			readl(base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='add'>+			      PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);</div><div class='add'>+		entry-&gt;data_save =</div><div class='add'>+			readl(base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='add'>+			      PCI_MSIX_ENTRY_DATA_OFFSET);</div><div class='add'>+</div><div class='add'>+		tail = msi_desc[vector]-&gt;link.tail;</div><div class='add'>+		vector = tail;</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;irq = temp;</div><div class='add'>+</div><div class='ctx'> 	save_state-&gt;cap_nr = PCI_CAP_ID_MSIX;</div><div class='ctx'> 	pci_add_saved_cap(dev, save_state);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -606,8 +648,6 @@ void pci_restore_msix_state(struct pci_dev *dev)</div><div class='ctx'> 	int vector, head, tail = 0;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	int j;</div><div class='del'>-	struct msg_address address;</div><div class='del'>-	struct msg_data data;</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='ctx'> 	int temp;</div><div class='ctx'> 	struct pci_cap_saved_state *save_state;</div><div class='hunk'>@@ -633,20 +673,13 @@ void pci_restore_msix_state(struct pci_dev *dev)</div><div class='ctx'> 		base = entry-&gt;mask_base;</div><div class='ctx'> 		j = entry-&gt;msi_attrib.entry_nr;</div><div class='ctx'> </div><div class='del'>-		msi_address_init(&amp;address);</div><div class='del'>-		msi_data_init(&amp;data, vector);</div><div class='del'>-</div><div class='del'>-		address.lo_address.value &amp;= MSI_ADDRESS_DEST_ID_MASK;</div><div class='del'>-		address.lo_address.value |= entry-&gt;msi_attrib.current_cpu &lt;&lt;</div><div class='del'>-					MSI_TARGET_CPU_SHIFT;</div><div class='del'>-</div><div class='del'>-		writel(address.lo_address.value,</div><div class='add'>+		writel(entry-&gt;address_lo_save,</div><div class='ctx'> 			base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);</div><div class='del'>-		writel(address.hi_address,</div><div class='add'>+		writel(entry-&gt;address_hi_save,</div><div class='ctx'> 			base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 			PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);</div><div class='del'>-		writel(*(u32*)&amp;data,</div><div class='add'>+		writel(entry-&gt;data_save,</div><div class='ctx'> 			base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 			PCI_MSIX_ENTRY_DATA_OFFSET);</div><div class='ctx'> </div><div class='hunk'>@@ -660,30 +693,32 @@ void pci_restore_msix_state(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void msi_register_init(struct pci_dev *dev, struct msi_desc *entry)</div><div class='add'>+static int msi_register_init(struct pci_dev *dev, struct msi_desc *entry)</div><div class='ctx'> {</div><div class='del'>-	struct msg_address address;</div><div class='del'>-	struct msg_data data;</div><div class='add'>+	int status;</div><div class='add'>+	u32 address_hi;</div><div class='add'>+	u32 address_lo;</div><div class='add'>+	u32 data;</div><div class='ctx'> 	int pos, vector = dev-&gt;irq;</div><div class='ctx'> 	u16 control;</div><div class='ctx'> </div><div class='ctx'>    	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);</div><div class='ctx'> 	pci_read_config_word(dev, msi_control_reg(pos), &amp;control);</div><div class='add'>+</div><div class='ctx'> 	/* Configure MSI capability structure */</div><div class='del'>-	msi_address_init(&amp;address);</div><div class='del'>-	msi_data_init(&amp;data, vector);</div><div class='del'>-	entry-&gt;msi_attrib.current_cpu = ((address.lo_address.u.dest_id &gt;&gt;</div><div class='del'>-				MSI_TARGET_CPU_SHIFT) &amp; MSI_TARGET_CPU_MASK);</div><div class='del'>-	pci_write_config_dword(dev, msi_lower_address_reg(pos),</div><div class='del'>-			address.lo_address.value);</div><div class='add'>+	status = msi_ops-&gt;setup(dev, vector, &amp;address_hi, &amp;address_lo, &amp;data);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	pci_write_config_dword(dev, msi_lower_address_reg(pos), address_lo);</div><div class='ctx'> 	if (is_64bit_address(control)) {</div><div class='ctx'> 		pci_write_config_dword(dev,</div><div class='del'>-			msi_upper_address_reg(pos), address.hi_address);</div><div class='add'>+			msi_upper_address_reg(pos), address_hi);</div><div class='ctx'> 		pci_write_config_word(dev,</div><div class='del'>-			msi_data_reg(pos, 1), *((u32*)&amp;data));</div><div class='add'>+			msi_data_reg(pos, 1), data);</div><div class='ctx'> 	} else</div><div class='ctx'> 		pci_write_config_word(dev,</div><div class='del'>-			msi_data_reg(pos, 0), *((u32*)&amp;data));</div><div class='add'>+			msi_data_reg(pos, 0), data);</div><div class='ctx'> 	if (entry-&gt;msi_attrib.maskbit) {</div><div class='ctx'> 		unsigned int maskbits, temp;</div><div class='ctx'> 		/* All MSIs are unmasked by default, Mask them all */</div><div class='hunk'>@@ -697,6 +732,8 @@ static void msi_register_init(struct pci_dev *dev, struct msi_desc *entry)</div><div class='ctx'> 			msi_mask_bits_reg(pos, is_64bit_address(control)),</div><div class='ctx'> 			maskbits);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -710,6 +747,7 @@ static void msi_register_init(struct pci_dev *dev, struct msi_desc *entry)</div><div class='ctx'>  **/</div><div class='ctx'> static int msi_capability_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='add'>+	int status;</div><div class='ctx'> 	struct msi_desc *entry;</div><div class='ctx'> 	int pos, vector;</div><div class='ctx'> 	u16 control;</div><div class='hunk'>@@ -742,7 +780,12 @@ static int msi_capability_init(struct pci_dev *dev)</div><div class='ctx'> 	/* Replace with MSI handler */</div><div class='ctx'> 	irq_handler_init(PCI_CAP_ID_MSI, vector, entry-&gt;msi_attrib.maskbit);</div><div class='ctx'> 	/* Configure MSI capability structure */</div><div class='del'>-	msi_register_init(dev, entry);</div><div class='add'>+	status = msi_register_init(dev, entry);</div><div class='add'>+	if (status != 0) {</div><div class='add'>+		dev-&gt;irq = entry-&gt;msi_attrib.default_vector;</div><div class='add'>+		kmem_cache_free(msi_cachep, entry);</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	attach_msi_entry(entry, vector);</div><div class='ctx'> 	/* Set MSI enabled bits	 */</div><div class='hunk'>@@ -765,8 +808,10 @@ static int msix_capability_init(struct pci_dev *dev,</div><div class='ctx'> 				struct msix_entry *entries, int nvec)</div><div class='ctx'> {</div><div class='ctx'> 	struct msi_desc *head = NULL, *tail = NULL, *entry = NULL;</div><div class='del'>-	struct msg_address address;</div><div class='del'>-	struct msg_data data;</div><div class='add'>+	u32 address_hi;</div><div class='add'>+	u32 address_lo;</div><div class='add'>+	u32 data;</div><div class='add'>+	int status;</div><div class='ctx'> 	int vector, pos, i, j, nr_entries, temp = 0;</div><div class='ctx'> 	unsigned long phys_addr;</div><div class='ctx'> 	u32 table_offset;</div><div class='hunk'>@@ -822,18 +867,20 @@ static int msix_capability_init(struct pci_dev *dev,</div><div class='ctx'> 		/* Replace with MSI-X handler */</div><div class='ctx'> 		irq_handler_init(PCI_CAP_ID_MSIX, vector, 1);</div><div class='ctx'> 		/* Configure MSI-X capability structure */</div><div class='del'>-		msi_address_init(&amp;address);</div><div class='del'>-		msi_data_init(&amp;data, vector);</div><div class='del'>-		entry-&gt;msi_attrib.current_cpu =</div><div class='del'>-			((address.lo_address.u.dest_id &gt;&gt;</div><div class='del'>-			MSI_TARGET_CPU_SHIFT) &amp; MSI_TARGET_CPU_MASK);</div><div class='del'>-		writel(address.lo_address.value,</div><div class='add'>+		status = msi_ops-&gt;setup(dev, vector,</div><div class='add'>+					&amp;address_hi,</div><div class='add'>+					&amp;address_lo,</div><div class='add'>+					&amp;data);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		writel(address_lo,</div><div class='ctx'> 			base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);</div><div class='del'>-		writel(address.hi_address,</div><div class='add'>+		writel(address_hi,</div><div class='ctx'> 			base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 			PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);</div><div class='del'>-		writel(*(u32*)&amp;data,</div><div class='add'>+		writel(data,</div><div class='ctx'> 			base + j * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 			PCI_MSIX_ENTRY_DATA_OFFSET);</div><div class='ctx'> 		attach_msi_entry(entry, vector);</div><div class='hunk'>@@ -865,6 +912,7 @@ static int msix_capability_init(struct pci_dev *dev,</div><div class='ctx'>  **/</div><div class='ctx'> int pci_enable_msi(struct pci_dev* dev)</div><div class='ctx'> {</div><div class='add'>+	struct pci_bus *bus;</div><div class='ctx'> 	int pos, temp, status = -EINVAL;</div><div class='ctx'> 	u16 control;</div><div class='ctx'> </div><div class='hunk'>@@ -874,8 +922,9 @@ int pci_enable_msi(struct pci_dev* dev)</div><div class='ctx'> 	if (dev-&gt;no_msi)</div><div class='ctx'> 		return status;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;bus-&gt;bus_flags &amp; PCI_BUS_FLAGS_NO_MSI)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	for (bus = dev-&gt;bus; bus; bus = bus-&gt;parent)</div><div class='add'>+		if (bus-&gt;bus_flags &amp; PCI_BUS_FLAGS_NO_MSI)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	temp = dev-&gt;irq;</div><div class='ctx'> </div><div class='hunk'>@@ -887,23 +936,23 @@ int pci_enable_msi(struct pci_dev* dev)</div><div class='ctx'> 	if (!pos)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(dev, msi_control_reg(pos), &amp;control);</div><div class='del'>-	if (control &amp; PCI_MSI_FLAGS_ENABLE)</div><div class='del'>-		return 0;			/* Already in MSI mode */</div><div class='del'>-</div><div class='ctx'> 	if (!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) {</div><div class='ctx'> 		/* Lookup Sucess */</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='add'>+		pci_read_config_word(dev, msi_control_reg(pos), &amp;control);</div><div class='add'>+		if (control &amp; PCI_MSI_FLAGS_ENABLE)</div><div class='add'>+			return 0;	/* Already in MSI mode */</div><div class='ctx'> 		spin_lock_irqsave(&amp;msi_lock, flags);</div><div class='ctx'> 		if (!vector_irq[dev-&gt;irq]) {</div><div class='ctx'> 			msi_desc[dev-&gt;irq]-&gt;msi_attrib.state = 0;</div><div class='ctx'> 			vector_irq[dev-&gt;irq] = -1;</div><div class='ctx'> 			nr_released_vectors--;</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;msi_lock, flags);</div><div class='del'>-			msi_register_init(dev, msi_desc[dev-&gt;irq]);</div><div class='del'>-			enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);</div><div class='del'>-			return 0;</div><div class='add'>+			status = msi_register_init(dev, msi_desc[dev-&gt;irq]);</div><div class='add'>+			if (status == 0)</div><div class='add'>+				enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);</div><div class='add'>+			return status;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;msi_lock, flags);</div><div class='ctx'> 		dev-&gt;irq = temp;</div><div class='hunk'>@@ -980,6 +1029,8 @@ static int msi_free_vector(struct pci_dev* dev, int vector, int reassign)</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	msi_ops-&gt;teardown(vector);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;msi_lock, flags);</div><div class='ctx'> 	entry = msi_desc[vector];</div><div class='ctx'> 	if (!entry || entry-&gt;dev != dev) {</div><div class='hunk'>@@ -1008,33 +1059,8 @@ static int msi_free_vector(struct pci_dev* dev, int vector, int reassign)</div><div class='ctx'> 				entry_nr * PCI_MSIX_ENTRY_SIZE +</div><div class='ctx'> 				PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);</div><div class='ctx'> </div><div class='del'>-		if (head == vector) {</div><div class='del'>-			/*</div><div class='del'>-			 * Detect last MSI-X vector to be released.</div><div class='del'>-			 * Release the MSI-X memory-mapped table.</div><div class='del'>-			 */</div><div class='del'>-#if 0</div><div class='del'>-			int pos, nr_entries;</div><div class='del'>-			unsigned long phys_addr;</div><div class='del'>-			u32 table_offset;</div><div class='del'>-			u16 control;</div><div class='del'>-			u8 bir;</div><div class='del'>-</div><div class='del'>-   			pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);</div><div class='del'>-			pci_read_config_word(dev, msi_control_reg(pos),</div><div class='del'>-				&amp;control);</div><div class='del'>-			nr_entries = multi_msix_capable(control);</div><div class='del'>-			pci_read_config_dword(dev, msix_table_offset_reg(pos),</div><div class='del'>-				&amp;table_offset);</div><div class='del'>-			bir = (u8)(table_offset &amp; PCI_MSIX_FLAGS_BIRMASK);</div><div class='del'>-			table_offset &amp;= ~PCI_MSIX_FLAGS_BIRMASK;</div><div class='del'>-			phys_addr = pci_resource_start(dev, bir) + table_offset;</div><div class='del'>-/*</div><div class='del'>- * FIXME!  and what did you want to do with phys_addr?</div><div class='del'>- */</div><div class='del'>-#endif</div><div class='add'>+		if (head == vector)</div><div class='ctx'> 			iounmap(base);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1108,6 +1134,7 @@ static int reroute_msix_table(int head, struct msix_entry *entries, int *nvec)</div><div class='ctx'>  **/</div><div class='ctx'> int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)</div><div class='ctx'> {</div><div class='add'>+	struct pci_bus *bus;</div><div class='ctx'> 	int status, pos, nr_entries, free_vectors;</div><div class='ctx'> 	int i, j, temp;</div><div class='ctx'> 	u16 control;</div><div class='hunk'>@@ -1116,6 +1143,13 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec)</div><div class='ctx'> 	if (!pci_msi_enable || !dev || !entries)</div><div class='ctx'>  		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;no_msi)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (bus = dev-&gt;bus; bus; bus = bus-&gt;parent)</div><div class='add'>+		if (bus-&gt;bus_flags &amp; PCI_BUS_FLAGS_NO_MSI)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	status = msi_init();</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		return status;</div><div class='hunk'>@@ -1300,24 +1334,6 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		msi_free_vector(dev, vector, 0);</div><div class='ctx'> 		if (warning) {</div><div class='del'>-			/* Force to release the MSI-X memory-mapped table */</div><div class='del'>-#if 0</div><div class='del'>-			unsigned long phys_addr;</div><div class='del'>-			u32 table_offset;</div><div class='del'>-			u16 control;</div><div class='del'>-			u8 bir;</div><div class='del'>-</div><div class='del'>-			pci_read_config_word(dev, msi_control_reg(pos),</div><div class='del'>-				&amp;control);</div><div class='del'>-			pci_read_config_dword(dev, msix_table_offset_reg(pos),</div><div class='del'>-				&amp;table_offset);</div><div class='del'>-			bir = (u8)(table_offset &amp; PCI_MSIX_FLAGS_BIRMASK);</div><div class='del'>-			table_offset &amp;= ~PCI_MSIX_FLAGS_BIRMASK;</div><div class='del'>-			phys_addr = pci_resource_start(dev, bir) + table_offset;</div><div class='del'>-/*</div><div class='del'>- * FIXME! and what did you want to do with phys_addr?</div><div class='del'>- */</div><div class='del'>-#endif</div><div class='ctx'> 			iounmap(base);</div><div class='ctx'> 			printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "</div><div class='ctx'> 			       "called without free_irq() on all MSI-X vectors\n",</div><div class='head'>diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h<br/>index 4ac52d441e47..56951c39d3a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/msi.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/msi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/msi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/msi.h</a></div><div class='hunk'>@@ -6,6 +6,68 @@</div><div class='ctx'> #ifndef MSI_H</div><div class='ctx'> #define MSI_H</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * MSI operation vector.  Used by the msi core code (drivers/pci/msi.c)</div><div class='add'>+ * to abstract platform-specific tasks relating to MSI address generation</div><div class='add'>+ * and resource management.</div><div class='add'>+ */</div><div class='add'>+struct msi_ops {</div><div class='add'>+	/**</div><div class='add'>+	 * setup - generate an MSI bus address and data for a given vector</div><div class='add'>+	 * @pdev: PCI device context (in)</div><div class='add'>+	 * @vector: vector allocated by the msi core (in)</div><div class='add'>+	 * @addr_hi: upper 32 bits of PCI bus MSI address (out)</div><div class='add'>+	 * @addr_lo: lower 32 bits of PCI bus MSI address (out)</div><div class='add'>+	 * @data: MSI data payload (out)</div><div class='add'>+	 *</div><div class='add'>+	 * Description: The setup op is used to generate a PCI bus addres and</div><div class='add'>+	 * data which the msi core will program into the card MSI capability</div><div class='add'>+	 * registers.  The setup routine is responsible for picking an initial</div><div class='add'>+	 * cpu to target the MSI at.  The setup routine is responsible for</div><div class='add'>+	 * examining pdev to determine the MSI capabilities of the card and</div><div class='add'>+	 * generating a suitable address/data.  The setup routine is</div><div class='add'>+	 * responsible for allocating and tracking any system resources it</div><div class='add'>+	 * needs to route the MSI to the cpu it picks, and for associating</div><div class='add'>+	 * those resources with the passed in vector.</div><div class='add'>+	 *</div><div class='add'>+	 * Returns 0 if the MSI address/data was successfully setup.</div><div class='add'>+	 **/</div><div class='add'>+</div><div class='add'>+	int	(*setup)    (struct pci_dev *pdev, unsigned int vector,</div><div class='add'>+			     u32 *addr_hi, u32 *addr_lo, u32 *data);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * teardown - release resources allocated by setup</div><div class='add'>+	 * @vector: vector context for resources (in)</div><div class='add'>+	 *</div><div class='add'>+	 * Description:  The teardown op is used to release any resources</div><div class='add'>+	 * that were allocated in the setup routine associated with the passed</div><div class='add'>+	 * in vector.</div><div class='add'>+	 **/</div><div class='add'>+</div><div class='add'>+	void	(*teardown) (unsigned int vector);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * target - retarget an MSI at a different cpu</div><div class='add'>+	 * @vector: vector context for resources (in)</div><div class='add'>+	 * @cpu:  new cpu to direct vector at (in)</div><div class='add'>+	 * @addr_hi: new value of PCI bus upper 32 bits (in/out)</div><div class='add'>+	 * @addr_lo: new value of PCI bus lower 32 bits (in/out)</div><div class='add'>+	 *</div><div class='add'>+	 * Description:  The target op is used to redirect an MSI vector</div><div class='add'>+	 * at a different cpu.  addr_hi/addr_lo coming in are the existing</div><div class='add'>+	 * values that the MSI core has programmed into the card.  The</div><div class='add'>+	 * target code is responsible for freeing any resources (if any)</div><div class='add'>+	 * associated with the old address, and generating a new PCI bus</div><div class='add'>+	 * addr_hi/addr_lo that will redirect the vector at the indicated cpu.</div><div class='add'>+	 **/</div><div class='add'>+</div><div class='add'>+	void	(*target)   (unsigned int vector, unsigned int cpu,</div><div class='add'>+			     u32 *addr_hi, u32 *addr_lo);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int msi_register(struct msi_ops *ops);</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/msi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -63,67 +125,6 @@ extern int pci_vector_resources(int last, int nr_released);</div><div class='ctx'> #define msix_mask(address)		(address | PCI_MSIX_FLAGS_BITMASK)</div><div class='ctx'> #define msix_is_pending(address) 	(address &amp; PCI_MSIX_FLAGS_PENDMASK)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * MSI Defined Data Structures</div><div class='del'>- */</div><div class='del'>-#define MSI_ADDRESS_HEADER		0xfee</div><div class='del'>-#define MSI_ADDRESS_HEADER_SHIFT	12</div><div class='del'>-#define MSI_ADDRESS_HEADER_MASK		0xfff000</div><div class='del'>-#define MSI_ADDRESS_DEST_ID_MASK	0xfff0000f</div><div class='del'>-#define MSI_TARGET_CPU_MASK		0xff</div><div class='del'>-#define MSI_DELIVERY_MODE		0</div><div class='del'>-#define MSI_LEVEL_MODE			1	/* Edge always assert */</div><div class='del'>-#define MSI_TRIGGER_MODE		0	/* MSI is edge sensitive */</div><div class='del'>-#define MSI_PHYSICAL_MODE		0</div><div class='del'>-#define MSI_LOGICAL_MODE		1</div><div class='del'>-#define MSI_REDIRECTION_HINT_MODE	0</div><div class='del'>-</div><div class='del'>-struct msg_data {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-	__u32	vector		:  8;</div><div class='del'>-	__u32	delivery_mode	:  3;	/* 000b: FIXED | 001b: lowest prior */</div><div class='del'>-	__u32	reserved_1	:  3;</div><div class='del'>-	__u32	level		:  1;	/* 0: deassert | 1: assert */</div><div class='del'>-	__u32	trigger		:  1;	/* 0: edge | 1: level */</div><div class='del'>-	__u32	reserved_2	: 16;</div><div class='del'>-#elif defined(__BIG_ENDIAN_BITFIELD)</div><div class='del'>-	__u32	reserved_2	: 16;</div><div class='del'>-	__u32	trigger		:  1;	/* 0: edge | 1: level */</div><div class='del'>-	__u32	level		:  1;	/* 0: deassert | 1: assert */</div><div class='del'>-	__u32	reserved_1	:  3;</div><div class='del'>-	__u32	delivery_mode	:  3;	/* 000b: FIXED | 001b: lowest prior */</div><div class='del'>-	__u32	vector		:  8;</div><div class='del'>-#else</div><div class='del'>-#error "Bitfield endianness not defined! Check your byteorder.h"</div><div class='del'>-#endif</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='del'>-struct msg_address {</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-#if defined(__LITTLE_ENDIAN_BITFIELD)</div><div class='del'>-			__u32	reserved_1	:  2;</div><div class='del'>-			__u32	dest_mode	:  1;	/*0:physic | 1:logic */</div><div class='del'>-			__u32	redirection_hint:  1;  	/*0: dedicated CPU</div><div class='del'>-							  1: lowest priority */</div><div class='del'>-			__u32	reserved_2	:  4;</div><div class='del'>- 			__u32	dest_id		: 24;	/* Destination ID */</div><div class='del'>-#elif defined(__BIG_ENDIAN_BITFIELD)</div><div class='del'>- 			__u32	dest_id		: 24;	/* Destination ID */</div><div class='del'>-			__u32	reserved_2	:  4;</div><div class='del'>-			__u32	redirection_hint:  1;  	/*0: dedicated CPU</div><div class='del'>-							  1: lowest priority */</div><div class='del'>-			__u32	dest_mode	:  1;	/*0:physic | 1:logic */</div><div class='del'>-			__u32	reserved_1	:  2;</div><div class='del'>-#else</div><div class='del'>-#error "Bitfield endianness not defined! Check your byteorder.h"</div><div class='del'>-#endif</div><div class='del'>-      		}u;</div><div class='del'>-       		__u32  value;</div><div class='del'>-	}lo_address;</div><div class='del'>-	__u32 	hi_address;</div><div class='del'>-} __attribute__ ((packed));</div><div class='del'>-</div><div class='ctx'> struct msi_desc {</div><div class='ctx'> 	struct {</div><div class='ctx'> 		__u8	type	: 5; 	/* {0: unused, 5h:MSI, 11h:MSI-X} */</div><div class='hunk'>@@ -132,7 +133,7 @@ struct msi_desc {</div><div class='ctx'> 		__u8	reserved: 1; 	/* reserved			  */</div><div class='ctx'> 		__u8	entry_nr;    	/* specific enabled entry 	  */</div><div class='ctx'> 		__u8	default_vector; /* default pre-assigned vector    */</div><div class='del'>-		__u8	current_cpu; 	/* current destination cpu	  */</div><div class='add'>+		__u8	unused; 	/* formerly unused destination cpu*/</div><div class='ctx'> 	}msi_attrib;</div><div class='ctx'> </div><div class='ctx'> 	struct {</div><div class='hunk'>@@ -142,6 +143,14 @@ struct msi_desc {</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *mask_base;</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	/* PM save area for MSIX address/data */</div><div class='add'>+</div><div class='add'>+	u32	address_hi_save;</div><div class='add'>+	u32	address_lo_save;</div><div class='add'>+	u32	data_save;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* MSI_H */</div><div class='head'>diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c<br/>index c2ecae5ff0c1..bb7456c1dbac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-acpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci-acpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-acpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/pci-acpi.c</a></div><div class='hunk'>@@ -267,7 +267,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ACPI bus type */</div><div class='del'>-static int pci_acpi_find_device(struct device *dev, acpi_handle *handle)</div><div class='add'>+static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev * pci_dev;</div><div class='ctx'> 	acpi_integer	addr;</div><div class='hunk'>@@ -281,7 +281,7 @@ static int pci_acpi_find_device(struct device *dev, acpi_handle *handle)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pci_acpi_find_root_bridge(struct device *dev, acpi_handle *handle)</div><div class='add'>+static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle)</div><div class='ctx'> {</div><div class='ctx'> 	int num;</div><div class='ctx'> 	unsigned int seg, bus;</div><div class='hunk'>@@ -299,21 +299,21 @@ static int pci_acpi_find_root_bridge(struct device *dev, acpi_handle *handle)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct acpi_bus_type pci_acpi_bus = {</div><div class='add'>+static struct acpi_bus_type acpi_pci_bus = {</div><div class='ctx'> 	.bus = &amp;pci_bus_type,</div><div class='del'>-	.find_device = pci_acpi_find_device,</div><div class='del'>-	.find_bridge = pci_acpi_find_root_bridge,</div><div class='add'>+	.find_device = acpi_pci_find_device,</div><div class='add'>+	.find_bridge = acpi_pci_find_root_bridge,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pci_acpi_init(void)</div><div class='add'>+static int __init acpi_pci_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = register_acpi_bus_type(&amp;pci_acpi_bus);</div><div class='add'>+	ret = register_acpi_bus_type(&amp;acpi_pci_bus);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	platform_pci_choose_state = acpi_pci_choose_state;</div><div class='ctx'> 	platform_pci_set_power_state = acpi_pci_set_power_state;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-arch_initcall(pci_acpi_init);</div><div class='add'>+arch_initcall(acpi_pci_init);</div><div class='head'>diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c<br/>index 1456759936c5..10e1a905c144 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci-driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/pci-driver.c</a></div><div class='hunk'>@@ -285,9 +285,9 @@ static int pci_device_suspend(struct device * dev, pm_message_t state)</div><div class='ctx'>  * Default resume method for devices that have no driver provided resume,</div><div class='ctx'>  * or not even a driver at all.</div><div class='ctx'>  */</div><div class='del'>-static void pci_default_resume(struct pci_dev *pci_dev)</div><div class='add'>+static int pci_default_resume(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='del'>-	int retval;</div><div class='add'>+	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* restore the PCI config space */</div><div class='ctx'> 	pci_restore_state(pci_dev);</div><div class='hunk'>@@ -297,18 +297,21 @@ static void pci_default_resume(struct pci_dev *pci_dev)</div><div class='ctx'> 	/* if the device was busmaster before the suspend, make it busmaster again */</div><div class='ctx'> 	if (pci_dev-&gt;is_busmaster)</div><div class='ctx'> 		pci_set_master(pci_dev);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pci_device_resume(struct device * dev)</div><div class='ctx'> {</div><div class='add'>+	int error;</div><div class='ctx'> 	struct pci_dev * pci_dev = to_pci_dev(dev);</div><div class='ctx'> 	struct pci_driver * drv = pci_dev-&gt;driver;</div><div class='ctx'> </div><div class='ctx'> 	if (drv &amp;&amp; drv-&gt;resume)</div><div class='del'>-		drv-&gt;resume(pci_dev);</div><div class='add'>+		error = drv-&gt;resume(pci_dev);</div><div class='ctx'> 	else</div><div class='del'>-		pci_default_resume(pci_dev);</div><div class='del'>-	return 0;</div><div class='add'>+		error = pci_default_resume(pci_dev);</div><div class='add'>+	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pci_device_shutdown(struct device *dev)</div><div class='head'>diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c<br/>index 56ac2bc003c7..fdefa7dcd156 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci-sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci-sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/pci-sysfs.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='hunk'>@@ -43,6 +42,29 @@ pci_config_attr(subsystem_vendor, "0x%04x\n");</div><div class='ctx'> pci_config_attr(subsystem_device, "0x%04x\n");</div><div class='ctx'> pci_config_attr(class, "0x%06x\n");</div><div class='ctx'> pci_config_attr(irq, "%u\n");</div><div class='add'>+pci_config_attr(is_enabled, "%u\n");</div><div class='add'>+</div><div class='add'>+static ssize_t broken_parity_status_show(struct device *dev,</div><div class='add'>+					 struct device_attribute *attr,</div><div class='add'>+					 char *buf)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	return sprintf (buf, "%u\n", pdev-&gt;broken_parity_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t broken_parity_status_store(struct device *dev,</div><div class='add'>+					  struct device_attribute *attr,</div><div class='add'>+					  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	ssize_t consumed = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((count &gt; 0) &amp;&amp; (*buf == '0' || *buf == '1')) {</div><div class='add'>+		pdev-&gt;broken_parity_status = *buf == '1' ? 1 : 0;</div><div class='add'>+		consumed = count;</div><div class='add'>+	}</div><div class='add'>+	return consumed;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static ssize_t local_cpus_show(struct device *dev,</div><div class='ctx'> 			struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -64,7 +86,7 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)</div><div class='ctx'> 	char * str = buf;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int max = 7;</div><div class='del'>-	u64 start, end;</div><div class='add'>+	resource_size_t start, end;</div><div class='ctx'> </div><div class='ctx'> 	if (pci_dev-&gt;subordinate)</div><div class='ctx'> 		max = DEVICE_COUNT_RESOURCE;</div><div class='hunk'>@@ -90,6 +112,25 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 		       (u8)(pci_dev-&gt;class &gt;&gt; 16), (u8)(pci_dev-&gt;class &gt;&gt; 8),</div><div class='ctx'> 		       (u8)(pci_dev-&gt;class));</div><div class='ctx'> }</div><div class='add'>+static ssize_t</div><div class='add'>+is_enabled_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+</div><div class='add'>+	/* this can crash the machine when done on the "wrong" device */</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	if (*buf == '0')</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	if (*buf == '1')</div><div class='add'>+		pci_enable_device(pdev);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> struct device_attribute pci_dev_attrs[] = {</div><div class='ctx'> 	__ATTR_RO(resource),</div><div class='hunk'>@@ -101,6 +142,9 @@ struct device_attribute pci_dev_attrs[] = {</div><div class='ctx'> 	__ATTR_RO(irq),</div><div class='ctx'> 	__ATTR_RO(local_cpus),</div><div class='ctx'> 	__ATTR_RO(modalias),</div><div class='add'>+	__ATTR(enable, 0600, is_enabled_show, is_enabled_store),</div><div class='add'>+	__ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),</div><div class='add'>+		broken_parity_status_show,broken_parity_status_store),</div><div class='ctx'> 	__ATTR_NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +364,7 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,</div><div class='ctx'> 						       struct device, kobj));</div><div class='ctx'> 	struct resource *res = (struct resource *)attr-&gt;private;</div><div class='ctx'> 	enum pci_mmap_state mmap_type;</div><div class='del'>-	u64 start, end;</div><div class='add'>+	resource_size_t start, end;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PCI_ROM_RESOURCE; i++)</div><div class='head'>diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c<br/>index 2329f941a0dc..9f79dd6d51ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/pci.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;asm/dma.h&gt;	/* isa_dma_bridge_buggy */</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='add'>+unsigned int pci_pm_d3_delay = 10;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children</div><div class='hunk'>@@ -164,7 +165,6 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)</div><div class='ctx'> 	return __pci_bus_find_cap(bus, devfn, hdr_type &amp; 0x7f, cap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='ctx'> /**</div><div class='ctx'>  * pci_find_ext_capability - Find an extended capability</div><div class='ctx'>  * @dev: PCI device to query</div><div class='hunk'>@@ -212,7 +212,7 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif  /*  0  */</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_find_ext_capability);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * pci_find_parent_resource - return resource region of parent bus of given region</div><div class='hunk'>@@ -314,6 +314,14 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)</div><div class='ctx'> 	} else if (dev-&gt;current_state == state)</div><div class='ctx'> 		return 0;        /* we're already there */</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * If the device or the parent bridge can't support PCI PM, ignore</div><div class='add'>+	 * the request if we're doing anything besides putting it into D0</div><div class='add'>+	 * (which would only happen on boot).</div><div class='add'>+	 */</div><div class='add'>+	if ((state == PCI_D1 || state == PCI_D2) &amp;&amp; pci_no_d1d2(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* find PCI PM capability in list */</div><div class='ctx'> 	pm = pci_find_capability(dev, PCI_CAP_ID_PM);</div><div class='ctx'> 	</div><div class='hunk'>@@ -364,13 +372,13 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)</div><div class='ctx'> 	/* Mandatory power management transition delays */</div><div class='ctx'> 	/* see PCI PM 1.1 5.6.1 table 18 */</div><div class='ctx'> 	if (state == PCI_D3hot || dev-&gt;current_state == PCI_D3hot)</div><div class='del'>-		msleep(10);</div><div class='add'>+		msleep(pci_pm_d3_delay);</div><div class='ctx'> 	else if (state == PCI_D2 || dev-&gt;current_state == PCI_D2)</div><div class='ctx'> 		udelay(200);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Give firmware a chance to be called, such as ACPI _PRx, _PSx</div><div class='del'>-	 * Firmware method after natice method ?</div><div class='add'>+	 * Firmware method after native method ?</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (platform_pci_set_power_state)</div><div class='ctx'> 		platform_pci_set_power_state(dev, state);</div><div class='hunk'>@@ -461,9 +469,23 @@ int</div><div class='ctx'> pci_restore_state(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	int val;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		pci_write_config_dword(dev,i * 4, dev-&gt;saved_config_space[i]);</div><div class='add'>+	/*</div><div class='add'>+	 * The Base Address register should be programmed before the command</div><div class='add'>+	 * register(s)</div><div class='add'>+	 */</div><div class='add'>+	for (i = 15; i &gt;= 0; i--) {</div><div class='add'>+		pci_read_config_dword(dev, i * 4, &amp;val);</div><div class='add'>+		if (val != dev-&gt;saved_config_space[i]) {</div><div class='add'>+			printk(KERN_DEBUG "PM: Writing back config space on "</div><div class='add'>+				"device %s at offset %x (was %x, writing %x)\n",</div><div class='add'>+				pci_name(dev), i,</div><div class='add'>+				val, (int)dev-&gt;saved_config_space[i]);</div><div class='add'>+			pci_write_config_dword(dev,i * 4,</div><div class='add'>+				dev-&gt;saved_config_space[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	pci_restore_msi_state(dev);</div><div class='ctx'> 	pci_restore_msix_state(dev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -504,7 +526,12 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)</div><div class='ctx'> int</div><div class='ctx'> pci_enable_device(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='del'>-	int err = pci_enable_device_bars(dev, (1 &lt;&lt; PCI_NUM_RESOURCES) - 1);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;is_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device_bars(dev, (1 &lt;&lt; PCI_NUM_RESOURCES) - 1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pci_fixup_device(pci_fixup_enable, dev);</div><div class='hunk'>@@ -533,7 +560,14 @@ void</div><div class='ctx'> pci_disable_device(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 pci_command;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;msi_enabled)</div><div class='add'>+		disable_msi_mode(dev, pci_find_capability(dev, PCI_CAP_ID_MSI),</div><div class='add'>+			PCI_CAP_ID_MSI);</div><div class='add'>+	if (dev-&gt;msix_enabled)</div><div class='add'>+		disable_msi_mode(dev, pci_find_capability(dev, PCI_CAP_ID_MSI),</div><div class='add'>+			PCI_CAP_ID_MSIX);</div><div class='add'>+</div><div class='ctx'> 	pci_read_config_word(dev, PCI_COMMAND, &amp;pci_command);</div><div class='ctx'> 	if (pci_command &amp; PCI_COMMAND_MASTER) {</div><div class='ctx'> 		pci_command &amp;= ~PCI_COMMAND_MASTER;</div><div class='hunk'>@@ -666,10 +700,12 @@ int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	printk (KERN_WARNING "PCI: Unable to reserve %s region #%d:%lx@%lx for device %s\n",</div><div class='add'>+	printk (KERN_WARNING "PCI: Unable to reserve %s region #%d:%llx@%llx "</div><div class='add'>+		"for device %s\n",</div><div class='ctx'> 		pci_resource_flags(pdev, bar) &amp; IORESOURCE_IO ? "I/O" : "mem",</div><div class='ctx'> 		bar + 1, /* PCI BAR # */</div><div class='del'>-		pci_resource_len(pdev, bar), pci_resource_start(pdev, bar),</div><div class='add'>+		(unsigned long long)pci_resource_len(pdev, bar),</div><div class='add'>+		(unsigned long long)pci_resource_start(pdev, bar),</div><div class='ctx'> 		pci_name(pdev));</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h<br/>index 30630cbe2fe3..08d58fc78ee1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/pci.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/pci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/pci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/pci.h</a></div><div class='hunk'>@@ -6,10 +6,10 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);</div><div class='ctx'> extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);</div><div class='ctx'> extern void pci_cleanup_rom(struct pci_dev *dev);</div><div class='ctx'> extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,</div><div class='del'>-				  unsigned long size, unsigned long align,</div><div class='del'>-				  unsigned long min, unsigned int type_mask,</div><div class='add'>+				  resource_size_t size, resource_size_t align,</div><div class='add'>+				  resource_size_t min, unsigned int type_mask,</div><div class='ctx'> 				  void (*alignf)(void *, struct resource *,</div><div class='del'>-					  	 unsigned long, unsigned long),</div><div class='add'>+					      resource_size_t, resource_size_t),</div><div class='ctx'> 				  void *alignf_data);</div><div class='ctx'> /* Firmware callbacks */</div><div class='ctx'> extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);</div><div class='hunk'>@@ -40,14 +40,14 @@ extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int</div><div class='ctx'> extern void pci_remove_legacy_files(struct pci_bus *bus);</div><div class='ctx'> </div><div class='ctx'> /* Lock for read/write access to pci device and bus lists */</div><div class='del'>-extern spinlock_t pci_bus_lock;</div><div class='add'>+extern struct rw_semaphore pci_bus_sem;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> extern int pci_msi_quirk;</div><div class='ctx'> #else</div><div class='ctx'> #define pci_msi_quirk 0</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+extern unsigned int pci_pm_d3_delay;</div><div class='ctx'> #ifdef CONFIG_PCI_MSI</div><div class='ctx'> void disable_msi_mode(struct pci_dev *dev, int pos, int type);</div><div class='ctx'> void pci_no_msi(void);</div><div class='hunk'>@@ -66,7 +66,15 @@ static inline int pci_save_msix_state(struct pci_dev *dev) { return 0; }</div><div class='ctx'> static inline void pci_restore_msi_state(struct pci_dev *dev) {}</div><div class='ctx'> static inline void pci_restore_msix_state(struct pci_dev *dev) {}</div><div class='ctx'> #endif</div><div class='add'>+static inline int pci_no_d1d2(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int parent_dstates = 0;</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;bus-&gt;self)</div><div class='add'>+		parent_dstates = dev-&gt;bus-&gt;self-&gt;no_d1d2;</div><div class='add'>+	return (dev-&gt;no_d1d2 || parent_dstates);</div><div class='add'>+</div><div class='add'>+}</div><div class='ctx'> extern int pcie_mch_quirk;</div><div class='ctx'> extern struct device_attribute pci_dev_attrs[];</div><div class='ctx'> extern struct class_device_attribute class_device_attr_cpuaffinity;</div><div class='head'>diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c<br/>index a10ed9dab2c2..c5a58d1c6c1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/probe.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/probe.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/probe.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/probe.c</a></div><div class='hunk'>@@ -180,25 +180,31 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)</div><div class='ctx'> 		res-&gt;flags |= pci_calc_resource_flags(l);</div><div class='ctx'> 		if ((l &amp; (PCI_BASE_ADDRESS_SPACE | PCI_BASE_ADDRESS_MEM_TYPE_MASK))</div><div class='ctx'> 		    == (PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64)) {</div><div class='del'>-			pci_read_config_dword(dev, reg+4, &amp;l);</div><div class='add'>+			u32 szhi, lhi;</div><div class='add'>+			pci_read_config_dword(dev, reg+4, &amp;lhi);</div><div class='add'>+			pci_write_config_dword(dev, reg+4, ~0);</div><div class='add'>+			pci_read_config_dword(dev, reg+4, &amp;szhi);</div><div class='add'>+			pci_write_config_dword(dev, reg+4, lhi);</div><div class='add'>+			szhi = pci_size(lhi, szhi, 0xffffffff);</div><div class='ctx'> 			next++;</div><div class='ctx'> #if BITS_PER_LONG == 64</div><div class='del'>-			res-&gt;start |= ((unsigned long) l) &lt;&lt; 32;</div><div class='add'>+			res-&gt;start |= ((unsigned long) lhi) &lt;&lt; 32;</div><div class='ctx'> 			res-&gt;end = res-&gt;start + sz;</div><div class='del'>-			pci_write_config_dword(dev, reg+4, ~0);</div><div class='del'>-			pci_read_config_dword(dev, reg+4, &amp;sz);</div><div class='del'>-			pci_write_config_dword(dev, reg+4, l);</div><div class='del'>-			sz = pci_size(l, sz, 0xffffffff);</div><div class='del'>-			if (sz) {</div><div class='add'>+			if (szhi) {</div><div class='ctx'> 				/* This BAR needs &gt; 4GB?  Wow. */</div><div class='del'>-				res-&gt;end |= (unsigned long)sz&lt;&lt;32;</div><div class='add'>+				res-&gt;end |= (unsigned long)szhi&lt;&lt;32;</div><div class='ctx'> 			}</div><div class='ctx'> #else</div><div class='del'>-			if (l) {</div><div class='del'>-				printk(KERN_ERR "PCI: Unable to handle 64-bit address for device %s\n", pci_name(dev));</div><div class='add'>+			if (szhi) {</div><div class='add'>+				printk(KERN_ERR "PCI: Unable to handle 64-bit BAR for device %s\n", pci_name(dev));</div><div class='ctx'> 				res-&gt;start = 0;</div><div class='ctx'> 				res-&gt;flags = 0;</div><div class='del'>-				continue;</div><div class='add'>+			} else if (lhi) {</div><div class='add'>+				/* 64-bit wide address, treat as disabled */</div><div class='add'>+				pci_write_config_dword(dev, reg, l &amp; ~(u32)PCI_BASE_ADDRESS_MEM_MASK);</div><div class='add'>+				pci_write_config_dword(dev, reg+4, 0);</div><div class='add'>+				res-&gt;start = 0;</div><div class='add'>+				res-&gt;end = sz;</div><div class='ctx'> 			}</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='hunk'>@@ -377,9 +383,9 @@ struct pci_bus * __devinit pci_add_new_bus(struct pci_bus *parent, struct pci_de</div><div class='ctx'> </div><div class='ctx'> 	child = pci_alloc_child_bus(parent, dev, busnr);</div><div class='ctx'> 	if (child) {</div><div class='del'>-		spin_lock(&amp;pci_bus_lock);</div><div class='add'>+		down_write(&amp;pci_bus_sem);</div><div class='ctx'> 		list_add_tail(&amp;child-&gt;node, &amp;parent-&gt;children);</div><div class='del'>-		spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+		up_write(&amp;pci_bus_sem);</div><div class='ctx'> 	}</div><div class='ctx'> 	return child;</div><div class='ctx'> }</div><div class='hunk'>@@ -809,6 +815,7 @@ pci_scan_device(struct pci_bus *bus, int devfn)</div><div class='ctx'> 	dev-&gt;vendor = l &amp; 0xffff;</div><div class='ctx'> 	dev-&gt;device = (l &gt;&gt; 16) &amp; 0xffff;</div><div class='ctx'> 	dev-&gt;cfg_size = pci_cfg_space_size(dev);</div><div class='add'>+	dev-&gt;error_state = pci_channel_io_normal;</div><div class='ctx'> </div><div class='ctx'> 	/* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer)</div><div class='ctx'> 	   set this higher, assuming the system even supports it.  */</div><div class='hunk'>@@ -838,9 +845,9 @@ void __devinit pci_device_add(struct pci_dev *dev, struct pci_bus *bus)</div><div class='ctx'> 	 * and the bus list for fixup functions, etc.</div><div class='ctx'> 	 */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;global_list);</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_write(&amp;pci_bus_sem);</div><div class='ctx'> 	list_add_tail(&amp;dev-&gt;bus_list, &amp;bus-&gt;devices);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_write(&amp;pci_bus_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct pci_dev * __devinit</div><div class='hunk'>@@ -975,9 +982,10 @@ struct pci_bus * __devinit pci_create_bus(struct device *parent,</div><div class='ctx'> 		pr_debug("PCI: Bus %04x:%02x already known\n", pci_domain_nr(b), bus);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+</div><div class='add'>+	down_write(&amp;pci_bus_sem);</div><div class='ctx'> 	list_add_tail(&amp;b-&gt;node, &amp;pci_root_buses);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_write(&amp;pci_bus_sem);</div><div class='ctx'> </div><div class='ctx'> 	memset(dev, 0, sizeof(*dev));</div><div class='ctx'> 	dev-&gt;parent = parent;</div><div class='hunk'>@@ -1017,9 +1025,9 @@ class_dev_create_file_err:</div><div class='ctx'> class_dev_reg_err:</div><div class='ctx'> 	device_unregister(dev);</div><div class='ctx'> dev_reg_err:</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_write(&amp;pci_bus_sem);</div><div class='ctx'> 	list_del(&amp;b-&gt;node);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_write(&amp;pci_bus_sem);</div><div class='ctx'> err_out:</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> 	kfree(b);</div><div class='head'>diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c<br/>index 54b2ebc9c91a..99cf33379769 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/proc.c</a></div><div class='hunk'>@@ -302,12 +302,6 @@ static struct file_operations proc_bus_pci_operations = {</div><div class='ctx'> #endif /* HAVE_PCI_MMAP */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if BITS_PER_LONG == 32</div><div class='del'>-#define LONG_FORMAT "\t%08lx"</div><div class='del'>-#else</div><div class='del'>-#define LONG_FORMAT "\t%16lx"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* iterator */</div><div class='ctx'> static void *pci_seq_start(struct seq_file *m, loff_t *pos)</div><div class='ctx'> {</div><div class='hunk'>@@ -356,18 +350,18 @@ static int show_device(struct seq_file *m, void *v)</div><div class='ctx'> 			dev-&gt;irq);</div><div class='ctx'> 	/* Here should be 7 and not PCI_NUM_RESOURCES as we need to preserve compatibility */</div><div class='ctx'> 	for (i=0; i&lt;7; i++) {</div><div class='del'>-		u64 start, end;</div><div class='add'>+		resource_size_t start, end;</div><div class='ctx'> 		pci_resource_to_user(dev, i, &amp;dev-&gt;resource[i], &amp;start, &amp;end);</div><div class='del'>-		seq_printf(m, LONG_FORMAT,</div><div class='del'>-			((unsigned long)start) |</div><div class='del'>-			(dev-&gt;resource[i].flags &amp; PCI_REGION_FLAG_MASK));</div><div class='add'>+		seq_printf(m, "\t%16llx",</div><div class='add'>+			(unsigned long long)(start |</div><div class='add'>+			(dev-&gt;resource[i].flags &amp; PCI_REGION_FLAG_MASK)));</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i=0; i&lt;7; i++) {</div><div class='del'>-		u64 start, end;</div><div class='add'>+		resource_size_t start, end;</div><div class='ctx'> 		pci_resource_to_user(dev, i, &amp;dev-&gt;resource[i], &amp;start, &amp;end);</div><div class='del'>-		seq_printf(m, LONG_FORMAT,</div><div class='add'>+		seq_printf(m, "\t%16llx",</div><div class='ctx'> 			dev-&gt;resource[i].start &lt; dev-&gt;resource[i].end ?</div><div class='del'>-			(unsigned long)(end - start) + 1 : 0);</div><div class='add'>+			(unsigned long long)(end - start) + 1 : 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	seq_putc(m, '\t');</div><div class='ctx'> 	if (drv)</div><div class='head'>diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c<br/>index d378478612fb..e3c78c39b7e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/quirks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/quirks.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  use the PowerTweak utility (see http://powertweak.sourceforge.net).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -24,6 +23,17 @@</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='add'>+/* The Mellanox Tavor device gives false positive parity errors</div><div class='add'>+ * Mark this device with a broken_parity_status, to allow</div><div class='add'>+ * PCI scanning code to "skip" this now blacklisted device.</div><div class='add'>+ */</div><div class='add'>+static void __devinit quirk_mellanox_tavor(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;broken_parity_status = 1;	/* This device gives false positives */</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR,quirk_mellanox_tavor);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE,quirk_mellanox_tavor);</div><div class='add'>+</div><div class='ctx'> /* Deal with broken BIOS'es that neglect to enable passive release,</div><div class='ctx'>    which can cause problems in combination with the 82441FX/PPro MTRRs */</div><div class='ctx'> static void __devinit quirk_passive_release(struct pci_dev *dev)</div><div class='hunk'>@@ -390,6 +400,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)</div><div class='ctx'> 	piix4_io_quirk(dev, "PIIX4 devres J", 0x7c, 1 &lt;&lt; 20);</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82371AB_3,	quirk_piix4_acpi );</div><div class='add'>+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82443MX_3,	quirk_piix4_acpi );</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at</div><div class='hunk'>@@ -672,6 +683,33 @@ static void __devinit quirk_vt82c598_id(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_vt82c598_id );</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ACPI_SLEEP</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some VIA systems boot with the abnormal status flag set. This can cause</div><div class='add'>+ * the BIOS to re-POST the system on resume rather than passing control</div><div class='add'>+ * back to the OS.  Clear the flag on boot</div><div class='add'>+ */</div><div class='add'>+static void __devinit quirk_via_abnormal_poweroff(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS,</div><div class='add'>+				&amp;reg);</div><div class='add'>+</div><div class='add'>+	if (reg &amp; 0x800) {</div><div class='add'>+		printk("Clearing abnormal poweroff flag\n");</div><div class='add'>+		acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK,</div><div class='add'>+					ACPI_REGISTER_PM1_STATUS,</div><div class='add'>+					(u16)0x800);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, quirk_via_abnormal_poweroff);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, quirk_via_abnormal_poweroff);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * CardBus controllers have a legacy base address that enables them</div><div class='ctx'>  * to respond as i82365 pcmcia controllers.  We don't want them to</div><div class='hunk'>@@ -878,27 +916,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82375,	quirk_e</div><div class='ctx'>  * when a PCI-Soundcard is added. The BIOS only gives Options</div><div class='ctx'>  * "Disabled" and "AUTO". This Quirk Sets the corresponding</div><div class='ctx'>  * Register-Value to enable the Soundcard.</div><div class='add'>+ *</div><div class='add'>+ * FIXME: Presently this quirk will run on anything that has an 8237</div><div class='add'>+ * which isn't correct, we need to check DMI tables or something in</div><div class='add'>+ * order to make sure it only runs on the MSI-K8T-Neo2Fir.  Because it</div><div class='add'>+ * runs everywhere at present we suppress the printk output in most</div><div class='add'>+ * irrelevant cases.</div><div class='ctx'>  */</div><div class='ctx'> static void __init k8t_sound_hostbridge(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "PCI: Quirk-MSI-K8T Soundcard On\n");</div><div class='ctx'> 	pci_read_config_byte(dev, 0x50, &amp;val);</div><div class='ctx'> 	if (val == 0x88 || val == 0xc8) {</div><div class='add'>+		/* Assume it's probably a MSI-K8T-Neo2Fir */</div><div class='add'>+		printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, attempting to turn soundcard ON\n");</div><div class='ctx'> 		pci_write_config_byte(dev, 0x50, val &amp; (~0x40));</div><div class='ctx'> </div><div class='ctx'> 		/* Verify the Change for Status output */</div><div class='ctx'> 		pci_read_config_byte(dev, 0x50, &amp;val);</div><div class='ctx'> 		if (val &amp; 0x40)</div><div class='del'>-			printk(KERN_INFO "PCI: MSI-K8T soundcard still off\n");</div><div class='add'>+			printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, soundcard still off\n");</div><div class='ctx'> 		else</div><div class='del'>-			printk(KERN_INFO "PCI: MSI-K8T soundcard on\n");</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_INFO "PCI: Unexpected Value in PCI-Register: "</div><div class='del'>-					"no Change!\n");</div><div class='add'>+			printk(KERN_INFO "PCI: MSI-K8T-Neo2Fir, soundcard on\n");</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);</div><div class='ctx'> </div><div class='hunk'>@@ -1161,6 +1202,55 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_962,		quirk_sis_96x_</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_SCSI_SATA) || defined(CONFIG_SCSI_SATA_MODULE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	If we are using libata we can drive this chip properly but must</div><div class='add'>+ *	do this early on to make the additional device appear during</div><div class='add'>+ *	the PCI scanning.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void __devinit quirk_jmicron_dualfn(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u32 conf;</div><div class='add'>+	u8 hdr;</div><div class='add'>+</div><div class='add'>+	/* Only poke fn 0 */</div><div class='add'>+	if (PCI_FUNC(pdev-&gt;devfn))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch(pdev-&gt;device) {</div><div class='add'>+		case PCI_DEVICE_ID_JMICRON_JMB365:</div><div class='add'>+		case PCI_DEVICE_ID_JMICRON_JMB366:</div><div class='add'>+			/* Redirect IDE second PATA port to the right spot */</div><div class='add'>+			pci_read_config_dword(pdev, 0x80, &amp;conf);</div><div class='add'>+			conf |= (1 &lt;&lt; 24);</div><div class='add'>+			/* Fall through */</div><div class='add'>+			pci_write_config_dword(pdev, 0x80, conf);</div><div class='add'>+		case PCI_DEVICE_ID_JMICRON_JMB361:</div><div class='add'>+		case PCI_DEVICE_ID_JMICRON_JMB363:</div><div class='add'>+			pci_read_config_dword(pdev, 0x40, &amp;conf);</div><div class='add'>+			/* Enable dual function mode, AHCI on fn 0, IDE fn1 */</div><div class='add'>+			/* Set the class codes correctly and then direct IDE 0 */</div><div class='add'>+			conf &amp;= ~0x000F0200;	/* Clear bit 9 and 16-19 */</div><div class='add'>+			conf |=  0x00C20002;	/* Set bit 1, 17, 22, 23 */</div><div class='add'>+			pci_write_config_dword(pdev, 0x40, conf);</div><div class='add'>+</div><div class='add'>+			/* Reconfigure so that the PCI scanner discovers the</div><div class='add'>+			   device is now multifunction */</div><div class='add'>+</div><div class='add'>+			pci_read_config_byte(pdev, PCI_HEADER_TYPE, &amp;hdr);</div><div class='add'>+			pdev-&gt;hdr_type = hdr &amp; 0x7f;</div><div class='add'>+			pdev-&gt;multifunction = !!(hdr &amp; 0x80);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_X86_IO_APIC</div><div class='ctx'> static void __init quirk_alder_ioapic(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1328,6 +1418,37 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_PXH_0,	quirk_pc</div><div class='ctx'> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_PXH_1,	quirk_pcie_pxh);</div><div class='ctx'> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_PXHV,	quirk_pcie_pxh);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Some Intel PCI Express chipsets have trouble with downstream</div><div class='add'>+ * device power management.</div><div class='add'>+ */</div><div class='add'>+static void quirk_intel_pcie_pm(struct pci_dev * dev)</div><div class='add'>+{</div><div class='add'>+	pci_pm_d3_delay = 120;</div><div class='add'>+	dev-&gt;no_d1d2 = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25e2, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25e3, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25e4, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25e5, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25e6, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25e7, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25f7, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25f8, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25f9, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x25fa, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2601, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2602, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2603, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2604, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2605, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2606, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2607, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2608, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x2609, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x260a, quirk_intel_pcie_pm);</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	0x260b, quirk_intel_pcie_pm);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Fixup the cardbus bridges on the IBM Dock II docking station</div><div class='hunk'>@@ -1485,6 +1606,25 @@ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	0x1460,		quirk_p64h2_1k_io);</div><div class='ctx'> </div><div class='add'>+/* Under some circumstances, AER is not linked with extended capabilities.</div><div class='add'>+ * Force it to be linked by setting the corresponding control bit in the</div><div class='add'>+ * config space.</div><div class='add'>+ */</div><div class='add'>+static void __devinit quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)</div><div class='add'>+{</div><div class='add'>+	uint8_t b;</div><div class='add'>+	if (pci_read_config_byte(dev, 0xf41, &amp;b) == 0) {</div><div class='add'>+		if (!(b &amp; 0x20)) {</div><div class='add'>+			pci_write_config_byte(dev, 0xf41, b | 0x20);</div><div class='add'>+			printk(KERN_INFO</div><div class='add'>+			       "PCI: Linking AER extended capability on %s\n",</div><div class='add'>+			       pci_name(dev));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,</div><div class='add'>+			quirk_nvidia_ck804_pcie_aer_ext_cap);</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(pcie_mch_quirk);</div><div class='ctx'> #ifdef CONFIG_HOTPLUG</div><div class='ctx'> EXPORT_SYMBOL(pci_fixup_device);</div><div class='head'>diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c<br/>index 1a6bf9de166f..99ffbd478b29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/remove.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/remove.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/remove.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/remove.c</a></div><div class='hunk'>@@ -22,18 +22,18 @@ static void pci_destroy_dev(struct pci_dev *dev)</div><div class='ctx'> 		pci_proc_detach_device(dev);</div><div class='ctx'> 		pci_remove_sysfs_dev_files(dev);</div><div class='ctx'> 		device_unregister(&amp;dev-&gt;dev);</div><div class='del'>-		spin_lock(&amp;pci_bus_lock);</div><div class='add'>+		down_write(&amp;pci_bus_sem);</div><div class='ctx'> 		list_del(&amp;dev-&gt;global_list);</div><div class='ctx'> 		dev-&gt;global_list.next = dev-&gt;global_list.prev = NULL;</div><div class='del'>-		spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+		up_write(&amp;pci_bus_sem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Remove the device from the device lists, and prevent any further</div><div class='ctx'> 	 * list accesses from this device */</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_write(&amp;pci_bus_sem);</div><div class='ctx'> 	list_del(&amp;dev-&gt;bus_list);</div><div class='ctx'> 	dev-&gt;bus_list.next = dev-&gt;bus_list.prev = NULL;</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_write(&amp;pci_bus_sem);</div><div class='ctx'> </div><div class='ctx'> 	pci_free_resources(dev);</div><div class='ctx'> 	pci_dev_put(dev);</div><div class='hunk'>@@ -62,9 +62,9 @@ void pci_remove_bus(struct pci_bus *pci_bus)</div><div class='ctx'> {</div><div class='ctx'> 	pci_proc_detach_bus(pci_bus);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_write(&amp;pci_bus_sem);</div><div class='ctx'> 	list_del(&amp;pci_bus-&gt;node);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_write(&amp;pci_bus_sem);</div><div class='ctx'> 	pci_remove_legacy_files(pci_bus);</div><div class='ctx'> 	class_device_remove_file(&amp;pci_bus-&gt;class_dev,</div><div class='ctx'> 		&amp;class_device_attr_cpuaffinity);</div><div class='head'>diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c<br/>index 598a115cd00e..f5ee7ce16fa6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/rom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/rom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/rom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/rom.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * PCI ROM access routines</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -80,8 +79,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_ROM_COPY) {</div><div class='ctx'> 			*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);</div><div class='del'>-			return (void __iomem *)pci_resource_start(pdev,</div><div class='del'>-							     PCI_ROM_RESOURCE);</div><div class='add'>+			return (void __iomem *)(unsigned long)</div><div class='add'>+				pci_resource_start(pdev, PCI_ROM_RESOURCE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* assign the ROM an address if it doesn't have one */</div><div class='ctx'> 			if (res-&gt;parent == NULL &amp;&amp;</div><div class='hunk'>@@ -170,11 +169,11 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)</div><div class='ctx'> 		return rom;</div><div class='ctx'> </div><div class='ctx'> 	res-&gt;end = res-&gt;start + *size;</div><div class='del'>-	memcpy_fromio((void*)res-&gt;start, rom, *size);</div><div class='add'>+	memcpy_fromio((void*)(unsigned long)res-&gt;start, rom, *size);</div><div class='ctx'> 	pci_unmap_rom(pdev, rom);</div><div class='ctx'> 	res-&gt;flags |= IORESOURCE_ROM_COPY;</div><div class='ctx'> </div><div class='del'>-	return (void __iomem *)res-&gt;start;</div><div class='add'>+	return (void __iomem *)(unsigned long)res-&gt;start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -227,7 +226,7 @@ void pci_cleanup_rom(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res = &amp;pdev-&gt;resource[PCI_ROM_RESOURCE];</div><div class='ctx'> 	if (res-&gt;flags &amp; IORESOURCE_ROM_COPY) {</div><div class='del'>-		kfree((void*)res-&gt;start);</div><div class='add'>+		kfree((void*)(unsigned long)res-&gt;start);</div><div class='ctx'> 		res-&gt;flags &amp;= ~IORESOURCE_ROM_COPY;</div><div class='ctx'> 		res-&gt;start = 0;</div><div class='ctx'> 		res-&gt;end = 0;</div><div class='head'>diff --git a/drivers/pci/search.c b/drivers/pci/search.c<br/>index ce7dd6e7be60..622b3f8ba820 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/search.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/search.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/search.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/search.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include "pci.h"</div><div class='ctx'> </div><div class='del'>-DEFINE_SPINLOCK(pci_bus_lock);</div><div class='add'>+DECLARE_RWSEM(pci_bus_sem);</div><div class='ctx'> </div><div class='ctx'> static struct pci_bus * __devinit</div><div class='ctx'> pci_do_find_bus(struct pci_bus* bus, unsigned char busnr)</div><div class='hunk'>@@ -72,11 +72,11 @@ pci_find_next_bus(const struct pci_bus *from)</div><div class='ctx'> 	struct pci_bus *b = NULL;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	n = from ? from-&gt;node.next : pci_root_buses.next;</div><div class='ctx'> 	if (n != &amp;pci_root_buses)</div><div class='ctx'> 		b = pci_bus_b(n);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	return b;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,7 @@ struct pci_dev * pci_get_slot(struct pci_bus *bus, unsigned int devfn)</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each(tmp, &amp;bus-&gt;devices) {</div><div class='ctx'> 		dev = pci_dev_b(tmp);</div><div class='hunk'>@@ -135,7 +135,7 @@ struct pci_dev * pci_get_slot(struct pci_bus *bus, unsigned int devfn)</div><div class='ctx'> 	dev = NULL;</div><div class='ctx'>  out:</div><div class='ctx'> 	pci_dev_get(dev);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +167,7 @@ static struct pci_dev * pci_find_subsys(unsigned int vendor,</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	n = from ? from-&gt;global_list.next : pci_devices.next;</div><div class='ctx'> </div><div class='ctx'> 	while (n &amp;&amp; (n != &amp;pci_devices)) {</div><div class='hunk'>@@ -181,7 +181,7 @@ static struct pci_dev * pci_find_subsys(unsigned int vendor,</div><div class='ctx'> 	}</div><div class='ctx'> 	dev = NULL;</div><div class='ctx'> exit:</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +232,7 @@ pci_get_subsys(unsigned int vendor, unsigned int device,</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	n = from ? from-&gt;global_list.next : pci_devices.next;</div><div class='ctx'> </div><div class='ctx'> 	while (n &amp;&amp; (n != &amp;pci_devices)) {</div><div class='hunk'>@@ -247,7 +247,7 @@ pci_get_subsys(unsigned int vendor, unsigned int device,</div><div class='ctx'> 	dev = NULL;</div><div class='ctx'> exit:</div><div class='ctx'> 	dev = pci_dev_get(dev);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	pci_dev_put(from);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='hunk'>@@ -292,7 +292,7 @@ pci_find_device_reverse(unsigned int vendor, unsigned int device, const struct p</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	n = from ? from-&gt;global_list.prev : pci_devices.prev;</div><div class='ctx'> </div><div class='ctx'> 	while (n &amp;&amp; (n != &amp;pci_devices)) {</div><div class='hunk'>@@ -304,7 +304,7 @@ pci_find_device_reverse(unsigned int vendor, unsigned int device, const struct p</div><div class='ctx'> 	}</div><div class='ctx'> 	dev = NULL;</div><div class='ctx'> exit:</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +328,7 @@ struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from)</div><div class='ctx'> 	struct pci_dev *dev;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	n = from ? from-&gt;global_list.next : pci_devices.next;</div><div class='ctx'> </div><div class='ctx'> 	while (n &amp;&amp; (n != &amp;pci_devices)) {</div><div class='hunk'>@@ -340,7 +340,7 @@ struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from)</div><div class='ctx'> 	dev = NULL;</div><div class='ctx'> exit:</div><div class='ctx'> 	dev = pci_dev_get(dev);</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	pci_dev_put(from);</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='hunk'>@@ -362,7 +362,7 @@ int pci_dev_present(const struct pci_device_id *ids)</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(in_interrupt());</div><div class='del'>-	spin_lock(&amp;pci_bus_lock);</div><div class='add'>+	down_read(&amp;pci_bus_sem);</div><div class='ctx'> 	while (ids-&gt;vendor || ids-&gt;subvendor || ids-&gt;class_mask) {</div><div class='ctx'> 		list_for_each_entry(dev, &amp;pci_devices, global_list) {</div><div class='ctx'> 			if (pci_match_one_device(ids, dev)) {</div><div class='hunk'>@@ -372,8 +372,8 @@ int pci_dev_present(const struct pci_device_id *ids)</div><div class='ctx'> 		}</div><div class='ctx'> 		ids++;</div><div class='ctx'> 	}</div><div class='del'>-exit:				</div><div class='del'>-	spin_unlock(&amp;pci_bus_lock);</div><div class='add'>+exit:</div><div class='add'>+	up_read(&amp;pci_bus_sem);</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pci_dev_present);</div><div class='head'>diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c<br/>index 28ce3a7ee434..47c1071ad84e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/setup-bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/setup-bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/setup-bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/setup-bus.c</a></div><div class='hunk'>@@ -55,9 +55,10 @@ pbus_assign_resources_sorted(struct pci_bus *bus)</div><div class='ctx'> 	list_for_each_entry(dev, &amp;bus-&gt;devices, bus_list) {</div><div class='ctx'> 		u16 class = dev-&gt;class &gt;&gt; 8;</div><div class='ctx'> </div><div class='del'>-		/* Don't touch classless devices and host bridges.  */</div><div class='add'>+		/* Don't touch classless devices or host bridges or ioapics.  */</div><div class='ctx'> 		if (class == PCI_CLASS_NOT_DEFINED ||</div><div class='del'>-		    class == PCI_CLASS_BRIDGE_HOST)</div><div class='add'>+		    class == PCI_CLASS_BRIDGE_HOST ||</div><div class='add'>+		    class == PCI_CLASS_SYSTEM_PIC)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		pdev_sort_resources(dev, &amp;head);</div><div class='hunk'>@@ -356,8 +357,10 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)</div><div class='ctx'> 			order = __ffs(align) - 20;</div><div class='ctx'> 			if (order &gt; 11) {</div><div class='ctx'> 				printk(KERN_WARNING "PCI: region %s/%d "</div><div class='del'>-				       "too large: %lx-%lx\n",</div><div class='del'>-				       pci_name(dev), i, r-&gt;start, r-&gt;end);</div><div class='add'>+				       "too large: %llx-%llx\n",</div><div class='add'>+					pci_name(dev), i,</div><div class='add'>+					(unsigned long long)r-&gt;start,</div><div class='add'>+					(unsigned long long)r-&gt;end);</div><div class='ctx'> 				r-&gt;flags = 0;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c<br/>index ea9277b7f899..ab78e4bbdd83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pci/setup-res.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pci/setup-res.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pci/setup-res.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pci/setup-res.c</a></div><div class='hunk'>@@ -40,8 +40,9 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)</div><div class='ctx'> </div><div class='ctx'> 	pcibios_resource_to_bus(dev, &amp;region, res);</div><div class='ctx'> </div><div class='del'>-	pr_debug("  got res [%lx:%lx] bus [%lx:%lx] flags %lx for "</div><div class='del'>-		 "BAR %d of %s\n", res-&gt;start, res-&gt;end,</div><div class='add'>+	pr_debug("  got res [%llx:%llx] bus [%lx:%lx] flags %lx for "</div><div class='add'>+		 "BAR %d of %s\n", (unsigned long long)res-&gt;start,</div><div class='add'>+		 (unsigned long long)res-&gt;end,</div><div class='ctx'> 		 region.start, region.end, res-&gt;flags, resno, pci_name(dev));</div><div class='ctx'> </div><div class='ctx'> 	new = region.start | (res-&gt;flags &amp; PCI_REGION_FLAG_MASK);</div><div class='hunk'>@@ -104,10 +105,12 @@ pci_claim_resource(struct pci_dev *dev, int resource)</div><div class='ctx'> 		err = insert_resource(root, res);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "PCI: %s region %d of %s %s [%lx:%lx]\n",</div><div class='del'>-		       root ? "Address space collision on" :</div><div class='del'>-			      "No parent found for",</div><div class='del'>-		       resource, dtype, pci_name(dev), res-&gt;start, res-&gt;end);</div><div class='add'>+		printk(KERN_ERR "PCI: %s region %d of %s %s [%llx:%llx]\n",</div><div class='add'>+			root ? "Address space collision on" :</div><div class='add'>+				"No parent found for",</div><div class='add'>+			resource, dtype, pci_name(dev),</div><div class='add'>+			(unsigned long long)res-&gt;start,</div><div class='add'>+			(unsigned long long)res-&gt;end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -118,7 +121,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_bus *bus = dev-&gt;bus;</div><div class='ctx'> 	struct resource *res = dev-&gt;resource + resno;</div><div class='del'>-	unsigned long size, min, align;</div><div class='add'>+	resource_size_t size, min, align;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	size = res-&gt;end - res-&gt;start + 1;</div><div class='hunk'>@@ -145,9 +148,11 @@ int pci_assign_resource(struct pci_dev *dev, int resno)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		printk(KERN_ERR "PCI: Failed to allocate %s resource #%d:%lx@%lx for %s\n",</div><div class='del'>-		       res-&gt;flags &amp; IORESOURCE_IO ? "I/O" : "mem",</div><div class='del'>-		       resno, size, res-&gt;start, pci_name(dev));</div><div class='add'>+		printk(KERN_ERR "PCI: Failed to allocate %s resource "</div><div class='add'>+			"#%d:%llx@%llx for %s\n",</div><div class='add'>+			res-&gt;flags &amp; IORESOURCE_IO ? "I/O" : "mem",</div><div class='add'>+			resno, (unsigned long long)size,</div><div class='add'>+			(unsigned long long)res-&gt;start, pci_name(dev));</div><div class='ctx'> 	} else if (resno &lt; PCI_BRIDGE_RESOURCES) {</div><div class='ctx'> 		pci_update_resource(dev, res, resno);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -155,6 +160,46 @@ int pci_assign_resource(struct pci_dev *dev, int resno)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_EMBEDDED</div><div class='add'>+int pci_assign_resource_fixed(struct pci_dev *dev, int resno)</div><div class='add'>+{</div><div class='add'>+	struct pci_bus *bus = dev-&gt;bus;</div><div class='add'>+	struct resource *res = dev-&gt;resource + resno;</div><div class='add'>+	unsigned int type_mask;</div><div class='add'>+	int i, ret = -EBUSY;</div><div class='add'>+</div><div class='add'>+	type_mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PCI_BUS_NUM_RESOURCES; i++) {</div><div class='add'>+		struct resource *r = bus-&gt;resource[i];</div><div class='add'>+		if (!r)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* type_mask must match */</div><div class='add'>+		if ((res-&gt;flags ^ r-&gt;flags) &amp; type_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = request_resource(r, res);</div><div class='add'>+</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "PCI: Failed to allocate %s resource "</div><div class='add'>+				"#%d:%llx@%llx for %s\n",</div><div class='add'>+			res-&gt;flags &amp; IORESOURCE_IO ? "I/O" : "mem",</div><div class='add'>+			resno, (unsigned long long)(res-&gt;end - res-&gt;start + 1),</div><div class='add'>+			(unsigned long long)res-&gt;start, pci_name(dev));</div><div class='add'>+	} else if (resno &lt; PCI_BRIDGE_RESOURCES) {</div><div class='add'>+		pci_update_resource(dev, res, resno);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pci_assign_resource_fixed);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Sort resources by alignment */</div><div class='ctx'> void __devinit</div><div class='ctx'> pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)</div><div class='hunk'>@@ -164,7 +209,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)</div><div class='ctx'> 	for (i = 0; i &lt; PCI_NUM_RESOURCES; i++) {</div><div class='ctx'> 		struct resource *r;</div><div class='ctx'> 		struct resource_list *list, *tmp;</div><div class='del'>-		unsigned long r_align;</div><div class='add'>+		resource_size_t r_align;</div><div class='ctx'> </div><div class='ctx'> 		r = &amp;dev-&gt;resource[i];</div><div class='ctx'> 		r_align = r-&gt;end - r-&gt;start;</div><div class='hunk'>@@ -173,13 +218,14 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!r_align) {</div><div class='ctx'> 			printk(KERN_WARNING "PCI: Ignore bogus resource %d "</div><div class='del'>-					    "[%lx:%lx] of %s\n",</div><div class='del'>-					    i, r-&gt;start, r-&gt;end, pci_name(dev));</div><div class='add'>+				"[%llx:%llx] of %s\n",</div><div class='add'>+				i, (unsigned long long)r-&gt;start,</div><div class='add'>+				(unsigned long long)r-&gt;end, pci_name(dev));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		r_align = (i &lt; PCI_BRIDGE_RESOURCES) ? r_align + 1 : r-&gt;start;</div><div class='ctx'> 		for (list = head; ; list = list-&gt;next) {</div><div class='del'>-			unsigned long align = 0;</div><div class='add'>+			resource_size_t align = 0;</div><div class='ctx'> 			struct resource_list *ln = list-&gt;next;</div><div class='ctx'> 			int idx;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig<br/>index 61cb4b29f55c..35f88649d3b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support"</div><div class='ctx'> </div><div class='ctx'> config PCCARD</div><div class='ctx'> 	tristate "PCCard (PCMCIA/CardBus) support"</div><div class='del'>-	select HOTPLUG</div><div class='add'>+	depends on HOTPLUG</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  Say Y here if you want to attach PCMCIA- or PC-cards to your Linux</div><div class='ctx'> 	  computer.  These are credit-card size devices such as network cards,</div><div class='head'>diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c<br/>index a4d50940ebeb..40569f40e90e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/at91_cf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/at91_cf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/at91_cf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/at91_cf.c</a></div><div class='hunk'>@@ -214,11 +214,10 @@ static struct pccard_operations at91_cf_ops = {</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int __init at91_cf_probe(struct device *dev)</div><div class='add'>+static int __init at91_cf_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91_cf_socket	*cf;</div><div class='del'>-	struct at91_cf_data	*board = dev-&gt;platform_data;</div><div class='del'>-	struct platform_device	*pdev = to_platform_device(dev);</div><div class='add'>+	struct at91_cf_data	*board = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct resource		*io;</div><div class='ctx'> 	unsigned int		csa;</div><div class='ctx'> 	int			status;</div><div class='hunk'>@@ -236,7 +235,7 @@ static int __init at91_cf_probe(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	cf-&gt;board = board;</div><div class='ctx'> 	cf-&gt;pdev = pdev;</div><div class='del'>-	dev_set_drvdata(dev, cf);</div><div class='add'>+	platform_set_drvdata(pdev, cf);</div><div class='ctx'> </div><div class='ctx'> 	/* CF takes over CS4, CS5, CS6 */</div><div class='ctx'> 	csa = at91_sys_read(AT91_EBI_CSA);</div><div class='hunk'>@@ -268,9 +267,10 @@ static int __init at91_cf_probe(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* must be a GPIO; ergo must trigger on both edges */</div><div class='ctx'> 	status = request_irq(board-&gt;det_pin, at91_cf_irq,</div><div class='del'>-			SA_SAMPLE_RANDOM, driver_name, cf);</div><div class='add'>+			IRQF_SAMPLE_RANDOM, driver_name, cf);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto fail0;</div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The card driver will request this irq later as needed.</div><div class='hunk'>@@ -280,7 +280,7 @@ static int __init at91_cf_probe(struct device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (board-&gt;irq_pin) {</div><div class='ctx'> 		status = request_irq(board-&gt;irq_pin, at91_cf_irq,</div><div class='del'>-				SA_SHIRQ, driver_name, cf);</div><div class='add'>+				IRQF_SHARED, driver_name, cf);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			goto fail0a;</div><div class='ctx'> 		cf-&gt;socket.pci_irq = board-&gt;irq_pin;</div><div class='hunk'>@@ -301,7 +301,7 @@ static int __init at91_cf_probe(struct device *dev)</div><div class='ctx'> 		board-&gt;det_pin, board-&gt;irq_pin);</div><div class='ctx'> </div><div class='ctx'> 	cf-&gt;socket.owner = THIS_MODULE;</div><div class='del'>-	cf-&gt;socket.dev.dev = dev;</div><div class='add'>+	cf-&gt;socket.dev.dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	cf-&gt;socket.ops = &amp;at91_cf_ops;</div><div class='ctx'> 	cf-&gt;socket.resource_ops = &amp;pccard_static_ops;</div><div class='ctx'> 	cf-&gt;socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP</div><div class='hunk'>@@ -323,21 +323,25 @@ fail1:</div><div class='ctx'> 		free_irq(board-&gt;irq_pin, cf);</div><div class='ctx'> fail0a:</div><div class='ctx'> 	free_irq(board-&gt;det_pin, cf);</div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, 0);</div><div class='ctx'> fail0:</div><div class='ctx'> 	at91_sys_write(AT91_EBI_CSA, csa);</div><div class='ctx'> 	kfree(cf);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __exit at91_cf_remove(struct device *dev)</div><div class='add'>+static int __exit at91_cf_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct at91_cf_socket	*cf = dev_get_drvdata(dev);</div><div class='add'>+	struct at91_cf_socket	*cf = platform_get_drvdata(pdev);</div><div class='add'>+	struct at91_cf_data	*board = cf-&gt;board;</div><div class='ctx'> 	struct resource		*io = cf-&gt;socket.io[0].res;</div><div class='ctx'> 	unsigned int		csa;</div><div class='ctx'> </div><div class='ctx'> 	pcmcia_unregister_socket(&amp;cf-&gt;socket);</div><div class='del'>-	free_irq(cf-&gt;board-&gt;irq_pin, cf);</div><div class='del'>-	free_irq(cf-&gt;board-&gt;det_pin, cf);</div><div class='add'>+	if (board-&gt;irq_pin)</div><div class='add'>+		free_irq(board-&gt;irq_pin, cf);</div><div class='add'>+	free_irq(board-&gt;det_pin, cf);</div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, 0);</div><div class='ctx'> 	iounmap((void __iomem *) cf-&gt;socket.io_offset);</div><div class='ctx'> 	release_mem_region(io-&gt;start, io-&gt;end + 1 - io-&gt;start);</div><div class='ctx'> </div><div class='hunk'>@@ -348,26 +352,65 @@ static int __exit at91_cf_remove(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_driver at91_cf_driver = {</div><div class='del'>-	.name		= (char *) driver_name,</div><div class='del'>-	.bus		= &amp;platform_bus_type,</div><div class='add'>+#ifdef	CONFIG_PM</div><div class='add'>+</div><div class='add'>+static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg)</div><div class='add'>+{</div><div class='add'>+	struct at91_cf_socket	*cf = platform_get_drvdata(pdev);</div><div class='add'>+	struct at91_cf_data	*board = cf-&gt;board;</div><div class='add'>+</div><div class='add'>+	pcmcia_socket_dev_suspend(&amp;pdev-&gt;dev, mesg);</div><div class='add'>+	if (device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='add'>+		enable_irq_wake(board-&gt;det_pin);</div><div class='add'>+	else {</div><div class='add'>+		disable_irq_wake(board-&gt;det_pin);</div><div class='add'>+		disable_irq(board-&gt;det_pin);</div><div class='add'>+	}</div><div class='add'>+	if (board-&gt;irq_pin)</div><div class='add'>+		disable_irq(board-&gt;irq_pin);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at91_cf_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct at91_cf_socket	*cf = platform_get_drvdata(pdev);</div><div class='add'>+	struct at91_cf_data	*board = cf-&gt;board;</div><div class='add'>+</div><div class='add'>+	if (board-&gt;irq_pin)</div><div class='add'>+		enable_irq(board-&gt;irq_pin);</div><div class='add'>+	if (!device_may_wakeup(&amp;pdev-&gt;dev))</div><div class='add'>+		enable_irq(board-&gt;det_pin);</div><div class='add'>+	pcmcia_socket_dev_resume(&amp;pdev-&gt;dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+#define	at91_cf_suspend		NULL</div><div class='add'>+#define	at91_cf_resume		NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver at91_cf_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= (char *) driver_name,</div><div class='add'>+		.owner		= THIS_MODULE,</div><div class='add'>+	},</div><div class='ctx'> 	.probe		= at91_cf_probe,</div><div class='ctx'> 	.remove		= __exit_p(at91_cf_remove),</div><div class='del'>-	.suspend	= pcmcia_socket_dev_suspend,</div><div class='del'>-	.resume		= pcmcia_socket_dev_resume,</div><div class='add'>+	.suspend	= at91_cf_suspend,</div><div class='add'>+	.resume		= at91_cf_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*--------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static int __init at91_cf_init(void)</div><div class='ctx'> {</div><div class='del'>-	return driver_register(&amp;at91_cf_driver);</div><div class='add'>+	return platform_driver_register(&amp;at91_cf_driver);</div><div class='ctx'> }</div><div class='ctx'> module_init(at91_cf_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit at91_cf_exit(void)</div><div class='ctx'> {</div><div class='del'>-	driver_unregister(&amp;at91_cf_driver);</div><div class='add'>+	platform_driver_unregister(&amp;at91_cf_driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(at91_cf_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/au1000_db1x00.c b/drivers/pcmcia/au1000_db1x00.c<br/>index abc13f28ba3f..74e051535d6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_db1x00.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_db1x00.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_db1x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/au1000_db1x00.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -296,7 +295,7 @@ struct pcmcia_low_level db1x00_pcmcia_ops = {</div><div class='ctx'> 	.socket_suspend		= db1x00_socket_suspend</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init au1x_board_init(struct device *dev)</div><div class='add'>+int au1x_board_init(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> 	bcsr-&gt;pcmcia = 0; /* turn off power, if it's not already off */</div><div class='head'>diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c<br/>index 971a35281649..d5dd0ce65536 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/au1000_generic.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h<br/>index f2c970b5f4ff..1e467bb54077 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_generic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_generic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_generic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/au1000_generic.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #define __ASM_AU1000_PCMCIA_H</div><div class='ctx'> </div><div class='ctx'> /* include the world */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;pcmcia/cs_types.h&gt;</div><div class='ctx'> #include &lt;pcmcia/cs.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/au1000_pb1x00.c b/drivers/pcmcia/au1000_pb1x00.c<br/>index fd5522ede867..86c0808d6a05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_pb1x00.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/au1000_pb1x00.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/au1000_pb1x00.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/au1000_pb1x00.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *  with this program; if not, write to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c<br/>index 3162998579c1..f9cd831a3f31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/cs.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +177,7 @@ static int pccardd(void *__skt);</div><div class='ctx'>  */</div><div class='ctx'> int pcmcia_register_socket(struct pcmcia_socket *socket)</div><div class='ctx'> {</div><div class='add'>+	struct task_struct *tsk;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!socket || !socket-&gt;ops || !socket-&gt;dev.dev || !socket-&gt;resource_ops)</div><div class='hunk'>@@ -239,15 +241,18 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)</div><div class='ctx'> 	mutex_init(&amp;socket-&gt;skt_mutex);</div><div class='ctx'> 	spin_lock_init(&amp;socket-&gt;thread_lock);</div><div class='ctx'> </div><div class='del'>-	ret = kernel_thread(pccardd, socket, CLONE_KERNEL);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	tsk = kthread_run(pccardd, socket, "pccardd");</div><div class='add'>+	if (IS_ERR(tsk)) {</div><div class='add'>+		ret = PTR_ERR(tsk);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;socket-&gt;thread_done);</div><div class='del'>-	if(!socket-&gt;thread) {</div><div class='add'>+	if (!socket-&gt;thread) {</div><div class='ctx'> 		printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	pcmcia_parse_events(socket, SS_DETECT);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -272,10 +277,8 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)</div><div class='ctx'> 	cs_dbg(socket, 0, "pcmcia_unregister_socket(0x%p)\n", socket-&gt;ops);</div><div class='ctx'> </div><div class='ctx'> 	if (socket-&gt;thread) {</div><div class='del'>-		init_completion(&amp;socket-&gt;thread_done);</div><div class='del'>-		socket-&gt;thread = NULL;</div><div class='ctx'> 		wake_up(&amp;socket-&gt;thread_wait);</div><div class='del'>-		wait_for_completion(&amp;socket-&gt;thread_done);</div><div class='add'>+		kthread_stop(socket-&gt;thread);</div><div class='ctx'> 	}</div><div class='ctx'> 	release_cis_mem(socket);</div><div class='ctx'> </div><div class='hunk'>@@ -630,8 +633,6 @@ static int pccardd(void *__skt)</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	daemonize("pccardd");</div><div class='del'>-</div><div class='ctx'> 	skt-&gt;thread = current;</div><div class='ctx'> 	skt-&gt;socket = dead_socket;</div><div class='ctx'> 	skt-&gt;ops-&gt;init(skt);</div><div class='hunk'>@@ -643,7 +644,8 @@ static int pccardd(void *__skt)</div><div class='ctx'> 		printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n",</div><div class='ctx'> 			skt);</div><div class='ctx'> 		skt-&gt;thread = NULL;</div><div class='del'>-		complete_and_exit(&amp;skt-&gt;thread_done, 0);</div><div class='add'>+		complete(&amp;skt-&gt;thread_done);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue(&amp;skt-&gt;thread_wait, &amp;wait);</div><div class='hunk'>@@ -674,7 +676,7 @@ static int pccardd(void *__skt)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!skt-&gt;thread)</div><div class='add'>+		if (kthread_should_stop())</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		schedule();</div><div class='hunk'>@@ -688,7 +690,7 @@ static int pccardd(void *__skt)</div><div class='ctx'> 	/* remove from the device core */</div><div class='ctx'> 	class_device_unregister(&amp;skt-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	complete_and_exit(&amp;skt-&gt;thread_done, 0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -697,11 +699,12 @@ static int pccardd(void *__skt)</div><div class='ctx'>  */</div><div class='ctx'> void pcmcia_parse_events(struct pcmcia_socket *s, u_int events)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	cs_dbg(s, 4, "parse_events: events %08x\n", events);</div><div class='ctx'> 	if (s-&gt;thread) {</div><div class='del'>-		spin_lock(&amp;s-&gt;thread_lock);</div><div class='add'>+		spin_lock_irqsave(&amp;s-&gt;thread_lock, flags);</div><div class='ctx'> 		s-&gt;thread_events |= events;</div><div class='del'>-		spin_unlock(&amp;s-&gt;thread_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;s-&gt;thread_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		wake_up(&amp;s-&gt;thread_wait);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c<br/>index 48d3b3d30c21..74b3124e8247 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/ds.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/ds.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/ds.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/ds.c</a></div><div class='hunk'>@@ -1143,6 +1143,12 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_socket *s = pcmcia_get_socket(skt);</div><div class='ctx'> </div><div class='add'>+	if (!s) {</div><div class='add'>+		printk(KERN_ERR "PCMCIA obtaining reference to socket %p " \</div><div class='add'>+			"failed, event 0x%x lost!\n", skt, event);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ds_dbg(1, "ds_event(0x%06x, %d, 0x%p)\n",</div><div class='ctx'> 	       event, priority, skt);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c<br/>index b39435bbfaeb..ad02629c8be2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/hd64465_ss.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/hd64465_ss.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/hd64465_ss.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/hd64465_ss.c</a></div><div class='hunk'>@@ -244,8 +244,8 @@ static void hs_map_irq(hs_socket_t *sp, unsigned int irq)</div><div class='ctx'> </div><div class='ctx'>     	hs_mapped_irq[irq].sock = sp;</div><div class='ctx'> 	/* insert ourselves as the irq controller */</div><div class='del'>-	hs_mapped_irq[irq].old_handler = irq_desc[irq].handler;</div><div class='del'>-	irq_desc[irq].handler = &amp;hd64465_ss_irq_type;</div><div class='add'>+	hs_mapped_irq[irq].old_handler = irq_desc[irq].chip;</div><div class='add'>+	irq_desc[irq].chip = &amp;hd64465_ss_irq_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +260,7 @@ static void hs_unmap_irq(hs_socket_t *sp, unsigned int irq)</div><div class='ctx'> 	    return;</div><div class='ctx'> 		</div><div class='ctx'> 	/* restore the original irq controller */</div><div class='del'>-	irq_desc[irq].handler = hs_mapped_irq[irq].old_handler;</div><div class='add'>+	irq_desc[irq].chip = hs_mapped_irq[irq].old_handler;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*============================================================*/</div><div class='hunk'>@@ -761,7 +761,7 @@ static int hs_init_socket(hs_socket_t *sp, int irq, unsigned long mem_base,</div><div class='ctx'> 	</div><div class='ctx'> 	hd64465_register_irq_demux(sp-&gt;irq, hs_irq_demux, sp);</div><div class='ctx'> 	</div><div class='del'>-    	if ((err = request_irq(sp-&gt;irq, hs_interrupt, SA_INTERRUPT, MODNAME, sp)) &lt; 0)</div><div class='add'>+    	if ((err = request_irq(sp-&gt;irq, hs_interrupt, IRQF_DISABLED, MODNAME, sp)) &lt; 0)</div><div class='ctx'> 	    return err;</div><div class='ctx'>     	if (request_mem_region(sp-&gt;mem_base, sp-&gt;mem_length, MODNAME) == 0) {</div><div class='ctx'>     	    sp-&gt;mem_base = 0;</div><div class='head'>diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c<br/>index d5f03a338c6c..2163aa75a257 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/i82092.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/i82092.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/i82092.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/i82092.c</a></div><div class='hunk'>@@ -149,7 +149,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de</div><div class='ctx'> </div><div class='ctx'> 	/* Register the interrupt handler */</div><div class='ctx'> 	dprintk(KERN_DEBUG "Requesting interrupt %i \n",dev-&gt;irq);</div><div class='del'>-	if ((ret = request_irq(dev-&gt;irq, i82092aa_interrupt, SA_SHIRQ, "i82092aa", i82092aa_interrupt))) {</div><div class='add'>+	if ((ret = request_irq(dev-&gt;irq, i82092aa_interrupt, IRQF_SHARED, "i82092aa", i82092aa_interrupt))) {</div><div class='ctx'> 		printk(KERN_ERR "i82092aa: Failed to register IRQ %d, aborting\n", dev-&gt;irq);</div><div class='ctx'> 		goto err_out_free_res;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c<br/>index a2f05f485156..1cc2682394b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/i82365.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/i82365.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/i82365.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/i82365.c</a></div><div class='hunk'>@@ -509,7 +509,7 @@ static irqreturn_t i365_count_irq(int irq, void *dev, struct pt_regs *regs)</div><div class='ctx'> static u_int __init test_irq(u_short sock, int irq)</div><div class='ctx'> {</div><div class='ctx'>     debug(2, "  testing ISA irq %d\n", irq);</div><div class='del'>-    if (request_irq(irq, i365_count_irq, SA_PROBEIRQ, "scan",</div><div class='add'>+    if (request_irq(irq, i365_count_irq, IRQF_PROBE_SHARED, "scan",</div><div class='ctx'> 			i365_count_irq) != 0)</div><div class='ctx'> 	return 1;</div><div class='ctx'>     irq_hits = 0; irq_sock = sock;</div><div class='hunk'>@@ -562,7 +562,7 @@ static u_int __init isa_scan(u_short sock, u_int mask0)</div><div class='ctx'>     } else {</div><div class='ctx'> 	/* Fallback: just find interrupts that aren't in use */</div><div class='ctx'> 	for (i = 0; i &lt; 16; i++)</div><div class='del'>-	    if ((mask0 &amp; (1 &lt;&lt; i)) &amp;&amp; (_check_irq(i, SA_PROBEIRQ) == 0))</div><div class='add'>+	    if ((mask0 &amp; (1 &lt;&lt; i)) &amp;&amp; (_check_irq(i, IRQF_PROBE_SHARED) == 0))</div><div class='ctx'> 		mask1 |= (1 &lt;&lt; i);</div><div class='ctx'> 	printk("default");</div><div class='ctx'> 	/* If scan failed, default to polled status */</div><div class='hunk'>@@ -726,7 +726,7 @@ static void __init add_pcic(int ns, int type)</div><div class='ctx'> 	u_int cs_mask = mask &amp; ((cs_irq) ? (1&lt;&lt;cs_irq) : ~(1&lt;&lt;12));</div><div class='ctx'> 	for (cs_irq = 15; cs_irq &gt; 0; cs_irq--)</div><div class='ctx'> 	    if ((cs_mask &amp; (1 &lt;&lt; cs_irq)) &amp;&amp;</div><div class='del'>-		(_check_irq(cs_irq, SA_PROBEIRQ) == 0))</div><div class='add'>+		(_check_irq(cs_irq, IRQF_PROBE_SHARED) == 0))</div><div class='ctx'> 		break;</div><div class='ctx'> 	if (cs_irq) {</div><div class='ctx'> 	    grab_irq = 1;</div><div class='hunk'>@@ -1084,9 +1084,10 @@ static int i365_set_mem_map(u_short sock, struct pccard_mem_map *mem)</div><div class='ctx'>     u_short base, i;</div><div class='ctx'>     u_char map;</div><div class='ctx'>     </div><div class='del'>-    debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, %#lx-%#lx, "</div><div class='add'>+    debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, %#llx-%#llx, "</div><div class='ctx'> 	  "%#x)\n", sock, mem-&gt;map, mem-&gt;flags, mem-&gt;speed,</div><div class='del'>-	  mem-&gt;res-&gt;start, mem-&gt;res-&gt;end, mem-&gt;card_start);</div><div class='add'>+	  (unsigned long long)mem-&gt;res-&gt;start,</div><div class='add'>+	  (unsigned long long)mem-&gt;res-&gt;end, mem-&gt;card_start);</div><div class='ctx'> </div><div class='ctx'>     map = mem-&gt;map;</div><div class='ctx'>     if ((map &gt; 4) || (mem-&gt;card_start &gt; 0x3ffffff) ||</div><div class='head'>diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c<br/>index 071cf485e1a3..9e768eaef17a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/m32r_cfc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/m32r_cfc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/m32r_cfc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/m32r_cfc.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c<br/>index 70d5f0748d55..61d50b5620dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/m32r_pcc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/m32r_pcc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/m32r_pcc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/m32r_pcc.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c<br/>index 0e07d9535116..d0f68ab8f041 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/m8xx_pcmcia.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/m8xx_pcmcia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/m8xx_pcmcia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/m8xx_pcmcia.c</a></div><div class='hunk'>@@ -157,7 +157,7 @@ MODULE_LICENSE("Dual MPL/GPL");</div><div class='ctx'> </div><div class='ctx'> static int pcmcia_schlvl = PCMCIA_SCHLVL;</div><div class='ctx'> </div><div class='del'>-static spinlock_t events_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(events_lock);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define PCMCIA_SOCKET_KEY_5V 1</div><div class='hunk'>@@ -644,7 +644,7 @@ static struct platform_device m8xx_device = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u32 pending_events[PCMCIA_SOCKETS_NO];</div><div class='del'>-static spinlock_t pending_event_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(pending_event_lock);</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t m8xx_interrupt(int irq, void *dev, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c<br/>index 2c23d7584399..420e10aec0ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/omap_cf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/omap_cf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/omap_cf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/omap_cf.c</a></div><div class='hunk'>@@ -232,7 +232,7 @@ static int __init omap_cf_probe(struct device *dev)</div><div class='ctx'> 	dev_set_drvdata(dev, cf);</div><div class='ctx'> </div><div class='ctx'> 	/* this primarily just shuts up irq handling noise */</div><div class='del'>-	status = request_irq(irq, omap_cf_irq, SA_SHIRQ,</div><div class='add'>+	status = request_irq(irq, omap_cf_irq, IRQF_SHARED,</div><div class='ctx'> 			driver_name, cf);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto fail0;</div><div class='head'>diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c<br/>index 3131bb0a0095..7bf25b88ea31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pcmcia_resource.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/pcmcia_resource.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pcmcia_resource.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/pcmcia_resource.c</a></div><div class='hunk'>@@ -788,6 +788,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	struct pcmcia_socket *s = p_dev-&gt;socket;</div><div class='ctx'> 	config_t *c;</div><div class='ctx'> 	int ret = CS_IN_USE, irq = 0;</div><div class='add'>+	int type;</div><div class='ctx'> </div><div class='ctx'> 	if (!(s-&gt;state &amp; SOCKET_PRESENT))</div><div class='ctx'> 		return CS_NO_CARD;</div><div class='hunk'>@@ -797,6 +798,13 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	if (c-&gt;state &amp; CONFIG_IRQ_REQ)</div><div class='ctx'> 		return CS_IN_USE;</div><div class='ctx'> </div><div class='add'>+	/* Decide what type of interrupt we are registering */</div><div class='add'>+	type = 0;</div><div class='add'>+	if (s-&gt;functions &gt; 1)		/* All of this ought to be handled higher up */</div><div class='add'>+		type = IRQF_SHARED;</div><div class='add'>+	if (req-&gt;Attributes &amp; IRQ_TYPE_DYNAMIC_SHARING)</div><div class='add'>+		type = IRQF_SHARED;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCMCIA_PROBE</div><div class='ctx'> 	if (s-&gt;irq.AssignedIRQ != 0) {</div><div class='ctx'> 		/* If the interrupt is already assigned, it must be the same */</div><div class='hunk'>@@ -822,9 +830,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 			 * marked as used by the kernel resource management core */</div><div class='ctx'> 			ret = request_irq(irq,</div><div class='ctx'> 					  (req-&gt;Attributes &amp; IRQ_HANDLE_PRESENT) ? req-&gt;Handler : test_action,</div><div class='del'>-					  ((req-&gt;Attributes &amp; IRQ_TYPE_DYNAMIC_SHARING) ||</div><div class='del'>-					   (s-&gt;functions &gt; 1) ||</div><div class='del'>-					   (irq == s-&gt;pci_irq)) ? SA_SHIRQ : 0,</div><div class='add'>+					  type,</div><div class='ctx'> 					  p_dev-&gt;devname,</div><div class='ctx'> 					  (req-&gt;Attributes &amp; IRQ_HANDLE_PRESENT) ? req-&gt;Instance : data);</div><div class='ctx'> 			if (!ret) {</div><div class='hunk'>@@ -839,18 +845,21 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)</div><div class='ctx'> 	if (ret &amp;&amp; !s-&gt;irq.AssignedIRQ) {</div><div class='ctx'> 		if (!s-&gt;pci_irq)</div><div class='ctx'> 			return ret;</div><div class='add'>+		type = IRQF_SHARED;</div><div class='ctx'> 		irq = s-&gt;pci_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ret &amp;&amp; req-&gt;Attributes &amp; IRQ_HANDLE_PRESENT) {</div><div class='del'>-		if (request_irq(irq, req-&gt;Handler,</div><div class='del'>-				((req-&gt;Attributes &amp; IRQ_TYPE_DYNAMIC_SHARING) ||</div><div class='del'>-				 (s-&gt;functions &gt; 1) ||</div><div class='del'>-				 (irq == s-&gt;pci_irq)) ? SA_SHIRQ : 0,</div><div class='del'>-				p_dev-&gt;devname, req-&gt;Instance))</div><div class='add'>+	if (ret &amp;&amp; (req-&gt;Attributes &amp; IRQ_HANDLE_PRESENT)) {</div><div class='add'>+		if (request_irq(irq, req-&gt;Handler, type,  p_dev-&gt;devname, req-&gt;Instance))</div><div class='ctx'> 			return CS_IN_USE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Make sure the fact the request type was overridden is passed back */</div><div class='add'>+	if (type == IRQF_SHARED &amp;&amp; !(req-&gt;Attributes &amp; IRQ_TYPE_DYNAMIC_SHARING)) {</div><div class='add'>+		req-&gt;Attributes |= IRQ_TYPE_DYNAMIC_SHARING;</div><div class='add'>+		printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n");</div><div class='add'>+		printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n");</div><div class='add'>+	}</div><div class='ctx'> 	c-&gt;irq.Attributes = req-&gt;Attributes;</div><div class='ctx'> 	s-&gt;irq.AssignedIRQ = req-&gt;AssignedIRQ = irq;</div><div class='ctx'> 	s-&gt;irq.Config++;</div><div class='head'>diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c<br/>index 247ab837f841..22c5e7427ddd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pd6729.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/pd6729.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pd6729.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/pd6729.c</a></div><div class='hunk'>@@ -642,7 +642,8 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 		goto err_out_free_mem;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "pd6729: Cirrus PD6729 PCI to PCMCIA Bridge "</div><div class='del'>-		"at 0x%lx on irq %d\n",	pci_resource_start(dev, 0), dev-&gt;irq);</div><div class='add'>+		"at 0x%llx on irq %d\n",</div><div class='add'>+		(unsigned long long)pci_resource_start(dev, 0), dev-&gt;irq);</div><div class='ctx'>  	/*</div><div class='ctx'> 	 * Since we have no memory BARs some firmware may not</div><div class='ctx'> 	 * have had PCI_COMMAND_MEMORY enabled, yet the device needs it.</div><div class='hunk'>@@ -688,7 +689,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,</div><div class='ctx'> 	pci_set_drvdata(dev, socket);</div><div class='ctx'> 	if (irq_mode == 1) {</div><div class='ctx'> 		/* Register the interrupt handler */</div><div class='del'>-		if ((ret = request_irq(dev-&gt;irq, pd6729_interrupt, SA_SHIRQ,</div><div class='add'>+		if ((ret = request_irq(dev-&gt;irq, pd6729_interrupt, IRQF_SHARED,</div><div class='ctx'> 							"pd6729", socket))) {</div><div class='ctx'> 			printk(KERN_ERR "pd6729: Failed to register irq %d, "</div><div class='ctx'> 							"aborting\n", dev-&gt;irq);</div><div class='head'>diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c<br/>index 7fa18fb814bc..b3518131ea0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/pxa2xx_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/pxa2xx_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/pxa2xx_base.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c<br/>index 0f8b157c9717..c3176b16b7be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/rsrc_nonstatic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/rsrc_nonstatic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/rsrc_nonstatic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/rsrc_nonstatic.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static DEFINE_MUTEX(rsrc_mutex);</div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='ctx'> static struct resource *</div><div class='del'>-make_resource(unsigned long b, unsigned long n, int flags, char *name)</div><div class='add'>+make_resource(resource_size_t b, resource_size_t n, int flags, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -86,8 +86,8 @@ make_resource(unsigned long b, unsigned long n, int flags, char *name)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct resource *</div><div class='del'>-claim_region(struct pcmcia_socket *s, unsigned long base, unsigned long size,</div><div class='del'>-	     int type, char *name)</div><div class='add'>+claim_region(struct pcmcia_socket *s, resource_size_t base,</div><div class='add'>+		resource_size_t size, int type, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct resource *res, *parent;</div><div class='ctx'> </div><div class='hunk'>@@ -519,10 +519,10 @@ struct pcmcia_align_data {</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> pcmcia_common_align(void *align_data, struct resource *res,</div><div class='del'>-		    unsigned long size, unsigned long align)</div><div class='add'>+			resource_size_t size, resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_align_data *data = align_data;</div><div class='del'>-	unsigned long start;</div><div class='add'>+	resource_size_t start;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Ensure that we have the correct start address</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -533,8 +533,8 @@ pcmcia_common_align(void *align_data, struct resource *res,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-pcmcia_align(void *align_data, struct resource *res,</div><div class='del'>-	     unsigned long size, unsigned long align)</div><div class='add'>+pcmcia_align(void *align_data, struct resource *res, resource_size_t size,</div><div class='add'>+		resource_size_t align)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcmcia_align_data *data = align_data;</div><div class='ctx'> 	struct resource_map *m;</div><div class='hunk'>@@ -808,8 +808,10 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_IO) {</div><div class='ctx'> 			if (res == &amp;ioport_resource)</div><div class='ctx'> 				continue;</div><div class='del'>-			printk(KERN_INFO "pcmcia: parent PCI bridge I/O window: 0x%lx - 0x%lx\n",</div><div class='del'>-			       res-&gt;start, res-&gt;end);</div><div class='add'>+			printk(KERN_INFO "pcmcia: parent PCI bridge I/O "</div><div class='add'>+				"window: 0x%llx - 0x%llx\n",</div><div class='add'>+				(unsigned long long)res-&gt;start,</div><div class='add'>+				(unsigned long long)res-&gt;end);</div><div class='ctx'> 			if (!adjust_io(s, ADD_MANAGED_RESOURCE, res-&gt;start, res-&gt;end))</div><div class='ctx'> 				done |= IORESOURCE_IO;</div><div class='ctx'> </div><div class='hunk'>@@ -818,8 +820,10 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)</div><div class='ctx'> 		if (res-&gt;flags &amp; IORESOURCE_MEM) {</div><div class='ctx'> 			if (res == &amp;iomem_resource)</div><div class='ctx'> 				continue;</div><div class='del'>-			printk(KERN_INFO "pcmcia: parent PCI bridge Memory window: 0x%lx - 0x%lx\n",</div><div class='del'>-			       res-&gt;start, res-&gt;end);</div><div class='add'>+			printk(KERN_INFO "pcmcia: parent PCI bridge Memory "</div><div class='add'>+				"window: 0x%llx - 0x%llx\n",</div><div class='add'>+				(unsigned long long)res-&gt;start,</div><div class='add'>+				(unsigned long long)res-&gt;end);</div><div class='ctx'> 			if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res-&gt;start, res-&gt;end))</div><div class='ctx'> 				done |= IORESOURCE_MEM;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c<br/>index c6b262b653d3..19b1e1276220 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa1100_badge4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa1100_badge4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa1100_badge4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/sa1100_badge4.c</a></div><div class='hunk'>@@ -128,8 +128,8 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state</div><div class='ctx'> </div><div class='ctx'> static struct pcmcia_low_level badge4_pcmcia_ops = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='del'>-	.init			= sa1111_pcmcia_hw_init,</div><div class='del'>-	.shutdown		= sa1111_pcmcia_hw_shutdown,</div><div class='add'>+	.hw_init		= sa1111_pcmcia_hw_init,</div><div class='add'>+	.hw_shutdown		= sa1111_pcmcia_hw_shutdown,</div><div class='ctx'> 	.socket_state		= sa1111_pcmcia_socket_state,</div><div class='ctx'> 	.configure_socket	= badge4_pcmcia_configure_socket,</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c<br/>index 6d441ec75c6a..c5b2a44b4c37 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa1100_generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa1100_generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa1100_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/sa1100_generic.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;pcmcia/cs_types.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c<br/>index 81ded52c8959..658cddfbcf29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa1111_generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa1111_generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa1111_generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/sa1111_generic.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * basically means we handle everything except controlling the</div><div class='ctx'>  * power.  Power is machine specific...</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c<br/>index 59c5d968e9f6..31a7abc55b23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa11xx_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/sa11xx_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/sa11xx_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/sa11xx_base.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c<br/>index ea7d9ca160b2..ecaa132fa592 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/soc_common.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/soc_common.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/soc_common.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/soc_common.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> ======================================================================*/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -39,12 +38,12 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/cpufreq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "soc_common.h"</div><div class='hunk'>@@ -524,7 +523,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,</div><div class='ctx'> 		if (irqs[i].sock != skt-&gt;nr)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		res = request_irq(irqs[i].irq, soc_common_pcmcia_interrupt,</div><div class='del'>-				  SA_INTERRUPT, irqs[i].str, skt);</div><div class='add'>+				  IRQF_DISABLED, irqs[i].str, skt);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_irq_type(irqs[i].irq, IRQT_NOEDGE);</div><div class='head'>diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c<br/>index 73bad1d5cb23..65a60671659f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/tcic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/tcic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/tcic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/tcic.c</a></div><div class='hunk'>@@ -756,8 +756,9 @@ static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m</div><div class='ctx'>     u_long base, len, mmap;</div><div class='ctx'> </div><div class='ctx'>     debug(1, "SetMemMap(%d, %d, %#2.2x, %d ns, "</div><div class='del'>-	  "%#lx-%#lx, %#x)\n", psock, mem-&gt;map, mem-&gt;flags,</div><div class='del'>-	  mem-&gt;speed, mem-&gt;res-&gt;start, mem-&gt;res-&gt;end, mem-&gt;card_start);</div><div class='add'>+	  "%#llx-%#llx, %#x)\n", psock, mem-&gt;map, mem-&gt;flags,</div><div class='add'>+	  mem-&gt;speed, (unsigned long long)mem-&gt;res-&gt;start,</div><div class='add'>+	  (unsigned long long)mem-&gt;res-&gt;end, mem-&gt;card_start);</div><div class='ctx'>     if ((mem-&gt;map &gt; 3) || (mem-&gt;card_start &gt; 0x3ffffff) ||</div><div class='ctx'> 	(mem-&gt;res-&gt;start &gt; 0xffffff) || (mem-&gt;res-&gt;end &gt; 0xffffff) ||</div><div class='ctx'> 	(mem-&gt;res-&gt;start &gt; mem-&gt;res-&gt;end) || (mem-&gt;speed &gt; 1000))</div><div class='head'>diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h<br/>index 7a3d1b8e16b9..62e9ebf967f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/ti113x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/ti113x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/ti113x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/ti113x.h</a></div><div class='hunk'>@@ -647,6 +647,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)</div><div class='ctx'> 		 */</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case PCI_DEVICE_ID_TI_XX12:</div><div class='ctx'> 	case PCI_DEVICE_ID_TI_X515:</div><div class='ctx'> 	case PCI_DEVICE_ID_TI_X420:</div><div class='ctx'> 	case PCI_DEVICE_ID_TI_X620:</div><div class='head'>diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c<br/>index 459e6e1946fd..e076a13db555 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/vrc4171_card.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/vrc4171_card.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/vrc4171_card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/vrc4171_card.c</a></div><div class='hunk'>@@ -730,7 +730,7 @@ static int __devinit vrc4171_card_init(void)</div><div class='ctx'> </div><div class='ctx'> 	retval = vrc4171_add_sockets();</div><div class='ctx'> 	if (retval == 0)</div><div class='del'>-		retval = request_irq(vrc4171_irq, pccard_interrupt, SA_SHIRQ,</div><div class='add'>+		retval = request_irq(vrc4171_irq, pccard_interrupt, IRQF_SHARED,</div><div class='ctx'> 		                     vrc4171_card_name, vrc4171_sockets);</div><div class='ctx'> </div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='head'>diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c<br/>index 6004196f7cc1..d19a9138135f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/vrc4173_cardu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/vrc4173_cardu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/vrc4173_cardu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/vrc4173_cardu.c</a></div><div class='hunk'>@@ -500,7 +500,7 @@ static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, cardu_interrupt, SA_SHIRQ, socket-&gt;name, socket) &lt; 0) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, cardu_interrupt, IRQF_SHARED, socket-&gt;name, socket) &lt; 0) {</div><div class='ctx'> 		pcmcia_unregister_socket(socket-&gt;pcmcia_socket);</div><div class='ctx'> 		socket-&gt;pcmcia_socket = NULL;</div><div class='ctx'> 		iounmap(socket-&gt;base);</div><div class='head'>diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c<br/>index 4145eb83b9b6..1344746381e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pcmcia/yenta_socket.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pcmcia/yenta_socket.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pcmcia/yenta_socket.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pcmcia/yenta_socket.c</a></div><div class='hunk'>@@ -287,7 +287,10 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)</div><div class='ctx'> 	struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);</div><div class='ctx'> 	u16 bridge;</div><div class='ctx'> </div><div class='del'>-	yenta_set_power(socket, state);</div><div class='add'>+	/* if powering down: do it immediately */</div><div class='add'>+	if (state-&gt;Vcc == 0)</div><div class='add'>+		yenta_set_power(socket, state);</div><div class='add'>+</div><div class='ctx'> 	socket-&gt;io_irq = state-&gt;io_irq;</div><div class='ctx'> 	bridge = config_readw(socket, CB_BRIDGE_CONTROL) &amp; ~(CB_BRIDGE_CRST | CB_BRIDGE_INTR);</div><div class='ctx'> 	if (cb_readl(socket, CB_SOCKET_STATE) &amp; CB_CBCARD) {</div><div class='hunk'>@@ -339,6 +342,10 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)</div><div class='ctx'> 	/* Socket event mask: get card insert/remove events.. */</div><div class='ctx'> 	cb_writel(socket, CB_SOCKET_EVENT, -1);</div><div class='ctx'> 	cb_writel(socket, CB_SOCKET_MASK, CB_CDMASK);</div><div class='add'>+</div><div class='add'>+	/* if powering up: do it as the last step when the socket is configured */</div><div class='add'>+	if (state-&gt;Vcc != 0)</div><div class='add'>+		yenta_set_power(socket, state);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -916,7 +923,7 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket)</div><div class='ctx'> </div><div class='ctx'> 	socket-&gt;probe_status = 0;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(socket-&gt;cb_irq, yenta_probe_handler, SA_SHIRQ, "yenta", socket)) {</div><div class='add'>+	if (request_irq(socket-&gt;cb_irq, yenta_probe_handler, IRQF_SHARED, "yenta", socket)) {</div><div class='ctx'> 		printk(KERN_WARNING "Yenta: request_irq() in yenta_probe_cb_irq() failed!\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -998,6 +1005,77 @@ static void yenta_config_init(struct yenta_socket *socket)</div><div class='ctx'> 	config_writew(socket, CB_BRIDGE_CONTROL, bridge);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * yenta_fixup_parent_bridge - Fix subordinate bus# of the parent bridge</div><div class='add'>+ * @cardbus_bridge: The PCI bus which the CardBus bridge bridges to</div><div class='add'>+ *</div><div class='add'>+ * Checks if devices on the bus which the CardBus bridge bridges to would be</div><div class='add'>+ * invisible during PCI scans because of a misconfigured subordinate number</div><div class='add'>+ * of the parent brige - some BIOSes seem to be too lazy to set it right.</div><div class='add'>+ * Does the fixup carefully by checking how far it can go without conflicts.</div><div class='add'>+ * See http://bugzilla.kernel.org/show_bug.cgi?id=2944 for more information.</div><div class='add'>+ */</div><div class='add'>+static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)</div><div class='add'>+{</div><div class='add'>+	struct list_head *tmp;</div><div class='add'>+	unsigned char upper_limit;</div><div class='add'>+ 	/*</div><div class='add'>+	 * We only check and fix the parent bridge: All systems which need</div><div class='add'>+	 * this fixup that have been reviewed are laptops and the only bridge</div><div class='add'>+	 * which needed fixing was the parent bridge of the CardBus bridge:</div><div class='add'>+	 */</div><div class='add'>+	struct pci_bus *bridge_to_fix = cardbus_bridge-&gt;parent;</div><div class='add'>+</div><div class='add'>+	/* Check bus numbers are already set up correctly: */</div><div class='add'>+	if (bridge_to_fix-&gt;subordinate &gt;= cardbus_bridge-&gt;subordinate)</div><div class='add'>+		return; /* The subordinate number is ok, nothing to do */</div><div class='add'>+</div><div class='add'>+	if (!bridge_to_fix-&gt;parent)</div><div class='add'>+		return; /* Root bridges are ok */</div><div class='add'>+</div><div class='add'>+	/* stay within the limits of the bus range of the parent: */</div><div class='add'>+	upper_limit = bridge_to_fix-&gt;parent-&gt;subordinate;</div><div class='add'>+</div><div class='add'>+	/* check the bus ranges of all silbling bridges to prevent overlap */</div><div class='add'>+	list_for_each(tmp, &amp;bridge_to_fix-&gt;parent-&gt;children) {</div><div class='add'>+		struct pci_bus * silbling = pci_bus_b(tmp);</div><div class='add'>+		/*</div><div class='add'>+		 * If the silbling has a higher secondary bus number</div><div class='add'>+		 * and it's secondary is equal or smaller than our</div><div class='add'>+		 * current upper limit, set the new upper limit to</div><div class='add'>+		 * the bus number below the silbling's range:</div><div class='add'>+		 */</div><div class='add'>+		if (silbling-&gt;secondary &gt; bridge_to_fix-&gt;subordinate</div><div class='add'>+		    &amp;&amp; silbling-&gt;secondary &lt;= upper_limit)</div><div class='add'>+			upper_limit = silbling-&gt;secondary - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Show that the wanted subordinate number is not possible: */</div><div class='add'>+	if (cardbus_bridge-&gt;subordinate &gt; upper_limit)</div><div class='add'>+		printk(KERN_WARNING "Yenta: Upper limit for fixing this "</div><div class='add'>+			"bridge's parent bridge: #%02x\n", upper_limit);</div><div class='add'>+</div><div class='add'>+	/* If we have room to increase the bridge's subordinate number, */</div><div class='add'>+	if (bridge_to_fix-&gt;subordinate &lt; upper_limit) {</div><div class='add'>+</div><div class='add'>+		/* use the highest number of the hidden bus, within limits */</div><div class='add'>+		unsigned char subordinate_to_assign =</div><div class='add'>+			min(cardbus_bridge-&gt;subordinate, upper_limit);</div><div class='add'>+</div><div class='add'>+		printk(KERN_INFO "Yenta: Raising subordinate bus# of parent "</div><div class='add'>+			"bus (#%02x) from #%02x to #%02x\n",</div><div class='add'>+			bridge_to_fix-&gt;number,</div><div class='add'>+			bridge_to_fix-&gt;subordinate, subordinate_to_assign);</div><div class='add'>+</div><div class='add'>+		/* Save the new subordinate in the bus struct of the bridge */</div><div class='add'>+		bridge_to_fix-&gt;subordinate = subordinate_to_assign;</div><div class='add'>+</div><div class='add'>+		/* and update the PCI config space with the new subordinate */</div><div class='add'>+		pci_write_config_byte(bridge_to_fix-&gt;self,</div><div class='add'>+			PCI_SUBORDINATE_BUS, bridge_to_fix-&gt;subordinate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize a cardbus controller. Make sure we have a usable</div><div class='ctx'>  * interrupt, and that we can map the cardbus area. Fill in the</div><div class='hunk'>@@ -1094,7 +1172,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> </div><div class='ctx'> 	/* We must finish initialization here */</div><div class='ctx'> </div><div class='del'>-	if (!socket-&gt;cb_irq || request_irq(socket-&gt;cb_irq, yenta_interrupt, SA_SHIRQ, "yenta", socket)) {</div><div class='add'>+	if (!socket-&gt;cb_irq || request_irq(socket-&gt;cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {</div><div class='ctx'> 		/* No IRQ or request_irq failed. Poll */</div><div class='ctx'> 		socket-&gt;cb_irq = 0; /* But zero is a valid IRQ number. */</div><div class='ctx'> 		init_timer(&amp;socket-&gt;poll_timer);</div><div class='hunk'>@@ -1113,6 +1191,8 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i</div><div class='ctx'> 	yenta_get_socket_capabilities(socket, isa_interrupts);</div><div class='ctx'> 	printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));</div><div class='ctx'> </div><div class='add'>+	yenta_fixup_parent_bridge(dev-&gt;subordinate);</div><div class='add'>+</div><div class='ctx'> 	/* Register it with the pcmcia layer.. */</div><div class='ctx'> 	ret = pcmcia_register_socket(&amp;socket-&gt;socket);</div><div class='ctx'> 	if (ret == 0) {</div><div class='hunk'>@@ -1232,6 +1312,7 @@ static struct pci_device_id yenta_table [] = {</div><div class='ctx'> </div><div class='ctx'> 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11, TI12XX),</div><div class='ctx'> 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X515, TI12XX),</div><div class='add'>+	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX12, TI12XX),</div><div class='ctx'> 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X420, TI12XX),</div><div class='ctx'> 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X620, TI12XX),</div><div class='ctx'> 	CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7410, TI12XX),</div><div class='head'>diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c<br/>index bb19c64073c6..227600cd6360 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/card.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/card.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/card.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/card.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='hunk'>@@ -60,30 +59,34 @@ static void card_remove_first(struct pnp_dev * dev)</div><div class='ctx'> 	card_remove(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int card_probe(struct pnp_card * card, struct pnp_card_driver * drv)</div><div class='add'>+static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)</div><div class='ctx'> {</div><div class='del'>-	const struct pnp_card_device_id *id = match_card(drv,card);</div><div class='del'>-	if (id) {</div><div class='del'>-		struct pnp_card_link * clink = pnp_alloc(sizeof(struct pnp_card_link));</div><div class='del'>-		if (!clink)</div><div class='del'>-			return 0;</div><div class='del'>-		clink-&gt;card = card;</div><div class='del'>-		clink-&gt;driver = drv;</div><div class='del'>-		clink-&gt;pm_state = PMSG_ON;</div><div class='del'>-		if (drv-&gt;probe) {</div><div class='del'>-			if (drv-&gt;probe(clink, id)&gt;=0)</div><div class='del'>-				return 1;</div><div class='del'>-			else {</div><div class='del'>-				struct pnp_dev * dev;</div><div class='del'>-				card_for_each_dev(card, dev) {</div><div class='del'>-					if (dev-&gt;card_link == clink)</div><div class='del'>-						pnp_release_card_device(dev);</div><div class='del'>-				}</div><div class='del'>-				kfree(clink);</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			return 1;</div><div class='add'>+	const struct pnp_card_device_id *id;</div><div class='add'>+	struct pnp_card_link *clink;</div><div class='add'>+	struct pnp_dev *dev;</div><div class='add'>+</div><div class='add'>+	if (!drv-&gt;probe)</div><div class='add'>+		return 0;</div><div class='add'>+	id = match_card(drv,card);</div><div class='add'>+	if (!id)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	clink = pnp_alloc(sizeof(*clink));</div><div class='add'>+	if (!clink)</div><div class='add'>+		return 0;</div><div class='add'>+	clink-&gt;card = card;</div><div class='add'>+	clink-&gt;driver = drv;</div><div class='add'>+	clink-&gt;pm_state = PMSG_ON;</div><div class='add'>+</div><div class='add'>+	if (drv-&gt;probe(clink, id) &gt;= 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* Recovery */</div><div class='add'>+	card_for_each_dev(card, dev) {</div><div class='add'>+		if (dev-&gt;card_link == clink)</div><div class='add'>+			pnp_release_card_device(dev);</div><div class='ctx'> 	}</div><div class='add'>+	kfree(clink);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c<br/>index e54c15383193..e161423b4300 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/driver.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c<br/>index a2d8ce7fef9c..3163e3d73da1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/interface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/interface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/interface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/interface.c</a></div><div class='hunk'>@@ -264,7 +264,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at</div><div class='ctx'> 			if (pnp_port_flags(dev, i) &amp; IORESOURCE_DISABLED)</div><div class='ctx'> 				pnp_printf(buffer," disabled\n");</div><div class='ctx'> 			else</div><div class='del'>-				pnp_printf(buffer," 0x%lx-0x%lx\n",</div><div class='add'>+				pnp_printf(buffer," 0x%llx-0x%llx\n",</div><div class='ctx'> 						pnp_port_start(dev, i),</div><div class='ctx'> 						pnp_port_end(dev, i));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -275,7 +275,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at</div><div class='ctx'> 			if (pnp_mem_flags(dev, i) &amp; IORESOURCE_DISABLED)</div><div class='ctx'> 				pnp_printf(buffer," disabled\n");</div><div class='ctx'> 			else</div><div class='del'>-				pnp_printf(buffer," 0x%lx-0x%lx\n",</div><div class='add'>+				pnp_printf(buffer," 0x%llx-0x%llx\n",</div><div class='ctx'> 						pnp_mem_start(dev, i),</div><div class='ctx'> 						pnp_mem_end(dev, i));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -286,7 +286,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at</div><div class='ctx'> 			if (pnp_irq_flags(dev, i) &amp; IORESOURCE_DISABLED)</div><div class='ctx'> 				pnp_printf(buffer," disabled\n");</div><div class='ctx'> 			else</div><div class='del'>-				pnp_printf(buffer," %ld\n",</div><div class='add'>+				pnp_printf(buffer," %lld\n",</div><div class='ctx'> 						pnp_irq(dev, i));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -296,7 +296,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at</div><div class='ctx'> 			if (pnp_dma_flags(dev, i) &amp; IORESOURCE_DISABLED)</div><div class='ctx'> 				pnp_printf(buffer," disabled\n");</div><div class='ctx'> 			else</div><div class='del'>-				pnp_printf(buffer," %ld\n",</div><div class='add'>+				pnp_printf(buffer," %lld\n",</div><div class='ctx'> 						pnp_dma(dev, i));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/pnp/isapnp/compat.c b/drivers/pnp/isapnp/compat.c<br/>index 3ff7e76b33bd..0697ab88a9ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/isapnp/compat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/isapnp/compat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/isapnp/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/isapnp/compat.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  </div><div class='ctx'> /* TODO: see if more isapnp functions are needed here */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c<br/>index ac7c2bb6c69e..f2e0179962e2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/isapnp/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/isapnp/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/isapnp/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/isapnp/core.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  *  2003-08-11	Resource Management Updates - Adam Belay &lt;ambx1@neo.rr.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c<br/>index cf54b0a3628e..958c11bedd0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/isapnp/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/isapnp/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/isapnp/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/isapnp/proc.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c<br/>index 6fff109bdab6..5026b345cb30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/manager.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/manager.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/manager.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/manager.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -20,7 +19,8 @@ DECLARE_MUTEX(pnp_res_mutex);</div><div class='ctx'> </div><div class='ctx'> static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *start, *end, *flags;</div><div class='add'>+	resource_size_t *start, *end;</div><div class='add'>+	unsigned long *flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !rule)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -63,7 +63,8 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)</div><div class='ctx'> </div><div class='ctx'> static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *start, *end, *flags;</div><div class='add'>+	resource_size_t *start, *end;</div><div class='add'>+	unsigned long *flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev || !rule)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -116,7 +117,8 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)</div><div class='ctx'> </div><div class='ctx'> static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *start, *end, *flags;</div><div class='add'>+	resource_size_t *start, *end;</div><div class='add'>+	unsigned long *flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* IRQ priority: this table is good for i386 */</div><div class='hunk'>@@ -168,7 +170,8 @@ static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)</div><div class='ctx'> </div><div class='ctx'> static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)</div><div class='ctx'> {</div><div class='del'>-	unsigned long *start, *end, *flags;</div><div class='add'>+	resource_size_t *start, *end;</div><div class='add'>+	unsigned long *flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* DMA priority: this table is good for i386 */</div><div class='hunk'>@@ -582,7 +585,8 @@ int pnp_disable_dev(struct pnp_dev *dev)</div><div class='ctx'>  * @size: size of region</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-void pnp_resource_change(struct resource *resource, unsigned long start, unsigned long size)</div><div class='add'>+void pnp_resource_change(struct resource *resource, resource_size_t start,</div><div class='add'>+				resource_size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	if (resource == NULL)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c<br/>index f104577f73e0..6cf34a63c790 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/pnpacpi/core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/pnpacpi/core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/pnpacpi/core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/pnpacpi/core.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;acpi/acpi_bus.h&gt;</div><div class='head'>diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c<br/>index 407b4eaddcbf..212268881857 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/pnpacpi/rsparser.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/pnpacpi/rsparser.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/pnpacpi/rsparser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/pnpacpi/rsparser.c</a></div><div class='hunk'>@@ -36,13 +36,13 @@ static int irq_flags(int triggering, int polarity)</div><div class='ctx'> {</div><div class='ctx'> 	int flag;</div><div class='ctx'> 	if (triggering == ACPI_LEVEL_SENSITIVE) {</div><div class='del'>-		if(polarity == ACPI_ACTIVE_LOW)</div><div class='add'>+		if (polarity == ACPI_ACTIVE_LOW)</div><div class='ctx'> 			flag = IORESOURCE_IRQ_LOWLEVEL;</div><div class='ctx'> 		else</div><div class='ctx'> 			flag = IORESOURCE_IRQ_HIGHLEVEL;</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='del'>-		if(polarity == ACPI_ACTIVE_LOW)</div><div class='add'>+		if (polarity == ACPI_ACTIVE_LOW)</div><div class='ctx'> 			flag = IORESOURCE_IRQ_LOWEDGE;</div><div class='ctx'> 		else</div><div class='ctx'> 			flag = IORESOURCE_IRQ_HIGHEDGE;</div><div class='hunk'>@@ -57,7 +57,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)</div><div class='ctx'> 		*triggering = ACPI_LEVEL_SENSITIVE;</div><div class='ctx'> 		*polarity = ACPI_ACTIVE_LOW;</div><div class='ctx'> 		break;</div><div class='del'>-	case IORESOURCE_IRQ_HIGHLEVEL:	</div><div class='add'>+	case IORESOURCE_IRQ_HIGHLEVEL:</div><div class='ctx'> 		*triggering = ACPI_LEVEL_SENSITIVE;</div><div class='ctx'> 		*polarity = ACPI_ACTIVE_HIGH;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -73,8 +73,8 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,</div><div class='del'>-	int triggering, int polarity)</div><div class='add'>+pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,</div><div class='add'>+	int triggering, int polarity, int shareable)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	int irq;</div><div class='hunk'>@@ -95,13 +95,16 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (shareable)</div><div class='add'>+		res-&gt;irq_resource[i].flags |= IORESOURCE_IRQ_SHAREABLE;</div><div class='add'>+</div><div class='ctx'> 	res-&gt;irq_resource[i].start = irq;</div><div class='ctx'> 	res-&gt;irq_resource[i].end = irq;</div><div class='ctx'> 	pcibios_penalize_isa_irq(irq, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)</div><div class='add'>+pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, u32 dma)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	while (i &lt; PNP_MAX_DMA &amp;&amp;</div><div class='hunk'>@@ -119,8 +122,8 @@ pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,</div><div class='del'>-	u32 io, u32 len)</div><div class='add'>+pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,</div><div class='add'>+	u64 io, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='ctx'> 	while (!(res-&gt;port_resource[i].flags &amp; IORESOURCE_UNSET) &amp;&amp;</div><div class='hunk'>@@ -138,7 +141,7 @@ pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-pnpacpi_parse_allocated_memresource(struct pnp_resource_table * res,</div><div class='add'>+pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,</div><div class='ctx'> 	u64 mem, u64 len)</div><div class='ctx'> {</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -156,11 +159,32 @@ pnpacpi_parse_allocated_memresource(struct pnp_resource_table * res,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,</div><div class='add'>+	struct acpi_resource *res)</div><div class='add'>+{</div><div class='add'>+	struct acpi_resource_address64 addr, *p = &amp;addr;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	status = acpi_resource_to_address64(res, p);</div><div class='add'>+	if (!ACPI_SUCCESS(status)) {</div><div class='add'>+		pnp_warn("PnPACPI: failed to convert resource type %d",</div><div class='add'>+			res-&gt;type);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;resource_type == ACPI_MEMORY_RANGE)</div><div class='add'>+		pnpacpi_parse_allocated_memresource(res_table,</div><div class='add'>+				p-&gt;minimum, p-&gt;address_length);</div><div class='add'>+	else if (p-&gt;resource_type == ACPI_IO_RANGE)</div><div class='add'>+		pnpacpi_parse_allocated_ioresource(res_table,</div><div class='add'>+				p-&gt;minimum, p-&gt;address_length);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,</div><div class='ctx'> 	void *data)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_resource_table * res_table = (struct pnp_resource_table *)data;</div><div class='add'>+	struct pnp_resource_table *res_table = (struct pnp_resource_table *)data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (res-&gt;type) {</div><div class='hunk'>@@ -173,7 +197,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,</div><div class='ctx'> 			pnpacpi_parse_allocated_irqresource(res_table,</div><div class='ctx'> 				res-&gt;data.irq.interrupts[i],</div><div class='ctx'> 				res-&gt;data.irq.triggering,</div><div class='del'>-				res-&gt;data.irq.polarity);</div><div class='add'>+				res-&gt;data.irq.polarity,</div><div class='add'>+				res-&gt;data.irq.sharable);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -221,19 +246,9 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,</div><div class='ctx'> 				res-&gt;data.fixed_memory32.address_length);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_ADDRESS16:</div><div class='del'>-		pnpacpi_parse_allocated_memresource(res_table,</div><div class='del'>-				res-&gt;data.address16.minimum,</div><div class='del'>-				res-&gt;data.address16.address_length);</div><div class='del'>-		break;</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_ADDRESS32:</div><div class='del'>-		pnpacpi_parse_allocated_memresource(res_table,</div><div class='del'>-				res-&gt;data.address32.minimum,</div><div class='del'>-				res-&gt;data.address32.address_length);</div><div class='del'>-		break;</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_ADDRESS64:</div><div class='del'>-		pnpacpi_parse_allocated_memresource(res_table,</div><div class='del'>-		res-&gt;data.address64.minimum,</div><div class='del'>-		res-&gt;data.address64.address_length);</div><div class='add'>+		pnpacpi_parse_allocated_address_space(res_table, res);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:</div><div class='hunk'>@@ -244,7 +259,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,</div><div class='ctx'> 			pnpacpi_parse_allocated_irqresource(res_table,</div><div class='ctx'> 				res-&gt;data.extended_irq.interrupts[i],</div><div class='ctx'> 				res-&gt;data.extended_irq.triggering,</div><div class='del'>-				res-&gt;data.extended_irq.polarity);</div><div class='add'>+				res-&gt;data.extended_irq.polarity,</div><div class='add'>+				res-&gt;data.extended_irq.sharable);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -255,11 +271,11 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,</div><div class='ctx'> 		pnp_warn("PnPACPI: unknown resource type %d", res-&gt;type);</div><div class='ctx'> 		return AE_ERROR;</div><div class='ctx'> 	}</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle, struct pnp_resource_table * res)</div><div class='add'>+acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle, struct pnp_resource_table *res)</div><div class='ctx'> {</div><div class='ctx'> 	/* Blank the resource table values */</div><div class='ctx'> 	pnp_init_resource_table(res);</div><div class='hunk'>@@ -317,17 +333,17 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso</div><div class='ctx'> 		pnp_err("Invalid DMA transfer type");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pnp_register_dma_resource(option,dma);</div><div class='add'>+	pnp_register_dma_resource(option, dma);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> static void pnpacpi_parse_irq_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_irq *p)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct pnp_irq * irq;</div><div class='del'>-	</div><div class='add'>+	struct pnp_irq *irq;</div><div class='add'>+</div><div class='ctx'> 	if (p-&gt;interrupt_count == 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);</div><div class='hunk'>@@ -347,7 +363,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_extended_irq *p)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct pnp_irq * irq;</div><div class='add'>+	struct pnp_irq *irq;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;interrupt_count == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -368,7 +384,7 @@ static void</div><div class='ctx'> pnpacpi_parse_port_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_io *io)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_port * port;</div><div class='add'>+	struct pnp_port *port;</div><div class='ctx'> </div><div class='ctx'> 	if (io-&gt;address_length == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -381,7 +397,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,</div><div class='ctx'> 	port-&gt;size = io-&gt;address_length;</div><div class='ctx'> 	port-&gt;flags = ACPI_DECODE_16 == io-&gt;io_decode ?</div><div class='ctx'> 		PNP_PORT_FLAG_16BITADDR : 0;</div><div class='del'>-	pnp_register_port_resource(option,port);</div><div class='add'>+	pnp_register_port_resource(option, port);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -389,7 +405,7 @@ static void</div><div class='ctx'> pnpacpi_parse_fixed_port_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_fixed_io *io)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_port * port;</div><div class='add'>+	struct pnp_port *port;</div><div class='ctx'> </div><div class='ctx'> 	if (io-&gt;address_length == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -400,7 +416,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,</div><div class='ctx'> 	port-&gt;size = io-&gt;address_length;</div><div class='ctx'> 	port-&gt;align = 0;</div><div class='ctx'> 	port-&gt;flags = PNP_PORT_FLAG_FIXED;</div><div class='del'>-	pnp_register_port_resource(option,port);</div><div class='add'>+	pnp_register_port_resource(option, port);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -408,7 +424,7 @@ static void</div><div class='ctx'> pnpacpi_parse_mem24_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_memory24 *p)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_mem * mem;</div><div class='add'>+	struct pnp_mem *mem;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;address_length == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -423,7 +439,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,</div><div class='ctx'> 	mem-&gt;flags = (ACPI_READ_WRITE_MEMORY == p-&gt;write_protect) ?</div><div class='ctx'> 			IORESOURCE_MEM_WRITEABLE : 0;</div><div class='ctx'> </div><div class='del'>-	pnp_register_mem_resource(option,mem);</div><div class='add'>+	pnp_register_mem_resource(option, mem);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -431,7 +447,7 @@ static void</div><div class='ctx'> pnpacpi_parse_mem32_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_memory32 *p)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_mem * mem;</div><div class='add'>+	struct pnp_mem *mem;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;address_length == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -446,7 +462,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,</div><div class='ctx'> 	mem-&gt;flags = (ACPI_READ_WRITE_MEMORY == p-&gt;write_protect) ?</div><div class='ctx'> 			IORESOURCE_MEM_WRITEABLE : 0;</div><div class='ctx'> </div><div class='del'>-	pnp_register_mem_resource(option,mem);</div><div class='add'>+	pnp_register_mem_resource(option, mem);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -454,7 +470,7 @@ static void</div><div class='ctx'> pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,</div><div class='ctx'> 	struct acpi_resource_fixed_memory32 *p)</div><div class='ctx'> {</div><div class='del'>-	struct pnp_mem * mem;</div><div class='add'>+	struct pnp_mem *mem;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;address_length == 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -468,7 +484,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,</div><div class='ctx'> 	mem-&gt;flags = (ACPI_READ_WRITE_MEMORY == p-&gt;write_protect) ?</div><div class='ctx'> 			IORESOURCE_MEM_WRITEABLE : 0;</div><div class='ctx'> </div><div class='del'>-	pnp_register_mem_resource(option,mem);</div><div class='add'>+	pnp_register_mem_resource(option, mem);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -477,8 +493,8 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_resource_address64 addr, *p = &amp;addr;</div><div class='ctx'> 	acpi_status status;</div><div class='del'>-	struct pnp_mem * mem;</div><div class='del'>-	struct pnp_port * port;</div><div class='add'>+	struct pnp_mem *mem;</div><div class='add'>+	struct pnp_port *port;</div><div class='ctx'> </div><div class='ctx'> 	status = acpi_resource_to_address64(r, p);</div><div class='ctx'> 	if (!ACPI_SUCCESS(status)) {</div><div class='hunk'>@@ -498,7 +514,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)</div><div class='ctx'> 		mem-&gt;align = 0;</div><div class='ctx'> 		mem-&gt;flags = (p-&gt;info.mem.write_protect ==</div><div class='ctx'> 		    ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;</div><div class='del'>-		pnp_register_mem_resource(option,mem);</div><div class='add'>+		pnp_register_mem_resource(option, mem);</div><div class='ctx'> 	} else if (p-&gt;resource_type == ACPI_IO_RANGE) {</div><div class='ctx'> 		port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);</div><div class='ctx'> 		if (!port)</div><div class='hunk'>@@ -507,7 +523,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)</div><div class='ctx'> 		port-&gt;size = p-&gt;address_length;</div><div class='ctx'> 		port-&gt;align = 0;</div><div class='ctx'> 		port-&gt;flags = PNP_PORT_FLAG_FIXED;</div><div class='del'>-		pnp_register_port_resource(option,port);</div><div class='add'>+		pnp_register_port_resource(option, port);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -531,7 +547,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_DMA:</div><div class='del'>-			pnpacpi_parse_dma_option(option, &amp;res-&gt;data.dma);	</div><div class='add'>+			pnpacpi_parse_dma_option(option, &amp;res-&gt;data.dma);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_START_DEPENDENT:</div><div class='hunk'>@@ -539,7 +555,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,</div><div class='ctx'> 				case ACPI_GOOD_CONFIGURATION:</div><div class='ctx'> 					priority = PNP_RES_PRIORITY_PREFERRED;</div><div class='ctx'> 					break;</div><div class='del'>-					</div><div class='add'>+</div><div class='ctx'> 				case ACPI_ACCEPTABLE_CONFIGURATION:</div><div class='ctx'> 					priority = PNP_RES_PRIORITY_ACCEPTABLE;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -555,7 +571,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,</div><div class='ctx'> 			option = pnp_register_dependent_option(dev, priority);</div><div class='ctx'> 			if (!option)</div><div class='ctx'> 				return AE_ERROR;</div><div class='del'>-			parse_data-&gt;option = option;	</div><div class='add'>+			parse_data-&gt;option = option;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_END_DEPENDENT:</div><div class='hunk'>@@ -615,7 +631,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,</div><div class='ctx'> 			pnp_warn("PnPACPI: unknown resource type %d", res-&gt;type);</div><div class='ctx'> 			return AE_ERROR;</div><div class='ctx'> 	}</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 	return AE_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -636,13 +652,8 @@ acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Set resource</div><div class='del'>- */</div><div class='del'>-static acpi_status pnpacpi_count_resources(struct acpi_resource *res,</div><div class='del'>-	void *data)</div><div class='add'>+static int pnpacpi_supported_resource(struct acpi_resource *res)</div><div class='ctx'> {</div><div class='del'>-	int *res_cnt = (int *)data;</div><div class='ctx'> 	switch (res-&gt;type) {</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_IRQ:</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_DMA:</div><div class='hunk'>@@ -655,43 +666,32 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_ADDRESS32:</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_ADDRESS64:</div><div class='ctx'> 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:</div><div class='del'>-		(*res_cnt) ++;</div><div class='del'>-	case ACPI_RESOURCE_TYPE_START_DEPENDENT:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_END_DEPENDENT:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_VENDOR:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_END_TAG:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:</div><div class='del'>-	default:</div><div class='del'>-		return AE_OK;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	return AE_OK;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static acpi_status pnpacpi_type_resources(struct acpi_resource *res,</div><div class='add'>+/*</div><div class='add'>+ * Set resource</div><div class='add'>+ */</div><div class='add'>+static acpi_status pnpacpi_count_resources(struct acpi_resource *res,</div><div class='ctx'> 	void *data)</div><div class='ctx'> {</div><div class='del'>-	struct acpi_resource **resource = (struct acpi_resource **)data;	</div><div class='del'>-	switch (res-&gt;type) {</div><div class='del'>-	case ACPI_RESOURCE_TYPE_IRQ:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_DMA:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_IO:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_FIXED_IO:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_MEMORY24:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_MEMORY32:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_ADDRESS16:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_ADDRESS32:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_ADDRESS64:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:</div><div class='add'>+	int *res_cnt = (int *)data;</div><div class='add'>+</div><div class='add'>+	if (pnpacpi_supported_resource(res))</div><div class='add'>+		(*res_cnt)++;</div><div class='add'>+	return AE_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)</div><div class='add'>+{</div><div class='add'>+	struct acpi_resource **resource = (struct acpi_resource **)data;</div><div class='add'>+</div><div class='add'>+	if (pnpacpi_supported_resource(res)) {</div><div class='ctx'> 		(*resource)-&gt;type = res-&gt;type;</div><div class='add'>+		(*resource)-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 		(*resource)++;</div><div class='del'>-	case ACPI_RESOURCE_TYPE_START_DEPENDENT:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_END_DEPENDENT:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_VENDOR:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_END_TAG:</div><div class='del'>-	case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:</div><div class='del'>-	default:</div><div class='del'>-		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return AE_OK;</div><div class='hunk'>@@ -735,11 +735,8 @@ static void pnpacpi_encode_irq(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='ctx'> 	int triggering, polarity;</div><div class='del'>-	</div><div class='del'>-	decode_irq_flags(p-&gt;flags &amp; IORESOURCE_BITS, &amp;triggering,</div><div class='del'>-		&amp;polarity);</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_IRQ;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='add'>+</div><div class='add'>+	decode_irq_flags(p-&gt;flags &amp; IORESOURCE_BITS, &amp;triggering, &amp;polarity);</div><div class='ctx'> 	resource-&gt;data.irq.triggering = triggering;</div><div class='ctx'> 	resource-&gt;data.irq.polarity = polarity;</div><div class='ctx'> 	if (triggering == ACPI_EDGE_SENSITIVE)</div><div class='hunk'>@@ -754,11 +751,8 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='ctx'> 	int triggering, polarity;</div><div class='del'>-	</div><div class='del'>-	decode_irq_flags(p-&gt;flags &amp; IORESOURCE_BITS, &amp;triggering,</div><div class='del'>-		&amp;polarity);</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_EXTENDED_IRQ;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='add'>+</div><div class='add'>+	decode_irq_flags(p-&gt;flags &amp; IORESOURCE_BITS, &amp;triggering, &amp;polarity);</div><div class='ctx'> 	resource-&gt;data.extended_irq.producer_consumer = ACPI_CONSUMER;</div><div class='ctx'> 	resource-&gt;data.extended_irq.triggering = triggering;</div><div class='ctx'> 	resource-&gt;data.extended_irq.polarity = polarity;</div><div class='hunk'>@@ -773,8 +767,6 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,</div><div class='ctx'> static void pnpacpi_encode_dma(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_DMA;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 	/* Note: pnp_assign_dma will copy pnp_dma-&gt;flags into p-&gt;flags */</div><div class='ctx'> 	if (p-&gt;flags &amp; IORESOURCE_DMA_COMPATIBLE)</div><div class='ctx'> 		resource-&gt;data.dma.type = ACPI_COMPATIBILITY;</div><div class='hunk'>@@ -798,8 +790,6 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource,</div><div class='ctx'> static void pnpacpi_encode_io(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_IO;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 	/* Note: pnp_assign_port will copy pnp_port-&gt;flags into p-&gt;flags */</div><div class='ctx'> 	resource-&gt;data.io.io_decode = (p-&gt;flags &amp; PNP_PORT_FLAG_16BITADDR)?</div><div class='ctx'> 		ACPI_DECODE_16 : ACPI_DECODE_10;</div><div class='hunk'>@@ -812,8 +802,6 @@ static void pnpacpi_encode_io(struct acpi_resource *resource,</div><div class='ctx'> static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_FIXED_IO;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 	resource-&gt;data.fixed_io.address = p-&gt;start;</div><div class='ctx'> 	resource-&gt;data.fixed_io.address_length = p-&gt;end - p-&gt;start + 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -821,8 +809,6 @@ static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,</div><div class='ctx'> static void pnpacpi_encode_mem24(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_MEMORY24;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 	/* Note: pnp_assign_mem will copy pnp_mem-&gt;flags into p-&gt;flags */</div><div class='ctx'> 	resource-&gt;data.memory24.write_protect =</div><div class='ctx'> 		(p-&gt;flags &amp; IORESOURCE_MEM_WRITEABLE) ?</div><div class='hunk'>@@ -836,8 +822,6 @@ static void pnpacpi_encode_mem24(struct acpi_resource *resource,</div><div class='ctx'> static void pnpacpi_encode_mem32(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_MEMORY32;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 	resource-&gt;data.memory32.write_protect =</div><div class='ctx'> 		(p-&gt;flags &amp; IORESOURCE_MEM_WRITEABLE) ?</div><div class='ctx'> 		ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;</div><div class='hunk'>@@ -850,8 +834,6 @@ static void pnpacpi_encode_mem32(struct acpi_resource *resource,</div><div class='ctx'> static void pnpacpi_encode_fixed_mem32(struct acpi_resource *resource,</div><div class='ctx'> 	struct resource *p)</div><div class='ctx'> {</div><div class='del'>-	resource-&gt;type = ACPI_RESOURCE_TYPE_FIXED_MEMORY32;</div><div class='del'>-	resource-&gt;length = sizeof(struct acpi_resource);</div><div class='ctx'> 	resource-&gt;data.fixed_memory32.write_protect =</div><div class='ctx'> 		(p-&gt;flags &amp; IORESOURCE_MEM_WRITEABLE) ?</div><div class='ctx'> 		ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;</div><div class='hunk'>@@ -882,37 +864,37 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,</div><div class='ctx'> 			pnp_dbg("Encode dma");</div><div class='ctx'> 			pnpacpi_encode_dma(resource,</div><div class='ctx'> 				&amp;res_table-&gt;dma_resource[dma]);</div><div class='del'>-			dma ++;</div><div class='add'>+			dma++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_IO:</div><div class='ctx'> 			pnp_dbg("Encode io");</div><div class='ctx'> 			pnpacpi_encode_io(resource,</div><div class='ctx'> 				&amp;res_table-&gt;port_resource[port]);</div><div class='del'>-			port ++;</div><div class='add'>+			port++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_FIXED_IO:</div><div class='ctx'> 			pnp_dbg("Encode fixed io");</div><div class='ctx'> 			pnpacpi_encode_fixed_io(resource,</div><div class='ctx'> 				&amp;res_table-&gt;port_resource[port]);</div><div class='del'>-			port ++;</div><div class='add'>+			port++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_MEMORY24:</div><div class='ctx'> 			pnp_dbg("Encode mem24");</div><div class='ctx'> 			pnpacpi_encode_mem24(resource,</div><div class='ctx'> 				&amp;res_table-&gt;mem_resource[mem]);</div><div class='del'>-			mem ++;</div><div class='add'>+			mem++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_MEMORY32:</div><div class='ctx'> 			pnp_dbg("Encode mem32");</div><div class='ctx'> 			pnpacpi_encode_mem32(resource,</div><div class='ctx'> 				&amp;res_table-&gt;mem_resource[mem]);</div><div class='del'>-			mem ++;</div><div class='add'>+			mem++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:</div><div class='ctx'> 			pnp_dbg("Encode fixed mem32");</div><div class='ctx'> 			pnpacpi_encode_fixed_mem32(resource,</div><div class='ctx'> 				&amp;res_table-&gt;mem_resource[mem]);</div><div class='del'>-			mem ++;</div><div class='add'>+			mem++;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:</div><div class='ctx'> 			pnp_dbg("Encode ext irq");</div><div class='hunk'>@@ -933,8 +915,8 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,</div><div class='ctx'> 			pnp_warn("unknown resource type %d", resource-&gt;type);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		resource ++;</div><div class='del'>-		i ++;</div><div class='add'>+		resource++;</div><div class='add'>+		i++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c<br/>index c89c98a2cca8..ef508a4de557 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/pnpbios/rsparser.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/pnpbios/rsparser.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/pnpbios/rsparser.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/pnpbios/rsparser.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;linux/pnpbios.h&gt;</div><div class='head'>diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c<br/>index 8936b0cb2ec3..e97ecefe8584 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/quirks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/quirks.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *  Copyright (c) 1999 Martin Mares &lt;mj@ucw.cz&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c<br/>index 6ded527169f4..5c8ec21e1086 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/resource.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/resource.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/resource.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/resource.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -241,7 +240,7 @@ int pnp_check_port(struct pnp_dev * dev, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int tmp;</div><div class='ctx'> 	struct pnp_dev *tdev;</div><div class='del'>-	unsigned long *port, *end, *tport, *tend;</div><div class='add'>+	resource_size_t *port, *end, *tport, *tend;</div><div class='ctx'> 	port = &amp;dev-&gt;res.port_resource[idx].start;</div><div class='ctx'> 	end = &amp;dev-&gt;res.port_resource[idx].end;</div><div class='ctx'> </div><div class='hunk'>@@ -297,7 +296,7 @@ int pnp_check_mem(struct pnp_dev * dev, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int tmp;</div><div class='ctx'> 	struct pnp_dev *tdev;</div><div class='del'>-	unsigned long *addr, *end, *taddr, *tend;</div><div class='add'>+	resource_size_t *addr, *end, *taddr, *tend;</div><div class='ctx'> 	addr = &amp;dev-&gt;res.mem_resource[idx].start;</div><div class='ctx'> 	end = &amp;dev-&gt;res.mem_resource[idx].end;</div><div class='ctx'> </div><div class='hunk'>@@ -358,7 +357,7 @@ int pnp_check_irq(struct pnp_dev * dev, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int tmp;</div><div class='ctx'> 	struct pnp_dev *tdev;</div><div class='del'>-	unsigned long * irq = &amp;dev-&gt;res.irq_resource[idx].start;</div><div class='add'>+	resource_size_t * irq = &amp;dev-&gt;res.irq_resource[idx].start;</div><div class='ctx'> </div><div class='ctx'> 	/* if the resource doesn't exist, don't complain about it */</div><div class='ctx'> 	if (cannot_compare(dev-&gt;res.irq_resource[idx].flags))</div><div class='hunk'>@@ -396,7 +395,8 @@ int pnp_check_irq(struct pnp_dev * dev, int idx)</div><div class='ctx'> 	/* check if the resource is already in use, skip if the</div><div class='ctx'> 	 * device is active because it itself may be in use */</div><div class='ctx'> 	if(!dev-&gt;active) {</div><div class='del'>-		if (request_irq(*irq, pnp_test_handler, SA_INTERRUPT, "pnp", NULL))</div><div class='add'>+		if (request_irq(*irq, pnp_test_handler,</div><div class='add'>+				IRQF_DISABLED|IRQF_PROBE_SHARED, "pnp", NULL))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		free_irq(*irq, NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -423,7 +423,7 @@ int pnp_check_dma(struct pnp_dev * dev, int idx)</div><div class='ctx'> #ifndef CONFIG_IA64</div><div class='ctx'> 	int tmp;</div><div class='ctx'> 	struct pnp_dev *tdev;</div><div class='del'>-	unsigned long * dma = &amp;dev-&gt;res.dma_resource[idx].start;</div><div class='add'>+	resource_size_t * dma = &amp;dev-&gt;res.dma_resource[idx].start;</div><div class='ctx'> </div><div class='ctx'> 	/* if the resource doesn't exist, don't complain about it */</div><div class='ctx'> 	if (cannot_compare(dev-&gt;res.dma_resource[idx].flags))</div><div class='head'>diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c<br/>index 61fe998944bd..946a0dcd627d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/pnp/support.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/pnp/support.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/pnp/support.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/pnp/support.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='head'>diff --git a/drivers/rapidio/rio-access.c b/drivers/rapidio/rio-access.c<br/>index b9fab2ae3a36..8b56bbdd011e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rapidio/rio-access.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio-access.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rapidio/rio-access.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rapidio/rio-access.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'>  * These interrupt-safe spinlocks protect all accesses to RIO</div><div class='ctx'>  * configuration space and doorbell access.</div><div class='ctx'>  */</div><div class='del'>-static spinlock_t rio_config_lock = SPIN_LOCK_UNLOCKED;</div><div class='del'>-static spinlock_t rio_doorbell_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(rio_config_lock);</div><div class='add'>+static DEFINE_SPINLOCK(rio_doorbell_lock);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Wrappers for all RIO configuration access functions.  They just check</div><div class='head'>diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c<br/>index 94e30fe4b8f3..7bf7b2c88245 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rapidio/rio-scan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio-scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rapidio/rio-scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rapidio/rio-scan.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c<br/>index bef9316e95df..5687b8fcbf93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rapidio/rio-sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio-sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rapidio/rio-sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rapidio/rio-sysfs.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/rio.h&gt;</div><div class='ctx'> #include &lt;linux/rio_drv.h&gt;</div><div class='head'>diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c<br/>index 5e382470faa2..f644807da2f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rapidio/rio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rapidio/rio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rapidio/rio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rapidio/rio.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig<br/>index 65d090dbef46..7ff1d88094b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/Kconfig</a></div><div class='hunk'>@@ -15,7 +15,7 @@ config RTC_CLASS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Generic RTC class support. If you say yes here, you will</div><div class='ctx'>  	  be allowed to plug one or more RTCs to your system. You will</div><div class='del'>-	  probably want to enable one of more of the interfaces below.</div><div class='add'>+	  probably want to enable one or more of the interfaces below.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-class.</div><div class='hunk'>@@ -73,6 +73,13 @@ config RTC_INTF_DEV</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-dev.</div><div class='ctx'> </div><div class='add'>+config RTC_INTF_DEV_UIE_EMUL</div><div class='add'>+	bool "RTC UIE emulation on dev interface"</div><div class='add'>+	depends on RTC_INTF_DEV</div><div class='add'>+	help</div><div class='add'>+	  Provides an emulation for RTC_UIE if the underlaying rtc chip</div><div class='add'>+	  driver did not provide RTC_UIE ioctls.</div><div class='add'>+</div><div class='ctx'> comment "RTC drivers"</div><div class='ctx'> 	depends on RTC_CLASS</div><div class='ctx'> </div><div class='hunk'>@@ -86,6 +93,44 @@ config RTC_DRV_X1205</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-x1205.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_DS1307</div><div class='add'>+	tristate "Dallas/Maxim DS1307 and similar I2C RTC chips"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; I2C</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for various compatible RTC</div><div class='add'>+	  chips (often with battery backup) connected with I2C.  This driver</div><div class='add'>+	  should handle DS1307, DS1337, DS1338, DS1339, DS1340, ST M41T00,</div><div class='add'>+	  and probably other chips.  In some cases the RTC must already</div><div class='add'>+	  have been initialized (by manufacturing or a bootloader).</div><div class='add'>+</div><div class='add'>+	  The first seven registers on these chips hold an RTC, and other</div><div class='add'>+	  registers may add features such as NVRAM, a trickle charger for</div><div class='add'>+	  the RTC/NVRAM backup power, and alarms.  This driver may not</div><div class='add'>+	  expose all those available chip features.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-ds1307.</div><div class='add'>+</div><div class='add'>+config RTC_DRV_DS1553</div><div class='add'>+	tristate "Dallas DS1553"</div><div class='add'>+	depends on RTC_CLASS</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the</div><div class='add'>+	  Dallas DS1553 timekeeping chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-ds1553.</div><div class='add'>+</div><div class='add'>+config RTC_DRV_ISL1208</div><div class='add'>+	tristate "Intersil 1208"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; I2C</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the</div><div class='add'>+	  Intersil 1208 RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-isl1208.</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_DS1672</div><div class='ctx'> 	tristate "Dallas/Maxim DS1672"</div><div class='ctx'> 	depends on RTC_CLASS &amp;&amp; I2C</div><div class='hunk'>@@ -96,6 +141,16 @@ config RTC_DRV_DS1672</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-ds1672.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_DS1742</div><div class='add'>+	tristate "Dallas DS1742"</div><div class='add'>+	depends on RTC_CLASS</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the</div><div class='add'>+	  Dallas DS1742 timekeeping chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-ds1742.</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_PCF8563</div><div class='ctx'> 	tristate "Philips PCF8563/Epson RTC8564"</div><div class='ctx'> 	depends on RTC_CLASS &amp;&amp; I2C</div><div class='hunk'>@@ -107,6 +162,26 @@ config RTC_DRV_PCF8563</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-pcf8563.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_PCF8583</div><div class='add'>+	tristate "Philips PCF8583"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; I2C</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the</div><div class='add'>+	  Philips PCF8583 RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-pcf8583.</div><div class='add'>+</div><div class='add'>+config RTC_DRV_RS5C348</div><div class='add'>+	tristate "Ricoh RS5C348A/B"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; SPI</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you get support for the</div><div class='add'>+	  Ricoh RS5C348A and RS5C348B RTC chips.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-rs5c348.</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_RS5C372</div><div class='ctx'> 	tristate "Ricoh RS5C372A/B"</div><div class='ctx'> 	depends on RTC_CLASS &amp;&amp; I2C</div><div class='hunk'>@@ -117,6 +192,22 @@ config RTC_DRV_RS5C372</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-rs5c372.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_S3C</div><div class='add'>+	tristate "Samsung S3C series SoC RTC"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; ARCH_S3C2410</div><div class='add'>+	help</div><div class='add'>+	  RTC (Realtime Clock) driver for the clock inbuilt into the</div><div class='add'>+	  Samsung S3C24XX series of SoCs. This can provide periodic</div><div class='add'>+	  interrupt rates from 1Hz to 64Hz for user programs, and</div><div class='add'>+	  wakeup from Alarm.</div><div class='add'>+</div><div class='add'>+	  The driver currently supports the common features on all the</div><div class='add'>+	  S3C24XX range, such as the S3C2410, S3C2412, S3C2413, S3C2440</div><div class='add'>+	  and S3C2442.</div><div class='add'>+</div><div class='add'>+	  This driver can also be build as a module. If so, the module</div><div class='add'>+	  will be called rtc-s3c.</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_M48T86</div><div class='ctx'> 	tristate "ST M48T86/Dallas DS12887"</div><div class='ctx'> 	depends on RTC_CLASS</div><div class='hunk'>@@ -157,6 +248,22 @@ config RTC_DRV_VR41XX</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called rtc-vr41xx.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_PL031</div><div class='add'>+	tristate "ARM AMBA PL031 RTC"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; ARM_AMBA</div><div class='add'>+	help</div><div class='add'>+	  If you say Y here you will get access to ARM AMBA</div><div class='add'>+	  PrimeCell PL031 UART found on certain ARM SOCs.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called rtc-pl031.</div><div class='add'>+</div><div class='add'>+config RTC_DRV_AT91</div><div class='add'>+	tristate "AT91RM9200"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; ARCH_AT91RM9200</div><div class='add'>+	help</div><div class='add'>+	  Driver for the Atmel AT91RM9200's internal RTC (Realtime Clock).</div><div class='add'>+</div><div class='ctx'> config RTC_DRV_TEST</div><div class='ctx'> 	tristate "Test driver/device"</div><div class='ctx'> 	depends on RTC_CLASS</div><div class='hunk'>@@ -172,4 +279,24 @@ config RTC_DRV_TEST</div><div class='ctx'> 	  This driver can also be built as a module. If so, the module</div><div class='ctx'> 	  will be called rtc-test.</div><div class='ctx'> </div><div class='add'>+config RTC_DRV_MAX6902</div><div class='add'>+	tristate "Maxim 6902"</div><div class='add'>+	depends on RTC_CLASS &amp;&amp; SPI</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you will get support for the</div><div class='add'>+	  Maxim MAX6902 spi RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-max6902.</div><div class='add'>+</div><div class='add'>+config RTC_DRV_V3020</div><div class='add'>+	tristate "EM Microelectronic V3020"</div><div class='add'>+	depends on RTC_CLASS</div><div class='add'>+	help</div><div class='add'>+	  If you say yes here you will get support for the</div><div class='add'>+	  EM Microelectronic v3020 RTC chip.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called rtc-v3020.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile<br/>index a9ca0f171686..bbcfb09d81d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/Makefile</a></div><div class='hunk'>@@ -12,11 +12,22 @@ obj-$(CONFIG_RTC_INTF_PROC)	+= rtc-proc.o</div><div class='ctx'> obj-$(CONFIG_RTC_INTF_DEV)	+= rtc-dev.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_ISL1208)	+= rtc-isl1208.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_TEST)	+= rtc-test.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_DS1307)	+= rtc-ds1307.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_DS1672)	+= rtc-ds1672.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_DS1742)	+= rtc-ds1742.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_PCF8563)	+= rtc-pcf8563.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_PCF8583)	+= rtc-pcf8583.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_S3C)	+= rtc-s3c.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_M48T86)	+= rtc-m48t86.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_DS1553)	+= rtc-ds1553.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_SA1100)	+= rtc-sa1100.o</div><div class='ctx'> obj-$(CONFIG_RTC_DRV_VR41XX)	+= rtc-vr41xx.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_MAX6902)	+= rtc-max6902.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_V3020)	+= rtc-v3020.o</div><div class='add'>+obj-$(CONFIG_RTC_DRV_AT91)	+= rtc-at91.o</div><div class='head'>diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c<br/>index 413c7d54ea10..1cb61a761cb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/class.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/class.c</a></div><div class='hunk'>@@ -69,6 +69,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,</div><div class='ctx'> 	rtc-&gt;id = id;</div><div class='ctx'> 	rtc-&gt;ops = ops;</div><div class='ctx'> 	rtc-&gt;owner = owner;</div><div class='add'>+	rtc-&gt;max_user_freq = 64;</div><div class='ctx'> 	rtc-&gt;class_dev.dev = dev;</div><div class='ctx'> 	rtc-&gt;class_dev.class = rtc_class;</div><div class='ctx'> 	rtc-&gt;class_dev.release = rtc_device_release;</div><div class='hunk'>@@ -93,7 +94,9 @@ exit_kfree:</div><div class='ctx'> 	kfree(rtc);</div><div class='ctx'> </div><div class='ctx'> exit_idr:</div><div class='add'>+	mutex_lock(&amp;idr_lock);</div><div class='ctx'> 	idr_remove(&amp;rtc_idr, id);</div><div class='add'>+	mutex_unlock(&amp;idr_lock);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	dev_err(dev, "rtc core: unable to register %s, err = %d\n",</div><div class='head'>diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c<br/>index 56e490709b87..579cd667b16f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/interface.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/interface.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/interface.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/interface.c</a></div><div class='hunk'>@@ -229,6 +229,9 @@ int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct rtc_device *rtc = to_rtc_device(class_dev);</div><div class='ctx'> </div><div class='add'>+	if (rtc-&gt;ops-&gt;irq_set_state == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;rtc-&gt;irq_task_lock, flags);</div><div class='ctx'> 	if (rtc-&gt;irq_task != task)</div><div class='ctx'> 		err = -ENXIO;</div><div class='hunk'>@@ -243,25 +246,12 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_state);</div><div class='ctx'> </div><div class='ctx'> int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int freq)</div><div class='ctx'> {</div><div class='del'>-	int err = 0, tmp = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct rtc_device *rtc = to_rtc_device(class_dev);</div><div class='ctx'> </div><div class='del'>-	/* allowed range is 2-8192 */</div><div class='del'>-	if (freq &lt; 2 || freq &gt; 8192)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-/*</div><div class='del'>-	FIXME: this does not belong here, will move where appropriate</div><div class='del'>-	at a later stage. It cannot hurt right now, trust me :)</div><div class='del'>-	if ((freq &gt; rtc_max_user_freq) &amp;&amp; (!capable(CAP_SYS_RESOURCE)))</div><div class='del'>-		return -EACCES;</div><div class='del'>-*/</div><div class='del'>-	/* check if freq is a power of 2 */</div><div class='del'>-	while (freq &gt; (1 &lt;&lt; tmp))</div><div class='del'>-		tmp++;</div><div class='del'>-</div><div class='del'>-	if (freq != (1 &lt;&lt; tmp))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (rtc-&gt;ops-&gt;irq_set_freq == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;rtc-&gt;irq_task_lock, flags);</div><div class='ctx'> 	if (rtc-&gt;irq_task != task)</div><div class='head'>diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91.c<br/>new file mode 100644<br/>index 000000000000..dfd0ce86f6a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-at91.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-at91.c</a></div><div class='hunk'>@@ -0,0 +1,407 @@</div><div class='add'>+/*</div><div class='add'>+ *	Real Time Clock interface for Linux on Atmel AT91RM9200</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (C) 2002 Rick Bronson</div><div class='add'>+ *</div><div class='add'>+ *	Converted to RTC class model by Andrew Victor</div><div class='add'>+ *</div><div class='add'>+ *	Ported to Linux 2.6 by Steven Scholz</div><div class='add'>+ *	Based on s3c2410-rtc.c Simtec Electronics</div><div class='add'>+ *</div><div class='add'>+ *	Based on sa1100-rtc.c by Nils Faerber</div><div class='add'>+ *	Based on rtc.c by Paul Gortmaker</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License</div><div class='add'>+ *	as published by the Free Software Foundation; either version</div><div class='add'>+ *	2 of the License, or (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/ioctl.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define AT91_RTC_FREQ		1</div><div class='add'>+#define AT91_RTC_EPOCH		1900UL	/* just like arch/arm/common/rtctime.c */</div><div class='add'>+</div><div class='add'>+static DECLARE_COMPLETION(at91_rtc_updated);</div><div class='add'>+static unsigned int at91_alarm_year = AT91_RTC_EPOCH;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Decode time/date into rtc_time structure</div><div class='add'>+ */</div><div class='add'>+static void at91_rtc_decodetime(unsigned int timereg, unsigned int calreg,</div><div class='add'>+				struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	unsigned int time, date;</div><div class='add'>+</div><div class='add'>+	/* must read twice in case it changes */</div><div class='add'>+	do {</div><div class='add'>+		time = at91_sys_read(timereg);</div><div class='add'>+		date = at91_sys_read(calreg);</div><div class='add'>+	} while ((time != at91_sys_read(timereg)) ||</div><div class='add'>+			(date != at91_sys_read(calreg)));</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec  = BCD2BIN((time &amp; AT91_RTC_SEC) &gt;&gt; 0);</div><div class='add'>+	tm-&gt;tm_min  = BCD2BIN((time &amp; AT91_RTC_MIN) &gt;&gt; 8);</div><div class='add'>+	tm-&gt;tm_hour = BCD2BIN((time &amp; AT91_RTC_HOUR) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The Calendar Alarm register does not have a field for</div><div class='add'>+	 * the year - so these will return an invalid value.  When an</div><div class='add'>+	 * alarm is set, at91_alarm_year wille store the current year.</div><div class='add'>+	 */</div><div class='add'>+	tm-&gt;tm_year  = BCD2BIN(date &amp; AT91_RTC_CENT) * 100;	/* century */</div><div class='add'>+	tm-&gt;tm_year += BCD2BIN((date &amp; AT91_RTC_YEAR) &gt;&gt; 8);	/* year */</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_wday = BCD2BIN((date &amp; AT91_RTC_DAY) &gt;&gt; 21) - 1;	/* day of the week [0-6], Sunday=0 */</div><div class='add'>+	tm-&gt;tm_mon  = BCD2BIN((date &amp; AT91_RTC_MONTH) &gt;&gt; 16) - 1;</div><div class='add'>+	tm-&gt;tm_mday = BCD2BIN((date &amp; AT91_RTC_DATE) &gt;&gt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read current time and date in RTC</div><div class='add'>+ */</div><div class='add'>+static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	at91_rtc_decodetime(AT91_RTC_TIMR, AT91_RTC_CALR, tm);</div><div class='add'>+	tm-&gt;tm_yday = rtc_year_days(tm-&gt;tm_mday, tm-&gt;tm_mon, tm-&gt;tm_year);</div><div class='add'>+	tm-&gt;tm_year = tm-&gt;tm_year - 1900;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,</div><div class='add'>+		1900 + tm-&gt;tm_year, tm-&gt;tm_mon, tm-&gt;tm_mday,</div><div class='add'>+		tm-&gt;tm_hour, tm-&gt;tm_min, tm-&gt;tm_sec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set current time and date in RTC</div><div class='add'>+ */</div><div class='add'>+static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	unsigned long cr;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,</div><div class='add'>+		1900 + tm-&gt;tm_year, tm-&gt;tm_mon, tm-&gt;tm_mday,</div><div class='add'>+		tm-&gt;tm_hour, tm-&gt;tm_min, tm-&gt;tm_sec);</div><div class='add'>+</div><div class='add'>+	/* Stop Time/Calendar from counting */</div><div class='add'>+	cr = at91_sys_read(AT91_RTC_CR);</div><div class='add'>+	at91_sys_write(AT91_RTC_CR, cr | AT91_RTC_UPDCAL | AT91_RTC_UPDTIM);</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_RTC_IER, AT91_RTC_ACKUPD);</div><div class='add'>+	wait_for_completion(&amp;at91_rtc_updated);	/* wait for ACKUPD interrupt */</div><div class='add'>+	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD);</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_RTC_TIMR,</div><div class='add'>+			  BIN2BCD(tm-&gt;tm_sec) &lt;&lt; 0</div><div class='add'>+			| BIN2BCD(tm-&gt;tm_min) &lt;&lt; 8</div><div class='add'>+			| BIN2BCD(tm-&gt;tm_hour) &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_RTC_CALR,</div><div class='add'>+			  BIN2BCD((tm-&gt;tm_year + 1900) / 100)	/* century */</div><div class='add'>+			| BIN2BCD(tm-&gt;tm_year % 100) &lt;&lt; 8	/* year */</div><div class='add'>+			| BIN2BCD(tm-&gt;tm_mon + 1) &lt;&lt; 16		/* tm_mon starts at zero */</div><div class='add'>+			| BIN2BCD(tm-&gt;tm_wday + 1) &lt;&lt; 21	/* day of the week [0-6], Sunday=0 */</div><div class='add'>+			| BIN2BCD(tm-&gt;tm_mday) &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+	/* Restart Time/Calendar */</div><div class='add'>+	cr = at91_sys_read(AT91_RTC_CR);</div><div class='add'>+	at91_sys_write(AT91_RTC_CR, cr &amp; ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read alarm time and date in RTC</div><div class='add'>+ */</div><div class='add'>+static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time *tm = &amp;alrm-&gt;time;</div><div class='add'>+</div><div class='add'>+	at91_rtc_decodetime(AT91_RTC_TIMALR, AT91_RTC_CALALR, tm);</div><div class='add'>+	tm-&gt;tm_yday = rtc_year_days(tm-&gt;tm_mday, tm-&gt;tm_mon, tm-&gt;tm_year);</div><div class='add'>+	tm-&gt;tm_year = at91_alarm_year - 1900;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,</div><div class='add'>+		1900 + tm-&gt;tm_year, tm-&gt;tm_mon, tm-&gt;tm_mday,</div><div class='add'>+		tm-&gt;tm_hour, tm-&gt;tm_min, tm-&gt;tm_sec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set alarm time and date in RTC</div><div class='add'>+ */</div><div class='add'>+static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+</div><div class='add'>+	at91_rtc_decodetime(AT91_RTC_TIMR, AT91_RTC_CALR, &amp;tm);</div><div class='add'>+</div><div class='add'>+	at91_alarm_year = tm.tm_year;</div><div class='add'>+</div><div class='add'>+	tm.tm_hour = alrm-&gt;time.tm_hour;</div><div class='add'>+	tm.tm_min = alrm-&gt;time.tm_min;</div><div class='add'>+	tm.tm_sec = alrm-&gt;time.tm_sec;</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_RTC_TIMALR,</div><div class='add'>+		  BIN2BCD(tm.tm_sec) &lt;&lt; 0</div><div class='add'>+		| BIN2BCD(tm.tm_min) &lt;&lt; 8</div><div class='add'>+		| BIN2BCD(tm.tm_hour) &lt;&lt; 16</div><div class='add'>+		| AT91_RTC_HOUREN | AT91_RTC_MINEN | AT91_RTC_SECEN);</div><div class='add'>+	at91_sys_write(AT91_RTC_CALALR,</div><div class='add'>+		  BIN2BCD(tm.tm_mon + 1) &lt;&lt; 16		/* tm_mon starts at zero */</div><div class='add'>+		| BIN2BCD(tm.tm_mday) &lt;&lt; 24</div><div class='add'>+		| AT91_RTC_DATEEN | AT91_RTC_MTHEN);</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,</div><div class='add'>+		at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,</div><div class='add'>+		tm.tm_min, tm.tm_sec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle commands from user-space</div><div class='add'>+ */</div><div class='add'>+static int at91_rtc_ioctl(struct device *dev, unsigned int cmd,</div><div class='add'>+			unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __FUNCTION__, cmd, arg);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_AIE_OFF:	/* alarm off */</div><div class='add'>+		at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_AIE_ON:	/* alarm on */</div><div class='add'>+		at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_UIE_OFF:	/* update off */</div><div class='add'>+	case RTC_PIE_OFF:	/* periodic off */</div><div class='add'>+		at91_sys_write(AT91_RTC_IDR, AT91_RTC_SECEV);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_UIE_ON:	/* update on */</div><div class='add'>+	case RTC_PIE_ON:	/* periodic on */</div><div class='add'>+		at91_sys_write(AT91_RTC_IER, AT91_RTC_SECEV);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_IRQP_READ:	/* read periodic alarm frequency */</div><div class='add'>+		ret = put_user(AT91_RTC_FREQ, (unsigned long *) arg);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_IRQP_SET:	/* set periodic alarm frequency */</div><div class='add'>+		if (arg != AT91_RTC_FREQ)</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -ENOIOCTLCMD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Provide additional RTC information in /proc/driver/rtc</div><div class='add'>+ */</div><div class='add'>+static int at91_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	unsigned long imr = at91_sys_read(AT91_RTC_IMR);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "alarm_IRQ\t: %s\n",</div><div class='add'>+			(imr &amp; AT91_RTC_ALARM) ? "yes" : "no");</div><div class='add'>+	seq_printf(seq, "update_IRQ\t: %s\n",</div><div class='add'>+			(imr &amp; AT91_RTC_ACKUPD) ? "yes" : "no");</div><div class='add'>+	seq_printf(seq, "periodic_IRQ\t: %s\n",</div><div class='add'>+			(imr &amp; AT91_RTC_SECEV) ? "yes" : "no");</div><div class='add'>+	seq_printf(seq, "periodic_freq\t: %ld\n",</div><div class='add'>+			(unsigned long) AT91_RTC_FREQ);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * IRQ handler for the RTC</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id,</div><div class='add'>+					struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = dev_id;</div><div class='add'>+	struct rtc_device *rtc = platform_get_drvdata(pdev);</div><div class='add'>+	unsigned int rtsr;</div><div class='add'>+	unsigned long events = 0;</div><div class='add'>+</div><div class='add'>+	rtsr = at91_sys_read(AT91_RTC_SR) &amp; at91_sys_read(AT91_RTC_IMR);</div><div class='add'>+	if (rtsr) {		/* this interrupt is shared!  Is it ours? */</div><div class='add'>+		if (rtsr &amp; AT91_RTC_ALARM)</div><div class='add'>+			events |= (RTC_AF | RTC_IRQF);</div><div class='add'>+		if (rtsr &amp; AT91_RTC_SECEV)</div><div class='add'>+			events |= (RTC_UF | RTC_IRQF);</div><div class='add'>+		if (rtsr &amp; AT91_RTC_ACKUPD)</div><div class='add'>+			complete(&amp;at91_rtc_updated);</div><div class='add'>+</div><div class='add'>+		at91_sys_write(AT91_RTC_SCCR, rtsr);	/* clear status reg */</div><div class='add'>+</div><div class='add'>+		rtc_update_irq(&amp;rtc-&gt;class_dev, 1, events);</div><div class='add'>+</div><div class='add'>+		pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__,</div><div class='add'>+			events &gt;&gt; 8, events &amp; 0x000000FF);</div><div class='add'>+</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	return IRQ_NONE;		/* not handled */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops at91_rtc_ops = {</div><div class='add'>+	.ioctl		= at91_rtc_ioctl,</div><div class='add'>+	.read_time	= at91_rtc_readtime,</div><div class='add'>+	.set_time	= at91_rtc_settime,</div><div class='add'>+	.read_alarm	= at91_rtc_readalarm,</div><div class='add'>+	.set_alarm	= at91_rtc_setalarm,</div><div class='add'>+	.proc		= at91_rtc_proc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize and install RTC driver</div><div class='add'>+ */</div><div class='add'>+static int __init at91_rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	at91_sys_write(AT91_RTC_CR, 0);</div><div class='add'>+	at91_sys_write(AT91_RTC_MR, 0);		/* 24 hour mode */</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts */</div><div class='add'>+	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |</div><div class='add'>+					AT91_RTC_SECEV | AT91_RTC_TIMEV |</div><div class='add'>+					AT91_RTC_CALEV);</div><div class='add'>+</div><div class='add'>+	ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,</div><div class='add'>+				IRQF_SHARED, "at91_rtc", pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n",</div><div class='add'>+				AT91_ID_SYS);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev,</div><div class='add'>+				&amp;at91_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		free_irq(AT91_ID_SYS, pdev);</div><div class='add'>+		return PTR_ERR(rtc);</div><div class='add'>+	}</div><div class='add'>+	platform_set_drvdata(pdev, rtc);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "AT91 Real Time Clock driver.\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable and remove the RTC driver</div><div class='add'>+ */</div><div class='add'>+static int __devexit at91_rtc_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts */</div><div class='add'>+	at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |</div><div class='add'>+					AT91_RTC_SECEV | AT91_RTC_TIMEV |</div><div class='add'>+					AT91_RTC_CALEV);</div><div class='add'>+	free_irq(AT91_ID_SYS, pdev);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(rtc);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+/* AT91RM9200 RTC Power management control */</div><div class='add'>+</div><div class='add'>+static struct timespec at91_rtc_delta;</div><div class='add'>+</div><div class='add'>+static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+	struct timespec time;</div><div class='add'>+</div><div class='add'>+	time.tv_nsec = 0;</div><div class='add'>+</div><div class='add'>+	/* calculate time delta for suspend */</div><div class='add'>+	at91_rtc_readtime(&amp;pdev-&gt;dev, &amp;tm);</div><div class='add'>+	rtc_tm_to_time(&amp;tm, &amp;time.tv_sec);</div><div class='add'>+	save_time_delta(&amp;at91_rtc_delta, &amp;time);</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,</div><div class='add'>+		1900 + tm.tm_year, tm.tm_mon, tm.tm_mday,</div><div class='add'>+		tm.tm_hour, tm.tm_min, tm.tm_sec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int at91_rtc_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+	struct timespec time;</div><div class='add'>+</div><div class='add'>+	time.tv_nsec = 0;</div><div class='add'>+</div><div class='add'>+	at91_rtc_readtime(&amp;pdev-&gt;dev, &amp;tm);</div><div class='add'>+	rtc_tm_to_time(&amp;tm, &amp;time.tv_sec);</div><div class='add'>+	restore_time_delta(&amp;at91_rtc_delta, &amp;time);</div><div class='add'>+</div><div class='add'>+	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,</div><div class='add'>+		1900 + tm.tm_year, tm.tm_mon, tm.tm_mday,</div><div class='add'>+		tm.tm_hour, tm.tm_min, tm.tm_sec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define at91_rtc_suspend NULL</div><div class='add'>+#define at91_rtc_resume  NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver at91_rtc_driver = {</div><div class='add'>+	.probe		= at91_rtc_probe,</div><div class='add'>+	.remove		= at91_rtc_remove,</div><div class='add'>+	.suspend	= at91_rtc_suspend,</div><div class='add'>+	.resume		= at91_rtc_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "at91_rtc",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at91_rtc_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;at91_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit at91_rtc_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;at91_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(at91_rtc_init);</div><div class='add'>+module_exit(at91_rtc_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Rick Bronson");</div><div class='add'>+MODULE_DESCRIPTION("RTC driver for Atmel AT91RM9200");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c<br/>index 2011567005f9..61a58259c93f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-dev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-dev.c</a></div><div class='hunk'>@@ -48,6 +48,93 @@ static int rtc_dev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL</div><div class='add'>+/*</div><div class='add'>+ * Routine to poll RTC seconds field for change as often as possible,</div><div class='add'>+ * after first RTC_UIE use timer to reduce polling</div><div class='add'>+ */</div><div class='add'>+static void rtc_uie_task(void *data)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc = data;</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+	int num = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rtc_read_time(&amp;rtc-&gt;class_dev, &amp;tm);</div><div class='add'>+	spin_lock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+	if (rtc-&gt;stop_uie_polling || err) {</div><div class='add'>+		rtc-&gt;uie_task_active = 0;</div><div class='add'>+	} else if (rtc-&gt;oldsecs != tm.tm_sec) {</div><div class='add'>+		num = (tm.tm_sec + 60 - rtc-&gt;oldsecs) % 60;</div><div class='add'>+		rtc-&gt;oldsecs = tm.tm_sec;</div><div class='add'>+		rtc-&gt;uie_timer.expires = jiffies + HZ - (HZ/10);</div><div class='add'>+		rtc-&gt;uie_timer_active = 1;</div><div class='add'>+		rtc-&gt;uie_task_active = 0;</div><div class='add'>+		add_timer(&amp;rtc-&gt;uie_timer);</div><div class='add'>+	} else if (schedule_work(&amp;rtc-&gt;uie_task) == 0) {</div><div class='add'>+		rtc-&gt;uie_task_active = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+	if (num)</div><div class='add'>+		rtc_update_irq(&amp;rtc-&gt;class_dev, num, RTC_UF | RTC_IRQF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtc_uie_timer(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc = (struct rtc_device *)data;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;rtc-&gt;irq_lock, flags);</div><div class='add'>+	rtc-&gt;uie_timer_active = 0;</div><div class='add'>+	rtc-&gt;uie_task_active = 1;</div><div class='add'>+	if ((schedule_work(&amp;rtc-&gt;uie_task) == 0))</div><div class='add'>+		rtc-&gt;uie_task_active = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;rtc-&gt;irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_uie(struct rtc_device *rtc)</div><div class='add'>+{</div><div class='add'>+	spin_lock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+	if (rtc-&gt;irq_active) {</div><div class='add'>+		rtc-&gt;stop_uie_polling = 1;</div><div class='add'>+		if (rtc-&gt;uie_timer_active) {</div><div class='add'>+			spin_unlock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+			del_timer_sync(&amp;rtc-&gt;uie_timer);</div><div class='add'>+			spin_lock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+			rtc-&gt;uie_timer_active = 0;</div><div class='add'>+		}</div><div class='add'>+		if (rtc-&gt;uie_task_active) {</div><div class='add'>+			spin_unlock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+			flush_scheduled_work();</div><div class='add'>+			spin_lock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+		}</div><div class='add'>+		rtc-&gt;irq_active = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_uie(struct rtc_device *rtc)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = rtc_read_time(&amp;rtc-&gt;class_dev, &amp;tm);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	spin_lock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+	if (!rtc-&gt;irq_active) {</div><div class='add'>+		rtc-&gt;irq_active = 1;</div><div class='add'>+		rtc-&gt;stop_uie_polling = 0;</div><div class='add'>+		rtc-&gt;oldsecs = tm.tm_sec;</div><div class='add'>+		rtc-&gt;uie_task_active = 1;</div><div class='add'>+		if (schedule_work(&amp;rtc-&gt;uie_task) == 0)</div><div class='add'>+			rtc-&gt;uie_task_active = 0;</div><div class='add'>+	}</div><div class='add'>+	rtc-&gt;irq_data = 0;</div><div class='add'>+	spin_unlock_irq(&amp;rtc-&gt;irq_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_RTC_INTF_DEV_UIE_EMUL */</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)</div><div class='hunk'>@@ -127,6 +214,28 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 	struct rtc_wkalrm alarm;</div><div class='ctx'> 	void __user *uarg = (void __user *) arg;</div><div class='ctx'> </div><div class='add'>+	/* check that the calles has appropriate permissions</div><div class='add'>+	 * for certain ioctls. doing this check here is useful</div><div class='add'>+	 * to avoid duplicate code in each driver.</div><div class='add'>+	 */</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_EPOCH_SET:</div><div class='add'>+	case RTC_SET_TIME:</div><div class='add'>+		if (!capable(CAP_SYS_TIME))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_IRQP_SET:</div><div class='add'>+		if (arg &gt; rtc-&gt;max_user_freq &amp;&amp; !capable(CAP_SYS_RESOURCE))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_PIE_ON:</div><div class='add'>+		if (!capable(CAP_SYS_RESOURCE))</div><div class='add'>+			return -EACCES;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* avoid conflicting IRQ users */</div><div class='ctx'> 	if (cmd == RTC_PIE_ON || cmd == RTC_PIE_OFF || cmd == RTC_IRQP_SET) {</div><div class='ctx'> 		spin_lock(&amp;rtc-&gt;irq_task_lock);</div><div class='hunk'>@@ -185,9 +294,6 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case RTC_SET_TIME:</div><div class='del'>-		if (!capable(CAP_SYS_TIME))</div><div class='del'>-			return -EACCES;</div><div class='del'>-</div><div class='ctx'> 		if (copy_from_user(&amp;tm, uarg, sizeof(tm)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -203,10 +309,6 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!capable(CAP_SYS_TIME)) {</div><div class='del'>-			err = -EACCES;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		rtc_epoch = arg;</div><div class='ctx'> 		err = 0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -232,6 +334,14 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL</div><div class='add'>+	case RTC_UIE_OFF:</div><div class='add'>+		clear_uie(rtc);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case RTC_UIE_ON:</div><div class='add'>+		return set_uie(rtc);</div><div class='add'>+#endif</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOTTY;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -244,6 +354,9 @@ static int rtc_dev_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtc_device *rtc = to_rtc_device(file-&gt;private_data);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL</div><div class='add'>+	clear_uie(rtc);</div><div class='add'>+#endif</div><div class='ctx'> 	if (rtc-&gt;ops-&gt;release)</div><div class='ctx'> 		rtc-&gt;ops-&gt;release(rtc-&gt;class_dev.dev);</div><div class='ctx'> </div><div class='hunk'>@@ -284,6 +397,10 @@ static int rtc_dev_add_device(struct class_device *class_dev,</div><div class='ctx'> 	mutex_init(&amp;rtc-&gt;char_lock);</div><div class='ctx'> 	spin_lock_init(&amp;rtc-&gt;irq_lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;rtc-&gt;irq_queue);</div><div class='add'>+#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL</div><div class='add'>+	INIT_WORK(&amp;rtc-&gt;uie_task, rtc_uie_task, rtc);</div><div class='add'>+	setup_timer(&amp;rtc-&gt;uie_timer, rtc_uie_timer, (unsigned long)rtc);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	cdev_init(&amp;rtc-&gt;char_dev, &amp;rtc_dev_fops);</div><div class='ctx'> 	rtc-&gt;char_dev.owner = rtc-&gt;owner;</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c<br/>new file mode 100644<br/>index 000000000000..e8afb9384786<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1307.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-ds1307.c</a></div><div class='hunk'>@@ -0,0 +1,388 @@</div><div class='add'>+/*</div><div class='add'>+ * rtc-ds1307.c - RTC driver for some mostly-compatible I2C chips.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2005 James Chapman (ds1337 core)</div><div class='add'>+ *  Copyright (C) 2006 David Brownell</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* We can't determine type by probing, but if we expect pre-Linux code</div><div class='add'>+ * to have set the chip up as a clock (turning on the oscillator and</div><div class='add'>+ * setting the date and time), Linux can ignore the non-clock features.</div><div class='add'>+ * That's a natural job for a factory or repair bench.</div><div class='add'>+ *</div><div class='add'>+ * If the I2C "force" mechanism is used, we assume the chip is a ds1337.</div><div class='add'>+ * (Much better would be board-specific tables of I2C devices, along with</div><div class='add'>+ * the platform_data drivers would use to sort such issues out.)</div><div class='add'>+ */</div><div class='add'>+enum ds_type {</div><div class='add'>+	unknown = 0,</div><div class='add'>+	ds_1307,		/* or ds1338, ... */</div><div class='add'>+	ds_1337,		/* or ds1339, ... */</div><div class='add'>+	ds_1340,		/* or st m41t00, ... */</div><div class='add'>+	// rs5c372 too?  different address...</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* RTC registers don't differ much, except for the century flag */</div><div class='add'>+#define DS1307_REG_SECS		0x00	/* 00-59 */</div><div class='add'>+#	define DS1307_BIT_CH		0x80</div><div class='add'>+#define DS1307_REG_MIN		0x01	/* 00-59 */</div><div class='add'>+#define DS1307_REG_HOUR		0x02	/* 00-23, or 1-12{am,pm} */</div><div class='add'>+#	define DS1340_BIT_CENTURY_EN	0x80	/* in REG_HOUR */</div><div class='add'>+#	define DS1340_BIT_CENTURY	0x40	/* in REG_HOUR */</div><div class='add'>+#define DS1307_REG_WDAY		0x03	/* 01-07 */</div><div class='add'>+#define DS1307_REG_MDAY		0x04	/* 01-31 */</div><div class='add'>+#define DS1307_REG_MONTH	0x05	/* 01-12 */</div><div class='add'>+#	define DS1337_BIT_CENTURY	0x80	/* in REG_MONTH */</div><div class='add'>+#define DS1307_REG_YEAR		0x06	/* 00-99 */</div><div class='add'>+</div><div class='add'>+/* Other registers (control, status, alarms, trickle charge, NVRAM, etc)</div><div class='add'>+ * start at 7, and they differ a lot. Only control and status matter for RTC;</div><div class='add'>+ * be careful using them.</div><div class='add'>+ */</div><div class='add'>+#define DS1307_REG_CONTROL	0x07</div><div class='add'>+#	define DS1307_BIT_OUT		0x80</div><div class='add'>+#	define DS1307_BIT_SQWE		0x10</div><div class='add'>+#	define DS1307_BIT_RS1		0x02</div><div class='add'>+#	define DS1307_BIT_RS0		0x01</div><div class='add'>+#define DS1337_REG_CONTROL	0x0e</div><div class='add'>+#	define DS1337_BIT_nEOSC		0x80</div><div class='add'>+#	define DS1337_BIT_RS2		0x10</div><div class='add'>+#	define DS1337_BIT_RS1		0x08</div><div class='add'>+#	define DS1337_BIT_INTCN		0x04</div><div class='add'>+#	define DS1337_BIT_A2IE		0x02</div><div class='add'>+#	define DS1337_BIT_A1IE		0x01</div><div class='add'>+#define DS1337_REG_STATUS	0x0f</div><div class='add'>+#	define DS1337_BIT_OSF		0x80</div><div class='add'>+#	define DS1337_BIT_A2I		0x02</div><div class='add'>+#	define DS1337_BIT_A1I		0x01</div><div class='add'>+#define DS1339_REG_TRICKLE	0x10</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct ds1307 {</div><div class='add'>+	u8			reg_addr;</div><div class='add'>+	u8			regs[8];</div><div class='add'>+	enum ds_type		type;</div><div class='add'>+	struct i2c_msg		msg[2];</div><div class='add'>+	struct i2c_client	client;</div><div class='add'>+	struct rtc_device	*rtc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ds1307_get_time(struct device *dev, struct rtc_time *t)</div><div class='add'>+{</div><div class='add'>+	struct ds1307	*ds1307 = dev_get_drvdata(dev);</div><div class='add'>+	int		tmp;</div><div class='add'>+</div><div class='add'>+	/* read the RTC registers all at once */</div><div class='add'>+	ds1307-&gt;msg[1].flags = I2C_M_RD;</div><div class='add'>+	ds1307-&gt;msg[1].len = 7;</div><div class='add'>+</div><div class='add'>+	tmp = i2c_transfer(ds1307-&gt;client.adapter, ds1307-&gt;msg, 2);</div><div class='add'>+	if (tmp != 2) {</div><div class='add'>+		dev_err(dev, "%s error %d\n", "read", tmp);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x\n",</div><div class='add'>+			"read",</div><div class='add'>+			ds1307-&gt;regs[0], ds1307-&gt;regs[1],</div><div class='add'>+			ds1307-&gt;regs[2], ds1307-&gt;regs[3],</div><div class='add'>+			ds1307-&gt;regs[4], ds1307-&gt;regs[5],</div><div class='add'>+			ds1307-&gt;regs[6]);</div><div class='add'>+</div><div class='add'>+	t-&gt;tm_sec = BCD2BIN(ds1307-&gt;regs[DS1307_REG_SECS] &amp; 0x7f);</div><div class='add'>+	t-&gt;tm_min = BCD2BIN(ds1307-&gt;regs[DS1307_REG_MIN] &amp; 0x7f);</div><div class='add'>+	tmp = ds1307-&gt;regs[DS1307_REG_HOUR] &amp; 0x3f;</div><div class='add'>+	t-&gt;tm_hour = BCD2BIN(tmp);</div><div class='add'>+	t-&gt;tm_wday = BCD2BIN(ds1307-&gt;regs[DS1307_REG_WDAY] &amp; 0x07) - 1;</div><div class='add'>+	t-&gt;tm_mday = BCD2BIN(ds1307-&gt;regs[DS1307_REG_MDAY] &amp; 0x3f);</div><div class='add'>+	tmp = ds1307-&gt;regs[DS1307_REG_MONTH] &amp; 0x1f;</div><div class='add'>+	t-&gt;tm_mon = BCD2BIN(tmp) - 1;</div><div class='add'>+</div><div class='add'>+	/* assume 20YY not 19YY, and ignore DS1337_BIT_CENTURY */</div><div class='add'>+	t-&gt;tm_year = BCD2BIN(ds1307-&gt;regs[DS1307_REG_YEAR]) + 100;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s secs=%d, mins=%d, "</div><div class='add'>+		"hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",</div><div class='add'>+		"read", t-&gt;tm_sec, t-&gt;tm_min,</div><div class='add'>+		t-&gt;tm_hour, t-&gt;tm_mday,</div><div class='add'>+		t-&gt;tm_mon, t-&gt;tm_year, t-&gt;tm_wday);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1307_set_time(struct device *dev, struct rtc_time *t)</div><div class='add'>+{</div><div class='add'>+	struct ds1307	*ds1307 = dev_get_drvdata(dev);</div><div class='add'>+	int		result;</div><div class='add'>+	int		tmp;</div><div class='add'>+	u8		*buf = ds1307-&gt;regs;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s secs=%d, mins=%d, "</div><div class='add'>+		"hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",</div><div class='add'>+		"write", dt-&gt;tm_sec, dt-&gt;tm_min,</div><div class='add'>+		dt-&gt;tm_hour, dt-&gt;tm_mday,</div><div class='add'>+		dt-&gt;tm_mon, dt-&gt;tm_year, dt-&gt;tm_wday);</div><div class='add'>+</div><div class='add'>+	*buf++ = 0;		/* first register addr */</div><div class='add'>+	buf[DS1307_REG_SECS] = BIN2BCD(t-&gt;tm_sec);</div><div class='add'>+	buf[DS1307_REG_MIN] = BIN2BCD(t-&gt;tm_min);</div><div class='add'>+	buf[DS1307_REG_HOUR] = BIN2BCD(t-&gt;tm_hour);</div><div class='add'>+	buf[DS1307_REG_WDAY] = BIN2BCD(t-&gt;tm_wday + 1);</div><div class='add'>+	buf[DS1307_REG_MDAY] = BIN2BCD(t-&gt;tm_mday);</div><div class='add'>+	buf[DS1307_REG_MONTH] = BIN2BCD(t-&gt;tm_mon + 1);</div><div class='add'>+</div><div class='add'>+	/* assume 20YY not 19YY */</div><div class='add'>+	tmp = t-&gt;tm_year - 100;</div><div class='add'>+	buf[DS1307_REG_YEAR] = BIN2BCD(tmp);</div><div class='add'>+</div><div class='add'>+	if (ds1307-&gt;type == ds_1337)</div><div class='add'>+		buf[DS1307_REG_MONTH] |= DS1337_BIT_CENTURY;</div><div class='add'>+	else if (ds1307-&gt;type == ds_1340)</div><div class='add'>+		buf[DS1307_REG_HOUR] |= DS1340_BIT_CENTURY_EN</div><div class='add'>+				| DS1340_BIT_CENTURY;</div><div class='add'>+</div><div class='add'>+	ds1307-&gt;msg[1].flags = 0;</div><div class='add'>+	ds1307-&gt;msg[1].len = 8;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x\n",</div><div class='add'>+		"write", buf[0], buf[1], buf[2], buf[3],</div><div class='add'>+		buf[4], buf[5], buf[6]);</div><div class='add'>+</div><div class='add'>+	result = i2c_transfer(ds1307-&gt;client.adapter, &amp;ds1307-&gt;msg[1], 1);</div><div class='add'>+	if (result != 1) {</div><div class='add'>+		dev_err(dev, "%s error %d\n", "write", tmp);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops ds13xx_rtc_ops = {</div><div class='add'>+	.read_time	= ds1307_get_time,</div><div class='add'>+	.set_time	= ds1307_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct i2c_driver ds1307_driver;</div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='add'>+ds1307_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='add'>+{</div><div class='add'>+	struct ds1307		*ds1307;</div><div class='add'>+	int			err = -ENODEV;</div><div class='add'>+	struct i2c_client	*client;</div><div class='add'>+	int			tmp;</div><div class='add'>+</div><div class='add'>+	if (!(ds1307 = kzalloc(sizeof(struct ds1307), GFP_KERNEL))) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	client = &amp;ds1307-&gt;client;</div><div class='add'>+	client-&gt;addr = address;</div><div class='add'>+	client-&gt;adapter = adapter;</div><div class='add'>+	client-&gt;driver = &amp;ds1307_driver;</div><div class='add'>+	client-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(client, ds1307);</div><div class='add'>+</div><div class='add'>+	ds1307-&gt;msg[0].addr = client-&gt;addr;</div><div class='add'>+	ds1307-&gt;msg[0].flags = 0;</div><div class='add'>+	ds1307-&gt;msg[0].len = 1;</div><div class='add'>+	ds1307-&gt;msg[0].buf = &amp;ds1307-&gt;reg_addr;</div><div class='add'>+</div><div class='add'>+	ds1307-&gt;msg[1].addr = client-&gt;addr;</div><div class='add'>+	ds1307-&gt;msg[1].flags = I2C_M_RD;</div><div class='add'>+	ds1307-&gt;msg[1].len = sizeof(ds1307-&gt;regs);</div><div class='add'>+	ds1307-&gt;msg[1].buf = ds1307-&gt;regs;</div><div class='add'>+</div><div class='add'>+	/* HACK: "force" implies "needs ds1337-style-oscillator setup" */</div><div class='add'>+	if (kind &gt;= 0) {</div><div class='add'>+		ds1307-&gt;type = ds_1337;</div><div class='add'>+</div><div class='add'>+		ds1307-&gt;reg_addr = DS1337_REG_CONTROL;</div><div class='add'>+		ds1307-&gt;msg[1].len = 2;</div><div class='add'>+</div><div class='add'>+		tmp = i2c_transfer(client-&gt;adapter, ds1307-&gt;msg, 2);</div><div class='add'>+		if (tmp != 2) {</div><div class='add'>+			pr_debug("read error %d\n", tmp);</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto exit_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ds1307-&gt;reg_addr = 0;</div><div class='add'>+		ds1307-&gt;msg[1].len = sizeof(ds1307-&gt;regs);</div><div class='add'>+</div><div class='add'>+		/* oscillator is off; need to turn it on */</div><div class='add'>+		if ((ds1307-&gt;regs[0] &amp; DS1337_BIT_nEOSC)</div><div class='add'>+				|| (ds1307-&gt;regs[1] &amp; DS1337_BIT_OSF)) {</div><div class='add'>+			printk(KERN_ERR "no ds1337 oscillator code\n");</div><div class='add'>+			goto exit_free;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		ds1307-&gt;type = ds_1307;</div><div class='add'>+</div><div class='add'>+read_rtc:</div><div class='add'>+	/* read RTC registers */</div><div class='add'>+</div><div class='add'>+	tmp = i2c_transfer(client-&gt;adapter, ds1307-&gt;msg, 2);</div><div class='add'>+	if (tmp != 2) {</div><div class='add'>+		pr_debug("read error %d\n", tmp);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto exit_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* minimal sanity checking; some chips (like DS1340) don't</div><div class='add'>+	 * specify the extra bits as must-be-zero, but there are</div><div class='add'>+	 * still a few values that are clearly out-of-range.</div><div class='add'>+	 */</div><div class='add'>+	tmp = ds1307-&gt;regs[DS1307_REG_SECS];</div><div class='add'>+	if (tmp &amp; DS1307_BIT_CH) {</div><div class='add'>+		if (ds1307-&gt;type &amp;&amp; ds1307-&gt;type != ds_1307) {</div><div class='add'>+			pr_debug("not a ds1307?\n");</div><div class='add'>+			goto exit_free;</div><div class='add'>+		}</div><div class='add'>+		ds1307-&gt;type = ds_1307;</div><div class='add'>+</div><div class='add'>+		/* this partial initialization should work for ds1307,</div><div class='add'>+		 * ds1338, ds1340, st m41t00, and more.</div><div class='add'>+		 */</div><div class='add'>+		dev_warn(&amp;client-&gt;dev, "oscillator started; SET TIME!\n");</div><div class='add'>+		i2c_smbus_write_byte_data(client, 0, 0);</div><div class='add'>+		goto read_rtc;</div><div class='add'>+	}</div><div class='add'>+	tmp = BCD2BIN(tmp &amp; 0x7f);</div><div class='add'>+	if (tmp &gt; 60)</div><div class='add'>+		goto exit_free;</div><div class='add'>+	tmp = BCD2BIN(ds1307-&gt;regs[DS1307_REG_MIN] &amp; 0x7f);</div><div class='add'>+	if (tmp &gt; 60)</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	tmp = BCD2BIN(ds1307-&gt;regs[DS1307_REG_MDAY] &amp; 0x3f);</div><div class='add'>+	if (tmp == 0 || tmp &gt; 31)</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	tmp = BCD2BIN(ds1307-&gt;regs[DS1307_REG_MONTH] &amp; 0x1f);</div><div class='add'>+	if (tmp == 0 || tmp &gt; 12)</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	/* force into in 24 hour mode (most chips) or</div><div class='add'>+	 * disable century bit (ds1340)</div><div class='add'>+	 */</div><div class='add'>+	tmp = ds1307-&gt;regs[DS1307_REG_HOUR];</div><div class='add'>+	if (tmp &amp; (1 &lt;&lt; 6)) {</div><div class='add'>+		if (tmp &amp; (1 &lt;&lt; 5))</div><div class='add'>+			tmp = BCD2BIN(tmp &amp; 0x1f) + 12;</div><div class='add'>+		else</div><div class='add'>+			tmp = BCD2BIN(tmp);</div><div class='add'>+		i2c_smbus_write_byte_data(client,</div><div class='add'>+				DS1307_REG_HOUR,</div><div class='add'>+				BIN2BCD(tmp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME chips like 1337 can generate alarm irqs too; those are</div><div class='add'>+	 * worth exposing through the API (especially when the irq is</div><div class='add'>+	 * wakeup-capable).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (ds1307-&gt;type) {</div><div class='add'>+	case unknown:</div><div class='add'>+		strlcpy(client-&gt;name, "unknown", I2C_NAME_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	case ds_1307:</div><div class='add'>+		strlcpy(client-&gt;name, "ds1307", I2C_NAME_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	case ds_1337:</div><div class='add'>+		strlcpy(client-&gt;name, "ds1337", I2C_NAME_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	case ds_1340:</div><div class='add'>+		strlcpy(client-&gt;name, "ds1340", I2C_NAME_SIZE);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Tell the I2C layer a new client has arrived */</div><div class='add'>+	if ((err = i2c_attach_client(client)))</div><div class='add'>+		goto exit_free;</div><div class='add'>+</div><div class='add'>+	ds1307-&gt;rtc = rtc_device_register(client-&gt;name, &amp;client-&gt;dev,</div><div class='add'>+				&amp;ds13xx_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(ds1307-&gt;rtc)) {</div><div class='add'>+		err = PTR_ERR(ds1307-&gt;rtc);</div><div class='add'>+		dev_err(&amp;client-&gt;dev,</div><div class='add'>+			"unable to register the class device\n");</div><div class='add'>+		goto exit_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_detach:</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+exit_free:</div><div class='add'>+	kfree(ds1307);</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit</div><div class='add'>+ds1307_attach_adapter(struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))</div><div class='add'>+		return 0;</div><div class='add'>+	return i2c_probe(adapter, &amp;addr_data, ds1307_detect);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ds1307_detach_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int		err;</div><div class='add'>+	struct ds1307	*ds1307 = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	rtc_device_unregister(ds1307-&gt;rtc);</div><div class='add'>+	if ((err = i2c_detach_client(client)))</div><div class='add'>+		return err;</div><div class='add'>+	kfree(ds1307);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver ds1307_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "ds1307",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.attach_adapter	= ds1307_attach_adapter,</div><div class='add'>+	.detach_client	= __devexit_p(ds1307_detach_client),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ds1307_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;ds1307_driver);</div><div class='add'>+}</div><div class='add'>+module_init(ds1307_init);</div><div class='add'>+</div><div class='add'>+static void __exit ds1307_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;ds1307_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(ds1307_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("RTC driver for DS1307 and similar chips");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c<br/>new file mode 100644<br/>index 000000000000..209001495474<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1553.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-ds1553.c</a></div><div class='hunk'>@@ -0,0 +1,414 @@</div><div class='add'>+/*</div><div class='add'>+ * An rtc driver for the Dallas DS1553</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION "0.1"</div><div class='add'>+</div><div class='add'>+#define RTC_REG_SIZE		0x2000</div><div class='add'>+#define RTC_OFFSET		0x1ff0</div><div class='add'>+</div><div class='add'>+#define RTC_FLAGS		(RTC_OFFSET + 0)</div><div class='add'>+#define RTC_SECONDS_ALARM	(RTC_OFFSET + 2)</div><div class='add'>+#define RTC_MINUTES_ALARM	(RTC_OFFSET + 3)</div><div class='add'>+#define RTC_HOURS_ALARM		(RTC_OFFSET + 4)</div><div class='add'>+#define RTC_DATE_ALARM		(RTC_OFFSET + 5)</div><div class='add'>+#define RTC_INTERRUPTS		(RTC_OFFSET + 6)</div><div class='add'>+#define RTC_WATCHDOG		(RTC_OFFSET + 7)</div><div class='add'>+#define RTC_CONTROL		(RTC_OFFSET + 8)</div><div class='add'>+#define RTC_CENTURY		(RTC_OFFSET + 8)</div><div class='add'>+#define RTC_SECONDS		(RTC_OFFSET + 9)</div><div class='add'>+#define RTC_MINUTES		(RTC_OFFSET + 10)</div><div class='add'>+#define RTC_HOURS		(RTC_OFFSET + 11)</div><div class='add'>+#define RTC_DAY			(RTC_OFFSET + 12)</div><div class='add'>+#define RTC_DATE		(RTC_OFFSET + 13)</div><div class='add'>+#define RTC_MONTH		(RTC_OFFSET + 14)</div><div class='add'>+#define RTC_YEAR		(RTC_OFFSET + 15)</div><div class='add'>+</div><div class='add'>+#define RTC_CENTURY_MASK	0x3f</div><div class='add'>+#define RTC_SECONDS_MASK	0x7f</div><div class='add'>+#define RTC_DAY_MASK		0x07</div><div class='add'>+</div><div class='add'>+/* Bits in the Control/Century register */</div><div class='add'>+#define RTC_WRITE		0x80</div><div class='add'>+#define RTC_READ		0x40</div><div class='add'>+</div><div class='add'>+/* Bits in the Seconds register */</div><div class='add'>+#define RTC_STOP		0x80</div><div class='add'>+</div><div class='add'>+/* Bits in the Flags register */</div><div class='add'>+#define RTC_FLAGS_AF		0x40</div><div class='add'>+#define RTC_FLAGS_BLF		0x10</div><div class='add'>+</div><div class='add'>+/* Bits in the Interrupts register */</div><div class='add'>+#define RTC_INTS_AE		0x80</div><div class='add'>+</div><div class='add'>+struct rtc_plat_data {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	void __iomem *ioaddr;</div><div class='add'>+	unsigned long baseaddr;</div><div class='add'>+	unsigned long last_jiffies;</div><div class='add'>+	int irq;</div><div class='add'>+	unsigned int irqen;</div><div class='add'>+	int alrm_sec;</div><div class='add'>+	int alrm_min;</div><div class='add'>+	int alrm_hour;</div><div class='add'>+	int alrm_mday;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ds1553_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	u8 century;</div><div class='add'>+</div><div class='add'>+	century = BIN2BCD((tm-&gt;tm_year + 1900) / 100);</div><div class='add'>+</div><div class='add'>+	writeb(RTC_WRITE, pdata-&gt;ioaddr + RTC_CONTROL);</div><div class='add'>+</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_year % 100), ioaddr + RTC_YEAR);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_mon + 1), ioaddr + RTC_MONTH);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_wday) &amp; RTC_DAY_MASK, ioaddr + RTC_DAY);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_mday), ioaddr + RTC_DATE);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_hour), ioaddr + RTC_HOURS);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_min), ioaddr + RTC_MINUTES);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_sec) &amp; RTC_SECONDS_MASK, ioaddr + RTC_SECONDS);</div><div class='add'>+</div><div class='add'>+	/* RTC_CENTURY and RTC_CONTROL share same register */</div><div class='add'>+	writeb(RTC_WRITE | (century &amp; RTC_CENTURY_MASK), ioaddr + RTC_CENTURY);</div><div class='add'>+	writeb(century &amp; RTC_CENTURY_MASK, ioaddr + RTC_CONTROL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1553_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	unsigned int year, month, day, hour, minute, second, week;</div><div class='add'>+	unsigned int century;</div><div class='add'>+</div><div class='add'>+	/* give enough time to update RTC in case of continuous read */</div><div class='add'>+	if (pdata-&gt;last_jiffies == jiffies)</div><div class='add'>+		msleep(1);</div><div class='add'>+	pdata-&gt;last_jiffies = jiffies;</div><div class='add'>+	writeb(RTC_READ, ioaddr + RTC_CONTROL);</div><div class='add'>+	second = readb(ioaddr + RTC_SECONDS) &amp; RTC_SECONDS_MASK;</div><div class='add'>+	minute = readb(ioaddr + RTC_MINUTES);</div><div class='add'>+	hour = readb(ioaddr + RTC_HOURS);</div><div class='add'>+	day = readb(ioaddr + RTC_DATE);</div><div class='add'>+	week = readb(ioaddr + RTC_DAY) &amp; RTC_DAY_MASK;</div><div class='add'>+	month = readb(ioaddr + RTC_MONTH);</div><div class='add'>+	year = readb(ioaddr + RTC_YEAR);</div><div class='add'>+	century = readb(ioaddr + RTC_CENTURY) &amp; RTC_CENTURY_MASK;</div><div class='add'>+	writeb(0, ioaddr + RTC_CONTROL);</div><div class='add'>+	tm-&gt;tm_sec = BCD2BIN(second);</div><div class='add'>+	tm-&gt;tm_min = BCD2BIN(minute);</div><div class='add'>+	tm-&gt;tm_hour = BCD2BIN(hour);</div><div class='add'>+	tm-&gt;tm_mday = BCD2BIN(day);</div><div class='add'>+	tm-&gt;tm_wday = BCD2BIN(week);</div><div class='add'>+	tm-&gt;tm_mon = BCD2BIN(month) - 1;</div><div class='add'>+	/* year is 1900 + tm-&gt;tm_year */</div><div class='add'>+	tm-&gt;tm_year = BCD2BIN(year) + BCD2BIN(century) * 100 - 1900;</div><div class='add'>+</div><div class='add'>+	if (rtc_valid_tm(tm) &lt; 0) {</div><div class='add'>+		dev_err(dev, "retrieved date/time is not valid.\n");</div><div class='add'>+		rtc_time_to_tm(0, tm);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ds1553_rtc_update_alarm(struct rtc_plat_data *pdata)</div><div class='add'>+{</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;rtc-&gt;irq_lock, flags);</div><div class='add'>+	writeb(pdata-&gt;alrm_mday &lt; 0 || (pdata-&gt;irqen &amp; RTC_UF) ?</div><div class='add'>+	       0x80 : BIN2BCD(pdata-&gt;alrm_mday),</div><div class='add'>+	       ioaddr + RTC_DATE_ALARM);</div><div class='add'>+	writeb(pdata-&gt;alrm_hour &lt; 0 || (pdata-&gt;irqen &amp; RTC_UF) ?</div><div class='add'>+	       0x80 : BIN2BCD(pdata-&gt;alrm_hour),</div><div class='add'>+	       ioaddr + RTC_HOURS_ALARM);</div><div class='add'>+	writeb(pdata-&gt;alrm_min &lt; 0 || (pdata-&gt;irqen &amp; RTC_UF) ?</div><div class='add'>+	       0x80 : BIN2BCD(pdata-&gt;alrm_min),</div><div class='add'>+	       ioaddr + RTC_MINUTES_ALARM);</div><div class='add'>+	writeb(pdata-&gt;alrm_sec &lt; 0 || (pdata-&gt;irqen &amp; RTC_UF) ?</div><div class='add'>+	       0x80 : BIN2BCD(pdata-&gt;alrm_sec),</div><div class='add'>+	       ioaddr + RTC_SECONDS_ALARM);</div><div class='add'>+	writeb(pdata-&gt;irqen ? RTC_INTS_AE : 0, ioaddr + RTC_INTERRUPTS);</div><div class='add'>+	readb(ioaddr + RTC_FLAGS);	/* clear interrupts */</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;rtc-&gt;irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1553_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pdata-&gt;alrm_mday = alrm-&gt;time.tm_mday;</div><div class='add'>+	pdata-&gt;alrm_hour = alrm-&gt;time.tm_hour;</div><div class='add'>+	pdata-&gt;alrm_min = alrm-&gt;time.tm_min;</div><div class='add'>+	pdata-&gt;alrm_sec = alrm-&gt;time.tm_sec;</div><div class='add'>+	if (alrm-&gt;enabled)</div><div class='add'>+		pdata-&gt;irqen |= RTC_AF;</div><div class='add'>+	ds1553_rtc_update_alarm(pdata);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1553_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	alrm-&gt;time.tm_mday = pdata-&gt;alrm_mday &lt; 0 ? 0 : pdata-&gt;alrm_mday;</div><div class='add'>+	alrm-&gt;time.tm_hour = pdata-&gt;alrm_hour &lt; 0 ? 0 : pdata-&gt;alrm_hour;</div><div class='add'>+	alrm-&gt;time.tm_min = pdata-&gt;alrm_min &lt; 0 ? 0 : pdata-&gt;alrm_min;</div><div class='add'>+	alrm-&gt;time.tm_sec = pdata-&gt;alrm_sec &lt; 0 ? 0 : pdata-&gt;alrm_sec;</div><div class='add'>+	alrm-&gt;enabled = (pdata-&gt;irqen &amp; RTC_AF) ? 1 : 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id,</div><div class='add'>+					struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = dev_id;</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	unsigned long events = RTC_IRQF;</div><div class='add'>+</div><div class='add'>+	/* read and clear interrupt */</div><div class='add'>+	if (!(readb(ioaddr + RTC_FLAGS) &amp; RTC_FLAGS_AF))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	if (readb(ioaddr + RTC_SECONDS_ALARM) &amp; 0x80)</div><div class='add'>+		events |= RTC_UF;</div><div class='add'>+	else</div><div class='add'>+		events |= RTC_AF;</div><div class='add'>+	rtc_update_irq(&amp;pdata-&gt;rtc-&gt;class_dev, 1, events);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ds1553_rtc_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq &gt;= 0) {</div><div class='add'>+		pdata-&gt;irqen = 0;</div><div class='add'>+		ds1553_rtc_update_alarm(pdata);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,</div><div class='add'>+			    unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq &lt; 0)</div><div class='add'>+		return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_AIE_OFF:</div><div class='add'>+		pdata-&gt;irqen &amp;= ~RTC_AF;</div><div class='add'>+		ds1553_rtc_update_alarm(pdata);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_AIE_ON:</div><div class='add'>+		pdata-&gt;irqen |= RTC_AF;</div><div class='add'>+		ds1553_rtc_update_alarm(pdata);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_UIE_OFF:</div><div class='add'>+		pdata-&gt;irqen &amp;= ~RTC_UF;</div><div class='add'>+		ds1553_rtc_update_alarm(pdata);</div><div class='add'>+		break;</div><div class='add'>+	case RTC_UIE_ON:</div><div class='add'>+		pdata-&gt;irqen |= RTC_UF;</div><div class='add'>+		ds1553_rtc_update_alarm(pdata);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops ds1553_rtc_ops = {</div><div class='add'>+	.read_time	= ds1553_rtc_read_time,</div><div class='add'>+	.set_time	= ds1553_rtc_set_time,</div><div class='add'>+	.read_alarm	= ds1553_rtc_read_alarm,</div><div class='add'>+	.set_alarm	= ds1553_rtc_set_alarm,</div><div class='add'>+	.release	= ds1553_rtc_release,</div><div class='add'>+	.ioctl		= ds1553_rtc_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ds1553_nvram_read(struct kobject *kobj, char *buf,</div><div class='add'>+				 loff_t pos, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev =</div><div class='add'>+		to_platform_device(container_of(kobj, struct device, kobj));</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	for (count = 0; size &gt; 0 &amp;&amp; pos &lt; RTC_OFFSET; count++, size--)</div><div class='add'>+		*buf++ = readb(ioaddr + pos++);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ds1553_nvram_write(struct kobject *kobj, char *buf,</div><div class='add'>+				  loff_t pos, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev =</div><div class='add'>+		to_platform_device(container_of(kobj, struct device, kobj));</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	for (count = 0; size &gt; 0 &amp;&amp; pos &lt; RTC_OFFSET; count++, size--)</div><div class='add'>+		writeb(*buf++, ioaddr + pos++);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bin_attribute ds1553_nvram_attr = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "nvram",</div><div class='add'>+		.mode = S_IRUGO | S_IWUGO,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.size = RTC_OFFSET,</div><div class='add'>+	.read = ds1553_nvram_read,</div><div class='add'>+	.write = ds1553_nvram_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ds1553_rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned int cen, sec;</div><div class='add'>+	struct rtc_plat_data *pdata = NULL;</div><div class='add'>+	void __iomem *ioaddr = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pdata-&gt;irq = -1;</div><div class='add'>+	if (!request_mem_region(res-&gt;start, RTC_REG_SIZE, pdev-&gt;name)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;baseaddr = res-&gt;start;</div><div class='add'>+	ioaddr = ioremap(pdata-&gt;baseaddr, RTC_REG_SIZE);</div><div class='add'>+	if (!ioaddr) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;ioaddr = ioaddr;</div><div class='add'>+	pdata-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+</div><div class='add'>+	/* turn RTC on if it was not on */</div><div class='add'>+	sec = readb(ioaddr + RTC_SECONDS);</div><div class='add'>+	if (sec &amp; RTC_STOP) {</div><div class='add'>+		sec &amp;= RTC_SECONDS_MASK;</div><div class='add'>+		cen = readb(ioaddr + RTC_CENTURY) &amp; RTC_CENTURY_MASK;</div><div class='add'>+		writeb(RTC_WRITE, ioaddr + RTC_CONTROL);</div><div class='add'>+		writeb(sec, ioaddr + RTC_SECONDS);</div><div class='add'>+		writeb(cen &amp; RTC_CENTURY_MASK, ioaddr + RTC_CONTROL);</div><div class='add'>+	}</div><div class='add'>+	if (readb(ioaddr + RTC_FLAGS) &amp; RTC_FLAGS_BLF)</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "voltage-low detected.\n");</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;irq &gt;= 0) {</div><div class='add'>+		writeb(0, ioaddr + RTC_INTERRUPTS);</div><div class='add'>+		if (request_irq(pdata-&gt;irq, ds1553_rtc_interrupt, IRQF_SHARED,</div><div class='add'>+				pdev-&gt;name, pdev) &lt; 0) {</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev, "interrupt not available.\n");</div><div class='add'>+			pdata-&gt;irq = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev,</div><div class='add'>+				  &amp;ds1553_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		ret = PTR_ERR(rtc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;rtc = rtc;</div><div class='add'>+	pdata-&gt;last_jiffies = jiffies;</div><div class='add'>+	platform_set_drvdata(pdev, pdata);</div><div class='add'>+	sysfs_create_bin_file(&amp;pdev-&gt;dev.kobj, &amp;ds1553_nvram_attr);</div><div class='add'>+	return 0;</div><div class='add'>+ out:</div><div class='add'>+	if (pdata-&gt;irq &gt;= 0)</div><div class='add'>+		free_irq(pdata-&gt;irq, pdev);</div><div class='add'>+	if (ioaddr)</div><div class='add'>+		iounmap(ioaddr);</div><div class='add'>+	if (pdata-&gt;baseaddr)</div><div class='add'>+		release_mem_region(pdata-&gt;baseaddr, RTC_REG_SIZE);</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ds1553_rtc_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	sysfs_remove_bin_file(&amp;pdev-&gt;dev.kobj, &amp;ds1553_nvram_attr);</div><div class='add'>+	rtc_device_unregister(pdata-&gt;rtc);</div><div class='add'>+	if (pdata-&gt;irq &gt;= 0) {</div><div class='add'>+		writeb(0, pdata-&gt;ioaddr + RTC_INTERRUPTS);</div><div class='add'>+		free_irq(pdata-&gt;irq, pdev);</div><div class='add'>+	}</div><div class='add'>+	iounmap(pdata-&gt;ioaddr);</div><div class='add'>+	release_mem_region(pdata-&gt;baseaddr, RTC_REG_SIZE);</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ds1553_rtc_driver = {</div><div class='add'>+	.probe		= ds1553_rtc_probe,</div><div class='add'>+	.remove		= __devexit_p(ds1553_rtc_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ds1553",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int ds1553_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ds1553_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void ds1553_exit(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_unregister(&amp;ds1553_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ds1553_init);</div><div class='add'>+module_exit(ds1553_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Dallas DS1553 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c<br/>new file mode 100644<br/>index 000000000000..8e47e5a06d2a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-ds1742.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-ds1742.c</a></div><div class='hunk'>@@ -0,0 +1,259 @@</div><div class='add'>+/*</div><div class='add'>+ * An rtc driver for the Dallas DS1742</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION "0.1"</div><div class='add'>+</div><div class='add'>+#define RTC_REG_SIZE		0x800</div><div class='add'>+#define RTC_OFFSET		0x7f8</div><div class='add'>+</div><div class='add'>+#define RTC_CONTROL		(RTC_OFFSET + 0)</div><div class='add'>+#define RTC_CENTURY		(RTC_OFFSET + 0)</div><div class='add'>+#define RTC_SECONDS		(RTC_OFFSET + 1)</div><div class='add'>+#define RTC_MINUTES		(RTC_OFFSET + 2)</div><div class='add'>+#define RTC_HOURS		(RTC_OFFSET + 3)</div><div class='add'>+#define RTC_DAY			(RTC_OFFSET + 4)</div><div class='add'>+#define RTC_DATE		(RTC_OFFSET + 5)</div><div class='add'>+#define RTC_MONTH		(RTC_OFFSET + 6)</div><div class='add'>+#define RTC_YEAR		(RTC_OFFSET + 7)</div><div class='add'>+</div><div class='add'>+#define RTC_CENTURY_MASK	0x3f</div><div class='add'>+#define RTC_SECONDS_MASK	0x7f</div><div class='add'>+#define RTC_DAY_MASK		0x07</div><div class='add'>+</div><div class='add'>+/* Bits in the Control/Century register */</div><div class='add'>+#define RTC_WRITE		0x80</div><div class='add'>+#define RTC_READ		0x40</div><div class='add'>+</div><div class='add'>+/* Bits in the Seconds register */</div><div class='add'>+#define RTC_STOP		0x80</div><div class='add'>+</div><div class='add'>+/* Bits in the Day register */</div><div class='add'>+#define RTC_BATT_FLAG		0x80</div><div class='add'>+</div><div class='add'>+struct rtc_plat_data {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	void __iomem *ioaddr;</div><div class='add'>+	unsigned long baseaddr;</div><div class='add'>+	unsigned long last_jiffies;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ds1742_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	u8 century;</div><div class='add'>+</div><div class='add'>+	century = BIN2BCD((tm-&gt;tm_year + 1900) / 100);</div><div class='add'>+</div><div class='add'>+	writeb(RTC_WRITE, ioaddr + RTC_CONTROL);</div><div class='add'>+</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_year % 100), ioaddr + RTC_YEAR);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_mon + 1), ioaddr + RTC_MONTH);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_wday) &amp; RTC_DAY_MASK, ioaddr + RTC_DAY);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_mday), ioaddr + RTC_DATE);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_hour), ioaddr + RTC_HOURS);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_min), ioaddr + RTC_MINUTES);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_sec) &amp; RTC_SECONDS_MASK, ioaddr + RTC_SECONDS);</div><div class='add'>+</div><div class='add'>+	/* RTC_CENTURY and RTC_CONTROL share same register */</div><div class='add'>+	writeb(RTC_WRITE | (century &amp; RTC_CENTURY_MASK), ioaddr + RTC_CENTURY);</div><div class='add'>+	writeb(century &amp; RTC_CENTURY_MASK, ioaddr + RTC_CONTROL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds1742_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	unsigned int year, month, day, hour, minute, second, week;</div><div class='add'>+	unsigned int century;</div><div class='add'>+</div><div class='add'>+	/* give enough time to update RTC in case of continuous read */</div><div class='add'>+	if (pdata-&gt;last_jiffies == jiffies)</div><div class='add'>+		msleep(1);</div><div class='add'>+	pdata-&gt;last_jiffies = jiffies;</div><div class='add'>+	writeb(RTC_READ, ioaddr + RTC_CONTROL);</div><div class='add'>+	second = readb(ioaddr + RTC_SECONDS) &amp; RTC_SECONDS_MASK;</div><div class='add'>+	minute = readb(ioaddr + RTC_MINUTES);</div><div class='add'>+	hour = readb(ioaddr + RTC_HOURS);</div><div class='add'>+	day = readb(ioaddr + RTC_DATE);</div><div class='add'>+	week = readb(ioaddr + RTC_DAY) &amp; RTC_DAY_MASK;</div><div class='add'>+	month = readb(ioaddr + RTC_MONTH);</div><div class='add'>+	year = readb(ioaddr + RTC_YEAR);</div><div class='add'>+	century = readb(ioaddr + RTC_CENTURY) &amp; RTC_CENTURY_MASK;</div><div class='add'>+	writeb(0, ioaddr + RTC_CONTROL);</div><div class='add'>+	tm-&gt;tm_sec = BCD2BIN(second);</div><div class='add'>+	tm-&gt;tm_min = BCD2BIN(minute);</div><div class='add'>+	tm-&gt;tm_hour = BCD2BIN(hour);</div><div class='add'>+	tm-&gt;tm_mday = BCD2BIN(day);</div><div class='add'>+	tm-&gt;tm_wday = BCD2BIN(week);</div><div class='add'>+	tm-&gt;tm_mon = BCD2BIN(month) - 1;</div><div class='add'>+	/* year is 1900 + tm-&gt;tm_year */</div><div class='add'>+	tm-&gt;tm_year = BCD2BIN(year) + BCD2BIN(century) * 100 - 1900;</div><div class='add'>+</div><div class='add'>+	if (rtc_valid_tm(tm) &lt; 0) {</div><div class='add'>+		dev_err(dev, "retrieved date/time is not valid.\n");</div><div class='add'>+		rtc_time_to_tm(0, tm);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops ds1742_rtc_ops = {</div><div class='add'>+	.read_time	= ds1742_rtc_read_time,</div><div class='add'>+	.set_time	= ds1742_rtc_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t ds1742_nvram_read(struct kobject *kobj, char *buf,</div><div class='add'>+				 loff_t pos, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev =</div><div class='add'>+		to_platform_device(container_of(kobj, struct device, kobj));</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	for (count = 0; size &gt; 0 &amp;&amp; pos &lt; RTC_OFFSET; count++, size--)</div><div class='add'>+		*buf++ = readb(ioaddr + pos++);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t ds1742_nvram_write(struct kobject *kobj, char *buf,</div><div class='add'>+				  loff_t pos, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev =</div><div class='add'>+		to_platform_device(container_of(kobj, struct device, kobj));</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+	void __iomem *ioaddr = pdata-&gt;ioaddr;</div><div class='add'>+	ssize_t count;</div><div class='add'>+</div><div class='add'>+	for (count = 0; size &gt; 0 &amp;&amp; pos &lt; RTC_OFFSET; count++, size--)</div><div class='add'>+		writeb(*buf++, ioaddr + pos++);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bin_attribute ds1742_nvram_attr = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "nvram",</div><div class='add'>+		.mode = S_IRUGO | S_IWUGO,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.size = RTC_OFFSET,</div><div class='add'>+	.read = ds1742_nvram_read,</div><div class='add'>+	.write = ds1742_nvram_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ds1742_rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned int cen, sec;</div><div class='add'>+	struct rtc_plat_data *pdata = NULL;</div><div class='add'>+	void __iomem *ioaddr = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (!request_mem_region(res-&gt;start, RTC_REG_SIZE, pdev-&gt;name)) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;baseaddr = res-&gt;start;</div><div class='add'>+	ioaddr = ioremap(pdata-&gt;baseaddr, RTC_REG_SIZE);</div><div class='add'>+	if (!ioaddr) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;ioaddr = ioaddr;</div><div class='add'>+</div><div class='add'>+	/* turn RTC on if it was not on */</div><div class='add'>+	sec = readb(ioaddr + RTC_SECONDS);</div><div class='add'>+	if (sec &amp; RTC_STOP) {</div><div class='add'>+		sec &amp;= RTC_SECONDS_MASK;</div><div class='add'>+		cen = readb(ioaddr + RTC_CENTURY) &amp; RTC_CENTURY_MASK;</div><div class='add'>+		writeb(RTC_WRITE, ioaddr + RTC_CONTROL);</div><div class='add'>+		writeb(sec, ioaddr + RTC_SECONDS);</div><div class='add'>+		writeb(cen &amp; RTC_CENTURY_MASK, ioaddr + RTC_CONTROL);</div><div class='add'>+	}</div><div class='add'>+	if (readb(ioaddr + RTC_DAY) &amp; RTC_BATT_FLAG)</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "voltage-low detected.\n");</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register(pdev-&gt;name, &amp;pdev-&gt;dev,</div><div class='add'>+				  &amp;ds1742_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		ret = PTR_ERR(rtc);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;rtc = rtc;</div><div class='add'>+	pdata-&gt;last_jiffies = jiffies;</div><div class='add'>+	platform_set_drvdata(pdev, pdata);</div><div class='add'>+	sysfs_create_bin_file(&amp;pdev-&gt;dev.kobj, &amp;ds1742_nvram_attr);</div><div class='add'>+	return 0;</div><div class='add'>+ out:</div><div class='add'>+	if (ioaddr)</div><div class='add'>+		iounmap(ioaddr);</div><div class='add'>+	if (pdata-&gt;baseaddr)</div><div class='add'>+		release_mem_region(pdata-&gt;baseaddr, RTC_REG_SIZE);</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit ds1742_rtc_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	sysfs_remove_bin_file(&amp;pdev-&gt;dev.kobj, &amp;ds1742_nvram_attr);</div><div class='add'>+	rtc_device_unregister(pdata-&gt;rtc);</div><div class='add'>+	iounmap(pdata-&gt;ioaddr);</div><div class='add'>+	release_mem_region(pdata-&gt;baseaddr, RTC_REG_SIZE);</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver ds1742_rtc_driver = {</div><div class='add'>+	.probe		= ds1742_rtc_probe,</div><div class='add'>+	.remove		= __devexit_p(ds1742_rtc_remove),</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ds1742",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int ds1742_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ds1742_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void ds1742_exit(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_unregister(&amp;ds1742_rtc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ds1742_init);</div><div class='add'>+module_exit(ds1742_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Dallas DS1742 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c<br/>new file mode 100644<br/>index 000000000000..f324d0a635d4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-isl1208.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-isl1208.c</a></div><div class='hunk'>@@ -0,0 +1,591 @@</div><div class='add'>+/*</div><div class='add'>+ * Intersil ISL1208 rtc class driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2005,2006 Hebert Valerio Riedel &lt;hvr@gnu.org&gt;</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute  it and/or modify it</div><div class='add'>+ *  under  the terms of  the GNU General  Public License as published by the</div><div class='add'>+ *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='add'>+ *  option) any later version.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "isl1208"</div><div class='add'>+#define DRV_VERSION "0.2"</div><div class='add'>+</div><div class='add'>+/* Register map */</div><div class='add'>+/* rtc section */</div><div class='add'>+#define ISL1208_REG_SC  0x00</div><div class='add'>+#define ISL1208_REG_MN  0x01</div><div class='add'>+#define ISL1208_REG_HR  0x02</div><div class='add'>+#define ISL1208_REG_HR_MIL     (1&lt;&lt;7) /* 24h/12h mode */</div><div class='add'>+#define ISL1208_REG_HR_PM      (1&lt;&lt;5) /* PM/AM bit in 12h mode */</div><div class='add'>+#define ISL1208_REG_DT  0x03</div><div class='add'>+#define ISL1208_REG_MO  0x04</div><div class='add'>+#define ISL1208_REG_YR  0x05</div><div class='add'>+#define ISL1208_REG_DW  0x06</div><div class='add'>+#define ISL1208_RTC_SECTION_LEN 7</div><div class='add'>+</div><div class='add'>+/* control/status section */</div><div class='add'>+#define ISL1208_REG_SR  0x07</div><div class='add'>+#define ISL1208_REG_SR_ARST    (1&lt;&lt;7) /* auto reset */</div><div class='add'>+#define ISL1208_REG_SR_XTOSCB  (1&lt;&lt;6) /* crystal oscillator */</div><div class='add'>+#define ISL1208_REG_SR_WRTC    (1&lt;&lt;4) /* write rtc */</div><div class='add'>+#define ISL1208_REG_SR_ALM     (1&lt;&lt;2) /* alarm */</div><div class='add'>+#define ISL1208_REG_SR_BAT     (1&lt;&lt;1) /* battery */</div><div class='add'>+#define ISL1208_REG_SR_RTCF    (1&lt;&lt;0) /* rtc fail */</div><div class='add'>+#define ISL1208_REG_INT 0x08</div><div class='add'>+#define ISL1208_REG_09  0x09 /* reserved */</div><div class='add'>+#define ISL1208_REG_ATR 0x0a</div><div class='add'>+#define ISL1208_REG_DTR 0x0b</div><div class='add'>+</div><div class='add'>+/* alarm section */</div><div class='add'>+#define ISL1208_REG_SCA 0x0c</div><div class='add'>+#define ISL1208_REG_MNA 0x0d</div><div class='add'>+#define ISL1208_REG_HRA 0x0e</div><div class='add'>+#define ISL1208_REG_DTA 0x0f</div><div class='add'>+#define ISL1208_REG_MOA 0x10</div><div class='add'>+#define ISL1208_REG_DWA 0x11</div><div class='add'>+#define ISL1208_ALARM_SECTION_LEN 6</div><div class='add'>+</div><div class='add'>+/* user section */</div><div class='add'>+#define ISL1208_REG_USR1 0x12</div><div class='add'>+#define ISL1208_REG_USR2 0x13</div><div class='add'>+#define ISL1208_USR_SECTION_LEN 2</div><div class='add'>+</div><div class='add'>+/* i2c configuration */</div><div class='add'>+#define ISL1208_I2C_ADDR 0xde</div><div class='add'>+</div><div class='add'>+static unsigned short normal_i2c[] = {</div><div class='add'>+	ISL1208_I2C_ADDR&gt;&gt;1, I2C_CLIENT_END</div><div class='add'>+};</div><div class='add'>+I2C_CLIENT_INSMOD; /* defines addr_data */</div><div class='add'>+</div><div class='add'>+static int isl1208_attach_adapter(struct i2c_adapter *adapter);</div><div class='add'>+static int isl1208_detach_client(struct i2c_client *client);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver isl1208_driver = {</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= DRV_NAME,</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_ISL1208,</div><div class='add'>+	.attach_adapter = &amp;isl1208_attach_adapter,</div><div class='add'>+	.detach_client	= &amp;isl1208_detach_client,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* block read */</div><div class='add'>+static int</div><div class='add'>+isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],</div><div class='add'>+		       unsigned len)</div><div class='add'>+{</div><div class='add'>+	u8 reg_addr[1] = { reg };</div><div class='add'>+	struct i2c_msg msgs[2] = {</div><div class='add'>+		{ client-&gt;addr, client-&gt;flags, sizeof(reg_addr), reg_addr },</div><div class='add'>+		{ client-&gt;addr, client-&gt;flags | I2C_M_RD, len, buf }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(len == 0);</div><div class='add'>+	BUG_ON(reg &gt; ISL1208_REG_USR2);</div><div class='add'>+	BUG_ON(reg + len &gt; ISL1208_REG_USR2 + 1);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(client-&gt;adapter, msgs, 2);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		ret = 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* block write */</div><div class='add'>+static int</div><div class='add'>+isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],</div><div class='add'>+		       unsigned len)</div><div class='add'>+{</div><div class='add'>+	u8 i2c_buf[ISL1208_REG_USR2 + 2];</div><div class='add'>+	struct i2c_msg msgs[1] = {</div><div class='add'>+		{ client-&gt;addr, client-&gt;flags, len + 1, i2c_buf }</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUG_ON(len == 0);</div><div class='add'>+	BUG_ON(reg &gt; ISL1208_REG_USR2);</div><div class='add'>+	BUG_ON(reg + len &gt; ISL1208_REG_USR2 + 1);</div><div class='add'>+</div><div class='add'>+	i2c_buf[0] = reg;</div><div class='add'>+	memcpy(&amp;i2c_buf[1], &amp;buf[0], len);</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(client-&gt;adapter, msgs, 1);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		ret = 0;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* simple check to see wether we have a isl1208 */</div><div class='add'>+static int isl1208_i2c_validate_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };</div><div class='add'>+	u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {</div><div class='add'>+		0x80, 0x80, 0x40, 0xc0, 0xe0, 0x00, 0xf8</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = isl1208_i2c_read_regs(client, 0, regs, ISL1208_RTC_SECTION_LEN);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ISL1208_RTC_SECTION_LEN; ++i) {</div><div class='add'>+		if (regs[i] &amp; zero_mask[i]) /* check if bits are cleared */</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_get_sr(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	return i2c_smbus_read_byte_data(client, ISL1208_REG_SR) == -1 ? -EIO:0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_get_atr(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int atr = i2c_smbus_read_byte_data(client, ISL1208_REG_ATR);</div><div class='add'>+</div><div class='add'>+	if (atr &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* The 6bit value in the ATR register controls the load</div><div class='add'>+	 * capacitance C_load * in steps of 0.25pF</div><div class='add'>+	 *</div><div class='add'>+	 * bit (1&lt;&lt;5) of the ATR register is inverted</div><div class='add'>+	 *</div><div class='add'>+	 * C_load(ATR=0x20) =  4.50pF</div><div class='add'>+	 * C_load(ATR=0x00) = 12.50pF</div><div class='add'>+	 * C_load(ATR=0x1f) = 20.25pF</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	atr &amp;= 0x3f; /* mask out lsb */</div><div class='add'>+	atr ^= 1&lt;&lt;5; /* invert 6th bit */</div><div class='add'>+	atr += 2*9; /* add offset of 4.5pF; unit[atr] = 0.25pF */</div><div class='add'>+</div><div class='add'>+	return atr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_get_dtr(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int dtr = i2c_smbus_read_byte_data(client, ISL1208_REG_DTR);</div><div class='add'>+</div><div class='add'>+	if (dtr &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* dtr encodes adjustments of {-60,-40,-20,0,20,40,60} ppm */</div><div class='add'>+	dtr = ((dtr &amp; 0x3) * 20) * (dtr &amp; (1&lt;&lt;2) ? -1 : 1);</div><div class='add'>+</div><div class='add'>+	return dtr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_get_usr(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	u8 buf[ISL1208_USR_SECTION_LEN] = { 0, };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = isl1208_i2c_read_regs (client, ISL1208_REG_USR1, buf,</div><div class='add'>+				   ISL1208_USR_SECTION_LEN);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return (buf[1] &lt;&lt; 8) | buf[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_set_usr(struct i2c_client *client, u16 usr)</div><div class='add'>+{</div><div class='add'>+	u8 buf[ISL1208_USR_SECTION_LEN];</div><div class='add'>+</div><div class='add'>+	buf[0] = usr &amp; 0xff;</div><div class='add'>+	buf[1] = (usr &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return isl1208_i2c_set_regs (client, ISL1208_REG_USR1, buf,</div><div class='add'>+				     ISL1208_USR_SECTION_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *const client = to_i2c_client(dev);</div><div class='add'>+	int sr, dtr, atr, usr;</div><div class='add'>+</div><div class='add'>+	sr = isl1208_i2c_get_sr(client);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: reading SR failed\n", __func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "status_reg\t:%s%s%s%s%s%s (0x%.2x)\n",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_RTCF) ? " RTCF" : "",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_BAT) ? " BAT" : "",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_ALM) ? " ALM" : "",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_WRTC) ? " WRTC" : "",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_ARST) ? " ARST" : "",</div><div class='add'>+		   sr);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "batt_status\t: %s\n",</div><div class='add'>+		   (sr &amp; ISL1208_REG_SR_RTCF) ? "bad" : "okay");</div><div class='add'>+</div><div class='add'>+	dtr = isl1208_i2c_get_dtr(client);</div><div class='add'>+	if (dtr &gt;= 0 -1)</div><div class='add'>+		seq_printf(seq, "digital_trim\t: %d ppm\n", dtr);</div><div class='add'>+</div><div class='add'>+	atr = isl1208_i2c_get_atr(client);</div><div class='add'>+	if (atr &gt;= 0)</div><div class='add'>+		seq_printf(seq, "analog_trim\t: %d.%.2d pF\n",</div><div class='add'>+			   atr&gt;&gt;2, (atr&amp;0x3)*25);</div><div class='add'>+</div><div class='add'>+	usr = isl1208_i2c_get_usr(client);</div><div class='add'>+	if (usr &gt;= 0)</div><div class='add'>+		seq_printf(seq, "user_data\t: 0x%.4x\n", usr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_read_time(struct i2c_client *client,</div><div class='add'>+				 struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	int sr;</div><div class='add'>+	u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };</div><div class='add'>+</div><div class='add'>+	sr = isl1208_i2c_get_sr(client);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: reading SR failed\n", __func__);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sr = isl1208_i2c_read_regs(client, 0, regs, ISL1208_RTC_SECTION_LEN);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: reading RTC section failed\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);</div><div class='add'>+	tm-&gt;tm_min = BCD2BIN(regs[ISL1208_REG_MN]);</div><div class='add'>+	{ /* HR field has a more complex interpretation */</div><div class='add'>+		const u8 _hr = regs[ISL1208_REG_HR];</div><div class='add'>+		if (_hr &amp; ISL1208_REG_HR_MIL) /* 24h format */</div><div class='add'>+			tm-&gt;tm_hour = BCD2BIN(_hr &amp; 0x3f);</div><div class='add'>+		else { // 12h format</div><div class='add'>+			tm-&gt;tm_hour = BCD2BIN(_hr &amp; 0x1f);</div><div class='add'>+			if (_hr &amp; ISL1208_REG_HR_PM) /* PM flag set */</div><div class='add'>+				tm-&gt;tm_hour += 12;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_mday = BCD2BIN(regs[ISL1208_REG_DT]);</div><div class='add'>+	tm-&gt;tm_mon = BCD2BIN(regs[ISL1208_REG_MO]) - 1; /* rtc starts at 1 */</div><div class='add'>+	tm-&gt;tm_year = BCD2BIN(regs[ISL1208_REG_YR]) + 100;</div><div class='add'>+	tm-&gt;tm_wday = BCD2BIN(regs[ISL1208_REG_DW]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_read_alarm(struct i2c_client *client,</div><div class='add'>+				  struct rtc_wkalrm *alarm)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time *const tm = &amp;alarm-&gt;time;</div><div class='add'>+	u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };</div><div class='add'>+	int sr;</div><div class='add'>+</div><div class='add'>+	sr = isl1208_i2c_get_sr(client);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: reading SR failed\n", __func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,</div><div class='add'>+				  ISL1208_ALARM_SECTION_LEN);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: reading alarm section failed\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MSB of each alarm register is an enable bit */</div><div class='add'>+	tm-&gt;tm_sec  = BCD2BIN(regs[ISL1208_REG_SCA-ISL1208_REG_SCA] &amp; 0x7f);</div><div class='add'>+	tm-&gt;tm_min  = BCD2BIN(regs[ISL1208_REG_MNA-ISL1208_REG_SCA] &amp; 0x7f);</div><div class='add'>+	tm-&gt;tm_hour = BCD2BIN(regs[ISL1208_REG_HRA-ISL1208_REG_SCA] &amp; 0x3f);</div><div class='add'>+	tm-&gt;tm_mday = BCD2BIN(regs[ISL1208_REG_DTA-ISL1208_REG_SCA] &amp; 0x3f);</div><div class='add'>+	tm-&gt;tm_mon  = BCD2BIN(regs[ISL1208_REG_MOA-ISL1208_REG_SCA] &amp; 0x1f)-1;</div><div class='add'>+	tm-&gt;tm_wday = BCD2BIN(regs[ISL1208_REG_DWA-ISL1208_REG_SCA] &amp; 0x03);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	return isl1208_i2c_read_time(to_i2c_client(dev), tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_i2c_set_time(struct i2c_client *client,</div><div class='add'>+				struct rtc_time const *tm)</div><div class='add'>+{</div><div class='add'>+	int sr;</div><div class='add'>+	u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };</div><div class='add'>+</div><div class='add'>+	regs[ISL1208_REG_SC] = BIN2BCD(tm-&gt;tm_sec);</div><div class='add'>+	regs[ISL1208_REG_MN] = BIN2BCD(tm-&gt;tm_min);</div><div class='add'>+	regs[ISL1208_REG_HR] = BIN2BCD(tm-&gt;tm_hour) | ISL1208_REG_HR_MIL;</div><div class='add'>+</div><div class='add'>+	regs[ISL1208_REG_DT] = BIN2BCD(tm-&gt;tm_mday);</div><div class='add'>+	regs[ISL1208_REG_MO] = BIN2BCD(tm-&gt;tm_mon + 1);</div><div class='add'>+	regs[ISL1208_REG_YR] = BIN2BCD(tm-&gt;tm_year - 100);</div><div class='add'>+</div><div class='add'>+	regs[ISL1208_REG_DW] = BIN2BCD(tm-&gt;tm_wday &amp; 7);</div><div class='add'>+</div><div class='add'>+	sr = isl1208_i2c_get_sr(client);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: reading SR failed\n", __func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set WRTC */</div><div class='add'>+	sr = i2c_smbus_write_byte_data (client, ISL1208_REG_SR,</div><div class='add'>+				       sr | ISL1208_REG_SR_WRTC);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: writing SR failed\n", __func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write RTC registers */</div><div class='add'>+	sr = isl1208_i2c_set_regs(client, 0, regs, ISL1208_RTC_SECTION_LEN);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: writing RTC section failed\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear WRTC again */</div><div class='add'>+	sr = i2c_smbus_write_byte_data (client, ISL1208_REG_SR,</div><div class='add'>+				       sr &amp; ~ISL1208_REG_SR_WRTC);</div><div class='add'>+	if (sr &lt; 0) {</div><div class='add'>+		dev_err(&amp;client-&gt;dev, "%s: writing SR failed\n", __func__);</div><div class='add'>+		return sr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int isl1208_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	return isl1208_i2c_set_time(to_i2c_client(dev), tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)</div><div class='add'>+{</div><div class='add'>+	return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops isl1208_rtc_ops = {</div><div class='add'>+	.proc		= isl1208_rtc_proc,</div><div class='add'>+	.read_time	= isl1208_rtc_read_time,</div><div class='add'>+	.set_time	= isl1208_rtc_set_time,</div><div class='add'>+	.read_alarm	= isl1208_rtc_read_alarm,</div><div class='add'>+	//.set_alarm	= isl1208_rtc_set_alarm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sysfs interface */</div><div class='add'>+</div><div class='add'>+static ssize_t isl1208_sysfs_show_atrim(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	int atr;</div><div class='add'>+</div><div class='add'>+	atr = isl1208_i2c_get_atr(to_i2c_client(dev));</div><div class='add'>+	if (atr &lt; 0)</div><div class='add'>+		return atr;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d.%.2d pF\n", atr&gt;&gt;2, (atr&amp;0x3)*25);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(atrim, S_IRUGO, isl1208_sysfs_show_atrim, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t isl1208_sysfs_show_dtrim(struct device *dev,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	int dtr;</div><div class='add'>+</div><div class='add'>+	dtr = isl1208_i2c_get_dtr(to_i2c_client(dev));</div><div class='add'>+	if (dtr &lt; 0)</div><div class='add'>+		return dtr;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d ppm\n", dtr);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(dtrim, S_IRUGO, isl1208_sysfs_show_dtrim, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t isl1208_sysfs_show_usr(struct device *dev,</div><div class='add'>+				       struct device_attribute *attr,</div><div class='add'>+				       char *buf)</div><div class='add'>+{</div><div class='add'>+	int usr;</div><div class='add'>+</div><div class='add'>+	usr = isl1208_i2c_get_usr(to_i2c_client(dev));</div><div class='add'>+	if (usr &lt; 0)</div><div class='add'>+		return usr;</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "0x%.4x\n", usr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t isl1208_sysfs_store_usr(struct device *dev,</div><div class='add'>+				       struct device_attribute *attr,</div><div class='add'>+				       const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int usr = -1;</div><div class='add'>+</div><div class='add'>+	if (buf[0] == '0' &amp;&amp; (buf[1] == 'x' || buf[1] == 'X')) {</div><div class='add'>+		if (sscanf(buf, "%x", &amp;usr) != 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (sscanf(buf, "%d", &amp;usr) != 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (usr &lt; 0 || usr &gt; 0xffff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(usr, S_IRUGO | S_IWUSR, isl1208_sysfs_show_usr,</div><div class='add'>+		   isl1208_sysfs_store_usr);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+isl1208_probe(struct i2c_adapter *adapter, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	struct i2c_client *new_client = NULL;</div><div class='add'>+	struct rtc_device *rtc = NULL;</div><div class='add'>+</div><div class='add'>+	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto failout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);</div><div class='add'>+	if (new_client == NULL) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto failout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_client-&gt;addr = addr;</div><div class='add'>+	new_client-&gt;adapter = adapter;</div><div class='add'>+	new_client-&gt;driver = &amp;isl1208_driver;</div><div class='add'>+	new_client-&gt;flags = 0;</div><div class='add'>+	strcpy(new_client-&gt;name, DRV_NAME);</div><div class='add'>+</div><div class='add'>+	if (kind &lt; 0) {</div><div class='add'>+		rc = isl1208_i2c_validate_client(new_client);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto failout;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = i2c_attach_client(new_client);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto failout;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;new_client-&gt;dev,</div><div class='add'>+		 "chip found, driver version " DRV_VERSION "\n");</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register(isl1208_driver.driver.name,</div><div class='add'>+				  &amp;new_client-&gt;dev,</div><div class='add'>+				  &amp;isl1208_rtc_ops, THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		rc = PTR_ERR(rtc);</div><div class='add'>+		goto failout_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(new_client, rtc);</div><div class='add'>+</div><div class='add'>+	rc = isl1208_i2c_get_sr(new_client);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(&amp;new_client-&gt;dev, "reading status failed\n");</div><div class='add'>+		goto failout_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc &amp; ISL1208_REG_SR_RTCF)</div><div class='add'>+		dev_warn(&amp;new_client-&gt;dev, "rtc power failure detected, "</div><div class='add'>+			 "please set clock.\n");</div><div class='add'>+</div><div class='add'>+	rc = device_create_file(&amp;new_client-&gt;dev, &amp;dev_attr_atrim);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto failout_unregister;</div><div class='add'>+	rc = device_create_file(&amp;new_client-&gt;dev, &amp;dev_attr_dtrim);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto failout_atrim;</div><div class='add'>+	rc = device_create_file(&amp;new_client-&gt;dev, &amp;dev_attr_usr);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto failout_dtrim;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ failout_dtrim:</div><div class='add'>+	device_remove_file(&amp;new_client-&gt;dev, &amp;dev_attr_dtrim);</div><div class='add'>+ failout_atrim:</div><div class='add'>+	device_remove_file(&amp;new_client-&gt;dev, &amp;dev_attr_atrim);</div><div class='add'>+ failout_unregister:</div><div class='add'>+	rtc_device_unregister(rtc);</div><div class='add'>+ failout_detach:</div><div class='add'>+	i2c_detach_client(new_client);</div><div class='add'>+ failout:</div><div class='add'>+	kfree(new_client);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+isl1208_attach_adapter (struct i2c_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return i2c_probe(adapter, &amp;addr_data, isl1208_probe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+isl1208_detach_client(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct rtc_device *const rtc = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (rtc)</div><div class='add'>+		rtc_device_unregister(rtc); /* do we need to kfree? */</div><div class='add'>+</div><div class='add'>+	rc = i2c_detach_client(client);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* module management */</div><div class='add'>+</div><div class='add'>+static int __init isl1208_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;isl1208_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit isl1208_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;isl1208_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Herbert Valerio Riedel &lt;hvr@gnu.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Intersil ISL1208 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+</div><div class='add'>+module_init(isl1208_init);</div><div class='add'>+module_exit(isl1208_exit);</div><div class='head'>diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c<br/>index cfedc1d28ee1..9812120f3a7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-lib.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-lib.c</a></div><div class='hunk'>@@ -18,9 +18,19 @@ static const unsigned char rtc_days_in_month[] = {</div><div class='ctx'> 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const unsigned short rtc_ydays[2][13] = {</div><div class='add'>+	/* Normal years */</div><div class='add'>+	{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },</div><div class='add'>+	/* Leap years */</div><div class='add'>+	{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)</div><div class='ctx'> #define LEAP_YEAR(year) ((!(year % 4) &amp;&amp; (year % 100)) || !(year % 400))</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The number of days in the month.</div><div class='add'>+ */</div><div class='ctx'> int rtc_month_days(unsigned int month, unsigned int year)</div><div class='ctx'> {</div><div class='ctx'> 	return rtc_days_in_month[month] + (LEAP_YEAR(year) &amp;&amp; month == 1);</div><div class='hunk'>@@ -28,6 +38,15 @@ int rtc_month_days(unsigned int month, unsigned int year)</div><div class='ctx'> EXPORT_SYMBOL(rtc_month_days);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The number of days since January 1. (0 to 365)</div><div class='add'>+ */</div><div class='add'>+int rtc_year_days(unsigned int day, unsigned int month, unsigned int year)</div><div class='add'>+{</div><div class='add'>+	return rtc_ydays[LEAP_YEAR(year)][month] + day-1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(rtc_year_days);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Convert seconds since 01-01-1970 00:00:00 to Gregorian date.</div><div class='ctx'>  */</div><div class='ctx'> void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)</div><div class='head'>diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c<br/>index f6e7ee04f3dc..8c0d1a6739ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t86.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-m48t86.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-m48t86.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-m48t86.c</a></div><div class='hunk'>@@ -48,33 +48,33 @@ static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> 	struct m48t86_ops *ops = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='del'>-	reg = ops-&gt;readb(M48T86_REG_B);</div><div class='add'>+	reg = ops-&gt;readbyte(M48T86_REG_B);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &amp; M48T86_REG_B_DM) {</div><div class='ctx'> 		/* data (binary) mode */</div><div class='del'>-		tm-&gt;tm_sec	= ops-&gt;readb(M48T86_REG_SEC);</div><div class='del'>-		tm-&gt;tm_min	= ops-&gt;readb(M48T86_REG_MIN);</div><div class='del'>-		tm-&gt;tm_hour	= ops-&gt;readb(M48T86_REG_HOUR) &amp; 0x3F;</div><div class='del'>-		tm-&gt;tm_mday	= ops-&gt;readb(M48T86_REG_DOM);</div><div class='add'>+		tm-&gt;tm_sec	= ops-&gt;readbyte(M48T86_REG_SEC);</div><div class='add'>+		tm-&gt;tm_min	= ops-&gt;readbyte(M48T86_REG_MIN);</div><div class='add'>+		tm-&gt;tm_hour	= ops-&gt;readbyte(M48T86_REG_HOUR) &amp; 0x3F;</div><div class='add'>+		tm-&gt;tm_mday	= ops-&gt;readbyte(M48T86_REG_DOM);</div><div class='ctx'> 		/* tm_mon is 0-11 */</div><div class='del'>-		tm-&gt;tm_mon	= ops-&gt;readb(M48T86_REG_MONTH) - 1;</div><div class='del'>-		tm-&gt;tm_year	= ops-&gt;readb(M48T86_REG_YEAR) + 100;</div><div class='del'>-		tm-&gt;tm_wday	= ops-&gt;readb(M48T86_REG_DOW);</div><div class='add'>+		tm-&gt;tm_mon	= ops-&gt;readbyte(M48T86_REG_MONTH) - 1;</div><div class='add'>+		tm-&gt;tm_year	= ops-&gt;readbyte(M48T86_REG_YEAR) + 100;</div><div class='add'>+		tm-&gt;tm_wday	= ops-&gt;readbyte(M48T86_REG_DOW);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* bcd mode */</div><div class='del'>-		tm-&gt;tm_sec	= BCD2BIN(ops-&gt;readb(M48T86_REG_SEC));</div><div class='del'>-		tm-&gt;tm_min	= BCD2BIN(ops-&gt;readb(M48T86_REG_MIN));</div><div class='del'>-		tm-&gt;tm_hour	= BCD2BIN(ops-&gt;readb(M48T86_REG_HOUR) &amp; 0x3F);</div><div class='del'>-		tm-&gt;tm_mday	= BCD2BIN(ops-&gt;readb(M48T86_REG_DOM));</div><div class='add'>+		tm-&gt;tm_sec	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_SEC));</div><div class='add'>+		tm-&gt;tm_min	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_MIN));</div><div class='add'>+		tm-&gt;tm_hour	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_HOUR) &amp; 0x3F);</div><div class='add'>+		tm-&gt;tm_mday	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_DOM));</div><div class='ctx'> 		/* tm_mon is 0-11 */</div><div class='del'>-		tm-&gt;tm_mon	= BCD2BIN(ops-&gt;readb(M48T86_REG_MONTH)) - 1;</div><div class='del'>-		tm-&gt;tm_year	= BCD2BIN(ops-&gt;readb(M48T86_REG_YEAR)) + 100;</div><div class='del'>-		tm-&gt;tm_wday	= BCD2BIN(ops-&gt;readb(M48T86_REG_DOW));</div><div class='add'>+		tm-&gt;tm_mon	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_MONTH)) - 1;</div><div class='add'>+		tm-&gt;tm_year	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_YEAR)) + 100;</div><div class='add'>+		tm-&gt;tm_wday	= BCD2BIN(ops-&gt;readbyte(M48T86_REG_DOW));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* correct the hour if the clock is in 12h mode */</div><div class='ctx'> 	if (!(reg &amp; M48T86_REG_B_H24))</div><div class='del'>-		if (ops-&gt;readb(M48T86_REG_HOUR) &amp; 0x80)</div><div class='add'>+		if (ops-&gt;readbyte(M48T86_REG_HOUR) &amp; 0x80)</div><div class='ctx'> 			tm-&gt;tm_hour += 12;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -86,35 +86,35 @@ static int m48t86_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> 	struct m48t86_ops *ops = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='del'>-	reg = ops-&gt;readb(M48T86_REG_B);</div><div class='add'>+	reg = ops-&gt;readbyte(M48T86_REG_B);</div><div class='ctx'> </div><div class='ctx'> 	/* update flag and 24h mode */</div><div class='ctx'> 	reg |= M48T86_REG_B_SET | M48T86_REG_B_H24;</div><div class='del'>-	ops-&gt;writeb(reg, M48T86_REG_B);</div><div class='add'>+	ops-&gt;writebyte(reg, M48T86_REG_B);</div><div class='ctx'> </div><div class='ctx'> 	if (reg &amp; M48T86_REG_B_DM) {</div><div class='ctx'> 		/* data (binary) mode */</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_sec, M48T86_REG_SEC);</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_min, M48T86_REG_MIN);</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_hour, M48T86_REG_HOUR);</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_mday, M48T86_REG_DOM);</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_mon + 1, M48T86_REG_MONTH);</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_year % 100, M48T86_REG_YEAR);</div><div class='del'>-		ops-&gt;writeb(tm-&gt;tm_wday, M48T86_REG_DOW);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_sec, M48T86_REG_SEC);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_min, M48T86_REG_MIN);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_hour, M48T86_REG_HOUR);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_mday, M48T86_REG_DOM);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_mon + 1, M48T86_REG_MONTH);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_year % 100, M48T86_REG_YEAR);</div><div class='add'>+		ops-&gt;writebyte(tm-&gt;tm_wday, M48T86_REG_DOW);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* bcd mode */</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_sec), M48T86_REG_SEC);</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_min), M48T86_REG_MIN);</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_hour), M48T86_REG_HOUR);</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_mday), M48T86_REG_DOM);</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_mon + 1), M48T86_REG_MONTH);</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_year % 100), M48T86_REG_YEAR);</div><div class='del'>-		ops-&gt;writeb(BIN2BCD(tm-&gt;tm_wday), M48T86_REG_DOW);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_sec), M48T86_REG_SEC);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_min), M48T86_REG_MIN);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_hour), M48T86_REG_HOUR);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_mday), M48T86_REG_DOM);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_mon + 1), M48T86_REG_MONTH);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_year % 100), M48T86_REG_YEAR);</div><div class='add'>+		ops-&gt;writebyte(BIN2BCD(tm-&gt;tm_wday), M48T86_REG_DOW);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* update ended */</div><div class='ctx'> 	reg &amp;= ~M48T86_REG_B_SET;</div><div class='del'>-	ops-&gt;writeb(reg, M48T86_REG_B);</div><div class='add'>+	ops-&gt;writebyte(reg, M48T86_REG_B);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -125,12 +125,12 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> 	struct m48t86_ops *ops = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='del'>-	reg = ops-&gt;readb(M48T86_REG_B);</div><div class='add'>+	reg = ops-&gt;readbyte(M48T86_REG_B);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "mode\t\t: %s\n",</div><div class='ctx'> 		 (reg &amp; M48T86_REG_B_DM) ? "binary" : "bcd");</div><div class='ctx'> </div><div class='del'>-	reg = ops-&gt;readb(M48T86_REG_D);</div><div class='add'>+	reg = ops-&gt;readbyte(M48T86_REG_D);</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "battery\t\t: %s\n",</div><div class='ctx'> 		 (reg &amp; M48T86_REG_D_VRT) ? "ok" : "exhausted");</div><div class='hunk'>@@ -157,7 +157,7 @@ static int __devinit m48t86_rtc_probe(struct platform_device *dev)</div><div class='ctx'> 	platform_set_drvdata(dev, rtc);</div><div class='ctx'> </div><div class='ctx'> 	/* read battery status */</div><div class='del'>-	reg = ops-&gt;readb(M48T86_REG_D);</div><div class='add'>+	reg = ops-&gt;readbyte(M48T86_REG_D);</div><div class='ctx'> 	dev_info(&amp;dev-&gt;dev, "battery %s\n",</div><div class='ctx'> 		(reg &amp; M48T86_REG_D_VRT) ? "ok" : "exhausted");</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c<br/>new file mode 100644<br/>index 000000000000..2c9739562b5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-max6902.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-max6902.c</a></div><div class='hunk'>@@ -0,0 +1,286 @@</div><div class='add'>+/* drivers/char/max6902.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 8D Technologies inc.</div><div class='add'>+ * Copyright (C) 2004 Compulab Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Driver for MAX6902 spi RTC</div><div class='add'>+ *</div><div class='add'>+ * Changelog:</div><div class='add'>+ *</div><div class='add'>+ * 24-May-2006: Raphael Assenat &lt;raph@8d.com&gt;</div><div class='add'>+ *                - Major rework</div><div class='add'>+ *   				Converted to rtc_device and uses the SPI layer.</div><div class='add'>+ *</div><div class='add'>+ * ??-???-2005: Someone at Compulab</div><div class='add'>+ *                - Initial driver creation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/version.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX6902_REG_SECONDS		0x01</div><div class='add'>+#define MAX6902_REG_MINUTES		0x03</div><div class='add'>+#define MAX6902_REG_HOURS		0x05</div><div class='add'>+#define MAX6902_REG_DATE		0x07</div><div class='add'>+#define MAX6902_REG_MONTH		0x09</div><div class='add'>+#define MAX6902_REG_DAY			0x0B</div><div class='add'>+#define MAX6902_REG_YEAR		0x0D</div><div class='add'>+#define MAX6902_REG_CONTROL		0x0F</div><div class='add'>+#define MAX6902_REG_CENTURY		0x13</div><div class='add'>+</div><div class='add'>+#undef MAX6902_DEBUG</div><div class='add'>+</div><div class='add'>+struct max6902 {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	u8 buf[9]; /* Burst read cmd + 8 registers */</div><div class='add'>+	u8 tx_buf[2];</div><div class='add'>+	u8 rx_buf[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void max6902_set_reg(struct device *dev, unsigned char address,</div><div class='add'>+				unsigned char data)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	unsigned char buf[2];</div><div class='add'>+</div><div class='add'>+	/* MSB must be '0' to write */</div><div class='add'>+	buf[0] = address &amp; 0x7f;</div><div class='add'>+	buf[1] = data;</div><div class='add'>+</div><div class='add'>+	spi_write(spi, buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6902_get_reg(struct device *dev, unsigned char address,</div><div class='add'>+				unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct max6902 *chip = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_message message;</div><div class='add'>+	struct spi_transfer xfer;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Build our spi message */</div><div class='add'>+	spi_message_init(&amp;message);</div><div class='add'>+	memset(&amp;xfer, 0, sizeof(xfer));</div><div class='add'>+	xfer.len = 2;</div><div class='add'>+	/* Can tx_buf and rx_buf be equal? The doc in spi.h is not sure... */</div><div class='add'>+	xfer.tx_buf = chip-&gt;tx_buf;</div><div class='add'>+	xfer.rx_buf = chip-&gt;rx_buf;</div><div class='add'>+</div><div class='add'>+	/* Set MSB to indicate read */</div><div class='add'>+	chip-&gt;tx_buf[0] = address | 0x80;</div><div class='add'>+</div><div class='add'>+	spi_message_add_tail(&amp;xfer, &amp;message);</div><div class='add'>+</div><div class='add'>+	/* do the i/o */</div><div class='add'>+	status = spi_sync(spi, &amp;message);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = message.status;</div><div class='add'>+	else</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	*data = chip-&gt;rx_buf[1];</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6902_get_datetime(struct device *dev, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+	unsigned char tmp;</div><div class='add'>+	int century;</div><div class='add'>+	int err;</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct max6902 *chip = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_message message;</div><div class='add'>+	struct spi_transfer xfer;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	err = max6902_get_reg(dev, MAX6902_REG_CENTURY, &amp;tmp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* build the message */</div><div class='add'>+	spi_message_init(&amp;message);</div><div class='add'>+	memset(&amp;xfer, 0, sizeof(xfer));</div><div class='add'>+	xfer.len = 1 + 7;	/* Burst read command + 7 registers */</div><div class='add'>+	xfer.tx_buf = chip-&gt;buf;</div><div class='add'>+	xfer.rx_buf = chip-&gt;buf;</div><div class='add'>+	chip-&gt;buf[0] = 0xbf;	/* Burst read */</div><div class='add'>+	spi_message_add_tail(&amp;xfer, &amp;message);</div><div class='add'>+</div><div class='add'>+	/* do the i/o */</div><div class='add'>+	status = spi_sync(spi, &amp;message);</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = message.status;</div><div class='add'>+	else</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* The chip sends data in this order:</div><div class='add'>+	 * Seconds, Minutes, Hours, Date, Month, Day, Year */</div><div class='add'>+	dt-&gt;tm_sec	= BCD2BIN(chip-&gt;buf[1]);</div><div class='add'>+	dt-&gt;tm_min	= BCD2BIN(chip-&gt;buf[2]);</div><div class='add'>+	dt-&gt;tm_hour	= BCD2BIN(chip-&gt;buf[3]);</div><div class='add'>+	dt-&gt;tm_mday	= BCD2BIN(chip-&gt;buf[4]);</div><div class='add'>+	dt-&gt;tm_mon	= BCD2BIN(chip-&gt;buf[5] - 1);</div><div class='add'>+	dt-&gt;tm_wday	= BCD2BIN(chip-&gt;buf[6]);</div><div class='add'>+	dt-&gt;tm_year = BCD2BIN(chip-&gt;buf[7]);</div><div class='add'>+</div><div class='add'>+	century = BCD2BIN(tmp) * 100;</div><div class='add'>+</div><div class='add'>+	dt-&gt;tm_year += century;</div><div class='add'>+	dt-&gt;tm_year -= 1900;</div><div class='add'>+</div><div class='add'>+#ifdef MAX6902_DEBUG</div><div class='add'>+	printk("\n%s : Read RTC values\n",__FUNCTION__);</div><div class='add'>+	printk("tm_hour: %i\n",dt-&gt;tm_hour);</div><div class='add'>+	printk("tm_min : %i\n",dt-&gt;tm_min);</div><div class='add'>+	printk("tm_sec : %i\n",dt-&gt;tm_sec);</div><div class='add'>+	printk("tm_year: %i\n",dt-&gt;tm_year);</div><div class='add'>+	printk("tm_mon : %i\n",dt-&gt;tm_mon);</div><div class='add'>+	printk("tm_mday: %i\n",dt-&gt;tm_mday);</div><div class='add'>+	printk("tm_wday: %i\n",dt-&gt;tm_wday);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6902_set_datetime(struct device *dev, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+	dt-&gt;tm_year = dt-&gt;tm_year+1900;</div><div class='add'>+</div><div class='add'>+#ifdef MAX6902_DEBUG</div><div class='add'>+	printk("\n%s : Setting RTC values\n",__FUNCTION__);</div><div class='add'>+	printk("tm_sec : %i\n",dt-&gt;tm_sec);</div><div class='add'>+	printk("tm_min : %i\n",dt-&gt;tm_min);</div><div class='add'>+	printk("tm_hour: %i\n",dt-&gt;tm_hour);</div><div class='add'>+	printk("tm_mday: %i\n",dt-&gt;tm_mday);</div><div class='add'>+	printk("tm_wday: %i\n",dt-&gt;tm_wday);</div><div class='add'>+	printk("tm_year: %i\n",dt-&gt;tm_year);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Remove write protection */</div><div class='add'>+	max6902_set_reg(dev, 0xF, 0);</div><div class='add'>+</div><div class='add'>+	max6902_set_reg(dev, 0x01, BIN2BCD(dt-&gt;tm_sec));</div><div class='add'>+	max6902_set_reg(dev, 0x03, BIN2BCD(dt-&gt;tm_min));</div><div class='add'>+	max6902_set_reg(dev, 0x05, BIN2BCD(dt-&gt;tm_hour));</div><div class='add'>+</div><div class='add'>+	max6902_set_reg(dev, 0x07, BIN2BCD(dt-&gt;tm_mday));</div><div class='add'>+	max6902_set_reg(dev, 0x09, BIN2BCD(dt-&gt;tm_mon+1));</div><div class='add'>+	max6902_set_reg(dev, 0x0B, BIN2BCD(dt-&gt;tm_wday));</div><div class='add'>+	max6902_set_reg(dev, 0x0D, BIN2BCD(dt-&gt;tm_year%100));</div><div class='add'>+	max6902_set_reg(dev, 0x13, BIN2BCD(dt-&gt;tm_year/100));</div><div class='add'>+</div><div class='add'>+	/* Compulab used a delay here. However, the datasheet</div><div class='add'>+	 * does not mention a delay being required anywhere... */</div><div class='add'>+	/* delay(2000); */</div><div class='add'>+</div><div class='add'>+	/* Write protect */</div><div class='add'>+	max6902_set_reg(dev, 0xF, 0x80);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6902_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	return max6902_get_datetime(dev, tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max6902_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	return max6902_set_datetime(dev, tm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops max6902_rtc_ops = {</div><div class='add'>+	.read_time	= max6902_read_time,</div><div class='add'>+	.set_time	= max6902_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit max6902_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	unsigned char tmp;</div><div class='add'>+	struct max6902 *chip;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register("max6902",</div><div class='add'>+				&amp;spi-&gt;dev, &amp;max6902_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc))</div><div class='add'>+		return PTR_ERR(rtc);</div><div class='add'>+</div><div class='add'>+	spi-&gt;mode = SPI_MODE_3;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi_setup(spi);</div><div class='add'>+</div><div class='add'>+	chip = kzalloc(sizeof *chip, GFP_KERNEL);</div><div class='add'>+	if (!chip) {</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;rtc = rtc;</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, chip);</div><div class='add'>+</div><div class='add'>+	res = max6902_get_reg(&amp;spi-&gt;dev, MAX6902_REG_SECONDS, &amp;tmp);</div><div class='add'>+	if (res) {</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit max6902_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct max6902 *chip = platform_get_drvdata(spi);</div><div class='add'>+	struct rtc_device *rtc = chip-&gt;rtc;</div><div class='add'>+</div><div class='add'>+	if (rtc)</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+</div><div class='add'>+	kfree(chip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver max6902_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name 	= "max6902",</div><div class='add'>+		.bus	= &amp;spi_bus_type,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe 	= max6902_probe,</div><div class='add'>+	.remove = __devexit_p(max6902_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int max6902_init(void)</div><div class='add'>+{</div><div class='add'>+	printk("max6902 spi driver\n");</div><div class='add'>+	return spi_register_driver(&amp;max6902_driver);</div><div class='add'>+}</div><div class='add'>+module_init(max6902_init);</div><div class='add'>+</div><div class='add'>+static __exit void max6902_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;max6902_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(max6902_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION ("max6902 spi RTC driver");</div><div class='add'>+MODULE_AUTHOR ("Raphael Assenat");</div><div class='add'>+MODULE_LICENSE ("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c<br/>new file mode 100644<br/>index 000000000000..b235a30cb661<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pcf8583.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-pcf8583.c</a></div><div class='hunk'>@@ -0,0 +1,394 @@</div><div class='add'>+/*</div><div class='add'>+ *  drivers/rtc/rtc-pcf8583.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2000 Russell King</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ *  Driver for PCF8583 RTC &amp; RAM chip</div><div class='add'>+ *</div><div class='add'>+ *  Converted to the generic RTC susbsystem by G. Liakhovetski (2006)</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mc146818rtc.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+</div><div class='add'>+struct rtc_mem {</div><div class='add'>+	unsigned int	loc;</div><div class='add'>+	unsigned int	nr;</div><div class='add'>+	unsigned char	*data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pcf8583 {</div><div class='add'>+	struct i2c_client client;</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	unsigned char ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CTRL_STOP	0x80</div><div class='add'>+#define CTRL_HOLD	0x40</div><div class='add'>+#define CTRL_32KHZ	0x00</div><div class='add'>+#define CTRL_MASK	0x08</div><div class='add'>+#define CTRL_ALARMEN	0x04</div><div class='add'>+#define CTRL_ALARM	0x02</div><div class='add'>+#define CTRL_TIMER	0x01</div><div class='add'>+</div><div class='add'>+static unsigned short normal_i2c[] = { I2C_CLIENT_END };</div><div class='add'>+</div><div class='add'>+/* Module parameters */</div><div class='add'>+I2C_CLIENT_INSMOD;</div><div class='add'>+</div><div class='add'>+static struct i2c_driver pcf8583_driver;</div><div class='add'>+</div><div class='add'>+#define get_ctrl(x)    ((struct pcf8583 *)i2c_get_clientdata(x))-&gt;ctrl</div><div class='add'>+#define set_ctrl(x, v) get_ctrl(x) = v</div><div class='add'>+</div><div class='add'>+#define CMOS_YEAR	(64 + 128)</div><div class='add'>+#define CMOS_CHECKSUM	(63)</div><div class='add'>+</div><div class='add'>+static int pcf8583_get_datetime(struct i2c_client *client, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[8], addr[1] = { 1 };</div><div class='add'>+	struct i2c_msg msgs[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = client-&gt;addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = addr,</div><div class='add'>+		}, {</div><div class='add'>+			.addr = client-&gt;addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = 6,</div><div class='add'>+			.buf = buf,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+</div><div class='add'>+	ret = i2c_transfer(client-&gt;adapter, msgs, 2);</div><div class='add'>+	if (ret == 2) {</div><div class='add'>+		dt-&gt;tm_year = buf[4] &gt;&gt; 6;</div><div class='add'>+		dt-&gt;tm_wday = buf[5] &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+		buf[4] &amp;= 0x3f;</div><div class='add'>+		buf[5] &amp;= 0x1f;</div><div class='add'>+</div><div class='add'>+		dt-&gt;tm_sec = BCD_TO_BIN(buf[1]);</div><div class='add'>+		dt-&gt;tm_min = BCD_TO_BIN(buf[2]);</div><div class='add'>+		dt-&gt;tm_hour = BCD_TO_BIN(buf[3]);</div><div class='add'>+		dt-&gt;tm_mday = BCD_TO_BIN(buf[4]);</div><div class='add'>+		dt-&gt;tm_mon = BCD_TO_BIN(buf[5]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret == 2 ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_set_datetime(struct i2c_client *client, struct rtc_time *dt, int datetoo)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[8];</div><div class='add'>+	int ret, len = 6;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	buf[1] = get_ctrl(client) | 0x80;</div><div class='add'>+	buf[2] = 0;</div><div class='add'>+	buf[3] = BIN_TO_BCD(dt-&gt;tm_sec);</div><div class='add'>+	buf[4] = BIN_TO_BCD(dt-&gt;tm_min);</div><div class='add'>+	buf[5] = BIN_TO_BCD(dt-&gt;tm_hour);</div><div class='add'>+</div><div class='add'>+	if (datetoo) {</div><div class='add'>+		len = 8;</div><div class='add'>+		buf[6] = BIN_TO_BCD(dt-&gt;tm_mday) | (dt-&gt;tm_year &lt;&lt; 6);</div><div class='add'>+		buf[7] = BIN_TO_BCD(dt-&gt;tm_mon)  | (dt-&gt;tm_wday &lt;&lt; 5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(client, (char *)buf, len);</div><div class='add'>+	if (ret != len)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	buf[1] = get_ctrl(client);</div><div class='add'>+	ret = i2c_master_send(client, (char *)buf, 2);</div><div class='add'>+</div><div class='add'>+	return ret == 2 ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_get_ctrl(struct i2c_client *client, unsigned char *ctrl)</div><div class='add'>+{</div><div class='add'>+	*ctrl = get_ctrl(client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_set_ctrl(struct i2c_client *client, unsigned char *ctrl)</div><div class='add'>+{</div><div class='add'>+	unsigned char buf[2];</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	buf[1] = *ctrl;</div><div class='add'>+	set_ctrl(client, *ctrl);</div><div class='add'>+</div><div class='add'>+	return i2c_master_send(client, (char *)buf, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_read_mem(struct i2c_client *client, struct rtc_mem *mem)</div><div class='add'>+{</div><div class='add'>+	unsigned char addr[1];</div><div class='add'>+	struct i2c_msg msgs[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = client-&gt;addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = addr,</div><div class='add'>+		}, {</div><div class='add'>+			.addr = client-&gt;addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = mem-&gt;nr,</div><div class='add'>+			.buf = mem-&gt;data,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (mem-&gt;loc &lt; 8)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	addr[0] = mem-&gt;loc;</div><div class='add'>+</div><div class='add'>+	return i2c_transfer(client-&gt;adapter, msgs, 2) == 2 ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_write_mem(struct i2c_client *client, struct rtc_mem *mem)</div><div class='add'>+{</div><div class='add'>+	unsigned char addr[1];</div><div class='add'>+	struct i2c_msg msgs[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = client-&gt;addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = addr,</div><div class='add'>+		}, {</div><div class='add'>+			.addr = client-&gt;addr,</div><div class='add'>+			.flags = I2C_M_NOSTART,</div><div class='add'>+			.len = mem-&gt;nr,</div><div class='add'>+			.buf = mem-&gt;data,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (mem-&gt;loc &lt; 8)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	addr[0] = mem-&gt;loc;</div><div class='add'>+</div><div class='add'>+	return i2c_transfer(client-&gt;adapter, msgs, 2) == 2 ? 0 : -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	unsigned char ctrl, year[2];</div><div class='add'>+	struct rtc_mem mem = { CMOS_YEAR, sizeof(year), year };</div><div class='add'>+	int real_year, year_offset, err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Ensure that the RTC is running.</div><div class='add'>+	 */</div><div class='add'>+	pcf8583_get_ctrl(client, &amp;ctrl);</div><div class='add'>+	if (ctrl &amp; (CTRL_STOP | CTRL_HOLD)) {</div><div class='add'>+		unsigned char new_ctrl = ctrl &amp; ~(CTRL_STOP | CTRL_HOLD);</div><div class='add'>+</div><div class='add'>+		printk(KERN_WARNING "RTC: resetting control %02x -&gt; %02x\n",</div><div class='add'>+		       ctrl, new_ctrl);</div><div class='add'>+</div><div class='add'>+		if ((err = pcf8583_set_ctrl(client, &amp;new_ctrl)) &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pcf8583_get_datetime(client, tm) ||</div><div class='add'>+	    pcf8583_read_mem(client, &amp;mem))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	real_year = year[0];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The RTC year holds the LSB two bits of the current</div><div class='add'>+	 * year, which should reflect the LSB two bits of the</div><div class='add'>+	 * CMOS copy of the year.  Any difference indicates</div><div class='add'>+	 * that we have to correct the CMOS version.</div><div class='add'>+	 */</div><div class='add'>+	year_offset = tm-&gt;tm_year - (real_year &amp; 3);</div><div class='add'>+	if (year_offset &lt; 0)</div><div class='add'>+		/*</div><div class='add'>+		 * RTC year wrapped.  Adjust it appropriately.</div><div class='add'>+		 */</div><div class='add'>+		year_offset += 4;</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_year = real_year + year_offset + year[1] * 100;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct i2c_client *client = to_i2c_client(dev);</div><div class='add'>+	unsigned char year[2], chk;</div><div class='add'>+	struct rtc_mem cmos_year  = { CMOS_YEAR, sizeof(year), year };</div><div class='add'>+	struct rtc_mem cmos_check = { CMOS_CHECKSUM, 1, &amp;chk };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The RTC's own 2-bit year must reflect the least</div><div class='add'>+	 * significant two bits of the CMOS year.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ret = pcf8583_set_datetime(client, tm, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pcf8583_read_mem(client, &amp;cmos_check);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pcf8583_read_mem(client, &amp;cmos_year);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	chk -= year[1] + year[0];</div><div class='add'>+</div><div class='add'>+	year[1] = tm-&gt;tm_year / 100;</div><div class='add'>+	year[0] = tm-&gt;tm_year % 100;</div><div class='add'>+</div><div class='add'>+	chk += year[1] + year[0];</div><div class='add'>+</div><div class='add'>+	ret = pcf8583_write_mem(client, &amp;cmos_year);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pcf8583_write_mem(client, &amp;cmos_check);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops pcf8583_rtc_ops = {</div><div class='add'>+	.read_time	= pcf8583_rtc_read_time,</div><div class='add'>+	.set_time	= pcf8583_rtc_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pcf8583_probe(struct i2c_adapter *adap, int addr, int kind);</div><div class='add'>+</div><div class='add'>+static int pcf8583_attach(struct i2c_adapter *adap)</div><div class='add'>+{</div><div class='add'>+	return i2c_probe(adap, &amp;addr_data, pcf8583_probe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcf8583_detach(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct pcf8583 *pcf = i2c_get_clientdata(client);</div><div class='add'>+	struct rtc_device *rtc = pcf-&gt;rtc;</div><div class='add'>+</div><div class='add'>+	if (rtc)</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+</div><div class='add'>+	if ((err = i2c_detach_client(client)))</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	kfree(pcf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct i2c_driver pcf8583_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "pcf8583",</div><div class='add'>+	},</div><div class='add'>+	.id		= I2C_DRIVERID_PCF8583,</div><div class='add'>+	.attach_adapter	= pcf8583_attach,</div><div class='add'>+	.detach_client	= pcf8583_detach,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pcf8583_probe(struct i2c_adapter *adap, int addr, int kind)</div><div class='add'>+{</div><div class='add'>+	struct pcf8583 *pcf;</div><div class='add'>+	struct i2c_client *client;</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	unsigned char buf[1], ad[1] = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+	struct i2c_msg msgs[2] = {</div><div class='add'>+		{</div><div class='add'>+			.addr = addr,</div><div class='add'>+			.flags = 0,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = ad,</div><div class='add'>+		}, {</div><div class='add'>+			.addr = addr,</div><div class='add'>+			.flags = I2C_M_RD,</div><div class='add'>+			.len = 1,</div><div class='add'>+			.buf = buf,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcf = kzalloc(sizeof(*pcf), GFP_KERNEL);</div><div class='add'>+	if (!pcf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	client = &amp;pcf-&gt;client;</div><div class='add'>+</div><div class='add'>+	client-&gt;addr		= addr;</div><div class='add'>+	client-&gt;adapter	= adap;</div><div class='add'>+	client-&gt;driver	= &amp;pcf8583_driver;</div><div class='add'>+</div><div class='add'>+	strlcpy(client-&gt;name, pcf8583_driver.driver.name, I2C_NAME_SIZE);</div><div class='add'>+</div><div class='add'>+	if (i2c_transfer(client-&gt;adapter, msgs, 2) != 2) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto exit_kfree;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = i2c_attach_client(client);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_kfree;</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register(pcf8583_driver.driver.name, &amp;client-&gt;dev,</div><div class='add'>+				  &amp;pcf8583_rtc_ops, THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		err = PTR_ERR(rtc);</div><div class='add'>+		goto exit_detach;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pcf-&gt;rtc = rtc;</div><div class='add'>+	i2c_set_clientdata(client, pcf);</div><div class='add'>+	set_ctrl(client, buf[0]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_detach:</div><div class='add'>+	i2c_detach_client(client);</div><div class='add'>+</div><div class='add'>+exit_kfree:</div><div class='add'>+	kfree(pcf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __init int pcf8583_init(void)</div><div class='add'>+{</div><div class='add'>+	return i2c_add_driver(&amp;pcf8583_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void pcf8583_exit(void)</div><div class='add'>+{</div><div class='add'>+	i2c_del_driver(&amp;pcf8583_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pcf8583_init);</div><div class='add'>+module_exit(pcf8583_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Russell King");</div><div class='add'>+MODULE_DESCRIPTION("PCF8583 I2C RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c<br/>new file mode 100644<br/>index 000000000000..d6d1c5726b0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-pl031.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-pl031.c</a></div><div class='hunk'>@@ -0,0 +1,233 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/rtc/rtc-pl031.c</div><div class='add'>+ *</div><div class='add'>+ * Real Time Clock interface for ARM AMBA PrimeCell 031 RTC</div><div class='add'>+ *</div><div class='add'>+ * Author: Deepak Saxena &lt;dsaxena@plexity.net&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2006 (c) MontaVista Software, Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or</div><div class='add'>+ * modify it under the terms of the GNU General Public License</div><div class='add'>+ * as published by the Free Software Foundation; either version</div><div class='add'>+ * 2 of the License, or (at your option) any later version.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/amba/bus.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register definitions</div><div class='add'>+ */</div><div class='add'>+#define	RTC_DR		0x00	/* Data read register */</div><div class='add'>+#define	RTC_MR		0x04	/* Match register */</div><div class='add'>+#define	RTC_LR		0x08	/* Data load register */</div><div class='add'>+#define	RTC_CR		0x0c	/* Control register */</div><div class='add'>+#define	RTC_IMSC	0x10	/* Interrupt mask and set register */</div><div class='add'>+#define	RTC_RIS		0x14	/* Raw interrupt status register */</div><div class='add'>+#define	RTC_MIS		0x18	/* Masked interrupt status register */</div><div class='add'>+#define	RTC_ICR		0x1c	/* Interrupt clear register */</div><div class='add'>+</div><div class='add'>+struct pl031_local {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t pl031_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc = dev_id;</div><div class='add'>+</div><div class='add'>+	rtc_update_irq(&amp;rtc-&gt;class_dev, 1, RTC_AF);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_open(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * We request IRQ in pl031_probe, so nothing to do here...</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pl031_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct pl031_local *ldata = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_AIE_OFF:</div><div class='add'>+		__raw_writel(1, ldata-&gt;base + RTC_MIS);</div><div class='add'>+		return 0;</div><div class='add'>+	case RTC_AIE_ON:</div><div class='add'>+		__raw_writel(0, ldata-&gt;base + RTC_MIS);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct pl031_local *ldata = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	rtc_time_to_tm(__raw_readl(ldata-&gt;base + RTC_DR), tm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	unsigned long time;</div><div class='add'>+	struct pl031_local *ldata = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	rtc_tm_to_time(tm, &amp;time);</div><div class='add'>+	__raw_writel(time, ldata-&gt;base + RTC_LR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)</div><div class='add'>+{</div><div class='add'>+	struct pl031_local *ldata = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	rtc_time_to_tm(__raw_readl(ldata-&gt;base + RTC_MR), &amp;alarm-&gt;time);</div><div class='add'>+	alarm-&gt;pending = __raw_readl(ldata-&gt;base + RTC_RIS);</div><div class='add'>+	alarm-&gt;enabled = __raw_readl(ldata-&gt;base + RTC_IMSC);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)</div><div class='add'>+{</div><div class='add'>+	struct pl031_local *ldata = dev_get_drvdata(dev);</div><div class='add'>+	unsigned long time;</div><div class='add'>+</div><div class='add'>+	rtc_tm_to_time(&amp;alarm-&gt;time, &amp;time);</div><div class='add'>+</div><div class='add'>+	__raw_writel(time, ldata-&gt;base + RTC_MR);</div><div class='add'>+	__raw_writel(!alarm-&gt;enabled, ldata-&gt;base + RTC_MIS);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops pl031_ops = {</div><div class='add'>+	.open = pl031_open,</div><div class='add'>+	.release = pl031_release,</div><div class='add'>+	.ioctl = pl031_ioctl,</div><div class='add'>+	.read_time = pl031_read_time,</div><div class='add'>+	.set_time = pl031_set_time,</div><div class='add'>+	.read_alarm = pl031_read_alarm,</div><div class='add'>+	.set_alarm = pl031_set_alarm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pl031_remove(struct amba_device *adev)</div><div class='add'>+{</div><div class='add'>+	struct pl031_local *ldata = dev_get_drvdata(&amp;adev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (ldata) {</div><div class='add'>+		dev_set_drvdata(&amp;adev-&gt;dev, NULL);</div><div class='add'>+		free_irq(adev-&gt;irq[0], ldata-&gt;rtc);</div><div class='add'>+		rtc_device_unregister(ldata-&gt;rtc);</div><div class='add'>+		iounmap(ldata-&gt;base);</div><div class='add'>+		kfree(ldata);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pl031_probe(struct amba_device *adev, void *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct pl031_local *ldata;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	ldata = kmalloc(sizeof(struct pl031_local), GFP_KERNEL);</div><div class='add'>+	if (!ldata) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	dev_set_drvdata(&amp;adev-&gt;dev, ldata);</div><div class='add'>+</div><div class='add'>+	ldata-&gt;base = ioremap(adev-&gt;res.start,</div><div class='add'>+			      adev-&gt;res.end - adev-&gt;res.start + 1);</div><div class='add'>+	if (!ldata-&gt;base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_no_remap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (request_irq(adev-&gt;irq[0], pl031_interrupt, IRQF_DISABLED,</div><div class='add'>+			"rtc-pl031", ldata-&gt;rtc)) {</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto out_no_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ldata-&gt;rtc = rtc_device_register("pl031", &amp;adev-&gt;dev, &amp;pl031_ops,</div><div class='add'>+					 THIS_MODULE);</div><div class='add'>+	if (IS_ERR(ldata-&gt;rtc)) {</div><div class='add'>+		ret = PTR_ERR(ldata-&gt;rtc);</div><div class='add'>+		goto out_no_rtc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_no_rtc:</div><div class='add'>+	free_irq(adev-&gt;irq[0], ldata-&gt;rtc);</div><div class='add'>+out_no_irq:</div><div class='add'>+	iounmap(ldata-&gt;base);</div><div class='add'>+out_no_remap:</div><div class='add'>+	dev_set_drvdata(&amp;adev-&gt;dev, NULL);</div><div class='add'>+	kfree(ldata);</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct amba_id pl031_ids[] __initdata = {</div><div class='add'>+	{</div><div class='add'>+		 .id = 0x00041031,</div><div class='add'>+	 	.mask = 0x000fffff, },</div><div class='add'>+	{0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct amba_driver pl031_driver = {</div><div class='add'>+	.drv = {</div><div class='add'>+		.name = "rtc-pl031",</div><div class='add'>+	},</div><div class='add'>+	.id_table = pl031_ids,</div><div class='add'>+	.probe = pl031_probe,</div><div class='add'>+	.remove = pl031_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init pl031_init(void)</div><div class='add'>+{</div><div class='add'>+	return amba_driver_register(&amp;pl031_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit pl031_exit(void)</div><div class='add'>+{</div><div class='add'>+	amba_driver_unregister(&amp;pl031_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pl031_init);</div><div class='add'>+module_exit(pl031_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Deepak Saxena &lt;dsaxena@plexity.net");</div><div class='add'>+MODULE_DESCRIPTION("ARM AMBA PL031 RTC Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c<br/>new file mode 100644<br/>index 000000000000..0964d1dba925<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-rs5c348.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-rs5c348.c</a></div><div class='hunk'>@@ -0,0 +1,246 @@</div><div class='add'>+/*</div><div class='add'>+ * A SPI driver for the Ricoh RS5C348 RTC</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * The board specific init code should provide characteristics of this</div><div class='add'>+ * device:</div><div class='add'>+ *     Mode 1 (High-Active, Shift-Then-Sample), High Avtive CS</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION "0.1"</div><div class='add'>+</div><div class='add'>+#define RS5C348_REG_SECS	0</div><div class='add'>+#define RS5C348_REG_MINS	1</div><div class='add'>+#define RS5C348_REG_HOURS	2</div><div class='add'>+#define RS5C348_REG_WDAY	3</div><div class='add'>+#define RS5C348_REG_DAY	4</div><div class='add'>+#define RS5C348_REG_MONTH	5</div><div class='add'>+#define RS5C348_REG_YEAR	6</div><div class='add'>+#define RS5C348_REG_CTL1	14</div><div class='add'>+#define RS5C348_REG_CTL2	15</div><div class='add'>+</div><div class='add'>+#define RS5C348_SECS_MASK	0x7f</div><div class='add'>+#define RS5C348_MINS_MASK	0x7f</div><div class='add'>+#define RS5C348_HOURS_MASK	0x3f</div><div class='add'>+#define RS5C348_WDAY_MASK	0x03</div><div class='add'>+#define RS5C348_DAY_MASK	0x3f</div><div class='add'>+#define RS5C348_MONTH_MASK	0x1f</div><div class='add'>+</div><div class='add'>+#define RS5C348_BIT_PM	0x20	/* REG_HOURS */</div><div class='add'>+#define RS5C348_BIT_Y2K	0x80	/* REG_MONTH */</div><div class='add'>+#define RS5C348_BIT_24H	0x20	/* REG_CTL1 */</div><div class='add'>+#define RS5C348_BIT_XSTP	0x10	/* REG_CTL2 */</div><div class='add'>+#define RS5C348_BIT_VDET	0x40	/* REG_CTL2 */</div><div class='add'>+</div><div class='add'>+#define RS5C348_CMD_W(addr)	(((addr) &lt;&lt; 4) | 0x08)	/* single write */</div><div class='add'>+#define RS5C348_CMD_R(addr)	(((addr) &lt;&lt; 4) | 0x0c)	/* single read */</div><div class='add'>+#define RS5C348_CMD_MW(addr)	(((addr) &lt;&lt; 4) | 0x00)	/* burst write */</div><div class='add'>+#define RS5C348_CMD_MR(addr)	(((addr) &lt;&lt; 4) | 0x04)	/* burst read */</div><div class='add'>+</div><div class='add'>+struct rs5c348_plat_data {</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	int rtc_24h;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rs5c348_rtc_set_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct rs5c348_plat_data *pdata = spi-&gt;dev.platform_data;</div><div class='add'>+	u8 txbuf[5+7], *txp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Transfer 5 bytes before writing SEC.  This gives 31us for carry. */</div><div class='add'>+	txp = txbuf;</div><div class='add'>+	txbuf[0] = RS5C348_CMD_R(RS5C348_REG_CTL2); /* cmd, ctl2 */</div><div class='add'>+	txbuf[1] = 0;	/* dummy */</div><div class='add'>+	txbuf[2] = RS5C348_CMD_R(RS5C348_REG_CTL2); /* cmd, ctl2 */</div><div class='add'>+	txbuf[3] = 0;	/* dummy */</div><div class='add'>+	txbuf[4] = RS5C348_CMD_MW(RS5C348_REG_SECS); /* cmd, sec, ... */</div><div class='add'>+	txp = &amp;txbuf[5];</div><div class='add'>+	txp[RS5C348_REG_SECS] = BIN2BCD(tm-&gt;tm_sec);</div><div class='add'>+	txp[RS5C348_REG_MINS] = BIN2BCD(tm-&gt;tm_min);</div><div class='add'>+	if (pdata-&gt;rtc_24h) {</div><div class='add'>+		txp[RS5C348_REG_HOURS] = BIN2BCD(tm-&gt;tm_hour);</div><div class='add'>+	} else {</div><div class='add'>+		/* hour 0 is AM12, noon is PM12 */</div><div class='add'>+		txp[RS5C348_REG_HOURS] = BIN2BCD((tm-&gt;tm_hour + 11) % 12 + 1) |</div><div class='add'>+			(tm-&gt;tm_hour &gt;= 12 ? RS5C348_BIT_PM : 0);</div><div class='add'>+	}</div><div class='add'>+	txp[RS5C348_REG_WDAY] = BIN2BCD(tm-&gt;tm_wday);</div><div class='add'>+	txp[RS5C348_REG_DAY] = BIN2BCD(tm-&gt;tm_mday);</div><div class='add'>+	txp[RS5C348_REG_MONTH] = BIN2BCD(tm-&gt;tm_mon + 1) |</div><div class='add'>+		(tm-&gt;tm_year &gt;= 100 ? RS5C348_BIT_Y2K : 0);</div><div class='add'>+	txp[RS5C348_REG_YEAR] = BIN2BCD(tm-&gt;tm_year % 100);</div><div class='add'>+	/* write in one transfer to avoid data inconsistency */</div><div class='add'>+	ret = spi_write_then_read(spi, txbuf, sizeof(txbuf), NULL, 0);</div><div class='add'>+	udelay(62);	/* Tcsr 62us */</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rs5c348_rtc_read_time(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	struct rs5c348_plat_data *pdata = spi-&gt;dev.platform_data;</div><div class='add'>+	u8 txbuf[5], rxbuf[7];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Transfer 5 byte befores reading SEC.  This gives 31us for carry. */</div><div class='add'>+	txbuf[0] = RS5C348_CMD_R(RS5C348_REG_CTL2); /* cmd, ctl2 */</div><div class='add'>+	txbuf[1] = 0;	/* dummy */</div><div class='add'>+	txbuf[2] = RS5C348_CMD_R(RS5C348_REG_CTL2); /* cmd, ctl2 */</div><div class='add'>+	txbuf[3] = 0;	/* dummy */</div><div class='add'>+	txbuf[4] = RS5C348_CMD_MR(RS5C348_REG_SECS); /* cmd, sec, ... */</div><div class='add'>+</div><div class='add'>+	/* read in one transfer to avoid data inconsistency */</div><div class='add'>+	ret = spi_write_then_read(spi, txbuf, sizeof(txbuf),</div><div class='add'>+				  rxbuf, sizeof(rxbuf));</div><div class='add'>+	udelay(62);	/* Tcsr 62us */</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tm-&gt;tm_sec = BCD2BIN(rxbuf[RS5C348_REG_SECS] &amp; RS5C348_SECS_MASK);</div><div class='add'>+	tm-&gt;tm_min = BCD2BIN(rxbuf[RS5C348_REG_MINS] &amp; RS5C348_MINS_MASK);</div><div class='add'>+	tm-&gt;tm_hour = BCD2BIN(rxbuf[RS5C348_REG_HOURS] &amp; RS5C348_HOURS_MASK);</div><div class='add'>+	if (!pdata-&gt;rtc_24h) {</div><div class='add'>+		tm-&gt;tm_hour %= 12;</div><div class='add'>+		if (rxbuf[RS5C348_REG_HOURS] &amp; RS5C348_BIT_PM)</div><div class='add'>+			tm-&gt;tm_hour += 12;</div><div class='add'>+	}</div><div class='add'>+	tm-&gt;tm_wday = BCD2BIN(rxbuf[RS5C348_REG_WDAY] &amp; RS5C348_WDAY_MASK);</div><div class='add'>+	tm-&gt;tm_mday = BCD2BIN(rxbuf[RS5C348_REG_DAY] &amp; RS5C348_DAY_MASK);</div><div class='add'>+	tm-&gt;tm_mon =</div><div class='add'>+		BCD2BIN(rxbuf[RS5C348_REG_MONTH] &amp; RS5C348_MONTH_MASK) - 1;</div><div class='add'>+	/* year is 1900 + tm-&gt;tm_year */</div><div class='add'>+	tm-&gt;tm_year = BCD2BIN(rxbuf[RS5C348_REG_YEAR]) +</div><div class='add'>+		((rxbuf[RS5C348_REG_MONTH] &amp; RS5C348_BIT_Y2K) ? 100 : 0);</div><div class='add'>+</div><div class='add'>+	if (rtc_valid_tm(tm) &lt; 0) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "retrieved date/time is not valid.\n");</div><div class='add'>+		rtc_time_to_tm(0, tm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops rs5c348_rtc_ops = {</div><div class='add'>+	.read_time	= rs5c348_rtc_read_time,</div><div class='add'>+	.set_time	= rs5c348_rtc_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver rs5c348_driver;</div><div class='add'>+</div><div class='add'>+static int __devinit rs5c348_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct rs5c348_plat_data *pdata;</div><div class='add'>+</div><div class='add'>+	pdata = kzalloc(sizeof(struct rs5c348_plat_data), GFP_KERNEL);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spi-&gt;dev.platform_data = pdata;</div><div class='add'>+</div><div class='add'>+	/* Check D7 of SECOND register */</div><div class='add'>+	ret = spi_w8r8(spi, RS5C348_CMD_R(RS5C348_REG_SECS));</div><div class='add'>+	if (ret &lt; 0 || (ret &amp; 0x80)) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "not found.\n");</div><div class='add'>+		goto kfree_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "chip found, driver version " DRV_VERSION "\n");</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "spiclk %u KHz.\n",</div><div class='add'>+		 (spi-&gt;max_speed_hz + 500) / 1000);</div><div class='add'>+</div><div class='add'>+	/* turn RTC on if it was not on */</div><div class='add'>+	ret = spi_w8r8(spi, RS5C348_CMD_R(RS5C348_REG_CTL2));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto kfree_exit;</div><div class='add'>+	if (ret &amp; (RS5C348_BIT_XSTP | RS5C348_BIT_VDET)) {</div><div class='add'>+		u8 buf[2];</div><div class='add'>+		if (ret &amp; RS5C348_BIT_VDET)</div><div class='add'>+			dev_warn(&amp;spi-&gt;dev, "voltage-low detected.\n");</div><div class='add'>+		buf[0] = RS5C348_CMD_W(RS5C348_REG_CTL2);</div><div class='add'>+		buf[1] = 0;</div><div class='add'>+		ret = spi_write_then_read(spi, buf, sizeof(buf), NULL, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto kfree_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = spi_w8r8(spi, RS5C348_CMD_R(RS5C348_REG_CTL1));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto kfree_exit;</div><div class='add'>+	if (ret &amp; RS5C348_BIT_24H)</div><div class='add'>+		pdata-&gt;rtc_24h = 1;</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register(rs5c348_driver.driver.name, &amp;spi-&gt;dev,</div><div class='add'>+				  &amp;rs5c348_rtc_ops, THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		ret = PTR_ERR(rtc);</div><div class='add'>+		goto kfree_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdata-&gt;rtc = rtc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+ kfree_exit:</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit rs5c348_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct rs5c348_plat_data *pdata = spi-&gt;dev.platform_data;</div><div class='add'>+	struct rtc_device *rtc = pdata-&gt;rtc;</div><div class='add'>+</div><div class='add'>+	if (rtc)</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct spi_driver rs5c348_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "rs5c348",</div><div class='add'>+		.bus	= &amp;spi_bus_type,</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.probe	= rs5c348_probe,</div><div class='add'>+	.remove	= __devexit_p(rs5c348_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int rs5c348_init(void)</div><div class='add'>+{</div><div class='add'>+	return spi_register_driver(&amp;rs5c348_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void rs5c348_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;rs5c348_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(rs5c348_init);</div><div class='add'>+module_exit(rs5c348_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Atsushi Nemoto &lt;anemo@mba.ocn.ne.jp&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c<br/>new file mode 100644<br/>index 000000000000..d6d1bff52b8e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-s3c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-s3c.c</a></div><div class='hunk'>@@ -0,0 +1,607 @@</div><div class='add'>+/* drivers/rtc/rtc-s3c.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004,2006 Simtec Electronics</div><div class='add'>+ *	Ben Dooks, &lt;ben@simtec.co.uk&gt;</div><div class='add'>+ *	http://armlinux.simtec.co.uk/</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * S3C2410/S3C2440/S3C24XX Internal RTC Driver</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/rtc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach/time.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/regs-rtc.h&gt;</div><div class='add'>+</div><div class='add'>+/* I have yet to find an S3C implementation with more than one</div><div class='add'>+ * of these rtc blocks in */</div><div class='add'>+</div><div class='add'>+static struct resource *s3c_rtc_mem;</div><div class='add'>+</div><div class='add'>+static void __iomem *s3c_rtc_base;</div><div class='add'>+static int s3c_rtc_alarmno = NO_IRQ;</div><div class='add'>+static int s3c_rtc_tickno  = NO_IRQ;</div><div class='add'>+static int s3c_rtc_freq    = 1;</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(s3c_rtc_pie_lock);</div><div class='add'>+static unsigned int tick_count;</div><div class='add'>+</div><div class='add'>+/* IRQ Handlers */</div><div class='add'>+</div><div class='add'>+static irqreturn_t s3c_rtc_alarmirq(int irq, void *id, struct pt_regs *r)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rdev = id;</div><div class='add'>+</div><div class='add'>+	rtc_update_irq(&amp;rdev-&gt;class_dev, 1, RTC_AF | RTC_IRQF);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t s3c_rtc_tickirq(int irq, void *id, struct pt_regs *r)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rdev = id;</div><div class='add'>+</div><div class='add'>+	rtc_update_irq(&amp;rdev-&gt;class_dev, tick_count++, RTC_PF | RTC_IRQF);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update control registers */</div><div class='add'>+static void s3c_rtc_setaie(int to)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: aie=%d\n", __FUNCTION__, to);</div><div class='add'>+</div><div class='add'>+	tmp = readb(S3C2410_RTCALM) &amp; ~S3C2410_RTCALM_ALMEN;</div><div class='add'>+</div><div class='add'>+	if (to)</div><div class='add'>+		tmp |= S3C2410_RTCALM_ALMEN;</div><div class='add'>+</div><div class='add'>+	writeb(tmp, S3C2410_RTCALM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_rtc_setpie(int to)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: pie=%d\n", __FUNCTION__, to);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;s3c_rtc_pie_lock);</div><div class='add'>+	tmp = readb(S3C2410_TICNT) &amp; ~S3C2410_TICNT_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (to)</div><div class='add'>+		tmp |= S3C2410_TICNT_ENABLE;</div><div class='add'>+</div><div class='add'>+	writeb(tmp, S3C2410_TICNT);</div><div class='add'>+	spin_unlock_irq(&amp;s3c_rtc_pie_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_rtc_setfreq(int freq)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;s3c_rtc_pie_lock);</div><div class='add'>+	tmp = readb(S3C2410_TICNT) &amp; S3C2410_TICNT_ENABLE;</div><div class='add'>+</div><div class='add'>+	s3c_rtc_freq = freq;</div><div class='add'>+</div><div class='add'>+	tmp |= (128 / freq)-1;</div><div class='add'>+</div><div class='add'>+	writeb(tmp, S3C2410_TICNT);</div><div class='add'>+	spin_unlock_irq(&amp;s3c_rtc_pie_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Time read/write */</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)</div><div class='add'>+{</div><div class='add'>+	unsigned int have_retried = 0;</div><div class='add'>+</div><div class='add'>+ retry_get_time:</div><div class='add'>+	rtc_tm-&gt;tm_min  = readb(S3C2410_RTCMIN);</div><div class='add'>+	rtc_tm-&gt;tm_hour = readb(S3C2410_RTCHOUR);</div><div class='add'>+	rtc_tm-&gt;tm_mday = readb(S3C2410_RTCDATE);</div><div class='add'>+	rtc_tm-&gt;tm_mon  = readb(S3C2410_RTCMON);</div><div class='add'>+	rtc_tm-&gt;tm_year = readb(S3C2410_RTCYEAR);</div><div class='add'>+	rtc_tm-&gt;tm_sec  = readb(S3C2410_RTCSEC);</div><div class='add'>+</div><div class='add'>+	/* the only way to work out wether the system was mid-update</div><div class='add'>+	 * when we read it is to check the second counter, and if it</div><div class='add'>+	 * is zero, then we re-try the entire read</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (rtc_tm-&gt;tm_sec == 0 &amp;&amp; !have_retried) {</div><div class='add'>+		have_retried = 1;</div><div class='add'>+		goto retry_get_time;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("read time %02x.%02x.%02x %02x/%02x/%02x\n",</div><div class='add'>+		 rtc_tm-&gt;tm_year, rtc_tm-&gt;tm_mon, rtc_tm-&gt;tm_mday,</div><div class='add'>+		 rtc_tm-&gt;tm_hour, rtc_tm-&gt;tm_min, rtc_tm-&gt;tm_sec);</div><div class='add'>+</div><div class='add'>+	BCD_TO_BIN(rtc_tm-&gt;tm_sec);</div><div class='add'>+	BCD_TO_BIN(rtc_tm-&gt;tm_min);</div><div class='add'>+	BCD_TO_BIN(rtc_tm-&gt;tm_hour);</div><div class='add'>+	BCD_TO_BIN(rtc_tm-&gt;tm_mday);</div><div class='add'>+	BCD_TO_BIN(rtc_tm-&gt;tm_mon);</div><div class='add'>+	BCD_TO_BIN(rtc_tm-&gt;tm_year);</div><div class='add'>+</div><div class='add'>+	rtc_tm-&gt;tm_year += 100;</div><div class='add'>+	rtc_tm-&gt;tm_mon -= 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)</div><div class='add'>+{</div><div class='add'>+	/* the rtc gets round the y2k problem by just not supporting it */</div><div class='add'>+</div><div class='add'>+	if (tm-&gt;tm_year &lt; 100)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_sec),  S3C2410_RTCSEC);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_min),  S3C2410_RTCMIN);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_hour), S3C2410_RTCHOUR);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_mday), S3C2410_RTCDATE);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_mon + 1), S3C2410_RTCMON);</div><div class='add'>+	writeb(BIN2BCD(tm-&gt;tm_year - 100), S3C2410_RTCYEAR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time *alm_tm = &amp;alrm-&gt;time;</div><div class='add'>+	unsigned int alm_en;</div><div class='add'>+</div><div class='add'>+	alm_tm-&gt;tm_sec  = readb(S3C2410_ALMSEC);</div><div class='add'>+	alm_tm-&gt;tm_min  = readb(S3C2410_ALMMIN);</div><div class='add'>+	alm_tm-&gt;tm_hour = readb(S3C2410_ALMHOUR);</div><div class='add'>+	alm_tm-&gt;tm_mon  = readb(S3C2410_ALMMON);</div><div class='add'>+	alm_tm-&gt;tm_mday = readb(S3C2410_ALMDATE);</div><div class='add'>+	alm_tm-&gt;tm_year = readb(S3C2410_ALMYEAR);</div><div class='add'>+</div><div class='add'>+	alm_en = readb(S3C2410_RTCALM);</div><div class='add'>+</div><div class='add'>+	pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",</div><div class='add'>+		 alm_en,</div><div class='add'>+		 alm_tm-&gt;tm_year, alm_tm-&gt;tm_mon, alm_tm-&gt;tm_mday,</div><div class='add'>+		 alm_tm-&gt;tm_hour, alm_tm-&gt;tm_min, alm_tm-&gt;tm_sec);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* decode the alarm enable field */</div><div class='add'>+</div><div class='add'>+	if (alm_en &amp; S3C2410_RTCALM_SECEN)</div><div class='add'>+		BCD_TO_BIN(alm_tm-&gt;tm_sec);</div><div class='add'>+	else</div><div class='add'>+		alm_tm-&gt;tm_sec = 0xff;</div><div class='add'>+</div><div class='add'>+	if (alm_en &amp; S3C2410_RTCALM_MINEN)</div><div class='add'>+		BCD_TO_BIN(alm_tm-&gt;tm_min);</div><div class='add'>+	else</div><div class='add'>+		alm_tm-&gt;tm_min = 0xff;</div><div class='add'>+</div><div class='add'>+	if (alm_en &amp; S3C2410_RTCALM_HOUREN)</div><div class='add'>+		BCD_TO_BIN(alm_tm-&gt;tm_hour);</div><div class='add'>+	else</div><div class='add'>+		alm_tm-&gt;tm_hour = 0xff;</div><div class='add'>+</div><div class='add'>+	if (alm_en &amp; S3C2410_RTCALM_DAYEN)</div><div class='add'>+		BCD_TO_BIN(alm_tm-&gt;tm_mday);</div><div class='add'>+	else</div><div class='add'>+		alm_tm-&gt;tm_mday = 0xff;</div><div class='add'>+</div><div class='add'>+	if (alm_en &amp; S3C2410_RTCALM_MONEN) {</div><div class='add'>+		BCD_TO_BIN(alm_tm-&gt;tm_mon);</div><div class='add'>+		alm_tm-&gt;tm_mon -= 1;</div><div class='add'>+	} else {</div><div class='add'>+		alm_tm-&gt;tm_mon = 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (alm_en &amp; S3C2410_RTCALM_YEAREN)</div><div class='add'>+		BCD_TO_BIN(alm_tm-&gt;tm_year);</div><div class='add'>+	else</div><div class='add'>+		alm_tm-&gt;tm_year = 0xffff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time *tm = &amp;alrm-&gt;time;</div><div class='add'>+	unsigned int alrm_en;</div><div class='add'>+</div><div class='add'>+	pr_debug("s3c_rtc_setalarm: %d, %02x/%02x/%02x %02x.%02x.%02x\n",</div><div class='add'>+		 alrm-&gt;enabled,</div><div class='add'>+		 tm-&gt;tm_mday &amp; 0xff, tm-&gt;tm_mon &amp; 0xff, tm-&gt;tm_year &amp; 0xff,</div><div class='add'>+		 tm-&gt;tm_hour &amp; 0xff, tm-&gt;tm_min &amp; 0xff, tm-&gt;tm_sec);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	alrm_en = readb(S3C2410_RTCALM) &amp; S3C2410_RTCALM_ALMEN;</div><div class='add'>+	writeb(0x00, S3C2410_RTCALM);</div><div class='add'>+</div><div class='add'>+	if (tm-&gt;tm_sec &lt; 60 &amp;&amp; tm-&gt;tm_sec &gt;= 0) {</div><div class='add'>+		alrm_en |= S3C2410_RTCALM_SECEN;</div><div class='add'>+		writeb(BIN2BCD(tm-&gt;tm_sec), S3C2410_ALMSEC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tm-&gt;tm_min &lt; 60 &amp;&amp; tm-&gt;tm_min &gt;= 0) {</div><div class='add'>+		alrm_en |= S3C2410_RTCALM_MINEN;</div><div class='add'>+		writeb(BIN2BCD(tm-&gt;tm_min), S3C2410_ALMMIN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tm-&gt;tm_hour &lt; 24 &amp;&amp; tm-&gt;tm_hour &gt;= 0) {</div><div class='add'>+		alrm_en |= S3C2410_RTCALM_HOUREN;</div><div class='add'>+		writeb(BIN2BCD(tm-&gt;tm_hour), S3C2410_ALMHOUR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("setting S3C2410_RTCALM to %08x\n", alrm_en);</div><div class='add'>+</div><div class='add'>+	writeb(alrm_en, S3C2410_RTCALM);</div><div class='add'>+</div><div class='add'>+	if (0) {</div><div class='add'>+		alrm_en = readb(S3C2410_RTCALM);</div><div class='add'>+		alrm_en &amp;= ~S3C2410_RTCALM_ALMEN;</div><div class='add'>+		writeb(alrm_en, S3C2410_RTCALM);</div><div class='add'>+		disable_irq_wake(s3c_rtc_alarmno);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (alrm-&gt;enabled)</div><div class='add'>+		enable_irq_wake(s3c_rtc_alarmno);</div><div class='add'>+	else</div><div class='add'>+		disable_irq_wake(s3c_rtc_alarmno);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_ioctl(struct device *dev,</div><div class='add'>+			 unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	unsigned int ret = -ENOIOCTLCMD;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case RTC_AIE_OFF:</div><div class='add'>+	case RTC_AIE_ON:</div><div class='add'>+		s3c_rtc_setaie((cmd == RTC_AIE_ON) ? 1 : 0);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_PIE_OFF:</div><div class='add'>+	case RTC_PIE_ON:</div><div class='add'>+		tick_count = 0;</div><div class='add'>+		s3c_rtc_setpie((cmd == RTC_PIE_ON) ? 1 : 0);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_IRQP_READ:</div><div class='add'>+		ret = put_user(s3c_rtc_freq, (unsigned long __user *)arg);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_IRQP_SET:</div><div class='add'>+		/* check for power of 2 */</div><div class='add'>+</div><div class='add'>+		if ((arg &amp; (arg-1)) != 0 || arg &lt; 1) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pr_debug("s3c2410_rtc: setting frequency %ld\n", arg);</div><div class='add'>+</div><div class='add'>+		s3c_rtc_setfreq(arg);</div><div class='add'>+		ret = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case RTC_UIE_ON:</div><div class='add'>+	case RTC_UIE_OFF:</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)</div><div class='add'>+{</div><div class='add'>+	unsigned int rtcalm = readb(S3C2410_RTCALM);</div><div class='add'>+	unsigned int ticnt = readb (S3C2410_TICNT);</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "alarm_IRQ\t: %s\n",</div><div class='add'>+		   (rtcalm &amp; S3C2410_RTCALM_ALMEN) ? "yes" : "no" );</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "periodic_IRQ\t: %s\n",</div><div class='add'>+		     (ticnt &amp; S3C2410_TICNT_ENABLE) ? "yes" : "no" );</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "periodic_freq\t: %d\n", s3c_rtc_freq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_open(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_device *rtc_dev = platform_get_drvdata(pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,</div><div class='add'>+			  SA_INTERRUPT,  "s3c2410-rtc alarm", rtc_dev);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,</div><div class='add'>+			  SA_INTERRUPT,  "s3c2410-rtc tick", rtc_dev);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);</div><div class='add'>+		goto tick_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+ tick_err:</div><div class='add'>+	free_irq(s3c_rtc_alarmno, rtc_dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void s3c_rtc_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = to_platform_device(dev);</div><div class='add'>+	struct rtc_device *rtc_dev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	/* do not clear AIE here, it may be needed for wake */</div><div class='add'>+</div><div class='add'>+	s3c_rtc_setpie(0);</div><div class='add'>+	free_irq(s3c_rtc_alarmno, rtc_dev);</div><div class='add'>+	free_irq(s3c_rtc_tickno, rtc_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops s3c_rtcops = {</div><div class='add'>+	.open		= s3c_rtc_open,</div><div class='add'>+	.release	= s3c_rtc_release,</div><div class='add'>+	.ioctl		= s3c_rtc_ioctl,</div><div class='add'>+	.read_time	= s3c_rtc_gettime,</div><div class='add'>+	.set_time	= s3c_rtc_settime,</div><div class='add'>+	.read_alarm	= s3c_rtc_getalarm,</div><div class='add'>+	.set_alarm	= s3c_rtc_setalarm,</div><div class='add'>+	.proc	        = s3c_rtc_proc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void s3c_rtc_enable(struct platform_device *pdev, int en)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	if (s3c_rtc_base == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!en) {</div><div class='add'>+		tmp = readb(S3C2410_RTCCON);</div><div class='add'>+		writeb(tmp &amp; ~S3C2410_RTCCON_RTCEN, S3C2410_RTCCON);</div><div class='add'>+</div><div class='add'>+		tmp = readb(S3C2410_TICNT);</div><div class='add'>+		writeb(tmp &amp; ~S3C2410_TICNT_ENABLE, S3C2410_TICNT);</div><div class='add'>+	} else {</div><div class='add'>+		/* re-enable the device, and check it is ok */</div><div class='add'>+</div><div class='add'>+		if ((readb(S3C2410_RTCCON) &amp; S3C2410_RTCCON_RTCEN) == 0){</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "rtc disabled, re-enabling\n");</div><div class='add'>+</div><div class='add'>+			tmp = readb(S3C2410_RTCCON);</div><div class='add'>+			writeb(tmp | S3C2410_RTCCON_RTCEN , S3C2410_RTCCON);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((readb(S3C2410_RTCCON) &amp; S3C2410_RTCCON_CNTSEL)){</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "removing RTCCON_CNTSEL\n");</div><div class='add'>+</div><div class='add'>+			tmp = readb(S3C2410_RTCCON);</div><div class='add'>+			writeb(tmp&amp; ~S3C2410_RTCCON_CNTSEL , S3C2410_RTCCON);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((readb(S3C2410_RTCCON) &amp; S3C2410_RTCCON_CLKRST)){</div><div class='add'>+			dev_info(&amp;pdev-&gt;dev, "removing RTCCON_CLKRST\n");</div><div class='add'>+</div><div class='add'>+			tmp = readb(S3C2410_RTCCON);</div><div class='add'>+			writeb(tmp &amp; ~S3C2410_RTCCON_CLKRST, S3C2410_RTCCON);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(dev, NULL);</div><div class='add'>+	rtc_device_unregister(rtc);</div><div class='add'>+</div><div class='add'>+	s3c_rtc_setpie(0);</div><div class='add'>+	s3c_rtc_setaie(0);</div><div class='add'>+</div><div class='add'>+	iounmap(s3c_rtc_base);</div><div class='add'>+	release_resource(s3c_rtc_mem);</div><div class='add'>+	kfree(s3c_rtc_mem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);</div><div class='add'>+</div><div class='add'>+	/* find the IRQs */</div><div class='add'>+</div><div class='add'>+	s3c_rtc_tickno = platform_get_irq(pdev, 1);</div><div class='add'>+	if (s3c_rtc_tickno &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no irq for rtc tick\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s3c_rtc_alarmno = platform_get_irq(pdev, 0);</div><div class='add'>+	if (s3c_rtc_alarmno &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no irq for alarm\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("s3c2410_rtc: tick irq %d, alarm irq %d\n",</div><div class='add'>+		 s3c_rtc_tickno, s3c_rtc_alarmno);</div><div class='add'>+</div><div class='add'>+	/* get the memory region */</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (res == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to get memory region resource\n");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s3c_rtc_mem = request_mem_region(res-&gt;start,</div><div class='add'>+					     res-&gt;end-res-&gt;start+1,</div><div class='add'>+					     pdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	if (s3c_rtc_mem == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to reserve memory region\n");</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto err_nores;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s3c_rtc_base = ioremap(res-&gt;start, res-&gt;end - res-&gt;start + 1);</div><div class='add'>+	if (s3c_rtc_base == NULL) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed ioremap()\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_nomap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check to see if everything is setup correctly */</div><div class='add'>+</div><div class='add'>+	s3c_rtc_enable(pdev, 1);</div><div class='add'>+</div><div class='add'>+ 	pr_debug("s3c2410_rtc: RTCCON=%02x\n", readb(S3C2410_RTCCON));</div><div class='add'>+</div><div class='add'>+	s3c_rtc_setfreq(s3c_rtc_freq);</div><div class='add'>+</div><div class='add'>+	/* register RTC and exit */</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register("s3c", &amp;pdev-&gt;dev, &amp;s3c_rtcops,</div><div class='add'>+				  THIS_MODULE);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot attach rtc\n");</div><div class='add'>+		ret = PTR_ERR(rtc);</div><div class='add'>+		goto err_nortc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtc-&gt;max_user_freq = 128;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, rtc);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_nortc:</div><div class='add'>+	s3c_rtc_enable(pdev, 0);</div><div class='add'>+	iounmap(s3c_rtc_base);</div><div class='add'>+</div><div class='add'>+ err_nomap:</div><div class='add'>+	release_resource(s3c_rtc_mem);</div><div class='add'>+</div><div class='add'>+ err_nores:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+</div><div class='add'>+/* RTC Power management control */</div><div class='add'>+</div><div class='add'>+static struct timespec s3c_rtc_delta;</div><div class='add'>+</div><div class='add'>+static int ticnt_save;</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+	struct timespec time;</div><div class='add'>+</div><div class='add'>+	time.tv_nsec = 0;</div><div class='add'>+</div><div class='add'>+	/* save TICNT for anyone using periodic interrupts */</div><div class='add'>+</div><div class='add'>+	ticnt_save = readb(S3C2410_TICNT);</div><div class='add'>+</div><div class='add'>+	/* calculate time delta for suspend */</div><div class='add'>+</div><div class='add'>+	s3c_rtc_gettime(&amp;pdev-&gt;dev, &amp;tm);</div><div class='add'>+	rtc_tm_to_time(&amp;tm, &amp;time.tv_sec);</div><div class='add'>+	save_time_delta(&amp;s3c_rtc_delta, &amp;time);</div><div class='add'>+	s3c_rtc_enable(pdev, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c_rtc_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rtc_time tm;</div><div class='add'>+	struct timespec time;</div><div class='add'>+</div><div class='add'>+	time.tv_nsec = 0;</div><div class='add'>+</div><div class='add'>+	s3c_rtc_enable(pdev, 1);</div><div class='add'>+	s3c_rtc_gettime(&amp;pdev-&gt;dev, &amp;tm);</div><div class='add'>+	rtc_tm_to_time(&amp;tm, &amp;time.tv_sec);</div><div class='add'>+	restore_time_delta(&amp;s3c_rtc_delta, &amp;time);</div><div class='add'>+</div><div class='add'>+	writeb(ticnt_save, S3C2410_TICNT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define s3c_rtc_suspend NULL</div><div class='add'>+#define s3c_rtc_resume  NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct platform_driver s3c2410_rtcdrv = {</div><div class='add'>+	.probe		= s3c_rtc_probe,</div><div class='add'>+	.remove		= s3c_rtc_remove,</div><div class='add'>+	.suspend	= s3c_rtc_suspend,</div><div class='add'>+	.resume		= s3c_rtc_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "s3c2410-rtc",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char __initdata banner[] = "S3C24XX RTC, (c) 2004,2006 Simtec Electronics\n";</div><div class='add'>+</div><div class='add'>+static int __init s3c_rtc_init(void)</div><div class='add'>+{</div><div class='add'>+	printk(banner);</div><div class='add'>+	return platform_driver_register(&amp;s3c2410_rtcdrv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit s3c_rtc_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;s3c2410_rtcdrv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(s3c_rtc_init);</div><div class='add'>+module_exit(s3c_rtc_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Samsung S3C RTC Driver");</div><div class='add'>+MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c<br/>index a997529f8926..ee4b61ee67b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-sa1100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-sa1100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-sa1100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-sa1100.c</a></div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> static unsigned long rtc_freq = 1024;</div><div class='ctx'> static struct rtc_time rtc_alarm;</div><div class='del'>-static spinlock_t sa1100_rtc_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(sa1100_rtc_lock);</div><div class='ctx'> </div><div class='ctx'> static int rtc_update_alarm(struct rtc_time *alrm)</div><div class='ctx'> {</div><div class='hunk'>@@ -157,19 +157,19 @@ static int sa1100_rtc_open(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,</div><div class='ctx'> 				"rtc 1Hz", dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);</div><div class='ctx'> 		goto fail_ui;</div><div class='ctx'> 	}</div><div class='del'>-	ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,</div><div class='ctx'> 				"rtc Alrm", dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);</div><div class='ctx'> 		goto fail_ai;</div><div class='ctx'> 	}</div><div class='del'>-	ret = request_irq(IRQ_OST1, timer1_interrupt, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(IRQ_OST1, timer1_interrupt, IRQF_DISABLED,</div><div class='ctx'> 				"rtc timer", dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(dev, "IRQ %d already in use.\n", IRQ_OST1);</div><div class='hunk'>@@ -229,8 +229,6 @@ static int sa1100_rtc_ioctl(struct device *dev, unsigned int cmd,</div><div class='ctx'> 		spin_unlock_irq(&amp;sa1100_rtc_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case RTC_PIE_ON:</div><div class='del'>-		if ((rtc_freq &gt; 64) &amp;&amp; !capable(CAP_SYS_RESOURCE))</div><div class='del'>-			return -EACCES;</div><div class='ctx'> 		spin_lock_irq(&amp;sa1100_rtc_lock);</div><div class='ctx'> 		OSMR1 = TIMER_FREQ/rtc_freq + OSCR;</div><div class='ctx'> 		OIER |= OIER_E1;</div><div class='hunk'>@@ -242,8 +240,6 @@ static int sa1100_rtc_ioctl(struct device *dev, unsigned int cmd,</div><div class='ctx'> 	case RTC_IRQP_SET:</div><div class='ctx'> 		if (arg &lt; 1 || arg &gt; TIMER_FREQ)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if ((arg &gt; 64) &amp;&amp; (!capable(CAP_SYS_RESOURCE)))</div><div class='del'>-			return -EACCES;</div><div class='ctx'> 		rtc_freq = arg;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c<br/>new file mode 100644<br/>index 000000000000..a40f400acff6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-v3020.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-v3020.c</a></div><div class='hunk'>@@ -0,0 +1,264 @@</div><div class='add'>+/* drivers/rtc/rtc-v3020.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 8D Technologies inc.</div><div class='add'>+ * Copyright (C) 2004 Compulab Ltd.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * Driver for the V3020 RTC</div><div class='add'>+ *</div><div class='add'>+ * Changelog:</div><div class='add'>+ *</div><div class='add'>+ *  10-May-2006: Raphael Assenat &lt;raph@8d.com&gt;</div><div class='add'>+ *				- Converted to platform driver</div><div class='add'>+ *				- Use the generic rtc class</div><div class='add'>+ *</div><div class='add'>+ *  ??-???-2004: Someone at Compulab</div><div class='add'>+ *  			- Initial driver creation.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/bcd.h&gt;</div><div class='add'>+#include &lt;linux/rtc-v3020.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#undef DEBUG</div><div class='add'>+</div><div class='add'>+struct v3020 {</div><div class='add'>+	void __iomem *ioaddress;</div><div class='add'>+	int leftshift;</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void v3020_set_reg(struct v3020 *chip, unsigned char address,</div><div class='add'>+			unsigned char data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned char tmp;</div><div class='add'>+</div><div class='add'>+	tmp = address;</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		writel((tmp &amp; 1) &lt;&lt; chip-&gt;leftshift, chip-&gt;ioaddress);</div><div class='add'>+		tmp &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Commands dont have data */</div><div class='add'>+	if (!V3020_IS_COMMAND(address)) {</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			writel((data &amp; 1) &lt;&lt; chip-&gt;leftshift, chip-&gt;ioaddress);</div><div class='add'>+			data &gt;&gt;= 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)</div><div class='add'>+{</div><div class='add'>+	unsigned int data=0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		writel((address &amp; 1) &lt;&lt; chip-&gt;leftshift, chip-&gt;ioaddress);</div><div class='add'>+		address &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		data &gt;&gt;= 1;</div><div class='add'>+		if (readl(chip-&gt;ioaddress) &amp; (1 &lt;&lt; chip-&gt;leftshift))</div><div class='add'>+			data |= 0x80;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int v3020_read_time(struct device *dev, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+	struct v3020 *chip = dev_get_drvdata(dev);</div><div class='add'>+	int tmp;</div><div class='add'>+</div><div class='add'>+	/* Copy the current time to ram... */</div><div class='add'>+	v3020_set_reg(chip, V3020_CMD_CLOCK2RAM, 0);</div><div class='add'>+</div><div class='add'>+	/* ...and then read constant values. */</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_SECONDS);</div><div class='add'>+	dt-&gt;tm_sec	= BCD2BIN(tmp);</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_MINUTES);</div><div class='add'>+	dt-&gt;tm_min	= BCD2BIN(tmp);</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_HOURS);</div><div class='add'>+	dt-&gt;tm_hour	= BCD2BIN(tmp);</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_MONTH_DAY);</div><div class='add'>+	dt-&gt;tm_mday	= BCD2BIN(tmp);</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_MONTH);</div><div class='add'>+	dt-&gt;tm_mon	= BCD2BIN(tmp);</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_WEEK_DAY);</div><div class='add'>+	dt-&gt;tm_wday	= BCD2BIN(tmp);</div><div class='add'>+	tmp = v3020_get_reg(chip, V3020_YEAR);</div><div class='add'>+	dt-&gt;tm_year = BCD2BIN(tmp)+100;</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	printk("\n%s : Read RTC values\n",__FUNCTION__);</div><div class='add'>+	printk("tm_hour: %i\n",dt-&gt;tm_hour);</div><div class='add'>+	printk("tm_min : %i\n",dt-&gt;tm_min);</div><div class='add'>+	printk("tm_sec : %i\n",dt-&gt;tm_sec);</div><div class='add'>+	printk("tm_year: %i\n",dt-&gt;tm_year);</div><div class='add'>+	printk("tm_mon : %i\n",dt-&gt;tm_mon);</div><div class='add'>+	printk("tm_mday: %i\n",dt-&gt;tm_mday);</div><div class='add'>+	printk("tm_wday: %i\n",dt-&gt;tm_wday);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int v3020_set_time(struct device *dev, struct rtc_time *dt)</div><div class='add'>+{</div><div class='add'>+	struct v3020 *chip = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+	printk("\n%s : Setting RTC values\n",__FUNCTION__);</div><div class='add'>+	printk("tm_sec : %i\n",dt-&gt;tm_sec);</div><div class='add'>+	printk("tm_min : %i\n",dt-&gt;tm_min);</div><div class='add'>+	printk("tm_hour: %i\n",dt-&gt;tm_hour);</div><div class='add'>+	printk("tm_mday: %i\n",dt-&gt;tm_mday);</div><div class='add'>+	printk("tm_wday: %i\n",dt-&gt;tm_wday);</div><div class='add'>+	printk("tm_year: %i\n",dt-&gt;tm_year);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Write all the values to ram... */</div><div class='add'>+	v3020_set_reg(chip, V3020_SECONDS, 	BIN2BCD(dt-&gt;tm_sec));</div><div class='add'>+	v3020_set_reg(chip, V3020_MINUTES, 	BIN2BCD(dt-&gt;tm_min));</div><div class='add'>+	v3020_set_reg(chip, V3020_HOURS, 	BIN2BCD(dt-&gt;tm_hour));</div><div class='add'>+	v3020_set_reg(chip, V3020_MONTH_DAY,	BIN2BCD(dt-&gt;tm_mday));</div><div class='add'>+	v3020_set_reg(chip, V3020_MONTH, 	BIN2BCD(dt-&gt;tm_mon));</div><div class='add'>+	v3020_set_reg(chip, V3020_WEEK_DAY, 	BIN2BCD(dt-&gt;tm_wday));</div><div class='add'>+	v3020_set_reg(chip, V3020_YEAR, 	BIN2BCD(dt-&gt;tm_year % 100));</div><div class='add'>+</div><div class='add'>+	/* ...and set the clock. */</div><div class='add'>+	v3020_set_reg(chip, V3020_CMD_RAM2CLOCK, 0);</div><div class='add'>+</div><div class='add'>+	/* Compulab used this delay here. I dont know why,</div><div class='add'>+	 * the datasheet does not specify a delay. */</div><div class='add'>+	/*mdelay(5);*/</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtc_class_ops v3020_rtc_ops = {</div><div class='add'>+	.read_time	= v3020_read_time,</div><div class='add'>+	.set_time	= v3020_set_time,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtc_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct v3020_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='add'>+	struct v3020 *chip;</div><div class='add'>+	struct rtc_device *rtc;</div><div class='add'>+	int retval = -EBUSY;</div><div class='add'>+	int i;</div><div class='add'>+	int temp;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;num_resources != 1)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;resource[0].flags != IORESOURCE_MEM)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (pdev == NULL)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	chip = kzalloc(sizeof *chip, GFP_KERNEL);</div><div class='add'>+	if (!chip)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chip-&gt;leftshift = pdata-&gt;leftshift;</div><div class='add'>+	chip-&gt;ioaddress = ioremap(pdev-&gt;resource[0].start, 1);</div><div class='add'>+	if (chip-&gt;ioaddress == NULL)</div><div class='add'>+		goto err_chip;</div><div class='add'>+</div><div class='add'>+	/* Make sure the v3020 expects a communication cycle</div><div class='add'>+	 * by reading 8 times */</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		temp = readl(chip-&gt;ioaddress);</div><div class='add'>+</div><div class='add'>+	/* Test chip by doing a write/read sequence</div><div class='add'>+	 * to the chip ram */</div><div class='add'>+	v3020_set_reg(chip, V3020_SECONDS, 0x33);</div><div class='add'>+	if(v3020_get_reg(chip, V3020_SECONDS) != 0x33) {</div><div class='add'>+		retval = -ENODEV;</div><div class='add'>+		goto err_io;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure frequency measurment mode, test modes, and lock</div><div class='add'>+	 * are all disabled */</div><div class='add'>+	v3020_set_reg(chip, V3020_STATUS_0, 0x0);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Chip available at physical address 0x%p,"</div><div class='add'>+		"data connected to D%d\n",</div><div class='add'>+		(void*)pdev-&gt;resource[0].start,</div><div class='add'>+		chip-&gt;leftshift);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, chip);</div><div class='add'>+</div><div class='add'>+	rtc = rtc_device_register("v3020",</div><div class='add'>+				&amp;pdev-&gt;dev, &amp;v3020_rtc_ops, THIS_MODULE);</div><div class='add'>+	if (IS_ERR(rtc)) {</div><div class='add'>+		retval = PTR_ERR(rtc);</div><div class='add'>+		goto err_io;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;rtc = rtc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_io:</div><div class='add'>+	iounmap(chip-&gt;ioaddress);</div><div class='add'>+err_chip:</div><div class='add'>+	kfree(chip);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtc_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct v3020 *chip = platform_get_drvdata(dev);</div><div class='add'>+	struct rtc_device *rtc = chip-&gt;rtc;</div><div class='add'>+</div><div class='add'>+	if (rtc)</div><div class='add'>+		rtc_device_unregister(rtc);</div><div class='add'>+</div><div class='add'>+	iounmap(chip-&gt;ioaddress);</div><div class='add'>+	kfree(chip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver rtc_device_driver = {</div><div class='add'>+	.probe	= rtc_probe,</div><div class='add'>+	.remove = rtc_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "v3020",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int v3020_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;rtc_device_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void v3020_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;rtc_device_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(v3020_init);</div><div class='add'>+module_exit(v3020_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("V3020 RTC");</div><div class='add'>+MODULE_AUTHOR("Raphael Assenat");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c<br/>index 277596c302e3..596764fd29f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-vr41xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/rtc/rtc-vr41xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/rtc/rtc-vr41xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/rtc/rtc-vr41xx.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='add'>+#include &lt;asm/vr41xx/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("NEC VR4100 series RTC driver");</div><div class='hunk'>@@ -81,7 +81,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define RTC_FREQUENCY		32768</div><div class='ctx'> #define MAX_PERIODIC_RATE	6553</div><div class='del'>-#define MAX_USER_PERIODIC_RATE	64</div><div class='ctx'> </div><div class='ctx'> static void __iomem *rtc1_base;</div><div class='ctx'> static void __iomem *rtc2_base;</div><div class='hunk'>@@ -94,7 +93,7 @@ static void __iomem *rtc2_base;</div><div class='ctx'> </div><div class='ctx'> static unsigned long epoch = 1970;	/* Jan 1 1970 00:00:00 */</div><div class='ctx'> </div><div class='del'>-static spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(rtc_lock);</div><div class='ctx'> static char rtc_name[] = "RTC";</div><div class='ctx'> static unsigned long periodic_frequency;</div><div class='ctx'> static unsigned long periodic_count;</div><div class='hunk'>@@ -240,9 +239,6 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long</div><div class='ctx'> 		if (arg &gt; MAX_PERIODIC_RATE)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (arg &gt; MAX_USER_PERIODIC_RATE &amp;&amp; capable(CAP_SYS_RESOURCE) == 0)</div><div class='del'>-			return -EACCES;</div><div class='del'>-</div><div class='ctx'> 		periodic_frequency = arg;</div><div class='ctx'> </div><div class='ctx'> 		count = RTC_FREQUENCY;</div><div class='hunk'>@@ -263,10 +259,6 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long</div><div class='ctx'> 		/* Doesn't support before 1900 */</div><div class='ctx'> 		if (arg &lt; 1900)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (capable(CAP_SYS_TIME) == 0)</div><div class='del'>-			return -EACCES;</div><div class='del'>-</div><div class='ctx'> 		epoch = arg;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -353,11 +345,11 @@ static int __devinit rtc_probe(struct platform_device *pdev)</div><div class='ctx'> 	spin_unlock_irq(&amp;rtc_lock);</div><div class='ctx'> </div><div class='ctx'> 	irq = ELAPSEDTIME_IRQ;</div><div class='del'>-	retval = request_irq(irq, elapsedtime_interrupt, SA_INTERRUPT,</div><div class='add'>+	retval = request_irq(irq, elapsedtime_interrupt, IRQF_DISABLED,</div><div class='ctx'> 	                     "elapsed_time", pdev);</div><div class='ctx'> 	if (retval == 0) {</div><div class='ctx'> 		irq = RTCLONG1_IRQ;</div><div class='del'>-		retval = request_irq(irq, rtclong1_interrupt, SA_INTERRUPT,</div><div class='add'>+		retval = request_irq(irq, rtclong1_interrupt, IRQF_DISABLED,</div><div class='ctx'> 		                     "rtclong1", pdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c<br/>index cfb1fff3787c..4bf03fb67f8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -95,7 +94,7 @@ dasd_alloc_device(void)</div><div class='ctx'> 	spin_lock_init(&amp;device-&gt;mem_lock);</div><div class='ctx'> 	spin_lock_init(&amp;device-&gt;request_queue_lock);</div><div class='ctx'> 	atomic_set (&amp;device-&gt;tasklet_scheduled, 0);</div><div class='del'>-	tasklet_init(&amp;device-&gt;tasklet, </div><div class='add'>+	tasklet_init(&amp;device-&gt;tasklet,</div><div class='ctx'> 		     (void (*)(unsigned long)) dasd_tasklet,</div><div class='ctx'> 		     (unsigned long) device);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;device-&gt;ccw_queue);</div><div class='hunk'>@@ -128,7 +127,7 @@ dasd_state_new_to_known(struct dasd_device *device)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * As long as the device is not in state DASD_STATE_NEW we want to </div><div class='add'>+	 * As long as the device is not in state DASD_STATE_NEW we want to</div><div class='ctx'> 	 * keep the reference count &gt; 0.</div><div class='ctx'> 	 */</div><div class='ctx'> 	dasd_get_device(device);</div><div class='hunk'>@@ -336,7 +335,7 @@ dasd_decrease_state(struct dasd_device *device)</div><div class='ctx'> 	if (device-&gt;state == DASD_STATE_ONLINE &amp;&amp;</div><div class='ctx'> 	    device-&gt;target &lt;= DASD_STATE_READY)</div><div class='ctx'> 		dasd_state_online_to_ready(device);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (device-&gt;state == DASD_STATE_READY &amp;&amp;</div><div class='ctx'> 	    device-&gt;target &lt;= DASD_STATE_BASIC)</div><div class='ctx'> 		dasd_state_ready_to_basic(device);</div><div class='hunk'>@@ -348,7 +347,7 @@ dasd_decrease_state(struct dasd_device *device)</div><div class='ctx'> 	if (device-&gt;state == DASD_STATE_BASIC &amp;&amp;</div><div class='ctx'> 	    device-&gt;target &lt;= DASD_STATE_KNOWN)</div><div class='ctx'> 		dasd_state_basic_to_known(device);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (device-&gt;state == DASD_STATE_KNOWN &amp;&amp;</div><div class='ctx'> 	    device-&gt;target &lt;= DASD_STATE_NEW)</div><div class='ctx'> 		dasd_state_known_to_new(device);</div><div class='hunk'>@@ -994,7 +993,7 @@ dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'> 		      ((irb-&gt;scsw.cstat &lt;&lt; 8) | irb-&gt;scsw.dstat), cqr);</div><div class='ctx'> </div><div class='ctx'>  	/* Find out the appropriate era_action. */</div><div class='del'>-	if (irb-&gt;scsw.fctl &amp; SCSW_FCTL_HALT_FUNC) </div><div class='add'>+	if (irb-&gt;scsw.fctl &amp; SCSW_FCTL_HALT_FUNC)</div><div class='ctx'> 		era = dasd_era_fatal;</div><div class='ctx'> 	else if (irb-&gt;scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END) &amp;&amp;</div><div class='ctx'> 		 irb-&gt;scsw.cstat == 0 &amp;&amp;</div><div class='hunk'>@@ -1004,7 +1003,7 @@ dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,</div><div class='ctx'>  	        era = dasd_era_fatal; /* don't recover this request */</div><div class='ctx'> 	else if (irb-&gt;esw.esw0.erw.cons)</div><div class='ctx'> 		era = device-&gt;discipline-&gt;examine_error(cqr, irb);</div><div class='del'>-	else </div><div class='add'>+	else</div><div class='ctx'> 		era = dasd_era_recover;</div><div class='ctx'> </div><div class='ctx'> 	DBF_DEV_EVENT(DBF_DEBUG, device, "era_code %d", era);</div><div class='hunk'>@@ -1287,7 +1286,7 @@ __dasd_start_head(struct dasd_device * device)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Remove requests from the ccw queue. </div><div class='add'>+ * Remove requests from the ccw queue.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> dasd_flush_ccw_queue(struct dasd_device * device, int all)</div><div class='hunk'>@@ -1450,23 +1449,23 @@ dasd_sleep_on(struct dasd_ccw_req * cqr)</div><div class='ctx'> 	wait_queue_head_t wait_q;</div><div class='ctx'> 	struct dasd_device *device;</div><div class='ctx'> 	int rc;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	device = cqr-&gt;device;</div><div class='ctx'> 	spin_lock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	init_waitqueue_head (&amp;wait_q);</div><div class='ctx'> 	cqr-&gt;callback = dasd_wakeup_cb;</div><div class='ctx'> 	cqr-&gt;callback_data = (void *) &amp;wait_q;</div><div class='ctx'> 	cqr-&gt;status = DASD_CQR_QUEUED;</div><div class='ctx'> 	list_add_tail(&amp;cqr-&gt;list, &amp;device-&gt;ccw_queue);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* let the bh start the request to keep them in order */</div><div class='ctx'> 	dasd_schedule_bh(device);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='ctx'> </div><div class='ctx'> 	wait_event(wait_q, _wait_for_wakeup(cqr));</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Request status is either done or failed. */</div><div class='ctx'> 	rc = (cqr-&gt;status == DASD_CQR_FAILED) ? -EIO : 0;</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1568,7 +1567,7 @@ dasd_sleep_on_immediatly(struct dasd_ccw_req * cqr)</div><div class='ctx'> 	wait_queue_head_t wait_q;</div><div class='ctx'> 	struct dasd_device *device;</div><div class='ctx'> 	int rc;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	device = cqr-&gt;device;</div><div class='ctx'> 	spin_lock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='ctx'> 	rc = _dasd_term_running_cqr(device);</div><div class='hunk'>@@ -1576,20 +1575,20 @@ dasd_sleep_on_immediatly(struct dasd_ccw_req * cqr)</div><div class='ctx'> 		spin_unlock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	init_waitqueue_head (&amp;wait_q);</div><div class='ctx'> 	cqr-&gt;callback = dasd_wakeup_cb;</div><div class='ctx'> 	cqr-&gt;callback_data = (void *) &amp;wait_q;</div><div class='ctx'> 	cqr-&gt;status = DASD_CQR_QUEUED;</div><div class='ctx'> 	list_add(&amp;cqr-&gt;list, &amp;device-&gt;ccw_queue);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* let the bh start the request to keep them in order */</div><div class='ctx'> 	dasd_schedule_bh(device);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irq(get_ccwdev_lock(device-&gt;cdev));</div><div class='ctx'> </div><div class='ctx'> 	wait_event(wait_q, _wait_for_wakeup(cqr));</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Request status is either done or failed. */</div><div class='ctx'> 	rc = (cqr-&gt;status == DASD_CQR_FAILED) ? -EIO : 0;</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1725,7 +1724,7 @@ dasd_flush_request_queue(struct dasd_device * device)</div><div class='ctx'> </div><div class='ctx'> 	if (!device-&gt;request_queue)</div><div class='ctx'> 		return;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irq(&amp;device-&gt;request_queue_lock);</div><div class='ctx'> 	while (!list_empty(&amp;device-&gt;request_queue-&gt;queue_head)) {</div><div class='ctx'> 		req = elv_next_request(device-&gt;request_queue);</div><div class='hunk'>@@ -1834,7 +1833,6 @@ dasd_exit(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	dasd_gendisk_exit();</div><div class='ctx'> 	dasd_devmap_exit();</div><div class='del'>-	devfs_remove("dasd");</div><div class='ctx'> 	if (dasd_debug_area != NULL) {</div><div class='ctx'> 		debug_unregister(dasd_debug_area);</div><div class='ctx'> 		dasd_debug_area = NULL;</div><div class='hunk'>@@ -1855,15 +1853,34 @@ dasd_generic_probe (struct ccw_device *cdev,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "dasd_generic_probe: could not set ccw-device options "</div><div class='add'>+		       "for %s\n", cdev-&gt;dev.bus_id);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> 	ret = dasd_add_sysfs_files(cdev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 		       "dasd_generic_probe: could not add sysfs entries "</div><div class='ctx'> 		       "for %s\n", cdev-&gt;dev.bus_id);</div><div class='del'>-	} else {</div><div class='del'>-		cdev-&gt;handler = &amp;dasd_int_handler;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='add'>+	cdev-&gt;handler = &amp;dasd_int_handler;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Automatically online either all dasd devices (dasd_autodetect)</div><div class='add'>+	 * or all devices specified with dasd= parameters during</div><div class='add'>+	 * initial probe.</div><div class='add'>+	 */</div><div class='add'>+	if ((dasd_get_feature(cdev, DASD_FEATURE_INITIAL_ONLINE) &gt; 0 ) ||</div><div class='add'>+	    (dasd_autodetect &amp;&amp; dasd_busid_known(cdev-&gt;dev.bus_id) != 0))</div><div class='add'>+		ret = ccw_device_set_online(cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "dasd_generic_probe: could not initially online "</div><div class='add'>+		       "ccw-device %s\n", cdev-&gt;dev.bus_id);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1911,6 +1928,8 @@ dasd_generic_set_online (struct ccw_device *cdev,</div><div class='ctx'> 	struct dasd_device *device;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	/* first online clears initial online feature flag */</div><div class='add'>+	dasd_set_feature(cdev, DASD_FEATURE_INITIAL_ONLINE, 0);</div><div class='ctx'> 	device = dasd_create_device(cdev);</div><div class='ctx'> 	if (IS_ERR(device))</div><div class='ctx'> 		return PTR_ERR(device);</div><div class='hunk'>@@ -2065,31 +2084,6 @@ dasd_generic_notify(struct ccw_device *cdev, int event)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Automatically online either all dasd devices (dasd_autodetect) or</div><div class='del'>- * all devices specified with dasd= parameters.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-__dasd_auto_online(struct device *dev, void *data)</div><div class='del'>-{</div><div class='del'>-	struct ccw_device *cdev;</div><div class='del'>-</div><div class='del'>-	cdev = to_ccwdev(dev);</div><div class='del'>-	if (dasd_autodetect || dasd_busid_known(cdev-&gt;dev.bus_id) == 0)</div><div class='del'>-		ccw_device_set_online(cdev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver)</div><div class='del'>-{</div><div class='del'>-	struct device_driver *drv;</div><div class='del'>-</div><div class='del'>-	drv = get_driver(&amp;dasd_discipline_driver-&gt;driver);</div><div class='del'>-	driver_for_each_device(drv, NULL, NULL, __dasd_auto_online);</div><div class='del'>-	put_driver(drv);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> dasd_init(void)</div><div class='hunk'>@@ -2111,9 +2105,6 @@ dasd_init(void)</div><div class='ctx'> </div><div class='ctx'> 	dasd_diag_discipline_pointer = NULL;</div><div class='ctx'> </div><div class='del'>-	rc = devfs_mk_dir("dasd");</div><div class='del'>-	if (rc)</div><div class='del'>-		goto failed;</div><div class='ctx'> 	rc = dasd_devmap_init();</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto failed;</div><div class='hunk'>@@ -2170,23 +2161,4 @@ EXPORT_SYMBOL_GPL(dasd_generic_remove);</div><div class='ctx'> EXPORT_SYMBOL_GPL(dasd_generic_notify);</div><div class='ctx'> EXPORT_SYMBOL_GPL(dasd_generic_set_online);</div><div class='ctx'> EXPORT_SYMBOL_GPL(dasd_generic_set_offline);</div><div class='del'>-EXPORT_SYMBOL_GPL(dasd_generic_auto_online);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4</div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_3370_erp.c b/drivers/s390/block/dasd_3370_erp.c<br/>index 1d11c2a9525d..1ddab8991d92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_3370_erp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_3370_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_3370_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_3370_erp.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_3370_erp.c</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='hunk'>@@ -12,10 +12,10 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3370_ERP_EXAMINE </div><div class='add'>+ * DASD_3370_ERP_EXAMINE</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Checks only for fatal/no/recover error. </div><div class='add'>+ *   Checks only for fatal/no/recover error.</div><div class='ctx'>  *   A detailed examination of the sense data is done later outside</div><div class='ctx'>  *   the interrupt handler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  *   'Chapter 7. 3370 Sense Data'.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   dasd_era_none	no error </div><div class='add'>+ *   dasd_era_none	no error</div><div class='ctx'>  *   dasd_era_fatal	for all fatal (unrecoverable errors)</div><div class='ctx'>  *   dasd_era_recover	for all others.</div><div class='ctx'>  */</div><div class='hunk'>@@ -82,22 +82,3 @@ dasd_3370_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb)</div><div class='ctx'> 	return dasd_era_recover;</div><div class='ctx'> </div><div class='ctx'> }				/* END dasd_3370_erp_examine */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4 </div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c<br/>index 2ed51562319e..669805d4402d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_3990_erp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_3990_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_3990_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_3990_erp.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_3990_erp.c</div><div class='del'>- * Author(s)......: Horst  Hummel    &lt;Horst.Hummel@de.ibm.com&gt; </div><div class='add'>+ * Author(s)......: Horst  Hummel    &lt;Horst.Hummel@de.ibm.com&gt;</div><div class='ctx'>  *		    Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='ctx'>  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000, 2001</div><div class='hunk'>@@ -25,23 +25,23 @@ struct DCTL_data {</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  * SECTION ERP EXAMINATION</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_EXAMINE_24 </div><div class='add'>+ * DASD_3990_ERP_EXAMINE_24</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Checks only for fatal (unrecoverable) error. </div><div class='add'>+ *   Checks only for fatal (unrecoverable) error.</div><div class='ctx'>  *   A detailed examination of the sense data is done later outside</div><div class='ctx'>  *   the interrupt handler.</div><div class='ctx'>  *</div><div class='ctx'>  *   Each bit configuration leading to an action code 2 (Exit with</div><div class='ctx'>  *   programming error or unusual condition indication)</div><div class='ctx'>  *   are handled as fatal error´s.</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  *   All other configurations are handled as recoverable errors.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='hunk'>@@ -93,15 +93,15 @@ dasd_3990_erp_examine_24(struct dasd_ccw_req * cqr, char *sense)</div><div class='ctx'> }				/* END dasd_3990_erp_examine_24 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_EXAMINE_32 </div><div class='add'>+ * DASD_3990_ERP_EXAMINE_32</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Checks only for fatal/no/recoverable error. </div><div class='add'>+ *   Checks only for fatal/no/recoverable error.</div><div class='ctx'>  *   A detailed examination of the sense data is done later outside</div><div class='ctx'>  *   the interrupt handler.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   dasd_era_none	no error </div><div class='add'>+ *   dasd_era_none	no error</div><div class='ctx'>  *   dasd_era_fatal	for all fatal (unrecoverable errors)</div><div class='ctx'>  *   dasd_era_recover	for recoverable others.</div><div class='ctx'>  */</div><div class='hunk'>@@ -128,10 +128,10 @@ dasd_3990_erp_examine_32(struct dasd_ccw_req * cqr, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_examine_32 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_EXAMINE </div><div class='add'>+ * DASD_3990_ERP_EXAMINE</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Checks only for fatal/no/recover error. </div><div class='add'>+ *   Checks only for fatal/no/recover error.</div><div class='ctx'>  *   A detailed examination of the sense data is done later outside</div><div class='ctx'>  *   the interrupt handler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -139,7 +139,7 @@ dasd_3990_erp_examine_32(struct dasd_ccw_req * cqr, char *sense)</div><div class='ctx'>  *   'Chapter 7. Error Recovery Procedures'.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   dasd_era_none	no error </div><div class='add'>+ *   dasd_era_none	no error</div><div class='ctx'>  *   dasd_era_fatal	for all fatal (unrecoverable errors)</div><div class='ctx'>  *   dasd_era_recover	for all others.</div><div class='ctx'>  */</div><div class='hunk'>@@ -178,18 +178,18 @@ dasd_3990_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb)</div><div class='ctx'> }				/* END dasd_3990_erp_examine */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  * SECTION ERP HANDLING</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  * 24 and 32 byte sense ERP functions</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_CLEANUP </div><div class='add'>+ * DASD_3990_ERP_CLEANUP</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Removes the already build but not necessary ERP request and sets</div><div class='hunk'>@@ -197,10 +197,10 @@ dasd_3990_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb)</div><div class='ctx'>  *</div><div class='ctx'>  *  PARAMETER</div><div class='ctx'>  *   erp		request to be blocked</div><div class='del'>- *   final_status	either DASD_CQR_DONE or DASD_CQR_FAILED </div><div class='add'>+ *   final_status	either DASD_CQR_DONE or DASD_CQR_FAILED</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   cqr		original cqr		   </div><div class='add'>+ *   cqr		original cqr</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_ccw_req *</div><div class='ctx'> dasd_3990_erp_cleanup(struct dasd_ccw_req * erp, char final_status)</div><div class='hunk'>@@ -214,7 +214,7 @@ dasd_3990_erp_cleanup(struct dasd_ccw_req * erp, char final_status)</div><div class='ctx'> }				/* end dasd_3990_erp_cleanup */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_BLOCK_QUEUE </div><div class='add'>+ * DASD_3990_ERP_BLOCK_QUEUE</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Block the given device request queue to prevent from further</div><div class='hunk'>@@ -237,7 +237,7 @@ dasd_3990_erp_block_queue(struct dasd_ccw_req * erp, int expires)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_INT_REQ </div><div class='add'>+ * DASD_3990_ERP_INT_REQ</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles 'Intervention Required' error.</div><div class='hunk'>@@ -277,7 +277,7 @@ dasd_3990_erp_int_req(struct dasd_ccw_req * erp)</div><div class='ctx'> }				/* end dasd_3990_erp_int_req */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_ALTERNATE_PATH </div><div class='add'>+ * DASD_3990_ERP_ALTERNATE_PATH</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Repeat the operation on a different channel path.</div><div class='hunk'>@@ -330,15 +330,15 @@ dasd_3990_erp_alternate_path(struct dasd_ccw_req * erp)</div><div class='ctx'>  * DASD_3990_ERP_DCTL</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Setup cqr to do the Diagnostic Control (DCTL) command with an </div><div class='add'>+ *   Setup cqr to do the Diagnostic Control (DCTL) command with an</div><div class='ctx'>  *   Inhibit Write subcommand (0x20) and the given modifier.</div><div class='ctx'>  *</div><div class='ctx'>  *  PARAMETER</div><div class='ctx'>  *   erp		pointer to the current (failed) ERP</div><div class='ctx'>  *   modifier		subcommand modifier</div><div class='del'>- *   </div><div class='add'>+ *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   dctl_cqr		pointer to NEW dctl_cqr </div><div class='add'>+ *   dctl_cqr		pointer to NEW dctl_cqr</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_ccw_req *</div><div class='hunk'>@@ -386,7 +386,7 @@ dasd_3990_erp_DCTL(struct dasd_ccw_req * erp, char modifier)</div><div class='ctx'> }				/* end dasd_3990_erp_DCTL */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_ACTION_1 </div><div class='add'>+ * DASD_3990_ERP_ACTION_1</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Setup ERP to do the ERP action 1 (see Reference manual).</div><div class='hunk'>@@ -415,7 +415,7 @@ dasd_3990_erp_action_1(struct dasd_ccw_req * erp)</div><div class='ctx'> }				/* end dasd_3990_erp_action_1 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_ACTION_4 </div><div class='add'>+ * DASD_3990_ERP_ACTION_4</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Setup ERP to do the ERP action 4 (see Reference manual).</div><div class='hunk'>@@ -453,11 +453,11 @@ dasd_3990_erp_action_4(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> </div><div class='ctx'> 		if (sense[25] == 0x1D) {	/* state change pending */</div><div class='ctx'> </div><div class='del'>-			DEV_MESSAGE(KERN_INFO, device, </div><div class='add'>+			DEV_MESSAGE(KERN_INFO, device,</div><div class='ctx'> 				    "waiting for state change pending "</div><div class='ctx'> 				    "interrupt, %d retries left",</div><div class='ctx'> 				    erp-&gt;retries);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			dasd_3990_erp_block_queue(erp, 30*HZ);</div><div class='ctx'> </div><div class='ctx'>                 } else if (sense[25] == 0x1E) {	/* busy */</div><div class='hunk'>@@ -469,9 +469,9 @@ dasd_3990_erp_action_4(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> 		} else {</div><div class='ctx'> </div><div class='ctx'> 			/* no state change pending - retry */</div><div class='del'>-			DEV_MESSAGE (KERN_INFO, device, </div><div class='add'>+			DEV_MESSAGE (KERN_INFO, device,</div><div class='ctx'> 				     "redriving request immediately, "</div><div class='del'>-				     "%d retries left", </div><div class='add'>+				     "%d retries left",</div><div class='ctx'> 				     erp-&gt;retries);</div><div class='ctx'> 			erp-&gt;status = DASD_CQR_QUEUED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -482,13 +482,13 @@ dasd_3990_erp_action_4(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_action_4 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  * 24 byte sense ERP functions (only)</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_ACTION_5 </div><div class='add'>+ * DASD_3990_ERP_ACTION_5</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Setup ERP to do the ERP action 5 (see Reference manual).</div><div class='hunk'>@@ -523,7 +523,7 @@ dasd_3990_erp_action_5(struct dasd_ccw_req * erp)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   sense		current sense data</div><div class='del'>- *   </div><div class='add'>+ *</div><div class='ctx'>  * RETURN VALUES</div><div class='ctx'>  *   void</div><div class='ctx'>  */</div><div class='hunk'>@@ -1150,9 +1150,9 @@ dasd_3990_handle_env_data(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   erp		current erp_head</div><div class='ctx'>  *   sense		current sense data</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   erp		'new' erp_head - pointer to new ERP </div><div class='add'>+ *   erp		'new' erp_head - pointer to new ERP</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_ccw_req *</div><div class='ctx'> dasd_3990_erp_com_rej(struct dasd_ccw_req * erp, char *sense)</div><div class='hunk'>@@ -1185,7 +1185,7 @@ dasd_3990_erp_com_rej(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_com_rej */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_BUS_OUT </div><div class='add'>+ * DASD_3990_ERP_BUS_OUT</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles 24 byte 'Bus Out Parity Check' error.</div><div class='hunk'>@@ -1483,7 +1483,7 @@ dasd_3990_erp_env_data(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   erp		already added default ERP</div><div class='del'>- *		</div><div class='add'>+ *</div><div class='ctx'>  * RETURN VALUES</div><div class='ctx'>  *   erp		new erp_head - pointer to new ERP</div><div class='ctx'>  */</div><div class='hunk'>@@ -1527,11 +1527,11 @@ dasd_3990_erp_file_prot(struct dasd_ccw_req * erp)</div><div class='ctx'> }				/* end dasd_3990_erp_file_prot */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_INSPECT_24 </div><div class='add'>+ * DASD_3990_ERP_INSPECT_24</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Does a detailed inspection of the 24 byte sense data</div><div class='del'>- *   and sets up a related error recovery action.  </div><div class='add'>+ *   and sets up a related error recovery action.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   sense		sense data of the actual error</div><div class='hunk'>@@ -1602,13 +1602,13 @@ dasd_3990_erp_inspect_24(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* END dasd_3990_erp_inspect_24 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  * 32 byte sense ERP functions (only)</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERPACTION_10_32 </div><div class='add'>+ * DASD_3990_ERPACTION_10_32</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles 32 byte 'Action 10' of Single Program Action Codes.</div><div class='hunk'>@@ -1616,7 +1616,7 @@ dasd_3990_erp_inspect_24(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   erp		current erp_head</div><div class='del'>- *   sense		current sense data </div><div class='add'>+ *   sense		current sense data</div><div class='ctx'>  * RETURN VALUES</div><div class='ctx'>  *   erp		modified erp_head</div><div class='ctx'>  */</div><div class='hunk'>@@ -1640,18 +1640,18 @@ dasd_3990_erp_action_10_32(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles 32 byte 'Action 1B' of Single Program Action Codes.</div><div class='del'>- *   A write operation could not be finished because of an unexpected </div><div class='add'>+ *   A write operation could not be finished because of an unexpected</div><div class='ctx'>  *   condition.</div><div class='del'>- *   The already created 'default erp' is used to get the link to </div><div class='del'>- *   the erp chain, but it can not be used for this recovery </div><div class='add'>+ *   The already created 'default erp' is used to get the link to</div><div class='add'>+ *   the erp chain, but it can not be used for this recovery</div><div class='ctx'>  *   action because it contains no DE/LO data space.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   default_erp	already added default erp.</div><div class='del'>- *   sense		current sense data </div><div class='add'>+ *   sense		current sense data</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   erp		new erp or </div><div class='add'>+ *   erp		new erp or</div><div class='ctx'>  *			default_erp in case of imprecise ending or error</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_ccw_req *</div><div class='hunk'>@@ -1789,16 +1789,16 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)</div><div class='ctx'>  * DASD_3990_UPDATE_1B</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Handles the update to the 32 byte 'Action 1B' of Single Program </div><div class='add'>+ *   Handles the update to the 32 byte 'Action 1B' of Single Program</div><div class='ctx'>  *   Action Codes in case the first action was not successful.</div><div class='ctx'>  *   The already created 'previous_erp' is the currently not successful</div><div class='del'>- *   ERP. </div><div class='add'>+ *   ERP.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   previous_erp	already created previous erp.</div><div class='del'>- *   sense		current sense data </div><div class='add'>+ *   sense		current sense data</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   erp		modified erp </div><div class='add'>+ *   erp		modified erp</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_ccw_req *</div><div class='ctx'> dasd_3990_update_1B(struct dasd_ccw_req * previous_erp, char *sense)</div><div class='hunk'>@@ -1897,7 +1897,7 @@ dasd_3990_update_1B(struct dasd_ccw_req * previous_erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_update_1B */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_COMPOUND_RETRY </div><div class='add'>+ * DASD_3990_ERP_COMPOUND_RETRY</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles the compound ERP action retry code.</div><div class='hunk'>@@ -1943,7 +1943,7 @@ dasd_3990_erp_compound_retry(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_compound_retry */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_COMPOUND_PATH </div><div class='add'>+ * DASD_3990_ERP_COMPOUND_PATH</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles the compound ERP action for retry on alternate</div><div class='hunk'>@@ -1965,7 +1965,7 @@ dasd_3990_erp_compound_path(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> 		dasd_3990_erp_alternate_path(erp);</div><div class='ctx'> </div><div class='ctx'> 		if (erp-&gt;status == DASD_CQR_FAILED) {</div><div class='del'>-			/* reset the lpm and the status to be able to </div><div class='add'>+			/* reset the lpm and the status to be able to</div><div class='ctx'> 			 * try further actions. */</div><div class='ctx'> </div><div class='ctx'> 			erp-&gt;lpm = 0;</div><div class='hunk'>@@ -1980,7 +1980,7 @@ dasd_3990_erp_compound_path(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_compound_path */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_COMPOUND_CODE </div><div class='add'>+ * DASD_3990_ERP_COMPOUND_CODE</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles the compound ERP action for retry code.</div><div class='hunk'>@@ -2001,18 +2001,18 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> </div><div class='ctx'> 		switch (sense[28]) {</div><div class='ctx'> 		case 0x17:</div><div class='del'>-			/* issue a Diagnostic Control command with an </div><div class='add'>+			/* issue a Diagnostic Control command with an</div><div class='ctx'> 			 * Inhibit Write subcommand and controler modifier */</div><div class='ctx'> 			erp = dasd_3990_erp_DCTL(erp, 0x20);</div><div class='ctx'> 			break;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		case 0x25:</div><div class='ctx'> 			/* wait for 5 seconds and retry again */</div><div class='ctx'> 			erp-&gt;retries = 1;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			dasd_3990_erp_block_queue (erp, 5*HZ);</div><div class='ctx'> 			break;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* should not happen - continue */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2026,7 +2026,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_compound_code */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_COMPOUND_CONFIG </div><div class='add'>+ * DASD_3990_ERP_COMPOUND_CONFIG</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Handles the compound ERP action for configruation</div><div class='hunk'>@@ -2063,10 +2063,10 @@ dasd_3990_erp_compound_config(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_compound_config */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_COMPOUND </div><div class='add'>+ * DASD_3990_ERP_COMPOUND</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Does the further compound program action if </div><div class='add'>+ *   Does the further compound program action if</div><div class='ctx'>  *   compound retry was not successful.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='hunk'>@@ -2110,11 +2110,11 @@ dasd_3990_erp_compound(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_compound */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_INSPECT_32 </div><div class='add'>+ * DASD_3990_ERP_INSPECT_32</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   Does a detailed inspection of the 32 byte sense data</div><div class='del'>- *   and sets up a related error recovery action.  </div><div class='add'>+ *   and sets up a related error recovery action.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   sense		sense data of the actual error</div><div class='hunk'>@@ -2228,9 +2228,9 @@ dasd_3990_erp_inspect_32(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'> }				/* end dasd_3990_erp_inspect_32 */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  * main ERP control fuctions (24 and 32 byte sense)</div><div class='del'>- ***************************************************************************** </div><div class='add'>+ *****************************************************************************</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2243,7 +2243,7 @@ dasd_3990_erp_inspect_32(struct dasd_ccw_req * erp, char *sense)</div><div class='ctx'>  * PARAMETER</div><div class='ctx'>  *   erp		pointer to the currently created default ERP</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   erp_new		contens was possibly modified </div><div class='add'>+ *   erp_new		contens was possibly modified</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_ccw_req *</div><div class='ctx'> dasd_3990_erp_inspect(struct dasd_ccw_req * erp)</div><div class='hunk'>@@ -2272,14 +2272,14 @@ dasd_3990_erp_inspect(struct dasd_ccw_req * erp)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * DASD_3990_ERP_ADD_ERP</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   This funtion adds an additional request block (ERP) to the head of</div><div class='ctx'>  *   the given cqr (or erp).</div><div class='ctx'>  *   This erp is initialized as an default erp (retry TIC)</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='del'>- *   cqr		head of the current ERP-chain (or single cqr if </div><div class='add'>+ *   cqr		head of the current ERP-chain (or single cqr if</div><div class='ctx'>  *			first error)</div><div class='ctx'>  * RETURN VALUES</div><div class='ctx'>  *   erp		pointer to new ERP-chain head</div><div class='hunk'>@@ -2332,15 +2332,15 @@ dasd_3990_erp_add_erp(struct dasd_ccw_req * cqr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_ADDITIONAL_ERP </div><div class='del'>- * </div><div class='add'>+ * DASD_3990_ERP_ADDITIONAL_ERP</div><div class='add'>+ *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   An additional ERP is needed to handle the current error.</div><div class='ctx'>  *   Add ERP to the head of the ERP-chain containing the ERP processing</div><div class='ctx'>  *   determined based on the sense data.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='del'>- *   cqr		head of the current ERP-chain (or single cqr if </div><div class='add'>+ *   cqr		head of the current ERP-chain (or single cqr if</div><div class='ctx'>  *			first error)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='hunk'>@@ -2376,7 +2376,7 @@ dasd_3990_erp_additional_erp(struct dasd_ccw_req * cqr)</div><div class='ctx'>  *   24 byte sense byte 25 and 27 is set as well.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='del'>- *   cqr1		first cqr, which will be compared with the </div><div class='add'>+ *   cqr1		first cqr, which will be compared with the</div><div class='ctx'>  *   cqr2		second cqr.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='hunk'>@@ -2415,7 +2415,7 @@ dasd_3990_erp_error_match(struct dasd_ccw_req *cqr1, struct dasd_ccw_req *cqr2)</div><div class='ctx'>  *   cqr		failed cqr (either original cqr or already an erp)</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   erp		erp-pointer to the already defined error </div><div class='add'>+ *   erp		erp-pointer to the already defined error</div><div class='ctx'>  *			recovery procedure OR</div><div class='ctx'>  *			NULL if a 'new' error occurred.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2451,10 +2451,10 @@ dasd_3990_erp_in_erp(struct dasd_ccw_req *cqr)</div><div class='ctx'>  * DASD_3990_ERP_FURTHER_ERP (24 &amp; 32 byte sense)</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   No retry is left for the current ERP. Check what has to be done </div><div class='add'>+ *   No retry is left for the current ERP. Check what has to be done</div><div class='ctx'>  *   with the ERP.</div><div class='ctx'>  *     - do further defined ERP action or</div><div class='del'>- *     - wait for interrupt or	</div><div class='add'>+ *     - wait for interrupt or</div><div class='ctx'>  *     - exit with permanent error</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='hunk'>@@ -2485,7 +2485,7 @@ dasd_3990_erp_further_erp(struct dasd_ccw_req *erp)</div><div class='ctx'> </div><div class='ctx'> 		if (!(sense[2] &amp; DASD_SENSE_BIT_0)) {</div><div class='ctx'> </div><div class='del'>-			/* issue a Diagnostic Control command with an </div><div class='add'>+			/* issue a Diagnostic Control command with an</div><div class='ctx'> 			 * Inhibit Write subcommand */</div><div class='ctx'> </div><div class='ctx'> 			switch (sense[25]) {</div><div class='hunk'>@@ -2535,14 +2535,14 @@ dasd_3990_erp_further_erp(struct dasd_ccw_req *erp)</div><div class='ctx'> }				/* end dasd_3990_erp_further_erp */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_3990_ERP_HANDLE_MATCH_ERP </div><div class='add'>+ * DASD_3990_ERP_HANDLE_MATCH_ERP</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='ctx'>  *   An error occurred again and an ERP has been detected which is already</div><div class='del'>- *   used to handle this error (e.g. retries). </div><div class='add'>+ *   used to handle this error (e.g. retries).</div><div class='ctx'>  *   All prior ERP's are asumed to be successful and therefore removed</div><div class='ctx'>  *   from queue.</div><div class='del'>- *   If retry counter of matching erp is already 0, it is checked if further </div><div class='add'>+ *   If retry counter of matching erp is already 0, it is checked if further</div><div class='ctx'>  *   action is needed (besides retry) or if the ERP has failed.</div><div class='ctx'>  *</div><div class='ctx'>  * PARAMETER</div><div class='hunk'>@@ -2631,7 +2631,7 @@ dasd_3990_erp_handle_match_erp(struct dasd_ccw_req *erp_head,</div><div class='ctx'>  *   erp		erp-pointer to the head of the ERP action chain.</div><div class='ctx'>  *			This means:</div><div class='ctx'>  *			 - either a ptr to an additional ERP cqr or</div><div class='del'>- *			 - the original given cqr (which's status might </div><div class='add'>+ *			 - the original given cqr (which's status might</div><div class='ctx'>  *			   be modified)</div><div class='ctx'>  */</div><div class='ctx'> struct dasd_ccw_req *</div><div class='hunk'>@@ -2723,22 +2723,3 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr)</div><div class='ctx'> 	return erp;</div><div class='ctx'> </div><div class='ctx'> }				/* end dasd_3990_erp_action */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4 </div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_9336_erp.c b/drivers/s390/block/dasd_9336_erp.c<br/>index dc861446d056..6e082688475a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_9336_erp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_9336_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_9336_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_9336_erp.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_9336_erp.c</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='hunk'>@@ -12,10 +12,10 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * DASD_9336_ERP_EXAMINE </div><div class='add'>+ * DASD_9336_ERP_EXAMINE</div><div class='ctx'>  *</div><div class='ctx'>  * DESCRIPTION</div><div class='del'>- *   Checks only for fatal/no/recover error. </div><div class='add'>+ *   Checks only for fatal/no/recover error.</div><div class='ctx'>  *   A detailed examination of the sense data is done later outside</div><div class='ctx'>  *   the interrupt handler.</div><div class='ctx'>  *</div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'>  *   'Chapter 7. 9336 Sense Data'.</div><div class='ctx'>  *</div><div class='ctx'>  * RETURN VALUES</div><div class='del'>- *   dasd_era_none	no error </div><div class='add'>+ *   dasd_era_none	no error</div><div class='ctx'>  *   dasd_era_fatal	for all fatal (unrecoverable errors)</div><div class='ctx'>  *   dasd_era_recover	for all others.</div><div class='ctx'>  */</div><div class='hunk'>@@ -39,22 +39,3 @@ dasd_9336_erp_examine(struct dasd_ccw_req * cqr, struct irb * irb)</div><div class='ctx'> 	return dasd_era_recover;</div><div class='ctx'> </div><div class='ctx'> }				/* END dasd_9336_erp_examine */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4 </div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_9343_erp.c b/drivers/s390/block/dasd_9343_erp.c<br/>index 4a5b79569aaa..ddecb9808ed4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_9343_erp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_9343_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_9343_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_9343_erp.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_9345_erp.c</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='head'>diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c<br/>index 216bc4fba199..7f6fdac74706 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_devmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_devmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_devmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_devmap.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -27,7 +26,7 @@</div><div class='ctx'> #include "dasd_int.h"</div><div class='ctx'> </div><div class='ctx'> kmem_cache_t *dasd_page_cache;</div><div class='del'>-EXPORT_SYMBOL(dasd_page_cache);</div><div class='add'>+EXPORT_SYMBOL_GPL(dasd_page_cache);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dasd_devmap_t is used to store the features and the relation</div><div class='hunk'>@@ -49,6 +48,20 @@ struct dasd_devmap {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * dasd_servermap is used to store the server_id of all storage servers</div><div class='add'>+ * accessed by DASD device driver.</div><div class='add'>+ */</div><div class='add'>+struct dasd_servermap {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct server_id {</div><div class='add'>+		char vendor[4];</div><div class='add'>+		char serial[15];</div><div class='add'>+	} sid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct list_head dasd_serverlist;</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Parameter parsing functions for dasd= parameter. The syntax is:</div><div class='ctx'>  *   &lt;devno&gt;		: (0x)?[0-9a-fA-F]+</div><div class='ctx'>  *   &lt;busid&gt;		: [0-0a-f]\.[0-9a-f]\.(0x)?[0-9a-fA-F]+</div><div class='hunk'>@@ -64,6 +77,8 @@ struct dasd_devmap {</div><div class='ctx'> </div><div class='ctx'> int dasd_probeonly =  0;	/* is true, when probeonly mode is active */</div><div class='ctx'> int dasd_autodetect = 0;	/* is true, when autodetection is active */</div><div class='add'>+int dasd_nopav = 0;		/* is true, when PAV is disabled */</div><div class='add'>+EXPORT_SYMBOL_GPL(dasd_nopav);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * char *dasd[] is intended to hold the ranges supplied by the dasd= statement</div><div class='hunk'>@@ -123,7 +138,7 @@ static inline int</div><div class='ctx'> dasd_busid(char **str, int *id0, int *id1, int *devno)</div><div class='ctx'> {</div><div class='ctx'> 	int val, old_style;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	/* check for leading '0x' */</div><div class='ctx'> 	old_style = 0;</div><div class='ctx'> 	if ((*str)[0] == '0' &amp;&amp; (*str)[1] == 'x') {</div><div class='hunk'>@@ -179,7 +194,7 @@ dasd_feature_list(char *str, char **endp)</div><div class='ctx'> 	features = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		for (len = 0; </div><div class='add'>+		for (len = 0;</div><div class='ctx'> 		     str[len] &amp;&amp; str[len] != ':' &amp;&amp; str[len] != ')'; len++);</div><div class='ctx'> 		if (len == 2 &amp;&amp; !strncmp(str, "ro", 2))</div><div class='ctx'> 			features |= DASD_FEATURE_READONLY;</div><div class='hunk'>@@ -228,19 +243,24 @@ dasd_parse_keyword( char *parsestring ) {</div><div class='ctx'> 		length = strlen(parsestring);</div><div class='ctx'> 		residual_str = parsestring + length;</div><div class='ctx'>         }</div><div class='del'>-	if (strncmp ("autodetect", parsestring, length) == 0) {</div><div class='add'>+	if (strncmp("autodetect", parsestring, length) == 0) {</div><div class='ctx'> 		dasd_autodetect = 1;</div><div class='ctx'> 		MESSAGE (KERN_INFO, "%s",</div><div class='ctx'> 			 "turning to autodetection mode");</div><div class='ctx'>                 return residual_str;</div><div class='ctx'>         }</div><div class='del'>-        if (strncmp ("probeonly", parsestring, length) == 0) {</div><div class='add'>+	if (strncmp("probeonly", parsestring, length) == 0) {</div><div class='ctx'> 		dasd_probeonly = 1;</div><div class='ctx'> 		MESSAGE(KERN_INFO, "%s",</div><div class='ctx'> 			"turning to probeonly mode");</div><div class='ctx'>                 return residual_str;</div><div class='ctx'>         }</div><div class='del'>-        if (strncmp ("fixedbuffers", parsestring, length) == 0) {</div><div class='add'>+	if (strncmp("nopav", parsestring, length) == 0) {</div><div class='add'>+		dasd_nopav = 1;</div><div class='add'>+		MESSAGE(KERN_INFO, "%s", "disable PAV mode");</div><div class='add'>+		return residual_str;</div><div class='add'>+	}</div><div class='add'>+	if (strncmp("fixedbuffers", parsestring, length) == 0) {</div><div class='ctx'> 		if (dasd_page_cache)</div><div class='ctx'> 			return residual_str;</div><div class='ctx'> 		dasd_page_cache =</div><div class='hunk'>@@ -294,6 +314,8 @@ dasd_parse_range( char *parsestring ) {</div><div class='ctx'> 	features = dasd_feature_list(str, &amp;str);</div><div class='ctx'> 	if (features &lt; 0)</div><div class='ctx'> 		return ERR_PTR(-EINVAL);</div><div class='add'>+	/* each device in dasd= parameter should be set initially online */</div><div class='add'>+	features |= DASD_FEATURE_INITIAL_ONLINE;</div><div class='ctx'> 	while (from &lt;= to) {</div><div class='ctx'> 		sprintf(bus_id, "%01x.%01x.%04x",</div><div class='ctx'> 			from_id0, from_id1, from++);</div><div class='hunk'>@@ -359,7 +381,7 @@ dasd_parse(void)</div><div class='ctx'>  * Add a devmap for the device specified by busid. It is possible that</div><div class='ctx'>  * the devmap already exists (dasd= parameter). The order of the devices</div><div class='ctx'>  * added through this function will define the kdevs for the individual</div><div class='del'>- * devices. </div><div class='add'>+ * devices.</div><div class='ctx'>  */</div><div class='ctx'> static struct dasd_devmap *</div><div class='ctx'> dasd_add_busid(char *bus_id, int features)</div><div class='hunk'>@@ -368,11 +390,11 @@ dasd_add_busid(char *bus_id, int features)</div><div class='ctx'> 	int hash;</div><div class='ctx'> </div><div class='ctx'> 	new = (struct dasd_devmap *)</div><div class='del'>-		kmalloc(sizeof(struct dasd_devmap), GFP_KERNEL);</div><div class='add'>+		kzalloc(sizeof(struct dasd_devmap), GFP_KERNEL);</div><div class='ctx'> 	if (!new)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='del'>-	devmap = 0;</div><div class='add'>+	devmap = NULL;</div><div class='ctx'> 	hash = dasd_hash_busid(bus_id);</div><div class='ctx'> 	list_for_each_entry(tmp, &amp;dasd_hashlists[hash], list)</div><div class='ctx'> 		if (strncmp(tmp-&gt;bus_id, bus_id, BUS_ID_SIZE) == 0) {</div><div class='hunk'>@@ -384,10 +406,10 @@ dasd_add_busid(char *bus_id, int features)</div><div class='ctx'> 		new-&gt;devindex = dasd_max_devindex++;</div><div class='ctx'> 		strncpy(new-&gt;bus_id, bus_id, BUS_ID_SIZE);</div><div class='ctx'> 		new-&gt;features = features;</div><div class='del'>-		new-&gt;device = 0;</div><div class='add'>+		new-&gt;device = NULL;</div><div class='ctx'> 		list_add(&amp;new-&gt;list, &amp;dasd_hashlists[hash]);</div><div class='ctx'> 		devmap = new;</div><div class='del'>-		new = 0;</div><div class='add'>+		new = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	kfree(new);</div><div class='hunk'>@@ -457,7 +479,7 @@ dasd_device_from_devindex(int devindex)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='del'>-	devmap = 0;</div><div class='add'>+	devmap = NULL;</div><div class='ctx'> 	for (i = 0; (i &lt; 256) &amp;&amp; !devmap; i++)</div><div class='ctx'> 		list_for_each_entry(tmp, &amp;dasd_hashlists[i], list)</div><div class='ctx'> 			if (tmp-&gt;devindex == devindex) {</div><div class='hunk'>@@ -630,7 +652,8 @@ dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-dasd_ro_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+dasd_ro_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+	      const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	int ro_flag;</div><div class='hunk'>@@ -658,7 +681,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_ro_show, dasd_ro_store);</div><div class='ctx'>  * use_diag controls whether the driver should use diag rather than ssch</div><div class='ctx'>  * to talk to the device</div><div class='ctx'>  */</div><div class='del'>-static ssize_t </div><div class='add'>+static ssize_t</div><div class='ctx'> dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='hunk'>@@ -673,7 +696,8 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-dasd_use_diag_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+dasd_use_diag_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	ssize_t rc;</div><div class='hunk'>@@ -697,11 +721,11 @@ dasd_use_diag_store(struct device *dev, struct device_attribute *attr, const cha</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static</div><div class='del'>-DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store);</div><div class='add'>+static DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-dasd_discipline_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+dasd_discipline_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+		     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='ctx'> 	char *dname;</div><div class='hunk'>@@ -834,6 +858,38 @@ static struct attribute_group dasd_attr_group = {</div><div class='ctx'> 	.attrs = dasd_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Check if the related storage server is already contained in the</div><div class='add'>+ * dasd_serverlist. If server is not contained, create new entry.</div><div class='add'>+ * Return 0 if server was already in serverlist,</div><div class='add'>+ *	  1 if the server was added successfully</div><div class='add'>+ *	 &lt;0 in case of error.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dasd_add_server(struct dasd_uid *uid)</div><div class='add'>+{</div><div class='add'>+	struct dasd_servermap *new, *tmp;</div><div class='add'>+</div><div class='add'>+	/* check if server is already contained */</div><div class='add'>+	list_for_each_entry(tmp, &amp;dasd_serverlist, list)</div><div class='add'>+	  // normale cmp?</div><div class='add'>+		if (strncmp(tmp-&gt;sid.vendor, uid-&gt;vendor,</div><div class='add'>+			    sizeof(tmp-&gt;sid.vendor)) == 0</div><div class='add'>+		    &amp;&amp; strncmp(tmp-&gt;sid.serial, uid-&gt;serial,</div><div class='add'>+			       sizeof(tmp-&gt;sid.serial)) == 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	new = (struct dasd_servermap *)</div><div class='add'>+		kzalloc(sizeof(struct dasd_servermap), GFP_KERNEL);</div><div class='add'>+	if (!new)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	strncpy(new-&gt;sid.vendor, uid-&gt;vendor, sizeof(new-&gt;sid.vendor));</div><div class='add'>+	strncpy(new-&gt;sid.serial, uid-&gt;serial, sizeof(new-&gt;sid.serial));</div><div class='add'>+	list_add(&amp;new-&gt;list, &amp;dasd_serverlist);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return copy of the device unique identifier.</div><div class='hunk'>@@ -854,21 +910,26 @@ dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Register the given device unique identifier into devmap struct.</div><div class='add'>+ * Return 0 if server was already in serverlist,</div><div class='add'>+ *	  1 if the server was added successful</div><div class='add'>+ *	 &lt;0 in case of error.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_devmap *devmap;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='ctx'> 		return PTR_ERR(devmap);</div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	devmap-&gt;uid = *uid;</div><div class='add'>+	rc = dasd_add_server(uid);</div><div class='ctx'> 	spin_unlock(&amp;dasd_devmap_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(dasd_set_uid);</div><div class='add'>+EXPORT_SYMBOL_GPL(dasd_set_uid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Return value of the specified feature.</div><div class='hunk'>@@ -880,7 +941,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)</div><div class='ctx'> </div><div class='ctx'> 	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='del'>-		return (int) PTR_ERR(devmap);</div><div class='add'>+		return PTR_ERR(devmap);</div><div class='ctx'> </div><div class='ctx'> 	return ((devmap-&gt;features &amp; feature) != 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -896,7 +957,7 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)</div><div class='ctx'> </div><div class='ctx'> 	devmap = dasd_find_busid(cdev-&gt;dev.bus_id);</div><div class='ctx'> 	if (IS_ERR(devmap))</div><div class='del'>-		return (int) PTR_ERR(devmap);</div><div class='add'>+		return PTR_ERR(devmap);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;dasd_devmap_lock);</div><div class='ctx'> 	if (flag)</div><div class='hunk'>@@ -932,8 +993,10 @@ dasd_devmap_init(void)</div><div class='ctx'> 	dasd_max_devindex = 0;</div><div class='ctx'> 	for (i = 0; i &lt; 256; i++)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;dasd_hashlists[i]);</div><div class='del'>-	return 0;</div><div class='ctx'> </div><div class='add'>+	/* Initialize servermap structure. */</div><div class='add'>+	INIT_LIST_HEAD(&amp;dasd_serverlist);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c<br/>index 3f9d704d2657..23fa0b289173 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_diag.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_diag.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_diag.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_diag.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_diag.c</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Based on.......: linux/drivers/s390/block/mdisk.c</div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -336,7 +335,7 @@ dasd_diag_check_device(struct dasd_device *device)</div><div class='ctx'> </div><div class='ctx'> 	private = (struct dasd_diag_private *) device-&gt;private;</div><div class='ctx'> 	if (private == NULL) {</div><div class='del'>-		private = kmalloc(sizeof(struct dasd_diag_private),GFP_KERNEL);</div><div class='add'>+		private = kzalloc(sizeof(struct dasd_diag_private),GFP_KERNEL);</div><div class='ctx'> 		if (private == NULL) {</div><div class='ctx'> 			DEV_MESSAGE(KERN_WARNING, device, "%s",</div><div class='ctx'> 				"memory allocation failed for private data");</div><div class='hunk'>@@ -527,7 +526,7 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)</div><div class='ctx'> 				   datasize, device);</div><div class='ctx'> 	if (IS_ERR(cqr))</div><div class='ctx'> 		return cqr;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	dreq = (struct dasd_diag_req *) cqr-&gt;data;</div><div class='ctx'> 	dreq-&gt;block_count = count;</div><div class='ctx'> 	dbio = dreq-&gt;bio;</div><div class='head'>diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h<br/>index 38a4e55f8953..b8c78267ff3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_diag.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_diag.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_diag.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_diag.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_diag.h</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Based on.......: linux/drivers/s390/block/mdisk.h</div><div class='head'>diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c<br/>index 7d5a6cee4bd8..39c2281371b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eckd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_eckd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eckd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_eckd.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_eckd.c</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='del'>- *		    Horst Hummel &lt;Horst.Hummel@de.ibm.com&gt; </div><div class='add'>+ *		    Horst Hummel &lt;Horst.Hummel@de.ibm.com&gt;</div><div class='ctx'>  *		    Carsten Otte &lt;Cotte@de.ibm.com&gt;</div><div class='ctx'>  *		    Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -24,6 +23,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/todclk.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/cio.h&gt;</div><div class='ctx'> #include &lt;asm/ccwdev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "dasd_int.h"</div><div class='hunk'>@@ -65,16 +65,16 @@ struct dasd_eckd_private {</div><div class='ctx'> /* The ccw bus type uses this table to find devices that it sends to</div><div class='ctx'>  * dasd_eckd_probe */</div><div class='ctx'> static struct ccw_device_id dasd_eckd_ids[] = {</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3390, 0), driver_info: 0x1},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3390, 0), driver_info: 0x2},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3390, 0), driver_info: 0x3},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3380, 0), driver_info: 0x4},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3380, 0), driver_info: 0x5},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x9343, 0, 0x9345, 0), driver_info: 0x6},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3390, 0), driver_info: 0x7},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3380, 0), driver_info: 0x8},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3390, 0), driver_info: 0x9},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3380, 0), driver_info: 0xa},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3390, 0), .driver_info = 0x1},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3390, 0), .driver_info = 0x2},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3390, 0), .driver_info = 0x3},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3380, 0), .driver_info = 0x4},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3380, 0), .driver_info = 0x5},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x9343, 0, 0x9345, 0), .driver_info = 0x6},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3390, 0), .driver_info = 0x7},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x2107, 0, 0x3380, 0), .driver_info = 0x8},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3390, 0), .driver_info = 0x9},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x1750, 0, 0x3380, 0), .driver_info = 0xa},</div><div class='ctx'> 	{ /* end of list */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -89,17 +89,22 @@ dasd_eckd_probe (struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = dasd_generic_probe (cdev, &amp;dasd_eckd_discipline);</div><div class='del'>-	if (ret)</div><div class='add'>+	/* set ECKD specific ccw-device options */</div><div class='add'>+	ret = ccw_device_set_options(cdev, CCWDEV_ALLOW_FORCE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "dasd_eckd_probe: could not set ccw-device options "</div><div class='add'>+		       "for %s\n", cdev-&gt;dev.bus_id);</div><div class='ctx'> 		return ret;</div><div class='del'>-	ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP | CCWDEV_ALLOW_FORCE);</div><div class='del'>-	return 0;</div><div class='add'>+	}</div><div class='add'>+	ret = dasd_generic_probe(cdev, &amp;dasd_eckd_discipline);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> dasd_eckd_set_online(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='del'>-	return dasd_generic_set_online (cdev, &amp;dasd_eckd_discipline);</div><div class='add'>+	return dasd_generic_set_online(cdev, &amp;dasd_eckd_discipline);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ccw_driver dasd_eckd_driver = {</div><div class='hunk'>@@ -210,14 +215,14 @@ check_XRC (struct ccw1         *de_ccw,</div><div class='ctx'> </div><div class='ctx'>         /* switch on System Time Stamp - needed for XRC Support */</div><div class='ctx'>         if (private-&gt;rdc_data.facilities.XRC_supported) {</div><div class='del'>-                </div><div class='add'>+</div><div class='ctx'>                 data-&gt;ga_extended |= 0x08; /* switch on 'Time Stamp Valid'   */</div><div class='ctx'>                 data-&gt;ga_extended |= 0x02; /* switch on 'Extended Parameter' */</div><div class='del'>-                </div><div class='add'>+</div><div class='ctx'>                 data-&gt;ep_sys_time = get_clock ();</div><div class='del'>-                </div><div class='add'>+</div><div class='ctx'>                 de_ccw-&gt;count = sizeof (struct DE_eckd_data);</div><div class='del'>-                de_ccw-&gt;flags |= CCW_FLAG_SLI;  </div><div class='add'>+		de_ccw-&gt;flags |= CCW_FLAG_SLI;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         return;</div><div class='hunk'>@@ -296,8 +301,8 @@ define_extent(struct ccw1 * ccw, struct DE_eckd_data * data, int trk,</div><div class='ctx'> 	/* check for sequential prestage - enhance cylinder range */</div><div class='ctx'> 	if (data-&gt;attributes.operation == DASD_SEQ_PRESTAGE ||</div><div class='ctx'> 	    data-&gt;attributes.operation == DASD_SEQ_ACCESS) {</div><div class='del'>-		</div><div class='del'>-		if (end.cyl + private-&gt;attrib.nr_cyl &lt; geo.cyl) </div><div class='add'>+</div><div class='add'>+		if (end.cyl + private-&gt;attrib.nr_cyl &lt; geo.cyl)</div><div class='ctx'> 			end.cyl += private-&gt;attrib.nr_cyl;</div><div class='ctx'> 		else</div><div class='ctx'> 			end.cyl = (geo.cyl - 1);</div><div class='hunk'>@@ -317,7 +322,7 @@ locate_record(struct ccw1 *ccw, struct LO_eckd_data *data, int trk,</div><div class='ctx'> 	struct dasd_eckd_private *private;</div><div class='ctx'> 	int sector;</div><div class='ctx'> 	int dn, d;</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 	private = (struct dasd_eckd_private *) device-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	DBF_DEV_EVENT(DBF_INFO, device,</div><div class='hunk'>@@ -541,6 +546,86 @@ dasd_eckd_read_conf(struct dasd_device *device)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Build CP for Perform Subsystem Function - SSC.</div><div class='add'>+ */</div><div class='add'>+struct dasd_ccw_req *</div><div class='add'>+dasd_eckd_build_psf_ssc(struct dasd_device *device)</div><div class='add'>+{</div><div class='add'>+       struct dasd_ccw_req *cqr;</div><div class='add'>+       struct dasd_psf_ssc_data *psf_ssc_data;</div><div class='add'>+       struct ccw1 *ccw;</div><div class='add'>+</div><div class='add'>+       cqr = dasd_smalloc_request("ECKD", 1 /* PSF */ ,</div><div class='add'>+				  sizeof(struct dasd_psf_ssc_data),</div><div class='add'>+				  device);</div><div class='add'>+</div><div class='add'>+       if (IS_ERR(cqr)) {</div><div class='add'>+	       DEV_MESSAGE(KERN_WARNING, device, "%s",</div><div class='add'>+			   "Could not allocate PSF-SSC request");</div><div class='add'>+	       return cqr;</div><div class='add'>+       }</div><div class='add'>+       psf_ssc_data = (struct dasd_psf_ssc_data *)cqr-&gt;data;</div><div class='add'>+       psf_ssc_data-&gt;order = PSF_ORDER_SSC;</div><div class='add'>+       psf_ssc_data-&gt;suborder = 0x08;</div><div class='add'>+</div><div class='add'>+       ccw = cqr-&gt;cpaddr;</div><div class='add'>+       ccw-&gt;cmd_code = DASD_ECKD_CCW_PSF;</div><div class='add'>+       ccw-&gt;cda = (__u32)(addr_t)psf_ssc_data;</div><div class='add'>+       ccw-&gt;count = 66;</div><div class='add'>+</div><div class='add'>+       cqr-&gt;device = device;</div><div class='add'>+       cqr-&gt;expires = 10*HZ;</div><div class='add'>+       cqr-&gt;buildclk = get_clock();</div><div class='add'>+       cqr-&gt;status = DASD_CQR_FILLED;</div><div class='add'>+       return cqr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform Subsystem Function.</div><div class='add'>+ * It is necessary to trigger CIO for channel revalidation since this</div><div class='add'>+ * call might change behaviour of DASD devices.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dasd_eckd_psf_ssc(struct dasd_device *device)</div><div class='add'>+{</div><div class='add'>+       struct dasd_ccw_req *cqr;</div><div class='add'>+       int rc;</div><div class='add'>+</div><div class='add'>+       cqr = dasd_eckd_build_psf_ssc(device);</div><div class='add'>+       if (IS_ERR(cqr))</div><div class='add'>+	       return PTR_ERR(cqr);</div><div class='add'>+</div><div class='add'>+       rc = dasd_sleep_on(cqr);</div><div class='add'>+       if (!rc)</div><div class='add'>+	       /* trigger CIO to reprobe devices */</div><div class='add'>+	       css_schedule_reprobe();</div><div class='add'>+       dasd_sfree_request(cqr, cqr-&gt;device);</div><div class='add'>+       return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Valide storage server of current device.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+dasd_eckd_validate_server(struct dasd_device *device)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Currently PAV is the only reason to 'validate' server on LPAR */</div><div class='add'>+	if (dasd_nopav || MACHINE_IS_VM)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = dasd_eckd_psf_ssc(device);</div><div class='add'>+	if (rc)</div><div class='add'>+		/* may be requested feature is not available on server,</div><div class='add'>+		 * therefore just report error and go ahead */</div><div class='add'>+		DEV_MESSAGE(KERN_INFO, device,</div><div class='add'>+			    "Perform Subsystem Function returned rc=%d", rc);</div><div class='add'>+	/* RE-Read Configuration Data */</div><div class='add'>+	return dasd_eckd_read_conf(device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Check device characteristics.</div><div class='ctx'>  * If the device is accessible using ECKD discipline, the device is enabled.</div><div class='ctx'>  */</div><div class='hunk'>@@ -554,7 +639,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)</div><div class='ctx'> </div><div class='ctx'> 	private = (struct dasd_eckd_private *) device-&gt;private;</div><div class='ctx'> 	if (private == NULL) {</div><div class='del'>-		private = kmalloc(sizeof(struct dasd_eckd_private),</div><div class='add'>+		private = kzalloc(sizeof(struct dasd_eckd_private),</div><div class='ctx'> 				  GFP_KERNEL | GFP_DMA);</div><div class='ctx'> 		if (private == NULL) {</div><div class='ctx'> 			DEV_MESSAGE(KERN_WARNING, device, "%s",</div><div class='hunk'>@@ -562,7 +647,6 @@ dasd_eckd_check_characteristics(struct dasd_device *device)</div><div class='ctx'> 				    "data");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		memset(private, 0, sizeof(struct dasd_eckd_private));</div><div class='ctx'> 		device-&gt;private = (void *) private;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Invalidate status of initial analysis. */</div><div class='hunk'>@@ -571,16 +655,29 @@ dasd_eckd_check_characteristics(struct dasd_device *device)</div><div class='ctx'> 	private-&gt;attrib.operation = DASD_NORMAL_CACHE;</div><div class='ctx'> 	private-&gt;attrib.nr_cyl = 0;</div><div class='ctx'> </div><div class='add'>+	/* Read Configuration Data */</div><div class='add'>+	rc = dasd_eckd_read_conf(device);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Generate device unique id and register in devmap */</div><div class='add'>+	rc = dasd_eckd_generate_uid(device, &amp;uid);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = dasd_set_uid(device-&gt;cdev, &amp;uid);</div><div class='add'>+	if (rc == 1)	/* new server found */</div><div class='add'>+		rc = dasd_eckd_validate_server(device);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	/* Read Device Characteristics */</div><div class='ctx'> 	rdc_data = (void *) &amp;(private-&gt;rdc_data);</div><div class='ctx'> 	memset(rdc_data, 0, sizeof(rdc_data));</div><div class='ctx'> 	rc = read_dev_chars(device-&gt;cdev, &amp;rdc_data, 64);</div><div class='del'>-	if (rc) {</div><div class='add'>+	if (rc)</div><div class='ctx'> 		DEV_MESSAGE(KERN_WARNING, device,</div><div class='del'>-			    "Read device characteristics returned error %d",</div><div class='del'>-			    rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+			    "Read device characteristics returned "</div><div class='add'>+			    "rc=%d", rc);</div><div class='ctx'> </div><div class='ctx'> 	DEV_MESSAGE(KERN_INFO, device,</div><div class='ctx'> 		    "%04X/%02X(CU:%04X/%02X) Cyl:%d Head:%d Sec:%d",</div><div class='hunk'>@@ -591,19 +688,6 @@ dasd_eckd_check_characteristics(struct dasd_device *device)</div><div class='ctx'> 		    private-&gt;rdc_data.no_cyl,</div><div class='ctx'> 		    private-&gt;rdc_data.trk_per_cyl,</div><div class='ctx'> 		    private-&gt;rdc_data.sec_per_trk);</div><div class='del'>-</div><div class='del'>-	/* Read Configuration Data */</div><div class='del'>-	rc = dasd_eckd_read_conf (device);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* Generate device unique id and register in devmap */</div><div class='del'>-	rc = dasd_eckd_generate_uid(device, &amp;uid);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	rc = dasd_set_uid(device-&gt;cdev, &amp;uid);</div><div class='del'>-</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -773,7 +857,7 @@ dasd_eckd_end_analysis(struct dasd_device *device)</div><div class='ctx'> 		    ((private-&gt;rdc_data.no_cyl *</div><div class='ctx'> 		      private-&gt;rdc_data.trk_per_cyl *</div><div class='ctx'> 		      blk_per_trk * (device-&gt;bp_block &gt;&gt; 9)) &gt;&gt; 1),</div><div class='del'>-		    ((blk_per_trk * device-&gt;bp_block) &gt;&gt; 10), </div><div class='add'>+		    ((blk_per_trk * device-&gt;bp_block) &gt;&gt; 10),</div><div class='ctx'> 		    private-&gt;uses_cdl ?</div><div class='ctx'> 		    "compatible disk layout" : "linux disk layout");</div><div class='ctx'> </div><div class='hunk'>@@ -970,7 +1054,7 @@ dasd_eckd_format_device(struct dasd_device * device,</div><div class='ctx'> 				if (i &lt; 3) {</div><div class='ctx'> 					ect-&gt;kl = 4;</div><div class='ctx'> 					ect-&gt;dl = sizes_trk0[i] - 4;</div><div class='del'>-				} </div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if ((fdata-&gt;intensity &amp; 0x08) &amp;&amp;</div><div class='ctx'> 			    fdata-&gt;start_unit == 1) {</div><div class='hunk'>@@ -1270,7 +1354,7 @@ dasd_eckd_fill_info(struct dasd_device * device,</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Release device ioctl.</div><div class='del'>- * Buils a channel programm to releases a prior reserved </div><div class='add'>+ * Buils a channel programm to releases a prior reserved</div><div class='ctx'>  * (see dasd_eckd_reserve) device.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -1310,8 +1394,8 @@ dasd_eckd_release(struct dasd_device *device)</div><div class='ctx'> /*</div><div class='ctx'>  * Reserve device ioctl.</div><div class='ctx'>  * Options are set to 'synchronous wait for interrupt' and</div><div class='del'>- * 'timeout the request'. This leads to a terminate IO if </div><div class='del'>- * the interrupt is outstanding for a certain time. </div><div class='add'>+ * 'timeout the request'. This leads to a terminate IO if</div><div class='add'>+ * the interrupt is outstanding for a certain time.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> dasd_eckd_reserve(struct dasd_device *device)</div><div class='hunk'>@@ -1349,7 +1433,7 @@ dasd_eckd_reserve(struct dasd_device *device)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Steal lock ioctl - unconditional reserve device.</div><div class='del'>- * Buils a channel programm to break a device's reservation. </div><div class='add'>+ * Buils a channel programm to break a device's reservation.</div><div class='ctx'>  * (unconditional reserve)</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -1522,6 +1606,40 @@ dasd_eckd_ioctl(struct dasd_device *device, unsigned int cmd, void __user *argp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Dump the range of CCWs into 'page' buffer</div><div class='add'>+ * and return number of printed chars.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+dasd_eckd_dump_ccw_range(struct ccw1 *from, struct ccw1 *to, char *page)</div><div class='add'>+{</div><div class='add'>+	int len, count;</div><div class='add'>+	char *datap;</div><div class='add'>+</div><div class='add'>+	len = 0;</div><div class='add'>+	while (from &lt;= to) {</div><div class='add'>+		len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='add'>+			       " CCW %p: %08X %08X DAT:",</div><div class='add'>+			       from, ((int *) from)[0], ((int *) from)[1]);</div><div class='add'>+</div><div class='add'>+		/* get pointer to data (consider IDALs) */</div><div class='add'>+		if (from-&gt;flags &amp; CCW_FLAG_IDA)</div><div class='add'>+			datap = (char *) *((addr_t *) (addr_t) from-&gt;cda);</div><div class='add'>+		else</div><div class='add'>+			datap = (char *) ((addr_t) from-&gt;cda);</div><div class='add'>+</div><div class='add'>+		/* dump data (max 32 bytes) */</div><div class='add'>+		for (count = 0; count &lt; from-&gt;count &amp;&amp; count &lt; 32; count++) {</div><div class='add'>+			if (count % 8 == 0) len += sprintf(page + len, " ");</div><div class='add'>+			if (count % 4 == 0) len += sprintf(page + len, " ");</div><div class='add'>+			len += sprintf(page + len, "%02x", datap[count]);</div><div class='add'>+		}</div><div class='add'>+		len += sprintf(page + len, "\n");</div><div class='add'>+		from++;</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Print sense data and related channel program.</div><div class='ctx'>  * Parts are printed because printk buffer is only 1024 bytes.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1530,8 +1648,8 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,</div><div class='ctx'> 		     struct irb *irb)</div><div class='ctx'> {</div><div class='ctx'> 	char *page;</div><div class='del'>-	struct ccw1 *act, *end, *last;</div><div class='del'>-	int len, sl, sct, count;</div><div class='add'>+	struct ccw1 *first, *last, *fail, *from, *to;</div><div class='add'>+	int len, sl, sct;</div><div class='ctx'> </div><div class='ctx'> 	page = (char *) get_zeroed_page(GFP_ATOMIC);</div><div class='ctx'> 	if (page == NULL) {</div><div class='hunk'>@@ -1539,7 +1657,8 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,</div><div class='ctx'> 			    "No memory to dump sense data");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	len = sprintf(page, KERN_ERR PRINTK_HEADER</div><div class='add'>+	/* dump the sense data */</div><div class='add'>+	len = sprintf(page,  KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		      " I/O status report for device %s:\n",</div><div class='ctx'> 		      device-&gt;cdev-&gt;dev.bus_id);</div><div class='ctx'> 	len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='hunk'>@@ -1564,87 +1683,55 @@ dasd_eckd_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,</div><div class='ctx'> </div><div class='ctx'> 		if (irb-&gt;ecw[27] &amp; DASD_SENSE_BIT_0) {</div><div class='ctx'> 			/* 24 Byte Sense Data */</div><div class='del'>-			len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='del'>-				       " 24 Byte: %x MSG %x, "</div><div class='del'>-				       "%s MSGb to SYSOP\n",</div><div class='del'>-				       irb-&gt;ecw[7] &gt;&gt; 4, irb-&gt;ecw[7] &amp; 0x0f,</div><div class='del'>-				       irb-&gt;ecw[1] &amp; 0x10 ? "" : "no");</div><div class='add'>+			sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='add'>+				" 24 Byte: %x MSG %x, "</div><div class='add'>+				"%s MSGb to SYSOP\n",</div><div class='add'>+				irb-&gt;ecw[7] &gt;&gt; 4, irb-&gt;ecw[7] &amp; 0x0f,</div><div class='add'>+				irb-&gt;ecw[1] &amp; 0x10 ? "" : "no");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* 32 Byte Sense Data */</div><div class='del'>-			len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='del'>-				       " 32 Byte: Format: %x "</div><div class='del'>-				       "Exception class %x\n",</div><div class='del'>-				       irb-&gt;ecw[6] &amp; 0x0f, irb-&gt;ecw[22] &gt;&gt; 4);</div><div class='add'>+			sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='add'>+				" 32 Byte: Format: %x "</div><div class='add'>+				"Exception class %x\n",</div><div class='add'>+				irb-&gt;ecw[6] &amp; 0x0f, irb-&gt;ecw[22] &gt;&gt; 4);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-	        len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='del'>-			       " SORRY - NO VALID SENSE AVAILABLE\n");</div><div class='add'>+		sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='add'>+			" SORRY - NO VALID SENSE AVAILABLE\n");</div><div class='ctx'> 	}</div><div class='del'>-	MESSAGE_LOG(KERN_ERR, "%s",</div><div class='del'>-		    page + sizeof(KERN_ERR PRINTK_HEADER));</div><div class='del'>-</div><div class='del'>-	/* dump the Channel Program */</div><div class='del'>-	/* print first CCWs (maximum 8) */</div><div class='del'>-	act = req-&gt;cpaddr;</div><div class='del'>-        for (last = act; last-&gt;flags &amp; (CCW_FLAG_CC | CCW_FLAG_DC); last++);</div><div class='del'>-	end = min(act + 8, last);</div><div class='del'>-	len = sprintf(page, KERN_ERR PRINTK_HEADER</div><div class='add'>+	printk("%s", page);</div><div class='add'>+</div><div class='add'>+	/* dump the Channel Program (max 140 Bytes per line) */</div><div class='add'>+	/* Count CCW and print first CCWs (maximum 1024 % 140 = 7) */</div><div class='add'>+	first = req-&gt;cpaddr;</div><div class='add'>+	for (last = first; last-&gt;flags &amp; (CCW_FLAG_CC | CCW_FLAG_DC); last++);</div><div class='add'>+	to = min(first + 6, last);</div><div class='add'>+	len = sprintf(page,  KERN_ERR PRINTK_HEADER</div><div class='ctx'> 		      " Related CP in req: %p\n", req);</div><div class='del'>-	while (act &lt;= end) {</div><div class='del'>-		len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='del'>-			       " CCW %p: %08X %08X DAT:",</div><div class='del'>-			       act, ((int *) act)[0], ((int *) act)[1]);</div><div class='del'>-		for (count = 0; count &lt; 32 &amp;&amp; count &lt; act-&gt;count;</div><div class='del'>-		     count += sizeof(int))</div><div class='del'>-			len += sprintf(page + len, " %08X",</div><div class='del'>-				       ((int *) (addr_t) act-&gt;cda)</div><div class='del'>-				       [(count&gt;&gt;2)]);</div><div class='del'>-		len += sprintf(page + len, "\n");</div><div class='del'>-		act++;</div><div class='del'>-	}</div><div class='del'>-	MESSAGE_LOG(KERN_ERR, "%s",</div><div class='del'>-		    page + sizeof(KERN_ERR PRINTK_HEADER));</div><div class='add'>+	dasd_eckd_dump_ccw_range(first, to, page + len);</div><div class='add'>+	printk("%s", page);</div><div class='ctx'> </div><div class='del'>-	/* print failing CCW area */</div><div class='add'>+	/* print failing CCW area (maximum 4) */</div><div class='add'>+	/* scsw-&gt;cda is either valid or zero  */</div><div class='ctx'> 	len = 0;</div><div class='del'>-	if (act &lt;  ((struct ccw1 *)(addr_t) irb-&gt;scsw.cpa) - 2) {</div><div class='del'>-		act = ((struct ccw1 *)(addr_t) irb-&gt;scsw.cpa) - 2;</div><div class='del'>-		len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");</div><div class='del'>-	}</div><div class='del'>-	end = min((struct ccw1 *)(addr_t) irb-&gt;scsw.cpa + 2, last);</div><div class='del'>-	while (act &lt;= end) {</div><div class='del'>-		len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='del'>-			       " CCW %p: %08X %08X DAT:",</div><div class='del'>-			       act, ((int *) act)[0], ((int *) act)[1]);</div><div class='del'>-		for (count = 0; count &lt; 32 &amp;&amp; count &lt; act-&gt;count;</div><div class='del'>-		     count += sizeof(int))</div><div class='del'>-			len += sprintf(page + len, " %08X",</div><div class='del'>-				       ((int *) (addr_t) act-&gt;cda)</div><div class='del'>-				       [(count&gt;&gt;2)]);</div><div class='del'>-		len += sprintf(page + len, "\n");</div><div class='del'>-		act++;</div><div class='add'>+	from = ++to;</div><div class='add'>+	fail = (struct ccw1 *)(addr_t) irb-&gt;scsw.cpa; /* failing CCW */</div><div class='add'>+	if (from &lt;  fail - 2) {</div><div class='add'>+		from = fail - 2;     /* there is a gap - print header */</div><div class='add'>+		len += sprintf(page, KERN_ERR PRINTK_HEADER "......\n");</div><div class='ctx'> 	}</div><div class='add'>+	to = min(fail + 1, last);</div><div class='add'>+	len += dasd_eckd_dump_ccw_range(from, to, page + len);</div><div class='ctx'> </div><div class='del'>-	/* print last CCWs */</div><div class='del'>-	if (act &lt;  last - 2) {</div><div class='del'>-		act = last - 2;</div><div class='add'>+	/* print last CCWs (maximum 2) */</div><div class='add'>+	from = max(from, ++to);</div><div class='add'>+	if (from &lt; last - 1) {</div><div class='add'>+		from = last - 1;     /* there is a gap - print header */</div><div class='ctx'> 		len += sprintf(page + len, KERN_ERR PRINTK_HEADER "......\n");</div><div class='ctx'> 	}</div><div class='del'>-	while (act &lt;= last) {</div><div class='del'>-		len += sprintf(page + len, KERN_ERR PRINTK_HEADER</div><div class='del'>-			       " CCW %p: %08X %08X DAT:",</div><div class='del'>-			       act, ((int *) act)[0], ((int *) act)[1]);</div><div class='del'>-		for (count = 0; count &lt; 32 &amp;&amp; count &lt; act-&gt;count;</div><div class='del'>-		     count += sizeof(int))</div><div class='del'>-			len += sprintf(page + len, " %08X",</div><div class='del'>-				       ((int *) (addr_t) act-&gt;cda)</div><div class='del'>-				       [(count&gt;&gt;2)]);</div><div class='del'>-		len += sprintf(page + len, "\n");</div><div class='del'>-		act++;</div><div class='del'>-	}</div><div class='add'>+	len += dasd_eckd_dump_ccw_range(from, last, page + len);</div><div class='ctx'> 	if (len &gt; 0)</div><div class='del'>-		MESSAGE_LOG(KERN_ERR, "%s",</div><div class='del'>-			    page + sizeof(KERN_ERR PRINTK_HEADER));</div><div class='add'>+		printk("%s", page);</div><div class='ctx'> 	free_page((unsigned long) page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1685,14 +1772,8 @@ static struct dasd_discipline dasd_eckd_discipline = {</div><div class='ctx'> static int __init</div><div class='ctx'> dasd_eckd_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	ASCEBC(dasd_eckd_discipline.ebcname, 4);</div><div class='del'>-</div><div class='del'>-	ret = ccw_driver_register(&amp;dasd_eckd_driver);</div><div class='del'>-	if (!ret)</div><div class='del'>-		dasd_generic_auto_online(&amp;dasd_eckd_driver);</div><div class='del'>-	return ret;</div><div class='add'>+	return ccw_driver_register(&amp;dasd_eckd_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit</div><div class='hunk'>@@ -1703,22 +1784,3 @@ dasd_eckd_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> module_init(dasd_eckd_init);</div><div class='ctx'> module_exit(dasd_eckd_cleanup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4 </div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h<br/>index d5734e976e1c..712ff1650134 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eckd.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_eckd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eckd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_eckd.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_eckd.h</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='del'>- *                  Horst Hummel &lt;Horst.Hummel@de.ibm.com&gt; </div><div class='add'>+ *		    Horst Hummel &lt;Horst.Hummel@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='ctx'>  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000</div><div class='ctx'>  *</div><div class='hunk'>@@ -41,9 +41,10 @@</div><div class='ctx'> #define DASD_ECKD_CCW_RESERVE		 0xB4</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *Perform Subsystem Function / Sub-Orders</div><div class='add'>+ * Perform Subsystem Function / Sub-Orders</div><div class='ctx'>  */</div><div class='del'>-#define PSF_ORDER_PRSSD			 0x18</div><div class='add'>+#define PSF_ORDER_PRSSD 0x18</div><div class='add'>+#define PSF_ORDER_SSC	0x1D</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * SECTION: Type Definitions</div><div class='hunk'>@@ -155,7 +156,7 @@ struct dasd_eckd_characteristics {</div><div class='ctx'> 		unsigned char reserved2:4;</div><div class='ctx'> 		unsigned char reserved3:8;</div><div class='ctx'> 		unsigned char defect_wr:1;</div><div class='del'>-		unsigned char XRC_supported:1; </div><div class='add'>+		unsigned char XRC_supported:1;</div><div class='ctx'> 		unsigned char reserved4:1;</div><div class='ctx'> 		unsigned char striping:1;</div><div class='ctx'> 		unsigned char reserved5:4;</div><div class='hunk'>@@ -343,7 +344,7 @@ struct dasd_eckd_path {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Perform Subsystem Function - Prepare for Read Subsystem Data	 </div><div class='add'>+ * Perform Subsystem Function - Prepare for Read Subsystem Data</div><div class='ctx'>  */</div><div class='ctx'> struct dasd_psf_prssd_data {</div><div class='ctx'> 	unsigned char order;</div><div class='hunk'>@@ -353,4 +354,15 @@ struct dasd_psf_prssd_data {</div><div class='ctx'> 	unsigned char varies[9];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Perform Subsystem Function - Set Subsystem Characteristics</div><div class='add'>+ */</div><div class='add'>+struct dasd_psf_ssc_data {</div><div class='add'>+	unsigned char order;</div><div class='add'>+	unsigned char flags;</div><div class='add'>+	unsigned char cu_type[4];</div><div class='add'>+	unsigned char suborder;</div><div class='add'>+	unsigned char reserved[59];</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='ctx'> #endif				/* DASD_ECKD_H */</div><div class='head'>diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c<br/>index 2d946b6ca074..da65f1b032f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_eer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_eer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_eer.c</a></div><div class='hunk'>@@ -89,7 +89,7 @@ struct eerbuffer {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(bufferlist);</div><div class='del'>-static spinlock_t bufferlock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(bufferlock);</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -276,7 +276,7 @@ struct dasd_eer_header {</div><div class='ctx'> 	__u64 tv_sec;</div><div class='ctx'> 	__u64 tv_usec;</div><div class='ctx'> 	char busid[DASD_EER_BUSID_SIZE];</div><div class='del'>-};</div><div class='add'>+} __attribute__ ((packed));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following function can be used for those triggers that have</div><div class='hunk'>@@ -521,6 +521,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);</div><div class='add'>+	if (!eerb)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	eerb-&gt;buffer_page_count = eer_pages;</div><div class='ctx'> 	if (eerb-&gt;buffer_page_count &lt; 1 ||</div><div class='ctx'> 	    eerb-&gt;buffer_page_count &gt; INT_MAX / PAGE_SIZE) {</div><div class='head'>diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c<br/>index b842377cb0c6..58a65097922b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_erp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_erp.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +89,7 @@ dasd_default_erp_action(struct dasd_ccw_req * cqr)</div><div class='ctx'> </div><div class='ctx'>         /* just retry - there is nothing to save ... I got no sense data.... */</div><div class='ctx'>         if (cqr-&gt;retries &gt; 0) {</div><div class='del'>-                DEV_MESSAGE (KERN_DEBUG, device, </div><div class='add'>+		DEV_MESSAGE (KERN_DEBUG, device,</div><div class='ctx'>                              "default ERP called (%i retries left)",</div><div class='ctx'>                              cqr-&gt;retries);</div><div class='ctx'> 		cqr-&gt;lpm    = LPM_ANYPATH;</div><div class='hunk'>@@ -155,7 +154,7 @@ dasd_default_erp_postaction(struct dasd_ccw_req * cqr)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Print the hex dump of the memory used by a request. This includes</div><div class='del'>- * all error recovery ccws that have been chained in from of the </div><div class='add'>+ * all error recovery ccws that have been chained in from of the</div><div class='ctx'>  * real request.</div><div class='ctx'>  */</div><div class='ctx'> static inline void</div><div class='hunk'>@@ -227,12 +226,12 @@ dasd_log_ccw(struct dasd_ccw_req * cqr, int caller, __u32 cpa)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Log bytes arround failed CCW but only if we did</div><div class='ctx'> 		 * not log the whole CP of the CCW is outside the</div><div class='del'>-		 * logged CP. </div><div class='add'>+		 * logged CP.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (cplength &gt; 40 ||</div><div class='ctx'> 		    ((addr_t) cpa &lt; (addr_t) lcqr-&gt;cpaddr &amp;&amp;</div><div class='ctx'> 		     (addr_t) cpa &gt; (addr_t) (lcqr-&gt;cpaddr + cplength + 4))) {</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			DEV_MESSAGE(KERN_ERR, device,</div><div class='ctx'> 				    "Failed CCW (%p) (area):",</div><div class='ctx'> 				    (void *) (long) cpa);</div><div class='head'>diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c<br/>index 91145698f8e9..e85015be109b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_fba.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_fba.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_fba.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_fba.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_fba.c</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='hunk'>@@ -45,8 +44,8 @@ struct dasd_fba_private {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ccw_device_id dasd_fba_ids[] = {</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x6310, 0, 0x9336, 0), driver_info: 0x1},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3370, 0), driver_info: 0x2},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x6310, 0, 0x9336, 0), .driver_info = 0x1},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3370, 0), .driver_info = 0x2},</div><div class='ctx'> 	{ /* end of list */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -56,19 +55,13 @@ static struct ccw_driver dasd_fba_driver; /* see below */</div><div class='ctx'> static int</div><div class='ctx'> dasd_fba_probe(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = dasd_generic_probe (cdev, &amp;dasd_fba_discipline);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP);</div><div class='del'>-	return 0;</div><div class='add'>+	return dasd_generic_probe(cdev, &amp;dasd_fba_discipline);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> dasd_fba_set_online(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='del'>-	return dasd_generic_set_online (cdev, &amp;dasd_fba_discipline);</div><div class='add'>+	return dasd_generic_set_online(cdev, &amp;dasd_fba_discipline);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ccw_driver dasd_fba_driver = {</div><div class='hunk'>@@ -125,13 +118,13 @@ static int</div><div class='ctx'> dasd_fba_check_characteristics(struct dasd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct dasd_fba_private *private;</div><div class='del'>-	struct ccw_device *cdev = device-&gt;cdev;	</div><div class='add'>+	struct ccw_device *cdev = device-&gt;cdev;</div><div class='ctx'> 	void *rdc_data;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	private = (struct dasd_fba_private *) device-&gt;private;</div><div class='ctx'> 	if (private == NULL) {</div><div class='del'>-		private = kmalloc(sizeof(struct dasd_fba_private), GFP_KERNEL);</div><div class='add'>+		private = kzalloc(sizeof(struct dasd_fba_private), GFP_KERNEL);</div><div class='ctx'> 		if (private == NULL) {</div><div class='ctx'> 			DEV_MESSAGE(KERN_WARNING, device, "%s",</div><div class='ctx'> 				    "memory allocation failed for private "</div><div class='hunk'>@@ -204,7 +197,7 @@ dasd_fba_examine_error(struct dasd_ccw_req * cqr, struct irb * irb)</div><div class='ctx'> 	if (irb-&gt;scsw.cstat == 0x00 &amp;&amp;</div><div class='ctx'> 	    irb-&gt;scsw.dstat == (DEV_STAT_CHN_END | DEV_STAT_DEV_END))</div><div class='ctx'> 		return dasd_era_none;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	cdev = device-&gt;cdev;</div><div class='ctx'> 	switch (cdev-&gt;id.dev_type) {</div><div class='ctx'> 	case 0x3370:</div><div class='hunk'>@@ -539,7 +532,7 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,</div><div class='ctx'>  * 8192 bytes (=2 pages). For 64 bit one dasd_mchunkt_t structure has</div><div class='ctx'>  * 24 bytes, the struct dasd_ccw_req has 136 bytes and each block can use</div><div class='ctx'>  * up to 16 bytes (8 for the ccw and 8 for the idal pointer). In</div><div class='del'>- * addition we have one define extent ccw + 16 bytes of data and a </div><div class='add'>+ * addition we have one define extent ccw + 16 bytes of data and a</div><div class='ctx'>  * locate record ccw for each block (stupid devices!) + 16 bytes of data.</div><div class='ctx'>  * That makes:</div><div class='ctx'>  * (8192 - 24 - 136 - 8 - 16) / 40 = 200.2 blocks at maximum.</div><div class='hunk'>@@ -569,16 +562,8 @@ static struct dasd_discipline dasd_fba_discipline = {</div><div class='ctx'> static int __init</div><div class='ctx'> dasd_fba_init(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	ASCEBC(dasd_fba_discipline.ebcname, 4);</div><div class='del'>-</div><div class='del'>-	ret = ccw_driver_register(&amp;dasd_fba_driver);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	dasd_generic_auto_online(&amp;dasd_fba_driver);</div><div class='del'>-	return 0;</div><div class='add'>+	return ccw_driver_register(&amp;dasd_fba_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit</div><div class='hunk'>@@ -589,22 +574,3 @@ dasd_fba_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> module_init(dasd_fba_init);</div><div class='ctx'> module_exit(dasd_fba_cleanup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4 </div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_fba.h b/drivers/s390/block/dasd_fba.h<br/>index da1fa91fc01d..14c910baa5fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_fba.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_fba.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_fba.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_fba.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_fba.h</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='head'>diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c<br/>index fce2835e7d19..4c272b70f41a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_genhd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_genhd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_genhd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_genhd.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/blkpg.h&gt;</div><div class='hunk'>@@ -68,8 +67,6 @@ dasd_gendisk_alloc(struct dasd_device *device)</div><div class='ctx'> 	}</div><div class='ctx'> 	len += sprintf(gdp-&gt;disk_name + len, "%c", 'a'+(device-&gt;devindex%26));</div><div class='ctx'> </div><div class='del'>- 	sprintf(gdp-&gt;devfs_name, "dasd/%s", device-&gt;cdev-&gt;dev.bus_id);</div><div class='del'>-</div><div class='ctx'> 	if (device-&gt;features &amp; DASD_FEATURE_READONLY)</div><div class='ctx'> 		set_disk_ro(gdp, 1);</div><div class='ctx'> 	gdp-&gt;private_data = device;</div><div class='hunk'>@@ -87,9 +84,9 @@ void</div><div class='ctx'> dasd_gendisk_free(struct dasd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	del_gendisk(device-&gt;gdp);</div><div class='del'>-	device-&gt;gdp-&gt;queue = 0;</div><div class='add'>+	device-&gt;gdp-&gt;queue = NULL;</div><div class='ctx'> 	put_disk(device-&gt;gdp);</div><div class='del'>-	device-&gt;gdp = 0;</div><div class='add'>+	device-&gt;gdp = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -139,7 +136,7 @@ dasd_destroy_partitions(struct dasd_device * device)</div><div class='ctx'> 	 * device-&gt;bdev to lower the offline open_count limit again.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bdev = device-&gt;bdev;</div><div class='del'>-	device-&gt;bdev = 0;</div><div class='add'>+	device-&gt;bdev = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * See fs/partition/check.c:delete_partition</div><div class='hunk'>@@ -148,7 +145,7 @@ dasd_destroy_partitions(struct dasd_device * device)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;bpart, 0, sizeof(struct blkpg_partition));</div><div class='ctx'> 	memset(&amp;barg, 0, sizeof(struct blkpg_ioctl_arg));</div><div class='del'>-	barg.data = &amp;bpart;</div><div class='add'>+	barg.data = (void __user *) &amp;bpart;</div><div class='ctx'> 	barg.op = BLKPG_DEL_PARTITION;</div><div class='ctx'> 	for (bpart.pno = device-&gt;gdp-&gt;minors - 1; bpart.pno &gt; 0; bpart.pno--)</div><div class='ctx'> 		ioctl_by_bdev(bdev, BLKPG, (unsigned long) &amp;barg);</div><div class='head'>diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h<br/>index d4b13e300a76..3ccf06d28ba1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_int.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_int.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_int.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_int.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * File...........: linux/drivers/s390/block/dasd_int.h</div><div class='ctx'>  * Author(s)......: Holger Smolinski &lt;Holger.Smolinski@de.ibm.com&gt;</div><div class='del'>- *                  Horst Hummel &lt;Horst.Hummel@de.ibm.com&gt; </div><div class='add'>+ *		    Horst Hummel &lt;Horst.Hummel@de.ibm.com&gt;</div><div class='ctx'>  *		    Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  * Bugreports.to..: &lt;Linux390@de.ibm.com&gt;</div><div class='ctx'>  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000</div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/genhd.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -186,7 +185,7 @@ struct dasd_ccw_req {</div><div class='ctx'>         void *callback_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * dasd_ccw_req -&gt; status can be:</div><div class='ctx'>  */</div><div class='ctx'> #define DASD_CQR_FILLED   0x00	/* request is ready to be processed */</div><div class='hunk'>@@ -248,7 +247,7 @@ struct dasd_discipline {</div><div class='ctx'>         /*</div><div class='ctx'>          * Error recovery functions. examine_error() returns a value that</div><div class='ctx'>          * indicates what to do for an error condition. If examine_error()</div><div class='del'>-         * returns 'dasd_era_recover' erp_action() is called to create a </div><div class='add'>+	 * returns 'dasd_era_recover' erp_action() is called to create a</div><div class='ctx'>          * special error recovery ccw. erp_postaction() is called after</div><div class='ctx'>          * an error recovery ccw has finished its execution. dump_sense</div><div class='ctx'>          * is called for every error condition to print the sense data</div><div class='hunk'>@@ -302,11 +301,11 @@ struct dasd_device {</div><div class='ctx'> 	spinlock_t request_queue_lock;</div><div class='ctx'> 	struct block_device *bdev;</div><div class='ctx'>         unsigned int devindex;</div><div class='del'>-	unsigned long blocks;		/* size of volume in blocks */</div><div class='del'>-	unsigned int bp_block;		/* bytes per block */</div><div class='del'>-	unsigned int s2b_shift;		/* log2 (bp_block/512) */</div><div class='del'>-	unsigned long flags;		/* per device flags */</div><div class='del'>-	unsigned short features;        /* copy of devmap-features (read-only!) */</div><div class='add'>+	unsigned long blocks;	   /* size of volume in blocks */</div><div class='add'>+	unsigned int bp_block;	   /* bytes per block */</div><div class='add'>+	unsigned int s2b_shift;	   /* log2 (bp_block/512) */</div><div class='add'>+	unsigned long flags;	   /* per device flags */</div><div class='add'>+	unsigned short features;   /* copy of devmap-features (read-only!) */</div><div class='ctx'> </div><div class='ctx'> 	/* extended error reporting stuff (eer) */</div><div class='ctx'> 	struct dasd_ccw_req *eer_cqr;</div><div class='hunk'>@@ -513,12 +512,12 @@ void dasd_generic_remove (struct ccw_device *cdev);</div><div class='ctx'> int dasd_generic_set_online(struct ccw_device *, struct dasd_discipline *);</div><div class='ctx'> int dasd_generic_set_offline (struct ccw_device *cdev);</div><div class='ctx'> int dasd_generic_notify(struct ccw_device *, int);</div><div class='del'>-void dasd_generic_auto_online (struct ccw_driver *);</div><div class='ctx'> </div><div class='ctx'> /* externals in dasd_devmap.c */</div><div class='ctx'> extern int dasd_max_devindex;</div><div class='ctx'> extern int dasd_probeonly;</div><div class='ctx'> extern int dasd_autodetect;</div><div class='add'>+extern int dasd_nopav;</div><div class='ctx'> </div><div class='ctx'> int dasd_devmap_init(void);</div><div class='ctx'> void dasd_devmap_exit(void);</div><div class='hunk'>@@ -606,22 +605,3 @@ static inline int dasd_eer_enabled(struct dasd_device *device)</div><div class='ctx'> #endif				/* __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> #endif				/* DASD_H */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Overrides for Emacs so that we follow Linus's tabbing style.</div><div class='del'>- * Emacs will notice this stuff at the end of the file and automatically</div><div class='del'>- * adjust the settings for this buffer only.  This must remain at the end</div><div class='del'>- * of the file.</div><div class='del'>- * ---------------------------------------------------------------------------</div><div class='del'>- * Local variables:</div><div class='del'>- * c-indent-level: 4 </div><div class='del'>- * c-brace-imaginary-offset: 0</div><div class='del'>- * c-brace-offset: -4</div><div class='del'>- * c-argdecl-indent: 4</div><div class='del'>- * c-label-offset: -4</div><div class='del'>- * c-continued-statement-offset: 4</div><div class='del'>- * c-continued-brace-offset: 0</div><div class='del'>- * indent-tabs-mode: 1</div><div class='del'>- * tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c<br/>index b8c80d28df41..8fed3603e9ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_ioctl.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * i/o controls for the dasd driver.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -90,10 +89,10 @@ static int</div><div class='ctx'> dasd_ioctl_quiesce(struct dasd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!capable (CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EACCES;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	DEV_MESSAGE (KERN_DEBUG, device, "%s",</div><div class='ctx'> 		     "Quiesce IO on device");</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='hunk'>@@ -110,13 +109,13 @@ static int</div><div class='ctx'> dasd_ioctl_resume(struct dasd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	if (!capable (CAP_SYS_ADMIN)) </div><div class='add'>+</div><div class='add'>+	if (!capable (CAP_SYS_ADMIN))</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> </div><div class='ctx'> 	DEV_MESSAGE (KERN_DEBUG, device, "%s",</div><div class='ctx'> 		     "resume IO on device");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='ctx'> 	device-&gt;stopped &amp;= ~DASD_STOPPED_QUIESCE;</div><div class='ctx'> 	spin_unlock_irqrestore(get_ccwdev_lock(device-&gt;cdev), flags);</div><div class='hunk'>@@ -287,7 +286,7 @@ dasd_ioctl_information(struct dasd_device *device,</div><div class='ctx'> 	dasd_info-&gt;open_count = atomic_read(&amp;device-&gt;open_count);</div><div class='ctx'> 	if (!device-&gt;bdev)</div><div class='ctx'> 		dasd_info-&gt;open_count++;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * check if device is really formatted</div><div class='ctx'> 	 * LDL / CDL was returned by 'fill_info'</div><div class='hunk'>@@ -346,7 +345,7 @@ dasd_ioctl_set_ro(struct block_device *bdev, void __user *argp)</div><div class='ctx'> 	if (bdev != bdev-&gt;bd_contains)</div><div class='ctx'> 		// ro setting is not allowed for partitions</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (get_user(intval, (int *)argp))</div><div class='add'>+	if (get_user(intval, (int __user *)argp))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	set_disk_ro(bdev-&gt;bd_disk, intval);</div><div class='head'>diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c<br/>index ad23aede356c..bfa010f6dab2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/dasd_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/dasd_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/dasd_proc.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='head'>diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c<br/>index 54ecd548c318..4cd879cb9bdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/block/xpram.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/block/xpram.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/block/xpram.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/block/xpram.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;  /* HDIO_GETGEO */</div><div class='ctx'> #include &lt;linux/sysdev.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define XPRAM_NAME	"xpram"</div><div class='hunk'>@@ -72,11 +71,11 @@ static int xpram_devs;</div><div class='ctx'> /*</div><div class='ctx'>  * Parameter parsing functions.</div><div class='ctx'>  */</div><div class='del'>-static int devs = XPRAM_DEVS;</div><div class='del'>-static unsigned int sizes[XPRAM_MAX_DEVS];</div><div class='add'>+static int __initdata devs = XPRAM_DEVS;</div><div class='add'>+static char __initdata *sizes[XPRAM_MAX_DEVS];</div><div class='ctx'> </div><div class='ctx'> module_param(devs, int, 0);</div><div class='del'>-module_param_array(sizes, int, NULL, 0);</div><div class='add'>+module_param_array(sizes, charp, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(devs, "number of devices (\"partitions\"), " \</div><div class='ctx'> 		 "the default is " __MODULE_STRING(XPRAM_DEVS) "\n");</div><div class='hunk'>@@ -87,59 +86,6 @@ MODULE_PARM_DESC(sizes, "list of device (partition) sizes " \</div><div class='ctx'> 		 "claimed by explicit sizes\n");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#ifndef MODULE</div><div class='del'>-/*</div><div class='del'>- * Parses the kernel parameters given in the kernel parameter line.</div><div class='del'>- * The expected format is</div><div class='del'>- *           &lt;number_of_partitions&gt;[","&lt;partition_size&gt;]*</div><div class='del'>- * where</div><div class='del'>- *           devices is a positive integer that initializes xpram_devs</div><div class='del'>- *           each size is a non-negative integer possibly followed by a</div><div class='del'>- *           magnitude (k,K,m,M,g,G), the list of sizes initialises</div><div class='del'>- *           xpram_sizes</div><div class='del'>- *</div><div class='del'>- * Arguments</div><div class='del'>- *           str: substring of kernel parameter line that contains xprams</div><div class='del'>- *                kernel parameters.</div><div class='del'>- *</div><div class='del'>- * Result    0 on success, -EINVAL else -- only for Version &gt; 2.3</div><div class='del'>- *</div><div class='del'>- * Side effects</div><div class='del'>- *           the global variabls devs is set to the value of</div><div class='del'>- *           &lt;number_of_partitions&gt; and sizes[i] is set to the i-th</div><div class='del'>- *           partition size (if provided). A parsing error of a value</div><div class='del'>- *           results in this value being set to -EINVAL.</div><div class='del'>- */</div><div class='del'>-static int __init xpram_setup (char *str)</div><div class='del'>-{</div><div class='del'>-	char *cp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	devs = simple_strtoul(str, &amp;cp, 10);</div><div class='del'>-	if (cp &lt;= str || devs &gt; XPRAM_MAX_DEVS)</div><div class='del'>-		return 0;</div><div class='del'>-	for (i = 0; (i &lt; devs) &amp;&amp; (*cp++ == ','); i++) {</div><div class='del'>-		sizes[i] = simple_strtoul(cp, &amp;cp, 10);</div><div class='del'>-		if (*cp == 'g' || *cp == 'G') {</div><div class='del'>-			sizes[i] &lt;&lt;= 20;</div><div class='del'>-			cp++;</div><div class='del'>-		} else if (*cp == 'm' || *cp == 'M') {</div><div class='del'>-			sizes[i] &lt;&lt;= 10;</div><div class='del'>-			cp++;</div><div class='del'>-		} else if (*cp == 'k' || *cp == 'K')</div><div class='del'>-			cp++;</div><div class='del'>-		while (isspace(*cp)) cp++;</div><div class='del'>-	}</div><div class='del'>-	if (*cp == ',' &amp;&amp; i &gt;= devs)</div><div class='del'>-		PRINT_WARN("partition sizes list has too many entries.\n");</div><div class='del'>-	else if (*cp != 0)</div><div class='del'>-		PRINT_WARN("ignored '%s' at end of parameter string.\n", cp);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("xpram_parts=", xpram_setup);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Copy expanded memory page (4kB) into main memory                  </div><div class='ctx'>  * Arguments                                                         </div><div class='hunk'>@@ -375,7 +321,9 @@ static int __init xpram_setup_sizes(unsigned long pages)</div><div class='ctx'> 	mem_needed = 0;</div><div class='ctx'> 	mem_auto_no = 0;</div><div class='ctx'> 	for (i = 0; i &lt; xpram_devs; i++) {</div><div class='del'>-		xpram_sizes[i] = (sizes[i] + 3) &amp; -4UL;</div><div class='add'>+		if (sizes[i])</div><div class='add'>+			xpram_sizes[i] =</div><div class='add'>+				(memparse(sizes[i], &amp;sizes[i]) + 3) &amp; -4UL;</div><div class='ctx'> 		if (xpram_sizes[i])</div><div class='ctx'> 			mem_needed += xpram_sizes[i];</div><div class='ctx'> 		else</div><div class='hunk'>@@ -439,8 +387,6 @@ static int __init xpram_setup_blkdev(void)</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("slram");</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Assign the other needed values: make request function, sizes and</div><div class='ctx'> 	 * hardsect size. All the minor devices feature the same value.</div><div class='hunk'>@@ -469,14 +415,12 @@ static int __init xpram_setup_blkdev(void)</div><div class='ctx'> 		disk-&gt;private_data = &amp;xpram_devices[i];</div><div class='ctx'> 		disk-&gt;queue = xpram_queue;</div><div class='ctx'> 		sprintf(disk-&gt;disk_name, "slram%d", i);</div><div class='del'>-		sprintf(disk-&gt;devfs_name, "slram/%d", i);</div><div class='ctx'> 		set_capacity(disk, xpram_sizes[i] &lt;&lt; 1);</div><div class='ctx'> 		add_disk(disk);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> out_unreg:</div><div class='del'>-	devfs_remove("slram");</div><div class='ctx'> 	unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);</div><div class='ctx'> out:</div><div class='ctx'> 	while (i--)</div><div class='hunk'>@@ -495,7 +439,6 @@ static void __exit xpram_exit(void)</div><div class='ctx'> 		put_disk(xpram_disks[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);</div><div class='del'>-	devfs_remove("slram");</div><div class='ctx'> 	blk_cleanup_queue(xpram_queue);</div><div class='ctx'> 	sysdev_unregister(&amp;xpram_sys_device);</div><div class='ctx'> 	sysdev_class_unregister(&amp;xpram_sysclass);</div><div class='head'>diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c<br/>index 606f6ad285a0..2fa566fa6da4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/con3215.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/con3215.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/con3215.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/con3215.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *	       Dan Morrison, IBM Corporation (dmorriso@cse.buffalo.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='hunk'>@@ -694,7 +693,7 @@ raw3215_probe (struct ccw_device *cdev)</div><div class='ctx'> 				       GFP_KERNEL|GFP_DMA);</div><div class='ctx'> 	if (raw-&gt;buffer == NULL) {</div><div class='ctx'> 		spin_lock(&amp;raw3215_device_lock);</div><div class='del'>-		raw3215[line] = 0;</div><div class='add'>+		raw3215[line] = NULL;</div><div class='ctx'> 		spin_unlock(&amp;raw3215_device_lock);</div><div class='ctx'> 		kfree(raw);</div><div class='ctx'> 		return -ENOMEM;</div><div class='head'>diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c<br/>index ef607a1de55a..7566be890688 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/con3270.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/con3270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/con3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/con3270.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *	-- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c<br/>index be463242cf0f..d83eb6358bac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/ctrlchar.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/ctrlchar.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/ctrlchar.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/ctrlchar.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;asm/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='hunk'>@@ -24,7 +23,7 @@ ctrlchar_handle_sysrq(void *tty)</div><div class='ctx'> 	handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, 0);</div><div class='add'>+static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/char/defkeymap.c b/drivers/s390/char/defkeymap.c<br/>index ca15adb140d1..17027d918cf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/defkeymap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/defkeymap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/defkeymap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/defkeymap.c</a></div><div class='hunk'>@@ -83,8 +83,8 @@ static u_short shift_ctrl_map[NR_KEYS] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> ushort *key_maps[MAX_NR_KEYMAPS] = {</div><div class='del'>-	plain_map, shift_map, 0, 0,</div><div class='del'>-	ctrl_map, shift_ctrl_map,	0</div><div class='add'>+	plain_map, shift_map, NULL, NULL,</div><div class='add'>+	ctrl_map, shift_ctrl_map, NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> unsigned int keymap_count = 4;</div><div class='hunk'>@@ -145,7 +145,7 @@ char *func_table[MAX_NR_FUNC] = {</div><div class='ctx'> 	func_buf + 97,</div><div class='ctx'> 	func_buf + 103,</div><div class='ctx'> 	func_buf + 109,</div><div class='del'>-	0,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kbdiacr accent_table[MAX_DIACR] = {</div><div class='head'>diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c<br/>index a6415377bc73..ef004d089712 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/fs3270.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/fs3270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/fs3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/fs3270.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *	-- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -237,7 +236,7 @@ fs3270_irq(struct fs3270 *fp, struct raw3270_request *rq, struct irb *irb)</div><div class='ctx'>  * Process reads from fullscreen 3270.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='del'>-fs3270_read(struct file *filp, char *data, size_t count, loff_t *off)</div><div class='add'>+fs3270_read(struct file *filp, char __user *data, size_t count, loff_t *off)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs3270 *fp;</div><div class='ctx'> 	struct raw3270_request *rq;</div><div class='hunk'>@@ -282,7 +281,7 @@ fs3270_read(struct file *filp, char *data, size_t count, loff_t *off)</div><div class='ctx'>  * Process writes to fullscreen 3270.</div><div class='ctx'>  */</div><div class='ctx'> static ssize_t</div><div class='del'>-fs3270_write(struct file *filp, const char *data, size_t count, loff_t *off)</div><div class='add'>+fs3270_write(struct file *filp, const char __user *data, size_t count, loff_t *off)</div><div class='ctx'> {</div><div class='ctx'> 	struct fs3270 *fp;</div><div class='ctx'> 	struct raw3270_request *rq;</div><div class='hunk'>@@ -339,10 +338,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		fp-&gt;write_command = arg;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUBGETI:</div><div class='del'>-		rc = put_user(fp-&gt;read_command, (char *) arg);</div><div class='add'>+		rc = put_user(fp-&gt;read_command, (char __user *) arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUBGETO:</div><div class='del'>-		rc = put_user(fp-&gt;write_command,(char *) arg);</div><div class='add'>+		rc = put_user(fp-&gt;write_command,(char __user *) arg);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TUBGETMOD:</div><div class='ctx'> 		iocb.model = fp-&gt;view.model;</div><div class='hunk'>@@ -351,7 +350,7 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		iocb.pf_cnt = 24;</div><div class='ctx'> 		iocb.re_cnt = 20;</div><div class='ctx'> 		iocb.map = 0;</div><div class='del'>-		if (copy_to_user((char *) arg, &amp;iocb,</div><div class='add'>+		if (copy_to_user((char __user *) arg, &amp;iocb,</div><div class='ctx'> 				 sizeof(struct raw3270_iocb)))</div><div class='ctx'> 			rc = -EFAULT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -480,7 +479,7 @@ fs3270_close(struct inode *inode, struct file *filp)</div><div class='ctx'> 	struct fs3270 *fp;</div><div class='ctx'> </div><div class='ctx'> 	fp = filp-&gt;private_data;</div><div class='del'>-	filp-&gt;private_data = 0;</div><div class='add'>+	filp-&gt;private_data = NULL;</div><div class='ctx'> 	if (fp) {</div><div class='ctx'> 		fp-&gt;fs_pid = 0;</div><div class='ctx'> 		raw3270_reset(&amp;fp-&gt;view);</div><div class='head'>diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c<br/>index d4d2ff0a9da2..3be06569180d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/keyboard.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/keyboard.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/keyboard.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/keyboard.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='hunk'>@@ -104,7 +103,7 @@ out_maps:</div><div class='ctx'> out_kbd:</div><div class='ctx'> 	kfree(kbd);</div><div class='ctx'> out:</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -305,7 +304,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)</div><div class='ctx'> 		if (kbd-&gt;sysrq) {</div><div class='ctx'> 			if (kbd-&gt;sysrq == K(KT_LATIN, '-')) {</div><div class='ctx'> 				kbd-&gt;sysrq = 0;</div><div class='del'>-				handle_sysrq(value, 0, kbd-&gt;tty);</div><div class='add'>+				handle_sysrq(value, NULL, kbd-&gt;tty);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (value == '-') {</div><div class='hunk'>@@ -364,7 +363,7 @@ do_kdsk_ioctl(struct kbd_data *kbd, struct kbentry __user *user_kbe,</div><div class='ctx'> 			/* disallocate map */</div><div class='ctx'> 			key_map = kbd-&gt;key_maps[tmp.kb_table];</div><div class='ctx'> 			if (key_map) {</div><div class='del'>-			    kbd-&gt;key_maps[tmp.kb_table] = 0;</div><div class='add'>+			    kbd-&gt;key_maps[tmp.kb_table] = NULL;</div><div class='ctx'> 			    kfree(key_map);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c<br/>index fb7bc9e5eebc..a138b1510093 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/monreader.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/monreader.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/monreader.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/monreader.c</a></div><div class='hunk'>@@ -586,7 +586,6 @@ static struct file_operations mon_fops = {</div><div class='ctx'> </div><div class='ctx'> static struct miscdevice mon_dev = {</div><div class='ctx'> 	.name       = "monreader",</div><div class='del'>-	.devfs_name = "monreader",</div><div class='ctx'> 	.fops       = &amp;mon_fops,</div><div class='ctx'> 	.minor      = MISC_DYNAMIC_MINOR,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c<br/>index eecb2afad5c2..95e285b2e25c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/raw3270.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/raw3270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/raw3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/raw3270.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *	-- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/bootmem.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='hunk'>@@ -50,6 +49,9 @@ struct raw3270 {</div><div class='ctx'> 	unsigned char *ascebc;		/* ascii -&gt; ebcdic table */</div><div class='ctx'> 	struct class_device *clttydev;	/* 3270-class tty device ptr */</div><div class='ctx'> 	struct class_device *cltubdev;	/* 3270-class tub device ptr */</div><div class='add'>+</div><div class='add'>+	struct raw3270_request init_request;</div><div class='add'>+	unsigned char init_data[256];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* raw3270-&gt;flags */</div><div class='hunk'>@@ -484,8 +486,6 @@ struct raw3270_ua {	/* Query Reply structure for Usable Area */</div><div class='ctx'> 	} __attribute__ ((packed)) aua;</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='del'>-static unsigned char raw3270_init_data[256];</div><div class='del'>-static struct raw3270_request raw3270_init_request;</div><div class='ctx'> static struct diag210 raw3270_init_diag210;</div><div class='ctx'> static DECLARE_MUTEX(raw3270_init_sem);</div><div class='ctx'> </div><div class='hunk'>@@ -555,7 +555,7 @@ raw3270_start_init(struct raw3270 *rp, struct raw3270_view *view,</div><div class='ctx'> #ifdef CONFIG_TN3270_CONSOLE</div><div class='ctx'> 	if (raw3270_registered == 0) {</div><div class='ctx'> 		spin_lock_irqsave(get_ccwdev_lock(view-&gt;dev-&gt;cdev), flags);</div><div class='del'>-		rq-&gt;callback = 0;</div><div class='add'>+		rq-&gt;callback = NULL;</div><div class='ctx'> 		rc = __raw3270_start(rp, view, rq);</div><div class='ctx'> 		if (rc == 0)</div><div class='ctx'> 			while (!raw3270_request_final(rq)) {</div><div class='hunk'>@@ -644,17 +644,17 @@ __raw3270_size_device(struct raw3270 *rp)</div><div class='ctx'> 	 * required (3270 device switched to 'stand-by') and command</div><div class='ctx'> 	 * rejects (old devices that can't do 'read partition').</div><div class='ctx'> 	 */</div><div class='del'>-	memset(&amp;raw3270_init_request, 0, sizeof(raw3270_init_request));</div><div class='del'>-	memset(raw3270_init_data, 0, sizeof(raw3270_init_data));</div><div class='del'>-	/* Store 'read partition' data stream to raw3270_init_data */</div><div class='del'>-	memcpy(raw3270_init_data, wbuf, sizeof(wbuf));</div><div class='del'>-	INIT_LIST_HEAD(&amp;raw3270_init_request.list);</div><div class='del'>-	raw3270_init_request.ccw.cmd_code = TC_WRITESF;</div><div class='del'>-	raw3270_init_request.ccw.flags = CCW_FLAG_SLI;</div><div class='del'>-	raw3270_init_request.ccw.count = sizeof(wbuf);</div><div class='del'>-	raw3270_init_request.ccw.cda = (__u32) __pa(raw3270_init_data);</div><div class='del'>-</div><div class='del'>-	rc = raw3270_start_init(rp, &amp;raw3270_init_view, &amp;raw3270_init_request);</div><div class='add'>+	memset(&amp;rp-&gt;init_request, 0, sizeof(rp-&gt;init_request));</div><div class='add'>+	memset(&amp;rp-&gt;init_data, 0, 256);</div><div class='add'>+	/* Store 'read partition' data stream to init_data */</div><div class='add'>+	memcpy(&amp;rp-&gt;init_data, wbuf, sizeof(wbuf));</div><div class='add'>+	INIT_LIST_HEAD(&amp;rp-&gt;init_request.list);</div><div class='add'>+	rp-&gt;init_request.ccw.cmd_code = TC_WRITESF;</div><div class='add'>+	rp-&gt;init_request.ccw.flags = CCW_FLAG_SLI;</div><div class='add'>+	rp-&gt;init_request.ccw.count = sizeof(wbuf);</div><div class='add'>+	rp-&gt;init_request.ccw.cda = (__u32) __pa(&amp;rp-&gt;init_data);</div><div class='add'>+</div><div class='add'>+	rc = raw3270_start_init(rp, &amp;raw3270_init_view, &amp;rp-&gt;init_request);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		/* Check error cases: -ERESTARTSYS, -EIO and -EOPNOTSUPP */</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -679,18 +679,18 @@ __raw3270_size_device(struct raw3270 *rp)</div><div class='ctx'> 	 * The device accepted the 'read partition' command. Now</div><div class='ctx'> 	 * set up a read ccw and issue it.</div><div class='ctx'> 	 */</div><div class='del'>-	raw3270_init_request.ccw.cmd_code = TC_READMOD;</div><div class='del'>-	raw3270_init_request.ccw.flags = CCW_FLAG_SLI;</div><div class='del'>-	raw3270_init_request.ccw.count = sizeof(raw3270_init_data);</div><div class='del'>-	raw3270_init_request.ccw.cda = (__u32) __pa(raw3270_init_data);</div><div class='del'>-	rc = raw3270_start_init(rp, &amp;raw3270_init_view, &amp;raw3270_init_request);</div><div class='add'>+	rp-&gt;init_request.ccw.cmd_code = TC_READMOD;</div><div class='add'>+	rp-&gt;init_request.ccw.flags = CCW_FLAG_SLI;</div><div class='add'>+	rp-&gt;init_request.ccw.count = sizeof(rp-&gt;init_data);</div><div class='add'>+	rp-&gt;init_request.ccw.cda = (__u32) __pa(rp-&gt;init_data);</div><div class='add'>+	rc = raw3270_start_init(rp, &amp;raw3270_init_view, &amp;rp-&gt;init_request);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	/* Got a Query Reply */</div><div class='del'>-	count = sizeof(raw3270_init_data) - raw3270_init_request.rescnt;</div><div class='del'>-	uap = (struct raw3270_ua *) (raw3270_init_data + 1);</div><div class='add'>+	count = sizeof(rp-&gt;init_data) - rp-&gt;init_request.rescnt;</div><div class='add'>+	uap = (struct raw3270_ua *) (rp-&gt;init_data + 1);</div><div class='ctx'> 	/* Paranoia check. */</div><div class='del'>-	if (raw3270_init_data[0] != 0x88 || uap-&gt;uab.qcode != 0x81)</div><div class='add'>+	if (rp-&gt;init_data[0] != 0x88 || uap-&gt;uab.qcode != 0x81)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	/* Copy rows/columns of default Usable Area */</div><div class='ctx'> 	rp-&gt;rows = uap-&gt;uab.h;</div><div class='hunk'>@@ -719,8 +719,8 @@ raw3270_size_device(struct raw3270 *rp)</div><div class='ctx'> 		rc = __raw3270_size_device_vm(rp);</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = __raw3270_size_device(rp);</div><div class='del'>-	raw3270_init_view.dev = 0;</div><div class='del'>-	rp-&gt;view = 0;</div><div class='add'>+	raw3270_init_view.dev = NULL;</div><div class='add'>+	rp-&gt;view = NULL;</div><div class='ctx'> 	up(&amp;raw3270_init_sem);</div><div class='ctx'> 	if (rc == 0) {	/* Found something. */</div><div class='ctx'> 		/* Try to find a model. */</div><div class='hunk'>@@ -749,20 +749,20 @@ raw3270_reset_device(struct raw3270 *rp)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;raw3270_init_sem);</div><div class='del'>-	memset(&amp;raw3270_init_request, 0, sizeof(raw3270_init_request));</div><div class='del'>-	memset(raw3270_init_data, 0, sizeof(raw3270_init_data));</div><div class='del'>-	/* Store reset data stream to raw3270_init_data/raw3270_init_request */</div><div class='del'>-	raw3270_init_data[0] = TW_KR;</div><div class='del'>-	INIT_LIST_HEAD(&amp;raw3270_init_request.list);</div><div class='del'>-	raw3270_init_request.ccw.cmd_code = TC_EWRITEA;</div><div class='del'>-	raw3270_init_request.ccw.flags = CCW_FLAG_SLI;</div><div class='del'>-	raw3270_init_request.ccw.count = 1;</div><div class='del'>-	raw3270_init_request.ccw.cda = (__u32) __pa(raw3270_init_data);</div><div class='add'>+	memset(&amp;rp-&gt;init_request, 0, sizeof(rp-&gt;init_request));</div><div class='add'>+	memset(&amp;rp-&gt;init_data, 0, sizeof(rp-&gt;init_data));</div><div class='add'>+	/* Store reset data stream to init_data/init_request */</div><div class='add'>+	rp-&gt;init_data[0] = TW_KR;</div><div class='add'>+	INIT_LIST_HEAD(&amp;rp-&gt;init_request.list);</div><div class='add'>+	rp-&gt;init_request.ccw.cmd_code = TC_EWRITEA;</div><div class='add'>+	rp-&gt;init_request.ccw.flags = CCW_FLAG_SLI;</div><div class='add'>+	rp-&gt;init_request.ccw.count = 1;</div><div class='add'>+	rp-&gt;init_request.ccw.cda = (__u32) __pa(rp-&gt;init_data);</div><div class='ctx'> 	rp-&gt;view = &amp;raw3270_init_view;</div><div class='ctx'> 	raw3270_init_view.dev = rp;</div><div class='del'>-	rc = raw3270_start_init(rp, &amp;raw3270_init_view, &amp;raw3270_init_request);</div><div class='del'>-	raw3270_init_view.dev = 0;</div><div class='del'>-	rp-&gt;view = 0;</div><div class='add'>+	rc = raw3270_start_init(rp, &amp;raw3270_init_view, &amp;rp-&gt;init_request);</div><div class='add'>+	raw3270_init_view.dev = NULL;</div><div class='add'>+	rp-&gt;view = NULL;</div><div class='ctx'> 	up(&amp;raw3270_init_sem);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -854,7 +854,7 @@ raw3270_setup_console(struct ccw_device *cdev)</div><div class='ctx'> 	char *ascebc;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rp = (struct raw3270 *) alloc_bootmem(sizeof(struct raw3270));</div><div class='add'>+	rp = (struct raw3270 *) alloc_bootmem_low(sizeof(struct raw3270));</div><div class='ctx'> 	ascebc = (char *) alloc_bootmem(256);</div><div class='ctx'> 	rc = raw3270_setup_device(cdev, rp, ascebc);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -895,7 +895,7 @@ raw3270_create_device(struct ccw_device *cdev)</div><div class='ctx'> 	char *ascebc;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rp = kmalloc(sizeof(struct raw3270), GFP_KERNEL);</div><div class='add'>+	rp = kmalloc(sizeof(struct raw3270), GFP_KERNEL | GFP_DMA);</div><div class='ctx'> 	if (!rp)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	ascebc = kmalloc(256, GFP_KERNEL);</div><div class='hunk'>@@ -934,7 +934,7 @@ raw3270_activate_view(struct raw3270_view *view)</div><div class='ctx'> 	else if (!test_bit(RAW3270_FLAGS_READY, &amp;rp-&gt;flags))</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 	else {</div><div class='del'>-		oldview = 0;</div><div class='add'>+		oldview = NULL;</div><div class='ctx'> 		if (rp-&gt;view) {</div><div class='ctx'> 			oldview = rp-&gt;view;</div><div class='ctx'> 			oldview-&gt;fn-&gt;deactivate(oldview);</div><div class='hunk'>@@ -951,7 +951,7 @@ raw3270_activate_view(struct raw3270_view *view)</div><div class='ctx'> 						rp-&gt;view = nv;</div><div class='ctx'> 						if (nv-&gt;fn-&gt;activate(nv) == 0)</div><div class='ctx'> 							break;</div><div class='del'>-						rp-&gt;view = 0;</div><div class='add'>+						rp-&gt;view = NULL;</div><div class='ctx'> 					}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -975,7 +975,7 @@ raw3270_deactivate_view(struct raw3270_view *view)</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(rp-&gt;cdev), flags);</div><div class='ctx'> 	if (rp-&gt;view == view) {</div><div class='ctx'> 		view-&gt;fn-&gt;deactivate(view);</div><div class='del'>-		rp-&gt;view = 0;</div><div class='add'>+		rp-&gt;view = NULL;</div><div class='ctx'> 		/* Move deactivated view to end of list. */</div><div class='ctx'> 		list_del_init(&amp;view-&gt;list);</div><div class='ctx'> 		list_add_tail(&amp;view-&gt;list, &amp;rp-&gt;view_list);</div><div class='hunk'>@@ -985,7 +985,7 @@ raw3270_deactivate_view(struct raw3270_view *view)</div><div class='ctx'> 				rp-&gt;view = view;</div><div class='ctx'> 				if (view-&gt;fn-&gt;activate(view) == 0)</div><div class='ctx'> 					break;</div><div class='del'>-				rp-&gt;view = 0;</div><div class='add'>+				rp-&gt;view = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1076,7 +1076,7 @@ raw3270_del_view(struct raw3270_view *view)</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(rp-&gt;cdev), flags);</div><div class='ctx'> 	if (rp-&gt;view == view) {</div><div class='ctx'> 		view-&gt;fn-&gt;deactivate(view);</div><div class='del'>-		rp-&gt;view = 0;</div><div class='add'>+		rp-&gt;view = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_del_init(&amp;view-&gt;list);</div><div class='ctx'> 	if (!rp-&gt;view &amp;&amp; test_bit(RAW3270_FLAGS_READY, &amp;rp-&gt;flags)) {</div><div class='hunk'>@@ -1117,9 +1117,9 @@ raw3270_delete_device(struct raw3270 *rp)</div><div class='ctx'> </div><div class='ctx'> 	/* Disconnect from ccw_device. */</div><div class='ctx'> 	cdev = rp-&gt;cdev;</div><div class='del'>-	rp-&gt;cdev = 0;</div><div class='del'>-	cdev-&gt;dev.driver_data = 0;</div><div class='del'>-	cdev-&gt;handler = 0;</div><div class='add'>+	rp-&gt;cdev = NULL;</div><div class='add'>+	cdev-&gt;dev.driver_data = NULL;</div><div class='add'>+	cdev-&gt;handler = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Put ccw_device structure. */</div><div class='ctx'> 	put_device(&amp;cdev-&gt;dev);</div><div class='hunk'>@@ -1144,7 +1144,7 @@ raw3270_model_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%i\n",</div><div class='ctx'> 			((struct raw3270 *) dev-&gt;driver_data)-&gt;model);</div><div class='ctx'> }</div><div class='del'>-static DEVICE_ATTR(model, 0444, raw3270_model_show, 0);</div><div class='add'>+static DEVICE_ATTR(model, 0444, raw3270_model_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> raw3270_rows_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -1152,7 +1152,7 @@ raw3270_rows_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%i\n",</div><div class='ctx'> 			((struct raw3270 *) dev-&gt;driver_data)-&gt;rows);</div><div class='ctx'> }</div><div class='del'>-static DEVICE_ATTR(rows, 0444, raw3270_rows_show, 0);</div><div class='add'>+static DEVICE_ATTR(rows, 0444, raw3270_rows_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> raw3270_columns_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='hunk'>@@ -1160,7 +1160,7 @@ raw3270_columns_show(struct device *dev, struct device_attribute *attr, char *bu</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%i\n",</div><div class='ctx'> 			((struct raw3270 *) dev-&gt;driver_data)-&gt;cols);</div><div class='ctx'> }</div><div class='del'>-static DEVICE_ATTR(columns, 0444, raw3270_columns_show, 0);</div><div class='add'>+static DEVICE_ATTR(columns, 0444, raw3270_columns_show, NULL);</div><div class='ctx'> </div><div class='ctx'> static struct attribute * raw3270_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_model.attr,</div><div class='hunk'>@@ -1296,7 +1296,7 @@ raw3270_remove (struct ccw_device *cdev)</div><div class='ctx'> 	spin_lock_irqsave(get_ccwdev_lock(cdev), flags);</div><div class='ctx'> 	if (rp-&gt;view) {</div><div class='ctx'> 		rp-&gt;view-&gt;fn-&gt;deactivate(rp-&gt;view);</div><div class='del'>-		rp-&gt;view = 0;</div><div class='add'>+		rp-&gt;view = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (!list_empty(&amp;rp-&gt;view_list)) {</div><div class='ctx'> 		v = list_entry(rp-&gt;view_list.next, struct raw3270_view, list);</div><div class='head'>diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h<br/>index b635bf8e7775..90beaa80a782 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/raw3270.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/raw3270.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/raw3270.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/raw3270.h</a></div><div class='hunk'>@@ -231,7 +231,7 @@ alloc_string(struct list_head *free_list, unsigned long len)</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;cs-&gt;update);</div><div class='ctx'> 		return cs;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long</div><div class='head'>diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c<br/>index 4138564402b8..985d1613baaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp.c</a></div><div class='hunk'>@@ -383,6 +383,7 @@ void</div><div class='ctx'> sclp_sync_wait(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long psw_mask;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned long cr0, cr0_sync;</div><div class='ctx'> 	u64 timeout;</div><div class='ctx'> </div><div class='hunk'>@@ -395,9 +396,11 @@ sclp_sync_wait(void)</div><div class='ctx'> 			  sclp_tod_from_jiffies(sclp_request_timer.expires -</div><div class='ctx'> 						jiffies);</div><div class='ctx'> 	}</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	/* Prevent bottom half from executing once we force interrupts open */</div><div class='ctx'> 	local_bh_disable();</div><div class='ctx'> 	/* Enable service-signal interruption, disable timer interrupts */</div><div class='add'>+	trace_hardirqs_on();</div><div class='ctx'> 	__ctl_store(cr0, 0, 0);</div><div class='ctx'> 	cr0_sync = cr0;</div><div class='ctx'> 	cr0_sync |= 0x00000200;</div><div class='hunk'>@@ -415,11 +418,10 @@ sclp_sync_wait(void)</div><div class='ctx'> 		barrier();</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	}</div><div class='del'>-	/* Restore interrupt settings */</div><div class='del'>-	asm volatile ("SSM 0(%0)"</div><div class='del'>-		      : : "a" (&amp;psw_mask) : "memory");</div><div class='add'>+	local_irq_disable();</div><div class='ctx'> 	__ctl_load(cr0, 0, 0);</div><div class='del'>-	__local_bh_enable();</div><div class='add'>+	_local_bh_enable();</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(sclp_sync_wait);</div><div class='head'>diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c<br/>index 10ef22f13541..86864f641716 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_con.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_con.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_con.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp_con.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c<br/>index 80f7f31310e6..732dfbdb85c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_cpi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_cpi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_cpi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp_cpi.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * SCLP Control-Program Identification.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c<br/>index 56fa69168898..32004aae95c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_quiesce.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_quiesce.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_quiesce.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp_quiesce.c</a></div><div class='hunk'>@@ -7,12 +7,12 @@</div><div class='ctx'>  *             Peter Oberparleiter &lt;peter.oberparleiter@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;linux/smp.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/reboot.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> #include &lt;asm/ptrace.h&gt;</div><div class='ctx'> #include &lt;asm/sigp.h&gt;</div><div class='hunk'>@@ -66,8 +66,6 @@ do_machine_quiesce(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern void ctrl_alt_del(void);</div><div class='del'>-</div><div class='ctx'> /* Handler for quiesce event. Start shutdown procedure. */</div><div class='ctx'> static void</div><div class='ctx'> sclp_quiesce_handler(struct evbuf_header *evbuf)</div><div class='head'>diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c<br/>index 91e93c78f57a..0c92d3909cca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_rw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_rw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_rw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp_rw.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c<br/>index 6cbf067f1a8f..f6cf9023039e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp_tty.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c<br/>index 9e02625c82cf..54fba6f17188 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_vt220.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/sclp_vt220.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/sclp_vt220.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/sclp_vt220.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *    Author(s): Peter Oberparleiter &lt;Peter.Oberparleiter@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tape.h b/drivers/s390/char/tape.h<br/>index cd51ace8b610..1f4c89967be4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include &lt;asm/ccwdev.h&gt;</div><div class='ctx'> #include &lt;asm/debug.h&gt;</div><div class='ctx'> #include &lt;asm/idals.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c<br/>index d4f2da738078..7b95dab913d0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_34xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_34xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_34xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_34xx.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='hunk'>@@ -1310,9 +1309,9 @@ static struct tape_discipline tape_discipline_34xx = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct ccw_device_id tape_34xx_ids[] = {</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE(0x3480, 0, 0x3480, 0), driver_info: tape_3480},</div><div class='del'>-	{ CCW_DEVICE_DEVTYPE(0x3490, 0, 0x3490, 0), driver_info: tape_3490},</div><div class='del'>-	{ /* end of list */ }</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE(0x3480, 0, 0x3480, 0), .driver_info = tape_3480},</div><div class='add'>+	{ CCW_DEVICE_DEVTYPE(0x3490, 0, 0x3490, 0), .driver_info = tape_3490},</div><div class='add'>+	{ /* end of list */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c<br/>index d71ef1adea59..928cbefc49d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_3590.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_3590.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_3590.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_3590.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c<br/>index b70d92690242..3225fcd1dcb4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_block.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_block.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_block.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_block.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c<br/>index 5ce7ca38ace0..97f75237bed6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_char.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_char.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_char.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_char.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *		 Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c<br/>index e6e4086d3224..122b4d8965c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_core.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *		 Stefan Bader &lt;shbader@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;	     // for kernel parameters</div><div class='ctx'> #include &lt;linux/kmod.h&gt;	     // for requesting modules</div><div class='head'>diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c<br/>index 5fec0a10cc3d..655d375ab22b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_proc.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * PROCFS Functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c<br/>index 99cf881f41db..7a76ec413a3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_std.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tape_std.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tape_std.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tape_std.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *		 Stefan Bader &lt;shbader@de.ibm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/bio.h&gt;</div><div class='head'>diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c<br/>index 9a141776873f..29718042c6c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/tty3270.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/tty3270.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/tty3270.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/tty3270.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *	-- Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='hunk'>@@ -438,7 +437,7 @@ tty3270_rcl_add(struct tty3270 *tp, char *input, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct string *s;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;rcl_walk = 0;</div><div class='add'>+	tp-&gt;rcl_walk = NULL;</div><div class='ctx'> 	if (len &lt;= 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (tp-&gt;rcl_nr &gt;= tp-&gt;rcl_max) {</div><div class='hunk'>@@ -467,12 +466,12 @@ tty3270_rcl_backward(struct kbd_data *kbd)</div><div class='ctx'> 		else if (!list_empty(&amp;tp-&gt;rcl_lines))</div><div class='ctx'> 			tp-&gt;rcl_walk = tp-&gt;rcl_lines.prev;</div><div class='ctx'> 		s = tp-&gt;rcl_walk ? </div><div class='del'>-			list_entry(tp-&gt;rcl_walk, struct string, list) : 0;</div><div class='add'>+			list_entry(tp-&gt;rcl_walk, struct string, list) : NULL;</div><div class='ctx'> 		if (tp-&gt;rcl_walk) {</div><div class='ctx'> 			s = list_entry(tp-&gt;rcl_walk, struct string, list);</div><div class='ctx'> 			tty3270_update_prompt(tp, s-&gt;string, s-&gt;len);</div><div class='ctx'> 		} else</div><div class='del'>-			tty3270_update_prompt(tp, 0, 0);</div><div class='add'>+			tty3270_update_prompt(tp, NULL, 0);</div><div class='ctx'> 		tty3270_set_timer(tp, 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;tp-&gt;view.lock);</div><div class='hunk'>@@ -554,7 +553,7 @@ tty3270_read_tasklet(struct raw3270_request *rrq)</div><div class='ctx'> 	 * has to be emitted to the tty and for 0x6d the screen</div><div class='ctx'> 	 * needs to be redrawn.</div><div class='ctx'> 	 */</div><div class='del'>-	input = 0;</div><div class='add'>+	input = NULL;</div><div class='ctx'> 	len = 0;</div><div class='ctx'> 	if (tp-&gt;input-&gt;string[0] == 0x7d) {</div><div class='ctx'> 		/* Enter: write input to tty. */</div><div class='hunk'>@@ -568,7 +567,7 @@ tty3270_read_tasklet(struct raw3270_request *rrq)</div><div class='ctx'> 			tty3270_update_status(tp);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Clear input area. */</div><div class='del'>-		tty3270_update_prompt(tp, 0, 0);</div><div class='add'>+		tty3270_update_prompt(tp, NULL, 0);</div><div class='ctx'> 		tty3270_set_timer(tp, 1);</div><div class='ctx'> 	} else if (tp-&gt;input-&gt;string[0] == 0x6d) {</div><div class='ctx'> 		/* Display has been cleared. Redraw. */</div><div class='hunk'>@@ -809,8 +808,8 @@ tty3270_release(struct raw3270_view *view)</div><div class='ctx'> 	tp = (struct tty3270 *) view;</div><div class='ctx'> 	tty = tp-&gt;tty;</div><div class='ctx'> 	if (tty) {</div><div class='del'>-		tty-&gt;driver_data = 0;</div><div class='del'>-		tp-&gt;tty = tp-&gt;kbd-&gt;tty = 0;</div><div class='add'>+		tty-&gt;driver_data = NULL;</div><div class='add'>+		tp-&gt;tty = tp-&gt;kbd-&gt;tty = NULL;</div><div class='ctx'> 		tty_hangup(tty);</div><div class='ctx'> 		raw3270_put_view(&amp;tp-&gt;view);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -949,8 +948,8 @@ tty3270_close(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 		return;</div><div class='ctx'> 	tp = (struct tty3270 *) tty-&gt;driver_data;</div><div class='ctx'> 	if (tp) {</div><div class='del'>-		tty-&gt;driver_data = 0;</div><div class='del'>-		tp-&gt;tty = tp-&gt;kbd-&gt;tty = 0;</div><div class='add'>+		tty-&gt;driver_data = NULL;</div><div class='add'>+		tp-&gt;tty = tp-&gt;kbd-&gt;tty = NULL;</div><div class='ctx'> 		raw3270_put_view(&amp;tp-&gt;view);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1674,7 +1673,7 @@ tty3270_set_termios(struct tty_struct *tty, struct termios *old)</div><div class='ctx'> 		new = L_ECHO(tty) ? TF_INPUT: TF_INPUTN;</div><div class='ctx'> 		if (new != tp-&gt;inattr) {</div><div class='ctx'> 			tp-&gt;inattr = new;</div><div class='del'>-			tty3270_update_prompt(tp, 0, 0);</div><div class='add'>+			tty3270_update_prompt(tp, NULL, 0);</div><div class='ctx'> 			tty3270_set_timer(tp, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1760,7 +1759,7 @@ void</div><div class='ctx'> tty3270_notifier(int index, int active)</div><div class='ctx'> {</div><div class='ctx'> 	if (active)</div><div class='del'>-		tty_register_device(tty3270_driver, index, 0);</div><div class='add'>+		tty_register_device(tty3270_driver, index, NULL);</div><div class='ctx'> 	else</div><div class='ctx'> 		tty_unregister_device(tty3270_driver, index);</div><div class='ctx'> }</div><div class='hunk'>@@ -1785,7 +1784,6 @@ tty3270_init(void)</div><div class='ctx'> 	 * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc</div><div class='ctx'> 	 */</div><div class='ctx'> 	driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	driver-&gt;devfs_name = "ttyTUB/";</div><div class='ctx'> 	driver-&gt;driver_name = "ttyTUB";</div><div class='ctx'> 	driver-&gt;name = "ttyTUB";</div><div class='ctx'> 	driver-&gt;major = IBM_TTY3270_MAJOR;</div><div class='hunk'>@@ -1793,7 +1791,7 @@ tty3270_init(void)</div><div class='ctx'> 	driver-&gt;type = TTY_DRIVER_TYPE_SYSTEM;</div><div class='ctx'> 	driver-&gt;subtype = SYSTEM_TYPE_TTY;</div><div class='ctx'> 	driver-&gt;init_termios = tty_std_termios;</div><div class='del'>-	driver-&gt;flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	driver-&gt;flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	tty_set_operations(driver, &amp;tty3270_ops);</div><div class='ctx'> 	ret = tty_register_driver(driver);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1820,7 +1818,7 @@ tty3270_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	raw3270_unregister_notifier(tty3270_notifier);</div><div class='ctx'> 	driver = tty3270_driver;</div><div class='del'>-	tty3270_driver = 0;</div><div class='add'>+	tty3270_driver = NULL;</div><div class='ctx'> 	tty_unregister_driver(driver);</div><div class='ctx'> 	tty3270_del_views();</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c<br/>index c625b69ebd19..6cb23040954b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/vmlogrdr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/vmlogrdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/vmlogrdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/vmlogrdr.c</a></div><div class='hunk'>@@ -86,8 +86,8 @@ struct vmlogrdr_priv_t {</div><div class='ctx'>  */</div><div class='ctx'> static int vmlogrdr_open(struct inode *, struct file *);</div><div class='ctx'> static int vmlogrdr_release(struct inode *, struct file *);</div><div class='del'>-static ssize_t vmlogrdr_read (struct file *filp, char *data, size_t count,</div><div class='del'>-			       loff_t * ppos);</div><div class='add'>+static ssize_t vmlogrdr_read (struct file *filp, char __user *data,</div><div class='add'>+			      size_t count, loff_t * ppos);</div><div class='ctx'> </div><div class='ctx'> static struct file_operations vmlogrdr_fops = {</div><div class='ctx'> 	.owner   = THIS_MODULE,</div><div class='hunk'>@@ -515,7 +515,7 @@ vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv) {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='del'>-vmlogrdr_read (struct file *filp, char *data, size_t count, loff_t * ppos)</div><div class='add'>+vmlogrdr_read(struct file *filp, char __user *data, size_t count, loff_t * ppos)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct vmlogrdr_priv_t * priv = filp-&gt;private_data;</div><div class='head'>diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c<br/>index 5acc0ace3d7d..807320a41fa4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/char/vmwatchdog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/char/vmwatchdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/char/vmwatchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/char/vmwatchdog.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static int vmwdt_ioctl(struct inode *i, struct file *f,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case WDIOC_GETSTATUS:</div><div class='ctx'> 	case WDIOC_GETBOOTSTATUS:</div><div class='del'>-		return put_user(0, (int *)arg);</div><div class='add'>+		return put_user(0, (int __user *)arg);</div><div class='ctx'> 	case WDIOC_GETTEMP:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	case WDIOC_SETOPTIONS:</div><div class='head'>diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c<br/>index 0960bef7b199..12c2d6b746e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/blacklist.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/blacklist.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/blacklist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/blacklist.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *		 Arnd Bergmann (arndb@de.ibm.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -224,39 +223,6 @@ is_blacklisted (int ssid, int devno)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='del'>-static int</div><div class='del'>-__s390_redo_validation(struct subchannel_id schid, void *data)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct subchannel *sch;</div><div class='del'>-</div><div class='del'>-	sch = get_subchannel_by_schid(schid);</div><div class='del'>-	if (sch) {</div><div class='del'>-		/* Already known. */</div><div class='del'>-		put_device(&amp;sch-&gt;dev);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ret = css_probe_device(schid);</div><div class='del'>-	if (ret == -ENXIO)</div><div class='del'>-		return ret; /* We're through. */</div><div class='del'>-	if (ret == -ENOMEM)</div><div class='del'>-		/* Stop validation for now. Bad, but no need for a panic. */</div><div class='del'>-		return ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Function: s390_redo_validation</div><div class='del'>- * Look for no longer blacklisted devices</div><div class='del'>- * FIXME: there must be a better way to do this */</div><div class='del'>-static inline void</div><div class='del'>-s390_redo_validation (void)</div><div class='del'>-{</div><div class='del'>-	CIO_TRACE_EVENT (0, "redoval");</div><div class='del'>-</div><div class='del'>-	for_each_subchannel(__s390_redo_validation, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Function: blacklist_parse_proc_parameters</div><div class='ctx'>  * parse the stuff which is piped to /proc/cio_ignore</div><div class='hunk'>@@ -281,7 +247,7 @@ blacklist_parse_proc_parameters (char *buf)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	s390_redo_validation ();</div><div class='add'>+	css_schedule_reprobe();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Iterator struct for all devices. */</div><div class='head'>diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c<br/>index bdfee7fbaa2e..f26a2ee3aad8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/ccwgroup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/ccwgroup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/ccwgroup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/ccwgroup.c</a></div><div class='hunk'>@@ -319,7 +319,7 @@ ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const</div><div class='ctx'> 	if (!try_module_get(gdrv-&gt;owner))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	value = simple_strtoul(buf, 0, 0);</div><div class='add'>+	value = simple_strtoul(buf, NULL, 0);</div><div class='ctx'> 	ret = count;</div><div class='ctx'> 	if (value == 1)</div><div class='ctx'> 		ccwgroup_set_online(gdev);</div><div class='hunk'>@@ -404,21 +404,24 @@ ccwgroup_driver_register (struct ccwgroup_driver *cdriver)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-__ccwgroup_driver_unregister_device(struct device *dev, void *data)</div><div class='add'>+__ccwgroup_match_all(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	__ccwgroup_remove_symlinks(to_ccwgroupdev(dev));</div><div class='del'>-	device_unregister(dev);</div><div class='del'>-	put_device(dev);</div><div class='del'>-	return 0;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> ccwgroup_driver_unregister (struct ccwgroup_driver *cdriver)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='ctx'> 	/* We don't want ccwgroup devices to live longer than their driver. */</div><div class='ctx'> 	get_driver(&amp;cdriver-&gt;driver);</div><div class='del'>-	driver_for_each_device(&amp;cdriver-&gt;driver, NULL, NULL,</div><div class='del'>-			       __ccwgroup_driver_unregister_device);</div><div class='add'>+	while ((dev = driver_find_device(&amp;cdriver-&gt;driver, NULL, NULL,</div><div class='add'>+					 __ccwgroup_match_all))) {</div><div class='add'>+		__ccwgroup_remove_symlinks(to_ccwgroupdev(dev));</div><div class='add'>+		device_unregister(dev);</div><div class='add'>+		put_device(dev);</div><div class='add'>+	}</div><div class='ctx'> 	put_driver(&amp;cdriver-&gt;driver);</div><div class='ctx'> 	driver_unregister(&amp;cdriver-&gt;driver);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c<br/>index 72187e54dcac..61ce3f1d5228 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/chsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/chsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/chsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/chsc.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -244,8 +243,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if ((sch-&gt;schib.scsw.actl &amp; SCSW_ACTL_DEVACT) &amp;&amp;</div><div class='ctx'> 	    (sch-&gt;schib.scsw.actl &amp; SCSW_ACTL_SCHACT) &amp;&amp;</div><div class='del'>-	    (sch-&gt;schib.pmcw.lpum == mask) &amp;&amp;</div><div class='del'>-	    (sch-&gt;vpm == 0)) {</div><div class='add'>+	    (sch-&gt;schib.pmcw.lpum == mask)) {</div><div class='ctx'> 		int cc;</div><div class='ctx'> </div><div class='ctx'> 		cc = cio_clear(sch);</div><div class='hunk'>@@ -918,12 +916,13 @@ chp_measurement_read(struct kobject *kobj, char *buf, loff_t off, size_t count)</div><div class='ctx'> 	chp = to_channelpath(container_of(kobj, struct device, kobj));</div><div class='ctx'> 	css = to_css(chp-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct cmg_chars);</div><div class='add'>+	size = sizeof(struct cmg_entry);</div><div class='ctx'> </div><div class='ctx'> 	/* Only allow single reads. */</div><div class='ctx'> 	if (off || count &lt; size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	chp_measurement_copy_block((struct cmg_entry *)buf, css, chp-&gt;id);</div><div class='add'>+	count = size;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1465,6 +1464,40 @@ chsc_get_chp_desc(struct subchannel *sch, int chp_no)</div><div class='ctx'> 	return desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int reset_channel_path(struct channel_path *chp)</div><div class='add'>+{</div><div class='add'>+	int cc;</div><div class='add'>+</div><div class='add'>+	cc = rchp(chp-&gt;id);</div><div class='add'>+	switch (cc) {</div><div class='add'>+	case 0:</div><div class='add'>+		return 0;</div><div class='add'>+	case 2:</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	default:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_channel_paths_css(struct channel_subsystem *css)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= __MAX_CHPID; i++) {</div><div class='add'>+		if (css-&gt;chps[i])</div><div class='add'>+			reset_channel_path(css-&gt;chps[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cio_reset_channel_paths(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= __MAX_CSSID; i++) {</div><div class='add'>+		if (css[i] &amp;&amp; css[i]-&gt;valid)</div><div class='add'>+			reset_channel_paths_css(css[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> chsc_alloc_sei_area(void)</div><div class='head'>diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c<br/>index 5b20d8c9c025..89320c1ad825 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/cio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/cio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/cio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/cio.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='hunk'>@@ -148,7 +147,7 @@ cio_tpi(void)</div><div class='ctx'> 		sch-&gt;driver-&gt;irq(&amp;sch-&gt;dev);</div><div class='ctx'> 	spin_unlock(&amp;sch-&gt;lock);</div><div class='ctx'> 	irq_exit ();</div><div class='del'>-	__local_bh_enable();</div><div class='add'>+	_local_bh_enable();</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -520,6 +519,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)</div><div class='ctx'> 	memset(sch, 0, sizeof(struct subchannel));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;sch-&gt;lock);</div><div class='add'>+	mutex_init(&amp;sch-&gt;reg_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Set a name for the subchannel */</div><div class='ctx'> 	snprintf (sch-&gt;dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", schid.ssid,</div><div class='hunk'>@@ -798,7 +798,7 @@ struct subchannel *</div><div class='ctx'> cio_get_console_subchannel(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (!console_subchannel_in_use)</div><div class='del'>-		return 0;</div><div class='add'>+		return NULL;</div><div class='ctx'> 	return &amp;console_subchannel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -876,5 +876,6 @@ void</div><div class='ctx'> reipl(unsigned long devno)</div><div class='ctx'> {</div><div class='ctx'> 	clear_all_subchannels();</div><div class='add'>+	cio_reset_channel_paths();</div><div class='ctx'> 	do_reipl(devno);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h<br/>index 0ca987344e07..4541c1af4b66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/cio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/cio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/cio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/cio.h</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'> #define S390_CIO_H</div><div class='ctx'> </div><div class='ctx'> #include "schid.h"</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * where we put the ssd info</div><div class='hunk'>@@ -87,7 +88,7 @@ struct orb {</div><div class='ctx'> struct subchannel {</div><div class='ctx'> 	struct subchannel_id schid;</div><div class='ctx'> 	spinlock_t lock;	/* subchannel lock */</div><div class='del'>-</div><div class='add'>+	struct mutex reg_mutex;</div><div class='ctx'> 	enum {</div><div class='ctx'> 		SUBCHANNEL_TYPE_IO = 0,</div><div class='ctx'> 		SUBCHANNEL_TYPE_CHSC = 1,</div><div class='head'>diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c<br/>index 07ef3f640f4a..0df3af1f08de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/cmf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/cmf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/cmf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/cmf.c</a></div><div class='hunk'>@@ -3,9 +3,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Linux on zSeries Channel Measurement Facility support</div><div class='ctx'>  *</div><div class='del'>- * Copyright 2000,2003 IBM Corporation</div><div class='add'>+ * Copyright 2000,2006 IBM Corporation</div><div class='ctx'>  *</div><div class='del'>- * Author: Arnd Bergmann &lt;arndb@de.ibm.com&gt;</div><div class='add'>+ * Authors: Arnd Bergmann &lt;arndb@de.ibm.com&gt;</div><div class='add'>+ *	    Cornelia Huck &lt;cornelia.huck@de.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * original idea from Natarajan Krishnaswami &lt;nkrishna@us.ibm.com&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -96,9 +97,9 @@ module_param(format, bool, 0444);</div><div class='ctx'> /**</div><div class='ctx'>  * struct cmb_operations - functions to use depending on cmb_format</div><div class='ctx'>  *</div><div class='del'>- * all these functions operate on a struct cmf_device. There is only</div><div class='del'>- * one instance of struct cmb_operations because all cmf_device</div><div class='del'>- * objects are guaranteed to be of the same type.</div><div class='add'>+ * Most of these functions operate on a struct ccw_device. There is only</div><div class='add'>+ * one instance of struct cmb_operations because the format of the measurement</div><div class='add'>+ * data is guaranteed to be the same for every ccw_device.</div><div class='ctx'>  *</div><div class='ctx'>  * @alloc:	allocate memory for a channel measurement block,</div><div class='ctx'>  *		either with the help of a special pool or with kmalloc</div><div class='hunk'>@@ -107,6 +108,7 @@ module_param(format, bool, 0444);</div><div class='ctx'>  * @readall:	read a measurement block in a common format</div><div class='ctx'>  * @reset:	clear the data in the associated measurement block and</div><div class='ctx'>  *		reset its time stamp</div><div class='add'>+ * @align:	align an allocated block so that the hardware can use it</div><div class='ctx'>  */</div><div class='ctx'> struct cmb_operations {</div><div class='ctx'> 	int (*alloc)  (struct ccw_device*);</div><div class='hunk'>@@ -115,11 +117,19 @@ struct cmb_operations {</div><div class='ctx'> 	u64 (*read)   (struct ccw_device*, int);</div><div class='ctx'> 	int (*readall)(struct ccw_device*, struct cmbdata *);</div><div class='ctx'> 	void (*reset) (struct ccw_device*);</div><div class='add'>+	void * (*align) (void *);</div><div class='ctx'> </div><div class='ctx'> 	struct attribute_group *attr_group;</div><div class='ctx'> };</div><div class='ctx'> static struct cmb_operations *cmbops;</div><div class='ctx'> </div><div class='add'>+struct cmb_data {</div><div class='add'>+	void *hw_block;   /* Pointer to block updated by hardware */</div><div class='add'>+	void *last_block; /* Last changed block copied from hardware block */</div><div class='add'>+	int size;	  /* Size of hw_block and last_block */</div><div class='add'>+	unsigned long long last_update;  /* when last_block was updated */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* our user interface is designed in terms of nanoseconds,</div><div class='ctx'>  * while the hardware measures total times in its own</div><div class='ctx'>  * unit.*/</div><div class='hunk'>@@ -226,63 +236,229 @@ struct set_schib_struct {</div><div class='ctx'> 	unsigned long address;</div><div class='ctx'> 	wait_queue_head_t wait;</div><div class='ctx'> 	int ret;</div><div class='add'>+	struct kref kref;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void cmf_set_schib_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct set_schib_struct *set_data;</div><div class='add'>+</div><div class='add'>+	set_data = container_of(kref, struct set_schib_struct, kref);</div><div class='add'>+	kfree(set_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CMF_PENDING 1</div><div class='add'>+</div><div class='ctx'> static int set_schib_wait(struct ccw_device *cdev, u32 mme,</div><div class='ctx'> 				int mbfc, unsigned long address)</div><div class='ctx'> {</div><div class='del'>-	struct set_schib_struct s = {</div><div class='del'>-		.mme = mme,</div><div class='del'>-		.mbfc = mbfc,</div><div class='del'>-		.address = address,</div><div class='del'>-		.wait = __WAIT_QUEUE_HEAD_INITIALIZER(s.wait),</div><div class='del'>-	};</div><div class='add'>+	struct set_schib_struct *set_data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='del'>-	s.ret = set_schib(cdev, mme, mbfc, address);</div><div class='del'>-	if (s.ret != -EBUSY) {</div><div class='del'>-		goto out_nowait;</div><div class='add'>+	if (!cdev-&gt;private-&gt;cmb) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	set_data = kzalloc(sizeof(struct set_schib_struct), GFP_ATOMIC);</div><div class='add'>+	if (!set_data) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	init_waitqueue_head(&amp;set_data-&gt;wait);</div><div class='add'>+	kref_init(&amp;set_data-&gt;kref);</div><div class='add'>+	set_data-&gt;mme = mme;</div><div class='add'>+	set_data-&gt;mbfc = mbfc;</div><div class='add'>+	set_data-&gt;address = address;</div><div class='add'>+</div><div class='add'>+	ret = set_schib(cdev, mme, mbfc, address);</div><div class='add'>+	if (ret != -EBUSY)</div><div class='add'>+		goto out_put;</div><div class='ctx'> </div><div class='ctx'> 	if (cdev-&gt;private-&gt;state != DEV_STATE_ONLINE) {</div><div class='del'>-		s.ret = -EBUSY;</div><div class='ctx'> 		/* if the device is not online, don't even try again */</div><div class='del'>-		goto out_nowait;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_put;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	cdev-&gt;private-&gt;state = DEV_STATE_CMFCHANGE;</div><div class='del'>-	cdev-&gt;private-&gt;cmb_wait = &amp;s;</div><div class='del'>-	s.ret = 1;</div><div class='add'>+	set_data-&gt;ret = CMF_PENDING;</div><div class='add'>+	cdev-&gt;private-&gt;cmb_wait = set_data;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='del'>-	if (wait_event_interruptible(s.wait, s.ret != 1)) {</div><div class='add'>+	if (wait_event_interruptible(set_data-&gt;wait,</div><div class='add'>+				     set_data-&gt;ret != CMF_PENDING)) {</div><div class='ctx'> 		spin_lock_irq(cdev-&gt;ccwlock);</div><div class='del'>-		if (s.ret == 1) {</div><div class='del'>-			s.ret = -ERESTARTSYS;</div><div class='del'>-			cdev-&gt;private-&gt;cmb_wait = 0;</div><div class='add'>+		if (set_data-&gt;ret == CMF_PENDING) {</div><div class='add'>+			set_data-&gt;ret = -ERESTARTSYS;</div><div class='ctx'> 			if (cdev-&gt;private-&gt;state == DEV_STATE_CMFCHANGE)</div><div class='ctx'> 				cdev-&gt;private-&gt;state = DEV_STATE_ONLINE;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> 	}</div><div class='del'>-	return s.ret;</div><div class='del'>-</div><div class='del'>-out_nowait:</div><div class='add'>+	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	cdev-&gt;private-&gt;cmb_wait = NULL;</div><div class='add'>+	ret = set_data-&gt;ret;</div><div class='add'>+out_put:</div><div class='add'>+	kref_put(&amp;set_data-&gt;kref, cmf_set_schib_release);</div><div class='add'>+out:</div><div class='ctx'> 	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='del'>-	return s.ret;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void retry_set_schib(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='del'>-	struct set_schib_struct *s;</div><div class='add'>+	struct set_schib_struct *set_data;</div><div class='add'>+</div><div class='add'>+	set_data = cdev-&gt;private-&gt;cmb_wait;</div><div class='add'>+	if (!set_data) {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	kref_get(&amp;set_data-&gt;kref);</div><div class='add'>+	set_data-&gt;ret = set_schib(cdev, set_data-&gt;mme, set_data-&gt;mbfc,</div><div class='add'>+				  set_data-&gt;address);</div><div class='add'>+	wake_up(&amp;set_data-&gt;wait);</div><div class='add'>+	kref_put(&amp;set_data-&gt;kref, cmf_set_schib_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmf_copy_block(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct subchannel *sch;</div><div class='add'>+	void *reference_buf;</div><div class='add'>+	void *hw_block;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+</div><div class='add'>+	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	if (stsch(sch-&gt;schid, &amp;sch-&gt;schib))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (sch-&gt;schib.scsw.fctl &amp; SCSW_FCTL_START_FUNC) {</div><div class='add'>+		/* Don't copy if a start function is in progress. */</div><div class='add'>+		if ((!sch-&gt;schib.scsw.actl &amp; SCSW_ACTL_SUSPENDED) &amp;&amp;</div><div class='add'>+		    (sch-&gt;schib.scsw.actl &amp;</div><div class='add'>+		     (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) &amp;&amp;</div><div class='add'>+		    (!sch-&gt;schib.scsw.stctl &amp; SCSW_STCTL_SEC_STATUS))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	hw_block = cmbops-&gt;align(cmb_data-&gt;hw_block);</div><div class='add'>+	if (!memcmp(cmb_data-&gt;last_block, hw_block, cmb_data-&gt;size))</div><div class='add'>+		/* No need to copy. */</div><div class='add'>+		return 0;</div><div class='add'>+	reference_buf = kzalloc(cmb_data-&gt;size, GFP_ATOMIC);</div><div class='add'>+	if (!reference_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* Ensure consistency of block copied from hardware. */</div><div class='add'>+	do {</div><div class='add'>+		memcpy(cmb_data-&gt;last_block, hw_block, cmb_data-&gt;size);</div><div class='add'>+		memcpy(reference_buf, hw_block, cmb_data-&gt;size);</div><div class='add'>+	} while (memcmp(cmb_data-&gt;last_block, reference_buf, cmb_data-&gt;size));</div><div class='add'>+	cmb_data-&gt;last_update = get_clock();</div><div class='add'>+	kfree(reference_buf);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct copy_block_struct {</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	int ret;</div><div class='add'>+	struct kref kref;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cmf_copy_block_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct copy_block_struct *copy_block;</div><div class='add'>+</div><div class='add'>+	copy_block = container_of(kref, struct copy_block_struct, kref);</div><div class='add'>+	kfree(copy_block);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmf_cmb_copy_wait(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct copy_block_struct *copy_block;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='add'>+	if (!cdev-&gt;private-&gt;cmb) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	copy_block = kzalloc(sizeof(struct copy_block_struct), GFP_ATOMIC);</div><div class='add'>+	if (!copy_block) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	init_waitqueue_head(&amp;copy_block-&gt;wait);</div><div class='add'>+	kref_init(&amp;copy_block-&gt;kref);</div><div class='add'>+</div><div class='add'>+	ret = cmf_copy_block(cdev);</div><div class='add'>+	if (ret != -EBUSY)</div><div class='add'>+		goto out_put;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;private-&gt;state != DEV_STATE_ONLINE) {</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdev-&gt;private-&gt;state = DEV_STATE_CMFUPDATE;</div><div class='add'>+	copy_block-&gt;ret = CMF_PENDING;</div><div class='add'>+	cdev-&gt;private-&gt;cmb_wait = copy_block;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	if (wait_event_interruptible(copy_block-&gt;wait,</div><div class='add'>+				     copy_block-&gt;ret != CMF_PENDING)) {</div><div class='add'>+		spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='add'>+		if (copy_block-&gt;ret == CMF_PENDING) {</div><div class='add'>+			copy_block-&gt;ret = -ERESTARTSYS;</div><div class='add'>+			if (cdev-&gt;private-&gt;state == DEV_STATE_CMFUPDATE)</div><div class='add'>+				cdev-&gt;private-&gt;state = DEV_STATE_ONLINE;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='add'>+	cdev-&gt;private-&gt;cmb_wait = NULL;</div><div class='add'>+	ret = copy_block-&gt;ret;</div><div class='add'>+out_put:</div><div class='add'>+	kref_put(&amp;copy_block-&gt;kref, cmf_copy_block_release);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cmf_retry_copy_block(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct copy_block_struct *copy_block;</div><div class='ctx'> </div><div class='del'>-	s = cdev-&gt;private-&gt;cmb_wait;</div><div class='del'>-	cdev-&gt;private-&gt;cmb_wait = 0;</div><div class='del'>-	if (!s) {</div><div class='add'>+	copy_block = cdev-&gt;private-&gt;cmb_wait;</div><div class='add'>+	if (!copy_block) {</div><div class='ctx'> 		WARN_ON(1);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	s-&gt;ret = set_schib(cdev, s-&gt;mme, s-&gt;mbfc, s-&gt;address);</div><div class='del'>-	wake_up(&amp;s-&gt;wait);</div><div class='add'>+	kref_get(&amp;copy_block-&gt;kref);</div><div class='add'>+	copy_block-&gt;ret = cmf_copy_block(cdev);</div><div class='add'>+	wake_up(&amp;copy_block-&gt;wait);</div><div class='add'>+	kref_put(&amp;copy_block-&gt;kref, cmf_copy_block_release);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cmf_generic_reset(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	if (cmb_data) {</div><div class='add'>+		memset(cmb_data-&gt;last_block, 0, cmb_data-&gt;size);</div><div class='add'>+		/*</div><div class='add'>+		 * Need to reset hw block as well to make the hardware start</div><div class='add'>+		 * from 0 again.</div><div class='add'>+		 */</div><div class='add'>+		memset(cmbops-&gt;align(cmb_data-&gt;hw_block), 0, cmb_data-&gt;size);</div><div class='add'>+		cmb_data-&gt;last_update = 0;</div><div class='add'>+	}</div><div class='add'>+	cdev-&gt;private-&gt;cmb_start_time = get_clock();</div><div class='add'>+	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -343,8 +519,8 @@ struct cmb {</div><div class='ctx'> /* insert a single device into the cmb_area list</div><div class='ctx'>  * called with cmb_area.lock held from alloc_cmb</div><div class='ctx'>  */</div><div class='del'>-static inline int</div><div class='del'>-alloc_cmb_single (struct ccw_device *cdev)</div><div class='add'>+static inline int alloc_cmb_single (struct ccw_device *cdev,</div><div class='add'>+				    struct cmb_data *cmb_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmb *cmb;</div><div class='ctx'> 	struct ccw_device_private *node;</div><div class='hunk'>@@ -358,10 +534,12 @@ alloc_cmb_single (struct ccw_device *cdev)</div><div class='ctx'> </div><div class='ctx'> 	/* find first unused cmb in cmb_area.mem.</div><div class='ctx'> 	 * this is a little tricky: cmb_area.list</div><div class='del'>-	 * remains sorted by -&gt;cmb pointers */</div><div class='add'>+	 * remains sorted by -&gt;cmb-&gt;hw_data pointers */</div><div class='ctx'> 	cmb = cmb_area.mem;</div><div class='ctx'> 	list_for_each_entry(node, &amp;cmb_area.list, cmb_list) {</div><div class='del'>-		if ((struct cmb*)node-&gt;cmb &gt; cmb)</div><div class='add'>+		struct cmb_data *data;</div><div class='add'>+		data = node-&gt;cmb;</div><div class='add'>+		if ((struct cmb*)data-&gt;hw_block &gt; cmb)</div><div class='ctx'> 			break;</div><div class='ctx'> 		cmb++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -372,7 +550,8 @@ alloc_cmb_single (struct ccw_device *cdev)</div><div class='ctx'> </div><div class='ctx'> 	/* insert new cmb */</div><div class='ctx'> 	list_add_tail(&amp;cdev-&gt;private-&gt;cmb_list, &amp;node-&gt;cmb_list);</div><div class='del'>-	cdev-&gt;private-&gt;cmb = cmb;</div><div class='add'>+	cmb_data-&gt;hw_block = cmb;</div><div class='add'>+	cdev-&gt;private-&gt;cmb = cmb_data;</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='hunk'>@@ -385,7 +564,19 @@ alloc_cmb (struct ccw_device *cdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct cmb *mem;</div><div class='ctx'> 	ssize_t size;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+</div><div class='add'>+	/* Allocate private cmb_data. */</div><div class='add'>+	cmb_data = kzalloc(sizeof(struct cmb_data), GFP_KERNEL);</div><div class='add'>+	if (!cmb_data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	cmb_data-&gt;last_block = kzalloc(sizeof(struct cmb), GFP_KERNEL);</div><div class='add'>+	if (!cmb_data-&gt;last_block) {</div><div class='add'>+		kfree(cmb_data);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	cmb_data-&gt;size = sizeof(struct cmb);</div><div class='ctx'> 	spin_lock(&amp;cmb_area.lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!cmb_area.mem) {</div><div class='hunk'>@@ -414,29 +605,36 @@ alloc_cmb (struct ccw_device *cdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* do the actual allocation */</div><div class='del'>-	ret = alloc_cmb_single(cdev);</div><div class='add'>+	ret = alloc_cmb_single(cdev, cmb_data);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock(&amp;cmb_area.lock);</div><div class='del'>-</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(cmb_data-&gt;last_block);</div><div class='add'>+		kfree(cmb_data);</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-free_cmb(struct ccw_device *cdev)</div><div class='add'>+static void free_cmb(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ccw_device_private *priv;</div><div class='del'>-</div><div class='del'>-	priv = cdev-&gt;private;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cmb_area.lock);</div><div class='ctx'> 	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> </div><div class='add'>+	priv = cdev-&gt;private;</div><div class='add'>+</div><div class='ctx'> 	if (list_empty(&amp;priv-&gt;cmb_list)) {</div><div class='ctx'> 		/* already freed */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	cmb_data = priv-&gt;cmb;</div><div class='ctx'> 	priv-&gt;cmb = NULL;</div><div class='add'>+	if (cmb_data)</div><div class='add'>+		kfree(cmb_data-&gt;last_block);</div><div class='add'>+	kfree(cmb_data);</div><div class='ctx'> 	list_del_init(&amp;priv-&gt;cmb_list);</div><div class='ctx'> </div><div class='ctx'> 	if (list_empty(&amp;cmb_area.list)) {</div><div class='hunk'>@@ -451,83 +649,97 @@ out:</div><div class='ctx'> 	spin_unlock(&amp;cmb_area.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-set_cmb(struct ccw_device *cdev, u32 mme)</div><div class='add'>+static int set_cmb(struct ccw_device *cdev, u32 mme)</div><div class='ctx'> {</div><div class='ctx'> 	u16 offset;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!cdev-&gt;private-&gt;cmb)</div><div class='add'>+	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='add'>+	if (!cdev-&gt;private-&gt;cmb) {</div><div class='add'>+		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	offset = mme ? (struct cmb *)cdev-&gt;private-&gt;cmb - cmb_area.mem : 0;</div><div class='add'>+	}</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	offset = mme ? (struct cmb *)cmb_data-&gt;hw_block - cmb_area.mem : 0;</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return set_schib_wait(cdev, mme, 0, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64</div><div class='del'>-read_cmb (struct ccw_device *cdev, int index)</div><div class='add'>+static u64 read_cmb (struct ccw_device *cdev, int index)</div><div class='ctx'> {</div><div class='del'>-	/* yes, we have to put it on the stack</div><div class='del'>-	 * because the cmb must only be accessed</div><div class='del'>-	 * atomically, e.g. with mvc */</div><div class='del'>-	struct cmb cmb;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct cmb *cmb;</div><div class='ctx'> 	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	ret = cmf_cmb_copy_wait(cdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='ctx'> 	if (!cdev-&gt;private-&gt;cmb) {</div><div class='del'>-		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='del'>-		return 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	cmb = *(struct cmb*)cdev-&gt;private-&gt;cmb;</div><div class='del'>-	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	cmb = ((struct cmb_data *)cdev-&gt;private-&gt;cmb)-&gt;last_block;</div><div class='ctx'> </div><div class='ctx'> 	switch (index) {</div><div class='ctx'> 	case cmb_ssch_rsch_count:</div><div class='del'>-		return cmb.ssch_rsch_count;</div><div class='add'>+		ret = cmb-&gt;ssch_rsch_count;</div><div class='add'>+		goto out;</div><div class='ctx'> 	case cmb_sample_count:</div><div class='del'>-		return cmb.sample_count;</div><div class='add'>+		ret = cmb-&gt;sample_count;</div><div class='add'>+		goto out;</div><div class='ctx'> 	case cmb_device_connect_time:</div><div class='del'>-		val = cmb.device_connect_time;</div><div class='add'>+		val = cmb-&gt;device_connect_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_function_pending_time:</div><div class='del'>-		val = cmb.function_pending_time;</div><div class='add'>+		val = cmb-&gt;function_pending_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_device_disconnect_time:</div><div class='del'>-		val = cmb.device_disconnect_time;</div><div class='add'>+		val = cmb-&gt;device_disconnect_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_control_unit_queuing_time:</div><div class='del'>-		val = cmb.control_unit_queuing_time;</div><div class='add'>+		val = cmb-&gt;control_unit_queuing_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_device_active_only_time:</div><div class='del'>-		val = cmb.device_active_only_time;</div><div class='add'>+		val = cmb-&gt;device_active_only_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	return time_to_avg_nsec(val, cmb.sample_count);</div><div class='add'>+	ret = time_to_avg_nsec(val, cmb-&gt;sample_count);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-readall_cmb (struct ccw_device *cdev, struct cmbdata *data)</div><div class='add'>+static int readall_cmb (struct ccw_device *cdev, struct cmbdata *data)</div><div class='ctx'> {</div><div class='del'>-	/* yes, we have to put it on the stack</div><div class='del'>-	 * because the cmb must only be accessed</div><div class='del'>-	 * atomically, e.g. with mvc */</div><div class='del'>-	struct cmb cmb;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct cmb *cmb;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='ctx'> 	u64 time;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = cmf_cmb_copy_wait(cdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='del'>-	if (!cdev-&gt;private-&gt;cmb) {</div><div class='del'>-		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	if (!cmb_data) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	cmb = *(struct cmb*)cdev-&gt;private-&gt;cmb;</div><div class='del'>-	time = get_clock() - cdev-&gt;private-&gt;cmb_start_time;</div><div class='del'>-	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	if (cmb_data-&gt;last_update == 0) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	cmb = cmb_data-&gt;last_block;</div><div class='add'>+	time = cmb_data-&gt;last_update - cdev-&gt;private-&gt;cmb_start_time;</div><div class='ctx'> </div><div class='ctx'> 	memset(data, 0, sizeof(struct cmbdata));</div><div class='ctx'> </div><div class='hunk'>@@ -538,31 +750,32 @@ readall_cmb (struct ccw_device *cdev, struct cmbdata *data)</div><div class='ctx'> 	data-&gt;elapsed_time = (time * 1000) &gt;&gt; 12;</div><div class='ctx'> </div><div class='ctx'> 	/* copy data to new structure */</div><div class='del'>-	data-&gt;ssch_rsch_count = cmb.ssch_rsch_count;</div><div class='del'>-	data-&gt;sample_count = cmb.sample_count;</div><div class='add'>+	data-&gt;ssch_rsch_count = cmb-&gt;ssch_rsch_count;</div><div class='add'>+	data-&gt;sample_count = cmb-&gt;sample_count;</div><div class='ctx'> </div><div class='ctx'> 	/* time fields are converted to nanoseconds while copying */</div><div class='del'>-	data-&gt;device_connect_time = time_to_nsec(cmb.device_connect_time);</div><div class='del'>-	data-&gt;function_pending_time = time_to_nsec(cmb.function_pending_time);</div><div class='del'>-	data-&gt;device_disconnect_time = time_to_nsec(cmb.device_disconnect_time);</div><div class='add'>+	data-&gt;device_connect_time = time_to_nsec(cmb-&gt;device_connect_time);</div><div class='add'>+	data-&gt;function_pending_time = time_to_nsec(cmb-&gt;function_pending_time);</div><div class='add'>+	data-&gt;device_disconnect_time =</div><div class='add'>+		time_to_nsec(cmb-&gt;device_disconnect_time);</div><div class='ctx'> 	data-&gt;control_unit_queuing_time</div><div class='del'>-		= time_to_nsec(cmb.control_unit_queuing_time);</div><div class='add'>+		= time_to_nsec(cmb-&gt;control_unit_queuing_time);</div><div class='ctx'> 	data-&gt;device_active_only_time</div><div class='del'>-		= time_to_nsec(cmb.device_active_only_time);</div><div class='add'>+		= time_to_nsec(cmb-&gt;device_active_only_time);</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void reset_cmb(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	cmf_generic_reset(cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-reset_cmb(struct ccw_device *cdev)</div><div class='add'>+static void * align_cmb(void *area)</div><div class='ctx'> {</div><div class='del'>-	struct cmb *cmb;</div><div class='del'>-	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='del'>-	cmb = cdev-&gt;private-&gt;cmb;</div><div class='del'>-	if (cmb)</div><div class='del'>-		memset (cmb, 0, sizeof (*cmb));</div><div class='del'>-	cdev-&gt;private-&gt;cmb_start_time = get_clock();</div><div class='del'>-	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	return area;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct attribute_group cmf_attr_group;</div><div class='hunk'>@@ -574,6 +787,7 @@ static struct cmb_operations cmbops_basic = {</div><div class='ctx'> 	.read	= read_cmb,</div><div class='ctx'> 	.readall    = readall_cmb,</div><div class='ctx'> 	.reset	    = reset_cmb,</div><div class='add'>+	.align	    = align_cmb,</div><div class='ctx'> 	.attr_group = &amp;cmf_attr_group,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -610,22 +824,34 @@ static inline struct cmbe* cmbe_align(struct cmbe *c)</div><div class='ctx'> 	return (struct cmbe*)addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-alloc_cmbe (struct ccw_device *cdev)</div><div class='add'>+static int alloc_cmbe (struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmbe *cmbe;</div><div class='del'>-	cmbe = kmalloc (sizeof (*cmbe) * 2, GFP_KERNEL);</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmbe = kzalloc (sizeof (*cmbe) * 2, GFP_KERNEL);</div><div class='ctx'> 	if (!cmbe)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='add'>+	cmb_data = kzalloc(sizeof(struct cmb_data), GFP_KERNEL);</div><div class='add'>+	if (!cmb_data) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	cmb_data-&gt;last_block = kzalloc(sizeof(struct cmbe), GFP_KERNEL);</div><div class='add'>+	if (!cmb_data-&gt;last_block) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	cmb_data-&gt;size = sizeof(struct cmbe);</div><div class='ctx'> 	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> 	if (cdev-&gt;private-&gt;cmb) {</div><div class='del'>-		kfree(cmbe);</div><div class='ctx'> 		spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	cdev-&gt;private-&gt;cmb = cmbe;</div><div class='add'>+	cmb_data-&gt;hw_block = cmbe;</div><div class='add'>+	cdev-&gt;private-&gt;cmb = cmb_data;</div><div class='ctx'> 	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> </div><div class='ctx'> 	/* activate global measurement if this is the first channel */</div><div class='hunk'>@@ -636,14 +862,24 @@ alloc_cmbe (struct ccw_device *cdev)</div><div class='ctx'> 	spin_unlock(&amp;cmb_area.lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+out_free:</div><div class='add'>+	if (cmb_data)</div><div class='add'>+		kfree(cmb_data-&gt;last_block);</div><div class='add'>+	kfree(cmb_data);</div><div class='add'>+	kfree(cmbe);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-free_cmbe (struct ccw_device *cdev)</div><div class='add'>+static void free_cmbe (struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='del'>-	kfree(cdev-&gt;private-&gt;cmb);</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='ctx'> 	cdev-&gt;private-&gt;cmb = NULL;</div><div class='add'>+	if (cmb_data)</div><div class='add'>+		kfree(cmb_data-&gt;last_block);</div><div class='add'>+	kfree(cmb_data);</div><div class='ctx'> 	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> </div><div class='ctx'> 	/* deactivate global measurement if this is the last channel */</div><div class='hunk'>@@ -654,89 +890,105 @@ free_cmbe (struct ccw_device *cdev)</div><div class='ctx'> 	spin_unlock(&amp;cmb_area.lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-set_cmbe(struct ccw_device *cdev, u32 mme)</div><div class='add'>+static int set_cmbe(struct ccw_device *cdev, u32 mme)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long mba;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!cdev-&gt;private-&gt;cmb)</div><div class='add'>+	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='add'>+	if (!cdev-&gt;private-&gt;cmb) {</div><div class='add'>+		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mba = mme ? (unsigned long) cmbe_align(cdev-&gt;private-&gt;cmb) : 0;</div><div class='add'>+	}</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	mba = mme ? (unsigned long) cmbe_align(cmb_data-&gt;hw_block) : 0;</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return set_schib_wait(cdev, mme, 1, mba);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-u64</div><div class='del'>-read_cmbe (struct ccw_device *cdev, int index)</div><div class='add'>+static u64 read_cmbe (struct ccw_device *cdev, int index)</div><div class='ctx'> {</div><div class='del'>-	/* yes, we have to put it on the stack</div><div class='del'>-	 * because the cmb must only be accessed</div><div class='del'>-	 * atomically, e.g. with mvc */</div><div class='del'>-	struct cmbe cmb;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct cmbe *cmb;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='ctx'> 	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='del'>-	if (!cdev-&gt;private-&gt;cmb) {</div><div class='del'>-		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	ret = cmf_cmb_copy_wait(cdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	cmb = *cmbe_align(cdev-&gt;private-&gt;cmb);</div><div class='del'>-	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	if (!cmb_data) {</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	cmb = cmb_data-&gt;last_block;</div><div class='ctx'> </div><div class='ctx'> 	switch (index) {</div><div class='ctx'> 	case cmb_ssch_rsch_count:</div><div class='del'>-		return cmb.ssch_rsch_count;</div><div class='add'>+		ret = cmb-&gt;ssch_rsch_count;</div><div class='add'>+		goto out;</div><div class='ctx'> 	case cmb_sample_count:</div><div class='del'>-		return cmb.sample_count;</div><div class='add'>+		ret = cmb-&gt;sample_count;</div><div class='add'>+		goto out;</div><div class='ctx'> 	case cmb_device_connect_time:</div><div class='del'>-		val = cmb.device_connect_time;</div><div class='add'>+		val = cmb-&gt;device_connect_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_function_pending_time:</div><div class='del'>-		val = cmb.function_pending_time;</div><div class='add'>+		val = cmb-&gt;function_pending_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_device_disconnect_time:</div><div class='del'>-		val = cmb.device_disconnect_time;</div><div class='add'>+		val = cmb-&gt;device_disconnect_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_control_unit_queuing_time:</div><div class='del'>-		val = cmb.control_unit_queuing_time;</div><div class='add'>+		val = cmb-&gt;control_unit_queuing_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_device_active_only_time:</div><div class='del'>-		val = cmb.device_active_only_time;</div><div class='add'>+		val = cmb-&gt;device_active_only_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_device_busy_time:</div><div class='del'>-		val = cmb.device_busy_time;</div><div class='add'>+		val = cmb-&gt;device_busy_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case cmb_initial_command_response_time:</div><div class='del'>-		val = cmb.initial_command_response_time;</div><div class='add'>+		val = cmb-&gt;initial_command_response_time;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return 0;</div><div class='add'>+		ret = 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	return time_to_avg_nsec(val, cmb.sample_count);</div><div class='add'>+	ret = time_to_avg_nsec(val, cmb-&gt;sample_count);</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-readall_cmbe (struct ccw_device *cdev, struct cmbdata *data)</div><div class='add'>+static int readall_cmbe (struct ccw_device *cdev, struct cmbdata *data)</div><div class='ctx'> {</div><div class='del'>-	/* yes, we have to put it on the stack</div><div class='del'>-	 * because the cmb must only be accessed</div><div class='del'>-	 * atomically, e.g. with mvc */</div><div class='del'>-	struct cmbe cmb;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct cmbe *cmb;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='ctx'> 	u64 time;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = cmf_cmb_copy_wait(cdev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	spin_lock_irqsave(cdev-&gt;ccwlock, flags);</div><div class='del'>-	if (!cdev-&gt;private-&gt;cmb) {</div><div class='del'>-		spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	if (!cmb_data) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	cmb = *cmbe_align(cdev-&gt;private-&gt;cmb);</div><div class='del'>-	time = get_clock() - cdev-&gt;private-&gt;cmb_start_time;</div><div class='del'>-	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	if (cmb_data-&gt;last_update == 0) {</div><div class='add'>+		ret = -EAGAIN;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	time = cmb_data-&gt;last_update - cdev-&gt;private-&gt;cmb_start_time;</div><div class='ctx'> </div><div class='ctx'> 	memset (data, 0, sizeof(struct cmbdata));</div><div class='ctx'> </div><div class='hunk'>@@ -746,35 +998,38 @@ readall_cmbe (struct ccw_device *cdev, struct cmbdata *data)</div><div class='ctx'> 	/* conver to nanoseconds */</div><div class='ctx'> 	data-&gt;elapsed_time = (time * 1000) &gt;&gt; 12;</div><div class='ctx'> </div><div class='add'>+	cmb = cmb_data-&gt;last_block;</div><div class='ctx'> 	/* copy data to new structure */</div><div class='del'>-	data-&gt;ssch_rsch_count = cmb.ssch_rsch_count;</div><div class='del'>-	data-&gt;sample_count = cmb.sample_count;</div><div class='add'>+	data-&gt;ssch_rsch_count = cmb-&gt;ssch_rsch_count;</div><div class='add'>+	data-&gt;sample_count = cmb-&gt;sample_count;</div><div class='ctx'> </div><div class='ctx'> 	/* time fields are converted to nanoseconds while copying */</div><div class='del'>-	data-&gt;device_connect_time = time_to_nsec(cmb.device_connect_time);</div><div class='del'>-	data-&gt;function_pending_time = time_to_nsec(cmb.function_pending_time);</div><div class='del'>-	data-&gt;device_disconnect_time = time_to_nsec(cmb.device_disconnect_time);</div><div class='add'>+	data-&gt;device_connect_time = time_to_nsec(cmb-&gt;device_connect_time);</div><div class='add'>+	data-&gt;function_pending_time = time_to_nsec(cmb-&gt;function_pending_time);</div><div class='add'>+	data-&gt;device_disconnect_time =</div><div class='add'>+		time_to_nsec(cmb-&gt;device_disconnect_time);</div><div class='ctx'> 	data-&gt;control_unit_queuing_time</div><div class='del'>-		= time_to_nsec(cmb.control_unit_queuing_time);</div><div class='add'>+		= time_to_nsec(cmb-&gt;control_unit_queuing_time);</div><div class='ctx'> 	data-&gt;device_active_only_time</div><div class='del'>-		= time_to_nsec(cmb.device_active_only_time);</div><div class='del'>-	data-&gt;device_busy_time = time_to_nsec(cmb.device_busy_time);</div><div class='add'>+		= time_to_nsec(cmb-&gt;device_active_only_time);</div><div class='add'>+	data-&gt;device_busy_time = time_to_nsec(cmb-&gt;device_busy_time);</div><div class='ctx'> 	data-&gt;initial_command_response_time</div><div class='del'>-		= time_to_nsec(cmb.initial_command_response_time);</div><div class='add'>+		= time_to_nsec(cmb-&gt;initial_command_response_time);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ret = 0;</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_irqrestore(cdev-&gt;ccwlock, flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-reset_cmbe(struct ccw_device *cdev)</div><div class='add'>+static void reset_cmbe(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='del'>-	struct cmbe *cmb;</div><div class='del'>-	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='del'>-	cmb = cmbe_align(cdev-&gt;private-&gt;cmb);</div><div class='del'>-	if (cmb)</div><div class='del'>-		memset (cmb, 0, sizeof (*cmb));</div><div class='del'>-	cdev-&gt;private-&gt;cmb_start_time = get_clock();</div><div class='del'>-	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	cmf_generic_reset(cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void * align_cmbe(void *area)</div><div class='add'>+{</div><div class='add'>+	return cmbe_align(area);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct attribute_group cmf_attr_group_ext;</div><div class='hunk'>@@ -786,6 +1041,7 @@ static struct cmb_operations cmbops_extended = {</div><div class='ctx'> 	.read	    = read_cmbe,</div><div class='ctx'> 	.readall    = readall_cmbe,</div><div class='ctx'> 	.reset	    = reset_cmbe,</div><div class='add'>+	.align	    = align_cmbe,</div><div class='ctx'> 	.attr_group = &amp;cmf_attr_group_ext,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -803,14 +1059,19 @@ cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 	struct ccw_device *cdev;</div><div class='ctx'> 	long interval;</div><div class='ctx'> 	unsigned long count;</div><div class='add'>+	struct cmb_data *cmb_data;</div><div class='ctx'> </div><div class='ctx'> 	cdev = to_ccwdev(dev);</div><div class='del'>-	interval  = get_clock() - cdev-&gt;private-&gt;cmb_start_time;</div><div class='ctx'> 	count = cmf_read(cdev, cmb_sample_count);</div><div class='del'>-	if (count)</div><div class='add'>+	spin_lock_irq(cdev-&gt;ccwlock);</div><div class='add'>+	cmb_data = cdev-&gt;private-&gt;cmb;</div><div class='add'>+	if (count) {</div><div class='add'>+		interval = cmb_data-&gt;last_update -</div><div class='add'>+			cdev-&gt;private-&gt;cmb_start_time;</div><div class='ctx'> 		interval /= count;</div><div class='del'>-	else</div><div class='add'>+	} else</div><div class='ctx'> 		interval = -1;</div><div class='add'>+	spin_unlock_irq(cdev-&gt;ccwlock);</div><div class='ctx'> 	return sprintf(buf, "%ld\n", interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -823,7 +1084,10 @@ cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = cmf_readall(to_ccwdev(dev), &amp;data);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret == -EAGAIN || ret == -ENODEV)</div><div class='add'>+		/* No data (yet/currently) available to use for calculation. */</div><div class='add'>+		return sprintf(buf, "n/a\n");</div><div class='add'>+	else if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	utilization = data.device_connect_time +</div><div class='hunk'>@@ -876,7 +1140,7 @@ static struct attribute *cmf_attributes[] = {</div><div class='ctx'> 	&amp;dev_attr_avg_device_disconnect_time.attr,</div><div class='ctx'> 	&amp;dev_attr_avg_control_unit_queuing_time.attr,</div><div class='ctx'> 	&amp;dev_attr_avg_device_active_only_time.attr,</div><div class='del'>-	0,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct attribute_group cmf_attr_group = {</div><div class='hunk'>@@ -896,7 +1160,7 @@ static struct attribute *cmf_attributes_ext[] = {</div><div class='ctx'> 	&amp;dev_attr_avg_device_active_only_time.attr,</div><div class='ctx'> 	&amp;dev_attr_avg_device_busy_time.attr,</div><div class='ctx'> 	&amp;dev_attr_avg_initial_command_response_time.attr,</div><div class='del'>-	0,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct attribute_group cmf_attr_group_ext = {</div><div class='hunk'>@@ -982,6 +1246,13 @@ cmf_readall(struct ccw_device *cdev, struct cmbdata *data)</div><div class='ctx'> 	return cmbops-&gt;readall(cdev, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Reenable cmf when a disconnected device becomes available again. */</div><div class='add'>+int cmf_reenable(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	cmbops-&gt;reset(cdev);</div><div class='add'>+	return cmbops-&gt;set(cdev, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init</div><div class='ctx'> init_cmf(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c<br/>index 74ea8aac4b7d..13eeea3d547f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/css.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/css.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/css.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/css.c</a></div><div class='hunk'>@@ -19,9 +19,11 @@</div><div class='ctx'> #include "cio_debug.h"</div><div class='ctx'> #include "ioasm.h"</div><div class='ctx'> #include "chsc.h"</div><div class='add'>+#include "device.h"</div><div class='ctx'> </div><div class='ctx'> int need_rescan = 0;</div><div class='ctx'> int css_init_done = 0;</div><div class='add'>+static int need_reprobe = 0;</div><div class='ctx'> static int max_ssid = 0;</div><div class='ctx'> </div><div class='ctx'> struct channel_subsystem *css[__MAX_CSSID + 1];</div><div class='hunk'>@@ -106,6 +108,24 @@ css_subchannel_release(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> extern int css_get_ssd_info(struct subchannel *sch);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+int css_sch_device_register(struct subchannel *sch)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sch-&gt;reg_mutex);</div><div class='add'>+	ret = device_register(&amp;sch-&gt;dev);</div><div class='add'>+	mutex_unlock(&amp;sch-&gt;reg_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void css_sch_device_unregister(struct subchannel *sch)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;sch-&gt;reg_mutex);</div><div class='add'>+	device_unregister(&amp;sch-&gt;dev);</div><div class='add'>+	mutex_unlock(&amp;sch-&gt;reg_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> css_register_subchannel(struct subchannel *sch)</div><div class='ctx'> {</div><div class='hunk'>@@ -117,7 +137,7 @@ css_register_subchannel(struct subchannel *sch)</div><div class='ctx'> 	sch-&gt;dev.release = &amp;css_subchannel_release;</div><div class='ctx'> 	</div><div class='ctx'> 	/* make it known to the system */</div><div class='del'>-	ret = device_register(&amp;sch-&gt;dev);</div><div class='add'>+	ret = css_sch_device_register(sch);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		printk (KERN_WARNING "%s: could not register %s\n",</div><div class='ctx'> 			__func__, sch-&gt;dev.bus_id);</div><div class='hunk'>@@ -248,7 +268,7 @@ css_evaluate_subchannel(struct subchannel_id schid, int slow)</div><div class='ctx'> 		 * The device will be killed automatically.</div><div class='ctx'> 		 */</div><div class='ctx'> 		cio_disable_subchannel(sch);</div><div class='del'>-		device_unregister(&amp;sch-&gt;dev);</div><div class='add'>+		css_sch_device_unregister(sch);</div><div class='ctx'> 		/* Reset intparm to zeroes. */</div><div class='ctx'> 		sch-&gt;schib.pmcw.intparm = 0;</div><div class='ctx'> 		cio_modify(sch);</div><div class='hunk'>@@ -262,7 +282,7 @@ css_evaluate_subchannel(struct subchannel_id schid, int slow)</div><div class='ctx'> 		 * away in any case.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!disc) {</div><div class='del'>-			device_unregister(&amp;sch-&gt;dev);</div><div class='add'>+			css_sch_device_unregister(sch);</div><div class='ctx'> 			/* Reset intparm to zeroes. */</div><div class='ctx'> 			sch-&gt;schib.pmcw.intparm = 0;</div><div class='ctx'> 			cio_modify(sch);</div><div class='hunk'>@@ -339,6 +359,67 @@ typedef void (*workfunc)(void *);</div><div class='ctx'> DECLARE_WORK(slow_path_work, (workfunc)css_trigger_slow_path, NULL);</div><div class='ctx'> struct workqueue_struct *slow_path_wq;</div><div class='ctx'> </div><div class='add'>+/* Reprobe subchannel if unregistered. */</div><div class='add'>+static int reprobe_subchannel(struct subchannel_id schid, void *data)</div><div class='add'>+{</div><div class='add'>+	struct subchannel *sch;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	CIO_DEBUG(KERN_INFO, 6, "cio: reprobe 0.%x.%04x\n",</div><div class='add'>+		  schid.ssid, schid.sch_no);</div><div class='add'>+	if (need_reprobe)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	sch = get_subchannel_by_schid(schid);</div><div class='add'>+	if (sch) {</div><div class='add'>+		/* Already known. */</div><div class='add'>+		put_device(&amp;sch-&gt;dev);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = css_probe_device(schid);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case -ENXIO:</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+		/* These should abort looping */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Work function used to reprobe all unregistered subchannels. */</div><div class='add'>+static void reprobe_all(void *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	CIO_MSG_EVENT(2, "reprobe start\n");</div><div class='add'>+</div><div class='add'>+	need_reprobe = 0;</div><div class='add'>+	/* Make sure initial subchannel scan is done. */</div><div class='add'>+	wait_event(ccw_device_init_wq,</div><div class='add'>+		   atomic_read(&amp;ccw_device_init_count) == 0);</div><div class='add'>+	ret = for_each_subchannel(reprobe_subchannel, NULL);</div><div class='add'>+</div><div class='add'>+	CIO_MSG_EVENT(2, "reprobe done (rc=%d, need_reprobe=%d)\n", ret,</div><div class='add'>+		      need_reprobe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DECLARE_WORK(css_reprobe_work, reprobe_all, NULL);</div><div class='add'>+</div><div class='add'>+/* Schedule reprobing of all unregistered subchannels. */</div><div class='add'>+void css_schedule_reprobe(void)</div><div class='add'>+{</div><div class='add'>+	need_reprobe = 1;</div><div class='add'>+	queue_work(ccw_device_work, &amp;css_reprobe_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(css_schedule_reprobe);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Rescan for new devices. FIXME: This is slow.</div><div class='ctx'>  * This function is called when we have lost CRWs due to overflows and we have</div><div class='hunk'>@@ -542,9 +623,13 @@ init_channel_subsystem (void)</div><div class='ctx'> 		ret = device_register(&amp;css[i]-&gt;device);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out_free;</div><div class='del'>-		if (css_characteristics_avail &amp;&amp; css_chsc_characteristics.secm)</div><div class='del'>-			device_create_file(&amp;css[i]-&gt;device,</div><div class='del'>-					   &amp;dev_attr_cm_enable);</div><div class='add'>+		if (css_characteristics_avail &amp;&amp;</div><div class='add'>+		    css_chsc_characteristics.secm) {</div><div class='add'>+			ret = device_create_file(&amp;css[i]-&gt;device,</div><div class='add'>+						 &amp;dev_attr_cm_enable);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_device;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	css_init_done = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -552,6 +637,8 @@ init_channel_subsystem (void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_subchannel(__init_channel_subsystem, NULL);</div><div class='ctx'> 	return 0;</div><div class='add'>+out_device:</div><div class='add'>+	device_unregister(&amp;css[i]-&gt;device);</div><div class='ctx'> out_free:</div><div class='ctx'> 	kfree(css[i]);</div><div class='ctx'> out_unregister:</div><div class='head'>diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h<br/>index 74a257b23383..8aabb4adeb5f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/css.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/css.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/css.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/css.h</a></div><div class='hunk'>@@ -45,11 +45,11 @@ struct pgid {</div><div class='ctx'> 	union {</div><div class='ctx'> 		__u8 fc;   	/* SPID function code */</div><div class='ctx'> 		struct path_state ps;	/* SNID path state */</div><div class='del'>-	} inf;</div><div class='add'>+	} __attribute__ ((packed)) inf;</div><div class='ctx'> 	union {</div><div class='ctx'> 		__u32 cpu_addr	: 16;	/* CPU address */</div><div class='ctx'> 		struct extended_cssid ext_cssid;</div><div class='del'>-	} pgid_high;</div><div class='add'>+	} __attribute__ ((packed)) pgid_high;</div><div class='ctx'> 	__u32 cpu_id	: 24;	/* CPU identification */</div><div class='ctx'> 	__u32 cpu_model : 16;	/* CPU model */</div><div class='ctx'> 	__u32 tod_high;		/* high word TOD clock */</div><div class='hunk'>@@ -100,7 +100,7 @@ struct ccw_device_private {</div><div class='ctx'> 	struct qdio_irq *qdio_data;</div><div class='ctx'> 	struct irb irb;		/* device status */</div><div class='ctx'> 	struct senseid senseid;	/* SenseID info */</div><div class='del'>-	struct pgid pgid;	/* path group ID */</div><div class='add'>+	struct pgid pgid[8];	/* path group IDs per chpid*/</div><div class='ctx'> 	struct ccw1 iccws[2];	/* ccws for SNID/SID/SPGID commands */</div><div class='ctx'> 	struct work_struct kick_work;</div><div class='ctx'> 	wait_queue_head_t wait_q;</div><div class='hunk'>@@ -136,6 +136,8 @@ extern struct bus_type css_bus_type;</div><div class='ctx'> extern struct css_driver io_subchannel_driver;</div><div class='ctx'> </div><div class='ctx'> extern int css_probe_device(struct subchannel_id);</div><div class='add'>+extern int css_sch_device_register(struct subchannel *);</div><div class='add'>+extern void css_sch_device_unregister(struct subchannel *);</div><div class='ctx'> extern struct subchannel * get_subchannel_by_schid(struct subchannel_id);</div><div class='ctx'> extern int css_init_done;</div><div class='ctx'> extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *);</div><div class='head'>diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c<br/>index 8e3053c2a451..585fa04233c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *		 Cornelia Huck (cornelia.huck@de.ibm.com)</div><div class='ctx'>  *		 Martin Schwidefsky (schwidefsky@de.ibm.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -101,7 +100,7 @@ ccw_uevent (struct device *dev, char **envp, int num_envp,</div><div class='ctx'> 	if ((buffer_size - length &lt;= 0) || (i &gt;= num_envp))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	envp[i] = 0;</div><div class='add'>+	envp[i] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -133,8 +132,8 @@ struct css_driver io_subchannel_driver = {</div><div class='ctx'> </div><div class='ctx'> struct workqueue_struct *ccw_device_work;</div><div class='ctx'> struct workqueue_struct *ccw_device_notify_work;</div><div class='del'>-static wait_queue_head_t ccw_device_init_wq;</div><div class='del'>-static atomic_t ccw_device_init_count;</div><div class='add'>+wait_queue_head_t ccw_device_init_wq;</div><div class='add'>+atomic_t ccw_device_init_count;</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> init_ccw_bus_type (void)</div><div class='hunk'>@@ -281,7 +280,7 @@ ccw_device_remove_disconnected(struct ccw_device *cdev)</div><div class='ctx'> 	 * 'throw away device'.</div><div class='ctx'> 	 */</div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='del'>-	device_unregister(&amp;sch-&gt;dev);</div><div class='add'>+	css_sch_device_unregister(sch);</div><div class='ctx'> 	/* Reset intparm to zeroes. */</div><div class='ctx'> 	sch-&gt;schib.pmcw.intparm = 0;</div><div class='ctx'> 	cio_modify(sch);</div><div class='hunk'>@@ -626,7 +625,7 @@ ccw_device_do_unreg_rereg(void *data)</div><div class='ctx'> 					other_sch-&gt;schib.pmcw.intparm = 0;</div><div class='ctx'> 					cio_modify(other_sch);</div><div class='ctx'> 				}</div><div class='del'>-				device_unregister(&amp;other_sch-&gt;dev);</div><div class='add'>+				css_sch_device_unregister(other_sch);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Update ssd info here. */</div><div class='hunk'>@@ -710,7 +709,7 @@ ccw_device_call_sch_unregister(void *data)</div><div class='ctx'> 	struct subchannel *sch;</div><div class='ctx'> </div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='del'>-	device_unregister(&amp;sch-&gt;dev);</div><div class='add'>+	css_sch_device_unregister(sch);</div><div class='ctx'> 	/* Reset intparm to zeroes. */</div><div class='ctx'> 	sch-&gt;schib.pmcw.intparm = 0;</div><div class='ctx'> 	cio_modify(sch);</div><div class='hunk'>@@ -1058,7 +1057,7 @@ get_ccwdev_by_busid(struct ccw_driver *cdrv, const char *bus_id)</div><div class='ctx'> 				 __ccwdev_check_busid);</div><div class='ctx'> 	put_driver(drv);</div><div class='ctx'> </div><div class='del'>-	return dev ? to_ccwdev(dev) : 0;</div><div class='add'>+	return dev ? to_ccwdev(dev) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /************************** device driver handling ************************/</div><div class='hunk'>@@ -1083,7 +1082,7 @@ ccw_device_probe (struct device *dev)</div><div class='ctx'> 	ret = cdrv-&gt;probe ? cdrv-&gt;probe(cdev) : -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		cdev-&gt;drv = 0;</div><div class='add'>+		cdev-&gt;drv = NULL;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1114,7 +1113,7 @@ ccw_device_remove (struct device *dev)</div><div class='ctx'> 				 ret, cdev-&gt;dev.bus_id);</div><div class='ctx'> 	}</div><div class='ctx'> 	ccw_device_set_timeout(cdev, 0);</div><div class='del'>-	cdev-&gt;drv = 0;</div><div class='add'>+	cdev-&gt;drv = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h<br/>index 11587ebb7289..00be9a5b4acd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device.h</a></div><div class='hunk'>@@ -1,6 +1,10 @@</div><div class='ctx'> #ifndef S390_DEVICE_H</div><div class='ctx'> #define S390_DEVICE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;asm/ccwdev.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * states of the device statemachine</div><div class='ctx'>  */</div><div class='hunk'>@@ -23,6 +27,7 @@ enum dev_state {</div><div class='ctx'> 	DEV_STATE_DISCONNECTED,</div><div class='ctx'> 	DEV_STATE_DISCONNECTED_SENSE_ID,</div><div class='ctx'> 	DEV_STATE_CMFCHANGE,</div><div class='add'>+	DEV_STATE_CMFUPDATE,</div><div class='ctx'> 	/* last element! */</div><div class='ctx'> 	NR_DEV_STATES</div><div class='ctx'> };</div><div class='hunk'>@@ -67,6 +72,8 @@ dev_fsm_final_state(struct ccw_device *cdev)</div><div class='ctx'> </div><div class='ctx'> extern struct workqueue_struct *ccw_device_work;</div><div class='ctx'> extern struct workqueue_struct *ccw_device_notify_work;</div><div class='add'>+extern wait_queue_head_t ccw_device_init_wq;</div><div class='add'>+extern atomic_t ccw_device_init_count;</div><div class='ctx'> </div><div class='ctx'> void io_subchannel_recog_done(struct ccw_device *cdev);</div><div class='ctx'> </div><div class='hunk'>@@ -112,5 +119,8 @@ int ccw_device_stlck(struct ccw_device *);</div><div class='ctx'> void ccw_device_set_timeout(struct ccw_device *, int);</div><div class='ctx'> extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);</div><div class='ctx'> </div><div class='add'>+/* Channel measurement facility related */</div><div class='ctx'> void retry_set_schib(struct ccw_device *cdev);</div><div class='add'>+void cmf_retry_copy_block(struct ccw_device *);</div><div class='add'>+int cmf_reenable(struct ccw_device *);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c<br/>index 180b3bf8b90d..ac6e0c7e43d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_fsm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_fsm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_fsm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device_fsm.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -336,8 +335,11 @@ ccw_device_oper_notify(void *data)</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		/* Driver doesn't want device back. */</div><div class='ctx'> 		ccw_device_do_unreg_rereg((void *)cdev);</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='add'>+		/* Reenable channel measurements, if needed. */</div><div class='add'>+		cmf_reenable(cdev);</div><div class='ctx'> 		wake_up(&amp;cdev-&gt;private-&gt;wait_q);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -376,6 +378,56 @@ ccw_device_done(struct ccw_device *cdev, int state)</div><div class='ctx'> 		put_device (&amp;cdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int cmp_pgid(struct pgid *p1, struct pgid *p2)</div><div class='add'>+{</div><div class='add'>+	char *c1;</div><div class='add'>+	char *c2;</div><div class='add'>+</div><div class='add'>+	c1 = (char *)p1;</div><div class='add'>+	c2 = (char *)p2;</div><div class='add'>+</div><div class='add'>+	return memcmp(c1 + 1, c2 + 1, sizeof(struct pgid) - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ccw_device_get_common_pgid(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int last;</div><div class='add'>+</div><div class='add'>+	last = 0;</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (cdev-&gt;private-&gt;pgid[i].inf.ps.state1 == SNID_STATE1_RESET)</div><div class='add'>+			/* No PGID yet */</div><div class='add'>+			continue;</div><div class='add'>+		if (cdev-&gt;private-&gt;pgid[last].inf.ps.state1 ==</div><div class='add'>+		    SNID_STATE1_RESET) {</div><div class='add'>+			/* First non-zero PGID */</div><div class='add'>+			last = i;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (cmp_pgid(&amp;cdev-&gt;private-&gt;pgid[i],</div><div class='add'>+			     &amp;cdev-&gt;private-&gt;pgid[last]) == 0)</div><div class='add'>+			/* Non-conflicting PGIDs */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* PGID mismatch, can't pathgroup. */</div><div class='add'>+		CIO_MSG_EVENT(0, "SNID - pgid mismatch for device "</div><div class='add'>+			      "0.%x.%04x, can't pathgroup\n",</div><div class='add'>+			      cdev-&gt;private-&gt;ssid, cdev-&gt;private-&gt;devno);</div><div class='add'>+		cdev-&gt;private-&gt;options.pgroup = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (cdev-&gt;private-&gt;pgid[last].inf.ps.state1 ==</div><div class='add'>+	    SNID_STATE1_RESET)</div><div class='add'>+		/* No previous pgid found */</div><div class='add'>+		memcpy(&amp;cdev-&gt;private-&gt;pgid[0], &amp;css[0]-&gt;global_pgid,</div><div class='add'>+		       sizeof(struct pgid));</div><div class='add'>+	else</div><div class='add'>+		/* Use existing pgid */</div><div class='add'>+		memcpy(&amp;cdev-&gt;private-&gt;pgid[0], &amp;cdev-&gt;private-&gt;pgid[last],</div><div class='add'>+		       sizeof(struct pgid));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Function called from device_pgid.c after sense path ground has completed.</div><div class='ctx'>  */</div><div class='hunk'>@@ -386,24 +438,26 @@ ccw_device_sense_pgid_done(struct ccw_device *cdev, int err)</div><div class='ctx'> </div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='ctx'> 	switch (err) {</div><div class='del'>-	case 0:</div><div class='del'>-		/* Start Path Group verification. */</div><div class='del'>-		sch-&gt;vpm = 0;	/* Start with no path groups set. */</div><div class='del'>-		cdev-&gt;private-&gt;state = DEV_STATE_VERIFY;</div><div class='del'>-		ccw_device_verify_start(cdev);</div><div class='add'>+	case -EOPNOTSUPP: /* path grouping not supported, use nop instead. */</div><div class='add'>+		cdev-&gt;private-&gt;options.pgroup = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 0: /* success */</div><div class='add'>+	case -EACCES: /* partial success, some paths not operational */</div><div class='add'>+		/* Check if all pgids are equal or 0. */</div><div class='add'>+		__ccw_device_get_common_pgid(cdev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ETIME:		/* Sense path group id stopped by timeout. */</div><div class='ctx'> 	case -EUSERS:		/* device is reserved for someone else. */</div><div class='ctx'> 		ccw_device_done(cdev, DEV_STATE_BOXED);</div><div class='del'>-		break;</div><div class='del'>-	case -EOPNOTSUPP: /* path grouping not supported, just set online. */</div><div class='del'>-		cdev-&gt;private-&gt;options.pgroup = 0;</div><div class='del'>-		ccw_device_done(cdev, DEV_STATE_ONLINE);</div><div class='del'>-		break;</div><div class='add'>+		return;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ccw_device_done(cdev, DEV_STATE_NOT_OPER);</div><div class='del'>-		break;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+	/* Start Path Group verification. */</div><div class='add'>+	sch-&gt;vpm = 0;	/* Start with no path groups set. */</div><div class='add'>+	cdev-&gt;private-&gt;state = DEV_STATE_VERIFY;</div><div class='add'>+	ccw_device_verify_start(cdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -560,8 +614,9 @@ ccw_device_online(struct ccw_device *cdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Do we want to do path grouping? */</div><div class='ctx'> 	if (!cdev-&gt;private-&gt;options.pgroup) {</div><div class='del'>-		/* No, set state online immediately. */</div><div class='del'>-		ccw_device_done(cdev, DEV_STATE_ONLINE);</div><div class='add'>+		/* Start initial path verification. */</div><div class='add'>+		cdev-&gt;private-&gt;state = DEV_STATE_VERIFY;</div><div class='add'>+		ccw_device_verify_start(cdev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Do a SensePGID first. */</div><div class='hunk'>@@ -607,6 +662,7 @@ ccw_device_offline(struct ccw_device *cdev)</div><div class='ctx'> 	/* Are we doing path grouping? */</div><div class='ctx'> 	if (!cdev-&gt;private-&gt;options.pgroup) {</div><div class='ctx'> 		/* No, set state offline immediately. */</div><div class='add'>+		sch-&gt;vpm = 0;</div><div class='ctx'> 		ccw_device_done(cdev, DEV_STATE_OFFLINE);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -703,8 +759,6 @@ ccw_device_online_verify(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> {</div><div class='ctx'> 	struct subchannel *sch;</div><div class='ctx'> </div><div class='del'>-	if (!cdev-&gt;private-&gt;options.pgroup)</div><div class='del'>-		return;</div><div class='ctx'> 	if (cdev-&gt;private-&gt;state == DEV_STATE_W4SENSE) {</div><div class='ctx'> 		cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -749,7 +803,7 @@ ccw_device_irq(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 			/* Unit check but no sense data. Need basic sense. */</div><div class='ctx'> 			if (ccw_device_do_sense(cdev, irb) != 0)</div><div class='ctx'> 				goto call_handler_unsol;</div><div class='del'>-			memcpy(irb, &amp;cdev-&gt;private-&gt;irb, sizeof(struct irb));</div><div class='add'>+			memcpy(&amp;cdev-&gt;private-&gt;irb, irb, sizeof(struct irb));</div><div class='ctx'> 			cdev-&gt;private-&gt;state = DEV_STATE_W4SENSE;</div><div class='ctx'> 			cdev-&gt;private-&gt;intparm = 0;</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -861,6 +915,8 @@ ccw_device_clear_verify(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 	irb = (struct irb *) __LC_IRB;</div><div class='ctx'> 	/* Accumulate status. We don't do basic sense. */</div><div class='ctx'> 	ccw_device_accumulate_irb(cdev, irb);</div><div class='add'>+	/* Remember to clear irb to avoid residuals. */</div><div class='add'>+	memset(&amp;cdev-&gt;private-&gt;irb, 0, sizeof(struct irb));</div><div class='ctx'> 	/* Try to start delayed device verification. */</div><div class='ctx'> 	ccw_device_online_verify(cdev, 0);</div><div class='ctx'> 	/* Note: Don't call handler for cio initiated clear! */</div><div class='hunk'>@@ -991,8 +1047,7 @@ static void</div><div class='ctx'> ccw_device_wait4io_verify(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> {</div><div class='ctx'> 	/* When the I/O has terminated, we have to start verification. */</div><div class='del'>-	if (cdev-&gt;private-&gt;options.pgroup)</div><div class='del'>-		cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='add'>+	cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1093,6 +1148,13 @@ ccw_device_change_cmfstate(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 	dev_fsm_event(cdev, dev_event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ccw_device_update_cmfblock(struct ccw_device *cdev,</div><div class='add'>+				       enum dev_event dev_event)</div><div class='add'>+{</div><div class='add'>+	cmf_retry_copy_block(cdev);</div><div class='add'>+	cdev-&gt;private-&gt;state = DEV_STATE_ONLINE;</div><div class='add'>+	dev_fsm_event(cdev, dev_event);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> ccw_device_quiesce_done(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='hunk'>@@ -1247,6 +1309,12 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {</div><div class='ctx'> 		[DEV_EVENT_TIMEOUT]	= ccw_device_change_cmfstate,</div><div class='ctx'> 		[DEV_EVENT_VERIFY]	= ccw_device_change_cmfstate,</div><div class='ctx'> 	},</div><div class='add'>+	[DEV_STATE_CMFUPDATE] = {</div><div class='add'>+		[DEV_EVENT_NOTOPER]	= ccw_device_update_cmfblock,</div><div class='add'>+		[DEV_EVENT_INTERRUPT]	= ccw_device_update_cmfblock,</div><div class='add'>+		[DEV_EVENT_TIMEOUT]	= ccw_device_update_cmfblock,</div><div class='add'>+		[DEV_EVENT_VERIFY]	= ccw_device_update_cmfblock,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c<br/>index e60b2d8103b8..438db483035d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_id.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_id.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_id.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device_id.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ccwdev.h&gt;</div><div class='head'>diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c<br/>index 795abb5a65ba..a60124264bee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_ops.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_ops.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_ops.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device_ops.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)</div><div class='ctx'>  *               Cornelia Huck (cornelia.huck@de.ibm.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -78,7 +77,8 @@ ccw_device_start_key(struct ccw_device *cdev, struct ccw1 *cpa,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	if (cdev-&gt;private-&gt;state == DEV_STATE_NOT_OPER)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	if (cdev-&gt;private-&gt;state == DEV_STATE_VERIFY) {</div><div class='add'>+	if (cdev-&gt;private-&gt;state == DEV_STATE_VERIFY ||</div><div class='add'>+	    cdev-&gt;private-&gt;state == DEV_STATE_CLEAR_VERIFY) {</div><div class='ctx'> 		/* Remember to fake irb when finished. */</div><div class='ctx'> 		if (!cdev-&gt;private-&gt;flags.fake_irb) {</div><div class='ctx'> 			cdev-&gt;private-&gt;flags.fake_irb = 1;</div><div class='hunk'>@@ -270,7 +270,8 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb)</div><div class='ctx'> 		 * We didn't get channel end / device end. Check if path</div><div class='ctx'> 		 * verification has been started; we can retry after it has</div><div class='ctx'> 		 * finished. We also retry unit checks except for command reject</div><div class='del'>-		 * or intervention required.</div><div class='add'>+		 * or intervention required. Also check for long busy</div><div class='add'>+		 * conditions.</div><div class='ctx'> 		 */</div><div class='ctx'> 		 if (cdev-&gt;private-&gt;flags.doverify ||</div><div class='ctx'> 			 cdev-&gt;private-&gt;state == DEV_STATE_VERIFY)</div><div class='hunk'>@@ -279,6 +280,10 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb)</div><div class='ctx'> 		     !(irb-&gt;ecw[0] &amp;</div><div class='ctx'> 		       (SNS0_CMD_REJECT | SNS0_INTERVENTION_REQ)))</div><div class='ctx'> 			 cdev-&gt;private-&gt;intparm = -EAGAIN;</div><div class='add'>+		else if ((irb-&gt;scsw.dstat &amp; DEV_STAT_ATTENTION) &amp;&amp;</div><div class='add'>+			 (irb-&gt;scsw.dstat &amp; DEV_STAT_DEV_END) &amp;&amp;</div><div class='add'>+			 (irb-&gt;scsw.dstat &amp; DEV_STAT_UNIT_EXCEP))</div><div class='add'>+			cdev-&gt;private-&gt;intparm = -EAGAIN;</div><div class='ctx'> 		 else</div><div class='ctx'> 			 cdev-&gt;private-&gt;intparm = -EIO;</div><div class='ctx'> 			 </div><div class='head'>diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c<br/>index 85b1020a1fcc..32610fd8868e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_pgid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_pgid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_pgid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device_pgid.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Path Group ID functions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -34,12 +33,17 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)</div><div class='ctx'> 	struct subchannel *sch;</div><div class='ctx'> 	struct ccw1 *ccw;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='add'>+	/* Return if we already checked on all paths. */</div><div class='add'>+	if (cdev-&gt;private-&gt;imask == 0)</div><div class='add'>+		return (sch-&gt;lpm == 0) ? -ENODEV : -EACCES;</div><div class='add'>+	i = 8 - ffs(cdev-&gt;private-&gt;imask);</div><div class='add'>+</div><div class='ctx'> 	/* Setup sense path group id channel program. */</div><div class='ctx'> 	ccw = cdev-&gt;private-&gt;iccws;</div><div class='ctx'> 	ccw-&gt;cmd_code = CCW_CMD_SENSE_PGID;</div><div class='del'>-	ccw-&gt;cda = (__u32) __pa (&amp;cdev-&gt;private-&gt;pgid);</div><div class='ctx'> 	ccw-&gt;count = sizeof (struct pgid);</div><div class='ctx'> 	ccw-&gt;flags = CCW_FLAG_SLI;</div><div class='ctx'> </div><div class='hunk'>@@ -49,6 +53,7 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)</div><div class='ctx'> 	ret = -ENODEV;</div><div class='ctx'> 	while (cdev-&gt;private-&gt;imask != 0) {</div><div class='ctx'> 		/* Try every path multiple times. */</div><div class='add'>+		ccw-&gt;cda = (__u32) __pa (&amp;cdev-&gt;private-&gt;pgid[i]);</div><div class='ctx'> 		if (cdev-&gt;private-&gt;iretry &gt; 0) {</div><div class='ctx'> 			cdev-&gt;private-&gt;iretry--;</div><div class='ctx'> 			ret = cio_start (sch, cdev-&gt;private-&gt;iccws, </div><div class='hunk'>@@ -65,7 +70,9 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)</div><div class='ctx'> 		}</div><div class='ctx'> 		cdev-&gt;private-&gt;imask &gt;&gt;= 1;</div><div class='ctx'> 		cdev-&gt;private-&gt;iretry = 5;</div><div class='add'>+		i++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +84,7 @@ ccw_device_sense_pgid_start(struct ccw_device *cdev)</div><div class='ctx'> 	cdev-&gt;private-&gt;state = DEV_STATE_SENSE_PGID;</div><div class='ctx'> 	cdev-&gt;private-&gt;imask = 0x80;</div><div class='ctx'> 	cdev-&gt;private-&gt;iretry = 5;</div><div class='del'>-	memset (&amp;cdev-&gt;private-&gt;pgid, 0, sizeof (struct pgid));</div><div class='add'>+	memset (&amp;cdev-&gt;private-&gt;pgid, 0, sizeof (cdev-&gt;private-&gt;pgid));</div><div class='ctx'> 	ret = __ccw_device_sense_pgid_start(cdev);</div><div class='ctx'> 	if (ret &amp;&amp; ret != -EBUSY)</div><div class='ctx'> 		ccw_device_sense_pgid_done(cdev, ret);</div><div class='hunk'>@@ -92,6 +99,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct subchannel *sch;</div><div class='ctx'> 	struct irb *irb;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='ctx'> 	irb = &amp;cdev-&gt;private-&gt;irb;</div><div class='hunk'>@@ -125,7 +133,8 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)</div><div class='ctx'> 			      sch-&gt;schid.sch_no, sch-&gt;orb.lpm);</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='del'>-	if (cdev-&gt;private-&gt;pgid.inf.ps.state2 == SNID_STATE2_RESVD_ELSE) {</div><div class='add'>+	i = 8 - ffs(cdev-&gt;private-&gt;imask);</div><div class='add'>+	if (cdev-&gt;private-&gt;pgid[i].inf.ps.state2 == SNID_STATE2_RESVD_ELSE) {</div><div class='ctx'> 		CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel 0.%x.%04x "</div><div class='ctx'> 			      "is reserved by someone else\n",</div><div class='ctx'> 			      cdev-&gt;private-&gt;devno, sch-&gt;schid.ssid,</div><div class='hunk'>@@ -163,12 +172,6 @@ ccw_device_sense_pgid_irq(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 	memset(&amp;cdev-&gt;private-&gt;irb, 0, sizeof(struct irb));</div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	/* 0, -ETIME, -EOPNOTSUPP, -EAGAIN, -EACCES or -EUSERS */</div><div class='del'>-	case 0:			/* Sense Path Group ID successful. */</div><div class='del'>-		if (cdev-&gt;private-&gt;pgid.inf.ps.state1 == SNID_STATE1_RESET)</div><div class='del'>-			memcpy(&amp;cdev-&gt;private-&gt;pgid, &amp;css[0]-&gt;global_pgid,</div><div class='del'>-			       sizeof(struct pgid));</div><div class='del'>-		ccw_device_sense_pgid_done(cdev, 0);</div><div class='del'>-		break;</div><div class='ctx'> 	case -EOPNOTSUPP:	/* Sense Path Group ID not supported */</div><div class='ctx'> 		ccw_device_sense_pgid_done(cdev, -EOPNOTSUPP);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -177,13 +180,15 @@ ccw_device_sense_pgid_irq(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -EACCES:		/* channel is not operational. */</div><div class='ctx'> 		sch-&gt;lpm &amp;= ~cdev-&gt;private-&gt;imask;</div><div class='add'>+		/* Fall through. */</div><div class='add'>+	case 0:			/* Sense Path Group ID successful. */</div><div class='ctx'> 		cdev-&gt;private-&gt;imask &gt;&gt;= 1;</div><div class='ctx'> 		cdev-&gt;private-&gt;iretry = 5;</div><div class='ctx'> 		/* Fall through. */</div><div class='ctx'> 	case -EAGAIN:		/* Try again. */</div><div class='ctx'> 		ret = __ccw_device_sense_pgid_start(cdev);</div><div class='ctx'> 		if (ret != 0 &amp;&amp; ret != -EBUSY)</div><div class='del'>-			ccw_device_sense_pgid_done(cdev, -ENODEV);</div><div class='add'>+			ccw_device_sense_pgid_done(cdev, ret);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -EUSERS:		/* device is reserved for someone else. */</div><div class='ctx'> 		ccw_device_sense_pgid_done(cdev, -EUSERS);</div><div class='hunk'>@@ -204,20 +209,20 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)</div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup sense path group id channel program. */</div><div class='del'>-	cdev-&gt;private-&gt;pgid.inf.fc = func;</div><div class='add'>+	cdev-&gt;private-&gt;pgid[0].inf.fc = func;</div><div class='ctx'> 	ccw = cdev-&gt;private-&gt;iccws;</div><div class='ctx'> 	if (!cdev-&gt;private-&gt;flags.pgid_single) {</div><div class='del'>-		cdev-&gt;private-&gt;pgid.inf.fc |= SPID_FUNC_MULTI_PATH;</div><div class='add'>+		cdev-&gt;private-&gt;pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;</div><div class='ctx'> 		ccw-&gt;cmd_code = CCW_CMD_SUSPEND_RECONN;</div><div class='ctx'> 		ccw-&gt;cda = 0;</div><div class='ctx'> 		ccw-&gt;count = 0;</div><div class='ctx'> 		ccw-&gt;flags = CCW_FLAG_SLI | CCW_FLAG_CC;</div><div class='ctx'> 		ccw++;</div><div class='ctx'> 	} else</div><div class='del'>-		cdev-&gt;private-&gt;pgid.inf.fc |= SPID_FUNC_SINGLE_PATH;</div><div class='add'>+		cdev-&gt;private-&gt;pgid[0].inf.fc |= SPID_FUNC_SINGLE_PATH;</div><div class='ctx'> </div><div class='ctx'> 	ccw-&gt;cmd_code = CCW_CMD_SET_PGID;</div><div class='del'>-	ccw-&gt;cda = (__u32) __pa (&amp;cdev-&gt;private-&gt;pgid);</div><div class='add'>+	ccw-&gt;cda = (__u32) __pa (&amp;cdev-&gt;private-&gt;pgid[0]);</div><div class='ctx'> 	ccw-&gt;count = sizeof (struct pgid);</div><div class='ctx'> 	ccw-&gt;flags = CCW_FLAG_SLI;</div><div class='ctx'> </div><div class='hunk'>@@ -245,6 +250,48 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Helper function to send a nop ccw down a path.</div><div class='add'>+ */</div><div class='add'>+static int __ccw_device_do_nop(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct subchannel *sch;</div><div class='add'>+	struct ccw1 *ccw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	/* Setup nop channel program. */</div><div class='add'>+	ccw = cdev-&gt;private-&gt;iccws;</div><div class='add'>+	ccw-&gt;cmd_code = CCW_CMD_NOOP;</div><div class='add'>+	ccw-&gt;cda = 0;</div><div class='add'>+	ccw-&gt;count = 0;</div><div class='add'>+	ccw-&gt;flags = CCW_FLAG_SLI;</div><div class='add'>+</div><div class='add'>+	/* Reset device status. */</div><div class='add'>+	memset(&amp;cdev-&gt;private-&gt;irb, 0, sizeof(struct irb));</div><div class='add'>+</div><div class='add'>+	/* Try multiple times. */</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+	if (cdev-&gt;private-&gt;iretry &gt; 0) {</div><div class='add'>+		cdev-&gt;private-&gt;iretry--;</div><div class='add'>+		ret = cio_start (sch, cdev-&gt;private-&gt;iccws,</div><div class='add'>+				 cdev-&gt;private-&gt;imask);</div><div class='add'>+		/* ret is 0, -EBUSY, -EACCES or -ENODEV */</div><div class='add'>+		if ((ret != -EACCES) &amp;&amp; (ret != -ENODEV))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	/* nop command failed on this path. Switch it off. */</div><div class='add'>+	sch-&gt;lpm &amp;= ~cdev-&gt;private-&gt;imask;</div><div class='add'>+	sch-&gt;vpm &amp;= ~cdev-&gt;private-&gt;imask;</div><div class='add'>+	CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel "</div><div class='add'>+		      "0.%x.%04x, lpm %02X, became 'not operational'\n",</div><div class='add'>+		      cdev-&gt;private-&gt;devno, sch-&gt;schid.ssid,</div><div class='add'>+		      sch-&gt;schid.sch_no, cdev-&gt;private-&gt;imask);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Called from interrupt context to check if a valid answer</div><div class='ctx'>  * to Set Path Group ID was received.</div><div class='ctx'>  */</div><div class='hunk'>@@ -283,6 +330,29 @@ __ccw_device_check_pgid(struct ccw_device *cdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Called from interrupt context to check the path status after a nop has</div><div class='add'>+ * been send.</div><div class='add'>+ */</div><div class='add'>+static int __ccw_device_check_nop(struct ccw_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct subchannel *sch;</div><div class='add'>+	struct irb *irb;</div><div class='add'>+</div><div class='add'>+	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='add'>+	irb = &amp;cdev-&gt;private-&gt;irb;</div><div class='add'>+	if (irb-&gt;scsw.fctl &amp; (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC))</div><div class='add'>+		return -ETIME;</div><div class='add'>+	if (irb-&gt;scsw.cc == 3) {</div><div class='add'>+		CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel 0.%x.%04x,"</div><div class='add'>+			      " lpm %02X, became 'not operational'\n",</div><div class='add'>+			      cdev-&gt;private-&gt;devno, sch-&gt;schid.ssid,</div><div class='add'>+			      sch-&gt;schid.sch_no, cdev-&gt;private-&gt;imask);</div><div class='add'>+		return -EACCES;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> __ccw_device_verify_start(struct ccw_device *cdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -297,9 +367,12 @@ __ccw_device_verify_start(struct ccw_device *cdev)</div><div class='ctx'> 			if ((sch-&gt;vpm &amp; imask) != (sch-&gt;lpm &amp; imask))</div><div class='ctx'> 				break;</div><div class='ctx'> 		cdev-&gt;private-&gt;imask = imask;</div><div class='del'>-		func = (sch-&gt;vpm &amp; imask) ?</div><div class='del'>-			SPID_FUNC_RESIGN : SPID_FUNC_ESTABLISH;</div><div class='del'>-		ret = __ccw_device_do_pgid(cdev, func);</div><div class='add'>+		if (cdev-&gt;private-&gt;options.pgroup) {</div><div class='add'>+			func = (sch-&gt;vpm &amp; imask) ?</div><div class='add'>+				SPID_FUNC_RESIGN : SPID_FUNC_ESTABLISH;</div><div class='add'>+			ret = __ccw_device_do_pgid(cdev, func);</div><div class='add'>+		} else</div><div class='add'>+			ret = __ccw_device_do_nop(cdev);</div><div class='ctx'> 		if (ret == 0 || ret == -EBUSY)</div><div class='ctx'> 			return;</div><div class='ctx'> 		cdev-&gt;private-&gt;iretry = 5;</div><div class='hunk'>@@ -328,7 +401,10 @@ ccw_device_verify_irq(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 	if (ccw_device_accumulate_and_sense(cdev, irb) != 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	sch = to_subchannel(cdev-&gt;dev.parent);</div><div class='del'>-	ret = __ccw_device_check_pgid(cdev);</div><div class='add'>+	if (cdev-&gt;private-&gt;options.pgroup)</div><div class='add'>+		ret = __ccw_device_check_pgid(cdev);</div><div class='add'>+	else</div><div class='add'>+		ret = __ccw_device_check_nop(cdev);</div><div class='ctx'> 	memset(&amp;cdev-&gt;private-&gt;irb, 0, sizeof(struct irb));</div><div class='ctx'> 	switch (ret) {</div><div class='ctx'> 	/* 0, -ETIME, -EAGAIN, -EOPNOTSUPP or -EACCES */</div><div class='hunk'>@@ -346,11 +422,10 @@ ccw_device_verify_irq(struct ccw_device *cdev, enum dev_event dev_event)</div><div class='ctx'> 		 * One of those strange devices which claim to be able</div><div class='ctx'> 		 * to do multipathing but not for Set Path Group ID.</div><div class='ctx'> 		 */</div><div class='del'>-		if (cdev-&gt;private-&gt;flags.pgid_single) {</div><div class='del'>-			ccw_device_verify_done(cdev, -EOPNOTSUPP);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cdev-&gt;private-&gt;flags.pgid_single = 1;</div><div class='add'>+		if (cdev-&gt;private-&gt;flags.pgid_single)</div><div class='add'>+			cdev-&gt;private-&gt;options.pgroup = 0;</div><div class='add'>+		else</div><div class='add'>+			cdev-&gt;private-&gt;flags.pgid_single = 1;</div><div class='ctx'> 		/* fall through. */</div><div class='ctx'> 	case -EAGAIN:		/* Try again. */</div><div class='ctx'> 		__ccw_device_verify_start(cdev);</div><div class='head'>diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c<br/>index 6c762b43f921..caf148d5caad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_status.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/device_status.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/device_status.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/device_status.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * Status accumulation and basic sense functions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -68,8 +67,7 @@ ccw_device_path_notoper(struct ccw_device *cdev)</div><div class='ctx'> 		      sch-&gt;schib.pmcw.pnom);</div><div class='ctx'> </div><div class='ctx'> 	sch-&gt;lpm &amp;= ~sch-&gt;schib.pmcw.pnom;</div><div class='del'>-	if (cdev-&gt;private-&gt;options.pgroup)</div><div class='del'>-		cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='add'>+	cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -181,7 +179,7 @@ ccw_device_accumulate_esw(struct ccw_device *cdev, struct irb *irb)</div><div class='ctx'> 	cdev_irb-&gt;esw.esw0.erw.auth = irb-&gt;esw.esw0.erw.auth;</div><div class='ctx'> 	/* Copy path verification required flag. */</div><div class='ctx'> 	cdev_irb-&gt;esw.esw0.erw.pvrf = irb-&gt;esw.esw0.erw.pvrf;</div><div class='del'>-	if (irb-&gt;esw.esw0.erw.pvrf &amp;&amp; cdev-&gt;private-&gt;options.pgroup)</div><div class='add'>+	if (irb-&gt;esw.esw0.erw.pvrf)</div><div class='ctx'> 		cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='ctx'> 	/* Copy concurrent sense bit. */</div><div class='ctx'> 	cdev_irb-&gt;esw.esw0.erw.cons = irb-&gt;esw.esw0.erw.cons;</div><div class='hunk'>@@ -355,7 +353,7 @@ ccw_device_accumulate_basic_sense(struct ccw_device *cdev, struct irb *irb)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Check if path verification is required. */</div><div class='ctx'> 	if (ccw_device_accumulate_esw_valid(irb) &amp;&amp;</div><div class='del'>-	    irb-&gt;esw.esw0.erw.pvrf &amp;&amp; cdev-&gt;private-&gt;options.pgroup) </div><div class='add'>+	    irb-&gt;esw.esw0.erw.pvrf)</div><div class='ctx'> 		cdev-&gt;private-&gt;flags.doverify = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c<br/>index 96f519281d92..7c93a8798d23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/cio/qdio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/cio/qdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/cio/qdio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/cio/qdio.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -2736,7 +2735,7 @@ qdio_free(struct ccw_device *cdev)</div><div class='ctx'> 	QDIO_DBF_TEXT1(0,trace,dbf_text);</div><div class='ctx'> 	QDIO_DBF_TEXT0(0,setup,dbf_text);</div><div class='ctx'> </div><div class='del'>-	cdev-&gt;private-&gt;qdio_data = 0;</div><div class='add'>+	cdev-&gt;private-&gt;qdio_data = NULL;</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;irq_ptr-&gt;setting_up_sema);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/crypto/z90crypt.h b/drivers/s390/crypto/z90crypt.h<br/>index 5e6b1f535f62..0ca1d126ccb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/crypto/z90crypt.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/crypto/z90crypt.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/crypto/z90crypt.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/crypto/z90crypt.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/drivers/s390/crypto/z90crypt.h</div><div class='ctx'>  *</div><div class='del'>- *  z90crypt 1.3.3</div><div class='add'>+ *  z90crypt 1.3.3 (kernel-private header)</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C)  2001, 2005 IBM Corporation</div><div class='ctx'>  *  Author(s): Robert Burroughs (burrough@us.ibm.com)</div><div class='hunk'>@@ -27,188 +27,7 @@</div><div class='ctx'> #ifndef _Z90CRYPT_H_</div><div class='ctx'> #define _Z90CRYPT_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/ioctl.h&gt;</div><div class='del'>-</div><div class='del'>-#define z90crypt_VERSION 1</div><div class='del'>-#define z90crypt_RELEASE 3	// 2 = PCIXCC, 3 = rewrite for coding standards</div><div class='del'>-#define z90crypt_VARIANT 3	// 3 = CEX2A support</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ica_rsa_modexpo</div><div class='del'>- *</div><div class='del'>- * Requirements:</div><div class='del'>- * - outputdatalength is at least as large as inputdatalength.</div><div class='del'>- * - All key parts are right justified in their fields, padded on</div><div class='del'>- *   the left with zeroes.</div><div class='del'>- * - length(b_key) = inputdatalength</div><div class='del'>- * - length(n_modulus) = inputdatalength</div><div class='del'>- */</div><div class='del'>-struct ica_rsa_modexpo {</div><div class='del'>-	char __user *	inputdata;</div><div class='del'>-	unsigned int	inputdatalength;</div><div class='del'>-	char __user *	outputdata;</div><div class='del'>-	unsigned int	outputdatalength;</div><div class='del'>-	char __user *	b_key;</div><div class='del'>-	char __user *	n_modulus;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct ica_rsa_modexpo_crt</div><div class='del'>- *</div><div class='del'>- * Requirements:</div><div class='del'>- * - inputdatalength is even.</div><div class='del'>- * - outputdatalength is at least as large as inputdatalength.</div><div class='del'>- * - All key parts are right justified in their fields, padded on</div><div class='del'>- *   the left with zeroes.</div><div class='del'>- * - length(bp_key)	= inputdatalength/2 + 8</div><div class='del'>- * - length(bq_key)	= inputdatalength/2</div><div class='del'>- * - length(np_key)	= inputdatalength/2 + 8</div><div class='del'>- * - length(nq_key)	= inputdatalength/2</div><div class='del'>- * - length(u_mult_inv) = inputdatalength/2 + 8</div><div class='del'>- */</div><div class='del'>-struct ica_rsa_modexpo_crt {</div><div class='del'>-	char __user *	inputdata;</div><div class='del'>-	unsigned int	inputdatalength;</div><div class='del'>-	char __user *	outputdata;</div><div class='del'>-	unsigned int	outputdatalength;</div><div class='del'>-	char __user *	bp_key;</div><div class='del'>-	char __user *	bq_key;</div><div class='del'>-	char __user *	np_prime;</div><div class='del'>-	char __user *	nq_prime;</div><div class='del'>-	char __user *	u_mult_inv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define Z90_IOCTL_MAGIC 'z'  // NOTE:  Need to allocate from linux folks</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Interface notes:</div><div class='del'>- *</div><div class='del'>- * The ioctl()s which are implemented (along with relevant details)</div><div class='del'>- * are:</div><div class='del'>- *</div><div class='del'>- *   ICARSAMODEXPO</div><div class='del'>- *     Perform an RSA operation using a Modulus-Exponent pair</div><div class='del'>- *     This takes an ica_rsa_modexpo struct as its arg.</div><div class='del'>- *</div><div class='del'>- *     NOTE: please refer to the comments preceding this structure</div><div class='del'>- *           for the implementation details for the contents of the</div><div class='del'>- *           block</div><div class='del'>- *</div><div class='del'>- *   ICARSACRT</div><div class='del'>- *     Perform an RSA operation using a Chinese-Remainder Theorem key</div><div class='del'>- *     This takes an ica_rsa_modexpo_crt struct as its arg.</div><div class='del'>- *</div><div class='del'>- *     NOTE: please refer to the comments preceding this structure</div><div class='del'>- *           for the implementation details for the contents of the</div><div class='del'>- *           block</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_TOTALCOUNT</div><div class='del'>- *     Return an integer count of all device types together.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PCICACOUNT</div><div class='del'>- *     Return an integer count of all PCICAs.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PCICCCOUNT</div><div class='del'>- *     Return an integer count of all PCICCs.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PCIXCCMCL2COUNT</div><div class='del'>- *     Return an integer count of all MCL2 PCIXCCs.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PCIXCCMCL3COUNT</div><div class='del'>- *     Return an integer count of all MCL3 PCIXCCs.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_CEX2CCOUNT</div><div class='del'>- *     Return an integer count of all CEX2Cs.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_CEX2ACOUNT</div><div class='del'>- *     Return an integer count of all CEX2As.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_REQUESTQ_COUNT</div><div class='del'>- *     Return an integer count of the number of entries waiting to be</div><div class='del'>- *     sent to a device.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PENDINGQ_COUNT</div><div class='del'>- *     Return an integer count of the number of entries sent to a</div><div class='del'>- *     device awaiting the reply.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_TOTALOPEN_COUNT</div><div class='del'>- *     Return an integer count of the number of open file handles.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_DOMAIN_INDEX</div><div class='del'>- *     Return the integer value of the Cryptographic Domain.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_STATUS_MASK</div><div class='del'>- *     Return an 64 element array of unsigned chars for the status of</div><div class='del'>- *     all devices.</div><div class='del'>- *       0x01: PCICA</div><div class='del'>- *       0x02: PCICC</div><div class='del'>- *       0x03: PCIXCC_MCL2</div><div class='del'>- *       0x04: PCIXCC_MCL3</div><div class='del'>- *       0x05: CEX2C</div><div class='del'>- *       0x06: CEX2A</div><div class='del'>- *       0x0d: device is disabled via the proc filesystem</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_QDEPTH_MASK</div><div class='del'>- *     Return an 64 element array of unsigned chars for the queue</div><div class='del'>- *     depth of all devices.</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PERDEV_REQCNT</div><div class='del'>- *     Return an 64 element array of unsigned integers for the number</div><div class='del'>- *     of successfully completed requests per device since the device</div><div class='del'>- *     was detected and made available.</div><div class='del'>- *</div><div class='del'>- *   ICAZ90STATUS (deprecated)</div><div class='del'>- *     Return some device driver status in a ica_z90_status struct</div><div class='del'>- *     This takes an ica_z90_status struct as its arg.</div><div class='del'>- *</div><div class='del'>- *     NOTE: this ioctl() is deprecated, and has been replaced with</div><div class='del'>- *           single ioctl()s for each type of status being requested</div><div class='del'>- *</div><div class='del'>- *   Z90STAT_PCIXCCCOUNT (deprecated)</div><div class='del'>- *     Return an integer count of all PCIXCCs (MCL2 + MCL3).</div><div class='del'>- *     This is DEPRECATED now that MCL3 PCIXCCs are treated differently from</div><div class='del'>- *     MCL2 PCIXCCs.</div><div class='del'>- *</div><div class='del'>- *   Z90QUIESCE (not recommended)</div><div class='del'>- *     Quiesce the driver.  This is intended to stop all new</div><div class='del'>- *     requests from being processed.  Its use is NOT recommended,</div><div class='del'>- *     except in circumstances where there is no other way to stop</div><div class='del'>- *     callers from accessing the driver.  Its original use was to</div><div class='del'>- *     allow the driver to be "drained" of work in preparation for</div><div class='del'>- *     a system shutdown.</div><div class='del'>- *</div><div class='del'>- *     NOTE: once issued, this ban on new work cannot be undone</div><div class='del'>- *           except by unloading and reloading the driver.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Supported ioctl calls</div><div class='del'>- */</div><div class='del'>-#define ICARSAMODEXPO	_IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0)</div><div class='del'>-#define ICARSACRT	_IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0)</div><div class='del'>-</div><div class='del'>-/* DEPRECATED status calls (bound for removal at some point) */</div><div class='del'>-#define ICAZ90STATUS	_IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status)</div><div class='del'>-#define Z90STAT_PCIXCCCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x43, int)</div><div class='del'>-</div><div class='del'>-/* unrelated to ICA callers */</div><div class='del'>-#define Z90QUIESCE	_IO(Z90_IOCTL_MAGIC, 0x11)</div><div class='del'>-</div><div class='del'>-/* New status calls */</div><div class='del'>-#define Z90STAT_TOTALCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x40, int)</div><div class='del'>-#define Z90STAT_PCICACOUNT	_IOR(Z90_IOCTL_MAGIC, 0x41, int)</div><div class='del'>-#define Z90STAT_PCICCCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x42, int)</div><div class='del'>-#define Z90STAT_PCIXCCMCL2COUNT	_IOR(Z90_IOCTL_MAGIC, 0x4b, int)</div><div class='del'>-#define Z90STAT_PCIXCCMCL3COUNT	_IOR(Z90_IOCTL_MAGIC, 0x4c, int)</div><div class='del'>-#define Z90STAT_CEX2CCOUNT	_IOR(Z90_IOCTL_MAGIC, 0x4d, int)</div><div class='del'>-#define Z90STAT_CEX2ACOUNT	_IOR(Z90_IOCTL_MAGIC, 0x4e, int)</div><div class='del'>-#define Z90STAT_REQUESTQ_COUNT	_IOR(Z90_IOCTL_MAGIC, 0x44, int)</div><div class='del'>-#define Z90STAT_PENDINGQ_COUNT	_IOR(Z90_IOCTL_MAGIC, 0x45, int)</div><div class='del'>-#define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int)</div><div class='del'>-#define Z90STAT_DOMAIN_INDEX	_IOR(Z90_IOCTL_MAGIC, 0x47, int)</div><div class='del'>-#define Z90STAT_STATUS_MASK	_IOR(Z90_IOCTL_MAGIC, 0x48, char[64])</div><div class='del'>-#define Z90STAT_QDEPTH_MASK	_IOR(Z90_IOCTL_MAGIC, 0x49, char[64])</div><div class='del'>-#define Z90STAT_PERDEV_REQCNT	_IOR(Z90_IOCTL_MAGIC, 0x4a, int[64])</div><div class='add'>+#include &lt;asm/z90crypt.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * local errno definitions</div><div class='head'>diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c<br/>index 982acc7303ea..b2f20ab8431a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/crypto/z90main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/crypto/z90main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/crypto/z90main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/crypto/z90main.c</a></div><div class='hunk'>@@ -411,7 +411,6 @@ static struct miscdevice z90crypt_misc_device = {</div><div class='ctx'> 	.minor	    = Z90CRYPT_MINOR,</div><div class='ctx'> 	.name	    = DEV_NAME,</div><div class='ctx'> 	.fops	    = &amp;z90crypt_fops,</div><div class='del'>-	.devfs_name = DEV_NAME</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile<br/>index 90d4d0ef3dd4..6775a837d646 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/Makefile</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # S/390 network devices</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ctc-objs := ctcmain.o ctctty.o ctcdbug.o</div><div class='add'>+ctc-objs := ctcmain.o ctcdbug.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_IUCV) += iucv.o</div><div class='ctx'> obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o</div><div class='hunk'>@@ -10,6 +10,7 @@ obj-$(CONFIG_SMSGIUCV) += smsgiucv.o</div><div class='ctx'> obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o</div><div class='ctx'> obj-$(CONFIG_LCS) += lcs.o cu3088.o</div><div class='ctx'> obj-$(CONFIG_CLAW) += claw.o cu3088.o</div><div class='add'>+obj-$(CONFIG_MPC) += ctcmpc.o fsm.o cu3088.o</div><div class='ctx'> qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o </div><div class='ctx'> qeth-$(CONFIG_PROC_FS) += qeth_proc.o</div><div class='ctx'> obj-$(CONFIG_QETH) += qeth.o</div><div class='head'>diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c<br/>index 23d53bf9daf1..95f4e105cb96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/claw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/claw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/claw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/claw.c</a></div><div class='hunk'>@@ -529,7 +529,7 @@ claw_open(struct net_device *dev)</div><div class='ctx'>         printk(KERN_INFO "%s:%s Enter  \n",dev-&gt;name,__FUNCTION__);</div><div class='ctx'> #endif</div><div class='ctx'> 	CLAW_DBF_TEXT(4,trace,"open");</div><div class='del'>-	if (!dev | (dev-&gt;name[0] == 0x00)) {</div><div class='add'>+	if (!dev || (dev-&gt;name[0] == 0x00)) {</div><div class='ctx'> 		CLAW_DBF_TEXT(2,trace,"BadDev");</div><div class='ctx'> 	 	printk(KERN_WARNING "claw: Bad device at open failing \n");</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c<br/>index fe986af884f8..20c8eb16f464 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/ctcmain.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctcmain.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/ctcmain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/ctcmain.c</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'>  * Fixes by : Jochen Röhrig (roehrig@de.ibm.com)</div><div class='ctx'>  *            Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='ctx'> 	      Peter Tiedemann (ptiedem@de.ibm.com)</div><div class='del'>- * Driver Model stuff by : Cornelia Huck &lt;huckc@de.ibm.com&gt;</div><div class='add'>+ * Driver Model stuff by : Cornelia Huck &lt;cornelia.huck@de.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Documentation used:</div><div class='ctx'>  *  - Principles of Operation (IBM doc#: SA22-7201-06)</div><div class='hunk'>@@ -65,7 +65,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/idals.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "ctctty.h"</div><div class='ctx'> #include "fsm.h"</div><div class='ctx'> #include "cu3088.h"</div><div class='ctx'> </div><div class='hunk'>@@ -479,10 +478,7 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb)</div><div class='ctx'> 		skb-&gt;dev = pskb-&gt;dev;</div><div class='ctx'> 		skb-&gt;protocol = pskb-&gt;protocol;</div><div class='ctx'> 		pskb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-		if (ch-&gt;protocol == CTC_PROTO_LINUX_TTY)</div><div class='del'>-			ctc_tty_netif_rx(skb);</div><div class='del'>-		else</div><div class='del'>-			netif_rx_ni(skb);</div><div class='add'>+		netif_rx_ni(skb);</div><div class='ctx'> 		/**</div><div class='ctx'> 		 * Successful rx; reset logflags</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -557,8 +553,7 @@ ccw_unit_check(struct channel *ch, unsigned char sense)</div><div class='ctx'> 	DBF_TEXT(trace, 5, __FUNCTION__);</div><div class='ctx'> 	if (sense &amp; SNS0_INTERVENTION_REQ) {</div><div class='ctx'> 		if (sense &amp; 0x01) {</div><div class='del'>-			if (ch-&gt;protocol != CTC_PROTO_LINUX_TTY)</div><div class='del'>-				ctc_pr_debug("%s: Interface disc. or Sel. reset "</div><div class='add'>+			ctc_pr_debug("%s: Interface disc. or Sel. reset "</div><div class='ctx'> 					"(remote)\n", ch-&gt;id);</div><div class='ctx'> 			fsm_event(ch-&gt;fsm, CH_EVENT_UC_RCRESET, ch);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2034,7 +2029,6 @@ static void</div><div class='ctx'> dev_action_chup(fsm_instance * fi, int event, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = (struct net_device *) arg;</div><div class='del'>-	struct ctc_priv *privptr = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='ctx'> 	switch (fsm_getstate(fi)) {</div><div class='hunk'>@@ -2049,8 +2043,6 @@ dev_action_chup(fsm_instance * fi, int event, void *arg)</div><div class='ctx'> 				fsm_newstate(fi, DEV_STATE_RUNNING);</div><div class='ctx'> 				ctc_pr_info("%s: connected with remote side\n",</div><div class='ctx'> 					    dev-&gt;name);</div><div class='del'>-				if (privptr-&gt;protocol == CTC_PROTO_LINUX_TTY)</div><div class='del'>-					ctc_tty_setcarrier(dev, 1);</div><div class='ctx'> 				ctc_clear_busy(dev);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2059,8 +2051,6 @@ dev_action_chup(fsm_instance * fi, int event, void *arg)</div><div class='ctx'> 				fsm_newstate(fi, DEV_STATE_RUNNING);</div><div class='ctx'> 				ctc_pr_info("%s: connected with remote side\n",</div><div class='ctx'> 					    dev-&gt;name);</div><div class='del'>-				if (privptr-&gt;protocol == CTC_PROTO_LINUX_TTY)</div><div class='del'>-					ctc_tty_setcarrier(dev, 1);</div><div class='ctx'> 				ctc_clear_busy(dev);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2086,14 +2076,10 @@ dev_action_chup(fsm_instance * fi, int event, void *arg)</div><div class='ctx'> static void</div><div class='ctx'> dev_action_chdown(fsm_instance * fi, int event, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *) arg;</div><div class='del'>-	struct ctc_priv *privptr = dev-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='ctx'> 	switch (fsm_getstate(fi)) {</div><div class='ctx'> 		case DEV_STATE_RUNNING:</div><div class='del'>-			if (privptr-&gt;protocol == CTC_PROTO_LINUX_TTY)</div><div class='del'>-				ctc_tty_setcarrier(dev, 0);</div><div class='ctx'> 			if (event == DEV_EVENT_TXDOWN)</div><div class='ctx'> 				fsm_newstate(fi, DEV_STATE_STARTWAIT_TX);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -2397,8 +2383,6 @@ ctc_tx(struct sk_buff *skb, struct net_device * dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (fsm_getstate(privptr-&gt;fsm) != DEV_STATE_RUNNING) {</div><div class='ctx'> 		fsm_event(privptr-&gt;fsm, DEV_EVENT_START, dev);</div><div class='del'>-		if (privptr-&gt;protocol == CTC_PROTO_LINUX_TTY)</div><div class='del'>-			return -EBUSY;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		privptr-&gt;stats.tx_dropped++;</div><div class='ctx'> 		privptr-&gt;stats.tx_errors++;</div><div class='hunk'>@@ -2608,20 +2592,13 @@ ctc_netdev_unregister(struct net_device * dev)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	privptr = (struct ctc_priv *) dev-&gt;priv;</div><div class='del'>-	if (privptr-&gt;protocol != CTC_PROTO_LINUX_TTY)</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-	else</div><div class='del'>-		ctc_tty_unregister_netdev(dev);</div><div class='add'>+	unregister_netdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> ctc_netdev_register(struct net_device * dev)</div><div class='ctx'> {</div><div class='del'>-	struct ctc_priv *privptr = (struct ctc_priv *) dev-&gt;priv;</div><div class='del'>-	if (privptr-&gt;protocol != CTC_PROTO_LINUX_TTY)</div><div class='del'>-		return register_netdev(dev);</div><div class='del'>-	else</div><div class='del'>-		return ctc_tty_register_netdev(dev);</div><div class='add'>+	return register_netdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2667,7 +2644,9 @@ ctc_proto_store(struct device *dev, struct device_attribute *attr, const char *b</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	sscanf(buf, "%u", &amp;value);</div><div class='del'>-	if ((value &lt; 0) || (value &gt; CTC_PROTO_MAX))</div><div class='add'>+	if (!((value == CTC_PROTO_S390)  ||</div><div class='add'>+	      (value == CTC_PROTO_LINUX) ||</div><div class='add'>+	      (value == CTC_PROTO_OS390)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	priv-&gt;protocol = value;</div><div class='ctx'> </div><div class='hunk'>@@ -2897,10 +2876,7 @@ ctc_new_device(struct ccwgroup_device *cgdev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (privptr-&gt;protocol == CTC_PROTO_LINUX_TTY)</div><div class='del'>-		strlcpy(dev-&gt;name, "ctctty%d", IFNAMSIZ);</div><div class='del'>-	else</div><div class='del'>-		strlcpy(dev-&gt;name, "ctc%d", IFNAMSIZ);</div><div class='add'>+	strlcpy(dev-&gt;name, "ctc%d", IFNAMSIZ);</div><div class='ctx'> </div><div class='ctx'> 	for (direction = READ; direction &lt;= WRITE; direction++) {</div><div class='ctx'> 		privptr-&gt;channel[direction] =</div><div class='hunk'>@@ -3046,7 +3022,6 @@ ctc_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	DBF_TEXT(setup, 3, __FUNCTION__);</div><div class='ctx'> 	unregister_cu3088_discipline(&amp;ctc_group_driver);</div><div class='del'>-	ctc_tty_cleanup();</div><div class='ctx'> 	ctc_unregister_dbf_views();</div><div class='ctx'> 	ctc_pr_info("CTC driver unloaded\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -3073,10 +3048,8 @@ ctc_init(void)</div><div class='ctx'> 		ctc_pr_crit("ctc_init failed with ctc_register_dbf_views rc = %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	ctc_tty_init();</div><div class='ctx'> 	ret = register_cu3088_discipline(&amp;ctc_group_driver);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		ctc_tty_cleanup();</div><div class='ctx'> 		ctc_unregister_dbf_views();</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/drivers/s390/net/ctcmain.h b/drivers/s390/net/ctcmain.h<br/>index d2e835c0c134..7f305d119f3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/ctcmain.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctcmain.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/ctcmain.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/ctcmain.h</a></div><div class='hunk'>@@ -35,7 +35,9 @@</div><div class='ctx'> #include &lt;asm/ccwdev.h&gt;</div><div class='ctx'> #include &lt;asm/ccwgroup.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "ctctty.h"</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "fsm.h"</div><div class='ctx'> #include "cu3088.h"</div><div class='ctx'> </div><div class='hunk'>@@ -50,9 +52,7 @@</div><div class='ctx'> </div><div class='ctx'> #define CTC_PROTO_S390          0</div><div class='ctx'> #define CTC_PROTO_LINUX         1</div><div class='del'>-#define CTC_PROTO_LINUX_TTY     2</div><div class='ctx'> #define CTC_PROTO_OS390         3</div><div class='del'>-#define CTC_PROTO_MAX           3</div><div class='ctx'> </div><div class='ctx'> #define CTC_BUFSIZE_LIMIT       65535</div><div class='ctx'> #define CTC_BUFSIZE_DEFAULT     32768</div><div class='hunk'>@@ -257,15 +257,13 @@ static __inline__ void</div><div class='ctx'> ctc_clear_busy(struct net_device * dev)</div><div class='ctx'> {</div><div class='ctx'> 	clear_bit(0, &amp;(((struct ctc_priv *) dev-&gt;priv)-&gt;tbusy));</div><div class='del'>-	if (((struct ctc_priv *)dev-&gt;priv)-&gt;protocol != CTC_PROTO_LINUX_TTY)</div><div class='del'>-		netif_wake_queue(dev);</div><div class='add'>+	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static __inline__ int</div><div class='ctx'> ctc_test_and_set_busy(struct net_device * dev)</div><div class='ctx'> {</div><div class='del'>-	if (((struct ctc_priv *)dev-&gt;priv)-&gt;protocol != CTC_PROTO_LINUX_TTY)</div><div class='del'>-		netif_stop_queue(dev);</div><div class='add'>+	netif_stop_queue(dev);</div><div class='ctx'> 	return test_and_set_bit(0, &amp;((struct ctc_priv *) dev-&gt;priv)-&gt;tbusy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c<br/>deleted file mode 100644<br/>index af54d1de07bf..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/ctctty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctctty.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1259 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * CTC / ESCON network driver, tty interface.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation</div><div class='del'>- * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/tty_flip.h&gt;</div><div class='del'>-#include &lt;linux/serial_reg.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='del'>-#include "ctctty.h"</div><div class='del'>-#include "ctcdbug.h"</div><div class='del'>-</div><div class='del'>-#define CTC_TTY_MAJOR       43</div><div class='del'>-#define CTC_TTY_MAX_DEVICES 64</div><div class='del'>-</div><div class='del'>-#define CTC_ASYNC_MAGIC          0x49344C01 /* for paranoia-checking        */</div><div class='del'>-#define CTC_ASYNC_INITIALIZED    0x80000000 /* port was initialized         */</div><div class='del'>-#define CTC_ASYNC_NORMAL_ACTIVE  0x20000000 /* Normal device active         */</div><div class='del'>-#define CTC_ASYNC_CLOSING        0x08000000 /* Serial port is closing       */</div><div class='del'>-#define CTC_ASYNC_CTS_FLOW       0x04000000 /* Do CTS flow control          */</div><div class='del'>-#define CTC_ASYNC_CHECK_CD       0x02000000 /* i.e., CLOCAL                 */</div><div class='del'>-#define CTC_ASYNC_HUP_NOTIFY         0x0001 /* Notify tty on hangups/closes */</div><div class='del'>-#define CTC_ASYNC_NETDEV_OPEN        0x0002 /* Underlying netdev is open    */</div><div class='del'>-#define CTC_ASYNC_TX_LINESTAT        0x0004 /* Must send line status        */</div><div class='del'>-#define CTC_ASYNC_SPLIT_TERMIOS      0x0008 /* Sep. termios for dialin/out  */</div><div class='del'>-#define CTC_TTY_XMIT_SIZE              1024 /* Default bufsize for write    */</div><div class='del'>-#define CTC_SERIAL_XMIT_MAX            4000 /* Maximum bufsize for write    */</div><div class='del'>-</div><div class='del'>-/* Private data (similar to async_struct in &lt;linux/serial.h&gt;) */</div><div class='del'>-typedef struct {</div><div class='del'>-  int			magic;</div><div class='del'>-  int			flags;		 /* defined in tty.h               */</div><div class='del'>-  int			mcr;		 /* Modem control register         */</div><div class='del'>-  int                   msr;             /* Modem status register          */</div><div class='del'>-  int                   lsr;             /* Line status register           */</div><div class='del'>-  int			line;</div><div class='del'>-  int			count;		 /* # of fd on device              */</div><div class='del'>-  int			blocked_open;	 /* # of blocked opens             */</div><div class='del'>-  struct net_device     *netdev;</div><div class='del'>-  struct sk_buff_head   tx_queue;        /* transmit queue                 */</div><div class='del'>-  struct sk_buff_head   rx_queue;        /* receive queue                  */</div><div class='del'>-  struct tty_struct 	*tty;            /* Pointer to corresponding tty   */</div><div class='del'>-  wait_queue_head_t	open_wait;</div><div class='del'>-  wait_queue_head_t	close_wait;</div><div class='del'>-  struct semaphore      write_sem;</div><div class='del'>-  struct tasklet_struct tasklet;</div><div class='del'>-  struct timer_list     stoptimer;</div><div class='del'>-} ctc_tty_info;</div><div class='del'>-</div><div class='del'>-/* Description of one CTC-tty */</div><div class='del'>-typedef struct {</div><div class='del'>-  struct tty_driver  *ctc_tty_device;		   /* tty-device             */</div><div class='del'>-  ctc_tty_info       info[CTC_TTY_MAX_DEVICES];	   /* Private data           */</div><div class='del'>-} ctc_tty_driver;</div><div class='del'>-</div><div class='del'>-static ctc_tty_driver *driver;</div><div class='del'>-</div><div class='del'>-/* Leave this unchanged unless you know what you do! */</div><div class='del'>-#define MODEM_PARANOIA_CHECK</div><div class='del'>-#define MODEM_DO_RESTART</div><div class='del'>-</div><div class='del'>-#define CTC_TTY_NAME "ctctty"</div><div class='del'>-</div><div class='del'>-static __u32 ctc_tty_magic = CTC_ASYNC_MAGIC;</div><div class='del'>-static int ctc_tty_shuttingdown = 0;</div><div class='del'>-</div><div class='del'>-static spinlock_t ctc_tty_lock;</div><div class='del'>-</div><div class='del'>-/* ctc_tty_try_read() is called from within ctc_tty_rcv_skb()</div><div class='del'>- * to stuff incoming data directly into a tty's flip-buffer. If the</div><div class='del'>- * flip buffer is full, the packet gets queued up.</div><div class='del'>- *</div><div class='del'>- * Return:</div><div class='del'>- *  1 = Success</div><div class='del'>- *  0 = Failure, data has to be buffered and later processed by</div><div class='del'>- *      ctc_tty_readmodem().</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ctc_tty_try_read(ctc_tty_info * info, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-	struct tty_struct *tty;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 5, __FUNCTION__);</div><div class='del'>-	if ((tty = info-&gt;tty)) {</div><div class='del'>-		if (info-&gt;mcr &amp; UART_MCR_RTS) {</div><div class='del'>-			len = skb-&gt;len;</div><div class='del'>-			tty_insert_flip_string(tty, skb-&gt;data, len);</div><div class='del'>-			tty_flip_buffer_push(tty);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ctc_tty_readmodem() is called periodically from within timer-interrupt.</div><div class='del'>- * It tries getting received data from the receive queue an stuff it into</div><div class='del'>- * the tty's flip-buffer.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ctc_tty_readmodem(ctc_tty_info *info)</div><div class='del'>-{</div><div class='del'>-	int ret = 1;</div><div class='del'>-	struct tty_struct *tty;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 5, __FUNCTION__);</div><div class='del'>-	if ((tty = info-&gt;tty)) {</div><div class='del'>-		if (info-&gt;mcr &amp; UART_MCR_RTS) {</div><div class='del'>-			struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-			if ((skb = skb_dequeue(&amp;info-&gt;rx_queue))) {</div><div class='del'>-				int len = skb-&gt;len;</div><div class='del'>-				tty_insert_flip_string(tty, skb-&gt;data, len);</div><div class='del'>-				skb_pull(skb, len);</div><div class='del'>-				tty_flip_buffer_push(tty);</div><div class='del'>-				if (skb-&gt;len &gt; 0)</div><div class='del'>-					skb_queue_head(&amp;info-&gt;rx_queue, skb);</div><div class='del'>-				else {</div><div class='del'>-					kfree_skb(skb);</div><div class='del'>-					ret = !skb_queue_empty(&amp;info-&gt;rx_queue);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-ctc_tty_setcarrier(struct net_device *netdev, int on)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if ((!driver) || ctc_tty_shuttingdown)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; CTC_TTY_MAX_DEVICES; i++)</div><div class='del'>-		if (driver-&gt;info[i].netdev == netdev) {</div><div class='del'>-			ctc_tty_info *info = &amp;driver-&gt;info[i];</div><div class='del'>-			if (on)</div><div class='del'>-				info-&gt;msr |= UART_MSR_DCD;</div><div class='del'>-			else</div><div class='del'>-				info-&gt;msr &amp;= ~UART_MSR_DCD;</div><div class='del'>-			if ((info-&gt;flags &amp; CTC_ASYNC_CHECK_CD) &amp;&amp; (!on))</div><div class='del'>-				tty_hangup(info-&gt;tty);</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-ctc_tty_netif_rx(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	ctc_tty_info *info = NULL;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 5, __FUNCTION__);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-	if ((!skb-&gt;dev) || (!driver) || ctc_tty_shuttingdown) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; CTC_TTY_MAX_DEVICES; i++)</div><div class='del'>-		if (driver-&gt;info[i].netdev == skb-&gt;dev) {</div><div class='del'>-			info = &amp;driver-&gt;info[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	if (!info) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (skb-&gt;len &lt; 6) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (memcmp(skb-&gt;data, &amp;ctc_tty_magic, sizeof(__u32))) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	skb_pull(skb, sizeof(__u32));</div><div class='del'>-</div><div class='del'>-	i = *((int *)skb-&gt;data);</div><div class='del'>-	skb_pull(skb, sizeof(info-&gt;mcr));</div><div class='del'>-	if (i &amp; UART_MCR_RTS) {</div><div class='del'>-		info-&gt;msr |= UART_MSR_CTS;</div><div class='del'>-		if (info-&gt;flags &amp; CTC_ASYNC_CTS_FLOW)</div><div class='del'>-			info-&gt;tty-&gt;hw_stopped = 0;</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;msr &amp;= ~UART_MSR_CTS;</div><div class='del'>-		if (info-&gt;flags &amp; CTC_ASYNC_CTS_FLOW)</div><div class='del'>-			info-&gt;tty-&gt;hw_stopped = 1;</div><div class='del'>-	}</div><div class='del'>-	if (i &amp; UART_MCR_DTR)</div><div class='del'>-		info-&gt;msr |= UART_MSR_DSR;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;msr &amp;= ~UART_MSR_DSR;</div><div class='del'>-	if (skb-&gt;len &lt;= 0) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* Try to deliver directly via tty-flip-buf if queue is empty */</div><div class='del'>-	if (skb_queue_empty(&amp;info-&gt;rx_queue))</div><div class='del'>-		if (ctc_tty_try_read(info, skb))</div><div class='del'>-			return;</div><div class='del'>-	/* Direct deliver failed or queue wasn't empty.</div><div class='del'>-	 * Queue up for later dequeueing via timer-irq.</div><div class='del'>-	 */</div><div class='del'>-	skb_queue_tail(&amp;info-&gt;rx_queue, skb);</div><div class='del'>-	/* Schedule dequeuing */</div><div class='del'>-	tasklet_schedule(&amp;info-&gt;tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ctc_tty_tint(ctc_tty_info * info)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = skb_dequeue(&amp;info-&gt;tx_queue);</div><div class='del'>-	int stopped = (info-&gt;tty-&gt;hw_stopped || info-&gt;tty-&gt;stopped);</div><div class='del'>-	int wake = 1;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (!info-&gt;netdev) {</div><div class='del'>-		if (skb)</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;flags &amp; CTC_ASYNC_TX_LINESTAT) {</div><div class='del'>-		int skb_res = info-&gt;netdev-&gt;hard_header_len +</div><div class='del'>-			sizeof(info-&gt;mcr) + sizeof(__u32);</div><div class='del'>-		/* If we must update line status,</div><div class='del'>-		 * create an empty dummy skb and insert it.</div><div class='del'>-		 */</div><div class='del'>-		if (skb)</div><div class='del'>-			skb_queue_head(&amp;info-&gt;tx_queue, skb);</div><div class='del'>-</div><div class='del'>-		skb = dev_alloc_skb(skb_res);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "ctc_tty: Out of memory in %s%d tint\n",</div><div class='del'>-			       CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb, skb_res);</div><div class='del'>-		stopped = 0;</div><div class='del'>-		wake = 0;</div><div class='del'>-	}</div><div class='del'>-	if (!skb)</div><div class='del'>-		return 0;</div><div class='del'>-	if (stopped) {</div><div class='del'>-		skb_queue_head(&amp;info-&gt;tx_queue, skb);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-#if 0</div><div class='del'>-	if (skb-&gt;len &gt; 0)</div><div class='del'>-		printk(KERN_DEBUG "tint: %d %02x\n", skb-&gt;len, *(skb-&gt;data));</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_DEBUG "tint: %d STAT\n", skb-&gt;len);</div><div class='del'>-#endif</div><div class='del'>-	memcpy(skb_push(skb, sizeof(info-&gt;mcr)), &amp;info-&gt;mcr, sizeof(info-&gt;mcr));</div><div class='del'>-	memcpy(skb_push(skb, sizeof(__u32)), &amp;ctc_tty_magic, sizeof(__u32));</div><div class='del'>-	rc = info-&gt;netdev-&gt;hard_start_xmit(skb, info-&gt;netdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		skb_pull(skb, sizeof(info-&gt;mcr) + sizeof(__u32));</div><div class='del'>-		if (skb-&gt;len &gt; 0)</div><div class='del'>-			skb_queue_head(&amp;info-&gt;tx_queue, skb);</div><div class='del'>-		else</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-	} else {</div><div class='del'>-		struct tty_struct *tty = info-&gt;tty;</div><div class='del'>-</div><div class='del'>-		info-&gt;flags &amp;= ~CTC_ASYNC_TX_LINESTAT;</div><div class='del'>-		if (tty) {</div><div class='del'>-			tty_wakeup(tty);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return (skb_queue_empty(&amp;info-&gt;tx_queue) ? 0 : 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/************************************************************</div><div class='del'>- *</div><div class='del'>- * Modem-functions</div><div class='del'>- *</div><div class='del'>- * mostly "stolen" from original Linux-serial.c and friends.</div><div class='del'>- *</div><div class='del'>- ************************************************************/</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-ctc_tty_paranoia_check(ctc_tty_info * info, char *name, const char *routine)</div><div class='del'>-{</div><div class='del'>-#ifdef MODEM_PARANOIA_CHECK</div><div class='del'>-	if (!info) {</div><div class='del'>-		printk(KERN_WARNING "ctc_tty: null info_struct for %s in %s\n",</div><div class='del'>-		       name, routine);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;magic != CTC_ASYNC_MAGIC) {</div><div class='del'>-		printk(KERN_WARNING "ctc_tty: bad magic for info struct %s in %s\n",</div><div class='del'>-		       name, routine);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_inject(ctc_tty_info *info, char c)</div><div class='del'>-{</div><div class='del'>-	int skb_res;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_shuttingdown)</div><div class='del'>-		return;</div><div class='del'>-	skb_res = info-&gt;netdev-&gt;hard_header_len + sizeof(info-&gt;mcr) +</div><div class='del'>-		sizeof(__u32) + 1;</div><div class='del'>-	skb = dev_alloc_skb(skb_res);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "ctc_tty: Out of memory in %s%d tx_inject\n",</div><div class='del'>-		       CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	skb_reserve(skb, skb_res);</div><div class='del'>-	*(skb_put(skb, 1)) = c;</div><div class='del'>-	skb_queue_head(&amp;info-&gt;tx_queue, skb);</div><div class='del'>-	tasklet_schedule(&amp;info-&gt;tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_transmit_status(ctc_tty_info *info)</div><div class='del'>-{</div><div class='del'>-	DBF_TEXT(trace, 5, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_shuttingdown)</div><div class='del'>-		return;</div><div class='del'>-	info-&gt;flags |= CTC_ASYNC_TX_LINESTAT;</div><div class='del'>-	tasklet_schedule(&amp;info-&gt;tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_change_speed(ctc_tty_info * info)</div><div class='del'>-{</div><div class='del'>-	unsigned int cflag;</div><div class='del'>-	unsigned int quot;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	if (!info-&gt;tty || !info-&gt;tty-&gt;termios)</div><div class='del'>-		return;</div><div class='del'>-	cflag = info-&gt;tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-</div><div class='del'>-	quot = i = cflag &amp; CBAUD;</div><div class='del'>-	if (i &amp; CBAUDEX) {</div><div class='del'>-		i &amp;= ~CBAUDEX;</div><div class='del'>-		if (i &lt; 1 || i &gt; 2)</div><div class='del'>-			info-&gt;tty-&gt;termios-&gt;c_cflag &amp;= ~CBAUDEX;</div><div class='del'>-		else</div><div class='del'>-			i += 15;</div><div class='del'>-	}</div><div class='del'>-	if (quot) {</div><div class='del'>-		info-&gt;mcr |= UART_MCR_DTR;</div><div class='del'>-		info-&gt;mcr |= UART_MCR_RTS;</div><div class='del'>-		ctc_tty_transmit_status(info);</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;mcr &amp;= ~UART_MCR_DTR;</div><div class='del'>-		info-&gt;mcr &amp;= ~UART_MCR_RTS;</div><div class='del'>-		ctc_tty_transmit_status(info);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* CTS flow control flag and modem status interrupts */</div><div class='del'>-	if (cflag &amp; CRTSCTS) {</div><div class='del'>-		info-&gt;flags |= CTC_ASYNC_CTS_FLOW;</div><div class='del'>-	} else</div><div class='del'>-		info-&gt;flags &amp;= ~CTC_ASYNC_CTS_FLOW;</div><div class='del'>-	if (cflag &amp; CLOCAL)</div><div class='del'>-		info-&gt;flags &amp;= ~CTC_ASYNC_CHECK_CD;</div><div class='del'>-	else {</div><div class='del'>-		info-&gt;flags |= CTC_ASYNC_CHECK_CD;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ctc_tty_startup(ctc_tty_info * info)</div><div class='del'>-{</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	if (info-&gt;flags &amp; CTC_ASYNC_INITIALIZED)</div><div class='del'>-		return 0;</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "starting up %s%d ...\n", CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * Now, initialize the UART</div><div class='del'>-	 */</div><div class='del'>-	info-&gt;mcr = UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2;</div><div class='del'>-	if (info-&gt;tty)</div><div class='del'>-		clear_bit(TTY_IO_ERROR, &amp;info-&gt;tty-&gt;flags);</div><div class='del'>-	/*</div><div class='del'>-	 * and set the speed of the serial port</div><div class='del'>-	 */</div><div class='del'>-	ctc_tty_change_speed(info);</div><div class='del'>-</div><div class='del'>-	info-&gt;flags |= CTC_ASYNC_INITIALIZED;</div><div class='del'>-	if (!(info-&gt;flags &amp; CTC_ASYNC_NETDEV_OPEN))</div><div class='del'>-		info-&gt;netdev-&gt;open(info-&gt;netdev);</div><div class='del'>-	info-&gt;flags |= CTC_ASYNC_NETDEV_OPEN;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_stopdev(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *)data;</div><div class='del'>-</div><div class='del'>-	if ((!info) || (!info-&gt;netdev) ||</div><div class='del'>-	    (info-&gt;flags &amp; CTC_ASYNC_INITIALIZED))</div><div class='del'>-		return;</div><div class='del'>-	info-&gt;netdev-&gt;stop(info-&gt;netdev);</div><div class='del'>-	info-&gt;flags &amp;= ~CTC_ASYNC_NETDEV_OPEN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine will shutdown a serial port; interrupts are disabled, and</div><div class='del'>- * DTR is dropped if the hangup on close termio flag is on.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ctc_tty_shutdown(ctc_tty_info * info)</div><div class='del'>-{</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	if (!(info-&gt;flags &amp; CTC_ASYNC_INITIALIZED))</div><div class='del'>-		return;</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "Shutting down %s%d ....\n", CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-	info-&gt;msr &amp;= ~UART_MSR_RI;</div><div class='del'>-	if (!info-&gt;tty || (info-&gt;tty-&gt;termios-&gt;c_cflag &amp; HUPCL))</div><div class='del'>-		info-&gt;mcr &amp;= ~(UART_MCR_DTR | UART_MCR_RTS);</div><div class='del'>-	if (info-&gt;tty)</div><div class='del'>-		set_bit(TTY_IO_ERROR, &amp;info-&gt;tty-&gt;flags);</div><div class='del'>-	mod_timer(&amp;info-&gt;stoptimer, jiffies + (10 * HZ));</div><div class='del'>-	skb_queue_purge(&amp;info-&gt;tx_queue);</div><div class='del'>-	skb_queue_purge(&amp;info-&gt;rx_queue);</div><div class='del'>-	info-&gt;flags &amp;= ~CTC_ASYNC_INITIALIZED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ctc_tty_write() is the main send-routine. It is called from the upper</div><div class='del'>- * levels within the kernel to perform sending data. Depending on the</div><div class='del'>- * online-flag it either directs output to the at-command-interpreter or</div><div class='del'>- * to the lower level. Additional tasks done here:</div><div class='del'>- *  - If online, check for escape-sequence (+++)</div><div class='del'>- *  - If sending audio-data, call ctc_tty_DLEdown() to parse DLE-codes.</div><div class='del'>- *  - If receiving audio-data, call ctc_tty_end_vrx() to abort if needed.</div><div class='del'>- *  - If dialing, abort dial.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ctc_tty_write(struct tty_struct *tty, const u_char * buf, int count)</div><div class='del'>-{</div><div class='del'>-	int c;</div><div class='del'>-	int total = 0;</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 5, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_shuttingdown)</div><div class='del'>-		goto ex;</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_write"))</div><div class='del'>-		goto ex;</div><div class='del'>-	if (!tty)</div><div class='del'>-		goto ex;</div><div class='del'>-	if (!info-&gt;netdev) {</div><div class='del'>-		total = -ENODEV;</div><div class='del'>-		goto ex;</div><div class='del'>-	}</div><div class='del'>-	while (1) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		int skb_res;</div><div class='del'>-</div><div class='del'>-		c = (count &lt; CTC_TTY_XMIT_SIZE) ? count : CTC_TTY_XMIT_SIZE;</div><div class='del'>-		if (c &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		skb_res = info-&gt;netdev-&gt;hard_header_len + sizeof(info-&gt;mcr) +</div><div class='del'>-			+ sizeof(__u32);</div><div class='del'>-		skb = dev_alloc_skb(skb_res + c);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "ctc_tty: Out of memory in %s%d write\n",</div><div class='del'>-			       CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb, skb_res);</div><div class='del'>-		memcpy(skb_put(skb, c), buf, c);</div><div class='del'>-		skb_queue_tail(&amp;info-&gt;tx_queue, skb);</div><div class='del'>-		buf += c;</div><div class='del'>-		total += c;</div><div class='del'>-		count -= c;</div><div class='del'>-	}</div><div class='del'>-	if (!skb_queue_empty(&amp;info-&gt;tx_queue)) {</div><div class='del'>-		info-&gt;lsr &amp;= ~UART_LSR_TEMT;</div><div class='del'>-		tasklet_schedule(&amp;info-&gt;tasklet);</div><div class='del'>-	}</div><div class='del'>-ex:</div><div class='del'>-	DBF_TEXT(trace, 6, __FUNCTION__);</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ctc_tty_write_room(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_write_room"))</div><div class='del'>-		return 0;</div><div class='del'>-	return CTC_TTY_XMIT_SIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ctc_tty_chars_in_buffer(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_chars_in_buffer"))</div><div class='del'>-		return 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_flush_buffer(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (!tty)</div><div class='del'>-		goto ex;</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, flags);</div><div class='del'>-	info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_flush_buffer")) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-		goto ex;</div><div class='del'>-	}</div><div class='del'>-	skb_queue_purge(&amp;info-&gt;tx_queue);</div><div class='del'>-	info-&gt;lsr |= UART_LSR_TEMT;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-	wake_up_interruptible(&amp;tty-&gt;write_wait);</div><div class='del'>-	tty_wakeup(tty);</div><div class='del'>-ex:</div><div class='del'>-	DBF_TEXT_(trace, 2, "ex: %s ", __FUNCTION__);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_flush_chars(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_shuttingdown)</div><div class='del'>-		return;</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_flush_chars"))</div><div class='del'>-		return;</div><div class='del'>-	if (tty-&gt;stopped || tty-&gt;hw_stopped || skb_queue_empty(&amp;info-&gt;tx_queue))</div><div class='del'>-		return;</div><div class='del'>-	tasklet_schedule(&amp;info-&gt;tasklet);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * ctc_tty_throttle()</div><div class='del'>- *</div><div class='del'>- * This routine is called by the upper-layer tty layer to signal that</div><div class='del'>- * incoming characters should be throttled.</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ctc_tty_throttle(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_throttle"))</div><div class='del'>-		return;</div><div class='del'>-	info-&gt;mcr &amp;= ~UART_MCR_RTS;</div><div class='del'>-	if (I_IXOFF(tty))</div><div class='del'>-		ctc_tty_inject(info, STOP_CHAR(tty));</div><div class='del'>-	ctc_tty_transmit_status(info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_unthrottle(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_unthrottle"))</div><div class='del'>-		return;</div><div class='del'>-	info-&gt;mcr |= UART_MCR_RTS;</div><div class='del'>-	if (I_IXOFF(tty))</div><div class='del'>-		ctc_tty_inject(info, START_CHAR(tty));</div><div class='del'>-	ctc_tty_transmit_status(info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * ctc_tty_ioctl() and friends</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ctc_tty_get_lsr_info - get line status register info</div><div class='del'>- *</div><div class='del'>- * Purpose: Let user call ioctl() to get info when the UART physically</div><div class='del'>- *          is emptied.  On bus types like RS485, the transmitter must</div><div class='del'>- *          release the bus after transmitting. This must be done when</div><div class='del'>- *          the transmit shift register is empty, not be done when the</div><div class='del'>- *          transmit holding register is empty.  This functionality</div><div class='del'>- *          allows RS485 driver to be written in user space.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ctc_tty_get_lsr_info(ctc_tty_info * info, uint __user *value)</div><div class='del'>-{</div><div class='del'>-	u_char status;</div><div class='del'>-	uint result;</div><div class='del'>-	ulong flags;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, flags);</div><div class='del'>-	status = info-&gt;lsr;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-	result = ((status &amp; UART_LSR_TEMT) ? TIOCSER_TEMT : 0);</div><div class='del'>-	put_user(result, value);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ctc_tty_tiocmget(struct tty_struct *tty, struct file *file)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-	u_char control,</div><div class='del'>-	 status;</div><div class='del'>-	uint result;</div><div class='del'>-	ulong flags;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_ioctl"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	control = info-&gt;mcr;</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, flags);</div><div class='del'>-	status = info-&gt;msr;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-	result = ((control &amp; UART_MCR_RTS) ? TIOCM_RTS : 0)</div><div class='del'>-	    | ((control &amp; UART_MCR_DTR) ? TIOCM_DTR : 0)</div><div class='del'>-	    | ((status &amp; UART_MSR_DCD) ? TIOCM_CAR : 0)</div><div class='del'>-	    | ((status &amp; UART_MSR_RI) ? TIOCM_RNG : 0)</div><div class='del'>-	    | ((status &amp; UART_MSR_DSR) ? TIOCM_DSR : 0)</div><div class='del'>-	    | ((status &amp; UART_MSR_CTS) ? TIOCM_CTS : 0);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ctc_tty_tiocmset(struct tty_struct *tty, struct file *file,</div><div class='del'>-		 unsigned int set, unsigned int clear)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_ioctl"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (set &amp; TIOCM_RTS)</div><div class='del'>-		info-&gt;mcr |= UART_MCR_RTS;</div><div class='del'>-	if (set &amp; TIOCM_DTR)</div><div class='del'>-		info-&gt;mcr |= UART_MCR_DTR;</div><div class='del'>-</div><div class='del'>-	if (clear &amp; TIOCM_RTS)</div><div class='del'>-		info-&gt;mcr &amp;= ~UART_MCR_RTS;</div><div class='del'>-	if (clear &amp; TIOCM_DTR)</div><div class='del'>-		info-&gt;mcr &amp;= ~UART_MCR_DTR;</div><div class='del'>-</div><div class='del'>-	if ((set | clear) &amp; (TIOCM_RTS|TIOCM_DTR))</div><div class='del'>-		ctc_tty_transmit_status(info);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ctc_tty_ioctl(struct tty_struct *tty, struct file *file,</div><div class='del'>-	       uint cmd, ulong arg)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-	int error;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_ioctl"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))</div><div class='del'>-		return -EIO;</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		case TCSBRK:   /* SVID version: non-zero arg --&gt; no break */</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_IOCTL</div><div class='del'>-			printk(KERN_DEBUG "%s%d ioctl TCSBRK\n", CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-			retval = tty_check_change(tty);</div><div class='del'>-			if (retval)</div><div class='del'>-				return retval;</div><div class='del'>-			tty_wait_until_sent(tty, 0);</div><div class='del'>-			return 0;</div><div class='del'>-		case TCSBRKP:  /* support for POSIX tcsendbreak() */</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_IOCTL</div><div class='del'>-			printk(KERN_DEBUG "%s%d ioctl TCSBRKP\n", CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-			retval = tty_check_change(tty);</div><div class='del'>-			if (retval)</div><div class='del'>-				return retval;</div><div class='del'>-			tty_wait_until_sent(tty, 0);</div><div class='del'>-			return 0;</div><div class='del'>-		case TIOCGSOFTCAR:</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_IOCTL</div><div class='del'>-			printk(KERN_DEBUG "%s%d ioctl TIOCGSOFTCAR\n", CTC_TTY_NAME,</div><div class='del'>-			       info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-			error = put_user(C_CLOCAL(tty) ? 1 : 0, (ulong __user *) arg);</div><div class='del'>-			return error;</div><div class='del'>-		case TIOCSSOFTCAR:</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_IOCTL</div><div class='del'>-			printk(KERN_DEBUG "%s%d ioctl TIOCSSOFTCAR\n", CTC_TTY_NAME,</div><div class='del'>-			       info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-			error = get_user(arg, (ulong __user *) arg);</div><div class='del'>-			if (error)</div><div class='del'>-				return error;</div><div class='del'>-			tty-&gt;termios-&gt;c_cflag =</div><div class='del'>-			    ((tty-&gt;termios-&gt;c_cflag &amp; ~CLOCAL) |</div><div class='del'>-			     (arg ? CLOCAL : 0));</div><div class='del'>-			return 0;</div><div class='del'>-		case TIOCSERGETLSR:	/* Get line status register */</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_IOCTL</div><div class='del'>-			printk(KERN_DEBUG "%s%d ioctl TIOCSERGETLSR\n", CTC_TTY_NAME,</div><div class='del'>-			       info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-			if (access_ok(VERIFY_WRITE, (void __user *) arg, sizeof(uint)))</div><div class='del'>-				return ctc_tty_get_lsr_info(info, (uint __user *) arg);</div><div class='del'>-			else</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		default:</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_IOCTL</div><div class='del'>-			printk(KERN_DEBUG "UNKNOWN ioctl 0x%08x on %s%d\n", cmd,</div><div class='del'>-			       CTC_TTY_NAME, info-&gt;line);</div><div class='del'>-#endif</div><div class='del'>-			return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_set_termios(struct tty_struct *tty, struct termios *old_termios)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-	unsigned int cflag = tty-&gt;termios-&gt;c_cflag;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	ctc_tty_change_speed(info);</div><div class='del'>-</div><div class='del'>-	/* Handle transition to B0 */</div><div class='del'>-	if ((old_termios-&gt;c_cflag &amp; CBAUD) &amp;&amp; !(cflag &amp; CBAUD)) {</div><div class='del'>-		info-&gt;mcr &amp;= ~(UART_MCR_DTR|UART_MCR_RTS);</div><div class='del'>-		ctc_tty_transmit_status(info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle transition from B0 to other */</div><div class='del'>-	if (!(old_termios-&gt;c_cflag &amp; CBAUD) &amp;&amp; (cflag &amp; CBAUD)) {</div><div class='del'>-		info-&gt;mcr |= UART_MCR_DTR;</div><div class='del'>-		if (!(tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS) ||</div><div class='del'>-                    !test_bit(TTY_THROTTLED, &amp;tty-&gt;flags)) {</div><div class='del'>-                        info-&gt;mcr |= UART_MCR_RTS;</div><div class='del'>-                }</div><div class='del'>-		ctc_tty_transmit_status(info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle turning off CRTSCTS */</div><div class='del'>-	if ((old_termios-&gt;c_cflag &amp; CRTSCTS) &amp;&amp;</div><div class='del'>-            !(tty-&gt;termios-&gt;c_cflag &amp; CRTSCTS))</div><div class='del'>-                tty-&gt;hw_stopped = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- * ctc_tty_open() and friends</div><div class='del'>- * ------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ctc_tty_block_til_ready(struct tty_struct *tty, struct file *filp, ctc_tty_info *info)</div><div class='del'>-{</div><div class='del'>-	DECLARE_WAITQUEUE(wait, NULL);</div><div class='del'>-	int do_clocal = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 4, __FUNCTION__);</div><div class='del'>-	/*</div><div class='del'>-	 * If the device is in the middle of being closed, then block</div><div class='del'>-	 * until it's done, and then try again.</div><div class='del'>-	 */</div><div class='del'>-	if (tty_hung_up_p(filp) ||</div><div class='del'>-	    (info-&gt;flags &amp; CTC_ASYNC_CLOSING)) {</div><div class='del'>-		if (info-&gt;flags &amp; CTC_ASYNC_CLOSING)</div><div class='del'>-			wait_event(info-&gt;close_wait,</div><div class='del'>-				   !(info-&gt;flags &amp; CTC_ASYNC_CLOSING));</div><div class='del'>-#ifdef MODEM_DO_RESTART</div><div class='del'>-		if (info-&gt;flags &amp; CTC_ASYNC_HUP_NOTIFY)</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		else</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-#else</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * If non-blocking mode is set, then make the check up front</div><div class='del'>-	 * and then exit.</div><div class='del'>-	 */</div><div class='del'>-	if ((filp-&gt;f_flags &amp; O_NONBLOCK) ||</div><div class='del'>-	    (tty-&gt;flags &amp; (1 &lt;&lt; TTY_IO_ERROR))) {</div><div class='del'>-		info-&gt;flags |= CTC_ASYNC_NORMAL_ACTIVE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (tty-&gt;termios-&gt;c_cflag &amp; CLOCAL)</div><div class='del'>-		do_clocal = 1;</div><div class='del'>-	/*</div><div class='del'>-	 * Block waiting for the carrier detect and the line to become</div><div class='del'>-	 * free (i.e., not in use by the callout).  While we are in</div><div class='del'>-	 * this loop, info-&gt;count is dropped by one, so that</div><div class='del'>-	 * ctc_tty_close() knows when to free things.  We restore it upon</div><div class='del'>-	 * exit, either normal or abnormal.</div><div class='del'>-	 */</div><div class='del'>-	retval = 0;</div><div class='del'>-	add_wait_queue(&amp;info-&gt;open_wait, &amp;wait);</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "ctc_tty_block_til_ready before block: %s%d, count = %d\n",</div><div class='del'>-	       CTC_TTY_NAME, info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, flags);</div><div class='del'>-	if (!(tty_hung_up_p(filp)))</div><div class='del'>-		info-&gt;count--;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-	info-&gt;blocked_open++;</div><div class='del'>-	while (1) {</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-		if (tty_hung_up_p(filp) ||</div><div class='del'>-		    !(info-&gt;flags &amp; CTC_ASYNC_INITIALIZED)) {</div><div class='del'>-#ifdef MODEM_DO_RESTART</div><div class='del'>-			if (info-&gt;flags &amp; CTC_ASYNC_HUP_NOTIFY)</div><div class='del'>-				retval = -EAGAIN;</div><div class='del'>-			else</div><div class='del'>-				retval = -ERESTARTSYS;</div><div class='del'>-#else</div><div class='del'>-			retval = -EAGAIN;</div><div class='del'>-#endif</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!(info-&gt;flags &amp; CTC_ASYNC_CLOSING) &amp;&amp;</div><div class='del'>-		    (do_clocal || (info-&gt;msr &amp; UART_MSR_DCD))) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			retval = -ERESTARTSYS;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-		printk(KERN_DEBUG "ctc_tty_block_til_ready blocking: %s%d, count = %d\n",</div><div class='del'>-		       CTC_TTY_NAME, info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-	current-&gt;state = TASK_RUNNING;</div><div class='del'>-	remove_wait_queue(&amp;info-&gt;open_wait, &amp;wait);</div><div class='del'>-	if (!tty_hung_up_p(filp))</div><div class='del'>-		info-&gt;count++;</div><div class='del'>-	info-&gt;blocked_open--;</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "ctc_tty_block_til_ready after blocking: %s%d, count = %d\n",</div><div class='del'>-	       CTC_TTY_NAME, info-&gt;line, info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-	info-&gt;flags |= CTC_ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine is called whenever a serial port is opened.  It</div><div class='del'>- * enables interrupts for a serial port, linking in its async structure into</div><div class='del'>- * the IRQ chain.   It also performs the serial-specific</div><div class='del'>- * initialization for the tty structure.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-ctc_tty_open(struct tty_struct *tty, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info;</div><div class='del'>-	unsigned long saveflags;</div><div class='del'>-	int retval,</div><div class='del'>-	 line;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	line = tty-&gt;index;</div><div class='del'>-	if (line &lt; 0 || line &gt; CTC_TTY_MAX_DEVICES)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	info = &amp;driver-&gt;info[line];</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_open"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (!info-&gt;netdev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "ctc_tty_open %s, count = %d\n", tty-&gt;name,</div><div class='del'>-	       info-&gt;count);</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	info-&gt;count++;</div><div class='del'>-	tty-&gt;driver_data = info;</div><div class='del'>-	info-&gt;tty = tty;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	/*</div><div class='del'>-	 * Start up serial port</div><div class='del'>-	 */</div><div class='del'>-	retval = ctc_tty_startup(info);</div><div class='del'>-	if (retval) {</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-		printk(KERN_DEBUG "ctc_tty_open return after startup\n");</div><div class='del'>-#endif</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-	retval = ctc_tty_block_til_ready(tty, filp, info);</div><div class='del'>-	if (retval) {</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-		printk(KERN_DEBUG "ctc_tty_open return after ctc_tty_block_til_ready \n");</div><div class='del'>-#endif</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "ctc_tty_open %s successful...\n", tty-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ctc_tty_close(struct tty_struct *tty, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *) tty-&gt;driver_data;</div><div class='del'>-	ulong flags;</div><div class='del'>-	ulong timeout;</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	if (!info || ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_close"))</div><div class='del'>-		return;</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, flags);</div><div class='del'>-	if (tty_hung_up_p(filp)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-		printk(KERN_DEBUG "ctc_tty_close return after tty_hung_up_p\n");</div><div class='del'>-#endif</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if ((tty-&gt;count == 1) &amp;&amp; (info-&gt;count != 1)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Uh, oh.  tty-&gt;count is 1, which means that the tty</div><div class='del'>-		 * structure will be freed.  Info-&gt;count should always</div><div class='del'>-		 * be one in these conditions.  If it's greater than</div><div class='del'>-		 * one, we've got real problems, since it means the</div><div class='del'>-		 * serial port won't be shutdown.</div><div class='del'>-		 */</div><div class='del'>-		printk(KERN_ERR "ctc_tty_close: bad port count; tty-&gt;count is 1, "</div><div class='del'>-		       "info-&gt;count is %d\n", info-&gt;count);</div><div class='del'>-		info-&gt;count = 1;</div><div class='del'>-	}</div><div class='del'>-	if (--info-&gt;count &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctc_tty_close: bad port count for %s%d: %d\n",</div><div class='del'>-		       CTC_TTY_NAME, info-&gt;line, info-&gt;count);</div><div class='del'>-		info-&gt;count = 0;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;count) {</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-		printk(KERN_DEBUG "ctc_tty_close after info-&gt;count != 0\n");</div><div class='del'>-#endif</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	info-&gt;flags |= CTC_ASYNC_CLOSING;</div><div class='del'>-	tty-&gt;closing = 1;</div><div class='del'>-	/*</div><div class='del'>-	 * At this point we stop accepting input.  To do this, we</div><div class='del'>-	 * disable the receive line status interrupts, and tell the</div><div class='del'>-	 * interrupt driver to stop checking the data ready bit in the</div><div class='del'>-	 * line status register.</div><div class='del'>-	 */</div><div class='del'>-	if (info-&gt;flags &amp; CTC_ASYNC_INITIALIZED) {</div><div class='del'>-		tty_wait_until_sent(tty, 30*HZ); /* 30 seconds timeout */</div><div class='del'>-		/*</div><div class='del'>-		 * Before we drop DTR, make sure the UART transmitter</div><div class='del'>-		 * has completely drained; this is especially</div><div class='del'>-		 * important if there is a transmit FIFO!</div><div class='del'>-		 */</div><div class='del'>-		timeout = jiffies + HZ;</div><div class='del'>-		while (!(info-&gt;lsr &amp; UART_LSR_TEMT)) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-			msleep(500);</div><div class='del'>-			spin_lock_irqsave(&amp;ctc_tty_lock, flags);</div><div class='del'>-			if (time_after(jiffies,timeout))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ctc_tty_shutdown(info);</div><div class='del'>-	if (tty-&gt;driver-&gt;flush_buffer) {</div><div class='del'>-		skb_queue_purge(&amp;info-&gt;tx_queue);</div><div class='del'>-		info-&gt;lsr |= UART_LSR_TEMT;</div><div class='del'>-	}</div><div class='del'>-	tty_ldisc_flush(tty);</div><div class='del'>-	info-&gt;tty = 0;</div><div class='del'>-	tty-&gt;closing = 0;</div><div class='del'>-	if (info-&gt;blocked_open) {</div><div class='del'>-		msleep_interruptible(500);</div><div class='del'>-		wake_up_interruptible(&amp;info-&gt;open_wait);</div><div class='del'>-	}</div><div class='del'>-	info-&gt;flags &amp;= ~(CTC_ASYNC_NORMAL_ACTIVE | CTC_ASYNC_CLOSING);</div><div class='del'>-	wake_up_interruptible(&amp;info-&gt;close_wait);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, flags);</div><div class='del'>-#ifdef CTC_DEBUG_MODEM_OPEN</div><div class='del'>-	printk(KERN_DEBUG "ctc_tty_close normal exit\n");</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ctc_tty_hangup() --- called by tty_hangup() when a hangup is signaled.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ctc_tty_hangup(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (ctc_tty_info *)tty-&gt;driver_data;</div><div class='del'>-	unsigned long saveflags;</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	if (ctc_tty_paranoia_check(info, tty-&gt;name, "ctc_tty_hangup"))</div><div class='del'>-		return;</div><div class='del'>-	ctc_tty_shutdown(info);</div><div class='del'>-	info-&gt;count = 0;</div><div class='del'>-	info-&gt;flags &amp;= ~CTC_ASYNC_NORMAL_ACTIVE;</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	info-&gt;tty = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	wake_up_interruptible(&amp;info-&gt;open_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * For all online tty's, try sending data to</div><div class='del'>- * the lower levels.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ctc_tty_task(unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	ctc_tty_info *info = (void *)arg;</div><div class='del'>-	unsigned long saveflags;</div><div class='del'>-	int again;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 3, __FUNCTION__);</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	if ((!ctc_tty_shuttingdown) &amp;&amp; info) {</div><div class='del'>-		again = ctc_tty_tint(info);</div><div class='del'>-		if (!again)</div><div class='del'>-			info-&gt;lsr |= UART_LSR_TEMT;</div><div class='del'>-		again |= ctc_tty_readmodem(info);</div><div class='del'>-		if (again) {</div><div class='del'>-			tasklet_schedule(&amp;info-&gt;tasklet);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct tty_operations ctc_ops = {</div><div class='del'>-	.open = ctc_tty_open,</div><div class='del'>-	.close = ctc_tty_close,</div><div class='del'>-	.write = ctc_tty_write,</div><div class='del'>-	.flush_chars = ctc_tty_flush_chars,</div><div class='del'>-	.write_room = ctc_tty_write_room,</div><div class='del'>-	.chars_in_buffer = ctc_tty_chars_in_buffer,</div><div class='del'>-	.flush_buffer = ctc_tty_flush_buffer,</div><div class='del'>-	.ioctl = ctc_tty_ioctl,</div><div class='del'>-	.throttle = ctc_tty_throttle,</div><div class='del'>-	.unthrottle = ctc_tty_unthrottle,</div><div class='del'>-	.set_termios = ctc_tty_set_termios,</div><div class='del'>-	.hangup = ctc_tty_hangup,</div><div class='del'>-	.tiocmget = ctc_tty_tiocmget,</div><div class='del'>-	.tiocmset = ctc_tty_tiocmset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-ctc_tty_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	ctc_tty_info *info;</div><div class='del'>-	struct tty_driver *device;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 2, __FUNCTION__);</div><div class='del'>-	driver = kmalloc(sizeof(ctc_tty_driver), GFP_KERNEL);</div><div class='del'>-	if (driver == NULL) {</div><div class='del'>-		printk(KERN_WARNING "Out of memory in ctc_tty_modem_init\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	memset(driver, 0, sizeof(ctc_tty_driver));</div><div class='del'>-	device = alloc_tty_driver(CTC_TTY_MAX_DEVICES);</div><div class='del'>-	if (!device) {</div><div class='del'>-		kfree(driver);</div><div class='del'>-		printk(KERN_WARNING "Out of memory in ctc_tty_modem_init\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	device-&gt;devfs_name = "ctc/" CTC_TTY_NAME;</div><div class='del'>-	device-&gt;name = CTC_TTY_NAME;</div><div class='del'>-	device-&gt;major = CTC_TTY_MAJOR;</div><div class='del'>-	device-&gt;minor_start = 0;</div><div class='del'>-	device-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='del'>-	device-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='del'>-	device-&gt;init_termios = tty_std_termios;</div><div class='del'>-	device-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-	device-&gt;flags = TTY_DRIVER_REAL_RAW;</div><div class='del'>-	device-&gt;driver_name = "ctc_tty",</div><div class='del'>-	tty_set_operations(device, &amp;ctc_ops);</div><div class='del'>-	if (tty_register_driver(device)) {</div><div class='del'>-		printk(KERN_WARNING "ctc_tty: Couldn't register serial-device\n");</div><div class='del'>-		put_tty_driver(device);</div><div class='del'>-		kfree(driver);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	driver-&gt;ctc_tty_device = device;</div><div class='del'>-	for (i = 0; i &lt; CTC_TTY_MAX_DEVICES; i++) {</div><div class='del'>-		info = &amp;driver-&gt;info[i];</div><div class='del'>-		init_MUTEX(&amp;info-&gt;write_sem);</div><div class='del'>-		tasklet_init(&amp;info-&gt;tasklet, ctc_tty_task,</div><div class='del'>-				(unsigned long) info);</div><div class='del'>-		info-&gt;magic = CTC_ASYNC_MAGIC;</div><div class='del'>-		info-&gt;line = i;</div><div class='del'>-		info-&gt;tty = 0;</div><div class='del'>-		info-&gt;count = 0;</div><div class='del'>-		info-&gt;blocked_open = 0;</div><div class='del'>-		init_waitqueue_head(&amp;info-&gt;open_wait);</div><div class='del'>-		init_waitqueue_head(&amp;info-&gt;close_wait);</div><div class='del'>-		skb_queue_head_init(&amp;info-&gt;tx_queue);</div><div class='del'>-		skb_queue_head_init(&amp;info-&gt;rx_queue);</div><div class='del'>-		init_timer(&amp;info-&gt;stoptimer);</div><div class='del'>-		info-&gt;stoptimer.function = ctc_tty_stopdev;</div><div class='del'>-		info-&gt;stoptimer.data = (unsigned long)info;</div><div class='del'>-		info-&gt;mcr = UART_MCR_RTS;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-ctc_tty_register_netdev(struct net_device *dev) {</div><div class='del'>-	int ttynum;</div><div class='del'>-	char *err;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 2, __FUNCTION__);</div><div class='del'>-	if ((!dev) || (!dev-&gt;name)) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "ctc_tty_register_netdev called "</div><div class='del'>-		       "with NULL dev or NULL dev-name\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	If the name is a format string the caller wants us to</div><div class='del'>-	 *	do a name allocation : format string must end with %d</div><div class='del'>-	 */</div><div class='del'>-	if (strchr(dev-&gt;name, '%'))</div><div class='del'>-	{</div><div class='del'>-		int err = dev_alloc_name(dev, dev-&gt;name);	// dev-&gt;name is changed by this</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_DEBUG "dev_alloc returned error %d\n", err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (p = dev-&gt;name; p &amp;&amp; ((*p &lt; '0') || (*p &gt; '9')); p++);</div><div class='del'>-	ttynum = simple_strtoul(p, &amp;err, 0);</div><div class='del'>-	if ((ttynum &lt; 0) || (ttynum &gt;= CTC_TTY_MAX_DEVICES) ||</div><div class='del'>-	    (err &amp;&amp; *err)) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "ctc_tty_register_netdev called "</div><div class='del'>-		       "with number in name '%s'\n", dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if (driver-&gt;info[ttynum].netdev) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "ctc_tty_register_netdev called "</div><div class='del'>-		       "for already registered device '%s'\n",</div><div class='del'>-		       dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	driver-&gt;info[ttynum].netdev = dev;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-ctc_tty_unregister_netdev(struct net_device *dev) {</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long saveflags;</div><div class='del'>-	ctc_tty_info *info = NULL;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 2, __FUNCTION__);</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	for (i = 0; i &lt; CTC_TTY_MAX_DEVICES; i++)</div><div class='del'>-		if (driver-&gt;info[i].netdev == dev) {</div><div class='del'>-			info = &amp;driver-&gt;info[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	if (info) {</div><div class='del'>-		info-&gt;netdev = NULL;</div><div class='del'>-		skb_queue_purge(&amp;info-&gt;tx_queue);</div><div class='del'>-		skb_queue_purge(&amp;info-&gt;rx_queue);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-ctc_tty_cleanup(void) {</div><div class='del'>-	unsigned long saveflags;</div><div class='del'>-</div><div class='del'>-	DBF_TEXT(trace, 2, __FUNCTION__);</div><div class='del'>-	spin_lock_irqsave(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	ctc_tty_shuttingdown = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctc_tty_lock, saveflags);</div><div class='del'>-	tty_unregister_driver(driver-&gt;ctc_tty_device);</div><div class='del'>-	put_tty_driver(driver-&gt;ctc_tty_device);</div><div class='del'>-	kfree(driver);</div><div class='del'>-	driver = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/s390/net/ctctty.h b/drivers/s390/net/ctctty.h<br/>deleted file mode 100644<br/>index 7254dc006311..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/ctctty.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/ctctty.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * CTC / ESCON network driver, tty interface.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation</div><div class='del'>- * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2, or (at your option)</div><div class='del'>- * any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CTCTTY_H_</div><div class='del'>-#define _CTCTTY_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-</div><div class='del'>-extern int  ctc_tty_register_netdev(struct net_device *);</div><div class='del'>-extern void ctc_tty_unregister_netdev(struct net_device *);</div><div class='del'>-extern void ctc_tty_netif_rx(struct sk_buff *);</div><div class='del'>-extern int  ctc_tty_init(void);</div><div class='del'>-extern void ctc_tty_cleanup(void);</div><div class='del'>-extern void ctc_tty_setcarrier(struct net_device *, int);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c<br/>index 7145e2134cf0..2c1db8036b7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/fsm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/fsm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/fsm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/fsm.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "fsm.h"</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c<br/>index e0c7deb98831..0e863df4027a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/iucv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/iucv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/iucv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/iucv.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -693,7 +692,7 @@ iucv_retrieve_buffer (void)</div><div class='ctx'> 	iucv_debug(1, "entering");</div><div class='ctx'> 	if (iucv_cpuid != -1) {</div><div class='ctx'> 		smp_call_function_on(iucv_retrieve_buffer_cpuid,</div><div class='del'>-				     0, 0, 1, iucv_cpuid);</div><div class='add'>+				     NULL, 0, 1, iucv_cpuid);</div><div class='ctx'> 		/* Release the cpu reserved by iucv_declare_buffer. */</div><div class='ctx'> 		smp_put_cpu(iucv_cpuid);</div><div class='ctx'> 		iucv_cpuid = -1;</div><div class='head'>diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c<br/>index f94419b334f7..2eded55ae88d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/lcs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/lcs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/lcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/lcs.c</a></div><div class='hunk'>@@ -1140,10 +1140,9 @@ list_modified:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* re-insert all entries from the failed_list into ipm_list */</div><div class='del'>-	list_for_each_entry_safe(ipm, tmp, &amp;failed_list, list) {</div><div class='del'>-		list_del_init(&amp;ipm-&gt;list);</div><div class='del'>-		list_add_tail(&amp;ipm-&gt;list, &amp;card-&gt;ipm_list);</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry_safe(ipm, tmp, &amp;failed_list, list)</div><div class='add'>+		list_move_tail(&amp;ipm-&gt;list, &amp;card-&gt;ipm_list);</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;card-&gt;ipm_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c<br/>index b452cc1afd55..5d6e6cbfa360 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/netiucv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/netiucv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/netiucv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/netiucv.c</a></div><div class='hunk'>@@ -2029,7 +2029,7 @@ remove_write (struct device_driver *drv, const char *buf, size_t count)</div><div class='ctx'>                 count = IFNAMSIZ-1;</div><div class='ctx'> </div><div class='ctx'>         for (i=0, p=(char *)buf; i&lt;count &amp;&amp; *p; i++, p++) {</div><div class='del'>-                if ((*p == '\n') | (*p == ' ')) {</div><div class='add'>+                if ((*p == '\n') || (*p == ' ')) {</div><div class='ctx'>                         /* trailing lf, grr */</div><div class='ctx'>                         break;</div><div class='ctx'>                 } else {</div><div class='head'>diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c<br/>index 0bab60a20309..8491598f9149 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_eddp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_eddp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_eddp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/qeth_eddp.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *    Author(s): Thomas Spatzier &lt;tspat@de.ibm.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='hunk'>@@ -420,7 +419,7 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,</div><div class='ctx'>        }</div><div class='ctx'> 	tcph = eddp-&gt;skb-&gt;h.th;</div><div class='ctx'> 	while (eddp-&gt;skb_offset &lt; eddp-&gt;skb-&gt;len) {</div><div class='del'>-		data_len = min((int)skb_shinfo(eddp-&gt;skb)-&gt;tso_size,</div><div class='add'>+		data_len = min((int)skb_shinfo(eddp-&gt;skb)-&gt;gso_size,</div><div class='ctx'> 			       (int)(eddp-&gt;skb-&gt;len - eddp-&gt;skb_offset));</div><div class='ctx'> 		/* prepare qdio hdr */</div><div class='ctx'> 		if (eddp-&gt;qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2){</div><div class='hunk'>@@ -515,20 +514,20 @@ qeth_eddp_calc_num_pages(struct qeth_eddp_context *ctx, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	QETH_DBF_TEXT(trace, 5, "eddpcanp");</div><div class='ctx'> 	/* can we put multiple skbs in one page? */</div><div class='del'>-	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)-&gt;tso_size + hdr_len);</div><div class='add'>+	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)-&gt;gso_size + hdr_len);</div><div class='ctx'> 	if (skbs_per_page &gt; 1){</div><div class='del'>-		ctx-&gt;num_pages = (skb_shinfo(skb)-&gt;tso_segs + 1) /</div><div class='add'>+		ctx-&gt;num_pages = (skb_shinfo(skb)-&gt;gso_segs + 1) /</div><div class='ctx'> 				 skbs_per_page + 1;</div><div class='ctx'> 		ctx-&gt;elements_per_skb = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* no -&gt; how many elements per skb? */</div><div class='del'>-		ctx-&gt;elements_per_skb = (skb_shinfo(skb)-&gt;tso_size + hdr_len +</div><div class='add'>+		ctx-&gt;elements_per_skb = (skb_shinfo(skb)-&gt;gso_size + hdr_len +</div><div class='ctx'> 				     PAGE_SIZE) &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		ctx-&gt;num_pages = ctx-&gt;elements_per_skb *</div><div class='del'>-				 (skb_shinfo(skb)-&gt;tso_segs + 1);</div><div class='add'>+				 (skb_shinfo(skb)-&gt;gso_segs + 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	ctx-&gt;num_elements = ctx-&gt;elements_per_skb *</div><div class='del'>-			    (skb_shinfo(skb)-&gt;tso_segs + 1);</div><div class='add'>+			    (skb_shinfo(skb)-&gt;gso_segs + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct qeth_eddp_context *</div><div class='head'>diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c<br/>index 9e671a48cd2f..103c41470bd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/qeth_main.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -85,6 +84,8 @@ static debug_info_t *qeth_dbf_qerr = NULL;</div><div class='ctx'> </div><div class='ctx'> DEFINE_PER_CPU(char[256], qeth_dbf_txt_buf);</div><div class='ctx'> </div><div class='add'>+static struct lock_class_key qdio_out_skb_queue_key;</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * some more definitions and declarations</div><div class='ctx'>  */</div><div class='hunk'>@@ -3230,6 +3231,9 @@ qeth_alloc_qdio_buffers(struct qeth_card *card)</div><div class='ctx'> 				&amp;card-&gt;qdio.out_qs[i]-&gt;qdio_bufs[j];</div><div class='ctx'> 			skb_queue_head_init(&amp;card-&gt;qdio.out_qs[i]-&gt;bufs[j].</div><div class='ctx'> 					    skb_list);</div><div class='add'>+			lockdep_set_class(</div><div class='add'>+				&amp;card-&gt;qdio.out_qs[i]-&gt;bufs[j].skb_list.lock,</div><div class='add'>+				&amp;qdio_out_skb_queue_key);</div><div class='ctx'> 			INIT_LIST_HEAD(&amp;card-&gt;qdio.out_qs[i]-&gt;bufs[j].ctx_list);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4416,8 +4420,10 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)</div><div class='ctx'> 	enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO;</div><div class='ctx'> 	struct qeth_eddp_context *ctx = NULL;</div><div class='ctx'> 	int tx_bytes = skb-&gt;len;</div><div class='add'>+#ifdef CONFIG_QETH_PERF_STATS</div><div class='ctx'> 	unsigned short nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	unsigned short tso_size = skb_shinfo(skb)-&gt;tso_size;</div><div class='add'>+	unsigned short tso_size = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+#endif</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	QETH_DBF_TEXT(trace, 6, "sendpkt");</div><div class='hunk'>@@ -4453,7 +4459,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)</div><div class='ctx'> 	queue = card-&gt;qdio.out_qs</div><div class='ctx'> 		[qeth_get_priority_queue(card, skb, ipv, cast_type)];</div><div class='ctx'> </div><div class='del'>-	if (skb_shinfo(skb)-&gt;tso_size)</div><div class='add'>+	if (skb_is_gso(skb))</div><div class='ctx'> 		large_send = card-&gt;options.large_send;</div><div class='ctx'> </div><div class='ctx'> 	/*are we able to do TSO ? If so ,prepare and send it from here */</div><div class='hunk'>@@ -4798,7 +4804,7 @@ static struct qeth_cmd_buffer *</div><div class='ctx'> qeth_get_setassparms_cmd(struct qeth_card *, enum qeth_ipa_funcs,</div><div class='ctx'> 			 __u16, __u16, enum qeth_prot_versions);</div><div class='ctx'> static int</div><div class='del'>-qeth_arp_query(struct qeth_card *card, char *udata)</div><div class='add'>+qeth_arp_query(struct qeth_card *card, char __user *udata)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_cmd_buffer *iob;</div><div class='ctx'> 	struct qeth_arp_query_info qinfo = {0, };</div><div class='hunk'>@@ -4931,7 +4937,7 @@ qeth_get_adapter_cmd(struct qeth_card *card, __u32 command, __u32 cmdlen)</div><div class='ctx'>  * function to send SNMP commands to OSA-E card</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-qeth_snmp_command(struct qeth_card *card, char *udata)</div><div class='add'>+qeth_snmp_command(struct qeth_card *card, char __user *udata)</div><div class='ctx'> {</div><div class='ctx'> 	struct qeth_cmd_buffer *iob;</div><div class='ctx'> 	struct qeth_ipa_cmd *cmd;</div><div class='hunk'>@@ -5273,6 +5279,7 @@ qeth_free_vlan_buffer(struct qeth_card *card, struct qeth_qdio_out_buffer *buf,</div><div class='ctx'> 	struct sk_buff_head tmp_list;</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;tmp_list);</div><div class='add'>+	lockdep_set_class(&amp;tmp_list.lock, &amp;qdio_out_skb_queue_key);</div><div class='ctx'> 	for(i = 0; i &lt; QETH_MAX_BUFFER_ELEMENTS(card); ++i){</div><div class='ctx'> 		while ((skb = skb_dequeue(&amp;buf-&gt;skb_list))){</div><div class='ctx'> 			if (vlan_tx_tag_present(skb) &amp;&amp;</div><div class='hunk'>@@ -7902,9 +7909,9 @@ qeth_set_online(struct ccwgroup_device *gdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ccw_device_id qeth_ids[] = {</div><div class='del'>-	{CCW_DEVICE(0x1731, 0x01), driver_info:QETH_CARD_TYPE_OSAE},</div><div class='del'>-	{CCW_DEVICE(0x1731, 0x05), driver_info:QETH_CARD_TYPE_IQD},</div><div class='del'>-	{CCW_DEVICE(0x1731, 0x06), driver_info:QETH_CARD_TYPE_OSN},</div><div class='add'>+	{CCW_DEVICE(0x1731, 0x01), .driver_info = QETH_CARD_TYPE_OSAE},</div><div class='add'>+	{CCW_DEVICE(0x1731, 0x05), .driver_info = QETH_CARD_TYPE_IQD},</div><div class='add'>+	{CCW_DEVICE(0x1731, 0x06), .driver_info = QETH_CARD_TYPE_OSN},</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(ccw, qeth_ids);</div><div class='hunk'>@@ -8373,7 +8380,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block qeth_ip_notifier = {</div><div class='ctx'> 	qeth_ip_event,</div><div class='del'>-	0</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QETH_IPV6</div><div class='hunk'>@@ -8426,7 +8433,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block qeth_ip6_notifier = {</div><div class='ctx'> 	qeth_ip6_event,</div><div class='del'>-	0</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -8453,7 +8460,7 @@ qeth_reboot_event(struct notifier_block *this, unsigned long event, void *ptr)</div><div class='ctx'> </div><div class='ctx'> static struct notifier_block qeth_reboot_notifier = {</div><div class='ctx'> 	qeth_reboot_event,</div><div class='del'>-	0</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c<br/>index 185a9cfbcbdc..001497bbea16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_sys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_sys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_sys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/qeth_sys.c</a></div><div class='hunk'>@@ -1755,7 +1755,7 @@ qeth_driver_group_store(struct device_driver *ddrv, const char *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static DRIVER_ATTR(group, 0200, 0, qeth_driver_group_store);</div><div class='add'>+static DRIVER_ATTR(group, 0200, NULL, qeth_driver_group_store);</div><div class='ctx'> </div><div class='ctx'> static ssize_t</div><div class='ctx'> qeth_driver_notifier_register_store(struct device_driver *ddrv, const char *buf,</div><div class='hunk'>@@ -1783,7 +1783,7 @@ qeth_driver_notifier_register_store(struct device_driver *ddrv, const char *buf,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DRIVER_ATTR(notifier_register, 0200, 0,</div><div class='add'>+static DRIVER_ATTR(notifier_register, 0200, NULL,</div><div class='ctx'> 		   qeth_driver_notifier_register_store);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='head'>diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h<br/>index 24ef40ca9562..593f298142c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_tso.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/qeth_tso.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/qeth_tso.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/qeth_tso.h</a></div><div class='hunk'>@@ -51,7 +51,7 @@ qeth_tso_fill_header(struct qeth_card *card, struct sk_buff *skb)</div><div class='ctx'> 	hdr-&gt;ext.hdr_version = 1;</div><div class='ctx'> 	hdr-&gt;ext.hdr_len     = 28;</div><div class='ctx'> 	/*insert non-fix values */</div><div class='del'>-	hdr-&gt;ext.mss = skb_shinfo(skb)-&gt;tso_size;</div><div class='add'>+	hdr-&gt;ext.mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 	hdr-&gt;ext.dg_hdr_len = (__u16)(iph-&gt;ihl*4 + tcph-&gt;doff*4);</div><div class='ctx'> 	hdr-&gt;ext.payload_len = (__u16)(skb-&gt;len - hdr-&gt;ext.dg_hdr_len -</div><div class='ctx'> 				       sizeof(struct qeth_hdr_tso));</div><div class='head'>diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c<br/>index 72118ee68954..b8179c27ceb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/net/smsgiucv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/net/smsgiucv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/net/smsgiucv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/net/smsgiucv.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ smsg_message_pending(iucv_MessagePending *eib, void *pgm_data)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = iucv_receive(eib-&gt;ippathid, eib-&gt;ipmsgid, eib-&gt;iptrgcls,</div><div class='del'>-			  msg, len, 0, 0, 0);</div><div class='add'>+			  msg, len, NULL, NULL, NULL);</div><div class='ctx'> 	if (rc == 0) {</div><div class='ctx'> 		msg[len] = 0;</div><div class='ctx'> 		EBCASC(msg, len);</div><div class='hunk'>@@ -122,7 +122,7 @@ smsg_unregister_callback(char *prefix, void (*callback)(char *from, char *str))</div><div class='ctx'> 	struct smsg_callback *cb, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;smsg_list_lock);</div><div class='del'>-	cb = 0;</div><div class='add'>+	cb = NULL;</div><div class='ctx'> 	list_for_each_entry(tmp, &amp;smsg_list, list)</div><div class='ctx'> 		if (tmp-&gt;callback == callback &amp;&amp;</div><div class='ctx'> 		    strcmp(tmp-&gt;prefix, prefix) == 0) {</div><div class='hunk'>@@ -139,7 +139,7 @@ smsg_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (smsg_handle &gt; 0) {</div><div class='ctx'> 		cpcmd("SET SMSG OFF", NULL, 0, NULL);</div><div class='del'>-		iucv_sever(smsg_pathid, 0);</div><div class='add'>+		iucv_sever(smsg_pathid, NULL);</div><div class='ctx'> 		iucv_unregister_program(smsg_handle);</div><div class='ctx'> 		driver_unregister(&amp;smsg_driver);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -162,19 +162,19 @@ smsg_init(void)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	smsg_handle = iucv_register_program("SMSGIUCV        ", "*MSG    ",</div><div class='del'>-					    pgmmask, &amp;smsg_ops, 0);</div><div class='add'>+					    pgmmask, &amp;smsg_ops, NULL);</div><div class='ctx'> 	if (!smsg_handle) {</div><div class='ctx'> 		printk(KERN_ERR "SMSGIUCV: failed to register to iucv");</div><div class='ctx'> 		driver_unregister(&amp;smsg_driver);</div><div class='ctx'> 		return -EIO;	/* better errno ? */</div><div class='ctx'> 	}</div><div class='del'>-	rc = iucv_connect (&amp;smsg_pathid, 255, 0, "*MSG    ", 0, 0, 0, 0,</div><div class='del'>-			   smsg_handle, 0);</div><div class='add'>+	rc = iucv_connect (&amp;smsg_pathid, 255, NULL, "*MSG    ", NULL, 0,</div><div class='add'>+			   NULL, NULL, smsg_handle, NULL);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_ERR "SMSGIUCV: failed to connect to *MSG");</div><div class='ctx'> 		iucv_unregister_program(smsg_handle);</div><div class='ctx'> 		driver_unregister(&amp;smsg_driver);</div><div class='del'>-		smsg_handle = 0;</div><div class='add'>+		smsg_handle = NULL;</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	cpcmd("SET SMSG IUCV", NULL, 0, NULL);</div><div class='head'>diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c<br/>index f99e55308b32..5399c5d99b81 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/s390mach.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/s390mach.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/s390mach.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/s390mach.c</a></div><div class='hunk'>@@ -8,12 +8,12 @@</div><div class='ctx'>  *		 Martin Schwidefsky (schwidefsky@de.ibm.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/lowcore.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -56,8 +56,6 @@ s390_collect_crw_info(void *param)</div><div class='ctx'> 	unsigned int chain;</div><div class='ctx'> </div><div class='ctx'> 	sem = (struct semaphore *)param;</div><div class='del'>-	/* Set a nice name. */</div><div class='del'>-	daemonize("kmcheck");</div><div class='ctx'> repeat:</div><div class='ctx'> 	down_interruptible(sem);</div><div class='ctx'> 	slow = 0;</div><div class='hunk'>@@ -113,6 +111,16 @@ repeat:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CRW_RSC_CPATH:</div><div class='ctx'> 			pr_debug("source is channel path %02X\n", crw[0].rsid);</div><div class='add'>+			/*</div><div class='add'>+			 * Check for solicited machine checks. These are</div><div class='add'>+			 * created by reset channel path and need not be</div><div class='add'>+			 * reported to the common I/O layer.</div><div class='add'>+			 */</div><div class='add'>+			if (crw[chain].slct) {</div><div class='add'>+				DBG(KERN_INFO"solicited machine check for "</div><div class='add'>+				    "channel path %02X\n", crw[0].rsid);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			switch (crw[0].erc) {</div><div class='ctx'> 			case CRW_ERC_IPARM: /* Path has come. */</div><div class='ctx'> 				ret = chp_process_crw(crw[0].rsid, 1);</div><div class='hunk'>@@ -380,6 +388,8 @@ s390_do_machine_check(struct pt_regs *regs)</div><div class='ctx'> 	struct mcck_struct *mcck;</div><div class='ctx'> 	int umode;</div><div class='ctx'> </div><div class='add'>+	lockdep_off();</div><div class='add'>+</div><div class='ctx'> 	mci = (struct mci *) &amp;S390_lowcore.mcck_interruption_code;</div><div class='ctx'> 	mcck = &amp;__get_cpu_var(cpu_mcck);</div><div class='ctx'> 	umode = user_mode(regs);</div><div class='hunk'>@@ -484,6 +494,7 @@ s390_do_machine_check(struct pt_regs *regs)</div><div class='ctx'> 		mcck-&gt;warning = 1;</div><div class='ctx'> 		set_thread_flag(TIF_MCCK_PENDING);</div><div class='ctx'> 	}</div><div class='add'>+	lockdep_on();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -516,7 +527,7 @@ arch_initcall(machine_check_init);</div><div class='ctx'> static int __init</div><div class='ctx'> machine_check_crw_init (void)</div><div class='ctx'> {</div><div class='del'>-	kernel_thread(s390_collect_crw_info, &amp;m_sem, CLONE_FS|CLONE_FILES);</div><div class='add'>+	kthread_run(s390_collect_crw_info, &amp;m_sem, "kmcheck");</div><div class='ctx'> 	ctl_set_bit(14, 28);	/* enable channel report MCH */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c<br/>index 395cfc6a344f..9cd789b8acd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_aux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_aux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_aux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_aux.c</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='ctx'> /*</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_aux.c</div><div class='del'>- *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='del'>- *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt;</div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt;</div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -29,6 +19,20 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Driver authors:</div><div class='add'>+ *            Martin Peschke (originator of the driver)</div><div class='add'>+ *            Raimund Schroeder</div><div class='add'>+ *            Aron Zeh</div><div class='add'>+ *            Wolfgang Taphorn</div><div class='add'>+ *            Stefan Bader</div><div class='add'>+ *            Heiko Carstens (kernel 2.6 port of the driver)</div><div class='add'>+ *            Andreas Herrmann</div><div class='add'>+ *            Maxim Shchetynin</div><div class='add'>+ *            Volker Sameske</div><div class='add'>+ *            Ralph Wuerthner</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #include "zfcp_ext.h"</div><div class='ctx'> </div><div class='ctx'> /* accumulated log level (module parameter) */</div><div class='hunk'>@@ -75,15 +79,9 @@ static struct miscdevice zfcp_cfdc_misc = {</div><div class='ctx'> /* declare driver module init/cleanup functions */</div><div class='ctx'> module_init(zfcp_module_init);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;, "</div><div class='del'>-	      "Andreas Herrman &lt;aherrman@de.ibm.com&gt;, "</div><div class='del'>-	      "Martin Peschke &lt;mpeschke@de.ibm.com&gt;, "</div><div class='del'>-	      "Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt;, "</div><div class='del'>-	      "Wolfgang Taphorn &lt;taphorn@de.ibm.com&gt;, "</div><div class='del'>-	      "Aron Zeh &lt;arzeh@de.ibm.com&gt;, "</div><div class='del'>-	      "IBM Deutschland Entwicklung GmbH");</div><div class='add'>+MODULE_AUTHOR("IBM Deutschland Entwicklung GmbH - linux390@de.ibm.com");</div><div class='ctx'> MODULE_DESCRIPTION</div><div class='del'>-    ("FCP (SCSI over Fibre Channel) HBA driver for IBM eServer zSeries");</div><div class='add'>+    ("FCP (SCSI over Fibre Channel) HBA driver for IBM System z9 and zSeries");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> module_param(device, charp, 0400);</div><div class='hunk'>@@ -291,12 +289,11 @@ zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sg_list = kmalloc(sizeof(struct zfcp_sg_list), GFP_KERNEL);</div><div class='add'>+	sg_list = kzalloc(sizeof(struct zfcp_sg_list), GFP_KERNEL);</div><div class='ctx'> 	if (sg_list == NULL) {</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	memset(sg_list, 0, sizeof(*sg_list));</div><div class='ctx'> </div><div class='ctx'> 	if (command != ZFCP_CFDC_IOC) {</div><div class='ctx'> 		ZFCP_LOG_INFO("IOC request code 0x%x invalid\n", command);</div><div class='hunk'>@@ -478,14 +475,13 @@ zfcp_sg_list_alloc(struct zfcp_sg_list *sg_list, size_t size)</div><div class='ctx'> 	sg_list-&gt;count = size &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 	if (size &amp; ~PAGE_MASK)</div><div class='ctx'> 		sg_list-&gt;count++;</div><div class='del'>-	sg_list-&gt;sg = kmalloc(sg_list-&gt;count * sizeof(struct scatterlist),</div><div class='add'>+	sg_list-&gt;sg = kcalloc(sg_list-&gt;count, sizeof(struct scatterlist),</div><div class='ctx'> 			      GFP_KERNEL);</div><div class='ctx'> 	if (sg_list-&gt;sg == NULL) {</div><div class='ctx'> 		sg_list-&gt;count = 0;</div><div class='ctx'> 		retval = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	memset(sg_list-&gt;sg, 0, sg_list-&gt;count * sizeof(struct scatterlist));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, sg = sg_list-&gt;sg; i &lt; sg_list-&gt;count; i++, sg++) {</div><div class='ctx'> 		sg-&gt;length = min(size, PAGE_SIZE);</div><div class='hunk'>@@ -744,7 +740,7 @@ struct zfcp_unit *</div><div class='ctx'> zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_unit *unit, *tmp_unit;</div><div class='del'>-	scsi_lun_t scsi_lun;</div><div class='add'>+	unsigned int scsi_lun;</div><div class='ctx'> 	int found;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -758,10 +754,9 @@ zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)</div><div class='ctx'> 	if (unit)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	unit = kmalloc(sizeof (struct zfcp_unit), GFP_KERNEL);</div><div class='add'>+	unit = kzalloc(sizeof (struct zfcp_unit), GFP_KERNEL);</div><div class='ctx'> 	if (!unit)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	memset(unit, 0, sizeof (struct zfcp_unit));</div><div class='ctx'> </div><div class='ctx'> 	/* initialise reference count stuff */</div><div class='ctx'> 	atomic_set(&amp;unit-&gt;refcount, 0);</div><div class='hunk'>@@ -929,13 +924,12 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* try to allocate new adapter data structure (zeroed) */</div><div class='del'>-	adapter = kmalloc(sizeof (struct zfcp_adapter), GFP_KERNEL);</div><div class='add'>+	adapter = kzalloc(sizeof (struct zfcp_adapter), GFP_KERNEL);</div><div class='ctx'> 	if (!adapter) {</div><div class='ctx'> 		ZFCP_LOG_INFO("error: allocation of base adapter "</div><div class='ctx'> 			      "structure failed\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	memset(adapter, 0, sizeof (struct zfcp_adapter));</div><div class='ctx'> </div><div class='ctx'> 	ccw_device-&gt;handler = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -997,12 +991,6 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)</div><div class='ctx'> 	/* intitialise SCSI ER timer */</div><div class='ctx'> 	init_timer(&amp;adapter-&gt;scsi_er_timer);</div><div class='ctx'> </div><div class='del'>-	/* set FC service class used per default */</div><div class='del'>-	adapter-&gt;fc_service_class = ZFCP_FC_SERVICE_CLASS_DEFAULT;</div><div class='del'>-</div><div class='del'>-	sprintf(adapter-&gt;name, "%s", zfcp_get_busid_by_adapter(adapter));</div><div class='del'>-	ASCEBC(adapter-&gt;name, strlen(adapter-&gt;name));</div><div class='del'>-</div><div class='ctx'> 	/* mark adapter unusable as long as sysfs registration is not complete */</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &amp;adapter-&gt;status);</div><div class='ctx'> </div><div class='hunk'>@@ -1139,10 +1127,9 @@ zfcp_port_enqueue(struct zfcp_adapter *adapter, wwn_t wwpn, u32 status,</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	port = kmalloc(sizeof (struct zfcp_port), GFP_KERNEL);</div><div class='add'>+	port = kzalloc(sizeof (struct zfcp_port), GFP_KERNEL);</div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	memset(port, 0, sizeof (struct zfcp_port));</div><div class='ctx'> </div><div class='ctx'> 	/* initialise reference count stuff */</div><div class='ctx'> 	atomic_set(&amp;port-&gt;refcount, 0);</div><div class='hunk'>@@ -1354,18 +1341,19 @@ static void</div><div class='ctx'> zfcp_fsf_incoming_els_plogi(struct zfcp_adapter *adapter,</div><div class='ctx'> 			    struct fsf_status_read_buffer *status_buffer)</div><div class='ctx'> {</div><div class='del'>-	logi *els_logi = (logi *) status_buffer-&gt;payload;</div><div class='add'>+	struct fsf_plogi *els_plogi;</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	els_plogi = (struct fsf_plogi *) status_buffer-&gt;payload;</div><div class='ctx'> 	read_lock_irqsave(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> 	list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list) {</div><div class='del'>-		if (port-&gt;wwpn == (*(wwn_t *) &amp; els_logi-&gt;nport_wwn))</div><div class='add'>+		if (port-&gt;wwpn == (*(wwn_t *) &amp;els_plogi-&gt;serv_param.wwpn))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	read_unlock_irqrestore(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!port || (port-&gt;wwpn != (*(wwn_t *) &amp; els_logi-&gt;nport_wwn))) {</div><div class='add'>+	if (!port || (port-&gt;wwpn != (*(wwn_t *) &amp;els_plogi-&gt;serv_param.wwpn))) {</div><div class='ctx'> 		ZFCP_LOG_DEBUG("ignored incoming PLOGI for nonexisting port "</div><div class='ctx'> 			       "with d_id 0x%08x on adapter %s\n",</div><div class='ctx'> 			       status_buffer-&gt;d_id,</div><div class='hunk'>@@ -1760,4 +1748,25 @@ zfcp_handle_els_rjt(u32 sq, struct zfcp_ls_rjt_par *rjt_par)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * zfcp_plogi_evaluate - evaluate PLOGI playload and copy important fields</div><div class='add'>+ * into zfcp_port structure</div><div class='add'>+ * @port: zfcp_port structure</div><div class='add'>+ * @plogi: plogi payload</div><div class='add'>+ */</div><div class='add'>+void</div><div class='add'>+zfcp_plogi_evaluate(struct zfcp_port *port, struct fsf_plogi *plogi)</div><div class='add'>+{</div><div class='add'>+	port-&gt;maxframe_size = plogi-&gt;serv_param.common_serv_param[7] |</div><div class='add'>+		((plogi-&gt;serv_param.common_serv_param[6] &amp; 0x0F) &lt;&lt; 8);</div><div class='add'>+	if (plogi-&gt;serv_param.class1_serv_param[0] &amp; 0x80)</div><div class='add'>+		port-&gt;supported_classes |= FC_COS_CLASS1;</div><div class='add'>+	if (plogi-&gt;serv_param.class2_serv_param[0] &amp; 0x80)</div><div class='add'>+		port-&gt;supported_classes |= FC_COS_CLASS2;</div><div class='add'>+	if (plogi-&gt;serv_param.class3_serv_param[0] &amp; 0x80)</div><div class='add'>+		port-&gt;supported_classes |= FC_COS_CLASS3;</div><div class='add'>+	if (plogi-&gt;serv_param.class4_serv_param[0] &amp; 0x80)</div><div class='add'>+		port-&gt;supported_classes |= FC_COS_CLASS4;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #undef ZFCP_LOG_AREA</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c<br/>index 241136d0c6eb..57d8e4bfb8d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_ccw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_ccw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_ccw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_ccw.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_ccw.c</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * CCW driver related routines</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2003, 2004</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *      Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *	Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *      Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c<br/>index a5f2ba9a8fdb..c033145d0f19 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_dbf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_dbf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_dbf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_dbf.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='ctx'> /*</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_dbf.c</div><div class='del'>- *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * Debugging facilities</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2005</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h<br/>index 6eba56cd89ba..2df512a18e2c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_def.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_def.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_def.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_def.h</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='ctx'> /* </div><div class='del'>- * </div><div class='del'>- * linux/drivers/s390/scsi/zfcp_def.h</div><div class='del'>- * </div><div class='del'>- * FCP adapter driver for IBM eServer zSeries </div><div class='del'>- * </div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt; </div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt; </div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt; </div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt; </div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='del'>- *            Volker Sameske &lt;sameske@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  * </div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify </div><div class='ctx'>  * it under the terms of the GNU General Public License as published by </div><div class='hunk'>@@ -50,7 +39,6 @@</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport_fc.h&gt;</div><div class='del'>-#include "../../fc4/fc.h"</div><div class='ctx'> #include "zfcp_fsf.h"</div><div class='ctx'> #include &lt;asm/ccwdev.h&gt;</div><div class='ctx'> #include &lt;asm/qdio.h&gt;</div><div class='hunk'>@@ -64,7 +52,7 @@</div><div class='ctx'> /********************* GENERAL DEFINES *********************************/</div><div class='ctx'> </div><div class='ctx'> /* zfcp version number, it consists of major, minor, and patch-level number */</div><div class='del'>-#define ZFCP_VERSION		"4.5.0"</div><div class='add'>+#define ZFCP_VERSION		"4.7.0"</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * zfcp_sg_to_address - determine kernel address from struct scatterlist</div><div class='hunk'>@@ -89,13 +77,9 @@ zfcp_address_to_sg(void *address, struct scatterlist *list)</div><div class='ctx'> 	list-&gt;offset = ((unsigned long) address) &amp; (PAGE_SIZE - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/********************* SCSI SPECIFIC DEFINES *********************************/</div><div class='add'>+#define REQUEST_LIST_SIZE 128</div><div class='ctx'> </div><div class='del'>-/* 32 bit for SCSI ID and LUN as long as the SCSI stack uses this type */</div><div class='del'>-typedef u32 scsi_id_t;</div><div class='del'>-typedef u32 scsi_lun_t;</div><div class='del'>-</div><div class='del'>-#define ZFCP_ERP_SCSI_LOW_MEM_TIMEOUT           (100*HZ)</div><div class='add'>+/********************* SCSI SPECIFIC DEFINES *********************************/</div><div class='ctx'> #define ZFCP_SCSI_ER_TIMEOUT                    (100*HZ)</div><div class='ctx'> </div><div class='ctx'> /********************* CIO/QDIO SPECIFIC DEFINES *****************************/</div><div class='hunk'>@@ -233,8 +217,9 @@ struct fcp_rsp_iu {</div><div class='ctx'> #define RSP_CODE_TASKMAN_FAILED	 5</div><div class='ctx'> </div><div class='ctx'> /* see fc-fs */</div><div class='del'>-#define LS_FAN 0x60000000</div><div class='del'>-#define LS_RSCN 0x61040000</div><div class='add'>+#define LS_RSCN  0x61040000</div><div class='add'>+#define LS_LOGO  0x05000000</div><div class='add'>+#define LS_PLOGI 0x03000000</div><div class='ctx'> </div><div class='ctx'> struct fcp_rscn_head {</div><div class='ctx'>         u8  command;</div><div class='hunk'>@@ -263,13 +248,6 @@ struct fcp_rscn_element {</div><div class='ctx'> #define ZFCP_NO_PORTS_PER_DOMAIN  0x10000</div><div class='ctx'> #define ZFCP_NO_PORTS_PER_FABRIC  0x1000000</div><div class='ctx'> </div><div class='del'>-struct fcp_fan {</div><div class='del'>-        u32 command;</div><div class='del'>-        u32 fport_did;</div><div class='del'>-        wwn_t fport_wwpn;</div><div class='del'>-        wwn_t fport_wwname;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='ctx'> /* see fc-ph */</div><div class='ctx'> struct fcp_logo {</div><div class='ctx'>         u32 command;</div><div class='hunk'>@@ -507,9 +485,6 @@ struct zfcp_rc_entry {</div><div class='ctx'> </div><div class='ctx'> #define ZFCP_NAME               "zfcp"</div><div class='ctx'> </div><div class='del'>-/* read-only LUN sharing switch initial value */</div><div class='del'>-#define ZFCP_RO_LUN_SHARING_DEFAULTS 0</div><div class='del'>-</div><div class='ctx'> /* independent log areas */</div><div class='ctx'> #define ZFCP_LOG_AREA_OTHER	0</div><div class='ctx'> #define ZFCP_LOG_AREA_SCSI	1</div><div class='hunk'>@@ -608,7 +583,6 @@ do { \</div><div class='ctx'>  * and unit</div><div class='ctx'>  */</div><div class='ctx'> #define ZFCP_COMMON_FLAGS			0xfff00000</div><div class='del'>-#define ZFCP_SPECIFIC_FLAGS			0x000fffff</div><div class='ctx'> </div><div class='ctx'> /* common status bits */</div><div class='ctx'> #define ZFCP_STATUS_COMMON_REMOVE		0x80000000</div><div class='hunk'>@@ -633,11 +607,6 @@ do { \</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED	0x00000200</div><div class='ctx'> #define ZFCP_STATUS_ADAPTER_XPORT_OK		0x00000800</div><div class='ctx'> </div><div class='del'>-#define ZFCP_STATUS_ADAPTER_SCSI_UP			\</div><div class='del'>-		(ZFCP_STATUS_COMMON_UNBLOCKED |	\</div><div class='del'>-		 ZFCP_STATUS_ADAPTER_REGISTERED)</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* FC-PH/FC-GS well-known address identifiers for generic services */</div><div class='ctx'> #define ZFCP_DID_MANAGEMENT_SERVICE		0xFFFFFA</div><div class='ctx'> #define ZFCP_DID_TIME_SERVICE			0xFFFFFB</div><div class='hunk'>@@ -652,7 +621,6 @@ do { \</div><div class='ctx'> #define ZFCP_STATUS_PORT_NO_WWPN		0x00000008</div><div class='ctx'> #define ZFCP_STATUS_PORT_NO_SCSI_ID		0x00000010</div><div class='ctx'> #define ZFCP_STATUS_PORT_INVALID_WWPN		0x00000020</div><div class='del'>-#define ZFCP_STATUS_PORT_ACCESS_DENIED		0x00000040</div><div class='ctx'> </div><div class='ctx'> /* for ports with well known addresses */</div><div class='ctx'> #define ZFCP_STATUS_PORT_WKA \</div><div class='hunk'>@@ -908,15 +876,12 @@ struct zfcp_adapter {</div><div class='ctx'> 	wwn_t			peer_wwpn;	   /* P2P peer WWPN */</div><div class='ctx'> 	u32			peer_d_id;	   /* P2P peer D_ID */</div><div class='ctx'> 	struct ccw_device       *ccw_device;	   /* S/390 ccw device */</div><div class='del'>-	u8			fc_service_class;</div><div class='ctx'> 	u32			hydra_version;	   /* Hydra version */</div><div class='ctx'> 	u32			fsf_lic_version;</div><div class='ctx'> 	u32			adapter_features;  /* FCP channel features */</div><div class='ctx'> 	u32			connection_features; /* host connection features */</div><div class='ctx'>         u32			hardware_version;  /* of FCP channel */</div><div class='ctx'> 	struct Scsi_Host	*scsi_host;	   /* Pointer to mid-layer */</div><div class='del'>-	unsigned short          scsi_host_no;      /* Assigned host number */</div><div class='del'>-	unsigned char		name[9];</div><div class='ctx'> 	struct list_head	port_list_head;	   /* remote port list */</div><div class='ctx'> 	struct list_head        port_remove_lh;    /* head of ports to be</div><div class='ctx'> 						      removed */</div><div class='hunk'>@@ -994,6 +959,8 @@ struct zfcp_port {</div><div class='ctx'> 	u32		       handle;	       /* handle assigned by FSF */</div><div class='ctx'> 	struct zfcp_erp_action erp_action;     /* pending error recovery */</div><div class='ctx'>         atomic_t               erp_counter;</div><div class='add'>+	u32                    maxframe_size;</div><div class='add'>+	u32                    supported_classes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* the struct device sysfs_device must be at the beginning of this structure.</div><div class='hunk'>@@ -1008,7 +975,7 @@ struct zfcp_unit {</div><div class='ctx'> 						  refcount drop to zero */</div><div class='ctx'> 	struct zfcp_port       *port;	       /* remote port of unit */</div><div class='ctx'> 	atomic_t	       status;	       /* status of this logical unit */</div><div class='del'>-	scsi_lun_t	       scsi_lun;       /* own SCSI LUN */</div><div class='add'>+	unsigned int	       scsi_lun;       /* own SCSI LUN */</div><div class='ctx'> 	fcp_lun_t	       fcp_lun;	       /* own FCP_LUN */</div><div class='ctx'> 	u32		       handle;	       /* handle assigned by FSF */</div><div class='ctx'>         struct scsi_device     *device;        /* scsi device struct pointer */</div><div class='hunk'>@@ -1052,11 +1019,6 @@ struct zfcp_data {</div><div class='ctx'> 	struct list_head	adapter_list_head;  /* head of adapter list */</div><div class='ctx'> 	struct list_head	adapter_remove_lh;  /* head of adapters to be</div><div class='ctx'> 						       removed */</div><div class='del'>-        rwlock_t                status_read_lock;   /* for status read thread */</div><div class='del'>-        struct list_head        status_read_receive_head;</div><div class='del'>-        struct list_head        status_read_send_head;</div><div class='del'>-        struct semaphore        status_read_sema;</div><div class='del'>-	wait_queue_head_t	status_read_thread_wqh;</div><div class='ctx'> 	u32			adapters;	    /* # of adapters in list */</div><div class='ctx'> 	rwlock_t                config_lock;        /* serialises changes</div><div class='ctx'> 						       to adapter/port/unit</div><div class='hunk'>@@ -1095,9 +1057,6 @@ struct zfcp_fsf_req_pool_element {</div><div class='ctx'> </div><div class='ctx'> /********************** ZFCP SPECIFIC DEFINES ********************************/</div><div class='ctx'> </div><div class='del'>-#define ZFCP_FSFREQ_CLEANUP_TIMEOUT	HZ/10</div><div class='del'>-</div><div class='del'>-#define ZFCP_KNOWN              0x00000001</div><div class='ctx'> #define ZFCP_REQ_AUTO_CLEANUP	0x00000002</div><div class='ctx'> #define ZFCP_WAIT_FOR_SBAL	0x00000004</div><div class='ctx'> #define ZFCP_REQ_NO_QTCB	0x00000008</div><div class='hunk'>@@ -1105,9 +1064,6 @@ struct zfcp_fsf_req_pool_element {</div><div class='ctx'> #define ZFCP_SET                0x00000100</div><div class='ctx'> #define ZFCP_CLEAR              0x00000200</div><div class='ctx'> </div><div class='del'>-#define ZFCP_INTERRUPTIBLE	1</div><div class='del'>-#define ZFCP_UNINTERRUPTIBLE	0</div><div class='del'>-</div><div class='ctx'> #ifndef atomic_test_mask</div><div class='ctx'> #define atomic_test_mask(mask, target) \</div><div class='ctx'>            ((atomic_read(target) &amp; mask) == mask)</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c<br/>index 57cb628a05aa..8ec8da0beaa8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_erp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_erp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_erp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_erp.c</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='ctx'> /* </div><div class='del'>- * </div><div class='del'>- * linux/drivers/s390/scsi/zfcp_erp.c </div><div class='del'>- * </div><div class='del'>- * FCP adapter driver for IBM eServer zSeries </div><div class='del'>- * </div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='del'>- *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt; </div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt; </div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt; </div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt; </div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  * </div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify </div><div class='ctx'>  * it under the terms of the GNU General Public License as published by </div><div class='hunk'>@@ -177,7 +167,7 @@ zfcp_fsf_scsi_er_timeout_handler(unsigned long data)</div><div class='ctx'>  *		initiates adapter recovery which is done</div><div class='ctx'>  *		asynchronously</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='hunk'>@@ -213,7 +203,7 @@ zfcp_erp_adapter_reopen_internal(struct zfcp_adapter *adapter, int clear_mask)</div><div class='ctx'>  * purpose:	Wrappper for zfcp_erp_adapter_reopen_internal</div><div class='ctx'>  *              used to ensure the correct locking</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='hunk'>@@ -231,13 +221,6 @@ zfcp_erp_adapter_reopen(struct zfcp_adapter *adapter, int clear_mask)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> zfcp_erp_adapter_shutdown(struct zfcp_adapter *adapter, int clear_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,13 +234,6 @@ zfcp_erp_adapter_shutdown(struct zfcp_adapter *adapter, int clear_mask)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> zfcp_erp_port_shutdown(struct zfcp_port *port, int clear_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -271,13 +247,6 @@ zfcp_erp_port_shutdown(struct zfcp_port *port, int clear_mask)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> zfcp_erp_unit_shutdown(struct zfcp_unit *unit, int clear_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -306,20 +275,17 @@ zfcp_erp_adisc(struct zfcp_port *port)</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	struct timer_list *timer;</div><div class='ctx'> </div><div class='del'>-	send_els = kmalloc(sizeof(struct zfcp_send_els), GFP_ATOMIC);</div><div class='add'>+	send_els = kzalloc(sizeof(struct zfcp_send_els), GFP_ATOMIC);</div><div class='ctx'> 	if (send_els == NULL)</div><div class='ctx'> 		goto nomem;</div><div class='del'>-	memset(send_els, 0, sizeof(*send_els));</div><div class='ctx'> </div><div class='del'>-	send_els-&gt;req = kmalloc(sizeof(struct scatterlist), GFP_ATOMIC);</div><div class='add'>+	send_els-&gt;req = kzalloc(sizeof(struct scatterlist), GFP_ATOMIC);</div><div class='ctx'> 	if (send_els-&gt;req == NULL)</div><div class='ctx'> 		goto nomem;</div><div class='del'>-	memset(send_els-&gt;req, 0, sizeof(*send_els-&gt;req));</div><div class='ctx'> </div><div class='del'>-	send_els-&gt;resp = kmalloc(sizeof(struct scatterlist), GFP_ATOMIC);</div><div class='add'>+	send_els-&gt;resp = kzalloc(sizeof(struct scatterlist), GFP_ATOMIC);</div><div class='ctx'> 	if (send_els-&gt;resp == NULL)</div><div class='ctx'> 		goto nomem;</div><div class='del'>-	memset(send_els-&gt;resp, 0, sizeof(*send_els-&gt;resp));</div><div class='ctx'> </div><div class='ctx'> 	address = (void *) get_zeroed_page(GFP_ATOMIC);</div><div class='ctx'> 	if (address == NULL)</div><div class='hunk'>@@ -503,7 +469,7 @@ zfcp_test_link(struct zfcp_port *port)</div><div class='ctx'>  *		initiates Forced Reopen recovery which is done</div><div class='ctx'>  *		asynchronously</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -543,7 +509,7 @@ zfcp_erp_port_forced_reopen_internal(struct zfcp_port *port, int clear_mask)</div><div class='ctx'>  * purpose:	Wrappper for zfcp_erp_port_forced_reopen_internal</div><div class='ctx'>  *              used to ensure the correct locking</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='hunk'>@@ -570,7 +536,7 @@ zfcp_erp_port_forced_reopen(struct zfcp_port *port, int clear_mask)</div><div class='ctx'>  *		initiates Reopen recovery which is done</div><div class='ctx'>  *		asynchronously</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -639,7 +605,7 @@ zfcp_erp_port_reopen(struct zfcp_port *port, int clear_mask)</div><div class='ctx'>  *		initiates Reopen recovery which is done</div><div class='ctx'>  *		asynchronously</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -812,13 +778,6 @@ zfcp_erp_unit_unblock(struct zfcp_unit *unit)</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_COMMON_UNBLOCKED, &amp;unit-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static void</div><div class='ctx'> zfcp_erp_action_ready(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -1356,13 +1315,6 @@ zfcp_erp_strategy_check_action(struct zfcp_erp_action *erp_action, int retval)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_strategy_do_action(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -1538,13 +1490,6 @@ zfcp_erp_strategy_check_target(struct zfcp_erp_action *erp_action, int result)</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_strategy_statechange(int action,</div><div class='ctx'> 			      u32 status,</div><div class='hunk'>@@ -1586,13 +1531,6 @@ zfcp_erp_strategy_statechange(int action,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static inline int</div><div class='ctx'> zfcp_erp_strategy_statechange_detected(atomic_t * target_status, u32 erp_status)</div><div class='ctx'> {</div><div class='hunk'>@@ -1605,13 +1543,6 @@ zfcp_erp_strategy_statechange_detected(atomic_t * target_status, u32 erp_status)</div><div class='ctx'> 	     !(ZFCP_STATUS_ERP_CLOSE_ONLY &amp; erp_status));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_strategy_check_unit(struct zfcp_unit *unit, int result)</div><div class='ctx'> {</div><div class='hunk'>@@ -1642,13 +1573,6 @@ zfcp_erp_strategy_check_unit(struct zfcp_unit *unit, int result)</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_strategy_check_port(struct zfcp_port *port, int result)</div><div class='ctx'> {</div><div class='hunk'>@@ -1678,13 +1602,6 @@ zfcp_erp_strategy_check_port(struct zfcp_port *port, int result)</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_strategy_check_adapter(struct zfcp_adapter *adapter, int result)</div><div class='ctx'> {</div><div class='hunk'>@@ -1764,13 +1681,6 @@ zfcp_erp_strategy_followup_actions(int action,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_strategy_check_queues(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -1809,12 +1719,6 @@ zfcp_erp_wait(struct zfcp_adapter *adapter)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_modify_adapter_status</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_modify_adapter_status(struct zfcp_adapter *adapter,</div><div class='ctx'> 			       u32 mask, int set_or_clear)</div><div class='hunk'>@@ -1901,7 +1805,7 @@ zfcp_erp_modify_unit_status(struct zfcp_unit *unit, u32 mask, int set_or_clear)</div><div class='ctx'>  * purpose:	Wrappper for zfcp_erp_port_reopen_all_internal</div><div class='ctx'>  *              used to ensure the correct locking</div><div class='ctx'>  *</div><div class='del'>- * returns:	0	- initiated action succesfully</div><div class='add'>+ * returns:	0	- initiated action successfully</div><div class='ctx'>  *		&lt;0	- failed to initiate action</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='hunk'>@@ -1919,13 +1823,6 @@ zfcp_erp_port_reopen_all(struct zfcp_adapter *adapter, int clear_mask)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:	FIXME</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_port_reopen_all_internal(struct zfcp_adapter *adapter, int clear_mask)</div><div class='ctx'> {</div><div class='hunk'>@@ -2271,9 +2168,9 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 		atomic_clear_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,</div><div class='ctx'> 				  &amp;adapter-&gt;status);</div><div class='ctx'> 		ZFCP_LOG_DEBUG("Doing exchange config data\n");</div><div class='del'>-		write_lock(&amp;adapter-&gt;erp_lock);</div><div class='add'>+		write_lock_irq(&amp;adapter-&gt;erp_lock);</div><div class='ctx'> 		zfcp_erp_action_to_running(erp_action);</div><div class='del'>-		write_unlock(&amp;adapter-&gt;erp_lock);</div><div class='add'>+		write_unlock_irq(&amp;adapter-&gt;erp_lock);</div><div class='ctx'> 		zfcp_erp_timeout_init(erp_action);</div><div class='ctx'> 		if (zfcp_fsf_exchange_config_data(erp_action)) {</div><div class='ctx'> 			retval = ZFCP_ERP_FAILED;</div><div class='hunk'>@@ -2339,9 +2236,9 @@ zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	adapter = erp_action-&gt;adapter;</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &amp;adapter-&gt;status);</div><div class='ctx'> </div><div class='del'>-	write_lock(&amp;adapter-&gt;erp_lock);</div><div class='add'>+	write_lock_irq(&amp;adapter-&gt;erp_lock);</div><div class='ctx'> 	zfcp_erp_action_to_running(erp_action);</div><div class='del'>-	write_unlock(&amp;adapter-&gt;erp_lock);</div><div class='add'>+	write_unlock_irq(&amp;adapter-&gt;erp_lock);</div><div class='ctx'> </div><div class='ctx'> 	zfcp_erp_timeout_init(erp_action);</div><div class='ctx'> 	ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL);</div><div class='hunk'>@@ -2370,13 +2267,6 @@ zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_adapter_strategy_open_fsf_statusread(struct zfcp_erp_action</div><div class='ctx'> 					      *erp_action)</div><div class='hunk'>@@ -2545,13 +2435,6 @@ zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_port_strategy_open(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -2566,15 +2449,6 @@ zfcp_erp_port_strategy_open(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- *</div><div class='del'>- * FIXME(design):	currently only prepared for fabric (nameserver!)</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -2690,13 +2564,6 @@ zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_port_strategy_open_nameserver(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -2813,13 +2680,6 @@ zfcp_erp_port_forced_strategy_close(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_port_strategy_clearstati(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -3022,13 +2882,6 @@ zfcp_erp_unit_strategy(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_unit_strategy_clearstati(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='hunk'>@@ -3129,13 +2982,6 @@ zfcp_erp_unit_strategy_open(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static inline void</div><div class='ctx'> zfcp_erp_timeout_init(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -3331,13 +3177,6 @@ zfcp_erp_action_enqueue(int action,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_action_dequeue(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -3402,9 +3241,13 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:</div><div class='ctx'> 	case ZFCP_ERP_ACTION_REOPEN_PORT:</div><div class='add'>+		if (atomic_test_mask(ZFCP_STATUS_PORT_NO_WWPN,</div><div class='add'>+				     &amp;port-&gt;status)) {</div><div class='add'>+			zfcp_port_put(port);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if ((result == ZFCP_ERP_SUCCEEDED)</div><div class='del'>-		    &amp;&amp; !atomic_test_mask(ZFCP_STATUS_PORT_NO_WWPN,</div><div class='del'>-					 &amp;port-&gt;status)</div><div class='ctx'> 		    &amp;&amp; !port-&gt;rport) {</div><div class='ctx'> 			struct fc_rport_identifiers ids;</div><div class='ctx'> 			ids.node_name = port-&gt;wwnn;</div><div class='hunk'>@@ -3418,12 +3261,30 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,</div><div class='ctx'> 						"(adapter %s, wwpn=0x%016Lx)\n",</div><div class='ctx'> 						zfcp_get_busid_by_port(port),</div><div class='ctx'> 						port-&gt;wwpn);</div><div class='del'>-			else</div><div class='add'>+			else {</div><div class='ctx'> 				scsi_flush_work(adapter-&gt;scsi_host);</div><div class='add'>+				port-&gt;rport-&gt;maxframe_size = port-&gt;maxframe_size;</div><div class='add'>+				port-&gt;rport-&gt;supported_classes =</div><div class='add'>+					port-&gt;supported_classes;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if ((result != ZFCP_ERP_SUCCEEDED) &amp;&amp; port-&gt;rport) {</div><div class='add'>+			fc_remote_port_delete(port-&gt;rport);</div><div class='add'>+			port-&gt;rport = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		zfcp_port_put(port);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ZFCP_ERP_ACTION_REOPEN_ADAPTER:</div><div class='add'>+		if (result != ZFCP_ERP_SUCCEEDED) {</div><div class='add'>+			struct zfcp_port *port;</div><div class='add'>+			list_for_each_entry(port, &amp;adapter-&gt;port_list_head, list)</div><div class='add'>+				if (port-&gt;rport &amp;&amp;</div><div class='add'>+				    !atomic_test_mask(ZFCP_STATUS_PORT_WKA,</div><div class='add'>+						      &amp;port-&gt;status)) {</div><div class='add'>+					fc_remote_port_delete(port-&gt;rport);</div><div class='add'>+					port-&gt;rport = NULL;</div><div class='add'>+				}</div><div class='add'>+		}</div><div class='ctx'> 		zfcp_adapter_put(adapter);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3432,13 +3293,6 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:	FIXME</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_action_dismiss_adapter(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -3455,13 +3309,6 @@ zfcp_erp_action_dismiss_adapter(struct zfcp_adapter *adapter)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:	FIXME</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_action_dismiss_port(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -3480,13 +3327,6 @@ zfcp_erp_action_dismiss_port(struct zfcp_port *port)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:	FIXME</div><div class='del'>- */</div><div class='ctx'> static int</div><div class='ctx'> zfcp_erp_action_dismiss_unit(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='hunk'>@@ -3501,13 +3341,6 @@ zfcp_erp_action_dismiss_unit(struct zfcp_unit *unit)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	moves erp_action to 'erp running list'</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static inline void</div><div class='ctx'> zfcp_erp_action_to_running(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -3518,13 +3351,6 @@ zfcp_erp_action_to_running(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	list_move(&amp;erp_action-&gt;list, &amp;erp_action-&gt;adapter-&gt;erp_running_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	moves erp_action to 'erp ready list'</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> static inline void</div><div class='ctx'> zfcp_erp_action_to_ready(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -3535,11 +3361,6 @@ zfcp_erp_action_to_ready(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	list_move(&amp;erp_action-&gt;list, &amp;erp_action-&gt;adapter-&gt;erp_ready_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_port_boxed</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_port_boxed(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -3556,11 +3377,6 @@ zfcp_erp_port_boxed(struct zfcp_port *port)</div><div class='ctx'> 	zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_unit_boxed</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_unit_boxed(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='hunk'>@@ -3574,11 +3390,6 @@ zfcp_erp_unit_boxed(struct zfcp_unit *unit)</div><div class='ctx'> 	zfcp_erp_unit_reopen(unit, ZFCP_STATUS_COMMON_ERP_FAILED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_port_access_denied</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_port_access_denied(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -3595,11 +3406,6 @@ zfcp_erp_port_access_denied(struct zfcp_port *port)</div><div class='ctx'> 	read_unlock_irqrestore(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_unit_access_denied</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_unit_access_denied(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='hunk'>@@ -3613,11 +3419,6 @@ zfcp_erp_unit_access_denied(struct zfcp_unit *unit)</div><div class='ctx'> 			ZFCP_SET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_adapter_access_changed</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -3628,7 +3429,7 @@ zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	debug_text_event(adapter-&gt;erp_dbf, 3, "a_access_recover");</div><div class='del'>-	debug_event(adapter-&gt;erp_dbf, 3, &amp;adapter-&gt;name, 8);</div><div class='add'>+	debug_event(adapter-&gt;erp_dbf, 3, zfcp_get_busid_by_adapter(adapter), 8);</div><div class='ctx'> </div><div class='ctx'> 	read_lock_irqsave(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> 	if (adapter-&gt;nameserver_port)</div><div class='hunk'>@@ -3639,11 +3440,6 @@ zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter)</div><div class='ctx'> 	read_unlock_irqrestore(&amp;zfcp_data.config_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_port_access_changed</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_port_access_changed(struct zfcp_port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -3672,11 +3468,6 @@ zfcp_erp_port_access_changed(struct zfcp_port *port)</div><div class='ctx'> 				zfcp_get_busid_by_adapter(adapter), port-&gt;wwpn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_erp_unit_access_changed</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_erp_unit_access_changed(struct zfcp_unit *unit)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h<br/>index 700f5402a978..d02366004cdd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_ext.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_ext.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_ext.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_ext.h</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='ctx'> /* </div><div class='del'>- * </div><div class='del'>- * linux/drivers/s390/scsi/zfcp_ext.h</div><div class='del'>- * </div><div class='del'>- * FCP adapter driver for IBM eServer zSeries </div><div class='del'>- * </div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt; </div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt; </div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt; </div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt; </div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  * </div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify </div><div class='ctx'>  * it under the terms of the GNU General Public License as published by </div><div class='hunk'>@@ -125,6 +115,7 @@ extern int  zfcp_nameserver_enqueue(struct zfcp_adapter *);</div><div class='ctx'> extern int  zfcp_ns_gid_pn_request(struct zfcp_erp_action *);</div><div class='ctx'> extern int  zfcp_check_ct_response(struct ct_hdr *);</div><div class='ctx'> extern int  zfcp_handle_els_rjt(u32, struct zfcp_ls_rjt_par *);</div><div class='add'>+extern void zfcp_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *);</div><div class='ctx'> </div><div class='ctx'> /******************************* SCSI ****************************************/</div><div class='ctx'> extern int  zfcp_adapter_scsi_register(struct zfcp_adapter *);</div><div class='hunk'>@@ -141,8 +132,6 @@ extern int zfcp_scsi_command_async(struct zfcp_adapter *,struct zfcp_unit *,</div><div class='ctx'> 				   struct scsi_cmnd *, struct timer_list *);</div><div class='ctx'> extern int zfcp_scsi_command_sync(struct zfcp_unit *, struct scsi_cmnd *,</div><div class='ctx'> 				  struct timer_list *);</div><div class='del'>-extern void zfcp_set_fc_host_attrs(struct zfcp_adapter *);</div><div class='del'>-extern void zfcp_set_fc_rport_attrs(struct zfcp_port *);</div><div class='ctx'> extern struct scsi_transport_template *zfcp_transport_template;</div><div class='ctx'> extern struct fc_function_template zfcp_transport_functions;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c<br/>index 662ec571d73b..31db2b06faba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_fsf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_fsf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_fsf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_fsf.c</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='ctx'> /*</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_fsf.c</div><div class='del'>- *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='del'>- *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt;</div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt;</div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='del'>- *            Volker Sameske &lt;sameske@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -877,6 +866,7 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 	struct zfcp_adapter *adapter = fsf_req-&gt;adapter;</div><div class='ctx'> 	struct fsf_status_read_buffer *status_buffer =</div><div class='ctx'> 		(struct fsf_status_read_buffer *) fsf_req-&gt;data;</div><div class='add'>+	struct fsf_bit_error_payload *fsf_bit_error;</div><div class='ctx'> </div><div class='ctx'> 	if (fsf_req-&gt;status &amp; ZFCP_STATUS_FSFREQ_DISMISSED) {</div><div class='ctx'> 		zfcp_hba_dbf_event_fsf_unsol("dism", adapter, status_buffer);</div><div class='hunk'>@@ -903,10 +893,37 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FSF_STATUS_READ_BIT_ERROR_THRESHOLD:</div><div class='del'>-		ZFCP_LOG_NORMAL("Bit error threshold data received:\n");</div><div class='del'>-		ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_NORMAL,</div><div class='del'>-			      (char *) status_buffer,</div><div class='del'>-			      sizeof (struct fsf_status_read_buffer));</div><div class='add'>+		fsf_bit_error = (struct fsf_bit_error_payload *)</div><div class='add'>+			status_buffer-&gt;payload;</div><div class='add'>+		ZFCP_LOG_NORMAL("Warning: bit error threshold data "</div><div class='add'>+		    "received (adapter %s, "</div><div class='add'>+		    "link failures = %i, loss of sync errors = %i, "</div><div class='add'>+		    "loss of signal errors = %i, "</div><div class='add'>+		    "primitive sequence errors = %i, "</div><div class='add'>+		    "invalid transmission word errors = %i, "</div><div class='add'>+		    "CRC errors = %i)\n",</div><div class='add'>+		    zfcp_get_busid_by_adapter(adapter),</div><div class='add'>+		    fsf_bit_error-&gt;link_failure_error_count,</div><div class='add'>+		    fsf_bit_error-&gt;loss_of_sync_error_count,</div><div class='add'>+		    fsf_bit_error-&gt;loss_of_signal_error_count,</div><div class='add'>+		    fsf_bit_error-&gt;primitive_sequence_error_count,</div><div class='add'>+		    fsf_bit_error-&gt;invalid_transmission_word_error_count,</div><div class='add'>+		    fsf_bit_error-&gt;crc_error_count);</div><div class='add'>+		ZFCP_LOG_INFO("Additional bit error threshold data "</div><div class='add'>+		    "(adapter %s, "</div><div class='add'>+		    "primitive sequence event time-outs = %i, "</div><div class='add'>+		    "elastic buffer overrun errors = %i, "</div><div class='add'>+		    "advertised receive buffer-to-buffer credit = %i, "</div><div class='add'>+		    "current receice buffer-to-buffer credit = %i, "</div><div class='add'>+		    "advertised transmit buffer-to-buffer credit = %i, "</div><div class='add'>+		    "current transmit buffer-to-buffer credit = %i)\n",</div><div class='add'>+		    zfcp_get_busid_by_adapter(adapter),</div><div class='add'>+		    fsf_bit_error-&gt;primitive_sequence_event_timeout_count,</div><div class='add'>+		    fsf_bit_error-&gt;elastic_buffer_overrun_error_count,</div><div class='add'>+		    fsf_bit_error-&gt;advertised_receive_b2b_credit,</div><div class='add'>+		    fsf_bit_error-&gt;current_receive_b2b_credit,</div><div class='add'>+		    fsf_bit_error-&gt;advertised_transmit_b2b_credit,</div><div class='add'>+		    fsf_bit_error-&gt;current_transmit_b2b_credit);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FSF_STATUS_READ_LINK_DOWN:</div><div class='hunk'>@@ -1427,7 +1444,8 @@ zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,</div><div class='ctx'> </div><div class='ctx'> 	/* settings in QTCB */</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;header.port_handle = port-&gt;handle;</div><div class='del'>-	fsf_req-&gt;qtcb-&gt;bottom.support.service_class = adapter-&gt;fc_service_class;</div><div class='add'>+	fsf_req-&gt;qtcb-&gt;bottom.support.service_class =</div><div class='add'>+		ZFCP_FC_SERVICE_CLASS_DEFAULT;</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;bottom.support.timeout = ct-&gt;timeout;</div><div class='ctx'>         fsf_req-&gt;data = (unsigned long) ct;</div><div class='ctx'> </div><div class='hunk'>@@ -1496,18 +1514,10 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'>         case FSF_SERVICE_CLASS_NOT_SUPPORTED:</div><div class='del'>-		if (adapter-&gt;fc_service_class &lt;= 3) {</div><div class='del'>-			ZFCP_LOG_INFO("error: adapter %s does not support fc "</div><div class='del'>-				      "class %d.\n",</div><div class='del'>-				      zfcp_get_busid_by_port(port),</div><div class='del'>-				      adapter-&gt;fc_service_class);</div><div class='del'>-		} else {</div><div class='del'>-			ZFCP_LOG_INFO("bug: The fibre channel class at the "</div><div class='del'>-				      "adapter %s is invalid. "</div><div class='del'>-				      "(debug info %d)\n",</div><div class='del'>-				      zfcp_get_busid_by_port(port),</div><div class='del'>-				      adapter-&gt;fc_service_class);</div><div class='del'>-		}</div><div class='add'>+		ZFCP_LOG_INFO("error: adapter %s does not support fc "</div><div class='add'>+			      "class %d.\n",</div><div class='add'>+			      zfcp_get_busid_by_port(port),</div><div class='add'>+			      ZFCP_FC_SERVICE_CLASS_DEFAULT);</div><div class='ctx'> 		/* stop operation for this adapter */</div><div class='ctx'> 		debug_text_exception(adapter-&gt;erp_dbf, 0, "fsf_s_class_nsup");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0);</div><div class='hunk'>@@ -1730,7 +1740,8 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)</div><div class='ctx'> </div><div class='ctx'> 	/* settings in QTCB */</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;bottom.support.d_id = d_id;</div><div class='del'>-	fsf_req-&gt;qtcb-&gt;bottom.support.service_class = adapter-&gt;fc_service_class;</div><div class='add'>+	fsf_req-&gt;qtcb-&gt;bottom.support.service_class =</div><div class='add'>+		ZFCP_FC_SERVICE_CLASS_DEFAULT;</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;bottom.support.timeout = ZFCP_ELS_TIMEOUT;</div><div class='ctx'> 	fsf_req-&gt;data = (unsigned long) els;</div><div class='ctx'> </div><div class='hunk'>@@ -1800,18 +1811,10 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FSF_SERVICE_CLASS_NOT_SUPPORTED:</div><div class='del'>-		if (adapter-&gt;fc_service_class &lt;= 3) {</div><div class='del'>-			ZFCP_LOG_INFO("error: adapter %s does "</div><div class='del'>-				      "not support fibrechannel class %d.\n",</div><div class='del'>-				      zfcp_get_busid_by_adapter(adapter),</div><div class='del'>-				      adapter-&gt;fc_service_class);</div><div class='del'>-		} else {</div><div class='del'>-			ZFCP_LOG_INFO("bug: The fibrechannel class at "</div><div class='del'>-				      "adapter %s is invalid. "</div><div class='del'>-				      "(debug info %d)\n",</div><div class='del'>-				      zfcp_get_busid_by_adapter(adapter),</div><div class='del'>-				      adapter-&gt;fc_service_class);</div><div class='del'>-		}</div><div class='add'>+		ZFCP_LOG_INFO("error: adapter %s does not support fc "</div><div class='add'>+			      "class %d.\n",</div><div class='add'>+			      zfcp_get_busid_by_adapter(adapter),</div><div class='add'>+			      ZFCP_FC_SERVICE_CLASS_DEFAULT);</div><div class='ctx'> 		/* stop operation for this adapter */</div><div class='ctx'> 		debug_text_exception(adapter-&gt;erp_dbf, 0, "fsf_s_class_nsup");</div><div class='ctx'> 		zfcp_erp_adapter_shutdown(adapter, 0);</div><div class='hunk'>@@ -1940,14 +1943,6 @@ skip_fsfstatus:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:	address of initiated FSF request</div><div class='del'>- *		NULL - request could not be initiated</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)</div><div class='ctx'> {</div><div class='hunk'>@@ -2232,7 +2227,7 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action,</div><div class='ctx'> 	/* setup new FSF request */</div><div class='ctx'> 	retval = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA,</div><div class='ctx'> 				     erp_action ? ZFCP_REQ_AUTO_CLEANUP : 0,</div><div class='del'>-				     0, &amp;lock_flags, &amp;fsf_req);</div><div class='add'>+				     NULL, &amp;lock_flags, &amp;fsf_req);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		ZFCP_LOG_INFO("error: Out of resources. Could not create an "</div><div class='ctx'>                               "exchange port data request for"</div><div class='hunk'>@@ -2565,8 +2560,7 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 		if (!atomic_test_mask(ZFCP_STATUS_PORT_NO_WWPN, &amp;port-&gt;status))</div><div class='ctx'> 		{</div><div class='ctx'> 			if (fsf_req-&gt;qtcb-&gt;bottom.support.els1_length &lt;</div><div class='del'>-			    ((((unsigned long) &amp;plogi-&gt;serv_param.wwpn) -</div><div class='del'>-			      ((unsigned long) plogi)) + sizeof (u64))) {</div><div class='add'>+			    sizeof (struct fsf_plogi)) {</div><div class='ctx'> 				ZFCP_LOG_INFO(</div><div class='ctx'> 					"warning: insufficient length of "</div><div class='ctx'> 					"PLOGI payload (%i)\n",</div><div class='hunk'>@@ -2585,8 +2579,10 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 					atomic_clear_mask(</div><div class='ctx'> 						ZFCP_STATUS_PORT_DID_DID,</div><div class='ctx'> 						&amp;port-&gt;status);</div><div class='del'>-				} else</div><div class='add'>+				} else {</div><div class='ctx'> 					port-&gt;wwnn = plogi-&gt;serv_param.wwnn;</div><div class='add'>+					zfcp_plogi_evaluate(port, plogi);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2993,8 +2989,8 @@ zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)</div><div class='ctx'> 	erp_action-&gt;fsf_req-&gt;qtcb-&gt;bottom.support.fcp_lun =</div><div class='ctx'> 		erp_action-&gt;unit-&gt;fcp_lun;</div><div class='ctx'> 	if (!(erp_action-&gt;adapter-&gt;connection_features &amp; FSF_FEATURE_NPIV_MODE))</div><div class='del'>-	erp_action-&gt;fsf_req-&gt;qtcb-&gt;bottom.support.option =</div><div class='del'>-		FSF_OPEN_LUN_SUPPRESS_BOXING;</div><div class='add'>+		erp_action-&gt;fsf_req-&gt;qtcb-&gt;bottom.support.option =</div><div class='add'>+			FSF_OPEN_LUN_SUPPRESS_BOXING;</div><div class='ctx'> 	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &amp;erp_action-&gt;unit-&gt;status);</div><div class='ctx'> 	erp_action-&gt;fsf_req-&gt;data = (unsigned long) erp_action-&gt;unit;</div><div class='ctx'> 	erp_action-&gt;fsf_req-&gt;erp_action = erp_action;</div><div class='hunk'>@@ -3569,7 +3565,7 @@ zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set FC service class in QTCB (3 per default) */</div><div class='del'>-	fsf_req-&gt;qtcb-&gt;bottom.io.service_class = adapter-&gt;fc_service_class;</div><div class='add'>+	fsf_req-&gt;qtcb-&gt;bottom.io.service_class = ZFCP_FC_SERVICE_CLASS_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* set FCP_LUN in FCP_CMND IU in QTCB */</div><div class='ctx'> 	fcp_cmnd_iu-&gt;fcp_lun = unit-&gt;fcp_lun;</div><div class='hunk'>@@ -3667,18 +3663,6 @@ zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:    zfcp_fsf_send_fcp_command_task_management</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- *</div><div class='del'>- * FIXME(design): should be watched by a timeout!!!</div><div class='del'>- * FIXME(design) shouldn't this be modified to return an int</div><div class='del'>- *               also...don't know how though</div><div class='del'>- *</div><div class='del'>- */</div><div class='ctx'> struct zfcp_fsf_req *</div><div class='ctx'> zfcp_fsf_send_fcp_command_task_management(struct zfcp_adapter *adapter,</div><div class='ctx'> 					  struct zfcp_unit *unit,</div><div class='hunk'>@@ -3720,7 +3704,7 @@ zfcp_fsf_send_fcp_command_task_management(struct zfcp_adapter *adapter,</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;header.lun_handle = unit-&gt;handle;</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;header.port_handle = unit-&gt;port-&gt;handle;</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;bottom.io.data_direction = FSF_DATADIR_CMND;</div><div class='del'>-	fsf_req-&gt;qtcb-&gt;bottom.io.service_class = adapter-&gt;fc_service_class;</div><div class='add'>+	fsf_req-&gt;qtcb-&gt;bottom.io.service_class = ZFCP_FC_SERVICE_CLASS_DEFAULT;</div><div class='ctx'> 	fsf_req-&gt;qtcb-&gt;bottom.io.fcp_cmnd_length =</div><div class='ctx'> 		sizeof (struct fcp_cmnd_iu) + sizeof (fcp_dl_t);</div><div class='ctx'> </div><div class='hunk'>@@ -3843,18 +3827,10 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case FSF_SERVICE_CLASS_NOT_SUPPORTED:</div><div class='del'>-		if (fsf_req-&gt;adapter-&gt;fc_service_class &lt;= 3) {</div><div class='del'>-			ZFCP_LOG_NORMAL("error: The adapter %s does "</div><div class='del'>-					"not support fibrechannel class %d.\n",</div><div class='del'>-					zfcp_get_busid_by_unit(unit),</div><div class='del'>-					fsf_req-&gt;adapter-&gt;fc_service_class);</div><div class='del'>-		} else {</div><div class='del'>-			ZFCP_LOG_NORMAL("bug: The fibrechannel class at "</div><div class='del'>-					"adapter %s is invalid. "</div><div class='del'>-					"(debug info %d)\n",</div><div class='del'>-					zfcp_get_busid_by_unit(unit),</div><div class='del'>-					fsf_req-&gt;adapter-&gt;fc_service_class);</div><div class='del'>-		}</div><div class='add'>+		ZFCP_LOG_INFO("error: adapter %s does not support fc "</div><div class='add'>+			      "class %d.\n",</div><div class='add'>+			      zfcp_get_busid_by_unit(unit),</div><div class='add'>+			      ZFCP_FC_SERVICE_CLASS_DEFAULT);</div><div class='ctx'> 		/* stop operation for this adapter */</div><div class='ctx'> 		debug_text_exception(fsf_req-&gt;adapter-&gt;erp_dbf, 0,</div><div class='ctx'> 				     "fsf_s_class_nsup");</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h<br/>index e734415cae6d..71186618947c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_fsf.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_fsf.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_fsf.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_fsf.h</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='ctx'> /* </div><div class='del'>- * </div><div class='del'>- * linux/drivers/s390/scsi/zfcp_fsf.h</div><div class='del'>- * </div><div class='del'>- * FCP adapter driver for IBM eServer zSeries </div><div class='del'>- * </div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt; </div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt; </div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt; </div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='del'>- *            Volker Sameske &lt;sameske@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  * </div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify </div><div class='ctx'>  * it under the terms of the GNU General Public License as published by </div><div class='hunk'>@@ -33,8 +22,7 @@</div><div class='ctx'> #ifndef FSF_H</div><div class='ctx'> #define FSF_H</div><div class='ctx'> </div><div class='del'>-#define FSF_QTCB_VERSION1			0x00000001</div><div class='del'>-#define FSF_QTCB_CURRENT_VERSION		FSF_QTCB_VERSION1</div><div class='add'>+#define FSF_QTCB_CURRENT_VERSION		0x00000001</div><div class='ctx'> </div><div class='ctx'> /* FSF commands */</div><div class='ctx'> #define	FSF_QTCB_FCP_CMND			0x00000001</div><div class='hunk'>@@ -64,7 +52,7 @@</div><div class='ctx'> #define FSF_CFDC_OPTION_FULL_ACCESS		0x00000002</div><div class='ctx'> #define FSF_CFDC_OPTION_RESTRICTED_ACCESS	0x00000004</div><div class='ctx'> </div><div class='del'>-/* FSF protocol stati */</div><div class='add'>+/* FSF protocol states */</div><div class='ctx'> #define FSF_PROT_GOOD				0x00000001</div><div class='ctx'> #define FSF_PROT_QTCB_VERSION_ERROR		0x00000010</div><div class='ctx'> #define FSF_PROT_SEQ_NUMB_ERROR			0x00000020</div><div class='hunk'>@@ -76,7 +64,7 @@</div><div class='ctx'> #define FSF_PROT_REEST_QUEUE                    0x00000800</div><div class='ctx'> #define FSF_PROT_ERROR_STATE			0x01000000</div><div class='ctx'> </div><div class='del'>-/* FSF stati */</div><div class='add'>+/* FSF states */</div><div class='ctx'> #define FSF_GOOD				0x00000000</div><div class='ctx'> #define FSF_PORT_ALREADY_OPEN			0x00000001</div><div class='ctx'> #define FSF_LUN_ALREADY_OPEN			0x00000002</div><div class='hunk'>@@ -269,20 +257,6 @@</div><div class='ctx'> #define FSF_UNIT_ACCESS_EXCLUSIVE		0x02000000</div><div class='ctx'> #define FSF_UNIT_ACCESS_OUTBOUND_TRANSFER	0x10000000</div><div class='ctx'> </div><div class='del'>-struct fsf_queue_designator;</div><div class='del'>-struct fsf_status_read_buffer;</div><div class='del'>-struct fsf_port_closed_payload;</div><div class='del'>-struct fsf_bit_error_payload;</div><div class='del'>-union  fsf_prot_status_qual;</div><div class='del'>-struct fsf_qual_version_error;</div><div class='del'>-struct fsf_qual_sequence_error;</div><div class='del'>-struct fsf_qtcb_prefix;</div><div class='del'>-struct fsf_qtcb_header;</div><div class='del'>-struct fsf_qtcb_bottom_config;</div><div class='del'>-struct fsf_qtcb_bottom_support;</div><div class='del'>-struct fsf_qtcb_bottom_io;</div><div class='del'>-union  fsf_qtcb_bottom;</div><div class='del'>-</div><div class='ctx'> struct fsf_queue_designator {</div><div class='ctx'> 	u8  cssid;</div><div class='ctx'> 	u8  chpid;</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c<br/>index 1c3275163c91..49ea5add4abc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_qdio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_qdio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_qdio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_qdio.c</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_qdio.c</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * QDIO related routines</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *      Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *      Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt;</div><div class='del'>- *      Wolfgang Taphorn</div><div class='del'>- *      Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *      Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -178,7 +168,8 @@ zfcp_qdio_allocate(struct zfcp_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	init_data-&gt;cdev = adapter-&gt;ccw_device;</div><div class='ctx'> 	init_data-&gt;q_format = QDIO_SCSI_QFMT;</div><div class='del'>-	memcpy(init_data-&gt;adapter_name, &amp;adapter-&gt;name, 8);</div><div class='add'>+	memcpy(init_data-&gt;adapter_name, zfcp_get_busid_by_adapter(adapter), 8);</div><div class='add'>+	ASCEBC(init_data-&gt;adapter_name, 8);</div><div class='ctx'> 	init_data-&gt;qib_param_field_format = 0;</div><div class='ctx'> 	init_data-&gt;qib_param_field = NULL;</div><div class='ctx'> 	init_data-&gt;input_slib_elements = NULL;</div><div class='hunk'>@@ -436,6 +427,7 @@ int</div><div class='ctx'> zfcp_qdio_reqid_check(struct zfcp_adapter *adapter, void *sbale_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_fsf_req *fsf_req;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* invalid (per convention used in this driver) */</div><div class='ctx'> 	if (unlikely(!sbale_addr)) {</div><div class='hunk'>@@ -447,15 +439,15 @@ zfcp_qdio_reqid_check(struct zfcp_adapter *adapter, void *sbale_addr)</div><div class='ctx'> 	fsf_req = (struct zfcp_fsf_req *) sbale_addr;</div><div class='ctx'> </div><div class='ctx'> 	/* serialize with zfcp_fsf_req_dismiss_all */</div><div class='del'>-	spin_lock(&amp;adapter-&gt;fsf_req_list_lock);</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;fsf_req_list_lock, flags);</div><div class='ctx'> 	if (list_empty(&amp;adapter-&gt;fsf_req_list_head)) {</div><div class='del'>-		spin_unlock(&amp;adapter-&gt;fsf_req_list_lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;fsf_req_list_lock, flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_del(&amp;fsf_req-&gt;list);</div><div class='ctx'> 	atomic_dec(&amp;adapter-&gt;fsf_reqs_active);</div><div class='del'>-	spin_unlock(&amp;adapter-&gt;fsf_req_list_lock);</div><div class='del'>-	</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;fsf_req_list_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(adapter != fsf_req-&gt;adapter)) {</div><div class='ctx'> 		ZFCP_LOG_NORMAL("bug: invalid reqid (fsf_req=%p, "</div><div class='ctx'> 				"fsf_req-&gt;adapter=%p, adapter=%p)\n",</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c<br/>index 9e6d07d7b3c8..671f4a6a5d18 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_scsi.c</a></div><div class='hunk'>@@ -1,18 +1,8 @@</div><div class='ctx'> /* </div><div class='del'>- * </div><div class='del'>- * linux/drivers/s390/scsi/zfcp_scsi.c</div><div class='del'>- * </div><div class='del'>- * FCP adapter driver for IBM eServer zSeries </div><div class='del'>- * </div><div class='del'>- * (C) Copyright IBM Corp. 2002, 2004</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * Author(s): Martin Peschke &lt;mpeschke@de.ibm.com&gt; </div><div class='del'>- *            Raimund Schroeder &lt;raimund.schroeder@de.ibm.com&gt; </div><div class='del'>- *            Aron Zeh</div><div class='del'>- *            Wolfgang Taphorn</div><div class='del'>- *            Stefan Bader &lt;stefan.bader@de.ibm.com&gt; </div><div class='del'>- *            Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt; </div><div class='del'>- *            Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  * </div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify </div><div class='ctx'>  * it under the terms of the GNU General Public License as published by </div><div class='hunk'>@@ -45,8 +35,8 @@ static int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *);</div><div class='ctx'> static int zfcp_task_management_function(struct zfcp_unit *, u8,</div><div class='ctx'> 					 struct scsi_cmnd *);</div><div class='ctx'> </div><div class='del'>-static struct zfcp_unit *zfcp_unit_lookup(struct zfcp_adapter *, int, scsi_id_t,</div><div class='del'>-					  scsi_lun_t);</div><div class='add'>+static struct zfcp_unit *zfcp_unit_lookup(struct zfcp_adapter *, int,</div><div class='add'>+					  unsigned int, unsigned int);</div><div class='ctx'> </div><div class='ctx'> static struct device_attribute *zfcp_sysfs_sdev_attrs[];</div><div class='ctx'> </div><div class='hunk'>@@ -54,30 +44,29 @@ struct scsi_transport_template *zfcp_transport_template;</div><div class='ctx'> </div><div class='ctx'> struct zfcp_data zfcp_data = {</div><div class='ctx'> 	.scsi_host_template = {</div><div class='del'>-	      name:	               ZFCP_NAME,</div><div class='del'>-	      proc_name:               "zfcp",</div><div class='del'>-	      proc_info:               NULL,</div><div class='del'>-	      detect:	               NULL,</div><div class='del'>-	      slave_alloc:             zfcp_scsi_slave_alloc,</div><div class='del'>-	      slave_configure:         zfcp_scsi_slave_configure,</div><div class='del'>-	      slave_destroy:           zfcp_scsi_slave_destroy,</div><div class='del'>-	      queuecommand:            zfcp_scsi_queuecommand,</div><div class='del'>-	      eh_abort_handler:        zfcp_scsi_eh_abort_handler,</div><div class='del'>-	      eh_device_reset_handler: zfcp_scsi_eh_device_reset_handler,</div><div class='del'>-	      eh_bus_reset_handler:    zfcp_scsi_eh_bus_reset_handler,</div><div class='del'>-	      eh_host_reset_handler:   zfcp_scsi_eh_host_reset_handler,</div><div class='del'>-			               /* FIXME(openfcp): Tune */</div><div class='del'>-	      can_queue:               4096,</div><div class='del'>-	      this_id:	               -1,</div><div class='del'>-	      /*</div><div class='del'>-	       * FIXME:</div><div class='del'>-	       * one less? can zfcp_create_sbale cope with it?</div><div class='del'>-	       */</div><div class='del'>-	      sg_tablesize:            ZFCP_MAX_SBALES_PER_REQ,</div><div class='del'>-	      cmd_per_lun:             1,</div><div class='del'>-	      unchecked_isa_dma:       0,</div><div class='del'>-	      use_clustering:          1,</div><div class='del'>-	      sdev_attrs:              zfcp_sysfs_sdev_attrs,</div><div class='add'>+		.name			= ZFCP_NAME,</div><div class='add'>+		.proc_name		= "zfcp",</div><div class='add'>+		.proc_info		= NULL,</div><div class='add'>+		.detect			= NULL,</div><div class='add'>+		.slave_alloc		= zfcp_scsi_slave_alloc,</div><div class='add'>+		.slave_configure	= zfcp_scsi_slave_configure,</div><div class='add'>+		.slave_destroy		= zfcp_scsi_slave_destroy,</div><div class='add'>+		.queuecommand		= zfcp_scsi_queuecommand,</div><div class='add'>+		.eh_abort_handler	= zfcp_scsi_eh_abort_handler,</div><div class='add'>+		.eh_device_reset_handler = zfcp_scsi_eh_device_reset_handler,</div><div class='add'>+		.eh_bus_reset_handler	= zfcp_scsi_eh_bus_reset_handler,</div><div class='add'>+		.eh_host_reset_handler	= zfcp_scsi_eh_host_reset_handler,</div><div class='add'>+		.can_queue		= 4096,</div><div class='add'>+		.this_id		= -1,</div><div class='add'>+		/*</div><div class='add'>+		 * FIXME:</div><div class='add'>+		 * one less? can zfcp_create_sbale cope with it?</div><div class='add'>+		 */</div><div class='add'>+		.sg_tablesize		= ZFCP_MAX_SBALES_PER_REQ,</div><div class='add'>+		.cmd_per_lun		= 1,</div><div class='add'>+		.unchecked_isa_dma	= 0,</div><div class='add'>+		.use_clustering		= 1,</div><div class='add'>+		.sdev_attrs		= zfcp_sysfs_sdev_attrs,</div><div class='ctx'> 	},</div><div class='ctx'> 	.driver_version = ZFCP_VERSION,</div><div class='ctx'> 	/* rest initialised with zeros */</div><div class='hunk'>@@ -161,14 +150,6 @@ set_driver_byte(u32 * result, char status)</div><div class='ctx'> 	set_byte(result, status, 3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_scsi_slave_alloc</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> static int</div><div class='ctx'> zfcp_scsi_slave_alloc(struct scsi_device *sdp)</div><div class='ctx'> {</div><div class='hunk'>@@ -195,14 +176,6 @@ zfcp_scsi_slave_alloc(struct scsi_device *sdp)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_scsi_slave_destroy</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)</div><div class='ctx'> {</div><div class='hunk'>@@ -374,18 +347,9 @@ zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,</div><div class='ctx'> 	return zfcp_scsi_command_async(adapter, unit, scpnt, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:    zfcp_unit_lookup</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- *</div><div class='del'>- * context:	</div><div class='del'>- */</div><div class='ctx'> static struct zfcp_unit *</div><div class='del'>-zfcp_unit_lookup(struct zfcp_adapter *adapter, int channel, scsi_id_t id,</div><div class='del'>-		 scsi_lun_t lun)</div><div class='add'>+zfcp_unit_lookup(struct zfcp_adapter *adapter, int channel, unsigned int id,</div><div class='add'>+		 unsigned int lun)</div><div class='ctx'> {</div><div class='ctx'> 	struct zfcp_port *port;</div><div class='ctx'> 	struct zfcp_unit *unit, *retval = NULL;</div><div class='hunk'>@@ -491,13 +455,6 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	zfcp_scsi_eh_device_reset_handler</div><div class='del'>- *</div><div class='del'>- * purpose:</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)</div><div class='ctx'> {</div><div class='hunk'>@@ -625,13 +582,6 @@ zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)</div><div class='ctx'> 	return SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> int</div><div class='ctx'> zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -657,10 +607,6 @@ zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;scsi_host-&gt;unique_id = unique_id++;	/* FIXME */</div><div class='ctx'> 	adapter-&gt;scsi_host-&gt;max_cmd_len = ZFCP_MAX_SCSI_CMND_LENGTH;</div><div class='ctx'> 	adapter-&gt;scsi_host-&gt;transportt = zfcp_transport_template;</div><div class='del'>-	/*</div><div class='del'>-	 * Reverse mapping of the host number to avoid race condition</div><div class='del'>-	 */</div><div class='del'>-	adapter-&gt;scsi_host_no = adapter-&gt;scsi_host-&gt;host_no;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * save a pointer to our own adapter data structure within</div><div class='hunk'>@@ -678,13 +624,6 @@ zfcp_adapter_scsi_register(struct zfcp_adapter *adapter)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * function:	</div><div class='del'>- *</div><div class='del'>- * purpose:	</div><div class='del'>- *</div><div class='del'>- * returns:</div><div class='del'>- */</div><div class='ctx'> void</div><div class='ctx'> zfcp_adapter_scsi_unregister(struct zfcp_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -703,7 +642,6 @@ zfcp_adapter_scsi_unregister(struct zfcp_adapter *adapter)</div><div class='ctx'> 	scsi_remove_host(shost);</div><div class='ctx'> 	scsi_host_put(shost);</div><div class='ctx'> 	adapter-&gt;scsi_host = NULL;</div><div class='del'>-	adapter-&gt;scsi_host_no = 0;</div><div class='ctx'> 	atomic_clear_mask(ZFCP_STATUS_ADAPTER_REGISTERED, &amp;adapter-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='hunk'>@@ -817,10 +755,9 @@ zfcp_get_fc_host_stats(struct Scsi_Host *shost)</div><div class='ctx'> 	if (!fc_stats)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	memset(data, 0, sizeof(*data));</div><div class='ctx'> </div><div class='ctx'> 	ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -848,10 +785,9 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	adapter = (struct zfcp_adapter *)shost-&gt;hostdata[0];</div><div class='del'>-	data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='del'>-	memset(data, 0, sizeof(*data));</div><div class='ctx'> </div><div class='ctx'> 	ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);</div><div class='ctx'> 	if (ret == 0) {</div><div class='hunk'>@@ -863,11 +799,18 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void zfcp_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout)</div><div class='add'>+{</div><div class='add'>+	rport-&gt;dev_loss_tmo = timeout;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct fc_function_template zfcp_transport_functions = {</div><div class='ctx'> 	.show_starget_port_id = 1,</div><div class='ctx'> 	.show_starget_port_name = 1,</div><div class='ctx'> 	.show_starget_node_name = 1,</div><div class='ctx'> 	.show_rport_supported_classes = 1,</div><div class='add'>+	.show_rport_maxframe_size = 1,</div><div class='add'>+	.show_rport_dev_loss_tmo = 1,</div><div class='ctx'> 	.show_host_node_name = 1,</div><div class='ctx'> 	.show_host_port_name = 1,</div><div class='ctx'> 	.show_host_permanent_port_name = 1,</div><div class='hunk'>@@ -877,6 +820,7 @@ struct fc_function_template zfcp_transport_functions = {</div><div class='ctx'> 	.show_host_serial_number = 1,</div><div class='ctx'> 	.get_fc_host_stats = zfcp_get_fc_host_stats,</div><div class='ctx'> 	.reset_fc_host_stats = zfcp_reset_fc_host_stats,</div><div class='add'>+	.set_rport_dev_loss_tmo = zfcp_set_rport_dev_loss_tmo,</div><div class='ctx'> 	/* no functions registered for following dynamic attributes but</div><div class='ctx'> 	   directly set by LLDD */</div><div class='ctx'> 	.show_host_port_type = 1,</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_sysfs_adapter.c b/drivers/s390/scsi/zfcp_sysfs_adapter.c<br/>index b29ac25e07f3..705c6d4428f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_adapter.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_adapter.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_adapter.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_sysfs_adapter.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_sysfs_adapter.c</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * sysfs adapter related routines</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2003, 2004</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *      Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *	Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *      Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_sysfs_driver.c b/drivers/s390/scsi/zfcp_sysfs_driver.c<br/>index 6622d55e0a45..005e62f8593b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_sysfs_driver.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_sysfs_driver.c</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * sysfs driver related routines</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2003, 2004</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *      Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *	Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *      Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_sysfs_port.c b/drivers/s390/scsi/zfcp_sysfs_port.c<br/>index f401d42db21c..1320c0591431 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_port.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_port.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_port.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_sysfs_port.c</a></div><div class='hunk'>@@ -1,17 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_sysfs_port.c</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * sysfs port related routines</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2003, 2004</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *      Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *	Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *      Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='del'>- *      Volker Sameske &lt;sameske@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/s390/scsi/zfcp_sysfs_unit.c b/drivers/s390/scsi/zfcp_sysfs_unit.c<br/>index ad5dfb889bee..81a484175863 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_unit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/scsi/zfcp_sysfs_unit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/scsi/zfcp_sysfs_unit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/scsi/zfcp_sysfs_unit.c</a></div><div class='hunk'>@@ -1,17 +1,8 @@</div><div class='ctx'> /*</div><div class='del'>- * linux/drivers/s390/scsi/zfcp_sysfs_unit.c</div><div class='add'>+ * This file is part of the zfcp device driver for</div><div class='add'>+ * FCP adapters for IBM System z9 and zSeries.</div><div class='ctx'>  *</div><div class='del'>- * FCP adapter driver for IBM eServer zSeries</div><div class='del'>- *</div><div class='del'>- * sysfs unit related routines</div><div class='del'>- *</div><div class='del'>- * (C) Copyright IBM Corp. 2003, 2004</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *      Martin Peschke &lt;mpeschke@de.ibm.com&gt;</div><div class='del'>- *	Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;</div><div class='del'>- *      Andreas Herrmann &lt;aherrman@de.ibm.com&gt;</div><div class='del'>- *      Volker Sameske &lt;sameske@de.ibm.com&gt;</div><div class='add'>+ * (C) Copyright IBM Corp. 2002, 2006</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  * it under the terms of the GNU General Public License as published by</div><div class='head'>diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c<br/>index 66da840c9316..d1c1e75bfd60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/s390/sysinfo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/s390/sysinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/s390/sysinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/s390/sysinfo.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *    Author(s): Ulrich Weigand (Ulrich.Weigand@de.ibm.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='head'>diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c<br/>index 015db40ad8a4..4fdb2c932210 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/aurora.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/aurora.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/aurora.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/aurora.c</a></div><div class='hunk'>@@ -337,19 +337,19 @@ static int aurora_probe(void)</div><div class='ctx'> 				printk("intr pri %d\n", grrr);</div><div class='ctx'> #endif</div><div class='ctx'> 				if ((bp-&gt;irq=irqs[bn]) &amp;&amp; valid_irq(bp-&gt;irq) &amp;&amp;</div><div class='del'>-				    !request_irq(bp-&gt;irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {</div><div class='add'>+				    !request_irq(bp-&gt;irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {</div><div class='ctx'> 					free_irq(bp-&gt;irq|0x30, bp);</div><div class='ctx'> 				} else</div><div class='ctx'> 				if ((bp-&gt;irq=prom_getint(sdev-&gt;prom_node, "bintr")) &amp;&amp; valid_irq(bp-&gt;irq) &amp;&amp;</div><div class='del'>-				    !request_irq(bp-&gt;irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {</div><div class='add'>+				    !request_irq(bp-&gt;irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {</div><div class='ctx'> 					free_irq(bp-&gt;irq|0x30, bp);</div><div class='ctx'> 				} else</div><div class='ctx'> 				if ((bp-&gt;irq=prom_getint(sdev-&gt;prom_node, "intr")) &amp;&amp; valid_irq(bp-&gt;irq) &amp;&amp;</div><div class='del'>-				    !request_irq(bp-&gt;irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {</div><div class='add'>+				    !request_irq(bp-&gt;irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {</div><div class='ctx'> 					free_irq(bp-&gt;irq|0x30, bp);</div><div class='ctx'> 				} else</div><div class='ctx'> 				for(grrr=0;grrr&lt;TYPE_1_IRQS;grrr++) {</div><div class='del'>-					if ((bp-&gt;irq=type_1_irq[grrr])&amp;&amp;!request_irq(bp-&gt;irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {</div><div class='add'>+					if ((bp-&gt;irq=type_1_irq[grrr])&amp;&amp;!request_irq(bp-&gt;irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {</div><div class='ctx'> 						free_irq(bp-&gt;irq|0x30, bp);</div><div class='ctx'> 						break;</div><div class='ctx'> 					} else {</div><div class='hunk'>@@ -909,14 +909,14 @@ static int aurora_setup_board(struct Aurora_board * bp)</div><div class='ctx'> #ifdef AURORA_ALLIRQ</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = 0; i &lt; AURORA_ALLIRQ; i++) {</div><div class='del'>-		error = request_irq(allirq[i]|0x30, aurora_interrupt, SA_SHIRQ,</div><div class='add'>+		error = request_irq(allirq[i]|0x30, aurora_interrupt, IRQF_SHARED,</div><div class='ctx'> 				    "sio16", bp);</div><div class='ctx'> 		if (error)</div><div class='ctx'> 			printk(KERN_ERR "IRQ%d request error %d\n",</div><div class='ctx'> 			       allirq[i], error);</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	error = request_irq(bp-&gt;irq|0x30, aurora_interrupt, SA_SHIRQ,</div><div class='add'>+	error = request_irq(bp-&gt;irq|0x30, aurora_interrupt, IRQF_SHARED,</div><div class='ctx'> 			    "sio16", bp);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		printk(KERN_ERR "IRQ request error %d\n", error);</div><div class='head'>diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c<br/>index d89f83f769f5..1cc706e11119 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/bbc_envctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/bbc_envctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/bbc_envctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/bbc_envctrl.c</a></div><div class='hunk'>@@ -575,9 +575,9 @@ int bbc_envctrl_init(void)</div><div class='ctx'> 	int devidx = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((echild = bbc_i2c_getdev(devidx++)) != NULL) {</div><div class='del'>-		if (!strcmp(echild-&gt;prom_name, "temperature"))</div><div class='add'>+		if (!strcmp(echild-&gt;prom_node-&gt;name, "temperature"))</div><div class='ctx'> 			attach_one_temp(echild, temp_index++);</div><div class='del'>-		if (!strcmp(echild-&gt;prom_name, "fan-control"))</div><div class='add'>+		if (!strcmp(echild-&gt;prom_node-&gt;name, "fan-control"))</div><div class='ctx'> 			attach_one_fan(echild, fan_index++);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (temp_index != 0 &amp;&amp; fan_index != 0) {</div><div class='head'>diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c<br/>index 3e156e005f2e..7186235594f9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/bbc_i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/bbc_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/bbc_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/bbc_i2c.c</a></div><div class='hunk'>@@ -377,7 +377,7 @@ static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)</div><div class='ctx'> 	bp-&gt;waiting = 0;</div><div class='ctx'> 	init_waitqueue_head(&amp;bp-&gt;wq);</div><div class='ctx'> 	if (request_irq(edev-&gt;irqs[0], bbc_i2c_interrupt,</div><div class='del'>-			SA_SHIRQ, "bbc_i2c", bp))</div><div class='add'>+			IRQF_SHARED, "bbc_i2c", bp))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;index = index;</div><div class='hunk'>@@ -423,7 +423,7 @@ static int __init bbc_present(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "bbc"))</div><div class='add'>+			if (!strcmp(edev-&gt;prom_node-&gt;name, "bbc"))</div><div class='ctx'> 				return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -446,7 +446,7 @@ static int __init bbc_i2c_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "i2c")) {</div><div class='add'>+			if (!strcmp(edev-&gt;prom_node-&gt;name, "i2c")) {</div><div class='ctx'> 				if (!attach_one_i2c(edev, index))</div><div class='ctx'> 					index++;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c<br/>index ccb20a6f5f36..385f4f768311 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/bpp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/bpp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/bpp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/bpp.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -1031,11 +1030,6 @@ static int __init bpp_init(void)</div><div class='ctx'> 		instances[idx].opened = 0;</div><div class='ctx'> 		probeLptPort(idx);</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_dir("bpp");</div><div class='del'>-	for (idx = 0; idx &lt; BPP_NO; idx++) {</div><div class='del'>-		devfs_mk_cdev(MKDEV(BPP_MAJOR, idx),</div><div class='del'>-				S_IFCHR | S_IRUSR | S_IWUSR, "bpp/%d", idx);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1044,9 +1038,6 @@ static void __exit bpp_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned idx;</div><div class='ctx'> </div><div class='del'>-	for (idx = 0; idx &lt; BPP_NO; idx++)</div><div class='del'>-		devfs_remove("bpp/%d", idx);</div><div class='del'>-	devfs_remove("bpp");</div><div class='ctx'> 	unregister_chrdev(BPP_MAJOR, dev_name);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0;  idx &lt; BPP_NO; idx++) {</div><div class='head'>diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c<br/>index fd2cc7782f76..836a58bb0305 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/cpwatchdog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/cpwatchdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/cpwatchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/cpwatchdog.c</a></div><div class='hunk'>@@ -301,11 +301,11 @@ static int wd_open(struct inode *inode, struct file *f)</div><div class='ctx'> 	{	</div><div class='ctx'> 		if (request_irq(wd_dev.irq, </div><div class='ctx'> 						&amp;wd_interrupt, </div><div class='del'>-						SA_SHIRQ,</div><div class='add'>+						IRQF_SHARED,</div><div class='ctx'> 						WD_OBPNAME,</div><div class='ctx'> 						(void *)wd_dev.regs)) {</div><div class='del'>-			printk("%s: Cannot register IRQ %s\n", </div><div class='del'>-				WD_OBPNAME, __irq_itoa(wd_dev.irq));</div><div class='add'>+			printk("%s: Cannot register IRQ %d\n", </div><div class='add'>+				WD_OBPNAME, wd_dev.irq);</div><div class='ctx'> 			return(-EBUSY);</div><div class='ctx'> 		}</div><div class='ctx'> 		wd_dev.initialized = 1;</div><div class='hunk'>@@ -755,7 +755,7 @@ static int __init wd_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, WD_OBPNAME))</div><div class='add'>+			if (!strcmp(edev-&gt;ofdev.node-&gt;name, WD_OBPNAME))</div><div class='ctx'> 				goto ebus_done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c<br/>index c3a51d1fae5d..d92bc8827a9e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/display7seg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/display7seg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/display7seg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/display7seg.c</a></div><div class='hunk'>@@ -184,7 +184,7 @@ static int __init d7s_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, D7S_OBPNAME))</div><div class='add'>+			if (!strcmp(edev-&gt;prom_node-&gt;name, D7S_OBPNAME))</div><div class='ctx'> 				goto ebus_done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c<br/>index 19e8eddf887a..063e676a3ac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/envctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/envctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/envctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/envctrl.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #define __KERNEL_SYSCALLS__</div><div class='ctx'> static int errno;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='hunk'>@@ -768,16 +767,14 @@ static void envctrl_set_mon(struct i2c_child_t *pchild,</div><div class='ctx'>  *                       decoding tables, monitor type, optional properties.</div><div class='ctx'>  * Return: None.</div><div class='ctx'>  */</div><div class='del'>-static void envctrl_init_adc(struct i2c_child_t *pchild, int node)</div><div class='add'>+static void envctrl_init_adc(struct i2c_child_t *pchild, struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	char chnls_desc[CHANNEL_DESC_SZ];</div><div class='ctx'> 	int i = 0, len;</div><div class='del'>-	char *pos = chnls_desc;</div><div class='add'>+	char *pos;</div><div class='add'>+	unsigned int *pval;</div><div class='ctx'> </div><div class='ctx'> 	/* Firmware describe channels into a stream separated by a '\0'. */</div><div class='del'>-	len = prom_getproperty(node, "channels-description", chnls_desc,</div><div class='del'>-			       CHANNEL_DESC_SZ);</div><div class='del'>-	chnls_desc[CHANNEL_DESC_SZ - 1] = '\0';</div><div class='add'>+	pos = of_get_property(dp, "channels-description", &amp;len);</div><div class='ctx'> </div><div class='ctx'> 	while (len &gt; 0) {</div><div class='ctx'> 		int l = strlen(pos) + 1;</div><div class='hunk'>@@ -787,10 +784,13 @@ static void envctrl_init_adc(struct i2c_child_t *pchild, int node)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get optional properties. */</div><div class='del'>-        len = prom_getproperty(node, "warning-temp", (char *)&amp;warning_temperature,</div><div class='del'>-			       sizeof(warning_temperature));</div><div class='del'>-        len = prom_getproperty(node, "shutdown-temp", (char *)&amp;shutdown_temperature,</div><div class='del'>-			       sizeof(shutdown_temperature));</div><div class='add'>+	pval = of_get_property(dp, "warning-temp", NULL);</div><div class='add'>+	if (pval)</div><div class='add'>+		warning_temperature = *pval;</div><div class='add'>+</div><div class='add'>+	pval = of_get_property(dp, "shutdown-temp", NULL);</div><div class='add'>+	if (pval)</div><div class='add'>+		shutdown_temperature = *pval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function Description: Initialize child device monitoring fan status.</div><div class='hunk'>@@ -864,21 +864,18 @@ static void envctrl_init_voltage_status(struct i2c_child_t *pchild)</div><div class='ctx'> static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='ctx'> 				   struct i2c_child_t *pchild)</div><div class='ctx'> {</div><div class='del'>-	int node, len, i, tbls_size = 0;</div><div class='del'>-</div><div class='del'>-	node = edev_child-&gt;prom_node;</div><div class='add'>+	int len, i, tbls_size = 0;</div><div class='add'>+	struct device_node *dp = edev_child-&gt;prom_node;</div><div class='add'>+	void *pval;</div><div class='ctx'> </div><div class='ctx'> 	/* Get device address. */</div><div class='del'>-	len = prom_getproperty(node, "reg",</div><div class='del'>-			       (char *) &amp;(pchild-&gt;addr),</div><div class='del'>-			       sizeof(pchild-&gt;addr));</div><div class='add'>+	pval = of_get_property(dp, "reg", &amp;len);</div><div class='add'>+	memcpy(&amp;pchild-&gt;addr, pval, len);</div><div class='ctx'> </div><div class='ctx'> 	/* Get tables property.  Read firmware temperature tables. */</div><div class='del'>-	len = prom_getproperty(node, "translation",</div><div class='del'>-			       (char *) pchild-&gt;tblprop_array,</div><div class='del'>-			       (PCF8584_MAX_CHANNELS *</div><div class='del'>-				sizeof(struct pcf8584_tblprop)));</div><div class='del'>-	if (len &gt; 0) {</div><div class='add'>+	pval = of_get_property(dp, "translation", &amp;len);</div><div class='add'>+	if (pval &amp;&amp; len &gt; 0) {</div><div class='add'>+		memcpy(pchild-&gt;tblprop_array, pval, len);</div><div class='ctx'>                 pchild-&gt;total_tbls = len / sizeof(struct pcf8584_tblprop);</div><div class='ctx'> 		for (i = 0; i &lt; pchild-&gt;total_tbls; i++) {</div><div class='ctx'> 			if ((pchild-&gt;tblprop_array[i].size + pchild-&gt;tblprop_array[i].offset) &gt; tbls_size) {</div><div class='hunk'>@@ -891,12 +888,12 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='ctx'> 			printk("envctrl: Failed to allocate table.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-                len = prom_getproperty(node, "tables",</div><div class='del'>-				       (char *) pchild-&gt;tables, tbls_size);</div><div class='del'>-                if (len &lt;= 0) {</div><div class='add'>+		pval = of_get_property(dp, "tables", &amp;len);</div><div class='add'>+                if (!pval || len &lt;= 0) {</div><div class='ctx'> 			printk("envctrl: Failed to get table.\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+		memcpy(pchild-&gt;tables, pval, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* SPARCengine ASM Reference Manual (ref. SMI doc 805-7581-04)</div><div class='hunk'>@@ -907,12 +904,11 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='ctx'> 	 * 'NULL' monitor type.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ENVCTRL_CPCI_IGNORED_NODE == pchild-&gt;addr) {</div><div class='add'>+		struct device_node *root_node;</div><div class='ctx'> 		int len;</div><div class='del'>-		char prop[56];</div><div class='ctx'> </div><div class='del'>-		len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop));</div><div class='del'>-		if (0 &lt; len &amp;&amp; (0 == strncmp(prop, "SUNW,UltraSPARC-IIi-cEngine", len)))</div><div class='del'>-		{</div><div class='add'>+		root_node = of_find_node_by_path("/");</div><div class='add'>+		if (!strcmp(root_node-&gt;name, "SUNW,UltraSPARC-IIi-cEngine")) {</div><div class='ctx'> 			for (len = 0; len &lt; PCF8584_MAX_CHANNELS; ++len) {</div><div class='ctx'> 				pchild-&gt;mon_type[len] = ENVCTRL_NOMON;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -921,16 +917,14 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the monitor channels. */</div><div class='del'>-	len = prom_getproperty(node, "channels-in-use",</div><div class='del'>-			       (char *) pchild-&gt;chnl_array,</div><div class='del'>-			       (PCF8584_MAX_CHANNELS *</div><div class='del'>-				sizeof(struct pcf8584_channel)));</div><div class='add'>+	pval = of_get_property(dp, "channels-in-use", &amp;len);</div><div class='add'>+	memcpy(pchild-&gt;chnl_array, pval, len);</div><div class='ctx'> 	pchild-&gt;total_chnls = len / sizeof(struct pcf8584_channel);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pchild-&gt;total_chnls; i++) {</div><div class='ctx'> 		switch (pchild-&gt;chnl_array[i].type) {</div><div class='ctx'> 		case PCF8584_TEMP_TYPE:</div><div class='del'>-			envctrl_init_adc(pchild, node);</div><div class='add'>+			envctrl_init_adc(pchild, dp);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case PCF8584_GLOBALADDR_TYPE:</div><div class='hunk'>@@ -945,7 +939,7 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,</div><div class='ctx'> </div><div class='ctx'> 		case PCF8584_VOLTAGE_TYPE:</div><div class='ctx'> 			if (pchild-&gt;i2ctype == I2C_ADC) {</div><div class='del'>-				envctrl_init_adc(pchild,node);</div><div class='add'>+				envctrl_init_adc(pchild,dp);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				envctrl_init_voltage_status(pchild);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1046,7 +1040,7 @@ static int __init envctrl_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "bbc")) {</div><div class='add'>+			if (!strcmp(edev-&gt;prom_node-&gt;name, "bbc")) {</div><div class='ctx'> 				/* If we find a boot-bus controller node,</div><div class='ctx'> 				 * then this envctrl driver is not for us.</div><div class='ctx'> 				 */</div><div class='hunk'>@@ -1060,14 +1054,14 @@ static int __init envctrl_init(void)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "i2c")) {</div><div class='add'>+			if (!strcmp(edev-&gt;prom_node-&gt;name, "i2c")) {</div><div class='ctx'> 				i2c = ioremap(edev-&gt;resource[0].start, 0x2);</div><div class='ctx'> 				for_each_edevchild(edev, edev_child) {</div><div class='del'>-					if (!strcmp("gpio", edev_child-&gt;prom_name)) {</div><div class='add'>+					if (!strcmp("gpio", edev_child-&gt;prom_node-&gt;name)) {</div><div class='ctx'> 						i2c_childlist[i].i2ctype = I2C_GPIO;</div><div class='ctx'> 						envctrl_init_i2c_child(edev_child, &amp;(i2c_childlist[i++]));</div><div class='ctx'> 					}</div><div class='del'>-					if (!strcmp("adc", edev_child-&gt;prom_name)) {</div><div class='add'>+					if (!strcmp("adc", edev_child-&gt;prom_node-&gt;name)) {</div><div class='ctx'> 						i2c_childlist[i].i2ctype = I2C_ADC;</div><div class='ctx'> 						envctrl_init_i2c_child(edev_child, &amp;(i2c_childlist[i++]));</div><div class='ctx'> 					}</div><div class='head'>diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c<br/>index 2beb3dded087..fa2418f7ad39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/flash.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/flash.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/flash.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/flash.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -71,7 +70,6 @@ flash_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 	if (vma-&gt;vm_end - (vma-&gt;vm_start + (vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT)) &gt; size)</div><div class='ctx'> 		size = vma-&gt;vm_end - (vma-&gt;vm_start + (vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT));</div><div class='ctx'> </div><div class='del'>-	vma-&gt;vm_flags |= (VM_SHM | VM_LOCKED);</div><div class='ctx'> 	vma-&gt;vm_page_prot = pgprot_noncached(vma-&gt;vm_page_prot);</div><div class='ctx'> </div><div class='ctx'> 	if (io_remap_pfn_range(vma, vma-&gt;vm_start, addr, size, vma-&gt;vm_page_prot))</div><div class='hunk'>@@ -192,9 +190,11 @@ static int __init flash_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!sdev) {</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='add'>+		struct linux_prom_registers *ebus_regs;</div><div class='add'>+</div><div class='ctx'> 		for_each_ebus(ebus) {</div><div class='ctx'> 			for_each_ebusdev(edev, ebus) {</div><div class='del'>-				if (!strcmp(edev-&gt;prom_name, "flashprom"))</div><div class='add'>+				if (!strcmp(edev-&gt;prom_node-&gt;name, "flashprom"))</div><div class='ctx'> 					goto ebus_done;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -202,23 +202,23 @@ static int __init flash_init(void)</div><div class='ctx'> 		if (!edev)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> </div><div class='del'>-		len = prom_getproperty(edev-&gt;prom_node, "reg", (void *)regs, sizeof(regs));</div><div class='del'>-		if ((len % sizeof(regs[0])) != 0) {</div><div class='add'>+		ebus_regs = of_get_property(edev-&gt;prom_node, "reg", &amp;len);</div><div class='add'>+		if (!ebus_regs || (len % sizeof(regs[0])) != 0) {</div><div class='ctx'> 			printk("flash: Strange reg property size %d\n", len);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nregs = len / sizeof(regs[0]);</div><div class='add'>+		nregs = len / sizeof(ebus_regs[0]);</div><div class='ctx'> </div><div class='ctx'> 		flash.read_base = edev-&gt;resource[0].start;</div><div class='del'>-		flash.read_size = regs[0].reg_size;</div><div class='add'>+		flash.read_size = ebus_regs[0].reg_size;</div><div class='ctx'> </div><div class='ctx'> 		if (nregs == 1) {</div><div class='ctx'> 			flash.write_base = edev-&gt;resource[0].start;</div><div class='del'>-			flash.write_size = regs[0].reg_size;</div><div class='add'>+			flash.write_size = ebus_regs[0].reg_size;</div><div class='ctx'> 		} else if (nregs == 2) {</div><div class='ctx'> 			flash.write_base = edev-&gt;resource[1].start;</div><div class='del'>-			flash.write_size = regs[1].reg_size;</div><div class='add'>+			flash.write_size = ebus_regs[1].reg_size;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk("flash: Strange number of regs %d\n", nregs);</div><div class='ctx'> 			return -ENODEV;</div><div class='head'>diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c<br/>index 239e108b8ed1..293bb2fdb1d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/openprom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/openprom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/openprom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/openprom.c</a></div><div class='hunk'>@@ -29,9 +29,6 @@</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PROMLIB_INTERNAL</div><div class='del'>-</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -39,10 +36,10 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/miscdevice.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/openpromio.h&gt;</div><div class='hunk'>@@ -51,15 +48,20 @@</div><div class='ctx'> #include &lt;asm/pbm.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+MODULE_AUTHOR("Thomas K. Dyas (tdyas@noc.rutgers.edu) and Eddie C. Dost  (ecd@skynet.be)");</div><div class='add'>+MODULE_DESCRIPTION("OPENPROM Configuration Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION("1.0");</div><div class='add'>+</div><div class='ctx'> /* Private data kept by the driver for each descriptor. */</div><div class='ctx'> typedef struct openprom_private_data</div><div class='ctx'> {</div><div class='del'>-	int current_node;	/* Current node for SunOS ioctls. */</div><div class='del'>-	int lastnode;		/* Last valid node used by BSD ioctls. */</div><div class='add'>+	struct device_node *current_node; /* Current node for SunOS ioctls. */</div><div class='add'>+	struct device_node *lastnode; /* Last valid node used by BSD ioctls. */</div><div class='ctx'> } DATA;</div><div class='ctx'> </div><div class='ctx'> /* ID of the PROM node containing all of the EEPROM options. */</div><div class='del'>-static int options_node = 0;</div><div class='add'>+static struct device_node *options_node;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Copy an openpromio structure into kernel space from user space.</div><div class='hunk'>@@ -87,9 +89,8 @@ static int copyin(struct openpromio __user *info, struct openpromio **opp_p)</div><div class='ctx'> 	if (bufsize &gt; OPROMMAXPARAM)</div><div class='ctx'> 		bufsize = OPROMMAXPARAM;</div><div class='ctx'> </div><div class='del'>-	if (!(*opp_p = kmalloc(sizeof(int) + bufsize + 1, GFP_KERNEL)))</div><div class='add'>+	if (!(*opp_p = kzalloc(sizeof(int) + bufsize + 1, GFP_KERNEL)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memset(*opp_p, 0, sizeof(int) + bufsize + 1);</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;(*opp_p)-&gt;oprom_array,</div><div class='ctx'> 			   &amp;info-&gt;oprom_array, bufsize)) {</div><div class='hunk'>@@ -107,10 +108,9 @@ static int getstrings(struct openpromio __user *info, struct openpromio **opp_p)</div><div class='ctx'> 	if (!info || !opp_p)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (!(*opp_p = kmalloc(sizeof(int) + OPROMMAXPARAM + 1, GFP_KERNEL)))</div><div class='add'>+	if (!(*opp_p = kzalloc(sizeof(int) + OPROMMAXPARAM + 1, GFP_KERNEL)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memset(*opp_p, 0, sizeof(int) + OPROMMAXPARAM + 1);</div><div class='ctx'> 	(*opp_p)-&gt;oprom_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	n = bufsize = 0;</div><div class='hunk'>@@ -140,16 +140,164 @@ static int copyout(void __user *info, struct openpromio *opp, int len)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int opromgetprop(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize)</div><div class='add'>+{</div><div class='add'>+	void *pval;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	pval = of_get_property(dp, op-&gt;oprom_array, &amp;len);</div><div class='add'>+	if (!pval || len &lt;= 0 || len &gt; bufsize)</div><div class='add'>+		return copyout(argp, op, sizeof(int));</div><div class='add'>+</div><div class='add'>+	memcpy(op-&gt;oprom_array, pval, len);</div><div class='add'>+	op-&gt;oprom_array[len] = '\0';</div><div class='add'>+	op-&gt;oprom_size = len;</div><div class='add'>+</div><div class='add'>+	return copyout(argp, op, sizeof(int) + bufsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opromnxtprop(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize)</div><div class='add'>+{</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (op-&gt;oprom_array[0] == '\0') {</div><div class='add'>+		prop = dp-&gt;properties;</div><div class='add'>+		if (!prop)</div><div class='add'>+			return copyout(argp, op, sizeof(int));</div><div class='add'>+		len = strlen(prop-&gt;name);</div><div class='add'>+	} else {</div><div class='add'>+		prop = of_find_property(dp, op-&gt;oprom_array, NULL);</div><div class='add'>+</div><div class='add'>+		if (!prop ||</div><div class='add'>+		    !prop-&gt;next ||</div><div class='add'>+		    (len = strlen(prop-&gt;next-&gt;name)) + 1 &gt; bufsize)</div><div class='add'>+			return copyout(argp, op, sizeof(int));</div><div class='add'>+</div><div class='add'>+		prop = prop-&gt;next;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(op-&gt;oprom_array, prop-&gt;name, len);</div><div class='add'>+	op-&gt;oprom_array[len] = '\0';</div><div class='add'>+	op-&gt;oprom_size = ++len;</div><div class='add'>+</div><div class='add'>+	return copyout(argp, op, sizeof(int) + bufsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opromsetopt(struct device_node *dp, struct openpromio *op, int bufsize)</div><div class='add'>+{</div><div class='add'>+	char *buf = op-&gt;oprom_array + strlen(op-&gt;oprom_array) + 1;</div><div class='add'>+	int len = op-&gt;oprom_array + bufsize - buf;</div><div class='add'>+</div><div class='add'>+	return of_set_property(options_node, op-&gt;oprom_array, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opromnext(void __user *argp, unsigned int cmd, struct device_node *dp, struct openpromio *op, int bufsize, DATA *data)</div><div class='add'>+{</div><div class='add'>+	phandle ph;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(phandle) != sizeof(int));</div><div class='add'>+</div><div class='add'>+	if (bufsize &lt; sizeof(phandle))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ph = *((int *) op-&gt;oprom_array);</div><div class='add'>+	if (ph) {</div><div class='add'>+		dp = of_find_node_by_phandle(ph);</div><div class='add'>+		if (!dp)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case OPROMNEXT:</div><div class='add'>+			dp = dp-&gt;sibling;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case OPROMCHILD:</div><div class='add'>+			dp = dp-&gt;child;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case OPROMSETCUR:</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		};</div><div class='add'>+	} else {</div><div class='add'>+		/* Sibling of node zero is the root node.  */</div><div class='add'>+		if (cmd != OPROMNEXT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		dp = of_find_node_by_path("/");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ph = 0;</div><div class='add'>+	if (dp)</div><div class='add'>+		ph = dp-&gt;node;</div><div class='add'>+</div><div class='add'>+	data-&gt;current_node = dp;</div><div class='add'>+	*((int *) op-&gt;oprom_array) = ph;</div><div class='add'>+	op-&gt;oprom_size = sizeof(phandle);</div><div class='add'>+</div><div class='add'>+	return copyout(argp, op, bufsize + sizeof(int));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int oprompci2node(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize, DATA *data)</div><div class='add'>+{</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (bufsize &gt;= 2*sizeof(int)) {</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+		struct pci_dev *pdev;</div><div class='add'>+		struct pcidev_cookie *pcp;</div><div class='add'>+		pdev = pci_find_slot (((int *) op-&gt;oprom_array)[0],</div><div class='add'>+				      ((int *) op-&gt;oprom_array)[1]);</div><div class='add'>+</div><div class='add'>+		pcp = pdev-&gt;sysdata;</div><div class='add'>+		if (pcp != NULL) {</div><div class='add'>+			dp = pcp-&gt;prom_node;</div><div class='add'>+			data-&gt;current_node = dp;</div><div class='add'>+			*((int *)op-&gt;oprom_array) = dp-&gt;node;</div><div class='add'>+			op-&gt;oprom_size = sizeof(int);</div><div class='add'>+			err = copyout(argp, op, bufsize + sizeof(int));</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int oprompath2node(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize, DATA *data)</div><div class='add'>+{</div><div class='add'>+	dp = of_find_node_by_path(op-&gt;oprom_array);</div><div class='add'>+	data-&gt;current_node = dp;</div><div class='add'>+	*((int *)op-&gt;oprom_array) = dp-&gt;node;</div><div class='add'>+	op-&gt;oprom_size = sizeof(int);</div><div class='add'>+</div><div class='add'>+	return copyout(argp, op, bufsize + sizeof(int));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int opromgetbootargs(void __user *argp, struct openpromio *op, int bufsize)</div><div class='add'>+{</div><div class='add'>+	char *buf = saved_command_line;</div><div class='add'>+	int len = strlen(buf);</div><div class='add'>+</div><div class='add'>+	if (len &gt; bufsize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	strcpy(op-&gt;oprom_array, buf);</div><div class='add'>+	op-&gt;oprom_size = len;</div><div class='add'>+</div><div class='add'>+	return copyout(argp, op, bufsize + sizeof(int));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *	SunOS and Solaris /dev/openprom ioctl calls.</div><div class='ctx'>  */</div><div class='ctx'> static int openprom_sunos_ioctl(struct inode * inode, struct file * file,</div><div class='del'>-				unsigned int cmd, unsigned long arg, int node)</div><div class='add'>+				unsigned int cmd, unsigned long arg,</div><div class='add'>+				struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	DATA *data = (DATA *) file-&gt;private_data;</div><div class='del'>-	char buffer[OPROMMAXPARAM+1], *buf;</div><div class='add'>+	DATA *data = file-&gt;private_data;</div><div class='ctx'> 	struct openpromio *opp;</div><div class='del'>-	int bufsize, len, error = 0;</div><div class='add'>+	int bufsize, error = 0;</div><div class='ctx'> 	static int cnt;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='hunk'>@@ -164,119 +312,35 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case OPROMGETOPT:</div><div class='ctx'> 	case OPROMGETPROP:</div><div class='del'>-		len = prom_getproplen(node, opp-&gt;oprom_array);</div><div class='del'>-</div><div class='del'>-		if (len &lt;= 0 || len &gt; bufsize) {</div><div class='del'>-			error = copyout(argp, opp, sizeof(int));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len = prom_getproperty(node, opp-&gt;oprom_array, buffer, bufsize);</div><div class='del'>-</div><div class='del'>-		memcpy(opp-&gt;oprom_array, buffer, len);</div><div class='del'>-		opp-&gt;oprom_array[len] = '\0';</div><div class='del'>-		opp-&gt;oprom_size = len;</div><div class='del'>-</div><div class='del'>-		error = copyout(argp, opp, sizeof(int) + bufsize);</div><div class='add'>+		error = opromgetprop(argp, dp, opp, bufsize);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMNXTOPT:</div><div class='ctx'> 	case OPROMNXTPROP:</div><div class='del'>-		buf = prom_nextprop(node, opp-&gt;oprom_array, buffer);</div><div class='del'>-</div><div class='del'>-		len = strlen(buf);</div><div class='del'>-		if (len == 0 || len + 1 &gt; bufsize) {</div><div class='del'>-			error = copyout(argp, opp, sizeof(int));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(opp-&gt;oprom_array, buf, len);</div><div class='del'>-		opp-&gt;oprom_array[len] = '\0';</div><div class='del'>-		opp-&gt;oprom_size = ++len;</div><div class='del'>-</div><div class='del'>-		error = copyout(argp, opp, sizeof(int) + bufsize);</div><div class='add'>+		error = opromnxtprop(argp, dp, opp, bufsize);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMSETOPT:</div><div class='ctx'> 	case OPROMSETOPT2:</div><div class='del'>-		buf = opp-&gt;oprom_array + strlen(opp-&gt;oprom_array) + 1;</div><div class='del'>-		len = opp-&gt;oprom_array + bufsize - buf;</div><div class='del'>-</div><div class='del'>-		error = prom_setprop(options_node, opp-&gt;oprom_array,</div><div class='del'>-				     buf, len);</div><div class='del'>-</div><div class='del'>-		if (error &lt; 0)</div><div class='del'>-			error = -EINVAL;</div><div class='add'>+		error = opromsetopt(dp, opp, bufsize);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMNEXT:</div><div class='ctx'> 	case OPROMCHILD:</div><div class='ctx'> 	case OPROMSETCUR:</div><div class='del'>-		if (bufsize &lt; sizeof(int)) {</div><div class='del'>-			error = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		node = *((int *) opp-&gt;oprom_array);</div><div class='del'>-</div><div class='del'>-		switch (cmd) {</div><div class='del'>-		case OPROMNEXT: node = __prom_getsibling(node); break;</div><div class='del'>-		case OPROMCHILD: node = __prom_getchild(node); break;</div><div class='del'>-		case OPROMSETCUR: break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		data-&gt;current_node = node;</div><div class='del'>-		*((int *)opp-&gt;oprom_array) = node;</div><div class='del'>-		opp-&gt;oprom_size = sizeof(int);</div><div class='del'>-</div><div class='del'>-		error = copyout(argp, opp, bufsize + sizeof(int));</div><div class='add'>+		error = opromnext(argp, cmd, dp, opp, bufsize, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMPCI2NODE:</div><div class='del'>-		error = -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (bufsize &gt;= 2*sizeof(int)) {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-			struct pci_dev *pdev;</div><div class='del'>-			struct pcidev_cookie *pcp;</div><div class='del'>-			pdev = pci_find_slot (((int *) opp-&gt;oprom_array)[0],</div><div class='del'>-					      ((int *) opp-&gt;oprom_array)[1]);</div><div class='del'>-</div><div class='del'>-			pcp = pdev-&gt;sysdata;</div><div class='del'>-			if (pcp != NULL &amp;&amp; pcp-&gt;prom_node != -1 &amp;&amp; pcp-&gt;prom_node) {</div><div class='del'>-				node = pcp-&gt;prom_node;</div><div class='del'>-				data-&gt;current_node = node;</div><div class='del'>-				*((int *)opp-&gt;oprom_array) = node;</div><div class='del'>-				opp-&gt;oprom_size = sizeof(int);</div><div class='del'>-				error = copyout(argp, opp, bufsize + sizeof(int));</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='add'>+		error = oprompci2node(argp, dp, opp, bufsize, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMPATH2NODE:</div><div class='del'>-		node = prom_finddevice(opp-&gt;oprom_array);</div><div class='del'>-		data-&gt;current_node = node;</div><div class='del'>-		*((int *)opp-&gt;oprom_array) = node;</div><div class='del'>-		opp-&gt;oprom_size = sizeof(int);</div><div class='del'>-</div><div class='del'>-		error = copyout(argp, opp, bufsize + sizeof(int));</div><div class='add'>+		error = oprompath2node(argp, dp, opp, bufsize, data);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMGETBOOTARGS:</div><div class='del'>-		buf = saved_command_line;</div><div class='del'>-</div><div class='del'>-		len = strlen(buf);</div><div class='del'>-</div><div class='del'>-		if (len &gt; bufsize) {</div><div class='del'>-			error = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strcpy(opp-&gt;oprom_array, buf);</div><div class='del'>-		opp-&gt;oprom_size = len;</div><div class='del'>-</div><div class='del'>-		error = copyout(argp, opp, bufsize + sizeof(int));</div><div class='add'>+		error = opromgetbootargs(argp, opp, bufsize);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OPROMU2P:</div><div class='hunk'>@@ -297,25 +361,14 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Return nonzero if a specific node is in the PROM device tree. */</div><div class='del'>-static int intree(int root, int node)</div><div class='add'>+static struct device_node *get_node(phandle n, DATA *data)</div><div class='ctx'> {</div><div class='del'>-	for (; root != 0; root = prom_getsibling(root))</div><div class='del'>-		if (root == node || intree(prom_getchild(root),node))</div><div class='del'>-			return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct device_node *dp = of_find_node_by_phandle(n);</div><div class='ctx'> </div><div class='del'>-/* Return nonzero if a specific node is "valid". */</div><div class='del'>-static int goodnode(int n, DATA *data)</div><div class='del'>-{</div><div class='del'>-	if (n == data-&gt;lastnode || n == prom_root_node || n == options_node)</div><div class='del'>-		return 1;</div><div class='del'>-	if (n == 0 || n == -1 || !intree(prom_root_node,n))</div><div class='del'>-		return 0;</div><div class='del'>-	data-&gt;lastnode = n;</div><div class='del'>-	return 1;</div><div class='add'>+	if (dp)</div><div class='add'>+		data-&gt;lastnode = dp;</div><div class='add'>+</div><div class='add'>+	return dp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Copy in a whole string from userspace into kernelspace. */</div><div class='hunk'>@@ -330,7 +383,7 @@ static int copyin_string(char __user *user, size_t len, char **ptr)</div><div class='ctx'> 	if (!tmp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if(copy_from_user(tmp, user, len)) {</div><div class='add'>+	if (copy_from_user(tmp, user, len)) {</div><div class='ctx'> 		kfree(tmp);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -345,162 +398,187 @@ static int copyin_string(char __user *user, size_t len, char **ptr)</div><div class='ctx'> /*</div><div class='ctx'>  *	NetBSD /dev/openprom ioctl calls.</div><div class='ctx'>  */</div><div class='del'>-static int openprom_bsd_ioctl(struct inode * inode, struct file * file,</div><div class='del'>-			      unsigned int cmd, unsigned long arg)</div><div class='add'>+static int opiocget(void __user *argp, DATA *data)</div><div class='ctx'> {</div><div class='del'>-	DATA *data = (DATA *) file-&gt;private_data;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	struct opiocdesc op;</div><div class='del'>-	int error, node, len;</div><div class='del'>-	char *str, *tmp;</div><div class='del'>-	char buffer[64];</div><div class='del'>-	static int cnt;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case OPIOCGET:</div><div class='del'>-		if (copy_from_user(&amp;op, argp, sizeof(op)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (!goodnode(op.op_nodeid,data))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	char *str;</div><div class='add'>+	void *pval;</div><div class='add'>+	int err, len;</div><div class='ctx'> </div><div class='del'>-		error = copyin_string(op.op_name, op.op_namelen, &amp;str);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+	if (copy_from_user(&amp;op, argp, sizeof(op)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		len = prom_getproplen(op.op_nodeid,str);</div><div class='add'>+	dp = get_node(op.op_nodeid, data);</div><div class='ctx'> </div><div class='del'>-		if (len &gt; op.op_buflen) {</div><div class='del'>-			kfree(str);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+	err = copyin_string(op.op_name, op.op_namelen, &amp;str);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	pval = of_get_property(dp, str, &amp;len);</div><div class='add'>+	err = 0;</div><div class='add'>+	if (!pval || len &gt; op.op_buflen) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	} else {</div><div class='ctx'> 		op.op_buflen = len;</div><div class='add'>+		if (copy_to_user(argp, &amp;op, sizeof(op)) ||</div><div class='add'>+		    copy_to_user(op.op_buf, pval, len))</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	kfree(str);</div><div class='ctx'> </div><div class='del'>-		if (len &lt;= 0) {</div><div class='del'>-			kfree(str);</div><div class='del'>-			/* Verified by the above copy_from_user */</div><div class='del'>-			if (__copy_to_user(argp, &amp;op,</div><div class='del'>-				       sizeof(op)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		tmp = kmalloc(len + 1, GFP_KERNEL);</div><div class='del'>-		if (!tmp) {</div><div class='del'>-			kfree(str);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+static int opiocnextprop(void __user *argp, DATA *data)</div><div class='add'>+{</div><div class='add'>+	struct opiocdesc op;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	char *str;</div><div class='add'>+	int err, len;</div><div class='ctx'> </div><div class='del'>-		cnt = prom_getproperty(op.op_nodeid, str, tmp, len);</div><div class='del'>-		if (cnt &lt;= 0) {</div><div class='del'>-			error = -EINVAL;</div><div class='del'>-		} else {</div><div class='del'>-			tmp[len] = '\0';</div><div class='add'>+	if (copy_from_user(&amp;op, argp, sizeof(op)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-			if (__copy_to_user(argp, &amp;op, sizeof(op)) != 0 ||</div><div class='del'>-			    copy_to_user(op.op_buf, tmp, len) != 0)</div><div class='del'>-				error = -EFAULT;</div><div class='del'>-		}</div><div class='add'>+	dp = get_node(op.op_nodeid, data);</div><div class='add'>+	if (!dp)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		kfree(tmp);</div><div class='del'>-		kfree(str);</div><div class='add'>+	err = copyin_string(op.op_name, op.op_namelen, &amp;str);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-		return error;</div><div class='add'>+	if (str[0] == '\0') {</div><div class='add'>+		prop = dp-&gt;properties;</div><div class='add'>+	} else {</div><div class='add'>+		prop = of_find_property(dp, str, NULL);</div><div class='add'>+		if (prop)</div><div class='add'>+			prop = prop-&gt;next;</div><div class='add'>+	}</div><div class='add'>+	kfree(str);</div><div class='ctx'> </div><div class='del'>-	case OPIOCNEXTPROP:</div><div class='del'>-		if (copy_from_user(&amp;op, argp, sizeof(op)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+	if (!prop)</div><div class='add'>+		len = 0;</div><div class='add'>+	else</div><div class='add'>+		len = prop-&gt;length;</div><div class='ctx'> </div><div class='del'>-		if (!goodnode(op.op_nodeid,data))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	if (len &gt; op.op_buflen)</div><div class='add'>+		len = op.op_buflen;</div><div class='ctx'> </div><div class='del'>-		error = copyin_string(op.op_name, op.op_namelen, &amp;str);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+	if (copy_to_user(argp, &amp;op, sizeof(op)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		tmp = prom_nextprop(op.op_nodeid,str,buffer);</div><div class='add'>+	if (len &amp;&amp;</div><div class='add'>+	    copy_to_user(op.op_buf, prop-&gt;value, len))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (tmp) {</div><div class='del'>-			len = strlen(tmp);</div><div class='del'>-			if (len &gt; op.op_buflen)</div><div class='del'>-				len = op.op_buflen;</div><div class='del'>-			else</div><div class='del'>-				op.op_buflen = len;</div><div class='del'>-		} else {</div><div class='del'>-			len = op.op_buflen = 0;</div><div class='del'>-		}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (!access_ok(VERIFY_WRITE, argp, sizeof(op))) {</div><div class='del'>-			kfree(str);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='add'>+static int opiocset(void __user *argp, DATA *data)</div><div class='add'>+{</div><div class='add'>+	struct opiocdesc op;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	char *str, *tmp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		if (!access_ok(VERIFY_WRITE, op.op_buf, len)) {</div><div class='del'>-			kfree(str);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='add'>+	if (copy_from_user(&amp;op, argp, sizeof(op)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	dp = get_node(op.op_nodeid, data);</div><div class='add'>+	if (!dp)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		error = __copy_to_user(argp, &amp;op, sizeof(op));</div><div class='del'>-		if (!error) error = __copy_to_user(op.op_buf, tmp, len);</div><div class='add'>+	err = copyin_string(op.op_name, op.op_namelen, &amp;str);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	err = copyin_string(op.op_buf, op.op_buflen, &amp;tmp);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kfree(str);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		return error;</div><div class='add'>+	err = of_set_property(dp, str, tmp, op.op_buflen);</div><div class='ctx'> </div><div class='del'>-	case OPIOCSET:</div><div class='del'>-		if (copy_from_user(&amp;op, argp, sizeof(op)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+	kfree(str);</div><div class='add'>+	kfree(tmp);</div><div class='ctx'> </div><div class='del'>-		if (!goodnode(op.op_nodeid,data))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		error = copyin_string(op.op_name, op.op_namelen, &amp;str);</div><div class='del'>-		if (error)</div><div class='del'>-			return error;</div><div class='add'>+static int opiocgetnext(unsigned int cmd, void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	phandle nd;</div><div class='ctx'> </div><div class='del'>-		error = copyin_string(op.op_buf, op.op_buflen, &amp;tmp);</div><div class='del'>-		if (error) {</div><div class='del'>-			kfree(str);</div><div class='del'>-			return error;</div><div class='del'>-		}</div><div class='add'>+	BUILD_BUG_ON(sizeof(phandle) != sizeof(int));</div><div class='ctx'> </div><div class='del'>-		len = prom_setprop(op.op_nodeid,str,tmp,op.op_buflen+1);</div><div class='add'>+	if (copy_from_user(&amp;nd, argp, sizeof(phandle)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		if (len != op.op_buflen)</div><div class='add'>+	if (nd == 0) {</div><div class='add'>+		if (cmd != OPIOCGETNEXT)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		dp = of_find_node_by_path("/");</div><div class='add'>+	} else {</div><div class='add'>+		dp = of_find_node_by_phandle(nd);</div><div class='add'>+		nd = 0;</div><div class='add'>+		if (dp) {</div><div class='add'>+			if (cmd == OPIOCGETNEXT)</div><div class='add'>+				dp = dp-&gt;sibling;</div><div class='add'>+			else</div><div class='add'>+				dp = dp-&gt;child;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dp)</div><div class='add'>+		nd = dp-&gt;node;</div><div class='add'>+	if (copy_to_user(argp, &amp;nd, sizeof(phandle)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-		kfree(str);</div><div class='del'>-		kfree(tmp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='add'>+static int openprom_bsd_ioctl(struct inode * inode, struct file * file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	DATA *data = (DATA *) file-&gt;private_data;</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	case OPIOCGETOPTNODE:</div><div class='del'>-		if (copy_to_user(argp, &amp;options_node, sizeof(int)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case OPIOCGET:</div><div class='add'>+		err = opiocget(argp, data);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	case OPIOCGETNEXT:</div><div class='del'>-	case OPIOCGETCHILD:</div><div class='del'>-		if (copy_from_user(&amp;node, argp, sizeof(int)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+	case OPIOCNEXTPROP:</div><div class='add'>+		err = opiocnextprop(argp, data);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		if (cmd == OPIOCGETNEXT)</div><div class='del'>-			node = __prom_getsibling(node);</div><div class='del'>-		else</div><div class='del'>-			node = __prom_getchild(node);</div><div class='add'>+	case OPIOCSET:</div><div class='add'>+		err = opiocset(argp, data);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case OPIOCGETOPTNODE:</div><div class='add'>+		BUILD_BUG_ON(sizeof(phandle) != sizeof(int));</div><div class='ctx'> </div><div class='del'>-		if (__copy_to_user(argp, &amp;node, sizeof(int)))</div><div class='add'>+		if (copy_to_user(argp, &amp;options_node-&gt;node, sizeof(phandle)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	case OPIOCGETNEXT:</div><div class='add'>+	case OPIOCGETCHILD:</div><div class='add'>+		err = opiocgetnext(cmd, argp);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='del'>-		if (cnt++ &lt; 10)</div><div class='del'>-			printk(KERN_INFO "openprom_bsd_ioctl: cmd 0x%X\n", cmd);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -511,7 +589,6 @@ static int openprom_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 			  unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	DATA *data = (DATA *) file-&gt;private_data;</div><div class='del'>-	static int cnt;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case OPROMGETOPT:</div><div class='hunk'>@@ -563,10 +640,8 @@ static int openprom_ioctl(struct inode * inode, struct file * file,</div><div class='ctx'> 		return openprom_bsd_ioctl(inode,file,cmd,arg);</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		if (cnt++ &lt; 10)</div><div class='del'>-			printk("openprom_ioctl: cmd 0x%X, arg 0x%lX\n", cmd, arg);</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	};</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long openprom_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='hunk'>@@ -594,9 +669,7 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 	case OPROMSETCUR:</div><div class='ctx'> 	case OPROMPCI2NODE:</div><div class='ctx'> 	case OPROMPATH2NODE:</div><div class='del'>-		lock_kernel();</div><div class='ctx'> 		rval = openprom_ioctl(file-&gt;f_dentry-&gt;d_inode, file, cmd, arg);</div><div class='del'>-		lock_kernel();</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -607,13 +680,13 @@ static int openprom_open(struct inode * inode, struct file * file)</div><div class='ctx'> {</div><div class='ctx'> 	DATA *data;</div><div class='ctx'> </div><div class='del'>-	data = (DATA *) kmalloc(sizeof(DATA), GFP_KERNEL);</div><div class='add'>+	data = kmalloc(sizeof(DATA), GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	data-&gt;current_node = prom_root_node;</div><div class='del'>-	data-&gt;lastnode = prom_root_node;</div><div class='del'>-	file-&gt;private_data = (void *)data;</div><div class='add'>+	data-&gt;current_node = of_find_node_by_path("/");</div><div class='add'>+	data-&gt;lastnode = data-&gt;current_node;</div><div class='add'>+	file-&gt;private_data = (void *) data;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -634,24 +707,30 @@ static struct file_operations openprom_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct miscdevice openprom_dev = {</div><div class='del'>-	SUN_OPENPROM_MINOR, "openprom", &amp;openprom_fops</div><div class='add'>+	.minor		= SUN_OPENPROM_MINOR,</div><div class='add'>+	.name		= "openprom",</div><div class='add'>+	.fops		= &amp;openprom_fops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init openprom_init(void)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	error = misc_register(&amp;openprom_dev);</div><div class='del'>-	if (error) {</div><div class='del'>-		printk(KERN_ERR "openprom: unable to get misc minor\n");</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='add'>+	err = misc_register(&amp;openprom_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	options_node = prom_getchild(prom_root_node);</div><div class='del'>-	options_node = prom_searchsiblings(options_node,"options");</div><div class='add'>+	dp = of_find_node_by_path("/");</div><div class='add'>+	dp = dp-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		if (!strcmp(dp-&gt;name, "options"))</div><div class='add'>+			break;</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='add'>+	}</div><div class='add'>+	options_node = dp;</div><div class='ctx'> </div><div class='del'>-	if (options_node == 0 || options_node == -1) {</div><div class='del'>-		printk(KERN_ERR "openprom: unable to find options node\n");</div><div class='add'>+	if (!options_node) {</div><div class='ctx'> 		misc_deregister(&amp;openprom_dev);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -666,4 +745,3 @@ static void __exit openprom_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> module_init(openprom_init);</div><div class='ctx'> module_exit(openprom_cleanup);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/sbus/char/riowatchdog.c b/drivers/sbus/char/riowatchdog.c<br/>index d1babff6a535..2a9cc8204429 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/riowatchdog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/riowatchdog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/riowatchdog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/riowatchdog.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ static int __init riowd_bbc_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "bbc"))</div><div class='add'>+			if (!strcmp(edev-&gt;ofdev.node-&gt;name, "bbc"))</div><div class='ctx'> 				goto found_bbc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -238,7 +238,7 @@ static int __init riowd_init(void)</div><div class='ctx'> </div><div class='ctx'> 	for_each_ebus(ebus) {</div><div class='ctx'> 		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, RIOWD_NAME))</div><div class='add'>+			if (!strcmp(edev-&gt;ofdev.node-&gt;name, RIOWD_NAME))</div><div class='ctx'> 				goto ebus_done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c<br/>index e2d9a7c85427..575b1f7ed410 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/uctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/uctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/uctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/uctrl.c</a></div><div class='hunk'>@@ -400,7 +400,7 @@ static int __init ts102_uctrl_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	driver-&gt;regs-&gt;uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK;</div><div class='del'>-	printk("uctrl: 0x%x (irq %s)\n", driver-&gt;regs, __irq_itoa(driver-&gt;irq));</div><div class='add'>+	printk("uctrl: 0x%x (irq %d)\n", driver-&gt;regs, driver-&gt;irq);</div><div class='ctx'> 	uctrl_get_event_status();</div><div class='ctx'> 	uctrl_get_external_status();</div><div class='ctx'>         return 0;</div><div class='head'>diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h<br/>index 8045cd5e7cb3..63941a259b92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/vfc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/vfc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/vfc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/vfc.h</a></div><div class='hunk'>@@ -1,8 +1,6 @@</div><div class='ctx'> #ifndef _LINUX_VFC_H_</div><div class='ctx'> #define _LINUX_VFC_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * The control register for the vfc is at offset 0x4000</div><div class='ctx'>  * The first field ram bank is located at offset 0x5000</div><div class='head'>diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c<br/>index dfdd6be551f3..55b2b31bd7ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/char/vfc_dev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/char/vfc_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/char/vfc_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/char/vfc_dev.c</a></div><div class='hunk'>@@ -164,10 +164,6 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (init_vfc_hw(dev))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-</div><div class='del'>-	devfs_mk_cdev(MKDEV(VFC_MAJOR, instance),</div><div class='del'>-			S_IFCHR | S_IRUSR | S_IWUSR,</div><div class='del'>-			"vfc/%d", instance);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -623,7 +619,7 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> 		map_size = sizeof(struct vfc_regs);</div><div class='ctx'> </div><div class='ctx'> 	vma-&gt;vm_flags |=</div><div class='del'>-		(VM_SHM | VM_LOCKED | VM_IO | VM_MAYREAD | VM_MAYWRITE | VM_MAYSHARE);</div><div class='add'>+		(VM_MAYREAD | VM_MAYWRITE | VM_MAYSHARE);</div><div class='ctx'> 	map_offset = (unsigned int) (long)dev-&gt;phys_regs;</div><div class='ctx'> 	ret = io_remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='ctx'> 				  MK_IOSPACE_PFN(dev-&gt;which_io,</div><div class='hunk'>@@ -677,7 +673,6 @@ static int vfc_probe(void)</div><div class='ctx'> 		kfree(vfc_dev_lst);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	devfs_mk_dir("vfc");</div><div class='ctx'> 	instance = 0;</div><div class='ctx'> 	for_all_sbusdev(sdev, sbus) {</div><div class='ctx'> 		if (strcmp(sdev-&gt;prom_name, "vfc") == 0) {</div><div class='hunk'>@@ -717,7 +712,6 @@ static void deinit_vfc_device(struct vfc_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if(dev == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	devfs_remove("vfc/%d", dev-&gt;instance);</div><div class='ctx'> 	sbus_iounmap(dev-&gt;regs, sizeof(struct vfc_regs));</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -731,7 +725,6 @@ void cleanup_module(void)</div><div class='ctx'> 	for (devp = vfc_dev_lst; *devp; devp++)</div><div class='ctx'> 		deinit_vfc_device(*devp);</div><div class='ctx'> </div><div class='del'>-	devfs_remove("vfc");</div><div class='ctx'> 	kfree(vfc_dev_lst);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/sbus/dvma.c b/drivers/sbus/dvma.c<br/>index 378a1d68024d..57e1526746a2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/dvma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/dvma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/dvma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/dvma.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c<br/>index 5d30a3ebfccd..16b59773c0bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sbus/sbus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sbus/sbus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sbus/sbus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sbus/sbus.c</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='del'>-/* $Id: sbus.c,v 1.100 2002/01/24 15:36:24 davem Exp $</div><div class='del'>- * sbus.c:  SBus support routines.</div><div class='add'>+/* sbus.c: SBus support routines.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)</div><div class='add'>+ * Copyright (C) 1995, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -14,237 +12,76 @@</div><div class='ctx'> #include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/bpp.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sbus_bus *sbus_root = NULL;</div><div class='add'>+struct sbus_bus *sbus_root;</div><div class='ctx'> </div><div class='del'>-static struct linux_prom_irqs irqs[PROMINTR_MAX] __initdata = { { 0 } };</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-static int interrupts[PROMINTR_MAX] __initdata = { 0 };</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-extern int pcic_present(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Perhaps when I figure out more about the iommu we'll put a</div><div class='del'>- * device registration routine here that probe_sbus() calls to</div><div class='del'>- * setup the iommu for each Sbus.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* We call this for each SBus device, and fill the structure based</div><div class='del'>- * upon the prom device tree.  We return the start of memory after</div><div class='del'>- * the things we have allocated.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* #define DEBUG_FILL */</div><div class='del'>-</div><div class='del'>-static void __init fill_sbus_device(int prom_node, struct sbus_dev *sdev)</div><div class='add'>+static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sdev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long address, base;</div><div class='add'>+	unsigned long base;</div><div class='add'>+	void *pval;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	sdev-&gt;prom_node = prom_node;</div><div class='del'>-	prom_getstring(prom_node, "name",</div><div class='del'>-		       sdev-&gt;prom_name, sizeof(sdev-&gt;prom_name));</div><div class='del'>-	address = prom_getint(prom_node, "address");</div><div class='del'>-	len = prom_getproperty(prom_node, "reg",</div><div class='del'>-			       (char *) sdev-&gt;reg_addrs,</div><div class='del'>-			       sizeof(sdev-&gt;reg_addrs));</div><div class='del'>-	if (len == -1) {</div><div class='del'>-		sdev-&gt;num_registers = 0;</div><div class='del'>-		goto no_regs;</div><div class='del'>-	}</div><div class='add'>+	sdev-&gt;prom_node = dp-&gt;node;</div><div class='add'>+	strcpy(sdev-&gt;prom_name, dp-&gt;name);</div><div class='ctx'> </div><div class='del'>-	if (len % sizeof(struct linux_prom_registers)) {</div><div class='del'>-		prom_printf("fill_sbus_device: proplen for regs of %s "</div><div class='del'>-			    " was %d, need multiple of %d\n",</div><div class='del'>-			    sdev-&gt;prom_name, len,</div><div class='del'>-			    (int) sizeof(struct linux_prom_registers));</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	if (len &gt; (sizeof(struct linux_prom_registers) * PROMREG_MAX)) {</div><div class='del'>-		prom_printf("fill_sbus_device: Too many register properties "</div><div class='del'>-			    "for device %s, len=%d\n",</div><div class='del'>-			    sdev-&gt;prom_name, len);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	sdev-&gt;num_registers = len / sizeof(struct linux_prom_registers);</div><div class='del'>-	sdev-&gt;ranges_applied = 0;</div><div class='add'>+	pval = of_get_property(dp, "reg", &amp;len);</div><div class='add'>+	sdev-&gt;num_registers = 0;</div><div class='add'>+	if (pval) {</div><div class='add'>+		memcpy(sdev-&gt;reg_addrs, pval, len);</div><div class='ctx'> </div><div class='del'>-	base = (unsigned long) sdev-&gt;reg_addrs[0].phys_addr;</div><div class='add'>+		sdev-&gt;num_registers =</div><div class='add'>+			len / sizeof(struct linux_prom_registers);</div><div class='ctx'> </div><div class='del'>-	/* Compute the slot number. */</div><div class='del'>-	if (base &gt;= SUN_SBUS_BVADDR &amp;&amp; sparc_cpu_model == sun4m) {</div><div class='del'>-		sdev-&gt;slot = sbus_dev_slot(base);</div><div class='del'>-	} else {</div><div class='del'>-		sdev-&gt;slot = sdev-&gt;reg_addrs[0].which_io;</div><div class='del'>-	}</div><div class='add'>+		base = (unsigned long) sdev-&gt;reg_addrs[0].phys_addr;</div><div class='ctx'> </div><div class='del'>-no_regs:</div><div class='del'>-	len = prom_getproperty(prom_node, "ranges",</div><div class='del'>-			       (char *)sdev-&gt;device_ranges,</div><div class='del'>-			       sizeof(sdev-&gt;device_ranges));</div><div class='del'>-	if (len == -1) {</div><div class='del'>-		sdev-&gt;num_device_ranges = 0;</div><div class='del'>-		goto no_ranges;</div><div class='del'>-	}</div><div class='del'>-	if (len % sizeof(struct linux_prom_ranges)) {</div><div class='del'>-		prom_printf("fill_sbus_device: proplen for ranges of %s "</div><div class='del'>-			    " was %d, need multiple of %d\n",</div><div class='del'>-			    sdev-&gt;prom_name, len,</div><div class='del'>-			    (int) sizeof(struct linux_prom_ranges));</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	if (len &gt; (sizeof(struct linux_prom_ranges) * PROMREG_MAX)) {</div><div class='del'>-		prom_printf("fill_sbus_device: Too many range properties "</div><div class='del'>-			    "for device %s, len=%d\n",</div><div class='del'>-			    sdev-&gt;prom_name, len);</div><div class='del'>-		prom_halt();</div><div class='add'>+		/* Compute the slot number. */</div><div class='add'>+		if (base &gt;= SUN_SBUS_BVADDR &amp;&amp; sparc_cpu_model == sun4m)</div><div class='add'>+			sdev-&gt;slot = sbus_dev_slot(base);</div><div class='add'>+		else</div><div class='add'>+			sdev-&gt;slot = sdev-&gt;reg_addrs[0].which_io;</div><div class='ctx'> 	}</div><div class='del'>-	sdev-&gt;num_device_ranges =</div><div class='del'>-		len / sizeof(struct linux_prom_ranges);</div><div class='del'>-</div><div class='del'>-no_ranges:</div><div class='del'>-	/* XXX Unfortunately, IRQ issues are very arch specific.</div><div class='del'>-	 * XXX Pull this crud out into an arch specific area</div><div class='del'>-	 * XXX at some point. -DaveM</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	len = prom_getproperty(prom_node, "interrupts",</div><div class='del'>-			       (char *) irqs, sizeof(irqs));</div><div class='del'>-	if (len == -1 || len == 0) {</div><div class='del'>-		sdev-&gt;irqs[0] = 0;</div><div class='del'>-		sdev-&gt;num_irqs = 0;</div><div class='del'>-	} else {</div><div class='del'>-		unsigned int pri = irqs[0].pri;</div><div class='del'>-</div><div class='del'>-		sdev-&gt;num_irqs = 1;</div><div class='del'>-		if (pri &lt; 0x20)</div><div class='del'>-			pri += sdev-&gt;slot * 8;</div><div class='del'>-</div><div class='del'>-		sdev-&gt;irqs[0] =	sbus_build_irq(sdev-&gt;bus, pri);</div><div class='add'>+</div><div class='add'>+	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='add'>+	sdev-&gt;num_device_ranges = 0;</div><div class='add'>+	if (pval) {</div><div class='add'>+		memcpy(sdev-&gt;device_ranges, pval, len);</div><div class='add'>+		sdev-&gt;num_device_ranges =</div><div class='add'>+			len / sizeof(struct linux_prom_ranges);</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_SPARC64 */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	len = prom_getproperty(prom_node, "intr",</div><div class='del'>-			       (char *)irqs, sizeof(irqs));</div><div class='del'>-	if (len != -1) {</div><div class='del'>-		sdev-&gt;num_irqs = len / 8;</div><div class='del'>-		if (sdev-&gt;num_irqs == 0) {</div><div class='del'>-			sdev-&gt;irqs[0] = 0;</div><div class='del'>-		} else if (sparc_cpu_model == sun4d) {</div><div class='del'>-			extern unsigned int sun4d_build_irq(struct sbus_dev *sdev, int irq);</div><div class='del'>-</div><div class='del'>-			for (len = 0; len &lt; sdev-&gt;num_irqs; len++)</div><div class='del'>-				sdev-&gt;irqs[len] = sun4d_build_irq(sdev, irqs[len].pri);</div><div class='del'>-		} else {</div><div class='del'>-			for (len = 0; len &lt; sdev-&gt;num_irqs; len++)</div><div class='del'>-				sdev-&gt;irqs[len] = irqs[len].pri;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* No "intr" node found-- check for "interrupts" node.</div><div class='del'>-		 * This node contains SBus interrupt levels, not IPLs</div><div class='del'>-		 * as in "intr", and no vector values.  We convert </div><div class='del'>-		 * SBus interrupt levels to PILs (platform specific).</div><div class='del'>-		 */</div><div class='del'>-		len = prom_getproperty(prom_node, "interrupts", </div><div class='del'>-					(char *)interrupts, sizeof(interrupts));</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			sdev-&gt;irqs[0] = 0;</div><div class='del'>-			sdev-&gt;num_irqs = 0;</div><div class='del'>-		} else {</div><div class='del'>-			sdev-&gt;num_irqs = len / sizeof(int);</div><div class='del'>-			for (len = 0; len &lt; sdev-&gt;num_irqs; len++) {</div><div class='del'>-				sdev-&gt;irqs[len] = sbint_to_irq(sdev, interrupts[len]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} </div><div class='del'>-#endif /* CONFIG_SPARC32 */</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* This routine gets called from whoever needs the sbus first, to scan</div><div class='del'>- * the SBus device tree.  Currently it just prints out the devices</div><div class='del'>- * found on the bus and builds trees of SBUS structs and attached</div><div class='del'>- * devices.</div><div class='del'>- */</div><div class='add'>+	sbus_fill_device_irq(sdev);</div><div class='ctx'> </div><div class='del'>-extern void iommu_init(int iommu_node, struct sbus_bus *sbus);</div><div class='del'>-extern void iounit_init(int sbi_node, int iounit_node, struct sbus_bus *sbus);</div><div class='del'>-void sun4_init(void);</div><div class='del'>-#ifdef CONFIG_SUN_AUXIO</div><div class='del'>-extern void auxio_probe(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __init sbus_do_child_siblings(int start_node,</div><div class='del'>-					  struct sbus_dev *child,</div><div class='del'>-					  struct sbus_dev *parent,</div><div class='del'>-					  struct sbus_bus *sbus)</div><div class='del'>-{</div><div class='del'>-	struct sbus_dev *this_dev = child;</div><div class='del'>-	int this_node = start_node;</div><div class='del'>-</div><div class='del'>-	/* Child already filled in, just need to traverse siblings. */</div><div class='del'>-	child-&gt;child = NULL;</div><div class='del'>-	child-&gt;parent = parent;</div><div class='del'>-	while((this_node = prom_getsibling(this_node)) != 0) {</div><div class='del'>-		this_dev-&gt;next = kmalloc(sizeof(struct sbus_dev), GFP_ATOMIC);</div><div class='del'>-		this_dev = this_dev-&gt;next;</div><div class='del'>-		this_dev-&gt;next = NULL;</div><div class='del'>-		this_dev-&gt;parent = parent;</div><div class='del'>-</div><div class='del'>-		this_dev-&gt;bus = sbus;</div><div class='del'>-		fill_sbus_device(this_node, this_dev);</div><div class='del'>-</div><div class='del'>-		if(prom_getchild(this_node)) {</div><div class='del'>-			this_dev-&gt;child = kmalloc(sizeof(struct sbus_dev),</div><div class='del'>-						  GFP_ATOMIC);</div><div class='del'>-			this_dev-&gt;child-&gt;bus = sbus;</div><div class='del'>-			this_dev-&gt;child-&gt;next = NULL;</div><div class='del'>-			fill_sbus_device(prom_getchild(this_node), this_dev-&gt;child);</div><div class='del'>-			sbus_do_child_siblings(prom_getchild(this_node),</div><div class='del'>-					       this_dev-&gt;child, this_dev, sbus);</div><div class='del'>-		} else {</div><div class='del'>-			this_dev-&gt;child = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	sdev-&gt;ofdev.node = dp;</div><div class='add'>+	if (sdev-&gt;parent)</div><div class='add'>+		sdev-&gt;ofdev.dev.parent = &amp;sdev-&gt;parent-&gt;ofdev.dev;</div><div class='add'>+	else</div><div class='add'>+		sdev-&gt;ofdev.dev.parent = &amp;sdev-&gt;bus-&gt;ofdev.dev;</div><div class='add'>+	sdev-&gt;ofdev.dev.bus = &amp;sbus_bus_type;</div><div class='add'>+	strcpy(sdev-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * XXX This functions appears to be a distorted version of</div><div class='del'>- * prom_sbus_ranges_init(), with all sun4d stuff cut away.</div><div class='del'>- * Ask DaveM what is going on here, how is sun4d supposed to work... XXX</div><div class='del'>- */</div><div class='del'>-/* added back sun4d patch from Thomas Bogendoerfer - should be OK (crn) */</div><div class='add'>+	if (of_device_register(&amp;sdev-&gt;ofdev) != 0)</div><div class='add'>+		printk(KERN_DEBUG "sbus: device registration error for %s!\n",</div><div class='add'>+		       sdev-&gt;ofdev.dev.bus_id);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static void __init sbus_bus_ranges_init(int parent_node, struct sbus_bus *sbus)</div><div class='add'>+static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus)</div><div class='ctx'> {</div><div class='add'>+	void *pval;</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	len = prom_getproperty(sbus-&gt;prom_node, "ranges",</div><div class='del'>-			       (char *) sbus-&gt;sbus_ranges,</div><div class='del'>-			       sizeof(sbus-&gt;sbus_ranges));</div><div class='del'>-	if (len == -1 || len == 0) {</div><div class='del'>-		sbus-&gt;num_sbus_ranges = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	sbus-&gt;num_sbus_ranges = len / sizeof(struct linux_prom_ranges);</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		struct linux_prom_ranges iounit_ranges[PROMREG_MAX];</div><div class='del'>-		int num_iounit_ranges;</div><div class='del'>-</div><div class='del'>-		len = prom_getproperty(parent_node, "ranges",</div><div class='del'>-				       (char *) iounit_ranges,</div><div class='del'>-				       sizeof (iounit_ranges));</div><div class='del'>-		if (len != -1) {</div><div class='del'>-			num_iounit_ranges = (len/sizeof(struct linux_prom_ranges));</div><div class='del'>-			prom_adjust_ranges (sbus-&gt;sbus_ranges, sbus-&gt;num_sbus_ranges, iounit_ranges, num_iounit_ranges);</div><div class='del'>-		}</div><div class='add'>+	pval = of_get_property(dp, "ranges", &amp;len);</div><div class='add'>+	sbus-&gt;num_sbus_ranges = 0;</div><div class='add'>+	if (pval) {</div><div class='add'>+		memcpy(sbus-&gt;sbus_ranges, pval, len);</div><div class='add'>+		sbus-&gt;num_sbus_ranges =</div><div class='add'>+			len / sizeof(struct linux_prom_ranges);</div><div class='add'>+</div><div class='add'>+		sbus_arch_bus_ranges_init(dp-&gt;parent, sbus);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init __apply_ranges_to_regs(struct linux_prom_ranges *ranges,</div><div class='hunk'>@@ -322,241 +159,127 @@ static void __init sbus_fixup_all_regs(struct sbus_dev *first_sdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern void register_proc_sparc_ioport(void);</div><div class='del'>-extern void firetruck_init(void);</div><div class='add'>+/* We preserve the "probe order" of these bus and device lists to give</div><div class='add'>+ * the same ordering as the old code.</div><div class='add'>+ */</div><div class='add'>+static void __init sbus_insert(struct sbus_bus *sbus, struct sbus_bus **root)</div><div class='add'>+{</div><div class='add'>+	while (*root)</div><div class='add'>+		root = &amp;(*root)-&gt;next;</div><div class='add'>+	*root = sbus;</div><div class='add'>+	sbus-&gt;next = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-extern void sun4_dvma_init(void);</div><div class='del'>-#endif</div><div class='add'>+static void __init sdev_insert(struct sbus_dev *sdev, struct sbus_dev **root)</div><div class='add'>+{</div><div class='add'>+	while (*root)</div><div class='add'>+		root = &amp;(*root)-&gt;next;</div><div class='add'>+	*root = sdev;</div><div class='add'>+	sdev-&gt;next = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int __init sbus_init(void)</div><div class='add'>+static void __init walk_children(struct device_node *dp, struct sbus_dev *parent, struct sbus_bus *sbus)</div><div class='ctx'> {</div><div class='del'>-	int nd, this_sbus, sbus_devs, topnd, iommund;</div><div class='del'>-	unsigned int sbus_clock;</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *this_dev;</div><div class='del'>-	int num_sbus = 0;  /* How many did we find? */</div><div class='add'>+	dp = dp-&gt;child;</div><div class='add'>+	while (dp) {</div><div class='add'>+		struct sbus_dev *sdev;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	register_proc_sparc_ioport();</div><div class='del'>-#endif</div><div class='add'>+		sdev = kzalloc(sizeof(struct sbus_dev), GFP_ATOMIC);</div><div class='add'>+		if (sdev) {</div><div class='add'>+			sdev_insert(sdev, &amp;parent-&gt;child);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	sun4_dvma_init();</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	topnd = prom_getchild(prom_root_node);</div><div class='del'>-	</div><div class='del'>-	/* Finding the first sbus is a special case... */</div><div class='del'>-	iommund = 0;</div><div class='del'>-	if(sparc_cpu_model == sun4u) {</div><div class='del'>-		nd = prom_searchsiblings(topnd, "sbus");</div><div class='del'>-		if(nd == 0) {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-			if (!pcic_present()) {</div><div class='del'>-				prom_printf("Neither SBUS nor PCI found.\n");</div><div class='del'>-				prom_halt();</div><div class='del'>-			} else {</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-				firetruck_init();</div><div class='del'>-#endif</div><div class='del'>-			}</div><div class='del'>-			return 0;</div><div class='del'>-#else</div><div class='del'>-			prom_printf("YEEE, UltraSparc sbus not found\n");</div><div class='del'>-			prom_halt();</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-	} else if(sparc_cpu_model == sun4d) {</div><div class='del'>-		if((iommund = prom_searchsiblings(topnd, "io-unit")) == 0 ||</div><div class='del'>-		   (nd = prom_getchild(iommund)) == 0 ||</div><div class='del'>-		   (nd = prom_searchsiblings(nd, "sbi")) == 0) {</div><div class='del'>-		   	panic("sbi not found");</div><div class='del'>-		}</div><div class='del'>-	} else if((nd = prom_searchsiblings(topnd, "sbus")) == 0) {</div><div class='del'>-		if((iommund = prom_searchsiblings(topnd, "iommu")) == 0 ||</div><div class='del'>-		   (nd = prom_getchild(iommund)) == 0 ||</div><div class='del'>-		   (nd = prom_searchsiblings(nd, "sbus")) == 0) {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-                        if (!pcic_present()) {</div><div class='del'>-                                prom_printf("Neither SBUS nor PCI found.\n");</div><div class='del'>-                                prom_halt();</div><div class='del'>-                        }</div><div class='del'>-                        return 0;</div><div class='del'>-#else</div><div class='del'>-			/* No reason to run further - the data access trap will occur. */</div><div class='del'>-			panic("sbus not found");</div><div class='del'>-#endif</div><div class='add'>+			sdev-&gt;bus = sbus;</div><div class='add'>+			sdev-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+			fill_sbus_device(dp, sdev);</div><div class='add'>+</div><div class='add'>+			walk_children(dp, sdev, sbus);</div><div class='ctx'> 		}</div><div class='add'>+		dp = dp-&gt;sibling;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Ok, we've found the first one, allocate first SBus struct</div><div class='del'>-	 * and place in chain.</div><div class='del'>-	 */</div><div class='del'>-	sbus = sbus_root = kmalloc(sizeof(struct sbus_bus), GFP_ATOMIC);</div><div class='del'>-	sbus-&gt;next = NULL;</div><div class='del'>-	sbus-&gt;prom_node = nd;</div><div class='del'>-	this_sbus = nd;</div><div class='add'>+static void __init build_one_sbus(struct device_node *dp, int num_sbus)</div><div class='add'>+{</div><div class='add'>+	struct sbus_bus *sbus;</div><div class='add'>+	unsigned int sbus_clock;</div><div class='add'>+	struct device_node *dev_dp;</div><div class='ctx'> </div><div class='del'>-	if(iommund &amp;&amp; sparc_cpu_model != sun4u &amp;&amp; sparc_cpu_model != sun4d)</div><div class='del'>-		iommu_init(iommund, sbus);</div><div class='add'>+	sbus = kzalloc(sizeof(struct sbus_bus), GFP_ATOMIC);</div><div class='add'>+	if (!sbus)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* Loop until we find no more SBUS's */</div><div class='del'>-	while(this_sbus) {</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-		/* IOMMU hides inside SBUS/SYSIO prom node on Ultra. */</div><div class='del'>-		if(sparc_cpu_model == sun4u) {</div><div class='del'>-			extern void sbus_iommu_init(int prom_node, struct sbus_bus *sbus);</div><div class='add'>+	sbus_insert(sbus, &amp;sbus_root);</div><div class='add'>+	sbus-&gt;prom_node = dp-&gt;node;</div><div class='ctx'> </div><div class='del'>-			sbus_iommu_init(this_sbus, sbus);</div><div class='del'>-		}</div><div class='del'>-#endif /* CONFIG_SPARC64 */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-		if (sparc_cpu_model == sun4d)</div><div class='del'>-			iounit_init(this_sbus, iommund, sbus);</div><div class='del'>-#endif /* CONFIG_SPARC32 */</div><div class='del'>-		printk("sbus%d: ", num_sbus);</div><div class='del'>-		sbus_clock = prom_getint(this_sbus, "clock-frequency");</div><div class='del'>-		if(sbus_clock == -1)</div><div class='del'>-			sbus_clock = (25*1000*1000);</div><div class='del'>-		printk("Clock %d.%d MHz\n", (int) ((sbus_clock/1000)/1000),</div><div class='del'>-		       (int) (((sbus_clock/1000)%1000 != 0) ? </div><div class='del'>-			      (((sbus_clock/1000)%1000) + 1000) : 0));</div><div class='del'>-</div><div class='del'>-		prom_getstring(this_sbus, "name",</div><div class='del'>-			       sbus-&gt;prom_name, sizeof(sbus-&gt;prom_name));</div><div class='del'>-		sbus-&gt;clock_freq = sbus_clock;</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-		if (sparc_cpu_model == sun4d) {</div><div class='del'>-			sbus-&gt;devid = prom_getint(iommund, "device-id");</div><div class='del'>-			sbus-&gt;board = prom_getint(iommund, "board#");</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		</div><div class='del'>-		sbus_bus_ranges_init(iommund, sbus);</div><div class='del'>-</div><div class='del'>-		sbus_devs = prom_getchild(this_sbus);</div><div class='del'>-		if (!sbus_devs) {</div><div class='del'>-			sbus-&gt;devices = NULL;</div><div class='del'>-			goto next_bus;</div><div class='del'>-		}</div><div class='add'>+	sbus_setup_iommu(sbus, dp);</div><div class='ctx'> </div><div class='del'>-		sbus-&gt;devices = kmalloc(sizeof(struct sbus_dev), GFP_ATOMIC);</div><div class='del'>-</div><div class='del'>-		this_dev = sbus-&gt;devices;</div><div class='del'>-		this_dev-&gt;next = NULL;</div><div class='del'>-</div><div class='del'>-		this_dev-&gt;bus = sbus;</div><div class='del'>-		this_dev-&gt;parent = NULL;</div><div class='del'>-		fill_sbus_device(sbus_devs, this_dev);</div><div class='del'>-</div><div class='del'>-		/* Should we traverse for children? */</div><div class='del'>-		if(prom_getchild(sbus_devs)) {</div><div class='del'>-			/* Allocate device node */</div><div class='del'>-			this_dev-&gt;child = kmalloc(sizeof(struct sbus_dev),</div><div class='del'>-						  GFP_ATOMIC);</div><div class='del'>-			/* Fill it */</div><div class='del'>-			this_dev-&gt;child-&gt;bus = sbus;</div><div class='del'>-			this_dev-&gt;child-&gt;next = NULL;</div><div class='del'>-			fill_sbus_device(prom_getchild(sbus_devs),</div><div class='del'>-					 this_dev-&gt;child);</div><div class='del'>-			sbus_do_child_siblings(prom_getchild(sbus_devs),</div><div class='del'>-					       this_dev-&gt;child,</div><div class='del'>-					       this_dev,</div><div class='del'>-					       sbus);</div><div class='del'>-		} else {</div><div class='del'>-			this_dev-&gt;child = NULL;</div><div class='del'>-		}</div><div class='add'>+	printk("sbus%d: ", num_sbus);</div><div class='ctx'> </div><div class='del'>-		while((sbus_devs = prom_getsibling(sbus_devs)) != 0) {</div><div class='del'>-			/* Allocate device node */</div><div class='del'>-			this_dev-&gt;next = kmalloc(sizeof(struct sbus_dev),</div><div class='del'>-						 GFP_ATOMIC);</div><div class='del'>-			this_dev = this_dev-&gt;next;</div><div class='del'>-			this_dev-&gt;next = NULL;</div><div class='del'>-</div><div class='del'>-			/* Fill it */</div><div class='del'>-			this_dev-&gt;bus = sbus;</div><div class='del'>-			this_dev-&gt;parent = NULL;</div><div class='del'>-			fill_sbus_device(sbus_devs, this_dev);</div><div class='del'>-</div><div class='del'>-			/* Is there a child node hanging off of us? */</div><div class='del'>-			if(prom_getchild(sbus_devs)) {</div><div class='del'>-				/* Get new device struct */</div><div class='del'>-				this_dev-&gt;child = kmalloc(sizeof(struct sbus_dev),</div><div class='del'>-							  GFP_ATOMIC);</div><div class='del'>-				/* Fill it */</div><div class='del'>-				this_dev-&gt;child-&gt;bus = sbus;</div><div class='del'>-				this_dev-&gt;child-&gt;next = NULL;</div><div class='del'>-				fill_sbus_device(prom_getchild(sbus_devs),</div><div class='del'>-						 this_dev-&gt;child);</div><div class='del'>-				sbus_do_child_siblings(prom_getchild(sbus_devs),</div><div class='del'>-						       this_dev-&gt;child,</div><div class='del'>-						       this_dev,</div><div class='del'>-						       sbus);</div><div class='del'>-			} else {</div><div class='del'>-				this_dev-&gt;child = NULL;</div><div class='del'>-			}</div><div class='add'>+	sbus_clock = of_getintprop_default(dp, "clock-frequency",</div><div class='add'>+					   (25*1000*1000));</div><div class='add'>+	sbus-&gt;clock_freq = sbus_clock;</div><div class='add'>+</div><div class='add'>+	printk("Clock %d.%d MHz\n", (int) ((sbus_clock/1000)/1000),</div><div class='add'>+	       (int) (((sbus_clock/1000)%1000 != 0) ? </div><div class='add'>+		      (((sbus_clock/1000)%1000) + 1000) : 0));</div><div class='add'>+</div><div class='add'>+	strcpy(sbus-&gt;prom_name, dp-&gt;name);</div><div class='add'>+</div><div class='add'>+	sbus_setup_arch_props(sbus, dp);</div><div class='add'>+</div><div class='add'>+	sbus_bus_ranges_init(dp, sbus);</div><div class='add'>+</div><div class='add'>+	sbus-&gt;ofdev.node = dp;</div><div class='add'>+	sbus-&gt;ofdev.dev.parent = NULL;</div><div class='add'>+	sbus-&gt;ofdev.dev.bus = &amp;sbus_bus_type;</div><div class='add'>+	strcpy(sbus-&gt;ofdev.dev.bus_id, dp-&gt;path_component_name);</div><div class='add'>+</div><div class='add'>+	if (of_device_register(&amp;sbus-&gt;ofdev) != 0)</div><div class='add'>+		printk(KERN_DEBUG "sbus: device registration error for %s!\n",</div><div class='add'>+		       sbus-&gt;ofdev.dev.bus_id);</div><div class='add'>+</div><div class='add'>+	dev_dp = dp-&gt;child;</div><div class='add'>+	while (dev_dp) {</div><div class='add'>+		struct sbus_dev *sdev;</div><div class='add'>+</div><div class='add'>+		sdev = kzalloc(sizeof(struct sbus_dev), GFP_ATOMIC);</div><div class='add'>+		if (sdev) {</div><div class='add'>+			sdev_insert(sdev, &amp;sbus-&gt;devices);</div><div class='add'>+</div><div class='add'>+			sdev-&gt;bus = sbus;</div><div class='add'>+			sdev-&gt;parent = NULL;</div><div class='add'>+			fill_sbus_device(dev_dp, sdev);</div><div class='add'>+</div><div class='add'>+			walk_children(dev_dp, sdev, sbus);</div><div class='ctx'> 		}</div><div class='add'>+		dev_dp = dev_dp-&gt;sibling;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Walk all devices and apply parent ranges. */</div><div class='del'>-		sbus_fixup_all_regs(sbus-&gt;devices);</div><div class='add'>+	sbus_fixup_all_regs(sbus-&gt;devices);</div><div class='ctx'> </div><div class='del'>-		dvma_init(sbus);</div><div class='del'>-	next_bus:</div><div class='add'>+	dvma_init(sbus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init sbus_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	const char *sbus_name = "sbus";</div><div class='add'>+	int num_sbus = 0;</div><div class='add'>+</div><div class='add'>+	if (sbus_arch_preinit())</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (sparc_cpu_model == sun4d)</div><div class='add'>+		sbus_name = "sbi";</div><div class='add'>+</div><div class='add'>+	for_each_node_by_name(dp, sbus_name) {</div><div class='add'>+		build_one_sbus(dp, num_sbus);</div><div class='ctx'> 		num_sbus++;</div><div class='del'>-		if(sparc_cpu_model == sun4u) {</div><div class='del'>-			this_sbus = prom_getsibling(this_sbus);</div><div class='del'>-			if(!this_sbus)</div><div class='del'>-				break;</div><div class='del'>-			this_sbus = prom_searchsiblings(this_sbus, "sbus");</div><div class='del'>-		} else if(sparc_cpu_model == sun4d) {</div><div class='del'>-			iommund = prom_getsibling(iommund);</div><div class='del'>-			if(!iommund)</div><div class='del'>-				break;</div><div class='del'>-			iommund = prom_searchsiblings(iommund, "io-unit");</div><div class='del'>-			if(!iommund)</div><div class='del'>-				break;</div><div class='del'>-			this_sbus = prom_searchsiblings(prom_getchild(iommund), "sbi");</div><div class='del'>-		} else {</div><div class='del'>-			this_sbus = prom_getsibling(this_sbus);</div><div class='del'>-			if(!this_sbus)</div><div class='del'>-				break;</div><div class='del'>-			this_sbus = prom_searchsiblings(this_sbus, "sbus");</div><div class='del'>-		}</div><div class='del'>-		if(this_sbus) {</div><div class='del'>-			sbus-&gt;next = kmalloc(sizeof(struct sbus_bus), GFP_ATOMIC);</div><div class='del'>-			sbus = sbus-&gt;next;</div><div class='del'>-			sbus-&gt;next = NULL;</div><div class='del'>-			sbus-&gt;prom_node = this_sbus;</div><div class='del'>-		} else {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} /* while(this_sbus) */</div><div class='ctx'> </div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		extern void sun4d_init_sbi_irq(void);</div><div class='del'>-		sun4d_init_sbi_irq();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	if (sparc_cpu_model == sun4u) {</div><div class='del'>-		firetruck_init();</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SUN_AUXIO</div><div class='del'>-	if (sparc_cpu_model == sun4u)</div><div class='del'>-		auxio_probe ();</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	if (sparc_cpu_model == sun4u) {</div><div class='del'>-		extern void clock_probe(void);</div><div class='del'>-</div><div class='del'>-		clock_probe();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	sbus_arch_postinit();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c<br/>index caeb6d246e57..5a9475e56d0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/3w-9xxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/3w-9xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/3w-9xxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/3w-9xxx.c</a></div><div class='hunk'>@@ -1388,7 +1388,7 @@ static int twa_map_scsi_sg_data(TW_Device_Extension *tw_dev, int request_id)</div><div class='ctx'> 	if (cmd-&gt;use_sg == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	use_sg = pci_map_sg(pdev, cmd-&gt;buffer, cmd-&gt;use_sg, DMA_BIDIRECTIONAL);</div><div class='add'>+	use_sg = pci_map_sg(pdev, cmd-&gt;request_buffer, cmd-&gt;use_sg, DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 	if (use_sg == 0) {</div><div class='ctx'> 		TW_PRINTK(tw_dev-&gt;host, TW_DRIVER, 0x1c, "Failed to map scatter gather list");</div><div class='hunk'>@@ -2122,7 +2122,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id</div><div class='ctx'> 				     TW_PARAM_PORTCOUNT, TW_PARAM_PORTCOUNT_LENGTH)));</div><div class='ctx'> </div><div class='ctx'> 	/* Now setup the interrupt handler */</div><div class='del'>-	retval = request_irq(pdev-&gt;irq, twa_interrupt, SA_SHIRQ, "3w-9xxx", tw_dev);</div><div class='add'>+	retval = request_irq(pdev-&gt;irq, twa_interrupt, IRQF_SHARED, "3w-9xxx", tw_dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		TW_PRINTK(tw_dev-&gt;host, TW_DRIVER, 0x30, "Error requesting IRQ");</div><div class='ctx'> 		goto out_remove_host;</div><div class='head'>diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c<br/>index e8e41e6eb42a..f3a5f422a8e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/3w-xxxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/3w-xxxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/3w-xxxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/3w-xxxx.c</a></div><div class='hunk'>@@ -405,7 +405,7 @@ static int tw_decode_sense(TW_Device_Extension *tw_dev, int request_id, int fill</div><div class='ctx'> 	/* Attempt to return intelligent sense information */</div><div class='ctx'> 	if (fill_sense) {</div><div class='ctx'> 		if ((command-&gt;status == 0xc7) || (command-&gt;status == 0xcb)) {</div><div class='del'>-			for (i=0;i&lt;(sizeof(tw_sense_table)/sizeof(tw_sense_table[0]));i++) {</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(tw_sense_table); i++) {</div><div class='ctx'> 				if (command-&gt;flags == tw_sense_table[i][0]) {</div><div class='ctx'> </div><div class='ctx'> 					/* Valid bit and 'current errors' */</div><div class='hunk'>@@ -625,7 +625,7 @@ static int tw_aen_complete(TW_Device_Extension *tw_dev, int request_id)</div><div class='ctx'> 	if (aen == 0x0ff) {</div><div class='ctx'> 		printk(KERN_WARNING "3w-xxxx: scsi%d: AEN: INFO: AEN queue overflow.\n", tw_dev-&gt;host-&gt;host_no);</div><div class='ctx'> 	} else {</div><div class='del'>-		table_max = sizeof(tw_aen_string)/sizeof(char *);</div><div class='add'>+		table_max = ARRAY_SIZE(tw_aen_string);</div><div class='ctx'> 		if ((aen &amp; 0x0ff) &lt; table_max) {</div><div class='ctx'> 			if ((tw_aen_string[aen &amp; 0xff][strlen(tw_aen_string[aen &amp; 0xff])-1]) == '#') {</div><div class='ctx'> 				printk(KERN_WARNING "3w-xxxx: scsi%d: AEN: %s%d.\n", tw_dev-&gt;host-&gt;host_no, tw_aen_string[aen &amp; 0xff], aen &gt;&gt; 8);</div><div class='hunk'>@@ -786,7 +786,7 @@ static int tw_aen_drain_queue(TW_Device_Extension *tw_dev)</div><div class='ctx'> 					if (aen == 0x0ff) {</div><div class='ctx'> 						printk(KERN_WARNING "3w-xxxx: AEN: INFO: AEN queue overflow.\n");</div><div class='ctx'> 					} else {</div><div class='del'>-						table_max = sizeof(tw_aen_string)/sizeof(char *);</div><div class='add'>+						table_max = ARRAY_SIZE(tw_aen_string);</div><div class='ctx'> 						if ((aen &amp; 0x0ff) &lt; table_max) {</div><div class='ctx'> 							if ((tw_aen_string[aen &amp; 0xff][strlen(tw_aen_string[aen &amp; 0xff])-1]) == '#') {</div><div class='ctx'> 								printk(KERN_WARNING "3w-xxxx: AEN: %s%d.\n", tw_aen_string[aen &amp; 0xff], aen &gt;&gt; 8);</div><div class='hunk'>@@ -1286,7 +1286,7 @@ static int tw_map_scsi_sg_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)</div><div class='ctx'> 	if (cmd-&gt;use_sg == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	use_sg = pci_map_sg(pdev, cmd-&gt;buffer, cmd-&gt;use_sg, DMA_BIDIRECTIONAL);</div><div class='add'>+	use_sg = pci_map_sg(pdev, cmd-&gt;request_buffer, cmd-&gt;use_sg, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	</div><div class='ctx'> 	if (use_sg == 0) {</div><div class='ctx'> 		printk(KERN_WARNING "3w-xxxx: tw_map_scsi_sg_data(): pci_map_sg() failed.\n");</div><div class='hunk'>@@ -2397,7 +2397,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *</div><div class='ctx'> 	printk(KERN_WARNING "3w-xxxx: scsi%d: Found a 3ware Storage Controller at 0x%x, IRQ: %d.\n", host-&gt;host_no, tw_dev-&gt;base_addr, pdev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* Now setup the interrupt handler */</div><div class='del'>-	retval = request_irq(pdev-&gt;irq, tw_interrupt, SA_SHIRQ, "3w-xxxx", tw_dev);</div><div class='add'>+	retval = request_irq(pdev-&gt;irq, tw_interrupt, IRQF_SHARED, "3w-xxxx", tw_dev);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_WARNING "3w-xxxx: Error requesting IRQ.");</div><div class='ctx'> 		goto out_remove_host;</div><div class='head'>diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c<br/>index 6a0f9506ea00..657a3ab75399 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/53c700.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/53c700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/53c700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/53c700.c</a></div><div class='hunk'>@@ -114,7 +114,6 @@</div><div class='ctx'>  * */</div><div class='ctx'> #define NCR_700_VERSION "2.8"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -174,6 +173,7 @@ STATIC int NCR_700_bus_reset(struct scsi_cmnd * SCpnt);</div><div class='ctx'> STATIC int NCR_700_host_reset(struct scsi_cmnd * SCpnt);</div><div class='ctx'> STATIC void NCR_700_chip_setup(struct Scsi_Host *host);</div><div class='ctx'> STATIC void NCR_700_chip_reset(struct Scsi_Host *host);</div><div class='add'>+STATIC int NCR_700_slave_alloc(struct scsi_device *SDpnt);</div><div class='ctx'> STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt);</div><div class='ctx'> STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt);</div><div class='ctx'> static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth);</div><div class='hunk'>@@ -316,7 +316,7 @@ NCR_700_detect(struct scsi_host_template *tpnt,</div><div class='ctx'> 	BUG_ON(!dma_is_consistent(pScript) &amp;&amp; L1_CACHE_BYTES &lt; dma_get_cache_alignment());</div><div class='ctx'> 	hostdata-&gt;slots = (struct NCR_700_command_slot *)(memory + SLOTS_OFFSET);</div><div class='ctx'> 	hostdata-&gt;dev = dev;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	pSlots = pScript + SLOTS_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the missing routines from the host template */</div><div class='hunk'>@@ -330,21 +330,21 @@ NCR_700_detect(struct scsi_host_template *tpnt,</div><div class='ctx'> 	tpnt-&gt;use_clustering = ENABLE_CLUSTERING;</div><div class='ctx'> 	tpnt-&gt;slave_configure = NCR_700_slave_configure;</div><div class='ctx'> 	tpnt-&gt;slave_destroy = NCR_700_slave_destroy;</div><div class='add'>+	tpnt-&gt;slave_alloc = NCR_700_slave_alloc;</div><div class='ctx'> 	tpnt-&gt;change_queue_depth = NCR_700_change_queue_depth;</div><div class='ctx'> 	tpnt-&gt;change_queue_type = NCR_700_change_queue_type;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if(tpnt-&gt;name == NULL)</div><div class='ctx'> 		tpnt-&gt;name = "53c700";</div><div class='ctx'> 	if(tpnt-&gt;proc_name == NULL)</div><div class='ctx'> 		tpnt-&gt;proc_name = "53c700";</div><div class='del'>-	</div><div class='ctx'> </div><div class='ctx'> 	host = scsi_host_alloc(tpnt, 4);</div><div class='ctx'> 	if (!host)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	memset(hostdata-&gt;slots, 0, sizeof(struct NCR_700_command_slot)</div><div class='ctx'> 	       * NCR_700_COMMAND_SLOTS_PER_HOST);</div><div class='del'>-	for(j = 0; j &lt; NCR_700_COMMAND_SLOTS_PER_HOST; j++) {</div><div class='add'>+	for (j = 0; j &lt; NCR_700_COMMAND_SLOTS_PER_HOST; j++) {</div><div class='ctx'> 		dma_addr_t offset = (dma_addr_t)((unsigned long)&amp;hostdata-&gt;slots[j].SG[0]</div><div class='ctx'> 					  - (unsigned long)&amp;hostdata-&gt;slots[0].SG[0]);</div><div class='ctx'> 		hostdata-&gt;slots[j].pSG = (struct NCR_700_SG_List *)((unsigned long)(pSlots + offset));</div><div class='hunk'>@@ -355,14 +355,12 @@ NCR_700_detect(struct scsi_host_template *tpnt,</div><div class='ctx'> 		hostdata-&gt;slots[j].state = NCR_700_SLOT_FREE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for(j = 0; j &lt; sizeof(SCRIPT)/sizeof(SCRIPT[0]); j++) {</div><div class='add'>+	for (j = 0; j &lt; ARRAY_SIZE(SCRIPT); j++)</div><div class='ctx'> 		script[j] = bS_to_host(SCRIPT[j]);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* adjust all labels to be bus physical */</div><div class='del'>-	for(j = 0; j &lt; PATCHES; j++) {</div><div class='add'>+	for (j = 0; j &lt; PATCHES; j++)</div><div class='ctx'> 		script[LABELPATCHES[j]] = bS_to_host(pScript + SCRIPT[LABELPATCHES[j]]);</div><div class='del'>-	}</div><div class='ctx'> 	/* now patch up fixed addresses. */</div><div class='ctx'> 	script_patch_32(script, MessageLocation,</div><div class='ctx'> 			pScript + MSGOUT_OFFSET);</div><div class='hunk'>@@ -376,7 +374,7 @@ NCR_700_detect(struct scsi_host_template *tpnt,</div><div class='ctx'> 	dma_sync_single_for_device(hostdata-&gt;dev, pScript, sizeof(SCRIPT), DMA_TO_DEVICE);</div><div class='ctx'> 	hostdata-&gt;state = NCR_700_HOST_FREE;</div><div class='ctx'> 	hostdata-&gt;cmd = NULL;</div><div class='del'>-	host-&gt;max_id = 7;</div><div class='add'>+	host-&gt;max_id = 8;</div><div class='ctx'> 	host-&gt;max_lun = NCR_700_MAX_LUNS;</div><div class='ctx'> 	BUG_ON(NCR_700_transport_template == NULL);</div><div class='ctx'> 	host-&gt;transportt = NCR_700_transport_template;</div><div class='hunk'>@@ -385,17 +383,17 @@ NCR_700_detect(struct scsi_host_template *tpnt,</div><div class='ctx'> 	host-&gt;hostdata[0] = (unsigned long)hostdata;</div><div class='ctx'> 	/* kick the chip */</div><div class='ctx'> 	NCR_700_writeb(0xff, host, CTEST9_REG);</div><div class='del'>-	if(hostdata-&gt;chip710) </div><div class='add'>+	if (hostdata-&gt;chip710)</div><div class='ctx'> 		hostdata-&gt;rev = (NCR_700_readb(host, CTEST8_REG)&gt;&gt;4) &amp; 0x0f;</div><div class='ctx'> 	else</div><div class='ctx'> 		hostdata-&gt;rev = (NCR_700_readb(host, CTEST7_REG)&gt;&gt;4) &amp; 0x0f;</div><div class='ctx'> 	hostdata-&gt;fast = (NCR_700_readb(host, CTEST9_REG) == 0);</div><div class='del'>-	if(banner == 0) {</div><div class='add'>+	if (banner == 0) {</div><div class='ctx'> 		printk(KERN_NOTICE "53c700: Version " NCR_700_VERSION " By James.Bottomley@HansenPartnership.com\n");</div><div class='ctx'> 		banner = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_NOTICE "scsi%d: %s rev %d %s\n", host-&gt;host_no,</div><div class='del'>-	       hostdata-&gt;chip710 ? "53c710" : </div><div class='add'>+	       hostdata-&gt;chip710 ? "53c710" :</div><div class='ctx'> 	       (hostdata-&gt;fast ? "53c700-66" : "53c700"),</div><div class='ctx'> 	       hostdata-&gt;rev, hostdata-&gt;differential ?</div><div class='ctx'> 	       "(Differential)" : "");</div><div class='hunk'>@@ -540,6 +538,7 @@ find_empty_slot(struct NCR_700_Host_Parameters *hostdata)</div><div class='ctx'> 	 * finish routine.  If we cannot queue the command when it</div><div class='ctx'> 	 * is properly build, we then change to NCR_700_SLOT_QUEUED */</div><div class='ctx'> 	slot-&gt;state = NCR_700_SLOT_BUSY;</div><div class='add'>+	slot-&gt;flags = 0;</div><div class='ctx'> 	hostdata-&gt;command_slot_count++;</div><div class='ctx'> 	</div><div class='ctx'> 	return slot;</div><div class='hunk'>@@ -589,7 +588,7 @@ NCR_700_unmap(struct NCR_700_Host_Parameters *hostdata, struct scsi_cmnd *SCp,</div><div class='ctx'> 	if(SCp-&gt;sc_data_direction != DMA_NONE &amp;&amp;</div><div class='ctx'> 	   SCp-&gt;sc_data_direction != DMA_BIDIRECTIONAL) {</div><div class='ctx'> 		if(SCp-&gt;use_sg) {</div><div class='del'>-			dma_unmap_sg(hostdata-&gt;dev, SCp-&gt;buffer,</div><div class='add'>+			dma_unmap_sg(hostdata-&gt;dev, SCp-&gt;request_buffer,</div><div class='ctx'> 				     SCp-&gt;use_sg, SCp-&gt;sc_data_direction);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dma_unmap_single(hostdata-&gt;dev, slot-&gt;dma_handle,</div><div class='hunk'>@@ -610,31 +609,24 @@ NCR_700_scsi_done(struct NCR_700_Host_Parameters *hostdata,</div><div class='ctx'> 		struct NCR_700_command_slot *slot = </div><div class='ctx'> 			(struct NCR_700_command_slot *)SCp-&gt;host_scribble;</div><div class='ctx'> 		</div><div class='del'>-		NCR_700_unmap(hostdata, SCp, slot);</div><div class='ctx'> 		dma_unmap_single(hostdata-&gt;dev, slot-&gt;pCmd,</div><div class='ctx'> 				 sizeof(SCp-&gt;cmnd), DMA_TO_DEVICE);</div><div class='del'>-		if(SCp-&gt;cmnd[0] == REQUEST_SENSE &amp;&amp; SCp-&gt;cmnd[6] == NCR_700_INTERNAL_SENSE_MAGIC) {</div><div class='add'>+		if (slot-&gt;flags == NCR_700_FLAG_AUTOSENSE) {</div><div class='add'>+			char *cmnd = NCR_700_get_sense_cmnd(SCp-&gt;device);</div><div class='ctx'> #ifdef NCR_700_DEBUG</div><div class='ctx'> 			printk(" ORIGINAL CMD %p RETURNED %d, new return is %d sense is\n",</div><div class='ctx'> 			       SCp, SCp-&gt;cmnd[7], result);</div><div class='ctx'> 			scsi_print_sense("53c700", SCp);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='add'>+			dma_unmap_single(hostdata-&gt;dev, slot-&gt;dma_handle, sizeof(SCp-&gt;sense_buffer), DMA_FROM_DEVICE);</div><div class='ctx'> 			/* restore the old result if the request sense was</div><div class='ctx'> 			 * successful */</div><div class='ctx'> 			if(result == 0)</div><div class='del'>-				result = SCp-&gt;cmnd[7];</div><div class='del'>-			/* now restore the original command */</div><div class='del'>-			memcpy((void *) SCp-&gt;cmnd, (void *) SCp-&gt;data_cmnd,</div><div class='del'>-			       sizeof(SCp-&gt;data_cmnd));</div><div class='del'>-			SCp-&gt;request_buffer = SCp-&gt;buffer;</div><div class='del'>-			SCp-&gt;request_bufflen = SCp-&gt;bufflen;</div><div class='del'>-			SCp-&gt;use_sg = SCp-&gt;old_use_sg;</div><div class='del'>-			SCp-&gt;cmd_len = SCp-&gt;old_cmd_len;</div><div class='del'>-			SCp-&gt;sc_data_direction = SCp-&gt;sc_old_data_direction;</div><div class='del'>-			SCp-&gt;underflow = SCp-&gt;old_underflow;</div><div class='del'>-			</div><div class='del'>-		}</div><div class='add'>+				result = cmnd[7];</div><div class='add'>+		} else</div><div class='add'>+			NCR_700_unmap(hostdata, SCp, slot);</div><div class='add'>+</div><div class='ctx'> 		free_slot(slot, hostdata);</div><div class='ctx'> #ifdef NCR_700_DEBUG</div><div class='ctx'> 		if(NCR_700_get_depth(SCp-&gt;device) == 0 ||</div><div class='hunk'>@@ -975,13 +967,15 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,</div><div class='ctx'> 		   status_byte(hostdata-&gt;status[0]) == COMMAND_TERMINATED) {</div><div class='ctx'> 			struct NCR_700_command_slot *slot =</div><div class='ctx'> 				(struct NCR_700_command_slot *)SCp-&gt;host_scribble;</div><div class='del'>-			if(SCp-&gt;cmnd[0] == REQUEST_SENSE) {</div><div class='add'>+			if(slot-&gt;flags == NCR_700_FLAG_AUTOSENSE) {</div><div class='ctx'> 				/* OOPS: bad device, returning another</div><div class='ctx'> 				 * contingent allegiance condition */</div><div class='ctx'> 				scmd_printk(KERN_ERR, SCp,</div><div class='ctx'> 					"broken device is looping in contingent allegiance: ignoring\n");</div><div class='ctx'> 				NCR_700_scsi_done(hostdata, SCp, hostdata-&gt;status[0]);</div><div class='ctx'> 			} else {</div><div class='add'>+				char *cmnd =</div><div class='add'>+					NCR_700_get_sense_cmnd(SCp-&gt;device);</div><div class='ctx'> #ifdef NCR_DEBUG</div><div class='ctx'> 				scsi_print_command(SCp);</div><div class='ctx'> 				printk("  cmd %p has status %d, requesting sense\n",</div><div class='hunk'>@@ -995,27 +989,25 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,</div><div class='ctx'> 				 * data associated with the command</div><div class='ctx'> 				 * here */</div><div class='ctx'> 				NCR_700_unmap(hostdata, SCp, slot);</div><div class='del'>-</div><div class='del'>-				SCp-&gt;cmnd[0] = REQUEST_SENSE;</div><div class='del'>-				SCp-&gt;cmnd[1] = (SCp-&gt;device-&gt;lun &amp; 0x7) &lt;&lt; 5;</div><div class='del'>-				SCp-&gt;cmnd[2] = 0;</div><div class='del'>-				SCp-&gt;cmnd[3] = 0;</div><div class='del'>-				SCp-&gt;cmnd[4] = sizeof(SCp-&gt;sense_buffer);</div><div class='del'>-				SCp-&gt;cmnd[5] = 0;</div><div class='del'>-				SCp-&gt;cmd_len = 6;</div><div class='add'>+				dma_unmap_single(hostdata-&gt;dev, slot-&gt;pCmd,</div><div class='add'>+						 sizeof(SCp-&gt;cmnd),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+				cmnd[0] = REQUEST_SENSE;</div><div class='add'>+				cmnd[1] = (SCp-&gt;device-&gt;lun &amp; 0x7) &lt;&lt; 5;</div><div class='add'>+				cmnd[2] = 0;</div><div class='add'>+				cmnd[3] = 0;</div><div class='add'>+				cmnd[4] = sizeof(SCp-&gt;sense_buffer);</div><div class='add'>+				cmnd[5] = 0;</div><div class='ctx'> 				/* Here's a quiet hack: the</div><div class='ctx'> 				 * REQUEST_SENSE command is six bytes,</div><div class='ctx'> 				 * so store a flag indicating that</div><div class='ctx'> 				 * this was an internal sense request</div><div class='ctx'> 				 * and the original status at the end</div><div class='ctx'> 				 * of the command */</div><div class='del'>-				SCp-&gt;cmnd[6] = NCR_700_INTERNAL_SENSE_MAGIC;</div><div class='del'>-				SCp-&gt;cmnd[7] = hostdata-&gt;status[0];</div><div class='del'>-				SCp-&gt;use_sg = 0;</div><div class='del'>-				SCp-&gt;sc_data_direction = DMA_FROM_DEVICE;</div><div class='del'>-				dma_sync_single_for_device(hostdata-&gt;dev, slot-&gt;pCmd,</div><div class='del'>-							   SCp-&gt;cmd_len, DMA_TO_DEVICE);</div><div class='del'>-				SCp-&gt;request_bufflen = sizeof(SCp-&gt;sense_buffer);</div><div class='add'>+				cmnd[6] = NCR_700_INTERNAL_SENSE_MAGIC;</div><div class='add'>+				cmnd[7] = hostdata-&gt;status[0];</div><div class='add'>+				slot-&gt;pCmd = dma_map_single(hostdata-&gt;dev, cmnd, MAX_COMMAND_SIZE, DMA_TO_DEVICE);</div><div class='ctx'> 				slot-&gt;dma_handle = dma_map_single(hostdata-&gt;dev, SCp-&gt;sense_buffer, sizeof(SCp-&gt;sense_buffer), DMA_FROM_DEVICE);</div><div class='ctx'> 				slot-&gt;SG[0].ins = bS_to_host(SCRIPT_MOVE_DATA_IN | sizeof(SCp-&gt;sense_buffer));</div><div class='ctx'> 				slot-&gt;SG[0].pAddr = bS_to_host(slot-&gt;dma_handle);</div><div class='hunk'>@@ -1027,6 +1019,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,</div><div class='ctx'> 				</div><div class='ctx'> 				/* queue the command for reissue */</div><div class='ctx'> 				slot-&gt;state = NCR_700_SLOT_QUEUED;</div><div class='add'>+				slot-&gt;flags = NCR_700_FLAG_AUTOSENSE;</div><div class='ctx'> 				hostdata-&gt;state = NCR_700_HOST_FREE;</div><div class='ctx'> 				hostdata-&gt;cmd = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1247,7 +1240,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,</div><div class='ctx'> </div><div class='ctx'> 			if(SCp-&gt;use_sg) {</div><div class='ctx'> 				for(i = 0; i &lt; SCp-&gt;use_sg + 1; i++) {</div><div class='del'>-					printk(KERN_INFO " SG[%d].length = %d, move_insn=%08x, addr %08x\n", i, ((struct scatterlist *)SCp-&gt;buffer)[i].length, ((struct NCR_700_command_slot *)SCp-&gt;host_scribble)-&gt;SG[i].ins, ((struct NCR_700_command_slot *)SCp-&gt;host_scribble)-&gt;SG[i].pAddr);</div><div class='add'>+					printk(KERN_INFO " SG[%d].length = %d, move_insn=%08x, addr %08x\n", i, ((struct scatterlist *)SCp-&gt;request_buffer)[i].length, ((struct NCR_700_command_slot *)SCp-&gt;host_scribble)-&gt;SG[i].ins, ((struct NCR_700_command_slot *)SCp-&gt;host_scribble)-&gt;SG[i].pAddr);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}	       </div><div class='hunk'>@@ -1406,12 +1399,14 @@ NCR_700_start_command(struct scsi_cmnd *SCp)</div><div class='ctx'> 	/* keep interrupts disabled until we have the command correctly</div><div class='ctx'> 	 * set up so we cannot take a selection interrupt */</div><div class='ctx'> </div><div class='del'>-	hostdata-&gt;msgout[0] = NCR_700_identify(SCp-&gt;cmnd[0] != REQUEST_SENSE,</div><div class='add'>+	hostdata-&gt;msgout[0] = NCR_700_identify((SCp-&gt;cmnd[0] != REQUEST_SENSE &amp;&amp;</div><div class='add'>+						slot-&gt;flags != NCR_700_FLAG_AUTOSENSE),</div><div class='ctx'> 					       SCp-&gt;device-&gt;lun);</div><div class='ctx'> 	/* for INQUIRY or REQUEST_SENSE commands, we cannot be sure</div><div class='ctx'> 	 * if the negotiated transfer parameters still hold, so</div><div class='ctx'> 	 * always renegotiate them */</div><div class='del'>-	if(SCp-&gt;cmnd[0] == INQUIRY || SCp-&gt;cmnd[0] == REQUEST_SENSE) {</div><div class='add'>+	if(SCp-&gt;cmnd[0] == INQUIRY || SCp-&gt;cmnd[0] == REQUEST_SENSE ||</div><div class='add'>+	   slot-&gt;flags == NCR_700_FLAG_AUTOSENSE) {</div><div class='ctx'> 		NCR_700_clear_flag(SCp-&gt;device, NCR_700_DEV_NEGOTIATED_SYNC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1420,7 +1415,8 @@ NCR_700_start_command(struct scsi_cmnd *SCp)</div><div class='ctx'> 	 * will refuse all tags, so send the request sense as untagged</div><div class='ctx'> 	 * */</div><div class='ctx'> 	if((hostdata-&gt;tag_negotiated &amp; (1&lt;&lt;scmd_id(SCp)))</div><div class='del'>-	   &amp;&amp; (slot-&gt;tag != SCSI_NO_TAG &amp;&amp; SCp-&gt;cmnd[0] != REQUEST_SENSE)) {</div><div class='add'>+	   &amp;&amp; (slot-&gt;tag != SCSI_NO_TAG &amp;&amp; SCp-&gt;cmnd[0] != REQUEST_SENSE &amp;&amp;</div><div class='add'>+	       slot-&gt;flags != NCR_700_FLAG_AUTOSENSE)) {</div><div class='ctx'> 		count += scsi_populate_tag_msg(SCp, &amp;hostdata-&gt;msgout[count]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1533,7 +1529,7 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 			/* clear all the negotiated parameters */</div><div class='ctx'> 			__shost_for_each_device(SDp, host)</div><div class='del'>-				SDp-&gt;hostdata = NULL;</div><div class='add'>+				NCR_700_clear_flag(SDp, ~0);</div><div class='ctx'> 			</div><div class='ctx'> 			/* clear all the slots and their pending commands */</div><div class='ctx'> 			for(i = 0; i &lt; NCR_700_COMMAND_SLOTS_PER_HOST; i++) {</div><div class='hunk'>@@ -1866,8 +1862,9 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 		__u32 count = 0;</div><div class='ctx'> </div><div class='ctx'> 		if(SCp-&gt;use_sg) {</div><div class='del'>-			sg_count = dma_map_sg(hostdata-&gt;dev, SCp-&gt;buffer,</div><div class='del'>-					      SCp-&gt;use_sg, direction);</div><div class='add'>+			sg_count = dma_map_sg(hostdata-&gt;dev,</div><div class='add'>+					      SCp-&gt;request_buffer, SCp-&gt;use_sg,</div><div class='add'>+					      direction);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			vPtr = dma_map_single(hostdata-&gt;dev,</div><div class='ctx'> 					      SCp-&gt;request_buffer, </div><div class='hunk'>@@ -1882,7 +1879,7 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> 		for(i = 0; i &lt; sg_count; i++) {</div><div class='ctx'> </div><div class='ctx'> 			if(SCp-&gt;use_sg) {</div><div class='del'>-				struct scatterlist *sg = SCp-&gt;buffer;</div><div class='add'>+				struct scatterlist *sg = SCp-&gt;request_buffer;</div><div class='ctx'> </div><div class='ctx'> 				vPtr = sg_dma_address(&amp;sg[i]);</div><div class='ctx'> 				count = sg_dma_len(&amp;sg[i]);</div><div class='hunk'>@@ -2037,7 +2034,17 @@ NCR_700_set_offset(struct scsi_target *STp, int offset)</div><div class='ctx'> 	spi_flags(STp) |= NCR_700_DEV_PRINT_SYNC_NEGOTIATION;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+STATIC int</div><div class='add'>+NCR_700_slave_alloc(struct scsi_device *SDp)</div><div class='add'>+{</div><div class='add'>+	SDp-&gt;hostdata = kzalloc(sizeof(struct NCR_700_Device_Parameters),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!SDp-&gt;hostdata)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> STATIC int</div><div class='ctx'> NCR_700_slave_configure(struct scsi_device *SDp)</div><div class='hunk'>@@ -2068,7 +2075,8 @@ NCR_700_slave_configure(struct scsi_device *SDp)</div><div class='ctx'> STATIC void</div><div class='ctx'> NCR_700_slave_destroy(struct scsi_device *SDp)</div><div class='ctx'> {</div><div class='del'>-	/* to do here: deallocate memory */</div><div class='add'>+	kfree(SDp-&gt;hostdata);</div><div class='add'>+	SDp-&gt;hostdata = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='head'>diff --git a/drivers/scsi/53c700.h b/drivers/scsi/53c700.h<br/>index a8c83bb03630..97ebe71b701b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/53c700.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/53c700.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/53c700.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/53c700.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Turn on for general debugging---too verbose for normal use */</div><div class='ctx'> #undef	NCR_700_DEBUG</div><div class='hunk'>@@ -76,11 +76,16 @@ struct NCR_700_SG_List {</div><div class='ctx'> 	#define	SCRIPT_RETURN			0x90080000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* We use device-&gt;hostdata to store negotiated parameters.  This is</div><div class='del'>- * supposed to be a pointer to a device private area, but we cannot</div><div class='del'>- * really use it as such since it will never be freed, so just use the</div><div class='del'>- * 32 bits to cram the information.  The SYNC negotiation sequence looks</div><div class='del'>- * like:</div><div class='add'>+struct NCR_700_Device_Parameters {</div><div class='add'>+	/* space for creating a request sense command. Really, except</div><div class='add'>+	 * for the annoying SCSI-2 requirement for LUN information in</div><div class='add'>+	 * cmnd[1], this could be in static storage */</div><div class='add'>+	unsigned char cmnd[MAX_COMMAND_SIZE];</div><div class='add'>+	__u8	depth;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* The SYNC negotiation sequence looks like:</div><div class='ctx'>  * </div><div class='ctx'>  * If DEV_NEGOTIATED_SYNC not set, tack and SDTR message on to the</div><div class='ctx'>  * initial identify for the device and set DEV_BEGIN_SYNC_NEGOTATION</div><div class='hunk'>@@ -98,19 +103,26 @@ struct NCR_700_SG_List {</div><div class='ctx'> #define NCR_700_DEV_BEGIN_SYNC_NEGOTIATION	(1&lt;&lt;17)</div><div class='ctx'> #define NCR_700_DEV_PRINT_SYNC_NEGOTIATION (1&lt;&lt;19)</div><div class='ctx'> </div><div class='add'>+static inline char *NCR_700_get_sense_cmnd(struct scsi_device *SDp)</div><div class='add'>+{</div><div class='add'>+	struct NCR_700_Device_Parameters *hostdata = SDp-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	return hostdata-&gt;cmnd;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='ctx'> NCR_700_set_depth(struct scsi_device *SDp, __u8 depth)</div><div class='ctx'> {</div><div class='del'>-	long l = (long)SDp-&gt;hostdata;</div><div class='add'>+	struct NCR_700_Device_Parameters *hostdata = SDp-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	l &amp;= 0xffff00ff;</div><div class='del'>-	l |= 0xff00 &amp; (depth &lt;&lt; 8);</div><div class='del'>-	SDp-&gt;hostdata = (void *)l;</div><div class='add'>+	hostdata-&gt;depth = depth;</div><div class='ctx'> }</div><div class='ctx'> static inline __u8</div><div class='ctx'> NCR_700_get_depth(struct scsi_device *SDp)</div><div class='ctx'> {</div><div class='del'>-	return ((((unsigned long)SDp-&gt;hostdata) &amp; 0xff00)&gt;&gt;8);</div><div class='add'>+	struct NCR_700_Device_Parameters *hostdata = SDp-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	return hostdata-&gt;depth;</div><div class='ctx'> }</div><div class='ctx'> static inline int</div><div class='ctx'> NCR_700_is_flag_set(struct scsi_device *SDp, __u32 flag)</div><div class='hunk'>@@ -163,6 +175,8 @@ struct NCR_700_command_slot {</div><div class='ctx'> 	#define NCR_700_SLOT_BUSY (1|NCR_700_SLOT_MAGIC) /* slot has command active on HA */</div><div class='ctx'> 	#define NCR_700_SLOT_QUEUED (2|NCR_700_SLOT_MAGIC) /* slot has command to be made active on HA */</div><div class='ctx'> 	__u8	state;</div><div class='add'>+	#define NCR_700_FLAG_AUTOSENSE	0x01</div><div class='add'>+	__u8	flags;</div><div class='ctx'> 	int	tag;</div><div class='ctx'> 	__u32	resume_offset;</div><div class='ctx'> 	struct scsi_cmnd *cmnd;</div><div class='hunk'>@@ -472,8 +486,7 @@ NCR_700_readl(struct Scsi_Host *host, __u32 reg)</div><div class='ctx'> 		ioread32(hostdata-&gt;base + reg);</div><div class='ctx'> #if 1</div><div class='ctx'> 	/* sanity check the register */</div><div class='del'>-	if((reg &amp; 0x3) != 0)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON((reg &amp; 0x3) != 0);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return value;</div><div class='hunk'>@@ -496,8 +509,7 @@ NCR_700_writel(__u32 value, struct Scsi_Host *host, __u32 reg)</div><div class='ctx'> </div><div class='ctx'> #if 1</div><div class='ctx'> 	/* sanity check the register */</div><div class='del'>-	if((reg &amp; 0x3) != 0)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON((reg &amp; 0x3) != 0);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	bEBus ? iowrite32be(value, hostdata-&gt;base + reg): </div><div class='head'>diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c<br/>index 7894b8ea84bd..c690c2b89e41 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/53c7xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/53c7xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/53c7xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/53c7xx.c</a></div><div class='hunk'>@@ -232,7 +232,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='hunk'>@@ -361,7 +360,7 @@ int CmdPageStart = (0 - Ent_dsa_zero - sizeof(struct NCR53c7x0_cmd)) &amp; 0xff;</div><div class='ctx'> static char *setup_strings[] =</div><div class='ctx'> 	{"","","","","","","",""};</div><div class='ctx'> </div><div class='del'>-#define MAX_SETUP_STRINGS (sizeof(setup_strings) / sizeof(char *))</div><div class='add'>+#define MAX_SETUP_STRINGS ARRAY_SIZE(setup_strings)</div><div class='ctx'> #define SETUP_BUFFER_SIZE 200</div><div class='ctx'> static char setup_buffer[SETUP_BUFFER_SIZE];</div><div class='ctx'> static char setup_used[MAX_SETUP_STRINGS];</div><div class='hunk'>@@ -709,7 +708,7 @@ request_synchronous (int host, int target) {</div><div class='ctx'> 	printk (KERN_ALERT "target %d is host ID\n", target);</div><div class='ctx'> 	return -1;</div><div class='ctx'>     } </div><div class='del'>-    else if (target &gt; h-&gt;max_id) {</div><div class='add'>+    else if (target &gt;= h-&gt;max_id) {</div><div class='ctx'> 	printk (KERN_ALERT "target %d exceeds maximum of %d\n", target,</div><div class='ctx'> 	    h-&gt;max_id);</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -1071,7 +1070,7 @@ NCR53c7x0_init (struct Scsi_Host *host) {</div><div class='ctx'> </div><div class='ctx'>     NCR53c7x0_driver_init (host);</div><div class='ctx'> </div><div class='del'>-    if (request_irq(host-&gt;irq, NCR53c7x0_intr, SA_SHIRQ, "53c7xx", host))</div><div class='add'>+    if (request_irq(host-&gt;irq, NCR53c7x0_intr, IRQF_SHARED, "53c7xx", host))</div><div class='ctx'>     {</div><div class='ctx'> 	printk("scsi%d : IRQ%d not free, detaching\n",</div><div class='ctx'> 		host-&gt;host_no, host-&gt;irq);</div><div class='hunk'>@@ -2190,15 +2189,15 @@ static const struct {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void </div><div class='add'>+static void</div><div class='ctx'> synchronous (struct Scsi_Host *host, int target, char *msg) {</div><div class='ctx'>     struct NCR53c7x0_hostdata *hostdata = (struct NCR53c7x0_hostdata *)</div><div class='ctx'> 	host-&gt;hostdata[0];</div><div class='ctx'>     int desire, divisor, i, limit;</div><div class='ctx'>     unsigned char scntl3, sxfer;</div><div class='ctx'> /* The diagnostic message fits on one line, even with max. width integers */</div><div class='del'>-    char buf[80];	</div><div class='del'>-   </div><div class='add'>+    char buf[80];</div><div class='add'>+</div><div class='ctx'> /* Desired transfer clock in Hz */</div><div class='ctx'>     desire = 1000000000L / (msg[3] * 4);</div><div class='ctx'> /* Scale the available SCSI clock by 10 so we get tenths */</div><div class='hunk'>@@ -2209,14 +2208,14 @@ synchronous (struct Scsi_Host *host, int target, char *msg) {</div><div class='ctx'> 	msg[4] = 8;</div><div class='ctx'> </div><div class='ctx'>     if (hostdata-&gt;options &amp; OPTION_DEBUG_SDTR)</div><div class='del'>-    	printk("scsi%d : optimal synchronous divisor of %d.%01d\n", </div><div class='add'>+    	printk("scsi%d : optimal synchronous divisor of %d.%01d\n",</div><div class='ctx'> 	    host-&gt;host_no, divisor / 10, divisor % 10);</div><div class='ctx'> </div><div class='del'>-    limit = (sizeof(syncs) / sizeof(syncs[0]) -1);</div><div class='add'>+    limit = ARRAY_SIZE(syncs) - 1;</div><div class='ctx'>     for (i = 0; (i &lt; limit) &amp;&amp; (divisor &gt; syncs[i].div); ++i);</div><div class='ctx'> </div><div class='ctx'>     if (hostdata-&gt;options &amp; OPTION_DEBUG_SDTR)</div><div class='del'>-    	printk("scsi%d : selected synchronous divisor of %d.%01d\n", </div><div class='add'>+    	printk("scsi%d : selected synchronous divisor of %d.%01d\n",</div><div class='ctx'> 	    host-&gt;host_no, syncs[i].div / 10, syncs[i].div % 10);</div><div class='ctx'> </div><div class='ctx'>     msg[3] = ((1000000000L / hostdata-&gt;scsi_clock) * syncs[i].div / 10 / 4);</div><div class='hunk'>@@ -3622,7 +3621,7 @@ NCR53c7xx_queue_command (Scsi_Cmnd *cmd, void (* done)(Scsi_Cmnd *)) {</div><div class='ctx'> #ifdef LINUX_1_2</div><div class='ctx'> 	|| cmd-&gt;device-&gt;id &gt; 7</div><div class='ctx'> #else</div><div class='del'>-	|| cmd-&gt;device-&gt;id &gt; host-&gt;max_id</div><div class='add'>+	|| cmd-&gt;device-&gt;id &gt;= host-&gt;max_id</div><div class='ctx'> #endif</div><div class='ctx'> 	|| cmd-&gt;device-&gt;id == host-&gt;this_id</div><div class='ctx'> 	|| hostdata-&gt;state == STATE_DISABLED) {</div><div class='hunk'>@@ -4233,7 +4232,7 @@ restart:</div><div class='ctx'>  * Purpose : handle NCR53c7x0 interrupts for all NCR devices sharing</div><div class='ctx'>  *	the same IRQ line.  </div><div class='ctx'>  * </div><div class='del'>- * Inputs : Since we're using the SA_INTERRUPT interrupt handler</div><div class='add'>+ * Inputs : Since we're using the IRQF_DISABLED interrupt handler</div><div class='ctx'>  *	semantics, irq indicates the interrupt which invoked </div><div class='ctx'>  *	this handler.  </div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c<br/>index bde3d5834ade..16a12a3b7b2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/BusLogic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/BusLogic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/BusLogic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/BusLogic.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #define BusLogic_DriverVersion		"2.1.16"</div><div class='ctx'> #define BusLogic_DriverDate		"18 July 2002"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -1845,7 +1844,7 @@ static boolean __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *Hos</div><div class='ctx'> 	/*</div><div class='ctx'> 	   Acquire shared access to the IRQ Channel.</div><div class='ctx'> 	 */</div><div class='del'>-	if (request_irq(HostAdapter-&gt;IRQ_Channel, BusLogic_InterruptHandler, SA_SHIRQ, HostAdapter-&gt;FullModelName, HostAdapter) &lt; 0) {</div><div class='add'>+	if (request_irq(HostAdapter-&gt;IRQ_Channel, BusLogic_InterruptHandler, IRQF_SHARED, HostAdapter-&gt;FullModelName, HostAdapter) &lt; 0) {</div><div class='ctx'> 		BusLogic_Error("UNABLE TO ACQUIRE IRQ CHANNEL %d - DETACHING\n", HostAdapter, HostAdapter-&gt;IRQ_Channel);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h<br/>index 1aaa6569edac..9792e5af5252 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/BusLogic.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/BusLogic.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/BusLogic.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/BusLogic.h</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #ifndef _BUSLOGIC_H</div><div class='ctx'> #define _BUSLOGIC_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef PACKED</div><div class='ctx'> #define PACKED __attribute__((packed))</div><div class='head'>diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c<br/>index 8e3d949b7118..7c0068049586 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/FlashPoint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/FlashPoint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/FlashPoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/FlashPoint.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SCSI_OMIT_FLASHPOINT</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig<br/>index a480a3742d47..96a81cd17617 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/Kconfig</a></div><div class='hunk'>@@ -501,7 +501,7 @@ config SCSI_ATA_PIIX</div><div class='ctx'> 	tristate "Intel PIIX/ICH SATA support"</div><div class='ctx'> 	depends on SCSI_SATA &amp;&amp; PCI</div><div class='ctx'> 	help</div><div class='del'>-	  This option enables support for ICH5 Serial ATA.</div><div class='add'>+	  This option enables support for ICH5/6/7/8 Serial ATA.</div><div class='ctx'> 	  If PATA support was enabled previously, this enables</div><div class='ctx'> 	  support for select Intel PIIX/ICH PATA host controllers.</div><div class='ctx'> </div><div class='hunk'>@@ -532,6 +532,16 @@ config SCSI_PDC_ADMA</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config SCSI_HPTIOP</div><div class='add'>+	tristate "HighPoint RocketRAID 3xxx Controller support"</div><div class='add'>+	depends on SCSI &amp;&amp; PCI</div><div class='add'>+	help</div><div class='add'>+	  This option enables support for HighPoint RocketRAID 3xxx</div><div class='add'>+	  controllers.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here; the module</div><div class='add'>+	  will be called hptiop. If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config SCSI_SATA_QSTOR</div><div class='ctx'> 	tristate "Pacific Digital SATA QStor support"</div><div class='ctx'> 	depends on SCSI_SATA &amp;&amp; PCI</div><div class='hunk'>@@ -1159,7 +1169,7 @@ config SCSI_NCR_Q720</div><div class='ctx'> 	  you do not have this SCSI card, so say N.</div><div class='ctx'> </div><div class='ctx'> config SCSI_NCR53C8XX_DEFAULT_TAGS</div><div class='del'>-	int "  default tagged command queue depth"</div><div class='add'>+	int "default tagged command queue depth"</div><div class='ctx'> 	depends on SCSI_ZALON || SCSI_NCR_Q720</div><div class='ctx'> 	default "8"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -1185,7 +1195,7 @@ config SCSI_NCR53C8XX_DEFAULT_TAGS</div><div class='ctx'> 	  There is no safe option other than using good SCSI devices.</div><div class='ctx'> </div><div class='ctx'> config SCSI_NCR53C8XX_MAX_TAGS</div><div class='del'>-	int "  maximum number of queued commands"</div><div class='add'>+	int "maximum number of queued commands"</div><div class='ctx'> 	depends on SCSI_ZALON || SCSI_NCR_Q720</div><div class='ctx'> 	default "32"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -1202,7 +1212,7 @@ config SCSI_NCR53C8XX_MAX_TAGS</div><div class='ctx'> 	  There is no safe option and the default answer is recommended.</div><div class='ctx'> </div><div class='ctx'> config SCSI_NCR53C8XX_SYNC</div><div class='del'>-	int "  synchronous transfers frequency in MHz"</div><div class='add'>+	int "synchronous transfers frequency in MHz"</div><div class='ctx'> 	depends on SCSI_ZALON || SCSI_NCR_Q720</div><div class='ctx'> 	default "20"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -1236,7 +1246,7 @@ config SCSI_NCR53C8XX_SYNC</div><div class='ctx'> 	  terminations and SCSI conformant devices.</div><div class='ctx'> </div><div class='ctx'> config SCSI_NCR53C8XX_PROFILE</div><div class='del'>-	bool "  enable profiling"</div><div class='add'>+	bool "enable profiling"</div><div class='ctx'> 	depends on SCSI_ZALON || SCSI_NCR_Q720</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option allows you to enable profiling information gathering.</div><div class='hunk'>@@ -1247,7 +1257,7 @@ config SCSI_NCR53C8XX_PROFILE</div><div class='ctx'> 	  The normal answer therefore is N.</div><div class='ctx'> </div><div class='ctx'> config SCSI_NCR53C8XX_NO_DISCONNECT</div><div class='del'>-	bool "  not allow targets to disconnect"</div><div class='add'>+	bool "not allow targets to disconnect"</div><div class='ctx'> 	depends on (SCSI_ZALON || SCSI_NCR_Q720) &amp;&amp; SCSI_NCR53C8XX_DEFAULT_TAGS=0</div><div class='ctx'> 	help</div><div class='ctx'> 	  This option is only provided for safety if you suspect some SCSI</div><div class='head'>diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile<br/>index 81803a16f986..ebd0cf00bf3e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/Makefile</a></div><div class='hunk'>@@ -33,7 +33,8 @@ obj-$(CONFIG_SCSI_FC_ATTRS) 	+= scsi_transport_fc.o</div><div class='ctx'> obj-$(CONFIG_SCSI_ISCSI_ATTRS)	+= scsi_transport_iscsi.o</div><div class='ctx'> obj-$(CONFIG_SCSI_SAS_ATTRS)	+= scsi_transport_sas.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_ISCSI_TCP) 	+= iscsi_tcp.o</div><div class='add'>+obj-$(CONFIG_ISCSI_TCP) 	+= libiscsi.o	iscsi_tcp.o</div><div class='add'>+obj-$(CONFIG_INFINIBAND_ISER) 	+= libiscsi.o</div><div class='ctx'> obj-$(CONFIG_SCSI_AMIGA7XX)	+= amiga7xx.o	53c7xx.o</div><div class='ctx'> obj-$(CONFIG_A3000_SCSI)	+= a3000.o	wd33c93.o</div><div class='ctx'> obj-$(CONFIG_A2091_SCSI)	+= a2091.o	wd33c93.o</div><div class='hunk'>@@ -136,6 +137,7 @@ obj-$(CONFIG_SCSI_SATA_NV)	+= libata.o sata_nv.o</div><div class='ctx'> obj-$(CONFIG_SCSI_SATA_ULI)	+= libata.o sata_uli.o</div><div class='ctx'> obj-$(CONFIG_SCSI_SATA_MV)	+= libata.o sata_mv.o</div><div class='ctx'> obj-$(CONFIG_SCSI_PDC_ADMA)	+= libata.o pdc_adma.o</div><div class='add'>+obj-$(CONFIG_SCSI_HPTIOP)	+= hptiop.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ARM)		+= arm/</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +166,7 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \</div><div class='ctx'> CFLAGS_ncr53c8xx.o	:= $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)</div><div class='ctx'> zalon7xx-objs	:= zalon.o ncr53c8xx.o</div><div class='ctx'> NCR_Q720_mod-objs	:= NCR_Q720.o ncr53c8xx.o</div><div class='del'>-libata-objs	:= libata-core.o libata-scsi.o libata-bmdma.o</div><div class='add'>+libata-objs	:= libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o</div><div class='ctx'> oktagon_esp_mod-objs	:= oktagon_esp.o oktagon_io.o</div><div class='ctx'> </div><div class='ctx'> # Files generated that shall be removed upon make clean</div><div class='head'>diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c<br/>index 9f0ddbe6dc76..616810ad17d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/NCR5380.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR5380.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/NCR5380.c</a></div><div class='hunk'>@@ -296,7 +296,7 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;use_sg) {</div><div class='del'>-		cmd-&gt;SCp.buffer = (struct scatterlist *) cmd-&gt;buffer;</div><div class='add'>+		cmd-&gt;SCp.buffer = (struct scatterlist *) cmd-&gt;request_buffer;</div><div class='ctx'> 		cmd-&gt;SCp.buffers_residual = cmd-&gt;use_sg - 1;</div><div class='ctx'> 		cmd-&gt;SCp.ptr = page_address(cmd-&gt;SCp.buffer-&gt;page)+</div><div class='ctx'> 			       cmd-&gt;SCp.buffer-&gt;offset;</div><div class='hunk'>@@ -500,7 +500,7 @@ static void NCR5380_print_phase(struct Scsi_Host *instance)</div><div class='ctx'> /* </div><div class='ctx'>  * Function : int should_disconnect (unsigned char cmd)</div><div class='ctx'>  *</div><div class='del'>- * Purpose : decide weather a command would normally disconnect or </div><div class='add'>+ * Purpose : decide whether a command would normally disconnect or </div><div class='ctx'>  *      not, since if it won't disconnect we should go to sleep.</div><div class='ctx'>  *</div><div class='ctx'>  * Input : cmd - opcode of SCSI command</div><div class='hunk'>@@ -585,7 +585,7 @@ static int __init NCR5380_probe_irq(struct Scsi_Host *instance, int possible)</div><div class='ctx'> 	NCR5380_setup(instance);</div><div class='ctx'> </div><div class='ctx'> 	for (trying_irqs = i = 0, mask = 1; i &lt; 16; ++i, mask &lt;&lt;= 1)</div><div class='del'>-		if ((mask &amp; possible) &amp;&amp; (request_irq(i, &amp;probe_intr, SA_INTERRUPT, "NCR-probe", NULL) == 0))</div><div class='add'>+		if ((mask &amp; possible) &amp;&amp; (request_irq(i, &amp;probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0))</div><div class='ctx'> 			trying_irqs |= mask;</div><div class='ctx'> </div><div class='ctx'> 	timeout = jiffies + (250 * HZ / 1000);</div><div class='head'>diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c<br/>index c7dd0154d012..8a4659e94105 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/NCR53C9x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR53C9x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/NCR53C9x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/NCR53C9x.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h<br/>index 65a9b377a410..481653c977cf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/NCR53C9x.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR53C9x.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/NCR53C9x.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/NCR53C9x.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #ifndef NCR53C9X_H</div><div class='ctx'> #define NCR53C9X_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* djweis for mac driver */</div><div class='head'>diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c<br/>index ae37d3ab9c4a..8472c5359023 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/NCR53c406a.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR53c406a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/NCR53c406a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/NCR53c406a.c</a></div><div class='hunk'>@@ -213,16 +213,16 @@ static void *addresses[] = {</div><div class='ctx'> 	(void *) 0xd8000,</div><div class='ctx'> 	(void *) 0xc8000</div><div class='ctx'> };</div><div class='del'>-#define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned ))</div><div class='add'>+#define ADDRESS_COUNT ARRAY_SIZE(addresses)</div><div class='ctx'> #endif				/* USE_BIOS */</div><div class='ctx'> </div><div class='ctx'> /* possible i/o port addresses */</div><div class='ctx'> static unsigned short ports[] = { 0x230, 0x330, 0x280, 0x290, 0x330, 0x340, 0x300, 0x310, 0x348, 0x350 };</div><div class='del'>-#define PORT_COUNT (sizeof( ports ) / sizeof( unsigned short ))</div><div class='add'>+#define PORT_COUNT ARRAY_SIZE(ports)</div><div class='ctx'> </div><div class='ctx'> /* possible interrupt channels */</div><div class='ctx'> static unsigned short intrs[] = { 10, 11, 12, 15 };</div><div class='del'>-#define INTR_COUNT (sizeof( intrs ) / sizeof( unsigned short ))</div><div class='add'>+#define INTR_COUNT ARRAY_SIZE(intrs)</div><div class='ctx'> </div><div class='ctx'> /* signatures for NCR 53c406a based controllers */</div><div class='ctx'> #if USE_BIOS</div><div class='hunk'>@@ -236,7 +236,7 @@ struct signature {</div><div class='ctx'> 	{</div><div class='ctx'> "Copyright (C) Acculogic, Inc.\r\n2.8M Diskette Extension Bios ver 4.04.03 03/01/1993", 61, 82},};</div><div class='ctx'> </div><div class='del'>-#define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))</div><div class='add'>+#define SIGNATURE_COUNT ARRAY_SIZE(signatures)</div><div class='ctx'> #endif				/* USE_BIOS */</div><div class='ctx'> </div><div class='ctx'> /* ============================================================ */</div><div class='head'>diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c<br/>index 577e63499778..a06f547e87f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/NCR_D700.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR_D700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/NCR_D700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/NCR_D700.c</a></div><div class='hunk'>@@ -320,7 +320,7 @@ NCR_D700_probe(struct device *dev)</div><div class='ctx'> 	memset(p, '\0', sizeof(*p));</div><div class='ctx'> 	p-&gt;dev = dev;</div><div class='ctx'> 	snprintf(p-&gt;name, sizeof(p-&gt;name), "D700(%s)", dev-&gt;bus_id);</div><div class='del'>-	if (request_irq(irq, NCR_D700_intr, SA_SHIRQ, p-&gt;name, p)) {</div><div class='add'>+	if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p-&gt;name, p)) {</div><div class='ctx'> 		printk(KERN_ERR "D700: request_irq failed\n");</div><div class='ctx'> 		kfree(p);</div><div class='ctx'> 		return -EBUSY;</div><div class='head'>diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c<br/>index 9d18ec90510f..c39ffbb86e39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/NCR_Q720.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/NCR_Q720.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/NCR_Q720.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/NCR_Q720.c</a></div><div class='hunk'>@@ -265,7 +265,7 @@ NCR_Q720_probe(struct device *dev)</div><div class='ctx'> 	p-&gt;irq = irq;</div><div class='ctx'> 	p-&gt;siops = siops;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(irq, NCR_Q720_intr, SA_SHIRQ, "NCR_Q720", p)) {</div><div class='add'>+	if (request_irq(irq, NCR_Q720_intr, IRQF_SHARED, "NCR_Q720", p)) {</div><div class='ctx'> 		printk(KERN_ERR "NCR_Q720: request irq %d failed\n", irq);</div><div class='ctx'> 		goto out_release;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c<br/>index 3dce21c78737..d7e9fab54c60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/a100u2w.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/a100u2w.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/a100u2w.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/a100u2w.c</a></div><div class='hunk'>@@ -1120,7 +1120,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	shost-&gt;sg_tablesize = TOTAL_SG_ENTRY;</div><div class='ctx'> </div><div class='ctx'> 	/* Initial orc chip           */</div><div class='del'>-	error = request_irq(pdev-&gt;irq, inia100_intr, SA_SHIRQ,</div><div class='add'>+	error = request_irq(pdev-&gt;irq, inia100_intr, IRQF_SHARED,</div><div class='ctx'> 			"inia100", shost);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "inia100: unable to get irq %d\n",</div><div class='head'>diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c<br/>index 54996eaae979..fddfa2ebcd70 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/a2091.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/a2091.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/a2091.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/a2091.c</a></div><div class='hunk'>@@ -208,7 +208,7 @@ int __init a2091_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 	regs.SASR = &amp;(DMA(instance)-&gt;SASR);</div><div class='ctx'> 	regs.SCMD = &amp;(DMA(instance)-&gt;SCMD);</div><div class='ctx'> 	wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);</div><div class='del'>-	request_irq(IRQ_AMIGA_PORTS, a2091_intr, SA_SHIRQ, "A2091 SCSI",</div><div class='add'>+	request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",</div><div class='ctx'> 		    instance);</div><div class='ctx'> 	DMA(instance)-&gt;CNTR = CNTR_PDMD | CNTR_INTEN;</div><div class='ctx'> 	num_a2091++;</div><div class='head'>diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c<br/>index f425d424bf08..ae9ab4b136ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/a3000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/a3000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/a3000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/a3000.c</a></div><div class='hunk'>@@ -190,7 +190,7 @@ int __init a3000_detect(struct scsi_host_template *tpnt)</div><div class='ctx'>     regs.SASR = &amp;(DMA(a3000_host)-&gt;SASR);</div><div class='ctx'>     regs.SCMD = &amp;(DMA(a3000_host)-&gt;SCMD);</div><div class='ctx'>     wd33c93_init(a3000_host, regs, dma_setup, dma_stop, WD33C93_FS_12_15);</div><div class='del'>-    if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, SA_SHIRQ, "A3000 SCSI",</div><div class='add'>+    if (request_irq(IRQ_AMIGA_PORTS, a3000_intr, IRQF_SHARED, "A3000 SCSI",</div><div class='ctx'> 		    a3000_intr))</div><div class='ctx'>         goto fail_irq;</div><div class='ctx'>     DMA(a3000_host)-&gt;CNTR = CNTR_PDMD | CNTR_INTEN;</div><div class='head'>diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c<br/>index 642a3b4e5937..83b5c7d085f2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/aachba.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/aachba.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/aachba.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/aachba.c</a></div><div class='hunk'>@@ -148,6 +148,8 @@ static int nondasd = -1;</div><div class='ctx'> static int dacmode = -1;</div><div class='ctx'> </div><div class='ctx'> static int commit = -1;</div><div class='add'>+int startup_timeout = 180;</div><div class='add'>+int aif_timeout = 120;</div><div class='ctx'> </div><div class='ctx'> module_param(nondasd, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on");</div><div class='hunk'>@@ -155,6 +157,10 @@ module_param(dacmode, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0=off, 1=on");</div><div class='ctx'> module_param(commit, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on");</div><div class='add'>+module_param(startup_timeout, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for adapter to have it's kernel up and\nrunning. This is typically adjusted for large systems that do not have a BIOS.");</div><div class='add'>+module_param(aif_timeout, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(aif_timeout, "The duration of time in seconds to wait for applications to pick up AIFs before\nderegistering them. This is typically adjusted for heavily burdened systems.");</div><div class='ctx'> </div><div class='ctx'> int numacb = -1;</div><div class='ctx'> module_param(numacb, int, S_IRUGO|S_IWUSR);</div><div class='hunk'>@@ -390,8 +396,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)</div><div class='ctx'> 	scsicmd-&gt;SCp.phase = AAC_OWNER_MIDLEVEL;</div><div class='ctx'> </div><div class='ctx'> 	dprintk((KERN_DEBUG "get_container_name_callback[cpu %d]: t = %ld.\n", smp_processor_id(), jiffies));</div><div class='del'>-	if (fibptr == NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(fibptr == NULL);</div><div class='ctx'> </div><div class='ctx'> 	get_name_reply = (struct aac_get_name_resp *) fib_data(fibptr);</div><div class='ctx'> 	/* Failure is irrelevant, using default value instead */</div><div class='hunk'>@@ -635,13 +640,13 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)</div><div class='ctx'> 			cp[sizeof(str-&gt;pid)] = c;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct aac_driver_ident *mp = aac_get_driver_ident(dev-&gt;cardtype);</div><div class='del'>-   </div><div class='del'>-		inqstrcpy (mp-&gt;vname, str-&gt;vid); </div><div class='add'>+</div><div class='add'>+		inqstrcpy (mp-&gt;vname, str-&gt;vid);</div><div class='ctx'> 		/* last six chars reserved for vol type */</div><div class='ctx'> 		inqstrcpy (mp-&gt;model, str-&gt;pid);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (tindex &lt; (sizeof(container_types)/sizeof(char *))){</div><div class='add'>+	if (tindex &lt; ARRAY_SIZE(container_types)){</div><div class='ctx'> 		char *findit = str-&gt;pid;</div><div class='ctx'> </div><div class='ctx'> 		for ( ; *findit != ' '; findit++); /* walk till we find a space */</div><div class='hunk'>@@ -950,12 +955,11 @@ static void io_callback(void *context, struct fib * fibptr)</div><div class='ctx'> 		  smp_processor_id(), (unsigned long long)lba, jiffies);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fibptr == NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(fibptr == NULL);</div><div class='ctx'> 		</div><div class='ctx'> 	if(scsicmd-&gt;use_sg)</div><div class='ctx'> 		pci_unmap_sg(dev-&gt;pdev, </div><div class='del'>-			(struct scatterlist *)scsicmd-&gt;buffer,</div><div class='add'>+			(struct scatterlist *)scsicmd-&gt;request_buffer,</div><div class='ctx'> 			scsicmd-&gt;use_sg,</div><div class='ctx'> 			scsicmd-&gt;sc_data_direction);</div><div class='ctx'> 	else if(scsicmd-&gt;request_bufflen)</div><div class='hunk'>@@ -1086,8 +1090,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)</div><div class='ctx'> 		</div><div class='ctx'> 		aac_build_sgraw(scsicmd, &amp;readcmd-&gt;sg);</div><div class='ctx'> 		fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(readcmd-&gt;sg.count) - 1) * sizeof (struct sgentryraw));</div><div class='del'>-		if (fibsize &gt; (dev-&gt;max_fib_size - sizeof(struct aac_fibhdr)))</div><div class='del'>-			BUG();</div><div class='add'>+		BUG_ON(fibsize &gt; (dev-&gt;max_fib_size - sizeof(struct aac_fibhdr)));</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *	Now send the Fib to the adapter</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1255,8 +1258,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)</div><div class='ctx'> 		</div><div class='ctx'> 		aac_build_sgraw(scsicmd, &amp;writecmd-&gt;sg);</div><div class='ctx'> 		fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(writecmd-&gt;sg.count) - 1) * sizeof (struct sgentryraw));</div><div class='del'>-		if (fibsize &gt; (dev-&gt;max_fib_size - sizeof(struct aac_fibhdr)))</div><div class='del'>-			BUG();</div><div class='add'>+		BUG_ON(fibsize &gt; (dev-&gt;max_fib_size - sizeof(struct aac_fibhdr)));</div><div class='ctx'> 		/*</div><div class='ctx'> 		 *	Now send the Fib to the adapter</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1570,7 +1572,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)</div><div class='ctx'> 		 *	see: &lt;vendor&gt;.c i.e. aac.c</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (scmd_id(scsicmd) == host-&gt;this_id) {</div><div class='del'>-			setinqstr(dev, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));</div><div class='add'>+			setinqstr(dev, (void *) (inq_data.inqd_vid), ARRAY_SIZE(container_types));</div><div class='ctx'> 			inq_data.inqd_pdt = INQD_PDT_PROC;	/* Processor device */</div><div class='ctx'> 			aac_internal_transfer(scsicmd, &amp;inq_data, 0, sizeof(inq_data));</div><div class='ctx'> 			scsicmd-&gt;result = DID_OK &lt;&lt; 16 | COMMAND_COMPLETE &lt;&lt; 8 | SAM_STAT_GOOD;</div><div class='hunk'>@@ -1898,8 +1900,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)</div><div class='ctx'> 	scsicmd-&gt;SCp.phase = AAC_OWNER_MIDLEVEL;</div><div class='ctx'> 	dev = (struct aac_dev *)scsicmd-&gt;device-&gt;host-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	if (fibptr == NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(fibptr == NULL);</div><div class='ctx'> </div><div class='ctx'> 	srbreply = (struct aac_srb_reply *) fib_data(fibptr);</div><div class='ctx'> </div><div class='hunk'>@@ -1913,7 +1914,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)</div><div class='ctx'> </div><div class='ctx'> 	if(scsicmd-&gt;use_sg)</div><div class='ctx'> 		pci_unmap_sg(dev-&gt;pdev, </div><div class='del'>-			(struct scatterlist *)scsicmd-&gt;buffer,</div><div class='add'>+			(struct scatterlist *)scsicmd-&gt;request_buffer,</div><div class='ctx'> 			scsicmd-&gt;use_sg,</div><div class='ctx'> 			scsicmd-&gt;sc_data_direction);</div><div class='ctx'> 	else if(scsicmd-&gt;request_bufflen)</div><div class='hunk'>@@ -2218,15 +2219,15 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	else if(scsicmd-&gt;request_bufflen) {</div><div class='del'>-		dma_addr_t addr; </div><div class='del'>-		addr = pci_map_single(dev-&gt;pdev,</div><div class='add'>+		u32 addr;</div><div class='add'>+		scsicmd-&gt;SCp.dma_handle = pci_map_single(dev-&gt;pdev,</div><div class='ctx'> 				scsicmd-&gt;request_buffer,</div><div class='ctx'> 				scsicmd-&gt;request_bufflen,</div><div class='ctx'> 				scsicmd-&gt;sc_data_direction);</div><div class='add'>+		addr = scsicmd-&gt;SCp.dma_handle;</div><div class='ctx'> 		psg-&gt;count = cpu_to_le32(1);</div><div class='ctx'> 		psg-&gt;sg[0].addr = cpu_to_le32(addr);</div><div class='ctx'> 		psg-&gt;sg[0].count = cpu_to_le32(scsicmd-&gt;request_bufflen);  </div><div class='del'>-		scsicmd-&gt;SCp.dma_handle = addr;</div><div class='ctx'> 		byte_count = scsicmd-&gt;request_bufflen;</div><div class='ctx'> 	}</div><div class='ctx'> 	return byte_count;</div><div class='hunk'>@@ -2375,7 +2376,7 @@ static struct aac_srb_status_info srb_status_info[] = {</div><div class='ctx'> 	{ SRB_STATUS_SUCCESS,		"Success"},</div><div class='ctx'> 	{ SRB_STATUS_ABORTED,		"Aborted Command"},</div><div class='ctx'> 	{ SRB_STATUS_ABORT_FAILED,	"Abort Failed"},</div><div class='del'>-	{ SRB_STATUS_ERROR,		"Error Event"}, </div><div class='add'>+	{ SRB_STATUS_ERROR,		"Error Event"},</div><div class='ctx'> 	{ SRB_STATUS_BUSY,		"Device Busy"},</div><div class='ctx'> 	{ SRB_STATUS_INVALID_REQUEST,	"Invalid Request"},</div><div class='ctx'> 	{ SRB_STATUS_INVALID_PATH_ID,	"Invalid Path ID"},</div><div class='hunk'>@@ -2394,7 +2395,7 @@ static struct aac_srb_status_info srb_status_info[] = {</div><div class='ctx'> 	{ SRB_STATUS_BAD_SRB_BLOCK_LENGTH,"Bad Srb Block Length"},</div><div class='ctx'> 	{ SRB_STATUS_REQUEST_FLUSHED,	"Request Flushed"},</div><div class='ctx'> 	{ SRB_STATUS_DELAYED_RETRY,	"Delayed Retry"},</div><div class='del'>-	{ SRB_STATUS_INVALID_LUN,	"Invalid LUN"}, </div><div class='add'>+	{ SRB_STATUS_INVALID_LUN,	"Invalid LUN"},</div><div class='ctx'> 	{ SRB_STATUS_INVALID_TARGET_ID,	"Invalid TARGET ID"},</div><div class='ctx'> 	{ SRB_STATUS_BAD_FUNCTION,	"Bad Function"},</div><div class='ctx'> 	{ SRB_STATUS_ERROR_RECOVERY,	"Error Recovery"},</div><div class='hunk'>@@ -2409,11 +2410,9 @@ char *aac_get_status_string(u32 status)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for(i=0; i &lt; (sizeof(srb_status_info)/sizeof(struct aac_srb_status_info)); i++ ){</div><div class='del'>-		if(srb_status_info[i].status == status){</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(srb_status_info); i++)</div><div class='add'>+		if (srb_status_info[i].status == status)</div><div class='ctx'> 			return srb_status_info[i].str;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return "Bad Status Code";</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h<br/>index f773b0dcfc95..d0eecd4bec83 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/aacraid.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/aacraid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/aacraid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/aacraid.h</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef AAC_DRIVER_BUILD</div><div class='ctx'> # define AAC_DRIVER_BUILD 2409</div><div class='del'>-# define AAC_DRIVER_BRANCH "-mh1"</div><div class='add'>+# define AAC_DRIVER_BRANCH "-mh2"</div><div class='ctx'> #endif</div><div class='ctx'> #define MAXIMUM_NUM_CONTAINERS	32</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +563,6 @@ struct aac_queue {</div><div class='ctx'> 	spinlock_t		lockdata;	/* Actual lock (used only on one side of the lock) */</div><div class='ctx'> 	struct list_head 	cmdq;	   	/* A queue of FIBs which need to be prcessed by the FS thread. This is */</div><div class='ctx'>                                 		/* only valid for command queues which receive entries from the adapter. */</div><div class='del'>-	struct list_head	pendingq;	/* A queue of outstanding fib's to the adapter. */</div><div class='ctx'> 	u32			numpending;	/* Number of entries on outstanding queue. */</div><div class='ctx'> 	struct aac_dev *	dev;		/* Back pointer to adapter structure */</div><div class='ctx'> };</div><div class='hunk'>@@ -823,11 +822,6 @@ struct fib {</div><div class='ctx'> 	void 			*callback_data;</div><div class='ctx'> 	u32			flags; // u32 dmb was ulong</div><div class='ctx'> 	/*</div><div class='del'>-	 *	The following is used to put this fib context onto the </div><div class='del'>-	 *	Outstanding I/O queue.</div><div class='del'>-	 */</div><div class='del'>-	struct list_head	queue;</div><div class='del'>-	/*</div><div class='ctx'> 	 *	And for the internal issue/reply queues (we may be able</div><div class='ctx'> 	 *	to merge these two)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1815,3 +1809,5 @@ int aac_probe_container(struct aac_dev *dev, int cid);</div><div class='ctx'> extern int numacb;</div><div class='ctx'> extern int acbsize;</div><div class='ctx'> extern char aac_driver_version[];</div><div class='add'>+extern int startup_timeout;</div><div class='add'>+extern int aif_timeout;</div><div class='head'>diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c<br/>index 9f75144e5247..255421de9d1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/commctrl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/commctrl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/commctrl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/commctrl.c</a></div><div class='hunk'>@@ -535,7 +535,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)</div><div class='ctx'> 	default:</div><div class='ctx'> 		data_dir = DMA_NONE;</div><div class='ctx'> 	}</div><div class='del'>-	if (user_srbcmd-&gt;sg.count &gt; (sizeof(sg_list)/sizeof(sg_list[0]))) {</div><div class='add'>+	if (user_srbcmd-&gt;sg.count &gt; ARRAY_SIZE(sg_list)) {</div><div class='ctx'> 		dprintk((KERN_DEBUG"aacraid: too many sg entries %d\n",</div><div class='ctx'> 		  le32_to_cpu(srbcmd-&gt;sg.count)));</div><div class='ctx'> 		rcode = -EINVAL;</div><div class='head'>diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c<br/>index 19397453bae7..1cd3584ba7ff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/comminit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/comminit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/comminit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/comminit.c</a></div><div class='hunk'>@@ -92,28 +92,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co</div><div class='ctx'> 	init-&gt;AdapterFibsPhysicalAddress = cpu_to_le32((u32)phys);</div><div class='ctx'> 	init-&gt;AdapterFibsSize = cpu_to_le32(fibsize);</div><div class='ctx'> 	init-&gt;AdapterFibAlign = cpu_to_le32(sizeof(struct hw_fib));</div><div class='del'>-	/* </div><div class='del'>-	 * number of 4k pages of host physical memory. The aacraid fw needs</div><div class='del'>-	 * this number to be less than 4gb worth of pages. num_physpages is in</div><div class='del'>-	 * system page units. New firmware doesn't have any issues with the</div><div class='del'>-	 * mapping system, but older Firmware did, and had *troubles* dealing</div><div class='del'>-	 * with the math overloading past 32 bits, thus we must limit this</div><div class='del'>-	 * field.</div><div class='del'>-	 *</div><div class='del'>-	 * This assumes the memory is mapped zero-&gt;n, which isnt</div><div class='del'>-	 * always true on real computers. It also has some slight problems</div><div class='del'>-	 * with the GART on x86-64. I've btw never tried DMA from PCI space</div><div class='del'>-	 * on this platform but don't be suprised if its problematic.</div><div class='del'>-	 */</div><div class='del'>-#ifndef CONFIG_GART_IOMMU</div><div class='del'>-	if ((num_physpages &lt;&lt; (PAGE_SHIFT - 12)) &lt;= AAC_MAX_HOSTPHYSMEMPAGES) {</div><div class='del'>-		init-&gt;HostPhysMemPages = </div><div class='del'>-			cpu_to_le32(num_physpages &lt;&lt; (PAGE_SHIFT-12));</div><div class='del'>-	} else </div><div class='del'>-#endif	</div><div class='del'>-	{</div><div class='del'>-		init-&gt;HostPhysMemPages = cpu_to_le32(AAC_MAX_HOSTPHYSMEMPAGES);</div><div class='del'>-	}</div><div class='add'>+	init-&gt;HostPhysMemPages = cpu_to_le32(AAC_MAX_HOSTPHYSMEMPAGES);</div><div class='ctx'> </div><div class='ctx'> 	init-&gt;InitFlags = 0;</div><div class='ctx'> 	if (dev-&gt;new_comm_interface) {</div><div class='hunk'>@@ -159,7 +138,6 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,</div><div class='ctx'> {</div><div class='ctx'> 	q-&gt;numpending = 0;</div><div class='ctx'> 	q-&gt;dev = dev;</div><div class='del'>-	INIT_LIST_HEAD(&amp;q-&gt;pendingq);</div><div class='ctx'> 	init_waitqueue_head(&amp;q-&gt;cmdready);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;q-&gt;cmdq);</div><div class='ctx'> 	init_waitqueue_head(&amp;q-&gt;qfull);</div><div class='head'>diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c<br/>index 9f9f4aae23c0..3f27419c66af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/commsup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/commsup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/commsup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/commsup.c</a></div><div class='hunk'>@@ -229,8 +229,7 @@ void aac_fib_init(struct fib *fibptr)</div><div class='ctx'> static void fib_dealloc(struct fib * fibptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_fib *hw_fib = fibptr-&gt;hw_fib;</div><div class='del'>-	if(hw_fib-&gt;header.StructType != FIB_MAGIC) </div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(hw_fib-&gt;header.StructType != FIB_MAGIC);</div><div class='ctx'> 	hw_fib-&gt;header.XferState = 0;        </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -472,7 +471,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,</div><div class='ctx'> 	spin_lock_irqsave(q-&gt;lock, qflags);</div><div class='ctx'> 	if (dev-&gt;new_comm_interface) {</div><div class='ctx'> 		unsigned long count = 10000000L; /* 50 seconds */</div><div class='del'>-		list_add_tail(&amp;fibptr-&gt;queue, &amp;q-&gt;pendingq);</div><div class='ctx'> 		q-&gt;numpending++;</div><div class='ctx'> 		spin_unlock_irqrestore(q-&gt;lock, qflags);</div><div class='ctx'> 		while (aac_adapter_send(fibptr) != 0) {</div><div class='hunk'>@@ -481,7 +479,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,</div><div class='ctx'> 					spin_unlock_irqrestore(&amp;fibptr-&gt;event_lock, flags);</div><div class='ctx'> 				spin_lock_irqsave(q-&gt;lock, qflags);</div><div class='ctx'> 				q-&gt;numpending--;</div><div class='del'>-				list_del(&amp;fibptr-&gt;queue);</div><div class='ctx'> 				spin_unlock_irqrestore(q-&gt;lock, qflags);</div><div class='ctx'> 				return -ETIMEDOUT;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -492,7 +489,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,</div><div class='ctx'> 		unsigned long nointr = 0;</div><div class='ctx'> 		aac_queue_get( dev, &amp;index, AdapNormCmdQueue, hw_fib, 1, fibptr, &amp;nointr);</div><div class='ctx'> </div><div class='del'>-		list_add_tail(&amp;fibptr-&gt;queue, &amp;q-&gt;pendingq);</div><div class='ctx'> 		q-&gt;numpending++;</div><div class='ctx'> 		*(q-&gt;headers.producer) = cpu_to_le32(index + 1);</div><div class='ctx'> 		spin_unlock_irqrestore(q-&gt;lock, qflags);</div><div class='hunk'>@@ -520,7 +516,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,</div><div class='ctx'> 				if (--count == 0) {</div><div class='ctx'> 					spin_lock_irqsave(q-&gt;lock, qflags);</div><div class='ctx'> 					q-&gt;numpending--;</div><div class='del'>-					list_del(&amp;fibptr-&gt;queue);</div><div class='ctx'> 					spin_unlock_irqrestore(q-&gt;lock, qflags);</div><div class='ctx'> 					if (wait == -1) {</div><div class='ctx'> 	        				printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n"</div><div class='hunk'>@@ -534,8 +529,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,</div><div class='ctx'> 			}</div><div class='ctx'> 		} else</div><div class='ctx'> 			down(&amp;fibptr-&gt;event_wait);</div><div class='del'>-		if(fibptr-&gt;done == 0)</div><div class='del'>-			BUG();</div><div class='add'>+		BUG_ON(fibptr-&gt;done == 0);</div><div class='ctx'> 			</div><div class='ctx'> 		if((fibptr-&gt;flags &amp; FIB_CONTEXT_FLAG_TIMED_OUT)){</div><div class='ctx'> 			return -ETIMEDOUT;</div><div class='hunk'>@@ -1214,7 +1208,7 @@ int aac_command_thread(void *data)</div><div class='ctx'> 						 * since the last read off</div><div class='ctx'> 						 * the queue?</div><div class='ctx'> 						 */</div><div class='del'>-						if ((time_now - time_last) &gt; 120) {</div><div class='add'>+						if ((time_now - time_last) &gt; aif_timeout) {</div><div class='ctx'> 							entry = entry-&gt;next;</div><div class='ctx'> 							aac_close_fib_context(dev, fibctx);</div><div class='ctx'> 							continue;</div><div class='head'>diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c<br/>index f6bcb9486f85..b2a5c7262f36 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/dpcsup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/dpcsup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/dpcsup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/dpcsup.c</a></div><div class='hunk'>@@ -85,10 +85,9 @@ unsigned int aac_response_normal(struct aac_queue * q)</div><div class='ctx'> 		 *	continue. The caller has already been notified that</div><div class='ctx'> 		 *	the fib timed out.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!(fib-&gt;flags &amp; FIB_CONTEXT_FLAG_TIMED_OUT)) {</div><div class='del'>-			list_del(&amp;fib-&gt;queue);</div><div class='add'>+		if (!(fib-&gt;flags &amp; FIB_CONTEXT_FLAG_TIMED_OUT))</div><div class='ctx'> 			dev-&gt;queues-&gt;queue[AdapNormCmdQueue].numpending--;</div><div class='del'>-		} else {</div><div class='add'>+		else {</div><div class='ctx'> 			printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib-&gt;flags);</div><div class='ctx'> 			printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib-&gt;header.SenderData,fib);</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -284,7 +283,6 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		list_del(&amp;fib-&gt;queue);</div><div class='ctx'> 		dev-&gt;queues-&gt;queue[AdapNormCmdQueue].numpending--;</div><div class='ctx'> </div><div class='ctx'> 		if (fast) {</div><div class='head'>diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c<br/>index 6ef89c99dd12..e42a479ce64a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/linit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/linit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/linit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/linit.c</a></div><div class='hunk'>@@ -119,7 +119,7 @@ static struct pci_device_id aac_pci_tbl[] = {</div><div class='ctx'> 	{ 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014R0 (Lancer) */</div><div class='ctx'> 	{ 0x9005, 0x0286, 0x9005, 0x02a0, 0, 0, 27 }, /* ICP9047MA (Lancer) */</div><div class='ctx'> 	{ 0x9005, 0x0286, 0x9005, 0x02a1, 0, 0, 28 }, /* ICP9087MA (Lancer) */</div><div class='del'>-	{ 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5085AU (Hurricane) */</div><div class='add'>+	{ 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5445AU (Hurricane44) */</div><div class='ctx'> 	{ 0x9005, 0x0285, 0x9005, 0x02a4, 0, 0, 30 }, /* ICP9085LI (Marauder-X) */</div><div class='ctx'> 	{ 0x9005, 0x0285, 0x9005, 0x02a5, 0, 0, 31 }, /* ICP5085BR (Marauder-E) */</div><div class='ctx'> 	{ 0x9005, 0x0286, 0x9005, 0x02a6, 0, 0, 32 }, /* ICP9067MA (Intruder-6) */</div><div class='hunk'>@@ -143,7 +143,7 @@ static struct pci_device_id aac_pci_tbl[] = {</div><div class='ctx'> 	{ 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS (BlackBird) */</div><div class='ctx'> 	{ 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */</div><div class='ctx'> 	{ 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */</div><div class='del'>-	{ 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-4810SAS (Hurricane */</div><div class='add'>+	{ 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800SAS (Hurricane44) */</div><div class='ctx'> </div><div class='ctx'> 	{ 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/</div><div class='ctx'> 	{ 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/</div><div class='hunk'>@@ -195,7 +195,7 @@ static struct aac_driver_ident aac_drivers[] = {</div><div class='ctx'> 	{ aac_rkt_init, "aacraid",  "ICP     ", "ICP9014R0       ", 1 }, /* ICP9014R0 (Lancer) */</div><div class='ctx'> 	{ aac_rkt_init, "aacraid",  "ICP     ", "ICP9047MA       ", 1 }, /* ICP9047MA (Lancer) */</div><div class='ctx'> 	{ aac_rkt_init, "aacraid",  "ICP     ", "ICP9087MA       ", 1 }, /* ICP9087MA (Lancer) */</div><div class='del'>-	{ aac_rkt_init, "aacraid",  "ICP     ", "ICP5085AU       ", 1 }, /* ICP5085AU (Hurricane) */</div><div class='add'>+	{ aac_rkt_init, "aacraid",  "ICP     ", "ICP5445AU       ", 1 }, /* ICP5445AU (Hurricane44) */</div><div class='ctx'> 	{ aac_rx_init, "aacraid",  "ICP     ", "ICP9085LI       ", 1 }, /* ICP9085LI (Marauder-X) */</div><div class='ctx'> 	{ aac_rx_init, "aacraid",  "ICP     ", "ICP5085BR       ", 1 }, /* ICP5085BR (Marauder-E) */</div><div class='ctx'> 	{ aac_rkt_init, "aacraid",  "ICP     ", "ICP9067MA       ", 1 }, /* ICP9067MA (Intruder-6) */</div><div class='hunk'>@@ -217,7 +217,7 @@ static struct aac_driver_ident aac_drivers[] = {</div><div class='ctx'> 	{ aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000SAS     ", 1 }, /* ASR-4000SAS (BlackBird &amp; AvonPark) */</div><div class='ctx'> 	{ aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4800SAS     ", 1 }, /* ASR-4800SAS (Marauder-X) */</div><div class='ctx'> 	{ aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4805SAS     ", 1 }, /* ASR-4805SAS (Marauder-E) */</div><div class='del'>-	{ aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-4810SAS     ", 1 }, /* ASR-4810SAS (Hurricane) */</div><div class='add'>+	{ aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-3800SAS     ", 1 }, /* ASR-3800SAS (Hurricane44) */</div><div class='ctx'> </div><div class='ctx'> 	{ aac_rx_init, "percraid", "DELL    ", "PERC 320/DC     ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/</div><div class='ctx'> 	{ aac_sa_init, "aacraid",  "ADAPTEC ", "Adaptec 5400S   ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/</div><div class='hunk'>@@ -453,15 +453,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_ERR "%s: Host adapter reset request. SCSI hang ?\n", </div><div class='ctx'> 					AAC_DRIVERNAME);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(host-&gt;host_lock);</div><div class='del'>-</div><div class='ctx'> 	aac = (struct aac_dev *)host-&gt;hostdata;</div><div class='ctx'> 	if (aac_adapter_check_health(aac)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Host adapter appears dead\n", </div><div class='ctx'> 				AAC_DRIVERNAME);</div><div class='del'>-		spin_unlock_irq(host-&gt;host_lock);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -487,13 +482,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * We can exit If all the commands are complete</div><div class='ctx'> 		 */</div><div class='del'>-		spin_unlock_irq(host-&gt;host_lock);</div><div class='ctx'> 		if (active == 0)</div><div class='ctx'> 			return SUCCESS;</div><div class='ctx'> 		ssleep(1);</div><div class='del'>-		spin_lock_irq(host-&gt;host_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(host-&gt;host_lock);</div><div class='ctx'> 	printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME);</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='hunk'>@@ -572,7 +564,7 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long</div><div class='ctx'> 		</div><div class='ctx'> 		f = compat_alloc_user_space(sizeof(*f));</div><div class='ctx'> 		ret = 0;</div><div class='del'>-		if (clear_user(f, sizeof(*f)) != sizeof(*f))</div><div class='add'>+		if (clear_user(f, sizeof(*f)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='ctx'> 		if (copy_in_user(f, (void __user *)arg, sizeof(struct fib_ioctl) - sizeof(u32)))</div><div class='ctx'> 			ret = -EFAULT;</div><div class='head'>diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c<br/>index 7a23e027eb78..458ea897fd72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/rkt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/rkt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/rkt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/rkt.c</a></div><div class='hunk'>@@ -444,16 +444,16 @@ int aac_rkt_init(struct aac_dev *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (!(rkt_readl(dev, MUnit.OMRx[0]) &amp; KERNEL_UP_AND_RUNNING))</div><div class='ctx'> 	{</div><div class='del'>-		if(time_after(jiffies, start+180*HZ))</div><div class='add'>+		if(time_after(jiffies, start+startup_timeout*HZ))</div><div class='ctx'> 		{</div><div class='ctx'> 			status = rkt_readl(dev, MUnit.OMRx[0]);</div><div class='ctx'> 			printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n", </div><div class='ctx'> 					dev-&gt;name, instance, status);</div><div class='ctx'> 			goto error_iounmap;</div><div class='ctx'> 		}</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	}</div><div class='del'>-	if (request_irq(dev-&gt;scsi_host_ptr-&gt;irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)&lt;0) </div><div class='add'>+	if (request_irq(dev-&gt;scsi_host_ptr-&gt;irq, aac_rkt_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev)&lt;0)</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance);</div><div class='ctx'> 		goto error_iounmap;</div><div class='head'>diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c<br/>index 729b9eb268c2..035018db69b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/rx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/rx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/rx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/rx.c</a></div><div class='hunk'>@@ -444,16 +444,16 @@ int aac_rx_init(struct aac_dev *dev)</div><div class='ctx'> 	while ((!(rx_readl(dev, IndexRegs.Mailbox[7]) &amp; KERNEL_UP_AND_RUNNING))</div><div class='ctx'> 		|| (!(rx_readl(dev, MUnit.OMRx[0]) &amp; KERNEL_UP_AND_RUNNING)))</div><div class='ctx'> 	{</div><div class='del'>-		if(time_after(jiffies, start+180*HZ))</div><div class='add'>+		if(time_after(jiffies, start+startup_timeout*HZ))</div><div class='ctx'> 		{</div><div class='ctx'> 			status = rx_readl(dev, IndexRegs.Mailbox[7]);</div><div class='ctx'> 			printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n", </div><div class='ctx'> 					dev-&gt;name, instance, status);</div><div class='ctx'> 			goto error_iounmap;</div><div class='ctx'> 		}</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	}</div><div class='del'>-	if (request_irq(dev-&gt;scsi_host_ptr-&gt;irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)&lt;0) </div><div class='add'>+	if (request_irq(dev-&gt;scsi_host_ptr-&gt;irq, aac_rx_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev)&lt;0)</div><div class='ctx'> 	{</div><div class='ctx'> 		printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance);</div><div class='ctx'> 		goto error_iounmap;</div><div class='head'>diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c<br/>index a53454908205..cd586cc8f9be 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/sa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aacraid/sa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aacraid/sa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aacraid/sa.c</a></div><div class='hunk'>@@ -66,11 +66,11 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> 			sa_writew(dev, DoorbellClrReg_p, PrintfReady); /* clear PrintfReady */</div><div class='ctx'> 			sa_writew(dev, DoorbellReg_s, PrintfDone);</div><div class='ctx'> 		} else if (intstat &amp; DOORBELL_1) {	// dev -&gt; Host Normal Command Ready</div><div class='del'>-			aac_command_normal(&amp;dev-&gt;queues-&gt;queue[HostNormCmdQueue]);</div><div class='ctx'> 			sa_writew(dev, DoorbellClrReg_p, DOORBELL_1);</div><div class='add'>+			aac_command_normal(&amp;dev-&gt;queues-&gt;queue[HostNormCmdQueue]);</div><div class='ctx'> 		} else if (intstat &amp; DOORBELL_2) {	// dev -&gt; Host Normal Response Ready</div><div class='del'>-			aac_response_normal(&amp;dev-&gt;queues-&gt;queue[HostNormRespQueue]);</div><div class='ctx'> 			sa_writew(dev, DoorbellClrReg_p, DOORBELL_2);</div><div class='add'>+			aac_response_normal(&amp;dev-&gt;queues-&gt;queue[HostNormRespQueue]);</div><div class='ctx'> 		} else if (intstat &amp; DOORBELL_3) {	// dev -&gt; Host Normal Command Not Full</div><div class='ctx'> 			sa_writew(dev, DoorbellClrReg_p, DOORBELL_3);</div><div class='ctx'> 		} else if (intstat &amp; DOORBELL_4) {	// dev -&gt; Host Normal Response Not Full</div><div class='hunk'>@@ -318,16 +318,16 @@ int aac_sa_init(struct aac_dev *dev)</div><div class='ctx'> 	 *	Wait for the adapter to be up and running. Wait up to 3 minutes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (!(sa_readl(dev, Mailbox7) &amp; KERNEL_UP_AND_RUNNING)) {</div><div class='del'>-		if (time_after(jiffies, start+180*HZ)) {</div><div class='add'>+		if (time_after(jiffies, start+startup_timeout*HZ)) {</div><div class='ctx'> 			status = sa_readl(dev, Mailbox7);</div><div class='ctx'> 			printk(KERN_WARNING "%s%d: adapter kernel failed to start, init status = %lx.\n", </div><div class='ctx'> 					name, instance, status);</div><div class='ctx'> 			goto error_iounmap;</div><div class='ctx'> 		}</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='add'>+		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;scsi_host_ptr-&gt;irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) &lt; 0) {</div><div class='add'>+	if (request_irq(dev-&gt;scsi_host_ptr-&gt;irq, aac_sa_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev ) &lt; 0) {</div><div class='ctx'> 		printk(KERN_WARNING "%s%d: Interrupt unavailable.\n", name, instance);</div><div class='ctx'> 		goto error_iounmap;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c<br/>index 2a419634b256..e32b4ab2f8fb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/advansys.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/advansys.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/advansys.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/advansys.c</a></div><div class='hunk'>@@ -371,7 +371,7 @@</div><div class='ctx'> </div><div class='ctx'>      1.5 (8/8/96):</div><div class='ctx'>          1. Add support for ABP-940U (PCI Ultra) adapter.</div><div class='del'>-         2. Add support for IRQ sharing by setting the SA_SHIRQ flag for</div><div class='add'>+         2. Add support for IRQ sharing by setting the IRQF_SHARED flag for</div><div class='ctx'>             request_irq and supplying a dev_id pointer to both request_irq()</div><div class='ctx'>             and free_irq().</div><div class='ctx'>          3. In AscSearchIOPortAddr11() restore a call to check_region() which</div><div class='hunk'>@@ -504,9 +504,9 @@</div><div class='ctx'>          3. For v2.1.93 and newer kernels use CONFIG_PCI and new PCI BIOS</div><div class='ctx'>             access functions.</div><div class='ctx'>          4. Update board serial number printing.</div><div class='del'>-         5. Try allocating an IRQ both with and without the SA_INTERRUPT</div><div class='add'>+         5. Try allocating an IRQ both with and without the IRQF_DISABLED</div><div class='ctx'>             flag set to allow IRQ sharing with drivers that do not set</div><div class='del'>-            the SA_INTERRUPT flag. Also display a more descriptive error</div><div class='add'>+            the IRQF_DISABLED flag. Also display a more descriptive error</div><div class='ctx'>             message if request_irq() fails.</div><div class='ctx'>          6. Update to latest Asc and Adv Libraries.</div><div class='ctx'> </div><div class='hunk'>@@ -754,7 +754,6 @@</div><div class='ctx'>  * --- Linux Include Files</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_X86) &amp;&amp; !defined(CONFIG_ISA)</div><div class='hunk'>@@ -5203,19 +5202,19 @@ advansys_detect(struct scsi_host_template *tpnt)</div><div class='ctx'>             /* Register IRQ Number. */</div><div class='ctx'>             ASC_DBG1(2, "advansys_detect: request_irq() %d\n", shp-&gt;irq);</div><div class='ctx'>            /*</div><div class='del'>-            * If request_irq() fails with the SA_INTERRUPT flag set,</div><div class='del'>-            * then try again without the SA_INTERRUPT flag set. This</div><div class='add'>+            * If request_irq() fails with the IRQF_DISABLED flag set,</div><div class='add'>+            * then try again without the IRQF_DISABLED flag set. This</div><div class='ctx'>             * allows IRQ sharing to work even with other drivers that</div><div class='del'>-            * do not set the SA_INTERRUPT flag.</div><div class='add'>+            * do not set the IRQF_DISABLED flag.</div><div class='ctx'>             *</div><div class='del'>-            * If SA_INTERRUPT is not set, then interrupts are enabled</div><div class='add'>+            * If IRQF_DISABLED is not set, then interrupts are enabled</div><div class='ctx'>             * before the driver interrupt function is called.</div><div class='ctx'>             */</div><div class='ctx'>             if (((ret = request_irq(shp-&gt;irq, advansys_interrupt,</div><div class='del'>-                            SA_INTERRUPT | (share_irq == TRUE ? SA_SHIRQ : 0),</div><div class='add'>+                            IRQF_DISABLED | (share_irq == TRUE ? IRQF_SHARED : 0),</div><div class='ctx'>                             "advansys", boardp)) != 0) &amp;&amp;</div><div class='ctx'>                 ((ret = request_irq(shp-&gt;irq, advansys_interrupt,</div><div class='del'>-                            (share_irq == TRUE ? SA_SHIRQ : 0),</div><div class='add'>+                            (share_irq == TRUE ? IRQF_SHARED : 0),</div><div class='ctx'>                             "advansys", boardp)) != 0))</div><div class='ctx'>             {</div><div class='ctx'>                 if (ret == -EBUSY) {</div><div class='hunk'>@@ -12374,7 +12373,7 @@ AscInitFromEEP(ASC_DVC_VAR *asc_dvc)</div><div class='ctx'>                 ASC_PRINT1(</div><div class='ctx'> "AscInitFromEEP: Failed to re-write EEPROM with %d errors.\n", i);</div><div class='ctx'>         } else {</div><div class='del'>-                ASC_PRINT("AscInitFromEEP: Succesfully re-wrote EEPROM.");</div><div class='add'>+                ASC_PRINT("AscInitFromEEP: Successfully re-wrote EEPROM.\n");</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     return (warn_code);</div><div class='hunk'>@@ -17316,7 +17315,7 @@ AdvWaitEEPCmd(AdvPortAddr iop_base)</div><div class='ctx'> /*</div><div class='ctx'>  * Write the EEPROM from 'cfg_buf'.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+void __init</div><div class='ctx'> AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)</div><div class='ctx'> {</div><div class='ctx'>     ushort *wbuf;</div><div class='hunk'>@@ -17383,7 +17382,7 @@ AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)</div><div class='ctx'> /*</div><div class='ctx'>  * Write the EEPROM from 'cfg_buf'.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+void __init</div><div class='ctx'> AdvSet38C0800EEPConfig(AdvPortAddr iop_base,</div><div class='ctx'>                        ADVEEP_38C0800_CONFIG *cfg_buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -17451,7 +17450,7 @@ AdvSet38C0800EEPConfig(AdvPortAddr iop_base,</div><div class='ctx'> /*</div><div class='ctx'>  * Write the EEPROM from 'cfg_buf'.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+void __init</div><div class='ctx'> AdvSet38C1600EEPConfig(AdvPortAddr iop_base,</div><div class='ctx'>                        ADVEEP_38C1600_CONFIG *cfg_buf)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c<br/>index de80cdfb5b9d..36e63f82d9f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aha152x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aha152x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aha152x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aha152x.c</a></div><div class='hunk'>@@ -855,7 +855,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)</div><div class='ctx'> 	SETPORT(SIMODE0, 0);</div><div class='ctx'> 	SETPORT(SIMODE1, 0);</div><div class='ctx'> </div><div class='del'>-	if( request_irq(shpnt-&gt;irq, swintr, SA_INTERRUPT|SA_SHIRQ, "aha152x", shpnt) ) {</div><div class='add'>+	if( request_irq(shpnt-&gt;irq, swintr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) {</div><div class='ctx'> 		printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt-&gt;host_no, shpnt-&gt;irq);</div><div class='ctx'> 		goto out_host_put;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -889,7 +889,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)</div><div class='ctx'> 	SETPORT(SSTAT0, 0x7f);</div><div class='ctx'> 	SETPORT(SSTAT1, 0xef);</div><div class='ctx'> </div><div class='del'>-	if ( request_irq(shpnt-&gt;irq, intr, SA_INTERRUPT|SA_SHIRQ, "aha152x", shpnt) ) {</div><div class='add'>+	if ( request_irq(shpnt-&gt;irq, intr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) {</div><div class='ctx'> 		printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt-&gt;host_no, shpnt-&gt;irq);</div><div class='ctx'> 		goto out_host_put;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c<br/>index 51bad7a1e773..24f0f5461792 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aha1542.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aha1542.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aha1542.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aha1542.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *        Added proper detection of the AHA-1640 (MCA version of AHA-1540)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1011,7 +1010,7 @@ static int __init do_setup(char *str)</div><div class='ctx'> </div><div class='ctx'> 	int count=setup_idx;</div><div class='ctx'> </div><div class='del'>-	get_options(str, sizeof(ints)/sizeof(int), ints);</div><div class='add'>+	get_options(str, ARRAY_SIZE(ints), ints);</div><div class='ctx'> 	aha1542_setup(str,ints);</div><div class='ctx'> </div><div class='ctx'> 	return count&lt;setup_idx;</div><div class='hunk'>@@ -1072,8 +1071,7 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 		int slot = 0;</div><div class='ctx'> 		int pos = 0;</div><div class='ctx'> </div><div class='del'>-		for (indx = 0; (slot !=  MCA_NOTFOUND) &amp;&amp; </div><div class='del'>-			     (indx &lt; sizeof(bases)/sizeof(bases[0])); indx++) {</div><div class='add'>+		for (indx = 0; (slot != MCA_NOTFOUND) &amp;&amp; (indx &lt; ARRAY_SIZE(bases)); indx++) {</div><div class='ctx'> </div><div class='ctx'> 			if (bases[indx])</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -1083,10 +1081,9 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 			if (slot == MCA_NOTFOUND)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			</div><div class='ctx'> 			/* Found one */</div><div class='ctx'> 			pos = mca_read_stored_pos(slot, 3);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			/* Decode address */</div><div class='ctx'> 			if (pos &amp; 0x80) {</div><div class='ctx'> 				if (pos &amp; 0x02) {</div><div class='hunk'>@@ -1118,23 +1115,22 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 			mca_set_adapter_name(slot, "Adapter AHA-1640");</div><div class='ctx'> 			mca_set_adapter_procfn(slot, NULL, NULL);</div><div class='ctx'> 			mca_mark_as_used(slot);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			/* Go on */</div><div class='ctx'> 			slot++;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	Hunt for ISA Plug'n'Pray Adaptecs (AHA1535)</div><div class='ctx'> 	 */</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 	if(isapnp)</div><div class='ctx'> 	{</div><div class='ctx'> 		struct pnp_dev *pdev = NULL;</div><div class='del'>-		for(indx = 0; indx &lt;sizeof(bases)/sizeof(bases[0]);indx++)</div><div class='del'>-		{</div><div class='add'>+		for(indx = 0; indx &lt; ARRAY_SIZE(bases); indx++) {</div><div class='ctx'> 			if(bases[indx])</div><div class='ctx'> 				continue;</div><div class='ctx'> 			pdev = pnp_find_dev(NULL, ISAPNP_VENDOR('A', 'D', 'P'), </div><div class='hunk'>@@ -1144,29 +1140,29 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 *	Activate the PnP card</div><div class='ctx'> 			 */</div><div class='del'>-			 </div><div class='add'>+</div><div class='ctx'> 			if(pnp_device_attach(pdev)&lt;0)</div><div class='ctx'> 				continue;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if(pnp_activate_dev(pdev)&lt;0) {</div><div class='ctx'> 				pnp_device_detach(pdev);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			if(!pnp_port_valid(pdev, 0)) {</div><div class='ctx'> 				pnp_device_detach(pdev);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 			bases[indx] = pnp_port_start(pdev, 0);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 			/* The card can be queried for its DMA, we have </div><div class='ctx'> 			   the DMA set up that is enough */</div><div class='del'>-			   </div><div class='add'>+</div><div class='ctx'> 			printk(KERN_INFO "ISAPnP found an AHA1535 at I/O 0x%03X\n", bases[indx]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	for (indx = 0; indx &lt; sizeof(bases) / sizeof(bases[0]); indx++)</div><div class='add'>+	for (indx = 0; indx &lt; ARRAY_SIZE(bases); indx++)</div><div class='ctx'> 		if (bases[indx] != 0 &amp;&amp; request_region(bases[indx], 4, "aha1542")) {</div><div class='ctx'> 			shpnt = scsi_register(tpnt,</div><div class='ctx'> 					sizeof(struct aha1542_hostdata));</div><div class='head'>diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c<br/>index 4b8c6a543925..0e4a7ebe300a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aha1740.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aha1740.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aha1740.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aha1740.c</a></div><div class='hunk'>@@ -634,7 +634,7 @@ static int aha1740_probe (struct device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	DEB(printk("aha1740_probe: enable interrupt channel %d\n",irq_level));</div><div class='del'>-	if (request_irq(irq_level,aha1740_intr_handle,irq_type ? 0 : SA_SHIRQ,</div><div class='add'>+	if (request_irq(irq_level,aha1740_intr_handle,irq_type ? 0 : IRQF_SHARED,</div><div class='ctx'> 			"aha1740",shpnt)) {</div><div class='ctx'> 		printk(KERN_ERR "aha1740_probe: Unable to allocate IRQ %d.\n",</div><div class='ctx'> 		       irq_level);</div><div class='head'>diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c<br/>index b4f8fb1d628b..77e7202a0eba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ahci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ahci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ahci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ahci.c</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ahci"</div><div class='del'>-#define DRV_VERSION	"1.2"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -56,12 +56,15 @@ enum {</div><div class='ctx'> 	AHCI_MAX_SG		= 168, /* hardware max is 64K */</div><div class='ctx'> 	AHCI_DMA_BOUNDARY	= 0xffffffff,</div><div class='ctx'> 	AHCI_USE_CLUSTERING	= 0,</div><div class='del'>-	AHCI_CMD_SLOT_SZ	= 32 * 32,</div><div class='add'>+	AHCI_MAX_CMDS		= 32,</div><div class='add'>+	AHCI_CMD_SZ		= 32,</div><div class='add'>+	AHCI_CMD_SLOT_SZ	= AHCI_MAX_CMDS * AHCI_CMD_SZ,</div><div class='ctx'> 	AHCI_RX_FIS_SZ		= 256,</div><div class='del'>-	AHCI_CMD_TBL_HDR	= 0x80,</div><div class='ctx'> 	AHCI_CMD_TBL_CDB	= 0x40,</div><div class='del'>-	AHCI_CMD_TBL_SZ		= AHCI_CMD_TBL_HDR + (AHCI_MAX_SG * 16),</div><div class='del'>-	AHCI_PORT_PRIV_DMA_SZ	= AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_SZ +</div><div class='add'>+	AHCI_CMD_TBL_HDR_SZ	= 0x80,</div><div class='add'>+	AHCI_CMD_TBL_SZ		= AHCI_CMD_TBL_HDR_SZ + (AHCI_MAX_SG * 16),</div><div class='add'>+	AHCI_CMD_TBL_AR_SZ	= AHCI_CMD_TBL_SZ * AHCI_MAX_CMDS,</div><div class='add'>+	AHCI_PORT_PRIV_DMA_SZ	= AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_AR_SZ +</div><div class='ctx'> 				  AHCI_RX_FIS_SZ,</div><div class='ctx'> 	AHCI_IRQ_ON_SG		= (1 &lt;&lt; 31),</div><div class='ctx'> 	AHCI_CMD_ATAPI		= (1 &lt;&lt; 5),</div><div class='hunk'>@@ -71,8 +74,10 @@ enum {</div><div class='ctx'> 	AHCI_CMD_CLR_BUSY	= (1 &lt;&lt; 10),</div><div class='ctx'> </div><div class='ctx'> 	RX_FIS_D2H_REG		= 0x40,	/* offset of D2H Register FIS data */</div><div class='add'>+	RX_FIS_UNK		= 0x60, /* offset of Unknown FIS data */</div><div class='ctx'> </div><div class='ctx'> 	board_ahci		= 0,</div><div class='add'>+	board_ahci_vt8251	= 1,</div><div class='ctx'> </div><div class='ctx'> 	/* global controller registers */</div><div class='ctx'> 	HOST_CAP		= 0x00, /* host capabilities */</div><div class='hunk'>@@ -87,8 +92,9 @@ enum {</div><div class='ctx'> 	HOST_AHCI_EN		= (1 &lt;&lt; 31), /* AHCI enabled */</div><div class='ctx'> </div><div class='ctx'> 	/* HOST_CAP bits */</div><div class='del'>-	HOST_CAP_64		= (1 &lt;&lt; 31), /* PCI DAC (64-bit DMA) support */</div><div class='ctx'> 	HOST_CAP_CLO		= (1 &lt;&lt; 24), /* Command List Override support */</div><div class='add'>+	HOST_CAP_NCQ		= (1 &lt;&lt; 30), /* Native Command Queueing */</div><div class='add'>+	HOST_CAP_64		= (1 &lt;&lt; 31), /* PCI DAC (64-bit DMA) support */</div><div class='ctx'> </div><div class='ctx'> 	/* registers for each SATA port */</div><div class='ctx'> 	PORT_LST_ADDR		= 0x00, /* command list DMA addr */</div><div class='hunk'>@@ -127,15 +133,17 @@ enum {</div><div class='ctx'> 	PORT_IRQ_PIOS_FIS	= (1 &lt;&lt; 1), /* PIO Setup FIS rx'd */</div><div class='ctx'> 	PORT_IRQ_D2H_REG_FIS	= (1 &lt;&lt; 0), /* D2H Register FIS rx'd */</div><div class='ctx'> </div><div class='del'>-	PORT_IRQ_FATAL		= PORT_IRQ_TF_ERR |</div><div class='del'>-				  PORT_IRQ_HBUS_ERR |</div><div class='del'>-				  PORT_IRQ_HBUS_DATA_ERR |</div><div class='del'>-				  PORT_IRQ_IF_ERR,</div><div class='del'>-	DEF_PORT_IRQ		= PORT_IRQ_FATAL | PORT_IRQ_PHYRDY |</div><div class='del'>-				  PORT_IRQ_CONNECT | PORT_IRQ_SG_DONE |</div><div class='del'>-				  PORT_IRQ_UNK_FIS | PORT_IRQ_SDB_FIS |</div><div class='del'>-				  PORT_IRQ_DMAS_FIS | PORT_IRQ_PIOS_FIS |</div><div class='del'>-				  PORT_IRQ_D2H_REG_FIS,</div><div class='add'>+	PORT_IRQ_FREEZE		= PORT_IRQ_HBUS_ERR |</div><div class='add'>+				  PORT_IRQ_IF_ERR |</div><div class='add'>+				  PORT_IRQ_CONNECT |</div><div class='add'>+				  PORT_IRQ_PHYRDY |</div><div class='add'>+				  PORT_IRQ_UNK_FIS,</div><div class='add'>+	PORT_IRQ_ERROR		= PORT_IRQ_FREEZE |</div><div class='add'>+				  PORT_IRQ_TF_ERR |</div><div class='add'>+				  PORT_IRQ_HBUS_DATA_ERR,</div><div class='add'>+	DEF_PORT_IRQ		= PORT_IRQ_ERROR | PORT_IRQ_SG_DONE |</div><div class='add'>+				  PORT_IRQ_SDB_FIS | PORT_IRQ_DMAS_FIS |</div><div class='add'>+				  PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS,</div><div class='ctx'> </div><div class='ctx'> 	/* PORT_CMD bits */</div><div class='ctx'> 	PORT_CMD_ATAPI		= (1 &lt;&lt; 24), /* Device is ATAPI */</div><div class='hunk'>@@ -153,6 +161,10 @@ enum {</div><div class='ctx'> </div><div class='ctx'> 	/* hpriv-&gt;flags bits */</div><div class='ctx'> 	AHCI_FLAG_MSI		= (1 &lt;&lt; 0),</div><div class='add'>+</div><div class='add'>+	/* ap-&gt;flags bits */</div><div class='add'>+	AHCI_FLAG_RESET_NEEDS_CLO	= (1 &lt;&lt; 24),</div><div class='add'>+	AHCI_FLAG_NO_NCQ		= (1 &lt;&lt; 25),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ahci_cmd_hdr {</div><div class='hunk'>@@ -181,7 +193,6 @@ struct ahci_port_priv {</div><div class='ctx'> 	dma_addr_t		cmd_slot_dma;</div><div class='ctx'> 	void			*cmd_tbl;</div><div class='ctx'> 	dma_addr_t		cmd_tbl_dma;</div><div class='del'>-	struct ahci_sg		*cmd_tbl_sg;</div><div class='ctx'> 	void			*rx_fis;</div><div class='ctx'> 	dma_addr_t		rx_fis_dma;</div><div class='ctx'> };</div><div class='hunk'>@@ -191,15 +202,16 @@ static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='ctx'> static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='ctx'> static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);</div><div class='ctx'> static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs);</div><div class='del'>-static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes);</div><div class='ctx'> static void ahci_irq_clear(struct ata_port *ap);</div><div class='del'>-static void ahci_eng_timeout(struct ata_port *ap);</div><div class='ctx'> static int ahci_port_start(struct ata_port *ap);</div><div class='ctx'> static void ahci_port_stop(struct ata_port *ap);</div><div class='ctx'> static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);</div><div class='ctx'> static void ahci_qc_prep(struct ata_queued_cmd *qc);</div><div class='ctx'> static u8 ahci_check_status(struct ata_port *ap);</div><div class='del'>-static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);</div><div class='add'>+static void ahci_freeze(struct ata_port *ap);</div><div class='add'>+static void ahci_thaw(struct ata_port *ap);</div><div class='add'>+static void ahci_error_handler(struct ata_port *ap);</div><div class='add'>+static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);</div><div class='ctx'> static void ahci_remove_one (struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template ahci_sht = {</div><div class='hunk'>@@ -207,7 +219,8 @@ static struct scsi_host_template ahci_sht = {</div><div class='ctx'> 	.name			= DRV_NAME,</div><div class='ctx'> 	.ioctl			= ata_scsi_ioctl,</div><div class='ctx'> 	.queuecommand		= ata_scsi_queuecmd,</div><div class='del'>-	.can_queue		= ATA_DEF_QUEUE,</div><div class='add'>+	.change_queue_depth	= ata_scsi_change_queue_depth,</div><div class='add'>+	.can_queue		= AHCI_MAX_CMDS - 1,</div><div class='ctx'> 	.this_id		= ATA_SHT_THIS_ID,</div><div class='ctx'> 	.sg_tablesize		= AHCI_MAX_SG,</div><div class='ctx'> 	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,</div><div class='hunk'>@@ -216,6 +229,7 @@ static struct scsi_host_template ahci_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= AHCI_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -228,19 +242,21 @@ static const struct ata_port_operations ahci_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.tf_read		= ahci_tf_read,</div><div class='ctx'> </div><div class='del'>-	.probe_reset		= ahci_probe_reset,</div><div class='del'>-</div><div class='ctx'> 	.qc_prep		= ahci_qc_prep,</div><div class='ctx'> 	.qc_issue		= ahci_qc_issue,</div><div class='ctx'> </div><div class='del'>-	.eng_timeout		= ahci_eng_timeout,</div><div class='del'>-</div><div class='ctx'> 	.irq_handler		= ahci_interrupt,</div><div class='ctx'> 	.irq_clear		= ahci_irq_clear,</div><div class='ctx'> </div><div class='ctx'> 	.scr_read		= ahci_scr_read,</div><div class='ctx'> 	.scr_write		= ahci_scr_write,</div><div class='ctx'> </div><div class='add'>+	.freeze			= ahci_freeze,</div><div class='add'>+	.thaw			= ahci_thaw,</div><div class='add'>+</div><div class='add'>+	.error_handler		= ahci_error_handler,</div><div class='add'>+	.post_internal_cmd	= ahci_post_internal_cmd,</div><div class='add'>+</div><div class='ctx'> 	.port_start		= ahci_port_start,</div><div class='ctx'> 	.port_stop		= ahci_port_stop,</div><div class='ctx'> };</div><div class='hunk'>@@ -250,7 +266,19 @@ static const struct ata_port_info ahci_port_info[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.sht		= &amp;ahci_sht,</div><div class='ctx'> 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='del'>-				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,</div><div class='add'>+				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |</div><div class='add'>+				  ATA_FLAG_SKIP_D2H_BSY,</div><div class='add'>+		.pio_mask	= 0x1f, /* pio0-4 */</div><div class='add'>+		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */</div><div class='add'>+		.port_ops	= &amp;ahci_ops,</div><div class='add'>+	},</div><div class='add'>+	/* board_ahci_vt8251 */</div><div class='add'>+	{</div><div class='add'>+		.sht		= &amp;ahci_sht,</div><div class='add'>+		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='add'>+				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |</div><div class='add'>+				  ATA_FLAG_SKIP_D2H_BSY |</div><div class='add'>+				  AHCI_FLAG_RESET_NEEDS_CLO | AHCI_FLAG_NO_NCQ,</div><div class='ctx'> 		.pio_mask	= 0x1f, /* pio0-4 */</div><div class='ctx'> 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */</div><div class='ctx'> 		.port_ops	= &amp;ahci_ops,</div><div class='hunk'>@@ -258,6 +286,7 @@ static const struct ata_port_info ahci_port_info[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id ahci_pci_tbl[] = {</div><div class='add'>+	/* Intel */</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 	  board_ahci }, /* ICH6 */</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='hunk'>@@ -288,14 +317,39 @@ static const struct pci_device_id ahci_pci_tbl[] = {</div><div class='ctx'> 	  board_ahci }, /* ICH8M */</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 	  board_ahci }, /* ICH8M */</div><div class='add'>+</div><div class='add'>+	/* JMicron */</div><div class='ctx'> 	{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 	  board_ahci }, /* JMicron JMB360 */</div><div class='add'>+	{ 0x197b, 0x2361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci }, /* JMicron JMB361 */</div><div class='ctx'> 	{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 	  board_ahci }, /* JMicron JMB363 */</div><div class='add'>+	{ 0x197b, 0x2365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci }, /* JMicron JMB365 */</div><div class='add'>+	{ 0x197b, 0x2366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci }, /* JMicron JMB366 */</div><div class='add'>+</div><div class='add'>+	/* ATI */</div><div class='ctx'> 	{ PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 	  board_ahci }, /* ATI SB600 non-raid */</div><div class='ctx'> 	{ PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 	  board_ahci }, /* ATI SB600 raid */</div><div class='add'>+</div><div class='add'>+	/* VIA */</div><div class='add'>+	{ PCI_VENDOR_ID_VIA, 0x3349, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci_vt8251 }, /* VIA VT8251 */</div><div class='add'>+</div><div class='add'>+	/* NVIDIA */</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x044c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci },		/* MCP65 */</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x044d, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci },		/* MCP65 */</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x044e, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci },		/* MCP65 */</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,</div><div class='add'>+	  board_ahci },		/* MCP65 */</div><div class='add'>+</div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -374,8 +428,6 @@ static int ahci_port_start(struct ata_port *ap)</div><div class='ctx'> 	pp-&gt;cmd_tbl = mem;</div><div class='ctx'> 	pp-&gt;cmd_tbl_dma = mem_dma;</div><div class='ctx'> </div><div class='del'>-	pp-&gt;cmd_tbl_sg = mem + AHCI_CMD_TBL_HDR;</div><div class='del'>-</div><div class='ctx'> 	ap-&gt;private_data = pp;</div><div class='ctx'> </div><div class='ctx'> 	if (hpriv-&gt;cap &amp; HOST_CAP_64)</div><div class='hunk'>@@ -508,46 +560,71 @@ static unsigned int ahci_dev_classify(struct ata_port *ap)</div><div class='ctx'> 	return ata_dev_classify(&amp;tf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, u32 opts)</div><div class='add'>+static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,</div><div class='add'>+			       u32 opts)</div><div class='ctx'> {</div><div class='del'>-	pp-&gt;cmd_slot[0].opts = cpu_to_le32(opts);</div><div class='del'>-	pp-&gt;cmd_slot[0].status = 0;</div><div class='del'>-	pp-&gt;cmd_slot[0].tbl_addr = cpu_to_le32(pp-&gt;cmd_tbl_dma &amp; 0xffffffff);</div><div class='del'>-	pp-&gt;cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp-&gt;cmd_tbl_dma &gt;&gt; 16) &gt;&gt; 16);</div><div class='add'>+	dma_addr_t cmd_tbl_dma;</div><div class='add'>+</div><div class='add'>+	cmd_tbl_dma = pp-&gt;cmd_tbl_dma + tag * AHCI_CMD_TBL_SZ;</div><div class='add'>+</div><div class='add'>+	pp-&gt;cmd_slot[tag].opts = cpu_to_le32(opts);</div><div class='add'>+	pp-&gt;cmd_slot[tag].status = 0;</div><div class='add'>+	pp-&gt;cmd_slot[tag].tbl_addr = cpu_to_le32(cmd_tbl_dma &amp; 0xffffffff);</div><div class='add'>+	pp-&gt;cmd_slot[tag].tbl_addr_hi = cpu_to_le32((cmd_tbl_dma &gt;&gt; 16) &gt;&gt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_poll_register(void __iomem *reg, u32 mask, u32 val,</div><div class='del'>-			      unsigned long interval_msec,</div><div class='del'>-			      unsigned long timeout_msec)</div><div class='add'>+static int ahci_clo(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout;</div><div class='add'>+	void __iomem *port_mmio = (void __iomem *) ap-&gt;ioaddr.cmd_addr;</div><div class='add'>+	struct ahci_host_priv *hpriv = ap-&gt;host_set-&gt;private_data;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='del'>-	timeout = jiffies + (timeout_msec * HZ) / 1000;</div><div class='del'>-	do {</div><div class='del'>-		tmp = readl(reg);</div><div class='del'>-		if ((tmp &amp; mask) == val)</div><div class='del'>-			return 0;</div><div class='del'>-		msleep(interval_msec);</div><div class='del'>-	} while (time_before(jiffies, timeout));</div><div class='add'>+	if (!(hpriv-&gt;cap &amp; HOST_CAP_CLO))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	tmp = readl(port_mmio + PORT_CMD);</div><div class='add'>+	tmp |= PORT_CMD_CLO;</div><div class='add'>+	writel(tmp, port_mmio + PORT_CMD);</div><div class='add'>+</div><div class='add'>+	tmp = ata_wait_register(port_mmio + PORT_CMD,</div><div class='add'>+				PORT_CMD_CLO, PORT_CMD_CLO, 1, 500);</div><div class='add'>+	if (tmp &amp; PORT_CMD_CLO)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='add'>+static int ahci_prereset(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	if ((ap-&gt;flags &amp; AHCI_FLAG_RESET_NEEDS_CLO) &amp;&amp;</div><div class='add'>+	    (ata_busy_wait(ap, ATA_BUSY, 1000) &amp; ATA_BUSY)) {</div><div class='add'>+		/* ATA_BUSY hasn't cleared, so send a CLO */</div><div class='add'>+		ahci_clo(ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ata_std_prereset(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ahci_softreset(struct ata_port *ap, unsigned int *class)</div><div class='ctx'> {</div><div class='del'>-	struct ahci_host_priv *hpriv = ap-&gt;host_set-&gt;private_data;</div><div class='ctx'> 	struct ahci_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 	void __iomem *mmio = ap-&gt;host_set-&gt;mmio_base;</div><div class='ctx'> 	void __iomem *port_mmio = ahci_port_base(mmio, ap-&gt;port_no);</div><div class='ctx'> 	const u32 cmd_fis_len = 5; /* five dwords */</div><div class='ctx'> 	const char *reason = NULL;</div><div class='ctx'> 	struct ata_taskfile tf;</div><div class='add'>+	u32 tmp;</div><div class='ctx'> 	u8 *fis;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='add'>+	if (ata_port_offline(ap)) {</div><div class='add'>+		DPRINTK("PHY reports no device\n");</div><div class='add'>+		*class = ATA_DEV_NONE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* prepare for SRST (AHCI-1.1 10.4.1) */</div><div class='ctx'> 	rc = ahci_stop_engine(ap);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -558,23 +635,13 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='ctx'> 	/* check BUSY/DRQ, perform Command List Override if necessary */</div><div class='ctx'> 	ahci_tf_read(ap, &amp;tf);</div><div class='ctx'> 	if (tf.command &amp; (ATA_BUSY | ATA_DRQ)) {</div><div class='del'>-		u32 tmp;</div><div class='add'>+		rc = ahci_clo(ap);</div><div class='ctx'> </div><div class='del'>-		if (!(hpriv-&gt;cap &amp; HOST_CAP_CLO)) {</div><div class='del'>-			rc = -EIO;</div><div class='del'>-			reason = "port busy but no CLO";</div><div class='add'>+		if (rc == -EOPNOTSUPP) {</div><div class='add'>+			reason = "port busy but CLO unavailable";</div><div class='ctx'> 			goto fail_restart;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tmp = readl(port_mmio + PORT_CMD);</div><div class='del'>-		tmp |= PORT_CMD_CLO;</div><div class='del'>-		writel(tmp, port_mmio + PORT_CMD);</div><div class='del'>-		readl(port_mmio + PORT_CMD); /* flush */</div><div class='del'>-</div><div class='del'>-		if (ahci_poll_register(port_mmio + PORT_CMD, PORT_CMD_CLO, 0x0,</div><div class='del'>-				       1, 500)) {</div><div class='del'>-			rc = -EIO;</div><div class='del'>-			reason = "CLO failed";</div><div class='add'>+		} else if (rc) {</div><div class='add'>+			reason = "port busy but CLO failed";</div><div class='ctx'> 			goto fail_restart;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -582,20 +649,21 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='ctx'> 	/* restart engine */</div><div class='ctx'> 	ahci_start_engine(ap);</div><div class='ctx'> </div><div class='del'>-	ata_tf_init(ap, &amp;tf, 0);</div><div class='add'>+	ata_tf_init(ap-&gt;device, &amp;tf);</div><div class='ctx'> 	fis = pp-&gt;cmd_tbl;</div><div class='ctx'> </div><div class='ctx'> 	/* issue the first D2H Register FIS */</div><div class='del'>-	ahci_fill_cmd_slot(pp, cmd_fis_len | AHCI_CMD_RESET | AHCI_CMD_CLR_BUSY);</div><div class='add'>+	ahci_fill_cmd_slot(pp, 0,</div><div class='add'>+			   cmd_fis_len | AHCI_CMD_RESET | AHCI_CMD_CLR_BUSY);</div><div class='ctx'> </div><div class='ctx'> 	tf.ctl |= ATA_SRST;</div><div class='ctx'> 	ata_tf_to_fis(&amp;tf, fis, 0);</div><div class='ctx'> 	fis[1] &amp;= ~(1 &lt;&lt; 7);	/* turn off Command FIS bit */</div><div class='ctx'> </div><div class='ctx'> 	writel(1, port_mmio + PORT_CMD_ISSUE);</div><div class='del'>-	readl(port_mmio + PORT_CMD_ISSUE);	/* flush */</div><div class='ctx'> </div><div class='del'>-	if (ahci_poll_register(port_mmio + PORT_CMD_ISSUE, 0x1, 0x0, 1, 500)) {</div><div class='add'>+	tmp = ata_wait_register(port_mmio + PORT_CMD_ISSUE, 0x1, 0x1, 1, 500);</div><div class='add'>+	if (tmp &amp; 0x1) {</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		reason = "1st FIS failed";</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -605,7 +673,7 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='ctx'> 	/* issue the second D2H Register FIS */</div><div class='del'>-	ahci_fill_cmd_slot(pp, cmd_fis_len);</div><div class='add'>+	ahci_fill_cmd_slot(pp, 0, cmd_fis_len);</div><div class='ctx'> </div><div class='ctx'> 	tf.ctl &amp;= ~ATA_SRST;</div><div class='ctx'> 	ata_tf_to_fis(&amp;tf, fis, 0);</div><div class='hunk'>@@ -625,7 +693,7 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='ctx'> 	msleep(150);</div><div class='ctx'> </div><div class='ctx'> 	*class = ATA_DEV_NONE;</div><div class='del'>-	if (sata_dev_present(ap)) {</div><div class='add'>+	if (ata_port_online(ap)) {</div><div class='ctx'> 		if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {</div><div class='ctx'> 			rc = -EIO;</div><div class='ctx'> 			reason = "device not ready";</div><div class='hunk'>@@ -640,25 +708,31 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='ctx'>  fail_restart:</div><div class='ctx'> 	ahci_start_engine(ap);</div><div class='ctx'>  fail:</div><div class='del'>-	if (verbose)</div><div class='del'>-		printk(KERN_ERR "ata%u: softreset failed (%s)\n",</div><div class='del'>-		       ap-&gt;id, reason);</div><div class='del'>-	else</div><div class='del'>-		DPRINTK("EXIT, rc=%d reason=\"%s\"\n", rc, reason);</div><div class='add'>+	ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_hardreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='add'>+static int ahci_hardreset(struct ata_port *ap, unsigned int *class)</div><div class='ctx'> {</div><div class='add'>+	struct ahci_port_priv *pp = ap-&gt;private_data;</div><div class='add'>+	u8 *d2h_fis = pp-&gt;rx_fis + RX_FIS_D2H_REG;</div><div class='add'>+	struct ata_taskfile tf;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='ctx'> 	ahci_stop_engine(ap);</div><div class='del'>-	rc = sata_std_hardreset(ap, verbose, class);</div><div class='add'>+</div><div class='add'>+	/* clear D2H reception area to properly wait for D2H FIS */</div><div class='add'>+	ata_tf_init(ap-&gt;device, &amp;tf);</div><div class='add'>+	tf.command = 0xff;</div><div class='add'>+	ata_tf_to_fis(&amp;tf, d2h_fis, 0);</div><div class='add'>+</div><div class='add'>+	rc = sata_std_hardreset(ap, class);</div><div class='add'>+</div><div class='ctx'> 	ahci_start_engine(ap);</div><div class='ctx'> </div><div class='del'>-	if (rc == 0)</div><div class='add'>+	if (rc == 0 &amp;&amp; ata_port_online(ap))</div><div class='ctx'> 		*class = ahci_dev_classify(ap);</div><div class='ctx'> 	if (*class == ATA_DEV_UNKNOWN)</div><div class='ctx'> 		*class = ATA_DEV_NONE;</div><div class='hunk'>@@ -686,13 +760,6 @@ static void ahci_postreset(struct ata_port *ap, unsigned int *class)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ahci_probe_reset(struct ata_port *ap, unsigned int *classes)</div><div class='del'>-{</div><div class='del'>-	return ata_drive_probe_reset(ap, ata_std_probeinit,</div><div class='del'>-				     ahci_softreset, ahci_hardreset,</div><div class='del'>-				     ahci_postreset, classes);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u8 ahci_check_status(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *mmio = (void __iomem *) ap-&gt;ioaddr.cmd_addr;</div><div class='hunk'>@@ -708,9 +775,8 @@ static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf)</div><div class='ctx'> 	ata_tf_from_fis(d2h_fis, tf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc)</div><div class='add'>+static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)</div><div class='ctx'> {</div><div class='del'>-	struct ahci_port_priv *pp = qc-&gt;ap-&gt;private_data;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	struct ahci_sg *ahci_sg;</div><div class='ctx'> 	unsigned int n_sg = 0;</div><div class='hunk'>@@ -720,7 +786,7 @@ static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Next, the S/G list.</div><div class='ctx'> 	 */</div><div class='del'>-	ahci_sg = pp-&gt;cmd_tbl_sg;</div><div class='add'>+	ahci_sg = cmd_tbl + AHCI_CMD_TBL_HDR_SZ;</div><div class='ctx'> 	ata_for_each_sg(sg, qc) {</div><div class='ctx'> 		dma_addr_t addr = sg_dma_address(sg);</div><div class='ctx'> 		u32 sg_len = sg_dma_len(sg);</div><div class='hunk'>@@ -741,6 +807,7 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> 	struct ahci_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 	int is_atapi = is_atapi_taskfile(&amp;qc-&gt;tf);</div><div class='add'>+	void *cmd_tbl;</div><div class='ctx'> 	u32 opts;</div><div class='ctx'> 	const u32 cmd_fis_len = 5; /* five dwords */</div><div class='ctx'> 	unsigned int n_elem;</div><div class='hunk'>@@ -749,16 +816,17 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> 	 * Fill in command table information.  First, the header,</div><div class='ctx'> 	 * a SATA Register - Host to Device command FIS.</div><div class='ctx'> 	 */</div><div class='del'>-	ata_tf_to_fis(&amp;qc-&gt;tf, pp-&gt;cmd_tbl, 0);</div><div class='add'>+	cmd_tbl = pp-&gt;cmd_tbl + qc-&gt;tag * AHCI_CMD_TBL_SZ;</div><div class='add'>+</div><div class='add'>+	ata_tf_to_fis(&amp;qc-&gt;tf, cmd_tbl, 0);</div><div class='ctx'> 	if (is_atapi) {</div><div class='del'>-		memset(pp-&gt;cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);</div><div class='del'>-		memcpy(pp-&gt;cmd_tbl + AHCI_CMD_TBL_CDB, qc-&gt;cdb,</div><div class='del'>-		       qc-&gt;dev-&gt;cdb_len);</div><div class='add'>+		memset(cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);</div><div class='add'>+		memcpy(cmd_tbl + AHCI_CMD_TBL_CDB, qc-&gt;cdb, qc-&gt;dev-&gt;cdb_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	n_elem = 0;</div><div class='ctx'> 	if (qc-&gt;flags &amp; ATA_QCFLAG_DMAMAP)</div><div class='del'>-		n_elem = ahci_fill_sg(qc);</div><div class='add'>+		n_elem = ahci_fill_sg(qc, cmd_tbl);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fill in command slot information.</div><div class='hunk'>@@ -769,112 +837,122 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> 	if (is_atapi)</div><div class='ctx'> 		opts |= AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH;</div><div class='ctx'> </div><div class='del'>-	ahci_fill_cmd_slot(pp, opts);</div><div class='add'>+	ahci_fill_cmd_slot(pp, qc-&gt;tag, opts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)</div><div class='add'>+static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *mmio = ap-&gt;host_set-&gt;mmio_base;</div><div class='del'>-	void __iomem *port_mmio = ahci_port_base(mmio, ap-&gt;port_no);</div><div class='del'>-	u32 tmp;</div><div class='add'>+	struct ahci_port_priv *pp = ap-&gt;private_data;</div><div class='add'>+	struct ata_eh_info *ehi = &amp;ap-&gt;eh_info;</div><div class='add'>+	unsigned int err_mask = 0, action = 0;</div><div class='add'>+	struct ata_queued_cmd *qc;</div><div class='add'>+	u32 serror;</div><div class='ctx'> </div><div class='del'>-	if ((ap-&gt;device[0].class != ATA_DEV_ATAPI) ||</div><div class='del'>-	    ((irq_stat &amp; PORT_IRQ_TF_ERR) == 0))</div><div class='del'>-		printk(KERN_WARNING "ata%u: port reset, "</div><div class='del'>-		       "p_is %x is %x pis %x cmd %x tf %x ss %x se %x\n",</div><div class='del'>-			ap-&gt;id,</div><div class='del'>-			irq_stat,</div><div class='del'>-			readl(mmio + HOST_IRQ_STAT),</div><div class='del'>-			readl(port_mmio + PORT_IRQ_STAT),</div><div class='del'>-			readl(port_mmio + PORT_CMD),</div><div class='del'>-			readl(port_mmio + PORT_TFDATA),</div><div class='del'>-			readl(port_mmio + PORT_SCR_STAT),</div><div class='del'>-			readl(port_mmio + PORT_SCR_ERR));</div><div class='del'>-</div><div class='del'>-	/* stop DMA */</div><div class='del'>-	ahci_stop_engine(ap);</div><div class='add'>+	ata_ehi_clear_desc(ehi);</div><div class='ctx'> </div><div class='del'>-	/* clear SATA phy error, if any */</div><div class='del'>-	tmp = readl(port_mmio + PORT_SCR_ERR);</div><div class='del'>-	writel(tmp, port_mmio + PORT_SCR_ERR);</div><div class='add'>+	/* AHCI needs SError cleared; otherwise, it might lock up */</div><div class='add'>+	serror = ahci_scr_read(ap, SCR_ERROR);</div><div class='add'>+	ahci_scr_write(ap, SCR_ERROR, serror);</div><div class='ctx'> </div><div class='del'>-	/* if DRQ/BSY is set, device needs to be reset.</div><div class='del'>-	 * if so, issue COMRESET</div><div class='del'>-	 */</div><div class='del'>-	tmp = readl(port_mmio + PORT_TFDATA);</div><div class='del'>-	if (tmp &amp; (ATA_BUSY | ATA_DRQ)) {</div><div class='del'>-		writel(0x301, port_mmio + PORT_SCR_CTL);</div><div class='del'>-		readl(port_mmio + PORT_SCR_CTL); /* flush */</div><div class='del'>-		udelay(10);</div><div class='del'>-		writel(0x300, port_mmio + PORT_SCR_CTL);</div><div class='del'>-		readl(port_mmio + PORT_SCR_CTL); /* flush */</div><div class='add'>+	/* analyze @irq_stat */</div><div class='add'>+	ata_ehi_push_desc(ehi, "irq_stat 0x%08x", irq_stat);</div><div class='add'>+</div><div class='add'>+	if (irq_stat &amp; PORT_IRQ_TF_ERR)</div><div class='add'>+		err_mask |= AC_ERR_DEV;</div><div class='add'>+</div><div class='add'>+	if (irq_stat &amp; (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR)) {</div><div class='add'>+		err_mask |= AC_ERR_HOST_BUS;</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* re-start DMA */</div><div class='del'>-	ahci_start_engine(ap);</div><div class='del'>-}</div><div class='add'>+	if (irq_stat &amp; PORT_IRQ_IF_ERR) {</div><div class='add'>+		err_mask |= AC_ERR_ATA_BUS;</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+		ata_ehi_push_desc(ehi, ", interface fatal error");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void ahci_eng_timeout(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	struct ata_host_set *host_set = ap-&gt;host_set;</div><div class='del'>-	void __iomem *mmio = host_set-&gt;mmio_base;</div><div class='del'>-	void __iomem *port_mmio = ahci_port_base(mmio, ap-&gt;port_no);</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	if (irq_stat &amp; (PORT_IRQ_CONNECT | PORT_IRQ_PHYRDY)) {</div><div class='add'>+		ata_ehi_hotplugged(ehi);</div><div class='add'>+		ata_ehi_push_desc(ehi, ", %s", irq_stat &amp; PORT_IRQ_CONNECT ?</div><div class='add'>+			"connection status changed" : "PHY RDY changed");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_WARNING "ata%u: handling error/timeout\n", ap-&gt;id);</div><div class='add'>+	if (irq_stat &amp; PORT_IRQ_UNK_FIS) {</div><div class='add'>+		u32 *unk = (u32 *)(pp-&gt;rx_fis + RX_FIS_UNK);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;host_set-&gt;lock, flags);</div><div class='add'>+		err_mask |= AC_ERR_HSM;</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+		ata_ehi_push_desc(ehi, ", unknown FIS %08x %08x %08x %08x",</div><div class='add'>+				  unk[0], unk[1], unk[2], unk[3]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ahci_restart_port(ap, readl(port_mmio + PORT_IRQ_STAT));</div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='add'>+	/* okay, let's hand over to EH */</div><div class='add'>+	ehi-&gt;serror |= serror;</div><div class='add'>+	ehi-&gt;action |= action;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;host_set-&gt;lock, flags);</div><div class='add'>+	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+	if (qc)</div><div class='add'>+		qc-&gt;err_mask |= err_mask;</div><div class='add'>+	else</div><div class='add'>+		ehi-&gt;err_mask |= err_mask;</div><div class='ctx'> </div><div class='del'>-	ata_eh_qc_complete(qc);</div><div class='add'>+	if (irq_stat &amp; PORT_IRQ_FREEZE)</div><div class='add'>+		ata_port_freeze(ap);</div><div class='add'>+	else</div><div class='add'>+		ata_port_abort(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)</div><div class='add'>+static void ahci_host_intr(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *mmio = ap-&gt;host_set-&gt;mmio_base;</div><div class='ctx'> 	void __iomem *port_mmio = ahci_port_base(mmio, ap-&gt;port_no);</div><div class='del'>-	u32 status, serr, ci;</div><div class='del'>-</div><div class='del'>-	serr = readl(port_mmio + PORT_SCR_ERR);</div><div class='del'>-	writel(serr, port_mmio + PORT_SCR_ERR);</div><div class='add'>+	struct ata_eh_info *ehi = &amp;ap-&gt;eh_info;</div><div class='add'>+	u32 status, qc_active;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	status = readl(port_mmio + PORT_IRQ_STAT);</div><div class='ctx'> 	writel(status, port_mmio + PORT_IRQ_STAT);</div><div class='ctx'> </div><div class='del'>-	ci = readl(port_mmio + PORT_CMD_ISSUE);</div><div class='del'>-	if (likely((ci &amp; 0x1) == 0)) {</div><div class='del'>-		if (qc) {</div><div class='del'>-			WARN_ON(qc-&gt;err_mask);</div><div class='del'>-			ata_qc_complete(qc);</div><div class='del'>-			qc = NULL;</div><div class='del'>-		}</div><div class='add'>+	if (unlikely(status &amp; PORT_IRQ_ERROR)) {</div><div class='add'>+		ahci_error_intr(ap, status);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (status &amp; PORT_IRQ_FATAL) {</div><div class='del'>-		unsigned int err_mask;</div><div class='del'>-		if (status &amp; PORT_IRQ_TF_ERR)</div><div class='del'>-			err_mask = AC_ERR_DEV;</div><div class='del'>-		else if (status &amp; PORT_IRQ_IF_ERR)</div><div class='del'>-			err_mask = AC_ERR_ATA_BUS;</div><div class='del'>-		else</div><div class='del'>-			err_mask = AC_ERR_HOST_BUS;</div><div class='del'>-</div><div class='del'>-		/* command processing has stopped due to error; restart */</div><div class='del'>-		ahci_restart_port(ap, status);</div><div class='del'>-</div><div class='del'>-		if (qc) {</div><div class='del'>-			qc-&gt;err_mask |= err_mask;</div><div class='del'>-			ata_qc_complete(qc);</div><div class='del'>-		}</div><div class='add'>+	if (ap-&gt;sactive)</div><div class='add'>+		qc_active = readl(port_mmio + PORT_SCR_ACT);</div><div class='add'>+	else</div><div class='add'>+		qc_active = readl(port_mmio + PORT_CMD_ISSUE);</div><div class='add'>+</div><div class='add'>+	rc = ata_qc_complete_multiple(ap, qc_active, NULL);</div><div class='add'>+	if (rc &gt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		ehi-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+		ehi-&gt;action |= ATA_EH_SOFTRESET;</div><div class='add'>+		ata_port_freeze(ap);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* hmmm... a spurious interupt */</div><div class='add'>+</div><div class='add'>+	/* some devices send D2H reg with I bit set during NCQ command phase */</div><div class='add'>+	if (ap-&gt;sactive &amp;&amp; status &amp; PORT_IRQ_D2H_REG_FIS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* ignore interim PIO setup fis interrupts */</div><div class='add'>+	if (ata_tag_valid(ap-&gt;active_tag)) {</div><div class='add'>+		struct ata_queued_cmd *qc =</div><div class='add'>+			ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+</div><div class='add'>+		if (qc &amp;&amp; qc-&gt;tf.protocol == ATA_PROT_PIO &amp;&amp;</div><div class='add'>+		    (status &amp; PORT_IRQ_PIOS_FIS))</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	if (ata_ratelimit())</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "spurious interrupt "</div><div class='add'>+				"(irq_stat 0x%x active_tag %d sactive 0x%x)\n",</div><div class='add'>+				status, ap-&gt;active_tag, ap-&gt;sactive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ahci_irq_clear(struct ata_port *ap)</div><div class='hunk'>@@ -882,7 +960,7 @@ static void ahci_irq_clear(struct ata_port *ap)</div><div class='ctx'> 	/* TODO */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *regs)</div><div class='add'>+static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_host_set *host_set = dev_instance;</div><div class='ctx'> 	struct ahci_host_priv *hpriv;</div><div class='hunk'>@@ -911,14 +989,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *</div><div class='ctx'> </div><div class='ctx'> 		ap = host_set-&gt;ports[i];</div><div class='ctx'> 		if (ap) {</div><div class='del'>-			struct ata_queued_cmd *qc;</div><div class='del'>-			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (!ahci_host_intr(ap, qc))</div><div class='del'>-				if (ata_ratelimit())</div><div class='del'>-					dev_printk(KERN_WARNING, host_set-&gt;dev,</div><div class='del'>-					  "unhandled interrupt on port %u\n",</div><div class='del'>-					  i);</div><div class='del'>-</div><div class='add'>+			ahci_host_intr(ap);</div><div class='ctx'> 			VPRINTK("port %u\n", i);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			VPRINTK("port %u (no irq)\n", i);</div><div class='hunk'>@@ -935,7 +1006,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        spin_unlock(&amp;host_set-&gt;lock);</div><div class='add'>+	spin_unlock(&amp;host_set-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("EXIT\n");</div><div class='ctx'> </div><div class='hunk'>@@ -947,12 +1018,65 @@ static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> 	void __iomem *port_mmio = (void __iomem *) ap-&gt;ioaddr.cmd_addr;</div><div class='ctx'> </div><div class='del'>-	writel(1, port_mmio + PORT_CMD_ISSUE);</div><div class='add'>+	if (qc-&gt;tf.protocol == ATA_PROT_NCQ)</div><div class='add'>+		writel(1 &lt;&lt; qc-&gt;tag, port_mmio + PORT_SCR_ACT);</div><div class='add'>+	writel(1 &lt;&lt; qc-&gt;tag, port_mmio + PORT_CMD_ISSUE);</div><div class='ctx'> 	readl(port_mmio + PORT_CMD_ISSUE);	/* flush */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ahci_freeze(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmio = ap-&gt;host_set-&gt;mmio_base;</div><div class='add'>+	void __iomem *port_mmio = ahci_port_base(mmio, ap-&gt;port_no);</div><div class='add'>+</div><div class='add'>+	/* turn IRQ off */</div><div class='add'>+	writel(0, port_mmio + PORT_IRQ_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ahci_thaw(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmio = ap-&gt;host_set-&gt;mmio_base;</div><div class='add'>+	void __iomem *port_mmio = ahci_port_base(mmio, ap-&gt;port_no);</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* clear IRQ */</div><div class='add'>+	tmp = readl(port_mmio + PORT_IRQ_STAT);</div><div class='add'>+	writel(tmp, port_mmio + PORT_IRQ_STAT);</div><div class='add'>+	writel(1 &lt;&lt; ap-&gt;id, mmio + HOST_IRQ_STAT);</div><div class='add'>+</div><div class='add'>+	/* turn IRQ back on */</div><div class='add'>+	writel(DEF_PORT_IRQ, port_mmio + PORT_IRQ_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ahci_error_handler(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	if (!(ap-&gt;pflags &amp; ATA_PFLAG_FROZEN)) {</div><div class='add'>+		/* restart engine */</div><div class='add'>+		ahci_stop_engine(ap);</div><div class='add'>+		ahci_start_engine(ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* perform recovery */</div><div class='add'>+	ata_do_eh(ap, ahci_prereset, ahci_softreset, ahci_hardreset,</div><div class='add'>+		  ahci_postreset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;flags &amp; ATA_QCFLAG_FAILED)</div><div class='add'>+		qc-&gt;err_mask |= AC_ERR_OTHER;</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;err_mask) {</div><div class='add'>+		/* make DMA engine forget about the failed command */</div><div class='add'>+		ahci_stop_engine(ap);</div><div class='add'>+		ahci_start_engine(ap);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ahci_setup_port(struct ata_ioports *port, unsigned long base,</div><div class='ctx'> 			    unsigned int port_idx)</div><div class='ctx'> {</div><div class='hunk'>@@ -1097,9 +1221,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)</div><div class='ctx'> 			writel(tmp, port_mmio + PORT_IRQ_STAT);</div><div class='ctx'> </div><div class='ctx'> 		writel(1 &lt;&lt; i, mmio + HOST_IRQ_STAT);</div><div class='del'>-</div><div class='del'>-		/* set irq mask (enables interrupts) */</div><div class='del'>-		writel(DEF_PORT_IRQ, port_mmio + PORT_IRQ_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = readl(mmio + HOST_CTL);</div><div class='hunk'>@@ -1197,9 +1318,22 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='add'>+	WARN_ON(ATA_MAX_QUEUE &gt; AHCI_MAX_CMDS);</div><div class='add'>+</div><div class='ctx'> 	if (!printed_version++)</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='add'>+	/* JMicron-specific fixup: make sure we're in AHCI mode */</div><div class='add'>+	/* This is protected from races with ata_jmicron by the pci probe</div><div class='add'>+	   locking */</div><div class='add'>+	if (pdev-&gt;vendor == PCI_VENDOR_ID_JMICRON) {</div><div class='add'>+		/* AHCI enable, AHCI on function 0 */</div><div class='add'>+		pci_write_config_byte(pdev, 0x41, 0xa1);</div><div class='add'>+		/* Function 1 is the PATA controller */</div><div class='add'>+		if (PCI_FUNC(pdev-&gt;devfn))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -1248,22 +1382,22 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	probe_ent-&gt;port_ops	= ahci_port_info[board_idx].port_ops;</div><div class='ctx'> </div><div class='ctx'>        	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-       	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+       	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = mmio_base;</div><div class='ctx'> 	probe_ent-&gt;private_data = hpriv;</div><div class='ctx'> </div><div class='ctx'> 	if (have_msi)</div><div class='ctx'> 		hpriv-&gt;flags |= AHCI_FLAG_MSI;</div><div class='ctx'> </div><div class='del'>-	/* JMicron-specific fixup: make sure we're in AHCI mode */</div><div class='del'>-	if (pdev-&gt;vendor == 0x197b)</div><div class='del'>-		pci_write_config_byte(pdev, 0x41, 0xa1);</div><div class='del'>-</div><div class='ctx'> 	/* initialize adapter */</div><div class='ctx'> 	rc = ahci_host_init(probe_ent);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out_hpriv;</div><div class='ctx'> </div><div class='add'>+	if (!(probe_ent-&gt;host_flags &amp; AHCI_FLAG_NO_NCQ) &amp;&amp;</div><div class='add'>+	    (hpriv-&gt;cap &amp; HOST_CAP_NCQ))</div><div class='add'>+		probe_ent-&gt;host_flags |= ATA_FLAG_NCQ;</div><div class='add'>+</div><div class='ctx'> 	ahci_print_info(probe_ent);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: check ata_device_add return value */</div><div class='hunk'>@@ -1295,21 +1429,17 @@ static void ahci_remove_one (struct pci_dev *pdev)</div><div class='ctx'> 	struct device *dev = pci_dev_to_dev(pdev);</div><div class='ctx'> 	struct ata_host_set *host_set = dev_get_drvdata(dev);</div><div class='ctx'> 	struct ahci_host_priv *hpriv = host_set-&gt;private_data;</div><div class='del'>-	struct ata_port *ap;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int have_msi;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='del'>-		ap = host_set-&gt;ports[i];</div><div class='del'>-</div><div class='del'>-		scsi_remove_host(ap-&gt;host);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; host_set-&gt;n_ports; i++)</div><div class='add'>+		ata_port_detach(host_set-&gt;ports[i]);</div><div class='ctx'> </div><div class='ctx'> 	have_msi = hpriv-&gt;flags &amp; AHCI_FLAG_MSI;</div><div class='ctx'> 	free_irq(host_set-&gt;irq, host_set);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='del'>-		ap = host_set-&gt;ports[i];</div><div class='add'>+		struct ata_port *ap = host_set-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		ata_scsi_release(ap-&gt;host);</div><div class='ctx'> 		scsi_host_put(ap-&gt;host);</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c<br/>index 527efd36f5c1..c4d17231c828 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7770.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7770.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7770.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7770.c</a></div><div class='hunk'>@@ -107,7 +107,7 @@ struct aic7770_identity aic7770_ident_table[] =</div><div class='ctx'> 		ahc_aic7770_EISA_setup</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='del'>-const int ahc_num_aic7770_devs = NUM_ELEMENTS(aic7770_ident_table);</div><div class='add'>+const int ahc_num_aic7770_devs = ARRAY_SIZE(aic7770_ident_table);</div><div class='ctx'> </div><div class='ctx'> struct aic7770_identity *</div><div class='ctx'> aic7770_find_device(uint32_t id)</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7770_osm.c b/drivers/scsi/aic7xxx/aic7770_osm.c<br/>index d754b3267863..867cbe23579b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7770_osm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7770_osm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7770_osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7770_osm.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ aic7770_map_int(struct ahc_softc *ahc, u_int irq)</div><div class='ctx'> </div><div class='ctx'> 	shared = 0;</div><div class='ctx'> 	if ((ahc-&gt;flags &amp; AHC_EDGE_INTERRUPT) == 0)</div><div class='del'>-		shared = SA_SHIRQ;</div><div class='add'>+		shared = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 	error = request_irq(irq, ahc_linux_isr, shared, "aic7xxx", ahc);</div><div class='ctx'> 	if (error == 0)</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h<br/>index bb5166da4358..df3346b5caf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx.h</a></div><div class='hunk'>@@ -68,8 +68,6 @@ struct scb_platform_data;</div><div class='ctx'> #define FALSE 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array))</div><div class='del'>-</div><div class='ctx'> #define ALL_CHANNELS '\0'</div><div class='ctx'> #define ALL_TARGETS_MASK 0xFFFF</div><div class='ctx'> #define INITIATOR_WILDCARD	(~0)</div><div class='hunk'>@@ -1489,6 +1487,7 @@ typedef enum {</div><div class='ctx'> } ahd_queue_alg;</div><div class='ctx'> </div><div class='ctx'> void			ahd_set_tags(struct ahd_softc *ahd,</div><div class='add'>+				     struct scsi_cmnd *cmd,</div><div class='ctx'> 				     struct ahd_devinfo *devinfo,</div><div class='ctx'> 				     ahd_queue_alg alg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c<br/>index 08771f6f6859..a1e8ca758594 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx_core.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ char *ahd_chip_names[] =</div><div class='ctx'> 	"aic7902",</div><div class='ctx'> 	"aic7901A"</div><div class='ctx'> };</div><div class='del'>-static const u_int num_chip_names = NUM_ELEMENTS(ahd_chip_names);</div><div class='add'>+static const u_int num_chip_names = ARRAY_SIZE(ahd_chip_names);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Hardware error codes.</div><div class='hunk'>@@ -77,7 +77,7 @@ static struct ahd_hard_error_entry ahd_hard_errors[] = {</div><div class='ctx'> 	{ MPARERR,	"Scratch or SCB Memory Parity Error" },</div><div class='ctx'> 	{ CIOPARERR,	"CIOBUS Parity Error" },</div><div class='ctx'> };</div><div class='del'>-static const u_int num_errors = NUM_ELEMENTS(ahd_hard_errors);</div><div class='add'>+static const u_int num_errors = ARRAY_SIZE(ahd_hard_errors);</div><div class='ctx'> </div><div class='ctx'> static struct ahd_phase_table_entry ahd_phase_table[] =</div><div class='ctx'> {</div><div class='hunk'>@@ -97,7 +97,7 @@ static struct ahd_phase_table_entry ahd_phase_table[] =</div><div class='ctx'>  * In most cases we only wish to itterate over real phases, so</div><div class='ctx'>  * exclude the last element from the count.</div><div class='ctx'>  */</div><div class='del'>-static const u_int num_phases = NUM_ELEMENTS(ahd_phase_table) - 1;</div><div class='add'>+static const u_int num_phases = ARRAY_SIZE(ahd_phase_table) - 1;</div><div class='ctx'> </div><div class='ctx'> /* Our Sequencer Program */</div><div class='ctx'> #include "aic79xx_seq.h"</div><div class='hunk'>@@ -1090,7 +1090,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)</div><div class='ctx'> </div><div class='ctx'> 			/* Notify XPT */</div><div class='ctx'> 			ahd_send_async(ahd, devinfo.channel, devinfo.target,</div><div class='del'>-				       CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);</div><div class='add'>+				       CAM_LUN_WILDCARD, AC_SENT_BDR);</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Allow the sequencer to continue with</div><div class='hunk'>@@ -3062,7 +3062,7 @@ ahd_set_syncrate(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,</div><div class='ctx'> 		tinfo-&gt;curr.ppr_options = ppr_options;</div><div class='ctx'> </div><div class='ctx'> 		ahd_send_async(ahd, devinfo-&gt;channel, devinfo-&gt;target,</div><div class='del'>-			       CAM_LUN_WILDCARD, AC_TRANSFER_NEG, NULL);</div><div class='add'>+			       CAM_LUN_WILDCARD, AC_TRANSFER_NEG);</div><div class='ctx'> 		if (bootverbose) {</div><div class='ctx'> 			if (offset != 0) {</div><div class='ctx'> 				int options;</div><div class='hunk'>@@ -3184,7 +3184,7 @@ ahd_set_width(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,</div><div class='ctx'> </div><div class='ctx'> 		tinfo-&gt;curr.width = width;</div><div class='ctx'> 		ahd_send_async(ahd, devinfo-&gt;channel, devinfo-&gt;target,</div><div class='del'>-			       CAM_LUN_WILDCARD, AC_TRANSFER_NEG, NULL);</div><div class='add'>+			       CAM_LUN_WILDCARD, AC_TRANSFER_NEG);</div><div class='ctx'> 		if (bootverbose) {</div><div class='ctx'> 			printf("%s: target %d using %dbit transfers\n",</div><div class='ctx'> 			       ahd_name(ahd), devinfo-&gt;target,</div><div class='hunk'>@@ -3211,12 +3211,14 @@ ahd_set_width(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,</div><div class='ctx'>  * Update the current state of tagged queuing for a given target.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-ahd_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,</div><div class='del'>-	     ahd_queue_alg alg)</div><div class='add'>+ahd_set_tags(struct ahd_softc *ahd, struct scsi_cmnd *cmd,</div><div class='add'>+	     struct ahd_devinfo *devinfo, ahd_queue_alg alg)</div><div class='ctx'> {</div><div class='del'>-	ahd_platform_set_tags(ahd, devinfo, alg);</div><div class='add'>+	struct scsi_device *sdev = cmd-&gt;device;</div><div class='add'>+</div><div class='add'>+	ahd_platform_set_tags(ahd, sdev, devinfo, alg);</div><div class='ctx'> 	ahd_send_async(ahd, devinfo-&gt;channel, devinfo-&gt;target,</div><div class='del'>-		       devinfo-&gt;lun, AC_TRANSFER_NEG, &amp;alg);</div><div class='add'>+		       devinfo-&gt;lun, AC_TRANSFER_NEG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -4746,7 +4748,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)</div><div class='ctx'> 			printf("(%s:%c:%d:%d): refuses tagged commands.  "</div><div class='ctx'> 			       "Performing non-tagged I/O\n", ahd_name(ahd),</div><div class='ctx'> 			       devinfo-&gt;channel, devinfo-&gt;target, devinfo-&gt;lun);</div><div class='del'>-			ahd_set_tags(ahd, devinfo, AHD_QUEUE_NONE);</div><div class='add'>+			ahd_set_tags(ahd, scb-&gt;io_ctx, devinfo, AHD_QUEUE_NONE);</div><div class='ctx'> 			mask = ~0x23;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printf("(%s:%c:%d:%d): refuses %s tagged commands.  "</div><div class='hunk'>@@ -4754,7 +4756,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)</div><div class='ctx'> 			       ahd_name(ahd), devinfo-&gt;channel, devinfo-&gt;target,</div><div class='ctx'> 			       devinfo-&gt;lun, tag_type == MSG_ORDERED_TASK</div><div class='ctx'> 			       ? "ordered" : "head of queue");</div><div class='del'>-			ahd_set_tags(ahd, devinfo, AHD_QUEUE_BASIC);</div><div class='add'>+			ahd_set_tags(ahd, scb-&gt;io_ctx, devinfo, AHD_QUEUE_BASIC);</div><div class='ctx'> 			mask = ~0x03;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -5098,7 +5100,7 @@ ahd_handle_devreset(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,</div><div class='ctx'> 	</div><div class='ctx'> 	if (status != CAM_SEL_TIMEOUT)</div><div class='ctx'> 		ahd_send_async(ahd, devinfo-&gt;channel, devinfo-&gt;target,</div><div class='del'>-			       CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);</div><div class='add'>+			       CAM_LUN_WILDCARD, AC_SENT_BDR);</div><div class='ctx'> </div><div class='ctx'> 	if (message != NULL &amp;&amp; bootverbose)</div><div class='ctx'> 		printf("%s: %s on %c:%d. %d SCBs aborted\n", ahd_name(ahd),</div><div class='hunk'>@@ -7259,7 +7261,7 @@ ahd_qinfifo_count(struct ahd_softc *ahd)</div><div class='ctx'> 		return (wrap_qinfifonext - wrap_qinpos);</div><div class='ctx'> 	else</div><div class='ctx'> 		return (wrap_qinfifonext</div><div class='del'>-		      + NUM_ELEMENTS(ahd-&gt;qinfifo) - wrap_qinpos);</div><div class='add'>+		      + ARRAY_SIZE(ahd-&gt;qinfifo) - wrap_qinpos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -7952,7 +7954,7 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Notify the XPT that a bus reset occurred */</div><div class='ctx'> 	ahd_send_async(ahd, devinfo.channel, CAM_TARGET_WILDCARD,</div><div class='del'>-		       CAM_LUN_WILDCARD, AC_BUS_RESET, NULL);</div><div class='add'>+		       CAM_LUN_WILDCARD, AC_BUS_RESET);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Revert to async/narrow transfers until we renegotiate.</div><div class='hunk'>@@ -8619,7 +8621,7 @@ ahd_check_patch(struct ahd_softc *ahd, struct patch **start_patch,</div><div class='ctx'> 	struct	patch *last_patch;</div><div class='ctx'> 	u_int	num_patches;</div><div class='ctx'> </div><div class='del'>-	num_patches = sizeof(patches)/sizeof(struct patch);</div><div class='add'>+	num_patches = ARRAY_SIZE(patches);</div><div class='ctx'> 	last_patch = &amp;patches[num_patches];</div><div class='ctx'> 	cur_patch = *start_patch;</div><div class='ctx'> </div><div class='hunk'>@@ -9396,8 +9398,8 @@ ahd_find_tmode_devs(struct ahd_softc *ahd, struct cam_sim *sim, union ccb *ccb,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u_int max_id;</div><div class='ctx'> </div><div class='del'>-		max_id = (ahd-&gt;features &amp; AHD_WIDE) ? 15 : 7;</div><div class='del'>-		if (ccb-&gt;ccb_h.target_id &gt; max_id)</div><div class='add'>+		max_id = (ahd-&gt;features &amp; AHD_WIDE) ? 16 : 8;</div><div class='add'>+		if (ccb-&gt;ccb_h.target_id &gt;= max_id)</div><div class='ctx'> 			return (CAM_TID_INVALID);</div><div class='ctx'> </div><div class='ctx'> 		if (ccb-&gt;ccb_h.target_lun &gt;= AHD_NUM_LUNS)</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c<br/>index 66e4a47bb9ee..b244c7124179 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_osm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_osm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx_osm.c</a></div><div class='hunk'>@@ -484,7 +484,6 @@ ahd_linux_target_alloc(struct scsi_target *starget)</div><div class='ctx'> 	struct seeprom_config *sc = ahd-&gt;seep_config;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct scsi_target **ahd_targp = ahd_linux_target_in_softc(starget);</div><div class='del'>-	struct ahd_linux_target *targ = scsi_transport_target_data(starget);</div><div class='ctx'> 	struct ahd_devinfo devinfo;</div><div class='ctx'> 	struct ahd_initiator_tinfo *tinfo;</div><div class='ctx'> 	struct ahd_tmode_tstate *tstate;</div><div class='hunk'>@@ -495,7 +494,6 @@ ahd_linux_target_alloc(struct scsi_target *starget)</div><div class='ctx'> 	BUG_ON(*ahd_targp != NULL);</div><div class='ctx'> </div><div class='ctx'> 	*ahd_targp = starget;</div><div class='del'>-	memset(targ, 0, sizeof(*targ));</div><div class='ctx'> </div><div class='ctx'> 	if (sc) {</div><div class='ctx'> 		int flags = sc-&gt;device_flags[starget-&gt;id];</div><div class='hunk'>@@ -551,15 +549,11 @@ ahd_linux_slave_alloc(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct	ahd_softc *ahd =</div><div class='ctx'> 		*((struct ahd_softc **)sdev-&gt;host-&gt;hostdata);</div><div class='del'>-	struct scsi_target *starget = sdev-&gt;sdev_target;</div><div class='del'>-	struct ahd_linux_target *targ = scsi_transport_target_data(starget);</div><div class='ctx'> 	struct ahd_linux_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (bootverbose)</div><div class='ctx'> 		printf("%s: Slave Alloc %d\n", ahd_name(ahd), sdev-&gt;id);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(targ-&gt;sdev[sdev-&gt;lun] != NULL);</div><div class='del'>-</div><div class='ctx'> 	dev = scsi_transport_device_data(sdev);</div><div class='ctx'> 	memset(dev, 0, sizeof(*dev));</div><div class='ctx'> </div><div class='hunk'>@@ -576,8 +570,6 @@ ahd_linux_slave_alloc(struct scsi_device *sdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev-&gt;maxtags = 0;</div><div class='ctx'> 	</div><div class='del'>-	targ-&gt;sdev[sdev-&gt;lun] = sdev;</div><div class='del'>-</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -599,23 +591,6 @@ ahd_linux_slave_configure(struct scsi_device *sdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-ahd_linux_slave_destroy(struct scsi_device *sdev)</div><div class='del'>-{</div><div class='del'>-	struct	ahd_softc *ahd;</div><div class='del'>-	struct	ahd_linux_device *dev = scsi_transport_device_data(sdev);</div><div class='del'>-	struct  ahd_linux_target *targ = scsi_transport_target_data(sdev-&gt;sdev_target);</div><div class='del'>-</div><div class='del'>-	ahd = *((struct ahd_softc **)sdev-&gt;host-&gt;hostdata);</div><div class='del'>-	if (bootverbose)</div><div class='del'>-		printf("%s: Slave Destroy %d\n", ahd_name(ahd), sdev-&gt;id);</div><div class='del'>-</div><div class='del'>-	BUG_ON(dev-&gt;active);</div><div class='del'>-</div><div class='del'>-	targ-&gt;sdev[sdev-&gt;lun] = NULL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #if defined(__i386__)</div><div class='ctx'> /*</div><div class='ctx'>  * Return the disk geometry for the given SCSI device.</div><div class='hunk'>@@ -822,7 +797,6 @@ struct scsi_host_template aic79xx_driver_template = {</div><div class='ctx'> 	.use_clustering		= ENABLE_CLUSTERING,</div><div class='ctx'> 	.slave_alloc		= ahd_linux_slave_alloc,</div><div class='ctx'> 	.slave_configure	= ahd_linux_slave_configure,</div><div class='del'>-	.slave_destroy		= ahd_linux_slave_destroy,</div><div class='ctx'> 	.target_alloc		= ahd_linux_target_alloc,</div><div class='ctx'> 	.target_destroy		= ahd_linux_target_destroy,</div><div class='ctx'> };</div><div class='hunk'>@@ -916,7 +890,7 @@ ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if ((instance &gt;= 0)</div><div class='del'>-	 &amp;&amp; (instance &lt; NUM_ELEMENTS(aic79xx_iocell_info))) {</div><div class='add'>+	 &amp;&amp; (instance &lt; ARRAY_SIZE(aic79xx_iocell_info))) {</div><div class='ctx'> 		uint8_t *iocell_info;</div><div class='ctx'> </div><div class='ctx'> 		iocell_info = (uint8_t*)&amp;aic79xx_iocell_info[instance];</div><div class='hunk'>@@ -934,7 +908,7 @@ ahd_linux_setup_tag_info_global(char *p)</div><div class='ctx'> 	tags = simple_strtoul(p + 1, NULL, 0) &amp; 0xff;</div><div class='ctx'> 	printf("Setting Global Tags= %d\n", tags);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_ELEMENTS(aic79xx_tag_info); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aic79xx_tag_info); i++) {</div><div class='ctx'> 		for (j = 0; j &lt; AHD_NUM_TARGETS; j++) {</div><div class='ctx'> 			aic79xx_tag_info[i].tag_commands[j] = tags;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -946,7 +920,7 @@ ahd_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if ((instance &gt;= 0) &amp;&amp; (targ &gt;= 0)</div><div class='del'>-	 &amp;&amp; (instance &lt; NUM_ELEMENTS(aic79xx_tag_info))</div><div class='add'>+	 &amp;&amp; (instance &lt; ARRAY_SIZE(aic79xx_tag_info))</div><div class='ctx'> 	 &amp;&amp; (targ &lt; AHD_NUM_TARGETS)) {</div><div class='ctx'> 		aic79xx_tag_info[instance].tag_commands[targ] = value &amp; 0x1FF;</div><div class='ctx'> 		if (bootverbose)</div><div class='hunk'>@@ -1072,21 +1046,21 @@ aic79xx_setup(char *s)</div><div class='ctx'> 	end = strchr(s, '\0');</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * XXX ia64 gcc isn't smart enough to know that NUM_ELEMENTS</div><div class='add'>+	 * XXX ia64 gcc isn't smart enough to know that ARRAY_SIZE</div><div class='ctx'> 	 * will never be 0 in this case.</div><div class='del'>-	 */      </div><div class='del'>-	n = 0;  </div><div class='add'>+	 */</div><div class='add'>+	n = 0;</div><div class='ctx'> </div><div class='ctx'> 	while ((p = strsep(&amp;s, ",.")) != NULL) {</div><div class='ctx'> 		if (*p == '\0')</div><div class='ctx'> 			continue;</div><div class='del'>-		for (i = 0; i &lt; NUM_ELEMENTS(options); i++) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(options); i++) {</div><div class='ctx'> </div><div class='ctx'> 			n = strlen(options[i].name);</div><div class='ctx'> 			if (strncmp(options[i].name, p, n) == 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		if (i == NUM_ELEMENTS(options))</div><div class='add'>+		if (i == ARRAY_SIZE(options))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (strncmp(p, "global_tag_depth", n) == 0) {</div><div class='hunk'>@@ -1249,20 +1223,13 @@ void</div><div class='ctx'> ahd_platform_free(struct ahd_softc *ahd)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_target *starget;</div><div class='del'>-	int i, j;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ahd-&gt;platform_data != NULL) {</div><div class='ctx'> 		/* destroy all of the device and target objects */</div><div class='ctx'> 		for (i = 0; i &lt; AHD_NUM_TARGETS; i++) {</div><div class='ctx'> 			starget = ahd-&gt;platform_data-&gt;starget[i];</div><div class='ctx'> 			if (starget != NULL) {</div><div class='del'>-				for (j = 0; j &lt; AHD_NUM_LUNS; j++) {</div><div class='del'>-					struct ahd_linux_target *targ =</div><div class='del'>-						scsi_transport_target_data(starget);</div><div class='del'>-					if (targ-&gt;sdev[j] == NULL)</div><div class='del'>-						continue;</div><div class='del'>-					targ-&gt;sdev[j] = NULL;</div><div class='del'>-				}</div><div class='ctx'> 				ahd-&gt;platform_data-&gt;starget[i] = NULL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1294,7 +1261,7 @@ ahd_platform_init(struct ahd_softc *ahd)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Lookup and commit any modified IO Cell options.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ahd-&gt;unit &lt; NUM_ELEMENTS(aic79xx_iocell_info)) {</div><div class='add'>+	if (ahd-&gt;unit &lt; ARRAY_SIZE(aic79xx_iocell_info)) {</div><div class='ctx'> 		struct ahd_linux_iocell_opts *iocell_opts;</div><div class='ctx'> </div><div class='ctx'> 		iocell_opts = &amp;aic79xx_iocell_info[ahd-&gt;unit];</div><div class='hunk'>@@ -1318,20 +1285,13 @@ ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='del'>-ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,</div><div class='del'>-		      ahd_queue_alg alg)</div><div class='add'>+ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,</div><div class='add'>+		      struct ahd_devinfo *devinfo, ahd_queue_alg alg)</div><div class='ctx'> {</div><div class='del'>-	struct scsi_target *starget;</div><div class='del'>-	struct ahd_linux_target *targ;</div><div class='ctx'> 	struct ahd_linux_device *dev;</div><div class='del'>-	struct scsi_device *sdev;</div><div class='ctx'> 	int was_queuing;</div><div class='ctx'> 	int now_queuing;</div><div class='ctx'> </div><div class='del'>-	starget = ahd-&gt;platform_data-&gt;starget[devinfo-&gt;target];</div><div class='del'>-	targ = scsi_transport_target_data(starget);</div><div class='del'>-	BUG_ON(targ == NULL);</div><div class='del'>-	sdev = targ-&gt;sdev[devinfo-&gt;lun];</div><div class='ctx'> 	if (sdev == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1426,7 +1386,7 @@ ahd_linux_user_tagdepth(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)</div><div class='ctx'> </div><div class='ctx'> 	tags = 0;</div><div class='ctx'> 	if ((ahd-&gt;user_discenable &amp; devinfo-&gt;target_mask) != 0) {</div><div class='del'>-		if (ahd-&gt;unit &gt;= NUM_ELEMENTS(aic79xx_tag_info)) {</div><div class='add'>+		if (ahd-&gt;unit &gt;= ARRAY_SIZE(aic79xx_tag_info)) {</div><div class='ctx'> </div><div class='ctx'> 			if (warned_user == 0) {</div><div class='ctx'> 				printf(KERN_WARNING</div><div class='hunk'>@@ -1467,11 +1427,15 @@ ahd_linux_device_queue_depth(struct scsi_device *sdev)</div><div class='ctx'> 	tags = ahd_linux_user_tagdepth(ahd, &amp;devinfo);</div><div class='ctx'> 	if (tags != 0 &amp;&amp; sdev-&gt;tagged_supported != 0) {</div><div class='ctx'> </div><div class='del'>-		ahd_set_tags(ahd, &amp;devinfo, AHD_QUEUE_TAGGED);</div><div class='add'>+		ahd_platform_set_tags(ahd, sdev, &amp;devinfo, AHD_QUEUE_TAGGED);</div><div class='add'>+		ahd_send_async(ahd, devinfo.channel, devinfo.target,</div><div class='add'>+			       devinfo.lun, AC_TRANSFER_NEG);</div><div class='ctx'> 		ahd_print_devinfo(ahd, &amp;devinfo);</div><div class='ctx'> 		printf("Tagged Queuing enabled.  Depth %d\n", tags);</div><div class='ctx'> 	} else {</div><div class='del'>-		ahd_set_tags(ahd, &amp;devinfo, AHD_QUEUE_NONE);</div><div class='add'>+		ahd_platform_set_tags(ahd, sdev, &amp;devinfo, AHD_QUEUE_NONE);</div><div class='add'>+		ahd_send_async(ahd, devinfo.channel, devinfo.target,</div><div class='add'>+			       devinfo.lun, AC_TRANSFER_NEG);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1629,7 +1593,7 @@ ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> ahd_send_async(struct ahd_softc *ahd, char channel,</div><div class='del'>-	       u_int target, u_int lun, ac_code code, void *arg)</div><div class='add'>+	       u_int target, u_int lun, ac_code code)</div><div class='ctx'> {</div><div class='ctx'> 	switch (code) {</div><div class='ctx'> 	case AC_TRANSFER_NEG:</div><div class='hunk'>@@ -1956,7 +1920,7 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,</div><div class='ctx'> 			}</div><div class='ctx'> 			ahd_set_transaction_status(scb, CAM_REQUEUE_REQ);</div><div class='ctx'> 			ahd_set_scsi_status(scb, SCSI_STATUS_OK);</div><div class='del'>-			ahd_platform_set_tags(ahd, &amp;devinfo,</div><div class='add'>+			ahd_platform_set_tags(ahd, sdev, &amp;devinfo,</div><div class='ctx'> 				     (dev-&gt;flags &amp; AHD_DEV_Q_BASIC)</div><div class='ctx'> 				   ? AHD_QUEUE_BASIC : AHD_QUEUE_TAGGED);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1966,7 +1930,7 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,</div><div class='ctx'> 		 * as if the target returned BUSY SCSI status.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev-&gt;openings = 1;</div><div class='del'>-		ahd_platform_set_tags(ahd, &amp;devinfo,</div><div class='add'>+		ahd_platform_set_tags(ahd, sdev, &amp;devinfo,</div><div class='ctx'> 			     (dev-&gt;flags &amp; AHD_DEV_Q_BASIC)</div><div class='ctx'> 			   ? AHD_QUEUE_BASIC : AHD_QUEUE_TAGGED);</div><div class='ctx'> 		ahd_set_scsi_status(scb, SCSI_STATUS_BUSY);</div><div class='hunk'>@@ -2778,8 +2742,6 @@ ahd_linux_init(void)</div><div class='ctx'> 	if (!ahd_linux_transport_template)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	scsi_transport_reserve_target(ahd_linux_transport_template,</div><div class='del'>-				      sizeof(struct ahd_linux_target));</div><div class='ctx'> 	scsi_transport_reserve_device(ahd_linux_transport_template,</div><div class='ctx'> 				      sizeof(struct ahd_linux_device));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h<br/>index 2b8331649eeb..601340d84410 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_osm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_osm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_osm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx_osm.h</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> #ifndef _AIC79XX_LINUX_H_</div><div class='ctx'> #define _AIC79XX_LINUX_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -94,7 +93,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /********************************** Misc Macros *******************************/</div><div class='del'>-#define	roundup(x, y)   ((((x)+((y)-1))/(y))*(y))</div><div class='ctx'> #define	powerof2(x)	((((x)-1)&amp;(x))==0)</div><div class='ctx'> </div><div class='ctx'> /************************* Forward Declarations *******************************/</div><div class='hunk'>@@ -263,7 +261,6 @@ typedef enum {</div><div class='ctx'> 	AHD_DEV_PERIODIC_OTAG	 = 0x40, /* Send OTAG to prevent starvation */</div><div class='ctx'> } ahd_linux_dev_flags;</div><div class='ctx'> </div><div class='del'>-struct ahd_linux_target;</div><div class='ctx'> struct ahd_linux_device {</div><div class='ctx'> 	TAILQ_ENTRY(ahd_linux_device) links;</div><div class='ctx'> </div><div class='hunk'>@@ -343,12 +340,6 @@ struct ahd_linux_device {</div><div class='ctx'> #define AHD_OTAG_THRESH	500</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ahd_linux_target {</div><div class='del'>-	struct scsi_device	 *sdev[AHD_NUM_LUNS];</div><div class='del'>-	struct ahd_transinfo	  last_tinfo;</div><div class='del'>-	struct ahd_softc	 *ahd;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /********************* Definitions Required by the Core ***********************/</div><div class='ctx'> /*</div><div class='ctx'>  * Number of SG segments we require.  So long as the S/G segments for</div><div class='hunk'>@@ -865,7 +856,7 @@ ahd_freeze_scb(struct scb *scb)</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void	ahd_platform_set_tags(struct ahd_softc *ahd,</div><div class='add'>+void	ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,</div><div class='ctx'> 			      struct ahd_devinfo *devinfo, ahd_queue_alg);</div><div class='ctx'> int	ahd_platform_abort_scbs(struct ahd_softc *ahd, int target,</div><div class='ctx'> 				char channel, int lun, u_int tag,</div><div class='hunk'>@@ -874,7 +865,7 @@ irqreturn_t</div><div class='ctx'> 	ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs);</div><div class='ctx'> void	ahd_done(struct ahd_softc*, struct scb*);</div><div class='ctx'> void	ahd_send_async(struct ahd_softc *, char channel,</div><div class='del'>-		       u_int target, u_int lun, ac_code, void *);</div><div class='add'>+		       u_int target, u_int lun, ac_code);</div><div class='ctx'> void	ahd_print_path(struct ahd_softc *, struct scb *);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c<br/>index ebbf7e4ff4cc..50a41eda580e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_osm_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_osm_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_osm_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx_osm_pci.c</a></div><div class='hunk'>@@ -342,7 +342,7 @@ ahd_pci_map_int(struct ahd_softc *ahd)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = request_irq(ahd-&gt;dev_softc-&gt;irq, ahd_linux_isr,</div><div class='del'>-			    SA_SHIRQ, "aic79xx", ahd);</div><div class='add'>+			    IRQF_SHARED, "aic79xx", ahd);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		ahd-&gt;platform_data-&gt;irq = ahd-&gt;dev_softc-&gt;irq;</div><div class='ctx'> 	</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c<br/>index 757242e522c2..14850f31aafa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx_pci.c</a></div><div class='hunk'>@@ -201,7 +201,7 @@ struct ahd_pci_identity ahd_pci_ident_table [] =</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const u_int ahd_num_pci_devs = NUM_ELEMENTS(ahd_pci_ident_table);</div><div class='add'>+const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table);</div><div class='ctx'> 		</div><div class='ctx'> #define	DEVCONFIG		0x40</div><div class='ctx'> #define		PCIXINITPAT	0x0000E000ul</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic79xx_proc.c b/drivers/scsi/aic7xxx/aic79xx_proc.c<br/>index 39a27840fce6..c5f0ee591509 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic79xx_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic79xx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic79xx_proc.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ static int	copy_info(struct info_str *info, char *fmt, ...);</div><div class='ctx'> static void	ahd_dump_target_state(struct ahd_softc *ahd,</div><div class='ctx'> 				      struct info_str *info,</div><div class='ctx'> 				      u_int our_id, char channel,</div><div class='del'>-				      u_int target_id, u_int target_offset);</div><div class='add'>+				      u_int target_id);</div><div class='ctx'> static void	ahd_dump_device_state(struct info_str *info,</div><div class='ctx'> 				      struct scsi_device *sdev);</div><div class='ctx'> static int	ahd_proc_write_seeprom(struct ahd_softc *ahd,</div><div class='hunk'>@@ -76,11 +76,9 @@ static u_int</div><div class='ctx'> ahd_calc_syncsrate(u_int period_factor)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int num_syncrates;</div><div class='ctx'> </div><div class='del'>-	num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);</div><div class='ctx'> 	/* See if the period is in the "exception" table */</div><div class='del'>-	for (i = 0; i &lt; num_syncrates; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(scsi_syncrates); i++) {</div><div class='ctx'> </div><div class='ctx'> 		if (period_factor == scsi_syncrates[i].period_factor) {</div><div class='ctx'> 			/* Period in kHz */</div><div class='hunk'>@@ -206,10 +204,8 @@ ahd_format_transinfo(struct info_str *info, struct ahd_transinfo *tinfo)</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,</div><div class='del'>-		      u_int our_id, char channel, u_int target_id,</div><div class='del'>-		      u_int target_offset)</div><div class='add'>+		      u_int our_id, char channel, u_int target_id)</div><div class='ctx'> {</div><div class='del'>-	struct	ahd_linux_target *targ;</div><div class='ctx'> 	struct  scsi_target *starget;</div><div class='ctx'> 	struct	ahd_initiator_tinfo *tinfo;</div><div class='ctx'> 	struct	ahd_tmode_tstate *tstate;</div><div class='hunk'>@@ -220,10 +216,9 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,</div><div class='ctx'> 	copy_info(info, "Target %d Negotiation Settings\n", target_id);</div><div class='ctx'> 	copy_info(info, "\tUser: ");</div><div class='ctx'> 	ahd_format_transinfo(info, &amp;tinfo-&gt;user);</div><div class='del'>-	starget = ahd-&gt;platform_data-&gt;starget[target_offset];</div><div class='add'>+	starget = ahd-&gt;platform_data-&gt;starget[target_id];</div><div class='ctx'> 	if (starget == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	targ = scsi_transport_target_data(starget);</div><div class='ctx'> </div><div class='ctx'> 	copy_info(info, "\tGoal: ");</div><div class='ctx'> 	ahd_format_transinfo(info, &amp;tinfo-&gt;goal);</div><div class='hunk'>@@ -233,7 +228,7 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,</div><div class='ctx'> 	for (lun = 0; lun &lt; AHD_NUM_LUNS; lun++) {</div><div class='ctx'> 		struct scsi_device *dev;</div><div class='ctx'> </div><div class='del'>-		dev = targ-&gt;sdev[lun];</div><div class='add'>+		dev = scsi_device_lookup_by_target(starget, lun);</div><div class='ctx'> </div><div class='ctx'> 		if (dev == NULL)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -357,7 +352,7 @@ ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,</div><div class='ctx'> 	copy_info(&amp;info, "Allocated SCBs: %d, SG List Length: %d\n\n",</div><div class='ctx'> 		  ahd-&gt;scb_data.numscbs, AHD_NSEG);</div><div class='ctx'> </div><div class='del'>-	max_targ = 15;</div><div class='add'>+	max_targ = 16;</div><div class='ctx'> </div><div class='ctx'> 	if (ahd-&gt;seep_config == NULL)</div><div class='ctx'> 		copy_info(&amp;info, "No Serial EEPROM\n");</div><div class='hunk'>@@ -375,12 +370,12 @@ ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,</div><div class='ctx'> 	copy_info(&amp;info, "\n");</div><div class='ctx'> </div><div class='ctx'> 	if ((ahd-&gt;features &amp; AHD_WIDE) == 0)</div><div class='del'>-		max_targ = 7;</div><div class='add'>+		max_targ = 8;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt;= max_targ; i++) {</div><div class='add'>+	for (i = 0; i &lt; max_targ; i++) {</div><div class='ctx'> </div><div class='ctx'> 		ahd_dump_target_state(ahd, &amp;info, ahd-&gt;our_id, 'A',</div><div class='del'>-				      /*target_id*/i, /*target_offset*/i);</div><div class='add'>+				      /*target_id*/i);</div><div class='ctx'> 	}</div><div class='ctx'> 	retval = info.pos &gt; info.offset ? info.pos - info.offset : 0;</div><div class='ctx'> done:</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h<br/>index 91d294c6334e..62ff8c3dc2bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx.h</a></div><div class='hunk'>@@ -69,8 +69,6 @@ struct seeprom_descriptor;</div><div class='ctx'> #define FALSE 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array))</div><div class='del'>-</div><div class='ctx'> #define ALL_CHANNELS '\0'</div><div class='ctx'> #define ALL_TARGETS_MASK 0xFFFF</div><div class='ctx'> #define INITIATOR_WILDCARD	(~0)</div><div class='hunk'>@@ -233,6 +231,7 @@ typedef enum {</div><div class='ctx'> 	AHC_TARGETMODE	= 0x20000,	/* Has tested target mode support */</div><div class='ctx'> 	AHC_MULTIROLE	= 0x40000,	/* Space for two roles at a time */</div><div class='ctx'> 	AHC_REMOVABLE	= 0x80000,	/* Hot-Swap supported */</div><div class='add'>+	AHC_HVD		= 0x100000,	/* HVD rather than SE */</div><div class='ctx'> 	AHC_AIC7770_FE	= AHC_FENONE,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The real 7850 does not support Ultra modes, but there are</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c<br/>index d37566978fba..93e4e40944b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx_core.c</a></div><div class='hunk'>@@ -68,7 +68,7 @@ char *ahc_chip_names[] =</div><div class='ctx'> 	"aic7892",</div><div class='ctx'> 	"aic7899"</div><div class='ctx'> };</div><div class='del'>-static const u_int num_chip_names = NUM_ELEMENTS(ahc_chip_names);</div><div class='add'>+static const u_int num_chip_names = ARRAY_SIZE(ahc_chip_names);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Hardware error codes.</div><div class='hunk'>@@ -88,7 +88,7 @@ static struct ahc_hard_error_entry ahc_hard_errors[] = {</div><div class='ctx'> 	{ PCIERRSTAT,	"PCI Error detected" },</div><div class='ctx'> 	{ CIOPARERR,	"CIOBUS Parity Error" },</div><div class='ctx'> };</div><div class='del'>-static const u_int num_errors = NUM_ELEMENTS(ahc_hard_errors);</div><div class='add'>+static const u_int num_errors = ARRAY_SIZE(ahc_hard_errors);</div><div class='ctx'> </div><div class='ctx'> static struct ahc_phase_table_entry ahc_phase_table[] =</div><div class='ctx'> {</div><div class='hunk'>@@ -108,7 +108,7 @@ static struct ahc_phase_table_entry ahc_phase_table[] =</div><div class='ctx'>  * In most cases we only wish to itterate over real phases, so</div><div class='ctx'>  * exclude the last element from the count.</div><div class='ctx'>  */</div><div class='del'>-static const u_int num_phases = NUM_ELEMENTS(ahc_phase_table) - 1;</div><div class='add'>+static const u_int num_phases = ARRAY_SIZE(ahc_phase_table) - 1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Valid SCSIRATE values.  (p. 3-17)</div><div class='hunk'>@@ -6367,7 +6367,7 @@ ahc_check_patch(struct ahc_softc *ahc, struct patch **start_patch,</div><div class='ctx'> 	struct	patch *last_patch;</div><div class='ctx'> 	u_int	num_patches;</div><div class='ctx'> </div><div class='del'>-	num_patches = sizeof(patches)/sizeof(struct patch);</div><div class='add'>+	num_patches = ARRAY_SIZE(patches);</div><div class='ctx'> 	last_patch = &amp;patches[num_patches];</div><div class='ctx'> 	cur_patch = *start_patch;</div><div class='ctx'> </div><div class='hunk'>@@ -6774,8 +6774,8 @@ ahc_find_tmode_devs(struct ahc_softc *ahc, struct cam_sim *sim, union ccb *ccb,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u_int max_id;</div><div class='ctx'> </div><div class='del'>-		max_id = (ahc-&gt;features &amp; AHC_WIDE) ? 15 : 7;</div><div class='del'>-		if (ccb-&gt;ccb_h.target_id &gt; max_id)</div><div class='add'>+		max_id = (ahc-&gt;features &amp; AHC_WIDE) ? 16 : 8;</div><div class='add'>+		if (ccb-&gt;ccb_h.target_id &gt;= max_id)</div><div class='ctx'> 			return (CAM_TID_INVALID);</div><div class='ctx'> </div><div class='ctx'> 		if (ccb-&gt;ccb_h.target_lun &gt;= AHC_NUM_LUNS)</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c<br/>index 2c801672d8bb..debf3e2a0798 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_osm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx_osm.c</a></div><div class='hunk'>@@ -886,7 +886,7 @@ ahc_linux_setup_tag_info_global(char *p)</div><div class='ctx'> 	tags = simple_strtoul(p + 1, NULL, 0) &amp; 0xff;</div><div class='ctx'> 	printf("Setting Global Tags= %d\n", tags);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_ELEMENTS(aic7xxx_tag_info); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(aic7xxx_tag_info); i++) {</div><div class='ctx'> 		for (j = 0; j &lt; AHC_NUM_TARGETS; j++) {</div><div class='ctx'> 			aic7xxx_tag_info[i].tag_commands[j] = tags;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -898,7 +898,7 @@ ahc_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if ((instance &gt;= 0) &amp;&amp; (targ &gt;= 0)</div><div class='del'>-	 &amp;&amp; (instance &lt; NUM_ELEMENTS(aic7xxx_tag_info))</div><div class='add'>+	 &amp;&amp; (instance &lt; ARRAY_SIZE(aic7xxx_tag_info))</div><div class='ctx'> 	 &amp;&amp; (targ &lt; AHC_NUM_TARGETS)) {</div><div class='ctx'> 		aic7xxx_tag_info[instance].tag_commands[targ] = value &amp; 0xff;</div><div class='ctx'> 		if (bootverbose)</div><div class='hunk'>@@ -1020,7 +1020,7 @@ aic7xxx_setup(char *s)</div><div class='ctx'> 	end = strchr(s, '\0');</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * XXX ia64 gcc isn't smart enough to know that NUM_ELEMENTS</div><div class='add'>+	 * XXX ia64 gcc isn't smart enough to know that ARRAY_SIZE</div><div class='ctx'> 	 * will never be 0 in this case.</div><div class='ctx'> 	 */</div><div class='ctx'> 	n = 0;</div><div class='hunk'>@@ -1028,13 +1028,13 @@ aic7xxx_setup(char *s)</div><div class='ctx'> 	while ((p = strsep(&amp;s, ",.")) != NULL) {</div><div class='ctx'> 		if (*p == '\0')</div><div class='ctx'> 			continue;</div><div class='del'>-		for (i = 0; i &lt; NUM_ELEMENTS(options); i++) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(options); i++) {</div><div class='ctx'> </div><div class='ctx'> 			n = strlen(options[i].name);</div><div class='ctx'> 			if (strncmp(options[i].name, p, n) == 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		if (i == NUM_ELEMENTS(options))</div><div class='add'>+		if (i == ARRAY_SIZE(options))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (strncmp(p, "global_tag_depth", n) == 0) {</div><div class='hunk'>@@ -1360,7 +1360,7 @@ ahc_linux_user_tagdepth(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)</div><div class='ctx'> </div><div class='ctx'> 	tags = 0;</div><div class='ctx'> 	if ((ahc-&gt;user_discenable &amp; devinfo-&gt;target_mask) != 0) {</div><div class='del'>-		if (ahc-&gt;unit &gt;= NUM_ELEMENTS(aic7xxx_tag_info)) {</div><div class='add'>+		if (ahc-&gt;unit &gt;= ARRAY_SIZE(aic7xxx_tag_info)) {</div><div class='ctx'> 			if (warned_user == 0) {</div><div class='ctx'> </div><div class='ctx'> 				printf(KERN_WARNING</div><div class='hunk'>@@ -2537,6 +2537,22 @@ static void ahc_linux_set_iu(struct scsi_target *starget, int iu)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void ahc_linux_get_signalling(struct Scsi_Host *shost)</div><div class='add'>+{</div><div class='add'>+	struct ahc_softc *ahc = *(struct ahc_softc **)shost-&gt;hostdata;</div><div class='add'>+	u8 mode = ahc_inb(ahc, SBLKCTL);</div><div class='add'>+</div><div class='add'>+	if (mode &amp; ENAB40)</div><div class='add'>+		spi_signalling(shost) = SPI_SIGNAL_LVD;</div><div class='add'>+	else if (mode &amp; ENAB20)</div><div class='add'>+		spi_signalling(shost) = </div><div class='add'>+			ahc-&gt;features &amp; AHC_HVD ?</div><div class='add'>+			SPI_SIGNAL_HVD :</div><div class='add'>+			SPI_SIGNAL_SE;</div><div class='add'>+	else</div><div class='add'>+		spi_signalling(shost) = SPI_SIGNAL_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct spi_function_template ahc_linux_transport_functions = {</div><div class='ctx'> 	.set_offset	= ahc_linux_set_offset,</div><div class='ctx'> 	.show_offset	= 1,</div><div class='hunk'>@@ -2552,6 +2568,7 @@ static struct spi_function_template ahc_linux_transport_functions = {</div><div class='ctx'> 	.set_qas	= ahc_linux_set_qas,</div><div class='ctx'> 	.show_qas	= 1,</div><div class='ctx'> #endif</div><div class='add'>+	.get_signalling	= ahc_linux_get_signalling,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h<br/>index a20b08c9ff15..d42a71ee076d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_osm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx_osm.h</a></div><div class='hunk'>@@ -59,7 +59,6 @@</div><div class='ctx'> #ifndef _AIC7XXX_LINUX_H_</div><div class='ctx'> #define _AIC7XXX_LINUX_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c<br/>index 0c9c2f400bf6..7e42f07a27f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_osm_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx_osm_pci.c</a></div><div class='hunk'>@@ -375,7 +375,7 @@ ahc_pci_map_int(struct ahc_softc *ahc)</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='ctx'> 	error = request_irq(ahc-&gt;dev_softc-&gt;irq, ahc_linux_isr,</div><div class='del'>-			    SA_SHIRQ, "aic7xxx", ahc);</div><div class='add'>+			    IRQF_SHARED, "aic7xxx", ahc);</div><div class='ctx'> 	if (error == 0)</div><div class='ctx'> 		ahc-&gt;platform_data-&gt;irq = ahc-&gt;dev_softc-&gt;irq;</div><div class='ctx'> 	</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c<br/>index 3adecef21783..63cab2d74552 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx_pci.c</a></div><div class='hunk'>@@ -144,16 +144,22 @@ static ahc_device_setup_t ahc_aic785X_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7860_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_apa1480_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7870_setup;</div><div class='add'>+static ahc_device_setup_t ahc_aic7870h_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha394X_setup;</div><div class='add'>+static ahc_device_setup_t ahc_aha394Xh_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha494X_setup;</div><div class='add'>+static ahc_device_setup_t ahc_aha494Xh_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha398X_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7880_setup;</div><div class='add'>+static ahc_device_setup_t ahc_aic7880h_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha2940Pro_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha394XU_setup;</div><div class='add'>+static ahc_device_setup_t ahc_aha394XUh_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha398XU_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7890_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7892_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7895_setup;</div><div class='add'>+static ahc_device_setup_t ahc_aic7895h_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7896_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aic7899_setup;</div><div class='ctx'> static ahc_device_setup_t ahc_aha29160C_setup;</div><div class='hunk'>@@ -225,19 +231,19 @@ struct ahc_pci_identity ahc_pci_ident_table [] =</div><div class='ctx'> 		ID_AHA_2944,</div><div class='ctx'> 		ID_ALL_MASK,</div><div class='ctx'> 		"Adaptec 2944 SCSI adapter",</div><div class='del'>-		ahc_aic7870_setup</div><div class='add'>+		ahc_aic7870h_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		ID_AHA_3944,</div><div class='ctx'> 		ID_ALL_MASK,</div><div class='ctx'> 		"Adaptec 3944 SCSI adapter",</div><div class='del'>-		ahc_aha394X_setup</div><div class='add'>+		ahc_aha394Xh_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		ID_AHA_4944,</div><div class='ctx'> 		ID_ALL_MASK,</div><div class='ctx'> 		"Adaptec 4944 SCSI adapter",</div><div class='del'>-		ahc_aha494X_setup</div><div class='add'>+		ahc_aha494Xh_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	/* aic7880 based controllers */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -256,13 +262,13 @@ struct ahc_pci_identity ahc_pci_ident_table [] =</div><div class='ctx'> 		ID_AHA_2944U &amp; ID_DEV_VENDOR_MASK,</div><div class='ctx'> 		ID_DEV_VENDOR_MASK,</div><div class='ctx'> 		"Adaptec 2944 Ultra SCSI adapter",</div><div class='del'>-		ahc_aic7880_setup</div><div class='add'>+		ahc_aic7880h_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		ID_AHA_3944U &amp; ID_DEV_VENDOR_MASK,</div><div class='ctx'> 		ID_DEV_VENDOR_MASK,</div><div class='ctx'> 		"Adaptec 3944 Ultra SCSI adapter",</div><div class='del'>-		ahc_aha394XU_setup</div><div class='add'>+		ahc_aha394XUh_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		ID_AHA_398XU &amp; ID_DEV_VENDOR_MASK,</div><div class='hunk'>@@ -278,7 +284,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =</div><div class='ctx'> 		ID_AHA_4944U &amp; ID_DEV_VENDOR_MASK,</div><div class='ctx'> 		ID_DEV_VENDOR_MASK,</div><div class='ctx'> 		"Adaptec 4944 Ultra SCSI adapter",</div><div class='del'>-		ahc_aic7880_setup</div><div class='add'>+		ahc_aic7880h_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		ID_AHA_2930U &amp; ID_DEV_VENDOR_MASK,</div><div class='hunk'>@@ -414,7 +420,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =</div><div class='ctx'> 		ID_AHA_3944AU,</div><div class='ctx'> 		ID_ALL_MASK,</div><div class='ctx'> 		"Adaptec 3944A Ultra SCSI adapter",</div><div class='del'>-		ahc_aic7895_setup</div><div class='add'>+		ahc_aic7895h_setup</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		ID_AIC7895_ARO,</div><div class='hunk'>@@ -553,7 +559,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const u_int ahc_num_pci_devs = NUM_ELEMENTS(ahc_pci_ident_table);</div><div class='add'>+const u_int ahc_num_pci_devs = ARRAY_SIZE(ahc_pci_ident_table);</div><div class='ctx'> 		</div><div class='ctx'> #define AHC_394X_SLOT_CHANNEL_A	4</div><div class='ctx'> #define AHC_394X_SLOT_CHANNEL_B	5</div><div class='hunk'>@@ -2121,6 +2127,16 @@ ahc_aic7870_setup(struct ahc_softc *ahc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ahc_aic7870h_setup(struct ahc_softc *ahc)</div><div class='add'>+{</div><div class='add'>+	int error = ahc_aic7870_setup(ahc);</div><div class='add'>+</div><div class='add'>+	ahc-&gt;features |= AHC_HVD;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ahc_aha394X_setup(struct ahc_softc *ahc)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -2132,6 +2148,16 @@ ahc_aha394X_setup(struct ahc_softc *ahc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ahc_aha394Xh_setup(struct ahc_softc *ahc)</div><div class='add'>+{</div><div class='add'>+	int error = ahc_aha394X_setup(ahc);</div><div class='add'>+</div><div class='add'>+	ahc-&gt;features |= AHC_HVD;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ahc_aha398X_setup(struct ahc_softc *ahc)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -2154,6 +2180,16 @@ ahc_aha494X_setup(struct ahc_softc *ahc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ahc_aha494Xh_setup(struct ahc_softc *ahc)</div><div class='add'>+{</div><div class='add'>+	int error = ahc_aha494X_setup(ahc);</div><div class='add'>+</div><div class='add'>+	ahc-&gt;features |= AHC_HVD;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ahc_aic7880_setup(struct ahc_softc *ahc)</div><div class='ctx'> {</div><div class='ctx'> 	ahc_dev_softc_t pci;</div><div class='hunk'>@@ -2175,6 +2211,17 @@ ahc_aic7880_setup(struct ahc_softc *ahc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ahc_aic7880h_setup(struct ahc_softc *ahc)</div><div class='add'>+{</div><div class='add'>+	int error = ahc_aic7880_setup(ahc);</div><div class='add'>+</div><div class='add'>+	ahc-&gt;features |= AHC_HVD;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ahc_aha2940Pro_setup(struct ahc_softc *ahc)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='hunk'>@@ -2194,6 +2241,16 @@ ahc_aha394XU_setup(struct ahc_softc *ahc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ahc_aha394XUh_setup(struct ahc_softc *ahc)</div><div class='add'>+{</div><div class='add'>+	int error = ahc_aha394XU_setup(ahc);</div><div class='add'>+</div><div class='add'>+	ahc-&gt;features |= AHC_HVD;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ahc_aha398XU_setup(struct ahc_softc *ahc)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -2292,6 +2349,16 @@ ahc_aic7895_setup(struct ahc_softc *ahc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+ahc_aic7895h_setup(struct ahc_softc *ahc)</div><div class='add'>+{</div><div class='add'>+	int error = ahc_aic7895_setup(ahc);</div><div class='add'>+</div><div class='add'>+	ahc-&gt;features |= AHC_HVD;</div><div class='add'>+</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> ahc_aic7896_setup(struct ahc_softc *ahc)</div><div class='ctx'> {</div><div class='ctx'> 	ahc_dev_softc_t pci;</div><div class='head'>diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c<br/>index 04a3506cf340..5914b4aa4a8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx/aic7xxx_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx/aic7xxx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx/aic7xxx_proc.c</a></div><div class='hunk'>@@ -77,11 +77,9 @@ static u_int</div><div class='ctx'> ahc_calc_syncsrate(u_int period_factor)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int num_syncrates;</div><div class='ctx'> </div><div class='del'>-	num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);</div><div class='ctx'> 	/* See if the period is in the "exception" table */</div><div class='del'>-	for (i = 0; i &lt; num_syncrates; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(scsi_syncrates); i++) {</div><div class='ctx'> </div><div class='ctx'> 		if (period_factor == scsi_syncrates[i].period_factor) {</div><div class='ctx'> 			/* Period in kHz */</div><div class='head'>diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c<br/>index 770f1647e4d6..3f85b5e978f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx_old.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx_old.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx_old.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx_old.c</a></div><div class='hunk'>@@ -1565,7 +1565,7 @@ aic7xxx_check_patch(struct aic7xxx_host *p,</div><div class='ctx'>   struct sequencer_patch *last_patch;</div><div class='ctx'>   int num_patches;</div><div class='ctx'> </div><div class='del'>-  num_patches = sizeof(sequencer_patches)/sizeof(struct sequencer_patch);</div><div class='add'>+  num_patches = ARRAY_SIZE(sequencer_patches);</div><div class='ctx'>   last_patch = &amp;sequencer_patches[num_patches];</div><div class='ctx'>   cur_patch = *start_patch;</div><div class='ctx'> </div><div class='hunk'>@@ -8322,11 +8322,11 @@ aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,</div><div class='ctx'>   }</div><div class='ctx'>   else</div><div class='ctx'>   {</div><div class='del'>-    result = (request_irq(p-&gt;irq, do_aic7xxx_isr, SA_SHIRQ,</div><div class='add'>+    result = (request_irq(p-&gt;irq, do_aic7xxx_isr, IRQF_SHARED,</div><div class='ctx'>               "aic7xxx", p));</div><div class='ctx'>     if (result &lt; 0)</div><div class='ctx'>     {</div><div class='del'>-      result = (request_irq(p-&gt;irq, do_aic7xxx_isr, SA_INTERRUPT | SA_SHIRQ,</div><div class='add'>+      result = (request_irq(p-&gt;irq, do_aic7xxx_isr, IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'>               "aic7xxx", p));</div><div class='ctx'>     }</div><div class='ctx'>   }</div><div class='head'>diff --git a/drivers/scsi/aic7xxx_old/aic7xxx_proc.c b/drivers/scsi/aic7xxx_old/aic7xxx_proc.c<br/>index 3bf334931a8a..b07e4f04fd00 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx_old/aic7xxx_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/aic7xxx_old/aic7xxx_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/aic7xxx_old/aic7xxx_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/aic7xxx_old/aic7xxx_proc.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *  $Id: aic7xxx_proc.c,v 4.1 1997/06/97 08:23:42 deang Exp $</div><div class='ctx'>  *-M*************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define	BLS	(&amp;aic7xxx_buffer[size])</div><div class='ctx'> #define HDRB \</div><div class='head'>diff --git a/drivers/scsi/amiga7xx.c b/drivers/scsi/amiga7xx.c<br/>index c0844fa32c5d..9099d531d5a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/amiga7xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/amiga7xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/amiga7xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/amiga7xx.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c<br/>index dda5a5f79c53..7621e3fa37b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/arm/acornscsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/acornscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/arm/acornscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/arm/acornscsi.c</a></div><div class='hunk'>@@ -129,7 +129,6 @@</div><div class='ctx'> #define STRx(x) STRINGIFY(x)</div><div class='ctx'> #define NO_WRITE_STR STRx(NO_WRITE)</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -3031,7 +3030,7 @@ acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)</div><div class='ctx'> 	if (!request_region(host-&gt;io_port, 2048, "acornscsi(ram)"))</div><div class='ctx'> 		goto err_5;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(host-&gt;irq, acornscsi_intr, SA_INTERRUPT, "acornscsi", ashost);</div><div class='add'>+	ret = request_irq(host-&gt;irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n",</div><div class='ctx'> 			host-&gt;host_no, ashost-&gt;scsi.irq, ret);</div><div class='head'>diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c<br/>index e6c9491dc5c0..3bdfc36481ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/arm/cumana_1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/cumana_1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/arm/cumana_1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/arm/cumana_1.c</a></div><div class='hunk'>@@ -277,7 +277,7 @@ cumanascsi1_probe(struct expansion_card *ec, const struct ecard_id *id)</div><div class='ctx'>         ((struct NCR5380_hostdata *)host-&gt;hostdata)-&gt;ctrl = 0;</div><div class='ctx'>         outb(0x00, host-&gt;io_port - 577);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(host-&gt;irq, cumanascsi_intr, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(host-&gt;irq, cumanascsi_intr, IRQF_DISABLED,</div><div class='ctx'> 			  "CumanaSCSI-1", host);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk("scsi%d: IRQ%d not free: %d\n",</div><div class='head'>diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c<br/>index fad2109268bb..719af0dcc0e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/arm/cumana_2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/cumana_2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/arm/cumana_2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/arm/cumana_2.c</a></div><div class='hunk'>@@ -460,7 +460,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(ec-&gt;irq, cumanascsi_2_intr,</div><div class='del'>-			  SA_INTERRUPT, "cumanascsi2", info);</div><div class='add'>+			  IRQF_DISABLED, "cumanascsi2", info);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk("scsi%d: IRQ%d not free: %d\n",</div><div class='ctx'> 		       host-&gt;host_no, ec-&gt;irq, ret);</div><div class='head'>diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c<br/>index 3d69f6c45a6b..b2c346a47052 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/arm/powertec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/powertec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/arm/powertec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/arm/powertec.c</a></div><div class='hunk'>@@ -373,7 +373,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(ec-&gt;irq, powertecscsi_intr,</div><div class='del'>-			  SA_INTERRUPT, "powertec", info);</div><div class='add'>+			  IRQF_DISABLED, "powertec", info);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk("scsi%d: IRQ%d not free: %d\n",</div><div class='ctx'> 		       host-&gt;host_no, ec-&gt;irq, ret);</div><div class='head'>diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c<br/>index b10750bb5c09..8caa5903ce38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/arm/queue.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/arm/queue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/arm/queue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/arm/queue.c</a></div><div class='hunk'>@@ -118,8 +118,7 @@ int __queue_add(Queue_t *queue, Scsi_Cmnd *SCpnt, int head)</div><div class='ctx'> 	list_del(l);</div><div class='ctx'> </div><div class='ctx'> 	q = list_entry(l, QE_t, list);</div><div class='del'>-	if (BAD_MAGIC(q, QUEUE_MAGIC_FREE))</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_FREE));</div><div class='ctx'> </div><div class='ctx'> 	SET_MAGIC(q, QUEUE_MAGIC_USED);</div><div class='ctx'> 	q-&gt;SCpnt = SCpnt;</div><div class='hunk'>@@ -144,8 +143,7 @@ static Scsi_Cmnd *__queue_remove(Queue_t *queue, struct list_head *ent)</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_del(ent);</div><div class='ctx'> 	q = list_entry(ent, QE_t, list);</div><div class='del'>-	if (BAD_MAGIC(q, QUEUE_MAGIC_USED))</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_USED));</div><div class='ctx'> </div><div class='ctx'> 	SET_MAGIC(q, QUEUE_MAGIC_FREE);</div><div class='ctx'> 	list_add(ent, &amp;queue-&gt;free);</div><div class='head'>diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c<br/>index 6dc88149f9f1..94b1261a259d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ata_piix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ata_piix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ata_piix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ata_piix.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ata_piix"</div><div class='del'>-#define DRV_VERSION	"1.05"</div><div class='add'>+#define DRV_VERSION	"2.00"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	PIIX_IOCFG		= 0x54, /* IDE I/O configuration register */</div><div class='hunk'>@@ -146,11 +146,10 @@ struct piix_map_db {</div><div class='ctx'> </div><div class='ctx'> static int piix_init_one (struct pci_dev *pdev,</div><div class='ctx'> 				    const struct pci_device_id *ent);</div><div class='del'>-</div><div class='del'>-static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes);</div><div class='del'>-static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes);</div><div class='ctx'> static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);</div><div class='ctx'> static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);</div><div class='add'>+static void piix_pata_error_handler(struct ata_port *ap);</div><div class='add'>+static void piix_sata_error_handler(struct ata_port *ap);</div><div class='ctx'> </div><div class='ctx'> static unsigned int in_module_init = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -159,6 +158,7 @@ static const struct pci_device_id piix_pci_tbl[] = {</div><div class='ctx'> 	{ 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix4_pata },</div><div class='ctx'> 	{ 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },</div><div class='ctx'> 	{ 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },</div><div class='add'>+	{ 0x8086, 0x27df, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE: The following PCI ids must be kept in sync with the</div><div class='hunk'>@@ -218,6 +218,7 @@ static struct scsi_host_template piix_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> 	.resume			= ata_scsi_device_resume,</div><div class='ctx'> 	.suspend		= ata_scsi_device_suspend,</div><div class='hunk'>@@ -227,6 +228,7 @@ static const struct ata_port_operations piix_pata_ops = {</div><div class='ctx'> 	.port_disable		= ata_port_disable,</div><div class='ctx'> 	.set_piomode		= piix_set_piomode,</div><div class='ctx'> 	.set_dmamode		= piix_set_dmamode,</div><div class='add'>+	.mode_filter		= ata_pci_default_filter,</div><div class='ctx'> </div><div class='ctx'> 	.tf_load		= ata_tf_load,</div><div class='ctx'> 	.tf_read		= ata_tf_read,</div><div class='hunk'>@@ -234,16 +236,18 @@ static const struct ata_port_operations piix_pata_ops = {</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='ctx'> </div><div class='del'>-	.probe_reset		= piix_pata_probe_reset,</div><div class='del'>-</div><div class='ctx'> 	.bmdma_setup		= ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start		= ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='ctx'> </div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= piix_pata_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> </div><div class='ctx'> 	.irq_handler		= ata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='hunk'>@@ -262,16 +266,18 @@ static const struct ata_port_operations piix_sata_ops = {</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='ctx'> </div><div class='del'>-	.probe_reset		= piix_sata_probe_reset,</div><div class='del'>-</div><div class='ctx'> 	.bmdma_setup		= ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start		= ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='ctx'> </div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= piix_sata_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> </div><div class='ctx'> 	.irq_handler		= ata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='hunk'>@@ -455,59 +461,51 @@ cbl40:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	piix_pata_probeinit - probeinit for PATA host controller</div><div class='add'>+ *	piix_pata_prereset - prereset for PATA host controller</div><div class='ctx'>  *	@ap: Target port</div><div class='ctx'>  *</div><div class='del'>- *	Probeinit including cable detection.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	None (inherited from caller).</div><div class='del'>- */</div><div class='del'>-static void piix_pata_probeinit(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	piix_pata_cbl_detect(ap);</div><div class='del'>-	ata_std_probeinit(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	piix_pata_probe_reset - Perform reset on PATA port and classify</div><div class='del'>- *	@ap: Port to reset</div><div class='del'>- *	@classes: Resulting classes of attached devices</div><div class='del'>- *</div><div class='del'>- *	Reset PATA phy and classify attached devices.</div><div class='add'>+ *	Prereset including cable detection.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	None (inherited from caller).</div><div class='ctx'>  */</div><div class='del'>-static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes)</div><div class='add'>+static int piix_pata_prereset(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ap-&gt;host_set-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!pci_test_config_bits(pdev, &amp;piix_enable_bits[ap-&gt;hard_port_no])) {</div><div class='del'>-		printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap-&gt;id);</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "port disabled. ignoring.\n");</div><div class='add'>+		ap-&gt;eh_context.i.action &amp;= ~ATA_EH_RESET_MASK;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ata_drive_probe_reset(ap, piix_pata_probeinit,</div><div class='del'>-				     ata_std_softreset, NULL,</div><div class='del'>-				     ata_std_postreset, classes);</div><div class='add'>+	piix_pata_cbl_detect(ap);</div><div class='add'>+</div><div class='add'>+	return ata_std_prereset(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void piix_pata_error_handler(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	ata_bmdma_drive_eh(ap, piix_pata_prereset, ata_std_softreset, NULL,</div><div class='add'>+			   ata_std_postreset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	piix_sata_probe - Probe PCI device for present SATA devices</div><div class='del'>- *	@ap: Port associated with the PCI device we wish to probe</div><div class='add'>+ *	piix_sata_prereset - prereset for SATA host controller</div><div class='add'>+ *	@ap: Target port</div><div class='ctx'>  *</div><div class='ctx'>  *	Reads and configures SATA PCI device's PCI config register</div><div class='ctx'>  *	Port Configuration and Status (PCS) to determine port and</div><div class='del'>- *	device availability.</div><div class='add'>+ *	device availability.  Return -ENODEV to skip reset if no</div><div class='add'>+ *	device is present.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	None (inherited from caller).</div><div class='ctx'>  *</div><div class='ctx'>  *	RETURNS:</div><div class='del'>- *	Mask of avaliable devices on the port.</div><div class='add'>+ *	0 if device is present, -ENODEV otherwise.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int piix_sata_probe (struct ata_port *ap)</div><div class='add'>+static int piix_sata_prereset(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ap-&gt;host_set-&gt;dev);</div><div class='ctx'> 	const unsigned int *map = ap-&gt;host_set-&gt;private_data;</div><div class='hunk'>@@ -549,29 +547,19 @@ static unsigned int piix_sata_probe (struct ata_port *ap)</div><div class='ctx'> 	DPRINTK("ata%u: LEAVE, pcs=0x%x present_mask=0x%x\n",</div><div class='ctx'> 		ap-&gt;id, pcs, present_mask);</div><div class='ctx'> </div><div class='del'>-	return present_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	piix_sata_probe_reset - Perform reset on SATA port and classify</div><div class='del'>- *	@ap: Port to reset</div><div class='del'>- *	@classes: Resulting classes of attached devices</div><div class='del'>- *</div><div class='del'>- *	Reset SATA phy and classify attached devices.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	None (inherited from caller).</div><div class='del'>- */</div><div class='del'>-static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes)</div><div class='del'>-{</div><div class='del'>-	if (!piix_sata_probe(ap)) {</div><div class='del'>-		printk(KERN_INFO "ata%u: SATA port has no device.\n", ap-&gt;id);</div><div class='add'>+	if (!present_mask) {</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "SATA port has no device.\n");</div><div class='add'>+		ap-&gt;eh_context.i.action &amp;= ~ATA_EH_RESET_MASK;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ata_drive_probe_reset(ap, ata_std_probeinit,</div><div class='del'>-				     ata_std_softreset, NULL,</div><div class='del'>-				     ata_std_postreset, classes);</div><div class='add'>+	return ata_std_prereset(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void piix_sata_error_handler(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	ata_bmdma_drive_eh(ap, piix_sata_prereset, ata_std_softreset, NULL,</div><div class='add'>+			   ata_std_postreset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -760,15 +748,15 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev)</div><div class='ctx'> 		pci_read_config_byte(pdev, PCI_REVISION_ID, &amp;rev);</div><div class='ctx'> 		pci_read_config_word(pdev, 0x41, &amp;cfg);</div><div class='ctx'> 		/* Only on the original revision: IDE DMA can hang */</div><div class='del'>-		if(rev == 0x00)</div><div class='add'>+		if (rev == 0x00)</div><div class='ctx'> 			no_piix_dma = 1;</div><div class='ctx'> 		/* On all revisions below 5 PXB bus lock must be disabled for IDE */</div><div class='del'>-		else if(cfg &amp; (1&lt;&lt;14) &amp;&amp; rev &lt; 5)</div><div class='add'>+		else if (cfg &amp; (1&lt;&lt;14) &amp;&amp; rev &lt; 5)</div><div class='ctx'> 			no_piix_dma = 2;</div><div class='ctx'> 	}</div><div class='del'>-	if(no_piix_dma)</div><div class='add'>+	if (no_piix_dma)</div><div class='ctx'> 		dev_printk(KERN_WARNING, &amp;ata_dev-&gt;dev, "450NX errata present, disabling IDE DMA.\n");</div><div class='del'>-	if(no_piix_dma == 2)</div><div class='add'>+	if (no_piix_dma == 2)</div><div class='ctx'> 		dev_printk(KERN_WARNING, &amp;ata_dev-&gt;dev, "A BIOS update may resolve this.\n");</div><div class='ctx'> 	return no_piix_dma;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c<br/>index 57295bcea3e7..007a14e5c3fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/atari_NCR5380.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/atari_NCR5380.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/atari_NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/atari_NCR5380.c</a></div><div class='hunk'>@@ -524,7 +524,6 @@ static __inline__ void initialize_SCp(Scsi_Cmnd *cmd)</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if NDEBUG</div><div class='head'>diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c<br/>index f677c5a32a68..e1be4a4387cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/atari_scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/atari_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/atari_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/atari_scsi.c</a></div><div class='hunk'>@@ -65,7 +65,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define NDEBUG (0)</div><div class='head'>diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c<br/>index a198d86667e9..0ec41f34f462 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/atp870u.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/atp870u.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/atp870u.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/atp870u.c</a></div><div class='hunk'>@@ -473,7 +473,7 @@ go_42:</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (workreq-&gt;use_sg) {</div><div class='ctx'> 				pci_unmap_sg(dev-&gt;pdev,</div><div class='del'>-					(struct scatterlist *)workreq-&gt;buffer,</div><div class='add'>+					(struct scatterlist *)workreq-&gt;request_buffer,</div><div class='ctx'> 					workreq-&gt;use_sg,</div><div class='ctx'> 					workreq-&gt;sc_data_direction);</div><div class='ctx'> 			} else if (workreq-&gt;request_bufflen &amp;&amp;</div><div class='hunk'>@@ -2625,29 +2625,32 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	unsigned int base_io, tmport, error,n;</div><div class='ctx'> 	unsigned char host_id;</div><div class='ctx'> 	struct Scsi_Host *shpnt = NULL;</div><div class='del'>-	struct atp_unit atp_dev, *p;</div><div class='add'>+	struct atp_unit *atpdev, *p;</div><div class='ctx'> 	unsigned char setupdata[2][16];</div><div class='ctx'> 	int count = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+	atpdev = kzalloc(sizeof(*atpdev), GFP_KERNEL);</div><div class='add'>+	if (!atpdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	if (pci_enable_device(pdev))</div><div class='del'>-		return -EIO;</div><div class='add'>+		goto err_eio;</div><div class='ctx'> </div><div class='ctx'>         if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {</div><div class='ctx'>                 printk(KERN_INFO "atp870u: use 32bit DMA mask.\n");</div><div class='ctx'>         } else {</div><div class='ctx'>                 printk(KERN_ERR "atp870u: DMA mask required but not available.\n");</div><div class='del'>-                return -EIO;</div><div class='add'>+		goto err_eio;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-	memset(&amp;atp_dev, 0, sizeof atp_dev);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * It's probably easier to weed out some revisions like</div><div class='ctx'> 	 * this than via the PCI device table</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ent-&gt;device == PCI_DEVICE_ID_ARTOP_AEC7610) {</div><div class='del'>-		error = pci_read_config_byte(pdev, PCI_CLASS_REVISION, &amp;atp_dev.chip_ver);</div><div class='del'>-		if (atp_dev.chip_ver &lt; 2)</div><div class='del'>-			return -EIO;</div><div class='add'>+		error = pci_read_config_byte(pdev, PCI_CLASS_REVISION, &amp;atpdev-&gt;chip_ver);</div><div class='add'>+		if (atpdev-&gt;chip_ver &lt; 2)</div><div class='add'>+			goto err_eio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (ent-&gt;device) {</div><div class='hunk'>@@ -2656,15 +2659,15 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	case ATP880_DEVID1:	</div><div class='ctx'> 	case ATP880_DEVID2:	</div><div class='ctx'> 	case ATP885_DEVID:	</div><div class='del'>-		atp_dev.chip_ver = 0x04;</div><div class='add'>+		atpdev-&gt;chip_ver = 0x04;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	base_io = pci_resource_start(pdev, 0);</div><div class='ctx'> 	base_io &amp;= 0xfffffff8;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if ((ent-&gt;device == ATP880_DEVID1)||(ent-&gt;device == ATP880_DEVID2)) {</div><div class='del'>-		error = pci_read_config_byte(pdev, PCI_CLASS_REVISION, &amp;atp_dev.chip_ver);</div><div class='add'>+		error = pci_read_config_byte(pdev, PCI_CLASS_REVISION, &amp;atpdev-&gt;chip_ver);</div><div class='ctx'> 		pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x80);//JCC082803</div><div class='ctx'> </div><div class='ctx'> 		host_id = inb(base_io + 0x39);</div><div class='hunk'>@@ -2672,17 +2675,17 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 		printk(KERN_INFO "   ACARD AEC-67160 PCI Ultra3 LVD Host Adapter: %d"</div><div class='ctx'> 			"    IO:%x, IRQ:%d.\n", count, base_io, pdev-&gt;irq);</div><div class='del'>-		atp_dev.ioport[0] = base_io + 0x40;</div><div class='del'>-		atp_dev.pciport[0] = base_io + 0x28;</div><div class='del'>-		atp_dev.dev_id = ent-&gt;device;</div><div class='del'>-		atp_dev.host_id[0] = host_id;</div><div class='add'>+		atpdev-&gt;ioport[0] = base_io + 0x40;</div><div class='add'>+		atpdev-&gt;pciport[0] = base_io + 0x28;</div><div class='add'>+		atpdev-&gt;dev_id = ent-&gt;device;</div><div class='add'>+		atpdev-&gt;host_id[0] = host_id;</div><div class='ctx'> </div><div class='ctx'> 		tmport = base_io + 0x22;</div><div class='del'>-		atp_dev.scam_on = inb(tmport);</div><div class='add'>+		atpdev-&gt;scam_on = inb(tmport);</div><div class='ctx'> 		tmport += 0x13;</div><div class='del'>-		atp_dev.global_map[0] = inb(tmport);</div><div class='add'>+		atpdev-&gt;global_map[0] = inb(tmport);</div><div class='ctx'> 		tmport += 0x07;</div><div class='del'>-		atp_dev.ultra_map[0] = inw(tmport);</div><div class='add'>+		atpdev-&gt;ultra_map[0] = inw(tmport);</div><div class='ctx'> </div><div class='ctx'> 		n = 0x3f09;</div><div class='ctx'> next_fblk_880:</div><div class='hunk'>@@ -2695,63 +2698,63 @@ next_fblk_880:</div><div class='ctx'> 		if (inb(base_io + 0x30) == 0xff)</div><div class='ctx'> 			goto flash_ok_880;</div><div class='ctx'> </div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x30);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x31);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x32);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x33);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x30);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x31);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x32);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x33);</div><div class='ctx'> 		outw(n, base_io + 0x34);</div><div class='ctx'> 		n += 0x0002;</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x30);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x31);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x32);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x33);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x30);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x31);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x32);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x33);</div><div class='ctx'> 		outw(n, base_io + 0x34);</div><div class='ctx'> 		n += 0x0002;</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x30);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x31);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x32);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x33);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x30);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x31);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x32);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x33);</div><div class='ctx'> 		outw(n, base_io + 0x34);</div><div class='ctx'> 		n += 0x0002;</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x30);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x31);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x32);</div><div class='del'>-		atp_dev.sp[0][m++] = inb(base_io + 0x33);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x30);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x31);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x32);</div><div class='add'>+		atpdev-&gt;sp[0][m++] = inb(base_io + 0x33);</div><div class='ctx'> 		n += 0x0018;</div><div class='ctx'> 		goto next_fblk_880;</div><div class='ctx'> flash_ok_880:</div><div class='ctx'> 		outw(0, base_io + 0x34);</div><div class='del'>-		atp_dev.ultra_map[0] = 0;</div><div class='del'>-		atp_dev.async[0] = 0;</div><div class='add'>+		atpdev-&gt;ultra_map[0] = 0;</div><div class='add'>+		atpdev-&gt;async[0] = 0;</div><div class='ctx'> 		for (k = 0; k &lt; 16; k++) {</div><div class='ctx'> 			n = 1;</div><div class='ctx'> 			n = n &lt;&lt; k;</div><div class='del'>-			if (atp_dev.sp[0][k] &gt; 1) {</div><div class='del'>-				atp_dev.ultra_map[0] |= n;</div><div class='add'>+			if (atpdev-&gt;sp[0][k] &gt; 1) {</div><div class='add'>+				atpdev-&gt;ultra_map[0] |= n;</div><div class='ctx'> 			} else {</div><div class='del'>-				if (atp_dev.sp[0][k] == 0)</div><div class='del'>-					atp_dev.async[0] |= n;</div><div class='add'>+				if (atpdev-&gt;sp[0][k] == 0)</div><div class='add'>+					atpdev-&gt;async[0] |= n;</div><div class='ctx'>  			}</div><div class='ctx'> 	 	}</div><div class='del'>-		atp_dev.async[0] = ~(atp_dev.async[0]);</div><div class='del'>-		outb(atp_dev.global_map[0], base_io + 0x35);</div><div class='add'>+		atpdev-&gt;async[0] = ~(atpdev-&gt;async[0]);</div><div class='add'>+		outb(atpdev-&gt;global_map[0], base_io + 0x35);</div><div class='ctx'>  </div><div class='ctx'> 		shpnt = scsi_host_alloc(&amp;atp870u_template, sizeof(struct atp_unit));</div><div class='ctx'> 		if (!shpnt)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			goto err_nomem;</div><div class='ctx'> </div><div class='ctx'> 		p = (struct atp_unit *)&amp;shpnt-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-		atp_dev.host = shpnt;</div><div class='del'>-		atp_dev.pdev = pdev;</div><div class='add'>+		atpdev-&gt;host = shpnt;</div><div class='add'>+		atpdev-&gt;pdev = pdev;</div><div class='ctx'> 		pci_set_drvdata(pdev, p);</div><div class='del'>-		memcpy(p, &amp;atp_dev, sizeof atp_dev);</div><div class='add'>+		memcpy(p, atpdev, sizeof(*atpdev));</div><div class='ctx'> 		if (atp870u_init_tables(shpnt) &lt; 0) {</div><div class='ctx'> 			printk(KERN_ERR "Unable to allocate tables for Acard controller\n");</div><div class='ctx'> 			goto unregister;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (request_irq(pdev-&gt;irq, atp870u_intr_handle, SA_SHIRQ, "atp880i", shpnt)) {</div><div class='add'>+		if (request_irq(pdev-&gt;irq, atp870u_intr_handle, IRQF_SHARED, "atp880i", shpnt)) {</div><div class='ctx'>  			printk(KERN_ERR "Unable to allocate IRQ%d for Acard controller.\n", pdev-&gt;irq);</div><div class='ctx'> 			goto free_tables;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2798,31 +2801,31 @@ flash_ok_880:</div><div class='ctx'> 			printk(KERN_INFO "   ACARD AEC-67162 PCI Ultra3 LVD Host Adapter:  IO:%x, IRQ:%d.\n"</div><div class='ctx'> 			       , base_io, pdev-&gt;irq);</div><div class='ctx'>         	</div><div class='del'>-		atp_dev.pdev = pdev;	</div><div class='del'>-		atp_dev.dev_id  = ent-&gt;device;</div><div class='del'>-		atp_dev.baseport = base_io;</div><div class='del'>-		atp_dev.ioport[0] = base_io + 0x80;</div><div class='del'>-		atp_dev.ioport[1] = base_io + 0xc0;</div><div class='del'>-		atp_dev.pciport[0] = base_io + 0x40;</div><div class='del'>-		atp_dev.pciport[1] = base_io + 0x50;</div><div class='add'>+		atpdev-&gt;pdev = pdev;</div><div class='add'>+		atpdev-&gt;dev_id  = ent-&gt;device;</div><div class='add'>+		atpdev-&gt;baseport = base_io;</div><div class='add'>+		atpdev-&gt;ioport[0] = base_io + 0x80;</div><div class='add'>+		atpdev-&gt;ioport[1] = base_io + 0xc0;</div><div class='add'>+		atpdev-&gt;pciport[0] = base_io + 0x40;</div><div class='add'>+		atpdev-&gt;pciport[1] = base_io + 0x50;</div><div class='ctx'> 				</div><div class='ctx'> 		shpnt = scsi_host_alloc(&amp;atp870u_template, sizeof(struct atp_unit));</div><div class='ctx'> 		if (!shpnt)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			goto err_nomem;</div><div class='ctx'>         	</div><div class='ctx'> 		p = (struct atp_unit *)&amp;shpnt-&gt;hostdata;</div><div class='ctx'>         	</div><div class='del'>-		atp_dev.host = shpnt;</div><div class='del'>-		atp_dev.pdev = pdev;</div><div class='add'>+		atpdev-&gt;host = shpnt;</div><div class='add'>+		atpdev-&gt;pdev = pdev;</div><div class='ctx'> 		pci_set_drvdata(pdev, p);</div><div class='del'>-		memcpy(p, &amp;atp_dev, sizeof(struct atp_unit));</div><div class='add'>+		memcpy(p, atpdev, sizeof(struct atp_unit));</div><div class='ctx'> 		if (atp870u_init_tables(shpnt) &lt; 0)</div><div class='ctx'> 			goto unregister;</div><div class='ctx'> 			</div><div class='ctx'> #ifdef ED_DBGP		</div><div class='ctx'> 	printk("request_irq() shpnt %p hostdata %p\n", shpnt, p);</div><div class='ctx'> #endif	        </div><div class='del'>-		if (request_irq(pdev-&gt;irq, atp870u_intr_handle, SA_SHIRQ, "atp870u", shpnt)) {</div><div class='add'>+		if (request_irq(pdev-&gt;irq, atp870u_intr_handle, IRQF_SHARED, "atp870u", shpnt)) {</div><div class='ctx'> 				printk(KERN_ERR "Unable to allocate IRQ for Acard controller.\n");</div><div class='ctx'> 			goto free_tables;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2974,43 +2977,43 @@ flash_ok_885:</div><div class='ctx'> 		printk(KERN_INFO "   ACARD AEC-671X PCI Ultra/W SCSI-2/3 Host Adapter: %d "</div><div class='ctx'> 			"IO:%x, IRQ:%d.\n", count, base_io, pdev-&gt;irq);</div><div class='ctx'> </div><div class='del'>-		atp_dev.ioport[0] = base_io;</div><div class='del'>-		atp_dev.pciport[0] = base_io + 0x20;</div><div class='del'>-		atp_dev.dev_id = ent-&gt;device;</div><div class='add'>+		atpdev-&gt;ioport[0] = base_io;</div><div class='add'>+		atpdev-&gt;pciport[0] = base_io + 0x20;</div><div class='add'>+		atpdev-&gt;dev_id = ent-&gt;device;</div><div class='ctx'> 		host_id &amp;= 0x07;</div><div class='del'>-		atp_dev.host_id[0] = host_id;</div><div class='add'>+		atpdev-&gt;host_id[0] = host_id;</div><div class='ctx'> 		tmport = base_io + 0x22;</div><div class='del'>-		atp_dev.scam_on = inb(tmport);</div><div class='add'>+		atpdev-&gt;scam_on = inb(tmport);</div><div class='ctx'> 		tmport += 0x0b;</div><div class='del'>-		atp_dev.global_map[0] = inb(tmport++);</div><div class='del'>-		atp_dev.ultra_map[0] = inw(tmport);</div><div class='add'>+		atpdev-&gt;global_map[0] = inb(tmport++);</div><div class='add'>+		atpdev-&gt;ultra_map[0] = inw(tmport);</div><div class='ctx'> </div><div class='del'>-		if (atp_dev.ultra_map[0] == 0) {</div><div class='del'>-			atp_dev.scam_on = 0x00;</div><div class='del'>-			atp_dev.global_map[0] = 0x20;</div><div class='del'>-			atp_dev.ultra_map[0] = 0xffff;</div><div class='add'>+		if (atpdev-&gt;ultra_map[0] == 0) {</div><div class='add'>+			atpdev-&gt;scam_on = 0x00;</div><div class='add'>+			atpdev-&gt;global_map[0] = 0x20;</div><div class='add'>+			atpdev-&gt;ultra_map[0] = 0xffff;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		shpnt = scsi_host_alloc(&amp;atp870u_template, sizeof(struct atp_unit));</div><div class='ctx'> 		if (!shpnt)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+			goto err_nomem;</div><div class='ctx'> </div><div class='ctx'> 		p = (struct atp_unit *)&amp;shpnt-&gt;hostdata;</div><div class='ctx'> 		</div><div class='del'>-		atp_dev.host = shpnt;</div><div class='del'>-		atp_dev.pdev = pdev;</div><div class='add'>+		atpdev-&gt;host = shpnt;</div><div class='add'>+		atpdev-&gt;pdev = pdev;</div><div class='ctx'> 		pci_set_drvdata(pdev, p);</div><div class='del'>-		memcpy(p, &amp;atp_dev, sizeof atp_dev);</div><div class='add'>+		memcpy(p, atpdev, sizeof(*atpdev));</div><div class='ctx'> 		if (atp870u_init_tables(shpnt) &lt; 0)</div><div class='ctx'> 			goto unregister;</div><div class='ctx'> </div><div class='del'>-		if (request_irq(pdev-&gt;irq, atp870u_intr_handle, SA_SHIRQ, "atp870i", shpnt)) {</div><div class='add'>+		if (request_irq(pdev-&gt;irq, atp870u_intr_handle, IRQF_SHARED, "atp870i", shpnt)) {</div><div class='ctx'> 			printk(KERN_ERR "Unable to allocate IRQ%d for Acard controller.\n", pdev-&gt;irq);</div><div class='ctx'> 			goto free_tables;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(shpnt-&gt;host_lock, flags);</div><div class='del'>-		if (atp_dev.chip_ver &gt; 0x07) {	/* check if atp876 chip then enable terminator */</div><div class='add'>+		if (atpdev-&gt;chip_ver &gt; 0x07) {	/* check if atp876 chip then enable terminator */</div><div class='ctx'> 			tmport = base_io + 0x3e;</div><div class='ctx'> 			outb(0x00, tmport);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3044,10 +3047,10 @@ flash_ok_885:</div><div class='ctx'> 		outb((inb(tmport) &amp; 0xef), tmport);</div><div class='ctx'> 		tmport++;</div><div class='ctx'> 		outb((inb(tmport) | 0x20), tmport);</div><div class='del'>-		if (atp_dev.chip_ver == 4)</div><div class='add'>+		if (atpdev-&gt;chip_ver == 4)</div><div class='ctx'> 			shpnt-&gt;max_id = 16;</div><div class='ctx'> 		else		</div><div class='del'>-			shpnt-&gt;max_id = 7;</div><div class='add'>+			shpnt-&gt;max_id = 8;</div><div class='ctx'> 		shpnt-&gt;this_id = host_id;</div><div class='ctx'> 		shpnt-&gt;unique_id = base_io;</div><div class='ctx'> 		shpnt-&gt;io_port = base_io;</div><div class='hunk'>@@ -3093,6 +3096,12 @@ unregister:</div><div class='ctx'> 	printk("atp870u_prob:unregister\n");</div><div class='ctx'> 	scsi_host_put(shpnt);</div><div class='ctx'> 	return -1;		</div><div class='add'>+err_eio:</div><div class='add'>+	kfree(atpdev);</div><div class='add'>+	return -EIO;</div><div class='add'>+err_nomem:</div><div class='add'>+	kfree(atpdev);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The abort command does not leave the device in a clean state where</div><div class='head'>diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c<br/>index 3867ac2de4c2..329a8f297b31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/blz1230.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/blz1230.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/blz1230.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/blz1230.c</a></div><div class='hunk'>@@ -172,7 +172,7 @@ int __init blz1230_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='ctx'> 		esp-&gt;slot = board+REAL_BLZ1230_ESP_ADDR;</div><div class='del'>-		if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,</div><div class='add'>+		if (request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,</div><div class='ctx'> 				 "Blizzard 1230 SCSI IV", esp-&gt;ehost))</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c<br/>index 4ebe69e32756..b6c137b97350 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/blz2060.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/blz2060.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/blz2060.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/blz2060.c</a></div><div class='hunk'>@@ -146,7 +146,7 @@ int __init blz2060_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 		esp-&gt;esp_command_dvma = virt_to_bus((void *)cmd_buffer);</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='del'>-		request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,</div><div class='add'>+		request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,</div><div class='ctx'> 			    "Blizzard 2060 SCSI", esp-&gt;ehost);</div><div class='ctx'> </div><div class='ctx'> 		/* Figure out our scsi ID on the bus */</div><div class='head'>diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c<br/>index d9abd1645d15..f6caa4307768 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ch.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> #define VERSION "0.25"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c<br/>index 30a335349cee..dddd2acce76f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/constants.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/constants.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/constants.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/constants.c</a></div><div class='hunk'>@@ -7,15 +7,14 @@</div><div class='ctx'>  * Additions for SPC-3 T10/1416-D Rev 21 22 Sept 2004, D. Gilbert 20041025</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_dbg.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -114,8 +113,7 @@ static const struct value_name_pair maint_in_arr[] = {</div><div class='ctx'> 	{0xd, "Report supported task management functions"},</div><div class='ctx'> 	{0xe, "Report priority"},</div><div class='ctx'> };</div><div class='del'>-#define MAINT_IN_SZ \</div><div class='del'>-        (int)(sizeof(maint_in_arr) / sizeof(maint_in_arr[0]))</div><div class='add'>+#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)</div><div class='ctx'> </div><div class='ctx'> static const struct value_name_pair maint_out_arr[] = {</div><div class='ctx'> 	{0x6, "Set device identifier"},</div><div class='hunk'>@@ -123,34 +121,29 @@ static const struct value_name_pair maint_out_arr[] = {</div><div class='ctx'> 	{0xb, "Change aliases"},</div><div class='ctx'> 	{0xe, "Set priority"},</div><div class='ctx'> };</div><div class='del'>-#define MAINT_OUT_SZ \</div><div class='del'>-        (int)(sizeof(maint_out_arr) / sizeof(maint_out_arr[0]))</div><div class='add'>+#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)</div><div class='ctx'> </div><div class='ctx'> static const struct value_name_pair serv_in12_arr[] = {</div><div class='ctx'> 	{0x1, "Read media serial number"},</div><div class='ctx'> };</div><div class='del'>-#define SERV_IN12_SZ  \</div><div class='del'>-        (int)(sizeof(serv_in12_arr) / sizeof(serv_in12_arr[0]))</div><div class='add'>+#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)</div><div class='ctx'> </div><div class='ctx'> static const struct value_name_pair serv_out12_arr[] = {</div><div class='ctx'> 	{-1, "dummy entry"},</div><div class='ctx'> };</div><div class='del'>-#define SERV_OUT12_SZ \</div><div class='del'>-        (int)(sizeof(serv_out12_arr) / sizeof(serv_in12_arr[0]))</div><div class='add'>+#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)</div><div class='ctx'> </div><div class='ctx'> static const struct value_name_pair serv_in16_arr[] = {</div><div class='ctx'> 	{0x10, "Read capacity(16)"},</div><div class='ctx'> 	{0x11, "Read long(16)"},</div><div class='ctx'> };</div><div class='del'>-#define SERV_IN16_SZ  \</div><div class='del'>-        (int)(sizeof(serv_in16_arr) / sizeof(serv_in16_arr[0]))</div><div class='add'>+#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)</div><div class='ctx'> </div><div class='ctx'> static const struct value_name_pair serv_out16_arr[] = {</div><div class='ctx'> 	{0x11, "Write long(16)"},</div><div class='ctx'> 	{0x1f, "Notify data transfer device(16)"},</div><div class='ctx'> };</div><div class='del'>-#define SERV_OUT16_SZ \</div><div class='del'>-        (int)(sizeof(serv_out16_arr) / sizeof(serv_in16_arr[0]))</div><div class='add'>+#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)</div><div class='ctx'> </div><div class='ctx'> static const struct value_name_pair variable_length_arr[] = {</div><div class='ctx'> 	{0x1, "Rebuild(32)"},</div><div class='hunk'>@@ -190,8 +183,7 @@ static const struct value_name_pair variable_length_arr[] = {</div><div class='ctx'> 	{0x8f7e, "Perform SCSI command (osd)"},</div><div class='ctx'> 	{0x8f7f, "Perform task management function (osd)"},</div><div class='ctx'> };</div><div class='del'>-#define VARIABLE_LENGTH_SZ \</div><div class='del'>-        (int)(sizeof(variable_length_arr) / sizeof(variable_length_arr[0]))</div><div class='add'>+#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)</div><div class='ctx'> </div><div class='ctx'> static const char * get_sa_name(const struct value_name_pair * arr,</div><div class='ctx'> 			        int arr_sz, int service_action)</div><div class='hunk'>@@ -1268,16 +1260,6 @@ void scsi_print_sense(const char *devclass, struct scsi_cmnd *cmd)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_print_sense);</div><div class='ctx'> </div><div class='del'>-void scsi_print_req_sense(const char *devclass, struct scsi_request *sreq)</div><div class='del'>-{</div><div class='del'>-	const char *name = devclass;</div><div class='del'>-</div><div class='del'>-	if (sreq-&gt;sr_request-&gt;rq_disk)</div><div class='del'>-		name = sreq-&gt;sr_request-&gt;rq_disk-&gt;disk_name;</div><div class='del'>-	__scsi_print_sense(name, sreq-&gt;sr_sense_buffer, SCSI_SENSE_BUFFERSIZE);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(scsi_print_req_sense);</div><div class='del'>-</div><div class='ctx'> void scsi_print_command(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	/* Assume appended output (i.e. not at start of line) */</div><div class='hunk'>@@ -1290,10 +1272,10 @@ EXPORT_SYMBOL(scsi_print_command);</div><div class='ctx'> #ifdef CONFIG_SCSI_CONSTANTS</div><div class='ctx'> </div><div class='ctx'> static const char * const hostbyte_table[]={</div><div class='del'>-"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET", </div><div class='add'>+"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET",</div><div class='ctx'> "DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",</div><div class='ctx'> "DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY"};</div><div class='del'>-#define NUM_HOSTBYTE_STRS (sizeof(hostbyte_table) / sizeof(const char *))</div><div class='add'>+#define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)</div><div class='ctx'> </div><div class='ctx'> void scsi_print_hostbyte(int scsiresult)</div><div class='ctx'> {</div><div class='hunk'>@@ -1303,7 +1285,7 @@ void scsi_print_hostbyte(int scsiresult)</div><div class='ctx'> 	if (hb &lt; NUM_HOSTBYTE_STRS)</div><div class='ctx'> 		printk("(%s) ", hostbyte_table[hb]);</div><div class='ctx'> 	else</div><div class='del'>-		printk("is invalid "); </div><div class='add'>+		printk("is invalid ");</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> void scsi_print_hostbyte(int scsiresult)</div><div class='hunk'>@@ -1315,14 +1297,14 @@ void scsi_print_hostbyte(int scsiresult)</div><div class='ctx'> #ifdef CONFIG_SCSI_CONSTANTS</div><div class='ctx'> </div><div class='ctx'> static const char * const driverbyte_table[]={</div><div class='del'>-"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR", </div><div class='add'>+"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR",</div><div class='ctx'> "DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};</div><div class='del'>-#define NUM_DRIVERBYTE_STRS (sizeof(driverbyte_table) / sizeof(const char *))</div><div class='add'>+#define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)</div><div class='ctx'> </div><div class='ctx'> static const char * const driversuggest_table[]={"SUGGEST_OK",</div><div class='ctx'> "SUGGEST_RETRY", "SUGGEST_ABORT", "SUGGEST_REMAP", "SUGGEST_DIE",</div><div class='ctx'> "SUGGEST_5", "SUGGEST_6", "SUGGEST_7", "SUGGEST_SENSE"};</div><div class='del'>-#define NUM_SUGGEST_STRS (sizeof(driversuggest_table) / sizeof(const char *))</div><div class='add'>+#define NUM_SUGGEST_STRS ARRAY_SIZE(driversuggest_table)</div><div class='ctx'> </div><div class='ctx'> void scsi_print_driverbyte(int scsiresult)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c<br/>index a4a4fac5c0a1..7c7cfb54e897 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/cyberstorm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/cyberstorm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/cyberstorm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/cyberstorm.c</a></div><div class='hunk'>@@ -172,7 +172,7 @@ int __init cyber_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 		esp-&gt;esp_command_dvma = virt_to_bus((void *)cmd_buffer);</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='del'>-		request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,</div><div class='add'>+		request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,</div><div class='ctx'> 			    "CyberStorm SCSI", esp-&gt;ehost);</div><div class='ctx'> 		/* Figure out our scsi ID on the bus */</div><div class='ctx'> 		/* The DMA cond flag contains a hardcoded jumper bit</div><div class='head'>diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c<br/>index 3a803d73bc5f..d88cb9cf091e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/cyberstormII.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/cyberstormII.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/cyberstormII.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/cyberstormII.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ int __init cyberII_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 		esp-&gt;esp_command_dvma = virt_to_bus((void *)cmd_buffer);</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='del'>-		request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,</div><div class='add'>+		request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,</div><div class='ctx'> 			    "CyberStorm SCSI Mk II", esp-&gt;ehost);</div><div class='ctx'> </div><div class='ctx'> 		/* Figure out our scsi ID on the bus */</div><div class='head'>diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c<br/>index cbf825263f3b..ff2b1796fa34 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dc395x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dc395x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dc395x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/dc395x.c</a></div><div class='hunk'>@@ -230,13 +230,12 @@ struct ScsiReqBlk {</div><div class='ctx'> 	struct scsi_cmnd *cmd;</div><div class='ctx'> </div><div class='ctx'> 	struct SGentry *segment_x;	/* Linear array of hw sg entries (up to 64 entries) */</div><div class='del'>-	u32 sg_bus_addr;	        /* Bus address of sg list (ie, of segment_x) */</div><div class='add'>+	dma_addr_t sg_bus_addr;	        /* Bus address of sg list (ie, of segment_x) */</div><div class='ctx'> </div><div class='ctx'> 	u8 sg_count;			/* No of HW sg entries for this request */</div><div class='ctx'> 	u8 sg_index;			/* Index of HW sg entry for this request */</div><div class='del'>-	u32 total_xfer_length;		/* Total number of bytes remaining to be transfered */</div><div class='del'>-	unsigned char *virt_addr;	/* Virtual address of current transfer position */</div><div class='del'>-</div><div class='add'>+	size_t total_xfer_length;	/* Total number of bytes remaining to be transfered */</div><div class='add'>+	size_t request_length;		/* Total number of bytes in this request */</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The sense buffer handling function, request_sense, uses</div><div class='ctx'> 	 * the first hw sg entry (segment_x[0]) and the transfer</div><div class='hunk'>@@ -246,8 +245,7 @@ struct ScsiReqBlk {</div><div class='ctx'> 	 * total_xfer_length in xferred. These values are restored in</div><div class='ctx'> 	 * pci_unmap_srb_sense. This is the only place xferred is used.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned char *virt_addr_req;	/* Saved virtual address of the request buffer */</div><div class='del'>-	u32 xferred;		        /* Saved copy of total_xfer_length */</div><div class='add'>+	size_t xferred;		        /* Saved copy of total_xfer_length */</div><div class='ctx'> </div><div class='ctx'> 	u16 state;</div><div class='ctx'> </div><div class='hunk'>@@ -977,17 +975,6 @@ static void send_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void pio_trigger(void)</div><div class='del'>-{</div><div class='del'>-	static int feedback_requested;</div><div class='del'>-</div><div class='del'>-	if (!feedback_requested) {</div><div class='del'>-		feedback_requested = 1;</div><div class='del'>-		printk(KERN_WARNING "%s: Please, contact &lt;linux-scsi@vger.kernel.org&gt; "</div><div class='del'>-		       "to help improve support for your system.\n", __FILE__);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Prepare SRB for being sent to Device DCB w/ command *cmd */</div><div class='ctx'> static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,</div><div class='ctx'> 		struct ScsiReqBlk *srb)</div><div class='hunk'>@@ -1001,7 +988,6 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,</div><div class='ctx'> 	srb-&gt;sg_count = 0;</div><div class='ctx'> 	srb-&gt;total_xfer_length = 0;</div><div class='ctx'> 	srb-&gt;sg_bus_addr = 0;</div><div class='del'>-	srb-&gt;virt_addr = NULL;</div><div class='ctx'> 	srb-&gt;sg_index = 0;</div><div class='ctx'> 	srb-&gt;adapter_status = 0;</div><div class='ctx'> 	srb-&gt;target_status = 0;</div><div class='hunk'>@@ -1032,7 +1018,6 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,</div><div class='ctx'> 			reqlen, cmd-&gt;request_buffer, cmd-&gt;use_sg,</div><div class='ctx'> 			srb-&gt;sg_count);</div><div class='ctx'> </div><div class='del'>-		srb-&gt;virt_addr = page_address(sl-&gt;page);</div><div class='ctx'> 		for (i = 0; i &lt; srb-&gt;sg_count; i++) {</div><div class='ctx'> 			u32 busaddr = (u32)sg_dma_address(&amp;sl[i]);</div><div class='ctx'> 			u32 seglen = (u32)sl[i].length;</div><div class='hunk'>@@ -1077,12 +1062,14 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,</div><div class='ctx'> 			srb-&gt;total_xfer_length++;</div><div class='ctx'> </div><div class='ctx'> 		srb-&gt;segment_x[0].length = srb-&gt;total_xfer_length;</div><div class='del'>-		srb-&gt;virt_addr = cmd-&gt;request_buffer;</div><div class='add'>+</div><div class='ctx'> 		dprintkdbg(DBG_0,</div><div class='ctx'> 			"build_srb: [1] len=%d buf=%p use_sg=%d map=%08x\n",</div><div class='ctx'> 			srb-&gt;total_xfer_length, cmd-&gt;request_buffer,</div><div class='ctx'> 			cmd-&gt;use_sg, srb-&gt;segment_x[0].address);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	srb-&gt;request_length = srb-&gt;total_xfer_length;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1414,10 +1401,10 @@ static int dc395x_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 	}</div><div class='ctx'> 	srb = find_cmd(cmd, &amp;dcb-&gt;srb_going_list);</div><div class='ctx'> 	if (srb) {</div><div class='del'>-		dprintkl(KERN_DEBUG, "eh_abort: Command in progress");</div><div class='add'>+		dprintkl(KERN_DEBUG, "eh_abort: Command in progress\n");</div><div class='ctx'> 		/* XXX: Should abort the command here */</div><div class='ctx'> 	} else {</div><div class='del'>-		dprintkl(KERN_DEBUG, "eh_abort: Command not found");</div><div class='add'>+		dprintkl(KERN_DEBUG, "eh_abort: Command not found\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	return FAILED;</div><div class='ctx'> }</div><div class='hunk'>@@ -1976,14 +1963,11 @@ static void sg_verify_length(struct ScsiReqBlk *srb)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Compute the next Scatter Gather list index and adjust its length</div><div class='del'>- * and address if necessary; also compute virt_addr</div><div class='add'>+ * and address if necessary</div><div class='ctx'>  */</div><div class='ctx'> static void sg_update_list(struct ScsiReqBlk *srb, u32 left)</div><div class='ctx'> {</div><div class='ctx'> 	u8 idx;</div><div class='del'>-	struct scatterlist *sg;</div><div class='del'>-	struct scsi_cmnd *cmd = srb-&gt;cmd;</div><div class='del'>-	int segment = cmd-&gt;use_sg;</div><div class='ctx'> 	u32 xferred = srb-&gt;total_xfer_length - left; /* bytes transfered */</div><div class='ctx'> 	struct SGentry *psge = srb-&gt;segment_x + srb-&gt;sg_index;</div><div class='ctx'> </div><div class='hunk'>@@ -2016,29 +2000,6 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)</div><div class='ctx'> 		psge++;</div><div class='ctx'> 	}</div><div class='ctx'> 	sg_verify_length(srb);</div><div class='del'>-</div><div class='del'>-	/* we need the corresponding virtual address */</div><div class='del'>-	if (!segment || (srb-&gt;flag &amp; AUTO_REQSENSE)) {</div><div class='del'>-		srb-&gt;virt_addr += xferred;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We have to walk the scatterlist to find it */</div><div class='del'>-	sg = (struct scatterlist *)cmd-&gt;request_buffer;</div><div class='del'>-	while (segment--) {</div><div class='del'>-		unsigned long mask =</div><div class='del'>-		    ~((unsigned long)sg-&gt;length - 1) &amp; PAGE_MASK;</div><div class='del'>-		if ((sg_dma_address(sg) &amp; mask) == (psge-&gt;address &amp; mask)) {</div><div class='del'>-			srb-&gt;virt_addr = (page_address(sg-&gt;page)</div><div class='del'>-					   + psge-&gt;address -</div><div class='del'>-					   (psge-&gt;address &amp; PAGE_MASK));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		++sg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dprintkl(KERN_ERR, "sg_update_list: sg_to_virt failed\n");</div><div class='del'>-	srb-&gt;virt_addr = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2050,15 +2011,7 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)</div><div class='ctx'>  */</div><div class='ctx'> static void sg_subtract_one(struct ScsiReqBlk *srb)</div><div class='ctx'> {</div><div class='del'>-	srb-&gt;total_xfer_length--;</div><div class='del'>-	srb-&gt;segment_x[srb-&gt;sg_index].length--;</div><div class='del'>-	if (srb-&gt;total_xfer_length &amp;&amp;</div><div class='del'>-	    !srb-&gt;segment_x[srb-&gt;sg_index].length) {</div><div class='del'>-		if (debug_enabled(DBG_PIO))</div><div class='del'>-			printk(" (next segment)");</div><div class='del'>-		srb-&gt;sg_index++;</div><div class='del'>-		sg_update_list(srb, srb-&gt;total_xfer_length);</div><div class='del'>-	}</div><div class='add'>+	sg_update_list(srb, srb-&gt;total_xfer_length - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2118,7 +2071,7 @@ static void data_out_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,</div><div class='ctx'> 	 * If we need more data, the DMA SG list will be freshly set up, anyway</div><div class='ctx'> 	 */</div><div class='ctx'> 	dprintkdbg(DBG_PIO, "data_out_phase0: "</div><div class='del'>-		"DMA{fifcnt=0x%02x fifostat=0x%02x} "</div><div class='add'>+		"DMA{fifocnt=0x%02x fifostat=0x%02x} "</div><div class='ctx'> 		"SCSI{fifocnt=0x%02x cnt=0x%06x status=0x%04x} total=0x%06x\n",</div><div class='ctx'> 		DC395x_read8(acb, TRM_S1040_DMA_FIFOCNT),</div><div class='ctx'> 		DC395x_read8(acb, TRM_S1040_DMA_FIFOSTAT),</div><div class='hunk'>@@ -2239,12 +2192,11 @@ static void data_out_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,</div><div class='ctx'> 	data_io_transfer(acb, srb, XFERDATAOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,</div><div class='ctx'> 		u16 *pscsi_status)</div><div class='ctx'> {</div><div class='ctx'> 	u16 scsi_status = *pscsi_status;</div><div class='del'>-	u32 d_left_counter = 0;</div><div class='add'>+</div><div class='ctx'> 	dprintkdbg(DBG_0, "data_in_phase0: (pid#%li) &lt;%02i-%i&gt;\n",</div><div class='ctx'> 		srb-&gt;cmd-&gt;pid, srb-&gt;cmd-&gt;device-&gt;id, srb-&gt;cmd-&gt;device-&gt;lun);</div><div class='ctx'> </div><div class='hunk'>@@ -2262,6 +2214,9 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,</div><div class='ctx'> 	 * seem to be a bad idea, actually.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(srb-&gt;state &amp; SRB_XFERPAD)) {</div><div class='add'>+		u32 d_left_counter;</div><div class='add'>+		unsigned int sc, fc;</div><div class='add'>+</div><div class='ctx'> 		if (scsi_status &amp; PARITYERROR) {</div><div class='ctx'> 			dprintkl(KERN_INFO, "data_in_phase0: (pid#%li) "</div><div class='ctx'> 				"Parity Error\n", srb-&gt;cmd-&gt;pid);</div><div class='hunk'>@@ -2298,18 +2253,19 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,</div><div class='ctx'> 				DC395x_read8(acb, TRM_S1040_DMA_FIFOSTAT));</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Now: Check remainig data: The SCSI counters should tell us ... */</div><div class='del'>-		d_left_counter = DC395x_read32(acb, TRM_S1040_SCSI_COUNTER)</div><div class='del'>-		    + ((DC395x_read8(acb, TRM_S1040_SCSI_FIFOCNT) &amp; 0x1f)</div><div class='add'>+		sc = DC395x_read32(acb, TRM_S1040_SCSI_COUNTER);</div><div class='add'>+		fc = DC395x_read8(acb, TRM_S1040_SCSI_FIFOCNT);</div><div class='add'>+		d_left_counter = sc + ((fc &amp; 0x1f)</div><div class='ctx'> 		       &lt;&lt; ((srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC) ? 1 :</div><div class='ctx'> 			   0));</div><div class='ctx'> 		dprintkdbg(DBG_KG, "data_in_phase0: "</div><div class='ctx'> 			"SCSI{fifocnt=0x%02x%s ctr=0x%08x} "</div><div class='ctx'> 			"DMA{fifocnt=0x%02x fifostat=0x%02x ctr=0x%08x} "</div><div class='ctx'> 			"Remain{totxfer=%i scsi_fifo+ctr=%i}\n",</div><div class='del'>-			DC395x_read8(acb, TRM_S1040_SCSI_FIFOCNT),</div><div class='add'>+			fc,</div><div class='ctx'> 			(srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC) ? "words" : "bytes",</div><div class='del'>-			DC395x_read32(acb, TRM_S1040_SCSI_COUNTER),</div><div class='del'>-			DC395x_read8(acb, TRM_S1040_DMA_FIFOCNT),</div><div class='add'>+			sc,</div><div class='add'>+			fc,</div><div class='ctx'> 			DC395x_read8(acb, TRM_S1040_DMA_FIFOSTAT),</div><div class='ctx'> 			DC395x_read32(acb, TRM_S1040_DMA_CXCNT),</div><div class='ctx'> 			srb-&gt;total_xfer_length, d_left_counter);</div><div class='hunk'>@@ -2317,40 +2273,79 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,</div><div class='ctx'> 		/* KG: Less than or equal to 4 bytes can not be transfered via DMA, it seems. */</div><div class='ctx'> 		if (d_left_counter</div><div class='ctx'> 		    &amp;&amp; srb-&gt;total_xfer_length &lt;= DC395x_LASTPIO) {</div><div class='add'>+			size_t left_io = srb-&gt;total_xfer_length;</div><div class='add'>+</div><div class='ctx'> 			/*u32 addr = (srb-&gt;segment_x[srb-&gt;sg_index].address); */</div><div class='ctx'> 			/*sg_update_list (srb, d_left_counter); */</div><div class='del'>-			dprintkdbg(DBG_PIO, "data_in_phase0: PIO (%i %s) to "</div><div class='del'>-				"%p for remaining %i bytes:",</div><div class='del'>-				DC395x_read8(acb, TRM_S1040_SCSI_FIFOCNT) &amp; 0x1f,</div><div class='add'>+			dprintkdbg(DBG_PIO, "data_in_phase0: PIO (%i %s) "</div><div class='add'>+				   "for remaining %i bytes:",</div><div class='add'>+				fc &amp; 0x1f,</div><div class='ctx'> 				(srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC) ?</div><div class='ctx'> 				    "words" : "bytes",</div><div class='del'>-				srb-&gt;virt_addr,</div><div class='ctx'> 				srb-&gt;total_xfer_length);</div><div class='ctx'> 			if (srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC)</div><div class='ctx'> 				DC395x_write8(acb, TRM_S1040_SCSI_CONFIG2,</div><div class='ctx'> 					      CFG2_WIDEFIFO);</div><div class='del'>-			while (DC395x_read8(acb, TRM_S1040_SCSI_FIFOCNT) != 0x40) {</div><div class='del'>-				u8 byte = DC395x_read8(acb, TRM_S1040_SCSI_FIFO);</div><div class='del'>-				pio_trigger();</div><div class='del'>-				*(srb-&gt;virt_addr)++ = byte;</div><div class='del'>-				if (debug_enabled(DBG_PIO))</div><div class='del'>-					printk(" %02x", byte);</div><div class='del'>-				d_left_counter--;</div><div class='del'>-				sg_subtract_one(srb);</div><div class='del'>-			}</div><div class='del'>-			if (srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC) {</div><div class='del'>-#if 1</div><div class='del'>-                /* Read the last byte ... */</div><div class='del'>-				if (srb-&gt;total_xfer_length &gt; 0) {</div><div class='del'>-					u8 byte = DC395x_read8(acb, TRM_S1040_SCSI_FIFO);</div><div class='del'>-					pio_trigger();</div><div class='del'>-					*(srb-&gt;virt_addr)++ = byte;</div><div class='del'>-					srb-&gt;total_xfer_length--;</div><div class='add'>+			while (left_io) {</div><div class='add'>+				unsigned char *virt, *base = NULL;</div><div class='add'>+				unsigned long flags = 0;</div><div class='add'>+				size_t len = left_io;</div><div class='add'>+</div><div class='add'>+				if (srb-&gt;cmd-&gt;use_sg) {</div><div class='add'>+					size_t offset = srb-&gt;request_length - left_io;</div><div class='add'>+					local_irq_save(flags);</div><div class='add'>+					/* Assumption: it's inside one page as it's at most 4 bytes and</div><div class='add'>+					   I just assume it's on a 4-byte boundary */</div><div class='add'>+					base = scsi_kmap_atomic_sg((struct scatterlist *)srb-&gt;cmd-&gt;request_buffer,</div><div class='add'>+								     srb-&gt;sg_count, &amp;offset, &amp;len);</div><div class='add'>+					virt = base + offset;</div><div class='add'>+				} else {</div><div class='add'>+					virt = srb-&gt;cmd-&gt;request_buffer + srb-&gt;cmd-&gt;request_bufflen - left_io;</div><div class='add'>+					len = left_io;</div><div class='add'>+				}</div><div class='add'>+				left_io -= len;</div><div class='add'>+</div><div class='add'>+				while (len) {</div><div class='add'>+					u8 byte;</div><div class='add'>+					byte = DC395x_read8(acb, TRM_S1040_SCSI_FIFO);</div><div class='add'>+					*virt++ = byte;</div><div class='add'>+</div><div class='ctx'> 					if (debug_enabled(DBG_PIO))</div><div class='ctx'> 						printk(" %02x", byte);</div><div class='add'>+</div><div class='add'>+					d_left_counter--;</div><div class='add'>+					sg_subtract_one(srb);</div><div class='add'>+</div><div class='add'>+					len--;</div><div class='add'>+</div><div class='add'>+					fc = DC395x_read8(acb, TRM_S1040_SCSI_FIFOCNT);</div><div class='add'>+</div><div class='add'>+					if (fc == 0x40) {</div><div class='add'>+						left_io = 0;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				WARN_ON((fc != 0x40) == !d_left_counter);</div><div class='add'>+</div><div class='add'>+				if (fc == 0x40 &amp;&amp; (srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC)) {</div><div class='add'>+					/* Read the last byte ... */</div><div class='add'>+					if (srb-&gt;total_xfer_length &gt; 0) {</div><div class='add'>+						u8 byte = DC395x_read8(acb, TRM_S1040_SCSI_FIFO);</div><div class='add'>+</div><div class='add'>+						*virt++ = byte;</div><div class='add'>+						srb-&gt;total_xfer_length--;</div><div class='add'>+						if (debug_enabled(DBG_PIO))</div><div class='add'>+							printk(" %02x", byte);</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					DC395x_write8(acb, TRM_S1040_SCSI_CONFIG2, 0);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (srb-&gt;cmd-&gt;use_sg) {</div><div class='add'>+					scsi_kunmap_atomic_sg(base);</div><div class='add'>+					local_irq_restore(flags);</div><div class='ctx'> 				}</div><div class='del'>-#endif</div><div class='del'>-				DC395x_write8(acb, TRM_S1040_SCSI_CONFIG2, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 			/*printk(" %08x", *(u32*)(bus_to_virt (addr))); */</div><div class='ctx'> 			/*srb-&gt;total_xfer_length = 0; */</div><div class='hunk'>@@ -2509,22 +2504,43 @@ static void data_io_transfer(struct AdapterCtlBlk *acb,</div><div class='ctx'> 				      SCMD_FIFO_IN);</div><div class='ctx'> 		} else {	/* write */</div><div class='ctx'> 			int ln = srb-&gt;total_xfer_length;</div><div class='add'>+			size_t left_io = srb-&gt;total_xfer_length;</div><div class='add'>+</div><div class='ctx'> 			if (srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC)</div><div class='ctx'> 				DC395x_write8(acb, TRM_S1040_SCSI_CONFIG2,</div><div class='ctx'> 				     CFG2_WIDEFIFO);</div><div class='del'>-			dprintkdbg(DBG_PIO,</div><div class='del'>-				"data_io_transfer: PIO %i bytes from %p:",</div><div class='del'>-				srb-&gt;total_xfer_length, srb-&gt;virt_addr);</div><div class='ctx'> </div><div class='del'>-			while (srb-&gt;total_xfer_length) {</div><div class='del'>-				if (debug_enabled(DBG_PIO))</div><div class='del'>-					printk(" %02x", (unsigned char) *(srb-&gt;virt_addr));</div><div class='add'>+			while (left_io) {</div><div class='add'>+				unsigned char *virt, *base = NULL;</div><div class='add'>+				unsigned long flags = 0;</div><div class='add'>+				size_t len = left_io;</div><div class='add'>+</div><div class='add'>+				if (srb-&gt;cmd-&gt;use_sg) {</div><div class='add'>+					size_t offset = srb-&gt;request_length - left_io;</div><div class='add'>+					local_irq_save(flags);</div><div class='add'>+					/* Again, max 4 bytes */</div><div class='add'>+					base = scsi_kmap_atomic_sg((struct scatterlist *)srb-&gt;cmd-&gt;request_buffer,</div><div class='add'>+								     srb-&gt;sg_count, &amp;offset, &amp;len);</div><div class='add'>+					virt = base + offset;</div><div class='add'>+				} else {</div><div class='add'>+					virt = srb-&gt;cmd-&gt;request_buffer + srb-&gt;cmd-&gt;request_bufflen - left_io;</div><div class='add'>+					len = left_io;</div><div class='add'>+				}</div><div class='add'>+				left_io -= len;</div><div class='add'>+</div><div class='add'>+				while (len--) {</div><div class='add'>+					if (debug_enabled(DBG_PIO))</div><div class='add'>+						printk(" %02x", *virt);</div><div class='add'>+</div><div class='add'>+					DC395x_write8(acb, TRM_S1040_SCSI_FIFO, *virt++);</div><div class='ctx'> </div><div class='del'>-				pio_trigger();</div><div class='del'>-				DC395x_write8(acb, TRM_S1040_SCSI_FIFO, </div><div class='del'>-				     *(srb-&gt;virt_addr)++);</div><div class='add'>+					sg_subtract_one(srb);</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-				sg_subtract_one(srb);</div><div class='add'>+				if (srb-&gt;cmd-&gt;use_sg) {</div><div class='add'>+					scsi_kunmap_atomic_sg(base);</div><div class='add'>+					local_irq_restore(flags);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (srb-&gt;dcb-&gt;sync_period &amp; WIDE_SYNC) {</div><div class='ctx'> 				if (ln % 2) {</div><div class='hunk'>@@ -3319,7 +3335,6 @@ static void pci_unmap_srb_sense(struct AdapterCtlBlk *acb,</div><div class='ctx'> 	    srb-&gt;segment_x[DC395x_MAX_SG_LISTENTRY - 1].address;</div><div class='ctx'> 	srb-&gt;segment_x[0].length =</div><div class='ctx'> 	    srb-&gt;segment_x[DC395x_MAX_SG_LISTENTRY - 1].length;</div><div class='del'>-	srb-&gt;virt_addr = srb-&gt;virt_addr_req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3332,21 +3347,14 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,</div><div class='ctx'> {</div><div class='ctx'> 	u8 tempcnt, status;</div><div class='ctx'> 	struct scsi_cmnd *cmd = srb-&gt;cmd;</div><div class='del'>-	struct ScsiInqData *ptr;</div><div class='ctx'> 	enum dma_data_direction dir = cmd-&gt;sc_data_direction;</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;use_sg) {</div><div class='del'>-		struct scatterlist* sg = (struct scatterlist *)cmd-&gt;request_buffer;</div><div class='del'>-		ptr = (struct ScsiInqData *)(page_address(sg-&gt;page) + sg-&gt;offset);</div><div class='del'>-	} else {</div><div class='del'>-		ptr = (struct ScsiInqData *)(cmd-&gt;request_buffer);</div><div class='del'>-	}</div><div class='add'>+	int ckc_only = 1;</div><div class='ctx'> </div><div class='ctx'> 	dprintkdbg(DBG_1, "srb_done: (pid#%li) &lt;%02i-%i&gt;\n", srb-&gt;cmd-&gt;pid,</div><div class='ctx'> 		srb-&gt;cmd-&gt;device-&gt;id, srb-&gt;cmd-&gt;device-&gt;lun);</div><div class='del'>-	dprintkdbg(DBG_SG, "srb_done: srb=%p sg=%i(%i/%i) buf=%p addr=%p\n",</div><div class='add'>+	dprintkdbg(DBG_SG, "srb_done: srb=%p sg=%i(%i/%i) buf=%p\n",</div><div class='ctx'> 		srb, cmd-&gt;use_sg, srb-&gt;sg_index, srb-&gt;sg_count,</div><div class='del'>-		cmd-&gt;request_buffer, ptr);</div><div class='add'>+		cmd-&gt;request_buffer);</div><div class='ctx'> 	status = srb-&gt;target_status;</div><div class='ctx'> 	if (srb-&gt;flag &amp; AUTO_REQSENSE) {</div><div class='ctx'> 		dprintkdbg(DBG_0, "srb_done: AUTO_REQSENSE1\n");</div><div class='hunk'>@@ -3485,29 +3493,47 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,</div><div class='ctx'> 					    srb-&gt;segment_x[0].address,</div><div class='ctx'> 					    cmd-&gt;request_bufflen, dir);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if ((cmd-&gt;result &amp; RES_DID) == 0 &amp;&amp; cmd-&gt;cmnd[0] == INQUIRY</div><div class='del'>-	    &amp;&amp; cmd-&gt;cmnd[2] == 0 &amp;&amp; cmd-&gt;request_bufflen &gt;= 8</div><div class='del'>-	    &amp;&amp; dir != PCI_DMA_NONE &amp;&amp; ptr &amp;&amp; (ptr-&gt;Vers &amp; 0x07) &gt;= 2)</div><div class='del'>-		dcb-&gt;inquiry7 = ptr-&gt;Flags;</div><div class='add'>+	ckc_only = 0;</div><div class='ctx'> /* Check Error Conditions */</div><div class='ctx'>       ckc_e:</div><div class='ctx'> </div><div class='add'>+	if (cmd-&gt;cmnd[0] == INQUIRY) {</div><div class='add'>+		unsigned char *base = NULL;</div><div class='add'>+		struct ScsiInqData *ptr;</div><div class='add'>+		unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+		if (cmd-&gt;use_sg) {</div><div class='add'>+			struct scatterlist* sg = (struct scatterlist *)cmd-&gt;request_buffer;</div><div class='add'>+			size_t offset = 0, len = sizeof(struct ScsiInqData);</div><div class='add'>+</div><div class='add'>+			local_irq_save(flags);</div><div class='add'>+			base = scsi_kmap_atomic_sg(sg, cmd-&gt;use_sg, &amp;offset, &amp;len);</div><div class='add'>+			ptr = (struct ScsiInqData *)(base + offset);</div><div class='add'>+		} else</div><div class='add'>+			ptr = (struct ScsiInqData *)(cmd-&gt;request_buffer);</div><div class='add'>+</div><div class='add'>+		if (!ckc_only &amp;&amp; (cmd-&gt;result &amp; RES_DID) == 0</div><div class='add'>+		    &amp;&amp; cmd-&gt;cmnd[2] == 0 &amp;&amp; cmd-&gt;request_bufflen &gt;= 8</div><div class='add'>+		    &amp;&amp; dir != PCI_DMA_NONE &amp;&amp; ptr &amp;&amp; (ptr-&gt;Vers &amp; 0x07) &gt;= 2)</div><div class='add'>+			dcb-&gt;inquiry7 = ptr-&gt;Flags;</div><div class='add'>+</div><div class='ctx'> 	/*if( srb-&gt;cmd-&gt;cmnd[0] == INQUIRY &amp;&amp; */</div><div class='ctx'> 	/*  (host_byte(cmd-&gt;result) == DID_OK || status_byte(cmd-&gt;result) &amp; CHECK_CONDITION) ) */</div><div class='del'>-	if (cmd-&gt;cmnd[0] == INQUIRY &amp;&amp; (cmd-&gt;result == (DID_OK &lt;&lt; 16)</div><div class='del'>-					 || status_byte(cmd-&gt;</div><div class='del'>-							result) &amp;</div><div class='del'>-					 CHECK_CONDITION)) {</div><div class='del'>-</div><div class='del'>-		if (!dcb-&gt;init_tcq_flag) {</div><div class='del'>-			add_dev(acb, dcb, ptr);</div><div class='del'>-			dcb-&gt;init_tcq_flag = 1;</div><div class='add'>+		if ((cmd-&gt;result == (DID_OK &lt;&lt; 16)</div><div class='add'>+		     || status_byte(cmd-&gt;result) &amp;</div><div class='add'>+		     CHECK_CONDITION)) {</div><div class='add'>+			if (!dcb-&gt;init_tcq_flag) {</div><div class='add'>+				add_dev(acb, dcb, ptr);</div><div class='add'>+				dcb-&gt;init_tcq_flag = 1;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (cmd-&gt;use_sg) {</div><div class='add'>+			scsi_kunmap_atomic_sg(base);</div><div class='add'>+			local_irq_restore(flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* Here is the info for Doug Gilbert's sg3 ... */</div><div class='ctx'> 	cmd-&gt;resid = srb-&gt;total_xfer_length;</div><div class='ctx'> 	/* This may be interpreted by sb. or not ... */</div><div class='hunk'>@@ -3713,8 +3739,6 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,</div><div class='ctx'> 	srb-&gt;xferred = srb-&gt;total_xfer_length;</div><div class='ctx'> 	/* srb-&gt;segment_x : a one entry of S/G list table */</div><div class='ctx'> 	srb-&gt;total_xfer_length = sizeof(cmd-&gt;sense_buffer);</div><div class='del'>-	srb-&gt;virt_addr_req = srb-&gt;virt_addr;</div><div class='del'>-	srb-&gt;virt_addr = cmd-&gt;sense_buffer;</div><div class='ctx'> 	srb-&gt;segment_x[0].length = sizeof(cmd-&gt;sense_buffer);</div><div class='ctx'> 	/* Map sense buffer */</div><div class='ctx'> 	srb-&gt;segment_x[0].address =</div><div class='hunk'>@@ -3747,7 +3771,7 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,</div><div class='ctx'>  * @target: The target for the new device.</div><div class='ctx'>  * @lun: The lun for the new device.</div><div class='ctx'>  *</div><div class='del'>- * Return the new device if succesfull or NULL on failure.</div><div class='add'>+ * Return the new device if successful or NULL on failure.</div><div class='ctx'>  **/</div><div class='ctx'> static struct DeviceCtlBlk *device_alloc(struct AdapterCtlBlk *acb,</div><div class='ctx'> 		u8 target, u8 lun)</div><div class='hunk'>@@ -4538,7 +4562,7 @@ static int __devinit adapter_init(struct AdapterCtlBlk *acb,</div><div class='ctx'> 	acb-&gt;io_port_base = io_port;</div><div class='ctx'> 	acb-&gt;io_port_len = io_port_len;</div><div class='ctx'> 	</div><div class='del'>-	if (request_irq(irq, dc395x_interrupt, SA_SHIRQ, DC395X_NAME, acb)) {</div><div class='add'>+	if (request_irq(irq, dc395x_interrupt, IRQF_SHARED, DC395X_NAME, acb)) {</div><div class='ctx'> 	    	/* release the region we just claimed */</div><div class='ctx'> 		dprintkl(KERN_INFO, "Failed to register IRQ\n");</div><div class='ctx'> 		goto failed;</div><div class='head'>diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c<br/>index a35ee43a48df..eb32062f7e68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dec_esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dec_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dec_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/dec_esp.c</a></div><div class='hunk'>@@ -202,19 +202,19 @@ static int dec_esp_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> </div><div class='ctx'> 		esp_initialize(esp);</div><div class='ctx'> </div><div class='del'>-		if (request_irq(esp-&gt;irq, esp_intr, SA_INTERRUPT,</div><div class='add'>+		if (request_irq(esp-&gt;irq, esp_intr, IRQF_DISABLED,</div><div class='ctx'> 				"ncr53c94", esp-&gt;ehost))</div><div class='ctx'> 			goto err_dealloc;</div><div class='ctx'> 		if (request_irq(dec_interrupt[DEC_IRQ_ASC_MERR],</div><div class='del'>-				scsi_dma_merr_int, SA_INTERRUPT,</div><div class='add'>+				scsi_dma_merr_int, IRQF_DISABLED,</div><div class='ctx'> 				"ncr53c94 error", esp-&gt;ehost))</div><div class='ctx'> 			goto err_free_irq;</div><div class='ctx'> 		if (request_irq(dec_interrupt[DEC_IRQ_ASC_ERR],</div><div class='del'>-				scsi_dma_err_int, SA_INTERRUPT,</div><div class='add'>+				scsi_dma_err_int, IRQF_DISABLED,</div><div class='ctx'> 				"ncr53c94 overrun", esp-&gt;ehost))</div><div class='ctx'> 			goto err_free_irq_merr;</div><div class='ctx'> 		if (request_irq(dec_interrupt[DEC_IRQ_ASC_DMA],</div><div class='del'>-				scsi_dma_int, SA_INTERRUPT,</div><div class='add'>+				scsi_dma_int, IRQF_DISABLED,</div><div class='ctx'> 				"ncr53c94 dma", esp-&gt;ehost))</div><div class='ctx'> 			goto err_free_irq_err;</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +276,7 @@ static int dec_esp_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 			esp-&gt;dma_mmu_release_scsi_sgl = 0;</div><div class='ctx'> 			esp-&gt;dma_advance_sg = 0;</div><div class='ctx'> </div><div class='del'>- 			if (request_irq(esp-&gt;irq, esp_intr, SA_INTERRUPT,</div><div class='add'>+ 			if (request_irq(esp-&gt;irq, esp_intr, IRQF_DISABLED,</div><div class='ctx'>  					 "PMAZ_AA", esp-&gt;ehost)) {</div><div class='ctx'>  				esp_deallocate(esp);</div><div class='ctx'>  				release_tc_card(slot);</div><div class='head'>diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c<br/>index 38e4010eff96..879a26657676 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dmx3191d.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dmx3191d.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dmx3191d.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/dmx3191d.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ static int __devinit dmx3191d_probe_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pdev-&gt;irq, NCR5380_intr, SA_SHIRQ,</div><div class='add'>+	if (request_irq(pdev-&gt;irq, NCR5380_intr, IRQF_SHARED,</div><div class='ctx'> 				DMX3191D_DRIVER_NAME, shost)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Steam powered scsi controllers run without an IRQ anyway</div><div class='head'>diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h<br/>index a9585f5235d9..d84a281ad944 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dpt/dpti_i2o.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dpt/dpti_i2o.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dpt/dpti_i2o.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/dpt/dpti_i2o.h</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/semaphore.h&gt; /* Needed for MUTEX init macros */</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c<br/>index b1b704a42efd..e1337339cacc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dpt_i2o.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dpt_i2o.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dpt_i2o.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/dpt_i2o.c</a></div><div class='hunk'>@@ -1009,7 +1009,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev</div><div class='ctx'> 		printk(KERN_INFO"     BAR1 %p - size= %x\n",msg_addr_virt,hba_map1_area_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq (pDev-&gt;irq, adpt_isr, SA_SHIRQ, pHba-&gt;name, pHba)) {</div><div class='add'>+	if (request_irq (pDev-&gt;irq, adpt_isr, IRQF_SHARED, pHba-&gt;name, pHba)) {</div><div class='ctx'> 		printk(KERN_ERR"%s: Couldn't register IRQ %d\n", pHba-&gt;name, pDev-&gt;irq);</div><div class='ctx'> 		adpt_i2o_delete_hba(pHba);</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c<br/>index 310d2f488668..0d5713dfa204 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/dtc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/dtc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/dtc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/dtc.c</a></div><div class='hunk'>@@ -145,35 +145,35 @@ static struct override {</div><div class='ctx'> 0, IRQ_AUTO}};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))</div><div class='add'>+#define NO_OVERRIDES ARRAY_SIZE(overrides)</div><div class='ctx'> </div><div class='ctx'> static struct base {</div><div class='ctx'> 	unsigned long address;</div><div class='ctx'> 	int noauto;</div><div class='del'>-} bases[] __initdata = { </div><div class='del'>-	{ 0xcc000, 0 }, </div><div class='del'>-	{ 0xc8000, 0 }, </div><div class='del'>-	{ 0xdc000, 0 }, </div><div class='add'>+} bases[] __initdata = {</div><div class='add'>+	{ 0xcc000, 0 },</div><div class='add'>+	{ 0xc8000, 0 },</div><div class='add'>+	{ 0xdc000, 0 },</div><div class='ctx'> 	{ 0xd8000, 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NO_BASES (sizeof (bases) / sizeof (struct base))</div><div class='add'>+#define NO_BASES ARRAY_SIZE(bases)</div><div class='ctx'> </div><div class='ctx'> static const struct signature {</div><div class='ctx'> 	const char *string;</div><div class='ctx'> 	int offset;</div><div class='del'>-} signatures[] = { </div><div class='add'>+} signatures[] = {</div><div class='ctx'> 	{"DATA TECHNOLOGY CORPORATION BIOS", 0x25},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NO_SIGNATURES (sizeof (signatures) /  sizeof (struct signature))</div><div class='add'>+#define NO_SIGNATURES ARRAY_SIZE(signatures)</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> /*</div><div class='ctx'>  * Function : dtc_setup(char *str, int *ints)</div><div class='ctx'>  *</div><div class='ctx'>  * Purpose : LILO command line initialization of the overrides array,</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Inputs : str - unused, ints - array of integer parameters with ints[0]</div><div class='ctx'>  *	equal to the number of ints.</div><div class='ctx'>  *</div><div class='hunk'>@@ -280,7 +280,7 @@ found:</div><div class='ctx'> 		/* With interrupts enabled, it will sometimes hang when doing heavy</div><div class='ctx'> 		 * reads. So better not enable them until I finger it out. */</div><div class='ctx'> 		if (instance-&gt;irq != SCSI_IRQ_NONE)</div><div class='del'>-			if (request_irq(instance-&gt;irq, dtc_intr, SA_INTERRUPT, "dtc", instance)) {</div><div class='add'>+			if (request_irq(instance-&gt;irq, dtc_intr, IRQF_DISABLED, "dtc", instance)) {</div><div class='ctx'> 				printk(KERN_ERR "scsi%d : IRQ%d not free, interrupts disabled\n", instance-&gt;host_no, instance-&gt;irq);</div><div class='ctx'> 				instance-&gt;irq = SCSI_IRQ_NONE;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c<br/>index 059eeee4b554..a5ff43b1b263 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/eata.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/eata.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/eata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/eata.c</a></div><div class='hunk'>@@ -477,7 +477,6 @@</div><div class='ctx'>  *  the driver sets host-&gt;wish_block = 1 for all ISA boards.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -1222,7 +1221,7 @@ static int port_detect(unsigned long port_base, unsigned int j,</div><div class='ctx'> </div><div class='ctx'> 	/* Board detected, allocate its IRQ */</div><div class='ctx'> 	if (request_irq(irq, do_interrupt_handler,</div><div class='del'>-			SA_INTERRUPT | ((subversion == ESA) ? SA_SHIRQ : 0),</div><div class='add'>+			IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED : 0),</div><div class='ctx'> 			driver_name, (void *)&amp;sha[j])) {</div><div class='ctx'> 		printk("%s: unable to allocate IRQ %u, detaching.\n", name,</div><div class='ctx'> 		       irq);</div><div class='head'>diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c<br/>index 23beb48c79c5..771b01984cbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/eata_pio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/eata_pio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/eata_pio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/eata_pio.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'>  *  last change: 2002/11/02               OS: Linux 2.5.45  *</div><div class='ctx'>  ************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -732,7 +731,7 @@ static int register_pio_HBA(long base, struct get_conf *gc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!reg_IRQ[gc-&gt;IRQ]) {	/* Interrupt already registered ? */</div><div class='del'>-		if (!request_irq(gc-&gt;IRQ, do_eata_pio_int_handler, SA_INTERRUPT, "EATA-PIO", sh)) {</div><div class='add'>+		if (!request_irq(gc-&gt;IRQ, do_eata_pio_int_handler, IRQF_DISABLED, "EATA-PIO", sh)) {</div><div class='ctx'> 			reg_IRQ[gc-&gt;IRQ]++;</div><div class='ctx'> 			if (!gc-&gt;IRQ_TR)</div><div class='ctx'> 				reg_IRQL[gc-&gt;IRQ] = 1;	/* IRQ is edge triggered */</div><div class='hunk'>@@ -966,7 +965,7 @@ static int eata_pio_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= MAXIRQ; i++)</div><div class='ctx'> 		if (reg_IRQ[i])</div><div class='del'>-			request_irq(i, do_eata_pio_int_handler, SA_INTERRUPT, "EATA-PIO", NULL);</div><div class='add'>+			request_irq(i, do_eata_pio_int_handler, IRQF_DISABLED, "EATA-PIO", NULL);</div><div class='ctx'> </div><div class='ctx'> 	HBA_ptr = first_HBA;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c<br/>index 87a8c3d2072c..10573c24a50b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/esp.c</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='del'>-/* $Id: esp.c,v 1.101 2002/01/15 06:48:55 davem Exp $</div><div class='del'>- * esp.c:  EnhancedScsiProcessor Sun SCSI driver code.</div><div class='add'>+/* esp.c: ESP Sun SCSI driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1995, 1998 David S. Miller (davem@caip.rutgers.edu)</div><div class='add'>+ * Copyright (C) 1995, 1998, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* TODO:</div><div class='hunk'>@@ -13,7 +12,6 @@</div><div class='ctx'>  * 3) Add tagged queueing.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -185,11 +183,6 @@ enum {</div><div class='ctx'> /*5*/	do_intr_end</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The master ring of all esp hosts we are managing in this driver. */</div><div class='del'>-static struct esp *espchain;</div><div class='del'>-static DEFINE_SPINLOCK(espchain_lock);</div><div class='del'>-static int esps_running = 0;</div><div class='del'>-</div><div class='ctx'> /* Forward declarations. */</div><div class='ctx'> static irqreturn_t esp_intr(int irq, void *dev_id, struct pt_regs *pregs);</div><div class='ctx'> </div><div class='hunk'>@@ -694,36 +687,6 @@ static void __init esp_bootup_reset(struct esp *esp)</div><div class='ctx'> 	sbus_readb(esp-&gt;eregs + ESP_INTRPT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void esp_chain_add(struct esp *esp)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(&amp;espchain_lock);</div><div class='del'>-	if (espchain) {</div><div class='del'>-		struct esp *elink = espchain;</div><div class='del'>-		while (elink-&gt;next)</div><div class='del'>-			elink = elink-&gt;next;</div><div class='del'>-		elink-&gt;next = esp;</div><div class='del'>-	} else {</div><div class='del'>-		espchain = esp;</div><div class='del'>-	}</div><div class='del'>-	esp-&gt;next = NULL;</div><div class='del'>-	spin_unlock_irq(&amp;espchain_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void esp_chain_del(struct esp *esp)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(&amp;espchain_lock);</div><div class='del'>-	if (espchain == esp) {</div><div class='del'>-		espchain = esp-&gt;next;</div><div class='del'>-	} else {</div><div class='del'>-		struct esp *elink = espchain;</div><div class='del'>-		while (elink-&gt;next != esp)</div><div class='del'>-			elink = elink-&gt;next;</div><div class='del'>-		elink-&gt;next = esp-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	esp-&gt;next = NULL;</div><div class='del'>-	spin_unlock_irq(&amp;espchain_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init esp_find_dvma(struct esp *esp, struct sbus_dev *dma_sdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbus_dev *sdev = esp-&gt;sdev;</div><div class='hunk'>@@ -815,14 +778,14 @@ static int __init esp_register_irq(struct esp *esp)</div><div class='ctx'> 	 * sanely maintain.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (request_irq(esp-&gt;ehost-&gt;irq, esp_intr,</div><div class='del'>-			SA_SHIRQ, "ESP SCSI", esp)) {</div><div class='add'>+			IRQF_SHARED, "ESP SCSI", esp)) {</div><div class='ctx'> 		printk("esp%d: Cannot acquire irq line\n",</div><div class='ctx'> 		       esp-&gt;esp_id);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("esp%d: IRQ %s ", esp-&gt;esp_id,</div><div class='del'>-	       __irq_itoa(esp-&gt;ehost-&gt;irq));</div><div class='add'>+	printk("esp%d: IRQ %d ", esp-&gt;esp_id,</div><div class='add'>+	       esp-&gt;ehost-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -830,19 +793,20 @@ static int __init esp_register_irq(struct esp *esp)</div><div class='ctx'> static void __init esp_get_scsi_id(struct esp *esp)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbus_dev *sdev = esp-&gt;sdev;</div><div class='add'>+	struct device_node *dp = sdev-&gt;ofdev.node;</div><div class='ctx'> </div><div class='del'>-	esp-&gt;scsi_id = prom_getintdefault(esp-&gt;prom_node,</div><div class='del'>-					  "initiator-id",</div><div class='del'>-					  -1);</div><div class='add'>+	esp-&gt;scsi_id = of_getintprop_default(dp,</div><div class='add'>+					     "initiator-id",</div><div class='add'>+					     -1);</div><div class='ctx'> 	if (esp-&gt;scsi_id == -1)</div><div class='del'>-		esp-&gt;scsi_id = prom_getintdefault(esp-&gt;prom_node,</div><div class='del'>-						  "scsi-initiator-id",</div><div class='del'>-						  -1);</div><div class='add'>+		esp-&gt;scsi_id = of_getintprop_default(dp,</div><div class='add'>+						     "scsi-initiator-id",</div><div class='add'>+						     -1);</div><div class='ctx'> 	if (esp-&gt;scsi_id == -1)</div><div class='ctx'> 		esp-&gt;scsi_id = (sdev-&gt;bus == NULL) ? 7 :</div><div class='del'>-			prom_getintdefault(sdev-&gt;bus-&gt;prom_node,</div><div class='del'>-					   "scsi-initiator-id",</div><div class='del'>-					   7);</div><div class='add'>+			of_getintprop_default(sdev-&gt;bus-&gt;ofdev.node,</div><div class='add'>+					      "scsi-initiator-id",</div><div class='add'>+					      7);</div><div class='ctx'> 	esp-&gt;ehost-&gt;this_id = esp-&gt;scsi_id;</div><div class='ctx'> 	esp-&gt;scsi_id_mask = (1 &lt;&lt; esp-&gt;scsi_id);</div><div class='ctx'> </div><div class='hunk'>@@ -1067,28 +1031,30 @@ static void __init esp_init_swstate(struct esp *esp)</div><div class='ctx'> 	esp-&gt;prev_hme_dmacsr = 0xffffffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init detect_one_esp(struct scsi_host_template *tpnt, struct sbus_dev *esp_dev,</div><div class='del'>-				 struct sbus_dev *espdma, struct sbus_bus *sbus,</div><div class='del'>-				 int id, int hme)</div><div class='add'>+static int __init detect_one_esp(struct scsi_host_template *tpnt,</div><div class='add'>+				 struct device *dev,</div><div class='add'>+				 struct sbus_dev *esp_dev,</div><div class='add'>+				 struct sbus_dev *espdma,</div><div class='add'>+				 struct sbus_bus *sbus,</div><div class='add'>+				 int hme)</div><div class='ctx'> {</div><div class='del'>-	struct Scsi_Host *esp_host = scsi_register(tpnt, sizeof(struct esp));</div><div class='add'>+	static int instance;</div><div class='add'>+	struct Scsi_Host *esp_host = scsi_host_alloc(tpnt, sizeof(struct esp));</div><div class='ctx'> 	struct esp *esp;</div><div class='ctx'> 	</div><div class='del'>-	if (!esp_host) {</div><div class='del'>-		printk("ESP: Cannot register SCSI host\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='add'>+	if (!esp_host)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	if (hme)</div><div class='ctx'> 		esp_host-&gt;max_id = 16;</div><div class='ctx'> 	esp = (struct esp *) esp_host-&gt;hostdata;</div><div class='ctx'> 	esp-&gt;ehost = esp_host;</div><div class='ctx'> 	esp-&gt;sdev = esp_dev;</div><div class='del'>-	esp-&gt;esp_id = id;</div><div class='add'>+	esp-&gt;esp_id = instance;</div><div class='ctx'> 	esp-&gt;prom_node = esp_dev-&gt;prom_node;</div><div class='ctx'> 	prom_getstring(esp-&gt;prom_node, "name", esp-&gt;prom_name,</div><div class='ctx'> 		       sizeof(esp-&gt;prom_name));</div><div class='ctx'> </div><div class='del'>-	esp_chain_add(esp);</div><div class='ctx'> 	if (esp_find_dvma(esp, espdma) &lt; 0)</div><div class='ctx'> 		goto fail_unlink;</div><div class='ctx'> 	if (esp_map_regs(esp, hme) &lt; 0) {</div><div class='hunk'>@@ -1115,8 +1081,19 @@ static int __init detect_one_esp(struct scsi_host_template *tpnt, struct sbus_de</div><div class='ctx'> </div><div class='ctx'> 	esp_bootup_reset(esp);</div><div class='ctx'> </div><div class='add'>+	if (scsi_add_host(esp_host, dev))</div><div class='add'>+		goto fail_free_irq;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;esp_dev-&gt;ofdev.dev, esp);</div><div class='add'>+</div><div class='add'>+	scsi_scan_host(esp_host);</div><div class='add'>+	instance++;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+fail_free_irq:</div><div class='add'>+	free_irq(esp-&gt;ehost-&gt;irq, esp);</div><div class='add'>+</div><div class='ctx'> fail_unmap_cmdarea:</div><div class='ctx'> 	sbus_free_consistent(esp-&gt;sdev, 16,</div><div class='ctx'> 			     (void *) esp-&gt;esp_command,</div><div class='hunk'>@@ -1129,119 +1106,98 @@ fail_dvma_release:</div><div class='ctx'> 	esp-&gt;dma-&gt;allocated = 0;</div><div class='ctx'> </div><div class='ctx'> fail_unlink:</div><div class='del'>-	esp_chain_del(esp);</div><div class='del'>-	scsi_unregister(esp_host);</div><div class='add'>+	scsi_host_put(esp_host);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Detecting ESP chips on the machine.  This is the simple and easy</div><div class='ctx'>  * version.</div><div class='ctx'>  */</div><div class='add'>+static int __devexit esp_remove_common(struct esp *esp)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq = esp-&gt;ehost-&gt;irq;</div><div class='add'>+</div><div class='add'>+	scsi_remove_host(esp-&gt;ehost);</div><div class='add'>+</div><div class='add'>+	ESP_INTSOFF(esp-&gt;dregs);</div><div class='add'>+#if 0</div><div class='add'>+	esp_reset_dma(esp);</div><div class='add'>+	esp_reset_esp(esp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	free_irq(irq, esp);</div><div class='add'>+	sbus_free_consistent(esp-&gt;sdev, 16,</div><div class='add'>+			     (void *) esp-&gt;esp_command, esp-&gt;esp_command_dvma);</div><div class='add'>+	sbus_iounmap(esp-&gt;eregs, ESP_REG_SIZE);</div><div class='add'>+	esp-&gt;dma-&gt;allocated = 0;</div><div class='add'>+</div><div class='add'>+	scsi_host_put(esp-&gt;ehost);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUN4</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sun4paddr.h&gt;</div><div class='ctx'> </div><div class='del'>-static int __init esp_detect(struct scsi_host_template *tpnt)</div><div class='del'>-{</div><div class='del'>-	static struct sbus_dev esp_dev;</div><div class='del'>-	int esps_in_use = 0;</div><div class='del'>-</div><div class='del'>-	espchain = NULL;</div><div class='add'>+static struct sbus_dev sun4_esp_dev;</div><div class='ctx'> </div><div class='add'>+static int __init esp_sun4_probe(struct scsi_host_template *tpnt)</div><div class='add'>+{</div><div class='ctx'> 	if (sun4_esp_physaddr) {</div><div class='del'>-		memset (&amp;esp_dev, 0, sizeof(esp_dev));</div><div class='del'>-		esp_dev.reg_addrs[0].phys_addr = sun4_esp_physaddr;</div><div class='del'>-		esp_dev.irqs[0] = 4;</div><div class='del'>-		esp_dev.resource[0].start = sun4_esp_physaddr;</div><div class='del'>-		esp_dev.resource[0].end = sun4_esp_physaddr + ESP_REG_SIZE - 1;</div><div class='del'>-		esp_dev.resource[0].flags = IORESOURCE_IO;</div><div class='del'>-</div><div class='del'>-		if (!detect_one_esp(tpnt, &amp;esp_dev, NULL, NULL, 0, 0))</div><div class='del'>-			esps_in_use++;</div><div class='del'>-		printk("ESP: Total of 1 ESP hosts found, %d actually in use.\n", esps_in_use);</div><div class='del'>-		esps_running =  esps_in_use;</div><div class='add'>+		memset(&amp;sun4_esp_dev, 0, sizeof(esp_dev));</div><div class='add'>+		sun4_esp_dev.reg_addrs[0].phys_addr = sun4_esp_physaddr;</div><div class='add'>+		sun4_esp_dev.irqs[0] = 4;</div><div class='add'>+		sun4_esp_dev.resource[0].start = sun4_esp_physaddr;</div><div class='add'>+		sun4_esp_dev.resource[0].end =</div><div class='add'>+			sun4_esp_physaddr + ESP_REG_SIZE - 1;</div><div class='add'>+		sun4_esp_dev.resource[0].flags = IORESOURCE_IO;</div><div class='add'>+</div><div class='add'>+		return detect_one_esp(tpnt, NULL,</div><div class='add'>+				      &amp;sun4_esp_dev, NULL, NULL, 0);</div><div class='ctx'> 	}</div><div class='del'>-	return esps_in_use;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_SUN4 */</div><div class='del'>-</div><div class='del'>-static int __init esp_detect(struct scsi_host_template *tpnt)</div><div class='add'>+static int __devexit esp_sun4_remove(void)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *esp_dev, *sbdev_iter;</div><div class='del'>-	int nesps = 0, esps_in_use = 0;</div><div class='add'>+	struct esp *esp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	espchain = 0;</div><div class='del'>-	if (!sbus_root) {</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-		return 0;</div><div class='del'>-#else</div><div class='del'>-		panic("No SBUS in esp_detect()");</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sbdev_iter, sbus) {</div><div class='del'>-			struct sbus_dev *espdma = NULL;</div><div class='del'>-			int hme = 0;</div><div class='del'>-</div><div class='del'>-			/* Is it an esp sbus device? */</div><div class='del'>-			esp_dev = sbdev_iter;</div><div class='del'>-			if (strcmp(esp_dev-&gt;prom_name, "esp") &amp;&amp;</div><div class='del'>-			    strcmp(esp_dev-&gt;prom_name, "SUNW,esp")) {</div><div class='del'>-				if (!strcmp(esp_dev-&gt;prom_name, "SUNW,fas")) {</div><div class='del'>-					hme = 1;</div><div class='del'>-					espdma = esp_dev;</div><div class='del'>-				} else {</div><div class='del'>-					if (!esp_dev-&gt;child ||</div><div class='del'>-					    (strcmp(esp_dev-&gt;prom_name, "espdma") &amp;&amp;</div><div class='del'>-					     strcmp(esp_dev-&gt;prom_name, "dma")))</div><div class='del'>-						continue; /* nope... */</div><div class='del'>-					espdma = esp_dev;</div><div class='del'>-					esp_dev = esp_dev-&gt;child;</div><div class='del'>-					if (strcmp(esp_dev-&gt;prom_name, "esp") &amp;&amp;</div><div class='del'>-					    strcmp(esp_dev-&gt;prom_name, "SUNW,esp"))</div><div class='del'>-						continue; /* how can this happen? */</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (detect_one_esp(tpnt, esp_dev, espdma, sbus, nesps++, hme) &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-				</div><div class='del'>-			esps_in_use++;</div><div class='del'>-		} /* for each sbusdev */</div><div class='del'>-	} /* for each sbus */</div><div class='del'>-	printk("ESP: Total of %d ESP hosts found, %d actually in use.\n", nesps,</div><div class='del'>-	       esps_in_use);</div><div class='del'>-	esps_running = esps_in_use;</div><div class='del'>-	return esps_in_use;</div><div class='add'>+	return esp_remove_common(esp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* !CONFIG_SUN4 */</div><div class='add'>+#else /* !CONFIG_SUN4 */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static int esp_release(struct Scsi_Host *host)</div><div class='add'>+static int __devinit esp_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct esp *esp = (struct esp *) host-&gt;hostdata;</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	struct sbus_dev *dma_sdev = NULL;</div><div class='add'>+	int hme = 0;</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;parent &amp;&amp;</div><div class='add'>+	    (!strcmp(dp-&gt;parent-&gt;name, "espdma") ||</div><div class='add'>+	     !strcmp(dp-&gt;parent-&gt;name, "dma")))</div><div class='add'>+		dma_sdev = sdev-&gt;parent;</div><div class='add'>+	else if (!strcmp(dp-&gt;name, "SUNW,fas")) {</div><div class='add'>+		dma_sdev = sdev;</div><div class='add'>+		hme = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ESP_INTSOFF(esp-&gt;dregs);</div><div class='del'>-#if 0</div><div class='del'>-	esp_reset_dma(esp);</div><div class='del'>-	esp_reset_esp(esp);</div><div class='del'>-#endif</div><div class='add'>+	return detect_one_esp(match-&gt;data, &amp;dev-&gt;dev,</div><div class='add'>+			      sdev, dma_sdev, sdev-&gt;bus, hme);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	free_irq(esp-&gt;ehost-&gt;irq, esp);</div><div class='del'>-	sbus_free_consistent(esp-&gt;sdev, 16,</div><div class='del'>-			     (void *) esp-&gt;esp_command, esp-&gt;esp_command_dvma);</div><div class='del'>-	sbus_iounmap(esp-&gt;eregs, ESP_REG_SIZE);</div><div class='del'>-	esp-&gt;dma-&gt;allocated = 0;</div><div class='del'>-	esp_chain_del(esp);</div><div class='add'>+static int __devexit esp_sbus_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct esp *esp = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-        return 0;</div><div class='add'>+	return esp_remove_common(esp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* !CONFIG_SUN4 */</div><div class='add'>+</div><div class='ctx'> /* The info function will return whatever useful</div><div class='ctx'>  * information the developer sees fit.  If not provided, then</div><div class='ctx'>  * the name field will be used instead.</div><div class='hunk'>@@ -1415,18 +1371,11 @@ static int esp_host_info(struct esp *esp, char *ptr, off_t offset, int len)</div><div class='ctx'> static int esp_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset,</div><div class='ctx'> 			 int length, int inout)</div><div class='ctx'> {</div><div class='del'>-	struct esp *esp;</div><div class='add'>+	struct esp *esp = (struct esp *) host-&gt;hostdata;</div><div class='ctx'> </div><div class='ctx'> 	if (inout)</div><div class='ctx'> 		return -EINVAL; /* not yet */</div><div class='ctx'> </div><div class='del'>-	for_each_esp(esp) {</div><div class='del'>-		if (esp-&gt;ehost == host)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!esp)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if (start)</div><div class='ctx'> 		*start = buffer;</div><div class='ctx'> </div><div class='hunk'>@@ -4377,15 +4326,12 @@ static void esp_slave_destroy(struct scsi_device *SDptr)</div><div class='ctx'> 	SDptr-&gt;hostdata = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct scsi_host_template driver_template = {</div><div class='del'>-	.proc_name		= "esp",</div><div class='del'>-	.proc_info		= esp_proc_info,</div><div class='del'>-	.name			= "Sun ESP 100/100a/200",</div><div class='del'>-	.detect			= esp_detect,</div><div class='add'>+static struct scsi_host_template esp_template = {</div><div class='add'>+	.module			= THIS_MODULE,</div><div class='add'>+	.name			= "esp",</div><div class='add'>+	.info			= esp_info,</div><div class='ctx'> 	.slave_alloc		= esp_slave_alloc,</div><div class='ctx'> 	.slave_destroy		= esp_slave_destroy,</div><div class='del'>-	.release		= esp_release,</div><div class='del'>-	.info			= esp_info,</div><div class='ctx'> 	.queuecommand		= esp_queue,</div><div class='ctx'> 	.eh_abort_handler	= esp_abort,</div><div class='ctx'> 	.eh_bus_reset_handler	= esp_reset,</div><div class='hunk'>@@ -4394,12 +4340,58 @@ static struct scsi_host_template driver_template = {</div><div class='ctx'> 	.sg_tablesize		= SG_ALL,</div><div class='ctx'> 	.cmd_per_lun		= 1,</div><div class='ctx'> 	.use_clustering		= ENABLE_CLUSTERING,</div><div class='add'>+	.proc_name		= "esp",</div><div class='add'>+	.proc_info		= esp_proc_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SUN4</div><div class='add'>+static struct of_device_id esp_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,esp",</div><div class='add'>+		.data = &amp;esp_template,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,fas",</div><div class='add'>+		.data = &amp;esp_template,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "esp",</div><div class='add'>+		.data = &amp;esp_template,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, esp_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver esp_sbus_driver = {</div><div class='add'>+	.name		= "esp",</div><div class='add'>+	.match_table	= esp_match,</div><div class='add'>+	.probe		= esp_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(esp_sbus_remove),</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int __init esp_init(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SUN4</div><div class='add'>+	return esp_sun4_probe(&amp;esp_template);</div><div class='add'>+#else</div><div class='add'>+	return of_register_driver(&amp;esp_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#include "scsi_module.c"</div><div class='add'>+static void __exit esp_exit(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SUN4</div><div class='add'>+	esp_sun4_remove();</div><div class='add'>+#else</div><div class='add'>+	of_unregister_driver(&amp;esp_sbus_driver);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-MODULE_DESCRIPTION("EnhancedScsiProcessor Sun SCSI driver");</div><div class='del'>-MODULE_AUTHOR("David S. Miller (davem@redhat.com)");</div><div class='add'>+MODULE_DESCRIPTION("ESP Sun SCSI driver");</div><div class='add'>+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='add'>+module_init(esp_init);</div><div class='add'>+module_exit(esp_exit);</div><div class='head'>diff --git a/drivers/scsi/esp.h b/drivers/scsi/esp.h<br/>index 73f7d6968ab6..a98cda9121fc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/esp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/esp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/esp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/esp.h</a></div><div class='hunk'>@@ -403,8 +403,4 @@ struct esp {</div><div class='ctx'> #define ESP_MHZ_TO_CYCLE(mhertz)  ((1000000000) / ((mhertz) / 1000))</div><div class='ctx'> #define ESP_TICK(ccf, cycle)  ((7682 * (ccf) * (cycle) / 1000))</div><div class='ctx'> </div><div class='del'>-/* For our interrupt engine. */</div><div class='del'>-#define for_each_esp(esp) \</div><div class='del'>-        for((esp) = espchain; (esp); (esp) = (esp)-&gt;next)</div><div class='del'>-</div><div class='ctx'> #endif /* !(_SPARC_ESP_H) */</div><div class='head'>diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c<br/>index 8ae9c406a83b..2a1c5c22b9e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/fastlane.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fastlane.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/fastlane.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/fastlane.c</a></div><div class='hunk'>@@ -210,7 +210,7 @@ int __init fastlane_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='ctx'> 		esp-&gt;slot = board+FASTLANE_ESP_ADDR;</div><div class='del'>-		if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,</div><div class='add'>+		if (request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,</div><div class='ctx'> 				"Fastlane SCSI", esp-&gt;ehost)) {</div><div class='ctx'> 			printk(KERN_WARNING "Fastlane: Could not get IRQ%d, aborting.\n", IRQ_AMIGA_PORTS);</div><div class='ctx'> 			goto err_unmap;</div><div class='head'>diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c<br/>index 03416548f20c..7f891023aa15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/fcal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fcal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/fcal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/fcal.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef CONFIG_KMOD</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c<br/>index cca485a2b438..dde3edf35c03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/fd_mcs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fd_mcs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/fd_mcs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/fd_mcs.c</a></div><div class='hunk'>@@ -279,7 +279,7 @@ static struct fd_mcs_adapters_struct fd_mcs_adapters[] = {</div><div class='ctx'> 	 2},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define FD_BRDS sizeof(fd_mcs_adapters)/sizeof(struct fd_mcs_adapters_struct)</div><div class='add'>+#define FD_BRDS ARRAY_SIZE(fd_mcs_adapters)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs);</div><div class='ctx'> </div><div class='hunk'>@@ -400,7 +400,7 @@ static int fd_mcs_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 				mca_set_adapter_name(slot - 1, fd_mcs_adapters[loop].name);</div><div class='ctx'> </div><div class='ctx'> 				/* check irq/region */</div><div class='del'>-				if (request_irq(irq, fd_mcs_intr, SA_SHIRQ, "fd_mcs", hosts)) {</div><div class='add'>+				if (request_irq(irq, fd_mcs_intr, IRQF_SHARED, "fd_mcs", hosts)) {</div><div class='ctx'> 					printk(KERN_ERR "fd_mcs: interrupt is not available, skipping...\n");</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='head'>diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c<br/>index 7334244397d1..b0694dcce246 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/fdomain.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/fdomain.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/fdomain.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/fdomain.c</a></div><div class='hunk'>@@ -266,7 +266,6 @@</div><div class='ctx'> </div><div class='ctx'>  **************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -420,10 +419,10 @@ static unsigned long addresses[] = {</div><div class='ctx'>    0xd0000,</div><div class='ctx'>    0xe0000,</div><div class='ctx'> };</div><div class='del'>-#define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned ))</div><div class='del'>-		       </div><div class='add'>+#define ADDRESS_COUNT ARRAY_SIZE(addresses)</div><div class='add'>+</div><div class='ctx'> static unsigned short ports[] = { 0x140, 0x150, 0x160, 0x170 };</div><div class='del'>-#define PORT_COUNT (sizeof( ports ) / sizeof( unsigned short ))</div><div class='add'>+#define PORT_COUNT ARRAY_SIZE(ports)</div><div class='ctx'> </div><div class='ctx'> static unsigned short ints[] = { 3, 5, 10, 11, 12, 14, 15, 0 };</div><div class='ctx'> </div><div class='hunk'>@@ -502,7 +501,7 @@ static struct signature {</div><div class='ctx'>     geometry location are verified). */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))</div><div class='add'>+#define SIGNATURE_COUNT ARRAY_SIZE(signatures)</div><div class='ctx'> </div><div class='ctx'> static void print_banner( struct Scsi_Host *shpnt )</div><div class='ctx'> {</div><div class='hunk'>@@ -519,7 +518,7 @@ static void print_banner( struct Scsi_Host *shpnt )</div><div class='ctx'> </div><div class='ctx'>       if (bios_minor &gt;= 0) printk("%d", bios_minor);</div><div class='ctx'>       else                 printk("?.");</div><div class='del'>-   </div><div class='add'>+</div><div class='ctx'>       printk( " at 0x%lx using scsi id %d\n",</div><div class='ctx'> 	      bios_base, shpnt-&gt;this_id );</div><div class='ctx'>    }</div><div class='hunk'>@@ -950,7 +949,7 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt )</div><div class='ctx'>       /* Register the IRQ with the kernel */</div><div class='ctx'> </div><div class='ctx'>       retcode = request_irq( interrupt_level,</div><div class='del'>-			     do_fdomain_16x0_intr, pdev?SA_SHIRQ:0, "fdomain", shpnt);</div><div class='add'>+			     do_fdomain_16x0_intr, pdev?IRQF_SHARED:0, "fdomain", shpnt);</div><div class='ctx'> </div><div class='ctx'>       if (retcode &lt; 0) {</div><div class='ctx'> 	 if (retcode == -EINVAL) {</div><div class='head'>diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c<br/>index e6bcfe949340..67f1100f3103 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/g_NCR5380.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/g_NCR5380.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/g_NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/g_NCR5380.c</a></div><div class='hunk'>@@ -91,7 +91,6 @@</div><div class='ctx'> #define AUTOPROBE_IRQ</div><div class='ctx'> #define AUTOSENSE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SCSI_GENERIC_NCR53C400</div><div class='ctx'> #define NCR53C400_PSEUDO_DMA 1</div><div class='hunk'>@@ -138,10 +137,9 @@ static struct override {</div><div class='ctx'> [1] __initdata = { { 0,},};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define NO_OVERRIDES ARRAY_SIZE(overrides)</div><div class='ctx'> </div><div class='del'>-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))</div><div class='del'>-</div><div class='del'>-#ifndef MODULE </div><div class='add'>+#ifndef MODULE</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	internal_setup		-	handle lilo command string override</div><div class='hunk'>@@ -210,7 +208,7 @@ static int __init do_NCR5380_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int ints[10];</div><div class='ctx'> </div><div class='del'>-	get_options(str, sizeof(ints) / sizeof(int), ints);</div><div class='add'>+	get_options(str, ARRAY_SIZE(ints), ints);</div><div class='ctx'> 	internal_setup(BOARD_NCR5380, str, ints);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -218,7 +216,7 @@ static int __init do_NCR5380_setup(char *str)</div><div class='ctx'> /**</div><div class='ctx'>  * 	do_NCR53C400_setup		-	set up entry point</div><div class='ctx'>  *	@str: unused</div><div class='del'>- *	@ints: integer parameters from kernel setup code </div><div class='add'>+ *	@ints: integer parameters from kernel setup code</div><div class='ctx'>  *</div><div class='ctx'>  *	Setup function invoked at boot to parse the ncr53c400= command</div><div class='ctx'>  *	line.</div><div class='hunk'>@@ -228,7 +226,7 @@ static int __init do_NCR53C400_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int ints[10];</div><div class='ctx'> </div><div class='del'>-	get_options(str, sizeof(ints) / sizeof(int), ints);</div><div class='add'>+	get_options(str, ARRAY_SIZE(ints), ints);</div><div class='ctx'> 	internal_setup(BOARD_NCR53C400, str, ints);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -236,7 +234,7 @@ static int __init do_NCR53C400_setup(char *str)</div><div class='ctx'> /**</div><div class='ctx'>  * 	do_NCR53C400A_setup	-	set up entry point</div><div class='ctx'>  *	@str: unused</div><div class='del'>- *	@ints: integer parameters from kernel setup code </div><div class='add'>+ *	@ints: integer parameters from kernel setup code</div><div class='ctx'>  *</div><div class='ctx'>  *	Setup function invoked at boot to parse the ncr53c400a= command</div><div class='ctx'>  *	line.</div><div class='hunk'>@@ -246,7 +244,7 @@ static int __init do_NCR53C400A_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int ints[10];</div><div class='ctx'> </div><div class='del'>-	get_options(str, sizeof(ints) / sizeof(int), ints);</div><div class='add'>+	get_options(str, ARRAY_SIZE(ints), ints);</div><div class='ctx'> 	internal_setup(BOARD_NCR53C400A, str, ints);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -254,7 +252,7 @@ static int __init do_NCR53C400A_setup(char *str)</div><div class='ctx'> /**</div><div class='ctx'>  * 	do_DTC3181E_setup	-	set up entry point</div><div class='ctx'>  *	@str: unused</div><div class='del'>- *	@ints: integer parameters from kernel setup code </div><div class='add'>+ *	@ints: integer parameters from kernel setup code</div><div class='ctx'>  *</div><div class='ctx'>  *	Setup function invoked at boot to parse the dtc3181e= command</div><div class='ctx'>  *	line.</div><div class='hunk'>@@ -264,7 +262,7 @@ static int __init do_DTC3181E_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int ints[10];</div><div class='ctx'> </div><div class='del'>-	get_options(str, sizeof(ints) / sizeof(int), ints);</div><div class='add'>+	get_options(str, ARRAY_SIZE(ints), ints);</div><div class='ctx'> 	internal_setup(BOARD_DTC3181E, str, ints);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -463,7 +461,7 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 			instance-&gt;irq = NCR5380_probe_irq(instance, 0xffff);</div><div class='ctx'> </div><div class='ctx'> 		if (instance-&gt;irq != SCSI_IRQ_NONE)</div><div class='del'>-			if (request_irq(instance-&gt;irq, generic_NCR5380_intr, SA_INTERRUPT, "NCR5380", instance)) {</div><div class='add'>+			if (request_irq(instance-&gt;irq, generic_NCR5380_intr, IRQF_DISABLED, "NCR5380", instance)) {</div><div class='ctx'> 				printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance-&gt;host_no, instance-&gt;irq);</div><div class='ctx'> 				instance-&gt;irq = SCSI_IRQ_NONE;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h<br/>index d60a89cb8052..df0b3f69ef63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/g_NCR5380.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/g_NCR5380.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/g_NCR5380.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/g_NCR5380.h</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #ifndef GENERIC_NCR5380_H</div><div class='ctx'> #define GENERIC_NCR5380_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define GENERIC_NCR5380_PUBLIC_RELEASE 1</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c<br/>index d5740bbdef3e..43afd476e606 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gdth.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gdth.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/gdth.c</a></div><div class='hunk'>@@ -4,9 +4,9 @@</div><div class='ctx'>  * Intel Corporation:  Storage RAID Controllers                         *</div><div class='ctx'>  *                                                                      *</div><div class='ctx'>  * gdth.c                                                               *</div><div class='del'>- * Copyright (C) 1995-04 ICP vortex GmbH, Achim Leubner                 *</div><div class='add'>+ * Copyright (C) 1995-06 ICP vortex GmbH, Achim Leubner                 *</div><div class='ctx'>  * Copyright (C) 2002-04 Intel Corporation                              *</div><div class='del'>- * Copyright (C) 2003-04 Adaptec Inc.                                   *</div><div class='add'>+ * Copyright (C) 2003-06 Adaptec Inc.                                   *</div><div class='ctx'>  * &lt;achim_leubner@adaptec.com&gt;                                          *</div><div class='ctx'>  *                                                                      *</div><div class='ctx'>  * Additions/Fixes:                                                     *</div><div class='hunk'>@@ -27,9 +27,14 @@</div><div class='ctx'>  * along with this kernel; if not, write to the Free Software           *</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            *</div><div class='ctx'>  *                                                                      *</div><div class='del'>- * Linux kernel 2.2.x, 2.4.x, 2.6.x supported                           *</div><div class='add'>+ * Linux kernel 2.4.x, 2.6.x supported                                  *</div><div class='ctx'>  *                                                                      *</div><div class='ctx'>  * $Log: gdth.c,v $</div><div class='add'>+ * Revision 1.74  2006/04/10 13:44:47  achim</div><div class='add'>+ * Community changes for 2.6.x</div><div class='add'>+ * Kernel 2.2.x no longer supported</div><div class='add'>+ * scsi_request interface removed, thanks to Christoph Hellwig</div><div class='add'>+ *</div><div class='ctx'>  * Revision 1.73  2004/03/31 13:33:03  achim</div><div class='ctx'>  * Special command 0xfd implemented to detect 64-bit DMA support</div><div class='ctx'>  *</div><div class='hunk'>@@ -94,7 +99,7 @@</div><div class='ctx'>  * Bugfix free_irq()</div><div class='ctx'>  *</div><div class='ctx'>  * Revision 1.56  2001/08/09 11:19:39  achim</div><div class='del'>- * struct scsi_host_template changes</div><div class='add'>+ * Scsi_Host_Template changes</div><div class='ctx'>  *</div><div class='ctx'>  * Revision 1.55  2001/08/09 10:11:28  achim</div><div class='ctx'>  * Command HOST_UNFREEZE_IO before cache service init.</div><div class='hunk'>@@ -388,7 +393,13 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,6)</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#else</div><div class='add'>+#define DMA_32BIT_MASK	0x00000000ffffffffULL</div><div class='add'>+#define DMA_64BIT_MASK	0xffffffffffffffffULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef GDTH_RTC</div><div class='ctx'> #include &lt;linux/mc146818rtc.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -408,8 +419,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "scsi.h"</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='del'>-#include "gdth.h"</div><div class='ctx'> #include "gdth_kcompat.h"</div><div class='add'>+#include "gdth.h"</div><div class='ctx'> </div><div class='ctx'> static void gdth_delay(int milliseconds);</div><div class='ctx'> static void gdth_eval_mapping(ulong32 size, ulong32 *cyls, int *heads, int *secs);</div><div class='hunk'>@@ -464,6 +475,8 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'> </div><div class='ctx'> static void gdth_flush(int hanum);</div><div class='ctx'> static int gdth_halt(struct notifier_block *nb, ulong event, void *buf);</div><div class='add'>+static int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *));</div><div class='add'>+static void gdth_scsi_done(struct scsi_cmnd *scp);</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_GDTH</div><div class='ctx'> static unchar   DebugState = DEBUG_GDTH;</div><div class='hunk'>@@ -556,8 +569,8 @@ static struct timer_list gdth_timer;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define PTR2USHORT(a)   (ushort)(ulong)(a)</div><div class='del'>-#define GDTOFFSOF(a,b)  (size_t)&amp;(((a*)0)-&gt;b)   </div><div class='del'>-#define INDEX_OK(i,t)   ((i)&lt;sizeof(t)/sizeof((t)[0]))</div><div class='add'>+#define GDTOFFSOF(a,b)  (size_t)&amp;(((a*)0)-&gt;b)</div><div class='add'>+#define INDEX_OK(i,t)   ((i)&lt;ARRAY_SIZE(t))</div><div class='ctx'> </div><div class='ctx'> #define NUMDATA(a)      ( (gdth_num_str  *)((a)-&gt;hostdata))</div><div class='ctx'> #define HADATA(a)       (&amp;((gdth_ext_str *)((a)-&gt;hostdata))-&gt;haext)</div><div class='hunk'>@@ -643,6 +656,7 @@ static int probe_eisa_isa = 0;</div><div class='ctx'> static int force_dma32 = 0;</div><div class='ctx'> </div><div class='ctx'> /* parameters for modprobe/insmod */</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,11)</div><div class='ctx'> module_param_array(irq, int, NULL, 0);</div><div class='ctx'> module_param(disable, int, 0);</div><div class='ctx'> module_param(reserve_mode, int, 0);</div><div class='hunk'>@@ -655,6 +669,20 @@ module_param(virt_ctr, int, 0);</div><div class='ctx'> module_param(shared_access, int, 0);</div><div class='ctx'> module_param(probe_eisa_isa, int, 0);</div><div class='ctx'> module_param(force_dma32, int, 0);</div><div class='add'>+#else</div><div class='add'>+MODULE_PARM(irq, "i");</div><div class='add'>+MODULE_PARM(disable, "i");</div><div class='add'>+MODULE_PARM(reserve_mode, "i");</div><div class='add'>+MODULE_PARM(reserve_list, "4-" __MODULE_STRING(MAX_RES_ARGS) "i");</div><div class='add'>+MODULE_PARM(reverse_scan, "i");</div><div class='add'>+MODULE_PARM(hdr_channel, "i");</div><div class='add'>+MODULE_PARM(max_ids, "i");</div><div class='add'>+MODULE_PARM(rescan, "i");</div><div class='add'>+MODULE_PARM(virt_ctr, "i");</div><div class='add'>+MODULE_PARM(shared_access, "i");</div><div class='add'>+MODULE_PARM(probe_eisa_isa, "i");</div><div class='add'>+MODULE_PARM(force_dma32, "i");</div><div class='add'>+#endif</div><div class='ctx'> MODULE_AUTHOR("Achim Leubner");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='hunk'>@@ -683,6 +711,91 @@ static void gdth_delay(int milliseconds)</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='add'>+static void gdth_scsi_done(struct scsi_cmnd *scp)</div><div class='add'>+{</div><div class='add'>+    TRACE2(("gdth_scsi_done()\n"));</div><div class='add'>+</div><div class='add'>+    if (scp-&gt;request)</div><div class='add'>+        complete((struct completion *)scp-&gt;request);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,</div><div class='add'>+                   int timeout, u32 *info)</div><div class='add'>+{</div><div class='add'>+    Scsi_Cmnd *scp;</div><div class='add'>+    DECLARE_COMPLETION(wait);</div><div class='add'>+    int rval;</div><div class='add'>+</div><div class='add'>+    scp = kmalloc(sizeof(*scp), GFP_KERNEL);</div><div class='add'>+    if (!scp)</div><div class='add'>+        return -ENOMEM;</div><div class='add'>+    memset(scp, 0, sizeof(*scp));</div><div class='add'>+    scp-&gt;device = sdev;</div><div class='add'>+    /* use request field to save the ptr. to completion struct. */</div><div class='add'>+    scp-&gt;request = (struct request *)&amp;wait;</div><div class='add'>+    scp-&gt;timeout_per_command = timeout*HZ;</div><div class='add'>+    scp-&gt;request_buffer = gdtcmd;</div><div class='add'>+    scp-&gt;cmd_len = 12;</div><div class='add'>+    memcpy(scp-&gt;cmnd, cmnd, 12);</div><div class='add'>+    scp-&gt;SCp.this_residual = IOCTL_PRI;   /* priority */</div><div class='add'>+    scp-&gt;done = gdth_scsi_done; /* some fn. test this */</div><div class='add'>+    gdth_queuecommand(scp, gdth_scsi_done);</div><div class='add'>+    wait_for_completion(&amp;wait);</div><div class='add'>+</div><div class='add'>+    rval = scp-&gt;SCp.Status;</div><div class='add'>+    if (info)</div><div class='add'>+        *info = scp-&gt;SCp.Message;</div><div class='add'>+    kfree(scp);</div><div class='add'>+    return rval;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void gdth_scsi_done(Scsi_Cmnd *scp)</div><div class='add'>+{</div><div class='add'>+    TRACE2(("gdth_scsi_done()\n"));</div><div class='add'>+</div><div class='add'>+    scp-&gt;request.rq_status = RQ_SCSI_DONE;</div><div class='add'>+    if (scp-&gt;request.waiting)</div><div class='add'>+        complete(scp-&gt;request.waiting);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,</div><div class='add'>+                   int timeout, u32 *info)</div><div class='add'>+{</div><div class='add'>+    Scsi_Cmnd *scp = scsi_allocate_device(sdev, 1, FALSE);</div><div class='add'>+    unsigned bufflen = gdtcmd ? sizeof(gdth_cmd_str) : 0;</div><div class='add'>+    DECLARE_COMPLETION(wait);</div><div class='add'>+    int rval;</div><div class='add'>+</div><div class='add'>+    if (!scp)</div><div class='add'>+        return -ENOMEM;</div><div class='add'>+    scp-&gt;cmd_len = 12;</div><div class='add'>+    scp-&gt;use_sg = 0;</div><div class='add'>+    scp-&gt;SCp.this_residual = IOCTL_PRI;   /* priority */</div><div class='add'>+    scp-&gt;request.rq_status = RQ_SCSI_BUSY;</div><div class='add'>+    scp-&gt;request.waiting = &amp;wait;</div><div class='add'>+    scsi_do_cmd(scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ, 1);</div><div class='add'>+    wait_for_completion(&amp;wait);</div><div class='add'>+</div><div class='add'>+    rval = scp-&gt;SCp.Status;</div><div class='add'>+    if (info)</div><div class='add'>+        *info = scp-&gt;SCp.Message;</div><div class='add'>+</div><div class='add'>+    scsi_release_command(scp);</div><div class='add'>+    return rval;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int gdth_execute(struct Scsi_Host *shost, gdth_cmd_str *gdtcmd, char *cmnd,</div><div class='add'>+                 int timeout, u32 *info)</div><div class='add'>+{</div><div class='add'>+    struct scsi_device *sdev = scsi_get_host_dev(shost);</div><div class='add'>+    int rval = __gdth_execute(sdev, gdtcmd, cmnd, timeout, info);</div><div class='add'>+</div><div class='add'>+    scsi_free_host_dev(sdev);</div><div class='add'>+    return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gdth_eval_mapping(ulong32 size, ulong32 *cyls, int *heads, int *secs)</div><div class='ctx'> {</div><div class='ctx'>     *cyls = size /HEADS/SECS;</div><div class='hunk'>@@ -773,7 +886,7 @@ static struct pci_device_id gdthtable[] __attribute_used__ = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci,gdthtable);</div><div class='ctx'> </div><div class='ctx'> static void __init gdth_search_dev(gdth_pci_str *pcistr, ushort *cnt,</div><div class='del'>-                                           ushort vendor, ushort device)</div><div class='add'>+                                   ushort vendor, ushort device)</div><div class='ctx'> {</div><div class='ctx'>     ulong base0, base1, base2;</div><div class='ctx'>     struct pci_dev *pdev;</div><div class='hunk'>@@ -2248,14 +2361,16 @@ static void gdth_putq(int hanum,Scsi_Cmnd *scp,unchar priority)</div><div class='ctx'>     ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'>     spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'> </div><div class='del'>-    scp-&gt;SCp.this_residual = (int)priority;</div><div class='del'>-    b = virt_ctr ? NUMDATA(scp-&gt;device-&gt;host)-&gt;busnum : scp-&gt;device-&gt;channel;</div><div class='del'>-    t = scp-&gt;device-&gt;id;</div><div class='del'>-    if (priority &gt;= DEFAULT_PRI) {</div><div class='del'>-        if ((b != ha-&gt;virt_bus &amp;&amp; ha-&gt;raw[BUS_L2P(ha,b)].lock) ||</div><div class='del'>-            (b == ha-&gt;virt_bus &amp;&amp; t &lt; MAX_HDRIVES &amp;&amp; ha-&gt;hdr[t].lock)) {</div><div class='del'>-            TRACE2(("gdth_putq(): locked IO -&gt; update_timeout()\n"));</div><div class='del'>-            scp-&gt;SCp.buffers_residual = gdth_update_timeout(hanum, scp, 0);</div><div class='add'>+    if (scp-&gt;done != gdth_scsi_done) {</div><div class='add'>+        scp-&gt;SCp.this_residual = (int)priority;</div><div class='add'>+        b = virt_ctr ? NUMDATA(scp-&gt;device-&gt;host)-&gt;busnum:scp-&gt;device-&gt;channel;</div><div class='add'>+        t = scp-&gt;device-&gt;id;</div><div class='add'>+        if (priority &gt;= DEFAULT_PRI) {</div><div class='add'>+            if ((b != ha-&gt;virt_bus &amp;&amp; ha-&gt;raw[BUS_L2P(ha,b)].lock) ||</div><div class='add'>+                (b==ha-&gt;virt_bus &amp;&amp; t&lt;MAX_HDRIVES &amp;&amp; ha-&gt;hdr[t].lock)) {</div><div class='add'>+                TRACE2(("gdth_putq(): locked IO -&gt;update_timeout()\n"));</div><div class='add'>+                scp-&gt;SCp.buffers_residual = gdth_update_timeout(hanum, scp, 0);</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -2309,14 +2424,18 @@ static void gdth_next(int hanum)</div><div class='ctx'>     for (nscp = pscp = ha-&gt;req_first; nscp; nscp = (Scsi_Cmnd *)nscp-&gt;SCp.ptr) {</div><div class='ctx'>         if (nscp != pscp &amp;&amp; nscp != (Scsi_Cmnd *)pscp-&gt;SCp.ptr)</div><div class='ctx'>             pscp = (Scsi_Cmnd *)pscp-&gt;SCp.ptr;</div><div class='del'>-        b = virt_ctr ? NUMDATA(nscp-&gt;device-&gt;host)-&gt;busnum : nscp-&gt;device-&gt;channel;</div><div class='del'>-        t = nscp-&gt;device-&gt;id;</div><div class='del'>-        l = nscp-&gt;device-&gt;lun;</div><div class='del'>-        if (nscp-&gt;SCp.this_residual &gt;= DEFAULT_PRI) {</div><div class='del'>-            if ((b != ha-&gt;virt_bus &amp;&amp; ha-&gt;raw[BUS_L2P(ha,b)].lock) ||</div><div class='del'>-                (b == ha-&gt;virt_bus &amp;&amp; t &lt; MAX_HDRIVES &amp;&amp; ha-&gt;hdr[t].lock)) </div><div class='del'>-                continue;</div><div class='del'>-        }</div><div class='add'>+        if (nscp-&gt;done != gdth_scsi_done) {</div><div class='add'>+            b = virt_ctr ?</div><div class='add'>+                NUMDATA(nscp-&gt;device-&gt;host)-&gt;busnum : nscp-&gt;device-&gt;channel;</div><div class='add'>+            t = nscp-&gt;device-&gt;id;</div><div class='add'>+            l = nscp-&gt;device-&gt;lun;</div><div class='add'>+            if (nscp-&gt;SCp.this_residual &gt;= DEFAULT_PRI) {</div><div class='add'>+                if ((b != ha-&gt;virt_bus &amp;&amp; ha-&gt;raw[BUS_L2P(ha,b)].lock) ||</div><div class='add'>+                    (b == ha-&gt;virt_bus &amp;&amp; t &lt; MAX_HDRIVES &amp;&amp; ha-&gt;hdr[t].lock))</div><div class='add'>+                    continue;</div><div class='add'>+            }</div><div class='add'>+        } else</div><div class='add'>+            b = t = l = 0;</div><div class='ctx'> </div><div class='ctx'>         if (firsttime) {</div><div class='ctx'>             if (gdth_test_busy(hanum)) {        /* controller busy ? */</div><div class='hunk'>@@ -2331,7 +2450,7 @@ static void gdth_next(int hanum)</div><div class='ctx'>             firsttime = FALSE;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        if (nscp-&gt;done != gdth_scsi_done || nscp-&gt;cmnd[0] != 0xff) {        </div><div class='add'>+        if (nscp-&gt;done != gdth_scsi_done) {</div><div class='ctx'>         if (nscp-&gt;SCp.phase == -1) {</div><div class='ctx'>             nscp-&gt;SCp.phase = CACHESERVICE;           /* default: cache svc. */ </div><div class='ctx'>             if (nscp-&gt;cmnd[0] == TEST_UNIT_READY) {</div><div class='hunk'>@@ -2394,7 +2513,7 @@ static void gdth_next(int hanum)</div><div class='ctx'>                 else</div><div class='ctx'>                     nscp-&gt;scsi_done(nscp);</div><div class='ctx'>             }</div><div class='del'>-        } else if (nscp-&gt;done == gdth_scsi_done &amp;&amp; nscp-&gt;cmnd[0] == 0xff) {</div><div class='add'>+        } else if (nscp-&gt;done == gdth_scsi_done) {</div><div class='ctx'>             if (!(cmd_index=gdth_special_cmd(hanum,nscp)))</div><div class='ctx'>                 this_cmd = FALSE;</div><div class='ctx'>             next_cmd = FALSE;</div><div class='hunk'>@@ -2542,13 +2661,13 @@ static void gdth_copy_internal_data(int hanum,Scsi_Cmnd *scp,</div><div class='ctx'>     gdth_ha_str *ha;</div><div class='ctx'>     char *address;</div><div class='ctx'> </div><div class='del'>-    cpcount = count&lt;=(ushort)scp-&gt;bufflen ? count:(ushort)scp-&gt;bufflen;</div><div class='add'>+    cpcount = count&lt;=(ushort)scp-&gt;request_bufflen ? count:(ushort)scp-&gt;request_bufflen;</div><div class='ctx'>     ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'> </div><div class='ctx'>     if (scp-&gt;use_sg) {</div><div class='ctx'>         sl = (struct scatterlist *)scp-&gt;request_buffer;</div><div class='ctx'>         for (i=0,cpsum=0; i&lt;scp-&gt;use_sg; ++i,++sl) {</div><div class='del'>-	    unsigned long flags;</div><div class='add'>+            unsigned long flags;</div><div class='ctx'>             cpnow = (ushort)sl-&gt;length;</div><div class='ctx'>             TRACE(("copy_internal() now %d sum %d count %d %d\n",</div><div class='ctx'>                           cpnow,cpsum,cpcount,(ushort)scp-&gt;bufflen));</div><div class='hunk'>@@ -2560,12 +2679,19 @@ static void gdth_copy_internal_data(int hanum,Scsi_Cmnd *scp,</div><div class='ctx'>                        hanum);</div><div class='ctx'>                 return;</div><div class='ctx'>             }</div><div class='del'>-	    local_irq_save(flags);</div><div class='del'>-	    address = kmap_atomic(sl-&gt;page, KM_BIO_SRC_IRQ) + sl-&gt;offset;</div><div class='add'>+            local_irq_save(flags);</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='add'>+            address = kmap_atomic(sl-&gt;page, KM_BIO_SRC_IRQ) + sl-&gt;offset;</div><div class='add'>+            memcpy(address,buffer,cpnow);</div><div class='add'>+            flush_dcache_page(sl-&gt;page);</div><div class='add'>+            kunmap_atomic(address, KM_BIO_SRC_IRQ);</div><div class='add'>+#else</div><div class='add'>+            address = kmap_atomic(sl-&gt;page, KM_BH_IRQ) + sl-&gt;offset;</div><div class='ctx'>             memcpy(address,buffer,cpnow);</div><div class='del'>-	    flush_dcache_page(sl-&gt;page);</div><div class='del'>-	    kunmap_atomic(address, KM_BIO_SRC_IRQ);</div><div class='del'>-	    local_irq_restore(flags);</div><div class='add'>+            flush_dcache_page(sl-&gt;page);</div><div class='add'>+            kunmap_atomic(address, KM_BH_IRQ);</div><div class='add'>+#endif</div><div class='add'>+            local_irq_restore(flags);</div><div class='ctx'>             if (cpsum == cpcount)</div><div class='ctx'>                 break;</div><div class='ctx'>             buffer += cpnow;</div><div class='hunk'>@@ -2946,9 +3072,9 @@ static int gdth_fill_raw_cmd(int hanum,Scsi_Cmnd *scp,unchar b)</div><div class='ctx'>         offset = (ulong)scp-&gt;sense_buffer &amp; ~PAGE_MASK;</div><div class='ctx'>         sense_paddr = pci_map_page(ha-&gt;pdev,page,offset,</div><div class='ctx'>                                    16,PCI_DMA_FROMDEVICE);</div><div class='del'>-        scp-&gt;SCp.buffer = (struct scatterlist *)((ulong32)sense_paddr);</div><div class='add'>+        *(ulong32 *)&amp;scp-&gt;SCp.buffer = (ulong32)sense_paddr;</div><div class='ctx'>         /* high part, if 64bit */</div><div class='del'>-        scp-&gt;host_scribble = (char *)(ulong32)((ulong64)sense_paddr &gt;&gt; 32);</div><div class='add'>+        *(ulong32 *)&amp;scp-&gt;host_scribble = (ulong32)((ulong64)sense_paddr &gt;&gt; 32);</div><div class='ctx'>         cmdp-&gt;OpCode           = GDT_WRITE;             /* always */</div><div class='ctx'>         cmdp-&gt;BoardNode        = LOCALBOARD;</div><div class='ctx'>         if (mode64) { </div><div class='hunk'>@@ -3022,7 +3148,7 @@ static int gdth_fill_raw_cmd(int hanum,Scsi_Cmnd *scp,unchar b)</div><div class='ctx'>             }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-        } else {</div><div class='add'>+        } else if (scp-&gt;request_bufflen) {</div><div class='ctx'>             scp-&gt;SCp.Status = GDTH_MAP_SINGLE;</div><div class='ctx'>             scp-&gt;SCp.Message = PCI_DMA_BIDIRECTIONAL; </div><div class='ctx'>             page = virt_to_page(scp-&gt;request_buffer);</div><div class='hunk'>@@ -3309,7 +3435,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id,struct pt_regs *regs)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (!gdth_polling)</div><div class='del'>-	spin_lock_irqsave(&amp;ha2-&gt;smp_lock, flags);</div><div class='add'>+        spin_lock_irqsave(&amp;ha2-&gt;smp_lock, flags);</div><div class='ctx'>     wait_index = 0;</div><div class='ctx'> </div><div class='ctx'>     /* search controller */</div><div class='hunk'>@@ -3642,9 +3768,10 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp)</div><div class='ctx'>                            scp-&gt;request_bufflen,scp-&gt;SCp.Message);</div><div class='ctx'>         if (scp-&gt;SCp.buffer) {</div><div class='ctx'>             dma_addr_t addr;</div><div class='del'>-            addr = (dma_addr_t)(ulong32)scp-&gt;SCp.buffer;</div><div class='add'>+            addr = (dma_addr_t)*(ulong32 *)&amp;scp-&gt;SCp.buffer;</div><div class='ctx'>             if (scp-&gt;host_scribble)</div><div class='del'>-                addr += (dma_addr_t)((ulong64)(ulong32)scp-&gt;host_scribble &lt;&lt; 32);               </div><div class='add'>+                addr += (dma_addr_t)</div><div class='add'>+                    ((ulong64)(*(ulong32 *)&amp;scp-&gt;host_scribble) &lt;&lt; 32);</div><div class='ctx'>             pci_unmap_page(ha-&gt;pdev,addr,16,PCI_DMA_FROMDEVICE);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -4154,7 +4281,11 @@ int __init option_setup(char *str)</div><div class='ctx'>     return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='ctx'> static int __init gdth_detect(struct scsi_host_template *shtp)</div><div class='add'>+#else</div><div class='add'>+static int __init gdth_detect(Scsi_Host_Template *shtp)</div><div class='add'>+#endif</div><div class='ctx'> {</div><div class='ctx'>     struct Scsi_Host *shp;</div><div class='ctx'>     gdth_pci_str pcistr[MAXHA];</div><div class='hunk'>@@ -4188,7 +4319,7 @@ static int __init gdth_detect(struct scsi_host_template *shtp)</div><div class='ctx'>         return 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    printk("GDT-HA: Storage RAID Controller Driver. Version: %s \n",GDTH_VERSION_STR);</div><div class='add'>+    printk("GDT-HA: Storage RAID Controller Driver. Version: %s\n",GDTH_VERSION_STR);</div><div class='ctx'>     /* initializations */</div><div class='ctx'>     gdth_polling = TRUE; b = 0;</div><div class='ctx'>     gdth_clear_events();</div><div class='hunk'>@@ -4219,7 +4350,7 @@ static int __init gdth_detect(struct scsi_host_template *shtp)</div><div class='ctx'>                 printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n",</div><div class='ctx'>                        isa_bios,ha-&gt;irq,ha-&gt;drq);</div><div class='ctx'> </div><div class='del'>-                if (request_irq(ha-&gt;irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha)) {</div><div class='add'>+                if (request_irq(ha-&gt;irq,gdth_interrupt,IRQF_DISABLED,"gdth",ha)) {</div><div class='ctx'>                     printk("GDT-ISA: Unable to allocate IRQ\n");</div><div class='ctx'>                     scsi_unregister(shp);</div><div class='ctx'>                     continue;</div><div class='hunk'>@@ -4345,7 +4476,7 @@ static int __init gdth_detect(struct scsi_host_template *shtp)</div><div class='ctx'>                 printk("Configuring GDT-EISA HA at Slot %d IRQ %u\n",</div><div class='ctx'>                        eisa_slot&gt;&gt;12,ha-&gt;irq);</div><div class='ctx'> </div><div class='del'>-                if (request_irq(ha-&gt;irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha)) {</div><div class='add'>+                if (request_irq(ha-&gt;irq,gdth_interrupt,IRQF_DISABLED,"gdth",ha)) {</div><div class='ctx'>                     printk("GDT-EISA: Unable to allocate IRQ\n");</div><div class='ctx'>                     scsi_unregister(shp);</div><div class='ctx'>                     continue;</div><div class='hunk'>@@ -4472,7 +4603,7 @@ static int __init gdth_detect(struct scsi_host_template *shtp)</div><div class='ctx'>                pcistr[ctr].bus,PCI_SLOT(pcistr[ctr].device_fn),ha-&gt;irq);</div><div class='ctx'> </div><div class='ctx'>         if (request_irq(ha-&gt;irq, gdth_interrupt,</div><div class='del'>-                        SA_INTERRUPT|SA_SHIRQ, "gdth", ha))</div><div class='add'>+                        IRQF_DISABLED|IRQF_SHARED, "gdth", ha))</div><div class='ctx'>         {</div><div class='ctx'>             printk("GDT-PCI: Unable to allocate IRQ\n");</div><div class='ctx'>             scsi_unregister(shp);</div><div class='hunk'>@@ -4751,7 +4882,7 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)</div><div class='ctx'>         gdth_internal_cmd(hanum, SCSIRAWSERVICE, GDT_RESET_BUS,</div><div class='ctx'>                           BUS_L2P(ha,b), 0, 0);</div><div class='ctx'>         gdth_polling = FALSE;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='add'>+        spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>     }</div><div class='ctx'>     return SUCCESS;</div><div class='ctx'> }</div><div class='hunk'>@@ -4819,7 +4950,9 @@ static int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *))</div><div class='ctx'>     priority = DEFAULT_PRI;</div><div class='ctx'>     if (scp-&gt;done == gdth_scsi_done)</div><div class='ctx'>         priority = scp-&gt;SCp.this_residual;</div><div class='del'>-    gdth_update_timeout(hanum, scp, scp-&gt;timeout_per_command * 6);</div><div class='add'>+    else</div><div class='add'>+        gdth_update_timeout(hanum, scp, scp-&gt;timeout_per_command * 6);</div><div class='add'>+</div><div class='ctx'>     gdth_putq( hanum, scp, priority );</div><div class='ctx'>     gdth_next( hanum );</div><div class='ctx'>     return 0;</div><div class='hunk'>@@ -4922,11 +5055,7 @@ static int ioc_resetdrv(void __user *arg, char *cmnd)</div><div class='ctx'>     gdth_cmd_str cmd;</div><div class='ctx'>     int hanum;</div><div class='ctx'>     gdth_ha_str *ha;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request *srp;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd *scp;</div><div class='del'>-#endif</div><div class='add'>+    int rval;</div><div class='ctx'> </div><div class='ctx'>     if (copy_from_user(&amp;res, arg, sizeof(gdth_ioctl_reset)) ||</div><div class='ctx'>         res.ionode &gt;= gdth_ctr_count || res.number &gt;= MAX_HDRIVES)</div><div class='hunk'>@@ -4943,25 +5072,11 @@ static int ioc_resetdrv(void __user *arg, char *cmnd)</div><div class='ctx'>         cmd.u.cache64.DeviceNo = res.number;</div><div class='ctx'>     else</div><div class='ctx'>         cmd.u.cache.DeviceNo = res.number;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    srp  = scsi_allocate_request(ha-&gt;sdev, GFP_KERNEL);</div><div class='del'>-    if (!srp)</div><div class='del'>-        return -ENOMEM;</div><div class='del'>-    srp-&gt;sr_cmd_len = 12;</div><div class='del'>-    srp-&gt;sr_use_sg = 0;</div><div class='del'>-    gdth_do_req(srp, &amp;cmd, cmnd, 30);</div><div class='del'>-    res.status = (ushort)srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-    scsi_release_request(srp);</div><div class='del'>-#else</div><div class='del'>-    scp  = scsi_allocate_device(ha-&gt;sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        return -ENOMEM;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-    gdth_do_cmd(scp, &amp;cmd, cmnd, 30);</div><div class='del'>-    res.status = (ushort)scp-&gt;SCp.Status;</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+    rval = __gdth_execute(ha-&gt;sdev, &amp;cmd, cmnd, 30, NULL);</div><div class='add'>+    if (rval &lt; 0)</div><div class='add'>+        return rval;</div><div class='add'>+    res.status = rval;</div><div class='ctx'> </div><div class='ctx'>     if (copy_to_user(arg, &amp;res, sizeof(gdth_ioctl_reset)))</div><div class='ctx'>         return -EFAULT;</div><div class='hunk'>@@ -4974,12 +5089,8 @@ static int ioc_general(void __user *arg, char *cmnd)</div><div class='ctx'>     char *buf = NULL;</div><div class='ctx'>     ulong64 paddr; </div><div class='ctx'>     int hanum;</div><div class='del'>-        gdth_ha_str *ha; </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        Scsi_Request *srp;</div><div class='del'>-#else</div><div class='del'>-        Scsi_Cmnd *scp;</div><div class='del'>-#endif</div><div class='add'>+    gdth_ha_str *ha;</div><div class='add'>+    int rval;</div><div class='ctx'>         </div><div class='ctx'>     if (copy_from_user(&amp;gen, arg, sizeof(gdth_ioctl_general)) ||</div><div class='ctx'>         gen.ionode &gt;= gdth_ctr_count)</div><div class='hunk'>@@ -5071,27 +5182,10 @@ static int ioc_general(void __user *arg, char *cmnd)</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    srp  = scsi_allocate_request(ha-&gt;sdev, GFP_KERNEL);</div><div class='del'>-    if (!srp)</div><div class='del'>-        return -ENOMEM;</div><div class='del'>-    srp-&gt;sr_cmd_len = 12;</div><div class='del'>-    srp-&gt;sr_use_sg = 0;</div><div class='del'>-    gdth_do_req(srp, &amp;gen.command, cmnd, gen.timeout);</div><div class='del'>-    gen.status = srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-    gen.info = srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-    scsi_release_request(srp);</div><div class='del'>-#else</div><div class='del'>-    scp  = scsi_allocate_device(ha-&gt;sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        return -ENOMEM;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-    gdth_do_cmd(scp, &amp;gen.command, cmnd, gen.timeout);</div><div class='del'>-    gen.status = scp-&gt;SCp.Status;</div><div class='del'>-    gen.info = scp-&gt;SCp.Message;</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-#endif</div><div class='add'>+    rval = __gdth_execute(ha-&gt;sdev, &amp;gen.command, cmnd, gen.timeout, &amp;gen.info);</div><div class='add'>+    if (rval &lt; 0)</div><div class='add'>+        return rval;</div><div class='add'>+    gen.status = rval;</div><div class='ctx'> </div><div class='ctx'>     if (copy_to_user(arg + sizeof(gdth_ioctl_general), buf, </div><div class='ctx'>                      gen.data_len + gen.sense_len)) {</div><div class='hunk'>@@ -5114,40 +5208,22 @@ static int ioc_hdrlist(void __user *arg, char *cmnd)</div><div class='ctx'>     gdth_ha_str *ha;</div><div class='ctx'>     unchar i;</div><div class='ctx'>     int hanum, rc = -ENOMEM;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request *srp;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd *scp;</div><div class='del'>-#endif</div><div class='del'>-        </div><div class='add'>+    u32 cluster_type = 0;</div><div class='add'>+</div><div class='ctx'>     rsc = kmalloc(sizeof(*rsc), GFP_KERNEL);</div><div class='ctx'>     cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'>     if (!rsc || !cmd)</div><div class='del'>-	goto free_fail;</div><div class='add'>+        goto free_fail;</div><div class='ctx'> </div><div class='ctx'>     if (copy_from_user(rsc, arg, sizeof(gdth_ioctl_rescan)) ||</div><div class='ctx'>         rsc-&gt;ionode &gt;= gdth_ctr_count) {</div><div class='ctx'>         rc = -EFAULT;</div><div class='del'>-	goto free_fail;</div><div class='add'>+        goto free_fail;</div><div class='ctx'>     }</div><div class='ctx'>     hanum = rsc-&gt;ionode;</div><div class='ctx'>     ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'>     memset(cmd, 0, sizeof(gdth_cmd_str));</div><div class='ctx'>    </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    srp  = scsi_allocate_request(ha-&gt;sdev, GFP_KERNEL);</div><div class='del'>-    if (!srp)</div><div class='del'>-        goto free_fail;</div><div class='del'>-    srp-&gt;sr_cmd_len = 12;</div><div class='del'>-    srp-&gt;sr_use_sg = 0;</div><div class='del'>-#else</div><div class='del'>-    scp  = scsi_allocate_device(ha-&gt;sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        goto free_fail;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'>     for (i = 0; i &lt; MAX_HDRIVES; ++i) { </div><div class='ctx'>         if (!ha-&gt;hdr[i].present) {</div><div class='ctx'>             rsc-&gt;hdr_list[i].bus = 0xff; </div><div class='hunk'>@@ -5164,27 +5240,15 @@ static int ioc_hdrlist(void __user *arg, char *cmnd)</div><div class='ctx'>                 cmd-&gt;u.cache64.DeviceNo = i;</div><div class='ctx'>             else</div><div class='ctx'>                 cmd-&gt;u.cache.DeviceNo = i;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-            gdth_do_req(srp, cmd, cmnd, 30);</div><div class='del'>-            if (srp-&gt;sr_command-&gt;SCp.Status == S_OK)</div><div class='del'>-                rsc-&gt;hdr_list[i].cluster_type = srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-#else</div><div class='del'>-            gdth_do_cmd(scp, cmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;SCp.Status == S_OK)</div><div class='del'>-                rsc-&gt;hdr_list[i].cluster_type = scp-&gt;SCp.Message;</div><div class='del'>-#endif</div><div class='add'>+            if (__gdth_execute(ha-&gt;sdev, cmd, cmnd, 30, &amp;cluster_type) == S_OK)</div><div class='add'>+                rsc-&gt;hdr_list[i].cluster_type = cluster_type;</div><div class='ctx'>         }</div><div class='ctx'>     } </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    scsi_release_request(srp);</div><div class='del'>-#else</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-#endif       </div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>     if (copy_to_user(arg, rsc, sizeof(gdth_ioctl_rescan)))</div><div class='ctx'>         rc = -EFAULT;</div><div class='ctx'>     else</div><div class='del'>-	rc = 0;</div><div class='add'>+        rc = 0;</div><div class='ctx'> </div><div class='ctx'> free_fail:</div><div class='ctx'>     kfree(rsc);</div><div class='hunk'>@@ -5202,40 +5266,21 @@ static int ioc_rescan(void __user *arg, char *cmnd)</div><div class='ctx'>     int rc = -ENOMEM;</div><div class='ctx'>     ulong flags;</div><div class='ctx'>     gdth_ha_str *ha; </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request *srp;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd *scp;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>     rsc = kmalloc(sizeof(*rsc), GFP_KERNEL);</div><div class='ctx'>     cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'>     if (!cmd || !rsc)</div><div class='del'>-	goto free_fail;</div><div class='add'>+        goto free_fail;</div><div class='ctx'> </div><div class='ctx'>     if (copy_from_user(rsc, arg, sizeof(gdth_ioctl_rescan)) ||</div><div class='ctx'>         rsc-&gt;ionode &gt;= gdth_ctr_count) {</div><div class='del'>-	rc = -EFAULT;</div><div class='del'>-	goto free_fail;</div><div class='add'>+        rc = -EFAULT;</div><div class='add'>+        goto free_fail;</div><div class='ctx'>     }</div><div class='ctx'>     hanum = rsc-&gt;ionode;</div><div class='ctx'>     ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'>     memset(cmd, 0, sizeof(gdth_cmd_str));</div><div class='ctx'> </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    srp  = scsi_allocate_request(ha-&gt;sdev, GFP_KERNEL);</div><div class='del'>-    if (!srp)</div><div class='del'>-        goto free_fail;</div><div class='del'>-    srp-&gt;sr_cmd_len = 12;</div><div class='del'>-    srp-&gt;sr_use_sg = 0;</div><div class='del'>-#else</div><div class='del'>-    scp  = scsi_allocate_device(ha-&gt;sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        goto free_fail;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-#endif</div><div class='del'>-     </div><div class='ctx'>     if (rsc-&gt;flag == 0) {</div><div class='ctx'>         /* old method: re-init. cache service */</div><div class='ctx'>         cmd-&gt;Service = CACHESERVICE;</div><div class='hunk'>@@ -5246,19 +5291,8 @@ static int ioc_rescan(void __user *arg, char *cmnd)</div><div class='ctx'>             cmd-&gt;OpCode = GDT_INIT;</div><div class='ctx'>             cmd-&gt;u.cache.DeviceNo = LINUX_OS;</div><div class='ctx'>         }</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        gdth_do_req(srp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-#elif LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,0)</div><div class='del'>-        gdth_do_cmd(scp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)scp-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)scp-&gt;SCp.Message;</div><div class='del'>-#else</div><div class='del'>-        gdth_do_cmd(&amp;scp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)scp.SCp.Status;</div><div class='del'>-        info = (ulong32)scp.SCp.Message;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+        status = __gdth_execute(ha-&gt;sdev, cmd, cmnd, 30, &amp;info);</div><div class='ctx'>         i = 0;</div><div class='ctx'>         hdr_cnt = (status == S_OK ? (ushort)info : 0);</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -5273,15 +5307,9 @@ static int ioc_rescan(void __user *arg, char *cmnd)</div><div class='ctx'>             cmd-&gt;u.cache64.DeviceNo = i;</div><div class='ctx'>         else </div><div class='ctx'>             cmd-&gt;u.cache.DeviceNo = i;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        gdth_do_req(srp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-#else</div><div class='del'>-        gdth_do_cmd(scp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)scp-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)scp-&gt;SCp.Message;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+        status = __gdth_execute(ha-&gt;sdev, cmd, cmnd, 30, &amp;info);</div><div class='add'>+</div><div class='ctx'>         spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>         rsc-&gt;hdr_list[i].bus = ha-&gt;virt_bus;</div><div class='ctx'>         rsc-&gt;hdr_list[i].target = i;</div><div class='hunk'>@@ -5313,15 +5341,9 @@ static int ioc_rescan(void __user *arg, char *cmnd)</div><div class='ctx'>             cmd-&gt;u.cache64.DeviceNo = i;</div><div class='ctx'>         else</div><div class='ctx'>             cmd-&gt;u.cache.DeviceNo = i;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        gdth_do_req(srp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-#else</div><div class='del'>-        gdth_do_cmd(scp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)scp-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)scp-&gt;SCp.Message;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+        status = __gdth_execute(ha-&gt;sdev, cmd, cmnd, 30, &amp;info);</div><div class='add'>+</div><div class='ctx'>         spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>         ha-&gt;hdr[i].devtype = (status == S_OK ? (ushort)info : 0);</div><div class='ctx'>         spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='hunk'>@@ -5332,15 +5354,9 @@ static int ioc_rescan(void __user *arg, char *cmnd)</div><div class='ctx'>             cmd-&gt;u.cache64.DeviceNo = i;</div><div class='ctx'>         else</div><div class='ctx'>             cmd-&gt;u.cache.DeviceNo = i;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        gdth_do_req(srp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-#else</div><div class='del'>-        gdth_do_cmd(scp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)scp-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)scp-&gt;SCp.Message;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+        status = __gdth_execute(ha-&gt;sdev, cmd, cmnd, 30, &amp;info);</div><div class='add'>+</div><div class='ctx'>         spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>         ha-&gt;hdr[i].cluster_type = </div><div class='ctx'>             ((status == S_OK &amp;&amp; !shared_access) ? (ushort)info : 0);</div><div class='hunk'>@@ -5353,29 +5369,18 @@ static int ioc_rescan(void __user *arg, char *cmnd)</div><div class='ctx'>             cmd-&gt;u.cache64.DeviceNo = i;</div><div class='ctx'>         else</div><div class='ctx'>             cmd-&gt;u.cache.DeviceNo = i;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        gdth_do_req(srp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)srp-&gt;sr_command-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)srp-&gt;sr_command-&gt;SCp.Message;</div><div class='del'>-#else</div><div class='del'>-        gdth_do_cmd(scp, cmd, cmnd, 30);</div><div class='del'>-        status = (ushort)scp-&gt;SCp.Status;</div><div class='del'>-        info = (ulong32)scp-&gt;SCp.Message;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+        status = __gdth_execute(ha-&gt;sdev, cmd, cmnd, 30, &amp;info);</div><div class='add'>+</div><div class='ctx'>         spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>         ha-&gt;hdr[i].rw_attribs = (status == S_OK ? (ushort)info : 0);</div><div class='ctx'>         spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'>     }</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    scsi_release_request(srp);</div><div class='del'>-#else</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-#endif       </div><div class='ctx'>  </div><div class='ctx'>     if (copy_to_user(arg, rsc, sizeof(gdth_ioctl_rescan)))</div><div class='ctx'>         rc = -EFAULT;</div><div class='ctx'>     else</div><div class='del'>-	rc = 0;</div><div class='add'>+        rc = 0;</div><div class='ctx'> </div><div class='ctx'> free_fail:</div><div class='ctx'>     kfree(rsc);</div><div class='hunk'>@@ -5515,17 +5520,18 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,</div><div class='ctx'>         hanum = res.ionode; </div><div class='ctx'>         ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'> </div><div class='del'>-        /* Because we need a Scsi_Cmnd struct., we make a scsi_allocate device also for kernels &gt;=2.6.x */        </div><div class='ctx'> #if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        scp  = scsi_get_command(ha-&gt;sdev, GFP_KERNEL);</div><div class='add'>+        scp  = kmalloc(sizeof(*scp), GFP_KERNEL);</div><div class='ctx'>         if (!scp)</div><div class='ctx'>             return -ENOMEM;</div><div class='add'>+        memset(scp, 0, sizeof(*scp));</div><div class='add'>+        scp-&gt;device = ha-&gt;sdev;</div><div class='ctx'>         scp-&gt;cmd_len = 12;</div><div class='ctx'>         scp-&gt;use_sg = 0;</div><div class='ctx'>         scp-&gt;device-&gt;channel = virt_ctr ? 0 : res.number;</div><div class='ctx'>         rval = gdth_eh_bus_reset(scp);</div><div class='ctx'>         res.status = (rval == SUCCESS ? S_OK : S_GENERR);</div><div class='del'>-        scsi_put_command(scp);</div><div class='add'>+        kfree(scp);</div><div class='ctx'> #else</div><div class='ctx'>         scp  = scsi_allocate_device(ha-&gt;sdev, 1, FALSE);</div><div class='ctx'>         if (!scp)</div><div class='hunk'>@@ -5558,34 +5564,12 @@ static void gdth_flush(int hanum)</div><div class='ctx'>     int             i;</div><div class='ctx'>     gdth_ha_str     *ha;</div><div class='ctx'>     gdth_cmd_str    gdtcmd;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request    *srp;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd       *scp;</div><div class='del'>-#endif</div><div class='del'>-    struct scsi_device     *sdev;</div><div class='ctx'>     char            cmnd[MAX_COMMAND_SIZE];   </div><div class='ctx'>     memset(cmnd, 0xff, MAX_COMMAND_SIZE);</div><div class='ctx'> </div><div class='ctx'>     TRACE2(("gdth_flush() hanum %d\n",hanum));</div><div class='ctx'>     ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'> </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);</div><div class='del'>-    srp  = scsi_allocate_request(sdev, GFP_KERNEL);</div><div class='del'>-    if (!srp)</div><div class='del'>-        return;</div><div class='del'>-    srp-&gt;sr_cmd_len = 12;</div><div class='del'>-    srp-&gt;sr_use_sg = 0;</div><div class='del'>-#else</div><div class='del'>-    sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);</div><div class='del'>-    scp  = scsi_allocate_device(sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        return;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'>     for (i = 0; i &lt; MAX_HDRIVES; ++i) {</div><div class='ctx'>         if (ha-&gt;hdr[i].present) {</div><div class='ctx'>             gdtcmd.BoardNode = LOCALBOARD;</div><div class='hunk'>@@ -5601,20 +5585,10 @@ static void gdth_flush(int hanum)</div><div class='ctx'>                 gdtcmd.u.cache.sg_canz = 0;</div><div class='ctx'>             }</div><div class='ctx'>             TRACE2(("gdth_flush(): flush ha %d drive %d\n", hanum, i));</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-            gdth_do_req(srp, &amp;gdtcmd, cmnd, 30);</div><div class='del'>-#else</div><div class='del'>-            gdth_do_cmd(scp, &amp;gdtcmd, cmnd, 30);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+            gdth_execute(gdth_ctr_tab[hanum], &amp;gdtcmd, cmnd, 30, NULL);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    scsi_release_request(srp);</div><div class='del'>-    scsi_free_host_dev(sdev);</div><div class='del'>-#else</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-    scsi_free_host_dev(sdev);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* shutdown routine */</div><div class='hunk'>@@ -5623,18 +5597,11 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)</div><div class='ctx'>     int             hanum;</div><div class='ctx'> #ifndef __alpha__</div><div class='ctx'>     gdth_cmd_str    gdtcmd;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request    *srp;</div><div class='del'>-    struct scsi_device     *sdev;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd       *scp;</div><div class='del'>-    struct scsi_device     *sdev;</div><div class='del'>-#endif</div><div class='ctx'>     char            cmnd[MAX_COMMAND_SIZE];   </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>     if (notifier_disabled)</div><div class='del'>-    	return NOTIFY_OK;</div><div class='add'>+        return NOTIFY_OK;</div><div class='ctx'> </div><div class='ctx'>     TRACE2(("gdth_halt() event %d\n",(int)event));</div><div class='ctx'>     if (event != SYS_RESTART &amp;&amp; event != SYS_HALT &amp;&amp; event != SYS_POWER_OFF)</div><div class='hunk'>@@ -5652,31 +5619,7 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)</div><div class='ctx'>         gdtcmd.Service = CACHESERVICE;</div><div class='ctx'>         gdtcmd.OpCode = GDT_RESET;</div><div class='ctx'>         TRACE2(("gdth_halt(): reset controller %d\n", hanum));</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);</div><div class='del'>-        srp  = scsi_allocate_request(sdev, GFP_KERNEL);</div><div class='del'>-        if (!srp) {</div><div class='del'>-            unregister_reboot_notifier(&amp;gdth_notifier);</div><div class='del'>-            return NOTIFY_OK;</div><div class='del'>-        }</div><div class='del'>-        srp-&gt;sr_cmd_len = 12;</div><div class='del'>-        srp-&gt;sr_use_sg = 0;</div><div class='del'>-        gdth_do_req(srp, &amp;gdtcmd, cmnd, 10);</div><div class='del'>-        scsi_release_request(srp);</div><div class='del'>-        scsi_free_host_dev(sdev);</div><div class='del'>-#else</div><div class='del'>-        sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);</div><div class='del'>-        scp  = scsi_allocate_device(sdev, 1, FALSE);</div><div class='del'>-        if (!scp) {</div><div class='del'>-            unregister_reboot_notifier(&amp;gdth_notifier);</div><div class='del'>-            return NOTIFY_OK;</div><div class='del'>-        }</div><div class='del'>-        scp-&gt;cmd_len = 12;</div><div class='del'>-        scp-&gt;use_sg = 0;</div><div class='del'>-        gdth_do_cmd(scp, &amp;gdtcmd, cmnd, 10);</div><div class='del'>-        scsi_release_command(scp);</div><div class='del'>-        scsi_free_host_dev(sdev);</div><div class='del'>-#endif</div><div class='add'>+        gdth_execute(gdth_ctr_tab[hanum], &amp;gdtcmd, cmnd, 10, NULL);</div><div class='ctx'> #endif</div><div class='ctx'>     }</div><div class='ctx'>     printk("Done.\n");</div><div class='hunk'>@@ -5687,7 +5630,22 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)</div><div class='ctx'>     return NOTIFY_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='add'>+/* configure lun */</div><div class='add'>+static int gdth_slave_configure(struct scsi_device *sdev)</div><div class='add'>+{</div><div class='add'>+    scsi_adjust_queue_depth(sdev, 0, sdev-&gt;host-&gt;cmd_per_lun);</div><div class='add'>+    sdev-&gt;skip_ms_page_3f = 1;</div><div class='add'>+    sdev-&gt;skip_ms_page_8 = 1;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='ctx'> static struct scsi_host_template driver_template = {</div><div class='add'>+#else</div><div class='add'>+static Scsi_Host_Template driver_template = {</div><div class='add'>+#endif</div><div class='ctx'>         .proc_name              = "gdth", </div><div class='ctx'>         .proc_info              = gdth_proc_info,</div><div class='ctx'>         .name                   = "GDT SCSI Disk Array Controller",</div><div class='hunk'>@@ -5698,6 +5656,9 @@ static struct scsi_host_template driver_template = {</div><div class='ctx'>         .eh_bus_reset_handler   = gdth_eh_bus_reset,</div><div class='ctx'>         .bios_param             = gdth_bios_param,</div><div class='ctx'>         .can_queue              = GDTH_MAXCMDS,</div><div class='add'>+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='add'>+        .slave_configure        = gdth_slave_configure,</div><div class='add'>+#endif</div><div class='ctx'>         .this_id                = -1,</div><div class='ctx'>         .sg_tablesize           = GDTH_MAXSG,</div><div class='ctx'>         .cmd_per_lun            = GDTH_MAXC_P_L,</div><div class='head'>diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h<br/>index cc4882fb97ad..47eae0299750 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gdth.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gdth.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/gdth.h</a></div><div class='hunk'>@@ -4,13 +4,13 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Header file for the GDT Disk Array/Storage RAID controllers driver for Linux</div><div class='ctx'>  * </div><div class='del'>- * gdth.h Copyright (C) 1995-03 ICP vortex, Achim Leubner</div><div class='add'>+ * gdth.h Copyright (C) 1995-06 ICP vortex, Achim Leubner</div><div class='ctx'>  * See gdth.c for further informations and </div><div class='ctx'>  * below for supported controller types</div><div class='ctx'>  *</div><div class='ctx'>  * &lt;achim_leubner@adaptec.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * $Id: gdth.h,v 1.57 2004/03/31 11:52:09 achim Exp $</div><div class='add'>+ * $Id: gdth.h,v 1.58 2006/01/11 16:14:09 achim Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='hunk'>@@ -26,9 +26,9 @@</div><div class='ctx'> /* defines, macros */</div><div class='ctx'> </div><div class='ctx'> /* driver version */</div><div class='del'>-#define GDTH_VERSION_STR        "3.04"</div><div class='add'>+#define GDTH_VERSION_STR        "3.05"</div><div class='ctx'> #define GDTH_VERSION            3</div><div class='del'>-#define GDTH_SUBVERSION         4</div><div class='add'>+#define GDTH_SUBVERSION         5</div><div class='ctx'> </div><div class='ctx'> /* protocol version */</div><div class='ctx'> #define PROTOCOL_VERSION        1</div><div class='head'>diff --git a/drivers/scsi/gdth_kcompat.h b/drivers/scsi/gdth_kcompat.h<br/>index e6cf0edfa0ca..2a302eee669a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gdth_kcompat.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth_kcompat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gdth_kcompat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/gdth_kcompat.h</a></div><div class='hunk'>@@ -1,5 +1,3 @@</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #ifndef IRQ_HANDLED</div><div class='ctx'> typedef void irqreturn_t;</div><div class='ctx'> #define IRQ_NONE</div><div class='hunk'>@@ -10,6 +8,18 @@ typedef void irqreturn_t;</div><div class='ctx'> #define MODULE_LICENSE(x)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef __iomem</div><div class='add'>+#define __iomem</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __attribute_used__</div><div class='add'>+#define __attribute_used__	__devinitdata</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef __user</div><div class='add'>+#define __user</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef SERVICE_ACTION_IN</div><div class='ctx'> #define SERVICE_ACTION_IN	0x9e</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c<br/>index 5e8657f9cdf6..32982eb75c84 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gdth_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gdth_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/gdth_proc.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* gdth_proc.c </div><div class='del'>- * $Id: gdth_proc.c,v 1.42 2004/03/05 15:50:20 achim Exp $</div><div class='add'>+ * $Id: gdth_proc.c,v 1.43 2006/01/11 16:15:00 achim Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='hunk'>@@ -51,57 +51,26 @@ int gdth_proc_info(char *buffer,char **start,off_t offset,int length,int hostno,</div><div class='ctx'> static int gdth_set_info(char *buffer,int length,struct Scsi_Host *host,</div><div class='ctx'>                          int hanum,int busnum)</div><div class='ctx'> {</div><div class='del'>-    int             ret_val = -EINVAL;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request    *scp;</div><div class='del'>-    struct scsi_device     *sdev;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd       *scp;</div><div class='del'>-    struct scsi_device     *sdev;</div><div class='del'>-#endif</div><div class='del'>-    TRACE2(("gdth_set_info() ha %d bus %d\n",hanum,busnum));</div><div class='add'>+    int ret_val = -EINVAL;</div><div class='ctx'> </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    sdev = scsi_get_host_dev(host);</div><div class='del'>-    scp  = scsi_allocate_request(sdev, GFP_KERNEL);</div><div class='del'>-    if (!scp)</div><div class='del'>-        return -ENOMEM;</div><div class='del'>-    scp-&gt;sr_cmd_len = 12;</div><div class='del'>-    scp-&gt;sr_use_sg = 0;</div><div class='del'>-#else</div><div class='del'>-    sdev = scsi_get_host_dev(host);</div><div class='del'>-    scp  = scsi_allocate_device(sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        return -ENOMEM;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-#endif</div><div class='add'>+    TRACE2(("gdth_set_info() ha %d bus %d\n",hanum,busnum));</div><div class='ctx'> </div><div class='ctx'>     if (length &gt;= 4) {</div><div class='ctx'>         if (strncmp(buffer,"gdth",4) == 0) {</div><div class='ctx'>             buffer += 5;</div><div class='ctx'>             length -= 5;</div><div class='del'>-            ret_val = gdth_set_asc_info( buffer, length, hanum, scp );</div><div class='add'>+            ret_val = gdth_set_asc_info(host, buffer, length, hanum);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    scsi_release_request(scp);</div><div class='del'>-    scsi_free_host_dev(sdev);</div><div class='del'>-#else</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-    scsi_free_host_dev(sdev);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'>     return ret_val;</div><div class='ctx'> }</div><div class='ctx'>          </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Request *scp)</div><div class='del'>-#else</div><div class='del'>-static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Cmnd *scp)</div><div class='del'>-#endif</div><div class='add'>+static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer,</div><div class='add'>+                        int length,int hanum)</div><div class='ctx'> {</div><div class='del'>-    int             orig_length, drive, wb_mode;</div><div class='del'>-    int             i, found;</div><div class='add'>+    int orig_length, drive, wb_mode;</div><div class='add'>+    int i, found;</div><div class='ctx'>     gdth_ha_str     *ha;</div><div class='ctx'>     gdth_cmd_str    gdtcmd;</div><div class='ctx'>     gdth_cpar_str   *pcpar;</div><div class='hunk'>@@ -146,11 +115,8 @@ static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Cmnd *scp)</div><div class='ctx'>                     gdtcmd.u.cache.DeviceNo = i;</div><div class='ctx'>                     gdtcmd.u.cache.BlockNo = 1;</div><div class='ctx'>                 }</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-                gdth_do_req(scp, &amp;gdtcmd, cmnd, 30);</div><div class='del'>-#else</div><div class='del'>-                gdth_do_cmd(scp, &amp;gdtcmd, cmnd, 30);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+                gdth_execute(host, &amp;gdtcmd, cmnd, 30, NULL);</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'>         if (!found)</div><div class='hunk'>@@ -202,11 +168,9 @@ static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Cmnd *scp)</div><div class='ctx'>         gdtcmd.u.ioctl.subfunc = CACHE_CONFIG;</div><div class='ctx'>         gdtcmd.u.ioctl.channel = INVALID_CHANNEL;</div><div class='ctx'>         pcpar-&gt;write_back = wb_mode==1 ? 0:1;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-        gdth_do_req(scp, &amp;gdtcmd, cmnd, 30);</div><div class='del'>-#else</div><div class='del'>-        gdth_do_cmd(scp, &amp;gdtcmd, cmnd, 30);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+        gdth_execute(host, &amp;gdtcmd, cmnd, 30, NULL);</div><div class='add'>+</div><div class='ctx'>         gdth_ioctl_free(hanum, GDTH_SCRATCH, ha-&gt;pscratch, paddr);</div><div class='ctx'>         printk("Done.\n");</div><div class='ctx'>         return(orig_length);</div><div class='hunk'>@@ -230,13 +194,6 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'> </div><div class='ctx'>     gdth_cmd_str *gdtcmd;</div><div class='ctx'>     gdth_evt_str *estr;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    Scsi_Request *scp;</div><div class='del'>-    struct scsi_device *sdev;</div><div class='del'>-#else</div><div class='del'>-    Scsi_Cmnd *scp;</div><div class='del'>-    struct scsi_device *sdev;</div><div class='del'>-#endif</div><div class='ctx'>     char hrec[161];</div><div class='ctx'>     struct timeval tv;</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +209,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>     gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);</div><div class='ctx'>     estr = kmalloc(sizeof(*estr), GFP_KERNEL);</div><div class='ctx'>     if (!gdtcmd || !estr)</div><div class='del'>-	goto free_fail;</div><div class='add'>+        goto free_fail;</div><div class='ctx'> </div><div class='ctx'>     memset(cmnd, 0xff, 12);</div><div class='ctx'>     memset(gdtcmd, 0, sizeof(gdth_cmd_str));</div><div class='hunk'>@@ -260,28 +217,6 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>     TRACE2(("gdth_get_info() ha %d bus %d\n",hanum,busnum));</div><div class='ctx'>     ha = HADATA(gdth_ctr_tab[hanum]);</div><div class='ctx'> </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    sdev = scsi_get_host_dev(host);</div><div class='del'>-    scp  = scsi_allocate_request(sdev, GFP_KERNEL);</div><div class='del'>-    if (!scp)</div><div class='del'>-        goto free_fail;</div><div class='del'>-    scp-&gt;sr_cmd_len = 12;</div><div class='del'>-    scp-&gt;sr_use_sg = 0;</div><div class='del'>-#elif LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,4,0)</div><div class='del'>-    sdev = scsi_get_host_dev(host);</div><div class='del'>-    scp  = scsi_allocate_device(sdev, 1, FALSE);</div><div class='del'>-    if (!scp)</div><div class='del'>-        goto free_fail;</div><div class='del'>-    scp-&gt;cmd_len = 12;</div><div class='del'>-    scp-&gt;use_sg = 0;</div><div class='del'>-#else</div><div class='del'>-    memset(&amp;sdev,0,sizeof(struct scsi_device));</div><div class='del'>-    memset(&amp;scp, 0,sizeof(Scsi_Cmnd));</div><div class='del'>-    sdev.host = scp.host = host;</div><div class='del'>-    sdev.id = scp.target = sdev.host-&gt;this_id;</div><div class='del'>-    scp.device = &amp;sdev;</div><div class='del'>-#endif</div><div class='del'>-    </div><div class='ctx'>     </div><div class='ctx'>     /* request is i.e. "cat /proc/scsi/gdth/0" */ </div><div class='ctx'>     /* format: %-15s\t%-10s\t%-15s\t%s */</div><div class='hunk'>@@ -386,16 +321,9 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>                 sizeof(pds-&gt;list[0]);</div><div class='ctx'>             if (pds-&gt;entries &gt; cnt)</div><div class='ctx'>                 pds-&gt;entries = cnt;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-            gdth_do_req(scp, gdtcmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;sr_command-&gt;SCp.Status != S_OK) </div><div class='del'>-#else</div><div class='del'>-            gdth_do_cmd(scp, gdtcmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;SCp.Status != S_OK) </div><div class='del'>-#endif</div><div class='del'>-            { </div><div class='add'>+</div><div class='add'>+            if (gdth_execute(host, gdtcmd, cmnd, 30, NULL) != S_OK)</div><div class='ctx'>                 pds-&gt;count = 0;</div><div class='del'>-            }</div><div class='ctx'> </div><div class='ctx'>             /* other IOCTLs must fit into area GDTH_SCRATCH/4 */</div><div class='ctx'>             for (j = 0; j &lt; ha-&gt;raw[i].pdev_cnt; ++j) {</div><div class='hunk'>@@ -410,14 +338,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>                 gdtcmd-&gt;u.ioctl.subfunc = SCSI_DR_INFO | L_CTRL_PATTERN;</div><div class='ctx'>                 gdtcmd-&gt;u.ioctl.channel = </div><div class='ctx'>                     ha-&gt;raw[i].address | ha-&gt;raw[i].id_list[j];</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-                gdth_do_req(scp, gdtcmd, cmnd, 30);</div><div class='del'>-                if (scp-&gt;sr_command-&gt;SCp.Status == S_OK) </div><div class='del'>-#else</div><div class='del'>-                gdth_do_cmd(scp, gdtcmd, cmnd, 30);</div><div class='del'>-                if (scp-&gt;SCp.Status == S_OK) </div><div class='del'>-#endif</div><div class='del'>-                {</div><div class='add'>+</div><div class='add'>+                if (gdth_execute(host, gdtcmd, cmnd, 30, NULL) == S_OK) {</div><div class='ctx'>                     strncpy(hrec,pdi-&gt;vendor,8);</div><div class='ctx'>                     strncpy(hrec+8,pdi-&gt;product,16);</div><div class='ctx'>                     strncpy(hrec+24,pdi-&gt;revision,4);</div><div class='hunk'>@@ -466,14 +388,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>                     gdtcmd-&gt;u.ioctl.channel = </div><div class='ctx'>                         ha-&gt;raw[i].address | ha-&gt;raw[i].id_list[j];</div><div class='ctx'>                     pdef-&gt;sddc_type = 0x08;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-                    gdth_do_req(scp, gdtcmd, cmnd, 30);</div><div class='del'>-                    if (scp-&gt;sr_command-&gt;SCp.Status == S_OK) </div><div class='del'>-#else</div><div class='del'>-                    gdth_do_cmd(scp, gdtcmd, cmnd, 30);</div><div class='del'>-                    if (scp-&gt;SCp.Status == S_OK) </div><div class='del'>-#endif</div><div class='del'>-                    {</div><div class='add'>+</div><div class='add'>+                    if (gdth_execute(host, gdtcmd, cmnd, 30, NULL) == S_OK) {</div><div class='ctx'>                         size = sprintf(buffer+len,</div><div class='ctx'>                                        " Grown Defects:\t%d\n",</div><div class='ctx'>                                        pdef-&gt;sddc_cnt);</div><div class='hunk'>@@ -519,16 +435,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>                 gdtcmd-&gt;u.ioctl.param_size = sizeof(gdth_cdrinfo_str);</div><div class='ctx'>                 gdtcmd-&gt;u.ioctl.subfunc = CACHE_DRV_INFO;</div><div class='ctx'>                 gdtcmd-&gt;u.ioctl.channel = drv_no;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-                gdth_do_req(scp, gdtcmd, cmnd, 30);</div><div class='del'>-                if (scp-&gt;sr_command-&gt;SCp.Status != S_OK) </div><div class='del'>-#else</div><div class='del'>-                gdth_do_cmd(scp, gdtcmd, cmnd, 30);</div><div class='del'>-                if (scp-&gt;SCp.Status != S_OK)</div><div class='del'>-#endif</div><div class='del'>-                {</div><div class='add'>+                if (gdth_execute(host, gdtcmd, cmnd, 30, NULL) != S_OK)</div><div class='ctx'>                     break;</div><div class='del'>-                }</div><div class='ctx'>                 pcdi-&gt;ld_dtype &gt;&gt;= 16;</div><div class='ctx'>                 j++;</div><div class='ctx'>                 if (pcdi-&gt;ld_dtype &gt; 2) {</div><div class='hunk'>@@ -629,14 +537,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>             gdtcmd-&gt;u.ioctl.param_size = sizeof(gdth_arrayinf_str);</div><div class='ctx'>             gdtcmd-&gt;u.ioctl.subfunc = ARRAY_INFO | LA_CTRL_PATTERN;</div><div class='ctx'>             gdtcmd-&gt;u.ioctl.channel = i;</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-            gdth_do_req(scp, gdtcmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;sr_command-&gt;SCp.Status == S_OK) </div><div class='del'>-#else</div><div class='del'>-            gdth_do_cmd(scp, gdtcmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;SCp.Status == S_OK) </div><div class='del'>-#endif</div><div class='del'>-            {</div><div class='add'>+            if (gdth_execute(host, gdtcmd, cmnd, 30, NULL) == S_OK) {</div><div class='ctx'>                 if (pai-&gt;ai_state == 0)</div><div class='ctx'>                     strcpy(hrec, "idle");</div><div class='ctx'>                 else if (pai-&gt;ai_state == 2)</div><div class='hunk'>@@ -710,14 +611,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>             gdtcmd-&gt;u.ioctl.channel = i;</div><div class='ctx'>             phg-&gt;entries = MAX_HDRIVES;</div><div class='ctx'>             phg-&gt;offset = GDTOFFSOF(gdth_hget_str, entry[0]); </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-            gdth_do_req(scp, gdtcmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;sr_command-&gt;SCp.Status != S_OK) </div><div class='del'>-#else</div><div class='del'>-            gdth_do_cmd(scp, gdtcmd, cmnd, 30);</div><div class='del'>-            if (scp-&gt;SCp.Status != S_OK) </div><div class='del'>-#endif</div><div class='del'>-            {</div><div class='add'>+            if (gdth_execute(host, gdtcmd, cmnd, 30, NULL) == S_OK) {</div><div class='ctx'>                 ha-&gt;hdr[i].ldr_no = i;</div><div class='ctx'>                 ha-&gt;hdr[i].rw_attribs = 0;</div><div class='ctx'>                 ha-&gt;hdr[i].start_sec = 0;</div><div class='hunk'>@@ -791,13 +685,6 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> stop_output:</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    scsi_release_request(scp);</div><div class='del'>-    scsi_free_host_dev(sdev);</div><div class='del'>-#else</div><div class='del'>-    scsi_release_command(scp);</div><div class='del'>-    scsi_free_host_dev(sdev);</div><div class='del'>-#endif</div><div class='ctx'>     *start = buffer +(offset-begin);</div><div class='ctx'>     len -= (offset-begin);</div><div class='ctx'>     if (len &gt; length)</div><div class='hunk'>@@ -812,64 +699,6 @@ free_fail:</div><div class='ctx'>     return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-static void gdth_do_req(Scsi_Request *scp, gdth_cmd_str *gdtcmd, </div><div class='del'>-                        char *cmnd, int timeout)</div><div class='del'>-{</div><div class='del'>-    unsigned bufflen;</div><div class='del'>-    DECLARE_COMPLETION(wait);</div><div class='del'>-</div><div class='del'>-    TRACE2(("gdth_do_req()\n"));</div><div class='del'>-    if (gdtcmd != NULL) { </div><div class='del'>-        bufflen = sizeof(gdth_cmd_str);</div><div class='del'>-    } else {</div><div class='del'>-        bufflen = 0;</div><div class='del'>-    }</div><div class='del'>-    scp-&gt;sr_request-&gt;rq_status = RQ_SCSI_BUSY;</div><div class='del'>-    scp-&gt;sr_request-&gt;waiting = &amp;wait;</div><div class='del'>-    scsi_do_req(scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ, 1);</div><div class='del'>-    wait_for_completion(&amp;wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-static void gdth_do_cmd(Scsi_Cmnd *scp, gdth_cmd_str *gdtcmd, </div><div class='del'>-                        char *cmnd, int timeout)</div><div class='del'>-{</div><div class='del'>-    unsigned bufflen;</div><div class='del'>-    DECLARE_COMPLETION(wait);</div><div class='del'>-</div><div class='del'>-    TRACE2(("gdth_do_cmd()\n"));</div><div class='del'>-    if (gdtcmd != NULL) { </div><div class='del'>-        scp-&gt;SCp.this_residual = IOCTL_PRI;</div><div class='del'>-        bufflen = sizeof(gdth_cmd_str);</div><div class='del'>-    } else {</div><div class='del'>-        scp-&gt;SCp.this_residual = DEFAULT_PRI;</div><div class='del'>-        bufflen = 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    scp-&gt;request.rq_status = RQ_SCSI_BUSY;</div><div class='del'>-    scp-&gt;request.waiting = &amp;wait;</div><div class='del'>-    scsi_do_cmd(scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ, 1);</div><div class='del'>-    wait_for_completion(&amp;wait);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void gdth_scsi_done(Scsi_Cmnd *scp)</div><div class='del'>-{</div><div class='del'>-    TRACE2(("gdth_scsi_done()\n"));</div><div class='del'>-</div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-    scp-&gt;request-&gt;rq_status = RQ_SCSI_DONE;</div><div class='del'>-    if (scp-&gt;request-&gt;waiting != NULL)</div><div class='del'>-        complete(scp-&gt;request-&gt;waiting);</div><div class='del'>-#else</div><div class='del'>-    scp-&gt;request.rq_status = RQ_SCSI_DONE;</div><div class='del'>-    if (scp-&gt;request.waiting != NULL)</div><div class='del'>-        complete(scp-&gt;request.waiting);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static char *gdth_ioctl_alloc(int hanum, int size, int scratch, </div><div class='ctx'>                               ulong64 *paddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -976,11 +805,14 @@ static void gdth_stop_timeout(int hanum, int busnum, int id)</div><div class='ctx'>     spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'> </div><div class='ctx'>     for (scp = ha-&gt;req_first; scp; scp = (Scsi_Cmnd *)scp-&gt;SCp.ptr) {</div><div class='del'>-        b = virt_ctr ? NUMDATA(scp-&gt;device-&gt;host)-&gt;busnum : scp-&gt;device-&gt;channel;</div><div class='del'>-        t = scp-&gt;device-&gt;id;</div><div class='del'>-        if (t == (unchar)id &amp;&amp; b == (unchar)busnum) {</div><div class='del'>-            TRACE2(("gdth_stop_timeout(): update_timeout()\n"));</div><div class='del'>-            scp-&gt;SCp.buffers_residual = gdth_update_timeout(hanum, scp, 0);</div><div class='add'>+        if (scp-&gt;done != gdth_scsi_done) {</div><div class='add'>+            b = virt_ctr ?</div><div class='add'>+                NUMDATA(scp-&gt;device-&gt;host)-&gt;busnum : scp-&gt;device-&gt;channel;</div><div class='add'>+            t = scp-&gt;device-&gt;id;</div><div class='add'>+            if (t == (unchar)id &amp;&amp; b == (unchar)busnum) {</div><div class='add'>+                TRACE2(("gdth_stop_timeout(): update_timeout()\n"));</div><div class='add'>+                scp-&gt;SCp.buffers_residual = gdth_update_timeout(hanum, scp, 0);</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='hunk'>@@ -997,11 +829,14 @@ static void gdth_start_timeout(int hanum, int busnum, int id)</div><div class='ctx'>     spin_lock_irqsave(&amp;ha-&gt;smp_lock, flags);</div><div class='ctx'> </div><div class='ctx'>     for (scp = ha-&gt;req_first; scp; scp = (Scsi_Cmnd *)scp-&gt;SCp.ptr) {</div><div class='del'>-        b = virt_ctr ? NUMDATA(scp-&gt;device-&gt;host)-&gt;busnum : scp-&gt;device-&gt;channel;</div><div class='del'>-        t = scp-&gt;device-&gt;id;</div><div class='del'>-        if (t == (unchar)id &amp;&amp; b == (unchar)busnum) {</div><div class='del'>-            TRACE2(("gdth_start_timeout(): update_timeout()\n"));</div><div class='del'>-            gdth_update_timeout(hanum, scp, scp-&gt;SCp.buffers_residual);</div><div class='add'>+        if (scp-&gt;done != gdth_scsi_done) {</div><div class='add'>+            b = virt_ctr ?</div><div class='add'>+                NUMDATA(scp-&gt;device-&gt;host)-&gt;busnum : scp-&gt;device-&gt;channel;</div><div class='add'>+            t = scp-&gt;device-&gt;id;</div><div class='add'>+            if (t == (unchar)id &amp;&amp; b == (unchar)busnum) {</div><div class='add'>+                TRACE2(("gdth_start_timeout(): update_timeout()\n"));</div><div class='add'>+                gdth_update_timeout(hanum, scp, scp-&gt;SCp.buffers_residual);</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     spin_unlock_irqrestore(&amp;ha-&gt;smp_lock, flags);</div><div class='head'>diff --git a/drivers/scsi/gdth_proc.h b/drivers/scsi/gdth_proc.h<br/>index 295e825e2c60..a679eeb6820b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gdth_proc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gdth_proc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gdth_proc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/gdth_proc.h</a></div><div class='hunk'>@@ -5,20 +5,16 @@</div><div class='ctx'>  * $Id: gdth_proc.h,v 1.16 2004/01/14 13:09:01 achim Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+int gdth_execute(struct Scsi_Host *shost, gdth_cmd_str *gdtcmd, char *cmnd,</div><div class='add'>+                 int timeout, u32 *info);</div><div class='add'>+</div><div class='ctx'> static int gdth_set_info(char *buffer,int length,struct Scsi_Host *host,</div><div class='ctx'>                          int hanum,int busnum);</div><div class='ctx'> static int gdth_get_info(char *buffer,char **start,off_t offset,int length,</div><div class='ctx'>                          struct Scsi_Host *host,int hanum,int busnum);</div><div class='ctx'> </div><div class='del'>-#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,0)</div><div class='del'>-static void gdth_do_req(Scsi_Request *srp, gdth_cmd_str *cmd, </div><div class='del'>-                        char *cmnd, int timeout);</div><div class='del'>-static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Request *scp);</div><div class='del'>-#else</div><div class='del'>-static void gdth_do_cmd(Scsi_Cmnd *scp, gdth_cmd_str *cmd, </div><div class='del'>-                        char *cmnd, int timeout);</div><div class='del'>-static int gdth_set_asc_info(char *buffer,int length,int hanum,Scsi_Cmnd *scp);</div><div class='del'>-#endif</div><div class='add'>+static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer,</div><div class='add'>+                             int length, int hanum);</div><div class='ctx'> </div><div class='ctx'> static char *gdth_ioctl_alloc(int hanum, int size, int scratch,</div><div class='ctx'>                               ulong64 *paddr);  </div><div class='hunk'>@@ -28,7 +24,5 @@ static void gdth_stop_timeout(int hanum, int busnum, int id);</div><div class='ctx'> static void gdth_start_timeout(int hanum, int busnum, int id);</div><div class='ctx'> static int gdth_update_timeout(int hanum, Scsi_Cmnd *scp, int timeout);</div><div class='ctx'> </div><div class='del'>-void gdth_scsi_done(Scsi_Cmnd *scp);</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c<br/>index 5b154498056d..a0d831b1bada 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/gvp11.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/gvp11.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/gvp11.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/gvp11.c</a></div><div class='hunk'>@@ -328,7 +328,7 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 		     (epc &amp; GVP_SCSICLKMASK) ? WD33C93_FS_8_10</div><div class='ctx'> 					     : WD33C93_FS_12_15);</div><div class='ctx'> </div><div class='del'>-	request_irq(IRQ_AMIGA_PORTS, gvp11_intr, SA_SHIRQ, "GVP11 SCSI",</div><div class='add'>+	request_irq(IRQ_AMIGA_PORTS, gvp11_intr, IRQF_SHARED, "GVP11 SCSI",</div><div class='ctx'> 		    instance);</div><div class='ctx'> 	DMA(instance)-&gt;CNTR = GVP11_DMAC_INT_ENABLE;</div><div class='ctx'> 	num_gvp11++;</div><div class='head'>diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c<br/>new file mode 100644<br/>index 000000000000..ab2f8b267908<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/hptiop.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/hptiop.c</a></div><div class='hunk'>@@ -0,0 +1,1493 @@</div><div class='add'>+/*</div><div class='add'>+ * HighPoint RR3xxx controller driver for Linux</div><div class='add'>+ * Copyright (C) 2006 HighPoint Technologies, Inc. All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Please report bugs/comments/suggestions to linux@highpoint-tech.com</div><div class='add'>+ *</div><div class='add'>+ * For more information, visit http://www.highpoint-tech.com</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/hdreg.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/div64.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_device.h&gt;</div><div class='add'>+#include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_tcq.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hptiop.h"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("HighPoint Technologies, Inc.");</div><div class='add'>+MODULE_DESCRIPTION("HighPoint RocketRAID 3xxx SATA Controller Driver");</div><div class='add'>+</div><div class='add'>+static char driver_name[] = "hptiop";</div><div class='add'>+static const char driver_name_long[] = "RocketRAID 3xxx SATA Controller driver";</div><div class='add'>+static const char driver_ver[] = "v1.0 (060426)";</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(hptiop_hba_list_lock);</div><div class='add'>+static LIST_HEAD(hptiop_hba_list);</div><div class='add'>+static int hptiop_cdev_major = -1;</div><div class='add'>+</div><div class='add'>+static void hptiop_host_request_callback(struct hptiop_hba *hba, u32 tag);</div><div class='add'>+static void hptiop_iop_request_callback(struct hptiop_hba *hba, u32 tag);</div><div class='add'>+static void hptiop_message_callback(struct hptiop_hba *hba, u32 msg);</div><div class='add'>+</div><div class='add'>+static inline void hptiop_pci_posting_flush(struct hpt_iopmu __iomem *iop)</div><div class='add'>+{</div><div class='add'>+	readl(&amp;iop-&gt;outbound_intstatus);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iop_wait_ready(struct hpt_iopmu __iomem *iop, u32 millisec)</div><div class='add'>+{</div><div class='add'>+	u32 req = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; millisec; i++) {</div><div class='add'>+		req = readl(&amp;iop-&gt;inbound_queue);</div><div class='add'>+		if (req != IOPMU_QUEUE_EMPTY)</div><div class='add'>+			break;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req != IOPMU_QUEUE_EMPTY) {</div><div class='add'>+		writel(req, &amp;iop-&gt;outbound_queue);</div><div class='add'>+		hptiop_pci_posting_flush(iop);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_request_callback(struct hptiop_hba *hba, u32 tag)</div><div class='add'>+{</div><div class='add'>+	if ((tag &amp; IOPMU_QUEUE_MASK_HOST_BITS) == IOPMU_QUEUE_ADDR_HOST_BIT)</div><div class='add'>+		return hptiop_host_request_callback(hba,</div><div class='add'>+				tag &amp; ~IOPMU_QUEUE_ADDR_HOST_BIT);</div><div class='add'>+	else</div><div class='add'>+		return hptiop_iop_request_callback(hba, tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hptiop_drain_outbound_queue(struct hptiop_hba *hba)</div><div class='add'>+{</div><div class='add'>+	u32 req;</div><div class='add'>+</div><div class='add'>+	while ((req = readl(&amp;hba-&gt;iop-&gt;outbound_queue)) != IOPMU_QUEUE_EMPTY) {</div><div class='add'>+</div><div class='add'>+		if (req &amp; IOPMU_QUEUE_MASK_HOST_BITS)</div><div class='add'>+			hptiop_request_callback(hba, req);</div><div class='add'>+		else {</div><div class='add'>+			struct hpt_iop_request_header __iomem * p;</div><div class='add'>+</div><div class='add'>+			p = (struct hpt_iop_request_header __iomem *)</div><div class='add'>+				((char __iomem *)hba-&gt;iop + req);</div><div class='add'>+</div><div class='add'>+			if (readl(&amp;p-&gt;flags) &amp; IOP_REQUEST_FLAG_SYNC_REQUEST) {</div><div class='add'>+				if (readl(&amp;p-&gt;context))</div><div class='add'>+					hptiop_request_callback(hba, req);</div><div class='add'>+				else</div><div class='add'>+					writel(1, &amp;p-&gt;context);</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+				hptiop_request_callback(hba, req);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __iop_intr(struct hptiop_hba *hba)</div><div class='add'>+{</div><div class='add'>+	struct hpt_iopmu __iomem *iop = hba-&gt;iop;</div><div class='add'>+	u32 status;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	status = readl(&amp;iop-&gt;outbound_intstatus);</div><div class='add'>+</div><div class='add'>+	if (status &amp; IOPMU_OUTBOUND_INT_MSG0) {</div><div class='add'>+		u32 msg = readl(&amp;iop-&gt;outbound_msgaddr0);</div><div class='add'>+		dprintk("received outbound msg %x\n", msg);</div><div class='add'>+		writel(IOPMU_OUTBOUND_INT_MSG0, &amp;iop-&gt;outbound_intstatus);</div><div class='add'>+		hptiop_message_callback(hba, msg);</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; IOPMU_OUTBOUND_INT_POSTQUEUE) {</div><div class='add'>+		hptiop_drain_outbound_queue(hba);</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iop_send_sync_request(struct hptiop_hba *hba,</div><div class='add'>+					void __iomem *_req, u32 millisec)</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header __iomem *req = _req;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	writel(readl(&amp;req-&gt;flags) | IOP_REQUEST_FLAG_SYNC_REQUEST,</div><div class='add'>+			&amp;req-&gt;flags);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;req-&gt;context);</div><div class='add'>+</div><div class='add'>+	writel((unsigned long)req - (unsigned long)hba-&gt;iop,</div><div class='add'>+			&amp;hba-&gt;iop-&gt;inbound_queue);</div><div class='add'>+</div><div class='add'>+	hptiop_pci_posting_flush(hba-&gt;iop);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; millisec; i++) {</div><div class='add'>+		__iop_intr(hba);</div><div class='add'>+		if (readl(&amp;req-&gt;context))</div><div class='add'>+			return 0;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iop_send_sync_msg(struct hptiop_hba *hba, u32 msg, u32 millisec)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	hba-&gt;msg_done = 0;</div><div class='add'>+</div><div class='add'>+	writel(msg, &amp;hba-&gt;iop-&gt;inbound_msgaddr0);</div><div class='add'>+</div><div class='add'>+	hptiop_pci_posting_flush(hba-&gt;iop);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; millisec; i++) {</div><div class='add'>+		spin_lock_irq(hba-&gt;host-&gt;host_lock);</div><div class='add'>+		__iop_intr(hba);</div><div class='add'>+		spin_unlock_irq(hba-&gt;host-&gt;host_lock);</div><div class='add'>+		if (hba-&gt;msg_done)</div><div class='add'>+			break;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hba-&gt;msg_done? 0 : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iop_get_config(struct hptiop_hba *hba,</div><div class='add'>+				struct hpt_iop_request_get_config *config)</div><div class='add'>+{</div><div class='add'>+	u32 req32;</div><div class='add'>+	struct hpt_iop_request_get_config __iomem *req;</div><div class='add'>+</div><div class='add'>+	req32 = readl(&amp;hba-&gt;iop-&gt;inbound_queue);</div><div class='add'>+	if (req32 == IOPMU_QUEUE_EMPTY)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	req = (struct hpt_iop_request_get_config __iomem *)</div><div class='add'>+			((unsigned long)hba-&gt;iop + req32);</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;req-&gt;header.flags);</div><div class='add'>+	writel(IOP_REQUEST_TYPE_GET_CONFIG, &amp;req-&gt;header.type);</div><div class='add'>+	writel(sizeof(struct hpt_iop_request_get_config), &amp;req-&gt;header.size);</div><div class='add'>+	writel(IOP_RESULT_PENDING, &amp;req-&gt;header.result);</div><div class='add'>+</div><div class='add'>+	if (iop_send_sync_request(hba, req, 20000)) {</div><div class='add'>+		dprintk("Get config send cmd failed\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy_fromio(config, req, sizeof(*config));</div><div class='add'>+	writel(req32, &amp;hba-&gt;iop-&gt;outbound_queue);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iop_set_config(struct hptiop_hba *hba,</div><div class='add'>+				struct hpt_iop_request_set_config *config)</div><div class='add'>+{</div><div class='add'>+	u32 req32;</div><div class='add'>+	struct hpt_iop_request_set_config __iomem *req;</div><div class='add'>+</div><div class='add'>+	req32 = readl(&amp;hba-&gt;iop-&gt;inbound_queue);</div><div class='add'>+	if (req32 == IOPMU_QUEUE_EMPTY)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	req = (struct hpt_iop_request_set_config __iomem *)</div><div class='add'>+			((unsigned long)hba-&gt;iop + req32);</div><div class='add'>+</div><div class='add'>+	memcpy_toio((u8 __iomem *)req + sizeof(struct hpt_iop_request_header),</div><div class='add'>+		(u8 *)config + sizeof(struct hpt_iop_request_header),</div><div class='add'>+		sizeof(struct hpt_iop_request_set_config) -</div><div class='add'>+			sizeof(struct hpt_iop_request_header));</div><div class='add'>+</div><div class='add'>+	writel(0, &amp;req-&gt;header.flags);</div><div class='add'>+	writel(IOP_REQUEST_TYPE_SET_CONFIG, &amp;req-&gt;header.type);</div><div class='add'>+	writel(sizeof(struct hpt_iop_request_set_config), &amp;req-&gt;header.size);</div><div class='add'>+	writel(IOP_RESULT_PENDING, &amp;req-&gt;header.result);</div><div class='add'>+</div><div class='add'>+	if (iop_send_sync_request(hba, req, 20000)) {</div><div class='add'>+		dprintk("Set config send cmd failed\n");</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(req32, &amp;hba-&gt;iop-&gt;outbound_queue);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_initialize_iop(struct hptiop_hba *hba)</div><div class='add'>+{</div><div class='add'>+	struct hpt_iopmu __iomem *iop = hba-&gt;iop;</div><div class='add'>+</div><div class='add'>+	/* enable interrupts */</div><div class='add'>+	writel(~(IOPMU_OUTBOUND_INT_POSTQUEUE | IOPMU_OUTBOUND_INT_MSG0),</div><div class='add'>+			&amp;iop-&gt;outbound_intmask);</div><div class='add'>+</div><div class='add'>+	hba-&gt;initialized = 1;</div><div class='add'>+</div><div class='add'>+	/* start background tasks */</div><div class='add'>+	if (iop_send_sync_msg(hba,</div><div class='add'>+			IOPMU_INBOUND_MSG0_START_BACKGROUND_TASK, 5000)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: fail to start background task\n",</div><div class='add'>+			hba-&gt;host-&gt;host_no);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_map_pci_bar(struct hptiop_hba *hba)</div><div class='add'>+{</div><div class='add'>+	u32 mem_base_phy, length;</div><div class='add'>+	void __iomem *mem_base_virt;</div><div class='add'>+	struct pci_dev *pcidev = hba-&gt;pcidev;</div><div class='add'>+</div><div class='add'>+	if (!(pci_resource_flags(pcidev, 0) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: pci resource invalid\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mem_base_phy = pci_resource_start(pcidev, 0);</div><div class='add'>+	length = pci_resource_len(pcidev, 0);</div><div class='add'>+	mem_base_virt = ioremap(mem_base_phy, length);</div><div class='add'>+</div><div class='add'>+	if (!mem_base_virt) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: Fail to ioremap memory space\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hba-&gt;iop = mem_base_virt;</div><div class='add'>+	dprintk("hptiop_map_pci_bar: iop=%p\n", hba-&gt;iop);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_message_callback(struct hptiop_hba *hba, u32 msg)</div><div class='add'>+{</div><div class='add'>+	dprintk("iop message 0x%x\n", msg);</div><div class='add'>+</div><div class='add'>+	if (!hba-&gt;initialized)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (msg == IOPMU_INBOUND_MSG0_RESET) {</div><div class='add'>+		atomic_set(&amp;hba-&gt;resetting, 0);</div><div class='add'>+		wake_up(&amp;hba-&gt;reset_wq);</div><div class='add'>+	}</div><div class='add'>+	else if (msg &lt;= IOPMU_INBOUND_MSG0_MAX)</div><div class='add'>+		hba-&gt;msg_done = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct hptiop_request *get_req(struct hptiop_hba *hba)</div><div class='add'>+{</div><div class='add'>+	struct hptiop_request *ret;</div><div class='add'>+</div><div class='add'>+	dprintk("get_req : req=%p\n", hba-&gt;req_list);</div><div class='add'>+</div><div class='add'>+	ret = hba-&gt;req_list;</div><div class='add'>+	if (ret)</div><div class='add'>+		hba-&gt;req_list = ret-&gt;next;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void free_req(struct hptiop_hba *hba, struct hptiop_request *req)</div><div class='add'>+{</div><div class='add'>+	dprintk("free_req(%d, %p)\n", req-&gt;index, req);</div><div class='add'>+	req-&gt;next = hba-&gt;req_list;</div><div class='add'>+	hba-&gt;req_list = req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_host_request_callback(struct hptiop_hba *hba, u32 tag)</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_scsi_command *req;</div><div class='add'>+	struct scsi_cmnd *scp;</div><div class='add'>+</div><div class='add'>+	req = (struct hpt_iop_request_scsi_command *)hba-&gt;reqs[tag].req_virt;</div><div class='add'>+	dprintk("hptiop_host_request_callback: req=%p, type=%d, "</div><div class='add'>+			"result=%d, context=0x%x tag=%d\n",</div><div class='add'>+			req, req-&gt;header.type, req-&gt;header.result,</div><div class='add'>+			req-&gt;header.context, tag);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!req-&gt;header.result);</div><div class='add'>+	BUG_ON(req-&gt;header.type != cpu_to_le32(IOP_REQUEST_TYPE_SCSI_COMMAND));</div><div class='add'>+</div><div class='add'>+	scp = hba-&gt;reqs[tag].scp;</div><div class='add'>+</div><div class='add'>+	if (HPT_SCP(scp)-&gt;mapped) {</div><div class='add'>+		if (scp-&gt;use_sg)</div><div class='add'>+			pci_unmap_sg(hba-&gt;pcidev,</div><div class='add'>+				(struct scatterlist *)scp-&gt;request_buffer,</div><div class='add'>+				scp-&gt;use_sg,</div><div class='add'>+				scp-&gt;sc_data_direction</div><div class='add'>+			);</div><div class='add'>+		else</div><div class='add'>+			pci_unmap_single(hba-&gt;pcidev,</div><div class='add'>+				HPT_SCP(scp)-&gt;dma_handle,</div><div class='add'>+				scp-&gt;request_bufflen,</div><div class='add'>+				scp-&gt;sc_data_direction</div><div class='add'>+			);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (le32_to_cpu(req-&gt;header.result)) {</div><div class='add'>+	case IOP_RESULT_SUCCESS:</div><div class='add'>+		scp-&gt;result = (DID_OK&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	case IOP_RESULT_BAD_TARGET:</div><div class='add'>+		scp-&gt;result = (DID_BAD_TARGET&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	case IOP_RESULT_BUSY:</div><div class='add'>+		scp-&gt;result = (DID_BUS_BUSY&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	case IOP_RESULT_RESET:</div><div class='add'>+		scp-&gt;result = (DID_RESET&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	case IOP_RESULT_FAIL:</div><div class='add'>+		scp-&gt;result = (DID_ERROR&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	case IOP_RESULT_INVALID_REQUEST:</div><div class='add'>+		scp-&gt;result = (DID_ABORT&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	case IOP_RESULT_MODE_SENSE_CHECK_CONDITION:</div><div class='add'>+		scp-&gt;result = SAM_STAT_CHECK_CONDITION;</div><div class='add'>+		memset(&amp;scp-&gt;sense_buffer,</div><div class='add'>+				0, sizeof(scp-&gt;sense_buffer));</div><div class='add'>+		memcpy(&amp;scp-&gt;sense_buffer,</div><div class='add'>+			&amp;req-&gt;sg_list, le32_to_cpu(req-&gt;dataxfer_length));</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		scp-&gt;result = ((DRIVER_INVALID|SUGGEST_ABORT)&lt;&lt;24) |</div><div class='add'>+					(DID_ABORT&lt;&lt;16);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk("scsi_done(%p)\n", scp);</div><div class='add'>+	scp-&gt;scsi_done(scp);</div><div class='add'>+	free_req(hba, &amp;hba-&gt;reqs[tag]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hptiop_iop_request_callback(struct hptiop_hba *hba, u32 tag)</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header __iomem *req;</div><div class='add'>+	struct hpt_iop_request_ioctl_command __iomem *p;</div><div class='add'>+	struct hpt_ioctl_k *arg;</div><div class='add'>+</div><div class='add'>+	req = (struct hpt_iop_request_header __iomem *)</div><div class='add'>+			((unsigned long)hba-&gt;iop + tag);</div><div class='add'>+	dprintk("hptiop_iop_request_callback: req=%p, type=%d, "</div><div class='add'>+			"result=%d, context=0x%x tag=%d\n",</div><div class='add'>+			req, readl(&amp;req-&gt;type), readl(&amp;req-&gt;result),</div><div class='add'>+			readl(&amp;req-&gt;context), tag);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!readl(&amp;req-&gt;result));</div><div class='add'>+	BUG_ON(readl(&amp;req-&gt;type) != IOP_REQUEST_TYPE_IOCTL_COMMAND);</div><div class='add'>+</div><div class='add'>+	p = (struct hpt_iop_request_ioctl_command __iomem *)req;</div><div class='add'>+	arg = (struct hpt_ioctl_k *)(unsigned long)</div><div class='add'>+		(readl(&amp;req-&gt;context) |</div><div class='add'>+			((u64)readl(&amp;req-&gt;context_hi32)&lt;&lt;32));</div><div class='add'>+</div><div class='add'>+	if (readl(&amp;req-&gt;result) == IOP_RESULT_SUCCESS) {</div><div class='add'>+		arg-&gt;result = HPT_IOCTL_RESULT_OK;</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;outbuf_size)</div><div class='add'>+			memcpy_fromio(arg-&gt;outbuf,</div><div class='add'>+				&amp;p-&gt;buf[(readl(&amp;p-&gt;inbuf_size) + 3)&amp; ~3],</div><div class='add'>+				arg-&gt;outbuf_size);</div><div class='add'>+</div><div class='add'>+		if (arg-&gt;bytes_returned)</div><div class='add'>+			*arg-&gt;bytes_returned = arg-&gt;outbuf_size;</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		arg-&gt;result = HPT_IOCTL_RESULT_FAILED;</div><div class='add'>+</div><div class='add'>+	arg-&gt;done(arg);</div><div class='add'>+	writel(tag, &amp;hba-&gt;iop-&gt;outbound_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t hptiop_intr(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct hptiop_hba  *hba = dev_id;</div><div class='add'>+	int  handled;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(hba-&gt;host-&gt;host_lock, flags);</div><div class='add'>+	handled = __iop_intr(hba);</div><div class='add'>+	spin_unlock_irqrestore(hba-&gt;host-&gt;host_lock, flags);</div><div class='add'>+</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_buildsgl(struct scsi_cmnd *scp, struct hpt_iopsg *psg)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = scp-&gt;device-&gt;host;</div><div class='add'>+	struct hptiop_hba *hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+	struct scatterlist *sglist = (struct scatterlist *)scp-&gt;request_buffer;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * though we'll not get non-use_sg fields anymore,</div><div class='add'>+	 * keep use_sg checking anyway</div><div class='add'>+	 */</div><div class='add'>+	if (scp-&gt;use_sg) {</div><div class='add'>+		int idx;</div><div class='add'>+</div><div class='add'>+		HPT_SCP(scp)-&gt;sgcnt = pci_map_sg(hba-&gt;pcidev,</div><div class='add'>+				sglist, scp-&gt;use_sg,</div><div class='add'>+				scp-&gt;sc_data_direction);</div><div class='add'>+		HPT_SCP(scp)-&gt;mapped = 1;</div><div class='add'>+		BUG_ON(HPT_SCP(scp)-&gt;sgcnt &gt; hba-&gt;max_sg_descriptors);</div><div class='add'>+</div><div class='add'>+		for (idx = 0; idx &lt; HPT_SCP(scp)-&gt;sgcnt; idx++) {</div><div class='add'>+			psg[idx].pci_address =</div><div class='add'>+				cpu_to_le64(sg_dma_address(&amp;sglist[idx]));</div><div class='add'>+			psg[idx].size = cpu_to_le32(sg_dma_len(&amp;sglist[idx]));</div><div class='add'>+			psg[idx].eot = (idx == HPT_SCP(scp)-&gt;sgcnt - 1) ?</div><div class='add'>+				cpu_to_le32(1) : 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return HPT_SCP(scp)-&gt;sgcnt;</div><div class='add'>+	} else {</div><div class='add'>+		HPT_SCP(scp)-&gt;dma_handle = pci_map_single(</div><div class='add'>+				hba-&gt;pcidev,</div><div class='add'>+				scp-&gt;request_buffer,</div><div class='add'>+				scp-&gt;request_bufflen,</div><div class='add'>+				scp-&gt;sc_data_direction</div><div class='add'>+			);</div><div class='add'>+		HPT_SCP(scp)-&gt;mapped = 1;</div><div class='add'>+		psg-&gt;pci_address = cpu_to_le64(HPT_SCP(scp)-&gt;dma_handle);</div><div class='add'>+		psg-&gt;size = cpu_to_le32(scp-&gt;request_bufflen);</div><div class='add'>+		psg-&gt;eot = cpu_to_le32(1);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_queuecommand(struct scsi_cmnd *scp,</div><div class='add'>+				void (*done)(struct scsi_cmnd *))</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = scp-&gt;device-&gt;host;</div><div class='add'>+	struct hptiop_hba *hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+	struct hpt_iop_request_scsi_command *req;</div><div class='add'>+	int sg_count = 0;</div><div class='add'>+	struct hptiop_request *_req;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!done);</div><div class='add'>+	scp-&gt;scsi_done = done;</div><div class='add'>+</div><div class='add'>+	_req = get_req(hba);</div><div class='add'>+	if (_req == NULL) {</div><div class='add'>+		dprintk("hptiop_queuecmd : no free req\n");</div><div class='add'>+		return SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	_req-&gt;scp = scp;</div><div class='add'>+</div><div class='add'>+	dprintk("hptiop_queuecmd(scp=%p) %d/%d/%d/%d cdb=(%x-%x-%x) "</div><div class='add'>+			"req_index=%d, req=%p\n",</div><div class='add'>+			scp,</div><div class='add'>+			host-&gt;host_no, scp-&gt;device-&gt;channel,</div><div class='add'>+			scp-&gt;device-&gt;id, scp-&gt;device-&gt;lun,</div><div class='add'>+			*((u32 *)&amp;scp-&gt;cmnd),</div><div class='add'>+			*((u32 *)&amp;scp-&gt;cmnd + 1),</div><div class='add'>+			*((u32 *)&amp;scp-&gt;cmnd + 2),</div><div class='add'>+			_req-&gt;index, _req-&gt;req_virt);</div><div class='add'>+</div><div class='add'>+	scp-&gt;result = 0;</div><div class='add'>+</div><div class='add'>+	if (scp-&gt;device-&gt;channel || scp-&gt;device-&gt;lun ||</div><div class='add'>+			scp-&gt;device-&gt;id &gt; hba-&gt;max_devices) {</div><div class='add'>+		scp-&gt;result = DID_BAD_TARGET &lt;&lt; 16;</div><div class='add'>+		free_req(hba, _req);</div><div class='add'>+		goto cmd_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = (struct hpt_iop_request_scsi_command *)_req-&gt;req_virt;</div><div class='add'>+</div><div class='add'>+	/* build S/G table */</div><div class='add'>+	if (scp-&gt;request_bufflen)</div><div class='add'>+		sg_count = hptiop_buildsgl(scp, req-&gt;sg_list);</div><div class='add'>+	else</div><div class='add'>+		HPT_SCP(scp)-&gt;mapped = 0;</div><div class='add'>+</div><div class='add'>+	req-&gt;header.flags = cpu_to_le32(IOP_REQUEST_FLAG_OUTPUT_CONTEXT);</div><div class='add'>+	req-&gt;header.type = cpu_to_le32(IOP_REQUEST_TYPE_SCSI_COMMAND);</div><div class='add'>+	req-&gt;header.result = cpu_to_le32(IOP_RESULT_PENDING);</div><div class='add'>+	req-&gt;header.context = cpu_to_le32(IOPMU_QUEUE_ADDR_HOST_BIT |</div><div class='add'>+							(u32)_req-&gt;index);</div><div class='add'>+	req-&gt;header.context_hi32 = 0;</div><div class='add'>+	req-&gt;dataxfer_length = cpu_to_le32(scp-&gt;request_bufflen);</div><div class='add'>+	req-&gt;channel = scp-&gt;device-&gt;channel;</div><div class='add'>+	req-&gt;target = scp-&gt;device-&gt;id;</div><div class='add'>+	req-&gt;lun = scp-&gt;device-&gt;lun;</div><div class='add'>+	req-&gt;header.size = cpu_to_le32(</div><div class='add'>+				sizeof(struct hpt_iop_request_scsi_command)</div><div class='add'>+				 - sizeof(struct hpt_iopsg)</div><div class='add'>+				 + sg_count * sizeof(struct hpt_iopsg));</div><div class='add'>+</div><div class='add'>+	memcpy(req-&gt;cdb, scp-&gt;cmnd, sizeof(req-&gt;cdb));</div><div class='add'>+</div><div class='add'>+	writel(IOPMU_QUEUE_ADDR_HOST_BIT | _req-&gt;req_shifted_phy,</div><div class='add'>+			&amp;hba-&gt;iop-&gt;inbound_queue);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cmd_done:</div><div class='add'>+	dprintk("scsi_done(scp=%p)\n", scp);</div><div class='add'>+	scp-&gt;scsi_done(scp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *hptiop_info(struct Scsi_Host *host)</div><div class='add'>+{</div><div class='add'>+	return driver_name_long;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_reset_hba(struct hptiop_hba *hba)</div><div class='add'>+{</div><div class='add'>+	if (atomic_xchg(&amp;hba-&gt;resetting, 1) == 0) {</div><div class='add'>+		atomic_inc(&amp;hba-&gt;reset_count);</div><div class='add'>+		writel(IOPMU_INBOUND_MSG0_RESET,</div><div class='add'>+				&amp;hba-&gt;iop-&gt;outbound_msgaddr0);</div><div class='add'>+		hptiop_pci_posting_flush(hba-&gt;iop);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(hba-&gt;reset_wq,</div><div class='add'>+			atomic_read(&amp;hba-&gt;resetting) == 0, 60 * HZ);</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;hba-&gt;resetting)) {</div><div class='add'>+		/* IOP is in unkown state, abort reset */</div><div class='add'>+		printk(KERN_ERR "scsi%d: reset failed\n", hba-&gt;host-&gt;host_no);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iop_send_sync_msg(hba,</div><div class='add'>+		IOPMU_INBOUND_MSG0_START_BACKGROUND_TASK, 5000)) {</div><div class='add'>+		dprintk("scsi%d: fail to start background task\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_reset(struct scsi_cmnd *scp)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host * host = scp-&gt;device-&gt;host;</div><div class='add'>+	struct hptiop_hba * hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	printk(KERN_WARNING "hptiop_reset(%d/%d/%d) scp=%p\n",</div><div class='add'>+			scp-&gt;device-&gt;host-&gt;host_no, scp-&gt;device-&gt;channel,</div><div class='add'>+			scp-&gt;device-&gt;id, scp);</div><div class='add'>+</div><div class='add'>+	return hptiop_reset_hba(hba)? FAILED : SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_adjust_disk_queue_depth(struct scsi_device *sdev,</div><div class='add'>+						int queue_depth)</div><div class='add'>+{</div><div class='add'>+	if(queue_depth &gt; 256)</div><div class='add'>+		queue_depth = 256;</div><div class='add'>+	scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);</div><div class='add'>+	return queue_depth;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hptiop_getinfo {</div><div class='add'>+	char __user *buffer;</div><div class='add'>+	loff_t buflength;</div><div class='add'>+	loff_t bufoffset;</div><div class='add'>+	loff_t buffillen;</div><div class='add'>+	loff_t filpos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void hptiop_copy_mem_info(struct hptiop_getinfo *pinfo,</div><div class='add'>+					char *data, int datalen)</div><div class='add'>+{</div><div class='add'>+	if (pinfo-&gt;filpos &lt; pinfo-&gt;bufoffset) {</div><div class='add'>+		if (pinfo-&gt;filpos + datalen &lt;= pinfo-&gt;bufoffset) {</div><div class='add'>+			pinfo-&gt;filpos += datalen;</div><div class='add'>+			return;</div><div class='add'>+		} else {</div><div class='add'>+			data += (pinfo-&gt;bufoffset - pinfo-&gt;filpos);</div><div class='add'>+			datalen  -= (pinfo-&gt;bufoffset - pinfo-&gt;filpos);</div><div class='add'>+			pinfo-&gt;filpos = pinfo-&gt;bufoffset;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pinfo-&gt;filpos += datalen;</div><div class='add'>+	if (pinfo-&gt;buffillen == pinfo-&gt;buflength)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pinfo-&gt;buflength - pinfo-&gt;buffillen &lt; datalen)</div><div class='add'>+		datalen = pinfo-&gt;buflength - pinfo-&gt;buffillen;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(pinfo-&gt;buffer + pinfo-&gt;buffillen, data, datalen))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pinfo-&gt;buffillen += datalen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_copy_info(struct hptiop_getinfo *pinfo, char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list args;</div><div class='add'>+	char buf[128];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	len = vsnprintf(buf, sizeof(buf), fmt, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+	hptiop_copy_mem_info(pinfo, buf, len);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_ioctl_done(struct hpt_ioctl_k *arg)</div><div class='add'>+{</div><div class='add'>+	arg-&gt;done = NULL;</div><div class='add'>+	wake_up(&amp;arg-&gt;hba-&gt;ioctl_wq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_do_ioctl(struct hpt_ioctl_k *arg)</div><div class='add'>+{</div><div class='add'>+	struct hptiop_hba *hba = arg-&gt;hba;</div><div class='add'>+	u32 val;</div><div class='add'>+	struct hpt_iop_request_ioctl_command __iomem *req;</div><div class='add'>+	int ioctl_retry = 0;</div><div class='add'>+</div><div class='add'>+	dprintk("scsi%d: hptiop_do_ioctl\n", hba-&gt;host-&gt;host_no);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * check (in + out) buff size from application.</div><div class='add'>+	 * outbuf must be dword aligned.</div><div class='add'>+	 */</div><div class='add'>+	if (((arg-&gt;inbuf_size + 3) &amp; ~3) + arg-&gt;outbuf_size &gt;</div><div class='add'>+			hba-&gt;max_request_size</div><div class='add'>+				- sizeof(struct hpt_iop_request_header)</div><div class='add'>+				- 4 * sizeof(u32)) {</div><div class='add'>+		dprintk("scsi%d: ioctl buf size (%d/%d) is too large\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no,</div><div class='add'>+				arg-&gt;inbuf_size, arg-&gt;outbuf_size);</div><div class='add'>+		arg-&gt;result = HPT_IOCTL_RESULT_FAILED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+retry:</div><div class='add'>+	spin_lock_irq(hba-&gt;host-&gt;host_lock);</div><div class='add'>+</div><div class='add'>+	val = readl(&amp;hba-&gt;iop-&gt;inbound_queue);</div><div class='add'>+	if (val == IOPMU_QUEUE_EMPTY) {</div><div class='add'>+		spin_unlock_irq(hba-&gt;host-&gt;host_lock);</div><div class='add'>+		dprintk("scsi%d: no free req for ioctl\n", hba-&gt;host-&gt;host_no);</div><div class='add'>+		arg-&gt;result = -1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = (struct hpt_iop_request_ioctl_command __iomem *)</div><div class='add'>+			((unsigned long)hba-&gt;iop + val);</div><div class='add'>+</div><div class='add'>+	writel(HPT_CTL_CODE_LINUX_TO_IOP(arg-&gt;ioctl_code),</div><div class='add'>+			&amp;req-&gt;ioctl_code);</div><div class='add'>+	writel(arg-&gt;inbuf_size, &amp;req-&gt;inbuf_size);</div><div class='add'>+	writel(arg-&gt;outbuf_size, &amp;req-&gt;outbuf_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * use the buffer on the IOP local memory first, then copy it</div><div class='add'>+	 * back to host.</div><div class='add'>+	 * the caller's request buffer shoudl be little-endian.</div><div class='add'>+	 */</div><div class='add'>+	if (arg-&gt;inbuf_size)</div><div class='add'>+		memcpy_toio(req-&gt;buf, arg-&gt;inbuf, arg-&gt;inbuf_size);</div><div class='add'>+</div><div class='add'>+	/* correct the controller ID for IOP */</div><div class='add'>+	if ((arg-&gt;ioctl_code == HPT_IOCTL_GET_CHANNEL_INFO ||</div><div class='add'>+		arg-&gt;ioctl_code == HPT_IOCTL_GET_CONTROLLER_INFO_V2 ||</div><div class='add'>+		arg-&gt;ioctl_code == HPT_IOCTL_GET_CONTROLLER_INFO)</div><div class='add'>+		&amp;&amp; arg-&gt;inbuf_size &gt;= sizeof(u32))</div><div class='add'>+		writel(0, req-&gt;buf);</div><div class='add'>+</div><div class='add'>+	writel(IOP_REQUEST_TYPE_IOCTL_COMMAND, &amp;req-&gt;header.type);</div><div class='add'>+	writel(0, &amp;req-&gt;header.flags);</div><div class='add'>+	writel(offsetof(struct hpt_iop_request_ioctl_command, buf)</div><div class='add'>+			+ arg-&gt;inbuf_size, &amp;req-&gt;header.size);</div><div class='add'>+	writel((u32)(unsigned long)arg, &amp;req-&gt;header.context);</div><div class='add'>+	writel(BITS_PER_LONG &gt; 32 ? (u32)((unsigned long)arg&gt;&gt;32) : 0,</div><div class='add'>+			&amp;req-&gt;header.context_hi32);</div><div class='add'>+	writel(IOP_RESULT_PENDING, &amp;req-&gt;header.result);</div><div class='add'>+</div><div class='add'>+	arg-&gt;result = HPT_IOCTL_RESULT_FAILED;</div><div class='add'>+	arg-&gt;done = hptiop_ioctl_done;</div><div class='add'>+</div><div class='add'>+	writel(val, &amp;hba-&gt;iop-&gt;inbound_queue);</div><div class='add'>+	hptiop_pci_posting_flush(hba-&gt;iop);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(hba-&gt;host-&gt;host_lock);</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(hba-&gt;ioctl_wq, arg-&gt;done == NULL, 60 * HZ);</div><div class='add'>+</div><div class='add'>+	if (arg-&gt;done != NULL) {</div><div class='add'>+		hptiop_reset_hba(hba);</div><div class='add'>+		if (ioctl_retry++ &lt; 3)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dprintk("hpt_iop_ioctl %x result %d\n",</div><div class='add'>+			arg-&gt;ioctl_code, arg-&gt;result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __hpt_do_ioctl(struct hptiop_hba *hba, u32 code, void *inbuf,</div><div class='add'>+			u32 insize, void *outbuf, u32 outsize)</div><div class='add'>+{</div><div class='add'>+	struct hpt_ioctl_k arg;</div><div class='add'>+	arg.hba = hba;</div><div class='add'>+	arg.ioctl_code = code;</div><div class='add'>+	arg.inbuf = inbuf;</div><div class='add'>+	arg.outbuf = outbuf;</div><div class='add'>+	arg.inbuf_size = insize;</div><div class='add'>+	arg.outbuf_size = outsize;</div><div class='add'>+	arg.bytes_returned = NULL;</div><div class='add'>+	hptiop_do_ioctl(&amp;arg);</div><div class='add'>+	return arg.result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int hpt_id_valid(__le32 id)</div><div class='add'>+{</div><div class='add'>+	return id != 0 &amp;&amp; id != cpu_to_le32(0xffffffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_get_controller_info(struct hptiop_hba *hba,</div><div class='add'>+					struct hpt_controller_info *pinfo)</div><div class='add'>+{</div><div class='add'>+	int id = 0;</div><div class='add'>+</div><div class='add'>+	return __hpt_do_ioctl(hba, HPT_IOCTL_GET_CONTROLLER_INFO,</div><div class='add'>+		&amp;id, sizeof(int), pinfo, sizeof(*pinfo));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int hptiop_get_channel_info(struct hptiop_hba *hba, int bus,</div><div class='add'>+					struct hpt_channel_info *pinfo)</div><div class='add'>+{</div><div class='add'>+	u32 ids[2];</div><div class='add'>+</div><div class='add'>+	ids[0] = 0;</div><div class='add'>+	ids[1] = bus;</div><div class='add'>+	return __hpt_do_ioctl(hba, HPT_IOCTL_GET_CHANNEL_INFO,</div><div class='add'>+				ids, sizeof(ids), pinfo, sizeof(*pinfo));</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_get_logical_devices(struct hptiop_hba *hba,</div><div class='add'>+					__le32 *pids, int maxcount)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 count = maxcount - 1;</div><div class='add'>+</div><div class='add'>+	if (__hpt_do_ioctl(hba, HPT_IOCTL_GET_LOGICAL_DEVICES,</div><div class='add'>+			&amp;count, sizeof(u32),</div><div class='add'>+			pids, sizeof(u32) * maxcount))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	maxcount = le32_to_cpu(pids[0]);</div><div class='add'>+	for (i = 0; i &lt; maxcount; i++)</div><div class='add'>+		pids[i] = pids[i+1];</div><div class='add'>+</div><div class='add'>+	return maxcount;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_get_device_info_v3(struct hptiop_hba *hba, __le32 id,</div><div class='add'>+				struct hpt_logical_device_info_v3 *pinfo)</div><div class='add'>+{</div><div class='add'>+	return __hpt_do_ioctl(hba, HPT_IOCTL_GET_DEVICE_INFO_V3,</div><div class='add'>+				&amp;id, sizeof(u32),</div><div class='add'>+				pinfo, sizeof(*pinfo));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *get_array_status(struct hpt_logical_device_info_v3 *devinfo)</div><div class='add'>+{</div><div class='add'>+	static char s[64];</div><div class='add'>+	u32 flags = le32_to_cpu(devinfo-&gt;u.array.flags);</div><div class='add'>+	u32 trans_prog = le32_to_cpu(devinfo-&gt;u.array.transforming_progress);</div><div class='add'>+	u32 reb_prog = le32_to_cpu(devinfo-&gt;u.array.rebuilding_progress);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ARRAY_FLAG_DISABLED)</div><div class='add'>+		return "Disabled";</div><div class='add'>+	else if (flags &amp; ARRAY_FLAG_TRANSFORMING)</div><div class='add'>+		sprintf(s, "Expanding/Migrating %d.%d%%%s%s",</div><div class='add'>+			trans_prog / 100,</div><div class='add'>+			trans_prog % 100,</div><div class='add'>+			(flags &amp; (ARRAY_FLAG_NEEDBUILDING|ARRAY_FLAG_BROKEN))?</div><div class='add'>+					", Critical" : "",</div><div class='add'>+			((flags &amp; ARRAY_FLAG_NEEDINITIALIZING) &amp;&amp;</div><div class='add'>+			 !(flags &amp; ARRAY_FLAG_REBUILDING) &amp;&amp;</div><div class='add'>+			 !(flags &amp; ARRAY_FLAG_INITIALIZING))?</div><div class='add'>+					", Unintialized" : "");</div><div class='add'>+	else if ((flags &amp; ARRAY_FLAG_BROKEN) &amp;&amp;</div><div class='add'>+				devinfo-&gt;u.array.array_type != AT_RAID6)</div><div class='add'>+		return "Critical";</div><div class='add'>+	else if (flags &amp; ARRAY_FLAG_REBUILDING)</div><div class='add'>+		sprintf(s,</div><div class='add'>+			(flags &amp; ARRAY_FLAG_NEEDINITIALIZING)?</div><div class='add'>+				"%sBackground initializing %d.%d%%" :</div><div class='add'>+					"%sRebuilding %d.%d%%",</div><div class='add'>+			(flags &amp; ARRAY_FLAG_BROKEN)? "Critical, " : "",</div><div class='add'>+			reb_prog / 100,</div><div class='add'>+			reb_prog % 100);</div><div class='add'>+	else if (flags &amp; ARRAY_FLAG_VERIFYING)</div><div class='add'>+		sprintf(s, "%sVerifying %d.%d%%",</div><div class='add'>+			(flags &amp; ARRAY_FLAG_BROKEN)? "Critical, " : "",</div><div class='add'>+			reb_prog / 100,</div><div class='add'>+			reb_prog % 100);</div><div class='add'>+	else if (flags &amp; ARRAY_FLAG_INITIALIZING)</div><div class='add'>+		sprintf(s, "%sForground initializing %d.%d%%",</div><div class='add'>+			(flags &amp; ARRAY_FLAG_BROKEN)? "Critical, " : "",</div><div class='add'>+			reb_prog / 100,</div><div class='add'>+			reb_prog % 100);</div><div class='add'>+	else if (flags &amp; ARRAY_FLAG_NEEDTRANSFORM)</div><div class='add'>+		sprintf(s,"%s%s%s", "Need Expanding/Migrating",</div><div class='add'>+			(flags &amp; ARRAY_FLAG_BROKEN)? "Critical, " : "",</div><div class='add'>+			((flags &amp; ARRAY_FLAG_NEEDINITIALIZING) &amp;&amp;</div><div class='add'>+			 !(flags &amp; ARRAY_FLAG_REBUILDING) &amp;&amp;</div><div class='add'>+			 !(flags &amp; ARRAY_FLAG_INITIALIZING))?</div><div class='add'>+				", Unintialized" : "");</div><div class='add'>+	else if (flags &amp; ARRAY_FLAG_NEEDINITIALIZING &amp;&amp;</div><div class='add'>+		!(flags &amp; ARRAY_FLAG_REBUILDING) &amp;&amp;</div><div class='add'>+		!(flags &amp; ARRAY_FLAG_INITIALIZING))</div><div class='add'>+		sprintf(s,"%sUninitialized",</div><div class='add'>+			(flags &amp; ARRAY_FLAG_BROKEN)? "Critical, " : "");</div><div class='add'>+	else if ((flags &amp; ARRAY_FLAG_NEEDBUILDING) ||</div><div class='add'>+			(flags &amp; ARRAY_FLAG_BROKEN))</div><div class='add'>+		return "Critical";</div><div class='add'>+	else</div><div class='add'>+		return "Normal";</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_dump_devinfo(struct hptiop_hba *hba,</div><div class='add'>+			struct hptiop_getinfo *pinfo, __le32 id, int indent)</div><div class='add'>+{</div><div class='add'>+	struct hpt_logical_device_info_v3 devinfo;</div><div class='add'>+	int i;</div><div class='add'>+	u64 capacity;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; indent; i++)</div><div class='add'>+		hptiop_copy_info(pinfo, "\t");</div><div class='add'>+</div><div class='add'>+	if (hptiop_get_device_info_v3(hba, id, &amp;devinfo)) {</div><div class='add'>+		hptiop_copy_info(pinfo, "unknown\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (devinfo.type) {</div><div class='add'>+</div><div class='add'>+	case LDT_DEVICE: {</div><div class='add'>+		struct hd_driveid *driveid;</div><div class='add'>+		u32 flags = le32_to_cpu(devinfo.u.device.flags);</div><div class='add'>+</div><div class='add'>+		driveid = (struct hd_driveid *)devinfo.u.device.ident;</div><div class='add'>+		/* model[] is 40 chars long, but we just want 20 chars here */</div><div class='add'>+		driveid-&gt;model[20] = 0;</div><div class='add'>+</div><div class='add'>+		if (indent)</div><div class='add'>+			if (flags &amp; DEVICE_FLAG_DISABLED)</div><div class='add'>+				hptiop_copy_info(pinfo,"Missing\n");</div><div class='add'>+			else</div><div class='add'>+				hptiop_copy_info(pinfo, "CH%d %s\n",</div><div class='add'>+					devinfo.u.device.path_id + 1,</div><div class='add'>+					driveid-&gt;model);</div><div class='add'>+		else {</div><div class='add'>+			capacity = le64_to_cpu(devinfo.capacity) * 512;</div><div class='add'>+			do_div(capacity, 1000000);</div><div class='add'>+			hptiop_copy_info(pinfo,</div><div class='add'>+				"CH%d %s, %lluMB, %s %s%s%s%s\n",</div><div class='add'>+				devinfo.u.device.path_id + 1,</div><div class='add'>+				driveid-&gt;model,</div><div class='add'>+				capacity,</div><div class='add'>+				(flags &amp; DEVICE_FLAG_DISABLED)?</div><div class='add'>+					"Disabled" : "Normal",</div><div class='add'>+				devinfo.u.device.read_ahead_enabled?</div><div class='add'>+						"[RA]" : "",</div><div class='add'>+				devinfo.u.device.write_cache_enabled?</div><div class='add'>+						"[WC]" : "",</div><div class='add'>+				devinfo.u.device.TCQ_enabled?</div><div class='add'>+						"[TCQ]" : "",</div><div class='add'>+				devinfo.u.device.NCQ_enabled?</div><div class='add'>+						"[NCQ]" : ""</div><div class='add'>+			);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	case LDT_ARRAY:</div><div class='add'>+		if (devinfo.target_id != INVALID_TARGET_ID)</div><div class='add'>+			hptiop_copy_info(pinfo, "[DISK %d_%d] ",</div><div class='add'>+					devinfo.vbus_id, devinfo.target_id);</div><div class='add'>+</div><div class='add'>+		capacity = le64_to_cpu(devinfo.capacity) * 512;</div><div class='add'>+		do_div(capacity, 1000000);</div><div class='add'>+		hptiop_copy_info(pinfo, "%s (%s), %lluMB, %s\n",</div><div class='add'>+			devinfo.u.array.name,</div><div class='add'>+			devinfo.u.array.array_type==AT_RAID0? "RAID0" :</div><div class='add'>+				devinfo.u.array.array_type==AT_RAID1? "RAID1" :</div><div class='add'>+				devinfo.u.array.array_type==AT_RAID5? "RAID5" :</div><div class='add'>+				devinfo.u.array.array_type==AT_RAID6? "RAID6" :</div><div class='add'>+				devinfo.u.array.array_type==AT_JBOD? "JBOD" :</div><div class='add'>+					"unknown",</div><div class='add'>+			capacity,</div><div class='add'>+			get_array_status(&amp;devinfo));</div><div class='add'>+		for (i = 0; i &lt; devinfo.u.array.ndisk; i++) {</div><div class='add'>+			if (hpt_id_valid(devinfo.u.array.members[i])) {</div><div class='add'>+				if (cpu_to_le16(1&lt;&lt;i) &amp;</div><div class='add'>+					devinfo.u.array.critical_members)</div><div class='add'>+					hptiop_copy_info(pinfo, "\t*");</div><div class='add'>+				hptiop_dump_devinfo(hba, pinfo,</div><div class='add'>+					devinfo.u.array.members[i], indent+1);</div><div class='add'>+			}</div><div class='add'>+			else</div><div class='add'>+				hptiop_copy_info(pinfo, "\tMissing\n");</div><div class='add'>+		}</div><div class='add'>+		if (id == devinfo.u.array.transform_source) {</div><div class='add'>+			hptiop_copy_info(pinfo, "\tExpanding/Migrating to:\n");</div><div class='add'>+			hptiop_dump_devinfo(hba, pinfo,</div><div class='add'>+				devinfo.u.array.transform_target, indent+1);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hptiop_show_version(struct class_device *class_dev, char *buf)</div><div class='add'>+{</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%s\n", driver_ver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hptiop_cdev_read(struct file *filp, char __user *buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct hptiop_hba *hba = filp-&gt;private_data;</div><div class='add'>+	struct hptiop_getinfo info;</div><div class='add'>+	int i, j, ndev;</div><div class='add'>+	struct hpt_controller_info con_info;</div><div class='add'>+	struct hpt_channel_info chan_info;</div><div class='add'>+	__le32 ids[32];</div><div class='add'>+</div><div class='add'>+	info.buffer     = buf;</div><div class='add'>+	info.buflength  = count;</div><div class='add'>+	info.bufoffset  = ppos ? *ppos : 0;</div><div class='add'>+	info.filpos     = 0;</div><div class='add'>+	info.buffillen  = 0;</div><div class='add'>+</div><div class='add'>+	if (hptiop_get_controller_info(hba, &amp;con_info))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; con_info.num_buses; i++) {</div><div class='add'>+		if (hptiop_get_channel_info(hba, i, &amp;chan_info) == 0) {</div><div class='add'>+			if (hpt_id_valid(chan_info.devices[0]))</div><div class='add'>+				hptiop_dump_devinfo(hba, &amp;info,</div><div class='add'>+						chan_info.devices[0], 0);</div><div class='add'>+			if (hpt_id_valid(chan_info.devices[1]))</div><div class='add'>+				hptiop_dump_devinfo(hba, &amp;info,</div><div class='add'>+						chan_info.devices[1], 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev = hptiop_get_logical_devices(hba, ids,</div><div class='add'>+					sizeof(ids) / sizeof(ids[0]));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if hptiop_get_logical_devices fails, ndev==-1 and it just</div><div class='add'>+	 * output nothing here</div><div class='add'>+	 */</div><div class='add'>+	for (j = 0; j &lt; ndev; j++)</div><div class='add'>+		hptiop_dump_devinfo(hba, &amp;info, ids[j], 0);</div><div class='add'>+</div><div class='add'>+	if (ppos)</div><div class='add'>+		*ppos += info.buffillen;</div><div class='add'>+</div><div class='add'>+	return info.buffillen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_cdev_ioctl(struct inode *inode,  struct file *file,</div><div class='add'>+					unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct hptiop_hba *hba = file-&gt;private_data;</div><div class='add'>+	struct hpt_ioctl_u ioctl_u;</div><div class='add'>+	struct hpt_ioctl_k ioctl_k;</div><div class='add'>+	u32 bytes_returned;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;ioctl_u,</div><div class='add'>+		(void __user *)arg, sizeof(struct hpt_ioctl_u)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ioctl_u.magic != HPT_IOCTL_MAGIC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ioctl_k.ioctl_code = ioctl_u.ioctl_code;</div><div class='add'>+	ioctl_k.inbuf = NULL;</div><div class='add'>+	ioctl_k.inbuf_size = ioctl_u.inbuf_size;</div><div class='add'>+	ioctl_k.outbuf = NULL;</div><div class='add'>+	ioctl_k.outbuf_size = ioctl_u.outbuf_size;</div><div class='add'>+	ioctl_k.hba = hba;</div><div class='add'>+	ioctl_k.bytes_returned = &amp;bytes_returned;</div><div class='add'>+</div><div class='add'>+	/* verify user buffer */</div><div class='add'>+	if ((ioctl_k.inbuf_size &amp;&amp; !access_ok(VERIFY_READ,</div><div class='add'>+			ioctl_u.inbuf, ioctl_k.inbuf_size)) ||</div><div class='add'>+		(ioctl_k.outbuf_size &amp;&amp; !access_ok(VERIFY_WRITE,</div><div class='add'>+			ioctl_u.outbuf, ioctl_k.outbuf_size)) ||</div><div class='add'>+		(ioctl_u.bytes_returned &amp;&amp; !access_ok(VERIFY_WRITE,</div><div class='add'>+			ioctl_u.bytes_returned, sizeof(u32))) ||</div><div class='add'>+		ioctl_k.inbuf_size + ioctl_k.outbuf_size &gt; 0x10000) {</div><div class='add'>+</div><div class='add'>+		dprintk("scsi%d: got bad user address\n", hba-&gt;host-&gt;host_no);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* map buffer to kernel. */</div><div class='add'>+	if (ioctl_k.inbuf_size) {</div><div class='add'>+		ioctl_k.inbuf = kmalloc(ioctl_k.inbuf_size, GFP_KERNEL);</div><div class='add'>+		if (!ioctl_k.inbuf) {</div><div class='add'>+			dprintk("scsi%d: fail to alloc inbuf\n",</div><div class='add'>+					hba-&gt;host-&gt;host_no);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copy_from_user(ioctl_k.inbuf,</div><div class='add'>+				ioctl_u.inbuf, ioctl_k.inbuf_size)) {</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ioctl_k.outbuf_size) {</div><div class='add'>+		ioctl_k.outbuf = kmalloc(ioctl_k.outbuf_size, GFP_KERNEL);</div><div class='add'>+		if (!ioctl_k.outbuf) {</div><div class='add'>+			dprintk("scsi%d: fail to alloc outbuf\n",</div><div class='add'>+					hba-&gt;host-&gt;host_no);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hptiop_do_ioctl(&amp;ioctl_k);</div><div class='add'>+</div><div class='add'>+	if (ioctl_k.result == HPT_IOCTL_RESULT_OK) {</div><div class='add'>+		if (ioctl_k.outbuf_size &amp;&amp;</div><div class='add'>+			copy_to_user(ioctl_u.outbuf,</div><div class='add'>+				ioctl_k.outbuf, ioctl_k.outbuf_size))</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		if (ioctl_u.bytes_returned &amp;&amp;</div><div class='add'>+			copy_to_user(ioctl_u.bytes_returned,</div><div class='add'>+				&amp;bytes_returned, sizeof(u32)))</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	kfree(ioctl_k.inbuf);</div><div class='add'>+	kfree(ioctl_k.outbuf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hptiop_cdev_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct hptiop_hba *hba;</div><div class='add'>+	unsigned i = 0, minor = iminor(inode);</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hptiop_hba_list_lock);</div><div class='add'>+	list_for_each_entry(hba, &amp;hptiop_hba_list, link) {</div><div class='add'>+		if (i == minor) {</div><div class='add'>+			file-&gt;private_data = hba;</div><div class='add'>+			ret = 0;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;hptiop_hba_list_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations hptiop_cdev_fops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.read  = hptiop_cdev_read,</div><div class='add'>+	.ioctl = hptiop_cdev_ioctl,</div><div class='add'>+	.open  = hptiop_cdev_open,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t hptiop_show_fw_version(struct class_device *class_dev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = class_to_shost(class_dev);</div><div class='add'>+	struct hptiop_hba *hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d.%d.%d.%d\n",</div><div class='add'>+				hba-&gt;firmware_version &gt;&gt; 24,</div><div class='add'>+				(hba-&gt;firmware_version &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+				(hba-&gt;firmware_version &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+				hba-&gt;firmware_version &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct class_device_attribute hptiop_attr_version = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "driver-version",</div><div class='add'>+		.mode = S_IRUGO,</div><div class='add'>+	},</div><div class='add'>+	.show = hptiop_show_version,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct class_device_attribute hptiop_attr_fw_version = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "firmware-version",</div><div class='add'>+		.mode = S_IRUGO,</div><div class='add'>+	},</div><div class='add'>+	.show = hptiop_show_fw_version,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct class_device_attribute *hptiop_attrs[] = {</div><div class='add'>+	&amp;hptiop_attr_version,</div><div class='add'>+	&amp;hptiop_attr_fw_version,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct scsi_host_template driver_template = {</div><div class='add'>+	.module                     = THIS_MODULE,</div><div class='add'>+	.name                       = driver_name,</div><div class='add'>+	.queuecommand               = hptiop_queuecommand,</div><div class='add'>+	.eh_device_reset_handler    = hptiop_reset,</div><div class='add'>+	.eh_bus_reset_handler       = hptiop_reset,</div><div class='add'>+	.info                       = hptiop_info,</div><div class='add'>+	.unchecked_isa_dma          = 0,</div><div class='add'>+	.emulated                   = 0,</div><div class='add'>+	.use_clustering             = ENABLE_CLUSTERING,</div><div class='add'>+	.proc_name                  = driver_name,</div><div class='add'>+	.shost_attrs                = hptiop_attrs,</div><div class='add'>+	.this_id                    = -1,</div><div class='add'>+	.change_queue_depth         = hptiop_adjust_disk_queue_depth,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __devinit hptiop_probe(struct pci_dev *pcidev,</div><div class='add'>+					const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = NULL;</div><div class='add'>+	struct hptiop_hba *hba;</div><div class='add'>+	struct hpt_iop_request_get_config iop_config;</div><div class='add'>+	struct hpt_iop_request_set_config set_config;</div><div class='add'>+	dma_addr_t start_phy;</div><div class='add'>+	void *start_virt;</div><div class='add'>+	u32 offset, i, req_size;</div><div class='add'>+</div><div class='add'>+	dprintk("hptiop_probe(%p)\n", pcidev);</div><div class='add'>+</div><div class='add'>+	if (pci_enable_device(pcidev)) {</div><div class='add'>+		printk(KERN_ERR "hptiop: fail to enable pci device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "adapter at PCI %d:%d:%d, IRQ %d\n",</div><div class='add'>+		pcidev-&gt;bus-&gt;number, pcidev-&gt;devfn &gt;&gt; 3, pcidev-&gt;devfn &amp; 7,</div><div class='add'>+		pcidev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	pci_set_master(pcidev);</div><div class='add'>+</div><div class='add'>+	/* Enable 64bit DMA if possible */</div><div class='add'>+	if (pci_set_dma_mask(pcidev, DMA_64BIT_MASK)) {</div><div class='add'>+		if (pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {</div><div class='add'>+			printk(KERN_ERR "hptiop: fail to set dma_mask\n");</div><div class='add'>+			goto disable_pci_device;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pci_request_regions(pcidev, driver_name)) {</div><div class='add'>+		printk(KERN_ERR "hptiop: pci_request_regions failed\n");</div><div class='add'>+		goto disable_pci_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	host = scsi_host_alloc(&amp;driver_template, sizeof(struct hptiop_hba));</div><div class='add'>+	if (!host) {</div><div class='add'>+		printk(KERN_ERR "hptiop: fail to alloc scsi host\n");</div><div class='add'>+		goto free_pci_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	hba-&gt;pcidev = pcidev;</div><div class='add'>+	hba-&gt;host = host;</div><div class='add'>+	hba-&gt;initialized = 0;</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;hba-&gt;resetting, 0);</div><div class='add'>+	atomic_set(&amp;hba-&gt;reset_count, 0);</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;hba-&gt;reset_wq);</div><div class='add'>+	init_waitqueue_head(&amp;hba-&gt;ioctl_wq);</div><div class='add'>+</div><div class='add'>+	host-&gt;max_lun = 1;</div><div class='add'>+	host-&gt;max_channel = 0;</div><div class='add'>+	host-&gt;io_port = 0;</div><div class='add'>+	host-&gt;n_io_port = 0;</div><div class='add'>+	host-&gt;irq = pcidev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	if (hptiop_map_pci_bar(hba))</div><div class='add'>+		goto free_scsi_host;</div><div class='add'>+</div><div class='add'>+	if (iop_wait_ready(hba-&gt;iop, 20000)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: firmware not ready\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no);</div><div class='add'>+		goto unmap_pci_bar;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iop_get_config(hba, &amp;iop_config)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: get config failed\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no);</div><div class='add'>+		goto unmap_pci_bar;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hba-&gt;max_requests = min(le32_to_cpu(iop_config.max_requests),</div><div class='add'>+				HPTIOP_MAX_REQUESTS);</div><div class='add'>+	hba-&gt;max_devices = le32_to_cpu(iop_config.max_devices);</div><div class='add'>+	hba-&gt;max_request_size = le32_to_cpu(iop_config.request_size);</div><div class='add'>+	hba-&gt;max_sg_descriptors = le32_to_cpu(iop_config.max_sg_count);</div><div class='add'>+	hba-&gt;firmware_version = le32_to_cpu(iop_config.firmware_version);</div><div class='add'>+	hba-&gt;sdram_size = le32_to_cpu(iop_config.sdram_size);</div><div class='add'>+</div><div class='add'>+	host-&gt;max_sectors = le32_to_cpu(iop_config.data_transfer_length) &gt;&gt; 9;</div><div class='add'>+	host-&gt;max_id = le32_to_cpu(iop_config.max_devices);</div><div class='add'>+	host-&gt;sg_tablesize = le32_to_cpu(iop_config.max_sg_count);</div><div class='add'>+	host-&gt;can_queue = le32_to_cpu(iop_config.max_requests);</div><div class='add'>+	host-&gt;cmd_per_lun = le32_to_cpu(iop_config.max_requests);</div><div class='add'>+	host-&gt;max_cmd_len = 16;</div><div class='add'>+</div><div class='add'>+	set_config.vbus_id = cpu_to_le32(host-&gt;host_no);</div><div class='add'>+	set_config.iop_id = cpu_to_le32(host-&gt;host_no);</div><div class='add'>+</div><div class='add'>+	if (iop_set_config(hba, &amp;set_config)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: set config failed\n",</div><div class='add'>+				hba-&gt;host-&gt;host_no);</div><div class='add'>+		goto unmap_pci_bar;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scsi_add_host(host, &amp;pcidev-&gt;dev)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: scsi_add_host failed\n",</div><div class='add'>+					hba-&gt;host-&gt;host_no);</div><div class='add'>+		goto unmap_pci_bar;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pcidev, host);</div><div class='add'>+</div><div class='add'>+	if (request_irq(pcidev-&gt;irq, hptiop_intr, IRQF_SHARED,</div><div class='add'>+					driver_name, hba)) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: request irq %d failed\n",</div><div class='add'>+					hba-&gt;host-&gt;host_no, pcidev-&gt;irq);</div><div class='add'>+		goto remove_scsi_host;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate request mem */</div><div class='add'>+	req_size = sizeof(struct hpt_iop_request_scsi_command)</div><div class='add'>+		+ sizeof(struct hpt_iopsg) * (hba-&gt;max_sg_descriptors - 1);</div><div class='add'>+	if ((req_size&amp; 0x1f) != 0)</div><div class='add'>+		req_size = (req_size + 0x1f) &amp; ~0x1f;</div><div class='add'>+</div><div class='add'>+	dprintk("req_size=%d, max_requests=%d\n", req_size, hba-&gt;max_requests);</div><div class='add'>+</div><div class='add'>+	hba-&gt;req_size = req_size;</div><div class='add'>+	start_virt = dma_alloc_coherent(&amp;pcidev-&gt;dev,</div><div class='add'>+				hba-&gt;req_size*hba-&gt;max_requests + 0x20,</div><div class='add'>+				&amp;start_phy, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!start_virt) {</div><div class='add'>+		printk(KERN_ERR "scsi%d: fail to alloc request mem\n",</div><div class='add'>+					hba-&gt;host-&gt;host_no);</div><div class='add'>+		goto free_request_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hba-&gt;dma_coherent = start_virt;</div><div class='add'>+	hba-&gt;dma_coherent_handle = start_phy;</div><div class='add'>+</div><div class='add'>+	if ((start_phy &amp; 0x1f) != 0)</div><div class='add'>+	{</div><div class='add'>+		offset = ((start_phy + 0x1f) &amp; ~0x1f) - start_phy;</div><div class='add'>+		start_phy += offset;</div><div class='add'>+		start_virt += offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hba-&gt;req_list = start_virt;</div><div class='add'>+	for (i = 0; i &lt; hba-&gt;max_requests; i++) {</div><div class='add'>+		hba-&gt;reqs[i].next = NULL;</div><div class='add'>+		hba-&gt;reqs[i].req_virt = start_virt;</div><div class='add'>+		hba-&gt;reqs[i].req_shifted_phy = start_phy &gt;&gt; 5;</div><div class='add'>+		hba-&gt;reqs[i].index = i;</div><div class='add'>+		free_req(hba, &amp;hba-&gt;reqs[i]);</div><div class='add'>+		start_virt = (char *)start_virt + hba-&gt;req_size;</div><div class='add'>+		start_phy = start_phy + hba-&gt;req_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable Interrupt and start background task */</div><div class='add'>+	if (hptiop_initialize_iop(hba))</div><div class='add'>+		goto free_request_mem;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hptiop_hba_list_lock);</div><div class='add'>+	list_add_tail(&amp;hba-&gt;link, &amp;hptiop_hba_list);</div><div class='add'>+	spin_unlock(&amp;hptiop_hba_list_lock);</div><div class='add'>+</div><div class='add'>+	scsi_scan_host(host);</div><div class='add'>+</div><div class='add'>+	dprintk("scsi%d: hptiop_probe successfully\n", hba-&gt;host-&gt;host_no);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_request_mem:</div><div class='add'>+	dma_free_coherent(&amp;hba-&gt;pcidev-&gt;dev,</div><div class='add'>+			hba-&gt;req_size*hba-&gt;max_requests + 0x20,</div><div class='add'>+			hba-&gt;dma_coherent, hba-&gt;dma_coherent_handle);</div><div class='add'>+</div><div class='add'>+free_request_irq:</div><div class='add'>+	free_irq(hba-&gt;pcidev-&gt;irq, hba);</div><div class='add'>+</div><div class='add'>+remove_scsi_host:</div><div class='add'>+	scsi_remove_host(host);</div><div class='add'>+</div><div class='add'>+unmap_pci_bar:</div><div class='add'>+	iounmap(hba-&gt;iop);</div><div class='add'>+</div><div class='add'>+free_pci_regions:</div><div class='add'>+	pci_release_regions(pcidev) ;</div><div class='add'>+</div><div class='add'>+free_scsi_host:</div><div class='add'>+	scsi_host_put(host);</div><div class='add'>+</div><div class='add'>+disable_pci_device:</div><div class='add'>+	pci_disable_device(pcidev);</div><div class='add'>+</div><div class='add'>+	dprintk("scsi%d: hptiop_probe fail\n", host-&gt;host_no);</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_shutdown(struct pci_dev *pcidev)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = pci_get_drvdata(pcidev);</div><div class='add'>+	struct hptiop_hba *hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+	struct hpt_iopmu __iomem *iop = hba-&gt;iop;</div><div class='add'>+	u32    int_mask;</div><div class='add'>+</div><div class='add'>+	dprintk("hptiop_shutdown(%p)\n", hba);</div><div class='add'>+</div><div class='add'>+	/* stop the iop */</div><div class='add'>+	if (iop_send_sync_msg(hba, IOPMU_INBOUND_MSG0_SHUTDOWN, 60000))</div><div class='add'>+		printk(KERN_ERR "scsi%d: shutdown the iop timeout\n",</div><div class='add'>+					hba-&gt;host-&gt;host_no);</div><div class='add'>+</div><div class='add'>+	/* disable all outbound interrupts */</div><div class='add'>+	int_mask = readl(&amp;iop-&gt;outbound_intmask);</div><div class='add'>+	writel(int_mask |</div><div class='add'>+		IOPMU_OUTBOUND_INT_MSG0 | IOPMU_OUTBOUND_INT_POSTQUEUE,</div><div class='add'>+		&amp;iop-&gt;outbound_intmask);</div><div class='add'>+	hptiop_pci_posting_flush(iop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hptiop_remove(struct pci_dev *pcidev)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = pci_get_drvdata(pcidev);</div><div class='add'>+	struct hptiop_hba *hba = (struct hptiop_hba *)host-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	dprintk("scsi%d: hptiop_remove\n", hba-&gt;host-&gt;host_no);</div><div class='add'>+</div><div class='add'>+	scsi_remove_host(host);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;hptiop_hba_list_lock);</div><div class='add'>+	list_del_init(&amp;hba-&gt;link);</div><div class='add'>+	spin_unlock(&amp;hptiop_hba_list_lock);</div><div class='add'>+</div><div class='add'>+	hptiop_shutdown(pcidev);</div><div class='add'>+</div><div class='add'>+	free_irq(hba-&gt;pcidev-&gt;irq, hba);</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;hba-&gt;pcidev-&gt;dev,</div><div class='add'>+			hba-&gt;req_size * hba-&gt;max_requests + 0x20,</div><div class='add'>+			hba-&gt;dma_coherent,</div><div class='add'>+			hba-&gt;dma_coherent_handle);</div><div class='add'>+</div><div class='add'>+	iounmap(hba-&gt;iop);</div><div class='add'>+</div><div class='add'>+	pci_release_regions(hba-&gt;pcidev);</div><div class='add'>+	pci_set_drvdata(hba-&gt;pcidev, NULL);</div><div class='add'>+	pci_disable_device(hba-&gt;pcidev);</div><div class='add'>+</div><div class='add'>+	scsi_host_put(host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_device_id hptiop_id_table[] = {</div><div class='add'>+	{ PCI_DEVICE(0x1103, 0x3220) },</div><div class='add'>+	{ PCI_DEVICE(0x1103, 0x3320) },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, hptiop_id_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver hptiop_pci_driver = {</div><div class='add'>+	.name       = driver_name,</div><div class='add'>+	.id_table   = hptiop_id_table,</div><div class='add'>+	.probe      = hptiop_probe,</div><div class='add'>+	.remove     = hptiop_remove,</div><div class='add'>+	.shutdown   = hptiop_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init hptiop_module_init(void)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "%s %s\n", driver_name_long, driver_ver);</div><div class='add'>+</div><div class='add'>+	error = pci_register_driver(&amp;hptiop_pci_driver);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	hptiop_cdev_major = register_chrdev(0, "hptiop", &amp;hptiop_cdev_fops);</div><div class='add'>+	if (hptiop_cdev_major &lt; 0) {</div><div class='add'>+		printk(KERN_WARNING "unable to register hptiop device.\n");</div><div class='add'>+		return hptiop_cdev_major;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit hptiop_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	dprintk("hptiop_module_exit\n");</div><div class='add'>+	unregister_chrdev(hptiop_cdev_major, "hptiop");</div><div class='add'>+	pci_unregister_driver(&amp;hptiop_pci_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+module_init(hptiop_module_init);</div><div class='add'>+module_exit(hptiop_module_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/scsi/hptiop.h b/drivers/scsi/hptiop.h<br/>new file mode 100644<br/>index 000000000000..f04f7e81d1ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/hptiop.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/hptiop.h</a></div><div class='hunk'>@@ -0,0 +1,465 @@</div><div class='add'>+/*</div><div class='add'>+ * HighPoint RR3xxx controller driver for Linux</div><div class='add'>+ * Copyright (C) 2006 HighPoint Technologies, Inc. All Rights Reserved.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; version 2 of the License.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * Please report bugs/comments/suggestions to linux@highpoint-tech.com</div><div class='add'>+ *</div><div class='add'>+ * For more information, visit http://www.highpoint-tech.com</div><div class='add'>+ */</div><div class='add'>+#ifndef _HPTIOP_H_</div><div class='add'>+#define _HPTIOP_H_</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * logical device type.</div><div class='add'>+ * Identify array (logical device) and physical device.</div><div class='add'>+ */</div><div class='add'>+#define LDT_ARRAY   1</div><div class='add'>+#define LDT_DEVICE  2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Array types</div><div class='add'>+ */</div><div class='add'>+#define AT_UNKNOWN  0</div><div class='add'>+#define AT_RAID0    1</div><div class='add'>+#define AT_RAID1    2</div><div class='add'>+#define AT_RAID5    3</div><div class='add'>+#define AT_RAID6    4</div><div class='add'>+#define AT_JBOD     7</div><div class='add'>+</div><div class='add'>+#define MAX_NAME_LENGTH     36</div><div class='add'>+#define MAX_ARRAYNAME_LEN   16</div><div class='add'>+</div><div class='add'>+#define MAX_ARRAY_MEMBERS_V1 8</div><div class='add'>+#define MAX_ARRAY_MEMBERS_V2 16</div><div class='add'>+</div><div class='add'>+/* keep definition for source code compatiblity */</div><div class='add'>+#define MAX_ARRAY_MEMBERS MAX_ARRAY_MEMBERS_V1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * array flags</div><div class='add'>+ */</div><div class='add'>+#define ARRAY_FLAG_DISABLED         0x00000001 /* The array is disabled */</div><div class='add'>+#define ARRAY_FLAG_NEEDBUILDING     0x00000002 /* need to be rebuilt */</div><div class='add'>+#define ARRAY_FLAG_REBUILDING       0x00000004 /* in rebuilding process */</div><div class='add'>+#define ARRAY_FLAG_BROKEN           0x00000008 /* broken but still working */</div><div class='add'>+#define ARRAY_FLAG_BOOTDISK         0x00000010 /* has a active partition */</div><div class='add'>+#define ARRAY_FLAG_BOOTMARK         0x00000040 /* array has boot mark set */</div><div class='add'>+#define ARRAY_FLAG_NEED_AUTOREBUILD 0x00000080 /* auto-rebuild should start */</div><div class='add'>+#define ARRAY_FLAG_VERIFYING        0x00000100 /* is being verified */</div><div class='add'>+#define ARRAY_FLAG_INITIALIZING     0x00000200 /* is being initialized */</div><div class='add'>+#define ARRAY_FLAG_TRANSFORMING     0x00000400 /* tranform in progress */</div><div class='add'>+#define ARRAY_FLAG_NEEDTRANSFORM    0x00000800 /* array need tranform */</div><div class='add'>+#define ARRAY_FLAG_NEEDINITIALIZING 0x00001000 /* initialization not done */</div><div class='add'>+#define ARRAY_FLAG_BROKEN_REDUNDANT 0x00002000 /* broken but redundant */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * device flags</div><div class='add'>+ */</div><div class='add'>+#define DEVICE_FLAG_DISABLED        0x00000001 /* device is disabled */</div><div class='add'>+#define DEVICE_FLAG_UNINITIALIZED   0x00010000 /* device is not initialized */</div><div class='add'>+#define DEVICE_FLAG_LEGACY          0x00020000 /* lagacy drive */</div><div class='add'>+#define DEVICE_FLAG_IS_SPARE        0x80000000 /* is a spare disk */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ioctl codes</div><div class='add'>+ */</div><div class='add'>+#define HPT_CTL_CODE(x) (x+0xFF00)</div><div class='add'>+#define HPT_CTL_CODE_LINUX_TO_IOP(x) ((x)-0xff00)</div><div class='add'>+</div><div class='add'>+#define HPT_IOCTL_GET_CONTROLLER_INFO       HPT_CTL_CODE(2)</div><div class='add'>+#define HPT_IOCTL_GET_CHANNEL_INFO          HPT_CTL_CODE(3)</div><div class='add'>+#define HPT_IOCTL_GET_LOGICAL_DEVICES       HPT_CTL_CODE(4)</div><div class='add'>+#define HPT_IOCTL_GET_DRIVER_CAPABILITIES   HPT_CTL_CODE(19)</div><div class='add'>+#define HPT_IOCTL_GET_DEVICE_INFO_V3        HPT_CTL_CODE(46)</div><div class='add'>+#define HPT_IOCTL_GET_CONTROLLER_INFO_V2    HPT_CTL_CODE(47)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Controller information.</div><div class='add'>+ */</div><div class='add'>+struct hpt_controller_info {</div><div class='add'>+	u8      chip_type;                    /* chip type */</div><div class='add'>+	u8      interrupt_level;              /* IRQ level */</div><div class='add'>+	u8      num_buses;                    /* bus count */</div><div class='add'>+	u8      chip_flags;</div><div class='add'>+</div><div class='add'>+	u8      product_id[MAX_NAME_LENGTH];/* product name */</div><div class='add'>+	u8      vendor_id[MAX_NAME_LENGTH]; /* vendor name */</div><div class='add'>+}</div><div class='add'>+__attribute__((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Channel information.</div><div class='add'>+ */</div><div class='add'>+struct hpt_channel_info {</div><div class='add'>+	__le32  io_port;         /* IDE Base Port Address */</div><div class='add'>+	__le32  control_port;    /* IDE Control Port Address */</div><div class='add'>+	__le32  devices[2];      /* device connected to this channel */</div><div class='add'>+}</div><div class='add'>+__attribute__((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Array information.</div><div class='add'>+ */</div><div class='add'>+struct hpt_array_info_v3 {</div><div class='add'>+	u8      name[MAX_ARRAYNAME_LEN]; /* array name */</div><div class='add'>+	u8      description[64];         /* array description */</div><div class='add'>+	u8      create_manager[16];      /* who created it */</div><div class='add'>+	__le32  create_time;             /* when created it */</div><div class='add'>+</div><div class='add'>+	u8      array_type;              /* array type */</div><div class='add'>+	u8      block_size_shift;        /* stripe size */</div><div class='add'>+	u8      ndisk;                   /* Number of ID in Members[] */</div><div class='add'>+	u8      reserved;</div><div class='add'>+</div><div class='add'>+	__le32  flags;                   /* working flags, see ARRAY_FLAG_XXX */</div><div class='add'>+	__le32  members[MAX_ARRAY_MEMBERS_V2];  /* member array/disks */</div><div class='add'>+</div><div class='add'>+	__le32  rebuilding_progress;</div><div class='add'>+	__le64  rebuilt_sectors; /* rebuilding point (LBA) for single member */</div><div class='add'>+</div><div class='add'>+	__le32  transform_source;</div><div class='add'>+	__le32  transform_target;    /* destination device ID */</div><div class='add'>+	__le32  transforming_progress;</div><div class='add'>+	__le32  signature;              /* persistent identification*/</div><div class='add'>+	__le16  critical_members;       /* bit mask of critical members */</div><div class='add'>+	__le16  reserve2;</div><div class='add'>+	__le32  reserve;</div><div class='add'>+}</div><div class='add'>+__attribute__((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * physical device information.</div><div class='add'>+ */</div><div class='add'>+#define MAX_PARENTS_PER_DISK    8</div><div class='add'>+</div><div class='add'>+struct hpt_device_info_v2 {</div><div class='add'>+	u8   ctlr_id;             /* controller id */</div><div class='add'>+	u8   path_id;             /* bus */</div><div class='add'>+	u8   target_id;           /* id */</div><div class='add'>+	u8   device_mode_setting; /* Current Data Transfer mode: 0-4 PIO0-4 */</div><div class='add'>+				  /* 5-7 MW DMA0-2, 8-13 UDMA0-5 */</div><div class='add'>+	u8   device_type;         /* device type */</div><div class='add'>+	u8   usable_mode;         /* highest usable mode */</div><div class='add'>+</div><div class='add'>+#ifdef __BIG_ENDIAN_BITFIELD</div><div class='add'>+	u8   NCQ_enabled: 1;</div><div class='add'>+	u8   NCQ_supported: 1;</div><div class='add'>+	u8   TCQ_enabled: 1;</div><div class='add'>+	u8   TCQ_supported: 1;</div><div class='add'>+	u8   write_cache_enabled: 1;</div><div class='add'>+	u8   write_cache_supported: 1;</div><div class='add'>+	u8   read_ahead_enabled: 1;</div><div class='add'>+	u8   read_ahead_supported: 1;</div><div class='add'>+	u8   reserved6: 6;</div><div class='add'>+	u8   spin_up_mode: 2;</div><div class='add'>+#else</div><div class='add'>+	u8   read_ahead_supported: 1;</div><div class='add'>+	u8   read_ahead_enabled: 1;</div><div class='add'>+	u8   write_cache_supported: 1;</div><div class='add'>+	u8   write_cache_enabled: 1;</div><div class='add'>+	u8   TCQ_supported: 1;</div><div class='add'>+	u8   TCQ_enabled: 1;</div><div class='add'>+	u8   NCQ_supported: 1;</div><div class='add'>+	u8   NCQ_enabled: 1;</div><div class='add'>+	u8   spin_up_mode: 2;</div><div class='add'>+	u8   reserved6: 6;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	__le32  flags;         /* working flags, see DEVICE_FLAG_XXX */</div><div class='add'>+	u8      ident[150];    /* (partitial) Identify Data of this device */</div><div class='add'>+</div><div class='add'>+	__le64  total_free;</div><div class='add'>+	__le64  max_free;</div><div class='add'>+	__le64  bad_sectors;</div><div class='add'>+	__le32  parent_arrays[MAX_PARENTS_PER_DISK];</div><div class='add'>+}</div><div class='add'>+__attribute__((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Logical device information.</div><div class='add'>+ */</div><div class='add'>+#define INVALID_TARGET_ID   0xFF</div><div class='add'>+#define INVALID_BUS_ID      0xFF</div><div class='add'>+</div><div class='add'>+struct hpt_logical_device_info_v3 {</div><div class='add'>+	u8       type;                   /* LDT_ARRAY or LDT_DEVICE */</div><div class='add'>+	u8       cache_policy;           /* refer to CACHE_POLICY_xxx */</div><div class='add'>+	u8       vbus_id;                /* vbus sequence in vbus_list */</div><div class='add'>+	u8       target_id;              /* OS target id. 0xFF is invalid */</div><div class='add'>+					 /* OS name: DISK $VBusId_$TargetId */</div><div class='add'>+	__le64   capacity;               /* array capacity */</div><div class='add'>+	__le32   parent_array;           /* don't use this field for physical</div><div class='add'>+					    device. use ParentArrays field in</div><div class='add'>+					    hpt_device_info_v2 */</div><div class='add'>+	/* reserved statistic fields */</div><div class='add'>+	__le32   stat1;</div><div class='add'>+	__le32   stat2;</div><div class='add'>+	__le32   stat3;</div><div class='add'>+	__le32   stat4;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct hpt_array_info_v3 array;</div><div class='add'>+		struct hpt_device_info_v2 device;</div><div class='add'>+	} __attribute__((packed)) u;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+__attribute__((packed));</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ioctl structure</div><div class='add'>+ */</div><div class='add'>+#define HPT_IOCTL_MAGIC   0xA1B2C3D4</div><div class='add'>+</div><div class='add'>+struct hpt_ioctl_u {</div><div class='add'>+	u32   magic;            /* used to check if it's a valid ioctl packet */</div><div class='add'>+	u32   ioctl_code;       /* operation control code */</div><div class='add'>+	void __user *inbuf;     /* input data buffer */</div><div class='add'>+	u32   inbuf_size;       /* size of input data buffer */</div><div class='add'>+	void __user *outbuf;    /* output data buffer */</div><div class='add'>+	u32   outbuf_size;      /* size of output data buffer */</div><div class='add'>+	void __user *bytes_returned;   /* count of bytes returned */</div><div class='add'>+}</div><div class='add'>+__attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct hpt_iopmu</div><div class='add'>+{</div><div class='add'>+	__le32 resrved0[4];</div><div class='add'>+	__le32 inbound_msgaddr0;</div><div class='add'>+	__le32 inbound_msgaddr1;</div><div class='add'>+	__le32 outbound_msgaddr0;</div><div class='add'>+	__le32 outbound_msgaddr1;</div><div class='add'>+	__le32 inbound_doorbell;</div><div class='add'>+	__le32 inbound_intstatus;</div><div class='add'>+	__le32 inbound_intmask;</div><div class='add'>+	__le32 outbound_doorbell;</div><div class='add'>+	__le32 outbound_intstatus;</div><div class='add'>+	__le32 outbound_intmask;</div><div class='add'>+	__le32 reserved1[2];</div><div class='add'>+	__le32 inbound_queue;</div><div class='add'>+	__le32 outbound_queue;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IOPMU_QUEUE_EMPTY            0xffffffff</div><div class='add'>+#define IOPMU_QUEUE_MASK_HOST_BITS   0xf0000000</div><div class='add'>+#define IOPMU_QUEUE_ADDR_HOST_BIT    0x80000000</div><div class='add'>+</div><div class='add'>+#define IOPMU_OUTBOUND_INT_MSG0      1</div><div class='add'>+#define IOPMU_OUTBOUND_INT_MSG1      2</div><div class='add'>+#define IOPMU_OUTBOUND_INT_DOORBELL  4</div><div class='add'>+#define IOPMU_OUTBOUND_INT_POSTQUEUE 8</div><div class='add'>+#define IOPMU_OUTBOUND_INT_PCI       0x10</div><div class='add'>+</div><div class='add'>+#define IOPMU_INBOUND_INT_MSG0       1</div><div class='add'>+#define IOPMU_INBOUND_INT_MSG1       2</div><div class='add'>+#define IOPMU_INBOUND_INT_DOORBELL   4</div><div class='add'>+#define IOPMU_INBOUND_INT_ERROR      8</div><div class='add'>+#define IOPMU_INBOUND_INT_POSTQUEUE  0x10</div><div class='add'>+</div><div class='add'>+enum hpt_iopmu_message {</div><div class='add'>+	/* host-to-iop messages */</div><div class='add'>+	IOPMU_INBOUND_MSG0_NOP = 0,</div><div class='add'>+	IOPMU_INBOUND_MSG0_RESET,</div><div class='add'>+	IOPMU_INBOUND_MSG0_FLUSH,</div><div class='add'>+	IOPMU_INBOUND_MSG0_SHUTDOWN,</div><div class='add'>+	IOPMU_INBOUND_MSG0_STOP_BACKGROUND_TASK,</div><div class='add'>+	IOPMU_INBOUND_MSG0_START_BACKGROUND_TASK,</div><div class='add'>+	IOPMU_INBOUND_MSG0_MAX = 0xff,</div><div class='add'>+	/* iop-to-host messages */</div><div class='add'>+	IOPMU_OUTBOUND_MSG0_REGISTER_DEVICE_0 = 0x100,</div><div class='add'>+	IOPMU_OUTBOUND_MSG0_REGISTER_DEVICE_MAX = 0x1ff,</div><div class='add'>+	IOPMU_OUTBOUND_MSG0_UNREGISTER_DEVICE_0 = 0x200,</div><div class='add'>+	IOPMU_OUTBOUND_MSG0_UNREGISTER_DEVICE_MAX = 0x2ff,</div><div class='add'>+	IOPMU_OUTBOUND_MSG0_REVALIDATE_DEVICE_0 = 0x300,</div><div class='add'>+	IOPMU_OUTBOUND_MSG0_REVALIDATE_DEVICE_MAX = 0x3ff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_iop_request_header</div><div class='add'>+{</div><div class='add'>+	__le32 size;</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	__le32 result;</div><div class='add'>+	__le32 context; /* host context */</div><div class='add'>+	__le32 context_hi32;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IOP_REQUEST_FLAG_SYNC_REQUEST 1</div><div class='add'>+#define IOP_REQUEST_FLAG_BIST_REQUEST 2</div><div class='add'>+#define IOP_REQUEST_FLAG_REMAPPED     4</div><div class='add'>+#define IOP_REQUEST_FLAG_OUTPUT_CONTEXT 8</div><div class='add'>+</div><div class='add'>+enum hpt_iop_request_type {</div><div class='add'>+	IOP_REQUEST_TYPE_GET_CONFIG = 0,</div><div class='add'>+	IOP_REQUEST_TYPE_SET_CONFIG,</div><div class='add'>+	IOP_REQUEST_TYPE_BLOCK_COMMAND,</div><div class='add'>+	IOP_REQUEST_TYPE_SCSI_COMMAND,</div><div class='add'>+	IOP_REQUEST_TYPE_IOCTL_COMMAND,</div><div class='add'>+	IOP_REQUEST_TYPE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hpt_iop_result_type {</div><div class='add'>+	IOP_RESULT_PENDING = 0,</div><div class='add'>+	IOP_RESULT_SUCCESS,</div><div class='add'>+	IOP_RESULT_FAIL,</div><div class='add'>+	IOP_RESULT_BUSY,</div><div class='add'>+	IOP_RESULT_RESET,</div><div class='add'>+	IOP_RESULT_INVALID_REQUEST,</div><div class='add'>+	IOP_RESULT_BAD_TARGET,</div><div class='add'>+	IOP_RESULT_MODE_SENSE_CHECK_CONDITION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_iop_request_get_config</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header header;</div><div class='add'>+	__le32 interface_version;</div><div class='add'>+	__le32 firmware_version;</div><div class='add'>+	__le32 max_requests;</div><div class='add'>+	__le32 request_size;</div><div class='add'>+	__le32 max_sg_count;</div><div class='add'>+	__le32 data_transfer_length;</div><div class='add'>+	__le32 alignment_mask;</div><div class='add'>+	__le32 max_devices;</div><div class='add'>+	__le32 sdram_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_iop_request_set_config</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header header;</div><div class='add'>+	__le32 iop_id;</div><div class='add'>+	__le32 vbus_id;</div><div class='add'>+	__le32 reserve[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_iopsg</div><div class='add'>+{</div><div class='add'>+	__le32 size;</div><div class='add'>+	__le32 eot; /* non-zero: end of table */</div><div class='add'>+	__le64 pci_address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_iop_request_block_command</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header header;</div><div class='add'>+	u8     channel;</div><div class='add'>+	u8     target;</div><div class='add'>+	u8     lun;</div><div class='add'>+	u8     pad1;</div><div class='add'>+	__le16 command; /* IOP_BLOCK_COMMAND_{READ,WRITE} */</div><div class='add'>+	__le16 sectors;</div><div class='add'>+	__le64 lba;</div><div class='add'>+	struct hpt_iopsg sg_list[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define IOP_BLOCK_COMMAND_READ     1</div><div class='add'>+#define IOP_BLOCK_COMMAND_WRITE    2</div><div class='add'>+#define IOP_BLOCK_COMMAND_VERIFY   3</div><div class='add'>+#define IOP_BLOCK_COMMAND_FLUSH    4</div><div class='add'>+#define IOP_BLOCK_COMMAND_SHUTDOWN 5</div><div class='add'>+</div><div class='add'>+struct hpt_iop_request_scsi_command</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header header;</div><div class='add'>+	u8     channel;</div><div class='add'>+	u8     target;</div><div class='add'>+	u8     lun;</div><div class='add'>+	u8     pad1;</div><div class='add'>+	u8     cdb[16];</div><div class='add'>+	__le32 dataxfer_length;</div><div class='add'>+	struct hpt_iopsg sg_list[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_iop_request_ioctl_command</div><div class='add'>+{</div><div class='add'>+	struct hpt_iop_request_header header;</div><div class='add'>+	__le32 ioctl_code;</div><div class='add'>+	__le32 inbuf_size;</div><div class='add'>+	__le32 outbuf_size;</div><div class='add'>+	__le32 bytes_returned;</div><div class='add'>+	u8     buf[1];</div><div class='add'>+	/* out data should be put at buf[(inbuf_size+3)&amp;~3] */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HPTIOP_MAX_REQUESTS  256u</div><div class='add'>+</div><div class='add'>+struct hptiop_request {</div><div class='add'>+	struct hptiop_request * next;</div><div class='add'>+	void *                  req_virt;</div><div class='add'>+	u32                     req_shifted_phy;</div><div class='add'>+	struct scsi_cmnd *      scp;</div><div class='add'>+	int                     index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_scsi_pointer {</div><div class='add'>+	int mapped;</div><div class='add'>+	int sgcnt;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HPT_SCP(scp) ((struct hpt_scsi_pointer *)&amp;(scp)-&gt;SCp)</div><div class='add'>+</div><div class='add'>+struct hptiop_hba {</div><div class='add'>+	struct hpt_iopmu __iomem * iop;</div><div class='add'>+	struct Scsi_Host * host;</div><div class='add'>+	struct pci_dev * pcidev;</div><div class='add'>+</div><div class='add'>+	struct list_head link;</div><div class='add'>+</div><div class='add'>+	/* IOP config info */</div><div class='add'>+	u32     firmware_version;</div><div class='add'>+	u32     sdram_size;</div><div class='add'>+	u32     max_devices;</div><div class='add'>+	u32     max_requests;</div><div class='add'>+	u32     max_request_size;</div><div class='add'>+	u32     max_sg_descriptors;</div><div class='add'>+</div><div class='add'>+	u32     req_size; /* host-allocated request buffer size */</div><div class='add'>+	int     initialized;</div><div class='add'>+	int     msg_done;</div><div class='add'>+</div><div class='add'>+	struct hptiop_request * req_list;</div><div class='add'>+	struct hptiop_request reqs[HPTIOP_MAX_REQUESTS];</div><div class='add'>+</div><div class='add'>+	/* used to free allocated dma area */</div><div class='add'>+	void *      dma_coherent;</div><div class='add'>+	dma_addr_t  dma_coherent_handle;</div><div class='add'>+</div><div class='add'>+	atomic_t    reset_count;</div><div class='add'>+	atomic_t    resetting;</div><div class='add'>+</div><div class='add'>+	wait_queue_head_t reset_wq;</div><div class='add'>+	wait_queue_head_t ioctl_wq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpt_ioctl_k</div><div class='add'>+{</div><div class='add'>+	struct hptiop_hba * hba;</div><div class='add'>+	u32    ioctl_code;</div><div class='add'>+	u32    inbuf_size;</div><div class='add'>+	u32    outbuf_size;</div><div class='add'>+	void * inbuf;</div><div class='add'>+	void * outbuf;</div><div class='add'>+	u32  * bytes_returned;</div><div class='add'>+	void (*done)(struct hpt_ioctl_k *);</div><div class='add'>+	int    result; /* HPT_IOCTL_RESULT_ */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HPT_IOCTL_RESULT_OK         0</div><div class='add'>+#define HPT_IOCTL_RESULT_FAILED     (-1)</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+#define dprintk(fmt, args...) do { printk(fmt, ##args); } while(0)</div><div class='add'>+#else</div><div class='add'>+#define dprintk(fmt, args...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c<br/>index 24eb59e143a9..2be1dc5d852a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ibmmca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ibmmca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ibmmca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ibmmca.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -760,7 +759,7 @@ static int device_inquiry(int host_index, int ldn)</div><div class='ctx'> 		while (!got_interrupt(host_index))</div><div class='ctx'> 			barrier();</div><div class='ctx'> </div><div class='del'>-		/*if command succesful, break */</div><div class='add'>+		/*if command successful, break */</div><div class='ctx'> 		if ((stat_result(host_index) == IM_SCB_CMD_COMPLETED) || (stat_result(host_index) == IM_SCB_CMD_COMPLETED_WITH_RETRIES))</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -885,7 +884,7 @@ static int immediate_assign(int host_index, unsigned int pun, unsigned int lun,</div><div class='ctx'> 		while (!got_interrupt(host_index))</div><div class='ctx'> 			barrier();</div><div class='ctx'> </div><div class='del'>-		/*if command succesful, break */</div><div class='add'>+		/*if command successful, break */</div><div class='ctx'> 		if (stat_result(host_index) == IM_IMMEDIATE_CMD_COMPLETED)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -921,7 +920,7 @@ static int immediate_feature(int host_index, unsigned int speed, unsigned int ti</div><div class='ctx'> 			return 2;</div><div class='ctx'> 		} else</div><div class='ctx'> 			global_command_error_excuse = 0;</div><div class='del'>-		/*if command succesful, break */</div><div class='add'>+		/*if command successful, break */</div><div class='ctx'> 		if (stat_result(host_index) == IM_IMMEDIATE_CMD_COMPLETED)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -959,7 +958,7 @@ static int immediate_reset(int host_index, unsigned int ldn)</div><div class='ctx'> 			/* did not work, finish */</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='del'>-		/*if command succesful, break */</div><div class='add'>+		/*if command successful, break */</div><div class='ctx'> 		if (stat_result(host_index) == IM_IMMEDIATE_CMD_COMPLETED)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1441,7 +1440,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)</div><div class='ctx'> 	struct Scsi_Host *dev = dev_id;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(dev-&gt;host_lock, flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	shpnt = dev;		/* assign host-structure to local pointer */</div><div class='ctx'> 	len = 0;		/* set filled text-buffer index to 0 */</div><div class='ctx'> 	/* get the _special contents of the hostdata structure */</div><div class='hunk'>@@ -1456,7 +1455,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)</div><div class='ctx'> 		/* if the integrated subsystem has been found automatically: */</div><div class='ctx'> 		len += sprintf(buf + len,</div><div class='ctx'> 			       "Adapter category: integrated\n" "Chip revision level: %d\n" "Chip status: %s\n" "8 kByte NVRAM status: %s\n", ((pos[2] &amp; 0xf0) &gt;&gt; 4), (pos[2] &amp; 1) ? "enabled" : "disabled", (pos[2] &amp; 2) ? "locked" : "accessible");</div><div class='del'>-	} else if ((speciale &gt;= 0) &amp;&amp; (speciale &lt; (sizeof(subsys_list) / sizeof(struct subsys_list_struct)))) {</div><div class='add'>+	} else if ((speciale &gt;= 0) &amp;&amp; (speciale &lt; ARRAY_SIZE(subsys_list))) {</div><div class='ctx'> 		/* if the subsystem is a slot adapter */</div><div class='ctx'> 		len += sprintf(buf + len, "Adapter category: slot-card\n" "ROM Segment Address: ");</div><div class='ctx'> 		if ((pos[2] &amp; 0xf0) == 0xf0)</div><div class='hunk'>@@ -1477,16 +1476,16 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)</div><div class='ctx'> 	while (len % sizeof(int) != (sizeof(int) - 1))</div><div class='ctx'> 		len += sprintf(buf + len, " ");</div><div class='ctx'> 	len += sprintf(buf + len, "\n");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(shpnt-&gt;host_lock, flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ibmmca_detect(struct scsi_host_template * scsi_template)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shpnt;</div><div class='del'>-	int port, id, i, j, k, list_size, slot;</div><div class='add'>+	int port, id, i, j, k, slot;</div><div class='ctx'> 	int devices_on_irq_11 = 0;</div><div class='ctx'> 	int devices_on_irq_14 = 0;</div><div class='ctx'> 	int IRQ14_registered = 0;</div><div class='hunk'>@@ -1511,7 +1510,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* get interrupt request level */</div><div class='del'>-	if (request_irq(IM_IRQ, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) {</div><div class='add'>+	if (request_irq(IM_IRQ, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) {</div><div class='ctx'> 		printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1603,8 +1602,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)</div><div class='ctx'> 	/* now look for other adapters in MCA slots, */</div><div class='ctx'> 	/* determine the number of known IBM-SCSI-subsystem types */</div><div class='ctx'> 	/* see the pos[2] dependence to get the adapter port-offset. */</div><div class='del'>-	list_size = sizeof(subsys_list) / sizeof(struct subsys_list_struct);</div><div class='del'>-	for (i = 0; i &lt; list_size; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(subsys_list); i++) {</div><div class='ctx'> 		/* scan each slot for a fitting adapter id */</div><div class='ctx'> 		slot = 0;	/* start at slot 0 */</div><div class='ctx'> 		while ((slot = mca_find_adapter(subsys_list[i].mca_id, slot))</div><div class='hunk'>@@ -1637,7 +1635,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)</div><div class='ctx'> 				/* IRQ11 is used by SCSI-2 F/W Adapter/A */</div><div class='ctx'> 				printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n");</div><div class='ctx'> 				/* get interrupt request level */</div><div class='del'>-				if (request_irq(IM_IRQ_FW, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) {</div><div class='add'>+				if (request_irq(IM_IRQ_FW, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) {</div><div class='ctx'> 					printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW);</div><div class='ctx'> 				} else</div><div class='ctx'> 					IRQ11_registered++;</div><div class='hunk'>@@ -1669,8 +1667,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)</div><div class='ctx'> 	/* now check for SCSI-adapters, mapped to the integrated SCSI</div><div class='ctx'> 	 * area. E.g. a W/Cache in MCA-slot 9(!). Do the check correct here,</div><div class='ctx'> 	 * as this is a known effect on some models 95xx. */</div><div class='del'>-	list_size = sizeof(subsys_list) / sizeof(struct subsys_list_struct);</div><div class='del'>-	for (i = 0; i &lt; list_size; i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(subsys_list); i++) {</div><div class='ctx'> 		/* scan each slot for a fitting adapter id */</div><div class='ctx'> 		slot = mca_find_adapter(subsys_list[i].mca_id, MCA_INTEGSCSI);</div><div class='ctx'> 		if (slot != MCA_NOTFOUND) {	/* scan through all slots */</div><div class='hunk'>@@ -1699,7 +1696,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)</div><div class='ctx'> 				/* IRQ11 is used by SCSI-2 F/W Adapter/A */</div><div class='ctx'> 				printk(KERN_DEBUG  "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n");</div><div class='ctx'> 				/* get interrupt request level */</div><div class='del'>-				if (request_irq(IM_IRQ_FW, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts))</div><div class='add'>+				if (request_irq(IM_IRQ_FW, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts))</div><div class='ctx'> 					printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW);</div><div class='ctx'> 				else</div><div class='ctx'> 					IRQ11_registered++;</div><div class='hunk'>@@ -2243,8 +2240,7 @@ static int __ibmmca_host_reset(Scsi_Cmnd * cmd)</div><div class='ctx'> 	int host_index;</div><div class='ctx'> 	unsigned long imm_command;</div><div class='ctx'> </div><div class='del'>-	if (cmd == NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(cmd == NULL);</div><div class='ctx'> </div><div class='ctx'> 	ticks = IM_RESET_DELAY * HZ;</div><div class='ctx'> 	shpnt = cmd-&gt;device-&gt;host;</div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c<br/>index 2e9be83a697f..669ea4fff166 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ibmvscsi/ibmvscsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ibmvscsi/ibmvscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ibmvscsi/ibmvscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ibmvscsi/ibmvscsi.c</a></div><div class='hunk'>@@ -121,10 +121,9 @@ static int initialize_event_pool(struct event_pool *pool,</div><div class='ctx'> </div><div class='ctx'> 	pool-&gt;size = size;</div><div class='ctx'> 	pool-&gt;next = 0;</div><div class='del'>-	pool-&gt;events = kmalloc(pool-&gt;size * sizeof(*pool-&gt;events), GFP_KERNEL);</div><div class='add'>+	pool-&gt;events = kcalloc(pool-&gt;size, sizeof(*pool-&gt;events), GFP_KERNEL);</div><div class='ctx'> 	if (!pool-&gt;events)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memset(pool-&gt;events, 0x00, pool-&gt;size * sizeof(*pool-&gt;events));</div><div class='ctx'> </div><div class='ctx'> 	pool-&gt;iu_storage =</div><div class='ctx'> 	    dma_alloc_coherent(hostdata-&gt;dev,</div><div class='hunk'>@@ -536,6 +535,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,</div><div class='ctx'> 				   struct ibmvscsi_host_data *hostdata)</div><div class='ctx'> {</div><div class='ctx'> 	u64 *crq_as_u64 = (u64 *) &amp;evt_struct-&gt;crq;</div><div class='add'>+	int request_status;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* If we have exhausted our request limit, just fail this request.</div><div class='hunk'>@@ -543,9 +543,18 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,</div><div class='ctx'> 	 * (such as task management requests) that the mid layer may think we</div><div class='ctx'> 	 * can handle more requests (can_queue) when we actually can't</div><div class='ctx'> 	 */</div><div class='del'>-	if ((evt_struct-&gt;crq.format == VIOSRP_SRP_FORMAT) &amp;&amp;</div><div class='del'>-	    (atomic_dec_if_positive(&amp;hostdata-&gt;request_limit) &lt; 0))</div><div class='del'>-		goto send_error;</div><div class='add'>+	if (evt_struct-&gt;crq.format == VIOSRP_SRP_FORMAT) {</div><div class='add'>+		request_status =</div><div class='add'>+			atomic_dec_if_positive(&amp;hostdata-&gt;request_limit);</div><div class='add'>+		/* If request limit was -1 when we started, it is now even</div><div class='add'>+		 * less than that</div><div class='add'>+		 */</div><div class='add'>+		if (request_status &lt; -1)</div><div class='add'>+			goto send_error;</div><div class='add'>+		/* Otherwise, if we have run out of requests */</div><div class='add'>+		else if (request_status &lt; 0)</div><div class='add'>+			goto send_busy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the IU into the transfer area */</div><div class='ctx'> 	*evt_struct-&gt;xfer_iu = evt_struct-&gt;iu;</div><div class='hunk'>@@ -568,11 +577,23 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- send_error:</div><div class='add'>+ send_busy:</div><div class='ctx'> 	unmap_cmd_data(&amp;evt_struct-&gt;iu.srp.cmd, evt_struct, hostdata-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	free_event_struct(&amp;hostdata-&gt;pool, evt_struct);</div><div class='ctx'>  	return SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+</div><div class='add'>+ send_error:</div><div class='add'>+	unmap_cmd_data(&amp;evt_struct-&gt;iu.srp.cmd, evt_struct, hostdata-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (evt_struct-&gt;cmnd != NULL) {</div><div class='add'>+		evt_struct-&gt;cmnd-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+		evt_struct-&gt;cmnd_done(evt_struct-&gt;cmnd);</div><div class='add'>+	} else if (evt_struct-&gt;done)</div><div class='add'>+		evt_struct-&gt;done(evt_struct);</div><div class='add'>+</div><div class='add'>+	free_event_struct(&amp;hostdata-&gt;pool, evt_struct);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1185,27 +1206,37 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq,</div><div class='ctx'> 		return;</div><div class='ctx'> 	case 0xFF:	/* Hypervisor telling us the connection is closed */</div><div class='ctx'> 		scsi_block_requests(hostdata-&gt;host);</div><div class='add'>+		atomic_set(&amp;hostdata-&gt;request_limit, 0);</div><div class='ctx'> 		if (crq-&gt;format == 0x06) {</div><div class='ctx'> 			/* We need to re-setup the interpartition connection */</div><div class='ctx'> 			printk(KERN_INFO</div><div class='ctx'> 			       "ibmvscsi: Re-enabling adapter!\n");</div><div class='del'>-			atomic_set(&amp;hostdata-&gt;request_limit, -1);</div><div class='ctx'> 			purge_requests(hostdata, DID_REQUEUE);</div><div class='del'>-			if (ibmvscsi_reenable_crq_queue(&amp;hostdata-&gt;queue,</div><div class='del'>-							hostdata) == 0)</div><div class='del'>-				if (ibmvscsi_send_crq(hostdata,</div><div class='del'>-						      0xC001000000000000LL, 0))</div><div class='add'>+			if ((ibmvscsi_reenable_crq_queue(&amp;hostdata-&gt;queue,</div><div class='add'>+							hostdata) == 0) ||</div><div class='add'>+			    (ibmvscsi_send_crq(hostdata,</div><div class='add'>+					       0xC001000000000000LL, 0))) {</div><div class='add'>+					atomic_set(&amp;hostdata-&gt;request_limit,</div><div class='add'>+						   -1);</div><div class='ctx'> 					printk(KERN_ERR</div><div class='del'>-					       "ibmvscsi: transmit error after"</div><div class='add'>+					       "ibmvscsi: error after"</div><div class='ctx'> 					       " enable\n");</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			printk(KERN_INFO</div><div class='ctx'> 			       "ibmvscsi: Virtual adapter failed rc %d!\n",</div><div class='ctx'> 			       crq-&gt;format);</div><div class='ctx'> </div><div class='del'>-			atomic_set(&amp;hostdata-&gt;request_limit, -1);</div><div class='ctx'> 			purge_requests(hostdata, DID_ERROR);</div><div class='del'>-			ibmvscsi_reset_crq_queue(&amp;hostdata-&gt;queue, hostdata);</div><div class='add'>+			if ((ibmvscsi_reset_crq_queue(&amp;hostdata-&gt;queue,</div><div class='add'>+							hostdata)) ||</div><div class='add'>+			    (ibmvscsi_send_crq(hostdata,</div><div class='add'>+					       0xC001000000000000LL, 0))) {</div><div class='add'>+					atomic_set(&amp;hostdata-&gt;request_limit,</div><div class='add'>+						   -1);</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "ibmvscsi: error after reset\n");</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		scsi_unblock_requests(hostdata-&gt;host);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1468,6 +1499,7 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	struct Scsi_Host *host;</div><div class='ctx'> 	struct device *dev = &amp;vdev-&gt;dev;</div><div class='ctx'> 	unsigned long wait_switch = 0;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	vdev-&gt;dev.driver_data = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1485,8 +1517,8 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	atomic_set(&amp;hostdata-&gt;request_limit, -1);</div><div class='ctx'> 	hostdata-&gt;host-&gt;max_sectors = 32 * 8; /* default max I/O 32 pages */</div><div class='ctx'> </div><div class='del'>-	if (ibmvscsi_init_crq_queue(&amp;hostdata-&gt;queue, hostdata,</div><div class='del'>-				    max_requests) != 0) {</div><div class='add'>+	rc = ibmvscsi_init_crq_queue(&amp;hostdata-&gt;queue, hostdata, max_requests);</div><div class='add'>+	if (rc != 0 &amp;&amp; rc != H_RESOURCE) {</div><div class='ctx'> 		printk(KERN_ERR "ibmvscsi: couldn't initialize crq\n");</div><div class='ctx'> 		goto init_crq_failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1506,7 +1538,8 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)</div><div class='ctx'> 	 * to fail if the other end is not acive.  In that case we don't</div><div class='ctx'> 	 * want to scan</div><div class='ctx'> 	 */</div><div class='del'>-	if (ibmvscsi_send_crq(hostdata, 0xC001000000000000LL, 0) == 0) {</div><div class='add'>+	if (ibmvscsi_send_crq(hostdata, 0xC001000000000000LL, 0) == 0</div><div class='add'>+	    || rc == H_RESOURCE) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait around max init_timeout secs for the adapter to finish</div><div class='ctx'> 		 * initializing. When we are done initializing, we will have a</div><div class='head'>diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c<br/>index 1a9992bdfef8..242b8873b333 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ibmvscsi/rpa_vscsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ibmvscsi/rpa_vscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ibmvscsi/rpa_vscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ibmvscsi/rpa_vscsi.c</a></div><div class='hunk'>@@ -208,6 +208,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,</div><div class='ctx'> 			    int max_requests)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='add'>+	int retrc;</div><div class='ctx'> 	struct vio_dev *vdev = to_vio_dev(hostdata-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	queue-&gt;msgs = (struct viosrp_crq *)get_zeroed_page(GFP_KERNEL);</div><div class='hunk'>@@ -226,7 +227,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,</div><div class='ctx'> 	gather_partition_info();</div><div class='ctx'> 	set_adapter_info(hostdata);</div><div class='ctx'> </div><div class='del'>-	rc = plpar_hcall_norets(H_REG_CRQ,</div><div class='add'>+	retrc = rc = plpar_hcall_norets(H_REG_CRQ,</div><div class='ctx'> 				vdev-&gt;unit_address,</div><div class='ctx'> 				queue-&gt;msg_token, PAGE_SIZE);</div><div class='ctx'> 	if (rc == H_RESOURCE)</div><div class='hunk'>@@ -263,7 +264,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,</div><div class='ctx'> 	tasklet_init(&amp;hostdata-&gt;srp_task, (void *)ibmvscsi_task,</div><div class='ctx'> 		     (unsigned long)hostdata);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return retrc;</div><div class='ctx'> </div><div class='ctx'>       req_irq_failed:</div><div class='ctx'> 	do {</div><div class='head'>diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c<br/>index 39b760a24241..f7b5d7372d26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ide-scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ide-scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ide-scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ide-scsi.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'> #define IDESCSI_VERSION "0.92"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -600,8 +599,7 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)</div><div class='ctx'> 				"issuing a packet command\n");</div><div class='ctx'> 		return ide_do_reset (drive);</div><div class='ctx'> 	}</div><div class='del'>-	if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-		BUG();</div><div class='add'>+	BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 	/* Set the interrupt routine */</div><div class='ctx'> 	ide_set_handler(drive, &amp;idescsi_pc_intr, get_timeout(pc), idescsi_expiry);</div><div class='ctx'> 	/* Send the actual packet */</div><div class='hunk'>@@ -691,8 +689,7 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)</div><div class='ctx'> 		set_bit(PC_DMA_OK, &amp;pc-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(IDESCSI_DRQ_INTERRUPT, &amp;scsi-&gt;flags)) {</div><div class='del'>-		if (HWGROUP(drive)-&gt;handler != NULL)</div><div class='del'>-			BUG();</div><div class='add'>+		BUG_ON(HWGROUP(drive)-&gt;handler != NULL);</div><div class='ctx'> 		ide_set_handler(drive, &amp;idescsi_transfer_pc,</div><div class='ctx'> 				get_timeout(pc), idescsi_expiry);</div><div class='ctx'> 		/* Issue the packet command */</div><div class='head'>diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c<br/>index fc0f30ae0f77..2d95ac9c32c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/imm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/imm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/imm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/imm.c</a></div><div class='hunk'>@@ -3,15 +3,11 @@</div><div class='ctx'>  * </div><div class='ctx'>  * (The IMM is the embedded controller in the ZIP Plus drive.)</div><div class='ctx'>  * </div><div class='del'>- * Current Maintainer: David Campbell (Perth, Western Australia)</div><div class='del'>- *                     campbell@torque.net</div><div class='del'>- *</div><div class='ctx'>  * My unoffical company acronym list is 21 pages long:</div><div class='ctx'>  *      FLA:    Four letter acronym with built in facility for</div><div class='ctx'>  *              future expansion to five letters.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -1119,6 +1115,10 @@ static int device_check(imm_struct *dev)</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * imm cannot deal with highmem, so this causes all IO pages for this host</div><div class='add'>+ * to reside in low memory (hence mapped)</div><div class='add'>+ */</div><div class='ctx'> static int imm_adjust_queue(struct scsi_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	blk_queue_bounce_limit(device-&gt;request_queue, BLK_BOUNCE_HIGH);</div><div class='hunk'>@@ -1141,10 +1141,6 @@ static struct scsi_host_template imm_template = {</div><div class='ctx'> 	.use_clustering		= ENABLE_CLUSTERING,</div><div class='ctx'> 	.can_queue		= 1,</div><div class='ctx'> 	.slave_alloc		= imm_adjust_queue,</div><div class='del'>-	.unchecked_isa_dma	= 1, /* imm cannot deal with highmem, so</div><div class='del'>-				      * this is an easy trick to ensure</div><div class='del'>-				      * all io pages for this host reside</div><div class='del'>-				      * in low memory */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************</div><div class='head'>diff --git a/drivers/scsi/imm.h b/drivers/scsi/imm.h<br/>index dc3aebf0e365..ece936ac29c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/imm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/imm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/imm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/imm.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*  Driver for the Iomega MatchMaker parallel port SCSI HBA embedded in </div><div class='ctx'>  * the Iomega ZIP Plus drive</div><div class='ctx'>  * </div><div class='del'>- * (c) 1998     David Campbell     campbell@torque.net</div><div class='add'>+ * (c) 1998     David Campbell</div><div class='ctx'>  *</div><div class='ctx'>  * Please note that I live in Perth, Western Australia. GMT+0800</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c<br/>index 9c519876f8a0..59a4097f1254 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/in2000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/in2000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/in2000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/in2000.c</a></div><div class='hunk'>@@ -370,7 +370,7 @@ static int in2000_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;use_sg) {</div><div class='del'>-		cmd-&gt;SCp.buffer = (struct scatterlist *) cmd-&gt;buffer;</div><div class='add'>+		cmd-&gt;SCp.buffer = (struct scatterlist *) cmd-&gt;request_buffer;</div><div class='ctx'> 		cmd-&gt;SCp.buffers_residual = cmd-&gt;use_sg - 1;</div><div class='ctx'> 		cmd-&gt;SCp.ptr = (char *) page_address(cmd-&gt;SCp.buffer-&gt;page) + cmd-&gt;SCp.buffer-&gt;offset;</div><div class='ctx'> 		cmd-&gt;SCp.this_residual = cmd-&gt;SCp.buffer-&gt;length;</div><div class='hunk'>@@ -1809,7 +1809,7 @@ static int in2000_abort(Scsi_Cmnd * cmd)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define MAX_IN2000_HOSTS 3</div><div class='del'>-#define MAX_SETUP_ARGS (sizeof(setup_args) / sizeof(char *))</div><div class='add'>+#define MAX_SETUP_ARGS ARRAY_SIZE(setup_args)</div><div class='ctx'> #define SETUP_BUFFER_SIZE 200</div><div class='ctx'> static char setup_buffer[SETUP_BUFFER_SIZE];</div><div class='ctx'> static char setup_used[MAX_SETUP_ARGS];</div><div class='hunk'>@@ -2015,7 +2015,7 @@ static int __init in2000_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 		write1_io(0, IO_FIFO_READ);	/* start fifo out in read mode */</div><div class='ctx'> 		write1_io(0, IO_INTR_MASK);	/* allow all ints */</div><div class='ctx'> 		x = int_tab[(switches &amp; (SW_INT0 | SW_INT1)) &gt;&gt; SW_INT_SHIFT];</div><div class='del'>-		if (request_irq(x, in2000_intr, SA_INTERRUPT, "in2000", instance)) {</div><div class='add'>+		if (request_irq(x, in2000_intr, IRQF_DISABLED, "in2000", instance)) {</div><div class='ctx'> 			printk("in2000_detect: Unable to allocate IRQ.\n");</div><div class='ctx'> 			detect_count--;</div><div class='ctx'> 			continue;</div><div class='head'>diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c<br/>index 0cc7f65b584f..9e10dac61cfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/initio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/initio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/initio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/initio.c</a></div><div class='hunk'>@@ -118,7 +118,6 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -154,7 +153,6 @@</div><div class='ctx'> static unsigned int i91u_debug = DEBUG_DEFAULT;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define TULSZ(sz)     (sizeof(sz) / sizeof(sz[0]))</div><div class='ctx'> #define TUL_RDWORD(x,y)         (short)(inl((int)((ULONG)((ULONG)x+(UCHAR)y)) ))</div><div class='ctx'> </div><div class='ctx'> typedef struct PCI_ID_Struc {</div><div class='hunk'>@@ -2771,7 +2769,7 @@ static int tul_NewReturnNumberOfAdapters(void)</div><div class='ctx'> </div><div class='ctx'> 	init_i91uAdapter_table();</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TULSZ(i91u_pci_devices); i++)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(i91u_pci_devices); i++)</div><div class='ctx'> 	{</div><div class='ctx'> 		while ((pDev = pci_find_device(i91u_pci_devices[i].vendor_id, i91u_pci_devices[i].device_id, pDev)) != NULL) {</div><div class='ctx'> 			if (pci_enable_device(pDev))</div><div class='hunk'>@@ -2869,7 +2867,7 @@ static int i91u_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 		hreg-&gt;sg_tablesize = TOTAL_SG_ENTRY;	/* Maximun support is 32 */</div><div class='ctx'> </div><div class='ctx'> 		/* Initial tulip chip           */</div><div class='del'>-		ok = request_irq(pHCB-&gt;HCS_Intr, i91u_intr, SA_INTERRUPT | SA_SHIRQ, "i91u", hreg);</div><div class='add'>+		ok = request_irq(pHCB-&gt;HCS_Intr, i91u_intr, IRQF_DISABLED | IRQF_SHARED, "i91u", hreg);</div><div class='ctx'> 		if (ok &lt; 0) {</div><div class='ctx'> 			printk(KERN_WARNING "i91u: unable to request IRQ %d\n\n", pHCB-&gt;HCS_Intr);</div><div class='ctx'> 			return 0;</div><div class='head'>diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h<br/>index 3efb1184fc39..acb67a4af2cc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/initio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/initio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/initio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/initio.h</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'>  **************************************************************************/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ULONG   unsigned long</div><div class='hunk'>@@ -193,13 +192,13 @@ typedef struct {</div><div class='ctx'> #define TSC_SEL_ATN_DIRECT_OUT  0x15	/* Select With ATN Sequence     */</div><div class='ctx'> #define TSC_SEL_ATN3_DIRECT_IN  0xB5	/* Select With ATN3 Sequence    */</div><div class='ctx'> #define TSC_SEL_ATN3_DIRECT_OUT 0x35	/* Select With ATN3 Sequence    */</div><div class='del'>-#define TSC_XF_DMA_OUT_DIRECT   0x06	/* DMA Xfer Infomation out      */</div><div class='del'>-#define TSC_XF_DMA_IN_DIRECT    0x86	/* DMA Xfer Infomation in       */</div><div class='add'>+#define TSC_XF_DMA_OUT_DIRECT   0x06	/* DMA Xfer Information out      */</div><div class='add'>+#define TSC_XF_DMA_IN_DIRECT    0x86	/* DMA Xfer Information in       */</div><div class='ctx'> </div><div class='del'>-#define TSC_XF_DMA_OUT  0x43	/* DMA Xfer Infomation out              */</div><div class='del'>-#define TSC_XF_DMA_IN   0xC3	/* DMA Xfer Infomation in               */</div><div class='del'>-#define TSC_XF_FIFO_OUT 0x03	/* FIFO Xfer Infomation out             */</div><div class='del'>-#define TSC_XF_FIFO_IN  0x83	/* FIFO Xfer Infomation in              */</div><div class='add'>+#define TSC_XF_DMA_OUT  0x43	/* DMA Xfer Information out              */</div><div class='add'>+#define TSC_XF_DMA_IN   0xC3	/* DMA Xfer Information in               */</div><div class='add'>+#define TSC_XF_FIFO_OUT 0x03	/* FIFO Xfer Information out             */</div><div class='add'>+#define TSC_XF_FIFO_IN  0x83	/* FIFO Xfer Information in              */</div><div class='ctx'> </div><div class='ctx'> #define TSC_MSG_ACCEPT  0x0F	/* Message Accept                       */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c<br/>index 8b80e59c8c52..01080b3acf5e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ipr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ipr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ipr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ipr.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -79,7 +78,6 @@</div><div class='ctx'> #include &lt;scsi/scsi_tcq.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include "ipr.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -6430,7 +6428,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,</div><div class='ctx'> 		ioa_cfg-&gt;needs_hard_reset = 1;</div><div class='ctx'> </div><div class='ctx'> 	ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);</div><div class='del'>-	rc = request_irq(pdev-&gt;irq, ipr_isr, SA_SHIRQ, IPR_NAME, ioa_cfg);</div><div class='add'>+	rc = request_irq(pdev-&gt;irq, ipr_isr, IRQF_SHARED, IPR_NAME, ioa_cfg);</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Couldn't register IRQ %d! rc=%d\n",</div><div class='head'>diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c<br/>index a4c0b04cfdbd..3c639286ec1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ips.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ips.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ips.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ips.c</a></div><div class='hunk'>@@ -196,7 +196,6 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -556,7 +555,7 @@ ips_setup(char *ips_str)</div><div class='ctx'> 		 * We now have key/value pairs.</div><div class='ctx'> 		 * Update the variables</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 0; i &lt; (sizeof (options) / sizeof (options[0])); i++) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(options); i++) {</div><div class='ctx'> 			if (strnicmp</div><div class='ctx'> 			    (key, options[i].option_name,</div><div class='ctx'> 			     strlen(options[i].option_name)) == 0) {</div><div class='hunk'>@@ -4364,7 +4363,7 @@ ips_rdcap(ips_ha_t * ha, ips_scb_t * scb)</div><div class='ctx'> </div><div class='ctx'> 	METHOD_TRACE("ips_rdcap", 1);</div><div class='ctx'> </div><div class='del'>-	if (scb-&gt;scsi_cmd-&gt;bufflen &lt; 8)</div><div class='add'>+	if (scb-&gt;scsi_cmd-&gt;request_bufflen &lt; 8)</div><div class='ctx'> 		return (0);</div><div class='ctx'> </div><div class='ctx'> 	cap.lba =</div><div class='hunk'>@@ -6438,7 +6437,7 @@ ips_erase_bios(ips_ha_t * ha)</div><div class='ctx'> 		/* VPP failure */</div><div class='ctx'> 		return (1);</div><div class='ctx'> </div><div class='del'>-	/* check for succesful flash */</div><div class='add'>+	/* check for successful flash */</div><div class='ctx'> 	if (status &amp; 0x30)</div><div class='ctx'> 		/* sequence error */</div><div class='ctx'> 		return (1);</div><div class='hunk'>@@ -6550,7 +6549,7 @@ ips_erase_bios_memio(ips_ha_t * ha)</div><div class='ctx'> 		/* VPP failure */</div><div class='ctx'> 		return (1);</div><div class='ctx'> </div><div class='del'>-	/* check for succesful flash */</div><div class='add'>+	/* check for successful flash */</div><div class='ctx'> 	if (status &amp; 0x30)</div><div class='ctx'> 		/* sequence error */</div><div class='ctx'> 		return (1);</div><div class='hunk'>@@ -7008,7 +7007,7 @@ ips_register_scsi(int index)</div><div class='ctx'> 	memcpy(ha, oldha, sizeof (ips_ha_t));</div><div class='ctx'> 	free_irq(oldha-&gt;irq, oldha);</div><div class='ctx'> 	/* Install the interrupt handler with the new ha */</div><div class='del'>-	if (request_irq(ha-&gt;irq, do_ipsintr, SA_SHIRQ, ips_name, ha)) {</div><div class='add'>+	if (request_irq(ha-&gt;irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {</div><div class='ctx'> 		IPS_PRINTK(KERN_WARNING, ha-&gt;pcidev,</div><div class='ctx'> 			   "Unable to install interrupt handler\n");</div><div class='ctx'> 		scsi_host_put(sh);</div><div class='hunk'>@@ -7420,7 +7419,7 @@ ips_init_phase2(int index)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Install the interrupt handler */</div><div class='del'>-	if (request_irq(ha-&gt;irq, do_ipsintr, SA_SHIRQ, ips_name, ha)) {</div><div class='add'>+	if (request_irq(ha-&gt;irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {</div><div class='ctx'> 		IPS_PRINTK(KERN_WARNING, ha-&gt;pcidev,</div><div class='ctx'> 			   "Unable to install interrupt handler\n");</div><div class='ctx'> 		return ips_abort_init(ha, index);</div><div class='head'>diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c<br/>index 2068b66822b7..848fb2aa4ca3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_tcp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/iscsi_tcp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_tcp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/iscsi_tcp.c</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 Dmitry Yusupov</div><div class='ctx'>  * Copyright (C) 2004 Alex Aizman</div><div class='del'>- * Copyright (C) 2005 Mike Christie</div><div class='add'>+ * Copyright (C) 2005 - 2006 Mike Christie</div><div class='add'>+ * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.</div><div class='ctx'>  * maintained by open-iscsi@googlegroups.com</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -36,37 +37,28 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_device.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_eh.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_tcq.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport_iscsi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iscsi_tcp.h"</div><div class='ctx'> </div><div class='add'>+#define ISCSI_TCP_VERSION "1.0-595"</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Dmitry Yusupov &lt;dmitry_yus@yahoo.com&gt;, "</div><div class='ctx'> 	      "Alex Aizman &lt;itn780@yahoo.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("iSCSI/TCP data-path");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION("0:4.445");</div><div class='add'>+MODULE_VERSION(ISCSI_TCP_VERSION);</div><div class='ctx'> /* #define DEBUG_TCP */</div><div class='del'>-/* #define DEBUG_SCSI */</div><div class='ctx'> #define DEBUG_ASSERT</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_TCP</div><div class='del'>-#define debug_tcp(fmt...) printk(KERN_DEBUG "tcp: " fmt)</div><div class='add'>+#define debug_tcp(fmt...) printk(KERN_INFO "tcp: " fmt)</div><div class='ctx'> #else</div><div class='ctx'> #define debug_tcp(fmt...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_SCSI</div><div class='del'>-#define debug_scsi(fmt...) printk(KERN_DEBUG "scsi: " fmt)</div><div class='del'>-#else</div><div class='del'>-#define debug_scsi(fmt...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef DEBUG_ASSERT</div><div class='ctx'> #ifdef BUG_ON</div><div class='ctx'> #undef BUG_ON</div><div class='hunk'>@@ -74,22 +66,9 @@ MODULE_VERSION("0:4.445");</div><div class='ctx'> #define BUG_ON(expr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define INVALID_SN_DELTA	0xffff</div><div class='del'>-</div><div class='ctx'> static unsigned int iscsi_max_lun = 512;</div><div class='ctx'> module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);</div><div class='ctx'> </div><div class='del'>-/* global data */</div><div class='del'>-static kmem_cache_t *taskcache;</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-iscsi_buf_init_virt(struct iscsi_buf *ibuf, char *vbuf, int size)</div><div class='del'>-{</div><div class='del'>-	sg_init_one(&amp;ibuf-&gt;sg, (u8 *)vbuf, size);</div><div class='del'>-	ibuf-&gt;sent = 0;</div><div class='del'>-	ibuf-&gt;use_sendmsg = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void</div><div class='ctx'> iscsi_buf_init_iov(struct iscsi_buf *ibuf, char *vbuf, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -130,68 +109,39 @@ static inline void</div><div class='ctx'> iscsi_hdr_digest(struct iscsi_conn *conn, struct iscsi_buf *buf,</div><div class='ctx'> 		 u8* crc)</div><div class='ctx'> {</div><div class='del'>-	crypto_digest_digest(conn-&gt;tx_tfm, &amp;buf-&gt;sg, 1, crc);</div><div class='del'>-	buf-&gt;sg.length += sizeof(uint32_t);</div><div class='del'>-}</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)</div><div class='del'>-{</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;session-&gt;lock, flags);</div><div class='del'>-	if (session-&gt;conn_cnt == 1 || session-&gt;leadconn == conn)</div><div class='del'>-		session-&gt;state = ISCSI_STATE_FAILED;</div><div class='del'>-	spin_unlock_irqrestore(&amp;session-&gt;lock, flags);</div><div class='del'>-	set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='del'>-	set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='del'>-	iscsi_conn_error(conn-&gt;cls_conn, err);</div><div class='add'>+	crypto_digest_digest(tcp_conn-&gt;tx_tfm, &amp;buf-&gt;sg, 1, crc);</div><div class='add'>+	buf-&gt;sg.length += sizeof(uint32_t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-iscsi_check_assign_cmdsn(struct iscsi_session *session, struct iscsi_nopin *hdr)</div><div class='add'>+iscsi_hdr_extract(struct iscsi_tcp_conn *tcp_conn)</div><div class='ctx'> {</div><div class='del'>-	uint32_t max_cmdsn = be32_to_cpu(hdr-&gt;max_cmdsn);</div><div class='del'>-	uint32_t exp_cmdsn = be32_to_cpu(hdr-&gt;exp_cmdsn);</div><div class='del'>-</div><div class='del'>-	if (max_cmdsn &lt; exp_cmdsn -1 &amp;&amp;</div><div class='del'>-	    max_cmdsn &gt; exp_cmdsn - INVALID_SN_DELTA)</div><div class='del'>-		return ISCSI_ERR_MAX_CMDSN;</div><div class='del'>-	if (max_cmdsn &gt; session-&gt;max_cmdsn ||</div><div class='del'>-	    max_cmdsn &lt; session-&gt;max_cmdsn - INVALID_SN_DELTA)</div><div class='del'>-		session-&gt;max_cmdsn = max_cmdsn;</div><div class='del'>-	if (exp_cmdsn &gt; session-&gt;exp_cmdsn ||</div><div class='del'>-	    exp_cmdsn &lt; session-&gt;exp_cmdsn - INVALID_SN_DELTA)</div><div class='del'>-		session-&gt;exp_cmdsn = exp_cmdsn;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct sk_buff *skb = tcp_conn-&gt;in.skb;</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-iscsi_hdr_extract(struct iscsi_conn *conn)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = conn-&gt;in.skb;</div><div class='add'>+	tcp_conn-&gt;in.zero_copy_hdr = 0;</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in.copy &gt;= conn-&gt;hdr_size &amp;&amp;</div><div class='del'>-	    conn-&gt;in_progress == IN_PROGRESS_WAIT_HEADER) {</div><div class='add'>+	if (tcp_conn-&gt;in.copy &gt;= tcp_conn-&gt;hdr_size &amp;&amp;</div><div class='add'>+	    tcp_conn-&gt;in_progress == IN_PROGRESS_WAIT_HEADER) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Zero-copy PDU Header: using connection context</div><div class='ctx'> 		 * to store header pointer.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (skb_shinfo(skb)-&gt;frag_list == NULL &amp;&amp;</div><div class='del'>-		    !skb_shinfo(skb)-&gt;nr_frags)</div><div class='del'>-			conn-&gt;in.hdr = (struct iscsi_hdr *)</div><div class='del'>-				((char*)skb-&gt;data + conn-&gt;in.offset);</div><div class='del'>-		else {</div><div class='add'>+		    !skb_shinfo(skb)-&gt;nr_frags) {</div><div class='add'>+			tcp_conn-&gt;in.hdr = (struct iscsi_hdr *)</div><div class='add'>+				((char*)skb-&gt;data + tcp_conn-&gt;in.offset);</div><div class='add'>+			tcp_conn-&gt;in.zero_copy_hdr = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			/* ignoring return code since we checked</div><div class='ctx'> 			 * in.copy before */</div><div class='del'>-			skb_copy_bits(skb, conn-&gt;in.offset,</div><div class='del'>-				&amp;conn-&gt;hdr, conn-&gt;hdr_size);</div><div class='del'>-			conn-&gt;in.hdr = &amp;conn-&gt;hdr;</div><div class='add'>+			skb_copy_bits(skb, tcp_conn-&gt;in.offset,</div><div class='add'>+				&amp;tcp_conn-&gt;hdr, tcp_conn-&gt;hdr_size);</div><div class='add'>+			tcp_conn-&gt;in.hdr = &amp;tcp_conn-&gt;hdr;</div><div class='ctx'> 		}</div><div class='del'>-		conn-&gt;in.offset += conn-&gt;hdr_size;</div><div class='del'>-		conn-&gt;in.copy -= conn-&gt;hdr_size;</div><div class='add'>+		tcp_conn-&gt;in.offset += tcp_conn-&gt;hdr_size;</div><div class='add'>+		tcp_conn-&gt;in.copy -= tcp_conn-&gt;hdr_size;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int hdr_remains;</div><div class='ctx'> 		int copylen;</div><div class='hunk'>@@ -201,118 +151,51 @@ iscsi_hdr_extract(struct iscsi_conn *conn)</div><div class='ctx'> 		 * copying it... This'll happen quite rarely.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		if (conn-&gt;in_progress == IN_PROGRESS_WAIT_HEADER)</div><div class='del'>-			conn-&gt;in.hdr_offset = 0;</div><div class='add'>+		if (tcp_conn-&gt;in_progress == IN_PROGRESS_WAIT_HEADER)</div><div class='add'>+			tcp_conn-&gt;in.hdr_offset = 0;</div><div class='ctx'> </div><div class='del'>-		hdr_remains = conn-&gt;hdr_size - conn-&gt;in.hdr_offset;</div><div class='add'>+		hdr_remains = tcp_conn-&gt;hdr_size - tcp_conn-&gt;in.hdr_offset;</div><div class='ctx'> 		BUG_ON(hdr_remains &lt;= 0);</div><div class='ctx'> </div><div class='del'>-		copylen = min(conn-&gt;in.copy, hdr_remains);</div><div class='del'>-		skb_copy_bits(skb, conn-&gt;in.offset,</div><div class='del'>-			(char*)&amp;conn-&gt;hdr + conn-&gt;in.hdr_offset, copylen);</div><div class='add'>+		copylen = min(tcp_conn-&gt;in.copy, hdr_remains);</div><div class='add'>+		skb_copy_bits(skb, tcp_conn-&gt;in.offset,</div><div class='add'>+			(char*)&amp;tcp_conn-&gt;hdr + tcp_conn-&gt;in.hdr_offset,</div><div class='add'>+			copylen);</div><div class='ctx'> </div><div class='ctx'> 		debug_tcp("PDU gather offset %d bytes %d in.offset %d "</div><div class='del'>-		       "in.copy %d\n", conn-&gt;in.hdr_offset, copylen,</div><div class='del'>-		       conn-&gt;in.offset, conn-&gt;in.copy);</div><div class='add'>+		       "in.copy %d\n", tcp_conn-&gt;in.hdr_offset, copylen,</div><div class='add'>+		       tcp_conn-&gt;in.offset, tcp_conn-&gt;in.copy);</div><div class='ctx'> </div><div class='del'>-		conn-&gt;in.offset += copylen;</div><div class='del'>-		conn-&gt;in.copy -= copylen;</div><div class='add'>+		tcp_conn-&gt;in.offset += copylen;</div><div class='add'>+		tcp_conn-&gt;in.copy -= copylen;</div><div class='ctx'> 		if (copylen &lt; hdr_remains)  {</div><div class='del'>-			conn-&gt;in_progress = IN_PROGRESS_HEADER_GATHER;</div><div class='del'>-			conn-&gt;in.hdr_offset += copylen;</div><div class='add'>+			tcp_conn-&gt;in_progress = IN_PROGRESS_HEADER_GATHER;</div><div class='add'>+			tcp_conn-&gt;in.hdr_offset += copylen;</div><div class='ctx'> 		        return -EAGAIN;</div><div class='ctx'> 		}</div><div class='del'>-		conn-&gt;in.hdr = &amp;conn-&gt;hdr;</div><div class='del'>-		conn-&gt;discontiguous_hdr_cnt++;</div><div class='del'>-	        conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='add'>+		tcp_conn-&gt;in.hdr = &amp;tcp_conn-&gt;hdr;</div><div class='add'>+		tcp_conn-&gt;discontiguous_hdr_cnt++;</div><div class='add'>+	        tcp_conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-iscsi_ctask_cleanup(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='add'>+/*</div><div class='add'>+ * must be called with session lock</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+__iscsi_ctask_cleanup(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct scsi_cmnd *sc;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;session-&gt;lock);</div><div class='del'>-	if (unlikely(!sc)) {</div><div class='del'>-		spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+	sc = ctask-&gt;sc;</div><div class='add'>+	if (unlikely(!sc))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-	if (sc-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='del'>-		struct iscsi_data_task *dtask, *n;</div><div class='del'>-		/* WRITE: cleanup Data-Out's if any */</div><div class='del'>-		list_for_each_entry_safe(dtask, n, &amp;ctask-&gt;dataqueue, item) {</div><div class='del'>-			list_del(&amp;dtask-&gt;item);</div><div class='del'>-			mempool_free(dtask, ctask-&gt;datapool);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ctask-&gt;xmstate = XMSTATE_IDLE;</div><div class='del'>-	ctask-&gt;r2t = NULL;</div><div class='del'>-	ctask-&gt;sc = NULL;</div><div class='del'>-	__kfifo_put(session-&gt;cmdpool.queue, (void*)&amp;ctask, sizeof(void*));</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iscsi_cmd_rsp - SCSI Command Response processing</div><div class='del'>- * @conn: iscsi connection</div><div class='del'>- * @ctask: scsi command task</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-iscsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-	struct iscsi_cmd_rsp *rhdr = (struct iscsi_cmd_rsp *)conn-&gt;in.hdr;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='ctx'> </div><div class='del'>-	rc = iscsi_check_assign_cmdsn(session, (struct iscsi_nopin*)rhdr);</div><div class='del'>-	if (rc) {</div><div class='del'>-		sc-&gt;result = (DID_ERROR &lt;&lt; 16);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conn-&gt;exp_statsn = be32_to_cpu(rhdr-&gt;statsn) + 1;</div><div class='del'>-</div><div class='del'>-	sc-&gt;result = (DID_OK &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='del'>-</div><div class='del'>-	if (rhdr-&gt;response != ISCSI_STATUS_CMD_COMPLETED) {</div><div class='del'>-		sc-&gt;result = (DID_ERROR &lt;&lt; 16);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rhdr-&gt;cmd_status == SAM_STAT_CHECK_CONDITION &amp;&amp; conn-&gt;senselen) {</div><div class='del'>-		int sensecopy = min(conn-&gt;senselen, SCSI_SENSE_BUFFERSIZE);</div><div class='del'>-</div><div class='del'>-		memcpy(sc-&gt;sense_buffer, conn-&gt;data + 2, sensecopy);</div><div class='del'>-		debug_scsi("copied %d bytes of sense\n", sensecopy);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sc-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_UNDERFLOW) {</div><div class='del'>-		int res_count = be32_to_cpu(rhdr-&gt;residual_count);</div><div class='del'>-</div><div class='del'>-		if (res_count &gt; 0 &amp;&amp; res_count &lt;= sc-&gt;request_bufflen)</div><div class='del'>-			sc-&gt;resid = res_count;</div><div class='del'>-		else</div><div class='del'>-			sc-&gt;result = (DID_BAD_TARGET &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='del'>-	} else if (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_BIDI_UNDERFLOW)</div><div class='del'>-		sc-&gt;result = (DID_BAD_TARGET &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='del'>-	else if (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_OVERFLOW)</div><div class='del'>-		sc-&gt;resid = be32_to_cpu(rhdr-&gt;residual_count);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	debug_scsi("done [sc %lx res %d itt 0x%x]\n",</div><div class='del'>-		   (long)sc, sc-&gt;result, ctask-&gt;itt);</div><div class='del'>-	conn-&gt;scsirsp_pdus_cnt++;</div><div class='del'>-	iscsi_ctask_cleanup(conn, ctask);</div><div class='del'>-	sc-&gt;scsi_done(sc);</div><div class='del'>-	return rc;</div><div class='add'>+	tcp_ctask-&gt;xmstate = XMSTATE_IDLE;</div><div class='add'>+	tcp_ctask-&gt;r2t = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -324,7 +207,9 @@ static int</div><div class='ctx'> iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)conn-&gt;in.hdr;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn-&gt;in.hdr;</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='ctx'> 	int datasn = be32_to_cpu(rhdr-&gt;datasn);</div><div class='ctx'> </div><div class='hunk'>@@ -334,9 +219,9 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * setup Data-In byte counter (gets decremented..)</div><div class='ctx'> 	 */</div><div class='del'>-	ctask-&gt;data_count = conn-&gt;in.datalen;</div><div class='add'>+	ctask-&gt;data_count = tcp_conn-&gt;in.datalen;</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in.datalen == 0)</div><div class='add'>+	if (tcp_conn-&gt;in.datalen == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ctask-&gt;datasn != datasn)</div><div class='hunk'>@@ -344,8 +229,8 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> </div><div class='ctx'> 	ctask-&gt;datasn++;</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;data_offset = be32_to_cpu(rhdr-&gt;offset);</div><div class='del'>-	if (ctask-&gt;data_offset + conn-&gt;in.datalen &gt; ctask-&gt;total_length)</div><div class='add'>+	tcp_ctask-&gt;data_offset = be32_to_cpu(rhdr-&gt;offset);</div><div class='add'>+	if (tcp_ctask-&gt;data_offset + tcp_conn-&gt;in.datalen &gt; ctask-&gt;total_length)</div><div class='ctx'> 		return ISCSI_ERR_DATA_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	if (rhdr-&gt;flags &amp; ISCSI_FLAG_DATA_STATUS) {</div><div class='hunk'>@@ -390,19 +275,17 @@ iscsi_solicit_data_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> 			struct iscsi_r2t_info *r2t)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_data *hdr;</div><div class='del'>-	struct iscsi_data_task *dtask;</div><div class='ctx'> 	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> </div><div class='del'>-	dtask = mempool_alloc(ctask-&gt;datapool, GFP_ATOMIC);</div><div class='del'>-	BUG_ON(!dtask);</div><div class='del'>-	hdr = &amp;dtask-&gt;hdr;</div><div class='add'>+	hdr = &amp;r2t-&gt;dtask.hdr;</div><div class='ctx'> 	memset(hdr, 0, sizeof(struct iscsi_data));</div><div class='ctx'> 	hdr-&gt;ttt = r2t-&gt;ttt;</div><div class='ctx'> 	hdr-&gt;datasn = cpu_to_be32(r2t-&gt;solicit_datasn);</div><div class='ctx'> 	r2t-&gt;solicit_datasn++;</div><div class='ctx'> 	hdr-&gt;opcode = ISCSI_OP_SCSI_DATA_OUT;</div><div class='del'>-	memcpy(hdr-&gt;lun, ctask-&gt;hdr.lun, sizeof(hdr-&gt;lun));</div><div class='del'>-	hdr-&gt;itt = ctask-&gt;hdr.itt;</div><div class='add'>+	memcpy(hdr-&gt;lun, ctask-&gt;hdr-&gt;lun, sizeof(hdr-&gt;lun));</div><div class='add'>+	hdr-&gt;itt = ctask-&gt;hdr-&gt;itt;</div><div class='ctx'> 	hdr-&gt;exp_statsn = r2t-&gt;exp_statsn;</div><div class='ctx'> 	hdr-&gt;offset = cpu_to_be32(r2t-&gt;data_offset);</div><div class='ctx'> 	if (r2t-&gt;data_length &gt; conn-&gt;max_xmit_dlength) {</div><div class='hunk'>@@ -418,11 +301,9 @@ iscsi_solicit_data_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> </div><div class='ctx'> 	r2t-&gt;sent = 0;</div><div class='ctx'> </div><div class='del'>-	iscsi_buf_init_virt(&amp;r2t-&gt;headbuf, (char*)hdr,</div><div class='add'>+	iscsi_buf_init_iov(&amp;r2t-&gt;headbuf, (char*)hdr,</div><div class='ctx'> 			   sizeof(struct iscsi_hdr));</div><div class='ctx'> </div><div class='del'>-	r2t-&gt;dtask = dtask;</div><div class='del'>-</div><div class='ctx'> 	if (sc-&gt;use_sg) {</div><div class='ctx'> 		int i, sg_count = 0;</div><div class='ctx'> 		struct scatterlist *sg = sc-&gt;request_buffer;</div><div class='hunk'>@@ -451,11 +332,9 @@ iscsi_solicit_data_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> 		}</div><div class='ctx'> 		BUG_ON(r2t-&gt;sg == NULL);</div><div class='ctx'> 	} else</div><div class='del'>-		iscsi_buf_init_iov(&amp;ctask-&gt;sendbuf,</div><div class='add'>+		iscsi_buf_init_iov(&amp;tcp_ctask-&gt;sendbuf,</div><div class='ctx'> 			    (char*)sc-&gt;request_buffer + r2t-&gt;data_offset,</div><div class='ctx'> 			    r2t-&gt;data_count);</div><div class='del'>-</div><div class='del'>-	list_add(&amp;dtask-&gt;item, &amp;ctask-&gt;dataqueue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -468,17 +347,16 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_r2t_info *r2t;</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	struct iscsi_r2t_rsp *rhdr = (struct iscsi_r2t_rsp *)conn-&gt;in.hdr;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_r2t_rsp *rhdr = (struct iscsi_r2t_rsp *)tcp_conn-&gt;in.hdr;</div><div class='ctx'> 	int r2tsn = be32_to_cpu(rhdr-&gt;r2tsn);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in.ahslen)</div><div class='del'>-		return ISCSI_ERR_AHSLEN;</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;in.datalen)</div><div class='add'>+	if (tcp_conn-&gt;in.datalen)</div><div class='ctx'> 		return ISCSI_ERR_DATALEN;</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;exp_r2tsn &amp;&amp; ctask-&gt;exp_r2tsn != r2tsn)</div><div class='add'>+	if (tcp_ctask-&gt;exp_r2tsn &amp;&amp; tcp_ctask-&gt;exp_r2tsn != r2tsn)</div><div class='ctx'> 		return ISCSI_ERR_R2TSN;</div><div class='ctx'> </div><div class='ctx'> 	rc = iscsi_check_assign_cmdsn(session, (struct iscsi_nopin*)rhdr);</div><div class='hunk'>@@ -496,7 +374,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> 		spin_unlock(&amp;session-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	rc = __kfifo_get(ctask-&gt;r2tpool.queue, (void*)&amp;r2t, sizeof(void*));</div><div class='add'>+	rc = __kfifo_get(tcp_ctask-&gt;r2tpool.queue, (void*)&amp;r2t, sizeof(void*));</div><div class='ctx'> 	BUG_ON(!rc);</div><div class='ctx'> </div><div class='ctx'> 	r2t-&gt;exp_statsn = rhdr-&gt;statsn;</div><div class='hunk'>@@ -518,10 +396,10 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> </div><div class='ctx'> 	iscsi_solicit_data_init(conn, ctask, r2t);</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;exp_r2tsn = r2tsn + 1;</div><div class='del'>-	ctask-&gt;xmstate |= XMSTATE_SOL_HDR;</div><div class='del'>-	__kfifo_put(ctask-&gt;r2tqueue, (void*)&amp;r2t, sizeof(void*));</div><div class='del'>-	__kfifo_put(conn-&gt;writequeue, (void*)&amp;ctask, sizeof(void*));</div><div class='add'>+	tcp_ctask-&gt;exp_r2tsn = r2tsn + 1;</div><div class='add'>+	tcp_ctask-&gt;xmstate |= XMSTATE_SOL_HDR;</div><div class='add'>+	__kfifo_put(tcp_ctask-&gt;r2tqueue, (void*)&amp;r2t, sizeof(void*));</div><div class='add'>+	__kfifo_put(conn-&gt;xmitqueue, (void*)&amp;ctask, sizeof(void*));</div><div class='ctx'> </div><div class='ctx'> 	scsi_queue_work(session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='ctx'> 	conn-&gt;r2t_pdus_cnt++;</div><div class='hunk'>@@ -531,258 +409,136 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iscsi_hdr_recv(struct iscsi_conn *conn)</div><div class='add'>+iscsi_tcp_hdr_recv(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='add'>+	int rc = 0, opcode, ahslen;</div><div class='ctx'> 	struct iscsi_hdr *hdr;</div><div class='del'>-	struct iscsi_cmd_task *ctask;</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	uint32_t cdgst, rdgst = 0;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	uint32_t cdgst, rdgst = 0, itt;</div><div class='ctx'> </div><div class='del'>-	hdr = conn-&gt;in.hdr;</div><div class='add'>+	hdr = tcp_conn-&gt;in.hdr;</div><div class='ctx'> </div><div class='ctx'> 	/* verify PDU length */</div><div class='del'>-	conn-&gt;in.datalen = ntoh24(hdr-&gt;dlength);</div><div class='del'>-	if (conn-&gt;in.datalen &gt; conn-&gt;max_recv_dlength) {</div><div class='add'>+	tcp_conn-&gt;in.datalen = ntoh24(hdr-&gt;dlength);</div><div class='add'>+	if (tcp_conn-&gt;in.datalen &gt; conn-&gt;max_recv_dlength) {</div><div class='ctx'> 		printk(KERN_ERR "iscsi_tcp: datalen %d &gt; %d\n",</div><div class='del'>-		       conn-&gt;in.datalen, conn-&gt;max_recv_dlength);</div><div class='add'>+		       tcp_conn-&gt;in.datalen, conn-&gt;max_recv_dlength);</div><div class='ctx'> 		return ISCSI_ERR_DATALEN;</div><div class='ctx'> 	}</div><div class='del'>-	conn-&gt;data_copied = 0;</div><div class='add'>+	tcp_conn-&gt;data_copied = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* read AHS */</div><div class='del'>-	conn-&gt;in.ahslen = hdr-&gt;hlength * 4;</div><div class='del'>-	conn-&gt;in.offset += conn-&gt;in.ahslen;</div><div class='del'>-	conn-&gt;in.copy -= conn-&gt;in.ahslen;</div><div class='del'>-	if (conn-&gt;in.copy &lt; 0) {</div><div class='add'>+	ahslen = hdr-&gt;hlength &lt;&lt; 2;</div><div class='add'>+	tcp_conn-&gt;in.offset += ahslen;</div><div class='add'>+	tcp_conn-&gt;in.copy -= ahslen;</div><div class='add'>+	if (tcp_conn-&gt;in.copy &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "iscsi_tcp: can't handle AHS with length "</div><div class='del'>-		       "%d bytes\n", conn-&gt;in.ahslen);</div><div class='add'>+		       "%d bytes\n", ahslen);</div><div class='ctx'> 		return ISCSI_ERR_AHSLEN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* calculate read padding */</div><div class='del'>-	conn-&gt;in.padding = conn-&gt;in.datalen &amp; (ISCSI_PAD_LEN-1);</div><div class='del'>-	if (conn-&gt;in.padding) {</div><div class='del'>-		conn-&gt;in.padding = ISCSI_PAD_LEN - conn-&gt;in.padding;</div><div class='del'>-		debug_scsi("read padding %d bytes\n", conn-&gt;in.padding);</div><div class='add'>+	tcp_conn-&gt;in.padding = tcp_conn-&gt;in.datalen &amp; (ISCSI_PAD_LEN-1);</div><div class='add'>+	if (tcp_conn-&gt;in.padding) {</div><div class='add'>+		tcp_conn-&gt;in.padding = ISCSI_PAD_LEN - tcp_conn-&gt;in.padding;</div><div class='add'>+		debug_scsi("read padding %d bytes\n", tcp_conn-&gt;in.padding);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;hdrdgst_en) {</div><div class='ctx'> 		struct scatterlist sg;</div><div class='ctx'> </div><div class='ctx'> 		sg_init_one(&amp;sg, (u8 *)hdr,</div><div class='del'>-			    sizeof(struct iscsi_hdr) + conn-&gt;in.ahslen);</div><div class='del'>-		crypto_digest_digest(conn-&gt;rx_tfm, &amp;sg, 1, (u8 *)&amp;cdgst);</div><div class='add'>+			    sizeof(struct iscsi_hdr) + ahslen);</div><div class='add'>+		crypto_digest_digest(tcp_conn-&gt;rx_tfm, &amp;sg, 1, (u8 *)&amp;cdgst);</div><div class='ctx'> 		rdgst = *(uint32_t*)((char*)hdr + sizeof(struct iscsi_hdr) +</div><div class='del'>-				     conn-&gt;in.ahslen);</div><div class='add'>+				     ahslen);</div><div class='ctx'> 		if (cdgst != rdgst) {</div><div class='del'>-			printk(KERN_ERR "iscsi_tcp: itt %x: hdrdgst error "</div><div class='del'>-			       "recv 0x%x calc 0x%x\n", conn-&gt;in.itt, rdgst,</div><div class='del'>-			       cdgst);</div><div class='add'>+			printk(KERN_ERR "iscsi_tcp: hdrdgst error "</div><div class='add'>+			       "recv 0x%x calc 0x%x\n", rdgst, cdgst);</div><div class='ctx'> 			return ISCSI_ERR_HDR_DGST;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* save opcode for later */</div><div class='del'>-	conn-&gt;in.opcode = hdr-&gt;opcode &amp; ISCSI_OPCODE_MASK;</div><div class='del'>-</div><div class='add'>+	opcode = hdr-&gt;opcode &amp; ISCSI_OPCODE_MASK;</div><div class='ctx'> 	/* verify itt (itt encoding: age+cid+itt) */</div><div class='del'>-	if (hdr-&gt;itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='del'>-		if ((hdr-&gt;itt &amp; AGE_MASK) !=</div><div class='del'>-				(session-&gt;age &lt;&lt; AGE_SHIFT)) {</div><div class='del'>-			printk(KERN_ERR "iscsi_tcp: received itt %x expected "</div><div class='del'>-				"session age (%x)\n", hdr-&gt;itt,</div><div class='del'>-				session-&gt;age &amp; AGE_MASK);</div><div class='del'>-			return ISCSI_ERR_BAD_ITT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((hdr-&gt;itt &amp; CID_MASK) != (conn-&gt;id &lt;&lt; CID_SHIFT)) {</div><div class='del'>-			printk(KERN_ERR "iscsi_tcp: received itt %x, expected "</div><div class='del'>-				"CID (%x)\n", hdr-&gt;itt, conn-&gt;id);</div><div class='del'>-			return ISCSI_ERR_BAD_ITT;</div><div class='del'>-		}</div><div class='del'>-		conn-&gt;in.itt = hdr-&gt;itt &amp; ITT_MASK;</div><div class='del'>-	} else</div><div class='del'>-		conn-&gt;in.itt = hdr-&gt;itt;</div><div class='add'>+	rc = iscsi_verify_itt(conn, hdr, &amp;itt);</div><div class='add'>+	if (rc == ISCSI_ERR_NO_SCSI_CMD) {</div><div class='add'>+		tcp_conn-&gt;in.datalen = 0; /* force drop */</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	debug_tcp("opcode 0x%x offset %d copy %d ahslen %d datalen %d\n",</div><div class='del'>-		  hdr-&gt;opcode, conn-&gt;in.offset, conn-&gt;in.copy,</div><div class='del'>-		  conn-&gt;in.ahslen, conn-&gt;in.datalen);</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;in.itt &lt; session-&gt;cmds_max) {</div><div class='del'>-		ctask = (struct iscsi_cmd_task *)session-&gt;cmds[conn-&gt;in.itt];</div><div class='del'>-</div><div class='del'>-		if (!ctask-&gt;sc) {</div><div class='del'>-			printk(KERN_INFO "iscsi_tcp: dropping ctask with "</div><div class='del'>-			       "itt 0x%x\n", ctask-&gt;itt);</div><div class='del'>-			conn-&gt;in.datalen = 0; /* force drop */</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ctask-&gt;sc-&gt;SCp.phase != session-&gt;age) {</div><div class='del'>-			printk(KERN_ERR "iscsi_tcp: ctask's session age %d, "</div><div class='del'>-				"expected %d\n", ctask-&gt;sc-&gt;SCp.phase,</div><div class='del'>-				session-&gt;age);</div><div class='del'>-			return ISCSI_ERR_SESSION_FAILED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		conn-&gt;in.ctask = ctask;</div><div class='del'>-</div><div class='del'>-		debug_scsi("rsp [op 0x%x cid %d sc %lx itt 0x%x len %d]\n",</div><div class='del'>-			   hdr-&gt;opcode, conn-&gt;id, (long)ctask-&gt;sc,</div><div class='del'>-			   ctask-&gt;itt, conn-&gt;in.datalen);</div><div class='del'>-</div><div class='del'>-		switch(conn-&gt;in.opcode) {</div><div class='del'>-		case ISCSI_OP_SCSI_CMD_RSP:</div><div class='del'>-			BUG_ON((void*)ctask != ctask-&gt;sc-&gt;SCp.ptr);</div><div class='del'>-			if (!conn-&gt;in.datalen)</div><div class='del'>-				rc = iscsi_cmd_rsp(conn, ctask);</div><div class='del'>-			else</div><div class='del'>-				/*</div><div class='del'>-				 * got sense or response data; copying PDU</div><div class='del'>-				 * Header to the connection's header</div><div class='del'>-				 * placeholder</div><div class='del'>-				 */</div><div class='del'>-				memcpy(&amp;conn-&gt;hdr, hdr,</div><div class='del'>-				       sizeof(struct iscsi_hdr));</div><div class='del'>-			break;</div><div class='del'>-		case ISCSI_OP_SCSI_DATA_IN:</div><div class='del'>-			BUG_ON((void*)ctask != ctask-&gt;sc-&gt;SCp.ptr);</div><div class='del'>-			/* save flags for non-exceptional status */</div><div class='del'>-			conn-&gt;in.flags = hdr-&gt;flags;</div><div class='del'>-			/* save cmd_status for sense data */</div><div class='del'>-			conn-&gt;in.cmd_status =</div><div class='del'>-				((struct iscsi_data_rsp*)hdr)-&gt;cmd_status;</div><div class='del'>-			rc = iscsi_data_rsp(conn, ctask);</div><div class='del'>-			break;</div><div class='del'>-		case ISCSI_OP_R2T:</div><div class='del'>-			BUG_ON((void*)ctask != ctask-&gt;sc-&gt;SCp.ptr);</div><div class='del'>-			if (ctask-&gt;sc-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='del'>-				rc = iscsi_r2t_rsp(conn, ctask);</div><div class='del'>-			else</div><div class='del'>-				rc = ISCSI_ERR_PROTO;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (conn-&gt;in.itt &gt;= ISCSI_MGMT_ITT_OFFSET &amp;&amp;</div><div class='del'>-		   conn-&gt;in.itt &lt; ISCSI_MGMT_ITT_OFFSET +</div><div class='del'>-					session-&gt;mgmtpool_max) {</div><div class='del'>-		struct iscsi_mgmt_task *mtask = (struct iscsi_mgmt_task *)</div><div class='del'>-					session-&gt;mgmt_cmds[conn-&gt;in.itt -</div><div class='del'>-						ISCSI_MGMT_ITT_OFFSET];</div><div class='del'>-</div><div class='del'>-		debug_scsi("immrsp [op 0x%x cid %d itt 0x%x len %d]\n",</div><div class='del'>-			   conn-&gt;in.opcode, conn-&gt;id, mtask-&gt;itt,</div><div class='del'>-			   conn-&gt;in.datalen);</div><div class='del'>-</div><div class='del'>-		switch(conn-&gt;in.opcode) {</div><div class='del'>-		case ISCSI_OP_LOGIN_RSP:</div><div class='del'>-		case ISCSI_OP_TEXT_RSP:</div><div class='del'>-		case ISCSI_OP_LOGOUT_RSP:</div><div class='del'>-			rc = iscsi_check_assign_cmdsn(session,</div><div class='del'>-						 (struct iscsi_nopin*)hdr);</div><div class='del'>-			if (rc)</div><div class='del'>-				break;</div><div class='add'>+		  opcode, tcp_conn-&gt;in.offset, tcp_conn-&gt;in.copy,</div><div class='add'>+		  ahslen, tcp_conn-&gt;in.datalen);</div><div class='ctx'> </div><div class='del'>-			if (!conn-&gt;in.datalen) {</div><div class='del'>-				rc = iscsi_recv_pdu(conn-&gt;cls_conn, hdr,</div><div class='del'>-						    NULL, 0);</div><div class='del'>-				if (conn-&gt;login_mtask != mtask) {</div><div class='del'>-					spin_lock(&amp;session-&gt;lock);</div><div class='del'>-					__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-					    (void*)&amp;mtask, sizeof(void*));</div><div class='del'>-					spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case ISCSI_OP_SCSI_TMFUNC_RSP:</div><div class='del'>-			rc = iscsi_check_assign_cmdsn(session,</div><div class='del'>-						 (struct iscsi_nopin*)hdr);</div><div class='del'>-			if (rc)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			if (conn-&gt;in.datalen || conn-&gt;in.ahslen) {</div><div class='del'>-				rc = ISCSI_ERR_PROTO;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			conn-&gt;tmfrsp_pdus_cnt++;</div><div class='del'>-			spin_lock(&amp;session-&gt;lock);</div><div class='del'>-			if (conn-&gt;tmabort_state == TMABORT_INITIAL) {</div><div class='del'>-				__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-						(void*)&amp;mtask, sizeof(void*));</div><div class='del'>-				conn-&gt;tmabort_state =</div><div class='del'>-					((struct iscsi_tm_rsp *)hdr)-&gt;</div><div class='del'>-					response == ISCSI_TMF_RSP_COMPLETE ?</div><div class='del'>-						TMABORT_SUCCESS:TMABORT_FAILED;</div><div class='del'>-				/* unblock eh_abort() */</div><div class='del'>-				wake_up(&amp;conn-&gt;ehwait);</div><div class='del'>-			}</div><div class='del'>-			spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-			break;</div><div class='del'>-		case ISCSI_OP_NOOP_IN:</div><div class='del'>-			if (hdr-&gt;ttt != ISCSI_RESERVED_TAG) {</div><div class='del'>-				rc = ISCSI_ERR_PROTO;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			rc = iscsi_check_assign_cmdsn(session,</div><div class='del'>-						(struct iscsi_nopin*)hdr);</div><div class='del'>-			if (rc)</div><div class='del'>-				break;</div><div class='del'>-			conn-&gt;exp_statsn = be32_to_cpu(hdr-&gt;statsn) + 1;</div><div class='del'>-</div><div class='del'>-			if (!conn-&gt;in.datalen) {</div><div class='del'>-				struct iscsi_mgmt_task *mtask;</div><div class='del'>-</div><div class='del'>-				rc = iscsi_recv_pdu(conn-&gt;cls_conn, hdr,</div><div class='del'>-						    NULL, 0);</div><div class='del'>-				mtask = (struct iscsi_mgmt_task *)</div><div class='del'>-					session-&gt;mgmt_cmds[conn-&gt;in.itt -</div><div class='del'>-							ISCSI_MGMT_ITT_OFFSET];</div><div class='del'>-				if (conn-&gt;login_mtask != mtask) {</div><div class='del'>-					spin_lock(&amp;session-&gt;lock);</div><div class='del'>-					__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-						  (void*)&amp;mtask, sizeof(void*));</div><div class='del'>-					spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (conn-&gt;in.itt == ISCSI_RESERVED_TAG) {</div><div class='del'>-		switch(conn-&gt;in.opcode) {</div><div class='del'>-		case ISCSI_OP_NOOP_IN:</div><div class='del'>-			if (!conn-&gt;in.datalen) {</div><div class='del'>-				rc = iscsi_check_assign_cmdsn(session,</div><div class='del'>-						 (struct iscsi_nopin*)hdr);</div><div class='del'>-				if (!rc &amp;&amp; hdr-&gt;ttt != ISCSI_RESERVED_TAG)</div><div class='del'>-					rc = iscsi_recv_pdu(conn-&gt;cls_conn,</div><div class='del'>-							    hdr, NULL, 0);</div><div class='del'>-			} else</div><div class='del'>-				rc = ISCSI_ERR_PROTO;</div><div class='del'>-			break;</div><div class='del'>-		case ISCSI_OP_REJECT:</div><div class='del'>-			/* we need sth like iscsi_reject_rsp()*/</div><div class='del'>-		case ISCSI_OP_ASYNC_EVENT:</div><div class='del'>-			/* we need sth like iscsi_async_event_rsp() */</div><div class='del'>-			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		rc = ISCSI_ERR_BAD_ITT;</div><div class='add'>+	switch(opcode) {</div><div class='add'>+	case ISCSI_OP_SCSI_DATA_IN:</div><div class='add'>+		tcp_conn-&gt;in.ctask = session-&gt;cmds[itt];</div><div class='add'>+		rc = iscsi_data_rsp(conn, tcp_conn-&gt;in.ctask);</div><div class='add'>+		/* fall through */</div><div class='add'>+	case ISCSI_OP_SCSI_CMD_RSP:</div><div class='add'>+		tcp_conn-&gt;in.ctask = session-&gt;cmds[itt];</div><div class='add'>+		if (tcp_conn-&gt;in.datalen)</div><div class='add'>+			goto copy_hdr;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;session-&gt;lock);</div><div class='add'>+		__iscsi_ctask_cleanup(conn, tcp_conn-&gt;in.ctask);</div><div class='add'>+		rc = __iscsi_complete_pdu(conn, hdr, NULL, 0);</div><div class='add'>+		spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_OP_R2T:</div><div class='add'>+		tcp_conn-&gt;in.ctask = session-&gt;cmds[itt];</div><div class='add'>+		if (ahslen)</div><div class='add'>+			rc = ISCSI_ERR_AHSLEN;</div><div class='add'>+		else if (tcp_conn-&gt;in.ctask-&gt;sc-&gt;sc_data_direction ==</div><div class='add'>+								DMA_TO_DEVICE)</div><div class='add'>+			rc = iscsi_r2t_rsp(conn, tcp_conn-&gt;in.ctask);</div><div class='add'>+		else</div><div class='add'>+			rc = ISCSI_ERR_PROTO;</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_OP_LOGIN_RSP:</div><div class='add'>+	case ISCSI_OP_TEXT_RSP:</div><div class='add'>+	case ISCSI_OP_LOGOUT_RSP:</div><div class='add'>+	case ISCSI_OP_NOOP_IN:</div><div class='add'>+	case ISCSI_OP_REJECT:</div><div class='add'>+	case ISCSI_OP_ASYNC_EVENT:</div><div class='add'>+		if (tcp_conn-&gt;in.datalen)</div><div class='add'>+			goto copy_hdr;</div><div class='add'>+	/* fall through */</div><div class='add'>+	case ISCSI_OP_SCSI_TMFUNC_RSP:</div><div class='add'>+		rc = iscsi_complete_pdu(conn, hdr, NULL, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		rc = ISCSI_ERR_BAD_OPCODE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='add'>+</div><div class='add'>+copy_hdr:</div><div class='add'>+	/*</div><div class='add'>+	 * if we did zero copy for the header but we will need multiple</div><div class='add'>+	 * skbs to complete the command then we have to copy the header</div><div class='add'>+	 * for later use</div><div class='add'>+	 */</div><div class='add'>+	if (tcp_conn-&gt;in.zero_copy_hdr &amp;&amp; tcp_conn-&gt;in.copy &lt;</div><div class='add'>+	   (tcp_conn-&gt;in.datalen + tcp_conn-&gt;in.padding +</div><div class='add'>+	    (conn-&gt;datadgst_en ? 4 : 0))) {</div><div class='add'>+		debug_tcp("Copying header for later use. in.copy %d in.datalen"</div><div class='add'>+			  " %d\n", tcp_conn-&gt;in.copy, tcp_conn-&gt;in.datalen);</div><div class='add'>+		memcpy(&amp;tcp_conn-&gt;hdr, tcp_conn-&gt;in.hdr,</div><div class='add'>+		       sizeof(struct iscsi_hdr));</div><div class='add'>+		tcp_conn-&gt;in.hdr = &amp;tcp_conn-&gt;hdr;</div><div class='add'>+		tcp_conn-&gt;in.zero_copy_hdr = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iscsi_ctask_copy - copy skb bits to the destanation cmd task</div><div class='del'>- * @conn: iscsi connection</div><div class='add'>+ * @conn: iscsi tcp connection</div><div class='ctx'>  * @ctask: scsi command task</div><div class='ctx'>  * @buf: buffer to copy to</div><div class='ctx'>  * @buf_size: size of buffer</div><div class='hunk'>@@ -804,110 +560,113 @@ iscsi_hdr_recv(struct iscsi_conn *conn)</div><div class='ctx'>  *	buf_left		left to copy from in progress buffer</div><div class='ctx'>  **/</div><div class='ctx'> static inline int</div><div class='del'>-iscsi_ctask_copy(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='add'>+iscsi_ctask_copy(struct iscsi_tcp_conn *tcp_conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> 		void *buf, int buf_size, int offset)</div><div class='ctx'> {</div><div class='del'>-	int buf_left = buf_size - (conn-&gt;data_copied + offset);</div><div class='del'>-	int size = min(conn-&gt;in.copy, buf_left);</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	int buf_left = buf_size - (tcp_conn-&gt;data_copied + offset);</div><div class='add'>+	int size = min(tcp_conn-&gt;in.copy, buf_left);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	size = min(size, ctask-&gt;data_count);</div><div class='ctx'> </div><div class='ctx'> 	debug_tcp("ctask_copy %d bytes at offset %d copied %d\n",</div><div class='del'>-	       size, conn-&gt;in.offset, conn-&gt;in.copied);</div><div class='add'>+	       size, tcp_conn-&gt;in.offset, tcp_conn-&gt;in.copied);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(size &lt;= 0);</div><div class='del'>-	BUG_ON(ctask-&gt;sent + size &gt; ctask-&gt;total_length);</div><div class='add'>+	BUG_ON(tcp_ctask-&gt;sent + size &gt; ctask-&gt;total_length);</div><div class='ctx'> </div><div class='del'>-	rc = skb_copy_bits(conn-&gt;in.skb, conn-&gt;in.offset,</div><div class='del'>-			   (char*)buf + (offset + conn-&gt;data_copied), size);</div><div class='add'>+	rc = skb_copy_bits(tcp_conn-&gt;in.skb, tcp_conn-&gt;in.offset,</div><div class='add'>+			   (char*)buf + (offset + tcp_conn-&gt;data_copied), size);</div><div class='ctx'> 	/* must fit into skb-&gt;len */</div><div class='ctx'> 	BUG_ON(rc);</div><div class='ctx'> </div><div class='del'>-	conn-&gt;in.offset += size;</div><div class='del'>-	conn-&gt;in.copy -= size;</div><div class='del'>-	conn-&gt;in.copied += size;</div><div class='del'>-	conn-&gt;data_copied += size;</div><div class='del'>-	ctask-&gt;sent += size;</div><div class='add'>+	tcp_conn-&gt;in.offset += size;</div><div class='add'>+	tcp_conn-&gt;in.copy -= size;</div><div class='add'>+	tcp_conn-&gt;in.copied += size;</div><div class='add'>+	tcp_conn-&gt;data_copied += size;</div><div class='add'>+	tcp_ctask-&gt;sent += size;</div><div class='ctx'> 	ctask-&gt;data_count -= size;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(conn-&gt;in.copy &lt; 0);</div><div class='add'>+	BUG_ON(tcp_conn-&gt;in.copy &lt; 0);</div><div class='ctx'> 	BUG_ON(ctask-&gt;data_count &lt; 0);</div><div class='ctx'> </div><div class='del'>-	if (buf_size != (conn-&gt;data_copied + offset)) {</div><div class='add'>+	if (buf_size != (tcp_conn-&gt;data_copied + offset)) {</div><div class='ctx'> 		if (!ctask-&gt;data_count) {</div><div class='del'>-			BUG_ON(buf_size - conn-&gt;data_copied &lt; 0);</div><div class='add'>+			BUG_ON(buf_size - tcp_conn-&gt;data_copied &lt; 0);</div><div class='ctx'> 			/* done with this PDU */</div><div class='del'>-			return buf_size - conn-&gt;data_copied;</div><div class='add'>+			return buf_size - tcp_conn-&gt;data_copied;</div><div class='ctx'> 		}</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* done with this buffer or with both - PDU and buffer */</div><div class='del'>-	conn-&gt;data_copied = 0;</div><div class='add'>+	tcp_conn-&gt;data_copied = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * iscsi_tcp_copy - copy skb bits to the destanation buffer</div><div class='del'>- * @conn: iscsi connection</div><div class='del'>- * @buf: buffer to copy to</div><div class='del'>- * @buf_size: number of bytes to copy</div><div class='add'>+ * @conn: iscsi tcp connection</div><div class='ctx'>  *</div><div class='ctx'>  * Notes:</div><div class='ctx'>  *	The function calls skb_copy_bits() and updates per-connection</div><div class='ctx'>  *	byte counters.</div><div class='ctx'>  **/</div><div class='ctx'> static inline int</div><div class='del'>-iscsi_tcp_copy(struct iscsi_conn *conn, void *buf, int buf_size)</div><div class='add'>+iscsi_tcp_copy(struct iscsi_tcp_conn *tcp_conn)</div><div class='ctx'> {</div><div class='del'>-	int buf_left = buf_size - conn-&gt;data_copied;</div><div class='del'>-	int size = min(conn-&gt;in.copy, buf_left);</div><div class='add'>+	void *buf = tcp_conn-&gt;data;</div><div class='add'>+	int buf_size = tcp_conn-&gt;in.datalen;</div><div class='add'>+	int buf_left = buf_size - tcp_conn-&gt;data_copied;</div><div class='add'>+	int size = min(tcp_conn-&gt;in.copy, buf_left);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	debug_tcp("tcp_copy %d bytes at offset %d copied %d\n",</div><div class='del'>-	       size, conn-&gt;in.offset, conn-&gt;data_copied);</div><div class='add'>+	       size, tcp_conn-&gt;in.offset, tcp_conn-&gt;data_copied);</div><div class='ctx'> 	BUG_ON(size &lt;= 0);</div><div class='ctx'> </div><div class='del'>-	rc = skb_copy_bits(conn-&gt;in.skb, conn-&gt;in.offset,</div><div class='del'>-			   (char*)buf + conn-&gt;data_copied, size);</div><div class='add'>+	rc = skb_copy_bits(tcp_conn-&gt;in.skb, tcp_conn-&gt;in.offset,</div><div class='add'>+			   (char*)buf + tcp_conn-&gt;data_copied, size);</div><div class='ctx'> 	BUG_ON(rc);</div><div class='ctx'> </div><div class='del'>-	conn-&gt;in.offset += size;</div><div class='del'>-	conn-&gt;in.copy -= size;</div><div class='del'>-	conn-&gt;in.copied += size;</div><div class='del'>-	conn-&gt;data_copied += size;</div><div class='add'>+	tcp_conn-&gt;in.offset += size;</div><div class='add'>+	tcp_conn-&gt;in.copy -= size;</div><div class='add'>+	tcp_conn-&gt;in.copied += size;</div><div class='add'>+	tcp_conn-&gt;data_copied += size;</div><div class='ctx'> </div><div class='del'>-	if (buf_size != conn-&gt;data_copied)</div><div class='add'>+	if (buf_size != tcp_conn-&gt;data_copied)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-partial_sg_digest_update(struct iscsi_conn *conn, struct scatterlist *sg,</div><div class='del'>-			 int offset, int length)</div><div class='add'>+partial_sg_digest_update(struct iscsi_tcp_conn *tcp_conn,</div><div class='add'>+			 struct scatterlist *sg, int offset, int length)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist temp;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;temp, sg, sizeof(struct scatterlist));</div><div class='ctx'> 	temp.offset = offset;</div><div class='ctx'> 	temp.length = length;</div><div class='del'>-	crypto_digest_update(conn-&gt;data_rx_tfm, &amp;temp, 1);</div><div class='add'>+	crypto_digest_update(tcp_conn-&gt;data_rx_tfm, &amp;temp, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iscsi_recv_digest_update(struct iscsi_conn *conn, char* buf, int len)</div><div class='add'>+iscsi_recv_digest_update(struct iscsi_tcp_conn *tcp_conn, char* buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct scatterlist tmp;</div><div class='ctx'> </div><div class='ctx'> 	sg_init_one(&amp;tmp, buf, len);</div><div class='del'>-	crypto_digest_update(conn-&gt;data_rx_tfm, &amp;tmp, 1);</div><div class='add'>+	crypto_digest_update(tcp_conn-&gt;data_rx_tfm, &amp;tmp, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iscsi_scsi_data_in(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_cmd_task *ctask = conn-&gt;in.ctask;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_cmd_task *ctask = tcp_conn-&gt;in.ctask;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> 	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='ctx'> 	struct scatterlist *sg;</div><div class='ctx'> 	int i, offset, rc = 0;</div><div class='hunk'>@@ -919,31 +678,33 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!sc-&gt;use_sg) {</div><div class='ctx'> 		i = ctask-&gt;data_count;</div><div class='del'>-		rc = iscsi_ctask_copy(conn, ctask, sc-&gt;request_buffer,</div><div class='del'>-				      sc-&gt;request_bufflen, ctask-&gt;data_offset);</div><div class='add'>+		rc = iscsi_ctask_copy(tcp_conn, ctask, sc-&gt;request_buffer,</div><div class='add'>+				      sc-&gt;request_bufflen,</div><div class='add'>+				      tcp_ctask-&gt;data_offset);</div><div class='ctx'> 		if (rc == -EAGAIN)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		if (conn-&gt;datadgst_en)</div><div class='del'>-			iscsi_recv_digest_update(conn, sc-&gt;request_buffer, i);</div><div class='add'>+			iscsi_recv_digest_update(tcp_conn, sc-&gt;request_buffer,</div><div class='add'>+						 i);</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	offset = ctask-&gt;data_offset;</div><div class='add'>+	offset = tcp_ctask-&gt;data_offset;</div><div class='ctx'> 	sg = sc-&gt;request_buffer;</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;data_offset)</div><div class='del'>-		for (i = 0; i &lt; ctask-&gt;sg_count; i++)</div><div class='add'>+	if (tcp_ctask-&gt;data_offset)</div><div class='add'>+		for (i = 0; i &lt; tcp_ctask-&gt;sg_count; i++)</div><div class='ctx'> 			offset -= sg[i].length;</div><div class='ctx'> 	/* we've passed through partial sg*/</div><div class='ctx'> 	if (offset &lt; 0)</div><div class='ctx'> 		offset = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = ctask-&gt;sg_count; i &lt; sc-&gt;use_sg; i++) {</div><div class='add'>+	for (i = tcp_ctask-&gt;sg_count; i &lt; sc-&gt;use_sg; i++) {</div><div class='ctx'> 		char *dest;</div><div class='ctx'> </div><div class='ctx'> 		dest = kmap_atomic(sg[i].page, KM_SOFTIRQ0);</div><div class='del'>-		rc = iscsi_ctask_copy(conn, ctask, dest + sg[i].offset,</div><div class='add'>+		rc = iscsi_ctask_copy(tcp_conn, ctask, dest + sg[i].offset,</div><div class='ctx'> 				      sg[i].length, offset);</div><div class='ctx'> 		kunmap_atomic(dest, KM_SOFTIRQ0);</div><div class='ctx'> 		if (rc == -EAGAIN)</div><div class='hunk'>@@ -952,15 +713,17 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)</div><div class='ctx'> 		if (!rc) {</div><div class='ctx'> 			if (conn-&gt;datadgst_en) {</div><div class='ctx'> 				if (!offset)</div><div class='del'>-					crypto_digest_update(conn-&gt;data_rx_tfm,</div><div class='del'>-							     &amp;sg[i], 1);</div><div class='add'>+					crypto_digest_update(</div><div class='add'>+							tcp_conn-&gt;data_rx_tfm,</div><div class='add'>+							&amp;sg[i], 1);</div><div class='ctx'> 				else</div><div class='del'>-					partial_sg_digest_update(conn, &amp;sg[i],</div><div class='add'>+					partial_sg_digest_update(tcp_conn,</div><div class='add'>+							&amp;sg[i],</div><div class='ctx'> 							sg[i].offset + offset,</div><div class='ctx'> 							sg[i].length - offset);</div><div class='ctx'> 			}</div><div class='ctx'> 			offset = 0;</div><div class='del'>-			ctask-&gt;sg_count++;</div><div class='add'>+			tcp_ctask-&gt;sg_count++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!ctask-&gt;data_count) {</div><div class='hunk'>@@ -968,25 +731,26 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)</div><div class='ctx'> 				/*</div><div class='ctx'> 				 * data-in is complete, but buffer not...</div><div class='ctx'> 				 */</div><div class='del'>-				partial_sg_digest_update(conn, &amp;sg[i],</div><div class='add'>+				partial_sg_digest_update(tcp_conn, &amp;sg[i],</div><div class='ctx'> 						sg[i].offset, sg[i].length-rc);</div><div class='ctx'> 			rc = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!conn-&gt;in.copy)</div><div class='add'>+		if (!tcp_conn-&gt;in.copy)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(ctask-&gt;data_count);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	/* check for non-exceptional status */</div><div class='del'>-	if (conn-&gt;in.flags &amp; ISCSI_FLAG_DATA_STATUS) {</div><div class='add'>+	if (tcp_conn-&gt;in.hdr-&gt;flags &amp; ISCSI_FLAG_DATA_STATUS) {</div><div class='ctx'> 		debug_scsi("done [sc %lx res %d itt 0x%x]\n",</div><div class='ctx'> 			   (long)sc, sc-&gt;result, ctask-&gt;itt);</div><div class='del'>-		conn-&gt;scsirsp_pdus_cnt++;</div><div class='del'>-		iscsi_ctask_cleanup(conn, ctask);</div><div class='del'>-		sc-&gt;scsi_done(sc);</div><div class='add'>+		spin_lock(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+		__iscsi_ctask_cleanup(conn, ctask);</div><div class='add'>+		__iscsi_complete_pdu(conn, tcp_conn-&gt;in.hdr, NULL, 0);</div><div class='add'>+		spin_unlock(&amp;conn-&gt;session-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -995,71 +759,38 @@ done:</div><div class='ctx'> static int</div><div class='ctx'> iscsi_data_recv(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	int rc = 0;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	int rc = 0, opcode;</div><div class='ctx'> </div><div class='del'>-	switch(conn-&gt;in.opcode) {</div><div class='add'>+	opcode = tcp_conn-&gt;in.hdr-&gt;opcode &amp; ISCSI_OPCODE_MASK;</div><div class='add'>+	switch (opcode) {</div><div class='ctx'> 	case ISCSI_OP_SCSI_DATA_IN:</div><div class='ctx'> 		rc = iscsi_scsi_data_in(conn);</div><div class='ctx'> 		break;</div><div class='del'>-	case ISCSI_OP_SCSI_CMD_RSP: {</div><div class='del'>-		/*</div><div class='del'>-		 * SCSI Sense Data:</div><div class='del'>-		 * copying the entire Data Segment.</div><div class='del'>-		 */</div><div class='del'>-		if (iscsi_tcp_copy(conn, conn-&gt;data, conn-&gt;in.datalen)) {</div><div class='del'>-			rc = -EAGAIN;</div><div class='del'>-			goto exit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * check for sense</div><div class='del'>-		 */</div><div class='del'>-		conn-&gt;in.hdr = &amp;conn-&gt;hdr;</div><div class='del'>-		conn-&gt;senselen = (conn-&gt;data[0] &lt;&lt; 8) | conn-&gt;data[1];</div><div class='del'>-		rc = iscsi_cmd_rsp(conn, conn-&gt;in.ctask);</div><div class='del'>-		if (!rc &amp;&amp; conn-&gt;datadgst_en)</div><div class='del'>-			iscsi_recv_digest_update(conn, conn-&gt;data,</div><div class='del'>-						 conn-&gt;in.datalen);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='add'>+	case ISCSI_OP_SCSI_CMD_RSP:</div><div class='add'>+		spin_lock(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+		__iscsi_ctask_cleanup(conn, tcp_conn-&gt;in.ctask);</div><div class='add'>+		spin_unlock(&amp;conn-&gt;session-&gt;lock);</div><div class='ctx'> 	case ISCSI_OP_TEXT_RSP:</div><div class='ctx'> 	case ISCSI_OP_LOGIN_RSP:</div><div class='del'>-	case ISCSI_OP_NOOP_IN: {</div><div class='del'>-		struct iscsi_mgmt_task *mtask = NULL;</div><div class='del'>-</div><div class='del'>-		if (conn-&gt;in.itt != ISCSI_RESERVED_TAG)</div><div class='del'>-			mtask = (struct iscsi_mgmt_task *)</div><div class='del'>-				session-&gt;mgmt_cmds[conn-&gt;in.itt -</div><div class='del'>-					ISCSI_MGMT_ITT_OFFSET];</div><div class='del'>-</div><div class='add'>+	case ISCSI_OP_NOOP_IN:</div><div class='add'>+	case ISCSI_OP_ASYNC_EVENT:</div><div class='add'>+	case ISCSI_OP_REJECT:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Collect data segment to the connection's data</div><div class='ctx'> 		 * placeholder</div><div class='ctx'> 		 */</div><div class='del'>-		if (iscsi_tcp_copy(conn, conn-&gt;data, conn-&gt;in.datalen)) {</div><div class='add'>+		if (iscsi_tcp_copy(tcp_conn)) {</div><div class='ctx'> 			rc = -EAGAIN;</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rc = iscsi_recv_pdu(conn-&gt;cls_conn, conn-&gt;in.hdr,</div><div class='del'>-				    conn-&gt;data, conn-&gt;in.datalen);</div><div class='del'>-</div><div class='del'>-		if (!rc &amp;&amp; conn-&gt;datadgst_en &amp;&amp;</div><div class='del'>-			conn-&gt;in.opcode != ISCSI_OP_LOGIN_RSP)</div><div class='del'>-			iscsi_recv_digest_update(conn, conn-&gt;data,</div><div class='del'>-			  			conn-&gt;in.datalen);</div><div class='del'>-</div><div class='del'>-		if (mtask &amp;&amp; conn-&gt;login_mtask != mtask) {</div><div class='del'>-			spin_lock(&amp;session-&gt;lock);</div><div class='del'>-			__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;mtask,</div><div class='del'>-				    sizeof(void*));</div><div class='del'>-			spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-	case ISCSI_OP_ASYNC_EVENT:</div><div class='del'>-	case ISCSI_OP_REJECT:</div><div class='add'>+		rc = iscsi_complete_pdu(conn, tcp_conn-&gt;in.hdr, tcp_conn-&gt;data,</div><div class='add'>+					tcp_conn-&gt;in.datalen);</div><div class='add'>+		if (!rc &amp;&amp; conn-&gt;datadgst_en &amp;&amp; opcode != ISCSI_OP_LOGIN_RSP)</div><div class='add'>+			iscsi_recv_digest_update(tcp_conn, tcp_conn-&gt;data,</div><div class='add'>+			  			tcp_conn-&gt;in.datalen);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		BUG_ON(1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1080,6 +811,7 @@ iscsi_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct iscsi_conn *conn = rd_desc-&gt;arg.data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> 	int processed;</div><div class='ctx'> 	char pad[ISCSI_PAD_LEN];</div><div class='ctx'> 	struct scatterlist sg;</div><div class='hunk'>@@ -1088,15 +820,15 @@ iscsi_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,</div><div class='ctx'> 	 * Save current SKB and its offset in the corresponding</div><div class='ctx'> 	 * connection context.</div><div class='ctx'> 	 */</div><div class='del'>-	conn-&gt;in.copy = skb-&gt;len - offset;</div><div class='del'>-	conn-&gt;in.offset = offset;</div><div class='del'>-	conn-&gt;in.skb = skb;</div><div class='del'>-	conn-&gt;in.len = conn-&gt;in.copy;</div><div class='del'>-	BUG_ON(conn-&gt;in.copy &lt;= 0);</div><div class='del'>-	debug_tcp("in %d bytes\n", conn-&gt;in.copy);</div><div class='add'>+	tcp_conn-&gt;in.copy = skb-&gt;len - offset;</div><div class='add'>+	tcp_conn-&gt;in.offset = offset;</div><div class='add'>+	tcp_conn-&gt;in.skb = skb;</div><div class='add'>+	tcp_conn-&gt;in.len = tcp_conn-&gt;in.copy;</div><div class='add'>+	BUG_ON(tcp_conn-&gt;in.copy &lt;= 0);</div><div class='add'>+	debug_tcp("in %d bytes\n", tcp_conn-&gt;in.copy);</div><div class='ctx'> </div><div class='ctx'> more:</div><div class='del'>-	conn-&gt;in.copied = 0;</div><div class='add'>+	tcp_conn-&gt;in.copied = 0;</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(conn-&gt;suspend_rx)) {</div><div class='hunk'>@@ -1104,9 +836,9 @@ more:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in_progress == IN_PROGRESS_WAIT_HEADER ||</div><div class='del'>-	    conn-&gt;in_progress == IN_PROGRESS_HEADER_GATHER) {</div><div class='del'>-		rc = iscsi_hdr_extract(conn);</div><div class='add'>+	if (tcp_conn-&gt;in_progress == IN_PROGRESS_WAIT_HEADER ||</div><div class='add'>+	    tcp_conn-&gt;in_progress == IN_PROGRESS_HEADER_GATHER) {</div><div class='add'>+		rc = iscsi_hdr_extract(tcp_conn);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 		       if (rc == -EAGAIN)</div><div class='ctx'> 				goto nomore;</div><div class='hunk'>@@ -1119,90 +851,91 @@ more:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Verify and process incoming PDU header.</div><div class='ctx'> 		 */</div><div class='del'>-		rc = iscsi_hdr_recv(conn);</div><div class='del'>-		if (!rc &amp;&amp; conn-&gt;in.datalen) {</div><div class='add'>+		rc = iscsi_tcp_hdr_recv(conn);</div><div class='add'>+		if (!rc &amp;&amp; tcp_conn-&gt;in.datalen) {</div><div class='ctx'> 			if (conn-&gt;datadgst_en) {</div><div class='del'>-				BUG_ON(!conn-&gt;data_rx_tfm);</div><div class='del'>-				crypto_digest_init(conn-&gt;data_rx_tfm);</div><div class='add'>+				BUG_ON(!tcp_conn-&gt;data_rx_tfm);</div><div class='add'>+				crypto_digest_init(tcp_conn-&gt;data_rx_tfm);</div><div class='ctx'> 			}</div><div class='del'>-			conn-&gt;in_progress = IN_PROGRESS_DATA_RECV;</div><div class='add'>+			tcp_conn-&gt;in_progress = IN_PROGRESS_DATA_RECV;</div><div class='ctx'> 		} else if (rc) {</div><div class='ctx'> 			iscsi_conn_failure(conn, rc);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in_progress == IN_PROGRESS_DDIGEST_RECV) {</div><div class='add'>+	if (tcp_conn-&gt;in_progress == IN_PROGRESS_DDIGEST_RECV) {</div><div class='ctx'> 		uint32_t recv_digest;</div><div class='add'>+</div><div class='ctx'> 		debug_tcp("extra data_recv offset %d copy %d\n",</div><div class='del'>-			  conn-&gt;in.offset, conn-&gt;in.copy);</div><div class='del'>-		skb_copy_bits(conn-&gt;in.skb, conn-&gt;in.offset,</div><div class='add'>+			  tcp_conn-&gt;in.offset, tcp_conn-&gt;in.copy);</div><div class='add'>+		skb_copy_bits(tcp_conn-&gt;in.skb, tcp_conn-&gt;in.offset,</div><div class='ctx'> 				&amp;recv_digest, 4);</div><div class='del'>-		conn-&gt;in.offset += 4;</div><div class='del'>-		conn-&gt;in.copy -= 4;</div><div class='del'>-		if (recv_digest != conn-&gt;in.datadgst) {</div><div class='add'>+		tcp_conn-&gt;in.offset += 4;</div><div class='add'>+		tcp_conn-&gt;in.copy -= 4;</div><div class='add'>+		if (recv_digest != tcp_conn-&gt;in.datadgst) {</div><div class='ctx'> 			debug_tcp("iscsi_tcp: data digest error!"</div><div class='ctx'> 				  "0x%x != 0x%x\n", recv_digest,</div><div class='del'>-				  conn-&gt;in.datadgst);</div><div class='add'>+				  tcp_conn-&gt;in.datadgst);</div><div class='ctx'> 			iscsi_conn_failure(conn, ISCSI_ERR_DATA_DGST);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			debug_tcp("iscsi_tcp: data digest match!"</div><div class='ctx'> 				  "0x%x == 0x%x\n", recv_digest,</div><div class='del'>-				  conn-&gt;in.datadgst);</div><div class='del'>-			conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='add'>+				  tcp_conn-&gt;in.datadgst);</div><div class='add'>+			tcp_conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in_progress == IN_PROGRESS_DATA_RECV &amp;&amp; conn-&gt;in.copy) {</div><div class='add'>+	if (tcp_conn-&gt;in_progress == IN_PROGRESS_DATA_RECV &amp;&amp;</div><div class='add'>+	   tcp_conn-&gt;in.copy) {</div><div class='ctx'> </div><div class='ctx'> 		debug_tcp("data_recv offset %d copy %d\n",</div><div class='del'>-		       conn-&gt;in.offset, conn-&gt;in.copy);</div><div class='add'>+		       tcp_conn-&gt;in.offset, tcp_conn-&gt;in.copy);</div><div class='ctx'> </div><div class='ctx'> 		rc = iscsi_data_recv(conn);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			if (rc == -EAGAIN) {</div><div class='del'>-				rd_desc-&gt;count = conn-&gt;in.datalen -</div><div class='del'>-						conn-&gt;in.ctask-&gt;data_count;</div><div class='add'>+			if (rc == -EAGAIN)</div><div class='ctx'> 				goto again;</div><div class='del'>-			}</div><div class='ctx'> 			iscsi_conn_failure(conn, rc);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		conn-&gt;in.copy -= conn-&gt;in.padding;</div><div class='del'>-		conn-&gt;in.offset += conn-&gt;in.padding;</div><div class='add'>+		tcp_conn-&gt;in.copy -= tcp_conn-&gt;in.padding;</div><div class='add'>+		tcp_conn-&gt;in.offset += tcp_conn-&gt;in.padding;</div><div class='ctx'> 		if (conn-&gt;datadgst_en) {</div><div class='del'>-			if (conn-&gt;in.padding) {</div><div class='del'>-				debug_tcp("padding -&gt; %d\n", conn-&gt;in.padding);</div><div class='del'>-				memset(pad, 0, conn-&gt;in.padding);</div><div class='del'>-				sg_init_one(&amp;sg, pad, conn-&gt;in.padding);</div><div class='del'>-				crypto_digest_update(conn-&gt;data_rx_tfm, &amp;sg, 1);</div><div class='add'>+			if (tcp_conn-&gt;in.padding) {</div><div class='add'>+				debug_tcp("padding -&gt; %d\n",</div><div class='add'>+					  tcp_conn-&gt;in.padding);</div><div class='add'>+				memset(pad, 0, tcp_conn-&gt;in.padding);</div><div class='add'>+				sg_init_one(&amp;sg, pad, tcp_conn-&gt;in.padding);</div><div class='add'>+				crypto_digest_update(tcp_conn-&gt;data_rx_tfm,</div><div class='add'>+						     &amp;sg, 1);</div><div class='ctx'> 			}</div><div class='del'>-			crypto_digest_final(conn-&gt;data_rx_tfm,</div><div class='del'>-					    (u8 *) &amp; conn-&gt;in.datadgst);</div><div class='del'>-			debug_tcp("rx digest 0x%x\n", conn-&gt;in.datadgst);</div><div class='del'>-			conn-&gt;in_progress = IN_PROGRESS_DDIGEST_RECV;</div><div class='add'>+			crypto_digest_final(tcp_conn-&gt;data_rx_tfm,</div><div class='add'>+					    (u8 *) &amp; tcp_conn-&gt;in.datadgst);</div><div class='add'>+			debug_tcp("rx digest 0x%x\n", tcp_conn-&gt;in.datadgst);</div><div class='add'>+			tcp_conn-&gt;in_progress = IN_PROGRESS_DDIGEST_RECV;</div><div class='ctx'> 		} else</div><div class='del'>-			conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='add'>+			tcp_conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	debug_tcp("f, processed %d from out of %d padding %d\n",</div><div class='del'>-	       conn-&gt;in.offset - offset, (int)len, conn-&gt;in.padding);</div><div class='del'>-	BUG_ON(conn-&gt;in.offset - offset &gt; len);</div><div class='add'>+	       tcp_conn-&gt;in.offset - offset, (int)len, tcp_conn-&gt;in.padding);</div><div class='add'>+	BUG_ON(tcp_conn-&gt;in.offset - offset &gt; len);</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;in.offset - offset != len) {</div><div class='add'>+	if (tcp_conn-&gt;in.offset - offset != len) {</div><div class='ctx'> 		debug_tcp("continue to process %d bytes\n",</div><div class='del'>-		       (int)len - (conn-&gt;in.offset - offset));</div><div class='add'>+		       (int)len - (tcp_conn-&gt;in.offset - offset));</div><div class='ctx'> 		goto more;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> nomore:</div><div class='del'>-	processed = conn-&gt;in.offset - offset;</div><div class='add'>+	processed = tcp_conn-&gt;in.offset - offset;</div><div class='ctx'> 	BUG_ON(processed == 0);</div><div class='ctx'> 	return processed;</div><div class='ctx'> </div><div class='ctx'> again:</div><div class='del'>-	processed = conn-&gt;in.offset - offset;</div><div class='add'>+	processed = tcp_conn-&gt;in.offset - offset;</div><div class='ctx'> 	debug_tcp("c, processed %d from out of %d rd_desc_cnt %d\n",</div><div class='ctx'> 	          processed, (int)len, (int)rd_desc-&gt;count);</div><div class='ctx'> 	BUG_ON(processed == 0);</div><div class='hunk'>@@ -1220,9 +953,14 @@ iscsi_tcp_data_ready(struct sock *sk, int flag)</div><div class='ctx'> </div><div class='ctx'> 	read_lock(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> </div><div class='del'>-	/* use rd_desc to pass 'conn' to iscsi_tcp_data_recv */</div><div class='add'>+	/*</div><div class='add'>+	 * Use rd_desc to pass 'conn' to iscsi_tcp_data_recv.</div><div class='add'>+	 * We set count to 1 because we want the network layer to</div><div class='add'>+	 * hand us all the skbs that are available. iscsi_tcp_data_recv</div><div class='add'>+	 * handled pdus that cross buffers or pdus that still need data.</div><div class='add'>+	 */</div><div class='ctx'> 	rd_desc.arg.data = conn;</div><div class='del'>-	rd_desc.count = 0;</div><div class='add'>+	rd_desc.count = 1;</div><div class='ctx'> 	tcp_read_sock(sk, &amp;rd_desc, iscsi_tcp_data_recv);</div><div class='ctx'> </div><div class='ctx'> 	read_unlock(&amp;sk-&gt;sk_callback_lock);</div><div class='hunk'>@@ -1231,6 +969,7 @@ iscsi_tcp_data_ready(struct sock *sk, int flag)</div><div class='ctx'> static void</div><div class='ctx'> iscsi_tcp_state_change(struct sock *sk)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn;</div><div class='ctx'> 	struct iscsi_conn *conn;</div><div class='ctx'> 	struct iscsi_session *session;</div><div class='ctx'> 	void (*old_state_change)(struct sock *);</div><div class='hunk'>@@ -1247,7 +986,8 @@ iscsi_tcp_state_change(struct sock *sk)</div><div class='ctx'> 		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	old_state_change = conn-&gt;old_state_change;</div><div class='add'>+	tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	old_state_change = tcp_conn-&gt;old_state_change;</div><div class='ctx'> </div><div class='ctx'> 	read_unlock(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1262,23 +1002,25 @@ static void</div><div class='ctx'> iscsi_write_space(struct sock *sk)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_conn *conn = (struct iscsi_conn*)sk-&gt;sk_user_data;</div><div class='del'>-	conn-&gt;old_write_space(sk);</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	tcp_conn-&gt;old_write_space(sk);</div><div class='ctx'> 	debug_tcp("iscsi_write_space: cid %d\n", conn-&gt;id);</div><div class='del'>-	clear_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='ctx'> 	scsi_queue_work(conn-&gt;session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iscsi_conn_set_callbacks(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = conn-&gt;sock-&gt;sk;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct sock *sk = tcp_conn-&gt;sock-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	/* assign new callbacks */</div><div class='ctx'> 	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> 	sk-&gt;sk_user_data = conn;</div><div class='del'>-	conn-&gt;old_data_ready = sk-&gt;sk_data_ready;</div><div class='del'>-	conn-&gt;old_state_change = sk-&gt;sk_state_change;</div><div class='del'>-	conn-&gt;old_write_space = sk-&gt;sk_write_space;</div><div class='add'>+	tcp_conn-&gt;old_data_ready = sk-&gt;sk_data_ready;</div><div class='add'>+	tcp_conn-&gt;old_state_change = sk-&gt;sk_state_change;</div><div class='add'>+	tcp_conn-&gt;old_write_space = sk-&gt;sk_write_space;</div><div class='ctx'> 	sk-&gt;sk_data_ready = iscsi_tcp_data_ready;</div><div class='ctx'> 	sk-&gt;sk_state_change = iscsi_tcp_state_change;</div><div class='ctx'> 	sk-&gt;sk_write_space = iscsi_write_space;</div><div class='hunk'>@@ -1288,14 +1030,15 @@ iscsi_conn_set_callbacks(struct iscsi_conn *conn)</div><div class='ctx'> static void</div><div class='ctx'> iscsi_conn_restore_callbacks(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct sock *sk = conn-&gt;sock-&gt;sk;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct sock *sk = tcp_conn-&gt;sock-&gt;sk;</div><div class='ctx'> </div><div class='ctx'> 	/* restore socket callbacks, see also: iscsi_conn_set_callbacks() */</div><div class='ctx'> 	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> 	sk-&gt;sk_user_data    = NULL;</div><div class='del'>-	sk-&gt;sk_data_ready   = conn-&gt;old_data_ready;</div><div class='del'>-	sk-&gt;sk_state_change = conn-&gt;old_state_change;</div><div class='del'>-	sk-&gt;sk_write_space  = conn-&gt;old_write_space;</div><div class='add'>+	sk-&gt;sk_data_ready   = tcp_conn-&gt;old_data_ready;</div><div class='add'>+	sk-&gt;sk_state_change = tcp_conn-&gt;old_state_change;</div><div class='add'>+	sk-&gt;sk_write_space  = tcp_conn-&gt;old_write_space;</div><div class='ctx'> 	sk-&gt;sk_no_check	 = 0;</div><div class='ctx'> 	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -1310,8 +1053,9 @@ iscsi_conn_restore_callbacks(struct iscsi_conn *conn)</div><div class='ctx'> static inline int</div><div class='ctx'> iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct socket *sk = conn-&gt;sock;</div><div class='del'>-	int offset = buf-&gt;sg.offset + buf-&gt;sent;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct socket *sk = tcp_conn-&gt;sock;</div><div class='add'>+	int offset = buf-&gt;sg.offset + buf-&gt;sent, res;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * if we got use_sg=0 or are sending something we kmallocd</div><div class='hunk'>@@ -1322,9 +1066,22 @@ iscsi_send(struct iscsi_conn *conn, struct iscsi_buf *buf, int size, int flags)</div><div class='ctx'> 	 * slab case.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (buf-&gt;use_sendmsg)</div><div class='del'>-		return sock_no_sendpage(sk, buf-&gt;sg.page, offset, size, flags);</div><div class='add'>+		res = sock_no_sendpage(sk, buf-&gt;sg.page, offset, size, flags);</div><div class='ctx'> 	else</div><div class='del'>-		return conn-&gt;sendpage(sk, buf-&gt;sg.page, offset, size, flags);</div><div class='add'>+		res = tcp_conn-&gt;sendpage(sk, buf-&gt;sg.page, offset, size, flags);</div><div class='add'>+</div><div class='add'>+	if (res &gt;= 0) {</div><div class='add'>+		conn-&gt;txdata_octets += res;</div><div class='add'>+		buf-&gt;sent += res;</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcp_conn-&gt;sendpage_failures_cnt++;</div><div class='add'>+	if (res == -EAGAIN)</div><div class='add'>+		res = -ENOBUFS;</div><div class='add'>+	else</div><div class='add'>+		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1350,16 +1107,10 @@ iscsi_sendhdr(struct iscsi_conn *conn, struct iscsi_buf *buf, int datalen)</div><div class='ctx'> 	res = iscsi_send(conn, buf, size, flags);</div><div class='ctx'> 	debug_tcp("sendhdr %d bytes, sent %d res %d\n", size, buf-&gt;sent, res);</div><div class='ctx'> 	if (res &gt;= 0) {</div><div class='del'>-		conn-&gt;txdata_octets += res;</div><div class='del'>-		buf-&gt;sent += res;</div><div class='ctx'> 		if (size != res)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		return 0;</div><div class='del'>-	} else if (res == -EAGAIN) {</div><div class='del'>-		conn-&gt;sendpage_failures_cnt++;</div><div class='del'>-		set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='del'>-	} else if (res == -EPIPE)</div><div class='del'>-		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -1392,47 +1143,46 @@ iscsi_sendpage(struct iscsi_conn *conn, struct iscsi_buf *buf,</div><div class='ctx'> 	debug_tcp("sendpage: %d bytes, sent %d left %d sent %d res %d\n",</div><div class='ctx'> 		  size, buf-&gt;sent, *count, *sent, res);</div><div class='ctx'> 	if (res &gt;= 0) {</div><div class='del'>-		conn-&gt;txdata_octets += res;</div><div class='del'>-		buf-&gt;sent += res;</div><div class='ctx'> 		*count -= res;</div><div class='ctx'> 		*sent += res;</div><div class='ctx'> 		if (size != res)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		return 0;</div><div class='del'>-	} else if (res == -EAGAIN) {</div><div class='del'>-		conn-&gt;sendpage_failures_cnt++;</div><div class='del'>-		set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='del'>-	} else if (res == -EPIPE)</div><div class='del'>-		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-iscsi_data_digest_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='add'>+iscsi_data_digest_init(struct iscsi_tcp_conn *tcp_conn,</div><div class='add'>+		      struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	BUG_ON(!conn-&gt;data_tx_tfm);</div><div class='del'>-	crypto_digest_init(conn-&gt;data_tx_tfm);</div><div class='del'>-	ctask-&gt;digest_count = 4;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!tcp_conn-&gt;data_tx_tfm);</div><div class='add'>+	crypto_digest_init(tcp_conn-&gt;data_tx_tfm);</div><div class='add'>+	tcp_ctask-&gt;digest_count = 4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iscsi_digest_final_send(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> 			struct iscsi_buf *buf, uint32_t *digest, int final)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int sent = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (final)</div><div class='del'>-		crypto_digest_final(conn-&gt;data_tx_tfm, (u8*)digest);</div><div class='add'>+		crypto_digest_final(tcp_conn-&gt;data_tx_tfm, (u8*)digest);</div><div class='ctx'> </div><div class='del'>-	iscsi_buf_init_virt(buf, (char*)digest, 4);</div><div class='del'>-	rc = iscsi_sendpage(conn, buf, &amp;ctask-&gt;digest_count, &amp;sent);</div><div class='add'>+	iscsi_buf_init_iov(buf, (char*)digest, 4);</div><div class='add'>+	rc = iscsi_sendpage(conn, buf, &amp;tcp_ctask-&gt;digest_count, &amp;sent);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		ctask-&gt;datadigest = *digest;</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_DATA_DIGEST;</div><div class='add'>+		tcp_ctask-&gt;datadigest = *digest;</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_DATA_DIGEST;</div><div class='ctx'> 	} else</div><div class='del'>-		ctask-&gt;digest_count = 4;</div><div class='add'>+		tcp_ctask-&gt;digest_count = 4;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1453,21 +1203,19 @@ static void</div><div class='ctx'> iscsi_solicit_data_cont(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> 			struct iscsi_r2t_info *r2t, int left)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_data *hdr;</div><div class='del'>-	struct iscsi_data_task *dtask;</div><div class='ctx'> 	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='ctx'> 	int new_offset;</div><div class='ctx'> </div><div class='del'>-	dtask = mempool_alloc(ctask-&gt;datapool, GFP_ATOMIC);</div><div class='del'>-	BUG_ON(!dtask);</div><div class='del'>-	hdr = &amp;dtask-&gt;hdr;</div><div class='add'>+	hdr = &amp;r2t-&gt;dtask.hdr;</div><div class='ctx'> 	memset(hdr, 0, sizeof(struct iscsi_data));</div><div class='ctx'> 	hdr-&gt;ttt = r2t-&gt;ttt;</div><div class='ctx'> 	hdr-&gt;datasn = cpu_to_be32(r2t-&gt;solicit_datasn);</div><div class='ctx'> 	r2t-&gt;solicit_datasn++;</div><div class='ctx'> 	hdr-&gt;opcode = ISCSI_OP_SCSI_DATA_OUT;</div><div class='del'>-	memcpy(hdr-&gt;lun, ctask-&gt;hdr.lun, sizeof(hdr-&gt;lun));</div><div class='del'>-	hdr-&gt;itt = ctask-&gt;hdr.itt;</div><div class='add'>+	memcpy(hdr-&gt;lun, ctask-&gt;hdr-&gt;lun, sizeof(hdr-&gt;lun));</div><div class='add'>+	hdr-&gt;itt = ctask-&gt;hdr-&gt;itt;</div><div class='ctx'> 	hdr-&gt;exp_statsn = r2t-&gt;exp_statsn;</div><div class='ctx'> 	new_offset = r2t-&gt;data_offset + r2t-&gt;sent;</div><div class='ctx'> 	hdr-&gt;offset = cpu_to_be32(new_offset);</div><div class='hunk'>@@ -1481,181 +1229,98 @@ iscsi_solicit_data_cont(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'> 	}</div><div class='ctx'> 	conn-&gt;dataout_pdus_cnt++;</div><div class='ctx'> </div><div class='del'>-	iscsi_buf_init_virt(&amp;r2t-&gt;headbuf, (char*)hdr,</div><div class='add'>+	iscsi_buf_init_iov(&amp;r2t-&gt;headbuf, (char*)hdr,</div><div class='ctx'> 			   sizeof(struct iscsi_hdr));</div><div class='ctx'> </div><div class='del'>-	r2t-&gt;dtask = dtask;</div><div class='del'>-</div><div class='ctx'> 	if (sc-&gt;use_sg &amp;&amp; !iscsi_buf_left(&amp;r2t-&gt;sendbuf)) {</div><div class='del'>-		BUG_ON(ctask-&gt;bad_sg == r2t-&gt;sg);</div><div class='add'>+		BUG_ON(tcp_ctask-&gt;bad_sg == r2t-&gt;sg);</div><div class='ctx'> 		iscsi_buf_init_sg(&amp;r2t-&gt;sendbuf, r2t-&gt;sg);</div><div class='ctx'> 		r2t-&gt;sg += 1;</div><div class='ctx'> 	} else</div><div class='del'>-		iscsi_buf_init_iov(&amp;ctask-&gt;sendbuf,</div><div class='add'>+		iscsi_buf_init_iov(&amp;tcp_ctask-&gt;sendbuf,</div><div class='ctx'> 			    (char*)sc-&gt;request_buffer + new_offset,</div><div class='ctx'> 			    r2t-&gt;data_count);</div><div class='del'>-</div><div class='del'>-	list_add(&amp;dtask-&gt;item, &amp;ctask-&gt;dataqueue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iscsi_unsolicit_data_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_data *hdr;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_data_task *dtask;</div><div class='ctx'> </div><div class='del'>-	dtask = mempool_alloc(ctask-&gt;datapool, GFP_ATOMIC);</div><div class='del'>-	BUG_ON(!dtask);</div><div class='del'>-	hdr = &amp;dtask-&gt;hdr;</div><div class='del'>-	memset(hdr, 0, sizeof(struct iscsi_data));</div><div class='del'>-	hdr-&gt;ttt = cpu_to_be32(ISCSI_RESERVED_TAG);</div><div class='del'>-	hdr-&gt;datasn = cpu_to_be32(ctask-&gt;unsol_datasn);</div><div class='del'>-	ctask-&gt;unsol_datasn++;</div><div class='del'>-	hdr-&gt;opcode = ISCSI_OP_SCSI_DATA_OUT;</div><div class='del'>-	memcpy(hdr-&gt;lun, ctask-&gt;hdr.lun, sizeof(hdr-&gt;lun));</div><div class='del'>-	hdr-&gt;itt = ctask-&gt;hdr.itt;</div><div class='del'>-	hdr-&gt;exp_statsn = cpu_to_be32(conn-&gt;exp_statsn);</div><div class='del'>-	hdr-&gt;offset = cpu_to_be32(ctask-&gt;total_length -</div><div class='del'>-				  ctask-&gt;r2t_data_count -</div><div class='del'>-				  ctask-&gt;unsol_count);</div><div class='del'>-	if (ctask-&gt;unsol_count &gt; conn-&gt;max_xmit_dlength) {</div><div class='del'>-		hton24(hdr-&gt;dlength, conn-&gt;max_xmit_dlength);</div><div class='del'>-		ctask-&gt;data_count = conn-&gt;max_xmit_dlength;</div><div class='del'>-		hdr-&gt;flags = 0;</div><div class='del'>-	} else {</div><div class='del'>-		hton24(hdr-&gt;dlength, ctask-&gt;unsol_count);</div><div class='del'>-		ctask-&gt;data_count = ctask-&gt;unsol_count;</div><div class='del'>-		hdr-&gt;flags = ISCSI_FLAG_CMD_FINAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iscsi_buf_init_virt(&amp;ctask-&gt;headbuf, (char*)hdr,</div><div class='add'>+	dtask = tcp_ctask-&gt;dtask = &amp;tcp_ctask-&gt;unsol_dtask;</div><div class='add'>+	iscsi_prep_unsolicit_data_pdu(ctask, &amp;dtask-&gt;hdr,</div><div class='add'>+				      tcp_ctask-&gt;r2t_data_count);</div><div class='add'>+	iscsi_buf_init_iov(&amp;tcp_ctask-&gt;headbuf, (char*)&amp;dtask-&gt;hdr,</div><div class='ctx'> 			   sizeof(struct iscsi_hdr));</div><div class='del'>-</div><div class='del'>-	list_add(&amp;dtask-&gt;item, &amp;ctask-&gt;dataqueue);</div><div class='del'>-</div><div class='del'>-	ctask-&gt;dtask = dtask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iscsi_cmd_init - Initialize iSCSI SCSI_READ or SCSI_WRITE commands</div><div class='add'>+ * iscsi_tcp_cmd_init - Initialize iSCSI SCSI_READ or SCSI_WRITE commands</div><div class='ctx'>  * @conn: iscsi connection</div><div class='ctx'>  * @ctask: scsi command task</div><div class='ctx'>  * @sc: scsi command</div><div class='ctx'>  **/</div><div class='ctx'> static void</div><div class='del'>-iscsi_cmd_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='del'>-		struct scsi_cmnd *sc)</div><div class='add'>+iscsi_tcp_cmd_init(struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-</div><div class='del'>-	BUG_ON(__kfifo_len(ctask-&gt;r2tqueue));</div><div class='del'>-</div><div class='del'>-	ctask-&gt;sc = sc;</div><div class='del'>-	ctask-&gt;conn = conn;</div><div class='del'>-	ctask-&gt;hdr.opcode = ISCSI_OP_SCSI_CMD;</div><div class='del'>-	ctask-&gt;hdr.flags = ISCSI_ATTR_SIMPLE;</div><div class='del'>-	int_to_scsilun(sc-&gt;device-&gt;lun, (struct scsi_lun *)ctask-&gt;hdr.lun);</div><div class='del'>-	ctask-&gt;hdr.itt = ctask-&gt;itt | (conn-&gt;id &lt;&lt; CID_SHIFT) |</div><div class='del'>-			 (session-&gt;age &lt;&lt; AGE_SHIFT);</div><div class='del'>-	ctask-&gt;hdr.data_length = cpu_to_be32(sc-&gt;request_bufflen);</div><div class='del'>-	ctask-&gt;hdr.cmdsn = cpu_to_be32(session-&gt;cmdsn); session-&gt;cmdsn++;</div><div class='del'>-	ctask-&gt;hdr.exp_statsn = cpu_to_be32(conn-&gt;exp_statsn);</div><div class='del'>-	memcpy(ctask-&gt;hdr.cdb, sc-&gt;cmnd, sc-&gt;cmd_len);</div><div class='del'>-	memset(&amp;ctask-&gt;hdr.cdb[sc-&gt;cmd_len], 0, MAX_COMMAND_SIZE - sc-&gt;cmd_len);</div><div class='add'>+	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;mtask = NULL;</div><div class='del'>-	ctask-&gt;sent = 0;</div><div class='del'>-	ctask-&gt;sg_count = 0;</div><div class='add'>+	BUG_ON(__kfifo_len(tcp_ctask-&gt;r2tqueue));</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;total_length = sc-&gt;request_bufflen;</div><div class='add'>+	tcp_ctask-&gt;sent = 0;</div><div class='add'>+	tcp_ctask-&gt;sg_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sc-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='del'>-		ctask-&gt;exp_r2tsn = 0;</div><div class='del'>-		ctask-&gt;hdr.flags |= ISCSI_FLAG_CMD_WRITE;</div><div class='add'>+		tcp_ctask-&gt;xmstate = XMSTATE_W_HDR;</div><div class='add'>+		tcp_ctask-&gt;exp_r2tsn = 0;</div><div class='ctx'> 		BUG_ON(ctask-&gt;total_length == 0);</div><div class='add'>+</div><div class='ctx'> 		if (sc-&gt;use_sg) {</div><div class='ctx'> 			struct scatterlist *sg = sc-&gt;request_buffer;</div><div class='ctx'> </div><div class='del'>-			iscsi_buf_init_sg(&amp;ctask-&gt;sendbuf,</div><div class='del'>-					  &amp;sg[ctask-&gt;sg_count++]);</div><div class='del'>-			ctask-&gt;sg = sg;</div><div class='del'>-			ctask-&gt;bad_sg = sg + sc-&gt;use_sg;</div><div class='del'>-		} else {</div><div class='del'>-			iscsi_buf_init_iov(&amp;ctask-&gt;sendbuf, sc-&gt;request_buffer,</div><div class='del'>-					sc-&gt;request_bufflen);</div><div class='del'>-		}</div><div class='add'>+			iscsi_buf_init_sg(&amp;tcp_ctask-&gt;sendbuf,</div><div class='add'>+					  &amp;sg[tcp_ctask-&gt;sg_count++]);</div><div class='add'>+			tcp_ctask-&gt;sg = sg;</div><div class='add'>+			tcp_ctask-&gt;bad_sg = sg + sc-&gt;use_sg;</div><div class='add'>+		} else</div><div class='add'>+			iscsi_buf_init_iov(&amp;tcp_ctask-&gt;sendbuf,</div><div class='add'>+					   sc-&gt;request_buffer,</div><div class='add'>+					   sc-&gt;request_bufflen);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Write counters:</div><div class='del'>-		 *</div><div class='del'>-		 *	imm_count	bytes to be sent right after</div><div class='del'>-		 *			SCSI PDU Header</div><div class='del'>-		 *</div><div class='del'>-		 *	unsol_count	bytes(as Data-Out) to be sent</div><div class='del'>-		 *			without	R2T ack right after</div><div class='del'>-		 *			immediate data</div><div class='del'>-		 *</div><div class='del'>-		 *	r2t_data_count	bytes to be sent via R2T ack's</div><div class='del'>-		 *</div><div class='del'>-		 *      pad_count       bytes to be sent as zero-padding</div><div class='del'>-		 */</div><div class='del'>-		ctask-&gt;imm_count = 0;</div><div class='del'>-		ctask-&gt;unsol_count = 0;</div><div class='del'>-		ctask-&gt;unsol_datasn = 0;</div><div class='del'>-		ctask-&gt;xmstate = XMSTATE_W_HDR;</div><div class='del'>-		/* calculate write padding */</div><div class='del'>-		ctask-&gt;pad_count = ctask-&gt;total_length &amp; (ISCSI_PAD_LEN-1);</div><div class='del'>-		if (ctask-&gt;pad_count) {</div><div class='del'>-			ctask-&gt;pad_count = ISCSI_PAD_LEN - ctask-&gt;pad_count;</div><div class='add'>+		if (ctask-&gt;imm_count)</div><div class='add'>+			tcp_ctask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='add'>+</div><div class='add'>+		tcp_ctask-&gt;pad_count = ctask-&gt;total_length &amp; (ISCSI_PAD_LEN-1);</div><div class='add'>+		if (tcp_ctask-&gt;pad_count) {</div><div class='add'>+			tcp_ctask-&gt;pad_count = ISCSI_PAD_LEN -</div><div class='add'>+							tcp_ctask-&gt;pad_count;</div><div class='ctx'> 			debug_scsi("write padding %d bytes\n",</div><div class='del'>-				ctask-&gt;pad_count);</div><div class='del'>-			ctask-&gt;xmstate |= XMSTATE_W_PAD;</div><div class='add'>+				   tcp_ctask-&gt;pad_count);</div><div class='add'>+			tcp_ctask-&gt;xmstate |= XMSTATE_W_PAD;</div><div class='ctx'> 		}</div><div class='del'>-		if (session-&gt;imm_data_en) {</div><div class='del'>-			if (ctask-&gt;total_length &gt;= session-&gt;first_burst)</div><div class='del'>-				ctask-&gt;imm_count = min(session-&gt;first_burst,</div><div class='del'>-							conn-&gt;max_xmit_dlength);</div><div class='del'>-			else</div><div class='del'>-				ctask-&gt;imm_count = min(ctask-&gt;total_length,</div><div class='del'>-							conn-&gt;max_xmit_dlength);</div><div class='del'>-			hton24(ctask-&gt;hdr.dlength, ctask-&gt;imm_count);</div><div class='del'>-			ctask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='del'>-		} else</div><div class='del'>-			zero_data(ctask-&gt;hdr.dlength);</div><div class='del'>-</div><div class='del'>-		if (!session-&gt;initial_r2t_en)</div><div class='del'>-			ctask-&gt;unsol_count = min(session-&gt;first_burst,</div><div class='del'>-				ctask-&gt;total_length) - ctask-&gt;imm_count;</div><div class='del'>-		if (!ctask-&gt;unsol_count)</div><div class='del'>-			/* No unsolicit Data-Out's */</div><div class='del'>-			ctask-&gt;hdr.flags |= ISCSI_FLAG_CMD_FINAL;</div><div class='del'>-		else</div><div class='del'>-			ctask-&gt;xmstate |= XMSTATE_UNS_HDR | XMSTATE_UNS_INIT;</div><div class='ctx'> </div><div class='del'>-		ctask-&gt;r2t_data_count = ctask-&gt;total_length -</div><div class='add'>+		if (ctask-&gt;unsol_count)</div><div class='add'>+			tcp_ctask-&gt;xmstate |= XMSTATE_UNS_HDR |</div><div class='add'>+						XMSTATE_UNS_INIT;</div><div class='add'>+		tcp_ctask-&gt;r2t_data_count = ctask-&gt;total_length -</div><div class='ctx'> 				    ctask-&gt;imm_count -</div><div class='ctx'> 				    ctask-&gt;unsol_count;</div><div class='ctx'> </div><div class='ctx'> 		debug_scsi("cmd [itt %x total %d imm %d imm_data %d "</div><div class='ctx'> 			   "r2t_data %d]\n",</div><div class='ctx'> 			   ctask-&gt;itt, ctask-&gt;total_length, ctask-&gt;imm_count,</div><div class='del'>-			   ctask-&gt;unsol_count, ctask-&gt;r2t_data_count);</div><div class='del'>-	} else {</div><div class='del'>-		ctask-&gt;hdr.flags |= ISCSI_FLAG_CMD_FINAL;</div><div class='del'>-		if (sc-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='del'>-			ctask-&gt;hdr.flags |= ISCSI_FLAG_CMD_READ;</div><div class='del'>-		ctask-&gt;datasn = 0;</div><div class='del'>-		ctask-&gt;xmstate = XMSTATE_R_HDR;</div><div class='del'>-		zero_data(ctask-&gt;hdr.dlength);</div><div class='del'>-	}</div><div class='add'>+			   ctask-&gt;unsol_count, tcp_ctask-&gt;r2t_data_count);</div><div class='add'>+	} else</div><div class='add'>+		tcp_ctask-&gt;xmstate = XMSTATE_R_HDR;</div><div class='ctx'> </div><div class='del'>-	iscsi_buf_init_virt(&amp;ctask-&gt;headbuf, (char*)&amp;ctask-&gt;hdr,</div><div class='add'>+	iscsi_buf_init_iov(&amp;tcp_ctask-&gt;headbuf, (char*)ctask-&gt;hdr,</div><div class='ctx'> 			    sizeof(struct iscsi_hdr));</div><div class='del'>-	conn-&gt;scsicmd_pdus_cnt++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * iscsi_mtask_xmit - xmit management(immediate) task</div><div class='add'>+ * iscsi_tcp_mtask_xmit - xmit management(immediate) task</div><div class='ctx'>  * @conn: iscsi connection</div><div class='ctx'>  * @mtask: task management task</div><div class='ctx'>  *</div><div class='hunk'>@@ -1669,132 +1334,167 @@ iscsi_cmd_init(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='ctx'>  *		IN_PROGRESS_IMM_DATA - PDU Data xmit in progress</div><div class='ctx'>  **/</div><div class='ctx'> static int</div><div class='del'>-iscsi_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)</div><div class='add'>+iscsi_tcp_mtask_xmit(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_mgmt_task *tcp_mtask = mtask-&gt;dd_data;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	debug_scsi("mtask deq [cid %d state %x itt 0x%x]\n",</div><div class='del'>-		conn-&gt;id, mtask-&gt;xmstate, mtask-&gt;itt);</div><div class='add'>+		conn-&gt;id, tcp_mtask-&gt;xmstate, mtask-&gt;itt);</div><div class='ctx'> </div><div class='del'>-	if (mtask-&gt;xmstate &amp; XMSTATE_IMM_HDR) {</div><div class='del'>-		mtask-&gt;xmstate &amp;= ~XMSTATE_IMM_HDR;</div><div class='add'>+	if (tcp_mtask-&gt;xmstate &amp; XMSTATE_IMM_HDR) {</div><div class='add'>+		tcp_mtask-&gt;xmstate &amp;= ~XMSTATE_IMM_HDR;</div><div class='ctx'> 		if (mtask-&gt;data_count)</div><div class='del'>-			mtask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='add'>+			tcp_mtask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='ctx'> 		if (conn-&gt;c_stage != ISCSI_CONN_INITIAL_STAGE &amp;&amp;</div><div class='del'>-	    	    conn-&gt;stop_stage != STOP_CONN_RECOVER &amp;&amp;</div><div class='add'>+		    conn-&gt;stop_stage != STOP_CONN_RECOVER &amp;&amp;</div><div class='ctx'> 		    conn-&gt;hdrdgst_en)</div><div class='del'>-			iscsi_hdr_digest(conn, &amp;mtask-&gt;headbuf,</div><div class='del'>-					(u8*)mtask-&gt;hdrext);</div><div class='del'>-		if (iscsi_sendhdr(conn, &amp;mtask-&gt;headbuf, mtask-&gt;data_count)) {</div><div class='del'>-			mtask-&gt;xmstate |= XMSTATE_IMM_HDR;</div><div class='add'>+			iscsi_hdr_digest(conn, &amp;tcp_mtask-&gt;headbuf,</div><div class='add'>+					(u8*)tcp_mtask-&gt;hdrext);</div><div class='add'>+		rc = iscsi_sendhdr(conn, &amp;tcp_mtask-&gt;headbuf,</div><div class='add'>+				   mtask-&gt;data_count);</div><div class='add'>+		if (rc) {</div><div class='add'>+			tcp_mtask-&gt;xmstate |= XMSTATE_IMM_HDR;</div><div class='ctx'> 			if (mtask-&gt;data_count)</div><div class='del'>-				mtask-&gt;xmstate &amp;= ~XMSTATE_IMM_DATA;</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+				tcp_mtask-&gt;xmstate &amp;= ~XMSTATE_IMM_DATA;</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (mtask-&gt;xmstate &amp; XMSTATE_IMM_DATA) {</div><div class='add'>+	if (tcp_mtask-&gt;xmstate &amp; XMSTATE_IMM_DATA) {</div><div class='ctx'> 		BUG_ON(!mtask-&gt;data_count);</div><div class='del'>-		mtask-&gt;xmstate &amp;= ~XMSTATE_IMM_DATA;</div><div class='add'>+		tcp_mtask-&gt;xmstate &amp;= ~XMSTATE_IMM_DATA;</div><div class='ctx'> 		/* FIXME: implement.</div><div class='ctx'> 		 * Virtual buffer could be spreaded across multiple pages...</div><div class='ctx'> 		 */</div><div class='ctx'> 		do {</div><div class='del'>-			if (iscsi_sendpage(conn, &amp;mtask-&gt;sendbuf,</div><div class='del'>-				   &amp;mtask-&gt;data_count, &amp;mtask-&gt;sent)) {</div><div class='del'>-				mtask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='del'>-				return -EAGAIN;</div><div class='add'>+			int rc;</div><div class='add'>+</div><div class='add'>+			rc = iscsi_sendpage(conn, &amp;tcp_mtask-&gt;sendbuf,</div><div class='add'>+					&amp;mtask-&gt;data_count, &amp;tcp_mtask-&gt;sent);</div><div class='add'>+			if (rc) {</div><div class='add'>+				tcp_mtask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='add'>+				return rc;</div><div class='ctx'> 			}</div><div class='ctx'> 		} while (mtask-&gt;data_count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	BUG_ON(mtask-&gt;xmstate != XMSTATE_IDLE);</div><div class='add'>+	BUG_ON(tcp_mtask-&gt;xmstate != XMSTATE_IDLE);</div><div class='add'>+	if (mtask-&gt;hdr-&gt;itt == cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='add'>+		struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+		list_del(&amp;conn-&gt;mtask-&gt;running);</div><div class='add'>+		__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;conn-&gt;mtask,</div><div class='add'>+			    sizeof(void*));</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-handle_xmstate_r_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='add'>+handle_xmstate_r_hdr(struct iscsi_conn *conn,</div><div class='add'>+		     struct iscsi_tcp_cmd_task *tcp_ctask)</div><div class='ctx'> {</div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_R_HDR;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_R_HDR;</div><div class='ctx'> 	if (conn-&gt;hdrdgst_en)</div><div class='del'>-		iscsi_hdr_digest(conn, &amp;ctask-&gt;headbuf, (u8*)ctask-&gt;hdrext);</div><div class='del'>-	if (!iscsi_sendhdr(conn, &amp;ctask-&gt;headbuf, 0)) {</div><div class='del'>-		BUG_ON(ctask-&gt;xmstate != XMSTATE_IDLE);</div><div class='add'>+		iscsi_hdr_digest(conn, &amp;tcp_ctask-&gt;headbuf,</div><div class='add'>+				 (u8*)tcp_ctask-&gt;hdrext);</div><div class='add'>+	rc = iscsi_sendhdr(conn, &amp;tcp_ctask-&gt;headbuf, 0);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		BUG_ON(tcp_ctask-&gt;xmstate != XMSTATE_IDLE);</div><div class='ctx'> 		return 0; /* wait for Data-In */</div><div class='ctx'> 	}</div><div class='del'>-	ctask-&gt;xmstate |= XMSTATE_R_HDR;</div><div class='del'>-	return -EAGAIN;</div><div class='add'>+	tcp_ctask-&gt;xmstate |= XMSTATE_R_HDR;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-handle_xmstate_w_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='add'>+handle_xmstate_w_hdr(struct iscsi_conn *conn,</div><div class='add'>+		     struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_W_HDR;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_W_HDR;</div><div class='ctx'> 	if (conn-&gt;hdrdgst_en)</div><div class='del'>-		iscsi_hdr_digest(conn, &amp;ctask-&gt;headbuf, (u8*)ctask-&gt;hdrext);</div><div class='del'>-	if (iscsi_sendhdr(conn, &amp;ctask-&gt;headbuf, ctask-&gt;imm_count)) {</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_W_HDR;</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+		iscsi_hdr_digest(conn, &amp;tcp_ctask-&gt;headbuf,</div><div class='add'>+				 (u8*)tcp_ctask-&gt;hdrext);</div><div class='add'>+	rc = iscsi_sendhdr(conn, &amp;tcp_ctask-&gt;headbuf, ctask-&gt;imm_count);</div><div class='add'>+	if (rc)</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_W_HDR;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> handle_xmstate_data_digest(struct iscsi_conn *conn,</div><div class='ctx'> 			   struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_DATA_DIGEST;</div><div class='del'>-	debug_tcp("resent data digest 0x%x\n", ctask-&gt;datadigest);</div><div class='del'>-	if (iscsi_digest_final_send(conn, ctask, &amp;ctask-&gt;immbuf,</div><div class='del'>-				    &amp;ctask-&gt;datadigest, 0)) {</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_DATA_DIGEST;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_DATA_DIGEST;</div><div class='add'>+	debug_tcp("resent data digest 0x%x\n", tcp_ctask-&gt;datadigest);</div><div class='add'>+	rc = iscsi_digest_final_send(conn, ctask, &amp;tcp_ctask-&gt;immbuf,</div><div class='add'>+				    &amp;tcp_ctask-&gt;datadigest, 0);</div><div class='add'>+	if (rc) {</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_DATA_DIGEST;</div><div class='ctx'> 		debug_tcp("resent data digest 0x%x fail!\n",</div><div class='del'>-			  ctask-&gt;datadigest);</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+			  tcp_ctask-&gt;datadigest);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> handle_xmstate_imm_data(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	BUG_ON(!ctask-&gt;imm_count);</div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_IMM_DATA;</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_IMM_DATA;</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;datadgst_en) {</div><div class='del'>-		iscsi_data_digest_init(conn, ctask);</div><div class='del'>-		ctask-&gt;immdigest = 0;</div><div class='add'>+		iscsi_data_digest_init(tcp_conn, ctask);</div><div class='add'>+		tcp_ctask-&gt;immdigest = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		if (iscsi_sendpage(conn, &amp;ctask-&gt;sendbuf, &amp;ctask-&gt;imm_count,</div><div class='del'>-				   &amp;ctask-&gt;sent)) {</div><div class='del'>-			ctask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='add'>+		rc = iscsi_sendpage(conn, &amp;tcp_ctask-&gt;sendbuf,</div><div class='add'>+				   &amp;ctask-&gt;imm_count, &amp;tcp_ctask-&gt;sent);</div><div class='add'>+		if (rc) {</div><div class='add'>+			tcp_ctask-&gt;xmstate |= XMSTATE_IMM_DATA;</div><div class='ctx'> 			if (conn-&gt;datadgst_en) {</div><div class='del'>-				crypto_digest_final(conn-&gt;data_tx_tfm,</div><div class='del'>-						(u8*)&amp;ctask-&gt;immdigest);</div><div class='add'>+				crypto_digest_final(tcp_conn-&gt;data_tx_tfm,</div><div class='add'>+						(u8*)&amp;tcp_ctask-&gt;immdigest);</div><div class='ctx'> 				debug_tcp("tx imm sendpage fail 0x%x\n",</div><div class='del'>-					  ctask-&gt;datadigest);</div><div class='add'>+					  tcp_ctask-&gt;datadigest);</div><div class='ctx'> 			}</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (conn-&gt;datadgst_en)</div><div class='del'>-			crypto_digest_update(conn-&gt;data_tx_tfm,</div><div class='del'>-					     &amp;ctask-&gt;sendbuf.sg, 1);</div><div class='add'>+			crypto_digest_update(tcp_conn-&gt;data_tx_tfm,</div><div class='add'>+					     &amp;tcp_ctask-&gt;sendbuf.sg, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (!ctask-&gt;imm_count)</div><div class='ctx'> 			break;</div><div class='del'>-		iscsi_buf_init_sg(&amp;ctask-&gt;sendbuf,</div><div class='del'>-				  &amp;ctask-&gt;sg[ctask-&gt;sg_count++]);</div><div class='add'>+		iscsi_buf_init_sg(&amp;tcp_ctask-&gt;sendbuf,</div><div class='add'>+				  &amp;tcp_ctask-&gt;sg[tcp_ctask-&gt;sg_count++]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;datadgst_en &amp;&amp; !(ctask-&gt;xmstate &amp; XMSTATE_W_PAD)) {</div><div class='del'>-		if (iscsi_digest_final_send(conn, ctask, &amp;ctask-&gt;immbuf,</div><div class='del'>-				            &amp;ctask-&gt;immdigest, 1)) {</div><div class='add'>+	if (conn-&gt;datadgst_en &amp;&amp; !(tcp_ctask-&gt;xmstate &amp; XMSTATE_W_PAD)) {</div><div class='add'>+		rc = iscsi_digest_final_send(conn, ctask, &amp;tcp_ctask-&gt;immbuf,</div><div class='add'>+				            &amp;tcp_ctask-&gt;immdigest, 1);</div><div class='add'>+		if (rc) {</div><div class='ctx'> 			debug_tcp("sending imm digest 0x%x fail!\n",</div><div class='del'>-				  ctask-&gt;immdigest);</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+				  tcp_ctask-&gt;immdigest);</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='del'>-		debug_tcp("sending imm digest 0x%x\n", ctask-&gt;immdigest);</div><div class='add'>+		debug_tcp("sending imm digest 0x%x\n", tcp_ctask-&gt;immdigest);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1803,74 +1503,81 @@ handle_xmstate_imm_data(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> static inline int</div><div class='ctx'> handle_xmstate_uns_hdr(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_data_task *dtask;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;xmstate |= XMSTATE_UNS_DATA;</div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_UNS_INIT) {</div><div class='add'>+	tcp_ctask-&gt;xmstate |= XMSTATE_UNS_DATA;</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_UNS_INIT) {</div><div class='ctx'> 		iscsi_unsolicit_data_init(conn, ctask);</div><div class='del'>-		BUG_ON(!ctask-&gt;dtask);</div><div class='del'>-		dtask = ctask-&gt;dtask;</div><div class='add'>+		dtask = tcp_ctask-&gt;dtask;</div><div class='ctx'> 		if (conn-&gt;hdrdgst_en)</div><div class='del'>-			iscsi_hdr_digest(conn, &amp;ctask-&gt;headbuf,</div><div class='add'>+			iscsi_hdr_digest(conn, &amp;tcp_ctask-&gt;headbuf,</div><div class='ctx'> 					(u8*)dtask-&gt;hdrext);</div><div class='del'>-		ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_INIT;</div><div class='add'>+		tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_INIT;</div><div class='ctx'> 	}</div><div class='del'>-	if (iscsi_sendhdr(conn, &amp;ctask-&gt;headbuf, ctask-&gt;data_count)) {</div><div class='del'>-		ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_DATA;</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_UNS_HDR;</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	rc = iscsi_sendhdr(conn, &amp;tcp_ctask-&gt;headbuf, ctask-&gt;data_count);</div><div class='add'>+	if (rc) {</div><div class='add'>+		tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_DATA;</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_UNS_HDR;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	debug_scsi("uns dout [itt 0x%x dlen %d sent %d]\n",</div><div class='del'>-		   ctask-&gt;itt, ctask-&gt;unsol_count, ctask-&gt;sent);</div><div class='add'>+		   ctask-&gt;itt, ctask-&gt;unsol_count, tcp_ctask-&gt;sent);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='ctx'> handle_xmstate_uns_data(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_data_task *dtask = ctask-&gt;dtask;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_data_task *dtask = tcp_ctask-&gt;dtask;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!ctask-&gt;data_count);</div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_DATA;</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_DATA;</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;datadgst_en) {</div><div class='del'>-		iscsi_data_digest_init(conn, ctask);</div><div class='add'>+		iscsi_data_digest_init(tcp_conn, ctask);</div><div class='ctx'> 		dtask-&gt;digest = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (;;) {</div><div class='del'>-		int start = ctask-&gt;sent;</div><div class='add'>+		int start = tcp_ctask-&gt;sent;</div><div class='ctx'> </div><div class='del'>-		if (iscsi_sendpage(conn, &amp;ctask-&gt;sendbuf, &amp;ctask-&gt;data_count,</div><div class='del'>-				   &amp;ctask-&gt;sent)) {</div><div class='del'>-			ctask-&gt;unsol_count -= ctask-&gt;sent - start;</div><div class='del'>-			ctask-&gt;xmstate |= XMSTATE_UNS_DATA;</div><div class='add'>+		rc = iscsi_sendpage(conn, &amp;tcp_ctask-&gt;sendbuf,</div><div class='add'>+				   &amp;ctask-&gt;data_count, &amp;tcp_ctask-&gt;sent);</div><div class='add'>+		if (rc) {</div><div class='add'>+			ctask-&gt;unsol_count -= tcp_ctask-&gt;sent - start;</div><div class='add'>+			tcp_ctask-&gt;xmstate |= XMSTATE_UNS_DATA;</div><div class='ctx'> 			/* will continue with this ctask later.. */</div><div class='ctx'> 			if (conn-&gt;datadgst_en) {</div><div class='del'>-				crypto_digest_final(conn-&gt;data_tx_tfm,</div><div class='add'>+				crypto_digest_final(tcp_conn-&gt;data_tx_tfm,</div><div class='ctx'> 						(u8 *)&amp;dtask-&gt;digest);</div><div class='ctx'> 				debug_tcp("tx uns data fail 0x%x\n",</div><div class='ctx'> 					  dtask-&gt;digest);</div><div class='ctx'> 			}</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		BUG_ON(ctask-&gt;sent &gt; ctask-&gt;total_length);</div><div class='del'>-		ctask-&gt;unsol_count -= ctask-&gt;sent - start;</div><div class='add'>+		BUG_ON(tcp_ctask-&gt;sent &gt; ctask-&gt;total_length);</div><div class='add'>+		ctask-&gt;unsol_count -= tcp_ctask-&gt;sent - start;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * XXX:we may run here with un-initial sendbuf.</div><div class='ctx'> 		 * so pass it</div><div class='ctx'> 		 */</div><div class='del'>-		if (conn-&gt;datadgst_en &amp;&amp; ctask-&gt;sent - start &gt; 0)</div><div class='del'>-			crypto_digest_update(conn-&gt;data_tx_tfm,</div><div class='del'>-					     &amp;ctask-&gt;sendbuf.sg, 1);</div><div class='add'>+		if (conn-&gt;datadgst_en &amp;&amp; tcp_ctask-&gt;sent - start &gt; 0)</div><div class='add'>+			crypto_digest_update(tcp_conn-&gt;data_tx_tfm,</div><div class='add'>+					     &amp;tcp_ctask-&gt;sendbuf.sg, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (!ctask-&gt;data_count)</div><div class='ctx'> 			break;</div><div class='del'>-		iscsi_buf_init_sg(&amp;ctask-&gt;sendbuf,</div><div class='del'>-				  &amp;ctask-&gt;sg[ctask-&gt;sg_count++]);</div><div class='add'>+		iscsi_buf_init_sg(&amp;tcp_ctask-&gt;sendbuf,</div><div class='add'>+				  &amp;tcp_ctask-&gt;sg[tcp_ctask-&gt;sg_count++]);</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(ctask-&gt;unsol_count &lt; 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1880,27 +1587,29 @@ handle_xmstate_uns_data(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ctask-&gt;unsol_count) {</div><div class='ctx'> 		if (conn-&gt;datadgst_en) {</div><div class='del'>-			if (iscsi_digest_final_send(conn, ctask,</div><div class='add'>+			rc = iscsi_digest_final_send(conn, ctask,</div><div class='ctx'> 						    &amp;dtask-&gt;digestbuf,</div><div class='del'>-						    &amp;dtask-&gt;digest, 1)) {</div><div class='add'>+						    &amp;dtask-&gt;digest, 1);</div><div class='add'>+			if (rc) {</div><div class='ctx'> 				debug_tcp("send uns digest 0x%x fail\n",</div><div class='ctx'> 					  dtask-&gt;digest);</div><div class='del'>-				return -EAGAIN;</div><div class='add'>+				return rc;</div><div class='ctx'> 			}</div><div class='ctx'> 			debug_tcp("sending uns digest 0x%x, more uns\n",</div><div class='ctx'> 				  dtask-&gt;digest);</div><div class='ctx'> 		}</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_UNS_INIT;</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_UNS_INIT;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conn-&gt;datadgst_en &amp;&amp; !(ctask-&gt;xmstate &amp; XMSTATE_W_PAD)) {</div><div class='del'>-		if (iscsi_digest_final_send(conn, ctask,</div><div class='add'>+	if (conn-&gt;datadgst_en &amp;&amp; !(tcp_ctask-&gt;xmstate &amp; XMSTATE_W_PAD)) {</div><div class='add'>+		rc = iscsi_digest_final_send(conn, ctask,</div><div class='ctx'> 					    &amp;dtask-&gt;digestbuf,</div><div class='del'>-					    &amp;dtask-&gt;digest, 1)) {</div><div class='add'>+					    &amp;dtask-&gt;digest, 1);</div><div class='add'>+		if (rc) {</div><div class='ctx'> 			debug_tcp("send last uns digest 0x%x fail\n",</div><div class='ctx'> 				   dtask-&gt;digest);</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 		debug_tcp("sending uns digest 0x%x\n",dtask-&gt;digest);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1912,15 +1621,17 @@ static inline int</div><div class='ctx'> handle_xmstate_sol_data(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	struct iscsi_r2t_info *r2t = ctask-&gt;r2t;</div><div class='del'>-	struct iscsi_data_task *dtask = r2t-&gt;dtask;</div><div class='del'>-	int left;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_r2t_info *r2t = tcp_ctask-&gt;r2t;</div><div class='add'>+	struct iscsi_data_task *dtask = &amp;r2t-&gt;dtask;</div><div class='add'>+	int left, rc;</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_DATA;</div><div class='del'>-	ctask-&gt;dtask = dtask;</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_DATA;</div><div class='add'>+	tcp_ctask-&gt;dtask = dtask;</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;datadgst_en) {</div><div class='del'>-		iscsi_data_digest_init(conn, ctask);</div><div class='add'>+		iscsi_data_digest_init(tcp_conn, ctask);</div><div class='ctx'> 		dtask-&gt;digest = 0;</div><div class='ctx'> 	}</div><div class='ctx'> solicit_again:</div><div class='hunk'>@@ -1930,25 +1641,27 @@ solicit_again:</div><div class='ctx'> 	if (!r2t-&gt;data_count)</div><div class='ctx'> 		goto data_out_done;</div><div class='ctx'> </div><div class='del'>-	if (iscsi_sendpage(conn, &amp;r2t-&gt;sendbuf, &amp;r2t-&gt;data_count, &amp;r2t-&gt;sent)) {</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='add'>+	rc = iscsi_sendpage(conn, &amp;r2t-&gt;sendbuf, &amp;r2t-&gt;data_count, &amp;r2t-&gt;sent);</div><div class='add'>+	if (rc) {</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='ctx'> 		/* will continue with this ctask later.. */</div><div class='ctx'> 		if (conn-&gt;datadgst_en) {</div><div class='del'>-			crypto_digest_final(conn-&gt;data_tx_tfm,</div><div class='add'>+			crypto_digest_final(tcp_conn-&gt;data_tx_tfm,</div><div class='ctx'> 					  (u8 *)&amp;dtask-&gt;digest);</div><div class='ctx'> 			debug_tcp("r2t data send fail 0x%x\n", dtask-&gt;digest);</div><div class='ctx'> 		}</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(r2t-&gt;data_count &lt; 0);</div><div class='ctx'> 	if (conn-&gt;datadgst_en)</div><div class='del'>-		crypto_digest_update(conn-&gt;data_tx_tfm, &amp;r2t-&gt;sendbuf.sg, 1);</div><div class='add'>+		crypto_digest_update(tcp_conn-&gt;data_tx_tfm, &amp;r2t-&gt;sendbuf.sg,</div><div class='add'>+				     1);</div><div class='ctx'> </div><div class='ctx'> 	if (r2t-&gt;data_count) {</div><div class='ctx'> 		BUG_ON(ctask-&gt;sc-&gt;use_sg == 0);</div><div class='ctx'> 		if (!iscsi_buf_left(&amp;r2t-&gt;sendbuf)) {</div><div class='del'>-			BUG_ON(ctask-&gt;bad_sg == r2t-&gt;sg);</div><div class='add'>+			BUG_ON(tcp_ctask-&gt;bad_sg == r2t-&gt;sg);</div><div class='ctx'> 			iscsi_buf_init_sg(&amp;r2t-&gt;sendbuf, r2t-&gt;sg);</div><div class='ctx'> 			r2t-&gt;sg += 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1964,19 +1677,20 @@ data_out_done:</div><div class='ctx'> 	left = r2t-&gt;data_length - r2t-&gt;sent;</div><div class='ctx'> 	if (left) {</div><div class='ctx'> 		if (conn-&gt;datadgst_en) {</div><div class='del'>-			if (iscsi_digest_final_send(conn, ctask,</div><div class='add'>+			rc = iscsi_digest_final_send(conn, ctask,</div><div class='ctx'> 						    &amp;dtask-&gt;digestbuf,</div><div class='del'>-						    &amp;dtask-&gt;digest, 1)) {</div><div class='add'>+						    &amp;dtask-&gt;digest, 1);</div><div class='add'>+			if (rc) {</div><div class='ctx'> 				debug_tcp("send r2t data digest 0x%x"</div><div class='ctx'> 					  "fail\n", dtask-&gt;digest);</div><div class='del'>-				return -EAGAIN;</div><div class='add'>+				return rc;</div><div class='ctx'> 			}</div><div class='ctx'> 			debug_tcp("r2t data send digest 0x%x\n",</div><div class='ctx'> 				  dtask-&gt;digest);</div><div class='ctx'> 		}</div><div class='ctx'> 		iscsi_solicit_data_cont(conn, ctask, r2t, left);</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='del'>-		ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_HDR;</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='add'>+		tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_HDR;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1984,26 +1698,27 @@ data_out_done:</div><div class='ctx'> 	 * Done with this R2T. Check if there are more</div><div class='ctx'> 	 * outstanding R2Ts ready to be processed.</div><div class='ctx'> 	 */</div><div class='del'>-	BUG_ON(ctask-&gt;r2t_data_count - r2t-&gt;data_length &lt; 0);</div><div class='add'>+	BUG_ON(tcp_ctask-&gt;r2t_data_count - r2t-&gt;data_length &lt; 0);</div><div class='ctx'> 	if (conn-&gt;datadgst_en) {</div><div class='del'>-		if (iscsi_digest_final_send(conn, ctask, &amp;dtask-&gt;digestbuf,</div><div class='del'>-					    &amp;dtask-&gt;digest, 1)) {</div><div class='add'>+		rc = iscsi_digest_final_send(conn, ctask, &amp;dtask-&gt;digestbuf,</div><div class='add'>+					    &amp;dtask-&gt;digest, 1);</div><div class='add'>+		if (rc) {</div><div class='ctx'> 			debug_tcp("send last r2t data digest 0x%x"</div><div class='ctx'> 				  "fail\n", dtask-&gt;digest);</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 		debug_tcp("r2t done dout digest 0x%x\n", dtask-&gt;digest);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctask-&gt;r2t_data_count -= r2t-&gt;data_length;</div><div class='del'>-	ctask-&gt;r2t = NULL;</div><div class='add'>+	tcp_ctask-&gt;r2t_data_count -= r2t-&gt;data_length;</div><div class='add'>+	tcp_ctask-&gt;r2t = NULL;</div><div class='ctx'> 	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	__kfifo_put(ctask-&gt;r2tpool.queue, (void*)&amp;r2t, sizeof(void*));</div><div class='add'>+	__kfifo_put(tcp_ctask-&gt;r2tpool.queue, (void*)&amp;r2t, sizeof(void*));</div><div class='ctx'> 	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-	if (__kfifo_get(ctask-&gt;r2tqueue, (void*)&amp;r2t, sizeof(void*))) {</div><div class='del'>-		ctask-&gt;r2t = r2t;</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='del'>-		ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_HDR;</div><div class='add'>+	if (__kfifo_get(tcp_ctask-&gt;r2tqueue, (void*)&amp;r2t, sizeof(void*))) {</div><div class='add'>+		tcp_ctask-&gt;r2t = r2t;</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='add'>+		tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_HDR;</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2013,36 +1728,44 @@ data_out_done:</div><div class='ctx'> static inline int</div><div class='ctx'> handle_xmstate_w_pad(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_data_task *dtask = ctask-&gt;dtask;</div><div class='del'>-	int sent;</div><div class='del'>-</div><div class='del'>-	ctask-&gt;xmstate &amp;= ~XMSTATE_W_PAD;</div><div class='del'>-	iscsi_buf_init_virt(&amp;ctask-&gt;sendbuf, (char*)&amp;ctask-&gt;pad,</div><div class='del'>-			    ctask-&gt;pad_count);</div><div class='del'>-	if (iscsi_sendpage(conn, &amp;ctask-&gt;sendbuf, &amp;ctask-&gt;pad_count, &amp;sent)) {</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_W_PAD;</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_data_task *dtask = tcp_ctask-&gt;dtask;</div><div class='add'>+	int sent, rc;</div><div class='add'>+</div><div class='add'>+	tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_W_PAD;</div><div class='add'>+	iscsi_buf_init_iov(&amp;tcp_ctask-&gt;sendbuf, (char*)&amp;tcp_ctask-&gt;pad,</div><div class='add'>+			    tcp_ctask-&gt;pad_count);</div><div class='add'>+	rc = iscsi_sendpage(conn, &amp;tcp_ctask-&gt;sendbuf, &amp;tcp_ctask-&gt;pad_count,</div><div class='add'>+			   &amp;sent);</div><div class='add'>+	if (rc) {</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_W_PAD;</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (conn-&gt;datadgst_en) {</div><div class='del'>-		crypto_digest_update(conn-&gt;data_tx_tfm, &amp;ctask-&gt;sendbuf.sg, 1);</div><div class='add'>+		crypto_digest_update(tcp_conn-&gt;data_tx_tfm,</div><div class='add'>+				     &amp;tcp_ctask-&gt;sendbuf.sg, 1);</div><div class='ctx'> 		/* imm data? */</div><div class='ctx'> 		if (!dtask) {</div><div class='del'>-			if (iscsi_digest_final_send(conn, ctask, &amp;ctask-&gt;immbuf,</div><div class='del'>-						    &amp;ctask-&gt;immdigest, 1)) {</div><div class='add'>+			rc = iscsi_digest_final_send(conn, ctask,</div><div class='add'>+						    &amp;tcp_ctask-&gt;immbuf,</div><div class='add'>+						    &amp;tcp_ctask-&gt;immdigest, 1);</div><div class='add'>+			if (rc) {</div><div class='ctx'> 				debug_tcp("send padding digest 0x%x"</div><div class='del'>-					  "fail!\n", ctask-&gt;immdigest);</div><div class='del'>-				return -EAGAIN;</div><div class='add'>+					  "fail!\n", tcp_ctask-&gt;immdigest);</div><div class='add'>+				return rc;</div><div class='ctx'> 			}</div><div class='ctx'> 			debug_tcp("done with padding, digest 0x%x\n",</div><div class='del'>-				  ctask-&gt;datadigest);</div><div class='add'>+				  tcp_ctask-&gt;datadigest);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (iscsi_digest_final_send(conn, ctask,</div><div class='add'>+			rc = iscsi_digest_final_send(conn, ctask,</div><div class='ctx'> 						    &amp;dtask-&gt;digestbuf,</div><div class='del'>-						    &amp;dtask-&gt;digest, 1)) {</div><div class='add'>+						    &amp;dtask-&gt;digest, 1);</div><div class='add'>+			if (rc) {</div><div class='ctx'> 				debug_tcp("send padding digest 0x%x"</div><div class='ctx'> 				          "fail\n", dtask-&gt;digest);</div><div class='del'>-				return -EAGAIN;</div><div class='add'>+				return rc;</div><div class='ctx'> 			}</div><div class='ctx'> 			debug_tcp("done with padding, digest 0x%x\n",</div><div class='ctx'> 				  dtask-&gt;digest);</div><div class='hunk'>@@ -2053,12 +1776,13 @@ handle_xmstate_w_pad(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iscsi_ctask_xmit(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='add'>+iscsi_tcp_ctask_xmit(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	debug_scsi("ctask deq [cid %d xmstate %x itt 0x%x]\n",</div><div class='del'>-		conn-&gt;id, ctask-&gt;xmstate, ctask-&gt;itt);</div><div class='add'>+		conn-&gt;id, tcp_ctask-&gt;xmstate, ctask-&gt;itt);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * serialize with TMF AbortTask</div><div class='hunk'>@@ -2066,40 +1790,38 @@ iscsi_ctask_xmit(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> 	if (ctask-&gt;mtask)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_R_HDR) {</div><div class='del'>-		rc = handle_xmstate_r_hdr(conn, ctask);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_R_HDR)</div><div class='add'>+		return handle_xmstate_r_hdr(conn, tcp_ctask);</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_W_HDR) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_W_HDR) {</div><div class='ctx'> 		rc = handle_xmstate_w_hdr(conn, ctask);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* XXX: for data digest xmit recover */</div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_DATA_DIGEST) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_DATA_DIGEST) {</div><div class='ctx'> 		rc = handle_xmstate_data_digest(conn, ctask);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_IMM_DATA) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_IMM_DATA) {</div><div class='ctx'> 		rc = handle_xmstate_imm_data(conn, ctask);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_UNS_HDR) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_UNS_HDR) {</div><div class='ctx'> 		BUG_ON(!ctask-&gt;unsol_count);</div><div class='del'>-		ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_HDR;</div><div class='add'>+		tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_UNS_HDR;</div><div class='ctx'> unsolicit_head_again:</div><div class='ctx'> 		rc = handle_xmstate_uns_hdr(conn, ctask);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_UNS_DATA) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_UNS_DATA) {</div><div class='ctx'> 		rc = handle_xmstate_uns_data(conn, ctask);</div><div class='ctx'> 		if (rc == 1)</div><div class='ctx'> 			goto unsolicit_head_again;</div><div class='hunk'>@@ -2108,23 +1830,24 @@ unsolicit_head_again:</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_SOL_HDR) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_SOL_HDR) {</div><div class='ctx'> 		struct iscsi_r2t_info *r2t;</div><div class='ctx'> </div><div class='del'>-		ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_HDR;</div><div class='del'>-		ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='del'>-		if (!ctask-&gt;r2t)</div><div class='del'>-			__kfifo_get(ctask-&gt;r2tqueue, (void*)&amp;ctask-&gt;r2t,</div><div class='add'>+		tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_HDR;</div><div class='add'>+		tcp_ctask-&gt;xmstate |= XMSTATE_SOL_DATA;</div><div class='add'>+		if (!tcp_ctask-&gt;r2t)</div><div class='add'>+			__kfifo_get(tcp_ctask-&gt;r2tqueue, (void*)&amp;tcp_ctask-&gt;r2t,</div><div class='ctx'> 				    sizeof(void*));</div><div class='ctx'> solicit_head_again:</div><div class='del'>-		r2t = ctask-&gt;r2t;</div><div class='add'>+		r2t = tcp_ctask-&gt;r2t;</div><div class='ctx'> 		if (conn-&gt;hdrdgst_en)</div><div class='ctx'> 			iscsi_hdr_digest(conn, &amp;r2t-&gt;headbuf,</div><div class='del'>-					(u8*)r2t-&gt;dtask-&gt;hdrext);</div><div class='del'>-		if (iscsi_sendhdr(conn, &amp;r2t-&gt;headbuf, r2t-&gt;data_count)) {</div><div class='del'>-			ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_DATA;</div><div class='del'>-			ctask-&gt;xmstate |= XMSTATE_SOL_HDR;</div><div class='del'>-			return -EAGAIN;</div><div class='add'>+					(u8*)r2t-&gt;dtask.hdrext);</div><div class='add'>+		rc = iscsi_sendhdr(conn, &amp;r2t-&gt;headbuf, r2t-&gt;data_count);</div><div class='add'>+		if (rc) {</div><div class='add'>+			tcp_ctask-&gt;xmstate &amp;= ~XMSTATE_SOL_DATA;</div><div class='add'>+			tcp_ctask-&gt;xmstate |= XMSTATE_SOL_HDR;</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		debug_scsi("sol dout [dsn %d itt 0x%x dlen %d sent %d]\n",</div><div class='hunk'>@@ -2132,7 +1855,7 @@ solicit_head_again:</div><div class='ctx'> 			r2t-&gt;sent);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ctask-&gt;xmstate &amp; XMSTATE_SOL_DATA) {</div><div class='add'>+	if (tcp_ctask-&gt;xmstate &amp; XMSTATE_SOL_DATA) {</div><div class='ctx'> 		rc = handle_xmstate_sol_data(conn, ctask);</div><div class='ctx'> 		if (rc == 1)</div><div class='ctx'> 			goto solicit_head_again;</div><div class='hunk'>@@ -2145,1022 +1868,199 @@ done:</div><div class='ctx'> 	 * Last thing to check is whether we need to send write</div><div class='ctx'> 	 * padding. Note that we check for xmstate equality, not just the bit.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ctask-&gt;xmstate == XMSTATE_W_PAD)</div><div class='add'>+	if (tcp_ctask-&gt;xmstate == XMSTATE_W_PAD)</div><div class='ctx'> 		rc = handle_xmstate_w_pad(conn, ctask);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iscsi_data_xmit - xmit any command into the scheduled connection</div><div class='del'>- * @conn: iscsi connection</div><div class='del'>- *</div><div class='del'>- * Notes:</div><div class='del'>- *	The function can return -EAGAIN in which case the caller must</div><div class='del'>- *	re-schedule it again later or recover. '0' return code means</div><div class='del'>- *	successful xmit.</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-iscsi_data_xmit(struct iscsi_conn *conn)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(conn-&gt;suspend_tx)) {</div><div class='del'>-		debug_tcp("conn %d Tx suspended!\n", conn-&gt;id);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Transmit in the following order:</div><div class='del'>-	 *</div><div class='del'>-	 * 1) un-finished xmit (ctask or mtask)</div><div class='del'>-	 * 2) immediate control PDUs</div><div class='del'>-	 * 3) write data</div><div class='del'>-	 * 4) SCSI commands</div><div class='del'>-	 * 5) non-immediate control PDUs</div><div class='del'>-	 *</div><div class='del'>-	 * No need to lock around __kfifo_get as long as</div><div class='del'>-	 * there's one producer and one consumer.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	BUG_ON(conn-&gt;ctask &amp;&amp; conn-&gt;mtask);</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;ctask) {</div><div class='del'>-		if (iscsi_ctask_xmit(conn, conn-&gt;ctask))</div><div class='del'>-			goto again;</div><div class='del'>-		/* done with this in-progress ctask */</div><div class='del'>-		conn-&gt;ctask = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (conn-&gt;mtask) {</div><div class='del'>-	        if (iscsi_mtask_xmit(conn, conn-&gt;mtask))</div><div class='del'>-		        goto again;</div><div class='del'>-		/* done with this in-progress mtask */</div><div class='del'>-		conn-&gt;mtask = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* process immediate first */</div><div class='del'>-        if (unlikely(__kfifo_len(conn-&gt;immqueue))) {</div><div class='del'>-		struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	        while (__kfifo_get(conn-&gt;immqueue, (void*)&amp;conn-&gt;mtask,</div><div class='del'>-			           sizeof(void*))) {</div><div class='del'>-		        if (iscsi_mtask_xmit(conn, conn-&gt;mtask))</div><div class='del'>-			        goto again;</div><div class='del'>-</div><div class='del'>-		        if (conn-&gt;mtask-&gt;hdr.itt ==</div><div class='del'>-					cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='del'>-			        spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-			        __kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-					    (void*)&amp;conn-&gt;mtask, sizeof(void*));</div><div class='del'>-			        spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		        }</div><div class='del'>-	        }</div><div class='del'>-		/* done with this mtask */</div><div class='del'>-		conn-&gt;mtask = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* process write queue */</div><div class='del'>-	while (__kfifo_get(conn-&gt;writequeue, (void*)&amp;conn-&gt;ctask,</div><div class='del'>-			   sizeof(void*))) {</div><div class='del'>-		if (iscsi_ctask_xmit(conn, conn-&gt;ctask))</div><div class='del'>-			goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* process command queue */</div><div class='del'>-	while (__kfifo_get(conn-&gt;xmitqueue, (void*)&amp;conn-&gt;ctask,</div><div class='del'>-			   sizeof(void*))) {</div><div class='del'>-		if (iscsi_ctask_xmit(conn, conn-&gt;ctask))</div><div class='del'>-			goto again;</div><div class='del'>-	}</div><div class='del'>-	/* done with this ctask */</div><div class='del'>-	conn-&gt;ctask = NULL;</div><div class='del'>-</div><div class='del'>-	/* process the rest control plane PDUs, if any */</div><div class='del'>-        if (unlikely(__kfifo_len(conn-&gt;mgmtqueue))) {</div><div class='del'>-		struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-</div><div class='del'>-	        while (__kfifo_get(conn-&gt;mgmtqueue, (void*)&amp;conn-&gt;mtask,</div><div class='del'>-			           sizeof(void*))) {</div><div class='del'>-		        if (iscsi_mtask_xmit(conn, conn-&gt;mtask))</div><div class='del'>-			        goto again;</div><div class='del'>-</div><div class='del'>-		        if (conn-&gt;mtask-&gt;hdr.itt ==</div><div class='del'>-					cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='del'>-			        spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-			        __kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-					    (void*)&amp;conn-&gt;mtask,</div><div class='del'>-				            sizeof(void*));</div><div class='del'>-			        spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		        }</div><div class='del'>-	        }</div><div class='del'>-		/* done with this mtask */</div><div class='del'>-		conn-&gt;mtask = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	if (unlikely(conn-&gt;suspend_tx))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -EAGAIN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iscsi_xmitworker(void *data)</div><div class='del'>-{</div><div class='del'>-	struct iscsi_conn *conn = data;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * serialize Xmit worker on a per-connection basis.</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	if (iscsi_data_xmit(conn))</div><div class='del'>-		scsi_queue_work(conn-&gt;session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define FAILURE_BAD_HOST		1</div><div class='del'>-#define FAILURE_SESSION_FAILED		2</div><div class='del'>-#define FAILURE_SESSION_FREED		3</div><div class='del'>-#define FAILURE_WINDOW_CLOSED		4</div><div class='del'>-#define FAILURE_SESSION_TERMINATE	5</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))</div><div class='del'>-{</div><div class='del'>-	struct Scsi_Host *host;</div><div class='del'>-	int reason = 0;</div><div class='del'>-	struct iscsi_session *session;</div><div class='del'>-	struct iscsi_conn *conn = NULL;</div><div class='del'>-	struct iscsi_cmd_task *ctask = NULL;</div><div class='del'>-</div><div class='del'>-	sc-&gt;scsi_done = done;</div><div class='del'>-	sc-&gt;result = 0;</div><div class='del'>-</div><div class='del'>-	host = sc-&gt;device-&gt;host;</div><div class='del'>-	session = iscsi_hostdata(host-&gt;hostdata);</div><div class='del'>-	BUG_ON(host != session-&gt;host);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (session-&gt;state != ISCSI_STATE_LOGGED_IN) {</div><div class='del'>-		if (session-&gt;state == ISCSI_STATE_FAILED) {</div><div class='del'>-			reason = FAILURE_SESSION_FAILED;</div><div class='del'>-			goto reject;</div><div class='del'>-		} else if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='del'>-			reason = FAILURE_SESSION_TERMINATE;</div><div class='del'>-			goto fault;</div><div class='del'>-		}</div><div class='del'>-		reason = FAILURE_SESSION_FREED;</div><div class='del'>-		goto fault;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check for iSCSI window and take care of CmdSN wrap-around</div><div class='del'>-	 */</div><div class='del'>-	if ((int)(session-&gt;max_cmdsn - session-&gt;cmdsn) &lt; 0) {</div><div class='del'>-		reason = FAILURE_WINDOW_CLOSED;</div><div class='del'>-		goto reject;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conn = session-&gt;leadconn;</div><div class='del'>-</div><div class='del'>-	__kfifo_get(session-&gt;cmdpool.queue, (void*)&amp;ctask, sizeof(void*));</div><div class='del'>-	BUG_ON(ctask-&gt;sc);</div><div class='del'>-</div><div class='del'>-	sc-&gt;SCp.phase = session-&gt;age;</div><div class='del'>-	sc-&gt;SCp.ptr = (char*)ctask;</div><div class='del'>-	iscsi_cmd_init(conn, ctask, sc);</div><div class='del'>-</div><div class='del'>-	__kfifo_put(conn-&gt;xmitqueue, (void*)&amp;ctask, sizeof(void*));</div><div class='del'>-	debug_scsi(</div><div class='del'>-	       "ctask enq [%s cid %d sc %lx itt 0x%x len %d cmdsn %d win %d]\n",</div><div class='del'>-		sc-&gt;sc_data_direction == DMA_TO_DEVICE ? "write" : "read",</div><div class='del'>-		conn-&gt;id, (long)sc, ctask-&gt;itt, sc-&gt;request_bufflen,</div><div class='del'>-		session-&gt;cmdsn, session-&gt;max_cmdsn - session-&gt;exp_cmdsn + 1);</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-	scsi_queue_work(host, &amp;conn-&gt;xmitwork);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-reject:</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-	debug_scsi("cmd 0x%x rejected (%d)\n", sc-&gt;cmnd[0], reason);</div><div class='del'>-	return SCSI_MLQUEUE_HOST_BUSY;</div><div class='del'>-</div><div class='del'>-fault:</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-	printk(KERN_ERR "iscsi_tcp: cmd 0x%x is not queued (%d)\n",</div><div class='del'>-	       sc-&gt;cmnd[0], reason);</div><div class='del'>-	sc-&gt;sense_buffer[0] = 0x70;</div><div class='del'>-	sc-&gt;sense_buffer[2] = NOT_READY;</div><div class='del'>-	sc-&gt;sense_buffer[7] = 0x6;</div><div class='del'>-	sc-&gt;sense_buffer[12] = 0x08;</div><div class='del'>-	sc-&gt;sense_buffer[13] = 0x00;</div><div class='del'>-	sc-&gt;result = (DID_NO_CONNECT &lt;&lt; 16);</div><div class='del'>-	sc-&gt;resid = sc-&gt;request_bufflen;</div><div class='del'>-	sc-&gt;scsi_done(sc);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iscsi_change_queue_depth(struct scsi_device *sdev, int depth)</div><div class='del'>-{</div><div class='del'>-	if (depth &gt; ISCSI_MAX_CMD_PER_LUN)</div><div class='del'>-		depth = ISCSI_MAX_CMD_PER_LUN;</div><div class='del'>-	scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);</div><div class='del'>-	return sdev-&gt;queue_depth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iscsi_pool_init(struct iscsi_queue *q, int max, void ***items, int item_size)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	*items = kmalloc(max * sizeof(void*), GFP_KERNEL);</div><div class='del'>-	if (*items == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	q-&gt;max = max;</div><div class='del'>-	q-&gt;pool = kmalloc(max * sizeof(void*), GFP_KERNEL);</div><div class='del'>-	if (q-&gt;pool == NULL) {</div><div class='del'>-		kfree(*items);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	q-&gt;queue = kfifo_init((void*)q-&gt;pool, max * sizeof(void*),</div><div class='del'>-			      GFP_KERNEL, NULL);</div><div class='del'>-	if (q-&gt;queue == ERR_PTR(-ENOMEM)) {</div><div class='del'>-		kfree(q-&gt;pool);</div><div class='del'>-		kfree(*items);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max; i++) {</div><div class='del'>-		q-&gt;pool[i] = kmalloc(item_size, GFP_KERNEL);</div><div class='del'>-		if (q-&gt;pool[i] == NULL) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			for (j = 0; j &lt; i; j++)</div><div class='del'>-				kfree(q-&gt;pool[j]);</div><div class='del'>-</div><div class='del'>-			kfifo_free(q-&gt;queue);</div><div class='del'>-			kfree(q-&gt;pool);</div><div class='del'>-			kfree(*items);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		memset(q-&gt;pool[i], 0, item_size);</div><div class='del'>-		(*items)[i] = q-&gt;pool[i];</div><div class='del'>-		__kfifo_put(q-&gt;queue, (void*)&amp;q-&gt;pool[i], sizeof(void*));</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iscsi_pool_free(struct iscsi_queue *q, void **items)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; q-&gt;max; i++)</div><div class='del'>-		kfree(items[i]);</div><div class='del'>-	kfree(q-&gt;pool);</div><div class='del'>-	kfree(items);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct iscsi_cls_conn *</div><div class='del'>-iscsi_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)</div><div class='add'>+iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)</div><div class='ctx'> {</div><div class='del'>-	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='del'>-	struct iscsi_session *session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='ctx'> 	struct iscsi_conn *conn;</div><div class='ctx'> 	struct iscsi_cls_conn *cls_conn;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn;</div><div class='ctx'> </div><div class='del'>-	cls_conn = iscsi_create_conn(cls_session, conn_idx);</div><div class='add'>+	cls_conn = iscsi_conn_setup(cls_session, conn_idx);</div><div class='ctx'> 	if (!cls_conn)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	conn = cls_conn-&gt;dd_data;</div><div class='del'>-	memset(conn, 0, sizeof(*conn));</div><div class='del'>-</div><div class='del'>-	conn-&gt;cls_conn = cls_conn;</div><div class='del'>-	conn-&gt;c_stage = ISCSI_CONN_INITIAL_STAGE;</div><div class='del'>-	conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='del'>-	conn-&gt;id = conn_idx;</div><div class='del'>-	conn-&gt;exp_statsn = 0;</div><div class='del'>-	conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='del'>-</div><div class='del'>-	/* initial operational parameters */</div><div class='del'>-	conn-&gt;hdr_size = sizeof(struct iscsi_hdr);</div><div class='del'>-	conn-&gt;data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;</div><div class='add'>+	/*</div><div class='add'>+	 * due to strange issues with iser these are not set</div><div class='add'>+	 * in iscsi_conn_setup</div><div class='add'>+	 */</div><div class='ctx'> 	conn-&gt;max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;</div><div class='ctx'> </div><div class='del'>-	/* initialize general xmit PDU commands queue */</div><div class='del'>-	conn-&gt;xmitqueue = kfifo_alloc(session-&gt;cmds_max * sizeof(void*),</div><div class='del'>-					GFP_KERNEL, NULL);</div><div class='del'>-	if (conn-&gt;xmitqueue == ERR_PTR(-ENOMEM))</div><div class='del'>-		goto xmitqueue_alloc_fail;</div><div class='del'>-</div><div class='del'>-	/* initialize write response PDU commands queue */</div><div class='del'>-	conn-&gt;writequeue = kfifo_alloc(session-&gt;cmds_max * sizeof(void*),</div><div class='del'>-					GFP_KERNEL, NULL);</div><div class='del'>-	if (conn-&gt;writequeue == ERR_PTR(-ENOMEM))</div><div class='del'>-		goto writequeue_alloc_fail;</div><div class='del'>-</div><div class='del'>-	/* initialize general immediate &amp; non-immediate PDU commands queue */</div><div class='del'>-	conn-&gt;immqueue = kfifo_alloc(session-&gt;mgmtpool_max * sizeof(void*),</div><div class='del'>-			                GFP_KERNEL, NULL);</div><div class='del'>-	if (conn-&gt;immqueue == ERR_PTR(-ENOMEM))</div><div class='del'>-		goto immqueue_alloc_fail;</div><div class='add'>+	tcp_conn = kzalloc(sizeof(*tcp_conn), GFP_KERNEL);</div><div class='add'>+	if (!tcp_conn)</div><div class='add'>+		goto tcp_conn_alloc_fail;</div><div class='ctx'> </div><div class='del'>-	conn-&gt;mgmtqueue = kfifo_alloc(session-&gt;mgmtpool_max * sizeof(void*),</div><div class='del'>-			                GFP_KERNEL, NULL);</div><div class='del'>-	if (conn-&gt;mgmtqueue == ERR_PTR(-ENOMEM))</div><div class='del'>-		goto mgmtqueue_alloc_fail;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;conn-&gt;xmitwork, iscsi_xmitworker, conn);</div><div class='del'>-</div><div class='del'>-	/* allocate login_mtask used for the login/text sequences */</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	if (!__kfifo_get(session-&gt;mgmtpool.queue,</div><div class='del'>-                         (void*)&amp;conn-&gt;login_mtask,</div><div class='del'>-			 sizeof(void*))) {</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		goto login_mtask_alloc_fail;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	conn-&gt;dd_data = tcp_conn;</div><div class='add'>+	tcp_conn-&gt;iscsi_conn = conn;</div><div class='add'>+	tcp_conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='add'>+	/* initial operational parameters */</div><div class='add'>+	tcp_conn-&gt;hdr_size = sizeof(struct iscsi_hdr);</div><div class='add'>+	tcp_conn-&gt;data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate initial PDU receive place holder */</div><div class='del'>-	if (conn-&gt;data_size &lt;= PAGE_SIZE)</div><div class='del'>-		conn-&gt;data = kmalloc(conn-&gt;data_size, GFP_KERNEL);</div><div class='add'>+	if (tcp_conn-&gt;data_size &lt;= PAGE_SIZE)</div><div class='add'>+		tcp_conn-&gt;data = kmalloc(tcp_conn-&gt;data_size, GFP_KERNEL);</div><div class='ctx'> 	else</div><div class='del'>-		conn-&gt;data = (void*)__get_free_pages(GFP_KERNEL,</div><div class='del'>-					get_order(conn-&gt;data_size));</div><div class='del'>-	if (!conn-&gt;data)</div><div class='add'>+		tcp_conn-&gt;data = (void*)__get_free_pages(GFP_KERNEL,</div><div class='add'>+					get_order(tcp_conn-&gt;data_size));</div><div class='add'>+	if (!tcp_conn-&gt;data)</div><div class='ctx'> 		goto max_recv_dlenght_alloc_fail;</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;conn-&gt;tmabort_timer);</div><div class='del'>-	mutex_init(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	init_waitqueue_head(&amp;conn-&gt;ehwait);</div><div class='del'>-</div><div class='ctx'> 	return cls_conn;</div><div class='ctx'> </div><div class='ctx'> max_recv_dlenght_alloc_fail:</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;conn-&gt;login_mtask,</div><div class='del'>-		    sizeof(void*));</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-login_mtask_alloc_fail:</div><div class='del'>-	kfifo_free(conn-&gt;mgmtqueue);</div><div class='del'>-mgmtqueue_alloc_fail:</div><div class='del'>-	kfifo_free(conn-&gt;immqueue);</div><div class='del'>-immqueue_alloc_fail:</div><div class='del'>-	kfifo_free(conn-&gt;writequeue);</div><div class='del'>-writequeue_alloc_fail:</div><div class='del'>-	kfifo_free(conn-&gt;xmitqueue);</div><div class='del'>-xmitqueue_alloc_fail:</div><div class='del'>-	iscsi_destroy_conn(cls_conn);</div><div class='add'>+	kfree(tcp_conn);</div><div class='add'>+tcp_conn_alloc_fail:</div><div class='add'>+	iscsi_conn_teardown(cls_conn);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iscsi_conn_destroy(struct iscsi_cls_conn *cls_conn)</div><div class='add'>+iscsi_tcp_conn_destroy(struct iscsi_cls_conn *cls_conn)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='del'>-	if (conn-&gt;c_stage == ISCSI_CONN_INITIAL_STAGE &amp;&amp; conn-&gt;sock) {</div><div class='del'>-		struct sock *sk = conn-&gt;sock-&gt;sk;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * conn_start() has never been called!</div><div class='del'>-		 * need to cleanup the socket.</div><div class='del'>-		 */</div><div class='del'>-		write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-		set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='del'>-		write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-</div><div class='del'>-		sock_hold(conn-&gt;sock-&gt;sk);</div><div class='del'>-		iscsi_conn_restore_callbacks(conn);</div><div class='del'>-		sock_put(conn-&gt;sock-&gt;sk);</div><div class='del'>-		sock_release(conn-&gt;sock);</div><div class='del'>-		conn-&gt;sock = NULL;</div><div class='del'>-	}</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	int digest = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	conn-&gt;c_stage = ISCSI_CONN_CLEANUP_WAIT;</div><div class='del'>-	if (session-&gt;leadconn == conn) {</div><div class='del'>-		/*</div><div class='del'>-		 * leading connection? then give up on recovery.</div><div class='del'>-		 */</div><div class='del'>-		session-&gt;state = ISCSI_STATE_TERMINATE;</div><div class='del'>-		wake_up(&amp;conn-&gt;ehwait);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (conn-&gt;hdrdgst_en || conn-&gt;datadgst_en)</div><div class='add'>+		digest = 1;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	iscsi_conn_teardown(cls_conn);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Block until all in-progress commands for this connection</div><div class='del'>-	 * time out or fail.</div><div class='del'>-	 */</div><div class='del'>-	for (;;) {</div><div class='del'>-		spin_lock_irqsave(session-&gt;host-&gt;host_lock, flags);</div><div class='del'>-		if (!session-&gt;host-&gt;host_busy) { /* OK for ERL == 0 */</div><div class='del'>-			spin_unlock_irqrestore(session-&gt;host-&gt;host_lock, flags);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(session-&gt;host-&gt;host_lock, flags);</div><div class='del'>-		msleep_interruptible(500);</div><div class='del'>-		printk("conn_destroy(): host_busy %d host_failed %d\n",</div><div class='del'>-			session-&gt;host-&gt;host_busy, session-&gt;host-&gt;host_failed);</div><div class='del'>-		/*</div><div class='del'>-		 * force eh_abort() to unblock</div><div class='del'>-		 */</div><div class='del'>-		wake_up(&amp;conn-&gt;ehwait);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now free crypto */</div><div class='del'>-	if (conn-&gt;hdrdgst_en || conn-&gt;datadgst_en) {</div><div class='del'>-		if (conn-&gt;tx_tfm)</div><div class='del'>-			crypto_free_tfm(conn-&gt;tx_tfm);</div><div class='del'>-		if (conn-&gt;rx_tfm)</div><div class='del'>-			crypto_free_tfm(conn-&gt;rx_tfm);</div><div class='del'>-		if (conn-&gt;data_tx_tfm)</div><div class='del'>-			crypto_free_tfm(conn-&gt;data_tx_tfm);</div><div class='del'>-		if (conn-&gt;data_rx_tfm)</div><div class='del'>-			crypto_free_tfm(conn-&gt;data_rx_tfm);</div><div class='add'>+	/* now free tcp_conn */</div><div class='add'>+	if (digest) {</div><div class='add'>+		if (tcp_conn-&gt;tx_tfm)</div><div class='add'>+			crypto_free_tfm(tcp_conn-&gt;tx_tfm);</div><div class='add'>+		if (tcp_conn-&gt;rx_tfm)</div><div class='add'>+			crypto_free_tfm(tcp_conn-&gt;rx_tfm);</div><div class='add'>+		if (tcp_conn-&gt;data_tx_tfm)</div><div class='add'>+			crypto_free_tfm(tcp_conn-&gt;data_tx_tfm);</div><div class='add'>+		if (tcp_conn-&gt;data_rx_tfm)</div><div class='add'>+			crypto_free_tfm(tcp_conn-&gt;data_rx_tfm);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* free conn-&gt;data, size = MaxRecvDataSegmentLength */</div><div class='del'>-	if (conn-&gt;data_size &lt;= PAGE_SIZE)</div><div class='del'>-		kfree(conn-&gt;data);</div><div class='add'>+	if (tcp_conn-&gt;data_size &lt;= PAGE_SIZE)</div><div class='add'>+		kfree(tcp_conn-&gt;data);</div><div class='ctx'> 	else</div><div class='del'>-		free_pages((unsigned long)conn-&gt;data,</div><div class='del'>-					get_order(conn-&gt;data_size));</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;conn-&gt;login_mtask,</div><div class='del'>-		    sizeof(void*));</div><div class='del'>-	list_del(&amp;conn-&gt;item);</div><div class='del'>-	if (list_empty(&amp;session-&gt;connections))</div><div class='del'>-		session-&gt;leadconn = NULL;</div><div class='del'>-	if (session-&gt;leadconn &amp;&amp; session-&gt;leadconn == conn)</div><div class='del'>-		session-&gt;leadconn = container_of(session-&gt;connections.next,</div><div class='del'>-			struct iscsi_conn, item);</div><div class='del'>-</div><div class='del'>-	if (session-&gt;leadconn == NULL)</div><div class='del'>-		/* none connections exits.. reset sequencing */</div><div class='del'>-		session-&gt;cmdsn = session-&gt;max_cmdsn = session-&gt;exp_cmdsn = 1;</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-	kfifo_free(conn-&gt;xmitqueue);</div><div class='del'>-	kfifo_free(conn-&gt;writequeue);</div><div class='del'>-	kfifo_free(conn-&gt;immqueue);</div><div class='del'>-	kfifo_free(conn-&gt;mgmtqueue);</div><div class='del'>-</div><div class='del'>-	iscsi_destroy_conn(cls_conn);</div><div class='add'>+		free_pages((unsigned long)tcp_conn-&gt;data,</div><div class='add'>+			   get_order(tcp_conn-&gt;data_size));</div><div class='add'>+	kfree(tcp_conn);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iscsi_conn_bind(struct iscsi_cls_session *cls_session,</div><div class='del'>-		struct iscsi_cls_conn *cls_conn, uint32_t transport_fd,</div><div class='del'>-		int is_leading)</div><div class='add'>+iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,</div><div class='add'>+		    struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,</div><div class='add'>+		    int is_leading)</div><div class='ctx'> {</div><div class='del'>-	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='del'>-	struct iscsi_session *session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='del'>-	struct iscsi_conn *tmp = ERR_PTR(-EEXIST), *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> 	struct sock *sk;</div><div class='ctx'> 	struct socket *sock;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* lookup for existing socket */</div><div class='del'>-	sock = sockfd_lookup(transport_fd, &amp;err);</div><div class='add'>+	sock = sockfd_lookup((int)transport_eph, &amp;err);</div><div class='ctx'> 	if (!sock) {</div><div class='ctx'> 		printk(KERN_ERR "iscsi_tcp: sockfd_lookup failed %d\n", err);</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* lookup for existing connection */</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	list_for_each_entry(tmp, &amp;session-&gt;connections, item) {</div><div class='del'>-		if (tmp == conn) {</div><div class='del'>-			if (conn-&gt;c_stage != ISCSI_CONN_STOPPED ||</div><div class='del'>-			    conn-&gt;stop_stage == STOP_CONN_TERM) {</div><div class='del'>-				printk(KERN_ERR "iscsi_tcp: can't bind "</div><div class='del'>-				       "non-stopped connection (%d:%d)\n",</div><div class='del'>-				       conn-&gt;c_stage, conn-&gt;stop_stage);</div><div class='del'>-				spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (tmp != conn) {</div><div class='del'>-		/* bind new iSCSI connection to session */</div><div class='del'>-		conn-&gt;session = session;</div><div class='del'>-</div><div class='del'>-		list_add(&amp;conn-&gt;item, &amp;session-&gt;connections);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (conn-&gt;stop_stage != STOP_CONN_SUSPEND) {</div><div class='del'>-		/* bind iSCSI connection and socket */</div><div class='del'>-		conn-&gt;sock = sock;</div><div class='add'>+	err = iscsi_conn_bind(cls_session, cls_conn, is_leading);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-		/* setup Socket parameters */</div><div class='del'>-		sk = sock-&gt;sk;</div><div class='del'>-		sk-&gt;sk_reuse = 1;</div><div class='del'>-		sk-&gt;sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */</div><div class='del'>-		sk-&gt;sk_allocation = GFP_ATOMIC;</div><div class='add'>+	/* bind iSCSI connection and socket */</div><div class='add'>+	tcp_conn-&gt;sock = sock;</div><div class='ctx'> </div><div class='del'>-		/* FIXME: disable Nagle's algorithm */</div><div class='add'>+	/* setup Socket parameters */</div><div class='add'>+	sk = sock-&gt;sk;</div><div class='add'>+	sk-&gt;sk_reuse = 1;</div><div class='add'>+	sk-&gt;sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */</div><div class='add'>+	sk-&gt;sk_allocation = GFP_ATOMIC;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * Intercept TCP callbacks for sendfile like receive</div><div class='del'>-		 * processing.</div><div class='del'>-		 */</div><div class='del'>-		iscsi_conn_set_callbacks(conn);</div><div class='del'>-</div><div class='del'>-		conn-&gt;sendpage = conn-&gt;sock-&gt;ops-&gt;sendpage;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * set receive state machine into initial state</div><div class='del'>-		 */</div><div class='del'>-		conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_leading)</div><div class='del'>-		session-&gt;leadconn = conn;</div><div class='add'>+	/* FIXME: disable Nagle's algorithm */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Unblock xmitworker(), Login Phase will pass through.</div><div class='add'>+	 * Intercept TCP callbacks for sendfile like receive</div><div class='add'>+	 * processing.</div><div class='add'>+	 */</div><div class='add'>+	conn-&gt;recv_lock = &amp;sk-&gt;sk_callback_lock;</div><div class='add'>+	iscsi_conn_set_callbacks(conn);</div><div class='add'>+	tcp_conn-&gt;sendpage = tcp_conn-&gt;sock-&gt;ops-&gt;sendpage;</div><div class='add'>+	/*</div><div class='add'>+	 * set receive state machine into initial state</div><div class='ctx'> 	 */</div><div class='del'>-	clear_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='del'>-	clear_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+	tcp_conn-&gt;in_progress = IN_PROGRESS_WAIT_HEADER;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-iscsi_conn_start(struct iscsi_cls_conn *cls_conn)</div><div class='add'>+static void</div><div class='add'>+iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	struct sock *sk;</div><div class='del'>-</div><div class='del'>-	/* FF phase warming up... */</div><div class='del'>-</div><div class='del'>-	if (session == NULL) {</div><div class='del'>-		printk(KERN_ERR "iscsi_tcp: can't start unbound connection\n");</div><div class='del'>-		return -EPERM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sk = conn-&gt;sock-&gt;sk;</div><div class='add'>+	struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+	struct iscsi_r2t_info *r2t;</div><div class='ctx'> </div><div class='del'>-	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	conn-&gt;c_stage = ISCSI_CONN_STARTED;</div><div class='del'>-	session-&gt;state = ISCSI_STATE_LOGGED_IN;</div><div class='add'>+	/* flush ctask's r2t queues */</div><div class='add'>+	while (__kfifo_get(tcp_ctask-&gt;r2tqueue, (void*)&amp;r2t, sizeof(void*)))</div><div class='add'>+		__kfifo_put(tcp_ctask-&gt;r2tpool.queue, (void*)&amp;r2t,</div><div class='add'>+			    sizeof(void*));</div><div class='ctx'> </div><div class='del'>-	switch(conn-&gt;stop_stage) {</div><div class='del'>-	case STOP_CONN_RECOVER:</div><div class='del'>-		/*</div><div class='del'>-		 * unblock eh_abort() if it is blocked. re-try all</div><div class='del'>-		 * commands after successful recovery</div><div class='del'>-		 */</div><div class='del'>-		session-&gt;conn_cnt++;</div><div class='del'>-		conn-&gt;stop_stage = 0;</div><div class='del'>-		conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='del'>-		session-&gt;age++;</div><div class='del'>-		wake_up(&amp;conn-&gt;ehwait);</div><div class='del'>-		break;</div><div class='del'>-	case STOP_CONN_TERM:</div><div class='del'>-		session-&gt;conn_cnt++;</div><div class='del'>-		conn-&gt;stop_stage = 0;</div><div class='del'>-		break;</div><div class='del'>-	case STOP_CONN_SUSPEND:</div><div class='del'>-		conn-&gt;stop_stage = 0;</div><div class='del'>-		clear_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='del'>-		clear_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	__iscsi_ctask_cleanup(conn, ctask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)</div><div class='add'>+iscsi_tcp_suspend_conn_rx(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> 	struct sock *sk;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!conn-&gt;sock);</div><div class='del'>-	sk = conn-&gt;sock-&gt;sk;</div><div class='add'>+	if (!tcp_conn-&gt;sock)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sk = tcp_conn-&gt;sock-&gt;sk;</div><div class='ctx'> 	write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='add'>+	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='ctx'> 	write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(session-&gt;host-&gt;host_lock, flags);</div><div class='del'>-	spin_lock(&amp;session-&gt;lock);</div><div class='del'>-	conn-&gt;stop_stage = flag;</div><div class='del'>-	conn-&gt;c_stage = ISCSI_CONN_STOPPED;</div><div class='del'>-	set_bit(SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='del'>-</div><div class='del'>-	if (flag != STOP_CONN_SUSPEND)</div><div class='del'>-		session-&gt;conn_cnt--;</div><div class='del'>-</div><div class='del'>-	if (session-&gt;conn_cnt == 0 || session-&gt;leadconn == conn)</div><div class='del'>-		session-&gt;state = ISCSI_STATE_FAILED;</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-	spin_unlock_irqrestore(session-&gt;host-&gt;host_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (flag == STOP_CONN_TERM || flag == STOP_CONN_RECOVER) {</div><div class='del'>-		struct iscsi_cmd_task *ctask;</div><div class='del'>-		struct iscsi_mgmt_task *mtask;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Socket must go now.</div><div class='del'>-		 */</div><div class='del'>-		sock_hold(conn-&gt;sock-&gt;sk);</div><div class='del'>-		iscsi_conn_restore_callbacks(conn);</div><div class='del'>-		sock_put(conn-&gt;sock-&gt;sk);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * flush xmit queues.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-		while (__kfifo_get(conn-&gt;writequeue, (void*)&amp;ctask,</div><div class='del'>-			    sizeof(void*)) ||</div><div class='del'>-			__kfifo_get(conn-&gt;xmitqueue, (void*)&amp;ctask,</div><div class='del'>-			    sizeof(void*))) {</div><div class='del'>-			struct iscsi_r2t_info *r2t;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * flush ctask's r2t queues</div><div class='del'>-			 */</div><div class='del'>-			while (__kfifo_get(ctask-&gt;r2tqueue, (void*)&amp;r2t,</div><div class='del'>-				sizeof(void*)))</div><div class='del'>-				__kfifo_put(ctask-&gt;r2tpool.queue, (void*)&amp;r2t,</div><div class='del'>-					    sizeof(void*));</div><div class='del'>-</div><div class='del'>-			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-			local_bh_disable();</div><div class='del'>-			iscsi_ctask_cleanup(conn, ctask);</div><div class='del'>-			local_bh_enable();</div><div class='del'>-			spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-		conn-&gt;ctask = NULL;</div><div class='del'>-		while (__kfifo_get(conn-&gt;immqueue, (void*)&amp;mtask,</div><div class='del'>-			   sizeof(void*)) ||</div><div class='del'>-			__kfifo_get(conn-&gt;mgmtqueue, (void*)&amp;mtask,</div><div class='del'>-			   sizeof(void*))) {</div><div class='del'>-			__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-				    (void*)&amp;mtask, sizeof(void*));</div><div class='del'>-		}</div><div class='del'>-		conn-&gt;mtask = NULL;</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * release socket only after we stopped data_xmit()</div><div class='del'>-		 * activity and flushed all outstandings</div><div class='del'>-		 */</div><div class='del'>-		sock_release(conn-&gt;sock);</div><div class='del'>-		conn-&gt;sock = NULL;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * for connection level recovery we should not calculate</div><div class='del'>-		 * header digest. conn-&gt;hdr_size used for optimization</div><div class='del'>-		 * in hdr_extract() and will be re-negotiated at</div><div class='del'>-		 * set_param() time.</div><div class='del'>-		 */</div><div class='del'>-		if (flag == STOP_CONN_RECOVER) {</div><div class='del'>-			conn-&gt;hdr_size = sizeof(struct iscsi_hdr);</div><div class='del'>-			conn-&gt;hdrdgst_en = 0;</div><div class='del'>-			conn-&gt;datadgst_en = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iscsi_conn_send_generic(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='del'>-			char *data, uint32_t data_size)</div><div class='del'>-{</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-	struct iscsi_nopout *nop = (struct iscsi_nopout *)hdr;</div><div class='del'>-	struct iscsi_mgmt_task *mtask;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		return -EPERM;</div><div class='del'>-	}</div><div class='del'>-	if (hdr-&gt;opcode == (ISCSI_OP_LOGIN | ISCSI_OP_IMMEDIATE) ||</div><div class='del'>-	    hdr-&gt;opcode == (ISCSI_OP_TEXT | ISCSI_OP_IMMEDIATE))</div><div class='del'>-		/*</div><div class='del'>-		 * Login and Text are sent serially, in</div><div class='del'>-		 * request-followed-by-response sequence.</div><div class='del'>-		 * Same mtask can be used. Same ITT must be used.</div><div class='del'>-		 * Note that login_mtask is preallocated at conn_create().</div><div class='del'>-		 */</div><div class='del'>-		mtask = conn-&gt;login_mtask;</div><div class='del'>-	else {</div><div class='del'>-	        BUG_ON(conn-&gt;c_stage == ISCSI_CONN_INITIAL_STAGE);</div><div class='del'>-	        BUG_ON(conn-&gt;c_stage == ISCSI_CONN_STOPPED);</div><div class='del'>-</div><div class='del'>-		if (!__kfifo_get(session-&gt;mgmtpool.queue,</div><div class='del'>-				 (void*)&amp;mtask, sizeof(void*))) {</div><div class='del'>-			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * pre-format CmdSN and ExpStatSN for outgoing PDU.</div><div class='del'>-	 */</div><div class='del'>-	if (hdr-&gt;itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='del'>-		hdr-&gt;itt = mtask-&gt;itt | (conn-&gt;id &lt;&lt; CID_SHIFT) |</div><div class='del'>-			   (session-&gt;age &lt;&lt; AGE_SHIFT);</div><div class='del'>-		nop-&gt;cmdsn = cpu_to_be32(session-&gt;cmdsn);</div><div class='del'>-		if (conn-&gt;c_stage == ISCSI_CONN_STARTED &amp;&amp;</div><div class='del'>-		    !(hdr-&gt;opcode &amp; ISCSI_OP_IMMEDIATE))</div><div class='del'>-			session-&gt;cmdsn++;</div><div class='del'>-	} else</div><div class='del'>-		/* do not advance CmdSN */</div><div class='del'>-		nop-&gt;cmdsn = cpu_to_be32(session-&gt;cmdsn);</div><div class='del'>-</div><div class='del'>-	nop-&gt;exp_statsn = cpu_to_be32(conn-&gt;exp_statsn);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;mtask-&gt;hdr, hdr, sizeof(struct iscsi_hdr));</div><div class='del'>-</div><div class='del'>-	iscsi_buf_init_virt(&amp;mtask-&gt;headbuf, (char*)&amp;mtask-&gt;hdr,</div><div class='del'>-				    sizeof(struct iscsi_hdr));</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (data_size) {</div><div class='del'>-		memcpy(mtask-&gt;data, data, data_size);</div><div class='del'>-		mtask-&gt;data_count = data_size;</div><div class='del'>-	} else</div><div class='del'>-		mtask-&gt;data_count = 0;</div><div class='del'>-</div><div class='del'>-	mtask-&gt;xmstate = XMSTATE_IMM_HDR;</div><div class='del'>-</div><div class='del'>-	if (mtask-&gt;data_count) {</div><div class='del'>-		iscsi_buf_init_iov(&amp;mtask-&gt;sendbuf, (char*)mtask-&gt;data,</div><div class='del'>-				    mtask-&gt;data_count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	debug_scsi("mgmtpdu [op 0x%x hdr-&gt;itt 0x%x datalen %d]\n",</div><div class='del'>-		   hdr-&gt;opcode, hdr-&gt;itt, data_size);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * since send_pdu() could be called at least from two contexts,</div><div class='del'>-	 * we need to serialize __kfifo_put, so we don't have to take</div><div class='del'>-	 * additional lock on fast data-path</div><div class='del'>-	 */</div><div class='del'>-        if (hdr-&gt;opcode &amp; ISCSI_OP_IMMEDIATE)</div><div class='del'>-	        __kfifo_put(conn-&gt;immqueue, (void*)&amp;mtask, sizeof(void*));</div><div class='del'>-	else</div><div class='del'>-	        __kfifo_put(conn-&gt;mgmtqueue, (void*)&amp;mtask, sizeof(void*));</div><div class='del'>-</div><div class='del'>-	scsi_queue_work(session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-iscsi_eh_host_reset(struct scsi_cmnd *sc)</div><div class='add'>+static void</div><div class='add'>+iscsi_tcp_terminate_conn(struct iscsi_conn *conn)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)sc-&gt;SCp.ptr;</div><div class='del'>-	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='del'>-		debug_scsi("failing host reset: session terminated "</div><div class='del'>-			   "[CID %d age %d]", conn-&gt;id, session-&gt;age);</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		return FAILED;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (!tcp_conn-&gt;sock)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	debug_scsi("failing connection CID %d due to SCSI host reset "</div><div class='del'>-		   "[itt 0x%x age %d]", conn-&gt;id, ctask-&gt;itt,</div><div class='del'>-		   session-&gt;age);</div><div class='del'>-	iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+	sock_hold(tcp_conn-&gt;sock-&gt;sk);</div><div class='add'>+	iscsi_conn_restore_callbacks(conn);</div><div class='add'>+	sock_put(tcp_conn-&gt;sock-&gt;sk);</div><div class='ctx'> </div><div class='del'>-	return SUCCESS;</div><div class='add'>+	sock_release(tcp_conn-&gt;sock);</div><div class='add'>+	tcp_conn-&gt;sock = NULL;</div><div class='add'>+	conn-&gt;recv_lock = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* called with host lock */</div><div class='ctx'> static void</div><div class='del'>-iscsi_tmabort_timedout(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)data;</div><div class='del'>-	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;session-&gt;lock);</div><div class='del'>-	if (conn-&gt;tmabort_state == TMABORT_INITIAL) {</div><div class='del'>-		__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='del'>-				(void*)&amp;ctask-&gt;mtask, sizeof(void*));</div><div class='del'>-		conn-&gt;tmabort_state = TMABORT_TIMEDOUT;</div><div class='del'>-		debug_scsi("tmabort timedout [sc %lx itt 0x%x]\n",</div><div class='del'>-			(long)ctask-&gt;sc, ctask-&gt;itt);</div><div class='del'>-		/* unblock eh_abort() */</div><div class='del'>-		wake_up(&amp;conn-&gt;ehwait);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;session-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iscsi_eh_abort(struct scsi_cmnd *sc)</div><div class='add'>+iscsi_tcp_mgmt_init(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask,</div><div class='add'>+		    char *data, uint32_t data_size)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='del'>-	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)sc-&gt;SCp.ptr;</div><div class='del'>-	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='del'>-	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-</div><div class='del'>-	conn-&gt;eh_abort_cnt++;</div><div class='del'>-	debug_scsi("aborting [sc %lx itt 0x%x]\n", (long)sc, ctask-&gt;itt);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * two cases for ERL=0 here:</div><div class='del'>-	 *</div><div class='del'>-	 * 1) connection-level failure;</div><div class='del'>-	 * 2) recovery due protocol error;</div><div class='del'>-	 */</div><div class='del'>-	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	if (session-&gt;state != ISCSI_STATE_LOGGED_IN) {</div><div class='del'>-		if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='del'>-			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-			mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-			goto failed;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-	} else {</div><div class='del'>-		struct iscsi_tm *hdr = &amp;conn-&gt;tmhdr;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Still LOGGED_IN...</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (!ctask-&gt;sc || sc-&gt;SCp.phase != session-&gt;age) {</div><div class='del'>-			/*</div><div class='del'>-			 * 1) ctask completed before time out. But session</div><div class='del'>-			 *    is still ok =&gt; Happy Retry.</div><div class='del'>-			 * 2) session was re-open during time out of ctask.</div><div class='del'>-			 */</div><div class='del'>-			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-			mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-			goto success;</div><div class='del'>-		}</div><div class='del'>-		conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * ctask timed out but session is OK</div><div class='del'>-		 * ERL=0 requires task mgmt abort to be issued on each</div><div class='del'>-		 * failed command. requests must be serialized.</div><div class='del'>-		 */</div><div class='del'>-		memset(hdr, 0, sizeof(struct iscsi_tm));</div><div class='del'>-		hdr-&gt;opcode = ISCSI_OP_SCSI_TMFUNC | ISCSI_OP_IMMEDIATE;</div><div class='del'>-		hdr-&gt;flags = ISCSI_TM_FUNC_ABORT_TASK;</div><div class='del'>-		hdr-&gt;flags |= ISCSI_FLAG_CMD_FINAL;</div><div class='del'>-		memcpy(hdr-&gt;lun, ctask-&gt;hdr.lun, sizeof(hdr-&gt;lun));</div><div class='del'>-		hdr-&gt;rtt = ctask-&gt;hdr.itt;</div><div class='del'>-		hdr-&gt;refcmdsn = ctask-&gt;hdr.cmdsn;</div><div class='del'>-</div><div class='del'>-		rc = iscsi_conn_send_generic(conn, (struct iscsi_hdr *)hdr,</div><div class='del'>-					     NULL, 0);</div><div class='del'>-		if (rc) {</div><div class='del'>-			iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='del'>-			debug_scsi("abort sent failure [itt 0x%x]", ctask-&gt;itt);</div><div class='del'>-		} else {</div><div class='del'>-			struct iscsi_r2t_info *r2t;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * TMF abort vs. TMF response race logic</div><div class='del'>-			 */</div><div class='del'>-			spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-			ctask-&gt;mtask = (struct iscsi_mgmt_task *)</div><div class='del'>-				session-&gt;mgmt_cmds[(hdr-&gt;itt &amp; ITT_MASK) -</div><div class='del'>-							ISCSI_MGMT_ITT_OFFSET];</div><div class='del'>-			/*</div><div class='del'>-			 * have to flush r2tqueue to avoid r2t leaks</div><div class='del'>-			 */</div><div class='del'>-			while (__kfifo_get(ctask-&gt;r2tqueue, (void*)&amp;r2t,</div><div class='del'>-				sizeof(void*))) {</div><div class='del'>-				__kfifo_put(ctask-&gt;r2tpool.queue, (void*)&amp;r2t,</div><div class='del'>-					sizeof(void*));</div><div class='del'>-			}</div><div class='del'>-			if (conn-&gt;tmabort_state == TMABORT_INITIAL) {</div><div class='del'>-				conn-&gt;tmfcmd_pdus_cnt++;</div><div class='del'>-				conn-&gt;tmabort_timer.expires = 3*HZ + jiffies;</div><div class='del'>-				conn-&gt;tmabort_timer.function =</div><div class='del'>-						iscsi_tmabort_timedout;</div><div class='del'>-				conn-&gt;tmabort_timer.data = (unsigned long)ctask;</div><div class='del'>-				add_timer(&amp;conn-&gt;tmabort_timer);</div><div class='del'>-				debug_scsi("abort sent [itt 0x%x]", ctask-&gt;itt);</div><div class='del'>-			} else {</div><div class='del'>-				if (!ctask-&gt;sc ||</div><div class='del'>-				    conn-&gt;tmabort_state == TMABORT_SUCCESS) {</div><div class='del'>-					conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='del'>-					spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-					mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-					goto success;</div><div class='del'>-				}</div><div class='del'>-				conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='del'>-				iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * block eh thread until:</div><div class='del'>-	 *</div><div class='del'>-	 * 1) abort response;</div><div class='del'>-	 * 2) abort timeout;</div><div class='del'>-	 * 3) session re-opened;</div><div class='del'>-	 * 4) session terminated;</div><div class='del'>-	 */</div><div class='del'>-	for (;;) {</div><div class='del'>-		int p_state = session-&gt;state;</div><div class='del'>-</div><div class='del'>-		rc = wait_event_interruptible(conn-&gt;ehwait,</div><div class='del'>-			(p_state == ISCSI_STATE_LOGGED_IN ?</div><div class='del'>-			 (session-&gt;state == ISCSI_STATE_TERMINATE ||</div><div class='del'>-			  conn-&gt;tmabort_state != TMABORT_INITIAL) :</div><div class='del'>-			 (session-&gt;state == ISCSI_STATE_TERMINATE ||</div><div class='del'>-			  session-&gt;state == ISCSI_STATE_LOGGED_IN)));</div><div class='del'>-		if (rc) {</div><div class='del'>-			/* shutdown.. */</div><div class='del'>-			session-&gt;state = ISCSI_STATE_TERMINATE;</div><div class='del'>-			goto failed;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			flush_signals(current);</div><div class='add'>+	struct iscsi_tcp_mgmt_task *tcp_mtask = mtask-&gt;dd_data;</div><div class='ctx'> </div><div class='del'>-		if (session-&gt;state == ISCSI_STATE_TERMINATE)</div><div class='del'>-			goto failed;</div><div class='del'>-</div><div class='del'>-		spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-		if (sc-&gt;SCp.phase == session-&gt;age &amp;&amp;</div><div class='del'>-		   (conn-&gt;tmabort_state == TMABORT_TIMEDOUT ||</div><div class='del'>-		    conn-&gt;tmabort_state == TMABORT_FAILED)) {</div><div class='del'>-			conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='del'>-			if (!ctask-&gt;sc) {</div><div class='del'>-				/*</div><div class='del'>-				 * ctask completed before tmf abort response or</div><div class='del'>-				 * time out.</div><div class='del'>-				 * But session is still ok =&gt; Happy Retry.</div><div class='del'>-				 */</div><div class='del'>-				spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-			iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-success:</div><div class='del'>-	debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask-&gt;itt);</div><div class='del'>-	rc = SUCCESS;</div><div class='del'>-	goto exit;</div><div class='del'>-</div><div class='del'>-failed:</div><div class='del'>-	debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask-&gt;itt);</div><div class='del'>-	rc = FAILED;</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	del_timer_sync(&amp;conn-&gt;tmabort_timer);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	if (conn-&gt;sock) {</div><div class='del'>-		struct sock *sk = conn-&gt;sock-&gt;sk;</div><div class='add'>+	iscsi_buf_init_iov(&amp;tcp_mtask-&gt;headbuf, (char*)mtask-&gt;hdr,</div><div class='add'>+			   sizeof(struct iscsi_hdr));</div><div class='add'>+	tcp_mtask-&gt;xmstate = XMSTATE_IMM_HDR;</div><div class='ctx'> </div><div class='del'>-		write_lock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-		iscsi_ctask_cleanup(conn, ctask);</div><div class='del'>-		write_unlock_bh(&amp;sk-&gt;sk_callback_lock);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	return rc;</div><div class='add'>+	if (mtask-&gt;data_count)</div><div class='add'>+		iscsi_buf_init_iov(&amp;tcp_mtask-&gt;sendbuf, (char*)mtask-&gt;data,</div><div class='add'>+				    mtask-&gt;data_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -3174,6 +2074,7 @@ iscsi_r2tpool_alloc(struct iscsi_session *session)</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (cmd_i = 0; cmd_i &lt; session-&gt;cmds_max; cmd_i++) {</div><div class='ctx'> 	        struct iscsi_cmd_task *ctask = session-&gt;cmds[cmd_i];</div><div class='add'>+		struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * pre-allocated x4 as much r2ts to handle race when</div><div class='hunk'>@@ -3182,42 +2083,32 @@ iscsi_r2tpool_alloc(struct iscsi_session *session)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		/* R2T pool */</div><div class='del'>-		if (iscsi_pool_init(&amp;ctask-&gt;r2tpool, session-&gt;max_r2t * 4,</div><div class='del'>-			(void***)&amp;ctask-&gt;r2ts, sizeof(struct iscsi_r2t_info))) {</div><div class='add'>+		if (iscsi_pool_init(&amp;tcp_ctask-&gt;r2tpool, session-&gt;max_r2t * 4,</div><div class='add'>+				    (void***)&amp;tcp_ctask-&gt;r2ts,</div><div class='add'>+				    sizeof(struct iscsi_r2t_info))) {</div><div class='ctx'> 			goto r2t_alloc_fail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* R2T xmit queue */</div><div class='del'>-		ctask-&gt;r2tqueue = kfifo_alloc(</div><div class='add'>+		tcp_ctask-&gt;r2tqueue = kfifo_alloc(</div><div class='ctx'> 		      session-&gt;max_r2t * 4 * sizeof(void*), GFP_KERNEL, NULL);</div><div class='del'>-		if (ctask-&gt;r2tqueue == ERR_PTR(-ENOMEM)) {</div><div class='del'>-			iscsi_pool_free(&amp;ctask-&gt;r2tpool, (void**)ctask-&gt;r2ts);</div><div class='del'>-			goto r2t_alloc_fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * number of</div><div class='del'>-		 * Data-Out PDU's within R2T-sequence can be quite big;</div><div class='del'>-		 * using mempool</div><div class='del'>-		 */</div><div class='del'>-		ctask-&gt;datapool = mempool_create_slab_pool(ISCSI_DTASK_DEFAULT_MAX,</div><div class='del'>-							   taskcache);</div><div class='del'>-		if (ctask-&gt;datapool == NULL) {</div><div class='del'>-			kfifo_free(ctask-&gt;r2tqueue);</div><div class='del'>-			iscsi_pool_free(&amp;ctask-&gt;r2tpool, (void**)ctask-&gt;r2ts);</div><div class='add'>+		if (tcp_ctask-&gt;r2tqueue == ERR_PTR(-ENOMEM)) {</div><div class='add'>+			iscsi_pool_free(&amp;tcp_ctask-&gt;r2tpool,</div><div class='add'>+					(void**)tcp_ctask-&gt;r2ts);</div><div class='ctx'> 			goto r2t_alloc_fail;</div><div class='ctx'> 		}</div><div class='del'>-		INIT_LIST_HEAD(&amp;ctask-&gt;dataqueue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> r2t_alloc_fail:</div><div class='ctx'> 	for (i = 0; i &lt; cmd_i; i++) {</div><div class='del'>-		mempool_destroy(session-&gt;cmds[i]-&gt;datapool);</div><div class='del'>-		kfifo_free(session-&gt;cmds[i]-&gt;r2tqueue);</div><div class='del'>-		iscsi_pool_free(&amp;session-&gt;cmds[i]-&gt;r2tpool,</div><div class='del'>-				(void**)session-&gt;cmds[i]-&gt;r2ts);</div><div class='add'>+		struct iscsi_cmd_task *ctask = session-&gt;cmds[i];</div><div class='add'>+		struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+		kfifo_free(tcp_ctask-&gt;r2tqueue);</div><div class='add'>+		iscsi_pool_free(&amp;tcp_ctask-&gt;r2tpool,</div><div class='add'>+				(void**)tcp_ctask-&gt;r2ts);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -3228,153 +2119,32 @@ iscsi_r2tpool_free(struct iscsi_session *session)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; session-&gt;cmds_max; i++) {</div><div class='del'>-		mempool_destroy(session-&gt;cmds[i]-&gt;datapool);</div><div class='del'>-		kfifo_free(session-&gt;cmds[i]-&gt;r2tqueue);</div><div class='del'>-		iscsi_pool_free(&amp;session-&gt;cmds[i]-&gt;r2tpool,</div><div class='del'>-				(void**)session-&gt;cmds[i]-&gt;r2ts);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct scsi_host_template iscsi_sht = {</div><div class='del'>-	.name			= "iSCSI Initiator over TCP/IP, v."</div><div class='del'>-				  ISCSI_VERSION_STR,</div><div class='del'>-	.queuecommand           = iscsi_queuecommand,</div><div class='del'>-	.change_queue_depth	= iscsi_change_queue_depth,</div><div class='del'>-	.can_queue		= ISCSI_XMIT_CMDS_MAX - 1,</div><div class='del'>-	.sg_tablesize		= ISCSI_SG_TABLESIZE,</div><div class='del'>-	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,</div><div class='del'>-	.eh_abort_handler       = iscsi_eh_abort,</div><div class='del'>-	.eh_host_reset_handler	= iscsi_eh_host_reset,</div><div class='del'>-	.use_clustering         = DISABLE_CLUSTERING,</div><div class='del'>-	.proc_name		= "iscsi_tcp",</div><div class='del'>-	.this_id		= -1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct iscsi_transport iscsi_tcp_transport;</div><div class='del'>-</div><div class='del'>-static struct iscsi_cls_session *</div><div class='del'>-iscsi_session_create(struct scsi_transport_template *scsit,</div><div class='del'>-		     uint32_t initial_cmdsn, uint32_t *sid)</div><div class='del'>-{</div><div class='del'>-	struct Scsi_Host *shost;</div><div class='del'>-	struct iscsi_session *session;</div><div class='del'>-	int cmd_i;</div><div class='add'>+		struct iscsi_cmd_task *ctask = session-&gt;cmds[i];</div><div class='add'>+		struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='ctx'> </div><div class='del'>-	shost = iscsi_transport_create_session(scsit, &amp;iscsi_tcp_transport);</div><div class='del'>-	if (!shost)</div><div class='del'>-		return NULL; </div><div class='del'>-</div><div class='del'>-	session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='del'>-	memset(session, 0, sizeof(struct iscsi_session));</div><div class='del'>-	session-&gt;host = shost;</div><div class='del'>-	session-&gt;state = ISCSI_STATE_FREE;</div><div class='del'>-	session-&gt;mgmtpool_max = ISCSI_MGMT_CMDS_MAX;</div><div class='del'>-	session-&gt;cmds_max = ISCSI_XMIT_CMDS_MAX;</div><div class='del'>-	session-&gt;cmdsn = initial_cmdsn;</div><div class='del'>-	session-&gt;exp_cmdsn = initial_cmdsn + 1;</div><div class='del'>-	session-&gt;max_cmdsn = initial_cmdsn + 1;</div><div class='del'>-	session-&gt;max_r2t = 1;</div><div class='del'>-	*sid = shost-&gt;host_no;</div><div class='del'>-</div><div class='del'>-	/* initialize SCSI PDU commands pool */</div><div class='del'>-	if (iscsi_pool_init(&amp;session-&gt;cmdpool, session-&gt;cmds_max,</div><div class='del'>-		(void***)&amp;session-&gt;cmds, sizeof(struct iscsi_cmd_task)))</div><div class='del'>-		goto cmdpool_alloc_fail;</div><div class='del'>-</div><div class='del'>-	/* pre-format cmds pool with ITT */</div><div class='del'>-	for (cmd_i = 0; cmd_i &lt; session-&gt;cmds_max; cmd_i++)</div><div class='del'>-		session-&gt;cmds[cmd_i]-&gt;itt = cmd_i;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;session-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;session-&gt;connections);</div><div class='del'>-</div><div class='del'>-	/* initialize immediate command pool */</div><div class='del'>-	if (iscsi_pool_init(&amp;session-&gt;mgmtpool, session-&gt;mgmtpool_max,</div><div class='del'>-		(void***)&amp;session-&gt;mgmt_cmds, sizeof(struct iscsi_mgmt_task)))</div><div class='del'>-		goto mgmtpool_alloc_fail;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* pre-format immediate cmds pool with ITT */</div><div class='del'>-	for (cmd_i = 0; cmd_i &lt; session-&gt;mgmtpool_max; cmd_i++) {</div><div class='del'>-		session-&gt;mgmt_cmds[cmd_i]-&gt;itt = ISCSI_MGMT_ITT_OFFSET + cmd_i;</div><div class='del'>-		session-&gt;mgmt_cmds[cmd_i]-&gt;data = kmalloc(</div><div class='del'>-			DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, GFP_KERNEL);</div><div class='del'>-		if (!session-&gt;mgmt_cmds[cmd_i]-&gt;data) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			for (j = 0; j &lt; cmd_i; j++)</div><div class='del'>-				kfree(session-&gt;mgmt_cmds[j]-&gt;data);</div><div class='del'>-			goto immdata_alloc_fail;</div><div class='del'>-		}</div><div class='add'>+		kfifo_free(tcp_ctask-&gt;r2tqueue);</div><div class='add'>+		iscsi_pool_free(&amp;tcp_ctask-&gt;r2tpool,</div><div class='add'>+				(void**)tcp_ctask-&gt;r2ts);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (iscsi_r2tpool_alloc(session))</div><div class='del'>-		goto r2tpool_alloc_fail;</div><div class='del'>-</div><div class='del'>-	return hostdata_session(shost-&gt;hostdata);</div><div class='del'>-</div><div class='del'>-r2tpool_alloc_fail:</div><div class='del'>-	for (cmd_i = 0; cmd_i &lt; session-&gt;mgmtpool_max; cmd_i++)</div><div class='del'>-		kfree(session-&gt;mgmt_cmds[cmd_i]-&gt;data);</div><div class='del'>-immdata_alloc_fail:</div><div class='del'>-	iscsi_pool_free(&amp;session-&gt;mgmtpool, (void**)session-&gt;mgmt_cmds);</div><div class='del'>-mgmtpool_alloc_fail:</div><div class='del'>-	iscsi_pool_free(&amp;session-&gt;cmdpool, (void**)session-&gt;cmds);</div><div class='del'>-cmdpool_alloc_fail:</div><div class='del'>-	iscsi_transport_destroy_session(shost);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-iscsi_session_destroy(struct iscsi_cls_session *cls_session)</div><div class='del'>-{</div><div class='del'>-	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='del'>-	struct iscsi_session *session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='del'>-	int cmd_i;</div><div class='del'>-	struct iscsi_data_task *dtask, *n;</div><div class='del'>-</div><div class='del'>-	for (cmd_i = 0; cmd_i &lt; session-&gt;cmds_max; cmd_i++) {</div><div class='del'>-		struct iscsi_cmd_task *ctask = session-&gt;cmds[cmd_i];</div><div class='del'>-		list_for_each_entry_safe(dtask, n, &amp;ctask-&gt;dataqueue, item) {</div><div class='del'>-			list_del(&amp;dtask-&gt;item);</div><div class='del'>-			mempool_free(dtask, ctask-&gt;datapool);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (cmd_i = 0; cmd_i &lt; session-&gt;mgmtpool_max; cmd_i++)</div><div class='del'>-		kfree(session-&gt;mgmt_cmds[cmd_i]-&gt;data);</div><div class='del'>-</div><div class='del'>-	iscsi_r2tpool_free(session);</div><div class='del'>-	iscsi_pool_free(&amp;session-&gt;mgmtpool, (void**)session-&gt;mgmt_cmds);</div><div class='del'>-	iscsi_pool_free(&amp;session-&gt;cmdpool, (void**)session-&gt;cmds);</div><div class='del'>-</div><div class='del'>-	iscsi_transport_destroy_session(shost);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> iscsi_conn_set_param(struct iscsi_cls_conn *cls_conn, enum iscsi_param param,</div><div class='del'>-		     uint32_t value)</div><div class='add'>+		     char *buf, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='ctx'> 	struct iscsi_session *session = conn-&gt;session;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;session-&gt;lock);</div><div class='del'>-	if (conn-&gt;c_stage != ISCSI_CONN_INITIAL_STAGE &amp;&amp;</div><div class='del'>-	    conn-&gt;stop_stage != STOP_CONN_RECOVER) {</div><div class='del'>-		printk(KERN_ERR "iscsi_tcp: can not change parameter [%d]\n",</div><div class='del'>-		       param);</div><div class='del'>-		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	int value;</div><div class='ctx'> </div><div class='ctx'> 	switch(param) {</div><div class='ctx'> 	case ISCSI_PARAM_MAX_RECV_DLENGTH: {</div><div class='del'>-		char *saveptr = conn-&gt;data;</div><div class='add'>+		char *saveptr = tcp_conn-&gt;data;</div><div class='ctx'> 		gfp_t flags = GFP_KERNEL;</div><div class='ctx'> </div><div class='del'>-		if (conn-&gt;data_size &gt;= value) {</div><div class='del'>-			conn-&gt;max_recv_dlength = value;</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		if (tcp_conn-&gt;data_size &gt;= value) {</div><div class='add'>+			iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3384,193 +2154,144 @@ iscsi_conn_set_param(struct iscsi_cls_conn *cls_conn, enum iscsi_param param,</div><div class='ctx'> 		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		if (value &lt;= PAGE_SIZE)</div><div class='del'>-			conn-&gt;data = kmalloc(value, flags);</div><div class='add'>+			tcp_conn-&gt;data = kmalloc(value, flags);</div><div class='ctx'> 		else</div><div class='del'>-			conn-&gt;data = (void*)__get_free_pages(flags,</div><div class='add'>+			tcp_conn-&gt;data = (void*)__get_free_pages(flags,</div><div class='ctx'> 							     get_order(value));</div><div class='del'>-		if (conn-&gt;data == NULL) {</div><div class='del'>-			conn-&gt;data = saveptr;</div><div class='add'>+		if (tcp_conn-&gt;data == NULL) {</div><div class='add'>+			tcp_conn-&gt;data = saveptr;</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		if (conn-&gt;data_size &lt;= PAGE_SIZE)</div><div class='add'>+		if (tcp_conn-&gt;data_size &lt;= PAGE_SIZE)</div><div class='ctx'> 			kfree(saveptr);</div><div class='ctx'> 		else</div><div class='ctx'> 			free_pages((unsigned long)saveptr,</div><div class='del'>-				   get_order(conn-&gt;data_size));</div><div class='del'>-		conn-&gt;max_recv_dlength = value;</div><div class='del'>-		conn-&gt;data_size = value;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_MAX_XMIT_DLENGTH:</div><div class='del'>-		conn-&gt;max_xmit_dlength =  value;</div><div class='add'>+				   get_order(tcp_conn-&gt;data_size));</div><div class='add'>+		iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='add'>+		tcp_conn-&gt;data_size = value;</div><div class='ctx'> 		break;</div><div class='add'>+		}</div><div class='ctx'> 	case ISCSI_PARAM_HDRDGST_EN:</div><div class='del'>-		conn-&gt;hdrdgst_en = value;</div><div class='del'>-		conn-&gt;hdr_size = sizeof(struct iscsi_hdr);</div><div class='add'>+		iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='add'>+		tcp_conn-&gt;hdr_size = sizeof(struct iscsi_hdr);</div><div class='ctx'> 		if (conn-&gt;hdrdgst_en) {</div><div class='del'>-			conn-&gt;hdr_size += sizeof(__u32);</div><div class='del'>-			if (!conn-&gt;tx_tfm)</div><div class='del'>-				conn-&gt;tx_tfm = crypto_alloc_tfm("crc32c", 0);</div><div class='del'>-			if (!conn-&gt;tx_tfm)</div><div class='add'>+			tcp_conn-&gt;hdr_size += sizeof(__u32);</div><div class='add'>+			if (!tcp_conn-&gt;tx_tfm)</div><div class='add'>+				tcp_conn-&gt;tx_tfm = crypto_alloc_tfm("crc32c",</div><div class='add'>+								    0);</div><div class='add'>+			if (!tcp_conn-&gt;tx_tfm)</div><div class='ctx'> 				return -ENOMEM;</div><div class='del'>-			if (!conn-&gt;rx_tfm)</div><div class='del'>-				conn-&gt;rx_tfm = crypto_alloc_tfm("crc32c", 0);</div><div class='del'>-			if (!conn-&gt;rx_tfm) {</div><div class='del'>-				crypto_free_tfm(conn-&gt;tx_tfm);</div><div class='add'>+			if (!tcp_conn-&gt;rx_tfm)</div><div class='add'>+				tcp_conn-&gt;rx_tfm = crypto_alloc_tfm("crc32c",</div><div class='add'>+								    0);</div><div class='add'>+			if (!tcp_conn-&gt;rx_tfm) {</div><div class='add'>+				crypto_free_tfm(tcp_conn-&gt;tx_tfm);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (conn-&gt;tx_tfm)</div><div class='del'>-				crypto_free_tfm(conn-&gt;tx_tfm);</div><div class='del'>-			if (conn-&gt;rx_tfm)</div><div class='del'>-				crypto_free_tfm(conn-&gt;rx_tfm);</div><div class='add'>+			if (tcp_conn-&gt;tx_tfm)</div><div class='add'>+				crypto_free_tfm(tcp_conn-&gt;tx_tfm);</div><div class='add'>+			if (tcp_conn-&gt;rx_tfm)</div><div class='add'>+				crypto_free_tfm(tcp_conn-&gt;rx_tfm);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_PARAM_DATADGST_EN:</div><div class='del'>-		conn-&gt;datadgst_en = value;</div><div class='add'>+		iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='ctx'> 		if (conn-&gt;datadgst_en) {</div><div class='del'>-			if (!conn-&gt;data_tx_tfm)</div><div class='del'>-				conn-&gt;data_tx_tfm =</div><div class='add'>+			if (!tcp_conn-&gt;data_tx_tfm)</div><div class='add'>+				tcp_conn-&gt;data_tx_tfm =</div><div class='ctx'> 				    crypto_alloc_tfm("crc32c", 0);</div><div class='del'>-			if (!conn-&gt;data_tx_tfm)</div><div class='add'>+			if (!tcp_conn-&gt;data_tx_tfm)</div><div class='ctx'> 				return -ENOMEM;</div><div class='del'>-			if (!conn-&gt;data_rx_tfm)</div><div class='del'>-				conn-&gt;data_rx_tfm =</div><div class='add'>+			if (!tcp_conn-&gt;data_rx_tfm)</div><div class='add'>+				tcp_conn-&gt;data_rx_tfm =</div><div class='ctx'> 				    crypto_alloc_tfm("crc32c", 0);</div><div class='del'>-			if (!conn-&gt;data_rx_tfm) {</div><div class='del'>-				crypto_free_tfm(conn-&gt;data_tx_tfm);</div><div class='add'>+			if (!tcp_conn-&gt;data_rx_tfm) {</div><div class='add'>+				crypto_free_tfm(tcp_conn-&gt;data_tx_tfm);</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			if (conn-&gt;data_tx_tfm)</div><div class='del'>-				crypto_free_tfm(conn-&gt;data_tx_tfm);</div><div class='del'>-			if (conn-&gt;data_rx_tfm)</div><div class='del'>-				crypto_free_tfm(conn-&gt;data_rx_tfm);</div><div class='add'>+			if (tcp_conn-&gt;data_tx_tfm)</div><div class='add'>+				crypto_free_tfm(tcp_conn-&gt;data_tx_tfm);</div><div class='add'>+			if (tcp_conn-&gt;data_rx_tfm)</div><div class='add'>+				crypto_free_tfm(tcp_conn-&gt;data_rx_tfm);</div><div class='ctx'> 		}</div><div class='del'>-		conn-&gt;sendpage = conn-&gt;datadgst_en ?</div><div class='del'>-			sock_no_sendpage : conn-&gt;sock-&gt;ops-&gt;sendpage;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_INITIAL_R2T_EN:</div><div class='del'>-		session-&gt;initial_r2t_en = value;</div><div class='add'>+		tcp_conn-&gt;sendpage = conn-&gt;datadgst_en ?</div><div class='add'>+			sock_no_sendpage : tcp_conn-&gt;sock-&gt;ops-&gt;sendpage;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_PARAM_MAX_R2T:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='ctx'> 		if (session-&gt;max_r2t == roundup_pow_of_two(value))</div><div class='ctx'> 			break;</div><div class='ctx'> 		iscsi_r2tpool_free(session);</div><div class='del'>-		session-&gt;max_r2t = value;</div><div class='add'>+		iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='ctx'> 		if (session-&gt;max_r2t &amp; (session-&gt;max_r2t - 1))</div><div class='ctx'> 			session-&gt;max_r2t = roundup_pow_of_two(session-&gt;max_r2t);</div><div class='ctx'> 		if (iscsi_r2tpool_alloc(session))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		break;</div><div class='del'>-	case ISCSI_PARAM_IMM_DATA_EN:</div><div class='del'>-		session-&gt;imm_data_en = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_FIRST_BURST:</div><div class='del'>-		session-&gt;first_burst = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_MAX_BURST:</div><div class='del'>-		session-&gt;max_burst = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_PDU_INORDER_EN:</div><div class='del'>-		session-&gt;pdu_inorder_en = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_DATASEQ_INORDER_EN:</div><div class='del'>-		session-&gt;dataseq_inorder_en = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_ERL:</div><div class='del'>-		session-&gt;erl = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_IFMARKER_EN:</div><div class='del'>-		BUG_ON(value);</div><div class='del'>-		session-&gt;ifmarker_en = value;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_OFMARKER_EN:</div><div class='del'>-		BUG_ON(value);</div><div class='del'>-		session-&gt;ofmarker_en = value;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-iscsi_session_get_param(struct iscsi_cls_session *cls_session,</div><div class='del'>-			enum iscsi_param param, uint32_t *value)</div><div class='del'>-{</div><div class='del'>-	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='del'>-	struct iscsi_session *session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='del'>-</div><div class='del'>-	switch(param) {</div><div class='del'>-	case ISCSI_PARAM_INITIAL_R2T_EN:</div><div class='del'>-		*value = session-&gt;initial_r2t_en;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_MAX_R2T:</div><div class='del'>-		*value = session-&gt;max_r2t;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_IMM_DATA_EN:</div><div class='del'>-		*value = session-&gt;imm_data_en;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_FIRST_BURST:</div><div class='del'>-		*value = session-&gt;first_burst;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_MAX_BURST:</div><div class='del'>-		*value = session-&gt;max_burst;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_PDU_INORDER_EN:</div><div class='del'>-		*value = session-&gt;pdu_inorder_en;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_DATASEQ_INORDER_EN:</div><div class='del'>-		*value = session-&gt;dataseq_inorder_en;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_ERL:</div><div class='del'>-		*value = session-&gt;erl;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_IFMARKER_EN:</div><div class='del'>-		*value = session-&gt;ifmarker_en;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_OFMARKER_EN:</div><div class='del'>-		*value = session-&gt;ofmarker_en;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return ISCSI_ERR_PARAM_NOT_FOUND;</div><div class='add'>+		return iscsi_set_param(cls_conn, param, buf, buflen);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,</div><div class='del'>-		     enum iscsi_param param, uint32_t *value)</div><div class='add'>+iscsi_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn,</div><div class='add'>+			 enum iscsi_param param, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='add'>+	struct inet_sock *inet;</div><div class='add'>+	struct ipv6_pinfo *np;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='ctx'> 	switch(param) {</div><div class='del'>-	case ISCSI_PARAM_MAX_RECV_DLENGTH:</div><div class='del'>-		*value = conn-&gt;max_recv_dlength;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_MAX_XMIT_DLENGTH:</div><div class='del'>-		*value = conn-&gt;max_xmit_dlength;</div><div class='del'>-		break;</div><div class='del'>-	case ISCSI_PARAM_HDRDGST_EN:</div><div class='del'>-		*value = conn-&gt;hdrdgst_en;</div><div class='add'>+	case ISCSI_PARAM_CONN_PORT:</div><div class='add'>+		mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+		if (!tcp_conn-&gt;sock) {</div><div class='add'>+			mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		inet = inet_sk(tcp_conn-&gt;sock-&gt;sk);</div><div class='add'>+		len = sprintf(buf, "%hu\n", be16_to_cpu(inet-&gt;dport));</div><div class='add'>+		mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='ctx'> 		break;</div><div class='del'>-	case ISCSI_PARAM_DATADGST_EN:</div><div class='del'>-		*value = conn-&gt;datadgst_en;</div><div class='add'>+	case ISCSI_PARAM_CONN_ADDRESS:</div><div class='add'>+		mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+		if (!tcp_conn-&gt;sock) {</div><div class='add'>+			mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sk = tcp_conn-&gt;sock-&gt;sk;</div><div class='add'>+		if (sk-&gt;sk_family == PF_INET) {</div><div class='add'>+			inet = inet_sk(sk);</div><div class='add'>+			len = sprintf(buf, "%u.%u.%u.%u\n",</div><div class='add'>+				      NIPQUAD(inet-&gt;daddr));</div><div class='add'>+		} else {</div><div class='add'>+			np = inet6_sk(sk);</div><div class='add'>+			len = sprintf(buf,</div><div class='add'>+				"%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",</div><div class='add'>+				NIP6(np-&gt;daddr));</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return ISCSI_ERR_PARAM_NOT_FOUND;</div><div class='add'>+		return iscsi_conn_get_param(cls_conn, param, buf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> iscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_tcp_conn *tcp_conn = conn-&gt;dd_data;</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;txdata_octets = conn-&gt;txdata_octets;</div><div class='ctx'> 	stats-&gt;rxdata_octets = conn-&gt;rxdata_octets;</div><div class='hunk'>@@ -3583,68 +2304,144 @@ iscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *stats)</div><div class='ctx'> 	stats-&gt;tmfrsp_pdus = conn-&gt;tmfrsp_pdus_cnt;</div><div class='ctx'> 	stats-&gt;custom_length = 3;</div><div class='ctx'> 	strcpy(stats-&gt;custom[0].desc, "tx_sendpage_failures");</div><div class='del'>-	stats-&gt;custom[0].value = conn-&gt;sendpage_failures_cnt;</div><div class='add'>+	stats-&gt;custom[0].value = tcp_conn-&gt;sendpage_failures_cnt;</div><div class='ctx'> 	strcpy(stats-&gt;custom[1].desc, "rx_discontiguous_hdr");</div><div class='del'>-	stats-&gt;custom[1].value = conn-&gt;discontiguous_hdr_cnt;</div><div class='add'>+	stats-&gt;custom[1].value = tcp_conn-&gt;discontiguous_hdr_cnt;</div><div class='ctx'> 	strcpy(stats-&gt;custom[2].desc, "eh_abort_cnt");</div><div class='ctx'> 	stats-&gt;custom[2].value = conn-&gt;eh_abort_cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-iscsi_conn_send_pdu(struct iscsi_cls_conn *cls_conn, struct iscsi_hdr *hdr,</div><div class='del'>-		    char *data, uint32_t data_size)</div><div class='add'>+static struct iscsi_cls_session *</div><div class='add'>+iscsi_tcp_session_create(struct iscsi_transport *iscsit,</div><div class='add'>+			 struct scsi_transport_template *scsit,</div><div class='add'>+			 uint32_t initial_cmdsn, uint32_t *hostno)</div><div class='ctx'> {</div><div class='del'>-	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='del'>-	int rc;</div><div class='add'>+	struct iscsi_cls_session *cls_session;</div><div class='add'>+	struct iscsi_session *session;</div><div class='add'>+	uint32_t hn;</div><div class='add'>+	int cmd_i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='del'>-	rc = iscsi_conn_send_generic(conn, hdr, data, data_size);</div><div class='del'>-	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	cls_session = iscsi_session_setup(iscsit, scsit,</div><div class='add'>+					 sizeof(struct iscsi_tcp_cmd_task),</div><div class='add'>+					 sizeof(struct iscsi_tcp_mgmt_task),</div><div class='add'>+					 initial_cmdsn, &amp;hn);</div><div class='add'>+	if (!cls_session)</div><div class='add'>+		return NULL;</div><div class='add'>+	*hostno = hn;</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	session = class_to_transport_session(cls_session);</div><div class='add'>+	for (cmd_i = 0; cmd_i &lt; session-&gt;cmds_max; cmd_i++) {</div><div class='add'>+		struct iscsi_cmd_task *ctask = session-&gt;cmds[cmd_i];</div><div class='add'>+		struct iscsi_tcp_cmd_task *tcp_ctask = ctask-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+		ctask-&gt;hdr = &amp;tcp_ctask-&gt;hdr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (cmd_i = 0; cmd_i &lt; session-&gt;mgmtpool_max; cmd_i++) {</div><div class='add'>+		struct iscsi_mgmt_task *mtask = session-&gt;mgmt_cmds[cmd_i];</div><div class='add'>+		struct iscsi_tcp_mgmt_task *tcp_mtask = mtask-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+		mtask-&gt;hdr = &amp;tcp_mtask-&gt;hdr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iscsi_r2tpool_alloc(class_to_transport_session(cls_session)))</div><div class='add'>+		goto r2tpool_alloc_fail;</div><div class='add'>+</div><div class='add'>+	return cls_session;</div><div class='add'>+</div><div class='add'>+r2tpool_alloc_fail:</div><div class='add'>+	iscsi_session_teardown(cls_session);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void iscsi_tcp_session_destroy(struct iscsi_cls_session *cls_session)</div><div class='add'>+{</div><div class='add'>+	iscsi_r2tpool_free(class_to_transport_session(cls_session));</div><div class='add'>+	iscsi_session_teardown(cls_session);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct scsi_host_template iscsi_sht = {</div><div class='add'>+	.name			= "iSCSI Initiator over TCP/IP, v"</div><div class='add'>+				  ISCSI_TCP_VERSION,</div><div class='add'>+	.queuecommand           = iscsi_queuecommand,</div><div class='add'>+	.change_queue_depth	= iscsi_change_queue_depth,</div><div class='add'>+	.can_queue		= ISCSI_XMIT_CMDS_MAX - 1,</div><div class='add'>+	.sg_tablesize		= ISCSI_SG_TABLESIZE,</div><div class='add'>+	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,</div><div class='add'>+	.eh_abort_handler       = iscsi_eh_abort,</div><div class='add'>+	.eh_host_reset_handler	= iscsi_eh_host_reset,</div><div class='add'>+	.use_clustering         = DISABLE_CLUSTERING,</div><div class='add'>+	.proc_name		= "iscsi_tcp",</div><div class='add'>+	.this_id		= -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static struct iscsi_transport iscsi_tcp_transport = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.name			= "tcp",</div><div class='ctx'> 	.caps			= CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST</div><div class='ctx'> 				  | CAP_DATADGST,</div><div class='add'>+	.param_mask		= ISCSI_MAX_RECV_DLENGTH |</div><div class='add'>+				  ISCSI_MAX_XMIT_DLENGTH |</div><div class='add'>+				  ISCSI_HDRDGST_EN |</div><div class='add'>+				  ISCSI_DATADGST_EN |</div><div class='add'>+				  ISCSI_INITIAL_R2T_EN |</div><div class='add'>+				  ISCSI_MAX_R2T |</div><div class='add'>+				  ISCSI_IMM_DATA_EN |</div><div class='add'>+				  ISCSI_FIRST_BURST |</div><div class='add'>+				  ISCSI_MAX_BURST |</div><div class='add'>+				  ISCSI_PDU_INORDER_EN |</div><div class='add'>+				  ISCSI_DATASEQ_INORDER_EN |</div><div class='add'>+				  ISCSI_ERL |</div><div class='add'>+				  ISCSI_CONN_PORT |</div><div class='add'>+				  ISCSI_CONN_ADDRESS |</div><div class='add'>+				  ISCSI_EXP_STATSN |</div><div class='add'>+				  ISCSI_PERSISTENT_PORT |</div><div class='add'>+				  ISCSI_PERSISTENT_ADDRESS |</div><div class='add'>+				  ISCSI_TARGET_NAME |</div><div class='add'>+				  ISCSI_TPGT,</div><div class='ctx'> 	.host_template		= &amp;iscsi_sht,</div><div class='del'>-	.hostdata_size		= sizeof(struct iscsi_session),</div><div class='ctx'> 	.conndata_size		= sizeof(struct iscsi_conn),</div><div class='ctx'> 	.max_conn		= 1,</div><div class='ctx'> 	.max_cmd_len		= ISCSI_TCP_MAX_CMD_LEN,</div><div class='del'>-	.create_session		= iscsi_session_create,</div><div class='del'>-	.destroy_session	= iscsi_session_destroy,</div><div class='del'>-	.create_conn		= iscsi_conn_create,</div><div class='del'>-	.bind_conn		= iscsi_conn_bind,</div><div class='del'>-	.destroy_conn		= iscsi_conn_destroy,</div><div class='add'>+	/* session management */</div><div class='add'>+	.create_session		= iscsi_tcp_session_create,</div><div class='add'>+	.destroy_session	= iscsi_tcp_session_destroy,</div><div class='add'>+	/* connection management */</div><div class='add'>+	.create_conn		= iscsi_tcp_conn_create,</div><div class='add'>+	.bind_conn		= iscsi_tcp_conn_bind,</div><div class='add'>+	.destroy_conn		= iscsi_tcp_conn_destroy,</div><div class='ctx'> 	.set_param		= iscsi_conn_set_param,</div><div class='del'>-	.get_conn_param		= iscsi_conn_get_param,</div><div class='add'>+	.get_conn_param		= iscsi_tcp_conn_get_param,</div><div class='ctx'> 	.get_session_param	= iscsi_session_get_param,</div><div class='ctx'> 	.start_conn		= iscsi_conn_start,</div><div class='ctx'> 	.stop_conn		= iscsi_conn_stop,</div><div class='add'>+	/* these are called as part of conn recovery */</div><div class='add'>+	.suspend_conn_recv	= iscsi_tcp_suspend_conn_rx,</div><div class='add'>+	.terminate_conn		= iscsi_tcp_terminate_conn,</div><div class='add'>+	/* IO */</div><div class='ctx'> 	.send_pdu		= iscsi_conn_send_pdu,</div><div class='ctx'> 	.get_stats		= iscsi_conn_get_stats,</div><div class='add'>+	.init_cmd_task		= iscsi_tcp_cmd_init,</div><div class='add'>+	.init_mgmt_task		= iscsi_tcp_mgmt_init,</div><div class='add'>+	.xmit_cmd_task		= iscsi_tcp_ctask_xmit,</div><div class='add'>+	.xmit_mgmt_task		= iscsi_tcp_mtask_xmit,</div><div class='add'>+	.cleanup_cmd_task	= iscsi_tcp_cleanup_ctask,</div><div class='add'>+	/* recovery */</div><div class='add'>+	.session_recovery_timedout = iscsi_session_recovery_timedout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='ctx'> iscsi_tcp_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (iscsi_max_lun &lt; 1) {</div><div class='del'>-		printk(KERN_ERR "Invalid max_lun value of %u\n", iscsi_max_lun);</div><div class='add'>+		printk(KERN_ERR "iscsi_tcp: Invalid max_lun value of %u\n",</div><div class='add'>+		       iscsi_max_lun);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	iscsi_tcp_transport.max_lun = iscsi_max_lun;</div><div class='ctx'> </div><div class='del'>-	taskcache = kmem_cache_create("iscsi_taskcache",</div><div class='del'>-			sizeof(struct iscsi_data_task), 0,</div><div class='del'>-			SLAB_HWCACHE_ALIGN, NULL, NULL);</div><div class='del'>-	if (!taskcache)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	if (!iscsi_register_transport(&amp;iscsi_tcp_transport))</div><div class='del'>-		kmem_cache_destroy(taskcache);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3653,7 +2450,6 @@ static void __exit</div><div class='ctx'> iscsi_tcp_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	iscsi_unregister_transport(&amp;iscsi_tcp_transport);</div><div class='del'>-	kmem_cache_destroy(taskcache);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(iscsi_tcp_init);</div><div class='head'>diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h<br/>index ba26741ac154..808302832e68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_tcp.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/iscsi_tcp.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/iscsi_tcp.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/iscsi_tcp.h</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'>  * iSCSI Initiator TCP Transport</div><div class='ctx'>  * Copyright (C) 2004 Dmitry Yusupov</div><div class='ctx'>  * Copyright (C) 2004 Alex Aizman</div><div class='del'>- * Copyright (C) 2005 Mike Christie</div><div class='add'>+ * Copyright (C) 2005 - 2006 Mike Christie</div><div class='add'>+ * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.</div><div class='ctx'>  * maintained by open-iscsi@googlegroups.com</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -21,20 +22,7 @@</div><div class='ctx'> #ifndef ISCSI_TCP_H</div><div class='ctx'> #define ISCSI_TCP_H</div><div class='ctx'> </div><div class='del'>-/* Session's states */</div><div class='del'>-#define ISCSI_STATE_FREE		1</div><div class='del'>-#define ISCSI_STATE_LOGGED_IN		2</div><div class='del'>-#define ISCSI_STATE_FAILED		3</div><div class='del'>-#define ISCSI_STATE_TERMINATE		4</div><div class='del'>-</div><div class='del'>-/* Connection's states */</div><div class='del'>-#define ISCSI_CONN_INITIAL_STAGE	0</div><div class='del'>-#define ISCSI_CONN_STARTED		1</div><div class='del'>-#define ISCSI_CONN_STOPPED		2</div><div class='del'>-#define ISCSI_CONN_CLEANUP_WAIT		3</div><div class='del'>-</div><div class='del'>-/* Connection suspend "bit" */</div><div class='del'>-#define SUSPEND_BIT			1</div><div class='add'>+#include &lt;scsi/libiscsi.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Socket's Receive state machine */</div><div class='ctx'> #define IN_PROGRESS_WAIT_HEADER		0x0</div><div class='hunk'>@@ -42,12 +30,6 @@</div><div class='ctx'> #define IN_PROGRESS_DATA_RECV		0x2</div><div class='ctx'> #define IN_PROGRESS_DDIGEST_RECV	0x3</div><div class='ctx'> </div><div class='del'>-/* Task Mgmt states */</div><div class='del'>-#define	TMABORT_INITIAL			0x0</div><div class='del'>-#define	TMABORT_SUCCESS			0x1</div><div class='del'>-#define	TMABORT_FAILED			0x2</div><div class='del'>-#define	TMABORT_TIMEDOUT		0x3</div><div class='del'>-</div><div class='ctx'> /* xmit state machine */</div><div class='ctx'> #define	XMSTATE_IDLE			0x0</div><div class='ctx'> #define	XMSTATE_R_HDR			0x1</div><div class='hunk'>@@ -62,34 +44,14 @@</div><div class='ctx'> #define	XMSTATE_W_PAD			0x200</div><div class='ctx'> #define XMSTATE_DATA_DIGEST		0x400</div><div class='ctx'> </div><div class='del'>-#define ISCSI_CONN_MAX			1</div><div class='ctx'> #define ISCSI_CONN_RCVBUF_MIN		262144</div><div class='ctx'> #define ISCSI_CONN_SNDBUF_MIN		262144</div><div class='ctx'> #define ISCSI_PAD_LEN			4</div><div class='ctx'> #define ISCSI_R2T_MAX			16</div><div class='del'>-#define ISCSI_XMIT_CMDS_MAX		128	/* must be power of 2 */</div><div class='del'>-#define ISCSI_MGMT_CMDS_MAX		32	/* must be power of 2 */</div><div class='del'>-#define ISCSI_MGMT_ITT_OFFSET		0xa00</div><div class='ctx'> #define ISCSI_SG_TABLESIZE		SG_ALL</div><div class='del'>-#define ISCSI_DEF_CMD_PER_LUN		32</div><div class='del'>-#define ISCSI_MAX_CMD_PER_LUN		128</div><div class='ctx'> #define ISCSI_TCP_MAX_CMD_LEN		16</div><div class='ctx'> </div><div class='del'>-#define ITT_MASK			(0xfff)</div><div class='del'>-#define CID_SHIFT			12</div><div class='del'>-#define CID_MASK			(0xffff&lt;&lt;CID_SHIFT)</div><div class='del'>-#define AGE_SHIFT			28</div><div class='del'>-#define AGE_MASK			(0xf&lt;&lt;AGE_SHIFT)</div><div class='del'>-</div><div class='del'>-struct iscsi_queue {</div><div class='del'>-	struct kfifo		*queue;		/* FIFO Queue */</div><div class='del'>-	void			**pool;		/* Pool of elements */</div><div class='del'>-	int			max;		/* Max number of elements */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct iscsi_session;</div><div class='del'>-struct iscsi_cmd_task;</div><div class='del'>-struct iscsi_mgmt_task;</div><div class='add'>+struct socket;</div><div class='ctx'> </div><div class='ctx'> /* Socket connection recieve helper */</div><div class='ctx'> struct iscsi_tcp_recv {</div><div class='hunk'>@@ -104,48 +66,32 @@ struct iscsi_tcp_recv {</div><div class='ctx'> 	struct iscsi_cmd_task	*ctask;		/* current cmd in progress */</div><div class='ctx'> </div><div class='ctx'> 	/* copied and flipped values */</div><div class='del'>-	int			opcode;</div><div class='del'>-	int			flags;</div><div class='del'>-	int			cmd_status;</div><div class='del'>-	int			ahslen;</div><div class='ctx'> 	int			datalen;</div><div class='del'>-	uint32_t		itt;</div><div class='ctx'> 	int			datadgst;</div><div class='add'>+	char			zero_copy_hdr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iscsi_cls_conn;</div><div class='del'>-</div><div class='del'>-struct iscsi_conn {</div><div class='del'>-	struct iscsi_cls_conn	*cls_conn;	/* ptr to class connection */</div><div class='add'>+struct iscsi_tcp_conn {</div><div class='add'>+	struct iscsi_conn	*iscsi_conn;</div><div class='add'>+	struct socket		*sock;</div><div class='ctx'> 	struct iscsi_hdr	hdr;		/* header placeholder */</div><div class='ctx'> 	char			hdrext[4*sizeof(__u16) +</div><div class='ctx'> 				    sizeof(__u32)];</div><div class='ctx'> 	int			data_copied;</div><div class='ctx'> 	char			*data;		/* data placeholder */</div><div class='del'>-	struct socket           *sock;          /* TCP socket */</div><div class='ctx'> 	int			data_size;	/* actual recv_dlength */</div><div class='ctx'> 	int			stop_stage;	/* conn_stop() flag: *</div><div class='ctx'> 						 * stop to recover,  *</div><div class='ctx'> 						 * stop to terminate */</div><div class='ctx'> 	/* iSCSI connection-wide sequencing */</div><div class='del'>-	uint32_t		exp_statsn;</div><div class='ctx'> 	int			hdr_size;	/* PDU header size */</div><div class='del'>-	unsigned long		suspend_rx;	/* suspend Rx */</div><div class='ctx'> </div><div class='ctx'> 	struct crypto_tfm	*rx_tfm;	/* CRC32C (Rx) */</div><div class='ctx'> 	struct crypto_tfm	*data_rx_tfm;	/* CRC32C (Rx) for data */</div><div class='ctx'> </div><div class='ctx'> 	/* control data */</div><div class='del'>-	int			senselen;	/* scsi sense length */</div><div class='del'>-	int			id;		/* CID */</div><div class='ctx'> 	struct iscsi_tcp_recv	in;		/* TCP receive context */</div><div class='del'>-	struct iscsi_session	*session;	/* parent session */</div><div class='del'>-	struct list_head	item;		/* maintains list of conns */</div><div class='ctx'> 	int			in_progress;	/* connection state machine */</div><div class='del'>-	int			c_stage;	/* connection state */</div><div class='del'>-	struct iscsi_mgmt_task	*login_mtask;	/* mtask used for login/text */</div><div class='del'>-	struct iscsi_mgmt_task	*mtask;		/* xmit mtask in progress */</div><div class='del'>-	struct iscsi_cmd_task	*ctask;		/* xmit ctask in progress */</div><div class='ctx'> </div><div class='ctx'> 	/* old values for socket callbacks */</div><div class='ctx'> 	void			(*old_data_ready)(struct sock *, int);</div><div class='hunk'>@@ -155,93 +101,14 @@ struct iscsi_conn {</div><div class='ctx'> 	/* xmit */</div><div class='ctx'> 	struct crypto_tfm	*tx_tfm;	/* CRC32C (Tx) */</div><div class='ctx'> 	struct crypto_tfm	*data_tx_tfm;	/* CRC32C (Tx) for data */</div><div class='del'>-	struct kfifo		*writequeue;	/* write cmds for Data-Outs */</div><div class='del'>-	struct kfifo		*immqueue;	/* immediate xmit queue */</div><div class='del'>-	struct kfifo		*mgmtqueue;	/* mgmt (control) xmit queue */</div><div class='del'>-	struct kfifo		*xmitqueue;	/* data-path cmd queue */</div><div class='del'>-	struct work_struct	xmitwork;	/* per-conn. xmit workqueue */</div><div class='del'>-	struct mutex		xmitmutex;	/* serializes connection xmit,</div><div class='del'>-						 * access to kfifos:	  *</div><div class='del'>-						 * xmitqueue, writequeue, *</div><div class='del'>-						 * immqueue, mgmtqueue    */</div><div class='del'>-	unsigned long		suspend_tx;	/* suspend Tx */</div><div class='del'>-</div><div class='del'>-	/* abort */</div><div class='del'>-	wait_queue_head_t	ehwait;		/* used in eh_abort()     */</div><div class='del'>-	struct iscsi_tm		tmhdr;</div><div class='del'>-	struct timer_list	tmabort_timer;  /* abort timer */</div><div class='del'>-	int			tmabort_state;  /* see TMABORT_INITIAL, etc.*/</div><div class='del'>-</div><div class='del'>-	/* negotiated params */</div><div class='del'>-	int			max_recv_dlength;</div><div class='del'>-	int			max_xmit_dlength;</div><div class='del'>-	int			hdrdgst_en;</div><div class='del'>-	int			datadgst_en;</div><div class='ctx'> </div><div class='del'>-	/* MIB-statistics */</div><div class='del'>-	uint64_t		txdata_octets;</div><div class='del'>-	uint64_t		rxdata_octets;</div><div class='del'>-	uint32_t		scsicmd_pdus_cnt;</div><div class='del'>-	uint32_t		dataout_pdus_cnt;</div><div class='del'>-	uint32_t		scsirsp_pdus_cnt;</div><div class='del'>-	uint32_t		datain_pdus_cnt;</div><div class='del'>-	uint32_t		r2t_pdus_cnt;</div><div class='del'>-	uint32_t		tmfcmd_pdus_cnt;</div><div class='del'>-	int32_t			tmfrsp_pdus_cnt;</div><div class='del'>-</div><div class='del'>-	/* custom statistics */</div><div class='add'>+	/* MIB custom statistics */</div><div class='ctx'> 	uint32_t		sendpage_failures_cnt;</div><div class='ctx'> 	uint32_t		discontiguous_hdr_cnt;</div><div class='del'>-	uint32_t		eh_abort_cnt;</div><div class='ctx'> </div><div class='ctx'> 	ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iscsi_session {</div><div class='del'>-	/* iSCSI session-wide sequencing */</div><div class='del'>-	uint32_t		cmdsn;</div><div class='del'>-	uint32_t		exp_cmdsn;</div><div class='del'>-	uint32_t		max_cmdsn;</div><div class='del'>-</div><div class='del'>-	/* configuration */</div><div class='del'>-	int			initial_r2t_en;</div><div class='del'>-	int			max_r2t;</div><div class='del'>-	int			imm_data_en;</div><div class='del'>-	int			first_burst;</div><div class='del'>-	int			max_burst;</div><div class='del'>-	int			time2wait;</div><div class='del'>-	int			time2retain;</div><div class='del'>-	int			pdu_inorder_en;</div><div class='del'>-	int			dataseq_inorder_en;</div><div class='del'>-	int			erl;</div><div class='del'>-	int			ifmarker_en;</div><div class='del'>-	int			ofmarker_en;</div><div class='del'>-</div><div class='del'>-	/* control data */</div><div class='del'>-	struct Scsi_Host	*host;</div><div class='del'>-	int			id;</div><div class='del'>-	struct iscsi_conn	*leadconn;	/* leading connection */</div><div class='del'>-	spinlock_t		lock;		/* protects session state, *</div><div class='del'>-						 * sequence numbers,       *</div><div class='del'>-						 * session resources:      *</div><div class='del'>-						 * - cmdpool,		   *</div><div class='del'>-						 * - mgmtpool,		   *</div><div class='del'>-						 * - r2tpool		   */</div><div class='del'>-	int			state;		/* session state           */</div><div class='del'>-	struct list_head	item;</div><div class='del'>-	void			*auth_client;</div><div class='del'>-	int			conn_cnt;</div><div class='del'>-	int			age;		/* counts session re-opens */</div><div class='del'>-</div><div class='del'>-	struct list_head	connections;	/* list of connections */</div><div class='del'>-	int			cmds_max;	/* size of cmds array */</div><div class='del'>-	struct iscsi_cmd_task	**cmds;		/* Original Cmds arr */</div><div class='del'>-	struct iscsi_queue	cmdpool;	/* PDU's pool */</div><div class='del'>-	int			mgmtpool_max;	/* size of mgmt array */</div><div class='del'>-	struct iscsi_mgmt_task	**mgmt_cmds;	/* Original mgmt arr */</div><div class='del'>-	struct iscsi_queue	mgmtpool;	/* Mgmt PDU's pool */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct iscsi_buf {</div><div class='ctx'> 	struct scatterlist	sg;</div><div class='ctx'> 	unsigned int		sent;</div><div class='hunk'>@@ -251,22 +118,17 @@ struct iscsi_buf {</div><div class='ctx'> struct iscsi_data_task {</div><div class='ctx'> 	struct iscsi_data	hdr;			/* PDU */</div><div class='ctx'> 	char			hdrext[sizeof(__u32)];	/* Header-Digest */</div><div class='del'>-	struct list_head	item;			/* data queue item */</div><div class='ctx'> 	struct iscsi_buf	digestbuf;		/* digest buffer */</div><div class='ctx'> 	uint32_t		digest;			/* data digest */</div><div class='ctx'> };</div><div class='del'>-#define ISCSI_DTASK_DEFAULT_MAX	ISCSI_SG_TABLESIZE * PAGE_SIZE / 512</div><div class='ctx'> </div><div class='del'>-struct iscsi_mgmt_task {</div><div class='del'>-	struct iscsi_hdr	hdr;		/* mgmt. PDU */</div><div class='del'>-	char			hdrext[sizeof(__u32)];	/* Header-Digest */</div><div class='del'>-	char			*data;		/* mgmt payload */</div><div class='add'>+struct iscsi_tcp_mgmt_task {</div><div class='add'>+	struct iscsi_hdr	hdr;</div><div class='add'>+	char			hdrext[sizeof(__u32)]; /* Header-Digest */</div><div class='ctx'> 	int			xmstate;	/* mgmt xmit progress */</div><div class='del'>-	int			data_count;	/* counts data to be sent */</div><div class='ctx'> 	struct iscsi_buf	headbuf;	/* header buffer */</div><div class='ctx'> 	struct iscsi_buf	sendbuf;	/* in progress buffer */</div><div class='ctx'> 	int			sent;</div><div class='del'>-	uint32_t		itt;		/* this ITT */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct iscsi_r2t_info {</div><div class='hunk'>@@ -280,48 +142,36 @@ struct iscsi_r2t_info {</div><div class='ctx'> 	int			data_count;	/* DATA-Out payload progress */</div><div class='ctx'> 	struct scatterlist	*sg;		/* per-R2T SG list */</div><div class='ctx'> 	int			solicit_datasn;</div><div class='del'>-	struct iscsi_data_task   *dtask;        /* which data task */</div><div class='add'>+	struct iscsi_data_task   dtask;        /* which data task */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct iscsi_cmd_task {</div><div class='del'>-	struct iscsi_cmd	hdr;			/* iSCSI PDU header */</div><div class='add'>+struct iscsi_tcp_cmd_task {</div><div class='add'>+	struct iscsi_cmd	hdr;</div><div class='ctx'> 	char			hdrext[4*sizeof(__u16)+	/* AHS */</div><div class='ctx'> 				    sizeof(__u32)];	/* HeaderDigest */</div><div class='ctx'> 	char			pad[ISCSI_PAD_LEN];</div><div class='del'>-	int			itt;			/* this ITT */</div><div class='del'>-	int			datasn;			/* DataSN */</div><div class='add'>+	int			pad_count;		/* padded bytes */</div><div class='ctx'> 	struct iscsi_buf	headbuf;		/* header buf (xmit) */</div><div class='ctx'> 	struct iscsi_buf	sendbuf;		/* in progress buffer*/</div><div class='add'>+	int			xmstate;		/* xmit xtate machine */</div><div class='ctx'> 	int			sent;</div><div class='ctx'> 	struct scatterlist	*sg;			/* per-cmd SG list  */</div><div class='ctx'> 	struct scatterlist	*bad_sg;		/* assert statement */</div><div class='ctx'> 	int			sg_count;		/* SG's to process  */</div><div class='del'>-	uint32_t		unsol_datasn;</div><div class='ctx'> 	uint32_t		exp_r2tsn;</div><div class='del'>-	int			xmstate;		/* xmit xtate machine */</div><div class='del'>-	int			imm_count;		/* imm-data (bytes)   */</div><div class='del'>-	int			unsol_count;		/* unsolicited (bytes)*/</div><div class='ctx'> 	int			r2t_data_count;		/* R2T Data-Out bytes */</div><div class='del'>-	int			data_count;		/* remaining Data-Out */</div><div class='del'>-	int			pad_count;		/* padded bytes */</div><div class='del'>-	struct scsi_cmnd	*sc;			/* associated SCSI cmd*/</div><div class='del'>-	int			total_length;</div><div class='ctx'> 	int			data_offset;</div><div class='del'>-	struct iscsi_conn	*conn;			/* used connection    */</div><div class='del'>-	struct iscsi_mgmt_task	*mtask;			/* tmf mtask in progr */</div><div class='del'>-</div><div class='ctx'> 	struct iscsi_r2t_info	*r2t;			/* in progress R2T    */</div><div class='ctx'> 	struct iscsi_queue	r2tpool;</div><div class='ctx'> 	struct kfifo		*r2tqueue;</div><div class='ctx'> 	struct iscsi_r2t_info	**r2ts;</div><div class='del'>-	struct list_head	dataqueue;		/* Data-Out dataqueue */</div><div class='del'>-	mempool_t		*datapool;</div><div class='ctx'> 	uint32_t		datadigest;		/* for recover digest */</div><div class='ctx'> 	int			digest_count;</div><div class='ctx'> 	uint32_t		immdigest;		/* for imm data */</div><div class='ctx'> 	struct iscsi_buf	immbuf;			/* for imm data digest */</div><div class='del'>-	struct iscsi_data_task   *dtask;		/* data task in progress*/</div><div class='del'>-	int			digest_offset;		/* for partial buff digest */</div><div class='add'>+	struct iscsi_data_task	*dtask;		/* data task in progress*/</div><div class='add'>+	struct iscsi_data_task	unsol_dtask;	/* unsol data task */</div><div class='add'>+	int			digest_offset;	/* for partial buff digest */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* ISCSI_H */</div><div class='head'>diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c<br/>index fc031c76dade..3fd8a96f2af3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/jazz_esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/jazz_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/jazz_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/jazz_esp.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 	esp-&gt;esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer));</div><div class='ctx'> 	</div><div class='ctx'> 	esp-&gt;irq = JAZZ_SCSI_IRQ;</div><div class='del'>-	request_irq(JAZZ_SCSI_IRQ, esp_intr, SA_INTERRUPT, "JAZZ SCSI",</div><div class='add'>+	request_irq(JAZZ_SCSI_IRQ, esp_intr, IRQF_DISABLED, "JAZZ SCSI",</div><div class='ctx'> 	            esp-&gt;ehost);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c<br/>index eb7bd310cc82..f0871c3ac3d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lasi700.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lasi700.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lasi700.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/lasi700.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ lasi700_probe(struct parisc_device *dev)</div><div class='ctx'> 	host-&gt;this_id = 7;</div><div class='ctx'> 	host-&gt;base = base;</div><div class='ctx'> 	host-&gt;irq = dev-&gt;irq;</div><div class='del'>-	if(request_irq(dev-&gt;irq, NCR_700_intr, SA_SHIRQ, "lasi700", host)) {</div><div class='add'>+	if(request_irq(dev-&gt;irq, NCR_700_intr, IRQF_SHARED, "lasi700", host)) {</div><div class='ctx'> 		printk(KERN_ERR "lasi700: request_irq failed!\n");</div><div class='ctx'> 		goto out_put_host;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c<br/>index 835dff0bafdc..9ce221f25954 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libata-bmdma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-bmdma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libata-bmdma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/libata-bmdma.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='hunk'>@@ -652,6 +651,151 @@ void ata_bmdma_stop(struct ata_queued_cmd *qc)</div><div class='ctx'> 	ata_altstatus(ap);        /* dummy read */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ata_bmdma_freeze - Freeze BMDMA controller port</div><div class='add'>+ *	@ap: port to freeze</div><div class='add'>+ *</div><div class='add'>+ *	Freeze BMDMA controller port.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ */</div><div class='add'>+void ata_bmdma_freeze(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_ioports *ioaddr = &amp;ap-&gt;ioaddr;</div><div class='add'>+</div><div class='add'>+	ap-&gt;ctl |= ATA_NIEN;</div><div class='add'>+	ap-&gt;last_ctl = ap-&gt;ctl;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_MMIO)</div><div class='add'>+		writeb(ap-&gt;ctl, (void __iomem *)ioaddr-&gt;ctl_addr);</div><div class='add'>+	else</div><div class='add'>+		outb(ap-&gt;ctl, ioaddr-&gt;ctl_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_bmdma_thaw - Thaw BMDMA controller port</div><div class='add'>+ *	@ap: port to thaw</div><div class='add'>+ *</div><div class='add'>+ *	Thaw BMDMA controller port.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ */</div><div class='add'>+void ata_bmdma_thaw(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	/* clear &amp; re-enable interrupts */</div><div class='add'>+	ata_chk_status(ap);</div><div class='add'>+	ap-&gt;ops-&gt;irq_clear(ap);</div><div class='add'>+	if (ap-&gt;ioaddr.ctl_addr)	/* FIXME: hack. create a hook instead */</div><div class='add'>+		ata_irq_on(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_bmdma_drive_eh - Perform EH with given methods for BMDMA controller</div><div class='add'>+ *	@ap: port to handle error for</div><div class='add'>+ *	@prereset: prereset method (can be NULL)</div><div class='add'>+ *	@softreset: softreset method (can be NULL)</div><div class='add'>+ *	@hardreset: hardreset method (can be NULL)</div><div class='add'>+ *	@postreset: postreset method (can be NULL)</div><div class='add'>+ *</div><div class='add'>+ *	Handle error for ATA BMDMA controller.  It can handle both</div><div class='add'>+ *	PATA and SATA controllers.  Many controllers should be able to</div><div class='add'>+ *	use this EH as-is or with some added handling before and</div><div class='add'>+ *	after.</div><div class='add'>+ *</div><div class='add'>+ *	This function is intended to be used for constructing</div><div class='add'>+ *	-&gt;error_handler callback by low level drivers.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ */</div><div class='add'>+void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='add'>+			ata_reset_fn_t softreset, ata_reset_fn_t hardreset,</div><div class='add'>+			ata_postreset_fn_t postreset)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	struct ata_queued_cmd *qc;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int thaw = 0;</div><div class='add'>+</div><div class='add'>+	qc = __ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+	if (qc &amp;&amp; !(qc-&gt;flags &amp; ATA_QCFLAG_FAILED))</div><div class='add'>+		qc = NULL;</div><div class='add'>+</div><div class='add'>+	/* reset PIO HSM and stop DMA engine */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='add'>+</div><div class='add'>+	if (qc &amp;&amp; (qc-&gt;tf.protocol == ATA_PROT_DMA ||</div><div class='add'>+		   qc-&gt;tf.protocol == ATA_PROT_ATAPI_DMA)) {</div><div class='add'>+		u8 host_stat;</div><div class='add'>+</div><div class='add'>+		host_stat = ata_bmdma_status(ap);</div><div class='add'>+</div><div class='add'>+		ata_ehi_push_desc(&amp;ehc-&gt;i, "BMDMA stat 0x%x", host_stat);</div><div class='add'>+</div><div class='add'>+		/* BMDMA controllers indicate host bus error by</div><div class='add'>+		 * setting DMA_ERR bit and timing out.  As it wasn't</div><div class='add'>+		 * really a timeout event, adjust error mask and</div><div class='add'>+		 * cancel frozen state.</div><div class='add'>+		 */</div><div class='add'>+		if (qc-&gt;err_mask == AC_ERR_TIMEOUT &amp;&amp; host_stat &amp; ATA_DMA_ERR) {</div><div class='add'>+			qc-&gt;err_mask = AC_ERR_HOST_BUS;</div><div class='add'>+			thaw = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ap-&gt;ops-&gt;bmdma_stop(qc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ata_altstatus(ap);</div><div class='add'>+	ata_chk_status(ap);</div><div class='add'>+	ap-&gt;ops-&gt;irq_clear(ap);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (thaw)</div><div class='add'>+		ata_eh_thaw_port(ap);</div><div class='add'>+</div><div class='add'>+	/* PIO and DMA engines have been stopped, perform recovery */</div><div class='add'>+	ata_do_eh(ap, prereset, softreset, hardreset, postreset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_bmdma_error_handler - Stock error handler for BMDMA controller</div><div class='add'>+ *	@ap: port to handle error for</div><div class='add'>+ *</div><div class='add'>+ *	Stock error handler for BMDMA controller.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ */</div><div class='add'>+void ata_bmdma_error_handler(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	ata_reset_fn_t hardreset;</div><div class='add'>+</div><div class='add'>+	hardreset = NULL;</div><div class='add'>+	if (sata_scr_valid(ap))</div><div class='add'>+		hardreset = sata_std_hardreset;</div><div class='add'>+</div><div class='add'>+	ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset, hardreset,</div><div class='add'>+			   ata_std_postreset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_bmdma_post_internal_cmd - Stock post_internal_cmd for</div><div class='add'>+ *				      BMDMA controller</div><div class='add'>+ *	@qc: internal command to clean up</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ */</div><div class='add'>+void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	ata_bmdma_stop(qc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> static struct ata_probe_ent *</div><div class='ctx'> ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port)</div><div class='hunk'>@@ -709,7 +853,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;private_data = port[0]-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (ports &amp; ATA_PORT_PRIMARY) {</div><div class='hunk'>@@ -930,10 +1074,21 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: check ata_device_add return */</div><div class='ctx'> 	if (legacy_mode) {</div><div class='del'>-		if (legacy_mode &amp; (1 &lt;&lt; 0))</div><div class='add'>+		struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+		struct ata_host_set *host_set = NULL;</div><div class='add'>+</div><div class='add'>+		if (legacy_mode &amp; (1 &lt;&lt; 0)) {</div><div class='ctx'> 			ata_device_add(probe_ent);</div><div class='del'>-		if (legacy_mode &amp; (1 &lt;&lt; 1))</div><div class='add'>+			host_set = dev_get_drvdata(dev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (legacy_mode &amp; (1 &lt;&lt; 1)) {</div><div class='ctx'> 			ata_device_add(probe_ent2);</div><div class='add'>+			if (host_set) {</div><div class='add'>+				host_set-&gt;next = dev_get_drvdata(dev);</div><div class='add'>+				dev_set_drvdata(dev, host_set);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		ata_device_add(probe_ent);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c<br/>index b046ffa22101..386e5f21e191 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libata-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libata-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/libata-core.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -61,26 +60,37 @@</div><div class='ctx'> </div><div class='ctx'> #include "libata.h"</div><div class='ctx'> </div><div class='del'>-static unsigned int ata_dev_init_params(struct ata_port *ap,</div><div class='del'>-					struct ata_device *dev,</div><div class='del'>-					u16 heads,</div><div class='del'>-					u16 sectors);</div><div class='del'>-static void ata_set_mode(struct ata_port *ap);</div><div class='del'>-static unsigned int ata_dev_set_xfermode(struct ata_port *ap,</div><div class='del'>-					 struct ata_device *dev);</div><div class='del'>-static void ata_dev_xfermask(struct ata_port *ap, struct ata_device *dev);</div><div class='add'>+/* debounce timing parameters in msecs { interval, duration, timeout } */</div><div class='add'>+const unsigned long sata_deb_timing_normal[]		= {   5,  100, 2000 };</div><div class='add'>+const unsigned long sata_deb_timing_hotplug[]		= {  25,  500, 2000 };</div><div class='add'>+const unsigned long sata_deb_timing_long[]		= { 100, 2000, 5000 };</div><div class='add'>+</div><div class='add'>+static unsigned int ata_dev_init_params(struct ata_device *dev,</div><div class='add'>+					u16 heads, u16 sectors);</div><div class='add'>+static unsigned int ata_dev_set_xfermode(struct ata_device *dev);</div><div class='add'>+static void ata_dev_xfermask(struct ata_device *dev);</div><div class='ctx'> </div><div class='ctx'> static unsigned int ata_unique_id = 1;</div><div class='ctx'> static struct workqueue_struct *ata_wq;</div><div class='ctx'> </div><div class='add'>+struct workqueue_struct *ata_aux_wq;</div><div class='add'>+</div><div class='ctx'> int atapi_enabled = 1;</div><div class='ctx'> module_param(atapi_enabled, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");</div><div class='ctx'> </div><div class='add'>+int atapi_dmadir = 0;</div><div class='add'>+module_param(atapi_dmadir, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(atapi_dmadir, "Enable ATAPI DMADIR bridge support (0=off, 1=on)");</div><div class='add'>+</div><div class='ctx'> int libata_fua = 0;</div><div class='ctx'> module_param_named(fua, libata_fua, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");</div><div class='ctx'> </div><div class='add'>+static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;</div><div class='add'>+module_param(ata_probe_timeout, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Jeff Garzik");</div><div class='ctx'> MODULE_DESCRIPTION("Library module for ATA devices");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='hunk'>@@ -397,11 +407,22 @@ static const char *ata_mode_string(unsigned int xfer_mask)</div><div class='ctx'> 	return "&lt;n/a&gt;";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ata_dev_disable(struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+static const char *sata_spd_string(unsigned int spd)</div><div class='add'>+{</div><div class='add'>+	static const char * const spd_str[] = {</div><div class='add'>+		"1.5 Gbps",</div><div class='add'>+		"3.0 Gbps",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (spd == 0 || (spd - 1) &gt;= ARRAY_SIZE(spd_str))</div><div class='add'>+		return "&lt;unknown&gt;";</div><div class='add'>+	return spd_str[spd - 1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ata_dev_disable(struct ata_device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (ata_dev_present(dev)) {</div><div class='del'>-		printk(KERN_WARNING "ata%u: dev %u disabled\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno);</div><div class='add'>+	if (ata_dev_enabled(dev) &amp;&amp; ata_msg_drv(dev-&gt;ap)) {</div><div class='add'>+		ata_dev_printk(dev, KERN_WARNING, "disabled\n");</div><div class='ctx'> 		dev-&gt;class++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -759,8 +780,9 @@ void ata_std_dev_select (struct ata_port *ap, unsigned int device)</div><div class='ctx'> void ata_dev_select(struct ata_port *ap, unsigned int device,</div><div class='ctx'> 			   unsigned int wait, unsigned int can_sleep)</div><div class='ctx'> {</div><div class='del'>-	VPRINTK("ENTER, ata%u: device %u, wait %u\n",</div><div class='del'>-		ap-&gt;id, device, wait);</div><div class='add'>+	if (ata_msg_probe(ap))</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "ata_dev_select: ENTER, ata%u: "</div><div class='add'>+				"device %u, wait %u\n", ap-&gt;id, device, wait);</div><div class='ctx'> </div><div class='ctx'> 	if (wait)</div><div class='ctx'> 		ata_wait_idle(ap);</div><div class='hunk'>@@ -885,7 +907,7 @@ void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data,</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_FLUSH_PORT_TASK)</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_FLUSH_PORT_TASK)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	PREPARE_WORK(&amp;ap-&gt;port_task, fn, data);</div><div class='hunk'>@@ -915,9 +937,9 @@ void ata_port_flush_task(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	ap-&gt;flags |= ATA_FLAG_FLUSH_PORT_TASK;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	ap-&gt;pflags |= ATA_PFLAG_FLUSH_PORT_TASK;</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("flush #1\n");</div><div class='ctx'> 	flush_workqueue(ata_wq);</div><div class='hunk'>@@ -928,30 +950,32 @@ void ata_port_flush_task(struct ata_port *ap)</div><div class='ctx'> 	 * Cancel and flush.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!cancel_delayed_work(&amp;ap-&gt;port_task)) {</div><div class='del'>-		DPRINTK("flush #2\n");</div><div class='add'>+		if (ata_msg_ctl(ap))</div><div class='add'>+			ata_port_printk(ap, KERN_DEBUG, "%s: flush #2\n",</div><div class='add'>+					__FUNCTION__);</div><div class='ctx'> 		flush_workqueue(ata_wq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	ap-&gt;flags &amp;= ~ATA_FLAG_FLUSH_PORT_TASK;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	ap-&gt;pflags &amp;= ~ATA_PFLAG_FLUSH_PORT_TASK;</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("EXIT\n");</div><div class='add'>+	if (ata_msg_ctl(ap))</div><div class='add'>+		ata_port_printk(ap, KERN_DEBUG, "%s: EXIT\n", __FUNCTION__);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ata_qc_complete_internal(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct completion *waiting = qc-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	qc-&gt;ap-&gt;ops-&gt;tf_read(qc-&gt;ap, &amp;qc-&gt;tf);</div><div class='ctx'> 	complete(waiting);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_exec_internal - execute libata internal command</div><div class='del'>- *	@ap: Port to which the command is sent</div><div class='ctx'>  *	@dev: Device to which the command is sent</div><div class='ctx'>  *	@tf: Taskfile registers for the command and the result</div><div class='add'>+ *	@cdb: CDB for packet command</div><div class='ctx'>  *	@dma_dir: Data tranfer direction of the command</div><div class='ctx'>  *	@buf: Data buffer of the command</div><div class='ctx'>  *	@buflen: Length of data buffer</div><div class='hunk'>@@ -964,25 +988,66 @@ void ata_qc_complete_internal(struct ata_queued_cmd *qc)</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	None.  Should be called with kernel context, might sleep.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Zero on success, AC_ERR_* mask on failure</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static unsigned</div><div class='del'>-ata_exec_internal(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-		  struct ata_taskfile *tf,</div><div class='del'>-		  int dma_dir, void *buf, unsigned int buflen)</div><div class='add'>+unsigned ata_exec_internal(struct ata_device *dev,</div><div class='add'>+			   struct ata_taskfile *tf, const u8 *cdb,</div><div class='add'>+			   int dma_dir, void *buf, unsigned int buflen)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='ctx'> 	u8 command = tf-&gt;command;</div><div class='ctx'> 	struct ata_queued_cmd *qc;</div><div class='del'>-	DECLARE_COMPLETION(wait);</div><div class='add'>+	unsigned int tag, preempted_tag;</div><div class='add'>+	u32 preempted_sactive, preempted_qc_active;</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(wait);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int err_mask;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	qc = ata_qc_new_init(ap, dev);</div><div class='del'>-	BUG_ON(qc == NULL);</div><div class='add'>+	/* no internal command while frozen */</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_FROZEN) {</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		return AC_ERR_SYSTEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize internal qc */</div><div class='ctx'> </div><div class='add'>+	/* XXX: Tag 0 is used for drivers with legacy EH as some</div><div class='add'>+	 * drivers choke if any other tag is given.  This breaks</div><div class='add'>+	 * ata_tag_internal() test for those drivers.  Don't use new</div><div class='add'>+	 * EH stuff without converting to it.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		tag = ATA_TAG_INTERNAL;</div><div class='add'>+	else</div><div class='add'>+		tag = 0;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(tag, &amp;ap-&gt;qc_allocated))</div><div class='add'>+		BUG();</div><div class='add'>+	qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+	qc-&gt;tag = tag;</div><div class='add'>+	qc-&gt;scsicmd = NULL;</div><div class='add'>+	qc-&gt;ap = ap;</div><div class='add'>+	qc-&gt;dev = dev;</div><div class='add'>+	ata_qc_reinit(qc);</div><div class='add'>+</div><div class='add'>+	preempted_tag = ap-&gt;active_tag;</div><div class='add'>+	preempted_sactive = ap-&gt;sactive;</div><div class='add'>+	preempted_qc_active = ap-&gt;qc_active;</div><div class='add'>+	ap-&gt;active_tag = ATA_TAG_POISON;</div><div class='add'>+	ap-&gt;sactive = 0;</div><div class='add'>+	ap-&gt;qc_active = 0;</div><div class='add'>+</div><div class='add'>+	/* prepare &amp; issue qc */</div><div class='ctx'> 	qc-&gt;tf = *tf;</div><div class='add'>+	if (cdb)</div><div class='add'>+		memcpy(qc-&gt;cdb, cdb, ATAPI_CDB_LEN);</div><div class='add'>+	qc-&gt;flags |= ATA_QCFLAG_RESULT_TF;</div><div class='ctx'> 	qc-&gt;dma_dir = dma_dir;</div><div class='ctx'> 	if (dma_dir != DMA_NONE) {</div><div class='ctx'> 		ata_sg_init_one(qc, buf, buflen);</div><div class='hunk'>@@ -994,33 +1059,58 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	ata_qc_issue(qc);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	rc = wait_for_completion_timeout(&amp;wait, ata_probe_timeout);</div><div class='ctx'> </div><div class='del'>-	if (!wait_for_completion_timeout(&amp;wait, ATA_TMOUT_INTERNAL)) {</div><div class='del'>-		ata_port_flush_task(ap);</div><div class='add'>+	ata_port_flush_task(ap);</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		/* We're racing with irq here.  If we lose, the</div><div class='ctx'> 		 * following test prevents us from completing the qc</div><div class='del'>-		 * again.  If completion irq occurs after here but</div><div class='del'>-		 * before the caller cleans up, it will result in a</div><div class='del'>-		 * spurious interrupt.  We can live with that.</div><div class='add'>+		 * twice.  If we win, the port is frozen and will be</div><div class='add'>+		 * cleaned up by -&gt;post_internal_cmd().</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE) {</div><div class='del'>-			qc-&gt;err_mask = AC_ERR_TIMEOUT;</div><div class='del'>-			ata_qc_complete(qc);</div><div class='del'>-			printk(KERN_WARNING "ata%u: qc timeout (cmd 0x%x)\n",</div><div class='del'>-			       ap-&gt;id, command);</div><div class='add'>+			qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='add'>+</div><div class='add'>+			if (ap-&gt;ops-&gt;error_handler)</div><div class='add'>+				ata_port_freeze(ap);</div><div class='add'>+			else</div><div class='add'>+				ata_qc_complete(qc);</div><div class='add'>+</div><div class='add'>+			if (ata_msg_warn(ap))</div><div class='add'>+				ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+					"qc timeout (cmd 0x%x)\n", command);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*tf = qc-&gt;tf;</div><div class='add'>+	/* do post_internal_cmd */</div><div class='add'>+	if (ap-&gt;ops-&gt;post_internal_cmd)</div><div class='add'>+		ap-&gt;ops-&gt;post_internal_cmd(qc);</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;flags &amp; ATA_QCFLAG_FAILED &amp;&amp; !qc-&gt;err_mask) {</div><div class='add'>+		if (ata_msg_warn(ap))</div><div class='add'>+			ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+				"zero err_mask for failed "</div><div class='add'>+				"internal command, assuming AC_ERR_OTHER\n");</div><div class='add'>+		qc-&gt;err_mask |= AC_ERR_OTHER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* finish up */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	*tf = qc-&gt;result_tf;</div><div class='ctx'> 	err_mask = qc-&gt;err_mask;</div><div class='ctx'> </div><div class='ctx'> 	ata_qc_free(qc);</div><div class='add'>+	ap-&gt;active_tag = preempted_tag;</div><div class='add'>+	ap-&gt;sactive = preempted_sactive;</div><div class='add'>+	ap-&gt;qc_active = preempted_qc_active;</div><div class='ctx'> </div><div class='ctx'> 	/* XXX - Some LLDDs (sata_mv) disable port on command failure.</div><div class='ctx'> 	 * Until those drivers are fixed, we detect the condition</div><div class='hunk'>@@ -1033,15 +1123,44 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Kill the following code as soon as those drivers are fixed.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED) {</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_DISABLED) {</div><div class='ctx'> 		err_mask |= AC_ERR_SYSTEM;</div><div class='ctx'> 		ata_port_probe(ap);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return err_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	ata_do_simple_cmd - execute simple internal command</div><div class='add'>+ *	@dev: Device to which the command is sent</div><div class='add'>+ *	@cmd: Opcode to execute</div><div class='add'>+ *</div><div class='add'>+ *	Execute a 'simple' command, that only consists of the opcode</div><div class='add'>+ *	'cmd' itself, without filling any other registers</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Zero on success, AC_ERR_* mask on failure</div><div class='add'>+ */</div><div class='add'>+unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd)</div><div class='add'>+{</div><div class='add'>+	struct ata_taskfile tf;</div><div class='add'>+</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='add'>+</div><div class='add'>+	tf.command = cmd;</div><div class='add'>+	tf.flags |= ATA_TFLAG_DEVICE;</div><div class='add'>+	tf.protocol = ATA_PROT_NODATA;</div><div class='add'>+</div><div class='add'>+	return ata_exec_internal(dev, &amp;tf, NULL, DMA_NONE, NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	ata_pio_need_iordy	-	check if iordy needed</div><div class='ctx'>  *	@adev: ATA device</div><div class='ctx'>  *</div><div class='hunk'>@@ -1076,11 +1195,10 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_read_id - Read ID data from the specified device</div><div class='del'>- *	@ap: port on which target device resides</div><div class='ctx'>  *	@dev: target device</div><div class='ctx'>  *	@p_class: pointer to class of the target device (may be changed)</div><div class='ctx'>  *	@post_reset: is this read ID post-reset?</div><div class='del'>- *	@p_id: read IDENTIFY page (newly allocated)</div><div class='add'>+ *	@id: buffer to read IDENTIFY data into</div><div class='ctx'>  *</div><div class='ctx'>  *	Read ID data from the specified device.  ATA_CMD_ID_ATA is</div><div class='ctx'>  *	performed on ATA devices and ATA_CMD_ID_ATAPI on ATAPI</div><div class='hunk'>@@ -1093,29 +1211,24 @@ unsigned int ata_pio_need_iordy(const struct ata_device *adev)</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	0 on success, -errno otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-			   unsigned int *p_class, int post_reset, u16 **p_id)</div><div class='add'>+int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,</div><div class='add'>+		    int post_reset, u16 *id)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='ctx'> 	unsigned int class = *p_class;</div><div class='ctx'> 	struct ata_taskfile tf;</div><div class='ctx'> 	unsigned int err_mask = 0;</div><div class='del'>-	u16 *id;</div><div class='ctx'> 	const char *reason;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	DPRINTK("ENTER, host %u, dev %u\n", ap-&gt;id, dev-&gt;devno);</div><div class='add'>+	if (ata_msg_ctl(ap))</div><div class='add'>+		ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER, host %u, dev %u\n",</div><div class='add'>+			       __FUNCTION__, ap-&gt;id, dev-&gt;devno);</div><div class='ctx'> </div><div class='ctx'> 	ata_dev_select(ap, dev-&gt;devno, 1, 1); /* select device 0/1 */</div><div class='ctx'> </div><div class='del'>-	id = kmalloc(sizeof(id[0]) * ATA_ID_WORDS, GFP_KERNEL);</div><div class='del'>-	if (id == NULL) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		reason = "out of memory";</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'>  retry:</div><div class='del'>-	ata_tf_init(ap, &amp;tf, dev-&gt;devno);</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='ctx'> </div><div class='ctx'> 	switch (class) {</div><div class='ctx'> 	case ATA_DEV_ATA:</div><div class='hunk'>@@ -1132,7 +1245,7 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	tf.protocol = ATA_PROT_PIO;</div><div class='ctx'> </div><div class='del'>-	err_mask = ata_exec_internal(ap, dev, &amp;tf, DMA_FROM_DEVICE,</div><div class='add'>+	err_mask = ata_exec_internal(dev, &amp;tf, NULL, DMA_FROM_DEVICE,</div><div class='ctx'> 				     id, sizeof(id[0]) * ATA_ID_WORDS);</div><div class='ctx'> 	if (err_mask) {</div><div class='ctx'> 		rc = -EIO;</div><div class='hunk'>@@ -1159,7 +1272,7 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 		 * Some drives were very specific about that exact sequence.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (ata_id_major_version(id) &lt; 4 || !ata_id_has_lba(id)) {</div><div class='del'>-			err_mask = ata_dev_init_params(ap, dev, id[3], id[6]);</div><div class='add'>+			err_mask = ata_dev_init_params(dev, id[3], id[6]);</div><div class='ctx'> 			if (err_mask) {</div><div class='ctx'> 				rc = -EIO;</div><div class='ctx'> 				reason = "INIT_DEV_PARAMS failed";</div><div class='hunk'>@@ -1175,25 +1288,58 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*p_class = class;</div><div class='del'>-	*p_id = id;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  err_out:</div><div class='del'>-	printk(KERN_WARNING "ata%u: dev %u failed to IDENTIFY (%s)\n",</div><div class='del'>-	       ap-&gt;id, dev-&gt;devno, reason);</div><div class='del'>-	kfree(id);</div><div class='add'>+	if (ata_msg_warn(ap))</div><div class='add'>+		ata_dev_printk(dev, KERN_WARNING, "failed to IDENTIFY "</div><div class='add'>+			       "(%s, err_mask=0x%x)\n", reason, err_mask);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 ata_dev_knobble(const struct ata_port *ap,</div><div class='del'>-				 struct ata_device *dev)</div><div class='add'>+static inline u8 ata_dev_knobble(struct ata_device *dev)</div><div class='ctx'> {</div><div class='del'>-	return ((ap-&gt;cbl == ATA_CBL_SATA) &amp;&amp; (!ata_id_is_sata(dev-&gt;id)));</div><div class='add'>+	return ((dev-&gt;ap-&gt;cbl == ATA_CBL_SATA) &amp;&amp; (!ata_id_is_sata(dev-&gt;id)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ata_dev_config_ncq(struct ata_device *dev,</div><div class='add'>+			       char *desc, size_t desc_sz)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='add'>+	int hdepth = 0, ddepth = ata_id_queue_depth(dev-&gt;id);</div><div class='add'>+</div><div class='add'>+	if (!ata_id_has_ncq(dev-&gt;id)) {</div><div class='add'>+		desc[0] = '\0';</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_NCQ) {</div><div class='add'>+		hdepth = min(ap-&gt;host-&gt;can_queue, ATA_MAX_QUEUE - 1);</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_NCQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdepth &gt;= ddepth)</div><div class='add'>+		snprintf(desc, desc_sz, "NCQ (depth %d)", ddepth);</div><div class='add'>+	else</div><div class='add'>+		snprintf(desc, desc_sz, "NCQ (depth %d/%d)", hdepth, ddepth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ata_set_port_max_cmd_len(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;host) {</div><div class='add'>+		ap-&gt;host-&gt;max_cmd_len = 0;</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+			ap-&gt;host-&gt;max_cmd_len = max_t(unsigned int,</div><div class='add'>+						      ap-&gt;host-&gt;max_cmd_len,</div><div class='add'>+						      ap-&gt;device[i].cdb_len);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_configure - Configure the specified ATA/ATAPI device</div><div class='del'>- *	@ap: Port on which target device resides</div><div class='ctx'>  *	@dev: Target device to configure</div><div class='ctx'>  *	@print_info: Enable device info printout</div><div class='ctx'>  *</div><div class='hunk'>@@ -1206,30 +1352,35 @@ static inline u8 ata_dev_knobble(const struct ata_port *ap,</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	0 on success, -errno otherwise</div><div class='ctx'>  */</div><div class='del'>-static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-			     int print_info)</div><div class='add'>+int ata_dev_configure(struct ata_device *dev, int print_info)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='ctx'> 	const u16 *id = dev-&gt;id;</div><div class='ctx'> 	unsigned int xfer_mask;</div><div class='del'>-	int i, rc;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!ata_dev_present(dev)) {</div><div class='del'>-		DPRINTK("ENTER/EXIT (host %u, dev %u) -- nodev\n",</div><div class='del'>-			ap-&gt;id, dev-&gt;devno);</div><div class='add'>+	if (!ata_dev_enabled(dev) &amp;&amp; ata_msg_info(ap)) {</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO,</div><div class='add'>+			       "%s: ENTER/EXIT (host %u, dev %u) -- nodev\n",</div><div class='add'>+			       __FUNCTION__, ap-&gt;id, dev-&gt;devno);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DPRINTK("ENTER, host %u, dev %u\n", ap-&gt;id, dev-&gt;devno);</div><div class='add'>+	if (ata_msg_probe(ap))</div><div class='add'>+		ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER, host %u, dev %u\n",</div><div class='add'>+			       __FUNCTION__, ap-&gt;id, dev-&gt;devno);</div><div class='ctx'> </div><div class='ctx'> 	/* print device capabilities */</div><div class='del'>-	if (print_info)</div><div class='del'>-		printk(KERN_DEBUG "ata%u: dev %u cfg 49:%04x 82:%04x 83:%04x "</div><div class='del'>-		       "84:%04x 85:%04x 86:%04x 87:%04x 88:%04x\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno, id[49], id[82], id[83],</div><div class='del'>-		       id[84], id[85], id[86], id[87], id[88]);</div><div class='add'>+	if (ata_msg_probe(ap))</div><div class='add'>+		ata_dev_printk(dev, KERN_DEBUG,</div><div class='add'>+			       "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x "</div><div class='add'>+			       "85:%04x 86:%04x 87:%04x 88:%04x\n",</div><div class='add'>+			       __FUNCTION__,</div><div class='add'>+			       id[49], id[82], id[83], id[84],</div><div class='add'>+			       id[85], id[86], id[87], id[88]);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize to-be-configured parameters */</div><div class='del'>-	dev-&gt;flags = 0;</div><div class='add'>+	dev-&gt;flags &amp;= ~ATA_DFLAG_CFG_MASK;</div><div class='ctx'> 	dev-&gt;max_sectors = 0;</div><div class='ctx'> 	dev-&gt;cdb_len = 0;</div><div class='ctx'> 	dev-&gt;n_sectors = 0;</div><div class='hunk'>@@ -1244,7 +1395,8 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	/* find max transfer mode; for printk only */</div><div class='ctx'> 	xfer_mask = ata_id_xfermask(id);</div><div class='ctx'> </div><div class='del'>-	ata_dump_id(id);</div><div class='add'>+	if (ata_msg_probe(ap))</div><div class='add'>+		ata_dump_id(id);</div><div class='ctx'> </div><div class='ctx'> 	/* ATA-specific feature tests */</div><div class='ctx'> 	if (dev-&gt;class == ATA_DEV_ATA) {</div><div class='hunk'>@@ -1252,6 +1404,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (ata_id_has_lba(id)) {</div><div class='ctx'> 			const char *lba_desc;</div><div class='add'>+			char ncq_desc[20];</div><div class='ctx'> </div><div class='ctx'> 			lba_desc = "LBA";</div><div class='ctx'> 			dev-&gt;flags |= ATA_DFLAG_LBA;</div><div class='hunk'>@@ -1260,15 +1413,17 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 				lba_desc = "LBA48";</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='add'>+			/* config NCQ */</div><div class='add'>+			ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));</div><div class='add'>+</div><div class='ctx'> 			/* print device info to dmesg */</div><div class='del'>-			if (print_info)</div><div class='del'>-				printk(KERN_INFO "ata%u: dev %u ATA-%d, "</div><div class='del'>-				       "max %s, %Lu sectors: %s\n",</div><div class='del'>-				       ap-&gt;id, dev-&gt;devno,</div><div class='del'>-				       ata_id_major_version(id),</div><div class='del'>-				       ata_mode_string(xfer_mask),</div><div class='del'>-				       (unsigned long long)dev-&gt;n_sectors,</div><div class='del'>-				       lba_desc);</div><div class='add'>+			if (ata_msg_drv(ap) &amp;&amp; print_info)</div><div class='add'>+				ata_dev_printk(dev, KERN_INFO, "ATA-%d, "</div><div class='add'>+					"max %s, %Lu sectors: %s %s\n",</div><div class='add'>+					ata_id_major_version(id),</div><div class='add'>+					ata_mode_string(xfer_mask),</div><div class='add'>+					(unsigned long long)dev-&gt;n_sectors,</div><div class='add'>+					lba_desc, ncq_desc);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* CHS */</div><div class='ctx'> </div><div class='hunk'>@@ -1285,14 +1440,22 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* print device info to dmesg */</div><div class='del'>-			if (print_info)</div><div class='del'>-				printk(KERN_INFO "ata%u: dev %u ATA-%d, "</div><div class='del'>-				       "max %s, %Lu sectors: CHS %u/%u/%u\n",</div><div class='del'>-				       ap-&gt;id, dev-&gt;devno,</div><div class='del'>-				       ata_id_major_version(id),</div><div class='del'>-				       ata_mode_string(xfer_mask),</div><div class='del'>-				       (unsigned long long)dev-&gt;n_sectors,</div><div class='del'>-				       dev-&gt;cylinders, dev-&gt;heads, dev-&gt;sectors);</div><div class='add'>+			if (ata_msg_drv(ap) &amp;&amp; print_info)</div><div class='add'>+				ata_dev_printk(dev, KERN_INFO, "ATA-%d, "</div><div class='add'>+					"max %s, %Lu sectors: CHS %u/%u/%u\n",</div><div class='add'>+					ata_id_major_version(id),</div><div class='add'>+					ata_mode_string(xfer_mask),</div><div class='add'>+					(unsigned long long)dev-&gt;n_sectors,</div><div class='add'>+					dev-&gt;cylinders, dev-&gt;heads,</div><div class='add'>+					dev-&gt;sectors);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;id[59] &amp; 0x100) {</div><div class='add'>+			dev-&gt;multi_count = dev-&gt;id[59] &amp; 0xff;</div><div class='add'>+			if (ata_msg_drv(ap) &amp;&amp; print_info)</div><div class='add'>+				ata_dev_printk(dev, KERN_INFO,</div><div class='add'>+					"ata%u: dev %u multi count %u\n",</div><div class='add'>+					ap-&gt;id, dev-&gt;devno, dev-&gt;multi_count);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;cdb_len = 16;</div><div class='hunk'>@@ -1300,31 +1463,37 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* ATAPI-specific feature tests */</div><div class='ctx'> 	else if (dev-&gt;class == ATA_DEV_ATAPI) {</div><div class='add'>+		char *cdb_intr_string = "";</div><div class='add'>+</div><div class='ctx'> 		rc = atapi_cdb_len(id);</div><div class='ctx'> 		if ((rc &lt; 12) || (rc &gt; ATAPI_CDB_LEN)) {</div><div class='del'>-			printk(KERN_WARNING "ata%u: unsupported CDB len\n", ap-&gt;id);</div><div class='add'>+			if (ata_msg_warn(ap))</div><div class='add'>+				ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+					       "unsupported CDB len\n");</div><div class='ctx'> 			rc = -EINVAL;</div><div class='ctx'> 			goto err_out_nosup;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;cdb_len = (unsigned int) rc;</div><div class='ctx'> </div><div class='add'>+		if (ata_id_cdb_intr(dev-&gt;id)) {</div><div class='add'>+			dev-&gt;flags |= ATA_DFLAG_CDB_INTR;</div><div class='add'>+			cdb_intr_string = ", CDB intr";</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* print device info to dmesg */</div><div class='del'>-		if (print_info)</div><div class='del'>-			printk(KERN_INFO "ata%u: dev %u ATAPI, max %s\n",</div><div class='del'>-			       ap-&gt;id, dev-&gt;devno, ata_mode_string(xfer_mask));</div><div class='add'>+		if (ata_msg_drv(ap) &amp;&amp; print_info)</div><div class='add'>+			ata_dev_printk(dev, KERN_INFO, "ATAPI, max %s%s\n",</div><div class='add'>+				       ata_mode_string(xfer_mask),</div><div class='add'>+				       cdb_intr_string);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ap-&gt;host-&gt;max_cmd_len = 0;</div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-		ap-&gt;host-&gt;max_cmd_len = max_t(unsigned int,</div><div class='del'>-					      ap-&gt;host-&gt;max_cmd_len,</div><div class='del'>-					      ap-&gt;device[i].cdb_len);</div><div class='add'>+	ata_set_port_max_cmd_len(ap);</div><div class='ctx'> </div><div class='ctx'> 	/* limit bridge transfers to udma5, 200 sectors */</div><div class='del'>-	if (ata_dev_knobble(ap, dev)) {</div><div class='del'>-		if (print_info)</div><div class='del'>-			printk(KERN_INFO "ata%u(%u): applying bridge limits\n",</div><div class='del'>-			       ap-&gt;id, dev-&gt;devno);</div><div class='add'>+	if (ata_dev_knobble(dev)) {</div><div class='add'>+		if (ata_msg_drv(ap) &amp;&amp; print_info)</div><div class='add'>+			ata_dev_printk(dev, KERN_INFO,</div><div class='add'>+				       "applying bridge limits\n");</div><div class='ctx'> 		dev-&gt;udma_mask &amp;= ATA_UDMA5;</div><div class='ctx'> 		dev-&gt;max_sectors = ATA_MAX_SECTORS;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1332,11 +1501,15 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	if (ap-&gt;ops-&gt;dev_config)</div><div class='ctx'> 		ap-&gt;ops-&gt;dev_config(ap, dev);</div><div class='ctx'> </div><div class='del'>-	DPRINTK("EXIT, drv_stat = 0x%x\n", ata_chk_status(ap));</div><div class='add'>+	if (ata_msg_probe(ap))</div><div class='add'>+		ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n",</div><div class='add'>+			__FUNCTION__, ata_chk_status(ap));</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_nosup:</div><div class='del'>-	DPRINTK("EXIT, err\n");</div><div class='add'>+	if (ata_msg_probe(ap))</div><div class='add'>+		ata_dev_printk(dev, KERN_DEBUG,</div><div class='add'>+			       "%s: EXIT, err\n", __FUNCTION__);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1352,79 +1525,104 @@ err_out_nosup:</div><div class='ctx'>  *	PCI/etc. bus probe sem.</div><div class='ctx'>  *</div><div class='ctx'>  *	RETURNS:</div><div class='del'>- *	Zero on success, non-zero on error.</div><div class='add'>+ *	Zero on success, negative errno otherwise.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int ata_bus_probe(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int classes[ATA_MAX_DEVICES];</div><div class='del'>-	unsigned int i, rc, found = 0;</div><div class='add'>+	int tries[ATA_MAX_DEVICES];</div><div class='add'>+	int i, rc, down_xfermask;</div><div class='add'>+	struct ata_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	ata_port_probe(ap);</div><div class='ctx'> </div><div class='del'>-	/* reset and determine device classes */</div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-		classes[i] = ATA_DEV_UNKNOWN;</div><div class='add'>+		tries[i] = ATA_PROBE_MAX_TRIES;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;ops-&gt;probe_reset) {</div><div class='del'>-		rc = ap-&gt;ops-&gt;probe_reset(ap, classes);</div><div class='del'>-		if (rc) {</div><div class='del'>-			printk("ata%u: reset failed (errno=%d)\n", ap-&gt;id, rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		ap-&gt;ops-&gt;phy_reset(ap);</div><div class='add'>+ retry:</div><div class='add'>+	down_xfermask = 0;</div><div class='ctx'> </div><div class='del'>-		if (!(ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED))</div><div class='del'>-			for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-				classes[i] = ap-&gt;device[i].class;</div><div class='add'>+	/* reset and determine device classes */</div><div class='add'>+	ap-&gt;ops-&gt;phy_reset(ap);</div><div class='ctx'> </div><div class='del'>-		ata_port_probe(ap);</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+</div><div class='add'>+		if (!(ap-&gt;flags &amp; ATA_FLAG_DISABLED) &amp;&amp;</div><div class='add'>+		    dev-&gt;class != ATA_DEV_UNKNOWN)</div><div class='add'>+			classes[dev-&gt;devno] = dev-&gt;class;</div><div class='add'>+		else</div><div class='add'>+			classes[dev-&gt;devno] = ATA_DEV_NONE;</div><div class='add'>+</div><div class='add'>+		dev-&gt;class = ATA_DEV_UNKNOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ata_port_probe(ap);</div><div class='add'>+</div><div class='add'>+	/* after the reset the device state is PIO 0 and the controller</div><div class='add'>+	   state is undefined. Record the mode */</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-		if (classes[i] == ATA_DEV_UNKNOWN)</div><div class='del'>-			classes[i] = ATA_DEV_NONE;</div><div class='add'>+		ap-&gt;device[i].pio_mode = XFER_PIO_0;</div><div class='ctx'> </div><div class='ctx'> 	/* read IDENTIFY page and configure devices */</div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='del'>-		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='ctx'> </div><div class='del'>-		dev-&gt;class = classes[i];</div><div class='add'>+		if (tries[i])</div><div class='add'>+			dev-&gt;class = classes[i];</div><div class='ctx'> </div><div class='del'>-		if (!ata_dev_present(dev))</div><div class='add'>+		if (!ata_dev_enabled(dev))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		WARN_ON(dev-&gt;id != NULL);</div><div class='del'>-		if (ata_dev_read_id(ap, dev, &amp;dev-&gt;class, 1, &amp;dev-&gt;id)) {</div><div class='del'>-			dev-&gt;class = ATA_DEV_NONE;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		rc = ata_dev_read_id(dev, &amp;dev-&gt;class, 1, dev-&gt;id);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto fail;</div><div class='ctx'> </div><div class='del'>-		if (ata_dev_configure(ap, dev, 1)) {</div><div class='del'>-			ata_dev_disable(ap, dev);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='add'>+		rc = ata_dev_configure(dev, 1);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		found = 1;</div><div class='add'>+	/* configure transfer mode */</div><div class='add'>+	rc = ata_set_mode(ap, &amp;dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		down_xfermask = 1;</div><div class='add'>+		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!found)</div><div class='del'>-		goto err_out_disable;</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		if (ata_dev_enabled(&amp;ap-&gt;device[i]))</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;ops-&gt;set_mode)</div><div class='del'>-		ap-&gt;ops-&gt;set_mode(ap);</div><div class='del'>-	else</div><div class='del'>-		ata_set_mode(ap);</div><div class='add'>+	/* no device present, disable port */</div><div class='add'>+	ata_port_disable(ap);</div><div class='add'>+	ap-&gt;ops-&gt;port_disable(ap);</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED)</div><div class='del'>-		goto err_out_disable;</div><div class='add'>+ fail:</div><div class='add'>+	switch (rc) {</div><div class='add'>+	case -EINVAL:</div><div class='add'>+	case -ENODEV:</div><div class='add'>+		tries[dev-&gt;devno] = 0;</div><div class='add'>+		break;</div><div class='add'>+	case -EIO:</div><div class='add'>+		sata_down_spd_limit(ap);</div><div class='add'>+		/* fall through */</div><div class='add'>+	default:</div><div class='add'>+		tries[dev-&gt;devno]--;</div><div class='add'>+		if (down_xfermask &amp;&amp;</div><div class='add'>+		    ata_down_xfermask_limit(dev, tries[dev-&gt;devno] == 1))</div><div class='add'>+			tries[dev-&gt;devno] = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	if (!tries[dev-&gt;devno]) {</div><div class='add'>+		ata_down_xfermask_limit(dev, 1);</div><div class='add'>+		ata_dev_disable(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-err_out_disable:</div><div class='del'>-	ap-&gt;ops-&gt;port_disable(ap);</div><div class='del'>-	return -1;</div><div class='add'>+	goto retry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1440,7 +1638,7 @@ err_out_disable:</div><div class='ctx'> </div><div class='ctx'> void ata_port_probe(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	ap-&gt;flags &amp;= ~ATA_FLAG_PORT_DISABLED;</div><div class='add'>+	ap-&gt;flags &amp;= ~ATA_FLAG_DISABLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1454,27 +1652,21 @@ void ata_port_probe(struct ata_port *ap)</div><div class='ctx'>  */</div><div class='ctx'> static void sata_print_link_status(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	u32 sstatus, tmp;</div><div class='del'>-	const char *speed;</div><div class='add'>+	u32 sstatus, scontrol, tmp;</div><div class='ctx'> </div><div class='del'>-	if (!ap-&gt;ops-&gt;scr_read)</div><div class='add'>+	if (sata_scr_read(ap, SCR_STATUS, &amp;sstatus))</div><div class='ctx'> 		return;</div><div class='add'>+	sata_scr_read(ap, SCR_CONTROL, &amp;scontrol);</div><div class='ctx'> </div><div class='del'>-	sstatus = scr_read(ap, SCR_STATUS);</div><div class='del'>-</div><div class='del'>-	if (sata_dev_present(ap)) {</div><div class='add'>+	if (ata_port_online(ap)) {</div><div class='ctx'> 		tmp = (sstatus &gt;&gt; 4) &amp; 0xf;</div><div class='del'>-		if (tmp &amp; (1 &lt;&lt; 0))</div><div class='del'>-			speed = "1.5";</div><div class='del'>-		else if (tmp &amp; (1 &lt;&lt; 1))</div><div class='del'>-			speed = "3.0";</div><div class='del'>-		else</div><div class='del'>-			speed = "&lt;unknown&gt;";</div><div class='del'>-		printk(KERN_INFO "ata%u: SATA link up %s Gbps (SStatus %X)\n",</div><div class='del'>-		       ap-&gt;id, speed, sstatus);</div><div class='add'>+		ata_port_printk(ap, KERN_INFO,</div><div class='add'>+				"SATA link up %s (SStatus %X SControl %X)\n",</div><div class='add'>+				sata_spd_string(tmp), sstatus, scontrol);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n",</div><div class='del'>-		       ap-&gt;id, sstatus);</div><div class='add'>+		ata_port_printk(ap, KERN_INFO,</div><div class='add'>+				"SATA link down (SStatus %X SControl %X)\n",</div><div class='add'>+				sstatus, scontrol);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1497,17 +1689,18 @@ void __sata_phy_reset(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;flags &amp; ATA_FLAG_SATA_RESET) {</div><div class='ctx'> 		/* issue phy wake/reset */</div><div class='del'>-		scr_write_flush(ap, SCR_CONTROL, 0x301);</div><div class='add'>+		sata_scr_write_flush(ap, SCR_CONTROL, 0x301);</div><div class='ctx'> 		/* Couldn't find anything in SATA I/II specs, but</div><div class='ctx'> 		 * AHCI-1.1 10.4.2 says at least 1 ms. */</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 	}</div><div class='del'>-	scr_write_flush(ap, SCR_CONTROL, 0x300); /* phy wake/clear reset */</div><div class='add'>+	/* phy wake/clear reset */</div><div class='add'>+	sata_scr_write_flush(ap, SCR_CONTROL, 0x300);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for phy to become ready, if necessary */</div><div class='ctx'> 	do {</div><div class='ctx'> 		msleep(200);</div><div class='del'>-		sstatus = scr_read(ap, SCR_STATUS);</div><div class='add'>+		sata_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='ctx'> 		if ((sstatus &amp; 0xf) != 1)</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (time_before(jiffies, timeout));</div><div class='hunk'>@@ -1516,12 +1709,12 @@ void __sata_phy_reset(struct ata_port *ap)</div><div class='ctx'> 	sata_print_link_status(ap);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: phy layer with polling, timeouts, etc. */</div><div class='del'>-	if (sata_dev_present(ap))</div><div class='add'>+	if (!ata_port_offline(ap))</div><div class='ctx'> 		ata_port_probe(ap);</div><div class='ctx'> 	else</div><div class='ctx'> 		ata_port_disable(ap);</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED)</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_DISABLED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {</div><div class='hunk'>@@ -1546,24 +1739,24 @@ void __sata_phy_reset(struct ata_port *ap)</div><div class='ctx'> void sata_phy_reset(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	__sata_phy_reset(ap);</div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED)</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_DISABLED)</div><div class='ctx'> 		return;</div><div class='ctx'> 	ata_bus_reset(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_pair		-	return other device on cable</div><div class='del'>- *	@ap: port</div><div class='ctx'>  *	@adev: device</div><div class='ctx'>  *</div><div class='ctx'>  *	Obtain the other device on the same cable, or if none is</div><div class='ctx'>  *	present NULL is returned</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct ata_device *ata_dev_pair(struct ata_port *ap, struct ata_device *adev)</div><div class='add'>+struct ata_device *ata_dev_pair(struct ata_device *adev)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = adev-&gt;ap;</div><div class='ctx'> 	struct ata_device *pair = &amp;ap-&gt;device[1 - adev-&gt;devno];</div><div class='del'>-	if (!ata_dev_present(pair))</div><div class='add'>+	if (!ata_dev_enabled(pair))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	return pair;</div><div class='ctx'> }</div><div class='hunk'>@@ -1585,7 +1778,122 @@ void ata_port_disable(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	ap-&gt;device[0].class = ATA_DEV_NONE;</div><div class='ctx'> 	ap-&gt;device[1].class = ATA_DEV_NONE;</div><div class='del'>-	ap-&gt;flags |= ATA_FLAG_PORT_DISABLED;</div><div class='add'>+	ap-&gt;flags |= ATA_FLAG_DISABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	sata_down_spd_limit - adjust SATA spd limit downward</div><div class='add'>+ *	@ap: Port to adjust SATA spd limit for</div><div class='add'>+ *</div><div class='add'>+ *	Adjust SATA spd limit of @ap downward.  Note that this</div><div class='add'>+ *	function only adjusts the limit.  The change must be applied</div><div class='add'>+ *	using sata_set_spd().</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, negative errno on failure</div><div class='add'>+ */</div><div class='add'>+int sata_down_spd_limit(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u32 sstatus, spd, mask;</div><div class='add'>+	int rc, highbit;</div><div class='add'>+</div><div class='add'>+	rc = sata_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	mask = ap-&gt;sata_spd_limit;</div><div class='add'>+	if (mask &lt;= 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	highbit = fls(mask) - 1;</div><div class='add'>+	mask &amp;= ~(1 &lt;&lt; highbit);</div><div class='add'>+</div><div class='add'>+	spd = (sstatus &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+	if (spd &lt;= 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	spd--;</div><div class='add'>+	mask &amp;= (1 &lt;&lt; spd) - 1;</div><div class='add'>+	if (!mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ap-&gt;sata_spd_limit = mask;</div><div class='add'>+</div><div class='add'>+	ata_port_printk(ap, KERN_WARNING, "limiting SATA link speed to %s\n",</div><div class='add'>+			sata_spd_string(fls(mask)));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sata_set_spd_needed(struct ata_port *ap, u32 *scontrol)</div><div class='add'>+{</div><div class='add'>+	u32 spd, limit;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;sata_spd_limit == UINT_MAX)</div><div class='add'>+		limit = 0;</div><div class='add'>+	else</div><div class='add'>+		limit = fls(ap-&gt;sata_spd_limit);</div><div class='add'>+</div><div class='add'>+	spd = (*scontrol &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+	*scontrol = (*scontrol &amp; ~0xf0) | ((limit &amp; 0xf) &lt;&lt; 4);</div><div class='add'>+</div><div class='add'>+	return spd != limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	sata_set_spd_needed - is SATA spd configuration needed</div><div class='add'>+ *	@ap: Port in question</div><div class='add'>+ *</div><div class='add'>+ *	Test whether the spd limit in SControl matches</div><div class='add'>+ *	@ap-&gt;sata_spd_limit.  This function is used to determine</div><div class='add'>+ *	whether hardreset is necessary to apply SATA spd</div><div class='add'>+ *	configuration.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if SATA spd configuration is needed, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+int sata_set_spd_needed(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u32 scontrol;</div><div class='add'>+</div><div class='add'>+	if (sata_scr_read(ap, SCR_CONTROL, &amp;scontrol))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return __sata_set_spd_needed(ap, &amp;scontrol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	sata_set_spd - set SATA spd according to spd limit</div><div class='add'>+ *	@ap: Port to set SATA spd for</div><div class='add'>+ *</div><div class='add'>+ *	Set SATA spd of @ap according to sata_spd_limit.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 if spd doesn't need to be changed, 1 if spd has been</div><div class='add'>+ *	changed.  Negative errno if SCR registers are inaccessible.</div><div class='add'>+ */</div><div class='add'>+int sata_set_spd(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u32 scontrol;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if ((rc = sata_scr_read(ap, SCR_CONTROL, &amp;scontrol)))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (!__sata_set_spd_needed(ap, &amp;scontrol))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1736,151 +2044,197 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ata_dev_set_mode(struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+/**</div><div class='add'>+ *	ata_down_xfermask_limit - adjust dev xfer masks downward</div><div class='add'>+ *	@dev: Device to adjust xfer masks</div><div class='add'>+ *	@force_pio0: Force PIO0</div><div class='add'>+ *</div><div class='add'>+ *	Adjust xfer masks of @dev downward.  Note that this function</div><div class='add'>+ *	does not apply the change.  Invoking ata_set_mode() afterwards</div><div class='add'>+ *	will apply the limit.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, negative errno on failure</div><div class='add'>+ */</div><div class='add'>+int ata_down_xfermask_limit(struct ata_device *dev, int force_pio0)</div><div class='add'>+{</div><div class='add'>+	unsigned long xfer_mask;</div><div class='add'>+	int highbit;</div><div class='add'>+</div><div class='add'>+	xfer_mask = ata_pack_xfermask(dev-&gt;pio_mask, dev-&gt;mwdma_mask,</div><div class='add'>+				      dev-&gt;udma_mask);</div><div class='add'>+</div><div class='add'>+	if (!xfer_mask)</div><div class='add'>+		goto fail;</div><div class='add'>+	/* don't gear down to MWDMA from UDMA, go directly to PIO */</div><div class='add'>+	if (xfer_mask &amp; ATA_MASK_UDMA)</div><div class='add'>+		xfer_mask &amp;= ~ATA_MASK_MWDMA;</div><div class='add'>+</div><div class='add'>+	highbit = fls(xfer_mask) - 1;</div><div class='add'>+	xfer_mask &amp;= ~(1 &lt;&lt; highbit);</div><div class='add'>+	if (force_pio0)</div><div class='add'>+		xfer_mask &amp;= 1 &lt;&lt; ATA_SHIFT_PIO;</div><div class='add'>+	if (!xfer_mask)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ata_unpack_xfermask(xfer_mask, &amp;dev-&gt;pio_mask, &amp;dev-&gt;mwdma_mask,</div><div class='add'>+			    &amp;dev-&gt;udma_mask);</div><div class='add'>+</div><div class='add'>+	ata_dev_printk(dev, KERN_WARNING, "limiting speed to %s\n",</div><div class='add'>+		       ata_mode_string(xfer_mask));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_dev_set_mode(struct ata_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int err_mask;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;flags &amp;= ~ATA_DFLAG_PIO;</div><div class='ctx'> 	if (dev-&gt;xfer_shift == ATA_SHIFT_PIO)</div><div class='ctx'> 		dev-&gt;flags |= ATA_DFLAG_PIO;</div><div class='ctx'> </div><div class='del'>-	err_mask = ata_dev_set_xfermode(ap, dev);</div><div class='add'>+	err_mask = ata_dev_set_xfermode(dev);</div><div class='ctx'> 	if (err_mask) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ata%u: failed to set xfermode (err_mask=0x%x)\n",</div><div class='del'>-		       ap-&gt;id, err_mask);</div><div class='add'>+		ata_dev_printk(dev, KERN_ERR, "failed to set xfermode "</div><div class='add'>+			       "(err_mask=0x%x)\n", err_mask);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = ata_dev_revalidate(ap, dev, 0);</div><div class='del'>-	if (rc) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ata%u: failed to revalidate after set xfermode\n",</div><div class='del'>-		       ap-&gt;id);</div><div class='add'>+	rc = ata_dev_revalidate(dev, 0);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("xfer_shift=%u, xfer_mode=0x%x\n",</div><div class='ctx'> 		dev-&gt;xfer_shift, (int)dev-&gt;xfer_mode);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "ata%u: dev %u configured for %s\n",</div><div class='del'>-	       ap-&gt;id, dev-&gt;devno,</div><div class='del'>-	       ata_mode_string(ata_xfer_mode2mask(dev-&gt;xfer_mode)));</div><div class='add'>+	ata_dev_printk(dev, KERN_INFO, "configured for %s\n",</div><div class='add'>+		       ata_mode_string(ata_xfer_mode2mask(dev-&gt;xfer_mode)));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ata_host_set_pio(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='del'>-		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='del'>-</div><div class='del'>-		if (!ata_dev_present(dev))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!dev-&gt;pio_mode) {</div><div class='del'>-			printk(KERN_WARNING "ata%u: no PIO support for device %d.\n", ap-&gt;id, i);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dev-&gt;xfer_mode = dev-&gt;pio_mode;</div><div class='del'>-		dev-&gt;xfer_shift = ATA_SHIFT_PIO;</div><div class='del'>-		if (ap-&gt;ops-&gt;set_piomode)</div><div class='del'>-			ap-&gt;ops-&gt;set_piomode(ap, dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ata_host_set_dma(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='del'>-		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='del'>-</div><div class='del'>-		if (!ata_dev_present(dev) || !dev-&gt;dma_mode)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		dev-&gt;xfer_mode = dev-&gt;dma_mode;</div><div class='del'>-		dev-&gt;xfer_shift = ata_xfer_mode2shift(dev-&gt;dma_mode);</div><div class='del'>-		if (ap-&gt;ops-&gt;set_dmamode)</div><div class='del'>-			ap-&gt;ops-&gt;set_dmamode(ap, dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_set_mode - Program timings and issue SET FEATURES - XFER</div><div class='ctx'>  *	@ap: port on which timings will be programmed</div><div class='add'>+ *	@r_failed_dev: out paramter for failed device</div><div class='ctx'>  *</div><div class='del'>- *	Set ATA device disk transfer mode (PIO3, UDMA6, etc.).</div><div class='add'>+ *	Set ATA device disk transfer mode (PIO3, UDMA6, etc.).  If</div><div class='add'>+ *	ata_set_mode() fails, pointer to the failing device is</div><div class='add'>+ *	returned in @r_failed_dev.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	PCI/etc. bus probe sem.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, negative errno otherwise</div><div class='ctx'>  */</div><div class='del'>-static void ata_set_mode(struct ata_port *ap)</div><div class='add'>+int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev)</div><div class='ctx'> {</div><div class='del'>-	int i, rc, used_dma = 0;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	int i, rc = 0, used_dma = 0, found = 0;</div><div class='add'>+</div><div class='add'>+	/* has private set_mode? */</div><div class='add'>+	if (ap-&gt;ops-&gt;set_mode) {</div><div class='add'>+		/* FIXME: make -&gt;set_mode handle no device case and</div><div class='add'>+		 * return error code and failing device on failure.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+			if (ata_dev_ready(&amp;ap-&gt;device[i])) {</div><div class='add'>+				ap-&gt;ops-&gt;set_mode(ap);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 1: calculate xfer_mask */</div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='del'>-		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='ctx'> 		unsigned int pio_mask, dma_mask;</div><div class='ctx'> </div><div class='del'>-		if (!ata_dev_present(dev))</div><div class='del'>-			continue;</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='ctx'> </div><div class='del'>-		ata_dev_xfermask(ap, dev);</div><div class='add'>+		if (!ata_dev_enabled(dev))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		/* TODO: let LLDD filter dev-&gt;*_mask here */</div><div class='add'>+		ata_dev_xfermask(dev);</div><div class='ctx'> </div><div class='ctx'> 		pio_mask = ata_pack_xfermask(dev-&gt;pio_mask, 0, 0);</div><div class='ctx'> 		dma_mask = ata_pack_xfermask(0, dev-&gt;mwdma_mask, dev-&gt;udma_mask);</div><div class='ctx'> 		dev-&gt;pio_mode = ata_xfer_mask2mode(pio_mask);</div><div class='ctx'> 		dev-&gt;dma_mode = ata_xfer_mask2mode(dma_mask);</div><div class='ctx'> </div><div class='add'>+		found = 1;</div><div class='ctx'> 		if (dev-&gt;dma_mode)</div><div class='ctx'> 			used_dma = 1;</div><div class='ctx'> 	}</div><div class='add'>+	if (!found)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* step 2: always set host PIO timings */</div><div class='del'>-	rc = ata_host_set_pio(ap);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_out;</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+		if (!ata_dev_enabled(dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!dev-&gt;pio_mode) {</div><div class='add'>+			ata_dev_printk(dev, KERN_WARNING, "no PIO support\n");</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;xfer_mode = dev-&gt;pio_mode;</div><div class='add'>+		dev-&gt;xfer_shift = ATA_SHIFT_PIO;</div><div class='add'>+		if (ap-&gt;ops-&gt;set_piomode)</div><div class='add'>+			ap-&gt;ops-&gt;set_piomode(ap, dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 3: set host DMA timings */</div><div class='del'>-	ata_host_set_dma(ap);</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+</div><div class='add'>+		if (!ata_dev_enabled(dev) || !dev-&gt;dma_mode)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev-&gt;xfer_mode = dev-&gt;dma_mode;</div><div class='add'>+		dev-&gt;xfer_shift = ata_xfer_mode2shift(dev-&gt;dma_mode);</div><div class='add'>+		if (ap-&gt;ops-&gt;set_dmamode)</div><div class='add'>+			ap-&gt;ops-&gt;set_dmamode(ap, dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* step 4: update devices' xfer mode */</div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='del'>-		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='ctx'> </div><div class='del'>-		if (!ata_dev_present(dev))</div><div class='add'>+		/* don't udpate suspended devices' xfer mode */</div><div class='add'>+		if (!ata_dev_ready(dev))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (ata_dev_set_mode(ap, dev))</div><div class='del'>-			goto err_out;</div><div class='add'>+		rc = ata_dev_set_mode(dev);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Record simplex status. If we selected DMA then the other</div><div class='del'>-	 *	host channels are not permitted to do so.</div><div class='add'>+	/* Record simplex status. If we selected DMA then the other</div><div class='add'>+	 * host channels are not permitted to do so.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	if (used_dma &amp;&amp; (ap-&gt;host_set-&gt;flags &amp; ATA_HOST_SIMPLEX))</div><div class='ctx'> 		ap-&gt;host_set-&gt;simplex_claimed = 1;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 *	Chip specific finalisation</div><div class='del'>-	 */</div><div class='add'>+	/* step5: chip specific finalisation */</div><div class='ctx'> 	if (ap-&gt;ops-&gt;post_set_mode)</div><div class='ctx'> 		ap-&gt;ops-&gt;post_set_mode(ap);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	ata_port_disable(ap);</div><div class='add'>+ out:</div><div class='add'>+	if (rc)</div><div class='add'>+		*r_failed_dev = dev;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1930,8 +2284,8 @@ unsigned int ata_busy_sleep (struct ata_port *ap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; ATA_BUSY)</div><div class='del'>-		printk(KERN_WARNING "ata%u is slow to respond, "</div><div class='del'>-		       "please be patient\n", ap-&gt;id);</div><div class='add'>+		ata_port_printk(ap, KERN_WARNING,</div><div class='add'>+				"port is slow to respond, please be patient\n");</div><div class='ctx'> </div><div class='ctx'> 	timeout = timer_start + tmout;</div><div class='ctx'> 	while ((status &amp; ATA_BUSY) &amp;&amp; (time_before(jiffies, timeout))) {</div><div class='hunk'>@@ -1940,8 +2294,8 @@ unsigned int ata_busy_sleep (struct ata_port *ap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; ATA_BUSY) {</div><div class='del'>-		printk(KERN_ERR "ata%u failed to respond (%lu secs)\n",</div><div class='del'>-		       ap-&gt;id, tmout / HZ);</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "port failed to respond "</div><div class='add'>+				"(%lu secs)\n", tmout / HZ);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2033,8 +2387,10 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,</div><div class='ctx'> 	 * the bus shows 0xFF because the odd clown forgets the D7</div><div class='ctx'> 	 * pulldown resistor.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ata_check_status(ap) == 0xFF)</div><div class='add'>+	if (ata_check_status(ap) == 0xFF) {</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "SRST failed (status 0xFF)\n");</div><div class='ctx'> 		return AC_ERR_OTHER;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ata_bus_post_reset(ap, devmask);</div><div class='ctx'> </div><div class='hunk'>@@ -2058,7 +2414,7 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,</div><div class='ctx'>  *	Obtains host_set lock.</div><div class='ctx'>  *</div><div class='ctx'>  *	SIDE EFFECTS:</div><div class='del'>- *	Sets ATA_FLAG_PORT_DISABLED if bus reset fails.</div><div class='add'>+ *	Sets ATA_FLAG_DISABLED if bus reset fails.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void ata_bus_reset(struct ata_port *ap)</div><div class='hunk'>@@ -2126,60 +2482,191 @@ void ata_bus_reset(struct ata_port *ap)</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	printk(KERN_ERR "ata%u: disabling port\n", ap-&gt;id);</div><div class='add'>+	ata_port_printk(ap, KERN_ERR, "disabling port\n");</div><div class='ctx'> 	ap-&gt;ops-&gt;port_disable(ap);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("EXIT\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sata_phy_resume(struct ata_port *ap)</div><div class='add'>+/**</div><div class='add'>+ *	sata_phy_debounce - debounce SATA phy status</div><div class='add'>+ *	@ap: ATA port to debounce SATA phy status for</div><div class='add'>+ *	@params: timing parameters { interval, duratinon, timeout } in msec</div><div class='add'>+ *</div><div class='add'>+ *	Make sure SStatus of @ap reaches stable state, determined by</div><div class='add'>+ *	holding the same value where DET is not 1 for @duration polled</div><div class='add'>+ *	every @interval, before @timeout.  Timeout constraints the</div><div class='add'>+ *	beginning of the stable state.  Because, after hot unplugging,</div><div class='add'>+ *	DET gets stuck at 1 on some controllers, this functions waits</div><div class='add'>+ *	until timeout then returns 0 if DET is stable at 1.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+int sata_phy_debounce(struct ata_port *ap, const unsigned long *params)</div><div class='ctx'> {</div><div class='del'>-	unsigned long timeout = jiffies + (HZ * 5);</div><div class='del'>-	u32 sstatus;</div><div class='add'>+	unsigned long interval_msec = params[0];</div><div class='add'>+	unsigned long duration = params[1] * HZ / 1000;</div><div class='add'>+	unsigned long timeout = jiffies + params[2] * HZ / 1000;</div><div class='add'>+	unsigned long last_jiffies;</div><div class='add'>+	u32 last, cur;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	scr_write_flush(ap, SCR_CONTROL, 0x300);</div><div class='add'>+	if ((rc = sata_scr_read(ap, SCR_STATUS, &amp;cur)))</div><div class='add'>+		return rc;</div><div class='add'>+	cur &amp;= 0xf;</div><div class='ctx'> </div><div class='del'>-	/* Wait for phy to become ready, if necessary. */</div><div class='del'>-	do {</div><div class='del'>-		msleep(200);</div><div class='del'>-		sstatus = scr_read(ap, SCR_STATUS);</div><div class='del'>-		if ((sstatus &amp; 0xf) != 1)</div><div class='del'>-			return 0;</div><div class='del'>-	} while (time_before(jiffies, timeout));</div><div class='add'>+	last = cur;</div><div class='add'>+	last_jiffies = jiffies;</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	while (1) {</div><div class='add'>+		msleep(interval_msec);</div><div class='add'>+		if ((rc = sata_scr_read(ap, SCR_STATUS, &amp;cur)))</div><div class='add'>+			return rc;</div><div class='add'>+		cur &amp;= 0xf;</div><div class='add'>+</div><div class='add'>+		/* DET stable? */</div><div class='add'>+		if (cur == last) {</div><div class='add'>+			if (cur == 1 &amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+				continue;</div><div class='add'>+			if (time_after(jiffies, last_jiffies + duration))</div><div class='add'>+				return 0;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* unstable, start over */</div><div class='add'>+		last = cur;</div><div class='add'>+		last_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+		/* check timeout */</div><div class='add'>+		if (time_after(jiffies, timeout))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_std_probeinit - initialize probing</div><div class='del'>- *	@ap: port to be probed</div><div class='add'>+ *	sata_phy_resume - resume SATA phy</div><div class='add'>+ *	@ap: ATA port to resume SATA phy for</div><div class='add'>+ *	@params: timing parameters { interval, duratinon, timeout } in msec</div><div class='ctx'>  *</div><div class='del'>- *	@ap is about to be probed.  Initialize it.  This function is</div><div class='del'>- *	to be used as standard callback for ata_drive_probe_reset().</div><div class='add'>+ *	Resume SATA phy of @ap and debounce it.</div><div class='ctx'>  *</div><div class='del'>- *	NOTE!!! Do not use this function as probeinit if a low level</div><div class='del'>- *	driver implements only hardreset.  Just pass NULL as probeinit</div><div class='del'>- *	in that case.  Using this function is probably okay but doing</div><div class='del'>- *	so makes reset sequence different from the original</div><div class='del'>- *	-&gt;phy_reset implementation and Jeff nervous.  :-P</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='ctx'>  */</div><div class='del'>-void ata_std_probeinit(struct ata_port *ap)</div><div class='add'>+int sata_phy_resume(struct ata_port *ap, const unsigned long *params)</div><div class='ctx'> {</div><div class='del'>-	if ((ap-&gt;flags &amp; ATA_FLAG_SATA) &amp;&amp; ap-&gt;ops-&gt;scr_read) {</div><div class='del'>-		sata_phy_resume(ap);</div><div class='del'>-		if (sata_dev_present(ap))</div><div class='del'>-			ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);</div><div class='add'>+	u32 scontrol;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if ((rc = sata_scr_read(ap, SCR_CONTROL, &amp;scontrol)))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	scontrol = (scontrol &amp; 0x0f0) | 0x300;</div><div class='add'>+</div><div class='add'>+	if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Some PHYs react badly if SStatus is pounded immediately</div><div class='add'>+	 * after resuming.  Delay 200ms before debouncing.</div><div class='add'>+	 */</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	return sata_phy_debounce(ap, params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ata_wait_spinup(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	unsigned long end, secs;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* first, debounce phy if SATA */</div><div class='add'>+	if (ap-&gt;cbl == ATA_CBL_SATA) {</div><div class='add'>+		rc = sata_phy_debounce(ap, sata_deb_timing_hotplug);</div><div class='add'>+</div><div class='add'>+		/* if debounced successfully and offline, no need to wait */</div><div class='add'>+		if ((rc == 0 || rc == -EOPNOTSUPP) &amp;&amp; ata_port_offline(ap))</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* okay, let's give the drive time to spin up */</div><div class='add'>+	end = ehc-&gt;i.hotplug_timestamp + ATA_SPINUP_WAIT * HZ / 1000;</div><div class='add'>+	secs = ((end - jiffies) + HZ - 1) / HZ;</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, end))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (secs &gt; 5)</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "waiting for device to spin up "</div><div class='add'>+				"(%lu secs)\n", secs);</div><div class='add'>+</div><div class='add'>+	schedule_timeout_uninterruptible(end - jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_std_prereset - prepare for reset</div><div class='add'>+ *	@ap: ATA port to be reset</div><div class='add'>+ *</div><div class='add'>+ *	@ap is about to be reset.  Initialize it.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int ata_std_prereset(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	const unsigned long *timing = sata_ehc_deb_timing(ehc);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* handle link resume &amp; hotplug spinup */</div><div class='add'>+	if ((ehc-&gt;i.flags &amp; ATA_EHI_RESUME_LINK) &amp;&amp;</div><div class='add'>+	    (ap-&gt;flags &amp; ATA_FLAG_HRST_TO_RESUME))</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_HARDRESET;</div><div class='add'>+</div><div class='add'>+	if ((ehc-&gt;i.flags &amp; ATA_EHI_HOTPLUGGED) &amp;&amp;</div><div class='add'>+	    (ap-&gt;flags &amp; ATA_FLAG_SKIP_D2H_BSY))</div><div class='add'>+		ata_wait_spinup(ap);</div><div class='add'>+</div><div class='add'>+	/* if we're about to do hardreset, nothing more to do */</div><div class='add'>+	if (ehc-&gt;i.action &amp; ATA_EH_HARDRESET)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* if SATA, resume phy */</div><div class='add'>+	if (ap-&gt;cbl == ATA_CBL_SATA) {</div><div class='add'>+		rc = sata_phy_resume(ap, timing);</div><div class='add'>+		if (rc &amp;&amp; rc != -EOPNOTSUPP) {</div><div class='add'>+			/* phy resume failed */</div><div class='add'>+			ata_port_printk(ap, KERN_WARNING, "failed to resume "</div><div class='add'>+					"link for reset (errno=%d)\n", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for !BSY if the controller can wait for the first D2H</div><div class='add'>+	 * Reg FIS and we don't know that no device is attached.</div><div class='add'>+	 */</div><div class='add'>+	if (!(ap-&gt;flags &amp; ATA_FLAG_SKIP_D2H_BSY) &amp;&amp; !ata_port_offline(ap))</div><div class='add'>+		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_std_softreset - reset host port via ATA SRST</div><div class='ctx'>  *	@ap: port to reset</div><div class='del'>- *	@verbose: fail verbosely</div><div class='ctx'>  *	@classes: resulting classes of attached devices</div><div class='ctx'>  *</div><div class='del'>- *	Reset host port using ATA SRST.  This function is to be used</div><div class='del'>- *	as standard callback for ata_drive_*_reset() functions.</div><div class='add'>+ *	Reset host port using ATA SRST.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	Kernel thread context (may sleep)</div><div class='hunk'>@@ -2187,7 +2674,7 @@ void ata_std_probeinit(struct ata_port *ap)</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	0 on success, -errno otherwise.</div><div class='ctx'>  */</div><div class='del'>-int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)</div><div class='add'>+int ata_std_softreset(struct ata_port *ap, unsigned int *classes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int slave_possible = ap-&gt;flags &amp; ATA_FLAG_SLAVE_POSS;</div><div class='ctx'> 	unsigned int devmask = 0, err_mask;</div><div class='hunk'>@@ -2195,7 +2682,7 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;ops-&gt;scr_read &amp;&amp; !sata_dev_present(ap)) {</div><div class='add'>+	if (ata_port_offline(ap)) {</div><div class='ctx'> 		classes[0] = ATA_DEV_NONE;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2213,11 +2700,7 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)</div><div class='ctx'> 	DPRINTK("about to softreset, devmask=%x\n", devmask);</div><div class='ctx'> 	err_mask = ata_bus_softreset(ap, devmask);</div><div class='ctx'> 	if (err_mask) {</div><div class='del'>-		if (verbose)</div><div class='del'>-			printk(KERN_ERR "ata%u: SRST failed (err_mask=0x%x)\n",</div><div class='del'>-			       ap-&gt;id, err_mask);</div><div class='del'>-		else</div><div class='del'>-			DPRINTK("EXIT, softreset failed (err_mask=0x%x)\n",</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "SRST failed (err_mask=0x%x)\n",</div><div class='ctx'> 				err_mask);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2235,12 +2718,9 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)</div><div class='ctx'> /**</div><div class='ctx'>  *	sata_std_hardreset - reset host port via SATA phy reset</div><div class='ctx'>  *	@ap: port to reset</div><div class='del'>- *	@verbose: fail verbosely</div><div class='ctx'>  *	@class: resulting class of attached device</div><div class='ctx'>  *</div><div class='ctx'>  *	SATA phy-reset host port using DET bits of SControl register.</div><div class='del'>- *	This function is to be used as standard callback for</div><div class='del'>- *	ata_drive_*_reset().</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	Kernel thread context (may sleep)</div><div class='hunk'>@@ -2248,35 +2728,59 @@ int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	0 on success, -errno otherwise.</div><div class='ctx'>  */</div><div class='del'>-int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='add'>+int sata_std_hardreset(struct ata_port *ap, unsigned int *class)</div><div class='ctx'> {</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	const unsigned long *timing = sata_ehc_deb_timing(ehc);</div><div class='add'>+	u32 scontrol;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	/* Issue phy wake/reset */</div><div class='del'>-	scr_write_flush(ap, SCR_CONTROL, 0x301);</div><div class='add'>+	if (sata_set_spd_needed(ap)) {</div><div class='add'>+		/* SATA spec says nothing about how to reconfigure</div><div class='add'>+		 * spd.  To be on the safe side, turn off phy during</div><div class='add'>+		 * reconfiguration.  This works for at least ICH7 AHCI</div><div class='add'>+		 * and Sil3124.</div><div class='add'>+		 */</div><div class='add'>+		if ((rc = sata_scr_read(ap, SCR_CONTROL, &amp;scontrol)))</div><div class='add'>+			return rc;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Couldn't find anything in SATA I/II specs, but AHCI-1.1</div><div class='add'>+		scontrol = (scontrol &amp; 0x0f0) | 0x302;</div><div class='add'>+</div><div class='add'>+		if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		sata_set_spd(ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* issue phy wake/reset */</div><div class='add'>+	if ((rc = sata_scr_read(ap, SCR_CONTROL, &amp;scontrol)))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	scontrol = (scontrol &amp; 0x0f0) | 0x301;</div><div class='add'>+</div><div class='add'>+	if ((rc = sata_scr_write_flush(ap, SCR_CONTROL, scontrol)))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Couldn't find anything in SATA I/II specs, but AHCI-1.1</div><div class='ctx'> 	 * 10.4.2 says at least 1 ms.</div><div class='ctx'> 	 */</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='del'>-	/* Bring phy back */</div><div class='del'>-	sata_phy_resume(ap);</div><div class='add'>+	/* bring phy back */</div><div class='add'>+	sata_phy_resume(ap, timing);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: phy layer with polling, timeouts, etc. */</div><div class='del'>-	if (!sata_dev_present(ap)) {</div><div class='add'>+	if (ata_port_offline(ap)) {</div><div class='ctx'> 		*class = ATA_DEV_NONE;</div><div class='ctx'> 		DPRINTK("EXIT, link offline\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {</div><div class='del'>-		if (verbose)</div><div class='del'>-			printk(KERN_ERR "ata%u: COMRESET failed "</div><div class='del'>-			       "(device not ready)\n", ap-&gt;id);</div><div class='del'>-		else</div><div class='del'>-			DPRINTK("EXIT, device not ready\n");</div><div class='add'>+		ata_port_printk(ap, KERN_ERR,</div><div class='add'>+				"COMRESET failed (device not ready)\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2297,27 +2801,28 @@ int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)</div><div class='ctx'>  *	the device might have been reset more than once using</div><div class='ctx'>  *	different reset methods before postreset is invoked.</div><div class='ctx'>  *</div><div class='del'>- *	This function is to be used as standard callback for</div><div class='del'>- *	ata_drive_*_reset().</div><div class='del'>- *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	Kernel thread context (may sleep)</div><div class='ctx'>  */</div><div class='ctx'> void ata_std_postreset(struct ata_port *ap, unsigned int *classes)</div><div class='ctx'> {</div><div class='del'>-	DPRINTK("ENTER\n");</div><div class='add'>+	u32 serror;</div><div class='ctx'> </div><div class='del'>-	/* set cable type if it isn't already set */</div><div class='del'>-	if (ap-&gt;cbl == ATA_CBL_NONE &amp;&amp; ap-&gt;flags &amp; ATA_FLAG_SATA)</div><div class='del'>-		ap-&gt;cbl = ATA_CBL_SATA;</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='ctx'> 	/* print link status */</div><div class='del'>-	if (ap-&gt;cbl == ATA_CBL_SATA)</div><div class='del'>-		sata_print_link_status(ap);</div><div class='add'>+	sata_print_link_status(ap);</div><div class='add'>+</div><div class='add'>+	/* clear SError */</div><div class='add'>+	if (sata_scr_read(ap, SCR_ERROR, &amp;serror) == 0)</div><div class='add'>+		sata_scr_write(ap, SCR_ERROR, serror);</div><div class='ctx'> </div><div class='ctx'> 	/* re-enable interrupts */</div><div class='del'>-	if (ap-&gt;ioaddr.ctl_addr)	/* FIXME: hack. create a hook instead */</div><div class='del'>-		ata_irq_on(ap);</div><div class='add'>+	if (!ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+		/* FIXME: hack. create a hook instead */</div><div class='add'>+		if (ap-&gt;ioaddr.ctl_addr)</div><div class='add'>+			ata_irq_on(ap);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* is double-select really necessary? */</div><div class='ctx'> 	if (classes[0] != ATA_DEV_NONE)</div><div class='hunk'>@@ -2343,126 +2848,7 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_std_probe_reset - standard probe reset method</div><div class='del'>- *	@ap: prot to perform probe-reset</div><div class='del'>- *	@classes: resulting classes of attached devices</div><div class='del'>- *</div><div class='del'>- *	The stock off-the-shelf -&gt;probe_reset method.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Kernel thread context (may sleep)</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	0 on success, -errno otherwise.</div><div class='del'>- */</div><div class='del'>-int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)</div><div class='del'>-{</div><div class='del'>-	ata_reset_fn_t hardreset;</div><div class='del'>-</div><div class='del'>-	hardreset = NULL;</div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_SATA &amp;&amp; ap-&gt;ops-&gt;scr_read)</div><div class='del'>-		hardreset = sata_std_hardreset;</div><div class='del'>-</div><div class='del'>-	return ata_drive_probe_reset(ap, ata_std_probeinit,</div><div class='del'>-				     ata_std_softreset, hardreset,</div><div class='del'>-				     ata_std_postreset, classes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_probe_reset(struct ata_port *ap, ata_reset_fn_t reset,</div><div class='del'>-			  ata_postreset_fn_t postreset,</div><div class='del'>-			  unsigned int *classes)</div><div class='del'>-{</div><div class='del'>-	int i, rc;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-		classes[i] = ATA_DEV_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	rc = reset(ap, 0, classes);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	/* If any class isn't ATA_DEV_UNKNOWN, consider classification</div><div class='del'>-	 * is complete and convert all ATA_DEV_UNKNOWN to</div><div class='del'>-	 * ATA_DEV_NONE.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-		if (classes[i] != ATA_DEV_UNKNOWN)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (i &lt; ATA_MAX_DEVICES)</div><div class='del'>-		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-			if (classes[i] == ATA_DEV_UNKNOWN)</div><div class='del'>-				classes[i] = ATA_DEV_NONE;</div><div class='del'>-</div><div class='del'>-	if (postreset)</div><div class='del'>-		postreset(ap, classes);</div><div class='del'>-</div><div class='del'>-	return classes[0] != ATA_DEV_UNKNOWN ? 0 : -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ata_drive_probe_reset - Perform probe reset with given methods</div><div class='del'>- *	@ap: port to reset</div><div class='del'>- *	@probeinit: probeinit method (can be NULL)</div><div class='del'>- *	@softreset: softreset method (can be NULL)</div><div class='del'>- *	@hardreset: hardreset method (can be NULL)</div><div class='del'>- *	@postreset: postreset method (can be NULL)</div><div class='del'>- *	@classes: resulting classes of attached devices</div><div class='del'>- *</div><div class='del'>- *	Reset the specified port and classify attached devices using</div><div class='del'>- *	given methods.  This function prefers softreset but tries all</div><div class='del'>- *	possible reset sequences to reset and classify devices.  This</div><div class='del'>- *	function is intended to be used for constructing -&gt;probe_reset</div><div class='del'>- *	callback by low level drivers.</div><div class='del'>- *</div><div class='del'>- *	Reset methods should follow the following rules.</div><div class='del'>- *</div><div class='del'>- *	- Return 0 on sucess, -errno on failure.</div><div class='del'>- *	- If classification is supported, fill classes[] with</div><div class='del'>- *	  recognized class codes.</div><div class='del'>- *	- If classification is not supported, leave classes[] alone.</div><div class='del'>- *	- If verbose is non-zero, print error message on failure;</div><div class='del'>- *	  otherwise, shut up.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Kernel thread context (may sleep)</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	0 on success, -EINVAL if no reset method is avaliable, -ENODEV</div><div class='del'>- *	if classification fails, and any error code from reset</div><div class='del'>- *	methods.</div><div class='del'>- */</div><div class='del'>-int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,</div><div class='del'>-			  ata_reset_fn_t softreset, ata_reset_fn_t hardreset,</div><div class='del'>-			  ata_postreset_fn_t postreset, unsigned int *classes)</div><div class='del'>-{</div><div class='del'>-	int rc = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (probeinit)</div><div class='del'>-		probeinit(ap);</div><div class='del'>-</div><div class='del'>-	if (softreset) {</div><div class='del'>-		rc = do_probe_reset(ap, softreset, postreset, classes);</div><div class='del'>-		if (rc == 0)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hardreset)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	rc = do_probe_reset(ap, hardreset, postreset, classes);</div><div class='del'>-	if (rc == 0 || rc != -ENODEV)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	if (softreset)</div><div class='del'>-		rc = do_probe_reset(ap, softreset, postreset, classes);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	ata_dev_same_device - Determine whether new ID matches configured device</div><div class='del'>- *	@ap: port on which the device to compare against resides</div><div class='ctx'>  *	@dev: device to compare against</div><div class='ctx'>  *	@new_class: class of the new device</div><div class='ctx'>  *	@new_id: IDENTIFY page of the new device</div><div class='hunk'>@@ -2477,17 +2863,16 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	1 if @dev matches @new_class and @new_id, 0 otherwise.</div><div class='ctx'>  */</div><div class='del'>-static int ata_dev_same_device(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-			       unsigned int new_class, const u16 *new_id)</div><div class='add'>+static int ata_dev_same_device(struct ata_device *dev, unsigned int new_class,</div><div class='add'>+			       const u16 *new_id)</div><div class='ctx'> {</div><div class='ctx'> 	const u16 *old_id = dev-&gt;id;</div><div class='ctx'> 	unsigned char model[2][41], serial[2][21];</div><div class='ctx'> 	u64 new_n_sectors;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;class != new_class) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "ata%u: dev %u class mismatch %d != %d\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno, dev-&gt;class, new_class);</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO, "class mismatch %d != %d\n",</div><div class='add'>+			       dev-&gt;class, new_class);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2498,24 +2883,22 @@ static int ata_dev_same_device(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	new_n_sectors = ata_id_n_sectors(new_id);</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(model[0], model[1])) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "ata%u: dev %u model number mismatch '%s' != '%s'\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno, model[0], model[1]);</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO, "model number mismatch "</div><div class='add'>+			       "'%s' != '%s'\n", model[0], model[1]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (strcmp(serial[0], serial[1])) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "ata%u: dev %u serial number mismatch '%s' != '%s'\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno, serial[0], serial[1]);</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO, "serial number mismatch "</div><div class='add'>+			       "'%s' != '%s'\n", serial[0], serial[1]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;class == ATA_DEV_ATA &amp;&amp; dev-&gt;n_sectors != new_n_sectors) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "ata%u: dev %u n_sectors mismatch %llu != %llu\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno, (unsigned long long)dev-&gt;n_sectors,</div><div class='del'>-		       (unsigned long long)new_n_sectors);</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO, "n_sectors mismatch "</div><div class='add'>+			       "%llu != %llu\n",</div><div class='add'>+			       (unsigned long long)dev-&gt;n_sectors,</div><div class='add'>+			       (unsigned long long)new_n_sectors);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2524,7 +2907,6 @@ static int ata_dev_same_device(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_revalidate - Revalidate ATA device</div><div class='del'>- *	@ap: port on which the device to revalidate resides</div><div class='ctx'>  *	@dev: device to revalidate</div><div class='ctx'>  *	@post_reset: is this revalidation after reset?</div><div class='ctx'>  *</div><div class='hunk'>@@ -2537,40 +2919,37 @@ static int ata_dev_same_device(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	0 on success, negative errno otherwise</div><div class='ctx'>  */</div><div class='del'>-int ata_dev_revalidate(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-		       int post_reset)</div><div class='add'>+int ata_dev_revalidate(struct ata_device *dev, int post_reset)</div><div class='ctx'> {</div><div class='del'>-	unsigned int class;</div><div class='del'>-	u16 *id;</div><div class='add'>+	unsigned int class = dev-&gt;class;</div><div class='add'>+	u16 *id = (void *)dev-&gt;ap-&gt;sector_buf;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!ata_dev_present(dev))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	class = dev-&gt;class;</div><div class='del'>-	id = NULL;</div><div class='add'>+	if (!ata_dev_enabled(dev)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto fail;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* allocate &amp; read ID data */</div><div class='del'>-	rc = ata_dev_read_id(ap, dev, &amp;class, post_reset, &amp;id);</div><div class='add'>+	/* read ID data */</div><div class='add'>+	rc = ata_dev_read_id(dev, &amp;class, post_reset, id);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	/* is the device still there? */</div><div class='del'>-	if (!ata_dev_same_device(ap, dev, class, id)) {</div><div class='add'>+	if (!ata_dev_same_device(dev, class, id)) {</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(dev-&gt;id);</div><div class='del'>-	dev-&gt;id = id;</div><div class='add'>+	memcpy(dev-&gt;id, id, sizeof(id[0]) * ATA_ID_WORDS);</div><div class='ctx'> </div><div class='ctx'> 	/* configure device according to the new ID */</div><div class='del'>-	return ata_dev_configure(ap, dev, 0);</div><div class='add'>+	rc = ata_dev_configure(dev, 0);</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'>  fail:</div><div class='del'>-	printk(KERN_ERR "ata%u: dev %u revalidation failed (errno=%d)\n",</div><div class='del'>-	       ap-&gt;id, dev-&gt;devno, rc);</div><div class='del'>-	kfree(id);</div><div class='add'>+	ata_dev_printk(dev, KERN_ERR, "revalidation failed (errno=%d)\n", rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2626,6 +3005,14 @@ static int ata_dma_blacklisted(const struct ata_device *dev)</div><div class='ctx'> 	unsigned int nlen, rlen;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/* We don't support polling DMA.</div><div class='add'>+	 * DMA blacklist those ATAPI devices with CDB-intr (and use PIO)</div><div class='add'>+	 * if the LLDD handles only interrupts in the HSM_ST_LAST state.</div><div class='add'>+	 */</div><div class='add'>+	if ((dev-&gt;ap-&gt;flags &amp; ATA_FLAG_PIO_POLLING) &amp;&amp;</div><div class='add'>+	    (dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='ctx'> 	ata_id_string(dev-&gt;id, model_num, ATA_ID_PROD_OFS,</div><div class='ctx'> 			  sizeof(model_num));</div><div class='ctx'> 	ata_id_string(dev-&gt;id, model_rev, ATA_ID_FW_REV_OFS,</div><div class='hunk'>@@ -2646,7 +3033,6 @@ static int ata_dma_blacklisted(const struct ata_device *dev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_xfermask - Compute supported xfermask of the given device</div><div class='del'>- *	@ap: Port on which the device to compute xfermask for resides</div><div class='ctx'>  *	@dev: Device to compute xfermask for</div><div class='ctx'>  *</div><div class='ctx'>  *	Compute supported xfermask of @dev and store it in</div><div class='hunk'>@@ -2661,49 +3047,61 @@ static int ata_dma_blacklisted(const struct ata_device *dev)</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	None.</div><div class='ctx'>  */</div><div class='del'>-static void ata_dev_xfermask(struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+static void ata_dev_xfermask(struct ata_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='ctx'> 	struct ata_host_set *hs = ap-&gt;host_set;</div><div class='ctx'> 	unsigned long xfer_mask;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	xfer_mask = ata_pack_xfermask(ap-&gt;pio_mask, ap-&gt;mwdma_mask,</div><div class='del'>-				      ap-&gt;udma_mask);</div><div class='add'>+	xfer_mask = ata_pack_xfermask(ap-&gt;pio_mask,</div><div class='add'>+				      ap-&gt;mwdma_mask, ap-&gt;udma_mask);</div><div class='add'>+</div><div class='add'>+	/* Apply cable rule here.  Don't apply it early because when</div><div class='add'>+	 * we handle hot plug the cable type can itself change.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;cbl == ATA_CBL_PATA40)</div><div class='add'>+		xfer_mask &amp;= ~(0xF8 &lt;&lt; ATA_SHIFT_UDMA);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Use port-wide xfermask for now */</div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='ctx'> 		struct ata_device *d = &amp;ap-&gt;device[i];</div><div class='del'>-		if (!ata_dev_present(d))</div><div class='add'>+</div><div class='add'>+		if (ata_dev_absent(d))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ata_dev_disabled(d)) {</div><div class='add'>+			/* to avoid violating device selection timing */</div><div class='add'>+			xfer_mask &amp;= ata_pack_xfermask(d-&gt;pio_mask,</div><div class='add'>+						       UINT_MAX, UINT_MAX);</div><div class='ctx'> 			continue;</div><div class='del'>-		xfer_mask &amp;= ata_pack_xfermask(d-&gt;pio_mask, d-&gt;mwdma_mask,</div><div class='del'>-					       d-&gt;udma_mask);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		xfer_mask &amp;= ata_pack_xfermask(d-&gt;pio_mask,</div><div class='add'>+					       d-&gt;mwdma_mask, d-&gt;udma_mask);</div><div class='ctx'> 		xfer_mask &amp;= ata_id_xfermask(d-&gt;id);</div><div class='ctx'> 		if (ata_dma_blacklisted(d))</div><div class='ctx'> 			xfer_mask &amp;= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);</div><div class='del'>-		/* Apply cable rule here. Don't apply it early because when</div><div class='del'>-		   we handle hot plug the cable type can itself change */</div><div class='del'>-		if (ap-&gt;cbl == ATA_CBL_PATA40)</div><div class='del'>-			xfer_mask &amp;= ~(0xF8 &lt;&lt; ATA_SHIFT_UDMA);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ata_dma_blacklisted(dev))</div><div class='del'>-		printk(KERN_WARNING "ata%u: dev %u is on DMA blacklist, "</div><div class='del'>-		       "disabling DMA\n", ap-&gt;id, dev-&gt;devno);</div><div class='add'>+		ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+			       "device is on DMA blacklist, disabling DMA\n");</div><div class='ctx'> </div><div class='ctx'> 	if (hs-&gt;flags &amp; ATA_HOST_SIMPLEX) {</div><div class='ctx'> 		if (hs-&gt;simplex_claimed)</div><div class='ctx'> 			xfer_mask &amp;= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (ap-&gt;ops-&gt;mode_filter)</div><div class='ctx'> 		xfer_mask = ap-&gt;ops-&gt;mode_filter(ap, dev, xfer_mask);</div><div class='ctx'> </div><div class='del'>-	ata_unpack_xfermask(xfer_mask, &amp;dev-&gt;pio_mask, &amp;dev-&gt;mwdma_mask,</div><div class='del'>-			    &amp;dev-&gt;udma_mask);</div><div class='add'>+	ata_unpack_xfermask(xfer_mask, &amp;dev-&gt;pio_mask,</div><div class='add'>+			    &amp;dev-&gt;mwdma_mask, &amp;dev-&gt;udma_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_set_xfermode - Issue SET FEATURES - XFER MODE command</div><div class='del'>- *	@ap: Port associated with device @dev</div><div class='ctx'>  *	@dev: Device to which command will be sent</div><div class='ctx'>  *</div><div class='ctx'>  *	Issue SET FEATURES - XFER MODE command to device @dev</div><div class='hunk'>@@ -2716,8 +3114,7 @@ static void ata_dev_xfermask(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'>  *	0 on success, AC_ERR_* mask otherwise.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int ata_dev_set_xfermode(struct ata_port *ap,</div><div class='del'>-					 struct ata_device *dev)</div><div class='add'>+static unsigned int ata_dev_set_xfermode(struct ata_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_taskfile tf;</div><div class='ctx'> 	unsigned int err_mask;</div><div class='hunk'>@@ -2725,14 +3122,14 @@ static unsigned int ata_dev_set_xfermode(struct ata_port *ap,</div><div class='ctx'> 	/* set up set-features taskfile */</div><div class='ctx'> 	DPRINTK("set features - xfer mode\n");</div><div class='ctx'> </div><div class='del'>-	ata_tf_init(ap, &amp;tf, dev-&gt;devno);</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='ctx'> 	tf.command = ATA_CMD_SET_FEATURES;</div><div class='ctx'> 	tf.feature = SETFEATURES_XFER;</div><div class='ctx'> 	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='ctx'> 	tf.protocol = ATA_PROT_NODATA;</div><div class='ctx'> 	tf.nsect = dev-&gt;xfer_mode;</div><div class='ctx'> </div><div class='del'>-	err_mask = ata_exec_internal(ap, dev, &amp;tf, DMA_NONE, NULL, 0);</div><div class='add'>+	err_mask = ata_exec_internal(dev, &amp;tf, NULL, DMA_NONE, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("EXIT, err_mask=%x\n", err_mask);</div><div class='ctx'> 	return err_mask;</div><div class='hunk'>@@ -2740,7 +3137,6 @@ static unsigned int ata_dev_set_xfermode(struct ata_port *ap,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_dev_init_params - Issue INIT DEV PARAMS command</div><div class='del'>- *	@ap: Port associated with device @dev</div><div class='ctx'>  *	@dev: Device to which command will be sent</div><div class='ctx'>  *	@heads: Number of heads (taskfile parameter)</div><div class='ctx'>  *	@sectors: Number of sectors (taskfile parameter)</div><div class='hunk'>@@ -2751,11 +3147,8 @@ static unsigned int ata_dev_set_xfermode(struct ata_port *ap,</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	0 on success, AC_ERR_* mask otherwise.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static unsigned int ata_dev_init_params(struct ata_port *ap,</div><div class='del'>-					struct ata_device *dev,</div><div class='del'>-					u16 heads,</div><div class='del'>-					u16 sectors)</div><div class='add'>+static unsigned int ata_dev_init_params(struct ata_device *dev,</div><div class='add'>+					u16 heads, u16 sectors)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_taskfile tf;</div><div class='ctx'> 	unsigned int err_mask;</div><div class='hunk'>@@ -2767,14 +3160,14 @@ static unsigned int ata_dev_init_params(struct ata_port *ap,</div><div class='ctx'> 	/* set up init dev params taskfile */</div><div class='ctx'> 	DPRINTK("init dev params \n");</div><div class='ctx'> </div><div class='del'>-	ata_tf_init(ap, &amp;tf, dev-&gt;devno);</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='ctx'> 	tf.command = ATA_CMD_INIT_DEV_PARAMS;</div><div class='ctx'> 	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='ctx'> 	tf.protocol = ATA_PROT_NODATA;</div><div class='ctx'> 	tf.nsect = sectors;</div><div class='ctx'> 	tf.device |= (heads - 1) &amp; 0x0f; /* max head = num. of heads - 1 */</div><div class='ctx'> </div><div class='del'>-	err_mask = ata_exec_internal(ap, dev, &amp;tf, DMA_NONE, NULL, 0);</div><div class='add'>+	err_mask = ata_exec_internal(dev, &amp;tf, NULL, DMA_NONE, NULL, 0);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("EXIT, err_mask=%x\n", err_mask);</div><div class='ctx'> 	return err_mask;</div><div class='hunk'>@@ -2957,6 +3350,7 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)</div><div class='ctx'> 	qc-&gt;n_elem = 1;</div><div class='ctx'> 	qc-&gt;orig_n_elem = 1;</div><div class='ctx'> 	qc-&gt;buf_virt = buf;</div><div class='add'>+	qc-&gt;nbytes = buflen;</div><div class='ctx'> </div><div class='ctx'> 	sg = qc-&gt;__sg;</div><div class='ctx'> 	sg_init_one(sg, buf, buflen);</div><div class='hunk'>@@ -3140,134 +3534,6 @@ skip_map:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_poll_qc_complete - turn irq back on and finish qc</div><div class='del'>- *	@qc: Command to complete</div><div class='del'>- *	@err_mask: ATA status register content</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	None.  (grabs host lock)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void ata_poll_qc_complete(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	ap-&gt;flags &amp;= ~ATA_FLAG_NOINTR;</div><div class='del'>-	ata_irq_on(ap);</div><div class='del'>-	ata_qc_complete(qc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ata_pio_poll - poll using PIO, depending on current state</div><div class='del'>- *	@ap: the target ata_port</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	None.  (executing in kernel thread context)</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	timeout value to use</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned long ata_pio_poll(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-	u8 status;</div><div class='del'>-	unsigned int poll_state = HSM_ST_UNKNOWN;</div><div class='del'>-	unsigned int reg_state = HSM_ST_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	WARN_ON(qc == NULL);</div><div class='del'>-</div><div class='del'>-	switch (ap-&gt;hsm_task_state) {</div><div class='del'>-	case HSM_ST:</div><div class='del'>-	case HSM_ST_POLL:</div><div class='del'>-		poll_state = HSM_ST_POLL;</div><div class='del'>-		reg_state = HSM_ST;</div><div class='del'>-		break;</div><div class='del'>-	case HSM_ST_LAST:</div><div class='del'>-	case HSM_ST_LAST_POLL:</div><div class='del'>-		poll_state = HSM_ST_LAST_POLL;</div><div class='del'>-		reg_state = HSM_ST_LAST;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		BUG();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = ata_chk_status(ap);</div><div class='del'>-	if (status &amp; ATA_BUSY) {</div><div class='del'>-		if (time_after(jiffies, ap-&gt;pio_task_timeout)) {</div><div class='del'>-			qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='del'>-			ap-&gt;hsm_task_state = HSM_ST_TMOUT;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		ap-&gt;hsm_task_state = poll_state;</div><div class='del'>-		return ATA_SHORT_PAUSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ap-&gt;hsm_task_state = reg_state;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ata_pio_complete - check if drive is busy or idle</div><div class='del'>- *	@ap: the target ata_port</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	None.  (executing in kernel thread context)</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	Non-zero if qc completed, zero otherwise.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ata_pio_complete (struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-	u8 drv_stat;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is purely heuristic.  This is a fast path.  Sometimes when</div><div class='del'>-	 * we enter, BSY will be cleared in a chk-status or two.  If not,</div><div class='del'>-	 * the drive is probably seeking or something.  Snooze for a couple</div><div class='del'>-	 * msecs, then chk-status again.  If still busy, fall back to</div><div class='del'>-	 * HSM_ST_POLL state.</div><div class='del'>-	 */</div><div class='del'>-	drv_stat = ata_busy_wait(ap, ATA_BUSY, 10);</div><div class='del'>-	if (drv_stat &amp; ATA_BUSY) {</div><div class='del'>-		msleep(2);</div><div class='del'>-		drv_stat = ata_busy_wait(ap, ATA_BUSY, 10);</div><div class='del'>-		if (drv_stat &amp; ATA_BUSY) {</div><div class='del'>-			ap-&gt;hsm_task_state = HSM_ST_LAST_POLL;</div><div class='del'>-			ap-&gt;pio_task_timeout = jiffies + ATA_TMOUT_PIO;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	WARN_ON(qc == NULL);</div><div class='del'>-</div><div class='del'>-	drv_stat = ata_wait_idle(ap);</div><div class='del'>-	if (!ata_ok(drv_stat)) {</div><div class='del'>-		qc-&gt;err_mask |= __ac_err_mask(drv_stat);</div><div class='del'>-		ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='del'>-</div><div class='del'>-	WARN_ON(qc-&gt;err_mask);</div><div class='del'>-	ata_poll_qc_complete(qc);</div><div class='del'>-</div><div class='del'>-	/* another command may start at this point */</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	swap_buf_le16 - swap halves of 16-bit words in place</div><div class='ctx'>  *	@buf:  Buffer to swap</div><div class='ctx'>  *	@buf_words:  Number of 16-bit words in buffer.</div><div class='hunk'>@@ -3291,7 +3557,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_mmio_data_xfer - Transfer data by MMIO</div><div class='del'>- *	@ap: port to read/write</div><div class='add'>+ *	@adev: device for this I/O</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@write_data: read/write</div><div class='hunk'>@@ -3302,9 +3568,10 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)</div><div class='ctx'>  *	Inherited from caller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,</div><div class='del'>-			       unsigned int buflen, int write_data)</div><div class='add'>+void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf,</div><div class='add'>+			unsigned int buflen, int write_data)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = adev-&gt;ap;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='ctx'> 	u16 *buf16 = (u16 *) buf;</div><div class='hunk'>@@ -3336,7 +3603,7 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_pio_data_xfer - Transfer data by PIO</div><div class='del'>- *	@ap: port to read/write</div><div class='add'>+ *	@adev: device to target</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='ctx'>  *	@write_data: read/write</div><div class='hunk'>@@ -3347,9 +3614,10 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,</div><div class='ctx'>  *	Inherited from caller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ata_pio_data_xfer(struct ata_port *ap, unsigned char *buf,</div><div class='del'>-			      unsigned int buflen, int write_data)</div><div class='add'>+void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf,</div><div class='add'>+		       unsigned int buflen, int write_data)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = adev-&gt;ap;</div><div class='ctx'> 	unsigned int words = buflen &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Transfer multiple of 2 bytes */</div><div class='hunk'>@@ -3374,38 +3642,29 @@ static void ata_pio_data_xfer(struct ata_port *ap, unsigned char *buf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_data_xfer - Transfer data from/to the data register.</div><div class='del'>- *	@ap: port to read/write</div><div class='add'>+ *	ata_pio_data_xfer_noirq - Transfer data by PIO</div><div class='add'>+ *	@adev: device to target</div><div class='ctx'>  *	@buf: data buffer</div><div class='ctx'>  *	@buflen: buffer length</div><div class='del'>- *	@do_write: read/write</div><div class='add'>+ *	@write_data: read/write</div><div class='ctx'>  *</div><div class='del'>- *	Transfer data from/to the device data register.</div><div class='add'>+ *	Transfer data from/to the device data register by PIO. Do the</div><div class='add'>+ *	transfer with interrupts disabled.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	Inherited from caller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ata_data_xfer(struct ata_port *ap, unsigned char *buf,</div><div class='del'>-			  unsigned int buflen, int do_write)</div><div class='add'>+void ata_pio_data_xfer_noirq(struct ata_device *adev, unsigned char *buf,</div><div class='add'>+				    unsigned int buflen, int write_data)</div><div class='ctx'> {</div><div class='del'>-	/* Make the crap hardware pay the costs not the good stuff */</div><div class='del'>-	if (unlikely(ap-&gt;flags &amp; ATA_FLAG_IRQ_MASK)) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		local_irq_save(flags);</div><div class='del'>-		if (ap-&gt;flags &amp; ATA_FLAG_MMIO)</div><div class='del'>-			ata_mmio_data_xfer(ap, buf, buflen, do_write);</div><div class='del'>-		else</div><div class='del'>-			ata_pio_data_xfer(ap, buf, buflen, do_write);</div><div class='del'>-		local_irq_restore(flags);</div><div class='del'>-	} else {</div><div class='del'>-		if (ap-&gt;flags &amp; ATA_FLAG_MMIO)</div><div class='del'>-			ata_mmio_data_xfer(ap, buf, buflen, do_write);</div><div class='del'>-		else</div><div class='del'>-			ata_pio_data_xfer(ap, buf, buflen, do_write);</div><div class='del'>-	}</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	ata_pio_data_xfer(adev, buf, buflen, write_data);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_pio_sector - Transfer ATA_SECT_SIZE (512 bytes) of data.</div><div class='ctx'>  *	@qc: Command on going</div><div class='hunk'>@@ -3435,7 +3694,24 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)</div><div class='ctx'> 	page = nth_page(page, (offset &gt;&gt; PAGE_SHIFT));</div><div class='ctx'> 	offset %= PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	buf = kmap(page) + offset;</div><div class='add'>+	DPRINTK("data %s\n", qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE ? "write" : "read");</div><div class='add'>+</div><div class='add'>+	if (PageHighMem(page)) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		/* FIXME: use a bounce buffer */</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		buf = kmap_atomic(page, KM_IRQ0);</div><div class='add'>+</div><div class='add'>+		/* do the actual data transfer */</div><div class='add'>+		ap-&gt;ops-&gt;data_xfer(qc-&gt;dev, buf + offset, ATA_SECT_SIZE, do_write);</div><div class='add'>+</div><div class='add'>+		kunmap_atomic(buf, KM_IRQ0);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+	} else {</div><div class='add'>+		buf = page_address(page);</div><div class='add'>+		ap-&gt;ops-&gt;data_xfer(qc-&gt;dev, buf + offset, ATA_SECT_SIZE, do_write);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	qc-&gt;cursect++;</div><div class='ctx'> 	qc-&gt;cursg_ofs++;</div><div class='hunk'>@@ -3444,14 +3720,68 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)</div><div class='ctx'> 		qc-&gt;cursg++;</div><div class='ctx'> 		qc-&gt;cursg_ofs = 0;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	DPRINTK("data %s\n", qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE ? "write" : "read");</div><div class='add'>+/**</div><div class='add'>+ *	ata_pio_sectors - Transfer one or many 512-byte sectors.</div><div class='add'>+ *	@qc: Command on going</div><div class='add'>+ *</div><div class='add'>+ *	Transfer one or many ATA_SECT_SIZE of data from/to the</div><div class='add'>+ *	ATA device for the DRQ request.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-	/* do the actual data transfer */</div><div class='del'>-	do_write = (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE);</div><div class='del'>-	ata_data_xfer(ap, buf, ATA_SECT_SIZE, do_write);</div><div class='add'>+static void ata_pio_sectors(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	if (is_multi_taskfile(&amp;qc-&gt;tf)) {</div><div class='add'>+		/* READ/WRITE MULTIPLE */</div><div class='add'>+		unsigned int nsect;</div><div class='add'>+</div><div class='add'>+		WARN_ON(qc-&gt;dev-&gt;multi_count == 0);</div><div class='ctx'> </div><div class='del'>-	kunmap(page);</div><div class='add'>+		nsect = min(qc-&gt;nsect - qc-&gt;cursect, qc-&gt;dev-&gt;multi_count);</div><div class='add'>+		while (nsect--)</div><div class='add'>+			ata_pio_sector(qc);</div><div class='add'>+	} else</div><div class='add'>+		ata_pio_sector(qc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	atapi_send_cdb - Write CDB bytes to hardware</div><div class='add'>+ *	@ap: Port to which ATAPI device is attached.</div><div class='add'>+ *	@qc: Taskfile currently active</div><div class='add'>+ *</div><div class='add'>+ *	When device has indicated its readiness to accept</div><div class='add'>+ *	a CDB, this function is called.  Send the CDB.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	caller.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	/* send SCSI cdb */</div><div class='add'>+	DPRINTK("send cdb\n");</div><div class='add'>+	WARN_ON(qc-&gt;dev-&gt;cdb_len &lt; 12);</div><div class='add'>+</div><div class='add'>+	ap-&gt;ops-&gt;data_xfer(qc-&gt;dev, qc-&gt;cdb, qc-&gt;dev-&gt;cdb_len, 1);</div><div class='add'>+	ata_altstatus(ap); /* flush */</div><div class='add'>+</div><div class='add'>+	switch (qc-&gt;tf.protocol) {</div><div class='add'>+	case ATA_PROT_ATAPI:</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_PROT_ATAPI_NODATA:</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='add'>+		break;</div><div class='add'>+	case ATA_PROT_ATAPI_DMA:</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='add'>+		/* initiate bmdma */</div><div class='add'>+		ap-&gt;ops-&gt;bmdma_start(qc);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3492,11 +3822,11 @@ next_sg:</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 		if (words) /* warning if bytes &gt; 1 */</div><div class='del'>-			printk(KERN_WARNING "ata%u: %u bytes trailing data\n",</div><div class='del'>-			       ap-&gt;id, bytes);</div><div class='add'>+			ata_dev_printk(qc-&gt;dev, KERN_WARNING,</div><div class='add'>+				       "%u bytes trailing data\n", bytes);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; words; i++)</div><div class='del'>-			ata_data_xfer(ap, (unsigned char*)pad_buf, 2, do_write);</div><div class='add'>+			ap-&gt;ops-&gt;data_xfer(qc-&gt;dev, (unsigned char*)pad_buf, 2, do_write);</div><div class='ctx'> </div><div class='ctx'> 		ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3517,7 +3847,24 @@ next_sg:</div><div class='ctx'> 	/* don't cross page boundaries */</div><div class='ctx'> 	count = min(count, (unsigned int)PAGE_SIZE - offset);</div><div class='ctx'> </div><div class='del'>-	buf = kmap(page) + offset;</div><div class='add'>+	DPRINTK("data %s\n", qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE ? "write" : "read");</div><div class='add'>+</div><div class='add'>+	if (PageHighMem(page)) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		/* FIXME: use bounce buffer */</div><div class='add'>+		local_irq_save(flags);</div><div class='add'>+		buf = kmap_atomic(page, KM_IRQ0);</div><div class='add'>+</div><div class='add'>+		/* do the actual data transfer */</div><div class='add'>+		ap-&gt;ops-&gt;data_xfer(qc-&gt;dev,  buf + offset, count, do_write);</div><div class='add'>+</div><div class='add'>+		kunmap_atomic(buf, KM_IRQ0);</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+	} else {</div><div class='add'>+		buf = page_address(page);</div><div class='add'>+		ap-&gt;ops-&gt;data_xfer(qc-&gt;dev,  buf + offset, count, do_write);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bytes -= count;</div><div class='ctx'> 	qc-&gt;curbytes += count;</div><div class='hunk'>@@ -3528,13 +3875,6 @@ next_sg:</div><div class='ctx'> 		qc-&gt;cursg_ofs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DPRINTK("data %s\n", qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE ? "write" : "read");</div><div class='del'>-</div><div class='del'>-	/* do the actual data transfer */</div><div class='del'>-	ata_data_xfer(ap, buf, count, do_write);</div><div class='del'>-</div><div class='del'>-	kunmap(page);</div><div class='del'>-</div><div class='ctx'> 	if (bytes)</div><div class='ctx'> 		goto next_sg;</div><div class='ctx'> }</div><div class='hunk'>@@ -3556,10 +3896,16 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)</div><div class='ctx'> 	unsigned int ireason, bc_lo, bc_hi, bytes;</div><div class='ctx'> 	int i_write, do_write = (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE) ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	ap-&gt;ops-&gt;tf_read(ap, &amp;qc-&gt;tf);</div><div class='del'>-	ireason = qc-&gt;tf.nsect;</div><div class='del'>-	bc_lo = qc-&gt;tf.lbam;</div><div class='del'>-	bc_hi = qc-&gt;tf.lbah;</div><div class='add'>+	/* Abuse qc-&gt;result_tf for temp storage of intermediate TF</div><div class='add'>+	 * here to save some kernel stack usage.</div><div class='add'>+	 * For normal completion, qc-&gt;result_tf is not relevant. For</div><div class='add'>+	 * error, qc-&gt;result_tf is later overwritten by ata_qc_complete().</div><div class='add'>+	 * So, the correctness of qc-&gt;result_tf is not affected.</div><div class='add'>+	 */</div><div class='add'>+	ap-&gt;ops-&gt;tf_read(ap, &amp;qc-&gt;result_tf);</div><div class='add'>+	ireason = qc-&gt;result_tf.nsect;</div><div class='add'>+	bc_lo = qc-&gt;result_tf.lbam;</div><div class='add'>+	bc_hi = qc-&gt;result_tf.lbah;</div><div class='ctx'> 	bytes = (bc_hi &lt;&lt; 8) | bc_lo;</div><div class='ctx'> </div><div class='ctx'> 	/* shall be cleared to zero, indicating xfer of data */</div><div class='hunk'>@@ -3571,307 +3917,365 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)</div><div class='ctx'> 	if (do_write != i_write)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='add'>+	VPRINTK("ata%u: xfering %d bytes\n", ap-&gt;id, bytes);</div><div class='add'>+</div><div class='ctx'> 	__atapi_pio_bytes(qc, bytes);</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	printk(KERN_INFO "ata%u: dev %u: ATAPI check failed\n",</div><div class='del'>-	      ap-&gt;id, dev-&gt;devno);</div><div class='add'>+	ata_dev_printk(dev, KERN_INFO, "ATAPI check failed\n");</div><div class='ctx'> 	qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='ctx'> 	ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_pio_block - start PIO on a block</div><div class='add'>+ *	ata_hsm_ok_in_wq - Check if the qc can be handled in the workqueue.</div><div class='ctx'>  *	@ap: the target ata_port</div><div class='add'>+ *	@qc: qc on going</div><div class='ctx'>  *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	None.  (executing in kernel thread context)</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if ok in workqueue, 0 otherwise.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ata_pio_block(struct ata_port *ap)</div><div class='add'>+static inline int ata_hsm_ok_in_wq(struct ata_port *ap, struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-	u8 status;</div><div class='add'>+	if (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * This is purely heuristic.  This is a fast path.</div><div class='del'>-	 * Sometimes when we enter, BSY will be cleared in</div><div class='del'>-	 * a chk-status or two.  If not, the drive is probably seeking</div><div class='del'>-	 * or something.  Snooze for a couple msecs, then</div><div class='del'>-	 * chk-status again.  If still busy, fall back to</div><div class='del'>-	 * HSM_ST_POLL state.</div><div class='del'>-	 */</div><div class='del'>-	status = ata_busy_wait(ap, ATA_BUSY, 5);</div><div class='del'>-	if (status &amp; ATA_BUSY) {</div><div class='del'>-		msleep(2);</div><div class='del'>-		status = ata_busy_wait(ap, ATA_BUSY, 10);</div><div class='del'>-		if (status &amp; ATA_BUSY) {</div><div class='del'>-			ap-&gt;hsm_task_state = HSM_ST_POLL;</div><div class='del'>-			ap-&gt;pio_task_timeout = jiffies + ATA_TMOUT_PIO;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (ap-&gt;hsm_task_state == HSM_ST_FIRST) {</div><div class='add'>+		if (qc-&gt;tf.protocol == ATA_PROT_PIO &amp;&amp;</div><div class='add'>+		    (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE))</div><div class='add'>+		    return 1;</div><div class='add'>+</div><div class='add'>+		if (is_atapi_taskfile(&amp;qc-&gt;tf) &amp;&amp;</div><div class='add'>+		    !(qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR))</div><div class='add'>+			return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	WARN_ON(qc == NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* check error */</div><div class='del'>-	if (status &amp; (ATA_ERR | ATA_DF)) {</div><div class='del'>-		qc-&gt;err_mask |= AC_ERR_DEV;</div><div class='del'>-		ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+/**</div><div class='add'>+ *	ata_hsm_qc_complete - finish a qc running on standard HSM</div><div class='add'>+ *	@qc: Command to complete</div><div class='add'>+ *	@in_wq: 1 if called from workqueue, 0 otherwise</div><div class='add'>+ *</div><div class='add'>+ *	Finish @qc which is running on standard HSM.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	If @in_wq is zero, spin_lock_irqsave(host_set lock).</div><div class='add'>+ *	Otherwise, none on entry and grabs host lock.</div><div class='add'>+ */</div><div class='add'>+static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/* transfer data if any */</div><div class='del'>-	if (is_atapi_taskfile(&amp;qc-&gt;tf)) {</div><div class='del'>-		/* DRQ=0 means no more data to transfer */</div><div class='del'>-		if ((status &amp; ATA_DRQ) == 0) {</div><div class='del'>-			ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+		if (in_wq) {</div><div class='add'>+			spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		atapi_pio_bytes(qc);</div><div class='del'>-	} else {</div><div class='del'>-		/* handle BSY=0, DRQ=0 as error */</div><div class='del'>-		if ((status &amp; ATA_DRQ) == 0) {</div><div class='del'>-			qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='del'>-			ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+			/* EH might have kicked in while host_set lock</div><div class='add'>+			 * is released.</div><div class='add'>+			 */</div><div class='add'>+			qc = ata_qc_from_tag(ap, qc-&gt;tag);</div><div class='add'>+			if (qc) {</div><div class='add'>+				if (likely(!(qc-&gt;err_mask &amp; AC_ERR_HSM))) {</div><div class='add'>+					ata_irq_on(ap);</div><div class='add'>+					ata_qc_complete(qc);</div><div class='add'>+				} else</div><div class='add'>+					ata_port_freeze(ap);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		ata_pio_sector(qc);</div><div class='add'>+			spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		} else {</div><div class='add'>+			if (likely(!(qc-&gt;err_mask &amp; AC_ERR_HSM)))</div><div class='add'>+				ata_qc_complete(qc);</div><div class='add'>+			else</div><div class='add'>+				ata_port_freeze(ap);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (in_wq) {</div><div class='add'>+			spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+			ata_irq_on(ap);</div><div class='add'>+			ata_qc_complete(qc);</div><div class='add'>+			spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		} else</div><div class='add'>+			ata_qc_complete(qc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ata_altstatus(ap); /* flush */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ata_pio_error(struct ata_port *ap)</div><div class='add'>+/**</div><div class='add'>+ *	ata_hsm_move - move the HSM to the next state.</div><div class='add'>+ *	@ap: the target ata_port</div><div class='add'>+ *	@qc: qc on going</div><div class='add'>+ *	@status: current device status</div><div class='add'>+ *	@in_wq: 1 if called from workqueue, 0 otherwise</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 when poll next status needed, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,</div><div class='add'>+		 u8 status, int in_wq)</div><div class='ctx'> {</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-</div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	WARN_ON(qc == NULL);</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	int poll_next;</div><div class='ctx'> </div><div class='del'>-	if (qc-&gt;tf.command != ATA_CMD_PACKET)</div><div class='del'>-		printk(KERN_WARNING "ata%u: PIO error\n", ap-&gt;id);</div><div class='add'>+	WARN_ON((qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE) == 0);</div><div class='ctx'> </div><div class='del'>-	/* make sure qc-&gt;err_mask is available to</div><div class='del'>-	 * know what's wrong and recover</div><div class='add'>+	/* Make sure ata_qc_issue_prot() does not throw things</div><div class='add'>+	 * like DMA polling into the workqueue. Notice that</div><div class='add'>+	 * in_wq is not equivalent to (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING).</div><div class='ctx'> 	 */</div><div class='del'>-	WARN_ON(qc-&gt;err_mask == 0);</div><div class='del'>-</div><div class='del'>-	ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='del'>-</div><div class='del'>-	ata_poll_qc_complete(qc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ata_pio_task(void *_data)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = _data;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	int qc_completed;</div><div class='add'>+	WARN_ON(in_wq != ata_hsm_ok_in_wq(ap, qc));</div><div class='ctx'> </div><div class='ctx'> fsm_start:</div><div class='del'>-	timeout = 0;</div><div class='del'>-	qc_completed = 0;</div><div class='add'>+	DPRINTK("ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",</div><div class='add'>+		ap-&gt;id, qc-&gt;tf.protocol, ap-&gt;hsm_task_state, status);</div><div class='ctx'> </div><div class='ctx'> 	switch (ap-&gt;hsm_task_state) {</div><div class='del'>-	case HSM_ST_IDLE:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case HSM_ST:</div><div class='del'>-		ata_pio_block(ap);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HSM_ST_LAST:</div><div class='del'>-		qc_completed = ata_pio_complete(ap);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HSM_ST_POLL:</div><div class='del'>-	case HSM_ST_LAST_POLL:</div><div class='del'>-		timeout = ata_pio_poll(ap);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HSM_ST_TMOUT:</div><div class='del'>-	case HSM_ST_ERR:</div><div class='del'>-		ata_pio_error(ap);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (timeout)</div><div class='del'>-		ata_port_queue_task(ap, ata_pio_task, ap, timeout);</div><div class='del'>-	else if (!qc_completed)</div><div class='del'>-		goto fsm_start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	atapi_packet_task - Write CDB bytes to hardware</div><div class='del'>- *	@_data: Port to which ATAPI device is attached.</div><div class='del'>- *</div><div class='del'>- *	When device has indicated its readiness to accept</div><div class='del'>- *	a CDB, this function is called.  Send the CDB.</div><div class='del'>- *	If DMA is to be performed, exit immediately.</div><div class='del'>- *	Otherwise, we are in polling mode, so poll</div><div class='del'>- *	status under operation succeeds or fails.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Kernel thread context (may sleep)</div><div class='del'>- */</div><div class='add'>+	case HSM_ST_FIRST:</div><div class='add'>+		/* Send first data block or PACKET CDB */</div><div class='ctx'> </div><div class='del'>-static void atapi_packet_task(void *_data)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = _data;</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-	u8 status;</div><div class='del'>-</div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	WARN_ON(qc == NULL);</div><div class='del'>-	WARN_ON(!(qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE));</div><div class='add'>+		/* If polling, we will stay in the work queue after</div><div class='add'>+		 * sending the data. Otherwise, interrupt handler</div><div class='add'>+		 * takes over after sending the data.</div><div class='add'>+		 */</div><div class='add'>+		poll_next = (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING);</div><div class='add'>+</div><div class='add'>+		/* check device status */</div><div class='add'>+		if (unlikely((status &amp; ATA_DRQ) == 0)) {</div><div class='add'>+			/* handle BSY=0, DRQ=0 as error */</div><div class='add'>+			if (likely(status &amp; (ATA_ERR | ATA_DF)))</div><div class='add'>+				/* device stops HSM for abort/error */</div><div class='add'>+				qc-&gt;err_mask |= AC_ERR_DEV;</div><div class='add'>+			else</div><div class='add'>+				/* HSM violation. Let EH handle this */</div><div class='add'>+				qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='ctx'> </div><div class='del'>-	/* sleep-wait for BSY to clear */</div><div class='del'>-	DPRINTK("busy wait\n");</div><div class='del'>-	if (ata_busy_sleep(ap, ATA_TMOUT_CDB_QUICK, ATA_TMOUT_CDB)) {</div><div class='del'>-		qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='add'>+			ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+			goto fsm_start;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* make sure DRQ is set */</div><div class='del'>-	status = ata_chk_status(ap);</div><div class='del'>-	if ((status &amp; (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) {</div><div class='del'>-		qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='add'>+		/* Device should not ask for data transfer (DRQ=1)</div><div class='add'>+		 * when it finds something wrong.</div><div class='add'>+		 * We ignore DRQ here and stop the HSM by</div><div class='add'>+		 * changing hsm_task_state to HSM_ST_ERR and</div><div class='add'>+		 * let the EH abort the command or reset the device.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(status &amp; (ATA_ERR | ATA_DF))) {</div><div class='add'>+			printk(KERN_WARNING "ata%d: DRQ=1 with device error, dev_stat 0x%X\n",</div><div class='add'>+			       ap-&gt;id, status);</div><div class='add'>+			qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+			ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+			goto fsm_start;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* send SCSI cdb */</div><div class='del'>-	DPRINTK("send cdb\n");</div><div class='del'>-	WARN_ON(qc-&gt;dev-&gt;cdb_len &lt; 12);</div><div class='add'>+		/* Send the CDB (atapi) or the first data block (ata pio out).</div><div class='add'>+		 * During the state transition, interrupt handler shouldn't</div><div class='add'>+		 * be invoked before the data transfer is complete and</div><div class='add'>+		 * hsm_task_state is changed. Hence, the following locking.</div><div class='add'>+		 */</div><div class='add'>+		if (in_wq)</div><div class='add'>+			spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (qc-&gt;tf.protocol == ATA_PROT_ATAPI_DMA ||</div><div class='del'>-	    qc-&gt;tf.protocol == ATA_PROT_ATAPI_NODATA) {</div><div class='del'>-		unsigned long flags;</div><div class='add'>+		if (qc-&gt;tf.protocol == ATA_PROT_PIO) {</div><div class='add'>+			/* PIO data out protocol.</div><div class='add'>+			 * send first data block.</div><div class='add'>+			 */</div><div class='ctx'> </div><div class='del'>-		/* Once we're done issuing command and kicking bmdma,</div><div class='del'>-		 * irq handler takes over.  To not lose irq, we need</div><div class='del'>-		 * to clear NOINTR flag before sending cdb, but</div><div class='del'>-		 * interrupt handler shouldn't be invoked before we're</div><div class='del'>-		 * finished.  Hence, the following locking.</div><div class='add'>+			/* ata_pio_sectors() might change the state</div><div class='add'>+			 * to HSM_ST_LAST. so, the state is changed here</div><div class='add'>+			 * before ata_pio_sectors().</div><div class='add'>+			 */</div><div class='add'>+			ap-&gt;hsm_task_state = HSM_ST;</div><div class='add'>+			ata_pio_sectors(qc);</div><div class='add'>+			ata_altstatus(ap); /* flush */</div><div class='add'>+		} else</div><div class='add'>+			/* send CDB */</div><div class='add'>+			atapi_send_cdb(ap, qc);</div><div class='add'>+</div><div class='add'>+		if (in_wq)</div><div class='add'>+			spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		/* if polling, ata_pio_task() handles the rest.</div><div class='add'>+		 * otherwise, interrupt handler takes over from here.</div><div class='ctx'> 		 */</div><div class='del'>-		spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-		ap-&gt;flags &amp;= ~ATA_FLAG_NOINTR;</div><div class='del'>-		ata_data_xfer(ap, qc-&gt;cdb, qc-&gt;dev-&gt;cdb_len, 1);</div><div class='del'>-		ata_altstatus(ap); /* flush */</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		if (qc-&gt;tf.protocol == ATA_PROT_ATAPI_DMA)</div><div class='del'>-			ap-&gt;ops-&gt;bmdma_start(qc);	/* initiate bmdma */</div><div class='del'>-		spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	} else {</div><div class='del'>-		ata_data_xfer(ap, qc-&gt;cdb, qc-&gt;dev-&gt;cdb_len, 1);</div><div class='del'>-		ata_altstatus(ap); /* flush */</div><div class='add'>+	case HSM_ST:</div><div class='add'>+		/* complete command or read/write the data register */</div><div class='add'>+		if (qc-&gt;tf.protocol == ATA_PROT_ATAPI) {</div><div class='add'>+			/* ATAPI PIO protocol */</div><div class='add'>+			if ((status &amp; ATA_DRQ) == 0) {</div><div class='add'>+				/* No more data to transfer or device error.</div><div class='add'>+				 * Device error will be tagged in HSM_ST_LAST.</div><div class='add'>+				 */</div><div class='add'>+				ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='add'>+				goto fsm_start;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		/* PIO commands are handled by polling */</div><div class='del'>-		ap-&gt;hsm_task_state = HSM_ST;</div><div class='del'>-		ata_port_queue_task(ap, ata_pio_task, ap, 0);</div><div class='del'>-	}</div><div class='add'>+			/* Device should not ask for data transfer (DRQ=1)</div><div class='add'>+			 * when it finds something wrong.</div><div class='add'>+			 * We ignore DRQ here and stop the HSM by</div><div class='add'>+			 * changing hsm_task_state to HSM_ST_ERR and</div><div class='add'>+			 * let the EH abort the command or reset the device.</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(status &amp; (ATA_ERR | ATA_DF))) {</div><div class='add'>+				printk(KERN_WARNING "ata%d: DRQ=1 with device error, dev_stat 0x%X\n",</div><div class='add'>+				       ap-&gt;id, status);</div><div class='add'>+				qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+				ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+				goto fsm_start;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+			atapi_pio_bytes(qc);</div><div class='ctx'> </div><div class='del'>-err_out:</div><div class='del'>-	ata_poll_qc_complete(qc);</div><div class='del'>-}</div><div class='add'>+			if (unlikely(ap-&gt;hsm_task_state == HSM_ST_ERR))</div><div class='add'>+				/* bad ireason reported by device */</div><div class='add'>+				goto fsm_start;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	ata_qc_timeout - Handle timeout of queued command</div><div class='del'>- *	@qc: Command that timed out</div><div class='del'>- *</div><div class='del'>- *	Some part of the kernel (currently, only the SCSI layer)</div><div class='del'>- *	has noticed that the active command on port @ap has not</div><div class='del'>- *	completed after a specified length of time.  Handle this</div><div class='del'>- *	condition by disabling DMA (if necessary) and completing</div><div class='del'>- *	transactions, with error if necessary.</div><div class='del'>- *</div><div class='del'>- *	This also handles the case of the "lost interrupt", where</div><div class='del'>- *	for some reason (possibly hardware bug, possibly driver bug)</div><div class='del'>- *	an interrupt was not delivered to the driver, even though the</div><div class='del'>- *	transaction completed successfully.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Inherited from SCSI layer (none, can sleep)</div><div class='del'>- */</div><div class='add'>+		} else {</div><div class='add'>+			/* ATA PIO protocol */</div><div class='add'>+			if (unlikely((status &amp; ATA_DRQ) == 0)) {</div><div class='add'>+				/* handle BSY=0, DRQ=0 as error */</div><div class='add'>+				if (likely(status &amp; (ATA_ERR | ATA_DF)))</div><div class='add'>+					/* device stops HSM for abort/error */</div><div class='add'>+					qc-&gt;err_mask |= AC_ERR_DEV;</div><div class='add'>+				else</div><div class='add'>+					/* HSM violation. Let EH handle this */</div><div class='add'>+					qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+</div><div class='add'>+				ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+				goto fsm_start;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-static void ata_qc_timeout(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	struct ata_host_set *host_set = ap-&gt;host_set;</div><div class='del'>-	u8 host_stat = 0, drv_stat;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+			/* For PIO reads, some devices may ask for</div><div class='add'>+			 * data transfer (DRQ=1) alone with ERR=1.</div><div class='add'>+			 * We respect DRQ here and transfer one</div><div class='add'>+			 * block of junk data before changing the</div><div class='add'>+			 * hsm_task_state to HSM_ST_ERR.</div><div class='add'>+			 *</div><div class='add'>+			 * For PIO writes, ERR=1 DRQ=1 doesn't make</div><div class='add'>+			 * sense since the data block has been</div><div class='add'>+			 * transferred to the device.</div><div class='add'>+			 */</div><div class='add'>+			if (unlikely(status &amp; (ATA_ERR | ATA_DF))) {</div><div class='add'>+				/* data might be corrputed */</div><div class='add'>+				qc-&gt;err_mask |= AC_ERR_DEV;</div><div class='add'>+</div><div class='add'>+				if (!(qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE)) {</div><div class='add'>+					ata_pio_sectors(qc);</div><div class='add'>+					ata_altstatus(ap);</div><div class='add'>+					status = ata_wait_idle(ap);</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (status &amp; (ATA_BUSY | ATA_DRQ))</div><div class='add'>+					qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+</div><div class='add'>+				/* ata_pio_sectors() might change the</div><div class='add'>+				 * state to HSM_ST_LAST. so, the state</div><div class='add'>+				 * is changed after ata_pio_sectors().</div><div class='add'>+				 */</div><div class='add'>+				ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+				goto fsm_start;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	DPRINTK("ENTER\n");</div><div class='add'>+			ata_pio_sectors(qc);</div><div class='ctx'> </div><div class='del'>-	ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='add'>+			if (ap-&gt;hsm_task_state == HSM_ST_LAST &amp;&amp;</div><div class='add'>+			    (!(qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE))) {</div><div class='add'>+				/* all data read */</div><div class='add'>+				ata_altstatus(ap);</div><div class='add'>+				status = ata_wait_idle(ap);</div><div class='add'>+				goto fsm_start;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;host_set-&gt;lock, flags);</div><div class='add'>+		ata_altstatus(ap); /* flush */</div><div class='add'>+		poll_next = 1;</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	switch (qc-&gt;tf.protocol) {</div><div class='add'>+	case HSM_ST_LAST:</div><div class='add'>+		if (unlikely(!ata_ok(status))) {</div><div class='add'>+			qc-&gt;err_mask |= __ac_err_mask(status);</div><div class='add'>+			ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+			goto fsm_start;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	case ATA_PROT_DMA:</div><div class='del'>-	case ATA_PROT_ATAPI_DMA:</div><div class='del'>-		host_stat = ap-&gt;ops-&gt;bmdma_status(ap);</div><div class='add'>+		/* no more data to transfer */</div><div class='add'>+		DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",</div><div class='add'>+			ap-&gt;id, qc-&gt;dev-&gt;devno, status);</div><div class='ctx'> </div><div class='del'>-		/* before we do anything else, clear DMA-Start bit */</div><div class='del'>-		ap-&gt;ops-&gt;bmdma_stop(qc);</div><div class='add'>+		WARN_ON(qc-&gt;err_mask);</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		ata_altstatus(ap);</div><div class='del'>-		drv_stat = ata_chk_status(ap);</div><div class='add'>+		/* complete taskfile transaction */</div><div class='add'>+		ata_hsm_qc_complete(qc, in_wq);</div><div class='ctx'> </div><div class='del'>-		/* ack bmdma irq events */</div><div class='del'>-		ap-&gt;ops-&gt;irq_clear(ap);</div><div class='add'>+		poll_next = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HSM_ST_ERR:</div><div class='add'>+		/* make sure qc-&gt;err_mask is available to</div><div class='add'>+		 * know what's wrong and recover</div><div class='add'>+		 */</div><div class='add'>+		WARN_ON(qc-&gt;err_mask == 0);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n",</div><div class='del'>-		       ap-&gt;id, qc-&gt;tf.command, drv_stat, host_stat);</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='ctx'> </div><div class='ctx'> 		/* complete taskfile transaction */</div><div class='del'>-		qc-&gt;err_mask |= ac_err_mask(drv_stat);</div><div class='add'>+		ata_hsm_qc_complete(qc, in_wq);</div><div class='add'>+</div><div class='add'>+		poll_next = 0;</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		poll_next = 0;</div><div class='add'>+		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;host_set-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	ata_eh_qc_complete(qc);</div><div class='del'>-</div><div class='del'>-	DPRINTK("EXIT\n");</div><div class='add'>+	return poll_next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	ata_eng_timeout - Handle timeout of queued command</div><div class='del'>- *	@ap: Port on which timed-out command is active</div><div class='del'>- *</div><div class='del'>- *	Some part of the kernel (currently, only the SCSI layer)</div><div class='del'>- *	has noticed that the active command on port @ap has not</div><div class='del'>- *	completed after a specified length of time.  Handle this</div><div class='del'>- *	condition by disabling DMA (if necessary) and completing</div><div class='del'>- *	transactions, with error if necessary.</div><div class='del'>- *</div><div class='del'>- *	This also handles the case of the "lost interrupt", where</div><div class='del'>- *	for some reason (possibly hardware bug, possibly driver bug)</div><div class='del'>- *	an interrupt was not delivered to the driver, even though the</div><div class='del'>- *	transaction completed successfully.</div><div class='del'>- *</div><div class='del'>- *	LOCKING:</div><div class='del'>- *	Inherited from SCSI layer (none, can sleep)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void ata_eng_timeout(struct ata_port *ap)</div><div class='add'>+static void ata_pio_task(void *_data)</div><div class='ctx'> {</div><div class='del'>-	DPRINTK("ENTER\n");</div><div class='add'>+	struct ata_queued_cmd *qc = _data;</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	u8 status;</div><div class='add'>+	int poll_next;</div><div class='add'>+</div><div class='add'>+fsm_start:</div><div class='add'>+	WARN_ON(ap-&gt;hsm_task_state == HSM_ST_IDLE);</div><div class='ctx'> </div><div class='del'>-	ata_qc_timeout(ata_qc_from_tag(ap, ap-&gt;active_tag));</div><div class='add'>+	/*</div><div class='add'>+	 * This is purely heuristic.  This is a fast path.</div><div class='add'>+	 * Sometimes when we enter, BSY will be cleared in</div><div class='add'>+	 * a chk-status or two.  If not, the drive is probably seeking</div><div class='add'>+	 * or something.  Snooze for a couple msecs, then</div><div class='add'>+	 * chk-status again.  If still busy, queue delayed work.</div><div class='add'>+	 */</div><div class='add'>+	status = ata_busy_wait(ap, ATA_BUSY, 5);</div><div class='add'>+	if (status &amp; ATA_BUSY) {</div><div class='add'>+		msleep(2);</div><div class='add'>+		status = ata_busy_wait(ap, ATA_BUSY, 10);</div><div class='add'>+		if (status &amp; ATA_BUSY) {</div><div class='add'>+			ata_port_queue_task(ap, ata_pio_task, qc, ATA_SHORT_PAUSE);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	DPRINTK("EXIT\n");</div><div class='add'>+	/* move the HSM */</div><div class='add'>+	poll_next = ata_hsm_move(ap, qc, status, 1);</div><div class='add'>+</div><div class='add'>+	/* another command or interrupt handler</div><div class='add'>+	 * may be running at this point.</div><div class='add'>+	 */</div><div class='add'>+	if (poll_next)</div><div class='add'>+		goto fsm_start;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3888,9 +4292,14 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)</div><div class='ctx'> 	struct ata_queued_cmd *qc = NULL;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_QUEUE; i++)</div><div class='del'>-		if (!test_and_set_bit(i, &amp;ap-&gt;qactive)) {</div><div class='del'>-			qc = ata_qc_from_tag(ap, i);</div><div class='add'>+	/* no command while frozen */</div><div class='add'>+	if (unlikely(ap-&gt;pflags &amp; ATA_PFLAG_FROZEN))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* the last tag is reserved for internal command. */</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_QUEUE - 1; i++)</div><div class='add'>+		if (!test_and_set_bit(i, &amp;ap-&gt;qc_allocated)) {</div><div class='add'>+			qc = __ata_qc_from_tag(ap, i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -3902,16 +4311,15 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_qc_new_init - Request an available ATA command, and initialize it</div><div class='del'>- *	@ap: Port associated with device @dev</div><div class='ctx'>  *	@dev: Device from whom we request an available command structure</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	None.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,</div><div class='del'>-				      struct ata_device *dev)</div><div class='add'>+struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='ctx'> 	struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='ctx'> 	qc = ata_qc_new(ap);</div><div class='hunk'>@@ -3946,36 +4354,153 @@ void ata_qc_free(struct ata_queued_cmd *qc)</div><div class='ctx'> 	qc-&gt;flags = 0;</div><div class='ctx'> 	tag = qc-&gt;tag;</div><div class='ctx'> 	if (likely(ata_tag_valid(tag))) {</div><div class='del'>-		if (tag == ap-&gt;active_tag)</div><div class='del'>-			ap-&gt;active_tag = ATA_TAG_POISON;</div><div class='ctx'> 		qc-&gt;tag = ATA_TAG_POISON;</div><div class='del'>-		clear_bit(tag, &amp;ap-&gt;qactive);</div><div class='add'>+		clear_bit(tag, &amp;ap-&gt;qc_allocated);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __ata_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+</div><div class='ctx'> 	WARN_ON(qc == NULL);	/* ata_qc_from_tag _might_ return NULL */</div><div class='ctx'> 	WARN_ON(!(qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE));</div><div class='ctx'> </div><div class='ctx'> 	if (likely(qc-&gt;flags &amp; ATA_QCFLAG_DMAMAP))</div><div class='ctx'> 		ata_sg_clean(qc);</div><div class='ctx'> </div><div class='add'>+	/* command should be marked inactive atomically with qc completion */</div><div class='add'>+	if (qc-&gt;tf.protocol == ATA_PROT_NCQ)</div><div class='add'>+		ap-&gt;sactive &amp;= ~(1 &lt;&lt; qc-&gt;tag);</div><div class='add'>+	else</div><div class='add'>+		ap-&gt;active_tag = ATA_TAG_POISON;</div><div class='add'>+</div><div class='ctx'> 	/* atapi: mark qc as inactive to prevent the interrupt handler</div><div class='ctx'> 	 * from completing the command twice later, before the error handler</div><div class='ctx'> 	 * is called. (when rc != 0 and atapi request sense is needed)</div><div class='ctx'> 	 */</div><div class='ctx'> 	qc-&gt;flags &amp;= ~ATA_QCFLAG_ACTIVE;</div><div class='add'>+	ap-&gt;qc_active &amp;= ~(1 &lt;&lt; qc-&gt;tag);</div><div class='ctx'> </div><div class='ctx'> 	/* call completion callback */</div><div class='ctx'> 	qc-&gt;complete_fn(qc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ata_qc_complete - Complete an active ATA command</div><div class='add'>+ *	@qc: Command to complete</div><div class='add'>+ *	@err_mask: ATA Status register contents</div><div class='add'>+ *</div><div class='add'>+ *	Indicate to the mid and upper layers that an ATA</div><div class='add'>+ *	command has completed, with either an ok or not-ok status.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ */</div><div class='add'>+void ata_qc_complete(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+</div><div class='add'>+	/* XXX: New EH and old EH use different mechanisms to</div><div class='add'>+	 * synchronize EH with regular execution path.</div><div class='add'>+	 *</div><div class='add'>+	 * In new EH, a failed qc is marked with ATA_QCFLAG_FAILED.</div><div class='add'>+	 * Normal execution path is responsible for not accessing a</div><div class='add'>+	 * failed qc.  libata core enforces the rule by returning NULL</div><div class='add'>+	 * from ata_qc_from_tag() for failed qcs.</div><div class='add'>+	 *</div><div class='add'>+	 * Old EH depends on ata_qc_complete() nullifying completion</div><div class='add'>+	 * requests if ATA_QCFLAG_EH_SCHEDULED is set.  Old EH does</div><div class='add'>+	 * not synchronize with interrupt handler.  Only PIO task is</div><div class='add'>+	 * taken care of.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+		WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_FROZEN);</div><div class='add'>+</div><div class='add'>+		if (unlikely(qc-&gt;err_mask))</div><div class='add'>+			qc-&gt;flags |= ATA_QCFLAG_FAILED;</div><div class='add'>+</div><div class='add'>+		if (unlikely(qc-&gt;flags &amp; ATA_QCFLAG_FAILED)) {</div><div class='add'>+			if (!ata_tag_internal(qc-&gt;tag)) {</div><div class='add'>+				/* always fill result TF for failed qc */</div><div class='add'>+				ap-&gt;ops-&gt;tf_read(ap, &amp;qc-&gt;result_tf);</div><div class='add'>+				ata_qc_schedule_eh(qc);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* read result TF if requested */</div><div class='add'>+		if (qc-&gt;flags &amp; ATA_QCFLAG_RESULT_TF)</div><div class='add'>+			ap-&gt;ops-&gt;tf_read(ap, &amp;qc-&gt;result_tf);</div><div class='add'>+</div><div class='add'>+		__ata_qc_complete(qc);</div><div class='add'>+	} else {</div><div class='add'>+		if (qc-&gt;flags &amp; ATA_QCFLAG_EH_SCHEDULED)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* read result TF if failed or requested */</div><div class='add'>+		if (qc-&gt;err_mask || qc-&gt;flags &amp; ATA_QCFLAG_RESULT_TF)</div><div class='add'>+			ap-&gt;ops-&gt;tf_read(ap, &amp;qc-&gt;result_tf);</div><div class='add'>+</div><div class='add'>+		__ata_qc_complete(qc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_qc_complete_multiple - Complete multiple qcs successfully</div><div class='add'>+ *	@ap: port in question</div><div class='add'>+ *	@qc_active: new qc_active mask</div><div class='add'>+ *	@finish_qc: LLDD callback invoked before completing a qc</div><div class='add'>+ *</div><div class='add'>+ *	Complete in-flight commands.  This functions is meant to be</div><div class='add'>+ *	called from low-level driver's interrupt routine to complete</div><div class='add'>+ *	requests normally.  ap-&gt;qc_active and @qc_active is compared</div><div class='add'>+ *	and commands are completed accordingly.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Number of completed commands on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int ata_qc_complete_multiple(struct ata_port *ap, u32 qc_active,</div><div class='add'>+			     void (*finish_qc)(struct ata_queued_cmd *))</div><div class='add'>+{</div><div class='add'>+	int nr_done = 0;</div><div class='add'>+	u32 done_mask;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	done_mask = ap-&gt;qc_active ^ qc_active;</div><div class='add'>+</div><div class='add'>+	if (unlikely(done_mask &amp; qc_active)) {</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "illegal qc_active transition "</div><div class='add'>+				"(%08x-&gt;%08x)\n", ap-&gt;qc_active, qc_active);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_QUEUE; i++) {</div><div class='add'>+		struct ata_queued_cmd *qc;</div><div class='add'>+</div><div class='add'>+		if (!(done_mask &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((qc = ata_qc_from_tag(ap, i))) {</div><div class='add'>+			if (finish_qc)</div><div class='add'>+				finish_qc(qc);</div><div class='add'>+			ata_qc_complete(qc);</div><div class='add'>+			nr_done++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nr_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int ata_should_dma_map(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> </div><div class='ctx'> 	switch (qc-&gt;tf.protocol) {</div><div class='add'>+	case ATA_PROT_NCQ:</div><div class='ctx'> 	case ATA_PROT_DMA:</div><div class='ctx'> 	case ATA_PROT_ATAPI_DMA:</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -4010,8 +4535,22 @@ void ata_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> </div><div class='del'>-	qc-&gt;ap-&gt;active_tag = qc-&gt;tag;</div><div class='add'>+	/* Make sure only one non-NCQ command is outstanding.  The</div><div class='add'>+	 * check is skipped for old EH because it reuses active qc to</div><div class='add'>+	 * request ATAPI sense.</div><div class='add'>+	 */</div><div class='add'>+	WARN_ON(ap-&gt;ops-&gt;error_handler &amp;&amp; ata_tag_valid(ap-&gt;active_tag));</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;tf.protocol == ATA_PROT_NCQ) {</div><div class='add'>+		WARN_ON(ap-&gt;sactive &amp; (1 &lt;&lt; qc-&gt;tag));</div><div class='add'>+		ap-&gt;sactive |= 1 &lt;&lt; qc-&gt;tag;</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(ap-&gt;sactive);</div><div class='add'>+		ap-&gt;active_tag = qc-&gt;tag;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	qc-&gt;flags |= ATA_QCFLAG_ACTIVE;</div><div class='add'>+	ap-&gt;qc_active |= 1 &lt;&lt; qc-&gt;tag;</div><div class='ctx'> </div><div class='ctx'> 	if (ata_should_dma_map(qc)) {</div><div class='ctx'> 		if (qc-&gt;flags &amp; ATA_QCFLAG_SG) {</div><div class='hunk'>@@ -4061,43 +4600,105 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> </div><div class='add'>+	/* Use polling pio if the LLD doesn't handle</div><div class='add'>+	 * interrupt driven pio and atapi CDB interrupt.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_PIO_POLLING) {</div><div class='add'>+		switch (qc-&gt;tf.protocol) {</div><div class='add'>+		case ATA_PROT_PIO:</div><div class='add'>+		case ATA_PROT_ATAPI:</div><div class='add'>+		case ATA_PROT_ATAPI_NODATA:</div><div class='add'>+			qc-&gt;tf.flags |= ATA_TFLAG_POLLING;</div><div class='add'>+			break;</div><div class='add'>+		case ATA_PROT_ATAPI_DMA:</div><div class='add'>+			if (qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR)</div><div class='add'>+				/* see ata_dma_blacklisted() */</div><div class='add'>+				BUG();</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* select the device */</div><div class='ctx'> 	ata_dev_select(ap, qc-&gt;dev-&gt;devno, 1, 0);</div><div class='ctx'> </div><div class='add'>+	/* start the command */</div><div class='ctx'> 	switch (qc-&gt;tf.protocol) {</div><div class='ctx'> 	case ATA_PROT_NODATA:</div><div class='add'>+		if (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)</div><div class='add'>+			ata_qc_set_polling(qc);</div><div class='add'>+</div><div class='ctx'> 		ata_tf_to_host(ap, &amp;qc-&gt;tf);</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='add'>+</div><div class='add'>+		if (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)</div><div class='add'>+			ata_port_queue_task(ap, ata_pio_task, qc, 0);</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ATA_PROT_DMA:</div><div class='add'>+		WARN_ON(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING);</div><div class='add'>+</div><div class='ctx'> 		ap-&gt;ops-&gt;tf_load(ap, &amp;qc-&gt;tf);	 /* load tf registers */</div><div class='ctx'> 		ap-&gt;ops-&gt;bmdma_setup(qc);	    /* set up bmdma */</div><div class='ctx'> 		ap-&gt;ops-&gt;bmdma_start(qc);	    /* initiate bmdma */</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_LAST;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case ATA_PROT_PIO: /* load tf registers, initiate polling pio */</div><div class='del'>-		ata_qc_set_polling(qc);</div><div class='del'>-		ata_tf_to_host(ap, &amp;qc-&gt;tf);</div><div class='del'>-		ap-&gt;hsm_task_state = HSM_ST;</div><div class='del'>-		ata_port_queue_task(ap, ata_pio_task, ap, 0);</div><div class='del'>-		break;</div><div class='add'>+	case ATA_PROT_PIO:</div><div class='add'>+		if (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)</div><div class='add'>+			ata_qc_set_polling(qc);</div><div class='ctx'> </div><div class='del'>-	case ATA_PROT_ATAPI:</div><div class='del'>-		ata_qc_set_polling(qc);</div><div class='ctx'> 		ata_tf_to_host(ap, &amp;qc-&gt;tf);</div><div class='del'>-		ata_port_queue_task(ap, atapi_packet_task, ap, 0);</div><div class='add'>+</div><div class='add'>+		if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE) {</div><div class='add'>+			/* PIO data out protocol */</div><div class='add'>+			ap-&gt;hsm_task_state = HSM_ST_FIRST;</div><div class='add'>+			ata_port_queue_task(ap, ata_pio_task, qc, 0);</div><div class='add'>+</div><div class='add'>+			/* always send first data block using</div><div class='add'>+			 * the ata_pio_task() codepath.</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			/* PIO data in protocol */</div><div class='add'>+			ap-&gt;hsm_task_state = HSM_ST;</div><div class='add'>+</div><div class='add'>+			if (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)</div><div class='add'>+				ata_port_queue_task(ap, ata_pio_task, qc, 0);</div><div class='add'>+</div><div class='add'>+			/* if polling, ata_pio_task() handles the rest.</div><div class='add'>+			 * otherwise, interrupt handler takes over from here.</div><div class='add'>+			 */</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case ATA_PROT_ATAPI:</div><div class='ctx'> 	case ATA_PROT_ATAPI_NODATA:</div><div class='del'>-		ap-&gt;flags |= ATA_FLAG_NOINTR;</div><div class='add'>+		if (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)</div><div class='add'>+			ata_qc_set_polling(qc);</div><div class='add'>+</div><div class='ctx'> 		ata_tf_to_host(ap, &amp;qc-&gt;tf);</div><div class='del'>-		ata_port_queue_task(ap, atapi_packet_task, ap, 0);</div><div class='add'>+</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_FIRST;</div><div class='add'>+</div><div class='add'>+		/* send cdb by polling if no cdb interrupt */</div><div class='add'>+		if ((!(qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR)) ||</div><div class='add'>+		    (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING))</div><div class='add'>+			ata_port_queue_task(ap, ata_pio_task, qc, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ATA_PROT_ATAPI_DMA:</div><div class='del'>-		ap-&gt;flags |= ATA_FLAG_NOINTR;</div><div class='add'>+		WARN_ON(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING);</div><div class='add'>+</div><div class='ctx'> 		ap-&gt;ops-&gt;tf_load(ap, &amp;qc-&gt;tf);	 /* load tf registers */</div><div class='ctx'> 		ap-&gt;ops-&gt;bmdma_setup(qc);	    /* set up bmdma */</div><div class='del'>-		ata_port_queue_task(ap, atapi_packet_task, ap, 0);</div><div class='add'>+		ap-&gt;hsm_task_state = HSM_ST_FIRST;</div><div class='add'>+</div><div class='add'>+		/* send cdb by polling if no cdb interrupt */</div><div class='add'>+		if (!(qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR))</div><div class='add'>+			ata_port_queue_task(ap, ata_pio_task, qc, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -4127,52 +4728,66 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)</div><div class='ctx'> inline unsigned int ata_host_intr (struct ata_port *ap,</div><div class='ctx'> 				   struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='del'>-	u8 status, host_stat;</div><div class='add'>+	u8 status, host_stat = 0;</div><div class='ctx'> </div><div class='del'>-	switch (qc-&gt;tf.protocol) {</div><div class='add'>+	VPRINTK("ata%u: protocol %d task_state %d\n",</div><div class='add'>+		ap-&gt;id, qc-&gt;tf.protocol, ap-&gt;hsm_task_state);</div><div class='ctx'> </div><div class='del'>-	case ATA_PROT_DMA:</div><div class='del'>-	case ATA_PROT_ATAPI_DMA:</div><div class='del'>-	case ATA_PROT_ATAPI:</div><div class='del'>-		/* check status of DMA engine */</div><div class='del'>-		host_stat = ap-&gt;ops-&gt;bmdma_status(ap);</div><div class='del'>-		VPRINTK("ata%u: host_stat 0x%X\n", ap-&gt;id, host_stat);</div><div class='del'>-</div><div class='del'>-		/* if it's not our irq... */</div><div class='del'>-		if (!(host_stat &amp; ATA_DMA_INTR))</div><div class='del'>-			goto idle_irq;</div><div class='del'>-</div><div class='del'>-		/* before we do anything else, clear DMA-Start bit */</div><div class='del'>-		ap-&gt;ops-&gt;bmdma_stop(qc);</div><div class='del'>-</div><div class='del'>-		/* fall through */</div><div class='del'>-</div><div class='del'>-	case ATA_PROT_ATAPI_NODATA:</div><div class='del'>-	case ATA_PROT_NODATA:</div><div class='del'>-		/* check altstatus */</div><div class='del'>-		status = ata_altstatus(ap);</div><div class='del'>-		if (status &amp; ATA_BUSY)</div><div class='del'>-			goto idle_irq;</div><div class='add'>+	/* Check whether we are expecting interrupt in this state */</div><div class='add'>+	switch (ap-&gt;hsm_task_state) {</div><div class='add'>+	case HSM_ST_FIRST:</div><div class='add'>+		/* Some pre-ATAPI-4 devices assert INTRQ</div><div class='add'>+		 * at this state when ready to receive CDB.</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='del'>-		/* check main status, clearing INTRQ */</div><div class='del'>-		status = ata_chk_status(ap);</div><div class='del'>-		if (unlikely(status &amp; ATA_BUSY))</div><div class='add'>+		/* Check the ATA_DFLAG_CDB_INTR flag is enough here.</div><div class='add'>+		 * The flag was turned on only for atapi devices.</div><div class='add'>+		 * No need to check is_atapi_taskfile(&amp;qc-&gt;tf) again.</div><div class='add'>+		 */</div><div class='add'>+		if (!(qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR))</div><div class='ctx'> 			goto idle_irq;</div><div class='del'>-		DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",</div><div class='del'>-			ap-&gt;id, qc-&gt;tf.protocol, status);</div><div class='del'>-</div><div class='del'>-		/* ack bmdma irq events */</div><div class='del'>-		ap-&gt;ops-&gt;irq_clear(ap);</div><div class='del'>-</div><div class='del'>-		/* complete taskfile transaction */</div><div class='del'>-		qc-&gt;err_mask |= ac_err_mask(status);</div><div class='del'>-		ata_qc_complete(qc);</div><div class='ctx'> 		break;</div><div class='del'>-</div><div class='add'>+	case HSM_ST_LAST:</div><div class='add'>+		if (qc-&gt;tf.protocol == ATA_PROT_DMA ||</div><div class='add'>+		    qc-&gt;tf.protocol == ATA_PROT_ATAPI_DMA) {</div><div class='add'>+			/* check status of DMA engine */</div><div class='add'>+			host_stat = ap-&gt;ops-&gt;bmdma_status(ap);</div><div class='add'>+			VPRINTK("ata%u: host_stat 0x%X\n", ap-&gt;id, host_stat);</div><div class='add'>+</div><div class='add'>+			/* if it's not our irq... */</div><div class='add'>+			if (!(host_stat &amp; ATA_DMA_INTR))</div><div class='add'>+				goto idle_irq;</div><div class='add'>+</div><div class='add'>+			/* before we do anything else, clear DMA-Start bit */</div><div class='add'>+			ap-&gt;ops-&gt;bmdma_stop(qc);</div><div class='add'>+</div><div class='add'>+			if (unlikely(host_stat &amp; ATA_DMA_ERR)) {</div><div class='add'>+				/* error when transfering data to/from memory */</div><div class='add'>+				qc-&gt;err_mask |= AC_ERR_HOST_BUS;</div><div class='add'>+				ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HSM_ST:</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto idle_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* check altstatus */</div><div class='add'>+	status = ata_altstatus(ap);</div><div class='add'>+	if (status &amp; ATA_BUSY)</div><div class='add'>+		goto idle_irq;</div><div class='add'>+</div><div class='add'>+	/* check main status, clearing INTRQ */</div><div class='add'>+	status = ata_chk_status(ap);</div><div class='add'>+	if (unlikely(status &amp; ATA_BUSY))</div><div class='add'>+		goto idle_irq;</div><div class='add'>+</div><div class='add'>+	/* ack bmdma irq events */</div><div class='add'>+	ap-&gt;ops-&gt;irq_clear(ap);</div><div class='add'>+</div><div class='add'>+	ata_hsm_move(ap, qc, status, 0);</div><div class='ctx'> 	return 1;	/* irq handled */</div><div class='ctx'> </div><div class='ctx'> idle_irq:</div><div class='hunk'>@@ -4181,7 +4796,7 @@ idle_irq:</div><div class='ctx'> #ifdef ATA_IRQ_TRAP</div><div class='ctx'> 	if ((ap-&gt;stats.idle_irq % 1000) == 0) {</div><div class='ctx'> 		ata_irq_ack(ap, 0); /* debug trap */</div><div class='del'>-		printk(KERN_WARNING "ata%d: irq trap\n", ap-&gt;id);</div><div class='add'>+		ata_port_printk(ap, KERN_WARNING, "irq trap\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4219,11 +4834,11 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 		ap = host_set-&gt;ports[i];</div><div class='ctx'> 		if (ap &amp;&amp;</div><div class='del'>-		    !(ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {</div><div class='add'>+		    !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 			struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='ctx'> 			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN)) &amp;&amp;</div><div class='add'>+			if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)) &amp;&amp;</div><div class='ctx'> 			    (qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE))</div><div class='ctx'> 				handled |= ata_host_intr(ap, qc);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4234,33 +4849,147 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs)</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	sata_scr_valid - test whether SCRs are accessible</div><div class='add'>+ *	@ap: ATA port to test SCR accessibility for</div><div class='add'>+ *</div><div class='add'>+ *	Test whether SCRs are accessible for @ap.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if SCRs are accessible, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+int sata_scr_valid(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	return ap-&gt;cbl == ATA_CBL_SATA &amp;&amp; ap-&gt;ops-&gt;scr_read;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Execute a 'simple' command, that only consists of the opcode 'cmd' itself,</div><div class='del'>- * without filling any other registers</div><div class='add'>+/**</div><div class='add'>+ *	sata_scr_read - read SCR register of the specified port</div><div class='add'>+ *	@ap: ATA port to read SCR for</div><div class='add'>+ *	@reg: SCR to read</div><div class='add'>+ *	@val: Place to store read value</div><div class='add'>+ *</div><div class='add'>+ *	Read SCR register @reg of @ap into *@val.  This function is</div><div class='add'>+ *	guaranteed to succeed if the cable type of the port is SATA</div><div class='add'>+ *	and the port implements -&gt;scr_read.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, negative errno on failure.</div><div class='ctx'>  */</div><div class='del'>-static int ata_do_simple_cmd(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-			     u8 cmd)</div><div class='add'>+int sata_scr_read(struct ata_port *ap, int reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	struct ata_taskfile tf;</div><div class='del'>-	int err;</div><div class='add'>+	if (sata_scr_valid(ap)) {</div><div class='add'>+		*val = ap-&gt;ops-&gt;scr_read(ap, reg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ata_tf_init(ap, &amp;tf, dev-&gt;devno);</div><div class='add'>+/**</div><div class='add'>+ *	sata_scr_write - write SCR register of the specified port</div><div class='add'>+ *	@ap: ATA port to write SCR for</div><div class='add'>+ *	@reg: SCR to write</div><div class='add'>+ *	@val: value to write</div><div class='add'>+ *</div><div class='add'>+ *	Write @val to SCR register @reg of @ap.  This function is</div><div class='add'>+ *	guaranteed to succeed if the cable type of the port is SATA</div><div class='add'>+ *	and the port implements -&gt;scr_read.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, negative errno on failure.</div><div class='add'>+ */</div><div class='add'>+int sata_scr_write(struct ata_port *ap, int reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (sata_scr_valid(ap)) {</div><div class='add'>+		ap-&gt;ops-&gt;scr_write(ap, reg, val);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	tf.command = cmd;</div><div class='del'>-	tf.flags |= ATA_TFLAG_DEVICE;</div><div class='del'>-	tf.protocol = ATA_PROT_NODATA;</div><div class='add'>+/**</div><div class='add'>+ *	sata_scr_write_flush - write SCR register of the specified port and flush</div><div class='add'>+ *	@ap: ATA port to write SCR for</div><div class='add'>+ *	@reg: SCR to write</div><div class='add'>+ *	@val: value to write</div><div class='add'>+ *</div><div class='add'>+ *	This function is identical to sata_scr_write() except that this</div><div class='add'>+ *	function performs flush after writing to the register.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, negative errno on failure.</div><div class='add'>+ */</div><div class='add'>+int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (sata_scr_valid(ap)) {</div><div class='add'>+		ap-&gt;ops-&gt;scr_write(ap, reg, val);</div><div class='add'>+		ap-&gt;ops-&gt;scr_read(ap, reg);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_online - test whether the given port is online</div><div class='add'>+ *	@ap: ATA port to test</div><div class='add'>+ *</div><div class='add'>+ *	Test whether @ap is online.  Note that this function returns 0</div><div class='add'>+ *	if online status of @ap cannot be obtained, so</div><div class='add'>+ *	ata_port_online(ap) != !ata_port_offline(ap).</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if the port online status is available and online.</div><div class='add'>+ */</div><div class='add'>+int ata_port_online(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u32 sstatus;</div><div class='add'>+</div><div class='add'>+	if (!sata_scr_read(ap, SCR_STATUS, &amp;sstatus) &amp;&amp; (sstatus &amp; 0xf) == 0x3)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	err = ata_exec_internal(ap, dev, &amp;tf, DMA_NONE, NULL, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "%s: ata command failed: %d\n",</div><div class='del'>-				__FUNCTION__, err);</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_offline - test whether the given port is offline</div><div class='add'>+ *	@ap: ATA port to test</div><div class='add'>+ *</div><div class='add'>+ *	Test whether @ap is offline.  Note that this function returns</div><div class='add'>+ *	0 if offline status of @ap cannot be obtained, so</div><div class='add'>+ *	ata_port_online(ap) != !ata_port_offline(ap).</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if the port offline status is available and offline.</div><div class='add'>+ */</div><div class='add'>+int ata_port_offline(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	u32 sstatus;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	if (!sata_scr_read(ap, SCR_STATUS, &amp;sstatus) &amp;&amp; (sstatus &amp; 0xf) != 0x3)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ata_flush_cache(struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+int ata_flush_cache(struct ata_device *dev)</div><div class='ctx'> {</div><div class='add'>+	unsigned int err_mask;</div><div class='ctx'> 	u8 cmd;</div><div class='ctx'> </div><div class='ctx'> 	if (!ata_try_flush_cache(dev))</div><div class='hunk'>@@ -4271,64 +5000,129 @@ static int ata_flush_cache(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd = ATA_CMD_FLUSH;</div><div class='ctx'> </div><div class='del'>-	return ata_do_simple_cmd(ap, dev, cmd);</div><div class='del'>-}</div><div class='add'>+	err_mask = ata_do_simple_cmd(dev, cmd);</div><div class='add'>+	if (err_mask) {</div><div class='add'>+		ata_dev_printk(dev, KERN_ERR, "failed to flush cache\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static int ata_standby_drive(struct ata_port *ap, struct ata_device *dev)</div><div class='del'>-{</div><div class='del'>-	return ata_do_simple_cmd(ap, dev, ATA_CMD_STANDBYNOW1);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ata_start_drive(struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+static int ata_host_set_request_pm(struct ata_host_set *host_set,</div><div class='add'>+				   pm_message_t mesg, unsigned int action,</div><div class='add'>+				   unsigned int ehi_flags, int wait)</div><div class='ctx'> {</div><div class='del'>-	return ata_do_simple_cmd(ap, dev, ATA_CMD_IDLEIMMEDIATE);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='add'>+		struct ata_port *ap = host_set-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		/* Previous resume operation might still be in</div><div class='add'>+		 * progress.  Wait for PM_PENDING to clear.</div><div class='add'>+		 */</div><div class='add'>+		if (ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING) {</div><div class='add'>+			ata_port_wait_eh(ap);</div><div class='add'>+			WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* request PM ops to EH */</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		ap-&gt;pm_mesg = mesg;</div><div class='add'>+		if (wait) {</div><div class='add'>+			rc = 0;</div><div class='add'>+			ap-&gt;pm_result = &amp;rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ap-&gt;pflags |= ATA_PFLAG_PM_PENDING;</div><div class='add'>+		ap-&gt;eh_info.action |= action;</div><div class='add'>+		ap-&gt;eh_info.flags |= ehi_flags;</div><div class='add'>+</div><div class='add'>+		ata_port_schedule_eh(ap);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		/* wait and check result */</div><div class='add'>+		if (wait) {</div><div class='add'>+			ata_port_wait_eh(ap);</div><div class='add'>+			WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_device_resume - wakeup a previously suspended devices</div><div class='del'>- *	@ap: port the device is connected to</div><div class='del'>- *	@dev: the device to resume</div><div class='add'>+ *	ata_host_set_suspend - suspend host_set</div><div class='add'>+ *	@host_set: host_set to suspend</div><div class='add'>+ *	@mesg: PM message</div><div class='add'>+ *</div><div class='add'>+ *	Suspend @host_set.  Actual operation is performed by EH.  This</div><div class='add'>+ *	function requests EH to perform PM operations and waits for EH</div><div class='add'>+ *	to finish.</div><div class='ctx'>  *</div><div class='del'>- *	Kick the drive back into action, by sending it an idle immediate</div><div class='del'>- *	command and making sure its transfer mode matches between drive</div><div class='del'>- *	and host.</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='ctx'>  *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='ctx'>  */</div><div class='del'>-int ata_device_resume(struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+int ata_host_set_suspend(struct ata_host_set *host_set, pm_message_t mesg)</div><div class='ctx'> {</div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_SUSPENDED) {</div><div class='del'>-		ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);</div><div class='del'>-		ap-&gt;flags &amp;= ~ATA_FLAG_SUSPENDED;</div><div class='del'>-		ata_set_mode(ap);</div><div class='add'>+	int i, j, rc;</div><div class='add'>+</div><div class='add'>+	rc = ata_host_set_request_pm(host_set, mesg, 0, ATA_EHI_QUIET, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/* EH is quiescent now.  Fail if we have any ready device.</div><div class='add'>+	 * This happens if hotplug occurs between completion of device</div><div class='add'>+	 * suspension and here.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='add'>+		struct ata_port *ap = host_set-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ATA_MAX_DEVICES; j++) {</div><div class='add'>+			struct ata_device *dev = &amp;ap-&gt;device[j];</div><div class='add'>+</div><div class='add'>+			if (ata_dev_ready(dev)) {</div><div class='add'>+				ata_port_printk(ap, KERN_WARNING,</div><div class='add'>+						"suspend failed, device %d "</div><div class='add'>+						"still active\n", dev-&gt;devno);</div><div class='add'>+				rc = -EBUSY;</div><div class='add'>+				goto fail;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!ata_dev_present(dev))</div><div class='del'>-		return 0;</div><div class='del'>-	if (dev-&gt;class == ATA_DEV_ATA)</div><div class='del'>-		ata_start_drive(ap, dev);</div><div class='ctx'> </div><div class='add'>+	host_set-&gt;dev-&gt;power.power_state = mesg;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	ata_host_set_resume(host_set);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_device_suspend - prepare a device for suspend</div><div class='del'>- *	@ap: port the device is connected to</div><div class='del'>- *	@dev: the device to suspend</div><div class='del'>- *	@state: target power management state</div><div class='add'>+ *	ata_host_set_resume - resume host_set</div><div class='add'>+ *	@host_set: host_set to resume</div><div class='ctx'>  *</div><div class='del'>- *	Flush the cache on the drive, if appropriate, then issue a</div><div class='del'>- *	standbynow command.</div><div class='add'>+ *	Resume @host_set.  Actual operation is performed by EH.  This</div><div class='add'>+ *	function requests EH to perform PM operations and returns.</div><div class='add'>+ *	Note that all resume operations are performed parallely.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='ctx'>  */</div><div class='del'>-int ata_device_suspend(struct ata_port *ap, struct ata_device *dev, pm_message_t state)</div><div class='add'>+void ata_host_set_resume(struct ata_host_set *host_set)</div><div class='ctx'> {</div><div class='del'>-	if (!ata_dev_present(dev))</div><div class='del'>-		return 0;</div><div class='del'>-	if (dev-&gt;class == ATA_DEV_ATA)</div><div class='del'>-		ata_flush_cache(ap, dev);</div><div class='del'>-</div><div class='del'>-	if (state.event != PM_EVENT_FREEZE)</div><div class='del'>-		ata_standby_drive(ap, dev);</div><div class='del'>-	ap-&gt;flags |= ATA_FLAG_SUSPENDED;</div><div class='del'>-	return 0;</div><div class='add'>+	ata_host_set_request_pm(host_set, PMSG_ON, ATA_EH_SOFTRESET,</div><div class='add'>+				ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET, 0);</div><div class='add'>+	host_set-&gt;dev-&gt;power.power_state = PMSG_ON;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4414,6 +5208,38 @@ static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	ata_dev_init - Initialize an ata_device structure</div><div class='add'>+ *	@dev: Device structure to initialize</div><div class='add'>+ *</div><div class='add'>+ *	Initialize @dev in preparation for probing.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ */</div><div class='add'>+void ata_dev_init(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* SATA spd limit is bound to the first device */</div><div class='add'>+	ap-&gt;sata_spd_limit = ap-&gt;hw_sata_spd_limit;</div><div class='add'>+</div><div class='add'>+	/* High bits of dev-&gt;flags are used to record warm plug</div><div class='add'>+	 * requests which occur asynchronously.  Synchronize using</div><div class='add'>+	 * host_set lock.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	dev-&gt;flags &amp;= ~ATA_DFLAG_INIT_MASK;</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,</div><div class='add'>+	       sizeof(*dev) - ATA_DEVICE_CLEAR_OFFSET);</div><div class='add'>+	dev-&gt;pio_mask = UINT_MAX;</div><div class='add'>+	dev-&gt;mwdma_mask = UINT_MAX;</div><div class='add'>+	dev-&gt;udma_mask = UINT_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	ata_host_init - Initialize an ata_port structure</div><div class='ctx'>  *	@ap: Structure to initialize</div><div class='ctx'>  *	@host: associated SCSI mid-layer structure</div><div class='hunk'>@@ -4427,7 +5253,6 @@ static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister)</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	Inherited from caller.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,</div><div class='ctx'> 			  struct ata_host_set *host_set,</div><div class='ctx'> 			  const struct ata_probe_ent *ent, unsigned int port_no)</div><div class='hunk'>@@ -4440,7 +5265,8 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,</div><div class='ctx'> 	host-&gt;unique_id = ata_unique_id++;</div><div class='ctx'> 	host-&gt;max_cmd_len = 12;</div><div class='ctx'> </div><div class='del'>-	ap-&gt;flags = ATA_FLAG_PORT_DISABLED;</div><div class='add'>+	ap-&gt;lock = &amp;host_set-&gt;lock;</div><div class='add'>+	ap-&gt;flags = ATA_FLAG_DISABLED;</div><div class='ctx'> 	ap-&gt;id = host-&gt;unique_id;</div><div class='ctx'> 	ap-&gt;host = host;</div><div class='ctx'> 	ap-&gt;ctl = ATA_DEVCTL_OBS;</div><div class='hunk'>@@ -4454,19 +5280,35 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,</div><div class='ctx'> 	ap-&gt;udma_mask = ent-&gt;udma_mask;</div><div class='ctx'> 	ap-&gt;flags |= ent-&gt;host_flags;</div><div class='ctx'> 	ap-&gt;ops = ent-&gt;port_ops;</div><div class='del'>-	ap-&gt;cbl = ATA_CBL_NONE;</div><div class='add'>+	ap-&gt;hw_sata_spd_limit = UINT_MAX;</div><div class='ctx'> 	ap-&gt;active_tag = ATA_TAG_POISON;</div><div class='ctx'> 	ap-&gt;last_ctl = 0xFF;</div><div class='ctx'> </div><div class='add'>+#if defined(ATA_VERBOSE_DEBUG)</div><div class='add'>+	/* turn on all debugging levels */</div><div class='add'>+	ap-&gt;msg_enable = 0x00FF;</div><div class='add'>+#elif defined(ATA_DEBUG)</div><div class='add'>+	ap-&gt;msg_enable = ATA_MSG_DRV | ATA_MSG_INFO | ATA_MSG_CTL | ATA_MSG_WARN | ATA_MSG_ERR;</div><div class='add'>+#else</div><div class='add'>+	ap-&gt;msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	INIT_WORK(&amp;ap-&gt;port_task, NULL, NULL);</div><div class='add'>+	INIT_WORK(&amp;ap-&gt;hotplug_task, ata_scsi_hotplug, ap);</div><div class='add'>+	INIT_WORK(&amp;ap-&gt;scsi_rescan_task, ata_scsi_dev_rescan, ap);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ap-&gt;eh_done_q);</div><div class='add'>+	init_waitqueue_head(&amp;ap-&gt;eh_wait_q);</div><div class='add'>+</div><div class='add'>+	/* set cable type */</div><div class='add'>+	ap-&gt;cbl = ATA_CBL_NONE;</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_SATA)</div><div class='add'>+		ap-&gt;cbl = ATA_CBL_SATA;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='ctx'> 		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+		dev-&gt;ap = ap;</div><div class='ctx'> 		dev-&gt;devno = i;</div><div class='del'>-		dev-&gt;pio_mask = UINT_MAX;</div><div class='del'>-		dev-&gt;mwdma_mask = UINT_MAX;</div><div class='del'>-		dev-&gt;udma_mask = UINT_MAX;</div><div class='add'>+		ata_dev_init(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef ATA_IRQ_TRAP</div><div class='hunk'>@@ -4502,7 +5344,7 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	if (!ent-&gt;port_ops-&gt;probe_reset &amp;&amp;</div><div class='add'>+	if (!ent-&gt;port_ops-&gt;error_handler &amp;&amp;</div><div class='ctx'> 	    !(ent-&gt;host_flags &amp; (ATA_FLAG_SATA_RESET | ATA_FLAG_SRST))) {</div><div class='ctx'> 		printk(KERN_ERR "ata%u: no reset mechanism available\n",</div><div class='ctx'> 		       port_no);</div><div class='hunk'>@@ -4515,7 +5357,7 @@ static struct ata_port * ata_host_add(const struct ata_probe_ent *ent,</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;transportt = &amp;ata_scsi_transport_template;</div><div class='ctx'> </div><div class='del'>-	ap = (struct ata_port *) &amp;host-&gt;hostdata[0];</div><div class='add'>+	ap = ata_shost_to_port(host);</div><div class='ctx'> </div><div class='ctx'> 	ata_host_init(ap, host, host_set, ent, port_no);</div><div class='ctx'> </div><div class='hunk'>@@ -4548,12 +5390,12 @@ err_out:</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	Number of ports registered.  Zero on error (no ports registered).</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int ata_device_add(const struct ata_probe_ent *ent)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int count = 0, i;</div><div class='ctx'> 	struct device *dev = ent-&gt;dev;</div><div class='ctx'> 	struct ata_host_set *host_set;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> 	/* alloc a container for our list of ATA ports (buses) */</div><div class='hunk'>@@ -4586,18 +5428,18 @@ int ata_device_add(const struct ata_probe_ent *ent)</div><div class='ctx'> 				(ap-&gt;pio_mask &lt;&lt; ATA_SHIFT_PIO);</div><div class='ctx'> </div><div class='ctx'> 		/* print per-port info to dmesg */</div><div class='del'>-		printk(KERN_INFO "ata%u: %cATA max %s cmd 0x%lX ctl 0x%lX "</div><div class='del'>-				 "bmdma 0x%lX irq %lu\n",</div><div class='del'>-			ap-&gt;id,</div><div class='del'>-			ap-&gt;flags &amp; ATA_FLAG_SATA ? 'S' : 'P',</div><div class='del'>-			ata_mode_string(xfer_mode_mask),</div><div class='del'>-	       		ap-&gt;ioaddr.cmd_addr,</div><div class='del'>-	       		ap-&gt;ioaddr.ctl_addr,</div><div class='del'>-	       		ap-&gt;ioaddr.bmdma_addr,</div><div class='del'>-	       		ent-&gt;irq);</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%lX "</div><div class='add'>+				"ctl 0x%lX bmdma 0x%lX irq %lu\n",</div><div class='add'>+				ap-&gt;flags &amp; ATA_FLAG_SATA ? 'S' : 'P',</div><div class='add'>+				ata_mode_string(xfer_mode_mask),</div><div class='add'>+				ap-&gt;ioaddr.cmd_addr,</div><div class='add'>+				ap-&gt;ioaddr.ctl_addr,</div><div class='add'>+				ap-&gt;ioaddr.bmdma_addr,</div><div class='add'>+				ent-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 		ata_chk_status(ap);</div><div class='ctx'> 		host_set-&gt;ops-&gt;irq_clear(ap);</div><div class='add'>+		ata_eh_freeze_port(ap);	/* freeze port before requesting IRQ */</div><div class='ctx'> 		count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4605,41 +5447,74 @@ int ata_device_add(const struct ata_probe_ent *ent)</div><div class='ctx'> 		goto err_free_ret;</div><div class='ctx'> </div><div class='ctx'> 	/* obtain irq, that is shared between channels */</div><div class='del'>-	if (request_irq(ent-&gt;irq, ent-&gt;port_ops-&gt;irq_handler, ent-&gt;irq_flags,</div><div class='del'>-			DRV_NAME, host_set))</div><div class='add'>+	rc = request_irq(ent-&gt;irq, ent-&gt;port_ops-&gt;irq_handler, ent-&gt;irq_flags,</div><div class='add'>+			 DRV_NAME, host_set);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_printk(KERN_ERR, dev, "irq %lu request failed: %d\n",</div><div class='add'>+			   ent-&gt;irq, rc);</div><div class='ctx'> 		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* perform each probe synchronously */</div><div class='ctx'> 	DPRINTK("probe begin\n");</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		struct ata_port *ap;</div><div class='add'>+		u32 scontrol;</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='ctx'> 		ap = host_set-&gt;ports[i];</div><div class='ctx'> </div><div class='del'>-		DPRINTK("ata%u: bus probe begin\n", ap-&gt;id);</div><div class='del'>-		rc = ata_bus_probe(ap);</div><div class='del'>-		DPRINTK("ata%u: bus probe end\n", ap-&gt;id);</div><div class='del'>-</div><div class='del'>-		if (rc) {</div><div class='del'>-			/* FIXME: do something useful here?</div><div class='del'>-			 * Current libata behavior will</div><div class='del'>-			 * tear down everything when</div><div class='del'>-			 * the module is removed</div><div class='del'>-			 * or the h/w is unplugged.</div><div class='del'>-			 */</div><div class='add'>+		/* init sata_spd_limit to the current value */</div><div class='add'>+		if (sata_scr_read(ap, SCR_CONTROL, &amp;scontrol) == 0) {</div><div class='add'>+			int spd = (scontrol &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+			ap-&gt;hw_sata_spd_limit &amp;= (1 &lt;&lt; spd) - 1;</div><div class='ctx'> 		}</div><div class='add'>+		ap-&gt;sata_spd_limit = ap-&gt;hw_sata_spd_limit;</div><div class='ctx'> </div><div class='ctx'> 		rc = scsi_add_host(ap-&gt;host, dev);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			printk(KERN_ERR "ata%u: scsi_add_host failed\n",</div><div class='del'>-			       ap-&gt;id);</div><div class='add'>+			ata_port_printk(ap, KERN_ERR, "scsi_add_host failed\n");</div><div class='ctx'> 			/* FIXME: do something useful here */</div><div class='ctx'> 			/* FIXME: handle unconditional calls to</div><div class='ctx'> 			 * scsi_scan_host and ata_host_remove, below,</div><div class='ctx'> 			 * at the very least</div><div class='ctx'> 			 */</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+			struct ata_eh_info *ehi = &amp;ap-&gt;eh_info;</div><div class='add'>+			unsigned long flags;</div><div class='add'>+</div><div class='add'>+			ata_port_probe(ap);</div><div class='add'>+</div><div class='add'>+			/* kick EH for boot probing */</div><div class='add'>+			spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+			ehi-&gt;probe_mask = (1 &lt;&lt; ATA_MAX_DEVICES) - 1;</div><div class='add'>+			ehi-&gt;action |= ATA_EH_SOFTRESET;</div><div class='add'>+			ehi-&gt;flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;</div><div class='add'>+</div><div class='add'>+			ap-&gt;pflags |= ATA_PFLAG_LOADING;</div><div class='add'>+			ata_port_schedule_eh(ap);</div><div class='add'>+</div><div class='add'>+			spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+			/* wait for EH to finish */</div><div class='add'>+			ata_port_wait_eh(ap);</div><div class='add'>+		} else {</div><div class='add'>+			DPRINTK("ata%u: bus probe begin\n", ap-&gt;id);</div><div class='add'>+			rc = ata_bus_probe(ap);</div><div class='add'>+			DPRINTK("ata%u: bus probe end\n", ap-&gt;id);</div><div class='add'>+</div><div class='add'>+			if (rc) {</div><div class='add'>+				/* FIXME: do something useful here?</div><div class='add'>+				 * Current libata behavior will</div><div class='add'>+				 * tear down everything when</div><div class='add'>+				 * the module is removed</div><div class='add'>+				 * or the h/w is unplugged.</div><div class='add'>+				 */</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* probes are done, now scan each port's disk(s) */</div><div class='hunk'>@@ -4667,6 +5542,63 @@ err_free_ret:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	ata_port_detach - Detach ATA port in prepration of device removal</div><div class='add'>+ *	@ap: ATA port to be detached</div><div class='add'>+ *</div><div class='add'>+ *	Detach all ATA devices and the associated SCSI devices of @ap;</div><div class='add'>+ *	then, remove the associated SCSI host.  @ap is guaranteed to</div><div class='add'>+ *	be quiescent on return from this function.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+void ata_port_detach(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* tell EH we're leaving &amp; flush EH */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	ap-&gt;pflags |= ATA_PFLAG_UNLOADING;</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ata_port_wait_eh(ap);</div><div class='add'>+</div><div class='add'>+	/* EH is now guaranteed to see UNLOADING, so no new device</div><div class='add'>+	 * will be attached.  Disable all existing devices.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		ata_dev_disable(&amp;ap-&gt;device[i]);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Final freeze &amp; EH.  All in-flight commands are aborted.  EH</div><div class='add'>+	 * will be skipped and retrials will be terminated with bad</div><div class='add'>+	 * target.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	ata_port_freeze(ap);	/* won't be thawed */</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ata_port_wait_eh(ap);</div><div class='add'>+</div><div class='add'>+	/* Flush hotplug task.  The sequence is similar to</div><div class='add'>+	 * ata_port_flush_task().</div><div class='add'>+	 */</div><div class='add'>+	flush_workqueue(ata_aux_wq);</div><div class='add'>+	cancel_delayed_work(&amp;ap-&gt;hotplug_task);</div><div class='add'>+	flush_workqueue(ata_aux_wq);</div><div class='add'>+</div><div class='add'>+	/* remove the associated SCSI host */</div><div class='add'>+	scsi_remove_host(ap-&gt;host);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	ata_host_set_remove - PCI layer callback for device removal</div><div class='ctx'>  *	@host_set: ATA host set that was removed</div><div class='ctx'>  *</div><div class='hunk'>@@ -4679,18 +5611,15 @@ err_free_ret:</div><div class='ctx'> </div><div class='ctx'> void ata_host_set_remove(struct ata_host_set *host_set)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='del'>-		ap = host_set-&gt;ports[i];</div><div class='del'>-		scsi_remove_host(ap-&gt;host);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; host_set-&gt;n_ports; i++)</div><div class='add'>+		ata_port_detach(host_set-&gt;ports[i]);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(host_set-&gt;irq, host_set);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='del'>-		ap = host_set-&gt;ports[i];</div><div class='add'>+		struct ata_port *ap = host_set-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 		ata_scsi_release(ap-&gt;host);</div><div class='ctx'> </div><div class='hunk'>@@ -4728,15 +5657,12 @@ void ata_host_set_remove(struct ata_host_set *host_set)</div><div class='ctx'> </div><div class='ctx'> int ata_scsi_release(struct Scsi_Host *host)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = (struct ata_port *) &amp;host-&gt;hostdata[0];</div><div class='del'>-	int i;</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(host);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='ctx'> 	ap-&gt;ops-&gt;port_disable(ap);</div><div class='ctx'> 	ata_host_remove(ap, 0);</div><div class='del'>-	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='del'>-		kfree(ap-&gt;device[i].id);</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("EXIT\n");</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -4796,8 +5722,12 @@ void ata_pci_remove_one (struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = pci_dev_to_dev(pdev);</div><div class='ctx'> 	struct ata_host_set *host_set = dev_get_drvdata(dev);</div><div class='add'>+	struct ata_host_set *host_set2 = host_set-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 	ata_host_set_remove(host_set);</div><div class='add'>+	if (host_set2)</div><div class='add'>+		ata_host_set_remove(host_set2);</div><div class='add'>+</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	dev_set_drvdata(dev, NULL);</div><div class='hunk'>@@ -4837,20 +5767,55 @@ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits)</div><div class='ctx'> 	return (tmp == bits-&gt;val) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	pci_save_state(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pci_set_power_state(pdev, PCI_D3hot);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	if (state.event == PM_EVENT_SUSPEND) {</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+		pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ata_pci_device_resume(struct pci_dev *pdev)</div><div class='add'>+void ata_pci_device_do_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	pci_set_power_state(pdev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> 	pci_enable_device(pdev);</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	rc = ata_host_set_suspend(host_set, state);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (host_set-&gt;next) {</div><div class='add'>+		rc = ata_host_set_suspend(host_set-&gt;next, state);</div><div class='add'>+		if (rc) {</div><div class='add'>+			ata_host_set_resume(host_set);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ata_pci_device_do_suspend(pdev, state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ata_pci_device_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ata_pci_device_do_resume(pdev);</div><div class='add'>+	ata_host_set_resume(host_set);</div><div class='add'>+	if (host_set-&gt;next)</div><div class='add'>+		ata_host_set_resume(host_set-&gt;next);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='hunk'>@@ -4858,10 +5823,17 @@ int ata_pci_device_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> static int __init ata_init(void)</div><div class='ctx'> {</div><div class='add'>+	ata_probe_timeout *= HZ;</div><div class='ctx'> 	ata_wq = create_workqueue("ata");</div><div class='ctx'> 	if (!ata_wq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	ata_aux_wq = create_singlethread_workqueue("ata_aux");</div><div class='add'>+	if (!ata_aux_wq) {</div><div class='add'>+		destroy_workqueue(ata_wq);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4869,13 +5841,14 @@ static int __init ata_init(void)</div><div class='ctx'> static void __exit ata_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	destroy_workqueue(ata_wq);</div><div class='add'>+	destroy_workqueue(ata_aux_wq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ata_init);</div><div class='ctx'> module_exit(ata_exit);</div><div class='ctx'> </div><div class='ctx'> static unsigned long ratelimit_time;</div><div class='del'>-static spinlock_t ata_ratelimit_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(ata_ratelimit_lock);</div><div class='ctx'> </div><div class='ctx'> int ata_ratelimit(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -4895,6 +5868,52 @@ int ata_ratelimit(void)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ata_wait_register - wait until register value changes</div><div class='add'>+ *	@reg: IO-mapped register</div><div class='add'>+ *	@mask: Mask to apply to read register value</div><div class='add'>+ *	@val: Wait condition</div><div class='add'>+ *	@interval_msec: polling interval in milliseconds</div><div class='add'>+ *	@timeout_msec: timeout in milliseconds</div><div class='add'>+ *</div><div class='add'>+ *	Waiting for some bits of register to change is a common</div><div class='add'>+ *	operation for ATA controllers.  This function reads 32bit LE</div><div class='add'>+ *	IO-mapped register @reg and tests for the following condition.</div><div class='add'>+ *</div><div class='add'>+ *	(*@reg &amp; mask) != val</div><div class='add'>+ *</div><div class='add'>+ *	If the condition is met, it returns; otherwise, the process is</div><div class='add'>+ *	repeated after @interval_msec until timeout.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	The final register value.</div><div class='add'>+ */</div><div class='add'>+u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,</div><div class='add'>+		      unsigned long interval_msec,</div><div class='add'>+		      unsigned long timeout_msec)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	tmp = ioread32(reg);</div><div class='add'>+</div><div class='add'>+	/* Calculate timeout _after_ the first read to make sure</div><div class='add'>+	 * preceding writes reach the controller before starting to</div><div class='add'>+	 * eat away the timeout.</div><div class='add'>+	 */</div><div class='add'>+	timeout = jiffies + (timeout_msec * HZ) / 1000;</div><div class='add'>+</div><div class='add'>+	while ((tmp &amp; mask) == val &amp;&amp; time_before(jiffies, timeout)) {</div><div class='add'>+		msleep(interval_msec);</div><div class='add'>+		tmp = ioread32(reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tmp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * libata is essentially a library of internal helper functions for</div><div class='ctx'>  * low-level ATA host controller drivers.  As such, the API/ABI is</div><div class='hunk'>@@ -4902,15 +5921,20 @@ int ata_ratelimit(void)</div><div class='ctx'>  * Do not depend on ABI/API stability.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+EXPORT_SYMBOL_GPL(sata_deb_timing_normal);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_deb_timing_hotplug);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_deb_timing_long);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_std_bios_param);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_std_ports);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_device_add);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_port_detach);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_set_remove);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_sg_init);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_sg_init_one);</div><div class='del'>-EXPORT_SYMBOL_GPL(__ata_qc_complete);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_hsm_move);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_qc_complete);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_qc_complete_multiple);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_qc_issue_prot);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_eng_timeout);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_tf_load);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_tf_read);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_noop_dev_select);</div><div class='hunk'>@@ -4924,6 +5948,9 @@ EXPORT_SYMBOL_GPL(ata_port_start);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_port_stop);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_stop);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_interrupt);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_mmio_data_xfer);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_pio_data_xfer);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_pio_data_xfer_noirq);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_qc_prep);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_noop_qc_prep);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_bmdma_setup);</div><div class='hunk'>@@ -4931,33 +5958,48 @@ EXPORT_SYMBOL_GPL(ata_bmdma_start);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_bmdma_irq_clear);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_bmdma_status);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_bmdma_stop);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_bmdma_freeze);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_bmdma_thaw);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_bmdma_drive_eh);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_bmdma_error_handler);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_bmdma_post_internal_cmd);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_port_probe);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_set_spd);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_phy_debounce);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_phy_resume);</div><div class='ctx'> EXPORT_SYMBOL_GPL(sata_phy_reset);</div><div class='ctx'> EXPORT_SYMBOL_GPL(__sata_phy_reset);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_bus_reset);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_std_probeinit);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_std_prereset);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_std_softreset);</div><div class='ctx'> EXPORT_SYMBOL_GPL(sata_std_hardreset);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_std_postreset);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_std_probe_reset);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_drive_probe_reset);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_dev_revalidate);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_dev_classify);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_dev_pair);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_port_disable);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_ratelimit);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_wait_register);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_busy_sleep);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_port_queue_task);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_ioctl);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_slave_config);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_scsi_slave_destroy);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_scsi_change_queue_depth);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_release);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_host_intr);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_scr_valid);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_scr_read);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_scr_write);</div><div class='add'>+EXPORT_SYMBOL_GPL(sata_scr_write_flush);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_port_online);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_port_offline);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_host_set_suspend);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_host_set_resume);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_id_string);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_id_c_string);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_simulate);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_eh_qc_complete);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_eh_qc_retry);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pio_need_iordy);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_timing_compute);</div><div class='hunk'>@@ -4969,13 +6011,23 @@ EXPORT_SYMBOL_GPL(ata_pci_host_stop);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_init_native_mode);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_init_one);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_remove_one);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_pci_device_do_suspend);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_pci_device_do_resume);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_device_suspend);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_device_resume);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_default_filter);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_pci_clear_simplex);</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(ata_device_suspend);</div><div class='del'>-EXPORT_SYMBOL_GPL(ata_device_resume);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_device_suspend);</div><div class='ctx'> EXPORT_SYMBOL_GPL(ata_scsi_device_resume);</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_eng_timeout);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_port_schedule_eh);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_port_abort);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_port_freeze);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_eh_freeze_port);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_eh_thaw_port);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_eh_qc_complete);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_eh_qc_retry);</div><div class='add'>+EXPORT_SYMBOL_GPL(ata_do_eh);</div><div class='head'>diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c<br/>new file mode 100644<br/>index 000000000000..4b6aa30f4d68<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libata-eh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/libata-eh.c</a></div><div class='hunk'>@@ -0,0 +1,2227 @@</div><div class='add'>+/*</div><div class='add'>+ *  libata-eh.c - libata error handling</div><div class='add'>+ *</div><div class='add'>+ *  Maintained by:  Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='add'>+ *    		    Please ALWAYS copy linux-ide@vger.kernel.org</div><div class='add'>+ *		    on emails.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright 2006 Tejun Heo &lt;htejun@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *  This program is free software; you can redistribute it and/or</div><div class='add'>+ *  modify it under the terms of the GNU General Public License as</div><div class='add'>+ *  published by the Free Software Foundation; either version 2, or</div><div class='add'>+ *  (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *  This program is distributed in the hope that it will be useful,</div><div class='add'>+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ *  General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *  You should have received a copy of the GNU General Public License</div><div class='add'>+ *  along with this program; see the file COPYING.  If not, write to</div><div class='add'>+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139,</div><div class='add'>+ *  USA.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ *  libata documentation is available via 'make {ps|pdf}docs',</div><div class='add'>+ *  as Documentation/DocBook/libata.*</div><div class='add'>+ *</div><div class='add'>+ *  Hardware documentation available from http://www.t13.org/ and</div><div class='add'>+ *  http://www.sata-io.org/</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_eh.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_device.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include "scsi_transport_api.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/libata.h&gt;</div><div class='add'>+</div><div class='add'>+#include "libata.h"</div><div class='add'>+</div><div class='add'>+static void __ata_port_freeze(struct ata_port *ap);</div><div class='add'>+static void ata_eh_finish(struct ata_port *ap);</div><div class='add'>+static void ata_eh_handle_port_suspend(struct ata_port *ap);</div><div class='add'>+static void ata_eh_handle_port_resume(struct ata_port *ap);</div><div class='add'>+</div><div class='add'>+static void ata_ering_record(struct ata_ering *ering, int is_io,</div><div class='add'>+			     unsigned int err_mask)</div><div class='add'>+{</div><div class='add'>+	struct ata_ering_entry *ent;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!err_mask);</div><div class='add'>+</div><div class='add'>+	ering-&gt;cursor++;</div><div class='add'>+	ering-&gt;cursor %= ATA_ERING_SIZE;</div><div class='add'>+</div><div class='add'>+	ent = &amp;ering-&gt;ring[ering-&gt;cursor];</div><div class='add'>+	ent-&gt;is_io = is_io;</div><div class='add'>+	ent-&gt;err_mask = err_mask;</div><div class='add'>+	ent-&gt;timestamp = get_jiffies_64();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ata_ering_entry * ata_ering_top(struct ata_ering *ering)</div><div class='add'>+{</div><div class='add'>+	struct ata_ering_entry *ent = &amp;ering-&gt;ring[ering-&gt;cursor];</div><div class='add'>+	if (!ent-&gt;err_mask)</div><div class='add'>+		return NULL;</div><div class='add'>+	return ent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_ering_map(struct ata_ering *ering,</div><div class='add'>+			 int (*map_fn)(struct ata_ering_entry *, void *),</div><div class='add'>+			 void *arg)</div><div class='add'>+{</div><div class='add'>+	int idx, rc = 0;</div><div class='add'>+	struct ata_ering_entry *ent;</div><div class='add'>+</div><div class='add'>+	idx = ering-&gt;cursor;</div><div class='add'>+	do {</div><div class='add'>+		ent = &amp;ering-&gt;ring[idx];</div><div class='add'>+		if (!ent-&gt;err_mask)</div><div class='add'>+			break;</div><div class='add'>+		rc = map_fn(ent, arg);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+		idx = (idx - 1 + ATA_ERING_SIZE) % ATA_ERING_SIZE;</div><div class='add'>+	} while (idx != ering-&gt;cursor);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ata_eh_dev_action(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;dev-&gt;ap-&gt;eh_context;</div><div class='add'>+</div><div class='add'>+	return ehc-&gt;i.action | ehc-&gt;i.dev_action[dev-&gt;devno];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ata_eh_clear_action(struct ata_device *dev,</div><div class='add'>+				struct ata_eh_info *ehi, unsigned int action)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!dev) {</div><div class='add'>+		ehi-&gt;action &amp;= ~action;</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+			ehi-&gt;dev_action[i] &amp;= ~action;</div><div class='add'>+	} else {</div><div class='add'>+		/* doesn't make sense for port-wide EH actions */</div><div class='add'>+		WARN_ON(!(action &amp; ATA_EH_PERDEV_MASK));</div><div class='add'>+</div><div class='add'>+		/* break ehi-&gt;action into ehi-&gt;dev_action */</div><div class='add'>+		if (ehi-&gt;action &amp; action) {</div><div class='add'>+			for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+				ehi-&gt;dev_action[i] |= ehi-&gt;action &amp; action;</div><div class='add'>+			ehi-&gt;action &amp;= ~action;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* turn off the specified per-dev action */</div><div class='add'>+		ehi-&gt;dev_action[dev-&gt;devno] &amp;= ~action;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_timed_out - SCSI layer time out callback</div><div class='add'>+ *	@cmd: timed out SCSI command</div><div class='add'>+ *</div><div class='add'>+ *	Handles SCSI layer timeout.  We race with normal completion of</div><div class='add'>+ *	the qc for @cmd.  If the qc is already gone, we lose and let</div><div class='add'>+ *	the scsi command finish (EH_HANDLED).  Otherwise, the qc has</div><div class='add'>+ *	timed out and EH should be invoked.  Prevent ata_qc_complete()</div><div class='add'>+ *	from finishing it by setting EH_SCHEDULED and return</div><div class='add'>+ *	EH_NOT_HANDLED.</div><div class='add'>+ *</div><div class='add'>+ *	TODO: kill this function once old EH is gone.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Called from timer context</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	EH_HANDLED or EH_NOT_HANDLED</div><div class='add'>+ */</div><div class='add'>+enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = cmd-&gt;device-&gt;host;</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(host);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct ata_queued_cmd *qc;</div><div class='add'>+	enum scsi_eh_timer_return ret;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+		ret = EH_NOT_HANDLED;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = EH_HANDLED;</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+	if (qc) {</div><div class='add'>+		WARN_ON(qc-&gt;scsicmd != cmd);</div><div class='add'>+		qc-&gt;flags |= ATA_QCFLAG_EH_SCHEDULED;</div><div class='add'>+		qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='add'>+		ret = EH_NOT_HANDLED;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	DPRINTK("EXIT, ret=%d\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_error - SCSI layer error handler callback</div><div class='add'>+ *	@host: SCSI host on which error occurred</div><div class='add'>+ *</div><div class='add'>+ *	Handles SCSI-layer-thrown error events.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from SCSI layer (none, can sleep)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Zero.</div><div class='add'>+ */</div><div class='add'>+void ata_scsi_error(struct Scsi_Host *host)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(host);</div><div class='add'>+	int i, repeat_cnt = ATA_EH_MAX_REPEAT;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	/* synchronize with port task */</div><div class='add'>+	ata_port_flush_task(ap);</div><div class='add'>+</div><div class='add'>+	/* synchronize with host_set lock and sort out timeouts */</div><div class='add'>+</div><div class='add'>+	/* For new EH, all qcs are finished in one of three ways -</div><div class='add'>+	 * normal completion, error completion, and SCSI timeout.</div><div class='add'>+	 * Both cmpletions can race against SCSI timeout.  When normal</div><div class='add'>+	 * completion wins, the qc never reaches EH.  When error</div><div class='add'>+	 * completion wins, the qc has ATA_QCFLAG_FAILED set.</div><div class='add'>+	 *</div><div class='add'>+	 * When SCSI timeout wins, things are a bit more complex.</div><div class='add'>+	 * Normal or error completion can occur after the timeout but</div><div class='add'>+	 * before this point.  In such cases, both types of</div><div class='add'>+	 * completions are honored.  A scmd is determined to have</div><div class='add'>+	 * timed out iff its associated qc is active and not failed.</div><div class='add'>+	 */</div><div class='add'>+	if (ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+		struct scsi_cmnd *scmd, *tmp;</div><div class='add'>+		int nr_timedout = 0;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		list_for_each_entry_safe(scmd, tmp, &amp;host-&gt;eh_cmd_q, eh_entry) {</div><div class='add'>+			struct ata_queued_cmd *qc;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; ATA_MAX_QUEUE; i++) {</div><div class='add'>+				qc = __ata_qc_from_tag(ap, i);</div><div class='add'>+				if (qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE &amp;&amp;</div><div class='add'>+				    qc-&gt;scsicmd == scmd)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (i &lt; ATA_MAX_QUEUE) {</div><div class='add'>+				/* the scmd has an associated qc */</div><div class='add'>+				if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED)) {</div><div class='add'>+					/* which hasn't failed yet, timeout */</div><div class='add'>+					qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='add'>+					qc-&gt;flags |= ATA_QCFLAG_FAILED;</div><div class='add'>+					nr_timedout++;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				/* Normal completion occurred after</div><div class='add'>+				 * SCSI timeout but before this point.</div><div class='add'>+				 * Successfully complete it.</div><div class='add'>+				 */</div><div class='add'>+				scmd-&gt;retries = scmd-&gt;allowed;</div><div class='add'>+				scsi_eh_finish_cmd(scmd, &amp;ap-&gt;eh_done_q);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If we have timed out qcs.  They belong to EH from</div><div class='add'>+		 * this point but the state of the controller is</div><div class='add'>+		 * unknown.  Freeze the port to make sure the IRQ</div><div class='add'>+		 * handler doesn't diddle with those qcs.  This must</div><div class='add'>+		 * be done atomically w.r.t. setting QCFLAG_FAILED.</div><div class='add'>+		 */</div><div class='add'>+		if (nr_timedout)</div><div class='add'>+			__ata_port_freeze(ap);</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+	} else</div><div class='add'>+		spin_unlock_wait(ap-&gt;lock);</div><div class='add'>+</div><div class='add'>+ repeat:</div><div class='add'>+	/* invoke error handler */</div><div class='add'>+	if (ap-&gt;ops-&gt;error_handler) {</div><div class='add'>+		/* process port resume request */</div><div class='add'>+		ata_eh_handle_port_resume(ap);</div><div class='add'>+</div><div class='add'>+		/* fetch &amp; clear EH info */</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		memset(&amp;ap-&gt;eh_context, 0, sizeof(ap-&gt;eh_context));</div><div class='add'>+		ap-&gt;eh_context.i = ap-&gt;eh_info;</div><div class='add'>+		memset(&amp;ap-&gt;eh_info, 0, sizeof(ap-&gt;eh_info));</div><div class='add'>+</div><div class='add'>+		ap-&gt;pflags |= ATA_PFLAG_EH_IN_PROGRESS;</div><div class='add'>+		ap-&gt;pflags &amp;= ~ATA_PFLAG_EH_PENDING;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		/* invoke EH, skip if unloading or suspended */</div><div class='add'>+		if (!(ap-&gt;pflags &amp; (ATA_PFLAG_UNLOADING | ATA_PFLAG_SUSPENDED)))</div><div class='add'>+			ap-&gt;ops-&gt;error_handler(ap);</div><div class='add'>+		else</div><div class='add'>+			ata_eh_finish(ap);</div><div class='add'>+</div><div class='add'>+		/* process port suspend request */</div><div class='add'>+		ata_eh_handle_port_suspend(ap);</div><div class='add'>+</div><div class='add'>+		/* Exception might have happend after -&gt;error_handler</div><div class='add'>+		 * recovered the port but before this point.  Repeat</div><div class='add'>+		 * EH in such case.</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		if (ap-&gt;pflags &amp; ATA_PFLAG_EH_PENDING) {</div><div class='add'>+			if (--repeat_cnt) {</div><div class='add'>+				ata_port_printk(ap, KERN_INFO,</div><div class='add'>+					"EH pending after completion, "</div><div class='add'>+					"repeating EH (cnt=%d)\n", repeat_cnt);</div><div class='add'>+				spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+				goto repeat;</div><div class='add'>+			}</div><div class='add'>+			ata_port_printk(ap, KERN_ERR, "EH pending after %d "</div><div class='add'>+					"tries, giving up\n", ATA_EH_MAX_REPEAT);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* this run is complete, make sure EH info is clear */</div><div class='add'>+		memset(&amp;ap-&gt;eh_info, 0, sizeof(ap-&gt;eh_info));</div><div class='add'>+</div><div class='add'>+		/* Clear host_eh_scheduled while holding ap-&gt;lock such</div><div class='add'>+		 * that if exception occurs after this point but</div><div class='add'>+		 * before EH completion, SCSI midlayer will</div><div class='add'>+		 * re-initiate EH.</div><div class='add'>+		 */</div><div class='add'>+		host-&gt;host_eh_scheduled = 0;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(ata_qc_from_tag(ap, ap-&gt;active_tag) == NULL);</div><div class='add'>+		ap-&gt;ops-&gt;eng_timeout(ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* finish or retry handled scmd's and clean up */</div><div class='add'>+	WARN_ON(host-&gt;host_failed || !list_empty(&amp;host-&gt;eh_cmd_q));</div><div class='add'>+</div><div class='add'>+	scsi_eh_flush_done_q(&amp;ap-&gt;eh_done_q);</div><div class='add'>+</div><div class='add'>+	/* clean up */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_LOADING)</div><div class='add'>+		ap-&gt;pflags &amp;= ~ATA_PFLAG_LOADING;</div><div class='add'>+	else if (ap-&gt;pflags &amp; ATA_PFLAG_SCSI_HOTPLUG)</div><div class='add'>+		queue_work(ata_aux_wq, &amp;ap-&gt;hotplug_task);</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_RECOVERED)</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "EH complete\n");</div><div class='add'>+</div><div class='add'>+	ap-&gt;pflags &amp;= ~(ATA_PFLAG_SCSI_HOTPLUG | ATA_PFLAG_RECOVERED);</div><div class='add'>+</div><div class='add'>+	/* tell wait_eh that we're done */</div><div class='add'>+	ap-&gt;pflags &amp;= ~ATA_PFLAG_EH_IN_PROGRESS;</div><div class='add'>+	wake_up_all(&amp;ap-&gt;eh_wait_q);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_wait_eh - Wait for the currently pending EH to complete</div><div class='add'>+ *	@ap: Port to wait EH for</div><div class='add'>+ *</div><div class='add'>+ *	Wait until the currently pending EH is complete.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+void ata_port_wait_eh(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+ retry:</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	while (ap-&gt;pflags &amp; (ATA_PFLAG_EH_PENDING | ATA_PFLAG_EH_IN_PROGRESS)) {</div><div class='add'>+		prepare_to_wait(&amp;ap-&gt;eh_wait_q, &amp;wait, TASK_UNINTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		schedule();</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+	finish_wait(&amp;ap-&gt;eh_wait_q, &amp;wait);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* make sure SCSI EH is complete */</div><div class='add'>+	if (scsi_host_in_recovery(ap-&gt;host)) {</div><div class='add'>+		msleep(10);</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_qc_timeout - Handle timeout of queued command</div><div class='add'>+ *	@qc: Command that timed out</div><div class='add'>+ *</div><div class='add'>+ *	Some part of the kernel (currently, only the SCSI layer)</div><div class='add'>+ *	has noticed that the active command on port @ap has not</div><div class='add'>+ *	completed after a specified length of time.  Handle this</div><div class='add'>+ *	condition by disabling DMA (if necessary) and completing</div><div class='add'>+ *	transactions, with error if necessary.</div><div class='add'>+ *</div><div class='add'>+ *	This also handles the case of the "lost interrupt", where</div><div class='add'>+ *	for some reason (possibly hardware bug, possibly driver bug)</div><div class='add'>+ *	an interrupt was not delivered to the driver, even though the</div><div class='add'>+ *	transaction completed successfully.</div><div class='add'>+ *</div><div class='add'>+ *	TODO: kill this function once old EH is gone.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from SCSI layer (none, can sleep)</div><div class='add'>+ */</div><div class='add'>+static void ata_qc_timeout(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	u8 host_stat = 0, drv_stat;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	ap-&gt;hsm_task_state = HSM_ST_IDLE;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	switch (qc-&gt;tf.protocol) {</div><div class='add'>+</div><div class='add'>+	case ATA_PROT_DMA:</div><div class='add'>+	case ATA_PROT_ATAPI_DMA:</div><div class='add'>+		host_stat = ap-&gt;ops-&gt;bmdma_status(ap);</div><div class='add'>+</div><div class='add'>+		/* before we do anything else, clear DMA-Start bit */</div><div class='add'>+		ap-&gt;ops-&gt;bmdma_stop(qc);</div><div class='add'>+</div><div class='add'>+		/* fall through */</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ata_altstatus(ap);</div><div class='add'>+		drv_stat = ata_chk_status(ap);</div><div class='add'>+</div><div class='add'>+		/* ack bmdma irq events */</div><div class='add'>+		ap-&gt;ops-&gt;irq_clear(ap);</div><div class='add'>+</div><div class='add'>+		ata_dev_printk(qc-&gt;dev, KERN_ERR, "command 0x%x timeout, "</div><div class='add'>+			       "stat 0x%x host_stat 0x%x\n",</div><div class='add'>+			       qc-&gt;tf.command, drv_stat, host_stat);</div><div class='add'>+</div><div class='add'>+		/* complete taskfile transaction */</div><div class='add'>+		qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ata_eh_qc_complete(qc);</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eng_timeout - Handle timeout of queued command</div><div class='add'>+ *	@ap: Port on which timed-out command is active</div><div class='add'>+ *</div><div class='add'>+ *	Some part of the kernel (currently, only the SCSI layer)</div><div class='add'>+ *	has noticed that the active command on port @ap has not</div><div class='add'>+ *	completed after a specified length of time.  Handle this</div><div class='add'>+ *	condition by disabling DMA (if necessary) and completing</div><div class='add'>+ *	transactions, with error if necessary.</div><div class='add'>+ *</div><div class='add'>+ *	This also handles the case of the "lost interrupt", where</div><div class='add'>+ *	for some reason (possibly hardware bug, possibly driver bug)</div><div class='add'>+ *	an interrupt was not delivered to the driver, even though the</div><div class='add'>+ *	transaction completed successfully.</div><div class='add'>+ *</div><div class='add'>+ *	TODO: kill this function once old EH is gone.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from SCSI layer (none, can sleep)</div><div class='add'>+ */</div><div class='add'>+void ata_eng_timeout(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	ata_qc_timeout(ata_qc_from_tag(ap, ap-&gt;active_tag));</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_qc_schedule_eh - schedule qc for error handling</div><div class='add'>+ *	@qc: command to schedule error handling for</div><div class='add'>+ *</div><div class='add'>+ *	Schedule error handling for @qc.  EH will kick in as soon as</div><div class='add'>+ *	other commands are drained.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ */</div><div class='add'>+void ata_qc_schedule_eh(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!ap-&gt;ops-&gt;error_handler);</div><div class='add'>+</div><div class='add'>+	qc-&gt;flags |= ATA_QCFLAG_FAILED;</div><div class='add'>+	qc-&gt;ap-&gt;pflags |= ATA_PFLAG_EH_PENDING;</div><div class='add'>+</div><div class='add'>+	/* The following will fail if timeout has already expired.</div><div class='add'>+	 * ata_scsi_error() takes care of such scmds on EH entry.</div><div class='add'>+	 * Note that ATA_QCFLAG_FAILED is unconditionally set after</div><div class='add'>+	 * this function completes.</div><div class='add'>+	 */</div><div class='add'>+	scsi_req_abort_cmd(qc-&gt;scsicmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_schedule_eh - schedule error handling without a qc</div><div class='add'>+ *	@ap: ATA port to schedule EH for</div><div class='add'>+ *</div><div class='add'>+ *	Schedule error handling for @ap.  EH will kick in as soon as</div><div class='add'>+ *	all commands are drained.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ */</div><div class='add'>+void ata_port_schedule_eh(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!ap-&gt;ops-&gt;error_handler);</div><div class='add'>+</div><div class='add'>+	ap-&gt;pflags |= ATA_PFLAG_EH_PENDING;</div><div class='add'>+	scsi_schedule_eh(ap-&gt;host);</div><div class='add'>+</div><div class='add'>+	DPRINTK("port EH scheduled\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_abort - abort all qc's on the port</div><div class='add'>+ *	@ap: ATA port to abort qc's for</div><div class='add'>+ *</div><div class='add'>+ *	Abort all active qc's of @ap and schedule EH.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Number of aborted qc's.</div><div class='add'>+ */</div><div class='add'>+int ata_port_abort(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	int tag, nr_aborted = 0;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!ap-&gt;ops-&gt;error_handler);</div><div class='add'>+</div><div class='add'>+	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='add'>+		struct ata_queued_cmd *qc = ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+		if (qc) {</div><div class='add'>+			qc-&gt;flags |= ATA_QCFLAG_FAILED;</div><div class='add'>+			ata_qc_complete(qc);</div><div class='add'>+			nr_aborted++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nr_aborted)</div><div class='add'>+		ata_port_schedule_eh(ap);</div><div class='add'>+</div><div class='add'>+	return nr_aborted;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	__ata_port_freeze - freeze port</div><div class='add'>+ *	@ap: ATA port to freeze</div><div class='add'>+ *</div><div class='add'>+ *	This function is called when HSM violation or some other</div><div class='add'>+ *	condition disrupts normal operation of the port.  Frozen port</div><div class='add'>+ *	is not allowed to perform any operation until the port is</div><div class='add'>+ *	thawed, which usually follows a successful reset.</div><div class='add'>+ *</div><div class='add'>+ *	ap-&gt;ops-&gt;freeze() callback can be used for freezing the port</div><div class='add'>+ *	hardware-wise (e.g. mask interrupt and stop DMA engine).  If a</div><div class='add'>+ *	port cannot be frozen hardware-wise, the interrupt handler</div><div class='add'>+ *	must ack and clear interrupts unconditionally while the port</div><div class='add'>+ *	is frozen.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ */</div><div class='add'>+static void __ata_port_freeze(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!ap-&gt;ops-&gt;error_handler);</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;ops-&gt;freeze)</div><div class='add'>+		ap-&gt;ops-&gt;freeze(ap);</div><div class='add'>+</div><div class='add'>+	ap-&gt;pflags |= ATA_PFLAG_FROZEN;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ata%u port frozen\n", ap-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_freeze - abort &amp; freeze port</div><div class='add'>+ *	@ap: ATA port to freeze</div><div class='add'>+ *</div><div class='add'>+ *	Abort and freeze @ap.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Number of aborted commands.</div><div class='add'>+ */</div><div class='add'>+int ata_port_freeze(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	int nr_aborted;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!ap-&gt;ops-&gt;error_handler);</div><div class='add'>+</div><div class='add'>+	nr_aborted = ata_port_abort(ap);</div><div class='add'>+	__ata_port_freeze(ap);</div><div class='add'>+</div><div class='add'>+	return nr_aborted;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_freeze_port - EH helper to freeze port</div><div class='add'>+ *	@ap: ATA port to freeze</div><div class='add'>+ *</div><div class='add'>+ *	Freeze @ap.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+void ata_eh_freeze_port(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	__ata_port_freeze(ap);</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_port_thaw_port - EH helper to thaw port</div><div class='add'>+ *	@ap: ATA port to thaw</div><div class='add'>+ *</div><div class='add'>+ *	Thaw frozen port @ap.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+void ata_eh_thaw_port(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ap-&gt;pflags &amp;= ~ATA_PFLAG_FROZEN;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;ops-&gt;thaw)</div><div class='add'>+		ap-&gt;ops-&gt;thaw(ap);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	DPRINTK("ata%u port thawed\n", ap-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ata_eh_scsidone(struct scsi_cmnd *scmd)</div><div class='add'>+{</div><div class='add'>+	/* nada */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __ata_eh_qc_complete(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+	struct scsi_cmnd *scmd = qc-&gt;scsicmd;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	qc-&gt;scsidone = ata_eh_scsidone;</div><div class='add'>+	__ata_qc_complete(qc);</div><div class='add'>+	WARN_ON(ata_tag_valid(qc-&gt;tag));</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	scsi_eh_finish_cmd(scmd, &amp;ap-&gt;eh_done_q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_qc_complete - Complete an active ATA command from EH</div><div class='add'>+ *	@qc: Command to complete</div><div class='add'>+ *</div><div class='add'>+ *	Indicate to the mid and upper layers that an ATA command has</div><div class='add'>+ *	completed.  To be used from EH.</div><div class='add'>+ */</div><div class='add'>+void ata_eh_qc_complete(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct scsi_cmnd *scmd = qc-&gt;scsicmd;</div><div class='add'>+	scmd-&gt;retries = scmd-&gt;allowed;</div><div class='add'>+	__ata_eh_qc_complete(qc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_qc_retry - Tell midlayer to retry an ATA command after EH</div><div class='add'>+ *	@qc: Command to retry</div><div class='add'>+ *</div><div class='add'>+ *	Indicate to the mid and upper layers that an ATA command</div><div class='add'>+ *	should be retried.  To be used from EH.</div><div class='add'>+ *</div><div class='add'>+ *	SCSI midlayer limits the number of retries to scmd-&gt;allowed.</div><div class='add'>+ *	scmd-&gt;retries is decremented for commands which get retried</div><div class='add'>+ *	due to unrelated failures (qc-&gt;err_mask is zero).</div><div class='add'>+ */</div><div class='add'>+void ata_eh_qc_retry(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct scsi_cmnd *scmd = qc-&gt;scsicmd;</div><div class='add'>+	if (!qc-&gt;err_mask &amp;&amp; scmd-&gt;retries)</div><div class='add'>+		scmd-&gt;retries--;</div><div class='add'>+	__ata_eh_qc_complete(qc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_detach_dev - detach ATA device</div><div class='add'>+ *	@dev: ATA device to detach</div><div class='add'>+ *</div><div class='add'>+ *	Detach @dev.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_detach_dev(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	ata_dev_disable(dev);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dev-&gt;flags &amp;= ~ATA_DFLAG_DETACH;</div><div class='add'>+</div><div class='add'>+	if (ata_scsi_offline_dev(dev)) {</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_DETACHED;</div><div class='add'>+		ap-&gt;pflags |= ATA_PFLAG_SCSI_HOTPLUG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear per-dev EH actions */</div><div class='add'>+	ata_eh_clear_action(dev, &amp;ap-&gt;eh_info, ATA_EH_PERDEV_MASK);</div><div class='add'>+	ata_eh_clear_action(dev, &amp;ap-&gt;eh_context.i, ATA_EH_PERDEV_MASK);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_about_to_do - about to perform eh_action</div><div class='add'>+ *	@ap: target ATA port</div><div class='add'>+ *	@dev: target ATA dev for per-dev action (can be NULL)</div><div class='add'>+ *	@action: action about to be performed</div><div class='add'>+ *</div><div class='add'>+ *	Called just before performing EH actions to clear related bits</div><div class='add'>+ *	in @ap-&gt;eh_info such that eh actions are not unnecessarily</div><div class='add'>+ *	repeated.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_about_to_do(struct ata_port *ap, struct ata_device *dev,</div><div class='add'>+			       unsigned int action)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ata_eh_clear_action(dev, &amp;ap-&gt;eh_info, action);</div><div class='add'>+</div><div class='add'>+	if (!(ap-&gt;eh_context.i.flags &amp; ATA_EHI_QUIET))</div><div class='add'>+		ap-&gt;pflags |= ATA_PFLAG_RECOVERED;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_done - EH action complete</div><div class='add'>+ *	@ap: target ATA port</div><div class='add'>+ *	@dev: target ATA dev for per-dev action (can be NULL)</div><div class='add'>+ *	@action: action just completed</div><div class='add'>+ *</div><div class='add'>+ *	Called right after performing EH actions to clear related bits</div><div class='add'>+ *	in @ap-&gt;eh_context.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_done(struct ata_port *ap, struct ata_device *dev,</div><div class='add'>+			unsigned int action)</div><div class='add'>+{</div><div class='add'>+	ata_eh_clear_action(dev, &amp;ap-&gt;eh_context.i, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_err_string - convert err_mask to descriptive string</div><div class='add'>+ *	@err_mask: error mask to convert to string</div><div class='add'>+ *</div><div class='add'>+ *	Convert @err_mask to descriptive string.  Errors are</div><div class='add'>+ *	prioritized according to severity and only the most severe</div><div class='add'>+ *	error is reported.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Descriptive string for @err_mask</div><div class='add'>+ */</div><div class='add'>+static const char * ata_err_string(unsigned int err_mask)</div><div class='add'>+{</div><div class='add'>+	if (err_mask &amp; AC_ERR_HOST_BUS)</div><div class='add'>+		return "host bus error";</div><div class='add'>+	if (err_mask &amp; AC_ERR_ATA_BUS)</div><div class='add'>+		return "ATA bus error";</div><div class='add'>+	if (err_mask &amp; AC_ERR_TIMEOUT)</div><div class='add'>+		return "timeout";</div><div class='add'>+	if (err_mask &amp; AC_ERR_HSM)</div><div class='add'>+		return "HSM violation";</div><div class='add'>+	if (err_mask &amp; AC_ERR_SYSTEM)</div><div class='add'>+		return "internal error";</div><div class='add'>+	if (err_mask &amp; AC_ERR_MEDIA)</div><div class='add'>+		return "media error";</div><div class='add'>+	if (err_mask &amp; AC_ERR_INVALID)</div><div class='add'>+		return "invalid argument";</div><div class='add'>+	if (err_mask &amp; AC_ERR_DEV)</div><div class='add'>+		return "device error";</div><div class='add'>+	return "unknown error";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_read_log_page - read a specific log page</div><div class='add'>+ *	@dev: target device</div><div class='add'>+ *	@page: page to read</div><div class='add'>+ *	@buf: buffer to store read page</div><div class='add'>+ *	@sectors: number of sectors to read</div><div class='add'>+ *</div><div class='add'>+ *	Read log page using READ_LOG_EXT command.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, AC_ERR_* mask otherwise.</div><div class='add'>+ */</div><div class='add'>+static unsigned int ata_read_log_page(struct ata_device *dev,</div><div class='add'>+				      u8 page, void *buf, unsigned int sectors)</div><div class='add'>+{</div><div class='add'>+	struct ata_taskfile tf;</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+</div><div class='add'>+	DPRINTK("read log page - page %d\n", page);</div><div class='add'>+</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='add'>+	tf.command = ATA_CMD_READ_LOG_EXT;</div><div class='add'>+	tf.lbal = page;</div><div class='add'>+	tf.nsect = sectors;</div><div class='add'>+	tf.hob_nsect = sectors &gt;&gt; 8;</div><div class='add'>+	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_LBA48 | ATA_TFLAG_DEVICE;</div><div class='add'>+	tf.protocol = ATA_PROT_PIO;</div><div class='add'>+</div><div class='add'>+	err_mask = ata_exec_internal(dev, &amp;tf, NULL, DMA_FROM_DEVICE,</div><div class='add'>+				     buf, sectors * ATA_SECT_SIZE);</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT, err_mask=%x\n", err_mask);</div><div class='add'>+	return err_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_read_log_10h - Read log page 10h for NCQ error details</div><div class='add'>+ *	@dev: Device to read log page 10h from</div><div class='add'>+ *	@tag: Resulting tag of the failed command</div><div class='add'>+ *	@tf: Resulting taskfile registers of the failed command</div><div class='add'>+ *</div><div class='add'>+ *	Read log page 10h to obtain NCQ error details and clear error</div><div class='add'>+ *	condition.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+static int ata_eh_read_log_10h(struct ata_device *dev,</div><div class='add'>+			       int *tag, struct ata_taskfile *tf)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = dev-&gt;ap-&gt;sector_buf;</div><div class='add'>+	unsigned int err_mask;</div><div class='add'>+	u8 csum;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err_mask = ata_read_log_page(dev, ATA_LOG_SATA_NCQ, buf, 1);</div><div class='add'>+	if (err_mask)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	csum = 0;</div><div class='add'>+	for (i = 0; i &lt; ATA_SECT_SIZE; i++)</div><div class='add'>+		csum += buf[i];</div><div class='add'>+	if (csum)</div><div class='add'>+		ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+			       "invalid checksum 0x%x on log page 10h\n", csum);</div><div class='add'>+</div><div class='add'>+	if (buf[0] &amp; 0x80)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	*tag = buf[0] &amp; 0x1f;</div><div class='add'>+</div><div class='add'>+	tf-&gt;command = buf[2];</div><div class='add'>+	tf-&gt;feature = buf[3];</div><div class='add'>+	tf-&gt;lbal = buf[4];</div><div class='add'>+	tf-&gt;lbam = buf[5];</div><div class='add'>+	tf-&gt;lbah = buf[6];</div><div class='add'>+	tf-&gt;device = buf[7];</div><div class='add'>+	tf-&gt;hob_lbal = buf[8];</div><div class='add'>+	tf-&gt;hob_lbam = buf[9];</div><div class='add'>+	tf-&gt;hob_lbah = buf[10];</div><div class='add'>+	tf-&gt;nsect = buf[12];</div><div class='add'>+	tf-&gt;hob_nsect = buf[13];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	atapi_eh_request_sense - perform ATAPI REQUEST_SENSE</div><div class='add'>+ *	@dev: device to perform REQUEST_SENSE to</div><div class='add'>+ *	@sense_buf: result sense data buffer (SCSI_SENSE_BUFFERSIZE bytes long)</div><div class='add'>+ *</div><div class='add'>+ *	Perform ATAPI REQUEST_SENSE after the device reported CHECK</div><div class='add'>+ *	SENSE.  This function is EH helper.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, AC_ERR_* mask on failure</div><div class='add'>+ */</div><div class='add'>+static unsigned int atapi_eh_request_sense(struct ata_device *dev,</div><div class='add'>+					   unsigned char *sense_buf)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='add'>+	struct ata_taskfile tf;</div><div class='add'>+	u8 cdb[ATAPI_CDB_LEN];</div><div class='add'>+</div><div class='add'>+	DPRINTK("ATAPI request sense\n");</div><div class='add'>+</div><div class='add'>+	ata_tf_init(dev, &amp;tf);</div><div class='add'>+</div><div class='add'>+	/* FIXME: is this needed? */</div><div class='add'>+	memset(sense_buf, 0, SCSI_SENSE_BUFFERSIZE);</div><div class='add'>+</div><div class='add'>+	/* XXX: why tf_read here? */</div><div class='add'>+	ap-&gt;ops-&gt;tf_read(ap, &amp;tf);</div><div class='add'>+</div><div class='add'>+	/* fill these in, for the case where they are -not- overwritten */</div><div class='add'>+	sense_buf[0] = 0x70;</div><div class='add'>+	sense_buf[2] = tf.feature &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+	memset(cdb, 0, ATAPI_CDB_LEN);</div><div class='add'>+	cdb[0] = REQUEST_SENSE;</div><div class='add'>+	cdb[4] = SCSI_SENSE_BUFFERSIZE;</div><div class='add'>+</div><div class='add'>+	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='add'>+	tf.command = ATA_CMD_PACKET;</div><div class='add'>+</div><div class='add'>+	/* is it pointless to prefer PIO for "safety reasons"? */</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_PIO_DMA) {</div><div class='add'>+		tf.protocol = ATA_PROT_ATAPI_DMA;</div><div class='add'>+		tf.feature |= ATAPI_PKT_DMA;</div><div class='add'>+	} else {</div><div class='add'>+		tf.protocol = ATA_PROT_ATAPI;</div><div class='add'>+		tf.lbam = (8 * 1024) &amp; 0xff;</div><div class='add'>+		tf.lbah = (8 * 1024) &gt;&gt; 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ata_exec_internal(dev, &amp;tf, cdb, DMA_FROM_DEVICE,</div><div class='add'>+				 sense_buf, SCSI_SENSE_BUFFERSIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_analyze_serror - analyze SError for a failed port</div><div class='add'>+ *	@ap: ATA port to analyze SError for</div><div class='add'>+ *</div><div class='add'>+ *	Analyze SError if available and further determine cause of</div><div class='add'>+ *	failure.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_analyze_serror(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	u32 serror = ehc-&gt;i.serror;</div><div class='add'>+	unsigned int err_mask = 0, action = 0;</div><div class='add'>+</div><div class='add'>+	if (serror &amp; SERR_PERSISTENT) {</div><div class='add'>+		err_mask |= AC_ERR_ATA_BUS;</div><div class='add'>+		action |= ATA_EH_HARDRESET;</div><div class='add'>+	}</div><div class='add'>+	if (serror &amp;</div><div class='add'>+	    (SERR_DATA_RECOVERED | SERR_COMM_RECOVERED | SERR_DATA)) {</div><div class='add'>+		err_mask |= AC_ERR_ATA_BUS;</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+	}</div><div class='add'>+	if (serror &amp; SERR_PROTOCOL) {</div><div class='add'>+		err_mask |= AC_ERR_HSM;</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+	}</div><div class='add'>+	if (serror &amp; SERR_INTERNAL) {</div><div class='add'>+		err_mask |= AC_ERR_SYSTEM;</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+	}</div><div class='add'>+	if (serror &amp; (SERR_PHYRDY_CHG | SERR_DEV_XCHG))</div><div class='add'>+		ata_ehi_hotplugged(&amp;ehc-&gt;i);</div><div class='add'>+</div><div class='add'>+	ehc-&gt;i.err_mask |= err_mask;</div><div class='add'>+	ehc-&gt;i.action |= action;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_analyze_ncq_error - analyze NCQ error</div><div class='add'>+ *	@ap: ATA port to analyze NCQ error for</div><div class='add'>+ *</div><div class='add'>+ *	Read log page 10h, determine the offending qc and acquire</div><div class='add'>+ *	error status TF.  For NCQ device errors, all LLDDs have to do</div><div class='add'>+ *	is setting AC_ERR_DEV in ehi-&gt;err_mask.  This function takes</div><div class='add'>+ *	care of the rest.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_analyze_ncq_error(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	struct ata_device *dev = ap-&gt;device;</div><div class='add'>+	struct ata_queued_cmd *qc;</div><div class='add'>+	struct ata_taskfile tf;</div><div class='add'>+	int tag, rc;</div><div class='add'>+</div><div class='add'>+	/* if frozen, we can't do much */</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_FROZEN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* is it NCQ device error? */</div><div class='add'>+	if (!ap-&gt;sactive || !(ehc-&gt;i.err_mask &amp; AC_ERR_DEV))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* has LLDD analyzed already? */</div><div class='add'>+	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='add'>+		qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (qc-&gt;err_mask)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* okay, this error is ours */</div><div class='add'>+	rc = ata_eh_read_log_10h(dev, &amp;tag, &amp;tf);</div><div class='add'>+	if (rc) {</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "failed to read log page 10h "</div><div class='add'>+				"(errno=%d)\n", rc);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(ap-&gt;sactive &amp; (1 &lt;&lt; tag))) {</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "log page 10h reported "</div><div class='add'>+				"inactive tag %d\n", tag);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we've got the perpetrator, condemn it */</div><div class='add'>+	qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+	memcpy(&amp;qc-&gt;result_tf, &amp;tf, sizeof(tf));</div><div class='add'>+	qc-&gt;err_mask |= AC_ERR_DEV;</div><div class='add'>+	ehc-&gt;i.err_mask &amp;= ~AC_ERR_DEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_analyze_tf - analyze taskfile of a failed qc</div><div class='add'>+ *	@qc: qc to analyze</div><div class='add'>+ *	@tf: Taskfile registers to analyze</div><div class='add'>+ *</div><div class='add'>+ *	Analyze taskfile of @qc and further determine cause of</div><div class='add'>+ *	failure.  This function also requests ATAPI sense data if</div><div class='add'>+ *	avaliable.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Determined recovery action</div><div class='add'>+ */</div><div class='add'>+static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,</div><div class='add'>+				      const struct ata_taskfile *tf)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp, action = 0;</div><div class='add'>+	u8 stat = tf-&gt;command, err = tf-&gt;feature;</div><div class='add'>+</div><div class='add'>+	if ((stat &amp; (ATA_BUSY | ATA_DRQ | ATA_DRDY)) != ATA_DRDY) {</div><div class='add'>+		qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+		return ATA_EH_SOFTRESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(qc-&gt;err_mask &amp; AC_ERR_DEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (qc-&gt;dev-&gt;class) {</div><div class='add'>+	case ATA_DEV_ATA:</div><div class='add'>+		if (err &amp; ATA_ICRC)</div><div class='add'>+			qc-&gt;err_mask |= AC_ERR_ATA_BUS;</div><div class='add'>+		if (err &amp; ATA_UNC)</div><div class='add'>+			qc-&gt;err_mask |= AC_ERR_MEDIA;</div><div class='add'>+		if (err &amp; ATA_IDNF)</div><div class='add'>+			qc-&gt;err_mask |= AC_ERR_INVALID;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ATA_DEV_ATAPI:</div><div class='add'>+		tmp = atapi_eh_request_sense(qc-&gt;dev,</div><div class='add'>+					     qc-&gt;scsicmd-&gt;sense_buffer);</div><div class='add'>+		if (!tmp) {</div><div class='add'>+			/* ATA_QCFLAG_SENSE_VALID is used to tell</div><div class='add'>+			 * atapi_qc_complete() that sense data is</div><div class='add'>+			 * already valid.</div><div class='add'>+			 *</div><div class='add'>+			 * TODO: interpret sense data and set</div><div class='add'>+			 * appropriate err_mask.</div><div class='add'>+			 */</div><div class='add'>+			qc-&gt;flags |= ATA_QCFLAG_SENSE_VALID;</div><div class='add'>+		} else</div><div class='add'>+			qc-&gt;err_mask |= tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;err_mask &amp; (AC_ERR_HSM | AC_ERR_TIMEOUT | AC_ERR_ATA_BUS))</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+</div><div class='add'>+	return action;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_eh_categorize_ering_entry(struct ata_ering_entry *ent)</div><div class='add'>+{</div><div class='add'>+	if (ent-&gt;err_mask &amp; (AC_ERR_ATA_BUS | AC_ERR_TIMEOUT))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (ent-&gt;is_io) {</div><div class='add'>+		if (ent-&gt;err_mask &amp; AC_ERR_HSM)</div><div class='add'>+			return 1;</div><div class='add'>+		if ((ent-&gt;err_mask &amp;</div><div class='add'>+		     (AC_ERR_DEV|AC_ERR_MEDIA|AC_ERR_INVALID)) == AC_ERR_DEV)</div><div class='add'>+			return 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct speed_down_needed_arg {</div><div class='add'>+	u64 since;</div><div class='add'>+	int nr_errors[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int speed_down_needed_cb(struct ata_ering_entry *ent, void *void_arg)</div><div class='add'>+{</div><div class='add'>+	struct speed_down_needed_arg *arg = void_arg;</div><div class='add'>+</div><div class='add'>+	if (ent-&gt;timestamp &lt; arg-&gt;since)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	arg-&gt;nr_errors[ata_eh_categorize_ering_entry(ent)]++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_speed_down_needed - Determine wheter speed down is necessary</div><div class='add'>+ *	@dev: Device of interest</div><div class='add'>+ *</div><div class='add'>+ *	This function examines error ring of @dev and determines</div><div class='add'>+ *	whether speed down is necessary.  Speed down is necessary if</div><div class='add'>+ *	there have been more than 3 of Cat-1 errors or 10 of Cat-2</div><div class='add'>+ *	errors during last 15 minutes.</div><div class='add'>+ *</div><div class='add'>+ *	Cat-1 errors are ATA_BUS, TIMEOUT for any command and HSM</div><div class='add'>+ *	violation for known supported commands.</div><div class='add'>+ *</div><div class='add'>+ *	Cat-2 errors are unclassified DEV error for known supported</div><div class='add'>+ *	command.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Inherited from caller.</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if speed down is necessary, 0 otherwise</div><div class='add'>+ */</div><div class='add'>+static int ata_eh_speed_down_needed(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	const u64 interval = 15LLU * 60 * HZ;</div><div class='add'>+	static const int err_limits[3] = { -1, 3, 10 };</div><div class='add'>+	struct speed_down_needed_arg arg;</div><div class='add'>+	struct ata_ering_entry *ent;</div><div class='add'>+	int err_cat;</div><div class='add'>+	u64 j64;</div><div class='add'>+</div><div class='add'>+	ent = ata_ering_top(&amp;dev-&gt;ering);</div><div class='add'>+	if (!ent)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err_cat = ata_eh_categorize_ering_entry(ent);</div><div class='add'>+	if (err_cat == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;arg, 0, sizeof(arg));</div><div class='add'>+</div><div class='add'>+	j64 = get_jiffies_64();</div><div class='add'>+	if (j64 &gt;= interval)</div><div class='add'>+		arg.since = j64 - interval;</div><div class='add'>+	else</div><div class='add'>+		arg.since = 0;</div><div class='add'>+</div><div class='add'>+	ata_ering_map(&amp;dev-&gt;ering, speed_down_needed_cb, &amp;arg);</div><div class='add'>+</div><div class='add'>+	return arg.nr_errors[err_cat] &gt; err_limits[err_cat];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_speed_down - record error and speed down if necessary</div><div class='add'>+ *	@dev: Failed device</div><div class='add'>+ *	@is_io: Did the device fail during normal IO?</div><div class='add'>+ *	@err_mask: err_mask of the error</div><div class='add'>+ *</div><div class='add'>+ *	Record error and examine error history to determine whether</div><div class='add'>+ *	adjusting transmission speed is necessary.  It also sets</div><div class='add'>+ *	transmission limits appropriately if such adjustment is</div><div class='add'>+ *	necessary.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno otherwise</div><div class='add'>+ */</div><div class='add'>+static int ata_eh_speed_down(struct ata_device *dev, int is_io,</div><div class='add'>+			     unsigned int err_mask)</div><div class='add'>+{</div><div class='add'>+	if (!err_mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* record error and determine whether speed down is necessary */</div><div class='add'>+	ata_ering_record(&amp;dev-&gt;ering, is_io, err_mask);</div><div class='add'>+</div><div class='add'>+	if (!ata_eh_speed_down_needed(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* speed down SATA link speed if possible */</div><div class='add'>+	if (sata_down_spd_limit(dev-&gt;ap) == 0)</div><div class='add'>+		return ATA_EH_HARDRESET;</div><div class='add'>+</div><div class='add'>+	/* lower transfer mode */</div><div class='add'>+	if (ata_down_xfermask_limit(dev, 0) == 0)</div><div class='add'>+		return ATA_EH_SOFTRESET;</div><div class='add'>+</div><div class='add'>+	ata_dev_printk(dev, KERN_ERR,</div><div class='add'>+		       "speed down requested but no transfer mode left\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_autopsy - analyze error and determine recovery action</div><div class='add'>+ *	@ap: ATA port to perform autopsy on</div><div class='add'>+ *</div><div class='add'>+ *	Analyze why @ap failed and determine which recovery action is</div><div class='add'>+ *	needed.  This function also sets more detailed AC_ERR_* values</div><div class='add'>+ *	and fills sense data for ATAPI CHECK SENSE.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_autopsy(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	unsigned int action = ehc-&gt;i.action;</div><div class='add'>+	struct ata_device *failed_dev = NULL;</div><div class='add'>+	unsigned int all_err_mask = 0;</div><div class='add'>+	int tag, is_io = 0;</div><div class='add'>+	u32 serror;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	if (ehc-&gt;i.flags &amp; ATA_EHI_NO_AUTOPSY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* obtain and analyze SError */</div><div class='add'>+	rc = sata_scr_read(ap, SCR_ERROR, &amp;serror);</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		ehc-&gt;i.serror |= serror;</div><div class='add'>+		ata_eh_analyze_serror(ap);</div><div class='add'>+	} else if (rc != -EOPNOTSUPP)</div><div class='add'>+		action |= ATA_EH_HARDRESET;</div><div class='add'>+</div><div class='add'>+	/* analyze NCQ failure */</div><div class='add'>+	ata_eh_analyze_ncq_error(ap);</div><div class='add'>+</div><div class='add'>+	/* any real error trumps AC_ERR_OTHER */</div><div class='add'>+	if (ehc-&gt;i.err_mask &amp; ~AC_ERR_OTHER)</div><div class='add'>+		ehc-&gt;i.err_mask &amp;= ~AC_ERR_OTHER;</div><div class='add'>+</div><div class='add'>+	all_err_mask |= ehc-&gt;i.err_mask;</div><div class='add'>+</div><div class='add'>+	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='add'>+		struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* inherit upper level err_mask */</div><div class='add'>+		qc-&gt;err_mask |= ehc-&gt;i.err_mask;</div><div class='add'>+</div><div class='add'>+		/* analyze TF */</div><div class='add'>+		action |= ata_eh_analyze_tf(qc, &amp;qc-&gt;result_tf);</div><div class='add'>+</div><div class='add'>+		/* DEV errors are probably spurious in case of ATA_BUS error */</div><div class='add'>+		if (qc-&gt;err_mask &amp; AC_ERR_ATA_BUS)</div><div class='add'>+			qc-&gt;err_mask &amp;= ~(AC_ERR_DEV | AC_ERR_MEDIA |</div><div class='add'>+					  AC_ERR_INVALID);</div><div class='add'>+</div><div class='add'>+		/* any real error trumps unknown error */</div><div class='add'>+		if (qc-&gt;err_mask &amp; ~AC_ERR_OTHER)</div><div class='add'>+			qc-&gt;err_mask &amp;= ~AC_ERR_OTHER;</div><div class='add'>+</div><div class='add'>+		/* SENSE_VALID trumps dev/unknown error and revalidation */</div><div class='add'>+		if (qc-&gt;flags &amp; ATA_QCFLAG_SENSE_VALID) {</div><div class='add'>+			qc-&gt;err_mask &amp;= ~(AC_ERR_DEV | AC_ERR_OTHER);</div><div class='add'>+			action &amp;= ~ATA_EH_REVALIDATE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* accumulate error info */</div><div class='add'>+		failed_dev = qc-&gt;dev;</div><div class='add'>+		all_err_mask |= qc-&gt;err_mask;</div><div class='add'>+		if (qc-&gt;flags &amp; ATA_QCFLAG_IO)</div><div class='add'>+			is_io = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enforce default EH actions */</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_FROZEN ||</div><div class='add'>+	    all_err_mask &amp; (AC_ERR_HSM | AC_ERR_TIMEOUT))</div><div class='add'>+		action |= ATA_EH_SOFTRESET;</div><div class='add'>+	else if (all_err_mask)</div><div class='add'>+		action |= ATA_EH_REVALIDATE;</div><div class='add'>+</div><div class='add'>+	/* if we have offending qcs and the associated failed device */</div><div class='add'>+	if (failed_dev) {</div><div class='add'>+		/* speed down */</div><div class='add'>+		action |= ata_eh_speed_down(failed_dev, is_io, all_err_mask);</div><div class='add'>+</div><div class='add'>+		/* perform per-dev EH action only on the offending device */</div><div class='add'>+		ehc-&gt;i.dev_action[failed_dev-&gt;devno] |=</div><div class='add'>+			action &amp; ATA_EH_PERDEV_MASK;</div><div class='add'>+		action &amp;= ~ATA_EH_PERDEV_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* record autopsy result */</div><div class='add'>+	ehc-&gt;i.dev = failed_dev;</div><div class='add'>+	ehc-&gt;i.action |= action;</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_report - report error handling to user</div><div class='add'>+ *	@ap: ATA port EH is going on</div><div class='add'>+ *</div><div class='add'>+ *	Report EH to user.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_report(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	const char *frozen, *desc;</div><div class='add'>+	int tag, nr_failed = 0;</div><div class='add'>+</div><div class='add'>+	desc = NULL;</div><div class='add'>+	if (ehc-&gt;i.desc[0] != '\0')</div><div class='add'>+		desc = ehc-&gt;i.desc;</div><div class='add'>+</div><div class='add'>+	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='add'>+		struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED))</div><div class='add'>+			continue;</div><div class='add'>+		if (qc-&gt;flags &amp; ATA_QCFLAG_SENSE_VALID &amp;&amp; !qc-&gt;err_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nr_failed++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nr_failed &amp;&amp; !ehc-&gt;i.err_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	frozen = "";</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_FROZEN)</div><div class='add'>+		frozen = " frozen";</div><div class='add'>+</div><div class='add'>+	if (ehc-&gt;i.dev) {</div><div class='add'>+		ata_dev_printk(ehc-&gt;i.dev, KERN_ERR, "exception Emask 0x%x "</div><div class='add'>+			       "SAct 0x%x SErr 0x%x action 0x%x%s\n",</div><div class='add'>+			       ehc-&gt;i.err_mask, ap-&gt;sactive, ehc-&gt;i.serror,</div><div class='add'>+			       ehc-&gt;i.action, frozen);</div><div class='add'>+		if (desc)</div><div class='add'>+			ata_dev_printk(ehc-&gt;i.dev, KERN_ERR, "(%s)\n", desc);</div><div class='add'>+	} else {</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "exception Emask 0x%x "</div><div class='add'>+				"SAct 0x%x SErr 0x%x action 0x%x%s\n",</div><div class='add'>+				ehc-&gt;i.err_mask, ap-&gt;sactive, ehc-&gt;i.serror,</div><div class='add'>+				ehc-&gt;i.action, frozen);</div><div class='add'>+		if (desc)</div><div class='add'>+			ata_port_printk(ap, KERN_ERR, "(%s)\n", desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='add'>+		struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED) || !qc-&gt;err_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ata_dev_printk(qc-&gt;dev, KERN_ERR, "tag %d cmd 0x%x "</div><div class='add'>+			       "Emask 0x%x stat 0x%x err 0x%x (%s)\n",</div><div class='add'>+			       qc-&gt;tag, qc-&gt;tf.command, qc-&gt;err_mask,</div><div class='add'>+			       qc-&gt;result_tf.command, qc-&gt;result_tf.feature,</div><div class='add'>+			       ata_err_string(qc-&gt;err_mask));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,</div><div class='add'>+			unsigned int *classes)</div><div class='add'>+{</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		classes[i] = ATA_DEV_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	rc = reset(ap, classes);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* If any class isn't ATA_DEV_UNKNOWN, consider classification</div><div class='add'>+	 * is complete and convert all ATA_DEV_UNKNOWN to</div><div class='add'>+	 * ATA_DEV_NONE.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		if (classes[i] != ATA_DEV_UNKNOWN)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (i &lt; ATA_MAX_DEVICES)</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+			if (classes[i] == ATA_DEV_UNKNOWN)</div><div class='add'>+				classes[i] = ATA_DEV_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_eh_followup_srst_needed(int rc, int classify,</div><div class='add'>+				       const unsigned int *classes)</div><div class='add'>+{</div><div class='add'>+	if (rc == -EAGAIN)</div><div class='add'>+		return 1;</div><div class='add'>+	if (rc != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (classify &amp;&amp; classes[0] == ATA_DEV_UNKNOWN)</div><div class='add'>+		return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_eh_reset(struct ata_port *ap, int classify,</div><div class='add'>+			ata_prereset_fn_t prereset, ata_reset_fn_t softreset,</div><div class='add'>+			ata_reset_fn_t hardreset, ata_postreset_fn_t postreset)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	unsigned int *classes = ehc-&gt;classes;</div><div class='add'>+	int tries = ATA_EH_RESET_TRIES;</div><div class='add'>+	int verbose = !(ehc-&gt;i.flags &amp; ATA_EHI_QUIET);</div><div class='add'>+	unsigned int action;</div><div class='add'>+	ata_reset_fn_t reset;</div><div class='add'>+	int i, did_followup_srst, rc;</div><div class='add'>+</div><div class='add'>+	/* Determine which reset to use and record in ehc-&gt;i.action.</div><div class='add'>+	 * prereset() may examine and modify it.</div><div class='add'>+	 */</div><div class='add'>+	action = ehc-&gt;i.action;</div><div class='add'>+	ehc-&gt;i.action &amp;= ~ATA_EH_RESET_MASK;</div><div class='add'>+	if (softreset &amp;&amp; (!hardreset || (!sata_set_spd_needed(ap) &amp;&amp;</div><div class='add'>+					 !(action &amp; ATA_EH_HARDRESET))))</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_SOFTRESET;</div><div class='add'>+	else</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_HARDRESET;</div><div class='add'>+</div><div class='add'>+	if (prereset) {</div><div class='add'>+		rc = prereset(ap);</div><div class='add'>+		if (rc) {</div><div class='add'>+			ata_port_printk(ap, KERN_ERR,</div><div class='add'>+					"prereset failed (errno=%d)\n", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* prereset() might have modified ehc-&gt;i.action */</div><div class='add'>+	if (ehc-&gt;i.action &amp; ATA_EH_HARDRESET)</div><div class='add'>+		reset = hardreset;</div><div class='add'>+	else if (ehc-&gt;i.action &amp; ATA_EH_SOFTRESET)</div><div class='add'>+		reset = softreset;</div><div class='add'>+	else {</div><div class='add'>+		/* prereset told us not to reset, bang classes and return */</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+			classes[i] = ATA_DEV_NONE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* did prereset() screw up?  if so, fix up to avoid oopsing */</div><div class='add'>+	if (!reset) {</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "BUG: prereset() requested "</div><div class='add'>+				"invalid reset type\n");</div><div class='add'>+		if (softreset)</div><div class='add'>+			reset = softreset;</div><div class='add'>+		else</div><div class='add'>+			reset = hardreset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ retry:</div><div class='add'>+	/* shut up during boot probing */</div><div class='add'>+	if (verbose)</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "%s resetting port\n",</div><div class='add'>+				reset == softreset ? "soft" : "hard");</div><div class='add'>+</div><div class='add'>+	/* reset */</div><div class='add'>+	ata_eh_about_to_do(ap, NULL, ATA_EH_RESET_MASK);</div><div class='add'>+	ehc-&gt;i.flags |= ATA_EHI_DID_RESET;</div><div class='add'>+</div><div class='add'>+	rc = ata_do_reset(ap, reset, classes);</div><div class='add'>+</div><div class='add'>+	did_followup_srst = 0;</div><div class='add'>+	if (reset == hardreset &amp;&amp;</div><div class='add'>+	    ata_eh_followup_srst_needed(rc, classify, classes)) {</div><div class='add'>+		/* okay, let's do follow-up softreset */</div><div class='add'>+		did_followup_srst = 1;</div><div class='add'>+		reset = softreset;</div><div class='add'>+</div><div class='add'>+		if (!reset) {</div><div class='add'>+			ata_port_printk(ap, KERN_ERR,</div><div class='add'>+					"follow-up softreset required "</div><div class='add'>+					"but no softreset avaliable\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ata_eh_about_to_do(ap, NULL, ATA_EH_RESET_MASK);</div><div class='add'>+		rc = ata_do_reset(ap, reset, classes);</div><div class='add'>+</div><div class='add'>+		if (rc == 0 &amp;&amp; classify &amp;&amp;</div><div class='add'>+		    classes[0] == ATA_DEV_UNKNOWN) {</div><div class='add'>+			ata_port_printk(ap, KERN_ERR,</div><div class='add'>+					"classification failed\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc &amp;&amp; --tries) {</div><div class='add'>+		const char *type;</div><div class='add'>+</div><div class='add'>+		if (reset == softreset) {</div><div class='add'>+			if (did_followup_srst)</div><div class='add'>+				type = "follow-up soft";</div><div class='add'>+			else</div><div class='add'>+				type = "soft";</div><div class='add'>+		} else</div><div class='add'>+			type = "hard";</div><div class='add'>+</div><div class='add'>+		ata_port_printk(ap, KERN_WARNING,</div><div class='add'>+				"%sreset failed, retrying in 5 secs\n", type);</div><div class='add'>+		ssleep(5);</div><div class='add'>+</div><div class='add'>+		if (reset == hardreset)</div><div class='add'>+			sata_down_spd_limit(ap);</div><div class='add'>+		if (hardreset)</div><div class='add'>+			reset = hardreset;</div><div class='add'>+		goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc == 0) {</div><div class='add'>+		/* After the reset, the device state is PIO 0 and the</div><div class='add'>+		 * controller state is undefined.  Record the mode.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+			ap-&gt;device[i].pio_mode = XFER_PIO_0;</div><div class='add'>+</div><div class='add'>+		if (postreset)</div><div class='add'>+			postreset(ap, classes);</div><div class='add'>+</div><div class='add'>+		/* reset successful, schedule revalidation */</div><div class='add'>+		ata_eh_done(ap, NULL, ATA_EH_RESET_MASK);</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_REVALIDATE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_eh_revalidate_and_attach(struct ata_port *ap,</div><div class='add'>+					struct ata_device **r_failed_dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		unsigned int action;</div><div class='add'>+</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+		action = ata_eh_dev_action(dev);</div><div class='add'>+</div><div class='add'>+		if (action &amp; ATA_EH_REVALIDATE &amp;&amp; ata_dev_ready(dev)) {</div><div class='add'>+			if (ata_port_offline(ap)) {</div><div class='add'>+				rc = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ata_eh_about_to_do(ap, dev, ATA_EH_REVALIDATE);</div><div class='add'>+			rc = ata_dev_revalidate(dev,</div><div class='add'>+					ehc-&gt;i.flags &amp; ATA_EHI_DID_RESET);</div><div class='add'>+			if (rc)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			ata_eh_done(ap, dev, ATA_EH_REVALIDATE);</div><div class='add'>+</div><div class='add'>+			/* schedule the scsi_rescan_device() here */</div><div class='add'>+			queue_work(ata_aux_wq, &amp;(ap-&gt;scsi_rescan_task));</div><div class='add'>+		} else if (dev-&gt;class == ATA_DEV_UNKNOWN &amp;&amp;</div><div class='add'>+			   ehc-&gt;tries[dev-&gt;devno] &amp;&amp;</div><div class='add'>+			   ata_class_enabled(ehc-&gt;classes[dev-&gt;devno])) {</div><div class='add'>+			dev-&gt;class = ehc-&gt;classes[dev-&gt;devno];</div><div class='add'>+</div><div class='add'>+			rc = ata_dev_read_id(dev, &amp;dev-&gt;class, 1, dev-&gt;id);</div><div class='add'>+			if (rc == 0)</div><div class='add'>+				rc = ata_dev_configure(dev, 1);</div><div class='add'>+</div><div class='add'>+			if (rc) {</div><div class='add'>+				dev-&gt;class = ATA_DEV_UNKNOWN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+			ap-&gt;pflags |= ATA_PFLAG_SCSI_HOTPLUG;</div><div class='add'>+			spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		*r_failed_dev = dev;</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_suspend - handle suspend EH action</div><div class='add'>+ *	@ap: target host port</div><div class='add'>+ *	@r_failed_dev: result parameter to indicate failing device</div><div class='add'>+ *</div><div class='add'>+ *	Handle suspend EH action.  Disk devices are spinned down and</div><div class='add'>+ *	other types of devices are just marked suspended.  Once</div><div class='add'>+ *	suspended, no EH action to the device is allowed until it is</div><div class='add'>+ *	resumed.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno otherwise</div><div class='add'>+ */</div><div class='add'>+static int ata_eh_suspend(struct ata_port *ap, struct ata_device **r_failed_dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+		unsigned int action, err_mask;</div><div class='add'>+</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+		action = ata_eh_dev_action(dev);</div><div class='add'>+</div><div class='add'>+		if (!ata_dev_enabled(dev) || !(action &amp; ATA_EH_SUSPEND))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON(dev-&gt;flags &amp; ATA_DFLAG_SUSPENDED);</div><div class='add'>+</div><div class='add'>+		ata_eh_about_to_do(ap, dev, ATA_EH_SUSPEND);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;class == ATA_DEV_ATA &amp;&amp; !(action &amp; ATA_EH_PM_FREEZE)) {</div><div class='add'>+			/* flush cache */</div><div class='add'>+			rc = ata_flush_cache(dev);</div><div class='add'>+			if (rc)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* spin down */</div><div class='add'>+			err_mask = ata_do_simple_cmd(dev, ATA_CMD_STANDBYNOW1);</div><div class='add'>+			if (err_mask) {</div><div class='add'>+				ata_dev_printk(dev, KERN_ERR, "failed to "</div><div class='add'>+					       "spin down (err_mask=0x%x)\n",</div><div class='add'>+					       err_mask);</div><div class='add'>+				rc = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_SUSPENDED;</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		ata_eh_done(ap, dev, ATA_EH_SUSPEND);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		*r_failed_dev = dev;</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_prep_resume - prep for resume EH action</div><div class='add'>+ *	@ap: target host port</div><div class='add'>+ *</div><div class='add'>+ *	Clear SUSPENDED in preparation for scheduled resume actions.</div><div class='add'>+ *	This allows other parts of EH to access the devices being</div><div class='add'>+ *	resumed.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_prep_resume(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		unsigned int action;</div><div class='add'>+</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+		action = ata_eh_dev_action(dev);</div><div class='add'>+</div><div class='add'>+		if (!ata_dev_enabled(dev) || !(action &amp; ATA_EH_RESUME))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+		dev-&gt;flags &amp;= ~ATA_DFLAG_SUSPENDED;</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_resume - handle resume EH action</div><div class='add'>+ *	@ap: target host port</div><div class='add'>+ *	@r_failed_dev: result parameter to indicate failing device</div><div class='add'>+ *</div><div class='add'>+ *	Handle resume EH action.  Target devices are already reset and</div><div class='add'>+ *	revalidated.  Spinning up is the only operation left.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno otherwise</div><div class='add'>+ */</div><div class='add'>+static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		unsigned int action, err_mask;</div><div class='add'>+</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+		action = ata_eh_dev_action(dev);</div><div class='add'>+</div><div class='add'>+		if (!ata_dev_enabled(dev) || !(action &amp; ATA_EH_RESUME))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ata_eh_about_to_do(ap, dev, ATA_EH_RESUME);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;class == ATA_DEV_ATA &amp;&amp; !(action &amp; ATA_EH_PM_FREEZE)) {</div><div class='add'>+			err_mask = ata_do_simple_cmd(dev,</div><div class='add'>+						     ATA_CMD_IDLEIMMEDIATE);</div><div class='add'>+			if (err_mask) {</div><div class='add'>+				ata_dev_printk(dev, KERN_ERR, "failed to "</div><div class='add'>+					       "spin up (err_mask=0x%x)\n",</div><div class='add'>+					       err_mask);</div><div class='add'>+				rc = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ata_eh_done(ap, dev, ATA_EH_RESUME);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		*r_failed_dev = dev;</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_nr_enabled(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	int i, cnt = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		if (ata_dev_enabled(&amp;ap-&gt;device[i]))</div><div class='add'>+			cnt++;</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_port_nr_vacant(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	int i, cnt = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		if (ap-&gt;device[i].class == ATA_DEV_UNKNOWN)</div><div class='add'>+			cnt++;</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ata_eh_skip_recovery(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* skip if all possible devices are suspended */</div><div class='add'>+	for (i = 0; i &lt; ata_port_max_devices(ap); i++) {</div><div class='add'>+		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+</div><div class='add'>+		if (ata_dev_absent(dev) || ata_dev_ready(dev))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == ata_port_max_devices(ap))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* always thaw frozen port and recover failed devices */</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_FROZEN || ata_port_nr_enabled(ap))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* skip if class codes for all vacant slots are ATA_DEV_NONE */</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;class == ATA_DEV_UNKNOWN &amp;&amp;</div><div class='add'>+		    ehc-&gt;classes[dev-&gt;devno] != ATA_DEV_NONE)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_recover - recover host port after error</div><div class='add'>+ *	@ap: host port to recover</div><div class='add'>+ *	@prereset: prereset method (can be NULL)</div><div class='add'>+ *	@softreset: softreset method (can be NULL)</div><div class='add'>+ *	@hardreset: hardreset method (can be NULL)</div><div class='add'>+ *	@postreset: postreset method (can be NULL)</div><div class='add'>+ *</div><div class='add'>+ *	This is the alpha and omega, eum and yang, heart and soul of</div><div class='add'>+ *	libata exception handling.  On entry, actions required to</div><div class='add'>+ *	recover the port and hotplug requests are recorded in</div><div class='add'>+ *	eh_context.  This function executes all the operations with</div><div class='add'>+ *	appropriate retrials and fallbacks to resurrect failed</div><div class='add'>+ *	devices, detach goners and greet newcomers.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno on failure.</div><div class='add'>+ */</div><div class='add'>+static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='add'>+			  ata_reset_fn_t softreset, ata_reset_fn_t hardreset,</div><div class='add'>+			  ata_postreset_fn_t postreset)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	int down_xfermask, i, rc;</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	/* prep for recovery */</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+</div><div class='add'>+		ehc-&gt;tries[dev-&gt;devno] = ATA_EH_DEV_TRIES;</div><div class='add'>+</div><div class='add'>+		/* process hotplug request */</div><div class='add'>+		if (dev-&gt;flags &amp; ATA_DFLAG_DETACH)</div><div class='add'>+			ata_eh_detach_dev(dev);</div><div class='add'>+</div><div class='add'>+		if (!ata_dev_enabled(dev) &amp;&amp;</div><div class='add'>+		    ((ehc-&gt;i.probe_mask &amp; (1 &lt;&lt; dev-&gt;devno)) &amp;&amp;</div><div class='add'>+		     !(ehc-&gt;did_probe_mask &amp; (1 &lt;&lt; dev-&gt;devno)))) {</div><div class='add'>+			ata_eh_detach_dev(dev);</div><div class='add'>+			ata_dev_init(dev);</div><div class='add'>+			ehc-&gt;did_probe_mask |= (1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+			ehc-&gt;i.action |= ATA_EH_SOFTRESET;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ retry:</div><div class='add'>+	down_xfermask = 0;</div><div class='add'>+	rc = 0;</div><div class='add'>+</div><div class='add'>+	/* if UNLOADING, finish immediately */</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_UNLOADING)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* prep for resume */</div><div class='add'>+	ata_eh_prep_resume(ap);</div><div class='add'>+</div><div class='add'>+	/* skip EH if possible. */</div><div class='add'>+	if (ata_eh_skip_recovery(ap))</div><div class='add'>+		ehc-&gt;i.action = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+		ehc-&gt;classes[i] = ATA_DEV_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* reset */</div><div class='add'>+	if (ehc-&gt;i.action &amp; ATA_EH_RESET_MASK) {</div><div class='add'>+		ata_eh_freeze_port(ap);</div><div class='add'>+</div><div class='add'>+		rc = ata_eh_reset(ap, ata_port_nr_vacant(ap), prereset,</div><div class='add'>+				  softreset, hardreset, postreset);</div><div class='add'>+		if (rc) {</div><div class='add'>+			ata_port_printk(ap, KERN_ERR,</div><div class='add'>+					"reset failed, giving up\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ata_eh_thaw_port(ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* revalidate existing devices and attach new ones */</div><div class='add'>+	rc = ata_eh_revalidate_and_attach(ap, &amp;dev);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto dev_fail;</div><div class='add'>+</div><div class='add'>+	/* resume devices */</div><div class='add'>+	rc = ata_eh_resume(ap, &amp;dev);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto dev_fail;</div><div class='add'>+</div><div class='add'>+	/* configure transfer mode if the port has been reset */</div><div class='add'>+	if (ehc-&gt;i.flags &amp; ATA_EHI_DID_RESET) {</div><div class='add'>+		rc = ata_set_mode(ap, &amp;dev);</div><div class='add'>+		if (rc) {</div><div class='add'>+			down_xfermask = 1;</div><div class='add'>+			goto dev_fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* suspend devices */</div><div class='add'>+	rc = ata_eh_suspend(ap, &amp;dev);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto dev_fail;</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+ dev_fail:</div><div class='add'>+	switch (rc) {</div><div class='add'>+	case -ENODEV:</div><div class='add'>+		/* device missing, schedule probing */</div><div class='add'>+		ehc-&gt;i.probe_mask |= (1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+	case -EINVAL:</div><div class='add'>+		ehc-&gt;tries[dev-&gt;devno] = 0;</div><div class='add'>+		break;</div><div class='add'>+	case -EIO:</div><div class='add'>+		sata_down_spd_limit(ap);</div><div class='add'>+	default:</div><div class='add'>+		ehc-&gt;tries[dev-&gt;devno]--;</div><div class='add'>+		if (down_xfermask &amp;&amp;</div><div class='add'>+		    ata_down_xfermask_limit(dev, ehc-&gt;tries[dev-&gt;devno] == 1))</div><div class='add'>+			ehc-&gt;tries[dev-&gt;devno] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ata_dev_enabled(dev) &amp;&amp; !ehc-&gt;tries[dev-&gt;devno]) {</div><div class='add'>+		/* disable device if it has used up all its chances */</div><div class='add'>+		ata_dev_disable(dev);</div><div class='add'>+</div><div class='add'>+		/* detach if offline */</div><div class='add'>+		if (ata_port_offline(ap))</div><div class='add'>+			ata_eh_detach_dev(dev);</div><div class='add'>+</div><div class='add'>+		/* probe if requested */</div><div class='add'>+		if ((ehc-&gt;i.probe_mask &amp; (1 &lt;&lt; dev-&gt;devno)) &amp;&amp;</div><div class='add'>+		    !(ehc-&gt;did_probe_mask &amp; (1 &lt;&lt; dev-&gt;devno))) {</div><div class='add'>+			ata_eh_detach_dev(dev);</div><div class='add'>+			ata_dev_init(dev);</div><div class='add'>+</div><div class='add'>+			ehc-&gt;tries[dev-&gt;devno] = ATA_EH_DEV_TRIES;</div><div class='add'>+			ehc-&gt;did_probe_mask |= (1 &lt;&lt; dev-&gt;devno);</div><div class='add'>+			ehc-&gt;i.action |= ATA_EH_SOFTRESET;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* soft didn't work?  be haaaaard */</div><div class='add'>+		if (ehc-&gt;i.flags &amp; ATA_EHI_DID_RESET)</div><div class='add'>+			ehc-&gt;i.action |= ATA_EH_HARDRESET;</div><div class='add'>+		else</div><div class='add'>+			ehc-&gt;i.action |= ATA_EH_SOFTRESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ata_port_nr_enabled(ap)) {</div><div class='add'>+		ata_port_printk(ap, KERN_WARNING, "failed to recover some "</div><div class='add'>+				"devices, retrying in 5 secs\n");</div><div class='add'>+		ssleep(5);</div><div class='add'>+	} else {</div><div class='add'>+		/* no device left, repeat fast */</div><div class='add'>+		msleep(500);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto retry;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	if (rc) {</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++)</div><div class='add'>+			ata_dev_disable(&amp;ap-&gt;device[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT, rc=%d\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_finish - finish up EH</div><div class='add'>+ *	@ap: host port to finish EH for</div><div class='add'>+ *</div><div class='add'>+ *	Recovery is complete.  Clean up EH states and retry or finish</div><div class='add'>+ *	failed qcs.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	None.</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_finish(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	int tag;</div><div class='add'>+</div><div class='add'>+	/* retry or finish qcs */</div><div class='add'>+	for (tag = 0; tag &lt; ATA_MAX_QUEUE; tag++) {</div><div class='add'>+		struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);</div><div class='add'>+</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_FAILED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (qc-&gt;err_mask) {</div><div class='add'>+			/* FIXME: Once EH migration is complete,</div><div class='add'>+			 * generate sense data in this function,</div><div class='add'>+			 * considering both err_mask and tf.</div><div class='add'>+			 */</div><div class='add'>+			if (qc-&gt;err_mask &amp; AC_ERR_INVALID)</div><div class='add'>+				ata_eh_qc_complete(qc);</div><div class='add'>+			else</div><div class='add'>+				ata_eh_qc_retry(qc);</div><div class='add'>+		} else {</div><div class='add'>+			if (qc-&gt;flags &amp; ATA_QCFLAG_SENSE_VALID) {</div><div class='add'>+				ata_eh_qc_complete(qc);</div><div class='add'>+			} else {</div><div class='add'>+				/* feed zero TF to sense generation */</div><div class='add'>+				memset(&amp;qc-&gt;result_tf, 0, sizeof(qc-&gt;result_tf));</div><div class='add'>+				ata_eh_qc_retry(qc);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_do_eh - do standard error handling</div><div class='add'>+ *	@ap: host port to handle error for</div><div class='add'>+ *	@prereset: prereset method (can be NULL)</div><div class='add'>+ *	@softreset: softreset method (can be NULL)</div><div class='add'>+ *	@hardreset: hardreset method (can be NULL)</div><div class='add'>+ *	@postreset: postreset method (can be NULL)</div><div class='add'>+ *</div><div class='add'>+ *	Perform standard error handling sequence.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,</div><div class='add'>+	       ata_reset_fn_t softreset, ata_reset_fn_t hardreset,</div><div class='add'>+	       ata_postreset_fn_t postreset)</div><div class='add'>+{</div><div class='add'>+	ata_eh_autopsy(ap);</div><div class='add'>+	ata_eh_report(ap);</div><div class='add'>+	ata_eh_recover(ap, prereset, softreset, hardreset, postreset);</div><div class='add'>+	ata_eh_finish(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_handle_port_suspend - perform port suspend operation</div><div class='add'>+ *	@ap: port to suspend</div><div class='add'>+ *</div><div class='add'>+ *	Suspend @ap.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_handle_port_suspend(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	/* are we suspending? */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	if (!(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING) ||</div><div class='add'>+	    ap-&gt;pm_mesg.event == PM_EVENT_ON) {</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	WARN_ON(ap-&gt;pflags &amp; ATA_PFLAG_SUSPENDED);</div><div class='add'>+</div><div class='add'>+	/* suspend */</div><div class='add'>+	ata_eh_freeze_port(ap);</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;ops-&gt;port_suspend)</div><div class='add'>+		rc = ap-&gt;ops-&gt;port_suspend(ap, ap-&gt;pm_mesg);</div><div class='add'>+</div><div class='add'>+	/* report result */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ap-&gt;pflags &amp;= ~ATA_PFLAG_PM_PENDING;</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		ap-&gt;pflags |= ATA_PFLAG_SUSPENDED;</div><div class='add'>+	else</div><div class='add'>+		ata_port_schedule_eh(ap);</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;pm_result) {</div><div class='add'>+		*ap-&gt;pm_result = rc;</div><div class='add'>+		ap-&gt;pm_result = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_eh_handle_port_resume - perform port resume operation</div><div class='add'>+ *	@ap: port to resume</div><div class='add'>+ *</div><div class='add'>+ *	Resume @ap.</div><div class='add'>+ *</div><div class='add'>+ *	This function also waits upto one second until all devices</div><div class='add'>+ *	hanging off this port requests resume EH action.  This is to</div><div class='add'>+ *	prevent invoking EH and thus reset multiple times on resume.</div><div class='add'>+ *</div><div class='add'>+ *	On DPM resume, where some of devices might not be resumed</div><div class='add'>+ *	together, this may delay port resume upto one second, but such</div><div class='add'>+ *	DPM resumes are rare and 1 sec delay isn't too bad.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+static void ata_eh_handle_port_resume(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	/* are we resuming? */</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	if (!(ap-&gt;pflags &amp; ATA_PFLAG_PM_PENDING) ||</div><div class='add'>+	    ap-&gt;pm_mesg.event != PM_EVENT_ON) {</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* spurious? */</div><div class='add'>+	if (!(ap-&gt;pflags &amp; ATA_PFLAG_SUSPENDED))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;ops-&gt;port_resume)</div><div class='add'>+		rc = ap-&gt;ops-&gt;port_resume(ap);</div><div class='add'>+</div><div class='add'>+	/* give devices time to request EH */</div><div class='add'>+	timeout = jiffies + HZ; /* 1s max */</div><div class='add'>+	while (1) {</div><div class='add'>+		for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+			struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+			unsigned int action = ata_eh_dev_action(dev);</div><div class='add'>+</div><div class='add'>+			if ((dev-&gt;flags &amp; ATA_DFLAG_SUSPENDED) &amp;&amp;</div><div class='add'>+			    !(action &amp; ATA_EH_RESUME))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == ATA_MAX_DEVICES || time_after(jiffies, timeout))</div><div class='add'>+			break;</div><div class='add'>+		msleep(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ done:</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	ap-&gt;pflags &amp;= ~(ATA_PFLAG_PM_PENDING | ATA_PFLAG_SUSPENDED);</div><div class='add'>+	if (ap-&gt;pm_result) {</div><div class='add'>+		*ap-&gt;pm_result = rc;</div><div class='add'>+		ap-&gt;pm_result = NULL;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c<br/>index a0289ec3e283..7ced41ecde86 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libata-scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata-scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libata-scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/libata-scsi.c</a></div><div class='hunk'>@@ -38,9 +38,10 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_tcq.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport.h&gt;</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='hunk'>@@ -51,10 +52,14 @@</div><div class='ctx'> #define SECTOR_SIZE	512</div><div class='ctx'> </div><div class='ctx'> typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, const u8 *scsicmd);</div><div class='del'>-static struct ata_device *</div><div class='del'>-ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev);</div><div class='del'>-static void ata_scsi_error(struct Scsi_Host *host);</div><div class='del'>-enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);</div><div class='add'>+</div><div class='add'>+static struct ata_device * __ata_scsi_find_dev(struct ata_port *ap,</div><div class='add'>+					const struct scsi_device *scsidev);</div><div class='add'>+static struct ata_device * ata_scsi_find_dev(struct ata_port *ap,</div><div class='add'>+					    const struct scsi_device *scsidev);</div><div class='add'>+static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,</div><div class='add'>+			      unsigned int id, unsigned int lun);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define RW_RECOVERY_MPAGE 0x1</div><div class='ctx'> #define RW_RECOVERY_MPAGE_LEN 12</div><div class='hunk'>@@ -102,6 +107,7 @@ static const u8 def_control_mpage[CONTROL_MPAGE_LEN] = {</div><div class='ctx'> struct scsi_transport_template ata_scsi_transport_template = {</div><div class='ctx'> 	.eh_strategy_handler	= ata_scsi_error,</div><div class='ctx'> 	.eh_timed_out		= ata_scsi_timed_out,</div><div class='add'>+	.user_scan		= ata_scsi_user_scan,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -216,9 +222,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)</div><div class='ctx'> 	 &amp;&amp; copy_to_user(arg + sizeof(args), argbuf, argsize))</div><div class='ctx'> 		rc = -EFAULT;</div><div class='ctx'> error:</div><div class='del'>-	if (argbuf)</div><div class='del'>-		kfree(argbuf);</div><div class='del'>-</div><div class='add'>+	kfree(argbuf);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -304,7 +308,6 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_scsi_qc_new - acquire new ata_queued_cmd reference</div><div class='del'>- *	@ap: ATA port to which the new command is attached</div><div class='ctx'>  *	@dev: ATA device to which the new command is attached</div><div class='ctx'>  *	@cmd: SCSI command that originated this ATA command</div><div class='ctx'>  *	@done: SCSI command completion function</div><div class='hunk'>@@ -323,14 +326,13 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	Command allocated, or %NULL if none available.</div><div class='ctx'>  */</div><div class='del'>-struct ata_queued_cmd *ata_scsi_qc_new(struct ata_port *ap,</div><div class='del'>-				       struct ata_device *dev,</div><div class='add'>+struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,</div><div class='ctx'> 				       struct scsi_cmnd *cmd,</div><div class='ctx'> 				       void (*done)(struct scsi_cmnd *))</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='del'>-	qc = ata_qc_new_init(ap, dev);</div><div class='add'>+	qc = ata_qc_new_init(dev);</div><div class='ctx'> 	if (qc) {</div><div class='ctx'> 		qc-&gt;scsicmd = cmd;</div><div class='ctx'> 		qc-&gt;scsidone = done;</div><div class='hunk'>@@ -395,20 +397,129 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ata_scsi_device_resume(struct scsi_device *sdev)</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_device_suspend - suspend ATA device associated with sdev</div><div class='add'>+ *	@sdev: the SCSI device to suspend</div><div class='add'>+ *	@state: target power management state</div><div class='add'>+ *</div><div class='add'>+ *	Request suspend EH action on the ATA device associated with</div><div class='add'>+ *	@sdev and wait for the operation to complete.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, -errno otherwise.</div><div class='add'>+ */</div><div class='add'>+int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = (struct ata_port *) &amp;sdev-&gt;host-&gt;hostdata[0];</div><div class='del'>-	struct ata_device *dev = &amp;ap-&gt;device[sdev-&gt;id];</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+	struct ata_device *dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int action;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* wait for the previous resume to complete */</div><div class='add'>+	while (dev-&gt;flags &amp; ATA_DFLAG_SUSPENDED) {</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+		ata_port_wait_eh(ap);</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if @sdev is already detached, nothing to do */</div><div class='add'>+	if (sdev-&gt;sdev_state == SDEV_OFFLINE ||</div><div class='add'>+	    sdev-&gt;sdev_state == SDEV_CANCEL || sdev-&gt;sdev_state == SDEV_DEL)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* request suspend */</div><div class='add'>+	action = ATA_EH_SUSPEND;</div><div class='add'>+	if (state.event != PM_EVENT_SUSPEND)</div><div class='add'>+		action |= ATA_EH_PM_FREEZE;</div><div class='add'>+	ap-&gt;eh_info.dev_action[dev-&gt;devno] |= action;</div><div class='add'>+	ap-&gt;eh_info.flags |= ATA_EHI_QUIET;</div><div class='add'>+	ata_port_schedule_eh(ap);</div><div class='ctx'> </div><div class='del'>-	return ata_device_resume(ap, dev);</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* wait for EH to do the job */</div><div class='add'>+	ata_port_wait_eh(ap);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* If @sdev is still attached but the associated ATA device</div><div class='add'>+	 * isn't suspended, the operation failed.</div><div class='add'>+	 */</div><div class='add'>+	if (sdev-&gt;sdev_state != SDEV_OFFLINE &amp;&amp;</div><div class='add'>+	    sdev-&gt;sdev_state != SDEV_CANCEL &amp;&amp; sdev-&gt;sdev_state != SDEV_DEL &amp;&amp;</div><div class='add'>+	    !(dev-&gt;flags &amp; ATA_DFLAG_SUSPENDED))</div><div class='add'>+		rc = -EIO;</div><div class='add'>+</div><div class='add'>+ out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+ out:</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		sdev-&gt;sdev_gendev.power.power_state = state;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_device_resume - resume ATA device associated with sdev</div><div class='add'>+ *	@sdev: the SCSI device to resume</div><div class='add'>+ *</div><div class='add'>+ *	Request resume EH action on the ATA device associated with</div><div class='add'>+ *	@sdev and return immediately.  This enables parallel</div><div class='add'>+ *	wakeup/spinup of devices.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0.</div><div class='add'>+ */</div><div class='add'>+int ata_scsi_device_resume(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='del'>-	struct ata_port *ap = (struct ata_port *) &amp;sdev-&gt;host-&gt;hostdata[0];</div><div class='del'>-	struct ata_device *dev = &amp;ap-&gt;device[sdev-&gt;id];</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+	struct ata_device *dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	struct ata_eh_info *ehi = &amp;ap-&gt;eh_info;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int action;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* if @sdev is already detached, nothing to do */</div><div class='add'>+	if (sdev-&gt;sdev_state == SDEV_OFFLINE ||</div><div class='add'>+	    sdev-&gt;sdev_state == SDEV_CANCEL || sdev-&gt;sdev_state == SDEV_DEL)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	return ata_device_suspend(ap, dev, state);</div><div class='add'>+	/* request resume */</div><div class='add'>+	action = ATA_EH_RESUME;</div><div class='add'>+	if (sdev-&gt;sdev_gendev.power.power_state.event == PM_EVENT_SUSPEND)</div><div class='add'>+		__ata_ehi_hotplugged(ehi);</div><div class='add'>+	else</div><div class='add'>+		action |= ATA_EH_PM_FREEZE | ATA_EH_SOFTRESET;</div><div class='add'>+	ehi-&gt;dev_action[dev-&gt;devno] |= action;</div><div class='add'>+</div><div class='add'>+	/* We don't want autopsy and verbose EH messages.  Disable</div><div class='add'>+	 * those if we're the only device on this link.</div><div class='add'>+	 */</div><div class='add'>+	if (ata_port_max_devices(ap) == 1)</div><div class='add'>+		ehi-&gt;flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;</div><div class='add'>+</div><div class='add'>+	ata_port_schedule_eh(ap);</div><div class='add'>+</div><div class='add'>+ out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+ out:</div><div class='add'>+	sdev-&gt;sdev_gendev.power.power_state = PMSG_ON;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -419,6 +530,7 @@ int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)</div><div class='ctx'>  *	@sk: the sense key we'll fill out</div><div class='ctx'>  *	@asc: the additional sense code we'll fill out</div><div class='ctx'>  *	@ascq: the additional sense code qualifier we'll fill out</div><div class='add'>+ *	@verbose: be verbose</div><div class='ctx'>  *</div><div class='ctx'>  *	Converts an ATA error into a SCSI error.  Fill out pointers to</div><div class='ctx'>  *	SK, ASC, and ASCQ bytes for later use in fixed or descriptor</div><div class='hunk'>@@ -428,7 +540,7 @@ int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)</div><div class='ctx'>  *	spin_lock_irqsave(host_set lock)</div><div class='ctx'>  */</div><div class='ctx'> void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,</div><div class='del'>-			u8 *ascq)</div><div class='add'>+			u8 *ascq, int verbose)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -493,8 +605,9 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* No immediate match */</div><div class='del'>-		printk(KERN_WARNING "ata%u: no sense translation for "</div><div class='del'>-		       "error 0x%02x\n", id, drv_err);</div><div class='add'>+		if (verbose)</div><div class='add'>+			printk(KERN_WARNING "ata%u: no sense translation for "</div><div class='add'>+			       "error 0x%02x\n", id, drv_err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fall back to interpreting status bits */</div><div class='hunk'>@@ -507,8 +620,9 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* No error?  Undecoded? */</div><div class='del'>-	printk(KERN_WARNING "ata%u: no sense translation for status: 0x%02x\n",</div><div class='del'>-	       id, drv_stat);</div><div class='add'>+	if (verbose)</div><div class='add'>+		printk(KERN_WARNING "ata%u: no sense translation for "</div><div class='add'>+		       "status: 0x%02x\n", id, drv_stat);</div><div class='ctx'> </div><div class='ctx'> 	/* We need a sensible error return here, which is tricky, and one</div><div class='ctx'> 	   that won't cause people to do things like return a disk wrongly */</div><div class='hunk'>@@ -517,9 +631,10 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,</div><div class='ctx'> 	*ascq = 0x00;</div><div class='ctx'> </div><div class='ctx'>  translate_done:</div><div class='del'>-	printk(KERN_ERR "ata%u: translated ATA stat/err 0x%02x/%02x to "</div><div class='del'>-	       "SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n", id, drv_stat, drv_err,</div><div class='del'>-	       *sk, *asc, *ascq);</div><div class='add'>+	if (verbose)</div><div class='add'>+		printk(KERN_ERR "ata%u: translated ATA stat/err 0x%02x/%02x "</div><div class='add'>+		       "to SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n",</div><div class='add'>+		       id, drv_stat, drv_err, *sk, *asc, *ascq);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -539,27 +654,23 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc,</div><div class='ctx'> void ata_gen_ata_desc_sense(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *cmd = qc-&gt;scsicmd;</div><div class='del'>-	struct ata_taskfile *tf = &amp;qc-&gt;tf;</div><div class='add'>+	struct ata_taskfile *tf = &amp;qc-&gt;result_tf;</div><div class='ctx'> 	unsigned char *sb = cmd-&gt;sense_buffer;</div><div class='ctx'> 	unsigned char *desc = sb + 8;</div><div class='add'>+	int verbose = qc-&gt;ap-&gt;ops-&gt;error_handler == NULL;</div><div class='ctx'> </div><div class='ctx'> 	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;result = (DRIVER_SENSE &lt;&lt; 24) | SAM_STAT_CHECK_CONDITION;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Read the controller registers.</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON(qc-&gt;ap-&gt;ops-&gt;tf_read == NULL);</div><div class='del'>-	qc-&gt;ap-&gt;ops-&gt;tf_read(qc-&gt;ap, tf);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Use ata_to_sense_error() to map status register bits</div><div class='ctx'> 	 * onto sense key, asc &amp; ascq.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tf-&gt;command &amp; (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {</div><div class='add'>+	if (qc-&gt;err_mask ||</div><div class='add'>+	    tf-&gt;command &amp; (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {</div><div class='ctx'> 		ata_to_sense_error(qc-&gt;ap-&gt;id, tf-&gt;command, tf-&gt;feature,</div><div class='del'>-				   &amp;sb[1], &amp;sb[2], &amp;sb[3]);</div><div class='add'>+				   &amp;sb[1], &amp;sb[2], &amp;sb[3], verbose);</div><div class='ctx'> 		sb[1] &amp;= 0x0f;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -615,26 +726,22 @@ void ata_gen_ata_desc_sense(struct ata_queued_cmd *qc)</div><div class='ctx'> void ata_gen_fixed_sense(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *cmd = qc-&gt;scsicmd;</div><div class='del'>-	struct ata_taskfile *tf = &amp;qc-&gt;tf;</div><div class='add'>+	struct ata_taskfile *tf = &amp;qc-&gt;result_tf;</div><div class='ctx'> 	unsigned char *sb = cmd-&gt;sense_buffer;</div><div class='add'>+	int verbose = qc-&gt;ap-&gt;ops-&gt;error_handler == NULL;</div><div class='ctx'> </div><div class='ctx'> 	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;result = (DRIVER_SENSE &lt;&lt; 24) | SAM_STAT_CHECK_CONDITION;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Read the controller registers.</div><div class='del'>-	 */</div><div class='del'>-	WARN_ON(qc-&gt;ap-&gt;ops-&gt;tf_read == NULL);</div><div class='del'>-	qc-&gt;ap-&gt;ops-&gt;tf_read(qc-&gt;ap, tf);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * Use ata_to_sense_error() to map status register bits</div><div class='ctx'> 	 * onto sense key, asc &amp; ascq.</div><div class='ctx'> 	 */</div><div class='del'>-	if (tf-&gt;command &amp; (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {</div><div class='add'>+	if (qc-&gt;err_mask ||</div><div class='add'>+	    tf-&gt;command &amp; (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {</div><div class='ctx'> 		ata_to_sense_error(qc-&gt;ap-&gt;id, tf-&gt;command, tf-&gt;feature,</div><div class='del'>-				   &amp;sb[2], &amp;sb[12], &amp;sb[13]);</div><div class='add'>+				   &amp;sb[2], &amp;sb[12], &amp;sb[13], verbose);</div><div class='ctx'> 		sb[2] &amp;= 0x0f;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -677,7 +784,7 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	max_sectors = ATA_MAX_SECTORS;</div><div class='ctx'> 	if (dev-&gt;flags &amp; ATA_DFLAG_LBA48)</div><div class='del'>-		max_sectors = 2048;</div><div class='add'>+		max_sectors = ATA_MAX_SECTORS_LBA48;</div><div class='ctx'> 	if (dev-&gt;max_sectors)</div><div class='ctx'> 		max_sectors = dev-&gt;max_sectors;</div><div class='ctx'> </div><div class='hunk'>@@ -692,6 +799,14 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,</div><div class='ctx'> 		request_queue_t *q = sdev-&gt;request_queue;</div><div class='ctx'> 		blk_queue_max_hw_segments(q, q-&gt;max_hw_segments - 1);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; ATA_DFLAG_NCQ) {</div><div class='add'>+		int depth;</div><div class='add'>+</div><div class='add'>+		depth = min(sdev-&gt;host-&gt;can_queue, ata_id_queue_depth(dev-&gt;id));</div><div class='add'>+		depth = min(ATA_MAX_QUEUE - 1, depth);</div><div class='add'>+		scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -708,152 +823,88 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,</div><div class='ctx'> </div><div class='ctx'> int ata_scsi_slave_config(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+	struct ata_device *dev = __ata_scsi_find_dev(ap, sdev);</div><div class='add'>+</div><div class='ctx'> 	ata_scsi_sdev_config(sdev);</div><div class='ctx'> </div><div class='ctx'> 	blk_queue_max_phys_segments(sdev-&gt;request_queue, LIBATA_MAX_PRD);</div><div class='ctx'> </div><div class='del'>-	if (sdev-&gt;id &lt; ATA_MAX_DEVICES) {</div><div class='del'>-		struct ata_port *ap;</div><div class='del'>-		struct ata_device *dev;</div><div class='del'>-</div><div class='del'>-		ap = (struct ata_port *) &amp;sdev-&gt;host-&gt;hostdata[0];</div><div class='del'>-		dev = &amp;ap-&gt;device[sdev-&gt;id];</div><div class='del'>-</div><div class='add'>+	if (dev)</div><div class='ctx'> 		ata_scsi_dev_config(sdev, dev);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;	/* scsi layer doesn't check return value, sigh */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_scsi_timed_out - SCSI layer time out callback</div><div class='del'>- *	@cmd: timed out SCSI command</div><div class='add'>+ *	ata_scsi_slave_destroy - SCSI device is about to be destroyed</div><div class='add'>+ *	@sdev: SCSI device to be destroyed</div><div class='ctx'>  *</div><div class='del'>- *	Handles SCSI layer timeout.  We race with normal completion of</div><div class='del'>- *	the qc for @cmd.  If the qc is already gone, we lose and let</div><div class='del'>- *	the scsi command finish (EH_HANDLED).  Otherwise, the qc has</div><div class='del'>- *	timed out and EH should be invoked.  Prevent ata_qc_complete()</div><div class='del'>- *	from finishing it by setting EH_SCHEDULED and return</div><div class='del'>- *	EH_NOT_HANDLED.</div><div class='add'>+ *	@sdev is about to be destroyed for hot/warm unplugging.  If</div><div class='add'>+ *	this unplugging was initiated by libata as indicated by NULL</div><div class='add'>+ *	dev-&gt;sdev, this function doesn't have to do anything.</div><div class='add'>+ *	Otherwise, SCSI layer initiated warm-unplug is in progress.</div><div class='add'>+ *	Clear dev-&gt;sdev, schedule the device for ATA detach and invoke</div><div class='add'>+ *	EH.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='del'>- *	Called from timer context</div><div class='del'>- *</div><div class='del'>- *	RETURNS:</div><div class='del'>- *	EH_HANDLED or EH_NOT_HANDLED</div><div class='add'>+ *	Defined by SCSI layer.  We don't really care.</div><div class='ctx'>  */</div><div class='del'>-enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)</div><div class='add'>+void ata_scsi_slave_destroy(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='del'>-	struct Scsi_Host *host = cmd-&gt;device-&gt;host;</div><div class='del'>-	struct ata_port *ap = (struct ata_port *) &amp;host-&gt;hostdata[0];</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(sdev-&gt;host);</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='del'>-	enum scsi_eh_timer_return ret = EH_HANDLED;</div><div class='add'>+	struct ata_device *dev;</div><div class='ctx'> </div><div class='del'>-	DPRINTK("ENTER\n");</div><div class='add'>+	if (!ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	if (qc) {</div><div class='del'>-		WARN_ON(qc-&gt;scsicmd != cmd);</div><div class='del'>-		qc-&gt;flags |= ATA_QCFLAG_EH_SCHEDULED;</div><div class='del'>-		qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='del'>-		ret = EH_NOT_HANDLED;</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+	dev = __ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	if (dev &amp;&amp; dev-&gt;sdev) {</div><div class='add'>+		/* SCSI device already in CANCEL state, no need to offline it */</div><div class='add'>+		dev-&gt;sdev = NULL;</div><div class='add'>+		dev-&gt;flags |= ATA_DFLAG_DETACH;</div><div class='add'>+		ata_port_schedule_eh(ap);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	DPRINTK("EXIT, ret=%d\n", ret);</div><div class='del'>-	return ret;</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	ata_scsi_error - SCSI layer error handler callback</div><div class='del'>- *	@host: SCSI host on which error occurred</div><div class='add'>+ *	ata_scsi_change_queue_depth - SCSI callback for queue depth config</div><div class='add'>+ *	@sdev: SCSI device to configure queue depth for</div><div class='add'>+ *	@queue_depth: new queue depth</div><div class='ctx'>  *</div><div class='del'>- *	Handles SCSI-layer-thrown error events.</div><div class='add'>+ *	This is libata standard hostt-&gt;change_queue_depth callback.</div><div class='add'>+ *	SCSI will call into this callback when user tries to set queue</div><div class='add'>+ *	depth via sysfs.</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='del'>- *	Inherited from SCSI layer (none, can sleep)</div><div class='add'>+ *	SCSI layer (we don't care)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Newly configured queue depth.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static void ata_scsi_error(struct Scsi_Host *host)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	DPRINTK("ENTER\n");</div><div class='del'>-</div><div class='del'>-	ap = (struct ata_port *) &amp;host-&gt;hostdata[0];</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	WARN_ON(ap-&gt;flags &amp; ATA_FLAG_IN_EH);</div><div class='del'>-	ap-&gt;flags |= ATA_FLAG_IN_EH;</div><div class='del'>-	WARN_ON(ata_qc_from_tag(ap, ap-&gt;active_tag) == NULL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	ata_port_flush_task(ap);</div><div class='del'>-</div><div class='del'>-	ap-&gt;ops-&gt;eng_timeout(ap);</div><div class='del'>-</div><div class='del'>-	WARN_ON(host-&gt;host_failed || !list_empty(&amp;host-&gt;eh_cmd_q));</div><div class='del'>-</div><div class='del'>-	scsi_eh_flush_done_q(&amp;ap-&gt;eh_done_q);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	ap-&gt;flags &amp;= ~ATA_FLAG_IN_EH;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	DPRINTK("EXIT\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ata_eh_scsidone(struct scsi_cmnd *scmd)</div><div class='add'>+int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)</div><div class='ctx'> {</div><div class='del'>-	/* nada */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __ata_eh_qc_complete(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	struct scsi_cmnd *scmd = qc-&gt;scsicmd;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(sdev-&gt;host);</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	int max_depth;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='del'>-	qc-&gt;scsidone = ata_eh_scsidone;</div><div class='del'>-	__ata_qc_complete(qc);</div><div class='del'>-	WARN_ON(ata_tag_valid(qc-&gt;tag));</div><div class='del'>-	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='add'>+	if (queue_depth &lt; 1)</div><div class='add'>+		return sdev-&gt;queue_depth;</div><div class='ctx'> </div><div class='del'>-	scsi_eh_finish_cmd(scmd, &amp;ap-&gt;eh_done_q);</div><div class='del'>-}</div><div class='add'>+	dev = ata_scsi_find_dev(ap, sdev);</div><div class='add'>+	if (!dev || !ata_dev_enabled(dev))</div><div class='add'>+		return sdev-&gt;queue_depth;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	ata_eh_qc_complete - Complete an active ATA command from EH</div><div class='del'>- *	@qc: Command to complete</div><div class='del'>- *</div><div class='del'>- *	Indicate to the mid and upper layers that an ATA command has</div><div class='del'>- *	completed.  To be used from EH.</div><div class='del'>- */</div><div class='del'>-void ata_eh_qc_complete(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	struct scsi_cmnd *scmd = qc-&gt;scsicmd;</div><div class='del'>-	scmd-&gt;retries = scmd-&gt;allowed;</div><div class='del'>-	__ata_eh_qc_complete(qc);</div><div class='del'>-}</div><div class='add'>+	max_depth = min(sdev-&gt;host-&gt;can_queue, ata_id_queue_depth(dev-&gt;id));</div><div class='add'>+	max_depth = min(ATA_MAX_QUEUE - 1, max_depth);</div><div class='add'>+	if (queue_depth &gt; max_depth)</div><div class='add'>+		queue_depth = max_depth;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	ata_eh_qc_retry - Tell midlayer to retry an ATA command after EH</div><div class='del'>- *	@qc: Command to retry</div><div class='del'>- *</div><div class='del'>- *	Indicate to the mid and upper layers that an ATA command</div><div class='del'>- *	should be retried.  To be used from EH.</div><div class='del'>- *</div><div class='del'>- *	SCSI midlayer limits the number of retries to scmd-&gt;allowed.</div><div class='del'>- *	This function might need to adjust scmd-&gt;retries for commands</div><div class='del'>- *	which get retried due to unrelated NCQ failures.</div><div class='del'>- */</div><div class='del'>-void ata_eh_qc_retry(struct ata_queued_cmd *qc)</div><div class='del'>-{</div><div class='del'>-	__ata_eh_qc_complete(qc);</div><div class='add'>+	scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, queue_depth);</div><div class='add'>+	return queue_depth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -891,7 +942,7 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc,</div><div class='ctx'> 		tf-&gt;nsect = 1;	/* 1 sector, lba=0 */</div><div class='ctx'> </div><div class='ctx'> 		if (qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_LBA) {</div><div class='del'>-			qc-&gt;tf.flags |= ATA_TFLAG_LBA;</div><div class='add'>+			tf-&gt;flags |= ATA_TFLAG_LBA;</div><div class='ctx'> </div><div class='ctx'> 			tf-&gt;lbah = 0x0;</div><div class='ctx'> 			tf-&gt;lbam = 0x0;</div><div class='hunk'>@@ -1195,6 +1246,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm</div><div class='ctx'> 	u64 block;</div><div class='ctx'> 	u32 n_block;</div><div class='ctx'> </div><div class='add'>+	qc-&gt;flags |= ATA_QCFLAG_IO;</div><div class='ctx'> 	tf-&gt;flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;</div><div class='ctx'> </div><div class='ctx'> 	if (scsicmd[0] == WRITE_10 || scsicmd[0] == WRITE_6 ||</div><div class='hunk'>@@ -1241,7 +1293,36 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm</div><div class='ctx'> 		 */</div><div class='ctx'> 		goto nothing_to_do;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;flags &amp; ATA_DFLAG_LBA) {</div><div class='add'>+	if ((dev-&gt;flags &amp; (ATA_DFLAG_PIO | ATA_DFLAG_NCQ)) == ATA_DFLAG_NCQ) {</div><div class='add'>+		/* yay, NCQ */</div><div class='add'>+		if (!lba_48_ok(block, n_block))</div><div class='add'>+			goto out_of_range;</div><div class='add'>+</div><div class='add'>+		tf-&gt;protocol = ATA_PROT_NCQ;</div><div class='add'>+		tf-&gt;flags |= ATA_TFLAG_LBA | ATA_TFLAG_LBA48;</div><div class='add'>+</div><div class='add'>+		if (tf-&gt;flags &amp; ATA_TFLAG_WRITE)</div><div class='add'>+			tf-&gt;command = ATA_CMD_FPDMA_WRITE;</div><div class='add'>+		else</div><div class='add'>+			tf-&gt;command = ATA_CMD_FPDMA_READ;</div><div class='add'>+</div><div class='add'>+		qc-&gt;nsect = n_block;</div><div class='add'>+</div><div class='add'>+		tf-&gt;nsect = qc-&gt;tag &lt;&lt; 3;</div><div class='add'>+		tf-&gt;hob_feature = (n_block &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		tf-&gt;feature = n_block &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		tf-&gt;hob_lbah = (block &gt;&gt; 40) &amp; 0xff;</div><div class='add'>+		tf-&gt;hob_lbam = (block &gt;&gt; 32) &amp; 0xff;</div><div class='add'>+		tf-&gt;hob_lbal = (block &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		tf-&gt;lbah = (block &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		tf-&gt;lbam = (block &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		tf-&gt;lbal = block &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		tf-&gt;device = 1 &lt;&lt; 6;</div><div class='add'>+		if (tf-&gt;flags &amp; ATA_TFLAG_FUA)</div><div class='add'>+			tf-&gt;device |= 1 &lt;&lt; 7;</div><div class='add'>+	} else if (dev-&gt;flags &amp; ATA_DFLAG_LBA) {</div><div class='ctx'> 		tf-&gt;flags |= ATA_TFLAG_LBA;</div><div class='ctx'> </div><div class='ctx'> 		if (lba_28_ok(block, n_block)) {</div><div class='hunk'>@@ -1332,6 +1413,17 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> 	u8 *cdb = cmd-&gt;cmnd;</div><div class='ctx'>  	int need_sense = (qc-&gt;err_mask != 0);</div><div class='ctx'> </div><div class='add'>+	/* We snoop the SET_FEATURES - Write Cache ON/OFF command, and</div><div class='add'>+	 * schedule EH_REVALIDATE operation to update the IDENTIFY DEVICE</div><div class='add'>+	 * cache</div><div class='add'>+	 */</div><div class='add'>+	if (!need_sense &amp;&amp; (qc-&gt;tf.command == ATA_CMD_SET_FEATURES) &amp;&amp;</div><div class='add'>+	    ((qc-&gt;tf.feature == SETFEATURES_WC_ON) ||</div><div class='add'>+	     (qc-&gt;tf.feature == SETFEATURES_WC_OFF))) {</div><div class='add'>+		qc-&gt;ap-&gt;eh_info.action |= ATA_EH_REVALIDATE;</div><div class='add'>+		ata_port_schedule_eh(qc-&gt;ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* For ATA pass thru (SAT) commands, generate a sense block if</div><div class='ctx'> 	 * user mandated it or if there's an error.  Note that if we</div><div class='ctx'> 	 * generate because the user forced us to, a check condition</div><div class='hunk'>@@ -1356,10 +1448,8 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (need_sense) {</div><div class='del'>-		/* The ata_gen_..._sense routines fill in tf */</div><div class='del'>-		ata_dump_status(qc-&gt;ap-&gt;id, &amp;qc-&gt;tf);</div><div class='del'>-	}</div><div class='add'>+	if (need_sense &amp;&amp; !qc-&gt;ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		ata_dump_status(qc-&gt;ap-&gt;id, &amp;qc-&gt;result_tf);</div><div class='ctx'> </div><div class='ctx'> 	qc-&gt;scsidone(cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -1367,8 +1457,40 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *	ata_scmd_need_defer - Check whether we need to defer scmd</div><div class='add'>+ *	@dev: ATA device to which the command is addressed</div><div class='add'>+ *	@is_io: Is the command IO (and thus possibly NCQ)?</div><div class='add'>+ *</div><div class='add'>+ *	NCQ and non-NCQ commands cannot run together.  As upper layer</div><div class='add'>+ *	only knows the queue depth, we are responsible for maintaining</div><div class='add'>+ *	exclusion.  This function checks whether a new command can be</div><div class='add'>+ *	issued to @dev.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if deferring is needed, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int ata_scmd_need_defer(struct ata_device *dev, int is_io)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;flags &amp; ATA_DFLAG_NCQ))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (is_io) {</div><div class='add'>+		if (!ata_tag_valid(ap-&gt;active_tag))</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (!ata_tag_valid(ap-&gt;active_tag) &amp;&amp; !ap-&gt;sactive)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	ata_scsi_translate - Translate then issue SCSI command to ATA device</div><div class='del'>- *	@ap: ATA port to which the command is addressed</div><div class='ctx'>  *	@dev: ATA device to which the command is addressed</div><div class='ctx'>  *	@cmd: SCSI command to execute</div><div class='ctx'>  *	@done: SCSI command completion function</div><div class='hunk'>@@ -1389,19 +1511,25 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'>  *</div><div class='ctx'>  *	LOCKING:</div><div class='ctx'>  *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 on success, SCSI_ML_QUEUE_DEVICE_BUSY if the command</div><div class='add'>+ *	needs to be deferred.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-			      struct scsi_cmnd *cmd,</div><div class='add'>+static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,</div><div class='ctx'> 			      void (*done)(struct scsi_cmnd *),</div><div class='ctx'> 			      ata_xlat_func_t xlat_func)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_queued_cmd *qc;</div><div class='ctx'> 	u8 *scsicmd = cmd-&gt;cmnd;</div><div class='add'>+	int is_io = xlat_func == ata_scsi_rw_xlat;</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	qc = ata_scsi_qc_new(ap, dev, cmd, done);</div><div class='add'>+	if (unlikely(ata_scmd_need_defer(dev, is_io)))</div><div class='add'>+		goto defer;</div><div class='add'>+</div><div class='add'>+	qc = ata_scsi_qc_new(dev, cmd, done);</div><div class='ctx'> 	if (!qc)</div><div class='ctx'> 		goto err_mem;</div><div class='ctx'> </div><div class='hunk'>@@ -1409,8 +1537,8 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	if (cmd-&gt;sc_data_direction == DMA_FROM_DEVICE ||</div><div class='ctx'> 	    cmd-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='ctx'> 		if (unlikely(cmd-&gt;request_bufflen &lt; 1)) {</div><div class='del'>-			printk(KERN_WARNING "ata%u(%u): WARNING: zero len r/w req\n",</div><div class='del'>-			       ap-&gt;id, dev-&gt;devno);</div><div class='add'>+			ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+				       "WARNING: zero len r/w req\n");</div><div class='ctx'> 			goto err_did;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1432,13 +1560,13 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> 	ata_qc_issue(qc);</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("EXIT\n");</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> early_finish:</div><div class='ctx'>         ata_qc_free(qc);</div><div class='ctx'> 	done(cmd);</div><div class='ctx'> 	DPRINTK("EXIT - early finish (good or error)\n");</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> err_did:</div><div class='ctx'> 	ata_qc_free(qc);</div><div class='hunk'>@@ -1446,7 +1574,11 @@ err_mem:</div><div class='ctx'> 	cmd-&gt;result = (DID_ERROR &lt;&lt; 16);</div><div class='ctx'> 	done(cmd);</div><div class='ctx'> 	DPRINTK("EXIT - internal\n");</div><div class='del'>-	return;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+defer:</div><div class='add'>+	DPRINTK("EXIT - defer\n");</div><div class='add'>+	return SCSI_MLQUEUE_DEVICE_BUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1944,7 +2076,7 @@ unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	dpofua = 0;</div><div class='del'>-	if (ata_dev_supports_fua(args-&gt;id) &amp;&amp; dev-&gt;flags &amp; ATA_DFLAG_LBA48 &amp;&amp;</div><div class='add'>+	if (ata_dev_supports_fua(args-&gt;id) &amp;&amp; (dev-&gt;flags &amp; ATA_DFLAG_LBA48) &amp;&amp;</div><div class='ctx'> 	    (!(dev-&gt;flags &amp; ATA_DFLAG_PIO) || dev-&gt;multi_count))</div><div class='ctx'> 		dpofua = 1 &lt;&lt; 4;</div><div class='ctx'> </div><div class='hunk'>@@ -2137,13 +2269,14 @@ void ata_scsi_badcmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), u8</div><div class='ctx'> </div><div class='ctx'> static void atapi_sense_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='del'>-	if (qc-&gt;err_mask &amp;&amp; ((qc-&gt;err_mask &amp; AC_ERR_DEV) == 0))</div><div class='add'>+	if (qc-&gt;err_mask &amp;&amp; ((qc-&gt;err_mask &amp; AC_ERR_DEV) == 0)) {</div><div class='ctx'> 		/* FIXME: not quite right; we don't want the</div><div class='ctx'> 		 * translation of taskfile registers into</div><div class='ctx'> 		 * a sense descriptors, since that's only</div><div class='ctx'> 		 * correct for ATA, not ATAPI</div><div class='ctx'> 		 */</div><div class='ctx'> 		ata_gen_ata_desc_sense(qc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	qc-&gt;scsidone(qc-&gt;scsicmd);</div><div class='ctx'> 	ata_qc_free(qc);</div><div class='hunk'>@@ -2207,21 +2340,38 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)</div><div class='ctx'> </div><div class='ctx'> 	VPRINTK("ENTER, err_mask 0x%X\n", err_mask);</div><div class='ctx'> </div><div class='add'>+	/* handle completion from new EH */</div><div class='add'>+	if (unlikely(qc-&gt;ap-&gt;ops-&gt;error_handler &amp;&amp;</div><div class='add'>+		     (err_mask || qc-&gt;flags &amp; ATA_QCFLAG_SENSE_VALID))) {</div><div class='add'>+</div><div class='add'>+		if (!(qc-&gt;flags &amp; ATA_QCFLAG_SENSE_VALID)) {</div><div class='add'>+			/* FIXME: not quite right; we don't want the</div><div class='add'>+			 * translation of taskfile registers into a</div><div class='add'>+			 * sense descriptors, since that's only</div><div class='add'>+			 * correct for ATA, not ATAPI</div><div class='add'>+			 */</div><div class='add'>+			ata_gen_ata_desc_sense(qc);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		qc-&gt;scsicmd-&gt;result = SAM_STAT_CHECK_CONDITION;</div><div class='add'>+		qc-&gt;scsidone(cmd);</div><div class='add'>+		ata_qc_free(qc);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* successful completion or old EH failure path */</div><div class='ctx'> 	if (unlikely(err_mask &amp; AC_ERR_DEV)) {</div><div class='ctx'> 		cmd-&gt;result = SAM_STAT_CHECK_CONDITION;</div><div class='ctx'> 		atapi_request_sense(qc);</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	else if (unlikely(err_mask))</div><div class='add'>+	} else if (unlikely(err_mask)) {</div><div class='ctx'> 		/* FIXME: not quite right; we don't want the</div><div class='ctx'> 		 * translation of taskfile registers into</div><div class='ctx'> 		 * a sense descriptors, since that's only</div><div class='ctx'> 		 * correct for ATA, not ATAPI</div><div class='ctx'> 		 */</div><div class='ctx'> 		ata_gen_ata_desc_sense(qc);</div><div class='del'>-</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		u8 *scsicmd = cmd-&gt;cmnd;</div><div class='ctx'> </div><div class='ctx'> 		if ((scsicmd[0] == INQUIRY) &amp;&amp; ((scsicmd[1] &amp; 0x03) == 0)) {</div><div class='hunk'>@@ -2303,18 +2453,63 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)</div><div class='ctx'> 		qc-&gt;tf.protocol = ATA_PROT_ATAPI_DMA;</div><div class='ctx'> 		qc-&gt;tf.feature |= ATAPI_PKT_DMA;</div><div class='ctx'> </div><div class='del'>-#ifdef ATAPI_ENABLE_DMADIR</div><div class='del'>-		/* some SATA bridges need us to indicate data xfer direction */</div><div class='del'>-		if (cmd-&gt;sc_data_direction != DMA_TO_DEVICE)</div><div class='add'>+		if (atapi_dmadir &amp;&amp; (cmd-&gt;sc_data_direction != DMA_TO_DEVICE))</div><div class='add'>+			/* some SATA bridges need us to indicate data xfer direction */</div><div class='ctx'> 			qc-&gt;tf.feature |= ATAPI_DMADIR;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	qc-&gt;nbytes = cmd-&gt;bufflen;</div><div class='add'>+	qc-&gt;nbytes = cmd-&gt;request_bufflen;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct ata_device * ata_find_dev(struct ata_port *ap, int id)</div><div class='add'>+{</div><div class='add'>+	if (likely(id &lt; ATA_MAX_DEVICES))</div><div class='add'>+		return &amp;ap-&gt;device[id];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ata_device * __ata_scsi_find_dev(struct ata_port *ap,</div><div class='add'>+					const struct scsi_device *scsidev)</div><div class='add'>+{</div><div class='add'>+	/* skip commands not addressed to targets we simulate */</div><div class='add'>+	if (unlikely(scsidev-&gt;channel || scsidev-&gt;lun))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return ata_find_dev(ap, scsidev-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_dev_enabled - determine if device is enabled</div><div class='add'>+ *	@dev: ATA device</div><div class='add'>+ *</div><div class='add'>+ *	Determine if commands should be sent to the specified device.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	0 if commands are not allowed / 1 if commands are allowed</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ata_scsi_dev_enabled(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(!ata_dev_enabled(dev)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!atapi_enabled || (dev-&gt;ap-&gt;flags &amp; ATA_FLAG_NO_ATAPI)) {</div><div class='add'>+		if (unlikely(dev-&gt;class == ATA_DEV_ATAPI)) {</div><div class='add'>+			ata_dev_printk(dev, KERN_WARNING,</div><div class='add'>+				       "WARNING: ATAPI is %s, device ignored.\n",</div><div class='add'>+				       atapi_enabled ? "not supported with this driver" : "disabled");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ata_scsi_find_dev - lookup ata_device from scsi_cmnd</div><div class='ctx'>  *	@ap: ATA port to which the device is attached</div><div class='hunk'>@@ -2331,33 +2526,14 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)</div><div class='ctx'>  *	RETURNS:</div><div class='ctx'>  *	Associated ATA device, or %NULL if not found.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static struct ata_device *</div><div class='ctx'> ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev)</div><div class='ctx'> {</div><div class='del'>-	struct ata_device *dev;</div><div class='del'>-</div><div class='del'>-	/* skip commands not addressed to targets we simulate */</div><div class='del'>-	if (likely(scsidev-&gt;id &lt; ATA_MAX_DEVICES))</div><div class='del'>-		dev = &amp;ap-&gt;device[scsidev-&gt;id];</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (unlikely((scsidev-&gt;channel != 0) ||</div><div class='del'>-		     (scsidev-&gt;lun != 0)))</div><div class='del'>-		return NULL;</div><div class='add'>+	struct ata_device *dev = __ata_scsi_find_dev(ap, scsidev);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!ata_dev_present(dev)))</div><div class='add'>+	if (unlikely(!dev || !ata_scsi_dev_enabled(dev)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (!atapi_enabled || (ap-&gt;flags &amp; ATA_FLAG_NO_ATAPI)) {</div><div class='del'>-		if (unlikely(dev-&gt;class == ATA_DEV_ATAPI)) {</div><div class='del'>-			printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n",</div><div class='del'>-			       ap-&gt;id, dev-&gt;devno, atapi_enabled ? "not supported with this driver" : "disabled");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2414,10 +2590,15 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_taskfile *tf = &amp;(qc-&gt;tf);</div><div class='ctx'> 	struct scsi_cmnd *cmd = qc-&gt;scsicmd;</div><div class='add'>+	struct ata_device *dev = qc-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if ((tf-&gt;protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)</div><div class='ctx'> 		goto invalid_fld;</div><div class='ctx'> </div><div class='add'>+	/* We may not issue DMA commands if no DMA mode is set */</div><div class='add'>+	if (tf-&gt;protocol == ATA_PROT_DMA &amp;&amp; dev-&gt;dma_mode == 0)</div><div class='add'>+		goto invalid_fld;</div><div class='add'>+</div><div class='ctx'> 	if (scsicmd[1] &amp; 0xe0)</div><div class='ctx'> 		/* PIO multi not supported yet */</div><div class='ctx'> 		goto invalid_fld;</div><div class='hunk'>@@ -2500,7 +2681,10 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)</div><div class='ctx'> 	 * TODO: find out if we need to do more here to</div><div class='ctx'> 	 *       cover scatter/gather case.</div><div class='ctx'> 	 */</div><div class='del'>-	qc-&gt;nsect = cmd-&gt;bufflen / ATA_SECT_SIZE;</div><div class='add'>+	qc-&gt;nsect = cmd-&gt;request_bufflen / ATA_SECT_SIZE;</div><div class='add'>+</div><div class='add'>+	/* request result TF */</div><div class='add'>+	qc-&gt;flags |= ATA_QCFLAG_RESULT_TF;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2578,19 +2762,24 @@ static inline void ata_scsi_dump_cdb(struct ata_port *ap,</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),</div><div class='del'>-				       struct ata_port *ap, struct ata_device *dev)</div><div class='add'>+static inline int __ata_scsi_queuecmd(struct scsi_cmnd *cmd,</div><div class='add'>+				      void (*done)(struct scsi_cmnd *),</div><div class='add'>+				      struct ata_device *dev)</div><div class='ctx'> {</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;class == ATA_DEV_ATA) {</div><div class='ctx'> 		ata_xlat_func_t xlat_func = ata_get_xlat_func(dev,</div><div class='ctx'> 							      cmd-&gt;cmnd[0]);</div><div class='ctx'> </div><div class='ctx'> 		if (xlat_func)</div><div class='del'>-			ata_scsi_translate(ap, dev, cmd, done, xlat_func);</div><div class='add'>+			rc = ata_scsi_translate(dev, cmd, done, xlat_func);</div><div class='ctx'> 		else</div><div class='del'>-			ata_scsi_simulate(ap, dev, cmd, done);</div><div class='add'>+			ata_scsi_simulate(dev, cmd, done);</div><div class='ctx'> 	} else</div><div class='del'>-		ata_scsi_translate(ap, dev, cmd, done, atapi_xlat);</div><div class='add'>+		rc = ata_scsi_translate(dev, cmd, done, atapi_xlat);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2609,39 +2798,39 @@ static inline void __ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struc</div><div class='ctx'>  *	Releases scsi-layer-held lock, and obtains host_set lock.</div><div class='ctx'>  *</div><div class='ctx'>  *	RETURNS:</div><div class='del'>- *	Zero.</div><div class='add'>+ *	Return value from __ata_scsi_queuecmd() if @cmd can be queued,</div><div class='add'>+ *	0 otherwise.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap;</div><div class='ctx'> 	struct ata_device *dev;</div><div class='ctx'> 	struct scsi_device *scsidev = cmd-&gt;device;</div><div class='ctx'> 	struct Scsi_Host *shost = scsidev-&gt;host;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	ap = (struct ata_port *) &amp;shost-&gt;hostdata[0];</div><div class='add'>+	ap = ata_shost_to_port(shost);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(shost-&gt;host_lock);</div><div class='del'>-	spin_lock(&amp;ap-&gt;host_set-&gt;lock);</div><div class='add'>+	spin_lock(ap-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ata_scsi_dump_cdb(ap, cmd);</div><div class='ctx'> </div><div class='ctx'> 	dev = ata_scsi_find_dev(ap, scsidev);</div><div class='ctx'> 	if (likely(dev))</div><div class='del'>-		__ata_scsi_queuecmd(cmd, done, ap, dev);</div><div class='add'>+		rc = __ata_scsi_queuecmd(cmd, done, dev);</div><div class='ctx'> 	else {</div><div class='ctx'> 		cmd-&gt;result = (DID_BAD_TARGET &lt;&lt; 16);</div><div class='ctx'> 		done(cmd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;ap-&gt;host_set-&gt;lock);</div><div class='add'>+	spin_unlock(ap-&gt;lock);</div><div class='ctx'> 	spin_lock(shost-&gt;host_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ata_scsi_simulate - simulate SCSI command on ATA device</div><div class='del'>- *	@ap: port the device is connected to</div><div class='ctx'>  *	@dev: the target device</div><div class='ctx'>  *	@cmd: SCSI command being sent to device.</div><div class='ctx'>  *	@done: SCSI command completion function.</div><div class='hunk'>@@ -2653,14 +2842,12 @@ int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))</div><div class='ctx'>  *	spin_lock_irqsave(host_set lock)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev,</div><div class='del'>-		      struct scsi_cmnd *cmd,</div><div class='add'>+void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd,</div><div class='ctx'> 		      void (*done)(struct scsi_cmnd *))</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_scsi_args args;</div><div class='ctx'> 	const u8 *scsicmd = cmd-&gt;cmnd;</div><div class='ctx'> </div><div class='del'>-	args.ap = ap;</div><div class='ctx'> 	args.dev = dev;</div><div class='ctx'> 	args.id = dev-&gt;id;</div><div class='ctx'> 	args.cmd = cmd;</div><div class='hunk'>@@ -2732,17 +2919,242 @@ void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev,</div><div class='ctx'> </div><div class='ctx'> void ata_scsi_scan_host(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	struct ata_device *dev;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED)</div><div class='add'>+	if (ap-&gt;flags &amp; ATA_FLAG_DISABLED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='del'>-		dev = &amp;ap-&gt;device[i];</div><div class='add'>+		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+		struct scsi_device *sdev;</div><div class='add'>+</div><div class='add'>+		if (!ata_dev_enabled(dev) || dev-&gt;sdev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sdev = __scsi_add_device(ap-&gt;host, 0, i, 0, NULL);</div><div class='add'>+		if (!IS_ERR(sdev)) {</div><div class='add'>+			dev-&gt;sdev = sdev;</div><div class='add'>+			scsi_device_put(sdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (ata_dev_present(dev))</div><div class='del'>-			scsi_scan_target(&amp;ap-&gt;host-&gt;shost_gendev, 0, i, 0, 0);</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_offline_dev - offline attached SCSI device</div><div class='add'>+ *	@dev: ATA device to offline attached SCSI device for</div><div class='add'>+ *</div><div class='add'>+ *	This function is called from ata_eh_hotplug() and responsible</div><div class='add'>+ *	for taking the SCSI device attached to @dev offline.  This</div><div class='add'>+ *	function is called with host_set lock which protects dev-&gt;sdev</div><div class='add'>+ *	against clearing.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	spin_lock_irqsave(host_set lock)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	1 if attached SCSI device exists, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+int ata_scsi_offline_dev(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;sdev) {</div><div class='add'>+		scsi_device_set_state(dev-&gt;sdev, SDEV_OFFLINE);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_remove_dev - remove attached SCSI device</div><div class='add'>+ *	@dev: ATA device to remove attached SCSI device for</div><div class='add'>+ *</div><div class='add'>+ *	This function is called from ata_eh_scsi_hotplug() and</div><div class='add'>+ *	responsible for removing the SCSI device attached to @dev.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+static void ata_scsi_remove_dev(struct ata_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = dev-&gt;ap;</div><div class='add'>+	struct scsi_device *sdev;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Alas, we need to grab scan_mutex to ensure SCSI device</div><div class='add'>+	 * state doesn't change underneath us and thus</div><div class='add'>+	 * scsi_device_get() always succeeds.  The mutex locking can</div><div class='add'>+	 * be removed if there is __scsi_device_get() interface which</div><div class='add'>+	 * increments reference counts regardless of device state.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;ap-&gt;host-&gt;scan_mutex);</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* clearing dev-&gt;sdev is protected by host_set lock */</div><div class='add'>+	sdev = dev-&gt;sdev;</div><div class='add'>+	dev-&gt;sdev = NULL;</div><div class='add'>+</div><div class='add'>+	if (sdev) {</div><div class='add'>+		/* If user initiated unplug races with us, sdev can go</div><div class='add'>+		 * away underneath us after the host_set lock and</div><div class='add'>+		 * scan_mutex are released.  Hold onto it.</div><div class='add'>+		 */</div><div class='add'>+		if (scsi_device_get(sdev) == 0) {</div><div class='add'>+			/* The following ensures the attached sdev is</div><div class='add'>+			 * offline on return from ata_scsi_offline_dev()</div><div class='add'>+			 * regardless it wins or loses the race</div><div class='add'>+			 * against this function.</div><div class='add'>+			 */</div><div class='add'>+			scsi_device_set_state(sdev, SDEV_OFFLINE);</div><div class='add'>+		} else {</div><div class='add'>+			WARN_ON(1);</div><div class='add'>+			sdev = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+	mutex_unlock(&amp;ap-&gt;host-&gt;scan_mutex);</div><div class='add'>+</div><div class='add'>+	if (sdev) {</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO, "detaching (SCSI %s)\n",</div><div class='add'>+			       sdev-&gt;sdev_gendev.bus_id);</div><div class='add'>+</div><div class='add'>+		scsi_remove_device(sdev);</div><div class='add'>+		scsi_device_put(sdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_hotplug - SCSI part of hotplug</div><div class='add'>+ *	@data: Pointer to ATA port to perform SCSI hotplug on</div><div class='add'>+ *</div><div class='add'>+ *	Perform SCSI part of hotplug.  It's executed from a separate</div><div class='add'>+ *	workqueue after EH completes.  This is necessary because SCSI</div><div class='add'>+ *	hot plugging requires working EH and hot unplugging is</div><div class='add'>+ *	synchronized with hot plugging with a mutex.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+void ata_scsi_hotplug(void *data)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ap-&gt;pflags &amp; ATA_PFLAG_UNLOADING) {</div><div class='add'>+		DPRINTK("ENTER/EXIT - unloading\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTK("ENTER\n");</div><div class='add'>+</div><div class='add'>+	/* unplug detached devices */</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		if (!(dev-&gt;flags &amp; ATA_DFLAG_DETACHED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+		dev-&gt;flags &amp;= ~ATA_DFLAG_DETACHED;</div><div class='add'>+		spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		ata_scsi_remove_dev(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* scan for new ones */</div><div class='add'>+	ata_scsi_scan_host(ap);</div><div class='add'>+</div><div class='add'>+	/* If we scanned while EH was in progress, scan would have</div><div class='add'>+	 * failed silently.  Requeue if there are enabled but</div><div class='add'>+	 * unattached devices.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		struct ata_device *dev = &amp;ap-&gt;device[i];</div><div class='add'>+		if (ata_dev_enabled(dev) &amp;&amp; !dev-&gt;sdev) {</div><div class='add'>+			queue_delayed_work(ata_aux_wq, &amp;ap-&gt;hotplug_task, HZ);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DPRINTK("EXIT\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_user_scan - indication for user-initiated bus scan</div><div class='add'>+ *	@shost: SCSI host to scan</div><div class='add'>+ *	@channel: Channel to scan</div><div class='add'>+ *	@id: ID to scan</div><div class='add'>+ *	@lun: LUN to scan</div><div class='add'>+ *</div><div class='add'>+ *	This function is called when user explicitly requests bus</div><div class='add'>+ *	scan.  Set probe pending flag and invoke EH.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	SCSI layer (we don't care)</div><div class='add'>+ *</div><div class='add'>+ *	RETURNS:</div><div class='add'>+ *	Zero.</div><div class='add'>+ */</div><div class='add'>+static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,</div><div class='add'>+			      unsigned int id, unsigned int lun)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = ata_shost_to_port(shost);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!ap-&gt;ops-&gt;error_handler)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if ((channel != SCAN_WILD_CARD &amp;&amp; channel != 0) ||</div><div class='add'>+	    (lun != SCAN_WILD_CARD &amp;&amp; lun != 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (id == SCAN_WILD_CARD) {</div><div class='add'>+		ap-&gt;eh_info.probe_mask |= (1 &lt;&lt; ATA_MAX_DEVICES) - 1;</div><div class='add'>+		ap-&gt;eh_info.action |= ATA_EH_SOFTRESET;</div><div class='add'>+	} else {</div><div class='add'>+		struct ata_device *dev = ata_find_dev(ap, id);</div><div class='add'>+</div><div class='add'>+		if (dev) {</div><div class='add'>+			ap-&gt;eh_info.probe_mask |= 1 &lt;&lt; dev-&gt;devno;</div><div class='add'>+			ap-&gt;eh_info.action |= ATA_EH_SOFTRESET;</div><div class='add'>+			ap-&gt;eh_info.flags |= ATA_EHI_RESUME_LINK;</div><div class='add'>+		} else</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc == 0)</div><div class='add'>+		ata_port_schedule_eh(ap);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(ap-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	ata_scsi_dev_rescan - initiate scsi_rescan_device()</div><div class='add'>+ *	@data: Pointer to ATA port to perform scsi_rescan_device()</div><div class='add'>+ *</div><div class='add'>+ *	After ATA pass thru (SAT) commands are executed successfully,</div><div class='add'>+ *	libata need to propagate the changes to SCSI layer.  This</div><div class='add'>+ *	function must be executed from ata_aux_wq such that sdev</div><div class='add'>+ *	attach/detach don't race with rescan.</div><div class='add'>+ *</div><div class='add'>+ *	LOCKING:</div><div class='add'>+ *	Kernel thread context (may sleep).</div><div class='add'>+ */</div><div class='add'>+void ata_scsi_dev_rescan(void *data)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = data;</div><div class='add'>+	struct ata_device *dev;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ATA_MAX_DEVICES; i++) {</div><div class='add'>+		dev = &amp;ap-&gt;device[i];</div><div class='add'>+</div><div class='add'>+		if (ata_dev_enabled(dev) &amp;&amp; dev-&gt;sdev)</div><div class='add'>+			scsi_rescan_device(&amp;(dev-&gt;sdev-&gt;sdev_gendev));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h<br/>index bac8cbae06fe..c325679d9b54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/libata.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/libata.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libata.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/libata.h</a></div><div class='hunk'>@@ -29,10 +29,9 @@</div><div class='ctx'> #define __LIBATA_H__</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"libata"</div><div class='del'>-#define DRV_VERSION	"1.20"	/* must be exactly four chars */</div><div class='add'>+#define DRV_VERSION	"2.00"	/* must be exactly four chars */</div><div class='ctx'> </div><div class='ctx'> struct ata_scsi_args {</div><div class='del'>-	struct ata_port		*ap;</div><div class='ctx'> 	struct ata_device	*dev;</div><div class='ctx'> 	u16			*id;</div><div class='ctx'> 	struct scsi_cmnd	*cmd;</div><div class='hunk'>@@ -40,18 +39,34 @@ struct ata_scsi_args {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* libata-core.c */</div><div class='add'>+extern struct workqueue_struct *ata_aux_wq;</div><div class='ctx'> extern int atapi_enabled;</div><div class='add'>+extern int atapi_dmadir;</div><div class='ctx'> extern int libata_fua;</div><div class='del'>-extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,</div><div class='del'>-				      struct ata_device *dev);</div><div class='add'>+extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev);</div><div class='ctx'> extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);</div><div class='add'>+extern void ata_dev_disable(struct ata_device *dev);</div><div class='ctx'> extern void ata_port_flush_task(struct ata_port *ap);</div><div class='add'>+extern unsigned ata_exec_internal(struct ata_device *dev,</div><div class='add'>+				  struct ata_taskfile *tf, const u8 *cdb,</div><div class='add'>+				  int dma_dir, void *buf, unsigned int buflen);</div><div class='add'>+extern unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd);</div><div class='add'>+extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,</div><div class='add'>+			   int post_reset, u16 *id);</div><div class='add'>+extern int ata_dev_configure(struct ata_device *dev, int print_info);</div><div class='add'>+extern int sata_down_spd_limit(struct ata_port *ap);</div><div class='add'>+extern int sata_set_spd_needed(struct ata_port *ap);</div><div class='add'>+extern int ata_down_xfermask_limit(struct ata_device *dev, int force_pio0);</div><div class='add'>+extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);</div><div class='ctx'> extern void ata_qc_free(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void ata_qc_issue(struct ata_queued_cmd *qc);</div><div class='add'>+extern void __ata_qc_complete(struct ata_queued_cmd *qc);</div><div class='ctx'> extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);</div><div class='ctx'> extern void ata_dev_select(struct ata_port *ap, unsigned int device,</div><div class='ctx'>                            unsigned int wait, unsigned int can_sleep);</div><div class='ctx'> extern void swap_buf_le16(u16 *buf, unsigned int buf_words);</div><div class='add'>+extern int ata_flush_cache(struct ata_device *dev);</div><div class='add'>+extern void ata_dev_init(struct ata_device *dev);</div><div class='ctx'> extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg);</div><div class='ctx'> extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);</div><div class='ctx'> </div><div class='hunk'>@@ -60,6 +75,8 @@ extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);</div><div class='ctx'> extern struct scsi_transport_template ata_scsi_transport_template;</div><div class='ctx'> </div><div class='ctx'> extern void ata_scsi_scan_host(struct ata_port *ap);</div><div class='add'>+extern int ata_scsi_offline_dev(struct ata_device *dev);</div><div class='add'>+extern void ata_scsi_hotplug(void *data);</div><div class='ctx'> extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,</div><div class='ctx'> 			       unsigned int buflen);</div><div class='ctx'> </div><div class='hunk'>@@ -88,5 +105,13 @@ extern void ata_scsi_set_sense(struct scsi_cmnd *cmd,</div><div class='ctx'> extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args,</div><div class='ctx'>                         unsigned int (*actor) (struct ata_scsi_args *args,</div><div class='ctx'>                                            u8 *rbuf, unsigned int buflen));</div><div class='add'>+extern void ata_schedule_scsi_eh(struct Scsi_Host *shost);</div><div class='add'>+extern void ata_scsi_dev_rescan(void *data);</div><div class='add'>+</div><div class='add'>+/* libata-eh.c */</div><div class='add'>+extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);</div><div class='add'>+extern void ata_scsi_error(struct Scsi_Host *host);</div><div class='add'>+extern void ata_port_wait_eh(struct ata_port *ap);</div><div class='add'>+extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);</div><div class='ctx'> </div><div class='ctx'> #endif /* __LIBATA_H__ */</div><div class='head'>diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c<br/>new file mode 100644<br/>index 000000000000..7e6e031cc41b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/libiscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/libiscsi.c</a></div><div class='hunk'>@@ -0,0 +1,1887 @@</div><div class='add'>+/*</div><div class='add'>+ * iSCSI lib functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006 Red Hat, Inc.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2004 - 2006 Mike Christie</div><div class='add'>+ * Copyright (C) 2004 - 2005 Dmitry Yusupov</div><div class='add'>+ * Copyright (C) 2004 - 2005 Alex Aizman</div><div class='add'>+ * maintained by open-iscsi@googlegroups.com</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/kfifo.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_device.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_eh.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_tcq.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_host.h&gt;</div><div class='add'>+#include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/iscsi_proto.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_transport.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_transport_iscsi.h&gt;</div><div class='add'>+#include &lt;scsi/libiscsi.h&gt;</div><div class='add'>+</div><div class='add'>+struct iscsi_session *</div><div class='add'>+class_to_transport_session(struct iscsi_cls_session *cls_session)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='add'>+	return iscsi_hostdata(shost-&gt;hostdata);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(class_to_transport_session);</div><div class='add'>+</div><div class='add'>+#define INVALID_SN_DELTA	0xffff</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+iscsi_check_assign_cmdsn(struct iscsi_session *session, struct iscsi_nopin *hdr)</div><div class='add'>+{</div><div class='add'>+	uint32_t max_cmdsn = be32_to_cpu(hdr-&gt;max_cmdsn);</div><div class='add'>+	uint32_t exp_cmdsn = be32_to_cpu(hdr-&gt;exp_cmdsn);</div><div class='add'>+</div><div class='add'>+	if (max_cmdsn &lt; exp_cmdsn -1 &amp;&amp;</div><div class='add'>+	    max_cmdsn &gt; exp_cmdsn - INVALID_SN_DELTA)</div><div class='add'>+		return ISCSI_ERR_MAX_CMDSN;</div><div class='add'>+	if (max_cmdsn &gt; session-&gt;max_cmdsn ||</div><div class='add'>+	    max_cmdsn &lt; session-&gt;max_cmdsn - INVALID_SN_DELTA)</div><div class='add'>+		session-&gt;max_cmdsn = max_cmdsn;</div><div class='add'>+	if (exp_cmdsn &gt; session-&gt;exp_cmdsn ||</div><div class='add'>+	    exp_cmdsn &lt; session-&gt;exp_cmdsn - INVALID_SN_DELTA)</div><div class='add'>+		session-&gt;exp_cmdsn = exp_cmdsn;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_check_assign_cmdsn);</div><div class='add'>+</div><div class='add'>+void iscsi_prep_unsolicit_data_pdu(struct iscsi_cmd_task *ctask,</div><div class='add'>+				   struct iscsi_data *hdr,</div><div class='add'>+				   int transport_data_cnt)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='add'>+</div><div class='add'>+	memset(hdr, 0, sizeof(struct iscsi_data));</div><div class='add'>+	hdr-&gt;ttt = cpu_to_be32(ISCSI_RESERVED_TAG);</div><div class='add'>+	hdr-&gt;datasn = cpu_to_be32(ctask-&gt;unsol_datasn);</div><div class='add'>+	ctask-&gt;unsol_datasn++;</div><div class='add'>+	hdr-&gt;opcode = ISCSI_OP_SCSI_DATA_OUT;</div><div class='add'>+	memcpy(hdr-&gt;lun, ctask-&gt;hdr-&gt;lun, sizeof(hdr-&gt;lun));</div><div class='add'>+</div><div class='add'>+	hdr-&gt;itt = ctask-&gt;hdr-&gt;itt;</div><div class='add'>+	hdr-&gt;exp_statsn = cpu_to_be32(conn-&gt;exp_statsn);</div><div class='add'>+</div><div class='add'>+	hdr-&gt;offset = cpu_to_be32(ctask-&gt;total_length -</div><div class='add'>+				  transport_data_cnt -</div><div class='add'>+				  ctask-&gt;unsol_count);</div><div class='add'>+</div><div class='add'>+	if (ctask-&gt;unsol_count &gt; conn-&gt;max_xmit_dlength) {</div><div class='add'>+		hton24(hdr-&gt;dlength, conn-&gt;max_xmit_dlength);</div><div class='add'>+		ctask-&gt;data_count = conn-&gt;max_xmit_dlength;</div><div class='add'>+		hdr-&gt;flags = 0;</div><div class='add'>+	} else {</div><div class='add'>+		hton24(hdr-&gt;dlength, ctask-&gt;unsol_count);</div><div class='add'>+		ctask-&gt;data_count = ctask-&gt;unsol_count;</div><div class='add'>+		hdr-&gt;flags = ISCSI_FLAG_CMD_FINAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_prep_unsolicit_data_pdu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_prep_scsi_cmd_pdu - prep iscsi scsi cmd pdu</div><div class='add'>+ * @ctask: iscsi cmd task</div><div class='add'>+ *</div><div class='add'>+ * Prep basic iSCSI PDU fields for a scsi cmd pdu. The LLD should set</div><div class='add'>+ * fields like dlength or final based on how much data it sends</div><div class='add'>+ */</div><div class='add'>+static void iscsi_prep_scsi_cmd_pdu(struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_cmd *hdr = ctask-&gt;hdr;</div><div class='add'>+	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='add'>+</div><div class='add'>+        hdr-&gt;opcode = ISCSI_OP_SCSI_CMD;</div><div class='add'>+        hdr-&gt;flags = ISCSI_ATTR_SIMPLE;</div><div class='add'>+        int_to_scsilun(sc-&gt;device-&gt;lun, (struct scsi_lun *)hdr-&gt;lun);</div><div class='add'>+        hdr-&gt;itt = ctask-&gt;itt | (conn-&gt;id &lt;&lt; ISCSI_CID_SHIFT) |</div><div class='add'>+                         (session-&gt;age &lt;&lt; ISCSI_AGE_SHIFT);</div><div class='add'>+        hdr-&gt;data_length = cpu_to_be32(sc-&gt;request_bufflen);</div><div class='add'>+        hdr-&gt;cmdsn = cpu_to_be32(session-&gt;cmdsn);</div><div class='add'>+        session-&gt;cmdsn++;</div><div class='add'>+        hdr-&gt;exp_statsn = cpu_to_be32(conn-&gt;exp_statsn);</div><div class='add'>+        memcpy(hdr-&gt;cdb, sc-&gt;cmnd, sc-&gt;cmd_len);</div><div class='add'>+        memset(&amp;hdr-&gt;cdb[sc-&gt;cmd_len], 0, MAX_COMMAND_SIZE - sc-&gt;cmd_len);</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_data_direction == DMA_TO_DEVICE) {</div><div class='add'>+		hdr-&gt;flags |= ISCSI_FLAG_CMD_WRITE;</div><div class='add'>+		/*</div><div class='add'>+		 * Write counters:</div><div class='add'>+		 *</div><div class='add'>+		 *	imm_count	bytes to be sent right after</div><div class='add'>+		 *			SCSI PDU Header</div><div class='add'>+		 *</div><div class='add'>+		 *	unsol_count	bytes(as Data-Out) to be sent</div><div class='add'>+		 *			without	R2T ack right after</div><div class='add'>+		 *			immediate data</div><div class='add'>+		 *</div><div class='add'>+		 *	r2t_data_count	bytes to be sent via R2T ack's</div><div class='add'>+		 *</div><div class='add'>+		 *      pad_count       bytes to be sent as zero-padding</div><div class='add'>+		 */</div><div class='add'>+		ctask-&gt;imm_count = 0;</div><div class='add'>+		ctask-&gt;unsol_count = 0;</div><div class='add'>+		ctask-&gt;unsol_datasn = 0;</div><div class='add'>+</div><div class='add'>+		if (session-&gt;imm_data_en) {</div><div class='add'>+			if (ctask-&gt;total_length &gt;= session-&gt;first_burst)</div><div class='add'>+				ctask-&gt;imm_count = min(session-&gt;first_burst,</div><div class='add'>+							conn-&gt;max_xmit_dlength);</div><div class='add'>+			else</div><div class='add'>+				ctask-&gt;imm_count = min(ctask-&gt;total_length,</div><div class='add'>+							conn-&gt;max_xmit_dlength);</div><div class='add'>+			hton24(ctask-&gt;hdr-&gt;dlength, ctask-&gt;imm_count);</div><div class='add'>+		} else</div><div class='add'>+			zero_data(ctask-&gt;hdr-&gt;dlength);</div><div class='add'>+</div><div class='add'>+		if (!session-&gt;initial_r2t_en)</div><div class='add'>+			ctask-&gt;unsol_count = min(session-&gt;first_burst,</div><div class='add'>+				ctask-&gt;total_length) - ctask-&gt;imm_count;</div><div class='add'>+		if (!ctask-&gt;unsol_count)</div><div class='add'>+			/* No unsolicit Data-Out's */</div><div class='add'>+			ctask-&gt;hdr-&gt;flags |= ISCSI_FLAG_CMD_FINAL;</div><div class='add'>+	} else {</div><div class='add'>+		ctask-&gt;datasn = 0;</div><div class='add'>+		hdr-&gt;flags |= ISCSI_FLAG_CMD_FINAL;</div><div class='add'>+		zero_data(hdr-&gt;dlength);</div><div class='add'>+</div><div class='add'>+		if (sc-&gt;sc_data_direction == DMA_FROM_DEVICE)</div><div class='add'>+			hdr-&gt;flags |= ISCSI_FLAG_CMD_READ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;scsicmd_pdus_cnt++;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_prep_scsi_cmd_pdu);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_complete_command - return command back to scsi-ml</div><div class='add'>+ * @session: iscsi session</div><div class='add'>+ * @ctask: iscsi cmd task</div><div class='add'>+ *</div><div class='add'>+ * Must be called with session lock.</div><div class='add'>+ * This function returns the scsi command to scsi-ml and returns</div><div class='add'>+ * the cmd task to the pool of available cmd tasks.</div><div class='add'>+ */</div><div class='add'>+static void iscsi_complete_command(struct iscsi_session *session,</div><div class='add'>+				   struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='add'>+</div><div class='add'>+	ctask-&gt;sc = NULL;</div><div class='add'>+	list_del_init(&amp;ctask-&gt;running);</div><div class='add'>+	__kfifo_put(session-&gt;cmdpool.queue, (void*)&amp;ctask, sizeof(void*));</div><div class='add'>+	sc-&gt;scsi_done(sc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_cmd_rsp - SCSI Command Response processing</div><div class='add'>+ * @conn: iscsi connection</div><div class='add'>+ * @hdr: iscsi header</div><div class='add'>+ * @ctask: scsi command task</div><div class='add'>+ * @data: cmd data buffer</div><div class='add'>+ * @datalen: len of buffer</div><div class='add'>+ *</div><div class='add'>+ * iscsi_cmd_rsp sets up the scsi_cmnd fields based on the PDU and</div><div class='add'>+ * then completes the command and task.</div><div class='add'>+ **/</div><div class='add'>+static int iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='add'>+			      struct iscsi_cmd_task *ctask, char *data,</div><div class='add'>+			      int datalen)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct iscsi_cmd_rsp *rhdr = (struct iscsi_cmd_rsp *)hdr;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct scsi_cmnd *sc = ctask-&gt;sc;</div><div class='add'>+</div><div class='add'>+	rc = iscsi_check_assign_cmdsn(session, (struct iscsi_nopin*)rhdr);</div><div class='add'>+	if (rc) {</div><div class='add'>+		sc-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;exp_statsn = be32_to_cpu(rhdr-&gt;statsn) + 1;</div><div class='add'>+</div><div class='add'>+	sc-&gt;result = (DID_OK &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='add'>+</div><div class='add'>+	if (rhdr-&gt;response != ISCSI_STATUS_CMD_COMPLETED) {</div><div class='add'>+		sc-&gt;result = DID_ERROR &lt;&lt; 16;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rhdr-&gt;cmd_status == SAM_STAT_CHECK_CONDITION) {</div><div class='add'>+		int senselen;</div><div class='add'>+</div><div class='add'>+		if (datalen &lt; 2) {</div><div class='add'>+invalid_datalen:</div><div class='add'>+			printk(KERN_ERR "iscsi: Got CHECK_CONDITION but "</div><div class='add'>+			       "invalid data buffer size of %d\n", datalen);</div><div class='add'>+			sc-&gt;result = DID_BAD_TARGET &lt;&lt; 16;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		senselen = (data[0] &lt;&lt; 8) | data[1];</div><div class='add'>+		if (datalen &lt; senselen)</div><div class='add'>+			goto invalid_datalen;</div><div class='add'>+</div><div class='add'>+		memcpy(sc-&gt;sense_buffer, data + 2,</div><div class='add'>+		       min(senselen, SCSI_SENSE_BUFFERSIZE));</div><div class='add'>+		debug_scsi("copied %d bytes of sense\n",</div><div class='add'>+			   min(senselen, SCSI_SENSE_BUFFERSIZE));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;sc_data_direction == DMA_TO_DEVICE)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_UNDERFLOW) {</div><div class='add'>+		int res_count = be32_to_cpu(rhdr-&gt;residual_count);</div><div class='add'>+</div><div class='add'>+		if (res_count &gt; 0 &amp;&amp; res_count &lt;= sc-&gt;request_bufflen)</div><div class='add'>+			sc-&gt;resid = res_count;</div><div class='add'>+		else</div><div class='add'>+			sc-&gt;result = (DID_BAD_TARGET &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='add'>+	} else if (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_BIDI_UNDERFLOW)</div><div class='add'>+		sc-&gt;result = (DID_BAD_TARGET &lt;&lt; 16) | rhdr-&gt;cmd_status;</div><div class='add'>+	else if (rhdr-&gt;flags &amp; ISCSI_FLAG_CMD_OVERFLOW)</div><div class='add'>+		sc-&gt;resid = be32_to_cpu(rhdr-&gt;residual_count);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	debug_scsi("done [sc %lx res %d itt 0x%x]\n",</div><div class='add'>+		   (long)sc, sc-&gt;result, ctask-&gt;itt);</div><div class='add'>+	conn-&gt;scsirsp_pdus_cnt++;</div><div class='add'>+</div><div class='add'>+	iscsi_complete_command(conn-&gt;session, ctask);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __iscsi_complete_pdu - complete pdu</div><div class='add'>+ * @conn: iscsi conn</div><div class='add'>+ * @hdr: iscsi header</div><div class='add'>+ * @data: data buffer</div><div class='add'>+ * @datalen: len of data buffer</div><div class='add'>+ *</div><div class='add'>+ * Completes pdu processing by freeing any resources allocated at</div><div class='add'>+ * queuecommand or send generic. session lock must be held and verify</div><div class='add'>+ * itt must have been called.</div><div class='add'>+ */</div><div class='add'>+int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='add'>+			 char *data, int datalen)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	int opcode = hdr-&gt;opcode &amp; ISCSI_OPCODE_MASK, rc = 0;</div><div class='add'>+	struct iscsi_cmd_task *ctask;</div><div class='add'>+	struct iscsi_mgmt_task *mtask;</div><div class='add'>+	uint32_t itt;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;itt != cpu_to_be32(ISCSI_RESERVED_TAG))</div><div class='add'>+		itt = hdr-&gt;itt &amp; ISCSI_ITT_MASK;</div><div class='add'>+	else</div><div class='add'>+		itt = hdr-&gt;itt;</div><div class='add'>+</div><div class='add'>+	if (itt &lt; session-&gt;cmds_max) {</div><div class='add'>+		ctask = session-&gt;cmds[itt];</div><div class='add'>+</div><div class='add'>+		debug_scsi("cmdrsp [op 0x%x cid %d itt 0x%x len %d]\n",</div><div class='add'>+			   opcode, conn-&gt;id, ctask-&gt;itt, datalen);</div><div class='add'>+</div><div class='add'>+		switch(opcode) {</div><div class='add'>+		case ISCSI_OP_SCSI_CMD_RSP:</div><div class='add'>+			BUG_ON((void*)ctask != ctask-&gt;sc-&gt;SCp.ptr);</div><div class='add'>+			rc = iscsi_scsi_cmd_rsp(conn, hdr, ctask, data,</div><div class='add'>+						datalen);</div><div class='add'>+			break;</div><div class='add'>+		case ISCSI_OP_SCSI_DATA_IN:</div><div class='add'>+			BUG_ON((void*)ctask != ctask-&gt;sc-&gt;SCp.ptr);</div><div class='add'>+			if (hdr-&gt;flags &amp; ISCSI_FLAG_DATA_STATUS) {</div><div class='add'>+				conn-&gt;scsirsp_pdus_cnt++;</div><div class='add'>+				iscsi_complete_command(session, ctask);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case ISCSI_OP_R2T:</div><div class='add'>+			/* LLD handles this for now */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (itt &gt;= ISCSI_MGMT_ITT_OFFSET &amp;&amp;</div><div class='add'>+		   itt &lt; ISCSI_MGMT_ITT_OFFSET + session-&gt;mgmtpool_max) {</div><div class='add'>+		mtask = session-&gt;mgmt_cmds[itt - ISCSI_MGMT_ITT_OFFSET];</div><div class='add'>+</div><div class='add'>+		debug_scsi("immrsp [op 0x%x cid %d itt 0x%x len %d]\n",</div><div class='add'>+			   opcode, conn-&gt;id, mtask-&gt;itt, datalen);</div><div class='add'>+</div><div class='add'>+		rc = iscsi_check_assign_cmdsn(session,</div><div class='add'>+					      (struct iscsi_nopin*)hdr);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto done;</div><div class='add'>+</div><div class='add'>+		switch(opcode) {</div><div class='add'>+		case ISCSI_OP_LOGOUT_RSP:</div><div class='add'>+			conn-&gt;exp_statsn = be32_to_cpu(hdr-&gt;statsn) + 1;</div><div class='add'>+			/* fall through */</div><div class='add'>+		case ISCSI_OP_LOGIN_RSP:</div><div class='add'>+		case ISCSI_OP_TEXT_RSP:</div><div class='add'>+			/*</div><div class='add'>+			 * login related PDU's exp_statsn is handled in</div><div class='add'>+			 * userspace</div><div class='add'>+			 */</div><div class='add'>+			rc = iscsi_recv_pdu(conn-&gt;cls_conn, hdr, data, datalen);</div><div class='add'>+			list_del(&amp;mtask-&gt;running);</div><div class='add'>+			if (conn-&gt;login_mtask != mtask)</div><div class='add'>+				__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='add'>+					    (void*)&amp;mtask, sizeof(void*));</div><div class='add'>+			break;</div><div class='add'>+		case ISCSI_OP_SCSI_TMFUNC_RSP:</div><div class='add'>+			if (datalen) {</div><div class='add'>+				rc = ISCSI_ERR_PROTO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			conn-&gt;exp_statsn = be32_to_cpu(hdr-&gt;statsn) + 1;</div><div class='add'>+			conn-&gt;tmfrsp_pdus_cnt++;</div><div class='add'>+			if (conn-&gt;tmabort_state == TMABORT_INITIAL) {</div><div class='add'>+				conn-&gt;tmabort_state =</div><div class='add'>+					((struct iscsi_tm_rsp *)hdr)-&gt;</div><div class='add'>+					response == ISCSI_TMF_RSP_COMPLETE ?</div><div class='add'>+						TMABORT_SUCCESS:TMABORT_FAILED;</div><div class='add'>+				/* unblock eh_abort() */</div><div class='add'>+				wake_up(&amp;conn-&gt;ehwait);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case ISCSI_OP_NOOP_IN:</div><div class='add'>+			if (hdr-&gt;ttt != ISCSI_RESERVED_TAG) {</div><div class='add'>+				rc = ISCSI_ERR_PROTO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			conn-&gt;exp_statsn = be32_to_cpu(hdr-&gt;statsn) + 1;</div><div class='add'>+</div><div class='add'>+			rc = iscsi_recv_pdu(conn-&gt;cls_conn, hdr, data, datalen);</div><div class='add'>+			list_del(&amp;mtask-&gt;running);</div><div class='add'>+			if (conn-&gt;login_mtask != mtask)</div><div class='add'>+				__kfifo_put(session-&gt;mgmtpool.queue,</div><div class='add'>+					    (void*)&amp;mtask, sizeof(void*));</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else if (itt == ISCSI_RESERVED_TAG) {</div><div class='add'>+		switch(opcode) {</div><div class='add'>+		case ISCSI_OP_NOOP_IN:</div><div class='add'>+			if (!datalen) {</div><div class='add'>+				rc = iscsi_check_assign_cmdsn(session,</div><div class='add'>+						 (struct iscsi_nopin*)hdr);</div><div class='add'>+				if (!rc &amp;&amp; hdr-&gt;ttt != ISCSI_RESERVED_TAG)</div><div class='add'>+					rc = iscsi_recv_pdu(conn-&gt;cls_conn,</div><div class='add'>+							    hdr, NULL, 0);</div><div class='add'>+			} else</div><div class='add'>+				rc = ISCSI_ERR_PROTO;</div><div class='add'>+			break;</div><div class='add'>+		case ISCSI_OP_REJECT:</div><div class='add'>+			/* we need sth like iscsi_reject_rsp()*/</div><div class='add'>+		case ISCSI_OP_ASYNC_EVENT:</div><div class='add'>+			conn-&gt;exp_statsn = be32_to_cpu(hdr-&gt;statsn) + 1;</div><div class='add'>+			/* we need sth like iscsi_async_event_rsp() */</div><div class='add'>+			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			rc = ISCSI_ERR_BAD_OPCODE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		rc = ISCSI_ERR_BAD_ITT;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__iscsi_complete_pdu);</div><div class='add'>+</div><div class='add'>+int iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='add'>+		       char *data, int datalen)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+	rc = __iscsi_complete_pdu(conn, hdr, data, datalen);</div><div class='add'>+	spin_unlock(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_complete_pdu);</div><div class='add'>+</div><div class='add'>+/* verify itt (itt encoding: age+cid+itt) */</div><div class='add'>+int iscsi_verify_itt(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='add'>+		     uint32_t *ret_itt)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_cmd_task *ctask;</div><div class='add'>+	uint32_t itt;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='add'>+		if ((hdr-&gt;itt &amp; ISCSI_AGE_MASK) !=</div><div class='add'>+		    (session-&gt;age &lt;&lt; ISCSI_AGE_SHIFT)) {</div><div class='add'>+			printk(KERN_ERR "iscsi: received itt %x expected "</div><div class='add'>+				"session age (%x)\n", hdr-&gt;itt,</div><div class='add'>+				session-&gt;age &amp; ISCSI_AGE_MASK);</div><div class='add'>+			return ISCSI_ERR_BAD_ITT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((hdr-&gt;itt &amp; ISCSI_CID_MASK) !=</div><div class='add'>+		    (conn-&gt;id &lt;&lt; ISCSI_CID_SHIFT)) {</div><div class='add'>+			printk(KERN_ERR "iscsi: received itt %x, expected "</div><div class='add'>+				"CID (%x)\n", hdr-&gt;itt, conn-&gt;id);</div><div class='add'>+			return ISCSI_ERR_BAD_ITT;</div><div class='add'>+		}</div><div class='add'>+		itt = hdr-&gt;itt &amp; ISCSI_ITT_MASK;</div><div class='add'>+	} else</div><div class='add'>+		itt = hdr-&gt;itt;</div><div class='add'>+</div><div class='add'>+	if (itt &lt; session-&gt;cmds_max) {</div><div class='add'>+		ctask = session-&gt;cmds[itt];</div><div class='add'>+</div><div class='add'>+		if (!ctask-&gt;sc) {</div><div class='add'>+			printk(KERN_INFO "iscsi: dropping ctask with "</div><div class='add'>+			       "itt 0x%x\n", ctask-&gt;itt);</div><div class='add'>+			/* force drop */</div><div class='add'>+			return ISCSI_ERR_NO_SCSI_CMD;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ctask-&gt;sc-&gt;SCp.phase != session-&gt;age) {</div><div class='add'>+			printk(KERN_ERR "iscsi: ctask's session age %d, "</div><div class='add'>+				"expected %d\n", ctask-&gt;sc-&gt;SCp.phase,</div><div class='add'>+				session-&gt;age);</div><div class='add'>+			return ISCSI_ERR_SESSION_FAILED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ret_itt = itt;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_verify_itt);</div><div class='add'>+</div><div class='add'>+void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;session-&gt;lock, flags);</div><div class='add'>+	if (session-&gt;state == ISCSI_STATE_FAILED) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;session-&gt;lock, flags);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;stop_stage == 0)</div><div class='add'>+		session-&gt;state = ISCSI_STATE_FAILED;</div><div class='add'>+	spin_unlock_irqrestore(&amp;session-&gt;lock, flags);</div><div class='add'>+	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='add'>+	iscsi_conn_error(conn-&gt;cls_conn, err);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_failure);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_data_xmit - xmit any command into the scheduled connection</div><div class='add'>+ * @conn: iscsi connection</div><div class='add'>+ *</div><div class='add'>+ * Notes:</div><div class='add'>+ *	The function can return -EAGAIN in which case the caller must</div><div class='add'>+ *	re-schedule it again later or recover. '0' return code means</div><div class='add'>+ *	successful xmit.</div><div class='add'>+ **/</div><div class='add'>+static int iscsi_data_xmit(struct iscsi_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_transport *tt;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(conn-&gt;suspend_tx)) {</div><div class='add'>+		debug_scsi("conn %d Tx suspended!\n", conn-&gt;id);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+	tt = conn-&gt;session-&gt;tt;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Transmit in the following order:</div><div class='add'>+	 *</div><div class='add'>+	 * 1) un-finished xmit (ctask or mtask)</div><div class='add'>+	 * 2) immediate control PDUs</div><div class='add'>+	 * 3) write data</div><div class='add'>+	 * 4) SCSI commands</div><div class='add'>+	 * 5) non-immediate control PDUs</div><div class='add'>+	 *</div><div class='add'>+	 * No need to lock around __kfifo_get as long as</div><div class='add'>+	 * there's one producer and one consumer.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	BUG_ON(conn-&gt;ctask &amp;&amp; conn-&gt;mtask);</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;ctask) {</div><div class='add'>+		rc = tt-&gt;xmit_cmd_task(conn, conn-&gt;ctask);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto again;</div><div class='add'>+		/* done with this in-progress ctask */</div><div class='add'>+		conn-&gt;ctask = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (conn-&gt;mtask) {</div><div class='add'>+		rc = tt-&gt;xmit_mgmt_task(conn, conn-&gt;mtask);</div><div class='add'>+	        if (rc)</div><div class='add'>+		        goto again;</div><div class='add'>+		/* done with this in-progress mtask */</div><div class='add'>+		conn-&gt;mtask = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* process immediate first */</div><div class='add'>+        if (unlikely(__kfifo_len(conn-&gt;immqueue))) {</div><div class='add'>+	        while (__kfifo_get(conn-&gt;immqueue, (void*)&amp;conn-&gt;mtask,</div><div class='add'>+			           sizeof(void*))) {</div><div class='add'>+			spin_lock_bh(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+			list_add_tail(&amp;conn-&gt;mtask-&gt;running,</div><div class='add'>+				      &amp;conn-&gt;mgmt_run_list);</div><div class='add'>+			spin_unlock_bh(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+			rc = tt-&gt;xmit_mgmt_task(conn, conn-&gt;mtask);</div><div class='add'>+		        if (rc)</div><div class='add'>+			        goto again;</div><div class='add'>+	        }</div><div class='add'>+		/* done with this mtask */</div><div class='add'>+		conn-&gt;mtask = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* process command queue */</div><div class='add'>+	while (__kfifo_get(conn-&gt;xmitqueue, (void*)&amp;conn-&gt;ctask,</div><div class='add'>+			   sizeof(void*))) {</div><div class='add'>+		/*</div><div class='add'>+		 * iscsi tcp may readd the task to the xmitqueue to send</div><div class='add'>+		 * write data</div><div class='add'>+		 */</div><div class='add'>+		spin_lock_bh(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+		if (list_empty(&amp;conn-&gt;ctask-&gt;running))</div><div class='add'>+			list_add_tail(&amp;conn-&gt;ctask-&gt;running, &amp;conn-&gt;run_list);</div><div class='add'>+		spin_unlock_bh(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+		rc = tt-&gt;xmit_cmd_task(conn, conn-&gt;ctask);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto again;</div><div class='add'>+	}</div><div class='add'>+	/* done with this ctask */</div><div class='add'>+	conn-&gt;ctask = NULL;</div><div class='add'>+</div><div class='add'>+	/* process the rest control plane PDUs, if any */</div><div class='add'>+        if (unlikely(__kfifo_len(conn-&gt;mgmtqueue))) {</div><div class='add'>+	        while (__kfifo_get(conn-&gt;mgmtqueue, (void*)&amp;conn-&gt;mtask,</div><div class='add'>+			           sizeof(void*))) {</div><div class='add'>+			spin_lock_bh(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+			list_add_tail(&amp;conn-&gt;mtask-&gt;running,</div><div class='add'>+				      &amp;conn-&gt;mgmt_run_list);</div><div class='add'>+			spin_unlock_bh(&amp;conn-&gt;session-&gt;lock);</div><div class='add'>+		        rc = tt-&gt;xmit_mgmt_task(conn, conn-&gt;mtask);</div><div class='add'>+			if (rc)</div><div class='add'>+			        goto again;</div><div class='add'>+	        }</div><div class='add'>+		/* done with this mtask */</div><div class='add'>+		conn-&gt;mtask = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODATA;</div><div class='add'>+</div><div class='add'>+again:</div><div class='add'>+	if (unlikely(conn-&gt;suspend_tx))</div><div class='add'>+		return -ENODATA;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iscsi_xmitworker(void *data)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = data;</div><div class='add'>+	int rc;</div><div class='add'>+	/*</div><div class='add'>+	 * serialize Xmit worker on a per-connection basis.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	do {</div><div class='add'>+		rc = iscsi_data_xmit(conn);</div><div class='add'>+	} while (rc &gt;= 0 || rc == -EAGAIN);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FAILURE_BAD_HOST = 1,</div><div class='add'>+	FAILURE_SESSION_FAILED,</div><div class='add'>+	FAILURE_SESSION_FREED,</div><div class='add'>+	FAILURE_WINDOW_CLOSED,</div><div class='add'>+	FAILURE_SESSION_TERMINATE,</div><div class='add'>+	FAILURE_SESSION_IN_RECOVERY,</div><div class='add'>+	FAILURE_SESSION_RECOVERY_TIMEOUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host;</div><div class='add'>+	int reason = 0;</div><div class='add'>+	struct iscsi_session *session;</div><div class='add'>+	struct iscsi_conn *conn;</div><div class='add'>+	struct iscsi_cmd_task *ctask = NULL;</div><div class='add'>+</div><div class='add'>+	sc-&gt;scsi_done = done;</div><div class='add'>+	sc-&gt;result = 0;</div><div class='add'>+</div><div class='add'>+	host = sc-&gt;device-&gt;host;</div><div class='add'>+	session = iscsi_hostdata(host-&gt;hostdata);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ISCSI_STATE_FAILED is a temp. state. The recovery</div><div class='add'>+	 * code will decide what is best to do with command queued</div><div class='add'>+	 * during this time</div><div class='add'>+	 */</div><div class='add'>+	if (session-&gt;state != ISCSI_STATE_LOGGED_IN &amp;&amp;</div><div class='add'>+	    session-&gt;state != ISCSI_STATE_FAILED) {</div><div class='add'>+		/*</div><div class='add'>+		 * to handle the race between when we set the recovery state</div><div class='add'>+		 * and block the session we requeue here (commands could</div><div class='add'>+		 * be entering our queuecommand while a block is starting</div><div class='add'>+		 * up because the block code is not locked)</div><div class='add'>+		 */</div><div class='add'>+		if (session-&gt;state == ISCSI_STATE_IN_RECOVERY) {</div><div class='add'>+			reason = FAILURE_SESSION_IN_RECOVERY;</div><div class='add'>+			goto reject;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (session-&gt;state == ISCSI_STATE_RECOVERY_FAILED)</div><div class='add'>+			reason = FAILURE_SESSION_RECOVERY_TIMEOUT;</div><div class='add'>+		else if (session-&gt;state == ISCSI_STATE_TERMINATE)</div><div class='add'>+			reason = FAILURE_SESSION_TERMINATE;</div><div class='add'>+		else</div><div class='add'>+			reason = FAILURE_SESSION_FREED;</div><div class='add'>+		goto fault;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check for iSCSI window and take care of CmdSN wrap-around</div><div class='add'>+	 */</div><div class='add'>+	if ((int)(session-&gt;max_cmdsn - session-&gt;cmdsn) &lt; 0) {</div><div class='add'>+		reason = FAILURE_WINDOW_CLOSED;</div><div class='add'>+		goto reject;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn = session-&gt;leadconn;</div><div class='add'>+</div><div class='add'>+	__kfifo_get(session-&gt;cmdpool.queue, (void*)&amp;ctask, sizeof(void*));</div><div class='add'>+	sc-&gt;SCp.phase = session-&gt;age;</div><div class='add'>+	sc-&gt;SCp.ptr = (char *)ctask;</div><div class='add'>+</div><div class='add'>+	ctask-&gt;mtask = NULL;</div><div class='add'>+	ctask-&gt;conn = conn;</div><div class='add'>+	ctask-&gt;sc = sc;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ctask-&gt;running);</div><div class='add'>+	ctask-&gt;total_length = sc-&gt;request_bufflen;</div><div class='add'>+	iscsi_prep_scsi_cmd_pdu(ctask);</div><div class='add'>+</div><div class='add'>+	session-&gt;tt-&gt;init_cmd_task(ctask);</div><div class='add'>+</div><div class='add'>+	__kfifo_put(conn-&gt;xmitqueue, (void*)&amp;ctask, sizeof(void*));</div><div class='add'>+	debug_scsi(</div><div class='add'>+	       "ctask enq [%s cid %d sc %lx itt 0x%x len %d cmdsn %d win %d]\n",</div><div class='add'>+		sc-&gt;sc_data_direction == DMA_TO_DEVICE ? "write" : "read",</div><div class='add'>+		conn-&gt;id, (long)sc, ctask-&gt;itt, sc-&gt;request_bufflen,</div><div class='add'>+		session-&gt;cmdsn, session-&gt;max_cmdsn - session-&gt;exp_cmdsn + 1);</div><div class='add'>+	spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	scsi_queue_work(host, &amp;conn-&gt;xmitwork);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+reject:</div><div class='add'>+	spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+	debug_scsi("cmd 0x%x rejected (%d)\n", sc-&gt;cmnd[0], reason);</div><div class='add'>+	return SCSI_MLQUEUE_HOST_BUSY;</div><div class='add'>+</div><div class='add'>+fault:</div><div class='add'>+	spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+	printk(KERN_ERR "iscsi: cmd 0x%x is not queued (%d)\n",</div><div class='add'>+	       sc-&gt;cmnd[0], reason);</div><div class='add'>+	sc-&gt;result = (DID_NO_CONNECT &lt;&lt; 16);</div><div class='add'>+	sc-&gt;resid = sc-&gt;request_bufflen;</div><div class='add'>+	sc-&gt;scsi_done(sc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_queuecommand);</div><div class='add'>+</div><div class='add'>+int iscsi_change_queue_depth(struct scsi_device *sdev, int depth)</div><div class='add'>+{</div><div class='add'>+	if (depth &gt; ISCSI_MAX_CMD_PER_LUN)</div><div class='add'>+		depth = ISCSI_MAX_CMD_PER_LUN;</div><div class='add'>+	scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);</div><div class='add'>+	return sdev-&gt;queue_depth;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_change_queue_depth);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_conn_send_generic(struct iscsi_conn *conn, struct iscsi_hdr *hdr,</div><div class='add'>+			char *data, uint32_t data_size)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_nopout *nop = (struct iscsi_nopout *)hdr;</div><div class='add'>+	struct iscsi_mgmt_task *mtask;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	if (hdr-&gt;opcode == (ISCSI_OP_LOGIN | ISCSI_OP_IMMEDIATE) ||</div><div class='add'>+	    hdr-&gt;opcode == (ISCSI_OP_TEXT | ISCSI_OP_IMMEDIATE))</div><div class='add'>+		/*</div><div class='add'>+		 * Login and Text are sent serially, in</div><div class='add'>+		 * request-followed-by-response sequence.</div><div class='add'>+		 * Same mtask can be used. Same ITT must be used.</div><div class='add'>+		 * Note that login_mtask is preallocated at conn_create().</div><div class='add'>+		 */</div><div class='add'>+		mtask = conn-&gt;login_mtask;</div><div class='add'>+	else {</div><div class='add'>+		BUG_ON(conn-&gt;c_stage == ISCSI_CONN_INITIAL_STAGE);</div><div class='add'>+		BUG_ON(conn-&gt;c_stage == ISCSI_CONN_STOPPED);</div><div class='add'>+</div><div class='add'>+		nop-&gt;exp_statsn = cpu_to_be32(conn-&gt;exp_statsn);</div><div class='add'>+		if (!__kfifo_get(session-&gt;mgmtpool.queue,</div><div class='add'>+				 (void*)&amp;mtask, sizeof(void*))) {</div><div class='add'>+			spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * pre-format CmdSN for outgoing PDU.</div><div class='add'>+	 */</div><div class='add'>+	if (hdr-&gt;itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {</div><div class='add'>+		hdr-&gt;itt = mtask-&gt;itt | (conn-&gt;id &lt;&lt; ISCSI_CID_SHIFT) |</div><div class='add'>+			   (session-&gt;age &lt;&lt; ISCSI_AGE_SHIFT);</div><div class='add'>+		nop-&gt;cmdsn = cpu_to_be32(session-&gt;cmdsn);</div><div class='add'>+		if (conn-&gt;c_stage == ISCSI_CONN_STARTED &amp;&amp;</div><div class='add'>+		    !(hdr-&gt;opcode &amp; ISCSI_OP_IMMEDIATE))</div><div class='add'>+			session-&gt;cmdsn++;</div><div class='add'>+	} else</div><div class='add'>+		/* do not advance CmdSN */</div><div class='add'>+		nop-&gt;cmdsn = cpu_to_be32(session-&gt;cmdsn);</div><div class='add'>+</div><div class='add'>+	if (data_size) {</div><div class='add'>+		memcpy(mtask-&gt;data, data, data_size);</div><div class='add'>+		mtask-&gt;data_count = data_size;</div><div class='add'>+	} else</div><div class='add'>+		mtask-&gt;data_count = 0;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;mtask-&gt;running);</div><div class='add'>+	memcpy(mtask-&gt;hdr, hdr, sizeof(struct iscsi_hdr));</div><div class='add'>+	if (session-&gt;tt-&gt;init_mgmt_task)</div><div class='add'>+		session-&gt;tt-&gt;init_mgmt_task(conn, mtask, data, data_size);</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	debug_scsi("mgmtpdu [op 0x%x hdr-&gt;itt 0x%x datalen %d]\n",</div><div class='add'>+		   hdr-&gt;opcode, hdr-&gt;itt, data_size);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * since send_pdu() could be called at least from two contexts,</div><div class='add'>+	 * we need to serialize __kfifo_put, so we don't have to take</div><div class='add'>+	 * additional lock on fast data-path</div><div class='add'>+	 */</div><div class='add'>+        if (hdr-&gt;opcode &amp; ISCSI_OP_IMMEDIATE)</div><div class='add'>+	        __kfifo_put(conn-&gt;immqueue, (void*)&amp;mtask, sizeof(void*));</div><div class='add'>+	else</div><div class='add'>+	        __kfifo_put(conn-&gt;mgmtqueue, (void*)&amp;mtask, sizeof(void*));</div><div class='add'>+</div><div class='add'>+	scsi_queue_work(session-&gt;host, &amp;conn-&gt;xmitwork);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iscsi_conn_send_pdu(struct iscsi_cls_conn *cls_conn, struct iscsi_hdr *hdr,</div><div class='add'>+			char *data, uint32_t data_size)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	rc = iscsi_conn_send_generic(conn, hdr, data, data_size);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_send_pdu);</div><div class='add'>+</div><div class='add'>+void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = class_to_transport_session(cls_session);</div><div class='add'>+	struct iscsi_conn *conn = session-&gt;leadconn;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (session-&gt;state != ISCSI_STATE_LOGGED_IN) {</div><div class='add'>+		session-&gt;state = ISCSI_STATE_RECOVERY_FAILED;</div><div class='add'>+		if (conn)</div><div class='add'>+			wake_up(&amp;conn-&gt;ehwait);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_session_recovery_timedout);</div><div class='add'>+</div><div class='add'>+int iscsi_eh_host_reset(struct scsi_cmnd *sc)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *host = sc-&gt;device-&gt;host;</div><div class='add'>+	struct iscsi_session *session = iscsi_hostdata(host-&gt;hostdata);</div><div class='add'>+	struct iscsi_conn *conn = session-&gt;leadconn;</div><div class='add'>+	int fail_session = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (session-&gt;state == ISCSI_STATE_TERMINATE) {</div><div class='add'>+failed:</div><div class='add'>+		debug_scsi("failing host reset: session terminated "</div><div class='add'>+			   "[CID %d age %d]", conn-&gt;id, session-&gt;age);</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+		return FAILED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sc-&gt;SCp.phase == session-&gt;age) {</div><div class='add'>+		debug_scsi("failing connection CID %d due to SCSI host reset",</div><div class='add'>+			   conn-&gt;id);</div><div class='add'>+		fail_session = 1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * we drop the lock here but the leadconn cannot be destoyed while</div><div class='add'>+	 * we are in the scsi eh</div><div class='add'>+	 */</div><div class='add'>+	if (fail_session)</div><div class='add'>+		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+</div><div class='add'>+	debug_scsi("iscsi_eh_host_reset wait for relogin\n");</div><div class='add'>+	wait_event_interruptible(conn-&gt;ehwait,</div><div class='add'>+				 session-&gt;state == ISCSI_STATE_TERMINATE ||</div><div class='add'>+				 session-&gt;state == ISCSI_STATE_LOGGED_IN ||</div><div class='add'>+				 session-&gt;state == ISCSI_STATE_RECOVERY_FAILED);</div><div class='add'>+	if (signal_pending(current))</div><div class='add'>+		flush_signals(current);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (session-&gt;state == ISCSI_STATE_LOGGED_IN)</div><div class='add'>+		printk(KERN_INFO "iscsi: host reset succeeded\n");</div><div class='add'>+	else</div><div class='add'>+		goto failed;</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return SUCCESS;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_eh_host_reset);</div><div class='add'>+</div><div class='add'>+static void iscsi_tmabort_timedout(unsigned long data)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)data;</div><div class='add'>+	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;session-&gt;lock);</div><div class='add'>+	if (conn-&gt;tmabort_state == TMABORT_INITIAL) {</div><div class='add'>+		conn-&gt;tmabort_state = TMABORT_TIMEDOUT;</div><div class='add'>+		debug_scsi("tmabort timedout [sc %p itt 0x%x]\n",</div><div class='add'>+			ctask-&gt;sc, ctask-&gt;itt);</div><div class='add'>+		/* unblock eh_abort() */</div><div class='add'>+		wake_up(&amp;conn-&gt;ehwait);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* must be called with the mutex lock */</div><div class='add'>+static int iscsi_exec_abort_task(struct scsi_cmnd *sc,</div><div class='add'>+				 struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_tm *hdr = &amp;conn-&gt;tmhdr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ctask timed out but session is OK requests must be serialized.</div><div class='add'>+	 */</div><div class='add'>+	memset(hdr, 0, sizeof(struct iscsi_tm));</div><div class='add'>+	hdr-&gt;opcode = ISCSI_OP_SCSI_TMFUNC | ISCSI_OP_IMMEDIATE;</div><div class='add'>+	hdr-&gt;flags = ISCSI_TM_FUNC_ABORT_TASK;</div><div class='add'>+	hdr-&gt;flags |= ISCSI_FLAG_CMD_FINAL;</div><div class='add'>+	memcpy(hdr-&gt;lun, ctask-&gt;hdr-&gt;lun, sizeof(hdr-&gt;lun));</div><div class='add'>+	hdr-&gt;rtt = ctask-&gt;hdr-&gt;itt;</div><div class='add'>+	hdr-&gt;refcmdsn = ctask-&gt;hdr-&gt;cmdsn;</div><div class='add'>+</div><div class='add'>+	rc = iscsi_conn_send_generic(conn, (struct iscsi_hdr *)hdr,</div><div class='add'>+				     NULL, 0);</div><div class='add'>+	if (rc) {</div><div class='add'>+		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+		debug_scsi("abort sent failure [itt 0x%x] %d", ctask-&gt;itt, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	debug_scsi("abort sent [itt 0x%x]\n", ctask-&gt;itt);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	ctask-&gt;mtask = (struct iscsi_mgmt_task *)</div><div class='add'>+			session-&gt;mgmt_cmds[(hdr-&gt;itt &amp; ISCSI_ITT_MASK) -</div><div class='add'>+					ISCSI_MGMT_ITT_OFFSET];</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;tmabort_state == TMABORT_INITIAL) {</div><div class='add'>+		conn-&gt;tmfcmd_pdus_cnt++;</div><div class='add'>+		conn-&gt;tmabort_timer.expires = 10*HZ + jiffies;</div><div class='add'>+		conn-&gt;tmabort_timer.function = iscsi_tmabort_timedout;</div><div class='add'>+		conn-&gt;tmabort_timer.data = (unsigned long)ctask;</div><div class='add'>+		add_timer(&amp;conn-&gt;tmabort_timer);</div><div class='add'>+		debug_scsi("abort set timeout [itt 0x%x]", ctask-&gt;itt);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * block eh thread until:</div><div class='add'>+	 *</div><div class='add'>+	 * 1) abort response</div><div class='add'>+	 * 2) abort timeout</div><div class='add'>+	 * 3) session is terminated or restarted or userspace has</div><div class='add'>+	 * given up on recovery</div><div class='add'>+	 */</div><div class='add'>+	wait_event_interruptible(conn-&gt;ehwait,</div><div class='add'>+				 sc-&gt;SCp.phase != session-&gt;age ||</div><div class='add'>+				 session-&gt;state != ISCSI_STATE_LOGGED_IN ||</div><div class='add'>+				 conn-&gt;tmabort_state != TMABORT_INITIAL);</div><div class='add'>+	if (signal_pending(current))</div><div class='add'>+		flush_signals(current);</div><div class='add'>+	del_timer_sync(&amp;conn-&gt;tmabort_timer);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * xmit mutex and session lock must be held</div><div class='add'>+ */</div><div class='add'>+#define iscsi_remove_task(tasktype)					\</div><div class='add'>+static struct iscsi_##tasktype *					\</div><div class='add'>+iscsi_remove_##tasktype(struct kfifo *fifo, uint32_t itt)		\</div><div class='add'>+{									\</div><div class='add'>+	int i, nr_tasks = __kfifo_len(fifo) / sizeof(void*);		\</div><div class='add'>+	struct iscsi_##tasktype *task;					\</div><div class='add'>+									\</div><div class='add'>+	debug_scsi("searching %d tasks\n", nr_tasks);			\</div><div class='add'>+									\</div><div class='add'>+	for (i = 0; i &lt; nr_tasks; i++) {				\</div><div class='add'>+		__kfifo_get(fifo, (void*)&amp;task, sizeof(void*));		\</div><div class='add'>+		debug_scsi("check task %u\n", task-&gt;itt);		\</div><div class='add'>+									\</div><div class='add'>+		if (task-&gt;itt == itt) {					\</div><div class='add'>+			debug_scsi("matched task\n");			\</div><div class='add'>+			return task;					\</div><div class='add'>+		}							\</div><div class='add'>+									\</div><div class='add'>+		__kfifo_put(fifo, (void*)&amp;task, sizeof(void*));		\</div><div class='add'>+	}								\</div><div class='add'>+	return NULL;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+iscsi_remove_task(mgmt_task);</div><div class='add'>+iscsi_remove_task(cmd_task);</div><div class='add'>+</div><div class='add'>+static int iscsi_ctask_mtask_cleanup(struct iscsi_cmd_task *ctask)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+</div><div class='add'>+	if (!ctask-&gt;mtask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!iscsi_remove_mgmt_task(conn-&gt;immqueue, ctask-&gt;mtask-&gt;itt))</div><div class='add'>+		list_del(&amp;ctask-&gt;mtask-&gt;running);</div><div class='add'>+	__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;ctask-&gt;mtask,</div><div class='add'>+		    sizeof(void*));</div><div class='add'>+	ctask-&gt;mtask = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * session lock and xmitmutex must be held</div><div class='add'>+ */</div><div class='add'>+static void fail_command(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,</div><div class='add'>+			 int err)</div><div class='add'>+{</div><div class='add'>+	struct scsi_cmnd *sc;</div><div class='add'>+</div><div class='add'>+	conn-&gt;session-&gt;tt-&gt;cleanup_cmd_task(conn, ctask);</div><div class='add'>+	iscsi_ctask_mtask_cleanup(ctask);</div><div class='add'>+</div><div class='add'>+	sc = ctask-&gt;sc;</div><div class='add'>+	if (!sc)</div><div class='add'>+		return;</div><div class='add'>+	sc-&gt;result = err;</div><div class='add'>+	sc-&gt;resid = sc-&gt;request_bufflen;</div><div class='add'>+	iscsi_complete_command(conn-&gt;session, ctask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int iscsi_eh_abort(struct scsi_cmnd *sc)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)sc-&gt;SCp.ptr;</div><div class='add'>+	struct iscsi_conn *conn = ctask-&gt;conn;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	struct iscsi_cmd_task *pending_ctask;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	conn-&gt;eh_abort_cnt++;</div><div class='add'>+	debug_scsi("aborting [sc %p itt 0x%x]\n", sc, ctask-&gt;itt);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we are not logged in or we have started a new session</div><div class='add'>+	 * then let the host reset code handle this</div><div class='add'>+	 */</div><div class='add'>+	if (session-&gt;state != ISCSI_STATE_LOGGED_IN ||</div><div class='add'>+	    sc-&gt;SCp.phase != session-&gt;age)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* ctask completed before time out */</div><div class='add'>+	if (!ctask-&gt;sc)</div><div class='add'>+		goto success;</div><div class='add'>+</div><div class='add'>+	/* what should we do here ? */</div><div class='add'>+	if (conn-&gt;ctask == ctask) {</div><div class='add'>+		printk(KERN_INFO "iscsi: sc %p itt 0x%x partially sent. "</div><div class='add'>+		       "Failing abort\n", sc, ctask-&gt;itt);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check for the easy pending cmd abort */</div><div class='add'>+	pending_ctask = iscsi_remove_cmd_task(conn-&gt;xmitqueue, ctask-&gt;itt);</div><div class='add'>+	if (pending_ctask) {</div><div class='add'>+		/* iscsi_tcp queues write transfers on the xmitqueue */</div><div class='add'>+		if (list_empty(&amp;pending_ctask-&gt;running)) {</div><div class='add'>+			debug_scsi("found pending task\n");</div><div class='add'>+			goto success;</div><div class='add'>+		} else</div><div class='add'>+			__kfifo_put(conn-&gt;xmitqueue, (void*)&amp;pending_ctask,</div><div class='add'>+				    sizeof(void*));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	rc = iscsi_exec_abort_task(sc, ctask);</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	iscsi_ctask_mtask_cleanup(ctask);</div><div class='add'>+	if (rc || sc-&gt;SCp.phase != session-&gt;age ||</div><div class='add'>+	    session-&gt;state != ISCSI_STATE_LOGGED_IN)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* ctask completed before tmf abort response */</div><div class='add'>+	if (!ctask-&gt;sc) {</div><div class='add'>+		debug_scsi("sc completed while abort in progress\n");</div><div class='add'>+		goto success;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conn-&gt;tmabort_state != TMABORT_SUCCESS) {</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);</div><div class='add'>+		spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+success:</div><div class='add'>+	debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask-&gt;itt);</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * clean up task if aborted. we have the xmitmutex so grab</div><div class='add'>+	 * the recv lock as a writer</div><div class='add'>+	 */</div><div class='add'>+	write_lock_bh(conn-&gt;recv_lock);</div><div class='add'>+	spin_lock(&amp;session-&gt;lock);</div><div class='add'>+	fail_command(conn, ctask, DID_ABORT &lt;&lt; 16);</div><div class='add'>+	spin_unlock(&amp;session-&gt;lock);</div><div class='add'>+	write_unlock_bh(conn-&gt;recv_lock);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	return SUCCESS;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+</div><div class='add'>+	debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask-&gt;itt);</div><div class='add'>+	return FAILED;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_eh_abort);</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+iscsi_pool_init(struct iscsi_queue *q, int max, void ***items, int item_size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*items = kmalloc(max * sizeof(void*), GFP_KERNEL);</div><div class='add'>+	if (*items == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	q-&gt;max = max;</div><div class='add'>+	q-&gt;pool = kmalloc(max * sizeof(void*), GFP_KERNEL);</div><div class='add'>+	if (q-&gt;pool == NULL) {</div><div class='add'>+		kfree(*items);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q-&gt;queue = kfifo_init((void*)q-&gt;pool, max * sizeof(void*),</div><div class='add'>+			      GFP_KERNEL, NULL);</div><div class='add'>+	if (q-&gt;queue == ERR_PTR(-ENOMEM)) {</div><div class='add'>+		kfree(q-&gt;pool);</div><div class='add'>+		kfree(*items);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max; i++) {</div><div class='add'>+		q-&gt;pool[i] = kmalloc(item_size, GFP_KERNEL);</div><div class='add'>+		if (q-&gt;pool[i] == NULL) {</div><div class='add'>+			int j;</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; i; j++)</div><div class='add'>+				kfree(q-&gt;pool[j]);</div><div class='add'>+</div><div class='add'>+			kfifo_free(q-&gt;queue);</div><div class='add'>+			kfree(q-&gt;pool);</div><div class='add'>+			kfree(*items);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		memset(q-&gt;pool[i], 0, item_size);</div><div class='add'>+		(*items)[i] = q-&gt;pool[i];</div><div class='add'>+		__kfifo_put(q-&gt;queue, (void*)&amp;q-&gt;pool[i], sizeof(void*));</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_pool_init);</div><div class='add'>+</div><div class='add'>+void iscsi_pool_free(struct iscsi_queue *q, void **items)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; q-&gt;max; i++)</div><div class='add'>+		kfree(items[i]);</div><div class='add'>+	kfree(q-&gt;pool);</div><div class='add'>+	kfree(items);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_pool_free);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * iSCSI Session's hostdata organization:</div><div class='add'>+ *</div><div class='add'>+ *    *------------------* &lt;== hostdata_session(host-&gt;hostdata)</div><div class='add'>+ *    | ptr to class sess|</div><div class='add'>+ *    |------------------| &lt;== iscsi_hostdata(host-&gt;hostdata)</div><div class='add'>+ *    | iscsi_session    |</div><div class='add'>+ *    *------------------*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define hostdata_privsize(_sz)	(sizeof(unsigned long) + _sz + \</div><div class='add'>+				 _sz % sizeof(unsigned long))</div><div class='add'>+</div><div class='add'>+#define hostdata_session(_hostdata) (iscsi_ptr(*(unsigned long *)_hostdata))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_session_setup - create iscsi cls session and host and session</div><div class='add'>+ * @scsit: scsi transport template</div><div class='add'>+ * @iscsit: iscsi transport template</div><div class='add'>+ * @initial_cmdsn: initial CmdSN</div><div class='add'>+ * @hostno: host no allocated</div><div class='add'>+ *</div><div class='add'>+ * This can be used by software iscsi_transports that allocate</div><div class='add'>+ * a session per scsi host.</div><div class='add'>+ **/</div><div class='add'>+struct iscsi_cls_session *</div><div class='add'>+iscsi_session_setup(struct iscsi_transport *iscsit,</div><div class='add'>+		    struct scsi_transport_template *scsit,</div><div class='add'>+		    int cmd_task_size, int mgmt_task_size,</div><div class='add'>+		    uint32_t initial_cmdsn, uint32_t *hostno)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	struct iscsi_session *session;</div><div class='add'>+	struct iscsi_cls_session *cls_session;</div><div class='add'>+	int cmd_i;</div><div class='add'>+</div><div class='add'>+	shost = scsi_host_alloc(iscsit-&gt;host_template,</div><div class='add'>+				hostdata_privsize(sizeof(*session)));</div><div class='add'>+	if (!shost)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	shost-&gt;max_id = 1;</div><div class='add'>+	shost-&gt;max_channel = 0;</div><div class='add'>+	shost-&gt;max_lun = iscsit-&gt;max_lun;</div><div class='add'>+	shost-&gt;max_cmd_len = iscsit-&gt;max_cmd_len;</div><div class='add'>+	shost-&gt;transportt = scsit;</div><div class='add'>+	shost-&gt;transportt-&gt;create_work_queue = 1;</div><div class='add'>+	*hostno = shost-&gt;host_no;</div><div class='add'>+</div><div class='add'>+	session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='add'>+	memset(session, 0, sizeof(struct iscsi_session));</div><div class='add'>+	session-&gt;host = shost;</div><div class='add'>+	session-&gt;state = ISCSI_STATE_FREE;</div><div class='add'>+	session-&gt;mgmtpool_max = ISCSI_MGMT_CMDS_MAX;</div><div class='add'>+	session-&gt;cmds_max = ISCSI_XMIT_CMDS_MAX;</div><div class='add'>+	session-&gt;cmdsn = initial_cmdsn;</div><div class='add'>+	session-&gt;exp_cmdsn = initial_cmdsn + 1;</div><div class='add'>+	session-&gt;max_cmdsn = initial_cmdsn + 1;</div><div class='add'>+	session-&gt;max_r2t = 1;</div><div class='add'>+	session-&gt;tt = iscsit;</div><div class='add'>+</div><div class='add'>+	/* initialize SCSI PDU commands pool */</div><div class='add'>+	if (iscsi_pool_init(&amp;session-&gt;cmdpool, session-&gt;cmds_max,</div><div class='add'>+			    (void***)&amp;session-&gt;cmds,</div><div class='add'>+			    cmd_task_size + sizeof(struct iscsi_cmd_task)))</div><div class='add'>+		goto cmdpool_alloc_fail;</div><div class='add'>+</div><div class='add'>+	/* pre-format cmds pool with ITT */</div><div class='add'>+	for (cmd_i = 0; cmd_i &lt; session-&gt;cmds_max; cmd_i++) {</div><div class='add'>+		struct iscsi_cmd_task *ctask = session-&gt;cmds[cmd_i];</div><div class='add'>+</div><div class='add'>+		if (cmd_task_size)</div><div class='add'>+			ctask-&gt;dd_data = &amp;ctask[1];</div><div class='add'>+		ctask-&gt;itt = cmd_i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;session-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;session-&gt;connections);</div><div class='add'>+</div><div class='add'>+	/* initialize immediate command pool */</div><div class='add'>+	if (iscsi_pool_init(&amp;session-&gt;mgmtpool, session-&gt;mgmtpool_max,</div><div class='add'>+			   (void***)&amp;session-&gt;mgmt_cmds,</div><div class='add'>+			   mgmt_task_size + sizeof(struct iscsi_mgmt_task)))</div><div class='add'>+		goto mgmtpool_alloc_fail;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* pre-format immediate cmds pool with ITT */</div><div class='add'>+	for (cmd_i = 0; cmd_i &lt; session-&gt;mgmtpool_max; cmd_i++) {</div><div class='add'>+		struct iscsi_mgmt_task *mtask = session-&gt;mgmt_cmds[cmd_i];</div><div class='add'>+</div><div class='add'>+		if (mgmt_task_size)</div><div class='add'>+			mtask-&gt;dd_data = &amp;mtask[1];</div><div class='add'>+		mtask-&gt;itt = ISCSI_MGMT_ITT_OFFSET + cmd_i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scsi_add_host(shost, NULL))</div><div class='add'>+		goto add_host_fail;</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(iscsit-&gt;owner))</div><div class='add'>+		goto cls_session_fail;</div><div class='add'>+</div><div class='add'>+	cls_session = iscsi_create_session(shost, iscsit, 0);</div><div class='add'>+	if (!cls_session)</div><div class='add'>+		goto module_put;</div><div class='add'>+	*(unsigned long*)shost-&gt;hostdata = (unsigned long)cls_session;</div><div class='add'>+</div><div class='add'>+	return cls_session;</div><div class='add'>+</div><div class='add'>+module_put:</div><div class='add'>+	module_put(iscsit-&gt;owner);</div><div class='add'>+cls_session_fail:</div><div class='add'>+	scsi_remove_host(shost);</div><div class='add'>+add_host_fail:</div><div class='add'>+	iscsi_pool_free(&amp;session-&gt;mgmtpool, (void**)session-&gt;mgmt_cmds);</div><div class='add'>+mgmtpool_alloc_fail:</div><div class='add'>+	iscsi_pool_free(&amp;session-&gt;cmdpool, (void**)session-&gt;cmds);</div><div class='add'>+cmdpool_alloc_fail:</div><div class='add'>+	scsi_host_put(shost);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_session_setup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_session_teardown - destroy session, host, and cls_session</div><div class='add'>+ * shost: scsi host</div><div class='add'>+ *</div><div class='add'>+ * This can be used by software iscsi_transports that allocate</div><div class='add'>+ * a session per scsi host.</div><div class='add'>+ **/</div><div class='add'>+void iscsi_session_teardown(struct iscsi_cls_session *cls_session)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='add'>+	struct iscsi_session *session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='add'>+</div><div class='add'>+	scsi_remove_host(shost);</div><div class='add'>+</div><div class='add'>+	iscsi_pool_free(&amp;session-&gt;mgmtpool, (void**)session-&gt;mgmt_cmds);</div><div class='add'>+	iscsi_pool_free(&amp;session-&gt;cmdpool, (void**)session-&gt;cmds);</div><div class='add'>+</div><div class='add'>+	iscsi_destroy_session(cls_session);</div><div class='add'>+	scsi_host_put(shost);</div><div class='add'>+	module_put(cls_session-&gt;transport-&gt;owner);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_session_teardown);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_conn_setup - create iscsi_cls_conn and iscsi_conn</div><div class='add'>+ * @cls_session: iscsi_cls_session</div><div class='add'>+ * @conn_idx: cid</div><div class='add'>+ **/</div><div class='add'>+struct iscsi_cls_conn *</div><div class='add'>+iscsi_conn_setup(struct iscsi_cls_session *cls_session, uint32_t conn_idx)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = class_to_transport_session(cls_session);</div><div class='add'>+	struct iscsi_conn *conn;</div><div class='add'>+	struct iscsi_cls_conn *cls_conn;</div><div class='add'>+	char *data;</div><div class='add'>+</div><div class='add'>+	cls_conn = iscsi_create_conn(cls_session, conn_idx);</div><div class='add'>+	if (!cls_conn)</div><div class='add'>+		return NULL;</div><div class='add'>+	conn = cls_conn-&gt;dd_data;</div><div class='add'>+	memset(conn, 0, sizeof(*conn));</div><div class='add'>+</div><div class='add'>+	conn-&gt;session = session;</div><div class='add'>+	conn-&gt;cls_conn = cls_conn;</div><div class='add'>+	conn-&gt;c_stage = ISCSI_CONN_INITIAL_STAGE;</div><div class='add'>+	conn-&gt;id = conn_idx;</div><div class='add'>+	conn-&gt;exp_statsn = 0;</div><div class='add'>+	conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='add'>+	INIT_LIST_HEAD(&amp;conn-&gt;run_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;conn-&gt;mgmt_run_list);</div><div class='add'>+</div><div class='add'>+	/* initialize general xmit PDU commands queue */</div><div class='add'>+	conn-&gt;xmitqueue = kfifo_alloc(session-&gt;cmds_max * sizeof(void*),</div><div class='add'>+					GFP_KERNEL, NULL);</div><div class='add'>+	if (conn-&gt;xmitqueue == ERR_PTR(-ENOMEM))</div><div class='add'>+		goto xmitqueue_alloc_fail;</div><div class='add'>+</div><div class='add'>+	/* initialize general immediate &amp; non-immediate PDU commands queue */</div><div class='add'>+	conn-&gt;immqueue = kfifo_alloc(session-&gt;mgmtpool_max * sizeof(void*),</div><div class='add'>+			                GFP_KERNEL, NULL);</div><div class='add'>+	if (conn-&gt;immqueue == ERR_PTR(-ENOMEM))</div><div class='add'>+		goto immqueue_alloc_fail;</div><div class='add'>+</div><div class='add'>+	conn-&gt;mgmtqueue = kfifo_alloc(session-&gt;mgmtpool_max * sizeof(void*),</div><div class='add'>+			                GFP_KERNEL, NULL);</div><div class='add'>+	if (conn-&gt;mgmtqueue == ERR_PTR(-ENOMEM))</div><div class='add'>+		goto mgmtqueue_alloc_fail;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;conn-&gt;xmitwork, iscsi_xmitworker, conn);</div><div class='add'>+</div><div class='add'>+	/* allocate login_mtask used for the login/text sequences */</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (!__kfifo_get(session-&gt;mgmtpool.queue,</div><div class='add'>+                         (void*)&amp;conn-&gt;login_mtask,</div><div class='add'>+			 sizeof(void*))) {</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+		goto login_mtask_alloc_fail;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	data = kmalloc(DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		goto login_mtask_data_alloc_fail;</div><div class='add'>+	conn-&gt;login_mtask-&gt;data = data;</div><div class='add'>+</div><div class='add'>+	init_timer(&amp;conn-&gt;tmabort_timer);</div><div class='add'>+	mutex_init(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	init_waitqueue_head(&amp;conn-&gt;ehwait);</div><div class='add'>+</div><div class='add'>+	return cls_conn;</div><div class='add'>+</div><div class='add'>+login_mtask_data_alloc_fail:</div><div class='add'>+	__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;conn-&gt;login_mtask,</div><div class='add'>+		    sizeof(void*));</div><div class='add'>+login_mtask_alloc_fail:</div><div class='add'>+	kfifo_free(conn-&gt;mgmtqueue);</div><div class='add'>+mgmtqueue_alloc_fail:</div><div class='add'>+	kfifo_free(conn-&gt;immqueue);</div><div class='add'>+immqueue_alloc_fail:</div><div class='add'>+	kfifo_free(conn-&gt;xmitqueue);</div><div class='add'>+xmitqueue_alloc_fail:</div><div class='add'>+	iscsi_destroy_conn(cls_conn);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_setup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_conn_teardown - teardown iscsi connection</div><div class='add'>+ * cls_conn: iscsi class connection</div><div class='add'>+ *</div><div class='add'>+ * TODO: we may need to make this into a two step process</div><div class='add'>+ * like scsi-mls remove + put host</div><div class='add'>+ */</div><div class='add'>+void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	if (conn-&gt;c_stage == ISCSI_CONN_INITIAL_STAGE) {</div><div class='add'>+		if (session-&gt;tt-&gt;suspend_conn_recv)</div><div class='add'>+			session-&gt;tt-&gt;suspend_conn_recv(conn);</div><div class='add'>+</div><div class='add'>+		session-&gt;tt-&gt;terminate_conn(conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	conn-&gt;c_stage = ISCSI_CONN_CLEANUP_WAIT;</div><div class='add'>+	if (session-&gt;leadconn == conn) {</div><div class='add'>+		/*</div><div class='add'>+		 * leading connection? then give up on recovery.</div><div class='add'>+		 */</div><div class='add'>+		session-&gt;state = ISCSI_STATE_TERMINATE;</div><div class='add'>+		wake_up(&amp;conn-&gt;ehwait);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Block until all in-progress commands for this connection</div><div class='add'>+	 * time out or fail.</div><div class='add'>+	 */</div><div class='add'>+	for (;;) {</div><div class='add'>+		spin_lock_irqsave(session-&gt;host-&gt;host_lock, flags);</div><div class='add'>+		if (!session-&gt;host-&gt;host_busy) { /* OK for ERL == 0 */</div><div class='add'>+			spin_unlock_irqrestore(session-&gt;host-&gt;host_lock, flags);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(session-&gt;host-&gt;host_lock, flags);</div><div class='add'>+		msleep_interruptible(500);</div><div class='add'>+		printk(KERN_INFO "iscsi: scsi conn_destroy(): host_busy %d "</div><div class='add'>+		       "host_failed %d\n", session-&gt;host-&gt;host_busy,</div><div class='add'>+		       session-&gt;host-&gt;host_failed);</div><div class='add'>+		/*</div><div class='add'>+		 * force eh_abort() to unblock</div><div class='add'>+		 */</div><div class='add'>+		wake_up(&amp;conn-&gt;ehwait);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	kfree(conn-&gt;login_mtask-&gt;data);</div><div class='add'>+	__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;conn-&gt;login_mtask,</div><div class='add'>+		    sizeof(void*));</div><div class='add'>+	list_del(&amp;conn-&gt;item);</div><div class='add'>+	if (list_empty(&amp;session-&gt;connections))</div><div class='add'>+		session-&gt;leadconn = NULL;</div><div class='add'>+	if (session-&gt;leadconn &amp;&amp; session-&gt;leadconn == conn)</div><div class='add'>+		session-&gt;leadconn = container_of(session-&gt;connections.next,</div><div class='add'>+			struct iscsi_conn, item);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;leadconn == NULL)</div><div class='add'>+		/* no connections exits.. reset sequencing */</div><div class='add'>+		session-&gt;cmdsn = session-&gt;max_cmdsn = session-&gt;exp_cmdsn = 1;</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	kfifo_free(conn-&gt;xmitqueue);</div><div class='add'>+	kfifo_free(conn-&gt;immqueue);</div><div class='add'>+	kfifo_free(conn-&gt;mgmtqueue);</div><div class='add'>+</div><div class='add'>+	iscsi_destroy_conn(cls_conn);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_teardown);</div><div class='add'>+</div><div class='add'>+int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+</div><div class='add'>+	if (session == NULL) {</div><div class='add'>+		printk(KERN_ERR "iscsi: can't start unbound connection\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	conn-&gt;c_stage = ISCSI_CONN_STARTED;</div><div class='add'>+	session-&gt;state = ISCSI_STATE_LOGGED_IN;</div><div class='add'>+</div><div class='add'>+	switch(conn-&gt;stop_stage) {</div><div class='add'>+	case STOP_CONN_RECOVER:</div><div class='add'>+		/*</div><div class='add'>+		 * unblock eh_abort() if it is blocked. re-try all</div><div class='add'>+		 * commands after successful recovery</div><div class='add'>+		 */</div><div class='add'>+		conn-&gt;stop_stage = 0;</div><div class='add'>+		conn-&gt;tmabort_state = TMABORT_INITIAL;</div><div class='add'>+		session-&gt;age++;</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+		iscsi_unblock_session(session_to_cls(session));</div><div class='add'>+		wake_up(&amp;conn-&gt;ehwait);</div><div class='add'>+		return 0;</div><div class='add'>+	case STOP_CONN_TERM:</div><div class='add'>+		conn-&gt;stop_stage = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_start);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+flush_control_queues(struct iscsi_session *session, struct iscsi_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_mgmt_task *mtask, *tmp;</div><div class='add'>+</div><div class='add'>+	/* handle pending */</div><div class='add'>+	while (__kfifo_get(conn-&gt;immqueue, (void*)&amp;mtask, sizeof(void*)) ||</div><div class='add'>+	       __kfifo_get(conn-&gt;mgmtqueue, (void*)&amp;mtask, sizeof(void*))) {</div><div class='add'>+		if (mtask == conn-&gt;login_mtask)</div><div class='add'>+			continue;</div><div class='add'>+		debug_scsi("flushing pending mgmt task itt 0x%x\n", mtask-&gt;itt);</div><div class='add'>+		__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;mtask,</div><div class='add'>+			    sizeof(void*));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* handle running */</div><div class='add'>+	list_for_each_entry_safe(mtask, tmp, &amp;conn-&gt;mgmt_run_list, running) {</div><div class='add'>+		debug_scsi("flushing running mgmt task itt 0x%x\n", mtask-&gt;itt);</div><div class='add'>+		list_del(&amp;mtask-&gt;running);</div><div class='add'>+</div><div class='add'>+		if (mtask == conn-&gt;login_mtask)</div><div class='add'>+			continue;</div><div class='add'>+		__kfifo_put(session-&gt;mgmtpool.queue, (void*)&amp;mtask,</div><div class='add'>+			   sizeof(void*));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;mtask = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fail commands. Mutex and session lock held and recv side suspended */</div><div class='add'>+static void fail_all_commands(struct iscsi_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cmd_task *ctask, *tmp;</div><div class='add'>+</div><div class='add'>+	/* flush pending */</div><div class='add'>+	while (__kfifo_get(conn-&gt;xmitqueue, (void*)&amp;ctask, sizeof(void*))) {</div><div class='add'>+		debug_scsi("failing pending sc %p itt 0x%x\n", ctask-&gt;sc,</div><div class='add'>+			   ctask-&gt;itt);</div><div class='add'>+		fail_command(conn, ctask, DID_BUS_BUSY &lt;&lt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fail all other running */</div><div class='add'>+	list_for_each_entry_safe(ctask, tmp, &amp;conn-&gt;run_list, running) {</div><div class='add'>+		debug_scsi("failing in progress sc %p itt 0x%x\n",</div><div class='add'>+			   ctask-&gt;sc, ctask-&gt;itt);</div><div class='add'>+		fail_command(conn, ctask, DID_BUS_BUSY &lt;&lt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;ctask = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void iscsi_start_session_recovery(struct iscsi_session *session,</div><div class='add'>+					 struct iscsi_conn *conn, int flag)</div><div class='add'>+{</div><div class='add'>+	int old_stop_stage;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	if (conn-&gt;stop_stage == STOP_CONN_TERM) {</div><div class='add'>+		spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When this is called for the in_login state, we only want to clean</div><div class='add'>+	 * up the login task and connection. We do not need to block and set</div><div class='add'>+	 * the recovery state again</div><div class='add'>+	 */</div><div class='add'>+	if (flag == STOP_CONN_TERM)</div><div class='add'>+		session-&gt;state = ISCSI_STATE_TERMINATE;</div><div class='add'>+	else if (conn-&gt;stop_stage != STOP_CONN_RECOVER)</div><div class='add'>+		session-&gt;state = ISCSI_STATE_IN_RECOVERY;</div><div class='add'>+</div><div class='add'>+	old_stop_stage = conn-&gt;stop_stage;</div><div class='add'>+	conn-&gt;stop_stage = flag;</div><div class='add'>+	conn-&gt;c_stage = ISCSI_CONN_STOPPED;</div><div class='add'>+	set_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;tt-&gt;suspend_conn_recv)</div><div class='add'>+		session-&gt;tt-&gt;suspend_conn_recv(conn);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+	/*</div><div class='add'>+	 * for connection level recovery we should not calculate</div><div class='add'>+	 * header digest. conn-&gt;hdr_size used for optimization</div><div class='add'>+	 * in hdr_extract() and will be re-negotiated at</div><div class='add'>+	 * set_param() time.</div><div class='add'>+	 */</div><div class='add'>+	if (flag == STOP_CONN_RECOVER) {</div><div class='add'>+		conn-&gt;hdrdgst_en = 0;</div><div class='add'>+		conn-&gt;datadgst_en = 0;</div><div class='add'>+		if (session-&gt;state == ISCSI_STATE_IN_RECOVERY &amp;&amp;</div><div class='add'>+		    old_stop_stage != STOP_CONN_RECOVER) {</div><div class='add'>+			debug_scsi("blocking session\n");</div><div class='add'>+			iscsi_block_session(session_to_cls(session));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	session-&gt;tt-&gt;terminate_conn(conn);</div><div class='add'>+	/*</div><div class='add'>+	 * flush queues.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	fail_all_commands(conn);</div><div class='add'>+	flush_control_queues(session, conn);</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;conn-&gt;xmitmutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+</div><div class='add'>+	switch (flag) {</div><div class='add'>+	case STOP_CONN_RECOVER:</div><div class='add'>+	case STOP_CONN_TERM:</div><div class='add'>+		iscsi_start_session_recovery(session, conn, flag);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		printk(KERN_ERR "iscsi: invalid stop flag %d\n", flag);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_stop);</div><div class='add'>+</div><div class='add'>+int iscsi_conn_bind(struct iscsi_cls_session *cls_session,</div><div class='add'>+		    struct iscsi_cls_conn *cls_conn, int is_leading)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_session *session = class_to_transport_session(cls_session);</div><div class='add'>+	struct iscsi_conn *tmp = ERR_PTR(-EEXIST), *conn = cls_conn-&gt;dd_data;</div><div class='add'>+</div><div class='add'>+	/* lookup for existing connection */</div><div class='add'>+	spin_lock_bh(&amp;session-&gt;lock);</div><div class='add'>+	list_for_each_entry(tmp, &amp;session-&gt;connections, item) {</div><div class='add'>+		if (tmp == conn) {</div><div class='add'>+			if (conn-&gt;c_stage != ISCSI_CONN_STOPPED ||</div><div class='add'>+			    conn-&gt;stop_stage == STOP_CONN_TERM) {</div><div class='add'>+				printk(KERN_ERR "iscsi: can't bind "</div><div class='add'>+				       "non-stopped connection (%d:%d)\n",</div><div class='add'>+				       conn-&gt;c_stage, conn-&gt;stop_stage);</div><div class='add'>+				spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (tmp != conn) {</div><div class='add'>+		/* bind new iSCSI connection to session */</div><div class='add'>+		conn-&gt;session = session;</div><div class='add'>+		list_add(&amp;conn-&gt;item, &amp;session-&gt;connections);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;session-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (is_leading)</div><div class='add'>+		session-&gt;leadconn = conn;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Unblock xmitworker(), Login Phase will pass through.</div><div class='add'>+	 */</div><div class='add'>+	clear_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_rx);</div><div class='add'>+	clear_bit(ISCSI_SUSPEND_BIT, &amp;conn-&gt;suspend_tx);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_bind);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int iscsi_set_param(struct iscsi_cls_conn *cls_conn,</div><div class='add'>+		    enum iscsi_param param, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	struct iscsi_session *session = conn-&gt;session;</div><div class='add'>+	uint32_t value;</div><div class='add'>+</div><div class='add'>+	switch(param) {</div><div class='add'>+	case ISCSI_PARAM_MAX_RECV_DLENGTH:</div><div class='add'>+		sscanf(buf, "%d", &amp;conn-&gt;max_recv_dlength);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_MAX_XMIT_DLENGTH:</div><div class='add'>+		sscanf(buf, "%d", &amp;conn-&gt;max_xmit_dlength);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_HDRDGST_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;conn-&gt;hdrdgst_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_DATADGST_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;conn-&gt;datadgst_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_INITIAL_R2T_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;initial_r2t_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_MAX_R2T:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;max_r2t);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_IMM_DATA_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;imm_data_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_FIRST_BURST:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;first_burst);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_MAX_BURST:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;max_burst);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_PDU_INORDER_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;pdu_inorder_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_DATASEQ_INORDER_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;dataseq_inorder_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_ERL:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;erl);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_IFMARKER_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		BUG_ON(value);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_OFMARKER_EN:</div><div class='add'>+		sscanf(buf, "%d", &amp;value);</div><div class='add'>+		BUG_ON(value);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_EXP_STATSN:</div><div class='add'>+		sscanf(buf, "%u", &amp;conn-&gt;exp_statsn);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_TARGET_NAME:</div><div class='add'>+		/* this should not change between logins */</div><div class='add'>+		if (session-&gt;targetname)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		session-&gt;targetname = kstrdup(buf, GFP_KERNEL);</div><div class='add'>+		if (!session-&gt;targetname)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_TPGT:</div><div class='add'>+		sscanf(buf, "%d", &amp;session-&gt;tpgt);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_PERSISTENT_PORT:</div><div class='add'>+		sscanf(buf, "%d", &amp;conn-&gt;persistent_port);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_PERSISTENT_ADDRESS:</div><div class='add'>+		/*</div><div class='add'>+		 * this is the address returned in discovery so it should</div><div class='add'>+		 * not change between logins.</div><div class='add'>+		 */</div><div class='add'>+		if (conn-&gt;persistent_address)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		conn-&gt;persistent_address = kstrdup(buf, GFP_KERNEL);</div><div class='add'>+		if (!conn-&gt;persistent_address)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_set_param);</div><div class='add'>+</div><div class='add'>+int iscsi_session_get_param(struct iscsi_cls_session *cls_session,</div><div class='add'>+			    enum iscsi_param param, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);</div><div class='add'>+	struct iscsi_session *session = iscsi_hostdata(shost-&gt;hostdata);</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	switch(param) {</div><div class='add'>+	case ISCSI_PARAM_INITIAL_R2T_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", session-&gt;initial_r2t_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_MAX_R2T:</div><div class='add'>+		len = sprintf(buf, "%hu\n", session-&gt;max_r2t);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_IMM_DATA_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", session-&gt;imm_data_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_FIRST_BURST:</div><div class='add'>+		len = sprintf(buf, "%u\n", session-&gt;first_burst);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_MAX_BURST:</div><div class='add'>+		len = sprintf(buf, "%u\n", session-&gt;max_burst);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_PDU_INORDER_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", session-&gt;pdu_inorder_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_DATASEQ_INORDER_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", session-&gt;dataseq_inorder_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_ERL:</div><div class='add'>+		len = sprintf(buf, "%d\n", session-&gt;erl);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_TARGET_NAME:</div><div class='add'>+		len = sprintf(buf, "%s\n", session-&gt;targetname);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_TPGT:</div><div class='add'>+		len = sprintf(buf, "%d\n", session-&gt;tpgt);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_session_get_param);</div><div class='add'>+</div><div class='add'>+int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,</div><div class='add'>+			 enum iscsi_param param, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_conn *conn = cls_conn-&gt;dd_data;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	switch(param) {</div><div class='add'>+	case ISCSI_PARAM_MAX_RECV_DLENGTH:</div><div class='add'>+		len = sprintf(buf, "%u\n", conn-&gt;max_recv_dlength);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_MAX_XMIT_DLENGTH:</div><div class='add'>+		len = sprintf(buf, "%u\n", conn-&gt;max_xmit_dlength);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_HDRDGST_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", conn-&gt;hdrdgst_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_DATADGST_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", conn-&gt;datadgst_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_IFMARKER_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", conn-&gt;ifmarker_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_OFMARKER_EN:</div><div class='add'>+		len = sprintf(buf, "%d\n", conn-&gt;ofmarker_en);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_EXP_STATSN:</div><div class='add'>+		len = sprintf(buf, "%u\n", conn-&gt;exp_statsn);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_PERSISTENT_PORT:</div><div class='add'>+		len = sprintf(buf, "%d\n", conn-&gt;persistent_port);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_PARAM_PERSISTENT_ADDRESS:</div><div class='add'>+		len = sprintf(buf, "%s\n", conn-&gt;persistent_address);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_conn_get_param);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mike Christie");</div><div class='add'>+MODULE_DESCRIPTION("iSCSI library functions");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h<br/>index 087c44539a16..f81691fcf177 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/lpfc/lpfc.h</a></div><div class='hunk'>@@ -174,7 +174,6 @@ struct lpfc_hba {</div><div class='ctx'> 	dma_addr_t slim2p_mapping;</div><div class='ctx'> 	uint16_t pci_cfg_value;</div><div class='ctx'> </div><div class='del'>-	struct semaphore hba_can_block;</div><div class='ctx'> 	int32_t hba_state;</div><div class='ctx'> </div><div class='ctx'> #define LPFC_STATE_UNKNOWN        0    /* HBA state is unknown */</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c<br/>index 283b7d824c34..4126fd87956f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc_els.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_els.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/lpfc/lpfc_els.c</a></div><div class='hunk'>@@ -821,7 +821,7 @@ lpfc_issue_els_plogi(struct lpfc_hba * phba, uint32_t did, uint8_t retry)</div><div class='ctx'> 	pring = &amp;psli-&gt;ring[LPFC_ELS_RING];	/* ELS ring */</div><div class='ctx'> </div><div class='ctx'> 	cmdsize = (sizeof (uint32_t) + sizeof (struct serv_parm));</div><div class='del'>-	elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry, 0, did,</div><div class='add'>+	elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry, NULL, did,</div><div class='ctx'> 								ELS_CMD_PLOGI);</div><div class='ctx'> 	if (!elsiocb)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -2791,8 +2791,8 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)</div><div class='ctx'> </div><div class='ctx'> 	ndlp = (struct lpfc_nodelist *) pmb-&gt;context2;</div><div class='ctx'> 	xri = (uint16_t) ((unsigned long)(pmb-&gt;context1));</div><div class='del'>-	pmb-&gt;context1 = 0;</div><div class='del'>-	pmb-&gt;context2 = 0;</div><div class='add'>+	pmb-&gt;context1 = NULL;</div><div class='add'>+	pmb-&gt;context2 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (mb-&gt;mbxStatus) {</div><div class='ctx'> 		mempool_free( pmb, phba-&gt;mbox_mem_pool);</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c<br/>index 908d0f27706f..81755a3f7c68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/lpfc/lpfc_init.c</a></div><div class='hunk'>@@ -939,12 +939,12 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)</div><div class='ctx'> 					"10-port ", "PCIe"};</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			m = (typeof(m)){ 0 };</div><div class='add'>+			m = (typeof(m)){ NULL };</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		m = (typeof(m)){ 0 };</div><div class='add'>+		m = (typeof(m)){ NULL };</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1451,7 +1451,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 		goto out_put_host;</div><div class='ctx'> </div><div class='ctx'> 	host-&gt;unique_id = phba-&gt;brd_no;</div><div class='del'>-	init_MUTEX(&amp;phba-&gt;hba_can_block);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;ctrspbuflist);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;rnidrspbuflist);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;phba-&gt;freebufList);</div><div class='hunk'>@@ -1620,7 +1619,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_remove_host;</div><div class='ctx'> </div><div class='del'>-	error =	request_irq(phba-&gt;pcidev-&gt;irq, lpfc_intr_handler, SA_SHIRQ,</div><div class='add'>+	error =	request_irq(phba-&gt;pcidev-&gt;irq, lpfc_intr_handler, IRQF_SHARED,</div><div class='ctx'> 							LPFC_DRIVER_NAME, phba);</div><div class='ctx'> 	if (error) {</div><div class='ctx'> 		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,</div><div class='head'>diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c<br/>index 7dc4c2e6bed2..aea1ee472f3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/lpfc/lpfc_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/lpfc/lpfc_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/lpfc/lpfc_scsi.c</a></div><div class='hunk'>@@ -41,20 +41,6 @@</div><div class='ctx'> #define LPFC_ABORT_WAIT  2</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-lpfc_block_requests(struct lpfc_hba * phba)</div><div class='del'>-{</div><div class='del'>-	down(&amp;phba-&gt;hba_can_block);</div><div class='del'>-	scsi_block_requests(phba-&gt;host);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-lpfc_unblock_requests(struct lpfc_hba * phba)</div><div class='del'>-{</div><div class='del'>-	scsi_unblock_requests(phba-&gt;host);</div><div class='del'>-	up(&amp;phba-&gt;hba_can_block);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This routine allocates a scsi buffer, which contains all the necessary</div><div class='ctx'>  * information needed to initiate a SCSI I/O.  The non-DMAable buffer region</div><div class='hunk'>@@ -859,7 +845,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	unsigned int loop_count = 0;</div><div class='ctx'> 	int ret = SUCCESS;</div><div class='ctx'> </div><div class='del'>-	lpfc_block_requests(phba);</div><div class='ctx'> 	spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_cmd = (struct lpfc_scsi_buf *)cmnd-&gt;host_scribble;</div><div class='hunk'>@@ -945,7 +930,6 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 			cmnd-&gt;device-&gt;lun, cmnd-&gt;serial_number);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-	lpfc_unblock_requests(phba);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -963,7 +947,6 @@ lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	int ret = FAILED;</div><div class='ctx'> 	int cnt, loopcnt;</div><div class='ctx'> </div><div class='del'>-	lpfc_block_requests(phba);</div><div class='ctx'> 	spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If target is not in a MAPPED state, delay the reset until</div><div class='hunk'>@@ -1065,7 +1048,6 @@ out_free_scsi_buf:</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-	lpfc_unblock_requests(phba);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1080,7 +1062,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 	int cnt, loopcnt;</div><div class='ctx'> 	struct lpfc_scsi_buf * lpfc_cmd;</div><div class='ctx'> </div><div class='del'>-	lpfc_block_requests(phba);</div><div class='ctx'> 	spin_lock_irq(shost-&gt;host_lock);</div><div class='ctx'> </div><div class='ctx'> 	lpfc_cmd = lpfc_get_scsi_buf(phba);</div><div class='hunk'>@@ -1163,7 +1144,6 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)</div><div class='ctx'> 			phba-&gt;brd_no, ret);</div><div class='ctx'> out:</div><div class='ctx'> 	spin_unlock_irq(shost-&gt;host_lock);</div><div class='del'>-	lpfc_unblock_requests(phba);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c<br/>index e31fadd61904..118206d68c6c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mac_esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/mac_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mac_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/mac_esp.c</a></div><div class='hunk'>@@ -43,9 +43,6 @@</div><div class='ctx'> </div><div class='ctx'> /* #define DEBUG_MAC_ESP */</div><div class='ctx'> </div><div class='del'>-#define mac_turnon_irq(x)	mac_enable_irq(x)</div><div class='del'>-#define mac_turnoff_irq(x)	mac_disable_irq(x)</div><div class='del'>-</div><div class='ctx'> extern void esp_handle(struct NCR_ESP *esp);</div><div class='ctx'> extern void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs);</div><div class='ctx'> </div><div class='hunk'>@@ -639,13 +636,13 @@ static void dma_init_write(struct NCR_ESP * esp, char * vaddress, int length)</div><div class='ctx'> </div><div class='ctx'> static void dma_ints_off(struct NCR_ESP * esp)</div><div class='ctx'> {</div><div class='del'>-	mac_turnoff_irq(esp-&gt;irq);</div><div class='add'>+	disable_irq(esp-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void dma_ints_on(struct NCR_ESP * esp)</div><div class='ctx'> {</div><div class='del'>-	mac_turnon_irq(esp-&gt;irq);</div><div class='add'>+	enable_irq(esp-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c<br/>index 777f9bcd1179..a942a21dd87e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mac_scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/mac_scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mac_scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/mac_scsi.c</a></div><div class='hunk'>@@ -65,9 +65,6 @@</div><div class='ctx'> #define RESET_BOOT</div><div class='ctx'> #define DRIVER_SETUP</div><div class='ctx'> </div><div class='del'>-#define	ENABLE_IRQ()	mac_enable_irq( IRQ_MAC_SCSI ); </div><div class='del'>-#define	DISABLE_IRQ()	mac_disable_irq( IRQ_MAC_SCSI );</div><div class='del'>-</div><div class='ctx'> extern void via_scsi_clear(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef RESET_BOOT</div><div class='hunk'>@@ -351,7 +348,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)</div><div class='ctx'> 	printk(KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." );</div><div class='ctx'> </div><div class='ctx'> 	/* switch off SCSI IRQ - catch an interrupt without IRQ bit set else */</div><div class='del'>-	mac_disable_irq(IRQ_MAC_SCSI);</div><div class='add'>+	disable_irq(IRQ_MAC_SCSI);</div><div class='ctx'> </div><div class='ctx'> 	/* get in phase */</div><div class='ctx'> 	NCR5380_write( TARGET_COMMAND_REG,</div><div class='hunk'>@@ -369,7 +366,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)</div><div class='ctx'> 		barrier();</div><div class='ctx'> </div><div class='ctx'> 	/* switch on SCSI IRQ again */</div><div class='del'>-	mac_enable_irq(IRQ_MAC_SCSI);</div><div class='add'>+	enable_irq(IRQ_MAC_SCSI);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO " done\n" );</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c<br/>index de35ffe2f79d..76edbb639d37 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/megaraid.c</a></div><div class='hunk'>@@ -524,7 +524,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)</div><div class='ctx'> 	 * filter the internal and ioctl commands</div><div class='ctx'> 	 */</div><div class='ctx'> 	if((cmd-&gt;cmnd[0] == MEGA_INTERNAL_CMD)) {</div><div class='del'>-		return cmd-&gt;buffer;</div><div class='add'>+		return cmd-&gt;request_buffer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1828,7 +1828,7 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)</div><div class='ctx'> </div><div class='ctx'> 	scb-&gt;dma_type = MEGA_SGLIST;</div><div class='ctx'> </div><div class='del'>-	if( sgcnt &gt; adapter-&gt;sglen ) BUG();</div><div class='add'>+	BUG_ON(sgcnt &gt; adapter-&gt;sglen);</div><div class='ctx'> </div><div class='ctx'> 	*len = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -4492,7 +4492,7 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)</div><div class='ctx'> 	scmd-&gt;device = sdev;</div><div class='ctx'> </div><div class='ctx'> 	scmd-&gt;device-&gt;host = adapter-&gt;host;</div><div class='del'>-	scmd-&gt;buffer = (void *)scb;</div><div class='add'>+	scmd-&gt;request_buffer = (void *)scb;</div><div class='ctx'> 	scmd-&gt;cmnd[0] = MEGA_INTERNAL_CMD;</div><div class='ctx'> </div><div class='ctx'> 	scb-&gt;state |= SCB_ACTIVE;</div><div class='hunk'>@@ -4714,7 +4714,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(irq, (adapter-&gt;flag &amp; BOARD_MEMMAP) ?</div><div class='ctx'> 				megaraid_isr_memmapped : megaraid_isr_iomapped,</div><div class='del'>-					SA_SHIRQ, "megaraid", adapter)) {</div><div class='add'>+					IRQF_SHARED, "megaraid", adapter)) {</div><div class='ctx'> 		printk(KERN_WARNING</div><div class='ctx'> 			"megaraid: Couldn't register IRQ %d!\n", irq);</div><div class='ctx'> 		goto out_free_scb_list;</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c<br/>index bec1424eda85..92715130ac09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_mbox.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid/megaraid_mbox.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_mbox.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/megaraid/megaraid_mbox.c</a></div><div class='hunk'>@@ -714,7 +714,7 @@ megaraid_io_detach(adapter_t *adapter)</div><div class='ctx'>  * . Allocate memory required for all the commands</div><div class='ctx'>  * . Use internal library of FW routines, build up complete soft state</div><div class='ctx'>  */</div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> megaraid_init_mbox(adapter_t *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev		*pdev;</div><div class='hunk'>@@ -767,7 +767,7 @@ megaraid_init_mbox(adapter_t *adapter)</div><div class='ctx'> 	//</div><div class='ctx'> </div><div class='ctx'> 	// request IRQ and register the interrupt service routine</div><div class='del'>-	if (request_irq(adapter-&gt;irq, megaraid_isr, SA_SHIRQ, "megaraid",</div><div class='add'>+	if (request_irq(adapter-&gt;irq, megaraid_isr, IRQF_SHARED, "megaraid",</div><div class='ctx'> 		adapter)) {</div><div class='ctx'> </div><div class='ctx'> 		con_log(CL_ANN, (KERN_WARNING</div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c<br/>index 39729460b00e..a8c9627a15c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid/megaraid_sas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/megaraid/megaraid_sas.c</a></div><div class='hunk'>@@ -10,7 +10,7 @@</div><div class='ctx'>  *	   2 of the License, or (at your option) any later version.</div><div class='ctx'>  *</div><div class='ctx'>  * FILE		: megaraid_sas.c</div><div class='del'>- * Version	: v00.00.02.04</div><div class='add'>+ * Version	: v00.00.03.01</div><div class='ctx'>  *</div><div class='ctx'>  * Authors:</div><div class='ctx'>  * 	Sreenivas Bagalkote	&lt;Sreenivas.Bagalkote@lsil.com&gt;</div><div class='hunk'>@@ -55,19 +55,25 @@ static struct pci_device_id megasas_pci_table[] = {</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='ctx'> 	 PCI_VENDOR_ID_LSI_LOGIC,</div><div class='del'>-	 PCI_DEVICE_ID_LSI_SAS1064R, // xscale IOP</div><div class='add'>+	 PCI_DEVICE_ID_LSI_SAS1064R, /* xscale IOP */</div><div class='ctx'> 	 PCI_ANY_ID,</div><div class='ctx'> 	 PCI_ANY_ID,</div><div class='ctx'> 	 },</div><div class='ctx'> 	{</div><div class='ctx'> 	 PCI_VENDOR_ID_LSI_LOGIC,</div><div class='del'>-	 PCI_DEVICE_ID_LSI_SAS1078R, // ppc IOP</div><div class='add'>+	 PCI_DEVICE_ID_LSI_SAS1078R, /* ppc IOP */</div><div class='ctx'> 	 PCI_ANY_ID,</div><div class='ctx'> 	 PCI_ANY_ID,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='add'>+	 PCI_VENDOR_ID_LSI_LOGIC,</div><div class='add'>+	 PCI_DEVICE_ID_LSI_VERDE_ZCR,	/* xscale IOP, vega */</div><div class='add'>+	 PCI_ANY_ID,</div><div class='add'>+	 PCI_ANY_ID,</div><div class='add'>+	 },</div><div class='add'>+	{</div><div class='ctx'> 	 PCI_VENDOR_ID_DELL,</div><div class='del'>-	 PCI_DEVICE_ID_DELL_PERC5, // xscale IOP</div><div class='add'>+	 PCI_DEVICE_ID_DELL_PERC5, /* xscale IOP */</div><div class='ctx'> 	 PCI_ANY_ID,</div><div class='ctx'> 	 PCI_ANY_ID,</div><div class='ctx'> 	 },</div><div class='hunk'>@@ -289,9 +295,14 @@ static struct megasas_instance_template megasas_instance_template_ppc = {</div><div class='ctx'>  * @regs:			MFI register set</div><div class='ctx'>  */</div><div class='ctx'> static inline void</div><div class='del'>-megasas_disable_intr(struct megasas_register_set __iomem * regs)</div><div class='add'>+megasas_disable_intr(struct megasas_instance *instance)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask = 0x1f; </div><div class='add'>+	struct megasas_register_set __iomem *regs = instance-&gt;reg_set;</div><div class='add'>+</div><div class='add'>+	if(instance-&gt;pdev-&gt;device == PCI_DEVICE_ID_LSI_SAS1078R)</div><div class='add'>+		mask = 0xffffffff;</div><div class='add'>+</div><div class='ctx'> 	writel(mask, &amp;regs-&gt;outbound_intr_mask);</div><div class='ctx'> </div><div class='ctx'> 	/* Dummy readl to force pci flush */</div><div class='hunk'>@@ -741,7 +752,6 @@ static int</div><div class='ctx'> megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> {</div><div class='ctx'> 	u32 frame_count;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct megasas_cmd *cmd;</div><div class='ctx'> 	struct megasas_instance *instance;</div><div class='ctx'> </div><div class='hunk'>@@ -776,9 +786,7 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Issue the command to the FW</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;instance-&gt;instance_lock, flags);</div><div class='del'>-	instance-&gt;fw_outstanding++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;instance-&gt;instance_lock, flags);</div><div class='add'>+	atomic_inc(&amp;instance-&gt;fw_outstanding);</div><div class='ctx'> </div><div class='ctx'> 	instance-&gt;instancet-&gt;fire_cmd(cmd-&gt;frame_phys_addr ,cmd-&gt;frame_count-1,instance-&gt;reg_set);</div><div class='ctx'> </div><div class='hunk'>@@ -826,19 +834,20 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; wait_time; i++) {</div><div class='ctx'> </div><div class='del'>-		if (!instance-&gt;fw_outstanding)</div><div class='add'>+		int outstanding = atomic_read(&amp;instance-&gt;fw_outstanding);</div><div class='add'>+</div><div class='add'>+		if (!outstanding)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (!(i % MEGASAS_RESET_NOTICE_INTERVAL)) {</div><div class='ctx'> 			printk(KERN_NOTICE "megasas: [%2d]waiting for %d "</div><div class='del'>-			       "commands to complete\n", i,</div><div class='del'>-			       instance-&gt;fw_outstanding);</div><div class='add'>+			       "commands to complete\n",i,outstanding);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		msleep(1000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (instance-&gt;fw_outstanding) {</div><div class='add'>+	if (atomic_read(&amp;instance-&gt;fw_outstanding)) {</div><div class='ctx'> 		instance-&gt;hw_crit_error = 1;</div><div class='ctx'> 		return FAILED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1050,7 +1059,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,</div><div class='ctx'> {</div><div class='ctx'> 	int exception = 0;</div><div class='ctx'> 	struct megasas_header *hdr = &amp;cmd-&gt;frame-&gt;hdr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;scmd) {</div><div class='ctx'> 		cmd-&gt;scmd-&gt;SCp.ptr = (char *)0;</div><div class='hunk'>@@ -1082,9 +1090,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,</div><div class='ctx'> </div><div class='ctx'> 		if (exception) {</div><div class='ctx'> </div><div class='del'>-			spin_lock_irqsave(&amp;instance-&gt;instance_lock, flags);</div><div class='del'>-			instance-&gt;fw_outstanding--;</div><div class='del'>-			spin_unlock_irqrestore(&amp;instance-&gt;instance_lock, flags);</div><div class='add'>+			atomic_dec(&amp;instance-&gt;fw_outstanding);</div><div class='ctx'> </div><div class='ctx'> 			megasas_unmap_sgbuf(instance, cmd);</div><div class='ctx'> 			cmd-&gt;scmd-&gt;scsi_done(cmd-&gt;scmd);</div><div class='hunk'>@@ -1132,9 +1138,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;instance-&gt;instance_lock, flags);</div><div class='del'>-		instance-&gt;fw_outstanding--;</div><div class='del'>-		spin_unlock_irqrestore(&amp;instance-&gt;instance_lock, flags);</div><div class='add'>+		atomic_dec(&amp;instance-&gt;fw_outstanding);</div><div class='ctx'> </div><div class='ctx'> 		megasas_unmap_sgbuf(instance, cmd);</div><div class='ctx'> 		cmd-&gt;scmd-&gt;scsi_done(cmd-&gt;scmd);</div><div class='hunk'>@@ -1267,7 +1271,7 @@ megasas_transition_to_ready(struct megasas_instance* instance)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Bring it to READY state; assuming max wait 2 secs</div><div class='ctx'> 			 */</div><div class='del'>-			megasas_disable_intr(instance-&gt;reg_set);</div><div class='add'>+			megasas_disable_intr(instance);</div><div class='ctx'> 			writel(MFI_INIT_READY, &amp;instance-&gt;reg_set-&gt;inbound_doorbell);</div><div class='ctx'> </div><div class='ctx'> 			max_wait = 10;</div><div class='hunk'>@@ -1764,6 +1768,11 @@ static int megasas_init_mfi(struct megasas_instance *instance)</div><div class='ctx'> 	init_frame-&gt;data_xfer_len = sizeof(struct megasas_init_queue_info);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='add'>+	 * disable the intr before firing the init frame to FW</div><div class='add'>+	 */</div><div class='add'>+	megasas_disable_intr(instance);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='ctx'> 	 * Issue the init frame in polled mode</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (megasas_issue_polled(instance, cmd)) {</div><div class='hunk'>@@ -2171,11 +2180,12 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;instance-&gt;cmd_pool);</div><div class='ctx'> </div><div class='add'>+	atomic_set(&amp;instance-&gt;fw_outstanding,0);</div><div class='add'>+</div><div class='ctx'> 	init_waitqueue_head(&amp;instance-&gt;int_cmd_wait_q);</div><div class='ctx'> 	init_waitqueue_head(&amp;instance-&gt;abort_cmd_wait_q);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;instance-&gt;cmd_pool_lock);</div><div class='del'>-	spin_lock_init(&amp;instance-&gt;instance_lock);</div><div class='ctx'> </div><div class='ctx'> 	sema_init(&amp;instance-&gt;aen_mutex, 1);</div><div class='ctx'> 	sema_init(&amp;instance-&gt;ioctl_sem, MEGASAS_INT_CMDS);</div><div class='hunk'>@@ -2197,7 +2207,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register IRQ</div><div class='ctx'> 	 */</div><div class='del'>-	if (request_irq(pdev-&gt;irq, megasas_isr, SA_SHIRQ, "megasas", instance)) {</div><div class='add'>+	if (request_irq(pdev-&gt;irq, megasas_isr, IRQF_SHARED, "megasas", instance)) {</div><div class='ctx'> 		printk(KERN_DEBUG "megasas: Failed to register IRQ\n");</div><div class='ctx'> 		goto fail_irq;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2240,7 +2250,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	megasas_mgmt_info.max_index--;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='del'>-	megasas_disable_intr(instance-&gt;reg_set);</div><div class='add'>+	megasas_disable_intr(instance);</div><div class='ctx'> 	free_irq(instance-&gt;pdev-&gt;irq, instance);</div><div class='ctx'> </div><div class='ctx'> 	megasas_release_mfi(instance);</div><div class='hunk'>@@ -2370,7 +2380,7 @@ static void megasas_detach_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(instance-&gt;pdev, NULL);</div><div class='ctx'> </div><div class='del'>-	megasas_disable_intr(instance-&gt;reg_set);</div><div class='add'>+	megasas_disable_intr(instance);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(instance-&gt;pdev-&gt;irq, instance);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h<br/>index 89639f0c38ef..3531a14222a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/megaraid/megaraid_sas.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/megaraid/megaraid_sas.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/megaraid/megaraid_sas.h</a></div><div class='hunk'>@@ -18,9 +18,16 @@</div><div class='ctx'> /**</div><div class='ctx'>  * MegaRAID SAS Driver meta data</div><div class='ctx'>  */</div><div class='del'>-#define MEGASAS_VERSION				"00.00.02.04"</div><div class='del'>-#define MEGASAS_RELDATE				"Feb 03, 2006"</div><div class='del'>-#define MEGASAS_EXT_VERSION			"Fri Feb 03 14:31:44 PST 2006"</div><div class='add'>+#define MEGASAS_VERSION				"00.00.03.01"</div><div class='add'>+#define MEGASAS_RELDATE				"May 14, 2006"</div><div class='add'>+#define MEGASAS_EXT_VERSION			"Sun May 14 22:49:52 PDT 2006"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device IDs</div><div class='add'>+ */</div><div class='add'>+#define	PCI_DEVICE_ID_LSI_SAS1078R		0x0060</div><div class='add'>+#define	PCI_DEVICE_ID_LSI_VERDE_ZCR		0x0413</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * =====================================</div><div class='ctx'>  * MegaRAID SAS MFI firmware definitions</div><div class='hunk'>@@ -554,7 +561,11 @@ struct megasas_ctrl_info {</div><div class='ctx'> #define MFI_POLL_TIMEOUT_SECS			10</div><div class='ctx'> </div><div class='ctx'> #define MFI_REPLY_1078_MESSAGE_INTERRUPT	0x80000000</div><div class='del'>-#define PCI_DEVICE_ID_LSI_SAS1078R		0x00000060</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+* register set for both 1068 and 1078 controllers</div><div class='add'>+* structure extended for 1078 registers</div><div class='add'>+*/</div><div class='ctx'>  </div><div class='ctx'> struct megasas_register_set {</div><div class='ctx'> 	u32 	reserved_0[4];			/*0000h*/</div><div class='hunk'>@@ -1077,9 +1088,8 @@ struct megasas_instance {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	u32 unique_id;</div><div class='ctx'> </div><div class='del'>-	u32 fw_outstanding;</div><div class='add'>+	atomic_t fw_outstanding;</div><div class='ctx'> 	u32 hw_crit_error;</div><div class='del'>-	spinlock_t instance_lock;</div><div class='ctx'> </div><div class='ctx'> 	struct megasas_instance_template *instancet;</div><div class='ctx'> };</div><div class='hunk'>@@ -1151,10 +1161,10 @@ struct compat_megasas_iocpacket {</div><div class='ctx'> 	struct compat_iovec sgl[MAX_IOCTL_SGE];</div><div class='ctx'> } __attribute__ ((packed));</div><div class='ctx'> </div><div class='add'>+#define MEGASAS_IOC_FIRMWARE32	_IOWR('M', 1, struct compat_megasas_iocpacket)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define MEGASAS_IOC_FIRMWARE	_IOWR('M', 1, struct megasas_iocpacket)</div><div class='del'>-#define MEGASAS_IOC_FIRMWARE32	_IOWR('M', 1, struct compat_megasas_iocpacket)</div><div class='ctx'> #define MEGASAS_IOC_GET_AEN	_IOW('M', 3, struct megasas_aen)</div><div class='ctx'> </div><div class='ctx'> struct megasas_mgmt_info {</div><div class='head'>diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c<br/>index f852421002ef..c88717727be8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/mesh.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/mesh.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/mesh.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/mesh.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * - retry arbitration if lost (unless higher levels do this for us)</div><div class='ctx'>  * - power down the chip when no device is detected</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c<br/>index 22f913127f08..b28712df0b77 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ncr53c8xx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ncr53c8xx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ncr53c8xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ncr53c8xx.c</a></div><div class='hunk'>@@ -529,7 +529,7 @@ static void __unmap_scsi_data(struct device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	switch(cmd-&gt;__data_mapped) {</div><div class='ctx'> 	case 2:</div><div class='del'>-		dma_unmap_sg(dev, cmd-&gt;buffer, cmd-&gt;use_sg,</div><div class='add'>+		dma_unmap_sg(dev, cmd-&gt;request_buffer, cmd-&gt;use_sg,</div><div class='ctx'> 				cmd-&gt;sc_data_direction);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='hunk'>@@ -564,7 +564,7 @@ static int __map_scsi_sg_data(struct device *dev, struct scsi_cmnd *cmd)</div><div class='ctx'> 	if (cmd-&gt;use_sg == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	use_sg = dma_map_sg(dev, cmd-&gt;buffer, cmd-&gt;use_sg,</div><div class='add'>+	use_sg = dma_map_sg(dev, cmd-&gt;request_buffer, cmd-&gt;use_sg,</div><div class='ctx'> 			cmd-&gt;sc_data_direction);</div><div class='ctx'> 	cmd-&gt;__data_mapped = 2;</div><div class='ctx'> 	cmd-&gt;__data_mapping = use_sg;</div><div class='hunk'>@@ -5118,8 +5118,7 @@ static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp)</div><div class='ctx'> 		cp-&gt;host_status &amp;= ~HS_SKIPMASK;</div><div class='ctx'> 		cp-&gt;start.schedule.l_paddr = </div><div class='ctx'> 			cpu_to_scr(NCB_SCRIPT_PHYS (np, select));</div><div class='del'>-		list_del(&amp;cp-&gt;link_ccbq);</div><div class='del'>-		list_add_tail(&amp;cp-&gt;link_ccbq, &amp;lp-&gt;skip_ccbq);</div><div class='add'>+		list_move_tail(&amp;cp-&gt;link_ccbq, &amp;lp-&gt;skip_ccbq);</div><div class='ctx'> 		if (cp-&gt;queued) {</div><div class='ctx'> 			--lp-&gt;queuedccbs;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -7697,7 +7696,7 @@ static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)</div><div class='ctx'> 	if (!use_sg)</div><div class='ctx'> 		segment = ncr_scatter_no_sglist(np, cp, cmd);</div><div class='ctx'> 	else if ((use_sg = map_scsi_sg_data(np, cmd)) &gt; 0) {</div><div class='del'>-		struct scatterlist *scatter = (struct scatterlist *)cmd-&gt;buffer;</div><div class='add'>+		struct scatterlist *scatter = (struct scatterlist *)cmd-&gt;request_buffer;</div><div class='ctx'> 		struct scr_tblmove *data;</div><div class='ctx'> </div><div class='ctx'> 		if (use_sg &gt; MAX_SCATTER) {</div><div class='head'>diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h<br/>index 0e4e46a01336..78818b6684f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ncr53c8xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ncr53c8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ncr53c8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ncr53c8xx.h</a></div><div class='hunk'>@@ -53,10 +53,8 @@</div><div class='ctx'> #ifndef NCR53C8XX_H</div><div class='ctx'> #define NCR53C8XX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> **	If you want a driver as small as possible, donnot define the </div><div class='head'>diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c<br/>index 30ee0ef4b459..bfb4f49e125d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/nsp32.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/nsp32.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/nsp32.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/nsp32.c</a></div><div class='hunk'>@@ -1636,7 +1636,7 @@ static void nsp32_scsi_done(struct scsi_cmnd *SCpnt)</div><div class='ctx'> </div><div class='ctx'> 	if (SCpnt-&gt;use_sg) {</div><div class='ctx'> 		pci_unmap_sg(data-&gt;Pci,</div><div class='del'>-			     (struct scatterlist *)SCpnt-&gt;buffer,</div><div class='add'>+			     (struct scatterlist *)SCpnt-&gt;request_buffer,</div><div class='ctx'> 			     SCpnt-&gt;use_sg, SCpnt-&gt;sc_data_direction);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pci_unmap_single(data-&gt;Pci,</div><div class='hunk'>@@ -2866,8 +2866,7 @@ static int nsp32_detect(struct scsi_host_template *sht)</div><div class='ctx'> 	 */</div><div class='ctx'> 	nsp32_do_bus_reset(data);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(host-&gt;irq, do_nsp32_isr,</div><div class='del'>-			  SA_SHIRQ | SA_SAMPLE_RANDOM, "nsp32", data);</div><div class='add'>+	ret = request_irq(host-&gt;irq, do_nsp32_isr, IRQF_SHARED, "nsp32", data);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "</div><div class='ctx'> 			  "SCSI PCI controller. Interrupt: %d", host-&gt;irq);</div><div class='hunk'>@@ -2886,12 +2885,19 @@ static int nsp32_detect(struct scsi_host_template *sht)</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'> #if (LINUX_VERSION_CODE &gt; KERNEL_VERSION(2,5,73))</div><div class='del'>-	scsi_add_host (host, &amp;PCIDEV-&gt;dev);</div><div class='add'>+	ret = scsi_add_host(host, &amp;PCIDEV-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		nsp32_msg(KERN_ERR, "failed to add scsi host");</div><div class='add'>+		goto free_region;</div><div class='add'>+	}</div><div class='ctx'> 	scsi_scan_host(host);</div><div class='ctx'> #endif</div><div class='ctx'> 	pci_set_drvdata(PCIDEV, host);</div><div class='ctx'> 	return DETECT_OK;</div><div class='ctx'> </div><div class='add'>+ free_region:</div><div class='add'>+	release_region(host-&gt;io_port, host-&gt;n_io_port);</div><div class='add'>+</div><div class='ctx'>  free_irq:</div><div class='ctx'> 	free_irq(host-&gt;irq, data);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c<br/>index dee426f8c07b..dd67a68c5c23 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/oktagon_esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/oktagon_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/oktagon_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/oktagon_esp.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Based on cyber_esp.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_AMIGA) || defined(CONFIG_APUS)</div><div class='ctx'> #define USE_BOTTOM_HALF</div><div class='hunk'>@@ -198,7 +197,7 @@ int oktagon_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 		esp-&gt;esp_command_dvma = (__u32) cmd_buffer;</div><div class='ctx'> </div><div class='ctx'> 		esp-&gt;irq = IRQ_AMIGA_PORTS;</div><div class='del'>-		request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,</div><div class='add'>+		request_irq(IRQ_AMIGA_PORTS, esp_intr, IRQF_SHARED,</div><div class='ctx'> 			    "BSC Oktagon SCSI", esp-&gt;ehost);</div><div class='ctx'> </div><div class='ctx'> 		/* Figure out our scsi ID on the bus */</div><div class='head'>diff --git a/drivers/scsi/oktagon_io.S b/drivers/scsi/oktagon_io.S<br/>index 08ce8d80d8f5..8a7340b02707 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/oktagon_io.S?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/oktagon_io.S</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/oktagon_io.S?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/oktagon_io.S</a></div><div class='hunk'>@@ -23,7 +23,6 @@ int oktag_from_io(long *addr,long *paddr,long len)</div><div class='ctx'>  * is moved to/from the IO register.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_APUS</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c<br/>index e3bd4bc339f4..4a2fed350d4e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/osst.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/osst.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/osst.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/osst.c</a></div><div class='hunk'>@@ -4724,7 +4724,7 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Flush the tape buffer before close */</div><div class='del'>-static int os_scsi_tape_flush(struct file * filp)</div><div class='add'>+static int os_scsi_tape_flush(struct file * filp, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	int		      result = 0, result2;</div><div class='ctx'> 	struct osst_tape    * STp    = filp-&gt;private_data;</div><div class='hunk'>@@ -5492,7 +5492,7 @@ static int __init osst_setup (char *str)</div><div class='ctx'>   char *stp;</div><div class='ctx'> </div><div class='ctx'>   stp = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'>   if (ints[0] &gt; 0) {</div><div class='ctx'> 	for (i = 0; i &lt; ints[0] &amp;&amp; i &lt; ARRAY_SIZE(parms); i++)</div><div class='ctx'> 		  *parms[i].val = ints[i + 1];</div><div class='hunk'>@@ -5507,7 +5507,7 @@ static int __init osst_setup (char *str)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (i &gt;= sizeof(parms) / sizeof(struct osst_dev_parm))</div><div class='add'>+		if (i &gt;= ARRAY_SIZE(parms))</div><div class='ctx'> 			printk(KERN_INFO "osst :I: Illegal parameter in '%s'\n",</div><div class='ctx'> 			       stp);</div><div class='ctx'> 		stp = strchr(stp, ',');</div><div class='head'>diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h<br/>index 011d4d6ca9f9..1e426f5d0ed8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/osst.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/osst.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/osst.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/osst.h</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*	FIXME - rename and use the following two types or delete them!</div><div class='head'>diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c<br/>index f09e94af9ade..1434209a8ac5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pas16.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pas16.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pas16.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/pas16.c</a></div><div class='hunk'>@@ -156,7 +156,7 @@ static int default_irqs[] __initdata =</div><div class='ctx'> static struct override {</div><div class='ctx'>     unsigned short io_port;</div><div class='ctx'>     int  irq;</div><div class='del'>-} overrides </div><div class='add'>+} overrides</div><div class='ctx'> #ifdef PAS16_OVERRIDE</div><div class='ctx'>     [] __initdata = PAS16_OVERRIDE;</div><div class='ctx'> #else</div><div class='hunk'>@@ -164,19 +164,19 @@ static struct override {</div><div class='ctx'> 	{0,IRQ_AUTO}};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))</div><div class='add'>+#define NO_OVERRIDES ARRAY_SIZE(overrides)</div><div class='ctx'> </div><div class='ctx'> static struct base {</div><div class='ctx'>     unsigned short io_port;</div><div class='ctx'>     int noauto;</div><div class='del'>-} bases[] __initdata = </div><div class='add'>+} bases[] __initdata =</div><div class='ctx'> 	{ {PAS16_DEFAULT_BASE_1, 0},</div><div class='ctx'> 	  {PAS16_DEFAULT_BASE_2, 0},</div><div class='ctx'> 	  {PAS16_DEFAULT_BASE_3, 0},</div><div class='ctx'> 	  {PAS16_DEFAULT_BASE_4, 0}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-#define NO_BASES (sizeof (bases) / sizeof (struct base))</div><div class='add'>+#define NO_BASES ARRAY_SIZE(bases)</div><div class='ctx'> </div><div class='ctx'> static const unsigned short  pas16_offset[ 8 ] =</div><div class='ctx'>     {</div><div class='hunk'>@@ -454,7 +454,7 @@ int __init pas16_detect(struct scsi_host_template * tpnt)</div><div class='ctx'> 	    instance-&gt;irq = NCR5380_probe_irq(instance, PAS16_IRQS);</div><div class='ctx'> </div><div class='ctx'> 	if (instance-&gt;irq != SCSI_IRQ_NONE) </div><div class='del'>-	    if (request_irq(instance-&gt;irq, pas16_intr, SA_INTERRUPT, "pas16", instance)) {</div><div class='add'>+	    if (request_irq(instance-&gt;irq, pas16_intr, IRQF_DISABLED, "pas16", instance)) {</div><div class='ctx'> 		printk("scsi%d : IRQ%d not free, interrupts disabled\n", </div><div class='ctx'> 		    instance-&gt;host_no, instance-&gt;irq);</div><div class='ctx'> 		instance-&gt;irq = SCSI_IRQ_NONE;</div><div class='head'>diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c<br/>index 231f9c311c69..0d4c04e1f3de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pcmcia/nsp_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pcmcia/nsp_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pcmcia/nsp_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/pcmcia/nsp_cs.c</a></div><div class='hunk'>@@ -1623,7 +1623,7 @@ static int nsp_cs_probe(struct pcmcia_device *link)</div><div class='ctx'> 	/* Interrupt handler */</div><div class='ctx'> 	link-&gt;irq.Handler	 = &amp;nspintr;</div><div class='ctx'> 	link-&gt;irq.Instance       = info;</div><div class='del'>-	link-&gt;irq.Attributes     |= (SA_SHIRQ | SA_SAMPLE_RANDOM);</div><div class='add'>+	link-&gt;irq.Attributes     |= IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 	/* General socket configuration */</div><div class='ctx'> 	link-&gt;conf.Attributes	 = CONF_ENABLE_IRQ;</div><div class='head'>diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c<br/>index 9f59827707f0..0b65099acb1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pcmcia/sym53c500_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pcmcia/sym53c500_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pcmcia/sym53c500_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/pcmcia/sym53c500_cs.c</a></div><div class='hunk'>@@ -799,7 +799,7 @@ next_entry:</div><div class='ctx'> 	data = (struct sym53c500_data *)host-&gt;hostdata;</div><div class='ctx'> </div><div class='ctx'> 	if (irq_level &gt; 0) {</div><div class='del'>-		if (request_irq(irq_level, SYM53C500_intr, SA_SHIRQ, "SYM53C500", host)) {</div><div class='add'>+		if (request_irq(irq_level, SYM53C500_intr, IRQF_SHARED, "SYM53C500", host)) {</div><div class='ctx'> 			printk("SYM53C500: unable to allocate IRQ %d\n", irq_level);</div><div class='ctx'> 			goto err_free_scsi;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c<br/>index 5cda16cfacb0..d1f38c32aa15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pdc_adma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pdc_adma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pdc_adma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/pdc_adma.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"pdc_adma"</div><div class='del'>-#define DRV_VERSION	"0.03"</div><div class='add'>+#define DRV_VERSION	"0.04"</div><div class='ctx'> </div><div class='ctx'> /* macro to calculate base address for ATA regs */</div><div class='ctx'> #define ADMA_ATA_REGS(base,port_no)	((base) + ((port_no) * 0x40))</div><div class='hunk'>@@ -152,6 +152,7 @@ static struct scsi_host_template adma_ata_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ADMA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -167,6 +168,7 @@ static const struct ata_port_operations adma_ata_ops = {</div><div class='ctx'> 	.qc_prep		= adma_qc_prep,</div><div class='ctx'> 	.qc_issue		= adma_qc_issue,</div><div class='ctx'> 	.eng_timeout		= adma_eng_timeout,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> 	.irq_handler		= adma_intr,</div><div class='ctx'> 	.irq_clear		= adma_irq_clear,</div><div class='ctx'> 	.port_start		= adma_port_start,</div><div class='hunk'>@@ -455,13 +457,13 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 		adma_enter_reg_mode(ap);</div><div class='del'>-		if (ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))</div><div class='add'>+		if (ap-&gt;flags &amp; ATA_FLAG_DISABLED)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		pp = ap-&gt;private_data;</div><div class='ctx'> 		if (!pp || pp-&gt;state != adma_state_pkt)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-		if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN))) {</div><div class='add'>+		if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING))) {</div><div class='ctx'> 			if ((status &amp; (aPERR | aPSD | aUIRQ)))</div><div class='ctx'> 				qc-&gt;err_mask |= AC_ERR_OTHER;</div><div class='ctx'> 			else if (pp-&gt;pkt[0] != cDONE)</div><div class='hunk'>@@ -480,13 +482,13 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set)</div><div class='ctx'> 	for (port_no = 0; port_no &lt; host_set-&gt;n_ports; ++port_no) {</div><div class='ctx'> 		struct ata_port *ap;</div><div class='ctx'> 		ap = host_set-&gt;ports[port_no];</div><div class='del'>-		if (ap &amp;&amp; (!(ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR)))) {</div><div class='add'>+		if (ap &amp;&amp; (!(ap-&gt;flags &amp; ATA_FLAG_DISABLED))) {</div><div class='ctx'> 			struct ata_queued_cmd *qc;</div><div class='ctx'> 			struct adma_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 			if (!pp || pp-&gt;state != adma_state_mmio)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN))) {</div><div class='add'>+			if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING))) {</div><div class='ctx'> </div><div class='ctx'> 				/* check main status, clearing INTRQ */</div><div class='ctx'> 				u8 status = ata_check_status(ap);</div><div class='hunk'>@@ -688,7 +690,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	probe_ent-&gt;port_ops	= adma_port_info[board_idx].port_ops;</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;irq		= pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags	= SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags	= IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base	= mmio_base;</div><div class='ctx'> 	probe_ent-&gt;n_ports	= ADMA_PORTS;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c<br/>index 46624ab9c3d2..7abf64d1bfc9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/pluto.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/pluto.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/pluto.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/pluto.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #ifdef CONFIG_KMOD</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -27,6 +26,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='add'>+#define RQ_SCSI_BUSY		0xffff</div><div class='add'>+#define RQ_SCSI_DONE		0xfffe</div><div class='add'>+</div><div class='ctx'> /* #define PLUTO_DEBUG */</div><div class='ctx'> </div><div class='ctx'> #define pluto_printk printk ("PLUTO %s: ", fc-&gt;name); printk</div><div class='head'>diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c<br/>index 108910f512e4..b0eba39f208a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ppa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ppa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ppa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ppa.c</a></div><div class='hunk'>@@ -6,11 +6,8 @@</div><div class='ctx'>  * (c) 1995,1996 Grant R. Guenther, grant@torque.net,</div><div class='ctx'>  * under the terms of the GNU General Public License.</div><div class='ctx'>  * </div><div class='del'>- * Current Maintainer: David Campbell (Perth, Western Australia, GMT+0800)</div><div class='del'>- *                     campbell@torque.net</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/scsi/ppa.h b/drivers/scsi/ppa.h<br/>index f6e1a1574bb8..7511df3588e4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/ppa.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/ppa.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/ppa.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/ppa.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * the Iomega ZIP drive</div><div class='ctx'>  * </div><div class='ctx'>  * (c) 1996     Grant R. Guenther  grant@torque.net</div><div class='del'>- *              David Campbell     campbell@torque.net</div><div class='add'>+ *              David Campbell</div><div class='ctx'>  *</div><div class='ctx'>  *      All comments to David.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c<br/>index 5a48e55f9418..8953991462d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla1280.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla1280.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla1280.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla1280.c</a></div><div class='hunk'>@@ -192,7 +192,7 @@</div><div class='ctx'>         - Don't walk the entire list in qla1280_putq_t() just to directly</div><div class='ctx'> 	  grab the pointer to the last element afterwards</div><div class='ctx'>     Rev  3.23.5 Beta August 9, 2001, Jes Sorensen</div><div class='del'>-	- Don't use SA_INTERRUPT, it's use is deprecated for this kinda driver</div><div class='add'>+	- Don't use IRQF_DISABLED, it's use is deprecated for this kinda driver</div><div class='ctx'>     Rev  3.23.4 Beta August 8, 2001, Jes Sorensen</div><div class='ctx'> 	- Set dev-&gt;max_sectors to 1024</div><div class='ctx'>     Rev  3.23.3 Beta August 6, 2001, Jes Sorensen</div><div class='hunk'>@@ -331,7 +331,6 @@</div><div class='ctx'> *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='hunk'>@@ -397,30 +396,6 @@</div><div class='ctx'> #include "ql1280_fw.h"</div><div class='ctx'> #include "ql1040_fw.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Missing PCI ID's</div><div class='del'>- */</div><div class='del'>-#ifndef PCI_DEVICE_ID_QLOGIC_ISP1080</div><div class='del'>-#define PCI_DEVICE_ID_QLOGIC_ISP1080	0x1080</div><div class='del'>-#endif</div><div class='del'>-#ifndef PCI_DEVICE_ID_QLOGIC_ISP1240</div><div class='del'>-#define PCI_DEVICE_ID_QLOGIC_ISP1240	0x1240</div><div class='del'>-#endif</div><div class='del'>-#ifndef PCI_DEVICE_ID_QLOGIC_ISP1280</div><div class='del'>-#define PCI_DEVICE_ID_QLOGIC_ISP1280	0x1280</div><div class='del'>-#endif</div><div class='del'>-#ifndef PCI_DEVICE_ID_QLOGIC_ISP10160</div><div class='del'>-#define PCI_DEVICE_ID_QLOGIC_ISP10160	0x1016</div><div class='del'>-#endif</div><div class='del'>-#ifndef PCI_DEVICE_ID_QLOGIC_ISP12160</div><div class='del'>-#define PCI_DEVICE_ID_QLOGIC_ISP12160	0x1216</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef PCI_VENDOR_ID_AMI</div><div class='del'>-#define PCI_VENDOR_ID_AMI               0x101e</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifndef BITS_PER_LONG</div><div class='ctx'> #error "BITS_PER_LONG not defined!"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -4234,20 +4209,17 @@ qla1280_setup(char *s)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static int __init</div><div class='ctx'> qla1280_get_token(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	char *sep;</div><div class='ctx'> 	long ret = -1;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	len = sizeof(setup_token)/sizeof(struct setup_tokens);</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	sep = strchr(str, ':');</div><div class='ctx'> </div><div class='ctx'> 	if (sep) {</div><div class='del'>-		for (i = 0; i &lt; len; i++){</div><div class='del'>-</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(setup_token); i++) {</div><div class='ctx'> 			if (!strncmp(setup_token[i].token, str, (sep - str))) {</div><div class='ctx'> 				ret =  setup_token[i].val;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -4397,7 +4369,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	/* Disable ISP interrupts. */</div><div class='ctx'> 	qla1280_disable_intrs(ha);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pdev-&gt;irq, qla1280_intr_handler, SA_SHIRQ,</div><div class='add'>+	if (request_irq(pdev-&gt;irq, qla1280_intr_handler, IRQF_SHARED,</div><div class='ctx'> 				"qla1280", ha)) {</div><div class='ctx'> 		printk("qla1280 : Failed to reserve interrupt %d already "</div><div class='ctx'> 		       "in use\n", pdev-&gt;irq);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig<br/>index ff40906c66f9..8c865b9e02b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/Kconfig</a></div><div class='hunk'>@@ -24,48 +24,3 @@ config SCSI_QLA_FC</div><div class='ctx'> 	Firmware images can be retrieved from:</div><div class='ctx'> </div><div class='ctx'> 		ftp://ftp.qlogic.com/outgoing/linux/firmware/</div><div class='del'>-</div><div class='del'>-	NOTE: The original method of building firmware-loader</div><div class='del'>-	modules has been deprecated as the firmware-images will</div><div class='del'>-	be removed from the kernel sources.</div><div class='del'>-</div><div class='del'>-config SCSI_QLA2XXX_EMBEDDED_FIRMWARE</div><div class='del'>-	bool "  Use firmware-loader modules (DEPRECATED)"</div><div class='del'>-	depends on SCSI_QLA_FC</div><div class='del'>-	help</div><div class='del'>-	  This option offers you the deprecated firmware-loader</div><div class='del'>-	  modules that have been obsoleted by the usage of the</div><div class='del'>-	  Firmware Loader interface in the qla2xxx driver.</div><div class='del'>-</div><div class='del'>-config SCSI_QLA21XX</div><div class='del'>-	tristate "  Build QLogic ISP2100 firmware-module"</div><div class='del'>-	depends on SCSI_QLA_FC &amp;&amp; SCSI_QLA2XXX_EMBEDDED_FIRMWARE</div><div class='del'>-	---help---</div><div class='del'>-	This driver supports the QLogic 21xx (ISP2100) host adapter family.</div><div class='del'>-</div><div class='del'>-config SCSI_QLA22XX</div><div class='del'>-	tristate "  Build QLogic ISP2200 firmware-module"</div><div class='del'>-	depends on SCSI_QLA_FC &amp;&amp; SCSI_QLA2XXX_EMBEDDED_FIRMWARE</div><div class='del'>-	---help---</div><div class='del'>-	This driver supports the QLogic 22xx (ISP2200) host adapter family.</div><div class='del'>-</div><div class='del'>-config SCSI_QLA2300</div><div class='del'>-	tristate "  Build QLogic ISP2300/ISP6312 firmware-module"</div><div class='del'>-	depends on SCSI_QLA_FC &amp;&amp; SCSI_QLA2XXX_EMBEDDED_FIRMWARE</div><div class='del'>-	---help---</div><div class='del'>-	This driver supports the QLogic 2300 (ISP2300, ISP2312 and</div><div class='del'>-	ISP6312) host adapter family.</div><div class='del'>-</div><div class='del'>-config SCSI_QLA2322</div><div class='del'>-	tristate "  Build QLogic ISP2322/ISP6322 firmware-module"</div><div class='del'>-	depends on SCSI_QLA_FC &amp;&amp; SCSI_QLA2XXX_EMBEDDED_FIRMWARE</div><div class='del'>-	---help---</div><div class='del'>-	This driver supports the QLogic 2322 (ISP2322 and ISP6322) host</div><div class='del'>-	adapter family.</div><div class='del'>-</div><div class='del'>-config SCSI_QLA24XX</div><div class='del'>-	tristate "  Build QLogic ISP24xx firmware-module"</div><div class='del'>-	depends on SCSI_QLA_FC &amp;&amp; SCSI_QLA2XXX_EMBEDDED_FIRMWARE</div><div class='del'>-	---help---</div><div class='del'>-	This driver supports the QLogic 24xx (ISP2422 and ISP2432) host</div><div class='del'>-	adapter family.</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile<br/>index c8f670ee60b4..411663af7bb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/Makefile</a></div><div class='hunk'>@@ -1,18 +1,4 @@</div><div class='del'>-EXTRA_CFLAGS += -DUNIQUE_FW_NAME</div><div class='del'>-</div><div class='ctx'> qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \</div><div class='del'>-		qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o</div><div class='add'>+		qla_dbg.o qla_sup.o qla_attr.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o</div><div class='del'>-</div><div class='del'>-qla2100-y := ql2100.o ql2100_fw.o</div><div class='del'>-qla2200-y := ql2200.o ql2200_fw.o</div><div class='del'>-qla2300-y := ql2300.o ql2300_fw.o</div><div class='del'>-qla2322-y := ql2322.o ql2322_fw.o</div><div class='del'>-qla2400-y := ql2400.o ql2400_fw.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_SCSI_QLA21XX) += qla2xxx.o qla2100.o</div><div class='del'>-obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o qla2200.o</div><div class='del'>-obj-$(CONFIG_SCSI_QLA2300) += qla2xxx.o qla2300.o</div><div class='del'>-obj-$(CONFIG_SCSI_QLA2322) += qla2xxx.o qla2322.o</div><div class='del'>-obj-$(CONFIG_SCSI_QLA24XX) += qla2xxx.o qla2400.o</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2100.c b/drivers/scsi/qla2xxx/ql2100.c<br/>deleted file mode 100644<br/>index f5db2235e432..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2100.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (C)  2003 Christoph Hellwig.</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include "qla_def.h"</div><div class='del'>-</div><div class='del'>-static char qla_driver_name[] = "qla2100";</div><div class='del'>-</div><div class='del'>-extern unsigned char  fw2100tp_version[];</div><div class='del'>-extern unsigned char  fw2100tp_version_str[];</div><div class='del'>-extern unsigned short fw2100tp_addr01;</div><div class='del'>-extern unsigned short fw2100tp_code01[];</div><div class='del'>-extern unsigned short fw2100tp_length01;</div><div class='del'>-</div><div class='del'>-static struct qla_fw_info qla_fw_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_NORMAL,</div><div class='del'>-		.fwcode		= &amp;fw2100tp_code01[0],</div><div class='del'>-		.fwlen		= &amp;fw2100tp_length01,</div><div class='del'>-		.fwstart	= &amp;fw2100tp_addr01,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{ FW_INFO_ADDR_NOMORE, },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct qla_board_info qla_board_tbl = {</div><div class='del'>-	.drv_name	= qla_driver_name,</div><div class='del'>-</div><div class='del'>-	.isp_name	= "ISP2100",</div><div class='del'>-	.fw_info	= qla_fw_tbl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_device_id qla2100_pci_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2100,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{0, 0},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, qla2100_pci_tbl);</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-qla2100_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return qla2x00_probe_one(pdev,</div><div class='del'>-	    (struct qla_board_info *)id-&gt;driver_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit</div><div class='del'>-qla2100_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	qla2x00_remove_one(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver qla2100_pci_driver = {</div><div class='del'>-	.name		= "qla2100",</div><div class='del'>-	.id_table	= qla2100_pci_tbl,</div><div class='del'>-	.probe		= qla2100_probe_one,</div><div class='del'>-	.remove		= __devexit_p(qla2100_remove_one),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-qla2100_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_module_init(&amp;qla2100_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-qla2100_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;qla2100_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(qla2100_init);</div><div class='del'>-module_exit(qla2100_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("QLogic Corporation");</div><div class='del'>-MODULE_DESCRIPTION("QLogic ISP21xx FC-SCSI Host Bus Adapter driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(QLA2XXX_VERSION);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2100_fw.c b/drivers/scsi/qla2xxx/ql2100_fw.c<br/>deleted file mode 100644<br/>index 56006162da40..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2100_fw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2100_fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4848 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Firmware Version 1.19.25 (13:12 Dec 10, 2003)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2100tp_version = 1*1024+19;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_version = 1*1024+19;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned char fw2100tp_version_str[] = {1,19,25};</div><div class='del'>-#else</div><div class='del'>-unsigned char firmware_version[] = {1,19,25};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-#define fw2100tp_VERSION_STRING "1.19.25"</div><div class='del'>-#else</div><div class='del'>-#define FW_VERSION_STRING "1.19.25"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2100tp_addr01 = 0x1000 ;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_addr01 = 0x1000 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2100tp_code01[] = { </div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code01[] = { </div><div class='del'>-#endif</div><div class='del'>-	0x0078, 0x102d, 0x0000, 0x9601, 0x0000, 0x0001, 0x0013, 0x0019,</div><div class='del'>-	0x0017, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,</div><div class='del'>-	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,</div><div class='del'>-	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3231, 0x3030, 0x2046, 0x6972,</div><div class='del'>-	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,</div><div class='del'>-	0x312e, 0x3139, 0x2020, 0x2020, 0x2400, 0x2091, 0x2000, 0x20c1,</div><div class='del'>-	0x0021, 0x2039, 0xffff, 0x2019, 0xaaaa, 0x2760, 0x2069, 0x7fff,</div><div class='del'>-	0x20c1, 0x0020, 0x2c2c, 0x2d34, 0x2762, 0x236a, 0x2c24, 0x2d04,</div><div class='del'>-	0x266a, 0x2562, 0xa406, 0x00c0, 0x1052, 0x20c1, 0x0021, 0x2c2c,</div><div class='del'>-	0x2362, 0x2c04, 0x2562, 0xa306, 0x0040, 0x1052, 0x20c1, 0x0020,</div><div class='del'>-	0x2039, 0x8fff, 0x20a1, 0xae00, 0x2708, 0x810d, 0x810d, 0x810d,</div><div class='del'>-	0x810d, 0xa18c, 0x000f, 0x2001, 0x000a, 0xa112, 0xa00e, 0x21a8,</div><div class='del'>-	0x41a4, 0x3400, 0x8211, 0x00c0, 0x105f, 0x2708, 0x3400, 0xa102,</div><div class='del'>-	0x0040, 0x106f, 0x0048, 0x106f, 0x20a8, 0xa00e, 0x41a4, 0x20a1,</div><div class='del'>-	0xa601, 0x2009, 0x0000, 0x20a9, 0x07ff, 0x41a4, 0x3400, 0x20c9,</div><div class='del'>-	0xabff, 0x2059, 0x0000, 0x2b78, 0x7823, 0x0004, 0x2089, 0x25c7,</div><div class='del'>-	0x2051, 0xa700, 0x2a70, 0x7762, 0xa786, 0x8fff, 0x0040, 0x1092,</div><div class='del'>-	0x705f, 0xce00, 0x705b, 0xcdf1, 0x7067, 0x0200, 0x706b, 0x0200,</div><div class='del'>-	0x0078, 0x109a, 0x705b, 0xbe01, 0x7067, 0x0100, 0x706b, 0x0100,</div><div class='del'>-	0x705f, 0xbe00, 0x1078, 0x12df, 0x1078, 0x13ca, 0x1078, 0x1577,</div><div class='del'>-	0x1078, 0x1ce9, 0x1078, 0x42ec, 0x1078, 0x76bf, 0x1078, 0x1355,</div><div class='del'>-	0x1078, 0x2ac0, 0x1078, 0x4e93, 0x1078, 0x49a3, 0x1078, 0x594a,</div><div class='del'>-	0x1078, 0x2263, 0x1078, 0x5c43, 0x1078, 0x5485, 0x1078, 0x2162,</div><div class='del'>-	0x1078, 0x2240, 0x2091, 0x3009, 0x7823, 0x0000, 0x0090, 0x10cf,</div><div class='del'>-	0x7820, 0xa086, 0x0002, 0x00c0, 0x10cf, 0x7823, 0x4000, 0x0068,</div><div class='del'>-	0x10c7, 0x781b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2a70,</div><div class='del'>-	0x7003, 0x0000, 0x2001, 0x017f, 0x2003, 0x0000, 0x2a70, 0x7000,</div><div class='del'>-	0xa08e, 0x0003, 0x00c0, 0x10ef, 0x1078, 0x365e, 0x1078, 0x2ae8,</div><div class='del'>-	0x1078, 0x4ee3, 0x1078, 0x4b66, 0x2009, 0x0100, 0x2104, 0xa082,</div><div class='del'>-	0x0002, 0x0048, 0x10f3, 0x1078, 0x5966, 0x0078, 0x10d6, 0x1079,</div><div class='del'>-	0x10f7, 0x0078, 0x10dc, 0x1078, 0x7197, 0x0078, 0x10eb, 0x1101,</div><div class='del'>-	0x1102, 0x11be, 0x10ff, 0x1246, 0x12dc, 0x12dd, 0x12de, 0x1078,</div><div class='del'>-	0x1332, 0x007c, 0x127e, 0x0f7e, 0x2091, 0x8000, 0x7000, 0xa086,</div><div class='del'>-	0x0001, 0x00c0, 0x1198, 0x1078, 0x3aec, 0x2079, 0x0100, 0x7844,</div><div class='del'>-	0xa005, 0x00c0, 0x1198, 0x2011, 0x41dc, 0x1078, 0x5a45, 0x1078,</div><div class='del'>-	0x1adf, 0x780f, 0x00ff, 0x7840, 0xa084, 0xfffb, 0x7842, 0x2011,</div><div class='del'>-	0x8010, 0x73c4, 0x1078, 0x361b, 0x2001, 0xffff, 0x1078, 0x5ae6,</div><div class='del'>-	0x723c, 0xc284, 0x723e, 0x2001, 0xa70c, 0x2014, 0xc2ac, 0x2202,</div><div class='del'>-	0x1078, 0x6f9f, 0x2011, 0x0004, 0x1078, 0x8d2b, 0x1078, 0x489e,</div><div class='del'>-	0x1078, 0x42d4, 0x0040, 0x1144, 0x7087, 0x0001, 0x70bf, 0x0000,</div><div class='del'>-	0x1078, 0x3c9e, 0x0078, 0x1198, 0x1078, 0x4967, 0x0040, 0x114d,</div><div class='del'>-	0x7a0c, 0xc2b4, 0x7a0e, 0x0078, 0x1159, 0x1078, 0x90b6, 0x70cc,</div><div class='del'>-	0xd09c, 0x00c0, 0x1159, 0x7098, 0xa005, 0x0040, 0x1159, 0x1078,</div><div class='del'>-	0x42b8, 0x70d7, 0x0000, 0x70d3, 0x0000, 0x72cc, 0x2079, 0xa752,</div><div class='del'>-	0x7804, 0xd0ac, 0x0040, 0x1165, 0xc295, 0x72ce, 0xa296, 0x0004,</div><div class='del'>-	0x0040, 0x1186, 0x2011, 0x0001, 0x1078, 0x8d2b, 0x7093, 0x0000,</div><div class='del'>-	0x7097, 0xffff, 0x7003, 0x0002, 0x0f7f, 0x1078, 0x2677, 0x2011,</div><div class='del'>-	0x0005, 0x1078, 0x70e0, 0x1078, 0x62d1, 0x0c7e, 0x2061, 0x0100,</div><div class='del'>-	0x60e3, 0x0008, 0x0c7f, 0x127f, 0x0078, 0x119a, 0x7093, 0x0000,</div><div class='del'>-	0x7097, 0xffff, 0x7003, 0x0002, 0x2011, 0x0005, 0x1078, 0x70e0,</div><div class='del'>-	0x1078, 0x62d1, 0x0c7e, 0x2061, 0x0100, 0x60e3, 0x0008, 0x0c7f,</div><div class='del'>-	0x0f7f, 0x127f, 0x007c, 0x0c7e, 0x20a9, 0x0082, 0x2009, 0x007e,</div><div class='del'>-	0x017e, 0x027e, 0x037e, 0x2110, 0x027e, 0x2019, 0x0029, 0x1078,</div><div class='del'>-	0x73d0, 0x027f, 0x1078, 0xa501, 0x037f, 0x027f, 0x017f, 0x1078,</div><div class='del'>-	0x298e, 0x8108, 0x00f0, 0x11a0, 0x0c7f, 0x706f, 0x0000, 0x7070,</div><div class='del'>-	0xa084, 0x00ff, 0x7072, 0x709b, 0x0000, 0x007c, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x7000, 0xa086, 0x0002, 0x00c0, 0x1244, 0x7094, 0xa086,</div><div class='del'>-	0xffff, 0x0040, 0x11d1, 0x1078, 0x2677, 0x1078, 0x62d1, 0x0078,</div><div class='del'>-	0x1244, 0x70cc, 0xd09c, 0x0040, 0x11fd, 0xd084, 0x0040, 0x11fd,</div><div class='del'>-	0x0f7e, 0x2079, 0x0100, 0x790c, 0xc1b5, 0x790e, 0x0f7f, 0xd08c,</div><div class='del'>-	0x0040, 0x11fd, 0x70d0, 0xa086, 0xffff, 0x0040, 0x11f9, 0x1078,</div><div class='del'>-	0x27f7, 0x1078, 0x62d1, 0x70cc, 0xd094, 0x00c0, 0x1244, 0x2011,</div><div class='del'>-	0x0001, 0x2019, 0x0000, 0x1078, 0x282f, 0x1078, 0x62d1, 0x0078,</div><div class='del'>-	0x1244, 0x70d4, 0xa005, 0x00c0, 0x1244, 0x7090, 0xa005, 0x00c0,</div><div class='del'>-	0x1244, 0x1078, 0x4967, 0x00c0, 0x1244, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0ac, 0x0040, 0x1227, 0x157e, 0x0c7e, 0x20a9, 0x007f, 0x2009,</div><div class='del'>-	0x0000, 0x017e, 0x1078, 0x45c4, 0x00c0, 0x121a, 0x6000, 0xd0ec,</div><div class='del'>-	0x00c0, 0x1222, 0x017f, 0x8108, 0x00f0, 0x1211, 0x0c7f, 0x157f,</div><div class='del'>-	0x0078, 0x1227, 0x017f, 0x0c7f, 0x157f, 0x0078, 0x1244, 0x7003,</div><div class='del'>-	0x0003, 0x7097, 0xffff, 0x2001, 0x0000, 0x1078, 0x24e8, 0x1078,</div><div class='del'>-	0x3699, 0x2001, 0xa9b2, 0x2004, 0xa086, 0x0005, 0x00c0, 0x123c,</div><div class='del'>-	0x2011, 0x0000, 0x1078, 0x70e0, 0x2011, 0x0000, 0x1078, 0x70ea,</div><div class='del'>-	0x1078, 0x62d1, 0x1078, 0x639b, 0x127f, 0x007c, 0x017e, 0x0f7e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x2079, 0x0100, 0x2009, 0x00f7, 0x1078,</div><div class='del'>-	0x42a1, 0x7940, 0xa18c, 0x0010, 0x7942, 0x7924, 0xd1b4, 0x0040,</div><div class='del'>-	0x125b, 0x7827, 0x0040, 0xd19c, 0x0040, 0x1260, 0x7827, 0x0008,</div><div class='del'>-	0x007e, 0x037e, 0x157e, 0xa006, 0x1078, 0x5ae6, 0x7900, 0xa18a,</div><div class='del'>-	0x0003, 0x0050, 0x1289, 0x7954, 0xd1ac, 0x00c0, 0x1289, 0x2009,</div><div class='del'>-	0x00f8, 0x1078, 0x42a1, 0x7843, 0x0090, 0x7843, 0x0010, 0x20a9,</div><div class='del'>-	0x09c4, 0x7820, 0xd09c, 0x00c0, 0x1281, 0x7824, 0xd0ac, 0x00c0,</div><div class='del'>-	0x12ca, 0x00f0, 0x1279, 0x2001, 0x0001, 0x1078, 0x24e8, 0x0078,</div><div class='del'>-	0x12d5, 0x7853, 0x0000, 0x782f, 0x0020, 0x20a9, 0x0050, 0x00e0,</div><div class='del'>-	0x128f, 0x2091, 0x6000, 0x00f0, 0x128f, 0x7853, 0x0400, 0x782f,</div><div class='del'>-	0x0000, 0x2009, 0x00f8, 0x1078, 0x42a1, 0x20a9, 0x000e, 0x0005,</div><div class='del'>-	0x00f0, 0x129f, 0x7853, 0x1400, 0x7843, 0x0090, 0x7843, 0x0010,</div><div class='del'>-	0x2019, 0x61a8, 0x7854, 0x0005, 0x0005, 0xd08c, 0x0040, 0x12b4,</div><div class='del'>-	0x7824, 0xd0ac, 0x00c0, 0x12ca, 0x8319, 0x00c0, 0x12aa, 0x2009,</div><div class='del'>-	0xa732, 0x2104, 0x8000, 0x200a, 0xa084, 0xfff0, 0x0040, 0x12c4,</div><div class='del'>-	0x200b, 0x0000, 0x1078, 0x2588, 0x2001, 0x0001, 0x1078, 0x24e8,</div><div class='del'>-	0x0078, 0x12d3, 0x2001, 0xa732, 0x2003, 0x0000, 0x7828, 0xc09d,</div><div class='del'>-	0x782a, 0x7827, 0x0048, 0x7853, 0x0400, 0x157f, 0x037f, 0x007f,</div><div class='del'>-	0x127f, 0x0f7f, 0x017f, 0x007c, 0x007c, 0x007c, 0x007c, 0x2a70,</div><div class='del'>-	0x2061, 0xa9ad, 0x2063, 0x0001, 0x6007, 0x0013, 0x600b, 0x0019,</div><div class='del'>-	0x600f, 0x0017, 0x2009, 0x0100, 0x2104, 0xa082, 0x0002, 0x0048,</div><div class='del'>-	0x12f5, 0x7053, 0xffff, 0x0078, 0x12f7, 0x7053, 0x0000, 0x7057,</div><div class='del'>-	0xffff, 0x706f, 0x0000, 0x7073, 0x0000, 0x1078, 0x90b6, 0x2061,</div><div class='del'>-	0xa98d, 0x6003, 0x0909, 0x6007, 0x0000, 0x600b, 0x8800, 0x600f,</div><div class='del'>-	0x0200, 0x6013, 0x00ff, 0x6017, 0x0003, 0x601b, 0x0000, 0x601f,</div><div class='del'>-	0x07d0, 0x2061, 0xa995, 0x6003, 0x8000, 0x6007, 0x0000, 0x600b,</div><div class='del'>-	0x0000, 0x600f, 0x0200, 0x6013, 0x00ff, 0x6017, 0x0000, 0x601b,</div><div class='del'>-	0x0001, 0x601f, 0x0000, 0x2061, 0xa9a5, 0x6003, 0x514c, 0x6007,</div><div class='del'>-	0x4f47, 0x600b, 0x4943, 0x600f, 0x2020, 0x2001, 0xa726, 0x2003,</div><div class='del'>-	0x0000, 0x007c, 0x2091, 0x8000, 0x0068, 0x1334, 0x007e, 0x017e,</div><div class='del'>-	0x2079, 0x0000, 0x7818, 0xd084, 0x00c0, 0x133a, 0x017f, 0x792e,</div><div class='del'>-	0x007f, 0x782a, 0x007f, 0x7826, 0x3900, 0x783a, 0x7823, 0x8002,</div><div class='del'>-	0x781b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2079, 0xa700,</div><div class='del'>-	0x7803, 0x0005, 0x0078, 0x1352, 0x007c, 0x2071, 0xa700, 0x715c,</div><div class='del'>-	0x712e, 0x2021, 0x0001, 0xa190, 0x002d, 0xa298, 0x002d, 0x0048,</div><div class='del'>-	0x136b, 0x7060, 0xa302, 0x00c8, 0x136b, 0x220a, 0x2208, 0x2310,</div><div class='del'>-	0x8420, 0x0078, 0x135d, 0x200b, 0x0000, 0x74aa, 0x74ae, 0x007c,</div><div class='del'>-	0x0e7e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa700, 0x70ac, 0xa0ea,</div><div class='del'>-	0x0010, 0x00c8, 0x137e, 0xa06e, 0x0078, 0x1388, 0x8001, 0x70ae,</div><div class='del'>-	0x702c, 0x2068, 0x2d04, 0x702e, 0x206b, 0x0000, 0x6807, 0x0000,</div><div class='del'>-	0x127f, 0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa700, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x70ac, 0x8001, 0x00c8, 0x1398, 0xa06e, 0x0078, 0x13a1,</div><div class='del'>-	0x70ae, 0x702c, 0x2068, 0x2d04, 0x702e, 0x206b, 0x0000, 0x6807,</div><div class='del'>-	0x0000, 0x127f, 0x0e7f, 0x007c, 0x0e7e, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xa700, 0x702c, 0x206a, 0x2d00, 0x702e, 0x70ac, 0x8000,</div><div class='del'>-	0x70ae, 0x127f, 0x0e7f, 0x007c, 0x8dff, 0x0040, 0x13c0, 0x6804,</div><div class='del'>-	0x6807, 0x0000, 0x007e, 0x1078, 0x13a4, 0x0d7f, 0x0078, 0x13b4,</div><div class='del'>-	0x007c, 0x0e7e, 0x2071, 0xa700, 0x70ac, 0xa08a, 0x0010, 0xa00d,</div><div class='del'>-	0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa9d6, 0x7007, 0x0000, 0x701b,</div><div class='del'>-	0x0000, 0x701f, 0x0000, 0x2071, 0x0000, 0x7010, 0xa085, 0x8004,</div><div class='del'>-	0x7012, 0x0e7f, 0x007c, 0x127e, 0x2091, 0x8000, 0x0e7e, 0x2270,</div><div class='del'>-	0x700b, 0x0000, 0x2071, 0xa9d6, 0x7018, 0xa088, 0xa9df, 0x220a,</div><div class='del'>-	0x8000, 0xa084, 0x0007, 0x701a, 0x7004, 0xa005, 0x00c0, 0x13f6,</div><div class='del'>-	0x0f7e, 0x2079, 0x0010, 0x1078, 0x1408, 0x0f7f, 0x0e7f, 0x127f,</div><div class='del'>-	0x007c, 0x0e7e, 0x2071, 0xa9d6, 0x7004, 0xa005, 0x00c0, 0x1406,</div><div class='del'>-	0x0f7e, 0x2079, 0x0010, 0x1078, 0x1408, 0x0f7f, 0x0e7f, 0x007c,</div><div class='del'>-	0x7000, 0x0079, 0x140b, 0x140f, 0x1479, 0x1496, 0x1496, 0x7018,</div><div class='del'>-	0x711c, 0xa106, 0x00c0, 0x1417, 0x7007, 0x0000, 0x007c, 0x0d7e,</div><div class='del'>-	0xa180, 0xa9df, 0x2004, 0x700a, 0x2068, 0x8108, 0xa18c, 0x0007,</div><div class='del'>-	0x711e, 0x7803, 0x0026, 0x6824, 0x7832, 0x6828, 0x7836, 0x682c,</div><div class='del'>-	0x783a, 0x6830, 0x783e, 0x6810, 0x700e, 0x680c, 0x7016, 0x6804,</div><div class='del'>-	0x0d7f, 0xd084, 0x0040, 0x1439, 0x7007, 0x0001, 0x1078, 0x143e,</div><div class='del'>-	0x007c, 0x7007, 0x0002, 0x1078, 0x1454, 0x007c, 0x017e, 0x027e,</div><div class='del'>-	0x710c, 0x2011, 0x0040, 0xa182, 0x0040, 0x00c8, 0x1449, 0x2110,</div><div class='del'>-	0xa006, 0x700e, 0x7212, 0x8203, 0x7822, 0x7803, 0x0020, 0x7803,</div><div class='del'>-	0x0041, 0x027f, 0x017f, 0x007c, 0x017e, 0x027e, 0x137e, 0x147e,</div><div class='del'>-	0x157e, 0x7014, 0x2098, 0x20a1, 0x0014, 0x7803, 0x0026, 0x710c,</div><div class='del'>-	0x2011, 0x0040, 0xa182, 0x0040, 0x00c8, 0x1468, 0x2110, 0xa006,</div><div class='del'>-	0x700e, 0x22a8, 0x53a6, 0x8203, 0x7822, 0x7803, 0x0020, 0x3300,</div><div class='del'>-	0x7016, 0x7803, 0x0001, 0x157f, 0x147f, 0x137f, 0x027f, 0x017f,</div><div class='del'>-	0x007c, 0x137e, 0x147e, 0x157e, 0x2099, 0xa7fa, 0x20a1, 0x0018,</div><div class='del'>-	0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x7803, 0x0041, 0x7007, 0x0003, 0x7000, 0xc084, 0x7002, 0x700b,</div><div class='del'>-	0xa7f5, 0x127f, 0x157f, 0x147f, 0x137f, 0x007c, 0x137e, 0x147e,</div><div class='del'>-	0x157e, 0x2001, 0xa829, 0x209c, 0x20a1, 0x0014, 0x7803, 0x0026,</div><div class='del'>-	0x2001, 0xa82a, 0x20ac, 0x53a6, 0x2099, 0xa82b, 0x20a1, 0x0018,</div><div class='del'>-	0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x7803, 0x0001, 0x7007, 0x0004, 0x7000, 0xc08c, 0x7002, 0x700b,</div><div class='del'>-	0xa826, 0x127f, 0x157f, 0x147f, 0x137f, 0x007c, 0x017e, 0x0e7e,</div><div class='del'>-	0x2071, 0xa9d6, 0x0f7e, 0x2079, 0x0010, 0x7904, 0x7803, 0x0002,</div><div class='del'>-	0xd1fc, 0x0040, 0x14d0, 0xa18c, 0x0700, 0x7004, 0x1079, 0x14d4,</div><div class='del'>-	0x0f7f, 0x0e7f, 0x017f, 0x007c, 0x1408, 0x14dc, 0x1509, 0x1531,</div><div class='del'>-	0x1564, 0x14da, 0x0078, 0x14da, 0xa18c, 0x0700, 0x00c0, 0x1502,</div><div class='del'>-	0x137e, 0x147e, 0x157e, 0x7014, 0x20a0, 0x2099, 0x0014, 0x7803,</div><div class='del'>-	0x0040, 0x7010, 0x20a8, 0x53a5, 0x3400, 0x7016, 0x157f, 0x147f,</div><div class='del'>-	0x137f, 0x700c, 0xa005, 0x0040, 0x151e, 0x1078, 0x143e, 0x007c,</div><div class='del'>-	0x7008, 0xa080, 0x0002, 0x2003, 0x0100, 0x7007, 0x0000, 0x1078,</div><div class='del'>-	0x1408, 0x007c, 0x7008, 0xa080, 0x0002, 0x2003, 0x0200, 0x0078,</div><div class='del'>-	0x14fd, 0xa18c, 0x0700, 0x00c0, 0x1514, 0x700c, 0xa005, 0x0040,</div><div class='del'>-	0x151e, 0x1078, 0x1454, 0x007c, 0x7008, 0xa080, 0x0002, 0x2003,</div><div class='del'>-	0x0200, 0x7007, 0x0000, 0x1078, 0x1408, 0x007c, 0x0d7e, 0x7008,</div><div class='del'>-	0x2068, 0x7830, 0x6826, 0x7834, 0x682a, 0x7838, 0x682e, 0x783c,</div><div class='del'>-	0x6832, 0x680b, 0x0100, 0x0d7f, 0x7007, 0x0000, 0x1078, 0x1408,</div><div class='del'>-	0x007c, 0xa18c, 0x0700, 0x00c0, 0x155e, 0x137e, 0x147e, 0x157e,</div><div class='del'>-	0x2001, 0xa7f8, 0x2004, 0xa080, 0x000d, 0x20a0, 0x2099, 0x0014,</div><div class='del'>-	0x7803, 0x0040, 0x20a9, 0x0020, 0x53a5, 0x2001, 0xa7fa, 0x2004,</div><div class='del'>-	0xd0bc, 0x0040, 0x1554, 0x2001, 0xa803, 0x2004, 0xa080, 0x000d,</div><div class='del'>-	0x20a0, 0x20a9, 0x0020, 0x53a5, 0x157f, 0x147f, 0x137f, 0x7007,</div><div class='del'>-	0x0000, 0x1078, 0x4f8c, 0x1078, 0x1408, 0x007c, 0x2011, 0x8003,</div><div class='del'>-	0x1078, 0x361b, 0x0078, 0x1562, 0xa18c, 0x0700, 0x00c0, 0x1571,</div><div class='del'>-	0x2001, 0xa828, 0x2003, 0x0100, 0x7007, 0x0000, 0x1078, 0x1408,</div><div class='del'>-	0x007c, 0x2011, 0x8004, 0x1078, 0x361b, 0x0078, 0x1575, 0x127e,</div><div class='del'>-	0x2091, 0x2100, 0x2079, 0x0030, 0x2071, 0xa9e7, 0x7803, 0x0004,</div><div class='del'>-	0x7003, 0x0000, 0x700f, 0xa9ed, 0x7013, 0xa9ed, 0x780f, 0x0076,</div><div class='del'>-	0x7803, 0x0004, 0x127f, 0x007c, 0x6934, 0xa184, 0x0007, 0x0079,</div><div class='del'>-	0x1591, 0x1599, 0x15df, 0x1599, 0x1599, 0x1599, 0x15c4, 0x15a8,</div><div class='del'>-	0x159d, 0xa085, 0x0001, 0x0078, 0x15f9, 0x684c, 0xd0bc, 0x0040,</div><div class='del'>-	0x1599, 0x6860, 0x682e, 0x685c, 0x682a, 0x6858, 0x0078, 0x15e7,</div><div class='del'>-	0xa18c, 0x00ff, 0xa186, 0x001e, 0x00c0, 0x1599, 0x684c, 0xd0bc,</div><div class='del'>-	0x0040, 0x1599, 0x6860, 0x682e, 0x685c, 0x682a, 0x6804, 0x681a,</div><div class='del'>-	0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004,</div><div class='del'>-	0x6832, 0x6858, 0x0078, 0x15ef, 0xa18c, 0x00ff, 0xa186, 0x0015,</div><div class='del'>-	0x00c0, 0x1599, 0x684c, 0xd0ac, 0x0040, 0x1599, 0x6804, 0x681a,</div><div class='del'>-	0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004,</div><div class='del'>-	0x6832, 0xa006, 0x682e, 0x682a, 0x6858, 0x0078, 0x15ef, 0x684c,</div><div class='del'>-	0xd0ac, 0x0040, 0x1599, 0xa006, 0x682e, 0x682a, 0x6858, 0xa18c,</div><div class='del'>-	0x000f, 0xa188, 0x206a, 0x210c, 0x6932, 0x2d08, 0x691a, 0x6826,</div><div class='del'>-	0x684c, 0xc0dd, 0x684e, 0xa006, 0x680a, 0x697c, 0x6912, 0x6980,</div><div class='del'>-	0x6916, 0x007c, 0x20e1, 0x0007, 0x20e1, 0x2000, 0x2001, 0x020a,</div><div class='del'>-	0x2004, 0x82ff, 0x0040, 0x161c, 0xa280, 0x0004, 0x0d7e, 0x206c,</div><div class='del'>-	0x684c, 0xd0dc, 0x00c0, 0x1618, 0x1078, 0x158c, 0x0040, 0x1618,</div><div class='del'>-	0x0d7f, 0xa280, 0x0000, 0x2003, 0x0002, 0xa016, 0x0078, 0x161c,</div><div class='del'>-	0x6808, 0x8000, 0x680a, 0x0d7f, 0x127e, 0x047e, 0x037e, 0x027e,</div><div class='del'>-	0x2091, 0x2100, 0x027f, 0x037f, 0x047f, 0x7000, 0xa005, 0x00c0,</div><div class='del'>-	0x1630, 0x7206, 0x2001, 0x1651, 0x007e, 0x2260, 0x0078, 0x17e0,</div><div class='del'>-	0x710c, 0x220a, 0x8108, 0x230a, 0x8108, 0x240a, 0x8108, 0xa182,</div><div class='del'>-	0xaa08, 0x0048, 0x163d, 0x2009, 0xa9ed, 0x710e, 0x7010, 0xa102,</div><div class='del'>-	0xa082, 0x0009, 0x0040, 0x1648, 0xa080, 0x001b, 0x00c0, 0x164b,</div><div class='del'>-	0x2009, 0x0138, 0x200a, 0x7000, 0xa005, 0x00c0, 0x1651, 0x1078,</div><div class='del'>-	0x17c1, 0x127f, 0x007c, 0x127e, 0x027e, 0x037e, 0x0c7e, 0x007e,</div><div class='del'>-	0x2091, 0x2100, 0x007f, 0x047f, 0x037f, 0x027f, 0x0d7e, 0x0c7e,</div><div class='del'>-	0x2460, 0x6110, 0x2168, 0x6a62, 0x6b5e, 0xa005, 0x0040, 0x16dd,</div><div class='del'>-	0x6808, 0xa005, 0x0040, 0x174a, 0x7000, 0xa005, 0x00c0, 0x1672,</div><div class='del'>-	0x0078, 0x16d2, 0x700c, 0x7110, 0xa106, 0x00c0, 0x1753, 0x7004,</div><div class='del'>-	0xa406, 0x00c0, 0x16d2, 0x2001, 0x0005, 0x2004, 0xd08c, 0x0040,</div><div class='del'>-	0x168f, 0x047e, 0x1078, 0x1913, 0x047f, 0x2460, 0x6010, 0xa080,</div><div class='del'>-	0x0002, 0x2004, 0xa005, 0x0040, 0x174a, 0x0078, 0x166c, 0x2001,</div><div class='del'>-	0x0207, 0x2004, 0xd09c, 0x00c0, 0x167b, 0x7804, 0xa084, 0x6000,</div><div class='del'>-	0x0040, 0x16a0, 0xa086, 0x6000, 0x0040, 0x16a0, 0x0078, 0x167b,</div><div class='del'>-	0x7100, 0xa186, 0x0002, 0x00c0, 0x16c0, 0x0e7e, 0x2b68, 0x6818,</div><div class='del'>-	0x2060, 0x1078, 0x203f, 0x2804, 0xac70, 0x6034, 0xd09c, 0x00c0,</div><div class='del'>-	0x16b5, 0x7108, 0x720c, 0x0078, 0x16b7, 0x7110, 0x7214, 0x6810,</div><div class='del'>-	0xa100, 0x6812, 0x6814, 0xa201, 0x6816, 0x0e7f, 0x0078, 0x16c4,</div><div class='del'>-	0xa186, 0x0001, 0x00c0, 0x16cc, 0x7820, 0x6910, 0xa100, 0x6812,</div><div class='del'>-	0x7824, 0x6914, 0xa101, 0x6816, 0x7803, 0x0004, 0x7003, 0x0000,</div><div class='del'>-	0x7004, 0x2060, 0x6100, 0xa18e, 0x0004, 0x00c0, 0x1753, 0x2009,</div><div class='del'>-	0x0048, 0x1078, 0x775c, 0x0078, 0x1753, 0x6808, 0xa005, 0x0040,</div><div class='del'>-	0x174a, 0x7000, 0xa005, 0x00c0, 0x16e7, 0x0078, 0x174a, 0x700c,</div><div class='del'>-	0x7110, 0xa106, 0x00c0, 0x16f0, 0x7004, 0xa406, 0x00c0, 0x174a,</div><div class='del'>-	0x2001, 0x0005, 0x2004, 0xd08c, 0x0040, 0x1704, 0x047e, 0x1078,</div><div class='del'>-	0x1913, 0x047f, 0x2460, 0x6010, 0xa080, 0x0002, 0x2004, 0xa005,</div><div class='del'>-	0x0040, 0x174a, 0x0078, 0x16e1, 0x2001, 0x0207, 0x2004, 0xd09c,</div><div class='del'>-	0x00c0, 0x16f0, 0x2001, 0x0005, 0x2004, 0xd08c, 0x00c0, 0x16f6,</div><div class='del'>-	0x7804, 0xa084, 0x6000, 0x0040, 0x171b, 0xa086, 0x6000, 0x0040,</div><div class='del'>-	0x171b, 0x0078, 0x16f0, 0x7007, 0x0000, 0xa016, 0x2218, 0x7000,</div><div class='del'>-	0xa08e, 0x0001, 0x0040, 0x173c, 0xa08e, 0x0002, 0x00c0, 0x174a,</div><div class='del'>-	0x0c7e, 0x0e7e, 0x6818, 0x2060, 0x1078, 0x203f, 0x2804, 0xac70,</div><div class='del'>-	0x6034, 0xd09c, 0x00c0, 0x1738, 0x7308, 0x720c, 0x0078, 0x173a,</div><div class='del'>-	0x7310, 0x7214, 0x0e7f, 0x0c7f, 0x7820, 0xa318, 0x7824, 0xa211,</div><div class='del'>-	0x6810, 0xa300, 0x6812, 0x6814, 0xa201, 0x6816, 0x7803, 0x0004,</div><div class='del'>-	0x7003, 0x0000, 0x6100, 0xa18e, 0x0004, 0x00c0, 0x1753, 0x2009,</div><div class='del'>-	0x0048, 0x1078, 0x775c, 0x0c7f, 0x0d7f, 0x127f, 0x007c, 0x0f7e,</div><div class='del'>-	0x0e7e, 0x027e, 0x037e, 0x047e, 0x057e, 0x2071, 0xa9e7, 0x7000,</div><div class='del'>-	0xa086, 0x0000, 0x0040, 0x17ba, 0x7004, 0xac06, 0x00c0, 0x17ab,</div><div class='del'>-	0x2079, 0x0030, 0x7000, 0xa086, 0x0003, 0x0040, 0x17ab, 0x7804,</div><div class='del'>-	0xd0fc, 0x00c0, 0x17a7, 0x20e1, 0x6000, 0x2011, 0x0032, 0x2001,</div><div class='del'>-	0x0208, 0x200c, 0x2001, 0x0209, 0x2004, 0xa106, 0x00c0, 0x176f,</div><div class='del'>-	0x8211, 0x00c0, 0x1777, 0x7804, 0xd0fc, 0x00c0, 0x17a7, 0x1078,</div><div class='del'>-	0x1b22, 0x027e, 0x057e, 0x7803, 0x0004, 0x7804, 0xd0ac, 0x00c0,</div><div class='del'>-	0x178d, 0x7803, 0x0002, 0x7803, 0x0009, 0x7003, 0x0003, 0x7007,</div><div class='del'>-	0x0000, 0x057f, 0x027f, 0x2001, 0x015d, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x0160, 0x2502, 0x2001, 0x0138, 0x2202, 0x0078, 0x17ab, 0x1078,</div><div class='del'>-	0x1913, 0x0078, 0x175f, 0x157e, 0x20a9, 0x0009, 0x2009, 0xa9ed,</div><div class='del'>-	0x2104, 0xac06, 0x00c0, 0x17b5, 0x200a, 0xa188, 0x0003, 0x00f0,</div><div class='del'>-	0x17b0, 0x157f, 0x057f, 0x047f, 0x037f, 0x027f, 0x0e7f, 0x0f7f,</div><div class='del'>-	0x007c, 0x700c, 0x7110, 0xa106, 0x00c0, 0x17c9, 0x7003, 0x0000,</div><div class='del'>-	0x007c, 0x2104, 0x7006, 0x2060, 0x8108, 0x211c, 0x8108, 0x2124,</div><div class='del'>-	0x8108, 0xa182, 0xaa08, 0x0048, 0x17d7, 0x2009, 0xa9ed, 0x7112,</div><div class='del'>-	0x700c, 0xa106, 0x00c0, 0x17e0, 0x2001, 0x0138, 0x2003, 0x0008,</div><div class='del'>-	0x8cff, 0x00c0, 0x17e7, 0x1078, 0x1b4d, 0x0078, 0x1854, 0x6010,</div><div class='del'>-	0x2068, 0x2d58, 0x6828, 0xa406, 0x00c0, 0x17f2, 0x682c, 0xa306,</div><div class='del'>-	0x0040, 0x182f, 0x601c, 0xa086, 0x0008, 0x0040, 0x182f, 0x6024,</div><div class='del'>-	0xd0f4, 0x00c0, 0x181c, 0xd0d4, 0x0040, 0x1818, 0x6038, 0xa402,</div><div class='del'>-	0x6034, 0xa303, 0x0040, 0x1806, 0x00c8, 0x1818, 0x643a, 0x6336,</div><div class='del'>-	0x6c2a, 0x6b2e, 0x047e, 0x037e, 0x2400, 0x6c7c, 0xa402, 0x6812,</div><div class='del'>-	0x2300, 0x6b80, 0xa303, 0x6816, 0x037f, 0x047f, 0x0078, 0x181c,</div><div class='del'>-	0x1078, 0x9063, 0x0040, 0x17e3, 0x2001, 0xa774, 0x2004, 0xd0b4,</div><div class='del'>-	0x00c0, 0x182b, 0x6018, 0x2004, 0xd0bc, 0x00c0, 0x182b, 0x6817,</div><div class='del'>-	0x7fff, 0x6813, 0xffff, 0x1078, 0x208a, 0x00c0, 0x17e3, 0x0c7e,</div><div class='del'>-	0x7004, 0x2060, 0x6024, 0xc0d4, 0x6026, 0x0c7f, 0x684c, 0xd0f4,</div><div class='del'>-	0x0040, 0x1840, 0x6817, 0xffff, 0x6813, 0xffff, 0x0078, 0x17e3,</div><div class='del'>-	0x6824, 0x2050, 0x6818, 0x2060, 0x6830, 0x2040, 0x6034, 0xa0cc,</div><div class='del'>-	0x000f, 0x2009, 0x0011, 0x1078, 0x1855, 0x0040, 0x1853, 0x2009,</div><div class='del'>-	0x0001, 0x1078, 0x1855, 0x2d58, 0x007c, 0x8aff, 0x0040, 0x18ec,</div><div class='del'>-	0xa03e, 0x2730, 0x6850, 0xd0fc, 0x00c0, 0x1877, 0xd0f4, 0x00c0,</div><div class='del'>-	0x1887, 0x0d7e, 0x2804, 0xac68, 0x2900, 0x0079, 0x1867, 0x18ce,</div><div class='del'>-	0x188e, 0x188e, 0x18ce, 0x18ce, 0x18c6, 0x18ce, 0x188e, 0x18ce,</div><div class='del'>-	0x1894, 0x1894, 0x18ce, 0x18ce, 0x18ce, 0x18bd, 0x1894, 0xc0fc,</div><div class='del'>-	0x6852, 0x6b6c, 0x6a70, 0x6d1c, 0x6c20, 0x0d7e, 0xd99c, 0x0040,</div><div class='del'>-	0x18d1, 0x2804, 0xac68, 0x6f08, 0x6e0c, 0x0078, 0x18d1, 0xc0f4,</div><div class='del'>-	0x6852, 0x6b6c, 0x6a70, 0x0d7e, 0x0078, 0x18d8, 0x6b08, 0x6a0c,</div><div class='del'>-	0x6d00, 0x6c04, 0x0078, 0x18d1, 0x7b0c, 0xd3bc, 0x0040, 0x18b5,</div><div class='del'>-	0x7004, 0x0e7e, 0x2070, 0x701c, 0x0e7f, 0xa086, 0x0008, 0x00c0,</div><div class='del'>-	0x18b5, 0x7b08, 0xa39c, 0x0fff, 0x2d20, 0x0d7f, 0x0d7e, 0x6a14,</div><div class='del'>-	0x82ff, 0x00c0, 0x18b0, 0x6810, 0xa302, 0x0048, 0x18b0, 0x6b10,</div><div class='del'>-	0x2011, 0x0000, 0x2468, 0x0078, 0x18b7, 0x6b10, 0x6a14, 0x6d00,</div><div class='del'>-	0x6c04, 0x6f08, 0x6e0c, 0x0078, 0x18d1, 0x0d7f, 0x0d7e, 0x6834,</div><div class='del'>-	0xa084, 0x00ff, 0xa086, 0x001e, 0x00c0, 0x18ce, 0x0d7f, 0x1078,</div><div class='del'>-	0x2026, 0x00c0, 0x1855, 0xa00e, 0x0078, 0x18ec, 0x0d7f, 0x1078,</div><div class='del'>-	0x1332, 0x7b22, 0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7902,</div><div class='del'>-	0x7000, 0x8000, 0x7002, 0x0d7f, 0x6828, 0xa300, 0x682a, 0x682c,</div><div class='del'>-	0xa201, 0x682e, 0x2300, 0x6b10, 0xa302, 0x6812, 0x2200, 0x6a14,</div><div class='del'>-	0xa203, 0x6816, 0x1078, 0x2026, 0x007c, 0x1078, 0x1332, 0x1078,</div><div class='del'>-	0x1c97, 0x7004, 0x2060, 0x0d7e, 0x6010, 0x2068, 0x7003, 0x0000,</div><div class='del'>-	0x1078, 0x1af4, 0x1078, 0x8d16, 0x0040, 0x190c, 0x6808, 0x8001,</div><div class='del'>-	0x680a, 0x697c, 0x6912, 0x6980, 0x6916, 0x682b, 0xffff, 0x682f,</div><div class='del'>-	0xffff, 0x6850, 0xc0bd, 0x6852, 0x0d7f, 0x1078, 0x8a11, 0x0078,</div><div class='del'>-	0x1adb, 0x1078, 0x1332, 0x127e, 0x2091, 0x2100, 0x007e, 0x017e,</div><div class='del'>-	0x2b68, 0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184, 0x0700,</div><div class='del'>-	0x00c0, 0x18ef, 0xa184, 0x0003, 0xa086, 0x0003, 0x0040, 0x1911,</div><div class='del'>-	0x7000, 0x0079, 0x192b, 0x1933, 0x1935, 0x1a34, 0x1ab2, 0x1ac9,</div><div class='del'>-	0x1933, 0x1933, 0x1933, 0x1078, 0x1332, 0x8001, 0x7002, 0xa184,</div><div class='del'>-	0x0880, 0x00c0, 0x194a, 0x8aff, 0x0040, 0x19d4, 0x2009, 0x0001,</div><div class='del'>-	0x1078, 0x1855, 0x0040, 0x1adb, 0x2009, 0x0001, 0x1078, 0x1855,</div><div class='del'>-	0x0078, 0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc, 0x00c0,</div><div class='del'>-	0x19b2, 0x027e, 0x037e, 0x017e, 0x7808, 0xd0ec, 0x00c0, 0x1962,</div><div class='del'>-	0x7c20, 0x7d24, 0x7e30, 0x7f34, 0x7803, 0x0009, 0x7003, 0x0004,</div><div class='del'>-	0x0078, 0x1964, 0x1078, 0x1bd7, 0x017f, 0xd194, 0x0040, 0x196b,</div><div class='del'>-	0x8aff, 0x0040, 0x19a1, 0x6b28, 0x6a2c, 0x2400, 0x686e, 0xa31a,</div><div class='del'>-	0x2500, 0x6872, 0xa213, 0x6b2a, 0x6a2e, 0x0c7e, 0x7004, 0x2060,</div><div class='del'>-	0x6024, 0xd0f4, 0x00c0, 0x197e, 0x633a, 0x6236, 0x0c7f, 0x2400,</div><div class='del'>-	0x6910, 0xa100, 0x6812, 0x2500, 0x6914, 0xa101, 0x6816, 0x037f,</div><div class='del'>-	0x027f, 0x2600, 0x681e, 0x2700, 0x6822, 0x1078, 0x203f, 0x2a00,</div><div class='del'>-	0x6826, 0x2c00, 0x681a, 0x2800, 0x6832, 0x6850, 0xc0fd, 0x6852,</div><div class='del'>-	0x6808, 0x8001, 0x680a, 0x00c0, 0x19a7, 0x684c, 0xd0e4, 0x0040,</div><div class='del'>-	0x19a7, 0x7004, 0x2060, 0x2009, 0x0048, 0x1078, 0x775c, 0x7000,</div><div class='del'>-	0xa086, 0x0004, 0x0040, 0x1adb, 0x7003, 0x0000, 0x1078, 0x17c1,</div><div class='del'>-	0x0078, 0x1adb, 0x057e, 0x7d0c, 0xd5bc, 0x00c0, 0x19b9, 0x1078,</div><div class='del'>-	0xa58e, 0x057f, 0x1078, 0x1af4, 0x0f7e, 0x7004, 0x2078, 0x1078,</div><div class='del'>-	0x4963, 0x0040, 0x19c6, 0x7824, 0xc0f5, 0x7826, 0x0f7f, 0x682b,</div><div class='del'>-	0xffff, 0x682f, 0xffff, 0x6808, 0x8001, 0x680a, 0x697c, 0x6912,</div><div class='del'>-	0x6980, 0x6916, 0x0078, 0x1adb, 0x7004, 0x0c7e, 0x2060, 0x6024,</div><div class='del'>-	0x0c7f, 0xd0f4, 0x0040, 0x19e1, 0x6808, 0x8001, 0x680a, 0x0078,</div><div class='del'>-	0x19f5, 0x684c, 0xc0f5, 0x684e, 0x7814, 0xa005, 0x00c0, 0x19f9,</div><div class='del'>-	0x7003, 0x0000, 0x6808, 0x8001, 0x680a, 0x00c0, 0x19f5, 0x7004,</div><div class='del'>-	0x2060, 0x2009, 0x0048, 0x1078, 0x775c, 0x1078, 0x17c1, 0x0078,</div><div class='del'>-	0x1adb, 0x7814, 0x6910, 0xa102, 0x6812, 0x6914, 0xa183, 0x0000,</div><div class='del'>-	0x6816, 0x7814, 0x7908, 0xa18c, 0x0fff, 0xa192, 0x0841, 0x00c8,</div><div class='del'>-	0x18ef, 0xa188, 0x0007, 0x8114, 0x8214, 0x8214, 0xa10a, 0x8104,</div><div class='del'>-	0x8004, 0x8004, 0xa20a, 0x810b, 0x810b, 0x810b, 0x1078, 0x1b5e,</div><div class='del'>-	0x7803, 0x0004, 0x780f, 0xffff, 0x7803, 0x0001, 0x7804, 0xd0fc,</div><div class='del'>-	0x0040, 0x1a1e, 0x7803, 0x0002, 0x7803, 0x0004, 0x780f, 0x0076,</div><div class='del'>-	0x7004, 0x7007, 0x0000, 0x2060, 0x2009, 0x0048, 0x1078, 0x775c,</div><div class='del'>-	0x1078, 0x1b92, 0x0040, 0x19f5, 0x8001, 0x7002, 0xd194, 0x0040,</div><div class='del'>-	0x1a46, 0x7804, 0xd0fc, 0x00c0, 0x191b, 0x8aff, 0x0040, 0x1adb,</div><div class='del'>-	0x2009, 0x0001, 0x1078, 0x1855, 0x0078, 0x1adb, 0xa184, 0x0880,</div><div class='del'>-	0x00c0, 0x1a53, 0x8aff, 0x0040, 0x1adb, 0x2009, 0x0001, 0x1078,</div><div class='del'>-	0x1855, 0x0078, 0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc,</div><div class='del'>-	0x00c0, 0x1a93, 0x027e, 0x037e, 0x7808, 0xd0ec, 0x00c0, 0x1a66,</div><div class='del'>-	0x7803, 0x0009, 0x7003, 0x0004, 0x0078, 0x1a68, 0x1078, 0x1bd7,</div><div class='del'>-	0x6b28, 0x6a2c, 0x1078, 0x203f, 0x0d7e, 0x0f7e, 0x2d78, 0x2804,</div><div class='del'>-	0xac68, 0x6034, 0xd09c, 0x00c0, 0x1a83, 0x6808, 0x2008, 0xa31a,</div><div class='del'>-	0x680c, 0xa213, 0x7810, 0xa100, 0x7812, 0x690c, 0x7814, 0xa101,</div><div class='del'>-	0x7816, 0x0078, 0x1a8f, 0x6810, 0x2008, 0xa31a, 0x6814, 0xa213,</div><div class='del'>-	0x7810, 0xa100, 0x7812, 0x6914, 0x7814, 0xa101, 0x7816, 0x0f7f,</div><div class='del'>-	0x0d7f, 0x0078, 0x196d, 0x057e, 0x7d0c, 0x1078, 0xa58e, 0x057f,</div><div class='del'>-	0x1078, 0x1af4, 0x0f7e, 0x7004, 0x2078, 0x1078, 0x4963, 0x0040,</div><div class='del'>-	0x1aa4, 0x7824, 0xc0f5, 0x7826, 0x0f7f, 0x682b, 0xffff, 0x682f,</div><div class='del'>-	0xffff, 0x6808, 0x8001, 0x680a, 0x697c, 0x6912, 0x6980, 0x6916,</div><div class='del'>-	0x0078, 0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0xa00d,</div><div class='del'>-	0x0040, 0x1ac5, 0x6808, 0x8001, 0x680a, 0x00c0, 0x1ac5, 0x7004,</div><div class='del'>-	0x2060, 0x2009, 0x0048, 0x1078, 0x775c, 0x1078, 0x17c1, 0x0078,</div><div class='del'>-	0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060, 0x6010,</div><div class='del'>-	0xa005, 0x0040, 0x1ac5, 0x2068, 0x6808, 0x8000, 0x680a, 0x6c28,</div><div class='del'>-	0x6b2c, 0x1078, 0x17e0, 0x017f, 0x007f, 0x127f, 0x007c, 0x127e,</div><div class='del'>-	0x2091, 0x2100, 0x7000, 0xa086, 0x0003, 0x00c0, 0x1af2, 0x700c,</div><div class='del'>-	0x7110, 0xa106, 0x0040, 0x1af2, 0x20e1, 0x9028, 0x700f, 0xa9ed,</div><div class='del'>-	0x7013, 0xa9ed, 0x127f, 0x007c, 0x0c7e, 0x1078, 0x1b22, 0x20e1,</div><div class='del'>-	0x9028, 0x700c, 0x7110, 0xa106, 0x0040, 0x1b19, 0x2104, 0xa005,</div><div class='del'>-	0x0040, 0x1b08, 0x2060, 0x6010, 0x2060, 0x6008, 0x8001, 0x600a,</div><div class='del'>-	0xa188, 0x0003, 0xa182, 0xaa08, 0x0048, 0x1b10, 0x2009, 0xa9ed,</div><div class='del'>-	0x7112, 0x700c, 0xa106, 0x00c0, 0x1af9, 0x2011, 0x0008, 0x0078,</div><div class='del'>-	0x1af9, 0x2001, 0x015d, 0x2003, 0x0000, 0x2001, 0x0138, 0x2202,</div><div class='del'>-	0x0c7f, 0x007c, 0x2001, 0x0138, 0x2014, 0x2003, 0x0000, 0x2021,</div><div class='del'>-	0xb015, 0x2001, 0x0141, 0x201c, 0xd3dc, 0x00c0, 0x1b3f, 0x2001,</div><div class='del'>-	0x0109, 0x201c, 0xa39c, 0x0048, 0x00c0, 0x1b3f, 0x2001, 0x0111,</div><div class='del'>-	0x201c, 0x83ff, 0x00c0, 0x1b3f, 0x8421, 0x00c0, 0x1b29, 0x007c,</div><div class='del'>-	0x2011, 0x0201, 0x2009, 0x003c, 0x2204, 0xa005, 0x00c0, 0x1b4c,</div><div class='del'>-	0x8109, 0x00c0, 0x1b44, 0x007c, 0x007c, 0x1078, 0x1b40, 0x0040,</div><div class='del'>-	0x1b55, 0x780c, 0xd0a4, 0x0040, 0x1b5b, 0x1078, 0x1af4, 0xa085,</div><div class='del'>-	0x0001, 0x0078, 0x1b5d, 0x1078, 0x1b92, 0x007c, 0x0e7e, 0x2071,</div><div class='del'>-	0x0200, 0x7808, 0xa084, 0xf000, 0xa10d, 0x1078, 0x1b22, 0x2019,</div><div class='del'>-	0x5000, 0x8319, 0x0040, 0x1b7c, 0x2001, 0xaa08, 0x2004, 0xa086,</div><div class='del'>-	0x0000, 0x0040, 0x1b7c, 0x2001, 0x0021, 0xd0fc, 0x0040, 0x1b69,</div><div class='del'>-	0x1078, 0x1eaa, 0x0078, 0x1b67, 0x20e1, 0x7000, 0x7324, 0x7420,</div><div class='del'>-	0x7028, 0x7028, 0x7426, 0x7037, 0x0001, 0x810f, 0x712e, 0x702f,</div><div class='del'>-	0x0100, 0x7037, 0x0008, 0x7326, 0x7422, 0x2001, 0x0138, 0x2202,</div><div class='del'>-	0x0e7f, 0x007c, 0x027e, 0x2001, 0x015d, 0x2001, 0x0000, 0x7908,</div><div class='del'>-	0xa18c, 0x0fff, 0xa182, 0x0ffd, 0x0048, 0x1ba0, 0x2009, 0x0000,</div><div class='del'>-	0xa190, 0x0007, 0xa294, 0x1ff8, 0x8214, 0x8214, 0x8214, 0x2001,</div><div class='del'>-	0x020a, 0x82ff, 0x0040, 0x1bb5, 0x20e1, 0x6000, 0x200c, 0x200c,</div><div class='del'>-	0x200c, 0x200c, 0x8211, 0x00c0, 0x1bae, 0x20e1, 0x7000, 0x200c,</div><div class='del'>-	0x200c, 0x7003, 0x0000, 0x20e1, 0x6000, 0x2001, 0x0208, 0x200c,</div><div class='del'>-	0x2001, 0x0209, 0x2004, 0xa106, 0x0040, 0x1bd4, 0x1078, 0x1b40,</div><div class='del'>-	0x0040, 0x1bd2, 0x7908, 0xd1ec, 0x00c0, 0x1bd4, 0x790c, 0xd1a4,</div><div class='del'>-	0x0040, 0x1b97, 0x1078, 0x1af4, 0xa006, 0x027f, 0x007c, 0x7c20,</div><div class='del'>-	0x7d24, 0x7e30, 0x7f34, 0x700c, 0x7110, 0xa106, 0x0040, 0x1c69,</div><div class='del'>-	0x7004, 0x017e, 0x210c, 0xa106, 0x017f, 0x0040, 0x1c69, 0x0d7e,</div><div class='del'>-	0x0c7e, 0x216c, 0x2d00, 0xa005, 0x0040, 0x1c67, 0x681c, 0xa086,</div><div class='del'>-	0x0008, 0x0040, 0x1c67, 0x6824, 0xd0d4, 0x00c0, 0x1c67, 0x6810,</div><div class='del'>-	0x2068, 0x6850, 0xd0fc, 0x0040, 0x1c29, 0x8108, 0x2104, 0x6b2c,</div><div class='del'>-	0xa306, 0x00c0, 0x1c67, 0x8108, 0x2104, 0x6a28, 0xa206, 0x00c0,</div><div class='del'>-	0x1c67, 0x6850, 0xc0fc, 0xc0f5, 0x6852, 0x686c, 0x7822, 0x6870,</div><div class='del'>-	0x7826, 0x681c, 0x7832, 0x6820, 0x7836, 0x6818, 0x2060, 0x6034,</div><div class='del'>-	0xd09c, 0x0040, 0x1c24, 0x6830, 0x2004, 0xac68, 0x6808, 0x783a,</div><div class='del'>-	0x680c, 0x783e, 0x0078, 0x1c65, 0xa006, 0x783a, 0x783e, 0x0078,</div><div class='del'>-	0x1c65, 0x8108, 0x2104, 0xa005, 0x00c0, 0x1c67, 0x6b2c, 0xa306,</div><div class='del'>-	0x00c0, 0x1c67, 0x8108, 0x2104, 0xa005, 0x00c0, 0x1c67, 0x6a28,</div><div class='del'>-	0xa206, 0x00c0, 0x1c67, 0x6850, 0xc0f5, 0x6852, 0x6830, 0x2004,</div><div class='del'>-	0x6918, 0xa160, 0xa180, 0x000d, 0x2004, 0xd09c, 0x00c0, 0x1c57,</div><div class='del'>-	0x6008, 0x7822, 0x686e, 0x600c, 0x7826, 0x6872, 0x6000, 0x7832,</div><div class='del'>-	0x6004, 0x7836, 0xa006, 0x783a, 0x783e, 0x0078, 0x1c65, 0x6010,</div><div class='del'>-	0x7822, 0x686e, 0x6014, 0x7826, 0x6872, 0x6000, 0x7832, 0x6004,</div><div class='del'>-	0x7836, 0x6008, 0x783a, 0x600c, 0x783e, 0x7803, 0x0011, 0x0c7f,</div><div class='del'>-	0x0d7f, 0x007c, 0x0f7e, 0x0e7e, 0x017e, 0x027e, 0x2071, 0xa9e7,</div><div class='del'>-	0x2079, 0x0030, 0x2011, 0x0050, 0x7000, 0xa086, 0x0000, 0x0040,</div><div class='del'>-	0x1c92, 0x8211, 0x0040, 0x1c90, 0x2001, 0x0005, 0x2004, 0xd08c,</div><div class='del'>-	0x0040, 0x1c79, 0x7904, 0xa18c, 0x0780, 0x017e, 0x1078, 0x1913,</div><div class='del'>-	0x017f, 0x81ff, 0x00c0, 0x1c90, 0x2011, 0x0050, 0x0078, 0x1c74,</div><div class='del'>-	0xa085, 0x0001, 0x027f, 0x017f, 0x0e7f, 0x0f7f, 0x007c, 0x7803,</div><div class='del'>-	0x0004, 0x2009, 0x0064, 0x7804, 0xd0ac, 0x0040, 0x1ce8, 0x8109,</div><div class='del'>-	0x00c0, 0x1c9b, 0x2009, 0x0100, 0x210c, 0xa18a, 0x0003, 0x1048,</div><div class='del'>-	0x1332, 0x1078, 0x1fca, 0x0e7e, 0x0f7e, 0x2071, 0xa9d6, 0x2079,</div><div class='del'>-	0x0010, 0x7004, 0xa086, 0x0000, 0x0040, 0x1ce0, 0x7800, 0x007e,</div><div class='del'>-	0x7820, 0x007e, 0x7830, 0x007e, 0x7834, 0x007e, 0x7838, 0x007e,</div><div class='del'>-	0x783c, 0x007e, 0x7803, 0x0004, 0x7823, 0x0000, 0x0005, 0x0005,</div><div class='del'>-	0x2079, 0x0030, 0x7804, 0xd0ac, 0x10c0, 0x1332, 0x2079, 0x0010,</div><div class='del'>-	0x007f, 0x783e, 0x007f, 0x783a, 0x007f, 0x7836, 0x007f, 0x7832,</div><div class='del'>-	0x007f, 0x7822, 0x007f, 0x7802, 0x0f7f, 0x0e7f, 0x0078, 0x1ce6,</div><div class='del'>-	0x0f7f, 0x0e7f, 0x7804, 0xd0ac, 0x10c0, 0x1332, 0x1078, 0x639b,</div><div class='del'>-	0x007c, 0x0e7e, 0x2071, 0xaa08, 0x7003, 0x0000, 0x0e7f, 0x007c,</div><div class='del'>-	0x0d7e, 0xa280, 0x0004, 0x206c, 0x694c, 0xd1dc, 0x00c0, 0x1d6b,</div><div class='del'>-	0x6934, 0xa184, 0x0007, 0x0079, 0x1cfd, 0x1d05, 0x1d56, 0x1d05,</div><div class='del'>-	0x1d05, 0x1d05, 0x1d3b, 0x1d18, 0x1d07, 0x1078, 0x1332, 0x684c,</div><div class='del'>-	0xd0b4, 0x0040, 0x1e79, 0x6860, 0x682e, 0x6816, 0x685c, 0x682a,</div><div class='del'>-	0x6812, 0x687c, 0x680a, 0x6880, 0x680e, 0x6958, 0x0078, 0x1d5e,</div><div class='del'>-	0x6834, 0xa084, 0x00ff, 0xa086, 0x001e, 0x00c0, 0x1d05, 0x684c,</div><div class='del'>-	0xd0b4, 0x0040, 0x1e79, 0x6860, 0x682e, 0x6816, 0x685c, 0x682a,</div><div class='del'>-	0x6812, 0x687c, 0x680a, 0x6880, 0x680e, 0x6804, 0x681a, 0xa080,</div><div class='del'>-	0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004, 0x6832,</div><div class='del'>-	0x6958, 0x0078, 0x1d67, 0xa18c, 0x00ff, 0xa186, 0x0015, 0x00c0,</div><div class='del'>-	0x1d6b, 0x684c, 0xd0b4, 0x0040, 0x1e79, 0x6804, 0x681a, 0xa080,</div><div class='del'>-	0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004, 0x6832,</div><div class='del'>-	0x6958, 0xa006, 0x682e, 0x682a, 0x0078, 0x1d67, 0x684c, 0xd0b4,</div><div class='del'>-	0x0040, 0x18ed, 0x6958, 0xa006, 0x682e, 0x682a, 0x2d00, 0x681a,</div><div class='del'>-	0x6834, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004, 0x6832, 0x6926,</div><div class='del'>-	0x684c, 0xc0dd, 0x684e, 0x0d7f, 0x007c, 0x0f7e, 0x2079, 0x0020,</div><div class='del'>-	0x7804, 0xd0fc, 0x10c0, 0x1eaa, 0x0e7e, 0x0d7e, 0x2071, 0xaa08,</div><div class='del'>-	0x7000, 0xa005, 0x00c0, 0x1df0, 0x0c7e, 0x7206, 0xa280, 0x0004,</div><div class='del'>-	0x205c, 0x7004, 0x2068, 0x7803, 0x0004, 0x6818, 0x0d7e, 0x2068,</div><div class='del'>-	0x686c, 0x7812, 0x6890, 0x0f7e, 0x20e1, 0x9040, 0x2079, 0x0200,</div><div class='del'>-	0x781a, 0x2079, 0x0100, 0x8004, 0x78d6, 0x0f7f, 0x0d7f, 0x2b68,</div><div class='del'>-	0x6824, 0x2050, 0x6818, 0x2060, 0x6830, 0x2040, 0x6034, 0xa0cc,</div><div class='del'>-	0x000f, 0x6908, 0x2001, 0x04fd, 0x2004, 0xa086, 0x0007, 0x0040,</div><div class='del'>-	0x1db2, 0xa184, 0x0007, 0x0040, 0x1db2, 0x017e, 0x2009, 0x0008,</div><div class='del'>-	0xa102, 0x017f, 0xa108, 0x791a, 0x7116, 0x701e, 0x680c, 0xa081,</div><div class='del'>-	0x0000, 0x781e, 0x701a, 0xa006, 0x700e, 0x7012, 0x7004, 0x692c,</div><div class='del'>-	0x6814, 0xa106, 0x00c0, 0x1dc9, 0x6928, 0x6810, 0xa106, 0x0040,</div><div class='del'>-	0x1dd6, 0x037e, 0x047e, 0x6b14, 0x6c10, 0x1078, 0x208a, 0x047f,</div><div class='del'>-	0x037f, 0x0040, 0x1dd6, 0x0c7f, 0x0078, 0x1df0, 0x8aff, 0x00c0,</div><div class='del'>-	0x1dde, 0x0c7f, 0xa085, 0x0001, 0x0078, 0x1df0, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x2079, 0x0020, 0x2009, 0x0001, 0x1078, 0x1df4, 0x0040,</div><div class='del'>-	0x1ded, 0x2009, 0x0001, 0x1078, 0x1df4, 0x127f, 0x0c7f, 0xa006,</div><div class='del'>-	0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x077e, 0x067e, 0x057e, 0x047e,</div><div class='del'>-	0x037e, 0x027e, 0x8aff, 0x0040, 0x1e72, 0x700c, 0x7214, 0xa23a,</div><div class='del'>-	0x7010, 0x7218, 0xa203, 0x0048, 0x1e71, 0xa705, 0x0040, 0x1e71,</div><div class='del'>-	0xa03e, 0x2730, 0x6850, 0xd0fc, 0x00c0, 0x1e24, 0x0d7e, 0x2804,</div><div class='del'>-	0xac68, 0x2900, 0x0079, 0x1e14, 0x1e53, 0x1e34, 0x1e34, 0x1e53,</div><div class='del'>-	0x1e53, 0x1e4b, 0x1e53, 0x1e34, 0x1e53, 0x1e3a, 0x1e3a, 0x1e53,</div><div class='del'>-	0x1e53, 0x1e53, 0x1e42, 0x1e3a, 0xc0fc, 0x6852, 0x6b6c, 0x6a70,</div><div class='del'>-	0x6d1c, 0x6c20, 0xd99c, 0x0040, 0x1e57, 0x0d7e, 0x2804, 0xac68,</div><div class='del'>-	0x6f08, 0x6e0c, 0x0078, 0x1e56, 0x6b08, 0x6a0c, 0x6d00, 0x6c04,</div><div class='del'>-	0x0078, 0x1e56, 0x6b10, 0x6a14, 0x6d00, 0x6c04, 0x6f08, 0x6e0c,</div><div class='del'>-	0x0078, 0x1e56, 0x0d7f, 0x0d7e, 0x6834, 0xa084, 0x00ff, 0xa086,</div><div class='del'>-	0x001e, 0x00c0, 0x1e53, 0x0d7f, 0x1078, 0x2026, 0x00c0, 0x1dfa,</div><div class='del'>-	0xa00e, 0x0078, 0x1e72, 0x0d7f, 0x1078, 0x1332, 0x0d7f, 0x7b22,</div><div class='del'>-	0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7902, 0x7000, 0x8000,</div><div class='del'>-	0x7002, 0x6828, 0xa300, 0x682a, 0x682c, 0xa201, 0x682e, 0x700c,</div><div class='del'>-	0xa300, 0x700e, 0x7010, 0xa201, 0x7012, 0x1078, 0x2026, 0x0078,</div><div class='del'>-	0x1e72, 0xa006, 0x027f, 0x037f, 0x047f, 0x057f, 0x067f, 0x077f,</div><div class='del'>-	0x007c, 0x1078, 0x1332, 0x027e, 0x2001, 0x0105, 0x2003, 0x0010,</div><div class='del'>-	0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060,</div><div class='del'>-	0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040, 0x1e92, 0x6850,</div><div class='del'>-	0xc0bd, 0x6852, 0x0d7f, 0x0c7e, 0x1078, 0x8a11, 0x0c7f, 0x2001,</div><div class='del'>-	0xa9c0, 0x2004, 0xac06, 0x00c0, 0x1ea7, 0x20e1, 0x9040, 0x1078,</div><div class='del'>-	0x738a, 0x2011, 0x0000, 0x1078, 0x70ea, 0x1078, 0x639b, 0x027f,</div><div class='del'>-	0x0078, 0x1f76, 0x127e, 0x2091, 0x2200, 0x007e, 0x017e, 0x0f7e,</div><div class='del'>-	0x0e7e, 0x0d7e, 0x0c7e, 0x2079, 0x0020, 0x2071, 0xaa08, 0x2b68,</div><div class='del'>-	0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184, 0x0700, 0x00c0,</div><div class='del'>-	0x1e7b, 0x7000, 0x0079, 0x1ec4, 0x1f76, 0x1ec8, 0x1f43, 0x1f74,</div><div class='del'>-	0x8001, 0x7002, 0xd19c, 0x00c0, 0x1edc, 0x8aff, 0x0040, 0x1efb,</div><div class='del'>-	0x2009, 0x0001, 0x1078, 0x1df4, 0x0040, 0x1f76, 0x2009, 0x0001,</div><div class='del'>-	0x1078, 0x1df4, 0x0078, 0x1f76, 0x7803, 0x0004, 0xd194, 0x0040,</div><div class='del'>-	0x1eec, 0x6850, 0xc0fc, 0x6852, 0x8aff, 0x00c0, 0x1ef1, 0x684c,</div><div class='del'>-	0xc0f5, 0x684e, 0x0078, 0x1ef1, 0x1078, 0x203f, 0x6850, 0xc0fd,</div><div class='del'>-	0x6852, 0x2a00, 0x6826, 0x2c00, 0x681a, 0x2800, 0x6832, 0x7003,</div><div class='del'>-	0x0000, 0x0078, 0x1f76, 0x711c, 0x81ff, 0x0040, 0x1f11, 0x7918,</div><div class='del'>-	0x7922, 0x7827, 0x0000, 0x7803, 0x0001, 0x7000, 0x8000, 0x7002,</div><div class='del'>-	0x700c, 0xa100, 0x700e, 0x7010, 0xa081, 0x0000, 0x7012, 0x0078,</div><div class='del'>-	0x1f76, 0x0f7e, 0x027e, 0x781c, 0x007e, 0x7818, 0x007e, 0x2079,</div><div class='del'>-	0x0100, 0x7a14, 0xa284, 0x0004, 0xa085, 0x0012, 0x7816, 0x037e,</div><div class='del'>-	0x2019, 0x1000, 0x8319, 0x1040, 0x1332, 0x7820, 0xd0bc, 0x00c0,</div><div class='del'>-	0x1f22, 0x037f, 0x79c8, 0x007f, 0xa102, 0x017f, 0x007e, 0x017e,</div><div class='del'>-	0x79c4, 0x007f, 0xa103, 0x78c6, 0x007f, 0x78ca, 0xa284, 0x0004,</div><div class='del'>-	0xa085, 0x0012, 0x7816, 0x027f, 0x0f7f, 0x7803, 0x0008, 0x7003,</div><div class='del'>-	0x0000, 0x0078, 0x1f76, 0x8001, 0x7002, 0xd194, 0x0040, 0x1f58,</div><div class='del'>-	0x7804, 0xd0fc, 0x00c0, 0x1eba, 0xd19c, 0x00c0, 0x1f72, 0x8aff,</div><div class='del'>-	0x0040, 0x1f76, 0x2009, 0x0001, 0x1078, 0x1df4, 0x0078, 0x1f76,</div><div class='del'>-	0x027e, 0x037e, 0x6b28, 0x6a2c, 0x1078, 0x203f, 0x0d7e, 0x2804,</div><div class='del'>-	0xac68, 0x6034, 0xd09c, 0x00c0, 0x1f6b, 0x6808, 0xa31a, 0x680c,</div><div class='del'>-	0xa213, 0x0078, 0x1f6f, 0x6810, 0xa31a, 0x6814, 0xa213, 0x0d7f,</div><div class='del'>-	0x0078, 0x1eec, 0x0078, 0x1eec, 0x1078, 0x1332, 0x0c7f, 0x0d7f,</div><div class='del'>-	0x0e7f, 0x0f7f, 0x017f, 0x007f, 0x127f, 0x007c, 0x0f7e, 0x0e7e,</div><div class='del'>-	0x2071, 0xaa08, 0x7000, 0xa086, 0x0000, 0x0040, 0x1fc7, 0x2079,</div><div class='del'>-	0x0020, 0x017e, 0x2009, 0x0207, 0x210c, 0xd194, 0x0040, 0x1fa4,</div><div class='del'>-	0x2009, 0x020c, 0x210c, 0xa184, 0x0003, 0x0040, 0x1fa4, 0x1078,</div><div class='del'>-	0xa5e2, 0x2001, 0x0133, 0x2004, 0xa005, 0x1040, 0x1332, 0x20e1,</div><div class='del'>-	0x9040, 0x2001, 0x020c, 0x2102, 0x2009, 0x0206, 0x2104, 0x2009,</div><div class='del'>-	0x0203, 0x210c, 0xa106, 0x00c0, 0x1faf, 0x20e1, 0x9040, 0x7804,</div><div class='del'>-	0xd0fc, 0x0040, 0x1f8a, 0x1078, 0x1eaa, 0x7000, 0xa086, 0x0000,</div><div class='del'>-	0x00c0, 0x1f8a, 0x017f, 0x7803, 0x0004, 0x7804, 0xd0ac, 0x00c0,</div><div class='del'>-	0x1fbd, 0x20e1, 0x9040, 0x7803, 0x0002, 0x7003, 0x0000, 0x0e7f,</div><div class='del'>-	0x0f7f, 0x007c, 0x027e, 0x0c7e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2071,</div><div class='del'>-	0xaa08, 0x2079, 0x0020, 0x7000, 0xa086, 0x0000, 0x0040, 0x2003,</div><div class='del'>-	0x7004, 0x2060, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040, 0x1fed,</div><div class='del'>-	0x6850, 0xc0b5, 0x6852, 0x680c, 0x7a1c, 0xa206, 0x00c0, 0x1fed,</div><div class='del'>-	0x6808, 0x7a18, 0xa206, 0x0040, 0x2009, 0x2001, 0x0105, 0x2003,</div><div class='del'>-	0x0010, 0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004,</div><div class='del'>-	0x2060, 0x1078, 0x8a11, 0x20e1, 0x9040, 0x1078, 0x738a, 0x2011,</div><div class='del'>-	0x0000, 0x1078, 0x70ea, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x027f,</div><div class='del'>-	0x007c, 0x6810, 0x6a14, 0xa205, 0x00c0, 0x1fed, 0x684c, 0xc0dc,</div><div class='del'>-	0x684e, 0x2c10, 0x1078, 0x1cf0, 0x2001, 0x0105, 0x2003, 0x0010,</div><div class='del'>-	0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x2069, 0xa9b1,</div><div class='del'>-	0x6833, 0x0000, 0x683f, 0x0000, 0x0078, 0x2003, 0x8840, 0x2804,</div><div class='del'>-	0xa005, 0x00c0, 0x203a, 0x6004, 0xa005, 0x0040, 0x203c, 0x681a,</div><div class='del'>-	0x2060, 0x6034, 0xa084, 0x000f, 0xa080, 0x206a, 0x2044, 0x88ff,</div><div class='del'>-	0x1040, 0x1332, 0x8a51, 0x007c, 0x2051, 0x0000, 0x007c, 0x8a50,</div><div class='del'>-	0x8841, 0x2804, 0xa005, 0x00c0, 0x2059, 0x2c00, 0xad06, 0x0040,</div><div class='del'>-	0x204e, 0x6000, 0xa005, 0x00c0, 0x204e, 0x2d00, 0x2060, 0x681a,</div><div class='del'>-	0x6034, 0xa084, 0x000f, 0xa080, 0x207a, 0x2044, 0x88ff, 0x1040,</div><div class='del'>-	0x1332, 0x007c, 0x0000, 0x0011, 0x0015, 0x0019, 0x001d, 0x0021,</div><div class='del'>-	0x0025, 0x0029, 0x0000, 0x000f, 0x0015, 0x001b, 0x0021, 0x0027,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x205f, 0x205b, 0x0000, 0x0000, 0x2069,</div><div class='del'>-	0x0000, 0x205f, 0x0000, 0x2066, 0x2063, 0x0000, 0x0000, 0x0000,</div><div class='del'>-	0x2069, 0x2066, 0x0000, 0x2061, 0x2061, 0x0000, 0x0000, 0x2069,</div><div class='del'>-	0x0000, 0x2061, 0x0000, 0x2067, 0x2067, 0x0000, 0x0000, 0x0000,</div><div class='del'>-	0x2069, 0x2067, 0x0a7e, 0x097e, 0x087e, 0x6b2e, 0x6c2a, 0x6858,</div><div class='del'>-	0xa055, 0x0040, 0x212d, 0x2d60, 0x6034, 0xa0cc, 0x000f, 0xa9c0,</div><div class='del'>-	0x206a, 0xa986, 0x0007, 0x0040, 0x20a5, 0xa986, 0x000e, 0x0040,</div><div class='del'>-	0x20a5, 0xa986, 0x000f, 0x00c0, 0x20a9, 0x605c, 0xa422, 0x6060,</div><div class='del'>-	0xa31b, 0x2804, 0xa045, 0x00c0, 0x20b7, 0x0050, 0x20b1, 0x0078,</div><div class='del'>-	0x212d, 0x6004, 0xa065, 0x0040, 0x212d, 0x0078, 0x2094, 0x2804,</div><div class='del'>-	0xa005, 0x0040, 0x20d5, 0xac68, 0xd99c, 0x00c0, 0x20c5, 0x6808,</div><div class='del'>-	0xa422, 0x680c, 0xa31b, 0x0078, 0x20c9, 0x6810, 0xa422, 0x6814,</div><div class='del'>-	0xa31b, 0x0048, 0x20f4, 0x2300, 0xa405, 0x0040, 0x20db, 0x8a51,</div><div class='del'>-	0x0040, 0x212d, 0x8840, 0x0078, 0x20b7, 0x6004, 0xa065, 0x0040,</div><div class='del'>-	0x212d, 0x0078, 0x2094, 0x8a51, 0x0040, 0x212d, 0x8840, 0x2804,</div><div class='del'>-	0xa005, 0x00c0, 0x20ee, 0x6004, 0xa065, 0x0040, 0x212d, 0x6034,</div><div class='del'>-	0xa0cc, 0x000f, 0xa9c0, 0x206a, 0x2804, 0x2040, 0x2b68, 0x6850,</div><div class='del'>-	0xc0fc, 0x6852, 0x0078, 0x2121, 0x8422, 0x8420, 0x831a, 0xa399,</div><div class='del'>-	0x0000, 0x0d7e, 0x2b68, 0x6c6e, 0x6b72, 0x0d7f, 0xd99c, 0x00c0,</div><div class='del'>-	0x210f, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300, 0xa11b, 0x1048,</div><div class='del'>-	0x1332, 0x6800, 0xa420, 0x6804, 0xa319, 0x0078, 0x211b, 0x6910,</div><div class='del'>-	0x2400, 0xa122, 0x6914, 0x2300, 0xa11b, 0x1048, 0x1332, 0x6800,</div><div class='del'>-	0xa420, 0x6804, 0xa319, 0x2b68, 0x6c1e, 0x6b22, 0x6850, 0xc0fd,</div><div class='del'>-	0x6852, 0x2c00, 0x681a, 0x2800, 0x6832, 0x2a00, 0x6826, 0x007f,</div><div class='del'>-	0x007f, 0x007f, 0xa006, 0x0078, 0x2132, 0x087f, 0x097f, 0x0a7f,</div><div class='del'>-	0xa085, 0x0001, 0x007c, 0x2001, 0x0005, 0x2004, 0xa084, 0x0007,</div><div class='del'>-	0x0079, 0x213a, 0x2142, 0x2143, 0x2146, 0x2149, 0x214e, 0x2151,</div><div class='del'>-	0x2156, 0x215b, 0x007c, 0x1078, 0x1eaa, 0x007c, 0x1078, 0x1913,</div><div class='del'>-	0x007c, 0x1078, 0x1913, 0x1078, 0x1eaa, 0x007c, 0x1078, 0x14be,</div><div class='del'>-	0x007c, 0x1078, 0x1eaa, 0x1078, 0x14be, 0x007c, 0x1078, 0x1913,</div><div class='del'>-	0x1078, 0x14be, 0x007c, 0x1078, 0x1913, 0x1078, 0x1eaa, 0x1078,</div><div class='del'>-	0x14be, 0x007c, 0x127e, 0x2091, 0x2300, 0x2079, 0x0200, 0x2071,</div><div class='del'>-	0xac80, 0x2069, 0xa700, 0x2009, 0x0004, 0x7912, 0x7817, 0x0004,</div><div class='del'>-	0x1078, 0x251f, 0x781b, 0x0002, 0x20e1, 0x8700, 0x127f, 0x007c,</div><div class='del'>-	0x127e, 0x2091, 0x2300, 0x781c, 0xa084, 0x0007, 0x0079, 0x2180,</div><div class='del'>-	0x21a4, 0x2188, 0x218c, 0x2190, 0x2196, 0x219a, 0x219e, 0x21a2,</div><div class='del'>-	0x1078, 0x548e, 0x0078, 0x21a4, 0x1078, 0x54da, 0x0078, 0x21a4,</div><div class='del'>-	0x1078, 0x548e, 0x1078, 0x54da, 0x0078, 0x21a4, 0x1078, 0x21a6,</div><div class='del'>-	0x0078, 0x21a4, 0x1078, 0x21a6, 0x0078, 0x21a4, 0x1078, 0x21a6,</div><div class='del'>-	0x0078, 0x21a4, 0x1078, 0x21a6, 0x127f, 0x007c, 0x007e, 0x017e,</div><div class='del'>-	0x027e, 0x1078, 0xa5e2, 0x7930, 0xa184, 0x0003, 0x0040, 0x21c9,</div><div class='del'>-	0x2001, 0xa9c0, 0x2004, 0xa005, 0x0040, 0x21c5, 0x2001, 0x0133,</div><div class='del'>-	0x2004, 0xa005, 0x1040, 0x1332, 0x0c7e, 0x2001, 0xa9c0, 0x2064,</div><div class='del'>-	0x1078, 0x8a11, 0x0c7f, 0x0078, 0x21f2, 0x20e1, 0x9040, 0x0078,</div><div class='del'>-	0x21f2, 0xa184, 0x0030, 0x0040, 0x21da, 0x6a00, 0xa286, 0x0003,</div><div class='del'>-	0x00c0, 0x21d4, 0x0078, 0x21d6, 0x1078, 0x4224, 0x20e1, 0x9010,</div><div class='del'>-	0x0078, 0x21f2, 0xa184, 0x00c0, 0x0040, 0x21ec, 0x0e7e, 0x037e,</div><div class='del'>-	0x047e, 0x057e, 0x2071, 0xa9e7, 0x1078, 0x1af4, 0x057f, 0x047f,</div><div class='del'>-	0x037f, 0x0e7f, 0x0078, 0x21f2, 0xa184, 0x0300, 0x0040, 0x21f2,</div><div class='del'>-	0x20e1, 0x9020, 0x7932, 0x027f, 0x017f, 0x007f, 0x007c, 0x017e,</div><div class='del'>-	0x0e7e, 0x0f7e, 0x2071, 0xa700, 0x7128, 0x2001, 0xa990, 0x2102,</div><div class='del'>-	0x2001, 0xa998, 0x2102, 0xa182, 0x0211, 0x00c8, 0x220b, 0x2009,</div><div class='del'>-	0x0008, 0x0078, 0x2235, 0xa182, 0x0259, 0x00c8, 0x2213, 0x2009,</div><div class='del'>-	0x0007, 0x0078, 0x2235, 0xa182, 0x02c1, 0x00c8, 0x221b, 0x2009,</div><div class='del'>-	0x0006, 0x0078, 0x2235, 0xa182, 0x0349, 0x00c8, 0x2223, 0x2009,</div><div class='del'>-	0x0005, 0x0078, 0x2235, 0xa182, 0x0421, 0x00c8, 0x222b, 0x2009,</div><div class='del'>-	0x0004, 0x0078, 0x2235, 0xa182, 0x0581, 0x00c8, 0x2233, 0x2009,</div><div class='del'>-	0x0003, 0x0078, 0x2235, 0x2009, 0x0002, 0x2079, 0x0200, 0x7912,</div><div class='del'>-	0x7817, 0x0004, 0x1078, 0x251f, 0x0f7f, 0x0e7f, 0x017f, 0x007c,</div><div class='del'>-	0x127e, 0x2091, 0x2200, 0x2061, 0x0100, 0x2071, 0xa700, 0x6024,</div><div class='del'>-	0x6026, 0x6053, 0x0030, 0x6033, 0x00ef, 0x60e7, 0x0000, 0x60eb,</div><div class='del'>-	0x00ef, 0x60e3, 0x0008, 0x604b, 0xf7f7, 0x6043, 0x0000, 0x602f,</div><div class='del'>-	0x0080, 0x602f, 0x0000, 0x6007, 0x0eaf, 0x600f, 0x00ff, 0x602b,</div><div class='del'>-	0x002f, 0x127f, 0x007c, 0x2001, 0xa730, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0xa72f, 0x2003, 0x0001, 0x007c, 0x127e, 0x2091, 0x2200, 0x007e,</div><div class='del'>-	0x017e, 0x027e, 0x6124, 0xa184, 0x002c, 0x00c0, 0x227b, 0xa184,</div><div class='del'>-	0x0007, 0x0079, 0x2281, 0xa195, 0x0004, 0xa284, 0x0007, 0x0079,</div><div class='del'>-	0x2281, 0x22ad, 0x2289, 0x228d, 0x2291, 0x2297, 0x229b, 0x22a1,</div><div class='del'>-	0x22a7, 0x1078, 0x5c56, 0x0078, 0x22ad, 0x1078, 0x5d45, 0x0078,</div><div class='del'>-	0x22ad, 0x1078, 0x5d45, 0x1078, 0x5c56, 0x0078, 0x22ad, 0x1078,</div><div class='del'>-	0x22b2, 0x0078, 0x22ad, 0x1078, 0x5c56, 0x1078, 0x22b2, 0x0078,</div><div class='del'>-	0x22ad, 0x1078, 0x5d45, 0x1078, 0x22b2, 0x0078, 0x22ad, 0x1078,</div><div class='del'>-	0x5d45, 0x1078, 0x5c56, 0x1078, 0x22b2, 0x027f, 0x017f, 0x007f,</div><div class='del'>-	0x127f, 0x007c, 0x6124, 0xd1ac, 0x0040, 0x23ac, 0x017e, 0x047e,</div><div class='del'>-	0x0c7e, 0x644c, 0xa486, 0xf0f0, 0x00c0, 0x22c5, 0x2061, 0x0100,</div><div class='del'>-	0x644a, 0x6043, 0x0090, 0x6043, 0x0010, 0x74c6, 0xa48c, 0xff00,</div><div class='del'>-	0x7034, 0xd084, 0x0040, 0x22dd, 0xa186, 0xf800, 0x00c0, 0x22dd,</div><div class='del'>-	0x703c, 0xd084, 0x00c0, 0x22dd, 0xc085, 0x703e, 0x037e, 0x2418,</div><div class='del'>-	0x2011, 0x8016, 0x1078, 0x361b, 0x037f, 0xa196, 0xff00, 0x0040,</div><div class='del'>-	0x231f, 0x6030, 0xa084, 0x00ff, 0x810f, 0xa116, 0x0040, 0x231f,</div><div class='del'>-	0x7130, 0xd184, 0x00c0, 0x231f, 0x2011, 0xa753, 0x2214, 0xd2ec,</div><div class='del'>-	0x0040, 0x22fa, 0xc18d, 0x7132, 0x2011, 0xa753, 0x2214, 0xd2ac,</div><div class='del'>-	0x00c0, 0x231f, 0x6240, 0xa294, 0x0010, 0x0040, 0x2306, 0x6248,</div><div class='del'>-	0xa294, 0xff00, 0xa296, 0xff00, 0x0040, 0x231f, 0x7030, 0xd08c,</div><div class='del'>-	0x0040, 0x2371, 0x7034, 0xd08c, 0x00c0, 0x2316, 0x2001, 0xa70c,</div><div class='del'>-	0x200c, 0xd1ac, 0x00c0, 0x2371, 0xc1ad, 0x2102, 0x037e, 0x73c4,</div><div class='del'>-	0x2011, 0x8013, 0x1078, 0x361b, 0x037f, 0x0078, 0x2371, 0x7034,</div><div class='del'>-	0xd08c, 0x00c0, 0x232b, 0x2001, 0xa70c, 0x200c, 0xd1ac, 0x00c0,</div><div class='del'>-	0x2371, 0xc1ad, 0x2102, 0x037e, 0x73c4, 0x2011, 0x8013, 0x1078,</div><div class='del'>-	0x361b, 0x037f, 0x7130, 0xc185, 0x7132, 0x2011, 0xa753, 0x220c,</div><div class='del'>-	0xd1a4, 0x0040, 0x2355, 0x017e, 0x2009, 0x0001, 0x2011, 0x0100,</div><div class='del'>-	0x1078, 0x5bf1, 0x2019, 0x000e, 0x1078, 0xa1a5, 0xa484, 0x00ff,</div><div class='del'>-	0xa080, 0x29c0, 0x200c, 0xa18c, 0xff00, 0x810f, 0x8127, 0xa006,</div><div class='del'>-	0x2009, 0x000e, 0x1078, 0xa22d, 0x017f, 0xd1ac, 0x00c0, 0x2362,</div><div class='del'>-	0x017e, 0x2009, 0x0000, 0x2019, 0x0004, 0x1078, 0x284f, 0x017f,</div><div class='del'>-	0x0078, 0x2371, 0x157e, 0x20a9, 0x007f, 0x2009, 0x0000, 0x1078,</div><div class='del'>-	0x45c4, 0x00c0, 0x236d, 0x1078, 0x42f8, 0x8108, 0x00f0, 0x2367,</div><div class='del'>-	0x157f, 0x0c7f, 0x047f, 0x0f7e, 0x2079, 0xa9c4, 0x783c, 0xa086,</div><div class='del'>-	0x0000, 0x0040, 0x2383, 0x6027, 0x0004, 0x783f, 0x0000, 0x2079,</div><div class='del'>-	0x0140, 0x7803, 0x0000, 0x0f7f, 0x2011, 0x0003, 0x1078, 0x70e0,</div><div class='del'>-	0x2011, 0x0002, 0x1078, 0x70ea, 0x1078, 0x6fc4, 0x037e, 0x2019,</div><div class='del'>-	0x0000, 0x1078, 0x7058, 0x037f, 0x60e3, 0x0000, 0x017f, 0x2001,</div><div class='del'>-	0xa700, 0x2014, 0xa296, 0x0004, 0x00c0, 0x23a4, 0xd19c, 0x00c0,</div><div class='del'>-	0x23ac, 0x6228, 0xc29d, 0x622a, 0x2003, 0x0001, 0x2001, 0xa722,</div><div class='del'>-	0x2003, 0x0000, 0x6027, 0x0020, 0xd194, 0x0040, 0x2490, 0x0f7e,</div><div class='del'>-	0x2079, 0xa9c4, 0x783c, 0xa086, 0x0001, 0x00c0, 0x23d0, 0x017e,</div><div class='del'>-	0x6027, 0x0004, 0x783f, 0x0000, 0x2079, 0x0140, 0x7803, 0x1000,</div><div class='del'>-	0x7803, 0x0000, 0x2079, 0xa9b1, 0x7807, 0x0000, 0x7833, 0x0000,</div><div class='del'>-	0x1078, 0x62d1, 0x1078, 0x639b, 0x017f, 0x0f7f, 0x0078, 0x2490,</div><div class='del'>-	0x0f7f, 0x017e, 0x3900, 0xa082, 0xaae3, 0x00c8, 0x23db, 0x017e,</div><div class='del'>-	0x1078, 0x747a, 0x017f, 0x6220, 0xd2b4, 0x0040, 0x2446, 0x1078,</div><div class='del'>-	0x5acb, 0x1078, 0x6e0f, 0x6027, 0x0004, 0x0f7e, 0x2019, 0xa9ba,</div><div class='del'>-	0x2304, 0xa07d, 0x0040, 0x241c, 0x7804, 0xa086, 0x0032, 0x00c0,</div><div class='del'>-	0x241c, 0x0d7e, 0x0c7e, 0x0e7e, 0x2069, 0x0140, 0x618c, 0x6288,</div><div class='del'>-	0x7818, 0x608e, 0x7808, 0x608a, 0x6043, 0x0002, 0x2001, 0x0003,</div><div class='del'>-	0x8001, 0x00c0, 0x2400, 0x6043, 0x0000, 0x6803, 0x1000, 0x6803,</div><div class='del'>-	0x0000, 0x618e, 0x628a, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x7810,</div><div class='del'>-	0x2070, 0x7037, 0x0103, 0x2f60, 0x1078, 0x772d, 0x0e7f, 0x0c7f,</div><div class='del'>-	0x0d7f, 0x0f7f, 0x017f, 0x007c, 0x0f7f, 0x0d7e, 0x2069, 0x0140,</div><div class='del'>-	0x6804, 0xa084, 0x4000, 0x0040, 0x2429, 0x6803, 0x1000, 0x6803,</div><div class='del'>-	0x0000, 0x0d7f, 0x0c7e, 0x2061, 0xa9b1, 0x6028, 0xa09a, 0x00c8,</div><div class='del'>-	0x00c8, 0x2439, 0x8000, 0x602a, 0x0c7f, 0x1078, 0x6e01, 0x0078,</div><div class='del'>-	0x248f, 0x2019, 0xa9ba, 0x2304, 0xa065, 0x0040, 0x2443, 0x2009,</div><div class='del'>-	0x0027, 0x1078, 0x775c, 0x0c7f, 0x0078, 0x248f, 0xd2bc, 0x0040,</div><div class='del'>-	0x248f, 0x1078, 0x5ad8, 0x6017, 0x0010, 0x6027, 0x0004, 0x0d7e,</div><div class='del'>-	0x2069, 0x0140, 0x6804, 0xa084, 0x4000, 0x0040, 0x245b, 0x6803,</div><div class='del'>-	0x1000, 0x6803, 0x0000, 0x0d7f, 0x0c7e, 0x2061, 0xa9b1, 0x6044,</div><div class='del'>-	0xa09a, 0x00c8, 0x00c8, 0x247e, 0x8000, 0x6046, 0x603c, 0x0c7f,</div><div class='del'>-	0xa005, 0x0040, 0x248f, 0x2009, 0x07d0, 0x1078, 0x5ad0, 0xa080,</div><div class='del'>-	0x0007, 0x2004, 0xa086, 0x0006, 0x00c0, 0x247a, 0x6017, 0x0012,</div><div class='del'>-	0x0078, 0x248f, 0x6017, 0x0016, 0x0078, 0x248f, 0x037e, 0x2019,</div><div class='del'>-	0x0001, 0x1078, 0x7058, 0x037f, 0x2019, 0xa9c0, 0x2304, 0xa065,</div><div class='del'>-	0x0040, 0x248e, 0x2009, 0x004f, 0x1078, 0x775c, 0x0c7f, 0x017f,</div><div class='del'>-	0xd19c, 0x0040, 0x24e4, 0x7034, 0xd0ac, 0x00c0, 0x24c1, 0x017e,</div><div class='del'>-	0x157e, 0x6027, 0x0008, 0x602f, 0x0020, 0x20a9, 0x000a, 0x00f0,</div><div class='del'>-	0x249f, 0x602f, 0x0000, 0x6150, 0xa185, 0x1400, 0x6052, 0x20a9,</div><div class='del'>-	0x0320, 0x00e0, 0x24a9, 0x2091, 0x6000, 0x6020, 0xd09c, 0x00c0,</div><div class='del'>-	0x24b8, 0x157f, 0x6152, 0x017f, 0x6027, 0x0008, 0x0078, 0x24e4,</div><div class='del'>-	0x1078, 0x2577, 0x00f0, 0x24a9, 0x157f, 0x6152, 0x017f, 0x6027,</div><div class='del'>-	0x0008, 0x017e, 0x6028, 0xc09c, 0x602a, 0x2011, 0x0003, 0x1078,</div><div class='del'>-	0x70e0, 0x2011, 0x0002, 0x1078, 0x70ea, 0x1078, 0x6fc4, 0x037e,</div><div class='del'>-	0x2019, 0x0000, 0x1078, 0x7058, 0x037f, 0x60e3, 0x0000, 0x1078,</div><div class='del'>-	0xa5bd, 0x1078, 0xa5db, 0x2001, 0xa700, 0x2003, 0x0004, 0x6027,</div><div class='del'>-	0x0008, 0x1078, 0x1246, 0x017f, 0xa18c, 0xffd0, 0x6126, 0x007c,</div><div class='del'>-	0x007e, 0x017e, 0x027e, 0x0e7e, 0x0f7e, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xa700, 0x71bc, 0x70be, 0xa116, 0x0040, 0x2518, 0x81ff,</div><div class='del'>-	0x0040, 0x2500, 0x2011, 0x8011, 0x1078, 0x361b, 0x0078, 0x2518,</div><div class='del'>-	0x2011, 0x8012, 0x1078, 0x361b, 0x2001, 0xa772, 0x2004, 0xd0fc,</div><div class='del'>-	0x00c0, 0x2518, 0x037e, 0x0c7e, 0x1078, 0x6f9f, 0x2061, 0x0100,</div><div class='del'>-	0x2019, 0x0028, 0x2009, 0x0000, 0x1078, 0x284f, 0x0c7f, 0x037f,</div><div class='del'>-	0x127f, 0x0f7f, 0x0e7f, 0x027f, 0x017f, 0x007f, 0x007c, 0x0c7e,</div><div class='del'>-	0x0f7e, 0x007e, 0x027e, 0x2061, 0x0100, 0xa190, 0x253b, 0x2204,</div><div class='del'>-	0x60f2, 0x2011, 0x2548, 0x6000, 0xa082, 0x0003, 0x00c8, 0x2534,</div><div class='del'>-	0x2001, 0x00ff, 0x0078, 0x2535, 0x2204, 0x60ee, 0x027f, 0x007f,</div><div class='del'>-	0x0f7f, 0x0c7f, 0x007c, 0x0840, 0x0840, 0x0840, 0x0580, 0x0420,</div><div class='del'>-	0x0348, 0x02c0, 0x0258, 0x0210, 0x01a8, 0x01a8, 0x01a8, 0x01a8,</div><div class='del'>-	0x0140, 0x00f8, 0x00d0, 0x00b0, 0x00a0, 0x2028, 0xa18c, 0x00ff,</div><div class='del'>-	0x2130, 0xa094, 0xff00, 0x00c0, 0x2558, 0x81ff, 0x0040, 0x255c,</div><div class='del'>-	0x1078, 0x5761, 0x0078, 0x2563, 0xa080, 0x29c0, 0x200c, 0xa18c,</div><div class='del'>-	0xff00, 0x810f, 0xa006, 0x007c, 0xa080, 0x29c0, 0x200c, 0xa18c,</div><div class='del'>-	0x00ff, 0x007c, 0x0c7e, 0x2061, 0xa700, 0x6030, 0x0040, 0x2573,</div><div class='del'>-	0xc09d, 0x0078, 0x2574, 0xc09c, 0x6032, 0x0c7f, 0x007c, 0x007e,</div><div class='del'>-	0x157e, 0x0f7e, 0x2079, 0x0100, 0x20a9, 0x000a, 0x7854, 0xd08c,</div><div class='del'>-	0x00c0, 0x2584, 0x00f0, 0x257e, 0x0f7f, 0x157f, 0x007f, 0x007c,</div><div class='del'>-	0x0c7e, 0x007e, 0x2061, 0x0100, 0x6030, 0x007e, 0x6048, 0x007e,</div><div class='del'>-	0x60e4, 0x007e, 0x60e8, 0x007e, 0x6050, 0x007e, 0x60f0, 0x007e,</div><div class='del'>-	0x60ec, 0x007e, 0x600c, 0x007e, 0x6004, 0x007e, 0x6028, 0x007e,</div><div class='del'>-	0x60e0, 0x007e, 0x602f, 0x0100, 0x602f, 0x0000, 0x0005, 0x0005,</div><div class='del'>-	0x0005, 0x0005, 0x602f, 0x0040, 0x602f, 0x0000, 0x007f, 0x60e2,</div><div class='del'>-	0x007f, 0x602a, 0x007f, 0x6006, 0x007f, 0x600e, 0x007f, 0x60ee,</div><div class='del'>-	0x007f, 0x60f2, 0x007f, 0x6052, 0x007f, 0x60ea, 0x007f, 0x60e6,</div><div class='del'>-	0x007f, 0x604a, 0x007f, 0x6032, 0x007f, 0x0c7f, 0x007c, 0x25e7,</div><div class='del'>-	0x25eb, 0x25ef, 0x25f5, 0x25fb, 0x2601, 0x2607, 0x260f, 0x2617,</div><div class='del'>-	0x261d, 0x2623, 0x262b, 0x2633, 0x263b, 0x2643, 0x264d, 0x2657,</div><div class='del'>-	0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657,</div><div class='del'>-	0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x107e,</div><div class='del'>-	0x007e, 0x0078, 0x2670, 0x107e, 0x007e, 0x0078, 0x2670, 0x107e,</div><div class='del'>-	0x007e, 0x1078, 0x226c, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078,</div><div class='del'>-	0x226c, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x0078,</div><div class='del'>-	0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x0078, 0x2670, 0x107e,</div><div class='del'>-	0x007e, 0x1078, 0x226c, 0x1078, 0x2133, 0x0078, 0x2670, 0x107e,</div><div class='del'>-	0x007e, 0x1078, 0x226c, 0x1078, 0x2133, 0x0078, 0x2670, 0x107e,</div><div class='del'>-	0x007e, 0x1078, 0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078,</div><div class='del'>-	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x226c, 0x1078,</div><div class='del'>-	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x226c, 0x1078,</div><div class='del'>-	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x1078,</div><div class='del'>-	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x1078,</div><div class='del'>-	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x226c, 0x1078,</div><div class='del'>-	0x2133, 0x1078, 0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078,</div><div class='del'>-	0x226c, 0x1078, 0x2133, 0x1078, 0x2178, 0x0078, 0x2670, 0x0005,</div><div class='del'>-	0x0078, 0x2657, 0xb084, 0x003c, 0x8004, 0x8004, 0x0079, 0x2660,</div><div class='del'>-	0x2670, 0x25ed, 0x25f1, 0x25f7, 0x25fd, 0x2603, 0x2609, 0x2611,</div><div class='del'>-	0x2619, 0x261f, 0x2625, 0x262d, 0x2635, 0x263d, 0x2645, 0x264f,</div><div class='del'>-	0x0008, 0x265a, 0x007f, 0x107f, 0x2091, 0x8001, 0x007c, 0x0c7e,</div><div class='del'>-	0x027e, 0x047e, 0x2021, 0x0000, 0x1078, 0x4967, 0x00c0, 0x2772,</div><div class='del'>-	0x70cc, 0xd09c, 0x0040, 0x268e, 0xd084, 0x00c0, 0x268e, 0xd0bc,</div><div class='del'>-	0x00c0, 0x2772, 0x1078, 0x2776, 0x0078, 0x2772, 0xd0cc, 0x00c0,</div><div class='del'>-	0x2772, 0xd094, 0x0040, 0x2698, 0x7097, 0xffff, 0x0078, 0x2772,</div><div class='del'>-	0x2001, 0x010c, 0x203c, 0x7284, 0xd284, 0x0040, 0x2701, 0xd28c,</div><div class='del'>-	0x00c0, 0x2701, 0x037e, 0x7394, 0xa38e, 0xffff, 0x0040, 0x26ab,</div><div class='del'>-	0x83ff, 0x00c0, 0x26ad, 0x2019, 0x0001, 0x8314, 0xa2e0, 0xadc0,</div><div class='del'>-	0x2c04, 0xa38c, 0x0001, 0x0040, 0x26ba, 0xa084, 0xff00, 0x8007,</div><div class='del'>-	0x0078, 0x26bc, 0xa084, 0x00ff, 0xa70e, 0x0040, 0x26f6, 0xa08e,</div><div class='del'>-	0x0000, 0x0040, 0x26f6, 0xa08e, 0x00ff, 0x00c0, 0x26d3, 0x7230,</div><div class='del'>-	0xd284, 0x00c0, 0x26fc, 0x7284, 0xc28d, 0x7286, 0x7097, 0xffff,</div><div class='del'>-	0x037f, 0x0078, 0x2701, 0x2009, 0x0000, 0x1078, 0x254d, 0x1078,</div><div class='del'>-	0x455c, 0x00c0, 0x26f9, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,</div><div class='del'>-	0x00c0, 0x26f0, 0x7030, 0xd08c, 0x0040, 0x26ea, 0x6000, 0xd0bc,</div><div class='del'>-	0x0040, 0x26f0, 0x1078, 0x278c, 0x0040, 0x26f9, 0x0078, 0x26f6,</div><div class='del'>-	0x1078, 0x28c4, 0x1078, 0x27b9, 0x0040, 0x26f9, 0x8318, 0x0078,</div><div class='del'>-	0x26ad, 0x7396, 0x0078, 0x26fe, 0x7097, 0xffff, 0x037f, 0x0078,</div><div class='del'>-	0x2772, 0xa780, 0x29c0, 0x203c, 0xa7bc, 0xff00, 0x873f, 0x2041,</div><div class='del'>-	0x007e, 0x7094, 0xa096, 0xffff, 0x00c0, 0x2713, 0x2009, 0x0000,</div><div class='del'>-	0x28a8, 0x0078, 0x271f, 0xa812, 0x0048, 0x271b, 0x2008, 0xa802,</div><div class='del'>-	0x20a8, 0x0078, 0x271f, 0x7097, 0xffff, 0x0078, 0x2772, 0x2700,</div><div class='del'>-	0x157e, 0x017e, 0xa106, 0x0040, 0x2766, 0xc484, 0x1078, 0x45c4,</div><div class='del'>-	0x0040, 0x2730, 0x1078, 0x455c, 0x00c0, 0x276f, 0x0078, 0x2731,</div><div class='del'>-	0xc485, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x2740,</div><div class='del'>-	0x7030, 0xd08c, 0x0040, 0x275e, 0x6000, 0xd0bc, 0x00c0, 0x275e,</div><div class='del'>-	0x7284, 0xd28c, 0x0040, 0x2756, 0x6004, 0xa084, 0x00ff, 0xa082,</div><div class='del'>-	0x0006, 0x0048, 0x2766, 0xd484, 0x00c0, 0x2752, 0x1078, 0x457f,</div><div class='del'>-	0x0078, 0x2754, 0x1078, 0x298e, 0x0078, 0x2766, 0x1078, 0x28c4,</div><div class='del'>-	0x1078, 0x27b9, 0x0040, 0x276f, 0x0078, 0x2766, 0x1078, 0x2959,</div><div class='del'>-	0x0040, 0x2766, 0x1078, 0x278c, 0x0040, 0x276f, 0x017f, 0x8108,</div><div class='del'>-	0x157f, 0x00f0, 0x271f, 0x7097, 0xffff, 0x0078, 0x2772, 0x017f,</div><div class='del'>-	0x157f, 0x7196, 0x047f, 0x027f, 0x0c7f, 0x007c, 0x0c7e, 0x017e,</div><div class='del'>-	0x7097, 0x0001, 0x2009, 0x007e, 0x1078, 0x455c, 0x00c0, 0x2789,</div><div class='del'>-	0x1078, 0x28c4, 0x1078, 0x27b9, 0x0040, 0x2789, 0x70cc, 0xc0bd,</div><div class='del'>-	0x70ce, 0x017f, 0x0c7f, 0x007c, 0x017e, 0x077e, 0x0d7e, 0x0c7e,</div><div class='del'>-	0x2c68, 0x2001, 0xa757, 0x2004, 0xa084, 0x00ff, 0x6842, 0x1078,</div><div class='del'>-	0x76c7, 0x0040, 0x27b4, 0x2d00, 0x601a, 0x601f, 0x0001, 0x2001,</div><div class='del'>-	0x0000, 0x1078, 0x44ee, 0x2001, 0x0000, 0x1078, 0x4502, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x7090, 0x8000, 0x7092, 0x127f, 0x2009, 0x0004,</div><div class='del'>-	0x1078, 0x775c, 0xa085, 0x0001, 0x0c7f, 0x0d7f, 0x077f, 0x017f,</div><div class='del'>-	0x007c, 0x017e, 0x077e, 0x0d7e, 0x0c7e, 0x2c68, 0x2001, 0xa757,</div><div class='del'>-	0x2004, 0xa084, 0x00ff, 0x6842, 0x1078, 0x9197, 0x0040, 0x27f2,</div><div class='del'>-	0x2d00, 0x601a, 0x6800, 0xc0c4, 0x6802, 0x68a0, 0xa086, 0x007e,</div><div class='del'>-	0x0040, 0x27db, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,</div><div class='del'>-	0x27db, 0x1078, 0x2880, 0x601f, 0x0001, 0x2001, 0x0000, 0x1078,</div><div class='del'>-	0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x7090, 0x8000, 0x7092, 0x127f, 0x2009, 0x0002, 0x1078, 0x775c,</div><div class='del'>-	0xa085, 0x0001, 0x0c7f, 0x0d7f, 0x077f, 0x017f, 0x007c, 0x0c7e,</div><div class='del'>-	0x027e, 0x2009, 0x0080, 0x1078, 0x455c, 0x00c0, 0x2805, 0x1078,</div><div class='del'>-	0x2808, 0x0040, 0x2805, 0x70d3, 0xffff, 0x027f, 0x0c7f, 0x007c,</div><div class='del'>-	0x017e, 0x077e, 0x0d7e, 0x0c7e, 0x2c68, 0x1078, 0x76c7, 0x0040,</div><div class='del'>-	0x282a, 0x2d00, 0x601a, 0x601f, 0x0001, 0x2001, 0x0000, 0x1078,</div><div class='del'>-	0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x70d4, 0x8000, 0x70d6, 0x127f, 0x2009, 0x0002, 0x1078, 0x775c,</div><div class='del'>-	0xa085, 0x0001, 0x0c7f, 0x0d7f, 0x077f, 0x017f, 0x007c, 0x0c7e,</div><div class='del'>-	0x0d7e, 0x127e, 0x2091, 0x8000, 0x2009, 0x007f, 0x1078, 0x455c,</div><div class='del'>-	0x00c0, 0x284b, 0x2c68, 0x1078, 0x76c7, 0x0040, 0x284b, 0x2d00,</div><div class='del'>-	0x601a, 0x6312, 0x601f, 0x0001, 0x620a, 0x2009, 0x0022, 0x1078,</div><div class='del'>-	0x775c, 0xa085, 0x0001, 0x127f, 0x0d7f, 0x0c7f, 0x007c, 0x0e7e,</div><div class='del'>-	0x0c7e, 0x067e, 0x037e, 0x027e, 0x1078, 0x5f0e, 0x1078, 0x5eae,</div><div class='del'>-	0x1078, 0x8068, 0x2130, 0x81ff, 0x0040, 0x2864, 0x20a9, 0x007e,</div><div class='del'>-	0x2009, 0x0000, 0x0078, 0x2868, 0x20a9, 0x007f, 0x2009, 0x0000,</div><div class='del'>-	0x017e, 0x1078, 0x45c4, 0x00c0, 0x2871, 0x1078, 0x47e9, 0x1078,</div><div class='del'>-	0x42f8, 0x017f, 0x8108, 0x00f0, 0x2868, 0x86ff, 0x00c0, 0x287a,</div><div class='del'>-	0x1078, 0x119b, 0x027f, 0x037f, 0x067f, 0x0c7f, 0x0e7f, 0x007c,</div><div class='del'>-	0x0e7e, 0x0c7e, 0x037e, 0x027e, 0x017e, 0x6218, 0x2270, 0x72a0,</div><div class='del'>-	0x027e, 0x2019, 0x0029, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000,</div><div class='del'>-	0x1078, 0x5e0a, 0x2c08, 0x1078, 0x9f9b, 0x077f, 0x017f, 0x2e60,</div><div class='del'>-	0x1078, 0x47e9, 0x6210, 0x6314, 0x1078, 0x42f8, 0x6212, 0x6316,</div><div class='del'>-	0x017f, 0x027f, 0x037f, 0x0c7f, 0x0e7f, 0x007c, 0x0e7e, 0x007e,</div><div class='del'>-	0x6018, 0xa080, 0x0028, 0x2004, 0xd0bc, 0x00c0, 0x28ba, 0x2071,</div><div class='del'>-	0xa700, 0x7090, 0xa005, 0x0040, 0x28b7, 0x8001, 0x7092, 0x007f,</div><div class='del'>-	0x0e7f, 0x007c, 0x2071, 0xa700, 0x70d4, 0xa005, 0x0040, 0x28b7,</div><div class='del'>-	0x8001, 0x70d6, 0x0078, 0x28b7, 0x6000, 0xc08c, 0x6002, 0x007c,</div><div class='del'>-	0x0f7e, 0x0e7e, 0x0c7e, 0x037e, 0x027e, 0x017e, 0x157e, 0x2178,</div><div class='del'>-	0x81ff, 0x00c0, 0x28d7, 0x20a9, 0x0001, 0x0078, 0x28f2, 0x2001,</div><div class='del'>-	0xa753, 0x2004, 0xd0c4, 0x0040, 0x28ee, 0xd0a4, 0x0040, 0x28ee,</div><div class='del'>-	0x047e, 0x6018, 0xa080, 0x0028, 0x2024, 0xa4a4, 0x00ff, 0x8427,</div><div class='del'>-	0xa006, 0x2009, 0x002d, 0x1078, 0xa22d, 0x047f, 0x20a9, 0x00ff,</div><div class='del'>-	0x2011, 0x0000, 0x027e, 0xa28e, 0x007e, 0x0040, 0x2936, 0xa28e,</div><div class='del'>-	0x007f, 0x0040, 0x2936, 0xa28e, 0x0080, 0x0040, 0x2936, 0xa288,</div><div class='del'>-	0xa835, 0x210c, 0x81ff, 0x0040, 0x2936, 0x8fff, 0x1040, 0x2942,</div><div class='del'>-	0x0c7e, 0x2160, 0x2001, 0x0001, 0x1078, 0x4972, 0x0c7f, 0x2019,</div><div class='del'>-	0x0029, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a,</div><div class='del'>-	0x0c7e, 0x027e, 0x2160, 0x6204, 0xa294, 0x00ff, 0xa286, 0x0006,</div><div class='del'>-	0x00c0, 0x2926, 0x6007, 0x0404, 0x0078, 0x292b, 0x2001, 0x0004,</div><div class='del'>-	0x8007, 0xa215, 0x6206, 0x027f, 0x0c7f, 0x017e, 0x2c08, 0x1078,</div><div class='del'>-	0x9f9b, 0x017f, 0x077f, 0x2160, 0x1078, 0x47e9, 0x027f, 0x8210,</div><div class='del'>-	0x00f0, 0x28f2, 0x157f, 0x017f, 0x027f, 0x037f, 0x0c7f, 0x0e7f,</div><div class='del'>-	0x0f7f, 0x007c, 0x047e, 0x027e, 0x017e, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0c4, 0x0040, 0x2955, 0xd0a4, 0x0040, 0x2955, 0xa006, 0x2220,</div><div class='del'>-	0x8427, 0x2009, 0x0029, 0x1078, 0xa22d, 0x017f, 0x027f, 0x047f,</div><div class='del'>-	0x007c, 0x017e, 0x027e, 0x037e, 0x0c7e, 0x7284, 0x82ff, 0x0040,</div><div class='del'>-	0x2987, 0xa290, 0xa753, 0x2214, 0xd2ac, 0x00c0, 0x2987, 0x2100,</div><div class='del'>-	0x1078, 0x2564, 0x81ff, 0x0040, 0x2989, 0x2019, 0x0001, 0x8314,</div><div class='del'>-	0xa2e0, 0xadc0, 0x2c04, 0xd384, 0x0040, 0x297b, 0xa084, 0xff00,</div><div class='del'>-	0x8007, 0x0078, 0x297d, 0xa084, 0x00ff, 0xa116, 0x0040, 0x2989,</div><div class='del'>-	0xa096, 0x00ff, 0x0040, 0x2987, 0x8318, 0x0078, 0x296f, 0xa085,</div><div class='del'>-	0x0001, 0x0c7f, 0x037f, 0x027f, 0x017f, 0x007c, 0x017e, 0x0c7e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x017e, 0x027e, 0x037e, 0x2110, 0x027e,</div><div class='del'>-	0x2019, 0x0029, 0x1078, 0x73d0, 0x027f, 0x1078, 0xa501, 0x037f,</div><div class='del'>-	0x027f, 0x017f, 0xa180, 0xa835, 0x2004, 0xa065, 0x0040, 0x29b7,</div><div class='del'>-	0x017e, 0x0c7e, 0x1078, 0x9197, 0x017f, 0x1040, 0x1332, 0x611a,</div><div class='del'>-	0x1078, 0x2880, 0x1078, 0x772d, 0x017f, 0x1078, 0x457f, 0x127f,</div><div class='del'>-	0x0c7f, 0x017f, 0x007c, 0x2001, 0xa733, 0x2004, 0xd0cc, 0x007c,</div><div class='del'>-	0x7eef, 0x7de8, 0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc, 0x80da,</div><div class='del'>-	0x7ad9, 0x80d6, 0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1, 0x79ce,</div><div class='del'>-	0x78cd, 0x80cc, 0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6, 0x77c5,</div><div class='del'>-	0x76c3, 0x80bc, 0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4, 0x72b3,</div><div class='del'>-	0x80b2, 0x80b1, 0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa, 0x6ea9,</div><div class='del'>-	0x80a7, 0x6da6, 0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d, 0x809b,</div><div class='del'>-	0x8098, 0x6797, 0x6690, 0x658f, 0x6488, 0x6384, 0x6282, 0x8081,</div><div class='del'>-	0x8080, 0x617c, 0x607a, 0x8079, 0x5f76, 0x8075, 0x8074, 0x8073,</div><div class='del'>-	0x8072, 0x8071, 0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a, 0x5b69,</div><div class='del'>-	0x8067, 0x5a66, 0x5965, 0x5863, 0x575c, 0x565a, 0x5559, 0x8056,</div><div class='del'>-	0x8055, 0x5454, 0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d, 0x804c,</div><div class='del'>-	0x804b, 0x4e4a, 0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043, 0x803c,</div><div class='del'>-	0x803a, 0x8039, 0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932, 0x4831,</div><div class='del'>-	0x802e, 0x472d, 0x462c, 0x452b, 0x442a, 0x4329, 0x4227, 0x8026,</div><div class='del'>-	0x8025, 0x4123, 0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18, 0x8017,</div><div class='del'>-	0x8010, 0x3b0f, 0x3a08, 0x8004, 0x3902, 0x8001, 0x8000, 0x8000,</div><div class='del'>-	0x3800, 0x3700, 0x3600, 0x8000, 0x3500, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x3400, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3300,</div><div class='del'>-	0x3200, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3100,</div><div class='del'>-	0x3000, 0x8000, 0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00, 0x2c00,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900, 0x2800,</div><div class='del'>-	0x8000, 0x2700, 0x2600, 0x2500, 0x2400, 0x2300, 0x2200, 0x8000,</div><div class='del'>-	0x8000, 0x2100, 0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x8000,</div><div class='del'>-	0x8000, 0x1b00, 0x1a00, 0x8000, 0x1900, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x1800, 0x8000, 0x1700, 0x1600, 0x1500,</div><div class='del'>-	0x8000, 0x1400, 0x1300, 0x1200, 0x1100, 0x1000, 0x0f00, 0x8000,</div><div class='del'>-	0x8000, 0x0e00, 0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900, 0x8000,</div><div class='del'>-	0x8000, 0x0800, 0x0700, 0x8000, 0x0600, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x0500, 0x0400, 0x0300, 0x8000, 0x0200, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x0100, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x2071, 0xa782, 0x7003, 0x0002, 0xa006, 0x7012, 0x7016, 0x703a,</div><div class='del'>-	0x703e, 0x7033, 0xa792, 0x7037, 0xa792, 0x7007, 0x0001, 0x2061,</div><div class='del'>-	0xa7d2, 0x6003, 0x0002, 0x007c, 0x0090, 0x2ae7, 0x0068, 0x2ae7,</div><div class='del'>-	0x2071, 0xa782, 0x2b78, 0x7818, 0xd084, 0x00c0, 0x2ae7, 0x2a60,</div><div class='del'>-	0x7820, 0xa08e, 0x0069, 0x00c0, 0x2bd7, 0x0079, 0x2b6b, 0x007c,</div><div class='del'>-	0x2071, 0xa782, 0x7004, 0x0079, 0x2aed, 0x2af1, 0x2af2, 0x2afc,</div><div class='del'>-	0x2b0e, 0x007c, 0x0090, 0x2afb, 0x0068, 0x2afb, 0x2b78, 0x7818,</div><div class='del'>-	0xd084, 0x0040, 0x2b1a, 0x007c, 0x2b78, 0x2061, 0xa7d2, 0x6008,</div><div class='del'>-	0xa08e, 0x0100, 0x0040, 0x2b09, 0xa086, 0x0200, 0x0040, 0x2bcf,</div><div class='del'>-	0x007c, 0x7014, 0x2068, 0x2a60, 0x7018, 0x007a, 0x7010, 0x2068,</div><div class='del'>-	0x6834, 0xa086, 0x0103, 0x0040, 0x2b16, 0x007c, 0x2a60, 0x2b78,</div><div class='del'>-	0x7018, 0x007a, 0x2a60, 0x7820, 0xa08a, 0x0040, 0x00c8, 0x2b23,</div><div class='del'>-	0x61bc, 0x0079, 0x2b2b, 0x2100, 0xa08a, 0x003f, 0x00c8, 0x2bcb,</div><div class='del'>-	0x61bc, 0x0079, 0x2b6b, 0x2bad, 0x2bdf, 0x2be7, 0x2beb, 0x2bf3,</div><div class='del'>-	0x2bf9, 0x2bfd, 0x2c09, 0x2c0d, 0x2c17, 0x2c1b, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2c1f, 0x2bcb, 0x2c2f, 0x2c46, 0x2c5d, 0x2cdd, 0x2ce2,</div><div class='del'>-	0x2d0f, 0x2d69, 0x2d7a, 0x2d98, 0x2dd9, 0x2de3, 0x2df0, 0x2e03,</div><div class='del'>-	0x2e22, 0x2e2b, 0x2e68, 0x2e6e, 0x2bcb, 0x2e8a, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x2bcb, 0x2e91, 0x2e9b, 0x2bcb, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2ea3, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x2bcb, 0x2eb5, 0x2ece, 0x2bcb, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x2bcb, 0x2ee0, 0x2f37, 0x2f95, 0x2fa9, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x398e, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x2bcb, 0x2c17, 0x2c1b, 0x2fc0, 0x2bcb, 0x2fcd,</div><div class='del'>-	0x3a26, 0x3a83, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb,</div><div class='del'>-	0x2bcb, 0x2bcb, 0x2bcb, 0x301a, 0x314f, 0x316b, 0x3177, 0x31da,</div><div class='del'>-	0x3233, 0x323e, 0x327d, 0x328c, 0x329b, 0x329e, 0x2fd1, 0x32c2,</div><div class='del'>-	0x331e, 0x332b, 0x343c, 0x356f, 0x3599, 0x36a6, 0x2bcb, 0x36b6,</div><div class='del'>-	0x36f0, 0x37bf, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x3827, 0x3843,</div><div class='del'>-	0x38bd, 0x3977, 0x713c, 0x0078, 0x2bad, 0x2021, 0x4000, 0x1078,</div><div class='del'>-	0x35f5, 0x127e, 0x2091, 0x8000, 0x0068, 0x2bba, 0x7818, 0xd084,</div><div class='del'>-	0x0040, 0x2bbd, 0x127f, 0x0078, 0x2bb1, 0x7c22, 0x7926, 0x7a2a,</div><div class='del'>-	0x7b2e, 0x781b, 0x0001, 0x2091, 0x4080, 0x7007, 0x0001, 0x2091,</div><div class='del'>-	0x5000, 0x127f, 0x007c, 0x2021, 0x4001, 0x0078, 0x2baf, 0x2021,</div><div class='del'>-	0x4002, 0x0078, 0x2baf, 0x2021, 0x4003, 0x0078, 0x2baf, 0x2021,</div><div class='del'>-	0x4005, 0x0078, 0x2baf, 0x2021, 0x4006, 0x0078, 0x2baf, 0xa02e,</div><div class='del'>-	0x2520, 0x7b28, 0x7a2c, 0x7824, 0x7930, 0x0078, 0x3604, 0x7823,</div><div class='del'>-	0x0004, 0x7824, 0x007a, 0xa02e, 0x2520, 0x7b28, 0x7a2c, 0x7824,</div><div class='del'>-	0x7930, 0x0078, 0x3608, 0x7924, 0x7828, 0x2114, 0x200a, 0x0078,</div><div class='del'>-	0x2bad, 0x7924, 0x2114, 0x0078, 0x2bad, 0x2099, 0x0009, 0x20a1,</div><div class='del'>-	0x0009, 0x20a9, 0x0007, 0x53a3, 0x7924, 0x7a28, 0x7b2c, 0x0078,</div><div class='del'>-	0x2bad, 0x7824, 0x2060, 0x0078, 0x2c21, 0x2009, 0x0001, 0x2011,</div><div class='del'>-	0x0013, 0x2019, 0x0019, 0x783b, 0x0017, 0x0078, 0x2bad, 0x7d38,</div><div class='del'>-	0x7c3c, 0x0078, 0x2be1, 0x7d38, 0x7c3c, 0x0078, 0x2bed, 0x2061,</div><div class='del'>-	0x1000, 0x610c, 0xa006, 0x2c14, 0xa200, 0x8c60, 0x8109, 0x00c0,</div><div class='del'>-	0x2c23, 0x2010, 0xa005, 0x0040, 0x2bad, 0x0078, 0x2bd3, 0x2069,</div><div class='del'>-	0xa752, 0x7824, 0x7930, 0xa11a, 0x00c8, 0x2bdb, 0x8019, 0x0040,</div><div class='del'>-	0x2bdb, 0x684a, 0x6942, 0x782c, 0x6852, 0x7828, 0x6856, 0xa006,</div><div class='del'>-	0x685a, 0x685e, 0x1078, 0x4eae, 0x0078, 0x2bad, 0x2069, 0xa752,</div><div class='del'>-	0x7824, 0x7934, 0xa11a, 0x00c8, 0x2bdb, 0x8019, 0x0040, 0x2bdb,</div><div class='del'>-	0x684e, 0x6946, 0x782c, 0x6862, 0x7828, 0x6866, 0xa006, 0x686a,</div><div class='del'>-	0x686e, 0x1078, 0x4a3e, 0x0078, 0x2bad, 0xa02e, 0x2520, 0x81ff,</div><div class='del'>-	0x00c0, 0x2bd7, 0x7924, 0x7b28, 0x7a2c, 0x20a9, 0x0005, 0x20a1,</div><div class='del'>-	0xa789, 0x41a1, 0x1078, 0x35ba, 0x0040, 0x2bd7, 0x2009, 0x0020,</div><div class='del'>-	0x1078, 0x3604, 0x701b, 0x2c75, 0x007c, 0x6834, 0x2008, 0xa084,</div><div class='del'>-	0x00ff, 0xa096, 0x0011, 0x0040, 0x2c85, 0xa096, 0x0019, 0x0040,</div><div class='del'>-	0x2c85, 0xa096, 0x0015, 0x00c0, 0x2bd7, 0x810f, 0xa18c, 0x00ff,</div><div class='del'>-	0x0040, 0x2bd7, 0x710e, 0x700c, 0x8001, 0x0040, 0x2cb6, 0x700e,</div><div class='del'>-	0x1078, 0x35ba, 0x0040, 0x2bd7, 0x2009, 0x0020, 0x2061, 0xa7d2,</div><div class='del'>-	0x6224, 0x6328, 0x642c, 0x6530, 0xa290, 0x0040, 0xa399, 0x0000,</div><div class='del'>-	0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x1078, 0x3604, 0x701b, 0x2ca9,</div><div class='del'>-	0x007c, 0x6834, 0xa084, 0x00ff, 0xa096, 0x0002, 0x0040, 0x2cb4,</div><div class='del'>-	0xa096, 0x000a, 0x00c0, 0x2bd7, 0x0078, 0x2c8b, 0x7010, 0x2068,</div><div class='del'>-	0x6838, 0xc0fd, 0x683a, 0x1078, 0x4431, 0x00c0, 0x2cc4, 0x7007,</div><div class='del'>-	0x0003, 0x701b, 0x2cc6, 0x007c, 0x1078, 0x4b51, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x20a9, 0x0005, 0x2099, 0xa789, 0x530a, 0x2100, 0xa210,</div><div class='del'>-	0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0xad80, 0x000d,</div><div class='del'>-	0x2009, 0x0020, 0x127f, 0x0078, 0x3608, 0x61a4, 0x7824, 0x60a6,</div><div class='del'>-	0x0078, 0x2bad, 0x2091, 0x8000, 0x7823, 0x4000, 0x7827, 0x4953,</div><div class='del'>-	0x782b, 0x5020, 0x782f, 0x2020, 0x2009, 0x017f, 0x2104, 0x7832,</div><div class='del'>-	0x3f00, 0x7836, 0x2061, 0x0100, 0x6200, 0x2061, 0x0200, 0x603c,</div><div class='del'>-	0x8007, 0xa205, 0x783a, 0x2009, 0x04fd, 0x2104, 0x783e, 0x781b,</div><div class='del'>-	0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2071, 0x0010, 0x20c1,</div><div class='del'>-	0x00f0, 0xa08a, 0x0003, 0x00c8, 0x0427, 0x0078, 0x0423, 0x81ff,</div><div class='del'>-	0x00c0, 0x2bd7, 0x7924, 0x810f, 0xa18c, 0x00ff, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x2bdb, 0x7e38, 0xa684, 0x3fff, 0xa082, 0x4000, 0x0048,</div><div class='del'>-	0x2d23, 0x0078, 0x2bdb, 0x7c28, 0x7d2c, 0x1078, 0x47a4, 0xd28c,</div><div class='del'>-	0x00c0, 0x2d2e, 0x1078, 0x4736, 0x0078, 0x2d30, 0x1078, 0x4772,</div><div class='del'>-	0x00c0, 0x2d5a, 0x2061, 0xae00, 0x127e, 0x2091, 0x8000, 0x6000,</div><div class='del'>-	0xa086, 0x0000, 0x0040, 0x2d48, 0x6010, 0xa06d, 0x0040, 0x2d48,</div><div class='del'>-	0x683c, 0xa406, 0x00c0, 0x2d48, 0x6840, 0xa506, 0x0040, 0x2d53,</div><div class='del'>-	0x127f, 0xace0, 0x0010, 0x2001, 0xa716, 0x2004, 0xac02, 0x00c8,</div><div class='del'>-	0x2bd7, 0x0078, 0x2d34, 0x1078, 0x8a11, 0x127f, 0x0040, 0x2bd7,</div><div class='del'>-	0x0078, 0x2bad, 0xa00e, 0x2001, 0x0005, 0x1078, 0x4b51, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x1078, 0x8f95, 0x1078, 0x4a73, 0x127f, 0x0078,</div><div class='del'>-	0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2, 0x0040, 0x2bdb,</div><div class='del'>-	0x1078, 0x4673, 0x0040, 0x2bd7, 0x1078, 0x47b2, 0x0040, 0x2bd7,</div><div class='del'>-	0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040,</div><div class='del'>-	0x2bdb, 0x1078, 0x482f, 0x0040, 0x2bd7, 0x2019, 0x0005, 0x1078,</div><div class='del'>-	0x47d3, 0x0040, 0x2bd7, 0x7828, 0xa08a, 0x1000, 0x00c8, 0x2bdb,</div><div class='del'>-	0x8003, 0x800b, 0x810b, 0xa108, 0x1078, 0x5a52, 0x0078, 0x2bad,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x81ff, 0x0040, 0x2da2, 0x2009, 0x0001,</div><div class='del'>-	0x0078, 0x2dd3, 0x2029, 0x00ff, 0x6450, 0x2400, 0xa506, 0x0040,</div><div class='del'>-	0x2dcd, 0x2508, 0x1078, 0x45c4, 0x00c0, 0x2dcd, 0x1078, 0x482f,</div><div class='del'>-	0x00c0, 0x2db8, 0x2009, 0x0002, 0x62ac, 0x2518, 0x0078, 0x2dd3,</div><div class='del'>-	0x2019, 0x0004, 0x1078, 0x47d3, 0x00c0, 0x2dc2, 0x2009, 0x0006,</div><div class='del'>-	0x0078, 0x2dd3, 0x7824, 0xa08a, 0x1000, 0x00c8, 0x2dd6, 0x8003,</div><div class='del'>-	0x800b, 0x810b, 0xa108, 0x1078, 0x5a52, 0x8529, 0x00c8, 0x2da5,</div><div class='del'>-	0x127f, 0x0078, 0x2bad, 0x127f, 0x0078, 0x2bd7, 0x127f, 0x0078,</div><div class='del'>-	0x2bdb, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078, 0x46e7, 0x1078,</div><div class='del'>-	0x47a4, 0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2,</div><div class='del'>-	0x0040, 0x2bdb, 0x1078, 0x46d6, 0x1078, 0x47a4, 0x0078, 0x2bad,</div><div class='del'>-	0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078,</div><div class='del'>-	0x4775, 0x0040, 0x2bd7, 0x1078, 0x4484, 0x1078, 0x472f, 0x1078,</div><div class='del'>-	0x47a4, 0x0078, 0x2bad, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078,</div><div class='del'>-	0x4673, 0x0040, 0x2bd7, 0x62a0, 0x2019, 0x0005, 0x0c7e, 0x1078,</div><div class='del'>-	0x47e9, 0x0c7f, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000, 0x1078,</div><div class='del'>-	0x5e0a, 0x2009, 0x0000, 0x1078, 0x9f9b, 0x077f, 0x1078, 0x47a4,</div><div class='del'>-	0x0078, 0x2bad, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078, 0x47a4,</div><div class='del'>-	0x2208, 0x0078, 0x2bad, 0x157e, 0x0d7e, 0x0e7e, 0x2069, 0xa814,</div><div class='del'>-	0x6810, 0x6914, 0xa10a, 0x00c8, 0x2e37, 0x2009, 0x0000, 0x6816,</div><div class='del'>-	0x2011, 0x0000, 0x2019, 0x0000, 0x20a9, 0x00ff, 0x2069, 0xa835,</div><div class='del'>-	0x2d04, 0xa075, 0x0040, 0x2e4c, 0x704c, 0x1078, 0x2e56, 0xa210,</div><div class='del'>-	0x7080, 0x1078, 0x2e56, 0xa318, 0x8d68, 0x00f0, 0x2e40, 0x2300,</div><div class='del'>-	0xa218, 0x0e7f, 0x0d7f, 0x157f, 0x0078, 0x2bad, 0x0f7e, 0x017e,</div><div class='del'>-	0xa07d, 0x0040, 0x2e65, 0x2001, 0x0000, 0x8000, 0x2f0c, 0x81ff,</div><div class='del'>-	0x0040, 0x2e65, 0x2178, 0x0078, 0x2e5d, 0x017f, 0x0f7f, 0x007c,</div><div class='del'>-	0x2069, 0xa814, 0x6910, 0x62a8, 0x0078, 0x2bad, 0x81ff, 0x00c0,</div><div class='del'>-	0x2bd7, 0x6150, 0xa190, 0x29c0, 0x2214, 0xa294, 0x00ff, 0x6070,</div><div class='del'>-	0xa084, 0xff00, 0xa215, 0x636c, 0x67cc, 0xd79c, 0x0040, 0x2e84,</div><div class='del'>-	0x2031, 0x0001, 0x0078, 0x2e86, 0x2031, 0x0000, 0x7e3a, 0x7f3e,</div><div class='del'>-	0x0078, 0x2bad, 0x6140, 0x6244, 0x2019, 0xa9a2, 0x231c, 0x0078,</div><div class='del'>-	0x2bad, 0x127e, 0x2091, 0x8000, 0x6134, 0x6338, 0xa006, 0x2010,</div><div class='del'>-	0x127f, 0x0078, 0x2bad, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x6244,</div><div class='del'>-	0x6338, 0x0078, 0x2bad, 0x6140, 0x6244, 0x7824, 0x6042, 0x7b28,</div><div class='del'>-	0x6346, 0x2069, 0xa752, 0x831f, 0xa305, 0x6816, 0x782c, 0x2069,</div><div class='del'>-	0xa9a2, 0x2d1c, 0x206a, 0x0078, 0x2bad, 0x017e, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x7824, 0x6036, 0xd094, 0x0040, 0x2ec8, 0x7828, 0xa085,</div><div class='del'>-	0x0001, 0x2009, 0xa9ab, 0x200a, 0x2001, 0xffff, 0x1078, 0x5ae6,</div><div class='del'>-	0x782c, 0x603a, 0x127f, 0x017f, 0x0078, 0x2bad, 0x1078, 0x35e4,</div><div class='del'>-	0x0040, 0x2bdb, 0x7828, 0xa00d, 0x0040, 0x2bdb, 0x782c, 0xa005,</div><div class='del'>-	0x0040, 0x2bdb, 0x6244, 0x6146, 0x6338, 0x603a, 0x0078, 0x2bad,</div><div class='del'>-	0x2001, 0xa700, 0x2004, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x0c7e,</div><div class='del'>-	0x2061, 0x0100, 0x7924, 0x810f, 0xa18c, 0x00ff, 0xa196, 0x00ff,</div><div class='del'>-	0x00c0, 0x2ef7, 0x6030, 0xa085, 0xff00, 0x0078, 0x2f06, 0xa182,</div><div class='del'>-	0x007f, 0x00c8, 0x2f30, 0xa188, 0x29c0, 0x210c, 0xa18c, 0x00ff,</div><div class='del'>-	0x6030, 0xa116, 0x0040, 0x2f30, 0x810f, 0xa105, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x007e, 0x1078, 0x76c7, 0x007f, 0x0040, 0x2f2c, 0x601a,</div><div class='del'>-	0x600b, 0xbc09, 0x601f, 0x0001, 0x1078, 0x35ba, 0x0040, 0x2f33,</div><div class='del'>-	0x6837, 0x0000, 0x7007, 0x0003, 0x6833, 0x0000, 0x6838, 0xc0fd,</div><div class='del'>-	0x683a, 0x701b, 0x2f8e, 0x2d00, 0x6012, 0x2009, 0x0032, 0x1078,</div><div class='del'>-	0x775c, 0x127f, 0x0c7f, 0x007c, 0x127f, 0x0c7f, 0x0078, 0x2bd7,</div><div class='del'>-	0x0c7f, 0x0078, 0x2bdb, 0x1078, 0x772d, 0x0078, 0x2f2c, 0x2001,</div><div class='del'>-	0xa700, 0x2004, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x0c7e, 0x2061,</div><div class='del'>-	0x0100, 0x7924, 0x810f, 0xa18c, 0x00ff, 0xa196, 0x00ff, 0x00c0,</div><div class='del'>-	0x2f4e, 0x6030, 0xa085, 0xff00, 0x0078, 0x2f5d, 0xa182, 0x007f,</div><div class='del'>-	0x00c8, 0x2f87, 0xa188, 0x29c0, 0x210c, 0xa18c, 0x00ff, 0x6030,</div><div class='del'>-	0xa116, 0x0040, 0x2f87, 0x810f, 0xa105, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x007e, 0x1078, 0x76c7, 0x007f, 0x0040, 0x2f83, 0x601a, 0x600b,</div><div class='del'>-	0xbc05, 0x601f, 0x0001, 0x1078, 0x35ba, 0x0040, 0x2f8a, 0x6837,</div><div class='del'>-	0x0000, 0x7007, 0x0003, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,</div><div class='del'>-	0x701b, 0x2f8e, 0x2d00, 0x6012, 0x2009, 0x0032, 0x1078, 0x775c,</div><div class='del'>-	0x127f, 0x0c7f, 0x007c, 0x127f, 0x0c7f, 0x0078, 0x2bd7, 0x0c7f,</div><div class='del'>-	0x0078, 0x2bdb, 0x1078, 0x772d, 0x0078, 0x2f83, 0x6830, 0xa086,</div><div class='del'>-	0x0100, 0x0040, 0x2bd7, 0x0078, 0x2bad, 0x2061, 0xaa33, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x6000, 0xd084, 0x0040, 0x2fa6, 0x6104, 0x6208,</div><div class='del'>-	0x2019, 0xa712, 0x231c, 0x127f, 0x0078, 0x2bad, 0x127f, 0x0078,</div><div class='del'>-	0x2bdb, 0x81ff, 0x00c0, 0x2bd7, 0x127e, 0x2091, 0x8000, 0x6248,</div><div class='del'>-	0x6064, 0xa202, 0x0048, 0x2fbd, 0xa085, 0x0001, 0x1078, 0x256a,</div><div class='del'>-	0x1078, 0x3c9e, 0x127f, 0x0078, 0x2bad, 0x127f, 0x0078, 0x2bdb,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x20a9, 0x0012, 0x2001, 0xa740, 0x20a0,</div><div class='del'>-	0xa006, 0x40a4, 0x127f, 0x0078, 0x2bad, 0x7d38, 0x7c3c, 0x0078,</div><div class='del'>-	0x2c5f, 0x7824, 0xa09c, 0x00ff, 0xa39a, 0x0003, 0x00c8, 0x2bd7,</div><div class='del'>-	0x6250, 0xa084, 0xff00, 0x8007, 0xa206, 0x00c0, 0x2fe9, 0x2001,</div><div class='del'>-	0xa740, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0078,</div><div class='del'>-	0x3608, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040, 0x2bdb,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x2bd7, 0x0c7e,</div><div class='del'>-	0x1078, 0x35ba, 0x0c7f, 0x0040, 0x2bd7, 0x6837, 0x0000, 0x6838,</div><div class='del'>-	0xc0fd, 0x683a, 0x1078, 0x8e5a, 0x0040, 0x2bd7, 0x7007, 0x0003,</div><div class='del'>-	0x701b, 0x300b, 0x007c, 0x6830, 0xa086, 0x0100, 0x0040, 0x2bd7,</div><div class='del'>-	0xad80, 0x000e, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,</div><div class='del'>-	0x0078, 0x3608, 0x1078, 0x35ba, 0x0040, 0x2bd7, 0x1078, 0x42dd,</div><div class='del'>-	0x2009, 0x001c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x3604,</div><div class='del'>-	0x701b, 0x302b, 0x007c, 0xade8, 0x000d, 0x6800, 0xa005, 0x0040,</div><div class='del'>-	0x2bdb, 0x6804, 0xd0ac, 0x0040, 0x3038, 0xd0a4, 0x0040, 0x2bdb,</div><div class='del'>-	0xd094, 0x0040, 0x3043, 0x0c7e, 0x2061, 0x0100, 0x6104, 0xa18c,</div><div class='del'>-	0xffdf, 0x6106, 0x0c7f, 0xd08c, 0x0040, 0x304e, 0x0c7e, 0x2061,</div><div class='del'>-	0x0100, 0x6104, 0xa18d, 0x0010, 0x6106, 0x0c7f, 0x2009, 0x0100,</div><div class='del'>-	0x210c, 0xa18a, 0x0002, 0x0048, 0x3063, 0xd084, 0x0040, 0x3063,</div><div class='del'>-	0x6a28, 0xa28a, 0x007f, 0x00c8, 0x2bdb, 0xa288, 0x29c0, 0x210c,</div><div class='del'>-	0xa18c, 0x00ff, 0x6156, 0xd0dc, 0x0040, 0x306c, 0x6828, 0xa08a,</div><div class='del'>-	0x007f, 0x00c8, 0x2bdb, 0x6052, 0x6808, 0xa08a, 0x0100, 0x0048,</div><div class='del'>-	0x2bdb, 0xa08a, 0x0841, 0x00c8, 0x2bdb, 0xa084, 0x0007, 0x00c0,</div><div class='del'>-	0x2bdb, 0x680c, 0xa005, 0x0040, 0x2bdb, 0x6810, 0xa005, 0x0040,</div><div class='del'>-	0x2bdb, 0x6848, 0x6940, 0xa10a, 0x00c8, 0x2bdb, 0x8001, 0x0040,</div><div class='del'>-	0x2bdb, 0x684c, 0x6944, 0xa10a, 0x00c8, 0x2bdb, 0x8001, 0x0040,</div><div class='del'>-	0x2bdb, 0x6804, 0xd0fc, 0x0040, 0x30c2, 0x1078, 0x35ba, 0x0040,</div><div class='del'>-	0x2bd7, 0x2009, 0x0014, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0xa290,</div><div class='del'>-	0x0038, 0xa399, 0x0000, 0x1078, 0x3604, 0x701b, 0x30a8, 0x007c,</div><div class='del'>-	0xade8, 0x000d, 0x20a9, 0x0014, 0x2d98, 0x2069, 0xa76e, 0x2da0,</div><div class='del'>-	0x53a3, 0x7010, 0xa0e8, 0x000d, 0x2001, 0xa772, 0x200c, 0xd1e4,</div><div class='del'>-	0x0040, 0x30c2, 0x0c7e, 0x2061, 0x0100, 0x6004, 0xa085, 0x0b00,</div><div class='del'>-	0x6006, 0x0c7f, 0x20a9, 0x001c, 0x2d98, 0x2069, 0xa752, 0x2da0,</div><div class='del'>-	0x53a3, 0x6814, 0xa08c, 0x00ff, 0x6142, 0x8007, 0xa084, 0x00ff,</div><div class='del'>-	0x6046, 0x1078, 0x4eae, 0x1078, 0x49ce, 0x1078, 0x4a3e, 0x6000,</div><div class='del'>-	0xa086, 0x0000, 0x00c0, 0x314d, 0x6808, 0x602a, 0x1078, 0x21f7,</div><div class='del'>-	0x6818, 0x691c, 0x6a20, 0x6b24, 0x8007, 0x810f, 0x8217, 0x831f,</div><div class='del'>-	0x6016, 0x611a, 0x621e, 0x6322, 0x6c04, 0xd4f4, 0x0040, 0x30fa,</div><div class='del'>-	0x6830, 0x6934, 0x6a38, 0x6b3c, 0x8007, 0x810f, 0x8217, 0x831f,</div><div class='del'>-	0x0078, 0x30fc, 0xa084, 0xf0ff, 0x6006, 0x610a, 0x620e, 0x6312,</div><div class='del'>-	0x1078, 0x5b19, 0x6904, 0xd1fc, 0x0040, 0x312f, 0x0c7e, 0x2009,</div><div class='del'>-	0x0000, 0x20a9, 0x0001, 0x6b70, 0xd384, 0x0040, 0x312c, 0x0078,</div><div class='del'>-	0x3116, 0x839d, 0x00c8, 0x312c, 0x3508, 0x8109, 0x1078, 0x5480,</div><div class='del'>-	0x6878, 0x6016, 0x6874, 0x2008, 0xa084, 0xff00, 0x8007, 0x600a,</div><div class='del'>-	0xa184, 0x00ff, 0x6006, 0x8108, 0x00c0, 0x312a, 0x6003, 0x0003,</div><div class='del'>-	0x0078, 0x312c, 0x6003, 0x0001, 0x00f0, 0x3111, 0x0c7f, 0x0c7e,</div><div class='del'>-	0x2061, 0x0100, 0x602f, 0x0040, 0x602f, 0x0000, 0x0c7f, 0x1078,</div><div class='del'>-	0x3819, 0x0040, 0x313d, 0x1078, 0x256a, 0x60c0, 0xa005, 0x0040,</div><div class='del'>-	0x3149, 0x6003, 0x0001, 0x2091, 0x301d, 0x1078, 0x4224, 0x0078,</div><div class='del'>-	0x314d, 0x6003, 0x0004, 0x2091, 0x301d, 0x0078, 0x2bad, 0x6000,</div><div class='del'>-	0xa086, 0x0000, 0x0040, 0x2bd7, 0x2069, 0xa752, 0x7830, 0x6842,</div><div class='del'>-	0x7834, 0x6846, 0x6804, 0xd0fc, 0x0040, 0x3162, 0x2009, 0x0030,</div><div class='del'>-	0x0078, 0x3164, 0x2009, 0x001c, 0x2d00, 0x7a2c, 0x7b28, 0x7c3c,</div><div class='del'>-	0x7d38, 0x0078, 0x3608, 0xa006, 0x1078, 0x256a, 0x81ff, 0x00c0,</div><div class='del'>-	0x2bd7, 0x1078, 0x42dd, 0x1078, 0x4224, 0x0078, 0x2bad, 0x81ff,</div><div class='del'>-	0x00c0, 0x2bd7, 0x6184, 0x81ff, 0x0040, 0x3191, 0x703f, 0x0000,</div><div class='del'>-	0x2001, 0xadc0, 0x2009, 0x0040, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x1078, 0x3608, 0x701b, 0x2baa, 0x127f,</div><div class='del'>-	0x007c, 0x703f, 0x0001, 0x0d7e, 0x2069, 0xadc0, 0x20a9, 0x0040,</div><div class='del'>-	0x20a1, 0xadc0, 0x2019, 0xffff, 0x43a4, 0x6550, 0xa588, 0x29c0,</div><div class='del'>-	0x210c, 0xa18c, 0x00ff, 0x216a, 0xa00e, 0x2011, 0x0002, 0x2100,</div><div class='del'>-	0xa506, 0x0040, 0x31c3, 0x1078, 0x45c4, 0x00c0, 0x31c3, 0x6014,</div><div class='del'>-	0x821c, 0x0048, 0x31bb, 0xa398, 0xadc0, 0xa085, 0xff00, 0x8007,</div><div class='del'>-	0x201a, 0x0078, 0x31c2, 0xa398, 0xadc0, 0x2324, 0xa4a4, 0xff00,</div><div class='del'>-	0xa405, 0x201a, 0x8210, 0x8108, 0xa182, 0x0080, 0x00c8, 0x31ca,</div><div class='del'>-	0x0078, 0x31a7, 0x8201, 0x8007, 0x2d0c, 0xa105, 0x206a, 0x0d7f,</div><div class='del'>-	0x20a9, 0x0040, 0x20a1, 0xadc0, 0x2099, 0xadc0, 0x1078, 0x4281,</div><div class='del'>-	0x0078, 0x3180, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x0c7e, 0x1078,</div><div class='del'>-	0x35ba, 0x0c7f, 0x00c0, 0x31e8, 0x2009, 0x0002, 0x0078, 0x2bd7,</div><div class='del'>-	0x2001, 0xa753, 0x2004, 0xd0b4, 0x0040, 0x320f, 0x6000, 0xd08c,</div><div class='del'>-	0x00c0, 0x320f, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,</div><div class='del'>-	0x320f, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x1078, 0x8eae,</div><div class='del'>-	0x00c0, 0x3206, 0x2009, 0x0003, 0x0078, 0x2bd7, 0x7007, 0x0003,</div><div class='del'>-	0x701b, 0x320b, 0x007c, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x20a9,</div><div class='del'>-	0x002b, 0x2c98, 0xade8, 0x0002, 0x2da0, 0x53a3, 0x20a9, 0x0004,</div><div class='del'>-	0xac80, 0x0006, 0x2098, 0xad80, 0x0006, 0x20a0, 0x1078, 0x4281,</div><div class='del'>-	0x20a9, 0x0004, 0xac80, 0x000a, 0x2098, 0xad80, 0x000a, 0x20a0,</div><div class='del'>-	0x1078, 0x4281, 0x2d00, 0x2009, 0x002b, 0x7a2c, 0x7b28, 0x7c3c,</div><div class='del'>-	0x7d38, 0x0078, 0x3608, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2,</div><div class='del'>-	0x0040, 0x2bdb, 0x1078, 0x47bd, 0x0078, 0x2bad, 0x81ff, 0x00c0,</div><div class='del'>-	0x2bd7, 0x7828, 0xa08a, 0x1000, 0x00c8, 0x2bdb, 0x1078, 0x35e4,</div><div class='del'>-	0x0040, 0x2bdb, 0x1078, 0x482f, 0x0040, 0x2bd7, 0x2019, 0x0004,</div><div class='del'>-	0x1078, 0x47d3, 0x7924, 0x810f, 0x7a28, 0x1078, 0x3259, 0x0078,</div><div class='del'>-	0x2bad, 0xa186, 0x00ff, 0x0040, 0x3261, 0x1078, 0x3271, 0x0078,</div><div class='del'>-	0x3270, 0x2029, 0x007e, 0x2061, 0xa700, 0x6450, 0x2400, 0xa506,</div><div class='del'>-	0x0040, 0x326d, 0x2508, 0x1078, 0x3271, 0x8529, 0x00c8, 0x3266,</div><div class='del'>-	0x007c, 0x1078, 0x45c4, 0x00c0, 0x327c, 0x2200, 0x8003, 0x800b,</div><div class='del'>-	0x810b, 0xa108, 0x1078, 0x5a52, 0x007c, 0x81ff, 0x00c0, 0x2bd7,</div><div class='del'>-	0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078, 0x4673, 0x0040, 0x2bd7,</div><div class='del'>-	0x1078, 0x47c8, 0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078,</div><div class='del'>-	0x35d2, 0x0040, 0x2bdb, 0x1078, 0x4673, 0x0040, 0x2bd7, 0x1078,</div><div class='del'>-	0x47b2, 0x0078, 0x2bad, 0x6100, 0x0078, 0x2bad, 0x1078, 0x35e4,</div><div class='del'>-	0x0040, 0x2bdb, 0x2001, 0xa700, 0x2004, 0xa086, 0x0003, 0x00c0,</div><div class='del'>-	0x2bd7, 0x0d7e, 0xace8, 0x000a, 0x7924, 0xd184, 0x0040, 0x32b2,</div><div class='del'>-	0xace8, 0x0006, 0x680c, 0x8007, 0x783e, 0x6808, 0x8007, 0x783a,</div><div class='del'>-	0x6b04, 0x831f, 0x6a00, 0x8217, 0x0d7f, 0x6100, 0xa18c, 0x0200,</div><div class='del'>-	0x0078, 0x2bad, 0xa006, 0x1078, 0x256a, 0x7824, 0xa084, 0x00ff,</div><div class='del'>-	0xa086, 0x00ff, 0x0040, 0x32cf, 0x81ff, 0x00c0, 0x2bd7, 0x1078,</div><div class='del'>-	0x42dd, 0x7828, 0xa08a, 0x1000, 0x00c8, 0x2bdb, 0x7924, 0xa18c,</div><div class='del'>-	0xff00, 0x810f, 0xa186, 0x00ff, 0x0040, 0x32e5, 0xa182, 0x007f,</div><div class='del'>-	0x00c8, 0x2bdb, 0x2100, 0x1078, 0x2564, 0x027e, 0x0c7e, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x2061, 0xa9c4, 0x601b, 0x0000, 0x601f, 0x0000,</div><div class='del'>-	0x2011, 0x0003, 0x1078, 0x70e0, 0x2011, 0x0002, 0x1078, 0x70ea,</div><div class='del'>-	0x1078, 0x6fc4, 0x037e, 0x2019, 0x0000, 0x1078, 0x7058, 0x037f,</div><div class='del'>-	0x2061, 0x0100, 0x6030, 0xa084, 0x00ff, 0x810f, 0xa105, 0x604a,</div><div class='del'>-	0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0x002d, 0x2011, 0x4259,</div><div class='del'>-	0x1078, 0x5add, 0x7924, 0xa18c, 0xff00, 0x810f, 0x7a28, 0x1078,</div><div class='del'>-	0x3259, 0x127f, 0x0c7f, 0x027f, 0x0078, 0x2bad, 0x7924, 0xa18c,</div><div class='del'>-	0xff00, 0x810f, 0x0c7e, 0x1078, 0x455c, 0x2c08, 0x0c7f, 0x00c0,</div><div class='del'>-	0x2bdb, 0x0078, 0x2bad, 0x81ff, 0x0040, 0x3332, 0x2009, 0x0001,</div><div class='del'>-	0x0078, 0x2bd7, 0x60cc, 0xd09c, 0x00c0, 0x333a, 0x2009, 0x0005,</div><div class='del'>-	0x0078, 0x2bd7, 0x1078, 0x35ba, 0x00c0, 0x3342, 0x2009, 0x0002,</div><div class='del'>-	0x0078, 0x2bd7, 0x7924, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078,</div><div class='del'>-	0x3604, 0x701b, 0x334c, 0x007c, 0x2009, 0x0080, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x3359, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x0040,</div><div class='del'>-	0x335d, 0x2021, 0x400a, 0x0078, 0x2baf, 0x0d7e, 0xade8, 0x000d,</div><div class='del'>-	0x6900, 0x6a08, 0x6b0c, 0x6c10, 0x6d14, 0x6e18, 0x6820, 0xa0be,</div><div class='del'>-	0x0100, 0x0040, 0x33d0, 0xa0be, 0x0112, 0x0040, 0x33d0, 0xa0be,</div><div class='del'>-	0x0113, 0x0040, 0x33d0, 0xa0be, 0x0114, 0x0040, 0x33d0, 0xa0be,</div><div class='del'>-	0x0117, 0x0040, 0x33d0, 0xa0be, 0x011a, 0x0040, 0x33d0, 0xa0be,</div><div class='del'>-	0x0121, 0x0040, 0x33c6, 0xa0be, 0x0131, 0x0040, 0x33c6, 0xa0be,</div><div class='del'>-	0x0171, 0x0040, 0x33d0, 0xa0be, 0x0173, 0x0040, 0x33d0, 0xa0be,</div><div class='del'>-	0x01a1, 0x00c0, 0x3398, 0x6830, 0x8007, 0x6832, 0x0078, 0x33d6,</div><div class='del'>-	0xa0be, 0x0212, 0x0040, 0x33cc, 0xa0be, 0x0213, 0x0040, 0x33cc,</div><div class='del'>-	0xa0be, 0x0214, 0x0040, 0x33be, 0xa0be, 0x0217, 0x0040, 0x33b8,</div><div class='del'>-	0xa0be, 0x021a, 0x00c0, 0x33b1, 0x6838, 0x8007, 0x683a, 0x0078,</div><div class='del'>-	0x33d0, 0xa0be, 0x0300, 0x0040, 0x33d0, 0x0d7f, 0x0078, 0x2bdb,</div><div class='del'>-	0xad80, 0x0010, 0x20a9, 0x0007, 0x1078, 0x3418, 0xad80, 0x000e,</div><div class='del'>-	0x20a9, 0x0001, 0x1078, 0x3418, 0x0078, 0x33d0, 0xad80, 0x000c,</div><div class='del'>-	0x1078, 0x3426, 0x0078, 0x33d6, 0xad80, 0x000e, 0x1078, 0x3426,</div><div class='del'>-	0xad80, 0x000c, 0x20a9, 0x0001, 0x1078, 0x3418, 0x0c7e, 0x1078,</div><div class='del'>-	0x35ba, 0x0040, 0x3409, 0x6838, 0xc0fd, 0x683a, 0x6837, 0x0119,</div><div class='del'>-	0x6853, 0x0000, 0x684f, 0x0020, 0x685b, 0x0001, 0x810b, 0x697e,</div><div class='del'>-	0x6883, 0x0000, 0x6a86, 0x6b8a, 0x6c8e, 0x6d92, 0x6996, 0x689b,</div><div class='del'>-	0x0000, 0x0c7f, 0x0d7f, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a,</div><div class='del'>-	0x6823, 0x0000, 0x6804, 0x2068, 0x1078, 0x8e76, 0x00c0, 0x3404,</div><div class='del'>-	0x2009, 0x0003, 0x0078, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x340f,</div><div class='del'>-	0x007c, 0x0c7f, 0x0d7f, 0x2009, 0x0002, 0x0078, 0x2bd7, 0x6820,</div><div class='del'>-	0xa086, 0x8001, 0x00c0, 0x2bad, 0x2009, 0x0004, 0x0078, 0x2bd7,</div><div class='del'>-	0x017e, 0x2008, 0x2044, 0x8000, 0x204c, 0x8000, 0x290a, 0x8108,</div><div class='del'>-	0x280a, 0x8108, 0x00f0, 0x341a, 0x017f, 0x007c, 0x017e, 0x0a7e,</div><div class='del'>-	0x0b7e, 0x2008, 0x2044, 0x8000, 0x204c, 0x8000, 0x2054, 0x8000,</div><div class='del'>-	0x205c, 0x2b0a, 0x8108, 0x2a0a, 0x8108, 0x290a, 0x8108, 0x280a,</div><div class='del'>-	0x0b7f, 0x0a7f, 0x017f, 0x007c, 0x81ff, 0x0040, 0x3443, 0x2009,</div><div class='del'>-	0x0001, 0x0078, 0x2bd7, 0x60cc, 0xd09c, 0x00c0, 0x344b, 0x2009,</div><div class='del'>-	0x0005, 0x0078, 0x2bd7, 0x7924, 0x2140, 0xa18c, 0xff00, 0x810f,</div><div class='del'>-	0xa182, 0x0080, 0x0048, 0x2bdb, 0xa182, 0x00ff, 0x00c8, 0x2bdb,</div><div class='del'>-	0x7a2c, 0x7b28, 0x606c, 0xa306, 0x00c0, 0x3466, 0x6070, 0xa24e,</div><div class='del'>-	0x0040, 0x2bdb, 0xa9cc, 0xff00, 0x0040, 0x2bdb, 0x0c7e, 0x1078,</div><div class='del'>-	0x350f, 0x2c68, 0x0c7f, 0x0040, 0x349e, 0xa0c6, 0x4000, 0x00c0,</div><div class='del'>-	0x3484, 0x0c7e, 0x007e, 0x2d60, 0x2009, 0x0000, 0x1078, 0x489b,</div><div class='del'>-	0x00c0, 0x347b, 0xc185, 0x6000, 0xd0bc, 0x0040, 0x3480, 0xc18d,</div><div class='del'>-	0x007f, 0x0c7f, 0x0078, 0x349b, 0xa0c6, 0x4007, 0x00c0, 0x348b,</div><div class='del'>-	0x2408, 0x0078, 0x349b, 0xa0c6, 0x4008, 0x00c0, 0x3493, 0x2708,</div><div class='del'>-	0x2610, 0x0078, 0x349b, 0xa0c6, 0x4009, 0x00c0, 0x3499, 0x0078,</div><div class='del'>-	0x349b, 0x2001, 0x4006, 0x2020, 0x0078, 0x2baf, 0x2d00, 0x7022,</div><div class='del'>-	0x017e, 0x0b7e, 0x0c7e, 0x0e7e, 0x2c70, 0x1078, 0x76c7, 0x0040,</div><div class='del'>-	0x34e4, 0x2d00, 0x601a, 0x2001, 0xa757, 0x2004, 0xa084, 0x00ff,</div><div class='del'>-	0x6842, 0x2e58, 0x0e7f, 0x0e7e, 0x0c7e, 0x1078, 0x35ba, 0x0c7f,</div><div class='del'>-	0x2b70, 0x00c0, 0x34c5, 0x1078, 0x772d, 0x0e7f, 0x0c7f, 0x0b7f,</div><div class='del'>-	0x017f, 0x2009, 0x0002, 0x0078, 0x2bd7, 0x6837, 0x0000, 0x2d00,</div><div class='del'>-	0x6012, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x1078, 0x2880, 0x127f, 0x601f, 0x0001, 0x2001, 0x0000,</div><div class='del'>-	0x1078, 0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x2009, 0x0002,</div><div class='del'>-	0x1078, 0x775c, 0xa085, 0x0001, 0x0e7f, 0x0c7f, 0x0b7f, 0x017f,</div><div class='del'>-	0x00c0, 0x34ee, 0x2009, 0x0003, 0x0078, 0x2bd7, 0x7007, 0x0003,</div><div class='del'>-	0x701b, 0x34f3, 0x007c, 0x6830, 0xa086, 0x0100, 0x7020, 0x2060,</div><div class='del'>-	0x00c0, 0x3501, 0x2009, 0x0004, 0x6204, 0xa294, 0x00ff, 0x0078,</div><div class='del'>-	0x2bd7, 0x2009, 0x0000, 0x1078, 0x489b, 0x00c0, 0x3508, 0xc185,</div><div class='del'>-	0x6000, 0xd0bc, 0x0040, 0x350d, 0xc18d, 0x0078, 0x2bad, 0x0e7e,</div><div class='del'>-	0x0d7e, 0x2029, 0x0000, 0x2021, 0x0080, 0x20a9, 0x007f, 0x2071,</div><div class='del'>-	0xa8b5, 0x2e04, 0xa005, 0x00c0, 0x3524, 0x2100, 0xa406, 0x00c0,</div><div class='del'>-	0x3555, 0x2428, 0x0078, 0x3555, 0x2068, 0x6f10, 0x2700, 0xa306,</div><div class='del'>-	0x00c0, 0x3546, 0x6e14, 0x2600, 0xa206, 0x00c0, 0x3546, 0x2400,</div><div class='del'>-	0xa106, 0x00c0, 0x3542, 0x2d60, 0xd884, 0x0040, 0x356a, 0x6004,</div><div class='del'>-	0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x356a, 0x2001, 0x4000,</div><div class='del'>-	0x0078, 0x356b, 0x2001, 0x4007, 0x0078, 0x356b, 0x2400, 0xa106,</div><div class='del'>-	0x00c0, 0x3555, 0x6e14, 0x87ff, 0x00c0, 0x3551, 0x86ff, 0x0040,</div><div class='del'>-	0x3521, 0x2001, 0x4008, 0x0078, 0x356b, 0x8420, 0x8e70, 0x00f0,</div><div class='del'>-	0x3519, 0x85ff, 0x00c0, 0x3564, 0x2001, 0x4009, 0x0078, 0x356b,</div><div class='del'>-	0x2001, 0x0001, 0x0078, 0x356b, 0x1078, 0x455c, 0x00c0, 0x3560,</div><div class='del'>-	0x6312, 0x6216, 0xa006, 0xa005, 0x0d7f, 0x0e7f, 0x007c, 0x81ff,</div><div class='del'>-	0x00c0, 0x2bd7, 0x1078, 0x35ba, 0x0040, 0x2bd7, 0x6837, 0x0000,</div><div class='del'>-	0x6838, 0xc0fd, 0x683a, 0x7824, 0xa005, 0x0040, 0x2bdb, 0xa096,</div><div class='del'>-	0x00ff, 0x0040, 0x3587, 0xa092, 0x0004, 0x00c8, 0x2bdb, 0x2010,</div><div class='del'>-	0x2d18, 0x1078, 0x282f, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b,</div><div class='del'>-	0x3592, 0x007c, 0x6830, 0xa086, 0x0100, 0x0040, 0x2bd7, 0x0078,</div><div class='del'>-	0x2bad, 0x7924, 0xa18c, 0xff00, 0x810f, 0xa182, 0x0080, 0x0048,</div><div class='del'>-	0x2bdb, 0xa182, 0x00ff, 0x00c8, 0x2bdb, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x1078, 0x8d5b, 0x00c0, 0x35b7, 0xa190, 0xa835, 0x2204, 0xa065,</div><div class='del'>-	0x0040, 0x35b7, 0x1078, 0x42f8, 0x127f, 0x0078, 0x2bad, 0x127f,</div><div class='del'>-	0x0078, 0x2bd7, 0x1078, 0x138b, 0x0040, 0x35d1, 0xa006, 0x6802,</div><div class='del'>-	0x7010, 0xa005, 0x00c0, 0x35c9, 0x2d00, 0x7012, 0x7016, 0x0078,</div><div class='del'>-	0x35cf, 0x7014, 0x6802, 0x2060, 0x2d00, 0x6006, 0x7016, 0xad80,</div><div class='del'>-	0x000d, 0x007c, 0x7924, 0x810f, 0xa18c, 0x00ff, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x35e1, 0x7e28, 0xa684, 0x3fff, 0xa082, 0x4000, 0x0048,</div><div class='del'>-	0x35e2, 0xa066, 0x8cff, 0x007c, 0x7e24, 0x860f, 0xa18c, 0x00ff,</div><div class='del'>-	0x1078, 0x45c4, 0x00c0, 0x35f2, 0xa6b4, 0x00ff, 0xa682, 0x4000,</div><div class='del'>-	0x0048, 0x35f3, 0xa066, 0x8cff, 0x007c, 0x017e, 0x7110, 0x81ff,</div><div class='del'>-	0x0040, 0x3600, 0x2168, 0x6904, 0x1078, 0x13a4, 0x0078, 0x35f7,</div><div class='del'>-	0x7112, 0x7116, 0x017f, 0x007c, 0x2031, 0x0001, 0x0078, 0x360a,</div><div class='del'>-	0x2031, 0x0000, 0x2061, 0xa7d2, 0x6606, 0x6112, 0x600e, 0x6226,</div><div class='del'>-	0x632a, 0x642e, 0x6532, 0x2c10, 0x1078, 0x13db, 0x7007, 0x0002,</div><div class='del'>-	0x701b, 0x2bad, 0x007c, 0x0f7e, 0x127e, 0x2091, 0x8000, 0x2079,</div><div class='del'>-	0x0000, 0x2001, 0xa790, 0x2004, 0xa005, 0x00c0, 0x3636, 0x0068,</div><div class='del'>-	0x3636, 0x7818, 0xd084, 0x00c0, 0x3636, 0x7a22, 0x7b26, 0x7c2a,</div><div class='del'>-	0x781b, 0x0001, 0x2091, 0x4080, 0x0078, 0x365b, 0x017e, 0x0c7e,</div><div class='del'>-	0x0e7e, 0x2071, 0xa782, 0x7138, 0xa182, 0x0008, 0x0048, 0x3644,</div><div class='del'>-	0x7030, 0x2060, 0x0078, 0x3655, 0x7030, 0xa0e0, 0x0008, 0xac82,</div><div class='del'>-	0xa7d2, 0x0048, 0x364d, 0x2061, 0xa792, 0x2c00, 0x7032, 0x81ff,</div><div class='del'>-	0x00c0, 0x3653, 0x7036, 0x8108, 0x713a, 0x2262, 0x6306, 0x640a,</div><div class='del'>-	0x0e7f, 0x0c7f, 0x017f, 0x127f, 0x0f7f, 0x007c, 0x0e7e, 0x2071,</div><div class='del'>-	0xa782, 0x7038, 0xa005, 0x0040, 0x3697, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x0068, 0x3696, 0x0f7e, 0x2079, 0x0000, 0x7818, 0xd084, 0x00c0,</div><div class='del'>-	0x3695, 0x0c7e, 0x7034, 0x2060, 0x2c04, 0x7822, 0x6004, 0x7826,</div><div class='del'>-	0x6008, 0x782a, 0x781b, 0x0001, 0x2091, 0x4080, 0x7038, 0x8001,</div><div class='del'>-	0x703a, 0xa005, 0x00c0, 0x368b, 0x7033, 0xa792, 0x7037, 0xa792,</div><div class='del'>-	0x0c7f, 0x0078, 0x3695, 0xac80, 0x0008, 0xa0fa, 0xa7d2, 0x0048,</div><div class='del'>-	0x3693, 0x2001, 0xa792, 0x7036, 0x0c7f, 0x0f7f, 0x127f, 0x0e7f,</div><div class='del'>-	0x007c, 0x027e, 0x2001, 0xa753, 0x2004, 0xd0c4, 0x0040, 0x36a4,</div><div class='del'>-	0x2011, 0x8014, 0x1078, 0x361b, 0x027f, 0x007c, 0x81ff, 0x00c0,</div><div class='del'>-	0x2bd7, 0x127e, 0x2091, 0x8000, 0x6030, 0xc08d, 0xc085, 0xc0ac,</div><div class='del'>-	0x6032, 0x1078, 0x4224, 0x127f, 0x0078, 0x2bad, 0x81ff, 0x00c0,</div><div class='del'>-	0x2bd7, 0x6000, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x2001, 0xa753,</div><div class='del'>-	0x2004, 0xd0ac, 0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040, 0x2bdb,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x36d3, 0x7828,</div><div class='del'>-	0xa005, 0x0040, 0x2bad, 0x0c7e, 0x1078, 0x35ba, 0x0c7f, 0x0040,</div><div class='del'>-	0x2bd7, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,</div><div class='del'>-	0x1078, 0x8f22, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x36e9,</div><div class='del'>-	0x007c, 0x6830, 0xa086, 0x0100, 0x0040, 0x2bd7, 0x0078, 0x2bad,</div><div class='del'>-	0x2001, 0xa700, 0x2004, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x7f24,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x35ba, 0x0040, 0x2bd7,</div><div class='del'>-	0x2009, 0x0000, 0x2031, 0x0000, 0x7023, 0x0000, 0x702f, 0x0000,</div><div class='del'>-	0xad80, 0x0005, 0x7026, 0x20a0, 0x1078, 0x45c4, 0x00c0, 0x376d,</div><div class='del'>-	0x6004, 0xa0c4, 0x00ff, 0xa8c6, 0x0006, 0x0040, 0x371d, 0xa0c4,</div><div class='del'>-	0xff00, 0xa8c6, 0x0600, 0x00c0, 0x376d, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0ac, 0x00c0, 0x372a, 0x1078, 0x489b, 0x00c0, 0x372a, 0xd79c,</div><div class='del'>-	0x0040, 0x376d, 0xd794, 0x00c0, 0x3730, 0xd784, 0x0040, 0x373c,</div><div class='del'>-	0xac80, 0x0006, 0x2098, 0x3400, 0x20a9, 0x0004, 0x53a3, 0x1078,</div><div class='del'>-	0x3426, 0xd794, 0x0040, 0x3745, 0xac80, 0x000a, 0x2098, 0x3400,</div><div class='del'>-	0x20a9, 0x0004, 0x53a3, 0x1078, 0x3426, 0x21a2, 0xd794, 0x0040,</div><div class='del'>-	0x3765, 0xac80, 0x0000, 0x2098, 0x94a0, 0x20a9, 0x0002, 0x53a3,</div><div class='del'>-	0xac80, 0x0003, 0x20a6, 0x94a0, 0xac80, 0x0004, 0x2098, 0x3400,</div><div class='del'>-	0x20a9, 0x0002, 0x53a3, 0x1078, 0x3418, 0xac80, 0x0026, 0x2098,</div><div class='del'>-	0x20a9, 0x0002, 0x53a3, 0x0078, 0x3766, 0x94a0, 0xd794, 0x0040,</div><div class='del'>-	0x376b, 0xa6b0, 0x000b, 0xa6b0, 0x0005, 0x8108, 0xd78c, 0x0040,</div><div class='del'>-	0x3777, 0xa186, 0x0100, 0x0040, 0x3788, 0x0078, 0x377b, 0xa186,</div><div class='del'>-	0x007e, 0x0040, 0x3788, 0xd794, 0x0040, 0x3782, 0xa686, 0x0020,</div><div class='del'>-	0x0078, 0x3784, 0xa686, 0x0028, 0x0040, 0x3791, 0x0078, 0x370c,</div><div class='del'>-	0x86ff, 0x00c0, 0x378f, 0x7120, 0x810b, 0x0078, 0x2bad, 0x702f,</div><div class='del'>-	0x0001, 0x711e, 0x7020, 0xa600, 0x7022, 0x772a, 0x2061, 0xa7d2,</div><div class='del'>-	0x6007, 0x0000, 0x6612, 0x7024, 0x600e, 0x6226, 0x632a, 0x642e,</div><div class='del'>-	0x6532, 0x2c10, 0x1078, 0x13db, 0x7007, 0x0002, 0x701b, 0x37a9,</div><div class='del'>-	0x007c, 0x702c, 0xa005, 0x00c0, 0x37bb, 0x711c, 0x7024, 0x20a0,</div><div class='del'>-	0x7728, 0x2031, 0x0000, 0x2061, 0xa7d2, 0x6224, 0x6328, 0x642c,</div><div class='del'>-	0x6530, 0x0078, 0x370c, 0x7120, 0x810b, 0x0078, 0x2bad, 0x2029,</div><div class='del'>-	0x007e, 0x7924, 0x7a28, 0x7b2c, 0x7c38, 0xa184, 0xff00, 0x8007,</div><div class='del'>-	0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb, 0xa184,</div><div class='del'>-	0x00ff, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb,</div><div class='del'>-	0xa284, 0xff00, 0x8007, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502,</div><div class='del'>-	0x0048, 0x2bdb, 0xa284, 0x00ff, 0xa0e2, 0x0020, 0x0048, 0x2bdb,</div><div class='del'>-	0xa502, 0x0048, 0x2bdb, 0xa384, 0xff00, 0x8007, 0xa0e2, 0x0020,</div><div class='del'>-	0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb, 0xa384, 0x00ff, 0xa0e2,</div><div class='del'>-	0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb, 0xa484, 0xff00,</div><div class='del'>-	0x8007, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb,</div><div class='del'>-	0xa484, 0x00ff, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048,</div><div class='del'>-	0x2bdb, 0x2061, 0xa9a5, 0x6102, 0x6206, 0x630a, 0x640e, 0x0078,</div><div class='del'>-	0x2bad, 0x007e, 0x2001, 0xa753, 0x2004, 0xd0cc, 0x007f, 0x007c,</div><div class='del'>-	0x007e, 0x2001, 0xa772, 0x2004, 0xd0bc, 0x007f, 0x007c, 0x6164,</div><div class='del'>-	0x7a24, 0x6300, 0x82ff, 0x00c0, 0x3830, 0x7926, 0x0078, 0x2bad,</div><div class='del'>-	0x83ff, 0x00c0, 0x2bdb, 0x2001, 0xfff0, 0xa200, 0x00c8, 0x2bdb,</div><div class='del'>-	0x2019, 0xffff, 0x6068, 0xa302, 0xa200, 0x0048, 0x2bdb, 0x7926,</div><div class='del'>-	0x6266, 0x0078, 0x2bad, 0x2001, 0xa700, 0x2004, 0xa086, 0x0003,</div><div class='del'>-	0x00c0, 0x2bd7, 0x7c28, 0x7d24, 0x7e38, 0x7f2c, 0x1078, 0x35ba,</div><div class='del'>-	0x0040, 0x2bd7, 0x2009, 0x0000, 0x2019, 0x0000, 0x7023, 0x0000,</div><div class='del'>-	0x702f, 0x0000, 0xad80, 0x0003, 0x7026, 0x20a0, 0xa1e0, 0xa835,</div><div class='del'>-	0x2c64, 0x8cff, 0x0040, 0x387d, 0x6004, 0xa084, 0x00ff, 0xa086,</div><div class='del'>-	0x0006, 0x0040, 0x3872, 0x6004, 0xa084, 0xff00, 0xa086, 0x0600,</div><div class='del'>-	0x00c0, 0x387d, 0x6014, 0x20a2, 0x94a0, 0x6010, 0x8007, 0xa105,</div><div class='del'>-	0x8007, 0x20a2, 0x94a0, 0xa398, 0x0002, 0x8108, 0xa182, 0x00ff,</div><div class='del'>-	0x0040, 0x3888, 0xa386, 0x002a, 0x0040, 0x3891, 0x0078, 0x385e,</div><div class='del'>-	0x83ff, 0x00c0, 0x388f, 0x7120, 0x810c, 0x0078, 0x2bad, 0x702f,</div><div class='del'>-	0x0001, 0x711e, 0x7020, 0xa300, 0x7022, 0x2061, 0xa7d2, 0x6007,</div><div class='del'>-	0x0000, 0x6312, 0x7024, 0x600e, 0x6426, 0x652a, 0x662e, 0x6732,</div><div class='del'>-	0x2c10, 0x1078, 0x13db, 0x7007, 0x0002, 0x701b, 0x38a8, 0x007c,</div><div class='del'>-	0x702c, 0xa005, 0x00c0, 0x38b9, 0x711c, 0x7024, 0x20a0, 0x2019,</div><div class='del'>-	0x0000, 0x2061, 0xa7d2, 0x6424, 0x6528, 0x662c, 0x6730, 0x0078,</div><div class='del'>-	0x385e, 0x7120, 0x810c, 0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7,</div><div class='del'>-	0x60cc, 0xd09c, 0x0040, 0x2bd7, 0x1078, 0x35ba, 0x0040, 0x2bd7,</div><div class='del'>-	0x7924, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x3604, 0x701b,</div><div class='del'>-	0x38d2, 0x007c, 0x0d7e, 0xade8, 0x000d, 0x6828, 0xa0be, 0x7000,</div><div class='del'>-	0x0040, 0x38e5, 0xa0be, 0x7100, 0x0040, 0x38e5, 0xa0be, 0x7200,</div><div class='del'>-	0x0040, 0x38e5, 0x0d7f, 0x0078, 0x2bdb, 0x6820, 0x6924, 0x1078,</div><div class='del'>-	0x254d, 0x00c0, 0x3910, 0x1078, 0x455c, 0x00c0, 0x3910, 0x7122,</div><div class='del'>-	0x6612, 0x6516, 0x6e18, 0x0c7e, 0x1078, 0x35ba, 0x0040, 0x3910,</div><div class='del'>-	0x1078, 0x35ba, 0x0040, 0x3910, 0x0c7f, 0x0d7f, 0x6837, 0x0000,</div><div class='del'>-	0x6838, 0xc0fd, 0x683a, 0x6823, 0x0000, 0x6804, 0x2068, 0x1078,</div><div class='del'>-	0x8e92, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x3913, 0x007c,</div><div class='del'>-	0x0d7f, 0x0078, 0x2bd7, 0x7120, 0x1078, 0x298e, 0x6820, 0xa086,</div><div class='del'>-	0x8001, 0x0040, 0x2bd7, 0x2d00, 0x701e, 0x6804, 0xa080, 0x0002,</div><div class='del'>-	0x007e, 0x20a9, 0x002a, 0x2098, 0x20a0, 0x1078, 0x4281, 0x007f,</div><div class='del'>-	0xade8, 0x000d, 0x6a08, 0x6b0c, 0x6c10, 0x6d14, 0x2061, 0xa7d2,</div><div class='del'>-	0x6007, 0x0000, 0x6e00, 0x6f28, 0xa7c6, 0x7000, 0x00c0, 0x393a,</div><div class='del'>-	0x0078, 0x393e, 0xa7c6, 0x7100, 0x00c0, 0x3946, 0xa6c2, 0x0004,</div><div class='del'>-	0x0048, 0x2bdb, 0x2009, 0x0004, 0x0078, 0x3608, 0xa7c6, 0x7200,</div><div class='del'>-	0x00c0, 0x2bdb, 0xa6c2, 0x0054, 0x0048, 0x2bdb, 0x600e, 0x6013,</div><div class='del'>-	0x002a, 0x6226, 0x632a, 0x642e, 0x6532, 0x2c10, 0x1078, 0x13db,</div><div class='del'>-	0x7007, 0x0002, 0x701b, 0x395d, 0x007c, 0x701c, 0x2068, 0x6804,</div><div class='del'>-	0xa080, 0x0001, 0x2004, 0xa080, 0x0002, 0x007e, 0x20a9, 0x002a,</div><div class='del'>-	0x2098, 0x20a0, 0x1078, 0x4281, 0x007f, 0x2009, 0x002a, 0x2061,</div><div class='del'>-	0xa7d2, 0x6224, 0x6328, 0x642c, 0x6530, 0x0078, 0x3608, 0x81ff,</div><div class='del'>-	0x00c0, 0x2bd7, 0x792c, 0x2001, 0xa99d, 0x2102, 0x1078, 0x35d2,</div><div class='del'>-	0x0040, 0x2bdb, 0x1078, 0x4673, 0x0040, 0x2bd7, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x1078, 0x47de, 0x127f, 0x0078, 0x2bad, 0x7824, 0xd08c,</div><div class='del'>-	0x00c0, 0x3995, 0xd084, 0x0040, 0x31da, 0x1078, 0x35e4, 0x0040,</div><div class='del'>-	0x2bdb, 0x0c7e, 0x1078, 0x35ba, 0x0c7f, 0x00c0, 0x39a3, 0x2009,</div><div class='del'>-	0x0002, 0x0078, 0x2bd7, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,</div><div class='del'>-	0x0040, 0x39b0, 0xa08e, 0x0004, 0x0040, 0x39b0, 0xa08e, 0x0005,</div><div class='del'>-	0x00c0, 0x39dd, 0x7824, 0xd08c, 0x0040, 0x39bb, 0x6000, 0xc08c,</div><div class='del'>-	0x6002, 0x0078, 0x39c5, 0x2001, 0xa753, 0x2004, 0xd0b4, 0x0040,</div><div class='del'>-	0x320f, 0x6000, 0xd08c, 0x00c0, 0x320f, 0x6837, 0x0000, 0x6838,</div><div class='del'>-	0xc0fd, 0x683a, 0x1078, 0x8eae, 0x00c0, 0x39d2, 0x2009, 0x0003,</div><div class='del'>-	0x0078, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x39d7, 0x007c, 0x1078,</div><div class='del'>-	0x35e4, 0x0040, 0x2bdb, 0x0078, 0x320f, 0x2009, 0xa72f, 0x210c,</div><div class='del'>-	0x81ff, 0x0040, 0x39e7, 0x2009, 0x0001, 0x0078, 0x2bd7, 0x2001,</div><div class='del'>-	0xa700, 0x2004, 0xa086, 0x0003, 0x0040, 0x39f2, 0x2009, 0x0007,</div><div class='del'>-	0x0078, 0x2bd7, 0x2001, 0xa753, 0x2004, 0xd0ac, 0x0040, 0x39fc,</div><div class='del'>-	0x2009, 0x0008, 0x0078, 0x2bd7, 0x609c, 0xd0a4, 0x00c0, 0x3a03,</div><div class='del'>-	0xd0ac, 0x00c0, 0x320f, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838,</div><div class='del'>-	0xc0fd, 0x683a, 0x1078, 0x8f22, 0x00c0, 0x3a12, 0x2009, 0x0003,</div><div class='del'>-	0x0078, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x3a17, 0x007c, 0x6830,</div><div class='del'>-	0xa086, 0x0100, 0x00c0, 0x3a20, 0x2009, 0x0004, 0x0078, 0x2bd7,</div><div class='del'>-	0x1078, 0x35e4, 0x0040, 0x2bdb, 0x0078, 0x39b2, 0x81ff, 0x2009,</div><div class='del'>-	0x0001, 0x00c0, 0x2bd7, 0x6000, 0xa086, 0x0003, 0x2009, 0x0007,</div><div class='del'>-	0x00c0, 0x2bd7, 0x2001, 0xa753, 0x2004, 0xd0ac, 0x2009, 0x0008,</div><div class='del'>-	0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x6004, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x0006, 0x2009, 0x0009, 0x00c0, 0x2bd7, 0x0c7e,</div><div class='del'>-	0x1078, 0x35ba, 0x0c7f, 0x2009, 0x0002, 0x0040, 0x2bd7, 0x6837,</div><div class='del'>-	0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x7928, 0xa194,</div><div class='del'>-	0xff00, 0xa18c, 0x00ff, 0xa006, 0x82ff, 0x00c0, 0x3a65, 0xc0ed,</div><div class='del'>-	0x6952, 0x792c, 0x6956, 0x0078, 0x3a6e, 0xa28e, 0x0100, 0x00c0,</div><div class='del'>-	0x2bdb, 0xc0e5, 0x6853, 0x0000, 0x6857, 0x0000, 0x683e, 0x1078,</div><div class='del'>-	0x90cd, 0x2009, 0x0003, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b,</div><div class='del'>-	0x3a7a, 0x007c, 0x6830, 0xa086, 0x0100, 0x2009, 0x0004, 0x0040,</div><div class='del'>-	0x2bd7, 0x0078, 0x2bad, 0x81ff, 0x2009, 0x0001, 0x00c0, 0x2bd7,</div><div class='del'>-	0x6000, 0xa086, 0x0003, 0x2009, 0x0007, 0x00c0, 0x2bd7, 0x1078,</div><div class='del'>-	0x35e4, 0x0040, 0x2bdb, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,</div><div class='del'>-	0x2009, 0x0009, 0x00c0, 0x2bd7, 0x0c7e, 0x1078, 0x35ba, 0x0c7f,</div><div class='del'>-	0x2009, 0x0002, 0x0040, 0x2bd7, 0xad80, 0x000f, 0x2009, 0x0008,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x3604, 0x701b, 0x3ab1,</div><div class='del'>-	0x007c, 0x0d7e, 0xade8, 0x000f, 0x6800, 0xa086, 0x0500, 0x00c0,</div><div class='del'>-	0x3ac4, 0x6804, 0xa005, 0x00c0, 0x3ac4, 0x6808, 0xa084, 0xff00,</div><div class='del'>-	0x00c0, 0x3ac4, 0x0078, 0x3ac7, 0x0d7f, 0x00c0, 0x2bdb, 0x0d7f,</div><div class='del'>-	0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x0c7e,</div><div class='del'>-	0x1078, 0x35e4, 0x00c0, 0x3ad7, 0x0c7f, 0x0078, 0x2bdb, 0x1078,</div><div class='del'>-	0x9129, 0x2009, 0x0003, 0x0c7f, 0x0040, 0x2bd7, 0x7007, 0x0003,</div><div class='del'>-	0x701b, 0x3ae3, 0x007c, 0x6830, 0xa086, 0x0100, 0x2009, 0x0004,</div><div class='del'>-	0x0040, 0x2bd7, 0x0078, 0x2bad, 0x127e, 0x0c7e, 0x0e7e, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0xa700, 0x6044, 0xd0a4, 0x00c0, 0x3b15, 0xd084,</div><div class='del'>-	0x0040, 0x3afe, 0x1078, 0x3c75, 0x0078, 0x3b11, 0xd08c, 0x0040,</div><div class='del'>-	0x3b05, 0x1078, 0x3b8c, 0x0078, 0x3b11, 0xd094, 0x0040, 0x3b0c,</div><div class='del'>-	0x1078, 0x3b60, 0x0078, 0x3b11, 0xd09c, 0x0040, 0x3b11, 0x1078,</div><div class='del'>-	0x3b1f, 0x0e7f, 0x0c7f, 0x127f, 0x007c, 0x017e, 0x6128, 0xd19c,</div><div class='del'>-	0x00c0, 0x3b1c, 0xc19d, 0x612a, 0x017f, 0x0078, 0x3b11, 0x624c,</div><div class='del'>-	0xa286, 0xf0f0, 0x00c0, 0x3b30, 0x6048, 0xa086, 0xf0f0, 0x0040,</div><div class='del'>-	0x3b30, 0x624a, 0x6043, 0x0090, 0x6043, 0x0010, 0x0078, 0x3b5f,</div><div class='del'>-	0xa294, 0xff00, 0xa296, 0xf700, 0x0040, 0x3b45, 0x7134, 0xd1a4,</div><div class='del'>-	0x00c0, 0x3b45, 0x6240, 0xa294, 0x0010, 0x0040, 0x3b45, 0x2009,</div><div class='del'>-	0x00f7, 0x1078, 0x42a1, 0x0078, 0x3b5f, 0x6043, 0x0040, 0x6043,</div><div class='del'>-	0x0000, 0x7077, 0x0000, 0x708f, 0x0001, 0x70b3, 0x0000, 0x70cf,</div><div class='del'>-	0x0000, 0x2009, 0xadc0, 0x200b, 0x0000, 0x7087, 0x0000, 0x707b,</div><div class='del'>-	0x000f, 0x2009, 0x000f, 0x2011, 0x41d5, 0x1078, 0x5add, 0x007c,</div><div class='del'>-	0x157e, 0x7078, 0xa005, 0x00c0, 0x3b8a, 0x2011, 0x41d5, 0x1078,</div><div class='del'>-	0x5a45, 0x6040, 0xa094, 0x0010, 0xa285, 0x0020, 0x6042, 0x20a9,</div><div class='del'>-	0x00c8, 0x6044, 0xd08c, 0x00c0, 0x3b83, 0x00f0, 0x3b71, 0x6242,</div><div class='del'>-	0x708b, 0x0000, 0x6040, 0xa094, 0x0010, 0xa285, 0x0080, 0x6042,</div><div class='del'>-	0x6242, 0x0078, 0x3b8a, 0x6242, 0x708b, 0x0000, 0x707f, 0x0000,</div><div class='del'>-	0x0078, 0x3b8a, 0x157f, 0x007c, 0x707c, 0xa08a, 0x0003, 0x00c8,</div><div class='del'>-	0x3b95, 0x1079, 0x3b98, 0x0078, 0x3b97, 0x1078, 0x1332, 0x007c,</div><div class='del'>-	0x3b9b, 0x3bea, 0x3c74, 0x0f7e, 0x707f, 0x0001, 0x20e1, 0xa000,</div><div class='del'>-	0x20e1, 0x8700, 0x1078, 0x21f7, 0x20e1, 0x9080, 0x20e1, 0x4000,</div><div class='del'>-	0x2079, 0xac00, 0x207b, 0x2200, 0x7807, 0x00ef, 0x780b, 0x0000,</div><div class='del'>-	0x780f, 0x00ef, 0x7813, 0x0138, 0x7817, 0x0000, 0x781b, 0x0000,</div><div class='del'>-	0x781f, 0x0000, 0x7823, 0xffff, 0x7827, 0xffff, 0x782b, 0x0000,</div><div class='del'>-	0x782f, 0x0000, 0x2079, 0xac0c, 0x207b, 0x1101, 0x7807, 0x0000,</div><div class='del'>-	0x2099, 0xa705, 0x20a1, 0xac0e, 0x20a9, 0x0004, 0x53a3, 0x2079,</div><div class='del'>-	0xac12, 0x207b, 0x0000, 0x7807, 0x0000, 0x2099, 0xac00, 0x20a1,</div><div class='del'>-	0x020b, 0x20a9, 0x0014, 0x53a6, 0x60c3, 0x000c, 0x600f, 0x0000,</div><div class='del'>-	0x1078, 0x420b, 0x0f7f, 0x7083, 0x0000, 0x6043, 0x0008, 0x6043,</div><div class='del'>-	0x0000, 0x007c, 0x0d7e, 0x7080, 0x7083, 0x0000, 0xa025, 0x0040,</div><div class='del'>-	0x3c5e, 0x6020, 0xd0b4, 0x00c0, 0x3c5c, 0x718c, 0x81ff, 0x0040,</div><div class='del'>-	0x3c4b, 0xa486, 0x000c, 0x00c0, 0x3c56, 0xa480, 0x0018, 0x8004,</div><div class='del'>-	0x20a8, 0x2011, 0xac80, 0x2019, 0xac00, 0x220c, 0x2304, 0xa106,</div><div class='del'>-	0x00c0, 0x3c22, 0x8210, 0x8318, 0x00f0, 0x3c05, 0x6043, 0x0004,</div><div class='del'>-	0x608b, 0xbc94, 0x608f, 0xf0f0, 0x6043, 0x0006, 0x707f, 0x0002,</div><div class='del'>-	0x708b, 0x0002, 0x2009, 0x07d0, 0x2011, 0x41dc, 0x1078, 0x5add,</div><div class='del'>-	0x0078, 0x3c5c, 0x2069, 0xac80, 0x6930, 0xa18e, 0x1101, 0x00c0,</div><div class='del'>-	0x3c56, 0x6834, 0xa005, 0x00c0, 0x3c56, 0x6900, 0xa18c, 0x00ff,</div><div class='del'>-	0x00c0, 0x3c36, 0x6804, 0xa005, 0x0040, 0x3c4b, 0x2011, 0xac8e,</div><div class='del'>-	0x2019, 0xa705, 0x20a9, 0x0004, 0x220c, 0x2304, 0xa102, 0x0048,</div><div class='del'>-	0x3c49, 0x00c0, 0x3c56, 0x8210, 0x8318, 0x00f0, 0x3c3c, 0x0078,</div><div class='del'>-	0x3c56, 0x708f, 0x0000, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099,</div><div class='del'>-	0xac80, 0x20a1, 0x020b, 0x20a9, 0x0014, 0x53a6, 0x6043, 0x0008,</div><div class='del'>-	0x6043, 0x0000, 0x0078, 0x3c5e, 0x0d7f, 0x007c, 0x6020, 0xd0b4,</div><div class='del'>-	0x00c0, 0x3c5c, 0x60c3, 0x000c, 0x2011, 0xa9bb, 0x2013, 0x0000,</div><div class='del'>-	0x7083, 0x0000, 0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7, 0x9575,</div><div class='del'>-	0x1078, 0x6e06, 0x0078, 0x3c5c, 0x007c, 0x7088, 0xa08a, 0x001d,</div><div class='del'>-	0x00c8, 0x3c7e, 0x1079, 0x3c81, 0x0078, 0x3c80, 0x1078, 0x1332,</div><div class='del'>-	0x007c, 0x3cab, 0x3cba, 0x3ce9, 0x3d02, 0x3d2e, 0x3d5a, 0x3d86,</div><div class='del'>-	0x3dbc, 0x3de8, 0x3e10, 0x3e53, 0x3e7d, 0x3e9f, 0x3eb5, 0x3edb,</div><div class='del'>-	0x3eee, 0x3ef7, 0x3f2b, 0x3f57, 0x3f83, 0x3faf, 0x3fe5, 0x4030,</div><div class='del'>-	0x405f, 0x4081, 0x40c3, 0x40e9, 0x4102, 0x4103, 0x0c7e, 0x2061,</div><div class='del'>-	0xa700, 0x6003, 0x0007, 0x2061, 0x0100, 0x6004, 0xa084, 0xfff9,</div><div class='del'>-	0x6006, 0x0c7f, 0x007c, 0x608b, 0xbc94, 0x608f, 0xf0f0, 0x6043,</div><div class='del'>-	0x0002, 0x708b, 0x0001, 0x2009, 0x07d0, 0x2011, 0x41dc, 0x1078,</div><div class='del'>-	0x5add, 0x007c, 0x0f7e, 0x7080, 0xa086, 0x0014, 0x00c0, 0x3ce7,</div><div class='del'>-	0x6043, 0x0000, 0x6020, 0xd0b4, 0x00c0, 0x3ce7, 0x2079, 0xac80,</div><div class='del'>-	0x7a30, 0xa296, 0x1102, 0x00c0, 0x3ce5, 0x7834, 0xa005, 0x00c0,</div><div class='del'>-	0x3ce5, 0x7a38, 0xd2fc, 0x0040, 0x3cdb, 0x70b0, 0xa005, 0x00c0,</div><div class='del'>-	0x3cdb, 0x70b3, 0x0001, 0x2011, 0x41dc, 0x1078, 0x5a45, 0x708b,</div><div class='del'>-	0x0010, 0x1078, 0x3ef7, 0x0078, 0x3ce7, 0x1078, 0x4224, 0x0f7f,</div><div class='del'>-	0x007c, 0x708b, 0x0003, 0x6043, 0x0004, 0x2011, 0x41dc, 0x1078,</div><div class='del'>-	0x5a45, 0x1078, 0x4289, 0x20a3, 0x1102, 0x20a3, 0x0000, 0x20a9,</div><div class='del'>-	0x000a, 0x20a3, 0x0000, 0x00f0, 0x3cf9, 0x60c3, 0x0014, 0x1078,</div><div class='del'>-	0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3d2c, 0x2011,</div><div class='del'>-	0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3d2a, 0x2079,</div><div class='del'>-	0xac80, 0x7a30, 0xa296, 0x1102, 0x00c0, 0x3d2a, 0x7834, 0xa005,</div><div class='del'>-	0x00c0, 0x3d2a, 0x7a38, 0xd2fc, 0x0040, 0x3d24, 0x70b0, 0xa005,</div><div class='del'>-	0x00c0, 0x3d24, 0x70b3, 0x0001, 0x708b, 0x0004, 0x1078, 0x3d2e,</div><div class='del'>-	0x0078, 0x3d2c, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b, 0x0005,</div><div class='del'>-	0x1078, 0x4289, 0x20a3, 0x1103, 0x20a3, 0x0000, 0x3430, 0x2011,</div><div class='del'>-	0xac8e, 0x1078, 0x42d4, 0x00c0, 0x3d4c, 0x7074, 0xa005, 0x00c0,</div><div class='del'>-	0x3d4c, 0x7150, 0xa186, 0xffff, 0x0040, 0x3d4c, 0x1078, 0x419d,</div><div class='del'>-	0x0040, 0x3d4c, 0x1078, 0x42b8, 0x20a9, 0x0008, 0x2298, 0x26a0,</div><div class='del'>-	0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078,</div><div class='del'>-	0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3d84, 0x2011,</div><div class='del'>-	0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3d82, 0x2079,</div><div class='del'>-	0xac80, 0x7a30, 0xa296, 0x1103, 0x00c0, 0x3d82, 0x7834, 0xa005,</div><div class='del'>-	0x00c0, 0x3d82, 0x7a38, 0xd2fc, 0x0040, 0x3d7c, 0x70b0, 0xa005,</div><div class='del'>-	0x00c0, 0x3d7c, 0x70b3, 0x0001, 0x708b, 0x0006, 0x1078, 0x3d86,</div><div class='del'>-	0x0078, 0x3d84, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b, 0x0007,</div><div class='del'>-	0x1078, 0x4289, 0x20a3, 0x1104, 0x20a3, 0x0000, 0x3430, 0x2011,</div><div class='del'>-	0xac8e, 0x1078, 0x42d4, 0x00c0, 0x3dae, 0x7074, 0xa005, 0x00c0,</div><div class='del'>-	0x3dae, 0x7154, 0xa186, 0xffff, 0x0040, 0x3dae, 0xa180, 0x29c0,</div><div class='del'>-	0x200c, 0xa18c, 0xff00, 0x810f, 0x1078, 0x419d, 0x0040, 0x3dae,</div><div class='del'>-	0x1078, 0x3820, 0x0040, 0x3dae, 0x1078, 0x256a, 0x20a9, 0x0008,</div><div class='del'>-	0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3,</div><div class='del'>-	0x0014, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040,</div><div class='del'>-	0x3de6, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0,</div><div class='del'>-	0x3de4, 0x2079, 0xac80, 0x7a30, 0xa296, 0x1104, 0x00c0, 0x3de4,</div><div class='del'>-	0x7834, 0xa005, 0x00c0, 0x3de4, 0x7a38, 0xd2fc, 0x0040, 0x3dde,</div><div class='del'>-	0x70b0, 0xa005, 0x00c0, 0x3dde, 0x70b3, 0x0001, 0x708b, 0x0008,</div><div class='del'>-	0x1078, 0x3de8, 0x0078, 0x3de6, 0x1078, 0x4224, 0x0f7f, 0x007c,</div><div class='del'>-	0x708b, 0x0009, 0x1078, 0x4289, 0x20a3, 0x1105, 0x20a3, 0x0100,</div><div class='del'>-	0x3430, 0x1078, 0x42d4, 0x00c0, 0x3e01, 0x7074, 0xa005, 0x00c0,</div><div class='del'>-	0x3e01, 0x1078, 0x4104, 0x00c0, 0x3e0b, 0xa085, 0x0001, 0x1078,</div><div class='del'>-	0x256a, 0x20a9, 0x0008, 0x2099, 0xac8e, 0x26a0, 0x53a6, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078, 0x420b, 0x007c,</div><div class='del'>-	0x0f7e, 0x7080, 0xa005, 0x0040, 0x3e51, 0x2011, 0x41dc, 0x1078,</div><div class='del'>-	0x5a45, 0xa086, 0x0014, 0x00c0, 0x3e4f, 0x2079, 0xac80, 0x7a30,</div><div class='del'>-	0xa296, 0x1105, 0x00c0, 0x3e4f, 0x7834, 0x2011, 0x0100, 0xa21e,</div><div class='del'>-	0x00c0, 0x3e3a, 0x7a38, 0xd2fc, 0x0040, 0x3e34, 0x70b0, 0xa005,</div><div class='del'>-	0x00c0, 0x3e34, 0x70b3, 0x0001, 0x708b, 0x000a, 0x1078, 0x3e53,</div><div class='del'>-	0x0078, 0x3e51, 0xa005, 0x00c0, 0x3e4f, 0x7a38, 0xd2fc, 0x0040,</div><div class='del'>-	0x3e47, 0x70b0, 0xa005, 0x00c0, 0x3e47, 0x70b3, 0x0001, 0x7087,</div><div class='del'>-	0x0000, 0x708b, 0x000e, 0x1078, 0x3edb, 0x0078, 0x3e51, 0x1078,</div><div class='del'>-	0x4224, 0x0f7f, 0x007c, 0x708b, 0x000b, 0x2011, 0xac0e, 0x22a0,</div><div class='del'>-	0x20a9, 0x0040, 0x2019, 0xffff, 0x43a4, 0x20a9, 0x0002, 0x2009,</div><div class='del'>-	0x0000, 0x41a4, 0x1078, 0x4289, 0x20a3, 0x1106, 0x20a3, 0x0000,</div><div class='del'>-	0x1078, 0x42d4, 0x0040, 0x3e70, 0x2013, 0x0000, 0x0078, 0x3e74,</div><div class='del'>-	0x6030, 0xa085, 0x0100, 0x2012, 0x2298, 0x20a9, 0x0042, 0x53a6,</div><div class='del'>-	0x60c3, 0x0084, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005,</div><div class='del'>-	0x0040, 0x3e9d, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0084,</div><div class='del'>-	0x00c0, 0x3e9b, 0x2079, 0xac80, 0x7a30, 0xa296, 0x1106, 0x00c0,</div><div class='del'>-	0x3e9b, 0x7834, 0xa005, 0x00c0, 0x3e9b, 0x708b, 0x000c, 0x1078,</div><div class='del'>-	0x3e9f, 0x0078, 0x3e9d, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b,</div><div class='del'>-	0x000d, 0x1078, 0x4289, 0x20a3, 0x1107, 0x20a3, 0x0000, 0x2099,</div><div class='del'>-	0xac8e, 0x20a9, 0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0084, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005,</div><div class='del'>-	0x0040, 0x3ed9, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0084,</div><div class='del'>-	0x00c0, 0x3ed7, 0x2079, 0xac80, 0x7a30, 0xa296, 0x1107, 0x00c0,</div><div class='del'>-	0x3ed7, 0x7834, 0xa005, 0x00c0, 0x3ed7, 0x7087, 0x0001, 0x1078,</div><div class='del'>-	0x427b, 0x708b, 0x000e, 0x1078, 0x3edb, 0x0078, 0x3ed9, 0x1078,</div><div class='del'>-	0x4224, 0x0f7f, 0x007c, 0x708b, 0x000f, 0x7083, 0x0000, 0x608b,</div><div class='del'>-	0xbc85, 0x608f, 0xb5b5, 0x6043, 0x0005, 0x6043, 0x0004, 0x2009,</div><div class='del'>-	0x07d0, 0x2011, 0x41dc, 0x1078, 0x5a38, 0x007c, 0x7080, 0xa005,</div><div class='del'>-	0x0040, 0x3ef6, 0x2011, 0x41dc, 0x1078, 0x5a45, 0x007c, 0x708b,</div><div class='del'>-	0x0011, 0x1078, 0x42d4, 0x00c0, 0x3f14, 0x716c, 0x81ff, 0x0040,</div><div class='del'>-	0x3f14, 0x2009, 0x0000, 0x7070, 0xa084, 0x00ff, 0x1078, 0x254d,</div><div class='del'>-	0xa186, 0x007e, 0x0040, 0x3f14, 0xa186, 0x0080, 0x0040, 0x3f14,</div><div class='del'>-	0x2011, 0xac8e, 0x1078, 0x419d, 0x20e1, 0x9080, 0x20e1, 0x4000,</div><div class='del'>-	0x2099, 0xac80, 0x20a1, 0x020b, 0x7480, 0xa480, 0x0018, 0xa080,</div><div class='del'>-	0x0007, 0xa084, 0x03f8, 0x8004, 0x20a8, 0x53a6, 0x60c3, 0x0014,</div><div class='del'>-	0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3f55,</div><div class='del'>-	0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3f53,</div><div class='del'>-	0x2079, 0xac80, 0x7a30, 0xa296, 0x1103, 0x00c0, 0x3f53, 0x7834,</div><div class='del'>-	0xa005, 0x00c0, 0x3f53, 0x7a38, 0xd2fc, 0x0040, 0x3f4d, 0x70b0,</div><div class='del'>-	0xa005, 0x00c0, 0x3f4d, 0x70b3, 0x0001, 0x708b, 0x0012, 0x1078,</div><div class='del'>-	0x3f57, 0x0078, 0x3f55, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b,</div><div class='del'>-	0x0013, 0x1078, 0x4295, 0x20a3, 0x1103, 0x20a3, 0x0000, 0x3430,</div><div class='del'>-	0x2011, 0xac8e, 0x1078, 0x42d4, 0x00c0, 0x3f75, 0x7074, 0xa005,</div><div class='del'>-	0x00c0, 0x3f75, 0x7150, 0xa186, 0xffff, 0x0040, 0x3f75, 0x1078,</div><div class='del'>-	0x419d, 0x0040, 0x3f75, 0x1078, 0x42b8, 0x20a9, 0x0008, 0x2298,</div><div class='del'>-	0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014,</div><div class='del'>-	0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3fad,</div><div class='del'>-	0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3fab,</div><div class='del'>-	0x2079, 0xac80, 0x7a30, 0xa296, 0x1104, 0x00c0, 0x3fab, 0x7834,</div><div class='del'>-	0xa005, 0x00c0, 0x3fab, 0x7a38, 0xd2fc, 0x0040, 0x3fa5, 0x70b0,</div><div class='del'>-	0xa005, 0x00c0, 0x3fa5, 0x70b3, 0x0001, 0x708b, 0x0014, 0x1078,</div><div class='del'>-	0x3faf, 0x0078, 0x3fad, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b,</div><div class='del'>-	0x0015, 0x1078, 0x4295, 0x20a3, 0x1104, 0x20a3, 0x0000, 0x3430,</div><div class='del'>-	0x2011, 0xac8e, 0x1078, 0x42d4, 0x00c0, 0x3fd7, 0x7074, 0xa005,</div><div class='del'>-	0x00c0, 0x3fd7, 0x7154, 0xa186, 0xffff, 0x0040, 0x3fd7, 0xa180,</div><div class='del'>-	0x29c0, 0x200c, 0xa18c, 0xff00, 0x810f, 0x1078, 0x419d, 0x0040,</div><div class='del'>-	0x3fd7, 0x1078, 0x3820, 0x0040, 0x3fd7, 0x1078, 0x256a, 0x20a9,</div><div class='del'>-	0x0008, 0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0014, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005,</div><div class='del'>-	0x0040, 0x402e, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014,</div><div class='del'>-	0x00c0, 0x402c, 0x2079, 0xac80, 0x7a30, 0xa296, 0x1105, 0x00c0,</div><div class='del'>-	0x402c, 0x7834, 0x2011, 0x0100, 0xa21e, 0x00c0, 0x400b, 0x7a38,</div><div class='del'>-	0xd2fc, 0x0040, 0x4009, 0x70b0, 0xa005, 0x00c0, 0x4009, 0x70b3,</div><div class='del'>-	0x0001, 0x0078, 0x401a, 0xa005, 0x00c0, 0x402c, 0x7a38, 0xd2fc,</div><div class='del'>-	0x0040, 0x4018, 0x70b0, 0xa005, 0x00c0, 0x4018, 0x70b3, 0x0001,</div><div class='del'>-	0x7087, 0x0000, 0x7a38, 0xd2f4, 0x0040, 0x4026, 0x2001, 0xa774,</div><div class='del'>-	0x2004, 0xd0a4, 0x00c0, 0x4026, 0x70cf, 0x0008, 0x708b, 0x0016,</div><div class='del'>-	0x1078, 0x4030, 0x0078, 0x402e, 0x1078, 0x4224, 0x0f7f, 0x007c,</div><div class='del'>-	0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xac80, 0x20a1, 0x020b,</div><div class='del'>-	0x20a9, 0x000e, 0x53a6, 0x3430, 0x2011, 0xac8e, 0x708b, 0x0017,</div><div class='del'>-	0x1078, 0x42d4, 0x00c0, 0x4050, 0x7074, 0xa005, 0x00c0, 0x4050,</div><div class='del'>-	0x1078, 0x4104, 0x00c0, 0x405a, 0xa085, 0x0001, 0x1078, 0x256a,</div><div class='del'>-	0x20a9, 0x0008, 0x2099, 0xac8e, 0x26a0, 0x53a6, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078, 0x420b, 0x007c, 0x0f7e,</div><div class='del'>-	0x7080, 0xa005, 0x0040, 0x407f, 0x2011, 0x41dc, 0x1078, 0x5a45,</div><div class='del'>-	0xa086, 0x0084, 0x00c0, 0x407d, 0x2079, 0xac80, 0x7a30, 0xa296,</div><div class='del'>-	0x1106, 0x00c0, 0x407d, 0x7834, 0xa005, 0x00c0, 0x407d, 0x708b,</div><div class='del'>-	0x0018, 0x1078, 0x4081, 0x0078, 0x407f, 0x1078, 0x4224, 0x0f7f,</div><div class='del'>-	0x007c, 0x708b, 0x0019, 0x1078, 0x4295, 0x20a3, 0x1106, 0x20a3,</div><div class='del'>-	0x0000, 0x3430, 0x2099, 0xac8e, 0x2039, 0xac0e, 0x27a0, 0x20a9,</div><div class='del'>-	0x0040, 0x53a3, 0x1078, 0x42d4, 0x00c0, 0x40b5, 0x2728, 0x2514,</div><div class='del'>-	0x8207, 0xa084, 0x00ff, 0x8000, 0x2018, 0xa294, 0x00ff, 0x8007,</div><div class='del'>-	0xa205, 0x202a, 0x6030, 0x2310, 0x8214, 0xa2a0, 0xac0e, 0x2414,</div><div class='del'>-	0xa38c, 0x0001, 0x0040, 0x40b0, 0xa294, 0xff00, 0x0078, 0x40b3,</div><div class='del'>-	0xa294, 0x00ff, 0x8007, 0xa215, 0x2222, 0x2798, 0x26a0, 0x20a9,</div><div class='del'>-	0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0084,</div><div class='del'>-	0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x40e7,</div><div class='del'>-	0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0084, 0x00c0, 0x40e5,</div><div class='del'>-	0x2079, 0xac80, 0x7a30, 0xa296, 0x1107, 0x00c0, 0x40e5, 0x7834,</div><div class='del'>-	0xa005, 0x00c0, 0x40e5, 0x7087, 0x0001, 0x1078, 0x427b, 0x708b,</div><div class='del'>-	0x001a, 0x1078, 0x40e9, 0x0078, 0x40e7, 0x1078, 0x4224, 0x0f7f,</div><div class='del'>-	0x007c, 0x708b, 0x001b, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099,</div><div class='del'>-	0xac80, 0x20a1, 0x020b, 0x7480, 0xa480, 0x0018, 0xa080, 0x0007,</div><div class='del'>-	0xa084, 0x03f8, 0x8004, 0x20a8, 0x53a6, 0x60c3, 0x0084, 0x1078,</div><div class='del'>-	0x420b, 0x007c, 0x007c, 0x007c, 0x087e, 0x097e, 0x2029, 0xa753,</div><div class='del'>-	0x252c, 0x20a9, 0x0008, 0x2041, 0xac0e, 0x28a0, 0x2099, 0xac8e,</div><div class='del'>-	0x53a3, 0x20a9, 0x0008, 0x2011, 0x0007, 0xd5d4, 0x0040, 0x411a,</div><div class='del'>-	0x2011, 0x0000, 0x2800, 0xa200, 0x200c, 0xa1a6, 0xffff, 0x00c0,</div><div class='del'>-	0x412c, 0xd5d4, 0x0040, 0x4127, 0x8210, 0x0078, 0x4128, 0x8211,</div><div class='del'>-	0x00f0, 0x411a, 0x0078, 0x4194, 0x82ff, 0x00c0, 0x413e, 0xd5d4,</div><div class='del'>-	0x0040, 0x4138, 0xa1a6, 0x3fff, 0x0040, 0x4124, 0x0078, 0x413c,</div><div class='del'>-	0xa1a6, 0x3fff, 0x0040, 0x4194, 0xa18d, 0xc000, 0x20a9, 0x0010,</div><div class='del'>-	0x2019, 0x0001, 0xd5d4, 0x0040, 0x4147, 0x2019, 0x0010, 0x2120,</div><div class='del'>-	0xd5d4, 0x0040, 0x414e, 0x8423, 0x0078, 0x414f, 0x8424, 0x00c8,</div><div class='del'>-	0x415c, 0xd5d4, 0x0040, 0x4157, 0x8319, 0x0078, 0x4158, 0x8318,</div><div class='del'>-	0x00f0, 0x4148, 0x0078, 0x4194, 0x23a8, 0x2021, 0x0001, 0x8426,</div><div class='del'>-	0x8425, 0x00f0, 0x4160, 0x2328, 0x8529, 0xa2be, 0x0007, 0x0040,</div><div class='del'>-	0x4174, 0x007e, 0x2039, 0x0007, 0x2200, 0xa73a, 0x007f, 0x27a8,</div><div class='del'>-	0xa5a8, 0x0010, 0x00f0, 0x4170, 0x7552, 0xa5c8, 0x29c0, 0x292c,</div><div class='del'>-	0xa5ac, 0x00ff, 0x6532, 0x60e7, 0x0000, 0x65ea, 0x706f, 0x0000,</div><div class='del'>-	0x7572, 0x2018, 0x2304, 0xa405, 0x201a, 0x7077, 0x0001, 0x26a0,</div><div class='del'>-	0x2898, 0x20a9, 0x0008, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x419a, 0xa006, 0x0078, 0x419a, 0xa006,</div><div class='del'>-	0x1078, 0x1332, 0x097f, 0x087f, 0x007c, 0x2118, 0x2021, 0x0000,</div><div class='del'>-	0x2001, 0x0007, 0xa39a, 0x0010, 0x0048, 0x41aa, 0x8420, 0x8001,</div><div class='del'>-	0x0078, 0x41a2, 0x2118, 0x84ff, 0x0040, 0x41b3, 0xa39a, 0x0010,</div><div class='del'>-	0x8421, 0x00c0, 0x41ae, 0x2021, 0x0001, 0x83ff, 0x0040, 0x41bc,</div><div class='del'>-	0x8423, 0x8319, 0x00c0, 0x41b8, 0xa238, 0x2704, 0xa42c, 0x00c0,</div><div class='del'>-	0x41d4, 0xa405, 0x203a, 0x7152, 0xa1a0, 0x29c0, 0x242c, 0xa5ac,</div><div class='del'>-	0x00ff, 0x6532, 0x60e7, 0x0000, 0x65ea, 0x706f, 0x0000, 0x7572,</div><div class='del'>-	0x7077, 0x0001, 0xa084, 0x0000, 0x007c, 0x0e7e, 0x2071, 0xa700,</div><div class='del'>-	0x707b, 0x0000, 0x0e7f, 0x007c, 0x0e7e, 0x0f7e, 0x2001, 0x0002,</div><div class='del'>-	0x1078, 0x5ae6, 0x2079, 0x0100, 0x2071, 0x0140, 0x1078, 0x6e0f,</div><div class='del'>-	0x7004, 0xa084, 0x4000, 0x0040, 0x41f1, 0x7003, 0x1000, 0x7003,</div><div class='del'>-	0x0000, 0x127e, 0x2091, 0x8000, 0x2071, 0xa722, 0x2073, 0x0000,</div><div class='del'>-	0x7840, 0x027e, 0x017e, 0x2009, 0x00f7, 0x1078, 0x42a1, 0x017f,</div><div class='del'>-	0xa094, 0x0010, 0xa285, 0x0080, 0x7842, 0x7a42, 0x027f, 0x127f,</div><div class='del'>-	0x0f7f, 0x0e7f, 0x007c, 0x127e, 0x2091, 0x8000, 0x2011, 0xa9bb,</div><div class='del'>-	0x2013, 0x0000, 0x7083, 0x0000, 0x127f, 0x20e1, 0x9080, 0x60a3,</div><div class='del'>-	0x0056, 0x60a7, 0x9575, 0x1078, 0x6e06, 0x2009, 0x07d0, 0x2011,</div><div class='del'>-	0x41dc, 0x1078, 0x5add, 0x007c, 0x017e, 0x027e, 0x0c7e, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x2011, 0x0003, 0x1078, 0x70e0, 0x2011, 0x0002,</div><div class='del'>-	0x1078, 0x70ea, 0x1078, 0x6fc4, 0x037e, 0x2019, 0x0000, 0x1078,</div><div class='del'>-	0x7058, 0x037f, 0x2009, 0x00f7, 0x1078, 0x42a1, 0x2061, 0xa9c4,</div><div class='del'>-	0x601b, 0x0000, 0x601f, 0x0000, 0x2061, 0xa700, 0x6003, 0x0001,</div><div class='del'>-	0x2061, 0x0100, 0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0x002d,</div><div class='del'>-	0x2011, 0x4259, 0x1078, 0x5a38, 0x127f, 0x0c7f, 0x027f, 0x017f,</div><div class='del'>-	0x007c, 0x0e7e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2001, 0x0001,</div><div class='del'>-	0x1078, 0x5ae6, 0x2071, 0x0100, 0x1078, 0x6e0f, 0x2071, 0x0140,</div><div class='del'>-	0x7004, 0xa084, 0x4000, 0x0040, 0x4271, 0x7003, 0x1000, 0x7003,</div><div class='del'>-	0x0000, 0x2001, 0x0001, 0x1078, 0x24e8, 0x1078, 0x4224, 0x127f,</div><div class='del'>-	0x007f, 0x0e7f, 0x007c, 0x20a9, 0x0040, 0x20a1, 0xadc0, 0x2099,</div><div class='del'>-	0xac8e, 0x3304, 0x8007, 0x20a2, 0x9398, 0x94a0, 0x00f0, 0x4281,</div><div class='del'>-	0x007c, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xac00, 0x20a1,</div><div class='del'>-	0x020b, 0x20a9, 0x000c, 0x53a6, 0x007c, 0x20e1, 0x9080, 0x20e1,</div><div class='del'>-	0x4000, 0x2099, 0xac80, 0x20a1, 0x020b, 0x20a9, 0x000c, 0x53a6,</div><div class='del'>-	0x007c, 0x0c7e, 0x007e, 0x2061, 0x0100, 0x810f, 0x2001, 0xa72f,</div><div class='del'>-	0x2004, 0xa005, 0x00c0, 0x42b2, 0x6030, 0xa084, 0x00ff, 0xa105,</div><div class='del'>-	0x0078, 0x42b4, 0xa185, 0x00f7, 0x604a, 0x007f, 0x0c7f, 0x007c,</div><div class='del'>-	0x017e, 0x047e, 0x2001, 0xa753, 0x2004, 0xd0a4, 0x0040, 0x42cb,</div><div class='del'>-	0xa006, 0x2020, 0x2009, 0x002a, 0x1078, 0xa22d, 0x2001, 0xa70c,</div><div class='del'>-	0x200c, 0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0000, 0x1078,</div><div class='del'>-	0x284f, 0x047f, 0x017f, 0x007c, 0x007e, 0x2001, 0xa70c, 0x2004,</div><div class='del'>-	0xd09c, 0x0040, 0x42db, 0x007f, 0x007c, 0x007e, 0x017e, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x2001, 0x0101, 0x200c, 0xa18d, 0x0006, 0x2102,</div><div class='del'>-	0x127f, 0x017f, 0x007f, 0x007c, 0x157e, 0x20a9, 0x00ff, 0x2009,</div><div class='del'>-	0xa835, 0xa006, 0x200a, 0x8108, 0x00f0, 0x42f2, 0x157f, 0x007c,</div><div class='del'>-	0x0d7e, 0x037e, 0x157e, 0x137e, 0x147e, 0x2069, 0xa752, 0xa006,</div><div class='del'>-	0x6002, 0x6007, 0x0707, 0x600a, 0x600e, 0x6012, 0xa198, 0x29c0,</div><div class='del'>-	0x231c, 0xa39c, 0x00ff, 0x6316, 0x20a9, 0x0004, 0xac98, 0x0006,</div><div class='del'>-	0x23a0, 0x40a4, 0x20a9, 0x0004, 0xac98, 0x000a, 0x23a0, 0x40a4,</div><div class='del'>-	0x603e, 0x6042, 0x604e, 0x6052, 0x6056, 0x605a, 0x605e, 0x6062,</div><div class='del'>-	0x6066, 0x606a, 0x606e, 0x6072, 0x6076, 0x607a, 0x607e, 0x6082,</div><div class='del'>-	0x6086, 0x608a, 0x608e, 0x6092, 0x6096, 0x609a, 0x609e, 0x60ae,</div><div class='del'>-	0x61a2, 0x0d7e, 0x60a4, 0xa06d, 0x0040, 0x4338, 0x1078, 0x13a4,</div><div class='del'>-	0x60a7, 0x0000, 0x60a8, 0xa06d, 0x0040, 0x4340, 0x1078, 0x13a4,</div><div class='del'>-	0x60ab, 0x0000, 0x0d7f, 0xa006, 0x604a, 0x6810, 0x603a, 0x680c,</div><div class='del'>-	0x6046, 0x6814, 0xa084, 0x00ff, 0x6042, 0x147f, 0x137f, 0x157f,</div><div class='del'>-	0x037f, 0x0d7f, 0x007c, 0x127e, 0x2091, 0x8000, 0x6944, 0x6e48,</div><div class='del'>-	0xa684, 0x3fff, 0xa082, 0x4000, 0x00c8, 0x4424, 0xa18c, 0xff00,</div><div class='del'>-	0x810f, 0xa182, 0x00ff, 0x00c8, 0x442a, 0x2001, 0xa70c, 0x2004,</div><div class='del'>-	0xa084, 0x0003, 0x0040, 0x4385, 0x2001, 0xa70c, 0x2004, 0xd084,</div><div class='del'>-	0x00c0, 0x4405, 0xa188, 0xa835, 0x2104, 0xa065, 0x0040, 0x4405,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006, 0x00c0, 0x4405, 0x6000,</div><div class='del'>-	0xd0c4, 0x0040, 0x4405, 0x0078, 0x4392, 0xa188, 0xa835, 0x2104,</div><div class='del'>-	0xa065, 0x0040, 0x43e9, 0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006,</div><div class='del'>-	0x00c0, 0x43ef, 0x60a4, 0xa00d, 0x0040, 0x439a, 0x1078, 0x4817,</div><div class='del'>-	0x0040, 0x43e3, 0x60a8, 0xa00d, 0x0040, 0x43b4, 0x1078, 0x486a,</div><div class='del'>-	0x00c0, 0x43b4, 0x694c, 0xd1fc, 0x00c0, 0x43aa, 0x1078, 0x44df,</div><div class='del'>-	0x0078, 0x43de, 0x1078, 0x4484, 0x694c, 0xd1ec, 0x00c0, 0x43de,</div><div class='del'>-	0x1078, 0x46d6, 0x0078, 0x43de, 0x694c, 0xa184, 0xa000, 0x0040,</div><div class='del'>-	0x43ce, 0xd1ec, 0x0040, 0x43c7, 0xd1fc, 0x0040, 0x43c3, 0x1078,</div><div class='del'>-	0x46e7, 0x0078, 0x43ca, 0x1078, 0x46e7, 0x0078, 0x43ce, 0xd1fc,</div><div class='del'>-	0x0040, 0x43ce, 0x1078, 0x4484, 0x0078, 0x43de, 0x6050, 0xa00d,</div><div class='del'>-	0x0040, 0x43d9, 0x2d00, 0x200a, 0x6803, 0x0000, 0x6052, 0x0078,</div><div class='del'>-	0x43de, 0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x1078, 0x5da9,</div><div class='del'>-	0xa006, 0x127f, 0x007c, 0x2001, 0x0005, 0x2009, 0x0000, 0x0078,</div><div class='del'>-	0x442e, 0x2001, 0x0028, 0x2009, 0x0000, 0x0078, 0x442e, 0xa082,</div><div class='del'>-	0x0006, 0x00c8, 0x4405, 0x60a0, 0xd0bc, 0x00c0, 0x4401, 0x6100,</div><div class='del'>-	0xd1fc, 0x0040, 0x4392, 0x2001, 0x0029, 0x2009, 0x1000, 0x0078,</div><div class='del'>-	0x442e, 0x2001, 0x0028, 0x0078, 0x4420, 0x2009, 0xa70c, 0x210c,</div><div class='del'>-	0xd18c, 0x0040, 0x440f, 0x2001, 0x0004, 0x0078, 0x4420, 0xd184,</div><div class='del'>-	0x0040, 0x4416, 0x2001, 0x0004, 0x0078, 0x4420, 0x2001, 0x0029,</div><div class='del'>-	0x6100, 0xd1fc, 0x0040, 0x4420, 0x2009, 0x1000, 0x0078, 0x442e,</div><div class='del'>-	0x2009, 0x0000, 0x0078, 0x442e, 0x2001, 0x0029, 0x2009, 0x0000,</div><div class='del'>-	0x0078, 0x442e, 0x2001, 0x0029, 0x2009, 0x0000, 0xa005, 0x127f,</div><div class='del'>-	0x007c, 0x6944, 0x6e48, 0xa684, 0x3fff, 0xa082, 0x4000, 0x00c8,</div><div class='del'>-	0x447e, 0xa18c, 0xff00, 0x810f, 0xa182, 0x00ff, 0x00c8, 0x4464,</div><div class='del'>-	0xa188, 0xa835, 0x2104, 0xa065, 0x0040, 0x4464, 0x6004, 0xa084,</div><div class='del'>-	0x00ff, 0xa08e, 0x0006, 0x00c0, 0x446a, 0x684c, 0xd0ec, 0x0040,</div><div class='del'>-	0x4457, 0x1078, 0x46e7, 0x1078, 0x4484, 0x0078, 0x445f, 0x1078,</div><div class='del'>-	0x4484, 0x684c, 0xd0fc, 0x0040, 0x445f, 0x1078, 0x46d6, 0x1078,</div><div class='del'>-	0x472f, 0xa006, 0x0078, 0x4482, 0x2001, 0x0028, 0x2009, 0x0000,</div><div class='del'>-	0x0078, 0x4482, 0xa082, 0x0006, 0x00c8, 0x4478, 0x6100, 0xd1fc,</div><div class='del'>-	0x0040, 0x444d, 0x2001, 0x0029, 0x2009, 0x1000, 0x0078, 0x4482,</div><div class='del'>-	0x2001, 0x0029, 0x2009, 0x0000, 0x0078, 0x4482, 0x2001, 0x0029,</div><div class='del'>-	0x2009, 0x0000, 0xa005, 0x007c, 0x127e, 0x2091, 0x8000, 0x6050,</div><div class='del'>-	0xa00d, 0x0040, 0x4492, 0x2d00, 0x200a, 0x6803, 0x0000, 0x6052,</div><div class='del'>-	0x127f, 0x007c, 0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x0078,</div><div class='del'>-	0x4490, 0x127e, 0x2091, 0x8000, 0x604c, 0xa005, 0x0040, 0x44af,</div><div class='del'>-	0x0e7e, 0x2071, 0xa9b1, 0x7004, 0xa086, 0x0002, 0x0040, 0x44b6,</div><div class='del'>-	0x0e7f, 0x604c, 0x6802, 0x2d00, 0x604e, 0x127f, 0x007c, 0x2d00,</div><div class='del'>-	0x6052, 0x604e, 0x6803, 0x0000, 0x0078, 0x44ad, 0x701c, 0xac06,</div><div class='del'>-	0x00c0, 0x44a8, 0x604c, 0x2070, 0x7000, 0x6802, 0x2d00, 0x7002,</div><div class='del'>-	0x0e7f, 0x127f, 0x007c, 0x127e, 0x2091, 0x8000, 0x604c, 0xa06d,</div><div class='del'>-	0x0040, 0x44d1, 0x6800, 0xa005, 0x00c0, 0x44cf, 0x6052, 0x604e,</div><div class='del'>-	0xad05, 0x127f, 0x007c, 0x604c, 0xa06d, 0x0040, 0x44de, 0x6800,</div><div class='del'>-	0xa005, 0x00c0, 0x44dc, 0x6052, 0x604e, 0xad05, 0x007c, 0x6803,</div><div class='del'>-	0x0000, 0x6084, 0xa00d, 0x0040, 0x44e9, 0x2d00, 0x200a, 0x6086,</div><div class='del'>-	0x007c, 0x2d00, 0x6086, 0x6082, 0x0078, 0x44e8, 0x127e, 0x0c7e,</div><div class='del'>-	0x027e, 0x2091, 0x8000, 0x6218, 0x2260, 0x6200, 0xa005, 0x0040,</div><div class='del'>-	0x44fc, 0xc285, 0x0078, 0x44fd, 0xc284, 0x6202, 0x027f, 0x0c7f,</div><div class='del'>-	0x127f, 0x007c, 0x127e, 0x0c7e, 0x2091, 0x8000, 0x6218, 0x2260,</div><div class='del'>-	0x6204, 0x007e, 0xa086, 0x0006, 0x00c0, 0x4521, 0x609c, 0xd0ac,</div><div class='del'>-	0x0040, 0x4521, 0x2001, 0xa753, 0x2004, 0xd0a4, 0x0040, 0x4521,</div><div class='del'>-	0xa284, 0xff00, 0x8007, 0xa086, 0x0007, 0x00c0, 0x4521, 0x2011,</div><div class='del'>-	0x0600, 0x007f, 0xa294, 0xff00, 0xa215, 0x6206, 0x007e, 0xa086,</div><div class='del'>-	0x0006, 0x00c0, 0x4531, 0x6290, 0x82ff, 0x00c0, 0x4531, 0x1078,</div><div class='del'>-	0x1332, 0x007f, 0x0c7f, 0x127f, 0x007c, 0x127e, 0x0c7e, 0x2091,</div><div class='del'>-	0x8000, 0x6218, 0x2260, 0x6204, 0x007e, 0xa086, 0x0006, 0x00c0,</div><div class='del'>-	0x4553, 0x609c, 0xd0a4, 0x0040, 0x4553, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0ac, 0x00c0, 0x4553, 0xa284, 0x00ff, 0xa086, 0x0007, 0x00c0,</div><div class='del'>-	0x4553, 0x2011, 0x0006, 0x007f, 0xa294, 0x00ff, 0x8007, 0xa215,</div><div class='del'>-	0x6206, 0x0c7f, 0x127f, 0x007c, 0x027e, 0xa182, 0x00ff, 0x0048,</div><div class='del'>-	0x4565, 0xa085, 0x0001, 0x0078, 0x457d, 0xa190, 0xa835, 0x2204,</div><div class='del'>-	0xa065, 0x00c0, 0x457c, 0x017e, 0x0d7e, 0x1078, 0x1370, 0x2d60,</div><div class='del'>-	0x0d7f, 0x017f, 0x0040, 0x4561, 0x2c00, 0x2012, 0x60a7, 0x0000,</div><div class='del'>-	0x60ab, 0x0000, 0x1078, 0x42f8, 0xa006, 0x027f, 0x007c, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x027e, 0xa182, 0x00ff, 0x0048, 0x458b, 0xa085,</div><div class='del'>-	0x0001, 0x0078, 0x45c1, 0x0d7e, 0xa190, 0xa835, 0x2204, 0xa06d,</div><div class='del'>-	0x0040, 0x45bf, 0x2013, 0x0000, 0x0d7e, 0x0c7e, 0x2d60, 0x60a4,</div><div class='del'>-	0xa06d, 0x0040, 0x459d, 0x1078, 0x13a4, 0x60a8, 0xa06d, 0x0040,</div><div class='del'>-	0x45a3, 0x1078, 0x13a4, 0x0c7f, 0x0d7f, 0x0d7e, 0x0c7e, 0x68ac,</div><div class='del'>-	0x2060, 0x8cff, 0x0040, 0x45bb, 0x600c, 0x007e, 0x6010, 0x2068,</div><div class='del'>-	0x1078, 0x8d16, 0x0040, 0x45b6, 0x1078, 0x13b4, 0x1078, 0x772d,</div><div class='del'>-	0x0c7f, 0x0078, 0x45a9, 0x0c7f, 0x0d7f, 0x1078, 0x13a4, 0x0d7f,</div><div class='del'>-	0xa006, 0x027f, 0x127f, 0x007c, 0x017e, 0xa182, 0x00ff, 0x0048,</div><div class='del'>-	0x45cd, 0xa085, 0x0001, 0x0078, 0x45d4, 0xa188, 0xa835, 0x2104,</div><div class='del'>-	0xa065, 0x0040, 0x45c9, 0xa006, 0x017f, 0x007c, 0x0d7e, 0x157e,</div><div class='del'>-	0x137e, 0x147e, 0x600b, 0x0000, 0x600f, 0x0000, 0x6000, 0xc08c,</div><div class='del'>-	0x6002, 0x2069, 0xac8e, 0x6808, 0x605e, 0x6810, 0x6062, 0x6138,</div><div class='del'>-	0xa10a, 0x0048, 0x45ec, 0x603a, 0x6814, 0x6066, 0x2099, 0xac96,</div><div class='del'>-	0xac88, 0x000a, 0x21a0, 0x20a9, 0x0004, 0x53a3, 0x2099, 0xac9a,</div><div class='del'>-	0xac88, 0x0006, 0x21a0, 0x20a9, 0x0004, 0x53a3, 0x2069, 0xacae,</div><div class='del'>-	0x6808, 0x606a, 0x690c, 0x616e, 0x6810, 0x6072, 0x6818, 0x6076,</div><div class='del'>-	0x60a0, 0xa086, 0x007e, 0x00c0, 0x4611, 0x2069, 0xac8e, 0x690c,</div><div class='del'>-	0x616e, 0xa182, 0x0211, 0x00c8, 0x4619, 0x2009, 0x0008, 0x0078,</div><div class='del'>-	0x4643, 0xa182, 0x0259, 0x00c8, 0x4621, 0x2009, 0x0007, 0x0078,</div><div class='del'>-	0x4643, 0xa182, 0x02c1, 0x00c8, 0x4629, 0x2009, 0x0006, 0x0078,</div><div class='del'>-	0x4643, 0xa182, 0x0349, 0x00c8, 0x4631, 0x2009, 0x0005, 0x0078,</div><div class='del'>-	0x4643, 0xa182, 0x0421, 0x00c8, 0x4639, 0x2009, 0x0004, 0x0078,</div><div class='del'>-	0x4643, 0xa182, 0x0581, 0x00c8, 0x4641, 0x2009, 0x0003, 0x0078,</div><div class='del'>-	0x4643, 0x2009, 0x0002, 0x6192, 0x147f, 0x137f, 0x157f, 0x0d7f,</div><div class='del'>-	0x007c, 0x017e, 0x027e, 0x0e7e, 0x2071, 0xac8d, 0x2e04, 0x6896,</div><div class='del'>-	0x2071, 0xac8e, 0x7004, 0x689a, 0x701c, 0x689e, 0x6a00, 0x2009,</div><div class='del'>-	0xa772, 0x210c, 0xd0bc, 0x0040, 0x4663, 0xd1ec, 0x0040, 0x4663,</div><div class='del'>-	0xc2ad, 0x0078, 0x4664, 0xc2ac, 0xd0c4, 0x0040, 0x466d, 0xd1e4,</div><div class='del'>-	0x0040, 0x466d, 0xc2bd, 0x0078, 0x466e, 0xc2bc, 0x6a02, 0x0e7f,</div><div class='del'>-	0x027f, 0x017f, 0x007c, 0x0d7e, 0x127e, 0x2091, 0x8000, 0x60a4,</div><div class='del'>-	0xa06d, 0x0040, 0x4697, 0x6900, 0x81ff, 0x00c0, 0x46ab, 0x6a04,</div><div class='del'>-	0xa282, 0x0010, 0x00c8, 0x46b0, 0xad88, 0x0004, 0x20a9, 0x0010,</div><div class='del'>-	0x2104, 0xa086, 0xffff, 0x0040, 0x4692, 0x8108, 0x00f0, 0x4688,</div><div class='del'>-	0x1078, 0x1332, 0x260a, 0x8210, 0x6a06, 0x0078, 0x46ab, 0x1078,</div><div class='del'>-	0x138b, 0x0040, 0x46b0, 0x2d00, 0x60a6, 0x6803, 0x0000, 0xad88,</div><div class='del'>-	0x0004, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108, 0x00f0, 0x46a3,</div><div class='del'>-	0x6807, 0x0001, 0x6e12, 0xa085, 0x0001, 0x127f, 0x0d7f, 0x007c,</div><div class='del'>-	0xa006, 0x0078, 0x46ad, 0x127e, 0x2091, 0x8000, 0x0d7e, 0x60a4,</div><div class='del'>-	0xa00d, 0x0040, 0x46d3, 0x2168, 0x6800, 0xa005, 0x00c0, 0x46cf,</div><div class='del'>-	0x1078, 0x4817, 0x00c0, 0x46d3, 0x200b, 0xffff, 0x6804, 0xa08a,</div><div class='del'>-	0x0002, 0x0048, 0x46cf, 0x8001, 0x6806, 0x0078, 0x46d3, 0x1078,</div><div class='del'>-	0x13a4, 0x60a7, 0x0000, 0x0d7f, 0x127f, 0x007c, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x1078, 0x487f, 0x0078, 0x46df, 0x1078, 0x4484, 0x1078,</div><div class='del'>-	0x4775, 0x00c0, 0x46dd, 0x1078, 0x472f, 0x127f, 0x007c, 0x0d7e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x60a8, 0xa06d, 0x0040, 0x470b, 0x6950,</div><div class='del'>-	0x81ff, 0x00c0, 0x471f, 0x6a54, 0xa282, 0x0010, 0x00c8, 0x472c,</div><div class='del'>-	0xad88, 0x0018, 0x20a9, 0x0010, 0x2104, 0xa086, 0xffff, 0x0040,</div><div class='del'>-	0x4706, 0x8108, 0x00f0, 0x46fc, 0x1078, 0x1332, 0x260a, 0x8210,</div><div class='del'>-	0x6a56, 0x0078, 0x471f, 0x1078, 0x138b, 0x0040, 0x472c, 0x2d00,</div><div class='del'>-	0x60aa, 0x6853, 0x0000, 0xad88, 0x0018, 0x20a9, 0x0010, 0x200b,</div><div class='del'>-	0xffff, 0x8108, 0x00f0, 0x4717, 0x6857, 0x0001, 0x6e62, 0x0078,</div><div class='del'>-	0x4723, 0x1078, 0x44df, 0x1078, 0x4739, 0x00c0, 0x4721, 0xa085,</div><div class='del'>-	0x0001, 0x127f, 0x0d7f, 0x007c, 0xa006, 0x0078, 0x4729, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x1078, 0x5da9, 0x127f, 0x007c, 0xa01e, 0x0078,</div><div class='del'>-	0x473b, 0x2019, 0x0001, 0xa00e, 0x127e, 0x2091, 0x8000, 0x604c,</div><div class='del'>-	0x2068, 0x6000, 0xd0dc, 0x00c0, 0x4759, 0x8dff, 0x0040, 0x4770,</div><div class='del'>-	0x83ff, 0x0040, 0x4751, 0x6848, 0xa606, 0x0040, 0x475e, 0x0078,</div><div class='del'>-	0x4759, 0x683c, 0xa406, 0x00c0, 0x4759, 0x6840, 0xa506, 0x0040,</div><div class='del'>-	0x475e, 0x2d08, 0x6800, 0x2068, 0x0078, 0x4745, 0x1078, 0x7233,</div><div class='del'>-	0x6a00, 0x604c, 0xad06, 0x00c0, 0x4768, 0x624e, 0x0078, 0x476b,</div><div class='del'>-	0xa180, 0x0000, 0x2202, 0x82ff, 0x00c0, 0x4770, 0x6152, 0x8dff,</div><div class='del'>-	0x127f, 0x007c, 0xa01e, 0x0078, 0x4777, 0x2019, 0x0001, 0xa00e,</div><div class='del'>-	0x6080, 0x2068, 0x8dff, 0x0040, 0x47a3, 0x83ff, 0x0040, 0x4786,</div><div class='del'>-	0x6848, 0xa606, 0x0040, 0x4793, 0x0078, 0x478e, 0x683c, 0xa406,</div><div class='del'>-	0x00c0, 0x478e, 0x6840, 0xa506, 0x0040, 0x4793, 0x2d08, 0x6800,</div><div class='del'>-	0x2068, 0x0078, 0x477a, 0x6a00, 0x6080, 0xad06, 0x00c0, 0x479b,</div><div class='del'>-	0x6282, 0x0078, 0x479e, 0xa180, 0x0000, 0x2202, 0x82ff, 0x00c0,</div><div class='del'>-	0x47a3, 0x6186, 0x8dff, 0x007c, 0xa016, 0x1078, 0x4810, 0x00c0,</div><div class='del'>-	0x47ab, 0x2011, 0x0001, 0x1078, 0x4863, 0x00c0, 0x47b1, 0xa295,</div><div class='del'>-	0x0002, 0x007c, 0x1078, 0x489b, 0x0040, 0x47ba, 0x1078, 0x8dda,</div><div class='del'>-	0x0078, 0x47bc, 0xa085, 0x0001, 0x007c, 0x1078, 0x489b, 0x0040,</div><div class='del'>-	0x47c5, 0x1078, 0x8d72, 0x0078, 0x47c7, 0xa085, 0x0001, 0x007c,</div><div class='del'>-	0x1078, 0x489b, 0x0040, 0x47d0, 0x1078, 0x8dbc, 0x0078, 0x47d2,</div><div class='del'>-	0xa085, 0x0001, 0x007c, 0x1078, 0x489b, 0x0040, 0x47db, 0x1078,</div><div class='del'>-	0x8d8e, 0x0078, 0x47dd, 0xa085, 0x0001, 0x007c, 0x1078, 0x489b,</div><div class='del'>-	0x0040, 0x47e6, 0x1078, 0x8df8, 0x0078, 0x47e8, 0xa085, 0x0001,</div><div class='del'>-	0x007c, 0x127e, 0x007e, 0x0d7e, 0x2091, 0x8000, 0x6080, 0xa06d,</div><div class='del'>-	0x0040, 0x4808, 0x6800, 0x007e, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x1078, 0x8f8d, 0x007e, 0x6000, 0xd0fc, 0x0040, 0x4802,</div><div class='del'>-	0x1078, 0xa4fd, 0x007f, 0x1078, 0x4a73, 0x007f, 0x0078, 0x47ef,</div><div class='del'>-	0x6083, 0x0000, 0x6087, 0x0000, 0x0d7f, 0x007f, 0x127f, 0x007c,</div><div class='del'>-	0x60a4, 0xa00d, 0x00c0, 0x4817, 0xa085, 0x0001, 0x007c, 0x0e7e,</div><div class='del'>-	0x2170, 0x7000, 0xa005, 0x00c0, 0x482c, 0x20a9, 0x0010, 0xae88,</div><div class='del'>-	0x0004, 0x2104, 0xa606, 0x0040, 0x482c, 0x8108, 0x00f0, 0x4821,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x482d, 0xa006, 0x0e7f, 0x007c, 0x0d7e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x60a4, 0xa06d, 0x00c0, 0x483d, 0x1078,</div><div class='del'>-	0x138b, 0x0040, 0x484f, 0x2d00, 0x60a6, 0x6803, 0x0001, 0x6807,</div><div class='del'>-	0x0000, 0xad88, 0x0004, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108,</div><div class='del'>-	0x00f0, 0x4845, 0xa085, 0x0001, 0x127f, 0x0d7f, 0x007c, 0xa006,</div><div class='del'>-	0x0078, 0x484c, 0x0d7e, 0x127e, 0x2091, 0x8000, 0x60a4, 0xa06d,</div><div class='del'>-	0x0040, 0x4860, 0x60a7, 0x0000, 0x1078, 0x13a4, 0xa085, 0x0001,</div><div class='del'>-	0x127f, 0x0d7f, 0x007c, 0x60a8, 0xa00d, 0x00c0, 0x486a, 0xa085,</div><div class='del'>-	0x0001, 0x007c, 0x0e7e, 0x2170, 0x7050, 0xa005, 0x00c0, 0x487d,</div><div class='del'>-	0x20a9, 0x0010, 0xae88, 0x0018, 0x2104, 0xa606, 0x0040, 0x487d,</div><div class='del'>-	0x8108, 0x00f0, 0x4874, 0xa085, 0x0001, 0x0e7f, 0x007c, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x1078, 0x4863, 0x00c0, 0x4899, 0x200b, 0xffff,</div><div class='del'>-	0x0d7e, 0x60a8, 0x2068, 0x6854, 0xa08a, 0x0002, 0x0048, 0x4894,</div><div class='del'>-	0x8001, 0x6856, 0x0078, 0x4898, 0x1078, 0x13a4, 0x60ab, 0x0000,</div><div class='del'>-	0x0d7f, 0x127f, 0x007c, 0x609c, 0xd0a4, 0x007c, 0x0f7e, 0x71b0,</div><div class='del'>-	0x81ff, 0x00c0, 0x48b9, 0x71cc, 0xd19c, 0x0040, 0x48b9, 0x2001,</div><div class='del'>-	0x007e, 0xa080, 0xa835, 0x2004, 0xa07d, 0x0040, 0x48b9, 0x7804,</div><div class='del'>-	0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x48b9, 0x7800, 0xc0ed,</div><div class='del'>-	0x7802, 0x2079, 0xa752, 0x7804, 0xd0a4, 0x0040, 0x48df, 0x157e,</div><div class='del'>-	0x0c7e, 0x20a9, 0x007f, 0x2009, 0x0000, 0x017e, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x48d9, 0x6004, 0xa084, 0xff00, 0x8007, 0xa096, 0x0004,</div><div class='del'>-	0x0040, 0x48d6, 0xa086, 0x0006, 0x00c0, 0x48d9, 0x6000, 0xc0ed,</div><div class='del'>-	0x6002, 0x017f, 0x8108, 0x00f0, 0x48c5, 0x0c7f, 0x157f, 0x1078,</div><div class='del'>-	0x4967, 0x0040, 0x48e8, 0x2001, 0xa9a1, 0x200c, 0x0078, 0x48f0,</div><div class='del'>-	0x2079, 0xa752, 0x7804, 0xd0a4, 0x0040, 0x48f4, 0x2009, 0x07d0,</div><div class='del'>-	0x2011, 0x48f6, 0x1078, 0x5add, 0x0f7f, 0x007c, 0x2011, 0x48f6,</div><div class='del'>-	0x1078, 0x5a45, 0x1078, 0x4967, 0x0040, 0x491e, 0x2001, 0xa8b3,</div><div class='del'>-	0x2004, 0xa080, 0x0000, 0x200c, 0xc1ec, 0x2102, 0x2001, 0xa753,</div><div class='del'>-	0x2004, 0xd0a4, 0x0040, 0x4912, 0x2009, 0x07d0, 0x2011, 0x48f6,</div><div class='del'>-	0x1078, 0x5add, 0x0e7e, 0x2071, 0xa700, 0x706f, 0x0000, 0x7073,</div><div class='del'>-	0x0000, 0x1078, 0x2677, 0x0e7f, 0x0078, 0x4956, 0x157e, 0x0c7e,</div><div class='del'>-	0x20a9, 0x007f, 0x2009, 0x0000, 0x017e, 0x1078, 0x45c4, 0x00c0,</div><div class='del'>-	0x4950, 0x6000, 0xd0ec, 0x0040, 0x4950, 0x047e, 0x62a0, 0xa294,</div><div class='del'>-	0x00ff, 0x8227, 0xa006, 0x2009, 0x0029, 0x1078, 0xa22d, 0x6000,</div><div class='del'>-	0xc0e5, 0xc0ec, 0x6002, 0x6004, 0xa084, 0x00ff, 0xa085, 0x0700,</div><div class='del'>-	0x6006, 0x2019, 0x0029, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000,</div><div class='del'>-	0x1078, 0x5e0a, 0x2009, 0x0000, 0x1078, 0x9f9b, 0x077f, 0x047f,</div><div class='del'>-	0x017f, 0x8108, 0x00f0, 0x4924, 0x0c7f, 0x157f, 0x007c, 0x0c7e,</div><div class='del'>-	0x6018, 0x2060, 0x6000, 0xc0ec, 0x6002, 0x0c7f, 0x007c, 0x7818,</div><div class='del'>-	0x2004, 0xd0ac, 0x007c, 0x7818, 0x2004, 0xd0bc, 0x007c, 0x0f7e,</div><div class='del'>-	0x2001, 0xa8b3, 0x2004, 0xa07d, 0x0040, 0x4970, 0x7800, 0xd0ec,</div><div class='del'>-	0x0f7f, 0x007c, 0x127e, 0x027e, 0x2091, 0x8000, 0x007e, 0x62a0,</div><div class='del'>-	0xa290, 0xa835, 0x2204, 0xac06, 0x10c0, 0x1332, 0x007f, 0x6200,</div><div class='del'>-	0xa005, 0x0040, 0x4986, 0xc2fd, 0x0078, 0x4987, 0xc2fc, 0x6202,</div><div class='del'>-	0x027f, 0x127f, 0x007c, 0x2011, 0xa733, 0x2204, 0xd0cc, 0x0040,</div><div class='del'>-	0x4998, 0x2001, 0xa99f, 0x200c, 0x2011, 0x4999, 0x1078, 0x5add,</div><div class='del'>-	0x007c, 0x2011, 0x4999, 0x1078, 0x5a45, 0x2011, 0xa733, 0x2204,</div><div class='del'>-	0xc0cc, 0x2012, 0x007c, 0x2071, 0xa814, 0x7003, 0x0001, 0x7007,</div><div class='del'>-	0x0000, 0x7013, 0x0000, 0x7017, 0x0000, 0x701b, 0x0000, 0x701f,</div><div class='del'>-	0x0000, 0x700b, 0x0000, 0x704b, 0x0001, 0x704f, 0x0000, 0x705b,</div><div class='del'>-	0x0020, 0x705f, 0x0040, 0x707f, 0x0000, 0x2071, 0xa97d, 0x7003,</div><div class='del'>-	0xa814, 0x7007, 0x0000, 0x700b, 0x0000, 0x700f, 0xa95d, 0x7013,</div><div class='del'>-	0x0020, 0x7017, 0x0040, 0x7037, 0x0000, 0x007c, 0x017e, 0x0e7e,</div><div class='del'>-	0x2071, 0xa935, 0xa00e, 0x7186, 0x718a, 0x7097, 0x0001, 0x2001,</div><div class='del'>-	0xa753, 0x2004, 0xd0fc, 0x00c0, 0x49e8, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xa00e, 0xd09c, 0x0040, 0x49e5, 0x8108, 0x7102, 0x0078, 0x4a3b,</div><div class='del'>-	0x2001, 0xa772, 0x200c, 0xa184, 0x000f, 0x2009, 0xa773, 0x210c,</div><div class='del'>-	0x0079, 0x49f2, 0x49dd, 0x4a13, 0x4a1b, 0x4a26, 0x4a2c, 0x49dd,</div><div class='del'>-	0x49dd, 0x49dd, 0x4a02, 0x49dd, 0x49dd, 0x49dd, 0x49dd, 0x49dd,</div><div class='del'>-	0x49dd, 0x49dd, 0x7003, 0x0004, 0x137e, 0x147e, 0x157e, 0x2099,</div><div class='del'>-	0xa776, 0x20a1, 0xa986, 0x20a9, 0x0004, 0x53a3, 0x157f, 0x147f,</div><div class='del'>-	0x137f, 0x0078, 0x4a3b, 0x708f, 0x0005, 0x7007, 0x0122, 0x2001,</div><div class='del'>-	0x0002, 0x0078, 0x4a21, 0x708f, 0x0002, 0x7007, 0x0121, 0x2001,</div><div class='del'>-	0x0003, 0x7002, 0x7097, 0x0001, 0x0078, 0x4a38, 0x7007, 0x0122,</div><div class='del'>-	0x2001, 0x0002, 0x0078, 0x4a30, 0x7007, 0x0121, 0x2001, 0x0003,</div><div class='del'>-	0x7002, 0xa006, 0x7096, 0x708e, 0xa184, 0xff00, 0x8007, 0x709a,</div><div class='del'>-	0xa184, 0x00ff, 0x7092, 0x0e7f, 0x017f, 0x007c, 0x0e7e, 0x2071,</div><div class='del'>-	0xa814, 0x684c, 0xa005, 0x00c0, 0x4a4c, 0x7028, 0xc085, 0x702a,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x4a71, 0x6a60, 0x7236, 0x6b64, 0x733a,</div><div class='del'>-	0x6868, 0x703e, 0x7076, 0x686c, 0x7042, 0x707a, 0x684c, 0x702e,</div><div class='del'>-	0x6844, 0x7032, 0x2009, 0x000d, 0x200a, 0x700b, 0x0000, 0x8007,</div><div class='del'>-	0x8006, 0x8006, 0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100,</div><div class='del'>-	0xa319, 0x726e, 0x7372, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001,</div><div class='del'>-	0xa006, 0x0e7f, 0x007c, 0x0e7e, 0x027e, 0x6838, 0xd0fc, 0x00c0,</div><div class='del'>-	0x4ac9, 0x6804, 0xa00d, 0x0040, 0x4a8f, 0x0d7e, 0x2071, 0xa700,</div><div class='del'>-	0xa016, 0x702c, 0x2168, 0x6904, 0x206a, 0x8210, 0x2d00, 0x81ff,</div><div class='del'>-	0x00c0, 0x4a82, 0x702e, 0x70ac, 0xa200, 0x70ae, 0x0d7f, 0x2071,</div><div class='del'>-	0xa814, 0x701c, 0xa005, 0x00c0, 0x4adb, 0x0068, 0x4ad9, 0x2071,</div><div class='del'>-	0xa935, 0x7200, 0x82ff, 0x0040, 0x4ad9, 0x6934, 0xa186, 0x0103,</div><div class='del'>-	0x00c0, 0x4aec, 0x6948, 0x6844, 0xa105, 0x00c0, 0x4acc, 0x2009,</div><div class='del'>-	0x8020, 0x2200, 0x0079, 0x4aac, 0x4ad9, 0x4ab1, 0x4b09, 0x4b17,</div><div class='del'>-	0x4ad9, 0x2071, 0x0000, 0x7018, 0xd084, 0x00c0, 0x4ad9, 0x7122,</div><div class='del'>-	0x683c, 0x7026, 0x6840, 0x702a, 0x701b, 0x0001, 0x2091, 0x4080,</div><div class='del'>-	0x2071, 0xa700, 0x702c, 0x206a, 0x2d00, 0x702e, 0x70ac, 0x8000,</div><div class='del'>-	0x70ae, 0x027f, 0x0e7f, 0x007c, 0x6844, 0xa086, 0x0100, 0x00c0,</div><div class='del'>-	0x4ad9, 0x6868, 0xa005, 0x00c0, 0x4ad9, 0x2009, 0x8020, 0x0078,</div><div class='del'>-	0x4aa9, 0x2071, 0xa814, 0x2d08, 0x206b, 0x0000, 0x7010, 0x8000,</div><div class='del'>-	0x7012, 0x7018, 0xa06d, 0x711a, 0x0040, 0x4ae9, 0x6902, 0x0078,</div><div class='del'>-	0x4aea, 0x711e, 0x0078, 0x4ac9, 0xa18c, 0x00ff, 0xa186, 0x0017,</div><div class='del'>-	0x0040, 0x4afa, 0xa186, 0x001e, 0x0040, 0x4afa, 0xa18e, 0x001f,</div><div class='del'>-	0x00c0, 0x4ad9, 0x684c, 0xd0cc, 0x0040, 0x4ad9, 0x6850, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x0001, 0x00c0, 0x4ad9, 0x2009, 0x8021, 0x0078,</div><div class='del'>-	0x4aa9, 0x7084, 0x8008, 0xa092, 0x001e, 0x00c8, 0x4ad9, 0x7186,</div><div class='del'>-	0xae90, 0x0003, 0xa210, 0x683c, 0x2012, 0x0078, 0x4b27, 0x7084,</div><div class='del'>-	0x8008, 0xa092, 0x000f, 0x00c8, 0x4ad9, 0x7186, 0xae90, 0x0003,</div><div class='del'>-	0x8003, 0xa210, 0x683c, 0x2012, 0x8210, 0x6840, 0x2012, 0x7088,</div><div class='del'>-	0xa10a, 0x0048, 0x4ac0, 0x718c, 0x7084, 0xa10a, 0x0048, 0x4ac0,</div><div class='del'>-	0x2071, 0x0000, 0x7018, 0xd084, 0x00c0, 0x4ac0, 0x2071, 0xa935,</div><div class='del'>-	0x7000, 0xa086, 0x0002, 0x00c0, 0x4b47, 0x1078, 0x4dc3, 0x2071,</div><div class='del'>-	0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078, 0x4ac0, 0x1078,</div><div class='del'>-	0x4dee, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078,</div><div class='del'>-	0x4ac0, 0x007e, 0x684c, 0x007e, 0x6837, 0x0103, 0x20a9, 0x001c,</div><div class='del'>-	0xad80, 0x0011, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x007f, 0xa084,</div><div class='del'>-	0x00ff, 0x684e, 0x007f, 0x684a, 0x6952, 0x007c, 0x2071, 0xa814,</div><div class='del'>-	0x7004, 0x0079, 0x4b6b, 0x4b75, 0x4b86, 0x4d94, 0x4d95, 0x4dbc,</div><div class='del'>-	0x4dc2, 0x4b76, 0x4d82, 0x4d23, 0x4da5, 0x007c, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x0068, 0x4b85, 0x2009, 0x000d, 0x7030, 0x200a, 0x2091,</div><div class='del'>-	0x4080, 0x7007, 0x0001, 0x700b, 0x0000, 0x127f, 0x2069, 0xa9c4,</div><div class='del'>-	0x6844, 0xa005, 0x0050, 0x4bae, 0x00c0, 0x4bae, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x2069, 0x0000, 0x6934, 0x2001, 0xa820, 0x2004, 0xa10a,</div><div class='del'>-	0x0040, 0x4ba9, 0x0068, 0x4bad, 0x2069, 0x0000, 0x6818, 0xd084,</div><div class='del'>-	0x00c0, 0x4bad, 0x2009, 0x8040, 0x6922, 0x681b, 0x0001, 0x2091,</div><div class='del'>-	0x4080, 0x2069, 0xa9c4, 0x6847, 0xffff, 0x127f, 0x2069, 0xa700,</div><div class='del'>-	0x6848, 0x6964, 0xa102, 0x2069, 0xa935, 0x688a, 0x6984, 0x701c,</div><div class='del'>-	0xa06d, 0x0040, 0x4bc0, 0x81ff, 0x0040, 0x4c08, 0x0078, 0x4bd6,</div><div class='del'>-	0x81ff, 0x0040, 0x4cda, 0x2071, 0xa935, 0x7184, 0x7088, 0xa10a,</div><div class='del'>-	0x00c8, 0x4bd6, 0x7190, 0x2071, 0xa9c4, 0x7040, 0xa005, 0x0040,</div><div class='del'>-	0x4bd6, 0x00d0, 0x4cda, 0x7142, 0x0078, 0x4cda, 0x2071, 0xa935,</div><div class='del'>-	0x718c, 0x127e, 0x2091, 0x8000, 0x7084, 0xa10a, 0x0048, 0x4cf7,</div><div class='del'>-	0x0068, 0x4c8c, 0x2071, 0x0000, 0x7018, 0xd084, 0x00c0, 0x4c8c,</div><div class='del'>-	0x2001, 0xffff, 0x2071, 0xa9c4, 0x7042, 0x2071, 0xa935, 0x7000,</div><div class='del'>-	0xa086, 0x0002, 0x00c0, 0x4bfe, 0x1078, 0x4dc3, 0x2071, 0x0000,</div><div class='del'>-	0x701b, 0x0001, 0x2091, 0x4080, 0x0078, 0x4c8c, 0x1078, 0x4dee,</div><div class='del'>-	0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078, 0x4c8c,</div><div class='del'>-	0x2071, 0xa935, 0x7000, 0xa005, 0x0040, 0x4cb9, 0x6934, 0xa186,</div><div class='del'>-	0x0103, 0x00c0, 0x4c8f, 0x684c, 0xd0bc, 0x00c0, 0x4cb9, 0x6948,</div><div class='del'>-	0x6844, 0xa105, 0x00c0, 0x4cac, 0x2009, 0x8020, 0x2071, 0xa935,</div><div class='del'>-	0x7000, 0x0079, 0x4c23, 0x4cb9, 0x4c71, 0x4c49, 0x4c5b, 0x4c28,</div><div class='del'>-	0x137e, 0x147e, 0x157e, 0x2099, 0xa776, 0x20a1, 0xa986, 0x20a9,</div><div class='del'>-	0x0004, 0x53a3, 0x157f, 0x147f, 0x137f, 0x2071, 0xa97d, 0xad80,</div><div class='del'>-	0x000f, 0x700e, 0x7013, 0x0002, 0x7007, 0x0002, 0x700b, 0x0000,</div><div class='del'>-	0x2e10, 0x1078, 0x13db, 0x2071, 0xa814, 0x7007, 0x0009, 0x0078,</div><div class='del'>-	0x4cda, 0x7084, 0x8008, 0xa092, 0x001e, 0x00c8, 0x4cda, 0xae90,</div><div class='del'>-	0x0003, 0xa210, 0x683c, 0x2012, 0x7186, 0x2071, 0xa814, 0x1078,</div><div class='del'>-	0x4e4c, 0x0078, 0x4cda, 0x7084, 0x8008, 0xa092, 0x000f, 0x00c8,</div><div class='del'>-	0x4cda, 0xae90, 0x0003, 0x8003, 0xa210, 0x683c, 0x2012, 0x8210,</div><div class='del'>-	0x6840, 0x2012, 0x7186, 0x2071, 0xa814, 0x1078, 0x4e4c, 0x0078,</div><div class='del'>-	0x4cda, 0x127e, 0x2091, 0x8000, 0x0068, 0x4c8c, 0x2071, 0x0000,</div><div class='del'>-	0x7018, 0xd084, 0x00c0, 0x4c8c, 0x7122, 0x683c, 0x7026, 0x6840,</div><div class='del'>-	0x702a, 0x701b, 0x0001, 0x2091, 0x4080, 0x127f, 0x2071, 0xa814,</div><div class='del'>-	0x1078, 0x4e4c, 0x0078, 0x4cda, 0x127f, 0x0078, 0x4cda, 0xa18c,</div><div class='del'>-	0x00ff, 0xa186, 0x0017, 0x0040, 0x4c9d, 0xa186, 0x001e, 0x0040,</div><div class='del'>-	0x4c9d, 0xa18e, 0x001f, 0x00c0, 0x4cb9, 0x684c, 0xd0cc, 0x0040,</div><div class='del'>-	0x4cb9, 0x6850, 0xa084, 0x00ff, 0xa086, 0x0001, 0x00c0, 0x4cb9,</div><div class='del'>-	0x2009, 0x8021, 0x0078, 0x4c1e, 0x6844, 0xa086, 0x0100, 0x00c0,</div><div class='del'>-	0x4cb9, 0x6868, 0xa005, 0x00c0, 0x4cb9, 0x2009, 0x8020, 0x0078,</div><div class='del'>-	0x4c1e, 0x2071, 0xa814, 0x1078, 0x4e60, 0x0040, 0x4cda, 0x2071,</div><div class='del'>-	0xa814, 0x700f, 0x0001, 0x6934, 0xa184, 0x00ff, 0xa086, 0x0003,</div><div class='del'>-	0x00c0, 0x4cd1, 0x810f, 0xa18c, 0x00ff, 0x8101, 0x0040, 0x4cd1,</div><div class='del'>-	0x710e, 0x7007, 0x0003, 0x1078, 0x4e80, 0x7050, 0xa086, 0x0100,</div><div class='del'>-	0x0040, 0x4d95, 0x127e, 0x2091, 0x8000, 0x2071, 0xa814, 0x7008,</div><div class='del'>-	0xa086, 0x0001, 0x00c0, 0x4cf5, 0x0068, 0x4cf5, 0x2009, 0x000d,</div><div class='del'>-	0x7030, 0x200a, 0x2091, 0x4080, 0x700b, 0x0000, 0x7004, 0xa086,</div><div class='del'>-	0x0006, 0x00c0, 0x4cf5, 0x7007, 0x0001, 0x127f, 0x007c, 0x2071,</div><div class='del'>-	0xa814, 0x1078, 0x4e60, 0x0040, 0x4d20, 0x2071, 0xa935, 0x7084,</div><div class='del'>-	0x700a, 0x20a9, 0x0020, 0x2099, 0xa936, 0x20a1, 0xa95d, 0x53a3,</div><div class='del'>-	0x7087, 0x0000, 0x2071, 0xa814, 0x2069, 0xa97d, 0x706c, 0x6826,</div><div class='del'>-	0x7070, 0x682a, 0x7074, 0x682e, 0x7078, 0x6832, 0x2d10, 0x1078,</div><div class='del'>-	0x13db, 0x7007, 0x0008, 0x2001, 0xffff, 0x2071, 0xa9c4, 0x7042,</div><div class='del'>-	0x127f, 0x0078, 0x4cda, 0x2069, 0xa97d, 0x6808, 0xa08e, 0x0000,</div><div class='del'>-	0x0040, 0x4d81, 0xa08e, 0x0200, 0x0040, 0x4d7f, 0xa08e, 0x0100,</div><div class='del'>-	0x00c0, 0x4d81, 0x127e, 0x2091, 0x8000, 0x0068, 0x4d7c, 0x2069,</div><div class='del'>-	0x0000, 0x6818, 0xd084, 0x00c0, 0x4d7c, 0x702c, 0x7130, 0x8108,</div><div class='del'>-	0xa102, 0x0048, 0x4d4a, 0xa00e, 0x7034, 0x706e, 0x7038, 0x7072,</div><div class='del'>-	0x0078, 0x4d54, 0x706c, 0xa080, 0x0040, 0x706e, 0x00c8, 0x4d54,</div><div class='del'>-	0x7070, 0xa081, 0x0000, 0x7072, 0x7132, 0x6936, 0x700b, 0x0000,</div><div class='del'>-	0x2001, 0xa95a, 0x2004, 0xa005, 0x00c0, 0x4d73, 0x6934, 0x2069,</div><div class='del'>-	0xa935, 0x689c, 0x699e, 0x2069, 0xa9c4, 0xa102, 0x00c0, 0x4d6c,</div><div class='del'>-	0x6844, 0xa005, 0x00d0, 0x4d7a, 0x2001, 0xa95b, 0x200c, 0x810d,</div><div class='del'>-	0x6946, 0x0078, 0x4d7a, 0x2009, 0x8040, 0x6922, 0x681b, 0x0001,</div><div class='del'>-	0x2091, 0x4080, 0x7007, 0x0001, 0x127f, 0x0078, 0x4d81, 0x7007,</div><div class='del'>-	0x0005, 0x007c, 0x701c, 0xa06d, 0x0040, 0x4d93, 0x1078, 0x4e60,</div><div class='del'>-	0x0040, 0x4d93, 0x7007, 0x0003, 0x1078, 0x4e80, 0x7050, 0xa086,</div><div class='del'>-	0x0100, 0x0040, 0x4d95, 0x007c, 0x007c, 0x7050, 0xa09e, 0x0100,</div><div class='del'>-	0x00c0, 0x4d9e, 0x7007, 0x0004, 0x0078, 0x4dbc, 0xa086, 0x0200,</div><div class='del'>-	0x00c0, 0x4da4, 0x7007, 0x0005, 0x007c, 0x2001, 0xa97f, 0x2004,</div><div class='del'>-	0xa08e, 0x0100, 0x00c0, 0x4db1, 0x7007, 0x0001, 0x1078, 0x4e4c,</div><div class='del'>-	0x007c, 0xa08e, 0x0000, 0x0040, 0x4db0, 0xa08e, 0x0200, 0x00c0,</div><div class='del'>-	0x4db0, 0x7007, 0x0005, 0x007c, 0x1078, 0x4e16, 0x7006, 0x1078,</div><div class='del'>-	0x4e4c, 0x007c, 0x007c, 0x0e7e, 0x157e, 0x2071, 0xa935, 0x7184,</div><div class='del'>-	0x81ff, 0x0040, 0x4deb, 0xa006, 0x7086, 0xae80, 0x0003, 0x2071,</div><div class='del'>-	0x0000, 0x21a8, 0x2014, 0x7226, 0x8000, 0x0070, 0x4de8, 0x2014,</div><div class='del'>-	0x722a, 0x8000, 0x0070, 0x4de8, 0x2014, 0x722e, 0x8000, 0x0070,</div><div class='del'>-	0x4de8, 0x2014, 0x723a, 0x8000, 0x0070, 0x4de8, 0x2014, 0x723e,</div><div class='del'>-	0xa180, 0x8030, 0x7022, 0x157f, 0x0e7f, 0x007c, 0x0e7e, 0x157e,</div><div class='del'>-	0x2071, 0xa935, 0x7184, 0x81ff, 0x0040, 0x4e13, 0xa006, 0x7086,</div><div class='del'>-	0xae80, 0x0003, 0x2071, 0x0000, 0x21a8, 0x2014, 0x7226, 0x8000,</div><div class='del'>-	0x2014, 0x722a, 0x8000, 0x0070, 0x4e0c, 0x2014, 0x723a, 0x8000,</div><div class='del'>-	0x2014, 0x723e, 0x0078, 0x4e10, 0x2001, 0x8020, 0x0078, 0x4e12,</div><div class='del'>-	0x2001, 0x8042, 0x7022, 0x157f, 0x0e7f, 0x007c, 0x702c, 0x7130,</div><div class='del'>-	0x8108, 0xa102, 0x0048, 0x4e23, 0xa00e, 0x7034, 0x706e, 0x7038,</div><div class='del'>-	0x7072, 0x0078, 0x4e2d, 0x706c, 0xa080, 0x0040, 0x706e, 0x00c8,</div><div class='del'>-	0x4e2d, 0x7070, 0xa081, 0x0000, 0x7072, 0x7132, 0x700c, 0x8001,</div><div class='del'>-	0x700e, 0x00c0, 0x4e43, 0x127e, 0x2091, 0x8000, 0x0068, 0x4e46,</div><div class='del'>-	0x2001, 0x000d, 0x2102, 0x2091, 0x4080, 0x2001, 0x0001, 0x700b,</div><div class='del'>-	0x0000, 0x127f, 0x007c, 0x2001, 0x0007, 0x007c, 0x2001, 0x0006,</div><div class='del'>-	0x700b, 0x0001, 0x127f, 0x007c, 0x701c, 0xa06d, 0x0040, 0x4e5f,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x7010, 0x8001, 0x7012, 0x2d04, 0x701e,</div><div class='del'>-	0xa005, 0x00c0, 0x4e5c, 0x701a, 0x127f, 0x1078, 0x13a4, 0x007c,</div><div class='del'>-	0x2019, 0x000d, 0x2304, 0x230c, 0xa10e, 0x0040, 0x4e6f, 0x2304,</div><div class='del'>-	0x230c, 0xa10e, 0x0040, 0x4e6f, 0xa006, 0x0078, 0x4e7f, 0x732c,</div><div class='del'>-	0x8319, 0x7130, 0xa102, 0x00c0, 0x4e79, 0x2300, 0xa005, 0x0078,</div><div class='del'>-	0x4e7f, 0x0048, 0x4e7e, 0xa302, 0x0078, 0x4e7f, 0x8002, 0x007c,</div><div class='del'>-	0x2d00, 0x7026, 0xa080, 0x000d, 0x7056, 0x7053, 0x0000, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x2009, 0xa9d6, 0x2104, 0xc08d, 0x200a, 0x127f,</div><div class='del'>-	0x1078, 0x13f9, 0x007c, 0x2071, 0xa7e2, 0x7003, 0x0000, 0x7007,</div><div class='del'>-	0x0000, 0x700f, 0x0000, 0x702b, 0x0001, 0x704f, 0x0000, 0x7053,</div><div class='del'>-	0x0001, 0x705f, 0x0020, 0x7063, 0x0040, 0x7083, 0x0000, 0x708b,</div><div class='del'>-	0x0000, 0x708f, 0x0001, 0x70bf, 0x0000, 0x007c, 0x0e7e, 0x2071,</div><div class='del'>-	0xa7e2, 0x6848, 0xa005, 0x00c0, 0x4ebc, 0x7028, 0xc085, 0x702a,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x4ee1, 0x6a50, 0x7236, 0x6b54, 0x733a,</div><div class='del'>-	0x6858, 0x703e, 0x707a, 0x685c, 0x7042, 0x707e, 0x6848, 0x702e,</div><div class='del'>-	0x6840, 0x7032, 0x2009, 0x000c, 0x200a, 0x8007, 0x8006, 0x8006,</div><div class='del'>-	0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100, 0xa319, 0x7272,</div><div class='del'>-	0x7376, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0x700f, 0x0000,</div><div class='del'>-	0xa006, 0x0e7f, 0x007c, 0x2b78, 0x2071, 0xa7e2, 0x7004, 0x1079,</div><div class='del'>-	0x4f41, 0x700c, 0x0079, 0x4eec, 0x4ef1, 0x4ee6, 0x4ee6, 0x4ee6,</div><div class='del'>-	0x4ee6, 0x007c, 0x700c, 0x0079, 0x4ef5, 0x4efa, 0x4f3f, 0x4f3f,</div><div class='del'>-	0x4f40, 0x4f40, 0x7830, 0x7930, 0xa106, 0x0040, 0x4f04, 0x7830,</div><div class='del'>-	0x7930, 0xa106, 0x00c0, 0x4f2a, 0x7030, 0xa10a, 0x0040, 0x4f2a,</div><div class='del'>-	0x00c8, 0x4f0c, 0x712c, 0xa10a, 0xa18a, 0x0002, 0x00c8, 0x4f2b,</div><div class='del'>-	0x1078, 0x1370, 0x0040, 0x4f2a, 0x2d00, 0x705a, 0x7063, 0x0040,</div><div class='del'>-	0x2001, 0x0003, 0x7057, 0x0000, 0x127e, 0x007e, 0x2091, 0x8000,</div><div class='del'>-	0x2009, 0xa9d6, 0x2104, 0xc085, 0x200a, 0x007f, 0x700e, 0x127f,</div><div class='del'>-	0x1078, 0x13f9, 0x007c, 0x1078, 0x1370, 0x0040, 0x4f2a, 0x2d00,</div><div class='del'>-	0x705a, 0x1078, 0x1370, 0x00c0, 0x4f37, 0x0078, 0x4f16, 0x2d00,</div><div class='del'>-	0x7086, 0x7063, 0x0080, 0x2001, 0x0004, 0x0078, 0x4f1a, 0x007c,</div><div class='del'>-	0x007c, 0x4f52, 0x4f53, 0x4f8a, 0x4f8b, 0x4f3f, 0x4fc1, 0x4fc6,</div><div class='del'>-	0x4ffd, 0x4ffe, 0x5019, 0x501a, 0x501b, 0x501c, 0x501d, 0x501e,</div><div class='del'>-	0x509e, 0x50c8, 0x007c, 0x700c, 0x0079, 0x4f56, 0x4f5b, 0x4f5e,</div><div class='del'>-	0x4f6e, 0x4f89, 0x4f89, 0x1078, 0x4ef2, 0x007c, 0x127e, 0x8001,</div><div class='del'>-	0x700e, 0x7058, 0x007e, 0x1078, 0x5464, 0x0040, 0x4f6b, 0x2091,</div><div class='del'>-	0x8000, 0x1078, 0x4ef2, 0x0d7f, 0x0078, 0x4f77, 0x127e, 0x8001,</div><div class='del'>-	0x700e, 0x1078, 0x5464, 0x7058, 0x2068, 0x7084, 0x705a, 0x6803,</div><div class='del'>-	0x0000, 0x6807, 0x0000, 0x6834, 0xa084, 0x00ff, 0xa08a, 0x0020,</div><div class='del'>-	0x00c8, 0x4f86, 0x1079, 0x4fa1, 0x127f, 0x007c, 0x127f, 0x1078,</div><div class='del'>-	0x501f, 0x007c, 0x007c, 0x007c, 0x0e7e, 0x2071, 0xa7e2, 0x700c,</div><div class='del'>-	0x0079, 0x4f92, 0x4f97, 0x4f97, 0x4f97, 0x4f99, 0x4f9d, 0x0e7f,</div><div class='del'>-	0x007c, 0x700f, 0x0001, 0x0078, 0x4f9f, 0x700f, 0x0002, 0x0e7f,</div><div class='del'>-	0x007c, 0x501f, 0x501f, 0x503b, 0x501f, 0x5171, 0x501f, 0x501f,</div><div class='del'>-	0x501f, 0x501f, 0x501f, 0x503b, 0x51bb, 0x5208, 0x5261, 0x5277,</div><div class='del'>-	0x501f, 0x501f, 0x5057, 0x503b, 0x501f, 0x501f, 0x5078, 0x5338,</div><div class='del'>-	0x5356, 0x501f, 0x5057, 0x501f, 0x501f, 0x501f, 0x501f, 0x506d,</div><div class='del'>-	0x5356, 0x7020, 0x2068, 0x1078, 0x13a4, 0x007c, 0x700c, 0x0079,</div><div class='del'>-	0x4fc9, 0x4fce, 0x4fd1, 0x4fe1, 0x4ffc, 0x4ffc, 0x1078, 0x4ef2,</div><div class='del'>-	0x007c, 0x127e, 0x8001, 0x700e, 0x7058, 0x007e, 0x1078, 0x5464,</div><div class='del'>-	0x0040, 0x4fde, 0x2091, 0x8000, 0x1078, 0x4ef2, 0x0d7f, 0x0078,</div><div class='del'>-	0x4fea, 0x127e, 0x8001, 0x700e, 0x1078, 0x5464, 0x7058, 0x2068,</div><div class='del'>-	0x7084, 0x705a, 0x6803, 0x0000, 0x6807, 0x0000, 0x6834, 0xa084,</div><div class='del'>-	0x00ff, 0xa08a, 0x001a, 0x00c8, 0x4ff9, 0x1079, 0x4fff, 0x127f,</div><div class='del'>-	0x007c, 0x127f, 0x1078, 0x501f, 0x007c, 0x007c, 0x007c, 0x501f,</div><div class='del'>-	0x503b, 0x515b, 0x501f, 0x503b, 0x501f, 0x503b, 0x503b, 0x501f,</div><div class='del'>-	0x503b, 0x515b, 0x503b, 0x503b, 0x503b, 0x503b, 0x503b, 0x501f,</div><div class='del'>-	0x503b, 0x515b, 0x501f, 0x501f, 0x503b, 0x501f, 0x501f, 0x501f,</div><div class='del'>-	0x503b, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 0x7007,</div><div class='del'>-	0x0001, 0x6838, 0xa084, 0x00ff, 0xc0d5, 0x683a, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x1078, 0x4a73, 0x127f, 0x007c, 0x7007, 0x0001, 0x6838,</div><div class='del'>-	0xa084, 0x00ff, 0xc0e5, 0x683a, 0x127e, 0x2091, 0x8000, 0x1078,</div><div class='del'>-	0x4a73, 0x127f, 0x007c, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff,</div><div class='del'>-	0xc0ed, 0x683a, 0x127e, 0x2091, 0x8000, 0x1078, 0x4a73, 0x127f,</div><div class='del'>-	0x007c, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff, 0xc0dd, 0x683a,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x1078, 0x4a73, 0x127f, 0x007c, 0x6834,</div><div class='del'>-	0x8007, 0xa084, 0x00ff, 0x0040, 0x502d, 0x8001, 0x00c0, 0x5064,</div><div class='del'>-	0x7007, 0x0001, 0x0078, 0x513a, 0x7007, 0x0006, 0x7012, 0x2d00,</div><div class='del'>-	0x7016, 0x701a, 0x704b, 0x513a, 0x007c, 0x684c, 0xa084, 0x00c0,</div><div class='del'>-	0xa086, 0x00c0, 0x00c0, 0x5078, 0x7007, 0x0001, 0x0078, 0x5373,</div><div class='del'>-	0x2d00, 0x7016, 0x701a, 0x20a9, 0x0004, 0xa080, 0x0024, 0x2098,</div><div class='del'>-	0x20a1, 0xa80d, 0x53a3, 0x6858, 0x7012, 0xa082, 0x0401, 0x00c8,</div><div class='del'>-	0x5049, 0x6884, 0xa08a, 0x0002, 0x00c8, 0x5049, 0x82ff, 0x00c0,</div><div class='del'>-	0x509a, 0x6888, 0x698c, 0xa105, 0x0040, 0x509a, 0x2001, 0x510a,</div><div class='del'>-	0x0078, 0x509d, 0xa280, 0x5100, 0x2004, 0x70c6, 0x7010, 0xa015,</div><div class='del'>-	0x0040, 0x50e8, 0x1078, 0x1370, 0x00c0, 0x50a9, 0x7007, 0x000f,</div><div class='del'>-	0x007c, 0x2d00, 0x7022, 0x70c4, 0x2060, 0x6000, 0x6836, 0x6004,</div><div class='del'>-	0xad00, 0x7096, 0x6008, 0xa20a, 0x00c8, 0x50b8, 0xa00e, 0x2200,</div><div class='del'>-	0x7112, 0x620c, 0x8003, 0x800b, 0xa296, 0x0004, 0x0040, 0x50c1,</div><div class='del'>-	0xa108, 0x719a, 0x810b, 0x719e, 0xae90, 0x0022, 0x1078, 0x13db,</div><div class='del'>-	0x7090, 0xa08e, 0x0100, 0x0040, 0x50dc, 0xa086, 0x0200, 0x0040,</div><div class='del'>-	0x50d4, 0x7007, 0x0010, 0x007c, 0x7020, 0x2068, 0x1078, 0x13a4,</div><div class='del'>-	0x7014, 0x2068, 0x0078, 0x5049, 0x7020, 0x2068, 0x7018, 0x6802,</div><div class='del'>-	0x6807, 0x0000, 0x2d08, 0x2068, 0x6906, 0x711a, 0x0078, 0x509e,</div><div class='del'>-	0x7014, 0x2068, 0x7007, 0x0001, 0x6884, 0xa005, 0x00c0, 0x50f7,</div><div class='del'>-	0x6888, 0x698c, 0xa105, 0x0040, 0x50f7, 0x1078, 0x510e, 0x6834,</div><div class='del'>-	0xa084, 0x00ff, 0xa086, 0x001e, 0x0040, 0x5373, 0x0078, 0x513a,</div><div class='del'>-	0x5102, 0x5106, 0x0002, 0x0011, 0x0007, 0x0004, 0x000a, 0x000f,</div><div class='del'>-	0x0005, 0x0006, 0x000a, 0x0011, 0x0005, 0x0004, 0x0f7e, 0x0e7e,</div><div class='del'>-	0x0c7e, 0x077e, 0x067e, 0x6f88, 0x6e8c, 0x6804, 0x2060, 0xacf0,</div><div class='del'>-	0x0021, 0xacf8, 0x0027, 0x2009, 0x0005, 0x700c, 0x7816, 0x7008,</div><div class='del'>-	0x7812, 0x7004, 0x7806, 0x7000, 0x7802, 0x7e0e, 0x7f0a, 0x8109,</div><div class='del'>-	0x0040, 0x5130, 0xaef2, 0x0004, 0xaffa, 0x0006, 0x0078, 0x511d,</div><div class='del'>-	0x6004, 0xa065, 0x00c0, 0x5117, 0x067f, 0x077f, 0x0c7f, 0x0e7f,</div><div class='del'>-	0x0f7f, 0x007c, 0x2009, 0xa72f, 0x210c, 0x81ff, 0x00c0, 0x5155,</div><div class='del'>-	0x6838, 0xa084, 0x00ff, 0x683a, 0x1078, 0x4353, 0x00c0, 0x5149,</div><div class='del'>-	0x007c, 0x1078, 0x4b51, 0x127e, 0x2091, 0x8000, 0x1078, 0x8f8d,</div><div class='del'>-	0x1078, 0x4a73, 0x127f, 0x0078, 0x5148, 0x2001, 0x0028, 0x2009,</div><div class='del'>-	0x0000, 0x0078, 0x5149, 0x7018, 0x6802, 0x2d08, 0x2068, 0x6906,</div><div class='del'>-	0x711a, 0x7010, 0x8001, 0x7012, 0x0040, 0x516a, 0x7007, 0x0006,</div><div class='del'>-	0x0078, 0x5170, 0x7014, 0x2068, 0x7007, 0x0001, 0x7048, 0x107a,</div><div class='del'>-	0x007c, 0x7007, 0x0001, 0x6944, 0x810f, 0xa18c, 0x00ff, 0x6848,</div><div class='del'>-	0xa084, 0x00ff, 0x20a9, 0x0001, 0xa096, 0x0001, 0x0040, 0x519a,</div><div class='del'>-	0x2009, 0x0000, 0x20a9, 0x00ff, 0xa096, 0x0002, 0x0040, 0x519a,</div><div class='del'>-	0xa005, 0x00c0, 0x51ad, 0x6944, 0x810f, 0xa18c, 0x00ff, 0x1078,</div><div class='del'>-	0x45c4, 0x00c0, 0x51ad, 0x067e, 0x6e50, 0x1078, 0x46b3, 0x067f,</div><div class='del'>-	0x0078, 0x51ad, 0x047e, 0x2011, 0xa70c, 0x2224, 0xc484, 0xc48c,</div><div class='del'>-	0x2412, 0x047f, 0x0c7e, 0x1078, 0x45c4, 0x00c0, 0x51a9, 0x1078,</div><div class='del'>-	0x4852, 0x8108, 0x00f0, 0x51a3, 0x0c7f, 0x684c, 0xd084, 0x00c0,</div><div class='del'>-	0x51b4, 0x1078, 0x13a4, 0x007c, 0x127e, 0x2091, 0x8000, 0x1078,</div><div class='del'>-	0x4a73, 0x127f, 0x007c, 0x127e, 0x2091, 0x8000, 0x7007, 0x0001,</div><div class='del'>-	0x2001, 0xa753, 0x2004, 0xd0a4, 0x0040, 0x51ff, 0x2061, 0xaa33,</div><div class='del'>-	0x6100, 0xd184, 0x0040, 0x51df, 0x6858, 0xa084, 0x00ff, 0x00c0,</div><div class='del'>-	0x5202, 0x6000, 0xd084, 0x0040, 0x51ff, 0x6004, 0xa005, 0x00c0,</div><div class='del'>-	0x5205, 0x6003, 0x0000, 0x600b, 0x0000, 0x0078, 0x51fc, 0x2011,</div><div class='del'>-	0x0001, 0x6860, 0xa005, 0x00c0, 0x51e7, 0x2001, 0x001e, 0x8000,</div><div class='del'>-	0x6016, 0x6858, 0xa084, 0x00ff, 0x0040, 0x51ff, 0x6006, 0x6858,</div><div class='del'>-	0x8007, 0xa084, 0x00ff, 0x0040, 0x51ff, 0x600a, 0x6858, 0x8000,</div><div class='del'>-	0x00c0, 0x51fb, 0xc28d, 0x6202, 0x127f, 0x0078, 0x5453, 0x127f,</div><div class='del'>-	0x0078, 0x544b, 0x127f, 0x0078, 0x5443, 0x127f, 0x0078, 0x5447,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x7007, 0x0001, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0a4, 0x0040, 0x525e, 0x2061, 0xaa33, 0x6000, 0xd084, 0x0040,</div><div class='del'>-	0x525e, 0x6204, 0x6308, 0xd08c, 0x00c0, 0x5250, 0x6c48, 0xa484,</div><div class='del'>-	0x0003, 0x0040, 0x5236, 0x6958, 0xa18c, 0x00ff, 0x8001, 0x00c0,</div><div class='del'>-	0x522f, 0x2100, 0xa210, 0x0048, 0x525b, 0x0078, 0x5236, 0x8001,</div><div class='del'>-	0x00c0, 0x525b, 0x2100, 0xa212, 0x0048, 0x525b, 0xa484, 0x000c,</div><div class='del'>-	0x0040, 0x5250, 0x6958, 0x810f, 0xa18c, 0x00ff, 0xa082, 0x0004,</div><div class='del'>-	0x00c0, 0x5248, 0x2100, 0xa318, 0x0048, 0x525b, 0x0078, 0x5250,</div><div class='del'>-	0xa082, 0x0004, 0x00c0, 0x525b, 0x2100, 0xa31a, 0x0048, 0x525b,</div><div class='del'>-	0x6860, 0xa005, 0x0040, 0x5256, 0x8000, 0x6016, 0x6206, 0x630a,</div><div class='del'>-	0x127f, 0x0078, 0x5453, 0x127f, 0x0078, 0x544f, 0x127f, 0x0078,</div><div class='del'>-	0x544b, 0x127e, 0x2091, 0x8000, 0x7007, 0x0001, 0x2061, 0xaa33,</div><div class='del'>-	0x6300, 0xd38c, 0x00c0, 0x5271, 0x6308, 0x8318, 0x0048, 0x5274,</div><div class='del'>-	0x630a, 0x127f, 0x0078, 0x5461, 0x127f, 0x0078, 0x544f, 0x127e,</div><div class='del'>-	0x0c7e, 0x2091, 0x8000, 0x7007, 0x0001, 0x684c, 0xd0ac, 0x0040,</div><div class='del'>-	0x528b, 0x0c7e, 0x2061, 0xaa33, 0x6000, 0xa084, 0xfcff, 0x6002,</div><div class='del'>-	0x0c7f, 0x0078, 0x52ba, 0x6858, 0xa005, 0x0040, 0x52d1, 0x685c,</div><div class='del'>-	0xa065, 0x0040, 0x52cd, 0x2001, 0xa72f, 0x2004, 0xa005, 0x0040,</div><div class='del'>-	0x529d, 0x1078, 0x8ed6, 0x0078, 0x52ab, 0x6013, 0x0400, 0x6037,</div><div class='del'>-	0x0000, 0x694c, 0xd1a4, 0x0040, 0x52a7, 0x6950, 0x6136, 0x2009,</div><div class='del'>-	0x0041, 0x1078, 0x775c, 0x6958, 0xa18c, 0xff00, 0xa186, 0x2000,</div><div class='del'>-	0x00c0, 0x52ba, 0x027e, 0x2009, 0x0000, 0x2011, 0xfdff, 0x1078,</div><div class='del'>-	0x5bf1, 0x027f, 0x684c, 0xd0c4, 0x0040, 0x52c9, 0x2061, 0xaa33,</div><div class='del'>-	0x6000, 0xd08c, 0x00c0, 0x52c9, 0x6008, 0x8000, 0x0048, 0x52cd,</div><div class='del'>-	0x600a, 0x0c7f, 0x127f, 0x0078, 0x5453, 0x0c7f, 0x127f, 0x0078,</div><div class='del'>-	0x544b, 0x6954, 0xa186, 0x0045, 0x0040, 0x5306, 0xa186, 0x002a,</div><div class='del'>-	0x00c0, 0x52e1, 0x2001, 0xa70c, 0x200c, 0xc194, 0x2102, 0x0078,</div><div class='del'>-	0x52ba, 0xa186, 0x0020, 0x0040, 0x52fa, 0xa186, 0x0029, 0x0040,</div><div class='del'>-	0x52ed, 0xa186, 0x002d, 0x00c0, 0x52cd, 0x6944, 0xa18c, 0xff00,</div><div class='del'>-	0x810f, 0x1078, 0x45c4, 0x00c0, 0x52ba, 0x6000, 0xc0e4, 0x6002,</div><div class='del'>-	0x0078, 0x52ba, 0x685c, 0xa065, 0x0040, 0x52cd, 0x6007, 0x0024,</div><div class='del'>-	0x2001, 0xa9a3, 0x2004, 0x6016, 0x0078, 0x52ba, 0x685c, 0xa065,</div><div class='del'>-	0x0040, 0x52cd, 0x0e7e, 0x6860, 0xa075, 0x2001, 0xa72f, 0x2004,</div><div class='del'>-	0xa005, 0x0040, 0x531e, 0x1078, 0x8ed6, 0x8eff, 0x0040, 0x531b,</div><div class='del'>-	0x2e60, 0x1078, 0x8ed6, 0x0e7f, 0x0078, 0x52ba, 0x6024, 0xc0dc,</div><div class='del'>-	0xc0d5, 0x6026, 0x2e60, 0x6007, 0x003a, 0x6870, 0xa005, 0x0040,</div><div class='del'>-	0x532f, 0x6007, 0x003b, 0x6874, 0x602a, 0x6878, 0x6012, 0x6003,</div><div class='del'>-	0x0001, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0e7f, 0x0078, 0x52ba,</div><div class='del'>-	0x2061, 0xaa33, 0x6000, 0xd084, 0x0040, 0x5352, 0xd08c, 0x00c0,</div><div class='del'>-	0x5461, 0x2091, 0x8000, 0x6204, 0x8210, 0x0048, 0x534c, 0x6206,</div><div class='del'>-	0x2091, 0x8001, 0x0078, 0x5461, 0x2091, 0x8001, 0x6853, 0x0016,</div><div class='del'>-	0x0078, 0x545a, 0x6853, 0x0007, 0x0078, 0x545a, 0x6834, 0x8007,</div><div class='del'>-	0xa084, 0x00ff, 0x00c0, 0x5360, 0x1078, 0x502d, 0x0078, 0x5372,</div><div class='del'>-	0x2030, 0x8001, 0x00c0, 0x536a, 0x7007, 0x0001, 0x1078, 0x5373,</div><div class='del'>-	0x0078, 0x5372, 0x7007, 0x0006, 0x7012, 0x2d00, 0x7016, 0x701a,</div><div class='del'>-	0x704b, 0x5373, 0x007c, 0x0e7e, 0x127e, 0x2091, 0x8000, 0xa03e,</div><div class='del'>-	0x2009, 0xa72f, 0x210c, 0x81ff, 0x00c0, 0x53ff, 0x2009, 0xa70c,</div><div class='del'>-	0x210c, 0xd194, 0x00c0, 0x5431, 0x6848, 0x2070, 0xae82, 0xae00,</div><div class='del'>-	0x0048, 0x53ef, 0x2001, 0xa716, 0x2004, 0xae02, 0x00c8, 0x53ef,</div><div class='del'>-	0x2061, 0xaa33, 0x6100, 0xa184, 0x0301, 0xa086, 0x0001, 0x00c0,</div><div class='del'>-	0x53d2, 0x711c, 0xa186, 0x0006, 0x00c0, 0x53da, 0x7018, 0xa005,</div><div class='del'>-	0x0040, 0x53ff, 0x2004, 0xd0e4, 0x00c0, 0x542b, 0x7024, 0xd0dc,</div><div class='del'>-	0x00c0, 0x5435, 0x6853, 0x0000, 0x6803, 0x0000, 0x2d08, 0x7010,</div><div class='del'>-	0xa005, 0x00c0, 0x53be, 0x7112, 0x684c, 0xd0f4, 0x00c0, 0x5439,</div><div class='del'>-	0x2e60, 0x1078, 0x5b27, 0x127f, 0x0e7f, 0x007c, 0x2068, 0x6800,</div><div class='del'>-	0xa005, 0x00c0, 0x53be, 0x6902, 0x2168, 0x684c, 0xd0f4, 0x00c0,</div><div class='del'>-	0x5439, 0x127f, 0x0e7f, 0x007c, 0x127f, 0x0e7f, 0x6853, 0x0006,</div><div class='del'>-	0x0078, 0x545a, 0xd184, 0x0040, 0x53cc, 0xd1c4, 0x00c0, 0x53f3,</div><div class='del'>-	0x0078, 0x53f7, 0x6944, 0xa18c, 0xff00, 0x810f, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x542b, 0x6000, 0xd0e4, 0x00c0, 0x542b, 0x711c, 0xa186,</div><div class='del'>-	0x0007, 0x00c0, 0x53ef, 0x6853, 0x0002, 0x0078, 0x542d, 0x6853,</div><div class='del'>-	0x0008, 0x0078, 0x542d, 0x6853, 0x000e, 0x0078, 0x542d, 0x6853,</div><div class='del'>-	0x0017, 0x0078, 0x542d, 0x6853, 0x0035, 0x0078, 0x542d, 0x2001,</div><div class='del'>-	0xa772, 0x2004, 0xd0fc, 0x0040, 0x5427, 0x6848, 0x2070, 0xae82,</div><div class='del'>-	0xae00, 0x0048, 0x5427, 0x6058, 0xae02, 0x00c8, 0x5427, 0x711c,</div><div class='del'>-	0xa186, 0x0006, 0x00c0, 0x5427, 0x7018, 0xa005, 0x0040, 0x5427,</div><div class='del'>-	0x2004, 0xd0bc, 0x0040, 0x5427, 0x2039, 0x0001, 0x7000, 0xa086,</div><div class='del'>-	0x0007, 0x00c0, 0x537e, 0x7003, 0x0002, 0x0078, 0x537e, 0x6853,</div><div class='del'>-	0x0028, 0x0078, 0x542d, 0x6853, 0x0029, 0x127f, 0x0e7f, 0x0078,</div><div class='del'>-	0x545a, 0x6853, 0x002a, 0x0078, 0x542d, 0x6853, 0x0045, 0x0078,</div><div class='del'>-	0x542d, 0x2e60, 0x2019, 0x0002, 0x6017, 0x0014, 0x1078, 0x9dd7,</div><div class='del'>-	0x127f, 0x0e7f, 0x007c, 0x2009, 0x003e, 0x0078, 0x5455, 0x2009,</div><div class='del'>-	0x0004, 0x0078, 0x5455, 0x2009, 0x0006, 0x0078, 0x5455, 0x2009,</div><div class='del'>-	0x0016, 0x0078, 0x5455, 0x2009, 0x0001, 0x6854, 0xa084, 0xff00,</div><div class='del'>-	0xa105, 0x6856, 0x2091, 0x8000, 0x1078, 0x4a73, 0x2091, 0x8001,</div><div class='del'>-	0x007c, 0x1078, 0x13a4, 0x007c, 0x702c, 0x7130, 0x8108, 0xa102,</div><div class='del'>-	0x0048, 0x5471, 0xa00e, 0x7034, 0x7072, 0x7038, 0x7076, 0x0078,</div><div class='del'>-	0x547d, 0x7070, 0xa080, 0x0040, 0x7072, 0x00c8, 0x547d, 0x7074,</div><div class='del'>-	0xa081, 0x0000, 0x7076, 0xa085, 0x0001, 0x7932, 0x7132, 0x007c,</div><div class='del'>-	0x0d7e, 0x1078, 0x5b1e, 0x0d7f, 0x007c, 0x0d7e, 0x2011, 0x0004,</div><div class='del'>-	0x2204, 0xa085, 0x8002, 0x2012, 0x0d7f, 0x007c, 0x20e1, 0x0002,</div><div class='del'>-	0x3d08, 0x20e1, 0x2000, 0x3d00, 0xa084, 0x7000, 0x0040, 0x549c,</div><div class='del'>-	0xa086, 0x1000, 0x00c0, 0x54d3, 0x20e1, 0x0000, 0x3d00, 0xa094,</div><div class='del'>-	0xff00, 0x8217, 0xa084, 0xf000, 0xa086, 0x3000, 0x00c0, 0x54b7,</div><div class='del'>-	0xa184, 0xff00, 0x8007, 0xa086, 0x0008, 0x00c0, 0x54d3, 0x1078,</div><div class='del'>-	0x29bb, 0x00c0, 0x54d3, 0x1078, 0x56b2, 0x0078, 0x54ce, 0x20e1,</div><div class='del'>-	0x0004, 0x3d60, 0xd1bc, 0x00c0, 0x54be, 0x3e60, 0xac84, 0x000f,</div><div class='del'>-	0x00c0, 0x54d3, 0xac82, 0xae00, 0x0048, 0x54d3, 0x6858, 0xac02,</div><div class='del'>-	0x00c8, 0x54d3, 0x2009, 0x0047, 0x1078, 0x775c, 0x7a1c, 0xd284,</div><div class='del'>-	0x00c0, 0x548e, 0x007c, 0xa016, 0x1078, 0x15fa, 0x0078, 0x54ce,</div><div class='del'>-	0x0078, 0x54d3, 0x781c, 0xd08c, 0x0040, 0x5502, 0x157e, 0x137e,</div><div class='del'>-	0x147e, 0x20e1, 0x3000, 0x3d20, 0x3e28, 0xa584, 0x0076, 0x00c0,</div><div class='del'>-	0x5518, 0xa484, 0x7000, 0xa086, 0x1000, 0x00c0, 0x5507, 0x1078,</div><div class='del'>-	0x554e, 0x0040, 0x5518, 0x20e1, 0x3000, 0x7828, 0x7828, 0x1078,</div><div class='del'>-	0x556c, 0x147f, 0x137f, 0x157f, 0x2009, 0xa9b9, 0x2104, 0xa005,</div><div class='del'>-	0x00c0, 0x5503, 0x007c, 0x1078, 0x62d1, 0x0078, 0x5502, 0xa484,</div><div class='del'>-	0x7000, 0x00c0, 0x5518, 0x1078, 0x554e, 0x0040, 0x552c, 0x7000,</div><div class='del'>-	0xa084, 0xff00, 0xa086, 0x8100, 0x0040, 0x54f3, 0x0078, 0x552c,</div><div class='del'>-	0x1078, 0xa55f, 0xd5a4, 0x0040, 0x5528, 0x047e, 0x1078, 0x1b22,</div><div class='del'>-	0x047f, 0x20e1, 0x9010, 0x2001, 0x0138, 0x2202, 0x0078, 0x5530,</div><div class='del'>-	0x1078, 0x554e, 0x6883, 0x0000, 0x20e1, 0x3000, 0x7828, 0x7828,</div><div class='del'>-	0x1078, 0x5537, 0x147f, 0x137f, 0x157f, 0x0078, 0x5502, 0x2001,</div><div class='del'>-	0xa70e, 0x2004, 0xd08c, 0x0040, 0x554d, 0x2001, 0xa700, 0x2004,</div><div class='del'>-	0xa086, 0x0003, 0x00c0, 0x554d, 0x027e, 0x037e, 0x2011, 0x8048,</div><div class='del'>-	0x2518, 0x1078, 0x361b, 0x037f, 0x027f, 0x007c, 0xa484, 0x01ff,</div><div class='del'>-	0x6882, 0xa005, 0x0040, 0x5560, 0xa080, 0x001f, 0xa084, 0x03f8,</div><div class='del'>-	0x80ac, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a, 0x53a5, 0x007c,</div><div class='del'>-	0x20a9, 0x000c, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a, 0x53a5,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x555f, 0x7000, 0xa084, 0xff00, 0xa08c,</div><div class='del'>-	0xf000, 0x8007, 0xa196, 0x0000, 0x00c0, 0x5579, 0x0078, 0x57ba,</div><div class='del'>-	0x007c, 0xa196, 0x2000, 0x00c0, 0x558a, 0x6900, 0xa18e, 0x0001,</div><div class='del'>-	0x00c0, 0x5586, 0x1078, 0x3aec, 0x0078, 0x5578, 0x1078, 0x5592,</div><div class='del'>-	0x0078, 0x5578, 0xa196, 0x8000, 0x00c0, 0x5578, 0x1078, 0x5871,</div><div class='del'>-	0x0078, 0x5578, 0x0c7e, 0x7110, 0xa18c, 0xff00, 0x810f, 0xa196,</div><div class='del'>-	0x0001, 0x0040, 0x559f, 0xa196, 0x0023, 0x00c0, 0x56aa, 0xa08e,</div><div class='del'>-	0x0023, 0x00c0, 0x55d4, 0x1078, 0x591d, 0x0040, 0x56aa, 0x7124,</div><div class='del'>-	0x610a, 0x7030, 0xa08e, 0x0200, 0x00c0, 0x55b8, 0x7034, 0xa005,</div><div class='del'>-	0x00c0, 0x56aa, 0x2009, 0x0015, 0x1078, 0x775c, 0x0078, 0x56aa,</div><div class='del'>-	0xa08e, 0x0214, 0x0040, 0x55c0, 0xa08e, 0x0210, 0x00c0, 0x55c6,</div><div class='del'>-	0x2009, 0x0015, 0x1078, 0x775c, 0x0078, 0x56aa, 0xa08e, 0x0100,</div><div class='del'>-	0x00c0, 0x56aa, 0x7034, 0xa005, 0x00c0, 0x56aa, 0x2009, 0x0016,</div><div class='del'>-	0x1078, 0x775c, 0x0078, 0x56aa, 0xa08e, 0x0022, 0x00c0, 0x56aa,</div><div class='del'>-	0x7030, 0xa08e, 0x0300, 0x00c0, 0x55e5, 0x7034, 0xa005, 0x00c0,</div><div class='del'>-	0x56aa, 0x2009, 0x0017, 0x0078, 0x5676, 0xa08e, 0x0500, 0x00c0,</div><div class='del'>-	0x55f1, 0x7034, 0xa005, 0x00c0, 0x56aa, 0x2009, 0x0018, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x2010, 0x00c0, 0x55f9, 0x2009, 0x0019, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x2110, 0x00c0, 0x5601, 0x2009, 0x001a, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x5200, 0x00c0, 0x560d, 0x7034, 0xa005, 0x00c0,</div><div class='del'>-	0x56aa, 0x2009, 0x001b, 0x0078, 0x5676, 0xa08e, 0x5000, 0x00c0,</div><div class='del'>-	0x5619, 0x7034, 0xa005, 0x00c0, 0x56aa, 0x2009, 0x001c, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x1300, 0x00c0, 0x5621, 0x2009, 0x0034, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x1200, 0x00c0, 0x562d, 0x7034, 0xa005, 0x00c0,</div><div class='del'>-	0x56aa, 0x2009, 0x0024, 0x0078, 0x5676, 0xa08c, 0xff00, 0xa18e,</div><div class='del'>-	0x2400, 0x00c0, 0x5637, 0x2009, 0x002d, 0x0078, 0x5676, 0xa08c,</div><div class='del'>-	0xff00, 0xa18e, 0x5300, 0x00c0, 0x5641, 0x2009, 0x002a, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x0f00, 0x00c0, 0x5649, 0x2009, 0x0020, 0x0078,</div><div class='del'>-	0x5676, 0xa08e, 0x5300, 0x00c0, 0x564f, 0x0078, 0x566c, 0xa08e,</div><div class='del'>-	0x6104, 0x00c0, 0x566c, 0x2011, 0xac8d, 0x8208, 0x2204, 0xa082,</div><div class='del'>-	0x0004, 0x20a8, 0x95ac, 0x95ac, 0x2011, 0x8015, 0x211c, 0x8108,</div><div class='del'>-	0x047e, 0x2124, 0x1078, 0x361b, 0x047f, 0x8108, 0x00f0, 0x565c,</div><div class='del'>-	0x2009, 0x0023, 0x0078, 0x5676, 0xa08e, 0x6000, 0x00c0, 0x5674,</div><div class='del'>-	0x2009, 0x003f, 0x0078, 0x5676, 0x2009, 0x001d, 0x017e, 0x2011,</div><div class='del'>-	0xac83, 0x2204, 0x8211, 0x220c, 0x1078, 0x254d, 0x00c0, 0x56ac,</div><div class='del'>-	0x1078, 0x455c, 0x00c0, 0x56ac, 0x6612, 0x6516, 0x86ff, 0x0040,</div><div class='del'>-	0x569c, 0x017f, 0x017e, 0xa186, 0x0017, 0x00c0, 0x569c, 0x686c,</div><div class='del'>-	0xa606, 0x00c0, 0x569c, 0x6870, 0xa506, 0xa084, 0xff00, 0x00c0,</div><div class='del'>-	0x569c, 0x6000, 0xc0f5, 0x6002, 0x0c7e, 0x1078, 0x76c7, 0x0040,</div><div class='del'>-	0x56af, 0x017f, 0x611a, 0x601f, 0x0004, 0x7120, 0x610a, 0x017f,</div><div class='del'>-	0x1078, 0x775c, 0x0c7f, 0x007c, 0x017f, 0x0078, 0x56aa, 0x0c7f,</div><div class='del'>-	0x0078, 0x56ac, 0x0c7e, 0x1078, 0x570f, 0x00c0, 0x570d, 0xa28e,</div><div class='del'>-	0x0033, 0x00c0, 0x56de, 0x1078, 0x591d, 0x0040, 0x570d, 0x7124,</div><div class='del'>-	0x610a, 0x7030, 0xa08e, 0x0200, 0x00c0, 0x56d0, 0x7034, 0xa005,</div><div class='del'>-	0x00c0, 0x570d, 0x2009, 0x0015, 0x1078, 0x775c, 0x0078, 0x570d,</div><div class='del'>-	0xa08e, 0x0100, 0x00c0, 0x570d, 0x7034, 0xa005, 0x00c0, 0x570d,</div><div class='del'>-	0x2009, 0x0016, 0x1078, 0x775c, 0x0078, 0x570d, 0xa28e, 0x0032,</div><div class='del'>-	0x00c0, 0x570d, 0x7030, 0xa08e, 0x1400, 0x00c0, 0x570d, 0x2009,</div><div class='del'>-	0x0038, 0x017e, 0x2011, 0xac83, 0x2204, 0x8211, 0x220c, 0x1078,</div><div class='del'>-	0x254d, 0x00c0, 0x570c, 0x1078, 0x455c, 0x00c0, 0x570c, 0x6612,</div><div class='del'>-	0x6516, 0x0c7e, 0x1078, 0x76c7, 0x0040, 0x570b, 0x017f, 0x611a,</div><div class='del'>-	0x601f, 0x0004, 0x7120, 0x610a, 0x017f, 0x1078, 0x775c, 0x1078,</div><div class='del'>-	0x62d1, 0x0078, 0x570d, 0x0c7f, 0x017f, 0x0c7f, 0x007c, 0x0f7e,</div><div class='del'>-	0x0d7e, 0x027e, 0x017e, 0x137e, 0x147e, 0x157e, 0x3c00, 0x007e,</div><div class='del'>-	0x2079, 0x0030, 0x2069, 0x0200, 0x1078, 0x1c6a, 0x00c0, 0x5750,</div><div class='del'>-	0x1078, 0x1b40, 0x0040, 0x575d, 0x7908, 0xa18c, 0x1fff, 0xa182,</div><div class='del'>-	0x0011, 0x00c8, 0x575a, 0x20a9, 0x000c, 0x20e1, 0x0000, 0x2ea0,</div><div class='del'>-	0x2099, 0x020a, 0x53a5, 0x20e1, 0x2000, 0x2001, 0x020a, 0x2004,</div><div class='del'>-	0x7a0c, 0x7808, 0xa080, 0x0007, 0xa084, 0x1ff8, 0xa08a, 0x0140,</div><div class='del'>-	0x10c8, 0x1332, 0x80ac, 0x20e1, 0x6000, 0x2099, 0x020a, 0x53a5,</div><div class='del'>-	0x20e1, 0x7000, 0x6828, 0x6828, 0x7803, 0x0004, 0xa294, 0x0070,</div><div class='del'>-	0x007f, 0x20e0, 0x157f, 0x147f, 0x137f, 0x017f, 0x027f, 0x0d7f,</div><div class='del'>-	0x0f7f, 0x007c, 0xa016, 0x1078, 0x15fa, 0xa085, 0x0001, 0x0078,</div><div class='del'>-	0x5750, 0x047e, 0x0e7e, 0x0d7e, 0x2028, 0x2130, 0xa696, 0x00ff,</div><div class='del'>-	0x00c0, 0x5782, 0xa596, 0xfffd, 0x00c0, 0x5772, 0x2009, 0x007f,</div><div class='del'>-	0x0078, 0x57b5, 0xa596, 0xfffe, 0x00c0, 0x577a, 0x2009, 0x007e,</div><div class='del'>-	0x0078, 0x57b5, 0xa596, 0xfffc, 0x00c0, 0x5782, 0x2009, 0x0080,</div><div class='del'>-	0x0078, 0x57b5, 0x2011, 0x0000, 0x2021, 0x0081, 0x20a9, 0x007e,</div><div class='del'>-	0x2071, 0xa8b6, 0x2e1c, 0x83ff, 0x00c0, 0x5794, 0x82ff, 0x00c0,</div><div class='del'>-	0x57a9, 0x2410, 0x0078, 0x57a9, 0x2368, 0x6f10, 0x007e, 0x2100,</div><div class='del'>-	0xa706, 0x007f, 0x6b14, 0x00c0, 0x57a3, 0xa346, 0x00c0, 0x57a3,</div><div class='del'>-	0x2408, 0x0078, 0x57b5, 0x87ff, 0x00c0, 0x57a9, 0x83ff, 0x0040,</div><div class='del'>-	0x578e, 0x8420, 0x8e70, 0x00f0, 0x578a, 0x82ff, 0x00c0, 0x57b4,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x57b6, 0x2208, 0xa006, 0x0d7f, 0x0e7f,</div><div class='del'>-	0x047f, 0x007c, 0xa084, 0x0007, 0x0079, 0x57bf, 0x007c, 0x57c7,</div><div class='del'>-	0x57c7, 0x57c7, 0x5933, 0x57c7, 0x57c8, 0x57e1, 0x5858, 0x007c,</div><div class='del'>-	0x7110, 0xd1bc, 0x0040, 0x57e0, 0x7120, 0x2160, 0xac8c, 0x000f,</div><div class='del'>-	0x00c0, 0x57e0, 0xac8a, 0xae00, 0x0048, 0x57e0, 0x6858, 0xac02,</div><div class='del'>-	0x00c8, 0x57e0, 0x7124, 0x610a, 0x2009, 0x0046, 0x1078, 0x775c,</div><div class='del'>-	0x007c, 0x0c7e, 0xa484, 0x01ff, 0x0040, 0x5833, 0x7110, 0xd1bc,</div><div class='del'>-	0x00c0, 0x5833, 0x2011, 0xac83, 0x2204, 0x8211, 0x220c, 0x1078,</div><div class='del'>-	0x254d, 0x00c0, 0x5833, 0x1078, 0x455c, 0x00c0, 0x5833, 0x6612,</div><div class='del'>-	0x6516, 0x6000, 0xd0ec, 0x00c0, 0x5833, 0x6204, 0xa294, 0xff00,</div><div class='del'>-	0x8217, 0xa286, 0x0006, 0x00c0, 0x5818, 0x0c7e, 0x1078, 0x76c7,</div><div class='del'>-	0x017f, 0x0040, 0x5835, 0x611a, 0x601f, 0x0006, 0x7120, 0x610a,</div><div class='del'>-	0x7130, 0x6122, 0x2009, 0x0044, 0x1078, 0x775c, 0x0078, 0x5833,</div><div class='del'>-	0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x5833, 0x611a, 0x601f,</div><div class='del'>-	0x0004, 0x7120, 0x610a, 0xa286, 0x0004, 0x00c0, 0x582b, 0x6007,</div><div class='del'>-	0x0005, 0x0078, 0x582d, 0x6007, 0x0001, 0x6003, 0x0001, 0x1078,</div><div class='del'>-	0x5dd7, 0x1078, 0x62d1, 0x0c7f, 0x007c, 0x2001, 0xa70d, 0x2004,</div><div class='del'>-	0xd0ec, 0x0040, 0x583f, 0x2011, 0x8049, 0x1078, 0x361b, 0x0c7e,</div><div class='del'>-	0x1078, 0x9197, 0x017f, 0x0040, 0x5833, 0x611a, 0x601f, 0x0006,</div><div class='del'>-	0x7120, 0x610a, 0x7130, 0x6122, 0x6013, 0x0300, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0041, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078, 0x5833,</div><div class='del'>-	0x7110, 0xd1bc, 0x0040, 0x5870, 0x7020, 0x2060, 0xac84, 0x000f,</div><div class='del'>-	0x00c0, 0x5870, 0xac82, 0xae00, 0x0048, 0x5870, 0x6858, 0xac02,</div><div class='del'>-	0x00c8, 0x5870, 0x7124, 0x610a, 0x2009, 0x0045, 0x1078, 0x775c,</div><div class='del'>-	0x007c, 0x007e, 0x1078, 0x29bb, 0x007f, 0x00c0, 0x5887, 0x7110,</div><div class='del'>-	0xa18c, 0xff00, 0x810f, 0xa18e, 0x0000, 0x00c0, 0x5887, 0xa084,</div><div class='del'>-	0x000f, 0xa08a, 0x0006, 0x00c8, 0x5887, 0x1079, 0x5888, 0x007c,</div><div class='del'>-	0x588e, 0x588f, 0x588e, 0x588e, 0x58ff, 0x590e, 0x007c, 0x7110,</div><div class='del'>-	0xd1bc, 0x0040, 0x5897, 0x702c, 0xd084, 0x0040, 0x58fe, 0x700c,</div><div class='del'>-	0x7108, 0x1078, 0x254d, 0x00c0, 0x58fe, 0x1078, 0x455c, 0x00c0,</div><div class='del'>-	0x58fe, 0x6612, 0x6516, 0x6204, 0x7110, 0xd1bc, 0x0040, 0x58c9,</div><div class='del'>-	0xa28c, 0x00ff, 0xa186, 0x0004, 0x0040, 0x58b2, 0xa186, 0x0006,</div><div class='del'>-	0x00c0, 0x58ef, 0x0c7e, 0x1078, 0x591d, 0x0c7f, 0x0040, 0x58fe,</div><div class='del'>-	0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x58fe, 0x611a, 0x601f,</div><div class='del'>-	0x0002, 0x7120, 0x610a, 0x2009, 0x0088, 0x1078, 0x775c, 0x0078,</div><div class='del'>-	0x58fe, 0xa28c, 0x00ff, 0xa186, 0x0006, 0x0040, 0x58de, 0xa186,</div><div class='del'>-	0x0004, 0x0040, 0x58de, 0xa294, 0xff00, 0x8217, 0xa286, 0x0004,</div><div class='del'>-	0x0040, 0x58de, 0xa286, 0x0006, 0x00c0, 0x58ef, 0x0c7e, 0x1078,</div><div class='del'>-	0x76c7, 0x017f, 0x0040, 0x58fe, 0x611a, 0x601f, 0x0005, 0x7120,</div><div class='del'>-	0x610a, 0x2009, 0x0088, 0x1078, 0x775c, 0x0078, 0x58fe, 0x0c7e,</div><div class='del'>-	0x1078, 0x76c7, 0x017f, 0x0040, 0x58fe, 0x611a, 0x601f, 0x0004,</div><div class='del'>-	0x7120, 0x610a, 0x2009, 0x0001, 0x1078, 0x775c, 0x007c, 0x7110,</div><div class='del'>-	0xd1bc, 0x0040, 0x590d, 0x1078, 0x591d, 0x0040, 0x590d, 0x7124,</div><div class='del'>-	0x610a, 0x2009, 0x0089, 0x1078, 0x775c, 0x007c, 0x7110, 0xd1bc,</div><div class='del'>-	0x0040, 0x591c, 0x1078, 0x591d, 0x0040, 0x591c, 0x7124, 0x610a,</div><div class='del'>-	0x2009, 0x008a, 0x1078, 0x775c, 0x007c, 0x7020, 0x2060, 0xac84,</div><div class='del'>-	0x000f, 0x00c0, 0x5930, 0xac82, 0xae00, 0x0048, 0x5930, 0x2001,</div><div class='del'>-	0xa716, 0x2004, 0xac02, 0x00c8, 0x5930, 0xa085, 0x0001, 0x007c,</div><div class='del'>-	0xa006, 0x0078, 0x592f, 0x7110, 0xd1bc, 0x00c0, 0x5949, 0x7024,</div><div class='del'>-	0x2060, 0xac84, 0x000f, 0x00c0, 0x5949, 0xac82, 0xae00, 0x0048,</div><div class='del'>-	0x5949, 0x6858, 0xac02, 0x00c8, 0x5949, 0x2009, 0x0051, 0x1078,</div><div class='del'>-	0x775c, 0x007c, 0x2071, 0xa9c4, 0x7003, 0x0003, 0x700f, 0x0361,</div><div class='del'>-	0xa006, 0x701a, 0x7012, 0x7017, 0xae00, 0x7007, 0x0000, 0x7026,</div><div class='del'>-	0x702b, 0x6e1c, 0x7032, 0x7037, 0x6e70, 0x703b, 0x0002, 0x703f,</div><div class='del'>-	0x0000, 0x7043, 0xffff, 0x7047, 0xffff, 0x007c, 0x2071, 0xa9c4,</div><div class='del'>-	0x00e0, 0x5a32, 0x2091, 0x6000, 0x700c, 0x8001, 0x700e, 0x00c0,</div><div class='del'>-	0x59de, 0x700f, 0x0361, 0x7007, 0x0001, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x7138, 0x8109, 0x713a, 0x00c0, 0x59dc, 0x703b, 0x0002, 0x2009,</div><div class='del'>-	0x0100, 0x2104, 0xa082, 0x0003, 0x00c8, 0x59dc, 0x703c, 0xa086,</div><div class='del'>-	0x0001, 0x00c0, 0x59b9, 0x0d7e, 0x2069, 0x0140, 0x6804, 0xa084,</div><div class='del'>-	0x4000, 0x0040, 0x5997, 0x6803, 0x1000, 0x0078, 0x599e, 0x6804,</div><div class='del'>-	0xa084, 0x1000, 0x0040, 0x599e, 0x6803, 0x0100, 0x6803, 0x0000,</div><div class='del'>-	0x703f, 0x0000, 0x2069, 0xa9b1, 0x6804, 0xa082, 0x0006, 0x00c0,</div><div class='del'>-	0x59ab, 0x6807, 0x0000, 0x6830, 0xa082, 0x0003, 0x00c0, 0x59b2,</div><div class='del'>-	0x6833, 0x0000, 0x1078, 0x62d1, 0x1078, 0x639b, 0x0d7f, 0x0078,</div><div class='del'>-	0x59dc, 0x0d7e, 0x2069, 0xa700, 0x6948, 0x6864, 0xa102, 0x00c8,</div><div class='del'>-	0x59db, 0x2069, 0xa9b1, 0x6804, 0xa086, 0x0000, 0x00c0, 0x59db,</div><div class='del'>-	0x6830, 0xa086, 0x0000, 0x00c0, 0x59db, 0x703f, 0x0001, 0x6807,</div><div class='del'>-	0x0006, 0x6833, 0x0003, 0x2069, 0x0100, 0x6830, 0x689e, 0x2069,</div><div class='del'>-	0x0140, 0x6803, 0x0600, 0x0d7f, 0x0078, 0x59e1, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x7024, 0xa00d, 0x0040, 0x59f9, 0x7020, 0x8001, 0x7022,</div><div class='del'>-	0x00c0, 0x59f9, 0x7023, 0x0009, 0x8109, 0x7126, 0xa186, 0x03e8,</div><div class='del'>-	0x00c0, 0x59f4, 0x7028, 0x107a, 0x81ff, 0x00c0, 0x59f9, 0x7028,</div><div class='del'>-	0x107a, 0x7030, 0xa00d, 0x0040, 0x5a10, 0x702c, 0x8001, 0x702e,</div><div class='del'>-	0x00c0, 0x5a10, 0x702f, 0x0009, 0x8109, 0x7132, 0x0040, 0x5a0e,</div><div class='del'>-	0xa184, 0x007f, 0x1040, 0x6ea2, 0x0078, 0x5a10, 0x7034, 0x107a,</div><div class='del'>-	0x7040, 0xa005, 0x0040, 0x5a18, 0x0050, 0x5a18, 0x8001, 0x7042,</div><div class='del'>-	0x7044, 0xa005, 0x0040, 0x5a20, 0x0050, 0x5a20, 0x8001, 0x7046,</div><div class='del'>-	0x7018, 0xa00d, 0x0040, 0x5a31, 0x7008, 0x8001, 0x700a, 0x00c0,</div><div class='del'>-	0x5a31, 0x700b, 0x0009, 0x8109, 0x711a, 0x00c0, 0x5a31, 0x701c,</div><div class='del'>-	0x107a, 0x127f, 0x7004, 0x0079, 0x5a35, 0x5a5c, 0x5a5d, 0x5a79,</div><div class='del'>-	0x0e7e, 0x2071, 0xa9c4, 0x7018, 0xa005, 0x00c0, 0x5a43, 0x711a,</div><div class='del'>-	0x721e, 0x700b, 0x0009, 0x0e7f, 0x007c, 0x0e7e, 0x007e, 0x2071,</div><div class='del'>-	0xa9c4, 0x701c, 0xa206, 0x00c0, 0x5a4f, 0x701a, 0x701e, 0x007f,</div><div class='del'>-	0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa9c4, 0x6088, 0xa102, 0x0048,</div><div class='del'>-	0x5a5a, 0x618a, 0x0e7f, 0x007c, 0x007c, 0x7110, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x5a6f, 0x6088, 0x8001, 0x0048, 0x5a6f, 0x608a, 0x00c0,</div><div class='del'>-	0x5a6f, 0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x8108,</div><div class='del'>-	0xa182, 0x00ff, 0x0048, 0x5a77, 0xa00e, 0x7007, 0x0002, 0x7112,</div><div class='del'>-	0x007c, 0x7014, 0x2060, 0x127e, 0x2091, 0x8000, 0x603c, 0xa005,</div><div class='del'>-	0x0040, 0x5a88, 0x8001, 0x603e, 0x00c0, 0x5a88, 0x1078, 0x8fac,</div><div class='del'>-	0x6014, 0xa005, 0x0040, 0x5ab2, 0x8001, 0x6016, 0x00c0, 0x5ab2,</div><div class='del'>-	0x611c, 0xa186, 0x0003, 0x0040, 0x5a99, 0xa186, 0x0006, 0x00c0,</div><div class='del'>-	0x5ab0, 0x6010, 0x2068, 0x6854, 0xa08a, 0x199a, 0x0048, 0x5ab0,</div><div class='del'>-	0xa082, 0x1999, 0x6856, 0xa08a, 0x199a, 0x0048, 0x5aa9, 0x2001,</div><div class='del'>-	0x1999, 0x8003, 0x800b, 0x810b, 0xa108, 0x6116, 0x0078, 0x5ab2,</div><div class='del'>-	0x1078, 0x8ace, 0x127f, 0xac88, 0x0010, 0x7116, 0x2001, 0xce00,</div><div class='del'>-	0xa102, 0x0048, 0x5abf, 0x7017, 0xae00, 0x7007, 0x0000, 0x007c,</div><div class='del'>-	0x0e7e, 0x2071, 0xa9c4, 0x7027, 0x07d0, 0x7023, 0x0009, 0x703b,</div><div class='del'>-	0x0002, 0x0e7f, 0x007c, 0x2001, 0xa9cd, 0x2003, 0x0000, 0x007c,</div><div class='del'>-	0x0e7e, 0x2071, 0xa9c4, 0x7132, 0x702f, 0x0009, 0x0e7f, 0x007c,</div><div class='del'>-	0x2011, 0xa9d0, 0x2013, 0x0000, 0x007c, 0x0e7e, 0x2071, 0xa9c4,</div><div class='del'>-	0x711a, 0x721e, 0x700b, 0x0009, 0x0e7f, 0x007c, 0x027e, 0x0e7e,</div><div class='del'>-	0x0f7e, 0x2079, 0xa700, 0x7a34, 0xd294, 0x0040, 0x5b15, 0x2071,</div><div class='del'>-	0xa9ac, 0x2e14, 0xa0fe, 0x0000, 0x0040, 0x5b02, 0xa0fe, 0x0001,</div><div class='del'>-	0x0040, 0x5b06, 0xa0fe, 0x0002, 0x00c0, 0x5b11, 0xa292, 0x0085,</div><div class='del'>-	0x0078, 0x5b08, 0xa292, 0x0005, 0x0078, 0x5b08, 0xa292, 0x0002,</div><div class='del'>-	0x2272, 0x0040, 0x5b0d, 0x00c8, 0x5b15, 0x2011, 0x8037, 0x1078,</div><div class='del'>-	0x361b, 0x2011, 0xa9ab, 0x2204, 0x2072, 0x0f7f, 0x0e7f, 0x027f,</div><div class='del'>-	0x007c, 0x0c7e, 0x2061, 0xaa33, 0x0c7f, 0x007c, 0xa184, 0x000f,</div><div class='del'>-	0x8003, 0x8003, 0x8003, 0xa080, 0xaa33, 0x2060, 0x007c, 0x6854,</div><div class='del'>-	0xa08a, 0x199a, 0x0048, 0x5b2e, 0x2001, 0x1999, 0xa005, 0x00c0,</div><div class='del'>-	0x5b3d, 0x0c7e, 0x2061, 0xaa33, 0x6014, 0x0c7f, 0xa005, 0x00c0,</div><div class='del'>-	0x5b42, 0x2001, 0x001e, 0x0078, 0x5b42, 0xa08e, 0xffff, 0x00c0,</div><div class='del'>-	0x5b42, 0xa006, 0x8003, 0x800b, 0x810b, 0xa108, 0x6116, 0x684c,</div><div class='del'>-	0xa08c, 0x00c0, 0xa18e, 0x00c0, 0x0040, 0x5b9e, 0xd0b4, 0x00c0,</div><div class='del'>-	0x5b59, 0xd0bc, 0x00c0, 0x5b8b, 0x2009, 0x0006, 0x1078, 0x5bc3,</div><div class='del'>-	0x007c, 0xd0fc, 0x0040, 0x5b64, 0xa084, 0x0003, 0x0040, 0x5b64,</div><div class='del'>-	0xa086, 0x0003, 0x00c0, 0x5bbc, 0x6024, 0xd0d4, 0x0040, 0x5b6e,</div><div class='del'>-	0xc0d4, 0x6026, 0x6860, 0x602a, 0x685c, 0x602e, 0x2009, 0xa774,</div><div class='del'>-	0x2104, 0xd084, 0x0040, 0x5b83, 0x6118, 0xa188, 0x0027, 0x2104,</div><div class='del'>-	0xd08c, 0x00c0, 0x5b83, 0x87ff, 0x00c0, 0x5b82, 0x2009, 0x0042,</div><div class='del'>-	0x1078, 0x775c, 0x007c, 0x87ff, 0x00c0, 0x5b8a, 0x2009, 0x0043,</div><div class='del'>-	0x1078, 0x775c, 0x007c, 0xd0fc, 0x0040, 0x5b96, 0xa084, 0x0003,</div><div class='del'>-	0x0040, 0x5b96, 0xa086, 0x0003, 0x00c0, 0x5bbc, 0x87ff, 0x00c0,</div><div class='del'>-	0x5b9d, 0x2009, 0x0042, 0x1078, 0x775c, 0x007c, 0xd0fc, 0x0040,</div><div class='del'>-	0x5baf, 0xa084, 0x0003, 0xa08e, 0x0002, 0x0040, 0x5bb3, 0x87ff,</div><div class='del'>-	0x00c0, 0x5bae, 0x2009, 0x0041, 0x1078, 0x775c, 0x007c, 0x1078,</div><div class='del'>-	0x5bc1, 0x0078, 0x5bae, 0x87ff, 0x00c0, 0x5bae, 0x2009, 0x0043,</div><div class='del'>-	0x1078, 0x775c, 0x0078, 0x5bae, 0x2009, 0x0004, 0x1078, 0x5bc3,</div><div class='del'>-	0x007c, 0x2009, 0x0001, 0x0d7e, 0x6010, 0xa0ec, 0xf000, 0x0040,</div><div class='del'>-	0x5bef, 0x2068, 0x6952, 0x6800, 0x6012, 0xa186, 0x0001, 0x00c0,</div><div class='del'>-	0x5be5, 0x694c, 0xa18c, 0x8100, 0xa18e, 0x8100, 0x00c0, 0x5be5,</div><div class='del'>-	0x0c7e, 0x2061, 0xaa33, 0x6200, 0xd28c, 0x00c0, 0x5be4, 0x6204,</div><div class='del'>-	0x8210, 0x0048, 0x5be4, 0x6206, 0x0c7f, 0x1078, 0x4a73, 0x6010,</div><div class='del'>-	0xa06d, 0x077e, 0x2039, 0x0000, 0x10c0, 0x5b27, 0x077f, 0x0d7f,</div><div class='del'>-	0x007c, 0x157e, 0x0c7e, 0x2061, 0xaa33, 0x6000, 0x81ff, 0x0040,</div><div class='del'>-	0x5bfc, 0xa205, 0x0078, 0x5bfd, 0xa204, 0x6002, 0x0c7f, 0x157f,</div><div class='del'>-	0x007c, 0x6800, 0xd08c, 0x00c0, 0x5c0d, 0x6808, 0xa005, 0x0040,</div><div class='del'>-	0x5c0d, 0x8001, 0x680a, 0xa085, 0x0001, 0x007c, 0x20a9, 0x0010,</div><div class='del'>-	0xa006, 0x8004, 0x8086, 0x818e, 0x00c8, 0x5c17, 0xa200, 0x00f0,</div><div class='del'>-	0x5c12, 0x8086, 0x818e, 0x007c, 0x157e, 0x20a9, 0x0010, 0xa005,</div><div class='del'>-	0x0040, 0x5c3d, 0xa11a, 0x00c8, 0x5c3d, 0x8213, 0x818d, 0x0048,</div><div class='del'>-	0x5c30, 0xa11a, 0x00c8, 0x5c31, 0x00f0, 0x5c25, 0x0078, 0x5c35,</div><div class='del'>-	0xa11a, 0x2308, 0x8210, 0x00f0, 0x5c25, 0x007e, 0x3200, 0xa084,</div><div class='del'>-	0xf7ff, 0x2080, 0x007f, 0x157f, 0x007c, 0x007e, 0x3200, 0xa085,</div><div class='del'>-	0x0800, 0x0078, 0x5c39, 0x127e, 0x2091, 0x2200, 0x2079, 0xa9b1,</div><div class='del'>-	0x127f, 0x0d7e, 0x2069, 0xa9b1, 0x6803, 0x0005, 0x2069, 0x0004,</div><div class='del'>-	0x2d04, 0xa085, 0x8001, 0x206a, 0x0d7f, 0x007c, 0x0c7e, 0x6027,</div><div class='del'>-	0x0001, 0x7804, 0xa084, 0x0007, 0x0079, 0x5c5e, 0x5c68, 0x5c8d,</div><div class='del'>-	0x5ce8, 0x5c6e, 0x5c8d, 0x5c68, 0x5c66, 0x5c66, 0x1078, 0x1332,</div><div class='del'>-	0x1078, 0x5acb, 0x1078, 0x62d1, 0x0c7f, 0x007c, 0x62c0, 0x82ff,</div><div class='del'>-	0x00c0, 0x5c74, 0x0c7f, 0x007c, 0x2011, 0x41dc, 0x1078, 0x5a45,</div><div class='del'>-	0x7828, 0xa092, 0x00c8, 0x00c8, 0x5c83, 0x8000, 0x782a, 0x1078,</div><div class='del'>-	0x421b, 0x0078, 0x5c72, 0x1078, 0x41dc, 0x7807, 0x0003, 0x7827,</div><div class='del'>-	0x0000, 0x782b, 0x0000, 0x0078, 0x5c72, 0x1078, 0x5acb, 0x3c00,</div><div class='del'>-	0x007e, 0x2011, 0x0209, 0x20e1, 0x4000, 0x2214, 0x007f, 0x20e0,</div><div class='del'>-	0x82ff, 0x0040, 0x5cab, 0x62c0, 0x82ff, 0x00c0, 0x5cab, 0x782b,</div><div class='del'>-	0x0000, 0x7824, 0xa065, 0x1040, 0x1332, 0x2009, 0x0013, 0x1078,</div><div class='del'>-	0x775c, 0x0c7f, 0x007c, 0x3900, 0xa082, 0xaae3, 0x00c8, 0x5cb2,</div><div class='del'>-	0x1078, 0x747a, 0x0c7e, 0x7824, 0xa065, 0x1040, 0x1332, 0x7804,</div><div class='del'>-	0xa086, 0x0004, 0x0040, 0x5d2d, 0x7828, 0xa092, 0x2710, 0x00c8,</div><div class='del'>-	0x5cc8, 0x8000, 0x782a, 0x0c7f, 0x1078, 0x6e01, 0x0078, 0x5ca9,</div><div class='del'>-	0x6104, 0xa186, 0x0003, 0x00c0, 0x5cdf, 0x0e7e, 0x2071, 0xa700,</div><div class='del'>-	0x70d8, 0x0e7f, 0xd08c, 0x0040, 0x5cdf, 0x0c7e, 0x0e7e, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0xa700, 0x1078, 0x4224, 0x0e7f, 0x0c7f, 0x1078,</div><div class='del'>-	0xa5d4, 0x2009, 0x0014, 0x1078, 0x775c, 0x0c7f, 0x0078, 0x5ca9,</div><div class='del'>-	0x2001, 0xa9cd, 0x2003, 0x0000, 0x62c0, 0x82ff, 0x00c0, 0x5cfc,</div><div class='del'>-	0x782b, 0x0000, 0x7824, 0xa065, 0x1040, 0x1332, 0x2009, 0x0013,</div><div class='del'>-	0x1078, 0x77b3, 0x0c7f, 0x007c, 0x0c7e, 0x0d7e, 0x3900, 0xa082,</div><div class='del'>-	0xaae3, 0x00c8, 0x5d05, 0x1078, 0x747a, 0x7824, 0xa005, 0x1040,</div><div class='del'>-	0x1332, 0x781c, 0xa06d, 0x1040, 0x1332, 0x6800, 0xc0dc, 0x6802,</div><div class='del'>-	0x7924, 0x2160, 0x1078, 0x772d, 0x693c, 0x81ff, 0x1040, 0x1332,</div><div class='del'>-	0x8109, 0x693e, 0x6854, 0xa015, 0x0040, 0x5d21, 0x7a1e, 0x0078,</div><div class='del'>-	0x5d23, 0x7918, 0x791e, 0x7807, 0x0000, 0x7827, 0x0000, 0x0d7f,</div><div class='del'>-	0x0c7f, 0x1078, 0x62d1, 0x0078, 0x5cfa, 0x6104, 0xa186, 0x0002,</div><div class='del'>-	0x0040, 0x5d38, 0xa186, 0x0004, 0x0040, 0x5d38, 0x0078, 0x5cbc,</div><div class='del'>-	0x7808, 0xac06, 0x0040, 0x5cbc, 0x1078, 0x61cd, 0x1078, 0x5dd7,</div><div class='del'>-	0x0c7f, 0x1078, 0x62d1, 0x0078, 0x5ca9, 0x0c7e, 0x6027, 0x0002,</div><div class='del'>-	0x62c8, 0x82ff, 0x00c0, 0x5d61, 0x62c4, 0x82ff, 0x00c0, 0x5d61,</div><div class='del'>-	0x793c, 0xa1e5, 0x0000, 0x0040, 0x5d5b, 0x2009, 0x0049, 0x1078,</div><div class='del'>-	0x775c, 0x0c7f, 0x007c, 0x2011, 0xa9d0, 0x2013, 0x0000, 0x0078,</div><div class='del'>-	0x5d59, 0x3908, 0xa192, 0xaae3, 0x00c8, 0x5d68, 0x1078, 0x747a,</div><div class='del'>-	0x6017, 0x0010, 0x793c, 0x81ff, 0x0040, 0x5d5b, 0x7944, 0xa192,</div><div class='del'>-	0x7530, 0x00c8, 0x5d85, 0x8108, 0x7946, 0x793c, 0xa188, 0x0007,</div><div class='del'>-	0x210c, 0xa18e, 0x0006, 0x00c0, 0x5d81, 0x6017, 0x0012, 0x0078,</div><div class='del'>-	0x5d59, 0x6017, 0x0016, 0x0078, 0x5d59, 0x7848, 0xc085, 0x784a,</div><div class='del'>-	0x0078, 0x5d59, 0x007e, 0x017e, 0x0c7e, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x600f, 0x0000, 0x2c08, 0x2061, 0xa9b1, 0x6020, 0x8000, 0x6022,</div><div class='del'>-	0x6010, 0xa005, 0x0040, 0x5da5, 0xa080, 0x0003, 0x2102, 0x6112,</div><div class='del'>-	0x127f, 0x0c7f, 0x017f, 0x007f, 0x007c, 0x6116, 0x6112, 0x0078,</div><div class='del'>-	0x5da0, 0x0d7e, 0x2069, 0xa9b1, 0x6000, 0xd0d4, 0x0040, 0x5dbe,</div><div class='del'>-	0x6820, 0x8000, 0x6822, 0xa086, 0x0001, 0x00c0, 0x5db9, 0x2c00,</div><div class='del'>-	0x681e, 0x6804, 0xa084, 0x0007, 0x0079, 0x62d9, 0xc0d5, 0x6002,</div><div class='del'>-	0x6818, 0xa005, 0x0040, 0x5dd0, 0x6056, 0x605b, 0x0000, 0x007e,</div><div class='del'>-	0x2c00, 0x681a, 0x0d7f, 0x685a, 0x2069, 0xa9b1, 0x0078, 0x5db0,</div><div class='del'>-	0x6056, 0x605a, 0x2c00, 0x681a, 0x681e, 0x0078, 0x5db0, 0x007e,</div><div class='del'>-	0x017e, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08,</div><div class='del'>-	0x2061, 0xa9b1, 0x6020, 0x8000, 0x6022, 0x6008, 0xa005, 0x0040,</div><div class='del'>-	0x5df2, 0xa080, 0x0003, 0x2102, 0x610a, 0x127f, 0x0c7f, 0x017f,</div><div class='del'>-	0x007f, 0x007c, 0x610e, 0x610a, 0x0078, 0x5ded, 0x0c7e, 0x600f,</div><div class='del'>-	0x0000, 0x2c08, 0x2061, 0xa9b1, 0x6034, 0xa005, 0x0040, 0x5e06,</div><div class='del'>-	0xa080, 0x0003, 0x2102, 0x6136, 0x0c7f, 0x007c, 0x613a, 0x6136,</div><div class='del'>-	0x0078, 0x5e04, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e, 0x057e,</div><div class='del'>-	0x037e, 0x027e, 0x017e, 0x007e, 0x127e, 0xa02e, 0x2071, 0xa9b1,</div><div class='del'>-	0x7638, 0x2660, 0x2678, 0x2091, 0x8000, 0x8cff, 0x0040, 0x5e8c,</div><div class='del'>-	0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x00c0, 0x5e87, 0x87ff,</div><div class='del'>-	0x0040, 0x5e2e, 0x6020, 0xa106, 0x00c0, 0x5e87, 0x703c, 0xac06,</div><div class='del'>-	0x00c0, 0x5e44, 0x037e, 0x2019, 0x0001, 0x1078, 0x7058, 0x7033,</div><div class='del'>-	0x0000, 0x703f, 0x0000, 0x7043, 0x0000, 0x7047, 0x0000, 0x704b,</div><div class='del'>-	0x0000, 0x037f, 0x2029, 0x0001, 0x7038, 0xac36, 0x00c0, 0x5e4a,</div><div class='del'>-	0x660c, 0x763a, 0x7034, 0xac36, 0x00c0, 0x5e58, 0x2c00, 0xaf36,</div><div class='del'>-	0x0040, 0x5e56, 0x2f00, 0x7036, 0x0078, 0x5e58, 0x7037, 0x0000,</div><div class='del'>-	0x660c, 0x067e, 0x2c00, 0xaf06, 0x0040, 0x5e61, 0x7e0e, 0x0078,</div><div class='del'>-	0x5e62, 0x2678, 0x600f, 0x0000, 0x1078, 0x8d16, 0x0040, 0x5e82,</div><div class='del'>-	0x6010, 0x2068, 0x601c, 0xa086, 0x0003, 0x00c0, 0x5e9d, 0x6837,</div><div class='del'>-	0x0103, 0x6b4a, 0x6847, 0x0000, 0x017e, 0x037e, 0x077e, 0x1078,</div><div class='del'>-	0x8f8d, 0x1078, 0xa4f2, 0x1078, 0x4a73, 0x077f, 0x037f, 0x017f,</div><div class='del'>-	0x1078, 0x8ec9, 0x1078, 0x8ed6, 0x0c7f, 0x0078, 0x5e1d, 0x2c78,</div><div class='del'>-	0x600c, 0x2060, 0x0078, 0x5e1d, 0x85ff, 0x0040, 0x5e91, 0x1078,</div><div class='del'>-	0x639b, 0x127f, 0x007f, 0x017f, 0x027f, 0x037f, 0x057f, 0x067f,</div><div class='del'>-	0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x601c, 0xa086, 0x0006,</div><div class='del'>-	0x00c0, 0x5e6f, 0x017e, 0x037e, 0x077e, 0x1078, 0xa4f2, 0x1078,</div><div class='del'>-	0xa1da, 0x077f, 0x037f, 0x017f, 0x0078, 0x5e82, 0x007e, 0x067e,</div><div class='del'>-	0x0c7e, 0x0d7e, 0x0f7e, 0x2031, 0x0000, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x2079, 0xa9b1, 0x7838, 0xa065, 0x0040, 0x5eef, 0x600c, 0x007e,</div><div class='del'>-	0x600f, 0x0000, 0x783c, 0xac06, 0x00c0, 0x5ed6, 0x037e, 0x2019,</div><div class='del'>-	0x0001, 0x1078, 0x7058, 0x7833, 0x0000, 0x783f, 0x0000, 0x7843,</div><div class='del'>-	0x0000, 0x7847, 0x0000, 0x784b, 0x0000, 0x037f, 0x1078, 0x8d16,</div><div class='del'>-	0x0040, 0x5eea, 0x6010, 0x2068, 0x601c, 0xa086, 0x0003, 0x00c0,</div><div class='del'>-	0x5ef8, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x4a73,</div><div class='del'>-	0x1078, 0x8ec9, 0x1078, 0x8ed6, 0x007f, 0x0078, 0x5ebb, 0x7e3a,</div><div class='del'>-	0x7e36, 0x127f, 0x0f7f, 0x0d7f, 0x0c7f, 0x067f, 0x007f, 0x007c,</div><div class='del'>-	0x601c, 0xa086, 0x0006, 0x00c0, 0x5ee1, 0x1078, 0xa1da, 0x0078,</div><div class='del'>-	0x5eea, 0x017e, 0x027e, 0x087e, 0x2041, 0x0000, 0x1078, 0x5f1b,</div><div class='del'>-	0x1078, 0x5fdb, 0x087f, 0x027f, 0x017f, 0x007c, 0x0f7e, 0x127e,</div><div class='del'>-	0x2079, 0xa9b1, 0x2091, 0x8000, 0x1078, 0x6076, 0x1078, 0x60ec,</div><div class='del'>-	0x127f, 0x0f7f, 0x007c, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e,</div><div class='del'>-	0x017e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa9b1, 0x7614,</div><div class='del'>-	0x2660, 0x2678, 0x8cff, 0x0040, 0x5fb5, 0x6018, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xa206, 0x00c0, 0x5fb0, 0x88ff, 0x0040, 0x5f3b, 0x6020,</div><div class='del'>-	0xa106, 0x00c0, 0x5fb0, 0x7024, 0xac06, 0x00c0, 0x5f6b, 0x2069,</div><div class='del'>-	0x0100, 0x68c0, 0xa005, 0x0040, 0x5f66, 0x1078, 0x5acb, 0x1078,</div><div class='del'>-	0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378, 0x7027, 0x0000, 0x037e,</div><div class='del'>-	0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0040, 0x5f5b, 0x6803,</div><div class='del'>-	0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084, 0x0040,</div><div class='del'>-	0x5f63, 0x6827, 0x0001, 0x037f, 0x0078, 0x5f6b, 0x6003, 0x0009,</div><div class='del'>-	0x630a, 0x0078, 0x5fb0, 0x7014, 0xac36, 0x00c0, 0x5f71, 0x660c,</div><div class='del'>-	0x7616, 0x7010, 0xac36, 0x00c0, 0x5f7f, 0x2c00, 0xaf36, 0x0040,</div><div class='del'>-	0x5f7d, 0x2f00, 0x7012, 0x0078, 0x5f7f, 0x7013, 0x0000, 0x660c,</div><div class='del'>-	0x067e, 0x2c00, 0xaf06, 0x0040, 0x5f88, 0x7e0e, 0x0078, 0x5f89,</div><div class='del'>-	0x2678, 0x600f, 0x0000, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040,</div><div class='del'>-	0x5fa9, 0x601c, 0xa086, 0x0003, 0x00c0, 0x5fbe, 0x6837, 0x0103,</div><div class='del'>-	0x6b4a, 0x6847, 0x0000, 0x017e, 0x037e, 0x087e, 0x1078, 0x8f8d,</div><div class='del'>-	0x1078, 0xa4f2, 0x1078, 0x4a73, 0x087f, 0x037f, 0x017f, 0x1078,</div><div class='del'>-	0x8ec9, 0x1078, 0x8ed6, 0x1078, 0x7233, 0x0c7f, 0x0078, 0x5f2a,</div><div class='del'>-	0x2c78, 0x600c, 0x2060, 0x0078, 0x5f2a, 0x127f, 0x007f, 0x017f,</div><div class='del'>-	0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x601c, 0xa086,</div><div class='del'>-	0x0006, 0x00c0, 0x5fcf, 0x017e, 0x037e, 0x087e, 0x1078, 0xa4f2,</div><div class='del'>-	0x1078, 0xa1da, 0x087f, 0x037f, 0x017f, 0x0078, 0x5fa9, 0x601c,</div><div class='del'>-	0xa086, 0x0002, 0x00c0, 0x5fa9, 0x6004, 0xa086, 0x0085, 0x0040,</div><div class='del'>-	0x5f96, 0x0078, 0x5fa9, 0x0c7e, 0x007e, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0xa280, 0xa835, 0x2004, 0xa065, 0x0040, 0x6072, 0x0f7e, 0x0e7e,</div><div class='del'>-	0x0d7e, 0x067e, 0x2071, 0xa9b1, 0x6654, 0x7018, 0xac06, 0x00c0,</div><div class='del'>-	0x5ff2, 0x761a, 0x701c, 0xac06, 0x00c0, 0x5ffe, 0x86ff, 0x00c0,</div><div class='del'>-	0x5ffd, 0x7018, 0x701e, 0x0078, 0x5ffe, 0x761e, 0x6058, 0xa07d,</div><div class='del'>-	0x0040, 0x6003, 0x7e56, 0xa6ed, 0x0000, 0x0040, 0x6009, 0x2f00,</div><div class='del'>-	0x685a, 0x6057, 0x0000, 0x605b, 0x0000, 0x6000, 0xc0d4, 0xc0dc,</div><div class='del'>-	0x6002, 0x1078, 0x44d3, 0x0040, 0x606e, 0x7624, 0x86ff, 0x0040,</div><div class='del'>-	0x605c, 0xa680, 0x0004, 0x2004, 0xad06, 0x00c0, 0x605c, 0x0d7e,</div><div class='del'>-	0x2069, 0x0100, 0x68c0, 0xa005, 0x0040, 0x6053, 0x1078, 0x5acb,</div><div class='del'>-	0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378, 0x7027, 0x0000,</div><div class='del'>-	0x037e, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0040, 0x603c,</div><div class='del'>-	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0040, 0x6044, 0x6827, 0x0001, 0x037f, 0x0d7f, 0x0c7e, 0x603c,</div><div class='del'>-	0xa005, 0x0040, 0x604d, 0x8001, 0x603e, 0x2660, 0x1078, 0x8ed6,</div><div class='del'>-	0x0c7f, 0x0078, 0x605c, 0x0d7f, 0x0c7e, 0x2660, 0x6003, 0x0009,</div><div class='del'>-	0x630a, 0x0c7f, 0x0078, 0x6011, 0x8dff, 0x0040, 0x606a, 0x6837,</div><div class='del'>-	0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x8f8d, 0x1078, 0xa4f2,</div><div class='del'>-	0x1078, 0x4a73, 0x1078, 0x7233, 0x0078, 0x6011, 0x067f, 0x0d7f,</div><div class='del'>-	0x0e7f, 0x0f7f, 0x127f, 0x007f, 0x0c7f, 0x007c, 0x007e, 0x067e,</div><div class='del'>-	0x0c7e, 0x0d7e, 0x2031, 0x0000, 0x7814, 0xa065, 0x0040, 0x60d0,</div><div class='del'>-	0x600c, 0x007e, 0x600f, 0x0000, 0x7824, 0xac06, 0x00c0, 0x60b5,</div><div class='del'>-	0x2069, 0x0100, 0x68c0, 0xa005, 0x0040, 0x60af, 0x1078, 0x5acb,</div><div class='del'>-	0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378, 0x7827, 0x0000,</div><div class='del'>-	0x037e, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0040, 0x60a4,</div><div class='del'>-	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0040, 0x60ac, 0x6827, 0x0001, 0x037f, 0x0078, 0x60b5, 0x6003,</div><div class='del'>-	0x0009, 0x630a, 0x2c30, 0x0078, 0x60cd, 0x6010, 0x2068, 0x1078,</div><div class='del'>-	0x8d16, 0x0040, 0x60c9, 0x601c, 0xa086, 0x0003, 0x00c0, 0x60d7,</div><div class='del'>-	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x4a73, 0x1078,</div><div class='del'>-	0x8ec9, 0x1078, 0x8ed6, 0x1078, 0x7233, 0x007f, 0x0078, 0x607d,</div><div class='del'>-	0x7e16, 0x7e12, 0x0d7f, 0x0c7f, 0x067f, 0x007f, 0x007c, 0x601c,</div><div class='del'>-	0xa086, 0x0006, 0x00c0, 0x60e0, 0x1078, 0xa1da, 0x0078, 0x60c9,</div><div class='del'>-	0x601c, 0xa086, 0x0002, 0x00c0, 0x60c9, 0x6004, 0xa086, 0x0085,</div><div class='del'>-	0x0040, 0x60c0, 0x0078, 0x60c9, 0x007e, 0x067e, 0x0c7e, 0x0d7e,</div><div class='del'>-	0x7818, 0xa065, 0x0040, 0x615a, 0x6054, 0x007e, 0x6057, 0x0000,</div><div class='del'>-	0x605b, 0x0000, 0x6000, 0xc0d4, 0xc0dc, 0x6002, 0x1078, 0x44d3,</div><div class='del'>-	0x0040, 0x6157, 0x7e24, 0x86ff, 0x0040, 0x6149, 0xa680, 0x0004,</div><div class='del'>-	0x2004, 0xad06, 0x00c0, 0x6149, 0x0d7e, 0x2069, 0x0100, 0x68c0,</div><div class='del'>-	0xa005, 0x0040, 0x6140, 0x1078, 0x5acb, 0x1078, 0x6e0f, 0x68c3,</div><div class='del'>-	0x0000, 0x1078, 0x7378, 0x7827, 0x0000, 0x037e, 0x2069, 0x0140,</div><div class='del'>-	0x6b04, 0xa384, 0x1000, 0x0040, 0x6129, 0x6803, 0x0100, 0x6803,</div><div class='del'>-	0x0000, 0x2069, 0x0100, 0x6824, 0xd084, 0x0040, 0x6131, 0x6827,</div><div class='del'>-	0x0001, 0x037f, 0x0d7f, 0x0c7e, 0x603c, 0xa005, 0x0040, 0x613a,</div><div class='del'>-	0x8001, 0x603e, 0x2660, 0x1078, 0x8ed6, 0x0c7f, 0x0078, 0x6149,</div><div class='del'>-	0x0d7f, 0x0c7e, 0x2660, 0x6003, 0x0009, 0x630a, 0x0c7f, 0x0078,</div><div class='del'>-	0x60fe, 0x8dff, 0x0040, 0x6153, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x1078, 0x4a73, 0x1078, 0x7233, 0x0078, 0x60fe, 0x007f,</div><div class='del'>-	0x0078, 0x60f1, 0x781e, 0x781a, 0x0d7f, 0x0c7f, 0x067f, 0x007f,</div><div class='del'>-	0x007c, 0x0e7e, 0x0d7e, 0x067e, 0x6000, 0xd0dc, 0x0040, 0x6181,</div><div class='del'>-	0x604c, 0xa06d, 0x0040, 0x6181, 0x6848, 0xa606, 0x00c0, 0x6181,</div><div class='del'>-	0x2071, 0xa9b1, 0x7024, 0xa035, 0x0040, 0x6181, 0xa080, 0x0004,</div><div class='del'>-	0x2004, 0xad06, 0x00c0, 0x6181, 0x6000, 0xc0dc, 0x6002, 0x1078,</div><div class='del'>-	0x6185, 0x067f, 0x0d7f, 0x0e7f, 0x007c, 0x0f7e, 0x2079, 0x0100,</div><div class='del'>-	0x78c0, 0xa005, 0x00c0, 0x6194, 0x0c7e, 0x2660, 0x6003, 0x0009,</div><div class='del'>-	0x630a, 0x0c7f, 0x0078, 0x61cb, 0x1078, 0x6e0f, 0x78c3, 0x0000,</div><div class='del'>-	0x1078, 0x7378, 0x7027, 0x0000, 0x037e, 0x2079, 0x0140, 0x7b04,</div><div class='del'>-	0xa384, 0x1000, 0x0040, 0x61a8, 0x7803, 0x0100, 0x7803, 0x0000,</div><div class='del'>-	0x2079, 0x0100, 0x7824, 0xd084, 0x0040, 0x61b0, 0x7827, 0x0001,</div><div class='del'>-	0x1078, 0x7378, 0x037f, 0x1078, 0x44d3, 0x0c7e, 0x603c, 0xa005,</div><div class='del'>-	0x0040, 0x61bc, 0x8001, 0x603e, 0x2660, 0x1078, 0x772d, 0x0c7f,</div><div class='del'>-	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x8f8d, 0x1078,</div><div class='del'>-	0x4a73, 0x1078, 0x7233, 0x0f7f, 0x007c, 0x0e7e, 0x0c7e, 0x2071,</div><div class='del'>-	0xa9b1, 0x7004, 0xa084, 0x0007, 0x0079, 0x61d6, 0x61e0, 0x61e3,</div><div class='del'>-	0x61fc, 0x6218, 0x6262, 0x61e0, 0x61e0, 0x61de, 0x1078, 0x1332,</div><div class='del'>-	0x0c7f, 0x0e7f, 0x007c, 0x7024, 0xa065, 0x0040, 0x61f1, 0x7020,</div><div class='del'>-	0x8001, 0x7022, 0x600c, 0xa015, 0x0040, 0x61f8, 0x7216, 0x600f,</div><div class='del'>-	0x0000, 0x7007, 0x0000, 0x7027, 0x0000, 0x0c7f, 0x0e7f, 0x007c,</div><div class='del'>-	0x7216, 0x7212, 0x0078, 0x61f1, 0x6018, 0x2060, 0x1078, 0x44d3,</div><div class='del'>-	0x6000, 0xc0dc, 0x6002, 0x7020, 0x8001, 0x7022, 0x0040, 0x620d,</div><div class='del'>-	0x6054, 0xa015, 0x0040, 0x6214, 0x721e, 0x7007, 0x0000, 0x7027,</div><div class='del'>-	0x0000, 0x0c7f, 0x0e7f, 0x007c, 0x7218, 0x721e, 0x0078, 0x620d,</div><div class='del'>-	0x7024, 0xa065, 0x0040, 0x625f, 0x700c, 0xac06, 0x00c0, 0x622f,</div><div class='del'>-	0x1078, 0x7233, 0x600c, 0xa015, 0x0040, 0x622b, 0x720e, 0x600f,</div><div class='del'>-	0x0000, 0x0078, 0x625d, 0x720e, 0x720a, 0x0078, 0x625d, 0x7014,</div><div class='del'>-	0xac06, 0x00c0, 0x6242, 0x1078, 0x7233, 0x600c, 0xa015, 0x0040,</div><div class='del'>-	0x623e, 0x7216, 0x600f, 0x0000, 0x0078, 0x625d, 0x7216, 0x7212,</div><div class='del'>-	0x0078, 0x625d, 0x601c, 0xa086, 0x0003, 0x00c0, 0x625d, 0x6018,</div><div class='del'>-	0x2060, 0x1078, 0x44d3, 0x6000, 0xc0dc, 0x6002, 0x1078, 0x7233,</div><div class='del'>-	0x701c, 0xa065, 0x0040, 0x625d, 0x6054, 0xa015, 0x0040, 0x625b,</div><div class='del'>-	0x721e, 0x0078, 0x625d, 0x7218, 0x721e, 0x7027, 0x0000, 0x0c7f,</div><div class='del'>-	0x0e7f, 0x007c, 0x7024, 0xa065, 0x0040, 0x626f, 0x1078, 0x7233,</div><div class='del'>-	0x600c, 0xa015, 0x0040, 0x6276, 0x720e, 0x600f, 0x0000, 0x1078,</div><div class='del'>-	0x7378, 0x7027, 0x0000, 0x0c7f, 0x0e7f, 0x007c, 0x720e, 0x720a,</div><div class='del'>-	0x0078, 0x626f, 0x0d7e, 0x2069, 0xa9b1, 0x6830, 0xa084, 0x0003,</div><div class='del'>-	0x0079, 0x6282, 0x6288, 0x628a, 0x62b4, 0x6288, 0x1078, 0x1332,</div><div class='del'>-	0x0d7f, 0x007c, 0x0c7e, 0x6840, 0xa086, 0x0001, 0x0040, 0x62aa,</div><div class='del'>-	0x683c, 0xa065, 0x0040, 0x629b, 0x600c, 0xa015, 0x0040, 0x62a6,</div><div class='del'>-	0x6a3a, 0x600f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000, 0x2011,</div><div class='del'>-	0xa9d0, 0x2013, 0x0000, 0x0c7f, 0x0d7f, 0x007c, 0x683a, 0x6836,</div><div class='del'>-	0x0078, 0x629b, 0x6843, 0x0000, 0x6838, 0xa065, 0x0040, 0x629b,</div><div class='del'>-	0x6003, 0x0003, 0x0078, 0x629b, 0x0c7e, 0x6843, 0x0000, 0x6847,</div><div class='del'>-	0x0000, 0x684b, 0x0000, 0x683c, 0xa065, 0x0040, 0x62ce, 0x600c,</div><div class='del'>-	0xa015, 0x0040, 0x62ca, 0x6a3a, 0x600f, 0x0000, 0x683f, 0x0000,</div><div class='del'>-	0x0078, 0x62ce, 0x683f, 0x0000, 0x683a, 0x6836, 0x0c7f, 0x0d7f,</div><div class='del'>-	0x007c, 0x0d7e, 0x2069, 0xa9b1, 0x6804, 0xa084, 0x0007, 0x0079,</div><div class='del'>-	0x62d9, 0x62e3, 0x638a, 0x638a, 0x638a, 0x638a, 0x638c, 0x638a,</div><div class='del'>-	0x62e1, 0x1078, 0x1332, 0x6820, 0xa005, 0x00c0, 0x62e9, 0x0d7f,</div><div class='del'>-	0x007c, 0x0c7e, 0x680c, 0xa065, 0x0040, 0x62f8, 0x6807, 0x0004,</div><div class='del'>-	0x6826, 0x682b, 0x0000, 0x1078, 0x63d4, 0x0c7f, 0x0d7f, 0x007c,</div><div class='del'>-	0x6814, 0xa065, 0x0040, 0x6306, 0x6807, 0x0001, 0x6826, 0x682b,</div><div class='del'>-	0x0000, 0x1078, 0x63d4, 0x0c7f, 0x0d7f, 0x007c, 0x0e7e, 0x037e,</div><div class='del'>-	0x6a1c, 0xa2f5, 0x0000, 0x0040, 0x6385, 0x704c, 0xa00d, 0x0040,</div><div class='del'>-	0x6315, 0x7088, 0xa005, 0x0040, 0x632d, 0x7054, 0xa075, 0x0040,</div><div class='del'>-	0x631e, 0xa20e, 0x0040, 0x6385, 0x0078, 0x6323, 0x6818, 0xa20e,</div><div class='del'>-	0x0040, 0x6385, 0x2070, 0x704c, 0xa00d, 0x0040, 0x6315, 0x7088,</div><div class='del'>-	0xa005, 0x00c0, 0x6315, 0x2e00, 0x681e, 0x733c, 0x7038, 0xa302,</div><div class='del'>-	0x00c8, 0x6315, 0x1078, 0x76fc, 0x0040, 0x6385, 0x8318, 0x733e,</div><div class='del'>-	0x6112, 0x2e10, 0x621a, 0xa180, 0x0014, 0x2004, 0xa084, 0x00ff,</div><div class='del'>-	0x6032, 0xa180, 0x0014, 0x2003, 0x0000, 0xa180, 0x0015, 0x2004,</div><div class='del'>-	0xa08a, 0x199a, 0x0048, 0x634e, 0x2001, 0x1999, 0x8003, 0x801b,</div><div class='del'>-	0x831b, 0xa318, 0x6316, 0x037f, 0x0f7e, 0x2c78, 0x71a0, 0xd1bc,</div><div class='del'>-	0x0040, 0x6367, 0x7100, 0xd1f4, 0x0040, 0x6363, 0x7114, 0xa18c,</div><div class='del'>-	0x00ff, 0x0078, 0x636c, 0x2009, 0x0000, 0x0078, 0x636c, 0xa1e0,</div><div class='del'>-	0x29c0, 0x2c0c, 0xa18c, 0x00ff, 0x2061, 0x0100, 0x619a, 0x1078,</div><div class='del'>-	0x6965, 0x7300, 0xc3dd, 0x7302, 0x6807, 0x0002, 0x2f18, 0x6b26,</div><div class='del'>-	0x682b, 0x0000, 0x781f, 0x0003, 0x7803, 0x0001, 0x7807, 0x0040,</div><div class='del'>-	0x0f7f, 0x0e7f, 0x0c7f, 0x0d7f, 0x007c, 0x037f, 0x0e7f, 0x0c7f,</div><div class='del'>-	0x0078, 0x6383, 0x0d7f, 0x007c, 0x0c7e, 0x680c, 0xa065, 0x0040,</div><div class='del'>-	0x6398, 0x6807, 0x0004, 0x6826, 0x682b, 0x0000, 0x1078, 0x63d4,</div><div class='del'>-	0x0c7f, 0x0d7f, 0x007c, 0x0f7e, 0x0d7e, 0x2069, 0xa9b1, 0x6830,</div><div class='del'>-	0xa086, 0x0000, 0x00c0, 0x63bb, 0x6838, 0xa07d, 0x0040, 0x63bb,</div><div class='del'>-	0x6833, 0x0001, 0x683e, 0x6847, 0x0000, 0x684b, 0x0000, 0x127e,</div><div class='del'>-	0x0f7e, 0x2091, 0x2200, 0x027f, 0x1078, 0x1d6d, 0x00c0, 0x63be,</div><div class='del'>-	0x127f, 0x1078, 0x6cb3, 0x0d7f, 0x0f7f, 0x007c, 0x127f, 0x6843,</div><div class='del'>-	0x0000, 0x7803, 0x0002, 0x780c, 0xa015, 0x0040, 0x63d0, 0x6a3a,</div><div class='del'>-	0x780f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000, 0x0078, 0x63bb,</div><div class='del'>-	0x683a, 0x6836, 0x0078, 0x63ca, 0x601c, 0xa084, 0x000f, 0x1079,</div><div class='del'>-	0x63da, 0x007c, 0x63e3, 0x63e8, 0x6809, 0x6922, 0x63e8, 0x6809,</div><div class='del'>-	0x6922, 0x63e3, 0x63e8, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x007c,</div><div class='del'>-	0x157e, 0x137e, 0x147e, 0x0c7e, 0x0f7e, 0x6004, 0xa08a, 0x0044,</div><div class='del'>-	0x10c8, 0x1332, 0x6118, 0x2178, 0x79a0, 0xd1bc, 0x0040, 0x6405,</div><div class='del'>-	0x7900, 0xd1f4, 0x0040, 0x6401, 0x7914, 0xa18c, 0x00ff, 0x0078,</div><div class='del'>-	0x640a, 0x2009, 0x0000, 0x0078, 0x640a, 0xa1f8, 0x29c0, 0x2f0c,</div><div class='del'>-	0xa18c, 0x00ff, 0x2c78, 0x2061, 0x0100, 0x619a, 0xa08a, 0x0040,</div><div class='del'>-	0x00c8, 0x645c, 0x1079, 0x641a, 0x0f7f, 0x0c7f, 0x147f, 0x137f,</div><div class='del'>-	0x157f, 0x007c, 0x64c2, 0x650a, 0x6532, 0x65cd, 0x65fd, 0x6605,</div><div class='del'>-	0x662c, 0x663d, 0x664e, 0x6656, 0x666e, 0x6656, 0x66d9, 0x663d,</div><div class='del'>-	0x66fa, 0x6702, 0x664e, 0x6702, 0x6713, 0x645a, 0x645a, 0x645a,</div><div class='del'>-	0x645a, 0x645a, 0x645a, 0x645a, 0x645a, 0x645a, 0x645a, 0x645a,</div><div class='del'>-	0x6eef, 0x6f14, 0x6f29, 0x6f4c, 0x6f6d, 0x662c, 0x645a, 0x662c,</div><div class='del'>-	0x6656, 0x645a, 0x6532, 0x65cd, 0x645a, 0x749c, 0x6656, 0x645a,</div><div class='del'>-	0x74bc, 0x6656, 0x645a, 0x645a, 0x64bd, 0x646b, 0x645a, 0x74e1,</div><div class='del'>-	0x7558, 0x7640, 0x645a, 0x7651, 0x6626, 0x766d, 0x645a, 0x6f82,</div><div class='del'>-	0x645a, 0x645a, 0x1078, 0x1332, 0x2100, 0x1079, 0x6465, 0x0f7f,</div><div class='del'>-	0x0c7f, 0x147f, 0x137f, 0x157f, 0x007c, 0x6469, 0x6469, 0x6469,</div><div class='del'>-	0x649f, 0x1078, 0x1332, 0x0d7e, 0x20a1, 0x020b, 0x1078, 0x6731,</div><div class='del'>-	0x7810, 0x2068, 0x20a3, 0x2414, 0x20a3, 0x0018, 0x20a3, 0x0800,</div><div class='del'>-	0x683c, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x6850, 0x20a2, 0x6854, 0x20a2, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x60c3, 0x0018, 0x1078, 0x6dfb, 0x0d7f, 0x007c,</div><div class='del'>-	0x0d7e, 0x7818, 0x2068, 0x68a0, 0xa082, 0x007e, 0x0048, 0x649c,</div><div class='del'>-	0xa085, 0x0001, 0x0d7f, 0x007c, 0xa006, 0x0078, 0x649a, 0x0d7e,</div><div class='del'>-	0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x0500, 0x20a3, 0x0000,</div><div class='del'>-	0x7810, 0xa0e8, 0x000f, 0x6808, 0x20a2, 0x680c, 0x20a2, 0x6810,</div><div class='del'>-	0x20a2, 0x6814, 0x20a2, 0x6818, 0x20a2, 0x681c, 0x20a2, 0x60c3,</div><div class='del'>-	0x0010, 0x1078, 0x6dfb, 0x0d7f, 0x007c, 0x6030, 0x609a, 0x1078,</div><div class='del'>-	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x5200,</div><div class='del'>-	0x20a3, 0x0000, 0x0d7e, 0x2069, 0xa752, 0x6804, 0xd084, 0x0040,</div><div class='del'>-	0x64dc, 0x6828, 0x20a3, 0x0000, 0x017e, 0x1078, 0x2564, 0x21a2,</div><div class='del'>-	0x017f, 0x0d7f, 0x0078, 0x64e1, 0x0d7f, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a9, 0x0004, 0x2099, 0xa705, 0x53a6, 0x20a9, 0x0004,</div><div class='del'>-	0x2099, 0xa701, 0x53a6, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082,</div><div class='del'>-	0x007f, 0x0048, 0x64fb, 0x2001, 0xa71b, 0x20a6, 0x2001, 0xa71c,</div><div class='del'>-	0x20a6, 0x0078, 0x6501, 0x20a3, 0x0000, 0x6030, 0xa084, 0x00ff,</div><div class='del'>-	0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x001c, 0x1078,</div><div class='del'>-	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x0500,</div><div class='del'>-	0x20a3, 0x0000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082, 0x007f,</div><div class='del'>-	0x0048, 0x6522, 0x2001, 0xa71b, 0x20a6, 0x2001, 0xa71c, 0x20a6,</div><div class='del'>-	0x0078, 0x6528, 0x20a3, 0x0000, 0x6030, 0xa084, 0x00ff, 0x20a2,</div><div class='del'>-	0x20a9, 0x0004, 0x2099, 0xa705, 0x53a6, 0x60c3, 0x0010, 0x1078,</div><div class='del'>-	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x6731, 0x0c7e, 0x7818,</div><div class='del'>-	0x2060, 0x2001, 0x0000, 0x1078, 0x4972, 0x0c7f, 0x7818, 0xa080,</div><div class='del'>-	0x0028, 0x2004, 0xa086, 0x007e, 0x00c0, 0x654d, 0x20a3, 0x0400,</div><div class='del'>-	0x620c, 0xc2b4, 0x620e, 0x0078, 0x654f, 0x20a3, 0x0300, 0x20a3,</div><div class='del'>-	0x0000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa086, 0x007e, 0x00c0,</div><div class='del'>-	0x659c, 0x2099, 0xa98d, 0x33a6, 0x9398, 0x33a6, 0x9398, 0x3304,</div><div class='del'>-	0xa084, 0x3fff, 0x20a2, 0x9398, 0x33a6, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a9, 0x0004, 0x2099,</div><div class='del'>-	0xa705, 0x53a6, 0x20a9, 0x0004, 0x2099, 0xa701, 0x53a6, 0x20a9,</div><div class='del'>-	0x0010, 0x20a3, 0x0000, 0x00f0, 0x6579, 0x2099, 0xa995, 0x3304,</div><div class='del'>-	0xc0dd, 0x20a2, 0x2001, 0xa772, 0x2004, 0xd0e4, 0x0040, 0x6594,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x9398, 0x9398, 0x9398, 0x33a6,</div><div class='del'>-	0x20a9, 0x0004, 0x0078, 0x6596, 0x20a9, 0x0007, 0x20a3, 0x0000,</div><div class='del'>-	0x00f0, 0x6596, 0x0078, 0x65bc, 0x2099, 0xa98d, 0x20a9, 0x0008,</div><div class='del'>-	0x53a6, 0x20a9, 0x0004, 0x2099, 0xa705, 0x53a6, 0x20a9, 0x0004,</div><div class='del'>-	0x2099, 0xa701, 0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x00f0,</div><div class='del'>-	0x65ad, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x00f0, 0x65b3, 0x2099,</div><div class='del'>-	0xa995, 0x20a9, 0x0008, 0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000,</div><div class='del'>-	0x00f0, 0x65be, 0x20a9, 0x000a, 0x20a3, 0x0000, 0x00f0, 0x65c4,</div><div class='del'>-	0x60c3, 0x0074, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x6731, 0x20a3, 0x2010, 0x20a3, 0x0014, 0x20a3, 0x0800, 0x20a3,</div><div class='del'>-	0x2000, 0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x0f7e,</div><div class='del'>-	0x2079, 0xa752, 0x7904, 0x0f7f, 0xd1ac, 0x00c0, 0x65e9, 0xa085,</div><div class='del'>-	0x0020, 0xd1a4, 0x0040, 0x65ee, 0xa085, 0x0010, 0xa085, 0x0002,</div><div class='del'>-	0x0d7e, 0x0078, 0x66b7, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0014, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x6731, 0x20a3, 0x5000, 0x0078, 0x654f, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x6731, 0x20a3, 0x2110, 0x20a3, 0x0014, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x60c3, 0x0014, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b,</div><div class='del'>-	0x1078, 0x67b9, 0x0078, 0x6630, 0x20a1, 0x020b, 0x1078, 0x67c2,</div><div class='del'>-	0x20a3, 0x0200, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0004, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0x0003, 0x20a3,</div><div class='del'>-	0x2a00, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b,</div><div class='del'>-	0x1078, 0x67c2, 0x20a3, 0x0200, 0x0078, 0x654f, 0x20a1, 0x020b,</div><div class='del'>-	0x1078, 0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0xa005,</div><div class='del'>-	0x0040, 0x6665, 0x20a2, 0x0078, 0x6667, 0x20a3, 0x0003, 0x7810,</div><div class='del'>-	0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c, 0x0d7e, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x67c2, 0x20a3, 0x0210, 0x20a3, 0x0014, 0x20a3,</div><div class='del'>-	0x0800, 0x7818, 0x2068, 0x6894, 0xa086, 0x0014, 0x00c0, 0x6694,</div><div class='del'>-	0x6998, 0xa184, 0xc000, 0x00c0, 0x6690, 0xd1ec, 0x0040, 0x668c,</div><div class='del'>-	0x20a3, 0x2100, 0x0078, 0x6696, 0x20a3, 0x0100, 0x0078, 0x6696,</div><div class='del'>-	0x20a3, 0x0400, 0x0078, 0x6696, 0x20a3, 0x0700, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x0f7e, 0x2079, 0xa752, 0x7904,</div><div class='del'>-	0x0f7f, 0xd1ac, 0x00c0, 0x66a6, 0xa085, 0x0020, 0xd1a4, 0x0040,</div><div class='del'>-	0x66ab, 0xa085, 0x0010, 0x2009, 0xa774, 0x210c, 0xd184, 0x0040,</div><div class='del'>-	0x66b5, 0x699c, 0xd18c, 0x0040, 0x66b7, 0xa085, 0x0002, 0x027e,</div><div class='del'>-	0x2009, 0xa772, 0x210c, 0xd1e4, 0x0040, 0x66c5, 0xc0c5, 0xa094,</div><div class='del'>-	0x0030, 0xa296, 0x0010, 0x0040, 0x66cf, 0xd1ec, 0x0040, 0x66cf,</div><div class='del'>-	0xa094, 0x0030, 0xa296, 0x0010, 0x0040, 0x66cf, 0xc0bd, 0x027f,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x60c3, 0x0014, 0x1078, 0x6dfb, 0x0d7f,</div><div class='del'>-	0x007c, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0210, 0x20a3,</div><div class='del'>-	0x0014, 0x20a3, 0x0000, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078,</div><div class='del'>-	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0200,</div><div class='del'>-	0x0078, 0x64c8, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0100,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0003, 0x20a3, 0x2a00, 0x60c3, 0x0008,</div><div class='del'>-	0x1078, 0x6dfb, 0x007c, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x000b, 0x20a3, 0x0000, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c,</div><div class='del'>-	0x027e, 0x037e, 0x047e, 0x2019, 0x3200, 0x2021, 0x0800, 0x0078,</div><div class='del'>-	0x6738, 0x027e, 0x037e, 0x047e, 0x2019, 0x2200, 0x2021, 0x0100,</div><div class='del'>-	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2014,</div><div class='del'>-	0xa286, 0x007e, 0x00c0, 0x674b, 0xa385, 0x00ff, 0x20a2, 0x20a3,</div><div class='del'>-	0xfffe, 0x0078, 0x6780, 0xa286, 0x007f, 0x00c0, 0x6757, 0x0d7e,</div><div class='del'>-	0xa385, 0x00ff, 0x20a2, 0x20a3, 0xfffd, 0x0078, 0x676e, 0xd2bc,</div><div class='del'>-	0x0040, 0x6776, 0xa286, 0x0080, 0x0d7e, 0x00c0, 0x6766, 0xa385,</div><div class='del'>-	0x00ff, 0x20a2, 0x20a3, 0xfffc, 0x0078, 0x676e, 0xa2e8, 0xa835,</div><div class='del'>-	0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6784, 0x0d7e, 0xa2e8,</div><div class='del'>-	0xa835, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x0d7f,</div><div class='del'>-	0x20a3, 0x0000, 0x6230, 0x22a2, 0xa485, 0x0029, 0x20a2, 0x047f,</div><div class='del'>-	0x037f, 0x20a3, 0x0000, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000,</div><div class='del'>-	0x2fa2, 0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f,</div><div class='del'>-	0x007c, 0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a3, 0x02ff,</div><div class='del'>-	0x2011, 0xfffc, 0x22a2, 0x0d7e, 0x2069, 0xa71b, 0x2da6, 0x8d68,</div><div class='del'>-	0x2da6, 0x0d7f, 0x20a3, 0x2029, 0x20a3, 0x0000, 0x0078, 0x678b,</div><div class='del'>-	0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0xfc02, 0x20a3, 0x0000,</div><div class='del'>-	0x007c, 0x027e, 0x037e, 0x047e, 0x2019, 0x3300, 0x2021, 0x0800,</div><div class='del'>-	0x0078, 0x67c9, 0x027e, 0x037e, 0x047e, 0x2019, 0x2300, 0x2021,</div><div class='del'>-	0x0100, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xa092, 0x007e, 0x0048, 0x67e6, 0x0d7e, 0xa0e8, 0xa835,</div><div class='del'>-	0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x67f4, 0x0d7e, 0xa0e8,</div><div class='del'>-	0xa835, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x0d7f,</div><div class='del'>-	0x20a3, 0x0000, 0x6230, 0x22a2, 0xa485, 0x0098, 0x20a2, 0x20a3,</div><div class='del'>-	0x0000, 0x047f, 0x037f, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000,</div><div class='del'>-	0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f,</div><div class='del'>-	0x007c, 0x0c7e, 0x0f7e, 0x6004, 0xa08a, 0x0085, 0x1048, 0x1332,</div><div class='del'>-	0xa08a, 0x008c, 0x10c8, 0x1332, 0x6118, 0x2178, 0x79a0, 0xd1bc,</div><div class='del'>-	0x0040, 0x6827, 0x7900, 0xd1f4, 0x0040, 0x6823, 0x7914, 0xa18c,</div><div class='del'>-	0x00ff, 0x0078, 0x682c, 0x2009, 0x0000, 0x0078, 0x682c, 0xa1f8,</div><div class='del'>-	0x29c0, 0x2f0c, 0xa18c, 0x00ff, 0x2c78, 0x2061, 0x0100, 0x619a,</div><div class='del'>-	0xa082, 0x0085, 0x1079, 0x6837, 0x0f7f, 0x0c7f, 0x007c, 0x6840,</div><div class='del'>-	0x684b, 0x6866, 0x683e, 0x683e, 0x683e, 0x6840, 0x1078, 0x1332,</div><div class='del'>-	0x147e, 0x20a1, 0x020b, 0x1078, 0x6879, 0x60c3, 0x0000, 0x1078,</div><div class='del'>-	0x6dfb, 0x147f, 0x007c, 0x147e, 0x20a1, 0x020b, 0x1078, 0x68ad,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x7808, 0x20a2, 0x7810, 0x20a2,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x000c, 0x1078, 0x6dfb, 0x147f, 0x007c, 0x147e, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x68ee, 0x20a3, 0x0003, 0x20a3, 0x0300, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x60c3, 0x0004, 0x1078, 0x6dfb, 0x147f,</div><div class='del'>-	0x007c, 0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080,</div><div class='del'>-	0x0028, 0x2004, 0xa092, 0x007e, 0x0048, 0x6898, 0x0d7e, 0xa0e8,</div><div class='del'>-	0xa835, 0x2d6c, 0x6810, 0xa085, 0x8100, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x2069, 0xa71b, 0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x68a7,</div><div class='del'>-	0x0d7e, 0xa0e8, 0xa835, 0x2d6c, 0x6810, 0xa085, 0x8100, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x20a3,</div><div class='del'>-	0x0009, 0x20a3, 0x0000, 0x0078, 0x678b, 0x027e, 0x20e1, 0x9080,</div><div class='del'>-	0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa092, 0x007e,</div><div class='del'>-	0x0048, 0x68cc, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c, 0x6810, 0xa085,</div><div class='del'>-	0x8400, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b, 0x2da6, 0x8d68,</div><div class='del'>-	0x2da6, 0x0d7f, 0x0078, 0x68db, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x8400, 0x20a2, 0x6814, 0x20a2, 0x0d7f, 0x20a3,</div><div class='del'>-	0x0000, 0x6230, 0x22a2, 0x20a3, 0x0099, 0x20a3, 0x0000, 0x1078,</div><div class='del'>-	0x6dea, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x7a10, 0x22a2,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f, 0x007c, 0x027e, 0x20e1,</div><div class='del'>-	0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa092,</div><div class='del'>-	0x007e, 0x0048, 0x690d, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c, 0x6810,</div><div class='del'>-	0xa085, 0x8500, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b, 0x2da6,</div><div class='del'>-	0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x691c, 0x0d7e, 0xa0e8, 0xa835,</div><div class='del'>-	0x2d6c, 0x6810, 0xa085, 0x8500, 0x20a2, 0x6814, 0x20a2, 0x0d7f,</div><div class='del'>-	0x20a3, 0x0000, 0x6230, 0x22a2, 0x20a3, 0x0099, 0x20a3, 0x0000,</div><div class='del'>-	0x0078, 0x68df, 0x0c7e, 0x0f7e, 0x2c78, 0x7804, 0xa08a, 0x0040,</div><div class='del'>-	0x1048, 0x1332, 0xa08a, 0x0053, 0x10c8, 0x1332, 0x7918, 0x2160,</div><div class='del'>-	0x61a0, 0xd1bc, 0x0040, 0x6941, 0x6100, 0xd1f4, 0x0040, 0x693d,</div><div class='del'>-	0x6114, 0xa18c, 0x00ff, 0x0078, 0x6946, 0x2009, 0x0000, 0x0078,</div><div class='del'>-	0x6946, 0xa1e0, 0x29c0, 0x2c0c, 0xa18c, 0x00ff, 0x2061, 0x0100,</div><div class='del'>-	0x619a, 0xa082, 0x0040, 0x1079, 0x6950, 0x0f7f, 0x0c7f, 0x007c,</div><div class='del'>-	0x6965, 0x6a73, 0x6a14, 0x6c27, 0x6963, 0x6963, 0x6963, 0x6963,</div><div class='del'>-	0x6963, 0x6963, 0x6963, 0x714c, 0x715d, 0x716e, 0x717f, 0x6963,</div><div class='del'>-	0x767e, 0x6963, 0x713b, 0x1078, 0x1332, 0x0d7e, 0x157e, 0x147e,</div><div class='del'>-	0x780b, 0xffff, 0x20a1, 0x020b, 0x1078, 0x69d0, 0x7910, 0x2168,</div><div class='del'>-	0x6948, 0x7922, 0x21a2, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x694c,</div><div class='del'>-	0xa184, 0x000f, 0x00c0, 0x6980, 0x2001, 0x0005, 0x0078, 0x698a,</div><div class='del'>-	0xd184, 0x0040, 0x6987, 0x2001, 0x0004, 0x0078, 0x698a, 0xa084,</div><div class='del'>-	0x0006, 0x8004, 0x017e, 0x2008, 0x7830, 0xa084, 0x00ff, 0x8007,</div><div class='del'>-	0xa105, 0x017f, 0x20a2, 0xd1ac, 0x0040, 0x699a, 0x20a3, 0x0002,</div><div class='del'>-	0x0078, 0x69a6, 0xd1b4, 0x0040, 0x69a1, 0x20a3, 0x0001, 0x0078,</div><div class='del'>-	0x69a6, 0x20a3, 0x0000, 0x2230, 0x0078, 0x69a8, 0x6a80, 0x6e7c,</div><div class='del'>-	0x20a9, 0x0008, 0xad80, 0x0017, 0x200c, 0x810f, 0x21a2, 0x8000,</div><div class='del'>-	0x00f0, 0x69ac, 0x22a2, 0x26a2, 0x60c3, 0x0020, 0x20e1, 0x9080,</div><div class='del'>-	0x6014, 0xa084, 0x0004, 0xa085, 0x0009, 0x6016, 0x2001, 0xa9cd,</div><div class='del'>-	0x2003, 0x07d0, 0x2001, 0xa9cc, 0x2003, 0x0009, 0x2001, 0xa9d2,</div><div class='del'>-	0x2003, 0x0002, 0x1078, 0x158c, 0x147f, 0x157f, 0x0d7f, 0x007c,</div><div class='del'>-	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7a18, 0xa280, 0x0023, 0x2014,</div><div class='del'>-	0x8210, 0xa294, 0x00ff, 0x2202, 0x8217, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xd0bc, 0x0040, 0x69f6, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x0600, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6a05, 0x0d7e, 0xa0e8,</div><div class='del'>-	0xa835, 0x2d6c, 0x6810, 0xa085, 0x0600, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x0d7f, 0x20a3, 0x0000, 0x6130, 0x21a2, 0x20a3, 0x0829, 0x20a3,</div><div class='del'>-	0x0000, 0x22a2, 0x20a3, 0x0000, 0x2fa2, 0x20a3, 0xffff, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x007c, 0x0d7e, 0x157e, 0x137e, 0x147e,</div><div class='del'>-	0x20a1, 0x020b, 0x1078, 0x6a34, 0x7810, 0x2068, 0x6860, 0x20a2,</div><div class='del'>-	0x685c, 0x20a2, 0x6880, 0x20a2, 0x687c, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x60c3, 0x000c, 0x1078, 0x6dfb, 0x147f,</div><div class='del'>-	0x137f, 0x157f, 0x0d7f, 0x007c, 0x027e, 0x20e1, 0x9080, 0x20e1,</div><div class='del'>-	0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0xd0bc, 0x0040, 0x6a52,</div><div class='del'>-	0x0d7e, 0xa0e8, 0xa835, 0x2d6c, 0x6810, 0xa085, 0x0500, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x2069, 0xa71b, 0x2da6, 0x8d68, 0x2da6, 0x0d7f,</div><div class='del'>-	0x0078, 0x6a61, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c, 0x6810, 0xa085,</div><div class='del'>-	0x0500, 0x20a2, 0x6814, 0x20a2, 0x0d7f, 0x20a3, 0x0000, 0x6230,</div><div class='del'>-	0x22a2, 0x20a3, 0x0889, 0x20a3, 0x0000, 0x1078, 0x6dea, 0x22a2,</div><div class='del'>-	0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x027f, 0x007c, 0x0d7e, 0x157e, 0x137e, 0x147e, 0x7810,</div><div class='del'>-	0xa0ec, 0xf000, 0x0040, 0x6a8b, 0xa06d, 0x1078, 0x495f, 0x0040,</div><div class='del'>-	0x6a8b, 0x684c, 0xa084, 0x2020, 0xa086, 0x2020, 0x00c0, 0x6a8b,</div><div class='del'>-	0x7824, 0xc0cd, 0x7826, 0x20a1, 0x020b, 0x1078, 0x6be0, 0xa016,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x7810, 0xa084, 0xf000,</div><div class='del'>-	0x00c0, 0x6aa2, 0x7810, 0xa084, 0x0700, 0x8007, 0x1079, 0x6aaa,</div><div class='del'>-	0x0078, 0x6aa5, 0xa006, 0x1079, 0x6aaa, 0x147f, 0x137f, 0x157f,</div><div class='del'>-	0x0d7f, 0x007c, 0x6ab4, 0x6b4c, 0x6b57, 0x6b81, 0x6b95, 0x6bb1,</div><div class='del'>-	0x6bbc, 0x6ab2, 0x1078, 0x1332, 0x017e, 0x037e, 0x694c, 0xa18c,</div><div class='del'>-	0x0003, 0x0040, 0x6abf, 0xa186, 0x0003, 0x00c0, 0x6ace, 0x6b78,</div><div class='del'>-	0x7824, 0xd0cc, 0x0040, 0x6ac5, 0xc3e5, 0x23a2, 0x6868, 0x20a2,</div><div class='del'>-	0x6864, 0x20a2, 0x037f, 0x017f, 0x0078, 0x6b8c, 0xa186, 0x0001,</div><div class='del'>-	0x10c0, 0x1332, 0x6b78, 0x7824, 0xd0cc, 0x0040, 0x6ad8, 0xc3e5,</div><div class='del'>-	0x23a2, 0x6868, 0x20a2, 0x6864, 0x20a2, 0x22a2, 0x6874, 0x20a2,</div><div class='del'>-	0x22a2, 0x687c, 0x20a2, 0x2009, 0x0018, 0xa384, 0x0300, 0x0040,</div><div class='del'>-	0x6b46, 0xd3c4, 0x0040, 0x6aee, 0x687c, 0xa108, 0xd3cc, 0x0040,</div><div class='del'>-	0x6af3, 0x6874, 0xa108, 0x157e, 0x20a9, 0x000d, 0xad80, 0x0020,</div><div class='del'>-	0x201c, 0x831f, 0x23a2, 0x8000, 0x00f0, 0x6af8, 0x157f, 0x22a2,</div><div class='del'>-	0x22a2, 0x22a2, 0xa184, 0x0003, 0x0040, 0x6b46, 0x20a1, 0x020b,</div><div class='del'>-	0x20e1, 0x9080, 0x20e1, 0x4000, 0x007e, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xd0bc, 0x0040, 0x6b26, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6b35, 0x0d7e, 0xa0e8,</div><div class='del'>-	0xa835, 0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x007f, 0x7b24, 0xd3cc,</div><div class='del'>-	0x0040, 0x6b3e, 0x20a3, 0x0889, 0x0078, 0x6b40, 0x20a3, 0x0898,</div><div class='del'>-	0x20a2, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000, 0x61c2, 0x037f,</div><div class='del'>-	0x017f, 0x1078, 0x6dfb, 0x007c, 0x2011, 0x0008, 0x7824, 0xd0cc,</div><div class='del'>-	0x0040, 0x6b53, 0xc2e5, 0x22a2, 0xa016, 0x0078, 0x6b8a, 0x2011,</div><div class='del'>-	0x0302, 0x7824, 0xd0cc, 0x0040, 0x6b5e, 0xc2e5, 0x22a2, 0xa016,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x0012, 0x22a2, 0x20a3, 0x0008,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x7000, 0x20a3, 0x0500,</div><div class='del'>-	0x22a2, 0x20a3, 0x000a, 0x22a2, 0x22a2, 0x20a3, 0x2500, 0x22a2,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0032, 0x1078, 0x6dfb,</div><div class='del'>-	0x007c, 0x2011, 0x0028, 0x7824, 0xd0cc, 0x0040, 0x6b88, 0xc2e5,</div><div class='del'>-	0x22a2, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2,</div><div class='del'>-	0x60c3, 0x0018, 0x1078, 0x6dfb, 0x007c, 0x2011, 0x0100, 0x7824,</div><div class='del'>-	0xd0cc, 0x0040, 0x6b9c, 0xc2e5, 0x22a2, 0xa016, 0x22a2, 0x22a2,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x0008, 0x22a2, 0x7834, 0xa084,</div><div class='del'>-	0x00ff, 0x20a2, 0x22a2, 0x22a2, 0x60c3, 0x0020, 0x1078, 0x6dfb,</div><div class='del'>-	0x007c, 0x2011, 0x0008, 0x7824, 0xd0cc, 0x0040, 0x6bb8, 0xc2e5,</div><div class='del'>-	0x22a2, 0xa016, 0x0078, 0x6b8a, 0x037e, 0x7b10, 0xa384, 0xff00,</div><div class='del'>-	0x7812, 0xa384, 0x00ff, 0x8001, 0x00c0, 0x6bcf, 0x7824, 0xd0cc,</div><div class='del'>-	0x0040, 0x6bcb, 0xc2e5, 0x22a2, 0x037f, 0x0078, 0x6b8a, 0x047e,</div><div class='del'>-	0x2021, 0x0800, 0x007e, 0x7824, 0xd0cc, 0x007f, 0x0040, 0x6bd9,</div><div class='del'>-	0xc4e5, 0x24a2, 0x047f, 0x22a2, 0x20a2, 0x037f, 0x0078, 0x6b8c,</div><div class='del'>-	0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xd0bc, 0x0040, 0x6bfe, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6c0d, 0x0d7e, 0xa0e8,</div><div class='del'>-	0xa835, 0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x7824, 0xd0cc, 0x0040,</div><div class='del'>-	0x6c15, 0x20a3, 0x0889, 0x0078, 0x6c17, 0x20a3, 0x0898, 0x20a3,</div><div class='del'>-	0x0000, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2,</div><div class='del'>-	0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f, 0x007c, 0x0d7e,</div><div class='del'>-	0x157e, 0x137e, 0x147e, 0x017e, 0x037e, 0x7810, 0xa084, 0x0700,</div><div class='del'>-	0x8007, 0x1079, 0x6c3a, 0x037f, 0x017f, 0x147f, 0x137f, 0x157f,</div><div class='del'>-	0x0d7f, 0x007c, 0x6c42, 0x6c42, 0x6c44, 0x6c42, 0x6c42, 0x6c42,</div><div class='del'>-	0x6c69, 0x6c42, 0x1078, 0x1332, 0x7910, 0xa18c, 0xf8ff, 0xa18d,</div><div class='del'>-	0x0600, 0x7912, 0x20a1, 0x020b, 0x2009, 0x0003, 0x1078, 0x6c73,</div><div class='del'>-	0x0d7e, 0x2069, 0xa752, 0x6804, 0xd0bc, 0x0040, 0x6c5e, 0x682c,</div><div class='del'>-	0xa084, 0x00ff, 0x8007, 0x20a2, 0x0078, 0x6c60, 0x20a3, 0x3f00,</div><div class='del'>-	0x0d7f, 0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0001, 0x1078, 0x6dfb,</div><div class='del'>-	0x007c, 0x20a1, 0x020b, 0x2009, 0x0003, 0x1078, 0x6c73, 0x20a3,</div><div class='del'>-	0x7f00, 0x0078, 0x6c61, 0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000,</div><div class='del'>-	0x7818, 0xa080, 0x0028, 0x2004, 0xd0bc, 0x0040, 0x6c91, 0x0d7e,</div><div class='del'>-	0xa0e8, 0xa835, 0x2d6c, 0x6810, 0xa085, 0x0100, 0x20a2, 0x6814,</div><div class='del'>-	0x20a2, 0x2069, 0xa71b, 0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078,</div><div class='del'>-	0x6ca0, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c, 0x6810, 0xa085, 0x0100,</div><div class='del'>-	0x20a2, 0x6814, 0x20a2, 0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2,</div><div class='del'>-	0x20a3, 0x0888, 0xa18d, 0x0008, 0x21a2, 0x1078, 0x6dea, 0x22a2,</div><div class='del'>-	0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x027f, 0x007c, 0x0e7e, 0x0d7e, 0x0c7e, 0x057e, 0x047e,</div><div class='del'>-	0x037e, 0x2061, 0x0100, 0x2071, 0xa700, 0x6130, 0x7818, 0x2068,</div><div class='del'>-	0x68a0, 0x2028, 0xd0bc, 0x00c0, 0x6cca, 0x6910, 0x6a14, 0x6430,</div><div class='del'>-	0x0078, 0x6cce, 0x6910, 0x6a14, 0x736c, 0x7470, 0x781c, 0xa086,</div><div class='del'>-	0x0006, 0x0040, 0x6d2d, 0xd5bc, 0x0040, 0x6cde, 0xa185, 0x0100,</div><div class='del'>-	0x6062, 0x6266, 0x636a, 0x646e, 0x0078, 0x6ce5, 0xa185, 0x0100,</div><div class='del'>-	0x6062, 0x6266, 0x606b, 0x0000, 0x646e, 0x6073, 0x0809, 0x6077,</div><div class='del'>-	0x0008, 0x688c, 0x8000, 0xa084, 0x00ff, 0x688e, 0x8007, 0x607a,</div><div class='del'>-	0x607f, 0x0000, 0x2f00, 0x6082, 0x7808, 0x6086, 0x7810, 0x2070,</div><div class='del'>-	0x7014, 0x608a, 0x7010, 0x608e, 0x700c, 0x60c6, 0x7008, 0x60ca,</div><div class='del'>-	0x686c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000,</div><div class='del'>-	0xa582, 0x0080, 0x0048, 0x6d17, 0x6a00, 0xd2f4, 0x0040, 0x6d15,</div><div class='del'>-	0x6a14, 0xa294, 0x00ff, 0x0078, 0x6d17, 0x2011, 0x0000, 0x629e,</div><div class='del'>-	0x6017, 0x0016, 0x2009, 0x07d0, 0x60c4, 0xa084, 0xfff0, 0xa005,</div><div class='del'>-	0x0040, 0x6d24, 0x2009, 0x1b58, 0x1078, 0x5ad0, 0x037f, 0x047f,</div><div class='del'>-	0x057f, 0x0c7f, 0x0d7f, 0x0e7f, 0x007c, 0x7810, 0x2070, 0x704c,</div><div class='del'>-	0xa084, 0x0003, 0xa086, 0x0002, 0x0040, 0x6d85, 0xd5bc, 0x0040,</div><div class='del'>-	0x6d41, 0xa185, 0x0100, 0x6062, 0x6266, 0x636a, 0x646e, 0x0078,</div><div class='del'>-	0x6d48, 0xa185, 0x0100, 0x6062, 0x6266, 0x606b, 0x0000, 0x646e,</div><div class='del'>-	0x6073, 0x0880, 0x6077, 0x0008, 0x688c, 0x8000, 0xa084, 0x00ff,</div><div class='del'>-	0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6086, 0x7808,</div><div class='del'>-	0x6082, 0x7060, 0x608a, 0x705c, 0x608e, 0x7080, 0x60c6, 0x707c,</div><div class='del'>-	0x60ca, 0x707c, 0x792c, 0xa108, 0x792e, 0x7080, 0x7928, 0xa109,</div><div class='del'>-	0x792a, 0x686c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7,</div><div class='del'>-	0x0000, 0xa582, 0x0080, 0x0048, 0x6d80, 0x6a00, 0xd2f4, 0x0040,</div><div class='del'>-	0x6d7e, 0x6a14, 0xa294, 0x00ff, 0x0078, 0x6d80, 0x2011, 0x0000,</div><div class='del'>-	0x629e, 0x6017, 0x0012, 0x0078, 0x6d1a, 0xd5bc, 0x0040, 0x6d90,</div><div class='del'>-	0xa185, 0x0700, 0x6062, 0x6266, 0x636a, 0x646e, 0x0078, 0x6d97,</div><div class='del'>-	0xa185, 0x0700, 0x6062, 0x6266, 0x606b, 0x0000, 0x646e, 0x1078,</div><div class='del'>-	0x495f, 0x0040, 0x6dad, 0x0d7e, 0x7810, 0xa06d, 0x684c, 0x0d7f,</div><div class='del'>-	0xa084, 0x2020, 0xa086, 0x2020, 0x00c0, 0x6dad, 0x7824, 0xc0cd,</div><div class='del'>-	0x7826, 0x6073, 0x0889, 0x0078, 0x6daf, 0x6073, 0x0898, 0x6077,</div><div class='del'>-	0x0000, 0x688c, 0x8000, 0xa084, 0x00ff, 0x688e, 0x8007, 0x607a,</div><div class='del'>-	0x607f, 0x0000, 0x2f00, 0x6086, 0x7808, 0x6082, 0x7014, 0x608a,</div><div class='del'>-	0x7010, 0x608e, 0x700c, 0x60c6, 0x7008, 0x60ca, 0x686c, 0x60ce,</div><div class='del'>-	0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xa582, 0x0080,</div><div class='del'>-	0x0048, 0x6ddd, 0x6a00, 0xd2f4, 0x0040, 0x6ddb, 0x6a14, 0xa294,</div><div class='del'>-	0x00ff, 0x0078, 0x6ddd, 0x2011, 0x0000, 0x629e, 0x7824, 0xd0cc,</div><div class='del'>-	0x0040, 0x6de6, 0x6017, 0x0016, 0x0078, 0x6d1a, 0x6017, 0x0012,</div><div class='del'>-	0x0078, 0x6d1a, 0x7a18, 0xa280, 0x0023, 0x2014, 0x8210, 0xa294,</div><div class='del'>-	0x00ff, 0x2202, 0x8217, 0x007c, 0x0d7e, 0x2069, 0xa9b1, 0x6843,</div><div class='del'>-	0x0001, 0x0d7f, 0x007c, 0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7,</div><div class='del'>-	0x9575, 0x1078, 0x6e06, 0x1078, 0x5ac0, 0x007c, 0x007e, 0x6014,</div><div class='del'>-	0xa084, 0x0004, 0xa085, 0x0009, 0x6016, 0x007f, 0x007c, 0x007e,</div><div class='del'>-	0x0c7e, 0x2061, 0x0100, 0x6014, 0xa084, 0x0004, 0xa085, 0x0008,</div><div class='del'>-	0x6016, 0x0c7f, 0x007f, 0x007c, 0x0c7e, 0x0d7e, 0x017e, 0x027e,</div><div class='del'>-	0x2061, 0x0100, 0x2069, 0x0140, 0x6904, 0xa194, 0x4000, 0x0040,</div><div class='del'>-	0x6e59, 0x1078, 0x6e0f, 0x6803, 0x1000, 0x6803, 0x0000, 0x0c7e,</div><div class='del'>-	0x2061, 0xa9b1, 0x6128, 0xa192, 0x00c8, 0x00c8, 0x6e44, 0x8108,</div><div class='del'>-	0x612a, 0x6124, 0x0c7f, 0x81ff, 0x0040, 0x6e54, 0x1078, 0x5ac0,</div><div class='del'>-	0x1078, 0x6e06, 0x0078, 0x6e54, 0x6124, 0xa1e5, 0x0000, 0x0040,</div><div class='del'>-	0x6e51, 0x1078, 0xa5d4, 0x1078, 0x5acb, 0x2009, 0x0014, 0x1078,</div><div class='del'>-	0x775c, 0x0c7f, 0x0078, 0x6e54, 0x027f, 0x017f, 0x0d7f, 0x0c7f,</div><div class='del'>-	0x007c, 0x2001, 0xa9cd, 0x2004, 0xa005, 0x00c0, 0x6e54, 0x0c7e,</div><div class='del'>-	0x2061, 0xa9b1, 0x6128, 0xa192, 0x0003, 0x00c8, 0x6e44, 0x8108,</div><div class='del'>-	0x612a, 0x0c7f, 0x1078, 0x5ac0, 0x1078, 0x4224, 0x0078, 0x6e54,</div><div class='del'>-	0x0c7e, 0x0d7e, 0x0e7e, 0x017e, 0x027e, 0x1078, 0x5ad8, 0x2071,</div><div class='del'>-	0xa9b1, 0x713c, 0x81ff, 0x0040, 0x6e9a, 0x2061, 0x0100, 0x2069,</div><div class='del'>-	0x0140, 0x6904, 0xa194, 0x4000, 0x0040, 0x6ea0, 0x6803, 0x1000,</div><div class='del'>-	0x6803, 0x0000, 0x037e, 0x2019, 0x0001, 0x1078, 0x7058, 0x037f,</div><div class='del'>-	0x713c, 0x2160, 0x1078, 0xa5d4, 0x2009, 0x004a, 0x1078, 0x775c,</div><div class='del'>-	0x0078, 0x6e9a, 0x027f, 0x017f, 0x0e7f, 0x0d7f, 0x0c7f, 0x007c,</div><div class='del'>-	0x0078, 0x6e8a, 0x0e7e, 0x2071, 0xa9b1, 0x7048, 0xd084, 0x0040,</div><div class='del'>-	0x6ebc, 0x713c, 0x81ff, 0x0040, 0x6ebc, 0x2071, 0x0100, 0xa188,</div><div class='del'>-	0x0007, 0x210c, 0xa18e, 0x0006, 0x00c0, 0x6eba, 0x7017, 0x0012,</div><div class='del'>-	0x0078, 0x6ebc, 0x7017, 0x0016, 0x0e7f, 0x007c, 0x0e7e, 0x0d7e,</div><div class='del'>-	0x0c7e, 0x067e, 0x057e, 0x047e, 0x007e, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x6018, 0x2068, 0x6ca0, 0x2071, 0xa9b1, 0x7018, 0x2068, 0x8dff,</div><div class='del'>-	0x0040, 0x6ee6, 0x68a0, 0xa406, 0x0040, 0x6eda, 0x6854, 0x2068,</div><div class='del'>-	0x0078, 0x6ecf, 0x6010, 0x2060, 0x643c, 0x6540, 0x6648, 0x2d60,</div><div class='del'>-	0x1078, 0x4736, 0x0040, 0x6ee6, 0xa085, 0x0001, 0x127f, 0x007f,</div><div class='del'>-	0x047f, 0x057f, 0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x007c, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x6731, 0x20a3, 0x1200, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x781c, 0xa086, 0x0004, 0x00c0, 0x6f01, 0x6098, 0x0078,</div><div class='del'>-	0x6f02, 0x6030, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x20a9,</div><div class='del'>-	0x0010, 0xa006, 0x20a2, 0x00f0, 0x6f0a, 0x20a2, 0x20a2, 0x60c3,</div><div class='del'>-	0x002c, 0x1078, 0x6dfb, 0x007c, 0x157e, 0x147e, 0x20a1, 0x020b,</div><div class='del'>-	0x1078, 0x6731, 0x20a3, 0x0f00, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x7808, 0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x147f, 0x157f,</div><div class='del'>-	0x007c, 0x157e, 0x147e, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3,</div><div class='del'>-	0x0200, 0x20a3, 0x0000, 0x20a9, 0x0006, 0x2011, 0xa740, 0x2019,</div><div class='del'>-	0xa741, 0x23a6, 0x22a6, 0xa398, 0x0002, 0xa290, 0x0002, 0x00f0,</div><div class='del'>-	0x6f39, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x001c, 0x1078,</div><div class='del'>-	0x6dfb, 0x147f, 0x157f, 0x007c, 0x157e, 0x147e, 0x017e, 0x027e,</div><div class='del'>-	0x20a1, 0x020b, 0x1078, 0x6799, 0x1078, 0x67b0, 0x7810, 0xa080,</div><div class='del'>-	0x0000, 0x2004, 0xa080, 0x0015, 0x2098, 0x7808, 0xa088, 0x0002,</div><div class='del'>-	0x21a8, 0x53a6, 0xa080, 0x0004, 0x8003, 0x60c2, 0x1078, 0x6dfb,</div><div class='del'>-	0x027f, 0x017f, 0x147f, 0x157f, 0x007c, 0x157e, 0x147e, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x6731, 0x20a3, 0x6200, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x7808, 0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x147f,</div><div class='del'>-	0x157f, 0x007c, 0x157e, 0x147e, 0x017e, 0x027e, 0x20a1, 0x020b,</div><div class='del'>-	0x1078, 0x6731, 0x7810, 0xa080, 0x0000, 0x2004, 0xa080, 0x0017,</div><div class='del'>-	0x2098, 0x7808, 0xa088, 0x0002, 0x21a8, 0x53a6, 0x8003, 0x60c2,</div><div class='del'>-	0x1078, 0x6dfb, 0x027f, 0x017f, 0x147f, 0x157f, 0x007c, 0x0e7e,</div><div class='del'>-	0x0c7e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa9b1, 0x700c,</div><div class='del'>-	0x2060, 0x8cff, 0x0040, 0x6fbb, 0x1078, 0x8f10, 0x00c0, 0x6fb2,</div><div class='del'>-	0x1078, 0x7c83, 0x600c, 0x007e, 0x1078, 0x772d, 0x1078, 0x7233,</div><div class='del'>-	0x0c7f, 0x0078, 0x6fa9, 0x700f, 0x0000, 0x700b, 0x0000, 0x127f,</div><div class='del'>-	0x007f, 0x0c7f, 0x0e7f, 0x007c, 0x127e, 0x157e, 0x0f7e, 0x0e7e,</div><div class='del'>-	0x0d7e, 0x0c7e, 0x027e, 0x017e, 0x007e, 0x2091, 0x8000, 0x2069,</div><div class='del'>-	0x0100, 0x2079, 0x0140, 0x2071, 0xa9b1, 0x7024, 0x2060, 0x8cff,</div><div class='del'>-	0x0040, 0x7014, 0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x5acb,</div><div class='del'>-	0x2009, 0x0013, 0x1078, 0x775c, 0x20a9, 0x01f4, 0x6824, 0xd094,</div><div class='del'>-	0x0040, 0x6ff7, 0x6827, 0x0004, 0x7804, 0xa084, 0x4000, 0x0040,</div><div class='del'>-	0x7009, 0x7803, 0x1000, 0x7803, 0x0000, 0x0078, 0x7009, 0xd084,</div><div class='del'>-	0x0040, 0x6ffe, 0x6827, 0x0001, 0x0078, 0x7000, 0x00f0, 0x6fe6,</div><div class='del'>-	0x7804, 0xa084, 0x1000, 0x0040, 0x7009, 0x7803, 0x0100, 0x7803,</div><div class='del'>-	0x0000, 0x6824, 0x007f, 0x017f, 0x027f, 0x0c7f, 0x0d7f, 0x0e7f,</div><div class='del'>-	0x0f7f, 0x157f, 0x127f, 0x007c, 0x2001, 0xa700, 0x2004, 0xa096,</div><div class='del'>-	0x0001, 0x0040, 0x704e, 0xa096, 0x0004, 0x0040, 0x704e, 0x1078,</div><div class='del'>-	0x5acb, 0x6817, 0x0008, 0x68c3, 0x0000, 0x2011, 0x41dc, 0x1078,</div><div class='del'>-	0x5a45, 0x20a9, 0x01f4, 0x6824, 0xd094, 0x0040, 0x703c, 0x6827,</div><div class='del'>-	0x0004, 0x7804, 0xa084, 0x4000, 0x0040, 0x704e, 0x7803, 0x1000,</div><div class='del'>-	0x7803, 0x0000, 0x0078, 0x704e, 0xd084, 0x0040, 0x7043, 0x6827,</div><div class='del'>-	0x0001, 0x0078, 0x7045, 0x00f0, 0x702b, 0x7804, 0xa084, 0x1000,</div><div class='del'>-	0x0040, 0x704e, 0x7803, 0x0100, 0x7803, 0x0000, 0x007f, 0x017f,</div><div class='del'>-	0x027f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x157f, 0x127f, 0x007c,</div><div class='del'>-	0x127e, 0x157e, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x027e, 0x017e,</div><div class='del'>-	0x007e, 0x2091, 0x8000, 0x2069, 0x0100, 0x2079, 0x0140, 0x2071,</div><div class='del'>-	0xa9b1, 0x703c, 0x2060, 0x8cff, 0x0040, 0x70d6, 0x68af, 0x95f5,</div><div class='del'>-	0x6817, 0x0010, 0x2009, 0x00fa, 0x8109, 0x00c0, 0x7074, 0x68c7,</div><div class='del'>-	0x0000, 0x68cb, 0x0008, 0x1078, 0x5ad8, 0x1078, 0x1f7e, 0x047e,</div><div class='del'>-	0x057e, 0x2009, 0x017f, 0x212c, 0x200b, 0x00a5, 0x2021, 0x0169,</div><div class='del'>-	0x2404, 0xa084, 0x000f, 0xa086, 0x0004, 0x00c0, 0x70a5, 0x68c7,</div><div class='del'>-	0x0000, 0x68cb, 0x0008, 0x0e7e, 0x0f7e, 0x2079, 0x0020, 0x2071,</div><div class='del'>-	0xaa08, 0x6814, 0xa084, 0x0004, 0xa085, 0x0012, 0x6816, 0x7803,</div><div class='del'>-	0x0008, 0x7003, 0x0000, 0x0f7f, 0x0e7f, 0x250a, 0x057f, 0x047f,</div><div class='del'>-	0xa39d, 0x0000, 0x00c0, 0x70b0, 0x2009, 0x0049, 0x1078, 0x775c,</div><div class='del'>-	0x20a9, 0x03e8, 0x6824, 0xd094, 0x0040, 0x70c3, 0x6827, 0x0004,</div><div class='del'>-	0x7804, 0xa084, 0x4000, 0x0040, 0x70d5, 0x7803, 0x1000, 0x7803,</div><div class='del'>-	0x0000, 0x0078, 0x70d5, 0xd08c, 0x0040, 0x70ca, 0x6827, 0x0002,</div><div class='del'>-	0x0078, 0x70cc, 0x00f0, 0x70b2, 0x7804, 0xa084, 0x1000, 0x0040,</div><div class='del'>-	0x70d5, 0x7803, 0x0100, 0x7803, 0x0000, 0x6824, 0x007f, 0x017f,</div><div class='del'>-	0x027f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x157f, 0x127f, 0x007c,</div><div class='del'>-	0x0d7e, 0x127e, 0x2091, 0x8000, 0x2069, 0xa9b1, 0x6a06, 0x127f,</div><div class='del'>-	0x0d7f, 0x007c, 0x0d7e, 0x127e, 0x2091, 0x8000, 0x2069, 0xa9b1,</div><div class='del'>-	0x6a32, 0x127f, 0x0d7f, 0x007c, 0x0f7e, 0x0e7e, 0x0c7e, 0x067e,</div><div class='del'>-	0x007e, 0x127e, 0x2071, 0xa9b1, 0x7614, 0x2660, 0x2678, 0x2091,</div><div class='del'>-	0x8000, 0x8cff, 0x0040, 0x7134, 0x601c, 0xa206, 0x00c0, 0x712f,</div><div class='del'>-	0x7014, 0xac36, 0x00c0, 0x710e, 0x660c, 0x7616, 0x7010, 0xac36,</div><div class='del'>-	0x00c0, 0x711c, 0x2c00, 0xaf36, 0x0040, 0x711a, 0x2f00, 0x7012,</div><div class='del'>-	0x0078, 0x711c, 0x7013, 0x0000, 0x660c, 0x067e, 0x2c00, 0xaf06,</div><div class='del'>-	0x0040, 0x7125, 0x7e0e, 0x0078, 0x7126, 0x2678, 0x600f, 0x0000,</div><div class='del'>-	0x1078, 0x8ed6, 0x1078, 0x7233, 0x0c7f, 0x0078, 0x7101, 0x2c78,</div><div class='del'>-	0x600c, 0x2060, 0x0078, 0x7101, 0x127f, 0x007f, 0x067f, 0x0c7f,</div><div class='del'>-	0x0e7f, 0x0f7f, 0x007c, 0x157e, 0x147e, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2,</div><div class='del'>-	0x20a3, 0x1000, 0x0078, 0x718e, 0x157e, 0x147e, 0x20a1, 0x020b,</div><div class='del'>-	0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a3, 0x4000, 0x0078, 0x718e, 0x157e, 0x147e, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a3, 0x2000, 0x0078, 0x718e, 0x157e, 0x147e,</div><div class='del'>-	0x20a1, 0x020b, 0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0400, 0x0078, 0x718e, 0x157e,</div><div class='del'>-	0x147e, 0x20a1, 0x020b, 0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0200, 0x1078, 0x723e,</div><div class='del'>-	0x60c3, 0x0020, 0x1078, 0x6dfb, 0x147f, 0x157f, 0x007c, 0x127e,</div><div class='del'>-	0x0c7e, 0x2091, 0x8000, 0x2061, 0x0100, 0x6120, 0xd1b4, 0x00c0,</div><div class='del'>-	0x71a6, 0xd1bc, 0x00c0, 0x71f0, 0x0078, 0x7230, 0x2009, 0x017f,</div><div class='del'>-	0x200b, 0x00a1, 0x157e, 0x007e, 0x0d7e, 0x2069, 0x0140, 0x20a9,</div><div class='del'>-	0x001e, 0x2009, 0x0169, 0x6804, 0xa084, 0x4000, 0x0040, 0x71e7,</div><div class='del'>-	0x6020, 0xd0b4, 0x0040, 0x71e7, 0x6024, 0xd094, 0x00c0, 0x71e7,</div><div class='del'>-	0x2104, 0xa084, 0x000f, 0xa086, 0x0004, 0x00c0, 0x71e7, 0x00f0,</div><div class='del'>-	0x71b3, 0x027e, 0x6198, 0xa18c, 0x00ff, 0x8107, 0x6130, 0xa18c,</div><div class='del'>-	0x00ff, 0xa10d, 0x6088, 0x628c, 0x618e, 0x608b, 0xbc91, 0x6043,</div><div class='del'>-	0x0001, 0x6043, 0x0000, 0x608a, 0x628e, 0x6024, 0xd094, 0x00c0,</div><div class='del'>-	0x71e6, 0x6a04, 0xa294, 0x4000, 0x00c0, 0x71dd, 0x027f, 0x0d7f,</div><div class='del'>-	0x007f, 0x157f, 0x2009, 0x017f, 0x200b, 0x0000, 0x0078, 0x7230,</div><div class='del'>-	0x2009, 0x017f, 0x200b, 0x00a1, 0x157e, 0x007e, 0x0d7e, 0x2069,</div><div class='del'>-	0x0140, 0x20a9, 0x001e, 0x2009, 0x0169, 0x6804, 0xa084, 0x4000,</div><div class='del'>-	0x0040, 0x7229, 0x6020, 0xd0bc, 0x0040, 0x7229, 0x2104, 0xa084,</div><div class='del'>-	0x000f, 0xa086, 0x0004, 0x00c0, 0x7229, 0x00f0, 0x71fd, 0x027e,</div><div class='del'>-	0x6164, 0xa18c, 0x00ff, 0x8107, 0x6130, 0xa18c, 0x00ff, 0xa10d,</div><div class='del'>-	0x6088, 0x628c, 0x608b, 0xbc91, 0x618e, 0x6043, 0x0001, 0x6043,</div><div class='del'>-	0x0000, 0x608a, 0x628e, 0x6a04, 0xa294, 0x4000, 0x00c0, 0x7223,</div><div class='del'>-	0x027f, 0x0d7f, 0x007f, 0x157f, 0x2009, 0x017f, 0x200b, 0x0000,</div><div class='del'>-	0x0c7f, 0x127f, 0x007c, 0x0e7e, 0x2071, 0xa9b1, 0x7020, 0xa005,</div><div class='del'>-	0x0040, 0x723c, 0x8001, 0x7022, 0x0e7f, 0x007c, 0x20a9, 0x0008,</div><div class='del'>-	0x20a2, 0x00f0, 0x7240, 0x20a2, 0x20a2, 0x007c, 0x0f7e, 0x0e7e,</div><div class='del'>-	0x0d7e, 0x0c7e, 0x077e, 0x067e, 0x007e, 0x127e, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xa9b1, 0x7614, 0x2660, 0x2678, 0x2039, 0x0001, 0x87ff,</div><div class='del'>-	0x0040, 0x72e2, 0x8cff, 0x0040, 0x72e2, 0x601c, 0xa086, 0x0006,</div><div class='del'>-	0x00c0, 0x72dd, 0x88ff, 0x0040, 0x726d, 0x2800, 0xac06, 0x00c0,</div><div class='del'>-	0x72dd, 0x2039, 0x0000, 0x0078, 0x7278, 0x6018, 0xa206, 0x00c0,</div><div class='del'>-	0x72dd, 0x85ff, 0x0040, 0x7278, 0x6020, 0xa106, 0x00c0, 0x72dd,</div><div class='del'>-	0x7024, 0xac06, 0x00c0, 0x72a8, 0x2069, 0x0100, 0x68c0, 0xa005,</div><div class='del'>-	0x0040, 0x72a3, 0x1078, 0x5acb, 0x6817, 0x0008, 0x68c3, 0x0000,</div><div class='del'>-	0x1078, 0x7378, 0x7027, 0x0000, 0x037e, 0x2069, 0x0140, 0x6b04,</div><div class='del'>-	0xa384, 0x1000, 0x0040, 0x7298, 0x6803, 0x0100, 0x6803, 0x0000,</div><div class='del'>-	0x2069, 0x0100, 0x6824, 0xd084, 0x0040, 0x72a0, 0x6827, 0x0001,</div><div class='del'>-	0x037f, 0x0078, 0x72a8, 0x6003, 0x0009, 0x630a, 0x0078, 0x72dd,</div><div class='del'>-	0x7014, 0xac36, 0x00c0, 0x72ae, 0x660c, 0x7616, 0x7010, 0xac36,</div><div class='del'>-	0x00c0, 0x72bc, 0x2c00, 0xaf36, 0x0040, 0x72ba, 0x2f00, 0x7012,</div><div class='del'>-	0x0078, 0x72bc, 0x7013, 0x0000, 0x660c, 0x067e, 0x2c00, 0xaf06,</div><div class='del'>-	0x0040, 0x72c5, 0x7e0e, 0x0078, 0x72c6, 0x2678, 0x89ff, 0x00c0,</div><div class='del'>-	0x72d5, 0x600f, 0x0000, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040,</div><div class='del'>-	0x72d3, 0x1078, 0xa1da, 0x1078, 0x8ed6, 0x1078, 0x7233, 0x88ff,</div><div class='del'>-	0x00c0, 0x72ec, 0x0c7f, 0x0078, 0x7257, 0x2c78, 0x600c, 0x2060,</div><div class='del'>-	0x0078, 0x7257, 0xa006, 0x127f, 0x007f, 0x067f, 0x077f, 0x0c7f,</div><div class='del'>-	0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x6017, 0x0000, 0x0c7f, 0xa8c5,</div><div class='del'>-	0x0001, 0x0078, 0x72e3, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e,</div><div class='del'>-	0x027e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa9b1, 0x7638,</div><div class='del'>-	0x2660, 0x2678, 0x8cff, 0x0040, 0x7367, 0x601c, 0xa086, 0x0006,</div><div class='del'>-	0x00c0, 0x7362, 0x87ff, 0x0040, 0x7313, 0x2700, 0xac06, 0x00c0,</div><div class='del'>-	0x7362, 0x0078, 0x731e, 0x6018, 0xa206, 0x00c0, 0x7362, 0x85ff,</div><div class='del'>-	0x0040, 0x731e, 0x6020, 0xa106, 0x00c0, 0x7362, 0x703c, 0xac06,</div><div class='del'>-	0x00c0, 0x7332, 0x037e, 0x2019, 0x0001, 0x1078, 0x7058, 0x7033,</div><div class='del'>-	0x0000, 0x703f, 0x0000, 0x7043, 0x0000, 0x7047, 0x0000, 0x704b,</div><div class='del'>-	0x0000, 0x037f, 0x7038, 0xac36, 0x00c0, 0x7338, 0x660c, 0x763a,</div><div class='del'>-	0x7034, 0xac36, 0x00c0, 0x7346, 0x2c00, 0xaf36, 0x0040, 0x7344,</div><div class='del'>-	0x2f00, 0x7036, 0x0078, 0x7346, 0x7037, 0x0000, 0x660c, 0x067e,</div><div class='del'>-	0x2c00, 0xaf06, 0x0040, 0x734f, 0x7e0e, 0x0078, 0x7350, 0x2678,</div><div class='del'>-	0x600f, 0x0000, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040, 0x735a,</div><div class='del'>-	0x1078, 0xa1da, 0x1078, 0x8ed6, 0x87ff, 0x00c0, 0x7371, 0x0c7f,</div><div class='del'>-	0x0078, 0x7302, 0x2c78, 0x600c, 0x2060, 0x0078, 0x7302, 0xa006,</div><div class='del'>-	0x127f, 0x007f, 0x027f, 0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f,</div><div class='del'>-	0x007c, 0x6017, 0x0000, 0x0c7f, 0xa7bd, 0x0001, 0x0078, 0x7368,</div><div class='del'>-	0x0e7e, 0x2071, 0xa9b1, 0x2001, 0xa700, 0x2004, 0xa086, 0x0002,</div><div class='del'>-	0x00c0, 0x7386, 0x7007, 0x0005, 0x0078, 0x7388, 0x7007, 0x0000,</div><div class='del'>-	0x0e7f, 0x007c, 0x0f7e, 0x0e7e, 0x0c7e, 0x067e, 0x027e, 0x007e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x2071, 0xa9b1, 0x2c10, 0x7638, 0x2660,</div><div class='del'>-	0x2678, 0x8cff, 0x0040, 0x73c8, 0x2200, 0xac06, 0x00c0, 0x73c3,</div><div class='del'>-	0x7038, 0xac36, 0x00c0, 0x73a6, 0x660c, 0x763a, 0x7034, 0xac36,</div><div class='del'>-	0x00c0, 0x73b4, 0x2c00, 0xaf36, 0x0040, 0x73b2, 0x2f00, 0x7036,</div><div class='del'>-	0x0078, 0x73b4, 0x7037, 0x0000, 0x660c, 0x2c00, 0xaf06, 0x0040,</div><div class='del'>-	0x73bc, 0x7e0e, 0x0078, 0x73bd, 0x2678, 0x600f, 0x0000, 0xa085,</div><div class='del'>-	0x0001, 0x0078, 0x73c8, 0x2c78, 0x600c, 0x2060, 0x0078, 0x7399,</div><div class='del'>-	0x127f, 0x007f, 0x027f, 0x067f, 0x0c7f, 0x0e7f, 0x0f7f, 0x007c,</div><div class='del'>-	0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e, 0x007e, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0xa9b1, 0x760c, 0x2660, 0x2678, 0x8cff, 0x0040,</div><div class='del'>-	0x7469, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x00c0, 0x7464,</div><div class='del'>-	0x7024, 0xac06, 0x00c0, 0x740f, 0x2069, 0x0100, 0x68c0, 0xa005,</div><div class='del'>-	0x0040, 0x743d, 0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378,</div><div class='del'>-	0x7027, 0x0000, 0x037e, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000,</div><div class='del'>-	0x0040, 0x7406, 0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100,</div><div class='del'>-	0x6824, 0xd084, 0x0040, 0x740e, 0x6827, 0x0001, 0x037f, 0x700c,</div><div class='del'>-	0xac36, 0x00c0, 0x7415, 0x660c, 0x760e, 0x7008, 0xac36, 0x00c0,</div><div class='del'>-	0x7423, 0x2c00, 0xaf36, 0x0040, 0x7421, 0x2f00, 0x700a, 0x0078,</div><div class='del'>-	0x7423, 0x700b, 0x0000, 0x660c, 0x067e, 0x2c00, 0xaf06, 0x0040,</div><div class='del'>-	0x742c, 0x7e0e, 0x0078, 0x742d, 0x2678, 0x600f, 0x0000, 0x1078,</div><div class='del'>-	0x8efc, 0x00c0, 0x7441, 0x1078, 0x28a6, 0x1078, 0x8f10, 0x00c0,</div><div class='del'>-	0x745d, 0x1078, 0x7c83, 0x0078, 0x745d, 0x1078, 0x7378, 0x0078,</div><div class='del'>-	0x740f, 0x1078, 0x8f10, 0x00c0, 0x7449, 0x1078, 0x7c83, 0x0078,</div><div class='del'>-	0x745d, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040, 0x745d, 0x601c,</div><div class='del'>-	0xa086, 0x0003, 0x00c0, 0x7471, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x1078, 0x4a73, 0x1078, 0x8ec9, 0x1078, 0x8ed6, 0x1078,</div><div class='del'>-	0x7233, 0x0c7f, 0x0078, 0x73de, 0x2c78, 0x600c, 0x2060, 0x0078,</div><div class='del'>-	0x73de, 0x127f, 0x007f, 0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f,</div><div class='del'>-	0x007c, 0x601c, 0xa086, 0x0006, 0x00c0, 0x745d, 0x1078, 0xa1da,</div><div class='del'>-	0x0078, 0x745d, 0x037e, 0x157e, 0x137e, 0x147e, 0x3908, 0xa006,</div><div class='del'>-	0xa190, 0x0020, 0x221c, 0xa39e, 0x2676, 0x00c0, 0x748b, 0x8210,</div><div class='del'>-	0x8000, 0x0078, 0x7482, 0xa005, 0x0040, 0x7497, 0x20a9, 0x0020,</div><div class='del'>-	0x2198, 0x8211, 0xa282, 0x0020, 0x20c8, 0x20a0, 0x53a3, 0x147f,</div><div class='del'>-	0x137f, 0x157f, 0x037f, 0x007c, 0x0d7e, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x67c2, 0x20a3, 0x0200, 0x20a3, 0x0014, 0x60c3, 0x0014, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x2099, 0xa9a5, 0x20a9, 0x0004, 0x53a6,</div><div class='del'>-	0x20a3, 0x0004, 0x20a3, 0x7878, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x1078, 0x6dfb, 0x0d7f, 0x007c, 0x20a1, 0x020b, 0x1078, 0x67c2,</div><div class='del'>-	0x20a3, 0x0214, 0x20a3, 0x0018, 0x20a3, 0x0800, 0x7810, 0xa084,</div><div class='del'>-	0xff00, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x7810, 0xa084, 0x00ff, 0x20a2, 0x7828, 0x20a2,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0018, 0x1078, 0x6dfb,</div><div class='del'>-	0x007c, 0x0d7e, 0x017e, 0x2f68, 0x2009, 0x0035, 0x1078, 0x91cc,</div><div class='del'>-	0x00c0, 0x7551, 0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x1300,</div><div class='del'>-	0x20a3, 0x0000, 0x7828, 0x2068, 0x681c, 0xa086, 0x0003, 0x0040,</div><div class='del'>-	0x752d, 0x7818, 0xa080, 0x0028, 0x2014, 0xa286, 0x007e, 0x00c0,</div><div class='del'>-	0x7507, 0x20a3, 0x00ff, 0x20a3, 0xfffe, 0x0078, 0x7542, 0xa286,</div><div class='del'>-	0x007f, 0x00c0, 0x7511, 0x20a3, 0x00ff, 0x20a3, 0xfffd, 0x0078,</div><div class='del'>-	0x7542, 0xd2bc, 0x0040, 0x7527, 0xa286, 0x0080, 0x00c0, 0x751e,</div><div class='del'>-	0x20a3, 0x00ff, 0x20a3, 0xfffc, 0x0078, 0x7542, 0xa2e8, 0xa835,</div><div class='del'>-	0x2d6c, 0x6810, 0x20a2, 0x6814, 0x20a2, 0x0078, 0x7542, 0x20a3,</div><div class='del'>-	0x0000, 0x6098, 0x20a2, 0x0078, 0x7542, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xa082, 0x007e, 0x0048, 0x753e, 0x0d7e, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x7542, 0x20a3, 0x0000,</div><div class='del'>-	0x6030, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x60c3, 0x000c, 0x1078, 0x6dfb, 0x017f, 0x0d7f,</div><div class='del'>-	0x007c, 0x7817, 0x0001, 0x7803, 0x0006, 0x017f, 0x0d7f, 0x007c,</div><div class='del'>-	0x0d7e, 0x027e, 0x7928, 0x2168, 0x691c, 0xa186, 0x0006, 0x0040,</div><div class='del'>-	0x757a, 0xa186, 0x0003, 0x0040, 0x75d5, 0xa186, 0x0005, 0x0040,</div><div class='del'>-	0x75b8, 0xa186, 0x0004, 0x0040, 0x75a8, 0xa186, 0x0008, 0x0040,</div><div class='del'>-	0x75c2, 0x7807, 0x0037, 0x7813, 0x1700, 0x1078, 0x7640, 0x027f,</div><div class='del'>-	0x0d7f, 0x007c, 0x1078, 0x75fd, 0x2009, 0x4000, 0x6800, 0x0079,</div><div class='del'>-	0x7581, 0x7594, 0x75a2, 0x7596, 0x75a2, 0x759d, 0x7594, 0x7594,</div><div class='del'>-	0x75a2, 0x75a2, 0x75a2, 0x75a2, 0x7594, 0x7594, 0x7594, 0x7594,</div><div class='del'>-	0x7594, 0x75a2, 0x7594, 0x75a2, 0x1078, 0x1332, 0x6824, 0xd0e4,</div><div class='del'>-	0x0040, 0x759d, 0xd0cc, 0x0040, 0x75a0, 0xa00e, 0x0078, 0x75a2,</div><div class='del'>-	0x2009, 0x2000, 0x6828, 0x20a2, 0x682c, 0x20a2, 0x0078, 0x75f3,</div><div class='del'>-	0x1078, 0x75fd, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009, 0x4000,</div><div class='del'>-	0x6a00, 0xa286, 0x0002, 0x00c0, 0x75b6, 0xa00e, 0x0078, 0x75f3,</div><div class='del'>-	0x1078, 0x75fd, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009, 0x4000,</div><div class='del'>-	0x0078, 0x75f3, 0x1078, 0x75fd, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x2009, 0x4000, 0xa286, 0x0005, 0x0040, 0x75d2, 0xa286, 0x0002,</div><div class='del'>-	0x00c0, 0x75d3, 0xa00e, 0x0078, 0x75f3, 0x1078, 0x75fd, 0x6810,</div><div class='del'>-	0x2068, 0x697c, 0x6810, 0xa112, 0x6980, 0x6814, 0xa103, 0x20a2,</div><div class='del'>-	0x22a2, 0x7928, 0xa180, 0x0000, 0x2004, 0xa08e, 0x0002, 0x0040,</div><div class='del'>-	0x75f1, 0xa08e, 0x0004, 0x0040, 0x75f1, 0x2009, 0x4000, 0x0078,</div><div class='del'>-	0x75f3, 0x2009, 0x0000, 0x21a2, 0x20a3, 0x0000, 0x60c3, 0x0018,</div><div class='del'>-	0x1078, 0x6dfb, 0x027f, 0x0d7f, 0x007c, 0x037e, 0x047e, 0x057e,</div><div class='del'>-	0x067e, 0x20a1, 0x020b, 0x1078, 0x67c2, 0xa006, 0x20a3, 0x0200,</div><div class='del'>-	0x20a2, 0x7934, 0x21a2, 0x7938, 0x21a2, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xa092, 0x007e, 0x0048, 0x7623, 0x0d7e, 0x2069, 0xa71b,</div><div class='del'>-	0x2d2c, 0x8d68, 0x2d34, 0xa0e8, 0xa835, 0x2d6c, 0x6b10, 0x6c14,</div><div class='del'>-	0x0d7f, 0x0078, 0x7629, 0x2019, 0x0000, 0x6498, 0x2029, 0x0000,</div><div class='del'>-	0x6630, 0x7828, 0xa080, 0x0007, 0x2004, 0xa086, 0x0003, 0x00c0,</div><div class='del'>-	0x7637, 0x25a2, 0x26a2, 0x23a2, 0x24a2, 0x0078, 0x763b, 0x23a2,</div><div class='del'>-	0x24a2, 0x25a2, 0x26a2, 0x067f, 0x057f, 0x047f, 0x037f, 0x007c,</div><div class='del'>-	0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0009, 0x7810, 0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb,</div><div class='del'>-	0x007c, 0x20a1, 0x020b, 0x1078, 0x6728, 0x20a3, 0x1400, 0x20a3,</div><div class='del'>-	0x0000, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x7828, 0x20a2, 0x782c,</div><div class='del'>-	0x20a2, 0x7830, 0xa084, 0x00ff, 0x8007, 0x20a2, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0010, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,</div><div class='del'>-	0x67b9, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0x20a2, 0x7810,</div><div class='del'>-	0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c, 0x147e, 0x20a1,</div><div class='del'>-	0x020b, 0x1078, 0x7689, 0x60c3, 0x0000, 0x1078, 0x6dfb, 0x147f,</div><div class='del'>-	0x007c, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xd0bc, 0x0040, 0x76a6, 0x0d7e, 0xa0e8, 0xa835, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x0300, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa71b,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x76ae, 0x20a3, 0x0300,</div><div class='del'>-	0x6298, 0x22a2, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x20a3, 0x0819,</div><div class='del'>-	0x20a3, 0x0000, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000, 0x2fa2,</div><div class='del'>-	0x7a08, 0x22a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x007c, 0x2061,</div><div class='del'>-	0xae00, 0x2a70, 0x7064, 0x704a, 0x704f, 0xae00, 0x007c, 0x0e7e,</div><div class='del'>-	0x127e, 0x2071, 0xa700, 0x2091, 0x8000, 0x7548, 0xa582, 0x0010,</div><div class='del'>-	0x0048, 0x76f9, 0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0040,</div><div class='del'>-	0x76e5, 0xace0, 0x0010, 0x7058, 0xac02, 0x00c8, 0x76e1, 0x0078,</div><div class='del'>-	0x76d4, 0x2061, 0xae00, 0x0078, 0x76d4, 0x6003, 0x0008, 0x8529,</div><div class='del'>-	0x754a, 0xaca8, 0x0010, 0x7058, 0xa502, 0x00c8, 0x76f5, 0x754e,</div><div class='del'>-	0xa085, 0x0001, 0x127f, 0x0e7f, 0x007c, 0x704f, 0xae00, 0x0078,</div><div class='del'>-	0x76f0, 0xa006, 0x0078, 0x76f2, 0x0e7e, 0x2071, 0xa700, 0x7548,</div><div class='del'>-	0xa582, 0x0010, 0x0048, 0x772a, 0x704c, 0x2060, 0x6000, 0xa086,</div><div class='del'>-	0x0000, 0x0040, 0x7717, 0xace0, 0x0010, 0x7058, 0xac02, 0x00c8,</div><div class='del'>-	0x7713, 0x0078, 0x7706, 0x2061, 0xae00, 0x0078, 0x7706, 0x6003,</div><div class='del'>-	0x0008, 0x8529, 0x754a, 0xaca8, 0x0010, 0x7058, 0xa502, 0x00c8,</div><div class='del'>-	0x7726, 0x754e, 0xa085, 0x0001, 0x0e7f, 0x007c, 0x704f, 0xae00,</div><div class='del'>-	0x0078, 0x7722, 0xa006, 0x0078, 0x7724, 0xac82, 0xae00, 0x1048,</div><div class='del'>-	0x1332, 0x2001, 0xa716, 0x2004, 0xac02, 0x10c8, 0x1332, 0xa006,</div><div class='del'>-	0x6006, 0x600a, 0x600e, 0x6012, 0x6016, 0x601a, 0x601f, 0x0000,</div><div class='del'>-	0x6003, 0x0000, 0x6022, 0x6026, 0x602a, 0x602e, 0x6032, 0x6036,</div><div class='del'>-	0x603a, 0x603e, 0x2061, 0xa700, 0x6048, 0x8000, 0x604a, 0xa086,</div><div class='del'>-	0x0001, 0x0040, 0x7754, 0x007c, 0x127e, 0x2091, 0x8000, 0x1078,</div><div class='del'>-	0x62d1, 0x127f, 0x0078, 0x7753, 0x601c, 0xa084, 0x000f, 0x0079,</div><div class='del'>-	0x7761, 0x776a, 0x777b, 0x7797, 0x77b3, 0x921e, 0x923a, 0x9256,</div><div class='del'>-	0x776a, 0x777b, 0xa186, 0x0013, 0x00c0, 0x7773, 0x1078, 0x61cd,</div><div class='del'>-	0x1078, 0x62d1, 0x007c, 0xa18e, 0x0047, 0x00c0, 0x777a, 0xa016,</div><div class='del'>-	0x1078, 0x15fa, 0x007c, 0x067e, 0x6000, 0xa0b2, 0x0010, 0x10c8,</div><div class='del'>-	0x1332, 0x1079, 0x7785, 0x067f, 0x007c, 0x7795, 0x7b00, 0x7cb2,</div><div class='del'>-	0x7795, 0x7d36, 0x77cf, 0x7795, 0x7795, 0x7a92, 0x80f6, 0x7795,</div><div class='del'>-	0x7795, 0x7795, 0x7795, 0x7795, 0x7795, 0x1078, 0x1332, 0x067e,</div><div class='del'>-	0x6000, 0xa0b2, 0x0010, 0x10c8, 0x1332, 0x1079, 0x77a1, 0x067f,</div><div class='del'>-	0x007c, 0x77b1, 0x87d3, 0x77b1, 0x77b1, 0x77b1, 0x77b1, 0x77b1,</div><div class='del'>-	0x77b1, 0x8776, 0x8961, 0x77b1, 0x8803, 0x8889, 0x8803, 0x8889,</div><div class='del'>-	0x77b1, 0x1078, 0x1332, 0x067e, 0x6000, 0xa0b2, 0x0010, 0x10c8,</div><div class='del'>-	0x1332, 0x1079, 0x77bd, 0x067f, 0x007c, 0x77cd, 0x813d, 0x820e,</div><div class='del'>-	0x8372, 0x84f1, 0x77cd, 0x77cd, 0x77cd, 0x8116, 0x871e, 0x8722,</div><div class='del'>-	0x77cd, 0x77cd, 0x77cd, 0x77cd, 0x8752, 0x1078, 0x1332, 0xa1b6,</div><div class='del'>-	0x0015, 0x00c0, 0x77d7, 0x1078, 0x772d, 0x0078, 0x77dd, 0xa1b6,</div><div class='del'>-	0x0016, 0x10c0, 0x1332, 0x1078, 0x772d, 0x007c, 0x20a9, 0x000e,</div><div class='del'>-	0x2e98, 0x6010, 0x20a0, 0x53a3, 0x20a9, 0x0006, 0x3310, 0x3420,</div><div class='del'>-	0x9398, 0x94a0, 0x3318, 0x3428, 0x222e, 0x2326, 0xa290, 0x0002,</div><div class='del'>-	0xa5a8, 0x0002, 0xa398, 0x0002, 0xa4a0, 0x0002, 0x00f0, 0x77ec,</div><div class='del'>-	0x0e7e, 0x1078, 0x8d16, 0x0040, 0x7803, 0x6010, 0x2070, 0x7007,</div><div class='del'>-	0x0000, 0x7037, 0x0103, 0x0e7f, 0x1078, 0x772d, 0x007c, 0x0d7e,</div><div class='del'>-	0x037e, 0x7330, 0xa386, 0x0200, 0x00c0, 0x7814, 0x6018, 0x2068,</div><div class='del'>-	0x6813, 0x00ff, 0x6817, 0xfffd, 0x6010, 0xa005, 0x0040, 0x781e,</div><div class='del'>-	0x2068, 0x6807, 0x0000, 0x6837, 0x0103, 0x6b32, 0x1078, 0x772d,</div><div class='del'>-	0x037f, 0x0d7f, 0x007c, 0x017e, 0x20a9, 0x002a, 0xae80, 0x000c,</div><div class='del'>-	0x2098, 0x6010, 0xa080, 0x0002, 0x20a0, 0x53a3, 0x20a9, 0x002a,</div><div class='del'>-	0x6010, 0xa080, 0x0001, 0x2004, 0xa080, 0x0002, 0x20a0, 0x53a3,</div><div class='del'>-	0x0e7e, 0x6010, 0x2004, 0x2070, 0x7037, 0x0103, 0x0e7f, 0x1078,</div><div class='del'>-	0x772d, 0x017f, 0x007c, 0x0e7e, 0x0d7e, 0x603f, 0x0000, 0x2c68,</div><div class='del'>-	0x017e, 0x2009, 0x0035, 0x1078, 0x91cc, 0x017f, 0x00c0, 0x785f,</div><div class='del'>-	0x027e, 0x6228, 0x2268, 0x027f, 0x2071, 0xac8c, 0x6b1c, 0xa386,</div><div class='del'>-	0x0003, 0x0040, 0x7863, 0xa386, 0x0006, 0x0040, 0x7867, 0x1078,</div><div class='del'>-	0x772d, 0x0078, 0x7869, 0x1078, 0x786c, 0x0078, 0x7869, 0x1078,</div><div class='del'>-	0x7938, 0x0d7f, 0x0e7f, 0x007c, 0x0f7e, 0x6810, 0x2078, 0xa186,</div><div class='del'>-	0x0015, 0x0040, 0x791d, 0xa18e, 0x0016, 0x00c0, 0x7936, 0x700c,</div><div class='del'>-	0xa08c, 0xff00, 0xa186, 0x1700, 0x0040, 0x7882, 0xa186, 0x0300,</div><div class='del'>-	0x00c0, 0x78f8, 0x8fff, 0x00c0, 0x788c, 0x6800, 0xa086, 0x000f,</div><div class='del'>-	0x0040, 0x78db, 0x0078, 0x7934, 0x6808, 0xa086, 0xffff, 0x00c0,</div><div class='del'>-	0x7921, 0x784c, 0xa084, 0x0060, 0xa086, 0x0020, 0x00c0, 0x78a2,</div><div class='del'>-	0x797c, 0x7810, 0xa106, 0x00c0, 0x7921, 0x7980, 0x7814, 0xa106,</div><div class='del'>-	0x00c0, 0x7921, 0x1078, 0x8ec9, 0x6830, 0x7852, 0x784c, 0xc0dc,</div><div class='del'>-	0xc0f4, 0xc0d4, 0x784e, 0x027e, 0xa00e, 0x6a14, 0x2001, 0x000a,</div><div class='del'>-	0x1078, 0x5c1c, 0x7854, 0xa20a, 0x0048, 0x78b7, 0x8011, 0x7a56,</div><div class='del'>-	0x82ff, 0x027f, 0x00c0, 0x78c3, 0x0c7e, 0x2d60, 0x1078, 0x8af0,</div><div class='del'>-	0x0c7f, 0x0078, 0x7934, 0x0c7e, 0x0d7e, 0x2f68, 0x6838, 0xd0fc,</div><div class='del'>-	0x00c0, 0x78ce, 0x1078, 0x4353, 0x0078, 0x78d0, 0x1078, 0x4431,</div><div class='del'>-	0x0d7f, 0x0c7f, 0x00c0, 0x7921, 0x0c7e, 0x2d60, 0x1078, 0x772d,</div><div class='del'>-	0x0c7f, 0x0078, 0x7934, 0x0c7e, 0x1078, 0x9197, 0x0040, 0x78f1,</div><div class='del'>-	0x6013, 0x0000, 0x6818, 0x601a, 0x601f, 0x0003, 0x6904, 0x0c7e,</div><div class='del'>-	0x2d60, 0x1078, 0x772d, 0x0c7f, 0x1078, 0x775c, 0x0c7f, 0x0078,</div><div class='del'>-	0x7934, 0x2001, 0xa9a4, 0x2004, 0x683e, 0x0c7f, 0x0078, 0x7934,</div><div class='del'>-	0x7008, 0xa086, 0x000b, 0x00c0, 0x7912, 0x6018, 0x200c, 0xc1bc,</div><div class='del'>-	0x2102, 0x0c7e, 0x2d60, 0x7853, 0x0003, 0x6007, 0x0085, 0x6003,</div><div class='del'>-	0x000b, 0x601f, 0x0002, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7f,</div><div class='del'>-	0x0078, 0x7934, 0x700c, 0xa086, 0x2a00, 0x00c0, 0x7921, 0x2001,</div><div class='del'>-	0xa9a4, 0x2004, 0x683e, 0x0078, 0x7934, 0x1078, 0x7953, 0x0078,</div><div class='del'>-	0x7936, 0x8fff, 0x1040, 0x1332, 0x0c7e, 0x0d7e, 0x2d60, 0x2f68,</div><div class='del'>-	0x6837, 0x0103, 0x684b, 0x0003, 0x1078, 0x89df, 0x1078, 0x8ec9,</div><div class='del'>-	0x1078, 0x8ed6, 0x0d7f, 0x0c7f, 0x1078, 0x772d, 0x0f7f, 0x007c,</div><div class='del'>-	0xa186, 0x0015, 0x00c0, 0x7942, 0x2001, 0xa9a4, 0x2004, 0x683e,</div><div class='del'>-	0x0078, 0x7950, 0xa18e, 0x0016, 0x00c0, 0x7952, 0x0c7e, 0x2d00,</div><div class='del'>-	0x2060, 0x1078, 0xa4a5, 0x1078, 0x5bc1, 0x1078, 0x772d, 0x0c7f,</div><div class='del'>-	0x1078, 0x772d, 0x007c, 0x027e, 0x037e, 0x047e, 0x7228, 0x7c80,</div><div class='del'>-	0x7b7c, 0xd2f4, 0x0040, 0x7962, 0x2001, 0xa9a4, 0x2004, 0x683e,</div><div class='del'>-	0x0078, 0x79c6, 0x0c7e, 0x2d60, 0x1078, 0x8a03, 0x0c7f, 0x6804,</div><div class='del'>-	0xa086, 0x0050, 0x00c0, 0x797a, 0x0c7e, 0x2d00, 0x2060, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0050, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7f,</div><div class='del'>-	0x0078, 0x79c6, 0x6800, 0xa086, 0x000f, 0x0040, 0x799c, 0x8fff,</div><div class='del'>-	0x1040, 0x1332, 0x6824, 0xd0dc, 0x00c0, 0x799c, 0x6800, 0xa086,</div><div class='del'>-	0x0004, 0x00c0, 0x79a1, 0x784c, 0xd0ac, 0x0040, 0x79a1, 0x784c,</div><div class='del'>-	0xc0dc, 0xc0f4, 0x784e, 0x7850, 0xc0f4, 0xc0fc, 0x7852, 0x2001,</div><div class='del'>-	0x0001, 0x682e, 0x0078, 0x79c0, 0x2001, 0x0007, 0x682e, 0x0078,</div><div class='del'>-	0x79c0, 0x784c, 0xd0b4, 0x00c0, 0x79ae, 0xd0ac, 0x0040, 0x799c,</div><div class='del'>-	0x784c, 0xd0f4, 0x00c0, 0x799c, 0x0078, 0x798f, 0xd2ec, 0x00c0,</div><div class='del'>-	0x799c, 0x7024, 0xa306, 0x00c0, 0x79b9, 0x7020, 0xa406, 0x0040,</div><div class='del'>-	0x799c, 0x7020, 0x6836, 0x7024, 0x683a, 0x2001, 0x0005, 0x682e,</div><div class='del'>-	0x1078, 0x9000, 0x1078, 0x62d1, 0x0078, 0x79c8, 0x1078, 0x772d,</div><div class='del'>-	0x047f, 0x037f, 0x027f, 0x007c, 0x0e7e, 0x0d7e, 0x027e, 0x6034,</div><div class='del'>-	0x2068, 0x6a1c, 0xa286, 0x0007, 0x0040, 0x7a35, 0xa286, 0x0002,</div><div class='del'>-	0x0040, 0x7a35, 0xa286, 0x0000, 0x0040, 0x7a35, 0x6808, 0x6338,</div><div class='del'>-	0xa306, 0x00c0, 0x7a35, 0x2071, 0xac8c, 0xa186, 0x0015, 0x0040,</div><div class='del'>-	0x7a2f, 0xa18e, 0x0016, 0x00c0, 0x7a02, 0x6030, 0xa084, 0x00ff,</div><div class='del'>-	0xa086, 0x0001, 0x00c0, 0x7a02, 0x700c, 0xa086, 0x2a00, 0x00c0,</div><div class='del'>-	0x7a02, 0x6034, 0xa080, 0x0009, 0x200c, 0xc1dd, 0xc1f5, 0x2102,</div><div class='del'>-	0x0078, 0x7a2f, 0x0c7e, 0x6034, 0x2060, 0x6104, 0xa186, 0x004b,</div><div class='del'>-	0x0040, 0x7a22, 0xa186, 0x004c, 0x0040, 0x7a22, 0xa186, 0x004d,</div><div class='del'>-	0x0040, 0x7a22, 0xa186, 0x004e, 0x0040, 0x7a22, 0xa186, 0x0052,</div><div class='del'>-	0x0040, 0x7a22, 0x6010, 0x2068, 0x1078, 0x8d16, 0x1040, 0x1332,</div><div class='del'>-	0x6853, 0x0003, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002,</div><div class='del'>-	0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7f, 0x0078, 0x7a35, 0x6034,</div><div class='del'>-	0x2068, 0x2001, 0xa9a4, 0x2004, 0x683e, 0x1078, 0x772d, 0x027f,</div><div class='del'>-	0x0d7f, 0x0e7f, 0x007c, 0x0d7e, 0x20a9, 0x000e, 0x2e98, 0x6010,</div><div class='del'>-	0x20a0, 0x53a3, 0xa1b6, 0x0015, 0x00c0, 0x7a73, 0x6018, 0x2068,</div><div class='del'>-	0x157e, 0x037e, 0x027e, 0xae90, 0x000c, 0xa290, 0x0004, 0x20a9,</div><div class='del'>-	0x0004, 0xad98, 0x000a, 0x1078, 0x80de, 0x027f, 0x037f, 0x157f,</div><div class='del'>-	0x00c0, 0x7a76, 0x157e, 0x037e, 0x027e, 0xae90, 0x000c, 0xa290,</div><div class='del'>-	0x0008, 0x20a9, 0x0004, 0xad98, 0x0006, 0x1078, 0x80de, 0x027f,</div><div class='del'>-	0x037f, 0x157f, 0x00c0, 0x7a76, 0x7038, 0x680a, 0x703c, 0x680e,</div><div class='del'>-	0x6800, 0xc08d, 0x6802, 0x0d7f, 0x0078, 0x77f8, 0x1078, 0x2880,</div><div class='del'>-	0x0c7e, 0x1078, 0x76c7, 0x2f00, 0x601a, 0x6013, 0x0000, 0x601f,</div><div class='del'>-	0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x2001, 0x0007, 0x1078,</div><div class='del'>-	0x4502, 0x1078, 0x4535, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0c7f,</div><div class='del'>-	0x0078, 0x7a73, 0x2100, 0xa1b2, 0x0044, 0x10c8, 0x1332, 0xa1b2,</div><div class='del'>-	0x0040, 0x00c8, 0x7af7, 0x0079, 0x7a9d, 0x7aeb, 0x7adf, 0x7aeb,</div><div class='del'>-	0x7aeb, 0x7aeb, 0x7aeb, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,</div><div class='del'>-	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,</div><div class='del'>-	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,</div><div class='del'>-	0x7add, 0x7add, 0x7add, 0x7add, 0x7aeb, 0x7add, 0x7aeb, 0x7aeb,</div><div class='del'>-	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7aeb, 0x7add, 0x7add,</div><div class='del'>-	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7aeb,</div><div class='del'>-	0x7aeb, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,</div><div class='del'>-	0x7add, 0x7add, 0x7aeb, 0x7add, 0x7add, 0x1078, 0x1332, 0x6003,</div><div class='del'>-	0x0001, 0x6106, 0x1078, 0x5dd7, 0x127e, 0x2091, 0x8000, 0x1078,</div><div class='del'>-	0x62d1, 0x127f, 0x007c, 0x6003, 0x0001, 0x6106, 0x1078, 0x5dd7,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0x2600,</div><div class='del'>-	0x0079, 0x7afa, 0x7afe, 0x7afe, 0x7afe, 0x7aeb, 0x1078, 0x1332,</div><div class='del'>-	0x6004, 0xa0b2, 0x0044, 0x10c8, 0x1332, 0xa1b6, 0x0013, 0x00c0,</div><div class='del'>-	0x7b10, 0xa0b2, 0x0040, 0x00c8, 0x7c79, 0x2008, 0x0079, 0x7bbf,</div><div class='del'>-	0xa1b6, 0x0027, 0x00c0, 0x7b7c, 0x1078, 0x61cd, 0x6004, 0x1078,</div><div class='del'>-	0x8efc, 0x0040, 0x7b2d, 0x1078, 0x8f10, 0x0040, 0x7b74, 0xa08e,</div><div class='del'>-	0x0021, 0x0040, 0x7b78, 0xa08e, 0x0022, 0x0040, 0x7b74, 0xa08e,</div><div class='del'>-	0x003d, 0x0040, 0x7b78, 0x0078, 0x7b6f, 0x1078, 0x28a6, 0x2001,</div><div class='del'>-	0x0007, 0x1078, 0x4502, 0x6018, 0xa080, 0x0028, 0x200c, 0x1078,</div><div class='del'>-	0x7c83, 0xa186, 0x007e, 0x00c0, 0x7b42, 0x2001, 0xa733, 0x2014,</div><div class='del'>-	0xc285, 0x2202, 0x017e, 0x027e, 0x037e, 0x2110, 0x027e, 0x2019,</div><div class='del'>-	0x0028, 0x1078, 0x73d0, 0x027f, 0x1078, 0xa501, 0x037f, 0x027f,</div><div class='del'>-	0x017f, 0x017e, 0x027e, 0x037e, 0x2110, 0x2019, 0x0028, 0x1078,</div><div class='del'>-	0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a, 0x0c7e, 0x6018,</div><div class='del'>-	0xa065, 0x0040, 0x7b65, 0x1078, 0x47e9, 0x0c7f, 0x2c08, 0x1078,</div><div class='del'>-	0x9f9b, 0x077f, 0x037f, 0x027f, 0x017f, 0x1078, 0x457f, 0x1078,</div><div class='del'>-	0x772d, 0x1078, 0x62d1, 0x007c, 0x1078, 0x7c83, 0x0078, 0x7b6f,</div><div class='del'>-	0x1078, 0x7ca6, 0x0078, 0x7b6f, 0xa186, 0x0014, 0x00c0, 0x7b73,</div><div class='del'>-	0x1078, 0x61cd, 0x1078, 0x2880, 0x1078, 0x8efc, 0x00c0, 0x7b9b,</div><div class='del'>-	0x1078, 0x28a6, 0x6018, 0xa080, 0x0028, 0x200c, 0x1078, 0x7c83,</div><div class='del'>-	0xa186, 0x007e, 0x00c0, 0x7b99, 0x2001, 0xa733, 0x200c, 0xc185,</div><div class='del'>-	0x2102, 0x0078, 0x7b6f, 0x1078, 0x8f10, 0x00c0, 0x7ba3, 0x1078,</div><div class='del'>-	0x7c83, 0x0078, 0x7b6f, 0x6004, 0xa08e, 0x0032, 0x00c0, 0x7bb4,</div><div class='del'>-	0x0e7e, 0x0f7e, 0x2071, 0xa782, 0x2079, 0x0000, 0x1078, 0x2bd7,</div><div class='del'>-	0x0f7f, 0x0e7f, 0x0078, 0x7b6f, 0x6004, 0xa08e, 0x0021, 0x0040,</div><div class='del'>-	0x7b9f, 0xa08e, 0x0022, 0x1040, 0x7c83, 0x0078, 0x7b6f, 0x7c01,</div><div class='del'>-	0x7c03, 0x7c07, 0x7c0b, 0x7c0f, 0x7c13, 0x7bff, 0x7bff, 0x7bff,</div><div class='del'>-	0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff,</div><div class='del'>-	0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff,</div><div class='del'>-	0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7c17, 0x7c29, 0x7bff,</div><div class='del'>-	0x7c2b, 0x7c29, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7c29,</div><div class='del'>-	0x7c29, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff,</div><div class='del'>-	0x7bff, 0x7c5c, 0x7c29, 0x7bff, 0x7c23, 0x7bff, 0x7bff, 0x7bff,</div><div class='del'>-	0x7c25, 0x7bff, 0x7bff, 0x7bff, 0x7c29, 0x7bff, 0x7bff, 0x1078,</div><div class='del'>-	0x1332, 0x0078, 0x7c29, 0x2001, 0x000b, 0x0078, 0x7c36, 0x2001,</div><div class='del'>-	0x0003, 0x0078, 0x7c36, 0x2001, 0x0005, 0x0078, 0x7c36, 0x2001,</div><div class='del'>-	0x0001, 0x0078, 0x7c36, 0x2001, 0x0009, 0x0078, 0x7c36, 0x1078,</div><div class='del'>-	0x61cd, 0x6003, 0x0005, 0x2001, 0xa9a4, 0x2004, 0x603e, 0x1078,</div><div class='del'>-	0x62d1, 0x0078, 0x7c35, 0x0078, 0x7c29, 0x0078, 0x7c29, 0x1078,</div><div class='del'>-	0x4502, 0x0078, 0x7c6e, 0x1078, 0x61cd, 0x6003, 0x0004, 0x2001,</div><div class='del'>-	0xa9a2, 0x2004, 0x6016, 0x1078, 0x62d1, 0x007c, 0x1078, 0x4502,</div><div class='del'>-	0x1078, 0x61cd, 0x2001, 0xa9a4, 0x2004, 0x603e, 0x6003, 0x0002,</div><div class='del'>-	0x037e, 0x2019, 0xa75d, 0x2304, 0xa084, 0xff00, 0x00c0, 0x7c4d,</div><div class='del'>-	0x2019, 0xa9a2, 0x231c, 0x0078, 0x7c56, 0x8007, 0xa09a, 0x0004,</div><div class='del'>-	0x0048, 0x7c48, 0x8003, 0x801b, 0x831b, 0xa318, 0x6316, 0x037f,</div><div class='del'>-	0x1078, 0x62d1, 0x0078, 0x7c35, 0x0e7e, 0x0f7e, 0x2071, 0xa782,</div><div class='del'>-	0x2079, 0x0000, 0x1078, 0x2bd7, 0x0f7f, 0x0e7f, 0x1078, 0x61cd,</div><div class='del'>-	0x1078, 0x772d, 0x1078, 0x62d1, 0x0078, 0x7c35, 0x1078, 0x61cd,</div><div class='del'>-	0x6003, 0x0002, 0x2001, 0xa9a2, 0x2004, 0x6016, 0x1078, 0x62d1,</div><div class='del'>-	0x007c, 0x2600, 0x2008, 0x0079, 0x7c7d, 0x7c81, 0x7c81, 0x7c81,</div><div class='del'>-	0x7c6e, 0x1078, 0x1332, 0x0e7e, 0x1078, 0x8d16, 0x0040, 0x7c9f,</div><div class='del'>-	0x6010, 0x2070, 0x7038, 0xd0fc, 0x0040, 0x7c9f, 0x7007, 0x0000,</div><div class='del'>-	0x017e, 0x6004, 0xa08e, 0x0021, 0x0040, 0x7ca1, 0xa08e, 0x003d,</div><div class='del'>-	0x0040, 0x7ca1, 0x017f, 0x7037, 0x0103, 0x7033, 0x0100, 0x0e7f,</div><div class='del'>-	0x007c, 0x017f, 0x1078, 0x7ca6, 0x0078, 0x7c9f, 0x0e7e, 0xacf0,</div><div class='del'>-	0x0004, 0x2e74, 0x7000, 0x2070, 0x7037, 0x0103, 0x7023, 0x8001,</div><div class='del'>-	0x0e7f, 0x007c, 0x0d7e, 0x6618, 0x2668, 0x6804, 0xa084, 0x00ff,</div><div class='del'>-	0x0d7f, 0xa0b2, 0x000c, 0x10c8, 0x1332, 0x6604, 0xa6b6, 0x0043,</div><div class='del'>-	0x00c0, 0x7cc6, 0x1078, 0x9144, 0x0078, 0x7d25, 0x6604, 0xa6b6,</div><div class='del'>-	0x0033, 0x00c0, 0x7ccf, 0x1078, 0x90e8, 0x0078, 0x7d25, 0x6604,</div><div class='del'>-	0xa6b6, 0x0028, 0x00c0, 0x7cd8, 0x1078, 0x8f3f, 0x0078, 0x7d25,</div><div class='del'>-	0x6604, 0xa6b6, 0x0029, 0x00c0, 0x7ce1, 0x1078, 0x8f59, 0x0078,</div><div class='del'>-	0x7d25, 0x6604, 0xa6b6, 0x001f, 0x00c0, 0x7cea, 0x1078, 0x77de,</div><div class='del'>-	0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0000, 0x00c0, 0x7cf3, 0x1078,</div><div class='del'>-	0x7a3b, 0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0022, 0x00c0, 0x7cfc,</div><div class='del'>-	0x1078, 0x7807, 0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0035, 0x00c0,</div><div class='del'>-	0x7d05, 0x1078, 0x7843, 0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0039,</div><div class='del'>-	0x00c0, 0x7d0e, 0x1078, 0x79cc, 0x0078, 0x7d25, 0x6604, 0xa6b6,</div><div class='del'>-	0x003d, 0x00c0, 0x7d17, 0x1078, 0x7823, 0x0078, 0x7d25, 0xa1b6,</div><div class='del'>-	0x0015, 0x00c0, 0x7d1f, 0x1079, 0x7d2a, 0x0078, 0x7d25, 0xa1b6,</div><div class='del'>-	0x0016, 0x00c0, 0x7d26, 0x1079, 0x7e7f, 0x007c, 0x1078, 0x7773,</div><div class='del'>-	0x0078, 0x7d25, 0x7d4e, 0x7d51, 0x7d4e, 0x7d9c, 0x7d4e, 0x7e13,</div><div class='del'>-	0x7e8b, 0x7d4e, 0x7d4e, 0x7e57, 0x7d4e, 0x7e6d, 0xa1b6, 0x0048,</div><div class='del'>-	0x0040, 0x7d42, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x1078,</div><div class='del'>-	0x15fa, 0x007c, 0x0e7e, 0xacf0, 0x0004, 0x2e74, 0x7000, 0x2070,</div><div class='del'>-	0x7037, 0x0103, 0x0e7f, 0x1078, 0x772d, 0x007c, 0x0005, 0x0005,</div><div class='del'>-	0x007c, 0x0e7e, 0x2071, 0xa700, 0x7080, 0xa086, 0x0074, 0x00c0,</div><div class='del'>-	0x7d85, 0x1078, 0x9f6f, 0x00c0, 0x7d77, 0x0d7e, 0x6018, 0x2068,</div><div class='del'>-	0x7030, 0xd08c, 0x0040, 0x7d6a, 0x6800, 0xd0bc, 0x0040, 0x7d6a,</div><div class='del'>-	0xc0c5, 0x6802, 0x1078, 0x7d89, 0x0d7f, 0x2001, 0x0006, 0x1078,</div><div class='del'>-	0x4502, 0x1078, 0x28a6, 0x1078, 0x772d, 0x0078, 0x7d87, 0x2001,</div><div class='del'>-	0x000a, 0x1078, 0x4502, 0x1078, 0x28a6, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0001, 0x1078, 0x5dd7, 0x0078, 0x7d87, 0x1078, 0x7dff, 0x0e7f,</div><div class='del'>-	0x007c, 0x6800, 0xd084, 0x0040, 0x7d9b, 0x2001, 0x0000, 0x1078,</div><div class='del'>-	0x44ee, 0x2069, 0xa752, 0x6804, 0xd0a4, 0x0040, 0x7d9b, 0x2001,</div><div class='del'>-	0x0006, 0x1078, 0x4535, 0x007c, 0x0d7e, 0x2011, 0xa720, 0x2204,</div><div class='del'>-	0xa086, 0x0074, 0x00c0, 0x7dfb, 0x6018, 0x2068, 0x6aa0, 0xa286,</div><div class='del'>-	0x007e, 0x00c0, 0x7daf, 0x1078, 0x7f9b, 0x0078, 0x7dfd, 0x1078,</div><div class='del'>-	0x7f91, 0x6018, 0x2068, 0xa080, 0x0028, 0x2014, 0xa286, 0x0080,</div><div class='del'>-	0x00c0, 0x7dd3, 0x6813, 0x00ff, 0x6817, 0xfffc, 0x6010, 0xa005,</div><div class='del'>-	0x0040, 0x7dc9, 0x2068, 0x6807, 0x0000, 0x6837, 0x0103, 0x6833,</div><div class='del'>-	0x0200, 0x2001, 0x0006, 0x1078, 0x4502, 0x1078, 0x28a6, 0x1078,</div><div class='del'>-	0x772d, 0x0078, 0x7dfd, 0x0e7e, 0x2071, 0xa733, 0x2e04, 0xd09c,</div><div class='del'>-	0x0040, 0x7dee, 0x2071, 0xac80, 0x7108, 0x720c, 0xa18c, 0x00ff,</div><div class='del'>-	0x00c0, 0x7de6, 0xa284, 0xff00, 0x0040, 0x7dee, 0x6018, 0x2070,</div><div class='del'>-	0x70a0, 0xd0bc, 0x00c0, 0x7dee, 0x7112, 0x7216, 0x0e7f, 0x2001,</div><div class='del'>-	0x0004, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0003, 0x1078,</div><div class='del'>-	0x5dd7, 0x0078, 0x7dfd, 0x1078, 0x7dff, 0x0d7f, 0x007c, 0x2001,</div><div class='del'>-	0x0007, 0x1078, 0x4502, 0x2001, 0xa700, 0x2004, 0xa086, 0x0003,</div><div class='del'>-	0x00c0, 0x7e0e, 0x2001, 0x0007, 0x1078, 0x4535, 0x1078, 0x28a6,</div><div class='del'>-	0x1078, 0x772d, 0x007c, 0x0e7e, 0x2071, 0xa700, 0x7080, 0xa086,</div><div class='del'>-	0x0014, 0x00c0, 0x7e51, 0x7000, 0xa086, 0x0003, 0x00c0, 0x7e26,</div><div class='del'>-	0x6010, 0xa005, 0x00c0, 0x7e26, 0x1078, 0x3699, 0x0d7e, 0x6018,</div><div class='del'>-	0x2068, 0x1078, 0x4649, 0x1078, 0x7d89, 0x0d7f, 0x1078, 0x8043,</div><div class='del'>-	0x00c0, 0x7e51, 0x0d7e, 0x6018, 0x2068, 0x6890, 0x0d7f, 0xa005,</div><div class='del'>-	0x0040, 0x7e51, 0x2001, 0x0006, 0x1078, 0x4502, 0x0e7e, 0x6010,</div><div class='del'>-	0xa005, 0x0040, 0x7e4a, 0x2070, 0x7007, 0x0000, 0x7037, 0x0103,</div><div class='del'>-	0x7033, 0x0200, 0x0e7f, 0x1078, 0x28a6, 0x1078, 0x772d, 0x0078,</div><div class='del'>-	0x7e55, 0x1078, 0x7c83, 0x1078, 0x7dff, 0x0e7f, 0x007c, 0x2011,</div><div class='del'>-	0xa720, 0x2204, 0xa086, 0x0014, 0x00c0, 0x7e6a, 0x2001, 0x0002,</div><div class='del'>-	0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0001, 0x1078, 0x5dd7,</div><div class='del'>-	0x0078, 0x7e6c, 0x1078, 0x7dff, 0x007c, 0x2011, 0xa720, 0x2204,</div><div class='del'>-	0xa086, 0x0004, 0x00c0, 0x7e7c, 0x2001, 0x0007, 0x1078, 0x4502,</div><div class='del'>-	0x1078, 0x772d, 0x0078, 0x7e7e, 0x1078, 0x7dff, 0x007c, 0x7d4e,</div><div class='del'>-	0x7e97, 0x7d4e, 0x7ed2, 0x7d4e, 0x7f44, 0x7e8b, 0x7d4e, 0x7d4e,</div><div class='del'>-	0x7f59, 0x7d4e, 0x7f6c, 0x6604, 0xa686, 0x0003, 0x0040, 0x7e13,</div><div class='del'>-	0xa6b6, 0x001e, 0x00c0, 0x7e96, 0x1078, 0x772d, 0x007c, 0x0d7e,</div><div class='del'>-	0x0c7e, 0x1078, 0x7f7f, 0x00c0, 0x7ead, 0x2001, 0x0000, 0x1078,</div><div class='del'>-	0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x1078, 0x5dd7, 0x0078, 0x7ecf, 0x2009, 0xac8e, 0x2104,</div><div class='del'>-	0xa086, 0x0009, 0x00c0, 0x7ec2, 0x6018, 0x2068, 0x6840, 0xa084,</div><div class='del'>-	0x00ff, 0xa005, 0x0040, 0x7ecd, 0x8001, 0x6842, 0x6017, 0x000a,</div><div class='del'>-	0x0078, 0x7ecf, 0x2009, 0xac8f, 0x2104, 0xa084, 0xff00, 0xa086,</div><div class='del'>-	0x1900, 0x00c0, 0x7ecd, 0x0078, 0x7ea1, 0x1078, 0x7dff, 0x0c7f,</div><div class='del'>-	0x0d7f, 0x007c, 0x1078, 0x7f8e, 0x00c0, 0x7ee6, 0x2001, 0x0000,</div><div class='del'>-	0x1078, 0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0002, 0x1078, 0x5dd7, 0x0078, 0x7f12, 0x1078, 0x7c83,</div><div class='del'>-	0x2009, 0xac8e, 0x2134, 0xa6b4, 0x00ff, 0xa686, 0x0005, 0x0040,</div><div class='del'>-	0x7f13, 0xa686, 0x000b, 0x0040, 0x7f10, 0x2009, 0xac8f, 0x2104,</div><div class='del'>-	0xa084, 0xff00, 0x00c0, 0x7f00, 0xa686, 0x0009, 0x0040, 0x7f13,</div><div class='del'>-	0xa086, 0x1900, 0x00c0, 0x7f10, 0xa686, 0x0009, 0x0040, 0x7f13,</div><div class='del'>-	0x2001, 0x0004, 0x1078, 0x4502, 0x1078, 0x772d, 0x0078, 0x7f12,</div><div class='del'>-	0x1078, 0x7dff, 0x007c, 0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d16,</div><div class='del'>-	0x0040, 0x7f21, 0x6838, 0xd0fc, 0x0040, 0x7f21, 0x0d7f, 0x0078,</div><div class='del'>-	0x7f10, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005, 0x0040,</div><div class='del'>-	0x7f32, 0x8001, 0x6842, 0x6017, 0x000a, 0x6007, 0x0016, 0x0d7f,</div><div class='del'>-	0x0078, 0x7f12, 0x68a0, 0xa086, 0x007e, 0x00c0, 0x7f3f, 0x0e7e,</div><div class='del'>-	0x2071, 0xa700, 0x1078, 0x42b8, 0x0e7f, 0x0078, 0x7f41, 0x1078,</div><div class='del'>-	0x2880, 0x0d7f, 0x0078, 0x7f10, 0x1078, 0x7f8e, 0x00c0, 0x7f54,</div><div class='del'>-	0x2001, 0x0004, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0003,</div><div class='del'>-	0x1078, 0x5dd7, 0x0078, 0x7f58, 0x1078, 0x7c83, 0x1078, 0x7dff,</div><div class='del'>-	0x007c, 0x1078, 0x7f8e, 0x00c0, 0x7f69, 0x2001, 0x0008, 0x1078,</div><div class='del'>-	0x4502, 0x6003, 0x0001, 0x6007, 0x0005, 0x1078, 0x5dd7, 0x0078,</div><div class='del'>-	0x7f6b, 0x1078, 0x7dff, 0x007c, 0x1078, 0x7f8e, 0x00c0, 0x7f7c,</div><div class='del'>-	0x2001, 0x000a, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0001,</div><div class='del'>-	0x1078, 0x5dd7, 0x0078, 0x7f7e, 0x1078, 0x7dff, 0x007c, 0x2009,</div><div class='del'>-	0xac8e, 0x2104, 0xa086, 0x0003, 0x00c0, 0x7f8d, 0x2009, 0xac8f,</div><div class='del'>-	0x2104, 0xa084, 0xff00, 0xa086, 0x2a00, 0x007c, 0xa085, 0x0001,</div><div class='del'>-	0x007c, 0x0c7e, 0x017e, 0xac88, 0x0006, 0x2164, 0x1078, 0x45d6,</div><div class='del'>-	0x017f, 0x0c7f, 0x007c, 0x0f7e, 0x0e7e, 0x0d7e, 0x037e, 0x017e,</div><div class='del'>-	0x6018, 0x2068, 0x2071, 0xa733, 0x2e04, 0xa085, 0x0003, 0x2072,</div><div class='del'>-	0x1078, 0x8014, 0x0040, 0x7fd9, 0x2009, 0xa733, 0x2104, 0xc0cd,</div><div class='del'>-	0x200a, 0x2001, 0xa753, 0x2004, 0xd0a4, 0x0040, 0x7fc2, 0xa006,</div><div class='del'>-	0x2020, 0x2009, 0x002a, 0x1078, 0xa22d, 0x2001, 0xa70c, 0x200c,</div><div class='del'>-	0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0001, 0x1078, 0x284f,</div><div class='del'>-	0x2071, 0xa700, 0x1078, 0x2677, 0x0c7e, 0x157e, 0x20a9, 0x0081,</div><div class='del'>-	0x2009, 0x007f, 0x1078, 0x298e, 0x8108, 0x00f0, 0x7fd2, 0x157f,</div><div class='del'>-	0x0c7f, 0x1078, 0x7f91, 0x6813, 0x00ff, 0x6817, 0xfffe, 0x2071,</div><div class='del'>-	0xac80, 0x2079, 0x0100, 0x2e04, 0xa084, 0x00ff, 0x2069, 0xa71b,</div><div class='del'>-	0x206a, 0x78e6, 0x007e, 0x8e70, 0x2e04, 0x2069, 0xa71c, 0x206a,</div><div class='del'>-	0x78ea, 0xa084, 0xff00, 0x017f, 0xa105, 0x2009, 0xa726, 0x200a,</div><div class='del'>-	0x2069, 0xac8e, 0x2071, 0xa99e, 0x6810, 0x2072, 0x6814, 0x7006,</div><div class='del'>-	0x6818, 0x700a, 0x681c, 0x700e, 0x1078, 0x907e, 0x2001, 0x0006,</div><div class='del'>-	0x1078, 0x4502, 0x1078, 0x28a6, 0x1078, 0x772d, 0x017f, 0x037f,</div><div class='del'>-	0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x027e, 0x037e, 0x0e7e, 0x157e,</div><div class='del'>-	0x2019, 0xa726, 0x231c, 0x83ff, 0x0040, 0x803e, 0x2071, 0xac80,</div><div class='del'>-	0x2e14, 0xa294, 0x00ff, 0x7004, 0xa084, 0xff00, 0xa205, 0xa306,</div><div class='del'>-	0x00c0, 0x803e, 0x2011, 0xac96, 0xad98, 0x000a, 0x20a9, 0x0004,</div><div class='del'>-	0x1078, 0x80de, 0x00c0, 0x803e, 0x2011, 0xac9a, 0xad98, 0x0006,</div><div class='del'>-	0x20a9, 0x0004, 0x1078, 0x80de, 0x00c0, 0x803e, 0x157f, 0x0e7f,</div><div class='del'>-	0x037f, 0x027f, 0x007c, 0x0e7e, 0x2071, 0xac8c, 0x7004, 0xa086,</div><div class='del'>-	0x0014, 0x00c0, 0x8066, 0x7008, 0xa086, 0x0800, 0x00c0, 0x8066,</div><div class='del'>-	0x700c, 0xd0ec, 0x0040, 0x8064, 0xa084, 0x0f00, 0xa086, 0x0100,</div><div class='del'>-	0x00c0, 0x8064, 0x7024, 0xd0a4, 0x00c0, 0x8061, 0xd0ac, 0x0040,</div><div class='del'>-	0x8064, 0xa006, 0x0078, 0x8066, 0xa085, 0x0001, 0x0e7f, 0x007c,</div><div class='del'>-	0x0e7e, 0x0d7e, 0x0c7e, 0x077e, 0x057e, 0x047e, 0x027e, 0x007e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x2029, 0xa9ba, 0x252c, 0x2021, 0xa9c0,</div><div class='del'>-	0x2424, 0x2061, 0xae00, 0x2071, 0xa700, 0x7248, 0x7064, 0xa202,</div><div class='del'>-	0x00c8, 0x80cc, 0x1078, 0xa252, 0x0040, 0x80c4, 0x671c, 0xa786,</div><div class='del'>-	0x0001, 0x0040, 0x80c4, 0xa786, 0x0007, 0x0040, 0x80c4, 0x2500,</div><div class='del'>-	0xac06, 0x0040, 0x80c4, 0x2400, 0xac06, 0x0040, 0x80c4, 0x0c7e,</div><div class='del'>-	0x6000, 0xa086, 0x0004, 0x00c0, 0x809f, 0x1078, 0x1757, 0xa786,</div><div class='del'>-	0x0008, 0x00c0, 0x80ae, 0x1078, 0x8f10, 0x00c0, 0x80ae, 0x0c7f,</div><div class='del'>-	0x1078, 0x7c83, 0x1078, 0x8ed6, 0x0078, 0x80c4, 0x6010, 0x2068,</div><div class='del'>-	0x1078, 0x8d16, 0x0040, 0x80c1, 0xa786, 0x0003, 0x00c0, 0x80d6,</div><div class='del'>-	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x4a73, 0x1078,</div><div class='del'>-	0x8ec9, 0x1078, 0x8ed6, 0x0c7f, 0xace0, 0x0010, 0x7058, 0xac02,</div><div class='del'>-	0x00c8, 0x80cc, 0x0078, 0x807d, 0x127f, 0x007f, 0x027f, 0x047f,</div><div class='del'>-	0x057f, 0x077f, 0x0c7f, 0x0d7f, 0x0e7f, 0x007c, 0xa786, 0x0006,</div><div class='del'>-	0x00c0, 0x80b8, 0x1078, 0xa1da, 0x0078, 0x80c1, 0x220c, 0x2304,</div><div class='del'>-	0xa106, 0x00c0, 0x80e9, 0x8210, 0x8318, 0x00f0, 0x80de, 0xa006,</div><div class='del'>-	0x007c, 0x2304, 0xa102, 0x0048, 0x80f1, 0x2001, 0x0001, 0x0078,</div><div class='del'>-	0x80f3, 0x2001, 0x0000, 0xa18d, 0x0001, 0x007c, 0x6004, 0xa08a,</div><div class='del'>-	0x0044, 0x10c8, 0x1332, 0x1078, 0x8efc, 0x0040, 0x8105, 0x1078,</div><div class='del'>-	0x8f10, 0x0040, 0x8112, 0x0078, 0x810b, 0x1078, 0x28a6, 0x1078,</div><div class='del'>-	0x8f10, 0x0040, 0x8112, 0x1078, 0x61cd, 0x1078, 0x772d, 0x1078,</div><div class='del'>-	0x62d1, 0x007c, 0x1078, 0x7c83, 0x0078, 0x810b, 0xa182, 0x0040,</div><div class='del'>-	0x0079, 0x811a, 0x812d, 0x812d, 0x812d, 0x812d, 0x812d, 0x812d,</div><div class='del'>-	0x812d, 0x812d, 0x812d, 0x812d, 0x812d, 0x812f, 0x812f, 0x812f,</div><div class='del'>-	0x812f, 0x812d, 0x812d, 0x812d, 0x812f, 0x1078, 0x1332, 0x600b,</div><div class='del'>-	0xffff, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0xa186, 0x0013, 0x00c0,</div><div class='del'>-	0x8146, 0x6004, 0xa082, 0x0040, 0x0079, 0x81d1, 0xa186, 0x0027,</div><div class='del'>-	0x00c0, 0x8168, 0x1078, 0x61cd, 0x1078, 0x2880, 0x0d7e, 0x6110,</div><div class='del'>-	0x2168, 0x1078, 0x8d16, 0x0040, 0x8162, 0x6837, 0x0103, 0x684b,</div><div class='del'>-	0x0029, 0x6847, 0x0000, 0x694c, 0xc1c5, 0x694e, 0x1078, 0x4a73,</div><div class='del'>-	0x1078, 0x8ec9, 0x0d7f, 0x1078, 0x772d, 0x1078, 0x62d1, 0x007c,</div><div class='del'>-	0xa186, 0x0014, 0x00c0, 0x8171, 0x6004, 0xa082, 0x0040, 0x0079,</div><div class='del'>-	0x8199, 0xa186, 0x0046, 0x0040, 0x817d, 0xa186, 0x0045, 0x0040,</div><div class='del'>-	0x817d, 0xa186, 0x0047, 0x10c0, 0x1332, 0x2001, 0x0109, 0x2004,</div><div class='del'>-	0xd084, 0x0040, 0x8196, 0x127e, 0x2091, 0x2200, 0x007e, 0x017e,</div><div class='del'>-	0x027e, 0x1078, 0x5c56, 0x027f, 0x017f, 0x007f, 0x127f, 0x6000,</div><div class='del'>-	0xa086, 0x0002, 0x00c0, 0x8196, 0x0078, 0x820e, 0x1078, 0x7773,</div><div class='del'>-	0x007c, 0x81ae, 0x81ac, 0x81ac, 0x81ac, 0x81ac, 0x81ac, 0x81ac,</div><div class='del'>-	0x81ac, 0x81ac, 0x81ac, 0x81ac, 0x81ca, 0x81ca, 0x81ca, 0x81ca,</div><div class='del'>-	0x81ac, 0x81ca, 0x81ac, 0x81ca, 0x1078, 0x1332, 0x1078, 0x61cd,</div><div class='del'>-	0x0d7e, 0x6110, 0x2168, 0x1078, 0x8d16, 0x0040, 0x81c4, 0x6837,</div><div class='del'>-	0x0103, 0x684b, 0x0006, 0x6847, 0x0000, 0x6850, 0xc0ec, 0x6852,</div><div class='del'>-	0x1078, 0x4a73, 0x1078, 0x8ec9, 0x0d7f, 0x1078, 0x772d, 0x1078,</div><div class='del'>-	0x62d1, 0x007c, 0x1078, 0x61cd, 0x1078, 0x772d, 0x1078, 0x62d1,</div><div class='del'>-	0x007c, 0x81e6, 0x81e4, 0x81e4, 0x81e4, 0x81e4, 0x81e4, 0x81e4,</div><div class='del'>-	0x81e4, 0x81e4, 0x81e4, 0x81e4, 0x81f8, 0x81f8, 0x81f8, 0x81f8,</div><div class='del'>-	0x81e4, 0x8207, 0x81e4, 0x81f8, 0x1078, 0x1332, 0x1078, 0x61cd,</div><div class='del'>-	0x2001, 0xa9a4, 0x2004, 0x603e, 0x6003, 0x0002, 0x1078, 0x62d1,</div><div class='del'>-	0x6010, 0xa088, 0x0013, 0x2104, 0xa085, 0x0400, 0x200a, 0x007c,</div><div class='del'>-	0x1078, 0x61cd, 0x2001, 0xa9a2, 0x2004, 0x6016, 0x2001, 0xa9a4,</div><div class='del'>-	0x2004, 0x603e, 0x6003, 0x000f, 0x1078, 0x62d1, 0x007c, 0x1078,</div><div class='del'>-	0x61cd, 0x1078, 0x772d, 0x1078, 0x62d1, 0x007c, 0xa182, 0x0040,</div><div class='del'>-	0x0079, 0x8212, 0x8225, 0x8225, 0x8225, 0x8225, 0x8225, 0x8227,</div><div class='del'>-	0x8331, 0x8363, 0x8225, 0x8225, 0x8225, 0x8225, 0x8225, 0x8225,</div><div class='del'>-	0x8225, 0x8225, 0x8225, 0x8225, 0x8225, 0x1078, 0x1332, 0x0e7e,</div><div class='del'>-	0x0d7e, 0x603f, 0x0000, 0x2071, 0xac80, 0x7124, 0x610a, 0x2071,</div><div class='del'>-	0xac8c, 0x6110, 0x2168, 0x7614, 0xa6b4, 0x0fff, 0x86ff, 0x0040,</div><div class='del'>-	0x82f0, 0xa68c, 0x0c00, 0x0040, 0x8265, 0x0f7e, 0x2c78, 0x1078,</div><div class='del'>-	0x4963, 0x0f7f, 0x0040, 0x8261, 0x684c, 0xd0ac, 0x0040, 0x8261,</div><div class='del'>-	0x6024, 0xd0dc, 0x00c0, 0x8261, 0x6850, 0xd0bc, 0x00c0, 0x8261,</div><div class='del'>-	0x7318, 0x6814, 0xa306, 0x00c0, 0x8308, 0x731c, 0x6810, 0xa31e,</div><div class='del'>-	0x0040, 0x8261, 0xd6d4, 0x0040, 0x8308, 0x6b14, 0xa305, 0x00c0,</div><div class='del'>-	0x8308, 0x7318, 0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff, 0xa186,</div><div class='del'>-	0x0002, 0x0040, 0x8298, 0xa186, 0x0028, 0x00c0, 0x8275, 0x1078,</div><div class='del'>-	0x8eea, 0x684b, 0x001c, 0x0078, 0x829a, 0xd6dc, 0x0040, 0x8291,</div><div class='del'>-	0x684b, 0x0015, 0x684c, 0xd0ac, 0x0040, 0x828f, 0x6914, 0x6a10,</div><div class='del'>-	0x2100, 0xa205, 0x0040, 0x828f, 0x7018, 0xa106, 0x00c0, 0x828c,</div><div class='del'>-	0x701c, 0xa206, 0x0040, 0x828f, 0x6962, 0x6a5e, 0xc6dc, 0x0078,</div><div class='del'>-	0x829a, 0xd6d4, 0x0040, 0x8298, 0x684b, 0x0007, 0x0078, 0x829a,</div><div class='del'>-	0x684b, 0x0000, 0x6837, 0x0103, 0x6e46, 0xa01e, 0xd6c4, 0x0040,</div><div class='del'>-	0x82c3, 0xa686, 0x0100, 0x00c0, 0x82ae, 0x2001, 0xac99, 0x2004,</div><div class='del'>-	0xa005, 0x00c0, 0x82ae, 0xc6c4, 0x0078, 0x8236, 0x7328, 0x732c,</div><div class='del'>-	0x6b56, 0x83ff, 0x0040, 0x82c3, 0xa38a, 0x0009, 0x0048, 0x82ba,</div><div class='del'>-	0x2019, 0x0008, 0x037e, 0x2308, 0x2019, 0xac98, 0xad90, 0x0019,</div><div class='del'>-	0x1078, 0x89f2, 0x037f, 0xd6cc, 0x0040, 0x831e, 0x7124, 0x695a,</div><div class='del'>-	0x81ff, 0x0040, 0x831e, 0xa192, 0x0021, 0x00c8, 0x82dc, 0x2071,</div><div class='del'>-	0xac98, 0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x1078, 0x89f2,</div><div class='del'>-	0x1078, 0x9204, 0x0078, 0x831e, 0x6838, 0xd0fc, 0x0040, 0x82e5,</div><div class='del'>-	0x2009, 0x0020, 0x695a, 0x0078, 0x82cf, 0x0f7e, 0x2d78, 0x1078,</div><div class='del'>-	0x898a, 0x0f7f, 0x1078, 0x9204, 0x1078, 0x89df, 0x0078, 0x8320,</div><div class='del'>-	0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f, 0x0040, 0x830e, 0x684c,</div><div class='del'>-	0xd0ac, 0x0040, 0x830e, 0x6024, 0xd0dc, 0x00c0, 0x830e, 0x6850,</div><div class='del'>-	0xd0bc, 0x00c0, 0x830e, 0x6810, 0x6914, 0xa105, 0x0040, 0x830e,</div><div class='del'>-	0x1078, 0x8fcf, 0x0d7f, 0x0e7f, 0x0078, 0x8330, 0x684b, 0x0000,</div><div class='del'>-	0x6837, 0x0103, 0x6e46, 0x684c, 0xd0ac, 0x0040, 0x831e, 0x6810,</div><div class='del'>-	0x6914, 0xa115, 0x0040, 0x831e, 0x1078, 0x84e2, 0x1078, 0x4a73,</div><div class='del'>-	0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0040, 0x8328, 0x8211, 0x6a3e,</div><div class='del'>-	0x1078, 0x8f99, 0x0d7f, 0x0e7f, 0x00c0, 0x8330, 0x1078, 0x772d,</div><div class='del'>-	0x007c, 0x0f7e, 0x6003, 0x0003, 0x2079, 0xac8c, 0x7c04, 0x7b00,</div><div class='del'>-	0x7e0c, 0x7d08, 0x6010, 0x2078, 0x784c, 0xd0ac, 0x0040, 0x8348,</div><div class='del'>-	0x6003, 0x0002, 0x0f7f, 0x007c, 0x2130, 0x2228, 0x0078, 0x8354,</div><div class='del'>-	0x2400, 0x797c, 0xa10a, 0x2300, 0x7a80, 0xa213, 0x2600, 0xa102,</div><div class='del'>-	0x2500, 0xa203, 0x0048, 0x8344, 0x7c12, 0x7b16, 0x7e0a, 0x7d0e,</div><div class='del'>-	0x0f7f, 0x603f, 0x0000, 0x2c10, 0x1078, 0x1cf0, 0x1078, 0x5df6,</div><div class='del'>-	0x1078, 0x639b, 0x007c, 0x2001, 0xa9a4, 0x2004, 0x603e, 0x6003,</div><div class='del'>-	0x0004, 0x6110, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x1078,</div><div class='del'>-	0x15fa, 0x007c, 0xa182, 0x0040, 0x0079, 0x8376, 0x8389, 0x8389,</div><div class='del'>-	0x8389, 0x8389, 0x8389, 0x838b, 0x8431, 0x8389, 0x8389, 0x8447,</div><div class='del'>-	0x84b8, 0x8389, 0x8389, 0x8389, 0x8389, 0x84c7, 0x8389, 0x8389,</div><div class='del'>-	0x8389, 0x1078, 0x1332, 0x077e, 0x0f7e, 0x0e7e, 0x0d7e, 0x2071,</div><div class='del'>-	0xac8c, 0x6110, 0x2178, 0x7614, 0xa6b4, 0x0fff, 0x7e46, 0x7f4c,</div><div class='del'>-	0xc7e5, 0x7f4e, 0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0040, 0x83a2,</div><div class='del'>-	0x8211, 0x6a3e, 0x86ff, 0x0040, 0x842c, 0xa694, 0xff00, 0xa284,</div><div class='del'>-	0x0c00, 0x0040, 0x83af, 0x7018, 0x7862, 0x701c, 0x785e, 0xa284,</div><div class='del'>-	0x0300, 0x0040, 0x842c, 0x1078, 0x138b, 0x1040, 0x1332, 0x2d00,</div><div class='del'>-	0x784a, 0x7f4c, 0xc7cd, 0x7f4e, 0x6837, 0x0103, 0x7838, 0x683a,</div><div class='del'>-	0x783c, 0x683e, 0x7840, 0x6842, 0x6e46, 0xa68c, 0x0c00, 0x0040,</div><div class='del'>-	0x83cd, 0x7318, 0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff, 0xa186,</div><div class='del'>-	0x0002, 0x0040, 0x83e9, 0xa186, 0x0028, 0x00c0, 0x83db, 0x684b,</div><div class='del'>-	0x001c, 0x0078, 0x83eb, 0xd6dc, 0x0040, 0x83e2, 0x684b, 0x0015,</div><div class='del'>-	0x0078, 0x83eb, 0xd6d4, 0x0040, 0x83e9, 0x684b, 0x0007, 0x0078,</div><div class='del'>-	0x83eb, 0x684b, 0x0000, 0x6f4e, 0x7850, 0x6852, 0x7854, 0x6856,</div><div class='del'>-	0xa01e, 0xd6c4, 0x0040, 0x8409, 0x7328, 0x732c, 0x6b56, 0x83ff,</div><div class='del'>-	0x0040, 0x8409, 0xa38a, 0x0009, 0x0048, 0x8400, 0x2019, 0x0008,</div><div class='del'>-	0x037e, 0x2308, 0x2019, 0xac98, 0xad90, 0x0019, 0x1078, 0x89f2,</div><div class='del'>-	0x037f, 0xd6cc, 0x0040, 0x842c, 0x7124, 0x695a, 0x81ff, 0x0040,</div><div class='del'>-	0x842c, 0xa192, 0x0021, 0x00c8, 0x8420, 0x2071, 0xac98, 0x831c,</div><div class='del'>-	0x2300, 0xae18, 0xad90, 0x001d, 0x1078, 0x89f2, 0x0078, 0x842c,</div><div class='del'>-	0x7838, 0xd0fc, 0x0040, 0x8429, 0x2009, 0x0020, 0x695a, 0x0078,</div><div class='del'>-	0x8415, 0x2d78, 0x1078, 0x898a, 0x0d7f, 0x0e7f, 0x0f7f, 0x077f,</div><div class='del'>-	0x007c, 0x0f7e, 0x6003, 0x0003, 0x2079, 0xac8c, 0x7c04, 0x7b00,</div><div class='del'>-	0x7e0c, 0x7d08, 0x6010, 0x2078, 0x7c12, 0x7b16, 0x7e0a, 0x7d0e,</div><div class='del'>-	0x0f7f, 0x2c10, 0x1078, 0x1cf0, 0x1078, 0x6df4, 0x007c, 0x0d7e,</div><div class='del'>-	0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f, 0x0040, 0x8453, 0x2001,</div><div class='del'>-	0xa9a4, 0x2004, 0x603e, 0x6003, 0x0002, 0x1078, 0x627a, 0x1078,</div><div class='del'>-	0x639b, 0x6110, 0x2168, 0x694c, 0xd1e4, 0x0040, 0x84b6, 0xd1cc,</div><div class='del'>-	0x0040, 0x848d, 0x6948, 0x6838, 0xd0fc, 0x0040, 0x8485, 0x017e,</div><div class='del'>-	0x684c, 0x007e, 0x6850, 0x007e, 0xad90, 0x000d, 0xa198, 0x000d,</div><div class='del'>-	0x2009, 0x0020, 0x157e, 0x21a8, 0x2304, 0x2012, 0x8318, 0x8210,</div><div class='del'>-	0x00f0, 0x8474, 0x157f, 0x007f, 0x6852, 0x007f, 0x684e, 0x017f,</div><div class='del'>-	0x2168, 0x1078, 0x13b4, 0x0078, 0x84b0, 0x017e, 0x1078, 0x13b4,</div><div class='del'>-	0x0d7f, 0x1078, 0x89df, 0x0078, 0x84b0, 0x6837, 0x0103, 0x6944,</div><div class='del'>-	0xa184, 0x00ff, 0xa0b6, 0x0002, 0x0040, 0x84ac, 0xa086, 0x0028,</div><div class='del'>-	0x00c0, 0x849e, 0x684b, 0x001c, 0x0078, 0x84ae, 0xd1dc, 0x0040,</div><div class='del'>-	0x84a5, 0x684b, 0x0015, 0x0078, 0x84ae, 0xd1d4, 0x0040, 0x84ac,</div><div class='del'>-	0x684b, 0x0007, 0x0078, 0x84ae, 0x684b, 0x0000, 0x1078, 0x4a73,</div><div class='del'>-	0x1078, 0x8f99, 0x00c0, 0x84b6, 0x1078, 0x772d, 0x0d7f, 0x007c,</div><div class='del'>-	0x2019, 0x0001, 0x1078, 0x7058, 0x6003, 0x0002, 0x2001, 0xa9a4,</div><div class='del'>-	0x2004, 0x603e, 0x1078, 0x627a, 0x1078, 0x639b, 0x007c, 0x1078,</div><div class='del'>-	0x627a, 0x1078, 0x2880, 0x0d7e, 0x6110, 0x2168, 0x1078, 0x8d16,</div><div class='del'>-	0x0040, 0x84dc, 0x6837, 0x0103, 0x684b, 0x0029, 0x6847, 0x0000,</div><div class='del'>-	0x1078, 0x4a73, 0x1078, 0x8ec9, 0x0d7f, 0x1078, 0x772d, 0x1078,</div><div class='del'>-	0x639b, 0x007c, 0x684b, 0x0015, 0xd1fc, 0x0040, 0x84ee, 0x684b,</div><div class='del'>-	0x0007, 0x8002, 0x8000, 0x810a, 0xa189, 0x0000, 0x6962, 0x685e,</div><div class='del'>-	0x007c, 0xa182, 0x0040, 0x0079, 0x84f5, 0x8508, 0x8508, 0x8508,</div><div class='del'>-	0x8508, 0x8508, 0x850a, 0x8508, 0x85e0, 0x85ec, 0x8508, 0x8508,</div><div class='del'>-	0x8508, 0x8508, 0x8508, 0x8508, 0x8508, 0x8508, 0x8508, 0x8508,</div><div class='del'>-	0x1078, 0x1332, 0x077e, 0x0f7e, 0x0e7e, 0x0d7e, 0x2071, 0xac8c,</div><div class='del'>-	0x6110, 0x2178, 0x7614, 0xa6b4, 0x0fff, 0x0f7e, 0x2c78, 0x1078,</div><div class='del'>-	0x4963, 0x0f7f, 0x0040, 0x8528, 0xa684, 0x00ff, 0x00c0, 0x8528,</div><div class='del'>-	0x6024, 0xd0f4, 0x0040, 0x8528, 0x1078, 0x8fcf, 0x0078, 0x85db,</div><div class='del'>-	0x7e46, 0x7f4c, 0xc7e5, 0x7f4e, 0x6218, 0x2268, 0x6a3c, 0x82ff,</div><div class='del'>-	0x0040, 0x8534, 0x8211, 0x6a3e, 0x86ff, 0x0040, 0x85d0, 0xa694,</div><div class='del'>-	0xff00, 0xa284, 0x0c00, 0x0040, 0x8541, 0x7018, 0x7862, 0x701c,</div><div class='del'>-	0x785e, 0xa284, 0x0300, 0x0040, 0x85cd, 0xa686, 0x0100, 0x00c0,</div><div class='del'>-	0x8553, 0x2001, 0xac99, 0x2004, 0xa005, 0x00c0, 0x8553, 0xc6c4,</div><div class='del'>-	0x7e46, 0x0078, 0x8534, 0x1078, 0x138b, 0x1040, 0x1332, 0x2d00,</div><div class='del'>-	0x784a, 0x7f4c, 0xa7bd, 0x0200, 0x7f4e, 0x6837, 0x0103, 0x7838,</div><div class='del'>-	0x683a, 0x783c, 0x683e, 0x7840, 0x6842, 0x6e46, 0xa68c, 0x0c00,</div><div class='del'>-	0x0040, 0x856e, 0x7318, 0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff,</div><div class='del'>-	0xa186, 0x0002, 0x0040, 0x858a, 0xa186, 0x0028, 0x00c0, 0x857c,</div><div class='del'>-	0x684b, 0x001c, 0x0078, 0x858c, 0xd6dc, 0x0040, 0x8583, 0x684b,</div><div class='del'>-	0x0015, 0x0078, 0x858c, 0xd6d4, 0x0040, 0x858a, 0x684b, 0x0007,</div><div class='del'>-	0x0078, 0x858c, 0x684b, 0x0000, 0x6f4e, 0x7850, 0x6852, 0x7854,</div><div class='del'>-	0x6856, 0xa01e, 0xd6c4, 0x0040, 0x85aa, 0x7328, 0x732c, 0x6b56,</div><div class='del'>-	0x83ff, 0x0040, 0x85aa, 0xa38a, 0x0009, 0x0048, 0x85a1, 0x2019,</div><div class='del'>-	0x0008, 0x037e, 0x2308, 0x2019, 0xac98, 0xad90, 0x0019, 0x1078,</div><div class='del'>-	0x89f2, 0x037f, 0xd6cc, 0x0040, 0x85cd, 0x7124, 0x695a, 0x81ff,</div><div class='del'>-	0x0040, 0x85cd, 0xa192, 0x0021, 0x00c8, 0x85c1, 0x2071, 0xac98,</div><div class='del'>-	0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x1078, 0x89f2, 0x0078,</div><div class='del'>-	0x85cd, 0x7838, 0xd0fc, 0x0040, 0x85ca, 0x2009, 0x0020, 0x695a,</div><div class='del'>-	0x0078, 0x85b6, 0x2d78, 0x1078, 0x898a, 0xd6dc, 0x00c0, 0x85d3,</div><div class='del'>-	0xa006, 0x0078, 0x85d9, 0x2001, 0x0001, 0x2071, 0xac8c, 0x7218,</div><div class='del'>-	0x731c, 0x1078, 0x1653, 0x0d7f, 0x0e7f, 0x0f7f, 0x077f, 0x007c,</div><div class='del'>-	0x2001, 0xa9a4, 0x2004, 0x603e, 0x20e1, 0x0005, 0x3d18, 0x3e20,</div><div class='del'>-	0x2c10, 0x1078, 0x15fa, 0x007c, 0x2001, 0xa9a4, 0x2004, 0x603e,</div><div class='del'>-	0x0d7e, 0x6003, 0x0002, 0x6110, 0x2168, 0x694c, 0xd1e4, 0x0040,</div><div class='del'>-	0x871c, 0x603f, 0x0000, 0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f,</div><div class='del'>-	0x0040, 0x8632, 0x6814, 0x6910, 0xa115, 0x0040, 0x8632, 0x6a60,</div><div class='del'>-	0xa206, 0x00c0, 0x860f, 0x685c, 0xa106, 0x0040, 0x8632, 0x684c,</div><div class='del'>-	0xc0e4, 0x684e, 0x6847, 0x0000, 0x6863, 0x0000, 0x685f, 0x0000,</div><div class='del'>-	0x6024, 0xd0f4, 0x00c0, 0x8627, 0x697c, 0x6810, 0xa102, 0x603a,</div><div class='del'>-	0x6980, 0x6814, 0xa103, 0x6036, 0x6024, 0xc0f5, 0x6026, 0x0d7e,</div><div class='del'>-	0x6018, 0x2068, 0x683c, 0x8000, 0x683e, 0x0d7f, 0x1078, 0x8fcf,</div><div class='del'>-	0x0078, 0x871c, 0x694c, 0xd1cc, 0x0040, 0x86e1, 0x6948, 0x6838,</div><div class='del'>-	0xd0fc, 0x0040, 0x8699, 0x017e, 0x684c, 0x007e, 0x6850, 0x007e,</div><div class='del'>-	0x0f7e, 0x2178, 0x7944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x0040,</div><div class='del'>-	0x866c, 0xa086, 0x0028, 0x00c0, 0x8653, 0x684b, 0x001c, 0x784b,</div><div class='del'>-	0x001c, 0x0078, 0x8677, 0xd1dc, 0x0040, 0x8663, 0x684b, 0x0015,</div><div class='del'>-	0x784b, 0x0015, 0x1078, 0x917c, 0x0040, 0x8661, 0x7944, 0xc1dc,</div><div class='del'>-	0x7946, 0x0078, 0x8677, 0xd1d4, 0x0040, 0x866c, 0x684b, 0x0007,</div><div class='del'>-	0x784b, 0x0007, 0x0078, 0x8677, 0x684c, 0xd0ac, 0x0040, 0x8677,</div><div class='del'>-	0x6810, 0x6914, 0xa115, 0x0040, 0x8677, 0x1078, 0x84e2, 0x6848,</div><div class='del'>-	0x784a, 0x6860, 0x7862, 0x685c, 0x785e, 0xad90, 0x000d, 0xaf98,</div><div class='del'>-	0x000d, 0x2009, 0x0020, 0x157e, 0x21a8, 0x2304, 0x2012, 0x8318,</div><div class='del'>-	0x8210, 0x00f0, 0x8685, 0x157f, 0x0f7f, 0x007f, 0x6852, 0x007f,</div><div class='del'>-	0x684e, 0x1078, 0x9204, 0x017f, 0x2168, 0x1078, 0x13b4, 0x0078,</div><div class='del'>-	0x8716, 0x017e, 0x0f7e, 0x2178, 0x7944, 0xa184, 0x00ff, 0xa0b6,</div><div class='del'>-	0x0002, 0x0040, 0x86c6, 0xa086, 0x0028, 0x00c0, 0x86ad, 0x684b,</div><div class='del'>-	0x001c, 0x784b, 0x001c, 0x0078, 0x86d1, 0xd1dc, 0x0040, 0x86bd,</div><div class='del'>-	0x684b, 0x0015, 0x784b, 0x0015, 0x1078, 0x917c, 0x0040, 0x86bb,</div><div class='del'>-	0x7944, 0xc1dc, 0x7946, 0x0078, 0x86d1, 0xd1d4, 0x0040, 0x86c6,</div><div class='del'>-	0x684b, 0x0007, 0x784b, 0x0007, 0x0078, 0x86d1, 0x684c, 0xd0ac,</div><div class='del'>-	0x0040, 0x86d1, 0x6810, 0x6914, 0xa115, 0x0040, 0x86d1, 0x1078,</div><div class='del'>-	0x84e2, 0x6860, 0x7862, 0x685c, 0x785e, 0x684c, 0x784e, 0x0f7f,</div><div class='del'>-	0x1078, 0x13b4, 0x0d7f, 0x1078, 0x9204, 0x1078, 0x89df, 0x0078,</div><div class='del'>-	0x8716, 0x6837, 0x0103, 0x6944, 0xa184, 0x00ff, 0xa0b6, 0x0002,</div><div class='del'>-	0x0040, 0x8707, 0xa086, 0x0028, 0x00c0, 0x86f2, 0x684b, 0x001c,</div><div class='del'>-	0x0078, 0x8714, 0xd1dc, 0x0040, 0x8700, 0x684b, 0x0015, 0x1078,</div><div class='del'>-	0x917c, 0x0040, 0x86fe, 0x6944, 0xc1dc, 0x6946, 0x0078, 0x8714,</div><div class='del'>-	0xd1d4, 0x0040, 0x8707, 0x684b, 0x0007, 0x0078, 0x8714, 0x684b,</div><div class='del'>-	0x0000, 0x684c, 0xd0ac, 0x0040, 0x8714, 0x6810, 0x6914, 0xa115,</div><div class='del'>-	0x0040, 0x8714, 0x1078, 0x84e2, 0x1078, 0x4a73, 0x1078, 0x8f99,</div><div class='del'>-	0x00c0, 0x871c, 0x1078, 0x772d, 0x0d7f, 0x007c, 0x1078, 0x61cd,</div><div class='del'>-	0x0078, 0x8724, 0x1078, 0x627a, 0x1078, 0x8d16, 0x0040, 0x8743,</div><div class='del'>-	0x0d7e, 0x6110, 0x2168, 0x6837, 0x0103, 0x2009, 0xa70c, 0x210c,</div><div class='del'>-	0xd18c, 0x00c0, 0x874e, 0xd184, 0x00c0, 0x874a, 0x6108, 0x694a,</div><div class='del'>-	0xa18e, 0x0029, 0x00c0, 0x873e, 0x1078, 0xa4f2, 0x6847, 0x0000,</div><div class='del'>-	0x1078, 0x4a73, 0x0d7f, 0x1078, 0x772d, 0x1078, 0x62d1, 0x1078,</div><div class='del'>-	0x639b, 0x007c, 0x684b, 0x0004, 0x0078, 0x873e, 0x684b, 0x0004,</div><div class='del'>-	0x0078, 0x873e, 0xa182, 0x0040, 0x0079, 0x8756, 0x8769, 0x8769,</div><div class='del'>-	0x8769, 0x8769, 0x8769, 0x876b, 0x8769, 0x876e, 0x8769, 0x8769,</div><div class='del'>-	0x8769, 0x8769, 0x8769, 0x8769, 0x8769, 0x8769, 0x8769, 0x8769,</div><div class='del'>-	0x8769, 0x1078, 0x1332, 0x1078, 0x772d, 0x007c, 0x007e, 0x027e,</div><div class='del'>-	0xa016, 0x1078, 0x15fa, 0x027f, 0x007f, 0x007c, 0xa182, 0x0085,</div><div class='del'>-	0x0079, 0x877a, 0x8783, 0x8781, 0x8781, 0x878f, 0x8781, 0x8781,</div><div class='del'>-	0x8781, 0x1078, 0x1332, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0x027e,</div><div class='del'>-	0x057e, 0x0d7e, 0x0e7e, 0x2071, 0xac80, 0x7224, 0x6212, 0x7220,</div><div class='del'>-	0x1078, 0x8d02, 0x0040, 0x87b4, 0x2268, 0x6800, 0xa086, 0x0000,</div><div class='del'>-	0x0040, 0x87b4, 0x6018, 0x6d18, 0xa52e, 0x00c0, 0x87b4, 0x0c7e,</div><div class='del'>-	0x2d60, 0x1078, 0x8a03, 0x0c7f, 0x0040, 0x87b4, 0x6803, 0x0002,</div><div class='del'>-	0x6007, 0x0086, 0x0078, 0x87b6, 0x6007, 0x0087, 0x6003, 0x0001,</div><div class='del'>-	0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0f7e, 0x2278, 0x1078, 0x4963,</div><div class='del'>-	0x0f7f, 0x0040, 0x87ce, 0x6824, 0xd0ec, 0x0040, 0x87ce, 0x0c7e,</div><div class='del'>-	0x2260, 0x603f, 0x0000, 0x1078, 0x8fcf, 0x0c7f, 0x0e7f, 0x0d7f,</div><div class='del'>-	0x057f, 0x027f, 0x007c, 0xa186, 0x0013, 0x00c0, 0x87e4, 0x6004,</div><div class='del'>-	0xa08a, 0x0085, 0x1048, 0x1332, 0xa08a, 0x008c, 0x10c8, 0x1332,</div><div class='del'>-	0xa082, 0x0085, 0x0079, 0x87f3, 0xa186, 0x0027, 0x0040, 0x87ec,</div><div class='del'>-	0xa186, 0x0014, 0x10c0, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ed6,</div><div class='del'>-	0x1078, 0x62d1, 0x007c, 0x87fa, 0x87fc, 0x87fc, 0x87fa, 0x87fa,</div><div class='del'>-	0x87fa, 0x87fa, 0x1078, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ed6,</div><div class='del'>-	0x1078, 0x62d1, 0x007c, 0xa186, 0x0013, 0x00c0, 0x880d, 0x6004,</div><div class='del'>-	0xa082, 0x0085, 0x2008, 0x0078, 0x8848, 0xa186, 0x0027, 0x00c0,</div><div class='del'>-	0x8830, 0x1078, 0x61cd, 0x1078, 0x2880, 0x0d7e, 0x6010, 0x2068,</div><div class='del'>-	0x1078, 0x8d16, 0x0040, 0x8826, 0x6837, 0x0103, 0x6847, 0x0000,</div><div class='del'>-	0x684b, 0x0029, 0x1078, 0x4a73, 0x1078, 0x8ec9, 0x0d7f, 0x1078,</div><div class='del'>-	0x772d, 0x1078, 0x62d1, 0x007c, 0x1078, 0x7773, 0x0078, 0x882b,</div><div class='del'>-	0xa186, 0x0014, 0x00c0, 0x882c, 0x1078, 0x61cd, 0x0d7e, 0x6010,</div><div class='del'>-	0x2068, 0x1078, 0x8d16, 0x0040, 0x8826, 0x6837, 0x0103, 0x6847,</div><div class='del'>-	0x0000, 0x684b, 0x0006, 0x6850, 0xc0ec, 0x6852, 0x0078, 0x8822,</div><div class='del'>-	0x0079, 0x884a, 0x8853, 0x8851, 0x8851, 0x8851, 0x8851, 0x8851,</div><div class='del'>-	0x886e, 0x1078, 0x1332, 0x1078, 0x61cd, 0x6030, 0xa08c, 0xff00,</div><div class='del'>-	0x810f, 0xa186, 0x0039, 0x0040, 0x8861, 0xa186, 0x0035, 0x00c0,</div><div class='del'>-	0x8865, 0x2001, 0xa9a2, 0x0078, 0x8867, 0x2001, 0xa9a3, 0x2004,</div><div class='del'>-	0x6016, 0x6003, 0x000c, 0x1078, 0x62d1, 0x007c, 0x1078, 0x61cd,</div><div class='del'>-	0x6030, 0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0040, 0x887c,</div><div class='del'>-	0xa186, 0x0035, 0x00c0, 0x8880, 0x2001, 0xa9a2, 0x0078, 0x8882,</div><div class='del'>-	0x2001, 0xa9a3, 0x2004, 0x6016, 0x6003, 0x000e, 0x1078, 0x62d1,</div><div class='del'>-	0x007c, 0xa182, 0x008c, 0x00c8, 0x8893, 0xa182, 0x0085, 0x0048,</div><div class='del'>-	0x8893, 0x0079, 0x8896, 0x1078, 0x7773, 0x007c, 0x889d, 0x889d,</div><div class='del'>-	0x889d, 0x889d, 0x889f, 0x88fc, 0x889d, 0x1078, 0x1332, 0x0f7e,</div><div class='del'>-	0x2c78, 0x1078, 0x4963, 0x0f7f, 0x0040, 0x88b2, 0x6030, 0xa08c,</div><div class='del'>-	0xff00, 0x810f, 0xa186, 0x0039, 0x0040, 0x8913, 0xa186, 0x0035,</div><div class='del'>-	0x0040, 0x8913, 0x0d7e, 0x1078, 0x8d16, 0x00c0, 0x88bb, 0x1078,</div><div class='del'>-	0x8ec9, 0x0078, 0x88de, 0x6010, 0x2068, 0x684c, 0xd0e4, 0x00c0,</div><div class='del'>-	0x88c3, 0x1078, 0x8ec9, 0x6837, 0x0103, 0x6850, 0xd0b4, 0x0040,</div><div class='del'>-	0x88cf, 0x684b, 0x0006, 0xc0ec, 0x6852, 0x0078, 0x88da, 0xd0bc,</div><div class='del'>-	0x0040, 0x88d6, 0x684b, 0x0002, 0x0078, 0x88da, 0x684b, 0x0005,</div><div class='del'>-	0x1078, 0x8f95, 0x6847, 0x0000, 0x1078, 0x4a73, 0x2c68, 0x1078,</div><div class='del'>-	0x76c7, 0x0040, 0x88f7, 0x6003, 0x0001, 0x6007, 0x001e, 0x2009,</div><div class='del'>-	0xac8e, 0x210c, 0x6136, 0x2009, 0xac8f, 0x210c, 0x613a, 0x6918,</div><div class='del'>-	0x611a, 0x6920, 0x6122, 0x601f, 0x0001, 0x1078, 0x5d8a, 0x2d60,</div><div class='del'>-	0x1078, 0x772d, 0x0d7f, 0x007c, 0x0f7e, 0x2c78, 0x1078, 0x4963,</div><div class='del'>-	0x0f7f, 0x0040, 0x8939, 0x6030, 0xa08c, 0xff00, 0x810f, 0xa186,</div><div class='del'>-	0x0035, 0x0040, 0x8913, 0xa186, 0x001e, 0x0040, 0x8913, 0xa186,</div><div class='del'>-	0x0039, 0x00c0, 0x8939, 0x0d7e, 0x2c68, 0x1078, 0x91cc, 0x00c0,</div><div class='del'>-	0x895d, 0x1078, 0x76c7, 0x0040, 0x8936, 0x6106, 0x6003, 0x0001,</div><div class='del'>-	0x601f, 0x0001, 0x6918, 0x611a, 0x6928, 0x612a, 0x692c, 0x612e,</div><div class='del'>-	0x6930, 0xa18c, 0x00ff, 0x6132, 0x6934, 0x6136, 0x6938, 0x613a,</div><div class='del'>-	0x6920, 0x6122, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x2d60, 0x0078,</div><div class='del'>-	0x895d, 0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040, 0x895d,</div><div class='del'>-	0x6837, 0x0103, 0x6850, 0xd0b4, 0x0040, 0x894c, 0xc0ec, 0x6852,</div><div class='del'>-	0x684b, 0x0006, 0x0078, 0x8957, 0xd0bc, 0x0040, 0x8953, 0x684b,</div><div class='del'>-	0x0002, 0x0078, 0x8957, 0x684b, 0x0005, 0x1078, 0x8f95, 0x6847,</div><div class='del'>-	0x0000, 0x1078, 0x4a73, 0x1078, 0x8ec9, 0x0d7f, 0x1078, 0x772d,</div><div class='del'>-	0x007c, 0x017e, 0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040,</div><div class='del'>-	0x8971, 0x6837, 0x0103, 0x684b, 0x0028, 0x6847, 0x0000, 0x1078,</div><div class='del'>-	0x4a73, 0x0d7f, 0x017f, 0xa186, 0x0013, 0x0040, 0x8983, 0xa186,</div><div class='del'>-	0x0014, 0x0040, 0x8983, 0xa186, 0x0027, 0x0040, 0x8983, 0x1078,</div><div class='del'>-	0x7773, 0x0078, 0x8989, 0x1078, 0x61cd, 0x1078, 0x8ed6, 0x1078,</div><div class='del'>-	0x62d1, 0x007c, 0x057e, 0x067e, 0x0d7e, 0x0f7e, 0x2029, 0x0001,</div><div class='del'>-	0xa182, 0x0101, 0x00c8, 0x8996, 0x0078, 0x8998, 0x2009, 0x0100,</div><div class='del'>-	0x2130, 0x2069, 0xac98, 0x831c, 0x2300, 0xad18, 0x2009, 0x0020,</div><div class='del'>-	0xaf90, 0x001d, 0x1078, 0x89f2, 0xa6b2, 0x0020, 0x7804, 0xa06d,</div><div class='del'>-	0x0040, 0x89ac, 0x1078, 0x13b4, 0x1078, 0x138b, 0x0040, 0x89d6,</div><div class='del'>-	0x8528, 0x6837, 0x0110, 0x683b, 0x0000, 0x2d20, 0x7c06, 0xa68a,</div><div class='del'>-	0x003d, 0x00c8, 0x89c2, 0x2608, 0xad90, 0x000f, 0x1078, 0x89f2,</div><div class='del'>-	0x0078, 0x89d6, 0xa6b2, 0x003c, 0x2009, 0x003c, 0x2d78, 0xad90,</div><div class='del'>-	0x000f, 0x1078, 0x89f2, 0x0078, 0x89ac, 0x0f7f, 0x852f, 0xa5ad,</div><div class='del'>-	0x0003, 0x7d36, 0xa5ac, 0x0000, 0x0078, 0x89db, 0x0f7f, 0x852f,</div><div class='del'>-	0xa5ad, 0x0003, 0x7d36, 0x0d7f, 0x067f, 0x057f, 0x007c, 0x0f7e,</div><div class='del'>-	0x8dff, 0x0040, 0x89f0, 0x6804, 0xa07d, 0x0040, 0x89ee, 0x6807,</div><div class='del'>-	0x0000, 0x1078, 0x4a73, 0x2f68, 0x0078, 0x89e3, 0x1078, 0x4a73,</div><div class='del'>-	0x0f7f, 0x007c, 0x157e, 0xa184, 0x0001, 0x0040, 0x89f8, 0x8108,</div><div class='del'>-	0x810c, 0x21a8, 0x2304, 0x8007, 0x2012, 0x8318, 0x8210, 0x00f0,</div><div class='del'>-	0x89fa, 0x157f, 0x007c, 0x067e, 0x127e, 0x2091, 0x8000, 0x2031,</div><div class='del'>-	0x0001, 0x601c, 0xa084, 0x000f, 0x1079, 0x8a1f, 0x127f, 0x067f,</div><div class='del'>-	0x007c, 0x127e, 0x2091, 0x8000, 0x067e, 0x2031, 0x0000, 0x601c,</div><div class='del'>-	0xa084, 0x000f, 0x1079, 0x8a1f, 0x067f, 0x127f, 0x007c, 0x8a39,</div><div class='del'>-	0x8a27, 0x8a34, 0x8a55, 0x8a27, 0x8a34, 0x8a55, 0x8a34, 0x1078,</div><div class='del'>-	0x1332, 0x037e, 0x2019, 0x0010, 0x1078, 0x9dd7, 0x601f, 0x0006,</div><div class='del'>-	0x6003, 0x0007, 0x037f, 0x007c, 0xa006, 0x007c, 0xa085, 0x0001,</div><div class='del'>-	0x007c, 0x0d7e, 0x86ff, 0x00c0, 0x8a50, 0x6010, 0x2068, 0x1078,</div><div class='del'>-	0x8d16, 0x0040, 0x8a52, 0xa00e, 0x2001, 0x0005, 0x1078, 0x4b51,</div><div class='del'>-	0x1078, 0x8f95, 0x1078, 0x4a73, 0x1078, 0x772d, 0xa085, 0x0001,</div><div class='del'>-	0x0d7f, 0x007c, 0xa006, 0x0078, 0x8a50, 0x6000, 0xa08a, 0x0010,</div><div class='del'>-	0x10c8, 0x1332, 0x1079, 0x8a5d, 0x007c, 0x8a6d, 0x8a92, 0x8a6f,</div><div class='del'>-	0x8ab5, 0x8a8e, 0x8a6d, 0x8a34, 0x8a39, 0x8a39, 0x8a34, 0x8a34,</div><div class='del'>-	0x8a34, 0x8a34, 0x8a34, 0x8a34, 0x8a34, 0x1078, 0x1332, 0x86ff,</div><div class='del'>-	0x00c0, 0x8a8b, 0x601c, 0xa086, 0x0006, 0x0040, 0x8a8b, 0x0d7e,</div><div class='del'>-	0x6010, 0x2068, 0x1078, 0x8d16, 0x0040, 0x8a80, 0x1078, 0x8f95,</div><div class='del'>-	0x0d7f, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x1078,</div><div class='del'>-	0x5d8a, 0x1078, 0x62d1, 0xa085, 0x0001, 0x007c, 0x1078, 0x1757,</div><div class='del'>-	0x0078, 0x8a6f, 0x0e7e, 0x2071, 0xa9b1, 0x7024, 0xac06, 0x00c0,</div><div class='del'>-	0x8a9b, 0x1078, 0x6fc4, 0x601c, 0xa084, 0x000f, 0xa086, 0x0006,</div><div class='del'>-	0x00c0, 0x8aad, 0x087e, 0x097e, 0x2049, 0x0001, 0x2c40, 0x1078,</div><div class='del'>-	0x7246, 0x097f, 0x087f, 0x0078, 0x8aaf, 0x1078, 0x6ebe, 0x0e7f,</div><div class='del'>-	0x00c0, 0x8a6f, 0x1078, 0x8a34, 0x007c, 0x037e, 0x0e7e, 0x2071,</div><div class='del'>-	0xa9b1, 0x703c, 0xac06, 0x00c0, 0x8ac5, 0x2019, 0x0000, 0x1078,</div><div class='del'>-	0x7058, 0x0e7f, 0x037f, 0x0078, 0x8a6f, 0x1078, 0x738a, 0x0e7f,</div><div class='del'>-	0x037f, 0x00c0, 0x8a6f, 0x1078, 0x8a34, 0x007c, 0x0c7e, 0x601c,</div><div class='del'>-	0xa084, 0x000f, 0x1079, 0x8ad6, 0x0c7f, 0x007c, 0x8ae5, 0x8b57,</div><div class='del'>-	0x8c8f, 0x8af0, 0x8ed6, 0x8ae5, 0x9dc8, 0x772d, 0x8b57, 0x1078,</div><div class='del'>-	0x8f10, 0x00c0, 0x8ae5, 0x1078, 0x7c83, 0x007c, 0x1078, 0x61cd,</div><div class='del'>-	0x1078, 0x62d1, 0x1078, 0x772d, 0x007c, 0x6017, 0x0001, 0x007c,</div><div class='del'>-	0x1078, 0x8d16, 0x0040, 0x8af8, 0x6010, 0xa080, 0x0019, 0x2c02,</div><div class='del'>-	0x6000, 0xa08a, 0x0010, 0x10c8, 0x1332, 0x1079, 0x8b00, 0x007c,</div><div class='del'>-	0x8b10, 0x8b12, 0x8b34, 0x8b46, 0x8b53, 0x8b10, 0x8ae5, 0x8ae5,</div><div class='del'>-	0x8ae5, 0x8b46, 0x8b46, 0x8b10, 0x8b10, 0x8b10, 0x8b10, 0x8b50,</div><div class='del'>-	0x1078, 0x1332, 0x0e7e, 0x6010, 0x2070, 0x7050, 0xc0b5, 0x7052,</div><div class='del'>-	0x2071, 0xa9b1, 0x7024, 0xac06, 0x0040, 0x8b30, 0x1078, 0x6ebe,</div><div class='del'>-	0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x2001, 0xa9a3,</div><div class='del'>-	0x2004, 0x6016, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0e7f, 0x007c,</div><div class='del'>-	0x6017, 0x0001, 0x0078, 0x8b2e, 0x0d7e, 0x6010, 0x2068, 0x6850,</div><div class='del'>-	0xc0b5, 0x6852, 0x0d7f, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f,</div><div class='del'>-	0x0002, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x007c, 0x0d7e, 0x6017,</div><div class='del'>-	0x0001, 0x6010, 0x2068, 0x6850, 0xc0b5, 0x6852, 0x0d7f, 0x007c,</div><div class='del'>-	0x1078, 0x772d, 0x007c, 0x1078, 0x1757, 0x0078, 0x8b34, 0x6000,</div><div class='del'>-	0xa08a, 0x0010, 0x10c8, 0x1332, 0x1079, 0x8b5f, 0x007c, 0x8b6f,</div><div class='del'>-	0x8aed, 0x8b71, 0x8b6f, 0x8b71, 0x8b71, 0x8ae6, 0x8b6f, 0x8adf,</div><div class='del'>-	0x8adf, 0x8b6f, 0x8b6f, 0x8b6f, 0x8b6f, 0x8b6f, 0x8b6f, 0x1078,</div><div class='del'>-	0x1332, 0x0d7e, 0x6018, 0x2068, 0x6804, 0xa084, 0x00ff, 0x0d7f,</div><div class='del'>-	0xa08a, 0x000c, 0x10c8, 0x1332, 0x1079, 0x8b7f, 0x007c, 0x8b8b,</div><div class='del'>-	0x8c33, 0x8b8d, 0x8bcd, 0x8b8d, 0x8bcd, 0x8b8d, 0x8b9a, 0x8b8b,</div><div class='del'>-	0x8bcd, 0x8b8b, 0x8bb7, 0x1078, 0x1332, 0x6004, 0xa08e, 0x0016,</div><div class='del'>-	0x0040, 0x8bc8, 0xa08e, 0x0004, 0x0040, 0x8bc8, 0xa08e, 0x0002,</div><div class='del'>-	0x0040, 0x8bc8, 0x6004, 0x1078, 0x8f10, 0x0040, 0x8c4e, 0xa08e,</div><div class='del'>-	0x0021, 0x0040, 0x8c52, 0xa08e, 0x0022, 0x0040, 0x8c4e, 0xa08e,</div><div class='del'>-	0x003d, 0x0040, 0x8c52, 0xa08e, 0x0039, 0x0040, 0x8c56, 0xa08e,</div><div class='del'>-	0x0035, 0x0040, 0x8c56, 0xa08e, 0x001e, 0x0040, 0x8bca, 0xa08e,</div><div class='del'>-	0x0001, 0x00c0, 0x8bc6, 0x0d7e, 0x6018, 0x2068, 0x6804, 0xa084,</div><div class='del'>-	0x00ff, 0x0d7f, 0xa086, 0x0006, 0x0040, 0x8bc8, 0x1078, 0x2880,</div><div class='del'>-	0x1078, 0x7c83, 0x1078, 0x8ed6, 0x007c, 0x0c7e, 0x0d7e, 0x6104,</div><div class='del'>-	0xa186, 0x0016, 0x0040, 0x8c23, 0xa186, 0x0002, 0x00c0, 0x8bf6,</div><div class='del'>-	0x6018, 0x2068, 0x68a0, 0xd0bc, 0x00c0, 0x8c7a, 0x6840, 0xa084,</div><div class='del'>-	0x00ff, 0xa005, 0x0040, 0x8bf6, 0x8001, 0x6842, 0x6013, 0x0000,</div><div class='del'>-	0x601f, 0x0007, 0x6017, 0x0398, 0x1078, 0x76c7, 0x0040, 0x8bf6,</div><div class='del'>-	0x2d00, 0x601a, 0x601f, 0x0001, 0x0078, 0x8c23, 0x0d7f, 0x0c7f,</div><div class='del'>-	0x6004, 0xa08e, 0x0002, 0x00c0, 0x8c14, 0x6018, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0xa086, 0x007e, 0x00c0, 0x8c14, 0x2009, 0xa733, 0x2104,</div><div class='del'>-	0xc085, 0x200a, 0x0e7e, 0x2071, 0xa700, 0x1078, 0x42b8, 0x0e7f,</div><div class='del'>-	0x1078, 0x7c83, 0x0078, 0x8c18, 0x1078, 0x7c83, 0x1078, 0x2880,</div><div class='del'>-	0x0e7e, 0x127e, 0x2091, 0x8000, 0x1078, 0x28a6, 0x127f, 0x0e7f,</div><div class='del'>-	0x1078, 0x8ed6, 0x007c, 0x2001, 0x0002, 0x1078, 0x4502, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0002, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0d7f,</div><div class='del'>-	0x0c7f, 0x0078, 0x8c22, 0x0c7e, 0x0d7e, 0x6104, 0xa186, 0x0016,</div><div class='del'>-	0x0040, 0x8c23, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005,</div><div class='del'>-	0x0040, 0x8bf6, 0x8001, 0x6842, 0x6003, 0x0001, 0x1078, 0x5dd7,</div><div class='del'>-	0x1078, 0x62d1, 0x0d7f, 0x0c7f, 0x0078, 0x8c22, 0x1078, 0x7c83,</div><div class='del'>-	0x0078, 0x8bca, 0x1078, 0x7ca6, 0x0078, 0x8bca, 0x0d7e, 0x2c68,</div><div class='del'>-	0x6104, 0x1078, 0x91cc, 0x0d7f, 0x0040, 0x8c62, 0x1078, 0x772d,</div><div class='del'>-	0x0078, 0x8c79, 0x6004, 0x8007, 0x6130, 0xa18c, 0x00ff, 0xa105,</div><div class='del'>-	0x6032, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x6038,</div><div class='del'>-	0x600a, 0x2001, 0xa9a3, 0x2004, 0x6016, 0x1078, 0x5d8a, 0x1078,</div><div class='del'>-	0x62d1, 0x007c, 0x0d7f, 0x0c7f, 0x1078, 0x7c83, 0x1078, 0x2880,</div><div class='del'>-	0x0e7e, 0x127e, 0x2091, 0x8000, 0x1078, 0x28a6, 0x6013, 0x0000,</div><div class='del'>-	0x601f, 0x0007, 0x6017, 0x0398, 0x127f, 0x0e7f, 0x007c, 0x6000,</div><div class='del'>-	0xa08a, 0x0010, 0x10c8, 0x1332, 0x1079, 0x8c97, 0x007c, 0x8ca7,</div><div class='del'>-	0x8ca7, 0x8ca7, 0x8ca7, 0x8ca7, 0x8ca7, 0x8ca7, 0x8ca7, 0x8ca7,</div><div class='del'>-	0x8ae5, 0x8ca7, 0x8aed, 0x8ca9, 0x8aed, 0x8cb7, 0x8ca7, 0x1078,</div><div class='del'>-	0x1332, 0x6004, 0xa086, 0x008b, 0x0040, 0x8cb7, 0x6007, 0x008b,</div><div class='del'>-	0x6003, 0x000d, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x007c, 0x1078,</div><div class='del'>-	0x8ec9, 0x1078, 0x8d16, 0x0040, 0x8cef, 0x1078, 0x2880, 0x0d7e,</div><div class='del'>-	0x1078, 0x8d16, 0x0040, 0x8cd1, 0x6010, 0x2068, 0x6837, 0x0103,</div><div class='del'>-	0x684b, 0x0006, 0x6847, 0x0000, 0x6850, 0xc0ed, 0x6852, 0x1078,</div><div class='del'>-	0x4a73, 0x2c68, 0x1078, 0x76c7, 0x0040, 0x8cdf, 0x6818, 0x601a,</div><div class='del'>-	0x0c7e, 0x2d60, 0x1078, 0x8ed6, 0x0c7f, 0x0078, 0x8ce0, 0x2d60,</div><div class='del'>-	0x0d7f, 0x6013, 0x0000, 0x601f, 0x0001, 0x6007, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0078, 0x8d01, 0x6030,</div><div class='del'>-	0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0040, 0x8cfb, 0xa186,</div><div class='del'>-	0x0035, 0x00c0, 0x8cff, 0x1078, 0x2880, 0x0078, 0x8cd1, 0x1078,</div><div class='del'>-	0x8ed6, 0x007c, 0xa284, 0x000f, 0x00c0, 0x8d13, 0xa282, 0xae00,</div><div class='del'>-	0x0048, 0x8d13, 0x2001, 0xa716, 0x2004, 0xa202, 0x00c8, 0x8d13,</div><div class='del'>-	0xa085, 0x0001, 0x007c, 0xa006, 0x0078, 0x8d12, 0x027e, 0x0e7e,</div><div class='del'>-	0x2071, 0xa700, 0x6210, 0x705c, 0xa202, 0x0048, 0x8d28, 0x7060,</div><div class='del'>-	0xa202, 0x00c8, 0x8d28, 0xa085, 0x0001, 0x0e7f, 0x027f, 0x007c,</div><div class='del'>-	0xa006, 0x0078, 0x8d25, 0x0e7e, 0x0c7e, 0x037e, 0x007e, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x2061, 0xae00, 0x2071, 0xa700, 0x7348, 0x7064,</div><div class='del'>-	0xa302, 0x00c8, 0x8d55, 0x601c, 0xa206, 0x00c0, 0x8d4d, 0x1078,</div><div class='del'>-	0x903b, 0x0040, 0x8d4d, 0x1078, 0x8f10, 0x00c0, 0x8d49, 0x1078,</div><div class='del'>-	0x7c83, 0x0c7e, 0x1078, 0x772d, 0x0c7f, 0xace0, 0x0010, 0x7058,</div><div class='del'>-	0xac02, 0x00c8, 0x8d55, 0x0078, 0x8d36, 0x127f, 0x007f, 0x037f,</div><div class='del'>-	0x0c7f, 0x0e7f, 0x007c, 0x0e7e, 0x0c7e, 0x017e, 0xa188, 0xa835,</div><div class='del'>-	0x210c, 0x81ff, 0x0040, 0x8d69, 0x2061, 0xaab3, 0x611a, 0x1078,</div><div class='del'>-	0x2880, 0xa006, 0x0078, 0x8d6e, 0xa085, 0x0001, 0x017f, 0x0c7f,</div><div class='del'>-	0x0e7f, 0x007c, 0x0c7e, 0x057e, 0x127e, 0x2091, 0x8000, 0x0c7e,</div><div class='del'>-	0x1078, 0x76c7, 0x057f, 0x0040, 0x8d8b, 0x6612, 0x651a, 0x601f,</div><div class='del'>-	0x0003, 0x2009, 0x004b, 0x1078, 0x775c, 0xa085, 0x0001, 0x127f,</div><div class='del'>-	0x057f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8d87, 0x0c7e, 0x057e,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x62a0, 0x0c7e, 0x1078, 0x76c7, 0x057f,</div><div class='del'>-	0x0040, 0x8db9, 0x6013, 0x0000, 0x651a, 0x601f, 0x0003, 0x0c7e,</div><div class='del'>-	0x2560, 0x1078, 0x47e9, 0x0c7f, 0x1078, 0x5f01, 0x077e, 0x2039,</div><div class='del'>-	0x0000, 0x1078, 0x5e0a, 0x2c08, 0x1078, 0x9f9b, 0x077f, 0x2009,</div><div class='del'>-	0x004c, 0x1078, 0x775c, 0xa085, 0x0001, 0x127f, 0x057f, 0x0c7f,</div><div class='del'>-	0x007c, 0xa006, 0x0078, 0x8db5, 0x0f7e, 0x0c7e, 0x047e, 0x0c7e,</div><div class='del'>-	0x1078, 0x76c7, 0x2c78, 0x0c7f, 0x0040, 0x8dd6, 0x7e12, 0x2c00,</div><div class='del'>-	0x781a, 0x781f, 0x0003, 0x2021, 0x0005, 0x1078, 0x8e21, 0x2f60,</div><div class='del'>-	0x2009, 0x004d, 0x1078, 0x775c, 0xa085, 0x0001, 0x047f, 0x0c7f,</div><div class='del'>-	0x0f7f, 0x007c, 0x0f7e, 0x0c7e, 0x047e, 0x0c7e, 0x1078, 0x76c7,</div><div class='del'>-	0x2c78, 0x0c7f, 0x0040, 0x8df4, 0x7e12, 0x2c00, 0x781a, 0x781f,</div><div class='del'>-	0x0003, 0x2021, 0x0005, 0x1078, 0x8e21, 0x2f60, 0x2009, 0x004e,</div><div class='del'>-	0x1078, 0x775c, 0xa085, 0x0001, 0x047f, 0x0c7f, 0x0f7f, 0x007c,</div><div class='del'>-	0x0f7e, 0x0c7e, 0x047e, 0x0c7e, 0x1078, 0x76c7, 0x2c78, 0x0c7f,</div><div class='del'>-	0x0040, 0x8e1d, 0x7e12, 0x2c00, 0x781a, 0x781f, 0x0003, 0x2021,</div><div class='del'>-	0x0004, 0x1078, 0x8e21, 0x2001, 0xa99d, 0x2004, 0xd0fc, 0x0040,</div><div class='del'>-	0x8e16, 0x2f60, 0x1078, 0x772d, 0x0078, 0x8e1b, 0x2f60, 0x2009,</div><div class='del'>-	0x0052, 0x1078, 0x775c, 0xa085, 0x0001, 0x047f, 0x0c7f, 0x0f7f,</div><div class='del'>-	0x007c, 0x097e, 0x077e, 0x127e, 0x2091, 0x8000, 0x1078, 0x4775,</div><div class='del'>-	0x0040, 0x8e2e, 0x2001, 0x8e26, 0x0078, 0x8e34, 0x1078, 0x4739,</div><div class='del'>-	0x0040, 0x8e3d, 0x2001, 0x8e2e, 0x007e, 0xa00e, 0x2400, 0x1078,</div><div class='del'>-	0x4b51, 0x1078, 0x4a73, 0x007f, 0x007a, 0x2418, 0x1078, 0x6161,</div><div class='del'>-	0x62a0, 0x087e, 0x2041, 0x0001, 0x2039, 0x0001, 0x2608, 0x1078,</div><div class='del'>-	0x5f1b, 0x087f, 0x1078, 0x5e0a, 0x2f08, 0x2648, 0x1078, 0x9f9b,</div><div class='del'>-	0x613c, 0x81ff, 0x1040, 0x5fdb, 0x1078, 0x62d1, 0x127f, 0x077f,</div><div class='del'>-	0x097f, 0x007c, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078,</div><div class='del'>-	0x76c7, 0x017f, 0x0040, 0x8e73, 0x660a, 0x611a, 0x601f, 0x0001,</div><div class='del'>-	0x2d00, 0x6012, 0x2009, 0x001f, 0x1078, 0x775c, 0xa085, 0x0001,</div><div class='del'>-	0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8e70, 0x0c7e, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x8e8f,</div><div class='del'>-	0x660a, 0x611a, 0x601f, 0x0008, 0x2d00, 0x6012, 0x2009, 0x0021,</div><div class='del'>-	0x1078, 0x775c, 0xa085, 0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006,</div><div class='del'>-	0x0078, 0x8e8c, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078,</div><div class='del'>-	0x76c7, 0x017f, 0x0040, 0x8eab, 0x660a, 0x611a, 0x601f, 0x0001,</div><div class='del'>-	0x2d00, 0x6012, 0x2009, 0x003d, 0x1078, 0x775c, 0xa085, 0x0001,</div><div class='del'>-	0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8ea8, 0x0c7e, 0x127e,</div><div class='del'>-	0x2091, 0x8000, 0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x8ec6,</div><div class='del'>-	0x611a, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0000, 0x1078,</div><div class='del'>-	0x775c, 0xa085, 0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078,</div><div class='del'>-	0x8ec3, 0x027e, 0x0d7e, 0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0040,</div><div class='del'>-	0x8ed3, 0x8211, 0x6a3e, 0x0d7f, 0x027f, 0x007c, 0x007e, 0x6000,</div><div class='del'>-	0xa086, 0x0000, 0x0040, 0x8ee8, 0x6013, 0x0000, 0x601f, 0x0007,</div><div class='del'>-	0x2001, 0xa9a3, 0x2004, 0x6016, 0x1078, 0xa4a5, 0x603f, 0x0000,</div><div class='del'>-	0x007f, 0x007c, 0x067e, 0x0c7e, 0x0d7e, 0x2031, 0xa753, 0x2634,</div><div class='del'>-	0xd6e4, 0x0040, 0x8ef8, 0x6618, 0x2660, 0x6e48, 0x1078, 0x46e7,</div><div class='del'>-	0x0d7f, 0x0c7f, 0x067f, 0x007c, 0x007e, 0x017e, 0x6004, 0xa08e,</div><div class='del'>-	0x0002, 0x0040, 0x8f0d, 0xa08e, 0x0003, 0x0040, 0x8f0d, 0xa08e,</div><div class='del'>-	0x0004, 0x0040, 0x8f0d, 0xa085, 0x0001, 0x017f, 0x007f, 0x007c,</div><div class='del'>-	0x007e, 0x0d7e, 0x6010, 0xa06d, 0x0040, 0x8f1d, 0x6838, 0xd0fc,</div><div class='del'>-	0x0040, 0x8f1d, 0xa006, 0x0078, 0x8f1f, 0xa085, 0x0001, 0x0d7f,</div><div class='del'>-	0x007f, 0x007c, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078,</div><div class='del'>-	0x76c7, 0x017f, 0x0040, 0x8f3c, 0x611a, 0x601f, 0x0001, 0x2d00,</div><div class='del'>-	0x6012, 0x1078, 0x2880, 0x2009, 0x0028, 0x1078, 0x775c, 0xa085,</div><div class='del'>-	0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8f39, 0xa186,</div><div class='del'>-	0x0015, 0x00c0, 0x8f54, 0x2011, 0xa720, 0x2204, 0xa086, 0x0074,</div><div class='del'>-	0x00c0, 0x8f54, 0x1078, 0x7f91, 0x6003, 0x0001, 0x6007, 0x0029,</div><div class='del'>-	0x1078, 0x5dd7, 0x0078, 0x8f58, 0x1078, 0x7c83, 0x1078, 0x772d,</div><div class='del'>-	0x007c, 0xa186, 0x0016, 0x00c0, 0x8f63, 0x2001, 0x0004, 0x1078,</div><div class='del'>-	0x4502, 0x0078, 0x8f84, 0xa186, 0x0015, 0x00c0, 0x8f88, 0x2011,</div><div class='del'>-	0xa720, 0x2204, 0xa086, 0x0014, 0x00c0, 0x8f88, 0x0d7e, 0x6018,</div><div class='del'>-	0x2068, 0x1078, 0x4649, 0x0d7f, 0x1078, 0x8043, 0x00c0, 0x8f88,</div><div class='del'>-	0x0d7e, 0x6018, 0x2068, 0x6890, 0x0d7f, 0xa005, 0x0040, 0x8f88,</div><div class='del'>-	0x2001, 0x0006, 0x1078, 0x4502, 0x1078, 0x77f8, 0x0078, 0x8f8c,</div><div class='del'>-	0x1078, 0x7c83, 0x1078, 0x772d, 0x007c, 0x6848, 0xa086, 0x0005,</div><div class='del'>-	0x00c0, 0x8f94, 0x1078, 0x8f95, 0x007c, 0x6850, 0xc0ad, 0x6852,</div><div class='del'>-	0x007c, 0x0e7e, 0x2071, 0xac8c, 0x7014, 0xd0e4, 0x0040, 0x8faa,</div><div class='del'>-	0x6013, 0x0000, 0x6003, 0x0001, 0x6007, 0x0050, 0x1078, 0x5d8a,</div><div class='del'>-	0x1078, 0x62d1, 0x0e7f, 0x007c, 0x0c7e, 0x0f7e, 0x2c78, 0x1078,</div><div class='del'>-	0x4963, 0x0f7f, 0x0040, 0x8fb9, 0x601c, 0xa084, 0x000f, 0x1079,</div><div class='del'>-	0x8fbb, 0x0c7f, 0x007c, 0x8ae5, 0x8fc6, 0x8fc9, 0x8fcc, 0xa26d,</div><div class='del'>-	0xa289, 0xa28c, 0x8ae5, 0x8ae5, 0x1078, 0x1332, 0x0005, 0x0005,</div><div class='del'>-	0x007c, 0x0005, 0x0005, 0x007c, 0x1078, 0x8fcf, 0x007c, 0x0f7e,</div><div class='del'>-	0x2c78, 0x1078, 0x4963, 0x0040, 0x8ffe, 0x1078, 0x76c7, 0x00c0,</div><div class='del'>-	0x8fdf, 0x2001, 0xa9a4, 0x2004, 0x783e, 0x0078, 0x8ffe, 0x7818,</div><div class='del'>-	0x601a, 0x781c, 0xa086, 0x0003, 0x0040, 0x8fec, 0x7808, 0x6036,</div><div class='del'>-	0x2f00, 0x603a, 0x0078, 0x8ff0, 0x7808, 0x603a, 0x2f00, 0x6036,</div><div class='del'>-	0x602a, 0x601f, 0x0001, 0x6007, 0x0035, 0x6003, 0x0001, 0x7920,</div><div class='del'>-	0x6122, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x2f60, 0x0f7f, 0x007c,</div><div class='del'>-	0x017e, 0x0f7e, 0x682c, 0x6032, 0xa08e, 0x0001, 0x0040, 0x9011,</div><div class='del'>-	0xa086, 0x0005, 0x0040, 0x9015, 0xa006, 0x602a, 0x602e, 0x0078,</div><div class='del'>-	0x9026, 0x6824, 0xc0f4, 0xc0d5, 0x6826, 0x6810, 0x2078, 0x787c,</div><div class='del'>-	0x6938, 0xa102, 0x7880, 0x6934, 0xa103, 0x00c8, 0x900c, 0x6834,</div><div class='del'>-	0x602a, 0x6838, 0xa084, 0xfffc, 0x683a, 0x602e, 0x2d00, 0x6036,</div><div class='del'>-	0x6808, 0x603a, 0x6918, 0x611a, 0x6920, 0x6122, 0x601f, 0x0001,</div><div class='del'>-	0x6007, 0x0039, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x6803, 0x0002,</div><div class='del'>-	0x0f7f, 0x017f, 0x007c, 0x007e, 0x017e, 0x6004, 0xa08e, 0x0034,</div><div class='del'>-	0x0040, 0x9060, 0xa08e, 0x0035, 0x0040, 0x9060, 0xa08e, 0x0036,</div><div class='del'>-	0x0040, 0x9060, 0xa08e, 0x0037, 0x0040, 0x9060, 0xa08e, 0x0038,</div><div class='del'>-	0x0040, 0x9060, 0xa08e, 0x0039, 0x0040, 0x9060, 0xa08e, 0x003a,</div><div class='del'>-	0x0040, 0x9060, 0xa08e, 0x003b, 0x0040, 0x9060, 0xa085, 0x0001,</div><div class='del'>-	0x017f, 0x007f, 0x007c, 0x0f7e, 0x2c78, 0x1078, 0x4963, 0x00c0,</div><div class='del'>-	0x906d, 0xa085, 0x0001, 0x0078, 0x907c, 0x6024, 0xd0f4, 0x00c0,</div><div class='del'>-	0x907b, 0xc0f5, 0x6026, 0x6010, 0x2078, 0x7828, 0x603a, 0x782c,</div><div class='del'>-	0x6036, 0x1078, 0x1757, 0xa006, 0x0f7f, 0x007c, 0x007e, 0x017e,</div><div class='del'>-	0x027e, 0x037e, 0x0e7e, 0x2001, 0xa99e, 0x200c, 0x8000, 0x2014,</div><div class='del'>-	0x2001, 0x0032, 0x1078, 0x5c1c, 0x2001, 0xa9a2, 0x82ff, 0x00c0,</div><div class='del'>-	0x9093, 0x2011, 0x0014, 0x2202, 0x2001, 0xa9a0, 0x200c, 0x8000,</div><div class='del'>-	0x2014, 0x2071, 0xa98d, 0x711a, 0x721e, 0x2001, 0x0064, 0x1078,</div><div class='del'>-	0x5c1c, 0x2001, 0xa9a3, 0x82ff, 0x00c0, 0x90a8, 0x2011, 0x0014,</div><div class='del'>-	0x2202, 0x2009, 0xa9a4, 0xa280, 0x000a, 0x200a, 0x1078, 0x498b,</div><div class='del'>-	0x0e7f, 0x037f, 0x027f, 0x017f, 0x007f, 0x007c, 0x007e, 0x0e7e,</div><div class='del'>-	0x2001, 0xa9a2, 0x2003, 0x0028, 0x2001, 0xa9a3, 0x2003, 0x0014,</div><div class='del'>-	0x2071, 0xa98d, 0x701b, 0x0000, 0x701f, 0x07d0, 0x2001, 0xa9a4,</div><div class='del'>-	0x2003, 0x001e, 0x0e7f, 0x007f, 0x007c, 0x0c7e, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x90e5, 0x611a,</div><div class='del'>-	0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0033, 0x1078, 0x775c,</div><div class='del'>-	0xa085, 0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x90e2,</div><div class='del'>-	0x0d7e, 0x0e7e, 0x0f7e, 0x2071, 0xa700, 0xa186, 0x0015, 0x00c0,</div><div class='del'>-	0x9117, 0x7080, 0xa086, 0x0018, 0x00c0, 0x9117, 0x6010, 0x2068,</div><div class='del'>-	0x6a3c, 0xd2e4, 0x00c0, 0x910b, 0x2c78, 0x1078, 0x6490, 0x0040,</div><div class='del'>-	0x911f, 0x706c, 0x6a50, 0xa206, 0x00c0, 0x9113, 0x7070, 0x6a54,</div><div class='del'>-	0xa206, 0x00c0, 0x9113, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009,</div><div class='del'>-	0x0000, 0x1078, 0x28c8, 0x1078, 0x77f8, 0x0078, 0x911b, 0x1078,</div><div class='del'>-	0x7c83, 0x1078, 0x772d, 0x0f7f, 0x0e7f, 0x0d7f, 0x007c, 0x7050,</div><div class='del'>-	0xa080, 0x29c0, 0x2004, 0x6a54, 0xa206, 0x0040, 0x910b, 0x0078,</div><div class='del'>-	0x9113, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078, 0x76c7,</div><div class='del'>-	0x017f, 0x0040, 0x9141, 0x611a, 0x601f, 0x0001, 0x2d00, 0x6012,</div><div class='del'>-	0x2009, 0x0043, 0x1078, 0x775c, 0xa085, 0x0001, 0x127f, 0x0c7f,</div><div class='del'>-	0x007c, 0xa006, 0x0078, 0x913e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2071,</div><div class='del'>-	0xa700, 0xa186, 0x0015, 0x00c0, 0x916a, 0x7080, 0xa086, 0x0004,</div><div class='del'>-	0x00c0, 0x916a, 0x6010, 0xa0e8, 0x000f, 0x2c78, 0x1078, 0x6490,</div><div class='del'>-	0x0040, 0x9172, 0x706c, 0x6a08, 0xa206, 0x00c0, 0x9166, 0x7070,</div><div class='del'>-	0x6a0c, 0xa206, 0x00c0, 0x9166, 0x1078, 0x2880, 0x1078, 0x77f8,</div><div class='del'>-	0x0078, 0x916e, 0x1078, 0x7c83, 0x1078, 0x772d, 0x0f7f, 0x0e7f,</div><div class='del'>-	0x0d7f, 0x007c, 0x7050, 0xa080, 0x29c0, 0x2004, 0x6a0c, 0xa206,</div><div class='del'>-	0x0040, 0x9164, 0x0078, 0x9166, 0x017e, 0x027e, 0x684c, 0xd0ac,</div><div class='del'>-	0x0040, 0x9194, 0x6914, 0x6a10, 0x2100, 0xa205, 0x0040, 0x9194,</div><div class='del'>-	0x6860, 0xa106, 0x00c0, 0x9190, 0x685c, 0xa206, 0x0040, 0x9194,</div><div class='del'>-	0x6962, 0x6a5e, 0xa085, 0x0001, 0x027f, 0x017f, 0x007c, 0x0e7e,</div><div class='del'>-	0x127e, 0x2071, 0xa700, 0x2091, 0x8000, 0x7548, 0xa582, 0x0001,</div><div class='del'>-	0x0048, 0x91c9, 0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0040,</div><div class='del'>-	0x91b5, 0xace0, 0x0010, 0x7058, 0xac02, 0x00c8, 0x91b1, 0x0078,</div><div class='del'>-	0x91a4, 0x2061, 0xae00, 0x0078, 0x91a4, 0x6003, 0x0008, 0x8529,</div><div class='del'>-	0x754a, 0xaca8, 0x0010, 0x7058, 0xa502, 0x00c8, 0x91c5, 0x754e,</div><div class='del'>-	0xa085, 0x0001, 0x127f, 0x0e7f, 0x007c, 0x704f, 0xae00, 0x0078,</div><div class='del'>-	0x91c0, 0xa006, 0x0078, 0x91c2, 0x0c7e, 0x027e, 0x017e, 0xa186,</div><div class='del'>-	0x0035, 0x0040, 0x91d6, 0x6a34, 0x0078, 0x91d7, 0x6a28, 0x1078,</div><div class='del'>-	0x8d02, 0x0040, 0x9200, 0x2260, 0x611c, 0xa186, 0x0003, 0x0040,</div><div class='del'>-	0x91e5, 0xa186, 0x0006, 0x00c0, 0x91fc, 0x6834, 0xa206, 0x0040,</div><div class='del'>-	0x91f4, 0x6838, 0xa206, 0x00c0, 0x91fc, 0x6108, 0x6834, 0xa106,</div><div class='del'>-	0x00c0, 0x91fc, 0x0078, 0x91f9, 0x6008, 0x6938, 0xa106, 0x00c0,</div><div class='del'>-	0x91fc, 0x6018, 0x6918, 0xa106, 0x017f, 0x027f, 0x0c7f, 0x007c,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x91fc, 0x6944, 0xd1cc, 0x0040, 0x921d,</div><div class='del'>-	0xa18c, 0x00ff, 0xa18e, 0x0002, 0x00c0, 0x921d, 0xad88, 0x001e,</div><div class='del'>-	0x210c, 0xa18c, 0x0f00, 0x810f, 0xa18e, 0x0001, 0x00c0, 0x921d,</div><div class='del'>-	0x6810, 0x6914, 0xa115, 0x10c0, 0x84e2, 0x007c, 0x067e, 0x6000,</div><div class='del'>-	0xa0b2, 0x0010, 0x10c8, 0x1332, 0x1079, 0x9228, 0x067f, 0x007c,</div><div class='del'>-	0x9238, 0x96ef, 0x980b, 0x9238, 0x9238, 0x9238, 0x9238, 0x9238,</div><div class='del'>-	0x9272, 0x989e, 0x9238, 0x9238, 0x9238, 0x9238, 0x9238, 0x9238,</div><div class='del'>-	0x1078, 0x1332, 0x067e, 0x6000, 0xa0b2, 0x0010, 0x10c8, 0x1332,</div><div class='del'>-	0x1079, 0x9244, 0x067f, 0x007c, 0x9254, 0x9d63, 0x9254, 0x9254,</div><div class='del'>-	0x9254, 0x9254, 0x9254, 0x9254, 0x9d21, 0x9db1, 0x9254, 0xa3c0,</div><div class='del'>-	0xa3f4, 0xa3c0, 0xa3f4, 0x9254, 0x1078, 0x1332, 0x067e, 0x6000,</div><div class='del'>-	0xa0b2, 0x0010, 0x10c8, 0x1332, 0x1079, 0x9260, 0x067f, 0x007c,</div><div class='del'>-	0x9270, 0x99fb, 0x9ad7, 0x9b05, 0x9b80, 0x9270, 0x9c86, 0x9c2e,</div><div class='del'>-	0x98aa, 0x9cf5, 0x9d0b, 0x9270, 0x9270, 0x9270, 0x9270, 0x9270,</div><div class='del'>-	0x1078, 0x1332, 0xa1b2, 0x0044, 0x10c8, 0x1332, 0x2100, 0x0079,</div><div class='del'>-	0x9279, 0x92b9, 0x94a8, 0x92b9, 0x92b9, 0x92b9, 0x94b0, 0x92b9,</div><div class='del'>-	0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9,</div><div class='del'>-	0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9,</div><div class='del'>-	0x92bb, 0x9321, 0x9330, 0x9387, 0x93a6, 0x9425, 0x9495, 0x92b9,</div><div class='del'>-	0x92b9, 0x94b4, 0x92b9, 0x92b9, 0x94c7, 0x94d2, 0x92b9, 0x92b9,</div><div class='del'>-	0x92b9, 0x92b9, 0x92b9, 0x950a, 0x92b9, 0x92b9, 0x9519, 0x92b9,</div><div class='del'>-	0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x9532, 0x92b9, 0x92b9,</div><div class='del'>-	0x92b9, 0x95bf, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9, 0x92b9,</div><div class='del'>-	0x9639, 0x1078, 0x1332, 0x1078, 0x4967, 0x00c0, 0x92cb, 0x2001,</div><div class='del'>-	0xa733, 0x2004, 0xd0cc, 0x00c0, 0x92cb, 0xa084, 0x0009, 0xa086,</div><div class='del'>-	0x0008, 0x00c0, 0x92d3, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013,</div><div class='del'>-	0x0000, 0x0078, 0x94a3, 0x1078, 0x4957, 0x0e7e, 0x0c7e, 0x037e,</div><div class='del'>-	0x027e, 0x017e, 0x6218, 0x2270, 0x72a0, 0x027e, 0x2019, 0x0029,</div><div class='del'>-	0x1078, 0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a, 0x2c08,</div><div class='del'>-	0x1078, 0x9f9b, 0x077f, 0x017f, 0x2e60, 0x1078, 0x47e9, 0x017f,</div><div class='del'>-	0x027f, 0x037f, 0x0c7f, 0x0e7f, 0x6618, 0x0c7e, 0x2660, 0x1078,</div><div class='del'>-	0x45d6, 0x0c7f, 0xa6b0, 0x0001, 0x2634, 0xa684, 0x00ff, 0xa082,</div><div class='del'>-	0x0006, 0x0048, 0x9313, 0x1078, 0x9ecf, 0x00c0, 0x9381, 0x1078,</div><div class='del'>-	0x9e60, 0x00c0, 0x930f, 0x6007, 0x0008, 0x0078, 0x94a3, 0x6007,</div><div class='del'>-	0x0009, 0x0078, 0x94a3, 0x1078, 0xa0af, 0x0040, 0x931d, 0x1078,</div><div class='del'>-	0x9ecf, 0x0040, 0x9307, 0x0078, 0x9381, 0x6013, 0x1900, 0x0078,</div><div class='del'>-	0x930f, 0x1078, 0x29bb, 0x00c0, 0x9674, 0x6106, 0x1078, 0x9e15,</div><div class='del'>-	0x6007, 0x0006, 0x0078, 0x94a3, 0x6007, 0x0007, 0x0078, 0x94a3,</div><div class='del'>-	0x1078, 0xa42c, 0x00c0, 0x9674, 0x1078, 0x29bb, 0x00c0, 0x9674,</div><div class='del'>-	0x0d7e, 0x6618, 0x2668, 0x6e04, 0xa684, 0x00ff, 0xa082, 0x0006,</div><div class='del'>-	0x00c8, 0x9346, 0x2001, 0x0001, 0x1078, 0x44ee, 0xa6b4, 0xff00,</div><div class='del'>-	0x8637, 0xa686, 0x0006, 0x0040, 0x9363, 0xa686, 0x0004, 0x0040,</div><div class='del'>-	0x9363, 0x6e04, 0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0040, 0x9363,</div><div class='del'>-	0xa686, 0x0004, 0x0040, 0x9363, 0xa686, 0x0005, 0x0040, 0x9363,</div><div class='del'>-	0x0d7f, 0x0078, 0x9381, 0x1078, 0x9f35, 0x00c0, 0x937c, 0xa686,</div><div class='del'>-	0x0006, 0x00c0, 0x9375, 0x027e, 0x6218, 0xa290, 0x0028, 0x2214,</div><div class='del'>-	0x2009, 0x0000, 0x1078, 0x28c8, 0x027f, 0x1078, 0x4649, 0x6007,</div><div class='del'>-	0x000a, 0x0d7f, 0x0078, 0x94a3, 0x6007, 0x000b, 0x0d7f, 0x0078,</div><div class='del'>-	0x94a3, 0x1078, 0x2880, 0x6007, 0x0001, 0x0078, 0x94a3, 0x1078,</div><div class='del'>-	0xa42c, 0x00c0, 0x9674, 0x1078, 0x29bb, 0x00c0, 0x9674, 0x6618,</div><div class='del'>-	0x0d7e, 0x2668, 0x6e04, 0x0d7f, 0xa686, 0x0707, 0x0040, 0x9381,</div><div class='del'>-	0x027e, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009, 0x0000, 0x1078,</div><div class='del'>-	0x28c8, 0x027f, 0x6007, 0x000c, 0x0078, 0x94a3, 0x1078, 0x4967,</div><div class='del'>-	0x00c0, 0x93b3, 0x2001, 0xa733, 0x2004, 0xa084, 0x0009, 0xa086,</div><div class='del'>-	0x0008, 0x00c0, 0x93bb, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013,</div><div class='del'>-	0x0000, 0x0078, 0x94a3, 0x1078, 0x4957, 0x6618, 0xa6b0, 0x0001,</div><div class='del'>-	0x2634, 0xa684, 0x00ff, 0xa082, 0x0006, 0x0048, 0x93ff, 0xa6b4,</div><div class='del'>-	0xff00, 0x8637, 0xa686, 0x0004, 0x0040, 0x93d2, 0xa686, 0x0006,</div><div class='del'>-	0x00c0, 0x9381, 0x1078, 0x9f44, 0x00c0, 0x93da, 0x6007, 0x000e,</div><div class='del'>-	0x0078, 0x94a3, 0x047e, 0x6418, 0xa4a0, 0x0028, 0x2424, 0xa4a4,</div><div class='del'>-	0x00ff, 0x8427, 0x047e, 0x1078, 0x2880, 0x047f, 0x017e, 0xa006,</div><div class='del'>-	0x2009, 0xa753, 0x210c, 0xd1a4, 0x0040, 0x93f9, 0x2009, 0x0029,</div><div class='del'>-	0x1078, 0xa22d, 0x6018, 0x0d7e, 0x2068, 0x6800, 0xc0e5, 0x6802,</div><div class='del'>-	0x0d7f, 0x017f, 0x047f, 0x6007, 0x0001, 0x0078, 0x94a3, 0x2001,</div><div class='del'>-	0x0001, 0x1078, 0x44ee, 0x157e, 0x017e, 0x027e, 0x037e, 0x20a9,</div><div class='del'>-	0x0004, 0x2019, 0xa705, 0x2011, 0xac90, 0x1078, 0x80de, 0x037f,</div><div class='del'>-	0x027f, 0x017f, 0x157f, 0xa005, 0x0040, 0x941f, 0xa6b4, 0xff00,</div><div class='del'>-	0x8637, 0xa686, 0x0006, 0x0040, 0x93d2, 0x0078, 0x9381, 0x6013,</div><div class='del'>-	0x1900, 0x6007, 0x0009, 0x0078, 0x94a3, 0x1078, 0x4967, 0x00c0,</div><div class='del'>-	0x9432, 0x2001, 0xa733, 0x2004, 0xa084, 0x0009, 0xa086, 0x0008,</div><div class='del'>-	0x00c0, 0x943a, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013, 0x0000,</div><div class='del'>-	0x0078, 0x94a3, 0x1078, 0x4957, 0x6618, 0xa6b0, 0x0001, 0x2634,</div><div class='del'>-	0xa684, 0x00ff, 0xa082, 0x0006, 0x0048, 0x9482, 0xa6b4, 0xff00,</div><div class='del'>-	0x8637, 0xa686, 0x0004, 0x0040, 0x9451, 0xa686, 0x0006, 0x00c0,</div><div class='del'>-	0x9381, 0x1078, 0x9f6f, 0x00c0, 0x945d, 0x1078, 0x9e60, 0x00c0,</div><div class='del'>-	0x945d, 0x6007, 0x0010, 0x0078, 0x94a3, 0x047e, 0x6418, 0xa4a0,</div><div class='del'>-	0x0028, 0x2424, 0xa4a4, 0x00ff, 0x8427, 0x047e, 0x1078, 0x2880,</div><div class='del'>-	0x047f, 0x017e, 0xa006, 0x2009, 0xa753, 0x210c, 0xd1a4, 0x0040,</div><div class='del'>-	0x947c, 0x2009, 0x0029, 0x1078, 0xa22d, 0x6018, 0x0d7e, 0x2068,</div><div class='del'>-	0x6800, 0xc0e5, 0x6802, 0x0d7f, 0x017f, 0x047f, 0x6007, 0x0001,</div><div class='del'>-	0x0078, 0x94a3, 0x1078, 0xa0af, 0x0040, 0x948f, 0xa6b4, 0xff00,</div><div class='del'>-	0x8637, 0xa686, 0x0006, 0x0040, 0x9451, 0x0078, 0x9381, 0x6013,</div><div class='del'>-	0x1900, 0x6007, 0x0009, 0x0078, 0x94a3, 0x1078, 0x29bb, 0x00c0,</div><div class='del'>-	0x9674, 0x1078, 0xa42c, 0x00c0, 0x9674, 0x1078, 0x9677, 0x00c0,</div><div class='del'>-	0x9381, 0x6007, 0x0012, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x007c,</div><div class='del'>-	0x6007, 0x0001, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x0078, 0x94a7,</div><div class='del'>-	0x6007, 0x0005, 0x0078, 0x94aa, 0x1078, 0xa42c, 0x00c0, 0x9674,</div><div class='del'>-	0x1078, 0x29bb, 0x00c0, 0x9674, 0x1078, 0x9677, 0x00c0, 0x9381,</div><div class='del'>-	0x6007, 0x0020, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x007c, 0x1078,</div><div class='del'>-	0x29bb, 0x00c0, 0x9674, 0x6007, 0x0023, 0x6003, 0x0001, 0x1078,</div><div class='del'>-	0x5dd7, 0x007c, 0x1078, 0xa42c, 0x00c0, 0x9674, 0x1078, 0x29bb,</div><div class='del'>-	0x00c0, 0x9674, 0x1078, 0x9677, 0x00c0, 0x9381, 0x017e, 0x027e,</div><div class='del'>-	0x2011, 0xac90, 0x2214, 0x2c08, 0xa006, 0x1078, 0xa1f6, 0x00c0,</div><div class='del'>-	0x94f9, 0x2160, 0x6007, 0x0026, 0x6013, 0x1700, 0x2011, 0xac89,</div><div class='del'>-	0x2214, 0xa296, 0xffff, 0x00c0, 0x9503, 0x6007, 0x0025, 0x0078,</div><div class='del'>-	0x9503, 0x6004, 0xa086, 0x0024, 0x00c0, 0x9500, 0x1078, 0x772d,</div><div class='del'>-	0x2160, 0x6007, 0x0025, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x027f,</div><div class='del'>-	0x017f, 0x007c, 0x1078, 0x29bb, 0x00c0, 0x9674, 0x6106, 0x1078,</div><div class='del'>-	0x9697, 0x6007, 0x002b, 0x0078, 0x94a3, 0x6007, 0x002c, 0x0078,</div><div class='del'>-	0x94a3, 0x1078, 0xa42c, 0x00c0, 0x9674, 0x1078, 0x29bb, 0x00c0,</div><div class='del'>-	0x9674, 0x1078, 0x9677, 0x00c0, 0x9381, 0x6106, 0x1078, 0x969c,</div><div class='del'>-	0x00c0, 0x952e, 0x6007, 0x002e, 0x0078, 0x94a3, 0x6007, 0x002f,</div><div class='del'>-	0x0078, 0x94a3, 0x1078, 0x29bb, 0x00c0, 0x9674, 0x0e7e, 0x0d7e,</div><div class='del'>-	0x0c7e, 0x6018, 0xa080, 0x0001, 0x200c, 0xa184, 0x00ff, 0xa086,</div><div class='del'>-	0x0006, 0x0040, 0x954f, 0xa184, 0xff00, 0x8007, 0xa086, 0x0006,</div><div class='del'>-	0x0040, 0x954f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0078, 0x94a8, 0x2001,</div><div class='del'>-	0xa772, 0x2004, 0xd0e4, 0x0040, 0x95bb, 0x2071, 0xac8c, 0x7010,</div><div class='del'>-	0x6036, 0x7014, 0x603a, 0x7108, 0x720c, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0a4, 0x0040, 0x956d, 0x6018, 0x2068, 0x6810, 0xa106, 0x00c0,</div><div class='del'>-	0x956d, 0x6814, 0xa206, 0x0040, 0x9591, 0x2001, 0xa753, 0x2004,</div><div class='del'>-	0xd0ac, 0x00c0, 0x95af, 0x2069, 0xa700, 0x6870, 0xa206, 0x00c0,</div><div class='del'>-	0x95af, 0x686c, 0xa106, 0x00c0, 0x95af, 0x7210, 0x1078, 0x8d02,</div><div class='del'>-	0x0040, 0x95b5, 0x1078, 0xa29e, 0x0040, 0x95b5, 0x622a, 0x6007,</div><div class='del'>-	0x0036, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x0c7f, 0x0d7f, 0x0e7f,</div><div class='del'>-	0x007c, 0x7214, 0xa286, 0xffff, 0x0040, 0x95a3, 0x1078, 0x8d02,</div><div class='del'>-	0x0040, 0x95b5, 0xa280, 0x0002, 0x2004, 0x7110, 0xa106, 0x00c0,</div><div class='del'>-	0x95b5, 0x0078, 0x957e, 0x7210, 0x2c08, 0xa085, 0x0001, 0x1078,</div><div class='del'>-	0xa1f6, 0x2c10, 0x2160, 0x0040, 0x95b5, 0x0078, 0x957e, 0x6007,</div><div class='del'>-	0x0037, 0x6013, 0x1500, 0x0078, 0x9589, 0x6007, 0x0037, 0x6013,</div><div class='del'>-	0x1700, 0x0078, 0x9589, 0x6007, 0x0012, 0x0078, 0x9589, 0x1078,</div><div class='del'>-	0x29bb, 0x00c0, 0x9674, 0x6018, 0xa080, 0x0001, 0x2004, 0xa084,</div><div class='del'>-	0xff00, 0x8007, 0xa086, 0x0006, 0x00c0, 0x94a8, 0x0e7e, 0x0d7e,</div><div class='del'>-	0x0c7e, 0x2001, 0xa772, 0x2004, 0xd0e4, 0x0040, 0x9631, 0x2069,</div><div class='del'>-	0xa700, 0x2071, 0xac8c, 0x7008, 0x6036, 0x720c, 0x623a, 0xa286,</div><div class='del'>-	0xffff, 0x00c0, 0x95ee, 0x7208, 0x0c7e, 0x2c08, 0xa085, 0x0001,</div><div class='del'>-	0x1078, 0xa1f6, 0x2c10, 0x0c7f, 0x0040, 0x9625, 0x1078, 0x8d02,</div><div class='del'>-	0x0040, 0x9625, 0x0c7e, 0x027e, 0x2260, 0x1078, 0x8a03, 0x027f,</div><div class='del'>-	0x0c7f, 0x7118, 0xa18c, 0xff00, 0x810f, 0xa186, 0x0001, 0x0040,</div><div class='del'>-	0x960f, 0xa186, 0x0005, 0x0040, 0x9609, 0xa186, 0x0007, 0x00c0,</div><div class='del'>-	0x9619, 0xa280, 0x0004, 0x2004, 0xa005, 0x0040, 0x9619, 0x057e,</div><div class='del'>-	0x7510, 0x7614, 0x1078, 0xa2b3, 0x057f, 0x0c7f, 0x0d7f, 0x0e7f,</div><div class='del'>-	0x007c, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013, 0x2a00, 0x6003,</div><div class='del'>-	0x0001, 0x1078, 0x5d8a, 0x0078, 0x9615, 0x6007, 0x003b, 0x602b,</div><div class='del'>-	0x0009, 0x6013, 0x1700, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x0078,</div><div class='del'>-	0x9615, 0x6007, 0x003b, 0x602b, 0x000b, 0x6013, 0x0000, 0x0078,</div><div class='del'>-	0x9589, 0x0e7e, 0x027e, 0x1078, 0x4967, 0x0040, 0x966e, 0x1078,</div><div class='del'>-	0x4957, 0x1078, 0xa4b9, 0x00c0, 0x966c, 0x2071, 0xa700, 0x70cc,</div><div class='del'>-	0xc085, 0x70ce, 0x0f7e, 0x2079, 0x0100, 0x7298, 0xa284, 0x00ff,</div><div class='del'>-	0x706e, 0x78e6, 0xa284, 0xff00, 0x7270, 0xa205, 0x7072, 0x78ea,</div><div class='del'>-	0x0f7f, 0x70d7, 0x0000, 0x2001, 0xa753, 0x2004, 0xd0a4, 0x0040,</div><div class='del'>-	0x9665, 0x2011, 0xa9ca, 0x2013, 0x07d0, 0xd0ac, 0x00c0, 0x966e,</div><div class='del'>-	0x1078, 0x2677, 0x0078, 0x966e, 0x1078, 0xa4e9, 0x027f, 0x0e7f,</div><div class='del'>-	0x1078, 0x772d, 0x0078, 0x94a7, 0x1078, 0x772d, 0x007c, 0x0d7e,</div><div class='del'>-	0x067e, 0x6618, 0x2668, 0x6e04, 0xa6b4, 0xff00, 0x8637, 0xa686,</div><div class='del'>-	0x0006, 0x0040, 0x9694, 0xa686, 0x0004, 0x0040, 0x9694, 0x6e04,</div><div class='del'>-	0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0040, 0x9694, 0xa686, 0x0004,</div><div class='del'>-	0x0040, 0x9694, 0xa085, 0x0001, 0x067f, 0x0d7f, 0x007c, 0x0d7e,</div><div class='del'>-	0x1078, 0x96cb, 0x0d7f, 0x007c, 0x0d7e, 0x1078, 0x96da, 0x00c0,</div><div class='del'>-	0x96c4, 0x680c, 0xa08c, 0xff00, 0x6820, 0xa084, 0x00ff, 0xa115,</div><div class='del'>-	0x6212, 0x6824, 0x602a, 0xd1e4, 0x0040, 0x96b2, 0x2009, 0x0001,</div><div class='del'>-	0x0078, 0x96c0, 0xd1ec, 0x0040, 0x96c4, 0x6920, 0xa18c, 0x00ff,</div><div class='del'>-	0x6824, 0x1078, 0x254d, 0x00c0, 0x96c4, 0x2110, 0x2009, 0x0000,</div><div class='del'>-	0x1078, 0x28c8, 0x0078, 0x96c8, 0xa085, 0x0001, 0x0078, 0x96c9,</div><div class='del'>-	0xa006, 0x0d7f, 0x007c, 0x2069, 0xac8d, 0x6800, 0xa082, 0x0010,</div><div class='del'>-	0x00c8, 0x96d8, 0x6013, 0x0000, 0xa085, 0x0001, 0x0078, 0x96d9,</div><div class='del'>-	0xa006, 0x007c, 0x6013, 0x0000, 0x2069, 0xac8c, 0x6808, 0xa084,</div><div class='del'>-	0xff00, 0xa086, 0x0800, 0x00c0, 0x96ee, 0x6800, 0xa084, 0x00ff,</div><div class='del'>-	0xa08e, 0x0014, 0x0040, 0x96ee, 0xa08e, 0x0010, 0x007c, 0x6004,</div><div class='del'>-	0xa0b2, 0x0044, 0x10c8, 0x1332, 0xa1b6, 0x0013, 0x00c0, 0x96fb,</div><div class='del'>-	0x2008, 0x0079, 0x970e, 0xa1b6, 0x0027, 0x0040, 0x9703, 0xa1b6,</div><div class='del'>-	0x0014, 0x10c0, 0x1332, 0x2001, 0x0007, 0x1078, 0x4535, 0x1078,</div><div class='del'>-	0x61cd, 0x1078, 0x8ed6, 0x1078, 0x62d1, 0x007c, 0x974e, 0x9750,</div><div class='del'>-	0x974e, 0x974e, 0x974e, 0x9750, 0x975c, 0x97e6, 0x97a9, 0x97e6,</div><div class='del'>-	0x97bd, 0x97e6, 0x975c, 0x97e6, 0x97de, 0x97e6, 0x97de, 0x97e6,</div><div class='del'>-	0x97e6, 0x974e, 0x974e, 0x974e, 0x974e, 0x974e, 0x974e, 0x974e,</div><div class='del'>-	0x974e, 0x974e, 0x974e, 0x974e, 0x9750, 0x974e, 0x97e6, 0x974e,</div><div class='del'>-	0x974e, 0x97e6, 0x974e, 0x97e6, 0x97e6, 0x974e, 0x974e, 0x974e,</div><div class='del'>-	0x974e, 0x97e6, 0x97e6, 0x974e, 0x97e6, 0x97e6, 0x974e, 0x974e,</div><div class='del'>-	0x974e, 0x974e, 0x974e, 0x9750, 0x97e6, 0x97e6, 0x974e, 0x974e,</div><div class='del'>-	0x97e6, 0x97e6, 0x974e, 0x974e, 0x974e, 0x974e, 0x1078, 0x1332,</div><div class='del'>-	0x1078, 0x61cd, 0x2001, 0xa9a2, 0x2004, 0x6016, 0x6003, 0x0002,</div><div class='del'>-	0x1078, 0x62d1, 0x0078, 0x97ec, 0x0f7e, 0x2079, 0xa752, 0x7804,</div><div class='del'>-	0x0f7f, 0xd0ac, 0x00c0, 0x97e6, 0x2001, 0x0000, 0x1078, 0x44ee,</div><div class='del'>-	0x6018, 0xa080, 0x0004, 0x2004, 0xa086, 0x00ff, 0x0040, 0x97e6,</div><div class='del'>-	0x0c7e, 0x6018, 0x2060, 0x6000, 0xd0f4, 0x00c0, 0x9780, 0x6010,</div><div class='del'>-	0xa005, 0x0040, 0x9780, 0x0c7f, 0x1078, 0x3699, 0x0078, 0x97e6,</div><div class='del'>-	0x0c7f, 0x2001, 0xa700, 0x2004, 0xa086, 0x0002, 0x00c0, 0x978f,</div><div class='del'>-	0x0f7e, 0x2079, 0xa700, 0x7890, 0x8000, 0x7892, 0x0f7f, 0x2001,</div><div class='del'>-	0x0002, 0x1078, 0x4502, 0x1078, 0x61cd, 0x601f, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0002, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0c7e,</div><div class='del'>-	0x6118, 0x2160, 0x2009, 0x0001, 0x1078, 0x5a52, 0x0c7f, 0x0078,</div><div class='del'>-	0x97ec, 0x6618, 0x0d7e, 0x2668, 0x6e04, 0x0d7f, 0xa6b4, 0xff00,</div><div class='del'>-	0x8637, 0xa686, 0x0006, 0x0040, 0x97e6, 0xa686, 0x0004, 0x0040,</div><div class='del'>-	0x97e6, 0x2001, 0x0004, 0x0078, 0x97e4, 0x2001, 0xa700, 0x2004,</div><div class='del'>-	0xa086, 0x0003, 0x00c0, 0x97c6, 0x1078, 0x3699, 0x2001, 0x0006,</div><div class='del'>-	0x1078, 0x97ed, 0x6618, 0x0d7e, 0x2668, 0x6e04, 0x0d7f, 0xa6b4,</div><div class='del'>-	0xff00, 0x8637, 0xa686, 0x0006, 0x0040, 0x97e6, 0x2001, 0x0006,</div><div class='del'>-	0x0078, 0x97e4, 0x2001, 0x0004, 0x0078, 0x97e4, 0x2001, 0x0006,</div><div class='del'>-	0x1078, 0x97ed, 0x0078, 0x97e6, 0x1078, 0x4535, 0x1078, 0x61cd,</div><div class='del'>-	0x1078, 0x772d, 0x1078, 0x62d1, 0x007c, 0x017e, 0x0d7e, 0x6118,</div><div class='del'>-	0x2168, 0x6900, 0xd184, 0x0040, 0x9808, 0x6104, 0xa18e, 0x000a,</div><div class='del'>-	0x00c0, 0x9800, 0x699c, 0xd1a4, 0x00c0, 0x9800, 0x2001, 0x0007,</div><div class='del'>-	0x1078, 0x4502, 0x2001, 0x0000, 0x1078, 0x44ee, 0x1078, 0x28a6,</div><div class='del'>-	0x0d7f, 0x017f, 0x007c, 0x0d7e, 0x6618, 0x2668, 0x6804, 0xa084,</div><div class='del'>-	0xff00, 0x8007, 0x0d7f, 0xa0b2, 0x000c, 0x10c8, 0x1332, 0xa1b6,</div><div class='del'>-	0x0015, 0x00c0, 0x981f, 0x1079, 0x9826, 0x0078, 0x9825, 0xa1b6,</div><div class='del'>-	0x0016, 0x10c0, 0x1332, 0x1079, 0x9832, 0x007c, 0x7d4e, 0x7d4e,</div><div class='del'>-	0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x9887, 0x983e, 0x7d4e, 0x7d4e,</div><div class='del'>-	0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e,</div><div class='del'>-	0x9887, 0x988f, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x0f7e, 0x2079,</div><div class='del'>-	0xa752, 0x7804, 0xd0ac, 0x00c0, 0x9865, 0x6018, 0xa07d, 0x0040,</div><div class='del'>-	0x9865, 0x7800, 0xd0f4, 0x00c0, 0x9851, 0x7810, 0xa005, 0x00c0,</div><div class='del'>-	0x9865, 0x2001, 0x0000, 0x1078, 0x44ee, 0x2001, 0x0002, 0x1078,</div><div class='del'>-	0x4502, 0x601f, 0x0001, 0x6003, 0x0001, 0x6007, 0x0002, 0x1078,</div><div class='del'>-	0x5dd7, 0x1078, 0x62d1, 0x0078, 0x9885, 0x2011, 0xac83, 0x2204,</div><div class='del'>-	0x8211, 0x220c, 0x1078, 0x254d, 0x00c0, 0x9885, 0x0c7e, 0x1078,</div><div class='del'>-	0x45c4, 0x0040, 0x9878, 0x0c7f, 0x1078, 0x772d, 0x0078, 0x9885,</div><div class='del'>-	0x6010, 0x007e, 0x6014, 0x007e, 0x1078, 0x42f8, 0x007f, 0x6016,</div><div class='del'>-	0x007f, 0x6012, 0x0c7f, 0x1078, 0x772d, 0x0f7f, 0x007c, 0x6604,</div><div class='del'>-	0xa6b6, 0x001e, 0x00c0, 0x988e, 0x1078, 0x772d, 0x007c, 0x1078,</div><div class='del'>-	0x7f8e, 0x00c0, 0x989b, 0x6003, 0x0001, 0x6007, 0x0001, 0x1078,</div><div class='del'>-	0x5dd7, 0x0078, 0x989d, 0x1078, 0x772d, 0x007c, 0x6004, 0xa08a,</div><div class='del'>-	0x0044, 0x10c8, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ed6, 0x1078,</div><div class='del'>-	0x62d1, 0x007c, 0xa182, 0x0040, 0x0079, 0x98ae, 0x98c1, 0x98c1,</div><div class='del'>-	0x98c1, 0x98c1, 0x98c3, 0x98c1, 0x98c1, 0x98c1, 0x98c1, 0x98c1,</div><div class='del'>-	0x98c1, 0x98c1, 0x98c1, 0x98c1, 0x98c1, 0x98c1, 0x98c1, 0x98c1,</div><div class='del'>-	0x98c1, 0x1078, 0x1332, 0x0d7e, 0x0e7e, 0x0f7e, 0x157e, 0x047e,</div><div class='del'>-	0x027e, 0x6218, 0xa280, 0x002b, 0x2004, 0xa005, 0x0040, 0x98d4,</div><div class='del'>-	0x2021, 0x0000, 0x1078, 0xa482, 0x6106, 0x2071, 0xac80, 0x7444,</div><div class='del'>-	0xa4a4, 0xff00, 0x0040, 0x992b, 0xa486, 0x2000, 0x00c0, 0x98e6,</div><div class='del'>-	0x2009, 0x0001, 0x2011, 0x0200, 0x1078, 0x5bf1, 0x1078, 0x138b,</div><div class='del'>-	0x1040, 0x1332, 0x6003, 0x0007, 0x2d00, 0x6837, 0x010d, 0x6803,</div><div class='del'>-	0x0000, 0x683b, 0x0000, 0x6c5a, 0x2c00, 0x685e, 0x6008, 0x68b2,</div><div class='del'>-	0x6018, 0x2078, 0x78a0, 0x8007, 0x7130, 0x694a, 0x017e, 0xa084,</div><div class='del'>-	0xff00, 0x6846, 0x684f, 0x0000, 0x6857, 0x0036, 0x1078, 0x4a73,</div><div class='del'>-	0x017f, 0xa486, 0x2000, 0x00c0, 0x9913, 0x2019, 0x0017, 0x1078,</div><div class='del'>-	0xa1a5, 0x0078, 0x998d, 0xa486, 0x0400, 0x00c0, 0x991d, 0x2019,</div><div class='del'>-	0x0002, 0x1078, 0xa156, 0x0078, 0x998d, 0xa486, 0x0200, 0x00c0,</div><div class='del'>-	0x9923, 0x1078, 0xa13b, 0xa486, 0x1000, 0x00c0, 0x9929, 0x1078,</div><div class='del'>-	0xa18a, 0x0078, 0x998d, 0x2069, 0xaa33, 0x6a00, 0xd284, 0x0040,</div><div class='del'>-	0x99f7, 0xa284, 0x0300, 0x00c0, 0x99ef, 0x6804, 0xa005, 0x0040,</div><div class='del'>-	0x99d5, 0x2d78, 0x6003, 0x0007, 0x1078, 0x1370, 0x0040, 0x9994,</div><div class='del'>-	0x7800, 0xd08c, 0x00c0, 0x9947, 0x7804, 0x8001, 0x7806, 0x6013,</div><div class='del'>-	0x0000, 0x6803, 0x0000, 0x6837, 0x0116, 0x683b, 0x0000, 0x6008,</div><div class='del'>-	0x68b2, 0x2c00, 0x684a, 0x6018, 0x2078, 0x78a0, 0x8007, 0x7130,</div><div class='del'>-	0x6986, 0x6846, 0x7928, 0x698a, 0x792c, 0x698e, 0x7930, 0x6992,</div><div class='del'>-	0x7934, 0x6996, 0x6853, 0x003d, 0x7244, 0xa294, 0x0003, 0xa286,</div><div class='del'>-	0x0002, 0x00c0, 0x996f, 0x684f, 0x0040, 0x0078, 0x9979, 0xa286,</div><div class='del'>-	0x0001, 0x00c0, 0x9977, 0x684f, 0x0080, 0x0078, 0x9979, 0x684f,</div><div class='del'>-	0x0000, 0x20a9, 0x000a, 0x2001, 0xac90, 0xad90, 0x0015, 0x200c,</div><div class='del'>-	0x810f, 0x2112, 0x8000, 0x8210, 0x00f0, 0x997f, 0x200c, 0x6982,</div><div class='del'>-	0x8000, 0x200c, 0x697e, 0x1078, 0x4a73, 0x027f, 0x047f, 0x157f,</div><div class='del'>-	0x0f7f, 0x0e7f, 0x0d7f, 0x007c, 0x2001, 0xa70e, 0x2004, 0xd084,</div><div class='del'>-	0x0040, 0x999e, 0x1078, 0x138b, 0x00c0, 0x9940, 0x6013, 0x0100,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0041, 0x1078, 0x5d8a, 0x1078, 0x62d1,</div><div class='del'>-	0x0078, 0x998d, 0x2069, 0xac92, 0x2d04, 0xa084, 0xff00, 0xa086,</div><div class='del'>-	0x1200, 0x00c0, 0x99c9, 0x2069, 0xac80, 0x686c, 0xa084, 0x00ff,</div><div class='del'>-	0x017e, 0x6110, 0xa18c, 0x0700, 0xa10d, 0x6112, 0x017f, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0043, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078,</div><div class='del'>-	0x998d, 0x6013, 0x0200, 0x6003, 0x0001, 0x6007, 0x0041, 0x1078,</div><div class='del'>-	0x5d8a, 0x1078, 0x62d1, 0x0078, 0x998d, 0x2001, 0xa70d, 0x2004,</div><div class='del'>-	0xd0ec, 0x0040, 0x99df, 0x2011, 0x8049, 0x1078, 0x361b, 0x6013,</div><div class='del'>-	0x0300, 0x0078, 0x99e5, 0x6013, 0x0100, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0041, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078, 0x998d, 0x6013,</div><div class='del'>-	0x0500, 0x0078, 0x99e5, 0x6013, 0x0600, 0x0078, 0x99aa, 0x6013,</div><div class='del'>-	0x0200, 0x0078, 0x99aa, 0xa186, 0x0013, 0x00c0, 0x9a0d, 0x6004,</div><div class='del'>-	0xa08a, 0x0040, 0x1048, 0x1332, 0xa08a, 0x0053, 0x10c8, 0x1332,</div><div class='del'>-	0xa082, 0x0040, 0x2008, 0x0079, 0x9a92, 0xa186, 0x0051, 0x0040,</div><div class='del'>-	0x9a1a, 0xa186, 0x0047, 0x00c0, 0x9a33, 0x6004, 0xa086, 0x0041,</div><div class='del'>-	0x0040, 0x9a41, 0x2001, 0x0109, 0x2004, 0xd084, 0x0040, 0x9a41,</div><div class='del'>-	0x127e, 0x2091, 0x2200, 0x007e, 0x017e, 0x027e, 0x1078, 0x5c56,</div><div class='del'>-	0x027f, 0x017f, 0x007f, 0x127f, 0x6000, 0xa086, 0x0002, 0x00c0,</div><div class='del'>-	0x9a41, 0x0078, 0x9ad7, 0xa186, 0x0027, 0x0040, 0x9a3b, 0xa186,</div><div class='del'>-	0x0014, 0x10c0, 0x1332, 0x6004, 0xa082, 0x0040, 0x2008, 0x0079,</div><div class='del'>-	0x9a44, 0x1078, 0x7773, 0x007c, 0x9a57, 0x9a59, 0x9a59, 0x9a81,</div><div class='del'>-	0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57,</div><div class='del'>-	0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x9a57, 0x1078,</div><div class='del'>-	0x1332, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x037e, 0x0d7e, 0x6010,</div><div class='del'>-	0xa06d, 0x0040, 0x9a7e, 0xad84, 0xf000, 0x0040, 0x9a7e, 0x6003,</div><div class='del'>-	0x0002, 0x6018, 0x2004, 0xd0bc, 0x00c0, 0x9a7e, 0x2019, 0x0004,</div><div class='del'>-	0x1078, 0xa1da, 0x6013, 0x0000, 0x6014, 0xa005, 0x00c0, 0x9a7c,</div><div class='del'>-	0x2001, 0xa9a3, 0x2004, 0x6016, 0x6003, 0x0007, 0x0d7f, 0x037f,</div><div class='del'>-	0x007c, 0x0d7e, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x1078, 0x8d16,</div><div class='del'>-	0x0040, 0x9a8e, 0x6010, 0x2068, 0x1078, 0x13a4, 0x1078, 0x8ed6,</div><div class='del'>-	0x0d7f, 0x007c, 0x9aa5, 0x9ac4, 0x9aae, 0x9ad1, 0x9aa5, 0x9aa5,</div><div class='del'>-	0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5,</div><div class='del'>-	0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5, 0x9aa5, 0x1078, 0x1332, 0x6010,</div><div class='del'>-	0xa088, 0x0013, 0x2104, 0xa085, 0x0400, 0x200a, 0x1078, 0x61cd,</div><div class='del'>-	0x6010, 0xa080, 0x0013, 0x2004, 0xd0b4, 0x0040, 0x9abf, 0x6003,</div><div class='del'>-	0x0007, 0x2009, 0x0043, 0x1078, 0x775c, 0x0078, 0x9ac1, 0x6003,</div><div class='del'>-	0x0002, 0x1078, 0x62d1, 0x007c, 0x1078, 0x61cd, 0x1078, 0xa433,</div><div class='del'>-	0x00c0, 0x9ace, 0x1078, 0x5bc1, 0x1078, 0x772d, 0x1078, 0x62d1,</div><div class='del'>-	0x007c, 0x1078, 0x61cd, 0x2009, 0x0041, 0x0078, 0x9c2e, 0xa182,</div><div class='del'>-	0x0040, 0x0079, 0x9adb, 0x9aee, 0x9af0, 0x9aee, 0x9aee, 0x9aee,</div><div class='del'>-	0x9aee, 0x9aee, 0x9af1, 0x9aee, 0x9aee, 0x9aee, 0x9aee, 0x9aee,</div><div class='del'>-	0x9aee, 0x9aee, 0x9aee, 0x9aee, 0x9afc, 0x9aee, 0x1078, 0x1332,</div><div class='del'>-	0x007c, 0x6003, 0x0004, 0x6110, 0x20e1, 0x0005, 0x3d18, 0x3e20,</div><div class='del'>-	0x2c10, 0x1078, 0x15fa, 0x007c, 0x0d7e, 0x1078, 0x5bc1, 0x0d7f,</div><div class='del'>-	0x1078, 0xa4a5, 0x1078, 0x772d, 0x007c, 0xa182, 0x0040, 0x0079,</div><div class='del'>-	0x9b09, 0x9b1c, 0x9b1c, 0x9b1c, 0x9b1c, 0x9b1c, 0x9b1c, 0x9b1c,</div><div class='del'>-	0x9b1e, 0x9b1c, 0x9b21, 0x9b4c, 0x9b1c, 0x9b1c, 0x9b1c, 0x9b1c,</div><div class='del'>-	0x9b4c, 0x9b1c, 0x9b1c, 0x9b1c, 0x1078, 0x1332, 0x1078, 0x7773,</div><div class='del'>-	0x007c, 0x1078, 0x627a, 0x1078, 0x639b, 0x6010, 0x0d7e, 0x2068,</div><div class='del'>-	0x684c, 0xd0fc, 0x0040, 0x9b37, 0xa08c, 0x0003, 0xa18e, 0x0002,</div><div class='del'>-	0x0040, 0x9b3f, 0x2009, 0x0041, 0x0d7f, 0x0078, 0x9c2e, 0x6003,</div><div class='del'>-	0x0007, 0x6017, 0x0000, 0x1078, 0x5bc1, 0x0d7f, 0x007c, 0x1078,</div><div class='del'>-	0xa433, 0x0040, 0x9b45, 0x0d7f, 0x007c, 0x1078, 0x5bc1, 0x1078,</div><div class='del'>-	0x772d, 0x0d7f, 0x0078, 0x9b3e, 0x037e, 0x1078, 0x627a, 0x1078,</div><div class='del'>-	0x639b, 0x6010, 0x0d7e, 0x2068, 0x6018, 0x2004, 0xd0bc, 0x0040,</div><div class='del'>-	0x9b6c, 0x684c, 0xa084, 0x0003, 0xa086, 0x0002, 0x0040, 0x9b68,</div><div class='del'>-	0x687c, 0x632c, 0xa31a, 0x632e, 0x6880, 0x6328, 0xa31b, 0x632a,</div><div class='del'>-	0x6003, 0x0002, 0x0078, 0x9b7d, 0x2019, 0x0004, 0x1078, 0xa1da,</div><div class='del'>-	0x6014, 0xa005, 0x00c0, 0x9b79, 0x2001, 0xa9a3, 0x2004, 0x8003,</div><div class='del'>-	0x6016, 0x6013, 0x0000, 0x6003, 0x0007, 0x0d7f, 0x037f, 0x007c,</div><div class='del'>-	0xa186, 0x0013, 0x00c0, 0x9b8e, 0x6004, 0xa086, 0x0042, 0x10c0,</div><div class='del'>-	0x1332, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x007c, 0xa186, 0x0027,</div><div class='del'>-	0x0040, 0x9b96, 0xa186, 0x0014, 0x00c0, 0x9ba6, 0x6004, 0xa086,</div><div class='del'>-	0x0042, 0x10c0, 0x1332, 0x2001, 0x0007, 0x1078, 0x4535, 0x1078,</div><div class='del'>-	0x61cd, 0x1078, 0x8ed6, 0x1078, 0x62d1, 0x007c, 0xa182, 0x0040,</div><div class='del'>-	0x0079, 0x9baa, 0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd,</div><div class='del'>-	0x9bbd, 0x9bbf, 0x9bcb, 0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd,</div><div class='del'>-	0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd, 0x9bbd, 0x1078, 0x1332, 0x037e,</div><div class='del'>-	0x047e, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x1078, 0x15fa,</div><div class='del'>-	0x047f, 0x037f, 0x007c, 0x6010, 0x0d7e, 0x2068, 0x6810, 0x6a14,</div><div class='del'>-	0x6118, 0x210c, 0xd1bc, 0x0040, 0x9bea, 0x6124, 0xd1f4, 0x00c0,</div><div class='del'>-	0x9bea, 0x007e, 0x047e, 0x057e, 0x6c7c, 0xa422, 0x6d80, 0x2200,</div><div class='del'>-	0xa52b, 0x602c, 0xa420, 0x642e, 0x6028, 0xa529, 0x652a, 0x057f,</div><div class='del'>-	0x047f, 0x007f, 0xa20d, 0x00c0, 0x9bfe, 0x684c, 0xd0fc, 0x0040,</div><div class='del'>-	0x9bf6, 0x2009, 0x0041, 0x0d7f, 0x0078, 0x9c2e, 0x6003, 0x0007,</div><div class='del'>-	0x6017, 0x0000, 0x1078, 0x5bc1, 0x0d7f, 0x007c, 0x007e, 0x0f7e,</div><div class='del'>-	0x2c78, 0x1078, 0x4963, 0x0f7f, 0x007f, 0x0040, 0x9c0b, 0x6003,</div><div class='del'>-	0x0002, 0x0d7f, 0x007c, 0x2009, 0xa70d, 0x210c, 0xd19c, 0x0040,</div><div class='del'>-	0x9c15, 0x6003, 0x0007, 0x0078, 0x9c17, 0x6003, 0x0006, 0x1078,</div><div class='del'>-	0x9c1d, 0x1078, 0x5bc3, 0x0d7f, 0x007c, 0xd2fc, 0x0040, 0x9c29,</div><div class='del'>-	0x8002, 0x8000, 0x8212, 0xa291, 0x0000, 0x2009, 0x0009, 0x0078,</div><div class='del'>-	0x9c2b, 0x2009, 0x0015, 0x6a6a, 0x6866, 0x007c, 0xa182, 0x0040,</div><div class='del'>-	0x0048, 0x9c34, 0x0079, 0x9c41, 0xa186, 0x0013, 0x0040, 0x9c3c,</div><div class='del'>-	0xa186, 0x0014, 0x10c0, 0x1332, 0x6024, 0xd0dc, 0x1040, 0x1332,</div><div class='del'>-	0x007c, 0x9c54, 0x9c5b, 0x9c67, 0x9c73, 0x9c54, 0x9c54, 0x9c54,</div><div class='del'>-	0x9c82, 0x9c54, 0x9c56, 0x9c56, 0x9c54, 0x9c54, 0x9c54, 0x9c54,</div><div class='del'>-	0x9c54, 0x9c54, 0x9c54, 0x9c54, 0x1078, 0x1332, 0x6024, 0xd0dc,</div><div class='del'>-	0x1040, 0x1332, 0x007c, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a,</div><div class='del'>-	0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0x6003,</div><div class='del'>-	0x0001, 0x6106, 0x1078, 0x5d8a, 0x127e, 0x2091, 0x8000, 0x1078,</div><div class='del'>-	0x62d1, 0x127f, 0x007c, 0x6003, 0x0003, 0x6106, 0x2c10, 0x1078,</div><div class='del'>-	0x1cf0, 0x127e, 0x2091, 0x8000, 0x1078, 0x5df6, 0x1078, 0x639b,</div><div class='del'>-	0x127f, 0x007c, 0xa016, 0x1078, 0x15fa, 0x007c, 0x127e, 0x2091,</div><div class='del'>-	0x8000, 0x037e, 0x0d7e, 0xa182, 0x0040, 0x1079, 0x9c93, 0x0d7f,</div><div class='del'>-	0x037f, 0x127f, 0x007c, 0x9ca3, 0x9ca5, 0x9cba, 0x9cd9, 0x9ca3,</div><div class='del'>-	0x9ca3, 0x9ca3, 0x9cf1, 0x9ca3, 0x9ca3, 0x9ca3, 0x9ca3, 0x9ca3,</div><div class='del'>-	0x9ca3, 0x9ca3, 0x9ca3, 0x1078, 0x1332, 0x6010, 0x2068, 0x684c,</div><div class='del'>-	0xd0fc, 0x0040, 0x9ccf, 0xa09c, 0x0003, 0xa39e, 0x0003, 0x0040,</div><div class='del'>-	0x9ccf, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a, 0x1078, 0x62d1,</div><div class='del'>-	0x0078, 0x9cf4, 0x6010, 0x2068, 0x684c, 0xd0fc, 0x0040, 0x9ccf,</div><div class='del'>-	0xa09c, 0x0003, 0xa39e, 0x0003, 0x0040, 0x9ccf, 0x6003, 0x0001,</div><div class='del'>-	0x6106, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078, 0x9cf4, 0x6013,</div><div class='del'>-	0x0000, 0x6017, 0x0000, 0x2019, 0x0004, 0x1078, 0xa1da, 0x0078,</div><div class='del'>-	0x9cf4, 0x6010, 0x2068, 0x684c, 0xd0fc, 0x0040, 0x9ccf, 0xa09c,</div><div class='del'>-	0x0003, 0xa39e, 0x0003, 0x0040, 0x9ccf, 0x6003, 0x0003, 0x6106,</div><div class='del'>-	0x2c10, 0x1078, 0x1cf0, 0x1078, 0x5df6, 0x1078, 0x639b, 0x0078,</div><div class='del'>-	0x9cf4, 0xa016, 0x1078, 0x15fa, 0x007c, 0x1078, 0x61cd, 0x6110,</div><div class='del'>-	0x81ff, 0x0040, 0x9d06, 0x0d7e, 0x2168, 0x1078, 0xa4f2, 0x037e,</div><div class='del'>-	0x2019, 0x0029, 0x1078, 0xa1da, 0x037f, 0x0d7f, 0x1078, 0x8ed6,</div><div class='del'>-	0x1078, 0x62d1, 0x007c, 0x1078, 0x627a, 0x6110, 0x81ff, 0x0040,</div><div class='del'>-	0x9d1c, 0x0d7e, 0x2168, 0x1078, 0xa4f2, 0x037e, 0x2019, 0x0029,</div><div class='del'>-	0x1078, 0xa1da, 0x037f, 0x0d7f, 0x1078, 0x8ed6, 0x1078, 0x639b,</div><div class='del'>-	0x007c, 0xa182, 0x0085, 0x0079, 0x9d25, 0x9d2e, 0x9d2c, 0x9d2c,</div><div class='del'>-	0x9d3a, 0x9d2c, 0x9d2c, 0x9d2c, 0x1078, 0x1332, 0x6003, 0x000b,</div><div class='del'>-	0x6106, 0x1078, 0x5d8a, 0x127e, 0x2091, 0x8000, 0x1078, 0x62d1,</div><div class='del'>-	0x127f, 0x007c, 0x027e, 0x0e7e, 0x1078, 0xa42c, 0x0040, 0x9d44,</div><div class='del'>-	0x1078, 0x772d, 0x0078, 0x9d60, 0x2071, 0xac80, 0x7224, 0x6212,</div><div class='del'>-	0x7220, 0x1078, 0xa079, 0x0040, 0x9d51, 0x6007, 0x0086, 0x0078,</div><div class='del'>-	0x9d5a, 0x6007, 0x0087, 0x7224, 0xa296, 0xffff, 0x00c0, 0x9d5a,</div><div class='del'>-	0x6007, 0x0086, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x1078, 0x62d1,</div><div class='del'>-	0x0e7f, 0x027f, 0x007c, 0xa186, 0x0013, 0x00c0, 0x9d74, 0x6004,</div><div class='del'>-	0xa08a, 0x0085, 0x1048, 0x1332, 0xa08a, 0x008c, 0x10c8, 0x1332,</div><div class='del'>-	0xa082, 0x0085, 0x0079, 0x9d8b, 0xa186, 0x0027, 0x0040, 0x9d80,</div><div class='del'>-	0xa186, 0x0014, 0x0040, 0x9d80, 0x1078, 0x7773, 0x0078, 0x9d8a,</div><div class='del'>-	0x2001, 0x0007, 0x1078, 0x4535, 0x1078, 0x61cd, 0x1078, 0x8ed6,</div><div class='del'>-	0x1078, 0x62d1, 0x007c, 0x9d92, 0x9d94, 0x9d94, 0x9d92, 0x9d92,</div><div class='del'>-	0x9d92, 0x9d92, 0x1078, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ed6,</div><div class='del'>-	0x1078, 0x62d1, 0x007c, 0xa182, 0x0085, 0x1048, 0x1332, 0xa182,</div><div class='del'>-	0x008c, 0x10c8, 0x1332, 0xa182, 0x0085, 0x0079, 0x9da7, 0x9dae,</div><div class='del'>-	0x9dae, 0x9dae, 0x9db0, 0x9dae, 0x9dae, 0x9dae, 0x1078, 0x1332,</div><div class='del'>-	0x007c, 0xa186, 0x0013, 0x0040, 0x9dc1, 0xa186, 0x0014, 0x0040,</div><div class='del'>-	0x9dc1, 0xa186, 0x0027, 0x0040, 0x9dc1, 0x1078, 0x7773, 0x0078,</div><div class='del'>-	0x9dc7, 0x1078, 0x61cd, 0x1078, 0x8ed6, 0x1078, 0x62d1, 0x007c,</div><div class='del'>-	0x037e, 0x1078, 0xa4a5, 0x603f, 0x0000, 0x2019, 0x000b, 0x1078,</div><div class='del'>-	0x9dd7, 0x601f, 0x0006, 0x6003, 0x0007, 0x037f, 0x007c, 0x127e,</div><div class='del'>-	0x037e, 0x2091, 0x8000, 0x087e, 0x2c40, 0x097e, 0x2049, 0x0000,</div><div class='del'>-	0x1078, 0x7246, 0x097f, 0x087f, 0x00c0, 0x9e12, 0x077e, 0x2c38,</div><div class='del'>-	0x1078, 0x72f3, 0x077f, 0x00c0, 0x9e12, 0x6000, 0xa086, 0x0000,</div><div class='del'>-	0x0040, 0x9e12, 0x601c, 0xa086, 0x0007, 0x0040, 0x9e12, 0x0d7e,</div><div class='del'>-	0x6000, 0xa086, 0x0004, 0x00c0, 0x9e03, 0x1078, 0xa4a5, 0x601f,</div><div class='del'>-	0x0007, 0x1078, 0x1757, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040,</div><div class='del'>-	0x9e0b, 0x1078, 0xa1da, 0x0d7f, 0x6013, 0x0000, 0x1078, 0xa4a5,</div><div class='del'>-	0x601f, 0x0007, 0x037f, 0x127f, 0x007c, 0x0f7e, 0x0c7e, 0x037e,</div><div class='del'>-	0x157e, 0x2079, 0xac80, 0x7938, 0x783c, 0x1078, 0x254d, 0x00c0,</div><div class='del'>-	0x9e59, 0x017e, 0x0c7e, 0x1078, 0x45c4, 0x00c0, 0x9e59, 0x017f,</div><div class='del'>-	0x027f, 0x027e, 0x017e, 0x2019, 0x0029, 0x1078, 0x73d0, 0x1078,</div><div class='del'>-	0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a, 0x077f, 0x017f,</div><div class='del'>-	0x077e, 0x2039, 0x0000, 0x1078, 0x9f9b, 0x077f, 0x1078, 0x47e9,</div><div class='del'>-	0x027e, 0x6204, 0xa294, 0xff00, 0x8217, 0xa286, 0x0006, 0x0040,</div><div class='del'>-	0x9e4d, 0xa286, 0x0004, 0x00c0, 0x9e50, 0x62a0, 0x1078, 0x2942,</div><div class='del'>-	0x027f, 0x017f, 0x1078, 0x42f8, 0x6612, 0x6516, 0xa006, 0x0078,</div><div class='del'>-	0x9e5b, 0x0c7f, 0x017f, 0x157f, 0x037f, 0x0c7f, 0x0f7f, 0x007c,</div><div class='del'>-	0x0c7e, 0x0d7e, 0x0e7e, 0x017e, 0x2009, 0xa720, 0x2104, 0xa086,</div><div class='del'>-	0x0074, 0x00c0, 0x9ec3, 0x2069, 0xac8e, 0x690c, 0xa182, 0x0100,</div><div class='del'>-	0x0048, 0x9eb3, 0x6908, 0xa184, 0x8000, 0x0040, 0x9ebf, 0x6018,</div><div class='del'>-	0x2070, 0x7010, 0xa084, 0x00ff, 0x0040, 0x9e82, 0x7000, 0xd0f4,</div><div class='del'>-	0x0040, 0x9e86, 0xa184, 0x0800, 0x0040, 0x9ebf, 0x6910, 0xa18a,</div><div class='del'>-	0x0001, 0x0048, 0x9eb7, 0x6914, 0x2069, 0xacae, 0x6904, 0x81ff,</div><div class='del'>-	0x00c0, 0x9eab, 0x690c, 0xa182, 0x0100, 0x0048, 0x9eb3, 0x6908,</div><div class='del'>-	0x81ff, 0x00c0, 0x9eaf, 0x6910, 0xa18a, 0x0001, 0x0048, 0x9eb7,</div><div class='del'>-	0x6918, 0xa18a, 0x0001, 0x0048, 0x9ebf, 0x0078, 0x9ec9, 0x6013,</div><div class='del'>-	0x0100, 0x0078, 0x9ec5, 0x6013, 0x0300, 0x0078, 0x9ec5, 0x6013,</div><div class='del'>-	0x0500, 0x0078, 0x9ec5, 0x6013, 0x0700, 0x0078, 0x9ec5, 0x6013,</div><div class='del'>-	0x0900, 0x0078, 0x9ec5, 0x6013, 0x0b00, 0x0078, 0x9ec5, 0x6013,</div><div class='del'>-	0x0f00, 0x0078, 0x9ec5, 0x6013, 0x2d00, 0xa085, 0x0001, 0x0078,</div><div class='del'>-	0x9eca, 0xa006, 0x017f, 0x0e7f, 0x0d7f, 0x0c7f, 0x007c, 0x0c7e,</div><div class='del'>-	0x0d7e, 0x027e, 0x037e, 0x157e, 0x6218, 0x2268, 0x6b04, 0xa394,</div><div class='del'>-	0x00ff, 0xa286, 0x0006, 0x0040, 0x9ef3, 0xa286, 0x0004, 0x0040,</div><div class='del'>-	0x9ef3, 0xa394, 0xff00, 0x8217, 0xa286, 0x0006, 0x0040, 0x9ef3,</div><div class='del'>-	0xa286, 0x0004, 0x0040, 0x9ef3, 0x0c7e, 0x2d60, 0x1078, 0x45d6,</div><div class='del'>-	0x0c7f, 0x0078, 0x9f2e, 0x2011, 0xac96, 0xad98, 0x000a, 0x20a9,</div><div class='del'>-	0x0004, 0x1078, 0x80de, 0x00c0, 0x9f2f, 0x2011, 0xac9a, 0xad98,</div><div class='del'>-	0x0006, 0x20a9, 0x0004, 0x1078, 0x80de, 0x00c0, 0x9f2f, 0x047e,</div><div class='del'>-	0x017e, 0x6aa0, 0xa294, 0x00ff, 0x8227, 0xa006, 0x2009, 0xa753,</div><div class='del'>-	0x210c, 0xd1a4, 0x0040, 0x9f1b, 0x2009, 0x0029, 0x1078, 0xa22d,</div><div class='del'>-	0x6800, 0xc0e5, 0x6802, 0x2019, 0x0029, 0x1078, 0x5f01, 0x077e,</div><div class='del'>-	0x2039, 0x0000, 0x1078, 0x5e0a, 0x2c08, 0x1078, 0x9f9b, 0x077f,</div><div class='del'>-	0x2001, 0x0007, 0x1078, 0x4535, 0x017f, 0x047f, 0xa006, 0x157f,</div><div class='del'>-	0x037f, 0x027f, 0x0d7f, 0x0c7f, 0x007c, 0x0d7e, 0x2069, 0xac8e,</div><div class='del'>-	0x6800, 0xa086, 0x0800, 0x0040, 0x9f41, 0x6013, 0x0000, 0x0078,</div><div class='del'>-	0x9f42, 0xa006, 0x0d7f, 0x007c, 0x0c7e, 0x0f7e, 0x017e, 0x027e,</div><div class='del'>-	0x037e, 0x157e, 0x2079, 0xac8c, 0x7930, 0x7834, 0x1078, 0x254d,</div><div class='del'>-	0x00c0, 0x9f68, 0x1078, 0x45c4, 0x00c0, 0x9f68, 0x2011, 0xac90,</div><div class='del'>-	0xac98, 0x000a, 0x20a9, 0x0004, 0x1078, 0x80de, 0x00c0, 0x9f68,</div><div class='del'>-	0x2011, 0xac94, 0xac98, 0x0006, 0x20a9, 0x0004, 0x1078, 0x80de,</div><div class='del'>-	0x157f, 0x037f, 0x027f, 0x017f, 0x0f7f, 0x0c7f, 0x007c, 0x0c7e,</div><div class='del'>-	0x007e, 0x017e, 0x027e, 0x037e, 0x157e, 0x2011, 0xac83, 0x2204,</div><div class='del'>-	0x8211, 0x220c, 0x1078, 0x254d, 0x00c0, 0x9f94, 0x1078, 0x45c4,</div><div class='del'>-	0x00c0, 0x9f94, 0x2011, 0xac96, 0xac98, 0x000a, 0x20a9, 0x0004,</div><div class='del'>-	0x1078, 0x80de, 0x00c0, 0x9f94, 0x2011, 0xac9a, 0xac98, 0x0006,</div><div class='del'>-	0x20a9, 0x0004, 0x1078, 0x80de, 0x157f, 0x037f, 0x027f, 0x017f,</div><div class='del'>-	0x007f, 0x0c7f, 0x007c, 0x0e7e, 0x0c7e, 0x087e, 0x077e, 0x067e,</div><div class='del'>-	0x057e, 0x047e, 0x027e, 0x127e, 0x2091, 0x8000, 0x2740, 0x2029,</div><div class='del'>-	0xa9ba, 0x252c, 0x2021, 0xa9c0, 0x2424, 0x2061, 0xae00, 0x2071,</div><div class='del'>-	0xa700, 0x7648, 0x7064, 0x81ff, 0x0040, 0x9fc2, 0x007e, 0xa186,</div><div class='del'>-	0xaab3, 0x007f, 0x0040, 0x9fc2, 0x8001, 0xa602, 0x00c8, 0xa02c,</div><div class='del'>-	0x0078, 0x9fc5, 0xa606, 0x0040, 0xa02c, 0x2100, 0xac06, 0x0040,</div><div class='del'>-	0xa022, 0x1078, 0xa252, 0x0040, 0xa022, 0x671c, 0xa786, 0x0001,</div><div class='del'>-	0x0040, 0xa047, 0xa786, 0x0004, 0x0040, 0xa047, 0xa786, 0x0007,</div><div class='del'>-	0x0040, 0xa022, 0x2500, 0xac06, 0x0040, 0xa022, 0x2400, 0xac06,</div><div class='del'>-	0x0040, 0xa022, 0x1078, 0xa266, 0x00c0, 0xa022, 0x88ff, 0x0040,</div><div class='del'>-	0x9fed, 0x6020, 0xa906, 0x00c0, 0xa022, 0x0d7e, 0x6000, 0xa086,</div><div class='del'>-	0x0004, 0x00c0, 0x9ff7, 0x017e, 0x1078, 0x1757, 0x017f, 0xa786,</div><div class='del'>-	0x0008, 0x00c0, 0xa006, 0x1078, 0x8f10, 0x00c0, 0xa006, 0x1078,</div><div class='del'>-	0x7c83, 0x0d7f, 0x1078, 0x8ed6, 0x0078, 0xa022, 0x6010, 0x2068,</div><div class='del'>-	0x1078, 0x8d16, 0x0040, 0xa01f, 0xa786, 0x0003, 0x00c0, 0xa036,</div><div class='del'>-	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0xa4f2, 0x017e,</div><div class='del'>-	0x1078, 0x8f8d, 0x1078, 0x4a73, 0x017f, 0x1078, 0x8ec9, 0x0d7f,</div><div class='del'>-	0x1078, 0x8ed6, 0xace0, 0x0010, 0x2001, 0xa716, 0x2004, 0xac02,</div><div class='del'>-	0x00c8, 0xa02c, 0x0078, 0x9faf, 0x127f, 0x027f, 0x047f, 0x057f,</div><div class='del'>-	0x067f, 0x077f, 0x087f, 0x0c7f, 0x0e7f, 0x007c, 0xa786, 0x0006,</div><div class='del'>-	0x00c0, 0xa010, 0xa386, 0x0005, 0x0040, 0xa044, 0x1078, 0xa4f2,</div><div class='del'>-	0x1078, 0xa1da, 0x0078, 0xa01f, 0x0d7f, 0x0078, 0xa022, 0x1078,</div><div class='del'>-	0xa266, 0x00c0, 0xa022, 0x81ff, 0x0040, 0xa022, 0xa180, 0x0001,</div><div class='del'>-	0x2004, 0xa086, 0x0018, 0x0040, 0xa05c, 0xa180, 0x0001, 0x2004,</div><div class='del'>-	0xa086, 0x002d, 0x00c0, 0xa022, 0x6000, 0xa086, 0x0002, 0x00c0,</div><div class='del'>-	0xa022, 0x1078, 0x8efc, 0x0040, 0xa06d, 0x1078, 0x8f10, 0x00c0,</div><div class='del'>-	0xa022, 0x1078, 0x7c83, 0x0078, 0xa075, 0x1078, 0x28a6, 0x1078,</div><div class='del'>-	0x8f10, 0x00c0, 0xa075, 0x1078, 0x7c83, 0x1078, 0x8ed6, 0x0078,</div><div class='del'>-	0xa022, 0x0c7e, 0x0e7e, 0x017e, 0x2c08, 0x2170, 0xa006, 0x1078,</div><div class='del'>-	0xa1f6, 0x017f, 0x0040, 0xa089, 0x601c, 0xa084, 0x000f, 0x1079,</div><div class='del'>-	0xa08c, 0x0e7f, 0x0c7f, 0x007c, 0xa094, 0xa094, 0xa094, 0xa094,</div><div class='del'>-	0xa094, 0xa094, 0xa096, 0xa094, 0xa006, 0x007c, 0x047e, 0x017e,</div><div class='del'>-	0x7018, 0xa080, 0x0028, 0x2024, 0xa4a4, 0x00ff, 0x8427, 0x2c00,</div><div class='del'>-	0x2009, 0x0020, 0x1078, 0xa22d, 0x017f, 0x047f, 0x037e, 0x2019,</div><div class='del'>-	0x0002, 0x1078, 0x9dd7, 0x037f, 0xa085, 0x0001, 0x007c, 0x2001,</div><div class='del'>-	0x0001, 0x1078, 0x44ee, 0x157e, 0x017e, 0x027e, 0x037e, 0x20a9,</div><div class='del'>-	0x0004, 0x2019, 0xa705, 0x2011, 0xac96, 0x1078, 0x80de, 0x037f,</div><div class='del'>-	0x027f, 0x017f, 0x157f, 0xa005, 0x007c, 0x0f7e, 0x0e7e, 0x0c7e,</div><div class='del'>-	0x087e, 0x077e, 0x067e, 0x027e, 0x127e, 0x2091, 0x8000, 0x2740,</div><div class='del'>-	0x2061, 0xae00, 0x2079, 0x0001, 0x8fff, 0x0040, 0xa12d, 0x2071,</div><div class='del'>-	0xa700, 0x7648, 0x7064, 0x8001, 0xa602, 0x00c8, 0xa12d, 0x88ff,</div><div class='del'>-	0x0040, 0xa0e8, 0x2800, 0xac06, 0x00c0, 0xa123, 0x2079, 0x0000,</div><div class='del'>-	0x1078, 0xa252, 0x0040, 0xa123, 0x2400, 0xac06, 0x0040, 0xa123,</div><div class='del'>-	0x671c, 0xa786, 0x0006, 0x00c0, 0xa123, 0xa786, 0x0007, 0x0040,</div><div class='del'>-	0xa123, 0x88ff, 0x00c0, 0xa107, 0x6018, 0xa206, 0x00c0, 0xa123,</div><div class='del'>-	0x85ff, 0x0040, 0xa107, 0x6020, 0xa106, 0x00c0, 0xa123, 0x0d7e,</div><div class='del'>-	0x6000, 0xa086, 0x0004, 0x00c0, 0xa113, 0x1078, 0xa4a5, 0x601f,</div><div class='del'>-	0x0007, 0x1078, 0x1757, 0x6010, 0x2068, 0x1078, 0x8d16, 0x0040,</div><div class='del'>-	0xa11d, 0x047e, 0x1078, 0xa1da, 0x047f, 0x0d7f, 0x1078, 0x8ed6,</div><div class='del'>-	0x88ff, 0x00c0, 0xa137, 0xace0, 0x0010, 0x2001, 0xa716, 0x2004,</div><div class='del'>-	0xac02, 0x00c8, 0xa12d, 0x0078, 0xa0d4, 0xa006, 0x127f, 0x027f,</div><div class='del'>-	0x067f, 0x077f, 0x087f, 0x0c7f, 0x0e7f, 0x0f7f, 0x007c, 0xa8c5,</div><div class='del'>-	0x0001, 0x0078, 0xa12e, 0x077e, 0x057e, 0x087e, 0x2041, 0x0000,</div><div class='del'>-	0x2029, 0x0001, 0x2c20, 0x2019, 0x0002, 0x6218, 0x097e, 0x2049,</div><div class='del'>-	0x0000, 0x1078, 0x7246, 0x097f, 0x087f, 0x2039, 0x0000, 0x1078,</div><div class='del'>-	0x72f3, 0x1078, 0xa0c5, 0x057f, 0x077f, 0x007c, 0x027e, 0x047e,</div><div class='del'>-	0x057e, 0x077e, 0x0c7e, 0x157e, 0x2c20, 0x2128, 0x20a9, 0x007f,</div><div class='del'>-	0x2009, 0x0000, 0x017e, 0x037e, 0x1078, 0x45c4, 0x00c0, 0xa17e,</div><div class='del'>-	0x2c10, 0x057e, 0x087e, 0x2041, 0x0000, 0x2508, 0x2029, 0x0001,</div><div class='del'>-	0x097e, 0x2049, 0x0000, 0x1078, 0x7246, 0x097f, 0x087f, 0x2039,</div><div class='del'>-	0x0000, 0x1078, 0x72f3, 0x1078, 0xa0c5, 0x057f, 0x037f, 0x017f,</div><div class='del'>-	0x8108, 0x00f0, 0xa162, 0x157f, 0x0c7f, 0x077f, 0x057f, 0x047f,</div><div class='del'>-	0x027f, 0x007c, 0x077e, 0x057e, 0x6218, 0x087e, 0x2041, 0x0000,</div><div class='del'>-	0x2029, 0x0001, 0x2019, 0x0048, 0x097e, 0x2049, 0x0000, 0x1078,</div><div class='del'>-	0x7246, 0x097f, 0x087f, 0x2039, 0x0000, 0x1078, 0x72f3, 0x2c20,</div><div class='del'>-	0x1078, 0xa0c5, 0x057f, 0x077f, 0x007c, 0x027e, 0x047e, 0x057e,</div><div class='del'>-	0x077e, 0x0c7e, 0x157e, 0x2c20, 0x20a9, 0x007f, 0x2009, 0x0000,</div><div class='del'>-	0x017e, 0x037e, 0x1078, 0x45c4, 0x00c0, 0xa1ce, 0x2c10, 0x087e,</div><div class='del'>-	0x2041, 0x0000, 0x2828, 0x047e, 0x2021, 0x0001, 0x1078, 0xa482,</div><div class='del'>-	0x047f, 0x097e, 0x2049, 0x0000, 0x1078, 0x7246, 0x097f, 0x087f,</div><div class='del'>-	0x2039, 0x0000, 0x1078, 0x72f3, 0x1078, 0xa0c5, 0x037f, 0x017f,</div><div class='del'>-	0x8108, 0x00f0, 0xa1b0, 0x157f, 0x0c7f, 0x077f, 0x057f, 0x047f,</div><div class='del'>-	0x027f, 0x007c, 0x017e, 0x0f7e, 0xad82, 0xce00, 0x0048, 0xa1f3,</div><div class='del'>-	0xad82, 0xffff, 0x00c8, 0xa1f3, 0x6800, 0xa07d, 0x0040, 0xa1f0,</div><div class='del'>-	0x6803, 0x0000, 0x6b52, 0x1078, 0x4a73, 0x2f68, 0x0078, 0xa1e4,</div><div class='del'>-	0x6b52, 0x1078, 0x4a73, 0x0f7f, 0x017f, 0x007c, 0x0e7e, 0x047e,</div><div class='del'>-	0x037e, 0x2061, 0xae00, 0xa005, 0x00c0, 0xa206, 0x2071, 0xa700,</div><div class='del'>-	0x7448, 0x7064, 0x8001, 0xa402, 0x00c8, 0xa228, 0x2100, 0xac06,</div><div class='del'>-	0x0040, 0xa21a, 0x6000, 0xa086, 0x0000, 0x0040, 0xa21a, 0x6008,</div><div class='del'>-	0xa206, 0x00c0, 0xa21a, 0x6018, 0xa1a0, 0x0006, 0x2424, 0xa406,</div><div class='del'>-	0x0040, 0xa224, 0xace0, 0x0010, 0x2001, 0xa716, 0x2004, 0xac02,</div><div class='del'>-	0x00c8, 0xa228, 0x0078, 0xa206, 0xa085, 0x0001, 0x0078, 0xa229,</div><div class='del'>-	0xa006, 0x037f, 0x047f, 0x0e7f, 0x007c, 0x0d7e, 0x007e, 0x1078,</div><div class='del'>-	0x138b, 0x007f, 0x1040, 0x1332, 0x6837, 0x010d, 0x685e, 0x027e,</div><div class='del'>-	0x2010, 0x1078, 0x8d02, 0x2001, 0x0000, 0x0040, 0xa243, 0x2200,</div><div class='del'>-	0xa080, 0x0008, 0x2004, 0x027f, 0x684a, 0x6956, 0x6c46, 0x684f,</div><div class='del'>-	0x0000, 0xa006, 0x68b2, 0x6802, 0x683a, 0x685a, 0x1078, 0x4a73,</div><div class='del'>-	0x0d7f, 0x007c, 0x6700, 0xa786, 0x0000, 0x0040, 0xa265, 0xa786,</div><div class='del'>-	0x0001, 0x0040, 0xa265, 0xa786, 0x000a, 0x0040, 0xa265, 0xa786,</div><div class='del'>-	0x0009, 0x0040, 0xa265, 0xa085, 0x0001, 0x007c, 0x0e7e, 0x6018,</div><div class='del'>-	0x2070, 0x70a0, 0xa206, 0x0e7f, 0x007c, 0x017e, 0x6004, 0xa08e,</div><div class='del'>-	0x001e, 0x00c0, 0xa287, 0x8007, 0x6130, 0xa18c, 0x00ff, 0xa105,</div><div class='del'>-	0x6032, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0005, 0x2001,</div><div class='del'>-	0xa9a3, 0x2004, 0x6016, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x017f,</div><div class='del'>-	0x007c, 0x0005, 0x0005, 0x007c, 0x6024, 0xd0e4, 0x0040, 0xa29d,</div><div class='del'>-	0xd0cc, 0x0040, 0xa297, 0x1078, 0x8fcf, 0x0078, 0xa29d, 0x1078,</div><div class='del'>-	0xa4a5, 0x1078, 0x5bc1, 0x1078, 0x772d, 0x007c, 0xa280, 0x0007,</div><div class='del'>-	0x2004, 0xa084, 0x000f, 0x0079, 0xa2a5, 0xa2ae, 0xa2ae, 0xa2ae,</div><div class='del'>-	0xa2b0, 0xa2ae, 0xa2b0, 0xa2b0, 0xa2ae, 0xa2b0, 0xa006, 0x007c,</div><div class='del'>-	0xa085, 0x0001, 0x007c, 0xa280, 0x0007, 0x2004, 0xa084, 0x000f,</div><div class='del'>-	0x0079, 0xa2ba, 0xa2c3, 0xa2c3, 0xa2c3, 0xa2c3, 0xa2c3, 0xa2c3,</div><div class='del'>-	0xa2ce, 0xa2c3, 0xa2c3, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013,</div><div class='del'>-	0x2a00, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x007c, 0x0c7e, 0x2260,</div><div class='del'>-	0x1078, 0xa4a5, 0x603f, 0x0000, 0x6024, 0xc0f4, 0xc0cc, 0x6026,</div><div class='del'>-	0x0c7f, 0x0d7e, 0x2268, 0xa186, 0x0007, 0x00c0, 0xa32f, 0x6810,</div><div class='del'>-	0xa005, 0x0040, 0xa2ec, 0xa080, 0x0013, 0x2004, 0xd0fc, 0x00c0,</div><div class='del'>-	0xa2ec, 0x0d7f, 0x0078, 0xa2c3, 0x6007, 0x003a, 0x6003, 0x0001,</div><div class='del'>-	0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7e, 0x2d60, 0x6100, 0xa186,</div><div class='del'>-	0x0002, 0x00c0, 0xa3bd, 0x6010, 0xa005, 0x00c0, 0xa306, 0x6000,</div><div class='del'>-	0xa086, 0x0007, 0x10c0, 0x1332, 0x0078, 0xa3bd, 0xa08c, 0xf000,</div><div class='del'>-	0x00c0, 0xa312, 0x0078, 0xa312, 0x2068, 0x6800, 0xa005, 0x00c0,</div><div class='del'>-	0xa30c, 0x2d00, 0xa080, 0x0013, 0x2004, 0xa084, 0x0003, 0xa086,</div><div class='del'>-	0x0002, 0x00c0, 0xa32b, 0x6010, 0x2068, 0x684c, 0xc0dc, 0xc0f4,</div><div class='del'>-	0x684e, 0x6850, 0xc0f4, 0xc0fc, 0x6852, 0x2009, 0x0043, 0x1078,</div><div class='del'>-	0x9c2e, 0x0078, 0xa3bd, 0x2009, 0x0041, 0x0078, 0xa3b7, 0xa186,</div><div class='del'>-	0x0005, 0x00c0, 0xa376, 0x6810, 0xa080, 0x0013, 0x2004, 0xd0bc,</div><div class='del'>-	0x00c0, 0xa33d, 0x0d7f, 0x0078, 0xa2c3, 0xd0b4, 0x0040, 0xa345,</div><div class='del'>-	0xd0fc, 0x1040, 0x1332, 0x0078, 0xa2df, 0x6007, 0x003a, 0x6003,</div><div class='del'>-	0x0001, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7e, 0x2d60, 0x6100,</div><div class='del'>-	0xa186, 0x0002, 0x0040, 0xa358, 0xa186, 0x0004, 0x00c0, 0xa3bd,</div><div class='del'>-	0x2071, 0xa9e7, 0x7000, 0xa086, 0x0003, 0x00c0, 0xa365, 0x7004,</div><div class='del'>-	0xac06, 0x00c0, 0xa365, 0x7003, 0x0000, 0x6810, 0xa080, 0x0013,</div><div class='del'>-	0x200c, 0xc1f4, 0xc1dc, 0x2102, 0x8000, 0x200c, 0xc1f4, 0xc1fc,</div><div class='del'>-	0xc1bc, 0x2102, 0x2009, 0x0042, 0x0078, 0xa3b7, 0x037e, 0x0d7e,</div><div class='del'>-	0x0d7e, 0x1078, 0x138b, 0x037f, 0x1040, 0x1332, 0x6837, 0x010d,</div><div class='del'>-	0x6803, 0x0000, 0x683b, 0x0000, 0x685b, 0x0000, 0x6b5e, 0x6857,</div><div class='del'>-	0x0045, 0x2c00, 0x6862, 0x6034, 0x6872, 0x2360, 0x6024, 0xc0dd,</div><div class='del'>-	0x6026, 0x6018, 0xa080, 0x0028, 0x2004, 0xa084, 0x00ff, 0x8007,</div><div class='del'>-	0x6320, 0x6b4a, 0x6846, 0x684f, 0x0000, 0x6d6a, 0x6e66, 0x686f,</div><div class='del'>-	0x0001, 0x1078, 0x4a73, 0x2019, 0x0045, 0x6008, 0x2068, 0x1078,</div><div class='del'>-	0x9dd7, 0x2d00, 0x600a, 0x601f, 0x0006, 0x6003, 0x0007, 0x6017,</div><div class='del'>-	0x0000, 0x603f, 0x0000, 0x0d7f, 0x037f, 0x0078, 0xa3be, 0x603f,</div><div class='del'>-	0x0000, 0x6003, 0x0007, 0x1078, 0x9c2e, 0x0c7f, 0x0d7f, 0x007c,</div><div class='del'>-	0xa186, 0x0013, 0x00c0, 0xa3ca, 0x6004, 0xa082, 0x0085, 0x2008,</div><div class='del'>-	0x0079, 0xa3e4, 0xa186, 0x0027, 0x00c0, 0xa3dd, 0x1078, 0x61cd,</div><div class='del'>-	0x037e, 0x0d7e, 0x6010, 0x2068, 0x2019, 0x0004, 0x1078, 0xa1da,</div><div class='del'>-	0x0d7f, 0x037f, 0x1078, 0x62d1, 0x007c, 0xa186, 0x0014, 0x0040,</div><div class='del'>-	0xa3ce, 0x1078, 0x7773, 0x007c, 0xa3ed, 0xa3eb, 0xa3eb, 0xa3eb,</div><div class='del'>-	0xa3eb, 0xa3eb, 0xa3ed, 0x1078, 0x1332, 0x1078, 0x61cd, 0x6003,</div><div class='del'>-	0x000c, 0x1078, 0x62d1, 0x007c, 0xa182, 0x008c, 0x00c8, 0xa3fe,</div><div class='del'>-	0xa182, 0x0085, 0x0048, 0xa3fe, 0x0079, 0xa401, 0x1078, 0x7773,</div><div class='del'>-	0x007c, 0xa408, 0xa408, 0xa408, 0xa408, 0xa40a, 0xa429, 0xa408,</div><div class='del'>-	0x1078, 0x1332, 0x0d7e, 0x2c68, 0x1078, 0x76c7, 0x0040, 0xa424,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x001e, 0x2009, 0xac8e, 0x210c, 0x6136,</div><div class='del'>-	0x2009, 0xac8f, 0x210c, 0x613a, 0x600b, 0xffff, 0x6918, 0x611a,</div><div class='del'>-	0x601f, 0x0004, 0x1078, 0x5d8a, 0x2d60, 0x1078, 0x772d, 0x0d7f,</div><div class='del'>-	0x007c, 0x1078, 0x772d, 0x007c, 0x0e7e, 0x6018, 0x2070, 0x7000,</div><div class='del'>-	0xd0ec, 0x0e7f, 0x007c, 0x6010, 0xa08c, 0xf000, 0x0040, 0xa481,</div><div class='del'>-	0xa080, 0x0013, 0x200c, 0xd1ec, 0x0040, 0xa481, 0x2001, 0xa772,</div><div class='del'>-	0x2004, 0xd0ec, 0x0040, 0xa481, 0x6003, 0x0002, 0x6024, 0xc0e5,</div><div class='del'>-	0x6026, 0xd1ac, 0x0040, 0xa45f, 0x0f7e, 0x2c78, 0x1078, 0x495f,</div><div class='del'>-	0x0f7f, 0x0040, 0xa45f, 0x2001, 0xa9a4, 0x2004, 0x603e, 0x2009,</div><div class='del'>-	0xa772, 0x210c, 0xd1f4, 0x00c0, 0xa47f, 0x0078, 0xa471, 0x2009,</div><div class='del'>-	0xa772, 0x210c, 0xd1f4, 0x0040, 0xa46b, 0x6024, 0xc0e4, 0x6026,</div><div class='del'>-	0xa006, 0x0078, 0xa481, 0x2001, 0xa9a4, 0x200c, 0x8103, 0xa100,</div><div class='del'>-	0x603e, 0x6018, 0xa088, 0x002b, 0x2104, 0xa005, 0x0040, 0xa47c,</div><div class='del'>-	0xa088, 0x0003, 0x0078, 0xa474, 0x2c0a, 0x600f, 0x0000, 0xa085,</div><div class='del'>-	0x0001, 0x007c, 0x017e, 0x0c7e, 0x0e7e, 0x6120, 0xa2f0, 0x002b,</div><div class='del'>-	0x2e04, 0x2060, 0x8cff, 0x0040, 0xa4a1, 0x84ff, 0x00c0, 0xa494,</div><div class='del'>-	0x6020, 0xa106, 0x00c0, 0xa49c, 0x600c, 0x2072, 0x1078, 0x5bc1,</div><div class='del'>-	0x1078, 0x772d, 0x0078, 0xa49e, 0xacf0, 0x0003, 0x2e64, 0x0078,</div><div class='del'>-	0xa48a, 0x0e7f, 0x0c7f, 0x017f, 0x007c, 0x0d7e, 0x6018, 0xa0e8,</div><div class='del'>-	0x002b, 0x2d04, 0xa005, 0x0040, 0xa4b7, 0xac06, 0x0040, 0xa4b5,</div><div class='del'>-	0x2d04, 0xa0e8, 0x0003, 0x0078, 0xa4a9, 0x600c, 0x206a, 0x0d7f,</div><div class='del'>-	0x007c, 0x027e, 0x037e, 0x157e, 0x2011, 0xa726, 0x2204, 0xa084,</div><div class='del'>-	0x00ff, 0x2019, 0xac8e, 0x2334, 0xa636, 0x00c0, 0xa4e5, 0x8318,</div><div class='del'>-	0x2334, 0x2204, 0xa084, 0xff00, 0xa636, 0x00c0, 0xa4e5, 0x2011,</div><div class='del'>-	0xac90, 0x6018, 0xa098, 0x000a, 0x20a9, 0x0004, 0x1078, 0x80de,</div><div class='del'>-	0x00c0, 0xa4e5, 0x2011, 0xac94, 0x6018, 0xa098, 0x0006, 0x20a9,</div><div class='del'>-	0x0004, 0x1078, 0x80de, 0x00c0, 0xa4e5, 0x157f, 0x037f, 0x027f,</div><div class='del'>-	0x007c, 0x0e7e, 0x2071, 0xa700, 0x1078, 0x42b8, 0x1078, 0x2677,</div><div class='del'>-	0x0e7f, 0x007c, 0x0e7e, 0x6018, 0x2070, 0x7000, 0xd0fc, 0x0040,</div><div class='del'>-	0xa4fb, 0x1078, 0xa4fd, 0x0e7f, 0x007c, 0x6850, 0xc0e5, 0x6852,</div><div class='del'>-	0x007c, 0x0e7e, 0x0c7e, 0x077e, 0x067e, 0x057e, 0x047e, 0x027e,</div><div class='del'>-	0x017e, 0x127e, 0x2091, 0x8000, 0x2029, 0xa9ba, 0x252c, 0x2021,</div><div class='del'>-	0xa9c0, 0x2424, 0x2061, 0xae00, 0x2071, 0xa700, 0x7648, 0x7064,</div><div class='del'>-	0xa606, 0x0040, 0xa555, 0x671c, 0xa786, 0x0001, 0x0040, 0xa524,</div><div class='del'>-	0xa786, 0x0008, 0x00c0, 0xa54b, 0x2500, 0xac06, 0x0040, 0xa54b,</div><div class='del'>-	0x2400, 0xac06, 0x0040, 0xa54b, 0x1078, 0xa252, 0x0040, 0xa54b,</div><div class='del'>-	0x1078, 0xa266, 0x00c0, 0xa54b, 0x6000, 0xa086, 0x0004, 0x00c0,</div><div class='del'>-	0xa53d, 0x017e, 0x1078, 0x1757, 0x017f, 0x1078, 0x8efc, 0x00c0,</div><div class='del'>-	0xa543, 0x1078, 0x28a6, 0x1078, 0x8f10, 0x00c0, 0xa549, 0x1078,</div><div class='del'>-	0x7c83, 0x1078, 0x8ed6, 0xace0, 0x0010, 0x2001, 0xa716, 0x2004,</div><div class='del'>-	0xac02, 0x00c8, 0xa555, 0x0078, 0xa514, 0x127f, 0x017f, 0x027f,</div><div class='del'>-	0x047f, 0x057f, 0x067f, 0x077f, 0x0c7f, 0x0e7f, 0x007c, 0x127e,</div><div class='del'>-	0x007e, 0x0e7e, 0x017e, 0x2091, 0x8000, 0x2071, 0xa740, 0xd5a4,</div><div class='del'>-	0x0040, 0xa56d, 0x7034, 0x8000, 0x7036, 0xd5b4, 0x0040, 0xa573,</div><div class='del'>-	0x7030, 0x8000, 0x7032, 0xd5ac, 0x0040, 0xa589, 0x2500, 0xa084,</div><div class='del'>-	0x0007, 0xa08e, 0x0003, 0x0040, 0xa589, 0xa08e, 0x0004, 0x0040,</div><div class='del'>-	0xa589, 0xa08e, 0x0005, 0x0040, 0xa589, 0x2071, 0xa74a, 0x1078,</div><div class='del'>-	0xa5ca, 0x017f, 0x0e7f, 0x007f, 0x127f, 0x007c, 0x127e, 0x007e,</div><div class='del'>-	0x0e7e, 0x017e, 0x2091, 0x8000, 0x2071, 0xa740, 0xd5a4, 0x0040,</div><div class='del'>-	0xa59c, 0x7034, 0x8000, 0x7036, 0xd5b4, 0x0040, 0xa5a2, 0x7030,</div><div class='del'>-	0x8000, 0x7032, 0xd5ac, 0x0040, 0xa5b8, 0x2500, 0xa084, 0x0007,</div><div class='del'>-	0xa08e, 0x0003, 0x0040, 0xa5b8, 0xa08e, 0x0004, 0x0040, 0xa5b8,</div><div class='del'>-	0xa08e, 0x0005, 0x0040, 0xa5b8, 0x2071, 0xa74a, 0x1078, 0xa5ca,</div><div class='del'>-	0x017f, 0x0e7f, 0x007f, 0x127f, 0x007c, 0x127e, 0x007e, 0x0e7e,</div><div class='del'>-	0x2091, 0x8000, 0x2071, 0xa742, 0x1078, 0xa5ca, 0x0e7f, 0x007f,</div><div class='del'>-	0x127f, 0x007c, 0x2e04, 0x8000, 0x2072, 0x00c8, 0xa5d3, 0x8e70,</div><div class='del'>-	0x2e04, 0x8000, 0x2072, 0x007c, 0x0e7e, 0x2071, 0xa740, 0x1078,</div><div class='del'>-	0xa5ca, 0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa744, 0x1078, 0xa5ca,</div><div class='del'>-	0x0e7f, 0x007c, 0x127e, 0x007e, 0x0e7e, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0xa740, 0x7044, 0x8000, 0x7046, 0x0e7f, 0x007f, 0x127f, 0x007c,</div><div class='del'>-	0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,</div><div class='del'>-	0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000,</div><div class='del'>-	0x4811</div><div class='del'>-};</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2100tp_length01 = 0x9601;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_length01 = 0x9601;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2200.c b/drivers/scsi/qla2xxx/ql2200.c<br/>deleted file mode 100644<br/>index 0eef72dc8da0..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2200.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2200.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (C)  2003 Christoph Hellwig.</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include "qla_def.h"</div><div class='del'>-</div><div class='del'>-static char qla_driver_name[] = "qla2200";</div><div class='del'>-</div><div class='del'>-extern unsigned char  fw2200tp_version[];</div><div class='del'>-extern unsigned char  fw2200tp_version_str[];</div><div class='del'>-extern unsigned short fw2200tp_addr01;</div><div class='del'>-extern unsigned short fw2200tp_code01[];</div><div class='del'>-extern unsigned short fw2200tp_length01;</div><div class='del'>-</div><div class='del'>-static struct qla_fw_info qla_fw_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_NORMAL,</div><div class='del'>-		.fwcode		= &amp;fw2200tp_code01[0],</div><div class='del'>-		.fwlen		= &amp;fw2200tp_length01,</div><div class='del'>-		.fwstart	= &amp;fw2200tp_addr01,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{ FW_INFO_ADDR_NOMORE, },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct qla_board_info qla_board_tbl = {</div><div class='del'>-	.drv_name	= qla_driver_name,</div><div class='del'>-</div><div class='del'>-	.isp_name	= "ISP2200",</div><div class='del'>-	.fw_info	= qla_fw_tbl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_device_id qla2200_pci_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2200,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{0, 0},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, qla2200_pci_tbl);</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-qla2200_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return qla2x00_probe_one(pdev,</div><div class='del'>-	    (struct qla_board_info *)id-&gt;driver_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit</div><div class='del'>-qla2200_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	qla2x00_remove_one(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver qla2200_pci_driver = {</div><div class='del'>-	.name		= "qla2200",</div><div class='del'>-	.id_table	= qla2200_pci_tbl,</div><div class='del'>-	.probe		= qla2200_probe_one,</div><div class='del'>-	.remove		= __devexit_p(qla2200_remove_one),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-qla2200_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_module_init(&amp;qla2200_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-qla2200_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;qla2200_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(qla2200_init);</div><div class='del'>-module_exit(qla2200_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("QLogic Corporation");</div><div class='del'>-MODULE_DESCRIPTION("QLogic ISP22xx FC-SCSI Host Bus Adapter driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(QLA2XXX_VERSION);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2200_fw.c b/drivers/scsi/qla2xxx/ql2200_fw.c<br/>deleted file mode 100644<br/>index ac07e18abb1d..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2200_fw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2200_fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5333 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Firmware Version 2.02.08 (17:06 Mar 22, 2005)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2200tp_version = 2*1024+2;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_version = 2*1024+2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned char fw2200tp_version_str[] = {2,2,8};</div><div class='del'>-#else</div><div class='del'>-unsigned char firmware_version[] = {2,2,8};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-#define fw2200tp_VERSION_STRING "2.02.08"</div><div class='del'>-#else</div><div class='del'>-#define FW_VERSION_STRING "2.02.08"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2200tp_addr01 = 0x1000 ;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_addr01 = 0x1000 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2200tp_code01[] = { </div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code01[] = { </div><div class='del'>-#endif</div><div class='del'>-	0x0470, 0x0000, 0x0000, 0xa52b, 0x0000, 0x0002, 0x0002, 0x0008,</div><div class='del'>-	0x0017, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,</div><div class='del'>-	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,</div><div class='del'>-	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3232, 0x3030, 0x2046, 0x6972,</div><div class='del'>-	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,</div><div class='del'>-	0x322e, 0x3032, 0x2e30, 0x3820, 0x2020, 0x2020, 0x2400, 0x20c1,</div><div class='del'>-	0x0005, 0x2001, 0x017f, 0x2003, 0x0000, 0x20c9, 0xbbff, 0x2091,</div><div class='del'>-	0x2000, 0x2059, 0x0000, 0x2b78, 0x7823, 0x0004, 0x2089, 0x299f,</div><div class='del'>-	0x2051, 0xb600, 0x2a70, 0x2029, 0xee00, 0x2031, 0xffff, 0x2039,</div><div class='del'>-	0xede9, 0x2021, 0x0200, 0x0804, 0x146d, 0x20a1, 0xb52b, 0xa00e,</div><div class='del'>-	0x20a9, 0x08d5, 0x41a4, 0x3400, 0x7562, 0x7666, 0x775e, 0x746a,</div><div class='del'>-	0x746e, 0x20a1, 0xbe00, 0x7164, 0x810d, 0x810d, 0x810d, 0x810d,</div><div class='del'>-	0xa18c, 0x000f, 0x2001, 0x000b, 0xa112, 0xa00e, 0x21a8, 0x41a4,</div><div class='del'>-	0x3400, 0x8211, 0x1dd8, 0x7164, 0x3400, 0xa102, 0x0120, 0x0218,</div><div class='del'>-	0x20a8, 0xa00e, 0x41a4, 0x3800, 0xd08c, 0x01d8, 0x2009, 0xb600,</div><div class='del'>-	0x810d, 0x810d, 0x810d, 0x810d, 0xa18c, 0x000f, 0x2001, 0x0001,</div><div class='del'>-	0xa112, 0x20a1, 0x1000, 0xa00e, 0x21a8, 0x41a4, 0x8211, 0x1de0,</div><div class='del'>-	0x2009, 0xb600, 0x3400, 0xa102, 0x0120, 0x0218, 0x20a8, 0xa00e,</div><div class='del'>-	0x41a4, 0x080c, 0x1416, 0x080c, 0x1637, 0x080c, 0x17d4, 0x080c,</div><div class='del'>-	0x1fbe, 0x080c, 0x4c72, 0x080c, 0x8646, 0x080c, 0x15c0, 0x080c,</div><div class='del'>-	0x2ef9, 0x080c, 0x5dfc, 0x080c, 0x53b3, 0x080c, 0x6940, 0x080c,</div><div class='del'>-	0x2545, 0x080c, 0x6bd3, 0x080c, 0x642d, 0x080c, 0x23ff, 0x080c,</div><div class='del'>-	0x2513, 0x2091, 0x3009, 0x7823, 0x0000, 0x1004, 0x10c5, 0x7820,</div><div class='del'>-	0xa086, 0x0002, 0x1150, 0x7823, 0x4000, 0x0e04, 0x10bd, 0x781b,</div><div class='del'>-	0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2a70, 0x7003, 0x0000,</div><div class='del'>-	0x2a70, 0x7000, 0xa08e, 0x0003, 0x1158, 0x080c, 0x3f4f, 0x080c,</div><div class='del'>-	0x2f20, 0x080c, 0x5e4a, 0x080c, 0x5562, 0x080c, 0x696b, 0x0c80,</div><div class='del'>-	0x000b, 0x0c98, 0x10e4, 0x10e5, 0x1215, 0x10e2, 0x12e2, 0x1413,</div><div class='del'>-	0x1414, 0x1415, 0x080c, 0x151a, 0x0005, 0x0126, 0x00f6, 0x2091,</div><div class='del'>-	0x8000, 0x7000, 0xa086, 0x0001, 0x1904, 0x11f2, 0x080c, 0x158d,</div><div class='del'>-	0x080c, 0x5b41, 0x0150, 0x080c, 0x5b67, 0x15c0, 0x2079, 0x0100,</div><div class='del'>-	0x7828, 0xa085, 0x1800, 0x782a, 0x0488, 0x080c, 0x5a79, 0x7000,</div><div class='del'>-	0xa086, 0x0001, 0x1904, 0x11f2, 0x708c, 0xa086, 0x0028, 0x1904,</div><div class='del'>-	0x11f2, 0x2001, 0x0161, 0x2003, 0x0001, 0x2079, 0x0100, 0x7827,</div><div class='del'>-	0xffff, 0x7a28, 0xa295, 0x1e2f, 0x7a2a, 0x2011, 0x5a14, 0x080c,</div><div class='del'>-	0x6a0e, 0x2011, 0x5a07, 0x080c, 0x6ace, 0x2011, 0x5a56, 0x080c,</div><div class='del'>-	0x6a0e, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0x2011, 0x8030, 0x2019,</div><div class='del'>-	0x0000, 0x708b, 0x0000, 0x080c, 0x1e05, 0x00e8, 0x080c, 0x44d6,</div><div class='del'>-	0x2079, 0x0100, 0x7844, 0xa005, 0x1904, 0x11f2, 0x2011, 0x4b23,</div><div class='del'>-	0x080c, 0x6a0e, 0x2011, 0x5a56, 0x080c, 0x6a0e, 0x080c, 0x1e05,</div><div class='del'>-	0x2001, 0xb88d, 0x2004, 0x780e, 0x7840, 0xa084, 0xfffb, 0x7842,</div><div class='del'>-	0x2011, 0x8010, 0x73cc, 0x080c, 0x3f13, 0x723c, 0xc284, 0x723e,</div><div class='del'>-	0x2001, 0xb60c, 0x200c, 0xc1ac, 0x2102, 0x080c, 0x7fbc, 0x2011,</div><div class='del'>-	0x0004, 0x080c, 0x9d1c, 0x080c, 0x52bf, 0x080c, 0x5b41, 0x0158,</div><div class='del'>-	0x080c, 0x4c4a, 0x0140, 0x708b, 0x0001, 0x70c7, 0x0000, 0x080c,</div><div class='del'>-	0x4673, 0x0804, 0x11f2, 0x080c, 0x537b, 0x0120, 0x7a0c, 0xc2b4,</div><div class='del'>-	0x7a0e, 0x0060, 0x7073, 0x0000, 0x080c, 0xa0c4, 0x70d4, 0xd09c,</div><div class='del'>-	0x1128, 0x70a0, 0xa005, 0x0110, 0x080c, 0x4c28, 0x70df, 0x0000,</div><div class='del'>-	0x70db, 0x0000, 0x72d4, 0x080c, 0x5b41, 0x1180, 0x2011, 0x0000,</div><div class='del'>-	0x0016, 0x080c, 0x2920, 0x2019, 0xb88f, 0x211a, 0x001e, 0x7053,</div><div class='del'>-	0xffff, 0x7057, 0x00ef, 0x7077, 0x0000, 0x0020, 0x2019, 0xb88f,</div><div class='del'>-	0x201b, 0x0000, 0x2079, 0xb652, 0x7804, 0xd0ac, 0x0108, 0xc295,</div><div class='del'>-	0x72d6, 0x080c, 0x5b41, 0x0118, 0xa296, 0x0004, 0x0548, 0x2011,</div><div class='del'>-	0x0001, 0x080c, 0x9d1c, 0x709b, 0x0000, 0x709f, 0xffff, 0x7003,</div><div class='del'>-	0x0002, 0x2079, 0x0100, 0x7827, 0x0003, 0x7828, 0xa085, 0x0003,</div><div class='del'>-	0x782a, 0x00fe, 0x080c, 0x2aed, 0x2011, 0x0005, 0x080c, 0x80fc,</div><div class='del'>-	0x080c, 0x71e5, 0x080c, 0x5b41, 0x0148, 0x00c6, 0x2061, 0x0100,</div><div class='del'>-	0x0016, 0x080c, 0x2920, 0x61e2, 0x001e, 0x00ce, 0x012e, 0x0420,</div><div class='del'>-	0x709b, 0x0000, 0x709f, 0xffff, 0x7003, 0x0002, 0x00f6, 0x2079,</div><div class='del'>-	0x0100, 0x7827, 0x0003, 0x7828, 0xa085, 0x0003, 0x782a, 0x00fe,</div><div class='del'>-	0x2011, 0x0005, 0x080c, 0x80fc, 0x080c, 0x71e5, 0x080c, 0x5b41,</div><div class='del'>-	0x0148, 0x00c6, 0x2061, 0x0100, 0x0016, 0x080c, 0x2920, 0x61e2,</div><div class='del'>-	0x001e, 0x00ce, 0x00fe, 0x012e, 0x0005, 0x00c6, 0x080c, 0x5b41,</div><div class='del'>-	0x1118, 0x20a9, 0x0100, 0x0010, 0x20a9, 0x0082, 0x080c, 0x5b41,</div><div class='del'>-	0x1118, 0x2009, 0x0000, 0x0010, 0x2009, 0x007e, 0x080c, 0x2dcc,</div><div class='del'>-	0x8108, 0x1f04, 0x1206, 0x00ce, 0x7073, 0x0000, 0x7074, 0xa084,</div><div class='del'>-	0x00ff, 0x7076, 0x70a3, 0x0000, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x7000, 0xa086, 0x0002, 0x1904, 0x12e0, 0x709c, 0xa086, 0xffff,</div><div class='del'>-	0x0130, 0x080c, 0x2aed, 0x080c, 0x71e5, 0x0804, 0x12e0, 0x70d4,</div><div class='del'>-	0xd0ac, 0x1110, 0xd09c, 0x0540, 0xd084, 0x0530, 0x0006, 0x0016,</div><div class='del'>-	0x2001, 0x0103, 0x2009, 0xb88d, 0x210c, 0x2102, 0x001e, 0x000e,</div><div class='del'>-	0xd08c, 0x01d0, 0x70d8, 0xa086, 0xffff, 0x0190, 0x080c, 0x2c4c,</div><div class='del'>-	0x080c, 0x71e5, 0x70d4, 0xd094, 0x1904, 0x12e0, 0x2011, 0x0001,</div><div class='del'>-	0x2019, 0x0000, 0x080c, 0x2c84, 0x080c, 0x71e5, 0x0804, 0x12e0,</div><div class='del'>-	0x70dc, 0xa005, 0x1904, 0x12e0, 0x7098, 0xa005, 0x1904, 0x12e0,</div><div class='del'>-	0x70d4, 0xd0a4, 0x0118, 0xd0b4, 0x0904, 0x12e0, 0x080c, 0x537b,</div><div class='del'>-	0x1904, 0x12e0, 0x2001, 0xb653, 0x2004, 0xd0ac, 0x01c8, 0x0156,</div><div class='del'>-	0x00c6, 0x20a9, 0x007f, 0x2009, 0x0000, 0x0016, 0x080c, 0x501b,</div><div class='del'>-	0x1118, 0x6000, 0xd0ec, 0x1138, 0x001e, 0x8108, 0x1f04, 0x126d,</div><div class='del'>-	0x00ce, 0x015e, 0x0028, 0x001e, 0x00ce, 0x015e, 0x0804, 0x12e0,</div><div class='del'>-	0x0006, 0x0016, 0x2001, 0x0103, 0x2009, 0xb88d, 0x210c, 0x2102,</div><div class='del'>-	0x001e, 0x000e, 0x71a8, 0x81ff, 0x11b0, 0xa006, 0x2009, 0x0200,</div><div class='del'>-	0x20a9, 0x0002, 0x20a1, 0xb8df, 0x40a1, 0x2009, 0x0700, 0x20a9,</div><div class='del'>-	0x0002, 0x20a1, 0xb8cf, 0x40a1, 0x7070, 0x8007, 0x7174, 0x810f,</div><div class='del'>-	0x20a9, 0x0002, 0x40a1, 0x20a1, 0xb8d3, 0x2009, 0x0000, 0x080c,</div><div class='del'>-	0x1500, 0x2001, 0x0000, 0x810f, 0x20a9, 0x0002, 0x40a1, 0x7030,</div><div class='del'>-	0xc08c, 0x7032, 0x7003, 0x0003, 0x709f, 0xffff, 0x080c, 0x1586,</div><div class='del'>-	0xa006, 0x080c, 0x27f8, 0x080c, 0x3f85, 0x00f6, 0x2079, 0x0100,</div><div class='del'>-	0x080c, 0x5b67, 0x0150, 0x080c, 0x5b41, 0x7828, 0x0118, 0xa084,</div><div class='del'>-	0xe1ff, 0x0010, 0xa084, 0xffdf, 0x782a, 0x00fe, 0x2001, 0xb8e2,</div><div class='del'>-	0x2004, 0xa086, 0x0005, 0x1120, 0x2011, 0x0000, 0x080c, 0x80fc,</div><div class='del'>-	0x2011, 0x0000, 0x080c, 0x8106, 0x080c, 0x71e5, 0x080c, 0x72a2,</div><div class='del'>-	0x012e, 0x0005, 0x0016, 0x0046, 0x00f6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2079, 0x0100, 0x2009, 0xb634, 0x2104, 0xa005, 0x1110, 0x080c,</div><div class='del'>-	0x294c, 0x2009, 0x00f7, 0x080c, 0x4c11, 0x7940, 0xa18c, 0x0010,</div><div class='del'>-	0x7942, 0x7924, 0xd1b4, 0x0110, 0x7827, 0x0040, 0xd19c, 0x0110,</div><div class='del'>-	0x7827, 0x0008, 0x0006, 0x0036, 0x0156, 0x7954, 0xd1ac, 0x1904,</div><div class='del'>-	0x1350, 0x080c, 0x5b53, 0x0158, 0x080c, 0x5b67, 0x1128, 0x2001,</div><div class='del'>-	0xb89e, 0x2003, 0x0000, 0x0070, 0x080c, 0x5b49, 0x0dc0, 0x2001,</div><div class='del'>-	0xb89e, 0x2003, 0xaaaa, 0x2001, 0xb89f, 0x2003, 0x0001, 0x080c,</div><div class='del'>-	0x5a79, 0x0058, 0x080c, 0x5b41, 0x0140, 0x2009, 0x00f8, 0x080c,</div><div class='del'>-	0x4c11, 0x7843, 0x0090, 0x7843, 0x0010, 0x20a9, 0x09c4, 0x7820,</div><div class='del'>-	0xd09c, 0x1138, 0x080c, 0x5b41, 0x0138, 0x7824, 0xd0ac, 0x1904,</div><div class='del'>-	0x13fa, 0x1f04, 0x132f, 0x0070, 0x7824, 0x080c, 0x5b5d, 0x0118,</div><div class='del'>-	0xd0ac, 0x1904, 0x13fa, 0xa084, 0x1800, 0x0d98, 0x7003, 0x0001,</div><div class='del'>-	0x0804, 0x13fa, 0x2001, 0x0001, 0x080c, 0x27f8, 0x0804, 0x1409,</div><div class='del'>-	0x7850, 0xa084, 0x0180, 0x7852, 0x782f, 0x0020, 0x20a9, 0x0046,</div><div class='del'>-	0x1d04, 0x1358, 0x080c, 0x6ab6, 0x1f04, 0x1358, 0x7850, 0xa084,</div><div class='del'>-	0x0180, 0xa085, 0x0400, 0x7852, 0x782f, 0x0000, 0x080c, 0x5b53,</div><div class='del'>-	0x0158, 0x080c, 0x5b67, 0x1128, 0x2001, 0xb89e, 0x2003, 0x0000,</div><div class='del'>-	0x0070, 0x080c, 0x5b49, 0x0dc0, 0x2001, 0xb89e, 0x2003, 0xaaaa,</div><div class='del'>-	0x2001, 0xb89f, 0x2003, 0x0001, 0x080c, 0x5a79, 0x0020, 0x2009,</div><div class='del'>-	0x00f8, 0x080c, 0x4c11, 0x20a9, 0x000e, 0xe000, 0x1f04, 0x1385,</div><div class='del'>-	0x7850, 0xa084, 0x0180, 0xa085, 0x1400, 0x7852, 0x080c, 0x5b41,</div><div class='del'>-	0x0120, 0x7843, 0x0090, 0x7843, 0x0010, 0x2021, 0xe678, 0x2019,</div><div class='del'>-	0xea60, 0x7820, 0xd09c, 0x1558, 0x080c, 0x5b41, 0x05d8, 0x7824,</div><div class='del'>-	0xd0ac, 0x1904, 0x13fa, 0x080c, 0x5b67, 0x1508, 0x0046, 0x2021,</div><div class='del'>-	0x0190, 0x8421, 0x1df0, 0x004e, 0x8421, 0x11c8, 0x7827, 0x0048,</div><div class='del'>-	0x20a9, 0x01f4, 0x1d04, 0x13b2, 0x080c, 0x6ab6, 0x1f04, 0x13b2,</div><div class='del'>-	0x7824, 0xa084, 0x0068, 0x15c8, 0x2001, 0xb89e, 0x2003, 0xaaaa,</div><div class='del'>-	0x2001, 0xb89f, 0x2003, 0x0001, 0x7003, 0x0001, 0x0498, 0x1d04,</div><div class='del'>-	0x13cb, 0x080c, 0x6ab6, 0x8319, 0x1960, 0x2009, 0xb634, 0x2104,</div><div class='del'>-	0x8000, 0x200a, 0xa084, 0xfff0, 0x0120, 0x200b, 0x0000, 0x080c,</div><div class='del'>-	0x294c, 0x00d8, 0x080c, 0x5b53, 0x1140, 0xa4a2, 0x0064, 0x1128,</div><div class='del'>-	0x080c, 0x5b18, 0x7003, 0x0001, 0x00a8, 0x7827, 0x1800, 0xe000,</div><div class='del'>-	0xe000, 0x7824, 0x080c, 0x5b5d, 0x0110, 0xd0ac, 0x1158, 0xa084,</div><div class='del'>-	0x1800, 0x09a8, 0x7003, 0x0001, 0x0028, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x27f8, 0x0048, 0x2001, 0xb634, 0x2003, 0x0000, 0x7827, 0x0048,</div><div class='del'>-	0x7828, 0xc09d, 0x782a, 0x7850, 0xa084, 0x0180, 0xa085, 0x0400,</div><div class='del'>-	0x7852, 0x015e, 0x003e, 0x000e, 0x080c, 0x155d, 0x012e, 0x00fe,</div><div class='del'>-	0x004e, 0x001e, 0x0005, 0x0005, 0x0005, 0x0005, 0x2a70, 0x2061,</div><div class='del'>-	0xb8c2, 0x2063, 0x0002, 0x6007, 0x0002, 0x600b, 0x0008, 0x600f,</div><div class='del'>-	0x0017, 0x2001, 0xb89e, 0x2003, 0x0000, 0x708b, 0x0000, 0x2009,</div><div class='del'>-	0x0100, 0x2104, 0xa082, 0x0002, 0x0218, 0x7053, 0xffff, 0x0010,</div><div class='del'>-	0x7053, 0x0000, 0x705b, 0xffff, 0x7073, 0x0000, 0x7077, 0x0000,</div><div class='del'>-	0x080c, 0xa0c4, 0x2061, 0xb88e, 0x6003, 0x0909, 0x6007, 0x0000,</div><div class='del'>-	0x600b, 0x8800, 0x600f, 0x0200, 0x6013, 0x00ff, 0x6017, 0x000f,</div><div class='del'>-	0x601b, 0x0000, 0x601f, 0x07d0, 0x2061, 0xb896, 0x6003, 0x8000,</div><div class='del'>-	0x6007, 0x0000, 0x600b, 0x0000, 0x600f, 0x0200, 0x6013, 0x00ff,</div><div class='del'>-	0x6017, 0x0000, 0x601b, 0x0001, 0x601f, 0x0000, 0x2061, 0xb8b9,</div><div class='del'>-	0x6003, 0x514c, 0x6007, 0x4f47, 0x600b, 0x4943, 0x600f, 0x2020,</div><div class='del'>-	0x2001, 0xb628, 0x2003, 0x0000, 0x0005, 0x04a0, 0x2011, 0x0000,</div><div class='del'>-	0x81ff, 0x0570, 0xa186, 0x0001, 0x1148, 0x2031, 0x8fff, 0x2039,</div><div class='del'>-	0xd601, 0x2021, 0x0100, 0x2029, 0xd600, 0x00e8, 0xa186, 0x0002,</div><div class='del'>-	0x1118, 0x2011, 0x0000, 0x00b8, 0xa186, 0x0005, 0x1118, 0x2011,</div><div class='del'>-	0x0001, 0x0088, 0xa186, 0x0009, 0x1118, 0x2011, 0x0002, 0x0058,</div><div class='del'>-	0xa186, 0x000a, 0x1118, 0x2011, 0x0002, 0x0028, 0xa186, 0x0055,</div><div class='del'>-	0x1110, 0x2011, 0x0003, 0x3800, 0xa084, 0xfffc, 0xa205, 0x20c0,</div><div class='del'>-	0x0804, 0x104d, 0xa00e, 0x2011, 0x0003, 0x2019, 0x14a9, 0x0804,</div><div class='del'>-	0x14fa, 0x2019, 0xaaaa, 0x2061, 0xffff, 0x2c14, 0x2362, 0xe000,</div><div class='del'>-	0xe000, 0x2c04, 0xa306, 0x2262, 0x1110, 0xc1b5, 0xc1a5, 0x2011,</div><div class='del'>-	0x0000, 0x2019, 0x14bc, 0x04f0, 0x2019, 0xaaaa, 0x2061, 0xffff,</div><div class='del'>-	0x2c14, 0x2362, 0xe000, 0xe000, 0x2c1c, 0x2061, 0x7fff, 0xe000,</div><div class='del'>-	0xe000, 0x2c04, 0x2061, 0xffff, 0x2262, 0xa306, 0x0110, 0xc18d,</div><div class='del'>-	0x0008, 0xc185, 0x2011, 0x0002, 0x2019, 0x14d7, 0x0418, 0x2061,</div><div class='del'>-	0xffff, 0x2019, 0xaaaa, 0x2c14, 0x2362, 0xe000, 0xe000, 0x2c04,</div><div class='del'>-	0x2262, 0xa306, 0x1180, 0x2c14, 0x2362, 0xe000, 0xe000, 0x2c1c,</div><div class='del'>-	0x2061, 0x7fff, 0x2c04, 0x2061, 0xffff, 0x2262, 0xa306, 0x1110,</div><div class='del'>-	0xc195, 0x0008, 0xc19d, 0x2011, 0x0001, 0x2019, 0x14f8, 0x0010,</div><div class='del'>-	0x0804, 0x146e, 0x3800, 0xa084, 0xfffc, 0xa205, 0x20c0, 0x0837,</div><div class='del'>-	0x2011, 0x0000, 0x080c, 0x501b, 0x1178, 0x6004, 0xa0c4, 0x00ff,</div><div class='del'>-	0xa8c6, 0x0006, 0x0128, 0xa0c4, 0xff00, 0xa8c6, 0x0600, 0x1120,</div><div class='del'>-	0xa186, 0x0080, 0x0108, 0x8210, 0x8108, 0xa186, 0x0100, 0x1d50,</div><div class='del'>-	0x2208, 0x0005, 0x2091, 0x8000, 0x0e04, 0x151c, 0x0006, 0x0016,</div><div class='del'>-	0x2079, 0x0000, 0x7818, 0xd084, 0x1de8, 0x001e, 0x792e, 0x000e,</div><div class='del'>-	0x782a, 0x000e, 0x7826, 0x3900, 0x783a, 0x7823, 0x8002, 0x781b,</div><div class='del'>-	0x0001, 0x2091, 0x5000, 0x0126, 0x0156, 0x0146, 0x20a9, 0x0010,</div><div class='del'>-	0x20a1, 0xba0d, 0x2091, 0x2000, 0x40a1, 0x20a9, 0x0010, 0x2091,</div><div class='del'>-	0x2200, 0x40a1, 0x20a9, 0x0010, 0x2091, 0x2400, 0x40a1, 0x20a9,</div><div class='del'>-	0x0010, 0x2091, 0x2600, 0x40a1, 0x20a9, 0x0010, 0x2091, 0x2800,</div><div class='del'>-	0x40a1, 0x014e, 0x015e, 0x012e, 0x2079, 0xb600, 0x7803, 0x0005,</div><div class='del'>-	0x2091, 0x4080, 0x04c9, 0x0cf8, 0x0005, 0x0006, 0x080c, 0x15a8,</div><div class='del'>-	0x1518, 0x00f6, 0x2079, 0xb624, 0x2f04, 0x8000, 0x207a, 0xa082,</div><div class='del'>-	0x000f, 0x0258, 0xa006, 0x207a, 0x2079, 0xb626, 0x2f04, 0xa084,</div><div class='del'>-	0x0001, 0xa086, 0x0001, 0x207a, 0x0070, 0x2079, 0xb626, 0x2f7c,</div><div class='del'>-	0x8fff, 0x1128, 0x2001, 0x0c03, 0x2003, 0x0040, 0x0020, 0x2001,</div><div class='del'>-	0x0c03, 0x2003, 0x00c0, 0x00fe, 0x000e, 0x0005, 0x0409, 0x1120,</div><div class='del'>-	0x2001, 0x0c03, 0x2003, 0x0080, 0x0005, 0x00d1, 0x1120, 0x2001,</div><div class='del'>-	0x0c03, 0x2003, 0x0040, 0x0005, 0x0006, 0x0091, 0x1178, 0x2001,</div><div class='del'>-	0x0c03, 0x2003, 0x0040, 0x2009, 0x0fff, 0x00a1, 0x2001, 0x0c03,</div><div class='del'>-	0x2003, 0x0080, 0x2009, 0x0fff, 0x0069, 0x0c88, 0x000e, 0x0005,</div><div class='del'>-	0x00c6, 0x2061, 0x0c00, 0x2c04, 0xa084, 0x00ff, 0xa086, 0x00aa,</div><div class='del'>-	0x00ce, 0x0005, 0x0156, 0x0126, 0xa18c, 0x0fff, 0x21a8, 0x1d04,</div><div class='del'>-	0x15b7, 0x2091, 0x6000, 0x1f04, 0x15b7, 0x012e, 0x015e, 0x0005,</div><div class='del'>-	0x2071, 0xb600, 0x7160, 0x712e, 0x2021, 0x0001, 0xa190, 0x0030,</div><div class='del'>-	0xa298, 0x0030, 0x0240, 0x7064, 0xa302, 0x1228, 0x220a, 0x2208,</div><div class='del'>-	0x2310, 0x8420, 0x0ca8, 0x3800, 0xd08c, 0x0148, 0x7064, 0xa086,</div><div class='del'>-	0xb600, 0x0128, 0x7067, 0xb600, 0x2011, 0x1000, 0x0c48, 0x200b,</div><div class='del'>-	0x0000, 0x74b2, 0x74b6, 0x0005, 0x00e6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xb600, 0x70b4, 0xa0ea, 0x0010, 0x0268, 0x8001, 0x70b6,</div><div class='del'>-	0x702c, 0x2068, 0x2d04, 0x702e, 0x206b, 0x0000, 0x6807, 0x0000,</div><div class='del'>-	0x012e, 0x00ee, 0x0005, 0xa06e, 0x0cd8, 0x00e6, 0x2071, 0xb600,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x70b4, 0x8001, 0x0260, 0x70b6, 0x702c,</div><div class='del'>-	0x2068, 0x2d04, 0x702e, 0x206b, 0x0000, 0x6807, 0x0000, 0x012e,</div><div class='del'>-	0x00ee, 0x0005, 0xa06e, 0x0cd8, 0x00e6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xb600, 0x702c, 0x206a, 0x2d00, 0x702e, 0x70b4, 0x8000,</div><div class='del'>-	0x70b6, 0x012e, 0x00ee, 0x0005, 0x8dff, 0x0138, 0x6804, 0x6807,</div><div class='del'>-	0x0000, 0x0006, 0x0c49, 0x00de, 0x0cb8, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0xb600, 0x70b4, 0xa08a, 0x0010, 0xa00d, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0xb913, 0x7007, 0x0000, 0x701b, 0x0000, 0x701f, 0x0000,</div><div class='del'>-	0x2071, 0x0000, 0x7010, 0xa085, 0x8004, 0x7012, 0x00ee, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x00e6, 0x2270, 0x700b, 0x0000, 0x2071,</div><div class='del'>-	0xb913, 0x7018, 0xa088, 0xb91c, 0x220a, 0x8000, 0xa084, 0x0007,</div><div class='del'>-	0x701a, 0x7004, 0xa005, 0x1128, 0x00f6, 0x2079, 0x0010, 0x0089,</div><div class='del'>-	0x00fe, 0x00ee, 0x012e, 0x0005, 0x00e6, 0x2071, 0xb913, 0x7004,</div><div class='del'>-	0xa005, 0x1128, 0x00f6, 0x2079, 0x0010, 0x0019, 0x00fe, 0x00ee,</div><div class='del'>-	0x0005, 0x7000, 0x0002, 0x1677, 0x16db, 0x16f8, 0x16f8, 0x7018,</div><div class='del'>-	0x711c, 0xa106, 0x1118, 0x7007, 0x0000, 0x0005, 0x00d6, 0xa180,</div><div class='del'>-	0xb91c, 0x2004, 0x700a, 0x2068, 0x8108, 0xa18c, 0x0007, 0x711e,</div><div class='del'>-	0x7803, 0x0026, 0x6824, 0x7832, 0x6828, 0x7836, 0x682c, 0x783a,</div><div class='del'>-	0x6830, 0x783e, 0x6810, 0x700e, 0x680c, 0x7016, 0x6804, 0x00de,</div><div class='del'>-	0xd084, 0x0120, 0x7007, 0x0001, 0x0029, 0x0005, 0x7007, 0x0002,</div><div class='del'>-	0x00b1, 0x0005, 0x0016, 0x0026, 0x710c, 0x2011, 0x0040, 0xa182,</div><div class='del'>-	0x0040, 0x1210, 0x2110, 0xa006, 0x700e, 0x7212, 0x8203, 0x7822,</div><div class='del'>-	0x7803, 0x0020, 0x7803, 0x0041, 0x002e, 0x001e, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x0136, 0x0146, 0x0156, 0x7014, 0x2098, 0x20a1, 0x0014,</div><div class='del'>-	0x7803, 0x0026, 0x710c, 0x2011, 0x0040, 0xa182, 0x0040, 0x1210,</div><div class='del'>-	0x2110, 0xa006, 0x700e, 0x22a8, 0x53a6, 0x8203, 0x7822, 0x7803,</div><div class='del'>-	0x0020, 0x3300, 0x7016, 0x7803, 0x0001, 0x015e, 0x014e, 0x013e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0136, 0x0146, 0x0156, 0x2099, 0xb6fa,</div><div class='del'>-	0x20a1, 0x0018, 0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x7803, 0x0041, 0x7007, 0x0003, 0x7000, 0xc084,</div><div class='del'>-	0x7002, 0x700b, 0xb6f5, 0x012e, 0x015e, 0x014e, 0x013e, 0x0005,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x2001, 0xb729, 0x209c, 0x20a1, 0x0014,</div><div class='del'>-	0x7803, 0x0026, 0x2001, 0xb72a, 0x20ac, 0x53a6, 0x2099, 0xb72b,</div><div class='del'>-	0x20a1, 0x0018, 0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x7803, 0x0001, 0x7007, 0x0004, 0x7000, 0xc08c,</div><div class='del'>-	0x7002, 0x700b, 0xb726, 0x012e, 0x015e, 0x014e, 0x013e, 0x0005,</div><div class='del'>-	0x0016, 0x00e6, 0x2071, 0xb913, 0x00f6, 0x2079, 0x0010, 0x7904,</div><div class='del'>-	0x7803, 0x0002, 0xd1fc, 0x0120, 0xa18c, 0x0700, 0x7004, 0x0023,</div><div class='del'>-	0x00fe, 0x00ee, 0x001e, 0x0005, 0x1671, 0x173b, 0x1769, 0x1793,</div><div class='del'>-	0x17c3, 0x173a, 0x0cf8, 0xa18c, 0x0700, 0x1528, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x7014, 0x20a0, 0x2099, 0x0014, 0x7803, 0x0040, 0x7010,</div><div class='del'>-	0x20a8, 0x53a5, 0x3400, 0x7016, 0x015e, 0x014e, 0x013e, 0x700c,</div><div class='del'>-	0xa005, 0x0570, 0x7830, 0x7832, 0x7834, 0x7836, 0x080c, 0x16a2,</div><div class='del'>-	0x0005, 0x7008, 0xa080, 0x0002, 0x2003, 0x0100, 0x7007, 0x0000,</div><div class='del'>-	0x080c, 0x1671, 0x0005, 0x7008, 0xa080, 0x0002, 0x2003, 0x0200,</div><div class='del'>-	0x0ca8, 0xa18c, 0x0700, 0x1150, 0x700c, 0xa005, 0x0188, 0x7830,</div><div class='del'>-	0x7832, 0x7834, 0x7836, 0x080c, 0x16b7, 0x0005, 0x7008, 0xa080,</div><div class='del'>-	0x0002, 0x2003, 0x0200, 0x7007, 0x0000, 0x080c, 0x1671, 0x0005,</div><div class='del'>-	0x00d6, 0x7008, 0x2068, 0x7830, 0x6826, 0x7834, 0x682a, 0x7838,</div><div class='del'>-	0x682e, 0x783c, 0x6832, 0x680b, 0x0100, 0x00de, 0x7007, 0x0000,</div><div class='del'>-	0x080c, 0x1671, 0x0005, 0xa18c, 0x0700, 0x1540, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x2001, 0xb6f8, 0x2004, 0xa080, 0x000d, 0x20a0, 0x2099,</div><div class='del'>-	0x0014, 0x7803, 0x0040, 0x20a9, 0x0020, 0x53a5, 0x2001, 0xb6fa,</div><div class='del'>-	0x2004, 0xd0bc, 0x0148, 0x2001, 0xb703, 0x2004, 0xa080, 0x000d,</div><div class='del'>-	0x20a0, 0x20a9, 0x0020, 0x53a5, 0x015e, 0x014e, 0x013e, 0x7007,</div><div class='del'>-	0x0000, 0x080c, 0x5ee1, 0x080c, 0x1671, 0x0005, 0x2011, 0x8003,</div><div class='del'>-	0x080c, 0x3f13, 0x0cf8, 0xa18c, 0x0700, 0x1148, 0x2001, 0xb728,</div><div class='del'>-	0x2003, 0x0100, 0x7007, 0x0000, 0x080c, 0x1671, 0x0005, 0x2011,</div><div class='del'>-	0x8004, 0x080c, 0x3f13, 0x0cf8, 0x0126, 0x2091, 0x2200, 0x2079,</div><div class='del'>-	0x0030, 0x2071, 0xb924, 0x7003, 0x0000, 0x700f, 0xb930, 0x7013,</div><div class='del'>-	0xb930, 0x780f, 0x00f6, 0x7803, 0x0004, 0x012e, 0x0005, 0x6934,</div><div class='del'>-	0xa184, 0x0007, 0x0002, 0x17f3, 0x1831, 0x17f3, 0x17f3, 0x17f3,</div><div class='del'>-	0x1819, 0x1800, 0x17f7, 0xa085, 0x0001, 0x0804, 0x184b, 0x684c,</div><div class='del'>-	0xd0bc, 0x0dc8, 0x6860, 0x682e, 0x685c, 0x682a, 0x6858, 0x04c8,</div><div class='del'>-	0xa18c, 0x00ff, 0xa186, 0x001e, 0x1d70, 0x684c, 0xd0bc, 0x0d58,</div><div class='del'>-	0x6860, 0x682e, 0x685c, 0x682a, 0x6804, 0x681a, 0xa080, 0x000d,</div><div class='del'>-	0x2004, 0xa084, 0x000f, 0xa080, 0x2308, 0x2005, 0x6832, 0x6858,</div><div class='del'>-	0x0440, 0xa18c, 0x00ff, 0xa186, 0x0015, 0x19a8, 0x684c, 0xd0ac,</div><div class='del'>-	0x0990, 0x6804, 0x681a, 0xa080, 0x000d, 0x2004, 0xa084, 0x000f,</div><div class='del'>-	0xa080, 0x2308, 0x2005, 0x6832, 0xa006, 0x682e, 0x682a, 0x6858,</div><div class='del'>-	0x0080, 0x684c, 0xd0ac, 0x0904, 0x17f3, 0xa006, 0x682e, 0x682a,</div><div class='del'>-	0x6858, 0xa18c, 0x000f, 0xa188, 0x2308, 0x210d, 0x6932, 0x2d08,</div><div class='del'>-	0x691a, 0x6826, 0x684c, 0xc0dd, 0x684e, 0xa006, 0x680a, 0x697c,</div><div class='del'>-	0x6912, 0x6980, 0x6916, 0x0005, 0x684c, 0xd0ac, 0x090c, 0x151a,</div><div class='del'>-	0x6833, 0x2305, 0x2d08, 0x691a, 0x6858, 0x8001, 0x6826, 0x684c,</div><div class='del'>-	0xc0dd, 0x684e, 0xa006, 0x680a, 0x682e, 0x682a, 0x697c, 0x6912,</div><div class='del'>-	0x6980, 0x6916, 0x0005, 0x20e1, 0x0007, 0x20e1, 0x2000, 0x2001,</div><div class='del'>-	0x020a, 0x2004, 0x82ff, 0x01e8, 0xa280, 0x0004, 0x00d6, 0x206c,</div><div class='del'>-	0x684c, 0xd0dc, 0x1190, 0xa280, 0x0007, 0x2004, 0xa086, 0x000a,</div><div class='del'>-	0x1110, 0x0891, 0x0010, 0x080c, 0x17e7, 0x0138, 0x00de, 0xa280,</div><div class='del'>-	0x0000, 0x2003, 0x0002, 0xa016, 0x0020, 0x6808, 0x8000, 0x680a,</div><div class='del'>-	0x00de, 0x0126, 0x0046, 0x0036, 0x0026, 0x2091, 0x2200, 0x002e,</div><div class='del'>-	0x003e, 0x004e, 0x7000, 0xa005, 0x01d0, 0x710c, 0x220a, 0x8108,</div><div class='del'>-	0x230a, 0x8108, 0x240a, 0x8108, 0xa182, 0xb94b, 0x0210, 0x2009,</div><div class='del'>-	0xb930, 0x710e, 0x7010, 0xa102, 0xa082, 0x0009, 0x0118, 0xa080,</div><div class='del'>-	0x001b, 0x1118, 0x2009, 0x0138, 0x200a, 0x012e, 0x0005, 0x7206,</div><div class='del'>-	0x2001, 0x18ad, 0x0006, 0x2260, 0x0804, 0x19da, 0x0126, 0x0026,</div><div class='del'>-	0x0036, 0x00c6, 0x0006, 0x2091, 0x2200, 0x000e, 0x004e, 0x003e,</div><div class='del'>-	0x002e, 0x00d6, 0x00c6, 0x2460, 0x6110, 0x2168, 0x6a62, 0x6b5e,</div><div class='del'>-	0xa005, 0x0904, 0x190f, 0x6808, 0xa005, 0x0904, 0x1946, 0x7000,</div><div class='del'>-	0xa005, 0x1108, 0x0488, 0x700c, 0x7110, 0xa106, 0x1904, 0x194e,</div><div class='del'>-	0x7004, 0xa406, 0x1548, 0x2001, 0x0005, 0x2004, 0xd08c, 0x0168,</div><div class='del'>-	0x0046, 0x080c, 0x1b22, 0x004e, 0x2460, 0x6010, 0xa080, 0x0002,</div><div class='del'>-	0x2004, 0xa005, 0x0904, 0x1946, 0x0c10, 0x2001, 0x0207, 0x2004,</div><div class='del'>-	0xd09c, 0x1d48, 0x7804, 0xa084, 0x6000, 0x0120, 0xa086, 0x6000,</div><div class='del'>-	0x0108, 0x0c08, 0x7818, 0x6812, 0x781c, 0x6816, 0x7803, 0x0004,</div><div class='del'>-	0x7003, 0x0000, 0x7004, 0x2060, 0x6100, 0xa18e, 0x0004, 0x1904,</div><div class='del'>-	0x194e, 0x2009, 0x0048, 0x080c, 0x86d3, 0x0804, 0x194e, 0x6808,</div><div class='del'>-	0xa005, 0x05a0, 0x7000, 0xa005, 0x0588, 0x700c, 0x7110, 0xa106,</div><div class='del'>-	0x1118, 0x7004, 0xa406, 0x1550, 0x2001, 0x0005, 0x2004, 0xd08c,</div><div class='del'>-	0x0160, 0x0046, 0x080c, 0x1b22, 0x004e, 0x2460, 0x6010, 0xa080,</div><div class='del'>-	0x0002, 0x2004, 0xa005, 0x01d0, 0x0c28, 0x2001, 0x0207, 0x2004,</div><div class='del'>-	0xd09c, 0x1d50, 0x2001, 0x0005, 0x2004, 0xd08c, 0x1d50, 0x7804,</div><div class='del'>-	0xa084, 0x6000, 0x0118, 0xa086, 0x6000, 0x19f0, 0x7818, 0x6812,</div><div class='del'>-	0x781c, 0x6816, 0x7803, 0x0004, 0x7003, 0x0000, 0x6100, 0xa18e,</div><div class='del'>-	0x0004, 0x1120, 0x2009, 0x0048, 0x080c, 0x86d3, 0x00ce, 0x00de,</div><div class='del'>-	0x012e, 0x0005, 0x00f6, 0x00e6, 0x0026, 0x0036, 0x0046, 0x0056,</div><div class='del'>-	0x2071, 0xb924, 0x7000, 0xa086, 0x0000, 0x0904, 0x19b8, 0x7004,</div><div class='del'>-	0xac06, 0x1904, 0x19aa, 0x2079, 0x0030, 0x7000, 0xa086, 0x0003,</div><div class='del'>-	0x0904, 0x19aa, 0x7804, 0xd0fc, 0x15c8, 0x20e1, 0x6000, 0x2011,</div><div class='del'>-	0x0032, 0x2001, 0x0208, 0x200c, 0x2001, 0x0209, 0x2004, 0xa106,</div><div class='del'>-	0x1d88, 0x8211, 0x1db0, 0x7804, 0xd0fc, 0x1540, 0x080c, 0x1e8a,</div><div class='del'>-	0x0026, 0x0056, 0x7803, 0x0004, 0x7804, 0xd0ac, 0x1de8, 0x7803,</div><div class='del'>-	0x0002, 0x7803, 0x0009, 0x7003, 0x0003, 0x7007, 0x0000, 0x005e,</div><div class='del'>-	0x002e, 0x2001, 0x015d, 0x2003, 0x0000, 0x080c, 0x5b41, 0x1138,</div><div class='del'>-	0x0066, 0x2031, 0x0001, 0x080c, 0x5bc3, 0x006e, 0x0058, 0x2001,</div><div class='del'>-	0x0160, 0x2502, 0x2001, 0x0138, 0x2202, 0x0020, 0x080c, 0x1b22,</div><div class='del'>-	0x0804, 0x195a, 0x0156, 0x20a9, 0x0009, 0x2009, 0xb930, 0x2104,</div><div class='del'>-	0xac06, 0x1108, 0x200a, 0xa188, 0x0003, 0x1f04, 0x19af, 0x015e,</div><div class='del'>-	0x005e, 0x004e, 0x003e, 0x002e, 0x00ee, 0x00fe, 0x0005, 0x700c,</div><div class='del'>-	0x7110, 0xa106, 0x0904, 0x1a4e, 0x2104, 0x7006, 0x2060, 0x8108,</div><div class='del'>-	0x211c, 0x8108, 0x2124, 0x8108, 0xa182, 0xb94b, 0x0210, 0x2009,</div><div class='del'>-	0xb930, 0x7112, 0x700c, 0xa106, 0x1128, 0x080c, 0x2920, 0x2001,</div><div class='del'>-	0x0138, 0x2102, 0x8cff, 0x0598, 0x6010, 0x2068, 0x2d58, 0x6828,</div><div class='del'>-	0xa406, 0x1590, 0x682c, 0xa306, 0x1578, 0x7004, 0x2060, 0x6020,</div><div class='del'>-	0xc0d4, 0x6022, 0x684c, 0xd0f4, 0x0128, 0x6817, 0xffff, 0x6813,</div><div class='del'>-	0xffff, 0x00e8, 0x6850, 0xd0f4, 0x1130, 0x7803, 0x0004, 0x6810,</div><div class='del'>-	0x781a, 0x6814, 0x781e, 0x6824, 0x2050, 0x6818, 0x2060, 0x6830,</div><div class='del'>-	0x2040, 0x6034, 0xa0cc, 0x000f, 0x2009, 0x0011, 0x080c, 0x1a51,</div><div class='del'>-	0x0120, 0x2009, 0x0001, 0x080c, 0x1a51, 0x2d58, 0x0005, 0x080c,</div><div class='del'>-	0x1df9, 0x0904, 0x19bf, 0x0cd0, 0x6020, 0xd0f4, 0x11e0, 0xd0d4,</div><div class='del'>-	0x01b8, 0x6038, 0xa402, 0x6034, 0xa303, 0x0108, 0x1288, 0x643a,</div><div class='del'>-	0x6336, 0x6c2a, 0x6b2e, 0x0046, 0x0036, 0x2400, 0x6c7c, 0xa402,</div><div class='del'>-	0x6812, 0x2300, 0x6b80, 0xa303, 0x6816, 0x003e, 0x004e, 0x0018,</div><div class='del'>-	0x080c, 0xa056, 0x09e0, 0x601c, 0xa08e, 0x0008, 0x0904, 0x19e5,</div><div class='del'>-	0xa08e, 0x000a, 0x0904, 0x19e5, 0x2001, 0xb674, 0x2004, 0xd0b4,</div><div class='del'>-	0x1140, 0x6018, 0x2004, 0xd0bc, 0x1120, 0x6817, 0x7fff, 0x6813,</div><div class='del'>-	0xffff, 0x080c, 0x2328, 0x1918, 0x0804, 0x19e5, 0x7003, 0x0000,</div><div class='del'>-	0x0005, 0x8aff, 0x0904, 0x1afc, 0xa03e, 0x2730, 0xc9fc, 0x6850,</div><div class='del'>-	0xd0fc, 0x11b8, 0xd0f4, 0x1588, 0x00d6, 0x2805, 0xac68, 0x2900,</div><div class='del'>-	0x0002, 0x1aba, 0x1a93, 0x1a93, 0x1aba, 0x1aba, 0x1ab2, 0x1aba,</div><div class='del'>-	0x1a93, 0x1aba, 0x1a9b, 0x1a9b, 0x1aba, 0x1aba, 0x1aba, 0x1aaa,</div><div class='del'>-	0x1a9b, 0x7803, 0x0004, 0xc0fc, 0x6852, 0x6b6c, 0x6a70, 0x6d1c,</div><div class='del'>-	0x6c20, 0x00d6, 0xd99c, 0x0140, 0x2805, 0xac68, 0x6f08, 0x6e0c,</div><div class='del'>-	0x080c, 0x23ed, 0x0120, 0x04d0, 0x080c, 0x23ed, 0x15b0, 0x6850,</div><div class='del'>-	0xc0fd, 0x6852, 0x00de, 0xa006, 0x0005, 0xc0f4, 0x6852, 0x6b6c,</div><div class='del'>-	0x6a70, 0x00d6, 0x04c0, 0x6b08, 0x6a0c, 0x6d00, 0x6c04, 0x080c,</div><div class='del'>-	0x23ed, 0x0d80, 0x0410, 0x6b10, 0x6a14, 0x6d00, 0x6c04, 0x6f08,</div><div class='del'>-	0x6e0c, 0x080c, 0x23ed, 0x0d30, 0x00c8, 0x6d00, 0x6c04, 0x6f08,</div><div class='del'>-	0x6e0c, 0x00a0, 0x00de, 0x00d6, 0x6834, 0xa084, 0x00ff, 0xa086,</div><div class='del'>-	0x001e, 0x1140, 0x00de, 0x080c, 0x22ca, 0x1904, 0x1a51, 0xa00e,</div><div class='del'>-	0x0804, 0x1afc, 0x00de, 0x080c, 0x151a, 0xc9fd, 0x7b22, 0x7a26,</div><div class='del'>-	0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7316, 0x721a, 0x751e, 0x7422,</div><div class='del'>-	0x7726, 0x762a, 0x7902, 0x7100, 0x8108, 0x7102, 0x00de, 0x6828,</div><div class='del'>-	0xa300, 0x682a, 0x682c, 0xa201, 0x682e, 0x8109, 0x2d08, 0x1500,</div><div class='del'>-	0xd9fc, 0x0160, 0xc9fc, 0x080c, 0x22ca, 0x01e8, 0x2805, 0xac68,</div><div class='del'>-	0x6800, 0xa506, 0x11c0, 0x6804, 0xa406, 0x00a8, 0xc9fc, 0x080c,</div><div class='del'>-	0x22ca, 0x0188, 0x2805, 0xac68, 0x6800, 0xa506, 0x1160, 0x6804,</div><div class='del'>-	0xa406, 0x1148, 0x6808, 0xa706, 0x1130, 0x680c, 0xa606, 0x0018,</div><div class='del'>-	0xc9fc, 0x080c, 0x22ca, 0x2168, 0x0005, 0x080c, 0x151a, 0x080c,</div><div class='del'>-	0x1f71, 0x7004, 0x2060, 0x00d6, 0x6010, 0x2068, 0x7003, 0x0000,</div><div class='del'>-	0x080c, 0x1e1a, 0x080c, 0x9d16, 0x0170, 0x6808, 0x8001, 0x680a,</div><div class='del'>-	0x697c, 0x6912, 0x6980, 0x6916, 0x682b, 0xffff, 0x682f, 0xffff,</div><div class='del'>-	0x6850, 0xc0bd, 0x6852, 0x00de, 0x080c, 0x99e6, 0x0804, 0x1d47,</div><div class='del'>-	0x080c, 0x151a, 0x0126, 0x2091, 0x2200, 0x0006, 0x0016, 0x2b68,</div><div class='del'>-	0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184, 0x0700, 0x1978,</div><div class='del'>-	0xa184, 0x0003, 0xa086, 0x0003, 0x0d58, 0x7000, 0x0002, 0x1b3f,</div><div class='del'>-	0x1b45, 0x1c56, 0x1d22, 0x1d36, 0x1b3f, 0x1b3f, 0x1b3f, 0x7804,</div><div class='del'>-	0xd09c, 0x1904, 0x1d47, 0x080c, 0x151a, 0x8001, 0x7002, 0xd1bc,</div><div class='del'>-	0x11a0, 0xd19c, 0x1904, 0x1bda, 0xd1dc, 0x1178, 0x8aff, 0x0904,</div><div class='del'>-	0x1bda, 0x2009, 0x0001, 0x080c, 0x1a51, 0x0904, 0x1d47, 0x2009,</div><div class='del'>-	0x0001, 0x080c, 0x1a51, 0x0804, 0x1d47, 0x7803, 0x0004, 0x7003,</div><div class='del'>-	0x0000, 0xd1bc, 0x1904, 0x1bba, 0x0026, 0x0036, 0x7c20, 0x7d24,</div><div class='del'>-	0x7e30, 0x7f34, 0x7818, 0x6812, 0x781c, 0x6816, 0x2001, 0x0201,</div><div class='del'>-	0x2004, 0xa005, 0x0140, 0x7808, 0xd0ec, 0x1128, 0x7803, 0x0009,</div><div class='del'>-	0x7003, 0x0004, 0x0010, 0x080c, 0x1d4b, 0x6b28, 0x6a2c, 0x2400,</div><div class='del'>-	0x686e, 0xa31a, 0x2500, 0x6872, 0xa213, 0x6b2a, 0x6a2e, 0x00c6,</div><div class='del'>-	0x7004, 0x2060, 0x6020, 0xd0f4, 0x1110, 0x633a, 0x6236, 0x00ce,</div><div class='del'>-	0x003e, 0x002e, 0x6e1e, 0x6f22, 0x2500, 0xa405, 0x0128, 0x080c,</div><div class='del'>-	0x22e0, 0x6850, 0xc0fd, 0x6852, 0x2a00, 0x6826, 0x2c00, 0x681a,</div><div class='del'>-	0x2800, 0x6832, 0x6808, 0x8001, 0x680a, 0x1148, 0x684c, 0xd0e4,</div><div class='del'>-	0x0130, 0x7004, 0x2060, 0x2009, 0x0048, 0x080c, 0x86d3, 0x7000,</div><div class='del'>-	0xa086, 0x0004, 0x0904, 0x1d47, 0x7003, 0x0000, 0x080c, 0x19bf,</div><div class='del'>-	0x0804, 0x1d47, 0x0056, 0x7d0c, 0xd5bc, 0x1110, 0x080c, 0xb4c3,</div><div class='del'>-	0x005e, 0x080c, 0x1e1a, 0x00f6, 0x7004, 0x2078, 0x080c, 0x5377,</div><div class='del'>-	0x0118, 0x7820, 0xc0f5, 0x7822, 0x00fe, 0x682b, 0xffff, 0x682f,</div><div class='del'>-	0xffff, 0x6808, 0x8001, 0x680a, 0x697c, 0x791a, 0x6980, 0x791e,</div><div class='del'>-	0x0804, 0x1d47, 0x7004, 0x00c6, 0x2060, 0x6020, 0x00ce, 0xd0f4,</div><div class='del'>-	0x0120, 0x6808, 0x8001, 0x680a, 0x04c0, 0x7818, 0x6812, 0x7a1c,</div><div class='del'>-	0x6a16, 0xd19c, 0x0160, 0xa205, 0x0150, 0x7004, 0xa080, 0x0007,</div><div class='del'>-	0x2004, 0xa084, 0xfffd, 0xa086, 0x0008, 0x1904, 0x1b5d, 0x684c,</div><div class='del'>-	0xc0f5, 0x684e, 0x7814, 0xa005, 0x1520, 0x7003, 0x0000, 0x6808,</div><div class='del'>-	0x8001, 0x680a, 0x01a0, 0x7004, 0x2060, 0x601c, 0xa086, 0x000a,</div><div class='del'>-	0x11a0, 0x0156, 0x20a9, 0x0009, 0x2009, 0xb930, 0x2104, 0xac06,</div><div class='del'>-	0x1108, 0x200a, 0xa188, 0x0003, 0x1f04, 0x1c0e, 0x015e, 0x7004,</div><div class='del'>-	0x2060, 0x2009, 0x0048, 0x080c, 0x86d3, 0x080c, 0x19bf, 0x0804,</div><div class='del'>-	0x1d47, 0x7818, 0x6812, 0x781c, 0x6816, 0x7814, 0x7908, 0xa18c,</div><div class='del'>-	0x0fff, 0xa192, 0x0841, 0x1a04, 0x1aff, 0xa188, 0x0007, 0x8114,</div><div class='del'>-	0x8214, 0x8214, 0xa10a, 0x8104, 0x8004, 0x8004, 0xa20a, 0x810b,</div><div class='del'>-	0x810b, 0x810b, 0x080c, 0x1eb5, 0x7803, 0x0004, 0x780f, 0xffff,</div><div class='del'>-	0x7803, 0x0001, 0x7804, 0xd0fc, 0x0de8, 0x7803, 0x0002, 0x7803,</div><div class='del'>-	0x0004, 0x780f, 0x00f6, 0x7004, 0x7007, 0x0000, 0x2060, 0x2009,</div><div class='del'>-	0x0048, 0x080c, 0x86d3, 0x080c, 0x1f0b, 0x0838, 0x8001, 0x7002,</div><div class='del'>-	0xd194, 0x01b0, 0x7804, 0xd0fc, 0x1904, 0x1cf2, 0xd09c, 0x0138,</div><div class='del'>-	0x7804, 0xd0fc, 0x1904, 0x1cf2, 0xd09c, 0x1904, 0x1cf6, 0x8aff,</div><div class='del'>-	0x0904, 0x1d47, 0x2009, 0x0001, 0x080c, 0x1a51, 0x0804, 0x1d47,</div><div class='del'>-	0xa184, 0x0888, 0x1148, 0x8aff, 0x0904, 0x1d47, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0x1a51, 0x0804, 0x1d47, 0x7818, 0x6812, 0x7a1c, 0x6a16,</div><div class='del'>-	0xa205, 0x0904, 0x1bf7, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc,</div><div class='del'>-	0x1904, 0x1cd4, 0x6834, 0xa084, 0x00ff, 0xa086, 0x0029, 0x1118,</div><div class='del'>-	0xd19c, 0x1904, 0x1bf7, 0x0026, 0x0036, 0x7c20, 0x7d24, 0x7e30,</div><div class='del'>-	0x7f34, 0x7818, 0x6812, 0x781c, 0x6816, 0x2001, 0x0201, 0x2004,</div><div class='del'>-	0xa005, 0x0140, 0x7808, 0xd0ec, 0x1128, 0x7803, 0x0009, 0x7003,</div><div class='del'>-	0x0004, 0x0020, 0x0016, 0x080c, 0x1d4b, 0x001e, 0x6b28, 0x6a2c,</div><div class='del'>-	0x080c, 0x22e0, 0x00d6, 0x2805, 0xac68, 0x6034, 0xd09c, 0x1128,</div><div class='del'>-	0x6808, 0xa31a, 0x680c, 0xa213, 0x0020, 0x6810, 0xa31a, 0x6814,</div><div class='del'>-	0xa213, 0x00de, 0xd194, 0x0904, 0x1b7f, 0x2a00, 0x6826, 0x2c00,</div><div class='del'>-	0x681a, 0x2800, 0x6832, 0x6808, 0x8001, 0x680a, 0x6b2a, 0x6a2e,</div><div class='del'>-	0x003e, 0x002e, 0x0804, 0x1c1d, 0x0056, 0x7d0c, 0x080c, 0xb4c3,</div><div class='del'>-	0x005e, 0x080c, 0x1e1a, 0x00f6, 0x7004, 0x2078, 0x080c, 0x5377,</div><div class='del'>-	0x0118, 0x7820, 0xc0f5, 0x7822, 0x00fe, 0x682b, 0xffff, 0x682f,</div><div class='del'>-	0xffff, 0x6808, 0x8001, 0x680a, 0x697c, 0x791a, 0x6980, 0x791e,</div><div class='del'>-	0x0804, 0x1d47, 0x7804, 0xd09c, 0x0904, 0x1b2a, 0x7c20, 0x7824,</div><div class='del'>-	0xa405, 0x1904, 0x1b2a, 0x7818, 0x6812, 0x7c1c, 0x6c16, 0xa405,</div><div class='del'>-	0x1120, 0x7803, 0x0002, 0x0804, 0x1bf7, 0x751c, 0x7420, 0x7724,</div><div class='del'>-	0x7628, 0x7014, 0xa528, 0x7018, 0xa421, 0xa7b9, 0x0000, 0xa6b1,</div><div class='del'>-	0x0000, 0x7830, 0xa506, 0x1150, 0x7834, 0xa406, 0x1138, 0x7838,</div><div class='del'>-	0xa706, 0x1120, 0x783c, 0xa606, 0x0904, 0x1b2a, 0x7803, 0x0002,</div><div class='del'>-	0x0804, 0x1c83, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0xa00d,</div><div class='del'>-	0x0150, 0x6808, 0x8001, 0x680a, 0x1130, 0x7004, 0x2060, 0x2009,</div><div class='del'>-	0x0048, 0x080c, 0x86d3, 0x080c, 0x19bf, 0x0088, 0x7803, 0x0004,</div><div class='del'>-	0x7003, 0x0000, 0x7004, 0x2060, 0x6010, 0xa005, 0x0da0, 0x2068,</div><div class='del'>-	0x6808, 0x8000, 0x680a, 0x6c28, 0x6b2c, 0x080c, 0x19da, 0x001e,</div><div class='del'>-	0x000e, 0x012e, 0x0005, 0x700c, 0x7110, 0xa106, 0x0904, 0x1ded,</div><div class='del'>-	0x7004, 0x0016, 0x210c, 0xa106, 0x001e, 0x0904, 0x1ded, 0x00d6,</div><div class='del'>-	0x00c6, 0x216c, 0x2d00, 0xa005, 0x0904, 0x1deb, 0x681c, 0xa086,</div><div class='del'>-	0x0008, 0x0904, 0x1deb, 0x6820, 0xd0d4, 0x1904, 0x1deb, 0x6810,</div><div class='del'>-	0x2068, 0x6850, 0xd0fc, 0x05a8, 0x8108, 0x2104, 0x6b2c, 0xa306,</div><div class='del'>-	0x1904, 0x1deb, 0x8108, 0x2104, 0x6a28, 0xa206, 0x1904, 0x1deb,</div><div class='del'>-	0x6850, 0xc0fc, 0xc0f5, 0x6852, 0x686c, 0x7822, 0x7016, 0x6870,</div><div class='del'>-	0x7826, 0x701a, 0x681c, 0x7832, 0x701e, 0x6820, 0x7836, 0x7022,</div><div class='del'>-	0x6818, 0x2060, 0x6034, 0xd09c, 0x0168, 0x6830, 0x2005, 0x00d6,</div><div class='del'>-	0xac68, 0x6808, 0x783a, 0x7026, 0x680c, 0x783e, 0x702a, 0x00de,</div><div class='del'>-	0x0804, 0x1de5, 0xa006, 0x783a, 0x783e, 0x7026, 0x702a, 0x0804,</div><div class='del'>-	0x1de5, 0x8108, 0x2104, 0xa005, 0x1904, 0x1deb, 0x6b2c, 0xa306,</div><div class='del'>-	0x1904, 0x1deb, 0x8108, 0x2104, 0xa005, 0x15e8, 0x6a28, 0xa206,</div><div class='del'>-	0x15d0, 0x6850, 0xc0f5, 0x6852, 0x6830, 0x2005, 0x6918, 0xa160,</div><div class='del'>-	0xa180, 0x000d, 0x2004, 0xd09c, 0x11a0, 0x6008, 0x7822, 0x7016,</div><div class='del'>-	0x686e, 0x600c, 0x7826, 0x701a, 0x6872, 0x6000, 0x7832, 0x701e,</div><div class='del'>-	0x6004, 0x7836, 0x7022, 0xa006, 0x783a, 0x783e, 0x7026, 0x702a,</div><div class='del'>-	0x00a0, 0x6010, 0x7822, 0x7016, 0x686e, 0x6014, 0x7826, 0x701a,</div><div class='del'>-	0x6872, 0x6000, 0x7832, 0x701e, 0x6004, 0x7836, 0x7022, 0x6008,</div><div class='del'>-	0x783a, 0x7026, 0x600c, 0x783e, 0x702a, 0x6810, 0x781a, 0x6814,</div><div class='del'>-	0x781e, 0x7803, 0x0011, 0x00ce, 0x00de, 0x0005, 0x2011, 0x0201,</div><div class='del'>-	0x2009, 0x003c, 0x2204, 0xa005, 0x1118, 0x8109, 0x1dd8, 0x0005,</div><div class='del'>-	0x0005, 0x0ca1, 0x0118, 0x780c, 0xd0a4, 0x0120, 0x00d9, 0xa085,</div><div class='del'>-	0x0001, 0x0010, 0x080c, 0x1f0b, 0x0005, 0x0126, 0x2091, 0x2200,</div><div class='del'>-	0x7000, 0xa086, 0x0003, 0x1160, 0x700c, 0x7110, 0xa106, 0x0140,</div><div class='del'>-	0x080c, 0x2991, 0x20e1, 0x9028, 0x700f, 0xb930, 0x7013, 0xb930,</div><div class='del'>-	0x012e, 0x0005, 0x00c6, 0x080c, 0x5b41, 0x11b8, 0x2001, 0x0160,</div><div class='del'>-	0x2003, 0x0000, 0x2001, 0x0138, 0x2003, 0x0000, 0x2011, 0x00c8,</div><div class='del'>-	0xe000, 0xe000, 0x8211, 0x1de0, 0x04b1, 0x0066, 0x2031, 0x0000,</div><div class='del'>-	0x080c, 0x5bc3, 0x006e, 0x00ce, 0x0005, 0x080c, 0x1e8a, 0x080c,</div><div class='del'>-	0x2991, 0x20e1, 0x9028, 0x700c, 0x7110, 0xa106, 0x01c0, 0x2104,</div><div class='del'>-	0xa005, 0x0130, 0x2060, 0x6010, 0x2060, 0x6008, 0x8001, 0x600a,</div><div class='del'>-	0xa188, 0x0003, 0xa182, 0xb94b, 0x0210, 0x2009, 0xb930, 0x7112,</div><div class='del'>-	0x700c, 0xa106, 0x1d40, 0x080c, 0x2920, 0x2110, 0x0c20, 0x2001,</div><div class='del'>-	0x015d, 0x2003, 0x0000, 0x2001, 0x0160, 0x2502, 0x2001, 0x0138,</div><div class='del'>-	0x2202, 0x00ce, 0x0005, 0x080c, 0x2991, 0x20e1, 0x9028, 0x2001,</div><div class='del'>-	0x015d, 0x2003, 0x0000, 0x00e6, 0x00c6, 0x0016, 0x2071, 0xb924,</div><div class='del'>-	0x700c, 0x7110, 0xa106, 0x0190, 0x2104, 0xa005, 0x0130, 0x2060,</div><div class='del'>-	0x6010, 0x2060, 0x6008, 0x8001, 0x600a, 0xa188, 0x0003, 0xa182,</div><div class='del'>-	0xb94b, 0x0210, 0x2009, 0xb930, 0x7112, 0x0c50, 0x001e, 0x00ce,</div><div class='del'>-	0x00ee, 0x0005, 0x2001, 0x0138, 0x2014, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x0160, 0x202c, 0x2003, 0x0000, 0x080c, 0x5b41, 0x1148, 0x2021,</div><div class='del'>-	0x0002, 0x1d04, 0x1e99, 0x2091, 0x6000, 0x8421, 0x1dd0, 0x0005,</div><div class='del'>-	0x2021, 0xb015, 0x2001, 0x0141, 0x201c, 0xd3dc, 0x1168, 0x2001,</div><div class='del'>-	0x0109, 0x201c, 0xa39c, 0x0048, 0x1138, 0x2001, 0x0111, 0x201c,</div><div class='del'>-	0x83ff, 0x1110, 0x8421, 0x1d70, 0x0005, 0x00e6, 0x2071, 0x0200,</div><div class='del'>-	0x7808, 0xa084, 0xf000, 0xa10d, 0x0869, 0x2001, 0x0105, 0x2004,</div><div class='del'>-	0xa084, 0x0003, 0x1130, 0x2001, 0xb94b, 0x2004, 0xa086, 0x0000,</div><div class='del'>-	0x0548, 0xa026, 0x2019, 0xf000, 0x8319, 0x1148, 0x2001, 0x012b,</div><div class='del'>-	0x2003, 0x95f5, 0x2001, 0x0129, 0x2003, 0x95f5, 0x00d8, 0x2001,</div><div class='del'>-	0x0105, 0x2004, 0xa084, 0x0003, 0x1130, 0x2001, 0xb94b, 0x2004,</div><div class='del'>-	0xa086, 0x0000, 0x0178, 0x2001, 0x0132, 0x2004, 0xa436, 0x0110,</div><div class='del'>-	0x2020, 0x0c00, 0x2001, 0x0021, 0x2004, 0xd0fc, 0x09e8, 0x080c,</div><div class='del'>-	0x216d, 0x08c0, 0x20e1, 0x7000, 0x7324, 0x7420, 0x7028, 0x7028,</div><div class='del'>-	0x7426, 0x7037, 0x0001, 0x810f, 0x712e, 0x702f, 0x0100, 0x7037,</div><div class='del'>-	0x0008, 0x7326, 0x7422, 0x2001, 0x0160, 0x2502, 0x2001, 0x0138,</div><div class='del'>-	0x2202, 0x00ee, 0x0005, 0x0026, 0x2001, 0x015d, 0x2003, 0x0000,</div><div class='del'>-	0x7908, 0xa18c, 0x0fff, 0xa182, 0x0ffd, 0x0210, 0x2009, 0x0000,</div><div class='del'>-	0xa190, 0x0007, 0xa294, 0x1ff8, 0x8214, 0x8214, 0x8214, 0x2001,</div><div class='del'>-	0x020a, 0x82ff, 0x0140, 0x20e1, 0x6000, 0x200c, 0x200c, 0x200c,</div><div class='del'>-	0x200c, 0x8211, 0x1dd0, 0x20e1, 0x7000, 0x200c, 0x200c, 0x7003,</div><div class='del'>-	0x0000, 0x20e1, 0x6000, 0x2001, 0x0208, 0x200c, 0x2001, 0x0209,</div><div class='del'>-	0x2004, 0xa106, 0x0158, 0x080c, 0x1dee, 0x0130, 0x7908, 0xd1ec,</div><div class='del'>-	0x1128, 0x790c, 0xd1a4, 0x0960, 0x080c, 0x1e1a, 0xa006, 0x002e,</div><div class='del'>-	0x0005, 0x00f6, 0x00e6, 0x0016, 0x0026, 0x2071, 0xb924, 0x2079,</div><div class='del'>-	0x0030, 0x2011, 0x0050, 0x7000, 0xa086, 0x0000, 0x01a8, 0x8211,</div><div class='del'>-	0x0188, 0x2001, 0x0005, 0x2004, 0xd08c, 0x0dc8, 0x7904, 0xa18c,</div><div class='del'>-	0x0780, 0x0016, 0x080c, 0x1b22, 0x001e, 0x81ff, 0x1118, 0x2011,</div><div class='del'>-	0x0050, 0x0c48, 0xa085, 0x0001, 0x002e, 0x001e, 0x00ee, 0x00fe,</div><div class='del'>-	0x0005, 0x7803, 0x0004, 0x2009, 0x0064, 0x7804, 0xd0ac, 0x0904,</div><div class='del'>-	0x1fbd, 0x8109, 0x1dd0, 0x2009, 0x0100, 0x210c, 0xa18a, 0x0003,</div><div class='del'>-	0x0a0c, 0x151a, 0x080c, 0x2274, 0x00e6, 0x00f6, 0x2071, 0xb913,</div><div class='del'>-	0x2079, 0x0010, 0x7004, 0xa086, 0x0000, 0x0538, 0x7800, 0x0006,</div><div class='del'>-	0x7820, 0x0006, 0x7830, 0x0006, 0x7834, 0x0006, 0x7838, 0x0006,</div><div class='del'>-	0x783c, 0x0006, 0x7803, 0x0004, 0xe000, 0xe000, 0x2079, 0x0030,</div><div class='del'>-	0x7804, 0xd0ac, 0x190c, 0x151a, 0x2079, 0x0010, 0x000e, 0x783e,</div><div class='del'>-	0x000e, 0x783a, 0x000e, 0x7836, 0x000e, 0x7832, 0x000e, 0x7822,</div><div class='del'>-	0x000e, 0x7802, 0x00fe, 0x00ee, 0x0030, 0x00fe, 0x00ee, 0x7804,</div><div class='del'>-	0xd0ac, 0x190c, 0x151a, 0x080c, 0x72a2, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0xb94b, 0x7003, 0x0000, 0x00ee, 0x0005, 0x00d6, 0xa280, 0x0004,</div><div class='del'>-	0x206c, 0x694c, 0xd1dc, 0x1904, 0x203b, 0x6934, 0xa184, 0x0007,</div><div class='del'>-	0x0002, 0x1fd9, 0x2026, 0x1fd9, 0x1fd9, 0x1fd9, 0x200d, 0x1fec,</div><div class='del'>-	0x1fdb, 0x080c, 0x151a, 0x684c, 0xd0b4, 0x0904, 0x212a, 0x6860,</div><div class='del'>-	0x682e, 0x6816, 0x685c, 0x682a, 0x6812, 0x687c, 0x680a, 0x6880,</div><div class='del'>-	0x680e, 0x6958, 0x0804, 0x202e, 0x6834, 0xa084, 0x00ff, 0xa086,</div><div class='del'>-	0x001e, 0x1d38, 0x684c, 0xd0b4, 0x0904, 0x212a, 0x6860, 0x682e,</div><div class='del'>-	0x6816, 0x685c, 0x682a, 0x6812, 0x687c, 0x680a, 0x6880, 0x680e,</div><div class='del'>-	0x6804, 0x681a, 0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080,</div><div class='del'>-	0x2308, 0x2005, 0x6832, 0x6958, 0x0450, 0xa18c, 0x00ff, 0xa186,</div><div class='del'>-	0x0015, 0x1548, 0x684c, 0xd0b4, 0x0904, 0x212a, 0x6804, 0x681a,</div><div class='del'>-	0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x2308, 0x2005,</div><div class='del'>-	0x6832, 0x6958, 0xa006, 0x682e, 0x682a, 0x0088, 0x684c, 0xd0b4,</div><div class='del'>-	0x0904, 0x1afd, 0x6958, 0xa006, 0x682e, 0x682a, 0x2d00, 0x681a,</div><div class='del'>-	0x6834, 0xa084, 0x000f, 0xa080, 0x2308, 0x2005, 0x6832, 0x6926,</div><div class='del'>-	0x684c, 0xc0dd, 0x684e, 0x00de, 0x0005, 0x00f6, 0x2079, 0x0020,</div><div class='del'>-	0x7804, 0xd0fc, 0x190c, 0x216d, 0x00e6, 0x00d6, 0x2071, 0xb94b,</div><div class='del'>-	0x7000, 0xa005, 0x1904, 0x20aa, 0x00c6, 0x7206, 0xa280, 0x0004,</div><div class='del'>-	0x205c, 0x7004, 0x2068, 0x7803, 0x0004, 0x6818, 0x00d6, 0x2068,</div><div class='del'>-	0x686c, 0x7812, 0x6890, 0x00f6, 0x20e1, 0x9040, 0x2079, 0x0200,</div><div class='del'>-	0x781a, 0x2079, 0x0100, 0x8004, 0x78d6, 0x00fe, 0x00de, 0x2b68,</div><div class='del'>-	0x6824, 0x2050, 0x6818, 0x2060, 0x6830, 0x2040, 0x6034, 0xa0cc,</div><div class='del'>-	0x000f, 0x6908, 0x791a, 0x7116, 0x680c, 0x781e, 0x701a, 0xa006,</div><div class='del'>-	0x700e, 0x7012, 0x7004, 0x692c, 0x6814, 0xa106, 0x1120, 0x6928,</div><div class='del'>-	0x6810, 0xa106, 0x0190, 0x2001, 0xb674, 0x2004, 0xd0cc, 0x0110,</div><div class='del'>-	0x00ce, 0x0400, 0x0036, 0x0046, 0x6b14, 0x6c10, 0x080c, 0x2328,</div><div class='del'>-	0x004e, 0x003e, 0x0110, 0x00ce, 0x00a8, 0x8aff, 0x1120, 0x00ce,</div><div class='del'>-	0xa085, 0x0001, 0x0078, 0x0126, 0x2091, 0x8000, 0x2079, 0x0020,</div><div class='del'>-	0x2009, 0x0001, 0x0059, 0x0118, 0x2009, 0x0001, 0x0039, 0x012e,</div><div class='del'>-	0x00ce, 0xa006, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x0076, 0x0066,</div><div class='del'>-	0x0056, 0x0046, 0x0036, 0x0026, 0x8aff, 0x0904, 0x2123, 0x700c,</div><div class='del'>-	0x7214, 0xa23a, 0x7010, 0x7218, 0xa203, 0x0a04, 0x2122, 0xa705,</div><div class='del'>-	0x0904, 0x2122, 0xa03e, 0x2730, 0x6850, 0xd0fc, 0x11a8, 0x00d6,</div><div class='del'>-	0x2805, 0xac68, 0x2900, 0x0002, 0x2105, 0x20ea, 0x20ea, 0x2105,</div><div class='del'>-	0x2105, 0x20fe, 0x2105, 0x20ea, 0x2105, 0x20ef, 0x20ef, 0x2105,</div><div class='del'>-	0x2105, 0x2105, 0x20f6, 0x20ef, 0xc0fc, 0x6852, 0x6b6c, 0x6a70,</div><div class='del'>-	0x6d1c, 0x6c20, 0xd99c, 0x0528, 0x00d6, 0x2805, 0xac68, 0x6f08,</div><div class='del'>-	0x6e0c, 0x00f0, 0x6b08, 0x6a0c, 0x6d00, 0x6c04, 0x00c8, 0x6b10,</div><div class='del'>-	0x6a14, 0x6d00, 0x6c04, 0x6f08, 0x6e0c, 0x0090, 0x00de, 0x00d6,</div><div class='del'>-	0x6834, 0xa084, 0x00ff, 0xa086, 0x001e, 0x1138, 0x00de, 0x080c,</div><div class='del'>-	0x22ca, 0x1904, 0x20b4, 0xa00e, 0x00f0, 0x00de, 0x080c, 0x151a,</div><div class='del'>-	0x00de, 0x7b22, 0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7902,</div><div class='del'>-	0x7000, 0x8000, 0x7002, 0x6828, 0xa300, 0x682a, 0x682c, 0xa201,</div><div class='del'>-	0x682e, 0x700c, 0xa300, 0x700e, 0x7010, 0xa201, 0x7012, 0x080c,</div><div class='del'>-	0x22ca, 0x0008, 0xa006, 0x002e, 0x003e, 0x004e, 0x005e, 0x006e,</div><div class='del'>-	0x007e, 0x0005, 0x080c, 0x151a, 0x0026, 0x2001, 0x0105, 0x2003,</div><div class='del'>-	0x0010, 0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004,</div><div class='del'>-	0x2060, 0x00d6, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0118, 0x6850,</div><div class='del'>-	0xc0bd, 0x6852, 0x601c, 0xa086, 0x0006, 0x1180, 0x2061, 0x0100,</div><div class='del'>-	0x62c8, 0x2001, 0x00fa, 0x8001, 0x1df0, 0x60c8, 0xa206, 0x1dc0,</div><div class='del'>-	0x60c4, 0x686a, 0x60c8, 0x6866, 0x7004, 0x2060, 0x00de, 0x00c6,</div><div class='del'>-	0x080c, 0x99e6, 0x00ce, 0x2001, 0xb8f0, 0x2004, 0xac06, 0x1150,</div><div class='del'>-	0x20e1, 0x9040, 0x080c, 0x82e4, 0x2011, 0x0000, 0x080c, 0x8106,</div><div class='del'>-	0x080c, 0x72a2, 0x002e, 0x0804, 0x2227, 0x0126, 0x2091, 0x2400,</div><div class='del'>-	0x0006, 0x0016, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x2079, 0x0020,</div><div class='del'>-	0x2071, 0xb94b, 0x2b68, 0x6818, 0x2060, 0x7904, 0x7803, 0x0002,</div><div class='del'>-	0xa184, 0x0700, 0x1904, 0x212c, 0x7000, 0x0002, 0x2227, 0x218a,</div><div class='del'>-	0x21fa, 0x2225, 0x8001, 0x7002, 0xd19c, 0x1170, 0x8aff, 0x05d0,</div><div class='del'>-	0x2009, 0x0001, 0x080c, 0x20ae, 0x0904, 0x2227, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0x20ae, 0x0804, 0x2227, 0x7803, 0x0004, 0xd194, 0x0148,</div><div class='del'>-	0x6850, 0xc0fc, 0x6852, 0x8aff, 0x11d8, 0x684c, 0xc0f5, 0x684e,</div><div class='del'>-	0x00b8, 0x0026, 0x0036, 0x6b28, 0x6a2c, 0x7820, 0x686e, 0xa31a,</div><div class='del'>-	0x7824, 0x6872, 0xa213, 0x7830, 0x681e, 0x7834, 0x6822, 0x6b2a,</div><div class='del'>-	0x6a2e, 0x003e, 0x002e, 0x080c, 0x22e0, 0x6850, 0xc0fd, 0x6852,</div><div class='del'>-	0x2a00, 0x6826, 0x2c00, 0x681a, 0x2800, 0x6832, 0x7003, 0x0000,</div><div class='del'>-	0x0804, 0x2227, 0x00f6, 0x0026, 0x781c, 0x0006, 0x7818, 0x0006,</div><div class='del'>-	0x2079, 0x0100, 0x7a14, 0xa284, 0x0184, 0xa085, 0x0012, 0x7816,</div><div class='del'>-	0x0036, 0x2019, 0x1000, 0x8319, 0x090c, 0x151a, 0x7820, 0xd0bc,</div><div class='del'>-	0x1dd0, 0x003e, 0x79c8, 0x000e, 0xa102, 0x001e, 0x0006, 0x0016,</div><div class='del'>-	0x79c4, 0x000e, 0xa103, 0x78c6, 0x000e, 0x78ca, 0xa284, 0x0184,</div><div class='del'>-	0xa085, 0x0012, 0x7816, 0x002e, 0x00fe, 0x7803, 0x0008, 0x7003,</div><div class='del'>-	0x0000, 0x0468, 0x8001, 0x7002, 0xd194, 0x0168, 0x7804, 0xd0fc,</div><div class='del'>-	0x1904, 0x217d, 0xd19c, 0x11f8, 0x8aff, 0x0508, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0x20ae, 0x00e0, 0x0026, 0x0036, 0x6b28, 0x6a2c, 0x080c,</div><div class='del'>-	0x22e0, 0x00d6, 0x2805, 0xac68, 0x6034, 0xd09c, 0x1128, 0x6808,</div><div class='del'>-	0xa31a, 0x680c, 0xa213, 0x0020, 0x6810, 0xa31a, 0x6814, 0xa213,</div><div class='del'>-	0x00de, 0x0804, 0x21ad, 0x0804, 0x21a9, 0x080c, 0x151a, 0x00ce,</div><div class='del'>-	0x00de, 0x00ee, 0x00fe, 0x001e, 0x000e, 0x012e, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x2071, 0xb94b, 0x7000, 0xa086, 0x0000, 0x05d0, 0x2079,</div><div class='del'>-	0x0020, 0x0016, 0x2009, 0x0207, 0x210c, 0xd194, 0x0198, 0x2009,</div><div class='del'>-	0x020c, 0x210c, 0xa184, 0x0003, 0x0168, 0x080c, 0xb50c, 0x2001,</div><div class='del'>-	0x0133, 0x2004, 0xa005, 0x090c, 0x151a, 0x20e1, 0x9040, 0x2001,</div><div class='del'>-	0x020c, 0x2102, 0x2009, 0x0206, 0x2104, 0x2009, 0x0203, 0x210c,</div><div class='del'>-	0xa106, 0x1110, 0x20e1, 0x9040, 0x7804, 0xd0fc, 0x09d8, 0x080c,</div><div class='del'>-	0x216d, 0x7000, 0xa086, 0x0000, 0x19a8, 0x001e, 0x7803, 0x0004,</div><div class='del'>-	0x7804, 0xd0ac, 0x1de8, 0x20e1, 0x9040, 0x7803, 0x0002, 0x7003,</div><div class='del'>-	0x0000, 0x00ee, 0x00fe, 0x0005, 0x0026, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x2071, 0xb94b, 0x2079, 0x0020, 0x7000, 0xa086, 0x0000,</div><div class='del'>-	0x0540, 0x7004, 0x2060, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0158,</div><div class='del'>-	0x6850, 0xc0b5, 0x6852, 0x680c, 0x7a1c, 0xa206, 0x1120, 0x6808,</div><div class='del'>-	0x7a18, 0xa206, 0x01e0, 0x2001, 0x0105, 0x2003, 0x0010, 0x20e1,</div><div class='del'>-	0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060, 0x080c,</div><div class='del'>-	0x99e6, 0x20e1, 0x9040, 0x080c, 0x82e4, 0x2011, 0x0000, 0x080c,</div><div class='del'>-	0x8106, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x002e, 0x0005, 0x6810,</div><div class='del'>-	0x6a14, 0xa205, 0x1d00, 0x684c, 0xc0dc, 0x684e, 0x2c10, 0x080c,</div><div class='del'>-	0x1fc5, 0x2001, 0x0105, 0x2003, 0x0010, 0x20e1, 0x9040, 0x7803,</div><div class='del'>-	0x0004, 0x7003, 0x0000, 0x2069, 0xb8e1, 0x6833, 0x0000, 0x683f,</div><div class='del'>-	0x0000, 0x08f8, 0x8840, 0x2805, 0xa005, 0x1170, 0x6004, 0xa005,</div><div class='del'>-	0x0168, 0x681a, 0x2060, 0x6034, 0xa084, 0x000f, 0xa080, 0x2308,</div><div class='del'>-	0x2045, 0x88ff, 0x090c, 0x151a, 0x8a51, 0x0005, 0x2050, 0x0005,</div><div class='del'>-	0x8a50, 0x8841, 0x2805, 0xa005, 0x1190, 0x2c00, 0xad06, 0x0120,</div><div class='del'>-	0x6000, 0xa005, 0x1108, 0x2d00, 0x2060, 0x681a, 0x6034, 0xa084,</div><div class='del'>-	0x000f, 0xa080, 0x2318, 0x2045, 0x88ff, 0x090c, 0x151a, 0x0005,</div><div class='del'>-	0x0000, 0x0011, 0x0015, 0x0019, 0x001d, 0x0021, 0x0025, 0x0029,</div><div class='del'>-	0x0000, 0x000f, 0x0015, 0x001b, 0x0021, 0x0027, 0x0000, 0x0000,</div><div class='del'>-	0x0000, 0x22fd, 0x22f9, 0x0000, 0x0000, 0x2307, 0x0000, 0x22fd,</div><div class='del'>-	0x0000, 0x2304, 0x2301, 0x0000, 0x0000, 0x0000, 0x2307, 0x2304,</div><div class='del'>-	0x0000, 0x22ff, 0x22ff, 0x0000, 0x0000, 0x2307, 0x0000, 0x22ff,</div><div class='del'>-	0x0000, 0x2305, 0x2305, 0x0000, 0x0000, 0x0000, 0x2307, 0x2305,</div><div class='del'>-	0x00a6, 0x0096, 0x0086, 0x6b2e, 0x6c2a, 0x6858, 0xa055, 0x0904,</div><div class='del'>-	0x23b9, 0x2d60, 0x6034, 0xa0cc, 0x000f, 0xa9c0, 0x2308, 0xa986,</div><div class='del'>-	0x0007, 0x0130, 0xa986, 0x000e, 0x0118, 0xa986, 0x000f, 0x1120,</div><div class='del'>-	0x605c, 0xa422, 0x6060, 0xa31b, 0x2805, 0xa045, 0x1140, 0x0310,</div><div class='del'>-	0x0804, 0x23b9, 0x6004, 0xa065, 0x0904, 0x23b9, 0x0c18, 0x2805,</div><div class='del'>-	0xa005, 0x01a8, 0xac68, 0xd99c, 0x1128, 0x6808, 0xa422, 0x680c,</div><div class='del'>-	0xa31b, 0x0020, 0x6810, 0xa422, 0x6814, 0xa31b, 0x0620, 0x2300,</div><div class='del'>-	0xa405, 0x0150, 0x8a51, 0x0904, 0x23b9, 0x8840, 0x0c40, 0x6004,</div><div class='del'>-	0xa065, 0x0904, 0x23b9, 0x0830, 0x8a51, 0x0904, 0x23b9, 0x8840,</div><div class='del'>-	0x2805, 0xa005, 0x1158, 0x6004, 0xa065, 0x0904, 0x23b9, 0x6034,</div><div class='del'>-	0xa0cc, 0x000f, 0xa9c0, 0x2308, 0x2805, 0x2040, 0x2b68, 0x6850,</div><div class='del'>-	0xc0fc, 0x6852, 0x0458, 0x8422, 0x8420, 0x831a, 0xa399, 0x0000,</div><div class='del'>-	0x00d6, 0x2b68, 0x6c6e, 0x6b72, 0x00de, 0xd99c, 0x1168, 0x6908,</div><div class='del'>-	0x2400, 0xa122, 0x690c, 0x2300, 0xa11b, 0x0a0c, 0x151a, 0x6800,</div><div class='del'>-	0xa420, 0x6804, 0xa319, 0x0060, 0x6910, 0x2400, 0xa122, 0x6914,</div><div class='del'>-	0x2300, 0xa11b, 0x0a0c, 0x151a, 0x6800, 0xa420, 0x6804, 0xa319,</div><div class='del'>-	0x2b68, 0x6c1e, 0x6b22, 0x6850, 0xc0fd, 0x6852, 0x2c00, 0x681a,</div><div class='del'>-	0x2800, 0x6832, 0x2a00, 0x6826, 0x000e, 0x000e, 0x000e, 0xa006,</div><div class='del'>-	0x0028, 0x008e, 0x009e, 0x00ae, 0xa085, 0x0001, 0x0005, 0x2001,</div><div class='del'>-	0x0005, 0x2004, 0xa084, 0x0007, 0x0002, 0x23cd, 0x23ce, 0x23d1,</div><div class='del'>-	0x23d4, 0x23d9, 0x23dc, 0x23e1, 0x23e6, 0x0005, 0x080c, 0x216d,</div><div class='del'>-	0x0005, 0x080c, 0x1b22, 0x0005, 0x080c, 0x1b22, 0x080c, 0x216d,</div><div class='del'>-	0x0005, 0x080c, 0x1720, 0x0005, 0x080c, 0x216d, 0x080c, 0x1720,</div><div class='del'>-	0x0005, 0x080c, 0x1b22, 0x080c, 0x1720, 0x0005, 0x080c, 0x1b22,</div><div class='del'>-	0x080c, 0x216d, 0x080c, 0x1720, 0x0005, 0x0006, 0x7000, 0xa086,</div><div class='del'>-	0x0001, 0x1158, 0x701c, 0xa506, 0x1140, 0x7020, 0xa406, 0x1128,</div><div class='del'>-	0x7024, 0xa706, 0x1110, 0x7028, 0xa606, 0x000e, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x2600, 0x2079, 0x0200, 0x2071, 0xbc80, 0x2069, 0xb600,</div><div class='del'>-	0x080c, 0x24f5, 0x080c, 0x24e5, 0x2009, 0x0004, 0x7912, 0x7817,</div><div class='del'>-	0x0004, 0x080c, 0x282d, 0x781b, 0x0002, 0x20e1, 0x9080, 0x20e1,</div><div class='del'>-	0x4000, 0x20a9, 0x0080, 0x782f, 0x0000, 0x1f04, 0x241b, 0x20e1,</div><div class='del'>-	0x9080, 0x783b, 0x001f, 0x20e1, 0x8700, 0x012e, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x2600, 0x781c, 0xd0a4, 0x190c, 0x24e2, 0xa084, 0x0007,</div><div class='del'>-	0x0002, 0x244b, 0x2439, 0x243c, 0x243f, 0x2444, 0x2446, 0x2448,</div><div class='del'>-	0x244a, 0x080c, 0x6436, 0x0078, 0x080c, 0x6475, 0x0060, 0x080c,</div><div class='del'>-	0x6436, 0x080c, 0x6475, 0x0038, 0x0041, 0x0028, 0x0031, 0x0018,</div><div class='del'>-	0x0021, 0x0008, 0x0011, 0x012e, 0x0005, 0x0006, 0x0016, 0x0026,</div><div class='del'>-	0x080c, 0xb50c, 0x7930, 0xa184, 0x0003, 0x01b0, 0x2001, 0xb8f0,</div><div class='del'>-	0x2004, 0xa005, 0x0170, 0x2001, 0x0133, 0x2004, 0xa005, 0x090c,</div><div class='del'>-	0x151a, 0x00c6, 0x2001, 0xb8f0, 0x2064, 0x080c, 0x99e6, 0x00ce,</div><div class='del'>-	0x04b8, 0x20e1, 0x9040, 0x04a0, 0xa184, 0x0030, 0x01e0, 0x6a00,</div><div class='del'>-	0xa286, 0x0003, 0x1108, 0x00a0, 0x080c, 0x5b41, 0x1178, 0x2001,</div><div class='del'>-	0xb89f, 0x2003, 0x0001, 0x2001, 0xb600, 0x2003, 0x0001, 0xa085,</div><div class='del'>-	0x0001, 0x080c, 0x5b85, 0x080c, 0x5a79, 0x0010, 0x080c, 0x4b7b,</div><div class='del'>-	0x080c, 0x24e5, 0x00a8, 0xa184, 0x00c0, 0x0168, 0x00e6, 0x0036,</div><div class='del'>-	0x0046, 0x0056, 0x2071, 0xb924, 0x080c, 0x1e1a, 0x005e, 0x004e,</div><div class='del'>-	0x003e, 0x00ee, 0x0028, 0xa184, 0x0300, 0x0110, 0x20e1, 0x9020,</div><div class='del'>-	0x7932, 0x002e, 0x001e, 0x000e, 0x0005, 0x0016, 0x00e6, 0x00f6,</div><div class='del'>-	0x2071, 0xb600, 0x7128, 0x2001, 0xb891, 0x2102, 0x2001, 0xb899,</div><div class='del'>-	0x2102, 0xa182, 0x0211, 0x1218, 0x2009, 0x0008, 0x0400, 0xa182,</div><div class='del'>-	0x0259, 0x1218, 0x2009, 0x0007, 0x00d0, 0xa182, 0x02c1, 0x1218,</div><div class='del'>-	0x2009, 0x0006, 0x00a0, 0xa182, 0x0349, 0x1218, 0x2009, 0x0005,</div><div class='del'>-	0x0070, 0xa182, 0x0421, 0x1218, 0x2009, 0x0004, 0x0040, 0xa182,</div><div class='del'>-	0x0581, 0x1218, 0x2009, 0x0003, 0x0010, 0x2009, 0x0002, 0x2079,</div><div class='del'>-	0x0200, 0x7912, 0x7817, 0x0004, 0x080c, 0x282d, 0x00fe, 0x00ee,</div><div class='del'>-	0x001e, 0x0005, 0x7938, 0x080c, 0x151a, 0x00e6, 0x0026, 0x2071,</div><div class='del'>-	0x0200, 0x20e1, 0x1000, 0x7220, 0x7028, 0x7020, 0xa206, 0x0de0,</div><div class='del'>-	0x20e1, 0x9010, 0x002e, 0x00ee, 0x0005, 0x20e1, 0xa000, 0x7837,</div><div class='del'>-	0x0001, 0x782f, 0x0000, 0x782f, 0x0000, 0x782f, 0x0000, 0x782f,</div><div class='del'>-	0x0000, 0x7837, 0x0005, 0x20a9, 0x0210, 0x7830, 0xd0bc, 0x1110,</div><div class='del'>-	0x1f04, 0x2505, 0x7837, 0x0001, 0x7837, 0x0000, 0xe000, 0xe000,</div><div class='del'>-	0x20e1, 0xa000, 0x0005, 0x0126, 0x2091, 0x2800, 0x2061, 0x0100,</div><div class='del'>-	0x2071, 0xb600, 0x6024, 0x6026, 0x6053, 0x0030, 0x080c, 0x286c,</div><div class='del'>-	0x6050, 0xa084, 0xfe7f, 0x6052, 0x2009, 0x00ef, 0x6132, 0x6136,</div><div class='del'>-	0x080c, 0x287c, 0x60e7, 0x0000, 0x61ea, 0x60e3, 0x0008, 0x604b,</div><div class='del'>-	0xf7f7, 0x6043, 0x0000, 0x602f, 0x0080, 0x602f, 0x0000, 0x6007,</div><div class='del'>-	0x0e9f, 0x601b, 0x001e, 0x600f, 0x00ff, 0x2001, 0xb88d, 0x2003,</div><div class='del'>-	0x00ff, 0x602b, 0x002f, 0x012e, 0x0005, 0x2001, 0xb632, 0x2003,</div><div class='del'>-	0x0000, 0x2001, 0xb631, 0x2003, 0x0001, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x2800, 0x0006, 0x0016, 0x0026, 0x6124, 0xa184, 0x1e2c, 0x1118,</div><div class='del'>-	0xa184, 0x0007, 0x002a, 0xa195, 0x0004, 0xa284, 0x0007, 0x0002,</div><div class='del'>-	0x2582, 0x2568, 0x256b, 0x256e, 0x2573, 0x2575, 0x2579, 0x257d,</div><div class='del'>-	0x080c, 0x6be6, 0x00b8, 0x080c, 0x6cc1, 0x00a0, 0x080c, 0x6cc1,</div><div class='del'>-	0x080c, 0x6be6, 0x0078, 0x0099, 0x0068, 0x080c, 0x6be6, 0x0079,</div><div class='del'>-	0x0048, 0x080c, 0x6cc1, 0x0059, 0x0028, 0x080c, 0x6cc1, 0x080c,</div><div class='del'>-	0x6be6, 0x0029, 0x002e, 0x001e, 0x000e, 0x012e, 0x0005, 0x6124,</div><div class='del'>-	0x6028, 0xd09c, 0x0118, 0xd19c, 0x1904, 0x279b, 0x080c, 0x5b41,</div><div class='del'>-	0x0578, 0x7000, 0xa086, 0x0003, 0x0198, 0x6024, 0xa084, 0x1800,</div><div class='del'>-	0x0178, 0x080c, 0x5b67, 0x0118, 0x080c, 0x5b53, 0x1148, 0x6027,</div><div class='del'>-	0x0020, 0x6043, 0x0000, 0x2001, 0xb89e, 0x2003, 0xaaaa, 0x0458,</div><div class='del'>-	0x080c, 0x5b67, 0x15d0, 0x6024, 0xa084, 0x1800, 0x1108, 0x04a8,</div><div class='del'>-	0x2001, 0xb89e, 0x2003, 0xaaaa, 0x2001, 0xb89f, 0x2003, 0x0001,</div><div class='del'>-	0x2001, 0xb600, 0x2003, 0x0001, 0x080c, 0x5a79, 0x0804, 0x279b,</div><div class='del'>-	0xd1ac, 0x1518, 0x6024, 0xd0dc, 0x1170, 0xd0e4, 0x1188, 0xd0d4,</div><div class='del'>-	0x11a0, 0xd0cc, 0x0130, 0x708c, 0xa086, 0x0028, 0x1110, 0x080c,</div><div class='del'>-	0x5cd0, 0x0804, 0x279b, 0x2001, 0xb89f, 0x2003, 0x0000, 0x0048,</div><div class='del'>-	0x2001, 0xb89f, 0x2003, 0x0002, 0x0020, 0x080c, 0x5c43, 0x0804,</div><div class='del'>-	0x279b, 0x080c, 0x5d75, 0x0804, 0x279b, 0xd1ac, 0x0904, 0x26e3,</div><div class='del'>-	0x080c, 0x5b41, 0x11d8, 0x6027, 0x0020, 0x0006, 0x0026, 0x0036,</div><div class='del'>-	0x080c, 0x5b5d, 0x1170, 0x2001, 0xb89f, 0x2003, 0x0001, 0x2001,</div><div class='del'>-	0xb600, 0x2003, 0x0001, 0x080c, 0x5a79, 0x003e, 0x002e, 0x000e,</div><div class='del'>-	0x0005, 0x003e, 0x002e, 0x000e, 0x080c, 0x5b18, 0x0016, 0x0046,</div><div class='del'>-	0x00c6, 0x644c, 0xa486, 0xf0f0, 0x1138, 0x2061, 0x0100, 0x644a,</div><div class='del'>-	0x6043, 0x0090, 0x6043, 0x0010, 0x74ce, 0xa48c, 0xff00, 0x7034,</div><div class='del'>-	0xd084, 0x0178, 0xa186, 0xf800, 0x1160, 0x703c, 0xd084, 0x1148,</div><div class='del'>-	0xc085, 0x703e, 0x0036, 0x2418, 0x2011, 0x8016, 0x080c, 0x3f13,</div><div class='del'>-	0x003e, 0xa196, 0xff00, 0x05b8, 0x7054, 0xa084, 0x00ff, 0x810f,</div><div class='del'>-	0xa116, 0x0588, 0x7130, 0xd184, 0x1570, 0x2011, 0xb653, 0x2214,</div><div class='del'>-	0xd2ec, 0x0138, 0xc18d, 0x7132, 0x2011, 0xb653, 0x2214, 0xd2ac,</div><div class='del'>-	0x1510, 0x6240, 0xa294, 0x0010, 0x0130, 0x6248, 0xa294, 0xff00,</div><div class='del'>-	0xa296, 0xff00, 0x01c0, 0x7030, 0xd08c, 0x0904, 0x26b0, 0x7034,</div><div class='del'>-	0xd08c, 0x1140, 0x2001, 0xb60c, 0x200c, 0xd1ac, 0x1904, 0x26b0,</div><div class='del'>-	0xc1ad, 0x2102, 0x0036, 0x73cc, 0x2011, 0x8013, 0x080c, 0x3f13,</div><div class='del'>-	0x003e, 0x0804, 0x26b0, 0x7034, 0xd08c, 0x1140, 0x2001, 0xb60c,</div><div class='del'>-	0x200c, 0xd1ac, 0x1904, 0x26b0, 0xc1ad, 0x2102, 0x0036, 0x73cc,</div><div class='del'>-	0x2011, 0x8013, 0x080c, 0x3f13, 0x003e, 0x7130, 0xc185, 0x7132,</div><div class='del'>-	0x2011, 0xb653, 0x220c, 0xd1a4, 0x01d0, 0x0016, 0x2009, 0x0001,</div><div class='del'>-	0x2011, 0x0100, 0x080c, 0x6b8c, 0x2019, 0x000e, 0x080c, 0xb121,</div><div class='del'>-	0xa484, 0x00ff, 0xa080, 0x2df9, 0x200d, 0xa18c, 0xff00, 0x810f,</div><div class='del'>-	0x8127, 0xa006, 0x2009, 0x000e, 0x080c, 0xb1a4, 0x001e, 0xd1ac,</div><div class='del'>-	0x1148, 0x0016, 0x2009, 0x0000, 0x2019, 0x0004, 0x080c, 0x2ca4,</div><div class='del'>-	0x001e, 0x0070, 0x0156, 0x20a9, 0x007f, 0x2009, 0x0000, 0x080c,</div><div class='del'>-	0x501b, 0x1110, 0x080c, 0x4c7e, 0x8108, 0x1f04, 0x26a7, 0x015e,</div><div class='del'>-	0x00ce, 0x004e, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011, 0x0002,</div><div class='del'>-	0x080c, 0x8106, 0x080c, 0x7fe0, 0x0036, 0x2019, 0x0000, 0x080c,</div><div class='del'>-	0x806b, 0x003e, 0x60e3, 0x0000, 0x001e, 0x2001, 0xb600, 0x2014,</div><div class='del'>-	0xa296, 0x0004, 0x1128, 0xd19c, 0x11b0, 0x6228, 0xc29d, 0x622a,</div><div class='del'>-	0x2003, 0x0001, 0x2001, 0xb623, 0x2003, 0x0000, 0x6027, 0x0020,</div><div class='del'>-	0x080c, 0x5b67, 0x1140, 0x0016, 0x2009, 0x07d0, 0x2011, 0x5a56,</div><div class='del'>-	0x080c, 0x6a94, 0x001e, 0xd194, 0x0904, 0x279b, 0x0016, 0x6220,</div><div class='del'>-	0xd2b4, 0x0904, 0x274c, 0x080c, 0x6a82, 0x080c, 0x7df3, 0x6027,</div><div class='del'>-	0x0004, 0x00f6, 0x2019, 0xb8ea, 0x2304, 0xa07d, 0x0570, 0x7804,</div><div class='del'>-	0xa086, 0x0032, 0x1550, 0x00d6, 0x00c6, 0x00e6, 0x2069, 0x0140,</div><div class='del'>-	0x618c, 0x6288, 0x7818, 0x608e, 0x7808, 0x608a, 0x6043, 0x0002,</div><div class='del'>-	0x2001, 0x0003, 0x8001, 0x1df0, 0x6043, 0x0000, 0x6803, 0x1000,</div><div class='del'>-	0x6803, 0x0000, 0x618e, 0x628a, 0x080c, 0x7102, 0x080c, 0x71e5,</div><div class='del'>-	0x7810, 0x2070, 0x7037, 0x0103, 0x2f60, 0x080c, 0x86a4, 0x00ee,</div><div class='del'>-	0x00ce, 0x00de, 0x00fe, 0x001e, 0x0005, 0x00fe, 0x00d6, 0x2069,</div><div class='del'>-	0x0140, 0x6804, 0xa084, 0x4000, 0x0120, 0x6803, 0x1000, 0x6803,</div><div class='del'>-	0x0000, 0x00de, 0x00c6, 0x2061, 0xb8e1, 0x6028, 0xa09a, 0x00c8,</div><div class='del'>-	0x1238, 0x8000, 0x602a, 0x00ce, 0x080c, 0x7de6, 0x0804, 0x279a,</div><div class='del'>-	0x2019, 0xb8ea, 0x2304, 0xa065, 0x0120, 0x2009, 0x0027, 0x080c,</div><div class='del'>-	0x86d3, 0x00ce, 0x0804, 0x279a, 0xd2bc, 0x0904, 0x279a, 0x080c,</div><div class='del'>-	0x6a8f, 0x6014, 0xa084, 0x0184, 0xa085, 0x0010, 0x6016, 0x6027,</div><div class='del'>-	0x0004, 0x00d6, 0x2069, 0x0140, 0x6804, 0xa084, 0x4000, 0x0120,</div><div class='del'>-	0x6803, 0x1000, 0x6803, 0x0000, 0x00de, 0x00c6, 0x2061, 0xb8e1,</div><div class='del'>-	0x6044, 0xa09a, 0x00c8, 0x12f0, 0x8000, 0x6046, 0x603c, 0x00ce,</div><div class='del'>-	0xa005, 0x0540, 0x2009, 0x07d0, 0x080c, 0x6a87, 0xa080, 0x0007,</div><div class='del'>-	0x2004, 0xa086, 0x0006, 0x1138, 0x6114, 0xa18c, 0x0184, 0xa18d,</div><div class='del'>-	0x0012, 0x6116, 0x00b8, 0x6114, 0xa18c, 0x0184, 0xa18d, 0x0016,</div><div class='del'>-	0x6116, 0x0080, 0x0036, 0x2019, 0x0001, 0x080c, 0x806b, 0x003e,</div><div class='del'>-	0x2019, 0xb8f0, 0x2304, 0xa065, 0x0120, 0x2009, 0x004f, 0x080c,</div><div class='del'>-	0x86d3, 0x00ce, 0x001e, 0xd19c, 0x0904, 0x27f4, 0x7034, 0xd0ac,</div><div class='del'>-	0x1560, 0x0016, 0x0156, 0x6027, 0x0008, 0x602f, 0x0020, 0x20a9,</div><div class='del'>-	0x0006, 0x1d04, 0x27a9, 0x2091, 0x6000, 0x1f04, 0x27a9, 0x602f,</div><div class='del'>-	0x0000, 0x6150, 0xa185, 0x1400, 0x6052, 0x20a9, 0x0366, 0x1d04,</div><div class='del'>-	0x27b7, 0x2091, 0x6000, 0x6020, 0xd09c, 0x1130, 0x015e, 0x6152,</div><div class='del'>-	0x001e, 0x6027, 0x0008, 0x0480, 0x080c, 0x293c, 0x1f04, 0x27b7,</div><div class='del'>-	0x015e, 0x6152, 0x001e, 0x6027, 0x0008, 0x0016, 0x6028, 0xc09c,</div><div class='del'>-	0x602a, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0x8106, 0x080c, 0x7fe0, 0x0036, 0x2019, 0x0000, 0x080c, 0x806b,</div><div class='del'>-	0x003e, 0x60e3, 0x0000, 0x080c, 0xb4eb, 0x080c, 0xb506, 0xa085,</div><div class='del'>-	0x0001, 0x080c, 0x5b85, 0x2001, 0xb600, 0x2003, 0x0004, 0x6027,</div><div class='del'>-	0x0008, 0x080c, 0x12e2, 0x001e, 0xa18c, 0xffd0, 0x6126, 0x0005,</div><div class='del'>-	0x0006, 0x0016, 0x0026, 0x00e6, 0x00f6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xb600, 0x71c4, 0x70c6, 0xa116, 0x0500, 0x81ff, 0x0128,</div><div class='del'>-	0x2011, 0x8011, 0x080c, 0x3f13, 0x00c8, 0x2011, 0x8012, 0x080c,</div><div class='del'>-	0x3f13, 0x2001, 0xb672, 0x2004, 0xd0fc, 0x1180, 0x0036, 0x00c6,</div><div class='del'>-	0x080c, 0x28c7, 0x080c, 0x7fbc, 0x2061, 0x0100, 0x2019, 0x0028,</div><div class='del'>-	0x2009, 0x0000, 0x080c, 0x2ca4, 0x00ce, 0x003e, 0x012e, 0x00fe,</div><div class='del'>-	0x00ee, 0x002e, 0x001e, 0x000e, 0x0005, 0x00c6, 0x00f6, 0x0006,</div><div class='del'>-	0x0026, 0x2061, 0x0100, 0xa190, 0x2840, 0x2205, 0x60f2, 0x2011,</div><div class='del'>-	0x284d, 0x2205, 0x60ee, 0x002e, 0x000e, 0x00fe, 0x00ce, 0x0005,</div><div class='del'>-	0x0840, 0x0840, 0x0840, 0x0580, 0x0420, 0x0348, 0x02c0, 0x0258,</div><div class='del'>-	0x0210, 0x01a8, 0x01a8, 0x01a8, 0x01a8, 0x0140, 0x00f8, 0x00d0,</div><div class='del'>-	0x00b0, 0x00a0, 0x2028, 0xa18c, 0x00ff, 0x2130, 0xa094, 0xff00,</div><div class='del'>-	0x1110, 0x81ff, 0x0118, 0x080c, 0x6723, 0x0038, 0xa080, 0x2df9,</div><div class='del'>-	0x200d, 0xa18c, 0xff00, 0x810f, 0xa006, 0x0005, 0xa080, 0x2df9,</div><div class='del'>-	0x200d, 0xa18c, 0x00ff, 0x0005, 0x00d6, 0x2069, 0x0140, 0x2001,</div><div class='del'>-	0xb615, 0x2003, 0x00ef, 0x20a9, 0x0010, 0xa006, 0x6852, 0x6856,</div><div class='del'>-	0x1f04, 0x2877, 0x00de, 0x0005, 0x0006, 0x00d6, 0x0026, 0x2069,</div><div class='del'>-	0x0140, 0x2001, 0xb615, 0x2102, 0x8114, 0x8214, 0x8214, 0x8214,</div><div class='del'>-	0x20a9, 0x0010, 0x6853, 0x0000, 0xa006, 0x82ff, 0x1128, 0xa184,</div><div class='del'>-	0x000f, 0xa080, 0xb51a, 0x2005, 0x6856, 0x8211, 0x1f04, 0x288c,</div><div class='del'>-	0x002e, 0x00de, 0x000e, 0x0005, 0x00c6, 0x2061, 0xb600, 0x6030,</div><div class='del'>-	0x0110, 0xc09d, 0x0008, 0xc09c, 0x6032, 0x00ce, 0x0005, 0x0156,</div><div class='del'>-	0x00d6, 0x0026, 0x0016, 0x0006, 0x2069, 0x0140, 0x6980, 0xa116,</div><div class='del'>-	0x0180, 0xa112, 0x1230, 0x8212, 0x8210, 0x22a8, 0x2001, 0x0402,</div><div class='del'>-	0x0018, 0x22a8, 0x2001, 0x0404, 0x680e, 0x1f04, 0x28bc, 0x680f,</div><div class='del'>-	0x0000, 0x000e, 0x001e, 0x002e, 0x00de, 0x015e, 0x0005, 0x2001,</div><div class='del'>-	0xb653, 0x2004, 0xd0c4, 0x0150, 0xd0a4, 0x0140, 0xa006, 0x0046,</div><div class='del'>-	0x2020, 0x2009, 0x002e, 0x080c, 0xb1a4, 0x004e, 0x0005, 0x00f6,</div><div class='del'>-	0x0016, 0x0026, 0x2079, 0x0140, 0x78c4, 0xd0dc, 0x0548, 0xa084,</div><div class='del'>-	0x0700, 0xa08e, 0x0300, 0x1520, 0x2011, 0x0000, 0x2009, 0x0002,</div><div class='del'>-	0x2300, 0xa080, 0x0020, 0x2018, 0x2300, 0x080c, 0x6bb2, 0x2011,</div><div class='del'>-	0x0030, 0x2200, 0x8007, 0xa085, 0x004c, 0x78c2, 0x2009, 0x0204,</div><div class='del'>-	0x210c, 0x2200, 0xa100, 0x2009, 0x0138, 0x200a, 0x080c, 0x5b41,</div><div class='del'>-	0x1118, 0x2009, 0xb88f, 0x200a, 0x002e, 0x001e, 0x00fe, 0x0005,</div><div class='del'>-	0x78c3, 0x0000, 0x0cc8, 0x0126, 0x2091, 0x2800, 0x0006, 0x0016,</div><div class='del'>-	0x0026, 0x2001, 0x0170, 0x200c, 0x8000, 0x2014, 0xa184, 0x0003,</div><div class='del'>-	0x0110, 0x0804, 0x1b20, 0x002e, 0x001e, 0x000e, 0x012e, 0x0005,</div><div class='del'>-	0x0006, 0x2001, 0x0100, 0x2004, 0xa082, 0x0005, 0x000e, 0x0268,</div><div class='del'>-	0x2001, 0x0170, 0x200c, 0xa18c, 0x00ff, 0xa18e, 0x004c, 0x1128,</div><div class='del'>-	0x200c, 0xa18c, 0xff00, 0x810f, 0x0010, 0x2009, 0x0000, 0x2001,</div><div class='del'>-	0x0204, 0x2004, 0xa108, 0x0005, 0x0006, 0x0156, 0x00f6, 0x2079,</div><div class='del'>-	0x0100, 0x20a9, 0x000a, 0x7854, 0xd08c, 0x1110, 0x1f04, 0x2943,</div><div class='del'>-	0x00fe, 0x015e, 0x000e, 0x0005, 0x0016, 0x00c6, 0x0006, 0x2061,</div><div class='del'>-	0x0100, 0x6030, 0x0006, 0x6048, 0x0006, 0x60e4, 0x0006, 0x60e8,</div><div class='del'>-	0x0006, 0x6050, 0x0006, 0x60f0, 0x0006, 0x60ec, 0x0006, 0x600c,</div><div class='del'>-	0x0006, 0x6004, 0x0006, 0x6028, 0x0006, 0x60e0, 0x0006, 0x602f,</div><div class='del'>-	0x0100, 0x602f, 0x0000, 0xe000, 0xe000, 0xe000, 0xe000, 0x602f,</div><div class='del'>-	0x0040, 0x602f, 0x0000, 0x000e, 0x60e2, 0x000e, 0x602a, 0x000e,</div><div class='del'>-	0x6006, 0x000e, 0x600e, 0x000e, 0x60ee, 0x000e, 0x60f2, 0x000e,</div><div class='del'>-	0x6052, 0x000e, 0x60ea, 0x000e, 0x60e6, 0x000e, 0x604a, 0x000e,</div><div class='del'>-	0x6032, 0x6036, 0x2008, 0x080c, 0x287c, 0x000e, 0x00ce, 0x001e,</div><div class='del'>-	0x0005, 0x2009, 0x0171, 0x2104, 0xd0dc, 0x0140, 0x2009, 0x0170,</div><div class='del'>-	0x2104, 0x200b, 0x0080, 0xe000, 0xe000, 0x200a, 0x0005, 0x2a2f,</div><div class='del'>-	0x2a33, 0x2a37, 0x2a3d, 0x2a43, 0x2a49, 0x2a4f, 0x2a57, 0x2a5f,</div><div class='del'>-	0x2a65, 0x2a6b, 0x2a73, 0x2a7b, 0x2a83, 0x2a8b, 0x2a95, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2a9f,</div><div class='del'>-	0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f,</div><div class='del'>-	0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2aa1,</div><div class='del'>-	0x2aa1, 0x2aa7, 0x2aa7, 0x2aae, 0x2aae, 0x2ab5, 0x2ab5, 0x2abe,</div><div class='del'>-	0x2abe, 0x2ac5, 0x2ac5, 0x2ace, 0x2ace, 0x2ad7, 0x2ad7, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2a9f,</div><div class='del'>-	0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f,</div><div class='del'>-	0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2,</div><div class='del'>-	0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2ae2, 0x2a9f,</div><div class='del'>-	0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f,</div><div class='del'>-	0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x2a9f, 0x0106,</div><div class='del'>-	0x0006, 0x0804, 0x2aea, 0x0106, 0x0006, 0x0804, 0x2aea, 0x0106,</div><div class='del'>-	0x0006, 0x080c, 0x254e, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c,</div><div class='del'>-	0x254e, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c, 0x23bf, 0x0804,</div><div class='del'>-	0x2aea, 0x0106, 0x0006, 0x080c, 0x23bf, 0x0804, 0x2aea, 0x0106,</div><div class='del'>-	0x0006, 0x080c, 0x254e, 0x080c, 0x23bf, 0x0804, 0x2aea, 0x0106,</div><div class='del'>-	0x0006, 0x080c, 0x254e, 0x080c, 0x23bf, 0x0804, 0x2aea, 0x0106,</div><div class='del'>-	0x0006, 0x080c, 0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c,</div><div class='del'>-	0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c, 0x254e, 0x080c,</div><div class='del'>-	0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c, 0x254e, 0x080c,</div><div class='del'>-	0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c, 0x23bf, 0x080c,</div><div class='del'>-	0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c, 0x23bf, 0x080c,</div><div class='del'>-	0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c, 0x254e, 0x080c,</div><div class='del'>-	0x23bf, 0x080c, 0x2427, 0x0804, 0x2aea, 0x0106, 0x0006, 0x080c,</div><div class='del'>-	0x254e, 0x080c, 0x23bf, 0x080c, 0x2427, 0x0804, 0x2aea, 0xe000,</div><div class='del'>-	0x0cf0, 0x0106, 0x0006, 0x080c, 0x290b, 0x0804, 0x2aea, 0x0106,</div><div class='del'>-	0x0006, 0x080c, 0x290b, 0x080c, 0x254e, 0x04e0, 0x0106, 0x0006,</div><div class='del'>-	0x080c, 0x290b, 0x080c, 0x23bf, 0x04a8, 0x0106, 0x0006, 0x080c,</div><div class='del'>-	0x290b, 0x080c, 0x254e, 0x080c, 0x23bf, 0x0460, 0x0106, 0x0006,</div><div class='del'>-	0x080c, 0x290b, 0x080c, 0x2427, 0x0428, 0x0106, 0x0006, 0x080c,</div><div class='del'>-	0x290b, 0x080c, 0x254e, 0x080c, 0x2427, 0x00e0, 0x0106, 0x0006,</div><div class='del'>-	0x080c, 0x290b, 0x080c, 0x23bf, 0x080c, 0x2427, 0x0098, 0x0106,</div><div class='del'>-	0x0006, 0x080c, 0x290b, 0x080c, 0x254e, 0x080c, 0x23bf, 0x080c,</div><div class='del'>-	0x2427, 0x0040, 0x20d1, 0x0000, 0x20d1, 0x0001, 0x20d1, 0x0000,</div><div class='del'>-	0x080c, 0x151a, 0x000e, 0x010e, 0x000d, 0x00c6, 0x0026, 0x0046,</div><div class='del'>-	0x2021, 0x0000, 0x080c, 0x537b, 0x1904, 0x2bca, 0x72d4, 0x2001,</div><div class='del'>-	0xb89e, 0x2004, 0xa005, 0x1110, 0xd29c, 0x0148, 0xd284, 0x1138,</div><div class='del'>-	0xd2bc, 0x1904, 0x2bca, 0x080c, 0x2bce, 0x0804, 0x2bca, 0xd2cc,</div><div class='del'>-	0x1904, 0x2bca, 0x080c, 0x5b41, 0x1120, 0x709f, 0xffff, 0x0804,</div><div class='del'>-	0x2bca, 0xd294, 0x0120, 0x709f, 0xffff, 0x0804, 0x2bca, 0x2001,</div><div class='del'>-	0xb615, 0x203c, 0x7288, 0xd284, 0x0904, 0x2b6c, 0xd28c, 0x1904,</div><div class='del'>-	0x2b6c, 0x0036, 0x739c, 0xa38e, 0xffff, 0x1110, 0x2019, 0x0001,</div><div class='del'>-	0x8314, 0xa2e0, 0xbdc0, 0x2c04, 0xa38c, 0x0001, 0x0120, 0xa084,</div><div class='del'>-	0xff00, 0x8007, 0x0010, 0xa084, 0x00ff, 0xa70e, 0x0560, 0xa08e,</div><div class='del'>-	0x0000, 0x0548, 0xa08e, 0x00ff, 0x1150, 0x7230, 0xd284, 0x1538,</div><div class='del'>-	0x7288, 0xc28d, 0x728a, 0x709f, 0xffff, 0x003e, 0x0428, 0x2009,</div><div class='del'>-	0x0000, 0x080c, 0x2852, 0x080c, 0x4fbf, 0x11b8, 0x6004, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x0006, 0x1150, 0x7030, 0xd08c, 0x0118, 0x6000,</div><div class='del'>-	0xd0bc, 0x0120, 0x080c, 0x2be1, 0x0140, 0x0028, 0x080c, 0x2d12,</div><div class='del'>-	0x080c, 0x2c0f, 0x0110, 0x8318, 0x0818, 0x739e, 0x0010, 0x709f,</div><div class='del'>-	0xffff, 0x003e, 0x0804, 0x2bca, 0xa780, 0x2df9, 0x203d, 0xa7bc,</div><div class='del'>-	0xff00, 0x873f, 0x2041, 0x007e, 0x709c, 0xa096, 0xffff, 0x1120,</div><div class='del'>-	0x2009, 0x0000, 0x28a8, 0x0050, 0xa812, 0x0220, 0x2008, 0xa802,</div><div class='del'>-	0x20a8, 0x0020, 0x709f, 0xffff, 0x0804, 0x2bca, 0x2700, 0x0156,</div><div class='del'>-	0x0016, 0xa106, 0x05a0, 0xc484, 0x080c, 0x501b, 0x0120, 0x080c,</div><div class='del'>-	0x4fbf, 0x15a8, 0x0008, 0xc485, 0x6004, 0xa084, 0x00ff, 0xa086,</div><div class='del'>-	0x0006, 0x1130, 0x7030, 0xd08c, 0x01e8, 0x6000, 0xd0bc, 0x11d0,</div><div class='del'>-	0x7288, 0xd28c, 0x0188, 0x6004, 0xa084, 0x00ff, 0xa082, 0x0006,</div><div class='del'>-	0x02b0, 0xd484, 0x1118, 0x080c, 0x4fde, 0x0028, 0x080c, 0x2d9f,</div><div class='del'>-	0x0170, 0x080c, 0x2dcc, 0x0058, 0x080c, 0x2d12, 0x080c, 0x2c0f,</div><div class='del'>-	0x0170, 0x0028, 0x080c, 0x2d9f, 0x0110, 0x0419, 0x0140, 0x001e,</div><div class='del'>-	0x8108, 0x015e, 0x1f04, 0x2b86, 0x709f, 0xffff, 0x0018, 0x001e,</div><div class='del'>-	0x015e, 0x719e, 0x004e, 0x002e, 0x00ce, 0x0005, 0x00c6, 0x0016,</div><div class='del'>-	0x709f, 0x0001, 0x2009, 0x007e, 0x080c, 0x4fbf, 0x1138, 0x080c,</div><div class='del'>-	0x2d12, 0x04a9, 0x0118, 0x70d4, 0xc0bd, 0x70d6, 0x001e, 0x00ce,</div><div class='del'>-	0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6, 0x2c68, 0x2001, 0xb657,</div><div class='del'>-	0x2004, 0xa084, 0x00ff, 0x6842, 0x080c, 0x9f92, 0x01d8, 0x2d00,</div><div class='del'>-	0x601a, 0x080c, 0xa0e3, 0x601f, 0x0001, 0x2001, 0x0000, 0x080c,</div><div class='del'>-	0x4f5d, 0x2001, 0x0000, 0x080c, 0x4f6f, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x7098, 0x8000, 0x709a, 0x012e, 0x2009, 0x0004, 0x080c, 0x86d3,</div><div class='del'>-	0xa085, 0x0001, 0x00ce, 0x00de, 0x007e, 0x001e, 0x0005, 0x0016,</div><div class='del'>-	0x0076, 0x00d6, 0x00c6, 0x2c68, 0x2001, 0xb657, 0x2004, 0xa084,</div><div class='del'>-	0x00ff, 0x6842, 0x080c, 0x9f92, 0x0550, 0x2d00, 0x601a, 0x6800,</div><div class='del'>-	0xc0c4, 0x6802, 0x68a0, 0xa086, 0x007e, 0x0140, 0x6804, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x0006, 0x1110, 0x080c, 0x2cd1, 0x080c, 0xa0e3,</div><div class='del'>-	0x601f, 0x0001, 0x2001, 0x0000, 0x080c, 0x4f5d, 0x2001, 0x0002,</div><div class='del'>-	0x080c, 0x4f6f, 0x0126, 0x2091, 0x8000, 0x7098, 0x8000, 0x709a,</div><div class='del'>-	0x012e, 0x2009, 0x0002, 0x080c, 0x86d3, 0xa085, 0x0001, 0x00ce,</div><div class='del'>-	0x00de, 0x007e, 0x001e, 0x0005, 0x00c6, 0x0026, 0x2009, 0x0080,</div><div class='del'>-	0x080c, 0x4fbf, 0x1120, 0x0031, 0x0110, 0x70db, 0xffff, 0x002e,</div><div class='del'>-	0x00ce, 0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6, 0x2c68, 0x080c,</div><div class='del'>-	0x864e, 0x01e8, 0x2d00, 0x601a, 0x080c, 0xa0e3, 0x601f, 0x0001,</div><div class='del'>-	0x2001, 0x0000, 0x080c, 0x4f5d, 0x2001, 0x0002, 0x080c, 0x4f6f,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x2cd1, 0x70dc, 0x8000, 0x70de,</div><div class='del'>-	0x012e, 0x2009, 0x0002, 0x080c, 0x86d3, 0xa085, 0x0001, 0x00ce,</div><div class='del'>-	0x00de, 0x007e, 0x001e, 0x0005, 0x00c6, 0x00d6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2009, 0x007f, 0x080c, 0x4fbf, 0x1190, 0x2c68, 0x080c,</div><div class='del'>-	0x864e, 0x0170, 0x2d00, 0x601a, 0x6312, 0x601f, 0x0001, 0x620a,</div><div class='del'>-	0x080c, 0xa0e3, 0x2009, 0x0022, 0x080c, 0x86d3, 0xa085, 0x0001,</div><div class='del'>-	0x012e, 0x00de, 0x00ce, 0x0005, 0x00e6, 0x00c6, 0x0066, 0x0036,</div><div class='del'>-	0x0026, 0x080c, 0x6e73, 0x080c, 0x6e16, 0x080c, 0x90fb, 0x2130,</div><div class='del'>-	0x81ff, 0x0128, 0x20a9, 0x007e, 0x2009, 0x0000, 0x0020, 0x20a9,</div><div class='del'>-	0x007f, 0x2009, 0x0000, 0x0016, 0x080c, 0x501b, 0x1120, 0x080c,</div><div class='del'>-	0x521c, 0x080c, 0x4c7e, 0x001e, 0x8108, 0x1f04, 0x2cbb, 0x86ff,</div><div class='del'>-	0x1110, 0x080c, 0x11f5, 0x002e, 0x003e, 0x006e, 0x00ce, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x6218, 0x2270,</div><div class='del'>-	0x72a0, 0x0026, 0x2019, 0x0029, 0x080c, 0x6e67, 0x0076, 0x2039,</div><div class='del'>-	0x0000, 0x080c, 0x6d74, 0x2c08, 0x080c, 0xaf3e, 0x007e, 0x001e,</div><div class='del'>-	0x2e60, 0x080c, 0x521c, 0x6210, 0x6314, 0x080c, 0x4c7e, 0x6212,</div><div class='del'>-	0x6316, 0x001e, 0x002e, 0x003e, 0x00ce, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x0006, 0x6018, 0xa080, 0x0028, 0x2004, 0xa086, 0x0080, 0x0150,</div><div class='del'>-	0x2071, 0xb600, 0x7098, 0xa005, 0x0110, 0x8001, 0x709a, 0x000e,</div><div class='del'>-	0x00ee, 0x0005, 0x2071, 0xb600, 0x70dc, 0xa005, 0x0dc0, 0x8001,</div><div class='del'>-	0x70de, 0x0ca8, 0x6000, 0xc08c, 0x6002, 0x0005, 0x00f6, 0x00e6,</div><div class='del'>-	0x00c6, 0x0036, 0x0026, 0x0016, 0x0156, 0x2178, 0x81ff, 0x1118,</div><div class='del'>-	0x20a9, 0x0001, 0x0098, 0x2001, 0xb653, 0x2004, 0xd0c4, 0x0150,</div><div class='del'>-	0xd0a4, 0x0140, 0xa006, 0x0046, 0x2020, 0x2009, 0x002d, 0x080c,</div><div class='del'>-	0xb1a4, 0x004e, 0x20a9, 0x00ff, 0x2011, 0x0000, 0x0026, 0xa28e,</div><div class='del'>-	0x007e, 0x0904, 0x2d7e, 0xa28e, 0x007f, 0x0904, 0x2d7e, 0xa28e,</div><div class='del'>-	0x0080, 0x05e0, 0xa288, 0xb735, 0x210c, 0x81ff, 0x05b8, 0x8fff,</div><div class='del'>-	0x1148, 0x2001, 0xb8be, 0x0006, 0x2003, 0x0001, 0x04d9, 0x000e,</div><div class='del'>-	0x2003, 0x0000, 0x00c6, 0x2160, 0x2001, 0x0001, 0x080c, 0x5385,</div><div class='del'>-	0x00ce, 0x2019, 0x0029, 0x080c, 0x6e67, 0x0076, 0x2039, 0x0000,</div><div class='del'>-	0x080c, 0x6d74, 0x00c6, 0x0026, 0x2160, 0x6204, 0xa294, 0x00ff,</div><div class='del'>-	0xa286, 0x0006, 0x1118, 0x6007, 0x0404, 0x0028, 0x2001, 0x0004,</div><div class='del'>-	0x8007, 0xa215, 0x6206, 0x002e, 0x00ce, 0x0016, 0x2c08, 0x080c,</div><div class='del'>-	0xaf3e, 0x001e, 0x007e, 0x2160, 0x080c, 0x521c, 0x002e, 0x8210,</div><div class='del'>-	0x1f04, 0x2d36, 0x015e, 0x001e, 0x002e, 0x003e, 0x00ce, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x0046, 0x0026, 0x0016, 0x2001, 0xb653, 0x2004,</div><div class='del'>-	0xd0c4, 0x0148, 0xd0a4, 0x0138, 0xa006, 0x2220, 0x8427, 0x2009,</div><div class='del'>-	0x0029, 0x080c, 0xb1a4, 0x001e, 0x002e, 0x004e, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x00c6, 0x7288, 0x82ff, 0x01f8, 0x2011, 0xb653,</div><div class='del'>-	0x2214, 0xd2ac, 0x11d0, 0x2100, 0x080c, 0x2866, 0x81ff, 0x01b8,</div><div class='del'>-	0x2019, 0x0001, 0x8314, 0xa2e0, 0xbdc0, 0x2c04, 0xd384, 0x0120,</div><div class='del'>-	0xa084, 0xff00, 0x8007, 0x0010, 0xa084, 0x00ff, 0xa116, 0x0138,</div><div class='del'>-	0xa096, 0x00ff, 0x0110, 0x8318, 0x0c68, 0xa085, 0x0001, 0x00ce,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x0005, 0x0016, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x0016, 0x0026, 0x0036, 0x2110, 0x0026, 0x2019, 0x0029,</div><div class='del'>-	0x080c, 0x8320, 0x002e, 0x080c, 0xb449, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0xa180, 0xb735, 0x2004, 0xa065, 0x0158, 0x0016, 0x00c6, 0x2061,</div><div class='del'>-	0xb9f5, 0x001e, 0x611a, 0x080c, 0x2cd1, 0x001e, 0x080c, 0x4fde,</div><div class='del'>-	0x012e, 0x00ce, 0x001e, 0x0005, 0x2001, 0xb635, 0x2004, 0xd0cc,</div><div class='del'>-	0x0005, 0x7eef, 0x7de8, 0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc,</div><div class='del'>-	0x80da, 0x7ad9, 0x80d6, 0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1,</div><div class='del'>-	0x79ce, 0x78cd, 0x80cc, 0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6,</div><div class='del'>-	0x77c5, 0x76c3, 0x80bc, 0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4,</div><div class='del'>-	0x72b3, 0x80b2, 0x80b1, 0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa,</div><div class='del'>-	0x6ea9, 0x80a7, 0x6da6, 0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d,</div><div class='del'>-	0x809b, 0x8098, 0x6797, 0x6690, 0x658f, 0x6488, 0x6384, 0x6282,</div><div class='del'>-	0x8081, 0x8080, 0x617c, 0x607a, 0x8079, 0x5f76, 0x8075, 0x8074,</div><div class='del'>-	0x8073, 0x8072, 0x8071, 0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a,</div><div class='del'>-	0x5b69, 0x8067, 0x5a66, 0x5965, 0x5863, 0x575c, 0x565a, 0x5559,</div><div class='del'>-	0x8056, 0x8055, 0x5454, 0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d,</div><div class='del'>-	0x804c, 0x804b, 0x4e4a, 0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043,</div><div class='del'>-	0x803c, 0x803a, 0x8039, 0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932,</div><div class='del'>-	0x4831, 0x802e, 0x472d, 0x462c, 0x452b, 0x442a, 0x4329, 0x4227,</div><div class='del'>-	0x8026, 0x8025, 0x4123, 0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18,</div><div class='del'>-	0x8017, 0x8010, 0x3b0f, 0x3a08, 0x8004, 0x3902, 0x8001, 0x8000,</div><div class='del'>-	0x8000, 0x3800, 0x3700, 0x3600, 0x8000, 0x3500, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x3400, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x3300, 0x3200, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x3100, 0x3000, 0x8000, 0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00,</div><div class='del'>-	0x2c00, 0x8000, 0x8000, 0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900,</div><div class='del'>-	0x2800, 0x8000, 0x2700, 0x2600, 0x2500, 0x2400, 0x2300, 0x2200,</div><div class='del'>-	0x8000, 0x8000, 0x2100, 0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00,</div><div class='del'>-	0x8000, 0x8000, 0x1b00, 0x1a00, 0x8000, 0x1900, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x1800, 0x8000, 0x1700, 0x1600,</div><div class='del'>-	0x1500, 0x8000, 0x1400, 0x1300, 0x1200, 0x1100, 0x1000, 0x0f00,</div><div class='del'>-	0x8000, 0x8000, 0x0e00, 0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900,</div><div class='del'>-	0x8000, 0x8000, 0x0800, 0x0700, 0x8000, 0x0600, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x0500, 0x0400, 0x0300, 0x8000, 0x0200, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x0100, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x0000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x2071, 0xb682, 0x7003, 0x0002, 0xa006, 0x7012, 0x7016,</div><div class='del'>-	0x703a, 0x703e, 0x7033, 0xb692, 0x7037, 0xb692, 0x7007, 0x0001,</div><div class='del'>-	0x2061, 0xb6d2, 0x6003, 0x0002, 0x0005, 0x1004, 0x2f1f, 0x0e04,</div><div class='del'>-	0x2f1f, 0x2071, 0xb682, 0x2b78, 0x7818, 0xd084, 0x1140, 0x2a60,</div><div class='del'>-	0x7820, 0xa08e, 0x0069, 0x1904, 0x3004, 0x0804, 0x2f9d, 0x0005,</div><div class='del'>-	0x2071, 0xb682, 0x7004, 0x0002, 0x2f28, 0x2f29, 0x2f32, 0x2f43,</div><div class='del'>-	0x0005, 0x1004, 0x2f31, 0x0e04, 0x2f31, 0x2b78, 0x7818, 0xd084,</div><div class='del'>-	0x01e8, 0x0005, 0x2b78, 0x2061, 0xb6d2, 0x6008, 0xa08e, 0x0100,</div><div class='del'>-	0x0128, 0xa086, 0x0200, 0x0904, 0x2ffe, 0x0005, 0x7014, 0x2068,</div><div class='del'>-	0x2a60, 0x7018, 0x0807, 0x7010, 0x2068, 0x6834, 0xa086, 0x0103,</div><div class='del'>-	0x0108, 0x0005, 0x2a60, 0x2b78, 0x7018, 0x0807, 0x2a60, 0x7820,</div><div class='del'>-	0xa08a, 0x0040, 0x1210, 0x61c4, 0x0042, 0x2100, 0xa08a, 0x003f,</div><div class='del'>-	0x1a04, 0x2ffb, 0x61c4, 0x0804, 0x2f9d, 0x2fdf, 0x300a, 0x3012,</div><div class='del'>-	0x3016, 0x301e, 0x3024, 0x3028, 0x3034, 0x3037, 0x3041, 0x3044,</div><div class='del'>-	0x2ffb, 0x2ffb, 0x2ffb, 0x3047, 0x2ffb, 0x3056, 0x306d, 0x3084,</div><div class='del'>-	0x30fe, 0x3103, 0x312c, 0x317d, 0x318e, 0x31ad, 0x31e5, 0x31ef,</div><div class='del'>-	0x31fc, 0x320f, 0x3230, 0x3239, 0x326f, 0x3275, 0x2ffb, 0x329e,</div><div class='del'>-	0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x32a5, 0x32af, 0x2ffb,</div><div class='del'>-	0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x32b7,</div><div class='del'>-	0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x32c9, 0x32d3, 0x2ffb,</div><div class='del'>-	0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x0002, 0x32fd, 0x3351,</div><div class='del'>-	0x33ac, 0x33c6, 0x2ffb, 0x33f7, 0x382a, 0x427a, 0x2ffb, 0x2ffb,</div><div class='del'>-	0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x2ffb, 0x3041, 0x3044,</div><div class='del'>-	0x382c, 0x2ffb, 0x3839, 0x4313, 0x436e, 0x43d2, 0x2ffb, 0x4435,</div><div class='del'>-	0x445f, 0x447e, 0x44b0, 0x2ffb, 0x2ffb, 0x2ffb, 0x383d, 0x39e2,</div><div class='del'>-	0x39fc, 0x3a26, 0x3a87, 0x3ae7, 0x3af2, 0x3b2a, 0x3b39, 0x3b48,</div><div class='del'>-	0x3b4b, 0x3b6e, 0x3bba, 0x3c34, 0x3c41, 0x3d42, 0x3e6a, 0x3e93,</div><div class='del'>-	0x3f91, 0x3fb3, 0x3fbf, 0x3ff8, 0x40bc, 0x2ffb, 0x2ffb, 0x2ffb,</div><div class='del'>-	0x2ffb, 0x4124, 0x413f, 0x41b1, 0x4263, 0x713c, 0x0000, 0x2021,</div><div class='del'>-	0x4000, 0x080c, 0x3ef0, 0x0126, 0x2091, 0x8000, 0x0e04, 0x2feb,</div><div class='del'>-	0x7818, 0xd084, 0x0110, 0x012e, 0x0cb0, 0x7c22, 0x7926, 0x7a2a,</div><div class='del'>-	0x7b2e, 0x781b, 0x0001, 0x2091, 0x4080, 0x7007, 0x0001, 0x2091,</div><div class='del'>-	0x5000, 0x012e, 0x0005, 0x2021, 0x4001, 0x0c18, 0x2021, 0x4002,</div><div class='del'>-	0x0c00, 0x2021, 0x4003, 0x08e8, 0x2021, 0x4005, 0x08d0, 0x2021,</div><div class='del'>-	0x4006, 0x08b8, 0xa02e, 0x2520, 0x7b28, 0x7a2c, 0x7824, 0x7930,</div><div class='del'>-	0x0804, 0x3efd, 0x7823, 0x0004, 0x7824, 0x0807, 0xa02e, 0x2520,</div><div class='del'>-	0x7b28, 0x7a2c, 0x7824, 0x7930, 0x0804, 0x3f00, 0x7924, 0x7828,</div><div class='del'>-	0x2114, 0x200a, 0x0804, 0x2fdf, 0x7924, 0x2114, 0x0804, 0x2fdf,</div><div class='del'>-	0x2099, 0x0009, 0x20a1, 0x0009, 0x20a9, 0x0007, 0x53a3, 0x7924,</div><div class='del'>-	0x7a28, 0x7b2c, 0x0804, 0x2fdf, 0x7824, 0x2060, 0x0090, 0x2009,</div><div class='del'>-	0x0002, 0x2011, 0x0002, 0x2019, 0x0008, 0x783b, 0x0017, 0x0804,</div><div class='del'>-	0x2fdf, 0x7d38, 0x7c3c, 0x0840, 0x7d38, 0x7c3c, 0x0888, 0x2061,</div><div class='del'>-	0x1000, 0xe10c, 0xa006, 0x2c15, 0xa200, 0x8c60, 0x8109, 0x1dd8,</div><div class='del'>-	0x2010, 0xa005, 0x0904, 0x2fdf, 0x0804, 0x3001, 0x2069, 0xb652,</div><div class='del'>-	0x7824, 0x7930, 0xa11a, 0x1a04, 0x3007, 0x8019, 0x0904, 0x3007,</div><div class='del'>-	0x684a, 0x6942, 0x782c, 0x6852, 0x7828, 0x6856, 0xa006, 0x685a,</div><div class='del'>-	0x685e, 0x080c, 0x5e17, 0x0804, 0x2fdf, 0x2069, 0xb652, 0x7824,</div><div class='del'>-	0x7934, 0xa11a, 0x1a04, 0x3007, 0x8019, 0x0904, 0x3007, 0x684e,</div><div class='del'>-	0x6946, 0x782c, 0x6862, 0x7828, 0x6866, 0xa006, 0x686a, 0x686e,</div><div class='del'>-	0x080c, 0x5447, 0x0804, 0x2fdf, 0xa02e, 0x2520, 0x81ff, 0x1904,</div><div class='del'>-	0x3004, 0x7924, 0x7b28, 0x7a2c, 0x20a9, 0x0005, 0x20a1, 0xb689,</div><div class='del'>-	0x41a1, 0x080c, 0x3ebc, 0x0904, 0x3004, 0x2009, 0x0020, 0x080c,</div><div class='del'>-	0x3efd, 0x701b, 0x309c, 0x0005, 0x6834, 0x2008, 0xa084, 0x00ff,</div><div class='del'>-	0xa096, 0x0011, 0x0138, 0xa096, 0x0019, 0x0120, 0xa096, 0x0015,</div><div class='del'>-	0x1904, 0x3004, 0x810f, 0xa18c, 0x00ff, 0x0904, 0x3004, 0x710e,</div><div class='del'>-	0x700c, 0x8001, 0x0528, 0x700e, 0x080c, 0x3ebc, 0x0904, 0x3004,</div><div class='del'>-	0x2009, 0x0020, 0x2061, 0xb6d2, 0x6224, 0x6328, 0x642c, 0x6530,</div><div class='del'>-	0xa290, 0x0040, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000,</div><div class='del'>-	0x080c, 0x3efd, 0x701b, 0x30cd, 0x0005, 0x6834, 0xa084, 0x00ff,</div><div class='del'>-	0xa096, 0x0002, 0x0120, 0xa096, 0x000a, 0x1904, 0x3004, 0x08c0,</div><div class='del'>-	0x7010, 0x2068, 0x6838, 0xc0fd, 0x683a, 0x080c, 0x4ebb, 0x1128,</div><div class='del'>-	0x7007, 0x0003, 0x701b, 0x30e7, 0x0005, 0x080c, 0x554d, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x20a9, 0x0005, 0x2099, 0xb689, 0x530a, 0x2100,</div><div class='del'>-	0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0xad80,</div><div class='del'>-	0x000d, 0x2009, 0x0020, 0x012e, 0x0804, 0x3f00, 0x61ac, 0x7824,</div><div class='del'>-	0x60ae, 0x0804, 0x2fdf, 0x2091, 0x8000, 0x7823, 0x4000, 0x7827,</div><div class='del'>-	0x4953, 0x782b, 0x5020, 0x782f, 0x2020, 0x2009, 0x017f, 0x2104,</div><div class='del'>-	0x7832, 0x3f00, 0x7836, 0x2061, 0x0100, 0x6200, 0x2061, 0x0200,</div><div class='del'>-	0x603c, 0x8007, 0xa205, 0x783a, 0x2009, 0x04fd, 0x2104, 0x783e,</div><div class='del'>-	0x781b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2071, 0x0010,</div><div class='del'>-	0x20c1, 0x00f0, 0x0804, 0x0427, 0x81ff, 0x1904, 0x3004, 0x7924,</div><div class='del'>-	0x810f, 0xa18c, 0x00ff, 0x080c, 0x501b, 0x1904, 0x3007, 0x7e38,</div><div class='del'>-	0xa684, 0x3fff, 0xa082, 0x4000, 0x0210, 0x0804, 0x3007, 0x7c28,</div><div class='del'>-	0x7d2c, 0x080c, 0x51e3, 0xd28c, 0x1118, 0x080c, 0x518c, 0x0010,</div><div class='del'>-	0x080c, 0x51bc, 0x1518, 0x2061, 0xbe00, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6000, 0xa086, 0x0000, 0x0148, 0x6010, 0xa06d, 0x0130, 0x683c,</div><div class='del'>-	0xa406, 0x1118, 0x6840, 0xa506, 0x0150, 0x012e, 0xace0, 0x0018,</div><div class='del'>-	0x2001, 0xb617, 0x2004, 0xac02, 0x1a04, 0x3004, 0x0c30, 0x080c,</div><div class='del'>-	0x99e6, 0x012e, 0x0904, 0x3004, 0x0804, 0x2fdf, 0xa00e, 0x2001,</div><div class='del'>-	0x0005, 0x080c, 0x554d, 0x0126, 0x2091, 0x8000, 0x080c, 0x9f8e,</div><div class='del'>-	0x080c, 0x547a, 0x012e, 0x0804, 0x2fdf, 0x81ff, 0x1904, 0x3004,</div><div class='del'>-	0x080c, 0x3ed1, 0x0904, 0x3007, 0x080c, 0x50e1, 0x0904, 0x3004,</div><div class='del'>-	0x080c, 0x51ef, 0x0904, 0x3004, 0x0804, 0x2fdf, 0x81ff, 0x1904,</div><div class='del'>-	0x3004, 0x080c, 0x3ee1, 0x0904, 0x3007, 0x080c, 0x525b, 0x0904,</div><div class='del'>-	0x3004, 0x2019, 0x0005, 0x7924, 0x080c, 0x520a, 0x0904, 0x3004,</div><div class='del'>-	0x7828, 0xa08a, 0x1000, 0x1a04, 0x3007, 0x8003, 0x800b, 0x810b,</div><div class='del'>-	0xa108, 0x080c, 0x6a1a, 0x0804, 0x2fdf, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x81ff, 0x0118, 0x2009, 0x0001, 0x0450, 0x2029, 0x00ff, 0x6450,</div><div class='del'>-	0x2400, 0xa506, 0x01f8, 0x2508, 0x080c, 0x501b, 0x11d8, 0x080c,</div><div class='del'>-	0x525b, 0x1128, 0x2009, 0x0002, 0x62b4, 0x2518, 0x00c0, 0x2019,</div><div class='del'>-	0x0004, 0xa00e, 0x080c, 0x520a, 0x1118, 0x2009, 0x0006, 0x0078,</div><div class='del'>-	0x7824, 0xa08a, 0x1000, 0x1270, 0x8003, 0x800b, 0x810b, 0xa108,</div><div class='del'>-	0x080c, 0x6a1a, 0x8529, 0x1ae0, 0x012e, 0x0804, 0x2fdf, 0x012e,</div><div class='del'>-	0x0804, 0x3004, 0x012e, 0x0804, 0x3007, 0x080c, 0x3ed1, 0x0904,</div><div class='del'>-	0x3007, 0x080c, 0x5147, 0x080c, 0x51e3, 0x0804, 0x2fdf, 0x81ff,</div><div class='del'>-	0x1904, 0x3004, 0x080c, 0x3ed1, 0x0904, 0x3007, 0x080c, 0x5138,</div><div class='del'>-	0x080c, 0x51e3, 0x0804, 0x2fdf, 0x81ff, 0x1904, 0x3004, 0x080c,</div><div class='del'>-	0x3ed1, 0x0904, 0x3007, 0x080c, 0x51be, 0x0904, 0x3004, 0x080c,</div><div class='del'>-	0x4eff, 0x080c, 0x5185, 0x080c, 0x51e3, 0x0804, 0x2fdf, 0x080c,</div><div class='del'>-	0x3ed1, 0x0904, 0x3007, 0x080c, 0x50e1, 0x0904, 0x3004, 0x62a0,</div><div class='del'>-	0x2019, 0x0005, 0x00c6, 0x080c, 0x521c, 0x2061, 0x0000, 0x080c,</div><div class='del'>-	0x6e67, 0x0076, 0x2039, 0x0000, 0x080c, 0x6d74, 0x2009, 0x0000,</div><div class='del'>-	0x080c, 0xaf3e, 0x007e, 0x00ce, 0x080c, 0x51e3, 0x0804, 0x2fdf,</div><div class='del'>-	0x080c, 0x3ed1, 0x0904, 0x3007, 0x080c, 0x51e3, 0x2208, 0x0804,</div><div class='del'>-	0x2fdf, 0x0156, 0x00d6, 0x00e6, 0x2069, 0xb714, 0x6810, 0x6914,</div><div class='del'>-	0xa10a, 0x1210, 0x2009, 0x0000, 0x6816, 0x2011, 0x0000, 0x2019,</div><div class='del'>-	0x0000, 0x20a9, 0x007e, 0x2069, 0xb735, 0x2d04, 0xa075, 0x0130,</div><div class='del'>-	0x704c, 0x0071, 0xa210, 0x7080, 0x0059, 0xa318, 0x8d68, 0x1f04,</div><div class='del'>-	0x324d, 0x2300, 0xa218, 0x00ee, 0x00de, 0x015e, 0x0804, 0x2fdf,</div><div class='del'>-	0x00f6, 0x0016, 0xa07d, 0x0140, 0x2001, 0x0000, 0x8000, 0x2f0c,</div><div class='del'>-	0x81ff, 0x0110, 0x2178, 0x0cd0, 0x001e, 0x00fe, 0x0005, 0x2069,</div><div class='del'>-	0xb714, 0x6910, 0x62b0, 0x0804, 0x2fdf, 0x81ff, 0x1904, 0x3004,</div><div class='del'>-	0x6150, 0xa190, 0x2df9, 0x2215, 0xa294, 0x00ff, 0x6370, 0x83ff,</div><div class='del'>-	0x0108, 0x6274, 0x67d4, 0xd79c, 0x0118, 0x2031, 0x0001, 0x0090,</div><div class='del'>-	0xd7ac, 0x0118, 0x2031, 0x0003, 0x0068, 0xd7a4, 0x0118, 0x2031,</div><div class='del'>-	0x0002, 0x0040, 0x080c, 0x5b41, 0x1118, 0x2031, 0x0004, 0x0010,</div><div class='del'>-	0x2031, 0x0000, 0x7e3a, 0x7f3e, 0x0804, 0x2fdf, 0x6140, 0x6244,</div><div class='del'>-	0x2019, 0xb8b6, 0x231c, 0x0804, 0x2fdf, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6134, 0xa006, 0x2010, 0x6338, 0x012e, 0x0804, 0x2fdf, 0x080c,</div><div class='del'>-	0x3ee1, 0x0904, 0x3007, 0x6244, 0x6338, 0x0804, 0x2fdf, 0x6140,</div><div class='del'>-	0x6244, 0x7824, 0x6042, 0x7b28, 0x6346, 0x2069, 0xb652, 0x831f,</div><div class='del'>-	0xa305, 0x6816, 0x782c, 0x2069, 0xb8b6, 0x2d1c, 0x206a, 0x0804,</div><div class='del'>-	0x2fdf, 0x0126, 0x2091, 0x8000, 0x7824, 0x6036, 0x782c, 0x603a,</div><div class='del'>-	0x012e, 0x0804, 0x2fdf, 0x7838, 0xa005, 0x01a8, 0x7828, 0xa025,</div><div class='del'>-	0x0904, 0x3007, 0x782c, 0xa02d, 0x0904, 0x3007, 0xa00e, 0x080c,</div><div class='del'>-	0x501b, 0x1120, 0x6244, 0x6338, 0x6446, 0x653a, 0xa186, 0x00ff,</div><div class='del'>-	0x0190, 0x8108, 0x0ca0, 0x080c, 0x3ee1, 0x0904, 0x3007, 0x7828,</div><div class='del'>-	0xa00d, 0x0904, 0x3007, 0x782c, 0xa005, 0x0904, 0x3007, 0x6244,</div><div class='del'>-	0x6146, 0x6338, 0x603a, 0x0804, 0x2fdf, 0x2001, 0xb600, 0x2004,</div><div class='del'>-	0xa086, 0x0003, 0x1904, 0x3004, 0x00c6, 0x2061, 0x0100, 0x7924,</div><div class='del'>-	0x810f, 0xa18c, 0x00ff, 0xa196, 0x00ff, 0x1130, 0x2001, 0xb615,</div><div class='del'>-	0x2004, 0xa085, 0xff00, 0x0078, 0xa182, 0x007f, 0x16a0, 0xa188,</div><div class='del'>-	0x2df9, 0x210d, 0xa18c, 0x00ff, 0x2001, 0xb615, 0x2004, 0xa116,</div><div class='del'>-	0x0550, 0x810f, 0xa105, 0x0126, 0x2091, 0x8000, 0x0006, 0x080c,</div><div class='del'>-	0x864e, 0x000e, 0x01e0, 0x601a, 0x600b, 0xbc09, 0x601f, 0x0001,</div><div class='del'>-	0x080c, 0x3ebc, 0x01d8, 0x6837, 0x0000, 0x7007, 0x0003, 0x6833,</div><div class='del'>-	0x0000, 0x6838, 0xc0fd, 0x683a, 0x701b, 0x33a5, 0x2d00, 0x6012,</div><div class='del'>-	0x2009, 0x0032, 0x080c, 0x86d3, 0x012e, 0x00ce, 0x0005, 0x012e,</div><div class='del'>-	0x00ce, 0x0804, 0x3004, 0x00ce, 0x0804, 0x3007, 0x080c, 0x86a4,</div><div class='del'>-	0x0cb0, 0x2001, 0xb600, 0x2004, 0xa086, 0x0003, 0x1904, 0x3004,</div><div class='del'>-	0x00c6, 0x2061, 0x0100, 0x7924, 0x810f, 0xa18c, 0x00ff, 0xa196,</div><div class='del'>-	0x00ff, 0x1130, 0x2001, 0xb615, 0x2004, 0xa085, 0xff00, 0x0078,</div><div class='del'>-	0xa182, 0x007f, 0x16a0, 0xa188, 0x2df9, 0x210d, 0xa18c, 0x00ff,</div><div class='del'>-	0x2001, 0xb615, 0x2004, 0xa116, 0x0550, 0x810f, 0xa105, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x0006, 0x080c, 0x864e, 0x000e, 0x01e0, 0x601a,</div><div class='del'>-	0x600b, 0xbc05, 0x601f, 0x0001, 0x080c, 0x3ebc, 0x01d8, 0x6837,</div><div class='del'>-	0x0000, 0x7007, 0x0003, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,</div><div class='del'>-	0x701b, 0x33a5, 0x2d00, 0x6012, 0x2009, 0x0032, 0x080c, 0x86d3,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0x012e, 0x00ce, 0x0804, 0x3004, 0x00ce,</div><div class='del'>-	0x0804, 0x3007, 0x080c, 0x86a4, 0x0cb0, 0x6830, 0xa086, 0x0100,</div><div class='del'>-	0x0904, 0x3004, 0x0804, 0x2fdf, 0x2061, 0xb975, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x6000, 0xd084, 0x0178, 0x6104, 0x6208, 0x2a60, 0x6068,</div><div class='del'>-	0x783a, 0x60b4, 0x783e, 0x60b0, 0x2019, 0x0072, 0x201a, 0x6348,</div><div class='del'>-	0x012e, 0x0804, 0x2fdf, 0xa00e, 0x2110, 0x0c80, 0x81ff, 0x1904,</div><div class='del'>-	0x3004, 0x080c, 0x5b41, 0x0904, 0x3004, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6248, 0x6068, 0xa202, 0x0248, 0xa085, 0x0001, 0x080c, 0x289c,</div><div class='del'>-	0x080c, 0x4673, 0x012e, 0x0804, 0x2fdf, 0x012e, 0x0804, 0x3007,</div><div class='del'>-	0x0006, 0x0016, 0x00c6, 0x00e6, 0x2001, 0xb8c0, 0x2070, 0x2061,</div><div class='del'>-	0xb652, 0x6008, 0x2072, 0x2009, 0x0000, 0x2011, 0x1000, 0x080c,</div><div class='del'>-	0x6bb2, 0x7206, 0x00ee, 0x00ce, 0x001e, 0x000e, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x7824, 0xa084, 0x0007, 0x0002, 0x3409, 0x3412,</div><div class='del'>-	0x3419, 0x3406, 0x3406, 0x3406, 0x3406, 0x3406, 0x012e, 0x0804,</div><div class='del'>-	0x3007, 0x2009, 0x0114, 0x2104, 0xa085, 0x0800, 0x200a, 0x080c,</div><div class='del'>-	0x3584, 0x0070, 0x2009, 0x010b, 0x200b, 0x0010, 0x080c, 0x3584,</div><div class='del'>-	0x0038, 0x81ff, 0x0128, 0x012e, 0x2021, 0x400b, 0x0804, 0x2fe1,</div><div class='del'>-	0x0086, 0x0096, 0x00a6, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6,</div><div class='del'>-	0x080c, 0x33e0, 0x2009, 0x0101, 0x210c, 0x0016, 0x2001, 0x0138,</div><div class='del'>-	0x200c, 0x2003, 0x0001, 0x0016, 0x2001, 0x007a, 0x2034, 0x2001,</div><div class='del'>-	0x007b, 0x202c, 0xa006, 0x2048, 0x2050, 0x2058, 0x080c, 0x37cf,</div><div class='del'>-	0x080c, 0x3733, 0xa03e, 0x2720, 0x00f6, 0x00e6, 0x00c6, 0x2d60,</div><div class='del'>-	0x2071, 0xb94b, 0x2079, 0x0020, 0x00d6, 0x2069, 0x0000, 0x6824,</div><div class='del'>-	0xd0b4, 0x0140, 0x2001, 0x007d, 0x2004, 0x783e, 0x2001, 0x007c,</div><div class='del'>-	0x2004, 0x783a, 0x00de, 0x2011, 0x0001, 0x080c, 0x36df, 0x080c,</div><div class='del'>-	0x36df, 0x00ce, 0x00ee, 0x00fe, 0x080c, 0x362a, 0x080c, 0x3707,</div><div class='del'>-	0x080c, 0x3684, 0x080c, 0x35e9, 0x080c, 0x361a, 0x00f6, 0x2079,</div><div class='del'>-	0x0100, 0x7824, 0xd094, 0x0530, 0x7814, 0xa084, 0x0184, 0xa085,</div><div class='del'>-	0x0010, 0x7816, 0x2079, 0x0140, 0x080c, 0x3562, 0x1110, 0x00fe,</div><div class='del'>-	0x0430, 0x7804, 0xd0dc, 0x0dc0, 0x2079, 0x0100, 0x7827, 0x0086,</div><div class='del'>-	0x7814, 0xa084, 0x0184, 0xa085, 0x0032, 0x7816, 0x080c, 0x3562,</div><div class='del'>-	0x1110, 0x00fe, 0x00a0, 0x7824, 0xd0bc, 0x0dc0, 0x7827, 0x0080,</div><div class='del'>-	0xa026, 0x7c16, 0x7824, 0xd0ac, 0x0130, 0x8b58, 0x080c, 0x356c,</div><div class='del'>-	0x00fe, 0x0804, 0x352c, 0x00fe, 0x080c, 0x3562, 0x1150, 0x8948,</div><div class='del'>-	0x2001, 0x007a, 0x2602, 0x2001, 0x007b, 0x2502, 0x080c, 0x356c,</div><div class='del'>-	0x0088, 0x87ff, 0x0140, 0x2001, 0x0201, 0x2004, 0xa005, 0x1904,</div><div class='del'>-	0x3466, 0x8739, 0x0038, 0x2001, 0xb924, 0x2004, 0xa086, 0x0000,</div><div class='del'>-	0x1904, 0x3466, 0x2001, 0x0033, 0x2003, 0x00f6, 0x8631, 0x1208,</div><div class='del'>-	0x8529, 0x2500, 0xa605, 0x0904, 0x352c, 0x7824, 0xd0bc, 0x0128,</div><div class='del'>-	0x2900, 0xaa05, 0xab05, 0x1904, 0x352c, 0x6033, 0x000d, 0x2001,</div><div class='del'>-	0x0030, 0x2003, 0x0004, 0x7824, 0xd0ac, 0x1148, 0x2001, 0xb924,</div><div class='del'>-	0x2003, 0x0003, 0x2001, 0x0030, 0x2003, 0x0009, 0x0040, 0x6027,</div><div class='del'>-	0x0001, 0x2001, 0x0075, 0x2004, 0xa005, 0x0108, 0x6026, 0x2c00,</div><div class='del'>-	0x601a, 0x20e1, 0x9040, 0x2d00, 0x681a, 0x6833, 0x000d, 0x7824,</div><div class='del'>-	0xd0a4, 0x1180, 0x6827, 0x0000, 0x00c6, 0x20a9, 0x0004, 0x2061,</div><div class='del'>-	0x0020, 0x6003, 0x0008, 0x2001, 0x0203, 0x2004, 0x1f04, 0x3501,</div><div class='del'>-	0x00ce, 0x0040, 0x6827, 0x0001, 0x2001, 0x0074, 0x2004, 0xa005,</div><div class='del'>-	0x0108, 0x6826, 0x00f6, 0x00c6, 0x2079, 0x0100, 0x2061, 0x0020,</div><div class='del'>-	0x7827, 0x0002, 0x2001, 0x0072, 0x2004, 0xa084, 0xfff8, 0x601a,</div><div class='del'>-	0x0006, 0x2001, 0x0073, 0x2004, 0x601e, 0x78c6, 0x000e, 0x78ca,</div><div class='del'>-	0x00ce, 0x00fe, 0x0804, 0x3444, 0x2061, 0x0100, 0x6027, 0x0002,</div><div class='del'>-	0x001e, 0x61e2, 0x001e, 0x6106, 0x7824, 0xa084, 0x0003, 0xa086,</div><div class='del'>-	0x0002, 0x0188, 0x20e1, 0x9028, 0x6050, 0xa084, 0xf7ef, 0x6052,</div><div class='del'>-	0x602f, 0x0000, 0x602c, 0xc0ac, 0x602e, 0x604b, 0xf7f7, 0x6043,</div><div class='del'>-	0x0090, 0x6043, 0x0010, 0x2908, 0x2a10, 0x2b18, 0x2b00, 0xaa05,</div><div class='del'>-	0xa905, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e,</div><div class='del'>-	0x008e, 0x1118, 0x012e, 0x0804, 0x2fdf, 0x012e, 0x2021, 0x400c,</div><div class='del'>-	0x0804, 0x2fe1, 0xa085, 0x0001, 0x1d04, 0x356b, 0x2091, 0x6000,</div><div class='del'>-	0x8420, 0xa486, 0x0064, 0x0005, 0x2001, 0x0105, 0x2003, 0x0010,</div><div class='del'>-	0x2001, 0x0030, 0x2003, 0x0004, 0x2001, 0x0020, 0x2003, 0x0004,</div><div class='del'>-	0x2001, 0xb924, 0x2003, 0x0000, 0x2001, 0xb94b, 0x2003, 0x0000,</div><div class='del'>-	0x20e1, 0xf000, 0xa026, 0x0005, 0x00f6, 0x2079, 0x0100, 0x2001,</div><div class='del'>-	0xb615, 0x200c, 0x7932, 0x7936, 0x080c, 0x287c, 0x7850, 0xa084,</div><div class='del'>-	0x0980, 0xa085, 0x0030, 0x7852, 0x2019, 0x01f4, 0x8319, 0x1df0,</div><div class='del'>-	0xa084, 0x0980, 0x7852, 0x782c, 0xc0ad, 0x782e, 0x20a9, 0x0046,</div><div class='del'>-	0x1d04, 0x35a0, 0x2091, 0x6000, 0x1f04, 0x35a0, 0x7850, 0xa085,</div><div class='del'>-	0x0400, 0x7852, 0x2001, 0x0009, 0x2004, 0xa084, 0x0003, 0xa086,</div><div class='del'>-	0x0001, 0x1118, 0x782c, 0xc0ac, 0x782e, 0x784b, 0xf7f7, 0x7843,</div><div class='del'>-	0x0090, 0x7843, 0x0010, 0x20a9, 0x000e, 0xe000, 0x1f04, 0x35bd,</div><div class='del'>-	0x7850, 0xa085, 0x1400, 0x7852, 0x2019, 0x61a8, 0x7854, 0xe000,</div><div class='del'>-	0xe000, 0xd08c, 0x1110, 0x8319, 0x1dc8, 0x7827, 0x0048, 0x7850,</div><div class='del'>-	0xa085, 0x0400, 0x7852, 0x7843, 0x0040, 0x2019, 0x01f4, 0xe000,</div><div class='del'>-	0xe000, 0x8319, 0x1de0, 0x2001, 0x0140, 0x2003, 0x0100, 0x7827,</div><div class='del'>-	0x0020, 0x7843, 0x0000, 0x2003, 0x0000, 0x7827, 0x0048, 0x00fe,</div><div class='del'>-	0x0005, 0x7824, 0xd0ac, 0x11c8, 0x00f6, 0x00e6, 0x2071, 0xb924,</div><div class='del'>-	0x2079, 0x0030, 0x2001, 0x0201, 0x2004, 0xa005, 0x0160, 0x7000,</div><div class='del'>-	0xa086, 0x0000, 0x1140, 0x0051, 0xd0bc, 0x0108, 0x8738, 0x7003,</div><div class='del'>-	0x0003, 0x7803, 0x0019, 0x00ee, 0x00fe, 0x0005, 0x780c, 0xa08c,</div><div class='del'>-	0x0070, 0x0178, 0x2009, 0x007a, 0x260a, 0x2009, 0x007b, 0x250a,</div><div class='del'>-	0xd0b4, 0x0108, 0x8a50, 0xd0ac, 0x0108, 0x8948, 0xd0a4, 0x0108,</div><div class='del'>-	0x8b58, 0x0005, 0x00f6, 0x2079, 0x0200, 0x781c, 0xd084, 0x0140,</div><div class='del'>-	0x20e1, 0x0007, 0x20e1, 0x2000, 0x2001, 0x020a, 0x2004, 0x0ca8,</div><div class='del'>-	0x00fe, 0x0005, 0x00e6, 0x2071, 0x0100, 0x2001, 0xb8c1, 0x2004,</div><div class='del'>-	0x70e2, 0x2009, 0xb615, 0x210c, 0x716e, 0x7063, 0x0100, 0x7166,</div><div class='del'>-	0x719e, 0x706b, 0x0000, 0x7073, 0x0809, 0x7077, 0x0008, 0x7078,</div><div class='del'>-	0xa080, 0x0100, 0x707a, 0x7080, 0x8000, 0x7082, 0x7087, 0xaaaa,</div><div class='del'>-	0xa006, 0x708a, 0x708e, 0x707e, 0x70d6, 0x70ab, 0x0036, 0x70af,</div><div class='del'>-	0x95d5, 0x7027, 0x0080, 0x7014, 0xa084, 0x0184, 0xa085, 0x0032,</div><div class='del'>-	0x7016, 0x080c, 0x3707, 0x080c, 0x3562, 0x1110, 0x8421, 0x0028,</div><div class='del'>-	0x7024, 0xd0bc, 0x0db0, 0x7027, 0x0080, 0x00f6, 0x00e6, 0x2071,</div><div class='del'>-	0xb924, 0x2079, 0x0030, 0x00d6, 0x2069, 0x0000, 0x6824, 0xd0b4,</div><div class='del'>-	0x0120, 0x683c, 0x783e, 0x6838, 0x783a, 0x00de, 0x2011, 0x0011,</div><div class='del'>-	0x080c, 0x36df, 0x2011, 0x0001, 0x080c, 0x36df, 0x00ee, 0x00fe,</div><div class='del'>-	0x7017, 0x0000, 0x00ee, 0x0005, 0x00f6, 0x00e6, 0x2071, 0xb924,</div><div class='del'>-	0x2079, 0x0030, 0x7904, 0xd1fc, 0x0904, 0x36dc, 0x7803, 0x0002,</div><div class='del'>-	0xa026, 0xd19c, 0x1904, 0x36d8, 0x7000, 0x0002, 0x36dc, 0x369a,</div><div class='del'>-	0x36be, 0x36d8, 0xd1bc, 0x1150, 0xd1dc, 0x1150, 0x8001, 0x7002,</div><div class='del'>-	0x2011, 0x0001, 0x04e1, 0x05c0, 0x04d1, 0x04b0, 0x780f, 0x0000,</div><div class='del'>-	0x7820, 0x7924, 0x7803, 0x0004, 0x7822, 0x7926, 0x2001, 0x0201,</div><div class='del'>-	0x200c, 0x81ff, 0x0de8, 0x080c, 0x3606, 0x2009, 0x0001, 0x7808,</div><div class='del'>-	0xd0ec, 0x0110, 0x2009, 0x0011, 0x7902, 0x00f0, 0x8001, 0x7002,</div><div class='del'>-	0xa184, 0x0880, 0x1138, 0x7804, 0xd0fc, 0x1940, 0x2011, 0x0001,</div><div class='del'>-	0x00b1, 0x0090, 0x6030, 0xa092, 0x0004, 0xa086, 0x0009, 0x1120,</div><div class='del'>-	0x6000, 0x601a, 0x2011, 0x0025, 0x6232, 0xd1dc, 0x1988, 0x0870,</div><div class='del'>-	0x7803, 0x0004, 0x7003, 0x0000, 0x00ee, 0x00fe, 0x0005, 0x6024,</div><div class='del'>-	0xa005, 0x0520, 0x8001, 0x6026, 0x6018, 0x6130, 0xa140, 0x2804,</div><div class='del'>-	0x7832, 0x8840, 0x2804, 0x7836, 0x8840, 0x2804, 0x7822, 0x8840,</div><div class='del'>-	0x2804, 0x7826, 0x8840, 0x7a02, 0x7000, 0x8000, 0x7002, 0x6018,</div><div class='del'>-	0xa802, 0xa08a, 0x0029, 0x1138, 0x6018, 0xa080, 0x0001, 0x2004,</div><div class='del'>-	0x601a, 0x2001, 0x000d, 0x6032, 0xa085, 0x0001, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x00c6, 0x2071, 0xb94b, 0x2079, 0x0020, 0x7904, 0xd1fc,</div><div class='del'>-	0x01f0, 0x7803, 0x0002, 0x2d60, 0xa026, 0x7000, 0x0002, 0x372f,</div><div class='del'>-	0x371a, 0x3726, 0x8001, 0x7002, 0xd19c, 0x1188, 0x2011, 0x0001,</div><div class='del'>-	0x080c, 0x36df, 0x0160, 0x080c, 0x36df, 0x0048, 0x8001, 0x7002,</div><div class='del'>-	0x7804, 0xd0fc, 0x1d30, 0x2011, 0x0001, 0x080c, 0x36df, 0x00ce,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x2061, 0x0200,</div><div class='del'>-	0x2001, 0xb8c1, 0x2004, 0x601a, 0x2061, 0x0100, 0x2001, 0xb8c0,</div><div class='del'>-	0x2004, 0x60ce, 0x6004, 0xc0ac, 0xa085, 0x0200, 0x6006, 0x2001,</div><div class='del'>-	0x0074, 0x2004, 0xa005, 0x01f8, 0x2038, 0x2001, 0x0076, 0x2024,</div><div class='del'>-	0x2001, 0x0077, 0x201c, 0x080c, 0x3ebc, 0x6833, 0x000d, 0x6f26,</div><div class='del'>-	0x2d00, 0x681a, 0xa78a, 0x0007, 0x0220, 0x2138, 0x2009, 0x0007,</div><div class='del'>-	0x0010, 0x2708, 0xa03e, 0x6818, 0xa080, 0x000d, 0x04b1, 0x1d90,</div><div class='del'>-	0x2d00, 0x681a, 0x0088, 0x080c, 0x3ebc, 0x6833, 0x000d, 0x2070,</div><div class='del'>-	0x6827, 0x0001, 0x2d00, 0x681a, 0x2001, 0x0076, 0x2004, 0x2072,</div><div class='del'>-	0x2001, 0x0077, 0x2004, 0x7006, 0x2061, 0x0020, 0x2079, 0x0100,</div><div class='del'>-	0x2001, 0xb8c0, 0x2004, 0x6012, 0x20e1, 0x9040, 0x2001, 0x0072,</div><div class='del'>-	0x2004, 0xa084, 0xfff8, 0x700a, 0x601a, 0x0006, 0x2001, 0x0073,</div><div class='del'>-	0x2004, 0x700e, 0x601e, 0x78c6, 0x000e, 0x78ca, 0xa006, 0x603a,</div><div class='del'>-	0x603e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x00e6, 0x2071, 0x0010,</div><div class='del'>-	0x20a0, 0x2099, 0x0014, 0x7003, 0x0026, 0x7432, 0x7336, 0xa006,</div><div class='del'>-	0x703a, 0x703e, 0x810b, 0x810b, 0x21a8, 0x810b, 0x7122, 0x7003,</div><div class='del'>-	0x0041, 0x7004, 0xd0fc, 0x0de8, 0x7003, 0x0002, 0x7003, 0x0040,</div><div class='del'>-	0x53a5, 0x7430, 0x7334, 0x87ff, 0x0180, 0x00c6, 0x00d6, 0x2d60,</div><div class='del'>-	0x00c6, 0x080c, 0x3ebc, 0x00ce, 0x6018, 0x2070, 0x2d00, 0x7006,</div><div class='del'>-	0x601a, 0x00de, 0x00ce, 0xa085, 0x0001, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x2001, 0x0075, 0x2004, 0xa005, 0x0508, 0x2038, 0x2001, 0x0078,</div><div class='del'>-	0x2024, 0x2001, 0x0079, 0x201c, 0x080c, 0x3ebc, 0x2d60, 0x6833,</div><div class='del'>-	0x000d, 0x6f26, 0x2d00, 0x681a, 0xa78a, 0x0007, 0x0220, 0x2138,</div><div class='del'>-	0x2009, 0x0007, 0x0010, 0x2708, 0xa03e, 0x6818, 0xa080, 0x000d,</div><div class='del'>-	0x080c, 0x379d, 0x1d88, 0x2d00, 0x681a, 0x00e0, 0x080c, 0x3ebc,</div><div class='del'>-	0x2d60, 0x6033, 0x000d, 0x2070, 0x6027, 0x0001, 0x2c00, 0x601a,</div><div class='del'>-	0x2001, 0x0078, 0x2004, 0x2072, 0x2001, 0x0079, 0x2004, 0x7006,</div><div class='del'>-	0x2001, 0x0072, 0x2004, 0xa084, 0xfff8, 0x700a, 0x2001, 0x0073,</div><div class='del'>-	0x2004, 0x700e, 0x2001, 0x0030, 0x2003, 0x0004, 0x7824, 0xd0ac,</div><div class='del'>-	0x1178, 0x2001, 0x0101, 0x200c, 0xc1ed, 0x2102, 0x6027, 0x0000,</div><div class='del'>-	0x2001, 0xb924, 0x2003, 0x0003, 0x2001, 0x0030, 0x2003, 0x0009,</div><div class='del'>-	0x00ee, 0x0005, 0x0804, 0x2fdf, 0x0126, 0x2091, 0x8000, 0x20a9,</div><div class='del'>-	0x0012, 0x2001, 0xb640, 0x20a0, 0xa006, 0x40a4, 0x012e, 0x0804,</div><div class='del'>-	0x2fdf, 0x7d38, 0x7c3c, 0x0804, 0x3086, 0x080c, 0x3ebc, 0x0904,</div><div class='del'>-	0x3004, 0x080c, 0x5b41, 0x0110, 0x080c, 0x4c52, 0x2009, 0x001c,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x3efd, 0x701b, 0x3851,</div><div class='del'>-	0x0005, 0xade8, 0x000d, 0x6800, 0xa005, 0x0904, 0x3007, 0x6804,</div><div class='del'>-	0xd0ac, 0x0118, 0xd0a4, 0x0904, 0x3007, 0xd094, 0x00c6, 0x2061,</div><div class='del'>-	0x0100, 0x6104, 0x0138, 0x6200, 0xa292, 0x0005, 0x0218, 0xa18c,</div><div class='del'>-	0xffdf, 0x0010, 0xa18d, 0x0020, 0x6106, 0x00ce, 0xd08c, 0x00c6,</div><div class='del'>-	0x2061, 0x0100, 0x6104, 0x0118, 0xa18d, 0x0010, 0x0010, 0xa18c,</div><div class='del'>-	0xffef, 0x6106, 0x00ce, 0x2009, 0x0100, 0x210c, 0xa18a, 0x0002,</div><div class='del'>-	0x0268, 0xd084, 0x0158, 0x6a28, 0xa28a, 0x007f, 0x1a04, 0x3007,</div><div class='del'>-	0xa288, 0x2df9, 0x210d, 0xa18c, 0x00ff, 0x615a, 0xd0dc, 0x0130,</div><div class='del'>-	0x6828, 0xa08a, 0x007f, 0x1a04, 0x3007, 0x6052, 0x6808, 0xa08a,</div><div class='del'>-	0x0100, 0x0a04, 0x3007, 0xa08a, 0x0841, 0x1a04, 0x3007, 0xa084,</div><div class='del'>-	0x0007, 0x1904, 0x3007, 0x680c, 0xa005, 0x0904, 0x3007, 0x6810,</div><div class='del'>-	0xa005, 0x0904, 0x3007, 0x6848, 0x6940, 0xa10a, 0x1a04, 0x3007,</div><div class='del'>-	0x8001, 0x0904, 0x3007, 0x684c, 0x6944, 0xa10a, 0x1a04, 0x3007,</div><div class='del'>-	0x8001, 0x0904, 0x3007, 0x6804, 0xd0fc, 0x0560, 0x080c, 0x3ebc,</div><div class='del'>-	0x0904, 0x3004, 0x2009, 0x0014, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,</div><div class='del'>-	0xa290, 0x0038, 0xa399, 0x0000, 0x080c, 0x3efd, 0x701b, 0x38d1,</div><div class='del'>-	0x0005, 0xade8, 0x000d, 0x20a9, 0x0014, 0x2d98, 0x2069, 0xb66e,</div><div class='del'>-	0x2da0, 0x53a3, 0x7010, 0xa0e8, 0x000d, 0x2001, 0xb672, 0x200c,</div><div class='del'>-	0xd1e4, 0x0140, 0x00c6, 0x2061, 0x0100, 0x6004, 0xa085, 0x0b00,</div><div class='del'>-	0x6006, 0x00ce, 0x2009, 0xb8b1, 0x200b, 0x0000, 0x2001, 0xb674,</div><div class='del'>-	0x2004, 0xd0ac, 0x0158, 0x7824, 0x200a, 0x2009, 0x017f, 0x200a,</div><div class='del'>-	0x3200, 0xa084, 0x003f, 0xa085, 0x3020, 0x2090, 0x20a9, 0x001c,</div><div class='del'>-	0x2d98, 0x2069, 0xb652, 0x2da0, 0x53a3, 0x6814, 0xa08c, 0x00ff,</div><div class='del'>-	0x6142, 0x8007, 0xa084, 0x00ff, 0x6046, 0x080c, 0x5e17, 0x080c,</div><div class='del'>-	0x53de, 0x080c, 0x5447, 0x6000, 0xa086, 0x0000, 0x1904, 0x39cc,</div><div class='del'>-	0x6808, 0x602a, 0x080c, 0x24a5, 0x0006, 0x2001, 0x0100, 0x2004,</div><div class='del'>-	0xa082, 0x0005, 0x000e, 0x0268, 0x2009, 0x0170, 0x200b, 0x0080,</div><div class='del'>-	0xe000, 0xe000, 0x200b, 0x0000, 0x0036, 0x6b08, 0x080c, 0x28d7,</div><div class='del'>-	0x003e, 0x6818, 0x691c, 0x6a20, 0x6b24, 0x8007, 0x810f, 0x8217,</div><div class='del'>-	0x831f, 0x6016, 0x611a, 0x621e, 0x6322, 0x6c04, 0xd4f4, 0x0148,</div><div class='del'>-	0x6830, 0x6934, 0x6a38, 0x6b3c, 0x8007, 0x810f, 0x8217, 0x831f,</div><div class='del'>-	0x0010, 0xa084, 0xf0ff, 0x6006, 0x610a, 0x620e, 0x6312, 0x8007,</div><div class='del'>-	0x810f, 0x8217, 0x831f, 0x20a9, 0x0004, 0x20a1, 0xb8c7, 0x40a1,</div><div class='del'>-	0x080c, 0x6ada, 0x6904, 0xd1fc, 0x0520, 0x00c6, 0x2009, 0x0000,</div><div class='del'>-	0x20a9, 0x0001, 0x6b70, 0xd384, 0x01c8, 0x0020, 0x839d, 0x12b0,</div><div class='del'>-	0x3508, 0x8109, 0x080c, 0x63ce, 0x6878, 0x6016, 0x6874, 0x2008,</div><div class='del'>-	0xa084, 0xff00, 0x8007, 0x600a, 0xa184, 0x00ff, 0x6006, 0x8108,</div><div class='del'>-	0x1118, 0x6003, 0x0003, 0x0010, 0x6003, 0x0001, 0x1f04, 0x3966,</div><div class='del'>-	0x00ce, 0x2069, 0xb652, 0x2001, 0xb89e, 0x6a80, 0xa294, 0x0030,</div><div class='del'>-	0xa28e, 0x0000, 0x0170, 0xa28e, 0x0010, 0x0118, 0xa28e, 0x0020,</div><div class='del'>-	0x0140, 0x2003, 0xaaaa, 0x080c, 0x2920, 0x2001, 0xb88f, 0x2102,</div><div class='del'>-	0x0008, 0x2102, 0x00c6, 0x2061, 0x0100, 0x602f, 0x0040, 0x602f,</div><div class='del'>-	0x0000, 0x00ce, 0x080c, 0x5b41, 0x0128, 0x080c, 0x4116, 0x0110,</div><div class='del'>-	0x080c, 0x289c, 0x60c8, 0xa005, 0x01d0, 0x6003, 0x0001, 0x2009,</div><div class='del'>-	0x39b2, 0x00e0, 0x080c, 0x5b41, 0x1178, 0x2011, 0x5a14, 0x080c,</div><div class='del'>-	0x6a0e, 0x2011, 0x5a07, 0x080c, 0x6ace, 0x2001, 0xb89f, 0x2003,</div><div class='del'>-	0x0000, 0x080c, 0x5a79, 0x0040, 0x080c, 0x4b7b, 0x0028, 0x6003,</div><div class='del'>-	0x0004, 0x2009, 0x39cc, 0x0010, 0x0804, 0x2fdf, 0x2001, 0x0100,</div><div class='del'>-	0x2004, 0xa082, 0x0005, 0x0258, 0x2001, 0x0170, 0x2004, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x004c, 0x1118, 0x2091, 0x309d, 0x0817, 0x2091,</div><div class='del'>-	0x301d, 0x0817, 0x6000, 0xa086, 0x0000, 0x0904, 0x3004, 0x2069,</div><div class='del'>-	0xb652, 0x7830, 0x6842, 0x7834, 0x6846, 0x6804, 0xd0fc, 0x0118,</div><div class='del'>-	0x2009, 0x0030, 0x0010, 0x2009, 0x001c, 0x2d00, 0x7a2c, 0x7b28,</div><div class='del'>-	0x7c3c, 0x7d38, 0x0804, 0x3f00, 0xa006, 0x080c, 0x289c, 0x81ff,</div><div class='del'>-	0x1904, 0x3004, 0x080c, 0x5b41, 0x1178, 0x2001, 0xb89f, 0x2003,</div><div class='del'>-	0x0001, 0x2001, 0xb600, 0x2003, 0x0001, 0xa085, 0x0001, 0x080c,</div><div class='del'>-	0x5b85, 0x080c, 0x5a79, 0x0080, 0x0016, 0x2009, 0xffff, 0x8109,</div><div class='del'>-	0x0130, 0x2001, 0xb8e2, 0x2004, 0xa086, 0x0000, 0x1dc0, 0x001e,</div><div class='del'>-	0x080c, 0x4c52, 0x080c, 0x4b7b, 0x0804, 0x2fdf, 0x81ff, 0x1904,</div><div class='del'>-	0x3004, 0x080c, 0x5b41, 0x1110, 0x0804, 0x3004, 0x6188, 0x81ff,</div><div class='del'>-	0x0198, 0x703f, 0x0000, 0x2001, 0xbdc0, 0x2009, 0x0040, 0x7a2c,</div><div class='del'>-	0x7b28, 0x7c3c, 0x7d38, 0x0126, 0x2091, 0x8000, 0x080c, 0x3f00,</div><div class='del'>-	0x701b, 0x2fdd, 0x012e, 0x0005, 0x703f, 0x0001, 0x00d6, 0x2069,</div><div class='del'>-	0xbdc0, 0x20a9, 0x0040, 0x20a1, 0xbdc0, 0x2019, 0xffff, 0x43a4,</div><div class='del'>-	0x6550, 0xa588, 0x2df9, 0x210d, 0xa18c, 0x00ff, 0x216a, 0xa00e,</div><div class='del'>-	0x2011, 0x0002, 0x2100, 0xa506, 0x01a8, 0x080c, 0x501b, 0x1190,</div><div class='del'>-	0x6014, 0x821c, 0x0238, 0xa398, 0xbdc0, 0xa085, 0xff00, 0x8007,</div><div class='del'>-	0x201a, 0x0038, 0xa398, 0xbdc0, 0x2324, 0xa4a4, 0xff00, 0xa405,</div><div class='del'>-	0x201a, 0x8210, 0x8108, 0xa182, 0x0080, 0x1208, 0x0c18, 0x8201,</div><div class='del'>-	0x8007, 0x2d0c, 0xa105, 0x206a, 0x00de, 0x20a9, 0x0040, 0x20a1,</div><div class='del'>-	0xbdc0, 0x2099, 0xbdc0, 0x080c, 0x4bf1, 0x0804, 0x3a33, 0x080c,</div><div class='del'>-	0x3ee1, 0x0904, 0x3007, 0x00c6, 0x080c, 0x3ebc, 0x00ce, 0x1120,</div><div class='del'>-	0x2009, 0x0002, 0x0804, 0x3004, 0x2001, 0xb653, 0x2004, 0xd0b4,</div><div class='del'>-	0x0550, 0x7824, 0xa084, 0xff00, 0xa08e, 0x7e00, 0x0520, 0xa08e,</div><div class='del'>-	0x7f00, 0x0508, 0xa08e, 0x8000, 0x01f0, 0x6000, 0xd08c, 0x11d8,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x11a8, 0x6837, 0x0000,</div><div class='del'>-	0x6838, 0xc0fd, 0x683a, 0x080c, 0x9e96, 0x1120, 0x2009, 0x0003,</div><div class='del'>-	0x0804, 0x3004, 0x7007, 0x0003, 0x701b, 0x3abf, 0x0005, 0x080c,</div><div class='del'>-	0x3ee1, 0x0904, 0x3007, 0x20a9, 0x002b, 0x2c98, 0xade8, 0x0002,</div><div class='del'>-	0x2da0, 0x53a3, 0x20a9, 0x0004, 0xac80, 0x0006, 0x2098, 0xad80,</div><div class='del'>-	0x0006, 0x20a0, 0x080c, 0x4bf1, 0x20a9, 0x0004, 0xac80, 0x000a,</div><div class='del'>-	0x2098, 0xad80, 0x000a, 0x20a0, 0x080c, 0x4bf1, 0x2d00, 0x2009,</div><div class='del'>-	0x002b, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804, 0x3f00, 0x81ff,</div><div class='del'>-	0x1904, 0x3004, 0x080c, 0x3ed1, 0x0904, 0x3007, 0x080c, 0x51f8,</div><div class='del'>-	0x0804, 0x2fdf, 0x81ff, 0x1904, 0x3004, 0x7828, 0xa08a, 0x1000,</div><div class='del'>-	0x1a04, 0x3007, 0x080c, 0x3ee1, 0x0904, 0x3007, 0x080c, 0x525b,</div><div class='del'>-	0x0904, 0x3004, 0x2019, 0x0004, 0xa00e, 0x080c, 0x520a, 0x7924,</div><div class='del'>-	0x810f, 0x7a28, 0x0011, 0x0804, 0x2fdf, 0xa186, 0x00ff, 0x0110,</div><div class='del'>-	0x0071, 0x0060, 0x2029, 0x007e, 0x2061, 0xb600, 0x6450, 0x2400,</div><div class='del'>-	0xa506, 0x0110, 0x2508, 0x0019, 0x8529, 0x1ec8, 0x0005, 0x080c,</div><div class='del'>-	0x501b, 0x1138, 0x2200, 0x8003, 0x800b, 0x810b, 0xa108, 0x080c,</div><div class='del'>-	0x6a1a, 0x0005, 0x81ff, 0x1904, 0x3004, 0x080c, 0x3ed1, 0x0904,</div><div class='del'>-	0x3007, 0x080c, 0x50e1, 0x0904, 0x3004, 0x080c, 0x5201, 0x0804,</div><div class='del'>-	0x2fdf, 0x81ff, 0x1904, 0x3004, 0x080c, 0x3ed1, 0x0904, 0x3007,</div><div class='del'>-	0x080c, 0x50e1, 0x0904, 0x3004, 0x080c, 0x51ef, 0x0804, 0x2fdf,</div><div class='del'>-	0x6100, 0x0804, 0x2fdf, 0x080c, 0x3ee1, 0x0904, 0x3007, 0x2001,</div><div class='del'>-	0xb600, 0x2004, 0xa086, 0x0003, 0x1904, 0x3004, 0x00d6, 0xace8,</div><div class='del'>-	0x000a, 0x7924, 0xd184, 0x0110, 0xace8, 0x0006, 0x680c, 0x8007,</div><div class='del'>-	0x783e, 0x6808, 0x8007, 0x783a, 0x6b04, 0x831f, 0x6a00, 0x8217,</div><div class='del'>-	0x00de, 0x6100, 0xa18c, 0x0200, 0x0804, 0x2fdf, 0x7824, 0xa09c,</div><div class='del'>-	0x0003, 0xd0b4, 0x1160, 0xa39a, 0x0003, 0x1a04, 0x3004, 0x6250,</div><div class='del'>-	0xa294, 0x00ff, 0xa084, 0xff00, 0x8007, 0xa206, 0x1150, 0x2001,</div><div class='del'>-	0xb640, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804,</div><div class='del'>-	0x3f00, 0x81ff, 0x1904, 0x3004, 0x080c, 0x3ee1, 0x0904, 0x3007,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1904, 0x3004, 0x00c6,</div><div class='del'>-	0x080c, 0x3ebc, 0x00ce, 0x0904, 0x3004, 0x6837, 0x0000, 0x6838,</div><div class='del'>-	0xc0fd, 0x683a, 0x080c, 0x9e42, 0x0904, 0x3004, 0x7007, 0x0003,</div><div class='del'>-	0x701b, 0x3bab, 0x0005, 0x6830, 0xa086, 0x0100, 0x0904, 0x3004,</div><div class='del'>-	0xad80, 0x000e, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,</div><div class='del'>-	0x0804, 0x3f00, 0xa006, 0x080c, 0x289c, 0x7824, 0xa084, 0x00ff,</div><div class='del'>-	0xa086, 0x00ff, 0x0118, 0x81ff, 0x1904, 0x3004, 0x080c, 0x5b41,</div><div class='del'>-	0x0110, 0x080c, 0x4c52, 0x7828, 0xa08a, 0x1000, 0x1a04, 0x3007,</div><div class='del'>-	0x7924, 0xa18c, 0xff00, 0x810f, 0xa186, 0x00ff, 0x0138, 0xa182,</div><div class='del'>-	0x007f, 0x1a04, 0x3007, 0x2100, 0x080c, 0x2866, 0x0026, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2061, 0xb8f4, 0x601b, 0x0000, 0x601f,</div><div class='del'>-	0x0000, 0x080c, 0x5b41, 0x1178, 0x2001, 0xb89f, 0x2003, 0x0001,</div><div class='del'>-	0x2001, 0xb600, 0x2003, 0x0001, 0xa085, 0x0001, 0x080c, 0x5b85,</div><div class='del'>-	0x080c, 0x5a79, 0x0440, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011,</div><div class='del'>-	0x0002, 0x080c, 0x8106, 0x080c, 0x7fe0, 0x0036, 0x2019, 0x0000,</div><div class='del'>-	0x080c, 0x806b, 0x003e, 0x2061, 0x0100, 0x2001, 0xb615, 0x2004,</div><div class='del'>-	0xa084, 0x00ff, 0x810f, 0xa105, 0x604a, 0x6043, 0x0090, 0x6043,</div><div class='del'>-	0x0010, 0x2009, 0xb8bf, 0x200b, 0x0000, 0x2009, 0x002d, 0x2011,</div><div class='del'>-	0x4bb4, 0x080c, 0x6a94, 0x7924, 0xa18c, 0xff00, 0x810f, 0x080c,</div><div class='del'>-	0x5b41, 0x1110, 0x2009, 0x00ff, 0x7a28, 0x080c, 0x3b0d, 0x012e,</div><div class='del'>-	0x00ce, 0x002e, 0x0804, 0x2fdf, 0x7924, 0xa18c, 0xff00, 0x810f,</div><div class='del'>-	0x00c6, 0x080c, 0x4fbf, 0x2c08, 0x00ce, 0x1904, 0x3007, 0x0804,</div><div class='del'>-	0x2fdf, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x3004, 0x60d4,</div><div class='del'>-	0xd0ac, 0x1130, 0xd09c, 0x1120, 0x2009, 0x0005, 0x0804, 0x3004,</div><div class='del'>-	0x080c, 0x3ebc, 0x1120, 0x2009, 0x0002, 0x0804, 0x3004, 0x7924,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x3efd, 0x701b, 0x3c61,</div><div class='del'>-	0x0005, 0x2009, 0x0080, 0x080c, 0x501b, 0x1130, 0x6004, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x0006, 0x0120, 0x2021, 0x400a, 0x0804, 0x2fe1,</div><div class='del'>-	0x00d6, 0xade8, 0x000d, 0x6900, 0x6a08, 0x6b0c, 0x6c10, 0x6d14,</div><div class='del'>-	0x6e18, 0x6820, 0xa0be, 0x0100, 0x0904, 0x3cd8, 0xa0be, 0x0112,</div><div class='del'>-	0x0904, 0x3cd8, 0xa0be, 0x0113, 0x0904, 0x3cd8, 0xa0be, 0x0114,</div><div class='del'>-	0x0904, 0x3cd8, 0xa0be, 0x0117, 0x0904, 0x3cd8, 0xa0be, 0x011a,</div><div class='del'>-	0x0904, 0x3cd8, 0xa0be, 0x011c, 0x0904, 0x3cd8, 0xa0be, 0x0121,</div><div class='del'>-	0x05b0, 0xa0be, 0x0131, 0x0598, 0xa0be, 0x0171, 0x05c8, 0xa0be,</div><div class='del'>-	0x0173, 0x05b0, 0xa0be, 0x01a1, 0x1120, 0x6830, 0x8007, 0x6832,</div><div class='del'>-	0x04a8, 0xa0be, 0x0212, 0x0540, 0xa0be, 0x0213, 0x0528, 0xa0be,</div><div class='del'>-	0x0214, 0x01b0, 0xa0be, 0x0217, 0x0168, 0xa0be, 0x021a, 0x1120,</div><div class='del'>-	0x6838, 0x8007, 0x683a, 0x00e0, 0xa0be, 0x0300, 0x01c8, 0x00de,</div><div class='del'>-	0x0804, 0x3007, 0xad80, 0x0010, 0x20a9, 0x0007, 0x080c, 0x3d1e,</div><div class='del'>-	0xad80, 0x000e, 0x20a9, 0x0001, 0x080c, 0x3d1e, 0x0048, 0xad80,</div><div class='del'>-	0x000c, 0x080c, 0x3d2c, 0x0050, 0xad80, 0x000e, 0x080c, 0x3d2c,</div><div class='del'>-	0xad80, 0x000c, 0x20a9, 0x0001, 0x080c, 0x3d1e, 0x00c6, 0x080c,</div><div class='del'>-	0x3ebc, 0x0568, 0x6838, 0xc0fd, 0x683a, 0x6837, 0x0119, 0x6853,</div><div class='del'>-	0x0000, 0x684f, 0x0020, 0x685b, 0x0001, 0x810b, 0x697e, 0x6883,</div><div class='del'>-	0x0000, 0x6a86, 0x6b8a, 0x6c8e, 0x6d92, 0x6996, 0x689b, 0x0000,</div><div class='del'>-	0x00ce, 0x00de, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x6823,</div><div class='del'>-	0x0000, 0x6804, 0x2068, 0x080c, 0x9e5e, 0x1120, 0x2009, 0x0003,</div><div class='del'>-	0x0804, 0x3004, 0x7007, 0x0003, 0x701b, 0x3d15, 0x0005, 0x00ce,</div><div class='del'>-	0x00de, 0x2009, 0x0002, 0x0804, 0x3004, 0x6820, 0xa086, 0x8001,</div><div class='del'>-	0x1904, 0x2fdf, 0x2009, 0x0004, 0x0804, 0x3004, 0x0016, 0x2008,</div><div class='del'>-	0x2044, 0x8000, 0x204c, 0x8000, 0x290a, 0x8108, 0x280a, 0x8108,</div><div class='del'>-	0x1f04, 0x3d20, 0x001e, 0x0005, 0x0016, 0x00a6, 0x00b6, 0x2008,</div><div class='del'>-	0x2044, 0x8000, 0x204c, 0x8000, 0x2054, 0x8000, 0x205c, 0x2b0a,</div><div class='del'>-	0x8108, 0x2a0a, 0x8108, 0x290a, 0x8108, 0x280a, 0x00be, 0x00ae,</div><div class='del'>-	0x001e, 0x0005, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x3004,</div><div class='del'>-	0x60d4, 0xd0ac, 0x1130, 0xd09c, 0x1120, 0x2009, 0x0005, 0x0804,</div><div class='del'>-	0x3004, 0x7924, 0x2140, 0xa18c, 0xff00, 0x810f, 0x60d4, 0xd0ac,</div><div class='del'>-	0x1120, 0xa182, 0x0080, 0x0a04, 0x3007, 0xa182, 0x00ff, 0x1a04,</div><div class='del'>-	0x3007, 0x7a2c, 0x7b28, 0x6070, 0xa306, 0x1140, 0x6074, 0xa24e,</div><div class='del'>-	0x0904, 0x3007, 0xa9cc, 0xff00, 0x0904, 0x3007, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x00c6, 0x080c, 0x3e0c, 0x2c68, 0x00ce, 0x0538, 0xa0c6,</div><div class='del'>-	0x4000, 0x1178, 0x00c6, 0x0006, 0x2d60, 0xa00e, 0x080c, 0x52bc,</div><div class='del'>-	0x1108, 0xc185, 0x6000, 0xd0bc, 0x0108, 0xc18d, 0x000e, 0x00ce,</div><div class='del'>-	0x0088, 0xa0c6, 0x4007, 0x1110, 0x2408, 0x0060, 0xa0c6, 0x4008,</div><div class='del'>-	0x1118, 0x2708, 0x2610, 0x0030, 0xa0c6, 0x4009, 0x1108, 0x0010,</div><div class='del'>-	0x2001, 0x4006, 0x2020, 0x012e, 0x0804, 0x2fe1, 0x2d00, 0x7022,</div><div class='del'>-	0x0016, 0x00b6, 0x00c6, 0x00e6, 0x2c70, 0x080c, 0x864e, 0x05c0,</div><div class='del'>-	0x2d00, 0x601a, 0x080c, 0xa0e3, 0x2e58, 0x00ee, 0x00e6, 0x00c6,</div><div class='del'>-	0x080c, 0x3ebc, 0x00ce, 0x2b70, 0x1158, 0x080c, 0x86a4, 0x00ee,</div><div class='del'>-	0x00ce, 0x00be, 0x001e, 0x012e, 0x2009, 0x0002, 0x0804, 0x3004,</div><div class='del'>-	0x6837, 0x0000, 0x683b, 0x0000, 0x2d00, 0x6012, 0x6833, 0x0000,</div><div class='del'>-	0x6838, 0xc0fd, 0xd88c, 0x0108, 0xc0f5, 0x683a, 0x080c, 0x2cd1,</div><div class='del'>-	0x601f, 0x0001, 0x2001, 0x0000, 0x080c, 0x4f5d, 0x2001, 0x0002,</div><div class='del'>-	0x080c, 0x4f6f, 0x2009, 0x0002, 0x080c, 0x86d3, 0xa085, 0x0001,</div><div class='del'>-	0x00ee, 0x00ce, 0x00be, 0x001e, 0x012e, 0x1120, 0x2009, 0x0003,</div><div class='del'>-	0x0804, 0x3004, 0x7007, 0x0003, 0x701b, 0x3def, 0x0005, 0x6830,</div><div class='del'>-	0xa086, 0x0100, 0x7020, 0x2060, 0x1138, 0x2009, 0x0004, 0x6204,</div><div class='del'>-	0xa294, 0x00ff, 0x0804, 0x3004, 0x2009, 0x0000, 0x6838, 0xd0f4,</div><div class='del'>-	0x1904, 0x2fdf, 0x080c, 0x52bc, 0x1108, 0xc185, 0x6000, 0xd0bc,</div><div class='del'>-	0x0108, 0xc18d, 0x0804, 0x2fdf, 0x00e6, 0x00d6, 0xa02e, 0x2001,</div><div class='del'>-	0xb635, 0x2004, 0xd0ac, 0x0130, 0xa026, 0x20a9, 0x00ff, 0x2071,</div><div class='del'>-	0xb735, 0x0030, 0x2021, 0x0080, 0x20a9, 0x007f, 0x2071, 0xb7b5,</div><div class='del'>-	0x2e04, 0xa005, 0x1130, 0x2100, 0xa406, 0x1570, 0x2428, 0xc5fd,</div><div class='del'>-	0x0458, 0x2068, 0x6f10, 0x2700, 0xa306, 0x11b0, 0x6e14, 0x2600,</div><div class='del'>-	0xa206, 0x1190, 0x2400, 0xa106, 0x1160, 0x2d60, 0xd884, 0x0568,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1538, 0x2001, 0x4000,</div><div class='del'>-	0x0428, 0x2001, 0x4007, 0x0410, 0x2400, 0xa106, 0x1168, 0x6e14,</div><div class='del'>-	0x87ff, 0x1138, 0x86ff, 0x09d0, 0x2001, 0xb635, 0x2004, 0xd0ac,</div><div class='del'>-	0x19a8, 0x2001, 0x4008, 0x0090, 0x8420, 0x8e70, 0x1f04, 0x3e20,</div><div class='del'>-	0x85ff, 0x1130, 0x2001, 0x4009, 0x0048, 0x2001, 0x0001, 0x0030,</div><div class='del'>-	0x080c, 0x4fbf, 0x1dd0, 0x6312, 0x6216, 0xa006, 0xa005, 0x00de,</div><div class='del'>-	0x00ee, 0x0005, 0x81ff, 0x1904, 0x3004, 0x080c, 0x3ebc, 0x0904,</div><div class='del'>-	0x3004, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x7824, 0xa005,</div><div class='del'>-	0x0904, 0x3007, 0xa096, 0x00ff, 0x0120, 0xa092, 0x0004, 0x1a04,</div><div class='del'>-	0x3007, 0x2010, 0x2d18, 0x080c, 0x2c84, 0x0904, 0x3004, 0x7007,</div><div class='del'>-	0x0003, 0x701b, 0x3e8c, 0x0005, 0x6830, 0xa086, 0x0100, 0x0904,</div><div class='del'>-	0x3004, 0x0804, 0x2fdf, 0x7924, 0xa18c, 0xff00, 0x810f, 0x60d4,</div><div class='del'>-	0xd0ac, 0x1120, 0xa182, 0x0080, 0x0a04, 0x3007, 0xa182, 0x00ff,</div><div class='del'>-	0x1a04, 0x3007, 0x0126, 0x2091, 0x8000, 0x080c, 0x9d46, 0x1188,</div><div class='del'>-	0xa190, 0xb735, 0x2204, 0xa065, 0x0160, 0x080c, 0x4c7e, 0x2001,</div><div class='del'>-	0xb635, 0x2004, 0xd0ac, 0x0110, 0x6017, 0x0000, 0x012e, 0x0804,</div><div class='del'>-	0x2fdf, 0x012e, 0x0804, 0x3004, 0x080c, 0x15fd, 0x0188, 0xa006,</div><div class='del'>-	0x6802, 0x7010, 0xa005, 0x1120, 0x2d00, 0x7012, 0x7016, 0x0030,</div><div class='del'>-	0x7014, 0x6802, 0x2060, 0x2d00, 0x6006, 0x7016, 0xad80, 0x000d,</div><div class='del'>-	0x0005, 0x7924, 0x810f, 0xa18c, 0x00ff, 0x080c, 0x501b, 0x1130,</div><div class='del'>-	0x7e28, 0xa684, 0x3fff, 0xa082, 0x4000, 0x0208, 0xa066, 0x8cff,</div><div class='del'>-	0x0005, 0x7e24, 0x860f, 0xa18c, 0x00ff, 0x080c, 0x501b, 0x1128,</div><div class='del'>-	0xa6b4, 0x00ff, 0xa682, 0x4000, 0x0208, 0xa066, 0x8cff, 0x0005,</div><div class='del'>-	0x0016, 0x7110, 0x81ff, 0x0128, 0x2168, 0x6904, 0x080c, 0x1614,</div><div class='del'>-	0x0cc8, 0x7112, 0x7116, 0x001e, 0x0005, 0x2031, 0x0001, 0x0010,</div><div class='del'>-	0x2031, 0x0000, 0x2061, 0xb6d2, 0x6606, 0x6112, 0x600e, 0x6226,</div><div class='del'>-	0x632a, 0x642e, 0x6532, 0x2c10, 0x080c, 0x1648, 0x7007, 0x0002,</div><div class='del'>-	0x701b, 0x2fdf, 0x0005, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2079,</div><div class='del'>-	0x0000, 0x2001, 0xb690, 0x2004, 0xa005, 0x1168, 0x0e04, 0x3f2b,</div><div class='del'>-	0x7818, 0xd084, 0x1140, 0x7a22, 0x7b26, 0x7c2a, 0x781b, 0x0001,</div><div class='del'>-	0x2091, 0x4080, 0x0408, 0x0016, 0x00c6, 0x00e6, 0x2071, 0xb682,</div><div class='del'>-	0x7138, 0xa182, 0x0010, 0x0218, 0x7030, 0x2060, 0x0078, 0x7030,</div><div class='del'>-	0xa0e0, 0x0004, 0xac82, 0xb6d2, 0x0210, 0x2061, 0xb692, 0x2c00,</div><div class='del'>-	0x7032, 0x81ff, 0x1108, 0x7036, 0x8108, 0x713a, 0x2262, 0x6306,</div><div class='del'>-	0x640a, 0x00ee, 0x00ce, 0x001e, 0x012e, 0x00fe, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0xb682, 0x7038, 0xa005, 0x0570, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0e04, 0x3f82, 0x00f6, 0x2079, 0x0000, 0x7818, 0xd084, 0x1508,</div><div class='del'>-	0x00c6, 0x7034, 0x2060, 0x2c04, 0x7822, 0x6004, 0x7826, 0x6008,</div><div class='del'>-	0x782a, 0x781b, 0x0001, 0x2091, 0x4080, 0x7038, 0x8001, 0x703a,</div><div class='del'>-	0xa005, 0x1130, 0x7033, 0xb692, 0x7037, 0xb692, 0x00ce, 0x0048,</div><div class='del'>-	0xac80, 0x0004, 0xa0fa, 0xb6d2, 0x0210, 0x2001, 0xb692, 0x7036,</div><div class='del'>-	0x00ce, 0x00fe, 0x012e, 0x00ee, 0x0005, 0x0026, 0x2001, 0xb653,</div><div class='del'>-	0x2004, 0xd0c4, 0x0120, 0x2011, 0x8014, 0x080c, 0x3f13, 0x002e,</div><div class='del'>-	0x0005, 0x81ff, 0x1904, 0x3004, 0x0126, 0x2091, 0x8000, 0x6030,</div><div class='del'>-	0xc08d, 0xc085, 0xc0ac, 0x6032, 0x080c, 0x5b41, 0x1178, 0x2001,</div><div class='del'>-	0xb89f, 0x2003, 0x0001, 0x2001, 0xb600, 0x2003, 0x0001, 0xa085,</div><div class='del'>-	0x0001, 0x080c, 0x5b85, 0x080c, 0x5a79, 0x0010, 0x080c, 0x4b7b,</div><div class='del'>-	0x012e, 0x0804, 0x2fdf, 0x7824, 0x2008, 0xa18c, 0xfffd, 0x1128,</div><div class='del'>-	0x61e0, 0xa10d, 0x61e2, 0x0804, 0x2fdf, 0x0804, 0x3007, 0x81ff,</div><div class='del'>-	0x1904, 0x3004, 0x6000, 0xa086, 0x0003, 0x1904, 0x3004, 0x2001,</div><div class='del'>-	0xb653, 0x2004, 0xd0ac, 0x1904, 0x3004, 0x080c, 0x3ee1, 0x0904,</div><div class='del'>-	0x3007, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1120, 0x7828,</div><div class='del'>-	0xa005, 0x0904, 0x2fdf, 0x00c6, 0x080c, 0x3ebc, 0x00ce, 0x0904,</div><div class='del'>-	0x3004, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,</div><div class='del'>-	0x080c, 0x9f27, 0x0904, 0x3004, 0x7007, 0x0003, 0x701b, 0x3ff1,</div><div class='del'>-	0x0005, 0x6830, 0xa086, 0x0100, 0x0904, 0x3004, 0x0804, 0x2fdf,</div><div class='del'>-	0x2001, 0xb600, 0x2004, 0xa086, 0x0003, 0x1904, 0x3004, 0x7f24,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x3ebc, 0x0904, 0x3004,</div><div class='del'>-	0x2009, 0x0000, 0x2031, 0x0000, 0x7023, 0x0000, 0x702f, 0x0000,</div><div class='del'>-	0xad80, 0x0005, 0x7026, 0x20a0, 0x080c, 0x501b, 0x1904, 0x406b,</div><div class='del'>-	0x6004, 0xa0c4, 0x00ff, 0xa8c6, 0x0006, 0x0130, 0xa0c4, 0xff00,</div><div class='del'>-	0xa8c6, 0x0600, 0x1904, 0x406b, 0x2001, 0xb653, 0x2004, 0xd0ac,</div><div class='del'>-	0x1128, 0x080c, 0x52bc, 0x1110, 0xd79c, 0x05e8, 0xd794, 0x1110,</div><div class='del'>-	0xd784, 0x0158, 0xac80, 0x0006, 0x2098, 0x3400, 0x20a9, 0x0004,</div><div class='del'>-	0x53a3, 0x080c, 0x3d2c, 0xd794, 0x0148, 0xac80, 0x000a, 0x2098,</div><div class='del'>-	0x3400, 0x20a9, 0x0004, 0x53a3, 0x080c, 0x3d2c, 0x21a2, 0xd794,</div><div class='del'>-	0x01d8, 0xac80, 0x0000, 0x2098, 0x94a0, 0x20a9, 0x0002, 0x53a3,</div><div class='del'>-	0xac80, 0x0003, 0x20a6, 0x94a0, 0xac80, 0x0004, 0x2098, 0x3400,</div><div class='del'>-	0x20a9, 0x0002, 0x53a3, 0x080c, 0x3d1e, 0xac80, 0x0026, 0x2098,</div><div class='del'>-	0x20a9, 0x0002, 0x53a3, 0x0008, 0x94a0, 0xd794, 0x0110, 0xa6b0,</div><div class='del'>-	0x000b, 0xa6b0, 0x0005, 0x8108, 0x2001, 0xb635, 0x2004, 0xd0ac,</div><div class='del'>-	0x0118, 0xa186, 0x0100, 0x0040, 0xd78c, 0x0120, 0xa186, 0x0100,</div><div class='del'>-	0x0170, 0x0018, 0xa186, 0x007e, 0x0150, 0xd794, 0x0118, 0xa686,</div><div class='del'>-	0x0020, 0x0010, 0xa686, 0x0028, 0x0150, 0x0804, 0x4014, 0x86ff,</div><div class='del'>-	0x1120, 0x7120, 0x810b, 0x0804, 0x2fdf, 0x702f, 0x0001, 0x711e,</div><div class='del'>-	0x7020, 0xa600, 0x7022, 0x772a, 0x2061, 0xb6d2, 0x6007, 0x0000,</div><div class='del'>-	0x6612, 0x7024, 0x600e, 0x6226, 0x632a, 0x642e, 0x6532, 0x2c10,</div><div class='del'>-	0x080c, 0x1648, 0x7007, 0x0002, 0x701b, 0x40a7, 0x0005, 0x702c,</div><div class='del'>-	0xa005, 0x1170, 0x711c, 0x7024, 0x20a0, 0x7728, 0x2031, 0x0000,</div><div class='del'>-	0x2061, 0xb6d2, 0x6224, 0x6328, 0x642c, 0x6530, 0x0804, 0x4014,</div><div class='del'>-	0x7120, 0x810b, 0x0804, 0x2fdf, 0x2029, 0x007e, 0x7924, 0x7a28,</div><div class='del'>-	0x7b2c, 0x7c38, 0xa184, 0xff00, 0x8007, 0xa0e2, 0x0020, 0x0a04,</div><div class='del'>-	0x3007, 0xa502, 0x0a04, 0x3007, 0xa184, 0x00ff, 0xa0e2, 0x0020,</div><div class='del'>-	0x0a04, 0x3007, 0xa502, 0x0a04, 0x3007, 0xa284, 0xff00, 0x8007,</div><div class='del'>-	0xa0e2, 0x0020, 0x0a04, 0x3007, 0xa502, 0x0a04, 0x3007, 0xa284,</div><div class='del'>-	0x00ff, 0xa0e2, 0x0020, 0x0a04, 0x3007, 0xa502, 0x0a04, 0x3007,</div><div class='del'>-	0xa384, 0xff00, 0x8007, 0xa0e2, 0x0020, 0x0a04, 0x3007, 0xa502,</div><div class='del'>-	0x0a04, 0x3007, 0xa384, 0x00ff, 0xa0e2, 0x0020, 0x0a04, 0x3007,</div><div class='del'>-	0xa502, 0x0a04, 0x3007, 0xa484, 0xff00, 0x8007, 0xa0e2, 0x0020,</div><div class='del'>-	0x0a04, 0x3007, 0xa502, 0x0a04, 0x3007, 0xa484, 0x00ff, 0xa0e2,</div><div class='del'>-	0x0020, 0x0a04, 0x3007, 0xa502, 0x0a04, 0x3007, 0x2061, 0xb8b9,</div><div class='del'>-	0x6102, 0x6206, 0x630a, 0x640e, 0x0804, 0x2fdf, 0x0006, 0x2001,</div><div class='del'>-	0xb653, 0x2004, 0xd0cc, 0x000e, 0x0005, 0x0006, 0x2001, 0xb672,</div><div class='del'>-	0x2004, 0xd0bc, 0x000e, 0x0005, 0x6168, 0x7a24, 0x6300, 0x82ff,</div><div class='del'>-	0x1118, 0x7926, 0x0804, 0x2fdf, 0x83ff, 0x1904, 0x3007, 0x2001,</div><div class='del'>-	0xfff0, 0xa200, 0x1a04, 0x3007, 0x2019, 0xffff, 0x606c, 0xa302,</div><div class='del'>-	0xa200, 0x0a04, 0x3007, 0x7926, 0x626a, 0x0804, 0x2fdf, 0x2001,</div><div class='del'>-	0xb600, 0x2004, 0xa086, 0x0003, 0x1904, 0x3004, 0x7c28, 0x7d24,</div><div class='del'>-	0x7e38, 0x7f2c, 0x080c, 0x3ebc, 0x0904, 0x3004, 0x2009, 0x0000,</div><div class='del'>-	0x2019, 0x0000, 0x7023, 0x0000, 0x702f, 0x0000, 0xad80, 0x0003,</div><div class='del'>-	0x7026, 0x20a0, 0xa1e0, 0xb735, 0x2c64, 0x8cff, 0x01b8, 0x6004,</div><div class='del'>-	0xa084, 0x00ff, 0xa086, 0x0006, 0x0130, 0x6004, 0xa084, 0xff00,</div><div class='del'>-	0xa086, 0x0600, 0x1158, 0x6014, 0x20a2, 0x94a0, 0x6010, 0x8007,</div><div class='del'>-	0xa105, 0x8007, 0x20a2, 0x94a0, 0xa398, 0x0002, 0x8108, 0xa182,</div><div class='del'>-	0x00ff, 0x0120, 0xa386, 0x002a, 0x0148, 0x08e0, 0x83ff, 0x1120,</div><div class='del'>-	0x7120, 0x810c, 0x0804, 0x2fdf, 0x702f, 0x0001, 0x711e, 0x7020,</div><div class='del'>-	0xa300, 0x7022, 0x2061, 0xb6d2, 0x6007, 0x0000, 0x6312, 0x7024,</div><div class='del'>-	0x600e, 0x6426, 0x652a, 0x662e, 0x6732, 0x2c10, 0x080c, 0x1648,</div><div class='del'>-	0x7007, 0x0002, 0x701b, 0x419d, 0x0005, 0x702c, 0xa005, 0x1168,</div><div class='del'>-	0x711c, 0x7024, 0x20a0, 0x2019, 0x0000, 0x2061, 0xb6d2, 0x6424,</div><div class='del'>-	0x6528, 0x662c, 0x6730, 0x0804, 0x415a, 0x7120, 0x810c, 0x0804,</div><div class='del'>-	0x2fdf, 0x81ff, 0x1904, 0x3004, 0x60d4, 0xd0ac, 0x1118, 0xd09c,</div><div class='del'>-	0x0904, 0x3004, 0x080c, 0x3ebc, 0x0904, 0x3004, 0x7924, 0x7a2c,</div><div class='del'>-	0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x3efd, 0x701b, 0x41c8, 0x0005,</div><div class='del'>-	0x00d6, 0xade8, 0x000d, 0x6828, 0xa0be, 0x7000, 0x0148, 0xa0be,</div><div class='del'>-	0x7100, 0x0130, 0xa0be, 0x7200, 0x0118, 0x00de, 0x0804, 0x3007,</div><div class='del'>-	0x6820, 0x6924, 0x080c, 0x2852, 0x1510, 0x080c, 0x4fbf, 0x11f8,</div><div class='del'>-	0x7122, 0x6612, 0x6516, 0x6e18, 0x00c6, 0x080c, 0x3ebc, 0x01b8,</div><div class='del'>-	0x080c, 0x3ebc, 0x01a0, 0x00ce, 0x00de, 0x6837, 0x0000, 0x6838,</div><div class='del'>-	0xc0fd, 0x683a, 0x6823, 0x0000, 0x6804, 0x2068, 0x080c, 0x9e7a,</div><div class='del'>-	0x0904, 0x3004, 0x7007, 0x0003, 0x701b, 0x4202, 0x0005, 0x00de,</div><div class='del'>-	0x0804, 0x3004, 0x7120, 0x080c, 0x2dcc, 0x6820, 0xa086, 0x8001,</div><div class='del'>-	0x0904, 0x3004, 0x2d00, 0x701e, 0x6804, 0xa080, 0x0002, 0x0006,</div><div class='del'>-	0x20a9, 0x002a, 0x2098, 0x20a0, 0x080c, 0x4bf1, 0x000e, 0xade8,</div><div class='del'>-	0x000d, 0x6a08, 0x6b0c, 0x6c10, 0x6d14, 0x2061, 0xb6d2, 0x6007,</div><div class='del'>-	0x0000, 0x6e00, 0x6f28, 0xa7c6, 0x7000, 0x1108, 0x0018, 0xa7c6,</div><div class='del'>-	0x7100, 0x1140, 0xa6c2, 0x0004, 0x0a04, 0x3007, 0x2009, 0x0004,</div><div class='del'>-	0x0804, 0x3f00, 0xa7c6, 0x7200, 0x1904, 0x3007, 0xa6c2, 0x0054,</div><div class='del'>-	0x0a04, 0x3007, 0x600e, 0x6013, 0x002a, 0x6226, 0x632a, 0x642e,</div><div class='del'>-	0x6532, 0x2c10, 0x080c, 0x1648, 0x7007, 0x0002, 0x701b, 0x4249,</div><div class='del'>-	0x0005, 0x701c, 0x2068, 0x6804, 0xa080, 0x0001, 0x2004, 0xa080,</div><div class='del'>-	0x0002, 0x0006, 0x20a9, 0x002a, 0x2098, 0x20a0, 0x080c, 0x4bf1,</div><div class='del'>-	0x000e, 0x2009, 0x002a, 0x2061, 0xb6d2, 0x6224, 0x6328, 0x642c,</div><div class='del'>-	0x6530, 0x0804, 0x3f00, 0x81ff, 0x1904, 0x3004, 0x792c, 0x2001,</div><div class='del'>-	0xb8a0, 0x2102, 0x080c, 0x3ed1, 0x0904, 0x3007, 0x080c, 0x50e1,</div><div class='del'>-	0x0904, 0x3004, 0x0126, 0x2091, 0x8000, 0x080c, 0x5213, 0x012e,</div><div class='del'>-	0x0804, 0x2fdf, 0x7824, 0xd08c, 0x1118, 0xd084, 0x0904, 0x3a87,</div><div class='del'>-	0x080c, 0x3ee1, 0x0904, 0x3007, 0x00c6, 0x080c, 0x3ebc, 0x00ce,</div><div class='del'>-	0x1120, 0x2009, 0x0002, 0x0804, 0x3004, 0x6004, 0xa084, 0x00ff,</div><div class='del'>-	0xa086, 0x0006, 0x0128, 0xa08e, 0x0004, 0x0110, 0xa08e, 0x0005,</div><div class='del'>-	0x15b8, 0x7824, 0xd08c, 0x0120, 0x6000, 0xc08c, 0x6002, 0x0030,</div><div class='del'>-	0x2001, 0xb653, 0x2004, 0xd0b4, 0x0904, 0x3ac3, 0x7824, 0xa084,</div><div class='del'>-	0xff00, 0xa08e, 0x7e00, 0x0904, 0x3ac3, 0xa08e, 0x7f00, 0x0904,</div><div class='del'>-	0x3ac3, 0xa08e, 0x8000, 0x0904, 0x3ac3, 0x6000, 0xd08c, 0x1904,</div><div class='del'>-	0x3ac3, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x080c, 0x9e96,</div><div class='del'>-	0x1120, 0x2009, 0x0003, 0x0804, 0x3004, 0x7007, 0x0003, 0x701b,</div><div class='del'>-	0x42ca, 0x0005, 0x080c, 0x3ee1, 0x0904, 0x3007, 0x0804, 0x3ac3,</div><div class='del'>-	0x2009, 0xb631, 0x210c, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,</div><div class='del'>-	0x3004, 0x2001, 0xb600, 0x2004, 0xa086, 0x0003, 0x0120, 0x2009,</div><div class='del'>-	0x0007, 0x0804, 0x3004, 0x2001, 0xb653, 0x2004, 0xd0ac, 0x0120,</div><div class='del'>-	0x2009, 0x0008, 0x0804, 0x3004, 0x609c, 0xd0a4, 0x1118, 0xd0ac,</div><div class='del'>-	0x1904, 0x3ac3, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd,</div><div class='del'>-	0x683a, 0x080c, 0x9f27, 0x1120, 0x2009, 0x0003, 0x0804, 0x3004,</div><div class='del'>-	0x7007, 0x0003, 0x701b, 0x4305, 0x0005, 0x6830, 0xa086, 0x0100,</div><div class='del'>-	0x1120, 0x2009, 0x0004, 0x0804, 0x3004, 0x080c, 0x3ee1, 0x0904,</div><div class='del'>-	0x3007, 0x0804, 0x4299, 0x81ff, 0x2009, 0x0001, 0x1904, 0x3004,</div><div class='del'>-	0x6000, 0xa086, 0x0003, 0x2009, 0x0007, 0x1904, 0x3004, 0x2001,</div><div class='del'>-	0xb653, 0x2004, 0xd0ac, 0x2009, 0x0008, 0x1904, 0x3004, 0x080c,</div><div class='del'>-	0x3ee1, 0x0904, 0x3007, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,</div><div class='del'>-	0x2009, 0x0009, 0x1904, 0x3004, 0x00c6, 0x080c, 0x3ebc, 0x00ce,</div><div class='del'>-	0x2009, 0x0002, 0x0904, 0x3004, 0x6837, 0x0000, 0x6833, 0x0000,</div><div class='del'>-	0x6838, 0xc0fd, 0x683a, 0x7928, 0xa194, 0xff00, 0xa18c, 0x00ff,</div><div class='del'>-	0xa006, 0x82ff, 0x1128, 0xc0ed, 0x6952, 0x792c, 0x6956, 0x0048,</div><div class='del'>-	0xa28e, 0x0100, 0x1904, 0x3007, 0xc0e5, 0x6853, 0x0000, 0x6857,</div><div class='del'>-	0x0000, 0x683e, 0x080c, 0xa0e4, 0x2009, 0x0003, 0x0904, 0x3004,</div><div class='del'>-	0x7007, 0x0003, 0x701b, 0x4365, 0x0005, 0x6830, 0xa086, 0x0100,</div><div class='del'>-	0x2009, 0x0004, 0x0904, 0x3004, 0x0804, 0x2fdf, 0x81ff, 0x2009,</div><div class='del'>-	0x0001, 0x1904, 0x3004, 0x6000, 0xa086, 0x0003, 0x2009, 0x0007,</div><div class='del'>-	0x1904, 0x3004, 0x080c, 0x3ee1, 0x0904, 0x3007, 0x6004, 0xa084,</div><div class='del'>-	0x00ff, 0xa086, 0x0006, 0x2009, 0x0009, 0x1904, 0x3004, 0x00c6,</div><div class='del'>-	0x080c, 0x3ebc, 0x00ce, 0x2009, 0x0002, 0x0904, 0x3004, 0xad80,</div><div class='del'>-	0x000f, 0x2009, 0x0008, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c,</div><div class='del'>-	0x3efd, 0x701b, 0x439c, 0x0005, 0x00d6, 0xade8, 0x000f, 0x6800,</div><div class='del'>-	0xa086, 0x0500, 0x1140, 0x6804, 0xa005, 0x1128, 0x6808, 0xa084,</div><div class='del'>-	0xff00, 0x1108, 0x0018, 0x00de, 0x1904, 0x3007, 0x00de, 0x6837,</div><div class='del'>-	0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x00c6, 0x080c,</div><div class='del'>-	0x3ee1, 0x1118, 0x00ce, 0x0804, 0x3007, 0x080c, 0xa133, 0x2009,</div><div class='del'>-	0x0003, 0x00ce, 0x0904, 0x3004, 0x7007, 0x0003, 0x701b, 0x43c9,</div><div class='del'>-	0x0005, 0x6830, 0xa086, 0x0100, 0x2009, 0x0004, 0x0904, 0x3004,</div><div class='del'>-	0x0804, 0x2fdf, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x3004,</div><div class='del'>-	0x6000, 0xa086, 0x0003, 0x0120, 0x2009, 0x0007, 0x0804, 0x3004,</div><div class='del'>-	0x7e24, 0x860f, 0xa18c, 0x00ff, 0xa6b4, 0x00ff, 0x080c, 0x501b,</div><div class='del'>-	0x1904, 0x3007, 0xa186, 0x007f, 0x0150, 0x6004, 0xa084, 0x00ff,</div><div class='del'>-	0xa086, 0x0006, 0x0120, 0x2009, 0x0009, 0x0804, 0x3004, 0x00c6,</div><div class='del'>-	0x080c, 0x3ebc, 0x00ce, 0x1120, 0x2009, 0x0002, 0x0804, 0x3004,</div><div class='del'>-	0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x2001, 0x0100, 0x8007,</div><div class='del'>-	0x680a, 0x080c, 0x9eb1, 0x1120, 0x2009, 0x0003, 0x0804, 0x3004,</div><div class='del'>-	0x7007, 0x0003, 0x701b, 0x4415, 0x0005, 0x6808, 0x8007, 0xa086,</div><div class='del'>-	0x0100, 0x1120, 0x2009, 0x0004, 0x0804, 0x3004, 0x68b0, 0x6836,</div><div class='del'>-	0x6810, 0x8007, 0xa084, 0x00ff, 0x800c, 0x6814, 0x8007, 0xa084,</div><div class='del'>-	0x00ff, 0x8004, 0xa080, 0x0002, 0xa108, 0xad80, 0x0004, 0x7a2c,</div><div class='del'>-	0x7b28, 0x7c3c, 0x7d38, 0x0804, 0x3f00, 0x080c, 0x3ebc, 0x1120,</div><div class='del'>-	0x2009, 0x0002, 0x0804, 0x3004, 0x7924, 0xa194, 0xff00, 0xa18c,</div><div class='del'>-	0x00ff, 0x8217, 0x82ff, 0x0110, 0x0804, 0x3007, 0x2009, 0x001a,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x3efd, 0x701b, 0x4451,</div><div class='del'>-	0x0005, 0x2001, 0xb62a, 0x2003, 0x0001, 0xad80, 0x000d, 0x2098,</div><div class='del'>-	0x20a9, 0x001a, 0x20a1, 0xb8c7, 0x53a3, 0x0804, 0x2fdf, 0x080c,</div><div class='del'>-	0x3ebc, 0x1120, 0x2009, 0x0002, 0x0804, 0x3004, 0x7924, 0xa194,</div><div class='del'>-	0xff00, 0xa18c, 0x00ff, 0x8217, 0x82ff, 0x0110, 0x0804, 0x3007,</div><div class='del'>-	0x2099, 0xb8c7, 0x20a0, 0x20a9, 0x001a, 0x53a3, 0x2009, 0x001a,</div><div class='del'>-	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804, 0x3f00, 0x7824, 0xa08a,</div><div class='del'>-	0x1000, 0x1a04, 0x3007, 0x0126, 0x2091, 0x8000, 0x8003, 0x800b,</div><div class='del'>-	0x810b, 0xa108, 0x00c6, 0x2061, 0xb8f4, 0x6142, 0x00ce, 0x012e,</div><div class='del'>-	0x0804, 0x2fdf, 0x00c6, 0x080c, 0x5b41, 0x1188, 0x2001, 0xb89f,</div><div class='del'>-	0x2003, 0x0001, 0x2001, 0xb600, 0x2003, 0x0001, 0xa085, 0x0001,</div><div class='del'>-	0x080c, 0x5b85, 0x080c, 0x5a79, 0x080c, 0x151a, 0x0038, 0x2061,</div><div class='del'>-	0xb600, 0x6030, 0xc09d, 0x6032, 0x080c, 0x4b7b, 0x00ce, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x00c6, 0x2061, 0xb8f4, 0x7924, 0x6152,</div><div class='del'>-	0x614e, 0x6057, 0x0000, 0x604b, 0x0009, 0x7838, 0x606a, 0x783c,</div><div class='del'>-	0x6066, 0x7828, 0x6062, 0x782c, 0x605e, 0x2061, 0xb8a1, 0x2001,</div><div class='del'>-	0xb909, 0x600e, 0x6013, 0x0001, 0x6017, 0x0002, 0x6007, 0x0000,</div><div class='del'>-	0x6037, 0x0000, 0x00ce, 0x012e, 0x0804, 0x2fdf, 0x0126, 0x00c6,</div><div class='del'>-	0x00e6, 0x2061, 0x0100, 0x2071, 0xb600, 0x6044, 0xd0a4, 0x11b0,</div><div class='del'>-	0xd084, 0x0118, 0x080c, 0x464d, 0x0068, 0xd08c, 0x0118, 0x080c,</div><div class='del'>-	0x456e, 0x0040, 0xd094, 0x0118, 0x080c, 0x453f, 0x0018, 0xd09c,</div><div class='del'>-	0x0108, 0x0061, 0x00ee, 0x00ce, 0x012e, 0x0005, 0x0016, 0x6128,</div><div class='del'>-	0xd19c, 0x1110, 0xc19d, 0x612a, 0x001e, 0x0ca0, 0x624c, 0xa286,</div><div class='del'>-	0xf0f0, 0x1150, 0x6048, 0xa086, 0xf0f0, 0x0130, 0x624a, 0x6043,</div><div class='del'>-	0x0090, 0x6043, 0x0010, 0x0490, 0xa294, 0xff00, 0xa296, 0xf700,</div><div class='del'>-	0x0178, 0x7134, 0xd1a4, 0x1160, 0x6240, 0xa295, 0x0100, 0x6242,</div><div class='del'>-	0xa294, 0x0010, 0x0128, 0x2009, 0x00f7, 0x080c, 0x4c11, 0x00f0,</div><div class='del'>-	0x6040, 0xa084, 0x0010, 0xa085, 0x0140, 0x6042, 0x6043, 0x0000,</div><div class='del'>-	0x707b, 0x0000, 0x7097, 0x0001, 0x70bb, 0x0000, 0x70d7, 0x0000,</div><div class='del'>-	0x2009, 0xbdc0, 0x200b, 0x0000, 0x708b, 0x0000, 0x707f, 0x000a,</div><div class='del'>-	0x2009, 0x000a, 0x2011, 0x4b1c, 0x080c, 0x6a94, 0x0005, 0x0156,</div><div class='del'>-	0x2001, 0xb674, 0x2004, 0xd08c, 0x0110, 0x7053, 0xffff, 0x707c,</div><div class='del'>-	0xa005, 0x1510, 0x2011, 0x4b1c, 0x080c, 0x6a0e, 0x6040, 0xa094,</div><div class='del'>-	0x0010, 0xa285, 0x0020, 0x6042, 0x20a9, 0x00c8, 0x6044, 0xd08c,</div><div class='del'>-	0x1168, 0x1f04, 0x4556, 0x6242, 0x708f, 0x0000, 0x6040, 0xa094,</div><div class='del'>-	0x0010, 0xa285, 0x0080, 0x6042, 0x6242, 0x0030, 0x6242, 0x708f,</div><div class='del'>-	0x0000, 0x7083, 0x0000, 0x0000, 0x015e, 0x0005, 0x7080, 0xa08a,</div><div class='del'>-	0x0003, 0x1210, 0x0023, 0x0010, 0x080c, 0x151a, 0x0005, 0x457a,</div><div class='del'>-	0x45ca, 0x464c, 0x00f6, 0x7083, 0x0001, 0x20e1, 0xa000, 0xe000,</div><div class='del'>-	0x20e1, 0x8700, 0x080c, 0x24a5, 0x20e1, 0x9080, 0x20e1, 0x4000,</div><div class='del'>-	0x2079, 0xbc00, 0x207b, 0x2200, 0x7807, 0x00ef, 0x780b, 0x0000,</div><div class='del'>-	0x780f, 0x00ef, 0x7813, 0x0138, 0x7817, 0x0000, 0x781b, 0x0000,</div><div class='del'>-	0x781f, 0x0000, 0x7823, 0xffff, 0x7827, 0xffff, 0x782b, 0x0000,</div><div class='del'>-	0x782f, 0x0000, 0x2079, 0xbc0c, 0x207b, 0x1101, 0x7807, 0x0000,</div><div class='del'>-	0x2099, 0xb605, 0x20a1, 0xbc0e, 0x20a9, 0x0004, 0x53a3, 0x2079,</div><div class='del'>-	0xbc12, 0x207b, 0x0000, 0x7807, 0x0000, 0x2099, 0xbc00, 0x20a1,</div><div class='del'>-	0x020b, 0x20a9, 0x0014, 0x53a6, 0x60c3, 0x000c, 0x600f, 0x0000,</div><div class='del'>-	0x080c, 0x4b55, 0x00fe, 0x7087, 0x0000, 0x6043, 0x0008, 0x6043,</div><div class='del'>-	0x0000, 0x0005, 0x00d6, 0x7084, 0x7087, 0x0000, 0xa025, 0x0904,</div><div class='del'>-	0x4634, 0x6020, 0xd0b4, 0x1904, 0x4632, 0x7194, 0x81ff, 0x0904,</div><div class='del'>-	0x4622, 0xa486, 0x000c, 0x1904, 0x462d, 0xa480, 0x0018, 0x8004,</div><div class='del'>-	0x20a8, 0x2011, 0xbc80, 0x2019, 0xbc00, 0x220c, 0x2304, 0xa106,</div><div class='del'>-	0x11b8, 0x8210, 0x8318, 0x1f04, 0x45e5, 0x6043, 0x0004, 0x608b,</div><div class='del'>-	0xbc94, 0x608f, 0xf0f0, 0x6043, 0x0006, 0x7083, 0x0002, 0x708f,</div><div class='del'>-	0x0002, 0x2009, 0x07d0, 0x2011, 0x4b23, 0x080c, 0x6a94, 0x0490,</div><div class='del'>-	0x2069, 0xbc80, 0x6930, 0xa18e, 0x1101, 0x1538, 0x6834, 0xa005,</div><div class='del'>-	0x1520, 0x6900, 0xa18c, 0x00ff, 0x1118, 0x6804, 0xa005, 0x0190,</div><div class='del'>-	0x2011, 0xbc8e, 0x2019, 0xb605, 0x20a9, 0x0004, 0x220c, 0x2304,</div><div class='del'>-	0xa102, 0x0230, 0x1190, 0x8210, 0x8318, 0x1f04, 0x4616, 0x0068,</div><div class='del'>-	0x7097, 0x0000, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xbc80,</div><div class='del'>-	0x20a1, 0x020b, 0x20a9, 0x0014, 0x53a6, 0x6043, 0x0008, 0x6043,</div><div class='del'>-	0x0000, 0x0010, 0x00de, 0x0005, 0x6040, 0xa085, 0x0100, 0x6042,</div><div class='del'>-	0x6020, 0xd0b4, 0x1db8, 0x60c3, 0x000c, 0x2011, 0xb8eb, 0x2013,</div><div class='del'>-	0x0000, 0x7087, 0x0000, 0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7,</div><div class='del'>-	0x9575, 0x080c, 0x7dea, 0x0c30, 0x0005, 0x708c, 0xa08a, 0x001d,</div><div class='del'>-	0x1210, 0x0023, 0x0010, 0x080c, 0x151a, 0x0005, 0x4680, 0x468f,</div><div class='del'>-	0x46b7, 0x46d0, 0x46f4, 0x471c, 0x4740, 0x4771, 0x4795, 0x47bd,</div><div class='del'>-	0x47f4, 0x481c, 0x4838, 0x484e, 0x486e, 0x4881, 0x4889, 0x48b9,</div><div class='del'>-	0x48dd, 0x4905, 0x4929, 0x495a, 0x4997, 0x49c6, 0x49e2, 0x4a21,</div><div class='del'>-	0x4a41, 0x4a5a, 0x4a5b, 0x00c6, 0x2061, 0xb600, 0x6003, 0x0007,</div><div class='del'>-	0x2061, 0x0100, 0x6004, 0xa084, 0xfff9, 0x6006, 0x00ce, 0x0005,</div><div class='del'>-	0x608b, 0xbc94, 0x608f, 0xf0f0, 0x6043, 0x0002, 0x708f, 0x0001,</div><div class='del'>-	0x2009, 0x07d0, 0x2011, 0x4b23, 0x080c, 0x6a94, 0x0005, 0x00f6,</div><div class='del'>-	0x7084, 0xa086, 0x0014, 0x1508, 0x6043, 0x0000, 0x6020, 0xd0b4,</div><div class='del'>-	0x11e0, 0x2079, 0xbc80, 0x7a30, 0xa296, 0x1102, 0x11a0, 0x7834,</div><div class='del'>-	0xa005, 0x1188, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110,</div><div class='del'>-	0x70bb, 0x0001, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0x708f, 0x0010,</div><div class='del'>-	0x080c, 0x4889, 0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005, 0x708f,</div><div class='del'>-	0x0003, 0x6043, 0x0004, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0x080c,</div><div class='del'>-	0x4bf9, 0x20a3, 0x1102, 0x20a3, 0x0000, 0x20a9, 0x000a, 0x20a3,</div><div class='del'>-	0x0000, 0x1f04, 0x46c7, 0x60c3, 0x0014, 0x080c, 0x4b55, 0x0005,</div><div class='del'>-	0x00f6, 0x7084, 0xa005, 0x01f0, 0x2011, 0x4b23, 0x080c, 0x6a0e,</div><div class='del'>-	0xa086, 0x0014, 0x11a8, 0x2079, 0xbc80, 0x7a30, 0xa296, 0x1102,</div><div class='del'>-	0x1178, 0x7834, 0xa005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70b8,</div><div class='del'>-	0xa005, 0x1110, 0x70bb, 0x0001, 0x708f, 0x0004, 0x0029, 0x0010,</div><div class='del'>-	0x080c, 0x4b7b, 0x00fe, 0x0005, 0x708f, 0x0005, 0x080c, 0x4bf9,</div><div class='del'>-	0x20a3, 0x1103, 0x20a3, 0x0000, 0x3430, 0x2011, 0xbc8e, 0x080c,</div><div class='del'>-	0x4c4a, 0x1160, 0x7078, 0xa005, 0x1148, 0x7150, 0xa186, 0xffff,</div><div class='del'>-	0x0128, 0x080c, 0x4ae7, 0x0110, 0x080c, 0x4c28, 0x20a9, 0x0008,</div><div class='del'>-	0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3,</div><div class='del'>-	0x0014, 0x080c, 0x4b55, 0x0005, 0x00f6, 0x7084, 0xa005, 0x01f0,</div><div class='del'>-	0x2011, 0x4b23, 0x080c, 0x6a0e, 0xa086, 0x0014, 0x11a8, 0x2079,</div><div class='del'>-	0xbc80, 0x7a30, 0xa296, 0x1103, 0x1178, 0x7834, 0xa005, 0x1160,</div><div class='del'>-	0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001,</div><div class='del'>-	0x708f, 0x0006, 0x0029, 0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005,</div><div class='del'>-	0x708f, 0x0007, 0x080c, 0x4bf9, 0x20a3, 0x1104, 0x20a3, 0x0000,</div><div class='del'>-	0x3430, 0x2011, 0xbc8e, 0x080c, 0x4c4a, 0x11a8, 0x7078, 0xa005,</div><div class='del'>-	0x1190, 0x7158, 0xa186, 0xffff, 0x0170, 0xa180, 0x2df9, 0x200d,</div><div class='del'>-	0xa18c, 0xff00, 0x810f, 0x080c, 0x4ae7, 0x0128, 0x080c, 0x411d,</div><div class='del'>-	0x0110, 0x080c, 0x289c, 0x20a9, 0x0008, 0x2298, 0x26a0, 0x53a6,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x4b55,</div><div class='del'>-	0x0005, 0x00f6, 0x7084, 0xa005, 0x01f0, 0x2011, 0x4b23, 0x080c,</div><div class='del'>-	0x6a0e, 0xa086, 0x0014, 0x11a8, 0x2079, 0xbc80, 0x7a30, 0xa296,</div><div class='del'>-	0x1104, 0x1178, 0x7834, 0xa005, 0x1160, 0x7a38, 0xd2fc, 0x0128,</div><div class='del'>-	0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x708f, 0x0008, 0x0029,</div><div class='del'>-	0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005, 0x708f, 0x0009, 0x080c,</div><div class='del'>-	0x4bf9, 0x20a3, 0x1105, 0x20a3, 0x0100, 0x3430, 0x080c, 0x4c4a,</div><div class='del'>-	0x1150, 0x7078, 0xa005, 0x1138, 0x080c, 0x4a5c, 0x1170, 0xa085,</div><div class='del'>-	0x0001, 0x080c, 0x289c, 0x20a9, 0x0008, 0x2099, 0xbc8e, 0x26a0,</div><div class='del'>-	0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c,</div><div class='del'>-	0x4b55, 0x0010, 0x080c, 0x4673, 0x0005, 0x00f6, 0x7084, 0xa005,</div><div class='del'>-	0x0588, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0xa086, 0x0014, 0x1540,</div><div class='del'>-	0x2079, 0xbc80, 0x7a30, 0xa296, 0x1105, 0x1510, 0x7834, 0x2011,</div><div class='del'>-	0x0100, 0xa21e, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005,</div><div class='del'>-	0x1110, 0x70bb, 0x0001, 0x708f, 0x000a, 0x00b1, 0x0098, 0xa005,</div><div class='del'>-	0x1178, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb,</div><div class='del'>-	0x0001, 0x708b, 0x0000, 0x708f, 0x000e, 0x080c, 0x486e, 0x0010,</div><div class='del'>-	0x080c, 0x4b7b, 0x00fe, 0x0005, 0x708f, 0x000b, 0x2011, 0xbc0e,</div><div class='del'>-	0x22a0, 0x20a9, 0x0040, 0x2019, 0xffff, 0x43a4, 0x20a9, 0x0002,</div><div class='del'>-	0x2009, 0x0000, 0x41a4, 0x080c, 0x4bf9, 0x20a3, 0x1106, 0x20a3,</div><div class='del'>-	0x0000, 0x080c, 0x4c4a, 0x0118, 0x2013, 0x0000, 0x0020, 0x7054,</div><div class='del'>-	0xa085, 0x0100, 0x2012, 0x2298, 0x20a9, 0x0042, 0x53a6, 0x60c3,</div><div class='del'>-	0x0084, 0x080c, 0x4b55, 0x0005, 0x00f6, 0x7084, 0xa005, 0x01b0,</div><div class='del'>-	0x2011, 0x4b23, 0x080c, 0x6a0e, 0xa086, 0x0084, 0x1168, 0x2079,</div><div class='del'>-	0xbc80, 0x7a30, 0xa296, 0x1106, 0x1138, 0x7834, 0xa005, 0x1120,</div><div class='del'>-	0x708f, 0x000c, 0x0029, 0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005,</div><div class='del'>-	0x708f, 0x000d, 0x080c, 0x4bf9, 0x20a3, 0x1107, 0x20a3, 0x0000,</div><div class='del'>-	0x2099, 0xbc8e, 0x20a9, 0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x60c3, 0x0084, 0x080c, 0x4b55, 0x0005, 0x00f6, 0x7084,</div><div class='del'>-	0xa005, 0x01d0, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0xa086, 0x0084,</div><div class='del'>-	0x1188, 0x2079, 0xbc80, 0x7a30, 0xa296, 0x1107, 0x1158, 0x7834,</div><div class='del'>-	0xa005, 0x1140, 0x708b, 0x0001, 0x080c, 0x4beb, 0x708f, 0x000e,</div><div class='del'>-	0x0029, 0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005, 0x708f, 0x000f,</div><div class='del'>-	0x7087, 0x0000, 0x608b, 0xbc85, 0x608f, 0xb5b5, 0x6043, 0x0005,</div><div class='del'>-	0x6043, 0x0004, 0x2009, 0x07d0, 0x2011, 0x4b23, 0x080c, 0x6a02,</div><div class='del'>-	0x0005, 0x7084, 0xa005, 0x0120, 0x2011, 0x4b23, 0x080c, 0x6a0e,</div><div class='del'>-	0x0005, 0x708f, 0x0011, 0x080c, 0x4c4a, 0x11a0, 0x7170, 0x81ff,</div><div class='del'>-	0x0188, 0x2009, 0x0000, 0x7074, 0xa084, 0x00ff, 0x080c, 0x2852,</div><div class='del'>-	0xa186, 0x007e, 0x0138, 0xa186, 0x0080, 0x0120, 0x2011, 0xbc8e,</div><div class='del'>-	0x080c, 0x4ae7, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xbc80,</div><div class='del'>-	0x20a1, 0x020b, 0x7484, 0xa480, 0x0018, 0xa080, 0x0007, 0xa084,</div><div class='del'>-	0x03f8, 0x8004, 0x20a8, 0x53a6, 0x60c3, 0x0014, 0x080c, 0x4b55,</div><div class='del'>-	0x0005, 0x00f6, 0x7084, 0xa005, 0x01f0, 0x2011, 0x4b23, 0x080c,</div><div class='del'>-	0x6a0e, 0xa086, 0x0014, 0x11a8, 0x2079, 0xbc80, 0x7a30, 0xa296,</div><div class='del'>-	0x1103, 0x1178, 0x7834, 0xa005, 0x1160, 0x7a38, 0xd2fc, 0x0128,</div><div class='del'>-	0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x708f, 0x0012, 0x0029,</div><div class='del'>-	0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005, 0x708f, 0x0013, 0x080c,</div><div class='del'>-	0x4c05, 0x20a3, 0x1103, 0x20a3, 0x0000, 0x3430, 0x2011, 0xbc8e,</div><div class='del'>-	0x080c, 0x4c4a, 0x1160, 0x7078, 0xa005, 0x1148, 0x7150, 0xa186,</div><div class='del'>-	0xffff, 0x0128, 0x080c, 0x4ae7, 0x0110, 0x080c, 0x4c28, 0x20a9,</div><div class='del'>-	0x0008, 0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0014, 0x080c, 0x4b55, 0x0005, 0x00f6, 0x7084, 0xa005,</div><div class='del'>-	0x01f0, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0xa086, 0x0014, 0x11a8,</div><div class='del'>-	0x2079, 0xbc80, 0x7a30, 0xa296, 0x1104, 0x1178, 0x7834, 0xa005,</div><div class='del'>-	0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb,</div><div class='del'>-	0x0001, 0x708f, 0x0014, 0x0029, 0x0010, 0x080c, 0x4b7b, 0x00fe,</div><div class='del'>-	0x0005, 0x708f, 0x0015, 0x080c, 0x4c05, 0x20a3, 0x1104, 0x20a3,</div><div class='del'>-	0x0000, 0x3430, 0x2011, 0xbc8e, 0x080c, 0x4c4a, 0x11a8, 0x7078,</div><div class='del'>-	0xa005, 0x1190, 0x7158, 0xa186, 0xffff, 0x0170, 0xa180, 0x2df9,</div><div class='del'>-	0x200d, 0xa18c, 0xff00, 0x810f, 0x080c, 0x4ae7, 0x0128, 0x080c,</div><div class='del'>-	0x411d, 0x0110, 0x080c, 0x289c, 0x20a9, 0x0008, 0x2298, 0x26a0,</div><div class='del'>-	0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c,</div><div class='del'>-	0x4b55, 0x0005, 0x00f6, 0x7084, 0xa005, 0x05b8, 0x2011, 0x4b23,</div><div class='del'>-	0x080c, 0x6a0e, 0xa086, 0x0014, 0x1570, 0x2079, 0xbc80, 0x7a30,</div><div class='del'>-	0xa296, 0x1105, 0x1540, 0x7834, 0x2011, 0x0100, 0xa21e, 0x1148,</div><div class='del'>-	0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001,</div><div class='del'>-	0x0060, 0xa005, 0x11c0, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005,</div><div class='del'>-	0x1110, 0x70bb, 0x0001, 0x708b, 0x0000, 0x7a38, 0xd2f4, 0x0138,</div><div class='del'>-	0x2001, 0xb674, 0x2004, 0xd0a4, 0x1110, 0x70d7, 0x0008, 0x708f,</div><div class='del'>-	0x0016, 0x0029, 0x0010, 0x080c, 0x4b7b, 0x00fe, 0x0005, 0x20e1,</div><div class='del'>-	0x9080, 0x20e1, 0x4000, 0x2099, 0xbc80, 0x20a1, 0x020b, 0x20a9,</div><div class='del'>-	0x000e, 0x53a6, 0x3430, 0x2011, 0xbc8e, 0x708f, 0x0017, 0x080c,</div><div class='del'>-	0x4c4a, 0x1150, 0x7078, 0xa005, 0x1138, 0x080c, 0x4a5c, 0x1170,</div><div class='del'>-	0xa085, 0x0001, 0x080c, 0x289c, 0x20a9, 0x0008, 0x2099, 0xbc8e,</div><div class='del'>-	0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014,</div><div class='del'>-	0x080c, 0x4b55, 0x0010, 0x080c, 0x4673, 0x0005, 0x00f6, 0x7084,</div><div class='del'>-	0xa005, 0x01b0, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0xa086, 0x0084,</div><div class='del'>-	0x1168, 0x2079, 0xbc80, 0x7a30, 0xa296, 0x1106, 0x1138, 0x7834,</div><div class='del'>-	0xa005, 0x1120, 0x708f, 0x0018, 0x0029, 0x0010, 0x080c, 0x4b7b,</div><div class='del'>-	0x00fe, 0x0005, 0x708f, 0x0019, 0x080c, 0x4c05, 0x20a3, 0x1106,</div><div class='del'>-	0x20a3, 0x0000, 0x3430, 0x2099, 0xbc8e, 0x2039, 0xbc0e, 0x27a0,</div><div class='del'>-	0x20a9, 0x0040, 0x53a3, 0x080c, 0x4c4a, 0x11e8, 0x2728, 0x2514,</div><div class='del'>-	0x8207, 0xa084, 0x00ff, 0x8000, 0x2018, 0xa294, 0x00ff, 0x8007,</div><div class='del'>-	0xa205, 0x202a, 0x7054, 0x2310, 0x8214, 0xa2a0, 0xbc0e, 0x2414,</div><div class='del'>-	0xa38c, 0x0001, 0x0118, 0xa294, 0xff00, 0x0018, 0xa294, 0x00ff,</div><div class='del'>-	0x8007, 0xa215, 0x2222, 0x2798, 0x26a0, 0x20a9, 0x0040, 0x53a6,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0084, 0x080c, 0x4b55,</div><div class='del'>-	0x0005, 0x00f6, 0x7084, 0xa005, 0x01d0, 0x2011, 0x4b23, 0x080c,</div><div class='del'>-	0x6a0e, 0xa086, 0x0084, 0x1188, 0x2079, 0xbc80, 0x7a30, 0xa296,</div><div class='del'>-	0x1107, 0x1158, 0x7834, 0xa005, 0x1140, 0x708b, 0x0001, 0x080c,</div><div class='del'>-	0x4beb, 0x708f, 0x001a, 0x0029, 0x0010, 0x080c, 0x4b7b, 0x00fe,</div><div class='del'>-	0x0005, 0x708f, 0x001b, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099,</div><div class='del'>-	0xbc80, 0x20a1, 0x020b, 0x7484, 0xa480, 0x0018, 0xa080, 0x0007,</div><div class='del'>-	0xa084, 0x03f8, 0x8004, 0x20a8, 0x53a6, 0x60c3, 0x0084, 0x080c,</div><div class='del'>-	0x4b55, 0x0005, 0x0005, 0x0005, 0x0086, 0x0096, 0x2029, 0xb653,</div><div class='del'>-	0x252c, 0x20a9, 0x0008, 0x2041, 0xbc0e, 0x28a0, 0x2099, 0xbc8e,</div><div class='del'>-	0x53a3, 0x20a9, 0x0008, 0x2011, 0x0007, 0xd5d4, 0x0110, 0x2011,</div><div class='del'>-	0x0000, 0x2800, 0xa200, 0x200c, 0xa1a6, 0xffff, 0x1148, 0xd5d4,</div><div class='del'>-	0x0110, 0x8210, 0x0008, 0x8211, 0x1f04, 0x4a71, 0x0804, 0x4adf,</div><div class='del'>-	0x82ff, 0x1160, 0xd5d4, 0x0120, 0xa1a6, 0x3fff, 0x0d90, 0x0020,</div><div class='del'>-	0xa1a6, 0x3fff, 0x0904, 0x4adf, 0xa18d, 0xc000, 0x20a9, 0x0010,</div><div class='del'>-	0x2019, 0x0001, 0xd5d4, 0x0110, 0x2019, 0x0010, 0x2120, 0xd5d4,</div><div class='del'>-	0x0110, 0x8423, 0x0008, 0x8424, 0x1240, 0xd5d4, 0x0110, 0x8319,</div><div class='del'>-	0x0008, 0x8318, 0x1f04, 0x4a97, 0x04d0, 0x23a8, 0x2021, 0x0001,</div><div class='del'>-	0x8426, 0x8425, 0x1f04, 0x4aa9, 0x2328, 0x8529, 0xa2be, 0x0007,</div><div class='del'>-	0x0158, 0x0006, 0x2039, 0x0007, 0x2200, 0xa73a, 0x000e, 0x27a8,</div><div class='del'>-	0xa5a8, 0x0010, 0x1f04, 0x4ab8, 0x7552, 0xa5c8, 0x2df9, 0x292d,</div><div class='del'>-	0xa5ac, 0x00ff, 0x7576, 0x6532, 0x6536, 0x0016, 0x2508, 0x080c,</div><div class='del'>-	0x287c, 0x001e, 0x60e7, 0x0000, 0x65ea, 0x2018, 0x2304, 0xa405,</div><div class='del'>-	0x201a, 0x707b, 0x0001, 0x26a0, 0x2898, 0x20a9, 0x0008, 0x53a6,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0xa085, 0x0001, 0x0028, 0xa006,</div><div class='del'>-	0x0018, 0xa006, 0x080c, 0x151a, 0x009e, 0x008e, 0x0005, 0x2118,</div><div class='del'>-	0x2021, 0x0000, 0x2001, 0x0007, 0xa39a, 0x0010, 0x0218, 0x8420,</div><div class='del'>-	0x8001, 0x0cd0, 0x2118, 0x84ff, 0x0120, 0xa39a, 0x0010, 0x8421,</div><div class='del'>-	0x1de0, 0x2021, 0x0001, 0x83ff, 0x0118, 0x8423, 0x8319, 0x1de8,</div><div class='del'>-	0xa238, 0x2704, 0xa42c, 0x11b8, 0xa405, 0x203a, 0x7152, 0xa1a0,</div><div class='del'>-	0x2df9, 0x242d, 0xa5ac, 0x00ff, 0x7576, 0x6532, 0x6536, 0x0016,</div><div class='del'>-	0x2508, 0x080c, 0x287c, 0x001e, 0x60e7, 0x0000, 0x65ea, 0x707b,</div><div class='del'>-	0x0001, 0xa084, 0x0000, 0x0005, 0x00e6, 0x2071, 0xb600, 0x707f,</div><div class='del'>-	0x0000, 0x00ee, 0x0005, 0x00e6, 0x00f6, 0x2079, 0x0100, 0x2071,</div><div class='del'>-	0x0140, 0x080c, 0x4c61, 0x080c, 0x7df3, 0x7004, 0xa084, 0x4000,</div><div class='del'>-	0x0120, 0x7003, 0x1000, 0x7003, 0x0000, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xb623, 0x2073, 0x0000, 0x7840, 0x0026, 0x0016, 0x2009,</div><div class='del'>-	0x00f7, 0x080c, 0x4c11, 0x001e, 0xa094, 0x0010, 0xa285, 0x0080,</div><div class='del'>-	0x7842, 0x7a42, 0x2009, 0x1388, 0x2011, 0x5a14, 0x080c, 0x6a94,</div><div class='del'>-	0x002e, 0x012e, 0x00fe, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2011, 0xb8eb, 0x2013, 0x0000, 0x7087, 0x0000, 0x012e, 0x20e1,</div><div class='del'>-	0x9080, 0x60a3, 0x0056, 0x60a7, 0x9575, 0x080c, 0x7dea, 0x6144,</div><div class='del'>-	0xd184, 0x0120, 0x718c, 0xa18d, 0x2000, 0x0018, 0x7180, 0xa18d,</div><div class='del'>-	0x1000, 0x2011, 0xb8bf, 0x2112, 0x2009, 0x07d0, 0x2011, 0x4b23,</div><div class='del'>-	0x080c, 0x6a94, 0x0005, 0x0016, 0x0026, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0x8106, 0x080c, 0x7fe0, 0x0036, 0x2019, 0x0000, 0x080c, 0x806b,</div><div class='del'>-	0x003e, 0x2009, 0x00f7, 0x080c, 0x4c11, 0x2061, 0xb8f4, 0x601b,</div><div class='del'>-	0x0000, 0x601f, 0x0000, 0x2061, 0xb600, 0x6003, 0x0001, 0x2061,</div><div class='del'>-	0x0100, 0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0xb8bf, 0x200b,</div><div class='del'>-	0x0000, 0x2009, 0x002d, 0x2011, 0x4bb4, 0x080c, 0x6a02, 0x012e,</div><div class='del'>-	0x00ce, 0x002e, 0x001e, 0x0005, 0x00e6, 0x0006, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x4c61, 0x2071, 0x0100, 0x080c, 0x7df3, 0x2071,</div><div class='del'>-	0x0140, 0x7004, 0xa084, 0x4000, 0x0120, 0x7003, 0x1000, 0x7003,</div><div class='del'>-	0x0000, 0x080c, 0x5b49, 0x01a8, 0x080c, 0x5b67, 0x1190, 0x2001,</div><div class='del'>-	0xb89e, 0x2003, 0xaaaa, 0x0016, 0x080c, 0x2920, 0x2001, 0xb88f,</div><div class='del'>-	0x2102, 0x001e, 0x2001, 0xb89f, 0x2003, 0x0000, 0x080c, 0x5a79,</div><div class='del'>-	0x0030, 0x2001, 0x0001, 0x080c, 0x27f8, 0x080c, 0x4b7b, 0x012e,</div><div class='del'>-	0x000e, 0x00ee, 0x0005, 0x20a9, 0x0040, 0x20a1, 0xbdc0, 0x2099,</div><div class='del'>-	0xbc8e, 0x3304, 0x8007, 0x20a2, 0x9398, 0x94a0, 0x1f04, 0x4bf1,</div><div class='del'>-	0x0005, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xbc00, 0x20a1,</div><div class='del'>-	0x020b, 0x20a9, 0x000c, 0x53a6, 0x0005, 0x20e1, 0x9080, 0x20e1,</div><div class='del'>-	0x4000, 0x2099, 0xbc80, 0x20a1, 0x020b, 0x20a9, 0x000c, 0x53a6,</div><div class='del'>-	0x0005, 0x00c6, 0x0006, 0x2061, 0x0100, 0x810f, 0x2001, 0xb631,</div><div class='del'>-	0x2004, 0xa005, 0x1138, 0x2001, 0xb615, 0x2004, 0xa084, 0x00ff,</div><div class='del'>-	0xa105, 0x0010, 0xa185, 0x00f7, 0x604a, 0x000e, 0x00ce, 0x0005,</div><div class='del'>-	0x0016, 0x0046, 0x2001, 0xb653, 0x2004, 0xd0a4, 0x0158, 0xa006,</div><div class='del'>-	0x2020, 0x2009, 0x002a, 0x080c, 0xb1a4, 0x2001, 0xb60c, 0x200c,</div><div class='del'>-	0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0000, 0x080c, 0x2ca4,</div><div class='del'>-	0x004e, 0x001e, 0x0005, 0x080c, 0x4b7b, 0x708f, 0x0000, 0x7087,</div><div class='del'>-	0x0000, 0x0005, 0x0006, 0x2001, 0xb60c, 0x2004, 0xd09c, 0x0100,</div><div class='del'>-	0x000e, 0x0005, 0x0006, 0x0016, 0x0126, 0x2091, 0x8000, 0x2001,</div><div class='del'>-	0x0101, 0x200c, 0xa18d, 0x0006, 0x2102, 0x012e, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x2001, 0xb60d, 0x2004, 0xd0bc, 0x0158, 0x0026, 0x0036,</div><div class='del'>-	0x2011, 0x8017, 0x2001, 0xb8bf, 0x201c, 0x080c, 0x3f13, 0x003e,</div><div class='del'>-	0x002e, 0x0005, 0x0156, 0x20a9, 0x00ff, 0x2009, 0xb735, 0xa006,</div><div class='del'>-	0x200a, 0x8108, 0x1f04, 0x4c78, 0x015e, 0x0005, 0x00d6, 0x0036,</div><div class='del'>-	0x0156, 0x0136, 0x0146, 0x2069, 0xb652, 0xa006, 0x6002, 0x6007,</div><div class='del'>-	0x0707, 0x600a, 0x600e, 0x6012, 0xa198, 0x2df9, 0x231d, 0xa39c,</div><div class='del'>-	0x00ff, 0x6316, 0x20a9, 0x0004, 0xac98, 0x0006, 0x23a0, 0x40a4,</div><div class='del'>-	0x20a9, 0x0004, 0xac98, 0x000a, 0x23a0, 0x40a4, 0x603e, 0x6042,</div><div class='del'>-	0x604e, 0x6052, 0x6056, 0x605a, 0x605e, 0x6062, 0x6066, 0x606a,</div><div class='del'>-	0x606e, 0x6072, 0x6076, 0x607a, 0x607e, 0x6082, 0x6086, 0x608a,</div><div class='del'>-	0x608e, 0x6092, 0x6096, 0x609a, 0x609e, 0x60ae, 0x61a2, 0x00d6,</div><div class='del'>-	0x60a4, 0xa06d, 0x0110, 0x080c, 0x1614, 0x60a7, 0x0000, 0x60a8,</div><div class='del'>-	0xa06d, 0x0110, 0x080c, 0x1614, 0x60ab, 0x0000, 0x00de, 0xa006,</div><div class='del'>-	0x604a, 0x6810, 0x603a, 0x680c, 0x6046, 0x6814, 0xa084, 0x00ff,</div><div class='del'>-	0x6042, 0x014e, 0x013e, 0x015e, 0x003e, 0x00de, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x6944, 0x6e48, 0xa684, 0x3fff, 0xa082, 0x4000,</div><div class='del'>-	0x1a04, 0x4d8c, 0xa18c, 0xff00, 0x810f, 0xa182, 0x00ff, 0x1a04,</div><div class='del'>-	0x4d91, 0x2001, 0xb60c, 0x2004, 0xa084, 0x0003, 0x01c0, 0x2001,</div><div class='del'>-	0xb60c, 0x2004, 0xd084, 0x1904, 0x4d74, 0xa188, 0xb735, 0x2104,</div><div class='del'>-	0xa065, 0x0904, 0x4d74, 0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006,</div><div class='del'>-	0x1904, 0x4d74, 0x6000, 0xd0c4, 0x0904, 0x4d74, 0x0068, 0xa188,</div><div class='del'>-	0xb735, 0x2104, 0xa065, 0x0904, 0x4d59, 0x6004, 0xa084, 0x00ff,</div><div class='del'>-	0xa08e, 0x0006, 0x1904, 0x4d5e, 0x60a4, 0xa00d, 0x0118, 0x080c,</div><div class='del'>-	0x5246, 0x05d0, 0x60a8, 0xa00d, 0x0188, 0x080c, 0x5291, 0x1170,</div><div class='del'>-	0x694c, 0xd1fc, 0x1118, 0x080c, 0x4f50, 0x0448, 0x080c, 0x4eff,</div><div class='del'>-	0x694c, 0xd1ec, 0x1520, 0x080c, 0x5138, 0x0408, 0x694c, 0xa184,</div><div class='del'>-	0xa000, 0x0178, 0xd1ec, 0x0140, 0xd1fc, 0x0118, 0x080c, 0x5147,</div><div class='del'>-	0x0028, 0x080c, 0x5147, 0x0028, 0xd1fc, 0x0118, 0x080c, 0x4eff,</div><div class='del'>-	0x0070, 0x6050, 0xa00d, 0x0130, 0x2d00, 0x200a, 0x6803, 0x0000,</div><div class='del'>-	0x6052, 0x0028, 0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x080c,</div><div class='del'>-	0x6d1c, 0xa006, 0x012e, 0x0005, 0x2001, 0x0005, 0x2009, 0x0000,</div><div class='del'>-	0x04e0, 0x2001, 0x0028, 0x2009, 0x0000, 0x04b8, 0xa082, 0x0006,</div><div class='del'>-	0x1298, 0x2001, 0xb635, 0x2004, 0xd0ac, 0x1158, 0x60a0, 0xd0bc,</div><div class='del'>-	0x1140, 0x6100, 0xd1fc, 0x0128, 0x2001, 0x0029, 0x2009, 0x1000,</div><div class='del'>-	0x0420, 0x2001, 0x0028, 0x00a8, 0x2009, 0xb60c, 0x210c, 0xd18c,</div><div class='del'>-	0x0118, 0x2001, 0x0004, 0x0068, 0xd184, 0x0118, 0x2001, 0x0004,</div><div class='del'>-	0x0040, 0x2001, 0x0029, 0x6100, 0xd1fc, 0x0118, 0x2009, 0x1000,</div><div class='del'>-	0x0060, 0x2009, 0x0000, 0x0048, 0x2001, 0x0029, 0x2009, 0x0000,</div><div class='del'>-	0x0020, 0x2001, 0x0029, 0x2009, 0x0000, 0xa005, 0x012e, 0x0005,</div><div class='del'>-	0x00e6, 0x0126, 0x2091, 0x8000, 0x6844, 0x8007, 0xa084, 0x00ff,</div><div class='del'>-	0x2008, 0xa182, 0x00ff, 0x1a04, 0x4deb, 0xa188, 0xb735, 0x2104,</div><div class='del'>-	0xa065, 0x01c0, 0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006, 0x11a8,</div><div class='del'>-	0x2c70, 0x080c, 0x864e, 0x05e8, 0x2e00, 0x601a, 0x2d00, 0x6012,</div><div class='del'>-	0x600b, 0xffff, 0x601f, 0x000a, 0x2009, 0x0003, 0x080c, 0x86d3,</div><div class='del'>-	0xa006, 0x0460, 0x2001, 0x0028, 0x0440, 0xa082, 0x0006, 0x1298,</div><div class='del'>-	0x2001, 0xb635, 0x2004, 0xd0ac, 0x1158, 0x60a0, 0xd0bc, 0x1140,</div><div class='del'>-	0x6100, 0xd1fc, 0x09e8, 0x2001, 0x0029, 0x2009, 0x1000, 0x00a8,</div><div class='del'>-	0x2001, 0x0028, 0x0090, 0x2009, 0xb60c, 0x210c, 0xd18c, 0x0118,</div><div class='del'>-	0x2001, 0x0004, 0x0050, 0xd184, 0x0118, 0x2001, 0x0004, 0x0028,</div><div class='del'>-	0x2001, 0x0029, 0x0010, 0x2001, 0x0029, 0xa005, 0x012e, 0x00ee,</div><div class='del'>-	0x0005, 0x2001, 0x002c, 0x0cc8, 0x00f6, 0x00e6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2011, 0x0000, 0x2079, 0xb600, 0x6944, 0xa18c, 0xff00,</div><div class='del'>-	0x810f, 0xa182, 0x00ff, 0x1a04, 0x4eb6, 0x080c, 0x501b, 0x11a0,</div><div class='del'>-	0x6004, 0xa084, 0x00ff, 0xa082, 0x0006, 0x1270, 0x6864, 0xa0c6,</div><div class='del'>-	0x006f, 0x0150, 0x2001, 0xb635, 0x2004, 0xd0ac, 0x1904, 0x4e9f,</div><div class='del'>-	0x60a0, 0xd0bc, 0x1904, 0x4e9f, 0x6864, 0xa0c6, 0x006f, 0x0118,</div><div class='del'>-	0x2008, 0x0804, 0x4e68, 0x6968, 0x2140, 0xa18c, 0xff00, 0x810f,</div><div class='del'>-	0x78d4, 0xd0ac, 0x1118, 0xa182, 0x0080, 0x06d0, 0xa182, 0x00ff,</div><div class='del'>-	0x16b8, 0x6a70, 0x6b6c, 0x7870, 0xa306, 0x1160, 0x7874, 0xa24e,</div><div class='del'>-	0x1118, 0x2208, 0x2310, 0x0460, 0xa9cc, 0xff00, 0x1118, 0x2208,</div><div class='del'>-	0x2310, 0x0430, 0x080c, 0x3e0c, 0x2c70, 0x0550, 0x2009, 0x0000,</div><div class='del'>-	0x2011, 0x0000, 0xa0c6, 0x4000, 0x1160, 0x0006, 0x2e60, 0x080c,</div><div class='del'>-	0x52bc, 0x1108, 0xc185, 0x7000, 0xd0bc, 0x0108, 0xc18d, 0x000e,</div><div class='del'>-	0x0088, 0xa0c6, 0x4007, 0x1110, 0x2408, 0x0060, 0xa0c6, 0x4008,</div><div class='del'>-	0x1118, 0x2708, 0x2610, 0x0030, 0xa0c6, 0x4009, 0x1108, 0x0010,</div><div class='del'>-	0x2001, 0x4006, 0x6866, 0x696a, 0x6a6e, 0x2001, 0x0030, 0x0450,</div><div class='del'>-	0x080c, 0x864e, 0x1138, 0x2001, 0x4005, 0x2009, 0x0003, 0x2011,</div><div class='del'>-	0x0000, 0x0c80, 0x2e00, 0x601a, 0x080c, 0xa0e3, 0x2d00, 0x6012,</div><div class='del'>-	0x601f, 0x0001, 0x6838, 0xd88c, 0x0108, 0xc0f5, 0x683a, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x2cd1, 0x012e, 0x2001, 0x0000, 0x080c,</div><div class='del'>-	0x4f5d, 0x2001, 0x0002, 0x080c, 0x4f6f, 0x2009, 0x0002, 0x080c,</div><div class='del'>-	0x86d3, 0xa006, 0xa005, 0x012e, 0x00ee, 0x00fe, 0x0005, 0x2001,</div><div class='del'>-	0x0028, 0x2009, 0x0000, 0x0cb0, 0x2009, 0xb60c, 0x210c, 0xd18c,</div><div class='del'>-	0x0118, 0x2001, 0x0004, 0x0038, 0xd184, 0x0118, 0x2001, 0x0004,</div><div class='del'>-	0x0010, 0x2001, 0x0029, 0x2009, 0x0000, 0x0c20, 0x2001, 0x0029,</div><div class='del'>-	0x2009, 0x0000, 0x08f8, 0x6944, 0x6e48, 0xa684, 0x3fff, 0xa082,</div><div class='del'>-	0x4000, 0x16b8, 0xa18c, 0xff00, 0x810f, 0xa182, 0x00ff, 0x12e0,</div><div class='del'>-	0xa188, 0xb735, 0x2104, 0xa065, 0x01b8, 0x6004, 0xa084, 0x00ff,</div><div class='del'>-	0xa08e, 0x0006, 0x11b0, 0x684c, 0xd0ec, 0x0120, 0x080c, 0x5147,</div><div class='del'>-	0x0431, 0x0030, 0x0421, 0x684c, 0xd0fc, 0x0110, 0x080c, 0x5138,</div><div class='del'>-	0x080c, 0x5185, 0xa006, 0x00c8, 0x2001, 0x0028, 0x2009, 0x0000,</div><div class='del'>-	0x00a0, 0xa082, 0x0006, 0x1240, 0x6100, 0xd1fc, 0x0d20, 0x2001,</div><div class='del'>-	0x0029, 0x2009, 0x1000, 0x0048, 0x2001, 0x0029, 0x2009, 0x0000,</div><div class='del'>-	0x0020, 0x2001, 0x0029, 0x2009, 0x0000, 0xa005, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x6050, 0xa00d, 0x0138, 0x2d00, 0x200a, 0x6803,</div><div class='del'>-	0x0000, 0x6052, 0x012e, 0x0005, 0x2d00, 0x6052, 0x604e, 0x6803,</div><div class='del'>-	0x0000, 0x0cc0, 0x0126, 0x2091, 0x8000, 0x604c, 0xa005, 0x0170,</div><div class='del'>-	0x00e6, 0x2071, 0xb8e1, 0x7004, 0xa086, 0x0002, 0x0168, 0x00ee,</div><div class='del'>-	0x604c, 0x6802, 0x2d00, 0x604e, 0x012e, 0x0005, 0x2d00, 0x6052,</div><div class='del'>-	0x604e, 0x6803, 0x0000, 0x0cc0, 0x701c, 0xac06, 0x1d80, 0x604c,</div><div class='del'>-	0x2070, 0x7000, 0x6802, 0x2d00, 0x7002, 0x00ee, 0x012e, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x604c, 0xa06d, 0x0130, 0x6800, 0xa005,</div><div class='del'>-	0x1108, 0x6052, 0x604e, 0xad05, 0x012e, 0x0005, 0x604c, 0xa06d,</div><div class='del'>-	0x0130, 0x6800, 0xa005, 0x1108, 0x6052, 0x604e, 0xad05, 0x0005,</div><div class='del'>-	0x6803, 0x0000, 0x6084, 0xa00d, 0x0120, 0x2d00, 0x200a, 0x6086,</div><div class='del'>-	0x0005, 0x2d00, 0x6086, 0x6082, 0x0cd8, 0x0126, 0x00c6, 0x0026,</div><div class='del'>-	0x2091, 0x8000, 0x6218, 0x2260, 0x6200, 0xa005, 0x0110, 0xc285,</div><div class='del'>-	0x0008, 0xc284, 0x6202, 0x002e, 0x00ce, 0x012e, 0x0005, 0x0126,</div><div class='del'>-	0x00c6, 0x2091, 0x8000, 0x6218, 0x2260, 0x6204, 0x0006, 0xa086,</div><div class='del'>-	0x0006, 0x1180, 0x609c, 0xd0ac, 0x0168, 0x2001, 0xb653, 0x2004,</div><div class='del'>-	0xd0a4, 0x0140, 0xa284, 0xff00, 0x8007, 0xa086, 0x0007, 0x1110,</div><div class='del'>-	0x2011, 0x0600, 0x000e, 0xa294, 0xff00, 0xa215, 0x6206, 0x0006,</div><div class='del'>-	0xa086, 0x0006, 0x1128, 0x6290, 0x82ff, 0x1110, 0x080c, 0x151a,</div><div class='del'>-	0x000e, 0x00ce, 0x012e, 0x0005, 0x0126, 0x00c6, 0x2091, 0x8000,</div><div class='del'>-	0x6218, 0x2260, 0x6204, 0x0006, 0xa086, 0x0006, 0x1178, 0x609c,</div><div class='del'>-	0xd0a4, 0x0160, 0x2001, 0xb653, 0x2004, 0xd0ac, 0x1138, 0xa284,</div><div class='del'>-	0x00ff, 0xa086, 0x0007, 0x1110, 0x2011, 0x0006, 0x000e, 0xa294,</div><div class='del'>-	0x00ff, 0x8007, 0xa215, 0x6206, 0x00ce, 0x012e, 0x0005, 0x0026,</div><div class='del'>-	0xa182, 0x00ff, 0x0218, 0xa085, 0x0001, 0x00b0, 0xa190, 0xb735,</div><div class='del'>-	0x2204, 0xa065, 0x1180, 0x0016, 0x00d6, 0x080c, 0x15e4, 0x2d60,</div><div class='del'>-	0x00de, 0x001e, 0x0d80, 0x2c00, 0x2012, 0x60a7, 0x0000, 0x60ab,</div><div class='del'>-	0x0000, 0x080c, 0x4c7e, 0xa006, 0x002e, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x0026, 0xa182, 0x00ff, 0x0218, 0xa085, 0x0001, 0x0480,</div><div class='del'>-	0x00d6, 0xa190, 0xb735, 0x2204, 0xa06d, 0x0540, 0x2013, 0x0000,</div><div class='del'>-	0x00d6, 0x00c6, 0x2d60, 0x60a4, 0xa06d, 0x0110, 0x080c, 0x1614,</div><div class='del'>-	0x60a8, 0xa06d, 0x0110, 0x080c, 0x1614, 0x00ce, 0x00de, 0x00d6,</div><div class='del'>-	0x00c6, 0x68ac, 0x2060, 0x8cff, 0x0168, 0x600c, 0x0006, 0x6010,</div><div class='del'>-	0x2068, 0x080c, 0x9d16, 0x0110, 0x080c, 0x1624, 0x080c, 0x86a4,</div><div class='del'>-	0x00ce, 0x0c88, 0x00ce, 0x00de, 0x080c, 0x1614, 0x00de, 0xa006,</div><div class='del'>-	0x002e, 0x012e, 0x0005, 0x0016, 0xa182, 0x00ff, 0x0218, 0xa085,</div><div class='del'>-	0x0001, 0x0030, 0xa188, 0xb735, 0x2104, 0xa065, 0x0dc0, 0xa006,</div><div class='del'>-	0x001e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146, 0x600b, 0x0000,</div><div class='del'>-	0x600f, 0x0000, 0x6000, 0xc08c, 0x6002, 0x080c, 0x5b41, 0x1558,</div><div class='del'>-	0x60a0, 0xa086, 0x007e, 0x2069, 0xbc90, 0x0130, 0x2001, 0xb635,</div><div class='del'>-	0x2004, 0xd0ac, 0x1500, 0x0098, 0x2d04, 0xd0e4, 0x01e0, 0x00d6,</div><div class='del'>-	0x2069, 0xbc8e, 0x00c6, 0x2061, 0xb8b2, 0x6810, 0x2062, 0x6814,</div><div class='del'>-	0x6006, 0x6818, 0x600a, 0x681c, 0x600e, 0x00ce, 0x00de, 0x8d69,</div><div class='del'>-	0x2d04, 0x2069, 0x0140, 0xa005, 0x1110, 0x2001, 0x0001, 0x6886,</div><div class='del'>-	0x2069, 0xb600, 0x68a6, 0x2069, 0xbc8e, 0x6808, 0x605e, 0x6810,</div><div class='del'>-	0x6062, 0x6138, 0xa10a, 0x0208, 0x603a, 0x6814, 0x6066, 0x2099,</div><div class='del'>-	0xbc96, 0xac88, 0x000a, 0x21a0, 0x20a9, 0x0004, 0x53a3, 0x2099,</div><div class='del'>-	0xbc9a, 0xac88, 0x0006, 0x21a0, 0x20a9, 0x0004, 0x53a3, 0x2069,</div><div class='del'>-	0xbcae, 0x6808, 0x606a, 0x690c, 0x616e, 0x6810, 0x6072, 0x6818,</div><div class='del'>-	0x6076, 0x60a0, 0xa086, 0x007e, 0x1120, 0x2069, 0xbc8e, 0x690c,</div><div class='del'>-	0x616e, 0xa182, 0x0211, 0x1218, 0x2009, 0x0008, 0x0400, 0xa182,</div><div class='del'>-	0x0259, 0x1218, 0x2009, 0x0007, 0x00d0, 0xa182, 0x02c1, 0x1218,</div><div class='del'>-	0x2009, 0x0006, 0x00a0, 0xa182, 0x0349, 0x1218, 0x2009, 0x0005,</div><div class='del'>-	0x0070, 0xa182, 0x0421, 0x1218, 0x2009, 0x0004, 0x0040, 0xa182,</div><div class='del'>-	0x0581, 0x1218, 0x2009, 0x0003, 0x0010, 0x2009, 0x0002, 0x6192,</div><div class='del'>-	0x014e, 0x013e, 0x015e, 0x00de, 0x0005, 0x0016, 0x0026, 0x00e6,</div><div class='del'>-	0x2071, 0xbc8d, 0x2e04, 0x6896, 0x2071, 0xbc8e, 0x7004, 0x689a,</div><div class='del'>-	0x701c, 0x689e, 0x6a00, 0x2009, 0xb672, 0x210c, 0xd0bc, 0x0120,</div><div class='del'>-	0xd1ec, 0x0110, 0xc2ad, 0x0008, 0xc2ac, 0xd0c4, 0x0120, 0xd1e4,</div><div class='del'>-	0x0110, 0xc2bd, 0x0008, 0xc2bc, 0x6a02, 0x00ee, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x60a4, 0xa06d, 0x01c0,</div><div class='del'>-	0x6900, 0x81ff, 0x1540, 0x6a04, 0xa282, 0x0010, 0x1648, 0xad88,</div><div class='del'>-	0x0004, 0x20a9, 0x0010, 0x2104, 0xa086, 0xffff, 0x0128, 0x8108,</div><div class='del'>-	0x1f04, 0x50f3, 0x080c, 0x151a, 0x260a, 0x8210, 0x6a06, 0x0098,</div><div class='del'>-	0x080c, 0x15fd, 0x01a8, 0x2d00, 0x60a6, 0x6803, 0x0000, 0xad88,</div><div class='del'>-	0x0004, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108, 0x1f04, 0x510b,</div><div class='del'>-	0x6807, 0x0001, 0x6e12, 0xa085, 0x0001, 0x012e, 0x00de, 0x0005,</div><div class='del'>-	0xa006, 0x0cd8, 0x0126, 0x2091, 0x8000, 0x00d6, 0x60a4, 0xa00d,</div><div class='del'>-	0x01a0, 0x2168, 0x6800, 0xa005, 0x1160, 0x080c, 0x5246, 0x1168,</div><div class='del'>-	0x200b, 0xffff, 0x6804, 0xa08a, 0x0002, 0x0218, 0x8001, 0x6806,</div><div class='del'>-	0x0020, 0x080c, 0x1614, 0x60a7, 0x0000, 0x00de, 0x012e, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x52a4, 0x0010, 0x080c, 0x4eff,</div><div class='del'>-	0x080c, 0x51be, 0x1dd8, 0x080c, 0x5185, 0x012e, 0x0005, 0x00d6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x60a8, 0xa06d, 0x01c0, 0x6950, 0x81ff,</div><div class='del'>-	0x1540, 0x6a54, 0xa282, 0x0010, 0x1670, 0xad88, 0x0018, 0x20a9,</div><div class='del'>-	0x0010, 0x2104, 0xa086, 0xffff, 0x0128, 0x8108, 0x1f04, 0x5159,</div><div class='del'>-	0x080c, 0x151a, 0x260a, 0x8210, 0x6a56, 0x0098, 0x080c, 0x15fd,</div><div class='del'>-	0x01d0, 0x2d00, 0x60aa, 0x6853, 0x0000, 0xad88, 0x0018, 0x20a9,</div><div class='del'>-	0x0010, 0x200b, 0xffff, 0x8108, 0x1f04, 0x5171, 0x6857, 0x0001,</div><div class='del'>-	0x6e62, 0x0010, 0x080c, 0x4f50, 0x0089, 0x1de0, 0xa085, 0x0001,</div><div class='del'>-	0x012e, 0x00de, 0x0005, 0xa006, 0x0cd8, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x6d1c, 0x012e, 0x0005, 0xa01e, 0x0010, 0x2019, 0x0001,</div><div class='del'>-	0xa00e, 0x0126, 0x2091, 0x8000, 0x604c, 0x2068, 0x6000, 0xd0dc,</div><div class='del'>-	0x1170, 0x8dff, 0x01f8, 0x83ff, 0x0120, 0x6848, 0xa606, 0x0158,</div><div class='del'>-	0x0030, 0x683c, 0xa406, 0x1118, 0x6840, 0xa506, 0x0120, 0x2d08,</div><div class='del'>-	0x6800, 0x2068, 0x0c70, 0x080c, 0x81a5, 0x6a00, 0x604c, 0xad06,</div><div class='del'>-	0x1110, 0x624e, 0x0018, 0xa180, 0x0000, 0x2202, 0x82ff, 0x1110,</div><div class='del'>-	0x6152, 0x8dff, 0x012e, 0x0005, 0xa01e, 0x0010, 0x2019, 0x0001,</div><div class='del'>-	0xa00e, 0x6080, 0x2068, 0x8dff, 0x01e8, 0x83ff, 0x0120, 0x6848,</div><div class='del'>-	0xa606, 0x0158, 0x0030, 0x683c, 0xa406, 0x1118, 0x6840, 0xa506,</div><div class='del'>-	0x0120, 0x2d08, 0x6800, 0x2068, 0x0c70, 0x6a00, 0x6080, 0xad06,</div><div class='del'>-	0x1110, 0x6282, 0x0018, 0xa180, 0x0000, 0x2202, 0x82ff, 0x1110,</div><div class='del'>-	0x6186, 0x8dff, 0x0005, 0xa016, 0x080c, 0x5240, 0x1110, 0x2011,</div><div class='del'>-	0x0001, 0x080c, 0x528b, 0x1110, 0xa295, 0x0002, 0x0005, 0x080c,</div><div class='del'>-	0x52bc, 0x0118, 0x080c, 0x9dcb, 0x0010, 0xa085, 0x0001, 0x0005,</div><div class='del'>-	0x080c, 0x52bc, 0x0118, 0x080c, 0x9d5b, 0x0010, 0xa085, 0x0001,</div><div class='del'>-	0x0005, 0x080c, 0x52bc, 0x0118, 0x080c, 0x9dae, 0x0010, 0xa085,</div><div class='del'>-	0x0001, 0x0005, 0x080c, 0x52bc, 0x0118, 0x080c, 0x9d77, 0x0010,</div><div class='del'>-	0xa085, 0x0001, 0x0005, 0x080c, 0x52bc, 0x0118, 0x080c, 0x9de7,</div><div class='del'>-	0x0010, 0xa085, 0x0001, 0x0005, 0x0126, 0x0006, 0x00d6, 0x2091,</div><div class='del'>-	0x8000, 0x6080, 0xa06d, 0x01a0, 0x6800, 0x0006, 0x6837, 0x0103,</div><div class='del'>-	0x6b4a, 0x6847, 0x0000, 0x080c, 0x9f88, 0x0006, 0x6000, 0xd0fc,</div><div class='del'>-	0x0110, 0x080c, 0xb445, 0x000e, 0x080c, 0x547a, 0x000e, 0x0c50,</div><div class='del'>-	0x6083, 0x0000, 0x6087, 0x0000, 0x00de, 0x000e, 0x012e, 0x0005,</div><div class='del'>-	0x60a4, 0xa00d, 0x1118, 0xa085, 0x0001, 0x0005, 0x00e6, 0x2170,</div><div class='del'>-	0x7000, 0xa005, 0x1168, 0x20a9, 0x0010, 0xae88, 0x0004, 0x2104,</div><div class='del'>-	0xa606, 0x0130, 0x8108, 0x1f04, 0x524f, 0xa085, 0x0001, 0x0008,</div><div class='del'>-	0xa006, 0x00ee, 0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x60a4,</div><div class='del'>-	0xa06d, 0x1128, 0x080c, 0x15fd, 0x01a0, 0x2d00, 0x60a6, 0x6803,</div><div class='del'>-	0x0001, 0x6807, 0x0000, 0xad88, 0x0004, 0x20a9, 0x0010, 0x200b,</div><div class='del'>-	0xffff, 0x8108, 0x1f04, 0x526f, 0xa085, 0x0001, 0x012e, 0x00de,</div><div class='del'>-	0x0005, 0xa006, 0x0cd8, 0x00d6, 0x0126, 0x2091, 0x8000, 0x60a4,</div><div class='del'>-	0xa06d, 0x0130, 0x60a7, 0x0000, 0x080c, 0x1614, 0xa085, 0x0001,</div><div class='del'>-	0x012e, 0x00de, 0x0005, 0x60a8, 0xa00d, 0x1118, 0xa085, 0x0001,</div><div class='del'>-	0x0005, 0x00e6, 0x2170, 0x7050, 0xa005, 0x1160, 0x20a9, 0x0010,</div><div class='del'>-	0xae88, 0x0018, 0x2104, 0xa606, 0x0128, 0x8108, 0x1f04, 0x529a,</div><div class='del'>-	0xa085, 0x0001, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x0c19,</div><div class='del'>-	0x1188, 0x200b, 0xffff, 0x00d6, 0x60a8, 0x2068, 0x6854, 0xa08a,</div><div class='del'>-	0x0002, 0x0218, 0x8001, 0x6856, 0x0020, 0x080c, 0x1614, 0x60ab,</div><div class='del'>-	0x0000, 0x00de, 0x012e, 0x0005, 0x609c, 0xd0a4, 0x0005, 0x00f6,</div><div class='del'>-	0x080c, 0x5b41, 0x01b0, 0x71b8, 0x81ff, 0x1198, 0x71d4, 0xd19c,</div><div class='del'>-	0x0180, 0x2001, 0x007e, 0xa080, 0xb735, 0x2004, 0xa07d, 0x0148,</div><div class='del'>-	0x7804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1118, 0x7800, 0xc0ed,</div><div class='del'>-	0x7802, 0x2079, 0xb652, 0x7804, 0xd0a4, 0x01e8, 0x0156, 0x00c6,</div><div class='del'>-	0x20a9, 0x007f, 0x2009, 0x0000, 0x0016, 0x080c, 0x501b, 0x1168,</div><div class='del'>-	0x6004, 0xa084, 0xff00, 0x8007, 0xa096, 0x0004, 0x0118, 0xa086,</div><div class='del'>-	0x0006, 0x1118, 0x6000, 0xc0ed, 0x6002, 0x001e, 0x8108, 0x1f04,</div><div class='del'>-	0x52e4, 0x00ce, 0x015e, 0x080c, 0x537b, 0x0120, 0x2001, 0xb8b5,</div><div class='del'>-	0x200c, 0x0038, 0x2079, 0xb652, 0x7804, 0xd0a4, 0x0130, 0x2009,</div><div class='del'>-	0x07d0, 0x2011, 0x530f, 0x080c, 0x6a94, 0x00fe, 0x0005, 0x2011,</div><div class='del'>-	0x530f, 0x080c, 0x6a0e, 0x080c, 0x537b, 0x01f0, 0x2001, 0xb7b3,</div><div class='del'>-	0x2004, 0xa080, 0x0000, 0x200c, 0xc1ec, 0x2102, 0x2001, 0xb653,</div><div class='del'>-	0x2004, 0xd0a4, 0x0130, 0x2009, 0x07d0, 0x2011, 0x530f, 0x080c,</div><div class='del'>-	0x6a94, 0x00e6, 0x2071, 0xb600, 0x7073, 0x0000, 0x7077, 0x0000,</div><div class='del'>-	0x080c, 0x2aed, 0x00ee, 0x04b0, 0x0156, 0x00c6, 0x20a9, 0x007f,</div><div class='del'>-	0x2009, 0x0000, 0x0016, 0x080c, 0x501b, 0x1530, 0x6000, 0xd0ec,</div><div class='del'>-	0x0518, 0x0046, 0x62a0, 0xa294, 0x00ff, 0x8227, 0xa006, 0x2009,</div><div class='del'>-	0x0029, 0x080c, 0xb1a4, 0x6000, 0xc0e5, 0xc0ec, 0x6002, 0x6004,</div><div class='del'>-	0xa084, 0x00ff, 0xa085, 0x0700, 0x6006, 0x2019, 0x0029, 0x080c,</div><div class='del'>-	0x6e67, 0x0076, 0x2039, 0x0000, 0x080c, 0x6d74, 0x2009, 0x0000,</div><div class='del'>-	0x080c, 0xaf3e, 0x007e, 0x004e, 0x001e, 0x8108, 0x1f04, 0x533a,</div><div class='del'>-	0x00ce, 0x015e, 0x0005, 0x00c6, 0x6018, 0x2060, 0x6000, 0xc0ec,</div><div class='del'>-	0x6002, 0x00ce, 0x0005, 0x7818, 0x2004, 0xd0ac, 0x0005, 0x7818,</div><div class='del'>-	0x2004, 0xd0bc, 0x0005, 0x00f6, 0x2001, 0xb7b3, 0x2004, 0xa07d,</div><div class='del'>-	0x0110, 0x7800, 0xd0ec, 0x00fe, 0x0005, 0x0126, 0x0026, 0x2091,</div><div class='del'>-	0x8000, 0x0006, 0x62a0, 0xa290, 0xb735, 0x2204, 0xac06, 0x190c,</div><div class='del'>-	0x151a, 0x000e, 0x6200, 0xa005, 0x0110, 0xc2fd, 0x0008, 0xc2fc,</div><div class='del'>-	0x6202, 0x002e, 0x012e, 0x0005, 0x2011, 0xb635, 0x2204, 0xd0cc,</div><div class='del'>-	0x0138, 0x2001, 0xb8b3, 0x200c, 0x2011, 0x53a9, 0x080c, 0x6a94,</div><div class='del'>-	0x0005, 0x2011, 0x53a9, 0x080c, 0x6a0e, 0x2011, 0xb635, 0x2204,</div><div class='del'>-	0xc0cc, 0x2012, 0x0005, 0x2071, 0xb714, 0x7003, 0x0001, 0x7007,</div><div class='del'>-	0x0000, 0x7013, 0x0000, 0x7017, 0x0000, 0x701b, 0x0000, 0x701f,</div><div class='del'>-	0x0000, 0x700b, 0x0000, 0x704b, 0x0001, 0x704f, 0x0000, 0x705b,</div><div class='del'>-	0x0020, 0x705f, 0x0040, 0x707f, 0x0000, 0x2071, 0xb87d, 0x7003,</div><div class='del'>-	0xb714, 0x7007, 0x0000, 0x700b, 0x0000, 0x700f, 0xb85d, 0x7013,</div><div class='del'>-	0x0020, 0x7017, 0x0040, 0x7037, 0x0000, 0x0005, 0x0016, 0x00e6,</div><div class='del'>-	0x2071, 0xb835, 0xa00e, 0x7186, 0x718a, 0x7097, 0x0001, 0x2001,</div><div class='del'>-	0xb653, 0x2004, 0xd0fc, 0x1150, 0x2001, 0xb653, 0x2004, 0xa00e,</div><div class='del'>-	0xd09c, 0x0108, 0x8108, 0x7102, 0x0804, 0x5444, 0x2001, 0xb672,</div><div class='del'>-	0x200c, 0xa184, 0x000f, 0x2009, 0xb673, 0x210c, 0x0002, 0x53ec,</div><div class='del'>-	0x541f, 0x5426, 0x5430, 0x5435, 0x53ec, 0x53ec, 0x53ec, 0x540f,</div><div class='del'>-	0x53ec, 0x53ec, 0x53ec, 0x53ec, 0x53ec, 0x53ec, 0x53ec, 0x7003,</div><div class='del'>-	0x0004, 0x0136, 0x0146, 0x0156, 0x2099, 0xb676, 0x20a1, 0xb886,</div><div class='del'>-	0x20a9, 0x0004, 0x53a3, 0x015e, 0x014e, 0x013e, 0x0428, 0x708f,</div><div class='del'>-	0x0005, 0x7007, 0x0122, 0x2001, 0x0002, 0x0030, 0x708f, 0x0002,</div><div class='del'>-	0x7007, 0x0121, 0x2001, 0x0003, 0x7002, 0x7097, 0x0001, 0x0088,</div><div class='del'>-	0x7007, 0x0122, 0x2001, 0x0002, 0x0020, 0x7007, 0x0121, 0x2001,</div><div class='del'>-	0x0003, 0x7002, 0xa006, 0x7096, 0x708e, 0xa184, 0xff00, 0x8007,</div><div class='del'>-	0x709a, 0xa184, 0x00ff, 0x7092, 0x00ee, 0x001e, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0xb714, 0x684c, 0xa005, 0x1130, 0x7028, 0xc085, 0x702a,</div><div class='del'>-	0xa085, 0x0001, 0x0428, 0x6a60, 0x7236, 0x6b64, 0x733a, 0x6868,</div><div class='del'>-	0x703e, 0x7076, 0x686c, 0x7042, 0x707a, 0x684c, 0x702e, 0x6844,</div><div class='del'>-	0x7032, 0x2009, 0x000d, 0x200a, 0x700b, 0x0000, 0x8007, 0x8006,</div><div class='del'>-	0x8006, 0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100, 0xa319,</div><div class='del'>-	0x726e, 0x7372, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0xa006,</div><div class='del'>-	0x00ee, 0x0005, 0x0156, 0x00e6, 0x0026, 0x6838, 0xd0fc, 0x1904,</div><div class='del'>-	0x54d3, 0x6804, 0xa00d, 0x0188, 0x00d6, 0x2071, 0xb600, 0xa016,</div><div class='del'>-	0x702c, 0x2168, 0x6904, 0x206a, 0x8210, 0x2d00, 0x81ff, 0x1dc8,</div><div class='del'>-	0x702e, 0x70b4, 0xa200, 0x70b6, 0x00de, 0x2071, 0xb714, 0x701c,</div><div class='del'>-	0xa005, 0x1904, 0x54e3, 0x20a9, 0x0032, 0x0f04, 0x54e1, 0x0e04,</div><div class='del'>-	0x549d, 0x2071, 0xb835, 0x7200, 0x82ff, 0x05d8, 0x6934, 0xa186,</div><div class='del'>-	0x0103, 0x1904, 0x54f1, 0x6948, 0x6844, 0xa105, 0x1540, 0x2009,</div><div class='del'>-	0x8020, 0x2200, 0x0002, 0x54e1, 0x54b8, 0x5509, 0x5515, 0x54e1,</div><div class='del'>-	0x2071, 0x0000, 0x20a9, 0x0032, 0x0f04, 0x54e1, 0x7018, 0xd084,</div><div class='del'>-	0x1dd8, 0x7122, 0x683c, 0x7026, 0x6840, 0x702a, 0x701b, 0x0001,</div><div class='del'>-	0x2091, 0x4080, 0x2071, 0xb600, 0x702c, 0x206a, 0x2d00, 0x702e,</div><div class='del'>-	0x70b4, 0x8000, 0x70b6, 0x002e, 0x00ee, 0x015e, 0x0005, 0x6844,</div><div class='del'>-	0xa086, 0x0100, 0x1130, 0x6868, 0xa005, 0x1118, 0x2009, 0x8020,</div><div class='del'>-	0x0880, 0x2071, 0xb714, 0x2d08, 0x206b, 0x0000, 0x7010, 0x8000,</div><div class='del'>-	0x7012, 0x7018, 0xa06d, 0x711a, 0x0110, 0x6902, 0x0008, 0x711e,</div><div class='del'>-	0x0c10, 0xa18c, 0x00ff, 0xa186, 0x0017, 0x0130, 0xa186, 0x001e,</div><div class='del'>-	0x0118, 0xa18e, 0x001f, 0x1d28, 0x684c, 0xd0cc, 0x0d10, 0x6850,</div><div class='del'>-	0xa084, 0x00ff, 0xa086, 0x0001, 0x19e0, 0x2009, 0x8021, 0x0804,</div><div class='del'>-	0x54b1, 0x7084, 0x8008, 0xa092, 0x001e, 0x1a98, 0x7186, 0xae90,</div><div class='del'>-	0x0003, 0xa210, 0x683c, 0x2012, 0x0078, 0x7084, 0x8008, 0xa092,</div><div class='del'>-	0x000f, 0x1a38, 0x7186, 0xae90, 0x0003, 0x8003, 0xa210, 0x683c,</div><div class='del'>-	0x2012, 0x8210, 0x6840, 0x2012, 0x7088, 0xa10a, 0x0a04, 0x54ca,</div><div class='del'>-	0x718c, 0x7084, 0xa10a, 0x0a04, 0x54ca, 0x2071, 0x0000, 0x7018,</div><div class='del'>-	0xd084, 0x1904, 0x54ca, 0x2071, 0xb835, 0x7000, 0xa086, 0x0002,</div><div class='del'>-	0x1150, 0x080c, 0x5794, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091,</div><div class='del'>-	0x4080, 0x0804, 0x54ca, 0x080c, 0x57be, 0x2071, 0x0000, 0x701b,</div><div class='del'>-	0x0001, 0x2091, 0x4080, 0x0804, 0x54ca, 0x0006, 0x684c, 0x0006,</div><div class='del'>-	0x6837, 0x0103, 0x20a9, 0x001c, 0xad80, 0x0011, 0x20a0, 0x2001,</div><div class='del'>-	0x0000, 0x40a4, 0x000e, 0xa084, 0x00ff, 0x684e, 0x000e, 0x684a,</div><div class='del'>-	0x6952, 0x0005, 0x2071, 0xb714, 0x7004, 0x0002, 0x5570, 0x5581,</div><div class='del'>-	0x577f, 0x5780, 0x578d, 0x5793, 0x5571, 0x5770, 0x5706, 0x575c,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0x0e04, 0x5580, 0x2009, 0x000d,</div><div class='del'>-	0x7030, 0x200a, 0x2091, 0x4080, 0x7007, 0x0001, 0x700b, 0x0000,</div><div class='del'>-	0x012e, 0x2069, 0xb8f4, 0x683c, 0xa005, 0x03f8, 0x11f0, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2069, 0x0000, 0x6934, 0x2001, 0xb720, 0x2004,</div><div class='del'>-	0xa10a, 0x0170, 0x0e04, 0x55a4, 0x2069, 0x0000, 0x6818, 0xd084,</div><div class='del'>-	0x1158, 0x2009, 0x8040, 0x6922, 0x681b, 0x0001, 0x2091, 0x4080,</div><div class='del'>-	0x2069, 0xb8f4, 0x683f, 0xffff, 0x012e, 0x2069, 0xb600, 0x6848,</div><div class='del'>-	0x6968, 0xa102, 0x2069, 0xb835, 0x688a, 0x6984, 0x701c, 0xa06d,</div><div class='del'>-	0x0120, 0x81ff, 0x0904, 0x55fa, 0x00a0, 0x81ff, 0x0904, 0x56c0,</div><div class='del'>-	0x2071, 0xb835, 0x7184, 0x7088, 0xa10a, 0x1258, 0x7190, 0x2071,</div><div class='del'>-	0xb8f4, 0x7038, 0xa005, 0x0128, 0x1b04, 0x56c0, 0x713a, 0x0804,</div><div class='del'>-	0x56c0, 0x2071, 0xb835, 0x718c, 0x0126, 0x2091, 0x8000, 0x7084,</div><div class='del'>-	0xa10a, 0x0a04, 0x56db, 0x0e04, 0x567c, 0x2071, 0x0000, 0x7018,</div><div class='del'>-	0xd084, 0x1904, 0x567c, 0x2001, 0xffff, 0x2071, 0xb8f4, 0x703a,</div><div class='del'>-	0x2071, 0xb835, 0x7000, 0xa086, 0x0002, 0x1150, 0x080c, 0x5794,</div><div class='del'>-	0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0804, 0x567c,</div><div class='del'>-	0x080c, 0x57be, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080,</div><div class='del'>-	0x0804, 0x567c, 0x2071, 0xb835, 0x7000, 0xa005, 0x0904, 0x56a2,</div><div class='del'>-	0x6934, 0xa186, 0x0103, 0x1904, 0x567f, 0x684c, 0xd0bc, 0x1904,</div><div class='del'>-	0x56a2, 0x6948, 0x6844, 0xa105, 0x1904, 0x5697, 0x2009, 0x8020,</div><div class='del'>-	0x2071, 0xb835, 0x7000, 0x0002, 0x56a2, 0x5662, 0x563a, 0x564c,</div><div class='del'>-	0x5619, 0x0136, 0x0146, 0x0156, 0x2099, 0xb676, 0x20a1, 0xb886,</div><div class='del'>-	0x20a9, 0x0004, 0x53a3, 0x015e, 0x014e, 0x013e, 0x2071, 0xb87d,</div><div class='del'>-	0xad80, 0x000f, 0x700e, 0x7013, 0x0002, 0x7007, 0x0002, 0x700b,</div><div class='del'>-	0x0000, 0x2e10, 0x080c, 0x1648, 0x2071, 0xb714, 0x7007, 0x0009,</div><div class='del'>-	0x0804, 0x56c0, 0x7084, 0x8008, 0xa092, 0x001e, 0x1a04, 0x56c0,</div><div class='del'>-	0xae90, 0x0003, 0xa210, 0x683c, 0x2012, 0x7186, 0x2071, 0xb714,</div><div class='del'>-	0x080c, 0x5815, 0x0804, 0x56c0, 0x7084, 0x8008, 0xa092, 0x000f,</div><div class='del'>-	0x1a04, 0x56c0, 0xae90, 0x0003, 0x8003, 0xa210, 0x683c, 0x2012,</div><div class='del'>-	0x8210, 0x6840, 0x2012, 0x7186, 0x2071, 0xb714, 0x080c, 0x5815,</div><div class='del'>-	0x0804, 0x56c0, 0x0126, 0x2091, 0x8000, 0x0e04, 0x567c, 0x2071,</div><div class='del'>-	0x0000, 0x7018, 0xd084, 0x1180, 0x7122, 0x683c, 0x7026, 0x6840,</div><div class='del'>-	0x702a, 0x701b, 0x0001, 0x2091, 0x4080, 0x012e, 0x2071, 0xb714,</div><div class='del'>-	0x080c, 0x5815, 0x0804, 0x56c0, 0x012e, 0x0804, 0x56c0, 0xa18c,</div><div class='del'>-	0x00ff, 0xa186, 0x0017, 0x0130, 0xa186, 0x001e, 0x0118, 0xa18e,</div><div class='del'>-	0x001f, 0x11c0, 0x684c, 0xd0cc, 0x01a8, 0x6850, 0xa084, 0x00ff,</div><div class='del'>-	0xa086, 0x0001, 0x1178, 0x2009, 0x8021, 0x0804, 0x5610, 0x6844,</div><div class='del'>-	0xa086, 0x0100, 0x1138, 0x6868, 0xa005, 0x1120, 0x2009, 0x8020,</div><div class='del'>-	0x0804, 0x5610, 0x2071, 0xb714, 0x080c, 0x5827, 0x01c8, 0x2071,</div><div class='del'>-	0xb714, 0x700f, 0x0001, 0x6934, 0xa184, 0x00ff, 0xa086, 0x0003,</div><div class='del'>-	0x1130, 0x810f, 0xa18c, 0x00ff, 0x8101, 0x0108, 0x710e, 0x7007,</div><div class='del'>-	0x0003, 0x080c, 0x5840, 0x7050, 0xa086, 0x0100, 0x0904, 0x5780,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2071, 0xb714, 0x7008, 0xa086, 0x0001,</div><div class='del'>-	0x1180, 0x0e04, 0x56d9, 0x2009, 0x000d, 0x7030, 0x200a, 0x2091,</div><div class='del'>-	0x4080, 0x700b, 0x0000, 0x7004, 0xa086, 0x0006, 0x1110, 0x7007,</div><div class='del'>-	0x0001, 0x012e, 0x0005, 0x2071, 0xb714, 0x080c, 0x5827, 0x0518,</div><div class='del'>-	0x2071, 0xb835, 0x7084, 0x700a, 0x20a9, 0x0020, 0x2099, 0xb836,</div><div class='del'>-	0x20a1, 0xb85d, 0x53a3, 0x7087, 0x0000, 0x2071, 0xb714, 0x2069,</div><div class='del'>-	0xb87d, 0x706c, 0x6826, 0x7070, 0x682a, 0x7074, 0x682e, 0x7078,</div><div class='del'>-	0x6832, 0x2d10, 0x080c, 0x1648, 0x7007, 0x0008, 0x2001, 0xffff,</div><div class='del'>-	0x2071, 0xb8f4, 0x703a, 0x012e, 0x0804, 0x56c0, 0x2069, 0xb87d,</div><div class='del'>-	0x6808, 0xa08e, 0x0000, 0x0904, 0x575b, 0xa08e, 0x0200, 0x0904,</div><div class='del'>-	0x5759, 0xa08e, 0x0100, 0x1904, 0x575b, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0e04, 0x5757, 0x2069, 0x0000, 0x6818, 0xd084, 0x15c0, 0x702c,</div><div class='del'>-	0x7130, 0x8108, 0xa102, 0x0230, 0xa00e, 0x7034, 0x706e, 0x7038,</div><div class='del'>-	0x7072, 0x0048, 0x706c, 0xa080, 0x0040, 0x706e, 0x1220, 0x7070,</div><div class='del'>-	0xa081, 0x0000, 0x7072, 0x7132, 0x6936, 0x700b, 0x0000, 0x2001,</div><div class='del'>-	0xb85a, 0x2004, 0xa005, 0x1190, 0x6934, 0x2069, 0xb835, 0x689c,</div><div class='del'>-	0x699e, 0x2069, 0xb8f4, 0xa102, 0x1118, 0x683c, 0xa005, 0x1368,</div><div class='del'>-	0x2001, 0xb85b, 0x200c, 0x810d, 0x693e, 0x0038, 0x2009, 0x8040,</div><div class='del'>-	0x6922, 0x681b, 0x0001, 0x2091, 0x4080, 0x7007, 0x0001, 0x012e,</div><div class='del'>-	0x0010, 0x7007, 0x0005, 0x0005, 0x2001, 0xb87f, 0x2004, 0xa08e,</div><div class='del'>-	0x0100, 0x1128, 0x7007, 0x0001, 0x080c, 0x5815, 0x0005, 0xa08e,</div><div class='del'>-	0x0000, 0x0de0, 0xa08e, 0x0200, 0x1dc8, 0x7007, 0x0005, 0x0005,</div><div class='del'>-	0x701c, 0xa06d, 0x0158, 0x080c, 0x5827, 0x0140, 0x7007, 0x0003,</div><div class='del'>-	0x080c, 0x5840, 0x7050, 0xa086, 0x0100, 0x0110, 0x0005, 0x0005,</div><div class='del'>-	0x7050, 0xa09e, 0x0100, 0x1118, 0x7007, 0x0004, 0x0030, 0xa086,</div><div class='del'>-	0x0200, 0x1110, 0x7007, 0x0005, 0x0005, 0x080c, 0x57e3, 0x7006,</div><div class='del'>-	0x080c, 0x5815, 0x0005, 0x0005, 0x00e6, 0x0156, 0x2071, 0xb835,</div><div class='del'>-	0x7184, 0x81ff, 0x0500, 0xa006, 0x7086, 0xae80, 0x0003, 0x2071,</div><div class='del'>-	0x0000, 0x21a8, 0x2014, 0x7226, 0x8000, 0x0f04, 0x57b8, 0x2014,</div><div class='del'>-	0x722a, 0x8000, 0x0f04, 0x57b8, 0x2014, 0x722e, 0x8000, 0x0f04,</div><div class='del'>-	0x57b8, 0x2014, 0x723a, 0x8000, 0x0f04, 0x57b8, 0x2014, 0x723e,</div><div class='del'>-	0xa180, 0x8030, 0x7022, 0x015e, 0x00ee, 0x0005, 0x00e6, 0x0156,</div><div class='del'>-	0x2071, 0xb835, 0x7184, 0x81ff, 0x01d8, 0xa006, 0x7086, 0xae80,</div><div class='del'>-	0x0003, 0x2071, 0x0000, 0x21a8, 0x2014, 0x7226, 0x8000, 0x2014,</div><div class='del'>-	0x722a, 0x8000, 0x0f04, 0x57da, 0x2014, 0x723a, 0x8000, 0x2014,</div><div class='del'>-	0x723e, 0x0018, 0x2001, 0x8020, 0x0010, 0x2001, 0x8042, 0x7022,</div><div class='del'>-	0x015e, 0x00ee, 0x0005, 0x702c, 0x7130, 0x8108, 0xa102, 0x0230,</div><div class='del'>-	0xa00e, 0x7034, 0x706e, 0x7038, 0x7072, 0x0048, 0x706c, 0xa080,</div><div class='del'>-	0x0040, 0x706e, 0x1220, 0x7070, 0xa081, 0x0000, 0x7072, 0x7132,</div><div class='del'>-	0x700c, 0x8001, 0x700e, 0x1180, 0x0126, 0x2091, 0x8000, 0x0e04,</div><div class='del'>-	0x580f, 0x2001, 0x000d, 0x2102, 0x2091, 0x4080, 0x2001, 0x0001,</div><div class='del'>-	0x700b, 0x0000, 0x012e, 0x0005, 0x2001, 0x0007, 0x0005, 0x2001,</div><div class='del'>-	0x0006, 0x700b, 0x0001, 0x012e, 0x0005, 0x701c, 0xa06d, 0x0170,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x7010, 0x8001, 0x7012, 0x2d04, 0x701e,</div><div class='del'>-	0xa005, 0x1108, 0x701a, 0x012e, 0x080c, 0x1614, 0x0005, 0x2019,</div><div class='del'>-	0x000d, 0x2304, 0x230c, 0xa10e, 0x0130, 0x2304, 0x230c, 0xa10e,</div><div class='del'>-	0x0110, 0xa006, 0x0060, 0x732c, 0x8319, 0x7130, 0xa102, 0x1118,</div><div class='del'>-	0x2300, 0xa005, 0x0020, 0x0210, 0xa302, 0x0008, 0x8002, 0x0005,</div><div class='del'>-	0x2d00, 0x7026, 0xa080, 0x000d, 0x7056, 0x7053, 0x0000, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2009, 0xb913, 0x2104, 0xc08d, 0x200a, 0x012e,</div><div class='del'>-	0x080c, 0x1664, 0x0005, 0x708c, 0xa08a, 0x0029, 0x1220, 0xa082,</div><div class='del'>-	0x001d, 0x0033, 0x0010, 0x080c, 0x151a, 0x6027, 0x1e00, 0x0005,</div><div class='del'>-	0x594e, 0x58c9, 0x58e1, 0x591e, 0x593f, 0x5979, 0x598b, 0x58e1,</div><div class='del'>-	0x5965, 0x586d, 0x589b, 0x586c, 0x0005, 0x00d6, 0x2069, 0x0200,</div><div class='del'>-	0x6804, 0xa005, 0x1180, 0x6808, 0xa005, 0x1518, 0x708f, 0x0028,</div><div class='del'>-	0x2069, 0xb8c6, 0x2d04, 0x7002, 0x080c, 0x5c43, 0x6028, 0xa085,</div><div class='del'>-	0x0600, 0x602a, 0x00b0, 0x708f, 0x0028, 0x2069, 0xb8c6, 0x2d04,</div><div class='del'>-	0x7002, 0x6028, 0xa085, 0x0600, 0x602a, 0x00e6, 0x0036, 0x0046,</div><div class='del'>-	0x0056, 0x2071, 0xb924, 0x080c, 0x1e1a, 0x005e, 0x004e, 0x003e,</div><div class='del'>-	0x00ee, 0x00de, 0x0005, 0x00d6, 0x2069, 0x0200, 0x6804, 0xa005,</div><div class='del'>-	0x1180, 0x6808, 0xa005, 0x1518, 0x708f, 0x0028, 0x2069, 0xb8c6,</div><div class='del'>-	0x2d04, 0x7002, 0x080c, 0x5cd0, 0x6028, 0xa085, 0x0600, 0x602a,</div><div class='del'>-	0x00b0, 0x708f, 0x0028, 0x2069, 0xb8c6, 0x2d04, 0x7002, 0x6028,</div><div class='del'>-	0xa085, 0x0600, 0x602a, 0x00e6, 0x0036, 0x0046, 0x0056, 0x2071,</div><div class='del'>-	0xb924, 0x080c, 0x1e1a, 0x005e, 0x004e, 0x003e, 0x00ee, 0x00de,</div><div class='del'>-	0x0005, 0x6803, 0x0090, 0x6124, 0xd1e4, 0x1190, 0x080c, 0x59f6,</div><div class='del'>-	0xd1d4, 0x1160, 0xd1dc, 0x1138, 0xd1cc, 0x0150, 0x708f, 0x0020,</div><div class='del'>-	0x080c, 0x59f6, 0x0028, 0x708f, 0x001d, 0x0010, 0x708f, 0x001f,</div><div class='del'>-	0x0005, 0x6803, 0x0088, 0x6124, 0xd1cc, 0x1590, 0xd1dc, 0x1568,</div><div class='del'>-	0xd1e4, 0x1540, 0xa184, 0x1e00, 0x1580, 0x60e3, 0x0001, 0x600c,</div><div class='del'>-	0xc0b4, 0x600e, 0x080c, 0x5b71, 0x080c, 0x24e5, 0x0156, 0x6803,</div><div class='del'>-	0x0100, 0x20a9, 0x0014, 0x6804, 0xd0dc, 0x1118, 0x1f04, 0x58fb,</div><div class='del'>-	0x0048, 0x20a9, 0x0014, 0x6803, 0x0080, 0x6804, 0xd0d4, 0x1130,</div><div class='del'>-	0x1f04, 0x5905, 0x080c, 0x5b92, 0x015e, 0x0078, 0x015e, 0x708f,</div><div class='del'>-	0x0028, 0x0058, 0x708f, 0x001e, 0x0040, 0x708f, 0x001d, 0x0028,</div><div class='del'>-	0x708f, 0x0020, 0x0010, 0x708f, 0x001f, 0x0005, 0x60e3, 0x0001,</div><div class='del'>-	0x600c, 0xc0b4, 0x600e, 0x080c, 0x5b71, 0x080c, 0x24e5, 0x6803,</div><div class='del'>-	0x0080, 0x6124, 0xd1d4, 0x1180, 0xd1dc, 0x1158, 0xd1e4, 0x1130,</div><div class='del'>-	0xa184, 0x1e00, 0x1158, 0x708f, 0x0028, 0x0040, 0x708f, 0x001e,</div><div class='del'>-	0x0028, 0x708f, 0x001d, 0x0010, 0x708f, 0x001f, 0x0005, 0x6803,</div><div class='del'>-	0x00a0, 0x6124, 0xd1dc, 0x1138, 0xd1e4, 0x0138, 0x080c, 0x1e63,</div><div class='del'>-	0x708f, 0x001e, 0x0010, 0x708f, 0x001d, 0x0005, 0x080c, 0x5a68,</div><div class='del'>-	0x6124, 0xd1dc, 0x1188, 0x080c, 0x59f6, 0x0016, 0x080c, 0x1e63,</div><div class='del'>-	0x001e, 0xd1d4, 0x1128, 0xd1e4, 0x0138, 0x708f, 0x001e, 0x0020,</div><div class='del'>-	0x708f, 0x001f, 0x080c, 0x59f6, 0x0005, 0x6803, 0x00a0, 0x6124,</div><div class='del'>-	0xd1d4, 0x1160, 0xd1cc, 0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0140,</div><div class='del'>-	0x708f, 0x001e, 0x0028, 0x708f, 0x001d, 0x0010, 0x708f, 0x0021,</div><div class='del'>-	0x0005, 0x080c, 0x5a68, 0x6124, 0xd1d4, 0x1150, 0xd1dc, 0x1128,</div><div class='del'>-	0xd1e4, 0x0140, 0x708f, 0x001e, 0x0028, 0x708f, 0x001d, 0x0010,</div><div class='del'>-	0x708f, 0x001f, 0x0005, 0x6803, 0x0090, 0x6124, 0xd1d4, 0x1178,</div><div class='del'>-	0xd1cc, 0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0158, 0x708f, 0x001e,</div><div class='del'>-	0x0040, 0x708f, 0x001d, 0x0028, 0x708f, 0x0020, 0x0010, 0x708f,</div><div class='del'>-	0x001f, 0x0005, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x0126, 0x2061,</div><div class='del'>-	0x0100, 0x2069, 0x0140, 0x2071, 0xb600, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x5b41, 0x11e8, 0x2001, 0xb60c, 0x200c, 0xd1b4, 0x01c0, 0xc1b4,</div><div class='del'>-	0x2102, 0x6027, 0x0200, 0xe000, 0xe000, 0x6024, 0xd0cc, 0x0158,</div><div class='del'>-	0x6803, 0x00a0, 0x2001, 0xb89f, 0x2003, 0x0001, 0x2001, 0xb600,</div><div class='del'>-	0x2003, 0x0001, 0x0428, 0x6028, 0xc0cd, 0x602a, 0x0408, 0x080c,</div><div class='del'>-	0x5b5d, 0x0150, 0x080c, 0x5b53, 0x1138, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x27f8, 0x080c, 0x5b18, 0x00a0, 0x080c, 0x5a65, 0x0178, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0x27f8, 0x708c, 0xa086, 0x001e, 0x0120, 0x708c,</div><div class='del'>-	0xa086, 0x0022, 0x1118, 0x708f, 0x0025, 0x0010, 0x708f, 0x0021,</div><div class='del'>-	0x012e, 0x00ee, 0x00de, 0x00ce, 0x001e, 0x0005, 0x0026, 0x2011,</div><div class='del'>-	0x5a07, 0x080c, 0x6ace, 0x002e, 0x0016, 0x0026, 0x2009, 0x0064,</div><div class='del'>-	0x2011, 0x5a07, 0x080c, 0x6ac5, 0x002e, 0x001e, 0x0005, 0x00e6,</div><div class='del'>-	0x00f6, 0x0016, 0x080c, 0x7df3, 0x2071, 0xb600, 0x080c, 0x59a2,</div><div class='del'>-	0x001e, 0x00fe, 0x00ee, 0x0005, 0x0016, 0x0026, 0x0036, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x00f6, 0x0126, 0x080c, 0x7df3, 0x2061, 0x0100,</div><div class='del'>-	0x2069, 0x0140, 0x2071, 0xb600, 0x2091, 0x8000, 0x6028, 0xc09c,</div><div class='del'>-	0x602a, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0x8106, 0x080c, 0x7fe0, 0x080c, 0x6a82, 0x0036, 0x2019, 0x0000,</div><div class='del'>-	0x080c, 0x806b, 0x003e, 0x60e3, 0x0000, 0x080c, 0xb4eb, 0x080c,</div><div class='del'>-	0xb506, 0x2001, 0xb600, 0x2003, 0x0004, 0x6027, 0x0008, 0x080c,</div><div class='del'>-	0x12e2, 0x2001, 0x0001, 0x080c, 0x27f8, 0x012e, 0x00fe, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x0005, 0x2001, 0xb600,</div><div class='del'>-	0x2004, 0xa086, 0x0004, 0x0140, 0x2001, 0xb89e, 0x2003, 0xaaaa,</div><div class='del'>-	0x2001, 0xb89f, 0x2003, 0x0000, 0x0005, 0x6020, 0xd09c, 0x0005,</div><div class='del'>-	0x6800, 0xa086, 0x00c0, 0x0160, 0x6803, 0x00c0, 0x0156, 0x20a9,</div><div class='del'>-	0x002d, 0x1d04, 0x5a71, 0x2091, 0x6000, 0x1f04, 0x5a71, 0x015e,</div><div class='del'>-	0x0005, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140,</div><div class='del'>-	0x2071, 0xb600, 0x2001, 0xb89f, 0x200c, 0xa186, 0x0000, 0x0158,</div><div class='del'>-	0xa186, 0x0001, 0x0158, 0xa186, 0x0002, 0x0158, 0xa186, 0x0003,</div><div class='del'>-	0x0158, 0x0804, 0x5b06, 0x708f, 0x0022, 0x0040, 0x708f, 0x0021,</div><div class='del'>-	0x0028, 0x708f, 0x0023, 0x0020, 0x708f, 0x0024, 0x6043, 0x0000,</div><div class='del'>-	0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001, 0x080c, 0x28a7,</div><div class='del'>-	0x0026, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0x8106, 0x080c, 0x7fe0, 0x0036, 0x2019, 0x0000, 0x080c, 0x806b,</div><div class='del'>-	0x003e, 0x002e, 0x7000, 0xa08e, 0x0004, 0x0118, 0x602b, 0x0028,</div><div class='del'>-	0x0010, 0x602b, 0x0020, 0x0156, 0x0126, 0x2091, 0x8000, 0x20a9,</div><div class='del'>-	0x0005, 0x6024, 0xd0ac, 0x0120, 0x012e, 0x015e, 0x0804, 0x5b14,</div><div class='del'>-	0x6800, 0xa084, 0x00a0, 0xc0bd, 0x6802, 0x6904, 0xd1d4, 0x1130,</div><div class='del'>-	0x6803, 0x0100, 0x1f04, 0x5ac9, 0x080c, 0x5b92, 0x012e, 0x015e,</div><div class='del'>-	0x080c, 0x5b53, 0x01a8, 0x6044, 0xa005, 0x0168, 0x6050, 0x0006,</div><div class='del'>-	0xa085, 0x0020, 0x6052, 0x080c, 0x5b92, 0xa006, 0x8001, 0x1df0,</div><div class='del'>-	0x000e, 0x6052, 0x0028, 0x6804, 0xd0d4, 0x1110, 0x080c, 0x5b92,</div><div class='del'>-	0x0016, 0x0026, 0x2009, 0x00c8, 0x2011, 0x5a14, 0x080c, 0x6a94,</div><div class='del'>-	0x002e, 0x001e, 0x2001, 0xb89f, 0x2003, 0x0004, 0x080c, 0x5853,</div><div class='del'>-	0x080c, 0x5b53, 0x0148, 0x6804, 0xd0d4, 0x1130, 0xd0dc, 0x1100,</div><div class='del'>-	0x2001, 0xb89f, 0x2003, 0x0000, 0x00ee, 0x00de, 0x00ce, 0x0005,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071,</div><div class='del'>-	0xb600, 0x2001, 0xb89e, 0x2003, 0x0000, 0x2001, 0xb88f, 0x2003,</div><div class='del'>-	0x0000, 0x708f, 0x0000, 0x60e3, 0x0000, 0x6887, 0x0000, 0x2001,</div><div class='del'>-	0x0000, 0x080c, 0x28a7, 0x6803, 0x0000, 0x6043, 0x0090, 0x6043,</div><div class='del'>-	0x0010, 0x6027, 0xffff, 0x602b, 0x182f, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x0005, 0x0006, 0x2001, 0xb89e, 0x2004, 0xa086, 0xaaaa, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x2001, 0xb672, 0x2004, 0xa084, 0x0030, 0xa086,</div><div class='del'>-	0x0000, 0x000e, 0x0005, 0x0006, 0x2001, 0xb672, 0x2004, 0xa084,</div><div class='del'>-	0x0030, 0xa086, 0x0030, 0x000e, 0x0005, 0x0006, 0x2001, 0xb672,</div><div class='del'>-	0x2004, 0xa084, 0x0030, 0xa086, 0x0010, 0x000e, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0xb672, 0x2004, 0xa084, 0x0030, 0xa086, 0x0020, 0x000e,</div><div class='del'>-	0x0005, 0x2001, 0xb60c, 0x2004, 0xd0a4, 0x0170, 0x080c, 0x28c7,</div><div class='del'>-	0x0036, 0x0016, 0x2009, 0x0000, 0x2019, 0x0028, 0x080c, 0x2ca4,</div><div class='del'>-	0x001e, 0x003e, 0xa006, 0x0009, 0x0005, 0x00e6, 0x2071, 0xb60c,</div><div class='del'>-	0x2e04, 0x0118, 0xa085, 0x0010, 0x0010, 0xa084, 0xffef, 0x2072,</div><div class='del'>-	0x00ee, 0x0005, 0x6050, 0x0006, 0x60f0, 0x0006, 0x60ec, 0x0006,</div><div class='del'>-	0x600c, 0x0006, 0x6004, 0x0006, 0x6028, 0x0006, 0x602f, 0x0100,</div><div class='del'>-	0x602f, 0x0000, 0x602f, 0x0040, 0x602f, 0x0000, 0x000e, 0x602a,</div><div class='del'>-	0x000e, 0x6006, 0x000e, 0x600e, 0x000e, 0x60ee, 0x000e, 0x60f2,</div><div class='del'>-	0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001, 0x080c, 0x28a7,</div><div class='del'>-	0x6800, 0xa084, 0x00a0, 0xc0bd, 0x6802, 0x6803, 0x00a0, 0x000e,</div><div class='del'>-	0x6052, 0x6050, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071, 0xb600,</div><div class='del'>-	0x6020, 0xa084, 0x0080, 0x0138, 0x2001, 0xb60c, 0x200c, 0xc1bd,</div><div class='del'>-	0x2102, 0x0804, 0x5c3b, 0x2001, 0xb60c, 0x200c, 0xc1bc, 0x2102,</div><div class='del'>-	0x6028, 0xa084, 0xe1ff, 0x602a, 0x6027, 0x0200, 0x6803, 0x0090,</div><div class='del'>-	0x20a9, 0x0384, 0x6024, 0xd0cc, 0x1508, 0x1d04, 0x5bea, 0x2091,</div><div class='del'>-	0x6000, 0x1f04, 0x5bea, 0x2011, 0x0003, 0x080c, 0x80fc, 0x2011,</div><div class='del'>-	0x0002, 0x080c, 0x8106, 0x080c, 0x7fe0, 0x2019, 0x0000, 0x080c,</div><div class='del'>-	0x806b, 0x6803, 0x00a0, 0x2001, 0xb89f, 0x2003, 0x0001, 0x2001,</div><div class='del'>-	0xb600, 0x2003, 0x0001, 0xa085, 0x0001, 0x0468, 0x86ff, 0x1120,</div><div class='del'>-	0x080c, 0x1e63, 0x080c, 0x24e5, 0x60e3, 0x0000, 0x2001, 0xb88f,</div><div class='del'>-	0x2004, 0x080c, 0x28a7, 0x60e2, 0x6803, 0x0080, 0x20a9, 0x0384,</div><div class='del'>-	0x6027, 0x1e00, 0x2009, 0x1e00, 0xe000, 0x6024, 0xa10c, 0x0138,</div><div class='del'>-	0x1d04, 0x5c20, 0x2091, 0x6000, 0x1f04, 0x5c20, 0x0820, 0x6028,</div><div class='del'>-	0xa085, 0x1e00, 0x602a, 0x70a4, 0xa005, 0x1118, 0x6887, 0x0001,</div><div class='del'>-	0x0008, 0x6886, 0xa006, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x2061, 0x0100, 0x2071, 0xb600, 0x2069, 0x0140,</div><div class='del'>-	0x6020, 0xa084, 0x00c0, 0x0120, 0x6884, 0xa005, 0x1904, 0x5c97,</div><div class='del'>-	0x6803, 0x0088, 0x60e3, 0x0000, 0x6887, 0x0000, 0x2001, 0x0000,</div><div class='del'>-	0x080c, 0x28a7, 0x2069, 0x0200, 0x6804, 0xa005, 0x1118, 0x6808,</div><div class='del'>-	0xa005, 0x01c0, 0x6028, 0xa084, 0xfbff, 0x602a, 0x6027, 0x0400,</div><div class='del'>-	0x2069, 0xb8c6, 0x7000, 0x206a, 0x708f, 0x0026, 0x7003, 0x0001,</div><div class='del'>-	0x20a9, 0x0002, 0x1d04, 0x5c7a, 0x2091, 0x6000, 0x1f04, 0x5c7a,</div><div class='del'>-	0x0804, 0x5cc8, 0x2069, 0x0140, 0x20a9, 0x0384, 0x6027, 0x1e00,</div><div class='del'>-	0x2009, 0x1e00, 0xe000, 0x6024, 0xa10c, 0x0520, 0xa084, 0x1a00,</div><div class='del'>-	0x1508, 0x1d04, 0x5c86, 0x2091, 0x6000, 0x1f04, 0x5c86, 0x2011,</div><div class='del'>-	0x0003, 0x080c, 0x80fc, 0x2011, 0x0002, 0x080c, 0x8106, 0x080c,</div><div class='del'>-	0x7fe0, 0x2019, 0x0000, 0x080c, 0x806b, 0x6803, 0x00a0, 0x2001,</div><div class='del'>-	0xb89f, 0x2003, 0x0001, 0x2001, 0xb600, 0x2003, 0x0001, 0xa085,</div><div class='del'>-	0x0001, 0x00b0, 0x080c, 0x24e5, 0x6803, 0x0080, 0x2069, 0x0140,</div><div class='del'>-	0x60e3, 0x0000, 0x70a4, 0xa005, 0x1118, 0x6887, 0x0001, 0x0008,</div><div class='del'>-	0x6886, 0x2001, 0xb88f, 0x2004, 0x080c, 0x28a7, 0x60e2, 0xa006,</div><div class='del'>-	0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005,</div><div class='del'>-	0x0156, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0xb600, 0x6020, 0xa084, 0x00c0, 0x01e0, 0x2011,</div><div class='del'>-	0x0003, 0x080c, 0x80fc, 0x2011, 0x0002, 0x080c, 0x8106, 0x080c,</div><div class='del'>-	0x7fe0, 0x2019, 0x0000, 0x080c, 0x806b, 0x2069, 0x0140, 0x6803,</div><div class='del'>-	0x00a0, 0x2001, 0xb89f, 0x2003, 0x0001, 0x2001, 0xb600, 0x2003,</div><div class='del'>-	0x0001, 0x0804, 0x5d6d, 0x2001, 0xb60c, 0x200c, 0xd1b4, 0x1160,</div><div class='del'>-	0xc1b5, 0x2102, 0x080c, 0x59fc, 0x2069, 0x0140, 0x080c, 0x24e5,</div><div class='del'>-	0x6803, 0x0080, 0x60e3, 0x0000, 0x2069, 0x0200, 0x6804, 0xa005,</div><div class='del'>-	0x1118, 0x6808, 0xa005, 0x01c0, 0x6028, 0xa084, 0xfdff, 0x602a,</div><div class='del'>-	0x6027, 0x0200, 0x2069, 0xb8c6, 0x7000, 0x206a, 0x708f, 0x0027,</div><div class='del'>-	0x7003, 0x0001, 0x20a9, 0x0002, 0x1d04, 0x5d24, 0x2091, 0x6000,</div><div class='del'>-	0x1f04, 0x5d24, 0x0804, 0x5d6d, 0x6027, 0x1e00, 0x2009, 0x1e00,</div><div class='del'>-	0xe000, 0x6024, 0xa10c, 0x01c8, 0xa084, 0x1c00, 0x11b0, 0x1d04,</div><div class='del'>-	0x5d2c, 0x0006, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x080c, 0x696b,</div><div class='del'>-	0x00ee, 0x00de, 0x00ce, 0x001e, 0x000e, 0x00e6, 0x2071, 0xb8f4,</div><div class='del'>-	0x7018, 0x00ee, 0xa005, 0x1d00, 0x0500, 0x0026, 0x2011, 0x5a14,</div><div class='del'>-	0x080c, 0x6a0e, 0x2011, 0x5a07, 0x080c, 0x6ace, 0x002e, 0x2069,</div><div class='del'>-	0x0140, 0x60e3, 0x0000, 0x70a4, 0xa005, 0x1118, 0x6887, 0x0001,</div><div class='del'>-	0x0008, 0x6886, 0x2001, 0xb88f, 0x2004, 0x080c, 0x28a7, 0x60e2,</div><div class='del'>-	0x2001, 0xb60c, 0x200c, 0xc1b4, 0x2102, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x0046, 0x00c6, 0x00e6, 0x2061, 0x0100, 0x2071, 0xb600,</div><div class='del'>-	0x7130, 0xd184, 0x1180, 0x2011, 0xb653, 0x2214, 0xd2ec, 0x0138,</div><div class='del'>-	0xc18d, 0x7132, 0x2011, 0xb653, 0x2214, 0xd2ac, 0x1120, 0x7030,</div><div class='del'>-	0xd08c, 0x0904, 0x5dda, 0x7130, 0xc185, 0x7132, 0x2011, 0xb653,</div><div class='del'>-	0x220c, 0xd1a4, 0x0530, 0x0016, 0x2019, 0x000e, 0x080c, 0xb121,</div><div class='del'>-	0x0156, 0x20a9, 0x007f, 0x2009, 0x0000, 0xa186, 0x007e, 0x01a0,</div><div class='del'>-	0xa186, 0x0080, 0x0188, 0x080c, 0x501b, 0x1170, 0x8127, 0xa006,</div><div class='del'>-	0x0016, 0x2009, 0x000e, 0x080c, 0xb1a4, 0x2009, 0x0001, 0x2011,</div><div class='del'>-	0x0100, 0x080c, 0x6b8c, 0x001e, 0x8108, 0x1f04, 0x5da5, 0x015e,</div><div class='del'>-	0x001e, 0xd1ac, 0x1148, 0x0016, 0x2009, 0x0000, 0x2019, 0x0004,</div><div class='del'>-	0x080c, 0x2ca4, 0x001e, 0x0070, 0x0156, 0x20a9, 0x007f, 0x2009,</div><div class='del'>-	0x0000, 0x080c, 0x501b, 0x1110, 0x080c, 0x4c7e, 0x8108, 0x1f04,</div><div class='del'>-	0x5dd1, 0x015e, 0x080c, 0x1e63, 0x2011, 0x0003, 0x080c, 0x80fc,</div><div class='del'>-	0x2011, 0x0002, 0x080c, 0x8106, 0x080c, 0x7fe0, 0x0036, 0x2019,</div><div class='del'>-	0x0000, 0x080c, 0x806b, 0x003e, 0x60e3, 0x0000, 0x2001, 0xb600,</div><div class='del'>-	0x2003, 0x0001, 0x080c, 0x5a79, 0x00ee, 0x00ce, 0x004e, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x015e, 0x0005, 0x2071, 0xb6e2, 0x7003, 0x0000,</div><div class='del'>-	0x7007, 0x0000, 0x700f, 0x0000, 0x702b, 0x0001, 0x704f, 0x0000,</div><div class='del'>-	0x7053, 0x0001, 0x705f, 0x0020, 0x7063, 0x0040, 0x7083, 0x0000,</div><div class='del'>-	0x708b, 0x0000, 0x708f, 0x0001, 0x70bf, 0x0000, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0xb6e2, 0x6848, 0xa005, 0x1130, 0x7028, 0xc085, 0x702a,</div><div class='del'>-	0xa085, 0x0001, 0x0428, 0x6a50, 0x7236, 0x6b54, 0x733a, 0x6858,</div><div class='del'>-	0x703e, 0x707a, 0x685c, 0x7042, 0x707e, 0x6848, 0x702e, 0x6840,</div><div class='del'>-	0x7032, 0x2009, 0x000c, 0x200a, 0x8007, 0x8006, 0x8006, 0xa08c,</div><div class='del'>-	0x003f, 0xa084, 0xffc0, 0xa210, 0x2100, 0xa319, 0x7272, 0x7376,</div><div class='del'>-	0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0x700f, 0x0000, 0xa006,</div><div class='del'>-	0x00ee, 0x0005, 0x2b78, 0x2071, 0xb6e2, 0x7004, 0x0043, 0x700c,</div><div class='del'>-	0x0002, 0x5e56, 0x5e4d, 0x5e4d, 0x5e4d, 0x5e4d, 0x0005, 0x5eac,</div><div class='del'>-	0x5ead, 0x5edf, 0x5ee0, 0x5eaa, 0x5f2e, 0x5f33, 0x5f64, 0x5f65,</div><div class='del'>-	0x5f80, 0x5f81, 0x5f82, 0x5f83, 0x5f84, 0x5f85, 0x603b, 0x6062,</div><div class='del'>-	0x700c, 0x0002, 0x5e6f, 0x5eaa, 0x5eaa, 0x5eab, 0x5eab, 0x7830,</div><div class='del'>-	0x7930, 0xa106, 0x0120, 0x7830, 0x7930, 0xa106, 0x1510, 0x7030,</div><div class='del'>-	0xa10a, 0x01f8, 0x1210, 0x712c, 0xa10a, 0xa18a, 0x0002, 0x12d0,</div><div class='del'>-	0x080c, 0x15e4, 0x01b0, 0x2d00, 0x705a, 0x7063, 0x0040, 0x2001,</div><div class='del'>-	0x0003, 0x7057, 0x0000, 0x0126, 0x0006, 0x2091, 0x8000, 0x2009,</div><div class='del'>-	0xb913, 0x2104, 0xc085, 0x200a, 0x000e, 0x700e, 0x012e, 0x080c,</div><div class='del'>-	0x1664, 0x0005, 0x080c, 0x15e4, 0x0de0, 0x2d00, 0x705a, 0x080c,</div><div class='del'>-	0x15e4, 0x1108, 0x0c10, 0x2d00, 0x7086, 0x7063, 0x0080, 0x2001,</div><div class='del'>-	0x0004, 0x08f8, 0x0005, 0x0005, 0x0005, 0x700c, 0x0002, 0x5eb4,</div><div class='del'>-	0x5eb7, 0x5ec5, 0x5ede, 0x5ede, 0x080c, 0x5e68, 0x0005, 0x0126,</div><div class='del'>-	0x8001, 0x700e, 0x7058, 0x0006, 0x080c, 0x63b5, 0x0120, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x5e68, 0x00de, 0x0048, 0x0126, 0x8001, 0x700e,</div><div class='del'>-	0x080c, 0x63b5, 0x7058, 0x2068, 0x7084, 0x705a, 0x6803, 0x0000,</div><div class='del'>-	0x6807, 0x0000, 0x6834, 0xa084, 0x00ff, 0xa08a, 0x003a, 0x1218,</div><div class='del'>-	0x00db, 0x012e, 0x0005, 0x012e, 0x080c, 0x5f86, 0x0005, 0x0005,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0xb6e2, 0x700c, 0x0002, 0x5eeb, 0x5eeb,</div><div class='del'>-	0x5eeb, 0x5eed, 0x5ef0, 0x00ee, 0x0005, 0x700f, 0x0001, 0x0010,</div><div class='del'>-	0x700f, 0x0002, 0x00ee, 0x0005, 0x5f86, 0x5f86, 0x5fa2, 0x5f86,</div><div class='del'>-	0x611f, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5fa2, 0x6161,</div><div class='del'>-	0x61a4, 0x61ed, 0x6201, 0x5f86, 0x5f86, 0x5fbe, 0x5fa2, 0x5f86,</div><div class='del'>-	0x5f86, 0x6018, 0x62ad, 0x62c8, 0x5f86, 0x5fbe, 0x5f86, 0x5f86,</div><div class='del'>-	0x5f86, 0x5f86, 0x600e, 0x62c8, 0x5f86, 0x5f86, 0x5f86, 0x5f86,</div><div class='del'>-	0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5fd2, 0x5f86, 0x5f86,</div><div class='del'>-	0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x63d3,</div><div class='del'>-	0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5f86, 0x5fe7, 0x7020, 0x2068,</div><div class='del'>-	0x080c, 0x1614, 0x0005, 0x700c, 0x0002, 0x5f3a, 0x5f3d, 0x5f4b,</div><div class='del'>-	0x5f63, 0x5f63, 0x080c, 0x5e68, 0x0005, 0x0126, 0x8001, 0x700e,</div><div class='del'>-	0x7058, 0x0006, 0x080c, 0x63b5, 0x0120, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x5e68, 0x00de, 0x0048, 0x0126, 0x8001, 0x700e, 0x080c, 0x63b5,</div><div class='del'>-	0x7058, 0x2068, 0x7084, 0x705a, 0x6803, 0x0000, 0x6807, 0x0000,</div><div class='del'>-	0x6834, 0xa084, 0x00ff, 0xa08a, 0x001a, 0x1218, 0x003b, 0x012e,</div><div class='del'>-	0x0005, 0x012e, 0x0419, 0x0005, 0x0005, 0x0005, 0x5f86, 0x5fa2,</div><div class='del'>-	0x610b, 0x5f86, 0x5fa2, 0x5f86, 0x5fa2, 0x5fa2, 0x5f86, 0x5fa2,</div><div class='del'>-	0x610b, 0x5fa2, 0x5fa2, 0x5fa2, 0x5fa2, 0x5fa2, 0x5f86, 0x5fa2,</div><div class='del'>-	0x610b, 0x5f86, 0x5f86, 0x5fa2, 0x5f86, 0x5f86, 0x5f86, 0x5fa2,</div><div class='del'>-	0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x7007, 0x0001,</div><div class='del'>-	0x6838, 0xa084, 0x00ff, 0xc0d5, 0x683a, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x547a, 0x012e, 0x0005, 0x7007, 0x0001, 0x6838, 0xa084,</div><div class='del'>-	0x00ff, 0xc0e5, 0x683a, 0x0126, 0x2091, 0x8000, 0x080c, 0x547a,</div><div class='del'>-	0x012e, 0x0005, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff, 0xc0ed,</div><div class='del'>-	0x683a, 0x0126, 0x2091, 0x8000, 0x080c, 0x547a, 0x012e, 0x0005,</div><div class='del'>-	0x7007, 0x0001, 0x6838, 0xa084, 0x00ff, 0xc0dd, 0x683a, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x547a, 0x012e, 0x0005, 0x6834, 0x8007,</div><div class='del'>-	0xa084, 0x00ff, 0x0988, 0x8001, 0x1120, 0x7007, 0x0001, 0x0804,</div><div class='del'>-	0x60cb, 0x7007, 0x0006, 0x7012, 0x2d00, 0x7016, 0x701a, 0x704b,</div><div class='del'>-	0x60cb, 0x0005, 0x6834, 0x8007, 0xa084, 0x00ff, 0x0904, 0x5f94,</div><div class='del'>-	0x8001, 0x1120, 0x7007, 0x0001, 0x0804, 0x60e8, 0x7007, 0x0006,</div><div class='del'>-	0x7012, 0x2d00, 0x7016, 0x701a, 0x704b, 0x60e8, 0x0005, 0x6834,</div><div class='del'>-	0x8007, 0xa084, 0x00ff, 0xa086, 0x0001, 0x1904, 0x5f94, 0x7007,</div><div class='del'>-	0x0001, 0x2009, 0xb631, 0x210c, 0x81ff, 0x11a8, 0x6838, 0xa084,</div><div class='del'>-	0x00ff, 0x683a, 0x6853, 0x0000, 0x080c, 0x4df4, 0x1108, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x6837, 0x0139, 0x684a, 0x6952, 0x080c,</div><div class='del'>-	0x547a, 0x012e, 0x0ca0, 0x2001, 0x0028, 0x0c90, 0x684c, 0xa084,</div><div class='del'>-	0x00c0, 0xa086, 0x00c0, 0x1120, 0x7007, 0x0001, 0x0804, 0x62e0,</div><div class='del'>-	0x2d00, 0x7016, 0x701a, 0x20a9, 0x0004, 0xa080, 0x0024, 0x2098,</div><div class='del'>-	0x20a1, 0xb70d, 0x53a3, 0x6858, 0x7012, 0xa082, 0x0401, 0x1a04,</div><div class='del'>-	0x5fb0, 0x6a84, 0xa28a, 0x0002, 0x1a04, 0x5fb0, 0x82ff, 0x1138,</div><div class='del'>-	0x6888, 0x698c, 0xa105, 0x0118, 0x2001, 0x609e, 0x0018, 0xa280,</div><div class='del'>-	0x6094, 0x2005, 0x70c6, 0x7010, 0xa015, 0x0904, 0x6080, 0x080c,</div><div class='del'>-	0x15e4, 0x1118, 0x7007, 0x000f, 0x0005, 0x2d00, 0x7022, 0x70c4,</div><div class='del'>-	0x2060, 0x2c05, 0x6836, 0xe004, 0xad00, 0x7096, 0xe008, 0xa20a,</div><div class='del'>-	0x1210, 0xa00e, 0x2200, 0x7112, 0xe20c, 0x8003, 0x800b, 0xa296,</div><div class='del'>-	0x0004, 0x0108, 0xa108, 0x719a, 0x810b, 0x719e, 0xae90, 0x0022,</div><div class='del'>-	0x080c, 0x1648, 0x7090, 0xa08e, 0x0100, 0x0170, 0xa086, 0x0200,</div><div class='del'>-	0x0118, 0x7007, 0x0010, 0x0005, 0x7020, 0x2068, 0x080c, 0x1614,</div><div class='del'>-	0x7014, 0x2068, 0x0804, 0x5fb0, 0x7020, 0x2068, 0x7018, 0x6802,</div><div class='del'>-	0x6807, 0x0000, 0x2d08, 0x2068, 0x6906, 0x711a, 0x0804, 0x603b,</div><div class='del'>-	0x7014, 0x2068, 0x7007, 0x0001, 0x6884, 0xa005, 0x1128, 0x6888,</div><div class='del'>-	0x698c, 0xa105, 0x0108, 0x00b1, 0x6834, 0xa084, 0x00ff, 0xa086,</div><div class='del'>-	0x001e, 0x0904, 0x62e0, 0x04b8, 0x6096, 0x609a, 0x0002, 0x0011,</div><div class='del'>-	0x0007, 0x0004, 0x000a, 0x000f, 0x0005, 0x0006, 0x000a, 0x0011,</div><div class='del'>-	0x0005, 0x0004, 0x00f6, 0x00e6, 0x00c6, 0x0076, 0x0066, 0x6f88,</div><div class='del'>-	0x6e8c, 0x6804, 0x2060, 0xacf0, 0x0021, 0xacf8, 0x0027, 0x2009,</div><div class='del'>-	0x0005, 0x700c, 0x7816, 0x7008, 0x7812, 0x7004, 0x7806, 0x7000,</div><div class='del'>-	0x7802, 0x7e0e, 0x7f0a, 0x8109, 0x0128, 0xaef2, 0x0004, 0xaffa,</div><div class='del'>-	0x0006, 0x0c78, 0x6004, 0xa065, 0x1d30, 0x006e, 0x007e, 0x00ce,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0x2009, 0xb631, 0x210c, 0x81ff, 0x1198,</div><div class='del'>-	0x6838, 0xa084, 0x00ff, 0x683a, 0x080c, 0x4cd7, 0x1108, 0x0005,</div><div class='del'>-	0x080c, 0x554d, 0x0126, 0x2091, 0x8000, 0x080c, 0x9f88, 0x080c,</div><div class='del'>-	0x547a, 0x012e, 0x0ca0, 0x2001, 0x0028, 0x2009, 0x0000, 0x0c80,</div><div class='del'>-	0x2009, 0xb631, 0x210c, 0x81ff, 0x11b0, 0x6858, 0xa005, 0x01c0,</div><div class='del'>-	0x6838, 0xa084, 0x00ff, 0x683a, 0x6853, 0x0000, 0x080c, 0x4d98,</div><div class='del'>-	0x1108, 0x0005, 0x0126, 0x2091, 0x8000, 0x684a, 0x6952, 0x080c,</div><div class='del'>-	0x547a, 0x012e, 0x0cb0, 0x2001, 0x0028, 0x2009, 0x0000, 0x0c90,</div><div class='del'>-	0x2001, 0x0000, 0x0c78, 0x7018, 0x6802, 0x2d08, 0x2068, 0x6906,</div><div class='del'>-	0x711a, 0x7010, 0x8001, 0x7012, 0x0118, 0x7007, 0x0006, 0x0030,</div><div class='del'>-	0x7014, 0x2068, 0x7007, 0x0001, 0x7048, 0x080f, 0x0005, 0x7007,</div><div class='del'>-	0x0001, 0x6944, 0x810f, 0xa18c, 0x00ff, 0x6848, 0xa084, 0x00ff,</div><div class='del'>-	0x20a9, 0x0001, 0xa096, 0x0001, 0x01b0, 0x2009, 0x0000, 0x20a9,</div><div class='del'>-	0x00ff, 0xa096, 0x0002, 0x0178, 0xa005, 0x11f0, 0x6944, 0x810f,</div><div class='del'>-	0xa18c, 0x00ff, 0x080c, 0x501b, 0x11b8, 0x0066, 0x6e50, 0x080c,</div><div class='del'>-	0x511a, 0x006e, 0x0088, 0x0046, 0x2011, 0xb60c, 0x2224, 0xc484,</div><div class='del'>-	0x2412, 0x004e, 0x00c6, 0x080c, 0x501b, 0x1110, 0x080c, 0x527b,</div><div class='del'>-	0x8108, 0x1f04, 0x614b, 0x00ce, 0x684c, 0xd084, 0x1118, 0x080c,</div><div class='del'>-	0x1614, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c, 0x547a, 0x012e,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001, 0x2001, 0xb653,</div><div class='del'>-	0x2004, 0xd0a4, 0x0580, 0x2061, 0xb975, 0x6100, 0xd184, 0x0178,</div><div class='del'>-	0x6858, 0xa084, 0x00ff, 0x1550, 0x6000, 0xd084, 0x0520, 0x6004,</div><div class='del'>-	0xa005, 0x1538, 0x6003, 0x0000, 0x600b, 0x0000, 0x00c8, 0x2011,</div><div class='del'>-	0x0001, 0x6860, 0xa005, 0x1110, 0x2001, 0x001e, 0x8000, 0x6016,</div><div class='del'>-	0x6858, 0xa084, 0x00ff, 0x0178, 0x6006, 0x6858, 0x8007, 0xa084,</div><div class='del'>-	0x00ff, 0x0148, 0x600a, 0x6858, 0x8000, 0x1108, 0xc28d, 0x6202,</div><div class='del'>-	0x012e, 0x0804, 0x63a4, 0x012e, 0x0804, 0x639e, 0x012e, 0x0804,</div><div class='del'>-	0x6398, 0x012e, 0x0804, 0x639b, 0x0126, 0x2091, 0x8000, 0x7007,</div><div class='del'>-	0x0001, 0x2001, 0xb653, 0x2004, 0xd0a4, 0x05e0, 0x2061, 0xb975,</div><div class='del'>-	0x6000, 0xd084, 0x05b8, 0x6204, 0x6308, 0xd08c, 0x1530, 0x6c48,</div><div class='del'>-	0xa484, 0x0003, 0x0170, 0x6958, 0xa18c, 0x00ff, 0x8001, 0x1120,</div><div class='del'>-	0x2100, 0xa210, 0x0620, 0x0028, 0x8001, 0x1508, 0x2100, 0xa212,</div><div class='del'>-	0x02f0, 0xa484, 0x000c, 0x0188, 0x6958, 0x810f, 0xa18c, 0x00ff,</div><div class='del'>-	0xa082, 0x0004, 0x1120, 0x2100, 0xa318, 0x0288, 0x0030, 0xa082,</div><div class='del'>-	0x0004, 0x1168, 0x2100, 0xa31a, 0x0250, 0x6860, 0xa005, 0x0110,</div><div class='del'>-	0x8000, 0x6016, 0x6206, 0x630a, 0x012e, 0x0804, 0x63a4, 0x012e,</div><div class='del'>-	0x0804, 0x63a1, 0x012e, 0x0804, 0x639e, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x7007, 0x0001, 0x2061, 0xb975, 0x6300, 0xd38c, 0x1120, 0x6308,</div><div class='del'>-	0x8318, 0x0220, 0x630a, 0x012e, 0x0804, 0x63b2, 0x012e, 0x0804,</div><div class='del'>-	0x63a1, 0x0126, 0x00c6, 0x2091, 0x8000, 0x7007, 0x0001, 0x684c,</div><div class='del'>-	0xd0ac, 0x0148, 0x00c6, 0x2061, 0xb975, 0x6000, 0xa084, 0xfcff,</div><div class='del'>-	0x6002, 0x00ce, 0x0448, 0x6858, 0xa005, 0x05d0, 0x685c, 0xa065,</div><div class='del'>-	0x0598, 0x2001, 0xb631, 0x2004, 0xa005, 0x0118, 0x080c, 0x9ed9,</div><div class='del'>-	0x0068, 0x6013, 0x0400, 0x6057, 0x0000, 0x694c, 0xd1a4, 0x0110,</div><div class='del'>-	0x6950, 0x6156, 0x2009, 0x0041, 0x080c, 0x86d3, 0x6958, 0xa18c,</div><div class='del'>-	0xff00, 0xa186, 0x2000, 0x1140, 0x0026, 0x2009, 0x0000, 0x2011,</div><div class='del'>-	0xfdff, 0x080c, 0x6b8c, 0x002e, 0x684c, 0xd0c4, 0x0148, 0x2061,</div><div class='del'>-	0xb975, 0x6000, 0xd08c, 0x1120, 0x6008, 0x8000, 0x0208, 0x600a,</div><div class='del'>-	0x00ce, 0x012e, 0x0804, 0x63a4, 0x00ce, 0x012e, 0x0804, 0x639e,</div><div class='del'>-	0x6954, 0xa186, 0x002e, 0x0d40, 0xa186, 0x002d, 0x0d28, 0xa186,</div><div class='del'>-	0x0045, 0x0528, 0xa186, 0x002a, 0x1130, 0x2001, 0xb60c, 0x200c,</div><div class='del'>-	0xc194, 0x2102, 0x08c8, 0xa186, 0x0020, 0x0170, 0xa186, 0x0029,</div><div class='del'>-	0x1d18, 0x6944, 0xa18c, 0xff00, 0x810f, 0x080c, 0x501b, 0x1960,</div><div class='del'>-	0x6000, 0xc0e4, 0x6002, 0x0840, 0x685c, 0xa065, 0x09a8, 0x6007,</div><div class='del'>-	0x0024, 0x2001, 0xb8b6, 0x2004, 0x6016, 0x0804, 0x623c, 0x685c,</div><div class='del'>-	0xa065, 0x0950, 0x00e6, 0x6860, 0xa075, 0x2001, 0xb631, 0x2004,</div><div class='del'>-	0xa005, 0x0150, 0x080c, 0x9ed9, 0x8eff, 0x0118, 0x2e60, 0x080c,</div><div class='del'>-	0x9ed9, 0x00ee, 0x0804, 0x623c, 0x6020, 0xc0dc, 0xc0d5, 0x6022,</div><div class='del'>-	0x2e60, 0x6007, 0x003a, 0x6870, 0xa005, 0x0130, 0x6007, 0x003b,</div><div class='del'>-	0x6874, 0x602a, 0x6878, 0x6012, 0x6003, 0x0001, 0x080c, 0x6cff,</div><div class='del'>-	0x080c, 0x71e5, 0x00ee, 0x0804, 0x623c, 0x2061, 0xb975, 0x6000,</div><div class='del'>-	0xd084, 0x0190, 0xd08c, 0x1904, 0x63b2, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6204, 0x8210, 0x0220, 0x6206, 0x012e, 0x0804, 0x63b2, 0x012e,</div><div class='del'>-	0x6853, 0x0016, 0x0804, 0x63ab, 0x6853, 0x0007, 0x0804, 0x63ab,</div><div class='del'>-	0x6834, 0x8007, 0xa084, 0x00ff, 0x1118, 0x080c, 0x5f94, 0x0078,</div><div class='del'>-	0x2030, 0x8001, 0x1120, 0x7007, 0x0001, 0x0051, 0x0040, 0x7007,</div><div class='del'>-	0x0006, 0x7012, 0x2d00, 0x7016, 0x701a, 0x704b, 0x62e0, 0x0005,</div><div class='del'>-	0x00e6, 0x0126, 0x2091, 0x8000, 0xa03e, 0x2009, 0xb631, 0x210c,</div><div class='del'>-	0x81ff, 0x1904, 0x635e, 0x2009, 0xb60c, 0x210c, 0xd194, 0x1904,</div><div class='del'>-	0x6388, 0x6848, 0x2070, 0xae82, 0xbe00, 0x0a04, 0x6352, 0x2001,</div><div class='del'>-	0xb617, 0x2004, 0xae02, 0x1a04, 0x6352, 0x711c, 0xa186, 0x0006,</div><div class='del'>-	0x1904, 0x6341, 0x7018, 0xa005, 0x0904, 0x635e, 0x2004, 0xd0e4,</div><div class='del'>-	0x1904, 0x6383, 0x2061, 0xb975, 0x6100, 0xa184, 0x0301, 0xa086,</div><div class='del'>-	0x0001, 0x1550, 0x7020, 0xd0dc, 0x1904, 0x638b, 0x6853, 0x0000,</div><div class='del'>-	0x6803, 0x0000, 0x2d08, 0x7010, 0xa005, 0x1158, 0x7112, 0x684c,</div><div class='del'>-	0xd0f4, 0x1904, 0x638e, 0x2e60, 0x080c, 0x6ae8, 0x012e, 0x00ee,</div><div class='del'>-	0x0005, 0x2068, 0x6800, 0xa005, 0x1de0, 0x6902, 0x2168, 0x684c,</div><div class='del'>-	0xd0f4, 0x1904, 0x638e, 0x012e, 0x00ee, 0x0005, 0x012e, 0x00ee,</div><div class='del'>-	0x6853, 0x0006, 0x0804, 0x63ab, 0xd184, 0x0dc0, 0xd1c4, 0x11a8,</div><div class='del'>-	0x00b8, 0x6944, 0xa18c, 0xff00, 0x810f, 0x080c, 0x501b, 0x15d8,</div><div class='del'>-	0x6000, 0xd0e4, 0x15c0, 0x711c, 0xa186, 0x0007, 0x1118, 0x6853,</div><div class='del'>-	0x0002, 0x0498, 0x6853, 0x0008, 0x0480, 0x6853, 0x000e, 0x0468,</div><div class='del'>-	0x6853, 0x0017, 0x0450, 0x6853, 0x0035, 0x0438, 0x2001, 0xb672,</div><div class='del'>-	0x2004, 0xd0fc, 0x01e8, 0x6848, 0x2070, 0xae82, 0xbe00, 0x02c0,</div><div class='del'>-	0x605c, 0xae02, 0x12a8, 0x711c, 0xa186, 0x0006, 0x1188, 0x7018,</div><div class='del'>-	0xa005, 0x0170, 0x2004, 0xd0bc, 0x0158, 0x2039, 0x0001, 0x7000,</div><div class='del'>-	0xa086, 0x0007, 0x1904, 0x62eb, 0x7003, 0x0002, 0x0804, 0x62eb,</div><div class='del'>-	0x6853, 0x0028, 0x0010, 0x6853, 0x0029, 0x012e, 0x00ee, 0x0418,</div><div class='del'>-	0x6853, 0x002a, 0x0cd0, 0x6853, 0x0045, 0x0cb8, 0x2e60, 0x2019,</div><div class='del'>-	0x0002, 0x6017, 0x0014, 0x080c, 0xad9c, 0x012e, 0x00ee, 0x0005,</div><div class='del'>-	0x2009, 0x003e, 0x0058, 0x2009, 0x0004, 0x0040, 0x2009, 0x0006,</div><div class='del'>-	0x0028, 0x2009, 0x0016, 0x0010, 0x2009, 0x0001, 0x6854, 0xa084,</div><div class='del'>-	0xff00, 0xa105, 0x6856, 0x0126, 0x2091, 0x8000, 0x080c, 0x547a,</div><div class='del'>-	0x012e, 0x0005, 0x080c, 0x1614, 0x0005, 0x702c, 0x7130, 0x8108,</div><div class='del'>-	0xa102, 0x0230, 0xa00e, 0x7034, 0x7072, 0x7038, 0x7076, 0x0058,</div><div class='del'>-	0x7070, 0xa080, 0x0040, 0x7072, 0x1230, 0x7074, 0xa081, 0x0000,</div><div class='del'>-	0x7076, 0xa085, 0x0001, 0x7932, 0x7132, 0x0005, 0x00d6, 0x080c,</div><div class='del'>-	0x6adf, 0x00de, 0x0005, 0x00d6, 0x00c6, 0x0036, 0x0026, 0x0016,</div><div class='del'>-	0x7007, 0x0001, 0x6a44, 0xa282, 0x0004, 0x1a04, 0x641e, 0xd284,</div><div class='del'>-	0x0170, 0x6a4c, 0xa290, 0xb735, 0x2204, 0xa065, 0x6004, 0x05e0,</div><div class='del'>-	0x8007, 0xa084, 0x00ff, 0xa084, 0x0006, 0x1108, 0x04a8, 0x2c10,</div><div class='del'>-	0x080c, 0x864e, 0x1118, 0x080c, 0x9f92, 0x05a0, 0x621a, 0x6844,</div><div class='del'>-	0x0002, 0x63fd, 0x6402, 0x6405, 0x640b, 0x2019, 0x0002, 0x080c,</div><div class='del'>-	0xb121, 0x0060, 0x080c, 0xb0b8, 0x0048, 0x2019, 0x0002, 0x6950,</div><div class='del'>-	0x080c, 0xb0d3, 0x0018, 0x6950, 0x080c, 0xb0b8, 0x080c, 0x86a4,</div><div class='del'>-	0x6857, 0x0000, 0x0126, 0x2091, 0x8000, 0x080c, 0x547a, 0x012e,</div><div class='del'>-	0x001e, 0x002e, 0x003e, 0x00ce, 0x00de, 0x0005, 0x6857, 0x0006,</div><div class='del'>-	0x0c88, 0x6857, 0x0002, 0x0c70, 0x6857, 0x0005, 0x0c58, 0x6857,</div><div class='del'>-	0x0004, 0x0c40, 0x6857, 0x0007, 0x0c28, 0x00d6, 0x2011, 0x0004,</div><div class='del'>-	0x2204, 0xa085, 0x8002, 0x2012, 0x00de, 0x0005, 0x20e1, 0x0002,</div><div class='del'>-	0x3d08, 0x20e1, 0x2000, 0x3d00, 0xa084, 0x7000, 0x0118, 0xa086,</div><div class='del'>-	0x1000, 0x1570, 0x20e1, 0x0000, 0x3d00, 0xa094, 0xff00, 0x8217,</div><div class='del'>-	0xa084, 0xf000, 0xa086, 0x3000, 0x1160, 0xa184, 0xff00, 0x8007,</div><div class='del'>-	0xa086, 0x0008, 0x11e8, 0x080c, 0x2df4, 0x11d0, 0x080c, 0x6675,</div><div class='del'>-	0x0098, 0x20e1, 0x0004, 0x3d60, 0xd1bc, 0x1108, 0x3e60, 0xac84,</div><div class='del'>-	0x0007, 0x1170, 0xac82, 0xbe00, 0x0258, 0x685c, 0xac02, 0x1240,</div><div class='del'>-	0x2009, 0x0047, 0x080c, 0x86d3, 0x7a1c, 0xd284, 0x1938, 0x0005,</div><div class='del'>-	0xa016, 0x080c, 0x1863, 0x0cc0, 0x0cd8, 0x781c, 0xd08c, 0x0500,</div><div class='del'>-	0x0156, 0x0136, 0x0146, 0x20e1, 0x3000, 0x3d20, 0x3e28, 0xa584,</div><div class='del'>-	0x0076, 0x1538, 0xa484, 0x7000, 0xa086, 0x1000, 0x11a8, 0x080c,</div><div class='del'>-	0x64f0, 0x01f8, 0x20e1, 0x3000, 0x7828, 0x7828, 0x080c, 0x650c,</div><div class='del'>-	0x014e, 0x013e, 0x015e, 0x2009, 0xb8e9, 0x2104, 0xa005, 0x1108,</div><div class='del'>-	0x0005, 0x080c, 0x71e5, 0x0ce0, 0xa484, 0x7000, 0x1548, 0x080c,</div><div class='del'>-	0x64f0, 0x01d8, 0x7000, 0xa084, 0xff00, 0xa086, 0x8100, 0x0d10,</div><div class='del'>-	0x00a0, 0xd5a4, 0x0178, 0x0056, 0x0046, 0x080c, 0x1e8a, 0x080c,</div><div class='del'>-	0x24e5, 0x2001, 0x0160, 0x2502, 0x2001, 0x0138, 0x2202, 0x004e,</div><div class='del'>-	0x005e, 0x0048, 0x04a9, 0x6887, 0x0000, 0x080c, 0xb49b, 0x20e1,</div><div class='del'>-	0x3000, 0x7828, 0x7828, 0x00b9, 0x014e, 0x013e, 0x015e, 0x0880,</div><div class='del'>-	0x0439, 0x1130, 0x7000, 0xa084, 0xff00, 0xa086, 0x8100, 0x1d68,</div><div class='del'>-	0x080c, 0xb49b, 0x20e1, 0x3000, 0x7828, 0x7828, 0x0056, 0x080c,</div><div class='del'>-	0x68e6, 0x005e, 0x0c40, 0x2001, 0xb60e, 0x2004, 0xd08c, 0x0178,</div><div class='del'>-	0x2001, 0xb600, 0x2004, 0xa086, 0x0003, 0x1148, 0x0026, 0x0036,</div><div class='del'>-	0x2011, 0x8048, 0x2518, 0x080c, 0x3f13, 0x003e, 0x002e, 0x0005,</div><div class='del'>-	0xa484, 0x01ff, 0x6886, 0xa005, 0x0160, 0xa080, 0x001f, 0xa084,</div><div class='del'>-	0x03f8, 0x80ac, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a, 0x53a5,</div><div class='del'>-	0x0005, 0x20a9, 0x000c, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a,</div><div class='del'>-	0x53a5, 0xa085, 0x0001, 0x0ca0, 0x7000, 0xa084, 0xff00, 0xa08c,</div><div class='del'>-	0xf000, 0x8007, 0xa196, 0x0000, 0x1118, 0x0804, 0x677a, 0x0005,</div><div class='del'>-	0xa196, 0x2000, 0x1148, 0x6900, 0xa18e, 0x0001, 0x1118, 0x080c,</div><div class='del'>-	0x44d6, 0x0ca8, 0x0039, 0x0c98, 0xa196, 0x8000, 0x1d80, 0x080c,</div><div class='del'>-	0x6826, 0x0c68, 0x00c6, 0x6a84, 0x82ff, 0x0904, 0x666f, 0x7110,</div><div class='del'>-	0xa18c, 0xff00, 0x810f, 0xa196, 0x0001, 0x0120, 0xa196, 0x0023,</div><div class='del'>-	0x1904, 0x666f, 0xa08e, 0x0023, 0x1570, 0x080c, 0x68c1, 0x0904,</div><div class='del'>-	0x666f, 0x7124, 0x610a, 0x7030, 0xa08e, 0x0200, 0x1150, 0x7034,</div><div class='del'>-	0xa005, 0x1904, 0x666f, 0x2009, 0x0015, 0x080c, 0x86d3, 0x0804,</div><div class='del'>-	0x666f, 0xa08e, 0x0214, 0x0118, 0xa08e, 0x0210, 0x1130, 0x2009,</div><div class='del'>-	0x0015, 0x080c, 0x86d3, 0x0804, 0x666f, 0xa08e, 0x0100, 0x1904,</div><div class='del'>-	0x666f, 0x7034, 0xa005, 0x1904, 0x666f, 0x2009, 0x0016, 0x080c,</div><div class='del'>-	0x86d3, 0x0804, 0x666f, 0xa08e, 0x0022, 0x1904, 0x666f, 0x7030,</div><div class='del'>-	0xa08e, 0x0300, 0x1580, 0x68d4, 0xd0a4, 0x0528, 0xc0b5, 0x68d6,</div><div class='del'>-	0x7100, 0xa18c, 0x00ff, 0x6972, 0x7004, 0x6876, 0x00f6, 0x2079,</div><div class='del'>-	0x0100, 0x79e6, 0x78ea, 0x0006, 0xa084, 0x00ff, 0x0016, 0x2008,</div><div class='del'>-	0x080c, 0x287c, 0x7932, 0x7936, 0x001e, 0x000e, 0x00fe, 0x080c,</div><div class='del'>-	0x2852, 0x6952, 0x703c, 0x00e6, 0x2071, 0x0140, 0x7086, 0x2071,</div><div class='del'>-	0xb600, 0x70a6, 0x00ee, 0x7034, 0xa005, 0x1904, 0x666f, 0x2009,</div><div class='del'>-	0x0017, 0x0804, 0x6635, 0xa08e, 0x0400, 0x1158, 0x7034, 0xa005,</div><div class='del'>-	0x1904, 0x666f, 0x68d4, 0xc0a5, 0x68d6, 0x2009, 0x0030, 0x0804,</div><div class='del'>-	0x6635, 0xa08e, 0x0500, 0x1140, 0x7034, 0xa005, 0x1904, 0x666f,</div><div class='del'>-	0x2009, 0x0018, 0x0804, 0x6635, 0xa08e, 0x2010, 0x1120, 0x2009,</div><div class='del'>-	0x0019, 0x0804, 0x6635, 0xa08e, 0x2110, 0x1120, 0x2009, 0x001a,</div><div class='del'>-	0x0804, 0x6635, 0xa08e, 0x5200, 0x1140, 0x7034, 0xa005, 0x1904,</div><div class='del'>-	0x666f, 0x2009, 0x001b, 0x0804, 0x6635, 0xa08e, 0x5000, 0x1140,</div><div class='del'>-	0x7034, 0xa005, 0x1904, 0x666f, 0x2009, 0x001c, 0x0804, 0x6635,</div><div class='del'>-	0xa08e, 0x1300, 0x1120, 0x2009, 0x0034, 0x0804, 0x6635, 0xa08e,</div><div class='del'>-	0x1200, 0x1140, 0x7034, 0xa005, 0x1904, 0x666f, 0x2009, 0x0024,</div><div class='del'>-	0x0804, 0x6635, 0xa08c, 0xff00, 0xa18e, 0x2400, 0x1118, 0x2009,</div><div class='del'>-	0x002d, 0x04d8, 0xa08c, 0xff00, 0xa18e, 0x5300, 0x1118, 0x2009,</div><div class='del'>-	0x002a, 0x0498, 0xa08e, 0x0f00, 0x1118, 0x2009, 0x0020, 0x0468,</div><div class='del'>-	0xa08e, 0x5300, 0x1108, 0x00d8, 0xa08e, 0x6104, 0x11c0, 0x2011,</div><div class='del'>-	0xbc8d, 0x8208, 0x2204, 0xa082, 0x0004, 0x20a8, 0x95ac, 0x95ac,</div><div class='del'>-	0x2011, 0x8015, 0x211c, 0x8108, 0x0046, 0x2124, 0x080c, 0x3f13,</div><div class='del'>-	0x004e, 0x8108, 0x1f04, 0x6618, 0x2009, 0x0023, 0x0070, 0xa08e,</div><div class='del'>-	0x6000, 0x1118, 0x2009, 0x003f, 0x0040, 0xa08e, 0x7800, 0x1118,</div><div class='del'>-	0x2009, 0x0045, 0x0010, 0x2009, 0x001d, 0x0016, 0x2011, 0xbc83,</div><div class='del'>-	0x2204, 0x8211, 0x220c, 0x080c, 0x2852, 0x1598, 0x080c, 0x4fbf,</div><div class='del'>-	0x1580, 0x6612, 0x6516, 0x86ff, 0x01e8, 0x001e, 0x0016, 0xa186,</div><div class='del'>-	0x0017, 0x1158, 0x6870, 0xa606, 0x11a8, 0x6874, 0xa506, 0xa084,</div><div class='del'>-	0xff00, 0x1180, 0x6000, 0xc0f5, 0x6002, 0xa186, 0x0046, 0x1150,</div><div class='del'>-	0x6870, 0xa606, 0x1138, 0x6874, 0xa506, 0xa084, 0xff00, 0x1110,</div><div class='del'>-	0x001e, 0x0068, 0x00c6, 0x080c, 0x864e, 0x0168, 0x001e, 0x611a,</div><div class='del'>-	0x601f, 0x0004, 0x7120, 0x610a, 0x001e, 0x080c, 0x86d3, 0x00ce,</div><div class='del'>-	0x0005, 0x001e, 0x0ce0, 0x00ce, 0x0ce0, 0x00c6, 0x0046, 0x080c,</div><div class='del'>-	0x66c9, 0x1904, 0x66c6, 0xa28e, 0x0033, 0x11e8, 0x080c, 0x68c1,</div><div class='del'>-	0x0904, 0x66c6, 0x7124, 0x610a, 0x7030, 0xa08e, 0x0200, 0x1140,</div><div class='del'>-	0x7034, 0xa005, 0x15d8, 0x2009, 0x0015, 0x080c, 0x86d3, 0x04b0,</div><div class='del'>-	0xa08e, 0x0100, 0x1598, 0x7034, 0xa005, 0x1580, 0x2009, 0x0016,</div><div class='del'>-	0x080c, 0x86d3, 0x0458, 0xa28e, 0x0032, 0x1540, 0x7030, 0xa08e,</div><div class='del'>-	0x1400, 0x1520, 0x2009, 0x0038, 0x0016, 0x2011, 0xbc83, 0x2204,</div><div class='del'>-	0x8211, 0x220c, 0x080c, 0x2852, 0x11c0, 0x080c, 0x4fbf, 0x11a8,</div><div class='del'>-	0x6612, 0x6516, 0x00c6, 0x080c, 0x864e, 0x0170, 0x001e, 0x611a,</div><div class='del'>-	0x080c, 0xa0e3, 0x601f, 0x0004, 0x7120, 0x610a, 0x001e, 0x080c,</div><div class='del'>-	0x86d3, 0x080c, 0x71e5, 0x0010, 0x00ce, 0x001e, 0x004e, 0x00ce,</div><div class='del'>-	0x0005, 0x00f6, 0x00d6, 0x0026, 0x0016, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x3c00, 0x0006, 0x2079, 0x0030, 0x2069, 0x0200, 0x080c, 0x1f49,</div><div class='del'>-	0x1590, 0x080c, 0x1dee, 0x05e0, 0x04f1, 0x1130, 0x7908, 0xa18c,</div><div class='del'>-	0x1fff, 0xa182, 0x0011, 0x1688, 0x20a9, 0x000c, 0x20e1, 0x0000,</div><div class='del'>-	0x2ea0, 0x2099, 0x020a, 0x53a5, 0x20e1, 0x2000, 0x2001, 0x020a,</div><div class='del'>-	0x2004, 0x7a0c, 0x7808, 0xa080, 0x0007, 0xa084, 0x1ff8, 0x0419,</div><div class='del'>-	0x1120, 0xa08a, 0x0140, 0x1a0c, 0x151a, 0x80ac, 0x20e1, 0x6000,</div><div class='del'>-	0x2099, 0x020a, 0x53a5, 0x20e1, 0x7000, 0x6828, 0x6828, 0x7803,</div><div class='del'>-	0x0004, 0xa294, 0x0070, 0x000e, 0x20e0, 0x015e, 0x014e, 0x013e,</div><div class='del'>-	0x001e, 0x002e, 0x00de, 0x00fe, 0x0005, 0xa016, 0x080c, 0x1863,</div><div class='del'>-	0xa085, 0x0001, 0x0c80, 0x0006, 0x2001, 0x0111, 0x2004, 0xa084,</div><div class='del'>-	0x0003, 0x000e, 0x0005, 0x0046, 0x00e6, 0x00d6, 0x2028, 0x2130,</div><div class='del'>-	0xa696, 0x00ff, 0x1198, 0xa596, 0xfffd, 0x1120, 0x2009, 0x007f,</div><div class='del'>-	0x0804, 0x6775, 0xa596, 0xfffe, 0x1118, 0x2009, 0x007e, 0x04e8,</div><div class='del'>-	0xa596, 0xfffc, 0x1118, 0x2009, 0x0080, 0x04b8, 0x2011, 0x0000,</div><div class='del'>-	0x2019, 0xb635, 0x231c, 0xd3ac, 0x0138, 0x2021, 0x0000, 0x20a9,</div><div class='del'>-	0x00ff, 0x2071, 0xb735, 0x0030, 0x2021, 0x0081, 0x20a9, 0x007e,</div><div class='del'>-	0x2071, 0xb7b6, 0x2e1c, 0x83ff, 0x1128, 0x82ff, 0x1198, 0x2410,</div><div class='del'>-	0xc2fd, 0x0080, 0x2368, 0x6f10, 0x0006, 0x2100, 0xa706, 0x000e,</div><div class='del'>-	0x6b14, 0x1120, 0xa346, 0x1110, 0x2408, 0x0078, 0x87ff, 0x1110,</div><div class='del'>-	0x83ff, 0x0d58, 0x8420, 0x8e70, 0x1f04, 0x6752, 0x82ff, 0x1118,</div><div class='del'>-	0xa085, 0x0001, 0x0018, 0xc2fc, 0x2208, 0xa006, 0x00de, 0x00ee,</div><div class='del'>-	0x004e, 0x0005, 0xa084, 0x0007, 0x000a, 0x0005, 0x6786, 0x6786,</div><div class='del'>-	0x6786, 0x68d3, 0x6786, 0x6787, 0x679c, 0x6811, 0x0005, 0x7110,</div><div class='del'>-	0xd1bc, 0x0188, 0x7120, 0x2160, 0xac8c, 0x0007, 0x1160, 0xac8a,</div><div class='del'>-	0xbe00, 0x0248, 0x685c, 0xac02, 0x1230, 0x7124, 0x610a, 0x2009,</div><div class='del'>-	0x0046, 0x080c, 0x86d3, 0x0005, 0x00c6, 0xa484, 0x01ff, 0x0904,</div><div class='del'>-	0x67ef, 0x7110, 0xd1bc, 0x1904, 0x67ef, 0x2011, 0xbc83, 0x2204,</div><div class='del'>-	0x8211, 0x220c, 0x080c, 0x2852, 0x1904, 0x67ef, 0x080c, 0x4fbf,</div><div class='del'>-	0x15f0, 0x6612, 0x6516, 0x6000, 0xd0ec, 0x15c8, 0x6204, 0xa294,</div><div class='del'>-	0xff00, 0x8217, 0xa286, 0x0006, 0x0148, 0x6204, 0xa294, 0x00ff,</div><div class='del'>-	0xa286, 0x0006, 0x11a0, 0xa295, 0x0600, 0x6206, 0x00c6, 0x080c,</div><div class='del'>-	0x864e, 0x001e, 0x0530, 0x611a, 0x601f, 0x0006, 0x7120, 0x610a,</div><div class='del'>-	0x7130, 0x6152, 0x2009, 0x0044, 0x080c, 0x86d3, 0x00c0, 0x00c6,</div><div class='del'>-	0x080c, 0x864e, 0x001e, 0x0198, 0x611a, 0x601f, 0x0004, 0x7120,</div><div class='del'>-	0x610a, 0xa286, 0x0004, 0x1118, 0x6007, 0x0005, 0x0010, 0x6007,</div><div class='del'>-	0x0001, 0x6003, 0x0001, 0x080c, 0x6d45, 0x080c, 0x71e5, 0x00ce,</div><div class='del'>-	0x0005, 0x2001, 0xb60d, 0x2004, 0xd0ec, 0x0120, 0x2011, 0x8049,</div><div class='del'>-	0x080c, 0x3f13, 0x00c6, 0x080c, 0x9f92, 0x001e, 0x0d80, 0x611a,</div><div class='del'>-	0x601f, 0x0006, 0x7120, 0x610a, 0x7130, 0x6152, 0x6013, 0x0300,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x6cff, 0x080c, 0x71e5,</div><div class='del'>-	0x08f0, 0x7110, 0xd1bc, 0x0188, 0x7020, 0x2060, 0xac84, 0x0007,</div><div class='del'>-	0x1160, 0xac82, 0xbe00, 0x0248, 0x685c, 0xac02, 0x1230, 0x7124,</div><div class='del'>-	0x610a, 0x2009, 0x0045, 0x080c, 0x86d3, 0x0005, 0x0006, 0x080c,</div><div class='del'>-	0x2df4, 0x000e, 0x1168, 0x7110, 0xa18c, 0xff00, 0x810f, 0xa18e,</div><div class='del'>-	0x0000, 0x1130, 0xa084, 0x000f, 0xa08a, 0x0006, 0x1208, 0x000b,</div><div class='del'>-	0x0005, 0x683f, 0x6840, 0x683f, 0x683f, 0x68a9, 0x68b5, 0x0005,</div><div class='del'>-	0x7110, 0xd1bc, 0x0120, 0x702c, 0xd084, 0x0904, 0x68a8, 0x700c,</div><div class='del'>-	0x7108, 0x080c, 0x2852, 0x1904, 0x68a8, 0x080c, 0x4fbf, 0x1904,</div><div class='del'>-	0x68a8, 0x6612, 0x6516, 0x6204, 0x7110, 0xd1bc, 0x01f8, 0xa28c,</div><div class='del'>-	0x00ff, 0xa186, 0x0004, 0x0118, 0xa186, 0x0006, 0x15c8, 0x00c6,</div><div class='del'>-	0x080c, 0x68c1, 0x00ce, 0x0904, 0x68a8, 0x00c6, 0x080c, 0x864e,</div><div class='del'>-	0x001e, 0x05f0, 0x611a, 0x080c, 0xa0e3, 0x601f, 0x0002, 0x7120,</div><div class='del'>-	0x610a, 0x2009, 0x0088, 0x080c, 0x86d3, 0x0490, 0xa28c, 0x00ff,</div><div class='del'>-	0xa186, 0x0006, 0x0160, 0xa186, 0x0004, 0x0148, 0xa294, 0xff00,</div><div class='del'>-	0x8217, 0xa286, 0x0004, 0x0118, 0xa286, 0x0006, 0x1188, 0x00c6,</div><div class='del'>-	0x080c, 0x864e, 0x001e, 0x01e0, 0x611a, 0x080c, 0xa0e3, 0x601f,</div><div class='del'>-	0x0005, 0x7120, 0x610a, 0x2009, 0x0088, 0x080c, 0x86d3, 0x0080,</div><div class='del'>-	0x00c6, 0x080c, 0x864e, 0x001e, 0x0158, 0x611a, 0x080c, 0xa0e3,</div><div class='del'>-	0x601f, 0x0004, 0x7120, 0x610a, 0x2009, 0x0001, 0x080c, 0x86d3,</div><div class='del'>-	0x0005, 0x7110, 0xd1bc, 0x0140, 0x00a1, 0x0130, 0x7124, 0x610a,</div><div class='del'>-	0x2009, 0x0089, 0x080c, 0x86d3, 0x0005, 0x7110, 0xd1bc, 0x0140,</div><div class='del'>-	0x0041, 0x0130, 0x7124, 0x610a, 0x2009, 0x008a, 0x080c, 0x86d3,</div><div class='del'>-	0x0005, 0x7020, 0x2060, 0xac84, 0x0007, 0x1158, 0xac82, 0xbe00,</div><div class='del'>-	0x0240, 0x2001, 0xb617, 0x2004, 0xac02, 0x1218, 0xa085, 0x0001,</div><div class='del'>-	0x0005, 0xa006, 0x0ce8, 0x7110, 0xd1bc, 0x1178, 0x7024, 0x2060,</div><div class='del'>-	0xac84, 0x0007, 0x1150, 0xac82, 0xbe00, 0x0238, 0x685c, 0xac02,</div><div class='del'>-	0x1220, 0x2009, 0x0051, 0x080c, 0x86d3, 0x0005, 0x2031, 0x0105,</div><div class='del'>-	0x0069, 0x0005, 0x2031, 0x0206, 0x0049, 0x0005, 0x2031, 0x0207,</div><div class='del'>-	0x0029, 0x0005, 0x2031, 0x0213, 0x0009, 0x0005, 0x00c6, 0x00d6,</div><div class='del'>-	0x00f6, 0x7000, 0xa084, 0xf000, 0xa086, 0xc000, 0x05b0, 0x080c,</div><div class='del'>-	0x864e, 0x0598, 0x0066, 0x00c6, 0x0046, 0x2011, 0xbc83, 0x2204,</div><div class='del'>-	0x8211, 0x220c, 0x080c, 0x2852, 0x1580, 0x080c, 0x4fbf, 0x1568,</div><div class='del'>-	0x6612, 0x6516, 0x2c00, 0x004e, 0x00ce, 0x601a, 0x080c, 0xa0e3,</div><div class='del'>-	0x080c, 0x15fd, 0x01f0, 0x2d00, 0x6056, 0x6803, 0x0000, 0x6837,</div><div class='del'>-	0x0000, 0x6c3a, 0xadf8, 0x000f, 0x20a9, 0x000e, 0x2fa0, 0x2e98,</div><div class='del'>-	0x53a3, 0x006e, 0x6612, 0x6007, 0x003e, 0x601f, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x6d45, 0x080c, 0x71e5, 0x00fe, 0x00de, 0x00ce,</div><div class='del'>-	0x0005, 0x080c, 0x86a4, 0x006e, 0x0cc0, 0x004e, 0x00ce, 0x0cc8,</div><div class='del'>-	0x2071, 0xb8f4, 0x7003, 0x0003, 0x700f, 0x0361, 0xa006, 0x701a,</div><div class='del'>-	0x7076, 0x7012, 0x7017, 0xbe00, 0x7007, 0x0000, 0x7026, 0x702b,</div><div class='del'>-	0x7e0a, 0x7032, 0x7037, 0x7e6a, 0x703b, 0xffff, 0x703f, 0xffff,</div><div class='del'>-	0x7042, 0x7047, 0x4492, 0x704a, 0x705b, 0x6a9d, 0x2001, 0xb8a1,</div><div class='del'>-	0x2003, 0x0003, 0x2001, 0xb8a3, 0x2003, 0x0100, 0x3a00, 0xa084,</div><div class='del'>-	0x0005, 0x706e, 0x0005, 0x2071, 0xb8f4, 0x1d04, 0x69fd, 0x2091,</div><div class='del'>-	0x6000, 0x700c, 0x8001, 0x700e, 0x1518, 0x700f, 0x0361, 0x7007,</div><div class='del'>-	0x0001, 0x0126, 0x2091, 0x8000, 0x7040, 0xa00d, 0x0128, 0x8109,</div><div class='del'>-	0x7142, 0x1110, 0x7044, 0x080f, 0x00c6, 0x2061, 0xb600, 0x6034,</div><div class='del'>-	0x00ce, 0xd0cc, 0x0180, 0x3a00, 0xa084, 0x0005, 0x726c, 0xa216,</div><div class='del'>-	0x0150, 0x706e, 0x2011, 0x8043, 0x2018, 0x080c, 0x3f13, 0x0018,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x7024, 0xa00d, 0x0188, 0x7020, 0x8001,</div><div class='del'>-	0x7022, 0x1168, 0x7023, 0x0009, 0x8109, 0x7126, 0xa186, 0x03e8,</div><div class='del'>-	0x1110, 0x7028, 0x080f, 0x81ff, 0x1110, 0x7028, 0x080f, 0x7030,</div><div class='del'>-	0xa00d, 0x0180, 0x702c, 0x8001, 0x702e, 0x1160, 0x702f, 0x0009,</div><div class='del'>-	0x8109, 0x7132, 0x0128, 0xa184, 0x007f, 0x090c, 0x7eaf, 0x0010,</div><div class='del'>-	0x7034, 0x080f, 0x7038, 0xa005, 0x0118, 0x0310, 0x8001, 0x703a,</div><div class='del'>-	0x703c, 0xa005, 0x0118, 0x0310, 0x8001, 0x703e, 0x704c, 0xa00d,</div><div class='del'>-	0x0168, 0x7048, 0x8001, 0x704a, 0x1148, 0x704b, 0x0009, 0x8109,</div><div class='del'>-	0x714e, 0x1120, 0x7150, 0x714e, 0x7058, 0x080f, 0x7018, 0xa00d,</div><div class='del'>-	0x01d8, 0x0016, 0x7074, 0xa00d, 0x0158, 0x7070, 0x8001, 0x7072,</div><div class='del'>-	0x1138, 0x7073, 0x0009, 0x8109, 0x7176, 0x1110, 0x7078, 0x080f,</div><div class='del'>-	0x001e, 0x7008, 0x8001, 0x700a, 0x1138, 0x700b, 0x0009, 0x8109,</div><div class='del'>-	0x711a, 0x1110, 0x701c, 0x080f, 0x012e, 0x7004, 0x0002, 0x6a23,</div><div class='del'>-	0x6a24, 0x6a3c, 0x00e6, 0x2071, 0xb8f4, 0x7018, 0xa005, 0x1120,</div><div class='del'>-	0x711a, 0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x00e6, 0x0006,</div><div class='del'>-	0x2071, 0xb8f4, 0x701c, 0xa206, 0x1110, 0x701a, 0x701e, 0x000e,</div><div class='del'>-	0x00ee, 0x0005, 0x00e6, 0x2071, 0xb8f4, 0x6088, 0xa102, 0x0208,</div><div class='del'>-	0x618a, 0x00ee, 0x0005, 0x0005, 0x7110, 0x080c, 0x501b, 0x1158,</div><div class='del'>-	0x6088, 0x8001, 0x0240, 0x608a, 0x1130, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x71e5, 0x012e, 0x8108, 0xa182, 0x00ff, 0x0218, 0xa00e,</div><div class='del'>-	0x7007, 0x0002, 0x7112, 0x0005, 0x7014, 0x2060, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x603c, 0xa005, 0x0128, 0x8001, 0x603e, 0x1110, 0x080c,</div><div class='del'>-	0x9fd1, 0x6014, 0xa005, 0x0500, 0x8001, 0x6016, 0x11e8, 0x611c,</div><div class='del'>-	0xa186, 0x0003, 0x0118, 0xa186, 0x0006, 0x11a0, 0x6010, 0x2068,</div><div class='del'>-	0x6854, 0xa08a, 0x199a, 0x0270, 0xa082, 0x1999, 0x6856, 0xa08a,</div><div class='del'>-	0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x800b, 0x810b, 0xa108,</div><div class='del'>-	0x6116, 0x0010, 0x080c, 0x9aa1, 0x012e, 0xac88, 0x0018, 0x7116,</div><div class='del'>-	0x2001, 0xee00, 0xa102, 0x0220, 0x7017, 0xbe00, 0x7007, 0x0000,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0xb8f4, 0x7027, 0x07d0, 0x7023, 0x0009,</div><div class='del'>-	0x00ee, 0x0005, 0x2001, 0xb8fd, 0x2003, 0x0000, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0xb8f4, 0x7132, 0x702f, 0x0009, 0x00ee, 0x0005, 0x2011,</div><div class='del'>-	0xb900, 0x2013, 0x0000, 0x0005, 0x00e6, 0x2071, 0xb8f4, 0x711a,</div><div class='del'>-	0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x00c6, 0x0026, 0x7054,</div><div class='del'>-	0x8000, 0x7056, 0x2061, 0xb8a1, 0x6008, 0xa086, 0x0000, 0x0158,</div><div class='del'>-	0x7068, 0x6032, 0x7064, 0x602e, 0x7060, 0x602a, 0x705c, 0x6026,</div><div class='del'>-	0x2c10, 0x080c, 0x1648, 0x002e, 0x00ce, 0x0005, 0x0006, 0x0016,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x080c, 0x696b, 0x00fe, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x001e, 0x000e, 0x0005, 0x00e6, 0x2071, 0xb8f4,</div><div class='del'>-	0x7176, 0x727a, 0x7073, 0x0009, 0x00ee, 0x0005, 0x00e6, 0x0006,</div><div class='del'>-	0x2071, 0xb8f4, 0x7078, 0xa206, 0x1110, 0x7076, 0x707a, 0x000e,</div><div class='del'>-	0x00ee, 0x0005, 0x00c6, 0x2061, 0xb975, 0x00ce, 0x0005, 0xa184,</div><div class='del'>-	0x000f, 0x8003, 0x8003, 0x8003, 0xa080, 0xb975, 0x2060, 0x0005,</div><div class='del'>-	0x6854, 0xa08a, 0x199a, 0x0210, 0x2001, 0x1999, 0xa005, 0x1150,</div><div class='del'>-	0x00c6, 0x2061, 0xb975, 0x6014, 0x00ce, 0xa005, 0x1138, 0x2001,</div><div class='del'>-	0x001e, 0x0020, 0xa08e, 0xffff, 0x1108, 0xa006, 0x8003, 0x800b,</div><div class='del'>-	0x810b, 0xa108, 0x6116, 0x684c, 0xa08c, 0x00c0, 0xa18e, 0x00c0,</div><div class='del'>-	0x05e8, 0xd0b4, 0x1138, 0xd0bc, 0x1550, 0x2009, 0x0006, 0x080c,</div><div class='del'>-	0x6b63, 0x0005, 0xd0fc, 0x0138, 0xa084, 0x0003, 0x0120, 0xa086,</div><div class='del'>-	0x0003, 0x1904, 0x6b5d, 0x6020, 0xd0d4, 0x0130, 0xc0d4, 0x6022,</div><div class='del'>-	0x6860, 0x602a, 0x685c, 0x602e, 0x2009, 0xb674, 0x2104, 0xd084,</div><div class='del'>-	0x0138, 0x87ff, 0x1120, 0x2009, 0x0042, 0x080c, 0x86d3, 0x0005,</div><div class='del'>-	0x87ff, 0x1120, 0x2009, 0x0043, 0x080c, 0x86d3, 0x0005, 0xd0fc,</div><div class='del'>-	0x0130, 0xa084, 0x0003, 0x0118, 0xa086, 0x0003, 0x11f0, 0x87ff,</div><div class='del'>-	0x1120, 0x2009, 0x0042, 0x080c, 0x86d3, 0x0005, 0xd0fc, 0x0160,</div><div class='del'>-	0xa084, 0x0003, 0xa08e, 0x0002, 0x0148, 0x87ff, 0x1120, 0x2009,</div><div class='del'>-	0x0041, 0x080c, 0x86d3, 0x0005, 0x0061, 0x0ce8, 0x87ff, 0x1dd8,</div><div class='del'>-	0x2009, 0x0043, 0x080c, 0x86d3, 0x0cb0, 0x2009, 0x0004, 0x0019,</div><div class='del'>-	0x0005, 0x2009, 0x0001, 0x00d6, 0x6010, 0xa0ec, 0xf000, 0x0510,</div><div class='del'>-	0x2068, 0x6952, 0x6800, 0x6012, 0xa186, 0x0001, 0x1188, 0x694c,</div><div class='del'>-	0xa18c, 0x8100, 0xa18e, 0x8100, 0x1158, 0x00c6, 0x2061, 0xb975,</div><div class='del'>-	0x6200, 0xd28c, 0x1120, 0x6204, 0x8210, 0x0208, 0x6206, 0x00ce,</div><div class='del'>-	0x080c, 0x547a, 0x6010, 0xa06d, 0x0076, 0x2039, 0x0000, 0x190c,</div><div class='del'>-	0x6ae8, 0x007e, 0x00de, 0x0005, 0x0156, 0x00c6, 0x2061, 0xb975,</div><div class='del'>-	0x6000, 0x81ff, 0x0110, 0xa205, 0x0008, 0xa204, 0x6002, 0x00ce,</div><div class='del'>-	0x015e, 0x0005, 0x6800, 0xd08c, 0x1138, 0x6808, 0xa005, 0x0120,</div><div class='del'>-	0x8001, 0x680a, 0xa085, 0x0001, 0x0005, 0x20a9, 0x0010, 0xa006,</div><div class='del'>-	0x8004, 0x8086, 0x818e, 0x1208, 0xa200, 0x1f04, 0x6ba9, 0x8086,</div><div class='del'>-	0x818e, 0x0005, 0x0156, 0x20a9, 0x0010, 0xa005, 0x01b8, 0xa11a,</div><div class='del'>-	0x12a8, 0x8213, 0x818d, 0x0228, 0xa11a, 0x1220, 0x1f04, 0x6bb9,</div><div class='del'>-	0x0028, 0xa11a, 0x2308, 0x8210, 0x1f04, 0x6bb9, 0x0006, 0x3200,</div><div class='del'>-	0xa084, 0xefff, 0x2080, 0x000e, 0x015e, 0x0005, 0x0006, 0x3200,</div><div class='del'>-	0xa085, 0x1000, 0x0cb8, 0x0126, 0x2091, 0x2800, 0x2079, 0xb8e1,</div><div class='del'>-	0x012e, 0x00d6, 0x2069, 0xb8e1, 0x6803, 0x0005, 0x2069, 0x0004,</div><div class='del'>-	0x2d04, 0xa085, 0x8001, 0x206a, 0x00de, 0x0005, 0x00c6, 0x6027,</div><div class='del'>-	0x0001, 0x7804, 0xa084, 0x0007, 0x0002, 0x6bf7, 0x6c18, 0x6c6b,</div><div class='del'>-	0x6bfd, 0x6c18, 0x6bf7, 0x6bf5, 0x6bf5, 0x080c, 0x151a, 0x080c,</div><div class='del'>-	0x6a82, 0x080c, 0x71e5, 0x00ce, 0x0005, 0x62c0, 0x82ff, 0x1110,</div><div class='del'>-	0x00ce, 0x0005, 0x2011, 0x4b23, 0x080c, 0x6a0e, 0x7828, 0xa092,</div><div class='del'>-	0x00c8, 0x1228, 0x8000, 0x782a, 0x080c, 0x4b65, 0x0c88, 0x080c,</div><div class='del'>-	0x4b23, 0x7807, 0x0003, 0x7827, 0x0000, 0x782b, 0x0000, 0x0c40,</div><div class='del'>-	0x080c, 0x6a82, 0x3c00, 0x0006, 0x2011, 0x0209, 0x20e1, 0x4000,</div><div class='del'>-	0x2214, 0x000e, 0x20e0, 0x82ff, 0x0178, 0x62c0, 0x82ff, 0x1160,</div><div class='del'>-	0x782b, 0x0000, 0x7824, 0xa065, 0x090c, 0x151a, 0x2009, 0x0013,</div><div class='del'>-	0x080c, 0x86d3, 0x00ce, 0x0005, 0x3900, 0xa082, 0xba2d, 0x1210,</div><div class='del'>-	0x080c, 0x83b9, 0x00c6, 0x7824, 0xa065, 0x090c, 0x151a, 0x7804,</div><div class='del'>-	0xa086, 0x0004, 0x0904, 0x6cab, 0x7828, 0xa092, 0x2710, 0x1230,</div><div class='del'>-	0x8000, 0x782a, 0x00ce, 0x080c, 0x7de6, 0x0c20, 0x6104, 0xa186,</div><div class='del'>-	0x0003, 0x1188, 0x00e6, 0x2071, 0xb600, 0x70e0, 0x00ee, 0xd08c,</div><div class='del'>-	0x0150, 0x00c6, 0x00e6, 0x2061, 0x0100, 0x2071, 0xb600, 0x080c,</div><div class='del'>-	0x4b7b, 0x00ee, 0x00ce, 0x080c, 0xb500, 0x2009, 0x0014, 0x080c,</div><div class='del'>-	0x86d3, 0x00ce, 0x0838, 0x2001, 0xb8fd, 0x2003, 0x0000, 0x62c0,</div><div class='del'>-	0x82ff, 0x1160, 0x782b, 0x0000, 0x7824, 0xa065, 0x090c, 0x151a,</div><div class='del'>-	0x2009, 0x0013, 0x080c, 0x872c, 0x00ce, 0x0005, 0x00c6, 0x00d6,</div><div class='del'>-	0x3900, 0xa082, 0xba2d, 0x1210, 0x080c, 0x83b9, 0x7824, 0xa005,</div><div class='del'>-	0x090c, 0x151a, 0x781c, 0xa06d, 0x090c, 0x151a, 0x6800, 0xc0dc,</div><div class='del'>-	0x6802, 0x7924, 0x2160, 0x080c, 0x86a4, 0x693c, 0x81ff, 0x090c,</div><div class='del'>-	0x151a, 0x8109, 0x693e, 0x6854, 0xa015, 0x0110, 0x7a1e, 0x0010,</div><div class='del'>-	0x7918, 0x791e, 0x7807, 0x0000, 0x7827, 0x0000, 0x00de, 0x00ce,</div><div class='del'>-	0x080c, 0x71e5, 0x0888, 0x6104, 0xa186, 0x0002, 0x0128, 0xa186,</div><div class='del'>-	0x0004, 0x0110, 0x0804, 0x6c44, 0x7808, 0xac06, 0x0904, 0x6c44,</div><div class='del'>-	0x080c, 0x7102, 0x080c, 0x6d45, 0x00ce, 0x080c, 0x71e5, 0x0804,</div><div class='del'>-	0x6c32, 0x00c6, 0x6027, 0x0002, 0x62c8, 0x60c4, 0xa205, 0x1178,</div><div class='del'>-	0x793c, 0xa1e5, 0x0000, 0x0130, 0x2009, 0x0049, 0x080c, 0x86d3,</div><div class='del'>-	0x00ce, 0x0005, 0x2011, 0xb900, 0x2013, 0x0000, 0x0cc8, 0x3908,</div><div class='del'>-	0xa192, 0xba2d, 0x1210, 0x080c, 0x83b9, 0x793c, 0x81ff, 0x0d90,</div><div class='del'>-	0x7944, 0xa192, 0x7530, 0x12b8, 0x8108, 0x7946, 0x793c, 0xa188,</div><div class='del'>-	0x0007, 0x210c, 0xa18e, 0x0006, 0x1138, 0x6014, 0xa084, 0x0184,</div><div class='del'>-	0xa085, 0x0012, 0x6016, 0x08e0, 0x6014, 0xa084, 0x0184, 0xa085,</div><div class='del'>-	0x0016, 0x6016, 0x08a8, 0x7848, 0xc085, 0x784a, 0x0888, 0x0006,</div><div class='del'>-	0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08,</div><div class='del'>-	0x2061, 0xb8e1, 0x6020, 0x8000, 0x6022, 0x6010, 0xa005, 0x0148,</div><div class='del'>-	0xa080, 0x0003, 0x2102, 0x6112, 0x012e, 0x00ce, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x6116, 0x6112, 0x0cc0, 0x00d6, 0x2069, 0xb8e1, 0x6000,</div><div class='del'>-	0xd0d4, 0x0168, 0x6820, 0x8000, 0x6822, 0xa086, 0x0001, 0x1110,</div><div class='del'>-	0x2c00, 0x681e, 0x6804, 0xa084, 0x0007, 0x0804, 0x71eb, 0xc0d5,</div><div class='del'>-	0x6002, 0x6818, 0xa005, 0x0158, 0x6056, 0x605b, 0x0000, 0x0006,</div><div class='del'>-	0x2c00, 0x681a, 0x00de, 0x685a, 0x2069, 0xb8e1, 0x0c18, 0x6056,</div><div class='del'>-	0x605a, 0x2c00, 0x681a, 0x681e, 0x08e8, 0x0006, 0x0016, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08, 0x2061, 0xb8e1,</div><div class='del'>-	0x6020, 0x8000, 0x6022, 0x6008, 0xa005, 0x0148, 0xa080, 0x0003,</div><div class='del'>-	0x2102, 0x610a, 0x012e, 0x00ce, 0x001e, 0x000e, 0x0005, 0x610e,</div><div class='del'>-	0x610a, 0x0cc0, 0x00c6, 0x600f, 0x0000, 0x2c08, 0x2061, 0xb8e1,</div><div class='del'>-	0x6034, 0xa005, 0x0130, 0xa080, 0x0003, 0x2102, 0x6136, 0x00ce,</div><div class='del'>-	0x0005, 0x613a, 0x6136, 0x0cd8, 0x00f6, 0x00e6, 0x00d6, 0x00c6,</div><div class='del'>-	0x0076, 0x0066, 0x0056, 0x0036, 0x0026, 0x0016, 0x0006, 0x0126,</div><div class='del'>-	0xa02e, 0x2071, 0xb8e1, 0x7638, 0x2660, 0x2678, 0x2091, 0x8000,</div><div class='del'>-	0x8cff, 0x0904, 0x6ded, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206,</div><div class='del'>-	0x1904, 0x6de8, 0x87ff, 0x0120, 0x6050, 0xa106, 0x1904, 0x6de8,</div><div class='del'>-	0x703c, 0xac06, 0x1190, 0x0036, 0x2019, 0x0001, 0x080c, 0x806b,</div><div class='del'>-	0x7033, 0x0000, 0x703f, 0x0000, 0x7043, 0x0000, 0x7047, 0x0000,</div><div class='del'>-	0x704b, 0x0000, 0x003e, 0x2029, 0x0001, 0x7038, 0xac36, 0x1110,</div><div class='del'>-	0x660c, 0x763a, 0x7034, 0xac36, 0x1140, 0x2c00, 0xaf36, 0x0118,</div><div class='del'>-	0x2f00, 0x7036, 0x0010, 0x7037, 0x0000, 0x660c, 0x0066, 0x2c00,</div><div class='del'>-	0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c,</div><div class='del'>-	0x9d16, 0x01c8, 0x6010, 0x2068, 0x601c, 0xa086, 0x0003, 0x1580,</div><div class='del'>-	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x0016, 0x0036, 0x0076,</div><div class='del'>-	0x080c, 0x9f88, 0x080c, 0xb43c, 0x080c, 0x547a, 0x007e, 0x003e,</div><div class='del'>-	0x001e, 0x080c, 0x9ecd, 0x080c, 0x9ed9, 0x00ce, 0x0804, 0x6d88,</div><div class='del'>-	0x2c78, 0x600c, 0x2060, 0x0804, 0x6d88, 0x85ff, 0x0120, 0x0036,</div><div class='del'>-	0x080c, 0x72a2, 0x003e, 0x012e, 0x000e, 0x001e, 0x002e, 0x003e,</div><div class='del'>-	0x005e, 0x006e, 0x007e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x601c, 0xa086, 0x0006, 0x1158, 0x0016, 0x0036, 0x0076, 0x080c,</div><div class='del'>-	0xb43c, 0x080c, 0xb155, 0x007e, 0x003e, 0x001e, 0x08a0, 0x601c,</div><div class='del'>-	0xa086, 0x000a, 0x0904, 0x6dd2, 0x0804, 0x6dd0, 0x0006, 0x0066,</div><div class='del'>-	0x00c6, 0x00d6, 0x00f6, 0x2031, 0x0000, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2079, 0xb8e1, 0x7838, 0xa065, 0x0568, 0x600c, 0x0006, 0x600f,</div><div class='del'>-	0x0000, 0x783c, 0xac06, 0x1180, 0x0036, 0x2019, 0x0001, 0x080c,</div><div class='del'>-	0x806b, 0x7833, 0x0000, 0x783f, 0x0000, 0x7843, 0x0000, 0x7847,</div><div class='del'>-	0x0000, 0x784b, 0x0000, 0x003e, 0x080c, 0x9d16, 0x0178, 0x6010,</div><div class='del'>-	0x2068, 0x601c, 0xa086, 0x0003, 0x11b0, 0x6837, 0x0103, 0x6b4a,</div><div class='del'>-	0x6847, 0x0000, 0x080c, 0x547a, 0x080c, 0x9ecd, 0x080c, 0x9ed9,</div><div class='del'>-	0x000e, 0x0888, 0x7e3a, 0x7e36, 0x012e, 0x00fe, 0x00de, 0x00ce,</div><div class='del'>-	0x006e, 0x000e, 0x0005, 0x601c, 0xa086, 0x0006, 0x1118, 0x080c,</div><div class='del'>-	0xb155, 0x0c60, 0x601c, 0xa086, 0x000a, 0x0d08, 0x08f0, 0x0016,</div><div class='del'>-	0x0026, 0x0086, 0x2041, 0x0000, 0x0099, 0x080c, 0x6f35, 0x008e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x00f6, 0x0126, 0x2079, 0xb8e1, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x6fc2, 0x080c, 0x7034, 0x012e, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0016, 0x0006, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2071, 0xb8e1, 0x7614, 0x2660, 0x2678, 0x8cff,</div><div class='del'>-	0x0904, 0x6f0b, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x1904,</div><div class='del'>-	0x6f06, 0x88ff, 0x0120, 0x6050, 0xa106, 0x1904, 0x6f06, 0x7024,</div><div class='del'>-	0xac06, 0x1538, 0x2069, 0x0100, 0x68c0, 0xa005, 0x01f0, 0x080c,</div><div class='del'>-	0x6a82, 0x080c, 0x7df3, 0x68c3, 0x0000, 0x080c, 0x82d4, 0x7027,</div><div class='del'>-	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120,</div><div class='del'>-	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0110, 0x6827, 0x0001, 0x003e, 0x0020, 0x6003, 0x0009, 0x630a,</div><div class='del'>-	0x04e8, 0x7014, 0xac36, 0x1110, 0x660c, 0x7616, 0x7010, 0xac36,</div><div class='del'>-	0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00, 0x7012, 0x0010, 0x7013,</div><div class='del'>-	0x0000, 0x660c, 0x0066, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008,</div><div class='del'>-	0x2678, 0x600f, 0x0000, 0x6010, 0x2068, 0x080c, 0x9d16, 0x01b8,</div><div class='del'>-	0x601c, 0xa086, 0x0003, 0x1540, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x0016, 0x0036, 0x0086, 0x080c, 0x9f88, 0x080c, 0xb43c,</div><div class='del'>-	0x080c, 0x547a, 0x008e, 0x003e, 0x001e, 0x080c, 0x9ecd, 0x080c,</div><div class='del'>-	0x9ed9, 0x080c, 0x81a5, 0x00ce, 0x0804, 0x6e8f, 0x2c78, 0x600c,</div><div class='del'>-	0x2060, 0x0804, 0x6e8f, 0x012e, 0x000e, 0x001e, 0x006e, 0x00ce,</div><div class='del'>-	0x00de, 0x00ee, 0x00fe, 0x0005, 0x601c, 0xa086, 0x0006, 0x1158,</div><div class='del'>-	0x0016, 0x0036, 0x0086, 0x080c, 0xb43c, 0x080c, 0xb155, 0x008e,</div><div class='del'>-	0x003e, 0x001e, 0x08e0, 0x601c, 0xa086, 0x0002, 0x1128, 0x6004,</div><div class='del'>-	0xa086, 0x0085, 0x0908, 0x0898, 0x601c, 0xa086, 0x0005, 0x1978,</div><div class='del'>-	0x6004, 0xa086, 0x0085, 0x0d20, 0x0850, 0x00c6, 0x0006, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0xa280, 0xb735, 0x2004, 0xa065, 0x0904, 0x6fbe,</div><div class='del'>-	0x00f6, 0x00e6, 0x00d6, 0x0066, 0x2071, 0xb8e1, 0x6654, 0x7018,</div><div class='del'>-	0xac06, 0x1108, 0x761a, 0x701c, 0xac06, 0x1130, 0x86ff, 0x1118,</div><div class='del'>-	0x7018, 0x701e, 0x0008, 0x761e, 0x6058, 0xa07d, 0x0108, 0x7e56,</div><div class='del'>-	0xa6ed, 0x0000, 0x0110, 0x2f00, 0x685a, 0x6057, 0x0000, 0x605b,</div><div class='del'>-	0x0000, 0x6000, 0xc0d4, 0xc0dc, 0x6002, 0x080c, 0x4f46, 0x0904,</div><div class='del'>-	0x6fba, 0x7624, 0x86ff, 0x05e8, 0xa680, 0x0004, 0x2004, 0xad06,</div><div class='del'>-	0x15c0, 0x00d6, 0x2069, 0x0100, 0x68c0, 0xa005, 0x0548, 0x080c,</div><div class='del'>-	0x6a82, 0x080c, 0x7df3, 0x68c3, 0x0000, 0x080c, 0x82d4, 0x7027,</div><div class='del'>-	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120,</div><div class='del'>-	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0110, 0x6827, 0x0001, 0x003e, 0x00de, 0x00c6, 0x603c, 0xa005,</div><div class='del'>-	0x0110, 0x8001, 0x603e, 0x2660, 0x080c, 0x9ed9, 0x00ce, 0x0048,</div><div class='del'>-	0x00de, 0x00c6, 0x2660, 0x6003, 0x0009, 0x630a, 0x00ce, 0x0804,</div><div class='del'>-	0x6f65, 0x8dff, 0x0158, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000,</div><div class='del'>-	0x080c, 0x9f88, 0x080c, 0xb43c, 0x080c, 0x547a, 0x080c, 0x81a5,</div><div class='del'>-	0x0804, 0x6f65, 0x006e, 0x00de, 0x00ee, 0x00fe, 0x012e, 0x000e,</div><div class='del'>-	0x00ce, 0x0005, 0x0006, 0x0066, 0x00c6, 0x00d6, 0x2031, 0x0000,</div><div class='del'>-	0x7814, 0xa065, 0x0904, 0x7014, 0x600c, 0x0006, 0x600f, 0x0000,</div><div class='del'>-	0x7824, 0xac06, 0x1540, 0x2069, 0x0100, 0x68c0, 0xa005, 0x01f0,</div><div class='del'>-	0x080c, 0x6a82, 0x080c, 0x7df3, 0x68c3, 0x0000, 0x080c, 0x82d4,</div><div class='del'>-	0x7827, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000,</div><div class='del'>-	0x0120, 0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824,</div><div class='del'>-	0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x0028, 0x6003, 0x0009,</div><div class='del'>-	0x630a, 0x2c30, 0x00b0, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0168,</div><div class='del'>-	0x601c, 0xa086, 0x0003, 0x11b8, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x080c, 0x547a, 0x080c, 0x9ecd, 0x080c, 0x9ed9, 0x080c,</div><div class='del'>-	0x81a5, 0x000e, 0x0804, 0x6fc9, 0x7e16, 0x7e12, 0x00de, 0x00ce,</div><div class='del'>-	0x006e, 0x000e, 0x0005, 0x601c, 0xa086, 0x0006, 0x1118, 0x080c,</div><div class='del'>-	0xb155, 0x0c58, 0x601c, 0xa086, 0x0002, 0x1128, 0x6004, 0xa086,</div><div class='del'>-	0x0085, 0x09d0, 0x0c10, 0x601c, 0xa086, 0x0005, 0x19f0, 0x6004,</div><div class='del'>-	0xa086, 0x0085, 0x0d60, 0x08c8, 0x0006, 0x0066, 0x00c6, 0x00d6,</div><div class='del'>-	0x7818, 0xa065, 0x0904, 0x709a, 0x6054, 0x0006, 0x6057, 0x0000,</div><div class='del'>-	0x605b, 0x0000, 0x6000, 0xc0d4, 0xc0dc, 0x6002, 0x080c, 0x4f46,</div><div class='del'>-	0x0904, 0x7097, 0x7e24, 0x86ff, 0x05e8, 0xa680, 0x0004, 0x2004,</div><div class='del'>-	0xad06, 0x15c0, 0x00d6, 0x2069, 0x0100, 0x68c0, 0xa005, 0x0548,</div><div class='del'>-	0x080c, 0x6a82, 0x080c, 0x7df3, 0x68c3, 0x0000, 0x080c, 0x82d4,</div><div class='del'>-	0x7827, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000,</div><div class='del'>-	0x0120, 0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824,</div><div class='del'>-	0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x00de, 0x00c6, 0x603c,</div><div class='del'>-	0xa005, 0x0110, 0x8001, 0x603e, 0x2660, 0x080c, 0x9ed9, 0x00ce,</div><div class='del'>-	0x0048, 0x00de, 0x00c6, 0x2660, 0x6003, 0x0009, 0x630a, 0x00ce,</div><div class='del'>-	0x0804, 0x7046, 0x8dff, 0x0138, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x080c, 0x547a, 0x080c, 0x81a5, 0x0804, 0x7046, 0x000e,</div><div class='del'>-	0x0804, 0x7039, 0x781e, 0x781a, 0x00de, 0x00ce, 0x006e, 0x000e,</div><div class='del'>-	0x0005, 0x00e6, 0x00d6, 0x0066, 0x6000, 0xd0dc, 0x01a0, 0x604c,</div><div class='del'>-	0xa06d, 0x0188, 0x6848, 0xa606, 0x1170, 0x2071, 0xb8e1, 0x7024,</div><div class='del'>-	0xa035, 0x0148, 0xa080, 0x0004, 0x2004, 0xad06, 0x1120, 0x6000,</div><div class='del'>-	0xc0dc, 0x6002, 0x0021, 0x006e, 0x00de, 0x00ee, 0x0005, 0x00f6,</div><div class='del'>-	0x2079, 0x0100, 0x78c0, 0xa005, 0x1138, 0x00c6, 0x2660, 0x6003,</div><div class='del'>-	0x0009, 0x630a, 0x00ce, 0x04a0, 0x080c, 0x7df3, 0x78c3, 0x0000,</div><div class='del'>-	0x080c, 0x82d4, 0x7027, 0x0000, 0x0036, 0x2079, 0x0140, 0x7b04,</div><div class='del'>-	0xa384, 0x1000, 0x0120, 0x7803, 0x0100, 0x7803, 0x0000, 0x2079,</div><div class='del'>-	0x0100, 0x7824, 0xd084, 0x0110, 0x7827, 0x0001, 0x080c, 0x82d4,</div><div class='del'>-	0x003e, 0x080c, 0x4f46, 0x00c6, 0x603c, 0xa005, 0x0110, 0x8001,</div><div class='del'>-	0x603e, 0x2660, 0x080c, 0x86a4, 0x00ce, 0x6837, 0x0103, 0x6b4a,</div><div class='del'>-	0x6847, 0x0000, 0x080c, 0x9f88, 0x080c, 0x547a, 0x080c, 0x81a5,</div><div class='del'>-	0x00fe, 0x0005, 0x00e6, 0x00c6, 0x2071, 0xb8e1, 0x7004, 0xa084,</div><div class='del'>-	0x0007, 0x0002, 0x7114, 0x7117, 0x712d, 0x7146, 0x7183, 0x7114,</div><div class='del'>-	0x7112, 0x7112, 0x080c, 0x151a, 0x00ce, 0x00ee, 0x0005, 0x7024,</div><div class='del'>-	0xa065, 0x0148, 0x7020, 0x8001, 0x7022, 0x600c, 0xa015, 0x0150,</div><div class='del'>-	0x7216, 0x600f, 0x0000, 0x7007, 0x0000, 0x7027, 0x0000, 0x00ce,</div><div class='del'>-	0x00ee, 0x0005, 0x7216, 0x7212, 0x0cb0, 0x6018, 0x2060, 0x080c,</div><div class='del'>-	0x4f46, 0x6000, 0xc0dc, 0x6002, 0x7020, 0x8001, 0x7022, 0x0120,</div><div class='del'>-	0x6054, 0xa015, 0x0140, 0x721e, 0x7007, 0x0000, 0x7027, 0x0000,</div><div class='del'>-	0x00ce, 0x00ee, 0x0005, 0x7218, 0x721e, 0x0cb0, 0x7024, 0xa065,</div><div class='del'>-	0x05b8, 0x700c, 0xac06, 0x1160, 0x080c, 0x81a5, 0x600c, 0xa015,</div><div class='del'>-	0x0120, 0x720e, 0x600f, 0x0000, 0x0448, 0x720e, 0x720a, 0x0430,</div><div class='del'>-	0x7014, 0xac06, 0x1160, 0x080c, 0x81a5, 0x600c, 0xa015, 0x0120,</div><div class='del'>-	0x7216, 0x600f, 0x0000, 0x00d0, 0x7216, 0x7212, 0x00b8, 0x601c,</div><div class='del'>-	0xa086, 0x0003, 0x1198, 0x6018, 0x2060, 0x080c, 0x4f46, 0x6000,</div><div class='del'>-	0xc0dc, 0x6002, 0x080c, 0x81a5, 0x701c, 0xa065, 0x0138, 0x6054,</div><div class='del'>-	0xa015, 0x0110, 0x721e, 0x0010, 0x7218, 0x721e, 0x7027, 0x0000,</div><div class='del'>-	0x00ce, 0x00ee, 0x0005, 0x7024, 0xa065, 0x0140, 0x080c, 0x81a5,</div><div class='del'>-	0x600c, 0xa015, 0x0150, 0x720e, 0x600f, 0x0000, 0x080c, 0x82d4,</div><div class='del'>-	0x7027, 0x0000, 0x00ce, 0x00ee, 0x0005, 0x720e, 0x720a, 0x0cb0,</div><div class='del'>-	0x00d6, 0x2069, 0xb8e1, 0x6830, 0xa084, 0x0003, 0x0002, 0x71a5,</div><div class='del'>-	0x71a7, 0x71cb, 0x71a3, 0x080c, 0x151a, 0x00de, 0x0005, 0x00c6,</div><div class='del'>-	0x6840, 0xa086, 0x0001, 0x01b8, 0x683c, 0xa065, 0x0130, 0x600c,</div><div class='del'>-	0xa015, 0x0170, 0x6a3a, 0x600f, 0x0000, 0x6833, 0x0000, 0x683f,</div><div class='del'>-	0x0000, 0x2011, 0xb900, 0x2013, 0x0000, 0x00ce, 0x00de, 0x0005,</div><div class='del'>-	0x683a, 0x6836, 0x0c90, 0x6843, 0x0000, 0x6838, 0xa065, 0x0d68,</div><div class='del'>-	0x6003, 0x0003, 0x0c50, 0x00c6, 0x6843, 0x0000, 0x6847, 0x0000,</div><div class='del'>-	0x684b, 0x0000, 0x683c, 0xa065, 0x0168, 0x600c, 0xa015, 0x0130,</div><div class='del'>-	0x6a3a, 0x600f, 0x0000, 0x683f, 0x0000, 0x0020, 0x683f, 0x0000,</div><div class='del'>-	0x683a, 0x6836, 0x00ce, 0x00de, 0x0005, 0x00d6, 0x2069, 0xb8e1,</div><div class='del'>-	0x6804, 0xa084, 0x0007, 0x0002, 0x71f6, 0x7292, 0x7292, 0x7292,</div><div class='del'>-	0x7292, 0x7294, 0x71f4, 0x71f4, 0x080c, 0x151a, 0x6820, 0xa005,</div><div class='del'>-	0x1110, 0x00de, 0x0005, 0x00c6, 0x680c, 0xa065, 0x0150, 0x6807,</div><div class='del'>-	0x0004, 0x6826, 0x682b, 0x0000, 0x080c, 0x72e4, 0x00ce, 0x00de,</div><div class='del'>-	0x0005, 0x6814, 0xa065, 0x0150, 0x6807, 0x0001, 0x6826, 0x682b,</div><div class='del'>-	0x0000, 0x080c, 0x72e4, 0x00ce, 0x00de, 0x0005, 0x00e6, 0x0036,</div><div class='del'>-	0x6a1c, 0xa2f5, 0x0000, 0x0904, 0x728e, 0x704c, 0xa00d, 0x0118,</div><div class='del'>-	0x7088, 0xa005, 0x01a0, 0x7054, 0xa075, 0x0120, 0xa20e, 0x0904,</div><div class='del'>-	0x728e, 0x0028, 0x6818, 0xa20e, 0x0904, 0x728e, 0x2070, 0x704c,</div><div class='del'>-	0xa00d, 0x0d88, 0x7088, 0xa005, 0x1d70, 0x2e00, 0x681e, 0x733c,</div><div class='del'>-	0x7038, 0xa302, 0x1e40, 0x080c, 0x867b, 0x0904, 0x728e, 0x8318,</div><div class='del'>-	0x733e, 0x6112, 0x2e10, 0x621a, 0xa180, 0x0014, 0x2004, 0xa084,</div><div class='del'>-	0x00ff, 0x605a, 0xa180, 0x0014, 0x2003, 0x0000, 0xa180, 0x0015,</div><div class='del'>-	0x2004, 0xa08a, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x801b,</div><div class='del'>-	0x831b, 0xa318, 0x6316, 0x003e, 0x00f6, 0x2c78, 0x71a0, 0x2001,</div><div class='del'>-	0xb635, 0x2004, 0xd0ac, 0x1110, 0xd1bc, 0x0150, 0x7100, 0xd1f4,</div><div class='del'>-	0x0120, 0x7114, 0xa18c, 0x00ff, 0x0040, 0x2009, 0x0000, 0x0028,</div><div class='del'>-	0xa1e0, 0x2df9, 0x2c0d, 0xa18c, 0x00ff, 0x2061, 0x0100, 0x619a,</div><div class='del'>-	0x080c, 0x7914, 0x7300, 0xc3dd, 0x7302, 0x6807, 0x0002, 0x2f18,</div><div class='del'>-	0x6b26, 0x682b, 0x0000, 0x781f, 0x0003, 0x7803, 0x0001, 0x7807,</div><div class='del'>-	0x0040, 0x00fe, 0x00ee, 0x00ce, 0x00de, 0x0005, 0x003e, 0x00ee,</div><div class='del'>-	0x00ce, 0x0cd0, 0x00de, 0x0005, 0x00c6, 0x680c, 0xa065, 0x0138,</div><div class='del'>-	0x6807, 0x0004, 0x6826, 0x682b, 0x0000, 0x080c, 0x72e4, 0x00ce,</div><div class='del'>-	0x00de, 0x0005, 0x00f6, 0x00d6, 0x2069, 0xb8e1, 0x6830, 0xa086,</div><div class='del'>-	0x0000, 0x11d0, 0x2001, 0xb60c, 0x200c, 0xd1bc, 0x1560, 0x6838,</div><div class='del'>-	0xa07d, 0x0190, 0x6833, 0x0001, 0x683e, 0x6847, 0x0000, 0x684b,</div><div class='del'>-	0x0000, 0x0126, 0x00f6, 0x2091, 0x2400, 0x002e, 0x080c, 0x203d,</div><div class='del'>-	0x1130, 0x012e, 0x080c, 0x7c5d, 0x00de, 0x00fe, 0x0005, 0x012e,</div><div class='del'>-	0xe000, 0x6843, 0x0000, 0x7803, 0x0002, 0x780c, 0xa015, 0x0140,</div><div class='del'>-	0x6a3a, 0x780f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000, 0x0c60,</div><div class='del'>-	0x683a, 0x6836, 0x0cc0, 0xc1bc, 0x2102, 0x0066, 0x2031, 0x0001,</div><div class='del'>-	0x080c, 0x5bc3, 0x006e, 0x0858, 0x601c, 0xa084, 0x000f, 0x000b,</div><div class='del'>-	0x0005, 0x72f2, 0x72f7, 0x77b5, 0x78d1, 0x72f7, 0x77b5, 0x78d1,</div><div class='del'>-	0x72f2, 0x72f7, 0x080c, 0x7102, 0x080c, 0x71e5, 0x0005, 0x0156,</div><div class='del'>-	0x0136, 0x0146, 0x00c6, 0x00f6, 0x6004, 0xa08a, 0x0080, 0x1a0c,</div><div class='del'>-	0x151a, 0x6118, 0x2178, 0x79a0, 0x2011, 0xb635, 0x2214, 0xd2ac,</div><div class='del'>-	0x1110, 0xd1bc, 0x0150, 0x7900, 0xd1f4, 0x0120, 0x7914, 0xa18c,</div><div class='del'>-	0x00ff, 0x0040, 0x2009, 0x0000, 0x0028, 0xa1f8, 0x2df9, 0x2f0d,</div><div class='del'>-	0xa18c, 0x00ff, 0x2c78, 0x2061, 0x0100, 0x619a, 0xa08a, 0x0040,</div><div class='del'>-	0x1a04, 0x736b, 0x0033, 0x00fe, 0x00ce, 0x014e, 0x013e, 0x015e,</div><div class='del'>-	0x0005, 0x741a, 0x7465, 0x7492, 0x755f, 0x758d, 0x7595, 0x75bb,</div><div class='del'>-	0x75cc, 0x75dd, 0x75e5, 0x75fb, 0x75e5, 0x765c, 0x75cc, 0x767d,</div><div class='del'>-	0x7685, 0x75dd, 0x7685, 0x7696, 0x7369, 0x7369, 0x7369, 0x7369,</div><div class='del'>-	0x7369, 0x7369, 0x7369, 0x7369, 0x7369, 0x7369, 0x7369, 0x7efe,</div><div class='del'>-	0x7f23, 0x7f46, 0x7f69, 0x7f8a, 0x75bb, 0x7369, 0x75bb, 0x75e5,</div><div class='del'>-	0x7369, 0x7492, 0x755f, 0x7369, 0x83d6, 0x75e5, 0x7369, 0x83f6,</div><div class='del'>-	0x75e5, 0x7369, 0x75dd, 0x7413, 0x737e, 0x7369, 0x841b, 0x8490,</div><div class='del'>-	0x8567, 0x7369, 0x8578, 0x75b6, 0x8594, 0x7369, 0x7f9f, 0x85ef,</div><div class='del'>-	0x7369, 0x080c, 0x151a, 0x2100, 0x0033, 0x00fe, 0x00ce, 0x014e,</div><div class='del'>-	0x013e, 0x015e, 0x0005, 0x737c, 0x737c, 0x737c, 0x73b2, 0x73d0,</div><div class='del'>-	0x73e6, 0x737c, 0x737c, 0x737c, 0x080c, 0x151a, 0x00d6, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x76b3, 0x7810, 0x2068, 0x20a3, 0x2414, 0x20a3,</div><div class='del'>-	0x0018, 0x20a3, 0x0800, 0x683c, 0x20a2, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x6850, 0x20a2, 0x6854,</div><div class='del'>-	0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0018, 0x080c,</div><div class='del'>-	0x7de0, 0x00de, 0x0005, 0x00d6, 0x7818, 0x2068, 0x68a0, 0x2069,</div><div class='del'>-	0xb600, 0x6ad4, 0xd2ac, 0x1110, 0xd0bc, 0x0110, 0xa085, 0x0001,</div><div class='del'>-	0x00de, 0x0005, 0x00d6, 0x20a1, 0x020b, 0x080c, 0x76b3, 0x20a3,</div><div class='del'>-	0x0500, 0x20a3, 0x0000, 0x7810, 0xa0e8, 0x000f, 0x6808, 0x20a2,</div><div class='del'>-	0x680c, 0x20a2, 0x6810, 0x20a2, 0x6814, 0x20a2, 0x6818, 0x20a2,</div><div class='del'>-	0x681c, 0x20a2, 0x60c3, 0x0010, 0x080c, 0x7de0, 0x00de, 0x0005,</div><div class='del'>-	0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x76b3, 0x20a3, 0x7800,</div><div class='del'>-	0x20a3, 0x0000, 0x7808, 0x8007, 0x20a2, 0x20a3, 0x0000, 0x60c3,</div><div class='del'>-	0x0008, 0x080c, 0x7de0, 0x014e, 0x015e, 0x0005, 0x0156, 0x0146,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x774f, 0x20a3, 0x0200, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0xdf10, 0x20a3, 0x0034, 0x2099, 0xb605, 0x20a9, 0x0004,</div><div class='del'>-	0x53a6, 0x2099, 0xb601, 0x20a9, 0x0004, 0x53a6, 0x2099, 0xb8c7,</div><div class='del'>-	0x20a9, 0x001a, 0x3304, 0x8007, 0x20a2, 0x9398, 0x1f04, 0x7402,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x004c, 0x080c, 0x7de0,</div><div class='del'>-	0x014e, 0x015e, 0x0005, 0x2001, 0xb615, 0x2004, 0x609a, 0x080c,</div><div class='del'>-	0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c, 0x76b3, 0x20a3, 0x5200,</div><div class='del'>-	0x20a3, 0x0000, 0x00d6, 0x2069, 0xb652, 0x6804, 0xd084, 0x0150,</div><div class='del'>-	0x6828, 0x20a3, 0x0000, 0x0016, 0x080c, 0x2866, 0x21a2, 0x001e,</div><div class='del'>-	0x00de, 0x0028, 0x00de, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a9,</div><div class='del'>-	0x0004, 0x2099, 0xb605, 0x53a6, 0x20a9, 0x0004, 0x2099, 0xb601,</div><div class='del'>-	0x53a6, 0x2001, 0xb635, 0x2004, 0xd0ac, 0x1138, 0x7818, 0xa080,</div><div class='del'>-	0x0028, 0x2004, 0xa082, 0x007f, 0x0238, 0x2001, 0xb61c, 0x20a6,</div><div class='del'>-	0x2001, 0xb61d, 0x20a6, 0x0040, 0x20a3, 0x0000, 0x2001, 0xb615,</div><div class='del'>-	0x2004, 0xa084, 0x00ff, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x001c, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x76b3, 0x20a3, 0x0500, 0x20a3, 0x0000, 0x2001, 0xb635, 0x2004,</div><div class='del'>-	0xd0ac, 0x1138, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082, 0x007f,</div><div class='del'>-	0x0238, 0x2001, 0xb61c, 0x20a6, 0x2001, 0xb61d, 0x20a6, 0x0040,</div><div class='del'>-	0x20a3, 0x0000, 0x2001, 0xb615, 0x2004, 0xa084, 0x00ff, 0x20a2,</div><div class='del'>-	0x20a9, 0x0004, 0x2099, 0xb605, 0x53a6, 0x60c3, 0x0010, 0x080c,</div><div class='del'>-	0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c, 0x76b3, 0x00c6, 0x7818,</div><div class='del'>-	0x2060, 0x2001, 0x0000, 0x080c, 0x5385, 0x00ce, 0x7818, 0xa080,</div><div class='del'>-	0x0028, 0x2004, 0xa086, 0x007e, 0x1130, 0x20a3, 0x0400, 0x620c,</div><div class='del'>-	0xc2b4, 0x620e, 0x0010, 0x20a3, 0x0300, 0x20a3, 0x0000, 0x7818,</div><div class='del'>-	0xa080, 0x0028, 0x2004, 0xa086, 0x007e, 0x1904, 0x7521, 0x2001,</div><div class='del'>-	0xb635, 0x2004, 0xd0a4, 0x01c8, 0x2099, 0xb88e, 0x33a6, 0x9398,</div><div class='del'>-	0x20a3, 0x0000, 0x9398, 0x3304, 0xa084, 0x2000, 0x20a2, 0x9398,</div><div class='del'>-	0x33a6, 0x9398, 0x20a3, 0x0000, 0x9398, 0x2001, 0x2710, 0x20a2,</div><div class='del'>-	0x9398, 0x33a6, 0x9398, 0x33a6, 0x00d0, 0x2099, 0xb88e, 0x33a6,</div><div class='del'>-	0x9398, 0x33a6, 0x9398, 0x3304, 0x080c, 0x5b41, 0x1118, 0xa084,</div><div class='del'>-	0x37ff, 0x0010, 0xa084, 0x3fff, 0x20a2, 0x9398, 0x33a6, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a9,</div><div class='del'>-	0x0004, 0x2099, 0xb605, 0x53a6, 0x20a9, 0x0004, 0x2099, 0xb601,</div><div class='del'>-	0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x1f04, 0x74fb, 0x20a9,</div><div class='del'>-	0x0008, 0x20a3, 0x0000, 0x1f04, 0x7501, 0x2099, 0xb896, 0x3304,</div><div class='del'>-	0xc0dd, 0x20a2, 0x2001, 0xb672, 0x2004, 0xd0e4, 0x0158, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x9398, 0x9398, 0x9398, 0x33a6, 0x20a9,</div><div class='del'>-	0x0004, 0x0010, 0x20a9, 0x0007, 0x20a3, 0x0000, 0x1f04, 0x751c,</div><div class='del'>-	0x0468, 0x2001, 0xb635, 0x2004, 0xd0a4, 0x0140, 0x2001, 0xb88f,</div><div class='del'>-	0x2004, 0x60e3, 0x0000, 0x080c, 0x28a7, 0x60e2, 0x2099, 0xb88e,</div><div class='del'>-	0x20a9, 0x0008, 0x53a6, 0x20a9, 0x0004, 0x2099, 0xb605, 0x53a6,</div><div class='del'>-	0x20a9, 0x0004, 0x2099, 0xb601, 0x53a6, 0x20a9, 0x0008, 0x20a3,</div><div class='del'>-	0x0000, 0x1f04, 0x753f, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x1f04,</div><div class='del'>-	0x7545, 0x2099, 0xb896, 0x20a9, 0x0008, 0x53a6, 0x20a9, 0x0008,</div><div class='del'>-	0x20a3, 0x0000, 0x1f04, 0x7550, 0x20a9, 0x000a, 0x20a3, 0x0000,</div><div class='del'>-	0x1f04, 0x7556, 0x60c3, 0x0074, 0x080c, 0x7de0, 0x0005, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x76b3, 0x20a3, 0x2010, 0x20a3, 0x0014, 0x20a3,</div><div class='del'>-	0x0800, 0x20a3, 0x2000, 0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2,</div><div class='del'>-	0x20a2, 0x00f6, 0x2079, 0xb652, 0x7904, 0x00fe, 0xd1ac, 0x1110,</div><div class='del'>-	0xa085, 0x0020, 0xd1a4, 0x0110, 0xa085, 0x0010, 0xa085, 0x0002,</div><div class='del'>-	0x00d6, 0x0804, 0x763e, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0014, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x76b3, 0x20a3, 0x5000, 0x0804, 0x74ad, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x76b3, 0x20a3, 0x2110, 0x20a3, 0x0014, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0000, 0x60c3, 0x0014, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b,</div><div class='del'>-	0x080c, 0x7747, 0x0020, 0x20a1, 0x020b, 0x080c, 0x774f, 0x20a3,</div><div class='del'>-	0x0200, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3,</div><div class='del'>-	0x0004, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c, 0x774f,</div><div class='del'>-	0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0x0003, 0x20a3, 0x2a00,</div><div class='del'>-	0x60c3, 0x0008, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x774f, 0x20a3, 0x0200, 0x0804, 0x74ad, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x774f, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0xa005, 0x0110,</div><div class='del'>-	0x20a2, 0x0010, 0x20a3, 0x0003, 0x7810, 0x20a2, 0x60c3, 0x0008,</div><div class='del'>-	0x080c, 0x7de0, 0x0005, 0x00d6, 0x20a1, 0x020b, 0x080c, 0x774f,</div><div class='del'>-	0x20a3, 0x0210, 0x20a3, 0x0014, 0x20a3, 0x0800, 0x7818, 0x2068,</div><div class='del'>-	0x6894, 0xa086, 0x0014, 0x1198, 0x699c, 0xa184, 0x0030, 0x0190,</div><div class='del'>-	0x6998, 0xa184, 0xc000, 0x1140, 0xd1ec, 0x0118, 0x20a3, 0x2100,</div><div class='del'>-	0x0058, 0x20a3, 0x0100, 0x0040, 0x20a3, 0x0400, 0x0028, 0x20a3,</div><div class='del'>-	0x0700, 0x0010, 0x700f, 0x0800, 0xa006, 0x20a2, 0x20a2, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x00f6, 0x2079, 0xb652, 0x7904, 0x00fe, 0xd1ac,</div><div class='del'>-	0x1110, 0xa085, 0x0020, 0xd1a4, 0x0110, 0xa085, 0x0010, 0x2009,</div><div class='del'>-	0xb674, 0x210c, 0xd184, 0x1110, 0xa085, 0x0002, 0x0026, 0x2009,</div><div class='del'>-	0xb672, 0x210c, 0xd1e4, 0x0130, 0xc0c5, 0xa094, 0x0030, 0xa296,</div><div class='del'>-	0x0010, 0x0140, 0xd1ec, 0x0130, 0xa094, 0x0030, 0xa296, 0x0010,</div><div class='del'>-	0x0108, 0xc0bd, 0x002e, 0x20a2, 0x20a2, 0x20a2, 0x60c3, 0x0014,</div><div class='del'>-	0x080c, 0x7de0, 0x00de, 0x0005, 0x20a1, 0x020b, 0x080c, 0x774f,</div><div class='del'>-	0x20a3, 0x0210, 0x20a3, 0x0014, 0x20a3, 0x0000, 0x20a3, 0x0100,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x60c3, 0x0014, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x774f, 0x20a3, 0x0200, 0x0804, 0x7420, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x774f, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0x0003, 0x20a3,</div><div class='del'>-	0x2a00, 0x60c3, 0x0008, 0x080c, 0x7de0, 0x0005, 0x20e1, 0x9080,</div><div class='del'>-	0x20e1, 0x4000, 0x20a1, 0x020b, 0x080c, 0x774f, 0x20a3, 0x0100,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x000b, 0x20a3, 0x0000, 0x60c3, 0x0008,</div><div class='del'>-	0x080c, 0x7de0, 0x0005, 0x0026, 0x0036, 0x0046, 0x2019, 0x3200,</div><div class='del'>-	0x2021, 0x0800, 0x0038, 0x0026, 0x0036, 0x0046, 0x2019, 0x2200,</div><div class='del'>-	0x2021, 0x0100, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080,</div><div class='del'>-	0x0028, 0x2014, 0xa286, 0x007e, 0x11a0, 0xa385, 0x00ff, 0x20a2,</div><div class='del'>-	0x20a3, 0xfffe, 0x20a3, 0x0000, 0x2011, 0xb615, 0x2214, 0x2001,</div><div class='del'>-	0xb89e, 0x2004, 0xa005, 0x0118, 0x2011, 0xb61d, 0x2214, 0x22a2,</div><div class='del'>-	0x04d0, 0xa286, 0x007f, 0x1138, 0x00d6, 0xa385, 0x00ff, 0x20a2,</div><div class='del'>-	0x20a3, 0xfffd, 0x00c8, 0x2001, 0xb635, 0x2004, 0xd0ac, 0x1110,</div><div class='del'>-	0xd2bc, 0x01c8, 0xa286, 0x0080, 0x00d6, 0x1130, 0xa385, 0x00ff,</div><div class='del'>-	0x20a2, 0x20a3, 0xfffc, 0x0040, 0xa2e8, 0xb735, 0x2d6c, 0x6810,</div><div class='del'>-	0xa305, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xb61c, 0x2da6, 0x8d68,</div><div class='del'>-	0x2da6, 0x00de, 0x0080, 0x00d6, 0xa2e8, 0xb735, 0x2d6c, 0x6810,</div><div class='del'>-	0xa305, 0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011,</div><div class='del'>-	0xb615, 0x2214, 0x22a2, 0xa485, 0x0029, 0x20a2, 0x004e, 0x003e,</div><div class='del'>-	0x20a3, 0x0000, 0x080c, 0x7dcf, 0x22a2, 0x20a3, 0x0000, 0x2fa2,</div><div class='del'>-	0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e, 0x0005,</div><div class='del'>-	0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a3, 0x02ff, 0x2011,</div><div class='del'>-	0xfffc, 0x22a2, 0x00d6, 0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6,</div><div class='del'>-	0x00de, 0x20a3, 0x2029, 0x20a3, 0x0000, 0x08e0, 0x20a3, 0x0100,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0xfc02, 0x20a3, 0x0000, 0x0005, 0x0026,</div><div class='del'>-	0x0036, 0x0046, 0x2019, 0x3300, 0x2021, 0x0800, 0x0038, 0x0026,</div><div class='del'>-	0x0036, 0x0046, 0x2019, 0x2300, 0x2021, 0x0100, 0x20e1, 0x9080,</div><div class='del'>-	0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xb635,</div><div class='del'>-	0x2214, 0xd2ac, 0x1118, 0xa092, 0x007e, 0x02d8, 0x00d6, 0xa0e8,</div><div class='del'>-	0xb735, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x6810,</div><div class='del'>-	0xa005, 0x1140, 0x6814, 0xa005, 0x1128, 0x20a3, 0x00ff, 0x20a3,</div><div class='del'>-	0xfffe, 0x0028, 0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,</div><div class='del'>-	0x0080, 0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa305, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xb615, 0x2214,</div><div class='del'>-	0x22a2, 0xa485, 0x0098, 0x20a2, 0x20a3, 0x0000, 0x004e, 0x003e,</div><div class='del'>-	0x080c, 0x7dcf, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e, 0x0005, 0x080c, 0x7dcf,</div><div class='del'>-	0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x7810, 0x20a2, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x002e, 0x0005, 0x00c6, 0x00f6, 0x6004,</div><div class='del'>-	0xa08a, 0x0085, 0x0a0c, 0x151a, 0xa08a, 0x008c, 0x1a0c, 0x151a,</div><div class='del'>-	0x6118, 0x2178, 0x79a0, 0x2011, 0xb635, 0x2214, 0xd2ac, 0x1110,</div><div class='del'>-	0xd1bc, 0x0150, 0x7900, 0xd1f4, 0x0120, 0x7914, 0xa18c, 0x00ff,</div><div class='del'>-	0x0040, 0x2009, 0x0000, 0x0028, 0xa1f8, 0x2df9, 0x2f0d, 0xa18c,</div><div class='del'>-	0x00ff, 0x2c78, 0x2061, 0x0100, 0x619a, 0xa082, 0x0085, 0x001b,</div><div class='del'>-	0x00fe, 0x00ce, 0x0005, 0x77ec, 0x77f6, 0x7811, 0x77ea, 0x77ea,</div><div class='del'>-	0x77ea, 0x77ec, 0x080c, 0x151a, 0x0146, 0x20a1, 0x020b, 0x04a1,</div><div class='del'>-	0x60c3, 0x0000, 0x080c, 0x7de0, 0x014e, 0x0005, 0x0146, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x785d, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x7808,</div><div class='del'>-	0x20a2, 0x7810, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0xffff, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x60c3, 0x000c, 0x080c, 0x7de0, 0x014e,</div><div class='del'>-	0x0005, 0x0146, 0x20a1, 0x020b, 0x080c, 0x7897, 0x20a3, 0x0003,</div><div class='del'>-	0x20a3, 0x0300, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0004,</div><div class='del'>-	0x080c, 0x7de0, 0x014e, 0x0005, 0x0026, 0x20e1, 0x9080, 0x20e1,</div><div class='del'>-	0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xb635, 0x2214,</div><div class='del'>-	0xd2ac, 0x1118, 0xa092, 0x007e, 0x0288, 0x00d6, 0xa0e8, 0xb735,</div><div class='del'>-	0x2d6c, 0x6810, 0xa085, 0x8100, 0x20a2, 0x6814, 0x20a2, 0x2069,</div><div class='del'>-	0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8,</div><div class='del'>-	0xb735, 0x2d6c, 0x6810, 0xa085, 0x8100, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x00de, 0x20a3, 0x0000, 0x2011, 0xb615, 0x2214, 0x22a2, 0x20a3,</div><div class='del'>-	0x0009, 0x20a3, 0x0000, 0x0804, 0x771a, 0x0026, 0x20e1, 0x9080,</div><div class='del'>-	0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xb635,</div><div class='del'>-	0x2214, 0xd2ac, 0x1118, 0xa092, 0x007e, 0x0288, 0x00d6, 0xa0e8,</div><div class='del'>-	0xb735, 0x2d6c, 0x6810, 0xa085, 0x8400, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6,</div><div class='del'>-	0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x8400, 0x20a2, 0x6814,</div><div class='del'>-	0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xb615, 0x2214, 0x22a2,</div><div class='del'>-	0x2001, 0x0099, 0x20a2, 0x20a3, 0x0000, 0x0804, 0x77a6, 0x0026,</div><div class='del'>-	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004,</div><div class='del'>-	0x2011, 0xb635, 0x2214, 0xd2ac, 0x1118, 0xa092, 0x007e, 0x0288,</div><div class='del'>-	0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x8500, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,</div><div class='del'>-	0x0088, 0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x8500,</div><div class='del'>-	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xb615,</div><div class='del'>-	0x2214, 0x22a2, 0x2001, 0x0099, 0x20a2, 0x20a3, 0x0000, 0x0804,</div><div class='del'>-	0x77a6, 0x00c6, 0x00f6, 0x2c78, 0x7804, 0xa08a, 0x0040, 0x0a0c,</div><div class='del'>-	0x151a, 0xa08a, 0x0053, 0x1a0c, 0x151a, 0x7918, 0x2160, 0x61a0,</div><div class='del'>-	0x2011, 0xb635, 0x2214, 0xd2ac, 0x1110, 0xd1bc, 0x0150, 0x6100,</div><div class='del'>-	0xd1f4, 0x0120, 0x6114, 0xa18c, 0x00ff, 0x0040, 0x2009, 0x0000,</div><div class='del'>-	0x0028, 0xa1e0, 0x2df9, 0x2c0d, 0xa18c, 0x00ff, 0x2061, 0x0100,</div><div class='del'>-	0x619a, 0xa082, 0x0040, 0x001b, 0x00fe, 0x00ce, 0x0005, 0x7914,</div><div class='del'>-	0x7a20, 0x79bd, 0x7bd2, 0x7912, 0x7912, 0x7912, 0x7912, 0x7912,</div><div class='del'>-	0x7912, 0x7912, 0x815e, 0x816e, 0x817e, 0x818e, 0x7912, 0x85a5,</div><div class='del'>-	0x7912, 0x814d, 0x080c, 0x151a, 0x00d6, 0x0156, 0x0146, 0x780b,</div><div class='del'>-	0xffff, 0x20a1, 0x020b, 0x080c, 0x7974, 0x7910, 0x2168, 0x6948,</div><div class='del'>-	0x7952, 0x21a2, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x694c, 0xa184,</div><div class='del'>-	0x000f, 0x1118, 0x2001, 0x0005, 0x0040, 0xd184, 0x0118, 0x2001,</div><div class='del'>-	0x0004, 0x0018, 0xa084, 0x0006, 0x8004, 0x0016, 0x2008, 0x7858,</div><div class='del'>-	0xa084, 0x00ff, 0x8007, 0xa105, 0x001e, 0x20a2, 0xd1ac, 0x0118,</div><div class='del'>-	0x20a3, 0x0002, 0x0048, 0xd1b4, 0x0118, 0x20a3, 0x0001, 0x0020,</div><div class='del'>-	0x20a3, 0x0000, 0x2230, 0x0010, 0x6a80, 0x6e7c, 0x20a9, 0x0008,</div><div class='del'>-	0x0136, 0xad88, 0x0017, 0x2198, 0x20a1, 0x021b, 0x53a6, 0x013e,</div><div class='del'>-	0x20a1, 0x020b, 0x22a2, 0x26a2, 0x60c3, 0x0020, 0x20e1, 0x9080,</div><div class='del'>-	0x6014, 0xa084, 0x0004, 0xa085, 0x0009, 0x6016, 0x2001, 0xb8fd,</div><div class='del'>-	0x2003, 0x07d0, 0x2001, 0xb8fc, 0x2003, 0x0009, 0x080c, 0x17e7,</div><div class='del'>-	0x014e, 0x015e, 0x00de, 0x0005, 0x20e1, 0x9080, 0x20e1, 0x4000,</div><div class='del'>-	0x7a18, 0xa280, 0x0023, 0x2014, 0x8210, 0xa294, 0x00ff, 0x2202,</div><div class='del'>-	0x8217, 0x7818, 0xa080, 0x0028, 0x2004, 0x2019, 0xb635, 0x231c,</div><div class='del'>-	0xd3ac, 0x1110, 0xd0bc, 0x0188, 0x00d6, 0xa0e8, 0xb735, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x0600, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xb61c,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xb735,</div><div class='del'>-	0x2d6c, 0x6810, 0xa085, 0x0600, 0x20a2, 0x6814, 0x20a2, 0x00de,</div><div class='del'>-	0x20a3, 0x0000, 0x2009, 0xb615, 0x210c, 0x21a2, 0x20a3, 0x0829,</div><div class='del'>-	0x20a3, 0x0000, 0x22a2, 0x20a3, 0x0000, 0x2fa2, 0x20a3, 0xffff,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x0005, 0x00d6, 0x0156, 0x0136,</div><div class='del'>-	0x0146, 0x20a1, 0x020b, 0x00c1, 0x7810, 0x2068, 0x6860, 0x20a2,</div><div class='del'>-	0x685c, 0x20a2, 0x6880, 0x20a2, 0x687c, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x60c3, 0x000c, 0x080c, 0x7de0, 0x014e,</div><div class='del'>-	0x013e, 0x015e, 0x00de, 0x0005, 0x0026, 0x20e1, 0x9080, 0x20e1,</div><div class='del'>-	0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xb635, 0x2214,</div><div class='del'>-	0xd2ac, 0x1110, 0xd0bc, 0x0188, 0x00d6, 0xa0e8, 0xb735, 0x2d6c,</div><div class='del'>-	0x6810, 0xa085, 0x0500, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xb61c,</div><div class='del'>-	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xb735,</div><div class='del'>-	0x2d6c, 0x6810, 0xa085, 0x0500, 0x20a2, 0x6814, 0x20a2, 0x00de,</div><div class='del'>-	0x20a3, 0x0000, 0x2011, 0xb615, 0x2214, 0x22a2, 0x20a3, 0x0889,</div><div class='del'>-	0x20a3, 0x0000, 0x080c, 0x7dcf, 0x22a2, 0x20a3, 0x0000, 0x7a08,</div><div class='del'>-	0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e, 0x0005,</div><div class='del'>-	0x00d6, 0x0156, 0x0136, 0x0146, 0x7810, 0xa0ec, 0xf000, 0x0168,</div><div class='del'>-	0xa06d, 0x080c, 0x5373, 0x0148, 0x684c, 0xa084, 0x2020, 0xa086,</div><div class='del'>-	0x2020, 0x1118, 0x7820, 0xc0cd, 0x7822, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x7b88, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x7810,</div><div class='del'>-	0xa084, 0xf000, 0x1130, 0x7810, 0xa084, 0x0700, 0x8007, 0x0043,</div><div class='del'>-	0x0010, 0xa006, 0x002b, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005,</div><div class='del'>-	0x7a5a, 0x7aef, 0x7aff, 0x7b31, 0x7b44, 0x7b5f, 0x7b68, 0x7a58,</div><div class='del'>-	0x080c, 0x151a, 0x0016, 0x0036, 0x694c, 0xa18c, 0x0003, 0x0118,</div><div class='del'>-	0xa186, 0x0003, 0x1170, 0x6b78, 0x7820, 0xd0cc, 0x0108, 0xc3e5,</div><div class='del'>-	0x23a2, 0x6868, 0x20a2, 0x6864, 0x20a2, 0x003e, 0x001e, 0x0804,</div><div class='del'>-	0x7b3b, 0xa186, 0x0001, 0x190c, 0x151a, 0x6b78, 0x7820, 0xd0cc,</div><div class='del'>-	0x0108, 0xc3e5, 0x23a2, 0x6868, 0x20a2, 0x6864, 0x20a2, 0x22a2,</div><div class='del'>-	0x6874, 0x20a2, 0x22a2, 0x687c, 0x20a2, 0x2009, 0x0018, 0xa384,</div><div class='del'>-	0x0300, 0x0904, 0x7ae9, 0xd3c4, 0x0110, 0x687c, 0xa108, 0xd3cc,</div><div class='del'>-	0x0110, 0x6874, 0xa108, 0x0156, 0x20a9, 0x000d, 0xad80, 0x0020,</div><div class='del'>-	0x201c, 0x831f, 0x23a2, 0x8000, 0x1f04, 0x7a98, 0x015e, 0x22a2,</div><div class='del'>-	0x22a2, 0x22a2, 0xa184, 0x0003, 0x0904, 0x7ae9, 0x20a1, 0x020b,</div><div class='del'>-	0x20e1, 0x9080, 0x20e1, 0x4000, 0x0006, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0x2011, 0xb635, 0x2214, 0xd2ac, 0x1110, 0xd0bc, 0x0188,</div><div class='del'>-	0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,</div><div class='del'>-	0x0088, 0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0700,</div><div class='del'>-	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xb615,</div><div class='del'>-	0x2214, 0x22a2, 0x000e, 0x7b20, 0xd3cc, 0x0118, 0x20a3, 0x0889,</div><div class='del'>-	0x0010, 0x20a3, 0x0898, 0x20a2, 0x080c, 0x7dcf, 0x22a2, 0x20a3,</div><div class='del'>-	0x0000, 0x61c2, 0x003e, 0x001e, 0x080c, 0x7de0, 0x0005, 0x2011,</div><div class='del'>-	0x0008, 0x2001, 0xb60d, 0x2004, 0xd0f4, 0x0110, 0x2011, 0x0028,</div><div class='del'>-	0x7820, 0xd0cc, 0x0108, 0xc2e5, 0x22a2, 0xa016, 0x04d0, 0x2011,</div><div class='del'>-	0x0302, 0x0016, 0x0036, 0x7828, 0x792c, 0xa11d, 0x0108, 0xc2dd,</div><div class='del'>-	0x7b20, 0xd3cc, 0x0108, 0xc2e5, 0x22a2, 0x20a2, 0x21a2, 0x003e,</div><div class='del'>-	0x001e, 0xa016, 0x22a2, 0x20a3, 0x0012, 0x22a2, 0x20a3, 0x0008,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x7000, 0x20a3, 0x0500,</div><div class='del'>-	0x22a2, 0x20a3, 0x000a, 0x22a2, 0x22a2, 0x20a3, 0x2500, 0x22a2,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0032, 0x080c, 0x7de0,</div><div class='del'>-	0x0005, 0x2011, 0x0028, 0x7820, 0xd0cc, 0x0108, 0xc2e5, 0x22a2,</div><div class='del'>-	0xa016, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x60c3,</div><div class='del'>-	0x0018, 0x080c, 0x7de0, 0x0005, 0x2011, 0x0100, 0x7820, 0xd0cc,</div><div class='del'>-	0x0108, 0xc2e5, 0x22a2, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x22a2,</div><div class='del'>-	0x22a2, 0x20a3, 0x0008, 0x22a2, 0x7854, 0xa084, 0x00ff, 0x20a2,</div><div class='del'>-	0x22a2, 0x22a2, 0x60c3, 0x0020, 0x080c, 0x7de0, 0x0005, 0x2011,</div><div class='del'>-	0x0008, 0x7820, 0xd0cc, 0x0108, 0xc2e5, 0x22a2, 0xa016, 0x0888,</div><div class='del'>-	0x0036, 0x7b10, 0xa384, 0xff00, 0x7812, 0xa384, 0x00ff, 0x8001,</div><div class='del'>-	0x1138, 0x7820, 0xd0cc, 0x0108, 0xc2e5, 0x22a2, 0x003e, 0x0808,</div><div class='del'>-	0x0046, 0x2021, 0x0800, 0x0006, 0x7820, 0xd0cc, 0x000e, 0x0108,</div><div class='del'>-	0xc4e5, 0x24a2, 0x004e, 0x22a2, 0x20a2, 0x003e, 0x0804, 0x7b3b,</div><div class='del'>-	0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0x2011, 0xb635, 0x2214, 0xd2ac, 0x1110, 0xd0bc, 0x0188,</div><div class='del'>-	0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,</div><div class='del'>-	0x0088, 0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0700,</div><div class='del'>-	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xb615,</div><div class='del'>-	0x2214, 0x22a2, 0x7820, 0xd0cc, 0x0118, 0x20a3, 0x0889, 0x0010,</div><div class='del'>-	0x20a3, 0x0898, 0x20a3, 0x0000, 0x080c, 0x7dcf, 0x22a2, 0x20a3,</div><div class='del'>-	0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x002e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146, 0x0016, 0x0036,</div><div class='del'>-	0x7810, 0xa084, 0x0700, 0x8007, 0x003b, 0x003e, 0x001e, 0x014e,</div><div class='del'>-	0x013e, 0x015e, 0x00de, 0x0005, 0x7bec, 0x7bec, 0x7bee, 0x7bec,</div><div class='del'>-	0x7bec, 0x7bec, 0x7c10, 0x7bec, 0x080c, 0x151a, 0x7910, 0xa18c,</div><div class='del'>-	0xf8ff, 0xa18d, 0x0600, 0x7912, 0x20a1, 0x020b, 0x2009, 0x0003,</div><div class='del'>-	0x00f9, 0x00d6, 0x2069, 0xb652, 0x6804, 0xd0bc, 0x0130, 0x682c,</div><div class='del'>-	0xa084, 0x00ff, 0x8007, 0x20a2, 0x0010, 0x20a3, 0x3f00, 0x00de,</div><div class='del'>-	0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0001, 0x080c, 0x7de0, 0x0005,</div><div class='del'>-	0x20a1, 0x020b, 0x2009, 0x0003, 0x0019, 0x20a3, 0x7f00, 0x0c80,</div><div class='del'>-	0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,</div><div class='del'>-	0x2004, 0x2011, 0xb635, 0x2214, 0xd2ac, 0x1110, 0xd0bc, 0x0188,</div><div class='del'>-	0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0100, 0x20a2,</div><div class='del'>-	0x6814, 0x20a2, 0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,</div><div class='del'>-	0x0088, 0x00d6, 0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0100,</div><div class='del'>-	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xb615,</div><div class='del'>-	0x2214, 0x22a2, 0x20a3, 0x0888, 0xa18d, 0x0008, 0x21a2, 0x080c,</div><div class='del'>-	0x7dcf, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3,</div><div class='del'>-	0x0000, 0x20a3, 0x0000, 0x002e, 0x0005, 0x00e6, 0x00d6, 0x00c6,</div><div class='del'>-	0x0056, 0x0046, 0x0036, 0x2061, 0x0100, 0x2071, 0xb600, 0x7154,</div><div class='del'>-	0x7818, 0x2068, 0x68a0, 0x2028, 0x76d4, 0xd6ac, 0x1130, 0xd0bc,</div><div class='del'>-	0x1120, 0x6910, 0x6a14, 0x7454, 0x0020, 0x6910, 0x6a14, 0x7370,</div><div class='del'>-	0x7474, 0x781c, 0xa0be, 0x0006, 0x0904, 0x7d1a, 0xa0be, 0x000a,</div><div class='del'>-	0x15e8, 0xa185, 0x0200, 0x6062, 0x6266, 0x636a, 0x646e, 0x6073,</div><div class='del'>-	0x2029, 0x6077, 0x0000, 0x688c, 0x8000, 0xa084, 0x00ff, 0x688e,</div><div class='del'>-	0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6082, 0x7808, 0x6086,</div><div class='del'>-	0x7810, 0x2070, 0x7014, 0x608a, 0x7010, 0x608e, 0x700c, 0x60c6,</div><div class='del'>-	0x7008, 0x60ca, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000,</div><div class='del'>-	0x609f, 0x0000, 0x080c, 0x8640, 0x2009, 0x07d0, 0x60c4, 0xa084,</div><div class='del'>-	0xfff0, 0xa005, 0x0110, 0x2009, 0x1b58, 0x080c, 0x6a87, 0x003e,</div><div class='del'>-	0x004e, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x70d4, 0xd0ac,</div><div class='del'>-	0x1110, 0xd5bc, 0x0138, 0xa185, 0x0100, 0x6062, 0x6266, 0x636a,</div><div class='del'>-	0x646e, 0x0038, 0xa185, 0x0100, 0x6062, 0x6266, 0x606b, 0x0000,</div><div class='del'>-	0x646e, 0x6073, 0x0809, 0x6077, 0x0008, 0x688c, 0x8000, 0xa084,</div><div class='del'>-	0x00ff, 0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6082,</div><div class='del'>-	0x7808, 0x6086, 0x7810, 0x2070, 0x7014, 0x608a, 0x7010, 0x608e,</div><div class='del'>-	0x700c, 0x60c6, 0x7008, 0x60ca, 0x792c, 0xa108, 0x792e, 0x700c,</div><div class='del'>-	0x7928, 0xa109, 0x792a, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7,</div><div class='del'>-	0x0000, 0xa582, 0x0080, 0x0248, 0x6a00, 0xd2f4, 0x0120, 0x6a14,</div><div class='del'>-	0xa294, 0x00ff, 0x0010, 0x2011, 0x0000, 0x629e, 0x080c, 0x8640,</div><div class='del'>-	0x2009, 0x07d0, 0x60c4, 0xa084, 0xfff0, 0xa005, 0x0110, 0x2009,</div><div class='del'>-	0x1b58, 0x080c, 0x6a87, 0x003e, 0x004e, 0x005e, 0x00ce, 0x00de,</div><div class='del'>-	0x00ee, 0x0005, 0x7810, 0x2070, 0x704c, 0xa084, 0x0003, 0xa086,</div><div class='del'>-	0x0002, 0x0904, 0x7d70, 0x2001, 0xb635, 0x2004, 0xd0ac, 0x1110,</div><div class='del'>-	0xd5bc, 0x0138, 0xa185, 0x0100, 0x6062, 0x6266, 0x636a, 0x646e,</div><div class='del'>-	0x0038, 0xa185, 0x0100, 0x6062, 0x6266, 0x606b, 0x0000, 0x646e,</div><div class='del'>-	0x6073, 0x0880, 0x6077, 0x0008, 0x688c, 0x8000, 0xa084, 0x00ff,</div><div class='del'>-	0x688e, 0x8007, 0x607a, 0x7834, 0x607e, 0x2f00, 0x6086, 0x7808,</div><div class='del'>-	0x6082, 0x7060, 0x608a, 0x705c, 0x608e, 0x7080, 0x60c6, 0x707c,</div><div class='del'>-	0x60ca, 0x707c, 0x792c, 0xa108, 0x792e, 0x7080, 0x7928, 0xa109,</div><div class='del'>-	0x792a, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xa582,</div><div class='del'>-	0x0080, 0x0248, 0x6a00, 0xd2f4, 0x0120, 0x6a14, 0xa294, 0x00ff,</div><div class='del'>-	0x0010, 0x2011, 0x0000, 0x629e, 0x080c, 0x863d, 0x0804, 0x7d08,</div><div class='del'>-	0x2001, 0xb635, 0x2004, 0xd0ac, 0x1110, 0xd5bc, 0x0138, 0xa185,</div><div class='del'>-	0x0700, 0x6062, 0x6266, 0x636a, 0x646e, 0x0038, 0xa185, 0x0700,</div><div class='del'>-	0x6062, 0x6266, 0x606b, 0x0000, 0x646e, 0x080c, 0x5373, 0x0180,</div><div class='del'>-	0x00d6, 0x7810, 0xa06d, 0x684c, 0x00de, 0xa084, 0x2020, 0xa086,</div><div class='del'>-	0x2020, 0x1130, 0x7820, 0xc0cd, 0x7822, 0x6073, 0x0889, 0x0010,</div><div class='del'>-	0x6073, 0x0898, 0x6077, 0x0000, 0x688c, 0x8000, 0xa084, 0x00ff,</div><div class='del'>-	0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6086, 0x7808,</div><div class='del'>-	0x6082, 0x7014, 0x608a, 0x7010, 0x608e, 0x700c, 0x60c6, 0x7008,</div><div class='del'>-	0x60ca, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xa582,</div><div class='del'>-	0x0080, 0x0248, 0x6a00, 0xd2f4, 0x0120, 0x6a14, 0xa294, 0x00ff,</div><div class='del'>-	0x0010, 0x2011, 0x0000, 0x629e, 0x7820, 0xd0cc, 0x0120, 0x080c,</div><div class='del'>-	0x8640, 0x0804, 0x7d08, 0x080c, 0x863d, 0x0804, 0x7d08, 0x7a18,</div><div class='del'>-	0xa280, 0x0023, 0x2014, 0x8210, 0xa294, 0x00ff, 0x2202, 0x8217,</div><div class='del'>-	0x0005, 0x00d6, 0x2069, 0xb8e1, 0x6843, 0x0001, 0x00de, 0x0005,</div><div class='del'>-	0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7, 0x9575, 0x0019, 0x080c,</div><div class='del'>-	0x6a79, 0x0005, 0x0006, 0x6014, 0xa084, 0x0004, 0xa085, 0x0009,</div><div class='del'>-	0x6016, 0x000e, 0x0005, 0x0016, 0x00c6, 0x0006, 0x2061, 0x0100,</div><div class='del'>-	0x61a4, 0x60a7, 0x95f5, 0x6014, 0xa084, 0x0004, 0xa085, 0x0008,</div><div class='del'>-	0x6016, 0x000e, 0xe000, 0xe000, 0xe000, 0xe000, 0x61a6, 0x00ce,</div><div class='del'>-	0x001e, 0x0005, 0x00c6, 0x00d6, 0x0016, 0x0026, 0x2061, 0x0100,</div><div class='del'>-	0x2069, 0x0140, 0x080c, 0x5b41, 0x1198, 0x2001, 0xb8fd, 0x2004,</div><div class='del'>-	0xa005, 0x15b8, 0x0066, 0x2031, 0x0001, 0x080c, 0x5bc3, 0x006e,</div><div class='del'>-	0x1118, 0x080c, 0x6a79, 0x0468, 0x00c6, 0x2061, 0xb8e1, 0x00d8,</div><div class='del'>-	0x6904, 0xa194, 0x4000, 0x0550, 0x0831, 0x6803, 0x1000, 0x6803,</div><div class='del'>-	0x0000, 0x00c6, 0x2061, 0xb8e1, 0x6128, 0xa192, 0x00c8, 0x1258,</div><div class='del'>-	0x8108, 0x612a, 0x6124, 0x00ce, 0x81ff, 0x0198, 0x080c, 0x6a79,</div><div class='del'>-	0x080c, 0x7dea, 0x0070, 0x6124, 0xa1e5, 0x0000, 0x0140, 0x080c,</div><div class='del'>-	0xb500, 0x080c, 0x6a82, 0x2009, 0x0014, 0x080c, 0x86d3, 0x00ce,</div><div class='del'>-	0x0000, 0x002e, 0x001e, 0x00de, 0x00ce, 0x0005, 0x2001, 0xb8fd,</div><div class='del'>-	0x2004, 0xa005, 0x1db0, 0x00c6, 0x2061, 0xb8e1, 0x6128, 0xa192,</div><div class='del'>-	0x0003, 0x1e08, 0x8108, 0x612a, 0x00ce, 0x080c, 0x6a79, 0x080c,</div><div class='del'>-	0x4b7b, 0x0c38, 0x00c6, 0x00d6, 0x00e6, 0x0016, 0x0026, 0x080c,</div><div class='del'>-	0x6a8f, 0x2071, 0xb8e1, 0x713c, 0x81ff, 0x0590, 0x2061, 0x0100,</div><div class='del'>-	0x2069, 0x0140, 0x080c, 0x5b41, 0x11a8, 0x0036, 0x2019, 0x0002,</div><div class='del'>-	0x080c, 0x806b, 0x003e, 0x713c, 0x2160, 0x080c, 0xb500, 0x2009,</div><div class='del'>-	0x004a, 0x080c, 0x86d3, 0x0066, 0x2031, 0x0001, 0x080c, 0x5bc3,</div><div class='del'>-	0x006e, 0x00b0, 0x6904, 0xa194, 0x4000, 0x01c0, 0x6803, 0x1000,</div><div class='del'>-	0x6803, 0x0000, 0x0036, 0x2019, 0x0001, 0x080c, 0x806b, 0x003e,</div><div class='del'>-	0x713c, 0x2160, 0x080c, 0xb500, 0x2009, 0x004a, 0x080c, 0x86d3,</div><div class='del'>-	0x002e, 0x001e, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x0c58, 0x0026,</div><div class='del'>-	0x00e6, 0x2071, 0xb8e1, 0x7048, 0xd084, 0x01c0, 0x713c, 0x81ff,</div><div class='del'>-	0x01a8, 0x2071, 0x0100, 0xa188, 0x0007, 0x2114, 0xa28e, 0x0006,</div><div class='del'>-	0x1138, 0x7014, 0xa084, 0x0184, 0xa085, 0x0012, 0x7016, 0x0030,</div><div class='del'>-	0x7014, 0xa084, 0x0184, 0xa085, 0x0016, 0x7016, 0x00ee, 0x002e,</div><div class='del'>-	0x0005, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046, 0x0006,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x6018, 0x2068, 0x6ca0, 0x2071, 0xb8e1,</div><div class='del'>-	0x7018, 0x2068, 0x8dff, 0x0188, 0x68a0, 0xa406, 0x0118, 0x6854,</div><div class='del'>-	0x2068, 0x0cc0, 0x6010, 0x2060, 0x643c, 0x6540, 0x6648, 0x2d60,</div><div class='del'>-	0x080c, 0x518c, 0x0110, 0xa085, 0x0001, 0x012e, 0x000e, 0x004e,</div><div class='del'>-	0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x20a1, 0x020b,</div><div class='del'>-	0x080c, 0x76b3, 0x20a3, 0x1200, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x781c, 0xa086, 0x0004, 0x1110, 0x6098, 0x0018, 0x2001, 0xb615,</div><div class='del'>-	0x2004, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x20a9, 0x0010,</div><div class='del'>-	0xa006, 0x20a2, 0x1f04, 0x7f19, 0x20a2, 0x20a2, 0x60c3, 0x002c,</div><div class='del'>-	0x080c, 0x7de0, 0x0005, 0x0156, 0x0146, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x76b3, 0x20a3, 0x0f00, 0x20a3, 0x0000, 0x7808, 0xd09c, 0x1150,</div><div class='del'>-	0x20a3, 0x0000, 0x20a2, 0x60c3, 0x0008, 0x080c, 0x7de0, 0x014e,</div><div class='del'>-	0x015e, 0x0005, 0x00d6, 0x7818, 0xa06d, 0x090c, 0x151a, 0x6810,</div><div class='del'>-	0xa084, 0x00ff, 0x20a2, 0x6814, 0x00de, 0x0c60, 0x0156, 0x0146,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x774f, 0x20a3, 0x0200, 0x20a3, 0x0000,</div><div class='del'>-	0x20a9, 0x0006, 0x2011, 0xb640, 0x2019, 0xb641, 0x23a6, 0x22a6,</div><div class='del'>-	0xa398, 0x0002, 0xa290, 0x0002, 0x1f04, 0x7f56, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x60c3, 0x001c, 0x080c, 0x7de0, 0x014e, 0x015e,</div><div class='del'>-	0x0005, 0x0156, 0x0146, 0x0016, 0x0026, 0x20a1, 0x020b, 0x080c,</div><div class='del'>-	0x7728, 0x080c, 0x773e, 0x7810, 0xa080, 0x0000, 0x2004, 0xa080,</div><div class='del'>-	0x0015, 0x2098, 0x7808, 0xa088, 0x0002, 0x21a8, 0x53a6, 0xa080,</div><div class='del'>-	0x0004, 0x8003, 0x60c2, 0x080c, 0x7de0, 0x002e, 0x001e, 0x014e,</div><div class='del'>-	0x015e, 0x0005, 0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x76b3,</div><div class='del'>-	0x20a3, 0x6200, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x7808, 0x20a2,</div><div class='del'>-	0x60c3, 0x0008, 0x080c, 0x7de0, 0x014e, 0x015e, 0x0005, 0x0156,</div><div class='del'>-	0x0146, 0x0016, 0x0026, 0x20a1, 0x020b, 0x080c, 0x76b3, 0x7810,</div><div class='del'>-	0xa080, 0x0000, 0x2004, 0xa080, 0x0017, 0x2098, 0x7808, 0xa088,</div><div class='del'>-	0x0002, 0x21a8, 0x53a6, 0x8003, 0x60c2, 0x080c, 0x7de0, 0x002e,</div><div class='del'>-	0x001e, 0x014e, 0x015e, 0x0005, 0x00e6, 0x00c6, 0x0006, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2071, 0xb8e1, 0x700c, 0x2060, 0x8cff, 0x0178,</div><div class='del'>-	0x080c, 0x9f14, 0x1110, 0x080c, 0x8ca5, 0x600c, 0x0006, 0x080c,</div><div class='del'>-	0xa0db, 0x080c, 0x86a4, 0x080c, 0x81a5, 0x00ce, 0x0c78, 0x700f,</div><div class='del'>-	0x0000, 0x700b, 0x0000, 0x012e, 0x000e, 0x00ce, 0x00ee, 0x0005,</div><div class='del'>-	0x0126, 0x0156, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0026, 0x0016,</div><div class='del'>-	0x0006, 0x2091, 0x8000, 0x2069, 0x0100, 0x2079, 0x0140, 0x2071,</div><div class='del'>-	0xb8e1, 0x7024, 0x2060, 0x8cff, 0x05a0, 0x080c, 0x7df3, 0x68c3,</div><div class='del'>-	0x0000, 0x080c, 0x6a82, 0x2009, 0x0013, 0x080c, 0x86d3, 0x20a9,</div><div class='del'>-	0x01f4, 0x6824, 0xd094, 0x0158, 0x6827, 0x0004, 0x7804, 0xa084,</div><div class='del'>-	0x4000, 0x01a0, 0x7803, 0x1000, 0x7803, 0x0000, 0x0078, 0xd084,</div><div class='del'>-	0x0118, 0x6827, 0x0001, 0x0010, 0x1f04, 0x8001, 0x7804, 0xa084,</div><div class='del'>-	0x1000, 0x0120, 0x7803, 0x0100, 0x7803, 0x0000, 0x6824, 0x000e,</div><div class='del'>-	0x001e, 0x002e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e,</div><div class='del'>-	0x0005, 0x2001, 0xb600, 0x2004, 0xa096, 0x0001, 0x0590, 0xa096,</div><div class='del'>-	0x0004, 0x0578, 0x080c, 0x6a82, 0x6814, 0xa084, 0x0001, 0x0110,</div><div class='del'>-	0x68a7, 0x95f5, 0x6817, 0x0008, 0x68c3, 0x0000, 0x2011, 0x4b23,</div><div class='del'>-	0x080c, 0x6a0e, 0x20a9, 0x01f4, 0x6824, 0xd094, 0x0158, 0x6827,</div><div class='del'>-	0x0004, 0x7804, 0xa084, 0x4000, 0x01a0, 0x7803, 0x1000, 0x7803,</div><div class='del'>-	0x0000, 0x0078, 0xd084, 0x0118, 0x6827, 0x0001, 0x0010, 0x1f04,</div><div class='del'>-	0x8044, 0x7804, 0xa084, 0x1000, 0x0120, 0x7803, 0x0100, 0x7803,</div><div class='del'>-	0x0000, 0x000e, 0x001e, 0x002e, 0x00ce, 0x00de, 0x00ee, 0x00fe,</div><div class='del'>-	0x015e, 0x012e, 0x0005, 0x0126, 0x0156, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x0026, 0x0016, 0x0006, 0x2091, 0x8000, 0x2069, 0x0100,</div><div class='del'>-	0x2079, 0x0140, 0x2071, 0xb8e1, 0x703c, 0x2060, 0x8cff, 0x0904,</div><div class='del'>-	0x80f2, 0xa386, 0x0002, 0x1128, 0x6814, 0xa084, 0x0002, 0x0904,</div><div class='del'>-	0x80f2, 0x68af, 0x95f5, 0x6817, 0x0010, 0x2009, 0x00fa, 0x8109,</div><div class='del'>-	0x1df0, 0x68c7, 0x0000, 0x68cb, 0x0008, 0x080c, 0x6a8f, 0x080c,</div><div class='del'>-	0x222f, 0x0046, 0x2009, 0x017f, 0x200b, 0x00a5, 0x2021, 0x0169,</div><div class='del'>-	0x2404, 0xa084, 0x000f, 0xa086, 0x0004, 0x1500, 0x68af, 0x95f5,</div><div class='del'>-	0x68c7, 0x0000, 0x68cb, 0x0008, 0x00e6, 0x00f6, 0x2079, 0x0020,</div><div class='del'>-	0x2071, 0xb94b, 0x6814, 0xa084, 0x0184, 0xa085, 0x0012, 0x6816,</div><div class='del'>-	0x7803, 0x0008, 0x7003, 0x0000, 0x00fe, 0x00ee, 0xa386, 0x0002,</div><div class='del'>-	0x1128, 0x7884, 0xa005, 0x1110, 0x7887, 0x0001, 0x2001, 0xb8b1,</div><div class='del'>-	0x2004, 0x200a, 0x004e, 0xa39d, 0x0000, 0x1120, 0x2009, 0x0049,</div><div class='del'>-	0x080c, 0x86d3, 0x20a9, 0x03e8, 0x6824, 0xd094, 0x0158, 0x6827,</div><div class='del'>-	0x0004, 0x7804, 0xa084, 0x4000, 0x01a0, 0x7803, 0x1000, 0x7803,</div><div class='del'>-	0x0000, 0x0078, 0xd08c, 0x0118, 0x6827, 0x0002, 0x0010, 0x1f04,</div><div class='del'>-	0x80d4, 0x7804, 0xa084, 0x1000, 0x0120, 0x7803, 0x0100, 0x7803,</div><div class='del'>-	0x0000, 0x6824, 0x000e, 0x001e, 0x002e, 0x00ce, 0x00de, 0x00ee,</div><div class='del'>-	0x00fe, 0x015e, 0x012e, 0x0005, 0x00d6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2069, 0xb8e1, 0x6a06, 0x012e, 0x00de, 0x0005, 0x00d6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2069, 0xb8e1, 0x6a32, 0x012e, 0x00de, 0x0005,</div><div class='del'>-	0x00f6, 0x00e6, 0x00c6, 0x0066, 0x0006, 0x0126, 0x2071, 0xb8e1,</div><div class='del'>-	0x7614, 0x2660, 0x2678, 0x2091, 0x8000, 0x8cff, 0x0538, 0x601c,</div><div class='del'>-	0xa206, 0x1500, 0x7014, 0xac36, 0x1110, 0x660c, 0x7616, 0x7010,</div><div class='del'>-	0xac36, 0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00, 0x7012, 0x0010,</div><div class='del'>-	0x7013, 0x0000, 0x660c, 0x0066, 0x2c00, 0xaf06, 0x0110, 0x7e0e,</div><div class='del'>-	0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0x9ed9, 0x080c, 0x81a5,</div><div class='del'>-	0x00ce, 0x08d8, 0x2c78, 0x600c, 0x2060, 0x08b8, 0x012e, 0x000e,</div><div class='del'>-	0x006e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x0156, 0x0146, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x7974, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a3, 0x1000, 0x0804, 0x819d, 0x0156, 0x0146,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x7974, 0x7810, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x4000, 0x0478, 0x0156, 0x0146,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x7974, 0x7810, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x2000, 0x00f8, 0x0156, 0x0146,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x7974, 0x7810, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0400, 0x0078, 0x0156, 0x0146,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x7974, 0x7810, 0x20a2, 0xa006, 0x20a2,</div><div class='del'>-	0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0200, 0x0089, 0x60c3, 0x0020,</div><div class='del'>-	0x080c, 0x7de0, 0x014e, 0x015e, 0x0005, 0x00e6, 0x2071, 0xb8e1,</div><div class='del'>-	0x7020, 0xa005, 0x0110, 0x8001, 0x7022, 0x00ee, 0x0005, 0x20a9,</div><div class='del'>-	0x0008, 0x20a2, 0x1f04, 0x81b1, 0x20a2, 0x20a2, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x00d6, 0x00c6, 0x0076, 0x0066, 0x0006, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0xb8e1, 0x7614, 0x2660, 0x2678, 0x2039, 0x0001,</div><div class='del'>-	0x87ff, 0x0904, 0x824d, 0x8cff, 0x0904, 0x824d, 0x601c, 0xa086,</div><div class='del'>-	0x0006, 0x1904, 0x8248, 0x88ff, 0x0138, 0x2800, 0xac06, 0x1904,</div><div class='del'>-	0x8248, 0x2039, 0x0000, 0x0050, 0x6018, 0xa206, 0x1904, 0x8248,</div><div class='del'>-	0x85ff, 0x0120, 0x6050, 0xa106, 0x1904, 0x8248, 0x7024, 0xac06,</div><div class='del'>-	0x1598, 0x2069, 0x0100, 0x68c0, 0xa005, 0x1160, 0x6824, 0xd084,</div><div class='del'>-	0x0148, 0x6827, 0x0001, 0x080c, 0x6a82, 0x080c, 0x82d4, 0x7027,</div><div class='del'>-	0x0000, 0x0410, 0x080c, 0x6a82, 0x6820, 0xd0b4, 0x0110, 0x68a7,</div><div class='del'>-	0x95f5, 0x6817, 0x0008, 0x68c3, 0x0000, 0x080c, 0x82d4, 0x7027,</div><div class='del'>-	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120,</div><div class='del'>-	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0110, 0x6827, 0x0001, 0x003e, 0x7014, 0xac36, 0x1110, 0x660c,</div><div class='del'>-	0x7616, 0x7010, 0xac36, 0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00,</div><div class='del'>-	0x7012, 0x0010, 0x7013, 0x0000, 0x660c, 0x0066, 0x2c00, 0xaf06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x89ff, 0x1158, 0x600f, 0x0000,</div><div class='del'>-	0x6010, 0x2068, 0x080c, 0x9d16, 0x0110, 0x080c, 0xb155, 0x080c,</div><div class='del'>-	0x9ed9, 0x080c, 0x81a5, 0x88ff, 0x1190, 0x00ce, 0x0804, 0x81c8,</div><div class='del'>-	0x2c78, 0x600c, 0x2060, 0x0804, 0x81c8, 0xa006, 0x012e, 0x000e,</div><div class='del'>-	0x006e, 0x007e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x6017,</div><div class='del'>-	0x0000, 0x00ce, 0xa8c5, 0x0001, 0x0c88, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x0066, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0xb8e1, 0x7638, 0x2660, 0x2678, 0x8cff, 0x0904, 0x82c4, 0x601c,</div><div class='del'>-	0xa086, 0x0006, 0x1904, 0x82bf, 0x87ff, 0x0128, 0x2700, 0xac06,</div><div class='del'>-	0x1904, 0x82bf, 0x0048, 0x6018, 0xa206, 0x1904, 0x82bf, 0x85ff,</div><div class='del'>-	0x0118, 0x6050, 0xa106, 0x15d8, 0x703c, 0xac06, 0x1180, 0x0036,</div><div class='del'>-	0x2019, 0x0001, 0x080c, 0x806b, 0x7033, 0x0000, 0x703f, 0x0000,</div><div class='del'>-	0x7043, 0x0000, 0x7047, 0x0000, 0x704b, 0x0000, 0x003e, 0x7038,</div><div class='del'>-	0xac36, 0x1110, 0x660c, 0x763a, 0x7034, 0xac36, 0x1140, 0x2c00,</div><div class='del'>-	0xaf36, 0x0118, 0x2f00, 0x7036, 0x0010, 0x7037, 0x0000, 0x660c,</div><div class='del'>-	0x0066, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f,</div><div class='del'>-	0x0000, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0110, 0x080c, 0xb155,</div><div class='del'>-	0x080c, 0x9ed9, 0x87ff, 0x1190, 0x00ce, 0x0804, 0x826c, 0x2c78,</div><div class='del'>-	0x600c, 0x2060, 0x0804, 0x826c, 0xa006, 0x012e, 0x000e, 0x002e,</div><div class='del'>-	0x006e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x6017, 0x0000,</div><div class='del'>-	0x00ce, 0xa7bd, 0x0001, 0x0c88, 0x00e6, 0x2071, 0xb8e1, 0x2001,</div><div class='del'>-	0xb600, 0x2004, 0xa086, 0x0002, 0x1118, 0x7007, 0x0005, 0x0010,</div><div class='del'>-	0x7007, 0x0000, 0x00ee, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0066,</div><div class='del'>-	0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0xb8e1, 0x2c10,</div><div class='del'>-	0x7638, 0x2660, 0x2678, 0x8cff, 0x0518, 0x2200, 0xac06, 0x11e0,</div><div class='del'>-	0x7038, 0xac36, 0x1110, 0x660c, 0x763a, 0x7034, 0xac36, 0x1140,</div><div class='del'>-	0x2c00, 0xaf36, 0x0118, 0x2f00, 0x7036, 0x0010, 0x7037, 0x0000,</div><div class='del'>-	0x660c, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f,</div><div class='del'>-	0x0000, 0xa085, 0x0001, 0x0020, 0x2c78, 0x600c, 0x2060, 0x08d8,</div><div class='del'>-	0x012e, 0x000e, 0x002e, 0x006e, 0x00ce, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0006, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0xb8e1, 0x760c, 0x2660, 0x2678, 0x8cff, 0x0904,</div><div class='del'>-	0x83aa, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x1904, 0x83a5,</div><div class='del'>-	0x7024, 0xac06, 0x1508, 0x2069, 0x0100, 0x68c0, 0xa005, 0x0904,</div><div class='del'>-	0x8381, 0x080c, 0x7df3, 0x68c3, 0x0000, 0x080c, 0x82d4, 0x7027,</div><div class='del'>-	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120,</div><div class='del'>-	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0110, 0x6827, 0x0001, 0x003e, 0x700c, 0xac36, 0x1110, 0x660c,</div><div class='del'>-	0x760e, 0x7008, 0xac36, 0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00,</div><div class='del'>-	0x700a, 0x0010, 0x700b, 0x0000, 0x660c, 0x0066, 0x2c00, 0xaf06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0x9f03,</div><div class='del'>-	0x1158, 0x080c, 0x2cf7, 0x080c, 0x9f14, 0x11f0, 0x080c, 0x8ca5,</div><div class='del'>-	0x00d8, 0x080c, 0x82d4, 0x08c0, 0x080c, 0x9f14, 0x1118, 0x080c,</div><div class='del'>-	0x8ca5, 0x0090, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0168, 0x601c,</div><div class='del'>-	0xa086, 0x0003, 0x11f8, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000,</div><div class='del'>-	0x080c, 0x547a, 0x080c, 0x9ecd, 0x080c, 0xa0db, 0x080c, 0x9ed9,</div><div class='del'>-	0x080c, 0x81a5, 0x00ce, 0x0804, 0x832e, 0x2c78, 0x600c, 0x2060,</div><div class='del'>-	0x0804, 0x832e, 0x012e, 0x000e, 0x006e, 0x00ce, 0x00de, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x601c, 0xa086, 0x0006, 0x1d30, 0x080c, 0xb155,</div><div class='del'>-	0x0c18, 0x0036, 0x0156, 0x0136, 0x0146, 0x3908, 0xa006, 0xa190,</div><div class='del'>-	0x0020, 0x221c, 0xa39e, 0x2aec, 0x1118, 0x8210, 0x8000, 0x0cc8,</div><div class='del'>-	0xa005, 0x0138, 0x20a9, 0x0020, 0x2198, 0xa110, 0x22a0, 0x22c8,</div><div class='del'>-	0x53a3, 0x014e, 0x013e, 0x015e, 0x003e, 0x0005, 0x00d6, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x774f, 0x20a3, 0x0200, 0x20a3, 0x0014, 0x60c3,</div><div class='del'>-	0x0014, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2099, 0xb8b9, 0x20a9,</div><div class='del'>-	0x0004, 0x53a6, 0x20a3, 0x0004, 0x20a3, 0x7878, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x080c, 0x7de0, 0x00de, 0x0005, 0x20a1, 0x020b,</div><div class='del'>-	0x080c, 0x774f, 0x20a3, 0x0214, 0x20a3, 0x0018, 0x20a3, 0x0800,</div><div class='del'>-	0x7810, 0xa084, 0xff00, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x20a3, 0x0000, 0x7810, 0xa084, 0x00ff, 0x20a2,</div><div class='del'>-	0x7828, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0018,</div><div class='del'>-	0x080c, 0x7de0, 0x0005, 0x00d6, 0x0016, 0x2f68, 0x2009, 0x0035,</div><div class='del'>-	0x080c, 0xa1c6, 0x1904, 0x8489, 0x20a1, 0x020b, 0x080c, 0x76b3,</div><div class='del'>-	0x20a3, 0x1300, 0x20a3, 0x0000, 0x7828, 0x2068, 0x681c, 0xa086,</div><div class='del'>-	0x0003, 0x0580, 0x7818, 0xa080, 0x0028, 0x2014, 0x2001, 0xb635,</div><div class='del'>-	0x2004, 0xd0ac, 0x11d0, 0xa286, 0x007e, 0x1128, 0x20a3, 0x00ff,</div><div class='del'>-	0x20a3, 0xfffe, 0x04b8, 0xa286, 0x007f, 0x1128, 0x20a3, 0x00ff,</div><div class='del'>-	0x20a3, 0xfffd, 0x0478, 0xd2bc, 0x0180, 0xa286, 0x0080, 0x1128,</div><div class='del'>-	0x20a3, 0x00ff, 0x20a3, 0xfffc, 0x0428, 0xa2e8, 0xb735, 0x2d6c,</div><div class='del'>-	0x6810, 0x20a2, 0x6814, 0x20a2, 0x00e8, 0x20a3, 0x0000, 0x6098,</div><div class='del'>-	0x20a2, 0x00c0, 0x2001, 0xb635, 0x2004, 0xd0ac, 0x1138, 0x7818,</div><div class='del'>-	0xa080, 0x0028, 0x2004, 0xa082, 0x007e, 0x0240, 0x00d6, 0x2069,</div><div class='del'>-	0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0020, 0x20a3, 0x0000,</div><div class='del'>-	0x6034, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x20a3, 0x0000,</div><div class='del'>-	0x20a3, 0x0000, 0x60c3, 0x000c, 0x080c, 0x7de0, 0x001e, 0x00de,</div><div class='del'>-	0x0005, 0x7817, 0x0001, 0x7803, 0x0006, 0x001e, 0x00de, 0x0005,</div><div class='del'>-	0x00d6, 0x0026, 0x7928, 0x2168, 0x691c, 0xa186, 0x0006, 0x01c0,</div><div class='del'>-	0xa186, 0x0003, 0x0904, 0x84ff, 0xa186, 0x0005, 0x0904, 0x84e8,</div><div class='del'>-	0xa186, 0x0004, 0x05b8, 0xa186, 0x0008, 0x0904, 0x84f0, 0x7807,</div><div class='del'>-	0x0037, 0x7813, 0x1700, 0x080c, 0x8567, 0x002e, 0x00de, 0x0005,</div><div class='del'>-	0x080c, 0x8523, 0x2009, 0x4000, 0x6800, 0x0002, 0x84c9, 0x84d4,</div><div class='del'>-	0x84cb, 0x84d4, 0x84d0, 0x84c9, 0x84c9, 0x84d4, 0x84d4, 0x84d4,</div><div class='del'>-	0x84d4, 0x84c9, 0x84c9, 0x84c9, 0x84c9, 0x84c9, 0x84d4, 0x84c9,</div><div class='del'>-	0x84d4, 0x080c, 0x151a, 0x6820, 0xd0e4, 0x0110, 0xd0cc, 0x0110,</div><div class='del'>-	0xa00e, 0x0010, 0x2009, 0x2000, 0x6828, 0x20a2, 0x682c, 0x20a2,</div><div class='del'>-	0x0804, 0x8519, 0x080c, 0x8523, 0x20a3, 0x0000, 0x20a3, 0x0000,</div><div class='del'>-	0x2009, 0x4000, 0x6a00, 0xa286, 0x0002, 0x1108, 0xa00e, 0x0488,</div><div class='del'>-	0x04d1, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009, 0x4000, 0x0448,</div><div class='del'>-	0x0491, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009, 0x4000, 0xa286,</div><div class='del'>-	0x0005, 0x0118, 0xa286, 0x0002, 0x1108, 0xa00e, 0x00d0, 0x0419,</div><div class='del'>-	0x6810, 0x2068, 0x697c, 0x6810, 0xa112, 0x6980, 0x6814, 0xa103,</div><div class='del'>-	0x20a2, 0x22a2, 0x7928, 0xa180, 0x0000, 0x2004, 0xa08e, 0x0002,</div><div class='del'>-	0x0130, 0xa08e, 0x0004, 0x0118, 0x2009, 0x4000, 0x0010, 0x2009,</div><div class='del'>-	0x0000, 0x21a2, 0x20a3, 0x0000, 0x60c3, 0x0018, 0x080c, 0x7de0,</div><div class='del'>-	0x002e, 0x00de, 0x0005, 0x0036, 0x0046, 0x0056, 0x0066, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x774f, 0xa006, 0x20a3, 0x0200, 0x20a2, 0x7934,</div><div class='del'>-	0x21a2, 0x7938, 0x21a2, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011,</div><div class='del'>-	0xb635, 0x2214, 0xd2ac, 0x1118, 0xa092, 0x007e, 0x0268, 0x00d6,</div><div class='del'>-	0x2069, 0xb61c, 0x2d2c, 0x8d68, 0x2d34, 0xa0e8, 0xb735, 0x2d6c,</div><div class='del'>-	0x6b10, 0x6c14, 0x00de, 0x0030, 0x2019, 0x0000, 0x6498, 0x2029,</div><div class='del'>-	0x0000, 0x6634, 0x7828, 0xa080, 0x0007, 0x2004, 0xa086, 0x0003,</div><div class='del'>-	0x1128, 0x25a2, 0x26a2, 0x23a2, 0x24a2, 0x0020, 0x23a2, 0x24a2,</div><div class='del'>-	0x25a2, 0x26a2, 0x006e, 0x005e, 0x004e, 0x003e, 0x0005, 0x20a1,</div><div class='del'>-	0x020b, 0x080c, 0x774f, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3,</div><div class='del'>-	0x0009, 0x7810, 0x20a2, 0x60c3, 0x0008, 0x080c, 0x7de0, 0x0005,</div><div class='del'>-	0x20a1, 0x020b, 0x080c, 0x76ab, 0x20a3, 0x1400, 0x20a3, 0x0000,</div><div class='del'>-	0x7834, 0x20a2, 0x7838, 0x20a2, 0x7828, 0x20a2, 0x782c, 0x20a2,</div><div class='del'>-	0x7830, 0xa084, 0x00ff, 0x8007, 0x20a2, 0x20a3, 0x0000, 0x60c3,</div><div class='del'>-	0x0010, 0x080c, 0x7de0, 0x0005, 0x20a1, 0x020b, 0x080c, 0x7747,</div><div class='del'>-	0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0x20a2, 0x7810, 0x20a2,</div><div class='del'>-	0x60c3, 0x0008, 0x080c, 0x7de0, 0x0005, 0x0146, 0x20a1, 0x020b,</div><div class='del'>-	0x0031, 0x60c3, 0x0000, 0x080c, 0x7de0, 0x014e, 0x0005, 0x20e1,</div><div class='del'>-	0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011,</div><div class='del'>-	0xb635, 0x2214, 0xd2ac, 0x1110, 0xd0bc, 0x0188, 0x00d6, 0xa0e8,</div><div class='del'>-	0xb735, 0x2d6c, 0x6810, 0xa085, 0x0300, 0x20a2, 0x6814, 0x20a2,</div><div class='del'>-	0x2069, 0xb61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0078, 0x00d6,</div><div class='del'>-	0xa0e8, 0xb735, 0x2d6c, 0x6810, 0xa085, 0x0300, 0x20a2, 0x6814,</div><div class='del'>-	0x20a2, 0x00de, 0x20a3, 0x0000, 0x6234, 0x22a2, 0x20a3, 0x0819,</div><div class='del'>-	0x20a3, 0x0000, 0x080c, 0x7dcf, 0x22a2, 0x20a3, 0x0000, 0x2fa2,</div><div class='del'>-	0x7a08, 0x22a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x0005, 0x20a1,</div><div class='del'>-	0x020b, 0x0079, 0x7910, 0x21a2, 0x20a3, 0x0000, 0x60c3, 0x0000,</div><div class='del'>-	0x20e1, 0x9080, 0x60a7, 0x9575, 0x080c, 0x7dea, 0x080c, 0x6a79,</div><div class='del'>-	0x0005, 0x0156, 0x0136, 0x0036, 0x00d6, 0x00e6, 0x20e1, 0x9080,</div><div class='del'>-	0x20e1, 0x4000, 0x7854, 0x2068, 0xadf0, 0x000f, 0x7210, 0xa296,</div><div class='del'>-	0x00c0, 0xa294, 0xfffd, 0x7212, 0x7214, 0xa294, 0x0300, 0x7216,</div><div class='del'>-	0x7100, 0xa194, 0x00ff, 0x7308, 0xa384, 0x00ff, 0xa08d, 0xc200,</div><div class='del'>-	0x7102, 0xa384, 0xff00, 0xa215, 0x720a, 0x7004, 0x720c, 0x700e,</div><div class='del'>-	0x7206, 0x20a9, 0x000a, 0x2e98, 0x53a6, 0x60a3, 0x0035, 0x6a38,</div><div class='del'>-	0xa294, 0x7000, 0xa286, 0x3000, 0x0110, 0x60a3, 0x0037, 0x00ee,</div><div class='del'>-	0x00de, 0x003e, 0x013e, 0x015e, 0x0005, 0x2009, 0x0092, 0x0010,</div><div class='del'>-	0x2009, 0x0096, 0x60ab, 0x0036, 0x6116, 0x0005, 0x2061, 0xbe00,</div><div class='del'>-	0x2a70, 0x7068, 0x704a, 0x704f, 0xbe00, 0x0005, 0x00e6, 0x0126,</div><div class='del'>-	0x2071, 0xb600, 0x2091, 0x8000, 0x7548, 0xa582, 0x0010, 0x0608,</div><div class='del'>-	0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0148, 0xace0, 0x0018,</div><div class='del'>-	0x705c, 0xac02, 0x1208, 0x0cb0, 0x2061, 0xbe00, 0x0c98, 0x6003,</div><div class='del'>-	0x0008, 0x8529, 0x754a, 0xaca8, 0x0018, 0x705c, 0xa502, 0x1230,</div><div class='del'>-	0x754e, 0xa085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x704f, 0xbe00,</div><div class='del'>-	0x0cc0, 0xa006, 0x0cc0, 0x00e6, 0x2071, 0xb600, 0x7548, 0xa582,</div><div class='del'>-	0x0010, 0x0600, 0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0148,</div><div class='del'>-	0xace0, 0x0018, 0x705c, 0xac02, 0x1208, 0x0cb0, 0x2061, 0xbe00,</div><div class='del'>-	0x0c98, 0x6003, 0x0008, 0x8529, 0x754a, 0xaca8, 0x0018, 0x705c,</div><div class='del'>-	0xa502, 0x1228, 0x754e, 0xa085, 0x0001, 0x00ee, 0x0005, 0x704f,</div><div class='del'>-	0xbe00, 0x0cc8, 0xa006, 0x0cc8, 0xac82, 0xbe00, 0x0a0c, 0x151a,</div><div class='del'>-	0x2001, 0xb617, 0x2004, 0xac02, 0x1a0c, 0x151a, 0xa006, 0x6006,</div><div class='del'>-	0x600a, 0x600e, 0x6012, 0x6016, 0x601a, 0x601f, 0x0000, 0x6003,</div><div class='del'>-	0x0000, 0x6052, 0x6056, 0x6022, 0x6026, 0x602a, 0x602e, 0x6032,</div><div class='del'>-	0x6036, 0x603a, 0x603e, 0x2061, 0xb600, 0x6048, 0x8000, 0x604a,</div><div class='del'>-	0xa086, 0x0001, 0x0108, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x71e5, 0x012e, 0x0cc0, 0x601c, 0xa084, 0x000f, 0x0002, 0x86e7,</div><div class='del'>-	0x86f6, 0x8711, 0x872c, 0xa20e, 0xa229, 0xa244, 0x86e7, 0x86f6,</div><div class='del'>-	0x86e7, 0x8747, 0x86e7, 0x86e7, 0x86e7, 0x86e7, 0x86e7, 0xa186,</div><div class='del'>-	0x0013, 0x1128, 0x080c, 0x7102, 0x080c, 0x71e5, 0x0005, 0xa18e,</div><div class='del'>-	0x0047, 0x1118, 0xa016, 0x080c, 0x1863, 0x0005, 0x0066, 0x6000,</div><div class='del'>-	0xa0b2, 0x0010, 0x1a0c, 0x151a, 0x0013, 0x006e, 0x0005, 0x870f,</div><div class='del'>-	0x8b27, 0x8cdf, 0x870f, 0x8d54, 0x8805, 0x870f, 0x870f, 0x8ab9,</div><div class='del'>-	0x917b, 0x870f, 0x870f, 0x870f, 0x870f, 0x870f, 0x870f, 0x080c,</div><div class='del'>-	0x151a, 0x0066, 0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x151a, 0x0013,</div><div class='del'>-	0x006e, 0x0005, 0x872a, 0x97de, 0x872a, 0x872a, 0x872a, 0x872a,</div><div class='del'>-	0x872a, 0x872a, 0x9789, 0x994a, 0x872a, 0x980b, 0x9882, 0x980b,</div><div class='del'>-	0x9882, 0x872a, 0x080c, 0x151a, 0x0066, 0x6000, 0xa0b2, 0x0010,</div><div class='del'>-	0x1a0c, 0x151a, 0x0013, 0x006e, 0x0005, 0x8745, 0x91bc, 0x9286,</div><div class='del'>-	0x93c4, 0x954d, 0x8745, 0x8745, 0x8745, 0x9196, 0x9739, 0x973c,</div><div class='del'>-	0x8745, 0x8745, 0x8745, 0x8745, 0x9766, 0x080c, 0x151a, 0x0066,</div><div class='del'>-	0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x151a, 0x0013, 0x006e, 0x0005,</div><div class='del'>-	0x8760, 0x8760, 0x8760, 0x878e, 0x87db, 0x8760, 0x8760, 0x8760,</div><div class='del'>-	0x8762, 0x8760, 0x8760, 0x8760, 0x8760, 0x8760, 0x8760, 0x8760,</div><div class='del'>-	0x080c, 0x151a, 0xa186, 0x0003, 0x190c, 0x151a, 0x00d6, 0x6003,</div><div class='del'>-	0x0003, 0x6106, 0x6010, 0x2068, 0x684f, 0x0040, 0x687c, 0x680a,</div><div class='del'>-	0x6880, 0x680e, 0x6813, 0x0000, 0x6817, 0x0000, 0x6854, 0xa092,</div><div class='del'>-	0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x8013, 0x8213, 0xa210,</div><div class='del'>-	0x6216, 0x00de, 0x2c10, 0x080c, 0x1fc5, 0x080c, 0x6d62, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x72a2, 0x012e, 0x0005, 0xa182, 0x0047,</div><div class='del'>-	0x0002, 0x879a, 0x879a, 0x879c, 0x87b5, 0x879a, 0x879a, 0x879a,</div><div class='del'>-	0x879a, 0x87c7, 0x080c, 0x151a, 0x00d6, 0x0016, 0x080c, 0x7198,</div><div class='del'>-	0x080c, 0x72a2, 0x6003, 0x0004, 0x6110, 0x2168, 0x684f, 0x0020,</div><div class='del'>-	0x685c, 0x685a, 0x6874, 0x687e, 0x6878, 0x6882, 0x6897, 0x0000,</div><div class='del'>-	0x689b, 0x0000, 0x001e, 0x00de, 0x0005, 0x080c, 0x7198, 0x00d6,</div><div class='del'>-	0x6110, 0x2168, 0x080c, 0x9d16, 0x0120, 0x684b, 0x0006, 0x080c,</div><div class='del'>-	0x547a, 0x00de, 0x080c, 0x86a4, 0x080c, 0x72a2, 0x0005, 0x080c,</div><div class='del'>-	0x7198, 0x080c, 0x2cd1, 0x00d6, 0x6110, 0x2168, 0x080c, 0x9d16,</div><div class='del'>-	0x0120, 0x684b, 0x0029, 0x080c, 0x547a, 0x00de, 0x080c, 0x86a4,</div><div class='del'>-	0x080c, 0x72a2, 0x0005, 0xa182, 0x0047, 0x0002, 0x87e9, 0x87f8,</div><div class='del'>-	0x87e7, 0x87e7, 0x87e7, 0x87e7, 0x87e7, 0x87e7, 0x87e7, 0x080c,</div><div class='del'>-	0x151a, 0x00d6, 0x6010, 0x2068, 0x684c, 0xc0f4, 0x684e, 0x00de,</div><div class='del'>-	0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x080c, 0x1863, 0x0005,</div><div class='del'>-	0x00d6, 0x6110, 0x2168, 0x684b, 0x0000, 0x6853, 0x0000, 0x080c,</div><div class='del'>-	0x547a, 0x00de, 0x080c, 0x86a4, 0x0005, 0xa1b6, 0x0015, 0x1118,</div><div class='del'>-	0x080c, 0x86a4, 0x0030, 0xa1b6, 0x0016, 0x190c, 0x151a, 0x080c,</div><div class='del'>-	0x86a4, 0x0005, 0x20a9, 0x000e, 0x2e98, 0x6010, 0x20a0, 0x53a3,</div><div class='del'>-	0x20a9, 0x0006, 0x3310, 0x3420, 0x9398, 0x94a0, 0x3318, 0x3428,</div><div class='del'>-	0x222e, 0x2326, 0xa290, 0x0002, 0xa5a8, 0x0002, 0xa398, 0x0002,</div><div class='del'>-	0xa4a0, 0x0002, 0x1f04, 0x8820, 0x00e6, 0x080c, 0x9d16, 0x0130,</div><div class='del'>-	0x6010, 0x2070, 0x7007, 0x0000, 0x7037, 0x0103, 0x00ee, 0x080c,</div><div class='del'>-	0x86a4, 0x0005, 0x00d6, 0x0036, 0x7330, 0xa386, 0x0200, 0x1130,</div><div class='del'>-	0x6018, 0x2068, 0x6813, 0x00ff, 0x6817, 0xfffd, 0x6010, 0xa005,</div><div class='del'>-	0x0130, 0x2068, 0x6807, 0x0000, 0x6837, 0x0103, 0x6b32, 0x080c,</div><div class='del'>-	0x86a4, 0x003e, 0x00de, 0x0005, 0x0016, 0x20a9, 0x002a, 0xae80,</div><div class='del'>-	0x000c, 0x2098, 0x6010, 0xa080, 0x0002, 0x20a0, 0x53a3, 0x20a9,</div><div class='del'>-	0x002a, 0x6010, 0xa080, 0x0001, 0x2004, 0xa080, 0x0002, 0x20a0,</div><div class='del'>-	0x53a3, 0x00e6, 0x6010, 0x2004, 0x2070, 0x7037, 0x0103, 0x00ee,</div><div class='del'>-	0x080c, 0x86a4, 0x001e, 0x0005, 0x0016, 0x2009, 0x0000, 0x7030,</div><div class='del'>-	0xa086, 0x0100, 0x0140, 0x7038, 0xa084, 0x00ff, 0x800c, 0x703c,</div><div class='del'>-	0xa084, 0x00ff, 0x8004, 0xa080, 0x0004, 0xa108, 0x21a8, 0xae80,</div><div class='del'>-	0x000c, 0x2098, 0x6010, 0xa080, 0x0002, 0x20a0, 0x080c, 0x4bf1,</div><div class='del'>-	0x00e6, 0x080c, 0x9d16, 0x0140, 0x6010, 0x2070, 0x7007, 0x0000,</div><div class='del'>-	0x7034, 0x70b2, 0x7037, 0x0103, 0x00ee, 0x080c, 0x86a4, 0x001e,</div><div class='del'>-	0x0005, 0x00e6, 0x00d6, 0x603f, 0x0000, 0x2c68, 0x0016, 0x2009,</div><div class='del'>-	0x0035, 0x080c, 0xa1c6, 0x001e, 0x1168, 0x0026, 0x6228, 0x2268,</div><div class='del'>-	0x002e, 0x2071, 0xbc8c, 0x6b1c, 0xa386, 0x0003, 0x0130, 0xa386,</div><div class='del'>-	0x0006, 0x0128, 0x080c, 0x86a4, 0x0020, 0x0031, 0x0010, 0x080c,</div><div class='del'>-	0x8982, 0x00de, 0x00ee, 0x0005, 0x00f6, 0x6810, 0x2078, 0xa186,</div><div class='del'>-	0x0015, 0x0904, 0x8969, 0xa18e, 0x0016, 0x1904, 0x8980, 0x700c,</div><div class='del'>-	0xa08c, 0xff00, 0xa186, 0x1700, 0x0120, 0xa186, 0x0300, 0x1904,</div><div class='del'>-	0x8948, 0x8fff, 0x1138, 0x6800, 0xa086, 0x000f, 0x0904, 0x892c,</div><div class='del'>-	0x0804, 0x897e, 0x6808, 0xa086, 0xffff, 0x1904, 0x896b, 0x784c,</div><div class='del'>-	0xa084, 0x0060, 0xa086, 0x0020, 0x1150, 0x797c, 0x7810, 0xa106,</div><div class='del'>-	0x1904, 0x896b, 0x7980, 0x7814, 0xa106, 0x1904, 0x896b, 0x080c,</div><div class='del'>-	0x9ecd, 0x6858, 0x7852, 0x784c, 0xc0dc, 0xc0f4, 0xc0d4, 0x784e,</div><div class='del'>-	0x0026, 0xa00e, 0x6a14, 0x2001, 0x000a, 0x080c, 0x6bb2, 0x7854,</div><div class='del'>-	0xa20a, 0x0208, 0x8011, 0x7a56, 0x82ff, 0x002e, 0x1138, 0x00c6,</div><div class='del'>-	0x2d60, 0x080c, 0x9ac5, 0x00ce, 0x0804, 0x897e, 0x00c6, 0x00d6,</div><div class='del'>-	0x2f68, 0x6838, 0xd0fc, 0x1118, 0x080c, 0x4cd7, 0x0010, 0x080c,</div><div class='del'>-	0x4ebb, 0x00de, 0x00ce, 0x1904, 0x896b, 0x00c6, 0x2d60, 0x080c,</div><div class='del'>-	0x86a4, 0x00ce, 0x0804, 0x897e, 0x00c6, 0x080c, 0x9f92, 0x0190,</div><div class='del'>-	0x6013, 0x0000, 0x6818, 0x601a, 0x080c, 0xa0e3, 0x601f, 0x0003,</div><div class='del'>-	0x6904, 0x00c6, 0x2d60, 0x080c, 0x86a4, 0x00ce, 0x080c, 0x86d3,</div><div class='del'>-	0x00ce, 0x04e0, 0x2001, 0xb8b8, 0x2004, 0x683e, 0x00ce, 0x04b0,</div><div class='del'>-	0x7008, 0xa086, 0x000b, 0x11a0, 0x6018, 0x200c, 0xc1bc, 0x2102,</div><div class='del'>-	0x00c6, 0x2d60, 0x784b, 0x0003, 0x6007, 0x0085, 0x6003, 0x000b,</div><div class='del'>-	0x601f, 0x0002, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x00ce, 0x00f0,</div><div class='del'>-	0x700c, 0xa086, 0x2a00, 0x1138, 0x2001, 0xb8b8, 0x2004, 0x683e,</div><div class='del'>-	0x00a8, 0x0481, 0x00a8, 0x8fff, 0x090c, 0x151a, 0x00c6, 0x00d6,</div><div class='del'>-	0x2d60, 0x2f68, 0x6837, 0x0103, 0x684b, 0x0003, 0x080c, 0x99b9,</div><div class='del'>-	0x080c, 0x9ecd, 0x080c, 0x9ed9, 0x00de, 0x00ce, 0x080c, 0x86a4,</div><div class='del'>-	0x00fe, 0x0005, 0xa186, 0x0015, 0x1128, 0x2001, 0xb8b8, 0x2004,</div><div class='del'>-	0x683e, 0x0068, 0xa18e, 0x0016, 0x1160, 0x00c6, 0x2d00, 0x2060,</div><div class='del'>-	0x080c, 0xb3f6, 0x080c, 0x6b61, 0x080c, 0x86a4, 0x00ce, 0x080c,</div><div class='del'>-	0x86a4, 0x0005, 0x0026, 0x0036, 0x0046, 0x7228, 0x7c80, 0x7b7c,</div><div class='del'>-	0xd2f4, 0x0130, 0x2001, 0xb8b8, 0x2004, 0x683e, 0x0804, 0x89fc,</div><div class='del'>-	0x00c6, 0x2d60, 0x080c, 0x99d9, 0x00ce, 0x6804, 0xa086, 0x0050,</div><div class='del'>-	0x1168, 0x00c6, 0x2d00, 0x2060, 0x6003, 0x0001, 0x6007, 0x0050,</div><div class='del'>-	0x080c, 0x6cff, 0x080c, 0x71e5, 0x00ce, 0x04f0, 0x6800, 0xa086,</div><div class='del'>-	0x000f, 0x01c8, 0x8fff, 0x090c, 0x151a, 0x6820, 0xd0dc, 0x1198,</div><div class='del'>-	0x6800, 0xa086, 0x0004, 0x1198, 0x784c, 0xd0ac, 0x0180, 0x784c,</div><div class='del'>-	0xc0dc, 0xc0f4, 0x784e, 0x7850, 0xc0f4, 0xc0fc, 0x7852, 0x2001,</div><div class='del'>-	0x0001, 0x682e, 0x00e0, 0x2001, 0x0007, 0x682e, 0x00c0, 0x784c,</div><div class='del'>-	0xd0b4, 0x1130, 0xd0ac, 0x0db8, 0x784c, 0xd0f4, 0x1da0, 0x0c38,</div><div class='del'>-	0xd2ec, 0x1d88, 0x7024, 0xa306, 0x1118, 0x7020, 0xa406, 0x0d58,</div><div class='del'>-	0x7020, 0x6836, 0x7024, 0x683a, 0x2001, 0x0005, 0x682e, 0x080c,</div><div class='del'>-	0xa01f, 0x080c, 0x71e5, 0x0010, 0x080c, 0x86a4, 0x004e, 0x003e,</div><div class='del'>-	0x002e, 0x0005, 0x00e6, 0x00d6, 0x0026, 0x6034, 0x2068, 0x6a1c,</div><div class='del'>-	0xa286, 0x0007, 0x0904, 0x8a60, 0xa286, 0x0002, 0x0904, 0x8a60,</div><div class='del'>-	0xa286, 0x0000, 0x0904, 0x8a60, 0x6808, 0x6338, 0xa306, 0x1904,</div><div class='del'>-	0x8a60, 0x2071, 0xbc8c, 0xa186, 0x0015, 0x05e0, 0xa18e, 0x0016,</div><div class='del'>-	0x1190, 0x6030, 0xa084, 0x00ff, 0xa086, 0x0001, 0x1160, 0x700c,</div><div class='del'>-	0xa086, 0x2a00, 0x1140, 0x6034, 0xa080, 0x0008, 0x200c, 0xc1dd,</div><div class='del'>-	0xc1f5, 0x2102, 0x0438, 0x00c6, 0x6034, 0x2060, 0x6104, 0xa186,</div><div class='del'>-	0x004b, 0x01a0, 0xa186, 0x004c, 0x0188, 0xa186, 0x004d, 0x0170,</div><div class='del'>-	0xa186, 0x004e, 0x0158, 0xa186, 0x0052, 0x0140, 0x6010, 0x2068,</div><div class='del'>-	0x080c, 0x9d16, 0x090c, 0x151a, 0x684b, 0x0003, 0x6007, 0x0085,</div><div class='del'>-	0x6003, 0x000b, 0x601f, 0x0002, 0x080c, 0x6cff, 0x080c, 0x71e5,</div><div class='del'>-	0x00ce, 0x0030, 0x6034, 0x2070, 0x2001, 0xb8b8, 0x2004, 0x703e,</div><div class='del'>-	0x080c, 0x86a4, 0x002e, 0x00de, 0x00ee, 0x0005, 0x00d6, 0x20a9,</div><div class='del'>-	0x000e, 0x2e98, 0x6010, 0x20a0, 0x53a3, 0xa1b6, 0x0015, 0x1558,</div><div class='del'>-	0x6018, 0x2068, 0x0156, 0x0036, 0x0026, 0xae90, 0x000c, 0xa290,</div><div class='del'>-	0x0004, 0x20a9, 0x0004, 0xad98, 0x000a, 0x080c, 0x9166, 0x002e,</div><div class='del'>-	0x003e, 0x015e, 0x11d8, 0x0156, 0x0036, 0x0026, 0xae90, 0x000c,</div><div class='del'>-	0xa290, 0x0008, 0x20a9, 0x0004, 0xad98, 0x0006, 0x080c, 0x9166,</div><div class='del'>-	0x002e, 0x003e, 0x015e, 0x1150, 0x7038, 0x680a, 0x703c, 0x680e,</div><div class='del'>-	0x6800, 0xc08d, 0x6802, 0x00de, 0x0804, 0x882c, 0x080c, 0x2cd1,</div><div class='del'>-	0x00c6, 0x080c, 0x864e, 0x2f00, 0x601a, 0x6013, 0x0000, 0x601f,</div><div class='del'>-	0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x2001, 0x0007, 0x080c,</div><div class='del'>-	0x4f6f, 0x080c, 0x4f9c, 0x080c, 0x6d45, 0x080c, 0x71e5, 0x00ce,</div><div class='del'>-	0x0c10, 0x2100, 0xa1b2, 0x0080, 0x1a0c, 0x151a, 0xa1b2, 0x0040,</div><div class='del'>-	0x1a04, 0x8b1d, 0x0002, 0x8b11, 0x8b05, 0x8b11, 0x8b11, 0x8b11,</div><div class='del'>-	0x8b11, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03,</div><div class='del'>-	0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03,</div><div class='del'>-	0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03,</div><div class='del'>-	0x8b03, 0x8b03, 0x8b11, 0x8b03, 0x8b11, 0x8b11, 0x8b03, 0x8b03,</div><div class='del'>-	0x8b03, 0x8b03, 0x8b03, 0x8b11, 0x8b03, 0x8b03, 0x8b03, 0x8b03,</div><div class='del'>-	0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b11, 0x8b11, 0x8b03,</div><div class='del'>-	0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03, 0x8b03,</div><div class='del'>-	0x8b11, 0x8b03, 0x8b03, 0x080c, 0x151a, 0x6003, 0x0001, 0x6106,</div><div class='del'>-	0x080c, 0x6d45, 0x0126, 0x2091, 0x8000, 0x080c, 0x71e5, 0x012e,</div><div class='del'>-	0x0005, 0x6003, 0x0001, 0x6106, 0x080c, 0x6d45, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x71e5, 0x012e, 0x0005, 0x2600, 0x0002, 0x8b11,</div><div class='del'>-	0x8b11, 0x8b25, 0x8b11, 0x8b11, 0x8b25, 0x080c, 0x151a, 0x6004,</div><div class='del'>-	0xa0b2, 0x0080, 0x1a0c, 0x151a, 0xa1b6, 0x0013, 0x0904, 0x8bd7,</div><div class='del'>-	0xa1b6, 0x0027, 0x1904, 0x8b9d, 0x080c, 0x7102, 0x6004, 0x080c,</div><div class='del'>-	0x9f03, 0x0190, 0x080c, 0x9f14, 0x0904, 0x8b97, 0xa08e, 0x0021,</div><div class='del'>-	0x0904, 0x8b9a, 0xa08e, 0x0022, 0x0904, 0x8b97, 0xa08e, 0x003d,</div><div class='del'>-	0x0904, 0x8b9a, 0x0804, 0x8b90, 0x080c, 0x2cf7, 0x2001, 0x0007,</div><div class='del'>-	0x080c, 0x4f6f, 0x6018, 0xa080, 0x0028, 0x200c, 0x080c, 0x8ca5,</div><div class='del'>-	0xa186, 0x007e, 0x1148, 0x2001, 0xb635, 0x2014, 0xc285, 0x080c,</div><div class='del'>-	0x5b41, 0x1108, 0xc2ad, 0x2202, 0x0016, 0x0026, 0x0036, 0x2110,</div><div class='del'>-	0x0026, 0x2019, 0x0028, 0x080c, 0x8320, 0x002e, 0x080c, 0xb449,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x0016, 0x0026, 0x0036, 0x2110, 0x2019,</div><div class='del'>-	0x0028, 0x080c, 0x6e67, 0x0076, 0x2039, 0x0000, 0x080c, 0x6d74,</div><div class='del'>-	0x00c6, 0x6018, 0xa065, 0x0110, 0x080c, 0x521c, 0x00ce, 0x2c08,</div><div class='del'>-	0x080c, 0xaf3e, 0x007e, 0x003e, 0x002e, 0x001e, 0x080c, 0x4fde,</div><div class='del'>-	0x080c, 0xa0db, 0x080c, 0x86a4, 0x080c, 0x71e5, 0x0005, 0x080c,</div><div class='del'>-	0x8ca5, 0x0cb0, 0x080c, 0x8cd3, 0x0c98, 0xa186, 0x0014, 0x1db0,</div><div class='del'>-	0x080c, 0x7102, 0x080c, 0x2cd1, 0x080c, 0x9f03, 0x1188, 0x080c,</div><div class='del'>-	0x2cf7, 0x6018, 0xa080, 0x0028, 0x200c, 0x080c, 0x8ca5, 0xa186,</div><div class='del'>-	0x007e, 0x1128, 0x2001, 0xb635, 0x200c, 0xc185, 0x2102, 0x08c0,</div><div class='del'>-	0x080c, 0x9f14, 0x1118, 0x080c, 0x8ca5, 0x0890, 0x6004, 0xa08e,</div><div class='del'>-	0x0032, 0x1158, 0x00e6, 0x00f6, 0x2071, 0xb682, 0x2079, 0x0000,</div><div class='del'>-	0x080c, 0x3004, 0x00fe, 0x00ee, 0x0818, 0x6004, 0xa08e, 0x0021,</div><div class='del'>-	0x0d50, 0xa08e, 0x0022, 0x090c, 0x8ca5, 0x0804, 0x8b90, 0xa0b2,</div><div class='del'>-	0x0040, 0x1a04, 0x8c9a, 0x2008, 0x0002, 0x8c1f, 0x8c20, 0x8c23,</div><div class='del'>-	0x8c26, 0x8c29, 0x8c2c, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d,</div><div class='del'>-	0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d,</div><div class='del'>-	0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d,</div><div class='del'>-	0x8c1d, 0x8c1d, 0x8c1d, 0x8c2f, 0x8c3e, 0x8c1d, 0x8c40, 0x8c3e,</div><div class='del'>-	0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c3e, 0x8c3e, 0x8c1d,</div><div class='del'>-	0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c7a,</div><div class='del'>-	0x8c3e, 0x8c1d, 0x8c3a, 0x8c1d, 0x8c1d, 0x8c1d, 0x8c3b, 0x8c1d,</div><div class='del'>-	0x8c1d, 0x8c1d, 0x8c3e, 0x8c71, 0x8c1d, 0x080c, 0x151a, 0x00f0,</div><div class='del'>-	0x2001, 0x000b, 0x0460, 0x2001, 0x0003, 0x0448, 0x2001, 0x0005,</div><div class='del'>-	0x0430, 0x2001, 0x0001, 0x0418, 0x2001, 0x0009, 0x0400, 0x080c,</div><div class='del'>-	0x7102, 0x6003, 0x0005, 0x2001, 0xb8b8, 0x2004, 0x603e, 0x080c,</div><div class='del'>-	0x71e5, 0x00a0, 0x0018, 0x0010, 0x080c, 0x4f6f, 0x0804, 0x8c8b,</div><div class='del'>-	0x080c, 0x7102, 0x2001, 0xb8b6, 0x2004, 0x6016, 0x2001, 0xb8b8,</div><div class='del'>-	0x2004, 0x603e, 0x6003, 0x0004, 0x080c, 0x71e5, 0x0005, 0x080c,</div><div class='del'>-	0x4f6f, 0x080c, 0x7102, 0x6003, 0x0002, 0x2001, 0xb8b8, 0x2004,</div><div class='del'>-	0x603e, 0x0036, 0x2019, 0xb65d, 0x2304, 0xa084, 0xff00, 0x1120,</div><div class='del'>-	0x2001, 0xb8b6, 0x201c, 0x0040, 0x8007, 0xa09a, 0x0004, 0x0ec0,</div><div class='del'>-	0x8003, 0x801b, 0x831b, 0xa318, 0x6316, 0x003e, 0x080c, 0x71e5,</div><div class='del'>-	0x08e8, 0x080c, 0x7102, 0x080c, 0xa0db, 0x080c, 0x86a4, 0x080c,</div><div class='del'>-	0x71e5, 0x08a0, 0x00e6, 0x00f6, 0x2071, 0xb682, 0x2079, 0x0000,</div><div class='del'>-	0x080c, 0x3004, 0x00fe, 0x00ee, 0x080c, 0x7102, 0x080c, 0x86a4,</div><div class='del'>-	0x080c, 0x71e5, 0x0818, 0x080c, 0x7102, 0x2001, 0xb8b8, 0x2004,</div><div class='del'>-	0x603e, 0x6003, 0x0002, 0x2001, 0xb8b6, 0x2004, 0x6016, 0x080c,</div><div class='del'>-	0x71e5, 0x0005, 0x2600, 0x2008, 0x0002, 0x8ca3, 0x8ca3, 0x8ca3,</div><div class='del'>-	0x8c8b, 0x8c8b, 0x8ca3, 0x080c, 0x151a, 0x00e6, 0x0026, 0x0016,</div><div class='del'>-	0x080c, 0x9d16, 0x0508, 0x6010, 0x2070, 0x7034, 0xa086, 0x0139,</div><div class='del'>-	0x1148, 0x2001, 0x0030, 0x2009, 0x0000, 0x2011, 0x4005, 0x080c,</div><div class='del'>-	0xa192, 0x0090, 0x7038, 0xd0fc, 0x0178, 0x7007, 0x0000, 0x0016,</div><div class='del'>-	0x6004, 0xa08e, 0x0021, 0x0160, 0xa08e, 0x003d, 0x0148, 0x001e,</div><div class='del'>-	0x7037, 0x0103, 0x7033, 0x0100, 0x001e, 0x002e, 0x00ee, 0x0005,</div><div class='del'>-	0x001e, 0x0009, 0x0cc8, 0x00e6, 0xacf0, 0x0004, 0x2e74, 0x7000,</div><div class='del'>-	0x2070, 0x7037, 0x0103, 0x7023, 0x8001, 0x00ee, 0x0005, 0x00d6,</div><div class='del'>-	0x6618, 0x2668, 0x6804, 0xa084, 0x00ff, 0x00de, 0xa0b2, 0x000c,</div><div class='del'>-	0x1a0c, 0x151a, 0x6604, 0xa6b6, 0x0043, 0x1120, 0x080c, 0xa14e,</div><div class='del'>-	0x0804, 0x8d44, 0x6604, 0xa6b6, 0x0033, 0x1120, 0x080c, 0xa0fe,</div><div class='del'>-	0x0804, 0x8d44, 0x6604, 0xa6b6, 0x0028, 0x1120, 0x080c, 0x9f44,</div><div class='del'>-	0x0804, 0x8d44, 0x6604, 0xa6b6, 0x0029, 0x1118, 0x080c, 0x9f5b,</div><div class='del'>-	0x04d8, 0x6604, 0xa6b6, 0x001f, 0x1118, 0x080c, 0x8812, 0x04a0,</div><div class='del'>-	0x6604, 0xa6b6, 0x0000, 0x1118, 0x080c, 0x8a66, 0x0468, 0x6604,</div><div class='del'>-	0xa6b6, 0x0022, 0x1118, 0x080c, 0x883a, 0x0430, 0x6604, 0xa6b6,</div><div class='del'>-	0x0035, 0x1118, 0x080c, 0x88a1, 0x00f8, 0x6604, 0xa6b6, 0x0039,</div><div class='del'>-	0x1118, 0x080c, 0x8a02, 0x00c0, 0x6604, 0xa6b6, 0x003d, 0x1118,</div><div class='del'>-	0x080c, 0x8854, 0x0088, 0x6604, 0xa6b6, 0x0044, 0x1118, 0x080c,</div><div class='del'>-	0x8874, 0x0050, 0xa1b6, 0x0015, 0x1110, 0x0053, 0x0028, 0xa1b6,</div><div class='del'>-	0x0016, 0x1118, 0x0804, 0x8f08, 0x0005, 0x080c, 0x86ef, 0x0ce0,</div><div class='del'>-	0x8d6b, 0x8d6e, 0x8d6b, 0x8db0, 0x8d6b, 0x8e95, 0x8f16, 0x8d6b,</div><div class='del'>-	0x8d6b, 0x8ee4, 0x8d6b, 0x8ef8, 0xa1b6, 0x0048, 0x0140, 0x20e1,</div><div class='del'>-	0x0005, 0x3d18, 0x3e20, 0x2c10, 0x080c, 0x1863, 0x0005, 0x00e6,</div><div class='del'>-	0xacf0, 0x0004, 0x2e74, 0x7000, 0x2070, 0x7037, 0x0103, 0x00ee,</div><div class='del'>-	0x080c, 0x86a4, 0x0005, 0xe000, 0xe000, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0xb600, 0x7084, 0xa086, 0x0074, 0x1530, 0x080c, 0xaf15, 0x11b0,</div><div class='del'>-	0x00d6, 0x6018, 0x2068, 0x7030, 0xd08c, 0x0128, 0x6800, 0xd0bc,</div><div class='del'>-	0x0110, 0xc0c5, 0x6802, 0x00d9, 0x00de, 0x2001, 0x0006, 0x080c,</div><div class='del'>-	0x4f6f, 0x080c, 0x2cf7, 0x080c, 0x86a4, 0x0078, 0x2001, 0x000a,</div><div class='del'>-	0x080c, 0x4f6f, 0x080c, 0x2cf7, 0x6003, 0x0001, 0x6007, 0x0001,</div><div class='del'>-	0x080c, 0x6d45, 0x0010, 0x080c, 0x8e82, 0x00ee, 0x0005, 0x6800,</div><div class='del'>-	0xd084, 0x0168, 0x2001, 0x0000, 0x080c, 0x4f5d, 0x2069, 0xb652,</div><div class='del'>-	0x6804, 0xd0a4, 0x0120, 0x2001, 0x0006, 0x080c, 0x4f9c, 0x0005,</div><div class='del'>-	0x00d6, 0x2011, 0xb621, 0x2204, 0xa086, 0x0074, 0x1904, 0x8e7f,</div><div class='del'>-	0x6018, 0x2068, 0x6aa0, 0xa286, 0x007e, 0x1120, 0x080c, 0x902e,</div><div class='del'>-	0x0804, 0x8e1e, 0x080c, 0x9024, 0x6018, 0x2068, 0xa080, 0x0028,</div><div class='del'>-	0x2014, 0xa286, 0x0080, 0x11c0, 0x6813, 0x00ff, 0x6817, 0xfffc,</div><div class='del'>-	0x6010, 0xa005, 0x0138, 0x2068, 0x6807, 0x0000, 0x6837, 0x0103,</div><div class='del'>-	0x6833, 0x0200, 0x2001, 0x0006, 0x080c, 0x4f6f, 0x080c, 0x2cf7,</div><div class='del'>-	0x080c, 0x86a4, 0x0804, 0x8e80, 0x00e6, 0x2071, 0xb635, 0x2e04,</div><div class='del'>-	0xd09c, 0x0188, 0x2071, 0xbc80, 0x7108, 0x720c, 0xa18c, 0x00ff,</div><div class='del'>-	0x1118, 0xa284, 0xff00, 0x0138, 0x6018, 0x2070, 0x70a0, 0xd0bc,</div><div class='del'>-	0x1110, 0x7112, 0x7216, 0x00ee, 0x6010, 0xa005, 0x0198, 0x2068,</div><div class='del'>-	0x6838, 0xd0f4, 0x0178, 0x6834, 0xa084, 0x00ff, 0xa086, 0x0039,</div><div class='del'>-	0x1958, 0x2001, 0x0000, 0x2009, 0x0000, 0x2011, 0x4000, 0x080c,</div><div class='del'>-	0xa192, 0x0840, 0x2001, 0x0004, 0x080c, 0x4f6f, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0003, 0x080c, 0x6d45, 0x0804, 0x8e80, 0x685c, 0xd0e4,</div><div class='del'>-	0x01d8, 0x080c, 0xa08e, 0x080c, 0x5b41, 0x0118, 0xd0dc, 0x1904,</div><div class='del'>-	0x8dda, 0x2011, 0xb635, 0x2204, 0xc0ad, 0x2012, 0x2001, 0xb88f,</div><div class='del'>-	0x2004, 0x00f6, 0x2079, 0x0100, 0x78e3, 0x0000, 0x080c, 0x28a7,</div><div class='del'>-	0x78e2, 0x00fe, 0x0804, 0x8dda, 0x080c, 0xa0c4, 0x2011, 0xb635,</div><div class='del'>-	0x2204, 0xc0a5, 0x2012, 0x0006, 0x080c, 0xb037, 0x000e, 0x1904,</div><div class='del'>-	0x8dda, 0xc0b5, 0x2012, 0x2001, 0x0006, 0x080c, 0x4f6f, 0x2001,</div><div class='del'>-	0x0000, 0x080c, 0x4f5d, 0x00c6, 0x2009, 0x00ef, 0x00f6, 0x2079,</div><div class='del'>-	0x0100, 0x79ea, 0x7932, 0x7936, 0x00fe, 0x080c, 0x287c, 0x00f6,</div><div class='del'>-	0x2079, 0xb600, 0x7976, 0x2100, 0x2009, 0x0000, 0x080c, 0x2852,</div><div class='del'>-	0x7952, 0x00fe, 0x8108, 0x080c, 0x4fbf, 0x2c00, 0x00ce, 0x1904,</div><div class='del'>-	0x8dda, 0x601a, 0x2001, 0x0002, 0x080c, 0x4f6f, 0x601f, 0x0001,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x6d45, 0x0008, 0x0011,</div><div class='del'>-	0x00de, 0x0005, 0x2001, 0x0007, 0x080c, 0x4f6f, 0x2001, 0xb600,</div><div class='del'>-	0x2004, 0xa086, 0x0003, 0x1120, 0x2001, 0x0007, 0x080c, 0x4f9c,</div><div class='del'>-	0x080c, 0x2cf7, 0x080c, 0x86a4, 0x0005, 0x00e6, 0x0026, 0x0016,</div><div class='del'>-	0x2071, 0xb600, 0x7084, 0xa086, 0x0014, 0x15f0, 0x7000, 0xa086,</div><div class='del'>-	0x0003, 0x1128, 0x6010, 0xa005, 0x1110, 0x080c, 0x3f85, 0x00d6,</div><div class='del'>-	0x6018, 0x2068, 0x080c, 0x50bd, 0x080c, 0x8d9f, 0x00de, 0x080c,</div><div class='del'>-	0x90dd, 0x1550, 0x00d6, 0x6018, 0x2068, 0x6890, 0x00de, 0xa005,</div><div class='del'>-	0x0518, 0x2001, 0x0006, 0x080c, 0x4f6f, 0x00e6, 0x6010, 0xa075,</div><div class='del'>-	0x01a8, 0x7034, 0xa084, 0x00ff, 0xa086, 0x0039, 0x1148, 0x2001,</div><div class='del'>-	0x0000, 0x2009, 0x0000, 0x2011, 0x4000, 0x080c, 0xa192, 0x0030,</div><div class='del'>-	0x7007, 0x0000, 0x7037, 0x0103, 0x7033, 0x0200, 0x00ee, 0x080c,</div><div class='del'>-	0x2cf7, 0x080c, 0x86a4, 0x0020, 0x080c, 0x8ca5, 0x080c, 0x8e82,</div><div class='del'>-	0x001e, 0x002e, 0x00ee, 0x0005, 0x2011, 0xb621, 0x2204, 0xa086,</div><div class='del'>-	0x0014, 0x1158, 0x2001, 0x0002, 0x080c, 0x4f6f, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0001, 0x080c, 0x6d45, 0x0010, 0x080c, 0x8e82, 0x0005,</div><div class='del'>-	0x2011, 0xb621, 0x2204, 0xa086, 0x0004, 0x1138, 0x2001, 0x0007,</div><div class='del'>-	0x080c, 0x4f6f, 0x080c, 0x86a4, 0x0010, 0x080c, 0x8e82, 0x0005,</div><div class='del'>-	0x000b, 0x0005, 0x8d6b, 0x8f21, 0x8d6b, 0x8f55, 0x8d6b, 0x8fe0,</div><div class='del'>-	0x8f16, 0x8d6b, 0x8d6b, 0x8ff3, 0x8d6b, 0x9003, 0x6604, 0xa686,</div><div class='del'>-	0x0003, 0x0904, 0x8e95, 0xa6b6, 0x001e, 0x1110, 0x080c, 0x86a4,</div><div class='del'>-	0x0005, 0x00d6, 0x00c6, 0x080c, 0x9013, 0x1178, 0x2001, 0x0000,</div><div class='del'>-	0x080c, 0x4f5d, 0x2001, 0x0002, 0x080c, 0x4f6f, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0002, 0x080c, 0x6d45, 0x00e8, 0x2009, 0xbc8e, 0x2104,</div><div class='del'>-	0xa086, 0x0009, 0x1160, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff,</div><div class='del'>-	0xa005, 0x0170, 0x8001, 0x6842, 0x6017, 0x000a, 0x0058, 0x2009,</div><div class='del'>-	0xbc8f, 0x2104, 0xa084, 0xff00, 0xa086, 0x1900, 0x1108, 0x08d0,</div><div class='del'>-	0x080c, 0x8e82, 0x00ce, 0x00de, 0x0005, 0x0026, 0x2011, 0x0000,</div><div class='del'>-	0x080c, 0x9021, 0x00d6, 0x2069, 0xb89e, 0x2d04, 0xa005, 0x0168,</div><div class='del'>-	0x6018, 0x2068, 0x68a0, 0xa086, 0x007e, 0x1138, 0x2069, 0xb61d,</div><div class='del'>-	0x2d04, 0x8000, 0x206a, 0x00de, 0x0010, 0x00de, 0x0078, 0x2001,</div><div class='del'>-	0x0000, 0x080c, 0x4f5d, 0x2001, 0x0002, 0x080c, 0x4f6f, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0002, 0x080c, 0x6d45, 0x0480, 0x00d6, 0x6010,</div><div class='del'>-	0x2068, 0x080c, 0x9d16, 0x00de, 0x0108, 0x6a34, 0x080c, 0x8ca5,</div><div class='del'>-	0x2009, 0xbc8e, 0x2134, 0xa6b4, 0x00ff, 0xa686, 0x0005, 0x0500,</div><div class='del'>-	0xa686, 0x000b, 0x01c8, 0x2009, 0xbc8f, 0x2104, 0xa084, 0xff00,</div><div class='del'>-	0x1118, 0xa686, 0x0009, 0x01a0, 0xa086, 0x1900, 0x1168, 0xa686,</div><div class='del'>-	0x0009, 0x0170, 0x2001, 0x0004, 0x080c, 0x4f6f, 0x2001, 0x0028,</div><div class='del'>-	0x6016, 0x6007, 0x004b, 0x0010, 0x080c, 0x8e82, 0x002e, 0x0005,</div><div class='del'>-	0x00d6, 0xa286, 0x0139, 0x0160, 0x6010, 0x2068, 0x080c, 0x9d16,</div><div class='del'>-	0x0148, 0x6834, 0xa086, 0x0139, 0x0118, 0x6838, 0xd0fc, 0x0110,</div><div class='del'>-	0x00de, 0x0c50, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005,</div><div class='del'>-	0x0140, 0x8001, 0x6842, 0x6017, 0x000a, 0x6007, 0x0016, 0x00de,</div><div class='del'>-	0x08e8, 0x68a0, 0xa086, 0x007e, 0x1138, 0x00e6, 0x2071, 0xb600,</div><div class='del'>-	0x080c, 0x4c28, 0x00ee, 0x0010, 0x080c, 0x2cd1, 0x00de, 0x0860,</div><div class='del'>-	0x080c, 0x9021, 0x1158, 0x2001, 0x0004, 0x080c, 0x4f6f, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0003, 0x080c, 0x6d45, 0x0020, 0x080c, 0x8ca5,</div><div class='del'>-	0x080c, 0x8e82, 0x0005, 0x0469, 0x1158, 0x2001, 0x0008, 0x080c,</div><div class='del'>-	0x4f6f, 0x6003, 0x0001, 0x6007, 0x0005, 0x080c, 0x6d45, 0x0010,</div><div class='del'>-	0x080c, 0x8e82, 0x0005, 0x00e9, 0x1158, 0x2001, 0x000a, 0x080c,</div><div class='del'>-	0x4f6f, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x6d45, 0x0010,</div><div class='del'>-	0x080c, 0x8e82, 0x0005, 0x2009, 0xbc8e, 0x2104, 0xa086, 0x0003,</div><div class='del'>-	0x1138, 0x2009, 0xbc8f, 0x2104, 0xa084, 0xff00, 0xa086, 0x2a00,</div><div class='del'>-	0x0005, 0xa085, 0x0001, 0x0005, 0x00c6, 0x0016, 0xac88, 0x0006,</div><div class='del'>-	0x2164, 0x080c, 0x502a, 0x001e, 0x00ce, 0x0005, 0x00f6, 0x00e6,</div><div class='del'>-	0x00d6, 0x0036, 0x0016, 0x6018, 0x2068, 0x2071, 0xb635, 0x2e04,</div><div class='del'>-	0xa085, 0x0003, 0x2072, 0x080c, 0x90b2, 0x0560, 0x2009, 0xb635,</div><div class='del'>-	0x2104, 0xc0cd, 0x200a, 0x2001, 0xb653, 0x2004, 0xd0a4, 0x0158,</div><div class='del'>-	0xa006, 0x2020, 0x2009, 0x002a, 0x080c, 0xb1a4, 0x2001, 0xb60c,</div><div class='del'>-	0x200c, 0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0001, 0x080c,</div><div class='del'>-	0x2ca4, 0x2071, 0xb600, 0x080c, 0x2aed, 0x00c6, 0x0156, 0x20a9,</div><div class='del'>-	0x0081, 0x2009, 0x007f, 0x080c, 0x2dcc, 0x8108, 0x1f04, 0x9063,</div><div class='del'>-	0x015e, 0x00ce, 0x080c, 0x9024, 0x6813, 0x00ff, 0x6817, 0xfffe,</div><div class='del'>-	0x2071, 0xbc80, 0x2079, 0x0100, 0x2e04, 0xa084, 0x00ff, 0x2069,</div><div class='del'>-	0xb61c, 0x206a, 0x78e6, 0x0006, 0x8e70, 0x2e04, 0x2069, 0xb61d,</div><div class='del'>-	0x206a, 0x78ea, 0x7832, 0x7836, 0x2010, 0xa084, 0xff00, 0x001e,</div><div class='del'>-	0xa105, 0x2009, 0xb628, 0x200a, 0x2200, 0xa084, 0x00ff, 0x2008,</div><div class='del'>-	0x080c, 0x287c, 0x080c, 0x5b41, 0x0170, 0x2069, 0xbc8e, 0x2071,</div><div class='del'>-	0xb8b2, 0x6810, 0x2072, 0x6814, 0x7006, 0x6818, 0x700a, 0x681c,</div><div class='del'>-	0x700e, 0x080c, 0xa08e, 0x0040, 0x2001, 0x0006, 0x080c, 0x4f6f,</div><div class='del'>-	0x080c, 0x2cf7, 0x080c, 0x86a4, 0x001e, 0x003e, 0x00de, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x0026, 0x0036, 0x00e6, 0x0156, 0x2019, 0xb628,</div><div class='del'>-	0x231c, 0x83ff, 0x01e8, 0x2071, 0xbc80, 0x2e14, 0xa294, 0x00ff,</div><div class='del'>-	0x7004, 0xa084, 0xff00, 0xa205, 0xa306, 0x1190, 0x2011, 0xbc96,</div><div class='del'>-	0xad98, 0x000a, 0x20a9, 0x0004, 0x080c, 0x9166, 0x1148, 0x2011,</div><div class='del'>-	0xbc9a, 0xad98, 0x0006, 0x20a9, 0x0004, 0x080c, 0x9166, 0x1100,</div><div class='del'>-	0x015e, 0x00ee, 0x003e, 0x002e, 0x0005, 0x00e6, 0x2071, 0xbc8c,</div><div class='del'>-	0x7004, 0xa086, 0x0014, 0x11a8, 0x7008, 0xa086, 0x0800, 0x1188,</div><div class='del'>-	0x700c, 0xd0ec, 0x0160, 0xa084, 0x0f00, 0xa086, 0x0100, 0x1138,</div><div class='del'>-	0x7024, 0xd0a4, 0x1110, 0xd0ac, 0x0110, 0xa006, 0x0010, 0xa085,</div><div class='del'>-	0x0001, 0x00ee, 0x0005, 0x00e6, 0x00d6, 0x00c6, 0x0076, 0x0056,</div><div class='del'>-	0x0046, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2029, 0xb8ea,</div><div class='del'>-	0x252c, 0x2021, 0xb8f0, 0x2424, 0x2061, 0xbe00, 0x2071, 0xb600,</div><div class='del'>-	0x7248, 0x7068, 0xa202, 0x16f0, 0x080c, 0xb1cc, 0x05a0, 0x671c,</div><div class='del'>-	0xa786, 0x0001, 0x0580, 0xa786, 0x0007, 0x0568, 0x2500, 0xac06,</div><div class='del'>-	0x0550, 0x2400, 0xac06, 0x0538, 0x00c6, 0x6000, 0xa086, 0x0004,</div><div class='del'>-	0x1110, 0x080c, 0x1952, 0xa786, 0x0008, 0x1148, 0x080c, 0x9f14,</div><div class='del'>-	0x1130, 0x00ce, 0x080c, 0x8ca5, 0x080c, 0x9ed9, 0x00a0, 0x6010,</div><div class='del'>-	0x2068, 0x080c, 0x9d16, 0x0160, 0xa786, 0x0003, 0x11e8, 0x6837,</div><div class='del'>-	0x0103, 0x6b4a, 0x6847, 0x0000, 0x080c, 0x547a, 0x080c, 0x9ecd,</div><div class='del'>-	0x080c, 0x9ed9, 0x00ce, 0xace0, 0x0018, 0x705c, 0xac02, 0x1210,</div><div class='del'>-	0x0804, 0x9110, 0x012e, 0x000e, 0x002e, 0x004e, 0x005e, 0x007e,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x0005, 0xa786, 0x0006, 0x1118, 0x080c,</div><div class='del'>-	0xb155, 0x0c30, 0xa786, 0x000a, 0x09e0, 0x08c8, 0x220c, 0x2304,</div><div class='del'>-	0xa106, 0x1130, 0x8210, 0x8318, 0x1f04, 0x9166, 0xa006, 0x0005,</div><div class='del'>-	0x2304, 0xa102, 0x0218, 0x2001, 0x0001, 0x0010, 0x2001, 0x0000,</div><div class='del'>-	0xa18d, 0x0001, 0x0005, 0x6004, 0xa08a, 0x0080, 0x1a0c, 0x151a,</div><div class='del'>-	0x080c, 0x9f03, 0x0120, 0x080c, 0x9f14, 0x0168, 0x0028, 0x080c,</div><div class='del'>-	0x2cf7, 0x080c, 0x9f14, 0x0138, 0x080c, 0x7102, 0x080c, 0x86a4,</div><div class='del'>-	0x080c, 0x71e5, 0x0005, 0x080c, 0x8ca5, 0x0cb0, 0xa182, 0x0040,</div><div class='del'>-	0x0002, 0x91ac, 0x91ac, 0x91ac, 0x91ac, 0x91ac, 0x91ac, 0x91ac,</div><div class='del'>-	0x91ac, 0x91ac, 0x91ac, 0x91ac, 0x91ae, 0x91ae, 0x91ae, 0x91ae,</div><div class='del'>-	0x91ac, 0x91ac, 0x91ac, 0x91ae, 0x080c, 0x151a, 0x600b, 0xffff,</div><div class='del'>-	0x6003, 0x0001, 0x6106, 0x080c, 0x6cff, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x71e5, 0x012e, 0x0005, 0xa186, 0x0013, 0x1128, 0x6004,</div><div class='del'>-	0xa082, 0x0040, 0x0804, 0x9248, 0xa186, 0x0027, 0x11e8, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x2cd1, 0x00d6, 0x6110, 0x2168, 0x080c, 0x9d16,</div><div class='del'>-	0x0168, 0x6837, 0x0103, 0x684b, 0x0029, 0x6847, 0x0000, 0x694c,</div><div class='del'>-	0xc1c5, 0x694e, 0x080c, 0x547a, 0x080c, 0x9ecd, 0x00de, 0x080c,</div><div class='del'>-	0x86a4, 0x080c, 0x71e5, 0x0005, 0xa186, 0x0014, 0x1120, 0x6004,</div><div class='del'>-	0xa082, 0x0040, 0x0428, 0xa186, 0x0046, 0x0138, 0xa186, 0x0045,</div><div class='del'>-	0x0120, 0xa186, 0x0047, 0x190c, 0x151a, 0x2001, 0x0109, 0x2004,</div><div class='del'>-	0xd084, 0x0198, 0x0126, 0x2091, 0x2800, 0x0006, 0x0016, 0x0026,</div><div class='del'>-	0x080c, 0x6be6, 0x002e, 0x001e, 0x000e, 0x012e, 0xe000, 0x6000,</div><div class='del'>-	0xa086, 0x0002, 0x1110, 0x0804, 0x9286, 0x080c, 0x86ef, 0x0005,</div><div class='del'>-	0x0002, 0x9226, 0x9224, 0x9224, 0x9224, 0x9224, 0x9224, 0x9224,</div><div class='del'>-	0x9224, 0x9224, 0x9224, 0x9224, 0x9241, 0x9241, 0x9241, 0x9241,</div><div class='del'>-	0x9224, 0x9241, 0x9224, 0x9241, 0x080c, 0x151a, 0x080c, 0x7102,</div><div class='del'>-	0x00d6, 0x6110, 0x2168, 0x080c, 0x9d16, 0x0168, 0x6837, 0x0103,</div><div class='del'>-	0x684b, 0x0006, 0x6847, 0x0000, 0x6850, 0xc0ec, 0x6852, 0x080c,</div><div class='del'>-	0x547a, 0x080c, 0x9ecd, 0x00de, 0x080c, 0x86a4, 0x080c, 0x71e5,</div><div class='del'>-	0x0005, 0x080c, 0x7102, 0x080c, 0x86a4, 0x080c, 0x71e5, 0x0005,</div><div class='del'>-	0x0002, 0x925e, 0x925c, 0x925c, 0x925c, 0x925c, 0x925c, 0x925c,</div><div class='del'>-	0x925c, 0x925c, 0x925c, 0x925c, 0x9270, 0x9270, 0x9270, 0x9270,</div><div class='del'>-	0x925c, 0x927f, 0x925c, 0x9270, 0x080c, 0x151a, 0x080c, 0x7102,</div><div class='del'>-	0x2001, 0xb8b8, 0x2004, 0x603e, 0x6003, 0x0002, 0x080c, 0x71e5,</div><div class='del'>-	0x6010, 0xa088, 0x0013, 0x2104, 0xa085, 0x0400, 0x200a, 0x0005,</div><div class='del'>-	0x080c, 0x7102, 0x2001, 0xb8b6, 0x2004, 0x6016, 0x2001, 0xb8b8,</div><div class='del'>-	0x2004, 0x603e, 0x6003, 0x000f, 0x080c, 0x71e5, 0x0005, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x86a4, 0x080c, 0x71e5, 0x0005, 0xa182, 0x0040,</div><div class='del'>-	0x0002, 0x929c, 0x929c, 0x929c, 0x929c, 0x929c, 0x929e, 0x9386,</div><div class='del'>-	0x93b5, 0x929c, 0x929c, 0x929c, 0x929c, 0x929c, 0x929c, 0x929c,</div><div class='del'>-	0x929c, 0x929c, 0x929c, 0x929c, 0x080c, 0x151a, 0x00e6, 0x00d6,</div><div class='del'>-	0x603f, 0x0000, 0x2071, 0xbc80, 0x7124, 0x610a, 0x2071, 0xbc8c,</div><div class='del'>-	0x6110, 0x2168, 0x7614, 0xa6b4, 0x0fff, 0x86ff, 0x0904, 0x934c,</div><div class='del'>-	0xa68c, 0x0c00, 0x0518, 0x00f6, 0x2c78, 0x080c, 0x5377, 0x00fe,</div><div class='del'>-	0x01c8, 0x684c, 0xd0ac, 0x01b0, 0x6020, 0xd0dc, 0x1198, 0x6850,</div><div class='del'>-	0xd0bc, 0x1180, 0x7318, 0x6814, 0xa306, 0x1904, 0x935f, 0x731c,</div><div class='del'>-	0x6810, 0xa31e, 0x0138, 0xd6d4, 0x0904, 0x935f, 0x6b14, 0xa305,</div><div class='del'>-	0x1904, 0x935f, 0x7318, 0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff,</div><div class='del'>-	0xa186, 0x0002, 0x0518, 0xa186, 0x0028, 0x1128, 0x080c, 0x9ef2,</div><div class='del'>-	0x684b, 0x001c, 0x00e8, 0xd6dc, 0x01a0, 0x684b, 0x0015, 0x684c,</div><div class='del'>-	0xd0ac, 0x0170, 0x6914, 0x6a10, 0x2100, 0xa205, 0x0148, 0x7018,</div><div class='del'>-	0xa106, 0x1118, 0x701c, 0xa206, 0x0118, 0x6962, 0x6a5e, 0xc6dc,</div><div class='del'>-	0x0038, 0xd6d4, 0x0118, 0x684b, 0x0007, 0x0010, 0x684b, 0x0000,</div><div class='del'>-	0x6837, 0x0103, 0x6e46, 0xa01e, 0xd6c4, 0x01f0, 0xa686, 0x0100,</div><div class='del'>-	0x1140, 0x2001, 0xbc99, 0x2004, 0xa005, 0x1118, 0xc6c4, 0x0804,</div><div class='del'>-	0x92ad, 0x7328, 0x732c, 0x6b56, 0x83ff, 0x0170, 0xa38a, 0x0009,</div><div class='del'>-	0x0210, 0x2019, 0x0008, 0x0036, 0x2308, 0x2019, 0xbc98, 0xad90,</div><div class='del'>-	0x0019, 0x080c, 0x99c9, 0x003e, 0xd6cc, 0x0904, 0x9375, 0x7124,</div><div class='del'>-	0x695a, 0x81ff, 0x0904, 0x9375, 0xa192, 0x0021, 0x1260, 0x2071,</div><div class='del'>-	0xbc98, 0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x080c, 0x99c9,</div><div class='del'>-	0x080c, 0xa1f3, 0x04d0, 0x6838, 0xd0fc, 0x0120, 0x2009, 0x0020,</div><div class='del'>-	0x695a, 0x0c68, 0x00f6, 0x2d78, 0x080c, 0x996e, 0x00fe, 0x080c,</div><div class='del'>-	0xa1f3, 0x080c, 0x99b9, 0x0458, 0x00f6, 0x2c78, 0x080c, 0x5377,</div><div class='del'>-	0x00fe, 0x0190, 0x684c, 0xd0ac, 0x0178, 0x6020, 0xd0dc, 0x1160,</div><div class='del'>-	0x6850, 0xd0bc, 0x1148, 0x6810, 0x6914, 0xa105, 0x0128, 0x080c,</div><div class='del'>-	0x9ff1, 0x00de, 0x00ee, 0x0408, 0x684b, 0x0000, 0x6837, 0x0103,</div><div class='del'>-	0x6e46, 0x080c, 0x9523, 0x1148, 0x684c, 0xd0ac, 0x0130, 0x6810,</div><div class='del'>-	0x6914, 0xa115, 0x0110, 0x080c, 0x953f, 0x080c, 0x547a, 0x6218,</div><div class='del'>-	0x2268, 0x6a3c, 0x82ff, 0x0110, 0x8211, 0x6a3e, 0x080c, 0x9fbf,</div><div class='del'>-	0x00de, 0x00ee, 0x1110, 0x080c, 0x86a4, 0x0005, 0x00f6, 0x6003,</div><div class='del'>-	0x0003, 0x2079, 0xbc8c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08, 0x6010,</div><div class='del'>-	0x2078, 0x784c, 0xd0ac, 0x0138, 0x6003, 0x0002, 0x00fe, 0x0005,</div><div class='del'>-	0x2130, 0x2228, 0x0058, 0x2400, 0x797c, 0xa10a, 0x2300, 0x7a80,</div><div class='del'>-	0xa213, 0x2600, 0xa102, 0x2500, 0xa203, 0x0e90, 0x7c12, 0x7b16,</div><div class='del'>-	0x7e0a, 0x7d0e, 0x00fe, 0x603f, 0x0000, 0x2c10, 0x080c, 0x1fc5,</div><div class='del'>-	0x080c, 0x6d62, 0x080c, 0x72a2, 0x0005, 0x2001, 0xb8b8, 0x2004,</div><div class='del'>-	0x603e, 0x6003, 0x0004, 0x6110, 0x20e1, 0x0005, 0x3d18, 0x3e20,</div><div class='del'>-	0x2c10, 0x080c, 0x1863, 0x0005, 0xa182, 0x0040, 0x0002, 0x93da,</div><div class='del'>-	0x93da, 0x93da, 0x93da, 0x93da, 0x93dc, 0x946f, 0x93da, 0x93da,</div><div class='del'>-	0x9485, 0x94eb, 0x93da, 0x93da, 0x93da, 0x93da, 0x9509, 0x93da,</div><div class='del'>-	0x93da, 0x93da, 0x080c, 0x151a, 0x0076, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x2071, 0xbc8c, 0x6110, 0x2178, 0x7614, 0xa6b4, 0x0fff, 0x7e46,</div><div class='del'>-	0x7f4c, 0xc7e5, 0x7f4e, 0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0110,</div><div class='del'>-	0x8211, 0x6a3e, 0x86ff, 0x0904, 0x946a, 0xa694, 0xff00, 0xa284,</div><div class='del'>-	0x0c00, 0x0120, 0x7018, 0x7862, 0x701c, 0x785e, 0xa284, 0x0300,</div><div class='del'>-	0x0904, 0x946a, 0x080c, 0x15fd, 0x090c, 0x151a, 0x2d00, 0x784a,</div><div class='del'>-	0x7f4c, 0xc7cd, 0x7f4e, 0x6837, 0x0103, 0x7838, 0x683a, 0x783c,</div><div class='del'>-	0x683e, 0x7840, 0x6842, 0x6e46, 0xa68c, 0x0c00, 0x0120, 0x7318,</div><div class='del'>-	0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff, 0xa186, 0x0002, 0x0180,</div><div class='del'>-	0xa186, 0x0028, 0x1118, 0x684b, 0x001c, 0x0060, 0xd6dc, 0x0118,</div><div class='del'>-	0x684b, 0x0015, 0x0038, 0xd6d4, 0x0118, 0x684b, 0x0007, 0x0010,</div><div class='del'>-	0x684b, 0x0000, 0x6f4e, 0x7850, 0x6852, 0x7854, 0x6856, 0xa01e,</div><div class='del'>-	0xd6c4, 0x0198, 0x7328, 0x732c, 0x6b56, 0x83ff, 0x0170, 0xa38a,</div><div class='del'>-	0x0009, 0x0210, 0x2019, 0x0008, 0x0036, 0x2308, 0x2019, 0xbc98,</div><div class='del'>-	0xad90, 0x0019, 0x080c, 0x99c9, 0x003e, 0xd6cc, 0x01d8, 0x7124,</div><div class='del'>-	0x695a, 0x81ff, 0x01b8, 0xa192, 0x0021, 0x1250, 0x2071, 0xbc98,</div><div class='del'>-	0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x080c, 0x99c9, 0x0050,</div><div class='del'>-	0x7838, 0xd0fc, 0x0120, 0x2009, 0x0020, 0x695a, 0x0c78, 0x2d78,</div><div class='del'>-	0x080c, 0x996e, 0x00de, 0x00ee, 0x00fe, 0x007e, 0x0005, 0x00f6,</div><div class='del'>-	0x6003, 0x0003, 0x2079, 0xbc8c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08,</div><div class='del'>-	0x6010, 0x2078, 0x7c12, 0x7b16, 0x7e0a, 0x7d0e, 0x00fe, 0x2c10,</div><div class='del'>-	0x080c, 0x1fc5, 0x080c, 0x7dd9, 0x0005, 0x00d6, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0x5377, 0x00fe, 0x0120, 0x2001, 0xb8b8, 0x2004, 0x603e,</div><div class='del'>-	0x6003, 0x0002, 0x080c, 0x7198, 0x080c, 0x72a2, 0x6110, 0x2168,</div><div class='del'>-	0x694c, 0xd1e4, 0x0904, 0x94e9, 0xd1cc, 0x0540, 0x6948, 0x6838,</div><div class='del'>-	0xd0fc, 0x01e8, 0x0016, 0x684c, 0x0006, 0x6850, 0x0006, 0xad90,</div><div class='del'>-	0x000d, 0xa198, 0x000d, 0x2009, 0x0020, 0x0156, 0x21a8, 0x2304,</div><div class='del'>-	0x2012, 0x8318, 0x8210, 0x1f04, 0x94af, 0x015e, 0x000e, 0x6852,</div><div class='del'>-	0x000e, 0x684e, 0x001e, 0x2168, 0x080c, 0x1624, 0x0428, 0x0016,</div><div class='del'>-	0x080c, 0x1624, 0x00de, 0x080c, 0x99b9, 0x00f0, 0x6837, 0x0103,</div><div class='del'>-	0x6944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x0180, 0xa086, 0x0028,</div><div class='del'>-	0x1118, 0x684b, 0x001c, 0x0070, 0xd1dc, 0x0118, 0x684b, 0x0015,</div><div class='del'>-	0x0048, 0xd1d4, 0x0118, 0x684b, 0x0007, 0x0020, 0x684b, 0x0000,</div><div class='del'>-	0x080c, 0x9523, 0x080c, 0x547a, 0x080c, 0x9fbf, 0x1110, 0x080c,</div><div class='del'>-	0x86a4, 0x00de, 0x0005, 0x2019, 0x0001, 0x080c, 0x806b, 0x6003,</div><div class='del'>-	0x0002, 0x00d6, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0140, 0x6808,</div><div class='del'>-	0x612c, 0xa10a, 0x612e, 0x680c, 0x6128, 0xa10b, 0x612a, 0x00de,</div><div class='del'>-	0x2001, 0xb8b8, 0x2004, 0x603e, 0x080c, 0x7198, 0x080c, 0x72a2,</div><div class='del'>-	0x0005, 0x080c, 0x7198, 0x080c, 0x2cd1, 0x00d6, 0x6110, 0x2168,</div><div class='del'>-	0x080c, 0x9d16, 0x0150, 0x6837, 0x0103, 0x684b, 0x0029, 0x6847,</div><div class='del'>-	0x0000, 0x080c, 0x547a, 0x080c, 0x9ecd, 0x00de, 0x080c, 0x86a4,</div><div class='del'>-	0x080c, 0x72a2, 0x0005, 0x684c, 0xd0b4, 0x01c0, 0x602c, 0x697c,</div><div class='del'>-	0xa112, 0x6028, 0x6980, 0xa10b, 0x2100, 0xa205, 0x0168, 0x684b,</div><div class='del'>-	0x0015, 0xd1fc, 0x0138, 0x684b, 0x0007, 0x8212, 0x8210, 0x810a,</div><div class='del'>-	0xa189, 0x0000, 0x6962, 0x6a5e, 0xa085, 0x0001, 0x0005, 0x684b,</div><div class='del'>-	0x0015, 0xd1fc, 0x0138, 0x684b, 0x0007, 0x8002, 0x8000, 0x810a,</div><div class='del'>-	0xa189, 0x0000, 0x6962, 0x685e, 0x0005, 0xa182, 0x0040, 0x0002,</div><div class='del'>-	0x9563, 0x9563, 0x9563, 0x9563, 0x9563, 0x9565, 0x9563, 0x9620,</div><div class='del'>-	0x962c, 0x9563, 0x9563, 0x9563, 0x9563, 0x9563, 0x9563, 0x9563,</div><div class='del'>-	0x9563, 0x9563, 0x9563, 0x080c, 0x151a, 0x0076, 0x00f6, 0x00e6,</div><div class='del'>-	0x00d6, 0x2071, 0xbc8c, 0x6110, 0x2178, 0x7614, 0xa6b4, 0x0fff,</div><div class='del'>-	0x00f6, 0x2c78, 0x080c, 0x5377, 0x00fe, 0x0150, 0xa684, 0x00ff,</div><div class='del'>-	0x1138, 0x6020, 0xd0f4, 0x0120, 0x080c, 0x9ff1, 0x0804, 0x961b,</div><div class='del'>-	0x7e46, 0x7f4c, 0xc7e5, 0x7f4e, 0x6218, 0x2268, 0x6a3c, 0x82ff,</div><div class='del'>-	0x0110, 0x8211, 0x6a3e, 0x86ff, 0x0904, 0x9611, 0xa694, 0xff00,</div><div class='del'>-	0xa284, 0x0c00, 0x0120, 0x7018, 0x7862, 0x701c, 0x785e, 0xa284,</div><div class='del'>-	0x0300, 0x0904, 0x960f, 0xa686, 0x0100, 0x1140, 0x2001, 0xbc99,</div><div class='del'>-	0x2004, 0xa005, 0x1118, 0xc6c4, 0x7e46, 0x0c28, 0x080c, 0x15fd,</div><div class='del'>-	0x090c, 0x151a, 0x2d00, 0x784a, 0x7f4c, 0xa7bd, 0x0200, 0x7f4e,</div><div class='del'>-	0x6837, 0x0103, 0x7838, 0x683a, 0x783c, 0x683e, 0x7840, 0x6842,</div><div class='del'>-	0x6e46, 0xa68c, 0x0c00, 0x0120, 0x7318, 0x6b62, 0x731c, 0x6b5e,</div><div class='del'>-	0xa68c, 0x00ff, 0xa186, 0x0002, 0x0180, 0xa186, 0x0028, 0x1118,</div><div class='del'>-	0x684b, 0x001c, 0x0060, 0xd6dc, 0x0118, 0x684b, 0x0015, 0x0038,</div><div class='del'>-	0xd6d4, 0x0118, 0x684b, 0x0007, 0x0010, 0x684b, 0x0000, 0x6f4e,</div><div class='del'>-	0x7850, 0x6852, 0x7854, 0x6856, 0xa01e, 0xd6c4, 0x0198, 0x7328,</div><div class='del'>-	0x732c, 0x6b56, 0x83ff, 0x0170, 0xa38a, 0x0009, 0x0210, 0x2019,</div><div class='del'>-	0x0008, 0x0036, 0x2308, 0x2019, 0xbc98, 0xad90, 0x0019, 0x080c,</div><div class='del'>-	0x99c9, 0x003e, 0xd6cc, 0x01d8, 0x7124, 0x695a, 0x81ff, 0x01b8,</div><div class='del'>-	0xa192, 0x0021, 0x1250, 0x2071, 0xbc98, 0x831c, 0x2300, 0xae18,</div><div class='del'>-	0xad90, 0x001d, 0x080c, 0x99c9, 0x0050, 0x7838, 0xd0fc, 0x0120,</div><div class='del'>-	0x2009, 0x0020, 0x695a, 0x0c78, 0x2d78, 0x080c, 0x996e, 0xd6dc,</div><div class='del'>-	0x1110, 0xa006, 0x0030, 0x2001, 0x0001, 0x2071, 0xbc8c, 0x7218,</div><div class='del'>-	0x731c, 0x080c, 0x18b6, 0x00de, 0x00ee, 0x00fe, 0x007e, 0x0005,</div><div class='del'>-	0x2001, 0xb8b8, 0x2004, 0x603e, 0x20e1, 0x0005, 0x3d18, 0x3e20,</div><div class='del'>-	0x2c10, 0x080c, 0x1863, 0x0005, 0x2001, 0xb8b8, 0x2004, 0x603e,</div><div class='del'>-	0x00d6, 0x6003, 0x0002, 0x6110, 0x2168, 0x694c, 0xd1e4, 0x0904,</div><div class='del'>-	0x9737, 0x603f, 0x0000, 0x00f6, 0x2c78, 0x080c, 0x5377, 0x00fe,</div><div class='del'>-	0x0560, 0x6814, 0x6910, 0xa115, 0x0540, 0x6a60, 0xa206, 0x1118,</div><div class='del'>-	0x685c, 0xa106, 0x0510, 0x684c, 0xc0e4, 0x684e, 0x6847, 0x0000,</div><div class='del'>-	0x6863, 0x0000, 0x685f, 0x0000, 0x6020, 0xd0f4, 0x1158, 0x697c,</div><div class='del'>-	0x6810, 0xa102, 0x603a, 0x6980, 0x6814, 0xa103, 0x6036, 0x6020,</div><div class='del'>-	0xc0f5, 0x6022, 0x00d6, 0x6018, 0x2068, 0x683c, 0x8000, 0x683e,</div><div class='del'>-	0x00de, 0x080c, 0x9ff1, 0x0804, 0x9737, 0x694c, 0xd1cc, 0x0904,</div><div class='del'>-	0x9707, 0x6948, 0x6838, 0xd0fc, 0x0904, 0x96ca, 0x0016, 0x684c,</div><div class='del'>-	0x0006, 0x6850, 0x0006, 0x00f6, 0x2178, 0x7944, 0xa184, 0x00ff,</div><div class='del'>-	0xa0b6, 0x0002, 0x01e0, 0xa086, 0x0028, 0x1128, 0x684b, 0x001c,</div><div class='del'>-	0x784b, 0x001c, 0x00e8, 0xd1dc, 0x0158, 0x684b, 0x0015, 0x784b,</div><div class='del'>-	0x0015, 0x080c, 0xa17b, 0x0118, 0x7944, 0xc1dc, 0x7946, 0x0080,</div><div class='del'>-	0xd1d4, 0x0128, 0x684b, 0x0007, 0x784b, 0x0007, 0x0048, 0x684c,</div><div class='del'>-	0xd0ac, 0x0130, 0x6810, 0x6914, 0xa115, 0x0110, 0x080c, 0x953f,</div><div class='del'>-	0x6848, 0x784a, 0x6860, 0x7862, 0x685c, 0x785e, 0xad90, 0x000d,</div><div class='del'>-	0xaf98, 0x000d, 0x2009, 0x0020, 0x0156, 0x21a8, 0x2304, 0x2012,</div><div class='del'>-	0x8318, 0x8210, 0x1f04, 0x96b6, 0x015e, 0x00fe, 0x000e, 0x6852,</div><div class='del'>-	0x000e, 0x684e, 0x080c, 0xa1f3, 0x001e, 0x2168, 0x080c, 0x1624,</div><div class='del'>-	0x0804, 0x9732, 0x0016, 0x00f6, 0x2178, 0x7944, 0xa184, 0x00ff,</div><div class='del'>-	0xa0b6, 0x0002, 0x01e0, 0xa086, 0x0028, 0x1128, 0x684b, 0x001c,</div><div class='del'>-	0x784b, 0x001c, 0x00e8, 0xd1dc, 0x0158, 0x684b, 0x0015, 0x784b,</div><div class='del'>-	0x0015, 0x080c, 0xa17b, 0x0118, 0x7944, 0xc1dc, 0x7946, 0x0080,</div><div class='del'>-	0xd1d4, 0x0128, 0x684b, 0x0007, 0x784b, 0x0007, 0x0048, 0x684c,</div><div class='del'>-	0xd0ac, 0x0130, 0x6810, 0x6914, 0xa115, 0x0110, 0x080c, 0x953f,</div><div class='del'>-	0x6860, 0x7862, 0x685c, 0x785e, 0x684c, 0x784e, 0x00fe, 0x080c,</div><div class='del'>-	0x1624, 0x00de, 0x080c, 0xa1f3, 0x080c, 0x99b9, 0x0458, 0x6837,</div><div class='del'>-	0x0103, 0x6944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x01b0, 0xa086,</div><div class='del'>-	0x0028, 0x1118, 0x684b, 0x001c, 0x00d8, 0xd1dc, 0x0148, 0x684b,</div><div class='del'>-	0x0015, 0x080c, 0xa17b, 0x0118, 0x6944, 0xc1dc, 0x6946, 0x0080,</div><div class='del'>-	0xd1d4, 0x0118, 0x684b, 0x0007, 0x0058, 0x684b, 0x0000, 0x684c,</div><div class='del'>-	0xd0ac, 0x0130, 0x6810, 0x6914, 0xa115, 0x0110, 0x080c, 0x953f,</div><div class='del'>-	0x080c, 0x547a, 0x080c, 0x9fbf, 0x1110, 0x080c, 0x86a4, 0x00de,</div><div class='del'>-	0x0005, 0x080c, 0x7102, 0x0010, 0x080c, 0x7198, 0x080c, 0x9d16,</div><div class='del'>-	0x01c0, 0x00d6, 0x6110, 0x2168, 0x6837, 0x0103, 0x2009, 0xb60c,</div><div class='del'>-	0x210c, 0xd18c, 0x11c0, 0xd184, 0x1198, 0x6108, 0x694a, 0xa18e,</div><div class='del'>-	0x0029, 0x1110, 0x080c, 0xb43c, 0x6847, 0x0000, 0x080c, 0x547a,</div><div class='del'>-	0x00de, 0x080c, 0x86a4, 0x080c, 0x71e5, 0x080c, 0x72a2, 0x0005,</div><div class='del'>-	0x684b, 0x0004, 0x0c88, 0x684b, 0x0004, 0x0c70, 0xa182, 0x0040,</div><div class='del'>-	0x0002, 0x977c, 0x977c, 0x977c, 0x977c, 0x977c, 0x977e, 0x977c,</div><div class='del'>-	0x9781, 0x977c, 0x977c, 0x977c, 0x977c, 0x977c, 0x977c, 0x977c,</div><div class='del'>-	0x977c, 0x977c, 0x977c, 0x977c, 0x080c, 0x151a, 0x080c, 0x86a4,</div><div class='del'>-	0x0005, 0x0006, 0x0026, 0xa016, 0x080c, 0x1863, 0x002e, 0x000e,</div><div class='del'>-	0x0005, 0xa182, 0x0085, 0x0002, 0x9795, 0x9793, 0x9793, 0x97a1,</div><div class='del'>-	0x9793, 0x9793, 0x9793, 0x080c, 0x151a, 0x6003, 0x0001, 0x6106,</div><div class='del'>-	0x080c, 0x6cff, 0x0126, 0x2091, 0x8000, 0x080c, 0x71e5, 0x012e,</div><div class='del'>-	0x0005, 0x0026, 0x0056, 0x00d6, 0x00e6, 0x2071, 0xbc80, 0x7224,</div><div class='del'>-	0x6212, 0x7220, 0x080c, 0x9d06, 0x01a0, 0x2268, 0x6800, 0xa086,</div><div class='del'>-	0x0000, 0x0178, 0x6018, 0x6d18, 0xa52e, 0x1158, 0x00c6, 0x2d60,</div><div class='del'>-	0x080c, 0x99d9, 0x00ce, 0x0128, 0x6803, 0x0002, 0x6007, 0x0086,</div><div class='del'>-	0x0010, 0x6007, 0x0087, 0x6003, 0x0001, 0x080c, 0x6cff, 0x080c,</div><div class='del'>-	0x71e5, 0x00f6, 0x2278, 0x080c, 0x5377, 0x00fe, 0x0150, 0x6820,</div><div class='del'>-	0xd0ec, 0x0138, 0x00c6, 0x2260, 0x603f, 0x0000, 0x080c, 0x9ff1,</div><div class='del'>-	0x00ce, 0x00ee, 0x00de, 0x005e, 0x002e, 0x0005, 0xa186, 0x0013,</div><div class='del'>-	0x1160, 0x6004, 0xa08a, 0x0085, 0x0a0c, 0x151a, 0xa08a, 0x008c,</div><div class='del'>-	0x1a0c, 0x151a, 0xa082, 0x0085, 0x0072, 0xa186, 0x0027, 0x0120,</div><div class='del'>-	0xa186, 0x0014, 0x190c, 0x151a, 0x080c, 0x7102, 0x080c, 0x9ed9,</div><div class='del'>-	0x080c, 0x71e5, 0x0005, 0x9802, 0x9804, 0x9804, 0x9802, 0x9802,</div><div class='del'>-	0x9802, 0x9802, 0x080c, 0x151a, 0x080c, 0x7102, 0x080c, 0x9ed9,</div><div class='del'>-	0x080c, 0x71e5, 0x0005, 0xa186, 0x0013, 0x1128, 0x6004, 0xa082,</div><div class='del'>-	0x0085, 0x2008, 0x04a8, 0xa186, 0x0027, 0x11e8, 0x080c, 0x7102,</div><div class='del'>-	0x080c, 0x2cd1, 0x00d6, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0150,</div><div class='del'>-	0x6837, 0x0103, 0x6847, 0x0000, 0x684b, 0x0029, 0x080c, 0x547a,</div><div class='del'>-	0x080c, 0x9ecd, 0x00de, 0x080c, 0x86a4, 0x080c, 0x71e5, 0x0005,</div><div class='del'>-	0x080c, 0x86ef, 0x0ce0, 0xa186, 0x0014, 0x1dd0, 0x080c, 0x7102,</div><div class='del'>-	0x00d6, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0d60, 0x6837, 0x0103,</div><div class='del'>-	0x6847, 0x0000, 0x684b, 0x0006, 0x6850, 0xc0ec, 0x6852, 0x08f0,</div><div class='del'>-	0x0002, 0x9852, 0x9850, 0x9850, 0x9850, 0x9850, 0x9850, 0x986a,</div><div class='del'>-	0x080c, 0x151a, 0x080c, 0x7102, 0x6030, 0xa08c, 0xff00, 0x810f,</div><div class='del'>-	0xa186, 0x0039, 0x0118, 0xa186, 0x0035, 0x1118, 0x2001, 0xb8b6,</div><div class='del'>-	0x0010, 0x2001, 0xb8b7, 0x2004, 0x6016, 0x6003, 0x000c, 0x080c,</div><div class='del'>-	0x71e5, 0x0005, 0x080c, 0x7102, 0x6030, 0xa08c, 0xff00, 0x810f,</div><div class='del'>-	0xa186, 0x0039, 0x0118, 0xa186, 0x0035, 0x1118, 0x2001, 0xb8b6,</div><div class='del'>-	0x0010, 0x2001, 0xb8b7, 0x2004, 0x6016, 0x6003, 0x000e, 0x080c,</div><div class='del'>-	0x71e5, 0x0005, 0xa182, 0x008c, 0x1220, 0xa182, 0x0085, 0x0208,</div><div class='del'>-	0x001a, 0x080c, 0x86ef, 0x0005, 0x9893, 0x9893, 0x9893, 0x9893,</div><div class='del'>-	0x9895, 0x98ee, 0x9893, 0x080c, 0x151a, 0x00d6, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0x5377, 0x00fe, 0x0168, 0x6030, 0xa08c, 0xff00, 0x810f,</div><div class='del'>-	0xa186, 0x0039, 0x0118, 0xa186, 0x0035, 0x1118, 0x00de, 0x0804,</div><div class='del'>-	0x9901, 0x080c, 0x9d16, 0x1118, 0x080c, 0x9ecd, 0x00f0, 0x6010,</div><div class='del'>-	0x2068, 0x684c, 0xd0e4, 0x1110, 0x080c, 0x9ecd, 0x6837, 0x0103,</div><div class='del'>-	0x6850, 0xd0b4, 0x0128, 0x684b, 0x0006, 0xc0ec, 0x6852, 0x0048,</div><div class='del'>-	0xd0bc, 0x0118, 0x684b, 0x0002, 0x0020, 0x684b, 0x0005, 0x080c,</div><div class='del'>-	0x9f8e, 0x6847, 0x0000, 0x080c, 0x547a, 0x2c68, 0x080c, 0x864e,</div><div class='del'>-	0x01c0, 0x6003, 0x0001, 0x6007, 0x001e, 0x600b, 0xffff, 0x2009,</div><div class='del'>-	0xbc8e, 0x210c, 0x6136, 0x2009, 0xbc8f, 0x210c, 0x613a, 0x6918,</div><div class='del'>-	0x611a, 0x080c, 0xa0e3, 0x6950, 0x6152, 0x601f, 0x0001, 0x080c,</div><div class='del'>-	0x6cff, 0x2d60, 0x080c, 0x86a4, 0x00de, 0x0005, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0x5377, 0x00fe, 0x0598, 0x6030, 0xa08c, 0xff00, 0x810f,</div><div class='del'>-	0xa186, 0x0035, 0x0130, 0xa186, 0x001e, 0x0118, 0xa186, 0x0039,</div><div class='del'>-	0x1530, 0x00d6, 0x2c68, 0x080c, 0xa1c6, 0x1904, 0x9946, 0x080c,</div><div class='del'>-	0x864e, 0x01d8, 0x6106, 0x6003, 0x0001, 0x601f, 0x0001, 0x6918,</div><div class='del'>-	0x611a, 0x6928, 0x612a, 0x692c, 0x612e, 0x6930, 0xa18c, 0x00ff,</div><div class='del'>-	0x6132, 0x6934, 0x6136, 0x6938, 0x613a, 0x6950, 0x6152, 0x080c,</div><div class='del'>-	0xa0e3, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x2d60, 0x00f8, 0x00d6,</div><div class='del'>-	0x6010, 0x2068, 0x080c, 0x9d16, 0x01c8, 0x6837, 0x0103, 0x6850,</div><div class='del'>-	0xd0b4, 0x0128, 0xc0ec, 0x6852, 0x684b, 0x0006, 0x0048, 0xd0bc,</div><div class='del'>-	0x0118, 0x684b, 0x0002, 0x0020, 0x684b, 0x0005, 0x080c, 0x9f8e,</div><div class='del'>-	0x6847, 0x0000, 0x080c, 0x547a, 0x080c, 0x9ecd, 0x00de, 0x080c,</div><div class='del'>-	0x86a4, 0x0005, 0x0016, 0x00d6, 0x6010, 0x2068, 0x080c, 0x9d16,</div><div class='del'>-	0x0140, 0x6837, 0x0103, 0x684b, 0x0028, 0x6847, 0x0000, 0x080c,</div><div class='del'>-	0x547a, 0x00de, 0x001e, 0xa186, 0x0013, 0x0148, 0xa186, 0x0014,</div><div class='del'>-	0x0130, 0xa186, 0x0027, 0x0118, 0x080c, 0x86ef, 0x0030, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005, 0x0056, 0x0066,</div><div class='del'>-	0x00d6, 0x00f6, 0x2029, 0x0001, 0xa182, 0x0101, 0x1208, 0x0010,</div><div class='del'>-	0x2009, 0x0100, 0x2130, 0x2069, 0xbc98, 0x831c, 0x2300, 0xad18,</div><div class='del'>-	0x2009, 0x0020, 0xaf90, 0x001d, 0x080c, 0x99c9, 0xa6b2, 0x0020,</div><div class='del'>-	0x7804, 0xa06d, 0x0110, 0x080c, 0x1624, 0x080c, 0x15fd, 0x0500,</div><div class='del'>-	0x8528, 0x6837, 0x0110, 0x683b, 0x0000, 0x2d20, 0x7c06, 0xa68a,</div><div class='del'>-	0x003d, 0x1228, 0x2608, 0xad90, 0x000f, 0x0459, 0x0088, 0xa6b2,</div><div class='del'>-	0x003c, 0x2009, 0x003c, 0x2d78, 0xad90, 0x000f, 0x0411, 0x0c28,</div><div class='del'>-	0x00fe, 0x852f, 0xa5ad, 0x0003, 0x7d36, 0xa5ac, 0x0000, 0x0028,</div><div class='del'>-	0x00fe, 0x852f, 0xa5ad, 0x0003, 0x7d36, 0x00de, 0x006e, 0x005e,</div><div class='del'>-	0x0005, 0x00f6, 0x8dff, 0x0158, 0x6804, 0xa07d, 0x0130, 0x6807,</div><div class='del'>-	0x0000, 0x080c, 0x547a, 0x2f68, 0x0cb8, 0x080c, 0x547a, 0x00fe,</div><div class='del'>-	0x0005, 0x0156, 0xa184, 0x0001, 0x0108, 0x8108, 0x810c, 0x21a8,</div><div class='del'>-	0x2304, 0x8007, 0x2012, 0x8318, 0x8210, 0x1f04, 0x99d0, 0x015e,</div><div class='del'>-	0x0005, 0x0066, 0x0126, 0x2091, 0x8000, 0x2031, 0x0001, 0x601c,</div><div class='del'>-	0xa084, 0x000f, 0x0083, 0x012e, 0x006e, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x0066, 0x2031, 0x0000, 0x601c, 0xa084, 0x000f, 0x001b,</div><div class='del'>-	0x006e, 0x012e, 0x0005, 0x9a10, 0x9a10, 0x9a0b, 0x9a32, 0x99fe,</div><div class='del'>-	0x9a0b, 0x9a32, 0x9a0b, 0x9a0b, 0x99fe, 0x9a0b, 0x080c, 0x151a,</div><div class='del'>-	0x0036, 0x2019, 0x0010, 0x080c, 0xad9c, 0x601f, 0x0006, 0x6003,</div><div class='del'>-	0x0007, 0x003e, 0x0005, 0xa006, 0x0005, 0xa085, 0x0001, 0x0005,</div><div class='del'>-	0x00d6, 0x86ff, 0x11d8, 0x6010, 0x2068, 0x080c, 0x9d16, 0x01c0,</div><div class='del'>-	0x6834, 0xa086, 0x0139, 0x1128, 0x684b, 0x0005, 0x6853, 0x0000,</div><div class='del'>-	0x0028, 0xa00e, 0x2001, 0x0005, 0x080c, 0x554d, 0x080c, 0x9f8e,</div><div class='del'>-	0x080c, 0x547a, 0x080c, 0x86a4, 0xa085, 0x0001, 0x00de, 0x0005,</div><div class='del'>-	0xa006, 0x0ce0, 0x6000, 0xa08a, 0x0010, 0x1a0c, 0x151a, 0x000b,</div><div class='del'>-	0x0005, 0x9a49, 0x9a6a, 0x9a4b, 0x9a89, 0x9a67, 0x9a49, 0x9a0b,</div><div class='del'>-	0x9a10, 0x9a10, 0x9a0b, 0x9a0b, 0x9a0b, 0x9a0b, 0x9a0b, 0x9a0b,</div><div class='del'>-	0x9a0b, 0x080c, 0x151a, 0x86ff, 0x11b8, 0x601c, 0xa086, 0x0006,</div><div class='del'>-	0x0198, 0x00d6, 0x6010, 0x2068, 0x080c, 0x9d16, 0x0110, 0x080c,</div><div class='del'>-	0x9f8e, 0x00de, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002,</div><div class='del'>-	0x080c, 0x6cff, 0x080c, 0x71e5, 0xa085, 0x0001, 0x0005, 0x080c,</div><div class='del'>-	0x1952, 0x0c08, 0x00e6, 0x2071, 0xb8e1, 0x7024, 0xac06, 0x1110,</div><div class='del'>-	0x080c, 0x7fe0, 0x601c, 0xa084, 0x000f, 0xa086, 0x0006, 0x1150,</div><div class='del'>-	0x0086, 0x0096, 0x2049, 0x0001, 0x2c40, 0x080c, 0x81b7, 0x009e,</div><div class='del'>-	0x008e, 0x0010, 0x080c, 0x7ed1, 0x00ee, 0x1928, 0x080c, 0x9a0b,</div><div class='del'>-	0x0005, 0x0036, 0x00e6, 0x2071, 0xb8e1, 0x703c, 0xac06, 0x1140,</div><div class='del'>-	0x2019, 0x0000, 0x080c, 0x806b, 0x00ee, 0x003e, 0x0804, 0x9a4b,</div><div class='del'>-	0x080c, 0x82e4, 0x00ee, 0x003e, 0x1904, 0x9a4b, 0x080c, 0x9a0b,</div><div class='del'>-	0x0005, 0x00c6, 0x601c, 0xa084, 0x000f, 0x0013, 0x00ce, 0x0005,</div><div class='del'>-	0x9aba, 0x9b27, 0x9c75, 0x9ac5, 0x9ed9, 0x9aba, 0xad8e, 0xa20a,</div><div class='del'>-	0x9b27, 0x9ab3, 0x9ce0, 0x080c, 0x151a, 0x080c, 0x9f14, 0x1110,</div><div class='del'>-	0x080c, 0x8ca5, 0x0005, 0x080c, 0x7102, 0x080c, 0x71e5, 0x080c,</div><div class='del'>-	0x86a4, 0x0005, 0x6017, 0x0001, 0x0005, 0x080c, 0x9d16, 0x0120,</div><div class='del'>-	0x6010, 0xa080, 0x0019, 0x2c02, 0x6000, 0xa08a, 0x0010, 0x1a0c,</div><div class='del'>-	0x151a, 0x000b, 0x0005, 0x9ae3, 0x9ae5, 0x9b05, 0x9b17, 0x9b24,</div><div class='del'>-	0x9ae3, 0x9aba, 0x9aba, 0x9aba, 0x9b17, 0x9b17, 0x9ae3, 0x9ae3,</div><div class='del'>-	0x9ae3, 0x9ae3, 0x9b21, 0x080c, 0x151a, 0x00e6, 0x6010, 0x2070,</div><div class='del'>-	0x7050, 0xc0b5, 0x7052, 0x2071, 0xb8e1, 0x7024, 0xac06, 0x0190,</div><div class='del'>-	0x080c, 0x7ed1, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002,</div><div class='del'>-	0x2001, 0xb8b7, 0x2004, 0x6016, 0x080c, 0x6cff, 0x080c, 0x71e5,</div><div class='del'>-	0x00ee, 0x0005, 0x6017, 0x0001, 0x0cd8, 0x00d6, 0x6010, 0x2068,</div><div class='del'>-	0x6850, 0xc0b5, 0x6852, 0x00de, 0x6007, 0x0085, 0x6003, 0x000b,</div><div class='del'>-	0x601f, 0x0002, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x0005, 0x00d6,</div><div class='del'>-	0x6017, 0x0001, 0x6010, 0x2068, 0x6850, 0xc0b5, 0x6852, 0x00de,</div><div class='del'>-	0x0005, 0x080c, 0x86a4, 0x0005, 0x080c, 0x1952, 0x08f0, 0x6000,</div><div class='del'>-	0xa08a, 0x0010, 0x1a0c, 0x151a, 0x000b, 0x0005, 0x9b3e, 0x9ac2,</div><div class='del'>-	0x9b40, 0x9b3e, 0x9b40, 0x9b40, 0x9abb, 0x9b3e, 0x9ab5, 0x9ab5,</div><div class='del'>-	0x9b3e, 0x9b3e, 0x9b3e, 0x9b3e, 0x9b3e, 0x9b3e, 0x080c, 0x151a,</div><div class='del'>-	0x00d6, 0x6018, 0x2068, 0x6804, 0xa084, 0x00ff, 0x00de, 0xa08a,</div><div class='del'>-	0x000c, 0x1a0c, 0x151a, 0x000b, 0x0005, 0x9b59, 0x9c1b, 0x9b5b,</div><div class='del'>-	0x9b99, 0x9b5b, 0x9b99, 0x9b5b, 0x9b69, 0x9b59, 0x9b99, 0x9b59,</div><div class='del'>-	0x9b85, 0x080c, 0x151a, 0x6004, 0xa08e, 0x0016, 0x05a8, 0xa08e,</div><div class='del'>-	0x0004, 0x0590, 0xa08e, 0x0002, 0x0578, 0xa08e, 0x004b, 0x0904,</div><div class='del'>-	0x9c17, 0x6004, 0x080c, 0x9f14, 0x0904, 0x9c34, 0xa08e, 0x0021,</div><div class='del'>-	0x0904, 0x9c38, 0xa08e, 0x0022, 0x0904, 0x9c34, 0xa08e, 0x003d,</div><div class='del'>-	0x0904, 0x9c38, 0xa08e, 0x0039, 0x0904, 0x9c3c, 0xa08e, 0x0035,</div><div class='del'>-	0x0904, 0x9c3c, 0xa08e, 0x001e, 0x0188, 0xa08e, 0x0001, 0x1150,</div><div class='del'>-	0x00d6, 0x6018, 0x2068, 0x6804, 0xa084, 0x00ff, 0x00de, 0xa086,</div><div class='del'>-	0x0006, 0x0110, 0x080c, 0x2cd1, 0x080c, 0x8ca5, 0x080c, 0x9ed9,</div><div class='del'>-	0x0005, 0x00c6, 0x00d6, 0x6104, 0xa186, 0x0016, 0x0904, 0x9c08,</div><div class='del'>-	0xa186, 0x0002, 0x15d8, 0x2001, 0xb635, 0x2004, 0xd08c, 0x1198,</div><div class='del'>-	0x080c, 0x5b41, 0x1180, 0x2001, 0xb89f, 0x2003, 0x0001, 0x2001,</div><div class='del'>-	0xb600, 0x2003, 0x0001, 0xa085, 0x0001, 0x080c, 0x5b85, 0x080c,</div><div class='del'>-	0x5a79, 0x0804, 0x9c5e, 0x6018, 0x2068, 0x2001, 0xb635, 0x2004,</div><div class='del'>-	0xd0ac, 0x1904, 0x9c5e, 0x68a0, 0xd0bc, 0x1904, 0x9c5e, 0x6840,</div><div class='del'>-	0xa084, 0x00ff, 0xa005, 0x0190, 0x8001, 0x6842, 0x6013, 0x0000,</div><div class='del'>-	0x601f, 0x0007, 0x6017, 0x0398, 0x603f, 0x0000, 0x080c, 0x864e,</div><div class='del'>-	0x0128, 0x2d00, 0x601a, 0x601f, 0x0001, 0x0450, 0x00de, 0x00ce,</div><div class='del'>-	0x6004, 0xa08e, 0x0002, 0x11a8, 0x6018, 0xa080, 0x0028, 0x2004,</div><div class='del'>-	0xa086, 0x007e, 0x1170, 0x2009, 0xb635, 0x2104, 0xc085, 0x200a,</div><div class='del'>-	0x00e6, 0x2071, 0xb600, 0x080c, 0x4c28, 0x00ee, 0x080c, 0x8ca5,</div><div class='del'>-	0x0020, 0x080c, 0x8ca5, 0x080c, 0x2cd1, 0x00e6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x2cf7, 0x012e, 0x00ee, 0x080c, 0x9ed9, 0x0005,</div><div class='del'>-	0x2001, 0x0002, 0x080c, 0x4f6f, 0x6003, 0x0001, 0x6007, 0x0002,</div><div class='del'>-	0x080c, 0x6d45, 0x080c, 0x71e5, 0x00de, 0x00ce, 0x0c80, 0x080c,</div><div class='del'>-	0x2cf7, 0x0804, 0x9b94, 0x00c6, 0x00d6, 0x6104, 0xa186, 0x0016,</div><div class='del'>-	0x0d38, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005, 0x0904,</div><div class='del'>-	0x9bde, 0x8001, 0x6842, 0x6003, 0x0001, 0x080c, 0x6d45, 0x080c,</div><div class='del'>-	0x71e5, 0x00de, 0x00ce, 0x0898, 0x080c, 0x8ca5, 0x0804, 0x9b96,</div><div class='del'>-	0x080c, 0x8cd3, 0x0804, 0x9b96, 0x00d6, 0x2c68, 0x6104, 0x080c,</div><div class='del'>-	0xa1c6, 0x00de, 0x0118, 0x080c, 0x86a4, 0x00b8, 0x6004, 0x8007,</div><div class='del'>-	0x6130, 0xa18c, 0x00ff, 0xa105, 0x6032, 0x6007, 0x0085, 0x6003,</div><div class='del'>-	0x000b, 0x601f, 0x0002, 0x6038, 0x600a, 0x2001, 0xb8b7, 0x2004,</div><div class='del'>-	0x6016, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x0005, 0x00de, 0x00ce,</div><div class='del'>-	0x080c, 0x8ca5, 0x080c, 0x2cd1, 0x00e6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x2cf7, 0x6013, 0x0000, 0x601f, 0x0007, 0x6017, 0x0398,</div><div class='del'>-	0x603f, 0x0000, 0x012e, 0x00ee, 0x0005, 0x6000, 0xa08a, 0x0010,</div><div class='del'>-	0x1a0c, 0x151a, 0x000b, 0x0005, 0x9c8c, 0x9c8c, 0x9c8c, 0x9c8c,</div><div class='del'>-	0x9c8c, 0x9c8c, 0x9c8c, 0x9c8c, 0x9c8c, 0x9aba, 0x9c8c, 0x9ac2,</div><div class='del'>-	0x9c8e, 0x9ac2, 0x9c9b, 0x9c8c, 0x080c, 0x151a, 0x6004, 0xa086,</div><div class='del'>-	0x008b, 0x0148, 0x6007, 0x008b, 0x6003, 0x000d, 0x080c, 0x6cff,</div><div class='del'>-	0x080c, 0x71e5, 0x0005, 0x080c, 0x9ecd, 0x080c, 0x9d16, 0x0580,</div><div class='del'>-	0x080c, 0x2cd1, 0x00d6, 0x080c, 0x9d16, 0x0168, 0x6010, 0x2068,</div><div class='del'>-	0x6837, 0x0103, 0x684b, 0x0006, 0x6847, 0x0000, 0x6850, 0xc0ed,</div><div class='del'>-	0x6852, 0x080c, 0x547a, 0x2c68, 0x080c, 0x864e, 0x0150, 0x6818,</div><div class='del'>-	0x601a, 0x080c, 0xa0e3, 0x00c6, 0x2d60, 0x080c, 0x9ed9, 0x00ce,</div><div class='del'>-	0x0008, 0x2d60, 0x00de, 0x6013, 0x0000, 0x601f, 0x0001, 0x6007,</div><div class='del'>-	0x0001, 0x6003, 0x0001, 0x080c, 0x6d45, 0x080c, 0x71e5, 0x0078,</div><div class='del'>-	0x6030, 0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0118, 0xa186,</div><div class='del'>-	0x0035, 0x1118, 0x080c, 0x2cd1, 0x08b0, 0x080c, 0x9ed9, 0x0005,</div><div class='del'>-	0x6000, 0xa08a, 0x0010, 0x1a0c, 0x151a, 0x000b, 0x0005, 0x9cf7,</div><div class='del'>-	0x9cf7, 0x9cf7, 0x9cf9, 0x9cf9, 0x9cf7, 0x9cf7, 0x9cf7, 0x9cf7,</div><div class='del'>-	0x9cf7, 0x9cf7, 0x9cf7, 0x9cf7, 0x9cf7, 0x9cf7, 0x9cf7, 0x080c,</div><div class='del'>-	0x151a, 0x080c, 0x82e4, 0x190c, 0x151a, 0x6110, 0x2168, 0x684b,</div><div class='del'>-	0x0006, 0x080c, 0x547a, 0x080c, 0x86a4, 0x0005, 0xa284, 0x0007,</div><div class='del'>-	0x1158, 0xa282, 0xbe00, 0x0240, 0x2001, 0xb617, 0x2004, 0xa202,</div><div class='del'>-	0x1218, 0xa085, 0x0001, 0x0005, 0xa006, 0x0ce8, 0x0026, 0x6210,</div><div class='del'>-	0xa294, 0xf000, 0x002e, 0x0005, 0x00e6, 0x00c6, 0x0036, 0x0006,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2061, 0xbe00, 0x2071, 0xb600, 0x7348,</div><div class='del'>-	0x7068, 0xa302, 0x12a8, 0x601c, 0xa206, 0x1160, 0x080c, 0xa06e,</div><div class='del'>-	0x0148, 0x080c, 0x9f14, 0x1110, 0x080c, 0x8ca5, 0x00c6, 0x080c,</div><div class='del'>-	0x86a4, 0x00ce, 0xace0, 0x0018, 0x705c, 0xac02, 0x1208, 0x0c38,</div><div class='del'>-	0x012e, 0x000e, 0x003e, 0x00ce, 0x00ee, 0x0005, 0x00e6, 0x00c6,</div><div class='del'>-	0x0016, 0xa188, 0xb735, 0x210c, 0x81ff, 0x0128, 0x2061, 0xb9f5,</div><div class='del'>-	0x611a, 0x080c, 0x2cd1, 0xa006, 0x0010, 0xa085, 0x0001, 0x001e,</div><div class='del'>-	0x00ce, 0x00ee, 0x0005, 0x00c6, 0x0056, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x00c6, 0x080c, 0x864e, 0x005e, 0x0180, 0x6612, 0x651a, 0x080c,</div><div class='del'>-	0xa0e3, 0x601f, 0x0003, 0x2009, 0x004b, 0x080c, 0x86d3, 0xa085,</div><div class='del'>-	0x0001, 0x012e, 0x005e, 0x00ce, 0x0005, 0xa006, 0x0cd0, 0x00c6,</div><div class='del'>-	0x0056, 0x0126, 0x2091, 0x8000, 0x62a0, 0x00c6, 0x080c, 0x9f92,</div><div class='del'>-	0x005e, 0x0550, 0x6013, 0x0000, 0x651a, 0x080c, 0xa0e3, 0x601f,</div><div class='del'>-	0x0003, 0x0016, 0x00c6, 0x2560, 0x080c, 0x521c, 0x00ce, 0x080c,</div><div class='del'>-	0x6e67, 0x0076, 0x2039, 0x0000, 0x080c, 0x6d74, 0x2c08, 0x080c,</div><div class='del'>-	0xaf3e, 0x007e, 0x001e, 0xd184, 0x0128, 0x080c, 0x86a4, 0xa085,</div><div class='del'>-	0x0001, 0x0030, 0x2009, 0x004c, 0x080c, 0x86d3, 0xa085, 0x0001,</div><div class='del'>-	0x012e, 0x005e, 0x00ce, 0x0005, 0xa006, 0x0cd0, 0x00f6, 0x00c6,</div><div class='del'>-	0x0046, 0x00c6, 0x080c, 0x864e, 0x2c78, 0x00ce, 0x0180, 0x7e12,</div><div class='del'>-	0x2c00, 0x781a, 0x781f, 0x0003, 0x2021, 0x0005, 0x080c, 0x9e0c,</div><div class='del'>-	0x2f60, 0x2009, 0x004d, 0x080c, 0x86d3, 0xa085, 0x0001, 0x004e,</div><div class='del'>-	0x00ce, 0x00fe, 0x0005, 0x00f6, 0x00c6, 0x0046, 0x00c6, 0x080c,</div><div class='del'>-	0x864e, 0x2c78, 0x00ce, 0x0178, 0x7e12, 0x2c00, 0x781a, 0x781f,</div><div class='del'>-	0x0003, 0x2021, 0x0005, 0x0481, 0x2f60, 0x2009, 0x004e, 0x080c,</div><div class='del'>-	0x86d3, 0xa085, 0x0001, 0x004e, 0x00ce, 0x00fe, 0x0005, 0x00f6,</div><div class='del'>-	0x00c6, 0x0046, 0x00c6, 0x080c, 0x864e, 0x2c78, 0x00ce, 0x01c0,</div><div class='del'>-	0x7e12, 0x2c00, 0x781a, 0x781f, 0x0003, 0x2021, 0x0004, 0x00a1,</div><div class='del'>-	0x2001, 0xb8a0, 0x2004, 0xd0fc, 0x0120, 0x2f60, 0x080c, 0x86a4,</div><div class='del'>-	0x0028, 0x2f60, 0x2009, 0x0052, 0x080c, 0x86d3, 0xa085, 0x0001,</div><div class='del'>-	0x004e, 0x00ce, 0x00fe, 0x0005, 0x0096, 0x0076, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x51be, 0x0118, 0x2001, 0x9e11, 0x0028, 0x080c,</div><div class='del'>-	0x518e, 0x0158, 0x2001, 0x9e17, 0x0006, 0xa00e, 0x2400, 0x080c,</div><div class='del'>-	0x554d, 0x080c, 0x547a, 0x000e, 0x0807, 0x2418, 0x080c, 0x70a1,</div><div class='del'>-	0x62a0, 0x0086, 0x2041, 0x0001, 0x2039, 0x0001, 0x2608, 0x080c,</div><div class='del'>-	0x6e80, 0x008e, 0x080c, 0x6d74, 0x2f08, 0x2648, 0x080c, 0xaf3e,</div><div class='del'>-	0x613c, 0x81ff, 0x090c, 0x6f35, 0x080c, 0x71e5, 0x012e, 0x007e,</div><div class='del'>-	0x009e, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6, 0x080c,</div><div class='del'>-	0x864e, 0x001e, 0x0188, 0x660a, 0x611a, 0x080c, 0xa0e3, 0x601f,</div><div class='del'>-	0x0001, 0x2d00, 0x6012, 0x2009, 0x001f, 0x080c, 0x86d3, 0xa085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0x00c6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x00c6, 0x080c, 0x864e, 0x001e, 0x0188, 0x660a,</div><div class='del'>-	0x611a, 0x080c, 0xa0e3, 0x601f, 0x0008, 0x2d00, 0x6012, 0x2009,</div><div class='del'>-	0x0021, 0x080c, 0x86d3, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005,</div><div class='del'>-	0xa006, 0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6, 0x080c,</div><div class='del'>-	0x864e, 0x001e, 0x0188, 0x660a, 0x611a, 0x080c, 0xa0e3, 0x601f,</div><div class='del'>-	0x0001, 0x2d00, 0x6012, 0x2009, 0x003d, 0x080c, 0x86d3, 0xa085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0x00c6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x00c6, 0x080c, 0x9f92, 0x001e, 0x0180, 0x611a,</div><div class='del'>-	0x080c, 0xa0e3, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0000,</div><div class='del'>-	0x080c, 0x86d3, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006,</div><div class='del'>-	0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6, 0x080c, 0x864e,</div><div class='del'>-	0x001e, 0x0188, 0x660a, 0x611a, 0x080c, 0xa0e3, 0x601f, 0x0001,</div><div class='del'>-	0x2d00, 0x6012, 0x2009, 0x0044, 0x080c, 0x86d3, 0xa085, 0x0001,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0x0026, 0x00d6, 0x6218,</div><div class='del'>-	0x2268, 0x6a3c, 0x82ff, 0x0110, 0x8211, 0x6a3e, 0x00de, 0x002e,</div><div class='del'>-	0x0005, 0x0006, 0x6000, 0xa086, 0x0000, 0x0190, 0x6013, 0x0000,</div><div class='del'>-	0x601f, 0x0007, 0x2001, 0xb8b6, 0x2004, 0x0006, 0xa082, 0x0051,</div><div class='del'>-	0x000e, 0x0208, 0x8004, 0x6016, 0x080c, 0xb3f6, 0x603f, 0x0000,</div><div class='del'>-	0x000e, 0x0005, 0x0066, 0x00c6, 0x00d6, 0x2031, 0xb653, 0x2634,</div><div class='del'>-	0xd6e4, 0x0128, 0x6618, 0x2660, 0x6e48, 0x080c, 0x5147, 0x00de,</div><div class='del'>-	0x00ce, 0x006e, 0x0005, 0x0006, 0x0016, 0x6004, 0xa08e, 0x0002,</div><div class='del'>-	0x0140, 0xa08e, 0x0003, 0x0128, 0xa08e, 0x0004, 0x0110, 0xa085,</div><div class='del'>-	0x0001, 0x001e, 0x000e, 0x0005, 0x0006, 0x00d6, 0x6010, 0xa06d,</div><div class='del'>-	0x0148, 0x6834, 0xa086, 0x0139, 0x0138, 0x6838, 0xd0fc, 0x0110,</div><div class='del'>-	0xa006, 0x0010, 0xa085, 0x0001, 0x00de, 0x000e, 0x0005, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x00c6, 0x080c, 0x864e, 0x001e, 0x0190,</div><div class='del'>-	0x611a, 0x080c, 0xa0e3, 0x601f, 0x0001, 0x2d00, 0x6012, 0x080c,</div><div class='del'>-	0x2cd1, 0x2009, 0x0028, 0x080c, 0x86d3, 0xa085, 0x0001, 0x012e,</div><div class='del'>-	0x00ce, 0x0005, 0xa006, 0x0cd8, 0xa186, 0x0015, 0x1178, 0x2011,</div><div class='del'>-	0xb621, 0x2204, 0xa086, 0x0074, 0x1148, 0x080c, 0x9024, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0029, 0x080c, 0x6d45, 0x0020, 0x080c, 0x8ca5,</div><div class='del'>-	0x080c, 0x86a4, 0x0005, 0xa186, 0x0016, 0x1128, 0x2001, 0x0004,</div><div class='del'>-	0x080c, 0x4f6f, 0x00e8, 0xa186, 0x0015, 0x11e8, 0x2011, 0xb621,</div><div class='del'>-	0x2204, 0xa086, 0x0014, 0x11b8, 0x00d6, 0x6018, 0x2068, 0x080c,</div><div class='del'>-	0x50bd, 0x00de, 0x080c, 0x90dd, 0x1170, 0x00d6, 0x6018, 0x2068,</div><div class='del'>-	0x6890, 0x00de, 0xa005, 0x0138, 0x2001, 0x0006, 0x080c, 0x4f6f,</div><div class='del'>-	0x080c, 0x882c, 0x0020, 0x080c, 0x8ca5, 0x080c, 0x86a4, 0x0005,</div><div class='del'>-	0x6848, 0xa086, 0x0005, 0x1108, 0x0009, 0x0005, 0x6850, 0xc0ad,</div><div class='del'>-	0x6852, 0x0005, 0x00e6, 0x0126, 0x2071, 0xb600, 0x2091, 0x8000,</div><div class='del'>-	0x7548, 0xa582, 0x0001, 0x0608, 0x704c, 0x2060, 0x6000, 0xa086,</div><div class='del'>-	0x0000, 0x0148, 0xace0, 0x0018, 0x705c, 0xac02, 0x1208, 0x0cb0,</div><div class='del'>-	0x2061, 0xbe00, 0x0c98, 0x6003, 0x0008, 0x8529, 0x754a, 0xaca8,</div><div class='del'>-	0x0018, 0x705c, 0xa502, 0x1230, 0x754e, 0xa085, 0x0001, 0x012e,</div><div class='del'>-	0x00ee, 0x0005, 0x704f, 0xbe00, 0x0cc0, 0xa006, 0x0cc0, 0x00e6,</div><div class='del'>-	0x2071, 0xbc8c, 0x7014, 0xd0e4, 0x0150, 0x6013, 0x0000, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0050, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x00ee,</div><div class='del'>-	0x0005, 0x00c6, 0x00f6, 0x2c78, 0x080c, 0x5377, 0x00fe, 0x0120,</div><div class='del'>-	0x601c, 0xa084, 0x000f, 0x0013, 0x00ce, 0x0005, 0x9aba, 0x9fe9,</div><div class='del'>-	0x9fec, 0x9fef, 0xb1e3, 0xb1fe, 0xb201, 0x9aba, 0x9aba, 0x080c,</div><div class='del'>-	0x151a, 0xe000, 0xe000, 0x0005, 0xe000, 0xe000, 0x0005, 0x0009,</div><div class='del'>-	0x0005, 0x00f6, 0x2c78, 0x080c, 0x5377, 0x0538, 0x080c, 0x864e,</div><div class='del'>-	0x1128, 0x2001, 0xb8b8, 0x2004, 0x783e, 0x00f8, 0x7818, 0x601a,</div><div class='del'>-	0x080c, 0xa0e3, 0x781c, 0xa086, 0x0003, 0x0128, 0x7808, 0x6036,</div><div class='del'>-	0x2f00, 0x603a, 0x0020, 0x7808, 0x603a, 0x2f00, 0x6036, 0x602a,</div><div class='del'>-	0x601f, 0x0001, 0x6007, 0x0035, 0x6003, 0x0001, 0x7950, 0x6152,</div><div class='del'>-	0x080c, 0x6cff, 0x080c, 0x71e5, 0x2f60, 0x00fe, 0x0005, 0x0016,</div><div class='del'>-	0x00f6, 0x682c, 0x6032, 0xa08e, 0x0001, 0x0138, 0xa086, 0x0005,</div><div class='del'>-	0x0140, 0xa006, 0x602a, 0x602e, 0x00a0, 0x6820, 0xc0f4, 0xc0d5,</div><div class='del'>-	0x6822, 0x6810, 0x2078, 0x787c, 0x6938, 0xa102, 0x7880, 0x6934,</div><div class='del'>-	0xa103, 0x1e78, 0x6834, 0x602a, 0x6838, 0xa084, 0xfffc, 0x683a,</div><div class='del'>-	0x602e, 0x2d00, 0x6036, 0x6808, 0x603a, 0x6918, 0x611a, 0x6950,</div><div class='del'>-	0x6152, 0x601f, 0x0001, 0x6007, 0x0039, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x6cff, 0x6803, 0x0002, 0x00fe, 0x001e, 0x0005, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0x5377, 0x1118, 0xa085, 0x0001, 0x0070, 0x6020, 0xd0f4,</div><div class='del'>-	0x1150, 0xc0f5, 0x6022, 0x6010, 0x2078, 0x7828, 0x603a, 0x782c,</div><div class='del'>-	0x6036, 0x080c, 0x1952, 0xa006, 0x00fe, 0x0005, 0x0006, 0x0016,</div><div class='del'>-	0x6004, 0xa08e, 0x0034, 0x01b8, 0xa08e, 0x0035, 0x01a0, 0xa08e,</div><div class='del'>-	0x0036, 0x0188, 0xa08e, 0x0037, 0x0170, 0xa08e, 0x0038, 0x0158,</div><div class='del'>-	0xa08e, 0x0039, 0x0140, 0xa08e, 0x003a, 0x0128, 0xa08e, 0x003b,</div><div class='del'>-	0x0110, 0xa085, 0x0001, 0x001e, 0x000e, 0x0005, 0x0006, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x00e6, 0x2001, 0xb8b2, 0x200c, 0x8000, 0x2014,</div><div class='del'>-	0x2001, 0x0032, 0x080c, 0x6bb2, 0x2001, 0xb8b6, 0x82ff, 0x1110,</div><div class='del'>-	0x2011, 0x0014, 0x2202, 0x2001, 0xb8b4, 0x200c, 0x8000, 0x2014,</div><div class='del'>-	0x2071, 0xb88e, 0x711a, 0x721e, 0x2001, 0x0064, 0x080c, 0x6bb2,</div><div class='del'>-	0x2001, 0xb8b7, 0x82ff, 0x1110, 0x2011, 0x0014, 0x2202, 0x2009,</div><div class='del'>-	0xb8b8, 0xa280, 0x000a, 0x200a, 0x080c, 0x539c, 0x00ee, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x000e, 0x0005, 0x0006, 0x00e6, 0x2001, 0xb8b6,</div><div class='del'>-	0x2003, 0x0028, 0x2001, 0xb8b7, 0x2003, 0x0014, 0x2071, 0xb88e,</div><div class='del'>-	0x701b, 0x0000, 0x701f, 0x07d0, 0x2001, 0xb8b8, 0x2003, 0x001e,</div><div class='del'>-	0x00ee, 0x000e, 0x0005, 0x00d6, 0x6054, 0xa06d, 0x0110, 0x080c,</div><div class='del'>-	0x1614, 0x00de, 0x0005, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x00c6, 0x080c, 0x864e, 0x001e, 0x0178, 0x611a, 0x0ca1, 0x601f,</div><div class='del'>-	0x0001, 0x2d00, 0x6012, 0x2009, 0x0033, 0x080c, 0x86d3, 0xa085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x2071, 0xb600, 0xa186, 0x0015, 0x1500, 0x7084, 0xa086,</div><div class='del'>-	0x0018, 0x11e0, 0x6010, 0x2068, 0x6a3c, 0xd2e4, 0x1160, 0x2c78,</div><div class='del'>-	0x080c, 0x73a3, 0x01d8, 0x7070, 0x6a50, 0xa206, 0x1160, 0x7074,</div><div class='del'>-	0x6a54, 0xa206, 0x1140, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009,</div><div class='del'>-	0x0000, 0x080c, 0x2d16, 0x080c, 0x882c, 0x0020, 0x080c, 0x8ca5,</div><div class='del'>-	0x080c, 0x86a4, 0x00fe, 0x00ee, 0x00de, 0x0005, 0x7054, 0x6a54,</div><div class='del'>-	0xa206, 0x0d48, 0x0c80, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6,</div><div class='del'>-	0x080c, 0x864e, 0x001e, 0x0180, 0x611a, 0x080c, 0xa0e3, 0x601f,</div><div class='del'>-	0x0001, 0x2d00, 0x6012, 0x2009, 0x0043, 0x080c, 0x86d3, 0xa085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x2071, 0xb600, 0xa186, 0x0015, 0x11c0, 0x7084, 0xa086,</div><div class='del'>-	0x0004, 0x11a0, 0x6010, 0xa0e8, 0x000f, 0x2c78, 0x080c, 0x73a3,</div><div class='del'>-	0x01a8, 0x7070, 0x6a08, 0xa206, 0x1130, 0x7074, 0x6a0c, 0xa206,</div><div class='del'>-	0x1110, 0x080c, 0x2cd1, 0x080c, 0x882c, 0x0020, 0x080c, 0x8ca5,</div><div class='del'>-	0x080c, 0x86a4, 0x00fe, 0x00ee, 0x00de, 0x0005, 0x7054, 0x6a0c,</div><div class='del'>-	0xa206, 0x0d78, 0x0c80, 0x0016, 0x0026, 0x684c, 0xd0ac, 0x0178,</div><div class='del'>-	0x6914, 0x6a10, 0x2100, 0xa205, 0x0150, 0x6860, 0xa106, 0x1118,</div><div class='del'>-	0x685c, 0xa206, 0x0120, 0x6962, 0x6a5e, 0xa085, 0x0001, 0x002e,</div><div class='del'>-	0x001e, 0x0005, 0x00d6, 0x0036, 0x6310, 0x2368, 0x684a, 0x6952,</div><div class='del'>-	0xa29e, 0x4000, 0x11a0, 0x00c6, 0x6318, 0x2360, 0x2009, 0x0000,</div><div class='del'>-	0x6838, 0xd0f4, 0x1140, 0x080c, 0x52bc, 0x1108, 0xc185, 0x6000,</div><div class='del'>-	0xd0bc, 0x0108, 0xc18d, 0x6a66, 0x696a, 0x00ce, 0x0080, 0x6a66,</div><div class='del'>-	0x3918, 0xa398, 0x0006, 0x231c, 0x686b, 0x0004, 0x6b72, 0x00c6,</div><div class='del'>-	0x6318, 0x2360, 0x6004, 0xa084, 0x00ff, 0x686e, 0x00ce, 0x080c,</div><div class='del'>-	0x547a, 0x6013, 0x0000, 0x003e, 0x00de, 0x0005, 0x00c6, 0x0026,</div><div class='del'>-	0x0016, 0xa186, 0x0035, 0x0110, 0x6a34, 0x0008, 0x6a28, 0x080c,</div><div class='del'>-	0x9d06, 0x01f0, 0x2260, 0x611c, 0xa186, 0x0003, 0x0118, 0xa186,</div><div class='del'>-	0x0006, 0x1190, 0x6834, 0xa206, 0x0140, 0x6838, 0xa206, 0x1160,</div><div class='del'>-	0x6108, 0x6834, 0xa106, 0x1140, 0x0020, 0x6008, 0x6938, 0xa106,</div><div class='del'>-	0x1118, 0x6018, 0x6918, 0xa106, 0x001e, 0x002e, 0x00ce, 0x0005,</div><div class='del'>-	0xa085, 0x0001, 0x0cc8, 0x6944, 0xd1cc, 0x0198, 0xa18c, 0x00ff,</div><div class='del'>-	0xa18e, 0x0002, 0x1170, 0xad88, 0x001e, 0x210c, 0xa18c, 0x0f00,</div><div class='del'>-	0x810f, 0xa18e, 0x0001, 0x1128, 0x6810, 0x6914, 0xa115, 0x190c,</div><div class='del'>-	0x953f, 0x0005, 0x080c, 0x86a4, 0x0804, 0x71e5, 0x0066, 0x6000,</div><div class='del'>-	0xa0b2, 0x0010, 0x1a0c, 0x151a, 0x0013, 0x006e, 0x0005, 0xa227,</div><div class='del'>-	0xa702, 0xa828, 0xa227, 0xa227, 0xa227, 0xa227, 0xa227, 0xa25f,</div><div class='del'>-	0xa8ac, 0xa227, 0xa227, 0xa227, 0xa227, 0xa227, 0xa227, 0x080c,</div><div class='del'>-	0x151a, 0x0066, 0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x151a, 0x0013,</div><div class='del'>-	0x006e, 0x0005, 0xa242, 0xad33, 0xa242, 0xa242, 0xa242, 0xa242,</div><div class='del'>-	0xa242, 0xa242, 0xacf5, 0xad7b, 0xa242, 0xb328, 0xb358, 0xb328,</div><div class='del'>-	0xb358, 0xa242, 0x080c, 0x151a, 0x0066, 0x6000, 0xa0b2, 0x0010,</div><div class='del'>-	0x1a0c, 0x151a, 0x0013, 0x006e, 0x0005, 0xa25d, 0xa9fc, 0xaac9,</div><div class='del'>-	0xaaf6, 0xab7a, 0xa25d, 0xac67, 0xac12, 0xa8b8, 0xaccb, 0xace0,</div><div class='del'>-	0xa25d, 0xa25d, 0xa25d, 0xa25d, 0xa25d, 0x080c, 0x151a, 0xa1b2,</div><div class='del'>-	0x0080, 0x1a0c, 0x151a, 0x2100, 0xa1b2, 0x0040, 0x1a04, 0xa676,</div><div class='del'>-	0x0002, 0xa2a9, 0xa474, 0xa2a9, 0xa2a9, 0xa2a9, 0xa47b, 0xa2a9,</div><div class='del'>-	0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9,</div><div class='del'>-	0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9,</div><div class='del'>-	0xa2ab, 0xa309, 0xa318, 0xa366, 0xa384, 0xa402, 0xa461, 0xa2a9,</div><div class='del'>-	0xa2a9, 0xa47e, 0xa2a9, 0xa2a9, 0xa491, 0xa49c, 0xa2a9, 0xa2a9,</div><div class='del'>-	0xa2a9, 0xa2a9, 0xa2a9, 0xa527, 0xa2a9, 0xa2a9, 0xa53a, 0xa2a9,</div><div class='del'>-	0xa2a9, 0xa4f2, 0xa2a9, 0xa2a9, 0xa2a9, 0xa552, 0xa2a9, 0xa2a9,</div><div class='del'>-	0xa2a9, 0xa5cc, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9, 0xa2a9,</div><div class='del'>-	0xa63d, 0x080c, 0x151a, 0x080c, 0x537b, 0x1150, 0x2001, 0xb635,</div><div class='del'>-	0x2004, 0xd0cc, 0x1128, 0xa084, 0x0009, 0xa086, 0x0008, 0x1140,</div><div class='del'>-	0x6007, 0x0009, 0x602b, 0x0009, 0x6013, 0x0000, 0x0804, 0xa46f,</div><div class='del'>-	0x080c, 0x536b, 0x00e6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x6218,</div><div class='del'>-	0x2270, 0x72a0, 0x0026, 0x2019, 0x0029, 0x080c, 0x6e67, 0x0076,</div><div class='del'>-	0x2039, 0x0000, 0x080c, 0x6d74, 0x2c08, 0x080c, 0xaf3e, 0x007e,</div><div class='del'>-	0x001e, 0x2e60, 0x080c, 0x521c, 0x001e, 0x002e, 0x003e, 0x00ce,</div><div class='del'>-	0x00ee, 0x6618, 0x00c6, 0x2660, 0x080c, 0x502a, 0x00ce, 0xa6b0,</div><div class='del'>-	0x0001, 0x2634, 0xa684, 0x00ff, 0xa082, 0x0006, 0x0278, 0x080c,</div><div class='del'>-	0xae82, 0x1904, 0xa360, 0x080c, 0xae22, 0x1120, 0x6007, 0x0008,</div><div class='del'>-	0x0804, 0xa46f, 0x6007, 0x0009, 0x0804, 0xa46f, 0x080c, 0xb037,</div><div class='del'>-	0x0128, 0x080c, 0xae82, 0x0d78, 0x0804, 0xa360, 0x6013, 0x1900,</div><div class='del'>-	0x0c88, 0x080c, 0x2df4, 0x1904, 0xa673, 0x6106, 0x080c, 0xaddc,</div><div class='del'>-	0x6007, 0x0006, 0x0804, 0xa46f, 0x6007, 0x0007, 0x0804, 0xa46f,</div><div class='del'>-	0x080c, 0xb38c, 0x1904, 0xa673, 0x080c, 0x2df4, 0x1904, 0xa673,</div><div class='del'>-	0x00d6, 0x6618, 0x2668, 0x6e04, 0xa684, 0x00ff, 0xa082, 0x0006,</div><div class='del'>-	0x1220, 0x2001, 0x0001, 0x080c, 0x4f5d, 0xa6b4, 0xff00, 0x8637,</div><div class='del'>-	0xa686, 0x0006, 0x0188, 0xa686, 0x0004, 0x0170, 0x6e04, 0xa6b4,</div><div class='del'>-	0x00ff, 0xa686, 0x0006, 0x0140, 0xa686, 0x0004, 0x0128, 0xa686,</div><div class='del'>-	0x0005, 0x0110, 0x00de, 0x00e0, 0x080c, 0xaee0, 0x11a0, 0xa686,</div><div class='del'>-	0x0006, 0x1150, 0x0026, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009,</div><div class='del'>-	0x0000, 0x080c, 0x2d16, 0x002e, 0x080c, 0x50bd, 0x6007, 0x000a,</div><div class='del'>-	0x00de, 0x0804, 0xa46f, 0x6007, 0x000b, 0x00de, 0x0804, 0xa46f,</div><div class='del'>-	0x080c, 0x2cd1, 0x6007, 0x0001, 0x0804, 0xa46f, 0x080c, 0xb38c,</div><div class='del'>-	0x1904, 0xa673, 0x080c, 0x2df4, 0x1904, 0xa673, 0x6618, 0x00d6,</div><div class='del'>-	0x2668, 0x6e04, 0x00de, 0xa686, 0x0707, 0x0d50, 0x0026, 0x6218,</div><div class='del'>-	0xa290, 0x0028, 0x2214, 0x2009, 0x0000, 0x080c, 0x2d16, 0x002e,</div><div class='del'>-	0x6007, 0x000c, 0x0804, 0xa46f, 0x080c, 0x537b, 0x1140, 0x2001,</div><div class='del'>-	0xb635, 0x2004, 0xa084, 0x0009, 0xa086, 0x0008, 0x1110, 0x0804,</div><div class='del'>-	0xa2b8, 0x080c, 0x536b, 0x6618, 0xa6b0, 0x0001, 0x2634, 0xa684,</div><div class='del'>-	0x00ff, 0xa082, 0x0006, 0x06e8, 0x1138, 0x0026, 0x2001, 0x0006,</div><div class='del'>-	0x080c, 0x4f9c, 0x002e, 0x0050, 0xa6b4, 0xff00, 0x8637, 0xa686,</div><div class='del'>-	0x0004, 0x0120, 0xa686, 0x0006, 0x1904, 0xa360, 0x080c, 0xaeed,</div><div class='del'>-	0x1120, 0x6007, 0x000e, 0x0804, 0xa46f, 0x0046, 0x6418, 0xa4a0,</div><div class='del'>-	0x0028, 0x2424, 0xa4a4, 0x00ff, 0x8427, 0x0046, 0x080c, 0x2cd1,</div><div class='del'>-	0x004e, 0x0016, 0xa006, 0x2009, 0xb653, 0x210c, 0xd1a4, 0x0158,</div><div class='del'>-	0x2009, 0x0029, 0x080c, 0xb1a4, 0x6018, 0x00d6, 0x2068, 0x6800,</div><div class='del'>-	0xc0e5, 0x6802, 0x00de, 0x001e, 0x004e, 0x6007, 0x0001, 0x0804,</div><div class='del'>-	0xa46f, 0x2001, 0x0001, 0x080c, 0x4f5d, 0x0156, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x20a9, 0x0004, 0x2019, 0xb605, 0x2011, 0xbc90, 0x080c,</div><div class='del'>-	0x9166, 0x003e, 0x002e, 0x001e, 0x015e, 0xa005, 0x0168, 0xa6b4,</div><div class='del'>-	0xff00, 0x8637, 0xa682, 0x0004, 0x0a04, 0xa360, 0xa682, 0x0007,</div><div class='del'>-	0x0a04, 0xa3ae, 0x0804, 0xa360, 0x6013, 0x1900, 0x6007, 0x0009,</div><div class='del'>-	0x0804, 0xa46f, 0x080c, 0x537b, 0x1140, 0x2001, 0xb635, 0x2004,</div><div class='del'>-	0xa084, 0x0009, 0xa086, 0x0008, 0x1110, 0x0804, 0xa2b8, 0x080c,</div><div class='del'>-	0x536b, 0x6618, 0xa6b0, 0x0001, 0x2634, 0xa684, 0x00ff, 0xa082,</div><div class='del'>-	0x0006, 0x06b8, 0xa6b4, 0xff00, 0x8637, 0xa686, 0x0004, 0x0120,</div><div class='del'>-	0xa686, 0x0006, 0x1904, 0xa360, 0x080c, 0xaf15, 0x1138, 0x080c,</div><div class='del'>-	0xae22, 0x1120, 0x6007, 0x0010, 0x0804, 0xa46f, 0x0046, 0x6418,</div><div class='del'>-	0xa4a0, 0x0028, 0x2424, 0xa4a4, 0x00ff, 0x8427, 0x0046, 0x080c,</div><div class='del'>-	0x2cd1, 0x004e, 0x0016, 0xa006, 0x2009, 0xb653, 0x210c, 0xd1a4,</div><div class='del'>-	0x0158, 0x2009, 0x0029, 0x080c, 0xb1a4, 0x6018, 0x00d6, 0x2068,</div><div class='del'>-	0x6800, 0xc0e5, 0x6802, 0x00de, 0x001e, 0x004e, 0x6007, 0x0001,</div><div class='del'>-	0x00f0, 0x080c, 0xb037, 0x0140, 0xa6b4, 0xff00, 0x8637, 0xa686,</div><div class='del'>-	0x0006, 0x0950, 0x0804, 0xa360, 0x6013, 0x1900, 0x6007, 0x0009,</div><div class='del'>-	0x0070, 0x080c, 0x2df4, 0x1904, 0xa673, 0x080c, 0xb38c, 0x1904,</div><div class='del'>-	0xa673, 0x080c, 0xa69b, 0x1904, 0xa360, 0x6007, 0x0012, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x6d45, 0x0005, 0x6007, 0x0001, 0x6003, 0x0001,</div><div class='del'>-	0x080c, 0x6d45, 0x0cc0, 0x6007, 0x0005, 0x0cc0, 0x080c, 0xb38c,</div><div class='del'>-	0x1904, 0xa673, 0x080c, 0x2df4, 0x1904, 0xa673, 0x080c, 0xa69b,</div><div class='del'>-	0x1904, 0xa360, 0x6007, 0x0020, 0x6003, 0x0001, 0x080c, 0x6d45,</div><div class='del'>-	0x0005, 0x080c, 0x2df4, 0x1904, 0xa673, 0x6007, 0x0023, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x6d45, 0x0005, 0x080c, 0xb38c, 0x1904, 0xa673,</div><div class='del'>-	0x080c, 0x2df4, 0x1904, 0xa673, 0x080c, 0xa69b, 0x1904, 0xa360,</div><div class='del'>-	0x0016, 0x0026, 0x2011, 0xbc91, 0x2214, 0xa286, 0xffff, 0x0190,</div><div class='del'>-	0x2c08, 0x080c, 0x9d06, 0x01e0, 0x2260, 0x2011, 0xbc90, 0x2214,</div><div class='del'>-	0x6008, 0xa206, 0x11a8, 0x6018, 0xa190, 0x0006, 0x2214, 0xa206,</div><div class='del'>-	0x01e8, 0x0070, 0x2011, 0xbc90, 0x2214, 0x2c08, 0xa006, 0x080c,</div><div class='del'>-	0xb176, 0x11a0, 0x2011, 0xbc91, 0x2214, 0xa286, 0xffff, 0x01c0,</div><div class='del'>-	0x2160, 0x6007, 0x0026, 0x6013, 0x1700, 0x2011, 0xbc89, 0x2214,</div><div class='del'>-	0xa296, 0xffff, 0x1180, 0x6007, 0x0025, 0x0068, 0x601c, 0xa086,</div><div class='del'>-	0x0007, 0x1d70, 0x6004, 0xa086, 0x0024, 0x1110, 0x080c, 0x86a4,</div><div class='del'>-	0x2160, 0x6007, 0x0025, 0x6003, 0x0001, 0x080c, 0x6d45, 0x002e,</div><div class='del'>-	0x001e, 0x0005, 0x2001, 0x0001, 0x080c, 0x4f5d, 0x0156, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x20a9, 0x0004, 0x2019, 0xb605, 0x2011, 0xbc96,</div><div class='del'>-	0x080c, 0x9166, 0x003e, 0x002e, 0x001e, 0x015e, 0x0120, 0x6007,</div><div class='del'>-	0x0031, 0x0804, 0xa46f, 0x080c, 0x8e82, 0x080c, 0x5b41, 0x11b0,</div><div class='del'>-	0x0006, 0x0026, 0x0036, 0x080c, 0x5b5d, 0x1158, 0x2001, 0xb89f,</div><div class='del'>-	0x2003, 0x0001, 0x2001, 0xb600, 0x2003, 0x0001, 0x080c, 0x5a79,</div><div class='del'>-	0x0010, 0x080c, 0x5b18, 0x003e, 0x002e, 0x000e, 0x0005, 0x080c,</div><div class='del'>-	0x2df4, 0x1904, 0xa673, 0x080c, 0xa69b, 0x1904, 0xa360, 0x6106,</div><div class='del'>-	0x080c, 0xa6b7, 0x6007, 0x002b, 0x0804, 0xa46f, 0x6007, 0x002c,</div><div class='del'>-	0x0804, 0xa46f, 0x080c, 0xb38c, 0x1904, 0xa673, 0x080c, 0x2df4,</div><div class='del'>-	0x1904, 0xa673, 0x080c, 0xa69b, 0x1904, 0xa360, 0x6106, 0x080c,</div><div class='del'>-	0xa6bb, 0x1120, 0x6007, 0x002e, 0x0804, 0xa46f, 0x6007, 0x002f,</div><div class='del'>-	0x0804, 0xa46f, 0x080c, 0x2df4, 0x1904, 0xa673, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x6018, 0xa080, 0x0001, 0x200c, 0xa184, 0x00ff, 0xa086,</div><div class='del'>-	0x0006, 0x0158, 0xa184, 0xff00, 0x8007, 0xa086, 0x0006, 0x0128,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x0804, 0xa474, 0x2001, 0xb672, 0x2004,</div><div class='del'>-	0xd0e4, 0x0904, 0xa5c9, 0x2071, 0xbc8c, 0x7010, 0x6036, 0x7014,</div><div class='del'>-	0x603a, 0x7108, 0x720c, 0x2001, 0xb653, 0x2004, 0xd0a4, 0x0140,</div><div class='del'>-	0x6018, 0x2068, 0x6810, 0xa106, 0x1118, 0x6814, 0xa206, 0x01f8,</div><div class='del'>-	0x2001, 0xb653, 0x2004, 0xd0ac, 0x1590, 0x2069, 0xb600, 0x6874,</div><div class='del'>-	0xa206, 0x1568, 0x6870, 0xa106, 0x1550, 0x7210, 0x080c, 0x9d06,</div><div class='del'>-	0x0558, 0x080c, 0xb210, 0x0540, 0x622a, 0x6007, 0x0036, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x6cff, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x7214,</div><div class='del'>-	0xa286, 0xffff, 0x0150, 0x080c, 0x9d06, 0x01b0, 0xa280, 0x0002,</div><div class='del'>-	0x2004, 0x7110, 0xa106, 0x1180, 0x0c08, 0x7210, 0x2c08, 0xa085,</div><div class='del'>-	0x0001, 0x080c, 0xb176, 0x2c10, 0x2160, 0x0130, 0x08b8, 0x6007,</div><div class='del'>-	0x0037, 0x6013, 0x1500, 0x08d8, 0x6007, 0x0037, 0x6013, 0x1700,</div><div class='del'>-	0x08b0, 0x6007, 0x0012, 0x0898, 0x080c, 0x2df4, 0x1904, 0xa673,</div><div class='del'>-	0x6018, 0xa080, 0x0001, 0x2004, 0xa084, 0xff00, 0x8007, 0xa086,</div><div class='del'>-	0x0006, 0x1904, 0xa474, 0x00e6, 0x00d6, 0x00c6, 0x2001, 0xb672,</div><div class='del'>-	0x2004, 0xd0e4, 0x0904, 0xa635, 0x2069, 0xb600, 0x2071, 0xbc8c,</div><div class='del'>-	0x7008, 0x6036, 0x720c, 0x623a, 0xa286, 0xffff, 0x1150, 0x7208,</div><div class='del'>-	0x00c6, 0x2c08, 0xa085, 0x0001, 0x080c, 0xb176, 0x2c10, 0x00ce,</div><div class='del'>-	0x0588, 0x080c, 0x9d06, 0x0570, 0x00c6, 0x0026, 0x2260, 0x080c,</div><div class='del'>-	0x99d9, 0x002e, 0x00ce, 0x7118, 0xa18c, 0xff00, 0x810f, 0xa186,</div><div class='del'>-	0x0001, 0x0158, 0xa186, 0x0005, 0x0118, 0xa186, 0x0007, 0x1178,</div><div class='del'>-	0xa280, 0x0004, 0x2004, 0xa005, 0x0150, 0x0056, 0x7510, 0x7614,</div><div class='del'>-	0x080c, 0xb227, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x6007,</div><div class='del'>-	0x003b, 0x602b, 0x0009, 0x6013, 0x2a00, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x6cff, 0x0c88, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013, 0x1700,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x6cff, 0x0c30, 0x6007, 0x003b, 0x602b,</div><div class='del'>-	0x000b, 0x6013, 0x0000, 0x0804, 0xa59f, 0x00e6, 0x0026, 0x080c,</div><div class='del'>-	0x537b, 0x0558, 0x080c, 0x536b, 0x080c, 0xb407, 0x1520, 0x2071,</div><div class='del'>-	0xb600, 0x70d4, 0xc085, 0x70d6, 0x00f6, 0x2079, 0x0100, 0x72a0,</div><div class='del'>-	0xa284, 0x00ff, 0x7072, 0x78e6, 0xa284, 0xff00, 0x7274, 0xa205,</div><div class='del'>-	0x7076, 0x78ea, 0x00fe, 0x70df, 0x0000, 0x2001, 0xb653, 0x2004,</div><div class='del'>-	0xd0a4, 0x0120, 0x2011, 0xb8fa, 0x2013, 0x07d0, 0xd0ac, 0x1128,</div><div class='del'>-	0x080c, 0x2aed, 0x0010, 0x080c, 0xb433, 0x002e, 0x00ee, 0x080c,</div><div class='del'>-	0x86a4, 0x0804, 0xa473, 0x080c, 0x86a4, 0x0005, 0x2600, 0x0002,</div><div class='del'>-	0xa681, 0xa681, 0xa681, 0xa681, 0xa681, 0xa683, 0xa681, 0xa681,</div><div class='del'>-	0xa681, 0x080c, 0x151a, 0x080c, 0xb38c, 0x1d68, 0x080c, 0x2df4,</div><div class='del'>-	0x1d50, 0x0089, 0x1138, 0x6007, 0x0045, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x6d45, 0x0005, 0x080c, 0x2cd1, 0x6007, 0x0001, 0x6003, 0x0001,</div><div class='del'>-	0x080c, 0x6d45, 0x0005, 0x00d6, 0x0066, 0x6618, 0x2668, 0x6e04,</div><div class='del'>-	0xa6b4, 0xff00, 0x8637, 0xa686, 0x0006, 0x0170, 0xa686, 0x0004,</div><div class='del'>-	0x0158, 0x6e04, 0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0128, 0xa686,</div><div class='del'>-	0x0004, 0x0110, 0xa085, 0x0001, 0x006e, 0x00de, 0x0005, 0x00d6,</div><div class='del'>-	0x0449, 0x00de, 0x0005, 0x00d6, 0x0491, 0x11f0, 0x680c, 0xa08c,</div><div class='del'>-	0xff00, 0x6820, 0xa084, 0x00ff, 0xa115, 0x6212, 0x6824, 0x602a,</div><div class='del'>-	0xd1e4, 0x0118, 0x2009, 0x0001, 0x0060, 0xd1ec, 0x0168, 0x6920,</div><div class='del'>-	0xa18c, 0x00ff, 0x6824, 0x080c, 0x2852, 0x1130, 0x2110, 0x2009,</div><div class='del'>-	0x0000, 0x080c, 0x2d16, 0x0018, 0xa085, 0x0001, 0x0008, 0xa006,</div><div class='del'>-	0x00de, 0x0005, 0x2069, 0xbc8d, 0x6800, 0xa082, 0x0010, 0x1228,</div><div class='del'>-	0x6013, 0x0000, 0xa085, 0x0001, 0x0008, 0xa006, 0x0005, 0x6013,</div><div class='del'>-	0x0000, 0x2069, 0xbc8c, 0x6808, 0xa084, 0xff00, 0xa086, 0x0800,</div><div class='del'>-	0x1140, 0x6800, 0xa084, 0x00ff, 0xa08e, 0x0014, 0x0110, 0xa08e,</div><div class='del'>-	0x0010, 0x0005, 0x6004, 0xa0b2, 0x0080, 0x1a0c, 0x151a, 0xa1b6,</div><div class='del'>-	0x0013, 0x1130, 0x2008, 0xa1b2, 0x0040, 0x1a04, 0xa802, 0x0092,</div><div class='del'>-	0xa1b6, 0x0027, 0x0120, 0xa1b6, 0x0014, 0x190c, 0x151a, 0x2001,</div><div class='del'>-	0x0007, 0x080c, 0x4f9c, 0x080c, 0x7102, 0x080c, 0x9ed9, 0x080c,</div><div class='del'>-	0x71e5, 0x0005, 0xa762, 0xa764, 0xa762, 0xa762, 0xa762, 0xa764,</div><div class='del'>-	0xa776, 0xa7fb, 0xa7c6, 0xa7fb, 0xa7d7, 0xa7fb, 0xa776, 0xa7fb,</div><div class='del'>-	0xa7f3, 0xa7fb, 0xa7f3, 0xa7fb, 0xa7fb, 0xa762, 0xa762, 0xa762,</div><div class='del'>-	0xa762, 0xa762, 0xa762, 0xa762, 0xa762, 0xa762, 0xa762, 0xa762,</div><div class='del'>-	0xa764, 0xa762, 0xa7fb, 0xa762, 0xa762, 0xa7fb, 0xa762, 0xa7f8,</div><div class='del'>-	0xa7fb, 0xa762, 0xa762, 0xa762, 0xa762, 0xa7fb, 0xa7fb, 0xa762,</div><div class='del'>-	0xa7fb, 0xa7fb, 0xa762, 0xa770, 0xa762, 0xa762, 0xa762, 0xa762,</div><div class='del'>-	0xa7f7, 0xa7fb, 0xa762, 0xa762, 0xa7fb, 0xa7fb, 0xa762, 0xa762,</div><div class='del'>-	0xa762, 0xa762, 0x080c, 0x151a, 0x080c, 0x7102, 0x2001, 0xb8b6,</div><div class='del'>-	0x2004, 0x6016, 0x6003, 0x0002, 0x080c, 0x71e5, 0x0804, 0xa801,</div><div class='del'>-	0x2001, 0x0000, 0x080c, 0x4f5d, 0x0804, 0xa7fb, 0x00f6, 0x2079,</div><div class='del'>-	0xb652, 0x7804, 0x00fe, 0xd0ac, 0x1904, 0xa7fb, 0x2001, 0x0000,</div><div class='del'>-	0x080c, 0x4f5d, 0x6018, 0xa080, 0x0004, 0x2004, 0xa086, 0x00ff,</div><div class='del'>-	0x1140, 0x00f6, 0x2079, 0xb600, 0x7898, 0x8000, 0x789a, 0x00fe,</div><div class='del'>-	0x00e0, 0x00c6, 0x6018, 0x2060, 0x6000, 0xd0f4, 0x1140, 0x6010,</div><div class='del'>-	0xa005, 0x0128, 0x00ce, 0x080c, 0x3f85, 0x0804, 0xa7fb, 0x00ce,</div><div class='del'>-	0x2001, 0xb600, 0x2004, 0xa086, 0x0002, 0x1138, 0x00f6, 0x2079,</div><div class='del'>-	0xb600, 0x7898, 0x8000, 0x789a, 0x00fe, 0x2001, 0x0002, 0x080c,</div><div class='del'>-	0x4f6f, 0x080c, 0x7102, 0x601f, 0x0001, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x080c, 0x6d45, 0x080c, 0x71e5, 0x00c6, 0x6118, 0x2160,</div><div class='del'>-	0x2009, 0x0001, 0x080c, 0x6a1a, 0x00ce, 0x04d8, 0x6618, 0x00d6,</div><div class='del'>-	0x2668, 0x6e04, 0x00de, 0xa6b4, 0xff00, 0x8637, 0xa686, 0x0006,</div><div class='del'>-	0x0550, 0xa686, 0x0004, 0x0538, 0x2001, 0x0004, 0x0410, 0x2001,</div><div class='del'>-	0xb600, 0x2004, 0xa086, 0x0003, 0x1110, 0x080c, 0x3f85, 0x2001,</div><div class='del'>-	0x0006, 0x04a1, 0x6618, 0x00d6, 0x2668, 0x6e04, 0x00de, 0xa6b4,</div><div class='del'>-	0xff00, 0x8637, 0xa686, 0x0006, 0x0170, 0x2001, 0x0006, 0x0048,</div><div class='del'>-	0x2001, 0x0004, 0x0030, 0x2001, 0x0006, 0x0401, 0x0020, 0x0018,</div><div class='del'>-	0x0010, 0x080c, 0x4f9c, 0x080c, 0x7102, 0x080c, 0x86a4, 0x080c,</div><div class='del'>-	0x71e5, 0x0005, 0x2600, 0x0002, 0xa80d, 0xa80d, 0xa80d, 0xa80d,</div><div class='del'>-	0xa80d, 0xa80f, 0xa80d, 0xa80d, 0xa80d, 0x080c, 0x151a, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x86a4, 0x080c, 0x71e5, 0x0005, 0x0016, 0x00d6,</div><div class='del'>-	0x6118, 0x2168, 0x6900, 0xd184, 0x0140, 0x080c, 0x4f6f, 0x2001,</div><div class='del'>-	0x0000, 0x080c, 0x4f5d, 0x080c, 0x2cf7, 0x00de, 0x001e, 0x0005,</div><div class='del'>-	0x00d6, 0x6618, 0x2668, 0x6804, 0xa084, 0xff00, 0x8007, 0x00de,</div><div class='del'>-	0xa0b2, 0x000c, 0x1a0c, 0x151a, 0xa1b6, 0x0015, 0x1110, 0x003b,</div><div class='del'>-	0x0028, 0xa1b6, 0x0016, 0x190c, 0x151a, 0x006b, 0x0005, 0x8d6b,</div><div class='del'>-	0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0xa898, 0xa857, 0x8d6b,</div><div class='del'>-	0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b,</div><div class='del'>-	0x8d6b, 0xa898, 0xa89f, 0x8d6b, 0x8d6b, 0x8d6b, 0x8d6b, 0x00f6,</div><div class='del'>-	0x2079, 0xb652, 0x7804, 0xd0ac, 0x11e0, 0x6018, 0xa07d, 0x01c8,</div><div class='del'>-	0x7800, 0xd0f4, 0x1118, 0x7810, 0xa005, 0x1198, 0x2001, 0x0000,</div><div class='del'>-	0x080c, 0x4f5d, 0x2001, 0x0002, 0x080c, 0x4f6f, 0x601f, 0x0001,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x6d45, 0x080c, 0x71e5,</div><div class='del'>-	0x00e8, 0x2011, 0xbc83, 0x2204, 0x8211, 0x220c, 0x080c, 0x2852,</div><div class='del'>-	0x11a8, 0x00c6, 0x080c, 0x501b, 0x0120, 0x00ce, 0x080c, 0x86a4,</div><div class='del'>-	0x0068, 0x6010, 0x0006, 0x6014, 0x0006, 0x080c, 0x4c7e, 0x000e,</div><div class='del'>-	0x6016, 0x000e, 0x6012, 0x00ce, 0x080c, 0x86a4, 0x00fe, 0x0005,</div><div class='del'>-	0x6604, 0xa6b6, 0x001e, 0x1110, 0x080c, 0x86a4, 0x0005, 0x080c,</div><div class='del'>-	0x9021, 0x1138, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x6d45,</div><div class='del'>-	0x0010, 0x080c, 0x86a4, 0x0005, 0x6004, 0xa08a, 0x0080, 0x1a0c,</div><div class='del'>-	0x151a, 0x080c, 0x7102, 0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005,</div><div class='del'>-	0xa182, 0x0040, 0x0002, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8d0,</div><div class='del'>-	0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce,</div><div class='del'>-	0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0xa8ce, 0x080c, 0x151a,</div><div class='del'>-	0x00d6, 0x00e6, 0x00f6, 0x0156, 0x0046, 0x0026, 0x6218, 0xa280,</div><div class='del'>-	0x002b, 0x2004, 0xa005, 0x0120, 0x2021, 0x0000, 0x080c, 0xb3d8,</div><div class='del'>-	0x6106, 0x2071, 0xbc80, 0x7444, 0xa4a4, 0xff00, 0x0904, 0xa934,</div><div class='del'>-	0xa486, 0x2000, 0x1130, 0x2009, 0x0001, 0x2011, 0x0200, 0x080c,</div><div class='del'>-	0x6b8c, 0x080c, 0x15fd, 0x090c, 0x151a, 0x6003, 0x0007, 0x2d00,</div><div class='del'>-	0x6837, 0x010d, 0x6803, 0x0000, 0x683b, 0x0000, 0x6c5a, 0x2c00,</div><div class='del'>-	0x685e, 0x6008, 0x68b2, 0x6018, 0x2078, 0x78a0, 0x8007, 0x7130,</div><div class='del'>-	0x694a, 0x0016, 0xa084, 0xff00, 0x6846, 0x684f, 0x0000, 0x6853,</div><div class='del'>-	0x0000, 0x6857, 0x0036, 0x080c, 0x547a, 0x001e, 0xa486, 0x2000,</div><div class='del'>-	0x1130, 0x2019, 0x0017, 0x080c, 0xb121, 0x0804, 0xa991, 0xa486,</div><div class='del'>-	0x0400, 0x1130, 0x2019, 0x0002, 0x080c, 0xb0d3, 0x0804, 0xa991,</div><div class='del'>-	0xa486, 0x0200, 0x1110, 0x080c, 0xb0b8, 0xa486, 0x1000, 0x1110,</div><div class='del'>-	0x080c, 0xb106, 0x0804, 0xa991, 0x2069, 0xb975, 0x6a00, 0xd284,</div><div class='del'>-	0x0904, 0xa9f8, 0xa284, 0x0300, 0x1904, 0xa9f1, 0x6804, 0xa005,</div><div class='del'>-	0x0904, 0xa9d9, 0x2d78, 0x6003, 0x0007, 0x080c, 0x15e4, 0x0904,</div><div class='del'>-	0xa998, 0x7800, 0xd08c, 0x1118, 0x7804, 0x8001, 0x7806, 0x6013,</div><div class='del'>-	0x0000, 0x6803, 0x0000, 0x6837, 0x0116, 0x683b, 0x0000, 0x6008,</div><div class='del'>-	0x68b2, 0x2c00, 0x684a, 0x6018, 0x2078, 0x78a0, 0x8007, 0x7130,</div><div class='del'>-	0x6986, 0x6846, 0x7928, 0x698a, 0x792c, 0x698e, 0x7930, 0x6992,</div><div class='del'>-	0x7934, 0x6996, 0x6853, 0x003d, 0x7244, 0xa294, 0x0003, 0xa286,</div><div class='del'>-	0x0002, 0x1118, 0x684f, 0x0040, 0x0040, 0xa286, 0x0001, 0x1118,</div><div class='del'>-	0x684f, 0x0080, 0x0010, 0x684f, 0x0000, 0x20a9, 0x000a, 0x2001,</div><div class='del'>-	0xbc90, 0xad90, 0x0015, 0x200c, 0x810f, 0x2112, 0x8000, 0x8210,</div><div class='del'>-	0x1f04, 0xa983, 0x200c, 0x6982, 0x8000, 0x200c, 0x697e, 0x080c,</div><div class='del'>-	0x547a, 0x002e, 0x004e, 0x015e, 0x00fe, 0x00ee, 0x00de, 0x0005,</div><div class='del'>-	0x2001, 0xb60e, 0x2004, 0xd084, 0x0120, 0x080c, 0x15fd, 0x1904,</div><div class='del'>-	0xa949, 0x6013, 0x0100, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c,</div><div class='del'>-	0x6cff, 0x080c, 0x71e5, 0x0c28, 0x2069, 0xbc92, 0x2d04, 0xa084,</div><div class='del'>-	0xff00, 0xa086, 0x1200, 0x11a8, 0x2069, 0xbc80, 0x686c, 0xa084,</div><div class='del'>-	0x00ff, 0x0016, 0x6110, 0xa18c, 0x0700, 0xa10d, 0x6112, 0x001e,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0043, 0x080c, 0x6cff, 0x080c, 0x71e5,</div><div class='del'>-	0x0840, 0x6868, 0x602a, 0x686c, 0x602e, 0x6013, 0x0200, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0041, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x0804,</div><div class='del'>-	0xa991, 0x2001, 0xb60d, 0x2004, 0xd0ec, 0x0120, 0x2011, 0x8049,</div><div class='del'>-	0x080c, 0x3f13, 0x6013, 0x0300, 0x0010, 0x6013, 0x0100, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0041, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x0804,</div><div class='del'>-	0xa991, 0x6013, 0x0500, 0x0c98, 0x6013, 0x0600, 0x0804, 0xa9ac,</div><div class='del'>-	0x6013, 0x0200, 0x0804, 0xa9ac, 0xa186, 0x0013, 0x1170, 0x6004,</div><div class='del'>-	0xa08a, 0x0040, 0x0a0c, 0x151a, 0xa08a, 0x0053, 0x1a0c, 0x151a,</div><div class='del'>-	0xa082, 0x0040, 0x2008, 0x0804, 0xaa86, 0xa186, 0x0051, 0x0138,</div><div class='del'>-	0xa186, 0x0047, 0x11d8, 0x6004, 0xa086, 0x0041, 0x0518, 0x2001,</div><div class='del'>-	0x0109, 0x2004, 0xd084, 0x01f0, 0x0126, 0x2091, 0x2800, 0x0006,</div><div class='del'>-	0x0016, 0x0026, 0x080c, 0x6be6, 0x002e, 0x001e, 0x000e, 0x012e,</div><div class='del'>-	0x6000, 0xa086, 0x0002, 0x1170, 0x0804, 0xaac9, 0xa186, 0x0027,</div><div class='del'>-	0x0120, 0xa186, 0x0014, 0x190c, 0x151a, 0x6004, 0xa082, 0x0040,</div><div class='del'>-	0x2008, 0x001a, 0x080c, 0x86ef, 0x0005, 0xaa50, 0xaa52, 0xaa52,</div><div class='del'>-	0xaa76, 0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50,</div><div class='del'>-	0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50, 0xaa50,</div><div class='del'>-	0x080c, 0x151a, 0x080c, 0x7102, 0x080c, 0x71e5, 0x0036, 0x00d6,</div><div class='del'>-	0x6010, 0xa06d, 0x01c0, 0xad84, 0xf000, 0x01a8, 0x6003, 0x0002,</div><div class='del'>-	0x6018, 0x2004, 0xd0bc, 0x1178, 0x2019, 0x0004, 0x080c, 0xb155,</div><div class='del'>-	0x6013, 0x0000, 0x6014, 0xa005, 0x1120, 0x2001, 0xb8b7, 0x2004,</div><div class='del'>-	0x6016, 0x6003, 0x0007, 0x00de, 0x003e, 0x0005, 0x00d6, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x71e5, 0x080c, 0x9d16, 0x0120, 0x6010, 0x2068,</div><div class='del'>-	0x080c, 0x1614, 0x080c, 0x9ed9, 0x00de, 0x0005, 0x0002, 0xaa9a,</div><div class='del'>-	0xaab7, 0xaaa3, 0xaac3, 0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a,</div><div class='del'>-	0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a, 0xaa9a,</div><div class='del'>-	0xaa9a, 0xaa9a, 0x080c, 0x151a, 0x6010, 0xa088, 0x0013, 0x2104,</div><div class='del'>-	0xa085, 0x0400, 0x200a, 0x080c, 0x7102, 0x6010, 0xa080, 0x0013,</div><div class='del'>-	0x2004, 0xd0b4, 0x0138, 0x6003, 0x0007, 0x2009, 0x0043, 0x080c,</div><div class='del'>-	0x86d3, 0x0010, 0x6003, 0x0002, 0x080c, 0x71e5, 0x0005, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0xb393, 0x1120, 0x080c, 0x6b61, 0x080c, 0x86a4,</div><div class='del'>-	0x080c, 0x71e5, 0x0005, 0x080c, 0x7102, 0x2009, 0x0041, 0x0804,</div><div class='del'>-	0xac12, 0xa182, 0x0040, 0x0002, 0xaadf, 0xaae1, 0xaadf, 0xaadf,</div><div class='del'>-	0xaadf, 0xaadf, 0xaadf, 0xaae2, 0xaadf, 0xaadf, 0xaadf, 0xaadf,</div><div class='del'>-	0xaadf, 0xaadf, 0xaadf, 0xaadf, 0xaadf, 0xaaed, 0xaadf, 0x080c,</div><div class='del'>-	0x151a, 0x0005, 0x6003, 0x0004, 0x6110, 0x20e1, 0x0005, 0x3d18,</div><div class='del'>-	0x3e20, 0x2c10, 0x080c, 0x1863, 0x0005, 0x00d6, 0x080c, 0x6b61,</div><div class='del'>-	0x00de, 0x080c, 0xb3f6, 0x080c, 0x86a4, 0x0005, 0xa182, 0x0040,</div><div class='del'>-	0x0002, 0xab0c, 0xab0c, 0xab0c, 0xab0c, 0xab0c, 0xab0c, 0xab0c,</div><div class='del'>-	0xab0e, 0xab0c, 0xab11, 0xab4a, 0xab0c, 0xab0c, 0xab0c, 0xab0c,</div><div class='del'>-	0xab4a, 0xab0c, 0xab0c, 0xab0c, 0x080c, 0x151a, 0x080c, 0x86ef,</div><div class='del'>-	0x0005, 0x2001, 0xb672, 0x2004, 0xd0e4, 0x0158, 0x2001, 0x0100,</div><div class='del'>-	0x2004, 0xa082, 0x0005, 0x0228, 0x2001, 0x011f, 0x2004, 0x6036,</div><div class='del'>-	0x0010, 0x6037, 0x0000, 0x080c, 0x7198, 0x080c, 0x72a2, 0x6010,</div><div class='del'>-	0x00d6, 0x2068, 0x684c, 0xd0fc, 0x0150, 0xa08c, 0x0003, 0xa18e,</div><div class='del'>-	0x0002, 0x0168, 0x2009, 0x0041, 0x00de, 0x0804, 0xac12, 0x6003,</div><div class='del'>-	0x0007, 0x6017, 0x0000, 0x080c, 0x6b61, 0x00de, 0x0005, 0x080c,</div><div class='del'>-	0xb393, 0x0110, 0x00de, 0x0005, 0x080c, 0x6b61, 0x080c, 0x86a4,</div><div class='del'>-	0x00de, 0x0ca0, 0x0036, 0x080c, 0x7198, 0x080c, 0x72a2, 0x6010,</div><div class='del'>-	0x00d6, 0x2068, 0x6018, 0x2004, 0xd0bc, 0x0188, 0x684c, 0xa084,</div><div class='del'>-	0x0003, 0xa086, 0x0002, 0x0140, 0x687c, 0x632c, 0xa31a, 0x632e,</div><div class='del'>-	0x6880, 0x6328, 0xa31b, 0x632a, 0x6003, 0x0002, 0x0080, 0x2019,</div><div class='del'>-	0x0004, 0x080c, 0xb155, 0x6014, 0xa005, 0x1128, 0x2001, 0xb8b7,</div><div class='del'>-	0x2004, 0x8003, 0x6016, 0x6013, 0x0000, 0x6003, 0x0007, 0x00de,</div><div class='del'>-	0x003e, 0x0005, 0xa186, 0x0013, 0x1150, 0x6004, 0xa086, 0x0042,</div><div class='del'>-	0x190c, 0x151a, 0x080c, 0x7102, 0x080c, 0x71e5, 0x0005, 0xa186,</div><div class='del'>-	0x0027, 0x0118, 0xa186, 0x0014, 0x1180, 0x6004, 0xa086, 0x0042,</div><div class='del'>-	0x190c, 0x151a, 0x2001, 0x0007, 0x080c, 0x4f9c, 0x080c, 0x7102,</div><div class='del'>-	0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005, 0xa182, 0x0040, 0x0002,</div><div class='del'>-	0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb5,</div><div class='del'>-	0xabc1, 0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb3, 0xabb3,</div><div class='del'>-	0xabb3, 0xabb3, 0xabb3, 0x080c, 0x151a, 0x0036, 0x0046, 0x20e1,</div><div class='del'>-	0x0005, 0x3d18, 0x3e20, 0x2c10, 0x080c, 0x1863, 0x004e, 0x003e,</div><div class='del'>-	0x0005, 0x6010, 0x00d6, 0x2068, 0x6810, 0x6a14, 0x0006, 0x0046,</div><div class='del'>-	0x0056, 0x6c7c, 0xa422, 0x6d80, 0x2200, 0xa52b, 0x602c, 0xa420,</div><div class='del'>-	0x642e, 0x6028, 0xa529, 0x652a, 0x005e, 0x004e, 0x000e, 0xa20d,</div><div class='del'>-	0x1178, 0x684c, 0xd0fc, 0x0120, 0x2009, 0x0041, 0x00de, 0x0490,</div><div class='del'>-	0x6003, 0x0007, 0x6017, 0x0000, 0x080c, 0x6b61, 0x00de, 0x0005,</div><div class='del'>-	0x0006, 0x00f6, 0x2c78, 0x080c, 0x5377, 0x00fe, 0x000e, 0x0120,</div><div class='del'>-	0x6003, 0x0002, 0x00de, 0x0005, 0x2009, 0xb60d, 0x210c, 0xd19c,</div><div class='del'>-	0x0118, 0x6003, 0x0007, 0x0010, 0x6003, 0x0006, 0x0021, 0x080c,</div><div class='del'>-	0x6b63, 0x00de, 0x0005, 0xd2fc, 0x0140, 0x8002, 0x8000, 0x8212,</div><div class='del'>-	0xa291, 0x0000, 0x2009, 0x0009, 0x0010, 0x2009, 0x0015, 0x6a6a,</div><div class='del'>-	0x6866, 0x0005, 0xa182, 0x0040, 0x0208, 0x0062, 0xa186, 0x0013,</div><div class='del'>-	0x0120, 0xa186, 0x0014, 0x190c, 0x151a, 0x6020, 0xd0dc, 0x090c,</div><div class='del'>-	0x151a, 0x0005, 0xac35, 0xac3c, 0xac48, 0xac54, 0xac35, 0xac35,</div><div class='del'>-	0xac35, 0xac63, 0xac35, 0xac37, 0xac37, 0xac35, 0xac35, 0xac35,</div><div class='del'>-	0xac35, 0xac37, 0xac35, 0xac37, 0xac35, 0x080c, 0x151a, 0x6020,</div><div class='del'>-	0xd0dc, 0x090c, 0x151a, 0x0005, 0x6003, 0x0001, 0x6106, 0x080c,</div><div class='del'>-	0x6cff, 0x0126, 0x2091, 0x8000, 0x080c, 0x71e5, 0x012e, 0x0005,</div><div class='del'>-	0x6003, 0x0001, 0x6106, 0x080c, 0x6cff, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x71e5, 0x012e, 0x0005, 0x6003, 0x0003, 0x6106, 0x2c10,</div><div class='del'>-	0x080c, 0x1fc5, 0x0126, 0x2091, 0x8000, 0x080c, 0x6d62, 0x080c,</div><div class='del'>-	0x72a2, 0x012e, 0x0005, 0xa016, 0x080c, 0x1863, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x0036, 0x00d6, 0xa182, 0x0040, 0x0023, 0x00de,</div><div class='del'>-	0x003e, 0x012e, 0x0005, 0xac83, 0xac85, 0xac97, 0xacb2, 0xac83,</div><div class='del'>-	0xac83, 0xac83, 0xacc7, 0xac83, 0xac83, 0xac83, 0xac83, 0xac83,</div><div class='del'>-	0xac83, 0xac83, 0xac83, 0x080c, 0x151a, 0x6010, 0x2068, 0x684c,</div><div class='del'>-	0xd0fc, 0x01f8, 0xa09c, 0x0003, 0xa39e, 0x0003, 0x01d0, 0x6003,</div><div class='del'>-	0x0001, 0x6106, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x0498, 0x6010,</div><div class='del'>-	0x2068, 0x684c, 0xd0fc, 0x0168, 0xa09c, 0x0003, 0xa39e, 0x0003,</div><div class='del'>-	0x0140, 0x6003, 0x0001, 0x6106, 0x080c, 0x6cff, 0x080c, 0x71e5,</div><div class='del'>-	0x0408, 0x6013, 0x0000, 0x6017, 0x0000, 0x2019, 0x0004, 0x080c,</div><div class='del'>-	0xb155, 0x00c0, 0x6010, 0x2068, 0x684c, 0xd0fc, 0x0d90, 0xa09c,</div><div class='del'>-	0x0003, 0xa39e, 0x0003, 0x0d68, 0x6003, 0x0003, 0x6106, 0x2c10,</div><div class='del'>-	0x080c, 0x1fc5, 0x080c, 0x6d62, 0x080c, 0x72a2, 0x0018, 0xa016,</div><div class='del'>-	0x080c, 0x1863, 0x0005, 0x080c, 0x7102, 0x6110, 0x81ff, 0x0158,</div><div class='del'>-	0x00d6, 0x2168, 0x080c, 0xb43c, 0x0036, 0x2019, 0x0029, 0x080c,</div><div class='del'>-	0xb155, 0x003e, 0x00de, 0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005,</div><div class='del'>-	0x080c, 0x7198, 0x6110, 0x81ff, 0x0158, 0x00d6, 0x2168, 0x080c,</div><div class='del'>-	0xb43c, 0x0036, 0x2019, 0x0029, 0x080c, 0xb155, 0x003e, 0x00de,</div><div class='del'>-	0x080c, 0x9ed9, 0x080c, 0x72a2, 0x0005, 0xa182, 0x0085, 0x0002,</div><div class='del'>-	0xad01, 0xacff, 0xacff, 0xad0d, 0xacff, 0xacff, 0xacff, 0x080c,</div><div class='del'>-	0x151a, 0x6003, 0x000b, 0x6106, 0x080c, 0x6cff, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x71e5, 0x012e, 0x0005, 0x0026, 0x00e6, 0x080c,</div><div class='del'>-	0xb38c, 0x0118, 0x080c, 0x86a4, 0x00d8, 0x2071, 0xbc80, 0x7224,</div><div class='del'>-	0x6212, 0x7220, 0x080c, 0xb003, 0x0118, 0x6007, 0x0086, 0x0040,</div><div class='del'>-	0x6007, 0x0087, 0x7224, 0xa296, 0xffff, 0x1110, 0x6007, 0x0086,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x080c, 0x72a2,</div><div class='del'>-	0x00ee, 0x002e, 0x0005, 0xa186, 0x0013, 0x1160, 0x6004, 0xa08a,</div><div class='del'>-	0x0085, 0x0a0c, 0x151a, 0xa08a, 0x008c, 0x1a0c, 0x151a, 0xa082,</div><div class='del'>-	0x0085, 0x00a2, 0xa186, 0x0027, 0x0130, 0xa186, 0x0014, 0x0118,</div><div class='del'>-	0x080c, 0x86ef, 0x0050, 0x2001, 0x0007, 0x080c, 0x4f9c, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005, 0xad5d, 0xad5f,</div><div class='del'>-	0xad5f, 0xad5d, 0xad5d, 0xad5d, 0xad5d, 0x080c, 0x151a, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005, 0xa182, 0x0085,</div><div class='del'>-	0x0a0c, 0x151a, 0xa182, 0x008c, 0x1a0c, 0x151a, 0xa182, 0x0085,</div><div class='del'>-	0x0002, 0xad78, 0xad78, 0xad78, 0xad7a, 0xad78, 0xad78, 0xad78,</div><div class='del'>-	0x080c, 0x151a, 0x0005, 0xa186, 0x0013, 0x0148, 0xa186, 0x0014,</div><div class='del'>-	0x0130, 0xa186, 0x0027, 0x0118, 0x080c, 0x86ef, 0x0030, 0x080c,</div><div class='del'>-	0x7102, 0x080c, 0x9ed9, 0x080c, 0x71e5, 0x0005, 0x0036, 0x080c,</div><div class='del'>-	0xb3f6, 0x603f, 0x0000, 0x2019, 0x000b, 0x0031, 0x601f, 0x0006,</div><div class='del'>-	0x6003, 0x0007, 0x003e, 0x0005, 0x0126, 0x0036, 0x2091, 0x8000,</div><div class='del'>-	0x0086, 0x2c40, 0x0096, 0x2049, 0x0000, 0x080c, 0x81b7, 0x009e,</div><div class='del'>-	0x008e, 0x1578, 0x0076, 0x2c38, 0x080c, 0x825d, 0x007e, 0x1548,</div><div class='del'>-	0x6000, 0xa086, 0x0000, 0x0528, 0x601c, 0xa086, 0x0007, 0x0508,</div><div class='del'>-	0x00d6, 0x6000, 0xa086, 0x0004, 0x1150, 0x080c, 0xb3f6, 0x601f,</div><div class='del'>-	0x0007, 0x2001, 0xb8b6, 0x2004, 0x6016, 0x080c, 0x1952, 0x6010,</div><div class='del'>-	0x2068, 0x080c, 0x9d16, 0x0110, 0x080c, 0xb155, 0x00de, 0x6013,</div><div class='del'>-	0x0000, 0x080c, 0xb3f6, 0x601f, 0x0007, 0x2001, 0xb8b6, 0x2004,</div><div class='del'>-	0x6016, 0x003e, 0x012e, 0x0005, 0x00f6, 0x00c6, 0x0036, 0x0156,</div><div class='del'>-	0x2079, 0xbc80, 0x7938, 0x783c, 0x080c, 0x2852, 0x15b0, 0x0016,</div><div class='del'>-	0x00c6, 0x080c, 0x501b, 0x1578, 0x001e, 0x002e, 0x0026, 0x0016,</div><div class='del'>-	0x2019, 0x0029, 0x080c, 0x8320, 0x080c, 0x6e67, 0x0076, 0x2039,</div><div class='del'>-	0x0000, 0x080c, 0x6d74, 0x007e, 0x001e, 0x0076, 0x2039, 0x0000,</div><div class='del'>-	0x080c, 0xaf3e, 0x007e, 0x080c, 0x521c, 0x0026, 0x6204, 0xa294,</div><div class='del'>-	0xff00, 0x8217, 0xa286, 0x0006, 0x0118, 0xa286, 0x0004, 0x1118,</div><div class='del'>-	0x62a0, 0x080c, 0x2d8a, 0x002e, 0x001e, 0x080c, 0x4c7e, 0x6612,</div><div class='del'>-	0x6516, 0xa006, 0x0010, 0x00ce, 0x001e, 0x015e, 0x003e, 0x00ce,</div><div class='del'>-	0x00fe, 0x0005, 0x00c6, 0x00d6, 0x00e6, 0x0016, 0x2009, 0xb621,</div><div class='del'>-	0x2104, 0xa086, 0x0074, 0x1904, 0xae77, 0x2069, 0xbc8e, 0x690c,</div><div class='del'>-	0xa182, 0x0100, 0x06c0, 0x6908, 0xa184, 0x8000, 0x05e8, 0x2001,</div><div class='del'>-	0xb89e, 0x2004, 0xa005, 0x1160, 0x6018, 0x2070, 0x7010, 0xa084,</div><div class='del'>-	0x00ff, 0x0118, 0x7000, 0xd0f4, 0x0118, 0xa184, 0x0800, 0x0560,</div><div class='del'>-	0x6910, 0xa18a, 0x0001, 0x0610, 0x6914, 0x2069, 0xbcae, 0x6904,</div><div class='del'>-	0x81ff, 0x1198, 0x690c, 0xa182, 0x0100, 0x02a8, 0x6908, 0x81ff,</div><div class='del'>-	0x1178, 0x6910, 0xa18a, 0x0001, 0x0288, 0x6918, 0xa18a, 0x0001,</div><div class='del'>-	0x0298, 0x00d0, 0x6013, 0x0100, 0x00a0, 0x6013, 0x0300, 0x0088,</div><div class='del'>-	0x6013, 0x0500, 0x0070, 0x6013, 0x0700, 0x0058, 0x6013, 0x0900,</div><div class='del'>-	0x0040, 0x6013, 0x0b00, 0x0028, 0x6013, 0x0f00, 0x0010, 0x6013,</div><div class='del'>-	0x2d00, 0xa085, 0x0001, 0x0008, 0xa006, 0x001e, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x0005, 0x00c6, 0x00d6, 0x0026, 0x0036, 0x0156, 0x6218,</div><div class='del'>-	0x2268, 0x6b04, 0xa394, 0x00ff, 0xa286, 0x0006, 0x0190, 0xa286,</div><div class='del'>-	0x0004, 0x0178, 0xa394, 0xff00, 0x8217, 0xa286, 0x0006, 0x0148,</div><div class='del'>-	0xa286, 0x0004, 0x0130, 0x00c6, 0x2d60, 0x080c, 0x502a, 0x00ce,</div><div class='del'>-	0x04c0, 0x2011, 0xbc96, 0xad98, 0x000a, 0x20a9, 0x0004, 0x080c,</div><div class='del'>-	0x9166, 0x1580, 0x2011, 0xbc9a, 0xad98, 0x0006, 0x20a9, 0x0004,</div><div class='del'>-	0x080c, 0x9166, 0x1538, 0x0046, 0x0016, 0x6aa0, 0xa294, 0x00ff,</div><div class='del'>-	0x8227, 0xa006, 0x2009, 0xb653, 0x210c, 0xd1a4, 0x0138, 0x2009,</div><div class='del'>-	0x0029, 0x080c, 0xb1a4, 0x6800, 0xc0e5, 0x6802, 0x2019, 0x0029,</div><div class='del'>-	0x080c, 0x6e67, 0x0076, 0x2039, 0x0000, 0x080c, 0x6d74, 0x2c08,</div><div class='del'>-	0x080c, 0xaf3e, 0x007e, 0x2001, 0x0007, 0x080c, 0x4f9c, 0x001e,</div><div class='del'>-	0x004e, 0xa006, 0x015e, 0x003e, 0x002e, 0x00de, 0x00ce, 0x0005,</div><div class='del'>-	0x00d6, 0x2069, 0xbc8e, 0x6800, 0xa086, 0x0800, 0x0118, 0x6013,</div><div class='del'>-	0x0000, 0x0008, 0xa006, 0x00de, 0x0005, 0x00c6, 0x00f6, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x0156, 0x2079, 0xbc8c, 0x7930, 0x7834, 0x080c,</div><div class='del'>-	0x2852, 0x11a0, 0x080c, 0x501b, 0x1188, 0x2011, 0xbc90, 0xac98,</div><div class='del'>-	0x000a, 0x20a9, 0x0004, 0x080c, 0x9166, 0x1140, 0x2011, 0xbc94,</div><div class='del'>-	0xac98, 0x0006, 0x20a9, 0x0004, 0x080c, 0x9166, 0x015e, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x00fe, 0x00ce, 0x0005, 0x00c6, 0x0006, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x0156, 0x2011, 0xbc83, 0x2204, 0x8211, 0x220c,</div><div class='del'>-	0x080c, 0x2852, 0x11a0, 0x080c, 0x501b, 0x1188, 0x2011, 0xbc96,</div><div class='del'>-	0xac98, 0x000a, 0x20a9, 0x0004, 0x080c, 0x9166, 0x1140, 0x2011,</div><div class='del'>-	0xbc9a, 0xac98, 0x0006, 0x20a9, 0x0004, 0x080c, 0x9166, 0x015e,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x000e, 0x00ce, 0x0005, 0x00e6, 0x00c6,</div><div class='del'>-	0x0086, 0x0076, 0x0066, 0x0056, 0x0046, 0x0026, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2740, 0x2029, 0xb8ea, 0x252c, 0x2021, 0xb8f0, 0x2424,</div><div class='del'>-	0x2061, 0xbe00, 0x2071, 0xb600, 0x7648, 0x7068, 0x81ff, 0x0150,</div><div class='del'>-	0x0006, 0xa186, 0xb9f5, 0x000e, 0x0128, 0x8001, 0xa602, 0x1a04,</div><div class='del'>-	0xafbf, 0x0018, 0xa606, 0x0904, 0xafbf, 0x2100, 0xac06, 0x0904,</div><div class='del'>-	0xafb6, 0x080c, 0xb1cc, 0x0904, 0xafb6, 0x671c, 0xa786, 0x0001,</div><div class='del'>-	0x0904, 0xafda, 0xa786, 0x0004, 0x0904, 0xafda, 0xa786, 0x0007,</div><div class='del'>-	0x05e8, 0x2500, 0xac06, 0x05d0, 0x2400, 0xac06, 0x05b8, 0x080c,</div><div class='del'>-	0xb1dc, 0x15a0, 0x88ff, 0x0118, 0x6050, 0xa906, 0x1578, 0x00d6,</div><div class='del'>-	0x6000, 0xa086, 0x0004, 0x1120, 0x0016, 0x080c, 0x1952, 0x001e,</div><div class='del'>-	0xa786, 0x0008, 0x1148, 0x080c, 0x9f14, 0x1130, 0x080c, 0x8ca5,</div><div class='del'>-	0x00de, 0x080c, 0x9ed9, 0x00d0, 0x6010, 0x2068, 0x080c, 0x9d16,</div><div class='del'>-	0x0190, 0xa786, 0x0003, 0x1528, 0x6837, 0x0103, 0x6b4a, 0x6847,</div><div class='del'>-	0x0000, 0x080c, 0xb43c, 0x0016, 0x080c, 0x9f88, 0x080c, 0x547a,</div><div class='del'>-	0x001e, 0x080c, 0x9ecd, 0x00de, 0x080c, 0x9ed9, 0xace0, 0x0018,</div><div class='del'>-	0x2001, 0xb617, 0x2004, 0xac02, 0x1210, 0x0804, 0xaf52, 0x012e,</div><div class='del'>-	0x002e, 0x004e, 0x005e, 0x006e, 0x007e, 0x008e, 0x00ce, 0x00ee,</div><div class='del'>-	0x0005, 0xa786, 0x0006, 0x1150, 0xa386, 0x0005, 0x0128, 0x080c,</div><div class='del'>-	0xb43c, 0x080c, 0xb155, 0x08f8, 0x00de, 0x0c00, 0xa786, 0x000a,</div><div class='del'>-	0x0968, 0x0850, 0x080c, 0xb1dc, 0x19c8, 0x81ff, 0x09b8, 0xa180,</div><div class='del'>-	0x0001, 0x2004, 0xa086, 0x0018, 0x0130, 0xa180, 0x0001, 0x2004,</div><div class='del'>-	0xa086, 0x002d, 0x1958, 0x6000, 0xa086, 0x0002, 0x1938, 0x080c,</div><div class='del'>-	0x9f03, 0x0130, 0x080c, 0x9f14, 0x1908, 0x080c, 0x8ca5, 0x0038,</div><div class='del'>-	0x080c, 0x2cf7, 0x080c, 0x9f14, 0x1110, 0x080c, 0x8ca5, 0x080c,</div><div class='del'>-	0x9ed9, 0x0804, 0xafb6, 0x00c6, 0x00e6, 0x0016, 0x2c08, 0x2170,</div><div class='del'>-	0xa006, 0x080c, 0xb176, 0x001e, 0x0120, 0x601c, 0xa084, 0x000f,</div><div class='del'>-	0x001b, 0x00ee, 0x00ce, 0x0005, 0xb01c, 0xb01c, 0xb01c, 0xb01c,</div><div class='del'>-	0xb01c, 0xb01c, 0xb01e, 0xb01c, 0xa006, 0x0005, 0x0046, 0x0016,</div><div class='del'>-	0x7018, 0xa080, 0x0028, 0x2024, 0xa4a4, 0x00ff, 0x8427, 0x2c00,</div><div class='del'>-	0x2009, 0x0020, 0x080c, 0xb1a4, 0x001e, 0x004e, 0x0036, 0x2019,</div><div class='del'>-	0x0002, 0x080c, 0xad9c, 0x003e, 0xa085, 0x0001, 0x0005, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0x4f5d, 0x0156, 0x0016, 0x0026, 0x0036, 0x20a9,</div><div class='del'>-	0x0004, 0x2019, 0xb605, 0x2011, 0xbc96, 0x080c, 0x9166, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x015e, 0xa005, 0x0005, 0x00f6, 0x00e6, 0x00c6,</div><div class='del'>-	0x0086, 0x0076, 0x0066, 0x0026, 0x0126, 0x2091, 0x8000, 0x2740,</div><div class='del'>-	0x2061, 0xbe00, 0x2079, 0x0001, 0x8fff, 0x0904, 0xb0ab, 0x2071,</div><div class='del'>-	0xb600, 0x7648, 0x7068, 0x8001, 0xa602, 0x1a04, 0xb0ab, 0x88ff,</div><div class='del'>-	0x0128, 0x2800, 0xac06, 0x15b0, 0x2079, 0x0000, 0x080c, 0xb1cc,</div><div class='del'>-	0x0588, 0x2400, 0xac06, 0x0570, 0x671c, 0xa786, 0x0006, 0x1550,</div><div class='del'>-	0xa786, 0x0007, 0x0538, 0x88ff, 0x1140, 0x6018, 0xa206, 0x1510,</div><div class='del'>-	0x85ff, 0x0118, 0x6050, 0xa106, 0x11e8, 0x00d6, 0x6000, 0xa086,</div><div class='del'>-	0x0004, 0x1150, 0x080c, 0xb3f6, 0x601f, 0x0007, 0x2001, 0xb8b6,</div><div class='del'>-	0x2004, 0x6016, 0x080c, 0x1952, 0x6010, 0x2068, 0x080c, 0x9d16,</div><div class='del'>-	0x0120, 0x0046, 0x080c, 0xb155, 0x004e, 0x00de, 0x080c, 0x9ed9,</div><div class='del'>-	0x88ff, 0x1198, 0xace0, 0x0018, 0x2001, 0xb617, 0x2004, 0xac02,</div><div class='del'>-	0x1210, 0x0804, 0xb05c, 0xa006, 0x012e, 0x002e, 0x006e, 0x007e,</div><div class='del'>-	0x008e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0xa8c5, 0x0001, 0x0ca0,</div><div class='del'>-	0x0076, 0x0056, 0x0086, 0x2041, 0x0000, 0x2029, 0x0001, 0x2c20,</div><div class='del'>-	0x2019, 0x0002, 0x6218, 0x0096, 0x2049, 0x0000, 0x080c, 0x81b7,</div><div class='del'>-	0x009e, 0x008e, 0x2039, 0x0000, 0x080c, 0x825d, 0x080c, 0xb04d,</div><div class='del'>-	0x005e, 0x007e, 0x0005, 0x0026, 0x0046, 0x0056, 0x0076, 0x00c6,</div><div class='del'>-	0x0156, 0x2c20, 0x2128, 0x20a9, 0x007f, 0x2009, 0x0000, 0x0016,</div><div class='del'>-	0x0036, 0x080c, 0x501b, 0x11b0, 0x2c10, 0x0056, 0x0086, 0x2041,</div><div class='del'>-	0x0000, 0x2508, 0x2029, 0x0001, 0x0096, 0x2049, 0x0000, 0x080c,</div><div class='del'>-	0x81b7, 0x009e, 0x008e, 0x2039, 0x0000, 0x080c, 0x825d, 0x080c,</div><div class='del'>-	0xb04d, 0x005e, 0x003e, 0x001e, 0x8108, 0x1f04, 0xb0df, 0x015e,</div><div class='del'>-	0x00ce, 0x007e, 0x005e, 0x004e, 0x002e, 0x0005, 0x0076, 0x0056,</div><div class='del'>-	0x6218, 0x0086, 0x2041, 0x0000, 0x2029, 0x0001, 0x2019, 0x0048,</div><div class='del'>-	0x0096, 0x2049, 0x0000, 0x080c, 0x81b7, 0x009e, 0x008e, 0x2039,</div><div class='del'>-	0x0000, 0x080c, 0x825d, 0x2c20, 0x080c, 0xb04d, 0x005e, 0x007e,</div><div class='del'>-	0x0005, 0x0026, 0x0046, 0x0056, 0x0076, 0x00c6, 0x0156, 0x2c20,</div><div class='del'>-	0x20a9, 0x007f, 0x2009, 0x0000, 0x0016, 0x0036, 0x080c, 0x501b,</div><div class='del'>-	0x11c0, 0x2c10, 0x0086, 0x2041, 0x0000, 0x2828, 0x0046, 0x2021,</div><div class='del'>-	0x0001, 0x080c, 0xb3d8, 0x004e, 0x0096, 0x2049, 0x0000, 0x080c,</div><div class='del'>-	0x81b7, 0x009e, 0x008e, 0x2039, 0x0000, 0x080c, 0x825d, 0x080c,</div><div class='del'>-	0xb04d, 0x003e, 0x001e, 0x8108, 0x1f04, 0xb12c, 0x015e, 0x00ce,</div><div class='del'>-	0x007e, 0x005e, 0x004e, 0x002e, 0x0005, 0x0016, 0x00f6, 0x3800,</div><div class='del'>-	0xd08c, 0x0130, 0xad82, 0x1000, 0x02b0, 0xad82, 0xb600, 0x0230,</div><div class='del'>-	0xad82, 0xee00, 0x0280, 0xad82, 0xffff, 0x1268, 0x6800, 0xa07d,</div><div class='del'>-	0x0138, 0x6803, 0x0000, 0x6b52, 0x080c, 0x547a, 0x2f68, 0x0cb0,</div><div class='del'>-	0x6b52, 0x080c, 0x547a, 0x00fe, 0x001e, 0x0005, 0x00e6, 0x0046,</div><div class='del'>-	0x0036, 0x2061, 0xbe00, 0xa005, 0x1138, 0x2071, 0xb600, 0x7448,</div><div class='del'>-	0x7068, 0x8001, 0xa402, 0x12d8, 0x2100, 0xac06, 0x0168, 0x6000,</div><div class='del'>-	0xa086, 0x0000, 0x0148, 0x6008, 0xa206, 0x1130, 0x6018, 0xa1a0,</div><div class='del'>-	0x0006, 0x2424, 0xa406, 0x0140, 0xace0, 0x0018, 0x2001, 0xb617,</div><div class='del'>-	0x2004, 0xac02, 0x1220, 0x0c40, 0xa085, 0x0001, 0x0008, 0xa006,</div><div class='del'>-	0x003e, 0x004e, 0x00ee, 0x0005, 0x00d6, 0x0006, 0x080c, 0x15fd,</div><div class='del'>-	0x000e, 0x090c, 0x151a, 0x6837, 0x010d, 0x685e, 0x0026, 0x2010,</div><div class='del'>-	0x080c, 0x9d06, 0x2001, 0x0000, 0x0120, 0x2200, 0xa080, 0x0014,</div><div class='del'>-	0x2004, 0x002e, 0x684a, 0x6956, 0x6c46, 0x684f, 0x0000, 0x2001,</div><div class='del'>-	0xb8be, 0x2004, 0x6852, 0xa006, 0x68b2, 0x6802, 0x683a, 0x685a,</div><div class='del'>-	0x080c, 0x547a, 0x00de, 0x0005, 0x6700, 0xa786, 0x0000, 0x0158,</div><div class='del'>-	0xa786, 0x0001, 0x0140, 0xa786, 0x000a, 0x0128, 0xa786, 0x0009,</div><div class='del'>-	0x0110, 0xa085, 0x0001, 0x0005, 0x00e6, 0x6018, 0x2070, 0x70a0,</div><div class='del'>-	0xa206, 0x00ee, 0x0005, 0x0016, 0x6004, 0xa08e, 0x001e, 0x11a0,</div><div class='del'>-	0x8007, 0x6130, 0xa18c, 0x00ff, 0xa105, 0x6032, 0x6007, 0x0085,</div><div class='del'>-	0x6003, 0x000b, 0x601f, 0x0005, 0x2001, 0xb8b7, 0x2004, 0x6016,</div><div class='del'>-	0x080c, 0x6cff, 0x080c, 0x71e5, 0x001e, 0x0005, 0xe000, 0xe000,</div><div class='del'>-	0x0005, 0x6020, 0xd0e4, 0x0158, 0xd0cc, 0x0118, 0x080c, 0x9ff1,</div><div class='del'>-	0x0030, 0x080c, 0xb3f6, 0x080c, 0x6b61, 0x080c, 0x86a4, 0x0005,</div><div class='del'>-	0xa280, 0x0007, 0x2004, 0xa084, 0x000f, 0x0002, 0xb21f, 0xb21f,</div><div class='del'>-	0xb21f, 0xb224, 0xb21f, 0xb221, 0xb221, 0xb21f, 0xb221, 0xa006,</div><div class='del'>-	0x0005, 0x00c6, 0x2260, 0x00ce, 0xa085, 0x0001, 0x0005, 0xa280,</div><div class='del'>-	0x0007, 0x2004, 0xa084, 0x000f, 0x0002, 0xb236, 0xb236, 0xb236,</div><div class='del'>-	0xb236, 0xb236, 0xb236, 0xb241, 0xb236, 0xb236, 0x6007, 0x003b,</div><div class='del'>-	0x602b, 0x0009, 0x6013, 0x2a00, 0x6003, 0x0001, 0x080c, 0x6cff,</div><div class='del'>-	0x0005, 0x00c6, 0x2260, 0x080c, 0xb3f6, 0x603f, 0x0000, 0x6020,</div><div class='del'>-	0xc0f4, 0xc0cc, 0x6022, 0x6037, 0x0000, 0x00ce, 0x00d6, 0x2268,</div><div class='del'>-	0xa186, 0x0007, 0x1904, 0xb29c, 0x6810, 0xa005, 0x0138, 0xa080,</div><div class='del'>-	0x0013, 0x2004, 0xd0fc, 0x1110, 0x00de, 0x08c0, 0x6007, 0x003a,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x00c6, 0x2d60,</div><div class='del'>-	0x6100, 0xa186, 0x0002, 0x1904, 0xb325, 0x6010, 0xa005, 0x1138,</div><div class='del'>-	0x6000, 0xa086, 0x0007, 0x190c, 0x151a, 0x0804, 0xb325, 0xa08c,</div><div class='del'>-	0xf000, 0x1130, 0x0028, 0x2068, 0x6800, 0xa005, 0x1de0, 0x2d00,</div><div class='del'>-	0xa080, 0x0013, 0x2004, 0xa084, 0x0003, 0xa086, 0x0002, 0x1180,</div><div class='del'>-	0x6010, 0x2068, 0x684c, 0xc0dc, 0xc0f4, 0x684e, 0x6850, 0xc0f4,</div><div class='del'>-	0xc0fc, 0x6852, 0x2009, 0x0043, 0x080c, 0xac12, 0x0804, 0xb325,</div><div class='del'>-	0x2009, 0x0041, 0x0804, 0xb31f, 0xa186, 0x0005, 0x15f0, 0x6810,</div><div class='del'>-	0xa080, 0x0013, 0x2004, 0xd0bc, 0x1118, 0x00de, 0x0804, 0xb236,</div><div class='del'>-	0xd0b4, 0x0128, 0xd0fc, 0x090c, 0x151a, 0x0804, 0xb254, 0x6007,</div><div class='del'>-	0x003a, 0x6003, 0x0001, 0x080c, 0x6cff, 0x080c, 0x71e5, 0x00c6,</div><div class='del'>-	0x2d60, 0x6100, 0xa186, 0x0002, 0x0120, 0xa186, 0x0004, 0x1904,</div><div class='del'>-	0xb325, 0x2071, 0xb924, 0x7000, 0xa086, 0x0003, 0x1128, 0x7004,</div><div class='del'>-	0xac06, 0x1110, 0x7003, 0x0000, 0x6810, 0xa080, 0x0013, 0x200c,</div><div class='del'>-	0xc1f4, 0xc1dc, 0x2102, 0x8000, 0x200c, 0xc1f4, 0xc1fc, 0xc1bc,</div><div class='del'>-	0x2102, 0x2009, 0x0042, 0x0804, 0xb31f, 0x0036, 0x00d6, 0x00d6,</div><div class='del'>-	0x080c, 0x15fd, 0x003e, 0x090c, 0x151a, 0x6837, 0x010d, 0x6803,</div><div class='del'>-	0x0000, 0x683b, 0x0000, 0x685b, 0x0000, 0x6b5e, 0x6857, 0x0045,</div><div class='del'>-	0x2c00, 0x6862, 0x6034, 0x6872, 0x2360, 0x6020, 0xc0dd, 0x6022,</div><div class='del'>-	0x6018, 0xa080, 0x0028, 0x2004, 0xa084, 0x00ff, 0x8007, 0x6350,</div><div class='del'>-	0x6b4a, 0x6846, 0x684f, 0x0000, 0x6853, 0x0000, 0x6d6a, 0x6e66,</div><div class='del'>-	0x686f, 0x0001, 0x080c, 0x547a, 0x2019, 0x0045, 0x6008, 0x2068,</div><div class='del'>-	0x080c, 0xad9c, 0x2d00, 0x600a, 0x601f, 0x0006, 0x6003, 0x0007,</div><div class='del'>-	0x6017, 0x0000, 0x603f, 0x0000, 0x00de, 0x003e, 0x0038, 0x603f,</div><div class='del'>-	0x0000, 0x6003, 0x0007, 0x080c, 0xac12, 0x00ce, 0x00de, 0x0005,</div><div class='del'>-	0xa186, 0x0013, 0x1128, 0x6004, 0xa082, 0x0085, 0x2008, 0x00c2,</div><div class='del'>-	0xa186, 0x0027, 0x1178, 0x080c, 0x7102, 0x0036, 0x00d6, 0x6010,</div><div class='del'>-	0x2068, 0x2019, 0x0004, 0x080c, 0xb155, 0x00de, 0x003e, 0x080c,</div><div class='del'>-	0x71e5, 0x0005, 0xa186, 0x0014, 0x0d70, 0x080c, 0x86ef, 0x0005,</div><div class='del'>-	0xb351, 0xb34f, 0xb34f, 0xb34f, 0xb34f, 0xb34f, 0xb351, 0x080c,</div><div class='del'>-	0x151a, 0x080c, 0x7102, 0x6003, 0x000c, 0x080c, 0x71e5, 0x0005,</div><div class='del'>-	0xa182, 0x008c, 0x1220, 0xa182, 0x0085, 0x0208, 0x001a, 0x080c,</div><div class='del'>-	0x86ef, 0x0005, 0xb369, 0xb369, 0xb369, 0xb369, 0xb36b, 0xb389,</div><div class='del'>-	0xb369, 0x080c, 0x151a, 0x00d6, 0x2c68, 0x080c, 0x864e, 0x01a0,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x001e, 0x2009, 0xbc8e, 0x210c, 0x6136,</div><div class='del'>-	0x2009, 0xbc8f, 0x210c, 0x613a, 0x600b, 0xffff, 0x6918, 0x611a,</div><div class='del'>-	0x601f, 0x0004, 0x080c, 0x6cff, 0x2d60, 0x080c, 0x86a4, 0x00de,</div><div class='del'>-	0x0005, 0x080c, 0x86a4, 0x0005, 0x00e6, 0x6018, 0x2070, 0x7000,</div><div class='del'>-	0xd0ec, 0x00ee, 0x0005, 0x6010, 0xa08c, 0xf000, 0x0904, 0xb3d7,</div><div class='del'>-	0xa080, 0x0013, 0x200c, 0xd1ec, 0x05d0, 0x2001, 0xb672, 0x2004,</div><div class='del'>-	0xd0ec, 0x05a8, 0x6003, 0x0002, 0x6020, 0xc0e5, 0x6022, 0xd1ac,</div><div class='del'>-	0x0180, 0x00f6, 0x2c78, 0x080c, 0x5373, 0x00fe, 0x0150, 0x2001,</div><div class='del'>-	0xb8b8, 0x2004, 0x603e, 0x2009, 0xb672, 0x210c, 0xd1f4, 0x11e8,</div><div class='del'>-	0x0080, 0x2009, 0xb672, 0x210c, 0xd1f4, 0x0128, 0x6020, 0xc0e4,</div><div class='del'>-	0x6022, 0xa006, 0x00a0, 0x2001, 0xb8b8, 0x200c, 0x8103, 0xa100,</div><div class='del'>-	0x603e, 0x6018, 0xa088, 0x002b, 0x2104, 0xa005, 0x0118, 0xa088,</div><div class='del'>-	0x0003, 0x0cd0, 0x2c0a, 0x600f, 0x0000, 0xa085, 0x0001, 0x0005,</div><div class='del'>-	0x0016, 0x00c6, 0x00e6, 0x6150, 0xa2f0, 0x002b, 0x2e04, 0x2060,</div><div class='del'>-	0x8cff, 0x0180, 0x84ff, 0x1118, 0x6050, 0xa106, 0x1138, 0x600c,</div><div class='del'>-	0x2072, 0x080c, 0x6b61, 0x080c, 0x86a4, 0x0010, 0xacf0, 0x0003,</div><div class='del'>-	0x2e64, 0x0c70, 0x00ee, 0x00ce, 0x001e, 0x0005, 0x00d6, 0x6018,</div><div class='del'>-	0xa0e8, 0x002b, 0x2d04, 0xa005, 0x0140, 0xac06, 0x0120, 0x2d04,</div><div class='del'>-	0xa0e8, 0x0003, 0x0cb8, 0x600c, 0x206a, 0x00de, 0x0005, 0x0026,</div><div class='del'>-	0x0036, 0x0156, 0x2011, 0xb628, 0x2204, 0xa084, 0x00ff, 0x2019,</div><div class='del'>-	0xbc8e, 0x2334, 0xa636, 0x11d8, 0x8318, 0x2334, 0x2204, 0xa084,</div><div class='del'>-	0xff00, 0xa636, 0x11a0, 0x2011, 0xbc90, 0x6018, 0xa098, 0x000a,</div><div class='del'>-	0x20a9, 0x0004, 0x080c, 0x9166, 0x1150, 0x2011, 0xbc94, 0x6018,</div><div class='del'>-	0xa098, 0x0006, 0x20a9, 0x0004, 0x080c, 0x9166, 0x1100, 0x015e,</div><div class='del'>-	0x003e, 0x002e, 0x0005, 0x00e6, 0x2071, 0xb600, 0x080c, 0x4c28,</div><div class='del'>-	0x080c, 0x2aed, 0x00ee, 0x0005, 0x00e6, 0x6018, 0x2070, 0x7000,</div><div class='del'>-	0xd0fc, 0x0108, 0x0011, 0x00ee, 0x0005, 0x6850, 0xc0e5, 0x6852,</div><div class='del'>-	0x0005, 0x00e6, 0x00c6, 0x0076, 0x0066, 0x0056, 0x0046, 0x0026,</div><div class='del'>-	0x0016, 0x0126, 0x2091, 0x8000, 0x2029, 0xb8ea, 0x252c, 0x2021,</div><div class='del'>-	0xb8f0, 0x2424, 0x2061, 0xbe00, 0x2071, 0xb600, 0x7648, 0x7068,</div><div class='del'>-	0xa606, 0x0578, 0x671c, 0xa786, 0x0001, 0x0118, 0xa786, 0x0008,</div><div class='del'>-	0x1500, 0x2500, 0xac06, 0x01e8, 0x2400, 0xac06, 0x01d0, 0x080c,</div><div class='del'>-	0xb1cc, 0x01b8, 0x080c, 0xb1dc, 0x11a0, 0x6000, 0xa086, 0x0004,</div><div class='del'>-	0x1120, 0x0016, 0x080c, 0x1952, 0x001e, 0x080c, 0x9f03, 0x1110,</div><div class='del'>-	0x080c, 0x2cf7, 0x080c, 0x9f14, 0x1110, 0x080c, 0x8ca5, 0x080c,</div><div class='del'>-	0x9ed9, 0xace0, 0x0018, 0x2001, 0xb617, 0x2004, 0xac02, 0x1208,</div><div class='del'>-	0x0858, 0x012e, 0x001e, 0x002e, 0x004e, 0x005e, 0x006e, 0x007e,</div><div class='del'>-	0x00ce, 0x00ee, 0x0005, 0x0126, 0x0006, 0x00e6, 0x0016, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0xb640, 0xd5a4, 0x0118, 0x7034, 0x8000, 0x7036,</div><div class='del'>-	0xd5b4, 0x0118, 0x7030, 0x8000, 0x7032, 0xd5ac, 0x0178, 0x2500,</div><div class='del'>-	0xa084, 0x0007, 0xa08e, 0x0003, 0x0148, 0xa08e, 0x0004, 0x0130,</div><div class='del'>-	0xa08e, 0x0005, 0x0118, 0x2071, 0xb64a, 0x04c9, 0x001e, 0x00ee,</div><div class='del'>-	0x000e, 0x012e, 0x0005, 0x0126, 0x0006, 0x00e6, 0x0016, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0xb640, 0xd5a4, 0x0118, 0x7034, 0x8000, 0x7036,</div><div class='del'>-	0xd5b4, 0x0118, 0x7030, 0x8000, 0x7032, 0xd5ac, 0x0178, 0x2500,</div><div class='del'>-	0xa084, 0x0007, 0xa08e, 0x0003, 0x0148, 0xa08e, 0x0004, 0x0130,</div><div class='del'>-	0xa08e, 0x0005, 0x0118, 0x2071, 0xb64a, 0x0089, 0x001e, 0x00ee,</div><div class='del'>-	0x000e, 0x012e, 0x0005, 0x0126, 0x0006, 0x00e6, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0xb642, 0x0021, 0x00ee, 0x000e, 0x012e, 0x0005, 0x2e04,</div><div class='del'>-	0x8000, 0x2072, 0x1220, 0x8e70, 0x2e04, 0x8000, 0x2072, 0x0005,</div><div class='del'>-	0x00e6, 0x2071, 0xb640, 0x0c99, 0x00ee, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0xb644, 0x0c69, 0x00ee, 0x0005, 0x0126, 0x0006, 0x00e6, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0xb640, 0x7044, 0x8000, 0x7046, 0x00ee, 0x000e,</div><div class='del'>-	0x012e, 0x0005, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020,</div><div class='del'>-	0x0040, 0x0080, 0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000,</div><div class='del'>-	0x4000, 0x8000, 0xdb06</div><div class='del'>-};</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2200tp_length01 = 0xa52b;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_length01 = 0xa52b;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2300.c b/drivers/scsi/qla2xxx/ql2300.c<br/>deleted file mode 100644<br/>index e7a93ddda79a..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2300.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2300.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (C)  2003 Christoph Hellwig.</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include "qla_def.h"</div><div class='del'>-</div><div class='del'>-static char qla_driver_name[] = "qla2300";</div><div class='del'>-</div><div class='del'>-extern unsigned char  fw2300ipx_version[];</div><div class='del'>-extern unsigned char  fw2300ipx_version_str[];</div><div class='del'>-extern unsigned short fw2300ipx_addr01;</div><div class='del'>-extern unsigned short fw2300ipx_code01[];</div><div class='del'>-extern unsigned short fw2300ipx_length01;</div><div class='del'>-</div><div class='del'>-static struct qla_fw_info qla_fw_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_NORMAL,</div><div class='del'>-		.fwcode		= &amp;fw2300ipx_code01[0],</div><div class='del'>-		.fwlen		= &amp;fw2300ipx_length01,</div><div class='del'>-		.fwstart	= &amp;fw2300ipx_addr01,</div><div class='del'>-	},</div><div class='del'>-	{ FW_INFO_ADDR_NOMORE, },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct qla_board_info qla_board_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP2300",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP2312",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP6312",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_device_id qla2300_pci_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2300,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[0],</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2312,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[1],</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP6312,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[2],</div><div class='del'>-	},</div><div class='del'>-	{0, 0},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, qla2300_pci_tbl);</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-qla2300_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return qla2x00_probe_one(pdev,</div><div class='del'>-	    (struct qla_board_info *)id-&gt;driver_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit</div><div class='del'>-qla2300_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	qla2x00_remove_one(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver qla2300_pci_driver = {</div><div class='del'>-	.name		= "qla2300",</div><div class='del'>-	.id_table	= qla2300_pci_tbl,</div><div class='del'>-	.probe		= qla2300_probe_one,</div><div class='del'>-	.remove		= __devexit_p(qla2300_remove_one),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-qla2300_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_module_init(&amp;qla2300_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-qla2300_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;qla2300_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(qla2300_init);</div><div class='del'>-module_exit(qla2300_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("QLogic Corporation");</div><div class='del'>-MODULE_DESCRIPTION("QLogic ISP23xx FC-SCSI Host Bus Adapter driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(QLA2XXX_VERSION);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2300_fw.c b/drivers/scsi/qla2xxx/ql2300_fw.c<br/>deleted file mode 100644<br/>index b8ce7fe5d8de..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2300_fw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2300_fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7746 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Firmware Version 3.03.20 (15:39 Feb 01, 2006)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2300ipx_version = 3*1024+3;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_version = 3*1024+3;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned char fw2300ipx_version_str[] = {3, 3,20};</div><div class='del'>-#else</div><div class='del'>-unsigned char firmware_version[] = {3, 3,20};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-#define fw2300ipx_VERSION_STRING "3.03.20"</div><div class='del'>-#else</div><div class='del'>-#define FW_VERSION_STRING "3.03.20"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2300ipx_addr01 = 0x0800 ;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_addr01 = 0x0800 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2300ipx_code01[] = { </div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code01[] = { </div><div class='del'>-#endif</div><div class='del'>-	0x0470, 0x0000, 0x0000, 0xf091, 0x0000, 0x0003, 0x0003, 0x0014,</div><div class='del'>-	0x0137, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,</div><div class='del'>-	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,</div><div class='del'>-	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3233, 0x3030, 0x2046, 0x6972,</div><div class='del'>-	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,</div><div class='del'>-	0x332e, 0x3033, 0x2e32, 0x3020, 0x2020, 0x2020, 0x2400, 0x20a9,</div><div class='del'>-	0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2200, 0x20a9, 0x000f,</div><div class='del'>-	0x2001, 0x0000, 0x400f, 0x2091, 0x2400, 0x20a9, 0x000f, 0x2001,</div><div class='del'>-	0x0000, 0x400f, 0x2091, 0x2600, 0x20a9, 0x000f, 0x2001, 0x0000,</div><div class='del'>-	0x400f, 0x2091, 0x2800, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f,</div><div class='del'>-	0x2091, 0x2a00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091,</div><div class='del'>-	0x2c00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2e00,</div><div class='del'>-	0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2000, 0x2001,</div><div class='del'>-	0x0000, 0x20c1, 0x0004, 0x20c9, 0x1bff, 0x2059, 0x0000, 0x2b78,</div><div class='del'>-	0x7883, 0x0004, 0x2089, 0x2d93, 0x2051, 0x1800, 0x2a70, 0x20e1,</div><div class='del'>-	0x0001, 0x20e9, 0x0001, 0x2009, 0x0000, 0x080c, 0x0e52, 0x2029,</div><div class='del'>-	0x4d00, 0x2031, 0xffff, 0x2039, 0x4cd0, 0x2021, 0x0200, 0x20e9,</div><div class='del'>-	0x0001, 0x20a1, 0x0000, 0x20a9, 0x0800, 0x900e, 0x4104, 0x20e9,</div><div class='del'>-	0x0001, 0x20a1, 0x1000, 0x900e, 0x2001, 0x0cc0, 0x9084, 0x0fff,</div><div class='del'>-	0x20a8, 0x4104, 0x2001, 0x0000, 0x9086, 0x0000, 0x0120, 0x21a8,</div><div class='del'>-	0x4104, 0x8001, 0x1de0, 0x756e, 0x7672, 0x776a, 0x7476, 0x747a,</div><div class='del'>-	0x00e6, 0x2071, 0x1ad1, 0x2472, 0x00ee, 0x20a1, 0x1cd0, 0x7170,</div><div class='del'>-	0x810d, 0x810d, 0x810d, 0x810d, 0x918c, 0x000f, 0x2001, 0x0001,</div><div class='del'>-	0x9112, 0x900e, 0x21a8, 0x4104, 0x8211, 0x1de0, 0x7170, 0x3400,</div><div class='del'>-	0x8001, 0x9102, 0x0120, 0x0218, 0x20a8, 0x900e, 0x4104, 0x2009,</div><div class='del'>-	0x1800, 0x810d, 0x810d, 0x810d, 0x810d, 0x810d, 0x918c, 0x001f,</div><div class='del'>-	0x2001, 0x0001, 0x9112, 0x20e9, 0x0001, 0x20a1, 0x0800, 0x900e,</div><div class='del'>-	0x20a9, 0x0800, 0x4104, 0x8211, 0x1dd8, 0x080c, 0x0f26, 0x080c,</div><div class='del'>-	0x613c, 0x080c, 0xb269, 0x080c, 0x10dd, 0x080c, 0x12fc, 0x080c,</div><div class='del'>-	0x1bd7, 0x080c, 0x0d57, 0x080c, 0x1062, 0x080c, 0x34b6, 0x080c,</div><div class='del'>-	0x7946, 0x080c, 0x6b7c, 0x080c, 0x8a69, 0x080c, 0x874a, 0x080c,</div><div class='del'>-	0x24b7, 0x080c, 0x93a5, 0x080c, 0x8066, 0x080c, 0x22e8, 0x080c,</div><div class='del'>-	0x241c, 0x080c, 0x24ac, 0x2091, 0x3009, 0x7883, 0x0000, 0x1004,</div><div class='del'>-	0x091f, 0x7880, 0x9086, 0x0002, 0x1190, 0x7883, 0x4000, 0x7837,</div><div class='del'>-	0x4000, 0x7833, 0x0010, 0x0e04, 0x0913, 0x2091, 0x5000, 0x2091,</div><div class='del'>-	0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x2071,</div><div class='del'>-	0x1800, 0x7003, 0x0000, 0x2071, 0x1800, 0x7000, 0x908e, 0x0003,</div><div class='del'>-	0x1178, 0x080c, 0x4d09, 0x080c, 0x34dd, 0x080c, 0x79b7, 0x080c,</div><div class='del'>-	0x7122, 0x080c, 0x8b50, 0x080c, 0x8776, 0x080c, 0x2cdd, 0x0c58,</div><div class='del'>-	0x000b, 0x0c78, 0x0944, 0x0945, 0x0ae0, 0x0942, 0x0ba0, 0x0d56,</div><div class='del'>-	0x0d56, 0x0d56, 0x080c, 0x0dc5, 0x0005, 0x0126, 0x00f6, 0x2091,</div><div class='del'>-	0x8000, 0x7000, 0x9086, 0x0001, 0x1904, 0x0ab3, 0x080c, 0x0e94,</div><div class='del'>-	0x080c, 0x7637, 0x0150, 0x080c, 0x765a, 0x15a0, 0x2079, 0x0100,</div><div class='del'>-	0x7828, 0x9085, 0x1800, 0x782a, 0x0468, 0x080c, 0x7563, 0x7000,</div><div class='del'>-	0x9086, 0x0001, 0x1904, 0x0ab3, 0x7098, 0x9086, 0x0029, 0x1904,</div><div class='del'>-	0x0ab3, 0x080c, 0x8733, 0x080c, 0x8725, 0x2001, 0x0161, 0x2003,</div><div class='del'>-	0x0001, 0x2079, 0x0100, 0x7827, 0xffff, 0x7a28, 0x9295, 0x5e2f,</div><div class='del'>-	0x7a2a, 0x2011, 0x74b2, 0x080c, 0x883d, 0x2011, 0x74a5, 0x080c,</div><div class='del'>-	0x8917, 0x2011, 0x5f97, 0x080c, 0x883d, 0x2011, 0x8030, 0x901e,</div><div class='del'>-	0x7396, 0x04d0, 0x080c, 0x583f, 0x2079, 0x0100, 0x7844, 0x9005,</div><div class='del'>-	0x1904, 0x0ab3, 0x2011, 0x5f97, 0x080c, 0x883d, 0x2011, 0x74b2,</div><div class='del'>-	0x080c, 0x883d, 0x2011, 0x74a5, 0x080c, 0x8917, 0x2001, 0x0265,</div><div class='del'>-	0x2001, 0x0205, 0x2003, 0x0000, 0x7840, 0x9084, 0xfffb, 0x7842,</div><div class='del'>-	0x2001, 0x19a7, 0x2004, 0x9005, 0x1140, 0x00c6, 0x2061, 0x0100,</div><div class='del'>-	0x080c, 0x60e4, 0x00ce, 0x0804, 0x0ab3, 0x780f, 0x006b, 0x7a28,</div><div class='del'>-	0x080c, 0x763f, 0x0118, 0x9295, 0x5e2f, 0x0010, 0x9295, 0x402f,</div><div class='del'>-	0x7a2a, 0x2011, 0x8010, 0x73d8, 0x2001, 0x19a8, 0x2003, 0x0001,</div><div class='del'>-	0x080c, 0x2b82, 0x080c, 0x4c44, 0x7248, 0xc284, 0x724a, 0x2001,</div><div class='del'>-	0x180c, 0x200c, 0xc1ac, 0xc1cc, 0x2102, 0x080c, 0xa9b0, 0x2011,</div><div class='del'>-	0x0004, 0x080c, 0xd0e8, 0x080c, 0x6947, 0x080c, 0x7637, 0x1120,</div><div class='del'>-	0x080c, 0x2bc6, 0x02e0, 0x0400, 0x080c, 0x60eb, 0x0140, 0x7097,</div><div class='del'>-	0x0001, 0x70d3, 0x0000, 0x080c, 0x5a11, 0x0804, 0x0ab3, 0x080c,</div><div class='del'>-	0x57d5, 0xd094, 0x0188, 0x2011, 0x180c, 0x2204, 0xc0cd, 0x2012,</div><div class='del'>-	0x080c, 0x57d9, 0xd0d4, 0x1118, 0x080c, 0x2bc6, 0x1270, 0x2011,</div><div class='del'>-	0x180c, 0x2204, 0xc0bc, 0x00a8, 0x080c, 0x57d9, 0xd0d4, 0x1db8,</div><div class='del'>-	0x2011, 0x180c, 0x2204, 0xc0bd, 0x0060, 0x2011, 0x180c, 0x2204,</div><div class='del'>-	0xc0bd, 0x2012, 0x080c, 0x6a9b, 0x1128, 0xd0a4, 0x0118, 0x2204,</div><div class='del'>-	0xc0fd, 0x2012, 0x080c, 0x6a61, 0x0120, 0x7a0c, 0xc2b4, 0x7a0e,</div><div class='del'>-	0x00a8, 0x707f, 0x0000, 0x080c, 0x7637, 0x1130, 0x70b0, 0x9005,</div><div class='del'>-	0x1168, 0x080c, 0xd52b, 0x0050, 0x080c, 0xd52b, 0x70dc, 0xd09c,</div><div class='del'>-	0x1128, 0x70b0, 0x9005, 0x0110, 0x080c, 0x60c1, 0x70e7, 0x0000,</div><div class='del'>-	0x70e3, 0x0000, 0x70a7, 0x0000, 0x080c, 0x2bce, 0x0228, 0x2011,</div><div class='del'>-	0x0101, 0x2204, 0xc0c4, 0x2012, 0x72dc, 0x080c, 0x7637, 0x1178,</div><div class='del'>-	0x9016, 0x0016, 0x080c, 0x298b, 0x2019, 0x196d, 0x211a, 0x001e,</div><div class='del'>-	0x705f, 0xffff, 0x7063, 0x00ef, 0x7083, 0x0000, 0x0020, 0x2019,</div><div class='del'>-	0x196d, 0x201b, 0x0000, 0x2079, 0x1847, 0x7804, 0xd0ac, 0x0108,</div><div class='del'>-	0xc295, 0x72de, 0x080c, 0x7637, 0x0118, 0x9296, 0x0004, 0x0548,</div><div class='del'>-	0x2011, 0x0001, 0x080c, 0xd0e8, 0x70ab, 0x0000, 0x70af, 0xffff,</div><div class='del'>-	0x7003, 0x0002, 0x2079, 0x0100, 0x7827, 0x0003, 0x7828, 0x9085,</div><div class='del'>-	0x0003, 0x782a, 0x00fe, 0x080c, 0x3000, 0x2011, 0x0005, 0x080c,</div><div class='del'>-	0xaabf, 0x080c, 0x9ab1, 0x080c, 0x7637, 0x0148, 0x00c6, 0x2061,</div><div class='del'>-	0x0100, 0x0016, 0x080c, 0x298b, 0x61e2, 0x001e, 0x00ce, 0x012e,</div><div class='del'>-	0x0420, 0x70ab, 0x0000, 0x70af, 0xffff, 0x7003, 0x0002, 0x00f6,</div><div class='del'>-	0x2079, 0x0100, 0x7827, 0x0003, 0x7828, 0x9085, 0x0003, 0x782a,</div><div class='del'>-	0x00fe, 0x2011, 0x0005, 0x080c, 0xaabf, 0x080c, 0x9ab1, 0x080c,</div><div class='del'>-	0x7637, 0x0148, 0x00c6, 0x2061, 0x0100, 0x0016, 0x080c, 0x298b,</div><div class='del'>-	0x61e2, 0x001e, 0x00ce, 0x00fe, 0x012e, 0x0005, 0x00c6, 0x00b6,</div><div class='del'>-	0x080c, 0x7637, 0x1118, 0x20a9, 0x0800, 0x0010, 0x20a9, 0x0782,</div><div class='del'>-	0x080c, 0x7637, 0x1110, 0x900e, 0x0010, 0x2009, 0x007e, 0x86ff,</div><div class='del'>-	0x0138, 0x9180, 0x1000, 0x2004, 0x905d, 0x0110, 0xb800, 0xd0bc,</div><div class='del'>-	0x090c, 0x334c, 0x8108, 0x1f04, 0x0ac7, 0x707f, 0x0000, 0x7080,</div><div class='del'>-	0x9084, 0x00ff, 0x7082, 0x70b3, 0x0000, 0x00be, 0x00ce, 0x0005,</div><div class='del'>-	0x00b6, 0x0126, 0x2091, 0x8000, 0x7000, 0x9086, 0x0002, 0x1904,</div><div class='del'>-	0x0b9d, 0x70ac, 0x9086, 0xffff, 0x0130, 0x080c, 0x3000, 0x080c,</div><div class='del'>-	0x9ab1, 0x0804, 0x0b9d, 0x70dc, 0xd0ac, 0x1110, 0xd09c, 0x0558,</div><div class='del'>-	0xd084, 0x0548, 0x0006, 0x2001, 0x0103, 0x2003, 0x002b, 0x000e,</div><div class='del'>-	0xd08c, 0x0508, 0x080c, 0x33af, 0x11d0, 0x70e0, 0x9086, 0xffff,</div><div class='del'>-	0x01b0, 0x080c, 0x31bc, 0x080c, 0x9ab1, 0x70dc, 0xd094, 0x1904,</div><div class='del'>-	0x0b9d, 0x2011, 0x0001, 0x080c, 0xd7e3, 0x0110, 0x2011, 0x0003,</div><div class='del'>-	0x901e, 0x080c, 0x31f6, 0x080c, 0x9ab1, 0x0804, 0x0b9d, 0x70e4,</div><div class='del'>-	0x9005, 0x1904, 0x0b9d, 0x70a8, 0x9005, 0x1904, 0x0b9d, 0x70dc,</div><div class='del'>-	0xd0a4, 0x0118, 0xd0b4, 0x0904, 0x0b9d, 0x080c, 0x6a61, 0x1904,</div><div class='del'>-	0x0b9d, 0x080c, 0x6ab4, 0x1904, 0x0b9d, 0x080c, 0x6a9b, 0x01c0,</div><div class='del'>-	0x0156, 0x00c6, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x6724,</div><div class='del'>-	0x1118, 0xb800, 0xd0ec, 0x1138, 0x001e, 0x8108, 0x1f04, 0x0b3d,</div><div class='del'>-	0x00ce, 0x015e, 0x0028, 0x001e, 0x00ce, 0x015e, 0x0804, 0x0b9d,</div><div class='del'>-	0x0006, 0x2001, 0x0103, 0x2003, 0x002b, 0x000e, 0x2011, 0x19b4,</div><div class='del'>-	0x080c, 0x0f96, 0x2011, 0x19ce, 0x080c, 0x0f96, 0x7030, 0xc08c,</div><div class='del'>-	0x7032, 0x7003, 0x0003, 0x70af, 0xffff, 0x080c, 0x0e76, 0x9006,</div><div class='del'>-	0x080c, 0x281c, 0x080c, 0x33af, 0x0118, 0x080c, 0x4de1, 0x0050,</div><div class='del'>-	0x0036, 0x0046, 0x2019, 0xffff, 0x2021, 0x0006, 0x080c, 0x4dfb,</div><div class='del'>-	0x004e, 0x003e, 0x00f6, 0x2079, 0x0100, 0x080c, 0x765a, 0x0150,</div><div class='del'>-	0x080c, 0x7637, 0x7828, 0x0118, 0x9084, 0xe1ff, 0x0010, 0x9084,</div><div class='del'>-	0xffdf, 0x782a, 0x00fe, 0x2001, 0x19e9, 0x2004, 0x9086, 0x0005,</div><div class='del'>-	0x1120, 0x2011, 0x0000, 0x080c, 0xaabf, 0x2011, 0x0000, 0x080c,</div><div class='del'>-	0xaac9, 0x080c, 0x9ab1, 0x080c, 0x9bd3, 0x012e, 0x00be, 0x0005,</div><div class='del'>-	0x0016, 0x0046, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2079, 0x0100,</div><div class='del'>-	0x7904, 0x918c, 0xfffd, 0x7906, 0x2009, 0x00f7, 0x080c, 0x60aa,</div><div class='del'>-	0x7940, 0x918c, 0x0010, 0x7942, 0x7924, 0xd1b4, 0x0110, 0x7827,</div><div class='del'>-	0x0040, 0xd19c, 0x0110, 0x7827, 0x0008, 0x0006, 0x0036, 0x0156,</div><div class='del'>-	0x7954, 0xd1ac, 0x1904, 0x0c2d, 0x2001, 0x19a8, 0x2004, 0x9005,</div><div class='del'>-	0x1518, 0x080c, 0x2c49, 0x1148, 0x2001, 0x0001, 0x080c, 0x2bb1,</div><div class='del'>-	0x2001, 0x0001, 0x080c, 0x2b94, 0x00b8, 0x080c, 0x2c51, 0x1138,</div><div class='del'>-	0x9006, 0x080c, 0x2bb1, 0x9006, 0x080c, 0x2b94, 0x0068, 0x080c,</div><div class='del'>-	0x2c59, 0x1d50, 0x2001, 0x1998, 0x2004, 0xd0fc, 0x0108, 0x0020,</div><div class='del'>-	0x080c, 0x29bf, 0x0804, 0x0d0d, 0x080c, 0x7648, 0x0148, 0x080c,</div><div class='del'>-	0x765a, 0x1118, 0x080c, 0x7941, 0x0050, 0x080c, 0x763f, 0x0dd0,</div><div class='del'>-	0x080c, 0x793c, 0x080c, 0x7932, 0x080c, 0x7563, 0x0058, 0x080c,</div><div class='del'>-	0x7637, 0x0140, 0x2009, 0x00f8, 0x080c, 0x60aa, 0x7843, 0x0090,</div><div class='del'>-	0x7843, 0x0010, 0x20a9, 0x09c4, 0x7820, 0xd09c, 0x1138, 0x080c,</div><div class='del'>-	0x7637, 0x0138, 0x7824, 0xd0ac, 0x1904, 0x0d12, 0x1f04, 0x0c0c,</div><div class='del'>-	0x0070, 0x7824, 0x080c, 0x7651, 0x0118, 0xd0ac, 0x1904, 0x0d12,</div><div class='del'>-	0x9084, 0x1800, 0x0d98, 0x7003, 0x0001, 0x0804, 0x0d12, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0x281c, 0x0804, 0x0d25, 0x2001, 0x19a8, 0x2004,</div><div class='del'>-	0x9005, 0x1518, 0x080c, 0x2c49, 0x1148, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x2bb1, 0x2001, 0x0001, 0x080c, 0x2b94, 0x00b8, 0x080c, 0x2c51,</div><div class='del'>-	0x1138, 0x9006, 0x080c, 0x2bb1, 0x9006, 0x080c, 0x2b94, 0x0068,</div><div class='del'>-	0x080c, 0x2c59, 0x1d50, 0x2001, 0x1998, 0x2004, 0xd0fc, 0x0108,</div><div class='del'>-	0x0020, 0x080c, 0x29bf, 0x0804, 0x0d0d, 0x7850, 0x9085, 0x0040,</div><div class='del'>-	0x7852, 0x7938, 0x7850, 0x9084, 0xfbcf, 0x7852, 0x080c, 0x2c61,</div><div class='del'>-	0x9085, 0x2000, 0x7852, 0x793a, 0x20a9, 0x0046, 0x1d04, 0x0c66,</div><div class='del'>-	0x080c, 0x88f7, 0x1f04, 0x0c66, 0x7850, 0x9085, 0x0400, 0x9084,</div><div class='del'>-	0xdfbf, 0x7852, 0x793a, 0x080c, 0x7648, 0x0148, 0x080c, 0x765a,</div><div class='del'>-	0x1118, 0x080c, 0x7941, 0x0050, 0x080c, 0x763f, 0x0dd0, 0x080c,</div><div class='del'>-	0x793c, 0x080c, 0x7932, 0x080c, 0x7563, 0x0020, 0x2009, 0x00f8,</div><div class='del'>-	0x080c, 0x60aa, 0x20a9, 0x0028, 0xa001, 0x1f04, 0x0c8c, 0x7850,</div><div class='del'>-	0x9085, 0x1400, 0x7852, 0x080c, 0x7637, 0x0120, 0x7843, 0x0090,</div><div class='del'>-	0x7843, 0x0010, 0x2021, 0xe678, 0x2019, 0xea60, 0x0d0c, 0x88f7,</div><div class='del'>-	0x7820, 0xd09c, 0x1588, 0x080c, 0x7637, 0x0904, 0x0cf2, 0x7824,</div><div class='del'>-	0xd0ac, 0x1904, 0x0d12, 0x080c, 0x765a, 0x1530, 0x0046, 0x2021,</div><div class='del'>-	0x0320, 0x8421, 0x1df0, 0x004e, 0x7827, 0x1800, 0x080c, 0x2c61,</div><div class='del'>-	0x7824, 0x9084, 0x1800, 0x1168, 0x9484, 0x0fff, 0x1140, 0x2001,</div><div class='del'>-	0x1810, 0x2004, 0x9084, 0x9000, 0x0110, 0x080c, 0x0d33, 0x8421,</div><div class='del'>-	0x1158, 0x1d04, 0x0ccd, 0x080c, 0x88f7, 0x080c, 0x793c, 0x080c,</div><div class='del'>-	0x7932, 0x7003, 0x0001, 0x04f0, 0x8319, 0x1940, 0x1d04, 0x0cda,</div><div class='del'>-	0x080c, 0x88f7, 0x2009, 0x199b, 0x2104, 0x9005, 0x0118, 0x8001,</div><div class='del'>-	0x200a, 0x1178, 0x200b, 0x000a, 0x7827, 0x0048, 0x20a9, 0x0002,</div><div class='del'>-	0x080c, 0x2c42, 0x7924, 0x080c, 0x2c61, 0xd19c, 0x0110, 0x080c,</div><div class='del'>-	0x2b82, 0x00d8, 0x080c, 0x7648, 0x1140, 0x94a2, 0x03e8, 0x1128,</div><div class='del'>-	0x080c, 0x760f, 0x7003, 0x0001, 0x00a8, 0x7827, 0x1800, 0x080c,</div><div class='del'>-	0x2c61, 0x7824, 0x080c, 0x7651, 0x0110, 0xd0ac, 0x1158, 0x9084,</div><div class='del'>-	0x1800, 0x0950, 0x7003, 0x0001, 0x0028, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x281c, 0x0078, 0x2009, 0x180c, 0x210c, 0xd19c, 0x1120, 0x7904,</div><div class='del'>-	0x918d, 0x0002, 0x7906, 0x7827, 0x0048, 0x7828, 0x9085, 0x0028,</div><div class='del'>-	0x782a, 0x7850, 0x9085, 0x0400, 0x7852, 0x2001, 0x19a8, 0x2003,</div><div class='del'>-	0x0000, 0x9006, 0x78f2, 0x015e, 0x003e, 0x000e, 0x012e, 0x00fe,</div><div class='del'>-	0x004e, 0x001e, 0x0005, 0x0006, 0x0016, 0x0036, 0x0046, 0x00b6,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x0156, 0x0069, 0x0d0c, 0x88f7,</div><div class='del'>-	0x015e, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x004e, 0x003e,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x00e6, 0x2071, 0x189e, 0x7004, 0x9086,</div><div class='del'>-	0x0001, 0x1110, 0x080c, 0x34dd, 0x00ee, 0x0005, 0x0005, 0x2a70,</div><div class='del'>-	0x2061, 0x19ac, 0x2063, 0x0003, 0x6007, 0x0003, 0x600b, 0x0014,</div><div class='del'>-	0x600f, 0x0137, 0x2001, 0x197c, 0x900e, 0x2102, 0x7196, 0x2001,</div><div class='del'>-	0x0100, 0x2004, 0x9082, 0x0002, 0x0218, 0x705f, 0xffff, 0x0008,</div><div class='del'>-	0x715e, 0x7067, 0xffff, 0x717e, 0x7182, 0x080c, 0xd52b, 0x70eb,</div><div class='del'>-	0x00c0, 0x2061, 0x196c, 0x6003, 0x0909, 0x6106, 0x600b, 0x8800,</div><div class='del'>-	0x600f, 0x0200, 0x6013, 0x00ff, 0x6017, 0x001f, 0x611a, 0x601f,</div><div class='del'>-	0x07d0, 0x2061, 0x1974, 0x6003, 0x8000, 0x6106, 0x610a, 0x600f,</div><div class='del'>-	0x0200, 0x6013, 0x00ff, 0x6116, 0x601b, 0x0001, 0x611e, 0x2061,</div><div class='del'>-	0x1989, 0x6003, 0x514c, 0x6007, 0x4f47, 0x600b, 0x4943, 0x600f,</div><div class='del'>-	0x2020, 0x2001, 0x182c, 0x2102, 0x0005, 0x9016, 0x080c, 0x6724,</div><div class='del'>-	0x1178, 0xb804, 0x90c4, 0x00ff, 0x98c6, 0x0006, 0x0128, 0x90c4,</div><div class='del'>-	0xff00, 0x98c6, 0x0600, 0x1120, 0x9186, 0x0080, 0x0108, 0x8210,</div><div class='del'>-	0x8108, 0x9186, 0x0800, 0x1d50, 0x2208, 0x0005, 0x2091, 0x8000,</div><div class='del'>-	0x2079, 0x0000, 0x000e, 0x00f6, 0x0010, 0x2091, 0x8000, 0x0e04,</div><div class='del'>-	0x0dc7, 0x0006, 0x0016, 0x2001, 0x8002, 0x0006, 0x2079, 0x0000,</div><div class='del'>-	0x000e, 0x7882, 0x7836, 0x001e, 0x798e, 0x000e, 0x788a, 0x000e,</div><div class='del'>-	0x7886, 0x3900, 0x789a, 0x00d6, 0x2069, 0x0300, 0x6818, 0x78ae,</div><div class='del'>-	0x681c, 0x78b2, 0x2001, 0x1a09, 0x2004, 0x78b6, 0x2001, 0x1a86,</div><div class='del'>-	0x2004, 0x78ba, 0x6808, 0x78be, 0x00de, 0x7833, 0x0012, 0x2091,</div><div class='del'>-	0x5000, 0x0156, 0x00d6, 0x0036, 0x0026, 0x2079, 0x0300, 0x2069,</div><div class='del'>-	0x1aa9, 0x7a08, 0x226a, 0x2069, 0x1aaa, 0x7a18, 0x226a, 0x8d68,</div><div class='del'>-	0x7a1c, 0x226a, 0x782c, 0x2019, 0x1ab7, 0x201a, 0x2019, 0x1aba,</div><div class='del'>-	0x9016, 0x7808, 0xd09c, 0x0168, 0x7820, 0x201a, 0x8210, 0x8318,</div><div class='del'>-	0x9386, 0x1acf, 0x0108, 0x0ca8, 0x7808, 0xd09c, 0x0110, 0x2011,</div><div class='del'>-	0xdead, 0x2019, 0x1ab8, 0x782c, 0x201a, 0x8318, 0x221a, 0x7803,</div><div class='del'>-	0x0000, 0x2069, 0x1a89, 0x901e, 0x20a9, 0x0020, 0x7b26, 0x7a28,</div><div class='del'>-	0x226a, 0x8d68, 0x8318, 0x1f04, 0x0e26, 0x002e, 0x003e, 0x00de,</div><div class='del'>-	0x015e, 0x2079, 0x1800, 0x7803, 0x0005, 0x2091, 0x4080, 0x2001,</div><div class='del'>-	0x0089, 0x2004, 0xd084, 0x0180, 0x2001, 0x1a1c, 0x2004, 0x9005,</div><div class='del'>-	0x0128, 0x2001, 0x008b, 0x2004, 0xd0fc, 0x0dd8, 0x2001, 0x008a,</div><div class='del'>-	0x2003, 0x0002, 0x2003, 0x1001, 0x080c, 0x57e4, 0x1108, 0x0099,</div><div class='del'>-	0x0cd8, 0x0005, 0x918c, 0x03ff, 0x2001, 0x0003, 0x2004, 0x9084,</div><div class='del'>-	0x0600, 0x1118, 0x918d, 0x2800, 0x0010, 0x918d, 0x2000, 0x2001,</div><div class='del'>-	0x017f, 0x2102, 0x0005, 0x0026, 0x0126, 0x2011, 0x0080, 0x080c,</div><div class='del'>-	0x0eee, 0x20a9, 0x0900, 0x080c, 0x0f0f, 0x2011, 0x0040, 0x080c,</div><div class='del'>-	0x0eee, 0x20a9, 0x0900, 0x080c, 0x0f0f, 0x0c78, 0x0026, 0x080c,</div><div class='del'>-	0x0efb, 0x1118, 0x2011, 0x0040, 0x0098, 0x2011, 0x010e, 0x2214,</div><div class='del'>-	0x9294, 0x0007, 0x9296, 0x0007, 0x0118, 0x2011, 0xa880, 0x0010,</div><div class='del'>-	0x2011, 0x6840, 0xd0e4, 0x70ef, 0x0000, 0x1120, 0x70ef, 0x0fa0,</div><div class='del'>-	0x080c, 0x0f00, 0x002e, 0x0005, 0x0026, 0x080c, 0x0efb, 0x0128,</div><div class='del'>-	0xd0a4, 0x1138, 0x2011, 0xcdd5, 0x0010, 0x2011, 0x0080, 0x080c,</div><div class='del'>-	0x0f00, 0x002e, 0x0005, 0x0026, 0x70ef, 0x0000, 0x080c, 0x0efb,</div><div class='del'>-	0x1148, 0x080c, 0x2c59, 0x1118, 0x2011, 0x8484, 0x0058, 0x2011,</div><div class='del'>-	0x8282, 0x0040, 0x080c, 0x2c59, 0x1118, 0x2011, 0xcdc5, 0x0010,</div><div class='del'>-	0x2011, 0xcac2, 0x080c, 0x0f00, 0x002e, 0x0005, 0x00e6, 0x0006,</div><div class='del'>-	0x2071, 0x1800, 0xd0b4, 0x70e8, 0x1110, 0xc0e4, 0x0048, 0x0006,</div><div class='del'>-	0x3b00, 0x9084, 0xff3f, 0x20d8, 0x000e, 0x70ef, 0x0000, 0xc0e5,</div><div class='del'>-	0x0079, 0x000e, 0x00ee, 0x0005, 0x00e6, 0x2071, 0x1800, 0xd0e4,</div><div class='del'>-	0x70e8, 0x1110, 0xc0dc, 0x0008, 0xc0dd, 0x0011, 0x00ee, 0x0005,</div><div class='del'>-	0x70ea, 0x7000, 0x9084, 0x0007, 0x000b, 0x0005, 0x0ebd, 0x0e94,</div><div class='del'>-	0x0e94, 0x0e76, 0x0ea3, 0x0e94, 0x0e94, 0x0ea3, 0x0016, 0x3b08,</div><div class='del'>-	0x3a00, 0x9104, 0x918d, 0x00c0, 0x21d8, 0x9084, 0xff3f, 0x9205,</div><div class='del'>-	0x20d0, 0x001e, 0x0005, 0x2001, 0x183a, 0x2004, 0xd0dc, 0x0005,</div><div class='del'>-	0x9e86, 0x1800, 0x190c, 0x0dc5, 0x70e8, 0xd0e4, 0x0108, 0xc2e5,</div><div class='del'>-	0x72ea, 0xd0e4, 0x1118, 0x9294, 0x00c0, 0x0c01, 0x0005, 0x1d04,</div><div class='del'>-	0x0f0f, 0x2091, 0x6000, 0x1f04, 0x0f0f, 0x0005, 0x890e, 0x810e,</div><div class='del'>-	0x810f, 0x9194, 0x003f, 0x918c, 0xffc0, 0x0005, 0x0006, 0x2200,</div><div class='del'>-	0x914d, 0x894f, 0x894d, 0x894d, 0x000e, 0x0005, 0x01d6, 0x0146,</div><div class='del'>-	0x0036, 0x0096, 0x2061, 0x188d, 0x600b, 0x0000, 0x600f, 0x0000,</div><div class='del'>-	0x6003, 0x0000, 0x6007, 0x0000, 0x2009, 0xffc0, 0x2105, 0x0006,</div><div class='del'>-	0x2001, 0xaaaa, 0x200f, 0x2019, 0x5555, 0x9016, 0x2049, 0x0bff,</div><div class='del'>-	0xab02, 0xa001, 0xa001, 0xa800, 0x9306, 0x1138, 0x2105, 0x9306,</div><div class='del'>-	0x0120, 0x8210, 0x99c8, 0x0400, 0x0c98, 0x000e, 0x200f, 0x2001,</div><div class='del'>-	0x189d, 0x928a, 0x000e, 0x1638, 0x928a, 0x0006, 0x2011, 0x0006,</div><div class='del'>-	0x1210, 0x2011, 0x0000, 0x2202, 0x9006, 0x2008, 0x82ff, 0x01b0,</div><div class='del'>-	0x8200, 0x600a, 0x600f, 0xffff, 0x6003, 0x0002, 0x6007, 0x0000,</div><div class='del'>-	0x0026, 0x2019, 0x0010, 0x9280, 0x0001, 0x20e8, 0x21a0, 0x21a8,</div><div class='del'>-	0x4104, 0x8319, 0x1de0, 0x8211, 0x1da0, 0x002e, 0x009e, 0x003e,</div><div class='del'>-	0x014e, 0x01de, 0x0005, 0x2011, 0x000e, 0x08e8, 0x0016, 0x0026,</div><div class='del'>-	0x0096, 0x3348, 0x080c, 0x0f16, 0x2100, 0x9300, 0x2098, 0x22e0,</div><div class='del'>-	0x009e, 0x002e, 0x001e, 0x0036, 0x3518, 0x20a9, 0x0001, 0x4002,</div><div class='del'>-	0x8007, 0x4004, 0x8319, 0x1dd8, 0x003e, 0x0005, 0x20e9, 0x0001,</div><div class='del'>-	0x71b8, 0x81ff, 0x11c0, 0x9006, 0x2009, 0x0200, 0x20a9, 0x0002,</div><div class='del'>-	0x9298, 0x0018, 0x23a0, 0x4001, 0x2009, 0x0700, 0x20a9, 0x0002,</div><div class='del'>-	0x9298, 0x0008, 0x23a0, 0x4001, 0x707c, 0x8007, 0x7180, 0x810f,</div><div class='del'>-	0x20a9, 0x0002, 0x4001, 0x9298, 0x000c, 0x23a0, 0x900e, 0x080c,</div><div class='del'>-	0x0da5, 0x2001, 0x0000, 0x810f, 0x20a9, 0x0002, 0x4001, 0x0005,</div><div class='del'>-	0x89ff, 0x0140, 0xa804, 0xa807, 0x0000, 0x0006, 0x080c, 0x1040,</div><div class='del'>-	0x009e, 0x0cb0, 0x0005, 0x00e6, 0x2071, 0x1800, 0x080c, 0x10b9,</div><div class='del'>-	0x090c, 0x0dc5, 0x00ee, 0x0005, 0x0086, 0x00e6, 0x0006, 0x0026,</div><div class='del'>-	0x0036, 0x0126, 0x2091, 0x8000, 0x00c9, 0x2071, 0x1800, 0x73c0,</div><div class='del'>-	0x702c, 0x9016, 0x9045, 0x0158, 0x8210, 0x9906, 0x090c, 0x0dc5,</div><div class='del'>-	0x2300, 0x9202, 0x0120, 0x1a0c, 0x0dc5, 0xa000, 0x0c98, 0x012e,</div><div class='del'>-	0x003e, 0x002e, 0x000e, 0x00ee, 0x008e, 0x0005, 0x0086, 0x00e6,</div><div class='del'>-	0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x1910, 0x7010, 0x9005,</div><div class='del'>-	0x0140, 0x7018, 0x9045, 0x0128, 0x9906, 0x090c, 0x0dc5, 0xa000,</div><div class='del'>-	0x0cc8, 0x012e, 0x000e, 0x00ee, 0x008e, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x1800, 0x0126, 0x2091, 0x8000, 0x70c0, 0x8001, 0x0270, 0x70c2,</div><div class='del'>-	0x702c, 0x2048, 0x9085, 0x0001, 0xa800, 0x702e, 0xa803, 0x0000,</div><div class='del'>-	0xa807, 0x0000, 0x012e, 0x00ee, 0x0005, 0x904e, 0x0cd8, 0x00e6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2071, 0x1800, 0x70c0, 0x90ca, 0x0020,</div><div class='del'>-	0x0268, 0x8001, 0x70c2, 0x702c, 0x2048, 0xa800, 0x702e, 0xa803,</div><div class='del'>-	0x0000, 0xa807, 0x0000, 0x012e, 0x00ee, 0x0005, 0x904e, 0x0cd8,</div><div class='del'>-	0x00e6, 0x0126, 0x2091, 0x8000, 0x0016, 0x890e, 0x810e, 0x810f,</div><div class='del'>-	0x9184, 0x003f, 0xa862, 0x9184, 0xffc0, 0xa85e, 0x001e, 0x0020,</div><div class='del'>-	0x00e6, 0x0126, 0x2091, 0x8000, 0x2071, 0x1800, 0x702c, 0xa802,</div><div class='del'>-	0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725, 0x012e,</div><div class='del'>-	0x00ee, 0x0005, 0x2071, 0x1800, 0x9026, 0x2009, 0x0000, 0x2049,</div><div class='del'>-	0x0400, 0x2900, 0x702e, 0x8940, 0x2800, 0xa802, 0xa95e, 0xa863,</div><div class='del'>-	0x0001, 0x8420, 0x9886, 0x0440, 0x0120, 0x2848, 0x9188, 0x0040,</div><div class='del'>-	0x0c90, 0x2071, 0x188d, 0x7000, 0x9005, 0x11a0, 0x2001, 0x0534,</div><div class='del'>-	0xa802, 0x2048, 0x2009, 0x4d00, 0x8940, 0x2800, 0xa802, 0xa95e,</div><div class='del'>-	0xa863, 0x0001, 0x8420, 0x9886, 0x0800, 0x0120, 0x2848, 0x9188,</div><div class='del'>-	0x0040, 0x0c90, 0x2071, 0x188d, 0x7104, 0x7200, 0x82ff, 0x01d0,</div><div class='del'>-	0x7308, 0x8318, 0x831f, 0x831b, 0x831b, 0x7312, 0x8319, 0x2001,</div><div class='del'>-	0x0800, 0xa802, 0x2048, 0x8900, 0xa802, 0x2040, 0xa95e, 0xaa62,</div><div class='del'>-	0x8420, 0x2300, 0x9906, 0x0130, 0x2848, 0x9188, 0x0040, 0x9291,</div><div class='del'>-	0x0000, 0x0c88, 0xa803, 0x0000, 0x2071, 0x1800, 0x74be, 0x74c2,</div><div class='del'>-	0x0005, 0x00e6, 0x0016, 0x9984, 0xfc00, 0x01e8, 0x908c, 0xf800,</div><div class='del'>-	0x1168, 0x9982, 0x0400, 0x02b8, 0x9982, 0x0440, 0x0278, 0x9982,</div><div class='del'>-	0x0534, 0x0288, 0x9982, 0x0800, 0x1270, 0x0040, 0x9982, 0x0800,</div><div class='del'>-	0x0250, 0x2071, 0x188d, 0x7010, 0x9902, 0x1228, 0x9085, 0x0001,</div><div class='del'>-	0x001e, 0x00ee, 0x0005, 0x9006, 0x0cd8, 0x00e6, 0x2071, 0x1a1b,</div><div class='del'>-	0x7007, 0x0000, 0x9006, 0x701e, 0x7022, 0x7002, 0x2071, 0x0000,</div><div class='del'>-	0x7010, 0x9085, 0x8044, 0x7012, 0x2071, 0x0080, 0x9006, 0x20a9,</div><div class='del'>-	0x0040, 0x7022, 0x1f04, 0x10f1, 0x702b, 0x0020, 0x00ee, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x00e6, 0xa06f, 0x0000, 0x2071, 0x1a1b,</div><div class='del'>-	0x701c, 0x9088, 0x1a25, 0x280a, 0x8000, 0x9084, 0x003f, 0x701e,</div><div class='del'>-	0x7120, 0x9106, 0x090c, 0x0dc5, 0x7004, 0x9005, 0x1128, 0x00f6,</div><div class='del'>-	0x2079, 0x0080, 0x00a9, 0x00fe, 0x00ee, 0x012e, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x00e6, 0x2071, 0x1a1b, 0x7004, 0x9005, 0x1128,</div><div class='del'>-	0x00f6, 0x2079, 0x0080, 0x0021, 0x00fe, 0x00ee, 0x012e, 0x0005,</div><div class='del'>-	0x7004, 0x9086, 0x0000, 0x1110, 0x7007, 0x0006, 0x7000, 0x0002,</div><div class='del'>-	0x113a, 0x12bd, 0x1138, 0x1138, 0x12b1, 0x12b1, 0x12b1, 0x12b1,</div><div class='del'>-	0x080c, 0x0dc5, 0x701c, 0x7120, 0x9106, 0x1148, 0x792c, 0x9184,</div><div class='del'>-	0x0001, 0x1120, 0xd1fc, 0x1110, 0x7007, 0x0000, 0x0005, 0x0096,</div><div class='del'>-	0x9180, 0x1a25, 0x2004, 0x700a, 0x2048, 0x8108, 0x918c, 0x003f,</div><div class='del'>-	0x7122, 0x782b, 0x0026, 0xa88c, 0x7802, 0xa890, 0x7806, 0xa894,</div><div class='del'>-	0x780a, 0xa898, 0x780e, 0xa878, 0x700e, 0xa870, 0x7016, 0xa874,</div><div class='del'>-	0x701a, 0xa868, 0x009e, 0xd084, 0x0120, 0x7007, 0x0001, 0x0029,</div><div class='del'>-	0x0005, 0x7007, 0x0002, 0x00b1, 0x0005, 0x0016, 0x0026, 0x710c,</div><div class='del'>-	0x2011, 0x0040, 0x9182, 0x0040, 0x1210, 0x2110, 0x9006, 0x700e,</div><div class='del'>-	0x7212, 0x8203, 0x7812, 0x782b, 0x0020, 0x782b, 0x0041, 0x002e,</div><div class='del'>-	0x001e, 0x0005, 0x0016, 0x0026, 0x0136, 0x0146, 0x0156, 0x7014,</div><div class='del'>-	0x20e0, 0x7018, 0x2098, 0x20e9, 0x0000, 0x20a1, 0x0088, 0x782b,</div><div class='del'>-	0x0026, 0x710c, 0x2011, 0x0040, 0x9182, 0x0040, 0x1210, 0x2110,</div><div class='del'>-	0x9006, 0x700e, 0x22a8, 0x4006, 0x8203, 0x7812, 0x782b, 0x0020,</div><div class='del'>-	0x3300, 0x701a, 0x782b, 0x0001, 0x015e, 0x014e, 0x013e, 0x002e,</div><div class='del'>-	0x001e, 0x0005, 0x2009, 0x1a1b, 0x2104, 0xc095, 0x200a, 0x080c,</div><div class='del'>-	0x1117, 0x0005, 0x0016, 0x00e6, 0x2071, 0x1a1b, 0x00f6, 0x2079,</div><div class='del'>-	0x0080, 0x792c, 0xd1bc, 0x190c, 0x0dbe, 0x782b, 0x0002, 0xd1fc,</div><div class='del'>-	0x0120, 0x918c, 0x0700, 0x7004, 0x0023, 0x00fe, 0x00ee, 0x001e,</div><div class='del'>-	0x0005, 0x1128, 0x11d0, 0x1204, 0x12dc, 0x0dc5, 0x12f7, 0x0dc5,</div><div class='del'>-	0x918c, 0x0700, 0x1550, 0x0136, 0x0146, 0x0156, 0x7014, 0x20e8,</div><div class='del'>-	0x7018, 0x20a0, 0x20e1, 0x0000, 0x2099, 0x0088, 0x782b, 0x0040,</div><div class='del'>-	0x7010, 0x20a8, 0x4005, 0x3400, 0x701a, 0x015e, 0x014e, 0x013e,</div><div class='del'>-	0x700c, 0x9005, 0x0578, 0x7800, 0x7802, 0x7804, 0x7806, 0x080c,</div><div class='del'>-	0x116d, 0x0005, 0x7008, 0x0096, 0x2048, 0xa86f, 0x0100, 0x009e,</div><div class='del'>-	0x7007, 0x0000, 0x080c, 0x1128, 0x0005, 0x7008, 0x0096, 0x2048,</div><div class='del'>-	0xa86f, 0x0200, 0x009e, 0x0ca0, 0x918c, 0x0700, 0x1150, 0x700c,</div><div class='del'>-	0x9005, 0x0180, 0x7800, 0x7802, 0x7804, 0x7806, 0x080c, 0x1182,</div><div class='del'>-	0x0005, 0x7008, 0x0096, 0x2048, 0xa86f, 0x0200, 0x009e, 0x7007,</div><div class='del'>-	0x0000, 0x0080, 0x0096, 0x7008, 0x2048, 0x7800, 0xa88e, 0x7804,</div><div class='del'>-	0xa892, 0x7808, 0xa896, 0x780c, 0xa89a, 0xa86f, 0x0100, 0x009e,</div><div class='del'>-	0x7007, 0x0000, 0x0096, 0x00d6, 0x7008, 0x2048, 0x2001, 0x18b9,</div><div class='del'>-	0x2004, 0x9906, 0x1128, 0xa89c, 0x080f, 0x00de, 0x009e, 0x00a0,</div><div class='del'>-	0x00de, 0x009e, 0x0096, 0x00d6, 0x7008, 0x2048, 0x0081, 0x0150,</div><div class='del'>-	0xa89c, 0x0086, 0x2940, 0x080f, 0x008e, 0x00de, 0x009e, 0x080c,</div><div class='del'>-	0x1117, 0x0005, 0x00de, 0x009e, 0x080c, 0x1117, 0x0005, 0xa8a8,</div><div class='del'>-	0xd08c, 0x0005, 0x0096, 0xa0a0, 0x904d, 0x090c, 0x0dc5, 0xa06c,</div><div class='del'>-	0x908e, 0x0100, 0x0130, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897,</div><div class='del'>-	0x4002, 0x080c, 0x6e92, 0xa09f, 0x0000, 0xa0a3, 0x0000, 0x2848,</div><div class='del'>-	0x080c, 0x1040, 0x009e, 0x0005, 0x00a6, 0xa0a0, 0x904d, 0x090c,</div><div class='del'>-	0x0dc5, 0xa06c, 0x908e, 0x0100, 0x0128, 0xa87b, 0x0001, 0xa883,</div><div class='del'>-	0x0000, 0x00c0, 0xa80c, 0x2050, 0xb004, 0x9005, 0x0198, 0xa80e,</div><div class='del'>-	0x2050, 0x8006, 0x8006, 0x8007, 0x908c, 0x003f, 0x9084, 0xffc0,</div><div class='del'>-	0x9080, 0x0002, 0xa076, 0xa172, 0xb000, 0xa07a, 0x2810, 0x080c,</div><div class='del'>-	0x10f8, 0x00e8, 0xa97c, 0xa894, 0x0016, 0x0006, 0x080c, 0x6e92,</div><div class='del'>-	0x000e, 0x001e, 0xd1fc, 0x1138, 0xd1f4, 0x0128, 0x00c6, 0x2060,</div><div class='del'>-	0x080c, 0xb2d3, 0x00ce, 0x7008, 0x2048, 0xa89f, 0x0000, 0xa8a3,</div><div class='del'>-	0x0000, 0x080c, 0x1040, 0x7007, 0x0000, 0x080c, 0x1117, 0x00ae,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0x782b, 0x1001, 0x7007, 0x0005,</div><div class='del'>-	0x7000, 0xc094, 0x7002, 0x012e, 0x0005, 0x0096, 0x2001, 0x192f,</div><div class='del'>-	0x204c, 0xa87c, 0x7812, 0xa88c, 0x7802, 0xa890, 0x7806, 0xa894,</div><div class='del'>-	0x780a, 0xa898, 0x780e, 0x782b, 0x0020, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x782b, 0x0041, 0x7007, 0x0003, 0x7000, 0xc084, 0x7002, 0x2900,</div><div class='del'>-	0x700a, 0x012e, 0x009e, 0x0005, 0x20e1, 0x0000, 0x2099, 0x0088,</div><div class='del'>-	0x782b, 0x0040, 0x0096, 0x2001, 0x192f, 0x204c, 0xaa7c, 0x009e,</div><div class='del'>-	0x080c, 0x8d91, 0x2009, 0x188c, 0x2104, 0x9084, 0xfffc, 0x200a,</div><div class='del'>-	0x080c, 0x8bf3, 0x7007, 0x0000, 0x080c, 0x1128, 0x0005, 0x7007,</div><div class='del'>-	0x0000, 0x080c, 0x1128, 0x0005, 0x0126, 0x2091, 0x2200, 0x2079,</div><div class='del'>-	0x0300, 0x2071, 0x1a65, 0x7003, 0x0000, 0x78bf, 0x00f6, 0x781b,</div><div class='del'>-	0x4800, 0x00c1, 0x7803, 0x0003, 0x780f, 0x0000, 0x20a9, 0x03ea,</div><div class='del'>-	0x2061, 0xf0ae, 0x2c0d, 0x7912, 0xe104, 0x9ce0, 0x0002, 0x7916,</div><div class='del'>-	0x1f04, 0x1312, 0x7807, 0x0007, 0x7803, 0x0000, 0x7803, 0x0001,</div><div class='del'>-	0x012e, 0x0005, 0x00c6, 0x7803, 0x0000, 0x7808, 0xd09c, 0x0120,</div><div class='del'>-	0x7820, 0x080c, 0x1376, 0x0cc8, 0x2001, 0x1a66, 0x2003, 0x0000,</div><div class='del'>-	0x78ab, 0x0004, 0x78ac, 0xd0ac, 0x1de8, 0x78ab, 0x0002, 0x7807,</div><div class='del'>-	0x0007, 0x7827, 0x0030, 0x782b, 0x0400, 0x7827, 0x0031, 0x782b,</div><div class='del'>-	0x1a89, 0x781f, 0xff00, 0x781b, 0xb700, 0x2001, 0x0200, 0x2004,</div><div class='del'>-	0xd0dc, 0x0110, 0x781f, 0x0303, 0x2061, 0x1a89, 0x602f, 0x1cd0,</div><div class='del'>-	0x2001, 0x181a, 0x2004, 0x9082, 0x1cd0, 0x6032, 0x603b, 0x20c7,</div><div class='del'>-	0x2001, 0x33b6, 0xd0fc, 0x190c, 0x0dc5, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0xd0c4, 0x1128, 0x2001, 0x0003, 0x2004, 0xd0d4, 0x1118, 0x783f,</div><div class='del'>-	0x33b6, 0x0020, 0x9084, 0xc000, 0x783f, 0xb3b6, 0x604f, 0x193d,</div><div class='del'>-	0x2001, 0x1928, 0x2004, 0x6042, 0x00ce, 0x0005, 0x9086, 0x000d,</div><div class='del'>-	0x11d0, 0x7808, 0xd09c, 0x01b8, 0x7820, 0x0026, 0x2010, 0x080c,</div><div class='del'>-	0xd0c6, 0x0180, 0x2260, 0x6000, 0x9086, 0x0004, 0x1158, 0x0016,</div><div class='del'>-	0x6120, 0x9186, 0x0009, 0x0108, 0x0020, 0x2009, 0x004c, 0x080c,</div><div class='del'>-	0xb352, 0x001e, 0x002e, 0x0005, 0x0126, 0x2091, 0x2200, 0x7908,</div><div class='del'>-	0x9184, 0x0070, 0x190c, 0x0dbe, 0xd19c, 0x0158, 0x7820, 0x908c,</div><div class='del'>-	0xf000, 0x15e8, 0x908a, 0x0024, 0x1a0c, 0x0dc5, 0x0023, 0x012e,</div><div class='del'>-	0x0005, 0x012e, 0x0005, 0x13cf, 0x13cf, 0x13e6, 0x13eb, 0x13ef,</div><div class='del'>-	0x13f4, 0x141c, 0x1420, 0x142e, 0x1432, 0x13cf, 0x14ff, 0x1503,</div><div class='del'>-	0x1575, 0x157c, 0x13cf, 0x157d, 0x157e, 0x1589, 0x1590, 0x13cf,</div><div class='del'>-	0x13cf, 0x13cf, 0x13cf, 0x13cf, 0x13cf, 0x13cf, 0x13f6, 0x13cf,</div><div class='del'>-	0x13cf, 0x13cf, 0x13cf, 0x13cf, 0x13cf, 0x13d3, 0x13d1, 0x080c,</div><div class='del'>-	0x0dc5, 0x080c, 0x0dbe, 0x080c, 0x159b, 0x2009, 0x1a7e, 0x2104,</div><div class='del'>-	0x8000, 0x200a, 0x080c, 0x813a, 0x080c, 0x1ad9, 0x0005, 0x2009,</div><div class='del'>-	0x0048, 0x2060, 0x080c, 0xb352, 0x012e, 0x0005, 0x7004, 0xc085,</div><div class='del'>-	0xc0b5, 0x7006, 0x0005, 0x7004, 0xc085, 0x7006, 0x0005, 0x080c,</div><div class='del'>-	0x159b, 0x080c, 0x16fb, 0x0005, 0x080c, 0x0dc5, 0x080c, 0x159b,</div><div class='del'>-	0x2060, 0x6014, 0x0096, 0x2048, 0xa83b, 0xffff, 0x009e, 0x2009,</div><div class='del'>-	0x0048, 0x080c, 0xb352, 0x2001, 0x015d, 0x2003, 0x0000, 0x2009,</div><div class='del'>-	0x03e8, 0x8109, 0x0160, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8,</div><div class='del'>-	0x2001, 0x0218, 0x2004, 0xd0ec, 0x1110, 0x080c, 0x15a0, 0x2001,</div><div class='del'>-	0x0307, 0x2003, 0x8000, 0x0005, 0x7004, 0xc095, 0x7006, 0x0005,</div><div class='del'>-	0x080c, 0x159b, 0x2060, 0x6014, 0x0096, 0x2048, 0xa83b, 0xffff,</div><div class='del'>-	0x009e, 0x2009, 0x0048, 0x080c, 0xb352, 0x0005, 0x080c, 0x159b,</div><div class='del'>-	0x080c, 0x0dc5, 0x080c, 0x159b, 0x080c, 0x14ea, 0x7827, 0x0018,</div><div class='del'>-	0x79ac, 0xd1dc, 0x0904, 0x149b, 0x7827, 0x0015, 0x7828, 0x782b,</div><div class='del'>-	0x0000, 0x9065, 0x0140, 0x2001, 0x020d, 0x2003, 0x0050, 0x2003,</div><div class='del'>-	0x0020, 0x0804, 0x14a1, 0x7004, 0x9005, 0x01c8, 0x1188, 0x78ab,</div><div class='del'>-	0x0004, 0x7827, 0x0018, 0x782b, 0x0000, 0xd1bc, 0x090c, 0x0dc5,</div><div class='del'>-	0x2001, 0x020d, 0x2003, 0x0050, 0x2003, 0x0020, 0x0804, 0x14cf,</div><div class='del'>-	0x78ab, 0x0004, 0x7803, 0x0001, 0x080c, 0x1503, 0x0005, 0x7827,</div><div class='del'>-	0x0018, 0xa001, 0x7828, 0x7827, 0x0011, 0xa001, 0x7928, 0x9106,</div><div class='del'>-	0x0110, 0x79ac, 0x08e0, 0x00e6, 0x2071, 0x0200, 0x702c, 0xd0c4,</div><div class='del'>-	0x0140, 0x00ee, 0x080c, 0x1ad9, 0x080c, 0x1322, 0x7803, 0x0001,</div><div class='del'>-	0x0005, 0x7037, 0x0001, 0xa001, 0x7150, 0x00ee, 0x918c, 0xff00,</div><div class='del'>-	0x9186, 0x0500, 0x0110, 0x79ac, 0x0810, 0x7004, 0xc09d, 0x7006,</div><div class='del'>-	0x78ab, 0x0004, 0x7803, 0x0001, 0x080c, 0x1503, 0x2001, 0x020d,</div><div class='del'>-	0x2003, 0x0020, 0x0005, 0x7828, 0x782b, 0x0000, 0x9065, 0x090c,</div><div class='del'>-	0x0dc5, 0x6014, 0x2048, 0x78ab, 0x0004, 0x918c, 0x0700, 0x01a8,</div><div class='del'>-	0x080c, 0x813a, 0x080c, 0x1ad9, 0x080c, 0xd0d8, 0x0158, 0xa9ac,</div><div class='del'>-	0xa936, 0xa9b0, 0xa93a, 0xa83f, 0xffff, 0xa843, 0xffff, 0xa880,</div><div class='del'>-	0xc0bd, 0xa882, 0x080c, 0xccf3, 0x0005, 0x6020, 0x9086, 0x0009,</div><div class='del'>-	0x1128, 0x2009, 0x004c, 0x080c, 0xb352, 0x0048, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb800, 0x00be, 0xd0bc, 0x6024, 0x190c, 0xd4c4, 0x2029,</div><div class='del'>-	0x00c8, 0x8529, 0x0128, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8,</div><div class='del'>-	0x7dbc, 0x080c, 0xf057, 0xd5a4, 0x1118, 0x080c, 0x15a0, 0x0005,</div><div class='del'>-	0x080c, 0x813a, 0x080c, 0x1ad9, 0x0005, 0x781f, 0x0300, 0x7803,</div><div class='del'>-	0x0001, 0x0005, 0x0016, 0x0066, 0x0076, 0x00f6, 0x2079, 0x0300,</div><div class='del'>-	0x7908, 0x918c, 0x0007, 0x9186, 0x0003, 0x0120, 0x2001, 0x0016,</div><div class='del'>-	0x080c, 0x1611, 0x00fe, 0x007e, 0x006e, 0x001e, 0x0005, 0x7004,</div><div class='del'>-	0xc09d, 0x7006, 0x0005, 0x7104, 0x9184, 0x0004, 0x190c, 0x0dc5,</div><div class='del'>-	0xd184, 0x11b1, 0xd19c, 0x0180, 0xc19c, 0x7106, 0x0016, 0x080c,</div><div class='del'>-	0x16de, 0x001e, 0x0148, 0x2001, 0x020d, 0x2003, 0x0050, 0x2003,</div><div class='del'>-	0x0020, 0x080c, 0x15a0, 0x0005, 0x81ff, 0x190c, 0x0dc5, 0x0005,</div><div class='del'>-	0x2100, 0xc184, 0xc1b4, 0x7106, 0xd0b4, 0x0016, 0x00e6, 0x1904,</div><div class='del'>-	0x156a, 0x2071, 0x0200, 0x080c, 0x16cb, 0x05e0, 0x080c, 0x16de,</div><div class='del'>-	0x05b0, 0x6014, 0x9005, 0x05b0, 0x0096, 0x2048, 0xa864, 0x009e,</div><div class='del'>-	0x9084, 0x00ff, 0x908e, 0x0029, 0x0160, 0x908e, 0x0048, 0x1550,</div><div class='del'>-	0x601c, 0xd084, 0x11e0, 0x00f6, 0x2c78, 0x080c, 0x1768, 0x00fe,</div><div class='del'>-	0x00b0, 0x00f6, 0x2c78, 0x080c, 0x18fd, 0x00fe, 0x2009, 0x01f4,</div><div class='del'>-	0x8109, 0x0168, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8, 0x2001,</div><div class='del'>-	0x0218, 0x2004, 0xd0ec, 0x1118, 0x080c, 0x15a0, 0x0040, 0x2001,</div><div class='del'>-	0x020d, 0x2003, 0x0020, 0x080c, 0x1322, 0x7803, 0x0001, 0x00ee,</div><div class='del'>-	0x001e, 0x0005, 0x080c, 0x16de, 0x0dd0, 0x2001, 0x020d, 0x2003,</div><div class='del'>-	0x0050, 0x2003, 0x0020, 0x0461, 0x0c90, 0x0429, 0x2060, 0x2009,</div><div class='del'>-	0x0053, 0x080c, 0xb352, 0x0005, 0x0005, 0x0005, 0x00e1, 0x2008,</div><div class='del'>-	0x00d1, 0x0006, 0x7004, 0xc09d, 0x7006, 0x000e, 0x080c, 0x90de,</div><div class='del'>-	0x0005, 0x0089, 0x9005, 0x0118, 0x080c, 0x8ce2, 0x0cd0, 0x0005,</div><div class='del'>-	0x2001, 0x0036, 0x2009, 0x1820, 0x210c, 0x2011, 0x181f, 0x2214,</div><div class='del'>-	0x080c, 0x1611, 0x0005, 0x7808, 0xd09c, 0x0de8, 0x7820, 0x0005,</div><div class='del'>-	0x080c, 0x14ea, 0x00d6, 0x2069, 0x0200, 0x2009, 0x01f4, 0x8109,</div><div class='del'>-	0x0510, 0x6804, 0x9005, 0x0dd8, 0x2001, 0x015d, 0x2003, 0x0000,</div><div class='del'>-	0x79bc, 0xd1a4, 0x1528, 0x79b8, 0x918c, 0x0fff, 0x0180, 0x9182,</div><div class='del'>-	0x0841, 0x1268, 0x9188, 0x0007, 0x918c, 0x0ff8, 0x810c, 0x810c,</div><div class='del'>-	0x810c, 0x080c, 0x1603, 0x6827, 0x0001, 0x8109, 0x1dd0, 0x04d9,</div><div class='del'>-	0x6827, 0x0002, 0x04c1, 0x6804, 0x9005, 0x1130, 0x682c, 0xd0e4,</div><div class='del'>-	0x1500, 0x6804, 0x9005, 0x0de8, 0x79b8, 0xd1ec, 0x1130, 0x08c0,</div><div class='del'>-	0x080c, 0x813a, 0x080c, 0x1ad9, 0x0090, 0x7827, 0x0015, 0x782b,</div><div class='del'>-	0x0000, 0x7827, 0x0018, 0x782b, 0x0000, 0x2001, 0x020d, 0x2003,</div><div class='del'>-	0x0020, 0x2001, 0x0307, 0x2003, 0x0300, 0x7803, 0x0001, 0x00de,</div><div class='del'>-	0x0005, 0x682c, 0x9084, 0x5400, 0x9086, 0x5400, 0x0d30, 0x7827,</div><div class='del'>-	0x0015, 0x782b, 0x0000, 0x7803, 0x0001, 0x6800, 0x9085, 0x1800,</div><div class='del'>-	0x6802, 0x00de, 0x0005, 0x6824, 0x9084, 0x0003, 0x1de0, 0x0005,</div><div class='del'>-	0x2001, 0x0030, 0x2c08, 0x621c, 0x0021, 0x7830, 0x9086, 0x0041,</div><div class='del'>-	0x0005, 0x00f6, 0x2079, 0x0300, 0x0006, 0x7808, 0xd09c, 0x0140,</div><div class='del'>-	0x0016, 0x0026, 0x00c6, 0x080c, 0x1394, 0x00ce, 0x002e, 0x001e,</div><div class='del'>-	0x000e, 0x0006, 0x7832, 0x7936, 0x7a3a, 0x781b, 0x8080, 0x0059,</div><div class='del'>-	0x1118, 0x000e, 0x00fe, 0x0005, 0x000e, 0x792c, 0x3900, 0x8000,</div><div class='del'>-	0x2004, 0x080c, 0x0dc5, 0x2009, 0x180c, 0x2104, 0xc0f4, 0x200a,</div><div class='del'>-	0x2009, 0xff00, 0x8109, 0x0904, 0x168f, 0x7a18, 0x9284, 0x0030,</div><div class='del'>-	0x0904, 0x168a, 0x9284, 0x0048, 0x9086, 0x0008, 0x1904, 0x168a,</div><div class='del'>-	0x2001, 0x0109, 0x2004, 0xd08c, 0x01f0, 0x0006, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x0126, 0x2091, 0x2800, 0x00f6, 0x0026,</div><div class='del'>-	0x0016, 0x2009, 0x1a81, 0x2104, 0x8000, 0x0208, 0x200a, 0x080c,</div><div class='del'>-	0x94b1, 0x001e, 0x002e, 0x00fe, 0x012e, 0x015e, 0x014e, 0x013e,</div><div class='del'>-	0x01de, 0x01ce, 0x000e, 0x2001, 0x009b, 0x2004, 0xd0fc, 0x01d0,</div><div class='del'>-	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x00f6,</div><div class='del'>-	0x0016, 0x2009, 0x1a82, 0x2104, 0x8000, 0x0208, 0x200a, 0x080c,</div><div class='del'>-	0x1eeb, 0x001e, 0x00fe, 0x015e, 0x014e, 0x013e, 0x01de, 0x01ce,</div><div class='del'>-	0x012e, 0x000e, 0x7818, 0xd0bc, 0x1904, 0x163a, 0x0005, 0x2001,</div><div class='del'>-	0x180c, 0x2004, 0xd0f4, 0x1528, 0x7a18, 0x9284, 0x0030, 0x0508,</div><div class='del'>-	0x9284, 0x0048, 0x9086, 0x0008, 0x11e0, 0x2001, 0x19f7, 0x2004,</div><div class='del'>-	0x9005, 0x01b8, 0x2001, 0x1a69, 0x2004, 0x9086, 0x0000, 0x0188,</div><div class='del'>-	0x2009, 0x1a80, 0x2104, 0x8000, 0x0208, 0x200a, 0x080c, 0xa767,</div><div class='del'>-	0x2009, 0x180c, 0x2104, 0xc0f5, 0x200a, 0x2009, 0xff00, 0x0804,</div><div class='del'>-	0x163a, 0x9085, 0x0001, 0x0005, 0x7832, 0x7936, 0x7a3a, 0x781b,</div><div class='del'>-	0x8080, 0x080c, 0x1633, 0x1108, 0x0005, 0x792c, 0x3900, 0x8000,</div><div class='del'>-	0x2004, 0x080c, 0x0dc5, 0x7037, 0x0001, 0x7150, 0x7037, 0x0002,</div><div class='del'>-	0x7050, 0x2060, 0xd1bc, 0x1110, 0x7054, 0x2060, 0x918c, 0xff00,</div><div class='del'>-	0x9186, 0x0500, 0x0110, 0x9085, 0x0001, 0x0005, 0x0006, 0x0046,</div><div class='del'>-	0x00e6, 0x2071, 0x0200, 0x7037, 0x0002, 0x7058, 0x9084, 0xff00,</div><div class='del'>-	0x8007, 0x9086, 0x00bc, 0x1158, 0x2021, 0x1a7f, 0x2404, 0x8000,</div><div class='del'>-	0x0208, 0x2022, 0x080c, 0x813a, 0x080c, 0x1ad9, 0x9006, 0x00ee,</div><div class='del'>-	0x004e, 0x000e, 0x0005, 0x0c11, 0x1108, 0x0005, 0x00e6, 0x0016,</div><div class='del'>-	0x2071, 0x0200, 0x0841, 0x6124, 0xd1dc, 0x01f8, 0x701c, 0xd08c,</div><div class='del'>-	0x0904, 0x175d, 0x7017, 0x0000, 0x2001, 0x0264, 0x2004, 0xd0bc,</div><div class='del'>-	0x0904, 0x175d, 0x2001, 0x0268, 0x00c6, 0x2064, 0x6104, 0x6038,</div><div class='del'>-	0x00ce, 0x918e, 0x0039, 0x1904, 0x175d, 0x9c06, 0x15f0, 0x0126,</div><div class='del'>-	0x2091, 0x2600, 0x080c, 0x8081, 0x012e, 0x7358, 0x745c, 0x6014,</div><div class='del'>-	0x905d, 0x0598, 0x2b48, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be,</div><div class='del'>-	0xd0bc, 0x190c, 0xd49f, 0xab42, 0xac3e, 0x2001, 0x1869, 0x2004,</div><div class='del'>-	0xd0b4, 0x1170, 0x601c, 0xd0e4, 0x1158, 0x6010, 0x00b6, 0x2058,</div><div class='del'>-	0xb800, 0x00be, 0xd0bc, 0x1120, 0xa83b, 0x7fff, 0xa837, 0xffff,</div><div class='del'>-	0x080c, 0x20e7, 0x1190, 0x080c, 0x195a, 0x2a00, 0xa816, 0x0130,</div><div class='del'>-	0x2800, 0xa80e, 0x2c05, 0xa80a, 0x2c00, 0xa812, 0x7037, 0x0020,</div><div class='del'>-	0x781f, 0x0300, 0x001e, 0x00ee, 0x0005, 0x7037, 0x0050, 0x7037,</div><div class='del'>-	0x0020, 0x001e, 0x00ee, 0x080c, 0x15a0, 0x0005, 0x080c, 0x0dc5,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x190c, 0x6b5e, 0x2ff0, 0x0126,</div><div class='del'>-	0x2091, 0x2200, 0x0016, 0x00c6, 0x3e60, 0x6014, 0x2048, 0x2940,</div><div class='del'>-	0x903e, 0x2730, 0xa864, 0x2068, 0xa81a, 0x9d84, 0x000f, 0x9088,</div><div class='del'>-	0x20c7, 0x2165, 0x0002, 0x179a, 0x1808, 0x179a, 0x179a, 0x179e,</div><div class='del'>-	0x17e9, 0x179a, 0x17be, 0x1793, 0x17ff, 0x179a, 0x179a, 0x17a3,</div><div class='del'>-	0x18f5, 0x17d2, 0x17c8, 0xa964, 0x918c, 0x00ff, 0x918e, 0x0048,</div><div class='del'>-	0x0904, 0x17ff, 0x9085, 0x0001, 0x0804, 0x18eb, 0xa87c, 0xd0ac,</div><div class='del'>-	0x0dc8, 0x0804, 0x180f, 0xa87c, 0xd0ac, 0x0da0, 0x0804, 0x187a,</div><div class='del'>-	0xa898, 0x901d, 0x1108, 0xab9c, 0x9016, 0xaab2, 0xaa3e, 0xaa42,</div><div class='del'>-	0x3e00, 0x9080, 0x0008, 0x2004, 0x9080, 0x933d, 0x2005, 0x9005,</div><div class='del'>-	0x090c, 0x0dc5, 0x2004, 0xa8ae, 0x0804, 0x18d3, 0xa87c, 0xd0bc,</div><div class='del'>-	0x09c8, 0xa890, 0xa842, 0xa88c, 0xa83e, 0xa888, 0x0804, 0x180f,</div><div class='del'>-	0xa87c, 0xd0bc, 0x0978, 0xa890, 0xa842, 0xa88c, 0xa83e, 0xa888,</div><div class='del'>-	0x0804, 0x187a, 0xa87c, 0xd0bc, 0x0928, 0xa890, 0xa842, 0xa88c,</div><div class='del'>-	0xa83e, 0xa804, 0x9045, 0x090c, 0x0dc5, 0xa164, 0xa91a, 0x91ec,</div><div class='del'>-	0x000f, 0x9d80, 0x20c7, 0x2065, 0xa888, 0xd19c, 0x1904, 0x187a,</div><div class='del'>-	0x0430, 0xa87c, 0xd0ac, 0x0904, 0x179a, 0xa804, 0x9045, 0x090c,</div><div class='del'>-	0x0dc5, 0xa164, 0xa91a, 0x91ec, 0x000f, 0x9d80, 0x20c7, 0x2065,</div><div class='del'>-	0x9006, 0xa842, 0xa83e, 0xd19c, 0x1904, 0x187a, 0x0080, 0xa87c,</div><div class='del'>-	0xd0ac, 0x0904, 0x179a, 0x9006, 0xa842, 0xa83e, 0x0804, 0x187a,</div><div class='del'>-	0xa87c, 0xd0ac, 0x0904, 0x179a, 0x9006, 0xa842, 0xa83e, 0x2c05,</div><div class='del'>-	0x908a, 0x0036, 0x1a0c, 0x0dc5, 0x9082, 0x001b, 0x0002, 0x1832,</div><div class='del'>-	0x1832, 0x1834, 0x1832, 0x1832, 0x1832, 0x183e, 0x1832, 0x1832,</div><div class='del'>-	0x1832, 0x1848, 0x1832, 0x1832, 0x1832, 0x1852, 0x1832, 0x1832,</div><div class='del'>-	0x1832, 0x185c, 0x1832, 0x1832, 0x1832, 0x1866, 0x1832, 0x1832,</div><div class='del'>-	0x1832, 0x1870, 0x080c, 0x0dc5, 0xa574, 0xa478, 0x9d86, 0x0024,</div><div class='del'>-	0x0904, 0x17a8, 0xa37c, 0xa280, 0x0804, 0x18d3, 0xa584, 0xa488,</div><div class='del'>-	0x9d86, 0x0024, 0x0904, 0x17a8, 0xa38c, 0xa290, 0x0804, 0x18d3,</div><div class='del'>-	0xa594, 0xa498, 0x9d86, 0x0024, 0x0904, 0x17a8, 0xa39c, 0xa2a0,</div><div class='del'>-	0x0804, 0x18d3, 0xa5a4, 0xa4a8, 0x9d86, 0x0024, 0x0904, 0x17a8,</div><div class='del'>-	0xa3ac, 0xa2b0, 0x0804, 0x18d3, 0xa5b4, 0xa4b8, 0x9d86, 0x0024,</div><div class='del'>-	0x0904, 0x17a8, 0xa3bc, 0xa2c0, 0x0804, 0x18d3, 0xa5c4, 0xa4c8,</div><div class='del'>-	0x9d86, 0x0024, 0x0904, 0x17a8, 0xa3cc, 0xa2d0, 0x0804, 0x18d3,</div><div class='del'>-	0xa5d4, 0xa4d8, 0x9d86, 0x0024, 0x0904, 0x17a8, 0xa3dc, 0xa2e0,</div><div class='del'>-	0x0804, 0x18d3, 0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082,</div><div class='del'>-	0x001b, 0x0002, 0x189d, 0x189b, 0x189b, 0x189b, 0x189b, 0x189b,</div><div class='del'>-	0x18a8, 0x189b, 0x189b, 0x189b, 0x189b, 0x189b, 0x18b3, 0x189b,</div><div class='del'>-	0x189b, 0x189b, 0x189b, 0x189b, 0x18be, 0x189b, 0x189b, 0x189b,</div><div class='del'>-	0x189b, 0x189b, 0x18c9, 0x080c, 0x0dc5, 0xa56c, 0xa470, 0xa774,</div><div class='del'>-	0xa678, 0x9d86, 0x002c, 0x0904, 0x17a8, 0xa37c, 0xa280, 0x0458,</div><div class='del'>-	0xa584, 0xa488, 0xa78c, 0xa690, 0x9d86, 0x002c, 0x0904, 0x17a8,</div><div class='del'>-	0xa394, 0xa298, 0x0400, 0xa59c, 0xa4a0, 0xa7a4, 0xa6a8, 0x9d86,</div><div class='del'>-	0x002c, 0x0904, 0x17a8, 0xa3ac, 0xa2b0, 0x00a8, 0xa5b4, 0xa4b8,</div><div class='del'>-	0xa7bc, 0xa6c0, 0x9d86, 0x002c, 0x0904, 0x17a8, 0xa3c4, 0xa2c8,</div><div class='del'>-	0x0050, 0xa5cc, 0xa4d0, 0xa7d4, 0xa6d8, 0x9d86, 0x002c, 0x0904,</div><div class='del'>-	0x17a8, 0xa3dc, 0xa2e0, 0xab2e, 0xaa32, 0xad1e, 0xac22, 0xaf26,</div><div class='del'>-	0xae2a, 0xa988, 0x8c60, 0x2c1d, 0xa8ac, 0xaab0, 0xa836, 0xaa3a,</div><div class='del'>-	0x8109, 0xa916, 0x1160, 0x3e60, 0x601c, 0xc085, 0x601e, 0xa87c,</div><div class='del'>-	0xc0dd, 0xa87e, 0x9006, 0x00ce, 0x001e, 0x012e, 0x0005, 0x2800,</div><div class='del'>-	0xa80e, 0xab0a, 0x2c00, 0xa812, 0x0c70, 0x0804, 0x179a, 0x2001,</div><div class='del'>-	0x180d, 0x2004, 0xd08c, 0x190c, 0x6b5e, 0x2ff0, 0x0126, 0x2091,</div><div class='del'>-	0x2200, 0x0016, 0x00c6, 0x3e60, 0x6014, 0x2048, 0x2940, 0xa80e,</div><div class='del'>-	0x2061, 0x20c2, 0xa813, 0x20c2, 0x2c05, 0xa80a, 0xa964, 0xa91a,</div><div class='del'>-	0xa87c, 0xd0ac, 0x090c, 0x0dc5, 0x9006, 0xa842, 0xa83e, 0x2c05,</div><div class='del'>-	0x908a, 0x0034, 0x1a0c, 0x0dc5, 0xadcc, 0xacd0, 0xafd4, 0xaed8,</div><div class='del'>-	0xabdc, 0xaae0, 0xab2e, 0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a,</div><div class='del'>-	0xa8ac, 0xaab0, 0xa836, 0xaa3a, 0xa988, 0xa864, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x0008, 0x1120, 0x8109, 0xa916, 0x0128, 0x0080, 0x918a,</div><div class='del'>-	0x0002, 0xa916, 0x1160, 0x3e60, 0x601c, 0xc085, 0x601e, 0xa87c,</div><div class='del'>-	0xc0dd, 0xa87e, 0x9006, 0x00ce, 0x001e, 0x012e, 0x0005, 0xa804,</div><div class='del'>-	0x9045, 0x090c, 0x0dc5, 0xa80e, 0xa064, 0xa81a, 0x9084, 0x000f,</div><div class='del'>-	0x9080, 0x20c7, 0x2015, 0x82ff, 0x090c, 0x0dc5, 0xaa12, 0x2205,</div><div class='del'>-	0xa80a, 0x0c08, 0x903e, 0x2730, 0xa880, 0xd0fc, 0x1190, 0x2d00,</div><div class='del'>-	0x0002, 0x1a4f, 0x19b1, 0x19b1, 0x1a4f, 0x1a4f, 0x1a49, 0x1a4f,</div><div class='del'>-	0x19b1, 0x1a00, 0x1a00, 0x1a00, 0x1a4f, 0x1a4f, 0x1a4f, 0x1a46,</div><div class='del'>-	0x1a00, 0xc0fc, 0xa882, 0xab2c, 0xaa30, 0xad1c, 0xac20, 0xdd9c,</div><div class='del'>-	0x0904, 0x1a51, 0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082,</div><div class='del'>-	0x001b, 0x0002, 0x199d, 0x199b, 0x199b, 0x199b, 0x199b, 0x199b,</div><div class='del'>-	0x19a1, 0x199b, 0x199b, 0x199b, 0x199b, 0x199b, 0x19a5, 0x199b,</div><div class='del'>-	0x199b, 0x199b, 0x199b, 0x199b, 0x19a9, 0x199b, 0x199b, 0x199b,</div><div class='del'>-	0x199b, 0x199b, 0x19ad, 0x080c, 0x0dc5, 0xa774, 0xa678, 0x0804,</div><div class='del'>-	0x1a51, 0xa78c, 0xa690, 0x0804, 0x1a51, 0xa7a4, 0xa6a8, 0x0804,</div><div class='del'>-	0x1a51, 0xa7bc, 0xa6c0, 0x0804, 0x1a51, 0xa7d4, 0xa6d8, 0x0804,</div><div class='del'>-	0x1a51, 0x2c05, 0x908a, 0x0036, 0x1a0c, 0x0dc5, 0x9082, 0x001b,</div><div class='del'>-	0x0002, 0x19d4, 0x19d4, 0x19d6, 0x19d4, 0x19d4, 0x19d4, 0x19dc,</div><div class='del'>-	0x19d4, 0x19d4, 0x19d4, 0x19e2, 0x19d4, 0x19d4, 0x19d4, 0x19e8,</div><div class='del'>-	0x19d4, 0x19d4, 0x19d4, 0x19ee, 0x19d4, 0x19d4, 0x19d4, 0x19f4,</div><div class='del'>-	0x19d4, 0x19d4, 0x19d4, 0x19fa, 0x080c, 0x0dc5, 0xa574, 0xa478,</div><div class='del'>-	0xa37c, 0xa280, 0x0804, 0x1a51, 0xa584, 0xa488, 0xa38c, 0xa290,</div><div class='del'>-	0x0804, 0x1a51, 0xa594, 0xa498, 0xa39c, 0xa2a0, 0x0804, 0x1a51,</div><div class='del'>-	0xa5a4, 0xa4a8, 0xa3ac, 0xa2b0, 0x0804, 0x1a51, 0xa5b4, 0xa4b8,</div><div class='del'>-	0xa3bc, 0xa2c0, 0x0804, 0x1a51, 0xa5c4, 0xa4c8, 0xa3cc, 0xa2d0,</div><div class='del'>-	0x0804, 0x1a51, 0xa5d4, 0xa4d8, 0xa3dc, 0xa2e0, 0x0804, 0x1a51,</div><div class='del'>-	0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082, 0x001b, 0x0002,</div><div class='del'>-	0x1a23, 0x1a21, 0x1a21, 0x1a21, 0x1a21, 0x1a21, 0x1a2a, 0x1a21,</div><div class='del'>-	0x1a21, 0x1a21, 0x1a21, 0x1a21, 0x1a31, 0x1a21, 0x1a21, 0x1a21,</div><div class='del'>-	0x1a21, 0x1a21, 0x1a38, 0x1a21, 0x1a21, 0x1a21, 0x1a21, 0x1a21,</div><div class='del'>-	0x1a3f, 0x080c, 0x0dc5, 0xa56c, 0xa470, 0xa774, 0xa678, 0xa37c,</div><div class='del'>-	0xa280, 0x0438, 0xa584, 0xa488, 0xa78c, 0xa690, 0xa394, 0xa298,</div><div class='del'>-	0x0400, 0xa59c, 0xa4a0, 0xa7a4, 0xa6a8, 0xa3ac, 0xa2b0, 0x00c8,</div><div class='del'>-	0xa5b4, 0xa4b8, 0xa7bc, 0xa6c0, 0xa3c4, 0xa2c8, 0x0090, 0xa5cc,</div><div class='del'>-	0xa4d0, 0xa7d4, 0xa6d8, 0xa3dc, 0xa2e0, 0x0058, 0x9d86, 0x000e,</div><div class='del'>-	0x1130, 0x080c, 0x207f, 0x1904, 0x195a, 0x900e, 0x0050, 0x080c,</div><div class='del'>-	0x0dc5, 0xab2e, 0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a, 0x080c,</div><div class='del'>-	0x207f, 0x0005, 0x6014, 0x2048, 0x6118, 0x81ff, 0x0148, 0x810c,</div><div class='del'>-	0x810c, 0x810c, 0x81ff, 0x1118, 0xa887, 0x0001, 0x0008, 0xa986,</div><div class='del'>-	0x601b, 0x0002, 0xa874, 0x9084, 0x00ff, 0x9084, 0x0008, 0x0150,</div><div class='del'>-	0x00e9, 0x6000, 0x9086, 0x0004, 0x1120, 0x2009, 0x0048, 0x080c,</div><div class='del'>-	0xb352, 0x0005, 0xa974, 0xd1dc, 0x1108, 0x0005, 0xa934, 0xa88c,</div><div class='del'>-	0x9106, 0x1158, 0xa938, 0xa890, 0x9106, 0x1138, 0x601c, 0xc084,</div><div class='del'>-	0x601e, 0x2009, 0x0048, 0x0804, 0xb352, 0x0005, 0x0126, 0x00c6,</div><div class='del'>-	0x2091, 0x2200, 0x00ce, 0x7908, 0x918c, 0x0007, 0x9186, 0x0000,</div><div class='del'>-	0x05b0, 0x9186, 0x0003, 0x0598, 0x6020, 0x6023, 0x0000, 0x0006,</div><div class='del'>-	0x2031, 0x0008, 0x00c6, 0x781f, 0x0808, 0x7808, 0xd09c, 0x0120,</div><div class='del'>-	0x080c, 0x1394, 0x8631, 0x1db8, 0x00ce, 0x781f, 0x0800, 0x2031,</div><div class='del'>-	0x0168, 0x00c6, 0x7808, 0xd09c, 0x190c, 0x1394, 0x00ce, 0x2001,</div><div class='del'>-	0x0038, 0x080c, 0x1b69, 0x7930, 0x9186, 0x0040, 0x0160, 0x9186,</div><div class='del'>-	0x0042, 0x190c, 0x0dc5, 0x2001, 0x001e, 0x8001, 0x1df0, 0x8631,</div><div class='del'>-	0x1d40, 0x080c, 0x1b78, 0x000e, 0x6022, 0x012e, 0x0005, 0x080c,</div><div class='del'>-	0x1b65, 0x7827, 0x0015, 0x7828, 0x9c06, 0x1db8, 0x782b, 0x0000,</div><div class='del'>-	0x0ca0, 0x00f6, 0x2079, 0x0300, 0x7803, 0x0000, 0x78ab, 0x0004,</div><div class='del'>-	0x2001, 0xf000, 0x8001, 0x090c, 0x0dc5, 0x7aac, 0xd2ac, 0x1dd0,</div><div class='del'>-	0x00fe, 0x080c, 0x7637, 0x1188, 0x2001, 0x0138, 0x2003, 0x0000,</div><div class='del'>-	0x2001, 0x0160, 0x2003, 0x0000, 0x2011, 0x012c, 0xa001, 0xa001,</div><div class='del'>-	0x8211, 0x1de0, 0x0059, 0x0804, 0x76e4, 0x0479, 0x0039, 0x2001,</div><div class='del'>-	0x0160, 0x2502, 0x2001, 0x0138, 0x2202, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x0200, 0x080c, 0x2c6d, 0x2009, 0x003c, 0x080c, 0x2409, 0x2001,</div><div class='del'>-	0x015d, 0x2003, 0x0000, 0x7000, 0x9084, 0x003c, 0x1de0, 0x080c,</div><div class='del'>-	0x8725, 0x70a0, 0x70a2, 0x7098, 0x709a, 0x709c, 0x709e, 0x2001,</div><div class='del'>-	0x020d, 0x2003, 0x0020, 0x00f6, 0x2079, 0x0300, 0x080c, 0x1322,</div><div class='del'>-	0x7803, 0x0001, 0x00fe, 0x00ee, 0x0005, 0x2001, 0x0138, 0x2014,</div><div class='del'>-	0x2003, 0x0000, 0x2001, 0x0160, 0x202c, 0x2003, 0x0000, 0x080c,</div><div class='del'>-	0x7637, 0x1108, 0x0005, 0x2021, 0x0260, 0x2001, 0x0141, 0x201c,</div><div class='del'>-	0xd3dc, 0x1168, 0x2001, 0x0109, 0x201c, 0x939c, 0x0048, 0x1160,</div><div class='del'>-	0x2001, 0x0111, 0x201c, 0x83ff, 0x1110, 0x8421, 0x1d70, 0x2001,</div><div class='del'>-	0x015d, 0x2003, 0x0000, 0x0005, 0x0046, 0x2021, 0x0019, 0x2003,</div><div class='del'>-	0x0048, 0xa001, 0xa001, 0x201c, 0x939c, 0x0048, 0x0120, 0x8421,</div><div class='del'>-	0x1db0, 0x004e, 0x0c60, 0x004e, 0x0c40, 0x601c, 0xc084, 0x601e,</div><div class='del'>-	0x0005, 0x2c08, 0x621c, 0x080c, 0x1611, 0x7930, 0x0005, 0x2c08,</div><div class='del'>-	0x621c, 0x080c, 0x16bc, 0x7930, 0x0005, 0x8001, 0x1df0, 0x0005,</div><div class='del'>-	0x2031, 0x0064, 0x781c, 0x9084, 0x0007, 0x0170, 0x2001, 0x0038,</div><div class='del'>-	0x0c41, 0x9186, 0x0040, 0x0904, 0x1bd6, 0x2001, 0x001e, 0x0c69,</div><div class='del'>-	0x8631, 0x1d80, 0x080c, 0x0dc5, 0x781f, 0x0202, 0x2001, 0x015d,</div><div class='del'>-	0x2003, 0x0000, 0x2001, 0x0dac, 0x0c01, 0x781c, 0xd084, 0x0110,</div><div class='del'>-	0x0861, 0x04e0, 0x2001, 0x0030, 0x0891, 0x9186, 0x0040, 0x0568,</div><div class='del'>-	0x781c, 0xd084, 0x1da8, 0x781f, 0x0101, 0x2001, 0x0014, 0x0869,</div><div class='del'>-	0x2001, 0x0037, 0x0821, 0x9186, 0x0040, 0x0140, 0x2001, 0x0030,</div><div class='del'>-	0x080c, 0x1b6f, 0x9186, 0x0040, 0x190c, 0x0dc5, 0x00d6, 0x2069,</div><div class='del'>-	0x0200, 0x692c, 0xd1f4, 0x1170, 0xd1c4, 0x0160, 0xd19c, 0x0130,</div><div class='del'>-	0x6800, 0x9085, 0x1800, 0x6802, 0x00de, 0x0080, 0x6908, 0x9184,</div><div class='del'>-	0x0007, 0x1db0, 0x00de, 0x781f, 0x0100, 0x791c, 0x9184, 0x0007,</div><div class='del'>-	0x090c, 0x0dc5, 0xa001, 0xa001, 0x781f, 0x0200, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x2400, 0x2071, 0x1a69, 0x2079, 0x0090, 0x012e, 0x0005,</div><div class='del'>-	0x9280, 0x0005, 0x2004, 0x2048, 0xa97c, 0xd1dc, 0x1904, 0x1c78,</div><div class='del'>-	0xa964, 0x9184, 0x0007, 0x0002, 0x1bf4, 0x1c63, 0x1c0b, 0x1c0d,</div><div class='del'>-	0x1c0b, 0x1c4b, 0x1c2b, 0x1c1a, 0x918c, 0x00ff, 0x9186, 0x0008,</div><div class='del'>-	0x1170, 0xa87c, 0xd0b4, 0x0904, 0x1ea5, 0x9006, 0xa842, 0xa83e,</div><div class='del'>-	0xa988, 0x2900, 0xa85a, 0xa813, 0x20c2, 0x0804, 0x1c74, 0x9186,</div><div class='del'>-	0x0048, 0x0904, 0x1c63, 0x080c, 0x0dc5, 0x9184, 0x00ff, 0x9086,</div><div class='del'>-	0x0013, 0x0904, 0x1c63, 0x9184, 0x00ff, 0x9086, 0x001b, 0x0904,</div><div class='del'>-	0x1c63, 0x0c88, 0xa87c, 0xd0b4, 0x0904, 0x1ea5, 0xa890, 0xa842,</div><div class='del'>-	0xa83a, 0xa88c, 0xa83e, 0xa836, 0xa8ac, 0xa846, 0xa8b0, 0xa84a,</div><div class='del'>-	0xa988, 0x0804, 0x1c6b, 0xa864, 0x9084, 0x00ff, 0x9086, 0x001e,</div><div class='del'>-	0x19d0, 0xa87c, 0xd0b4, 0x0904, 0x1ea5, 0xa890, 0xa842, 0xa83a,</div><div class='del'>-	0xa88c, 0xa83e, 0xa836, 0xa8ac, 0xa846, 0xa8b0, 0xa84a, 0xa804,</div><div class='del'>-	0xa85a, 0x2040, 0xa064, 0x9084, 0x000f, 0x9080, 0x20c7, 0x2005,</div><div class='del'>-	0xa812, 0xa988, 0x0448, 0x918c, 0x00ff, 0x9186, 0x0015, 0x1540,</div><div class='del'>-	0xa87c, 0xd0b4, 0x0904, 0x1ea5, 0xa804, 0xa85a, 0x2040, 0xa064,</div><div class='del'>-	0x9084, 0x000f, 0x9080, 0x20c7, 0x2005, 0xa812, 0xa988, 0x9006,</div><div class='del'>-	0xa842, 0xa83e, 0x0088, 0xa87c, 0xd0b4, 0x0904, 0x1ea5, 0xa988,</div><div class='del'>-	0x9006, 0xa842, 0xa83e, 0x2900, 0xa85a, 0xa864, 0x9084, 0x000f,</div><div class='del'>-	0x9080, 0x20c7, 0x2005, 0xa812, 0xa916, 0xa87c, 0xc0dd, 0xa87e,</div><div class='del'>-	0x0005, 0x00f6, 0x2079, 0x0090, 0x782c, 0xd0fc, 0x190c, 0x1eeb,</div><div class='del'>-	0x00e6, 0x2071, 0x1a69, 0x7000, 0x9005, 0x1904, 0x1cdf, 0x7206,</div><div class='del'>-	0x9280, 0x0005, 0x204c, 0x9280, 0x0004, 0x2004, 0x782b, 0x0004,</div><div class='del'>-	0x00f6, 0x2079, 0x0200, 0x7803, 0x0040, 0x00fe, 0x00b6, 0x2058,</div><div class='del'>-	0xb86c, 0x7836, 0xb890, 0x00be, 0x00f6, 0x2079, 0x0200, 0x7803,</div><div class='del'>-	0x0040, 0xa001, 0xa001, 0xa001, 0xa001, 0xa001, 0xa001, 0x781a,</div><div class='del'>-	0x78d7, 0x0000, 0x00fe, 0xa814, 0x2050, 0xa858, 0x2040, 0xa810,</div><div class='del'>-	0x2060, 0xa064, 0x90ec, 0x000f, 0xa944, 0x791a, 0x7116, 0xa848,</div><div class='del'>-	0x781e, 0x701a, 0x9006, 0x700e, 0x7012, 0x7004, 0xa940, 0xa838,</div><div class='del'>-	0x9106, 0x1500, 0xa93c, 0xa834, 0x9106, 0x11e0, 0x0006, 0x0016,</div><div class='del'>-	0xa938, 0xa834, 0x9105, 0x0118, 0x001e, 0x000e, 0x0098, 0x001e,</div><div class='del'>-	0x000e, 0x8aff, 0x01c8, 0x0126, 0x2091, 0x8000, 0x2009, 0x0306,</div><div class='del'>-	0x200b, 0x0808, 0x00d9, 0x0108, 0x00c9, 0x012e, 0x9006, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x0036, 0x0046, 0xab38, 0xac34, 0x080c, 0x20e7,</div><div class='del'>-	0x004e, 0x003e, 0x0d30, 0x0c98, 0x9085, 0x0001, 0x0c80, 0x2009,</div><div class='del'>-	0x0306, 0x200b, 0x4800, 0x7027, 0x0000, 0x0005, 0x0076, 0x0066,</div><div class='del'>-	0x0056, 0x0046, 0x0036, 0x0026, 0x8aff, 0x0904, 0x1e9e, 0x700c,</div><div class='del'>-	0x7214, 0x923a, 0x7010, 0x7218, 0x9203, 0x0a04, 0x1e9d, 0x9705,</div><div class='del'>-	0x0904, 0x1e9d, 0x903e, 0x2730, 0xa880, 0xd0fc, 0x1190, 0x2d00,</div><div class='del'>-	0x0002, 0x1e22, 0x1d61, 0x1d61, 0x1e22, 0x1e22, 0x1dff, 0x1e22,</div><div class='del'>-	0x1d61, 0x1e06, 0x1db0, 0x1db0, 0x1e22, 0x1e22, 0x1e22, 0x1df9,</div><div class='del'>-	0x1db0, 0xc0fc, 0xa882, 0xab2c, 0xaa30, 0xad1c, 0xac20, 0xdd9c,</div><div class='del'>-	0x0904, 0x1e2f, 0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082,</div><div class='del'>-	0x001b, 0x0002, 0x1d4d, 0x1d4b, 0x1d4b, 0x1d4b, 0x1d4b, 0x1d4b,</div><div class='del'>-	0x1d51, 0x1d4b, 0x1d4b, 0x1d4b, 0x1d4b, 0x1d4b, 0x1d55, 0x1d4b,</div><div class='del'>-	0x1d4b, 0x1d4b, 0x1d4b, 0x1d4b, 0x1d59, 0x1d4b, 0x1d4b, 0x1d4b,</div><div class='del'>-	0x1d4b, 0x1d4b, 0x1d5d, 0x080c, 0x0dc5, 0xa774, 0xa678, 0x0804,</div><div class='del'>-	0x1e2f, 0xa78c, 0xa690, 0x0804, 0x1e2f, 0xa7a4, 0xa6a8, 0x0804,</div><div class='del'>-	0x1e2f, 0xa7bc, 0xa6c0, 0x0804, 0x1e2f, 0xa7d4, 0xa6d8, 0x0804,</div><div class='del'>-	0x1e2f, 0x2c05, 0x908a, 0x0036, 0x1a0c, 0x0dc5, 0x9082, 0x001b,</div><div class='del'>-	0x0002, 0x1d84, 0x1d84, 0x1d86, 0x1d84, 0x1d84, 0x1d84, 0x1d8c,</div><div class='del'>-	0x1d84, 0x1d84, 0x1d84, 0x1d92, 0x1d84, 0x1d84, 0x1d84, 0x1d98,</div><div class='del'>-	0x1d84, 0x1d84, 0x1d84, 0x1d9e, 0x1d84, 0x1d84, 0x1d84, 0x1da4,</div><div class='del'>-	0x1d84, 0x1d84, 0x1d84, 0x1daa, 0x080c, 0x0dc5, 0xa574, 0xa478,</div><div class='del'>-	0xa37c, 0xa280, 0x0804, 0x1e2f, 0xa584, 0xa488, 0xa38c, 0xa290,</div><div class='del'>-	0x0804, 0x1e2f, 0xa594, 0xa498, 0xa39c, 0xa2a0, 0x0804, 0x1e2f,</div><div class='del'>-	0xa5a4, 0xa4a8, 0xa3ac, 0xa2b0, 0x0804, 0x1e2f, 0xa5b4, 0xa4b8,</div><div class='del'>-	0xa3bc, 0xa2c0, 0x0804, 0x1e2f, 0xa5c4, 0xa4c8, 0xa3cc, 0xa2d0,</div><div class='del'>-	0x0804, 0x1e2f, 0xa5d4, 0xa4d8, 0xa3dc, 0xa2e0, 0x0804, 0x1e2f,</div><div class='del'>-	0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082, 0x001b, 0x0002,</div><div class='del'>-	0x1dd3, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1ddb, 0x1dd1,</div><div class='del'>-	0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1de3, 0x1dd1, 0x1dd1, 0x1dd1,</div><div class='del'>-	0x1dd1, 0x1dd1, 0x1deb, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1,</div><div class='del'>-	0x1df2, 0x080c, 0x0dc5, 0xa56c, 0xa470, 0xa774, 0xa678, 0xa37c,</div><div class='del'>-	0xa280, 0x0804, 0x1e2f, 0xa584, 0xa488, 0xa78c, 0xa690, 0xa394,</div><div class='del'>-	0xa298, 0x0804, 0x1e2f, 0xa59c, 0xa4a0, 0xa7a4, 0xa6a8, 0xa3ac,</div><div class='del'>-	0xa2b0, 0x0804, 0x1e2f, 0xa5b4, 0xa4b8, 0xa7bc, 0xa6c0, 0xa3c4,</div><div class='del'>-	0xa2c8, 0x04e8, 0xa5cc, 0xa4d0, 0xa7d4, 0xa6d8, 0xa3dc, 0xa2e0,</div><div class='del'>-	0x04b0, 0xa864, 0x9084, 0x00ff, 0x9086, 0x001e, 0x1518, 0x080c,</div><div class='del'>-	0x207f, 0x1904, 0x1cfc, 0x900e, 0x0804, 0x1e9e, 0xab64, 0x939c,</div><div class='del'>-	0x00ff, 0x9386, 0x0048, 0x1180, 0x00c6, 0x7004, 0x2060, 0x6004,</div><div class='del'>-	0x9086, 0x0043, 0x00ce, 0x0904, 0x1db0, 0xab9c, 0x9016, 0xad8c,</div><div class='del'>-	0xac90, 0xaf94, 0xae98, 0x0098, 0x9386, 0x0008, 0x0904, 0x1db0,</div><div class='del'>-	0x080c, 0x0dc5, 0xa964, 0x918c, 0x00ff, 0x9186, 0x0013, 0x0904,</div><div class='del'>-	0x1d61, 0x9186, 0x001b, 0x0904, 0x1db0, 0x080c, 0x0dc5, 0x2009,</div><div class='del'>-	0x030f, 0x2104, 0xd0fc, 0x0538, 0x0066, 0x2009, 0x0306, 0x2134,</div><div class='del'>-	0x200b, 0x4000, 0x2104, 0x9084, 0x0030, 0x15b8, 0x2031, 0x1000,</div><div class='del'>-	0x2600, 0x9302, 0x928b, 0x0000, 0xa82e, 0xa932, 0x0278, 0x9105,</div><div class='del'>-	0x0168, 0x2011, 0x0000, 0x2618, 0x2600, 0x9500, 0xa81e, 0x9481,</div><div class='del'>-	0x0000, 0xa822, 0xa880, 0xc0fd, 0xa882, 0x0020, 0xa82f, 0x0000,</div><div class='del'>-	0xa833, 0x0000, 0x006e, 0x7b12, 0x7a16, 0x7d02, 0x7c06, 0x7f0a,</div><div class='del'>-	0x7e0e, 0x782b, 0x0001, 0x7000, 0x8000, 0x7002, 0xa83c, 0x9300,</div><div class='del'>-	0xa83e, 0xa840, 0x9201, 0xa842, 0x700c, 0x9300, 0x700e, 0x7010,</div><div class='del'>-	0x9201, 0x7012, 0x080c, 0x207f, 0x0448, 0xd6b4, 0x0110, 0x200b,</div><div class='del'>-	0x4040, 0x2031, 0x0080, 0x9584, 0x007f, 0x0108, 0x9632, 0x7124,</div><div class='del'>-	0x7000, 0x9086, 0x0000, 0x1198, 0xc185, 0x7126, 0x2009, 0x0306,</div><div class='del'>-	0x2104, 0xd0b4, 0x1904, 0x1e40, 0x200b, 0x4040, 0x2009, 0x1a83,</div><div class='del'>-	0x2104, 0x8000, 0x0a04, 0x1e40, 0x200a, 0x0804, 0x1e40, 0xc18d,</div><div class='del'>-	0x7126, 0xd184, 0x1d58, 0x0804, 0x1e40, 0x9006, 0x002e, 0x003e,</div><div class='del'>-	0x004e, 0x005e, 0x006e, 0x007e, 0x0005, 0x080c, 0x0dc5, 0x0026,</div><div class='del'>-	0x2001, 0x0105, 0x2003, 0x0010, 0x782b, 0x0004, 0x7003, 0x0000,</div><div class='del'>-	0x7004, 0x2060, 0x6014, 0x2048, 0x080c, 0xd0d8, 0x0118, 0xa880,</div><div class='del'>-	0xc0bd, 0xa882, 0x782c, 0xd0ac, 0x1de8, 0x080c, 0x1cef, 0x6020,</div><div class='del'>-	0x9086, 0x0006, 0x1180, 0x2061, 0x0100, 0x62c8, 0x2001, 0x00fa,</div><div class='del'>-	0x8001, 0x1df0, 0x60c8, 0x9206, 0x1dc0, 0x60c4, 0xa89a, 0x60c8,</div><div class='del'>-	0xa896, 0x7004, 0x2060, 0x00c6, 0x080c, 0xccf3, 0x00ce, 0x2001,</div><div class='del'>-	0x19f7, 0x2004, 0x9c06, 0x1160, 0x2009, 0x0040, 0x080c, 0x2409,</div><div class='del'>-	0x080c, 0xac2b, 0x2011, 0x0000, 0x080c, 0xaac9, 0x080c, 0x9bd3,</div><div class='del'>-	0x002e, 0x0804, 0x202f, 0x0126, 0x2091, 0x2400, 0xa858, 0x2040,</div><div class='del'>-	0x792c, 0x782b, 0x0002, 0x9184, 0x0700, 0x1904, 0x1ea7, 0x7000,</div><div class='del'>-	0x0002, 0x202f, 0x1efd, 0x1f7d, 0x202d, 0x8001, 0x7002, 0x7027,</div><div class='del'>-	0x0000, 0xd19c, 0x1158, 0x8aff, 0x0904, 0x1f4a, 0x080c, 0x1cf6,</div><div class='del'>-	0x0904, 0x202f, 0x080c, 0x1cf6, 0x0804, 0x202f, 0x782b, 0x0004,</div><div class='del'>-	0xd194, 0x0148, 0xa880, 0xc0fc, 0xa882, 0x8aff, 0x1518, 0xa87c,</div><div class='del'>-	0xc0f5, 0xa87e, 0x00f8, 0x0026, 0x0036, 0xab3c, 0xaa40, 0x0016,</div><div class='del'>-	0x7910, 0xa82c, 0x9100, 0xa82e, 0x7914, 0xa830, 0x9101, 0xa832,</div><div class='del'>-	0x001e, 0x7810, 0x931a, 0x7814, 0x9213, 0x7800, 0xa81e, 0x7804,</div><div class='del'>-	0xa822, 0xab3e, 0xaa42, 0x003e, 0x002e, 0x080c, 0x209a, 0xa880,</div><div class='del'>-	0xc0fd, 0xa882, 0x2a00, 0xa816, 0x2800, 0xa85a, 0x2c00, 0xa812,</div><div class='del'>-	0x7003, 0x0000, 0x2009, 0x0306, 0x200b, 0x4800, 0x7027, 0x0000,</div><div class='del'>-	0x0804, 0x202f, 0x00f6, 0x0026, 0x781c, 0x0006, 0x7818, 0x0006,</div><div class='del'>-	0x2079, 0x0100, 0x7a14, 0x9284, 0x1984, 0x9085, 0x0012, 0x7816,</div><div class='del'>-	0x0036, 0x2019, 0x1000, 0x8319, 0x090c, 0x0dc5, 0x7820, 0xd0bc,</div><div class='del'>-	0x1dd0, 0x003e, 0x79c8, 0x000e, 0x9102, 0x001e, 0x0006, 0x0016,</div><div class='del'>-	0x79c4, 0x000e, 0x9103, 0x78c6, 0x000e, 0x78ca, 0x9284, 0x1984,</div><div class='del'>-	0x9085, 0x0012, 0x7816, 0x002e, 0x00fe, 0x782b, 0x0008, 0x7003,</div><div class='del'>-	0x0000, 0x080c, 0x1cef, 0x0804, 0x202f, 0x8001, 0x7002, 0x7024,</div><div class='del'>-	0x8004, 0x7026, 0xd194, 0x0170, 0x782c, 0xd0fc, 0x1904, 0x1ef0,</div><div class='del'>-	0xd19c, 0x1904, 0x202b, 0x8aff, 0x0904, 0x202f, 0x080c, 0x1cf6,</div><div class='del'>-	0x0804, 0x202f, 0x0026, 0x0036, 0xab3c, 0xaa40, 0x080c, 0x209a,</div><div class='del'>-	0xdd9c, 0x1904, 0x1fea, 0x2c05, 0x908a, 0x0036, 0x1a0c, 0x0dc5,</div><div class='del'>-	0x9082, 0x001b, 0x0002, 0x1fbe, 0x1fbe, 0x1fc0, 0x1fbe, 0x1fbe,</div><div class='del'>-	0x1fbe, 0x1fc6, 0x1fbe, 0x1fbe, 0x1fbe, 0x1fcc, 0x1fbe, 0x1fbe,</div><div class='del'>-	0x1fbe, 0x1fd2, 0x1fbe, 0x1fbe, 0x1fbe, 0x1fd8, 0x1fbe, 0x1fbe,</div><div class='del'>-	0x1fbe, 0x1fde, 0x1fbe, 0x1fbe, 0x1fbe, 0x1fe4, 0x080c, 0x0dc5,</div><div class='del'>-	0xa07c, 0x931a, 0xa080, 0x9213, 0x0804, 0x1f1f, 0xa08c, 0x931a,</div><div class='del'>-	0xa090, 0x9213, 0x0804, 0x1f1f, 0xa09c, 0x931a, 0xa0a0, 0x9213,</div><div class='del'>-	0x0804, 0x1f1f, 0xa0ac, 0x931a, 0xa0b0, 0x9213, 0x0804, 0x1f1f,</div><div class='del'>-	0xa0bc, 0x931a, 0xa0c0, 0x9213, 0x0804, 0x1f1f, 0xa0cc, 0x931a,</div><div class='del'>-	0xa0d0, 0x9213, 0x0804, 0x1f1f, 0xa0dc, 0x931a, 0xa0e0, 0x9213,</div><div class='del'>-	0x0804, 0x1f1f, 0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082,</div><div class='del'>-	0x001b, 0x0002, 0x200d, 0x200b, 0x200b, 0x200b, 0x200b, 0x200b,</div><div class='del'>-	0x2013, 0x200b, 0x200b, 0x200b, 0x200b, 0x200b, 0x2019, 0x200b,</div><div class='del'>-	0x200b, 0x200b, 0x200b, 0x200b, 0x201f, 0x200b, 0x200b, 0x200b,</div><div class='del'>-	0x200b, 0x200b, 0x2025, 0x080c, 0x0dc5, 0xa07c, 0x931a, 0xa080,</div><div class='del'>-	0x9213, 0x0804, 0x1f1f, 0xa094, 0x931a, 0xa098, 0x9213, 0x0804,</div><div class='del'>-	0x1f1f, 0xa0ac, 0x931a, 0xa0b0, 0x9213, 0x0804, 0x1f1f, 0xa0c4,</div><div class='del'>-	0x931a, 0xa0c8, 0x9213, 0x0804, 0x1f1f, 0xa0dc, 0x931a, 0xa0e0,</div><div class='del'>-	0x9213, 0x0804, 0x1f1f, 0x0804, 0x1f1b, 0x080c, 0x0dc5, 0x012e,</div><div class='del'>-	0x0005, 0x00f6, 0x00e6, 0x2071, 0x1a69, 0x7000, 0x9086, 0x0000,</div><div class='del'>-	0x0904, 0x207a, 0x2079, 0x0090, 0x2009, 0x0207, 0x210c, 0xd194,</div><div class='del'>-	0x01b8, 0x2009, 0x020c, 0x210c, 0x9184, 0x0003, 0x0188, 0x080c,</div><div class='del'>-	0xf0a0, 0x2001, 0x0133, 0x2004, 0x9005, 0x090c, 0x0dc5, 0x0016,</div><div class='del'>-	0x2009, 0x0040, 0x080c, 0x2409, 0x001e, 0x2001, 0x020c, 0x2102,</div><div class='del'>-	0x2009, 0x0206, 0x2104, 0x2009, 0x0203, 0x210c, 0x9106, 0x1120,</div><div class='del'>-	0x2009, 0x0040, 0x080c, 0x2409, 0x782c, 0xd0fc, 0x09a8, 0x080c,</div><div class='del'>-	0x1eeb, 0x7000, 0x9086, 0x0000, 0x1978, 0x782b, 0x0004, 0x782c,</div><div class='del'>-	0xd0ac, 0x1de8, 0x2009, 0x0040, 0x080c, 0x2409, 0x782b, 0x0002,</div><div class='del'>-	0x7003, 0x0000, 0x080c, 0x1cef, 0x00ee, 0x00fe, 0x0005, 0xa880,</div><div class='del'>-	0xd0fc, 0x11a8, 0x8c60, 0x2c05, 0x9005, 0x0110, 0x8a51, 0x0005,</div><div class='del'>-	0xa004, 0x9005, 0x0168, 0xa85a, 0x2040, 0xa064, 0x9084, 0x000f,</div><div class='del'>-	0x9080, 0x20c7, 0x2065, 0x8cff, 0x090c, 0x0dc5, 0x8a51, 0x0005,</div><div class='del'>-	0x2050, 0x0005, 0xa880, 0xd0fc, 0x11b8, 0x8a50, 0x8c61, 0x2c05,</div><div class='del'>-	0x9005, 0x1190, 0x2800, 0x9906, 0x0120, 0xa000, 0x9005, 0x1108,</div><div class='del'>-	0x2900, 0x2040, 0xa85a, 0xa064, 0x9084, 0x000f, 0x9080, 0x20d7,</div><div class='del'>-	0x2065, 0x8cff, 0x090c, 0x0dc5, 0x0005, 0x0000, 0x001d, 0x0021,</div><div class='del'>-	0x0025, 0x0029, 0x002d, 0x0031, 0x0035, 0x0000, 0x001b, 0x0021,</div><div class='del'>-	0x0027, 0x002d, 0x0033, 0x0000, 0x0000, 0x0023, 0x0000, 0x0000,</div><div class='del'>-	0x20ba, 0x20b6, 0x20ba, 0x20ba, 0x20c4, 0x0000, 0x20ba, 0x20c1,</div><div class='del'>-	0x20c1, 0x20be, 0x20c1, 0x20c1, 0x0000, 0x20c4, 0x20c1, 0x0000,</div><div class='del'>-	0x20bc, 0x20bc, 0x0000, 0x20bc, 0x20c4, 0x0000, 0x20bc, 0x20c2,</div><div class='del'>-	0x20c2, 0x20c2, 0x0000, 0x20c2, 0x0000, 0x20c4, 0x20c2, 0x00c6,</div><div class='del'>-	0x00d6, 0x0086, 0xab42, 0xac3e, 0xa888, 0x9055, 0x0904, 0x22c6,</div><div class='del'>-	0x2940, 0xa064, 0x90ec, 0x000f, 0x9084, 0x00ff, 0x9086, 0x0008,</div><div class='del'>-	0x1118, 0x2061, 0x20c2, 0x00d0, 0x9de0, 0x20c7, 0x9d86, 0x0007,</div><div class='del'>-	0x0130, 0x9d86, 0x000e, 0x0118, 0x9d86, 0x000f, 0x1120, 0xa08c,</div><div class='del'>-	0x9422, 0xa090, 0x931b, 0x2c05, 0x9065, 0x1140, 0x0310, 0x0804,</div><div class='del'>-	0x22c6, 0xa004, 0x9045, 0x0904, 0x22c6, 0x08d8, 0x2c05, 0x9005,</div><div class='del'>-	0x0904, 0x21ae, 0xdd9c, 0x1904, 0x216a, 0x908a, 0x0036, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x9082, 0x001b, 0x0002, 0x213f, 0x213f, 0x2141, 0x213f,</div><div class='del'>-	0x213f, 0x213f, 0x2147, 0x213f, 0x213f, 0x213f, 0x214d, 0x213f,</div><div class='del'>-	0x213f, 0x213f, 0x2153, 0x213f, 0x213f, 0x213f, 0x2159, 0x213f,</div><div class='del'>-	0x213f, 0x213f, 0x215f, 0x213f, 0x213f, 0x213f, 0x2165, 0x080c,</div><div class='del'>-	0x0dc5, 0xa07c, 0x9422, 0xa080, 0x931b, 0x0804, 0x21a4, 0xa08c,</div><div class='del'>-	0x9422, 0xa090, 0x931b, 0x0804, 0x21a4, 0xa09c, 0x9422, 0xa0a0,</div><div class='del'>-	0x931b, 0x0804, 0x21a4, 0xa0ac, 0x9422, 0xa0b0, 0x931b, 0x0804,</div><div class='del'>-	0x21a4, 0xa0bc, 0x9422, 0xa0c0, 0x931b, 0x0804, 0x21a4, 0xa0cc,</div><div class='del'>-	0x9422, 0xa0d0, 0x931b, 0x0804, 0x21a4, 0xa0dc, 0x9422, 0xa0e0,</div><div class='del'>-	0x931b, 0x04d0, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082, 0x001b,</div><div class='del'>-	0x0002, 0x218c, 0x218a, 0x218a, 0x218a, 0x218a, 0x218a, 0x2191,</div><div class='del'>-	0x218a, 0x218a, 0x218a, 0x218a, 0x218a, 0x2196, 0x218a, 0x218a,</div><div class='del'>-	0x218a, 0x218a, 0x218a, 0x219b, 0x218a, 0x218a, 0x218a, 0x218a,</div><div class='del'>-	0x218a, 0x21a0, 0x080c, 0x0dc5, 0xa07c, 0x9422, 0xa080, 0x931b,</div><div class='del'>-	0x0098, 0xa094, 0x9422, 0xa098, 0x931b, 0x0070, 0xa0ac, 0x9422,</div><div class='del'>-	0xa0b0, 0x931b, 0x0048, 0xa0c4, 0x9422, 0xa0c8, 0x931b, 0x0020,</div><div class='del'>-	0xa0dc, 0x9422, 0xa0e0, 0x931b, 0x0630, 0x2300, 0x9405, 0x0160,</div><div class='del'>-	0x8a51, 0x0904, 0x22c6, 0x8c60, 0x0804, 0x2116, 0xa004, 0x9045,</div><div class='del'>-	0x0904, 0x22c6, 0x0804, 0x20f1, 0x8a51, 0x0904, 0x22c6, 0x8c60,</div><div class='del'>-	0x2c05, 0x9005, 0x1158, 0xa004, 0x9045, 0x0904, 0x22c6, 0xa064,</div><div class='del'>-	0x90ec, 0x000f, 0x9de0, 0x20c7, 0x2c05, 0x2060, 0xa880, 0xc0fc,</div><div class='del'>-	0xa882, 0x0804, 0x22bb, 0x2c05, 0x8422, 0x8420, 0x831a, 0x9399,</div><div class='del'>-	0x0000, 0xac2e, 0xab32, 0xdd9c, 0x1904, 0x2258, 0x9082, 0x001b,</div><div class='del'>-	0x0002, 0x21f4, 0x21f4, 0x21f6, 0x21f4, 0x21f4, 0x21f4, 0x2204,</div><div class='del'>-	0x21f4, 0x21f4, 0x21f4, 0x2212, 0x21f4, 0x21f4, 0x21f4, 0x2220,</div><div class='del'>-	0x21f4, 0x21f4, 0x21f4, 0x222e, 0x21f4, 0x21f4, 0x21f4, 0x223c,</div><div class='del'>-	0x21f4, 0x21f4, 0x21f4, 0x224a, 0x080c, 0x0dc5, 0xa17c, 0x2400,</div><div class='del'>-	0x9122, 0xa180, 0x2300, 0x911b, 0x0a0c, 0x0dc5, 0xa074, 0x9420,</div><div class='del'>-	0xa078, 0x9319, 0x0804, 0x22b6, 0xa18c, 0x2400, 0x9122, 0xa190,</div><div class='del'>-	0x2300, 0x911b, 0x0a0c, 0x0dc5, 0xa084, 0x9420, 0xa088, 0x9319,</div><div class='del'>-	0x0804, 0x22b6, 0xa19c, 0x2400, 0x9122, 0xa1a0, 0x2300, 0x911b,</div><div class='del'>-	0x0a0c, 0x0dc5, 0xa094, 0x9420, 0xa098, 0x9319, 0x0804, 0x22b6,</div><div class='del'>-	0xa1ac, 0x2400, 0x9122, 0xa1b0, 0x2300, 0x911b, 0x0a0c, 0x0dc5,</div><div class='del'>-	0xa0a4, 0x9420, 0xa0a8, 0x9319, 0x0804, 0x22b6, 0xa1bc, 0x2400,</div><div class='del'>-	0x9122, 0xa1c0, 0x2300, 0x911b, 0x0a0c, 0x0dc5, 0xa0b4, 0x9420,</div><div class='del'>-	0xa0b8, 0x9319, 0x0804, 0x22b6, 0xa1cc, 0x2400, 0x9122, 0xa1d0,</div><div class='del'>-	0x2300, 0x911b, 0x0a0c, 0x0dc5, 0xa0c4, 0x9420, 0xa0c8, 0x9319,</div><div class='del'>-	0x0804, 0x22b6, 0xa1dc, 0x2400, 0x9122, 0xa1e0, 0x2300, 0x911b,</div><div class='del'>-	0x0a0c, 0x0dc5, 0xa0d4, 0x9420, 0xa0d8, 0x9319, 0x0804, 0x22b6,</div><div class='del'>-	0x9082, 0x001b, 0x0002, 0x2276, 0x2274, 0x2274, 0x2274, 0x2274,</div><div class='del'>-	0x2274, 0x2283, 0x2274, 0x2274, 0x2274, 0x2274, 0x2274, 0x2290,</div><div class='del'>-	0x2274, 0x2274, 0x2274, 0x2274, 0x2274, 0x229d, 0x2274, 0x2274,</div><div class='del'>-	0x2274, 0x2274, 0x2274, 0x22aa, 0x080c, 0x0dc5, 0xa17c, 0x2400,</div><div class='del'>-	0x9122, 0xa180, 0x2300, 0x911b, 0x0a0c, 0x0dc5, 0xa06c, 0x9420,</div><div class='del'>-	0xa070, 0x9319, 0x0498, 0xa194, 0x2400, 0x9122, 0xa198, 0x2300,</div><div class='del'>-	0x911b, 0x0a0c, 0x0dc5, 0xa084, 0x9420, 0xa088, 0x9319, 0x0430,</div><div class='del'>-	0xa1ac, 0x2400, 0x9122, 0xa1b0, 0x2300, 0x911b, 0x0a0c, 0x0dc5,</div><div class='del'>-	0xa09c, 0x9420, 0xa0a0, 0x9319, 0x00c8, 0xa1c4, 0x2400, 0x9122,</div><div class='del'>-	0xa1c8, 0x2300, 0x911b, 0x0a0c, 0x0dc5, 0xa0b4, 0x9420, 0xa0b8,</div><div class='del'>-	0x9319, 0x0060, 0xa1dc, 0x2400, 0x9122, 0xa1e0, 0x2300, 0x911b,</div><div class='del'>-	0x0a0c, 0x0dc5, 0xa0cc, 0x9420, 0xa0d0, 0x9319, 0xac1e, 0xab22,</div><div class='del'>-	0xa880, 0xc0fd, 0xa882, 0x2800, 0xa85a, 0x2c00, 0xa812, 0x2a00,</div><div class='del'>-	0xa816, 0x000e, 0x000e, 0x000e, 0x9006, 0x0028, 0x008e, 0x00de,</div><div class='del'>-	0x00ce, 0x9085, 0x0001, 0x0005, 0x2001, 0x0005, 0x2004, 0xd0bc,</div><div class='del'>-	0x190c, 0x0dbe, 0x9084, 0x0007, 0x0002, 0x22e7, 0x1eeb, 0x22e7,</div><div class='del'>-	0x22dd, 0x22e0, 0x22e3, 0x22e0, 0x22e3, 0x080c, 0x1eeb, 0x0005,</div><div class='del'>-	0x080c, 0x11b2, 0x0005, 0x080c, 0x1eeb, 0x080c, 0x11b2, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x2600, 0x2079, 0x0200, 0x2071, 0x0260, 0x2069,</div><div class='del'>-	0x1800, 0x7817, 0x0000, 0x789b, 0x0814, 0x78a3, 0x0406, 0x789f,</div><div class='del'>-	0x0410, 0x2009, 0x013b, 0x200b, 0x0400, 0x781b, 0x0002, 0x783b,</div><div class='del'>-	0x001f, 0x7837, 0x0020, 0x7803, 0x1600, 0x012e, 0x0005, 0x2091,</div><div class='del'>-	0x2600, 0x781c, 0xd0a4, 0x190c, 0x2406, 0x7900, 0xd1dc, 0x1118,</div><div class='del'>-	0x9084, 0x0006, 0x001a, 0x9084, 0x000e, 0x0002, 0x232e, 0x2326,</div><div class='del'>-	0x8081, 0x2326, 0x2328, 0x2328, 0x2328, 0x2328, 0x8067, 0x2326,</div><div class='del'>-	0x232a, 0x2326, 0x2328, 0x2326, 0x2328, 0x2326, 0x080c, 0x0dc5,</div><div class='del'>-	0x0031, 0x0020, 0x080c, 0x8067, 0x080c, 0x8081, 0x0005, 0x0006,</div><div class='del'>-	0x0016, 0x0026, 0x080c, 0xf0a0, 0x7930, 0x9184, 0x0003, 0x01c0,</div><div class='del'>-	0x2001, 0x19f7, 0x2004, 0x9005, 0x0170, 0x2001, 0x0133, 0x2004,</div><div class='del'>-	0x9005, 0x090c, 0x0dc5, 0x00c6, 0x2001, 0x19f7, 0x2064, 0x080c,</div><div class='del'>-	0xccf3, 0x00ce, 0x00f8, 0x2009, 0x0040, 0x080c, 0x2409, 0x00d0,</div><div class='del'>-	0x9184, 0x0014, 0x01a0, 0x6a00, 0x9286, 0x0003, 0x0160, 0x080c,</div><div class='del'>-	0x7637, 0x1138, 0x080c, 0x7932, 0x080c, 0x612e, 0x080c, 0x7563,</div><div class='del'>-	0x0010, 0x080c, 0x5fed, 0x080c, 0x8130, 0x0041, 0x0018, 0x9184,</div><div class='del'>-	0x9540, 0x1dc8, 0x002e, 0x001e, 0x000e, 0x0005, 0x00e6, 0x0036,</div><div class='del'>-	0x0046, 0x0056, 0x2071, 0x1a65, 0x080c, 0x1ad9, 0x005e, 0x004e,</div><div class='del'>-	0x003e, 0x00ee, 0x0005, 0x0126, 0x2091, 0x2e00, 0x2071, 0x1800,</div><div class='del'>-	0x7128, 0x2001, 0x196f, 0x2102, 0x2001, 0x1977, 0x2102, 0x2001,</div><div class='del'>-	0x013b, 0x2102, 0x2079, 0x0200, 0x2001, 0x0201, 0x789e, 0x78a3,</div><div class='del'>-	0x0200, 0x9198, 0x0007, 0x831c, 0x831c, 0x831c, 0x9398, 0x0005,</div><div class='del'>-	0x2320, 0x9182, 0x0204, 0x1230, 0x2011, 0x0008, 0x8423, 0x8423,</div><div class='del'>-	0x8423, 0x0488, 0x9182, 0x024c, 0x1240, 0x2011, 0x0007, 0x8403,</div><div class='del'>-	0x8003, 0x9400, 0x9400, 0x9420, 0x0430, 0x9182, 0x02bc, 0x1238,</div><div class='del'>-	0x2011, 0x0006, 0x8403, 0x8003, 0x9400, 0x9420, 0x00e0, 0x9182,</div><div class='del'>-	0x034c, 0x1230, 0x2011, 0x0005, 0x8403, 0x8003, 0x9420, 0x0098,</div><div class='del'>-	0x9182, 0x042c, 0x1228, 0x2011, 0x0004, 0x8423, 0x8423, 0x0058,</div><div class='del'>-	0x9182, 0x059c, 0x1228, 0x2011, 0x0003, 0x8403, 0x9420, 0x0018,</div><div class='del'>-	0x2011, 0x0002, 0x8423, 0x9482, 0x0228, 0x8002, 0x8020, 0x8301,</div><div class='del'>-	0x9402, 0x0110, 0x0208, 0x8321, 0x8217, 0x8203, 0x9405, 0x789a,</div><div class='del'>-	0x012e, 0x0005, 0x0006, 0x00d6, 0x2069, 0x0200, 0x6814, 0x9084,</div><div class='del'>-	0xffc0, 0x910d, 0x6916, 0x00de, 0x000e, 0x0005, 0x00d6, 0x2069,</div><div class='del'>-	0x0200, 0x9005, 0x6810, 0x0110, 0xc0a5, 0x0008, 0xc0a4, 0x6812,</div><div class='del'>-	0x00de, 0x0005, 0x0006, 0x00d6, 0x2069, 0x0200, 0x6810, 0x9084,</div><div class='del'>-	0xfff8, 0x910d, 0x6912, 0x00de, 0x000e, 0x0005, 0x7938, 0x080c,</div><div class='del'>-	0x0dbe, 0x00f6, 0x2079, 0x0200, 0x7902, 0xa001, 0xa001, 0xa001,</div><div class='del'>-	0xa001, 0xa001, 0xa001, 0x7902, 0xa001, 0xa001, 0xa001, 0xa001,</div><div class='del'>-	0xa001, 0xa001, 0x00fe, 0x0005, 0x0126, 0x2091, 0x2800, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0x1800, 0x2009, 0x0000, 0x080c, 0x2c67, 0x080c,</div><div class='del'>-	0x2b82, 0x6054, 0x8004, 0x8004, 0x8004, 0x8004, 0x9084, 0x000c,</div><div class='del'>-	0x6150, 0x918c, 0xfff3, 0x9105, 0x6052, 0x6050, 0x9084, 0xb17f,</div><div class='del'>-	0x9085, 0x2000, 0x6052, 0x2009, 0x199d, 0x2011, 0x199e, 0x6358,</div><div class='del'>-	0x939c, 0x38f0, 0x2320, 0x080c, 0x2bc6, 0x1238, 0x939d, 0x4003,</div><div class='del'>-	0x94a5, 0x8603, 0x230a, 0x2412, 0x0030, 0x939d, 0x0203, 0x94a5,</div><div class='del'>-	0x8603, 0x230a, 0x2412, 0x9006, 0x080c, 0x2bb1, 0x9006, 0x080c,</div><div class='del'>-	0x2b94, 0x20a9, 0x0012, 0x1d04, 0x245b, 0x2091, 0x6000, 0x1f04,</div><div class='del'>-	0x245b, 0x602f, 0x0100, 0x602f, 0x0000, 0x6050, 0x9085, 0x0400,</div><div class='del'>-	0x9084, 0xdfff, 0x6052, 0x6024, 0x6026, 0x080c, 0x28ac, 0x2009,</div><div class='del'>-	0x00ef, 0x6132, 0x6136, 0x080c, 0x28bc, 0x60e7, 0x0000, 0x61ea,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002, 0x1110, 0x2001,</div><div class='del'>-	0x0008, 0x60e2, 0x604b, 0xf7f7, 0x6043, 0x0000, 0x602f, 0x0080,</div><div class='del'>-	0x602f, 0x0000, 0x6007, 0x349f, 0x60bb, 0x0000, 0x20a9, 0x0018,</div><div class='del'>-	0x60bf, 0x0000, 0x1f04, 0x2490, 0x60bb, 0x0000, 0x60bf, 0x0108,</div><div class='del'>-	0x60bf, 0x0012, 0x60bf, 0x0405, 0x60bf, 0x0014, 0x60bf, 0x0320,</div><div class='del'>-	0x60bf, 0x0018, 0x601b, 0x00f0, 0x601f, 0x001e, 0x600f, 0x006b,</div><div class='del'>-	0x602b, 0x402f, 0x012e, 0x0005, 0x00f6, 0x2079, 0x0140, 0x78c3,</div><div class='del'>-	0x0080, 0x78c3, 0x0083, 0x78c3, 0x0000, 0x00fe, 0x0005, 0x2001,</div><div class='del'>-	0x1835, 0x2003, 0x0000, 0x2001, 0x1834, 0x2003, 0x0001, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x6124, 0x0066,</div><div class='del'>-	0x2031, 0x1837, 0x2634, 0x96b4, 0x0028, 0x006e, 0x1138, 0x6020,</div><div class='del'>-	0xd1bc, 0x0120, 0xd0bc, 0x1168, 0xd0b4, 0x1198, 0x9184, 0x5e2c,</div><div class='del'>-	0x1118, 0x9184, 0x0007, 0x00aa, 0x9195, 0x0004, 0x9284, 0x0007,</div><div class='del'>-	0x0082, 0x0016, 0x2001, 0x188b, 0x200c, 0xd184, 0x001e, 0x0d70,</div><div class='del'>-	0x0c98, 0x0016, 0x2001, 0x188b, 0x200c, 0xd194, 0x001e, 0x0d30,</div><div class='del'>-	0x0c58, 0x2513, 0x24f9, 0x24fc, 0x24ff, 0x2504, 0x2506, 0x250a,</div><div class='del'>-	0x250e, 0x080c, 0x93e2, 0x00b8, 0x080c, 0x94b1, 0x00a0, 0x080c,</div><div class='del'>-	0x94b1, 0x080c, 0x93e2, 0x0078, 0x0099, 0x0068, 0x080c, 0x93e2,</div><div class='del'>-	0x0079, 0x0048, 0x080c, 0x94b1, 0x0059, 0x0028, 0x080c, 0x94b1,</div><div class='del'>-	0x080c, 0x93e2, 0x0029, 0x002e, 0x001e, 0x000e, 0x012e, 0x0005,</div><div class='del'>-	0x00a6, 0x6124, 0x6028, 0xd09c, 0x0118, 0xd19c, 0x1904, 0x2784,</div><div class='del'>-	0xd1f4, 0x190c, 0x0dbe, 0x080c, 0x7637, 0x0904, 0x256e, 0x080c,</div><div class='del'>-	0xd7e3, 0x1120, 0x7000, 0x9086, 0x0003, 0x0570, 0x6024, 0x9084,</div><div class='del'>-	0x1800, 0x0550, 0x080c, 0x765a, 0x0118, 0x080c, 0x7648, 0x1520,</div><div class='del'>-	0x6027, 0x0020, 0x6043, 0x0000, 0x080c, 0xd7e3, 0x0168, 0x080c,</div><div class='del'>-	0x765a, 0x1150, 0x2001, 0x19a8, 0x2003, 0x0001, 0x6027, 0x1800,</div><div class='del'>-	0x080c, 0x74b2, 0x0804, 0x2787, 0x70a4, 0x9005, 0x1150, 0x70a7,</div><div class='del'>-	0x0001, 0x00d6, 0x2069, 0x0140, 0x080c, 0x768b, 0x00de, 0x1904,</div><div class='del'>-	0x2787, 0x080c, 0x793c, 0x0428, 0x080c, 0x765a, 0x1590, 0x6024,</div><div class='del'>-	0x9084, 0x1800, 0x1108, 0x0468, 0x080c, 0x793c, 0x080c, 0x7932,</div><div class='del'>-	0x080c, 0x612e, 0x080c, 0x7563, 0x0804, 0x2784, 0xd1ac, 0x1508,</div><div class='del'>-	0x6024, 0xd0dc, 0x1170, 0xd0e4, 0x1178, 0xd0d4, 0x1190, 0xd0cc,</div><div class='del'>-	0x0130, 0x7098, 0x9086, 0x0029, 0x1110, 0x080c, 0x7818, 0x0804,</div><div class='del'>-	0x2784, 0x080c, 0x7937, 0x0048, 0x2001, 0x197d, 0x2003, 0x0002,</div><div class='del'>-	0x0020, 0x080c, 0x7774, 0x0804, 0x2784, 0x080c, 0x78ba, 0x0804,</div><div class='del'>-	0x2784, 0x6220, 0xd1bc, 0x0138, 0xd2bc, 0x1904, 0x27e1, 0xd2b4,</div><div class='del'>-	0x1904, 0x27f4, 0x0000, 0xd1ac, 0x0904, 0x2699, 0x0036, 0x6328,</div><div class='del'>-	0xc3bc, 0x632a, 0x003e, 0x080c, 0x7637, 0x11c0, 0x6027, 0x0020,</div><div class='del'>-	0x0006, 0x0026, 0x0036, 0x080c, 0x7651, 0x1158, 0x080c, 0x7932,</div><div class='del'>-	0x080c, 0x612e, 0x080c, 0x7563, 0x003e, 0x002e, 0x000e, 0x00ae,</div><div class='del'>-	0x0005, 0x003e, 0x002e, 0x000e, 0x080c, 0x760f, 0x0016, 0x0046,</div><div class='del'>-	0x00c6, 0x644c, 0x9486, 0xf0f0, 0x1138, 0x2061, 0x0100, 0x644a,</div><div class='del'>-	0x6043, 0x0090, 0x6043, 0x0010, 0x74da, 0x948c, 0xff00, 0x7038,</div><div class='del'>-	0xd084, 0x0190, 0x080c, 0xd7e3, 0x1118, 0x9186, 0xf800, 0x1160,</div><div class='del'>-	0x7048, 0xd084, 0x1148, 0xc085, 0x704a, 0x0036, 0x2418, 0x2011,</div><div class='del'>-	0x8016, 0x080c, 0x4c44, 0x003e, 0x080c, 0xd7dc, 0x1904, 0x2676,</div><div class='del'>-	0x9196, 0xff00, 0x05a8, 0x7060, 0x9084, 0x00ff, 0x810f, 0x81ff,</div><div class='del'>-	0x0110, 0x9116, 0x0568, 0x7130, 0xd184, 0x1550, 0x080c, 0x33aa,</div><div class='del'>-	0x0128, 0xc18d, 0x7132, 0x080c, 0x6a9b, 0x1510, 0x6240, 0x9294,</div><div class='del'>-	0x0010, 0x0130, 0x6248, 0x9294, 0xff00, 0x9296, 0xff00, 0x01c0,</div><div class='del'>-	0x7030, 0xd08c, 0x0904, 0x2676, 0x7038, 0xd08c, 0x1140, 0x2001,</div><div class='del'>-	0x180c, 0x200c, 0xd1ac, 0x1904, 0x2676, 0xc1ad, 0x2102, 0x0036,</div><div class='del'>-	0x73d8, 0x2011, 0x8013, 0x080c, 0x4c44, 0x003e, 0x0804, 0x2676,</div><div class='del'>-	0x7038, 0xd08c, 0x1140, 0x2001, 0x180c, 0x200c, 0xd1ac, 0x1904,</div><div class='del'>-	0x2676, 0xc1ad, 0x2102, 0x0036, 0x73d8, 0x2011, 0x8013, 0x080c,</div><div class='del'>-	0x4c44, 0x003e, 0x7130, 0xc185, 0x7132, 0x2011, 0x1848, 0x220c,</div><div class='del'>-	0xd1a4, 0x01f0, 0x0016, 0x2009, 0x0001, 0x2011, 0x0100, 0x080c,</div><div class='del'>-	0x8a50, 0x2019, 0x000e, 0x00c6, 0x2061, 0x0000, 0x080c, 0xeba1,</div><div class='del'>-	0x00ce, 0x9484, 0x00ff, 0x9080, 0x33b6, 0x200d, 0x918c, 0xff00,</div><div class='del'>-	0x810f, 0x2120, 0x9006, 0x2009, 0x000e, 0x080c, 0xec31, 0x001e,</div><div class='del'>-	0x0016, 0x2009, 0x0002, 0x2019, 0x0004, 0x080c, 0x321b, 0x001e,</div><div class='del'>-	0x00a8, 0x0156, 0x00b6, 0x20a9, 0x007f, 0x900e, 0x080c, 0x6724,</div><div class='del'>-	0x1140, 0x7030, 0xd084, 0x1118, 0xb800, 0xd0bc, 0x1110, 0x080c,</div><div class='del'>-	0x6148, 0x8108, 0x1f04, 0x2666, 0x00be, 0x015e, 0x00ce, 0x004e,</div><div class='del'>-	0x080c, 0xb244, 0x60e3, 0x0000, 0x001e, 0x2001, 0x1800, 0x2014,</div><div class='del'>-	0x9296, 0x0004, 0x1170, 0xd19c, 0x11a0, 0x2011, 0x180c, 0x2214,</div><div class='del'>-	0xd29c, 0x1120, 0x6204, 0x9295, 0x0002, 0x6206, 0x6228, 0xc29d,</div><div class='del'>-	0x622a, 0x2003, 0x0001, 0x2001, 0x1826, 0x2003, 0x0000, 0x6027,</div><div class='del'>-	0x0020, 0xd194, 0x0904, 0x2784, 0x0016, 0x6220, 0xd2b4, 0x0904,</div><div class='del'>-	0x2721, 0x080c, 0x88c3, 0x080c, 0xa6e9, 0x6027, 0x0004, 0x00f6,</div><div class='del'>-	0x2019, 0x19f1, 0x2304, 0x907d, 0x0904, 0x26f0, 0x7804, 0x9086,</div><div class='del'>-	0x0032, 0x15f0, 0x00d6, 0x00c6, 0x00e6, 0x0096, 0x2069, 0x0140,</div><div class='del'>-	0x782c, 0x685e, 0x7808, 0x685a, 0x6043, 0x0002, 0x2001, 0x0003,</div><div class='del'>-	0x8001, 0x1df0, 0x6043, 0x0000, 0x2001, 0x003c, 0x8001, 0x1df0,</div><div class='del'>-	0x080c, 0x2d49, 0x2001, 0x001e, 0x8001, 0x0240, 0x20a9, 0x0009,</div><div class='del'>-	0x080c, 0x2c42, 0x6904, 0xd1dc, 0x1140, 0x0cb0, 0x2001, 0x0100,</div><div class='del'>-	0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x080c, 0x99a5, 0x080c,</div><div class='del'>-	0x9ab1, 0x7814, 0x2048, 0xa867, 0x0103, 0x2f60, 0x080c, 0xb2d3,</div><div class='del'>-	0x009e, 0x00ee, 0x00ce, 0x00de, 0x00fe, 0x001e, 0x00ae, 0x0005,</div><div class='del'>-	0x00fe, 0x00d6, 0x2069, 0x0140, 0x6804, 0x9084, 0x4000, 0x0110,</div><div class='del'>-	0x080c, 0x2d49, 0x00de, 0x00c6, 0x2061, 0x19e8, 0x6028, 0x080c,</div><div class='del'>-	0xd7e3, 0x0120, 0x909a, 0x0003, 0x1258, 0x0018, 0x909a, 0x00c8,</div><div class='del'>-	0x1238, 0x8000, 0x602a, 0x00ce, 0x080c, 0xa6c5, 0x0804, 0x2783,</div><div class='del'>-	0x2061, 0x0100, 0x62c0, 0x080c, 0xb0ca, 0x2019, 0x19f1, 0x2304,</div><div class='del'>-	0x9065, 0x0120, 0x2009, 0x0027, 0x080c, 0xb352, 0x00ce, 0x0804,</div><div class='del'>-	0x2783, 0xd2bc, 0x0904, 0x276a, 0x080c, 0x88d0, 0x6014, 0x9084,</div><div class='del'>-	0x1984, 0x9085, 0x0010, 0x6016, 0x6027, 0x0004, 0x00d6, 0x2069,</div><div class='del'>-	0x0140, 0x6804, 0x9084, 0x4000, 0x0110, 0x080c, 0x2d49, 0x00de,</div><div class='del'>-	0x00c6, 0x2061, 0x19e8, 0x6044, 0x080c, 0xd7e3, 0x0120, 0x909a,</div><div class='del'>-	0x0003, 0x1658, 0x0018, 0x909a, 0x00c8, 0x1638, 0x8000, 0x6046,</div><div class='del'>-	0x603c, 0x00ce, 0x9005, 0x05b8, 0x2009, 0x07d0, 0x080c, 0x88c8,</div><div class='del'>-	0x9080, 0x0008, 0x2004, 0x9086, 0x0006, 0x1138, 0x6114, 0x918c,</div><div class='del'>-	0x1984, 0x918d, 0x0012, 0x6116, 0x0430, 0x9080, 0x0008, 0x2004,</div><div class='del'>-	0x9086, 0x0009, 0x0d98, 0x6114, 0x918c, 0x1984, 0x918d, 0x0016,</div><div class='del'>-	0x6116, 0x00c8, 0x6027, 0x0004, 0x00b0, 0x0036, 0x2019, 0x0001,</div><div class='del'>-	0x080c, 0xaa49, 0x003e, 0x2019, 0x19f7, 0x2304, 0x9065, 0x0150,</div><div class='del'>-	0x2009, 0x004f, 0x6020, 0x9086, 0x0009, 0x1110, 0x2009, 0x004f,</div><div class='del'>-	0x080c, 0xb352, 0x00ce, 0x001e, 0xd19c, 0x0904, 0x27dc, 0x7038,</div><div class='del'>-	0xd0ac, 0x1538, 0x0016, 0x0156, 0x6027, 0x0008, 0x080c, 0x2d73,</div><div class='del'>-	0x20a9, 0x0028, 0xa001, 0x1f04, 0x2792, 0x6150, 0x9185, 0x1400,</div><div class='del'>-	0x6052, 0x20a9, 0x0366, 0x1d04, 0x279b, 0x080c, 0x88f7, 0x6020,</div><div class='del'>-	0xd09c, 0x1130, 0x015e, 0x6152, 0x001e, 0x6027, 0x0008, 0x04a0,</div><div class='del'>-	0x080c, 0x2c29, 0x1f04, 0x279b, 0x015e, 0x6152, 0x001e, 0x6027,</div><div class='del'>-	0x0008, 0x0016, 0x6028, 0xc09c, 0x602a, 0x080c, 0xb244, 0x60e3,</div><div class='del'>-	0x0000, 0x080c, 0xf07f, 0x080c, 0xf09a, 0x080c, 0x57d9, 0xd0fc,</div><div class='del'>-	0x1138, 0x080c, 0xd7dc, 0x1120, 0x9085, 0x0001, 0x080c, 0x767b,</div><div class='del'>-	0x9006, 0x080c, 0x2d39, 0x2009, 0x0002, 0x080c, 0x2c67, 0x00e6,</div><div class='del'>-	0x2071, 0x1800, 0x7003, 0x0004, 0x080c, 0x0ea3, 0x00ee, 0x6027,</div><div class='del'>-	0x0008, 0x080c, 0x0ba0, 0x001e, 0x918c, 0xffd0, 0x6126, 0x00ae,</div><div class='del'>-	0x0005, 0x0016, 0x2001, 0x188b, 0x200c, 0xd184, 0x001e, 0x0904,</div><div class='del'>-	0x259b, 0x0016, 0x2009, 0x27ed, 0x00d0, 0x2001, 0x188b, 0x200c,</div><div class='del'>-	0xc184, 0x2102, 0x001e, 0x0c40, 0x0016, 0x2001, 0x188b, 0x200c,</div><div class='del'>-	0xd194, 0x001e, 0x0904, 0x259b, 0x0016, 0x2009, 0x2800, 0x0038,</div><div class='del'>-	0x2001, 0x188b, 0x200c, 0xc194, 0x2102, 0x001e, 0x08a8, 0x6028,</div><div class='del'>-	0xc0bc, 0x602a, 0x2001, 0x0156, 0x2003, 0xbc91, 0x8000, 0x2003,</div><div class='del'>-	0xffff, 0x6043, 0x0001, 0x080c, 0x2c61, 0x6027, 0x0080, 0x6017,</div><div class='del'>-	0x0000, 0x6043, 0x0000, 0x0817, 0x0006, 0x0016, 0x0026, 0x0036,</div><div class='del'>-	0x00e6, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2071, 0x1800, 0x71d0,</div><div class='del'>-	0x70d2, 0x9116, 0x0904, 0x286b, 0x81ff, 0x01a0, 0x2009, 0x0000,</div><div class='del'>-	0x080c, 0x2c67, 0x2011, 0x8011, 0x2019, 0x010e, 0x231c, 0x939e,</div><div class='del'>-	0x0007, 0x1118, 0x2019, 0x0001, 0x0010, 0x2019, 0x0000, 0x080c,</div><div class='del'>-	0x4c44, 0x0448, 0x2001, 0x19a9, 0x200c, 0x81ff, 0x1140, 0x2001,</div><div class='del'>-	0x0109, 0x2004, 0xd0b4, 0x0118, 0x2019, 0x0003, 0x0008, 0x2118,</div><div class='del'>-	0x2011, 0x8012, 0x080c, 0x4c44, 0x080c, 0x0ea3, 0x080c, 0x57d9,</div><div class='del'>-	0xd0fc, 0x1188, 0x080c, 0xd7dc, 0x1170, 0x00c6, 0x080c, 0x2907,</div><div class='del'>-	0x080c, 0xa9b0, 0x2061, 0x0100, 0x2019, 0x0028, 0x2009, 0x0002,</div><div class='del'>-	0x080c, 0x321b, 0x00ce, 0x012e, 0x00fe, 0x00ee, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x2028, 0x918c, 0x00ff, 0x2130, 0x9094,</div><div class='del'>-	0xff00, 0x11f0, 0x2011, 0x1837, 0x2214, 0xd2ac, 0x11c8, 0x81ff,</div><div class='del'>-	0x01e8, 0x2011, 0x181f, 0x2204, 0x9106, 0x1190, 0x2011, 0x1820,</div><div class='del'>-	0x2214, 0x9294, 0xff00, 0x9584, 0xff00, 0x9206, 0x1148, 0x2011,</div><div class='del'>-	0x1820, 0x2214, 0x9294, 0x00ff, 0x9584, 0x00ff, 0x9206, 0x1120,</div><div class='del'>-	0x2500, 0x080c, 0x83a5, 0x0048, 0x9584, 0x00ff, 0x9080, 0x33b6,</div><div class='del'>-	0x200d, 0x918c, 0xff00, 0x810f, 0x9006, 0x0005, 0x9080, 0x33b6,</div><div class='del'>-	0x200d, 0x918c, 0x00ff, 0x0005, 0x00d6, 0x2069, 0x0140, 0x2001,</div><div class='del'>-	0x1818, 0x2003, 0x00ef, 0x20a9, 0x0010, 0x9006, 0x6852, 0x6856,</div><div class='del'>-	0x1f04, 0x28b7, 0x00de, 0x0005, 0x0006, 0x00d6, 0x0026, 0x2069,</div><div class='del'>-	0x0140, 0x2001, 0x1818, 0x2102, 0x8114, 0x8214, 0x8214, 0x8214,</div><div class='del'>-	0x20a9, 0x0010, 0x6853, 0x0000, 0x9006, 0x82ff, 0x1128, 0x9184,</div><div class='del'>-	0x000f, 0x9080, 0xf880, 0x2005, 0x6856, 0x8211, 0x1f04, 0x28cc,</div><div class='del'>-	0x002e, 0x00de, 0x000e, 0x0005, 0x00c6, 0x2061, 0x1800, 0x6030,</div><div class='del'>-	0x0110, 0xc09d, 0x0008, 0xc09c, 0x6032, 0x00ce, 0x0005, 0x0156,</div><div class='del'>-	0x00d6, 0x0026, 0x0016, 0x0006, 0x2069, 0x0140, 0x6980, 0x9116,</div><div class='del'>-	0x0180, 0x9112, 0x1230, 0x8212, 0x8210, 0x22a8, 0x2001, 0x0402,</div><div class='del'>-	0x0018, 0x22a8, 0x2001, 0x0404, 0x680e, 0x1f04, 0x28fc, 0x680f,</div><div class='del'>-	0x0000, 0x000e, 0x001e, 0x002e, 0x00de, 0x015e, 0x0005, 0x080c,</div><div class='del'>-	0x57d5, 0xd0c4, 0x0150, 0xd0a4, 0x0140, 0x9006, 0x0046, 0x2020,</div><div class='del'>-	0x2009, 0x002e, 0x080c, 0xec31, 0x004e, 0x0005, 0x00f6, 0x0016,</div><div class='del'>-	0x0026, 0x2079, 0x0140, 0x78c4, 0xd0dc, 0x0904, 0x2973, 0x080c,</div><div class='del'>-	0x2bc6, 0x0660, 0x9084, 0x0700, 0x908e, 0x0600, 0x1120, 0x2011,</div><div class='del'>-	0x4000, 0x900e, 0x0458, 0x908e, 0x0500, 0x1120, 0x2011, 0x8000,</div><div class='del'>-	0x900e, 0x0420, 0x908e, 0x0400, 0x1120, 0x9016, 0x2009, 0x0001,</div><div class='del'>-	0x00e8, 0x908e, 0x0300, 0x1120, 0x9016, 0x2009, 0x0002, 0x00b0,</div><div class='del'>-	0x908e, 0x0200, 0x1120, 0x9016, 0x2009, 0x0004, 0x0078, 0x908e,</div><div class='del'>-	0x0100, 0x1548, 0x9016, 0x2009, 0x0008, 0x0040, 0x9084, 0x0700,</div><div class='del'>-	0x908e, 0x0300, 0x1500, 0x2011, 0x0030, 0x0058, 0x2300, 0x9080,</div><div class='del'>-	0x0020, 0x2018, 0x080c, 0x9375, 0x928c, 0xff00, 0x0110, 0x2011,</div><div class='del'>-	0x00ff, 0x2200, 0x8007, 0x9085, 0x004c, 0x78c2, 0x2009, 0x0138,</div><div class='del'>-	0x220a, 0x080c, 0x7637, 0x1118, 0x2009, 0x196d, 0x220a, 0x002e,</div><div class='del'>-	0x001e, 0x00fe, 0x0005, 0x78c3, 0x0000, 0x0cc8, 0x0126, 0x2091,</div><div class='del'>-	0x2800, 0x0006, 0x0016, 0x0026, 0x2001, 0x0170, 0x200c, 0x8000,</div><div class='del'>-	0x2014, 0x9184, 0x0003, 0x0110, 0x080c, 0x0dbe, 0x002e, 0x001e,</div><div class='del'>-	0x000e, 0x012e, 0x0005, 0x2001, 0x180d, 0x2004, 0xd08c, 0x0118,</div><div class='del'>-	0x2009, 0x0002, 0x0005, 0x2001, 0x0171, 0x2004, 0xd0dc, 0x0168,</div><div class='del'>-	0x2001, 0x0170, 0x200c, 0x918c, 0x00ff, 0x918e, 0x004c, 0x1128,</div><div class='del'>-	0x200c, 0x918c, 0xff00, 0x810f, 0x0005, 0x900e, 0x2001, 0x0227,</div><div class='del'>-	0x2004, 0x8007, 0x9084, 0x00ff, 0x8004, 0x9108, 0x2001, 0x0226,</div><div class='del'>-	0x2004, 0x8007, 0x9084, 0x00ff, 0x8004, 0x9108, 0x0005, 0x0018,</div><div class='del'>-	0x000c, 0x0018, 0x0020, 0x1000, 0x0800, 0x1000, 0x1800, 0x0156,</div><div class='del'>-	0x0006, 0x0016, 0x0026, 0x00e6, 0x2001, 0x1990, 0x2004, 0x908a,</div><div class='del'>-	0x0007, 0x1a0c, 0x0dc5, 0x0033, 0x00ee, 0x002e, 0x001e, 0x000e,</div><div class='del'>-	0x015e, 0x0005, 0x29d9, 0x29f7, 0x2a1b, 0x2a1d, 0x2a46, 0x2a48,</div><div class='del'>-	0x2a4a, 0x2001, 0x0001, 0x080c, 0x281c, 0x080c, 0x2c24, 0x2001,</div><div class='del'>-	0x1992, 0x2003, 0x0000, 0x7828, 0x9084, 0xe1d7, 0x782a, 0x9006,</div><div class='del'>-	0x20a9, 0x0009, 0x080c, 0x2be2, 0x2001, 0x1990, 0x2003, 0x0006,</div><div class='del'>-	0x2009, 0x001e, 0x2011, 0x2a4b, 0x080c, 0x88d5, 0x0005, 0x2009,</div><div class='del'>-	0x1995, 0x200b, 0x0000, 0x2001, 0x199a, 0x2003, 0x0036, 0x2001,</div><div class='del'>-	0x1999, 0x2003, 0x002a, 0x2001, 0x1992, 0x2003, 0x0001, 0x9006,</div><div class='del'>-	0x080c, 0x2b94, 0x2001, 0xffff, 0x20a9, 0x0009, 0x080c, 0x2be2,</div><div class='del'>-	0x2001, 0x1990, 0x2003, 0x0006, 0x2009, 0x001e, 0x2011, 0x2a4b,</div><div class='del'>-	0x080c, 0x88d5, 0x0005, 0x080c, 0x0dc5, 0x2001, 0x199a, 0x2003,</div><div class='del'>-	0x0036, 0x2001, 0x1992, 0x2003, 0x0003, 0x7a38, 0x9294, 0x0005,</div><div class='del'>-	0x9296, 0x0004, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x2b94, 0x2001, 0x1996, 0x2003, 0x0000, 0x2001, 0xffff, 0x20a9,</div><div class='del'>-	0x0009, 0x080c, 0x2be2, 0x2001, 0x1990, 0x2003, 0x0006, 0x2009,</div><div class='del'>-	0x001e, 0x2011, 0x2a4b, 0x080c, 0x88d5, 0x0005, 0x080c, 0x0dc5,</div><div class='del'>-	0x080c, 0x0dc5, 0x0005, 0x0006, 0x0016, 0x0026, 0x00e6, 0x00f6,</div><div class='del'>-	0x0156, 0x0126, 0x2091, 0x8000, 0x2079, 0x0100, 0x2001, 0x1992,</div><div class='del'>-	0x2004, 0x908a, 0x0007, 0x1a0c, 0x0dc5, 0x0043, 0x012e, 0x015e,</div><div class='del'>-	0x00fe, 0x00ee, 0x002e, 0x001e, 0x000e, 0x0005, 0x2a6d, 0x2a89,</div><div class='del'>-	0x2ac5, 0x2af1, 0x2b11, 0x2b1d, 0x2b1f, 0x080c, 0x2bd6, 0x1190,</div><div class='del'>-	0x2009, 0x1998, 0x2104, 0x7a38, 0x9294, 0x0005, 0x9296, 0x0004,</div><div class='del'>-	0x0110, 0xc08d, 0x0008, 0xc085, 0x200a, 0x2001, 0x1990, 0x2003,</div><div class='del'>-	0x0001, 0x0030, 0x080c, 0x2b43, 0x2001, 0xffff, 0x080c, 0x29e8,</div><div class='del'>-	0x0005, 0x080c, 0x2b21, 0x05c0, 0x2009, 0x1999, 0x2104, 0x8001,</div><div class='del'>-	0x200a, 0x080c, 0x2bd6, 0x1158, 0x7a38, 0x9294, 0x0005, 0x9296,</div><div class='del'>-	0x0005, 0x0518, 0x2009, 0x1998, 0x2104, 0xc085, 0x200a, 0x2009,</div><div class='del'>-	0x1995, 0x2104, 0x8000, 0x200a, 0x9086, 0x0005, 0x0118, 0x080c,</div><div class='del'>-	0x2b29, 0x00c0, 0x200b, 0x0000, 0x7a38, 0x9294, 0x0006, 0x9296,</div><div class='del'>-	0x0004, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001, 0x080c, 0x2bb1,</div><div class='del'>-	0x2001, 0x1992, 0x2003, 0x0002, 0x0028, 0x2001, 0x1990, 0x2003,</div><div class='del'>-	0x0003, 0x0010, 0x080c, 0x2a0a, 0x0005, 0x080c, 0x2b21, 0x0540,</div><div class='del'>-	0x2009, 0x1999, 0x2104, 0x8001, 0x200a, 0x080c, 0x2bd6, 0x1148,</div><div class='del'>-	0x2001, 0x1990, 0x2003, 0x0003, 0x2001, 0x1991, 0x2003, 0x0000,</div><div class='del'>-	0x00b8, 0x2009, 0x1999, 0x2104, 0x9005, 0x1118, 0x080c, 0x2b66,</div><div class='del'>-	0x0010, 0x080c, 0x2b36, 0x080c, 0x2b29, 0x2009, 0x1995, 0x200b,</div><div class='del'>-	0x0000, 0x2001, 0x1992, 0x2003, 0x0001, 0x080c, 0x2a0a, 0x0000,</div><div class='del'>-	0x0005, 0x0479, 0x01e8, 0x080c, 0x2bd6, 0x1198, 0x2009, 0x1996,</div><div class='del'>-	0x2104, 0x8000, 0x200a, 0x9086, 0x0007, 0x0108, 0x0078, 0x2001,</div><div class='del'>-	0x199b, 0x2003, 0x000a, 0x2009, 0x1998, 0x2104, 0xc0fd, 0x200a,</div><div class='del'>-	0x0038, 0x00f9, 0x2001, 0x1992, 0x2003, 0x0004, 0x080c, 0x2a35,</div><div class='del'>-	0x0005, 0x0079, 0x0148, 0x080c, 0x2bd6, 0x1118, 0x080c, 0x2a21,</div><div class='del'>-	0x0018, 0x0079, 0x080c, 0x2a35, 0x0005, 0x080c, 0x0dc5, 0x080c,</div><div class='del'>-	0x0dc5, 0x2009, 0x199a, 0x2104, 0x8001, 0x200a, 0x090c, 0x2b82,</div><div class='del'>-	0x0005, 0x7a38, 0x9294, 0x0005, 0x9296, 0x0005, 0x0110, 0x9006,</div><div class='del'>-	0x0010, 0x2001, 0x0001, 0x080c, 0x2bb1, 0x0005, 0x7a38, 0x9294,</div><div class='del'>-	0x0006, 0x9296, 0x0006, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x2b94, 0x0005, 0x2009, 0x1995, 0x2104, 0x8000, 0x200a,</div><div class='del'>-	0x9086, 0x0005, 0x0108, 0x0068, 0x200b, 0x0000, 0x7a38, 0x9294,</div><div class='del'>-	0x0006, 0x9296, 0x0006, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001,</div><div class='del'>-	0x04d9, 0x7a38, 0x9294, 0x0005, 0x9296, 0x0005, 0x0110, 0x9006,</div><div class='del'>-	0x0010, 0x2001, 0x0001, 0x080c, 0x2bb1, 0x0005, 0x0086, 0x2001,</div><div class='del'>-	0x1998, 0x2004, 0x9084, 0x7fff, 0x090c, 0x0dc5, 0x2009, 0x1997,</div><div class='del'>-	0x2144, 0x8846, 0x280a, 0x9844, 0x0dd8, 0xd08c, 0x1120, 0xd084,</div><div class='del'>-	0x1120, 0x080c, 0x0dc5, 0x9006, 0x0010, 0x2001, 0x0001, 0x00a1,</div><div class='del'>-	0x008e, 0x0005, 0x0006, 0x0156, 0x2001, 0x1990, 0x20a9, 0x0009,</div><div class='del'>-	0x2003, 0x0000, 0x8000, 0x1f04, 0x2b88, 0x2001, 0x1997, 0x2003,</div><div class='del'>-	0x8000, 0x015e, 0x000e, 0x0005, 0x00f6, 0x2079, 0x0100, 0x9085,</div><div class='del'>-	0x0000, 0x0158, 0x7838, 0x9084, 0xfff9, 0x9085, 0x0004, 0x783a,</div><div class='del'>-	0x2009, 0x199d, 0x210c, 0x795a, 0x0050, 0x7838, 0x9084, 0xfffb,</div><div class='del'>-	0x9085, 0x0006, 0x783a, 0x2009, 0x199e, 0x210c, 0x795a, 0x00fe,</div><div class='del'>-	0x0005, 0x00f6, 0x2079, 0x0100, 0x9085, 0x0000, 0x0138, 0x7838,</div><div class='del'>-	0x9084, 0xfffa, 0x9085, 0x0004, 0x783a, 0x0030, 0x7838, 0x9084,</div><div class='del'>-	0xfffb, 0x9085, 0x0005, 0x783a, 0x00fe, 0x0005, 0x0006, 0x2001,</div><div class='del'>-	0x0100, 0x2004, 0x9082, 0x0007, 0x000e, 0x0005, 0x0006, 0x2001,</div><div class='del'>-	0x0100, 0x2004, 0x9082, 0x0009, 0x000e, 0x0005, 0x0156, 0x20a9,</div><div class='del'>-	0x0064, 0x7820, 0x080c, 0x2c61, 0xd09c, 0x1110, 0x1f04, 0x2bd9,</div><div class='del'>-	0x015e, 0x0005, 0x0126, 0x0016, 0x0006, 0x2091, 0x8000, 0x7850,</div><div class='del'>-	0x9085, 0x0040, 0x7852, 0x7850, 0x9084, 0xfbcf, 0x7852, 0x080c,</div><div class='del'>-	0x2c61, 0x9085, 0x2000, 0x7852, 0x000e, 0x2008, 0x9186, 0x0000,</div><div class='del'>-	0x1118, 0x783b, 0x0007, 0x0090, 0x9186, 0x0001, 0x1118, 0x783b,</div><div class='del'>-	0x0006, 0x0060, 0x9186, 0x0002, 0x1118, 0x783b, 0x0005, 0x0030,</div><div class='del'>-	0x9186, 0x0003, 0x1118, 0x783b, 0x0004, 0x0000, 0x0006, 0x1d04,</div><div class='del'>-	0x2c0f, 0x080c, 0x88f7, 0x1f04, 0x2c0f, 0x7850, 0x9085, 0x0400,</div><div class='del'>-	0x9084, 0xdfbf, 0x7852, 0x080c, 0x2c61, 0x9085, 0x1000, 0x7852,</div><div class='del'>-	0x000e, 0x001e, 0x012e, 0x0005, 0x7850, 0x9084, 0xffcf, 0x7852,</div><div class='del'>-	0x0005, 0x0006, 0x0156, 0x00f6, 0x2079, 0x0100, 0x20a9, 0x000a,</div><div class='del'>-	0x7854, 0xd0ac, 0x1130, 0x7820, 0xd0e4, 0x1140, 0x1f04, 0x2c33,</div><div class='del'>-	0x0028, 0x7854, 0xd08c, 0x1110, 0x1f04, 0x2c39, 0x00fe, 0x015e,</div><div class='del'>-	0x000e, 0x0005, 0x1d04, 0x2c42, 0x080c, 0x88f7, 0x1f04, 0x2c42,</div><div class='del'>-	0x0005, 0x0006, 0x2001, 0x199c, 0x2004, 0x9086, 0x0000, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x2001, 0x199c, 0x2004, 0x9086, 0x0001, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x2001, 0x199c, 0x2004, 0x9086, 0x0002, 0x000e,</div><div class='del'>-	0x0005, 0xa001, 0xa001, 0xa001, 0xa001, 0xa001, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x19a9, 0x2102, 0x000e, 0x0005, 0x2009, 0x0171, 0x2104,</div><div class='del'>-	0xd0dc, 0x0140, 0x2009, 0x0170, 0x2104, 0x200b, 0x0080, 0xa001,</div><div class='del'>-	0xa001, 0x200a, 0x0005, 0x0036, 0x0046, 0x2001, 0x0141, 0x200c,</div><div class='del'>-	0x918c, 0xff00, 0x9186, 0x2100, 0x0140, 0x9186, 0x2000, 0x0170,</div><div class='del'>-	0x9186, 0x0100, 0x1904, 0x2cda, 0x0048, 0x0016, 0x2009, 0x1a87,</div><div class='del'>-	0x2104, 0x8000, 0x0208, 0x200a, 0x001e, 0x04f0, 0x2009, 0x00a2,</div><div class='del'>-	0x080c, 0x0e52, 0x2019, 0x0160, 0x2324, 0x2011, 0x0003, 0x2009,</div><div class='del'>-	0x0169, 0x2104, 0x9084, 0x0007, 0x210c, 0x918c, 0x0007, 0x910e,</div><div class='del'>-	0x1db0, 0x9086, 0x0003, 0x1548, 0x2304, 0x0066, 0x0076, 0x2031,</div><div class='del'>-	0x0002, 0x233c, 0x973e, 0x0148, 0x8631, 0x1dd8, 0x2031, 0x1a88,</div><div class='del'>-	0x263c, 0x8738, 0x0208, 0x2732, 0x2304, 0x007e, 0x006e, 0x9402,</div><div class='del'>-	0x02a0, 0x19d0, 0x8211, 0x19d8, 0x84ff, 0x0170, 0x2001, 0x0141,</div><div class='del'>-	0x200c, 0x918c, 0xff00, 0x9186, 0x0100, 0x0130, 0x2009, 0x180c,</div><div class='del'>-	0x2104, 0xc0dd, 0x200a, 0x0008, 0x0421, 0x2001, 0x1981, 0x200c,</div><div class='del'>-	0x080c, 0x0e52, 0x004e, 0x003e, 0x0005, 0x2001, 0x180c, 0x2004,</div><div class='del'>-	0xd0dc, 0x01b0, 0x2001, 0x0160, 0x2004, 0x9005, 0x0140, 0x2001,</div><div class='del'>-	0x0141, 0x2004, 0x9084, 0xff00, 0x9086, 0x0100, 0x1148, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x0016, 0x0026, 0x0021, 0x002e, 0x001e, 0x012e,</div><div class='del'>-	0x0005, 0x00c6, 0x2061, 0x0100, 0x6014, 0x0006, 0x2001, 0x0161,</div><div class='del'>-	0x2003, 0x0000, 0x6017, 0x0018, 0xa001, 0xa001, 0x602f, 0x0008,</div><div class='del'>-	0x6104, 0x918e, 0x0010, 0x6106, 0x918e, 0x0010, 0x6106, 0x6017,</div><div class='del'>-	0x0040, 0x04b9, 0x001e, 0x9184, 0x0003, 0x01e0, 0x0036, 0x0016,</div><div class='del'>-	0x2019, 0x0141, 0x6124, 0x918c, 0x0028, 0x1120, 0x2304, 0x9084,</div><div class='del'>-	0x2800, 0x0dc0, 0x001e, 0x919c, 0xffe4, 0x9184, 0x0001, 0x0118,</div><div class='del'>-	0x9385, 0x0009, 0x6016, 0x9184, 0x0002, 0x0118, 0x9385, 0x0012,</div><div class='del'>-	0x6016, 0x003e, 0x2001, 0x180c, 0x200c, 0xc1dc, 0x2102, 0x00ce,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x080c, 0x7651, 0x0108, 0xc0bc, 0x2009,</div><div class='del'>-	0x0140, 0x2114, 0x9294, 0x0001, 0x9215, 0x220a, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x2009, 0x0140, 0x2114, 0x9294, 0x0001,</div><div class='del'>-	0x9285, 0x1000, 0x200a, 0x220a, 0x002e, 0x001e, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x2009, 0x0140, 0x2114, 0x9294, 0x0001, 0x9215, 0x220a,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0006, 0x0016, 0x2009, 0x0140, 0x2104,</div><div class='del'>-	0x1128, 0x080c, 0x7651, 0x0110, 0xc0bc, 0x0008, 0xc0bd, 0x200a,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x0006, 0x0156, 0x6050, 0x9085, 0x0040,</div><div class='del'>-	0x6052, 0x6050, 0x9084, 0xfbcf, 0x6052, 0x080c, 0x2c61, 0x9085,</div><div class='del'>-	0x2000, 0x6052, 0x20a9, 0x0012, 0x1d04, 0x2d84, 0x080c, 0x88f7,</div><div class='del'>-	0x1f04, 0x2d84, 0x6050, 0x9085, 0x0400, 0x9084, 0xdfbf, 0x6052,</div><div class='del'>-	0x015e, 0x000e, 0x0005, 0x2fff, 0x2fff, 0x2e23, 0x2e23, 0x2e2f,</div><div class='del'>-	0x2e2f, 0x2e3b, 0x2e3b, 0x2e49, 0x2e49, 0x2e55, 0x2e55, 0x2e63,</div><div class='del'>-	0x2e63, 0x2e71, 0x2e71, 0x2e83, 0x2e83, 0x2e8f, 0x2e8f, 0x2e9d,</div><div class='del'>-	0x2e9d, 0x2ebb, 0x2ebb, 0x2edb, 0x2edb, 0x2eab, 0x2eab, 0x2ecb,</div><div class='del'>-	0x2ecb, 0x2ee9, 0x2ee9, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2efb, 0x2efb, 0x2f07, 0x2f07, 0x2f15,</div><div class='del'>-	0x2f15, 0x2f23, 0x2f23, 0x2f33, 0x2f33, 0x2f41, 0x2f41, 0x2f51,</div><div class='del'>-	0x2f51, 0x2f61, 0x2f61, 0x2f73, 0x2f73, 0x2f81, 0x2f81, 0x2f91,</div><div class='del'>-	0x2f91, 0x2fb3, 0x2fb3, 0x2fd5, 0x2fd5, 0x2fa1, 0x2fa1, 0x2fc4,</div><div class='del'>-	0x2fc4, 0x2fe4, 0x2fe4, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81, 0x2e81,</div><div class='del'>-	0x2e81, 0x2e81, 0x2e81, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x24c0, 0x0804, 0x2ff7, 0x0106,</div><div class='del'>-	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,</div><div class='del'>-	0x22cc, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x22cc, 0x080c, 0x24c0, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126,</div><div class='del'>-	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x24c0, 0x080c,</div><div class='del'>-	0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x22cc, 0x080c, 0x2307, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x22cc, 0x080c, 0x24c0, 0x080c, 0x2307, 0x0804,</div><div class='del'>-	0x2ff7, 0xa001, 0x0cf0, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x1394, 0x0804, 0x2ff7, 0x0106,</div><div class='del'>-	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,</div><div class='del'>-	0x24c0, 0x080c, 0x1394, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126,</div><div class='del'>-	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x22cc, 0x080c,</div><div class='del'>-	0x1394, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x24c0, 0x080c, 0x1394, 0x080c,</div><div class='del'>-	0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x22cc, 0x080c, 0x24c0, 0x080c,</div><div class='del'>-	0x1394, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x22cc, 0x080c, 0x1394, 0x080c,</div><div class='del'>-	0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x1394, 0x080c, 0x2307, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x22cc, 0x080c, 0x24c0, 0x080c, 0x1394, 0x080c,</div><div class='del'>-	0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x0804, 0x2ff7, 0x0106,</div><div class='del'>-	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,</div><div class='del'>-	0x2976, 0x080c, 0x24c0, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126,</div><div class='del'>-	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c,</div><div class='del'>-	0x22cc, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c, 0x22cc, 0x080c,</div><div class='del'>-	0x24c0, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c, 0x2307, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2976, 0x080c, 0x24c0, 0x080c, 0x2307, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2976, 0x080c, 0x22cc, 0x080c, 0x2307, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2976, 0x080c, 0x22cc, 0x080c, 0x24c0, 0x080c,</div><div class='del'>-	0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c, 0x1394, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2976, 0x080c, 0x24c0, 0x080c, 0x1394, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2976, 0x080c, 0x22cc, 0x080c, 0x1394, 0x0804,</div><div class='del'>-	0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x2976, 0x080c, 0x24c0, 0x080c, 0x1394, 0x080c,</div><div class='del'>-	0x2307, 0x0804, 0x2ff7, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c, 0x22cc, 0x080c,</div><div class='del'>-	0x24c0, 0x080c, 0x1394, 0x0498, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c, 0x22cc,</div><div class='del'>-	0x080c, 0x1394, 0x080c, 0x2307, 0x0410, 0x0106, 0x0006, 0x0126,</div><div class='del'>-	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c,</div><div class='del'>-	0x1394, 0x080c, 0x2307, 0x0098, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x2976, 0x080c, 0x22cc,</div><div class='del'>-	0x080c, 0x24c0, 0x080c, 0x1394, 0x080c, 0x2307, 0x0000, 0x015e,</div><div class='del'>-	0x014e, 0x013e, 0x01de, 0x01ce, 0x012e, 0x000e, 0x010e, 0x000d,</div><div class='del'>-	0x00b6, 0x00c6, 0x0026, 0x0046, 0x9026, 0x080c, 0x6a61, 0x1904,</div><div class='del'>-	0x3137, 0x72dc, 0x2001, 0x197c, 0x2004, 0x9005, 0x1110, 0xd29c,</div><div class='del'>-	0x0148, 0xd284, 0x1138, 0xd2bc, 0x1904, 0x3137, 0x080c, 0x313c,</div><div class='del'>-	0x0804, 0x3137, 0xd2cc, 0x1904, 0x3137, 0x080c, 0x7637, 0x1120,</div><div class='del'>-	0x70af, 0xffff, 0x0804, 0x3137, 0xd294, 0x0120, 0x70af, 0xffff,</div><div class='del'>-	0x0804, 0x3137, 0x080c, 0x33a5, 0x0160, 0x080c, 0xd7e3, 0x0128,</div><div class='del'>-	0x2001, 0x1818, 0x203c, 0x0804, 0x30b0, 0x70af, 0xffff, 0x0804,</div><div class='del'>-	0x3137, 0x2001, 0x1818, 0x203c, 0x7294, 0xd284, 0x0904, 0x30b0,</div><div class='del'>-	0xd28c, 0x1904, 0x30b0, 0x0036, 0x73ac, 0x938e, 0xffff, 0x1110,</div><div class='del'>-	0x2019, 0x0001, 0x8314, 0x92e0, 0x1c80, 0x2c04, 0x938c, 0x0001,</div><div class='del'>-	0x0120, 0x9084, 0xff00, 0x8007, 0x0010, 0x9084, 0x00ff, 0x970e,</div><div class='del'>-	0x0904, 0x30a6, 0x908e, 0x0000, 0x0904, 0x30a6, 0x908e, 0x00ff,</div><div class='del'>-	0x1160, 0x7230, 0xd284, 0x1904, 0x30ab, 0x7294, 0xc28d, 0x7296,</div><div class='del'>-	0x70af, 0xffff, 0x003e, 0x0804, 0x30b0, 0x2009, 0x180d, 0x210c,</div><div class='del'>-	0xd18c, 0x0150, 0x0026, 0x2011, 0x0010, 0x080c, 0x6ac7, 0x002e,</div><div class='del'>-	0x0118, 0x70af, 0xffff, 0x0488, 0x900e, 0x080c, 0x2873, 0x080c,</div><div class='del'>-	0x66b9, 0x1538, 0x9006, 0xb8bb, 0x0520, 0xb8ac, 0x9005, 0x0148,</div><div class='del'>-	0x00c6, 0x2060, 0x080c, 0x8cf7, 0x00ce, 0x090c, 0x9096, 0xb8af,</div><div class='del'>-	0x0000, 0x080c, 0x6aa3, 0x1168, 0x7030, 0xd08c, 0x0130, 0xb800,</div><div class='del'>-	0xd0bc, 0x0138, 0x080c, 0x6944, 0x0120, 0x080c, 0x3155, 0x0148,</div><div class='del'>-	0x0028, 0x080c, 0x3295, 0x080c, 0x3181, 0x0118, 0x8318, 0x0804,</div><div class='del'>-	0x304a, 0x73ae, 0x0010, 0x70af, 0xffff, 0x003e, 0x0804, 0x3137,</div><div class='del'>-	0x9780, 0x33b6, 0x203d, 0x97bc, 0xff00, 0x873f, 0x2041, 0x007e,</div><div class='del'>-	0x70ac, 0x9096, 0xffff, 0x1118, 0x900e, 0x28a8, 0x0050, 0x9812,</div><div class='del'>-	0x0220, 0x2008, 0x9802, 0x20a8, 0x0020, 0x70af, 0xffff, 0x0804,</div><div class='del'>-	0x3137, 0x2700, 0x0156, 0x0016, 0x9106, 0x0904, 0x312c, 0x2001,</div><div class='del'>-	0x180d, 0x2004, 0xd08c, 0x0158, 0x0026, 0x2011, 0x0010, 0x080c,</div><div class='del'>-	0x6ac7, 0x002e, 0x0120, 0x2009, 0xffff, 0x0804, 0x3134, 0xc484,</div><div class='del'>-	0x080c, 0x6724, 0x0168, 0x080c, 0xd7e3, 0x1904, 0x312c, 0x080c,</div><div class='del'>-	0x33a5, 0x1904, 0x312c, 0x080c, 0x66b9, 0x1904, 0x3134, 0x0008,</div><div class='del'>-	0xc485, 0xb8bb, 0x0520, 0xb8ac, 0x9005, 0x0148, 0x00c6, 0x2060,</div><div class='del'>-	0x080c, 0x8cf7, 0x00ce, 0x090c, 0x9096, 0xb8af, 0x0000, 0x080c,</div><div class='del'>-	0x6aa3, 0x1130, 0x7030, 0xd08c, 0x01f8, 0xb800, 0xd0bc, 0x11e0,</div><div class='del'>-	0x7294, 0xd28c, 0x0180, 0x080c, 0x6aa3, 0x9082, 0x0006, 0x02e0,</div><div class='del'>-	0xd484, 0x1118, 0x080c, 0x66de, 0x0028, 0x080c, 0x3321, 0x01a0,</div><div class='del'>-	0x080c, 0x334c, 0x0088, 0x080c, 0x3295, 0x080c, 0xd7e3, 0x1160,</div><div class='del'>-	0x080c, 0x3181, 0x0188, 0x0040, 0x080c, 0xd7e3, 0x1118, 0x080c,</div><div class='del'>-	0x3321, 0x0110, 0x0451, 0x0140, 0x001e, 0x8108, 0x015e, 0x1f04,</div><div class='del'>-	0x30c9, 0x70af, 0xffff, 0x0018, 0x001e, 0x015e, 0x71ae, 0x004e,</div><div class='del'>-	0x002e, 0x00ce, 0x00be, 0x0005, 0x00c6, 0x0016, 0x70af, 0x0001,</div><div class='del'>-	0x2009, 0x007e, 0x080c, 0x66b9, 0x1168, 0xb813, 0x00ff, 0xb817,</div><div class='del'>-	0xfffe, 0x080c, 0x3295, 0x04a9, 0x0128, 0x70dc, 0xc0bd, 0x70de,</div><div class='del'>-	0x080c, 0xd52b, 0x001e, 0x00ce, 0x0005, 0x0016, 0x0076, 0x00d6,</div><div class='del'>-	0x00c6, 0x2001, 0x184c, 0x2004, 0x9084, 0x00ff, 0xb842, 0x080c,</div><div class='del'>-	0xb325, 0x01d0, 0x2b00, 0x6012, 0x080c, 0xd554, 0x6023, 0x0001,</div><div class='del'>-	0x9006, 0x080c, 0x6656, 0x2001, 0x0000, 0x080c, 0x666a, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x70a8, 0x8000, 0x70aa, 0x012e, 0x2009, 0x0004,</div><div class='del'>-	0x080c, 0xb352, 0x9085, 0x0001, 0x00ce, 0x00de, 0x007e, 0x001e,</div><div class='del'>-	0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6, 0x2001, 0x184c, 0x2004,</div><div class='del'>-	0x9084, 0x00ff, 0xb842, 0x080c, 0xb325, 0x0548, 0x2b00, 0x6012,</div><div class='del'>-	0xb800, 0xc0c4, 0xb802, 0xb8a0, 0x9086, 0x007e, 0x0140, 0xb804,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x0006, 0x1110, 0x080c, 0x3250, 0x080c,</div><div class='del'>-	0xd554, 0x6023, 0x0001, 0x9006, 0x080c, 0x6656, 0x2001, 0x0002,</div><div class='del'>-	0x080c, 0x666a, 0x0126, 0x2091, 0x8000, 0x70a8, 0x8000, 0x70aa,</div><div class='del'>-	0x012e, 0x2009, 0x0002, 0x080c, 0xb352, 0x9085, 0x0001, 0x00ce,</div><div class='del'>-	0x00de, 0x007e, 0x001e, 0x0005, 0x00b6, 0x00c6, 0x0026, 0x2009,</div><div class='del'>-	0x0080, 0x080c, 0x66b9, 0x1140, 0xb813, 0x00ff, 0xb817, 0xfffc,</div><div class='del'>-	0x0039, 0x0110, 0x70e3, 0xffff, 0x002e, 0x00ce, 0x00be, 0x0005,</div><div class='del'>-	0x0016, 0x0076, 0x00d6, 0x00c6, 0x080c, 0xb27d, 0x01d0, 0x2b00,</div><div class='del'>-	0x6012, 0x080c, 0xd554, 0x6023, 0x0001, 0x9006, 0x080c, 0x6656,</div><div class='del'>-	0x2001, 0x0002, 0x080c, 0x666a, 0x0126, 0x2091, 0x8000, 0x70e4,</div><div class='del'>-	0x8000, 0x70e6, 0x012e, 0x2009, 0x0002, 0x080c, 0xb352, 0x9085,</div><div class='del'>-	0x0001, 0x00ce, 0x00de, 0x007e, 0x001e, 0x0005, 0x00c6, 0x00d6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2009, 0x007f, 0x080c, 0x66b9, 0x11b8,</div><div class='del'>-	0xb813, 0x00ff, 0xb817, 0xfffd, 0xb8cf, 0x0004, 0x080c, 0xb27d,</div><div class='del'>-	0x0170, 0x2b00, 0x6012, 0x6316, 0x6023, 0x0001, 0x620a, 0x080c,</div><div class='del'>-	0xd554, 0x2009, 0x0022, 0x080c, 0xb352, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x00de, 0x00ce, 0x0005, 0x00e6, 0x00c6, 0x0066, 0x0036, 0x0026,</div><div class='del'>-	0x00b6, 0x21f0, 0x080c, 0x96af, 0x080c, 0x962f, 0x080c, 0xb111,</div><div class='del'>-	0x080c, 0xc2d3, 0x3e08, 0x2130, 0x81ff, 0x0120, 0x20a9, 0x007e,</div><div class='del'>-	0x900e, 0x0018, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x6724,</div><div class='del'>-	0x1140, 0x9686, 0x0002, 0x1118, 0xb800, 0xd0bc, 0x1110, 0x080c,</div><div class='del'>-	0x6148, 0x001e, 0x8108, 0x1f04, 0x3235, 0x9686, 0x0001, 0x190c,</div><div class='del'>-	0x3379, 0x00be, 0x002e, 0x003e, 0x006e, 0x00ce, 0x00ee, 0x0005,</div><div class='del'>-	0x00e6, 0x00c6, 0x0046, 0x0036, 0x0026, 0x0016, 0x00b6, 0x6210,</div><div class='del'>-	0x2258, 0xbaa0, 0x0026, 0x2019, 0x0029, 0x080c, 0x96a4, 0x0076,</div><div class='del'>-	0x2039, 0x0000, 0x080c, 0x9577, 0x2c08, 0x080c, 0xe91c, 0x007e,</div><div class='del'>-	0x001e, 0xba10, 0xbb14, 0xbcc0, 0x080c, 0x6148, 0xba12, 0xbb16,</div><div class='del'>-	0xbcc2, 0x00be, 0x001e, 0x002e, 0x003e, 0x004e, 0x00ce, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x0006, 0x00b6, 0x6010, 0x2058, 0xb8a0, 0x00be,</div><div class='del'>-	0x9086, 0x0080, 0x0150, 0x2071, 0x1800, 0x70a8, 0x9005, 0x0110,</div><div class='del'>-	0x8001, 0x70aa, 0x000e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x70e4,</div><div class='del'>-	0x9005, 0x0dc0, 0x8001, 0x70e6, 0x0ca8, 0xb800, 0xc08c, 0xb802,</div><div class='del'>-	0x0005, 0x00f6, 0x00e6, 0x00c6, 0x00b6, 0x0046, 0x0036, 0x0026,</div><div class='del'>-	0x0016, 0x0156, 0x2178, 0x81ff, 0x1118, 0x20a9, 0x0001, 0x0078,</div><div class='del'>-	0x080c, 0x57d5, 0xd0c4, 0x0140, 0xd0a4, 0x0130, 0x9006, 0x2020,</div><div class='del'>-	0x2009, 0x002d, 0x080c, 0xec31, 0x20a9, 0x0800, 0x9016, 0x0026,</div><div class='del'>-	0x928e, 0x007e, 0x0904, 0x3300, 0x928e, 0x007f, 0x0904, 0x3300,</div><div class='del'>-	0x928e, 0x0080, 0x05e8, 0x9288, 0x1000, 0x210c, 0x81ff, 0x05c0,</div><div class='del'>-	0x8fff, 0x1148, 0x2001, 0x198e, 0x0006, 0x2003, 0x0001, 0x04f1,</div><div class='del'>-	0x000e, 0x2003, 0x0000, 0x00b6, 0x00c6, 0x2158, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x6a6d, 0x00ce, 0x00be, 0x2019, 0x0029, 0x080c, 0x96a4,</div><div class='del'>-	0x0076, 0x2039, 0x0000, 0x080c, 0x9577, 0x00b6, 0x00c6, 0x0026,</div><div class='del'>-	0x2158, 0xba04, 0x9294, 0x00ff, 0x9286, 0x0006, 0x1118, 0xb807,</div><div class='del'>-	0x0404, 0x0028, 0x2001, 0x0004, 0x8007, 0x9215, 0xba06, 0x002e,</div><div class='del'>-	0x00ce, 0x00be, 0x0016, 0x2c08, 0x080c, 0xe91c, 0x001e, 0x007e,</div><div class='del'>-	0x002e, 0x8210, 0x1f04, 0x32b7, 0x015e, 0x001e, 0x002e, 0x003e,</div><div class='del'>-	0x004e, 0x00be, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x0046, 0x0026,</div><div class='del'>-	0x0016, 0x080c, 0x57d5, 0xd0c4, 0x0140, 0xd0a4, 0x0130, 0x9006,</div><div class='del'>-	0x2220, 0x2009, 0x0029, 0x080c, 0xec31, 0x001e, 0x002e, 0x004e,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x0036, 0x00c6, 0x7294, 0x82ff, 0x01e8,</div><div class='del'>-	0x080c, 0x6a9b, 0x11d0, 0x2100, 0x080c, 0x28a6, 0x81ff, 0x01b8,</div><div class='del'>-	0x2019, 0x0001, 0x8314, 0x92e0, 0x1c80, 0x2c04, 0xd384, 0x0120,</div><div class='del'>-	0x9084, 0xff00, 0x8007, 0x0010, 0x9084, 0x00ff, 0x9116, 0x0138,</div><div class='del'>-	0x9096, 0x00ff, 0x0110, 0x8318, 0x0c68, 0x9085, 0x0001, 0x00ce,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x0005, 0x0016, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x0036, 0x2019, 0x0029, 0x00a9, 0x003e, 0x9180, 0x1000,</div><div class='del'>-	0x2004, 0x9065, 0x0158, 0x0016, 0x00c6, 0x2061, 0x1ab7, 0x001e,</div><div class='del'>-	0x6112, 0x080c, 0x3250, 0x001e, 0x080c, 0x66de, 0x012e, 0x00ce,</div><div class='del'>-	0x001e, 0x0005, 0x0016, 0x0026, 0x2110, 0x080c, 0xac6c, 0x080c,</div><div class='del'>-	0xef94, 0x002e, 0x001e, 0x0005, 0x2001, 0x1837, 0x2004, 0xd0cc,</div><div class='del'>-	0x0005, 0x00c6, 0x00b6, 0x080c, 0x7637, 0x1118, 0x20a9, 0x0800,</div><div class='del'>-	0x0010, 0x20a9, 0x0782, 0x080c, 0x7637, 0x1110, 0x900e, 0x0010,</div><div class='del'>-	0x2009, 0x007e, 0x9180, 0x1000, 0x2004, 0x905d, 0x0130, 0x86ff,</div><div class='del'>-	0x0110, 0xb800, 0xd0bc, 0x090c, 0x66de, 0x8108, 0x1f04, 0x338a,</div><div class='del'>-	0x2061, 0x1800, 0x607f, 0x0000, 0x6080, 0x9084, 0x00ff, 0x6082,</div><div class='del'>-	0x60b3, 0x0000, 0x00be, 0x00ce, 0x0005, 0x2001, 0x1869, 0x2004,</div><div class='del'>-	0xd0bc, 0x0005, 0x2011, 0x1848, 0x2214, 0xd2ec, 0x0005, 0x0026,</div><div class='del'>-	0x2011, 0x1867, 0x2214, 0xd2dc, 0x002e, 0x0005, 0x7eef, 0x7de8,</div><div class='del'>-	0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc, 0x80da, 0x7ad9, 0x80d6,</div><div class='del'>-	0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1, 0x79ce, 0x78cd, 0x80cc,</div><div class='del'>-	0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6, 0x77c5, 0x76c3, 0x80bc,</div><div class='del'>-	0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4, 0x72b3, 0x80b2, 0x80b1,</div><div class='del'>-	0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa, 0x6ea9, 0x80a7, 0x6da6,</div><div class='del'>-	0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d, 0x809b, 0x8098, 0x6797,</div><div class='del'>-	0x6690, 0x658f, 0x6488, 0x6384, 0x6282, 0x8081, 0x8080, 0x617c,</div><div class='del'>-	0x607a, 0x8079, 0x5f76, 0x8075, 0x8074, 0x8073, 0x8072, 0x8071,</div><div class='del'>-	0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a, 0x5b69, 0x8067, 0x5a66,</div><div class='del'>-	0x5965, 0x5863, 0x575c, 0x565a, 0x5559, 0x8056, 0x8055, 0x5454,</div><div class='del'>-	0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d, 0x804c, 0x804b, 0x4e4a,</div><div class='del'>-	0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043, 0x803c, 0x803a, 0x8039,</div><div class='del'>-	0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932, 0x4831, 0x802e, 0x472d,</div><div class='del'>-	0x462c, 0x452b, 0x442a, 0x4329, 0x4227, 0x8026, 0x8025, 0x4123,</div><div class='del'>-	0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18, 0x8017, 0x8010, 0x3b0f,</div><div class='del'>-	0x3a08, 0x8004, 0x3902, 0x8001, 0x8000, 0x8000, 0x3800, 0x3700,</div><div class='del'>-	0x3600, 0x8000, 0x3500, 0x8000, 0x8000, 0x8000, 0x3400, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3300, 0x3200, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3100, 0x3000, 0x8000,</div><div class='del'>-	0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00, 0x2c00, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900, 0x2800, 0x8000, 0x2700,</div><div class='del'>-	0x2600, 0x2500, 0x2400, 0x2300, 0x2200, 0x8000, 0x8000, 0x2100,</div><div class='del'>-	0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x8000, 0x8000, 0x1b00,</div><div class='del'>-	0x1a00, 0x8000, 0x1900, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x1800, 0x8000, 0x1700, 0x1600, 0x1500, 0x8000, 0x1400,</div><div class='del'>-	0x1300, 0x1200, 0x1100, 0x1000, 0x0f00, 0x8000, 0x8000, 0x0e00,</div><div class='del'>-	0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900, 0x8000, 0x8000, 0x0800,</div><div class='del'>-	0x0700, 0x8000, 0x0600, 0x8000, 0x8000, 0x8000, 0x0500, 0x0400,</div><div class='del'>-	0x0300, 0x8000, 0x0200, 0x8000, 0x8000, 0x8000, 0x0100, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x2071, 0x189e,</div><div class='del'>-	0x7003, 0x0002, 0x9006, 0x7016, 0x701a, 0x704a, 0x704e, 0x700e,</div><div class='del'>-	0x7042, 0x7046, 0x703b, 0x18ba, 0x703f, 0x18ba, 0x7007, 0x0001,</div><div class='del'>-	0x080c, 0x1027, 0x090c, 0x0dc5, 0x2900, 0x706a, 0xa867, 0x0002,</div><div class='del'>-	0xa8ab, 0xdcb0, 0x080c, 0x1027, 0x090c, 0x0dc5, 0x2900, 0x706e,</div><div class='del'>-	0xa867, 0x0002, 0xa8ab, 0xdcb0, 0x0005, 0x2071, 0x189e, 0x7004,</div><div class='del'>-	0x0002, 0x34e5, 0x34e6, 0x34f9, 0x350d, 0x0005, 0x1004, 0x34f6,</div><div class='del'>-	0x0e04, 0x34f6, 0x2079, 0x0000, 0x0126, 0x2091, 0x8000, 0x700c,</div><div class='del'>-	0x9005, 0x1128, 0x700f, 0x0001, 0x012e, 0x0468, 0x0005, 0x012e,</div><div class='del'>-	0x0ce8, 0x2079, 0x0000, 0x2061, 0x18b8, 0x2c4c, 0xa86c, 0x908e,</div><div class='del'>-	0x0100, 0x0128, 0x9086, 0x0200, 0x0904, 0x35e1, 0x0005, 0x7018,</div><div class='del'>-	0x2048, 0x2061, 0x1800, 0x701c, 0x0807, 0x7014, 0x2048, 0xa864,</div><div class='del'>-	0x9094, 0x00ff, 0x9296, 0x0029, 0x1120, 0xaa78, 0xd2fc, 0x0128,</div><div class='del'>-	0x0005, 0x9086, 0x0103, 0x0108, 0x0005, 0x2079, 0x0000, 0x2061,</div><div class='del'>-	0x1800, 0x701c, 0x0807, 0x2061, 0x1800, 0x7880, 0x908a, 0x0040,</div><div class='del'>-	0x1210, 0x61d0, 0x0042, 0x2100, 0x908a, 0x003f, 0x1a04, 0x35de,</div><div class='del'>-	0x61d0, 0x0804, 0x3573, 0x35b5, 0x35ed, 0x35de, 0x35f9, 0x3603,</div><div class='del'>-	0x3609, 0x360d, 0x361d, 0x3621, 0x3637, 0x363d, 0x3643, 0x364e,</div><div class='del'>-	0x3659, 0x3668, 0x3677, 0x3685, 0x369c, 0x36b7, 0x35de, 0x3762,</div><div class='del'>-	0x37a0, 0x3846, 0x3857, 0x387a, 0x35de, 0x35de, 0x35de, 0x38b2,</div><div class='del'>-	0x38ce, 0x38d7, 0x3906, 0x390c, 0x35de, 0x3952, 0x35de, 0x35de,</div><div class='del'>-	0x35de, 0x35de, 0x35de, 0x395d, 0x3966, 0x396e, 0x3970, 0x35de,</div><div class='del'>-	0x35de, 0x35de, 0x35de, 0x35de, 0x35de, 0x399c, 0x35de, 0x35de,</div><div class='del'>-	0x35de, 0x35de, 0x35de, 0x39b9, 0x3a40, 0x35de, 0x35de, 0x35de,</div><div class='del'>-	0x35de, 0x35de, 0x35de, 0x0002, 0x3a6a, 0x3a6d, 0x3acc, 0x3ae5,</div><div class='del'>-	0x3b15, 0x3db7, 0x35de, 0x5398, 0x35de, 0x35de, 0x35de, 0x35de,</div><div class='del'>-	0x35de, 0x35de, 0x35de, 0x35de, 0x3637, 0x363d, 0x42ec, 0x57f9,</div><div class='del'>-	0x430a, 0x5427, 0x5479, 0x5584, 0x35de, 0x55e6, 0x5622, 0x5653,</div><div class='del'>-	0x575b, 0x5680, 0x56db, 0x35de, 0x430e, 0x44e1, 0x44f7, 0x451c,</div><div class='del'>-	0x4581, 0x45f5, 0x4615, 0x468c, 0x46e8, 0x4744, 0x4747, 0x476c,</div><div class='del'>-	0x4823, 0x4889, 0x4891, 0x49c6, 0x4b6e, 0x4ba2, 0x4e06, 0x35de,</div><div class='del'>-	0x4e24, 0x4eeb, 0x4fd4, 0x502e, 0x35de, 0x50c1, 0x35de, 0x50d7,</div><div class='del'>-	0x50f2, 0x4891, 0x5338, 0x714c, 0x0000, 0x2021, 0x4000, 0x080c,</div><div class='del'>-	0x4c20, 0x0126, 0x2091, 0x8000, 0x0e04, 0x35bf, 0x0010, 0x012e,</div><div class='del'>-	0x0cc0, 0x7c36, 0x9486, 0x4000, 0x0118, 0x7833, 0x0011, 0x0010,</div><div class='del'>-	0x7833, 0x0010, 0x7c82, 0x7986, 0x7a8a, 0x7b8e, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x7007, 0x0001,</div><div class='del'>-	0x2091, 0x5000, 0x700f, 0x0000, 0x012e, 0x0005, 0x2021, 0x4001,</div><div class='del'>-	0x08b0, 0x2021, 0x4002, 0x0898, 0x2021, 0x4003, 0x0880, 0x2021,</div><div class='del'>-	0x4005, 0x0868, 0x2021, 0x4006, 0x0850, 0x2039, 0x0001, 0x902e,</div><div class='del'>-	0x2520, 0x7b88, 0x7a8c, 0x7884, 0x7990, 0x81ff, 0x0d98, 0x0804,</div><div class='del'>-	0x4c2d, 0x2039, 0x0001, 0x902e, 0x2520, 0x7b88, 0x7a8c, 0x7884,</div><div class='del'>-	0x7990, 0x0804, 0x4c30, 0x7984, 0x7888, 0x2114, 0x200a, 0x0804,</div><div class='del'>-	0x35b5, 0x7984, 0x2114, 0x0804, 0x35b5, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x0021, 0x20e9, 0x0000, 0x20a1, 0x0021, 0x20a9, 0x001f, 0x4003,</div><div class='del'>-	0x7984, 0x7a88, 0x7b8c, 0x0804, 0x35b5, 0x7884, 0x2060, 0x0804,</div><div class='del'>-	0x366a, 0x2009, 0x0003, 0x2011, 0x0003, 0x2019, 0x0014, 0x789b,</div><div class='del'>-	0x0137, 0x7893, 0xffff, 0x2001, 0x188f, 0x2004, 0x9005, 0x0118,</div><div class='del'>-	0x7896, 0x0804, 0x35b5, 0x7897, 0x0001, 0x0804, 0x35b5, 0x2039,</div><div class='del'>-	0x0001, 0x7d98, 0x7c9c, 0x0804, 0x35f1, 0x2039, 0x0001, 0x7d98,</div><div class='del'>-	0x7c9c, 0x0804, 0x35fd, 0x79a0, 0x9182, 0x0040, 0x0210, 0x0804,</div><div class='del'>-	0x35ea, 0x2138, 0x7d98, 0x7c9c, 0x0804, 0x35f1, 0x79a0, 0x9182,</div><div class='del'>-	0x0040, 0x0210, 0x0804, 0x35ea, 0x2138, 0x7d98, 0x7c9c, 0x0804,</div><div class='del'>-	0x35fd, 0x79a0, 0x9182, 0x0040, 0x0210, 0x0804, 0x35ea, 0x21e8,</div><div class='del'>-	0x7984, 0x7888, 0x20a9, 0x0001, 0x21a0, 0x4004, 0x0804, 0x35b5,</div><div class='del'>-	0x2061, 0x0800, 0xe10c, 0x9006, 0x2c15, 0x9200, 0x8c60, 0x8109,</div><div class='del'>-	0x1dd8, 0x2010, 0x9005, 0x0904, 0x35b5, 0x0804, 0x35e4, 0x79a0,</div><div class='del'>-	0x9182, 0x0040, 0x0210, 0x0804, 0x35ea, 0x21e0, 0x20a9, 0x0001,</div><div class='del'>-	0x7984, 0x2198, 0x4012, 0x0804, 0x35b5, 0x2069, 0x1847, 0x7884,</div><div class='del'>-	0x7990, 0x911a, 0x1a04, 0x35ea, 0x8019, 0x0904, 0x35ea, 0x684a,</div><div class='del'>-	0x6942, 0x788c, 0x6852, 0x7888, 0x6856, 0x9006, 0x685a, 0x685e,</div><div class='del'>-	0x080c, 0x7963, 0x0804, 0x35b5, 0x2069, 0x1847, 0x7884, 0x7994,</div><div class='del'>-	0x911a, 0x1a04, 0x35ea, 0x8019, 0x0904, 0x35ea, 0x684e, 0x6946,</div><div class='del'>-	0x788c, 0x6862, 0x7888, 0x6866, 0x9006, 0x686a, 0x686e, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x6bf8, 0x012e, 0x0804, 0x35b5, 0x902e,</div><div class='del'>-	0x2520, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x35e7, 0x7984,</div><div class='del'>-	0x7b88, 0x7a8c, 0x20a9, 0x0005, 0x20e9, 0x0001, 0x20a1, 0x18a6,</div><div class='del'>-	0x4101, 0x080c, 0x4be4, 0x1120, 0x2009, 0x0002, 0x0804, 0x35e7,</div><div class='del'>-	0x2009, 0x0020, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4c2d,</div><div class='del'>-	0x701f, 0x36db, 0x0005, 0xa864, 0x2008, 0x9084, 0x00ff, 0x9096,</div><div class='del'>-	0x0011, 0x0168, 0x9096, 0x0019, 0x0150, 0x9096, 0x0015, 0x0138,</div><div class='del'>-	0x9096, 0x0048, 0x0120, 0x9096, 0x0029, 0x1904, 0x35e7, 0x810f,</div><div class='del'>-	0x918c, 0x00ff, 0x0904, 0x35e7, 0x7112, 0x7010, 0x8001, 0x0560,</div><div class='del'>-	0x7012, 0x080c, 0x4be4, 0x1120, 0x2009, 0x0002, 0x0804, 0x35e7,</div><div class='del'>-	0x2009, 0x0020, 0x7068, 0x2040, 0xa28c, 0xa390, 0xa494, 0xa598,</div><div class='del'>-	0x9290, 0x0040, 0x9399, 0x0000, 0x94a1, 0x0000, 0x95a9, 0x0000,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4c2d, 0x701f, 0x3719,</div><div class='del'>-	0x0005, 0xa864, 0x9084, 0x00ff, 0x9096, 0x0002, 0x0120, 0x9096,</div><div class='del'>-	0x000a, 0x1904, 0x35e7, 0x0888, 0x0126, 0x2091, 0x8000, 0x7014,</div><div class='del'>-	0x2048, 0xa868, 0xc0fd, 0xa86a, 0xa864, 0x9084, 0x00ff, 0x9096,</div><div class='del'>-	0x0029, 0x1148, 0xc2fd, 0xaa7a, 0x080c, 0x629f, 0x0138, 0xa87a,</div><div class='del'>-	0xa982, 0x012e, 0x0060, 0x080c, 0x65cf, 0x1130, 0x7007, 0x0003,</div><div class='del'>-	0x701f, 0x3747, 0x012e, 0x0005, 0x080c, 0x710b, 0x012e, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x20a9, 0x0005, 0x20e1, 0x0001, 0x2099, 0x18a6,</div><div class='del'>-	0x400a, 0x2100, 0x9210, 0x9399, 0x0000, 0x94a1, 0x0000, 0x95a9,</div><div class='del'>-	0x0000, 0xa85c, 0x9080, 0x0019, 0x2009, 0x0020, 0x012e, 0xaf60,</div><div class='del'>-	0x0804, 0x4c30, 0x2091, 0x8000, 0x7837, 0x4000, 0x7833, 0x0010,</div><div class='del'>-	0x7883, 0x4000, 0x7887, 0x4953, 0x788b, 0x5020, 0x788f, 0x2020,</div><div class='del'>-	0x2009, 0x017f, 0x2104, 0x7892, 0x3f00, 0x7896, 0x2061, 0x0100,</div><div class='del'>-	0x6200, 0x2061, 0x0200, 0x603c, 0x8007, 0x9205, 0x789a, 0x2009,</div><div class='del'>-	0x04fd, 0x2104, 0x789e, 0x2091, 0x5000, 0x2091, 0x4080, 0x2001,</div><div class='del'>-	0x0089, 0x2004, 0xd084, 0x0180, 0x2001, 0x1a1c, 0x2004, 0x9005,</div><div class='del'>-	0x0128, 0x2001, 0x008b, 0x2004, 0xd0fc, 0x0dd8, 0x2001, 0x008a,</div><div class='del'>-	0x2003, 0x0002, 0x2003, 0x1001, 0x2071, 0x0080, 0x0804, 0x0427,</div><div class='del'>-	0x81ff, 0x1904, 0x35e7, 0x7984, 0x080c, 0x6724, 0x1904, 0x35ea,</div><div class='del'>-	0x7e98, 0x9684, 0x3fff, 0x9082, 0x4000, 0x1a04, 0x35ea, 0x7c88,</div><div class='del'>-	0x7d8c, 0x080c, 0x6887, 0x080c, 0x6856, 0x0000, 0x1518, 0x2061,</div><div class='del'>-	0x1cd0, 0x0126, 0x2091, 0x8000, 0x6000, 0x9086, 0x0000, 0x0148,</div><div class='del'>-	0x6014, 0x904d, 0x0130, 0xa86c, 0x9406, 0x1118, 0xa870, 0x9506,</div><div class='del'>-	0x0150, 0x012e, 0x9ce0, 0x0018, 0x2001, 0x181a, 0x2004, 0x9c02,</div><div class='del'>-	0x1a04, 0x35e7, 0x0c30, 0x080c, 0xccf3, 0x012e, 0x0904, 0x35e7,</div><div class='del'>-	0x0804, 0x35b5, 0x900e, 0x2001, 0x0005, 0x080c, 0x710b, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0xd3d4, 0x080c, 0x6e9f, 0x012e, 0x0804,</div><div class='del'>-	0x35b5, 0x00a6, 0x2950, 0xb198, 0x080c, 0x6724, 0x1904, 0x3833,</div><div class='del'>-	0xb6a4, 0x9684, 0x3fff, 0x9082, 0x4000, 0x16e8, 0xb49c, 0xb5a0,</div><div class='del'>-	0x080c, 0x6887, 0x080c, 0x6856, 0x1520, 0x2061, 0x1cd0, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x6000, 0x9086, 0x0000, 0x0148, 0x6014, 0x904d,</div><div class='del'>-	0x0130, 0xa86c, 0x9406, 0x1118, 0xa870, 0x9506, 0x0158, 0x012e,</div><div class='del'>-	0x9ce0, 0x0018, 0x2001, 0x181a, 0x2004, 0x9c02, 0x2009, 0x000d,</div><div class='del'>-	0x12b0, 0x0c28, 0x080c, 0xccf3, 0x012e, 0x2009, 0x0003, 0x0178,</div><div class='del'>-	0x00e0, 0x900e, 0x2001, 0x0005, 0x080c, 0x710b, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xd3d4, 0x080c, 0x6e92, 0x012e, 0x0070, 0xb097,</div><div class='del'>-	0x4005, 0xb19a, 0x0010, 0xb097, 0x4006, 0x900e, 0x9085, 0x0001,</div><div class='del'>-	0x2001, 0x0030, 0x2a48, 0x00ae, 0x0005, 0xb097, 0x4000, 0x9006,</div><div class='del'>-	0x918d, 0x0001, 0x2008, 0x2a48, 0x00ae, 0x0005, 0x81ff, 0x1904,</div><div class='del'>-	0x35e7, 0x080c, 0x4bfb, 0x0904, 0x35ea, 0x080c, 0x67eb, 0x0904,</div><div class='del'>-	0x35e7, 0x080c, 0x688d, 0x0904, 0x35e7, 0x0804, 0x460c, 0x81ff,</div><div class='del'>-	0x1904, 0x35e7, 0x080c, 0x4c17, 0x0904, 0x35ea, 0x080c, 0x691b,</div><div class='del'>-	0x0904, 0x35e7, 0x2019, 0x0005, 0x79a8, 0x080c, 0x68a8, 0x0904,</div><div class='del'>-	0x35e7, 0x7888, 0x908a, 0x1000, 0x1a04, 0x35ea, 0x8003, 0x800b,</div><div class='del'>-	0x810b, 0x9108, 0x080c, 0x884b, 0x79a8, 0xd184, 0x1904, 0x35b5,</div><div class='del'>-	0x0804, 0x460c, 0x0126, 0x2091, 0x8000, 0x81ff, 0x0118, 0x2009,</div><div class='del'>-	0x0001, 0x0450, 0x2029, 0x07ff, 0x645c, 0x2400, 0x9506, 0x01f8,</div><div class='del'>-	0x2508, 0x080c, 0x6724, 0x11d8, 0x080c, 0x691b, 0x1128, 0x2009,</div><div class='del'>-	0x0002, 0x62c0, 0x2518, 0x00c0, 0x2019, 0x0004, 0x900e, 0x080c,</div><div class='del'>-	0x68a8, 0x1118, 0x2009, 0x0006, 0x0078, 0x7884, 0x908a, 0x1000,</div><div class='del'>-	0x1270, 0x8003, 0x800b, 0x810b, 0x9108, 0x080c, 0x884b, 0x8529,</div><div class='del'>-	0x1ae0, 0x012e, 0x0804, 0x35b5, 0x012e, 0x0804, 0x35e7, 0x012e,</div><div class='del'>-	0x0804, 0x35ea, 0x080c, 0x4bfb, 0x0904, 0x35ea, 0x080c, 0x67eb,</div><div class='del'>-	0x0904, 0x35e7, 0xbaa0, 0x2019, 0x0005, 0x00c6, 0x9066, 0x080c,</div><div class='del'>-	0x96a4, 0x0076, 0x903e, 0x080c, 0x9577, 0x900e, 0x080c, 0xe91c,</div><div class='del'>-	0x007e, 0x00ce, 0x080c, 0x6887, 0x0804, 0x35b5, 0x080c, 0x4bfb,</div><div class='del'>-	0x0904, 0x35ea, 0x080c, 0x6887, 0x2208, 0x0804, 0x35b5, 0x0156,</div><div class='del'>-	0x00d6, 0x00e6, 0x2069, 0x1910, 0x6810, 0x6914, 0x910a, 0x1208,</div><div class='del'>-	0x900e, 0x6816, 0x9016, 0x901e, 0x20a9, 0x007e, 0x2069, 0x1000,</div><div class='del'>-	0x2d04, 0x905d, 0x0118, 0xb84c, 0x0059, 0x9210, 0x8d68, 0x1f04,</div><div class='del'>-	0x38e8, 0x2300, 0x9218, 0x00ee, 0x00de, 0x015e, 0x0804, 0x35b5,</div><div class='del'>-	0x00f6, 0x0016, 0x907d, 0x0138, 0x9006, 0x8000, 0x2f0c, 0x81ff,</div><div class='del'>-	0x0110, 0x2178, 0x0cd0, 0x001e, 0x00fe, 0x0005, 0x2069, 0x1910,</div><div class='del'>-	0x6910, 0x62bc, 0x0804, 0x35b5, 0x81ff, 0x0120, 0x2009, 0x0001,</div><div class='del'>-	0x0804, 0x35e7, 0x0126, 0x2091, 0x8000, 0x080c, 0x57e9, 0x0128,</div><div class='del'>-	0x2009, 0x0007, 0x012e, 0x0804, 0x35e7, 0x012e, 0x615c, 0x9190,</div><div class='del'>-	0x33b6, 0x2215, 0x9294, 0x00ff, 0x637c, 0x83ff, 0x0108, 0x6280,</div><div class='del'>-	0x67dc, 0x97c4, 0x000a, 0x98c6, 0x000a, 0x1118, 0x2031, 0x0001,</div><div class='del'>-	0x00e8, 0x97c4, 0x0022, 0x98c6, 0x0022, 0x1118, 0x2031, 0x0003,</div><div class='del'>-	0x00a8, 0x97c4, 0x0012, 0x98c6, 0x0012, 0x1118, 0x2031, 0x0002,</div><div class='del'>-	0x0068, 0x080c, 0x7637, 0x1118, 0x2031, 0x0004, 0x0038, 0xd79c,</div><div class='del'>-	0x0120, 0x2009, 0x0005, 0x0804, 0x35e7, 0x9036, 0x7e9a, 0x7f9e,</div><div class='del'>-	0x0804, 0x35b5, 0x614c, 0x6250, 0x2019, 0x1986, 0x231c, 0x2001,</div><div class='del'>-	0x1987, 0x2004, 0x789a, 0x0804, 0x35b5, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6138, 0x623c, 0x6340, 0x012e, 0x0804, 0x35b5, 0x080c, 0x4c17,</div><div class='del'>-	0x0904, 0x35ea, 0xba44, 0xbb38, 0x0804, 0x35b5, 0x080c, 0x0dc5,</div><div class='del'>-	0x080c, 0x4c17, 0x2110, 0x0904, 0x35ea, 0xb804, 0x908c, 0x00ff,</div><div class='del'>-	0x918e, 0x0006, 0x0140, 0x9084, 0xff00, 0x9086, 0x0600, 0x2009,</div><div class='del'>-	0x0009, 0x1904, 0x35e7, 0x0126, 0x2091, 0x8000, 0x2019, 0x0005,</div><div class='del'>-	0x00c6, 0x9066, 0x080c, 0xac6c, 0x080c, 0x96a4, 0x0076, 0x903e,</div><div class='del'>-	0x080c, 0x9577, 0x900e, 0x080c, 0xe91c, 0x007e, 0x00ce, 0xb807,</div><div class='del'>-	0x0407, 0x012e, 0x0804, 0x35b5, 0x614c, 0x6250, 0x7884, 0x604e,</div><div class='del'>-	0x7b88, 0x6352, 0x2069, 0x1847, 0x831f, 0x9305, 0x6816, 0x788c,</div><div class='del'>-	0x2069, 0x1986, 0x2d1c, 0x206a, 0x7e98, 0x9682, 0x0014, 0x1210,</div><div class='del'>-	0x2031, 0x07d0, 0x2069, 0x1987, 0x2d04, 0x266a, 0x789a, 0x0804,</div><div class='del'>-	0x35b5, 0x0126, 0x2091, 0x8000, 0x6138, 0x7884, 0x603a, 0x910e,</div><div class='del'>-	0xd1b4, 0x190c, 0x0ebe, 0xd094, 0x0148, 0x00e6, 0x2071, 0x19fb,</div><div class='del'>-	0x79b4, 0x9192, 0x07d0, 0x1208, 0x713e, 0x00ee, 0xd0c4, 0x01a8,</div><div class='del'>-	0x00d6, 0x78a8, 0x2009, 0x199d, 0x200a, 0x78ac, 0x2011, 0x199e,</div><div class='del'>-	0x2012, 0x2069, 0x0100, 0x6838, 0x9086, 0x0007, 0x1118, 0x2214,</div><div class='del'>-	0x6a5a, 0x0010, 0x210c, 0x695a, 0x00de, 0x7888, 0xd0ec, 0x0178,</div><div class='del'>-	0x6034, 0xc08d, 0x6036, 0x2001, 0x0050, 0x6076, 0x607a, 0x6056,</div><div class='del'>-	0x606b, 0x2450, 0x00c6, 0x2061, 0x1ad1, 0x2062, 0x00ce, 0x2011,</div><div class='del'>-	0x0114, 0x220c, 0x7888, 0xd08c, 0x0118, 0x918d, 0x0080, 0x0010,</div><div class='del'>-	0x918c, 0xff7f, 0x2112, 0x603c, 0x7988, 0x613e, 0x6140, 0x910d,</div><div class='del'>-	0x788c, 0x6042, 0x7a88, 0x9294, 0x1000, 0x9205, 0x910e, 0xd1e4,</div><div class='del'>-	0x190c, 0x0ed4, 0x9084, 0x0020, 0x0130, 0x78b4, 0x6046, 0x9084,</div><div class='del'>-	0x0001, 0x090c, 0x42ec, 0x6040, 0xd0cc, 0x0120, 0x78b0, 0x2011,</div><div class='del'>-	0x0114, 0x2012, 0x012e, 0x0804, 0x35b5, 0x00f6, 0x2079, 0x1800,</div><div class='del'>-	0x7a38, 0xa898, 0x9084, 0xfebf, 0x9215, 0xa89c, 0x9084, 0xfebf,</div><div class='del'>-	0x8002, 0x9214, 0x7838, 0x9084, 0x0140, 0x9215, 0x7a3a, 0xa897,</div><div class='del'>-	0x4000, 0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x00fe, 0x0005,</div><div class='del'>-	0x7898, 0x9005, 0x01a8, 0x7888, 0x9025, 0x0904, 0x35ea, 0x788c,</div><div class='del'>-	0x902d, 0x0904, 0x35ea, 0x900e, 0x080c, 0x6724, 0x1120, 0xba44,</div><div class='del'>-	0xbb38, 0xbc46, 0xbd3a, 0x9186, 0x07ff, 0x0190, 0x8108, 0x0ca0,</div><div class='del'>-	0x080c, 0x4c17, 0x0904, 0x35ea, 0x7888, 0x900d, 0x0904, 0x35ea,</div><div class='del'>-	0x788c, 0x9005, 0x0904, 0x35ea, 0xba44, 0xb946, 0xbb38, 0xb83a,</div><div class='del'>-	0x0804, 0x35b5, 0x2011, 0xbc09, 0x0010, 0x2011, 0xbc05, 0x080c,</div><div class='del'>-	0x57e9, 0x1904, 0x35e7, 0x00c6, 0x2061, 0x0100, 0x7984, 0x9186,</div><div class='del'>-	0x00ff, 0x1130, 0x2001, 0x1818, 0x2004, 0x9085, 0xff00, 0x0088,</div><div class='del'>-	0x9182, 0x007f, 0x16e0, 0x9188, 0x33b6, 0x210d, 0x918c, 0x00ff,</div><div class='del'>-	0x2001, 0x1818, 0x2004, 0x0026, 0x9116, 0x002e, 0x0580, 0x810f,</div><div class='del'>-	0x9105, 0x0126, 0x2091, 0x8000, 0x0006, 0x080c, 0xb27d, 0x000e,</div><div class='del'>-	0x0510, 0x602e, 0x620a, 0x7984, 0x00b6, 0x080c, 0x66bf, 0x2b08,</div><div class='del'>-	0x00be, 0x1500, 0x6112, 0x6023, 0x0001, 0x080c, 0x4be4, 0x01d0,</div><div class='del'>-	0x9006, 0xa866, 0x7007, 0x0003, 0xa832, 0xa868, 0xc0fd, 0xa86a,</div><div class='del'>-	0x701f, 0x3ac5, 0x2900, 0x6016, 0x2009, 0x0032, 0x080c, 0xb352,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0x012e, 0x00ce, 0x0804, 0x35e7, 0x00ce,</div><div class='del'>-	0x0804, 0x35ea, 0x080c, 0xb2d3, 0x0cb0, 0xa830, 0x9086, 0x0100,</div><div class='del'>-	0x0904, 0x35e7, 0x0804, 0x35b5, 0x2061, 0x1a74, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x6000, 0xd084, 0x0170, 0x6104, 0x6208, 0x2061, 0x1800,</div><div class='del'>-	0x6354, 0x6074, 0x789a, 0x60c0, 0x789e, 0x60bc, 0x78aa, 0x012e,</div><div class='del'>-	0x0804, 0x35b5, 0x900e, 0x2110, 0x0c88, 0x81ff, 0x1904, 0x35e7,</div><div class='del'>-	0x080c, 0x7637, 0x0904, 0x35e7, 0x0126, 0x2091, 0x8000, 0x6254,</div><div class='del'>-	0x6074, 0x9202, 0x0248, 0x9085, 0x0001, 0x080c, 0x28dc, 0x080c,</div><div class='del'>-	0x5a11, 0x012e, 0x0804, 0x35b5, 0x012e, 0x0804, 0x35ea, 0x0006,</div><div class='del'>-	0x0016, 0x00c6, 0x00e6, 0x2001, 0x19aa, 0x2070, 0x2061, 0x1847,</div><div class='del'>-	0x6008, 0x2072, 0x900e, 0x2011, 0x1400, 0x080c, 0x9375, 0x7206,</div><div class='del'>-	0x00ee, 0x00ce, 0x001e, 0x000e, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x81ff, 0x0128, 0x012e, 0x2021, 0x400b, 0x0804, 0x35b7, 0x7884,</div><div class='del'>-	0xd0fc, 0x0158, 0x2001, 0x002a, 0x2004, 0x9005, 0x0180, 0x9082,</div><div class='del'>-	0x00e1, 0x0298, 0x012e, 0x0804, 0x35ea, 0x2001, 0x002a, 0x2004,</div><div class='del'>-	0x9005, 0x0128, 0x2069, 0x1847, 0x6908, 0x9102, 0x1230, 0x012e,</div><div class='del'>-	0x0804, 0x35ea, 0x012e, 0x0804, 0x35e7, 0x080c, 0xb23d, 0x0dd0,</div><div class='del'>-	0x7884, 0xd0fc, 0x0904, 0x3b94, 0x00c6, 0x080c, 0x4be4, 0x00ce,</div><div class='del'>-	0x0d88, 0xa867, 0x0000, 0x7884, 0xa80a, 0x7898, 0xa80e, 0x789c,</div><div class='del'>-	0xa812, 0x2001, 0x002e, 0x2004, 0xa81a, 0x2001, 0x002f, 0x2004,</div><div class='del'>-	0xa81e, 0x2001, 0x0030, 0x2004, 0xa822, 0x2001, 0x0031, 0x2004,</div><div class='del'>-	0xa826, 0x2001, 0x0034, 0x2004, 0xa82a, 0x2001, 0x0035, 0x2004,</div><div class='del'>-	0xa82e, 0x2001, 0x002a, 0x2004, 0x9080, 0x0003, 0x9084, 0x00fc,</div><div class='del'>-	0x8004, 0xa816, 0x080c, 0x3d1a, 0x0928, 0x7014, 0x2048, 0xad2c,</div><div class='del'>-	0xac28, 0xab1c, 0xaa18, 0xa930, 0xa808, 0xd0b4, 0x1120, 0x2029,</div><div class='del'>-	0x0000, 0x2021, 0x0000, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f,</div><div class='del'>-	0x9084, 0xffc0, 0x9080, 0x001b, 0x080c, 0x4c2d, 0x701f, 0x3c57,</div><div class='del'>-	0x7023, 0x0001, 0x012e, 0x0005, 0x0046, 0x0086, 0x0096, 0x00a6,</div><div class='del'>-	0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x080c, 0x3aff, 0x2001,</div><div class='del'>-	0x19a0, 0x2003, 0x0000, 0x2021, 0x000a, 0x2061, 0x0100, 0x6104,</div><div class='del'>-	0x0016, 0x60bb, 0x0000, 0x60bf, 0x32e1, 0x60bf, 0x0012, 0x080c,</div><div class='del'>-	0x3d89, 0x080c, 0x3d48, 0x00f6, 0x00e6, 0x0086, 0x2940, 0x2071,</div><div class='del'>-	0x1a69, 0x2079, 0x0090, 0x00d6, 0x2069, 0x0000, 0x6884, 0xd0b4,</div><div class='del'>-	0x0140, 0x2001, 0x0035, 0x2004, 0x780e, 0x2001, 0x0034, 0x2004,</div><div class='del'>-	0x780a, 0x00de, 0x2011, 0x0001, 0x080c, 0x4130, 0x008e, 0x00ee,</div><div class='del'>-	0x00fe, 0x080c, 0x4052, 0x080c, 0x3f57, 0x05b8, 0x2001, 0x020b,</div><div class='del'>-	0x2004, 0x9084, 0x0140, 0x1db8, 0x080c, 0x41a4, 0x00f6, 0x2079,</div><div class='del'>-	0x0300, 0x78bc, 0x00fe, 0x908c, 0x0070, 0x1560, 0x2071, 0x0200,</div><div class='del'>-	0x7037, 0x0000, 0x7050, 0x9084, 0xff00, 0x9086, 0x3200, 0x1510,</div><div class='del'>-	0x7037, 0x0001, 0x7050, 0x9084, 0xff00, 0x9086, 0xe100, 0x11d0,</div><div class='del'>-	0x7037, 0x0000, 0x7054, 0x7037, 0x0000, 0x715c, 0x9106, 0x1190,</div><div class='del'>-	0x2001, 0x1820, 0x2004, 0x9106, 0x1168, 0x00c6, 0x2061, 0x0100,</div><div class='del'>-	0x6024, 0x9084, 0x1e00, 0x00ce, 0x0138, 0x080c, 0x3f61, 0x080c,</div><div class='del'>-	0x3d43, 0x0058, 0x080c, 0x3d43, 0x080c, 0x40c8, 0x080c, 0x4048,</div><div class='del'>-	0x2001, 0x020b, 0x2004, 0xd0e4, 0x0dd8, 0x2001, 0x032a, 0x2003,</div><div class='del'>-	0x0004, 0x2061, 0x0100, 0x6027, 0x0002, 0x001e, 0x6106, 0x2011,</div><div class='del'>-	0x020d, 0x2013, 0x0020, 0x60bb, 0x0000, 0x60bf, 0x0108, 0x60bf,</div><div class='del'>-	0x0012, 0x2001, 0x0004, 0x200c, 0x918c, 0xfffd, 0x2102, 0x080c,</div><div class='del'>-	0x12fc, 0x2009, 0x0028, 0x080c, 0x2409, 0x2001, 0x0227, 0x200c,</div><div class='del'>-	0x2102, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e,</div><div class='del'>-	0x008e, 0x004e, 0x2001, 0x19a0, 0x2004, 0x9005, 0x1118, 0x012e,</div><div class='del'>-	0x0804, 0x35b5, 0x012e, 0x2021, 0x400c, 0x0804, 0x35b7, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x0046, 0x0056, 0x0076, 0x0086, 0x0096, 0x00d6,</div><div class='del'>-	0x0156, 0x7014, 0x2048, 0x7020, 0x20a8, 0x8000, 0x7022, 0xa804,</div><div class='del'>-	0x9005, 0x0904, 0x3cb3, 0x2048, 0x1f04, 0x3c67, 0x7068, 0x2040,</div><div class='del'>-	0xa28c, 0xa390, 0xa494, 0xa598, 0xa930, 0xa808, 0xd0b4, 0x1120,</div><div class='del'>-	0x2029, 0x0000, 0x2021, 0x0000, 0x0096, 0x7014, 0x2048, 0xa864,</div><div class='del'>-	0x009e, 0x9086, 0x0103, 0x0170, 0x8906, 0x8006, 0x8007, 0x90bc,</div><div class='del'>-	0x003f, 0x9084, 0xffc0, 0x9080, 0x001b, 0x080c, 0x4c2d, 0x701f,</div><div class='del'>-	0x3c57, 0x00b0, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,</div><div class='del'>-	0xffc0, 0x9080, 0x001b, 0x21a8, 0x27e0, 0x2098, 0x27e8, 0x20a0,</div><div class='del'>-	0x0006, 0x080c, 0x0f8b, 0x000e, 0x080c, 0x4c30, 0x701f, 0x3c57,</div><div class='del'>-	0x015e, 0x00de, 0x009e, 0x008e, 0x007e, 0x005e, 0x004e, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x7014, 0x2048, 0xa864, 0x9086, 0x0103,</div><div class='del'>-	0x1118, 0x701f, 0x3d18, 0x0450, 0x7014, 0x2048, 0xa868, 0xc0fd,</div><div class='del'>-	0xa86a, 0x2009, 0x007f, 0x080c, 0x66b9, 0x0110, 0x9006, 0x0030,</div><div class='del'>-	0xb813, 0x00ff, 0xb817, 0xfffd, 0x080c, 0xd5a7, 0x015e, 0x00de,</div><div class='del'>-	0x009e, 0x008e, 0x007e, 0x005e, 0x004e, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x0904, 0x35e7, 0x0016, 0x0026, 0x0036, 0x0046, 0x0056, 0x0076,</div><div class='del'>-	0x0086, 0x0096, 0x00d6, 0x0156, 0x701f, 0x3cea, 0x7007, 0x0003,</div><div class='del'>-	0x0804, 0x3ca8, 0xa830, 0x9086, 0x0100, 0x2021, 0x400c, 0x0904,</div><div class='del'>-	0x35b7, 0x0076, 0xad10, 0xac0c, 0xab24, 0xaa20, 0xa930, 0xa808,</div><div class='del'>-	0xd0b4, 0x1120, 0x2029, 0x0000, 0x2021, 0x0000, 0x8906, 0x8006,</div><div class='del'>-	0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x001b, 0x21a8,</div><div class='del'>-	0x27e0, 0x2098, 0x27e8, 0x20a0, 0x0006, 0x080c, 0x0f8b, 0x000e,</div><div class='del'>-	0x080c, 0x4c30, 0x007e, 0x701f, 0x3c57, 0x7023, 0x0001, 0x0005,</div><div class='del'>-	0x0804, 0x35b5, 0x0156, 0x00c6, 0xa814, 0x908a, 0x001e, 0x0218,</div><div class='del'>-	0xa833, 0x001e, 0x0010, 0xa832, 0x0078, 0x81ff, 0x0168, 0x0016,</div><div class='del'>-	0x080c, 0x4be4, 0x001e, 0x0130, 0xa800, 0x2040, 0xa008, 0xa80a,</div><div class='del'>-	0x2100, 0x0c58, 0x9006, 0x0010, 0x9085, 0x0001, 0x00ce, 0x015e,</div><div class='del'>-	0x0005, 0x0006, 0x00f6, 0x2079, 0x0000, 0x7880, 0x9086, 0x0044,</div><div class='del'>-	0x00fe, 0x000e, 0x0005, 0x2001, 0x19a0, 0x2003, 0x0001, 0x0005,</div><div class='del'>-	0x00f6, 0x00e6, 0x00c6, 0x2061, 0x0200, 0x2001, 0x19ab, 0x2004,</div><div class='del'>-	0x601a, 0x2061, 0x0100, 0x2001, 0x19aa, 0x2004, 0x60ce, 0x6104,</div><div class='del'>-	0xc1ac, 0x6106, 0x080c, 0x4be4, 0xa813, 0x0019, 0xa817, 0x0001,</div><div class='del'>-	0x2900, 0xa85a, 0x2001, 0x002e, 0x2004, 0xa866, 0x2001, 0x002f,</div><div class='del'>-	0x2004, 0xa86a, 0x2061, 0x0090, 0x2079, 0x0100, 0x2001, 0x19aa,</div><div class='del'>-	0x2004, 0x6036, 0x2009, 0x0040, 0x080c, 0x2409, 0x2001, 0x002a,</div><div class='del'>-	0x2004, 0x9084, 0xfff8, 0xa86e, 0x601a, 0xa873, 0x0000, 0x601f,</div><div class='del'>-	0x0000, 0x78ca, 0x9006, 0x600a, 0x600e, 0x00ce, 0x00ee, 0x00fe,</div><div class='del'>-	0x0005, 0x00e6, 0x080c, 0x4be4, 0x2940, 0xa013, 0x0019, 0xa017,</div><div class='del'>-	0x0001, 0x2800, 0xa05a, 0x2001, 0x0030, 0x2004, 0xa866, 0x2001,</div><div class='del'>-	0x0031, 0x2004, 0xa86a, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8,</div><div class='del'>-	0xa86e, 0xa873, 0x0000, 0x2001, 0x032a, 0x2003, 0x0004, 0x2001,</div><div class='del'>-	0x0300, 0x2003, 0x0000, 0x2001, 0x020d, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x0004, 0x200c, 0x918d, 0x0002, 0x2102, 0x00ee, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x81ff, 0x0148, 0x080c, 0x2c59, 0x1130, 0x9006,</div><div class='del'>-	0x080c, 0x2bb1, 0x9006, 0x080c, 0x2b94, 0x2001, 0x199f, 0x2003,</div><div class='del'>-	0x0000, 0x7884, 0x9084, 0x0007, 0x0002, 0x3dd8, 0x3de1, 0x3dea,</div><div class='del'>-	0x3dd5, 0x3dd5, 0x3dd5, 0x3dd5, 0x3dd5, 0x012e, 0x0804, 0x35ea,</div><div class='del'>-	0x2009, 0x0114, 0x2104, 0x9085, 0x0800, 0x200a, 0x080c, 0x3fab,</div><div class='del'>-	0x00c0, 0x2009, 0x0114, 0x2104, 0x9085, 0x4000, 0x200a, 0x080c,</div><div class='del'>-	0x3fab, 0x0078, 0x080c, 0x7637, 0x1128, 0x012e, 0x2009, 0x0016,</div><div class='del'>-	0x0804, 0x35e7, 0x81ff, 0x0128, 0x012e, 0x2021, 0x400b, 0x0804,</div><div class='del'>-	0x35b7, 0x2001, 0x0141, 0x2004, 0xd0dc, 0x0db0, 0x0086, 0x0096,</div><div class='del'>-	0x00a6, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x080c, 0x3aff,</div><div class='del'>-	0x2009, 0x0101, 0x210c, 0x0016, 0x7ec8, 0x7dcc, 0x9006, 0x2068,</div><div class='del'>-	0x2060, 0x2058, 0x080c, 0x427f, 0x080c, 0x41cf, 0x903e, 0x2720,</div><div class='del'>-	0x00f6, 0x00e6, 0x0086, 0x2940, 0x2071, 0x1a69, 0x2079, 0x0090,</div><div class='del'>-	0x00d6, 0x2069, 0x0000, 0x6884, 0xd0b4, 0x0120, 0x68d4, 0x780e,</div><div class='del'>-	0x68d0, 0x780a, 0x00de, 0x2011, 0x0001, 0x080c, 0x4130, 0x080c,</div><div class='del'>-	0x2c61, 0x080c, 0x2c61, 0x080c, 0x2c61, 0x080c, 0x2c61, 0x080c,</div><div class='del'>-	0x4130, 0x008e, 0x00ee, 0x00fe, 0x080c, 0x4052, 0x2009, 0x9c40,</div><div class='del'>-	0x8109, 0x11b0, 0x080c, 0x3f61, 0x2001, 0x0004, 0x200c, 0x918c,</div><div class='del'>-	0xfffd, 0x2102, 0x001e, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be,</div><div class='del'>-	0x00ae, 0x009e, 0x008e, 0x2009, 0x0017, 0x080c, 0x35e7, 0x0cf8,</div><div class='del'>-	0x2001, 0x020b, 0x2004, 0x9084, 0x0140, 0x1d10, 0x00f6, 0x2079,</div><div class='del'>-	0x0000, 0x7884, 0x00fe, 0xd0bc, 0x0178, 0x2001, 0x0201, 0x200c,</div><div class='del'>-	0x81ff, 0x0150, 0x080c, 0x4030, 0x2d00, 0x9c05, 0x9b05, 0x0120,</div><div class='del'>-	0x080c, 0x3f61, 0x0804, 0x3f0e, 0x080c, 0x41a4, 0x080c, 0x40c8,</div><div class='del'>-	0x080c, 0x4013, 0x080c, 0x4048, 0x00f6, 0x2079, 0x0100, 0x7824,</div><div class='del'>-	0xd0ac, 0x0130, 0x8b58, 0x080c, 0x3f61, 0x00fe, 0x0804, 0x3f0e,</div><div class='del'>-	0x00fe, 0x080c, 0x3f57, 0x1150, 0x8d68, 0x2001, 0x0032, 0x2602,</div><div class='del'>-	0x2001, 0x0033, 0x2502, 0x080c, 0x3f61, 0x0080, 0x87ff, 0x0138,</div><div class='del'>-	0x2001, 0x0201, 0x2004, 0x9005, 0x1908, 0x8739, 0x0038, 0x2001,</div><div class='del'>-	0x1a65, 0x2004, 0x9086, 0x0000, 0x1904, 0x3e5e, 0x2001, 0x032f,</div><div class='del'>-	0x2003, 0x00f6, 0x8631, 0x1208, 0x8529, 0x2500, 0x9605, 0x0904,</div><div class='del'>-	0x3f0e, 0x7884, 0xd0bc, 0x0128, 0x2d00, 0x9c05, 0x9b05, 0x1904,</div><div class='del'>-	0x3f0e, 0xa013, 0x0019, 0x2001, 0x032a, 0x2003, 0x0004, 0x7884,</div><div class='del'>-	0xd0ac, 0x1148, 0x2001, 0x1a65, 0x2003, 0x0003, 0x2001, 0x032a,</div><div class='del'>-	0x2003, 0x0009, 0x0030, 0xa017, 0x0001, 0x78b4, 0x9005, 0x0108,</div><div class='del'>-	0xa016, 0x2800, 0xa05a, 0x2009, 0x0040, 0x080c, 0x2409, 0x2900,</div><div class='del'>-	0xa85a, 0xa813, 0x0019, 0x7884, 0xd0a4, 0x1180, 0xa817, 0x0000,</div><div class='del'>-	0x00c6, 0x20a9, 0x0004, 0x2061, 0x0090, 0x602b, 0x0008, 0x2001,</div><div class='del'>-	0x0203, 0x2004, 0x1f04, 0x3ee5, 0x00ce, 0x0030, 0xa817, 0x0001,</div><div class='del'>-	0x78b0, 0x9005, 0x0108, 0xa816, 0x00f6, 0x00c6, 0x2079, 0x0100,</div><div class='del'>-	0x2061, 0x0090, 0x7827, 0x0002, 0x2001, 0x002a, 0x2004, 0x9084,</div><div class='del'>-	0xfff8, 0x601a, 0x0006, 0x2001, 0x002b, 0x2004, 0x601e, 0x78c6,</div><div class='del'>-	0x000e, 0x78ca, 0x00ce, 0x00fe, 0x0804, 0x3e18, 0x001e, 0x00c6,</div><div class='del'>-	0x2001, 0x032a, 0x2003, 0x0004, 0x2061, 0x0100, 0x6027, 0x0002,</div><div class='del'>-	0x6106, 0x2011, 0x020d, 0x2013, 0x0020, 0x2001, 0x0004, 0x200c,</div><div class='del'>-	0x918c, 0xfffd, 0x2102, 0x080c, 0x12fc, 0x7884, 0x9084, 0x0003,</div><div class='del'>-	0x9086, 0x0002, 0x01a0, 0x2009, 0x0028, 0x080c, 0x2409, 0x2001,</div><div class='del'>-	0x0227, 0x200c, 0x2102, 0x6050, 0x9084, 0xb7ef, 0x6052, 0x602f,</div><div class='del'>-	0x0000, 0x604b, 0xf7f7, 0x6043, 0x0090, 0x6043, 0x0010, 0x00ce,</div><div class='del'>-	0x2d08, 0x2c10, 0x2b18, 0x2b00, 0x9c05, 0x9d05, 0x00fe, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e, 0x008e, 0x1118, 0x012e,</div><div class='del'>-	0x0804, 0x35b5, 0x012e, 0x2021, 0x400c, 0x0804, 0x35b7, 0x9085,</div><div class='del'>-	0x0001, 0x1d04, 0x3f60, 0x2091, 0x6000, 0x8420, 0x9486, 0x0064,</div><div class='del'>-	0x0005, 0x2001, 0x0105, 0x2003, 0x0010, 0x2001, 0x032a, 0x2003,</div><div class='del'>-	0x0004, 0x2001, 0x1a65, 0x2003, 0x0000, 0x0071, 0x2009, 0x0048,</div><div class='del'>-	0x080c, 0x2409, 0x2001, 0x0227, 0x2024, 0x2402, 0x2001, 0x0109,</div><div class='del'>-	0x2003, 0x4000, 0x9026, 0x0005, 0x00f6, 0x00e6, 0x2071, 0x1a69,</div><div class='del'>-	0x7000, 0x9086, 0x0000, 0x0520, 0x2079, 0x0090, 0x2009, 0x0206,</div><div class='del'>-	0x2104, 0x2009, 0x0203, 0x210c, 0x9106, 0x1120, 0x2009, 0x0040,</div><div class='del'>-	0x080c, 0x2409, 0x782c, 0xd0fc, 0x0d88, 0x080c, 0x41a4, 0x7000,</div><div class='del'>-	0x9086, 0x0000, 0x1d58, 0x782b, 0x0004, 0x782c, 0xd0ac, 0x1de8,</div><div class='del'>-	0x2009, 0x0040, 0x080c, 0x2409, 0x782b, 0x0002, 0x7003, 0x0000,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0x00f6, 0x2079, 0x0100, 0x2001, 0x1818,</div><div class='del'>-	0x200c, 0x7932, 0x7936, 0x080c, 0x28bc, 0x7850, 0x9084, 0xfbff,</div><div class='del'>-	0x9085, 0x0030, 0x7852, 0x2019, 0x01f4, 0x8319, 0x1df0, 0x9084,</div><div class='del'>-	0xffcf, 0x9085, 0x2000, 0x7852, 0x20a9, 0x0046, 0x1d04, 0x3fc6,</div><div class='del'>-	0x2091, 0x6000, 0x1f04, 0x3fc6, 0x7850, 0x9085, 0x0400, 0x9084,</div><div class='del'>-	0xdfff, 0x7852, 0x2001, 0x0021, 0x2004, 0x9084, 0x0003, 0x9086,</div><div class='del'>-	0x0001, 0x1120, 0x7850, 0x9084, 0xdfff, 0x7852, 0x784b, 0xf7f7,</div><div class='del'>-	0x7843, 0x0090, 0x7843, 0x0010, 0x20a9, 0x0028, 0xa001, 0x1f04,</div><div class='del'>-	0x3fe6, 0x7850, 0x9085, 0x1400, 0x7852, 0x2019, 0x61a8, 0x7854,</div><div class='del'>-	0xa001, 0xa001, 0xd08c, 0x1110, 0x8319, 0x1dc8, 0x7827, 0x0048,</div><div class='del'>-	0x7850, 0x9085, 0x0400, 0x7852, 0x7843, 0x0040, 0x2019, 0x01f4,</div><div class='del'>-	0xa001, 0xa001, 0x8319, 0x1de0, 0x2001, 0x0100, 0x080c, 0x2d39,</div><div class='del'>-	0x7827, 0x0020, 0x7843, 0x0000, 0x9006, 0x080c, 0x2d39, 0x7827,</div><div class='del'>-	0x0048, 0x00fe, 0x0005, 0x7884, 0xd0ac, 0x11c8, 0x00f6, 0x00e6,</div><div class='del'>-	0x2071, 0x1a65, 0x2079, 0x0320, 0x2001, 0x0201, 0x2004, 0x9005,</div><div class='del'>-	0x0160, 0x7000, 0x9086, 0x0000, 0x1140, 0x0051, 0xd0bc, 0x0108,</div><div class='del'>-	0x8738, 0x7003, 0x0003, 0x782b, 0x0019, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x2079, 0x0300, 0x78bc, 0x00fe, 0x908c, 0x0070, 0x0178,</div><div class='del'>-	0x2009, 0x0032, 0x260a, 0x2009, 0x0033, 0x250a, 0xd0b4, 0x0108,</div><div class='del'>-	0x8c60, 0xd0ac, 0x0108, 0x8d68, 0xd0a4, 0x0108, 0x8b58, 0x0005,</div><div class='del'>-	0x00f6, 0x2079, 0x0200, 0x781c, 0xd084, 0x0110, 0x7837, 0x0050,</div><div class='del'>-	0x00fe, 0x0005, 0x00e6, 0x2071, 0x0100, 0x2001, 0x19ab, 0x2004,</div><div class='del'>-	0x70e2, 0x080c, 0x3d39, 0x1188, 0x2001, 0x1820, 0x2004, 0x2009,</div><div class='del'>-	0x181f, 0x210c, 0x918c, 0x00ff, 0x706e, 0x716a, 0x7066, 0x918d,</div><div class='del'>-	0x3200, 0x7162, 0x7073, 0xe109, 0x0080, 0x702c, 0x9085, 0x0002,</div><div class='del'>-	0x702e, 0x2009, 0x1818, 0x210c, 0x716e, 0x7063, 0x0100, 0x7166,</div><div class='del'>-	0x719e, 0x706b, 0x0000, 0x7073, 0x0809, 0x7077, 0x0008, 0x7078,</div><div class='del'>-	0x9080, 0x0100, 0x707a, 0x7080, 0x8000, 0x7082, 0x7087, 0xaaaa,</div><div class='del'>-	0x9006, 0x708a, 0x708e, 0x707e, 0x70d6, 0x70ab, 0x0036, 0x70af,</div><div class='del'>-	0x95d5, 0x7014, 0x9084, 0x1984, 0x9085, 0x0092, 0x7016, 0x080c,</div><div class='del'>-	0x41a4, 0x00f6, 0x2071, 0x1a65, 0x2079, 0x0320, 0x00d6, 0x2069,</div><div class='del'>-	0x0000, 0x6884, 0xd0b4, 0x0120, 0x689c, 0x780e, 0x6898, 0x780a,</div><div class='del'>-	0x00de, 0x080c, 0x3d39, 0x0140, 0x2001, 0x199f, 0x200c, 0x2003,</div><div class='del'>-	0x0001, 0x918e, 0x0001, 0x0120, 0x2009, 0x03e8, 0x8109, 0x1df0,</div><div class='del'>-	0x792c, 0xd1fc, 0x0110, 0x782b, 0x0004, 0x2011, 0x0011, 0x080c,</div><div class='del'>-	0x4130, 0x2011, 0x0001, 0x080c, 0x4130, 0x00fe, 0x00ee, 0x0005,</div><div class='del'>-	0x00f6, 0x00e6, 0x2071, 0x1a65, 0x2079, 0x0320, 0x792c, 0xd1fc,</div><div class='del'>-	0x0904, 0x412d, 0x782b, 0x0002, 0x9026, 0xd19c, 0x1904, 0x4129,</div><div class='del'>-	0x7000, 0x0002, 0x412d, 0x40de, 0x410e, 0x4129, 0xd1bc, 0x1170,</div><div class='del'>-	0xd1dc, 0x1190, 0x8001, 0x7002, 0x2011, 0x0001, 0x080c, 0x4130,</div><div class='del'>-	0x0904, 0x412d, 0x080c, 0x4130, 0x0804, 0x412d, 0x00f6, 0x2079,</div><div class='del'>-	0x0300, 0x78bf, 0x0000, 0x00fe, 0x7810, 0x7914, 0x782b, 0x0004,</div><div class='del'>-	0x7812, 0x7916, 0x2001, 0x0201, 0x200c, 0x81ff, 0x0de8, 0x080c,</div><div class='del'>-	0x4030, 0x2009, 0x0001, 0x00f6, 0x2079, 0x0300, 0x78b8, 0x00fe,</div><div class='del'>-	0xd0ec, 0x0110, 0x2009, 0x0011, 0x792a, 0x00f8, 0x8001, 0x7002,</div><div class='del'>-	0x9184, 0x0880, 0x1140, 0x782c, 0xd0fc, 0x1904, 0x40d2, 0x2011,</div><div class='del'>-	0x0001, 0x00b1, 0x0090, 0xa010, 0x9092, 0x0004, 0x9086, 0x0015,</div><div class='del'>-	0x1120, 0xa000, 0xa05a, 0x2011, 0x0031, 0xa212, 0xd1dc, 0x1960,</div><div class='del'>-	0x0828, 0x782b, 0x0004, 0x7003, 0x0000, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0xa014, 0x9005, 0x0550, 0x8001, 0x0036, 0x0096, 0xa016, 0xa058,</div><div class='del'>-	0x2048, 0xa010, 0x2009, 0x0031, 0x911a, 0x831c, 0x831c, 0x938a,</div><div class='del'>-	0x0007, 0x1a0c, 0x0dc5, 0x9398, 0x415e, 0x231d, 0x083f, 0x9080,</div><div class='del'>-	0x0004, 0x7a2a, 0x7100, 0x8108, 0x7102, 0x009e, 0x003e, 0x908a,</div><div class='del'>-	0x0035, 0x1140, 0x0096, 0xa058, 0x2048, 0xa804, 0xa05a, 0x2001,</div><div class='del'>-	0x0019, 0x009e, 0xa012, 0x9085, 0x0001, 0x0005, 0x419b, 0x4192,</div><div class='del'>-	0x4189, 0x4180, 0x4177, 0x416e, 0x4165, 0xa964, 0x7902, 0xa968,</div><div class='del'>-	0x7906, 0xa96c, 0x7912, 0xa970, 0x7916, 0x0005, 0xa974, 0x7902,</div><div class='del'>-	0xa978, 0x7906, 0xa97c, 0x7912, 0xa980, 0x7916, 0x0005, 0xa984,</div><div class='del'>-	0x7902, 0xa988, 0x7906, 0xa98c, 0x7912, 0xa990, 0x7916, 0x0005,</div><div class='del'>-	0xa994, 0x7902, 0xa998, 0x7906, 0xa99c, 0x7912, 0xa9a0, 0x7916,</div><div class='del'>-	0x0005, 0xa9a4, 0x7902, 0xa9a8, 0x7906, 0xa9ac, 0x7912, 0xa9b0,</div><div class='del'>-	0x7916, 0x0005, 0xa9b4, 0x7902, 0xa9b8, 0x7906, 0xa9bc, 0x7912,</div><div class='del'>-	0xa9c0, 0x7916, 0x0005, 0xa9c4, 0x7902, 0xa9c8, 0x7906, 0xa9cc,</div><div class='del'>-	0x7912, 0xa9d0, 0x7916, 0x0005, 0x00f6, 0x00e6, 0x0086, 0x2071,</div><div class='del'>-	0x1a69, 0x2079, 0x0090, 0x792c, 0xd1fc, 0x01e8, 0x782b, 0x0002,</div><div class='del'>-	0x2940, 0x9026, 0x7000, 0x0002, 0x41cb, 0x41b7, 0x41c2, 0x8001,</div><div class='del'>-	0x7002, 0xd19c, 0x1180, 0x2011, 0x0001, 0x080c, 0x4130, 0x190c,</div><div class='del'>-	0x4130, 0x0048, 0x8001, 0x7002, 0x782c, 0xd0fc, 0x1d38, 0x2011,</div><div class='del'>-	0x0001, 0x080c, 0x4130, 0x008e, 0x00ee, 0x00fe, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x00c6, 0x0086, 0x2061, 0x0200, 0x2001, 0x19ab, 0x2004,</div><div class='del'>-	0x601a, 0x2061, 0x0100, 0x2001, 0x19aa, 0x2004, 0x60ce, 0x6104,</div><div class='del'>-	0xc1ac, 0x6106, 0x2001, 0x002c, 0x2004, 0x9005, 0x0520, 0x2038,</div><div class='del'>-	0x2001, 0x002e, 0x2024, 0x2001, 0x002f, 0x201c, 0x080c, 0x4be4,</div><div class='del'>-	0xa813, 0x0019, 0xaf16, 0x2900, 0xa85a, 0x978a, 0x0007, 0x0220,</div><div class='del'>-	0x2138, 0x2009, 0x0007, 0x0010, 0x2708, 0x903e, 0x0096, 0xa858,</div><div class='del'>-	0x2048, 0xa85c, 0x9080, 0x0019, 0x009e, 0x080c, 0x4247, 0x1d68,</div><div class='del'>-	0x2900, 0xa85a, 0x00d0, 0x080c, 0x4be4, 0xa813, 0x0019, 0xa817,</div><div class='del'>-	0x0001, 0x2900, 0xa85a, 0x2001, 0x002e, 0x2004, 0xa866, 0x2001,</div><div class='del'>-	0x002f, 0x2004, 0xa86a, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8,</div><div class='del'>-	0xa86e, 0x2001, 0x002b, 0x2004, 0xa872, 0x2061, 0x0090, 0x2079,</div><div class='del'>-	0x0100, 0x2001, 0x19aa, 0x2004, 0x6036, 0x2009, 0x0040, 0x080c,</div><div class='del'>-	0x2409, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8, 0x601a, 0x0006,</div><div class='del'>-	0x2001, 0x002b, 0x2004, 0x601e, 0x78c6, 0x000e, 0x78ca, 0x9006,</div><div class='del'>-	0x600a, 0x600e, 0x008e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0x0080, 0xaa60, 0x22e8, 0x20a0, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x0088, 0x702b, 0x0026, 0x7402, 0x7306, 0x9006, 0x700a, 0x700e,</div><div class='del'>-	0x810b, 0x810b, 0x21a8, 0x810b, 0x7112, 0x702b, 0x0041, 0x702c,</div><div class='del'>-	0xd0fc, 0x0de8, 0x702b, 0x0002, 0x702b, 0x0040, 0x4005, 0x7400,</div><div class='del'>-	0x7304, 0x87ff, 0x0190, 0x0086, 0x0096, 0x2940, 0x0086, 0x080c,</div><div class='del'>-	0x4be4, 0x008e, 0xa058, 0x00a6, 0x2050, 0x2900, 0xb006, 0xa05a,</div><div class='del'>-	0x00ae, 0x009e, 0x008e, 0x9085, 0x0001, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x2001, 0x002d, 0x2004, 0x9005, 0x0528, 0x2038, 0x2001, 0x0030,</div><div class='del'>-	0x2024, 0x2001, 0x0031, 0x201c, 0x080c, 0x4be4, 0x2940, 0xa813,</div><div class='del'>-	0x0019, 0xaf16, 0x2900, 0xa85a, 0x978a, 0x0007, 0x0220, 0x2138,</div><div class='del'>-	0x2009, 0x0007, 0x0010, 0x2708, 0x903e, 0x0096, 0xa858, 0x2048,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0x009e, 0x080c, 0x4247, 0x1d68, 0x2900,</div><div class='del'>-	0xa85a, 0x00d8, 0x080c, 0x4be4, 0x2940, 0xa013, 0x0019, 0xa017,</div><div class='del'>-	0x0001, 0x2800, 0xa05a, 0x2001, 0x0030, 0x2004, 0xa066, 0x2001,</div><div class='del'>-	0x0031, 0x2004, 0xa06a, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8,</div><div class='del'>-	0xa06e, 0x2001, 0x002b, 0x2004, 0xa072, 0x2001, 0x032a, 0x2003,</div><div class='del'>-	0x0004, 0x7884, 0xd0ac, 0x1180, 0x2001, 0x0101, 0x200c, 0x918d,</div><div class='del'>-	0x0200, 0x2102, 0xa017, 0x0000, 0x2001, 0x1a65, 0x2003, 0x0003,</div><div class='del'>-	0x2001, 0x032a, 0x2003, 0x0009, 0x2001, 0x0300, 0x2003, 0x0000,</div><div class='del'>-	0x2001, 0x020d, 0x2003, 0x0000, 0x2001, 0x0004, 0x200c, 0x918d,</div><div class='del'>-	0x0002, 0x2102, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x20a9,</div><div class='del'>-	0x0007, 0x20a1, 0x1840, 0x20e9, 0x0001, 0x9006, 0x4004, 0x20a9,</div><div class='del'>-	0x0014, 0x20a1, 0xffec, 0x20e9, 0x0000, 0x9006, 0x4004, 0x2009,</div><div class='del'>-	0x013c, 0x200a, 0x012e, 0x7880, 0x9086, 0x0052, 0x0108, 0x0005,</div><div class='del'>-	0x0804, 0x35b5, 0x7d98, 0x7c9c, 0x0804, 0x36b9, 0x080c, 0x7637,</div><div class='del'>-	0x190c, 0x60f3, 0x6040, 0x9084, 0x0020, 0x09b1, 0x2069, 0x1847,</div><div class='del'>-	0x2d00, 0x2009, 0x0030, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x2039,</div><div class='del'>-	0x0001, 0x080c, 0x4c2d, 0x701f, 0x4326, 0x0005, 0x080c, 0x57e4,</div><div class='del'>-	0x1130, 0x3b00, 0x3a08, 0xc194, 0xc095, 0x20d8, 0x21d0, 0x2069,</div><div class='del'>-	0x1847, 0x6800, 0x9005, 0x0904, 0x35ea, 0x2001, 0x180d, 0x2004,</div><div class='del'>-	0xd08c, 0x6804, 0x0118, 0xc0a4, 0xc0ac, 0x6806, 0xd0ac, 0x0118,</div><div class='del'>-	0xd0a4, 0x0904, 0x35ea, 0xd094, 0x00c6, 0x2061, 0x0100, 0x6104,</div><div class='del'>-	0x0138, 0x6200, 0x9292, 0x0005, 0x0218, 0x918c, 0xffdf, 0x0010,</div><div class='del'>-	0x918d, 0x0020, 0x6106, 0x00ce, 0xd08c, 0x00c6, 0x2061, 0x0100,</div><div class='del'>-	0x6104, 0x0118, 0x918d, 0x0010, 0x0010, 0x918c, 0xffef, 0x6106,</div><div class='del'>-	0x00ce, 0xd084, 0x0158, 0x6a28, 0x928a, 0x007f, 0x1a04, 0x35ea,</div><div class='del'>-	0x9288, 0x33b6, 0x210d, 0x918c, 0x00ff, 0x6166, 0xd0dc, 0x0130,</div><div class='del'>-	0x6828, 0x908a, 0x007f, 0x1a04, 0x35ea, 0x605e, 0x6888, 0x9084,</div><div class='del'>-	0x0030, 0x8004, 0x8004, 0x8004, 0x8004, 0x0006, 0x2009, 0x19b2,</div><div class='del'>-	0x9080, 0x29b7, 0x2005, 0x200a, 0x000e, 0x2009, 0x19b3, 0x9080,</div><div class='del'>-	0x29bb, 0x2005, 0x200a, 0x6808, 0x908a, 0x0100, 0x0a04, 0x35ea,</div><div class='del'>-	0x908a, 0x0841, 0x1a04, 0x35ea, 0x9084, 0x0007, 0x1904, 0x35ea,</div><div class='del'>-	0x680c, 0x9005, 0x0904, 0x35ea, 0x6810, 0x9005, 0x0904, 0x35ea,</div><div class='del'>-	0x6848, 0x6940, 0x910a, 0x1a04, 0x35ea, 0x8001, 0x0904, 0x35ea,</div><div class='del'>-	0x684c, 0x6944, 0x910a, 0x1a04, 0x35ea, 0x8001, 0x0904, 0x35ea,</div><div class='del'>-	0x2009, 0x1981, 0x200b, 0x0000, 0x2001, 0x1869, 0x2004, 0xd0c4,</div><div class='del'>-	0x0140, 0x7884, 0x200a, 0x2008, 0x080c, 0x0e52, 0x3b00, 0xc085,</div><div class='del'>-	0x20d8, 0x6814, 0x908c, 0x00ff, 0x614e, 0x8007, 0x9084, 0x00ff,</div><div class='del'>-	0x6052, 0x080c, 0x7963, 0x080c, 0x6b8e, 0x080c, 0x6bf8, 0x6808,</div><div class='del'>-	0x602a, 0x080c, 0x237b, 0x2009, 0x0170, 0x200b, 0x0080, 0xa001,</div><div class='del'>-	0xa001, 0x200b, 0x0000, 0x0036, 0x6b08, 0x080c, 0x2916, 0x003e,</div><div class='del'>-	0x6000, 0x9086, 0x0000, 0x1904, 0x44cf, 0x6818, 0x691c, 0x6a20,</div><div class='del'>-	0x6b24, 0x8007, 0x810f, 0x8217, 0x831f, 0x6016, 0x611a, 0x621e,</div><div class='del'>-	0x6322, 0x6c04, 0xd4f4, 0x0148, 0x6830, 0x6934, 0x6a38, 0x6b3c,</div><div class='del'>-	0x8007, 0x810f, 0x8217, 0x831f, 0x0010, 0x9084, 0xf0ff, 0x6006,</div><div class='del'>-	0x610a, 0x620e, 0x6312, 0x8007, 0x810f, 0x8217, 0x831f, 0x20a9,</div><div class='del'>-	0x0004, 0x20a1, 0x19b4, 0x20e9, 0x0001, 0x4001, 0x20a9, 0x0004,</div><div class='del'>-	0x20a1, 0x19ce, 0x20e9, 0x0001, 0x4001, 0x080c, 0x8962, 0x00c6,</div><div class='del'>-	0x900e, 0x20a9, 0x0001, 0x6b70, 0xd384, 0x0510, 0x0068, 0x2009,</div><div class='del'>-	0x0100, 0x210c, 0x918e, 0x0008, 0x1110, 0x839d, 0x0010, 0x83f5,</div><div class='del'>-	0x3e18, 0x12b0, 0x3508, 0x8109, 0x080c, 0x7f6f, 0x6878, 0x6016,</div><div class='del'>-	0x6874, 0x2008, 0x9084, 0xff00, 0x8007, 0x600a, 0x9184, 0x00ff,</div><div class='del'>-	0x6006, 0x8108, 0x1118, 0x6003, 0x0003, 0x0010, 0x6003, 0x0001,</div><div class='del'>-	0x1f04, 0x441f, 0x00ce, 0x00c6, 0x2061, 0x199c, 0x2001, 0x180d,</div><div class='del'>-	0x2004, 0xd08c, 0x11a8, 0x6a88, 0x9284, 0xc000, 0x2010, 0x9286,</div><div class='del'>-	0x0000, 0x1158, 0x2063, 0x0000, 0x2001, 0x0001, 0x080c, 0x2bb1,</div><div class='del'>-	0x2001, 0x0001, 0x080c, 0x2b94, 0x0088, 0x9286, 0x4000, 0x1148,</div><div class='del'>-	0x2063, 0x0001, 0x9006, 0x080c, 0x2bb1, 0x9006, 0x080c, 0x2b94,</div><div class='del'>-	0x0028, 0x9286, 0x8000, 0x1d30, 0x2063, 0x0002, 0x00ce, 0x00e6,</div><div class='del'>-	0x2c70, 0x080c, 0x0ea3, 0x00ee, 0x6888, 0xd0ec, 0x0130, 0x2011,</div><div class='del'>-	0x0114, 0x2204, 0x9085, 0x0100, 0x2012, 0x6a80, 0x9284, 0x0030,</div><div class='del'>-	0x9086, 0x0030, 0x1128, 0x9294, 0xffcf, 0x9295, 0x0020, 0x6a82,</div><div class='del'>-	0x2001, 0x197c, 0x6a80, 0x9294, 0x0030, 0x928e, 0x0000, 0x0170,</div><div class='del'>-	0x928e, 0x0010, 0x0118, 0x928e, 0x0020, 0x0140, 0x2003, 0xaaaa,</div><div class='del'>-	0x080c, 0x298b, 0x2001, 0x196d, 0x2102, 0x0008, 0x2102, 0x00c6,</div><div class='del'>-	0x2061, 0x0100, 0x602f, 0x0040, 0x602f, 0x0000, 0x00ce, 0x080c,</div><div class='del'>-	0x7637, 0x0128, 0x080c, 0x50cb, 0x0110, 0x080c, 0x28dc, 0x60d4,</div><div class='del'>-	0x9005, 0x01c0, 0x6003, 0x0001, 0x2009, 0x44b7, 0x00e0, 0x080c,</div><div class='del'>-	0x7637, 0x1168, 0x2011, 0x74b2, 0x080c, 0x883d, 0x2011, 0x74a5,</div><div class='del'>-	0x080c, 0x8917, 0x080c, 0x7937, 0x080c, 0x7563, 0x0040, 0x080c,</div><div class='del'>-	0x5fed, 0x0028, 0x6003, 0x0004, 0x2009, 0x44cf, 0x0020, 0x080c,</div><div class='del'>-	0x6a05, 0x0804, 0x35b5, 0x2001, 0x0170, 0x2004, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x004c, 0x1118, 0x2091, 0x30bd, 0x0817, 0x2091, 0x303d,</div><div class='del'>-	0x0817, 0x6000, 0x9086, 0x0000, 0x0904, 0x35e7, 0x2069, 0x1847,</div><div class='del'>-	0x7890, 0x6842, 0x7894, 0x6846, 0x2d00, 0x2009, 0x0030, 0x7a8c,</div><div class='del'>-	0x7b88, 0x7c9c, 0x7d98, 0x2039, 0x0001, 0x0804, 0x4c30, 0x9006,</div><div class='del'>-	0x080c, 0x28dc, 0x81ff, 0x1904, 0x35e7, 0x080c, 0x7637, 0x11b0,</div><div class='del'>-	0x080c, 0x7932, 0x080c, 0x612e, 0x080c, 0x33aa, 0x0118, 0x6130,</div><div class='del'>-	0xc18d, 0x6132, 0x080c, 0xd7e3, 0x0130, 0x080c, 0x765a, 0x1118,</div><div class='del'>-	0x080c, 0x760f, 0x0038, 0x080c, 0x7563, 0x0020, 0x080c, 0x60f3,</div><div class='del'>-	0x080c, 0x5fed, 0x0804, 0x35b5, 0x81ff, 0x1904, 0x35e7, 0x080c,</div><div class='del'>-	0x7637, 0x1110, 0x0804, 0x35e7, 0x0126, 0x2091, 0x8000, 0x6194,</div><div class='del'>-	0x81ff, 0x0190, 0x704f, 0x0000, 0x2001, 0x1c80, 0x2009, 0x0040,</div><div class='del'>-	0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x2039, 0x0001, 0x080c, 0x4c30,</div><div class='del'>-	0x701f, 0x35b3, 0x012e, 0x0005, 0x704f, 0x0001, 0x00d6, 0x2069,</div><div class='del'>-	0x1c80, 0x20a9, 0x0040, 0x20e9, 0x0001, 0x20a1, 0x1c80, 0x2019,</div><div class='del'>-	0xffff, 0x4304, 0x655c, 0x9588, 0x33b6, 0x210d, 0x918c, 0x00ff,</div><div class='del'>-	0x216a, 0x900e, 0x2011, 0x0002, 0x2100, 0x9506, 0x01a8, 0x080c,</div><div class='del'>-	0x6724, 0x1190, 0xb814, 0x821c, 0x0238, 0x9398, 0x1c80, 0x9085,</div><div class='del'>-	0xff00, 0x8007, 0x201a, 0x0038, 0x9398, 0x1c80, 0x2324, 0x94a4,</div><div class='del'>-	0xff00, 0x9405, 0x201a, 0x8210, 0x8108, 0x9182, 0x0080, 0x1208,</div><div class='del'>-	0x0c18, 0x8201, 0x8007, 0x2d0c, 0x9105, 0x206a, 0x00de, 0x20a9,</div><div class='del'>-	0x0040, 0x20a1, 0x1c80, 0x2099, 0x1c80, 0x080c, 0x607e, 0x0804,</div><div class='del'>-	0x452c, 0x080c, 0x4c17, 0x0904, 0x35ea, 0x080c, 0x4be4, 0x1120,</div><div class='del'>-	0x2009, 0x0002, 0x0804, 0x35e7, 0x080c, 0x57d5, 0xd0b4, 0x0558,</div><div class='del'>-	0x7884, 0x908e, 0x007e, 0x0538, 0x908e, 0x007f, 0x0520, 0x908e,</div><div class='del'>-	0x0080, 0x0508, 0x080c, 0x33a5, 0x1148, 0xb800, 0xd08c, 0x11d8,</div><div class='del'>-	0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x11a8, 0xa867, 0x0000,</div><div class='del'>-	0xa868, 0xc0fd, 0xa86a, 0x080c, 0xd2a3, 0x1120, 0x2009, 0x0003,</div><div class='del'>-	0x0804, 0x35e7, 0x7007, 0x0003, 0x701f, 0x45b7, 0x0005, 0x080c,</div><div class='del'>-	0x4c17, 0x0904, 0x35ea, 0x20a9, 0x002b, 0xb8c4, 0x20e0, 0xb8c8,</div><div class='del'>-	0x2098, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003,</div><div class='del'>-	0x20a9, 0x0008, 0x9080, 0x0006, 0x20a0, 0xb8c4, 0x20e0, 0xb8c8,</div><div class='del'>-	0x9080, 0x0006, 0x2098, 0x080c, 0x0f8b, 0x0070, 0x20a9, 0x0004,</div><div class='del'>-	0xa85c, 0x9080, 0x000a, 0x20a0, 0xb8c4, 0x20e0, 0xb8c8, 0x9080,</div><div class='del'>-	0x000a, 0x2098, 0x080c, 0x0f8b, 0x8906, 0x8006, 0x8007, 0x90bc,</div><div class='del'>-	0x003f, 0x9084, 0xffc0, 0x9080, 0x0002, 0x2009, 0x002b, 0x7a8c,</div><div class='del'>-	0x7b88, 0x7c9c, 0x7d98, 0x0804, 0x4c30, 0x81ff, 0x1904, 0x35e7,</div><div class='del'>-	0x080c, 0x4bfb, 0x0904, 0x35ea, 0x080c, 0x6896, 0x0904, 0x35e7,</div><div class='del'>-	0x0058, 0xa878, 0x9005, 0x0120, 0x2009, 0x0004, 0x0804, 0x35e7,</div><div class='del'>-	0xa974, 0xaa94, 0x0804, 0x35b5, 0x080c, 0x57dd, 0x0904, 0x35b5,</div><div class='del'>-	0x701f, 0x4601, 0x7007, 0x0003, 0x0005, 0x81ff, 0x1904, 0x35e7,</div><div class='del'>-	0x7888, 0x908a, 0x1000, 0x1a04, 0x35ea, 0x080c, 0x4c17, 0x0904,</div><div class='del'>-	0x35ea, 0x080c, 0x6aa3, 0x0120, 0x080c, 0x6aab, 0x1904, 0x35ea,</div><div class='del'>-	0x080c, 0x691b, 0x0904, 0x35e7, 0x2019, 0x0004, 0x900e, 0x080c,</div><div class='del'>-	0x68a8, 0x0904, 0x35e7, 0x7984, 0x7a88, 0x04c9, 0x08a8, 0xa89c,</div><div class='del'>-	0x908a, 0x1000, 0x12f8, 0x080c, 0x4c15, 0x01e0, 0x080c, 0x6aa3,</div><div class='del'>-	0x0118, 0x080c, 0x6aab, 0x11b0, 0x080c, 0x691b, 0x2009, 0x0002,</div><div class='del'>-	0x0168, 0x2009, 0x0002, 0x2019, 0x0004, 0x080c, 0x68a8, 0x2009,</div><div class='del'>-	0x0003, 0x0120, 0xa998, 0xaa9c, 0x00d1, 0x0060, 0xa897, 0x4005,</div><div class='del'>-	0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001,</div><div class='del'>-	0x0030, 0x0005, 0xa897, 0x4000, 0x080c, 0x57dd, 0x0110, 0x9006,</div><div class='del'>-	0x0018, 0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x9186,</div><div class='del'>-	0x00ff, 0x0110, 0x0071, 0x0060, 0x2029, 0x007e, 0x2061, 0x1800,</div><div class='del'>-	0x645c, 0x2400, 0x9506, 0x0110, 0x2508, 0x0019, 0x8529, 0x1ec8,</div><div class='del'>-	0x0005, 0x080c, 0x6724, 0x1138, 0x2200, 0x8003, 0x800b, 0x810b,</div><div class='del'>-	0x9108, 0x080c, 0x884b, 0x0005, 0x81ff, 0x1904, 0x35e7, 0x798c,</div><div class='del'>-	0x2001, 0x1980, 0x918c, 0x8000, 0x2102, 0x080c, 0x4bfb, 0x0904,</div><div class='del'>-	0x35ea, 0x080c, 0x6aa3, 0x0120, 0x080c, 0x6aab, 0x1904, 0x35ea,</div><div class='del'>-	0x080c, 0x67eb, 0x0904, 0x35e7, 0x080c, 0x689f, 0x0904, 0x35e7,</div><div class='del'>-	0x2001, 0x1980, 0x2004, 0xd0fc, 0x1904, 0x35b5, 0x0804, 0x460c,</div><div class='del'>-	0xa9a0, 0x2001, 0x1980, 0x918c, 0x8000, 0xc18d, 0x2102, 0x080c,</div><div class='del'>-	0x4c08, 0x01a0, 0x080c, 0x6aa3, 0x0118, 0x080c, 0x6aab, 0x1170,</div><div class='del'>-	0x080c, 0x67eb, 0x2009, 0x0002, 0x0128, 0x080c, 0x689f, 0x1170,</div><div class='del'>-	0x2009, 0x0003, 0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x0005, 0xa897, 0x4000,</div><div class='del'>-	0x2001, 0x1980, 0x2004, 0xd0fc, 0x1128, 0x080c, 0x57dd, 0x0110,</div><div class='del'>-	0x9006, 0x0018, 0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005,</div><div class='del'>-	0x81ff, 0x1904, 0x35e7, 0x798c, 0x2001, 0x197f, 0x918c, 0x8000,</div><div class='del'>-	0x2102, 0x080c, 0x4bfb, 0x0904, 0x35ea, 0x080c, 0x6aa3, 0x0120,</div><div class='del'>-	0x080c, 0x6aab, 0x1904, 0x35ea, 0x080c, 0x67eb, 0x0904, 0x35e7,</div><div class='del'>-	0x080c, 0x688d, 0x0904, 0x35e7, 0x2001, 0x197f, 0x2004, 0xd0fc,</div><div class='del'>-	0x1904, 0x35b5, 0x0804, 0x460c, 0xa9a0, 0x2001, 0x197f, 0x918c,</div><div class='del'>-	0x8000, 0xc18d, 0x2102, 0x080c, 0x4c08, 0x01a0, 0x080c, 0x6aa3,</div><div class='del'>-	0x0118, 0x080c, 0x6aab, 0x1170, 0x080c, 0x67eb, 0x2009, 0x0002,</div><div class='del'>-	0x0128, 0x080c, 0x688d, 0x1170, 0x2009, 0x0003, 0xa897, 0x4005,</div><div class='del'>-	0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001,</div><div class='del'>-	0x0030, 0x0005, 0xa897, 0x4000, 0x2001, 0x197f, 0x2004, 0xd0fc,</div><div class='del'>-	0x1128, 0x080c, 0x57dd, 0x0110, 0x9006, 0x0018, 0x900e, 0x9085,</div><div class='del'>-	0x0001, 0x2001, 0x0000, 0x0005, 0x6100, 0x0804, 0x35b5, 0x080c,</div><div class='del'>-	0x4c17, 0x0904, 0x35ea, 0x080c, 0x57e9, 0x1904, 0x35e7, 0x79a8,</div><div class='del'>-	0xd184, 0x1158, 0xb834, 0x8007, 0x789e, 0xb830, 0x8007, 0x789a,</div><div class='del'>-	0xbb2c, 0x831f, 0xba28, 0x8217, 0x0050, 0xb824, 0x8007, 0x789e,</div><div class='del'>-	0xb820, 0x8007, 0x789a, 0xbb1c, 0x831f, 0xba18, 0x8217, 0xb900,</div><div class='del'>-	0x918c, 0x0202, 0x0804, 0x35b5, 0x78a8, 0x909c, 0x0003, 0xd0ac,</div><div class='del'>-	0x1158, 0xd0b4, 0x1148, 0x939a, 0x0003, 0x1a04, 0x35e7, 0x625c,</div><div class='del'>-	0x7884, 0x9206, 0x1904, 0x47c7, 0x080c, 0x894c, 0x2001, 0xffec,</div><div class='del'>-	0x2009, 0x000c, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x2039, 0x0000,</div><div class='del'>-	0x0006, 0x78a8, 0x9084, 0x0080, 0x1528, 0x0006, 0x0036, 0x2001,</div><div class='del'>-	0x1a83, 0x201c, 0x7b9a, 0x2003, 0x0000, 0x2001, 0x1a84, 0x201c,</div><div class='del'>-	0x7b9e, 0x2003, 0x0000, 0x2001, 0x1a85, 0x201c, 0x7bae, 0x2003,</div><div class='del'>-	0x0000, 0x2001, 0x1a7f, 0x201c, 0x7baa, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x1a86, 0x201c, 0x7bb2, 0x2003, 0x0000, 0x003e, 0x000e, 0x000e,</div><div class='del'>-	0x0804, 0x4c30, 0x000e, 0x2031, 0x0000, 0x2061, 0x18b8, 0x2c44,</div><div class='del'>-	0xa66a, 0xa17a, 0xa772, 0xa076, 0xa28e, 0xa392, 0xa496, 0xa59a,</div><div class='del'>-	0x080c, 0x10f8, 0x7007, 0x0002, 0x701f, 0x47e7, 0x0005, 0x81ff,</div><div class='del'>-	0x1904, 0x35e7, 0x080c, 0x4c17, 0x0904, 0x35ea, 0x080c, 0x6aa3,</div><div class='del'>-	0x1904, 0x35e7, 0x00c6, 0x080c, 0x4be4, 0x00ce, 0x0904, 0x35e7,</div><div class='del'>-	0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x7ea8, 0x080c, 0xd249,</div><div class='del'>-	0x0904, 0x35e7, 0x7007, 0x0003, 0x701f, 0x480d, 0x0005, 0x080c,</div><div class='del'>-	0x42ec, 0x0006, 0x0036, 0x2001, 0x1a83, 0x201c, 0x7b9a, 0x2003,</div><div class='del'>-	0x0000, 0x2001, 0x1a84, 0x201c, 0x7b9e, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x1a85, 0x201c, 0x7bae, 0x2003, 0x0000, 0x2001, 0x1a7f, 0x201c,</div><div class='del'>-	0x7baa, 0x2003, 0x0000, 0x2001, 0x1a86, 0x201c, 0x7bb2, 0x2003,</div><div class='del'>-	0x0000, 0x003e, 0x000e, 0x0804, 0x35b5, 0xa830, 0x9086, 0x0100,</div><div class='del'>-	0x0904, 0x35e7, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,</div><div class='del'>-	0xffc0, 0x9080, 0x001b, 0x2009, 0x000c, 0x7a8c, 0x7b88, 0x7c9c,</div><div class='del'>-	0x7d98, 0x0804, 0x4c30, 0x9006, 0x080c, 0x28dc, 0x78a8, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x00ff, 0x0118, 0x81ff, 0x1904, 0x35e7, 0x080c,</div><div class='del'>-	0x7637, 0x0110, 0x080c, 0x60f3, 0x7888, 0x908a, 0x1000, 0x1a04,</div><div class='del'>-	0x35ea, 0x7984, 0x9186, 0x00ff, 0x0138, 0x9182, 0x007f, 0x1a04,</div><div class='del'>-	0x35ea, 0x2100, 0x080c, 0x28a6, 0x0026, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2061, 0x19fb, 0x601b, 0x0000, 0x601f, 0x0000, 0x607b,</div><div class='del'>-	0x0000, 0x607f, 0x0000, 0x080c, 0x7637, 0x1158, 0x080c, 0x7932,</div><div class='del'>-	0x080c, 0x612e, 0x9085, 0x0001, 0x080c, 0x767b, 0x080c, 0x7563,</div><div class='del'>-	0x00d0, 0x080c, 0xb244, 0x2061, 0x0100, 0x2001, 0x1818, 0x2004,</div><div class='del'>-	0x9084, 0x00ff, 0x810f, 0x9105, 0x604a, 0x6043, 0x0090, 0x6043,</div><div class='del'>-	0x0010, 0x2009, 0x1999, 0x200b, 0x0000, 0x2009, 0x002d, 0x2011,</div><div class='del'>-	0x6019, 0x080c, 0x88d5, 0x7984, 0x080c, 0x7637, 0x1110, 0x2009,</div><div class='del'>-	0x00ff, 0x7a88, 0x080c, 0x466f, 0x012e, 0x00ce, 0x002e, 0x0804,</div><div class='del'>-	0x35b5, 0x7984, 0x080c, 0x66b9, 0x2b08, 0x1904, 0x35ea, 0x0804,</div><div class='del'>-	0x35b5, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x35e7, 0x60dc,</div><div class='del'>-	0xd0ac, 0x1130, 0xd09c, 0x1120, 0x2009, 0x0005, 0x0804, 0x35e7,</div><div class='del'>-	0x080c, 0x4be4, 0x1120, 0x2009, 0x0002, 0x0804, 0x35e7, 0x7984,</div><div class='del'>-	0x81ff, 0x0904, 0x35ea, 0x9192, 0x0021, 0x1a04, 0x35ea, 0x7a8c,</div><div class='del'>-	0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080, 0x0019, 0x702a, 0xaf60,</div><div class='del'>-	0x7736, 0x080c, 0x4c2d, 0x701f, 0x48c4, 0x7880, 0x9086, 0x006e,</div><div class='del'>-	0x0110, 0x701f, 0x527d, 0x0005, 0x2009, 0x0080, 0x080c, 0x6724,</div><div class='del'>-	0x1118, 0x080c, 0x6aa3, 0x0120, 0x2021, 0x400a, 0x0804, 0x35b7,</div><div class='del'>-	0x00d6, 0x0096, 0xa964, 0xaa6c, 0xab70, 0xac74, 0xad78, 0xae7c,</div><div class='del'>-	0xa884, 0x90be, 0x0100, 0x0904, 0x495d, 0x90be, 0x0112, 0x0904,</div><div class='del'>-	0x495d, 0x90be, 0x0113, 0x0904, 0x495d, 0x90be, 0x0114, 0x0904,</div><div class='del'>-	0x495d, 0x90be, 0x0117, 0x0904, 0x495d, 0x90be, 0x011a, 0x0904,</div><div class='del'>-	0x495d, 0x90be, 0x011c, 0x0904, 0x495d, 0x90be, 0x0121, 0x0904,</div><div class='del'>-	0x4944, 0x90be, 0x0131, 0x0904, 0x4944, 0x90be, 0x0171, 0x0904,</div><div class='del'>-	0x495d, 0x90be, 0x0173, 0x0904, 0x495d, 0x90be, 0x01a1, 0x1128,</div><div class='del'>-	0xa894, 0x8007, 0xa896, 0x0804, 0x4968, 0x90be, 0x0212, 0x0904,</div><div class='del'>-	0x4951, 0x90be, 0x0213, 0x05e8, 0x90be, 0x0214, 0x0500, 0x90be,</div><div class='del'>-	0x0217, 0x0188, 0x90be, 0x021a, 0x1120, 0xa89c, 0x8007, 0xa89e,</div><div class='del'>-	0x04e0, 0x90be, 0x021f, 0x05c8, 0x90be, 0x0300, 0x05b0, 0x009e,</div><div class='del'>-	0x00de, 0x0804, 0x35ea, 0x7028, 0x9080, 0x0010, 0x2098, 0x20a0,</div><div class='del'>-	0x7034, 0x20e0, 0x20e8, 0x20a9, 0x0007, 0x080c, 0x49a6, 0x7028,</div><div class='del'>-	0x9080, 0x000e, 0x2098, 0x20a0, 0x7034, 0x20e0, 0x20e8, 0x20a9,</div><div class='del'>-	0x0001, 0x080c, 0x49a6, 0x00c8, 0x7028, 0x9080, 0x000c, 0x2098,</div><div class='del'>-	0x20a0, 0x7034, 0x20e0, 0x20e8, 0x20a9, 0x0001, 0x080c, 0x49b3,</div><div class='del'>-	0x00b8, 0x7028, 0x9080, 0x000e, 0x2098, 0x20a0, 0x7034, 0x20e0,</div><div class='del'>-	0x20e8, 0x20a9, 0x0001, 0x080c, 0x49b3, 0x7028, 0x9080, 0x000c,</div><div class='del'>-	0x2098, 0x20a0, 0x7034, 0x20e0, 0x20e8, 0x20a9, 0x0001, 0x04f1,</div><div class='del'>-	0x00c6, 0x080c, 0x4be4, 0x0550, 0xa868, 0xc0fd, 0xa86a, 0xa867,</div><div class='del'>-	0x0119, 0x9006, 0xa882, 0xa87f, 0x0020, 0xa88b, 0x0001, 0x810b,</div><div class='del'>-	0xa9ae, 0xa8b2, 0xaab6, 0xabba, 0xacbe, 0xadc2, 0xa9c6, 0xa8ca,</div><div class='del'>-	0x00ce, 0x009e, 0x00de, 0xa866, 0xa822, 0xa868, 0xc0fd, 0xa86a,</div><div class='del'>-	0xa804, 0x2048, 0x080c, 0xd264, 0x1120, 0x2009, 0x0003, 0x0804,</div><div class='del'>-	0x35e7, 0x7007, 0x0003, 0x701f, 0x499d, 0x0005, 0x00ce, 0x009e,</div><div class='del'>-	0x00de, 0x2009, 0x0002, 0x0804, 0x35e7, 0xa820, 0x9086, 0x8001,</div><div class='del'>-	0x1904, 0x35b5, 0x2009, 0x0004, 0x0804, 0x35e7, 0x0016, 0x0026,</div><div class='del'>-	0x3510, 0x20a9, 0x0002, 0x4002, 0x4104, 0x4004, 0x8211, 0x1dc8,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0016, 0x0026, 0x0036, 0x0046, 0x3520,</div><div class='del'>-	0x20a9, 0x0004, 0x4002, 0x4304, 0x4204, 0x4104, 0x4004, 0x8421,</div><div class='del'>-	0x1db8, 0x004e, 0x003e, 0x002e, 0x001e, 0x0005, 0x81ff, 0x0120,</div><div class='del'>-	0x2009, 0x0001, 0x0804, 0x35e7, 0x60dc, 0xd0ac, 0x1188, 0x2009,</div><div class='del'>-	0x180d, 0x210c, 0xd18c, 0x0130, 0xd09c, 0x0120, 0x2009, 0x0016,</div><div class='del'>-	0x0804, 0x35e7, 0xd09c, 0x1120, 0x2009, 0x0005, 0x0804, 0x35e7,</div><div class='del'>-	0x7984, 0x78a8, 0x2040, 0x080c, 0xb23d, 0x1120, 0x9182, 0x007f,</div><div class='del'>-	0x0a04, 0x35ea, 0x9186, 0x00ff, 0x0904, 0x35ea, 0x9182, 0x0800,</div><div class='del'>-	0x1a04, 0x35ea, 0x7a8c, 0x7b88, 0x607c, 0x9306, 0x1158, 0x6080,</div><div class='del'>-	0x924e, 0x0904, 0x35ea, 0x080c, 0xb23d, 0x1120, 0x99cc, 0xff00,</div><div class='del'>-	0x0904, 0x35ea, 0x0126, 0x2091, 0x8000, 0x2001, 0x180d, 0x2004,</div><div class='del'>-	0xd08c, 0x0198, 0x9386, 0x00ff, 0x0180, 0x0026, 0x2011, 0x8008,</div><div class='del'>-	0x080c, 0x6ac7, 0x002e, 0x0148, 0x918d, 0x8000, 0x080c, 0x6b11,</div><div class='del'>-	0x1120, 0x2001, 0x4009, 0x0804, 0x4a64, 0x080c, 0x4af7, 0x0904,</div><div class='del'>-	0x4a6a, 0x0086, 0x90c6, 0x4000, 0x008e, 0x1538, 0x00c6, 0x0006,</div><div class='del'>-	0x0036, 0xb818, 0xbb1c, 0x9305, 0xbb20, 0x9305, 0xbb24, 0x9305,</div><div class='del'>-	0xbb28, 0x9305, 0xbb2c, 0x9305, 0xbb30, 0x9305, 0xbb34, 0x9305,</div><div class='del'>-	0x003e, 0x0570, 0xd88c, 0x1128, 0x080c, 0x6aa3, 0x0110, 0xc89d,</div><div class='del'>-	0x0438, 0x900e, 0x080c, 0x6944, 0x1108, 0xc185, 0xb800, 0xd0bc,</div><div class='del'>-	0x0108, 0xc18d, 0x000e, 0x00ce, 0x00b8, 0x90c6, 0x4007, 0x1110,</div><div class='del'>-	0x2408, 0x0090, 0x90c6, 0x4008, 0x1118, 0x2708, 0x2610, 0x0060,</div><div class='del'>-	0x90c6, 0x4009, 0x1108, 0x0040, 0x90c6, 0x4006, 0x1108, 0x0020,</div><div class='del'>-	0x2001, 0x4005, 0x2009, 0x000a, 0x2020, 0x012e, 0x0804, 0x35b7,</div><div class='del'>-	0x000e, 0x00ce, 0x2b00, 0x7026, 0x0016, 0x00b6, 0x00c6, 0x00e6,</div><div class='del'>-	0x2c70, 0x080c, 0xb325, 0x0904, 0x4abf, 0x2b00, 0x6012, 0x080c,</div><div class='del'>-	0xd554, 0x2e58, 0x00ee, 0x00e6, 0x00c6, 0x080c, 0x4be4, 0x00ce,</div><div class='del'>-	0x2b70, 0x1158, 0x080c, 0xb2d3, 0x00ee, 0x00ce, 0x00be, 0x001e,</div><div class='del'>-	0x012e, 0x2009, 0x0002, 0x0804, 0x35e7, 0x900e, 0xa966, 0xa96a,</div><div class='del'>-	0x2900, 0x6016, 0xa932, 0xa868, 0xc0fd, 0xd88c, 0x0108, 0xc0f5,</div><div class='del'>-	0xa86a, 0xd89c, 0x1110, 0x080c, 0x3250, 0x6023, 0x0001, 0x9006,</div><div class='del'>-	0x080c, 0x6656, 0xd89c, 0x0138, 0x2001, 0x0004, 0x080c, 0x666a,</div><div class='del'>-	0x2009, 0x0003, 0x0030, 0x2001, 0x0002, 0x080c, 0x666a, 0x2009,</div><div class='del'>-	0x0002, 0x080c, 0xb352, 0x78a8, 0xd094, 0x0138, 0x00ee, 0x7024,</div><div class='del'>-	0x00e6, 0x2058, 0xb8cc, 0xc08d, 0xb8ce, 0x9085, 0x0001, 0x00ee,</div><div class='del'>-	0x00ce, 0x00be, 0x001e, 0x012e, 0x1120, 0x2009, 0x0003, 0x0804,</div><div class='del'>-	0x35e7, 0x7007, 0x0003, 0x701f, 0x4ace, 0x0005, 0xa830, 0x2009,</div><div class='del'>-	0x180d, 0x210c, 0xd18c, 0x0140, 0x2008, 0x918e, 0xdead, 0x1120,</div><div class='del'>-	0x2021, 0x4009, 0x0804, 0x35b7, 0x9086, 0x0100, 0x7024, 0x2058,</div><div class='del'>-	0x1138, 0x2009, 0x0004, 0xba04, 0x9294, 0x00ff, 0x0804, 0x5729,</div><div class='del'>-	0x900e, 0xa868, 0xd0f4, 0x1904, 0x35b5, 0x080c, 0x6944, 0x1108,</div><div class='del'>-	0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x0804, 0x35b5, 0x00e6,</div><div class='del'>-	0x00d6, 0x0096, 0x83ff, 0x0904, 0x4b46, 0x902e, 0x080c, 0xb23d,</div><div class='del'>-	0x0130, 0x9026, 0x20a9, 0x0800, 0x2071, 0x1000, 0x0030, 0x2021,</div><div class='del'>-	0x007f, 0x20a9, 0x0781, 0x2071, 0x107f, 0x2e04, 0x9005, 0x11b8,</div><div class='del'>-	0x2100, 0x9406, 0x1904, 0x4b57, 0x2428, 0x94ce, 0x007f, 0x1120,</div><div class='del'>-	0x92ce, 0xfffd, 0x1558, 0x0030, 0x94ce, 0x0080, 0x1130, 0x92ce,</div><div class='del'>-	0xfffc, 0x1520, 0x93ce, 0x00ff, 0x1508, 0xc5fd, 0x0480, 0x2058,</div><div class='del'>-	0xbf10, 0x2700, 0x9306, 0x11e8, 0xbe14, 0x2600, 0x9206, 0x11c8,</div><div class='del'>-	0x2400, 0x9106, 0x1180, 0xd884, 0x0598, 0xd894, 0x1588, 0x080c,</div><div class='del'>-	0x6a43, 0x1570, 0x2001, 0x4000, 0x0460, 0x080c, 0x6aa3, 0x1540,</div><div class='del'>-	0x2001, 0x4000, 0x0430, 0x2001, 0x4007, 0x0418, 0x2001, 0x4006,</div><div class='del'>-	0x0400, 0x2400, 0x9106, 0x1158, 0xbe14, 0x87ff, 0x1128, 0x86ff,</div><div class='del'>-	0x0918, 0x080c, 0xb23d, 0x1900, 0x2001, 0x4008, 0x0090, 0x8420,</div><div class='del'>-	0x8e70, 0x1f04, 0x4b0d, 0x85ff, 0x1130, 0x2001, 0x4009, 0x0048,</div><div class='del'>-	0x2001, 0x0001, 0x0030, 0x080c, 0x66b9, 0x1dd0, 0xbb12, 0xba16,</div><div class='del'>-	0x9006, 0x9005, 0x009e, 0x00de, 0x00ee, 0x0005, 0x81ff, 0x0120,</div><div class='del'>-	0x2009, 0x0001, 0x0804, 0x35e7, 0x080c, 0x4be4, 0x1120, 0x2009,</div><div class='del'>-	0x0002, 0x0804, 0x35e7, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a,</div><div class='del'>-	0x7884, 0x9005, 0x0904, 0x35ea, 0x9096, 0x00ff, 0x0120, 0x9092,</div><div class='del'>-	0x0004, 0x1a04, 0x35ea, 0x2010, 0x2918, 0x080c, 0x31f6, 0x1120,</div><div class='del'>-	0x2009, 0x0003, 0x0804, 0x35e7, 0x7007, 0x0003, 0x701f, 0x4b99,</div><div class='del'>-	0x0005, 0xa830, 0x9086, 0x0100, 0x1904, 0x35b5, 0x2009, 0x0004,</div><div class='del'>-	0x0804, 0x35e7, 0x7984, 0x080c, 0xb23d, 0x1120, 0x9182, 0x007f,</div><div class='del'>-	0x0a04, 0x35ea, 0x9186, 0x00ff, 0x0904, 0x35ea, 0x9182, 0x0800,</div><div class='del'>-	0x1a04, 0x35ea, 0x2001, 0x9400, 0x080c, 0x5784, 0x1904, 0x35e7,</div><div class='del'>-	0x0804, 0x35b5, 0xa998, 0x080c, 0xb23d, 0x1118, 0x9182, 0x007f,</div><div class='del'>-	0x0280, 0x9186, 0x00ff, 0x0168, 0x9182, 0x0800, 0x1250, 0x2001,</div><div class='del'>-	0x9400, 0x080c, 0x5784, 0x11a8, 0x0060, 0xa897, 0x4005, 0xa99a,</div><div class='del'>-	0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030,</div><div class='del'>-	0x0005, 0xa897, 0x4000, 0x900e, 0x9085, 0x0001, 0x2001, 0x0000,</div><div class='del'>-	0x0005, 0x2009, 0x000a, 0x0c48, 0x080c, 0x100e, 0x0198, 0x9006,</div><div class='del'>-	0xa802, 0x7014, 0x9005, 0x1120, 0x2900, 0x7016, 0x701a, 0x0040,</div><div class='del'>-	0x7018, 0xa802, 0x0086, 0x2040, 0x2900, 0xa006, 0x701a, 0x008e,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x7984, 0x080c, 0x6724, 0x1130, 0x7e88,</div><div class='del'>-	0x9684, 0x3fff, 0x9082, 0x4000, 0x0208, 0x905e, 0x8bff, 0x0005,</div><div class='del'>-	0xa998, 0x080c, 0x6724, 0x1130, 0xae9c, 0x9684, 0x3fff, 0x9082,</div><div class='del'>-	0x4000, 0x0208, 0x905e, 0x8bff, 0x0005, 0xae98, 0x0008, 0x7e84,</div><div class='del'>-	0x2608, 0x080c, 0x6724, 0x1108, 0x0008, 0x905e, 0x8bff, 0x0005,</div><div class='del'>-	0x0016, 0x7114, 0x81ff, 0x0128, 0x2148, 0xa904, 0x080c, 0x1040,</div><div class='del'>-	0x0cc8, 0x7116, 0x711a, 0x001e, 0x0005, 0x2031, 0x0001, 0x0010,</div><div class='del'>-	0x2031, 0x0000, 0x2061, 0x18b8, 0x2c44, 0xa66a, 0xa17a, 0xa772,</div><div class='del'>-	0xa076, 0xa28e, 0xa392, 0xa496, 0xa59a, 0x080c, 0x10f8, 0x7007,</div><div class='del'>-	0x0002, 0x701f, 0x35b5, 0x0005, 0x00f6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2079, 0x0000, 0x2001, 0x18b0, 0x2004, 0x9005, 0x1190, 0x0e04,</div><div class='del'>-	0x4c61, 0x7a36, 0x7833, 0x0012, 0x7a82, 0x7b86, 0x7c8a, 0x2091,</div><div class='del'>-	0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x0804,</div><div class='del'>-	0x4cc7, 0x0016, 0x0086, 0x0096, 0x00c6, 0x00e6, 0x2071, 0x189e,</div><div class='del'>-	0x7044, 0x9005, 0x1540, 0x7148, 0x9182, 0x0010, 0x0288, 0x7038,</div><div class='del'>-	0x2060, 0x080c, 0x100e, 0x0904, 0x4cbf, 0xa84b, 0x0000, 0x2900,</div><div class='del'>-	0x7046, 0x2001, 0x0002, 0x9080, 0x20c7, 0x2005, 0xa846, 0x0098,</div><div class='del'>-	0x7038, 0x90e0, 0x0004, 0x2001, 0x18ba, 0x9c82, 0x18fa, 0x0210,</div><div class='del'>-	0x2061, 0x18ba, 0x2c00, 0x703a, 0x7148, 0x81ff, 0x1108, 0x703e,</div><div class='del'>-	0x8108, 0x714a, 0x0460, 0x7148, 0x8108, 0x714a, 0x7044, 0x2040,</div><div class='del'>-	0xa144, 0x2105, 0x0016, 0x908a, 0x0036, 0x1a0c, 0x0dc5, 0x2060,</div><div class='del'>-	0x001e, 0x8108, 0x2105, 0x9005, 0xa146, 0x1520, 0x080c, 0x100e,</div><div class='del'>-	0x1130, 0x8109, 0xa946, 0x7148, 0x8109, 0x714a, 0x00d8, 0x9006,</div><div class='del'>-	0xa806, 0xa84a, 0xa046, 0x2800, 0xa802, 0x2900, 0xa006, 0x7046,</div><div class='del'>-	0x2001, 0x0002, 0x9080, 0x20c7, 0x2005, 0xa846, 0x0058, 0x2262,</div><div class='del'>-	0x6306, 0x640a, 0x00ee, 0x00ce, 0x009e, 0x008e, 0x001e, 0x012e,</div><div class='del'>-	0x00fe, 0x0005, 0x2c00, 0x9082, 0x001b, 0x0002, 0x4ce9, 0x4ce9,</div><div class='del'>-	0x4ceb, 0x4ce9, 0x4ce9, 0x4ce9, 0x4cef, 0x4ce9, 0x4ce9, 0x4ce9,</div><div class='del'>-	0x4cf3, 0x4ce9, 0x4ce9, 0x4ce9, 0x4cf7, 0x4ce9, 0x4ce9, 0x4ce9,</div><div class='del'>-	0x4cfb, 0x4ce9, 0x4ce9, 0x4ce9, 0x4cff, 0x4ce9, 0x4ce9, 0x4ce9,</div><div class='del'>-	0x4d04, 0x080c, 0x0dc5, 0xa276, 0xa37a, 0xa47e, 0x0898, 0xa286,</div><div class='del'>-	0xa38a, 0xa48e, 0x0878, 0xa296, 0xa39a, 0xa49e, 0x0858, 0xa2a6,</div><div class='del'>-	0xa3aa, 0xa4ae, 0x0838, 0xa2b6, 0xa3ba, 0xa4be, 0x0818, 0xa2c6,</div><div class='del'>-	0xa3ca, 0xa4ce, 0x0804, 0x4cc2, 0xa2d6, 0xa3da, 0xa4de, 0x0804,</div><div class='del'>-	0x4cc2, 0x00e6, 0x2071, 0x189e, 0x7048, 0x9005, 0x0904, 0x4d9b,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x0e04, 0x4d9a, 0x00f6, 0x2079, 0x0000,</div><div class='del'>-	0x00c6, 0x0096, 0x0086, 0x0076, 0x9006, 0x2038, 0x7040, 0x2048,</div><div class='del'>-	0x9005, 0x0500, 0xa948, 0x2105, 0x0016, 0x908a, 0x0036, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x2060, 0x001e, 0x8108, 0x2105, 0x9005, 0xa94a, 0x1904,</div><div class='del'>-	0x4d9d, 0xa804, 0x9005, 0x090c, 0x0dc5, 0x7042, 0x2938, 0x2040,</div><div class='del'>-	0xa003, 0x0000, 0x2001, 0x0002, 0x9080, 0x20c7, 0x2005, 0xa04a,</div><div class='del'>-	0x0804, 0x4d9d, 0x703c, 0x2060, 0x2c14, 0x6304, 0x6408, 0x650c,</div><div class='del'>-	0x2200, 0x7836, 0x7833, 0x0012, 0x7882, 0x2300, 0x7886, 0x2400,</div><div class='del'>-	0x788a, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,</div><div class='del'>-	0x11aa, 0x87ff, 0x0118, 0x2748, 0x080c, 0x1040, 0x7048, 0x8001,</div><div class='del'>-	0x704a, 0x9005, 0x1170, 0x7040, 0x2048, 0x9005, 0x0128, 0x080c,</div><div class='del'>-	0x1040, 0x9006, 0x7042, 0x7046, 0x703b, 0x18ba, 0x703f, 0x18ba,</div><div class='del'>-	0x0420, 0x7040, 0x9005, 0x1508, 0x7238, 0x2c00, 0x9206, 0x0148,</div><div class='del'>-	0x9c80, 0x0004, 0x90fa, 0x18fa, 0x0210, 0x2001, 0x18ba, 0x703e,</div><div class='del'>-	0x00a0, 0x9006, 0x703e, 0x703a, 0x7044, 0x9005, 0x090c, 0x0dc5,</div><div class='del'>-	0x2048, 0xa800, 0x9005, 0x1de0, 0x2900, 0x7042, 0x2001, 0x0002,</div><div class='del'>-	0x9080, 0x20c7, 0x2005, 0xa84a, 0x0000, 0x007e, 0x008e, 0x009e,</div><div class='del'>-	0x00ce, 0x00fe, 0x012e, 0x00ee, 0x0005, 0x2c00, 0x9082, 0x001b,</div><div class='del'>-	0x0002, 0x4dbc, 0x4dbc, 0x4dbe, 0x4dbc, 0x4dbc, 0x4dbc, 0x4dc3,</div><div class='del'>-	0x4dbc, 0x4dbc, 0x4dbc, 0x4dc8, 0x4dbc, 0x4dbc, 0x4dbc, 0x4dcd,</div><div class='del'>-	0x4dbc, 0x4dbc, 0x4dbc, 0x4dd2, 0x4dbc, 0x4dbc, 0x4dbc, 0x4dd7,</div><div class='del'>-	0x4dbc, 0x4dbc, 0x4dbc, 0x4ddc, 0x080c, 0x0dc5, 0xaa74, 0xab78,</div><div class='del'>-	0xac7c, 0x0804, 0x4d48, 0xaa84, 0xab88, 0xac8c, 0x0804, 0x4d48,</div><div class='del'>-	0xaa94, 0xab98, 0xac9c, 0x0804, 0x4d48, 0xaaa4, 0xaba8, 0xacac,</div><div class='del'>-	0x0804, 0x4d48, 0xaab4, 0xabb8, 0xacbc, 0x0804, 0x4d48, 0xaac4,</div><div class='del'>-	0xabc8, 0xaccc, 0x0804, 0x4d48, 0xaad4, 0xabd8, 0xacdc, 0x0804,</div><div class='del'>-	0x4d48, 0x0016, 0x0026, 0x0036, 0x00b6, 0x00c6, 0x2009, 0x007e,</div><div class='del'>-	0x080c, 0x6724, 0x2019, 0x0001, 0xb85c, 0xd0ac, 0x0110, 0x2019,</div><div class='del'>-	0x0000, 0x2011, 0x801b, 0x080c, 0x4c44, 0x00ce, 0x00be, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0026, 0x080c, 0x57d5, 0xd0c4, 0x0120,</div><div class='del'>-	0x2011, 0x8014, 0x080c, 0x4c44, 0x002e, 0x0005, 0x81ff, 0x1904,</div><div class='del'>-	0x35e7, 0x0126, 0x2091, 0x8000, 0x6030, 0xc08d, 0xc085, 0xc0ac,</div><div class='del'>-	0x6032, 0x080c, 0x7637, 0x1158, 0x080c, 0x7932, 0x080c, 0x612e,</div><div class='del'>-	0x9085, 0x0001, 0x080c, 0x767b, 0x080c, 0x7563, 0x0010, 0x080c,</div><div class='del'>-	0x5fed, 0x012e, 0x0804, 0x35b5, 0x81ff, 0x0120, 0x2009, 0x0001,</div><div class='del'>-	0x0804, 0x35e7, 0x080c, 0x57e9, 0x0120, 0x2009, 0x0007, 0x0804,</div><div class='del'>-	0x35e7, 0x080c, 0x6a9b, 0x0120, 0x2009, 0x0008, 0x0804, 0x35e7,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x0178, 0x0026, 0x2011, 0x0010,</div><div class='del'>-	0x080c, 0x6ac7, 0x002e, 0x0140, 0x7984, 0x080c, 0x6b11, 0x1120,</div><div class='del'>-	0x2009, 0x4009, 0x0804, 0x35e7, 0x7984, 0x080c, 0x66b9, 0x1904,</div><div class='del'>-	0x35ea, 0x080c, 0x4c17, 0x0904, 0x35ea, 0x2b00, 0x7026, 0x080c,</div><div class='del'>-	0x6aa3, 0x7888, 0x1170, 0x9084, 0x0005, 0x1158, 0x900e, 0x080c,</div><div class='del'>-	0x6944, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x0804,</div><div class='del'>-	0x35b5, 0x080c, 0x4be4, 0x0904, 0x35e7, 0x9006, 0xa866, 0xa832,</div><div class='del'>-	0xa868, 0xc0fd, 0xa86a, 0x080c, 0xd302, 0x0904, 0x35e7, 0x7888,</div><div class='del'>-	0xd094, 0x0118, 0xb8cc, 0xc08d, 0xb8ce, 0x7007, 0x0003, 0x701f,</div><div class='del'>-	0x4ecb, 0x0005, 0x2061, 0x1800, 0x080c, 0x57e9, 0x2009, 0x0007,</div><div class='del'>-	0x1560, 0x080c, 0x6a9b, 0x0118, 0x2009, 0x0008, 0x0430, 0xa998,</div><div class='del'>-	0x080c, 0x66b9, 0x1530, 0x080c, 0x4c15, 0x0518, 0x080c, 0x6aa3,</div><div class='del'>-	0xa89c, 0x1168, 0x9084, 0x0005, 0x1150, 0x900e, 0x080c, 0x6944,</div><div class='del'>-	0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x00d0, 0xa868,</div><div class='del'>-	0xc0fc, 0xa86a, 0x080c, 0xd302, 0x11e0, 0xa89c, 0xd094, 0x0118,</div><div class='del'>-	0xb8cc, 0xc08d, 0xb8ce, 0x2009, 0x0003, 0xa897, 0x4005, 0xa99a,</div><div class='del'>-	0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030,</div><div class='del'>-	0x0005, 0xa897, 0x4000, 0xa99a, 0x9006, 0x918d, 0x0001, 0x2008,</div><div class='del'>-	0x0005, 0x9006, 0x0005, 0xa830, 0x2009, 0x180d, 0x210c, 0xd18c,</div><div class='del'>-	0x0140, 0x2008, 0x918e, 0xdead, 0x1120, 0x2021, 0x4009, 0x0804,</div><div class='del'>-	0x35b7, 0x9086, 0x0100, 0x7024, 0x2058, 0x1110, 0x0804, 0x5729,</div><div class='del'>-	0x900e, 0x080c, 0x6944, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108,</div><div class='del'>-	0xc18d, 0x0804, 0x35b5, 0x080c, 0x57e9, 0x0120, 0x2009, 0x0007,</div><div class='del'>-	0x0804, 0x35e7, 0x7f84, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x080c,</div><div class='del'>-	0x4be4, 0x1120, 0x2009, 0x0002, 0x0804, 0x35e7, 0x900e, 0x2130,</div><div class='del'>-	0x7126, 0x7132, 0xa860, 0x20e8, 0x7036, 0xa85c, 0x9080, 0x0005,</div><div class='del'>-	0x702a, 0x20a0, 0x080c, 0x6724, 0x1904, 0x4f81, 0x080c, 0x6aa3,</div><div class='del'>-	0x0138, 0x080c, 0x6aab, 0x0120, 0x080c, 0x6a43, 0x1904, 0x4f81,</div><div class='del'>-	0xd794, 0x1110, 0xd784, 0x01a8, 0xb8c4, 0x20e0, 0xb8c8, 0x9080,</div><div class='del'>-	0x0006, 0x2098, 0x3400, 0xd794, 0x0198, 0x20a9, 0x0008, 0x4003,</div><div class='del'>-	0x2098, 0x20a0, 0x3d00, 0x20e0, 0x20a9, 0x0002, 0x080c, 0x49b3,</div><div class='del'>-	0x0080, 0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x000a, 0x2098, 0x3400,</div><div class='del'>-	0x20a9, 0x0004, 0x4003, 0x2098, 0x20a0, 0x3d00, 0x20e0, 0x080c,</div><div class='del'>-	0x49b3, 0x9186, 0x007e, 0x0170, 0x9186, 0x0080, 0x0158, 0x080c,</div><div class='del'>-	0x6aa3, 0x90c2, 0x0006, 0x1210, 0xc1fd, 0x0020, 0x080c, 0x6944,</div><div class='del'>-	0x1108, 0xc1fd, 0x4104, 0xc1fc, 0xd794, 0x0528, 0xb8c4, 0x20e0,</div><div class='del'>-	0xb8c8, 0x2060, 0x9c80, 0x0000, 0x2098, 0x20a9, 0x0002, 0x4003,</div><div class='del'>-	0x9c80, 0x0003, 0x2098, 0x20a9, 0x0001, 0x4005, 0x9c80, 0x0004,</div><div class='del'>-	0x2098, 0x3400, 0x20a9, 0x0002, 0x4003, 0x2098, 0x20a0, 0x3d00,</div><div class='del'>-	0x20e0, 0x080c, 0x49a6, 0x9c80, 0x0026, 0x2098, 0xb8c4, 0x20e0,</div><div class='del'>-	0x20a9, 0x0002, 0x4003, 0xd794, 0x0110, 0x96b0, 0x000b, 0x96b0,</div><div class='del'>-	0x0005, 0x8108, 0x080c, 0xb23d, 0x0118, 0x9186, 0x0800, 0x0040,</div><div class='del'>-	0xd78c, 0x0120, 0x9186, 0x0800, 0x0170, 0x0018, 0x9186, 0x007e,</div><div class='del'>-	0x0150, 0xd794, 0x0118, 0x9686, 0x0020, 0x0010, 0x9686, 0x0028,</div><div class='del'>-	0x0150, 0x0804, 0x4f0a, 0x86ff, 0x1120, 0x7124, 0x810b, 0x0804,</div><div class='del'>-	0x35b5, 0x7033, 0x0001, 0x7122, 0x7024, 0x9600, 0x7026, 0x772e,</div><div class='del'>-	0x2061, 0x18b8, 0x2c44, 0xa06b, 0x0000, 0xa67a, 0x7034, 0xa072,</div><div class='del'>-	0x7028, 0xa076, 0xa28e, 0xa392, 0xa496, 0xa59a, 0x080c, 0x10f8,</div><div class='del'>-	0x7007, 0x0002, 0x701f, 0x4fbd, 0x0005, 0x7030, 0x9005, 0x1180,</div><div class='del'>-	0x7120, 0x7028, 0x20a0, 0x772c, 0x9036, 0x7034, 0x20e8, 0x2061,</div><div class='del'>-	0x18b8, 0x2c44, 0xa28c, 0xa390, 0xa494, 0xa598, 0x0804, 0x4f0a,</div><div class='del'>-	0x7124, 0x810b, 0x0804, 0x35b5, 0x2029, 0x007e, 0x7984, 0x7a88,</div><div class='del'>-	0x7b8c, 0x7c98, 0x9184, 0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04,</div><div class='del'>-	0x35ea, 0x9502, 0x0a04, 0x35ea, 0x9184, 0x00ff, 0x90e2, 0x0020,</div><div class='del'>-	0x0a04, 0x35ea, 0x9502, 0x0a04, 0x35ea, 0x9284, 0xff00, 0x8007,</div><div class='del'>-	0x90e2, 0x0020, 0x0a04, 0x35ea, 0x9502, 0x0a04, 0x35ea, 0x9284,</div><div class='del'>-	0x00ff, 0x90e2, 0x0020, 0x0a04, 0x35ea, 0x9502, 0x0a04, 0x35ea,</div><div class='del'>-	0x9384, 0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04, 0x35ea, 0x9502,</div><div class='del'>-	0x0a04, 0x35ea, 0x9384, 0x00ff, 0x90e2, 0x0020, 0x0a04, 0x35ea,</div><div class='del'>-	0x9502, 0x0a04, 0x35ea, 0x9484, 0xff00, 0x8007, 0x90e2, 0x0020,</div><div class='del'>-	0x0a04, 0x35ea, 0x9502, 0x0a04, 0x35ea, 0x9484, 0x00ff, 0x90e2,</div><div class='del'>-	0x0020, 0x0a04, 0x35ea, 0x9502, 0x0a04, 0x35ea, 0x2061, 0x1989,</div><div class='del'>-	0x6102, 0x6206, 0x630a, 0x640e, 0x0804, 0x35b5, 0x080c, 0x4be4,</div><div class='del'>-	0x0904, 0x35e7, 0x2009, 0x0016, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4c2d, 0x701f, 0x5041,</div><div class='del'>-	0x0005, 0x20a9, 0x0016, 0x896e, 0x8d6e, 0x8d6f, 0x9d84, 0xffc0,</div><div class='del'>-	0x9080, 0x0019, 0x2098, 0x9d84, 0x003f, 0x20e0, 0x2069, 0x1877,</div><div class='del'>-	0x20e9, 0x0001, 0x2da0, 0x4003, 0x6800, 0x9005, 0x0904, 0x50a8,</div><div class='del'>-	0x6804, 0x2008, 0x918c, 0xfff8, 0x1904, 0x50a8, 0x680c, 0x9005,</div><div class='del'>-	0x0904, 0x50a8, 0x9082, 0xff01, 0x1a04, 0x50a8, 0x6810, 0x9082,</div><div class='del'>-	0x005c, 0x06f0, 0x6824, 0x2008, 0x9082, 0x0008, 0x06c8, 0x9182,</div><div class='del'>-	0x0400, 0x16b0, 0x0056, 0x2029, 0x0000, 0x080c, 0x8e80, 0x005e,</div><div class='del'>-	0x6944, 0x6820, 0x9102, 0x0660, 0x6820, 0x9082, 0x0019, 0x1640,</div><div class='del'>-	0x6828, 0x6944, 0x810c, 0x9102, 0x0618, 0x6840, 0x9082, 0x000f,</div><div class='del'>-	0x12f8, 0x080c, 0x1027, 0x2900, 0x0590, 0x684e, 0x00e6, 0x2071,</div><div class='del'>-	0x1931, 0x00b6, 0x2059, 0x0000, 0x080c, 0x8d3c, 0x00be, 0x00ee,</div><div class='del'>-	0x01e8, 0x080c, 0x8a84, 0x080c, 0x8ad3, 0x1160, 0x6857, 0x0000,</div><div class='del'>-	0x00c6, 0x6b10, 0x2061, 0x1a65, 0x630a, 0x00ce, 0x0804, 0x35b5,</div><div class='del'>-	0x0804, 0x35ea, 0x080c, 0x8acc, 0x00e6, 0x2071, 0x1931, 0x080c,</div><div class='del'>-	0x8f00, 0x080c, 0x8f0f, 0x080c, 0x8d21, 0x00ee, 0x2001, 0x188a,</div><div class='del'>-	0x204c, 0x080c, 0x1040, 0x2001, 0x188a, 0x2003, 0x0000, 0x0804,</div><div class='del'>-	0x35e7, 0x0126, 0x2091, 0x8000, 0x080c, 0x92bf, 0x080c, 0x8acc,</div><div class='del'>-	0x012e, 0x0804, 0x35b5, 0x0006, 0x080c, 0x57d5, 0xd0cc, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x080c, 0x57d9, 0xd0bc, 0x000e, 0x0005, 0x6174,</div><div class='del'>-	0x7a84, 0x6300, 0x82ff, 0x1118, 0x7986, 0x0804, 0x35b5, 0x83ff,</div><div class='del'>-	0x1904, 0x35ea, 0x2001, 0xfff0, 0x9200, 0x1a04, 0x35ea, 0x2019,</div><div class='del'>-	0xffff, 0x6078, 0x9302, 0x9200, 0x0a04, 0x35ea, 0x7986, 0x6276,</div><div class='del'>-	0x0804, 0x35b5, 0x080c, 0x57e9, 0x1904, 0x35e7, 0x7c88, 0x7d84,</div><div class='del'>-	0x7e98, 0x7f8c, 0x080c, 0x4be4, 0x0904, 0x35e7, 0x900e, 0x901e,</div><div class='del'>-	0x7326, 0x7332, 0xa860, 0x20e8, 0x7036, 0xa85c, 0x9080, 0x0003,</div><div class='del'>-	0x702a, 0x20a0, 0x91d8, 0x1000, 0x2b5c, 0x8bff, 0x0178, 0x080c,</div><div class='del'>-	0x6aa3, 0x0118, 0x080c, 0x6aab, 0x1148, 0x20a9, 0x0001, 0xb814,</div><div class='del'>-	0x4004, 0xb810, 0x4004, 0x4104, 0x9398, 0x0003, 0x8108, 0x9182,</div><div class='del'>-	0x0800, 0x0120, 0x9386, 0x003c, 0x0170, 0x0c20, 0x83ff, 0x1148,</div><div class='del'>-	0x7224, 0x900e, 0x2001, 0x0003, 0x080c, 0x9375, 0x2208, 0x0804,</div><div class='del'>-	0x35b5, 0x7033, 0x0001, 0x7122, 0x7024, 0x9300, 0x7026, 0x2061,</div><div class='del'>-	0x18b8, 0x2c44, 0xa06b, 0x0000, 0xa37a, 0x7028, 0xa076, 0x7034,</div><div class='del'>-	0xa072, 0xa48e, 0xa592, 0xa696, 0xa79a, 0x080c, 0x10f8, 0x7007,</div><div class='del'>-	0x0002, 0x701f, 0x514c, 0x0005, 0x7030, 0x9005, 0x1178, 0x7120,</div><div class='del'>-	0x7028, 0x20a0, 0x901e, 0x7034, 0x20e8, 0x2061, 0x18b8, 0x2c44,</div><div class='del'>-	0xa48c, 0xa590, 0xa694, 0xa798, 0x0804, 0x510a, 0x7224, 0x900e,</div><div class='del'>-	0x2001, 0x0003, 0x080c, 0x9375, 0x2208, 0x0804, 0x35b5, 0x00f6,</div><div class='del'>-	0x00e6, 0x080c, 0x57e9, 0x2009, 0x0007, 0x1904, 0x51df, 0x2071,</div><div class='del'>-	0x189e, 0x745c, 0x84ff, 0x2009, 0x000e, 0x1904, 0x51df, 0xac9c,</div><div class='del'>-	0xad98, 0xaea4, 0xafa0, 0x0096, 0x080c, 0x1027, 0x2009, 0x0002,</div><div class='del'>-	0x0904, 0x51df, 0x2900, 0x705e, 0x900e, 0x901e, 0x7356, 0x7362,</div><div class='del'>-	0xa860, 0x7066, 0xa85c, 0x9080, 0x0003, 0x705a, 0x20a0, 0x91d8,</div><div class='del'>-	0x1000, 0x2b5c, 0x8bff, 0x0178, 0x080c, 0x6aa3, 0x0118, 0x080c,</div><div class='del'>-	0x6aab, 0x1148, 0xb814, 0x20a9, 0x0001, 0x4004, 0xb810, 0x4004,</div><div class='del'>-	0x4104, 0x9398, 0x0003, 0x8108, 0x9182, 0x0800, 0x0120, 0x9386,</div><div class='del'>-	0x003c, 0x01e8, 0x0c20, 0x83ff, 0x11c0, 0x7254, 0x900e, 0x2001,</div><div class='del'>-	0x0003, 0x080c, 0x9375, 0x2208, 0x009e, 0xa897, 0x4000, 0xa99a,</div><div class='del'>-	0x715c, 0x81ff, 0x090c, 0x0dc5, 0x2148, 0x080c, 0x1040, 0x9006,</div><div class='del'>-	0x705e, 0x918d, 0x0001, 0x2008, 0x0418, 0x7063, 0x0001, 0x7152,</div><div class='del'>-	0x7054, 0x9300, 0x7056, 0x2061, 0x18b9, 0x2c44, 0xa37a, 0x7058,</div><div class='del'>-	0xa076, 0x7064, 0xa072, 0xa48e, 0xa592, 0xa696, 0xa79a, 0xa09f,</div><div class='del'>-	0x51eb, 0x000e, 0xa0a2, 0x080c, 0x10f8, 0x9006, 0x0048, 0x009e,</div><div class='del'>-	0xa897, 0x4005, 0xa99a, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0x00f6, 0xa0a0, 0x904d, 0x090c, 0x0dc5,</div><div class='del'>-	0x00e6, 0x2071, 0x189e, 0xa06c, 0x908e, 0x0100, 0x0138, 0xa87b,</div><div class='del'>-	0x0030, 0xa883, 0x0000, 0xa897, 0x4002, 0x00d8, 0x7060, 0x9005,</div><div class='del'>-	0x1158, 0x7150, 0x7058, 0x20a0, 0x901e, 0x7064, 0x20e8, 0xa48c,</div><div class='del'>-	0xa590, 0xa694, 0xa798, 0x0428, 0xa87b, 0x0000, 0xa883, 0x0000,</div><div class='del'>-	0xa897, 0x4000, 0x7254, 0x900e, 0x2001, 0x0003, 0x080c, 0x9375,</div><div class='del'>-	0xaa9a, 0x715c, 0x81ff, 0x090c, 0x0dc5, 0x2148, 0x080c, 0x1040,</div><div class='del'>-	0x705f, 0x0000, 0xa0a0, 0x2048, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x6e9f, 0x012e, 0xa09f, 0x0000, 0xa0a3, 0x0000, 0x00ee, 0x00fe,</div><div class='del'>-	0x0005, 0x91d8, 0x1000, 0x2b5c, 0x8bff, 0x0178, 0x080c, 0x6aa3,</div><div class='del'>-	0x0118, 0x080c, 0x6aab, 0x1148, 0xb814, 0x20a9, 0x0001, 0x4004,</div><div class='del'>-	0xb810, 0x4004, 0x4104, 0x9398, 0x0003, 0x8108, 0x9182, 0x0800,</div><div class='del'>-	0x0120, 0x9386, 0x003c, 0x0518, 0x0c20, 0x83ff, 0x11f0, 0x7154,</div><div class='del'>-	0x810c, 0xa99a, 0xa897, 0x4000, 0x715c, 0x81ff, 0x090c, 0x0dc5,</div><div class='del'>-	0x2148, 0x080c, 0x1040, 0x9006, 0x705e, 0x918d, 0x0001, 0x2008,</div><div class='del'>-	0xa0a0, 0x2048, 0x0126, 0x2091, 0x8000, 0x080c, 0x6e9f, 0x012e,</div><div class='del'>-	0xa09f, 0x0000, 0xa0a3, 0x0000, 0x0070, 0x7063, 0x0001, 0x7152,</div><div class='del'>-	0x7054, 0x9300, 0x7056, 0xa37a, 0xa48e, 0xa592, 0xa696, 0xa79a,</div><div class='del'>-	0x080c, 0x10f8, 0x9006, 0x00ee, 0x0005, 0x0096, 0xa88c, 0x90be,</div><div class='del'>-	0x7000, 0x0148, 0x90be, 0x7100, 0x0130, 0x90be, 0x7200, 0x0118,</div><div class='del'>-	0x009e, 0x0804, 0x35ea, 0xa884, 0xa988, 0x080c, 0x2873, 0x1518,</div><div class='del'>-	0x080c, 0x66b9, 0x1500, 0x7126, 0xbe12, 0xbd16, 0xae7c, 0x080c,</div><div class='del'>-	0x4be4, 0x01c8, 0x080c, 0x4be4, 0x01b0, 0x009e, 0xa867, 0x0000,</div><div class='del'>-	0xa868, 0xc0fd, 0xa86a, 0xa823, 0x0000, 0xa804, 0x2048, 0x080c,</div><div class='del'>-	0xd284, 0x1120, 0x2009, 0x0003, 0x0804, 0x35e7, 0x7007, 0x0003,</div><div class='del'>-	0x701f, 0x52b8, 0x0005, 0x009e, 0x2009, 0x0002, 0x0804, 0x35e7,</div><div class='del'>-	0x7124, 0x080c, 0x334c, 0xa820, 0x9086, 0x8001, 0x1120, 0x2009,</div><div class='del'>-	0x0004, 0x0804, 0x35e7, 0x2900, 0x7022, 0xa804, 0x0096, 0x2048,</div><div class='del'>-	0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x009e,</div><div class='del'>-	0x9080, 0x0002, 0x0076, 0x0006, 0x2098, 0x20a0, 0x27e0, 0x27e8,</div><div class='del'>-	0x20a9, 0x002a, 0x080c, 0x0f8b, 0xaa6c, 0xab70, 0xac74, 0xad78,</div><div class='del'>-	0x2061, 0x18b8, 0x2c44, 0xa06b, 0x0000, 0xae64, 0xaf8c, 0x97c6,</div><div class='del'>-	0x7000, 0x0118, 0x97c6, 0x7100, 0x1148, 0x96c2, 0x0004, 0x0600,</div><div class='del'>-	0x2009, 0x0004, 0x000e, 0x007e, 0x0804, 0x4c30, 0x97c6, 0x7200,</div><div class='del'>-	0x11b8, 0x96c2, 0x0054, 0x02a0, 0x000e, 0x007e, 0x2061, 0x18b8,</div><div class='del'>-	0x2c44, 0xa076, 0xa772, 0xa07b, 0x002a, 0xa28e, 0xa392, 0xa496,</div><div class='del'>-	0xa59a, 0x080c, 0x10f8, 0x7007, 0x0002, 0x701f, 0x5314, 0x0005,</div><div class='del'>-	0x000e, 0x007e, 0x0804, 0x35ea, 0x7020, 0x2048, 0xa804, 0x2048,</div><div class='del'>-	0xa804, 0x2048, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,</div><div class='del'>-	0xffc0, 0x9080, 0x0002, 0x2098, 0x20a0, 0x27e0, 0x27e8, 0x20a9,</div><div class='del'>-	0x002a, 0x080c, 0x0f8b, 0x2100, 0x2238, 0x2061, 0x18b8, 0x2c44,</div><div class='del'>-	0xa28c, 0xa390, 0xa494, 0xa598, 0x2009, 0x002a, 0x0804, 0x4c30,</div><div class='del'>-	0x81ff, 0x1904, 0x35e7, 0x798c, 0x2001, 0x197e, 0x918c, 0x8000,</div><div class='del'>-	0x2102, 0x080c, 0x4bfb, 0x0904, 0x35ea, 0x080c, 0x6aa3, 0x0120,</div><div class='del'>-	0x080c, 0x6aab, 0x1904, 0x35ea, 0x080c, 0x67eb, 0x0904, 0x35e7,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x68b1, 0x012e, 0x0904, 0x35e7,</div><div class='del'>-	0x2001, 0x197e, 0x2004, 0xd0fc, 0x1904, 0x35b5, 0x0804, 0x460c,</div><div class='del'>-	0xa9a0, 0x2001, 0x197e, 0x918c, 0x8000, 0xc18d, 0x2102, 0x080c,</div><div class='del'>-	0x4c08, 0x01a0, 0x080c, 0x6aa3, 0x0118, 0x080c, 0x6aab, 0x1170,</div><div class='del'>-	0x080c, 0x67eb, 0x2009, 0x0002, 0x0128, 0x080c, 0x68b1, 0x1170,</div><div class='del'>-	0x2009, 0x0003, 0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x0005, 0xa897, 0x4000,</div><div class='del'>-	0x2001, 0x197e, 0x2004, 0xd0fc, 0x1128, 0x080c, 0x57dd, 0x0110,</div><div class='del'>-	0x9006, 0x0018, 0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005,</div><div class='del'>-	0x78a8, 0xd08c, 0x1118, 0xd084, 0x0904, 0x4581, 0x080c, 0x4c17,</div><div class='del'>-	0x0904, 0x35ea, 0x080c, 0x4be4, 0x1120, 0x2009, 0x0002, 0x0804,</div><div class='del'>-	0x35e7, 0x080c, 0x6aa3, 0x0130, 0x908e, 0x0004, 0x0118, 0x908e,</div><div class='del'>-	0x0005, 0x15a0, 0x78a8, 0xd08c, 0x0120, 0xb800, 0xc08c, 0xb802,</div><div class='del'>-	0x0028, 0x080c, 0x57d5, 0xd0b4, 0x0904, 0x45bb, 0x7884, 0x908e,</div><div class='del'>-	0x007e, 0x0904, 0x45bb, 0x908e, 0x007f, 0x0904, 0x45bb, 0x908e,</div><div class='del'>-	0x0080, 0x0904, 0x45bb, 0xb800, 0xd08c, 0x1904, 0x45bb, 0xa867,</div><div class='del'>-	0x0000, 0xa868, 0xc0fd, 0xa86a, 0x080c, 0xd2a3, 0x1120, 0x2009,</div><div class='del'>-	0x0003, 0x0804, 0x35e7, 0x7007, 0x0003, 0x701f, 0x53e0, 0x0005,</div><div class='del'>-	0x080c, 0x4c17, 0x0904, 0x35ea, 0x0804, 0x45bb, 0x080c, 0x33a5,</div><div class='del'>-	0x0108, 0x0005, 0x2009, 0x1834, 0x210c, 0x81ff, 0x0120, 0x2009,</div><div class='del'>-	0x0001, 0x0804, 0x35e7, 0x080c, 0x57e9, 0x0120, 0x2009, 0x0007,</div><div class='del'>-	0x0804, 0x35e7, 0x080c, 0x6a9b, 0x0120, 0x2009, 0x0008, 0x0804,</div><div class='del'>-	0x35e7, 0xb89c, 0xd0a4, 0x1118, 0xd0ac, 0x1904, 0x45bb, 0x9006,</div><div class='del'>-	0xa866, 0xa832, 0xa868, 0xc0fd, 0xa86a, 0x080c, 0xd302, 0x1120,</div><div class='del'>-	0x2009, 0x0003, 0x0804, 0x35e7, 0x7007, 0x0003, 0x701f, 0x5419,</div><div class='del'>-	0x0005, 0xa830, 0x9086, 0x0100, 0x1120, 0x2009, 0x0004, 0x0804,</div><div class='del'>-	0x5729, 0x080c, 0x4c17, 0x0904, 0x35ea, 0x0804, 0x53b2, 0x81ff,</div><div class='del'>-	0x2009, 0x0001, 0x1904, 0x35e7, 0x080c, 0x57e9, 0x2009, 0x0007,</div><div class='del'>-	0x1904, 0x35e7, 0x080c, 0x6a9b, 0x0120, 0x2009, 0x0008, 0x0804,</div><div class='del'>-	0x35e7, 0x080c, 0x4c17, 0x0904, 0x35ea, 0x080c, 0x6aa3, 0x2009,</div><div class='del'>-	0x0009, 0x1904, 0x35e7, 0x080c, 0x4be4, 0x2009, 0x0002, 0x0904,</div><div class='del'>-	0x35e7, 0x9006, 0xa866, 0xa832, 0xa868, 0xc0fd, 0xa86a, 0x7988,</div><div class='del'>-	0xa95a, 0x9194, 0xfd00, 0x918c, 0x00ff, 0x9006, 0x82ff, 0x1128,</div><div class='del'>-	0xc0ed, 0xa952, 0x798c, 0xa956, 0x0038, 0x928e, 0x0100, 0x1904,</div><div class='del'>-	0x35ea, 0xc0e5, 0xa952, 0xa956, 0xa83e, 0x080c, 0xd555, 0x2009,</div><div class='del'>-	0x0003, 0x0904, 0x35e7, 0x7007, 0x0003, 0x701f, 0x5470, 0x0005,</div><div class='del'>-	0xa830, 0x9086, 0x0100, 0x2009, 0x0004, 0x0904, 0x35e7, 0x0804,</div><div class='del'>-	0x35b5, 0x7aa8, 0x9284, 0xc000, 0x0148, 0xd2ec, 0x01a0, 0x080c,</div><div class='del'>-	0x57e9, 0x1188, 0x2009, 0x0014, 0x0804, 0x35e7, 0xd2dc, 0x1578,</div><div class='del'>-	0x81ff, 0x2009, 0x0001, 0x1904, 0x35e7, 0x080c, 0x57e9, 0x2009,</div><div class='del'>-	0x0007, 0x1904, 0x35e7, 0xd2f4, 0x0138, 0x9284, 0x5000, 0xc0d5,</div><div class='del'>-	0x080c, 0x57af, 0x0804, 0x35b5, 0xd2fc, 0x0160, 0x080c, 0x4c17,</div><div class='del'>-	0x0904, 0x35ea, 0x7984, 0x9284, 0x9000, 0xc0d5, 0x080c, 0x5784,</div><div class='del'>-	0x0804, 0x35b5, 0x080c, 0x4c17, 0x0904, 0x35ea, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0006, 0x2009, 0x0009, 0x1904, 0x555f, 0x080c,</div><div class='del'>-	0x4be4, 0x2009, 0x0002, 0x0904, 0x555f, 0xa85c, 0x9080, 0x001b,</div><div class='del'>-	0xaf60, 0x2009, 0x0008, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x080c,</div><div class='del'>-	0x4c2d, 0x701f, 0x54cc, 0x0005, 0xa86c, 0x9086, 0x0500, 0x1138,</div><div class='del'>-	0xa870, 0x9005, 0x1120, 0xa874, 0x9084, 0xff00, 0x0110, 0x1904,</div><div class='del'>-	0x35ea, 0xa866, 0xa832, 0xa868, 0xc0fd, 0xa86a, 0x080c, 0x4c17,</div><div class='del'>-	0x1110, 0x0804, 0x35ea, 0x2009, 0x0043, 0x080c, 0xd5c1, 0x2009,</div><div class='del'>-	0x0003, 0x0904, 0x555f, 0x7007, 0x0003, 0x701f, 0x54f0, 0x0005,</div><div class='del'>-	0xa830, 0x9086, 0x0100, 0x2009, 0x0004, 0x0904, 0x555f, 0x7984,</div><div class='del'>-	0x7aa8, 0x9284, 0x1000, 0xc0d5, 0x080c, 0x5784, 0x0804, 0x35b5,</div><div class='del'>-	0x00c6, 0xaab0, 0x9284, 0xc000, 0x0148, 0xd2ec, 0x0170, 0x080c,</div><div class='del'>-	0x57e9, 0x1158, 0x2009, 0x0014, 0x0804, 0x554e, 0x2061, 0x1800,</div><div class='del'>-	0x080c, 0x57e9, 0x2009, 0x0007, 0x15c8, 0xd2f4, 0x0130, 0x9284,</div><div class='del'>-	0x5000, 0xc0d5, 0x080c, 0x57af, 0x0058, 0xd2fc, 0x0180, 0x080c,</div><div class='del'>-	0x4c15, 0x0590, 0xa998, 0x9284, 0x9000, 0xc0d5, 0x080c, 0x5784,</div><div class='del'>-	0xa87b, 0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0x0438, 0x080c,</div><div class='del'>-	0x4c15, 0x0510, 0x080c, 0x6aa3, 0x2009, 0x0009, 0x11b8, 0xa8c4,</div><div class='del'>-	0x9086, 0x0500, 0x11c8, 0xa8c8, 0x9005, 0x11b0, 0xa8cc, 0x9084,</div><div class='del'>-	0xff00, 0x1190, 0x080c, 0x4c15, 0x1108, 0x0070, 0x2009, 0x004b,</div><div class='del'>-	0x080c, 0xd5c1, 0x2009, 0x0003, 0x0108, 0x0078, 0x0431, 0x19c0,</div><div class='del'>-	0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085,</div><div class='del'>-	0x0001, 0x2001, 0x0030, 0x00ce, 0x0005, 0x9006, 0x0ce0, 0x7aa8,</div><div class='del'>-	0xd2dc, 0x0904, 0x35e7, 0x0016, 0x7984, 0x9284, 0x1000, 0xc0fd,</div><div class='del'>-	0x080c, 0x5784, 0x001e, 0x1904, 0x35e7, 0x0804, 0x35b5, 0x00f6,</div><div class='del'>-	0x2d78, 0xaab0, 0x0021, 0x00fe, 0x0005, 0xaab0, 0xc2d5, 0xd2dc,</div><div class='del'>-	0x0150, 0x0016, 0xa998, 0x9284, 0x1400, 0xc0fd, 0x080c, 0x5784,</div><div class='del'>-	0x001e, 0x9085, 0x0001, 0x0005, 0x81ff, 0x0120, 0x2009, 0x0001,</div><div class='del'>-	0x0804, 0x35e7, 0x080c, 0x57e9, 0x0120, 0x2009, 0x0007, 0x0804,</div><div class='del'>-	0x35e7, 0x7984, 0x7ea8, 0x96b4, 0x00ff, 0x080c, 0x6724, 0x1904,</div><div class='del'>-	0x35ea, 0x9186, 0x007f, 0x0138, 0x080c, 0x6aa3, 0x0120, 0x2009,</div><div class='del'>-	0x0009, 0x0804, 0x35e7, 0x080c, 0x4be4, 0x1120, 0x2009, 0x0002,</div><div class='del'>-	0x0804, 0x35e7, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x2001,</div><div class='del'>-	0x0100, 0x8007, 0xa80a, 0x080c, 0xd2bd, 0x1120, 0x2009, 0x0003,</div><div class='del'>-	0x0804, 0x35e7, 0x7007, 0x0003, 0x701f, 0x55bf, 0x0005, 0xa808,</div><div class='del'>-	0x8007, 0x9086, 0x0100, 0x1120, 0x2009, 0x0004, 0x0804, 0x35e7,</div><div class='del'>-	0xa8e0, 0xa866, 0xa810, 0x8007, 0x9084, 0x00ff, 0x800c, 0xa814,</div><div class='del'>-	0x8007, 0x9084, 0x00ff, 0x8004, 0x9080, 0x0002, 0x9108, 0x8906,</div><div class='del'>-	0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0004,</div><div class='del'>-	0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x0804, 0x4c30, 0x080c, 0x4be4,</div><div class='del'>-	0x1120, 0x2009, 0x0002, 0x0804, 0x35e7, 0x7984, 0x9194, 0xff00,</div><div class='del'>-	0x918c, 0x00ff, 0x8217, 0x82ff, 0x1118, 0x7023, 0x19b4, 0x0040,</div><div class='del'>-	0x92c6, 0x0001, 0x1118, 0x7023, 0x19ce, 0x0010, 0x0804, 0x35ea,</div><div class='del'>-	0x2009, 0x001a, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080,</div><div class='del'>-	0x0019, 0xaf60, 0x080c, 0x4c2d, 0x701f, 0x560f, 0x0005, 0x2001,</div><div class='del'>-	0x182e, 0x2003, 0x0001, 0xa85c, 0x9080, 0x0019, 0x2098, 0xa860,</div><div class='del'>-	0x20e0, 0x20a9, 0x001a, 0x7020, 0x20a0, 0x20e9, 0x0001, 0x4003,</div><div class='del'>-	0x0804, 0x35b5, 0x080c, 0x4be4, 0x1120, 0x2009, 0x0002, 0x0804,</div><div class='del'>-	0x35e7, 0x7984, 0x9194, 0xff00, 0x918c, 0x00ff, 0x8217, 0x82ff,</div><div class='del'>-	0x1118, 0x2099, 0x19b4, 0x0040, 0x92c6, 0x0001, 0x1118, 0x2099,</div><div class='del'>-	0x19ce, 0x0010, 0x0804, 0x35ea, 0xa85c, 0x9080, 0x0019, 0x20a0,</div><div class='del'>-	0xa860, 0x20e8, 0x20a9, 0x001a, 0x20e1, 0x0001, 0x4003, 0x2009,</div><div class='del'>-	0x001a, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080, 0x0019,</div><div class='del'>-	0xaf60, 0x0804, 0x4c30, 0x7884, 0x908a, 0x1000, 0x1a04, 0x35ea,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x8003, 0x800b, 0x810b, 0x9108, 0x00c6,</div><div class='del'>-	0x2061, 0x19fb, 0x614a, 0x00ce, 0x012e, 0x0804, 0x35b5, 0x00c6,</div><div class='del'>-	0x080c, 0x7637, 0x1160, 0x080c, 0x7932, 0x080c, 0x612e, 0x9085,</div><div class='del'>-	0x0001, 0x080c, 0x767b, 0x080c, 0x7563, 0x080c, 0x0dc5, 0x2061,</div><div class='del'>-	0x1800, 0x6030, 0xc09d, 0x6032, 0x080c, 0x5fed, 0x00ce, 0x0005,</div><div class='del'>-	0x00c6, 0x2001, 0x1800, 0x2004, 0x908e, 0x0000, 0x0904, 0x35e7,</div><div class='del'>-	0x7884, 0x9005, 0x0188, 0x7888, 0x2061, 0x199c, 0x2c0c, 0x2062,</div><div class='del'>-	0x080c, 0x2c49, 0x01a0, 0x080c, 0x2c51, 0x0188, 0x080c, 0x2c59,</div><div class='del'>-	0x0170, 0x2162, 0x0804, 0x35ea, 0x2061, 0x0100, 0x6038, 0x9086,</div><div class='del'>-	0x0007, 0x1118, 0x2009, 0x0001, 0x0010, 0x2009, 0x0000, 0x7884,</div><div class='del'>-	0x9086, 0x0002, 0x1568, 0x2061, 0x0100, 0x6028, 0xc09c, 0x602a,</div><div class='del'>-	0x0026, 0x2011, 0x0003, 0x080c, 0xaabf, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0xaac9, 0x002e, 0x080c, 0xa9d3, 0x0036, 0x901e, 0x080c, 0xaa49,</div><div class='del'>-	0x003e, 0x60e3, 0x0000, 0x080c, 0xf07f, 0x080c, 0xf09a, 0x9085,</div><div class='del'>-	0x0001, 0x080c, 0x767b, 0x9006, 0x080c, 0x2d39, 0x2001, 0x1800,</div><div class='del'>-	0x2003, 0x0004, 0x2001, 0x19a8, 0x2003, 0x0000, 0x6027, 0x0008,</div><div class='del'>-	0x00ce, 0x0804, 0x35b5, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,</div><div class='del'>-	0x35e7, 0x080c, 0x57e9, 0x0120, 0x2009, 0x0007, 0x0804, 0x35e7,</div><div class='del'>-	0x7984, 0x7ea8, 0x96b4, 0x00ff, 0x080c, 0x6724, 0x1904, 0x35ea,</div><div class='del'>-	0x9186, 0x007f, 0x0138, 0x080c, 0x6aa3, 0x0120, 0x2009, 0x0009,</div><div class='del'>-	0x0804, 0x35e7, 0x080c, 0x4be4, 0x1120, 0x2009, 0x0002, 0x0804,</div><div class='del'>-	0x35e7, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x080c, 0xd2c0,</div><div class='del'>-	0x1120, 0x2009, 0x0003, 0x0804, 0x35e7, 0x7007, 0x0003, 0x701f,</div><div class='del'>-	0x5712, 0x0005, 0xa830, 0x9086, 0x0100, 0x1120, 0x2009, 0x0004,</div><div class='del'>-	0x0804, 0x35e7, 0xa8e0, 0xa866, 0xa834, 0x8007, 0x800c, 0xa85c,</div><div class='del'>-	0x9080, 0x000c, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xaf60, 0x0804,</div><div class='del'>-	0x4c30, 0xa898, 0x9086, 0x000d, 0x1904, 0x35e7, 0x2021, 0x4005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x0e04, 0x5736, 0x0010, 0x012e, 0x0cc0,</div><div class='del'>-	0x7c36, 0x9486, 0x4000, 0x0118, 0x7833, 0x0011, 0x0010, 0x7833,</div><div class='del'>-	0x0010, 0x7883, 0x4005, 0xa998, 0x7986, 0xa9a4, 0x799a, 0xa9a8,</div><div class='del'>-	0x799e, 0x080c, 0x4c20, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,</div><div class='del'>-	0xd084, 0x190c, 0x11aa, 0x7007, 0x0001, 0x2091, 0x5000, 0x700f,</div><div class='del'>-	0x0000, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x00c6, 0x2061,</div><div class='del'>-	0x19fb, 0x7984, 0x615a, 0x6156, 0x605f, 0x0000, 0x6053, 0x0009,</div><div class='del'>-	0x7898, 0x6072, 0x789c, 0x606e, 0x7888, 0x606a, 0x788c, 0x6066,</div><div class='del'>-	0x2001, 0x1a0b, 0x2044, 0x2001, 0x1a12, 0xa076, 0xa060, 0xa072,</div><div class='del'>-	0xa07b, 0x0001, 0xa07f, 0x0002, 0xa06b, 0x0000, 0xa09f, 0x0000,</div><div class='del'>-	0x00ce, 0x012e, 0x0804, 0x35b5, 0x0126, 0x2091, 0x8000, 0x00b6,</div><div class='del'>-	0x00c6, 0x90e4, 0xc000, 0x0168, 0x0006, 0xd0d4, 0x0130, 0x0036,</div><div class='del'>-	0x2019, 0x0029, 0x080c, 0x336a, 0x003e, 0x080c, 0xd125, 0x000e,</div><div class='del'>-	0x1198, 0xd0e4, 0x0160, 0x9180, 0x1000, 0x2004, 0x905d, 0x0160,</div><div class='del'>-	0x080c, 0x6148, 0x080c, 0xb23d, 0x0110, 0xb817, 0x0000, 0x9006,</div><div class='del'>-	0x00ce, 0x00be, 0x012e, 0x0005, 0x9085, 0x0001, 0x0cc8, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x0156, 0x2010, 0x900e, 0x20a9, 0x0800, 0x0016,</div><div class='del'>-	0x9180, 0x1000, 0x2004, 0x9005, 0x0188, 0x9186, 0x007e, 0x0170,</div><div class='del'>-	0x9186, 0x007f, 0x0158, 0x9186, 0x0080, 0x0140, 0x9186, 0x00ff,</div><div class='del'>-	0x0128, 0x0026, 0x2200, 0x080c, 0x5784, 0x002e, 0x001e, 0x8108,</div><div class='del'>-	0x1f04, 0x57b7, 0x015e, 0x012e, 0x0005, 0x2001, 0x1848, 0x2004,</div><div class='del'>-	0x0005, 0x2001, 0x1867, 0x2004, 0x0005, 0x0006, 0x2001, 0x1810,</div><div class='del'>-	0x2004, 0xd0d4, 0x000e, 0x0005, 0x2001, 0x180e, 0x2004, 0xd0b4,</div><div class='del'>-	0x0005, 0x2001, 0x1800, 0x2004, 0x9086, 0x0003, 0x0005, 0x0016,</div><div class='del'>-	0x00e6, 0x2071, 0x189e, 0x7108, 0x910d, 0x710a, 0x00ee, 0x001e,</div><div class='del'>-	0x0005, 0x79a4, 0x81ff, 0x0904, 0x35ea, 0x9182, 0x0081, 0x1a04,</div><div class='del'>-	0x35ea, 0x810c, 0x0016, 0x080c, 0x4be4, 0x0170, 0x080c, 0x0f16,</div><div class='del'>-	0x2100, 0x2238, 0x7d84, 0x7c88, 0x7b8c, 0x7a90, 0x001e, 0x080c,</div><div class='del'>-	0x4c2d, 0x701f, 0x5819, 0x0005, 0x001e, 0x2009, 0x0002, 0x0804,</div><div class='del'>-	0x35e7, 0x2079, 0x0000, 0x7d94, 0x7c98, 0x7ba8, 0x7aac, 0x79a4,</div><div class='del'>-	0x810c, 0x2061, 0x18b8, 0x2c44, 0xa770, 0xa074, 0x2071, 0x189e,</div><div class='del'>-	0x080c, 0x4c30, 0x701f, 0x582d, 0x0005, 0x2061, 0x18b8, 0x2c44,</div><div class='del'>-	0x0016, 0x0026, 0xa270, 0xa174, 0x080c, 0x0f1e, 0x002e, 0x001e,</div><div class='del'>-	0x080c, 0x0fcb, 0x9006, 0xa802, 0xa806, 0x0804, 0x35b5, 0x0126,</div><div class='del'>-	0x0156, 0x0136, 0x0146, 0x01c6, 0x01d6, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x2061, 0x0100, 0x2069, 0x0200, 0x2071, 0x1800, 0x6044,</div><div class='del'>-	0xd0a4, 0x11e8, 0xd084, 0x0118, 0x080c, 0x59ed, 0x0068, 0xd08c,</div><div class='del'>-	0x0118, 0x080c, 0x58f6, 0x0040, 0xd094, 0x0118, 0x080c, 0x58c6,</div><div class='del'>-	0x0018, 0xd09c, 0x0108, 0x0099, 0x00fe, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x01de, 0x01ce, 0x014e, 0x013e, 0x015e, 0x012e, 0x0005, 0x0016,</div><div class='del'>-	0x6128, 0xd19c, 0x1110, 0xc19d, 0x612a, 0x001e, 0x0c68, 0x7030,</div><div class='del'>-	0xd09c, 0x1120, 0x6004, 0x9085, 0x0002, 0x6006, 0x7098, 0x9005,</div><div class='del'>-	0x0120, 0x709b, 0x0000, 0x7093, 0x0000, 0x624c, 0x9286, 0xf0f0,</div><div class='del'>-	0x1150, 0x6048, 0x9086, 0xf0f0, 0x0130, 0x624a, 0x6043, 0x0090,</div><div class='del'>-	0x6043, 0x0010, 0x0490, 0x9294, 0xff00, 0x9296, 0xf700, 0x0178,</div><div class='del'>-	0x7138, 0xd1a4, 0x1160, 0x6240, 0x9295, 0x0100, 0x6242, 0x9294,</div><div class='del'>-	0x0010, 0x0128, 0x2009, 0x00f7, 0x080c, 0x60aa, 0x00f0, 0x6040,</div><div class='del'>-	0x9084, 0x0010, 0x9085, 0x0140, 0x6042, 0x6043, 0x0000, 0x7087,</div><div class='del'>-	0x0000, 0x70a3, 0x0001, 0x70c7, 0x0000, 0x70df, 0x0000, 0x2009,</div><div class='del'>-	0x1c80, 0x200b, 0x0000, 0x7097, 0x0000, 0x708b, 0x000f, 0x2009,</div><div class='del'>-	0x000f, 0x2011, 0x5f90, 0x080c, 0x88d5, 0x0005, 0x2001, 0x1869,</div><div class='del'>-	0x2004, 0xd08c, 0x0110, 0x705f, 0xffff, 0x7088, 0x9005, 0x1528,</div><div class='del'>-	0x2011, 0x5f90, 0x080c, 0x883d, 0x6040, 0x9094, 0x0010, 0x9285,</div><div class='del'>-	0x0020, 0x6042, 0x20a9, 0x00c8, 0x6044, 0xd08c, 0x1168, 0x1f04,</div><div class='del'>-	0x58dc, 0x6242, 0x709b, 0x0000, 0x6040, 0x9094, 0x0010, 0x9285,</div><div class='del'>-	0x0080, 0x6042, 0x6242, 0x0048, 0x6242, 0x709b, 0x0000, 0x708f,</div><div class='del'>-	0x0000, 0x9006, 0x080c, 0x6133, 0x0000, 0x0005, 0x708c, 0x908a,</div><div class='del'>-	0x0003, 0x1a0c, 0x0dc5, 0x000b, 0x0005, 0x5900, 0x5951, 0x59ec,</div><div class='del'>-	0x00f6, 0x0016, 0x6900, 0x918c, 0x0800, 0x708f, 0x0001, 0x2001,</div><div class='del'>-	0x015d, 0x2003, 0x0000, 0x6803, 0x00fc, 0x20a9, 0x0004, 0x6800,</div><div class='del'>-	0x9084, 0x00fc, 0x0120, 0x1f04, 0x590f, 0x080c, 0x0dc5, 0x68a0,</div><div class='del'>-	0x68a2, 0x689c, 0x689e, 0x6898, 0x689a, 0xa001, 0x918d, 0x1600,</div><div class='del'>-	0x6902, 0x001e, 0x6837, 0x0020, 0x080c, 0x610f, 0x2079, 0x1c00,</div><div class='del'>-	0x7833, 0x1101, 0x7837, 0x0000, 0x20e1, 0x0001, 0x2099, 0x1805,</div><div class='del'>-	0x20e9, 0x0001, 0x20a1, 0x1c0e, 0x20a9, 0x0004, 0x4003, 0x080c,</div><div class='del'>-	0xaf8e, 0x20e1, 0x0001, 0x2099, 0x1c00, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x0240, 0x20a9, 0x0014, 0x4003, 0x60c3, 0x000c, 0x600f, 0x0000,</div><div class='del'>-	0x080c, 0x5fc1, 0x00fe, 0x9006, 0x7092, 0x6043, 0x0008, 0x6042,</div><div class='del'>-	0x0005, 0x00f6, 0x7090, 0x7093, 0x0000, 0x9025, 0x0904, 0x59c9,</div><div class='del'>-	0x6020, 0xd0b4, 0x1904, 0x59c7, 0x71a0, 0x81ff, 0x0904, 0x59b5,</div><div class='del'>-	0x9486, 0x000c, 0x1904, 0x59c2, 0x9480, 0x0018, 0x8004, 0x20a8,</div><div class='del'>-	0x080c, 0x6108, 0x2011, 0x0260, 0x2019, 0x1c00, 0x220c, 0x2304,</div><div class='del'>-	0x9106, 0x11e8, 0x8210, 0x8318, 0x1f04, 0x596e, 0x6043, 0x0004,</div><div class='del'>-	0x2061, 0x0140, 0x605b, 0xbc94, 0x605f, 0xf0f0, 0x2061, 0x0100,</div><div class='del'>-	0x6043, 0x0006, 0x708f, 0x0002, 0x709b, 0x0002, 0x2009, 0x07d0,</div><div class='del'>-	0x2011, 0x5f97, 0x080c, 0x88d5, 0x080c, 0x610f, 0x04c0, 0x080c,</div><div class='del'>-	0x6108, 0x2079, 0x0260, 0x7930, 0x918e, 0x1101, 0x1558, 0x7834,</div><div class='del'>-	0x9005, 0x1540, 0x7900, 0x918c, 0x00ff, 0x1118, 0x7804, 0x9005,</div><div class='del'>-	0x0190, 0x080c, 0x6108, 0x2011, 0x026e, 0x2019, 0x1805, 0x20a9,</div><div class='del'>-	0x0004, 0x220c, 0x2304, 0x9102, 0x0230, 0x11a0, 0x8210, 0x8318,</div><div class='del'>-	0x1f04, 0x59a9, 0x0078, 0x70a3, 0x0000, 0x080c, 0x6108, 0x20e1,</div><div class='del'>-	0x0000, 0x2099, 0x0260, 0x20e9, 0x0001, 0x20a1, 0x1c00, 0x20a9,</div><div class='del'>-	0x0014, 0x4003, 0x6043, 0x0008, 0x6043, 0x0000, 0x0010, 0x00fe,</div><div class='del'>-	0x0005, 0x6040, 0x9085, 0x0100, 0x6042, 0x6020, 0xd0b4, 0x1db8,</div><div class='del'>-	0x080c, 0xaf8e, 0x20e1, 0x0001, 0x2099, 0x1c00, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x0240, 0x20a9, 0x0014, 0x4003, 0x60c3, 0x000c, 0x2011,</div><div class='del'>-	0x19f2, 0x2013, 0x0000, 0x7093, 0x0000, 0x60a3, 0x0056, 0x60a7,</div><div class='del'>-	0x9575, 0x080c, 0xa6e0, 0x08d8, 0x0005, 0x7098, 0x908a, 0x001d,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x000b, 0x0005, 0x5a1e, 0x5a31, 0x5a5a, 0x5a7a,</div><div class='del'>-	0x5aa0, 0x5acf, 0x5af5, 0x5b2d, 0x5b53, 0x5b81, 0x5bbc, 0x5bf4,</div><div class='del'>-	0x5c12, 0x5c3d, 0x5c5f, 0x5c7a, 0x5c84, 0x5cb8, 0x5cde, 0x5d0d,</div><div class='del'>-	0x5d33, 0x5d6b, 0x5daf, 0x5dec, 0x5e0d, 0x5e66, 0x5e88, 0x5eb6,</div><div class='del'>-	0x5eb6, 0x00c6, 0x2061, 0x1800, 0x6003, 0x0007, 0x2061, 0x0100,</div><div class='del'>-	0x6004, 0x9084, 0xfff9, 0x6006, 0x00ce, 0x0005, 0x2061, 0x0140,</div><div class='del'>-	0x605b, 0xbc94, 0x605f, 0xf0f0, 0x2061, 0x0100, 0x6043, 0x0002,</div><div class='del'>-	0x709b, 0x0001, 0x2009, 0x07d0, 0x2011, 0x5f97, 0x080c, 0x88d5,</div><div class='del'>-	0x0005, 0x00f6, 0x7090, 0x9086, 0x0014, 0x1510, 0x6042, 0x6020,</div><div class='del'>-	0xd0b4, 0x11f0, 0x080c, 0x6108, 0x2079, 0x0260, 0x7a30, 0x9296,</div><div class='del'>-	0x1102, 0x11a0, 0x7834, 0x9005, 0x1188, 0x7a38, 0xd2fc, 0x0128,</div><div class='del'>-	0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x2011, 0x5f97, 0x080c,</div><div class='del'>-	0x883d, 0x709b, 0x0010, 0x080c, 0x5c84, 0x0010, 0x7093, 0x0000,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x709b, 0x0003, 0x6043, 0x0004, 0x2011,</div><div class='del'>-	0x5f97, 0x080c, 0x883d, 0x080c, 0x608c, 0x2079, 0x0240, 0x7833,</div><div class='del'>-	0x1102, 0x7837, 0x0000, 0x20a9, 0x0008, 0x9f88, 0x000e, 0x200b,</div><div class='del'>-	0x0000, 0x8108, 0x1f04, 0x5a6f, 0x60c3, 0x0014, 0x080c, 0x5fc1,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005, 0x0500, 0x2011, 0x5f97,</div><div class='del'>-	0x080c, 0x883d, 0x9086, 0x0014, 0x11b8, 0x080c, 0x6108, 0x2079,</div><div class='del'>-	0x0260, 0x7a30, 0x9296, 0x1102, 0x1178, 0x7834, 0x9005, 0x1160,</div><div class='del'>-	0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001,</div><div class='del'>-	0x709b, 0x0004, 0x0029, 0x0010, 0x080c, 0x60e4, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x709b, 0x0005, 0x080c, 0x608c, 0x2079, 0x0240, 0x7833,</div><div class='del'>-	0x1103, 0x7837, 0x0000, 0x080c, 0x6108, 0x080c, 0x60eb, 0x1170,</div><div class='del'>-	0x7084, 0x9005, 0x1158, 0x715c, 0x9186, 0xffff, 0x0138, 0x2011,</div><div class='del'>-	0x0008, 0x080c, 0x5f44, 0x0168, 0x080c, 0x60c1, 0x20a9, 0x0008,</div><div class='del'>-	0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e,</div><div class='del'>-	0x4003, 0x60c3, 0x0014, 0x080c, 0x5fc1, 0x00fe, 0x0005, 0x00f6,</div><div class='del'>-	0x7090, 0x9005, 0x0500, 0x2011, 0x5f97, 0x080c, 0x883d, 0x9086,</div><div class='del'>-	0x0014, 0x11b8, 0x080c, 0x6108, 0x2079, 0x0260, 0x7a30, 0x9296,</div><div class='del'>-	0x1103, 0x1178, 0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc, 0x0128,</div><div class='del'>-	0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x709b, 0x0006, 0x0029,</div><div class='del'>-	0x0010, 0x080c, 0x60e4, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x0007,</div><div class='del'>-	0x080c, 0x608c, 0x2079, 0x0240, 0x7833, 0x1104, 0x7837, 0x0000,</div><div class='del'>-	0x080c, 0x6108, 0x080c, 0x60eb, 0x11b8, 0x7084, 0x9005, 0x11a0,</div><div class='del'>-	0x7164, 0x9186, 0xffff, 0x0180, 0x9180, 0x33b6, 0x200d, 0x918c,</div><div class='del'>-	0xff00, 0x810f, 0x2011, 0x0008, 0x080c, 0x5f44, 0x0180, 0x080c,</div><div class='del'>-	0x50d1, 0x0110, 0x080c, 0x28dc, 0x20a9, 0x0008, 0x20e1, 0x0000,</div><div class='del'>-	0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3,</div><div class='del'>-	0x0014, 0x080c, 0x5fc1, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005,</div><div class='del'>-	0x0500, 0x2011, 0x5f97, 0x080c, 0x883d, 0x9086, 0x0014, 0x11b8,</div><div class='del'>-	0x080c, 0x6108, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1104, 0x1178,</div><div class='del'>-	0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005,</div><div class='del'>-	0x1110, 0x70c7, 0x0001, 0x709b, 0x0008, 0x0029, 0x0010, 0x080c,</div><div class='del'>-	0x60e4, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x0009, 0x080c, 0x608c,</div><div class='del'>-	0x2079, 0x0240, 0x7833, 0x1105, 0x7837, 0x0100, 0x080c, 0x60eb,</div><div class='del'>-	0x1150, 0x7084, 0x9005, 0x1138, 0x080c, 0x5eb7, 0x1188, 0x9085,</div><div class='del'>-	0x0001, 0x080c, 0x28dc, 0x20a9, 0x0008, 0x080c, 0x6108, 0x20e1,</div><div class='del'>-	0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003,</div><div class='del'>-	0x60c3, 0x0014, 0x080c, 0x5fc1, 0x0010, 0x080c, 0x5a11, 0x00fe,</div><div class='del'>-	0x0005, 0x00f6, 0x7090, 0x9005, 0x05a8, 0x2011, 0x5f97, 0x080c,</div><div class='del'>-	0x883d, 0x9086, 0x0014, 0x1560, 0x080c, 0x6108, 0x2079, 0x0260,</div><div class='del'>-	0x7a30, 0x9296, 0x1105, 0x1520, 0x7834, 0x9084, 0x0100, 0x2011,</div><div class='del'>-	0x0100, 0x921e, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005,</div><div class='del'>-	0x1110, 0x70c7, 0x0001, 0x709b, 0x000a, 0x00b1, 0x0098, 0x9005,</div><div class='del'>-	0x1178, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7,</div><div class='del'>-	0x0001, 0x7097, 0x0000, 0x709b, 0x000e, 0x080c, 0x5c5f, 0x0010,</div><div class='del'>-	0x080c, 0x60e4, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x000b, 0x2011,</div><div class='del'>-	0x1c0e, 0x20e9, 0x0001, 0x22a0, 0x20a9, 0x0040, 0x2019, 0xffff,</div><div class='del'>-	0x4304, 0x080c, 0x608c, 0x2079, 0x0240, 0x7833, 0x1106, 0x7837,</div><div class='del'>-	0x0000, 0x080c, 0x60eb, 0x0118, 0x2013, 0x0000, 0x0020, 0x7060,</div><div class='del'>-	0x9085, 0x0100, 0x2012, 0x20a9, 0x0040, 0x2009, 0x024e, 0x2011,</div><div class='del'>-	0x1c0e, 0x220e, 0x8210, 0x8108, 0x9186, 0x0260, 0x1128, 0x6810,</div><div class='del'>-	0x8000, 0x6812, 0x2009, 0x0240, 0x1f04, 0x5be1, 0x60c3, 0x0084,</div><div class='del'>-	0x080c, 0x5fc1, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005, 0x01c0,</div><div class='del'>-	0x2011, 0x5f97, 0x080c, 0x883d, 0x9086, 0x0084, 0x1178, 0x080c,</div><div class='del'>-	0x6108, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1106, 0x1138, 0x7834,</div><div class='del'>-	0x9005, 0x1120, 0x709b, 0x000c, 0x0029, 0x0010, 0x080c, 0x60e4,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x709b, 0x000d, 0x080c, 0x608c, 0x2079,</div><div class='del'>-	0x0240, 0x7833, 0x1107, 0x7837, 0x0000, 0x080c, 0x6108, 0x20a9,</div><div class='del'>-	0x0040, 0x2011, 0x026e, 0x2009, 0x024e, 0x220e, 0x8210, 0x8108,</div><div class='del'>-	0x9186, 0x0260, 0x1150, 0x6810, 0x8000, 0x6812, 0x2009, 0x0240,</div><div class='del'>-	0x6814, 0x8000, 0x6816, 0x2011, 0x0260, 0x1f04, 0x5c25, 0x60c3,</div><div class='del'>-	0x0084, 0x080c, 0x5fc1, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005,</div><div class='del'>-	0x01e0, 0x2011, 0x5f97, 0x080c, 0x883d, 0x9086, 0x0084, 0x1198,</div><div class='del'>-	0x080c, 0x6108, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1107, 0x1158,</div><div class='del'>-	0x7834, 0x9005, 0x1140, 0x7097, 0x0001, 0x080c, 0x605e, 0x709b,</div><div class='del'>-	0x000e, 0x0029, 0x0010, 0x080c, 0x60e4, 0x00fe, 0x0005, 0x918d,</div><div class='del'>-	0x0001, 0x080c, 0x6133, 0x709b, 0x000f, 0x7093, 0x0000, 0x2061,</div><div class='del'>-	0x0140, 0x605b, 0xbc85, 0x605f, 0xb5b5, 0x2061, 0x0100, 0x6043,</div><div class='del'>-	0x0005, 0x6043, 0x0004, 0x2009, 0x07d0, 0x2011, 0x5f97, 0x080c,</div><div class='del'>-	0x8831, 0x0005, 0x7090, 0x9005, 0x0130, 0x2011, 0x5f97, 0x080c,</div><div class='del'>-	0x883d, 0x709b, 0x0000, 0x0005, 0x709b, 0x0011, 0x080c, 0xaf8e,</div><div class='del'>-	0x080c, 0x6108, 0x20e1, 0x0000, 0x2099, 0x0260, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x0240, 0x7490, 0x9480, 0x0018, 0x9080, 0x0007, 0x9084,</div><div class='del'>-	0x03f8, 0x8004, 0x20a8, 0x4003, 0x080c, 0x60eb, 0x11a0, 0x717c,</div><div class='del'>-	0x81ff, 0x0188, 0x900e, 0x7080, 0x9084, 0x00ff, 0x0160, 0x080c,</div><div class='del'>-	0x2873, 0x9186, 0x007e, 0x0138, 0x9186, 0x0080, 0x0120, 0x2011,</div><div class='del'>-	0x0008, 0x080c, 0x5f44, 0x60c3, 0x0014, 0x080c, 0x5fc1, 0x0005,</div><div class='del'>-	0x00f6, 0x7090, 0x9005, 0x0500, 0x2011, 0x5f97, 0x080c, 0x883d,</div><div class='del'>-	0x9086, 0x0014, 0x11b8, 0x080c, 0x6108, 0x2079, 0x0260, 0x7a30,</div><div class='del'>-	0x9296, 0x1103, 0x1178, 0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc,</div><div class='del'>-	0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x709b, 0x0012,</div><div class='del'>-	0x0029, 0x0010, 0x7093, 0x0000, 0x00fe, 0x0005, 0x00f6, 0x709b,</div><div class='del'>-	0x0013, 0x080c, 0x609a, 0x2079, 0x0240, 0x7833, 0x1103, 0x7837,</div><div class='del'>-	0x0000, 0x080c, 0x6108, 0x080c, 0x60eb, 0x1170, 0x7084, 0x9005,</div><div class='del'>-	0x1158, 0x715c, 0x9186, 0xffff, 0x0138, 0x2011, 0x0008, 0x080c,</div><div class='del'>-	0x5f44, 0x0168, 0x080c, 0x60c1, 0x20a9, 0x0008, 0x20e1, 0x0000,</div><div class='del'>-	0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3,</div><div class='del'>-	0x0014, 0x080c, 0x5fc1, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005,</div><div class='del'>-	0x0500, 0x2011, 0x5f97, 0x080c, 0x883d, 0x9086, 0x0014, 0x11b8,</div><div class='del'>-	0x080c, 0x6108, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1104, 0x1178,</div><div class='del'>-	0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005,</div><div class='del'>-	0x1110, 0x70c7, 0x0001, 0x709b, 0x0014, 0x0029, 0x0010, 0x7093,</div><div class='del'>-	0x0000, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x0015, 0x080c, 0x609a,</div><div class='del'>-	0x2079, 0x0240, 0x7833, 0x1104, 0x7837, 0x0000, 0x080c, 0x6108,</div><div class='del'>-	0x080c, 0x60eb, 0x11b8, 0x7084, 0x9005, 0x11a0, 0x7164, 0x9186,</div><div class='del'>-	0xffff, 0x0180, 0x9180, 0x33b6, 0x200d, 0x918c, 0xff00, 0x810f,</div><div class='del'>-	0x2011, 0x0008, 0x080c, 0x5f44, 0x0180, 0x080c, 0x50d1, 0x0110,</div><div class='del'>-	0x080c, 0x28dc, 0x20a9, 0x0008, 0x20e1, 0x0000, 0x2099, 0x026e,</div><div class='del'>-	0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c,</div><div class='del'>-	0x5fc1, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005, 0x05f0, 0x2011,</div><div class='del'>-	0x5f97, 0x080c, 0x883d, 0x9086, 0x0014, 0x15a8, 0x080c, 0x6108,</div><div class='del'>-	0x2079, 0x0260, 0x7a30, 0x9296, 0x1105, 0x1568, 0x7834, 0x9084,</div><div class='del'>-	0x0100, 0x2011, 0x0100, 0x921e, 0x1168, 0x9085, 0x0001, 0x080c,</div><div class='del'>-	0x6133, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7,</div><div class='del'>-	0x0001, 0x0080, 0x9005, 0x11b8, 0x7a38, 0xd2fc, 0x0128, 0x70c4,</div><div class='del'>-	0x9005, 0x1110, 0x70c7, 0x0001, 0x9085, 0x0001, 0x080c, 0x6133,</div><div class='del'>-	0x7097, 0x0000, 0x7a38, 0xd2f4, 0x0110, 0x70df, 0x0008, 0x709b,</div><div class='del'>-	0x0016, 0x0029, 0x0010, 0x7093, 0x0000, 0x00fe, 0x0005, 0x080c,</div><div class='del'>-	0xaf8e, 0x080c, 0x6108, 0x20e1, 0x0000, 0x2099, 0x0260, 0x20e9,</div><div class='del'>-	0x0000, 0x20a1, 0x0240, 0x20a9, 0x000e, 0x4003, 0x2011, 0x026d,</div><div class='del'>-	0x2204, 0x9084, 0x0100, 0x2011, 0x024d, 0x2012, 0x2011, 0x026e,</div><div class='del'>-	0x709b, 0x0017, 0x080c, 0x60eb, 0x1150, 0x7084, 0x9005, 0x1138,</div><div class='del'>-	0x080c, 0x5eb7, 0x1188, 0x9085, 0x0001, 0x080c, 0x28dc, 0x20a9,</div><div class='del'>-	0x0008, 0x080c, 0x6108, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9,</div><div class='del'>-	0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x5fc1,</div><div class='del'>-	0x0010, 0x080c, 0x5a11, 0x0005, 0x00f6, 0x7090, 0x9005, 0x01d8,</div><div class='del'>-	0x2011, 0x5f97, 0x080c, 0x883d, 0x9086, 0x0084, 0x1190, 0x080c,</div><div class='del'>-	0x6108, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1106, 0x1150, 0x7834,</div><div class='del'>-	0x9005, 0x1138, 0x9006, 0x080c, 0x6133, 0x709b, 0x0018, 0x0029,</div><div class='del'>-	0x0010, 0x7093, 0x0000, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x0019,</div><div class='del'>-	0x080c, 0x609a, 0x2079, 0x0240, 0x7833, 0x1106, 0x7837, 0x0000,</div><div class='del'>-	0x080c, 0x6108, 0x2009, 0x026e, 0x2039, 0x1c0e, 0x20a9, 0x0040,</div><div class='del'>-	0x213e, 0x8738, 0x8108, 0x9186, 0x0280, 0x1128, 0x6814, 0x8000,</div><div class='del'>-	0x6816, 0x2009, 0x0260, 0x1f04, 0x5e20, 0x2039, 0x1c0e, 0x080c,</div><div class='del'>-	0x60eb, 0x11e8, 0x2728, 0x2514, 0x8207, 0x9084, 0x00ff, 0x8000,</div><div class='del'>-	0x2018, 0x9294, 0x00ff, 0x8007, 0x9205, 0x202a, 0x7060, 0x2310,</div><div class='del'>-	0x8214, 0x92a0, 0x1c0e, 0x2414, 0x938c, 0x0001, 0x0118, 0x9294,</div><div class='del'>-	0xff00, 0x0018, 0x9294, 0x00ff, 0x8007, 0x9215, 0x2222, 0x20a9,</div><div class='del'>-	0x0040, 0x2009, 0x024e, 0x270e, 0x8738, 0x8108, 0x9186, 0x0260,</div><div class='del'>-	0x1128, 0x6810, 0x8000, 0x6812, 0x2009, 0x0240, 0x1f04, 0x5e53,</div><div class='del'>-	0x60c3, 0x0084, 0x080c, 0x5fc1, 0x00fe, 0x0005, 0x00f6, 0x7090,</div><div class='del'>-	0x9005, 0x01e0, 0x2011, 0x5f97, 0x080c, 0x883d, 0x9086, 0x0084,</div><div class='del'>-	0x1198, 0x080c, 0x6108, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1107,</div><div class='del'>-	0x1158, 0x7834, 0x9005, 0x1140, 0x7097, 0x0001, 0x080c, 0x605e,</div><div class='del'>-	0x709b, 0x001a, 0x0029, 0x0010, 0x7093, 0x0000, 0x00fe, 0x0005,</div><div class='del'>-	0x9085, 0x0001, 0x080c, 0x6133, 0x709b, 0x001b, 0x080c, 0xaf8e,</div><div class='del'>-	0x080c, 0x6108, 0x2011, 0x0260, 0x2009, 0x0240, 0x7490, 0x9480,</div><div class='del'>-	0x0018, 0x9080, 0x0007, 0x9084, 0x03f8, 0x8004, 0x20a8, 0x220e,</div><div class='del'>-	0x8210, 0x8108, 0x9186, 0x0260, 0x1150, 0x6810, 0x8000, 0x6812,</div><div class='del'>-	0x2009, 0x0240, 0x6814, 0x8000, 0x6816, 0x2011, 0x0260, 0x1f04,</div><div class='del'>-	0x5e9f, 0x60c3, 0x0084, 0x080c, 0x5fc1, 0x0005, 0x0005, 0x0086,</div><div class='del'>-	0x0096, 0x2029, 0x1848, 0x252c, 0x20a9, 0x0008, 0x2041, 0x1c0e,</div><div class='del'>-	0x20e9, 0x0001, 0x28a0, 0x080c, 0x6108, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x026e, 0x4003, 0x20a9, 0x0008, 0x2011, 0x0007, 0xd5d4, 0x0108,</div><div class='del'>-	0x9016, 0x2800, 0x9200, 0x200c, 0x91a6, 0xffff, 0x1148, 0xd5d4,</div><div class='del'>-	0x0110, 0x8210, 0x0008, 0x8211, 0x1f04, 0x5ed1, 0x0804, 0x5f40,</div><div class='del'>-	0x82ff, 0x1160, 0xd5d4, 0x0120, 0x91a6, 0x3fff, 0x0d90, 0x0020,</div><div class='del'>-	0x91a6, 0x3fff, 0x0904, 0x5f40, 0x918d, 0xc000, 0x20a9, 0x0010,</div><div class='del'>-	0x2019, 0x0001, 0xd5d4, 0x0110, 0x2019, 0x0010, 0x2120, 0xd5d4,</div><div class='del'>-	0x0110, 0x8423, 0x0008, 0x8424, 0x1240, 0xd5d4, 0x0110, 0x8319,</div><div class='del'>-	0x0008, 0x8318, 0x1f04, 0x5ef7, 0x04d8, 0x23a8, 0x2021, 0x0001,</div><div class='del'>-	0x8426, 0x8425, 0x1f04, 0x5f09, 0x2328, 0x8529, 0x92be, 0x0007,</div><div class='del'>-	0x0158, 0x0006, 0x2039, 0x0007, 0x2200, 0x973a, 0x000e, 0x27a8,</div><div class='del'>-	0x95a8, 0x0010, 0x1f04, 0x5f18, 0x755e, 0x95c8, 0x33b6, 0x292d,</div><div class='del'>-	0x95ac, 0x00ff, 0x7582, 0x6532, 0x6536, 0x0016, 0x2508, 0x080c,</div><div class='del'>-	0x28bc, 0x001e, 0x60e7, 0x0000, 0x65ea, 0x2018, 0x2304, 0x9405,</div><div class='del'>-	0x201a, 0x7087, 0x0001, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x20e1,</div><div class='del'>-	0x0001, 0x2898, 0x20a9, 0x0008, 0x4003, 0x9085, 0x0001, 0x0008,</div><div class='del'>-	0x9006, 0x009e, 0x008e, 0x0005, 0x0156, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x22a8, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000,</div><div class='del'>-	0x2011, 0x024e, 0x22a0, 0x4003, 0x014e, 0x013e, 0x01de, 0x01ce,</div><div class='del'>-	0x015e, 0x2118, 0x9026, 0x2001, 0x0007, 0x939a, 0x0010, 0x0218,</div><div class='del'>-	0x8420, 0x8001, 0x0cd0, 0x2118, 0x84ff, 0x0120, 0x939a, 0x0010,</div><div class='del'>-	0x8421, 0x1de0, 0x2021, 0x0001, 0x83ff, 0x0118, 0x8423, 0x8319,</div><div class='del'>-	0x1de8, 0x9238, 0x2029, 0x026e, 0x9528, 0x2504, 0x942c, 0x11b8,</div><div class='del'>-	0x9405, 0x203a, 0x715e, 0x91a0, 0x33b6, 0x242d, 0x95ac, 0x00ff,</div><div class='del'>-	0x7582, 0x6532, 0x6536, 0x0016, 0x2508, 0x080c, 0x28bc, 0x001e,</div><div class='del'>-	0x60e7, 0x0000, 0x65ea, 0x7087, 0x0001, 0x9084, 0x0000, 0x0005,</div><div class='del'>-	0x00e6, 0x2071, 0x1800, 0x708b, 0x0000, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x00f6, 0x2079, 0x0100, 0x2071, 0x0140, 0x080c, 0x604d, 0x080c,</div><div class='del'>-	0xa6e9, 0x7004, 0x9084, 0x4000, 0x0110, 0x080c, 0x2d49, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2071, 0x1826, 0x2073, 0x0000, 0x7840, 0x0026,</div><div class='del'>-	0x0016, 0x2009, 0x00f7, 0x080c, 0x60aa, 0x001e, 0x9094, 0x0010,</div><div class='del'>-	0x9285, 0x0080, 0x7842, 0x7a42, 0x002e, 0x012e, 0x00fe, 0x00ee,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0x080c, 0x2bce, 0x0228, 0x2011,</div><div class='del'>-	0x0101, 0x2204, 0xc0c5, 0x2012, 0x2011, 0x19f2, 0x2013, 0x0000,</div><div class='del'>-	0x7093, 0x0000, 0x012e, 0x60a3, 0x0056, 0x60a7, 0x9575, 0x080c,</div><div class='del'>-	0xa6e0, 0x6144, 0xd184, 0x0120, 0x7198, 0x918d, 0x2000, 0x0018,</div><div class='del'>-	0x718c, 0x918d, 0x1000, 0x2011, 0x1999, 0x2112, 0x2009, 0x07d0,</div><div class='del'>-	0x2011, 0x5f97, 0x080c, 0x88d5, 0x0005, 0x0016, 0x0026, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0xb244, 0x2009, 0x00f7, 0x080c,</div><div class='del'>-	0x60aa, 0x2061, 0x19fb, 0x900e, 0x611a, 0x611e, 0x617a, 0x617e,</div><div class='del'>-	0x2061, 0x1800, 0x6003, 0x0001, 0x2061, 0x0100, 0x6043, 0x0090,</div><div class='del'>-	0x6043, 0x0010, 0x2009, 0x1999, 0x200b, 0x0000, 0x2009, 0x002d,</div><div class='del'>-	0x2011, 0x6019, 0x080c, 0x8831, 0x012e, 0x00ce, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x00e6, 0x0006, 0x0126, 0x2091, 0x8000, 0x0471, 0x2071,</div><div class='del'>-	0x0100, 0x080c, 0xa6e9, 0x2071, 0x0140, 0x7004, 0x9084, 0x4000,</div><div class='del'>-	0x0110, 0x080c, 0x2d49, 0x080c, 0x763f, 0x0188, 0x080c, 0x765a,</div><div class='del'>-	0x1170, 0x080c, 0x793c, 0x0016, 0x080c, 0x298b, 0x2001, 0x196d,</div><div class='del'>-	0x2102, 0x001e, 0x080c, 0x7937, 0x080c, 0x7563, 0x0050, 0x2009,</div><div class='del'>-	0x0001, 0x080c, 0x2c67, 0x2001, 0x0001, 0x080c, 0x281c, 0x080c,</div><div class='del'>-	0x5fed, 0x012e, 0x000e, 0x00ee, 0x0005, 0x2001, 0x180e, 0x2004,</div><div class='del'>-	0xd0bc, 0x0158, 0x0026, 0x0036, 0x2011, 0x8017, 0x2001, 0x1999,</div><div class='del'>-	0x201c, 0x080c, 0x4c44, 0x003e, 0x002e, 0x0005, 0x20a9, 0x0012,</div><div class='del'>-	0x20e9, 0x0001, 0x20a1, 0x1c80, 0x080c, 0x6108, 0x20e9, 0x0000,</div><div class='del'>-	0x2099, 0x026e, 0x0099, 0x20a9, 0x0020, 0x080c, 0x6102, 0x2099,</div><div class='del'>-	0x0260, 0x20a1, 0x1c92, 0x0051, 0x20a9, 0x000e, 0x080c, 0x6105,</div><div class='del'>-	0x2099, 0x0260, 0x20a1, 0x1cb2, 0x0009, 0x0005, 0x0016, 0x0026,</div><div class='del'>-	0x3410, 0x3308, 0x2104, 0x8007, 0x2012, 0x8108, 0x8210, 0x1f04,</div><div class='del'>-	0x6082, 0x002e, 0x001e, 0x0005, 0x080c, 0xaf8e, 0x20e1, 0x0001,</div><div class='del'>-	0x2099, 0x1c00, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000c,</div><div class='del'>-	0x4003, 0x0005, 0x080c, 0xaf8e, 0x080c, 0x6108, 0x20e1, 0x0000,</div><div class='del'>-	0x2099, 0x0260, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000c,</div><div class='del'>-	0x4003, 0x0005, 0x00c6, 0x0006, 0x2061, 0x0100, 0x810f, 0x2001,</div><div class='del'>-	0x1834, 0x2004, 0x9005, 0x1138, 0x2001, 0x1818, 0x2004, 0x9084,</div><div class='del'>-	0x00ff, 0x9105, 0x0010, 0x9185, 0x00f7, 0x604a, 0x000e, 0x00ce,</div><div class='del'>-	0x0005, 0x0016, 0x0046, 0x080c, 0x6a9f, 0x0158, 0x9006, 0x2020,</div><div class='del'>-	0x2009, 0x002a, 0x080c, 0xec31, 0x2001, 0x180c, 0x200c, 0xc195,</div><div class='del'>-	0x2102, 0x2019, 0x002a, 0x900e, 0x080c, 0x321b, 0x080c, 0xd7e3,</div><div class='del'>-	0x0140, 0x0036, 0x2019, 0xffff, 0x2021, 0x0007, 0x080c, 0x4dfb,</div><div class='del'>-	0x003e, 0x004e, 0x001e, 0x0005, 0x080c, 0x5fed, 0x709b, 0x0000,</div><div class='del'>-	0x7093, 0x0000, 0x0005, 0x0006, 0x2001, 0x180c, 0x2004, 0xd09c,</div><div class='del'>-	0x0100, 0x000e, 0x0005, 0x0006, 0x0016, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2001, 0x0101, 0x200c, 0x918d, 0x0006, 0x2102, 0x012e, 0x001e,</div><div class='del'>-	0x000e, 0x0005, 0x2009, 0x0001, 0x0020, 0x2009, 0x0002, 0x0008,</div><div class='del'>-	0x900e, 0x6814, 0x9084, 0xffc0, 0x910d, 0x6916, 0x0005, 0x00f6,</div><div class='del'>-	0x0156, 0x0146, 0x01d6, 0x9006, 0x20a9, 0x0080, 0x20e9, 0x0001,</div><div class='del'>-	0x20a1, 0x1c00, 0x4004, 0x2079, 0x1c00, 0x7803, 0x2200, 0x7807,</div><div class='del'>-	0x00ef, 0x780f, 0x00ef, 0x7813, 0x0138, 0x7823, 0xffff, 0x7827,</div><div class='del'>-	0xffff, 0x01de, 0x014e, 0x015e, 0x00fe, 0x0005, 0x2001, 0x1800,</div><div class='del'>-	0x2003, 0x0001, 0x0005, 0x2001, 0x19a7, 0x0118, 0x2003, 0x0001,</div><div class='del'>-	0x0010, 0x2003, 0x0000, 0x0005, 0x0156, 0x20a9, 0x0800, 0x2009,</div><div class='del'>-	0x1000, 0x9006, 0x200a, 0x8108, 0x1f04, 0x6142, 0x015e, 0x0005,</div><div class='del'>-	0x00d6, 0x0036, 0x0156, 0x0136, 0x0146, 0x2069, 0x1847, 0x9006,</div><div class='del'>-	0xb802, 0xb8ce, 0xb807, 0x0707, 0xb80a, 0xb80e, 0xb812, 0x9198,</div><div class='del'>-	0x33b6, 0x231d, 0x939c, 0x00ff, 0xbb16, 0x0016, 0x0026, 0xb8c2,</div><div class='del'>-	0x080c, 0xb23d, 0x1120, 0x9192, 0x007e, 0x1208, 0xbbc2, 0x20a9,</div><div class='del'>-	0x0004, 0xb8c4, 0x20e8, 0xb9c8, 0x9198, 0x0006, 0x9006, 0x23a0,</div><div class='del'>-	0x4004, 0x20a9, 0x0004, 0x9198, 0x000a, 0x23a0, 0x4004, 0x002e,</div><div class='del'>-	0x001e, 0xb83e, 0xb842, 0xb84e, 0xb852, 0xb856, 0xb85a, 0xb85e,</div><div class='del'>-	0xb862, 0xb866, 0xb86a, 0xb86f, 0x0100, 0xb872, 0xb876, 0xb87a,</div><div class='del'>-	0xb88a, 0xb88e, 0xb893, 0x0008, 0xb896, 0xb89a, 0xb89e, 0xb8be,</div><div class='del'>-	0xb9a2, 0x0096, 0xb8a4, 0x904d, 0x0110, 0x080c, 0x1040, 0xb8a7,</div><div class='del'>-	0x0000, 0x009e, 0x9006, 0xb84a, 0x6810, 0xb83a, 0x680c, 0xb846,</div><div class='del'>-	0xb8bb, 0x0520, 0xb8ac, 0x9005, 0x0198, 0x00c6, 0x2060, 0x9c82,</div><div class='del'>-	0x1cd0, 0x0a0c, 0x0dc5, 0x2001, 0x181a, 0x2004, 0x9c02, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x080c, 0x8cf7, 0x00ce, 0x090c, 0x9096, 0xb8af, 0x0000,</div><div class='del'>-	0x6814, 0x9084, 0x00ff, 0xb842, 0x014e, 0x013e, 0x015e, 0x003e,</div><div class='del'>-	0x00de, 0x0005, 0x0126, 0x2091, 0x8000, 0xa974, 0xae78, 0x9684,</div><div class='del'>-	0x3fff, 0x9082, 0x4000, 0x1a04, 0x6230, 0x9182, 0x0800, 0x1a04,</div><div class='del'>-	0x6234, 0x2001, 0x180c, 0x2004, 0x9084, 0x0003, 0x1904, 0x623a,</div><div class='del'>-	0x9188, 0x1000, 0x2104, 0x905d, 0x0518, 0xb804, 0x9084, 0x00ff,</div><div class='del'>-	0x908e, 0x0006, 0x1508, 0xb8a4, 0x900d, 0x1904, 0x624c, 0xb850,</div><div class='del'>-	0x900d, 0x1148, 0xa802, 0x2900, 0xb852, 0xb84e, 0x080c, 0x951c,</div><div class='del'>-	0x9006, 0x012e, 0x0005, 0x00a6, 0x2150, 0x2900, 0xb002, 0xa803,</div><div class='del'>-	0x0000, 0x00ae, 0xb852, 0x0c90, 0x2001, 0x0005, 0x900e, 0x04b8,</div><div class='del'>-	0x2001, 0x0028, 0x900e, 0x0498, 0x9082, 0x0006, 0x1290, 0x080c,</div><div class='del'>-	0xb23d, 0x1160, 0xb8a0, 0x9084, 0xff80, 0x1140, 0xb900, 0xd1fc,</div><div class='del'>-	0x0990, 0x2001, 0x0029, 0x2009, 0x1000, 0x0408, 0x2001, 0x0028,</div><div class='del'>-	0x00a8, 0x2009, 0x180c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004,</div><div class='del'>-	0x0068, 0xd184, 0x0118, 0x2001, 0x0004, 0x0040, 0x2001, 0x0029,</div><div class='del'>-	0xb900, 0xd1fc, 0x0118, 0x2009, 0x1000, 0x0048, 0x900e, 0x0038,</div><div class='del'>-	0x2001, 0x0029, 0x900e, 0x0018, 0x2001, 0x0029, 0x900e, 0x9005,</div><div class='del'>-	0x012e, 0x0005, 0x2001, 0x180c, 0x2004, 0xd084, 0x19d0, 0x9188,</div><div class='del'>-	0x1000, 0x2104, 0x905d, 0x09a8, 0x080c, 0x6aa3, 0x1990, 0xb800,</div><div class='del'>-	0xd0bc, 0x0978, 0x0804, 0x61e3, 0x080c, 0x68c0, 0x0904, 0x61fc,</div><div class='del'>-	0x0804, 0x61e7, 0x00b6, 0x00e6, 0x0126, 0x2091, 0x8000, 0xa874,</div><div class='del'>-	0x908e, 0x00ff, 0x1120, 0x2001, 0x196b, 0x205c, 0x0060, 0xa974,</div><div class='del'>-	0x9182, 0x0800, 0x1690, 0x9188, 0x1000, 0x2104, 0x905d, 0x01d0,</div><div class='del'>-	0x080c, 0x6a43, 0x11d0, 0x080c, 0xb27d, 0x0570, 0x2b00, 0x6012,</div><div class='del'>-	0x2900, 0x6016, 0x6023, 0x0009, 0x600b, 0x0000, 0xa874, 0x908e,</div><div class='del'>-	0x00ff, 0x1110, 0x600b, 0x8000, 0x2009, 0x0043, 0x080c, 0xb352,</div><div class='del'>-	0x9006, 0x00b0, 0x2001, 0x0028, 0x0090, 0x2009, 0x180c, 0x210c,</div><div class='del'>-	0xd18c, 0x0118, 0x2001, 0x0004, 0x0038, 0xd184, 0x0118, 0x2001,</div><div class='del'>-	0x0004, 0x0010, 0x2001, 0x0029, 0x0010, 0x2001, 0x0029, 0x9005,</div><div class='del'>-	0x012e, 0x00ee, 0x00be, 0x0005, 0x2001, 0x002c, 0x0cc0, 0x00b6,</div><div class='del'>-	0x00e6, 0x0126, 0x2091, 0x8000, 0xa974, 0x9182, 0x0800, 0x1a04,</div><div class='del'>-	0x631d, 0x9188, 0x1000, 0x2104, 0x905d, 0x0904, 0x62f5, 0xb8a0,</div><div class='del'>-	0x9086, 0x007f, 0x0190, 0xa87c, 0xd0fc, 0x1178, 0x080c, 0x6aab,</div><div class='del'>-	0x0160, 0xa994, 0x81ff, 0x0130, 0x908e, 0x0004, 0x0130, 0x908e,</div><div class='del'>-	0x0005, 0x0118, 0x080c, 0x6aa3, 0x1598, 0xa87c, 0xd0fc, 0x01e0,</div><div class='del'>-	0xa894, 0x9005, 0x01c8, 0x2060, 0x0026, 0x2010, 0x080c, 0xd0c6,</div><div class='del'>-	0x002e, 0x1120, 0x2001, 0x0008, 0x0804, 0x631f, 0x6020, 0x9086,</div><div class='del'>-	0x000a, 0x0120, 0x2001, 0x0008, 0x0804, 0x631f, 0x601a, 0x6003,</div><div class='del'>-	0x0008, 0x2900, 0x6016, 0x0058, 0x080c, 0xb27d, 0x05e8, 0x2b00,</div><div class='del'>-	0x6012, 0x2900, 0x6016, 0x600b, 0xffff, 0x6023, 0x000a, 0x2009,</div><div class='del'>-	0x0003, 0x080c, 0xb352, 0x9006, 0x0458, 0x2001, 0x0028, 0x0438,</div><div class='del'>-	0x9082, 0x0006, 0x1290, 0x080c, 0xb23d, 0x1160, 0xb8a0, 0x9084,</div><div class='del'>-	0xff80, 0x1140, 0xb900, 0xd1fc, 0x0900, 0x2001, 0x0029, 0x2009,</div><div class='del'>-	0x1000, 0x00a8, 0x2001, 0x0028, 0x0090, 0x2009, 0x180c, 0x210c,</div><div class='del'>-	0xd18c, 0x0118, 0x2001, 0x0004, 0x0050, 0xd184, 0x0118, 0x2001,</div><div class='del'>-	0x0004, 0x0028, 0x2001, 0x0029, 0x0010, 0x2001, 0x0029, 0x9005,</div><div class='del'>-	0x012e, 0x00ee, 0x00be, 0x0005, 0x2001, 0x002c, 0x0cc0, 0x00f6,</div><div class='del'>-	0x00b6, 0x0126, 0x2091, 0x8000, 0xa8e0, 0x9005, 0x1550, 0xa8dc,</div><div class='del'>-	0x9082, 0x0101, 0x1630, 0xa8c8, 0x9005, 0x1518, 0xa8c4, 0x9082,</div><div class='del'>-	0x0101, 0x12f8, 0xa974, 0x2079, 0x1800, 0x9182, 0x0800, 0x12e8,</div><div class='del'>-	0x7830, 0x9084, 0x0003, 0x1130, 0xaa98, 0xab94, 0xa878, 0x9084,</div><div class='del'>-	0x0007, 0x00ea, 0x7930, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0038,</div><div class='del'>-	0xd184, 0x0118, 0x2001, 0x0004, 0x0010, 0x2001, 0x0029, 0x900e,</div><div class='del'>-	0x0038, 0x2001, 0x002c, 0x900e, 0x0018, 0x2001, 0x0029, 0x900e,</div><div class='del'>-	0x9006, 0x0008, 0x9005, 0x012e, 0x00be, 0x00fe, 0x0005, 0x63b4,</div><div class='del'>-	0x636f, 0x6386, 0x63b4, 0x63b4, 0x63b4, 0x63b4, 0x63b4, 0x2100,</div><div class='del'>-	0x9082, 0x007e, 0x1278, 0x080c, 0x66b9, 0x0148, 0x9046, 0xb810,</div><div class='del'>-	0x9306, 0x1904, 0x63bc, 0xb814, 0x9206, 0x15f0, 0x0028, 0xbb12,</div><div class='del'>-	0xba16, 0x0010, 0x080c, 0x4af7, 0x0150, 0x04b0, 0x080c, 0x6724,</div><div class='del'>-	0x1598, 0xb810, 0x9306, 0x1580, 0xb814, 0x9206, 0x1568, 0x080c,</div><div class='del'>-	0xb27d, 0x0530, 0x2b00, 0x6012, 0x080c, 0xd554, 0x2900, 0x6016,</div><div class='del'>-	0x600b, 0xffff, 0x6023, 0x000a, 0xa878, 0x9086, 0x0001, 0x1170,</div><div class='del'>-	0x080c, 0x3250, 0x9006, 0x080c, 0x6656, 0x2001, 0x0002, 0x080c,</div><div class='del'>-	0x666a, 0x2001, 0x0200, 0xb86e, 0xb893, 0x0002, 0x2009, 0x0003,</div><div class='del'>-	0x080c, 0xb352, 0x9006, 0x0068, 0x2001, 0x0001, 0x900e, 0x0038,</div><div class='del'>-	0x2001, 0x002c, 0x900e, 0x0018, 0x2001, 0x0028, 0x900e, 0x9005,</div><div class='del'>-	0x0000, 0x012e, 0x00be, 0x00fe, 0x0005, 0x00b6, 0x00f6, 0x00e6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0xa894, 0x90c6, 0x0015, 0x0904, 0x65a7,</div><div class='del'>-	0x90c6, 0x0056, 0x0904, 0x65ab, 0x90c6, 0x0066, 0x0904, 0x65af,</div><div class='del'>-	0x90c6, 0x0067, 0x0904, 0x65b3, 0x90c6, 0x0068, 0x0904, 0x65b7,</div><div class='del'>-	0x90c6, 0x0071, 0x0904, 0x65bb, 0x90c6, 0x0074, 0x0904, 0x65bf,</div><div class='del'>-	0x90c6, 0x007c, 0x0904, 0x65c3, 0x90c6, 0x007e, 0x0904, 0x65c7,</div><div class='del'>-	0x90c6, 0x0037, 0x0904, 0x65cb, 0x9016, 0x2079, 0x1800, 0xa974,</div><div class='del'>-	0x9186, 0x00ff, 0x0904, 0x65a2, 0x9182, 0x0800, 0x1a04, 0x65a2,</div><div class='del'>-	0x080c, 0x6724, 0x1198, 0xb804, 0x9084, 0x00ff, 0x9082, 0x0006,</div><div class='del'>-	0x1268, 0xa894, 0x90c6, 0x006f, 0x0148, 0x080c, 0xb23d, 0x1904,</div><div class='del'>-	0x658b, 0xb8a0, 0x9084, 0xff80, 0x1904, 0x658b, 0xa894, 0x90c6,</div><div class='del'>-	0x006f, 0x0158, 0x90c6, 0x005e, 0x0904, 0x64eb, 0x90c6, 0x0064,</div><div class='del'>-	0x0904, 0x6514, 0x2008, 0x0804, 0x64ad, 0xa998, 0xa8b0, 0x2040,</div><div class='del'>-	0x080c, 0xb23d, 0x1120, 0x9182, 0x007f, 0x0a04, 0x64ad, 0x9186,</div><div class='del'>-	0x00ff, 0x0904, 0x64ad, 0x9182, 0x0800, 0x1a04, 0x64ad, 0xaaa0,</div><div class='del'>-	0xab9c, 0x787c, 0x9306, 0x11a8, 0x7880, 0x0096, 0x924e, 0x1128,</div><div class='del'>-	0x2208, 0x2310, 0x009e, 0x0804, 0x64ad, 0x080c, 0xb23d, 0x1140,</div><div class='del'>-	0x99cc, 0xff00, 0x009e, 0x1128, 0x2208, 0x2310, 0x0804, 0x64ad,</div><div class='del'>-	0x009e, 0x080c, 0x4af7, 0x0904, 0x64b7, 0x900e, 0x9016, 0x90c6,</div><div class='del'>-	0x4000, 0x15e0, 0x0006, 0x080c, 0x6944, 0x1108, 0xc185, 0xb800,</div><div class='del'>-	0xd0bc, 0x0108, 0xc18d, 0x20a9, 0x0004, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x9080, 0x0031, 0x20a0, 0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x0006,</div><div class='del'>-	0x2098, 0x080c, 0x0f8b, 0x20a9, 0x0004, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x9080, 0x0035, 0x20a0, 0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x000a,</div><div class='del'>-	0x2098, 0x080c, 0x0f8b, 0xa8c4, 0xabc8, 0x9305, 0xabcc, 0x9305,</div><div class='del'>-	0xabd0, 0x9305, 0xabd4, 0x9305, 0xabd8, 0x9305, 0xabdc, 0x9305,</div><div class='del'>-	0xabe0, 0x9305, 0x9005, 0x0510, 0x000e, 0x00c8, 0x90c6, 0x4007,</div><div class='del'>-	0x1110, 0x2408, 0x00a0, 0x90c6, 0x4008, 0x1118, 0x2708, 0x2610,</div><div class='del'>-	0x0070, 0x90c6, 0x4009, 0x1108, 0x0050, 0x90c6, 0x4006, 0x0138,</div><div class='del'>-	0x2001, 0x4005, 0x2009, 0x000a, 0x0010, 0x2001, 0x4006, 0xa896,</div><div class='del'>-	0xa99a, 0xaa9e, 0x2001, 0x0030, 0x900e, 0x0478, 0x000e, 0x080c,</div><div class='del'>-	0xb27d, 0x1130, 0x2001, 0x4005, 0x2009, 0x0003, 0x9016, 0x0c78,</div><div class='del'>-	0x2b00, 0x6012, 0x080c, 0xd554, 0x2900, 0x6016, 0x6023, 0x0001,</div><div class='del'>-	0xa868, 0xd88c, 0x0108, 0xc0f5, 0xa86a, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x3250, 0x012e, 0x9006, 0x080c, 0x6656, 0x2001, 0x0002,</div><div class='del'>-	0x080c, 0x666a, 0x2009, 0x0002, 0x080c, 0xb352, 0xa8b0, 0xd094,</div><div class='del'>-	0x0118, 0xb8cc, 0xc08d, 0xb8ce, 0x9006, 0x9005, 0x012e, 0x00ee,</div><div class='del'>-	0x00fe, 0x00be, 0x0005, 0x080c, 0x57e9, 0x0118, 0x2009, 0x0007,</div><div class='del'>-	0x00f8, 0xa998, 0xaeb0, 0x080c, 0x6724, 0x1904, 0x64a8, 0x9186,</div><div class='del'>-	0x007f, 0x0130, 0x080c, 0x6aa3, 0x0118, 0x2009, 0x0009, 0x0080,</div><div class='del'>-	0x0096, 0x080c, 0x100e, 0x1120, 0x009e, 0x2009, 0x0002, 0x0040,</div><div class='del'>-	0x2900, 0x009e, 0xa806, 0x080c, 0xd2c0, 0x19b0, 0x2009, 0x0003,</div><div class='del'>-	0x2001, 0x4005, 0x0804, 0x64af, 0xa998, 0xaeb0, 0x080c, 0x6724,</div><div class='del'>-	0x1904, 0x64a8, 0x0096, 0x080c, 0x100e, 0x1128, 0x009e, 0x2009,</div><div class='del'>-	0x0002, 0x0804, 0x6568, 0x2900, 0x009e, 0xa806, 0x0096, 0x2048,</div><div class='del'>-	0x20a9, 0x002b, 0xb8c4, 0x20e0, 0xb8c8, 0x2098, 0xa860, 0x20e8,</div><div class='del'>-	0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003, 0x20a9, 0x0008, 0x9080,</div><div class='del'>-	0x0006, 0x20a0, 0xbbc8, 0x9398, 0x0006, 0x2398, 0x080c, 0x0f8b,</div><div class='del'>-	0x009e, 0xa87b, 0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0xd684,</div><div class='del'>-	0x1168, 0x080c, 0x57d5, 0xd0b4, 0x1118, 0xa89b, 0x000b, 0x00e0,</div><div class='del'>-	0xb800, 0xd08c, 0x0118, 0xa89b, 0x000c, 0x00b0, 0x080c, 0x6aa3,</div><div class='del'>-	0x0118, 0xa89b, 0x0009, 0x0080, 0x080c, 0x57e9, 0x0118, 0xa89b,</div><div class='del'>-	0x0007, 0x0050, 0x080c, 0xd2a3, 0x1904, 0x64e4, 0x2009, 0x0003,</div><div class='del'>-	0x2001, 0x4005, 0x0804, 0x64af, 0xa87b, 0x0030, 0xa897, 0x4005,</div><div class='del'>-	0xa804, 0x8006, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0,</div><div class='del'>-	0x9080, 0x0002, 0x2009, 0x002b, 0xaaa0, 0xab9c, 0xaca8, 0xada4,</div><div class='del'>-	0x2031, 0x0000, 0x2041, 0x1252, 0x080c, 0xb7f1, 0x1904, 0x64e4,</div><div class='del'>-	0x2009, 0x0002, 0x08e8, 0x2001, 0x0028, 0x900e, 0x0804, 0x64e5,</div><div class='del'>-	0x2009, 0x180c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0038,</div><div class='del'>-	0xd184, 0x0118, 0x2001, 0x0004, 0x0010, 0x2001, 0x0029, 0x900e,</div><div class='del'>-	0x0804, 0x64e5, 0x2001, 0x0029, 0x900e, 0x0804, 0x64e5, 0x080c,</div><div class='del'>-	0x37e9, 0x0804, 0x64e6, 0x080c, 0x5500, 0x0804, 0x64e6, 0x080c,</div><div class='del'>-	0x4637, 0x0804, 0x64e6, 0x080c, 0x46b0, 0x0804, 0x64e6, 0x080c,</div><div class='del'>-	0x470c, 0x0804, 0x64e6, 0x080c, 0x4bba, 0x0804, 0x64e6, 0x080c,</div><div class='del'>-	0x4e82, 0x0804, 0x64e6, 0x080c, 0x5167, 0x0804, 0x64e6, 0x080c,</div><div class='del'>-	0x5360, 0x0804, 0x64e6, 0x080c, 0x3a25, 0x0804, 0x64e6, 0x00b6,</div><div class='del'>-	0xa974, 0xae78, 0x9684, 0x3fff, 0x9082, 0x4000, 0x1618, 0x9182,</div><div class='del'>-	0x0800, 0x1268, 0x9188, 0x1000, 0x2104, 0x905d, 0x0140, 0x080c,</div><div class='del'>-	0x6aa3, 0x1148, 0x00e9, 0x080c, 0x684f, 0x9006, 0x00b0, 0x2001,</div><div class='del'>-	0x0028, 0x900e, 0x0090, 0x9082, 0x0006, 0x1240, 0xb900, 0xd1fc,</div><div class='del'>-	0x0d88, 0x2001, 0x0029, 0x2009, 0x1000, 0x0038, 0x2001, 0x0029,</div><div class='del'>-	0x900e, 0x0018, 0x2001, 0x0029, 0x900e, 0x9005, 0x00be, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0xb850, 0x900d, 0x0150, 0x2900, 0x0096,</div><div class='del'>-	0x2148, 0xa802, 0x009e, 0xa803, 0x0000, 0xb852, 0x012e, 0x0005,</div><div class='del'>-	0x2900, 0xb852, 0xb84e, 0xa803, 0x0000, 0x0cc0, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0xb84c, 0x9005, 0x0170, 0x00e6, 0x2071, 0x19e8, 0x7004,</div><div class='del'>-	0x9086, 0x0002, 0x0168, 0x00ee, 0xb84c, 0xa802, 0x2900, 0xb84e,</div><div class='del'>-	0x012e, 0x0005, 0x2900, 0xb852, 0xb84e, 0xa803, 0x0000, 0x0cc0,</div><div class='del'>-	0x701c, 0x9b06, 0x1d80, 0xb84c, 0x00a6, 0x2050, 0xb000, 0xa802,</div><div class='del'>-	0x2900, 0xb002, 0x00ae, 0x00ee, 0x012e, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0xb84c, 0x904d, 0x0130, 0xa800, 0x9005, 0x1108, 0xb852,</div><div class='del'>-	0xb84e, 0x9905, 0x012e, 0x0005, 0xb84c, 0x904d, 0x0130, 0xa800,</div><div class='del'>-	0x9005, 0x1108, 0xb852, 0xb84e, 0x9905, 0x0005, 0x00b6, 0x0126,</div><div class='del'>-	0x00c6, 0x0026, 0x2091, 0x8000, 0x6210, 0x2258, 0xba00, 0x9005,</div><div class='del'>-	0x0110, 0xc285, 0x0008, 0xc284, 0xba02, 0x002e, 0x00ce, 0x012e,</div><div class='del'>-	0x00be, 0x0005, 0x00b6, 0x0126, 0x00c6, 0x2091, 0x8000, 0x6210,</div><div class='del'>-	0x2258, 0xba04, 0x0006, 0x9086, 0x0006, 0x1170, 0xb89c, 0xd0ac,</div><div class='del'>-	0x0158, 0x080c, 0x6a9f, 0x0140, 0x9284, 0xff00, 0x8007, 0x9086,</div><div class='del'>-	0x0007, 0x1110, 0x2011, 0x0600, 0x000e, 0x9294, 0xff00, 0x9215,</div><div class='del'>-	0xba06, 0x0006, 0x9086, 0x0006, 0x1120, 0xba90, 0x82ff, 0x090c,</div><div class='del'>-	0x0dc5, 0x000e, 0x00ce, 0x012e, 0x00be, 0x0005, 0x00b6, 0x0126,</div><div class='del'>-	0x00c6, 0x2091, 0x8000, 0x6210, 0x2258, 0xba04, 0x0006, 0x9086,</div><div class='del'>-	0x0006, 0x1168, 0xb89c, 0xd0a4, 0x0150, 0x080c, 0x6a9b, 0x1138,</div><div class='del'>-	0x9284, 0x00ff, 0x9086, 0x0007, 0x1110, 0x2011, 0x0006, 0x000e,</div><div class='del'>-	0x9294, 0x00ff, 0x8007, 0x9215, 0xba06, 0x00ce, 0x012e, 0x00be,</div><div class='del'>-	0x0005, 0x9182, 0x0800, 0x0218, 0x9085, 0x0001, 0x0005, 0x00d6,</div><div class='del'>-	0x0026, 0x9190, 0x1000, 0x2204, 0x905d, 0x1188, 0x0096, 0x080c,</div><div class='del'>-	0x100e, 0x2958, 0x009e, 0x0168, 0x2b00, 0x2012, 0xb85c, 0xb8ca,</div><div class='del'>-	0xb860, 0xb8c6, 0x9006, 0xb8a6, 0xb8ae, 0x080c, 0x6148, 0x9006,</div><div class='del'>-	0x0010, 0x9085, 0x0001, 0x002e, 0x00de, 0x0005, 0x00b6, 0x0096,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x0026, 0x9182, 0x0800, 0x0218, 0x9085,</div><div class='del'>-	0x0001, 0x04a8, 0x00d6, 0x9190, 0x1000, 0x2204, 0x905d, 0x0568,</div><div class='del'>-	0x2013, 0x0000, 0xb8a4, 0x904d, 0x0110, 0x080c, 0x1040, 0x00d6,</div><div class='del'>-	0x00c6, 0xb8bc, 0x2060, 0x8cff, 0x0168, 0x600c, 0x0006, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xd0d8, 0x0110, 0x080c, 0x0fc0, 0x080c, 0xb2d3,</div><div class='del'>-	0x00ce, 0x0c88, 0x00ce, 0x00de, 0x00c6, 0xb8ac, 0x9065, 0x0128,</div><div class='del'>-	0x621c, 0xd2c4, 0x0110, 0x080c, 0x9096, 0x00ce, 0x2b48, 0xb8c8,</div><div class='del'>-	0xb85e, 0xb8c4, 0xb862, 0x080c, 0x1050, 0x00de, 0x9006, 0x002e,</div><div class='del'>-	0x012e, 0x009e, 0x00be, 0x0005, 0x0016, 0x9182, 0x0800, 0x0218,</div><div class='del'>-	0x9085, 0x0001, 0x0030, 0x9188, 0x1000, 0x2104, 0x905d, 0x0dc0,</div><div class='del'>-	0x9006, 0x001e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146, 0x9006,</div><div class='del'>-	0xb80a, 0xb80e, 0xb800, 0xc08c, 0xb802, 0x080c, 0x7637, 0x1510,</div><div class='del'>-	0xb8a0, 0x9086, 0x007e, 0x0120, 0x080c, 0xb23d, 0x11d8, 0x0078,</div><div class='del'>-	0x7040, 0xd0e4, 0x01b8, 0x00c6, 0x2061, 0x1982, 0x7048, 0x2062,</div><div class='del'>-	0x704c, 0x6006, 0x7050, 0x600a, 0x7054, 0x600e, 0x00ce, 0x703c,</div><div class='del'>-	0x2069, 0x0140, 0x9005, 0x1110, 0x2001, 0x0001, 0x6886, 0x2069,</div><div class='del'>-	0x1800, 0x68b6, 0x7040, 0xb85e, 0x7048, 0xb862, 0x704c, 0xb866,</div><div class='del'>-	0x20e1, 0x0000, 0x2099, 0x0276, 0xb8c4, 0x20e8, 0xb8c8, 0x9088,</div><div class='del'>-	0x000a, 0x21a0, 0x20a9, 0x0004, 0x4003, 0x2099, 0x027a, 0x9088,</div><div class='del'>-	0x0006, 0x21a0, 0x20a9, 0x0004, 0x4003, 0x2069, 0x0200, 0x6817,</div><div class='del'>-	0x0001, 0x7040, 0xb86a, 0x7144, 0xb96e, 0x7048, 0xb872, 0x7050,</div><div class='del'>-	0xb876, 0x2069, 0x0200, 0x6817, 0x0000, 0xb8a0, 0x9086, 0x007e,</div><div class='del'>-	0x1110, 0x7144, 0xb96e, 0x9182, 0x0211, 0x1218, 0x2009, 0x0008,</div><div class='del'>-	0x0400, 0x9182, 0x0259, 0x1218, 0x2009, 0x0007, 0x00d0, 0x9182,</div><div class='del'>-	0x02c1, 0x1218, 0x2009, 0x0006, 0x00a0, 0x9182, 0x0349, 0x1218,</div><div class='del'>-	0x2009, 0x0005, 0x0070, 0x9182, 0x0421, 0x1218, 0x2009, 0x0004,</div><div class='del'>-	0x0040, 0x9182, 0x0581, 0x1218, 0x2009, 0x0003, 0x0010, 0x2009,</div><div class='del'>-	0x0002, 0xb992, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x00e6, 0x2071, 0x0260, 0x7034, 0xb896, 0x703c, 0xb89a,</div><div class='del'>-	0x7054, 0xb89e, 0x0036, 0xbbcc, 0xc384, 0xba00, 0x2009, 0x1867,</div><div class='del'>-	0x210c, 0xd0bc, 0x0120, 0xd1ec, 0x0110, 0xc2ad, 0x0008, 0xc2ac,</div><div class='del'>-	0xd0c4, 0x0148, 0xd1e4, 0x0138, 0xc2bd, 0xd0cc, 0x0128, 0xd38c,</div><div class='del'>-	0x1108, 0xc385, 0x0008, 0xc2bc, 0xba02, 0xbbce, 0x003e, 0x00ee,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0096, 0x0126, 0x2091, 0x8000, 0xb8a4,</div><div class='del'>-	0x904d, 0x0578, 0xa900, 0x81ff, 0x15c0, 0xaa04, 0x9282, 0x0010,</div><div class='del'>-	0x16c8, 0x0136, 0x0146, 0x01c6, 0x01d6, 0x8906, 0x8006, 0x8007,</div><div class='del'>-	0x908c, 0x003f, 0x21e0, 0x9084, 0xffc0, 0x9080, 0x0004, 0x2098,</div><div class='del'>-	0x2009, 0x0010, 0x20a9, 0x0001, 0x4002, 0x9086, 0xffff, 0x0120,</div><div class='del'>-	0x8109, 0x1dd0, 0x080c, 0x0dc5, 0x3c00, 0x20e8, 0x3300, 0x8001,</div><div class='del'>-	0x20a0, 0x4604, 0x8210, 0xaa06, 0x01de, 0x01ce, 0x014e, 0x013e,</div><div class='del'>-	0x0060, 0x080c, 0x100e, 0x0170, 0x2900, 0xb8a6, 0xa803, 0x0000,</div><div class='del'>-	0x080c, 0x68e0, 0xa807, 0x0001, 0xae12, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x009e, 0x0005, 0x9006, 0x0cd8, 0x0126, 0x2091, 0x8000, 0x0096,</div><div class='del'>-	0xb8a4, 0x904d, 0x0188, 0xa800, 0x9005, 0x1150, 0x080c, 0x68ef,</div><div class='del'>-	0x1158, 0xa804, 0x908a, 0x0002, 0x0218, 0x8001, 0xa806, 0x0020,</div><div class='del'>-	0x080c, 0x1040, 0xb8a7, 0x0000, 0x009e, 0x012e, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x951c, 0x012e, 0x0005, 0x901e, 0x0010,</div><div class='del'>-	0x2019, 0x0001, 0x900e, 0x0126, 0x2091, 0x8000, 0xb84c, 0x2048,</div><div class='del'>-	0xb800, 0xd0dc, 0x1170, 0x89ff, 0x0500, 0x83ff, 0x0120, 0xa878,</div><div class='del'>-	0x9606, 0x0158, 0x0030, 0xa86c, 0x9406, 0x1118, 0xa870, 0x9506,</div><div class='del'>-	0x0120, 0x2908, 0xa800, 0x2048, 0x0c70, 0x080c, 0xaaf1, 0xaa00,</div><div class='del'>-	0xb84c, 0x9906, 0x1110, 0xba4e, 0x0020, 0x00a6, 0x2150, 0xb202,</div><div class='del'>-	0x00ae, 0x82ff, 0x1110, 0xb952, 0x89ff, 0x012e, 0x0005, 0x9016,</div><div class='del'>-	0x0489, 0x1110, 0x2011, 0x0001, 0x0005, 0x080c, 0x6944, 0x0128,</div><div class='del'>-	0x080c, 0xd195, 0x0010, 0x9085, 0x0001, 0x0005, 0x080c, 0x6944,</div><div class='del'>-	0x0128, 0x080c, 0xd13a, 0x0010, 0x9085, 0x0001, 0x0005, 0x080c,</div><div class='del'>-	0x6944, 0x0128, 0x080c, 0xd192, 0x0010, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x080c, 0x6944, 0x0128, 0x080c, 0xd159, 0x0010, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x080c, 0x6944, 0x0128, 0x080c, 0xd1d8, 0x0010, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0xb8a4, 0x900d, 0x1118, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x0136, 0x01c6, 0xa800, 0x9005, 0x11b8, 0x890e, 0x810e, 0x810f,</div><div class='del'>-	0x9184, 0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0004, 0x2098,</div><div class='del'>-	0x20a9, 0x0001, 0x2009, 0x0010, 0x4002, 0x9606, 0x0128, 0x8109,</div><div class='del'>-	0x1dd8, 0x9085, 0x0001, 0x0008, 0x9006, 0x01ce, 0x013e, 0x0005,</div><div class='del'>-	0x0146, 0x01d6, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0004, 0x20a0,</div><div class='del'>-	0x20a9, 0x0010, 0x2009, 0xffff, 0x4104, 0x01de, 0x014e, 0x0136,</div><div class='del'>-	0x01c6, 0xa800, 0x9005, 0x11b8, 0x890e, 0x810e, 0x810f, 0x9184,</div><div class='del'>-	0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0004, 0x2098, 0x20a9,</div><div class='del'>-	0x0001, 0x2009, 0x0010, 0x4002, 0x9606, 0x0128, 0x8109, 0x1dd8,</div><div class='del'>-	0x9085, 0x0001, 0x0068, 0x0146, 0x01d6, 0x3300, 0x8001, 0x20a0,</div><div class='del'>-	0x3c00, 0x20e8, 0x2001, 0xffff, 0x4004, 0x01de, 0x014e, 0x9006,</div><div class='del'>-	0x01ce, 0x013e, 0x0005, 0x0096, 0x0126, 0x2091, 0x8000, 0xb8a4,</div><div class='del'>-	0x904d, 0x1128, 0x080c, 0x100e, 0x0168, 0x2900, 0xb8a6, 0x080c,</div><div class='del'>-	0x68e0, 0xa803, 0x0001, 0xa807, 0x0000, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x009e, 0x0005, 0x9006, 0x0cd8, 0x0096, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0xb8a4, 0x904d, 0x0130, 0xb8a7, 0x0000, 0x080c, 0x1040, 0x9085,</div><div class='del'>-	0x0001, 0x012e, 0x009e, 0x0005, 0xb89c, 0xd0a4, 0x0005, 0x00b6,</div><div class='del'>-	0x00f6, 0x080c, 0x7637, 0x01b0, 0x71c4, 0x81ff, 0x1198, 0x71dc,</div><div class='del'>-	0xd19c, 0x0180, 0x2001, 0x007e, 0x9080, 0x1000, 0x2004, 0x905d,</div><div class='del'>-	0x0148, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x1118, 0xb800,</div><div class='del'>-	0xc0ed, 0xb802, 0x2079, 0x1847, 0x7804, 0xd0a4, 0x01d0, 0x0156,</div><div class='del'>-	0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x6724, 0x1168, 0xb804,</div><div class='del'>-	0x9084, 0xff00, 0x8007, 0x9096, 0x0004, 0x0118, 0x9086, 0x0006,</div><div class='del'>-	0x1118, 0xb800, 0xc0ed, 0xb802, 0x001e, 0x8108, 0x1f04, 0x696b,</div><div class='del'>-	0x015e, 0x080c, 0x6a61, 0x0120, 0x2001, 0x1985, 0x200c, 0x0098,</div><div class='del'>-	0x2079, 0x1847, 0x7804, 0xd0a4, 0x0190, 0x2009, 0x07d0, 0x2001,</div><div class='del'>-	0x182c, 0x2004, 0x9005, 0x0138, 0x2001, 0x1867, 0x2004, 0xd0e4,</div><div class='del'>-	0x0110, 0x2009, 0x5dc0, 0x2011, 0x69a2, 0x080c, 0x88d5, 0x00fe,</div><div class='del'>-	0x00be, 0x0005, 0x00b6, 0x2011, 0x69a2, 0x080c, 0x883d, 0x080c,</div><div class='del'>-	0x6a61, 0x01d8, 0x2001, 0x107e, 0x2004, 0x2058, 0xb900, 0xc1ec,</div><div class='del'>-	0xb902, 0x080c, 0x6a9f, 0x0130, 0x2009, 0x07d0, 0x2011, 0x69a2,</div><div class='del'>-	0x080c, 0x88d5, 0x00e6, 0x2071, 0x1800, 0x9006, 0x707e, 0x7060,</div><div class='del'>-	0x7082, 0x080c, 0x3000, 0x00ee, 0x04b0, 0x0156, 0x00c6, 0x20a9,</div><div class='del'>-	0x007f, 0x900e, 0x0016, 0x080c, 0x6724, 0x1538, 0xb800, 0xd0ec,</div><div class='del'>-	0x0520, 0x0046, 0xbaa0, 0x2220, 0x9006, 0x2009, 0x0029, 0x080c,</div><div class='del'>-	0xec31, 0xb800, 0xc0e5, 0xc0ec, 0xb802, 0x080c, 0x6a9b, 0x2001,</div><div class='del'>-	0x0707, 0x1128, 0xb804, 0x9084, 0x00ff, 0x9085, 0x0700, 0xb806,</div><div class='del'>-	0x2019, 0x0029, 0x080c, 0x96a4, 0x0076, 0x903e, 0x080c, 0x9577,</div><div class='del'>-	0x900e, 0x080c, 0xe91c, 0x007e, 0x004e, 0x001e, 0x8108, 0x1f04,</div><div class='del'>-	0x69ca, 0x00ce, 0x015e, 0x00be, 0x0005, 0x00b6, 0x6010, 0x2058,</div><div class='del'>-	0xb800, 0xc0ec, 0xb802, 0x00be, 0x0005, 0x00b6, 0x00c6, 0x0096,</div><div class='del'>-	0x080c, 0x1027, 0x090c, 0x0dc5, 0x2958, 0x009e, 0x2001, 0x196b,</div><div class='del'>-	0x2b02, 0x8b07, 0x8006, 0x8006, 0x908c, 0x003f, 0xb9c6, 0x908c,</div><div class='del'>-	0xffc0, 0xb9ca, 0xb8af, 0x0000, 0x2009, 0x00ff, 0x080c, 0x6148,</div><div class='del'>-	0xb807, 0x0006, 0xb813, 0x00ff, 0xb817, 0xffff, 0xb86f, 0x0200,</div><div class='del'>-	0xb86c, 0xb893, 0x0002, 0xb8bb, 0x0520, 0xb8a3, 0x00ff, 0xb8af,</div><div class='del'>-	0x0000, 0x00ce, 0x00be, 0x0005, 0x7810, 0x00b6, 0x2058, 0xb800,</div><div class='del'>-	0x00be, 0xd0ac, 0x0005, 0x6010, 0x00b6, 0x905d, 0x0108, 0xb800,</div><div class='del'>-	0x00be, 0xd0bc, 0x0005, 0x0006, 0x0016, 0x0026, 0xb804, 0x908c,</div><div class='del'>-	0x00ff, 0x9196, 0x0006, 0x0188, 0x9196, 0x0004, 0x0170, 0x9196,</div><div class='del'>-	0x0005, 0x0158, 0x908c, 0xff00, 0x810f, 0x9196, 0x0006, 0x0128,</div><div class='del'>-	0x9196, 0x0004, 0x0110, 0x9196, 0x0005, 0x002e, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x00b6, 0x00f6, 0x2001, 0x107e, 0x2004, 0x905d, 0x0110,</div><div class='del'>-	0xb800, 0xd0ec, 0x00fe, 0x00be, 0x0005, 0x0126, 0x0026, 0x2091,</div><div class='del'>-	0x8000, 0x0006, 0xbaa0, 0x9290, 0x1000, 0x2204, 0x9b06, 0x190c,</div><div class='del'>-	0x0dc5, 0x000e, 0xba00, 0x9005, 0x0110, 0xc2fd, 0x0008, 0xc2fc,</div><div class='del'>-	0xba02, 0x002e, 0x012e, 0x0005, 0x2011, 0x1837, 0x2204, 0xd0cc,</div><div class='del'>-	0x0138, 0x2001, 0x1983, 0x200c, 0x2011, 0x6a91, 0x080c, 0x88d5,</div><div class='del'>-	0x0005, 0x2011, 0x6a91, 0x080c, 0x883d, 0x2011, 0x1837, 0x2204,</div><div class='del'>-	0xc0cc, 0x2012, 0x0005, 0x080c, 0x57d5, 0xd0ac, 0x0005, 0x080c,</div><div class='del'>-	0x57d5, 0xd0a4, 0x0005, 0x0016, 0xb904, 0x9184, 0x00ff, 0x908e,</div><div class='del'>-	0x0006, 0x001e, 0x0005, 0x0016, 0xb904, 0x9184, 0xff00, 0x8007,</div><div class='del'>-	0x908e, 0x0006, 0x001e, 0x0005, 0x00b6, 0x00f6, 0x080c, 0xd7e3,</div><div class='del'>-	0x0158, 0x70dc, 0x9084, 0x0028, 0x0138, 0x2001, 0x107f, 0x2004,</div><div class='del'>-	0x905d, 0x0110, 0xb8cc, 0xd094, 0x00fe, 0x00be, 0x0005, 0x0006,</div><div class='del'>-	0x0016, 0x0036, 0x0046, 0x0076, 0x00b6, 0x2001, 0x1818, 0x203c,</div><div class='del'>-	0x9780, 0x33b6, 0x203d, 0x97bc, 0xff00, 0x873f, 0x9006, 0x2018,</div><div class='del'>-	0x2008, 0x9284, 0x8000, 0x0110, 0x2019, 0x0001, 0x9294, 0x7fff,</div><div class='del'>-	0x2100, 0x9706, 0x0190, 0x91a0, 0x1000, 0x2404, 0x905d, 0x0168,</div><div class='del'>-	0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x1138, 0x83ff, 0x0118,</div><div class='del'>-	0xb89c, 0xd0a4, 0x0110, 0x8211, 0x0158, 0x8108, 0x83ff, 0x0120,</div><div class='del'>-	0x9182, 0x0800, 0x0e28, 0x0068, 0x9182, 0x007e, 0x0e08, 0x0048,</div><div class='del'>-	0x00be, 0x007e, 0x004e, 0x003e, 0x001e, 0x9085, 0x0001, 0x000e,</div><div class='del'>-	0x0005, 0x00be, 0x007e, 0x004e, 0x003e, 0x001e, 0x9006, 0x000e,</div><div class='del'>-	0x0005, 0x0046, 0x0056, 0x0076, 0x00b6, 0x2100, 0x9084, 0x7fff,</div><div class='del'>-	0x9080, 0x1000, 0x2004, 0x905d, 0x0130, 0xb804, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x0006, 0x0550, 0x9184, 0x8000, 0x0580, 0x2001, 0x1818,</div><div class='del'>-	0x203c, 0x9780, 0x33b6, 0x203d, 0x97bc, 0xff00, 0x873f, 0x9006,</div><div class='del'>-	0x2020, 0x2400, 0x9706, 0x01a0, 0x94a8, 0x1000, 0x2504, 0x905d,</div><div class='del'>-	0x0178, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x1148, 0xb89c,</div><div class='del'>-	0xd0a4, 0x0130, 0xb814, 0x9206, 0x1118, 0xb810, 0x9306, 0x0128,</div><div class='del'>-	0x8420, 0x9482, 0x0800, 0x0e28, 0x0048, 0x918c, 0x7fff, 0x00be,</div><div class='del'>-	0x007e, 0x005e, 0x004e, 0x9085, 0x0001, 0x0005, 0x918c, 0x7fff,</div><div class='del'>-	0x00be, 0x007e, 0x005e, 0x004e, 0x9006, 0x0005, 0x0006, 0x2001,</div><div class='del'>-	0x00a0, 0x8001, 0xa001, 0xa001, 0xa001, 0x1dd8, 0x000e, 0x0005,</div><div class='del'>-	0x0006, 0x2001, 0x00f8, 0x8001, 0xa001, 0xa001, 0xa001, 0x1dd8,</div><div class='del'>-	0x000e, 0x0005, 0x0006, 0x2001, 0x00e8, 0x8001, 0xa001, 0xa001,</div><div class='del'>-	0xa001, 0x1dd8, 0x000e, 0x0005, 0x2071, 0x1910, 0x7003, 0x0001,</div><div class='del'>-	0x7007, 0x0000, 0x9006, 0x7012, 0x7016, 0x701a, 0x701e, 0x700a,</div><div class='del'>-	0x7046, 0x2001, 0x1922, 0x2003, 0x0000, 0x0005, 0x0016, 0x00e6,</div><div class='del'>-	0x2071, 0x1948, 0x900e, 0x710a, 0x080c, 0x57d5, 0xd0fc, 0x1140,</div><div class='del'>-	0x080c, 0x57d5, 0x900e, 0xd09c, 0x0108, 0x8108, 0x7102, 0x0470,</div><div class='del'>-	0x2001, 0x1867, 0x200c, 0x9184, 0x0007, 0x0006, 0x2001, 0x180d,</div><div class='del'>-	0x2004, 0xd08c, 0x000e, 0x0108, 0x9006, 0x0002, 0x6b98, 0x6b98,</div><div class='del'>-	0x6b98, 0x6b98, 0x6b98, 0x6bb6, 0x6bcb, 0x6bd9, 0x7003, 0x0003,</div><div class='del'>-	0x2009, 0x1868, 0x210c, 0x9184, 0xff00, 0x908e, 0xff00, 0x0140,</div><div class='del'>-	0x8007, 0x9005, 0x1110, 0x2001, 0x0002, 0x8003, 0x7006, 0x0030,</div><div class='del'>-	0x7007, 0x0001, 0x0018, 0x7003, 0x0005, 0x0c50, 0x2071, 0x1910,</div><div class='del'>-	0x704f, 0x0000, 0x2071, 0x1800, 0x70f3, 0x0001, 0x00ee, 0x001e,</div><div class='del'>-	0x0005, 0x7003, 0x0000, 0x2071, 0x1910, 0x2009, 0x1868, 0x210c,</div><div class='del'>-	0x9184, 0x7f00, 0x8007, 0x908c, 0x000f, 0x0160, 0x714e, 0x8004,</div><div class='del'>-	0x8004, 0x8004, 0x8004, 0x2071, 0x1800, 0x908c, 0x0007, 0x0128,</div><div class='del'>-	0x70f2, 0x0c20, 0x704f, 0x000f, 0x0c90, 0x70f3, 0x0005, 0x08f0,</div><div class='del'>-	0x00e6, 0x2071, 0x0050, 0x684c, 0x9005, 0x1150, 0x00e6, 0x2071,</div><div class='del'>-	0x1910, 0x7028, 0xc085, 0x702a, 0x00ee, 0x9085, 0x0001, 0x0488,</div><div class='del'>-	0x6844, 0x9005, 0x0158, 0x080c, 0x79a4, 0x6a60, 0x9200, 0x7002,</div><div class='del'>-	0x6864, 0x9101, 0x7006, 0x9006, 0x7012, 0x7016, 0x6860, 0x7002,</div><div class='del'>-	0x6864, 0x7006, 0x6868, 0x700a, 0x686c, 0x700e, 0x6844, 0x9005,</div><div class='del'>-	0x1110, 0x7012, 0x7016, 0x684c, 0x701a, 0x701c, 0x9085, 0x0040,</div><div class='del'>-	0x701e, 0x7037, 0x0019, 0x702b, 0x0001, 0x00e6, 0x2071, 0x1910,</div><div class='del'>-	0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0x700b, 0x0000, 0x00ee,</div><div class='del'>-	0x9006, 0x00ee, 0x0005, 0x00e6, 0x0026, 0x2071, 0x1948, 0x7000,</div><div class='del'>-	0x9015, 0x0904, 0x6ea5, 0x9286, 0x0003, 0x0904, 0x6d3e, 0x9286,</div><div class='del'>-	0x0005, 0x0904, 0x6d3e, 0x2071, 0x1877, 0xa87c, 0x9005, 0x0904,</div><div class='del'>-	0x6c99, 0x7140, 0xa868, 0x9102, 0x0a04, 0x6ea5, 0xa878, 0xd084,</div><div class='del'>-	0x15d8, 0xa853, 0x0019, 0x2001, 0x8023, 0xa84e, 0x2071, 0x1910,</div><div class='del'>-	0x701c, 0x9005, 0x1904, 0x7073, 0x0e04, 0x70e1, 0x2071, 0x0000,</div><div class='del'>-	0xa850, 0x7032, 0xa84c, 0x7082, 0xa870, 0x7086, 0xa86c, 0x708a,</div><div class='del'>-	0xa880, 0x708e, 0x7036, 0x0146, 0x01d6, 0x0136, 0x01c6, 0x0156,</div><div class='del'>-	0x20e9, 0x0000, 0x20a1, 0x002a, 0xa868, 0x20a8, 0xa860, 0x20e0,</div><div class='del'>-	0xa85c, 0x9080, 0x0021, 0x2098, 0x4003, 0x015e, 0x01ce, 0x013e,</div><div class='del'>-	0x01de, 0x014e, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084,</div><div class='del'>-	0x190c, 0x11aa, 0x0804, 0x6d21, 0xa853, 0x001b, 0x2001, 0x8027,</div><div class='del'>-	0x0820, 0x7004, 0xd08c, 0x1904, 0x6ea5, 0xa853, 0x001a, 0x2001,</div><div class='del'>-	0x8024, 0x0804, 0x6c5d, 0x00e6, 0x0026, 0x2071, 0x1948, 0x7000,</div><div class='del'>-	0x9015, 0x0904, 0x6ea5, 0x9286, 0x0003, 0x0904, 0x6d3e, 0x9286,</div><div class='del'>-	0x0005, 0x0904, 0x6d3e, 0xa84f, 0x8022, 0xa853, 0x0018, 0x0804,</div><div class='del'>-	0x6d06, 0xa868, 0xd0fc, 0x1508, 0x00e6, 0x0026, 0x2001, 0x1948,</div><div class='del'>-	0x2004, 0x9015, 0x0904, 0x6ea5, 0xa978, 0xa874, 0x9105, 0x1904,</div><div class='del'>-	0x6ea5, 0x9286, 0x0003, 0x0904, 0x6d3e, 0x9286, 0x0005, 0x0904,</div><div class='del'>-	0x6d3e, 0xa87c, 0xd0bc, 0x1904, 0x6ea5, 0x2200, 0x0002, 0x6ea5,</div><div class='del'>-	0x6d02, 0x6d3e, 0x6d3e, 0x6ea5, 0x6d3e, 0x0005, 0xa868, 0xd0fc,</div><div class='del'>-	0x1500, 0x00e6, 0x0026, 0x2009, 0x1948, 0x210c, 0x81ff, 0x0904,</div><div class='del'>-	0x6ea5, 0xa880, 0x9084, 0x00ff, 0x9086, 0x0001, 0x1904, 0x6ea5,</div><div class='del'>-	0x9186, 0x0003, 0x0904, 0x6d3e, 0x9186, 0x0005, 0x0904, 0x6d3e,</div><div class='del'>-	0xa87c, 0xd0cc, 0x0904, 0x6ea5, 0xa84f, 0x8021, 0xa853, 0x0017,</div><div class='del'>-	0x0028, 0x0005, 0xa84f, 0x8020, 0xa853, 0x0016, 0x2071, 0x1910,</div><div class='del'>-	0x701c, 0x9005, 0x1904, 0x7073, 0x0e04, 0x70e1, 0x2071, 0x0000,</div><div class='del'>-	0xa84c, 0x7082, 0xa850, 0x7032, 0xa86c, 0x7086, 0x7036, 0xa870,</div><div class='del'>-	0x708a, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,</div><div class='del'>-	0x11aa, 0x2071, 0x1800, 0x2011, 0x0001, 0xa804, 0x900d, 0x702c,</div><div class='del'>-	0x1158, 0xa802, 0x2900, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c,</div><div class='del'>-	0x8725, 0x002e, 0x00ee, 0x0005, 0x0096, 0x2148, 0xa904, 0xa802,</div><div class='del'>-	0x8210, 0x2900, 0x81ff, 0x1dc8, 0x009e, 0x0c58, 0xa84f, 0x0000,</div><div class='del'>-	0x00f6, 0x2079, 0x0050, 0x2071, 0x1910, 0xa803, 0x0000, 0x7010,</div><div class='del'>-	0x9005, 0x1904, 0x6e29, 0x782c, 0x908c, 0x0780, 0x190c, 0x722f,</div><div class='del'>-	0x8004, 0x8004, 0x8004, 0x9084, 0x0003, 0x0002, 0x6d5c, 0x6e29,</div><div class='del'>-	0x6d80, 0x6dc6, 0x080c, 0x0dc5, 0x2071, 0x1800, 0x2900, 0x7822,</div><div class='del'>-	0xa804, 0x900d, 0x1168, 0x2071, 0x19fb, 0x7044, 0x9005, 0x1320,</div><div class='del'>-	0x2001, 0x1949, 0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005,</div><div class='del'>-	0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff,</div><div class='del'>-	0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725, 0x0c18,</div><div class='del'>-	0x2071, 0x1800, 0x2900, 0x7822, 0xa804, 0x900d, 0x1578, 0x7824,</div><div class='del'>-	0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c, 0x1148, 0x2009, 0x1830,</div><div class='del'>-	0x210c, 0x918a, 0x0020, 0x0218, 0x7022, 0x00ee, 0x0058, 0x00ee,</div><div class='del'>-	0x2048, 0x702c, 0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2,</div><div class='del'>-	0x080c, 0x8725, 0x782c, 0x9094, 0x0780, 0x190c, 0x722f, 0xd0a4,</div><div class='del'>-	0x19f0, 0x2071, 0x19fb, 0x7044, 0x9005, 0x1320, 0x2001, 0x1949,</div><div class='del'>-	0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016, 0x702c,</div><div class='del'>-	0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e,</div><div class='del'>-	0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725, 0x0808, 0x0096, 0x00e6,</div><div class='del'>-	0x7824, 0x2048, 0x2071, 0x1800, 0x702c, 0xa802, 0x2900, 0x702e,</div><div class='del'>-	0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x722f, 0xd0a4, 0x1d60, 0x00ee, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x722f, 0xd09c, 0x1198, 0x009e, 0x2900, 0x7822, 0xa804,</div><div class='del'>-	0x900d, 0x1550, 0x2071, 0x19fb, 0x7044, 0x9005, 0x1320, 0x2001,</div><div class='del'>-	0x1949, 0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x009e,</div><div class='del'>-	0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110,</div><div class='del'>-	0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1168, 0x2071,</div><div class='del'>-	0x19fb, 0x7044, 0x9005, 0x1320, 0x2001, 0x1949, 0x2004, 0x7046,</div><div class='del'>-	0x00fe, 0x002e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x9016, 0x702c,</div><div class='del'>-	0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e,</div><div class='del'>-	0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725, 0x00fe, 0x002e, 0x00ee,</div><div class='del'>-	0x0005, 0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a,</div><div class='del'>-	0x0110, 0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1904,</div><div class='del'>-	0x6e7d, 0x782c, 0x9094, 0x0780, 0x190c, 0x722f, 0xd09c, 0x1198,</div><div class='del'>-	0x701c, 0x904d, 0x0180, 0x7010, 0x8001, 0x7012, 0x1108, 0x701a,</div><div class='del'>-	0xa800, 0x701e, 0x2900, 0x7822, 0x782c, 0x9094, 0x0780, 0x190c,</div><div class='del'>-	0x722f, 0xd09c, 0x0d68, 0x782c, 0x9094, 0x0780, 0x190c, 0x722f,</div><div class='del'>-	0xd0a4, 0x01b0, 0x00e6, 0x7824, 0x2048, 0x2071, 0x1800, 0x702c,</div><div class='del'>-	0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725,</div><div class='del'>-	0x782c, 0x9094, 0x0780, 0x190c, 0x722f, 0xd0a4, 0x1d60, 0x00ee,</div><div class='del'>-	0x2071, 0x19fb, 0x7044, 0x9005, 0x1320, 0x2001, 0x1949, 0x2004,</div><div class='del'>-	0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x00e6, 0x2071, 0x1800,</div><div class='del'>-	0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff,</div><div class='del'>-	0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725, 0x00ee,</div><div class='del'>-	0x0804, 0x6e39, 0xa868, 0xd0fc, 0x1904, 0x6ef3, 0x0096, 0xa804,</div><div class='del'>-	0xa807, 0x0000, 0x904d, 0x190c, 0x0fc0, 0x009e, 0x0020, 0xa868,</div><div class='del'>-	0xd0fc, 0x1904, 0x6ef3, 0x00e6, 0x0026, 0xa84f, 0x0000, 0x00f6,</div><div class='del'>-	0x2079, 0x0050, 0x2071, 0x1800, 0x70ec, 0x8001, 0x0558, 0x1a04,</div><div class='del'>-	0x6ef0, 0x2071, 0x1910, 0xa803, 0x0000, 0xa864, 0x9084, 0x00ff,</div><div class='del'>-	0x908e, 0x0016, 0x01a8, 0x7010, 0x9005, 0x1904, 0x6fef, 0x782c,</div><div class='del'>-	0x908c, 0x0780, 0x190c, 0x722f, 0x8004, 0x8004, 0x8004, 0x9084,</div><div class='del'>-	0x0003, 0x0002, 0x6ef4, 0x6fef, 0x6f0f, 0x6f80, 0x080c, 0x0dc5,</div><div class='del'>-	0x2009, 0x1948, 0x2104, 0x0002, 0x6ebb, 0x6ebb, 0x6ebb, 0x6d47,</div><div class='del'>-	0x6ebb, 0x6d47, 0x70ef, 0x0fa0, 0x71e8, 0x8107, 0x9106, 0x9094,</div><div class='del'>-	0x00c0, 0x9184, 0xff3f, 0x9205, 0x70ea, 0x3b08, 0x3a00, 0x9104,</div><div class='del'>-	0x918d, 0x00c0, 0x21d8, 0x9084, 0xff3f, 0x9205, 0x20d0, 0x0808,</div><div class='del'>-	0x70ee, 0x0804, 0x6eb1, 0x0005, 0x2071, 0x1800, 0x2900, 0x7822,</div><div class='del'>-	0xa804, 0x900d, 0x1120, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016,</div><div class='del'>-	0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8,</div><div class='del'>-	0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725, 0x0c60, 0x2071,</div><div class='del'>-	0x1800, 0x2900, 0x7822, 0xa804, 0x900d, 0x1904, 0x6f6f, 0x7830,</div><div class='del'>-	0x8007, 0x908c, 0x001f, 0x70f0, 0x9102, 0x1220, 0x00fe, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x7824, 0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c,</div><div class='del'>-	0x1148, 0x2009, 0x1830, 0x210c, 0x918a, 0x0020, 0x0218, 0x7022,</div><div class='del'>-	0x00ee, 0x0058, 0x00ee, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e,</div><div class='del'>-	0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x722f, 0xd0a4, 0x19f0, 0x0e04, 0x6f66, 0x7838, 0x7938,</div><div class='del'>-	0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013,</div><div class='del'>-	0x00de, 0x2001, 0x1921, 0x200c, 0xc184, 0x2102, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x2001, 0x1922,</div><div class='del'>-	0x2003, 0x0000, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x2001, 0x1921,</div><div class='del'>-	0x200c, 0xc185, 0x2102, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016,</div><div class='del'>-	0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8,</div><div class='del'>-	0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725, 0x0804, 0x6f22,</div><div class='del'>-	0x0096, 0x00e6, 0x7824, 0x2048, 0x2071, 0x1800, 0x702c, 0xa802,</div><div class='del'>-	0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725, 0x782c,</div><div class='del'>-	0x9094, 0x0780, 0x190c, 0x722f, 0xd0a4, 0x1d60, 0x00ee, 0x0e04,</div><div class='del'>-	0x6fc2, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000,</div><div class='del'>-	0x6836, 0x6833, 0x0013, 0x00de, 0x7044, 0xc084, 0x7046, 0x2091,</div><div class='del'>-	0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x704b,</div><div class='del'>-	0x0000, 0x782c, 0x9094, 0x0780, 0x190c, 0x722f, 0xd09c, 0x1170,</div><div class='del'>-	0x009e, 0x2900, 0x7822, 0xa804, 0x900d, 0x11e0, 0x00fe, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x7044, 0xc085, 0x7046, 0x0c58, 0x009e, 0x2908,</div><div class='del'>-	0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902,</div><div class='del'>-	0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1120, 0x00fe, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904,</div><div class='del'>-	0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200,</div><div class='del'>-	0x70c2, 0x080c, 0x8725, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x2908,</div><div class='del'>-	0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902,</div><div class='del'>-	0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1904, 0x705e, 0x782c,</div><div class='del'>-	0x9094, 0x0780, 0x190c, 0x722f, 0xd09c, 0x11b0, 0x701c, 0x904d,</div><div class='del'>-	0x0198, 0xa84c, 0x9005, 0x1180, 0x7010, 0x8001, 0x7012, 0x1108,</div><div class='del'>-	0x701a, 0xa800, 0x701e, 0x2900, 0x7822, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x722f, 0xd09c, 0x0d50, 0x782c, 0x9094, 0x0780, 0x190c,</div><div class='del'>-	0x722f, 0xd0a4, 0x05b8, 0x00e6, 0x7824, 0x2048, 0x2071, 0x1800,</div><div class='del'>-	0x702c, 0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c,</div><div class='del'>-	0x8725, 0x782c, 0x9094, 0x0780, 0x190c, 0x722f, 0xd0a4, 0x1d60,</div><div class='del'>-	0x00ee, 0x0e04, 0x7057, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6,</div><div class='del'>-	0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x7044, 0xc084,</div><div class='del'>-	0x7046, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,</div><div class='del'>-	0x11aa, 0x704b, 0x0000, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x7044,</div><div class='del'>-	0xc085, 0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x1800, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900,</div><div class='del'>-	0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725,</div><div class='del'>-	0x00ee, 0x0804, 0x6fff, 0x2071, 0x1910, 0xa803, 0x0000, 0x2908,</div><div class='del'>-	0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902,</div><div class='del'>-	0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1128, 0x1e04, 0x709e,</div><div class='del'>-	0x002e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148,</div><div class='del'>-	0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0,</div><div class='del'>-	0x9200, 0x70c2, 0x080c, 0x8725, 0x0e04, 0x7088, 0x2071, 0x1910,</div><div class='del'>-	0x701c, 0x2048, 0xa84c, 0x900d, 0x0d18, 0x2071, 0x0000, 0x7182,</div><div class='del'>-	0xa850, 0x7032, 0xa86c, 0x7086, 0x7036, 0xa870, 0x708a, 0xa850,</div><div class='del'>-	0x9082, 0x0019, 0x1278, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,</div><div class='del'>-	0xd084, 0x190c, 0x11aa, 0x2071, 0x1910, 0x080c, 0x721b, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0xa850, 0x9082, 0x001c, 0x1e68, 0xa880, 0x708e,</div><div class='del'>-	0x7036, 0x0146, 0x01d6, 0x0136, 0x01c6, 0x0156, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x002a, 0xa868, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x0021, 0x2098, 0x4003, 0x015e, 0x01ce, 0x013e, 0x01de, 0x014e,</div><div class='del'>-	0x0890, 0x2071, 0x1910, 0xa803, 0x0000, 0x2908, 0x7010, 0x8000,</div><div class='del'>-	0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008, 0x711e,</div><div class='del'>-	0x2148, 0xa804, 0x900d, 0x1118, 0x002e, 0x00ee, 0x0005, 0x2071,</div><div class='del'>-	0x1800, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900,</div><div class='del'>-	0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8725,</div><div class='del'>-	0x002e, 0x00ee, 0x0005, 0x0006, 0xa87c, 0x0006, 0xa867, 0x0103,</div><div class='del'>-	0x20a9, 0x001c, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x001d, 0x20a0,</div><div class='del'>-	0x9006, 0x4004, 0x000e, 0x9084, 0x00ff, 0xa87e, 0x000e, 0xa87a,</div><div class='del'>-	0xa982, 0x0005, 0x2071, 0x1910, 0x7004, 0x0002, 0x712e, 0x712f,</div><div class='del'>-	0x721a, 0x712f, 0x712c, 0x721a, 0x080c, 0x0dc5, 0x0005, 0x2001,</div><div class='del'>-	0x1948, 0x2004, 0x0002, 0x7139, 0x7139, 0x71b3, 0x71b4, 0x7139,</div><div class='del'>-	0x71b4, 0x0126, 0x2091, 0x8000, 0x1e0c, 0x723a, 0x701c, 0x904d,</div><div class='del'>-	0x0508, 0xa84c, 0x9005, 0x0904, 0x7184, 0x0e04, 0x7162, 0xa94c,</div><div class='del'>-	0x2071, 0x0000, 0x7182, 0xa850, 0x7032, 0xa86c, 0x7086, 0x7036,</div><div class='del'>-	0xa870, 0x708a, 0xa850, 0x9082, 0x0019, 0x1278, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x2071, 0x1910,</div><div class='del'>-	0x080c, 0x721b, 0x012e, 0x0804, 0x71b2, 0xa850, 0x9082, 0x001c,</div><div class='del'>-	0x1e68, 0xa880, 0x708e, 0x7036, 0x0146, 0x01d6, 0x0136, 0x01c6,</div><div class='del'>-	0x0156, 0x20e9, 0x0000, 0x20a1, 0x002a, 0xa868, 0x20a8, 0xa860,</div><div class='del'>-	0x20e0, 0xa85c, 0x9080, 0x0021, 0x2098, 0x4003, 0x015e, 0x01ce,</div><div class='del'>-	0x013e, 0x01de, 0x014e, 0x0890, 0x2001, 0x005b, 0x2004, 0x9094,</div><div class='del'>-	0x0780, 0x190c, 0x722f, 0xd09c, 0x2071, 0x1910, 0x1510, 0x2071,</div><div class='del'>-	0x1910, 0x700f, 0x0001, 0xa964, 0x9184, 0x00ff, 0x9086, 0x0003,</div><div class='del'>-	0x1130, 0x810f, 0x918c, 0x00ff, 0x8101, 0x0108, 0x710e, 0x2900,</div><div class='del'>-	0x00d6, 0x2069, 0x0050, 0x6822, 0x00de, 0x2071, 0x1910, 0x701c,</div><div class='del'>-	0x2048, 0x7010, 0x8001, 0x7012, 0xa800, 0x701e, 0x9005, 0x1108,</div><div class='del'>-	0x701a, 0x012e, 0x0005, 0x0005, 0x00d6, 0x2008, 0x2069, 0x19fb,</div><div class='del'>-	0x6844, 0x9005, 0x0760, 0x0158, 0x9186, 0x0003, 0x0540, 0x2001,</div><div class='del'>-	0x1815, 0x2004, 0x2009, 0x1ad1, 0x210c, 0x9102, 0x1500, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2069, 0x0050, 0x693c, 0x6838, 0x9106, 0x0190,</div><div class='del'>-	0x0e04, 0x71e6, 0x2069, 0x0000, 0x6837, 0x8040, 0x6833, 0x0012,</div><div class='del'>-	0x6883, 0x8040, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084,</div><div class='del'>-	0x190c, 0x11aa, 0x2069, 0x19fb, 0x6847, 0xffff, 0x012e, 0x00de,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x1e0c, 0x72a5, 0x701c, 0x904d, 0x0540,</div><div class='del'>-	0x2001, 0x005b, 0x2004, 0x9094, 0x0780, 0x15c9, 0xd09c, 0x1500,</div><div class='del'>-	0x2071, 0x1910, 0x700f, 0x0001, 0xa964, 0x9184, 0x00ff, 0x9086,</div><div class='del'>-	0x0003, 0x1130, 0x810f, 0x918c, 0x00ff, 0x8101, 0x0108, 0x710e,</div><div class='del'>-	0x2900, 0x00d6, 0x2069, 0x0050, 0x6822, 0x00de, 0x701c, 0x2048,</div><div class='del'>-	0x7010, 0x8001, 0x7012, 0xa800, 0x701e, 0x9005, 0x1108, 0x701a,</div><div class='del'>-	0x012e, 0x0005, 0x0005, 0x0126, 0x2091, 0x8000, 0x701c, 0x904d,</div><div class='del'>-	0x0160, 0x7010, 0x8001, 0x7012, 0xa800, 0x701e, 0x9005, 0x1108,</div><div class='del'>-	0x701a, 0x012e, 0x080c, 0x1040, 0x0005, 0x012e, 0x0005, 0x2091,</div><div class='del'>-	0x8000, 0x0e04, 0x7231, 0x0006, 0x0016, 0x2001, 0x8004, 0x0006,</div><div class='del'>-	0x0804, 0x0dce, 0x0096, 0x00f6, 0x2079, 0x0050, 0x7044, 0xd084,</div><div class='del'>-	0x01d0, 0xc084, 0x7046, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6,</div><div class='del'>-	0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x704b, 0x0000,</div><div class='del'>-	0x00fe, 0x009e, 0x0005, 0x782c, 0x9094, 0x0780, 0x1981, 0xd0a4,</div><div class='del'>-	0x0db8, 0x7148, 0x704c, 0x8108, 0x714a, 0x9102, 0x0e88, 0x00e6,</div><div class='del'>-	0x2071, 0x1800, 0x7824, 0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c,</div><div class='del'>-	0x1148, 0x2009, 0x1830, 0x210c, 0x918a, 0x0020, 0x0218, 0x7022,</div><div class='del'>-	0x00ee, 0x0058, 0x00ee, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e,</div><div class='del'>-	0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x722f, 0xd0a4, 0x19f0, 0x7838, 0x7938, 0x910e, 0x1de0,</div><div class='del'>-	0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x2091,</div><div class='del'>-	0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa, 0x00ee,</div><div class='del'>-	0x704b, 0x0000, 0x00fe, 0x009e, 0x0005, 0x00f6, 0x2079, 0x0050,</div><div class='del'>-	0x7044, 0xd084, 0x01b8, 0xc084, 0x7046, 0x7838, 0x7938, 0x910e,</div><div class='del'>-	0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de,</div><div class='del'>-	0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x11aa,</div><div class='del'>-	0x00fe, 0x0005, 0x782c, 0x9094, 0x0780, 0x190c, 0x722f, 0xd0a4,</div><div class='del'>-	0x0db8, 0x00e6, 0x2071, 0x1800, 0x7824, 0x2048, 0x702c, 0xa802,</div><div class='del'>-	0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c, 0x8725, 0x782c,</div><div class='del'>-	0x9094, 0x0780, 0x190c, 0x722f, 0xd0a4, 0x1d70, 0x00d6, 0x2069,</div><div class='del'>-	0x0050, 0x693c, 0x2069, 0x1948, 0x6808, 0x690a, 0x2069, 0x19fb,</div><div class='del'>-	0x9102, 0x1118, 0x6844, 0x9005, 0x1320, 0x2001, 0x1949, 0x200c,</div><div class='del'>-	0x6946, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x7098, 0x908a, 0x002a,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x9082, 0x001d, 0x001b, 0x6027, 0x1e00, 0x0005,</div><div class='del'>-	0x73e6, 0x7353, 0x736f, 0x7399, 0x73d5, 0x7415, 0x7427, 0x736f,</div><div class='del'>-	0x73fd, 0x730e, 0x733c, 0x73bf, 0x730d, 0x0005, 0x00d6, 0x2069,</div><div class='del'>-	0x0200, 0x6804, 0x9005, 0x1180, 0x6808, 0x9005, 0x1518, 0x709b,</div><div class='del'>-	0x0029, 0x2069, 0x198f, 0x2d04, 0x7002, 0x080c, 0x7774, 0x6028,</div><div class='del'>-	0x9085, 0x0600, 0x602a, 0x00b0, 0x709b, 0x0029, 0x2069, 0x198f,</div><div class='del'>-	0x2d04, 0x7002, 0x6028, 0x9085, 0x0600, 0x602a, 0x00e6, 0x0036,</div><div class='del'>-	0x0046, 0x0056, 0x2071, 0x1a65, 0x080c, 0x1ad9, 0x005e, 0x004e,</div><div class='del'>-	0x003e, 0x00ee, 0x00de, 0x0005, 0x00d6, 0x2069, 0x0200, 0x6804,</div><div class='del'>-	0x9005, 0x1178, 0x6808, 0x9005, 0x1160, 0x709b, 0x0029, 0x2069,</div><div class='del'>-	0x198f, 0x2d04, 0x7002, 0x080c, 0x7818, 0x6028, 0x9085, 0x0600,</div><div class='del'>-	0x602a, 0x00de, 0x0005, 0x0006, 0x2001, 0x0090, 0x080c, 0x2d39,</div><div class='del'>-	0x000e, 0x6124, 0xd1e4, 0x1190, 0x080c, 0x7494, 0xd1d4, 0x1160,</div><div class='del'>-	0xd1dc, 0x1138, 0xd1cc, 0x0150, 0x709b, 0x0020, 0x080c, 0x7494,</div><div class='del'>-	0x0028, 0x709b, 0x001d, 0x0010, 0x709b, 0x001f, 0x0005, 0x2001,</div><div class='del'>-	0x0088, 0x080c, 0x2d39, 0x6124, 0xd1cc, 0x11e8, 0xd1dc, 0x11c0,</div><div class='del'>-	0xd1e4, 0x1198, 0x9184, 0x1e00, 0x11d8, 0x080c, 0x1b06, 0x60e3,</div><div class='del'>-	0x0001, 0x600c, 0xc0b4, 0x600e, 0x080c, 0x7663, 0x2001, 0x0080,</div><div class='del'>-	0x080c, 0x2d39, 0x709b, 0x0029, 0x0058, 0x709b, 0x001e, 0x0040,</div><div class='del'>-	0x709b, 0x001d, 0x0028, 0x709b, 0x0020, 0x0010, 0x709b, 0x001f,</div><div class='del'>-	0x0005, 0x080c, 0x1b06, 0x60e3, 0x0001, 0x600c, 0xc0b4, 0x600e,</div><div class='del'>-	0x080c, 0x7663, 0x2001, 0x0080, 0x080c, 0x2d39, 0x6124, 0xd1d4,</div><div class='del'>-	0x1198, 0xd1dc, 0x1170, 0xd1e4, 0x1148, 0x9184, 0x1e00, 0x1118,</div><div class='del'>-	0x709b, 0x0029, 0x0058, 0x709b, 0x0028, 0x0040, 0x709b, 0x001e,</div><div class='del'>-	0x0028, 0x709b, 0x001d, 0x0010, 0x709b, 0x001f, 0x0005, 0x6124,</div><div class='del'>-	0xd1d4, 0x1180, 0xd1dc, 0x1158, 0xd1e4, 0x1130, 0x9184, 0x1e00,</div><div class='del'>-	0x1158, 0x709b, 0x0029, 0x0040, 0x709b, 0x001e, 0x0028, 0x709b,</div><div class='del'>-	0x001d, 0x0010, 0x709b, 0x001f, 0x0005, 0x2001, 0x00a0, 0x080c,</div><div class='del'>-	0x2d39, 0x6124, 0xd1dc, 0x1138, 0xd1e4, 0x0138, 0x080c, 0x1b06,</div><div class='del'>-	0x709b, 0x001e, 0x0010, 0x709b, 0x001d, 0x0005, 0x080c, 0x7517,</div><div class='del'>-	0x6124, 0xd1dc, 0x1188, 0x080c, 0x7494, 0x0016, 0x080c, 0x1b06,</div><div class='del'>-	0x001e, 0xd1d4, 0x1128, 0xd1e4, 0x0138, 0x709b, 0x001e, 0x0020,</div><div class='del'>-	0x709b, 0x001f, 0x080c, 0x7494, 0x0005, 0x0006, 0x2001, 0x00a0,</div><div class='del'>-	0x080c, 0x2d39, 0x000e, 0x6124, 0xd1d4, 0x1160, 0xd1cc, 0x1150,</div><div class='del'>-	0xd1dc, 0x1128, 0xd1e4, 0x0140, 0x709b, 0x001e, 0x0028, 0x709b,</div><div class='del'>-	0x001d, 0x0010, 0x709b, 0x0021, 0x0005, 0x080c, 0x7517, 0x6124,</div><div class='del'>-	0xd1d4, 0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0140, 0x709b, 0x001e,</div><div class='del'>-	0x0028, 0x709b, 0x001d, 0x0010, 0x709b, 0x001f, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x0090, 0x080c, 0x2d39, 0x000e, 0x6124, 0xd1d4, 0x1178,</div><div class='del'>-	0xd1cc, 0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0158, 0x709b, 0x001e,</div><div class='del'>-	0x0040, 0x709b, 0x001d, 0x0028, 0x709b, 0x0020, 0x0010, 0x709b,</div><div class='del'>-	0x001f, 0x0005, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x0126, 0x2061,</div><div class='del'>-	0x0100, 0x2069, 0x0140, 0x2071, 0x1800, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x7637, 0x11d8, 0x2001, 0x180c, 0x200c, 0xd1b4, 0x01b0, 0xc1b4,</div><div class='del'>-	0x2102, 0x6027, 0x0200, 0x080c, 0x2c61, 0x6024, 0xd0cc, 0x0148,</div><div class='del'>-	0x2001, 0x00a0, 0x080c, 0x2d39, 0x080c, 0x7932, 0x080c, 0x612e,</div><div class='del'>-	0x0428, 0x6028, 0xc0cd, 0x602a, 0x0408, 0x080c, 0x7651, 0x0150,</div><div class='del'>-	0x080c, 0x7648, 0x1138, 0x2001, 0x0001, 0x080c, 0x281c, 0x080c,</div><div class='del'>-	0x760f, 0x00a0, 0x080c, 0x7514, 0x0178, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x281c, 0x7098, 0x9086, 0x001e, 0x0120, 0x7098, 0x9086, 0x0022,</div><div class='del'>-	0x1118, 0x709b, 0x0025, 0x0010, 0x709b, 0x0021, 0x012e, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x001e, 0x0005, 0x0026, 0x2011, 0x74a5, 0x080c,</div><div class='del'>-	0x8917, 0x002e, 0x0016, 0x0026, 0x2009, 0x0064, 0x2011, 0x74a5,</div><div class='del'>-	0x080c, 0x890e, 0x002e, 0x001e, 0x0005, 0x00e6, 0x00f6, 0x0016,</div><div class='del'>-	0x080c, 0xa6e9, 0x2071, 0x1800, 0x080c, 0x7442, 0x001e, 0x00fe,</div><div class='del'>-	0x00ee, 0x0005, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x0126, 0x2071, 0x1800, 0x080c, 0xa6e9, 0x2061, 0x0100,</div><div class='del'>-	0x2069, 0x0140, 0x2091, 0x8000, 0x6028, 0xc09c, 0x602a, 0x2011,</div><div class='del'>-	0x0003, 0x080c, 0xaabf, 0x2011, 0x0002, 0x080c, 0xaac9, 0x080c,</div><div class='del'>-	0xa9d3, 0x080c, 0x88c3, 0x0036, 0x901e, 0x080c, 0xaa49, 0x003e,</div><div class='del'>-	0x60e3, 0x0000, 0x080c, 0xf07f, 0x080c, 0xf09a, 0x2009, 0x0004,</div><div class='del'>-	0x080c, 0x2c67, 0x080c, 0x2b82, 0x2001, 0x1800, 0x2003, 0x0004,</div><div class='del'>-	0x6027, 0x0008, 0x2011, 0x74a5, 0x080c, 0x8917, 0x080c, 0x7651,</div><div class='del'>-	0x0118, 0x9006, 0x080c, 0x2d39, 0x080c, 0x0ba0, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x281c, 0x012e, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0026, 0x00e6, 0x2011, 0x74b2, 0x2071,</div><div class='del'>-	0x19fb, 0x701c, 0x9206, 0x1118, 0x7018, 0x9005, 0x0110, 0x9085,</div><div class='del'>-	0x0001, 0x00ee, 0x002e, 0x0005, 0x6020, 0xd09c, 0x0005, 0x6800,</div><div class='del'>-	0x9084, 0xfffe, 0x9086, 0x00c0, 0x01b8, 0x2001, 0x00c0, 0x080c,</div><div class='del'>-	0x2d39, 0x0156, 0x20a9, 0x002d, 0x1d04, 0x7524, 0x2091, 0x6000,</div><div class='del'>-	0x1f04, 0x7524, 0x015e, 0x00d6, 0x2069, 0x1800, 0x689c, 0x8001,</div><div class='del'>-	0x0220, 0x0118, 0x689e, 0x00de, 0x0005, 0x689f, 0x0014, 0x68e8,</div><div class='del'>-	0xd0dc, 0x0dc8, 0x6800, 0x9086, 0x0001, 0x1da8, 0x080c, 0x8923,</div><div class='del'>-	0x0c90, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140,</div><div class='del'>-	0x2071, 0x1800, 0x080c, 0x7941, 0x2001, 0x196d, 0x2003, 0x0000,</div><div class='del'>-	0x9006, 0x709a, 0x60e2, 0x6886, 0x080c, 0x28e7, 0x9006, 0x080c,</div><div class='del'>-	0x2d39, 0x080c, 0x5fed, 0x6027, 0xffff, 0x602b, 0x182f, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x0005, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100,</div><div class='del'>-	0x2069, 0x0140, 0x2071, 0x1800, 0x2001, 0x197d, 0x200c, 0x9186,</div><div class='del'>-	0x0000, 0x0158, 0x9186, 0x0001, 0x0158, 0x9186, 0x0002, 0x0158,</div><div class='del'>-	0x9186, 0x0003, 0x0158, 0x0804, 0x75ff, 0x709b, 0x0022, 0x0040,</div><div class='del'>-	0x709b, 0x0021, 0x0028, 0x709b, 0x0023, 0x0010, 0x709b, 0x0024,</div><div class='del'>-	0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001, 0x080c, 0x28e7,</div><div class='del'>-	0x0026, 0x080c, 0xb244, 0x002e, 0x7000, 0x908e, 0x0004, 0x0118,</div><div class='del'>-	0x602b, 0x0028, 0x0010, 0x602b, 0x0020, 0x0156, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x20a9, 0x0005, 0x6024, 0xd0ac, 0x0150, 0x012e, 0x015e,</div><div class='del'>-	0x080c, 0xd7e3, 0x0118, 0x9006, 0x080c, 0x2d63, 0x0804, 0x760b,</div><div class='del'>-	0x6800, 0x9084, 0x00a1, 0xc0bd, 0x6802, 0x080c, 0x2c61, 0x6904,</div><div class='del'>-	0xd1d4, 0x1140, 0x2001, 0x0100, 0x080c, 0x2d39, 0x1f04, 0x75a3,</div><div class='del'>-	0x080c, 0x768b, 0x012e, 0x015e, 0x080c, 0x7648, 0x01d8, 0x6044,</div><div class='del'>-	0x9005, 0x0198, 0x2011, 0x0114, 0x2204, 0x9085, 0x0100, 0x2012,</div><div class='del'>-	0x6050, 0x0006, 0x9085, 0x0020, 0x6052, 0x080c, 0x768b, 0x9006,</div><div class='del'>-	0x8001, 0x1df0, 0x000e, 0x6052, 0x0028, 0x6804, 0xd0d4, 0x1110,</div><div class='del'>-	0x080c, 0x768b, 0x080c, 0xd7e3, 0x0118, 0x9006, 0x080c, 0x2d63,</div><div class='del'>-	0x0016, 0x0026, 0x7000, 0x908e, 0x0004, 0x0130, 0x2009, 0x00c8,</div><div class='del'>-	0x2011, 0x74b2, 0x080c, 0x88d5, 0x002e, 0x001e, 0x080c, 0x871c,</div><div class='del'>-	0x7034, 0xc085, 0x7036, 0x2001, 0x197d, 0x2003, 0x0004, 0x080c,</div><div class='del'>-	0x72f5, 0x080c, 0x7648, 0x0138, 0x6804, 0xd0d4, 0x1120, 0xd0dc,</div><div class='del'>-	0x1100, 0x080c, 0x7937, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071, 0x1800,</div><div class='del'>-	0x080c, 0x8733, 0x080c, 0x8725, 0x080c, 0x7941, 0x2001, 0x196d,</div><div class='del'>-	0x2003, 0x0000, 0x9006, 0x709a, 0x60e2, 0x6886, 0x080c, 0x28e7,</div><div class='del'>-	0x9006, 0x080c, 0x2d39, 0x6043, 0x0090, 0x6043, 0x0010, 0x6027,</div><div class='del'>-	0xffff, 0x602b, 0x182f, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x197c, 0x2004, 0x9086, 0xaaaa, 0x000e, 0x0005, 0x0006,</div><div class='del'>-	0x080c, 0x57d9, 0x9084, 0x0030, 0x9086, 0x0000, 0x000e, 0x0005,</div><div class='del'>-	0x0006, 0x080c, 0x57d9, 0x9084, 0x0030, 0x9086, 0x0030, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x080c, 0x57d9, 0x9084, 0x0030, 0x9086, 0x0010,</div><div class='del'>-	0x000e, 0x0005, 0x0006, 0x080c, 0x57d9, 0x9084, 0x0030, 0x9086,</div><div class='del'>-	0x0020, 0x000e, 0x0005, 0x0036, 0x0016, 0x2001, 0x180c, 0x2004,</div><div class='del'>-	0x908c, 0x0013, 0x0168, 0x0020, 0x080c, 0x2907, 0x900e, 0x0010,</div><div class='del'>-	0x2009, 0x0002, 0x2019, 0x0028, 0x080c, 0x321b, 0x9006, 0x0019,</div><div class='del'>-	0x001e, 0x003e, 0x0005, 0x00e6, 0x2071, 0x180c, 0x2e04, 0x0130,</div><div class='del'>-	0x080c, 0xd7dc, 0x1128, 0x9085, 0x0010, 0x0010, 0x9084, 0xffef,</div><div class='del'>-	0x2072, 0x00ee, 0x0005, 0x6050, 0x0006, 0x60ec, 0x0006, 0x600c,</div><div class='del'>-	0x0006, 0x6004, 0x0006, 0x6028, 0x0006, 0x0016, 0x6138, 0x6050,</div><div class='del'>-	0x9084, 0xfbff, 0x9085, 0x2000, 0x6052, 0x613a, 0x20a9, 0x0012,</div><div class='del'>-	0x1d04, 0x76a0, 0x2091, 0x6000, 0x1f04, 0x76a0, 0x602f, 0x0100,</div><div class='del'>-	0x602f, 0x0000, 0x6050, 0x9085, 0x0400, 0x9084, 0xdfff, 0x6052,</div><div class='del'>-	0x613a, 0x001e, 0x602f, 0x0040, 0x602f, 0x0000, 0x000e, 0x602a,</div><div class='del'>-	0x000e, 0x6006, 0x000e, 0x600e, 0x000e, 0x60ee, 0x60e3, 0x0000,</div><div class='del'>-	0x6887, 0x0001, 0x2001, 0x0001, 0x080c, 0x28e7, 0x2001, 0x00a0,</div><div class='del'>-	0x0006, 0x080c, 0xd7e3, 0x000e, 0x0130, 0x080c, 0x2d57, 0x9006,</div><div class='del'>-	0x080c, 0x2d63, 0x0010, 0x080c, 0x2d39, 0x000e, 0x6052, 0x6050,</div><div class='del'>-	0x0006, 0xc0e5, 0x6052, 0x00f6, 0x2079, 0x0100, 0x080c, 0x2bd6,</div><div class='del'>-	0x00fe, 0x000e, 0x6052, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071,</div><div class='del'>-	0x1800, 0x6020, 0x9084, 0x0080, 0x0138, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0xc1c5, 0x2102, 0x0804, 0x7766, 0x2001, 0x180c, 0x200c, 0xc1c4,</div><div class='del'>-	0x2102, 0x6028, 0x9084, 0xe1ff, 0x602a, 0x6027, 0x0200, 0x2001,</div><div class='del'>-	0x0090, 0x080c, 0x2d39, 0x20a9, 0x0366, 0x6024, 0xd0cc, 0x1518,</div><div class='del'>-	0x1d04, 0x770d, 0x2091, 0x6000, 0x1f04, 0x770d, 0x2011, 0x0003,</div><div class='del'>-	0x080c, 0xaabf, 0x2011, 0x0002, 0x080c, 0xaac9, 0x080c, 0xa9d3,</div><div class='del'>-	0x901e, 0x080c, 0xaa49, 0x2001, 0x00a0, 0x080c, 0x2d39, 0x080c,</div><div class='del'>-	0x7932, 0x080c, 0x612e, 0x080c, 0xd7e3, 0x0110, 0x080c, 0x0d33,</div><div class='del'>-	0x9085, 0x0001, 0x04c8, 0x080c, 0x1b06, 0x60e3, 0x0000, 0x2001,</div><div class='del'>-	0x180d, 0x2004, 0xd08c, 0x2001, 0x0002, 0x1118, 0x2001, 0x196d,</div><div class='del'>-	0x2004, 0x080c, 0x28e7, 0x60e2, 0x2001, 0x0080, 0x080c, 0x2d39,</div><div class='del'>-	0x20a9, 0x0366, 0x6027, 0x1e00, 0x2009, 0x1e00, 0x080c, 0x2c61,</div><div class='del'>-	0x6024, 0x910c, 0x0140, 0x1d04, 0x774a, 0x2091, 0x6000, 0x1f04,</div><div class='del'>-	0x774a, 0x0804, 0x7716, 0x6028, 0x9085, 0x1e00, 0x602a, 0x70b4,</div><div class='del'>-	0x9005, 0x1118, 0x6887, 0x0001, 0x0008, 0x6886, 0x080c, 0xd7e3,</div><div class='del'>-	0x0110, 0x080c, 0x0d33, 0x9006, 0x00ee, 0x00de, 0x00ce, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2071, 0x1800, 0x7000,</div><div class='del'>-	0x9086, 0x0003, 0x1168, 0x2001, 0x020b, 0x2004, 0x9084, 0x5540,</div><div class='del'>-	0x9086, 0x5540, 0x1128, 0x2069, 0x1a7c, 0x2d04, 0x8000, 0x206a,</div><div class='del'>-	0x2069, 0x0140, 0x6020, 0x9084, 0x00c0, 0x0120, 0x6884, 0x9005,</div><div class='del'>-	0x1904, 0x77d9, 0x2001, 0x0088, 0x080c, 0x2d39, 0x9006, 0x60e2,</div><div class='del'>-	0x6886, 0x080c, 0x28e7, 0x2069, 0x0200, 0x6804, 0x9005, 0x1118,</div><div class='del'>-	0x6808, 0x9005, 0x01c0, 0x6028, 0x9084, 0xfbff, 0x602a, 0x6027,</div><div class='del'>-	0x0400, 0x2069, 0x198f, 0x7000, 0x206a, 0x709b, 0x0026, 0x7003,</div><div class='del'>-	0x0001, 0x20a9, 0x0002, 0x1d04, 0x77bb, 0x2091, 0x6000, 0x1f04,</div><div class='del'>-	0x77bb, 0x0804, 0x7810, 0x2069, 0x0140, 0x20a9, 0x0384, 0x6027,</div><div class='del'>-	0x1e00, 0x2009, 0x1e00, 0x080c, 0x2c61, 0x6024, 0x910c, 0x0508,</div><div class='del'>-	0x9084, 0x1a00, 0x11f0, 0x1d04, 0x77c7, 0x2091, 0x6000, 0x1f04,</div><div class='del'>-	0x77c7, 0x2011, 0x0003, 0x080c, 0xaabf, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0xaac9, 0x080c, 0xa9d3, 0x901e, 0x080c, 0xaa49, 0x2001, 0x00a0,</div><div class='del'>-	0x080c, 0x2d39, 0x080c, 0x7932, 0x080c, 0x612e, 0x9085, 0x0001,</div><div class='del'>-	0x00f8, 0x080c, 0x1b06, 0x2001, 0x0080, 0x080c, 0x2d39, 0x2069,</div><div class='del'>-	0x0140, 0x60e3, 0x0000, 0x70b4, 0x9005, 0x1118, 0x6887, 0x0001,</div><div class='del'>-	0x0008, 0x6886, 0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002,</div><div class='del'>-	0x1118, 0x2001, 0x196d, 0x2004, 0x080c, 0x28e7, 0x60e2, 0x9006,</div><div class='del'>-	0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005,</div><div class='del'>-	0x0156, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0x1800, 0x6020, 0x9084, 0x00c0, 0x01c8, 0x2011,</div><div class='del'>-	0x0003, 0x080c, 0xaabf, 0x2011, 0x0002, 0x080c, 0xaac9, 0x080c,</div><div class='del'>-	0xa9d3, 0x901e, 0x080c, 0xaa49, 0x2069, 0x0140, 0x2001, 0x00a0,</div><div class='del'>-	0x080c, 0x2d39, 0x080c, 0x7932, 0x080c, 0x612e, 0x0804, 0x78b2,</div><div class='del'>-	0x2001, 0x180c, 0x200c, 0xd1b4, 0x1160, 0xc1b5, 0x2102, 0x080c,</div><div class='del'>-	0x749a, 0x2069, 0x0140, 0x2001, 0x0080, 0x080c, 0x2d39, 0x60e3,</div><div class='del'>-	0x0000, 0x2069, 0x0200, 0x6804, 0x9005, 0x1118, 0x6808, 0x9005,</div><div class='del'>-	0x0180, 0x6028, 0x9084, 0xfdff, 0x602a, 0x6027, 0x0200, 0x2069,</div><div class='del'>-	0x198f, 0x7000, 0x206a, 0x709b, 0x0027, 0x7003, 0x0001, 0x0804,</div><div class='del'>-	0x78b2, 0x6027, 0x1e00, 0x2009, 0x1e00, 0x080c, 0x2c61, 0x6024,</div><div class='del'>-	0x910c, 0x01c8, 0x9084, 0x1c00, 0x11b0, 0x1d04, 0x7869, 0x0006,</div><div class='del'>-	0x0016, 0x00c6, 0x00d6, 0x00e6, 0x080c, 0x8776, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x001e, 0x000e, 0x00e6, 0x2071, 0x19fb, 0x7078, 0x00ee,</div><div class='del'>-	0x9005, 0x19f8, 0x0438, 0x0026, 0x2011, 0x74b2, 0x080c, 0x883d,</div><div class='del'>-	0x2011, 0x74a5, 0x080c, 0x8917, 0x002e, 0x2069, 0x0140, 0x60e3,</div><div class='del'>-	0x0000, 0x70b4, 0x9005, 0x1118, 0x6887, 0x0001, 0x0008, 0x6886,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002, 0x1118, 0x2001,</div><div class='del'>-	0x196d, 0x2004, 0x080c, 0x28e7, 0x60e2, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0xc1b4, 0x2102, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036, 0x0046, 0x00c6,</div><div class='del'>-	0x00e6, 0x2061, 0x0100, 0x2071, 0x1800, 0x080c, 0xd7dc, 0x1904,</div><div class='del'>-	0x7920, 0x7130, 0xd184, 0x1170, 0x080c, 0x33aa, 0x0138, 0xc18d,</div><div class='del'>-	0x7132, 0x2011, 0x1848, 0x2214, 0xd2ac, 0x1120, 0x7030, 0xd08c,</div><div class='del'>-	0x0904, 0x7920, 0x2011, 0x1848, 0x220c, 0xd1a4, 0x0538, 0x0016,</div><div class='del'>-	0x2019, 0x000e, 0x080c, 0xeba1, 0x0156, 0x00b6, 0x20a9, 0x007f,</div><div class='del'>-	0x900e, 0x9186, 0x007e, 0x01a0, 0x9186, 0x0080, 0x0188, 0x080c,</div><div class='del'>-	0x6724, 0x1170, 0x2120, 0x9006, 0x0016, 0x2009, 0x000e, 0x080c,</div><div class='del'>-	0xec31, 0x2009, 0x0001, 0x2011, 0x0100, 0x080c, 0x8a50, 0x001e,</div><div class='del'>-	0x8108, 0x1f04, 0x78e9, 0x00be, 0x015e, 0x001e, 0xd1ac, 0x1148,</div><div class='del'>-	0x0016, 0x2009, 0x0002, 0x2019, 0x0004, 0x080c, 0x321b, 0x001e,</div><div class='del'>-	0x0078, 0x0156, 0x00b6, 0x20a9, 0x007f, 0x900e, 0x080c, 0x6724,</div><div class='del'>-	0x1110, 0x080c, 0x6148, 0x8108, 0x1f04, 0x7916, 0x00be, 0x015e,</div><div class='del'>-	0x080c, 0x1b06, 0x080c, 0xb244, 0x60e3, 0x0000, 0x080c, 0x612e,</div><div class='del'>-	0x080c, 0x7563, 0x00ee, 0x00ce, 0x004e, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x015e, 0x0005, 0x2001, 0x197d, 0x2003, 0x0001, 0x0005, 0x2001,</div><div class='del'>-	0x197d, 0x2003, 0x0000, 0x0005, 0x2001, 0x197c, 0x2003, 0xaaaa,</div><div class='del'>-	0x0005, 0x2001, 0x197c, 0x2003, 0x0000, 0x0005, 0x2071, 0x18fa,</div><div class='del'>-	0x7003, 0x0000, 0x7007, 0x0000, 0x080c, 0x1027, 0x090c, 0x0dc5,</div><div class='del'>-	0xa8ab, 0xdcb0, 0x2900, 0x704e, 0x080c, 0x1027, 0x090c, 0x0dc5,</div><div class='del'>-	0xa8ab, 0xdcb0, 0x2900, 0x7052, 0xa867, 0x0000, 0xa86b, 0x0001,</div><div class='del'>-	0xa89f, 0x0000, 0x0005, 0x00e6, 0x2071, 0x0040, 0x6848, 0x9005,</div><div class='del'>-	0x1118, 0x9085, 0x0001, 0x04b0, 0x6840, 0x9005, 0x0150, 0x04a1,</div><div class='del'>-	0x6a50, 0x9200, 0x7002, 0x6854, 0x9101, 0x7006, 0x9006, 0x7012,</div><div class='del'>-	0x7016, 0x6850, 0x7002, 0x6854, 0x7006, 0x6858, 0x700a, 0x685c,</div><div class='del'>-	0x700e, 0x6840, 0x9005, 0x1110, 0x7012, 0x7016, 0x6848, 0x701a,</div><div class='del'>-	0x701c, 0x9085, 0x0040, 0x701e, 0x2001, 0x0019, 0x7036, 0x702b,</div><div class='del'>-	0x0001, 0x2001, 0x0004, 0x200c, 0x918c, 0xfff7, 0x918d, 0x8000,</div><div class='del'>-	0x2102, 0x00d6, 0x2069, 0x18fa, 0x6807, 0x0001, 0x00de, 0x080c,</div><div class='del'>-	0x7f74, 0x9006, 0x00ee, 0x0005, 0x900e, 0x0156, 0x20a9, 0x0006,</div><div class='del'>-	0x8003, 0x2011, 0x0100, 0x2214, 0x9296, 0x0008, 0x1110, 0x818d,</div><div class='del'>-	0x0010, 0x81f5, 0x3e08, 0x1f04, 0x79a8, 0x015e, 0x0005, 0x2079,</div><div class='del'>-	0x0040, 0x2071, 0x18fa, 0x7004, 0x0002, 0x79c7, 0x79c8, 0x7a00,</div><div class='del'>-	0x7a5b, 0x7bbb, 0x79c5, 0x79c5, 0x7be5, 0x080c, 0x0dc5, 0x0005,</div><div class='del'>-	0x2079, 0x0040, 0x782c, 0x908c, 0x0780, 0x190c, 0x8056, 0xd0a4,</div><div class='del'>-	0x01f8, 0x7824, 0x2048, 0x9006, 0xa802, 0xa806, 0xa864, 0x9084,</div><div class='del'>-	0x00ff, 0x908a, 0x0040, 0x0610, 0x00c0, 0x2001, 0x1800, 0x200c,</div><div class='del'>-	0x9186, 0x0003, 0x1168, 0x7004, 0x0002, 0x79f0, 0x79ca, 0x79f0,</div><div class='del'>-	0x79ee, 0x79f0, 0x79f0, 0x79f0, 0x79f0, 0x79f0, 0x080c, 0x7a5b,</div><div class='del'>-	0x782c, 0xd09c, 0x090c, 0x7f74, 0x0005, 0x9082, 0x005a, 0x1218,</div><div class='del'>-	0x2100, 0x003b, 0x0c10, 0x080c, 0x7a91, 0x0c90, 0x00e3, 0x08e8,</div><div class='del'>-	0x0005, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a91, 0x7ab3, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a9d, 0x7a91, 0x7cdb,</div><div class='del'>-	0x7a91, 0x7a91, 0x7a91, 0x7ab3, 0x7a91, 0x7a9d, 0x7d1c, 0x7d5d,</div><div class='del'>-	0x7da4, 0x7db8, 0x7a91, 0x7a91, 0x7ab3, 0x7a9d, 0x7ac7, 0x7a91,</div><div class='del'>-	0x7b8f, 0x7e63, 0x7e7e, 0x7a91, 0x7ab3, 0x7a91, 0x7ac7, 0x7a91,</div><div class='del'>-	0x7a91, 0x7b85, 0x7e7e, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7adb, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7a91, 0x7ffa, 0x7a91,</div><div class='del'>-	0x7fa4, 0x7a91, 0x7fa4, 0x7a91, 0x7af0, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a91, 0x7a91, 0x7a91, 0x2079, 0x0040, 0x7004, 0x9086, 0x0003,</div><div class='del'>-	0x1198, 0x782c, 0x080c, 0x7f9d, 0xd0a4, 0x0170, 0x7824, 0x2048,</div><div class='del'>-	0x9006, 0xa802, 0xa806, 0xa864, 0x9084, 0x00ff, 0x908a, 0x001a,</div><div class='del'>-	0x1210, 0x002b, 0x0c50, 0x00e9, 0x080c, 0x7f74, 0x0005, 0x7a91,</div><div class='del'>-	0x7a9d, 0x7cc7, 0x7a91, 0x7a9d, 0x7a91, 0x7a9d, 0x7a9d, 0x7a91,</div><div class='del'>-	0x7a9d, 0x7cc7, 0x7a9d, 0x7a9d, 0x7a9d, 0x7a9d, 0x7a9d, 0x7a91,</div><div class='del'>-	0x7a9d, 0x7cc7, 0x7a91, 0x7a91, 0x7a9d, 0x7a91, 0x7a91, 0x7a91,</div><div class='del'>-	0x7a9d, 0x00e6, 0x2071, 0x18fa, 0x2009, 0x0400, 0x0071, 0x00ee,</div><div class='del'>-	0x0005, 0x2009, 0x1000, 0x0049, 0x0005, 0x2009, 0x2000, 0x0029,</div><div class='del'>-	0x0005, 0x2009, 0x0800, 0x0009, 0x0005, 0x7007, 0x0001, 0xa868,</div><div class='del'>-	0x9084, 0x00ff, 0x9105, 0xa86a, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x6e9f, 0x012e, 0x0005, 0xa864, 0x8007, 0x9084, 0x00ff, 0x0d08,</div><div class='del'>-	0x8001, 0x1120, 0x7007, 0x0001, 0x0804, 0x7c64, 0x7007, 0x0003,</div><div class='del'>-	0x7012, 0x2900, 0x7016, 0x701a, 0x704b, 0x7c64, 0x0005, 0xa864,</div><div class='del'>-	0x8007, 0x9084, 0x00ff, 0x0968, 0x8001, 0x1120, 0x7007, 0x0001,</div><div class='del'>-	0x0804, 0x7c7f, 0x7007, 0x0003, 0x7012, 0x2900, 0x7016, 0x701a,</div><div class='del'>-	0x704b, 0x7c7f, 0x0005, 0xa864, 0x8007, 0x9084, 0x00ff, 0x0904,</div><div class='del'>-	0x7a99, 0x8001, 0x1120, 0x7007, 0x0001, 0x0804, 0x7c9b, 0x7007,</div><div class='del'>-	0x0003, 0x7012, 0x2900, 0x7016, 0x701a, 0x704b, 0x7c9b, 0x0005,</div><div class='del'>-	0xa864, 0x8007, 0x9084, 0x00ff, 0x9086, 0x0001, 0x1904, 0x7a99,</div><div class='del'>-	0x7007, 0x0001, 0x2009, 0x1834, 0x210c, 0x81ff, 0x1904, 0x7b5c,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x0904, 0x7b47, 0xa99c, 0x9186,</div><div class='del'>-	0x00ff, 0x05e8, 0xa994, 0x9186, 0x006f, 0x0188, 0x9186, 0x0074,</div><div class='del'>-	0x15b0, 0x0026, 0x2011, 0x0010, 0x080c, 0x6ac7, 0x002e, 0x0578,</div><div class='del'>-	0x0016, 0xa998, 0x080c, 0x6b11, 0x001e, 0x1548, 0x0400, 0x080c,</div><div class='del'>-	0x7637, 0x0140, 0xa897, 0x4005, 0xa89b, 0x0016, 0x2001, 0x0030,</div><div class='del'>-	0x900e, 0x0438, 0x0026, 0x2011, 0x8008, 0x080c, 0x6ac7, 0x002e,</div><div class='del'>-	0x01b0, 0x0016, 0x0026, 0x0036, 0xa998, 0xaaa0, 0xab9c, 0x918d,</div><div class='del'>-	0x8000, 0x080c, 0x6b11, 0x003e, 0x002e, 0x001e, 0x1140, 0xa897,</div><div class='del'>-	0x4005, 0xa89b, 0x4009, 0x2001, 0x0030, 0x900e, 0x0050, 0xa868,</div><div class='del'>-	0x9084, 0x00ff, 0xa86a, 0xa883, 0x0000, 0x080c, 0x63c5, 0x1108,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0xa867, 0x0139, 0xa87a, 0xa982,</div><div class='del'>-	0x080c, 0x6e9f, 0x012e, 0x0ca0, 0xa994, 0x9186, 0x0071, 0x0904,</div><div class='del'>-	0x7b00, 0x9186, 0x0064, 0x0904, 0x7b00, 0x9186, 0x007c, 0x0904,</div><div class='del'>-	0x7b00, 0x9186, 0x0028, 0x0904, 0x7b00, 0x9186, 0x0038, 0x0904,</div><div class='del'>-	0x7b00, 0x9186, 0x0078, 0x0904, 0x7b00, 0x9186, 0x005f, 0x0904,</div><div class='del'>-	0x7b00, 0x9186, 0x0056, 0x0904, 0x7b00, 0xa897, 0x4005, 0xa89b,</div><div class='del'>-	0x0001, 0x2001, 0x0030, 0x900e, 0x0860, 0xa87c, 0x9084, 0x00c0,</div><div class='del'>-	0x9086, 0x00c0, 0x1120, 0x7007, 0x0001, 0x0804, 0x7e95, 0x2900,</div><div class='del'>-	0x7016, 0x701a, 0x20a9, 0x0004, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x0030, 0x2098, 0x7050, 0x2040, 0xa060, 0x20e8, 0xa05c, 0x9080,</div><div class='del'>-	0x0023, 0x20a0, 0x4003, 0xa888, 0x7012, 0x9082, 0x0401, 0x1a04,</div><div class='del'>-	0x7aa1, 0xaab4, 0x928a, 0x0002, 0x1a04, 0x7aa1, 0x82ff, 0x1138,</div><div class='del'>-	0xa8b8, 0xa9bc, 0x9105, 0x0118, 0x2001, 0x7c22, 0x0018, 0x9280,</div><div class='del'>-	0x7c18, 0x2005, 0x7056, 0x7010, 0x9015, 0x0904, 0x7c03, 0x080c,</div><div class='del'>-	0x1027, 0x1118, 0x7007, 0x0004, 0x0005, 0x2900, 0x7022, 0x7054,</div><div class='del'>-	0x2060, 0xe000, 0xa866, 0x7050, 0x2040, 0xa95c, 0xe004, 0x9100,</div><div class='del'>-	0xa076, 0xa860, 0xa072, 0xe008, 0x920a, 0x1210, 0x900e, 0x2200,</div><div class='del'>-	0x7112, 0xe20c, 0x8003, 0x800b, 0x9296, 0x0004, 0x0108, 0x9108,</div><div class='del'>-	0xa17a, 0x810b, 0xa17e, 0x080c, 0x10f8, 0xa06c, 0x908e, 0x0100,</div><div class='del'>-	0x0170, 0x9086, 0x0200, 0x0118, 0x7007, 0x0007, 0x0005, 0x7020,</div><div class='del'>-	0x2048, 0x080c, 0x1040, 0x7014, 0x2048, 0x0804, 0x7aa1, 0x7020,</div><div class='del'>-	0x2048, 0x7018, 0xa802, 0xa807, 0x0000, 0x2908, 0x2048, 0xa906,</div><div class='del'>-	0x711a, 0x0804, 0x7bbb, 0x7014, 0x2048, 0x7007, 0x0001, 0xa8b4,</div><div class='del'>-	0x9005, 0x1128, 0xa8b8, 0xa9bc, 0x9105, 0x0108, 0x00b9, 0xa864,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x001e, 0x0904, 0x7e95, 0x0804, 0x7c64,</div><div class='del'>-	0x7c1a, 0x7c1e, 0x0002, 0x001d, 0x0007, 0x0004, 0x000a, 0x001b,</div><div class='del'>-	0x0005, 0x0006, 0x000a, 0x001d, 0x0005, 0x0004, 0x0076, 0x0066,</div><div class='del'>-	0xafb8, 0xaebc, 0xa804, 0x2050, 0xb0c0, 0xb0e2, 0xb0bc, 0xb0de,</div><div class='del'>-	0xb0b8, 0xb0d2, 0xb0b4, 0xb0ce, 0xb6da, 0xb7d6, 0xb0b0, 0xb0ca,</div><div class='del'>-	0xb0ac, 0xb0c6, 0xb0a8, 0xb0ba, 0xb0a4, 0xb0b6, 0xb6c2, 0xb7be,</div><div class='del'>-	0xb0a0, 0xb0b2, 0xb09c, 0xb0ae, 0xb098, 0xb0a2, 0xb094, 0xb09e,</div><div class='del'>-	0xb6aa, 0xb7a6, 0xb090, 0xb09a, 0xb08c, 0xb096, 0xb088, 0xb08a,</div><div class='del'>-	0xb084, 0xb086, 0xb692, 0xb78e, 0xb080, 0xb082, 0xb07c, 0xb07e,</div><div class='del'>-	0xb078, 0xb072, 0xb074, 0xb06e, 0xb67a, 0xb776, 0xb004, 0x9055,</div><div class='del'>-	0x1958, 0x006e, 0x007e, 0x0005, 0x2009, 0x1834, 0x210c, 0x81ff,</div><div class='del'>-	0x1178, 0x080c, 0x61c2, 0x1108, 0x0005, 0x080c, 0x710b, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0xd3ce, 0x080c, 0x6e9f, 0x012e, 0x0ca0,</div><div class='del'>-	0x080c, 0xd7dc, 0x1d70, 0x2001, 0x0028, 0x900e, 0x0c70, 0x2009,</div><div class='del'>-	0x1834, 0x210c, 0x81ff, 0x1188, 0xa888, 0x9005, 0x0188, 0xa883,</div><div class='del'>-	0x0000, 0x080c, 0x6252, 0x1108, 0x0005, 0xa87a, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x6e9f, 0x012e, 0x0cb8, 0x2001, 0x0028, 0x0ca8,</div><div class='del'>-	0x2001, 0x0000, 0x0c90, 0x0419, 0x11d8, 0xa888, 0x9005, 0x01e0,</div><div class='del'>-	0xa883, 0x0000, 0xa87c, 0xd0f4, 0x0120, 0x080c, 0x6327, 0x1138,</div><div class='del'>-	0x0005, 0x9006, 0xa87a, 0x080c, 0x629f, 0x1108, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0xa87a, 0xa982, 0x080c, 0x6e9f, 0x012e, 0x0cb0,</div><div class='del'>-	0x2001, 0x0028, 0x900e, 0x0c98, 0x2001, 0x0000, 0x0c80, 0x00c6,</div><div class='del'>-	0x2061, 0x1800, 0x60d0, 0x9005, 0x0100, 0x00ce, 0x0005, 0x7018,</div><div class='del'>-	0xa802, 0x2908, 0x2048, 0xa906, 0x711a, 0x7010, 0x8001, 0x7012,</div><div class='del'>-	0x0118, 0x7007, 0x0003, 0x0030, 0x7014, 0x2048, 0x7007, 0x0001,</div><div class='del'>-	0x7048, 0x080f, 0x0005, 0x00b6, 0x7007, 0x0001, 0xa974, 0xa878,</div><div class='del'>-	0x9084, 0x00ff, 0x9096, 0x0004, 0x0540, 0x20a9, 0x0001, 0x9096,</div><div class='del'>-	0x0001, 0x0190, 0x900e, 0x20a9, 0x0800, 0x9096, 0x0002, 0x0160,</div><div class='del'>-	0x9005, 0x11d8, 0xa974, 0x080c, 0x6724, 0x11b8, 0x0066, 0xae80,</div><div class='del'>-	0x080c, 0x6834, 0x006e, 0x0088, 0x0046, 0x2011, 0x180c, 0x2224,</div><div class='del'>-	0xc484, 0x2412, 0x004e, 0x00c6, 0x080c, 0x6724, 0x1110, 0x080c,</div><div class='del'>-	0x6934, 0x8108, 0x1f04, 0x7d04, 0x00ce, 0xa87c, 0xd084, 0x1120,</div><div class='del'>-	0x080c, 0x1040, 0x00be, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x6e9f, 0x012e, 0x00be, 0x0005, 0x0126, 0x2091, 0x8000, 0x7007,</div><div class='del'>-	0x0001, 0x080c, 0x6a9f, 0x0580, 0x2061, 0x1a74, 0x6100, 0xd184,</div><div class='del'>-	0x0178, 0xa888, 0x9084, 0x00ff, 0x1550, 0x6000, 0xd084, 0x0520,</div><div class='del'>-	0x6004, 0x9005, 0x1538, 0x6003, 0x0000, 0x600b, 0x0000, 0x00c8,</div><div class='del'>-	0x2011, 0x0001, 0xa890, 0x9005, 0x1110, 0x2001, 0x001e, 0x8000,</div><div class='del'>-	0x6016, 0xa888, 0x9084, 0x00ff, 0x0178, 0x6006, 0xa888, 0x8007,</div><div class='del'>-	0x9084, 0x00ff, 0x0148, 0x600a, 0xa888, 0x8000, 0x1108, 0xc28d,</div><div class='del'>-	0x6202, 0x012e, 0x0804, 0x7f5e, 0x012e, 0x0804, 0x7f58, 0x012e,</div><div class='del'>-	0x0804, 0x7f52, 0x012e, 0x0804, 0x7f55, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x7007, 0x0001, 0x080c, 0x6a9f, 0x05e0, 0x2061, 0x1a74, 0x6000,</div><div class='del'>-	0xd084, 0x05b8, 0x6204, 0x6308, 0xd08c, 0x1530, 0xac78, 0x9484,</div><div class='del'>-	0x0003, 0x0170, 0xa988, 0x918c, 0x00ff, 0x8001, 0x1120, 0x2100,</div><div class='del'>-	0x9210, 0x0620, 0x0028, 0x8001, 0x1508, 0x2100, 0x9212, 0x02f0,</div><div class='del'>-	0x9484, 0x000c, 0x0188, 0xa988, 0x810f, 0x918c, 0x00ff, 0x9082,</div><div class='del'>-	0x0004, 0x1120, 0x2100, 0x9318, 0x0288, 0x0030, 0x9082, 0x0004,</div><div class='del'>-	0x1168, 0x2100, 0x931a, 0x0250, 0xa890, 0x9005, 0x0110, 0x8000,</div><div class='del'>-	0x6016, 0x6206, 0x630a, 0x012e, 0x0804, 0x7f5e, 0x012e, 0x0804,</div><div class='del'>-	0x7f5b, 0x012e, 0x0804, 0x7f58, 0x0126, 0x2091, 0x8000, 0x7007,</div><div class='del'>-	0x0001, 0x2061, 0x1a74, 0x6300, 0xd38c, 0x1120, 0x6308, 0x8318,</div><div class='del'>-	0x0220, 0x630a, 0x012e, 0x0804, 0x7f6c, 0x012e, 0x0804, 0x7f5b,</div><div class='del'>-	0x00b6, 0x0126, 0x00c6, 0x2091, 0x8000, 0x7007, 0x0001, 0xa87c,</div><div class='del'>-	0xd0ac, 0x0148, 0x00c6, 0x2061, 0x1a74, 0x6000, 0x9084, 0xfcff,</div><div class='del'>-	0x6002, 0x00ce, 0x0440, 0xa888, 0x9005, 0x05d8, 0xa88c, 0x9065,</div><div class='del'>-	0x0598, 0x2001, 0x1834, 0x2004, 0x9005, 0x0118, 0x080c, 0xb306,</div><div class='del'>-	0x0068, 0x6017, 0xf400, 0x605b, 0x0000, 0xa97c, 0xd1a4, 0x0110,</div><div class='del'>-	0xa980, 0x615a, 0x2009, 0x0041, 0x080c, 0xb352, 0xa988, 0x918c,</div><div class='del'>-	0xff00, 0x9186, 0x2000, 0x1138, 0x0026, 0x900e, 0x2011, 0xfdff,</div><div class='del'>-	0x080c, 0x8a50, 0x002e, 0xa87c, 0xd0c4, 0x0148, 0x2061, 0x1a74,</div><div class='del'>-	0x6000, 0xd08c, 0x1120, 0x6008, 0x8000, 0x0208, 0x600a, 0x00ce,</div><div class='del'>-	0x012e, 0x00be, 0x0804, 0x7f5e, 0x00ce, 0x012e, 0x00be, 0x0804,</div><div class='del'>-	0x7f58, 0xa984, 0x9186, 0x002e, 0x0d30, 0x9186, 0x002d, 0x0d18,</div><div class='del'>-	0x9186, 0x0045, 0x0510, 0x9186, 0x002a, 0x1130, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0xc194, 0x2102, 0x08b8, 0x9186, 0x0020, 0x0158, 0x9186,</div><div class='del'>-	0x0029, 0x1d10, 0xa974, 0x080c, 0x6724, 0x1968, 0xb800, 0xc0e4,</div><div class='del'>-	0xb802, 0x0848, 0xa88c, 0x9065, 0x09b8, 0x6007, 0x0024, 0x2001,</div><div class='del'>-	0x1986, 0x2004, 0x601a, 0x0804, 0x7df3, 0xa88c, 0x9065, 0x0960,</div><div class='del'>-	0x00e6, 0xa890, 0x9075, 0x2001, 0x1834, 0x2004, 0x9005, 0x0150,</div><div class='del'>-	0x080c, 0xb306, 0x8eff, 0x0118, 0x2e60, 0x080c, 0xb306, 0x00ee,</div><div class='del'>-	0x0804, 0x7df3, 0x6024, 0xc0dc, 0xc0d5, 0x6026, 0x2e60, 0x6007,</div><div class='del'>-	0x003a, 0xa8a0, 0x9005, 0x0130, 0x6007, 0x003b, 0xa8a4, 0x602e,</div><div class='del'>-	0xa8a8, 0x6016, 0x6003, 0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1,</div><div class='del'>-	0x00ee, 0x0804, 0x7df3, 0x2061, 0x1a74, 0x6000, 0xd084, 0x0190,</div><div class='del'>-	0xd08c, 0x1904, 0x7f6c, 0x0126, 0x2091, 0x8000, 0x6204, 0x8210,</div><div class='del'>-	0x0220, 0x6206, 0x012e, 0x0804, 0x7f6c, 0x012e, 0xa883, 0x0016,</div><div class='del'>-	0x0804, 0x7f65, 0xa883, 0x0007, 0x0804, 0x7f65, 0xa864, 0x8007,</div><div class='del'>-	0x9084, 0x00ff, 0x0130, 0x8001, 0x1138, 0x7007, 0x0001, 0x0069,</div><div class='del'>-	0x0005, 0x080c, 0x7a99, 0x0040, 0x7007, 0x0003, 0x7012, 0x2900,</div><div class='del'>-	0x7016, 0x701a, 0x704b, 0x7e95, 0x0005, 0x00b6, 0x00e6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x903e, 0x2061, 0x1800, 0x61d0, 0x81ff, 0x1904,</div><div class='del'>-	0x7f17, 0x6130, 0xd194, 0x1904, 0x7f41, 0xa878, 0x2070, 0x9e82,</div><div class='del'>-	0x1cd0, 0x0a04, 0x7f0b, 0x6068, 0x9e02, 0x1a04, 0x7f0b, 0x7120,</div><div class='del'>-	0x9186, 0x0006, 0x1904, 0x7efd, 0x7010, 0x905d, 0x0904, 0x7f17,</div><div class='del'>-	0xb800, 0xd0e4, 0x1904, 0x7f3b, 0x2061, 0x1a74, 0x6100, 0x9184,</div><div class='del'>-	0x0301, 0x9086, 0x0001, 0x15a0, 0x7024, 0xd0dc, 0x1904, 0x7f44,</div><div class='del'>-	0xa883, 0x0000, 0xa803, 0x0000, 0x2908, 0x7014, 0x9005, 0x1198,</div><div class='del'>-	0x7116, 0xa87c, 0xd0f4, 0x1904, 0x7f47, 0x080c, 0x57d5, 0xd09c,</div><div class='del'>-	0x1118, 0xa87c, 0xc0cc, 0xa87e, 0x2e60, 0x080c, 0x8970, 0x012e,</div><div class='del'>-	0x00ee, 0x00be, 0x0005, 0x2048, 0xa800, 0x9005, 0x1de0, 0xa902,</div><div class='del'>-	0x2148, 0xa87c, 0xd0f4, 0x1904, 0x7f47, 0x012e, 0x00ee, 0x00be,</div><div class='del'>-	0x0005, 0x012e, 0x00ee, 0xa883, 0x0006, 0x00be, 0x0804, 0x7f65,</div><div class='del'>-	0xd184, 0x0db8, 0xd1c4, 0x1190, 0x00a0, 0xa974, 0x080c, 0x6724,</div><div class='del'>-	0x15d0, 0xb800, 0xd0e4, 0x15b8, 0x7120, 0x9186, 0x0007, 0x1118,</div><div class='del'>-	0xa883, 0x0002, 0x0490, 0xa883, 0x0008, 0x0478, 0xa883, 0x000e,</div><div class='del'>-	0x0460, 0xa883, 0x0017, 0x0448, 0xa883, 0x0035, 0x0430, 0x080c,</div><div class='del'>-	0x57d9, 0xd0fc, 0x01e8, 0xa878, 0x2070, 0x9e82, 0x1cd0, 0x02c0,</div><div class='del'>-	0x6068, 0x9e02, 0x12a8, 0x7120, 0x9186, 0x0006, 0x1188, 0x7010,</div><div class='del'>-	0x905d, 0x0170, 0xb800, 0xd0bc, 0x0158, 0x2039, 0x0001, 0x7000,</div><div class='del'>-	0x9086, 0x0007, 0x1904, 0x7ea1, 0x7003, 0x0002, 0x0804, 0x7ea1,</div><div class='del'>-	0xa883, 0x0028, 0x0010, 0xa883, 0x0029, 0x012e, 0x00ee, 0x00be,</div><div class='del'>-	0x0420, 0xa883, 0x002a, 0x0cc8, 0xa883, 0x0045, 0x0cb0, 0x2e60,</div><div class='del'>-	0x2019, 0x0002, 0x601b, 0x0014, 0x080c, 0xe754, 0x012e, 0x00ee,</div><div class='del'>-	0x00be, 0x0005, 0x2009, 0x003e, 0x0058, 0x2009, 0x0004, 0x0040,</div><div class='del'>-	0x2009, 0x0006, 0x0028, 0x2009, 0x0016, 0x0010, 0x2009, 0x0001,</div><div class='del'>-	0xa884, 0x9084, 0xff00, 0x9105, 0xa886, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x6e9f, 0x012e, 0x0005, 0x080c, 0x1040, 0x0005, 0x00d6,</div><div class='del'>-	0x080c, 0x8967, 0x00de, 0x0005, 0x00d6, 0x00e6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0x0040, 0x702c, 0xd084, 0x01d8, 0x908c, 0x0780,</div><div class='del'>-	0x190c, 0x8056, 0xd09c, 0x11a8, 0x2071, 0x1800, 0x70c0, 0x90ea,</div><div class='del'>-	0x0020, 0x0278, 0x8001, 0x70c2, 0x702c, 0x2048, 0xa800, 0x702e,</div><div class='del'>-	0x9006, 0xa802, 0xa806, 0x2071, 0x0040, 0x2900, 0x7022, 0x702c,</div><div class='del'>-	0x0c28, 0x012e, 0x00ee, 0x00de, 0x0005, 0x0006, 0x9084, 0x0780,</div><div class='del'>-	0x190c, 0x8056, 0x000e, 0x0005, 0xa898, 0x9084, 0x0003, 0x05a8,</div><div class='del'>-	0x080c, 0xb27d, 0x05d8, 0x2900, 0x6016, 0xa864, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x0035, 0x1138, 0x6008, 0xc0fd, 0x600a, 0x2001, 0x196b,</div><div class='del'>-	0x2004, 0x0098, 0xa8a0, 0x9084, 0x00ff, 0xa99c, 0x918c, 0xff00,</div><div class='del'>-	0x9105, 0xa99c, 0x918c, 0x00ff, 0x080c, 0x2873, 0x1540, 0x00b6,</div><div class='del'>-	0x080c, 0x6724, 0x2b00, 0x00be, 0x1510, 0x6012, 0x6023, 0x0001,</div><div class='del'>-	0x2009, 0x0040, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0035, 0x0110,</div><div class='del'>-	0x2009, 0x0041, 0x080c, 0xb352, 0x0005, 0xa87b, 0x0101, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x6e9f, 0x012e, 0x0005, 0xa87b, 0x002c,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x6e9f, 0x012e, 0x0005, 0xa87b,</div><div class='del'>-	0x0028, 0x0126, 0x2091, 0x8000, 0x080c, 0x6e9f, 0x012e, 0x080c,</div><div class='del'>-	0xb2d3, 0x0005, 0x00d6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x00b6,</div><div class='del'>-	0x7007, 0x0001, 0xaa74, 0x9282, 0x0004, 0x1a04, 0x8047, 0xa97c,</div><div class='del'>-	0x9188, 0x1000, 0x2104, 0x905d, 0xb804, 0xd284, 0x0140, 0x05e8,</div><div class='del'>-	0x8007, 0x9084, 0x00ff, 0x9084, 0x0006, 0x1108, 0x04b0, 0x2b10,</div><div class='del'>-	0x080c, 0xb27d, 0x1118, 0x080c, 0xb325, 0x05a8, 0x6212, 0xa874,</div><div class='del'>-	0x0002, 0x8025, 0x802a, 0x802d, 0x8033, 0x2019, 0x0002, 0x080c,</div><div class='del'>-	0xeba1, 0x0060, 0x080c, 0xeb38, 0x0048, 0x2019, 0x0002, 0xa980,</div><div class='del'>-	0x080c, 0xeb53, 0x0018, 0xa980, 0x080c, 0xeb38, 0x080c, 0xb2d3,</div><div class='del'>-	0xa887, 0x0000, 0x0126, 0x2091, 0x8000, 0x080c, 0x6e9f, 0x012e,</div><div class='del'>-	0x00be, 0x001e, 0x002e, 0x003e, 0x00ce, 0x00de, 0x0005, 0xa887,</div><div class='del'>-	0x0006, 0x0c80, 0xa887, 0x0002, 0x0c68, 0xa887, 0x0005, 0x0c50,</div><div class='del'>-	0xa887, 0x0004, 0x0c38, 0xa887, 0x0007, 0x0c20, 0x2091, 0x8000,</div><div class='del'>-	0x0e04, 0x8058, 0x0006, 0x0016, 0x2001, 0x8003, 0x0006, 0x0804,</div><div class='del'>-	0x0dce, 0x2001, 0x1834, 0x2004, 0x9005, 0x0005, 0x0005, 0x00f6,</div><div class='del'>-	0x2079, 0x0300, 0x2001, 0x0200, 0x200c, 0xc1e5, 0xc1dc, 0x2102,</div><div class='del'>-	0x2009, 0x0218, 0x210c, 0xd1ec, 0x1120, 0x080c, 0x15a0, 0x00fe,</div><div class='del'>-	0x0005, 0x2001, 0x020d, 0x2003, 0x0020, 0x781f, 0x0300, 0x00fe,</div><div class='del'>-	0x0005, 0x781c, 0xd08c, 0x0904, 0x80d8, 0x68c0, 0x90aa, 0x0005,</div><div class='del'>-	0x0a04, 0x871c, 0x7d44, 0x7c40, 0x9584, 0x00f6, 0x1510, 0x9484,</div><div class='del'>-	0x7000, 0x0140, 0x908a, 0x2000, 0x1260, 0x9584, 0x0700, 0x8007,</div><div class='del'>-	0x0804, 0x80df, 0x7000, 0x9084, 0xff00, 0x9086, 0x8100, 0x0da8,</div><div class='del'>-	0x00b0, 0x9484, 0x0fff, 0x1130, 0x7000, 0x9084, 0xff00, 0x9086,</div><div class='del'>-	0x8100, 0x11c0, 0x080c, 0xf057, 0x080c, 0x8601, 0x7817, 0x0140,</div><div class='del'>-	0x00a8, 0x9584, 0x0076, 0x1118, 0x080c, 0x865f, 0x19c0, 0xd5a4,</div><div class='del'>-	0x0148, 0x0046, 0x0056, 0x080c, 0x813a, 0x080c, 0x236e, 0x005e,</div><div class='del'>-	0x004e, 0x0020, 0x080c, 0xf057, 0x7817, 0x0140, 0x080c, 0x7637,</div><div class='del'>-	0x0168, 0x2001, 0x0111, 0x2004, 0xd08c, 0x0140, 0x6893, 0x0000,</div><div class='del'>-	0x2001, 0x0110, 0x2003, 0x0008, 0x2003, 0x0000, 0x080c, 0x811b,</div><div class='del'>-	0x2001, 0x19f1, 0x2004, 0x9005, 0x090c, 0x9ab1, 0x0005, 0x0002,</div><div class='del'>-	0x80f1, 0x8409, 0x80e8, 0x80e8, 0x80e8, 0x80e8, 0x80e8, 0x80e8,</div><div class='del'>-	0x7817, 0x0140, 0x2001, 0x19f1, 0x2004, 0x9005, 0x090c, 0x9ab1,</div><div class='del'>-	0x0005, 0x7000, 0x908c, 0xff00, 0x9194, 0xf000, 0x810f, 0x9484,</div><div class='del'>-	0x0fff, 0x6892, 0x9286, 0x2000, 0x1150, 0x6800, 0x9086, 0x0001,</div><div class='del'>-	0x1118, 0x080c, 0x583f, 0x0070, 0x080c, 0x815a, 0x0058, 0x9286,</div><div class='del'>-	0x3000, 0x1118, 0x080c, 0x8341, 0x0028, 0x9286, 0x8000, 0x1110,</div><div class='del'>-	0x080c, 0x8528, 0x7817, 0x0140, 0x2001, 0x19f1, 0x2004, 0x9005,</div><div class='del'>-	0x090c, 0x9ab1, 0x0005, 0x2001, 0x1810, 0x2004, 0xd08c, 0x0178,</div><div class='del'>-	0x2001, 0x1800, 0x2004, 0x9086, 0x0003, 0x1148, 0x0026, 0x0036,</div><div class='del'>-	0x2011, 0x8048, 0x2518, 0x080c, 0x4c44, 0x003e, 0x002e, 0x0005,</div><div class='del'>-	0x0036, 0x0046, 0x0056, 0x00f6, 0x2079, 0x0200, 0x2019, 0xfffe,</div><div class='del'>-	0x7c30, 0x0050, 0x0036, 0x0046, 0x0056, 0x00f6, 0x2079, 0x0200,</div><div class='del'>-	0x7d44, 0x7c40, 0x2019, 0xffff, 0x2001, 0x1810, 0x2004, 0xd08c,</div><div class='del'>-	0x0160, 0x2001, 0x1800, 0x2004, 0x9086, 0x0003, 0x1130, 0x0026,</div><div class='del'>-	0x2011, 0x8048, 0x080c, 0x4c44, 0x002e, 0x00fe, 0x005e, 0x004e,</div><div class='del'>-	0x003e, 0x0005, 0x00b6, 0x00c6, 0x7010, 0x9084, 0xff00, 0x8007,</div><div class='del'>-	0x9096, 0x0001, 0x0120, 0x9096, 0x0023, 0x1904, 0x8312, 0x9186,</div><div class='del'>-	0x0023, 0x15c0, 0x080c, 0x85c6, 0x0904, 0x8312, 0x6120, 0x9186,</div><div class='del'>-	0x0001, 0x0150, 0x9186, 0x0004, 0x0138, 0x9186, 0x0008, 0x0120,</div><div class='del'>-	0x9186, 0x000a, 0x1904, 0x8312, 0x7124, 0x610a, 0x7030, 0x908e,</div><div class='del'>-	0x0200, 0x1130, 0x2009, 0x0015, 0x080c, 0xb352, 0x0804, 0x8312,</div><div class='del'>-	0x908e, 0x0214, 0x0118, 0x908e, 0x0210, 0x1130, 0x2009, 0x0015,</div><div class='del'>-	0x080c, 0xb352, 0x0804, 0x8312, 0x908e, 0x0100, 0x1904, 0x8312,</div><div class='del'>-	0x7034, 0x9005, 0x1904, 0x8312, 0x2009, 0x0016, 0x080c, 0xb352,</div><div class='del'>-	0x0804, 0x8312, 0x9186, 0x0022, 0x1904, 0x8312, 0x7030, 0x908e,</div><div class='del'>-	0x0300, 0x1580, 0x68dc, 0xd0a4, 0x0528, 0xc0b5, 0x68de, 0x7100,</div><div class='del'>-	0x918c, 0x00ff, 0x697e, 0x7004, 0x6882, 0x00f6, 0x2079, 0x0100,</div><div class='del'>-	0x79e6, 0x78ea, 0x0006, 0x9084, 0x00ff, 0x0016, 0x2008, 0x080c,</div><div class='del'>-	0x28bc, 0x7932, 0x7936, 0x001e, 0x000e, 0x00fe, 0x080c, 0x2873,</div><div class='del'>-	0x695e, 0x703c, 0x00e6, 0x2071, 0x0140, 0x7086, 0x2071, 0x1800,</div><div class='del'>-	0x70b6, 0x00ee, 0x7034, 0x9005, 0x1904, 0x8312, 0x2009, 0x0017,</div><div class='del'>-	0x0804, 0x82c2, 0x908e, 0x0400, 0x1190, 0x7034, 0x9005, 0x1904,</div><div class='del'>-	0x8312, 0x080c, 0x7637, 0x0120, 0x2009, 0x001d, 0x0804, 0x82c2,</div><div class='del'>-	0x68dc, 0xc0a5, 0x68de, 0x2009, 0x0030, 0x0804, 0x82c2, 0x908e,</div><div class='del'>-	0x0500, 0x1140, 0x7034, 0x9005, 0x1904, 0x8312, 0x2009, 0x0018,</div><div class='del'>-	0x0804, 0x82c2, 0x908e, 0x2010, 0x1120, 0x2009, 0x0019, 0x0804,</div><div class='del'>-	0x82c2, 0x908e, 0x2110, 0x1120, 0x2009, 0x001a, 0x0804, 0x82c2,</div><div class='del'>-	0x908e, 0x5200, 0x1140, 0x7034, 0x9005, 0x1904, 0x8312, 0x2009,</div><div class='del'>-	0x001b, 0x0804, 0x82c2, 0x908e, 0x5000, 0x1140, 0x7034, 0x9005,</div><div class='del'>-	0x1904, 0x8312, 0x2009, 0x001c, 0x0804, 0x82c2, 0x908e, 0x1300,</div><div class='del'>-	0x1120, 0x2009, 0x0034, 0x0804, 0x82c2, 0x908e, 0x1200, 0x1140,</div><div class='del'>-	0x7034, 0x9005, 0x1904, 0x8312, 0x2009, 0x0024, 0x0804, 0x82c2,</div><div class='del'>-	0x908c, 0xff00, 0x918e, 0x2400, 0x1170, 0x2009, 0x002d, 0x2001,</div><div class='del'>-	0x1810, 0x2004, 0xd09c, 0x0904, 0x82c2, 0x080c, 0xdf1a, 0x1904,</div><div class='del'>-	0x8312, 0x0804, 0x82c0, 0x908c, 0xff00, 0x918e, 0x5300, 0x1120,</div><div class='del'>-	0x2009, 0x002a, 0x0804, 0x82c2, 0x908e, 0x0f00, 0x1120, 0x2009,</div><div class='del'>-	0x0020, 0x0804, 0x82c2, 0x908e, 0x6104, 0x1530, 0x2029, 0x0205,</div><div class='del'>-	0x2011, 0x026d, 0x8208, 0x2204, 0x9082, 0x0004, 0x8004, 0x8004,</div><div class='del'>-	0x20a8, 0x2011, 0x8015, 0x211c, 0x8108, 0x0046, 0x2124, 0x080c,</div><div class='del'>-	0x4c44, 0x004e, 0x8108, 0x0f04, 0x8276, 0x9186, 0x0280, 0x1d88,</div><div class='del'>-	0x2504, 0x8000, 0x202a, 0x2009, 0x0260, 0x0c58, 0x202b, 0x0000,</div><div class='del'>-	0x2009, 0x0023, 0x0804, 0x82c2, 0x908e, 0x6000, 0x1120, 0x2009,</div><div class='del'>-	0x003f, 0x0804, 0x82c2, 0x908e, 0x5400, 0x1138, 0x080c, 0x86cc,</div><div class='del'>-	0x1904, 0x8312, 0x2009, 0x0046, 0x04a8, 0x908e, 0x5500, 0x1148,</div><div class='del'>-	0x080c, 0x86f4, 0x1118, 0x2009, 0x0041, 0x0460, 0x2009, 0x0042,</div><div class='del'>-	0x0448, 0x908e, 0x7800, 0x1118, 0x2009, 0x0045, 0x0418, 0x908e,</div><div class='del'>-	0x1000, 0x1118, 0x2009, 0x004e, 0x00e8, 0x908e, 0x6300, 0x1118,</div><div class='del'>-	0x2009, 0x004a, 0x00b8, 0x908c, 0xff00, 0x918e, 0x5600, 0x1118,</div><div class='del'>-	0x2009, 0x004f, 0x0078, 0x908c, 0xff00, 0x918e, 0x5700, 0x1118,</div><div class='del'>-	0x2009, 0x0050, 0x0038, 0x2009, 0x001d, 0x6838, 0xd0d4, 0x0110,</div><div class='del'>-	0x2009, 0x004c, 0x0016, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c,</div><div class='del'>-	0x080c, 0x2873, 0x1904, 0x8315, 0x080c, 0x66b9, 0x1904, 0x8315,</div><div class='del'>-	0xbe12, 0xbd16, 0x001e, 0x0016, 0x080c, 0x7637, 0x01c0, 0x68dc,</div><div class='del'>-	0xd08c, 0x1148, 0x7000, 0x9084, 0x00ff, 0x1188, 0x7004, 0x9084,</div><div class='del'>-	0xff00, 0x1168, 0x0040, 0x687c, 0x9606, 0x1148, 0x6880, 0x9506,</div><div class='del'>-	0x9084, 0xff00, 0x1120, 0x9584, 0x00ff, 0xb8c2, 0x0080, 0xb8c0,</div><div class='del'>-	0x9005, 0x1168, 0x9186, 0x0046, 0x1150, 0x687c, 0x9606, 0x1138,</div><div class='del'>-	0x6880, 0x9506, 0x9084, 0xff00, 0x1110, 0x001e, 0x0098, 0x080c,</div><div class='del'>-	0xb27d, 0x01a8, 0x2b08, 0x6112, 0x6023, 0x0004, 0x7120, 0x610a,</div><div class='del'>-	0x001e, 0x9186, 0x004c, 0x1110, 0x6023, 0x000a, 0x0016, 0x001e,</div><div class='del'>-	0x080c, 0xb352, 0x00ce, 0x00be, 0x0005, 0x001e, 0x0cd8, 0x2001,</div><div class='del'>-	0x180e, 0x2004, 0xd0ec, 0x0120, 0x2011, 0x8049, 0x080c, 0x4c44,</div><div class='del'>-	0x080c, 0xb325, 0x0d90, 0x2b08, 0x6112, 0x6023, 0x0004, 0x7120,</div><div class='del'>-	0x610a, 0x001e, 0x0016, 0x9186, 0x0017, 0x0118, 0x9186, 0x0030,</div><div class='del'>-	0x1128, 0x6007, 0x0009, 0x6017, 0x2900, 0x0020, 0x6007, 0x0051,</div><div class='del'>-	0x6017, 0x0000, 0x602f, 0x0009, 0x6003, 0x0001, 0x080c, 0x9547,</div><div class='del'>-	0x08a0, 0x080c, 0x873b, 0x1158, 0x080c, 0x3374, 0x1140, 0x7010,</div><div class='del'>-	0x9084, 0xff00, 0x8007, 0x908e, 0x0008, 0x1108, 0x0009, 0x0005,</div><div class='del'>-	0x00b6, 0x00c6, 0x0046, 0x7000, 0x908c, 0xff00, 0x810f, 0x9186,</div><div class='del'>-	0x0033, 0x11e8, 0x080c, 0x85c6, 0x0904, 0x83a1, 0x7124, 0x610a,</div><div class='del'>-	0x7030, 0x908e, 0x0200, 0x1140, 0x7034, 0x9005, 0x15d0, 0x2009,</div><div class='del'>-	0x0015, 0x080c, 0xb352, 0x04a8, 0x908e, 0x0100, 0x1590, 0x7034,</div><div class='del'>-	0x9005, 0x1578, 0x2009, 0x0016, 0x080c, 0xb352, 0x0450, 0x9186,</div><div class='del'>-	0x0032, 0x1538, 0x7030, 0x908e, 0x1400, 0x1518, 0x2009, 0x0038,</div><div class='del'>-	0x0016, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c, 0x080c, 0x2873,</div><div class='del'>-	0x11b8, 0x080c, 0x66b9, 0x11a0, 0xbe12, 0xbd16, 0x080c, 0xb27d,</div><div class='del'>-	0x0178, 0x2b08, 0x6112, 0x080c, 0xd554, 0x6023, 0x0004, 0x7120,</div><div class='del'>-	0x610a, 0x001e, 0x080c, 0xb352, 0x080c, 0x9ab1, 0x0010, 0x00ce,</div><div class='del'>-	0x001e, 0x004e, 0x00ce, 0x00be, 0x0005, 0x00b6, 0x0046, 0x00e6,</div><div class='del'>-	0x00d6, 0x2028, 0x2130, 0x9696, 0x00ff, 0x11b8, 0x9592, 0xfffc,</div><div class='del'>-	0x02a0, 0x9596, 0xfffd, 0x1120, 0x2009, 0x007f, 0x0804, 0x8403,</div><div class='del'>-	0x9596, 0xfffe, 0x1120, 0x2009, 0x007e, 0x0804, 0x8403, 0x9596,</div><div class='del'>-	0xfffc, 0x1118, 0x2009, 0x0080, 0x04f0, 0x2011, 0x0000, 0x2019,</div><div class='del'>-	0x1837, 0x231c, 0xd3ac, 0x0130, 0x9026, 0x20a9, 0x0800, 0x2071,</div><div class='del'>-	0x1000, 0x0030, 0x2021, 0x0081, 0x20a9, 0x077f, 0x2071, 0x1081,</div><div class='del'>-	0x2e1c, 0x93dd, 0x0000, 0x1140, 0x82ff, 0x11d0, 0x9496, 0x00ff,</div><div class='del'>-	0x01b8, 0x2410, 0xc2fd, 0x00a0, 0xbf10, 0x2600, 0x9706, 0xb814,</div><div class='del'>-	0x1120, 0x9546, 0x1110, 0x2408, 0x00b0, 0x9745, 0x1148, 0x94c6,</div><div class='del'>-	0x007e, 0x0130, 0x94c6, 0x007f, 0x0118, 0x94c6, 0x0080, 0x1d20,</div><div class='del'>-	0x8420, 0x8e70, 0x1f04, 0x83d8, 0x82ff, 0x1118, 0x9085, 0x0001,</div><div class='del'>-	0x0018, 0xc2fc, 0x2208, 0x9006, 0x00de, 0x00ee, 0x004e, 0x00be,</div><div class='del'>-	0x0005, 0x2001, 0x1837, 0x200c, 0x9184, 0x0080, 0x0110, 0xd18c,</div><div class='del'>-	0x0138, 0x7000, 0x908c, 0xff00, 0x810f, 0x9184, 0x000f, 0x004a,</div><div class='del'>-	0x7817, 0x0140, 0x2001, 0x19f1, 0x2004, 0x9005, 0x090c, 0x9ab1,</div><div class='del'>-	0x0005, 0x8431, 0x8431, 0x8431, 0x85d8, 0x8431, 0x843a, 0x8465,</div><div class='del'>-	0x84f3, 0x8431, 0x8431, 0x8431, 0x8431, 0x8431, 0x8431, 0x8431,</div><div class='del'>-	0x8431, 0x7817, 0x0140, 0x2001, 0x19f1, 0x2004, 0x9005, 0x090c,</div><div class='del'>-	0x9ab1, 0x0005, 0x00b6, 0x7110, 0xd1bc, 0x01e8, 0x7120, 0x2160,</div><div class='del'>-	0x9c8c, 0x0007, 0x11c0, 0x9c8a, 0x1cd0, 0x02a8, 0x6868, 0x9c02,</div><div class='del'>-	0x1290, 0x7008, 0x9084, 0x00ff, 0x6110, 0x2158, 0xb910, 0x9106,</div><div class='del'>-	0x1150, 0x700c, 0xb914, 0x9106, 0x1130, 0x7124, 0x610a, 0x2009,</div><div class='del'>-	0x0046, 0x080c, 0xb352, 0x7817, 0x0140, 0x2001, 0x19f1, 0x2004,</div><div class='del'>-	0x9005, 0x090c, 0x9ab1, 0x00be, 0x0005, 0x00b6, 0x00c6, 0x9484,</div><div class='del'>-	0x0fff, 0x0904, 0x84c9, 0x7110, 0xd1bc, 0x1904, 0x84c9, 0x7108,</div><div class='del'>-	0x700c, 0x2028, 0x918c, 0x00ff, 0x2130, 0x9094, 0xff00, 0x15b0,</div><div class='del'>-	0x81ff, 0x15a0, 0x9080, 0x33b6, 0x200d, 0x918c, 0xff00, 0x810f,</div><div class='del'>-	0x2001, 0x0080, 0x9106, 0x0904, 0x84c9, 0x080c, 0x66b9, 0x1904,</div><div class='del'>-	0x84c9, 0xbe12, 0xbd16, 0xb800, 0xd0ec, 0x15d8, 0xba04, 0x9294,</div><div class='del'>-	0xff00, 0x9286, 0x0600, 0x11a0, 0x080c, 0xb27d, 0x05e8, 0x2b08,</div><div class='del'>-	0x7028, 0x6046, 0x702c, 0x604a, 0x6112, 0x6023, 0x0006, 0x7120,</div><div class='del'>-	0x610a, 0x7130, 0x6156, 0x2009, 0x0044, 0x080c, 0xe192, 0x0408,</div><div class='del'>-	0x080c, 0x6aa3, 0x1138, 0xb807, 0x0606, 0x0c30, 0x190c, 0x83a5,</div><div class='del'>-	0x11c0, 0x0898, 0x080c, 0xb27d, 0x2b08, 0x0198, 0x6112, 0x6023,</div><div class='del'>-	0x0004, 0x7120, 0x610a, 0x9286, 0x0400, 0x1118, 0x6007, 0x0005,</div><div class='del'>-	0x0010, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x9547, 0x080c,</div><div class='del'>-	0x9ab1, 0x7817, 0x0140, 0x2001, 0x19f1, 0x2004, 0x9005, 0x090c,</div><div class='del'>-	0x9ab1, 0x00ce, 0x00be, 0x0005, 0x2001, 0x180e, 0x2004, 0xd0ec,</div><div class='del'>-	0x0120, 0x2011, 0x8049, 0x080c, 0x4c44, 0x080c, 0xb325, 0x0d48,</div><div class='del'>-	0x2b08, 0x6112, 0x6023, 0x0006, 0x7120, 0x610a, 0x7130, 0x6156,</div><div class='del'>-	0x6017, 0xf300, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x94ff,</div><div class='del'>-	0x080c, 0x9ab1, 0x08b0, 0x00b6, 0x7110, 0xd1bc, 0x01e8, 0x7020,</div><div class='del'>-	0x2060, 0x9c84, 0x0007, 0x11c0, 0x9c82, 0x1cd0, 0x02a8, 0x6868,</div><div class='del'>-	0x9c02, 0x1290, 0x7008, 0x9084, 0x00ff, 0x6110, 0x2158, 0xb910,</div><div class='del'>-	0x9106, 0x1150, 0x700c, 0xb914, 0x9106, 0x1130, 0x7124, 0x610a,</div><div class='del'>-	0x2009, 0x0045, 0x080c, 0xb352, 0x7817, 0x0140, 0x2001, 0x19f1,</div><div class='del'>-	0x2004, 0x9005, 0x090c, 0x9ab1, 0x00be, 0x0005, 0x6120, 0x9186,</div><div class='del'>-	0x0002, 0x0128, 0x9186, 0x0005, 0x0110, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x080c, 0x873b, 0x1180, 0x080c, 0x3374, 0x1168, 0x7010, 0x9084,</div><div class='del'>-	0xff00, 0x8007, 0x9086, 0x0000, 0x1130, 0x9184, 0x000f, 0x908a,</div><div class='del'>-	0x0006, 0x1208, 0x000b, 0x0005, 0x8542, 0x8543, 0x8542, 0x8542,</div><div class='del'>-	0x85a8, 0x85b7, 0x0005, 0x00b6, 0x700c, 0x7108, 0x080c, 0x2873,</div><div class='del'>-	0x1904, 0x85a6, 0x080c, 0x66b9, 0x1904, 0x85a6, 0xbe12, 0xbd16,</div><div class='del'>-	0x7110, 0xd1bc, 0x0540, 0x702c, 0xd084, 0x1120, 0xb800, 0xd0bc,</div><div class='del'>-	0x1904, 0x85a6, 0x080c, 0x6aa3, 0x0148, 0x9086, 0x0004, 0x0130,</div><div class='del'>-	0x080c, 0x6aab, 0x0118, 0x9086, 0x0004, 0x1588, 0x00c6, 0x080c,</div><div class='del'>-	0x85c6, 0x00ce, 0x05d8, 0x080c, 0xb27d, 0x2b08, 0x05b8, 0x6112,</div><div class='del'>-	0x080c, 0xd554, 0x6023, 0x0002, 0x7120, 0x610a, 0x2009, 0x0088,</div><div class='del'>-	0x080c, 0xb352, 0x0458, 0x080c, 0x6aa3, 0x0148, 0x9086, 0x0004,</div><div class='del'>-	0x0130, 0x080c, 0x6aab, 0x0118, 0x9086, 0x0004, 0x1180, 0x080c,</div><div class='del'>-	0xb27d, 0x2b08, 0x01d8, 0x6112, 0x080c, 0xd554, 0x6023, 0x0005,</div><div class='del'>-	0x7120, 0x610a, 0x2009, 0x0088, 0x080c, 0xb352, 0x0078, 0x080c,</div><div class='del'>-	0xb27d, 0x2b08, 0x0158, 0x6112, 0x080c, 0xd554, 0x6023, 0x0004,</div><div class='del'>-	0x7120, 0x610a, 0x2009, 0x0001, 0x080c, 0xb352, 0x00be, 0x0005,</div><div class='del'>-	0x7110, 0xd1bc, 0x0158, 0x00d1, 0x0148, 0x080c, 0x851e, 0x1130,</div><div class='del'>-	0x7124, 0x610a, 0x2009, 0x0089, 0x080c, 0xb352, 0x0005, 0x7110,</div><div class='del'>-	0xd1bc, 0x0158, 0x0059, 0x0148, 0x080c, 0x851e, 0x1130, 0x7124,</div><div class='del'>-	0x610a, 0x2009, 0x008a, 0x080c, 0xb352, 0x0005, 0x7020, 0x2060,</div><div class='del'>-	0x9c84, 0x0007, 0x1158, 0x9c82, 0x1cd0, 0x0240, 0x2001, 0x181a,</div><div class='del'>-	0x2004, 0x9c02, 0x1218, 0x9085, 0x0001, 0x0005, 0x9006, 0x0ce8,</div><div class='del'>-	0x00b6, 0x7110, 0xd1bc, 0x11d8, 0x7024, 0x2060, 0x9c84, 0x0007,</div><div class='del'>-	0x11b0, 0x9c82, 0x1cd0, 0x0298, 0x6868, 0x9c02, 0x1280, 0x7008,</div><div class='del'>-	0x9084, 0x00ff, 0x6110, 0x2158, 0xb910, 0x9106, 0x1140, 0x700c,</div><div class='del'>-	0xb914, 0x9106, 0x1120, 0x2009, 0x0051, 0x080c, 0xb352, 0x7817,</div><div class='del'>-	0x0140, 0x2001, 0x19f1, 0x2004, 0x9005, 0x090c, 0x9ab1, 0x00be,</div><div class='del'>-	0x0005, 0x2031, 0x0105, 0x0069, 0x0005, 0x2031, 0x0206, 0x0049,</div><div class='del'>-	0x0005, 0x2031, 0x0207, 0x0029, 0x0005, 0x2031, 0x0213, 0x0009,</div><div class='del'>-	0x0005, 0x00c6, 0x0096, 0x00f6, 0x7000, 0x9084, 0xf000, 0x9086,</div><div class='del'>-	0xc000, 0x05d0, 0x080c, 0xb27d, 0x05b8, 0x0066, 0x00c6, 0x0046,</div><div class='del'>-	0x2011, 0x0263, 0x2204, 0x8211, 0x220c, 0x080c, 0x2873, 0x15a0,</div><div class='del'>-	0x080c, 0x66b9, 0x1588, 0xbe12, 0xbd16, 0x2b00, 0x004e, 0x00ce,</div><div class='del'>-	0x6012, 0x080c, 0xd554, 0x080c, 0x100e, 0x0510, 0x2900, 0x605a,</div><div class='del'>-	0x9006, 0xa802, 0xa866, 0xac6a, 0xa85c, 0x90f8, 0x001b, 0x20a9,</div><div class='del'>-	0x000e, 0xa860, 0x20e8, 0x20e1, 0x0000, 0x2fa0, 0x2e98, 0x4003,</div><div class='del'>-	0x006e, 0x6616, 0x6007, 0x003e, 0x6023, 0x0001, 0x6003, 0x0001,</div><div class='del'>-	0x080c, 0x9547, 0x080c, 0x9ab1, 0x00fe, 0x009e, 0x00ce, 0x0005,</div><div class='del'>-	0x080c, 0xb2d3, 0x006e, 0x0cc0, 0x004e, 0x00ce, 0x0cc8, 0x00c6,</div><div class='del'>-	0x7000, 0x908c, 0xff00, 0x9184, 0xf000, 0x810f, 0x9086, 0x2000,</div><div class='del'>-	0x1904, 0x86b6, 0x9186, 0x0022, 0x15f0, 0x2001, 0x0111, 0x2004,</div><div class='del'>-	0x9005, 0x1904, 0x86b8, 0x7030, 0x908e, 0x0400, 0x0904, 0x86b8,</div><div class='del'>-	0x908e, 0x6000, 0x05e8, 0x908e, 0x5400, 0x05d0, 0x908e, 0x0300,</div><div class='del'>-	0x11d8, 0x2009, 0x1837, 0x210c, 0xd18c, 0x1590, 0xd1a4, 0x1580,</div><div class='del'>-	0x080c, 0x6a61, 0x0588, 0x68b0, 0x9084, 0x00ff, 0x7100, 0x918c,</div><div class='del'>-	0x00ff, 0x9106, 0x1518, 0x6880, 0x69b0, 0x918c, 0xff00, 0x9105,</div><div class='del'>-	0x7104, 0x9106, 0x11d8, 0x00e0, 0x2009, 0x0103, 0x210c, 0xd1b4,</div><div class='del'>-	0x11a8, 0x908e, 0x5200, 0x09e8, 0x908e, 0x0500, 0x09d0, 0x908e,</div><div class='del'>-	0x5000, 0x09b8, 0x0058, 0x9186, 0x0023, 0x1140, 0x080c, 0x85c6,</div><div class='del'>-	0x0128, 0x6004, 0x9086, 0x0002, 0x0118, 0x0000, 0x9006, 0x0010,</div><div class='del'>-	0x9085, 0x0001, 0x00ce, 0x0005, 0x7030, 0x908e, 0x0300, 0x0118,</div><div class='del'>-	0x908e, 0x5200, 0x1d98, 0x2001, 0x1837, 0x2004, 0x9084, 0x0009,</div><div class='del'>-	0x9086, 0x0008, 0x0d68, 0x0c50, 0x0156, 0x0046, 0x0016, 0x0036,</div><div class='del'>-	0x7038, 0x2020, 0x8427, 0x94a4, 0x0007, 0xd484, 0x0148, 0x20a9,</div><div class='del'>-	0x0004, 0x2019, 0x1805, 0x2011, 0x027a, 0x080c, 0xc365, 0x1178,</div><div class='del'>-	0xd48c, 0x0148, 0x20a9, 0x0004, 0x2019, 0x1801, 0x2011, 0x027e,</div><div class='del'>-	0x080c, 0xc365, 0x1120, 0xd494, 0x0110, 0x9085, 0x0001, 0x003e,</div><div class='del'>-	0x001e, 0x004e, 0x015e, 0x0005, 0x0156, 0x0046, 0x0016, 0x0036,</div><div class='del'>-	0x7038, 0x2020, 0x8427, 0x94a4, 0x0007, 0xd484, 0x0148, 0x20a9,</div><div class='del'>-	0x0004, 0x2019, 0x1805, 0x2011, 0x0272, 0x080c, 0xc365, 0x1178,</div><div class='del'>-	0xd48c, 0x0148, 0x20a9, 0x0004, 0x2019, 0x1801, 0x2011, 0x0276,</div><div class='del'>-	0x080c, 0xc365, 0x1120, 0xd494, 0x0110, 0x9085, 0x0001, 0x003e,</div><div class='del'>-	0x001e, 0x004e, 0x015e, 0x0005, 0x00f6, 0x2079, 0x0200, 0x7800,</div><div class='del'>-	0xc0e5, 0xc0cc, 0x7802, 0x00fe, 0x0005, 0x00f6, 0x2079, 0x1800,</div><div class='del'>-	0x7834, 0xd084, 0x1130, 0x2079, 0x0200, 0x7800, 0x9085, 0x1200,</div><div class='del'>-	0x7802, 0x00fe, 0x0005, 0x00e6, 0x2071, 0x1800, 0x7034, 0xc084,</div><div class='del'>-	0x7036, 0x00ee, 0x0005, 0x0016, 0x2001, 0x1837, 0x200c, 0x9184,</div><div class='del'>-	0x0080, 0x0118, 0xd18c, 0x0118, 0x9006, 0x001e, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0cd8, 0x2071, 0x19fb, 0x7003, 0x0003, 0x700f, 0x0361,</div><div class='del'>-	0x9006, 0x701a, 0x707a, 0x7012, 0x7017, 0x1cd0, 0x7007, 0x0000,</div><div class='del'>-	0x7026, 0x702b, 0xa6ff, 0x7032, 0x703a, 0x703f, 0x0064, 0x7037,</div><div class='del'>-	0xa767, 0x7047, 0xffff, 0x704a, 0x704f, 0x5667, 0x7052, 0x7063,</div><div class='del'>-	0x88de, 0x080c, 0x1027, 0x090c, 0x0dc5, 0x2900, 0x7042, 0xa867,</div><div class='del'>-	0x0003, 0xa86f, 0x0100, 0xa8ab, 0xdcb0, 0x0005, 0x2071, 0x19fb,</div><div class='del'>-	0x1d04, 0x882c, 0x2091, 0x6000, 0x700c, 0x8001, 0x700e, 0x1540,</div><div class='del'>-	0x2001, 0x013c, 0x2004, 0x9005, 0x190c, 0x894c, 0x2001, 0x1869,</div><div class='del'>-	0x2004, 0xd0c4, 0x0158, 0x3a00, 0xd08c, 0x1140, 0x20d1, 0x0000,</div><div class='del'>-	0x20d1, 0x0001, 0x20d1, 0x0000, 0x080c, 0x0dc5, 0x700f, 0x0361,</div><div class='del'>-	0x7007, 0x0001, 0x0126, 0x2091, 0x8000, 0x080c, 0x8923, 0x7048,</div><div class='del'>-	0x900d, 0x0148, 0x8109, 0x714a, 0x1130, 0x704c, 0x080f, 0x0018,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x7024, 0x900d, 0x0188, 0x7020, 0x8001,</div><div class='del'>-	0x7022, 0x1168, 0x7023, 0x0009, 0x8109, 0x7126, 0x9186, 0x03e8,</div><div class='del'>-	0x1110, 0x7028, 0x080f, 0x81ff, 0x1110, 0x7028, 0x080f, 0x7030,</div><div class='del'>-	0x900d, 0x05a8, 0x702c, 0x8001, 0x702e, 0x1588, 0x0016, 0x2009,</div><div class='del'>-	0x0306, 0x210c, 0x9184, 0x0030, 0x01e8, 0x9184, 0x0048, 0x9086,</div><div class='del'>-	0x0008, 0x11c0, 0x7038, 0x9005, 0x01a8, 0x8001, 0x703a, 0x1190,</div><div class='del'>-	0x080c, 0x7637, 0x0178, 0x00e6, 0x2071, 0x19e8, 0x080c, 0xa7f5,</div><div class='del'>-	0x00ee, 0x1140, 0x2009, 0x1a86, 0x2104, 0x8000, 0x0208, 0x200a,</div><div class='del'>-	0x001e, 0x0068, 0x001e, 0x702f, 0x0009, 0x8109, 0x7132, 0x0128,</div><div class='del'>-	0x9184, 0x007f, 0x090c, 0xa8ab, 0x0010, 0x7034, 0x080f, 0x7044,</div><div class='del'>-	0x9005, 0x0118, 0x0310, 0x8001, 0x7046, 0x7054, 0x900d, 0x0168,</div><div class='del'>-	0x7050, 0x8001, 0x7052, 0x1148, 0x7053, 0x0009, 0x8109, 0x7156,</div><div class='del'>-	0x1120, 0x7158, 0x7156, 0x7060, 0x080f, 0x7018, 0x900d, 0x01d8,</div><div class='del'>-	0x0016, 0x7078, 0x900d, 0x0158, 0x7074, 0x8001, 0x7076, 0x1138,</div><div class='del'>-	0x7077, 0x0009, 0x8109, 0x717a, 0x1110, 0x707c, 0x080f, 0x001e,</div><div class='del'>-	0x7008, 0x8001, 0x700a, 0x1138, 0x700b, 0x0009, 0x8109, 0x711a,</div><div class='del'>-	0x1110, 0x701c, 0x080f, 0x012e, 0x7004, 0x0002, 0x8854, 0x8855,</div><div class='del'>-	0x8871, 0x00e6, 0x2071, 0x19fb, 0x7018, 0x9005, 0x1120, 0x711a,</div><div class='del'>-	0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x00e6, 0x0006, 0x2071,</div><div class='del'>-	0x19fb, 0x701c, 0x9206, 0x1120, 0x701a, 0x701e, 0x707a, 0x707e,</div><div class='del'>-	0x000e, 0x00ee, 0x0005, 0x00e6, 0x2071, 0x19fb, 0xb888, 0x9102,</div><div class='del'>-	0x0208, 0xb98a, 0x00ee, 0x0005, 0x0005, 0x00b6, 0x7110, 0x080c,</div><div class='del'>-	0x6724, 0x1168, 0xb888, 0x8001, 0x0250, 0xb88a, 0x1140, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x0016, 0x080c, 0x9ab1, 0x001e, 0x012e, 0x8108,</div><div class='del'>-	0x9182, 0x0800, 0x0218, 0x900e, 0x7007, 0x0002, 0x7112, 0x00be,</div><div class='del'>-	0x0005, 0x7014, 0x2060, 0x0126, 0x2091, 0x8000, 0x6040, 0x9005,</div><div class='del'>-	0x0128, 0x8001, 0x6042, 0x1110, 0x080c, 0xd3e5, 0x6018, 0x9005,</div><div class='del'>-	0x0558, 0x8001, 0x601a, 0x1540, 0x6120, 0x9186, 0x0003, 0x0148,</div><div class='del'>-	0x9186, 0x0006, 0x0130, 0x9186, 0x0009, 0x11e0, 0x611c, 0xd1c4,</div><div class='del'>-	0x1100, 0x080c, 0xd0d8, 0x01b0, 0x6014, 0x2048, 0xa884, 0x908a,</div><div class='del'>-	0x199a, 0x0280, 0x9082, 0x1999, 0xa886, 0x908a, 0x199a, 0x0210,</div><div class='del'>-	0x2001, 0x1999, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a, 0xa87c,</div><div class='del'>-	0xd0e4, 0x0110, 0x080c, 0xcdbc, 0x012e, 0x9c88, 0x0018, 0x7116,</div><div class='del'>-	0x2001, 0x181a, 0x2004, 0x9102, 0x0220, 0x7017, 0x1cd0, 0x7007,</div><div class='del'>-	0x0000, 0x0005, 0x00e6, 0x2071, 0x19fb, 0x7027, 0x07d0, 0x7023,</div><div class='del'>-	0x0009, 0x00ee, 0x0005, 0x2001, 0x1a04, 0x2003, 0x0000, 0x0005,</div><div class='del'>-	0x00e6, 0x2071, 0x19fb, 0x7132, 0x702f, 0x0009, 0x00ee, 0x0005,</div><div class='del'>-	0x2011, 0x1a07, 0x2013, 0x0000, 0x0005, 0x00e6, 0x2071, 0x19fb,</div><div class='del'>-	0x711a, 0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x0086, 0x0026,</div><div class='del'>-	0x705c, 0x8000, 0x705e, 0x2001, 0x1a0b, 0x2044, 0xa06c, 0x9086,</div><div class='del'>-	0x0000, 0x0150, 0x7070, 0xa09a, 0x706c, 0xa096, 0x7068, 0xa092,</div><div class='del'>-	0x7064, 0xa08e, 0x080c, 0x10f8, 0x002e, 0x008e, 0x0005, 0x0006,</div><div class='del'>-	0x0016, 0x0096, 0x00a6, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6,</div><div class='del'>-	0x0156, 0x080c, 0x8776, 0x015e, 0x00fe, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x00be, 0x00ae, 0x009e, 0x001e, 0x000e, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x19fb, 0x717a, 0x727e, 0x7077, 0x0009, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x0006, 0x2071, 0x19fb, 0x707c, 0x9206, 0x1110, 0x707a, 0x707e,</div><div class='del'>-	0x000e, 0x00ee, 0x0005, 0x2069, 0x1800, 0x69e8, 0xd1e4, 0x1518,</div><div class='del'>-	0x0026, 0xd1ec, 0x0140, 0x6a54, 0x6874, 0x9202, 0x0288, 0x8117,</div><div class='del'>-	0x9294, 0x00c0, 0x0088, 0x9184, 0x0007, 0x01a0, 0x8109, 0x9184,</div><div class='del'>-	0x0007, 0x0110, 0x69ea, 0x0070, 0x8107, 0x9084, 0x0007, 0x910d,</div><div class='del'>-	0x8107, 0x9106, 0x9094, 0x00c0, 0x9184, 0xff3f, 0x9205, 0x68ea,</div><div class='del'>-	0x080c, 0x0eee, 0x002e, 0x0005, 0x0016, 0x00c6, 0x2009, 0xfff4,</div><div class='del'>-	0x210d, 0x2061, 0x0100, 0x60f0, 0x9100, 0x60f3, 0x0000, 0x2009,</div><div class='del'>-	0xfff4, 0x200f, 0x1220, 0x8108, 0x2105, 0x8000, 0x200f, 0x00ce,</div><div class='del'>-	0x001e, 0x0005, 0x00c6, 0x2061, 0x1a74, 0x00ce, 0x0005, 0x9184,</div><div class='del'>-	0x000f, 0x8003, 0x8003, 0x8003, 0x9080, 0x1a74, 0x2060, 0x0005,</div><div class='del'>-	0xa884, 0x908a, 0x199a, 0x1638, 0x9005, 0x1150, 0x00c6, 0x2061,</div><div class='del'>-	0x1a74, 0x6014, 0x00ce, 0x9005, 0x1130, 0x2001, 0x001e, 0x0018,</div><div class='del'>-	0x908e, 0xffff, 0x01b0, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a,</div><div class='del'>-	0xa87c, 0x908c, 0x00c0, 0x918e, 0x00c0, 0x0904, 0x89fa, 0xd0b4,</div><div class='del'>-	0x1168, 0xd0bc, 0x1904, 0x89d3, 0x2009, 0x0006, 0x080c, 0x8a27,</div><div class='del'>-	0x0005, 0x900e, 0x0c60, 0x2001, 0x1999, 0x08b0, 0xd0fc, 0x0160,</div><div class='del'>-	0x908c, 0x0003, 0x0120, 0x918e, 0x0003, 0x1904, 0x8a21, 0x908c,</div><div class='del'>-	0x2020, 0x918e, 0x2020, 0x01a8, 0x6024, 0xd0d4, 0x11e8, 0x2009,</div><div class='del'>-	0x1869, 0x2104, 0xd084, 0x1138, 0x87ff, 0x1120, 0x2009, 0x0043,</div><div class='del'>-	0x0804, 0xb352, 0x0005, 0x87ff, 0x1de8, 0x2009, 0x0042, 0x0804,</div><div class='del'>-	0xb352, 0x6110, 0x00b6, 0x2158, 0xb900, 0x00be, 0xd1ac, 0x0d20,</div><div class='del'>-	0x6024, 0xc0cd, 0x6026, 0x0c00, 0xc0d4, 0x6026, 0xa890, 0x602e,</div><div class='del'>-	0xa88c, 0x6032, 0x08e0, 0xd0fc, 0x0160, 0x908c, 0x0003, 0x0120,</div><div class='del'>-	0x918e, 0x0003, 0x1904, 0x8a21, 0x908c, 0x2020, 0x918e, 0x2020,</div><div class='del'>-	0x0170, 0x0076, 0x00f6, 0x2c78, 0x080c, 0x1768, 0x00fe, 0x007e,</div><div class='del'>-	0x87ff, 0x1120, 0x2009, 0x0042, 0x080c, 0xb352, 0x0005, 0x6110,</div><div class='del'>-	0x00b6, 0x2158, 0xb900, 0x00be, 0xd1ac, 0x0d58, 0x6124, 0xc1cd,</div><div class='del'>-	0x6126, 0x0c38, 0xd0fc, 0x0188, 0x908c, 0x2020, 0x918e, 0x2020,</div><div class='del'>-	0x01a8, 0x9084, 0x0003, 0x908e, 0x0002, 0x0148, 0x87ff, 0x1120,</div><div class='del'>-	0x2009, 0x0041, 0x080c, 0xb352, 0x0005, 0x00b9, 0x0ce8, 0x87ff,</div><div class='del'>-	0x1dd8, 0x2009, 0x0043, 0x080c, 0xb352, 0x0cb0, 0x6110, 0x00b6,</div><div class='del'>-	0x2158, 0xb900, 0x00be, 0xd1ac, 0x0d20, 0x6124, 0xc1cd, 0x6126,</div><div class='del'>-	0x0c00, 0x2009, 0x0004, 0x0019, 0x0005, 0x2009, 0x0001, 0x0096,</div><div class='del'>-	0x080c, 0xd0d8, 0x0518, 0x6014, 0x2048, 0xa982, 0xa800, 0x6016,</div><div class='del'>-	0x9186, 0x0001, 0x1188, 0xa97c, 0x918c, 0x8100, 0x918e, 0x8100,</div><div class='del'>-	0x1158, 0x00c6, 0x2061, 0x1a74, 0x6200, 0xd28c, 0x1120, 0x6204,</div><div class='del'>-	0x8210, 0x0208, 0x6206, 0x00ce, 0x080c, 0x6cde, 0x6014, 0x904d,</div><div class='del'>-	0x0076, 0x2039, 0x0000, 0x190c, 0x8970, 0x007e, 0x009e, 0x0005,</div><div class='del'>-	0x0156, 0x00c6, 0x2061, 0x1a74, 0x6000, 0x81ff, 0x0110, 0x9205,</div><div class='del'>-	0x0008, 0x9204, 0x6002, 0x00ce, 0x015e, 0x0005, 0x6800, 0xd08c,</div><div class='del'>-	0x1138, 0x6808, 0x9005, 0x0120, 0x8001, 0x680a, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x2071, 0x1924, 0x7003, 0x0006, 0x7007, 0x0000, 0x700f,</div><div class='del'>-	0x0000, 0x7013, 0x0001, 0x080c, 0x1027, 0x090c, 0x0dc5, 0xa867,</div><div class='del'>-	0x0006, 0xa86b, 0x0001, 0xa8ab, 0xdcb0, 0xa89f, 0x0000, 0x2900,</div><div class='del'>-	0x702e, 0x7033, 0x0000, 0x0005, 0x0126, 0x2091, 0x8000, 0x0096,</div><div class='del'>-	0x00e6, 0x2071, 0x1924, 0x702c, 0x2048, 0x6a2c, 0x721e, 0x6b30,</div><div class='del'>-	0x7322, 0x6834, 0x7026, 0xa896, 0x6838, 0x702a, 0xa89a, 0x6824,</div><div class='del'>-	0x7016, 0x683c, 0x701a, 0x2009, 0x0028, 0x200a, 0x9005, 0x0148,</div><div class='del'>-	0x900e, 0x9188, 0x000c, 0x8001, 0x1de0, 0x2100, 0x9210, 0x1208,</div><div class='del'>-	0x8318, 0xaa8e, 0xab92, 0x7010, 0xd084, 0x0168, 0xc084, 0x7007,</div><div class='del'>-	0x0001, 0x700f, 0x0000, 0x0006, 0x2009, 0x1ad1, 0x2104, 0x9082,</div><div class='del'>-	0x0007, 0x200a, 0x000e, 0xc095, 0x7012, 0x2008, 0x2001, 0x003b,</div><div class='del'>-	0x080c, 0x1611, 0x9006, 0x2071, 0x193d, 0x7002, 0x7006, 0x702a,</div><div class='del'>-	0x00ee, 0x009e, 0x012e, 0x0005, 0x2009, 0x1ad1, 0x2104, 0x9080,</div><div class='del'>-	0x0007, 0x200a, 0x0005, 0x00e6, 0x0126, 0x0156, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0x1800, 0x7154, 0x2001, 0x0008, 0x910a, 0x0638, 0x2001,</div><div class='del'>-	0x187d, 0x20ac, 0x9006, 0x9080, 0x0008, 0x1f04, 0x8ae3, 0x71c0,</div><div class='del'>-	0x9102, 0x02e0, 0x2071, 0x1877, 0x20a9, 0x0007, 0x00c6, 0x080c,</div><div class='del'>-	0xb27d, 0x6023, 0x0009, 0x6003, 0x0004, 0x601f, 0x0101, 0x0089,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x8c61, 0x012e, 0x1f04, 0x8aef,</div><div class='del'>-	0x9006, 0x00ce, 0x015e, 0x012e, 0x00ee, 0x0005, 0x9085, 0x0001,</div><div class='del'>-	0x0cc8, 0x00e6, 0x00b6, 0x0096, 0x0086, 0x0056, 0x0046, 0x0026,</div><div class='del'>-	0x7118, 0x720c, 0x7620, 0x7004, 0xd084, 0x1128, 0x2021, 0x0024,</div><div class='del'>-	0x2029, 0x0002, 0x0020, 0x2021, 0x002c, 0x2029, 0x000a, 0x080c,</div><div class='del'>-	0x100e, 0x090c, 0x0dc5, 0x2900, 0x6016, 0x2058, 0xac66, 0x9006,</div><div class='del'>-	0xa802, 0xa806, 0xa86a, 0xa87a, 0xa8aa, 0xa887, 0x0005, 0xa87f,</div><div class='del'>-	0x0020, 0x7008, 0xa89a, 0x7010, 0xa89e, 0xae8a, 0xa8af, 0xffff,</div><div class='del'>-	0xa8b3, 0x0000, 0x8109, 0x0160, 0x080c, 0x100e, 0x090c, 0x0dc5,</div><div class='del'>-	0xad66, 0x2b00, 0xa802, 0x2900, 0xb806, 0x2058, 0x8109, 0x1da0,</div><div class='del'>-	0x002e, 0x004e, 0x005e, 0x008e, 0x009e, 0x00be, 0x00ee, 0x0005,</div><div class='del'>-	0x2079, 0x0000, 0x2071, 0x1924, 0x7004, 0x004b, 0x700c, 0x0002,</div><div class='del'>-	0x8b5b, 0x8b54, 0x8b54, 0x0005, 0x8b65, 0x8bbb, 0x8bbb, 0x8bbb,</div><div class='del'>-	0x8bbc, 0x8bcd, 0x8bcd, 0x700c, 0x0cba, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x78a0, 0x79a0, 0x9106, 0x1904, 0x8bad, 0x7814, 0xd0bc, 0x1904,</div><div class='del'>-	0x8bb6, 0x012e, 0x7018, 0x910a, 0x1128, 0x7030, 0x9005, 0x1904,</div><div class='del'>-	0x8bff, 0x0005, 0x1210, 0x7114, 0x910a, 0x9192, 0x000a, 0x0210,</div><div class='del'>-	0x2009, 0x000a, 0x2001, 0x1888, 0x2014, 0x2001, 0x1936, 0x2004,</div><div class='del'>-	0x9100, 0x9202, 0x0e50, 0x080c, 0x8d5c, 0x2200, 0x9102, 0x0208,</div><div class='del'>-	0x2208, 0x0096, 0x702c, 0x2048, 0xa873, 0x0001, 0xa976, 0x080c,</div><div class='del'>-	0x8e65, 0x2100, 0xa87e, 0xa86f, 0x0000, 0x009e, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2009, 0x1a1b, 0x2104, 0xc085, 0x200a, 0x700f, 0x0002,</div><div class='del'>-	0x012e, 0x080c, 0x1117, 0x1de8, 0x0005, 0x78a0, 0x79a0, 0x9106,</div><div class='del'>-	0x0904, 0x8b6d, 0x080c, 0x8d34, 0x012e, 0x0005, 0x7810, 0xc0c5,</div><div class='del'>-	0x7812, 0x0804, 0x8b6d, 0x0005, 0x700c, 0x0002, 0x8bc1, 0x8bc4,</div><div class='del'>-	0x8bc3, 0x080c, 0x8b63, 0x0005, 0x8001, 0x700e, 0x0096, 0x702c,</div><div class='del'>-	0x2048, 0xa974, 0x009e, 0x0011, 0x0ca0, 0x0005, 0x0096, 0x702c,</div><div class='del'>-	0x2048, 0x7018, 0x9100, 0x7214, 0x921a, 0x1130, 0x701c, 0xa88e,</div><div class='del'>-	0x7020, 0xa892, 0x9006, 0x0068, 0x0006, 0x080c, 0x8e65, 0x2100,</div><div class='del'>-	0xaa8c, 0x9210, 0xaa8e, 0x1220, 0xa890, 0x9081, 0x0000, 0xa892,</div><div class='del'>-	0x000e, 0x009e, 0x0126, 0x2091, 0x8000, 0x78a2, 0x701a, 0x080c,</div><div class='del'>-	0x8d34, 0x012e, 0x0005, 0x00e6, 0x2071, 0x1924, 0x700c, 0x0002,</div><div class='del'>-	0x8bfd, 0x8bfd, 0x8bfb, 0x700f, 0x0001, 0x00ee, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x7030, 0x9005, 0x0508, 0x2078, 0x7814, 0x2048,</div><div class='del'>-	0xae88, 0x00b6, 0x2059, 0x0000, 0x080c, 0x8c6a, 0x00be, 0x01b0,</div><div class='del'>-	0x00e6, 0x2071, 0x193d, 0x080c, 0x8cb1, 0x00ee, 0x0178, 0x0096,</div><div class='del'>-	0x080c, 0x1027, 0x2900, 0x009e, 0x0148, 0xa8aa, 0x04b9, 0x0041,</div><div class='del'>-	0x2001, 0x1947, 0x2003, 0x0000, 0x012e, 0x08c8, 0x012e, 0x0005,</div><div class='del'>-	0x00d6, 0x00c6, 0x0086, 0x00a6, 0x2940, 0x2650, 0x2600, 0x9005,</div><div class='del'>-	0x0180, 0xa864, 0x9084, 0x000f, 0x2068, 0x9d88, 0x20c7, 0x2165,</div><div class='del'>-	0x0056, 0x2029, 0x0000, 0x080c, 0x8dea, 0x080c, 0x207f, 0x1dd8,</div><div class='del'>-	0x005e, 0x00ae, 0x2001, 0x187f, 0x2004, 0xa88a, 0x080c, 0x1768,</div><div class='del'>-	0x781f, 0x0101, 0x7813, 0x0000, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x8cc0, 0x012e, 0x008e, 0x00ce, 0x00de, 0x0005, 0x7030, 0x9005,</div><div class='del'>-	0x0138, 0x2078, 0x780c, 0x7032, 0x2001, 0x1947, 0x2003, 0x0001,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0x1924, 0x7030, 0x600e, 0x2c00, 0x7032,</div><div class='del'>-	0x00ee, 0x0005, 0x00d6, 0x00c6, 0x0026, 0x9b80, 0x8f33, 0x2005,</div><div class='del'>-	0x906d, 0x090c, 0x0dc5, 0x9b80, 0x8f2b, 0x2005, 0x9065, 0x090c,</div><div class='del'>-	0x0dc5, 0x6114, 0x2600, 0x9102, 0x0248, 0x6828, 0x9102, 0x02f0,</div><div class='del'>-	0x9085, 0x0001, 0x002e, 0x00ce, 0x00de, 0x0005, 0x6804, 0xd094,</div><div class='del'>-	0x0148, 0x6854, 0xd084, 0x1178, 0xc085, 0x6856, 0x2011, 0x8026,</div><div class='del'>-	0x080c, 0x4c44, 0x684c, 0x0096, 0x904d, 0x090c, 0x0dc5, 0xa804,</div><div class='del'>-	0x8000, 0xa806, 0x009e, 0x9006, 0x2030, 0x0c20, 0x6854, 0xd08c,</div><div class='del'>-	0x1d08, 0xc08d, 0x6856, 0x2011, 0x8025, 0x080c, 0x4c44, 0x684c,</div><div class='del'>-	0x0096, 0x904d, 0x090c, 0x0dc5, 0xa800, 0x8000, 0xa802, 0x009e,</div><div class='del'>-	0x0888, 0x7000, 0x2019, 0x0008, 0x8319, 0x7104, 0x9102, 0x1118,</div><div class='del'>-	0x2300, 0x9005, 0x0020, 0x0210, 0x9302, 0x0008, 0x8002, 0x0005,</div><div class='del'>-	0x00d6, 0x7814, 0x9005, 0x090c, 0x0dc5, 0x781c, 0x9084, 0x0101,</div><div class='del'>-	0x9086, 0x0101, 0x190c, 0x0dc5, 0x7827, 0x0000, 0x2069, 0x193d,</div><div class='del'>-	0x6804, 0x9080, 0x193f, 0x2f08, 0x2102, 0x6904, 0x8108, 0x9182,</div><div class='del'>-	0x0008, 0x0208, 0x900e, 0x6906, 0x9180, 0x193f, 0x2003, 0x0000,</div><div class='del'>-	0x00de, 0x0005, 0x0096, 0x00c6, 0x2060, 0x6014, 0x2048, 0xa8a8,</div><div class='del'>-	0x0096, 0x2048, 0x9005, 0x190c, 0x1040, 0x009e, 0xa8ab, 0x0000,</div><div class='del'>-	0x080c, 0x0fc0, 0x080c, 0xb2d3, 0x00ce, 0x009e, 0x0005, 0x6020,</div><div class='del'>-	0x9086, 0x0009, 0x1128, 0x601c, 0xd0c4, 0x0110, 0x9006, 0x0005,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x6000, 0x9086, 0x0000, 0x0178, 0x6010,</div><div class='del'>-	0x9005, 0x0150, 0x00b6, 0x2058, 0x080c, 0x9067, 0x00be, 0x6013,</div><div class='del'>-	0x0000, 0x601b, 0x0000, 0x0010, 0x2c00, 0x0861, 0x0005, 0x2009,</div><div class='del'>-	0x1928, 0x210c, 0xd194, 0x0005, 0x2009, 0x1928, 0x210c, 0xd1c4,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0x00e6, 0x2071, 0x1924, 0x7110,</div><div class='del'>-	0xc194, 0xc185, 0x7007, 0x0000, 0x7112, 0x2001, 0x003b, 0x080c,</div><div class='del'>-	0x1611, 0x00ee, 0x012e, 0x0005, 0x7814, 0xd0bc, 0x1108, 0x0005,</div><div class='del'>-	0x7810, 0xc0c5, 0x7812, 0x0cc0, 0x0096, 0x00d6, 0x9006, 0x7006,</div><div class='del'>-	0x700e, 0x701a, 0x701e, 0x7022, 0x7016, 0x702a, 0x7026, 0x702f,</div><div class='del'>-	0x0000, 0x080c, 0x8eb3, 0x0170, 0x080c, 0x8ee8, 0x0158, 0x2900,</div><div class='del'>-	0x7002, 0x700a, 0x701a, 0x7013, 0x0001, 0x701f, 0x000a, 0x00de,</div><div class='del'>-	0x009e, 0x0005, 0x900e, 0x0cd8, 0x00e6, 0x0096, 0x0086, 0x00d6,</div><div class='del'>-	0x00c6, 0x2071, 0x1931, 0x721c, 0x2100, 0x9202, 0x1618, 0x080c,</div><div class='del'>-	0x8ee8, 0x090c, 0x0dc5, 0x7018, 0x9005, 0x1160, 0x2900, 0x7002,</div><div class='del'>-	0x700a, 0x701a, 0x9006, 0x7006, 0x700e, 0xa806, 0xa802, 0x7012,</div><div class='del'>-	0x701e, 0x0038, 0x2040, 0xa806, 0x2900, 0xa002, 0x701a, 0xa803,</div><div class='del'>-	0x0000, 0x7010, 0x8000, 0x7012, 0x701c, 0x9080, 0x000a, 0x701e,</div><div class='del'>-	0x721c, 0x08d0, 0x721c, 0x00ce, 0x00de, 0x008e, 0x009e, 0x00ee,</div><div class='del'>-	0x0005, 0x0096, 0x0156, 0x0136, 0x0146, 0x00e6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0x1931, 0x7300, 0x831f, 0x831e, 0x831e, 0x9384,</div><div class='del'>-	0x003f, 0x20e8, 0x939c, 0xffc0, 0x9398, 0x0003, 0x7104, 0x080c,</div><div class='del'>-	0x8e65, 0x810c, 0x2100, 0x9318, 0x8003, 0x2228, 0x2021, 0x0078,</div><div class='del'>-	0x9402, 0x9532, 0x0208, 0x2028, 0x2500, 0x8004, 0x20a8, 0x23a0,</div><div class='del'>-	0xa001, 0xa001, 0x4005, 0x2508, 0x080c, 0x8e6e, 0x2130, 0x7014,</div><div class='del'>-	0x9600, 0x7016, 0x2600, 0x711c, 0x9102, 0x701e, 0x7004, 0x9600,</div><div class='del'>-	0x2008, 0x9082, 0x000a, 0x1190, 0x7000, 0x2048, 0xa800, 0x9005,</div><div class='del'>-	0x1148, 0x2009, 0x0001, 0x0026, 0x080c, 0x8d5c, 0x002e, 0x7000,</div><div class='del'>-	0x2048, 0xa800, 0x7002, 0x7007, 0x0000, 0x0008, 0x7106, 0x2500,</div><div class='del'>-	0x9212, 0x1904, 0x8d9b, 0x012e, 0x00ee, 0x014e, 0x013e, 0x015e,</div><div class='del'>-	0x009e, 0x0005, 0x0016, 0x0026, 0x00e6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x9580, 0x8f2b, 0x2005, 0x9075, 0x090c, 0x0dc5, 0x080c, 0x8e40,</div><div class='del'>-	0x012e, 0x9580, 0x8f27, 0x2005, 0x9075, 0x090c, 0x0dc5, 0x0156,</div><div class='del'>-	0x0136, 0x01c6, 0x0146, 0x01d6, 0x831f, 0x831e, 0x831e, 0x9384,</div><div class='del'>-	0x003f, 0x20e0, 0x9384, 0xffc0, 0x9100, 0x2098, 0xa860, 0x20e8,</div><div class='del'>-	0xa95c, 0x2c05, 0x9100, 0x20a0, 0x20a9, 0x0002, 0x4003, 0x2e0c,</div><div class='del'>-	0x2d00, 0x0002, 0x8e2a, 0x8e2a, 0x8e2c, 0x8e2a, 0x8e2c, 0x8e2a,</div><div class='del'>-	0x8e2a, 0x8e2a, 0x8e2a, 0x8e2a, 0x8e32, 0x8e2a, 0x8e32, 0x8e2a,</div><div class='del'>-	0x8e2a, 0x8e2a, 0x080c, 0x0dc5, 0x4104, 0x20a9, 0x0002, 0x4002,</div><div class='del'>-	0x4003, 0x0028, 0x20a9, 0x0002, 0x4003, 0x4104, 0x4003, 0x01de,</div><div class='del'>-	0x014e, 0x01ce, 0x013e, 0x015e, 0x00ee, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x0096, 0x7014, 0x8001, 0x7016, 0x710c, 0x2110, 0x00f1, 0x810c,</div><div class='del'>-	0x9188, 0x0003, 0x7308, 0x8210, 0x9282, 0x000a, 0x1198, 0x7008,</div><div class='del'>-	0x2048, 0xa800, 0x9005, 0x0158, 0x0006, 0x080c, 0x8ef7, 0x009e,</div><div class='del'>-	0xa807, 0x0000, 0x2900, 0x700a, 0x7010, 0x8001, 0x7012, 0x700f,</div><div class='del'>-	0x0000, 0x0008, 0x720e, 0x009e, 0x0005, 0x0006, 0x810b, 0x810b,</div><div class='del'>-	0x2100, 0x810b, 0x9100, 0x2008, 0x000e, 0x0005, 0x0006, 0x0026,</div><div class='del'>-	0x2100, 0x9005, 0x0158, 0x9092, 0x000c, 0x0240, 0x900e, 0x8108,</div><div class='del'>-	0x9082, 0x000c, 0x1de0, 0x002e, 0x000e, 0x0005, 0x900e, 0x0cd8,</div><div class='del'>-	0x2d00, 0x90b8, 0x0008, 0x2031, 0x8eb1, 0x901e, 0x6808, 0x9005,</div><div class='del'>-	0x0108, 0x8318, 0x690c, 0x910a, 0x0248, 0x0140, 0x8318, 0x6810,</div><div class='del'>-	0x9112, 0x0220, 0x0118, 0x8318, 0x2208, 0x0cd0, 0x233a, 0x6804,</div><div class='del'>-	0xd084, 0x2300, 0x2021, 0x0001, 0x1150, 0x9082, 0x0003, 0x0967,</div><div class='del'>-	0x0a67, 0x8420, 0x9082, 0x0007, 0x0967, 0x0a67, 0x0cd0, 0x9082,</div><div class='del'>-	0x0002, 0x0967, 0x0a67, 0x8420, 0x9082, 0x0005, 0x0967, 0x0a67,</div><div class='del'>-	0x0cd0, 0x6c1a, 0x0005, 0x0096, 0x0046, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2b00, 0x9080, 0x8f2f, 0x2005, 0x9005, 0x090c, 0x0dc5, 0x2004,</div><div class='del'>-	0x90a0, 0x000a, 0x080c, 0x1027, 0x01d0, 0x2900, 0x7026, 0xa803,</div><div class='del'>-	0x0000, 0xa807, 0x0000, 0x080c, 0x1027, 0x0188, 0x7024, 0xa802,</div><div class='del'>-	0xa807, 0x0000, 0x2900, 0x7026, 0x94a2, 0x000a, 0x0110, 0x0208,</div><div class='del'>-	0x0c90, 0x9085, 0x0001, 0x012e, 0x004e, 0x009e, 0x0005, 0x7024,</div><div class='del'>-	0x9005, 0x0dc8, 0x2048, 0xac00, 0x080c, 0x1040, 0x2400, 0x0cc0,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x7024, 0x2048, 0x9005, 0x0130, 0xa800,</div><div class='del'>-	0x7026, 0xa803, 0x0000, 0xa807, 0x0000, 0x012e, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x7024, 0xa802, 0x2900, 0x7026, 0x012e, 0x0005,</div><div class='del'>-	0x0096, 0x9e80, 0x0009, 0x2004, 0x9005, 0x0138, 0x2048, 0xa800,</div><div class='del'>-	0x0006, 0x080c, 0x1040, 0x000e, 0x0cb8, 0x009e, 0x0005, 0x0096,</div><div class='del'>-	0x7008, 0x9005, 0x0138, 0x2048, 0xa800, 0x0006, 0x080c, 0x1040,</div><div class='del'>-	0x000e, 0x0cb8, 0x9006, 0x7002, 0x700a, 0x7006, 0x700e, 0x701a,</div><div class='del'>-	0x701e, 0x7022, 0x702a, 0x7026, 0x702e, 0x009e, 0x0005, 0x1a67,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x1931, 0x0000, 0x0000, 0x0000, 0x1888,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x1877, 0x0000, 0x0000, 0x0000, 0x00e6,</div><div class='del'>-	0x00c6, 0x00b6, 0x00a6, 0xa8a8, 0x2040, 0x2071, 0x1877, 0x080c,</div><div class='del'>-	0x9053, 0xa067, 0x0023, 0x6010, 0x905d, 0x0904, 0x9028, 0xb814,</div><div class='del'>-	0xa06e, 0xb910, 0xa172, 0xb9a0, 0xa176, 0x2001, 0x0003, 0xa07e,</div><div class='del'>-	0xa834, 0xa082, 0xa07b, 0x0000, 0xa898, 0x9005, 0x0118, 0xa078,</div><div class='del'>-	0xc085, 0xa07a, 0x2858, 0x2031, 0x0018, 0xa068, 0x908a, 0x0019,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x2020, 0x2050, 0x2940, 0xa864, 0x90bc, 0x00ff,</div><div class='del'>-	0x908c, 0x000f, 0x91e0, 0x20c7, 0x2c65, 0x9786, 0x0024, 0x2c05,</div><div class='del'>-	0x1590, 0x908a, 0x0036, 0x1a0c, 0x0dc5, 0x9082, 0x001b, 0x0002,</div><div class='del'>-	0x8f93, 0x8f93, 0x8f95, 0x8f93, 0x8f93, 0x8f93, 0x8f97, 0x8f93,</div><div class='del'>-	0x8f93, 0x8f93, 0x8f99, 0x8f93, 0x8f93, 0x8f93, 0x8f9b, 0x8f93,</div><div class='del'>-	0x8f93, 0x8f93, 0x8f9d, 0x8f93, 0x8f93, 0x8f93, 0x8f9f, 0x8f93,</div><div class='del'>-	0x8f93, 0x8f93, 0x8fa1, 0x080c, 0x0dc5, 0xa180, 0x04b8, 0xa190,</div><div class='del'>-	0x04a8, 0xa1a0, 0x0498, 0xa1b0, 0x0488, 0xa1c0, 0x0478, 0xa1d0,</div><div class='del'>-	0x0468, 0xa1e0, 0x0458, 0x908a, 0x0034, 0x1a0c, 0x0dc5, 0x9082,</div><div class='del'>-	0x001b, 0x0002, 0x8fc5, 0x8fc3, 0x8fc3, 0x8fc3, 0x8fc3, 0x8fc3,</div><div class='del'>-	0x8fc7, 0x8fc3, 0x8fc3, 0x8fc3, 0x8fc3, 0x8fc3, 0x8fc9, 0x8fc3,</div><div class='del'>-	0x8fc3, 0x8fc3, 0x8fc3, 0x8fc3, 0x8fcb, 0x8fc3, 0x8fc3, 0x8fc3,</div><div class='del'>-	0x8fc3, 0x8fc3, 0x8fcd, 0x080c, 0x0dc5, 0xa180, 0x0038, 0xa198,</div><div class='del'>-	0x0028, 0xa1b0, 0x0018, 0xa1c8, 0x0008, 0xa1e0, 0x2600, 0x0002,</div><div class='del'>-	0x8fe9, 0x8feb, 0x8fed, 0x8fef, 0x8ff1, 0x8ff3, 0x8ff5, 0x8ff7,</div><div class='del'>-	0x8ff9, 0x8ffb, 0x8ffd, 0x8fff, 0x9001, 0x9003, 0x9005, 0x9007,</div><div class='del'>-	0x9009, 0x900b, 0x900d, 0x900f, 0x9011, 0x9013, 0x9015, 0x9017,</div><div class='del'>-	0x9019, 0x080c, 0x0dc5, 0xb9e2, 0x0468, 0xb9de, 0x0458, 0xb9da,</div><div class='del'>-	0x0448, 0xb9d6, 0x0438, 0xb9d2, 0x0428, 0xb9ce, 0x0418, 0xb9ca,</div><div class='del'>-	0x0408, 0xb9c6, 0x00f8, 0xb9c2, 0x00e8, 0xb9be, 0x00d8, 0xb9ba,</div><div class='del'>-	0x00c8, 0xb9b6, 0x00b8, 0xb9b2, 0x00a8, 0xb9ae, 0x0098, 0xb9aa,</div><div class='del'>-	0x0088, 0xb9a6, 0x0078, 0xb9a2, 0x0068, 0xb99e, 0x0058, 0xb99a,</div><div class='del'>-	0x0048, 0xb996, 0x0038, 0xb992, 0x0028, 0xb98e, 0x0018, 0xb98a,</div><div class='del'>-	0x0008, 0xb986, 0x8631, 0x8421, 0x0130, 0x080c, 0x207f, 0x090c,</div><div class='del'>-	0x0dc5, 0x0804, 0x8f6d, 0x00ae, 0x00be, 0x00ce, 0x00ee, 0x0005,</div><div class='del'>-	0xa86c, 0xa06e, 0xa870, 0xa072, 0xa077, 0x00ff, 0x9006, 0x0804,</div><div class='del'>-	0x8f4f, 0x0006, 0x0016, 0x00b6, 0x6010, 0x2058, 0xb810, 0x9005,</div><div class='del'>-	0x01b0, 0x2001, 0x1925, 0x2004, 0x9005, 0x0188, 0x2001, 0x1800,</div><div class='del'>-	0x2004, 0x9086, 0x0003, 0x1158, 0x0036, 0x0046, 0xbba0, 0x2021,</div><div class='del'>-	0x0004, 0x2011, 0x8014, 0x080c, 0x4c44, 0x004e, 0x003e, 0x00be,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x9016, 0x710c, 0xa834, 0x910a, 0xa936,</div><div class='del'>-	0x7008, 0x9005, 0x0120, 0x8210, 0x910a, 0x0230, 0x0128, 0x7010,</div><div class='del'>-	0x8210, 0x910a, 0x0208, 0x1de0, 0xaa8a, 0xa26a, 0x0005, 0x00f6,</div><div class='del'>-	0x00d6, 0x0036, 0x2079, 0x0300, 0x781b, 0x0200, 0x7818, 0xd094,</div><div class='del'>-	0x1dd8, 0x781b, 0x0202, 0xa001, 0xa001, 0x7818, 0xd094, 0x1da0,</div><div class='del'>-	0xb8ac, 0x906d, 0x0198, 0x2079, 0x0000, 0x9c1e, 0x1118, 0x680c,</div><div class='del'>-	0xb8ae, 0x0050, 0x9c06, 0x0130, 0x2d78, 0x680c, 0x906d, 0x1dd0,</div><div class='del'>-	0x080c, 0x0dc5, 0x6b0c, 0x7b0e, 0x600f, 0x0000, 0x2079, 0x0300,</div><div class='del'>-	0x781b, 0x0200, 0x003e, 0x00de, 0x00fe, 0x0005, 0x00e6, 0x00d6,</div><div class='del'>-	0x0096, 0x00c6, 0x0036, 0x0126, 0x2091, 0x8000, 0x0156, 0x20a9,</div><div class='del'>-	0x01ff, 0x2071, 0x0300, 0x701b, 0x0200, 0x7018, 0xd094, 0x0110,</div><div class='del'>-	0x1f04, 0x90a3, 0x701b, 0x0202, 0xa001, 0xa001, 0x7018, 0xd094,</div><div class='del'>-	0x1d90, 0xb8ac, 0x9065, 0x01f0, 0x600c, 0xb8ae, 0x6024, 0xc08d,</div><div class='del'>-	0x6026, 0x6003, 0x0004, 0x601b, 0x0000, 0x6013, 0x0000, 0x601f,</div><div class='del'>-	0x0101, 0x6014, 0x904d, 0x090c, 0x0dc5, 0xa88b, 0x0000, 0xa8a8,</div><div class='del'>-	0xa8ab, 0x0000, 0x904d, 0x090c, 0x0dc5, 0x080c, 0x1040, 0x080c,</div><div class='del'>-	0x8c61, 0x08f8, 0x2071, 0x0300, 0x701b, 0x0200, 0x015e, 0x012e,</div><div class='del'>-	0x003e, 0x00ce, 0x009e, 0x00de, 0x00ee, 0x0005, 0x00c6, 0x00b6,</div><div class='del'>-	0x0016, 0x0006, 0x0156, 0x080c, 0x2873, 0x015e, 0x11b0, 0x080c,</div><div class='del'>-	0x66b9, 0x190c, 0x0dc5, 0x000e, 0x001e, 0xb912, 0xb816, 0x080c,</div><div class='del'>-	0xb27d, 0x0140, 0x2b00, 0x6012, 0x6023, 0x0001, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0xb352, 0x00be, 0x00ce, 0x0005, 0x000e, 0x001e, 0x0cd0,</div><div class='del'>-	0x0066, 0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0dc5, 0x0013, 0x006e,</div><div class='del'>-	0x0005, 0x9119, 0x9119, 0x9119, 0x911b, 0x916c, 0x9119, 0x9119,</div><div class='del'>-	0x9119, 0x91e6, 0x9119, 0x9223, 0x9119, 0x9119, 0x9119, 0x9119,</div><div class='del'>-	0x9119, 0x080c, 0x0dc5, 0x9182, 0x0040, 0x0002, 0x912e, 0x912e,</div><div class='del'>-	0x912e, 0x912e, 0x912e, 0x912e, 0x912e, 0x912e, 0x912e, 0x9130,</div><div class='del'>-	0x9145, 0x912e, 0x912e, 0x912e, 0x912e, 0x9158, 0x080c, 0x0dc5,</div><div class='del'>-	0x0096, 0x080c, 0x9a61, 0x080c, 0x9bd3, 0x6114, 0x2148, 0xa87b,</div><div class='del'>-	0x0000, 0x6010, 0x00b6, 0x2058, 0xb8bb, 0x0500, 0x00be, 0x080c,</div><div class='del'>-	0x6ca3, 0x080c, 0xb2d3, 0x009e, 0x0005, 0x080c, 0x9a61, 0x00d6,</div><div class='del'>-	0x6114, 0x080c, 0xd0d8, 0x0130, 0x0096, 0x6114, 0x2148, 0x080c,</div><div class='del'>-	0x6e9f, 0x009e, 0x00de, 0x080c, 0xb2d3, 0x080c, 0x9bd3, 0x0005,</div><div class='del'>-	0x080c, 0x9a61, 0x080c, 0x3250, 0x6114, 0x0096, 0x2148, 0x080c,</div><div class='del'>-	0xd0d8, 0x0120, 0xa87b, 0x0029, 0x080c, 0x6e9f, 0x009e, 0x080c,</div><div class='del'>-	0xb2d3, 0x080c, 0x9bd3, 0x0005, 0x601b, 0x0000, 0x9182, 0x0040,</div><div class='del'>-	0x0096, 0x0002, 0x9187, 0x9187, 0x9187, 0x9187, 0x9187, 0x9187,</div><div class='del'>-	0x9187, 0x9187, 0x9189, 0x9187, 0x9187, 0x9187, 0x91e2, 0x9187,</div><div class='del'>-	0x9187, 0x9187, 0x9187, 0x9187, 0x9187, 0x9190, 0x9187, 0x080c,</div><div class='del'>-	0x0dc5, 0x6114, 0x2148, 0xa938, 0x918e, 0xffff, 0x0904, 0x91e2,</div><div class='del'>-	0x6024, 0xd08c, 0x15d8, 0x080c, 0x8d17, 0x05e0, 0x00e6, 0x6114,</div><div class='del'>-	0x2148, 0x080c, 0x8f37, 0x0096, 0xa8a8, 0x2048, 0x080c, 0x6c3b,</div><div class='del'>-	0x009e, 0xa8ab, 0x0000, 0x6010, 0x9005, 0x0128, 0x00b6, 0x2058,</div><div class='del'>-	0x080c, 0x9067, 0x00be, 0xae88, 0x00b6, 0x2059, 0x0000, 0x080c,</div><div class='del'>-	0x8c6a, 0x00be, 0x01e0, 0x2071, 0x193d, 0x080c, 0x8cb1, 0x01b8,</div><div class='del'>-	0x9086, 0x0001, 0x1128, 0x2001, 0x1947, 0x2004, 0x9005, 0x1178,</div><div class='del'>-	0x0096, 0x080c, 0x100e, 0x2900, 0x009e, 0x0148, 0xa8aa, 0x00f6,</div><div class='del'>-	0x2c78, 0x080c, 0x8c28, 0x00fe, 0x00ee, 0x009e, 0x0005, 0x080c,</div><div class='del'>-	0x8c61, 0x0cd0, 0x080c, 0x8d1c, 0x1160, 0x6010, 0x9005, 0x0130,</div><div class='del'>-	0x2058, 0xb8ac, 0x9005, 0x190c, 0x0dc5, 0x6012, 0x2c00, 0x080c,</div><div class='del'>-	0x8ce2, 0x0005, 0x080c, 0x9290, 0x009e, 0x0005, 0x9182, 0x0040,</div><div class='del'>-	0x0096, 0x0002, 0x91fa, 0x91fa, 0x91fa, 0x91fc, 0x91fa, 0x91fa,</div><div class='del'>-	0x91fa, 0x9221, 0x91fa, 0x91fa, 0x91fa, 0x91fa, 0x91fa, 0x91fa,</div><div class='del'>-	0x91fa, 0x91fa, 0x080c, 0x0dc5, 0x6003, 0x0003, 0x6106, 0x6014,</div><div class='del'>-	0x2048, 0xa8ac, 0xa846, 0xa8b0, 0xa84a, 0xa837, 0x0000, 0xa83b,</div><div class='del'>-	0x0000, 0xa884, 0x9092, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003,</div><div class='del'>-	0x8013, 0x8213, 0x9210, 0x621a, 0x2c10, 0x080c, 0x1be0, 0x080c,</div><div class='del'>-	0x9564, 0x0126, 0x2091, 0x8000, 0x080c, 0x9bd3, 0x012e, 0x009e,</div><div class='del'>-	0x0005, 0x080c, 0x0dc5, 0x080c, 0x9a61, 0x080c, 0x9bd3, 0x6114,</div><div class='del'>-	0x2148, 0xa87b, 0x0000, 0x6010, 0x00b6, 0x2058, 0xb8bb, 0x0500,</div><div class='del'>-	0x00be, 0x080c, 0x6e9f, 0x080c, 0xb2d3, 0x009e, 0x0005, 0x6000,</div><div class='del'>-	0x908a, 0x0010, 0x1a0c, 0x0dc5, 0x0096, 0x0013, 0x009e, 0x0005,</div><div class='del'>-	0x9250, 0x9250, 0x9250, 0x9252, 0x9263, 0x9250, 0x9250, 0x9250,</div><div class='del'>-	0x9250, 0x9250, 0x9250, 0x9250, 0x9250, 0x9250, 0x9250, 0x9250,</div><div class='del'>-	0x080c, 0x0dc5, 0x080c, 0xac2b, 0x6114, 0x2148, 0xa87b, 0x0006,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb8bb, 0x0500, 0x00be, 0x080c, 0x6e9f,</div><div class='del'>-	0x080c, 0xb2d3, 0x0005, 0x0461, 0x0005, 0x6000, 0x908a, 0x0010,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x0096, 0x0013, 0x009e, 0x0005, 0x927e, 0x927e,</div><div class='del'>-	0x927e, 0x9280, 0x9290, 0x927e, 0x927e, 0x927e, 0x927e, 0x927e,</div><div class='del'>-	0x927e, 0x927e, 0x927e, 0x927e, 0x927e, 0x927e, 0x080c, 0x0dc5,</div><div class='del'>-	0x0036, 0x00e6, 0x2071, 0x19e8, 0x703c, 0x9c06, 0x1120, 0x2019,</div><div class='del'>-	0x0000, 0x080c, 0xaa49, 0x080c, 0xac2b, 0x00ee, 0x003e, 0x0005,</div><div class='del'>-	0x6024, 0xd08c, 0x11f0, 0x00f6, 0x00e6, 0x601b, 0x0000, 0x6014,</div><div class='del'>-	0x2048, 0x6010, 0x9005, 0x0128, 0x00b6, 0x2058, 0x080c, 0x9067,</div><div class='del'>-	0x00be, 0x2071, 0x193d, 0x080c, 0x8cb1, 0x0160, 0x2001, 0x187f,</div><div class='del'>-	0x2004, 0xa88a, 0x2031, 0x0000, 0x2c78, 0x080c, 0x8c28, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x0096, 0xa88b, 0x0000, 0xa8a8, 0x2048, 0x080c,</div><div class='del'>-	0x1040, 0x009e, 0xa8ab, 0x0000, 0x080c, 0x8c61, 0x0c80, 0x2001,</div><div class='del'>-	0x1925, 0x200c, 0x918e, 0x0000, 0x190c, 0x8d17, 0x05c8, 0x00e6,</div><div class='del'>-	0x2071, 0x1924, 0x7110, 0xc1c5, 0x7112, 0x080c, 0x8d21, 0x00f6,</div><div class='del'>-	0x00c6, 0x2071, 0x1000, 0x00b6, 0x2e04, 0x905d, 0x0138, 0xb8ac,</div><div class='del'>-	0x9065, 0x0120, 0x080c, 0x8cf7, 0x090c, 0x9096, 0x8e70, 0x9e86,</div><div class='del'>-	0x1800, 0x1d90, 0x00be, 0x00d6, 0x0096, 0x0046, 0x2061, 0x1cd0,</div><div class='del'>-	0x2001, 0x181a, 0x2024, 0x6020, 0x9086, 0x0000, 0x1191, 0x9ce0,</div><div class='del'>-	0x0018, 0x2400, 0x9c06, 0x1db8, 0x004e, 0x009e, 0x00de, 0x00d1,</div><div class='del'>-	0x00ce, 0x00fe, 0x2071, 0x1924, 0x7110, 0xc1c4, 0x7112, 0x00ee,</div><div class='del'>-	0x0005, 0x6020, 0x9086, 0x0009, 0x1160, 0x6100, 0x9186, 0x0004,</div><div class='del'>-	0x1138, 0x6110, 0x81ff, 0x190c, 0x0dc5, 0x2c00, 0x080c, 0x8ce2,</div><div class='del'>-	0x9006, 0x0005, 0x2071, 0x193f, 0x2073, 0x0000, 0x8e70, 0x9e86,</div><div class='del'>-	0x1947, 0x1dd0, 0x2071, 0x193d, 0x7006, 0x7002, 0x2001, 0x1930,</div><div class='del'>-	0x2064, 0x8cff, 0x0130, 0x6120, 0x918e, 0x0000, 0x190c, 0x0dc5,</div><div class='del'>-	0x2102, 0x2001, 0x188a, 0x200c, 0x81ff, 0x0148, 0x0096, 0x2148,</div><div class='del'>-	0x080c, 0x1040, 0x009e, 0x2001, 0x188a, 0x2003, 0x0000, 0x2071,</div><div class='del'>-	0x1931, 0x080c, 0x8f00, 0x0804, 0x8f0f, 0x0000, 0x0000, 0x0000,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x187a, 0x0000,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0036, 0x0046, 0x20a9, 0x0010, 0x9006, 0x8004, 0x2019, 0x0100,</div><div class='del'>-	0x231c, 0x93a6, 0x0008, 0x1118, 0x8086, 0x818e, 0x0020, 0x80f6,</div><div class='del'>-	0x3e00, 0x81f6, 0x3e08, 0x1208, 0x9200, 0x1f04, 0x9356, 0x93a6,</div><div class='del'>-	0x0008, 0x1118, 0x8086, 0x818e, 0x0020, 0x80f6, 0x3e00, 0x81f6,</div><div class='del'>-	0x3e08, 0x004e, 0x003e, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0076, 0x0156, 0x20a9, 0x0010, 0x9005, 0x0510, 0x911a, 0x1600,</div><div class='del'>-	0x8213, 0x2039, 0x0100, 0x273c, 0x97be, 0x0008, 0x1110, 0x818d,</div><div class='del'>-	0x0010, 0x81f5, 0x3e08, 0x0228, 0x911a, 0x1220, 0x1f04, 0x9380,</div><div class='del'>-	0x0028, 0x911a, 0x2308, 0x8210, 0x1f04, 0x9380, 0x0006, 0x3200,</div><div class='del'>-	0x9084, 0xefff, 0x2080, 0x000e, 0x015e, 0x007e, 0x012e, 0x0005,</div><div class='del'>-	0x0006, 0x3200, 0x9085, 0x1000, 0x0ca8, 0x0126, 0x2091, 0x2800,</div><div class='del'>-	0x2079, 0x19e8, 0x012e, 0x00d6, 0x2069, 0x19e8, 0x6803, 0x0005,</div><div class='del'>-	0x0156, 0x0146, 0x01d6, 0x20e9, 0x0000, 0x2069, 0x0200, 0x080c,</div><div class='del'>-	0xaf8e, 0x0401, 0x080c, 0xaf79, 0x00e9, 0x080c, 0xaf7c, 0x00d1,</div><div class='del'>-	0x080c, 0xaf7f, 0x00b9, 0x080c, 0xaf82, 0x00a1, 0x080c, 0xaf85,</div><div class='del'>-	0x0089, 0x080c, 0xaf88, 0x0071, 0x080c, 0xaf8b, 0x0059, 0x01de,</div><div class='del'>-	0x014e, 0x015e, 0x2069, 0x0004, 0x2d04, 0x9085, 0x8001, 0x206a,</div><div class='del'>-	0x00de, 0x0005, 0x20a9, 0x0020, 0x20a1, 0x0240, 0x2001, 0x0000,</div><div class='del'>-	0x4004, 0x0005, 0x00c6, 0x6027, 0x0001, 0x7804, 0x9084, 0x0007,</div><div class='del'>-	0x0002, 0x93f3, 0x9417, 0x9458, 0x93f9, 0x9417, 0x93f3, 0x93f1,</div><div class='del'>-	0x93f1, 0x080c, 0x0dc5, 0x080c, 0x88c3, 0x080c, 0x9ab1, 0x00ce,</div><div class='del'>-	0x0005, 0x62c0, 0x82ff, 0x1110, 0x00ce, 0x0005, 0x2011, 0x5f97,</div><div class='del'>-	0x080c, 0x883d, 0x7828, 0x9092, 0x00c8, 0x1228, 0x8000, 0x782a,</div><div class='del'>-	0x080c, 0x5fd7, 0x0c88, 0x62c0, 0x080c, 0xb0ca, 0x080c, 0x5f97,</div><div class='del'>-	0x7807, 0x0003, 0x7827, 0x0000, 0x782b, 0x0000, 0x0c28, 0x080c,</div><div class='del'>-	0x88c3, 0x6220, 0xd2a4, 0x0170, 0xd2cc, 0x0160, 0x782b, 0x0000,</div><div class='del'>-	0x7824, 0x9065, 0x090c, 0x0dc5, 0x2009, 0x0013, 0x080c, 0xb352,</div><div class='del'>-	0x00ce, 0x0005, 0x00c6, 0x7824, 0x9065, 0x090c, 0x0dc5, 0x7828,</div><div class='del'>-	0x9092, 0xc350, 0x12c0, 0x8000, 0x782a, 0x00ce, 0x080c, 0x2bce,</div><div class='del'>-	0x0278, 0x00c6, 0x7924, 0x2160, 0x6010, 0x906d, 0x090c, 0x0dc5,</div><div class='del'>-	0x7807, 0x0000, 0x7827, 0x0000, 0x00ce, 0x080c, 0x9ab1, 0x0c00,</div><div class='del'>-	0x080c, 0xa6c5, 0x08e8, 0x2011, 0x0130, 0x2214, 0x080c, 0xb0ca,</div><div class='del'>-	0x080c, 0xf094, 0x2009, 0x0014, 0x080c, 0xb352, 0x00ce, 0x0880,</div><div class='del'>-	0x2001, 0x1a04, 0x2003, 0x0000, 0x62c0, 0x82ff, 0x1160, 0x782b,</div><div class='del'>-	0x0000, 0x7824, 0x9065, 0x090c, 0x0dc5, 0x2009, 0x0013, 0x080c,</div><div class='del'>-	0xb3a4, 0x00ce, 0x0005, 0x00b6, 0x00c6, 0x00d6, 0x7824, 0x9005,</div><div class='del'>-	0x090c, 0x0dc5, 0x7828, 0x9092, 0xc350, 0x1648, 0x8000, 0x782a,</div><div class='del'>-	0x00de, 0x00ce, 0x00be, 0x080c, 0x2bce, 0x02f0, 0x00b6, 0x00c6,</div><div class='del'>-	0x00d6, 0x781c, 0x905d, 0x090c, 0x0dc5, 0xb800, 0xc0dc, 0xb802,</div><div class='del'>-	0x7924, 0x2160, 0x080c, 0xb2d3, 0xb93c, 0x81ff, 0x090c, 0x0dc5,</div><div class='del'>-	0x8109, 0xb93e, 0x7807, 0x0000, 0x7827, 0x0000, 0x00de, 0x00ce,</div><div class='del'>-	0x00be, 0x080c, 0x9ab1, 0x0868, 0x080c, 0xa6c5, 0x0850, 0x2011,</div><div class='del'>-	0x0130, 0x2214, 0x080c, 0xb0ca, 0x080c, 0xf094, 0x7824, 0x9065,</div><div class='del'>-	0x2009, 0x0014, 0x080c, 0xb352, 0x00de, 0x00ce, 0x00be, 0x0804,</div><div class='del'>-	0x9469, 0x00c6, 0x2001, 0x009b, 0x2004, 0xd0fc, 0x190c, 0x1eeb,</div><div class='del'>-	0x6024, 0x6027, 0x0002, 0xd0f4, 0x15b8, 0x62c8, 0x60c4, 0x9205,</div><div class='del'>-	0x1170, 0x783c, 0x9065, 0x0130, 0x2009, 0x0049, 0x080c, 0xb352,</div><div class='del'>-	0x00ce, 0x0005, 0x2011, 0x1a07, 0x2013, 0x0000, 0x0cc8, 0x793c,</div><div class='del'>-	0x81ff, 0x0dc0, 0x7944, 0x9192, 0x7530, 0x1628, 0x8108, 0x7946,</div><div class='del'>-	0x793c, 0x9188, 0x0008, 0x210c, 0x918e, 0x0006, 0x1138, 0x6014,</div><div class='del'>-	0x9084, 0x1984, 0x9085, 0x0012, 0x6016, 0x0c10, 0x793c, 0x9188,</div><div class='del'>-	0x0008, 0x210c, 0x918e, 0x0009, 0x0d90, 0x6014, 0x9084, 0x1984,</div><div class='del'>-	0x9085, 0x0016, 0x6016, 0x08a0, 0x793c, 0x2160, 0x2009, 0x004a,</div><div class='del'>-	0x080c, 0xb352, 0x0868, 0x7848, 0xc085, 0x784a, 0x0848, 0x0006,</div><div class='del'>-	0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08,</div><div class='del'>-	0x2061, 0x19e8, 0x6020, 0x8000, 0x6022, 0x6010, 0x9005, 0x0148,</div><div class='del'>-	0x9080, 0x0003, 0x2102, 0x6112, 0x012e, 0x00ce, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x6116, 0x6112, 0x0cc0, 0x00d6, 0x2069, 0x19e8, 0xb800,</div><div class='del'>-	0xd0d4, 0x0168, 0x6820, 0x8000, 0x6822, 0x9086, 0x0001, 0x1110,</div><div class='del'>-	0x2b00, 0x681e, 0x00de, 0x0804, 0x9ab1, 0x00de, 0x0005, 0xc0d5,</div><div class='del'>-	0xb802, 0x6818, 0x9005, 0x0168, 0xb856, 0xb85b, 0x0000, 0x0086,</div><div class='del'>-	0x0006, 0x2b00, 0x681a, 0x008e, 0xa05a, 0x008e, 0x2069, 0x19e8,</div><div class='del'>-	0x0c08, 0xb856, 0xb85a, 0x2b00, 0x681a, 0x681e, 0x08d8, 0x0006,</div><div class='del'>-	0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08,</div><div class='del'>-	0x2061, 0x19e8, 0x6020, 0x8000, 0x6022, 0x6008, 0x9005, 0x0148,</div><div class='del'>-	0x9080, 0x0003, 0x2102, 0x610a, 0x012e, 0x00ce, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x610e, 0x610a, 0x0cc0, 0x00c6, 0x600f, 0x0000, 0x2c08,</div><div class='del'>-	0x2061, 0x19e8, 0x6034, 0x9005, 0x0130, 0x9080, 0x0003, 0x2102,</div><div class='del'>-	0x6136, 0x00ce, 0x0005, 0x613a, 0x6136, 0x00ce, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x00d6, 0x00c6, 0x00b6, 0x0096, 0x0076, 0x0066, 0x0056,</div><div class='del'>-	0x0036, 0x0026, 0x0016, 0x0006, 0x0126, 0x902e, 0x2071, 0x19e8,</div><div class='del'>-	0x7638, 0x2660, 0x2678, 0x2091, 0x8000, 0x8cff, 0x0904, 0x95f3,</div><div class='del'>-	0x6010, 0x2058, 0xb8a0, 0x9206, 0x1904, 0x95ee, 0x87ff, 0x0120,</div><div class='del'>-	0x6054, 0x9106, 0x1904, 0x95ee, 0x703c, 0x9c06, 0x1178, 0x0036,</div><div class='del'>-	0x2019, 0x0001, 0x080c, 0xaa49, 0x7033, 0x0000, 0x9006, 0x703e,</div><div class='del'>-	0x7042, 0x7046, 0x704a, 0x003e, 0x2029, 0x0001, 0x7038, 0x9c36,</div><div class='del'>-	0x1110, 0x660c, 0x763a, 0x7034, 0x9c36, 0x1140, 0x2c00, 0x9f36,</div><div class='del'>-	0x0118, 0x2f00, 0x7036, 0x0010, 0x7037, 0x0000, 0x660c, 0x0066,</div><div class='del'>-	0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000,</div><div class='del'>-	0x080c, 0xd0d8, 0x01f0, 0x6014, 0x2048, 0x6020, 0x9086, 0x0003,</div><div class='del'>-	0x15b8, 0x6004, 0x9086, 0x0040, 0x090c, 0xac1b, 0xa867, 0x0103,</div><div class='del'>-	0xab7a, 0xa877, 0x0000, 0x0016, 0x0036, 0x0076, 0x080c, 0xd3ce,</div><div class='del'>-	0x080c, 0xef85, 0x080c, 0x6e9f, 0x007e, 0x003e, 0x001e, 0x080c,</div><div class='del'>-	0xd2c3, 0x080c, 0xb306, 0x00ce, 0x0804, 0x958d, 0x2c78, 0x600c,</div><div class='del'>-	0x2060, 0x0804, 0x958d, 0x85ff, 0x0120, 0x0036, 0x080c, 0x9bd3,</div><div class='del'>-	0x003e, 0x012e, 0x000e, 0x001e, 0x002e, 0x003e, 0x005e, 0x006e,</div><div class='del'>-	0x007e, 0x009e, 0x00be, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x6020, 0x9086, 0x0006, 0x1158, 0x0016, 0x0036, 0x0076, 0x080c,</div><div class='del'>-	0xef85, 0x080c, 0xebd4, 0x007e, 0x003e, 0x001e, 0x0890, 0x6020,</div><div class='del'>-	0x9086, 0x0009, 0x1168, 0xa87b, 0x0006, 0x0016, 0x0036, 0x0076,</div><div class='del'>-	0x080c, 0x6e9f, 0x080c, 0xb2d3, 0x007e, 0x003e, 0x001e, 0x0818,</div><div class='del'>-	0x6020, 0x9086, 0x000a, 0x0904, 0x95d8, 0x0804, 0x95d1, 0x0006,</div><div class='del'>-	0x0066, 0x0096, 0x00c6, 0x00d6, 0x00f6, 0x9036, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2079, 0x19e8, 0x7838, 0x9065, 0x0904, 0x9684, 0x600c,</div><div class='del'>-	0x0006, 0x600f, 0x0000, 0x783c, 0x9c06, 0x1168, 0x0036, 0x2019,</div><div class='del'>-	0x0001, 0x080c, 0xaa49, 0x7833, 0x0000, 0x901e, 0x7b3e, 0x7b42,</div><div class='del'>-	0x7b46, 0x7b4a, 0x003e, 0x080c, 0xd0d8, 0x0548, 0x6014, 0x2048,</div><div class='del'>-	0x6020, 0x9086, 0x0003, 0x1590, 0x3e08, 0x918e, 0x0002, 0x1188,</div><div class='del'>-	0x6010, 0x9005, 0x0170, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,</div><div class='del'>-	0x0140, 0x6040, 0x9005, 0x11a8, 0x2001, 0x1988, 0x2004, 0x6042,</div><div class='del'>-	0x0080, 0x6004, 0x9086, 0x0040, 0x090c, 0xac1b, 0xa867, 0x0103,</div><div class='del'>-	0xab7a, 0xa877, 0x0000, 0x080c, 0x6e92, 0x080c, 0xd2c3, 0x080c,</div><div class='del'>-	0xb306, 0x000e, 0x0804, 0x963c, 0x7e3a, 0x7e36, 0x012e, 0x00fe,</div><div class='del'>-	0x00de, 0x00ce, 0x009e, 0x006e, 0x000e, 0x0005, 0x6020, 0x9086,</div><div class='del'>-	0x0006, 0x1118, 0x080c, 0xebd4, 0x0c50, 0x6020, 0x9086, 0x0009,</div><div class='del'>-	0x1130, 0xab7a, 0x080c, 0x6e9f, 0x080c, 0xb2d3, 0x0c10, 0x6020,</div><div class='del'>-	0x9086, 0x000a, 0x09a8, 0x0868, 0x0016, 0x0026, 0x0086, 0x9046,</div><div class='del'>-	0x0099, 0x080c, 0x978f, 0x008e, 0x002e, 0x001e, 0x0005, 0x00f6,</div><div class='del'>-	0x0126, 0x2079, 0x19e8, 0x2091, 0x8000, 0x080c, 0x9826, 0x080c,</div><div class='del'>-	0x98b6, 0x012e, 0x00fe, 0x0005, 0x00b6, 0x0096, 0x00f6, 0x00e6,</div><div class='del'>-	0x00d6, 0x00c6, 0x0066, 0x0016, 0x0006, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0x19e8, 0x7614, 0x2660, 0x2678, 0x8cff, 0x0904, 0x9754,</div><div class='del'>-	0x6010, 0x2058, 0xb8a0, 0x9206, 0x1904, 0x974f, 0x88ff, 0x0120,</div><div class='del'>-	0x6054, 0x9106, 0x1904, 0x974f, 0x7024, 0x9c06, 0x1568, 0x2069,</div><div class='del'>-	0x0100, 0x6820, 0xd0a4, 0x0110, 0xd0cc, 0x1508, 0x080c, 0x88c3,</div><div class='del'>-	0x080c, 0xa6e9, 0x68c3, 0x0000, 0x080c, 0xac1b, 0x7027, 0x0000,</div><div class='del'>-	0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001,</div><div class='del'>-	0x0100, 0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x2069, 0x0100,</div><div class='del'>-	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x0028, 0x6003,</div><div class='del'>-	0x0009, 0x630a, 0x0804, 0x974f, 0x7014, 0x9c36, 0x1110, 0x660c,</div><div class='del'>-	0x7616, 0x7010, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00,</div><div class='del'>-	0x7012, 0x0010, 0x7013, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0xd0d8, 0x01e8, 0x6020, 0x9086, 0x0003, 0x1580, 0x080c,</div><div class='del'>-	0xd2e0, 0x1118, 0x080c, 0xbcb6, 0x0098, 0xa867, 0x0103, 0xab7a,</div><div class='del'>-	0xa877, 0x0000, 0x0016, 0x0036, 0x0086, 0x080c, 0xd3ce, 0x080c,</div><div class='del'>-	0xef85, 0x080c, 0x6e9f, 0x008e, 0x003e, 0x001e, 0x080c, 0xd2c3,</div><div class='del'>-	0x080c, 0xb306, 0x080c, 0xaaf1, 0x00ce, 0x0804, 0x96cd, 0x2c78,</div><div class='del'>-	0x600c, 0x2060, 0x0804, 0x96cd, 0x012e, 0x000e, 0x001e, 0x006e,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x00fe, 0x009e, 0x00be, 0x0005, 0x6020,</div><div class='del'>-	0x9086, 0x0006, 0x1158, 0x0016, 0x0036, 0x0086, 0x080c, 0xef85,</div><div class='del'>-	0x080c, 0xebd4, 0x008e, 0x003e, 0x001e, 0x08d0, 0x080c, 0xbcb6,</div><div class='del'>-	0x6020, 0x9086, 0x0002, 0x1160, 0x6004, 0x0006, 0x9086, 0x0085,</div><div class='del'>-	0x000e, 0x0904, 0x9735, 0x9086, 0x008b, 0x0904, 0x9735, 0x0840,</div><div class='del'>-	0x6020, 0x9086, 0x0005, 0x1920, 0x6004, 0x0006, 0x9086, 0x0085,</div><div class='del'>-	0x000e, 0x09c8, 0x9086, 0x008b, 0x09b0, 0x0804, 0x9748, 0x00b6,</div><div class='del'>-	0x00a6, 0x0096, 0x00c6, 0x0006, 0x0126, 0x2091, 0x8000, 0x9280,</div><div class='del'>-	0x1000, 0x2004, 0x905d, 0x0904, 0x981f, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x0066, 0x2071, 0x19e8, 0xbe54, 0x7018, 0x9b06, 0x1108, 0x761a,</div><div class='del'>-	0x701c, 0x9b06, 0x1130, 0x86ff, 0x1118, 0x7018, 0x701e, 0x0008,</div><div class='del'>-	0x761e, 0xb858, 0x904d, 0x0108, 0xae56, 0x96d5, 0x0000, 0x0110,</div><div class='del'>-	0x2900, 0xb05a, 0xb857, 0x0000, 0xb85b, 0x0000, 0xb800, 0xc0d4,</div><div class='del'>-	0xc0dc, 0xb802, 0x080c, 0x664c, 0x0904, 0x981b, 0x7624, 0x86ff,</div><div class='del'>-	0x0904, 0x980a, 0x9680, 0x0005, 0x2004, 0x9906, 0x15d8, 0x00d6,</div><div class='del'>-	0x2069, 0x0100, 0x68c0, 0x9005, 0x0560, 0x080c, 0x88c3, 0x080c,</div><div class='del'>-	0xa6e9, 0x68c3, 0x0000, 0x080c, 0xac1b, 0x7027, 0x0000, 0x0036,</div><div class='del'>-	0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100,</div><div class='del'>-	0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x2069, 0x0100, 0x6824,</div><div class='del'>-	0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x00de, 0x00c6, 0xb83c,</div><div class='del'>-	0x9005, 0x0110, 0x8001, 0xb83e, 0x2660, 0x080c, 0xb306, 0x00ce,</div><div class='del'>-	0x0048, 0x00de, 0x00c6, 0x2660, 0x6003, 0x0009, 0x630a, 0x00ce,</div><div class='del'>-	0x0804, 0x97c2, 0x89ff, 0x0158, 0xa867, 0x0103, 0xab7a, 0xa877,</div><div class='del'>-	0x0000, 0x080c, 0xd3ce, 0x080c, 0xef85, 0x080c, 0x6e9f, 0x080c,</div><div class='del'>-	0xaaf1, 0x0804, 0x97c2, 0x006e, 0x00de, 0x00ee, 0x00fe, 0x012e,</div><div class='del'>-	0x000e, 0x00ce, 0x009e, 0x00ae, 0x00be, 0x0005, 0x0096, 0x0006,</div><div class='del'>-	0x0066, 0x00c6, 0x00d6, 0x9036, 0x7814, 0x9065, 0x0904, 0x9889,</div><div class='del'>-	0x600c, 0x0006, 0x600f, 0x0000, 0x7824, 0x9c06, 0x1580, 0x2069,</div><div class='del'>-	0x0100, 0x6820, 0xd0a4, 0x0110, 0xd0cc, 0x1508, 0x080c, 0x88c3,</div><div class='del'>-	0x080c, 0xa6e9, 0x68c3, 0x0000, 0x080c, 0xac1b, 0x7827, 0x0000,</div><div class='del'>-	0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001,</div><div class='del'>-	0x0100, 0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x2069, 0x0100,</div><div class='del'>-	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x0040, 0x080c,</div><div class='del'>-	0x6a3b, 0x1520, 0x6003, 0x0009, 0x630a, 0x2c30, 0x00f8, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xd0d6, 0x01b0, 0x6020, 0x9086, 0x0003, 0x1508,</div><div class='del'>-	0x080c, 0xd2e0, 0x1118, 0x080c, 0xbcb6, 0x0060, 0x080c, 0x6a3b,</div><div class='del'>-	0x1168, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x6e9f,</div><div class='del'>-	0x080c, 0xd2c3, 0x080c, 0xb306, 0x080c, 0xaaf1, 0x000e, 0x0804,</div><div class='del'>-	0x982d, 0x7e16, 0x7e12, 0x00de, 0x00ce, 0x006e, 0x000e, 0x009e,</div><div class='del'>-	0x0005, 0x6020, 0x9086, 0x0006, 0x1118, 0x080c, 0xebd4, 0x0c50,</div><div class='del'>-	0x080c, 0xbcb6, 0x6020, 0x9086, 0x0002, 0x1150, 0x6004, 0x0006,</div><div class='del'>-	0x9086, 0x0085, 0x000e, 0x0990, 0x9086, 0x008b, 0x0978, 0x08d0,</div><div class='del'>-	0x6020, 0x9086, 0x0005, 0x19b0, 0x6004, 0x0006, 0x9086, 0x0085,</div><div class='del'>-	0x000e, 0x0d18, 0x9086, 0x008b, 0x0d00, 0x0860, 0x0006, 0x0066,</div><div class='del'>-	0x0096, 0x00b6, 0x00c6, 0x00d6, 0x7818, 0x905d, 0x0904, 0x9936,</div><div class='del'>-	0xb854, 0x0006, 0x9006, 0xb856, 0xb85a, 0xb800, 0xc0d4, 0xc0dc,</div><div class='del'>-	0xb802, 0x080c, 0x664c, 0x0904, 0x9933, 0x7e24, 0x86ff, 0x0904,</div><div class='del'>-	0x9926, 0x9680, 0x0005, 0x2004, 0x9906, 0x1904, 0x9926, 0x00d6,</div><div class='del'>-	0x2069, 0x0100, 0x68c0, 0x9005, 0x0904, 0x991d, 0x080c, 0x88c3,</div><div class='del'>-	0x080c, 0xa6e9, 0x68c3, 0x0000, 0x080c, 0xac1b, 0x7827, 0x0000,</div><div class='del'>-	0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001,</div><div class='del'>-	0x0100, 0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x2069, 0x0100,</div><div class='del'>-	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x00de, 0x00c6,</div><div class='del'>-	0x3e08, 0x918e, 0x0002, 0x1168, 0xb800, 0xd0bc, 0x0150, 0x9680,</div><div class='del'>-	0x0010, 0x200c, 0x81ff, 0x1518, 0x2009, 0x1988, 0x210c, 0x2102,</div><div class='del'>-	0x00f0, 0xb83c, 0x9005, 0x0110, 0x8001, 0xb83e, 0x2660, 0x600f,</div><div class='del'>-	0x0000, 0x080c, 0xb306, 0x00ce, 0x0048, 0x00de, 0x00c6, 0x2660,</div><div class='del'>-	0x6003, 0x0009, 0x630a, 0x00ce, 0x0804, 0x98c9, 0x89ff, 0x0138,</div><div class='del'>-	0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x6e9f, 0x080c,</div><div class='del'>-	0xaaf1, 0x0804, 0x98c9, 0x000e, 0x0804, 0x98bd, 0x781e, 0x781a,</div><div class='del'>-	0x00de, 0x00ce, 0x00be, 0x009e, 0x006e, 0x000e, 0x0005, 0x00e6,</div><div class='del'>-	0x00d6, 0x0096, 0x0066, 0xb800, 0xd0dc, 0x01a0, 0xb84c, 0x904d,</div><div class='del'>-	0x0188, 0xa878, 0x9606, 0x1170, 0x2071, 0x19e8, 0x7024, 0x9035,</div><div class='del'>-	0x0148, 0x9080, 0x0005, 0x2004, 0x9906, 0x1120, 0xb800, 0xc0dc,</div><div class='del'>-	0xb802, 0x0029, 0x006e, 0x009e, 0x00de, 0x00ee, 0x0005, 0x00f6,</div><div class='del'>-	0x2079, 0x0100, 0x78c0, 0x9005, 0x1138, 0x00c6, 0x2660, 0x6003,</div><div class='del'>-	0x0009, 0x630a, 0x00ce, 0x04b8, 0x080c, 0xa6e9, 0x78c3, 0x0000,</div><div class='del'>-	0x080c, 0xac1b, 0x7027, 0x0000, 0x0036, 0x2079, 0x0140, 0x7b04,</div><div class='del'>-	0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x2d39, 0x9006,</div><div class='del'>-	0x080c, 0x2d39, 0x2079, 0x0100, 0x7824, 0xd084, 0x0110, 0x7827,</div><div class='del'>-	0x0001, 0x080c, 0xac1b, 0x003e, 0x080c, 0x664c, 0x00c6, 0xb83c,</div><div class='del'>-	0x9005, 0x0110, 0x8001, 0xb83e, 0x2660, 0x080c, 0xb2d3, 0x00ce,</div><div class='del'>-	0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0xd3ce, 0x080c,</div><div class='del'>-	0x6e9f, 0x080c, 0xaaf1, 0x00fe, 0x0005, 0x00b6, 0x00e6, 0x00c6,</div><div class='del'>-	0x2011, 0x0101, 0x2204, 0xc0c4, 0x2012, 0x2001, 0x180c, 0x2014,</div><div class='del'>-	0xc2e4, 0x2202, 0x2071, 0x19e8, 0x7004, 0x9084, 0x0007, 0x0002,</div><div class='del'>-	0x99c2, 0x99c6, 0x99e4, 0x9a0d, 0x9a4b, 0x99c2, 0x99dd, 0x99c0,</div><div class='del'>-	0x080c, 0x0dc5, 0x00ce, 0x00ee, 0x00be, 0x0005, 0x7024, 0x9065,</div><div class='del'>-	0x0148, 0x7020, 0x8001, 0x7022, 0x600c, 0x9015, 0x0158, 0x7216,</div><div class='del'>-	0x600f, 0x0000, 0x7007, 0x0000, 0x7027, 0x0000, 0x00ce, 0x00ee,</div><div class='del'>-	0x00be, 0x0005, 0x7216, 0x7212, 0x0ca8, 0x7007, 0x0000, 0x7027,</div><div class='del'>-	0x0000, 0x7020, 0x9005, 0x0070, 0x6010, 0x2058, 0x080c, 0x664c,</div><div class='del'>-	0xb800, 0xc0dc, 0xb802, 0x7007, 0x0000, 0x7027, 0x0000, 0x7020,</div><div class='del'>-	0x8001, 0x7022, 0x1148, 0x2001, 0x180c, 0x2014, 0xd2ec, 0x1180,</div><div class='del'>-	0x00ce, 0x00ee, 0x00be, 0x0005, 0xb854, 0x9015, 0x0120, 0x721e,</div><div class='del'>-	0x080c, 0x9ab1, 0x0ca8, 0x7218, 0x721e, 0x080c, 0x9ab1, 0x0c80,</div><div class='del'>-	0xc2ec, 0x2202, 0x080c, 0x9bd3, 0x0c58, 0x7024, 0x9065, 0x05b8,</div><div class='del'>-	0x700c, 0x9c06, 0x1160, 0x080c, 0xaaf1, 0x600c, 0x9015, 0x0120,</div><div class='del'>-	0x720e, 0x600f, 0x0000, 0x0448, 0x720e, 0x720a, 0x0430, 0x7014,</div><div class='del'>-	0x9c06, 0x1160, 0x080c, 0xaaf1, 0x600c, 0x9015, 0x0120, 0x7216,</div><div class='del'>-	0x600f, 0x0000, 0x00d0, 0x7216, 0x7212, 0x00b8, 0x6020, 0x9086,</div><div class='del'>-	0x0003, 0x1198, 0x6010, 0x2058, 0x080c, 0x664c, 0xb800, 0xc0dc,</div><div class='del'>-	0xb802, 0x080c, 0xaaf1, 0x701c, 0x9065, 0x0138, 0xb854, 0x9015,</div><div class='del'>-	0x0110, 0x721e, 0x0010, 0x7218, 0x721e, 0x7027, 0x0000, 0x00ce,</div><div class='del'>-	0x00ee, 0x00be, 0x0005, 0x7024, 0x9065, 0x0140, 0x080c, 0xaaf1,</div><div class='del'>-	0x600c, 0x9015, 0x0158, 0x720e, 0x600f, 0x0000, 0x080c, 0xac1b,</div><div class='del'>-	0x7027, 0x0000, 0x00ce, 0x00ee, 0x00be, 0x0005, 0x720e, 0x720a,</div><div class='del'>-	0x0ca8, 0x00d6, 0x2069, 0x19e8, 0x6830, 0x9084, 0x0003, 0x0002,</div><div class='del'>-	0x9a6e, 0x9a70, 0x9a94, 0x9a6c, 0x080c, 0x0dc5, 0x00de, 0x0005,</div><div class='del'>-	0x00c6, 0x6840, 0x9086, 0x0001, 0x01b8, 0x683c, 0x9065, 0x0130,</div><div class='del'>-	0x600c, 0x9015, 0x0170, 0x6a3a, 0x600f, 0x0000, 0x6833, 0x0000,</div><div class='del'>-	0x683f, 0x0000, 0x2011, 0x1a07, 0x2013, 0x0000, 0x00ce, 0x00de,</div><div class='del'>-	0x0005, 0x683a, 0x6836, 0x0c90, 0x6843, 0x0000, 0x6838, 0x9065,</div><div class='del'>-	0x0d68, 0x6003, 0x0003, 0x0c50, 0x00c6, 0x9006, 0x6842, 0x6846,</div><div class='del'>-	0x684a, 0x683c, 0x9065, 0x0160, 0x600c, 0x9015, 0x0130, 0x6a3a,</div><div class='del'>-	0x600f, 0x0000, 0x683f, 0x0000, 0x0018, 0x683e, 0x683a, 0x6836,</div><div class='del'>-	0x00ce, 0x00de, 0x0005, 0x2001, 0x180c, 0x200c, 0xc1e5, 0x2102,</div><div class='del'>-	0x0005, 0x2001, 0x180c, 0x200c, 0xd1ec, 0x0120, 0xc1ec, 0x2102,</div><div class='del'>-	0x080c, 0x9bd3, 0x2001, 0x19f4, 0x2004, 0x9086, 0x0001, 0x0d58,</div><div class='del'>-	0x00d6, 0x2069, 0x19e8, 0x6804, 0x9084, 0x0007, 0x0006, 0x9005,</div><div class='del'>-	0x11c8, 0x2001, 0x1837, 0x2004, 0x9084, 0x0028, 0x1198, 0x2001,</div><div class='del'>-	0x197c, 0x2004, 0x9086, 0xaaaa, 0x0168, 0x2001, 0x188b, 0x2004,</div><div class='del'>-	0xd08c, 0x1118, 0xd084, 0x1118, 0x0028, 0x080c, 0x9bd3, 0x000e,</div><div class='del'>-	0x00de, 0x0005, 0x000e, 0x0002, 0x9aee, 0x9ba7, 0x9ba7, 0x9ba7,</div><div class='del'>-	0x9ba7, 0x9ba9, 0x9ba7, 0x9aec, 0x080c, 0x0dc5, 0x6820, 0x9005,</div><div class='del'>-	0x1110, 0x00de, 0x0005, 0x00c6, 0x680c, 0x9065, 0x01f0, 0x6104,</div><div class='del'>-	0x918e, 0x0040, 0x1180, 0x2009, 0x1837, 0x210c, 0x918c, 0x0028,</div><div class='del'>-	0x1150, 0x080c, 0x7637, 0x0138, 0x0006, 0x2009, 0x188b, 0x2104,</div><div class='del'>-	0xc095, 0x200a, 0x000e, 0x6807, 0x0004, 0x6826, 0x682b, 0x0000,</div><div class='del'>-	0x080c, 0x9c7c, 0x00ce, 0x00de, 0x0005, 0x6814, 0x9065, 0x0150,</div><div class='del'>-	0x6807, 0x0001, 0x6826, 0x682b, 0x0000, 0x080c, 0x9c7c, 0x00ce,</div><div class='del'>-	0x00de, 0x0005, 0x00b6, 0x00e6, 0x6a1c, 0x92dd, 0x0000, 0x0904,</div><div class='del'>-	0x9b91, 0xb84c, 0x900d, 0x0118, 0xb888, 0x9005, 0x01a0, 0xb854,</div><div class='del'>-	0x905d, 0x0120, 0x920e, 0x0904, 0x9b91, 0x0028, 0x6818, 0x920e,</div><div class='del'>-	0x0904, 0x9b91, 0x2058, 0xb84c, 0x900d, 0x0d88, 0xb888, 0x9005,</div><div class='del'>-	0x1d70, 0x2b00, 0x681e, 0xbb3c, 0xb838, 0x9302, 0x1e40, 0x080c,</div><div class='del'>-	0xb2aa, 0x0904, 0x9b91, 0x8318, 0xbb3e, 0x6116, 0x2b10, 0x6212,</div><div class='del'>-	0x0096, 0x2148, 0xa880, 0x9084, 0x00ff, 0x605e, 0xa883, 0x0000,</div><div class='del'>-	0xa884, 0x009e, 0x908a, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003,</div><div class='del'>-	0x801b, 0x831b, 0x9318, 0x631a, 0x6114, 0x0096, 0x2148, 0xa964,</div><div class='del'>-	0x009e, 0x918c, 0x00ff, 0x918e, 0x0048, 0x0538, 0x00f6, 0x2c78,</div><div class='del'>-	0x2061, 0x0100, 0xbac0, 0x629a, 0x2069, 0x0200, 0x2071, 0x0240,</div><div class='del'>-	0x080c, 0xa219, 0x2069, 0x19e8, 0xbb00, 0xc3dd, 0xbb02, 0x6807,</div><div class='del'>-	0x0002, 0x2f18, 0x6b26, 0x682b, 0x0000, 0x7823, 0x0003, 0x7803,</div><div class='del'>-	0x0001, 0x7807, 0x0040, 0x00fe, 0x00ee, 0x00be, 0x00ce, 0x00de,</div><div class='del'>-	0x0005, 0x00ee, 0x00be, 0x00ce, 0x0cd0, 0x6807, 0x0006, 0x2c18,</div><div class='del'>-	0x6b26, 0x6820, 0x8001, 0x6822, 0x682b, 0x0000, 0x080c, 0x664c,</div><div class='del'>-	0x080c, 0xb0ea, 0x00ee, 0x00be, 0x00ce, 0x00de, 0x0005, 0x00de,</div><div class='del'>-	0x0005, 0x00c6, 0x680c, 0x9065, 0x01d8, 0x6104, 0x918e, 0x0040,</div><div class='del'>-	0x1180, 0x2009, 0x1837, 0x210c, 0x918c, 0x0028, 0x1150, 0x080c,</div><div class='del'>-	0x7637, 0x0138, 0x0006, 0x2009, 0x188b, 0x2104, 0xc095, 0x200a,</div><div class='del'>-	0x000e, 0x6807, 0x0004, 0x6826, 0x682b, 0x0000, 0x080c, 0x9c7c,</div><div class='del'>-	0x00ce, 0x00de, 0x0005, 0x2001, 0x180c, 0x2014, 0xc2ed, 0x2202,</div><div class='del'>-	0x00de, 0x00fe, 0x0005, 0x00f6, 0x00d6, 0x2069, 0x19e8, 0x6830,</div><div class='del'>-	0x9086, 0x0000, 0x1570, 0x2001, 0x180c, 0x2014, 0xd2e4, 0x0130,</div><div class='del'>-	0xc2e4, 0x2202, 0x080c, 0x9ac0, 0x2069, 0x19e8, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0xd1c4, 0x1508, 0x6838, 0x907d, 0x01d8, 0x6a04, 0x9296,</div><div class='del'>-	0x0000, 0x1904, 0x9c70, 0x7920, 0x918e, 0x0009, 0x0568, 0x6833,</div><div class='del'>-	0x0001, 0x683e, 0x6847, 0x0000, 0x684b, 0x0000, 0x0126, 0x00f6,</div><div class='del'>-	0x2091, 0x2400, 0x002e, 0x080c, 0x1c79, 0x1158, 0x012e, 0x080c,</div><div class='del'>-	0xa546, 0x00de, 0x00fe, 0x0005, 0xc1c4, 0x2102, 0x080c, 0x76e4,</div><div class='del'>-	0x08d0, 0x012e, 0x6843, 0x0000, 0x7803, 0x0002, 0x780c, 0x9015,</div><div class='del'>-	0x0140, 0x6a3a, 0x780f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000,</div><div class='del'>-	0x0c40, 0x683a, 0x6836, 0x0cc0, 0x7908, 0xd1fc, 0x1198, 0x6833,</div><div class='del'>-	0x0001, 0x683e, 0x6847, 0x0000, 0x684b, 0x0000, 0x0126, 0x00f6,</div><div class='del'>-	0x2091, 0x2400, 0x002e, 0x080c, 0x1c79, 0x19d8, 0x012e, 0x080c,</div><div class='del'>-	0xa4c7, 0x0878, 0x2001, 0x1837, 0x2004, 0x9084, 0x0028, 0x1188,</div><div class='del'>-	0x2001, 0x197c, 0x2004, 0x9086, 0xaaaa, 0x0158, 0x2001, 0x19e9,</div><div class='del'>-	0x2004, 0x9005, 0x11f0, 0x2001, 0x188b, 0x200c, 0xc185, 0xc18c,</div><div class='del'>-	0x2102, 0x2f00, 0x6833, 0x0001, 0x683e, 0x6847, 0x0000, 0x684b,</div><div class='del'>-	0x0000, 0x0126, 0x00f6, 0x2091, 0x2400, 0x002e, 0x080c, 0x1c79,</div><div class='del'>-	0x1904, 0x9c11, 0x012e, 0x6a3c, 0x2278, 0x080c, 0xa451, 0x0804,</div><div class='del'>-	0x9c09, 0x2011, 0x188b, 0x2204, 0xc08d, 0x2012, 0x0804, 0x9c09,</div><div class='del'>-	0x6a04, 0x9296, 0x0006, 0x1904, 0x9bcb, 0x6a30, 0x9296, 0x0000,</div><div class='del'>-	0x0904, 0x9bf3, 0x0804, 0x9bcb, 0x6020, 0x9084, 0x000f, 0x000b,</div><div class='del'>-	0x0005, 0x9c90, 0x9c95, 0xa149, 0xa1e2, 0x9c95, 0xa149, 0xa1e2,</div><div class='del'>-	0x9c90, 0x9c95, 0x9c90, 0x9c90, 0x9c90, 0x9c90, 0x9c90, 0x9c90,</div><div class='del'>-	0x080c, 0x99a5, 0x080c, 0x9ab1, 0x0005, 0x00b6, 0x0156, 0x0136,</div><div class='del'>-	0x0146, 0x01c6, 0x01d6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2069,</div><div class='del'>-	0x0200, 0x2071, 0x0240, 0x6004, 0x908a, 0x0053, 0x1a0c, 0x0dc5,</div><div class='del'>-	0x6110, 0x2158, 0xb9c0, 0x2c78, 0x2061, 0x0100, 0x619a, 0x908a,</div><div class='del'>-	0x0040, 0x1a04, 0x9d01, 0x005b, 0x00fe, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x01de, 0x01ce, 0x014e, 0x013e, 0x015e, 0x00be, 0x0005, 0x9eaa,</div><div class='del'>-	0x9ee5, 0x9f0e, 0x9fd8, 0x9ffa, 0xa000, 0xa00d, 0xa015, 0xa021,</div><div class='del'>-	0xa027, 0xa038, 0xa027, 0xa090, 0xa015, 0xa09c, 0xa0a2, 0xa021,</div><div class='del'>-	0xa0a2, 0xa0ae, 0x9cff, 0x9cff, 0x9cff, 0x9cff, 0x9cff, 0x9cff,</div><div class='del'>-	0x9cff, 0x9cff, 0x9cff, 0x9cff, 0x9cff, 0xa900, 0xa923, 0xa934,</div><div class='del'>-	0xa954, 0xa986, 0xa00d, 0x9cff, 0xa00d, 0xa027, 0x9cff, 0x9f0e,</div><div class='del'>-	0x9fd8, 0x9cff, 0xad12, 0xa027, 0x9cff, 0xad2e, 0xa027, 0x9cff,</div><div class='del'>-	0xa021, 0x9ea4, 0x9d22, 0x9cff, 0xad4a, 0xadb7, 0xae92, 0x9cff,</div><div class='del'>-	0xae9f, 0xa00a, 0xaeca, 0x9cff, 0xa990, 0xaef7, 0x9cff, 0x080c,</div><div class='del'>-	0x0dc5, 0x2100, 0x005b, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x01de,</div><div class='del'>-	0x01ce, 0x014e, 0x013e, 0x015e, 0x00be, 0x0005, 0xaf92, 0xb044,</div><div class='del'>-	0x9d20, 0x9d5a, 0x9e06, 0x9e11, 0x9d20, 0xa00d, 0x9d20, 0x9e6b,</div><div class='del'>-	0x9e77, 0x9d75, 0x9d20, 0x9d90, 0x9dc4, 0xb1b1, 0xb1f6, 0xa027,</div><div class='del'>-	0x080c, 0x0dc5, 0x00d6, 0x0096, 0x080c, 0xa0c1, 0x0026, 0x0036,</div><div class='del'>-	0x7814, 0x2048, 0xa958, 0xd1cc, 0x1138, 0x2009, 0x2414, 0x2011,</div><div class='del'>-	0x0018, 0x2019, 0x0018, 0x0030, 0x2009, 0x2410, 0x2011, 0x0014,</div><div class='del'>-	0x2019, 0x0014, 0x7102, 0x7206, 0x700b, 0x0800, 0xa83c, 0x700e,</div><div class='del'>-	0xa850, 0x7022, 0xa854, 0x7026, 0x63c2, 0x080c, 0xa6bd, 0x003e,</div><div class='del'>-	0x002e, 0x009e, 0x00de, 0x0005, 0x7810, 0x00b6, 0x2058, 0xb8a0,</div><div class='del'>-	0x00be, 0x080c, 0xb23d, 0x1118, 0x9084, 0xff80, 0x0110, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x00d6, 0x0096, 0x080c, 0xa0c1, 0x7003, 0x0500,</div><div class='del'>-	0x7814, 0x2048, 0xa874, 0x700a, 0xa878, 0x700e, 0xa87c, 0x7012,</div><div class='del'>-	0xa880, 0x7016, 0xa884, 0x701a, 0xa888, 0x701e, 0x60c3, 0x0010,</div><div class='del'>-	0x080c, 0xa6bd, 0x009e, 0x00de, 0x0005, 0x00d6, 0x0096, 0x080c,</div><div class='del'>-	0xa0c1, 0x7003, 0x0500, 0x7814, 0x2048, 0xa8cc, 0x700a, 0xa8d0,</div><div class='del'>-	0x700e, 0xa8d4, 0x7012, 0xa8d8, 0x7016, 0xa8dc, 0x701a, 0xa8e0,</div><div class='del'>-	0x701e, 0x60c3, 0x0010, 0x080c, 0xa6bd, 0x009e, 0x00de, 0x0005,</div><div class='del'>-	0x00d6, 0x0096, 0x0126, 0x2091, 0x8000, 0x080c, 0xa0c1, 0x20e9,</div><div class='del'>-	0x0000, 0x2001, 0x19a4, 0x2003, 0x0000, 0x7814, 0x2048, 0xa814,</div><div class='del'>-	0x8003, 0x60c2, 0xa830, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x001b, 0x2098, 0x2001, 0x19a4, 0x0016, 0x200c, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x23ee, 0x080c, 0xde7c, 0x9006, 0x080c, 0x23ee, 0x001e,</div><div class='del'>-	0xa804, 0x9005, 0x0110, 0x2048, 0x0c28, 0x04d9, 0x080c, 0xa6bd,</div><div class='del'>-	0x012e, 0x009e, 0x00de, 0x0005, 0x00d6, 0x0096, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xa10c, 0x20e9, 0x0000, 0x2001, 0x19a4, 0x2003,</div><div class='del'>-	0x0000, 0x7814, 0x2048, 0xa86f, 0x0200, 0xa873, 0x0000, 0xa814,</div><div class='del'>-	0x8003, 0x60c2, 0xa830, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x001b, 0x2098, 0x2001, 0x19a4, 0x0016, 0x200c, 0x080c, 0xde7c,</div><div class='del'>-	0x001e, 0xa804, 0x9005, 0x0110, 0x2048, 0x0c60, 0x0051, 0x7814,</div><div class='del'>-	0x2048, 0x080c, 0x0fc0, 0x080c, 0xa6bd, 0x012e, 0x009e, 0x00de,</div><div class='del'>-	0x0005, 0x60c0, 0x8004, 0x9084, 0x0003, 0x9005, 0x0130, 0x9082,</div><div class='del'>-	0x0004, 0x20a3, 0x0000, 0x8000, 0x1de0, 0x0005, 0x080c, 0xa0c1,</div><div class='del'>-	0x7003, 0x7800, 0x7808, 0x8007, 0x700a, 0x60c3, 0x0008, 0x0804,</div><div class='del'>-	0xa6bd, 0x00d6, 0x00e6, 0x080c, 0xa10c, 0x7814, 0x9084, 0xff00,</div><div class='del'>-	0x2073, 0x0200, 0x8e70, 0x8e70, 0x9096, 0xdf00, 0x0138, 0x9096,</div><div class='del'>-	0xe000, 0x0120, 0x2073, 0x0010, 0x8e70, 0x0030, 0x9095, 0x0010,</div><div class='del'>-	0x2272, 0x8e70, 0x2073, 0x0034, 0x8e70, 0x2069, 0x1805, 0x20a9,</div><div class='del'>-	0x0004, 0x2d76, 0x8d68, 0x8e70, 0x1f04, 0x9e31, 0x2069, 0x1801,</div><div class='del'>-	0x20a9, 0x0004, 0x2d76, 0x8d68, 0x8e70, 0x1f04, 0x9e3a, 0x9096,</div><div class='del'>-	0xdf00, 0x0130, 0x9096, 0xe000, 0x0118, 0x60c3, 0x0018, 0x00f0,</div><div class='del'>-	0x2069, 0x19b4, 0x9086, 0xdf00, 0x0110, 0x2069, 0x19ce, 0x20a9,</div><div class='del'>-	0x001a, 0x9e86, 0x0260, 0x1148, 0x00c6, 0x2061, 0x0200, 0x6010,</div><div class='del'>-	0x8000, 0x6012, 0x00ce, 0x2071, 0x0240, 0x2d04, 0x8007, 0x2072,</div><div class='del'>-	0x8d68, 0x8e70, 0x1f04, 0x9e51, 0x60c3, 0x004c, 0x080c, 0xa6bd,</div><div class='del'>-	0x00ee, 0x00de, 0x0005, 0x080c, 0xa0c1, 0x7003, 0x6300, 0x7007,</div><div class='del'>-	0x0028, 0x7808, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa6bd, 0x00d6,</div><div class='del'>-	0x0026, 0x0016, 0x080c, 0xa10c, 0x7003, 0x0200, 0x7814, 0x700e,</div><div class='del'>-	0x00e6, 0x9ef0, 0x0004, 0x2009, 0x0001, 0x2011, 0x000c, 0x2069,</div><div class='del'>-	0x1924, 0x6810, 0xd084, 0x1148, 0x2073, 0x0500, 0x8e70, 0x2073,</div><div class='del'>-	0x0000, 0x8e70, 0x8108, 0x9290, 0x0004, 0x2073, 0x0800, 0x8e70,</div><div class='del'>-	0x2073, 0x0000, 0x00ee, 0x7206, 0x710a, 0x62c2, 0x080c, 0xa6bd,</div><div class='del'>-	0x001e, 0x002e, 0x00de, 0x0005, 0x2001, 0x1818, 0x2004, 0x609a,</div><div class='del'>-	0x0804, 0xa6bd, 0x080c, 0xa0c1, 0x7003, 0x5200, 0x2069, 0x1847,</div><div class='del'>-	0x6804, 0xd084, 0x0130, 0x6828, 0x0016, 0x080c, 0x28a6, 0x710e,</div><div class='del'>-	0x001e, 0x20a9, 0x0004, 0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9,</div><div class='del'>-	0x0000, 0x20a1, 0x0250, 0x4003, 0x20a9, 0x0004, 0x2099, 0x1801,</div><div class='del'>-	0x20a1, 0x0254, 0x4003, 0x080c, 0xb23d, 0x1120, 0xb8a0, 0x9082,</div><div class='del'>-	0x007f, 0x0248, 0x2001, 0x181f, 0x2004, 0x7032, 0x2001, 0x1820,</div><div class='del'>-	0x2004, 0x7036, 0x0030, 0x2001, 0x1818, 0x2004, 0x9084, 0x00ff,</div><div class='del'>-	0x7036, 0x60c3, 0x001c, 0x0804, 0xa6bd, 0x080c, 0xa0c1, 0x7003,</div><div class='del'>-	0x0500, 0x080c, 0xb23d, 0x1120, 0xb8a0, 0x9082, 0x007f, 0x0248,</div><div class='del'>-	0x2001, 0x181f, 0x2004, 0x700a, 0x2001, 0x1820, 0x2004, 0x700e,</div><div class='del'>-	0x0030, 0x2001, 0x1818, 0x2004, 0x9084, 0x00ff, 0x700e, 0x20a9,</div><div class='del'>-	0x0004, 0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x0250, 0x4003, 0x60c3, 0x0010, 0x0804, 0xa6bd, 0x080c, 0xa0c1,</div><div class='del'>-	0x9006, 0x080c, 0x6a6d, 0xb8a0, 0x9086, 0x007e, 0x1170, 0x2011,</div><div class='del'>-	0x0240, 0x2013, 0x22ff, 0x2011, 0x0241, 0x2013, 0xfffe, 0x7003,</div><div class='del'>-	0x0400, 0x620c, 0xc2b4, 0x620e, 0x0058, 0x7814, 0x0096, 0x904d,</div><div class='del'>-	0x0120, 0x9006, 0xa89a, 0xa8a6, 0xa8aa, 0x009e, 0x7003, 0x0300,</div><div class='del'>-	0xb8a0, 0x9086, 0x007e, 0x1904, 0x9f98, 0x00d6, 0x2069, 0x196c,</div><div class='del'>-	0x2001, 0x1837, 0x2004, 0xd0a4, 0x0188, 0x6800, 0x700a, 0x6808,</div><div class='del'>-	0x9084, 0x2000, 0x7012, 0x080c, 0xb254, 0x680c, 0x7016, 0x701f,</div><div class='del'>-	0x2710, 0x6818, 0x7022, 0x681c, 0x7026, 0x0428, 0x6800, 0x700a,</div><div class='del'>-	0x6804, 0x700e, 0x2009, 0x180d, 0x210c, 0xd18c, 0x0110, 0x2001,</div><div class='del'>-	0x0002, 0x00f6, 0x2079, 0x0100, 0x080c, 0x7637, 0x1128, 0x78e3,</div><div class='del'>-	0x0000, 0x080c, 0x28e7, 0x78e2, 0x00fe, 0x6808, 0x080c, 0x7637,</div><div class='del'>-	0x1118, 0x9084, 0x37ff, 0x0010, 0x9084, 0x3fff, 0x7012, 0x080c,</div><div class='del'>-	0xb254, 0x680c, 0x7016, 0x00de, 0x20a9, 0x0004, 0x20e1, 0x0001,</div><div class='del'>-	0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1, 0x0256, 0x4003, 0x20a9,</div><div class='del'>-	0x0004, 0x2099, 0x1801, 0x20a1, 0x025a, 0x4003, 0x00d6, 0x080c,</div><div class='del'>-	0xaf79, 0x2069, 0x1974, 0x2071, 0x024e, 0x6800, 0xc0dd, 0x7002,</div><div class='del'>-	0x080c, 0x57d9, 0xd0e4, 0x0110, 0x680c, 0x700e, 0x00de, 0x04e0,</div><div class='del'>-	0x2001, 0x1837, 0x2004, 0xd0a4, 0x01a8, 0x0016, 0x2001, 0x180d,</div><div class='del'>-	0x2004, 0xd08c, 0x2009, 0x0002, 0x1118, 0x2001, 0x196d, 0x200c,</div><div class='del'>-	0x60e0, 0x9106, 0x0130, 0x2100, 0x60e3, 0x0000, 0x080c, 0x28e7,</div><div class='del'>-	0x61e2, 0x001e, 0x20e1, 0x0001, 0x2099, 0x196c, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x024e, 0x20a9, 0x0008, 0x4003, 0x20a9, 0x0004, 0x2099,</div><div class='del'>-	0x1805, 0x20a1, 0x0256, 0x4003, 0x20a9, 0x0004, 0x2099, 0x1801,</div><div class='del'>-	0x20a1, 0x025a, 0x4003, 0x080c, 0xaf79, 0x20a1, 0x024e, 0x20a9,</div><div class='del'>-	0x0008, 0x2099, 0x1974, 0x4003, 0x60c3, 0x0074, 0x0804, 0xa6bd,</div><div class='del'>-	0x080c, 0xa0c1, 0x7003, 0x2010, 0x7007, 0x0014, 0x700b, 0x0800,</div><div class='del'>-	0x700f, 0x2000, 0x9006, 0x00f6, 0x2079, 0x1847, 0x7904, 0x00fe,</div><div class='del'>-	0xd1ac, 0x1110, 0x9085, 0x0020, 0xd1a4, 0x0110, 0x9085, 0x0010,</div><div class='del'>-	0x9085, 0x0002, 0x00d6, 0x0804, 0xa071, 0x7026, 0x60c3, 0x0014,</div><div class='del'>-	0x0804, 0xa6bd, 0x080c, 0xa0c1, 0x7003, 0x5000, 0x0804, 0x9f30,</div><div class='del'>-	0x080c, 0xa0c1, 0x7003, 0x2110, 0x7007, 0x0014, 0x60c3, 0x0014,</div><div class='del'>-	0x0804, 0xa6bd, 0x080c, 0xa103, 0x0010, 0x080c, 0xa10c, 0x7003,</div><div class='del'>-	0x0200, 0x60c3, 0x0004, 0x0804, 0xa6bd, 0x080c, 0xa10c, 0x7003,</div><div class='del'>-	0x0100, 0x700b, 0x0003, 0x700f, 0x2a00, 0x60c3, 0x0008, 0x0804,</div><div class='del'>-	0xa6bd, 0x080c, 0xa10c, 0x7003, 0x0200, 0x0804, 0x9f30, 0x080c,</div><div class='del'>-	0xa10c, 0x7003, 0x0100, 0x782c, 0x9005, 0x0110, 0x700a, 0x0010,</div><div class='del'>-	0x700b, 0x0003, 0x7814, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa6bd,</div><div class='del'>-	0x00d6, 0x080c, 0xa10c, 0x7003, 0x0210, 0x7007, 0x0014, 0x700b,</div><div class='del'>-	0x0800, 0xb894, 0x9086, 0x0014, 0x1198, 0xb99c, 0x9184, 0x0030,</div><div class='del'>-	0x0190, 0xb998, 0x9184, 0xc000, 0x1140, 0xd1ec, 0x0118, 0x700f,</div><div class='del'>-	0x2100, 0x0058, 0x700f, 0x0100, 0x0040, 0x700f, 0x0400, 0x0028,</div><div class='del'>-	0x700f, 0x0700, 0x0010, 0x700f, 0x0800, 0x00f6, 0x2079, 0x1847,</div><div class='del'>-	0x7904, 0x00fe, 0xd1ac, 0x1110, 0x9085, 0x0020, 0xd1a4, 0x0110,</div><div class='del'>-	0x9085, 0x0010, 0x2009, 0x1869, 0x210c, 0xd184, 0x1110, 0x9085,</div><div class='del'>-	0x0002, 0x0026, 0x2009, 0x1867, 0x210c, 0xd1e4, 0x0150, 0xc0c5,</div><div class='del'>-	0xbacc, 0xd28c, 0x1108, 0xc0cd, 0x9094, 0x0030, 0x9296, 0x0010,</div><div class='del'>-	0x0140, 0xd1ec, 0x0130, 0x9094, 0x0030, 0x9296, 0x0010, 0x0108,</div><div class='del'>-	0xc0bd, 0x002e, 0x7026, 0x60c3, 0x0014, 0x00de, 0x0804, 0xa6bd,</div><div class='del'>-	0x080c, 0xa10c, 0x7003, 0x0210, 0x7007, 0x0014, 0x700f, 0x0100,</div><div class='del'>-	0x60c3, 0x0014, 0x0804, 0xa6bd, 0x080c, 0xa10c, 0x7003, 0x0200,</div><div class='del'>-	0x0804, 0x9eae, 0x080c, 0xa10c, 0x7003, 0x0100, 0x700b, 0x0003,</div><div class='del'>-	0x700f, 0x2a00, 0x60c3, 0x0008, 0x0804, 0xa6bd, 0x080c, 0xa10c,</div><div class='del'>-	0x7003, 0x0100, 0x700b, 0x000b, 0x60c3, 0x0008, 0x0804, 0xa6bd,</div><div class='del'>-	0x0026, 0x00d6, 0x0036, 0x0046, 0x2019, 0x3200, 0x2021, 0x0800,</div><div class='del'>-	0x0040, 0x0026, 0x00d6, 0x0036, 0x0046, 0x2019, 0x2200, 0x2021,</div><div class='del'>-	0x0100, 0x080c, 0xaf8e, 0xb810, 0x9305, 0x7002, 0xb814, 0x7006,</div><div class='del'>-	0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x9485, 0x0029,</div><div class='del'>-	0x7012, 0x004e, 0x003e, 0x00de, 0x080c, 0xa6ab, 0x721a, 0x9f95,</div><div class='del'>-	0x0000, 0x7222, 0x7027, 0xffff, 0x2071, 0x024c, 0x002e, 0x0005,</div><div class='del'>-	0x0026, 0x080c, 0xaf8e, 0x7003, 0x02ff, 0x7007, 0xfffc, 0x00d6,</div><div class='del'>-	0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x00de, 0x7013,</div><div class='del'>-	0x2029, 0x0c10, 0x7003, 0x0100, 0x7007, 0x0000, 0x700b, 0xfc02,</div><div class='del'>-	0x700f, 0x0000, 0x0005, 0x0026, 0x00d6, 0x0036, 0x0046, 0x2019,</div><div class='del'>-	0x3300, 0x2021, 0x0800, 0x0040, 0x0026, 0x00d6, 0x0036, 0x0046,</div><div class='del'>-	0x2019, 0x2300, 0x2021, 0x0100, 0x080c, 0xaf8e, 0xb810, 0x9305,</div><div class='del'>-	0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0xb810, 0x9005, 0x1140,</div><div class='del'>-	0xb814, 0x9005, 0x1128, 0x700b, 0x00ff, 0x700f, 0xfffe, 0x0020,</div><div class='del'>-	0x687c, 0x700a, 0x6880, 0x700e, 0x0000, 0x9485, 0x0098, 0x7012,</div><div class='del'>-	0x004e, 0x003e, 0x00de, 0x080c, 0xa6ab, 0x721a, 0x7a08, 0x7222,</div><div class='del'>-	0x2f10, 0x7226, 0x2071, 0x024c, 0x002e, 0x0005, 0x080c, 0xa6ab,</div><div class='del'>-	0x721a, 0x7a08, 0x7222, 0x7814, 0x7026, 0x2071, 0x024c, 0x002e,</div><div class='del'>-	0x0005, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2069, 0x0200,</div><div class='del'>-	0x2071, 0x0240, 0x6004, 0x908a, 0x0085, 0x0a0c, 0x0dc5, 0x908a,</div><div class='del'>-	0x0092, 0x1a0c, 0x0dc5, 0x6110, 0x2158, 0xb9c0, 0x2c78, 0x2061,</div><div class='del'>-	0x0100, 0x619a, 0x9082, 0x0085, 0x0033, 0x00fe, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x00be, 0x0005, 0xa17a, 0xa189, 0xa194, 0xa178, 0xa178,</div><div class='del'>-	0xa178, 0xa17a, 0xa178, 0xa178, 0xa178, 0xa178, 0xa178, 0xa178,</div><div class='del'>-	0x080c, 0x0dc5, 0x0411, 0x60c3, 0x0000, 0x0026, 0x080c, 0x2bce,</div><div class='del'>-	0x0228, 0x2011, 0x0101, 0x2204, 0xc0c5, 0x2012, 0x002e, 0x0804,</div><div class='del'>-	0xa6bd, 0x0431, 0x7808, 0x700a, 0x7814, 0x700e, 0x7017, 0xffff,</div><div class='del'>-	0x60c3, 0x000c, 0x0804, 0xa6bd, 0x04a1, 0x7003, 0x0003, 0x7007,</div><div class='del'>-	0x0300, 0x60c3, 0x0004, 0x0804, 0xa6bd, 0x0026, 0x080c, 0xaf8e,</div><div class='del'>-	0xb810, 0x9085, 0x8100, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800,</div><div class='del'>-	0x687c, 0x700a, 0x6880, 0x700e, 0x7013, 0x0009, 0x0804, 0xa0dc,</div><div class='del'>-	0x0026, 0x080c, 0xaf8e, 0xb810, 0x9085, 0x8400, 0x7002, 0xb814,</div><div class='del'>-	0x7006, 0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x2001,</div><div class='del'>-	0x0099, 0x7a20, 0x9296, 0x0005, 0x0108, 0xc0bc, 0x7012, 0x0804,</div><div class='del'>-	0xa13e, 0x0026, 0x080c, 0xaf8e, 0xb810, 0x9085, 0x8500, 0x7002,</div><div class='del'>-	0xb814, 0x7006, 0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e,</div><div class='del'>-	0x2001, 0x0099, 0x7a20, 0x9296, 0x0005, 0x0108, 0xc0bc, 0x7012,</div><div class='del'>-	0x0804, 0xa13e, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2c78,</div><div class='del'>-	0x2069, 0x0200, 0x2071, 0x0240, 0x7804, 0x908a, 0x0040, 0x0a0c,</div><div class='del'>-	0x0dc5, 0x908a, 0x0054, 0x1a0c, 0x0dc5, 0x7910, 0x2158, 0xb9c0,</div><div class='del'>-	0x2061, 0x0100, 0x619a, 0x9082, 0x0040, 0x0033, 0x00fe, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x00be, 0x0005, 0xa219, 0xa2e0, 0xa2b3, 0xa402,</div><div class='del'>-	0xa217, 0xa217, 0xa217, 0xa217, 0xa217, 0xa217, 0xa217, 0xaad8,</div><div class='del'>-	0xaadd, 0xaae2, 0xaae7, 0xa217, 0xaed6, 0xa217, 0xaad3, 0x080c,</div><div class='del'>-	0x0dc5, 0x0096, 0x780b, 0xffff, 0x080c, 0xa284, 0x7914, 0x2148,</div><div class='del'>-	0xa978, 0x7956, 0xae64, 0x96b4, 0x00ff, 0x9686, 0x0008, 0x1148,</div><div class='del'>-	0xa8b4, 0x7032, 0xa8b8, 0x7036, 0xa8bc, 0x703a, 0xa8c0, 0x703e,</div><div class='del'>-	0x0008, 0x7132, 0xa97c, 0x9184, 0x000f, 0x1118, 0x2001, 0x0005,</div><div class='del'>-	0x0040, 0xd184, 0x0118, 0x2001, 0x0004, 0x0018, 0x9084, 0x0006,</div><div class='del'>-	0x8004, 0x2010, 0x785c, 0x9084, 0x00ff, 0x8007, 0x9205, 0x7042,</div><div class='del'>-	0xd1ac, 0x0158, 0x7047, 0x0002, 0x9686, 0x0008, 0x1118, 0x080c,</div><div class='del'>-	0x18f7, 0x0010, 0x080c, 0x1768, 0x0050, 0xd1b4, 0x0118, 0x7047,</div><div class='del'>-	0x0001, 0x0028, 0x7047, 0x0000, 0x9016, 0x2230, 0x0010, 0xaab0,</div><div class='del'>-	0xaeac, 0x726a, 0x766e, 0x20a9, 0x0008, 0x20e9, 0x0000, 0xa860,</div><div class='del'>-	0x20e0, 0xa85c, 0x9080, 0x0023, 0x2098, 0x20a1, 0x0252, 0x2069,</div><div class='del'>-	0x0200, 0x6813, 0x0018, 0x4003, 0x6813, 0x0008, 0x60c3, 0x0020,</div><div class='del'>-	0x6017, 0x0009, 0x2001, 0x1a04, 0x2003, 0x07d0, 0x2001, 0x1a03,</div><div class='del'>-	0x2003, 0x0009, 0x009e, 0x0005, 0x6813, 0x0008, 0xba8c, 0x8210,</div><div class='del'>-	0xb8cc, 0xd084, 0x0180, 0x2001, 0x1ad0, 0x200c, 0x8108, 0x2102,</div><div class='del'>-	0x2001, 0x1acf, 0x201c, 0x1218, 0x8318, 0x2302, 0x0ea0, 0x794a,</div><div class='del'>-	0x712e, 0x7b46, 0x732a, 0x9294, 0x00ff, 0xba8e, 0x8217, 0x721a,</div><div class='del'>-	0xba10, 0x9295, 0x0600, 0x7202, 0xba14, 0x7206, 0x2069, 0x1800,</div><div class='del'>-	0x6a7c, 0x720a, 0x6a80, 0x720e, 0x7013, 0x0829, 0x2f10, 0x7222,</div><div class='del'>-	0x7027, 0xffff, 0x0005, 0x00d6, 0x0096, 0x0081, 0x7814, 0x2048,</div><div class='del'>-	0xa890, 0x7002, 0xa88c, 0x7006, 0xa8b0, 0x700a, 0xa8ac, 0x700e,</div><div class='del'>-	0x60c3, 0x000c, 0x009e, 0x00de, 0x0804, 0xa6bd, 0x6813, 0x0008,</div><div class='del'>-	0xb810, 0x9085, 0x0500, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800,</div><div class='del'>-	0x687c, 0x700a, 0x6880, 0x700e, 0x7013, 0x0889, 0x080c, 0xa6ab,</div><div class='del'>-	0x721a, 0x7a08, 0x7222, 0x2f10, 0x7226, 0x2071, 0x024c, 0x0005,</div><div class='del'>-	0x00d6, 0x0096, 0x080c, 0xa3e0, 0x7814, 0x2048, 0x080c, 0xd0d6,</div><div class='del'>-	0x1130, 0x7814, 0x9084, 0x0700, 0x8007, 0x0033, 0x0010, 0x9006,</div><div class='del'>-	0x001b, 0x009e, 0x00de, 0x0005, 0xa2fe, 0xa367, 0xa377, 0xa39d,</div><div class='del'>-	0xa3a9, 0xa3ba, 0xa3c2, 0xa2fc, 0x080c, 0x0dc5, 0x0016, 0x0036,</div><div class='del'>-	0xa97c, 0x918c, 0x0003, 0x0118, 0x9186, 0x0003, 0x1198, 0xaba8,</div><div class='del'>-	0x7824, 0xd0cc, 0x1168, 0x7316, 0xa898, 0x701a, 0xa894, 0x701e,</div><div class='del'>-	0x003e, 0x001e, 0x2001, 0x19b2, 0x2004, 0x60c2, 0x0804, 0xa6bd,</div><div class='del'>-	0xc3e5, 0x0c88, 0x9186, 0x0001, 0x190c, 0x0dc5, 0xaba8, 0x7824,</div><div class='del'>-	0xd0cc, 0x1904, 0xa364, 0x7316, 0xa898, 0x701a, 0xa894, 0x701e,</div><div class='del'>-	0xa8a4, 0x7026, 0xa8ac, 0x702e, 0x2009, 0x0018, 0x9384, 0x0300,</div><div class='del'>-	0x0570, 0xd3c4, 0x0110, 0xa8ac, 0x9108, 0xd3cc, 0x0110, 0xa8a4,</div><div class='del'>-	0x9108, 0x6810, 0x9085, 0x0010, 0x6812, 0x2011, 0x0258, 0x20e9,</div><div class='del'>-	0x0000, 0x22a0, 0x0156, 0x20a9, 0x0008, 0xa860, 0x20e0, 0xa85c,</div><div class='del'>-	0x9080, 0x002c, 0x2098, 0x4003, 0x6810, 0x8000, 0x6812, 0x2011,</div><div class='del'>-	0x0240, 0x22a0, 0x20a9, 0x0005, 0x4003, 0x6810, 0xc0a4, 0x6812,</div><div class='del'>-	0x015e, 0x9184, 0x0003, 0x0118, 0x2019, 0x0245, 0x201a, 0x61c2,</div><div class='del'>-	0x003e, 0x001e, 0x0804, 0xa6bd, 0xc3e5, 0x0804, 0xa323, 0x2011,</div><div class='del'>-	0x0008, 0x2001, 0x180f, 0x2004, 0xd0a4, 0x0110, 0x2011, 0x0028,</div><div class='del'>-	0x7824, 0xd0cc, 0x1110, 0x7216, 0x0470, 0x0ce8, 0xc2e5, 0x2011,</div><div class='del'>-	0x0302, 0x0016, 0x782c, 0x701a, 0x7930, 0x711e, 0x9105, 0x0108,</div><div class='del'>-	0xc2dd, 0x001e, 0x7824, 0xd0cc, 0x0108, 0xc2e5, 0x7216, 0x7027,</div><div class='del'>-	0x0012, 0x702f, 0x0008, 0x7043, 0x7000, 0x7047, 0x0500, 0x704f,</div><div class='del'>-	0x000a, 0x2069, 0x0200, 0x6813, 0x0009, 0x2071, 0x0240, 0x700b,</div><div class='del'>-	0x2500, 0x60c3, 0x0032, 0x0804, 0xa6bd, 0x2011, 0x0028, 0x7824,</div><div class='del'>-	0xd0cc, 0x1128, 0x7216, 0x60c3, 0x0018, 0x0804, 0xa6bd, 0x0cd0,</div><div class='del'>-	0xc2e5, 0x2011, 0x0100, 0x7824, 0xd0cc, 0x0108, 0xc2e5, 0x7216,</div><div class='del'>-	0x702f, 0x0008, 0x7858, 0x9084, 0x00ff, 0x7036, 0x60c3, 0x0020,</div><div class='del'>-	0x0804, 0xa6bd, 0x2011, 0x0008, 0x7824, 0xd0cc, 0x0108, 0xc2e5,</div><div class='del'>-	0x7216, 0x0c08, 0x0036, 0x7b14, 0x9384, 0xff00, 0x7816, 0x9384,</div><div class='del'>-	0x00ff, 0x8001, 0x1138, 0x7824, 0xd0cc, 0x0108, 0xc2e5, 0x7216,</div><div class='del'>-	0x003e, 0x0888, 0x0046, 0x2021, 0x0800, 0x0006, 0x7824, 0xd0cc,</div><div class='del'>-	0x000e, 0x0108, 0xc4e5, 0x7416, 0x004e, 0x701e, 0x003e, 0x0818,</div><div class='del'>-	0x00d6, 0x6813, 0x0008, 0xb810, 0x9085, 0x0700, 0x7002, 0xb814,</div><div class='del'>-	0x7006, 0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x7824,</div><div class='del'>-	0xd0cc, 0x1168, 0x7013, 0x0898, 0x080c, 0xa6ab, 0x721a, 0x7a08,</div><div class='del'>-	0x7222, 0x2f10, 0x7226, 0x2071, 0x024c, 0x00de, 0x0005, 0x7013,</div><div class='del'>-	0x0889, 0x0c90, 0x0016, 0x7814, 0x9084, 0x0700, 0x8007, 0x0013,</div><div class='del'>-	0x001e, 0x0005, 0xa412, 0xa412, 0xa414, 0xa412, 0xa412, 0xa412,</div><div class='del'>-	0xa42e, 0xa412, 0x080c, 0x0dc5, 0x7914, 0x918c, 0x08ff, 0x918d,</div><div class='del'>-	0xf600, 0x7916, 0x2009, 0x0003, 0x00b9, 0x2069, 0x1847, 0x6804,</div><div class='del'>-	0xd0bc, 0x0130, 0x682c, 0x9084, 0x00ff, 0x8007, 0x7032, 0x0010,</div><div class='del'>-	0x7033, 0x3f00, 0x60c3, 0x0001, 0x0804, 0xa6bd, 0x2009, 0x0003,</div><div class='del'>-	0x0019, 0x7033, 0x7f00, 0x0cb0, 0x0016, 0x080c, 0xaf8e, 0x001e,</div><div class='del'>-	0xb810, 0x9085, 0x0100, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800,</div><div class='del'>-	0x6a7c, 0x720a, 0x6a80, 0x720e, 0x7013, 0x0888, 0x918d, 0x0008,</div><div class='del'>-	0x7116, 0x080c, 0xa6ab, 0x721a, 0x7a08, 0x7222, 0x2f10, 0x7226,</div><div class='del'>-	0x0005, 0x00b6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046,</div><div class='del'>-	0x0036, 0x2061, 0x0100, 0x2071, 0x1800, 0x7160, 0x7810, 0x2058,</div><div class='del'>-	0x76dc, 0x96b4, 0x0028, 0x0110, 0x737c, 0x7480, 0x2500, 0x76dc,</div><div class='del'>-	0x96b4, 0x0028, 0x0140, 0x2001, 0x04ff, 0x6062, 0x6067, 0xffff,</div><div class='del'>-	0x636a, 0x646e, 0x0050, 0x2001, 0x00ff, 0x9085, 0x0400, 0x6062,</div><div class='del'>-	0x6067, 0xffff, 0x606b, 0x0000, 0x616e, 0xb8b8, 0x6073, 0x0530,</div><div class='del'>-	0x6077, 0x0008, 0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007,</div><div class='del'>-	0x9085, 0x0020, 0x607a, 0x607f, 0x0000, 0x2b00, 0x6082, 0x6087,</div><div class='del'>-	0xffff, 0x7814, 0x0096, 0x2048, 0xa838, 0x608a, 0xa834, 0x608e,</div><div class='del'>-	0xa848, 0x60c6, 0xa844, 0x60ca, 0x009e, 0xb86c, 0x60ce, 0x60ab,</div><div class='del'>-	0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000, 0x2001, 0x1837, 0x2004,</div><div class='del'>-	0x9084, 0x0028, 0x0128, 0x609f, 0x0000, 0x2001, 0x0092, 0x0048,</div><div class='del'>-	0x6028, 0xc0bd, 0x602a, 0x609f, 0x00ff, 0x6027, 0xffff, 0x2001,</div><div class='del'>-	0x00b2, 0x6016, 0x2009, 0x07d0, 0x080c, 0x88c8, 0x003e, 0x004e,</div><div class='del'>-	0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00be, 0x0005, 0x00b6,</div><div class='del'>-	0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046, 0x0036, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0x1800, 0x7160, 0x7810, 0x2058, 0xb8a0, 0x2028,</div><div class='del'>-	0x76dc, 0xd6ac, 0x1168, 0x9582, 0x007e, 0x1250, 0x2500, 0x9094,</div><div class='del'>-	0xff80, 0x1130, 0x9080, 0x33b6, 0x2015, 0x9294, 0x00ff, 0x0020,</div><div class='del'>-	0xb910, 0xba14, 0x737c, 0x7480, 0x70dc, 0xd0ac, 0x1130, 0x9582,</div><div class='del'>-	0x007e, 0x1218, 0x9584, 0xff80, 0x0138, 0x9185, 0x0400, 0x6062,</div><div class='del'>-	0x6266, 0x636a, 0x646e, 0x0030, 0x6063, 0x0400, 0x6266, 0x606b,</div><div class='del'>-	0x0000, 0x616e, 0xb8b8, 0x6072, 0x6077, 0x0000, 0xb864, 0xd0a4,</div><div class='del'>-	0x0110, 0x6077, 0x0008, 0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e,</div><div class='del'>-	0x8007, 0x9085, 0x0020, 0x607a, 0x607f, 0x0000, 0x2b00, 0x6082,</div><div class='del'>-	0x6087, 0xffff, 0x7814, 0x0096, 0x2048, 0xa838, 0x608a, 0xa834,</div><div class='del'>-	0x608e, 0xa848, 0x60c6, 0xa844, 0x60ca, 0x009e, 0xb86c, 0x60ce,</div><div class='del'>-	0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xbac0, 0x629e,</div><div class='del'>-	0x00f6, 0x2079, 0x0140, 0x7803, 0x0000, 0x00fe, 0x2009, 0x0092,</div><div class='del'>-	0x6116, 0x2009, 0x07d0, 0x080c, 0x88c8, 0x003e, 0x004e, 0x005e,</div><div class='del'>-	0x006e, 0x00ce, 0x00de, 0x00ee, 0x00be, 0x0005, 0x00b6, 0x0096,</div><div class='del'>-	0x00e6, 0x00d6, 0x00c6, 0x0056, 0x0046, 0x0036, 0x2061, 0x0100,</div><div class='del'>-	0x2071, 0x1800, 0x7810, 0x2058, 0xb8a0, 0x2028, 0xb910, 0xba14,</div><div class='del'>-	0x737c, 0x7480, 0x7820, 0x90be, 0x0006, 0x0904, 0xa61a, 0x90be,</div><div class='del'>-	0x000a, 0x1904, 0xa5d6, 0xb8c0, 0x609e, 0x7814, 0x2048, 0xa87c,</div><div class='del'>-	0xd0fc, 0x0558, 0xaf90, 0x9784, 0xff00, 0x9105, 0x6062, 0x873f,</div><div class='del'>-	0x9784, 0xff00, 0x0006, 0x7814, 0x2048, 0xa878, 0xc0fc, 0x9005,</div><div class='del'>-	0x000e, 0x1160, 0xaf94, 0x87ff, 0x0198, 0x2039, 0x0098, 0x9705,</div><div class='del'>-	0x6072, 0x7808, 0x6082, 0x2f00, 0x6086, 0x0038, 0x9185, 0x2200,</div><div class='del'>-	0x6062, 0x6073, 0x0129, 0x6077, 0x0000, 0xb8c0, 0x609e, 0x0050,</div><div class='del'>-	0x2039, 0x0029, 0x9705, 0x6072, 0x0cc0, 0x9185, 0x0200, 0x6062,</div><div class='del'>-	0x6073, 0x2029, 0xa87c, 0xd0fc, 0x0118, 0xaf94, 0x87ff, 0x1120,</div><div class='del'>-	0x2f00, 0x6082, 0x7808, 0x6086, 0x6266, 0x636a, 0x646e, 0x6077,</div><div class='del'>-	0x0000, 0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007, 0x607a,</div><div class='del'>-	0x607f, 0x0000, 0xa838, 0x608a, 0xa834, 0x608e, 0xa848, 0x60c6,</div><div class='del'>-	0xa844, 0x60ca, 0xb86c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000,</div><div class='del'>-	0x080c, 0xaf73, 0x2009, 0x07d0, 0x60c4, 0x9084, 0xfff0, 0x9005,</div><div class='del'>-	0x0110, 0x2009, 0x1b58, 0x080c, 0x88c8, 0x003e, 0x004e, 0x005e,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x009e, 0x00be, 0x0005, 0x7804, 0x9086,</div><div class='del'>-	0x0040, 0x0904, 0xa656, 0x9185, 0x0100, 0x6062, 0x6266, 0x636a,</div><div class='del'>-	0x646e, 0x6073, 0x0809, 0x6077, 0x0008, 0x60af, 0x95d5, 0x60d7,</div><div class='del'>-	0x0000, 0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007, 0x607a,</div><div class='del'>-	0x607f, 0x0000, 0x2f00, 0x6082, 0x7808, 0x6086, 0x7814, 0x2048,</div><div class='del'>-	0xa838, 0x608a, 0xa834, 0x608e, 0xa848, 0x60c6, 0xa844, 0x60ca,</div><div class='del'>-	0xb86c, 0x60ce, 0xbac0, 0x629e, 0x080c, 0xaf73, 0x2009, 0x07d0,</div><div class='del'>-	0x60c4, 0x9084, 0xfff0, 0x9005, 0x0110, 0x2009, 0x1b58, 0x080c,</div><div class='del'>-	0x88c8, 0x003e, 0x004e, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x009e,</div><div class='del'>-	0x00be, 0x0005, 0x7814, 0x2048, 0xa87c, 0x9084, 0x0003, 0x9086,</div><div class='del'>-	0x0002, 0x0904, 0xa672, 0x9185, 0x0100, 0x6062, 0x6266, 0x636a,</div><div class='del'>-	0x646e, 0x6073, 0x0880, 0x6077, 0x0008, 0xb88c, 0x8000, 0x9084,</div><div class='del'>-	0x00ff, 0xb88e, 0x8007, 0x607a, 0x7838, 0x607e, 0x2f00, 0x6086,</div><div class='del'>-	0x7808, 0x6082, 0xa890, 0x608a, 0xa88c, 0x608e, 0xa8b0, 0x60c6,</div><div class='del'>-	0xa8ac, 0x60ca, 0xa8ac, 0x7930, 0x9108, 0x7932, 0xa8b0, 0x792c,</div><div class='del'>-	0x9109, 0x792e, 0xb86c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000,</div><div class='del'>-	0xbac0, 0x629e, 0x080c, 0xaf50, 0x0804, 0xa606, 0xb8cc, 0xd084,</div><div class='del'>-	0x0148, 0xb88c, 0x7814, 0x2048, 0xb88c, 0x784a, 0xa836, 0x2900,</div><div class='del'>-	0xa83a, 0xb046, 0x9185, 0x0600, 0x6062, 0x6266, 0x636a, 0x646e,</div><div class='del'>-	0x6073, 0x0829, 0x6077, 0x0000, 0x60af, 0x9575, 0x60d7, 0x0000,</div><div class='del'>-	0x0804, 0xa5e9, 0x9185, 0x0700, 0x6062, 0x6266, 0x636a, 0x646e,</div><div class='del'>-	0x7824, 0xd0cc, 0x7826, 0x0118, 0x6073, 0x0889, 0x0010, 0x6073,</div><div class='del'>-	0x0898, 0x6077, 0x0000, 0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e,</div><div class='del'>-	0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6086, 0x7808, 0x6082,</div><div class='del'>-	0xa838, 0x608a, 0xa834, 0x608e, 0xa848, 0x60c6, 0xa844, 0x60ca,</div><div class='del'>-	0xb86c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xbac0, 0x629e,</div><div class='del'>-	0x7824, 0xd0cc, 0x0120, 0x080c, 0xaf73, 0x0804, 0xa606, 0x080c,</div><div class='del'>-	0xaf50, 0x0804, 0xa606, 0x7a10, 0x00b6, 0x2258, 0xba8c, 0x8210,</div><div class='del'>-	0x9294, 0x00ff, 0xba8e, 0x00be, 0x8217, 0x0005, 0x00d6, 0x2069,</div><div class='del'>-	0x19e8, 0x6843, 0x0001, 0x00de, 0x0005, 0x60a3, 0x0056, 0x60a7,</div><div class='del'>-	0x9575, 0x00f1, 0x080c, 0x88ba, 0x0005, 0x0016, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0x9184, 0x0600, 0x9086, 0x0600, 0x0128, 0x0089, 0x080c,</div><div class='del'>-	0x88ba, 0x001e, 0x0005, 0xc1e5, 0x2001, 0x180c, 0x2102, 0x2001,</div><div class='del'>-	0x19e9, 0x2003, 0x0000, 0x2001, 0x19f1, 0x2003, 0x0000, 0x0c88,</div><div class='del'>-	0x0006, 0x6014, 0x9084, 0x1804, 0x9085, 0x0009, 0x6016, 0x000e,</div><div class='del'>-	0x0005, 0x0016, 0x00c6, 0x0006, 0x2061, 0x0100, 0x61a4, 0x60a7,</div><div class='del'>-	0x95f5, 0x6014, 0x9084, 0x1804, 0x9085, 0x0008, 0x6016, 0x000e,</div><div class='del'>-	0xa001, 0xa001, 0xa001, 0x61a6, 0x00ce, 0x001e, 0x0005, 0x00c6,</div><div class='del'>-	0x00d6, 0x0016, 0x0026, 0x2061, 0x0100, 0x2069, 0x0140, 0x080c,</div><div class='del'>-	0x7637, 0x11c0, 0x2001, 0x1a04, 0x2004, 0x9005, 0x15d0, 0x080c,</div><div class='del'>-	0x76e4, 0x1160, 0x2061, 0x0100, 0x6020, 0xd0b4, 0x1120, 0x6024,</div><div class='del'>-	0xd084, 0x090c, 0x0dc5, 0x080c, 0x88ba, 0x0458, 0x00c6, 0x2061,</div><div class='del'>-	0x19e8, 0x00c8, 0x6904, 0x9194, 0x4000, 0x0540, 0x0811, 0x080c,</div><div class='del'>-	0x2d49, 0x00c6, 0x2061, 0x19e8, 0x6128, 0x9192, 0x0008, 0x1258,</div><div class='del'>-	0x8108, 0x612a, 0x6124, 0x00ce, 0x81ff, 0x0198, 0x080c, 0x88ba,</div><div class='del'>-	0x080c, 0xa6e0, 0x0070, 0x6124, 0x91e5, 0x0000, 0x0140, 0x080c,</div><div class='del'>-	0xf094, 0x080c, 0x88c3, 0x2009, 0x0014, 0x080c, 0xb352, 0x00ce,</div><div class='del'>-	0x0000, 0x002e, 0x001e, 0x00de, 0x00ce, 0x0005, 0x2001, 0x1a04,</div><div class='del'>-	0x2004, 0x9005, 0x1db0, 0x00c6, 0x2061, 0x19e8, 0x6128, 0x9192,</div><div class='del'>-	0x0003, 0x1e08, 0x8108, 0x612a, 0x00ce, 0x080c, 0x88ba, 0x080c,</div><div class='del'>-	0x5fed, 0x2009, 0x1846, 0x2114, 0x8210, 0x220a, 0x0c10, 0x0096,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x0016, 0x0026, 0x080c, 0x88d0, 0x2071,</div><div class='del'>-	0x19e8, 0x713c, 0x81ff, 0x0904, 0xa7e9, 0x2061, 0x0100, 0x2069,</div><div class='del'>-	0x0140, 0x080c, 0x7637, 0x11e0, 0x0036, 0x2019, 0x0002, 0x080c,</div><div class='del'>-	0xaa49, 0x003e, 0x713c, 0x2160, 0x080c, 0xf094, 0x2009, 0x004a,</div><div class='del'>-	0x6220, 0x9296, 0x0009, 0x1130, 0x6114, 0x2148, 0xa87b, 0x0006,</div><div class='del'>-	0x2009, 0x004a, 0x080c, 0xb352, 0x080c, 0x76e4, 0x0804, 0xa7e9,</div><div class='del'>-	0x080c, 0xa7f5, 0x0904, 0xa7e9, 0x6904, 0xd1f4, 0x0904, 0xa7f0,</div><div class='del'>-	0x080c, 0x2d49, 0x00c6, 0x703c, 0x9065, 0x090c, 0x0dc5, 0x6020,</div><div class='del'>-	0x00ce, 0x9086, 0x0006, 0x1528, 0x61c8, 0x60c4, 0x9105, 0x1508,</div><div class='del'>-	0x2009, 0x180c, 0x2104, 0xd0d4, 0x01e0, 0x6214, 0x9294, 0x1800,</div><div class='del'>-	0x1128, 0x6224, 0x9294, 0x0002, 0x1560, 0x0030, 0xc0d4, 0x200a,</div><div class='del'>-	0xd0cc, 0x0110, 0x080c, 0x2c7b, 0x6014, 0x9084, 0xe7fd, 0x9085,</div><div class='del'>-	0x0010, 0x6016, 0x703c, 0x2060, 0x2009, 0x0049, 0x080c, 0xb352,</div><div class='del'>-	0x00c0, 0x0036, 0x2019, 0x0001, 0x080c, 0xaa49, 0x003e, 0x713c,</div><div class='del'>-	0x2160, 0x080c, 0xf094, 0x2009, 0x004a, 0x6220, 0x9296, 0x0009,</div><div class='del'>-	0x1130, 0x6114, 0x2148, 0xa87b, 0x0006, 0x2009, 0x004a, 0x080c,</div><div class='del'>-	0xb352, 0x002e, 0x001e, 0x00ee, 0x00de, 0x00ce, 0x009e, 0x0005,</div><div class='del'>-	0xd1ec, 0x1904, 0xa7a0, 0x0804, 0xa7a2, 0x00d6, 0x00c6, 0x0096,</div><div class='del'>-	0x703c, 0x9065, 0x090c, 0x0dc5, 0x2001, 0x0306, 0x200c, 0x9184,</div><div class='del'>-	0x0030, 0x0904, 0xa8a8, 0x9184, 0x0048, 0x9086, 0x0008, 0x1904,</div><div class='del'>-	0xa8a8, 0x2009, 0x0206, 0x2104, 0x2009, 0x0203, 0x210c, 0x9106,</div><div class='del'>-	0x1904, 0xa8a8, 0x2009, 0x022a, 0x2104, 0x2009, 0x022f, 0x210c,</div><div class='del'>-	0x9116, 0x9084, 0x03ff, 0x918c, 0x03ff, 0x9294, 0x0400, 0x0110,</div><div class='del'>-	0x9102, 0x0030, 0x2010, 0x2100, 0x9202, 0x2009, 0x0228, 0x9102,</div><div class='del'>-	0x9082, 0x0005, 0x0250, 0x2008, 0x2001, 0x013b, 0x2004, 0x8004,</div><div class='del'>-	0x8004, 0x8004, 0x9102, 0x1a04, 0xa8a8, 0x2009, 0x1a84, 0x2104,</div><div class='del'>-	0x8000, 0x0208, 0x200a, 0x2069, 0x0100, 0x6914, 0x918c, 0x1984,</div><div class='del'>-	0x918d, 0x0010, 0x6916, 0x69c8, 0x2011, 0x0020, 0x68c8, 0x9106,</div><div class='del'>-	0x15c0, 0x8211, 0x1dd8, 0x2001, 0x0306, 0x2003, 0x4800, 0x2001,</div><div class='del'>-	0x009a, 0x2003, 0x0004, 0x2001, 0x1a69, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x1a72, 0x2003, 0x0000, 0x6a88, 0x698c, 0x2200, 0x9105, 0x1170,</div><div class='del'>-	0x0096, 0x6014, 0x2048, 0xa87c, 0xc0dc, 0xa87e, 0xa880, 0xc0fc,</div><div class='del'>-	0xa882, 0x009e, 0x2c10, 0x080c, 0x1be0, 0x0040, 0x6014, 0x2048,</div><div class='del'>-	0xaa3a, 0xa936, 0x6ac4, 0x69c8, 0xa946, 0xaa4a, 0x0126, 0x00c6,</div><div class='del'>-	0x2091, 0x2400, 0x002e, 0x080c, 0x1c79, 0x190c, 0x0dc5, 0x012e,</div><div class='del'>-	0x0090, 0x2009, 0x1a85, 0x2104, 0x8000, 0x0208, 0x200a, 0x69c8,</div><div class='del'>-	0x2011, 0x0020, 0x8211, 0x1df0, 0x68c8, 0x9106, 0x1dc0, 0x69c4,</div><div class='del'>-	0x68c8, 0x9105, 0x0160, 0x6824, 0xd08c, 0x0110, 0x6827, 0x0002,</div><div class='del'>-	0x7048, 0xc085, 0x704a, 0x0079, 0x7048, 0xc084, 0x704a, 0x2009,</div><div class='del'>-	0x07d0, 0x080c, 0x88c8, 0x9006, 0x009e, 0x00ce, 0x00de, 0x0005,</div><div class='del'>-	0x9085, 0x0001, 0x0cc8, 0x0026, 0x00e6, 0x2071, 0x19e8, 0x7048,</div><div class='del'>-	0xd084, 0x01d8, 0x713c, 0x81ff, 0x01c0, 0x2071, 0x0100, 0x9188,</div><div class='del'>-	0x0008, 0x2114, 0x928e, 0x0006, 0x1138, 0x7014, 0x9084, 0x1984,</div><div class='del'>-	0x9085, 0x0012, 0x7016, 0x0048, 0x928e, 0x0009, 0x0db0, 0x7014,</div><div class='del'>-	0x9084, 0x1984, 0x9085, 0x0016, 0x7016, 0x00ee, 0x002e, 0x0005,</div><div class='del'>-	0x00b6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046, 0x0006,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x6010, 0x2058, 0xbca0, 0x2071, 0x19e8,</div><div class='del'>-	0x7018, 0x2058, 0x8bff, 0x0190, 0xb8a0, 0x9406, 0x0118, 0xb854,</div><div class='del'>-	0x2058, 0x0cc0, 0x6014, 0x0096, 0x2048, 0xac6c, 0xad70, 0xae78,</div><div class='del'>-	0x009e, 0x080c, 0x6856, 0x0110, 0x9085, 0x0001, 0x012e, 0x000e,</div><div class='del'>-	0x004e, 0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00be, 0x0005,</div><div class='del'>-	0x080c, 0xa0c1, 0x7003, 0x1200, 0x7838, 0x7012, 0x783c, 0x7016,</div><div class='del'>-	0x00c6, 0x7820, 0x9086, 0x0004, 0x1148, 0x7810, 0x9005, 0x0130,</div><div class='del'>-	0x00b6, 0x2058, 0xb810, 0xb914, 0x00be, 0x0020, 0x2061, 0x1800,</div><div class='del'>-	0x607c, 0x6180, 0x9084, 0x00ff, 0x700a, 0x710e, 0x00ce, 0x60c3,</div><div class='del'>-	0x002c, 0x0804, 0xa6bd, 0x080c, 0xa0c1, 0x7003, 0x0f00, 0x7808,</div><div class='del'>-	0xd09c, 0x0128, 0xb810, 0x9084, 0x00ff, 0x700a, 0xb814, 0x700e,</div><div class='del'>-	0x60c3, 0x0008, 0x0804, 0xa6bd, 0x0156, 0x080c, 0xa10c, 0x7003,</div><div class='del'>-	0x0200, 0x080c, 0x894c, 0x20a9, 0x0006, 0x2011, 0xffec, 0x2019,</div><div class='del'>-	0xffed, 0x9ef0, 0x0002, 0x2305, 0x2072, 0x8e70, 0x2205, 0x2072,</div><div class='del'>-	0x8e70, 0x9398, 0x0002, 0x9290, 0x0002, 0x1f04, 0xa943, 0x60c3,</div><div class='del'>-	0x001c, 0x015e, 0x0804, 0xa6bd, 0x0016, 0x0026, 0x080c, 0xa0e8,</div><div class='del'>-	0x080c, 0xa0fa, 0x9e80, 0x0004, 0x20e9, 0x0000, 0x20a0, 0x7814,</div><div class='del'>-	0x0096, 0x2048, 0xa800, 0x2048, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x0021, 0x2098, 0x009e, 0x7808, 0x9088, 0x0002, 0x21a8, 0x9192,</div><div class='del'>-	0x0010, 0x1250, 0x4003, 0x9080, 0x0004, 0x8003, 0x60c2, 0x080c,</div><div class='del'>-	0xa6bd, 0x002e, 0x001e, 0x0005, 0x20a9, 0x0010, 0x4003, 0x080c,</div><div class='del'>-	0xaf79, 0x20a1, 0x0240, 0x22a8, 0x4003, 0x0c68, 0x080c, 0xa0c1,</div><div class='del'>-	0x7003, 0x6200, 0x7808, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa6bd,</div><div class='del'>-	0x0016, 0x0026, 0x080c, 0xa0c1, 0x20e9, 0x0000, 0x20a1, 0x024c,</div><div class='del'>-	0x7814, 0x0096, 0x2048, 0xa800, 0x2048, 0xa860, 0x20e0, 0xa85c,</div><div class='del'>-	0x9080, 0x0023, 0x2098, 0x009e, 0x7808, 0x9088, 0x0002, 0x21a8,</div><div class='del'>-	0x4003, 0x8003, 0x60c2, 0x080c, 0xa6bd, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x00e6, 0x00c6, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19e8,</div><div class='del'>-	0x700c, 0x2060, 0x8cff, 0x0178, 0x080c, 0xd2e0, 0x1110, 0x080c,</div><div class='del'>-	0xbcb6, 0x600c, 0x0006, 0x080c, 0xd54c, 0x080c, 0xb2d3, 0x080c,</div><div class='del'>-	0xaaf1, 0x00ce, 0x0c78, 0x2c00, 0x700e, 0x700a, 0x012e, 0x000e,</div><div class='del'>-	0x00ce, 0x00ee, 0x0005, 0x0126, 0x0156, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x0066, 0x0026, 0x0016, 0x0006, 0x2091, 0x8000, 0x2001,</div><div class='del'>-	0x180c, 0x200c, 0x918c, 0xe7ff, 0x2102, 0x2069, 0x0100, 0x2079,</div><div class='del'>-	0x0140, 0x2071, 0x19e8, 0x7024, 0x2060, 0x8cff, 0x01f8, 0x080c,</div><div class='del'>-	0xa6e9, 0x6ac0, 0x68c3, 0x0000, 0x080c, 0x88c3, 0x00c6, 0x2061,</div><div class='del'>-	0x0100, 0x080c, 0xb0ca, 0x00ce, 0x20a9, 0x01f4, 0x0461, 0x2009,</div><div class='del'>-	0x0013, 0x080c, 0xb352, 0x000e, 0x001e, 0x002e, 0x006e, 0x00ce,</div><div class='del'>-	0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e, 0x0005, 0x2001, 0x1800,</div><div class='del'>-	0x2004, 0x9096, 0x0001, 0x0d78, 0x9096, 0x0004, 0x0d60, 0x080c,</div><div class='del'>-	0x88c3, 0x6814, 0x9084, 0x0001, 0x0110, 0x68a7, 0x95f5, 0x6817,</div><div class='del'>-	0x0008, 0x68c3, 0x0000, 0x2011, 0x5f97, 0x080c, 0x883d, 0x20a9,</div><div class='del'>-	0x01f4, 0x0009, 0x08c0, 0x6824, 0xd094, 0x0140, 0x6827, 0x0004,</div><div class='del'>-	0x7804, 0x9084, 0x4000, 0x190c, 0x2d49, 0x0090, 0xd084, 0x0118,</div><div class='del'>-	0x6827, 0x4001, 0x0010, 0x1f04, 0xaa2b, 0x7804, 0x9084, 0x1000,</div><div class='del'>-	0x0138, 0x2001, 0x0100, 0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39,</div><div class='del'>-	0x0005, 0x0126, 0x0156, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066,</div><div class='del'>-	0x0026, 0x0016, 0x0006, 0x2091, 0x8000, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0x918c, 0xdbff, 0x2102, 0x2069, 0x0100, 0x2079, 0x0140, 0x2071,</div><div class='del'>-	0x19e8, 0x703c, 0x2060, 0x8cff, 0x0904, 0xaab4, 0x9386, 0x0002,</div><div class='del'>-	0x1128, 0x6814, 0x9084, 0x0002, 0x0904, 0xaab4, 0x68af, 0x95f5,</div><div class='del'>-	0x6817, 0x0010, 0x2009, 0x00fa, 0x8109, 0x1df0, 0x69c6, 0x68cb,</div><div class='del'>-	0x0008, 0x080c, 0x88d0, 0x080c, 0x2031, 0x2001, 0x0032, 0x6920,</div><div class='del'>-	0xd1bc, 0x0130, 0x8001, 0x1dd8, 0x692c, 0x918d, 0x0008, 0x692e,</div><div class='del'>-	0x20a9, 0x03e8, 0x6824, 0xd094, 0x0140, 0x6827, 0x0004, 0x7804,</div><div class='del'>-	0x9084, 0x4000, 0x190c, 0x2d49, 0x0090, 0xd08c, 0x0118, 0x6827,</div><div class='del'>-	0x0002, 0x0010, 0x1f04, 0xaa8a, 0x7804, 0x9084, 0x1000, 0x0138,</div><div class='del'>-	0x2001, 0x0100, 0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x6827,</div><div class='del'>-	0x4000, 0x6824, 0x83ff, 0x1140, 0x2009, 0x0049, 0x6020, 0x9086,</div><div class='del'>-	0x0009, 0x0110, 0x080c, 0xb352, 0x000e, 0x001e, 0x002e, 0x006e,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e, 0x0005, 0x00d6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2069, 0x19e8, 0x6a06, 0x012e, 0x00de,</div><div class='del'>-	0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x2069, 0x19e8, 0x6a32,</div><div class='del'>-	0x012e, 0x00de, 0x0005, 0x080c, 0xa284, 0x7047, 0x1000, 0x0098,</div><div class='del'>-	0x080c, 0xa284, 0x7047, 0x4000, 0x0070, 0x080c, 0xa284, 0x7047,</div><div class='del'>-	0x2000, 0x0048, 0x080c, 0xa284, 0x7047, 0x0400, 0x0020, 0x080c,</div><div class='del'>-	0xa284, 0x7047, 0x0200, 0x7854, 0x7032, 0x60c3, 0x0020, 0x0804,</div><div class='del'>-	0xa6bd, 0x00e6, 0x2071, 0x19e8, 0x7020, 0x9005, 0x0110, 0x8001,</div><div class='del'>-	0x7022, 0x00ee, 0x0005, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0076,</div><div class='del'>-	0x0066, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19e8, 0x7614,</div><div class='del'>-	0x2660, 0x2678, 0x2039, 0x0001, 0x87ff, 0x0904, 0xab96, 0x8cff,</div><div class='del'>-	0x0904, 0xab96, 0x6020, 0x9086, 0x0006, 0x1904, 0xab91, 0x88ff,</div><div class='del'>-	0x0138, 0x2800, 0x9c06, 0x1904, 0xab91, 0x2039, 0x0000, 0x0050,</div><div class='del'>-	0x6010, 0x9b06, 0x1904, 0xab91, 0x85ff, 0x0120, 0x6054, 0x9106,</div><div class='del'>-	0x1904, 0xab91, 0x7024, 0x9c06, 0x15b0, 0x2069, 0x0100, 0x68c0,</div><div class='del'>-	0x9005, 0x1160, 0x6824, 0xd084, 0x0148, 0x6827, 0x0001, 0x080c,</div><div class='del'>-	0x88c3, 0x080c, 0xac1b, 0x7027, 0x0000, 0x0428, 0x080c, 0x88c3,</div><div class='del'>-	0x6820, 0xd0b4, 0x0110, 0x68a7, 0x95f5, 0x6817, 0x0008, 0x68c3,</div><div class='del'>-	0x0000, 0x080c, 0xac1b, 0x7027, 0x0000, 0x0036, 0x2069, 0x0140,</div><div class='del'>-	0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x2d39,</div><div class='del'>-	0x9006, 0x080c, 0x2d39, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110,</div><div class='del'>-	0x6827, 0x0001, 0x003e, 0x7014, 0x9c36, 0x1110, 0x660c, 0x7616,</div><div class='del'>-	0x7010, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00, 0x7012,</div><div class='del'>-	0x0010, 0x7013, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06, 0x0110,</div><div class='del'>-	0x7e0e, 0x0008, 0x2678, 0x89ff, 0x1168, 0x600f, 0x0000, 0x6014,</div><div class='del'>-	0x0096, 0x2048, 0x080c, 0xd0d6, 0x0110, 0x080c, 0xebd4, 0x009e,</div><div class='del'>-	0x080c, 0xb306, 0x080c, 0xaaf1, 0x88ff, 0x1190, 0x00ce, 0x0804,</div><div class='del'>-	0xab0c, 0x2c78, 0x600c, 0x2060, 0x0804, 0xab0c, 0x9006, 0x012e,</div><div class='del'>-	0x000e, 0x006e, 0x007e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x601b, 0x0000, 0x00ce, 0x98c5, 0x0001, 0x0c88, 0x00f6, 0x00e6,</div><div class='del'>-	0x00d6, 0x0096, 0x00c6, 0x0066, 0x0026, 0x0006, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0x19e8, 0x7638, 0x2660, 0x2678, 0x8cff, 0x0904,</div><div class='del'>-	0xac0a, 0x6020, 0x9086, 0x0006, 0x1904, 0xac05, 0x87ff, 0x0128,</div><div class='del'>-	0x2700, 0x9c06, 0x1904, 0xac05, 0x0040, 0x6010, 0x9b06, 0x15e8,</div><div class='del'>-	0x85ff, 0x0118, 0x6054, 0x9106, 0x15c0, 0x703c, 0x9c06, 0x1168,</div><div class='del'>-	0x0036, 0x2019, 0x0001, 0x080c, 0xaa49, 0x7033, 0x0000, 0x9006,</div><div class='del'>-	0x703e, 0x7042, 0x7046, 0x704a, 0x003e, 0x7038, 0x9c36, 0x1110,</div><div class='del'>-	0x660c, 0x763a, 0x7034, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118,</div><div class='del'>-	0x2f00, 0x7036, 0x0010, 0x7037, 0x0000, 0x660c, 0x0066, 0x2c00,</div><div class='del'>-	0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xd0d6, 0x0110, 0x080c, 0xebd4, 0x080c, 0xb306,</div><div class='del'>-	0x87ff, 0x1198, 0x00ce, 0x0804, 0xabb6, 0x2c78, 0x600c, 0x2060,</div><div class='del'>-	0x0804, 0xabb6, 0x9006, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce,</div><div class='del'>-	0x009e, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x601b, 0x0000, 0x00ce,</div><div class='del'>-	0x97bd, 0x0001, 0x0c80, 0x00e6, 0x2071, 0x19e8, 0x2001, 0x1800,</div><div class='del'>-	0x2004, 0x9086, 0x0002, 0x1118, 0x7007, 0x0005, 0x0010, 0x7007,</div><div class='del'>-	0x0000, 0x00ee, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0066, 0x0026,</div><div class='del'>-	0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19e8, 0x2c10, 0x7638,</div><div class='del'>-	0x2660, 0x2678, 0x8cff, 0x0540, 0x2200, 0x9c06, 0x1508, 0x7038,</div><div class='del'>-	0x9c36, 0x1110, 0x660c, 0x763a, 0x7034, 0x9c36, 0x1140, 0x2c00,</div><div class='del'>-	0x9f36, 0x0118, 0x2f00, 0x7036, 0x0010, 0x7037, 0x0000, 0x660c,</div><div class='del'>-	0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000,</div><div class='del'>-	0x6004, 0x9086, 0x0040, 0x090c, 0x99a5, 0x9085, 0x0001, 0x0020,</div><div class='del'>-	0x2c78, 0x600c, 0x2060, 0x08b0, 0x012e, 0x000e, 0x002e, 0x006e,</div><div class='del'>-	0x00ce, 0x00ee, 0x00fe, 0x0005, 0x0096, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x0066, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x19e8, 0x760c, 0x2660, 0x2678, 0x8cff, 0x0904, 0xad01, 0x6010,</div><div class='del'>-	0x00b6, 0x2058, 0xb8a0, 0x00be, 0x9206, 0x1904, 0xacfc, 0x7024,</div><div class='del'>-	0x9c06, 0x1520, 0x2069, 0x0100, 0x68c0, 0x9005, 0x0904, 0xacd3,</div><div class='del'>-	0x080c, 0xa6e9, 0x68c3, 0x0000, 0x080c, 0xac1b, 0x7027, 0x0000,</div><div class='del'>-	0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001,</div><div class='del'>-	0x0100, 0x080c, 0x2d39, 0x9006, 0x080c, 0x2d39, 0x2069, 0x0100,</div><div class='del'>-	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x700c, 0x9c36,</div><div class='del'>-	0x1110, 0x660c, 0x760e, 0x7008, 0x9c36, 0x1140, 0x2c00, 0x9f36,</div><div class='del'>-	0x0118, 0x2f00, 0x700a, 0x0010, 0x700b, 0x0000, 0x660c, 0x0066,</div><div class='del'>-	0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000,</div><div class='del'>-	0x080c, 0xd2cf, 0x1180, 0x080c, 0x3279, 0x080c, 0xd2e0, 0x1518,</div><div class='del'>-	0x080c, 0xbcb6, 0x0400, 0x080c, 0xac1b, 0x6824, 0xd084, 0x09b0,</div><div class='del'>-	0x6827, 0x0001, 0x0898, 0x080c, 0xd2e0, 0x1118, 0x080c, 0xbcb6,</div><div class='del'>-	0x0090, 0x6014, 0x2048, 0x080c, 0xd0d6, 0x0168, 0x6020, 0x9086,</div><div class='del'>-	0x0003, 0x1508, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c,</div><div class='del'>-	0x6e92, 0x080c, 0xd2c3, 0x080c, 0xd54c, 0x080c, 0xb306, 0x080c,</div><div class='del'>-	0xaaf1, 0x00ce, 0x0804, 0xac7c, 0x2c78, 0x600c, 0x2060, 0x0804,</div><div class='del'>-	0xac7c, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce, 0x00de, 0x00ee,</div><div class='del'>-	0x00fe, 0x009e, 0x0005, 0x6020, 0x9086, 0x0006, 0x1d20, 0x080c,</div><div class='del'>-	0xebd4, 0x0c08, 0x00d6, 0x080c, 0xa10c, 0x7003, 0x0200, 0x7007,</div><div class='del'>-	0x0014, 0x60c3, 0x0014, 0x20e1, 0x0001, 0x2099, 0x1989, 0x20e9,</div><div class='del'>-	0x0000, 0x20a1, 0x0250, 0x20a9, 0x0004, 0x4003, 0x7023, 0x0004,</div><div class='del'>-	0x7027, 0x7878, 0x080c, 0xa6bd, 0x00de, 0x0005, 0x080c, 0xa10c,</div><div class='del'>-	0x700b, 0x0800, 0x7814, 0x9084, 0xff00, 0x700e, 0x7814, 0x9084,</div><div class='del'>-	0x00ff, 0x7022, 0x782c, 0x7026, 0x7858, 0x9084, 0x00ff, 0x9085,</div><div class='del'>-	0x0200, 0x7002, 0x7858, 0x9084, 0xff00, 0x8007, 0x7006, 0x60c2,</div><div class='del'>-	0x0804, 0xa6bd, 0x00b6, 0x00d6, 0x0016, 0x00d6, 0x2f68, 0x2009,</div><div class='del'>-	0x0035, 0x080c, 0xd759, 0x00de, 0x1904, 0xadaf, 0x080c, 0xa0c1,</div><div class='del'>-	0x7003, 0x1300, 0x782c, 0x080c, 0xaeb5, 0x2068, 0x6820, 0x9086,</div><div class='del'>-	0x0003, 0x0560, 0x7810, 0x2058, 0xbaa0, 0x080c, 0xb23d, 0x11d8,</div><div class='del'>-	0x9286, 0x007e, 0x1128, 0x700b, 0x00ff, 0x700f, 0xfffe, 0x0498,</div><div class='del'>-	0x9286, 0x007f, 0x1128, 0x700b, 0x00ff, 0x700f, 0xfffd, 0x0458,</div><div class='del'>-	0x9284, 0xff80, 0x0180, 0x9286, 0x0080, 0x1128, 0x700b, 0x00ff,</div><div class='del'>-	0x700f, 0xfffc, 0x0400, 0x92d8, 0x1000, 0x2b5c, 0xb810, 0x700a,</div><div class='del'>-	0xb814, 0x700e, 0x00c0, 0x6098, 0x700e, 0x00a8, 0x080c, 0xb23d,</div><div class='del'>-	0x1130, 0x7810, 0x2058, 0xb8a0, 0x9082, 0x007e, 0x0250, 0x00d6,</div><div class='del'>-	0x2069, 0x181f, 0x2d04, 0x700a, 0x8d68, 0x2d04, 0x700e, 0x00de,</div><div class='del'>-	0x0010, 0x6034, 0x700e, 0x7838, 0x7012, 0x783c, 0x7016, 0x60c3,</div><div class='del'>-	0x000c, 0x001e, 0x00de, 0x080c, 0xa6bd, 0x00be, 0x0005, 0x781b,</div><div class='del'>-	0x0001, 0x7803, 0x0006, 0x001e, 0x00de, 0x00be, 0x0005, 0x792c,</div><div class='del'>-	0x9180, 0x0008, 0x200c, 0x9186, 0x0006, 0x01c0, 0x9186, 0x0003,</div><div class='del'>-	0x0904, 0xae2a, 0x9186, 0x0005, 0x0904, 0xae12, 0x9186, 0x0004,</div><div class='del'>-	0x05d8, 0x9186, 0x0008, 0x0904, 0xae1b, 0x7807, 0x0037, 0x782f,</div><div class='del'>-	0x0003, 0x7817, 0x1700, 0x080c, 0xae92, 0x0005, 0x080c, 0xae53,</div><div class='del'>-	0x00d6, 0x0026, 0x792c, 0x2168, 0x2009, 0x4000, 0x6800, 0x0002,</div><div class='del'>-	0xadf3, 0xadfe, 0xadf5, 0xadfe, 0xadfa, 0xadf3, 0xadf3, 0xadfe,</div><div class='del'>-	0xadfe, 0xadfe, 0xadfe, 0xadf3, 0xadf3, 0xadf3, 0xadf3, 0xadf3,</div><div class='del'>-	0xadfe, 0xadf3, 0xadfe, 0x080c, 0x0dc5, 0x6824, 0xd0e4, 0x0110,</div><div class='del'>-	0xd0cc, 0x0110, 0x900e, 0x0010, 0x2009, 0x2000, 0x682c, 0x7022,</div><div class='del'>-	0x6830, 0x7026, 0x0804, 0xae4c, 0x080c, 0xae53, 0x00d6, 0x0026,</div><div class='del'>-	0x792c, 0x2168, 0x2009, 0x4000, 0x6a00, 0x9286, 0x0002, 0x1108,</div><div class='del'>-	0x900e, 0x04d0, 0x080c, 0xae53, 0x00d6, 0x0026, 0x792c, 0x2168,</div><div class='del'>-	0x2009, 0x4000, 0x0488, 0x04b9, 0x00d6, 0x0026, 0x792c, 0x2168,</div><div class='del'>-	0x2009, 0x4000, 0x9286, 0x0005, 0x0118, 0x9286, 0x0002, 0x1108,</div><div class='del'>-	0x900e, 0x0410, 0x0441, 0x00d6, 0x0026, 0x792c, 0x2168, 0x6814,</div><div class='del'>-	0x6924, 0xc185, 0x6926, 0x0096, 0x2048, 0xa9ac, 0xa834, 0x9112,</div><div class='del'>-	0xa9b0, 0xa838, 0x009e, 0x9103, 0x7022, 0x7226, 0x792c, 0x9180,</div><div class='del'>-	0x0000, 0x2004, 0x908e, 0x0002, 0x0130, 0x908e, 0x0004, 0x0118,</div><div class='del'>-	0x2009, 0x4000, 0x0008, 0x900e, 0x712a, 0x60c3, 0x0018, 0x002e,</div><div class='del'>-	0x00de, 0x0804, 0xa6bd, 0x00b6, 0x0036, 0x0046, 0x0056, 0x0066,</div><div class='del'>-	0x080c, 0xa10c, 0x9006, 0x7003, 0x0200, 0x7938, 0x710a, 0x793c,</div><div class='del'>-	0x710e, 0x7810, 0x2058, 0xb8a0, 0x080c, 0xb23d, 0x1118, 0x9092,</div><div class='del'>-	0x007e, 0x0268, 0x00d6, 0x2069, 0x181f, 0x2d2c, 0x8d68, 0x2d34,</div><div class='del'>-	0x90d8, 0x1000, 0x2b5c, 0xbb10, 0xbc14, 0x00de, 0x0028, 0x901e,</div><div class='del'>-	0x6498, 0x2029, 0x0000, 0x6634, 0x782c, 0x9080, 0x0008, 0x2004,</div><div class='del'>-	0x9086, 0x0003, 0x1128, 0x7512, 0x7616, 0x731a, 0x741e, 0x0020,</div><div class='del'>-	0x7312, 0x7416, 0x751a, 0x761e, 0x006e, 0x005e, 0x004e, 0x003e,</div><div class='del'>-	0x00be, 0x0005, 0x080c, 0xa10c, 0x7003, 0x0100, 0x782c, 0x700a,</div><div class='del'>-	0x7814, 0x700e, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa6bd, 0x080c,</div><div class='del'>-	0xa0b8, 0x7003, 0x1400, 0x7838, 0x700a, 0x0079, 0x783c, 0x700e,</div><div class='del'>-	0x782c, 0x7012, 0x7830, 0x7016, 0x7834, 0x9084, 0x00ff, 0x8007,</div><div class='del'>-	0x701a, 0x60c3, 0x0010, 0x0804, 0xa6bd, 0x00e6, 0x2071, 0x0240,</div><div class='del'>-	0x0006, 0x00f6, 0x2078, 0x7810, 0x00b6, 0x2058, 0xb8cc, 0xd084,</div><div class='del'>-	0x0120, 0x7844, 0x702a, 0x7848, 0x702e, 0x00be, 0x00fe, 0x000e,</div><div class='del'>-	0x00ee, 0x0005, 0x080c, 0xa103, 0x7003, 0x0100, 0x782c, 0x700a,</div><div class='del'>-	0x7814, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa6bd, 0x0021, 0x60c3,</div><div class='del'>-	0x0000, 0x0804, 0xa6bd, 0x00d6, 0x080c, 0xaf8e, 0xb810, 0x9085,</div><div class='del'>-	0x0300, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x687c, 0x700a,</div><div class='del'>-	0x6880, 0x700e, 0x7013, 0x0819, 0x080c, 0xa6ab, 0x721a, 0x2f10,</div><div class='del'>-	0x7222, 0x7a08, 0x7226, 0x2071, 0x024c, 0x00de, 0x0005, 0x00a9,</div><div class='del'>-	0x7914, 0x712a, 0x60c3, 0x0000, 0x60a7, 0x9575, 0x0026, 0x080c,</div><div class='del'>-	0x2bce, 0x0228, 0x2011, 0x0101, 0x2204, 0xc0c5, 0x2012, 0x002e,</div><div class='del'>-	0x080c, 0xa6e0, 0x080c, 0x88ba, 0x0005, 0x0036, 0x0096, 0x00d6,</div><div class='del'>-	0x00e6, 0x7858, 0x2048, 0xaa7c, 0x9296, 0x00c0, 0x9294, 0x00fd,</div><div class='del'>-	0xaa7e, 0xaa80, 0x9294, 0x0300, 0xaa82, 0xa96c, 0x9194, 0x00ff,</div><div class='del'>-	0xab74, 0x9384, 0x00ff, 0x908d, 0xc200, 0xa96e, 0x9384, 0xff00,</div><div class='del'>-	0x9215, 0xaa76, 0xa870, 0xaa78, 0xa87a, 0xaa72, 0x00d6, 0x2069,</div><div class='del'>-	0x0200, 0x080c, 0xaf8e, 0x00de, 0x20e9, 0x0000, 0x20a1, 0x0240,</div><div class='del'>-	0x20a9, 0x000a, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x001b, 0x2098,</div><div class='del'>-	0x4003, 0x60a3, 0x0035, 0xaa68, 0x9294, 0x7000, 0x9286, 0x3000,</div><div class='del'>-	0x0110, 0x60a3, 0x0037, 0x00ee, 0x00de, 0x009e, 0x003e, 0x0005,</div><div class='del'>-	0x900e, 0x7814, 0x0096, 0x2048, 0xa87c, 0xd0fc, 0x01c0, 0x9084,</div><div class='del'>-	0x0003, 0x11a8, 0x2001, 0x180c, 0x2004, 0xd0bc, 0x0180, 0x7824,</div><div class='del'>-	0xd0cc, 0x1168, 0xd0c4, 0x1158, 0xa8a8, 0x9005, 0x1140, 0x2001,</div><div class='del'>-	0x180c, 0x200c, 0xc1d5, 0x2102, 0x2009, 0x19b3, 0x210c, 0x009e,</div><div class='del'>-	0x918d, 0x0092, 0x0010, 0x2009, 0x0096, 0x60ab, 0x0036, 0x6116,</div><div class='del'>-	0x0005, 0x2009, 0x0009, 0x00a0, 0x2009, 0x000a, 0x0088, 0x2009,</div><div class='del'>-	0x000b, 0x0070, 0x2009, 0x000c, 0x0058, 0x2009, 0x000d, 0x0040,</div><div class='del'>-	0x2009, 0x000e, 0x0028, 0x2009, 0x000f, 0x0010, 0x2009, 0x0008,</div><div class='del'>-	0x6912, 0x0005, 0x080c, 0xa0c1, 0x0016, 0x0026, 0x0096, 0x00d6,</div><div class='del'>-	0x7814, 0x2048, 0x7013, 0x0138, 0x2001, 0x1837, 0x2004, 0x9084,</div><div class='del'>-	0x0028, 0x1138, 0x2001, 0x197c, 0x2004, 0x9086, 0xaaaa, 0x1904,</div><div class='del'>-	0xb033, 0x7003, 0x5400, 0x00c6, 0x2061, 0x1800, 0x607c, 0x9084,</div><div class='del'>-	0x00ff, 0xa998, 0x810f, 0x918c, 0xff00, 0x9105, 0x700a, 0x6080,</div><div class='del'>-	0x700e, 0xa998, 0x918c, 0xff00, 0x7112, 0x20a9, 0x0004, 0x2009,</div><div class='del'>-	0x1805, 0x2e10, 0x9290, 0x0006, 0x2104, 0x2012, 0x8108, 0x8210,</div><div class='del'>-	0x1f04, 0xafc4, 0x20a9, 0x0004, 0x2009, 0x1801, 0x2104, 0x2012,</div><div class='del'>-	0x8108, 0x8210, 0x1f04, 0xafce, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x0029, 0x2098, 0x2009, 0x0006, 0x20a9, 0x0001, 0x4002, 0x8007,</div><div class='del'>-	0x2012, 0x8210, 0x8109, 0x1dc0, 0x00d6, 0x2069, 0x0200, 0x080c,</div><div class='del'>-	0xaf79, 0x00de, 0x2071, 0x0240, 0x2011, 0x0240, 0x2009, 0x0002,</div><div class='del'>-	0x20a9, 0x0001, 0x4002, 0x8007, 0x2012, 0x8210, 0x8109, 0x1dc0,</div><div class='del'>-	0x2009, 0x0008, 0x20a9, 0x0001, 0x4002, 0x8007, 0x2012, 0x8210,</div><div class='del'>-	0x8109, 0x1dc0, 0xa85c, 0x9080, 0x0031, 0x2098, 0x2009, 0x0008,</div><div class='del'>-	0x20a9, 0x0001, 0x4002, 0x8007, 0x2012, 0x8210, 0x8109, 0x1dc0,</div><div class='del'>-	0x00ce, 0x60c3, 0x004c, 0x60a3, 0x0056, 0x60a7, 0x9575, 0x2001,</div><div class='del'>-	0x1837, 0x2004, 0x9084, 0x0028, 0x1168, 0x080c, 0x7637, 0x0150,</div><div class='del'>-	0x6028, 0xc0bd, 0x602a, 0x6014, 0x9084, 0x1804, 0x9085, 0x0029,</div><div class='del'>-	0x6016, 0x0010, 0x080c, 0xa6bd, 0x080c, 0x88ba, 0x00de, 0x009e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x00e6, 0x2071, 0x0240, 0x2001, 0x2200,</div><div class='del'>-	0x9085, 0x00ff, 0x7002, 0x7007, 0xffff, 0x2071, 0x0100, 0x709b,</div><div class='del'>-	0x00ff, 0x00ee, 0x0804, 0xafa9, 0x080c, 0xa0c1, 0x0016, 0x0026,</div><div class='del'>-	0x0096, 0x00d6, 0x7814, 0x2048, 0x7013, 0x0138, 0x7003, 0x5500,</div><div class='del'>-	0x00c6, 0xa89c, 0x9084, 0x00ff, 0xa998, 0x810f, 0x918c, 0xff00,</div><div class='del'>-	0x9105, 0x700a, 0xa99c, 0x918c, 0xff00, 0xa8a0, 0x9084, 0x00ff,</div><div class='del'>-	0x9105, 0x700e, 0xa998, 0x918c, 0xff00, 0x2061, 0x1800, 0x607c,</div><div class='del'>-	0x9084, 0x00ff, 0x910d, 0x7112, 0x6180, 0x7116, 0x2009, 0x0008,</div><div class='del'>-	0xa860, 0x20e0, 0xa85c, 0x9080, 0x0029, 0x2098, 0x2e10, 0x9290,</div><div class='del'>-	0x0006, 0x20a9, 0x0001, 0x4002, 0x8007, 0x2012, 0x8210, 0x8109,</div><div class='del'>-	0x1dc0, 0x20a9, 0x0004, 0x2009, 0x1805, 0x2104, 0x2012, 0x8108,</div><div class='del'>-	0x8210, 0x1f04, 0xb085, 0x20a9, 0x0002, 0x2009, 0x1801, 0x2104,</div><div class='del'>-	0x2012, 0x8108, 0x8210, 0x1f04, 0xb08f, 0x00d6, 0x0016, 0x2069,</div><div class='del'>-	0x0200, 0x080c, 0xaf79, 0x001e, 0x00de, 0x2071, 0x0240, 0x20a9,</div><div class='del'>-	0x0002, 0x2009, 0x1803, 0x2011, 0x0240, 0x2104, 0x2012, 0x8108,</div><div class='del'>-	0x8210, 0x1f04, 0xb0a5, 0x2009, 0x0008, 0x4002, 0x8007, 0x2012,</div><div class='del'>-	0x8210, 0x8109, 0x1dd0, 0x9006, 0x20a9, 0x0008, 0x2012, 0x8210,</div><div class='del'>-	0x1f04, 0xb0b6, 0x00ce, 0x60c3, 0x004c, 0x60a3, 0x0056, 0x60a7,</div><div class='del'>-	0x9575, 0x080c, 0xa6bd, 0x080c, 0x88ba, 0x00de, 0x009e, 0x002e,</div><div class='del'>-	0x001e, 0x0005, 0x00d6, 0x9290, 0x0018, 0x8214, 0x20e9, 0x0000,</div><div class='del'>-	0x2069, 0x0200, 0x6813, 0x0000, 0x22a8, 0x9284, 0x00e0, 0x0128,</div><div class='del'>-	0x20a9, 0x0020, 0x9292, 0x0020, 0x0008, 0x9016, 0x20a1, 0x0240,</div><div class='del'>-	0x9006, 0x4004, 0x82ff, 0x0120, 0x6810, 0x8000, 0x6812, 0x0c60,</div><div class='del'>-	0x00de, 0x0005, 0x00d6, 0x0096, 0x6014, 0x2048, 0xa878, 0x6056,</div><div class='del'>-	0x9006, 0xa836, 0xa83a, 0xa99c, 0xa946, 0xa84a, 0x6023, 0x0003,</div><div class='del'>-	0x6007, 0x0040, 0x6003, 0x0003, 0x600b, 0xffff, 0xa817, 0x0001,</div><div class='del'>-	0xa842, 0xa83e, 0x2900, 0xa85a, 0xa813, 0x20c5, 0x080c, 0x9564,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x9bd3, 0x012e, 0x009e, 0x00de,</div><div class='del'>-	0x0005, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x00a6, 0x0096, 0x0066,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2071, 0x19e8, 0x760c, 0x2660, 0x2678,</div><div class='del'>-	0x8cff, 0x0904, 0xb19d, 0x7024, 0x9c06, 0x1520, 0x2069, 0x0100,</div><div class='del'>-	0x68c0, 0x9005, 0x0904, 0xb16f, 0x080c, 0xa6e9, 0x68c3, 0x0000,</div><div class='del'>-	0x080c, 0xac1b, 0x7027, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04,</div><div class='del'>-	0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x2d39, 0x9006,</div><div class='del'>-	0x080c, 0x2d39, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110, 0x6827,</div><div class='del'>-	0x0001, 0x003e, 0x700c, 0x9c36, 0x1110, 0x660c, 0x760e, 0x7008,</div><div class='del'>-	0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00, 0x700a, 0x0010,</div><div class='del'>-	0x700b, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06, 0x0110, 0x7e0e,</div><div class='del'>-	0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0xd2cf, 0x1180, 0x080c,</div><div class='del'>-	0x3279, 0x080c, 0xd2e0, 0x1518, 0x080c, 0xbcb6, 0x0400, 0x080c,</div><div class='del'>-	0xac1b, 0x6824, 0xd084, 0x09b0, 0x6827, 0x0001, 0x0898, 0x080c,</div><div class='del'>-	0xd2e0, 0x1118, 0x080c, 0xbcb6, 0x0090, 0x6014, 0x2048, 0x080c,</div><div class='del'>-	0xd0d6, 0x0168, 0x6020, 0x9086, 0x0003, 0x1520, 0xa867, 0x0103,</div><div class='del'>-	0xab7a, 0xa877, 0x0000, 0x080c, 0x6e9f, 0x080c, 0xd2c3, 0x080c,</div><div class='del'>-	0xd54c, 0x080c, 0xb306, 0x080c, 0xaaf1, 0x00ce, 0x0804, 0xb120,</div><div class='del'>-	0x2c78, 0x600c, 0x2060, 0x0804, 0xb120, 0x700f, 0x0000, 0x700b,</div><div class='del'>-	0x0000, 0x012e, 0x006e, 0x009e, 0x00ae, 0x00ce, 0x00de, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x6020, 0x9086, 0x0006, 0x1d08, 0x080c, 0xebd4,</div><div class='del'>-	0x08f0, 0x00d6, 0x0156, 0x080c, 0xa10c, 0x7a14, 0x82ff, 0x0138,</div><div class='del'>-	0x7003, 0x0100, 0x700b, 0x0003, 0x60c3, 0x0008, 0x0490, 0x7003,</div><div class='del'>-	0x0200, 0x7007, 0x0000, 0x2069, 0x1800, 0x901e, 0x6800, 0x9086,</div><div class='del'>-	0x0004, 0x1110, 0xc38d, 0x0060, 0x080c, 0x7637, 0x1110, 0xc3ad,</div><div class='del'>-	0x0008, 0xc3a5, 0x6adc, 0xd29c, 0x1110, 0xd2ac, 0x0108, 0xc39d,</div><div class='del'>-	0x730e, 0x080c, 0x894c, 0x20a9, 0x0006, 0x2011, 0xffec, 0x2019,</div><div class='del'>-	0xffed, 0x2071, 0x0250, 0x2305, 0x2072, 0x8e70, 0x2205, 0x2072,</div><div class='del'>-	0x8e70, 0x9398, 0x0002, 0x9290, 0x0002, 0x1f04, 0xb1e3, 0x60c3,</div><div class='del'>-	0x0020, 0x080c, 0xa6bd, 0x015e, 0x00de, 0x0005, 0x0156, 0x080c,</div><div class='del'>-	0xa10c, 0x7a14, 0x82ff, 0x0168, 0x9286, 0xffff, 0x0118, 0x9282,</div><div class='del'>-	0x000e, 0x1238, 0x7003, 0x0100, 0x700b, 0x0003, 0x60c3, 0x0008,</div><div class='del'>-	0x0488, 0x7003, 0x0200, 0x7007, 0x001c, 0x700f, 0x0001, 0x2011,</div><div class='del'>-	0x19be, 0x2204, 0x8007, 0x701a, 0x8210, 0x2204, 0x8007, 0x701e,</div><div class='del'>-	0x0421, 0x1120, 0xb8a0, 0x9082, 0x007f, 0x0248, 0x2001, 0x181f,</div><div class='del'>-	0x2004, 0x7022, 0x2001, 0x1820, 0x2004, 0x7026, 0x0030, 0x2001,</div><div class='del'>-	0x1818, 0x2004, 0x9084, 0x00ff, 0x7026, 0x20a9, 0x0004, 0x20e1,</div><div class='del'>-	0x0001, 0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1, 0x0256, 0x4003,</div><div class='del'>-	0x60c3, 0x001c, 0x015e, 0x0804, 0xa6bd, 0x0006, 0x2001, 0x1837,</div><div class='del'>-	0x2004, 0xd0ac, 0x000e, 0x0005, 0x2011, 0x0003, 0x080c, 0xaabf,</div><div class='del'>-	0x2011, 0x0002, 0x080c, 0xaac9, 0x080c, 0xa9d3, 0x0036, 0x901e,</div><div class='del'>-	0x080c, 0xaa49, 0x003e, 0x0005, 0x080c, 0x33af, 0x0188, 0x0016,</div><div class='del'>-	0x00b6, 0x00c6, 0x7010, 0x9085, 0x0020, 0x7012, 0x2009, 0x007e,</div><div class='del'>-	0x080c, 0x6724, 0xb85c, 0xc0ac, 0xb85e, 0x00ce, 0x00be, 0x001e,</div><div class='del'>-	0x0005, 0x2071, 0x188d, 0x7000, 0x9005, 0x0140, 0x2001, 0x0976,</div><div class='del'>-	0x2071, 0x1800, 0x7076, 0x707a, 0x706b, 0xffe0, 0x2071, 0x1800,</div><div class='del'>-	0x7074, 0x7056, 0x705b, 0x1cd0, 0x0005, 0x00e6, 0x0126, 0x2071,</div><div class='del'>-	0x1800, 0x2091, 0x8000, 0x7554, 0x9582, 0x0010, 0x0608, 0x7058,</div><div class='del'>-	0x2060, 0x6000, 0x9086, 0x0000, 0x0148, 0x9ce0, 0x0018, 0x7068,</div><div class='del'>-	0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1cd0, 0x0c98, 0x6003, 0x0008,</div><div class='del'>-	0x8529, 0x7556, 0x9ca8, 0x0018, 0x7068, 0x9502, 0x1230, 0x755a,</div><div class='del'>-	0x9085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x705b, 0x1cd0, 0x0cc0,</div><div class='del'>-	0x9006, 0x0cc0, 0x00e6, 0x2071, 0x1800, 0x7554, 0x9582, 0x0010,</div><div class='del'>-	0x0600, 0x7058, 0x2060, 0x6000, 0x9086, 0x0000, 0x0148, 0x9ce0,</div><div class='del'>-	0x0018, 0x7068, 0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1cd0, 0x0c98,</div><div class='del'>-	0x6003, 0x0008, 0x8529, 0x7556, 0x9ca8, 0x0018, 0x7068, 0x9502,</div><div class='del'>-	0x1228, 0x755a, 0x9085, 0x0001, 0x00ee, 0x0005, 0x705b, 0x1cd0,</div><div class='del'>-	0x0cc8, 0x9006, 0x0cc8, 0x9c82, 0x1cd0, 0x0a0c, 0x0dc5, 0x2001,</div><div class='del'>-	0x181a, 0x2004, 0x9c02, 0x1a0c, 0x0dc5, 0x9006, 0x6006, 0x600a,</div><div class='del'>-	0x600e, 0x6016, 0x601a, 0x6012, 0x6023, 0x0000, 0x6003, 0x0000,</div><div class='del'>-	0x601e, 0x6056, 0x605a, 0x6026, 0x602a, 0x602e, 0x6032, 0x6036,</div><div class='del'>-	0x603a, 0x603e, 0x6042, 0x602a, 0x2061, 0x1800, 0x6054, 0x8000,</div><div class='del'>-	0x6056, 0x9086, 0x0001, 0x0108, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0016, 0x080c, 0x9ab1, 0x001e, 0x012e, 0x0cb0, 0x0006, 0x6000,</div><div class='del'>-	0x9086, 0x0000, 0x01c0, 0x601c, 0xd084, 0x190c, 0x1a8e, 0x6017,</div><div class='del'>-	0x0000, 0x6023, 0x0007, 0x2001, 0x1986, 0x2004, 0x0006, 0x9082,</div><div class='del'>-	0x0051, 0x000e, 0x0208, 0x8004, 0x601a, 0x080c, 0xee87, 0x6043,</div><div class='del'>-	0x0000, 0x6013, 0x0000, 0x000e, 0x0005, 0x00e6, 0x0126, 0x2071,</div><div class='del'>-	0x1800, 0x2091, 0x8000, 0x7554, 0x9582, 0x0001, 0x0608, 0x7058,</div><div class='del'>-	0x2060, 0x6000, 0x9086, 0x0000, 0x0148, 0x9ce0, 0x0018, 0x7068,</div><div class='del'>-	0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1cd0, 0x0c98, 0x6003, 0x0008,</div><div class='del'>-	0x8529, 0x7556, 0x9ca8, 0x0018, 0x7068, 0x9502, 0x1230, 0x755a,</div><div class='del'>-	0x9085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x705b, 0x1cd0, 0x0cc0,</div><div class='del'>-	0x9006, 0x0cc0, 0x6020, 0x9084, 0x000f, 0x0002, 0xb365, 0xb36e,</div><div class='del'>-	0xb389, 0xb3a4, 0xd82b, 0xd848, 0xd863, 0xb365, 0xb36e, 0x9100,</div><div class='del'>-	0xb3bd, 0xb365, 0xb365, 0xb365, 0xb365, 0x9186, 0x0013, 0x1128,</div><div class='del'>-	0x080c, 0x99a5, 0x080c, 0x9ab1, 0x0005, 0x0005, 0x0066, 0x6000,</div><div class='del'>-	0x90b2, 0x0010, 0x1a0c, 0x0dc5, 0x0013, 0x006e, 0x0005, 0xb387,</div><div class='del'>-	0xbb05, 0xbcfd, 0xb387, 0xbd93, 0xb6a0, 0xb387, 0xb387, 0xba87,</div><div class='del'>-	0xc3b1, 0xb387, 0xb387, 0xb387, 0xb387, 0xb387, 0xb387, 0x080c,</div><div class='del'>-	0x0dc5, 0x0066, 0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0dc5, 0x0013,</div><div class='del'>-	0x006e, 0x0005, 0xb3a2, 0xca7e, 0xb3a2, 0xb3a2, 0xb3a2, 0xb3a2,</div><div class='del'>-	0xb3a2, 0xb3a2, 0xca15, 0xcc00, 0xb3a2, 0xcabf, 0xcb3e, 0xcabf,</div><div class='del'>-	0xcb3e, 0xb3a2, 0x080c, 0x0dc5, 0x6000, 0x9082, 0x0010, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x6000, 0x0002, 0xb3bb, 0xc3f8, 0xc4c0, 0xc5f3, 0xc7a2,</div><div class='del'>-	0xb3bb, 0xb3bb, 0xb3bb, 0xc3cc, 0xc9a1, 0xc9a4, 0xb3bb, 0xb3bb,</div><div class='del'>-	0xb3bb, 0xb3bb, 0xc9d3, 0x080c, 0x0dc5, 0x0066, 0x6000, 0x90b2,</div><div class='del'>-	0x0010, 0x1a0c, 0x0dc5, 0x0013, 0x006e, 0x0005, 0xb3d6, 0xb3d6,</div><div class='del'>-	0xb419, 0xb4b8, 0xb54d, 0xb3d6, 0xb3d6, 0xb3d6, 0xb3d8, 0xb3d6,</div><div class='del'>-	0xb3d6, 0xb3d6, 0xb3d6, 0xb3d6, 0xb3d6, 0xb3d6, 0x080c, 0x0dc5,</div><div class='del'>-	0x9186, 0x004c, 0x0588, 0x9186, 0x0003, 0x190c, 0x0dc5, 0x0096,</div><div class='del'>-	0x601c, 0xc0ed, 0x601e, 0x6003, 0x0003, 0x6106, 0x6014, 0x2048,</div><div class='del'>-	0xa87c, 0x9084, 0xa000, 0xc0b5, 0xa87e, 0xa8ac, 0xa846, 0xa8b0,</div><div class='del'>-	0xa84a, 0x9006, 0xa836, 0xa83a, 0xa884, 0x9092, 0x199a, 0x0210,</div><div class='del'>-	0x2001, 0x1999, 0x8003, 0x8013, 0x8213, 0x9210, 0x621a, 0x009e,</div><div class='del'>-	0x2c10, 0x080c, 0x1be0, 0x080c, 0x9564, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x9bd3, 0x012e, 0x0005, 0x6010, 0x00b6, 0x2058, 0xbca0,</div><div class='del'>-	0x00be, 0x2c00, 0x080c, 0xb56f, 0x080c, 0xd7fb, 0x6003, 0x0007,</div><div class='del'>-	0x0005, 0x00d6, 0x0096, 0x00f6, 0x2079, 0x1800, 0x7a90, 0x6014,</div><div class='del'>-	0x2048, 0xa87c, 0xd0ec, 0x1110, 0x9290, 0x0018, 0xac78, 0xc4fc,</div><div class='del'>-	0x0046, 0xa8e0, 0x9005, 0x1140, 0xa8dc, 0x921a, 0x0140, 0x0220,</div><div class='del'>-	0xa87b, 0x0007, 0x2010, 0x0028, 0xa87b, 0x0015, 0x0010, 0xa87b,</div><div class='del'>-	0x0000, 0x8214, 0xa883, 0x0000, 0xaa02, 0x0006, 0x0016, 0x0026,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2400, 0x9005, 0x1108, 0x009a,</div><div class='del'>-	0x2100, 0x9086, 0x0015, 0x1118, 0x2001, 0x0001, 0x0038, 0x2100,</div><div class='del'>-	0x9086, 0x0016, 0x0118, 0x2001, 0x0001, 0x002a, 0x94a4, 0x0007,</div><div class='del'>-	0x8423, 0x9405, 0x0002, 0xb480, 0xb480, 0xb47b, 0xb47e, 0xb480,</div><div class='del'>-	0xb478, 0xb46b, 0xb46b, 0xb46b, 0xb46b, 0xb46b, 0xb46b, 0xb46b,</div><div class='del'>-	0xb46b, 0xb46b, 0xb46b, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x004e, 0x00fe, 0x009e, 0x00de, 0x080c, 0x0dc5,</div><div class='del'>-	0x080c, 0xbfab, 0x0028, 0x080c, 0xc0e9, 0x0010, 0x080c, 0xc1df,</div><div class='del'>-	0x00fe, 0x00ee, 0x00de, 0x00ce, 0x002e, 0x001e, 0x2c00, 0xa896,</div><div class='del'>-	0x000e, 0x080c, 0xb62d, 0x0530, 0xa804, 0xa80e, 0x00a6, 0x2050,</div><div class='del'>-	0xb100, 0x00ae, 0x8006, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,</div><div class='del'>-	0xffc0, 0x9080, 0x0002, 0xaacc, 0xabd0, 0xacd4, 0xadd8, 0x2031,</div><div class='del'>-	0x0000, 0x2041, 0x126c, 0x080c, 0xb7f1, 0x0160, 0x000e, 0x9005,</div><div class='del'>-	0x0120, 0x00fe, 0x009e, 0x00de, 0x0005, 0x00fe, 0x009e, 0x00de,</div><div class='del'>-	0x0804, 0xb2d3, 0x2001, 0x002c, 0x900e, 0x080c, 0xb693, 0x0c70,</div><div class='del'>-	0x91b6, 0x0015, 0x0170, 0x91b6, 0x0016, 0x0158, 0x91b2, 0x0047,</div><div class='del'>-	0x0a0c, 0x0dc5, 0x91b2, 0x0050, 0x1a0c, 0x0dc5, 0x9182, 0x0047,</div><div class='del'>-	0x00ca, 0x2001, 0x0109, 0x2004, 0xd08c, 0x0198, 0x0126, 0x2091,</div><div class='del'>-	0x2800, 0x0006, 0x0016, 0x0026, 0x080c, 0x94b1, 0x002e, 0x001e,</div><div class='del'>-	0x000e, 0x012e, 0xa001, 0x6000, 0x9086, 0x0002, 0x1110, 0x0804,</div><div class='del'>-	0xb419, 0x0005, 0xb4eb, 0xb4eb, 0xb4ed, 0xb523, 0xb4eb, 0xb4eb,</div><div class='del'>-	0xb4eb, 0xb4eb, 0xb536, 0x080c, 0x0dc5, 0x00d6, 0x0016, 0x0096,</div><div class='del'>-	0x080c, 0x9a61, 0x080c, 0x9bd3, 0x6003, 0x0004, 0x6114, 0x2148,</div><div class='del'>-	0xa87c, 0xd0fc, 0x01c0, 0xa878, 0xc0fc, 0x9005, 0x1158, 0xa894,</div><div class='del'>-	0x9005, 0x0140, 0x2001, 0x0000, 0x900e, 0x080c, 0xb693, 0x080c,</div><div class='del'>-	0xb2d3, 0x00a8, 0x6003, 0x0002, 0xa8a4, 0xa9a8, 0x9105, 0x1178,</div><div class='del'>-	0xa8ae, 0xa8b2, 0x0c78, 0xa87f, 0x0020, 0xa88c, 0xa88a, 0xa8a4,</div><div class='del'>-	0xa8ae, 0xa8a8, 0xa8b2, 0xa8c7, 0x0000, 0xa8cb, 0x0000, 0x009e,</div><div class='del'>-	0x001e, 0x00de, 0x0005, 0x080c, 0x9a61, 0x00d6, 0x0096, 0x6114,</div><div class='del'>-	0x2148, 0x080c, 0xd0d8, 0x0120, 0xa87b, 0x0006, 0x080c, 0x6e9f,</div><div class='del'>-	0x009e, 0x00de, 0x080c, 0xb2d3, 0x0804, 0x9bd3, 0x080c, 0x9a61,</div><div class='del'>-	0x080c, 0x3250, 0x080c, 0xd7f8, 0x00d6, 0x0096, 0x6114, 0x2148,</div><div class='del'>-	0x080c, 0xd0d8, 0x0120, 0xa87b, 0x0029, 0x080c, 0x6e9f, 0x009e,</div><div class='del'>-	0x00de, 0x080c, 0xb2d3, 0x0804, 0x9bd3, 0x9182, 0x0047, 0x0002,</div><div class='del'>-	0xb55d, 0xb55f, 0xb55d, 0xb55d, 0xb55d, 0xb55d, 0xb55d, 0xb55d,</div><div class='del'>-	0xb55d, 0xb55d, 0xb55d, 0xb55d, 0xb55f, 0x080c, 0x0dc5, 0x00d6,</div><div class='del'>-	0x0096, 0x601f, 0x0000, 0x6114, 0x2148, 0xa87b, 0x0000, 0xa883,</div><div class='del'>-	0x0000, 0x080c, 0x6e9f, 0x009e, 0x00de, 0x0804, 0xb2d3, 0x0026,</div><div class='del'>-	0x0036, 0x0056, 0x0066, 0x0096, 0x00a6, 0x00f6, 0x0006, 0x080c,</div><div class='del'>-	0x100e, 0x000e, 0x090c, 0x0dc5, 0xa960, 0x21e8, 0xa95c, 0x9188,</div><div class='del'>-	0x0019, 0x21a0, 0x900e, 0x20a9, 0x0020, 0x4104, 0xa87a, 0x2079,</div><div class='del'>-	0x1800, 0x7990, 0x9188, 0x0018, 0x918c, 0x0fff, 0xa972, 0xac76,</div><div class='del'>-	0x2950, 0x00a6, 0x2001, 0x0205, 0x2003, 0x0000, 0x901e, 0x2029,</div><div class='del'>-	0x0001, 0x9182, 0x0035, 0x1228, 0x2011, 0x001f, 0x080c, 0xcc85,</div><div class='del'>-	0x04c0, 0x2130, 0x2009, 0x0034, 0x2011, 0x001f, 0x080c, 0xcc85,</div><div class='del'>-	0x96b2, 0x0034, 0xb004, 0x904d, 0x0110, 0x080c, 0x0fc0, 0x080c,</div><div class='del'>-	0x100e, 0x01d0, 0x8528, 0xa867, 0x0110, 0xa86b, 0x0000, 0x2920,</div><div class='del'>-	0xb406, 0x968a, 0x003d, 0x1230, 0x2608, 0x2011, 0x001b, 0x080c,</div><div class='del'>-	0xcc85, 0x00b8, 0x96b2, 0x003c, 0x2009, 0x003c, 0x2950, 0x2011,</div><div class='del'>-	0x001b, 0x080c, 0xcc85, 0x0c18, 0x2001, 0x0205, 0x2003, 0x0000,</div><div class='del'>-	0x00ae, 0x852f, 0x95ad, 0x0050, 0xb566, 0xb070, 0xc0fd, 0xb072,</div><div class='del'>-	0x0048, 0x2001, 0x0205, 0x2003, 0x0000, 0x00ae, 0x852f, 0x95ad,</div><div class='del'>-	0x0050, 0xb566, 0x2a48, 0xa804, 0xa807, 0x0000, 0x0006, 0x080c,</div><div class='del'>-	0x6e9f, 0x000e, 0x2048, 0x9005, 0x1db0, 0x00fe, 0x00ae, 0x009e,</div><div class='del'>-	0x006e, 0x005e, 0x003e, 0x002e, 0x0005, 0x00d6, 0x00f6, 0x0096,</div><div class='del'>-	0x0006, 0x080c, 0x100e, 0x000e, 0x090c, 0x0dc5, 0xa960, 0x21e8,</div><div class='del'>-	0xa95c, 0x9188, 0x0019, 0x21a0, 0x900e, 0x20a9, 0x0020, 0x4104,</div><div class='del'>-	0xaa66, 0xa87a, 0x2079, 0x1800, 0x7990, 0x810c, 0x9188, 0x000c,</div><div class='del'>-	0x9182, 0x001a, 0x0210, 0x2009, 0x001a, 0x21a8, 0x810b, 0xa972,</div><div class='del'>-	0xac76, 0x2e98, 0xa85c, 0x9080, 0x001f, 0x20a0, 0x2001, 0x0205,</div><div class='del'>-	0x200c, 0x918d, 0x0080, 0x2102, 0x4003, 0x2003, 0x0000, 0x080c,</div><div class='del'>-	0x6e9f, 0x009e, 0x00fe, 0x00de, 0x0005, 0x0016, 0x00d6, 0x00f6,</div><div class='del'>-	0x0096, 0x0016, 0x2001, 0x0205, 0x200c, 0x918d, 0x0080, 0x2102,</div><div class='del'>-	0x001e, 0x2079, 0x0200, 0x2e98, 0xa87c, 0xd0ec, 0x0118, 0x9e80,</div><div class='del'>-	0x000c, 0x2098, 0x2021, 0x003e, 0x901e, 0x9282, 0x0020, 0x0218,</div><div class='del'>-	0x2011, 0x0020, 0x2018, 0x9486, 0x003e, 0x1170, 0x0096, 0x080c,</div><div class='del'>-	0x100e, 0x2900, 0x009e, 0x05c0, 0xa806, 0x2048, 0xa860, 0x20e8,</div><div class='del'>-	0xa85c, 0x9080, 0x0002, 0x20a0, 0x3300, 0x908e, 0x0260, 0x0140,</div><div class='del'>-	0x2009, 0x0280, 0x9102, 0x920a, 0x0218, 0x2010, 0x2100, 0x9318,</div><div class='del'>-	0x2200, 0x9402, 0x1228, 0x2400, 0x9202, 0x2410, 0x9318, 0x9006,</div><div class='del'>-	0x2020, 0x22a8, 0xa800, 0x9200, 0xa802, 0x20e1, 0x0000, 0x4003,</div><div class='del'>-	0x83ff, 0x0180, 0x3300, 0x9086, 0x0280, 0x1130, 0x7814, 0x8000,</div><div class='del'>-	0x9085, 0x0080, 0x7816, 0x2e98, 0x2310, 0x84ff, 0x0904, 0xb642,</div><div class='del'>-	0x0804, 0xb644, 0x9085, 0x0001, 0x7817, 0x0000, 0x009e, 0x00fe,</div><div class='del'>-	0x00de, 0x001e, 0x0005, 0x00d6, 0x0036, 0x0096, 0x6314, 0x2348,</div><div class='del'>-	0xa87a, 0xa982, 0x080c, 0x6e92, 0x009e, 0x003e, 0x00de, 0x0005,</div><div class='del'>-	0x91b6, 0x0015, 0x1118, 0x080c, 0xb2d3, 0x0030, 0x91b6, 0x0016,</div><div class='del'>-	0x190c, 0x0dc5, 0x080c, 0xb2d3, 0x0005, 0x20a9, 0x000e, 0x20e1,</div><div class='del'>-	0x0000, 0x2e98, 0x6014, 0x0096, 0x2048, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x20a0, 0x009e, 0x4003, 0x9196, 0x0016, 0x01f0, 0x0136, 0x9080,</div><div class='del'>-	0x001b, 0x20a0, 0x2011, 0x0006, 0x20a9, 0x0001, 0x3418, 0x8318,</div><div class='del'>-	0x23a0, 0x4003, 0x3318, 0x8318, 0x2398, 0x8211, 0x1db8, 0x2011,</div><div class='del'>-	0x0006, 0x013e, 0x20a0, 0x3318, 0x8318, 0x2398, 0x4003, 0x3418,</div><div class='del'>-	0x8318, 0x23a0, 0x8211, 0x1db8, 0x0096, 0x080c, 0xd0d8, 0x0130,</div><div class='del'>-	0x6014, 0x2048, 0xa807, 0x0000, 0xa867, 0x0103, 0x009e, 0x0804,</div><div class='del'>-	0xb2d3, 0x0096, 0x00d6, 0x0036, 0x7330, 0x9386, 0x0200, 0x11a8,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb8cf, 0x0000, 0x00be, 0x6014, 0x9005,</div><div class='del'>-	0x0130, 0x2048, 0xa807, 0x0000, 0xa867, 0x0103, 0xab32, 0x080c,</div><div class='del'>-	0xb2d3, 0x003e, 0x00de, 0x009e, 0x0005, 0x0011, 0x1d48, 0x0cc8,</div><div class='del'>-	0x0006, 0x0016, 0x080c, 0xd7e3, 0x0188, 0x6014, 0x9005, 0x1170,</div><div class='del'>-	0x600b, 0x0003, 0x601b, 0x0000, 0x6043, 0x0000, 0x2009, 0x0022,</div><div class='del'>-	0x080c, 0xbadd, 0x9006, 0x001e, 0x000e, 0x0005, 0x9085, 0x0001,</div><div class='del'>-	0x0cd0, 0x0096, 0x0016, 0x20a9, 0x0014, 0x9e80, 0x000c, 0x20e1,</div><div class='del'>-	0x0000, 0x2098, 0x6014, 0x2048, 0xa860, 0x20e8, 0xa85c, 0x9080,</div><div class='del'>-	0x0002, 0x20a0, 0x4003, 0x2001, 0x0205, 0x2003, 0x0001, 0x2099,</div><div class='del'>-	0x0260, 0x20a9, 0x0016, 0x4003, 0x20a9, 0x000a, 0xa804, 0x2048,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003, 0x2001,</div><div class='del'>-	0x0205, 0x2003, 0x0002, 0x2099, 0x0260, 0x20a9, 0x0020, 0x4003,</div><div class='del'>-	0x2003, 0x0000, 0x6014, 0x2048, 0xa800, 0x2048, 0xa867, 0x0103,</div><div class='del'>-	0x080c, 0xb2d3, 0x001e, 0x009e, 0x0005, 0x0096, 0x0016, 0x900e,</div><div class='del'>-	0x7030, 0x9086, 0x0100, 0x0140, 0x7038, 0x9084, 0x00ff, 0x800c,</div><div class='del'>-	0x703c, 0x9084, 0x00ff, 0x8004, 0x9080, 0x0004, 0x9108, 0x810b,</div><div class='del'>-	0x2011, 0x0002, 0x2019, 0x000c, 0x6014, 0x2048, 0x080c, 0xcc85,</div><div class='del'>-	0x080c, 0xd0d8, 0x0140, 0x6014, 0x2048, 0xa807, 0x0000, 0xa864,</div><div class='del'>-	0xa8e2, 0xa867, 0x0103, 0x080c, 0xb2d3, 0x001e, 0x009e, 0x0005,</div><div class='del'>-	0x0016, 0x2009, 0x0000, 0x7030, 0x9086, 0x0200, 0x0110, 0x2009,</div><div class='del'>-	0x0001, 0x0096, 0x6014, 0x904d, 0x090c, 0x0dc5, 0xa97a, 0x080c,</div><div class='del'>-	0x6e9f, 0x009e, 0x080c, 0xb2d3, 0x001e, 0x0005, 0x0016, 0x0096,</div><div class='del'>-	0x7030, 0x9086, 0x0100, 0x1118, 0x2009, 0x0004, 0x0010, 0x7034,</div><div class='del'>-	0x800c, 0x810b, 0x2011, 0x000c, 0x2019, 0x000c, 0x6014, 0x2048,</div><div class='del'>-	0xa804, 0x0096, 0x9005, 0x0108, 0x2048, 0x080c, 0xcc85, 0x009e,</div><div class='del'>-	0x080c, 0xd0d8, 0x0148, 0xa804, 0x9005, 0x1158, 0xa807, 0x0000,</div><div class='del'>-	0xa864, 0xa8e2, 0xa867, 0x0103, 0x080c, 0xb2d3, 0x009e, 0x001e,</div><div class='del'>-	0x0005, 0x0086, 0x2040, 0xa030, 0x8007, 0x9086, 0x0100, 0x1118,</div><div class='del'>-	0x080c, 0xbcb6, 0x00e0, 0xa034, 0x8007, 0x800c, 0x8806, 0x8006,</div><div class='del'>-	0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x000c, 0xa87b,</div><div class='del'>-	0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0xaaa0, 0xab9c, 0xaca8,</div><div class='del'>-	0xada4, 0x2031, 0x0000, 0x2041, 0x1252, 0x0019, 0x0d08, 0x008e,</div><div class='del'>-	0x0898, 0x0096, 0x0006, 0x080c, 0x100e, 0x000e, 0x01b0, 0xa8ab,</div><div class='del'>-	0x0dcb, 0xa876, 0x000e, 0xa8a2, 0x0006, 0xae6a, 0x2800, 0xa89e,</div><div class='del'>-	0xa97a, 0xaf72, 0xaa8e, 0xab92, 0xac96, 0xad9a, 0x0086, 0x2940,</div><div class='del'>-	0x080c, 0x10f8, 0x008e, 0x9085, 0x0001, 0x009e, 0x0005, 0x00e6,</div><div class='del'>-	0x00d6, 0x0026, 0x7008, 0x9084, 0x00ff, 0x6210, 0x00b6, 0x2258,</div><div class='del'>-	0xba10, 0x00be, 0x9206, 0x1520, 0x700c, 0x6210, 0x00b6, 0x2258,</div><div class='del'>-	0xba14, 0x00be, 0x9206, 0x11e0, 0x6043, 0x0000, 0x2c68, 0x0016,</div><div class='del'>-	0x2009, 0x0035, 0x080c, 0xd759, 0x001e, 0x1158, 0x622c, 0x2268,</div><div class='del'>-	0x2071, 0x026c, 0x6b20, 0x9386, 0x0003, 0x0130, 0x9386, 0x0006,</div><div class='del'>-	0x0128, 0x080c, 0xb2d3, 0x0020, 0x0039, 0x0010, 0x080c, 0xb910,</div><div class='del'>-	0x002e, 0x00de, 0x00ee, 0x0005, 0x0096, 0x6814, 0x2048, 0x9186,</div><div class='del'>-	0x0015, 0x0904, 0xb8f8, 0x918e, 0x0016, 0x1904, 0xb90e, 0x700c,</div><div class='del'>-	0x908c, 0xff00, 0x9186, 0x1700, 0x0120, 0x9186, 0x0300, 0x1904,</div><div class='del'>-	0xb8d2, 0x89ff, 0x1138, 0x6800, 0x9086, 0x000f, 0x0904, 0xb8b5,</div><div class='del'>-	0x0804, 0xb90c, 0x6808, 0x9086, 0xffff, 0x1904, 0xb8fa, 0xa87c,</div><div class='del'>-	0x9084, 0x0060, 0x9086, 0x0020, 0x1128, 0xa83c, 0xa940, 0x9105,</div><div class='del'>-	0x1904, 0xb8fa, 0x6824, 0xd084, 0x1904, 0xb8fa, 0xd0b4, 0x0158,</div><div class='del'>-	0x0016, 0x2001, 0x1986, 0x200c, 0x6018, 0x9102, 0x9082, 0x0005,</div><div class='del'>-	0x001e, 0x1a04, 0xb8fa, 0x080c, 0xd2c3, 0x685c, 0xa882, 0xa87c,</div><div class='del'>-	0xc0dc, 0xc0f4, 0xc0d4, 0xa87e, 0x0026, 0x900e, 0x6a18, 0x2001,</div><div class='del'>-	0x000a, 0x080c, 0x9375, 0xa884, 0x920a, 0x0208, 0x8011, 0xaa86,</div><div class='del'>-	0x82ff, 0x002e, 0x1138, 0x00c6, 0x2d60, 0x080c, 0xcde3, 0x00ce,</div><div class='del'>-	0x0804, 0xb90c, 0x00c6, 0xa868, 0xd0fc, 0x1118, 0x080c, 0x61c2,</div><div class='del'>-	0x0010, 0x080c, 0x65cf, 0x00ce, 0x1904, 0xb8fa, 0x00c6, 0x2d60,</div><div class='del'>-	0x080c, 0xb2d3, 0x00ce, 0x0804, 0xb90c, 0x00c6, 0x080c, 0xb325,</div><div class='del'>-	0x0198, 0x6017, 0x0000, 0x6810, 0x6012, 0x080c, 0xd554, 0x6023,</div><div class='del'>-	0x0003, 0x6904, 0x00c6, 0x2d60, 0x080c, 0xb2d3, 0x00ce, 0x080c,</div><div class='del'>-	0xb352, 0x00ce, 0x0804, 0xb90c, 0x2001, 0x1988, 0x2004, 0x6842,</div><div class='del'>-	0x00ce, 0x04d0, 0x7008, 0x9086, 0x000b, 0x11c8, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb900, 0xc1bc, 0xb902, 0x00be, 0x00c6, 0x2d60, 0xa87b,</div><div class='del'>-	0x0003, 0x080c, 0xd79d, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023,</div><div class='del'>-	0x0002, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x00ce, 0x00e8, 0x700c,</div><div class='del'>-	0x9086, 0x2a00, 0x1138, 0x2001, 0x1988, 0x2004, 0x6842, 0x00a0,</div><div class='del'>-	0x0479, 0x00a0, 0x89ff, 0x090c, 0x0dc5, 0x00c6, 0x00d6, 0x2d60,</div><div class='del'>-	0xa867, 0x0103, 0xa87b, 0x0003, 0x080c, 0x6cb9, 0x080c, 0xd2c3,</div><div class='del'>-	0x080c, 0xb306, 0x00de, 0x00ce, 0x080c, 0xb2d3, 0x009e, 0x0005,</div><div class='del'>-	0x9186, 0x0015, 0x1128, 0x2001, 0x1988, 0x2004, 0x6842, 0x0068,</div><div class='del'>-	0x918e, 0x0016, 0x1160, 0x00c6, 0x2d00, 0x2060, 0x080c, 0xee87,</div><div class='del'>-	0x080c, 0x8a25, 0x080c, 0xb2d3, 0x00ce, 0x080c, 0xb2d3, 0x0005,</div><div class='del'>-	0x0026, 0x0036, 0x0046, 0x7228, 0xacb0, 0xabac, 0xd2f4, 0x0130,</div><div class='del'>-	0x2001, 0x1988, 0x2004, 0x6842, 0x0804, 0xb98a, 0x00c6, 0x2d60,</div><div class='del'>-	0x080c, 0xcce6, 0x00ce, 0x6804, 0x9086, 0x0050, 0x1168, 0x00c6,</div><div class='del'>-	0x2d00, 0x2060, 0x6003, 0x0001, 0x6007, 0x0050, 0x080c, 0x94ff,</div><div class='del'>-	0x080c, 0x9ab1, 0x00ce, 0x04f0, 0x6800, 0x9086, 0x000f, 0x01a8,</div><div class='del'>-	0x89ff, 0x090c, 0x0dc5, 0x6800, 0x9086, 0x0004, 0x1190, 0xa87c,</div><div class='del'>-	0xd0ac, 0x0178, 0xa843, 0x0fff, 0xa83f, 0x0fff, 0xa880, 0xc0fc,</div><div class='del'>-	0xa882, 0x2001, 0x0001, 0x6832, 0x0400, 0x2001, 0x0007, 0x6832,</div><div class='del'>-	0x00e0, 0xa87c, 0xd0b4, 0x1150, 0xd0ac, 0x0db8, 0x6824, 0xd0f4,</div><div class='del'>-	0x1d48, 0xa838, 0xa934, 0x9105, 0x0d80, 0x0c20, 0xd2ec, 0x1d68,</div><div class='del'>-	0x7024, 0x9306, 0x1118, 0x7020, 0x9406, 0x0d38, 0x7020, 0x683e,</div><div class='del'>-	0x7024, 0x683a, 0x2001, 0x0005, 0x6832, 0x080c, 0xd44b, 0x080c,</div><div class='del'>-	0x9ab1, 0x0010, 0x080c, 0xb2d3, 0x004e, 0x003e, 0x002e, 0x0005,</div><div class='del'>-	0x00e6, 0x00d6, 0x0026, 0x7008, 0x9084, 0x00ff, 0x6210, 0x00b6,</div><div class='del'>-	0x2258, 0xba10, 0x00be, 0x9206, 0x1904, 0xb9f5, 0x700c, 0x6210,</div><div class='del'>-	0x00b6, 0x2258, 0xba14, 0x00be, 0x9206, 0x1904, 0xb9f5, 0x6038,</div><div class='del'>-	0x2068, 0x6824, 0xc0dc, 0x6826, 0x6a20, 0x9286, 0x0007, 0x0904,</div><div class='del'>-	0xb9f5, 0x9286, 0x0002, 0x0904, 0xb9f5, 0x9286, 0x0000, 0x05e8,</div><div class='del'>-	0x6808, 0x633c, 0x9306, 0x15c8, 0x2071, 0x026c, 0x9186, 0x0015,</div><div class='del'>-	0x0570, 0x918e, 0x0016, 0x1100, 0x00c6, 0x6038, 0x2060, 0x6104,</div><div class='del'>-	0x9186, 0x004b, 0x01c0, 0x9186, 0x004c, 0x01a8, 0x9186, 0x004d,</div><div class='del'>-	0x0190, 0x9186, 0x004e, 0x0178, 0x9186, 0x0052, 0x0160, 0x6014,</div><div class='del'>-	0x0096, 0x2048, 0x080c, 0xd0d8, 0x090c, 0x0dc5, 0xa87b, 0x0003,</div><div class='del'>-	0x009e, 0x080c, 0xd79d, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023,</div><div class='del'>-	0x0002, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x00ce, 0x0030, 0x6038,</div><div class='del'>-	0x2070, 0x2001, 0x1988, 0x2004, 0x7042, 0x080c, 0xb2d3, 0x002e,</div><div class='del'>-	0x00de, 0x00ee, 0x0005, 0x00b6, 0x0096, 0x00f6, 0x6014, 0x2048,</div><div class='del'>-	0x6010, 0x2058, 0x91b6, 0x0015, 0x0130, 0xba08, 0xbb0c, 0xbc00,</div><div class='del'>-	0xc48c, 0xbc02, 0x0470, 0x0096, 0x0156, 0x0036, 0x0026, 0x2b48,</div><div class='del'>-	0x9e90, 0x0010, 0x2019, 0x000a, 0x20a9, 0x0004, 0x080c, 0xc379,</div><div class='del'>-	0x002e, 0x003e, 0x015e, 0x009e, 0x1904, 0xba66, 0x0096, 0x0156,</div><div class='del'>-	0x0036, 0x0026, 0x2b48, 0x9e90, 0x0014, 0x2019, 0x0006, 0x20a9,</div><div class='del'>-	0x0004, 0x080c, 0xc379, 0x002e, 0x003e, 0x015e, 0x009e, 0x15b0,</div><div class='del'>-	0x7238, 0xba0a, 0x733c, 0xbb0e, 0x83ff, 0x0118, 0xbc00, 0xc48d,</div><div class='del'>-	0xbc02, 0xa804, 0x9005, 0x1128, 0x00fe, 0x009e, 0x00be, 0x0804,</div><div class='del'>-	0xb6dc, 0x0096, 0x2048, 0xaa12, 0xab16, 0xac0a, 0x009e, 0x8006,</div><div class='del'>-	0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002,</div><div class='del'>-	0x2009, 0x002b, 0xaaa0, 0xab9c, 0xaca8, 0xada4, 0x2031, 0x0000,</div><div class='del'>-	0x2041, 0x1252, 0x080c, 0xb7f1, 0x0130, 0x00fe, 0x009e, 0x080c,</div><div class='del'>-	0xb2d3, 0x00be, 0x0005, 0x080c, 0xbcb6, 0x0cb8, 0x2b78, 0x00f6,</div><div class='del'>-	0x080c, 0x3250, 0x080c, 0xd7f8, 0x00fe, 0x00c6, 0x080c, 0xb27d,</div><div class='del'>-	0x2f00, 0x6012, 0x6017, 0x0000, 0x6023, 0x0001, 0x6007, 0x0001,</div><div class='del'>-	0x6003, 0x0001, 0x2001, 0x0007, 0x080c, 0x666a, 0x080c, 0x6696,</div><div class='del'>-	0x080c, 0x9547, 0x080c, 0x9ab1, 0x00ce, 0x0804, 0xba39, 0x2100,</div><div class='del'>-	0x91b2, 0x0053, 0x1a0c, 0x0dc5, 0x91b2, 0x0040, 0x1a04, 0xbaef,</div><div class='del'>-	0x0002, 0xbadd, 0xbadd, 0xbad3, 0xbadd, 0xbadd, 0xbadd, 0xbad1,</div><div class='del'>-	0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1,</div><div class='del'>-	0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1,</div><div class='del'>-	0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1,</div><div class='del'>-	0xbadd, 0xbad1, 0xbadd, 0xbadd, 0xbad1, 0xbad1, 0xbad1, 0xbad1,</div><div class='del'>-	0xbad1, 0xbad3, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1,</div><div class='del'>-	0xbad1, 0xbad1, 0xbad1, 0xbadd, 0xbadd, 0xbad1, 0xbad1, 0xbad1,</div><div class='del'>-	0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbad1, 0xbadd, 0xbad1,</div><div class='del'>-	0xbad1, 0x080c, 0x0dc5, 0x0066, 0x00b6, 0x6610, 0x2658, 0xb8cc,</div><div class='del'>-	0xc08c, 0xb8ce, 0x00be, 0x006e, 0x0000, 0x6003, 0x0001, 0x6106,</div><div class='del'>-	0x9186, 0x0032, 0x0118, 0x080c, 0x9547, 0x0010, 0x080c, 0x94ff,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x9ab1, 0x012e, 0x0005, 0x2600,</div><div class='del'>-	0x0002, 0xbadd, 0xbadd, 0xbb03, 0xbadd, 0xbadd, 0xbb03, 0xbb03,</div><div class='del'>-	0xbb03, 0xbb03, 0xbadd, 0xbb03, 0xbadd, 0xbb03, 0xbadd, 0xbb03,</div><div class='del'>-	0xbb03, 0xbb03, 0xbb03, 0x080c, 0x0dc5, 0x6004, 0x90b2, 0x0053,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x91b6, 0x0013, 0x0904, 0xbbd8, 0x91b6, 0x0027,</div><div class='del'>-	0x1904, 0xbb82, 0x080c, 0x99a5, 0x6004, 0x080c, 0xd2cf, 0x01b0,</div><div class='del'>-	0x080c, 0xd2e0, 0x01a8, 0x908e, 0x0021, 0x0904, 0xbb7f, 0x908e,</div><div class='del'>-	0x0022, 0x1130, 0x080c, 0xb708, 0x0904, 0xbb7b, 0x0804, 0xbb7c,</div><div class='del'>-	0x908e, 0x003d, 0x0904, 0xbb7f, 0x0804, 0xbb75, 0x080c, 0x3279,</div><div class='del'>-	0x2001, 0x0007, 0x080c, 0x666a, 0x6010, 0x00b6, 0x2058, 0xb9a0,</div><div class='del'>-	0x00be, 0x080c, 0xbcb6, 0x9186, 0x007e, 0x1148, 0x2001, 0x1837,</div><div class='del'>-	0x2014, 0xc285, 0x080c, 0x7637, 0x1108, 0xc2ad, 0x2202, 0x0036,</div><div class='del'>-	0x0026, 0x2019, 0x0028, 0x2110, 0x080c, 0xef94, 0x002e, 0x003e,</div><div class='del'>-	0x0016, 0x0026, 0x0036, 0x2110, 0x2019, 0x0028, 0x080c, 0x96a4,</div><div class='del'>-	0x0076, 0x903e, 0x080c, 0x9577, 0x6010, 0x00b6, 0x905d, 0x0100,</div><div class='del'>-	0x00be, 0x2c08, 0x080c, 0xe91c, 0x007e, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x080c, 0xd7f8, 0x0016, 0x080c, 0xd54c, 0x080c, 0xb2d3, 0x001e,</div><div class='del'>-	0x080c, 0x334c, 0x080c, 0x9ab1, 0x0030, 0x080c, 0xd54c, 0x080c,</div><div class='del'>-	0xb2d3, 0x080c, 0x9ab1, 0x0005, 0x080c, 0xbcb6, 0x0cb0, 0x080c,</div><div class='del'>-	0xbcf2, 0x0c98, 0x9186, 0x0015, 0x0118, 0x9186, 0x0016, 0x1148,</div><div class='del'>-	0x080c, 0xd809, 0x0d80, 0x6000, 0x9086, 0x0002, 0x0904, 0xbcfd,</div><div class='del'>-	0x0c50, 0x9186, 0x0014, 0x1d38, 0x080c, 0x99a5, 0x6004, 0x908e,</div><div class='del'>-	0x0022, 0x1118, 0x080c, 0xb708, 0x09f0, 0x080c, 0x3250, 0x080c,</div><div class='del'>-	0xd7f8, 0x080c, 0xd2cf, 0x1198, 0x080c, 0x3279, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb9a0, 0x00be, 0x080c, 0xbcb6, 0x9186, 0x007e, 0x1128,</div><div class='del'>-	0x2001, 0x1837, 0x200c, 0xc185, 0x2102, 0x0804, 0xbb75, 0x080c,</div><div class='del'>-	0xd2e0, 0x1120, 0x080c, 0xbcb6, 0x0804, 0xbb75, 0x6004, 0x908e,</div><div class='del'>-	0x0032, 0x1160, 0x00e6, 0x00f6, 0x2071, 0x189e, 0x2079, 0x0000,</div><div class='del'>-	0x080c, 0x35e7, 0x00fe, 0x00ee, 0x0804, 0xbb75, 0x6004, 0x908e,</div><div class='del'>-	0x0021, 0x0d40, 0x908e, 0x0022, 0x090c, 0xbcb6, 0x0804, 0xbb75,</div><div class='del'>-	0x90b2, 0x0040, 0x1a04, 0xbc92, 0x2008, 0x0002, 0xbc20, 0xbc21,</div><div class='del'>-	0xbc24, 0xbc27, 0xbc2a, 0xbc37, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e,</div><div class='del'>-	0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e,</div><div class='del'>-	0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e,</div><div class='del'>-	0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc3a, 0xbc47, 0xbc1e, 0xbc49,</div><div class='del'>-	0xbc47, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc47, 0xbc47,</div><div class='del'>-	0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc1e,</div><div class='del'>-	0xbc79, 0xbc47, 0xbc1e, 0xbc43, 0xbc1e, 0xbc1e, 0xbc1e, 0xbc44,</div><div class='del'>-	0xbc1e, 0xbc1e, 0xbc1e, 0xbc47, 0xbc70, 0xbc1e, 0x080c, 0x0dc5,</div><div class='del'>-	0x0430, 0x2001, 0x000b, 0x0470, 0x2001, 0x0003, 0x0458, 0x2001,</div><div class='del'>-	0x0005, 0x0440, 0x6010, 0x00b6, 0x2058, 0xb804, 0x00be, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0000, 0x1500, 0x2001, 0x0001, 0x00d8, 0x2001,</div><div class='del'>-	0x0009, 0x00c0, 0x080c, 0x99a5, 0x6003, 0x0005, 0x080c, 0xd7fb,</div><div class='del'>-	0x080c, 0x9ab1, 0x0070, 0x0018, 0x0010, 0x080c, 0x666a, 0x0804,</div><div class='del'>-	0xbc8a, 0x080c, 0x99a5, 0x080c, 0xd7fb, 0x6003, 0x0004, 0x080c,</div><div class='del'>-	0x9ab1, 0x0005, 0x080c, 0x666a, 0x080c, 0x99a5, 0x6003, 0x0002,</div><div class='del'>-	0x0036, 0x2019, 0x1852, 0x2304, 0x9084, 0xff00, 0x1120, 0x2001,</div><div class='del'>-	0x1986, 0x201c, 0x0040, 0x8007, 0x909a, 0x0004, 0x0ec0, 0x8003,</div><div class='del'>-	0x801b, 0x831b, 0x9318, 0x631a, 0x003e, 0x080c, 0x9ab1, 0x0c08,</div><div class='del'>-	0x080c, 0x99a5, 0x080c, 0xd54c, 0x080c, 0xb2d3, 0x080c, 0x9ab1,</div><div class='del'>-	0x08c0, 0x00e6, 0x00f6, 0x2071, 0x189e, 0x2079, 0x0000, 0x080c,</div><div class='del'>-	0x35e7, 0x00fe, 0x00ee, 0x080c, 0x99a5, 0x080c, 0xb2d3, 0x080c,</div><div class='del'>-	0x9ab1, 0x0838, 0x080c, 0x99a5, 0x6003, 0x0002, 0x080c, 0xd7fb,</div><div class='del'>-	0x0804, 0x9ab1, 0x2600, 0x2008, 0x0002, 0xbca9, 0xbc8a, 0xbca7,</div><div class='del'>-	0xbc8a, 0xbc8a, 0xbca7, 0xbca7, 0xbca7, 0xbca7, 0xbc8a, 0xbca7,</div><div class='del'>-	0xbc8a, 0xbca7, 0xbc8a, 0xbca7, 0xbca7, 0xbca7, 0xbca7, 0x080c,</div><div class='del'>-	0x0dc5, 0x080c, 0x99a5, 0x0096, 0x6014, 0x2048, 0x080c, 0x6e9f,</div><div class='del'>-	0x009e, 0x080c, 0xb2d3, 0x080c, 0x9ab1, 0x0005, 0x00e6, 0x0096,</div><div class='del'>-	0x0026, 0x0016, 0x080c, 0xd0d8, 0x0568, 0x6014, 0x2048, 0xa864,</div><div class='del'>-	0x9086, 0x0139, 0x11a8, 0xa894, 0x9086, 0x0056, 0x1148, 0x080c,</div><div class='del'>-	0x556f, 0x0130, 0x2001, 0x0000, 0x900e, 0x2011, 0x4000, 0x0028,</div><div class='del'>-	0x2001, 0x0030, 0x900e, 0x2011, 0x4005, 0x080c, 0xd6bd, 0x0090,</div><div class='del'>-	0xa868, 0xd0fc, 0x0178, 0xa807, 0x0000, 0x0016, 0x6004, 0x908e,</div><div class='del'>-	0x0021, 0x0168, 0x908e, 0x003d, 0x0150, 0x001e, 0xa867, 0x0103,</div><div class='del'>-	0xa833, 0x0100, 0x001e, 0x002e, 0x009e, 0x00ee, 0x0005, 0x001e,</div><div class='del'>-	0x0009, 0x0cc0, 0x0096, 0x6014, 0x2048, 0xa800, 0x2048, 0xa867,</div><div class='del'>-	0x0103, 0xa823, 0x8001, 0x009e, 0x0005, 0x00b6, 0x6610, 0x2658,</div><div class='del'>-	0xb804, 0x9084, 0x00ff, 0x90b2, 0x000c, 0x1a0c, 0x0dc5, 0x6604,</div><div class='del'>-	0x96b6, 0x004d, 0x1120, 0x080c, 0xd5dc, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x0043, 0x1120, 0x080c, 0xd625, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x004b, 0x1120, 0x080c, 0xd651, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x0033, 0x1120, 0x080c, 0xd56e, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x0028, 0x1120, 0x080c, 0xd31e, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x0029, 0x1120, 0x080c, 0xd35f, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x001f, 0x1120, 0x080c, 0xb6ad, 0x0804, 0xbd82, 0x6604,</div><div class='del'>-	0x96b6, 0x0000, 0x1118, 0x080c, 0xb9fb, 0x04e0, 0x6604, 0x96b6,</div><div class='del'>-	0x0022, 0x1118, 0x080c, 0xb6e9, 0x04a8, 0x6604, 0x96b6, 0x0035,</div><div class='del'>-	0x1118, 0x080c, 0xb80f, 0x0470, 0x6604, 0x96b6, 0x0039, 0x1118,</div><div class='del'>-	0x080c, 0xb990, 0x0438, 0x6604, 0x96b6, 0x003d, 0x1118, 0x080c,</div><div class='del'>-	0xb721, 0x0400, 0x6604, 0x96b6, 0x0044, 0x1118, 0x080c, 0xb75d,</div><div class='del'>-	0x00c8, 0x6604, 0x96b6, 0x0049, 0x1118, 0x080c, 0xb79e, 0x0090,</div><div class='del'>-	0x6604, 0x96b6, 0x0041, 0x1118, 0x080c, 0xb788, 0x0058, 0x91b6,</div><div class='del'>-	0x0015, 0x1110, 0x0063, 0x0030, 0x91b6, 0x0016, 0x1128, 0x00be,</div><div class='del'>-	0x0804, 0xc08e, 0x00be, 0x0005, 0x080c, 0xb36d, 0x0cd8, 0xbd9f,</div><div class='del'>-	0xbdad, 0xbd9f, 0xbdf4, 0xbd9f, 0xbfab, 0xc09b, 0xbd9f, 0xbd9f,</div><div class='del'>-	0xc064, 0xbd9f, 0xc07a, 0x0096, 0x601f, 0x0000, 0x6014, 0x2048,</div><div class='del'>-	0xa800, 0x2048, 0xa867, 0x0103, 0x009e, 0x0804, 0xb2d3, 0xa001,</div><div class='del'>-	0xa001, 0x0005, 0x6604, 0x96b6, 0x0004, 0x1130, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x6656, 0x0804, 0xb2d3, 0x0005, 0x00e6, 0x2071, 0x1800,</div><div class='del'>-	0x7090, 0x9086, 0x0074, 0x1540, 0x080c, 0xe8ed, 0x11b0, 0x6010,</div><div class='del'>-	0x00b6, 0x2058, 0x7030, 0xd08c, 0x0128, 0xb800, 0xd0bc, 0x0110,</div><div class='del'>-	0xc0c5, 0xb802, 0x00f9, 0x00be, 0x2001, 0x0006, 0x080c, 0x666a,</div><div class='del'>-	0x080c, 0x3279, 0x080c, 0xb2d3, 0x0098, 0x2001, 0x000a, 0x080c,</div><div class='del'>-	0x666a, 0x080c, 0x3279, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c,</div><div class='del'>-	0x9547, 0x080c, 0x9ab1, 0x0020, 0x2001, 0x0001, 0x080c, 0xbf7b,</div><div class='del'>-	0x00ee, 0x0005, 0x00d6, 0xb800, 0xd084, 0x0160, 0x9006, 0x080c,</div><div class='del'>-	0x6656, 0x2069, 0x1847, 0x6804, 0xd0a4, 0x0120, 0x2001, 0x0006,</div><div class='del'>-	0x080c, 0x6696, 0x00de, 0x0005, 0x00b6, 0x0096, 0x00d6, 0x2011,</div><div class='del'>-	0x1824, 0x2204, 0x9086, 0x0074, 0x1904, 0xbf50, 0x6010, 0x2058,</div><div class='del'>-	0xbaa0, 0x9286, 0x007e, 0x1120, 0x080c, 0xc1ea, 0x0804, 0xbebd,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x0904, 0xbe5f, 0x00d6, 0x080c,</div><div class='del'>-	0x7637, 0x01a0, 0x0026, 0x2011, 0x0010, 0x080c, 0x6ac7, 0x002e,</div><div class='del'>-	0x0904, 0xbe5e, 0x080c, 0x57e9, 0x1598, 0x6014, 0x2048, 0xa807,</div><div class='del'>-	0x0000, 0xa867, 0x0103, 0xa833, 0xdead, 0x0450, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb910, 0x00be, 0x9186, 0x00ff, 0x0580, 0x0026, 0x2011,</div><div class='del'>-	0x8008, 0x080c, 0x6ac7, 0x002e, 0x0548, 0x6014, 0x9005, 0x090c,</div><div class='del'>-	0x0dc5, 0x2048, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1140,</div><div class='del'>-	0x2001, 0x0030, 0x900e, 0x2011, 0x4009, 0x080c, 0xd6bd, 0x0040,</div><div class='del'>-	0x6014, 0x2048, 0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0xdead,</div><div class='del'>-	0x6010, 0x2058, 0xb9a0, 0x0016, 0x080c, 0x3279, 0x080c, 0xb2d3,</div><div class='del'>-	0x001e, 0x080c, 0x334c, 0x00de, 0x0804, 0xbf55, 0x00de, 0x080c,</div><div class='del'>-	0xc1df, 0x6010, 0x2058, 0xbaa0, 0x9286, 0x0080, 0x1510, 0x6014,</div><div class='del'>-	0x9005, 0x01a8, 0x2048, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039,</div><div class='del'>-	0x1140, 0x2001, 0x0000, 0x900e, 0x2011, 0x4000, 0x080c, 0xd6bd,</div><div class='del'>-	0x0030, 0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0x0200, 0x2001,</div><div class='del'>-	0x0006, 0x080c, 0x666a, 0x080c, 0x3279, 0x080c, 0xb2d3, 0x0804,</div><div class='del'>-	0xbf55, 0x080c, 0xbf63, 0x6014, 0x9005, 0x0190, 0x2048, 0xa868,</div><div class='del'>-	0xd0f4, 0x01e8, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1d08,</div><div class='del'>-	0x2001, 0x0000, 0x900e, 0x2011, 0x4000, 0x080c, 0xd6bd, 0x08f8,</div><div class='del'>-	0x080c, 0xbf59, 0x0160, 0x9006, 0x080c, 0x6656, 0x2001, 0x0004,</div><div class='del'>-	0x080c, 0x6696, 0x2001, 0x0007, 0x080c, 0x666a, 0x08a0, 0x2001,</div><div class='del'>-	0x0004, 0x080c, 0x666a, 0x6003, 0x0001, 0x6007, 0x0003, 0x080c,</div><div class='del'>-	0x9547, 0x080c, 0x9ab1, 0x0804, 0xbf55, 0xb85c, 0xd0e4, 0x0178,</div><div class='del'>-	0x080c, 0xd4ee, 0x080c, 0x7637, 0x0118, 0xd0dc, 0x1904, 0xbe7f,</div><div class='del'>-	0x2011, 0x1837, 0x2204, 0xc0ad, 0x2012, 0x0804, 0xbe7f, 0x080c,</div><div class='del'>-	0xd52b, 0x2011, 0x1837, 0x2204, 0xc0a5, 0x2012, 0x0006, 0x080c,</div><div class='del'>-	0xeab9, 0x000e, 0x1904, 0xbe7f, 0xc0b5, 0x2012, 0x2001, 0x0006,</div><div class='del'>-	0x080c, 0x666a, 0x9006, 0x080c, 0x6656, 0x00c6, 0x2001, 0x180f,</div><div class='del'>-	0x2004, 0xd09c, 0x0520, 0x00f6, 0x2079, 0x0100, 0x00e6, 0x2071,</div><div class='del'>-	0x1800, 0x700c, 0x9084, 0x00ff, 0x78e6, 0x707e, 0x7010, 0x78ea,</div><div class='del'>-	0x7082, 0x908c, 0x00ff, 0x00ee, 0x780c, 0xc0b5, 0x780e, 0x00fe,</div><div class='del'>-	0x080c, 0x28bc, 0x00f6, 0x2100, 0x900e, 0x080c, 0x2873, 0x795e,</div><div class='del'>-	0x00fe, 0x9186, 0x0081, 0x01f0, 0x2009, 0x0081, 0x00e0, 0x2009,</div><div class='del'>-	0x00ef, 0x00f6, 0x2079, 0x0100, 0x79ea, 0x78e7, 0x0000, 0x7932,</div><div class='del'>-	0x7936, 0x780c, 0xc0b5, 0x780e, 0x00fe, 0x080c, 0x28bc, 0x00f6,</div><div class='del'>-	0x2079, 0x1800, 0x7982, 0x2100, 0x900e, 0x797e, 0x080c, 0x2873,</div><div class='del'>-	0x795e, 0x00fe, 0x8108, 0x080c, 0x66b9, 0x2b00, 0x00ce, 0x1904,</div><div class='del'>-	0xbe7f, 0x6012, 0x2009, 0x180f, 0x210c, 0xd19c, 0x0150, 0x2009,</div><div class='del'>-	0x027c, 0x210c, 0x918c, 0x00ff, 0xb912, 0x2009, 0x027d, 0x210c,</div><div class='del'>-	0xb916, 0x2001, 0x0002, 0x080c, 0x666a, 0x6023, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0002, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x0028,</div><div class='del'>-	0x080c, 0xbcb6, 0x2001, 0x0001, 0x0431, 0x00de, 0x009e, 0x00be,</div><div class='del'>-	0x0005, 0x2001, 0x1810, 0x2004, 0xd0a4, 0x0120, 0x2001, 0x1848,</div><div class='del'>-	0x2004, 0xd0ac, 0x0005, 0x00e6, 0x080c, 0xefed, 0x0190, 0x2071,</div><div class='del'>-	0x0260, 0x7108, 0x720c, 0x918c, 0x00ff, 0x1118, 0x9284, 0xff00,</div><div class='del'>-	0x0140, 0x6010, 0x2058, 0xb8a0, 0x9084, 0xff80, 0x1110, 0xb912,</div><div class='del'>-	0xba16, 0x00ee, 0x0005, 0x2030, 0x9005, 0x0158, 0x2001, 0x0007,</div><div class='del'>-	0x080c, 0x666a, 0x080c, 0x57e9, 0x1120, 0x2001, 0x0007, 0x080c,</div><div class='del'>-	0x6696, 0x2600, 0x9005, 0x11b0, 0x6014, 0x0096, 0x2048, 0xa868,</div><div class='del'>-	0x009e, 0xd0fc, 0x1178, 0x0036, 0x0046, 0x6010, 0x00b6, 0x2058,</div><div class='del'>-	0xbba0, 0x00be, 0x2021, 0x0004, 0x2011, 0x8014, 0x080c, 0x4c44,</div><div class='del'>-	0x004e, 0x003e, 0x080c, 0x3279, 0x6020, 0x9086, 0x000a, 0x1108,</div><div class='del'>-	0x0005, 0x0804, 0xb2d3, 0x00b6, 0x00e6, 0x0026, 0x0016, 0x2071,</div><div class='del'>-	0x1800, 0x7090, 0x9086, 0x0014, 0x1904, 0xc05a, 0x2001, 0x180d,</div><div class='del'>-	0x2004, 0xd08c, 0x0904, 0xc00d, 0x00d6, 0x080c, 0x7637, 0x01a0,</div><div class='del'>-	0x0026, 0x2011, 0x0010, 0x080c, 0x6ac7, 0x002e, 0x0904, 0xc00c,</div><div class='del'>-	0x080c, 0x57e9, 0x1598, 0x6014, 0x2048, 0xa807, 0x0000, 0xa867,</div><div class='del'>-	0x0103, 0xa833, 0xdead, 0x0450, 0x6010, 0x00b6, 0x2058, 0xb910,</div><div class='del'>-	0x00be, 0x9186, 0x00ff, 0x0580, 0x0026, 0x2011, 0x8008, 0x080c,</div><div class='del'>-	0x6ac7, 0x002e, 0x0548, 0x6014, 0x9005, 0x090c, 0x0dc5, 0x2048,</div><div class='del'>-	0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1140, 0x2001, 0x0030,</div><div class='del'>-	0x900e, 0x2011, 0x4009, 0x080c, 0xd6bd, 0x0040, 0x6014, 0x2048,</div><div class='del'>-	0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0xdead, 0x6010, 0x2058,</div><div class='del'>-	0xb9a0, 0x0016, 0x080c, 0x3279, 0x080c, 0xb2d3, 0x001e, 0x080c,</div><div class='del'>-	0x334c, 0x00de, 0x0804, 0xc05f, 0x00de, 0x080c, 0x57e9, 0x1170,</div><div class='del'>-	0x6014, 0x9005, 0x1158, 0x0036, 0x0046, 0x6010, 0x2058, 0xbba0,</div><div class='del'>-	0x2021, 0x0006, 0x080c, 0x4dfb, 0x004e, 0x003e, 0x00d6, 0x6010,</div><div class='del'>-	0x2058, 0x080c, 0x67bf, 0x080c, 0xbde2, 0x00de, 0x080c, 0xc2b5,</div><div class='del'>-	0x1588, 0x6010, 0x2058, 0xb890, 0x9005, 0x0560, 0x2001, 0x0006,</div><div class='del'>-	0x080c, 0x666a, 0x0096, 0x6014, 0x904d, 0x01d0, 0xa864, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0039, 0x1140, 0x2001, 0x0000, 0x900e, 0x2011,</div><div class='del'>-	0x4000, 0x080c, 0xd6bd, 0x0060, 0xa864, 0x9084, 0x00ff, 0x9086,</div><div class='del'>-	0x0029, 0x0130, 0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0x0200,</div><div class='del'>-	0x009e, 0x080c, 0x3279, 0x6020, 0x9086, 0x000a, 0x0140, 0x080c,</div><div class='del'>-	0xb2d3, 0x0028, 0x080c, 0xbcb6, 0x9006, 0x080c, 0xbf7b, 0x001e,</div><div class='del'>-	0x002e, 0x00ee, 0x00be, 0x0005, 0x2011, 0x1824, 0x2204, 0x9086,</div><div class='del'>-	0x0014, 0x1160, 0x2001, 0x0002, 0x080c, 0x666a, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0001, 0x080c, 0x9547, 0x0804, 0x9ab1, 0x2001, 0x0001,</div><div class='del'>-	0x0804, 0xbf7b, 0x2030, 0x2011, 0x1824, 0x2204, 0x9086, 0x0004,</div><div class='del'>-	0x1148, 0x96b6, 0x000b, 0x1120, 0x2001, 0x0007, 0x080c, 0x666a,</div><div class='del'>-	0x0804, 0xb2d3, 0x2001, 0x0001, 0x0804, 0xbf7b, 0x0002, 0xbd9f,</div><div class='del'>-	0xc0a6, 0xbd9f, 0xc0e9, 0xbd9f, 0xc196, 0xc09b, 0xbda2, 0xbd9f,</div><div class='del'>-	0xc1aa, 0xbd9f, 0xc1bc, 0x6604, 0x9686, 0x0003, 0x0904, 0xbfab,</div><div class='del'>-	0x96b6, 0x001e, 0x1110, 0x080c, 0xb2d3, 0x0005, 0x00b6, 0x00d6,</div><div class='del'>-	0x00c6, 0x080c, 0xc1ce, 0x11a0, 0x9006, 0x080c, 0x6656, 0x080c,</div><div class='del'>-	0x3250, 0x080c, 0xd7f8, 0x2001, 0x0002, 0x080c, 0x666a, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0002, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x0428,</div><div class='del'>-	0x2009, 0x026e, 0x2104, 0x9086, 0x0009, 0x1160, 0x6010, 0x2058,</div><div class='del'>-	0xb840, 0x9084, 0x00ff, 0x9005, 0x0180, 0x8001, 0xb842, 0x601b,</div><div class='del'>-	0x000a, 0x0098, 0x2009, 0x026f, 0x2104, 0x9084, 0xff00, 0x908e,</div><div class='del'>-	0x1900, 0x0158, 0x908e, 0x1e00, 0x0990, 0x080c, 0x3250, 0x080c,</div><div class='del'>-	0xd7f8, 0x2001, 0x0001, 0x080c, 0xbf7b, 0x00ce, 0x00de, 0x00be,</div><div class='del'>-	0x0005, 0x0096, 0x00b6, 0x0026, 0x9016, 0x080c, 0xc1dc, 0x00d6,</div><div class='del'>-	0x2069, 0x197c, 0x2d04, 0x9005, 0x0168, 0x6010, 0x2058, 0xb8a0,</div><div class='del'>-	0x9086, 0x007e, 0x1138, 0x2069, 0x1820, 0x2d04, 0x8000, 0x206a,</div><div class='del'>-	0x00de, 0x0010, 0x00de, 0x0088, 0x9006, 0x080c, 0x6656, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0x666a, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c,</div><div class='del'>-	0x9547, 0x080c, 0x9ab1, 0x0804, 0xc166, 0x080c, 0xd0d8, 0x01b0,</div><div class='del'>-	0x6014, 0x2048, 0xa864, 0x2010, 0x9086, 0x0139, 0x1138, 0x6007,</div><div class='del'>-	0x0016, 0x2001, 0x0002, 0x080c, 0xd71a, 0x00b0, 0x6014, 0x2048,</div><div class='del'>-	0xa864, 0xd0fc, 0x0118, 0x2001, 0x0001, 0x0ca8, 0x2001, 0x180e,</div><div class='del'>-	0x2004, 0xd0dc, 0x0148, 0x6010, 0x2058, 0xb840, 0x9084, 0x00ff,</div><div class='del'>-	0x9005, 0x1110, 0x9006, 0x0c38, 0x080c, 0xbcb6, 0x2009, 0x026e,</div><div class='del'>-	0x2134, 0x96b4, 0x00ff, 0x9686, 0x0005, 0x0520, 0x9686, 0x000b,</div><div class='del'>-	0x01c8, 0x2009, 0x026f, 0x2104, 0x9084, 0xff00, 0x1118, 0x9686,</div><div class='del'>-	0x0009, 0x01c0, 0x9086, 0x1900, 0x1168, 0x9686, 0x0009, 0x0190,</div><div class='del'>-	0x2001, 0x0004, 0x080c, 0x666a, 0x2001, 0x0028, 0x601a, 0x6007,</div><div class='del'>-	0x0052, 0x0020, 0x2001, 0x0001, 0x080c, 0xbf7b, 0x002e, 0x00be,</div><div class='del'>-	0x009e, 0x0005, 0x9286, 0x0139, 0x0160, 0x6014, 0x2048, 0x080c,</div><div class='del'>-	0xd0d8, 0x0140, 0xa864, 0x9086, 0x0139, 0x0118, 0xa868, 0xd0fc,</div><div class='del'>-	0x0108, 0x0c40, 0x6010, 0x2058, 0xb840, 0x9084, 0x00ff, 0x9005,</div><div class='del'>-	0x0138, 0x8001, 0xb842, 0x601b, 0x000a, 0x6007, 0x0016, 0x08f0,</div><div class='del'>-	0xb8a0, 0x9086, 0x007e, 0x1138, 0x00e6, 0x2071, 0x1800, 0x080c,</div><div class='del'>-	0x60c1, 0x00ee, 0x0010, 0x080c, 0x3250, 0x0860, 0x2001, 0x0004,</div><div class='del'>-	0x080c, 0x666a, 0x080c, 0xc1dc, 0x1140, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0003, 0x080c, 0x9547, 0x0804, 0x9ab1, 0x080c, 0xbcb6, 0x9006,</div><div class='del'>-	0x0804, 0xbf7b, 0x0489, 0x1160, 0x2001, 0x0008, 0x080c, 0x666a,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0005, 0x080c, 0x9547, 0x0804, 0x9ab1,</div><div class='del'>-	0x2001, 0x0001, 0x0804, 0xbf7b, 0x00f9, 0x1160, 0x2001, 0x000a,</div><div class='del'>-	0x080c, 0x666a, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x9547,</div><div class='del'>-	0x0804, 0x9ab1, 0x2001, 0x0001, 0x0804, 0xbf7b, 0x2009, 0x026e,</div><div class='del'>-	0x2104, 0x9086, 0x0003, 0x1138, 0x2009, 0x026f, 0x2104, 0x9084,</div><div class='del'>-	0xff00, 0x9086, 0x2a00, 0x0005, 0x9085, 0x0001, 0x0005, 0x00b6,</div><div class='del'>-	0x00c6, 0x0016, 0x6110, 0x2158, 0x080c, 0x6733, 0x001e, 0x00ce,</div><div class='del'>-	0x00be, 0x0005, 0x00b6, 0x00f6, 0x00e6, 0x00d6, 0x0036, 0x0016,</div><div class='del'>-	0x6010, 0x2058, 0x2009, 0x1837, 0x2104, 0x9085, 0x0003, 0x200a,</div><div class='del'>-	0x080c, 0xc287, 0x0560, 0x2009, 0x1837, 0x2104, 0xc0cd, 0x200a,</div><div class='del'>-	0x080c, 0x6a9f, 0x0158, 0x9006, 0x2020, 0x2009, 0x002a, 0x080c,</div><div class='del'>-	0xec31, 0x2001, 0x180c, 0x200c, 0xc195, 0x2102, 0x2019, 0x002a,</div><div class='del'>-	0x2009, 0x0001, 0x080c, 0x321b, 0x00e6, 0x2071, 0x1800, 0x080c,</div><div class='del'>-	0x3000, 0x00ee, 0x00c6, 0x0156, 0x20a9, 0x0781, 0x2009, 0x007f,</div><div class='del'>-	0x080c, 0x334c, 0x8108, 0x1f04, 0xc220, 0x015e, 0x00ce, 0x080c,</div><div class='del'>-	0xc1df, 0x2071, 0x0260, 0x2079, 0x0200, 0x7817, 0x0001, 0x2001,</div><div class='del'>-	0x1837, 0x200c, 0xc1c5, 0x7018, 0xd0fc, 0x0110, 0xd0dc, 0x0118,</div><div class='del'>-	0x7038, 0xd0dc, 0x1108, 0xc1c4, 0x7817, 0x0000, 0x2001, 0x1837,</div><div class='del'>-	0x2102, 0x9184, 0x0050, 0x9086, 0x0050, 0x05d0, 0x2079, 0x0100,</div><div class='del'>-	0x2e04, 0x9084, 0x00ff, 0x2069, 0x181f, 0x206a, 0x78e6, 0x0006,</div><div class='del'>-	0x8e70, 0x2e04, 0x2069, 0x1820, 0x206a, 0x78ea, 0x7832, 0x7836,</div><div class='del'>-	0x2010, 0x9084, 0xff00, 0x001e, 0x9105, 0x2009, 0x182c, 0x200a,</div><div class='del'>-	0x2200, 0x9084, 0x00ff, 0x2008, 0x080c, 0x28bc, 0x080c, 0x7637,</div><div class='del'>-	0x0170, 0x2071, 0x0260, 0x2069, 0x1982, 0x7048, 0x206a, 0x704c,</div><div class='del'>-	0x6806, 0x7050, 0x680a, 0x7054, 0x680e, 0x080c, 0xd4ee, 0x0040,</div><div class='del'>-	0x2001, 0x0006, 0x080c, 0x666a, 0x080c, 0x3279, 0x080c, 0xb2d3,</div><div class='del'>-	0x001e, 0x003e, 0x00de, 0x00ee, 0x00fe, 0x00be, 0x0005, 0x0096,</div><div class='del'>-	0x0026, 0x0036, 0x00e6, 0x0156, 0x2019, 0x182c, 0x231c, 0x83ff,</div><div class='del'>-	0x01f0, 0x2071, 0x0260, 0x7200, 0x9294, 0x00ff, 0x7004, 0x9084,</div><div class='del'>-	0xff00, 0x9205, 0x9306, 0x1198, 0x2011, 0x0276, 0x20a9, 0x0004,</div><div class='del'>-	0x2b48, 0x2019, 0x000a, 0x080c, 0xc379, 0x1148, 0x2011, 0x027a,</div><div class='del'>-	0x20a9, 0x0004, 0x2019, 0x0006, 0x080c, 0xc379, 0x1100, 0x015e,</div><div class='del'>-	0x00ee, 0x003e, 0x002e, 0x009e, 0x0005, 0x00e6, 0x2071, 0x0260,</div><div class='del'>-	0x7034, 0x9086, 0x0014, 0x11a8, 0x7038, 0x9086, 0x0800, 0x1188,</div><div class='del'>-	0x703c, 0xd0ec, 0x0160, 0x9084, 0x0f00, 0x9086, 0x0100, 0x1138,</div><div class='del'>-	0x7054, 0xd0a4, 0x1110, 0xd0ac, 0x0110, 0x9006, 0x0010, 0x9085,</div><div class='del'>-	0x0001, 0x00ee, 0x0005, 0x00e6, 0x0096, 0x00c6, 0x0076, 0x0056,</div><div class='del'>-	0x0046, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2029, 0x19f1,</div><div class='del'>-	0x252c, 0x2021, 0x19f7, 0x2424, 0x2061, 0x1cd0, 0x2071, 0x1800,</div><div class='del'>-	0x7254, 0x7074, 0x9202, 0x1a04, 0xc345, 0x080c, 0x8cf7, 0x0904,</div><div class='del'>-	0xc33e, 0x080c, 0xec62, 0x0904, 0xc33e, 0x6720, 0x9786, 0x0007,</div><div class='del'>-	0x0904, 0xc33e, 0x2500, 0x9c06, 0x0904, 0xc33e, 0x2400, 0x9c06,</div><div class='del'>-	0x05e8, 0x3e08, 0x9186, 0x0002, 0x1148, 0x6010, 0x9005, 0x0130,</div><div class='del'>-	0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x1580, 0x00c6, 0x6000,</div><div class='del'>-	0x9086, 0x0004, 0x1110, 0x080c, 0x1a8e, 0x9786, 0x000a, 0x0148,</div><div class='del'>-	0x080c, 0xd2e0, 0x1130, 0x00ce, 0x080c, 0xbcb6, 0x080c, 0xb306,</div><div class='del'>-	0x00e8, 0x6014, 0x2048, 0x080c, 0xd0d8, 0x01a8, 0x9786, 0x0003,</div><div class='del'>-	0x1530, 0xa867, 0x0103, 0xa87c, 0xd0cc, 0x0130, 0x0096, 0xa878,</div><div class='del'>-	0x2048, 0x080c, 0x0fc0, 0x009e, 0xab7a, 0xa877, 0x0000, 0x080c,</div><div class='del'>-	0x6e92, 0x080c, 0xd2c3, 0x080c, 0xb306, 0x00ce, 0x9ce0, 0x0018,</div><div class='del'>-	0x7068, 0x9c02, 0x1210, 0x0804, 0xc2e8, 0x012e, 0x000e, 0x002e,</div><div class='del'>-	0x004e, 0x005e, 0x007e, 0x00ce, 0x009e, 0x00ee, 0x0005, 0x9786,</div><div class='del'>-	0x0006, 0x1118, 0x080c, 0xebd4, 0x0c30, 0x9786, 0x0009, 0x1148,</div><div class='del'>-	0x6000, 0x9086, 0x0004, 0x0d08, 0x2009, 0x004c, 0x080c, 0xb352,</div><div class='del'>-	0x08e0, 0x9786, 0x000a, 0x0980, 0x0820, 0x220c, 0x2304, 0x9106,</div><div class='del'>-	0x1130, 0x8210, 0x8318, 0x1f04, 0xc365, 0x9006, 0x0005, 0x2304,</div><div class='del'>-	0x9102, 0x0218, 0x2001, 0x0001, 0x0008, 0x9006, 0x918d, 0x0001,</div><div class='del'>-	0x0005, 0x0136, 0x01c6, 0x0016, 0x8906, 0x8006, 0x8007, 0x908c,</div><div class='del'>-	0x003f, 0x21e0, 0x9084, 0xffc0, 0x9300, 0x2098, 0x3518, 0x20a9,</div><div class='del'>-	0x0001, 0x220c, 0x4002, 0x910e, 0x1140, 0x8210, 0x8319, 0x1dc8,</div><div class='del'>-	0x9006, 0x001e, 0x01ce, 0x013e, 0x0005, 0x220c, 0x9102, 0x0218,</div><div class='del'>-	0x2001, 0x0001, 0x0010, 0x2001, 0x0000, 0x918d, 0x0001, 0x001e,</div><div class='del'>-	0x01ce, 0x013e, 0x0005, 0x220c, 0x810f, 0x2304, 0x9106, 0x1130,</div><div class='del'>-	0x8210, 0x8318, 0x1f04, 0xc3a3, 0x9006, 0x0005, 0x918d, 0x0001,</div><div class='del'>-	0x0005, 0x6004, 0x908a, 0x0053, 0x1a0c, 0x0dc5, 0x080c, 0xd2cf,</div><div class='del'>-	0x0120, 0x080c, 0xd2e0, 0x0168, 0x0028, 0x080c, 0x3279, 0x080c,</div><div class='del'>-	0xd2e0, 0x0138, 0x080c, 0x99a5, 0x080c, 0xb2d3, 0x080c, 0x9ab1,</div><div class='del'>-	0x0005, 0x080c, 0xbcb6, 0x0cb0, 0x9182, 0x0054, 0x1220, 0x9182,</div><div class='del'>-	0x0040, 0x0208, 0x000a, 0x0005, 0xc3e8, 0xc3e8, 0xc3e8, 0xc3e8,</div><div class='del'>-	0xc3e8, 0xc3e8, 0xc3e8, 0xc3e8, 0xc3e8, 0xc3e8, 0xc3e8, 0xc3ea,</div><div class='del'>-	0xc3ea, 0xc3ea, 0xc3ea, 0xc3e8, 0xc3e8, 0xc3e8, 0xc3ea, 0xc3e8,</div><div class='del'>-	0x080c, 0x0dc5, 0x600b, 0xffff, 0x6003, 0x0001, 0x6106, 0x080c,</div><div class='del'>-	0x94ff, 0x0126, 0x2091, 0x8000, 0x080c, 0x9ab1, 0x012e, 0x0005,</div><div class='del'>-	0x9186, 0x0013, 0x1128, 0x6004, 0x9082, 0x0040, 0x0804, 0xc482,</div><div class='del'>-	0x9186, 0x0027, 0x1520, 0x080c, 0x99a5, 0x080c, 0x3250, 0x080c,</div><div class='del'>-	0xd7f8, 0x0096, 0x6114, 0x2148, 0x080c, 0xd0d8, 0x0198, 0x080c,</div><div class='del'>-	0xd2e0, 0x1118, 0x080c, 0xbcb6, 0x0068, 0xa867, 0x0103, 0xa87b,</div><div class='del'>-	0x0029, 0xa877, 0x0000, 0xa97c, 0xc1c5, 0xa97e, 0x080c, 0x6e9f,</div><div class='del'>-	0x080c, 0xd2c3, 0x009e, 0x080c, 0xb2d3, 0x0804, 0x9ab1, 0x9186,</div><div class='del'>-	0x0014, 0x1120, 0x6004, 0x9082, 0x0040, 0x00b8, 0x9186, 0x0046,</div><div class='del'>-	0x0150, 0x9186, 0x0045, 0x0138, 0x9186, 0x0053, 0x0120, 0x9186,</div><div class='del'>-	0x0048, 0x190c, 0x0dc5, 0x080c, 0xd809, 0x0130, 0x6000, 0x9086,</div><div class='del'>-	0x0002, 0x1110, 0x0804, 0xc4c0, 0x0005, 0x0002, 0xc45c, 0xc45a,</div><div class='del'>-	0xc45a, 0xc45a, 0xc45a, 0xc45a, 0xc45a, 0xc45a, 0xc45a, 0xc45a,</div><div class='del'>-	0xc45a, 0xc477, 0xc477, 0xc477, 0xc477, 0xc45a, 0xc477, 0xc45a,</div><div class='del'>-	0xc477, 0xc45a, 0x080c, 0x0dc5, 0x080c, 0x99a5, 0x0096, 0x6114,</div><div class='del'>-	0x2148, 0x080c, 0xd0d8, 0x0168, 0xa867, 0x0103, 0xa87b, 0x0006,</div><div class='del'>-	0xa877, 0x0000, 0xa880, 0xc0ec, 0xa882, 0x080c, 0x6e9f, 0x080c,</div><div class='del'>-	0xd2c3, 0x009e, 0x080c, 0xb2d3, 0x080c, 0x9ab1, 0x0005, 0x080c,</div><div class='del'>-	0x99a5, 0x080c, 0xd2e0, 0x090c, 0xbcb6, 0x080c, 0xb2d3, 0x080c,</div><div class='del'>-	0x9ab1, 0x0005, 0x0002, 0xc499, 0xc497, 0xc497, 0xc497, 0xc497,</div><div class='del'>-	0xc497, 0xc497, 0xc497, 0xc497, 0xc497, 0xc497, 0xc4b0, 0xc4b0,</div><div class='del'>-	0xc4b0, 0xc4b0, 0xc497, 0xc4ba, 0xc497, 0xc4b0, 0xc497, 0x080c,</div><div class='del'>-	0x0dc5, 0x0096, 0x080c, 0x99a5, 0x6014, 0x2048, 0x2001, 0x1988,</div><div class='del'>-	0x2004, 0x6042, 0xa97c, 0xd1ac, 0x0140, 0x6003, 0x0004, 0xa87c,</div><div class='del'>-	0x9085, 0x0400, 0xa87e, 0x009e, 0x0005, 0x6003, 0x0002, 0x0cb8,</div><div class='del'>-	0x080c, 0x99a5, 0x080c, 0xd7fb, 0x080c, 0xd800, 0x6003, 0x000f,</div><div class='del'>-	0x0804, 0x9ab1, 0x080c, 0x99a5, 0x080c, 0xb2d3, 0x0804, 0x9ab1,</div><div class='del'>-	0x9182, 0x0054, 0x1220, 0x9182, 0x0040, 0x0208, 0x000a, 0x0005,</div><div class='del'>-	0xc4dc, 0xc4dc, 0xc4dc, 0xc4dc, 0xc4dc, 0xc4de, 0xc5be, 0xc4dc,</div><div class='del'>-	0xc5f2, 0xc4dc, 0xc4dc, 0xc4dc, 0xc4dc, 0xc4dc, 0xc4dc, 0xc4dc,</div><div class='del'>-	0xc4dc, 0xc4dc, 0xc4dc, 0xc5f2, 0x080c, 0x0dc5, 0x00b6, 0x0096,</div><div class='del'>-	0x6114, 0x2148, 0x7644, 0x96b4, 0x0fff, 0x86ff, 0x1528, 0x6010,</div><div class='del'>-	0x2058, 0xb800, 0xd0bc, 0x1904, 0xc5ad, 0xa87b, 0x0000, 0xa867,</div><div class='del'>-	0x0103, 0xae76, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115,</div><div class='del'>-	0x190c, 0xc78b, 0x080c, 0x6cb9, 0x6210, 0x2258, 0xba3c, 0x82ff,</div><div class='del'>-	0x0110, 0x8211, 0xba3e, 0x7044, 0xd0e4, 0x1904, 0xc58e, 0x080c,</div><div class='del'>-	0xb2d3, 0x009e, 0x00be, 0x0005, 0x968c, 0x0c00, 0x0150, 0x6010,</div><div class='del'>-	0x2058, 0xb800, 0xd0bc, 0x1904, 0xc592, 0x7348, 0xab92, 0x734c,</div><div class='del'>-	0xab8e, 0x968c, 0x00ff, 0x9186, 0x0002, 0x0508, 0x9186, 0x0028,</div><div class='del'>-	0x1118, 0xa87b, 0x001c, 0x00e8, 0xd6dc, 0x01a0, 0xa87b, 0x0015,</div><div class='del'>-	0xa87c, 0xd0ac, 0x0170, 0xa938, 0xaa34, 0x2100, 0x9205, 0x0148,</div><div class='del'>-	0x7048, 0x9106, 0x1118, 0x704c, 0x9206, 0x0118, 0xa992, 0xaa8e,</div><div class='del'>-	0xc6dc, 0x0038, 0xd6d4, 0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b,</div><div class='del'>-	0x0000, 0xa867, 0x0103, 0xae76, 0x901e, 0xd6c4, 0x01d8, 0x9686,</div><div class='del'>-	0x0100, 0x1130, 0x7064, 0x9005, 0x1118, 0xc6c4, 0x0804, 0xc4e5,</div><div class='del'>-	0x735c, 0xab86, 0x83ff, 0x0170, 0x938a, 0x0009, 0x0210, 0x2019,</div><div class='del'>-	0x0008, 0x0036, 0x2308, 0x2019, 0x0018, 0x2011, 0x0025, 0x080c,</div><div class='del'>-	0xcc85, 0x003e, 0xd6cc, 0x0904, 0xc4fa, 0x7154, 0xa98a, 0x81ff,</div><div class='del'>-	0x0904, 0xc4fa, 0x9192, 0x0021, 0x1278, 0x8304, 0x9098, 0x0018,</div><div class='del'>-	0x2011, 0x0029, 0x080c, 0xcc85, 0x2011, 0x0205, 0x2013, 0x0000,</div><div class='del'>-	0x080c, 0xd786, 0x0804, 0xc4fa, 0xa868, 0xd0fc, 0x0120, 0x2009,</div><div class='del'>-	0x0020, 0xa98a, 0x0c50, 0x00a6, 0x2950, 0x080c, 0xcc24, 0x00ae,</div><div class='del'>-	0x080c, 0xd786, 0x080c, 0xcc75, 0x0804, 0xc4fc, 0x080c, 0xd3d8,</div><div class='del'>-	0x0804, 0xc509, 0xa87c, 0xd0ac, 0x0904, 0xc515, 0xa880, 0xd0bc,</div><div class='del'>-	0x1904, 0xc515, 0x9684, 0x0400, 0x0130, 0xa838, 0xab34, 0x9305,</div><div class='del'>-	0x0904, 0xc515, 0x00b8, 0x7348, 0xa838, 0x9306, 0x1198, 0x734c,</div><div class='del'>-	0xa834, 0x931e, 0x0904, 0xc515, 0x0068, 0xa87c, 0xd0ac, 0x0904,</div><div class='del'>-	0xc4ed, 0xa838, 0xa934, 0x9105, 0x0904, 0xc4ed, 0xa880, 0xd0bc,</div><div class='del'>-	0x1904, 0xc4ed, 0x080c, 0xd412, 0x0804, 0xc509, 0x0096, 0x00f6,</div><div class='del'>-	0x6003, 0x0003, 0x6007, 0x0043, 0x2079, 0x026c, 0x7c04, 0x7b00,</div><div class='del'>-	0x7e0c, 0x7d08, 0x6014, 0x2048, 0xa87c, 0xd0ac, 0x0140, 0x6003,</div><div class='del'>-	0x0002, 0x00fe, 0x009e, 0x0005, 0x2130, 0x2228, 0x0058, 0x2400,</div><div class='del'>-	0xa9ac, 0x910a, 0x2300, 0xaab0, 0x9213, 0x2600, 0x9102, 0x2500,</div><div class='del'>-	0x9203, 0x0e90, 0xac36, 0xab3a, 0xae46, 0xad4a, 0x00fe, 0x6043,</div><div class='del'>-	0x0000, 0x2c10, 0x080c, 0x1be0, 0x080c, 0x9564, 0x080c, 0x9bd3,</div><div class='del'>-	0x009e, 0x0005, 0x0005, 0x9182, 0x0054, 0x1220, 0x9182, 0x0040,</div><div class='del'>-	0x0208, 0x000a, 0x0005, 0xc60f, 0xc60f, 0xc60f, 0xc60f, 0xc60f,</div><div class='del'>-	0xc611, 0xc6a7, 0xc60f, 0xc60f, 0xc6be, 0xc74e, 0xc60f, 0xc60f,</div><div class='del'>-	0xc60f, 0xc60f, 0xc763, 0xc60f, 0xc60f, 0xc60f, 0xc60f, 0x080c,</div><div class='del'>-	0x0dc5, 0x0076, 0x00a6, 0x00e6, 0x0096, 0x2071, 0x0260, 0x6114,</div><div class='del'>-	0x2150, 0x7644, 0xb676, 0x96b4, 0x0fff, 0xb77c, 0xc7e5, 0xb77e,</div><div class='del'>-	0x6210, 0x00b6, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e,</div><div class='del'>-	0x00be, 0x86ff, 0x0904, 0xc6a2, 0x9694, 0xff00, 0x9284, 0x0c00,</div><div class='del'>-	0x0120, 0x7048, 0xb092, 0x704c, 0xb08e, 0x9284, 0x0300, 0x0904,</div><div class='del'>-	0xc6a2, 0x080c, 0x100e, 0x090c, 0x0dc5, 0x2900, 0xb07a, 0xb77c,</div><div class='del'>-	0xc7cd, 0xb77e, 0xa867, 0x0103, 0xb068, 0xa86a, 0xb06c, 0xa86e,</div><div class='del'>-	0xb070, 0xa872, 0xae76, 0x968c, 0x0c00, 0x0120, 0x7348, 0xab92,</div><div class='del'>-	0x734c, 0xab8e, 0x968c, 0x00ff, 0x9186, 0x0002, 0x0180, 0x9186,</div><div class='del'>-	0x0028, 0x1118, 0xa87b, 0x001c, 0x0060, 0xd6dc, 0x0118, 0xa87b,</div><div class='del'>-	0x0015, 0x0038, 0xd6d4, 0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b,</div><div class='del'>-	0x0000, 0xaf7e, 0xb080, 0xa882, 0xb084, 0xa886, 0x901e, 0xd6c4,</div><div class='del'>-	0x0190, 0x735c, 0xab86, 0x83ff, 0x0170, 0x938a, 0x0009, 0x0210,</div><div class='del'>-	0x2019, 0x0008, 0x0036, 0x2308, 0x2019, 0x0018, 0x2011, 0x0025,</div><div class='del'>-	0x080c, 0xcc85, 0x003e, 0xd6cc, 0x01e8, 0x7154, 0xa98a, 0x81ff,</div><div class='del'>-	0x01c8, 0x9192, 0x0021, 0x1260, 0x8304, 0x9098, 0x0018, 0x2011,</div><div class='del'>-	0x0029, 0x080c, 0xcc85, 0x2011, 0x0205, 0x2013, 0x0000, 0x0050,</div><div class='del'>-	0xb068, 0xd0fc, 0x0120, 0x2009, 0x0020, 0xa98a, 0x0c68, 0x2950,</div><div class='del'>-	0x080c, 0xcc24, 0x009e, 0x00ee, 0x00ae, 0x007e, 0x0005, 0x00f6,</div><div class='del'>-	0x00a6, 0x6003, 0x0003, 0x2079, 0x026c, 0x7c04, 0x7b00, 0x7e0c,</div><div class='del'>-	0x7d08, 0x6014, 0x2050, 0xb436, 0xb33a, 0xb646, 0xb54a, 0x00ae,</div><div class='del'>-	0x00fe, 0x2c10, 0x080c, 0x1be0, 0x0804, 0xa6b6, 0x6003, 0x0002,</div><div class='del'>-	0x6004, 0x9086, 0x0040, 0x11c8, 0x0096, 0x6014, 0x2048, 0xa87c,</div><div class='del'>-	0xd0ac, 0x0160, 0x601c, 0xd084, 0x1130, 0x00f6, 0x2c00, 0x2078,</div><div class='del'>-	0x080c, 0x1768, 0x00fe, 0x6003, 0x0004, 0x0010, 0x6003, 0x0002,</div><div class='del'>-	0x009e, 0x080c, 0x99a5, 0x080c, 0x9ab1, 0x0096, 0x2001, 0x1988,</div><div class='del'>-	0x2004, 0x6042, 0x080c, 0x9a61, 0x080c, 0x9bd3, 0x6114, 0x2148,</div><div class='del'>-	0xa97c, 0xd1e4, 0x0904, 0xc749, 0xd1cc, 0x05c8, 0xa978, 0xa868,</div><div class='del'>-	0xd0fc, 0x0540, 0x0016, 0xa87c, 0x0006, 0xa880, 0x0006, 0xa860,</div><div class='del'>-	0x20e8, 0xa85c, 0x9080, 0x0019, 0x20a0, 0x810e, 0x810e, 0x810f,</div><div class='del'>-	0x9184, 0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0019, 0x2098,</div><div class='del'>-	0x0156, 0x20a9, 0x0020, 0x4003, 0x015e, 0x000e, 0xa882, 0x000e,</div><div class='del'>-	0xc0cc, 0xa87e, 0x001e, 0xa874, 0x0006, 0x2148, 0x080c, 0x0fc0,</div><div class='del'>-	0x001e, 0x0458, 0x0016, 0x080c, 0x0fc0, 0x009e, 0xa87c, 0xc0cc,</div><div class='del'>-	0xa87e, 0xa974, 0x0016, 0x080c, 0xcc75, 0x001e, 0x00f0, 0xa867,</div><div class='del'>-	0x0103, 0xa974, 0x9184, 0x00ff, 0x90b6, 0x0002, 0x0180, 0x9086,</div><div class='del'>-	0x0028, 0x1118, 0xa87b, 0x001c, 0x0060, 0xd1dc, 0x0118, 0xa87b,</div><div class='del'>-	0x0015, 0x0038, 0xd1d4, 0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b,</div><div class='del'>-	0x0000, 0x0016, 0x080c, 0x6cb9, 0x001e, 0xd1e4, 0x1120, 0x080c,</div><div class='del'>-	0xb2d3, 0x009e, 0x0005, 0x080c, 0xd3d8, 0x0cd8, 0x6004, 0x9086,</div><div class='del'>-	0x0040, 0x1120, 0x080c, 0x99a5, 0x080c, 0x9ab1, 0x2019, 0x0001,</div><div class='del'>-	0x080c, 0xaa49, 0x6003, 0x0002, 0x080c, 0xd800, 0x080c, 0x9a61,</div><div class='del'>-	0x080c, 0x9bd3, 0x0005, 0x6004, 0x9086, 0x0040, 0x1120, 0x080c,</div><div class='del'>-	0x99a5, 0x080c, 0x9ab1, 0x2019, 0x0001, 0x080c, 0xaa49, 0x080c,</div><div class='del'>-	0x9a61, 0x080c, 0x3250, 0x080c, 0xd7f8, 0x0096, 0x6114, 0x2148,</div><div class='del'>-	0x080c, 0xd0d8, 0x0150, 0xa867, 0x0103, 0xa87b, 0x0029, 0xa877,</div><div class='del'>-	0x0000, 0x080c, 0x6e9f, 0x080c, 0xd2c3, 0x009e, 0x080c, 0xb2d3,</div><div class='del'>-	0x080c, 0x9bd3, 0x0005, 0xa87b, 0x0015, 0xd1fc, 0x0180, 0xa87b,</div><div class='del'>-	0x0007, 0x8002, 0x8000, 0x810a, 0x9189, 0x0000, 0x0006, 0x0016,</div><div class='del'>-	0x2009, 0x1a7d, 0x2104, 0x8000, 0x200a, 0x001e, 0x000e, 0xa992,</div><div class='del'>-	0xa88e, 0x0005, 0x9182, 0x0054, 0x1220, 0x9182, 0x0040, 0x0208,</div><div class='del'>-	0x000a, 0x0005, 0xc7be, 0xc7be, 0xc7be, 0xc7be, 0xc7be, 0xc7c0,</div><div class='del'>-	0xc7be, 0xc7be, 0xc866, 0xc7be, 0xc7be, 0xc7be, 0xc7be, 0xc7be,</div><div class='del'>-	0xc7be, 0xc7be, 0xc7be, 0xc7be, 0xc7be, 0xc998, 0x080c, 0x0dc5,</div><div class='del'>-	0x0076, 0x00a6, 0x00e6, 0x0096, 0x2071, 0x0260, 0x6114, 0x2150,</div><div class='del'>-	0x7644, 0xb676, 0x96b4, 0x0fff, 0xb77c, 0xc7e5, 0xb77e, 0x6210,</div><div class='del'>-	0x00b6, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e, 0x00be,</div><div class='del'>-	0x86ff, 0x0904, 0xc85f, 0x9694, 0xff00, 0x9284, 0x0c00, 0x0120,</div><div class='del'>-	0x7048, 0xb092, 0x704c, 0xb08e, 0x9284, 0x0300, 0x0904, 0xc85f,</div><div class='del'>-	0x9686, 0x0100, 0x1130, 0x7064, 0x9005, 0x1118, 0xc6c4, 0xb676,</div><div class='del'>-	0x0c38, 0x080c, 0x100e, 0x090c, 0x0dc5, 0x2900, 0xb07a, 0xb77c,</div><div class='del'>-	0x97bd, 0x0200, 0xb77e, 0xa867, 0x0103, 0xb068, 0xa86a, 0xb06c,</div><div class='del'>-	0xa86e, 0xb070, 0xa872, 0x7044, 0x9084, 0xf000, 0x9635, 0xae76,</div><div class='del'>-	0x968c, 0x0c00, 0x0120, 0x7348, 0xab92, 0x734c, 0xab8e, 0x968c,</div><div class='del'>-	0x00ff, 0x9186, 0x0002, 0x0180, 0x9186, 0x0028, 0x1118, 0xa87b,</div><div class='del'>-	0x001c, 0x0060, 0xd6dc, 0x0118, 0xa87b, 0x0015, 0x0038, 0xd6d4,</div><div class='del'>-	0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b, 0x0000, 0xaf7e, 0xb080,</div><div class='del'>-	0xa882, 0xb084, 0xa886, 0x901e, 0xd6c4, 0x0190, 0x735c, 0xab86,</div><div class='del'>-	0x83ff, 0x0170, 0x938a, 0x0009, 0x0210, 0x2019, 0x0008, 0x0036,</div><div class='del'>-	0x2308, 0x2019, 0x0018, 0x2011, 0x0025, 0x080c, 0xcc85, 0x003e,</div><div class='del'>-	0xd6cc, 0x01e8, 0x7154, 0xa98a, 0x81ff, 0x01c8, 0x9192, 0x0021,</div><div class='del'>-	0x1260, 0x8304, 0x9098, 0x0018, 0x2011, 0x0029, 0x080c, 0xcc85,</div><div class='del'>-	0x2011, 0x0205, 0x2013, 0x0000, 0x0050, 0xb068, 0xd0fc, 0x0120,</div><div class='del'>-	0x2009, 0x0020, 0xa98a, 0x0c68, 0x2950, 0x080c, 0xcc24, 0x080c,</div><div class='del'>-	0x1a5a, 0x009e, 0x00ee, 0x00ae, 0x007e, 0x0005, 0x2001, 0x1988,</div><div class='del'>-	0x2004, 0x6042, 0x0096, 0x6114, 0x2148, 0xa83c, 0xa940, 0x9105,</div><div class='del'>-	0x1118, 0xa87c, 0xc0dc, 0xa87e, 0x6003, 0x0002, 0xa97c, 0xd1e4,</div><div class='del'>-	0x0904, 0xc993, 0x6043, 0x0000, 0x6010, 0x00b6, 0x2058, 0xb800,</div><div class='del'>-	0x00be, 0xd0bc, 0x1500, 0xd1cc, 0x0904, 0xc962, 0xa978, 0xa868,</div><div class='del'>-	0xd0fc, 0x0904, 0xc923, 0x0016, 0xa87c, 0x0006, 0xa880, 0x0006,</div><div class='del'>-	0x00a6, 0x2150, 0xb174, 0x9184, 0x00ff, 0x90b6, 0x0002, 0x0904,</div><div class='del'>-	0xc8f0, 0x9086, 0x0028, 0x1904, 0xc8dc, 0xa87b, 0x001c, 0xb07b,</div><div class='del'>-	0x001c, 0x0804, 0xc8f8, 0x6024, 0xd0f4, 0x11d0, 0xa838, 0xaa34,</div><div class='del'>-	0x9205, 0x09c8, 0xa838, 0xaa90, 0x9206, 0x1120, 0xa88c, 0xaa34,</div><div class='del'>-	0x9206, 0x0988, 0x6024, 0xd0d4, 0x1148, 0xa9ac, 0xa834, 0x9102,</div><div class='del'>-	0x603a, 0xa9b0, 0xa838, 0x9103, 0x603e, 0x6024, 0xc0f5, 0x6026,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb83c, 0x8000, 0xb83e, 0x00be, 0x9006,</div><div class='del'>-	0xa876, 0xa892, 0xa88e, 0xa87c, 0xc0e4, 0xa87e, 0xd0cc, 0x0140,</div><div class='del'>-	0xc0cc, 0xa87e, 0x0096, 0xa878, 0x2048, 0x080c, 0x0fc0, 0x009e,</div><div class='del'>-	0x080c, 0xd412, 0x0804, 0xc993, 0xd1dc, 0x0158, 0xa87b, 0x0015,</div><div class='del'>-	0xb07b, 0x0015, 0x080c, 0xd6a6, 0x0118, 0xb174, 0xc1dc, 0xb176,</div><div class='del'>-	0x0078, 0xd1d4, 0x0128, 0xa87b, 0x0007, 0xb07b, 0x0007, 0x0040,</div><div class='del'>-	0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115, 0x190c, 0xc78b,</div><div class='del'>-	0xa87c, 0xb07e, 0xa890, 0xb092, 0xa88c, 0xb08e, 0xa860, 0x20e8,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0x20a0, 0x20a9, 0x0020, 0x8a06, 0x8006,</div><div class='del'>-	0x8007, 0x9094, 0x003f, 0x22e0, 0x9084, 0xffc0, 0x9080, 0x0019,</div><div class='del'>-	0x2098, 0x4003, 0x00ae, 0x000e, 0xa882, 0x000e, 0xc0cc, 0xa87e,</div><div class='del'>-	0x080c, 0xd786, 0x001e, 0xa874, 0x0006, 0x2148, 0x080c, 0x0fc0,</div><div class='del'>-	0x001e, 0x0804, 0xc98f, 0x0016, 0x00a6, 0x2150, 0xb174, 0x9184,</div><div class='del'>-	0x00ff, 0x90b6, 0x0002, 0x01e0, 0x9086, 0x0028, 0x1128, 0xa87b,</div><div class='del'>-	0x001c, 0xb07b, 0x001c, 0x00e0, 0xd1dc, 0x0158, 0xa87b, 0x0015,</div><div class='del'>-	0xb07b, 0x0015, 0x080c, 0xd6a6, 0x0118, 0xb174, 0xc1dc, 0xb176,</div><div class='del'>-	0x0078, 0xd1d4, 0x0128, 0xa87b, 0x0007, 0xb07b, 0x0007, 0x0040,</div><div class='del'>-	0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115, 0x190c, 0xc78b,</div><div class='del'>-	0xa890, 0xb092, 0xa88c, 0xb08e, 0xa87c, 0xb07e, 0x00ae, 0x080c,</div><div class='del'>-	0x0fc0, 0x009e, 0x080c, 0xd786, 0xa974, 0x0016, 0x080c, 0xcc75,</div><div class='del'>-	0x001e, 0x0468, 0xa867, 0x0103, 0xa974, 0x9184, 0x00ff, 0x90b6,</div><div class='del'>-	0x0002, 0x01b0, 0x9086, 0x0028, 0x1118, 0xa87b, 0x001c, 0x00d0,</div><div class='del'>-	0xd1dc, 0x0148, 0xa87b, 0x0015, 0x080c, 0xd6a6, 0x0118, 0xa974,</div><div class='del'>-	0xc1dc, 0xa976, 0x0078, 0xd1d4, 0x0118, 0xa87b, 0x0007, 0x0050,</div><div class='del'>-	0xa87b, 0x0000, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115,</div><div class='del'>-	0x190c, 0xc78b, 0xa974, 0x0016, 0x080c, 0x6cb9, 0x001e, 0xd1e4,</div><div class='del'>-	0x1120, 0x080c, 0xb2d3, 0x009e, 0x0005, 0x080c, 0xd3d8, 0x0cd8,</div><div class='del'>-	0x6114, 0x0096, 0x2148, 0xa97c, 0xd1e4, 0x190c, 0x1a7a, 0x009e,</div><div class='del'>-	0x0005, 0x080c, 0x99a5, 0x0010, 0x080c, 0x9a61, 0x080c, 0xd0d8,</div><div class='del'>-	0x01f0, 0x0096, 0x6114, 0x2148, 0x080c, 0xd2e0, 0x1118, 0x080c,</div><div class='del'>-	0xbcb6, 0x00a0, 0xa867, 0x0103, 0x2009, 0x180c, 0x210c, 0xd18c,</div><div class='del'>-	0x11b8, 0xd184, 0x1190, 0x6108, 0xa97a, 0x918e, 0x0029, 0x1110,</div><div class='del'>-	0x080c, 0xef85, 0xa877, 0x0000, 0x080c, 0x6e9f, 0x009e, 0x080c,</div><div class='del'>-	0xb2d3, 0x080c, 0x9ab1, 0x0804, 0x9bd3, 0xa87b, 0x0004, 0x0c90,</div><div class='del'>-	0xa87b, 0x0004, 0x0c78, 0x9182, 0x0054, 0x1220, 0x9182, 0x0040,</div><div class='del'>-	0x0208, 0x000a, 0x0005, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef,</div><div class='del'>-	0xc9f1, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef,</div><div class='del'>-	0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0xc9ef, 0x080c,</div><div class='del'>-	0x0dc5, 0x080c, 0x57dd, 0x01f8, 0x6014, 0x7144, 0x918c, 0x0fff,</div><div class='del'>-	0x9016, 0xd1c4, 0x0118, 0x7264, 0x9294, 0x00ff, 0x0096, 0x904d,</div><div class='del'>-	0x0188, 0xa87b, 0x0000, 0xa864, 0x9086, 0x0139, 0x0128, 0xa867,</div><div class='del'>-	0x0103, 0xa976, 0xaa96, 0x0030, 0xa897, 0x4000, 0xa99a, 0xaa9e,</div><div class='del'>-	0x080c, 0x6e9f, 0x009e, 0x0804, 0xb2d3, 0x9182, 0x0085, 0x0002,</div><div class='del'>-	0xca27, 0xca25, 0xca25, 0xca33, 0xca25, 0xca25, 0xca25, 0xca25,</div><div class='del'>-	0xca25, 0xca25, 0xca25, 0xca25, 0xca25, 0x080c, 0x0dc5, 0x6003,</div><div class='del'>-	0x0001, 0x6106, 0x080c, 0x94ff, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x9ab1, 0x012e, 0x0005, 0x0026, 0x0056, 0x00d6, 0x00e6, 0x2071,</div><div class='del'>-	0x0260, 0x7224, 0x6216, 0x7220, 0x080c, 0xd0c6, 0x01f8, 0x2268,</div><div class='del'>-	0x6800, 0x9086, 0x0000, 0x01d0, 0x6010, 0x6d10, 0x952e, 0x11b0,</div><div class='del'>-	0x00c6, 0x2d60, 0x00d6, 0x080c, 0xcce6, 0x00de, 0x00ce, 0x0158,</div><div class='del'>-	0x702c, 0xd084, 0x1118, 0x080c, 0xccb0, 0x0010, 0x6803, 0x0002,</div><div class='del'>-	0x6007, 0x0086, 0x0028, 0x080c, 0xccd2, 0x0d90, 0x6007, 0x0087,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x7220, 0x080c,</div><div class='del'>-	0xd0c6, 0x0178, 0x6810, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,</div><div class='del'>-	0x0140, 0x6824, 0xd0ec, 0x0128, 0x00c6, 0x2d60, 0x080c, 0xd412,</div><div class='del'>-	0x00ce, 0x00ee, 0x00de, 0x005e, 0x002e, 0x0005, 0x9186, 0x0013,</div><div class='del'>-	0x1160, 0x6004, 0x908a, 0x0085, 0x0a0c, 0x0dc5, 0x908a, 0x0092,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x9082, 0x0085, 0x00e2, 0x9186, 0x0027, 0x0120,</div><div class='del'>-	0x9186, 0x0014, 0x190c, 0x0dc5, 0x080c, 0x99a5, 0x0096, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xd0d8, 0x0140, 0xa867, 0x0103, 0xa877, 0x0000,</div><div class='del'>-	0xa87b, 0x0029, 0x080c, 0x6e9f, 0x009e, 0x080c, 0xb306, 0x0804,</div><div class='del'>-	0x9ab1, 0xcab6, 0xcab8, 0xcab8, 0xcab6, 0xcab6, 0xcab6, 0xcab6,</div><div class='del'>-	0xcab6, 0xcab6, 0xcab6, 0xcab6, 0xcab6, 0xcab6, 0x080c, 0x0dc5,</div><div class='del'>-	0x080c, 0x99a5, 0x080c, 0xb306, 0x080c, 0x9ab1, 0x0005, 0x9186,</div><div class='del'>-	0x0013, 0x1128, 0x6004, 0x9082, 0x0085, 0x2008, 0x04b8, 0x9186,</div><div class='del'>-	0x0027, 0x11f8, 0x080c, 0x99a5, 0x080c, 0x3250, 0x080c, 0xd7f8,</div><div class='del'>-	0x0096, 0x6014, 0x2048, 0x080c, 0xd0d8, 0x0150, 0xa867, 0x0103,</div><div class='del'>-	0xa877, 0x0000, 0xa87b, 0x0029, 0x080c, 0x6e9f, 0x080c, 0xd2c3,</div><div class='del'>-	0x009e, 0x080c, 0xb2d3, 0x080c, 0x9ab1, 0x0005, 0x080c, 0xb36d,</div><div class='del'>-	0x0ce0, 0x9186, 0x0014, 0x1dd0, 0x080c, 0x99a5, 0x0096, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xd0d8, 0x0d60, 0xa867, 0x0103, 0xa877, 0x0000,</div><div class='del'>-	0xa87b, 0x0006, 0xa880, 0xc0ec, 0xa882, 0x08f0, 0x0002, 0xcb0e,</div><div class='del'>-	0xcb0c, 0xcb0c, 0xcb0c, 0xcb0c, 0xcb0c, 0xcb26, 0xcb0c, 0xcb0c,</div><div class='del'>-	0xcb0c, 0xcb0c, 0xcb0c, 0xcb0c, 0x080c, 0x0dc5, 0x080c, 0x99a5,</div><div class='del'>-	0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186,</div><div class='del'>-	0x0035, 0x1118, 0x2001, 0x1986, 0x0010, 0x2001, 0x1987, 0x2004,</div><div class='del'>-	0x601a, 0x6003, 0x000c, 0x080c, 0x9ab1, 0x0005, 0x080c, 0x99a5,</div><div class='del'>-	0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186,</div><div class='del'>-	0x0035, 0x1118, 0x2001, 0x1986, 0x0010, 0x2001, 0x1987, 0x2004,</div><div class='del'>-	0x601a, 0x6003, 0x000e, 0x080c, 0x9ab1, 0x0005, 0x9182, 0x0092,</div><div class='del'>-	0x1220, 0x9182, 0x0085, 0x0208, 0x0012, 0x0804, 0xb36d, 0xcb54,</div><div class='del'>-	0xcb54, 0xcb54, 0xcb54, 0xcb56, 0xcba3, 0xcb54, 0xcb54, 0xcb54,</div><div class='del'>-	0xcb54, 0xcb54, 0xcb54, 0xcb54, 0x080c, 0x0dc5, 0x0096, 0x6010,</div><div class='del'>-	0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x0168, 0x6034, 0x908c,</div><div class='del'>-	0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186, 0x0035, 0x1118,</div><div class='del'>-	0x009e, 0x0804, 0xcbb7, 0x080c, 0xd0d8, 0x1118, 0x080c, 0xd2c3,</div><div class='del'>-	0x0068, 0x6014, 0x2048, 0xa87c, 0xd0e4, 0x1110, 0x080c, 0xd2c3,</div><div class='del'>-	0xa867, 0x0103, 0x080c, 0xd7c3, 0x080c, 0x6e9f, 0x00d6, 0x2c68,</div><div class='del'>-	0x080c, 0xb27d, 0x01d0, 0x6003, 0x0001, 0x6007, 0x001e, 0x600b,</div><div class='del'>-	0xffff, 0x2009, 0x026e, 0x210c, 0x613a, 0x2009, 0x026f, 0x210c,</div><div class='del'>-	0x613e, 0x6910, 0x6112, 0x080c, 0xd554, 0x6954, 0x6156, 0x6023,</div><div class='del'>-	0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x2d60, 0x00de, 0x080c,</div><div class='del'>-	0xb2d3, 0x009e, 0x0005, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be,</div><div class='del'>-	0xd0bc, 0x05a0, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0035,</div><div class='del'>-	0x0130, 0x9186, 0x001e, 0x0118, 0x9186, 0x0039, 0x1538, 0x00d6,</div><div class='del'>-	0x2c68, 0x080c, 0xd759, 0x11f0, 0x080c, 0xb27d, 0x01d8, 0x6106,</div><div class='del'>-	0x6003, 0x0001, 0x6023, 0x0001, 0x6910, 0x6112, 0x692c, 0x612e,</div><div class='del'>-	0x6930, 0x6132, 0x6934, 0x918c, 0x00ff, 0x6136, 0x6938, 0x613a,</div><div class='del'>-	0x693c, 0x613e, 0x6954, 0x6156, 0x080c, 0xd554, 0x080c, 0x94ff,</div><div class='del'>-	0x080c, 0x9ab1, 0x2d60, 0x00de, 0x0804, 0xb2d3, 0x0096, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xd0d8, 0x01c8, 0xa867, 0x0103, 0xa880, 0xd0b4,</div><div class='del'>-	0x0128, 0xc0ec, 0xa882, 0xa87b, 0x0006, 0x0048, 0xd0bc, 0x0118,</div><div class='del'>-	0xa87b, 0x0002, 0x0020, 0xa87b, 0x0005, 0x080c, 0xd3d4, 0xa877,</div><div class='del'>-	0x0000, 0x080c, 0x6e9f, 0x080c, 0xd2c3, 0x009e, 0x0804, 0xb2d3,</div><div class='del'>-	0x0016, 0x0096, 0x6014, 0x2048, 0x080c, 0xd0d8, 0x0140, 0xa867,</div><div class='del'>-	0x0103, 0xa87b, 0x0028, 0xa877, 0x0000, 0x080c, 0x6e9f, 0x009e,</div><div class='del'>-	0x001e, 0x9186, 0x0013, 0x0148, 0x9186, 0x0014, 0x0130, 0x9186,</div><div class='del'>-	0x0027, 0x0118, 0x080c, 0xb36d, 0x0030, 0x080c, 0x99a5, 0x080c,</div><div class='del'>-	0xb306, 0x080c, 0x9ab1, 0x0005, 0x0056, 0x0066, 0x0096, 0x00a6,</div><div class='del'>-	0x2029, 0x0001, 0x9182, 0x0101, 0x1208, 0x0010, 0x2009, 0x0100,</div><div class='del'>-	0x2130, 0x8304, 0x9098, 0x0018, 0x2009, 0x0020, 0x2011, 0x0029,</div><div class='del'>-	0x080c, 0xcc85, 0x96b2, 0x0020, 0xb004, 0x904d, 0x0110, 0x080c,</div><div class='del'>-	0x0fc0, 0x080c, 0x100e, 0x0520, 0x8528, 0xa867, 0x0110, 0xa86b,</div><div class='del'>-	0x0000, 0x2920, 0xb406, 0x968a, 0x003d, 0x1228, 0x2608, 0x2011,</div><div class='del'>-	0x001b, 0x0499, 0x00a8, 0x96b2, 0x003c, 0x2009, 0x003c, 0x2950,</div><div class='del'>-	0x2011, 0x001b, 0x0451, 0x0c28, 0x2001, 0x0205, 0x2003, 0x0000,</div><div class='del'>-	0x00ae, 0x852f, 0x95ad, 0x0003, 0xb566, 0x95ac, 0x0000, 0x0048,</div><div class='del'>-	0x2001, 0x0205, 0x2003, 0x0000, 0x00ae, 0x852f, 0x95ad, 0x0003,</div><div class='del'>-	0xb566, 0x009e, 0x006e, 0x005e, 0x0005, 0x00a6, 0x89ff, 0x0158,</div><div class='del'>-	0xa804, 0x9055, 0x0130, 0xa807, 0x0000, 0x080c, 0x6e9f, 0x2a48,</div><div class='del'>-	0x0cb8, 0x080c, 0x6e9f, 0x00ae, 0x0005, 0x00f6, 0x2079, 0x0200,</div><div class='del'>-	0x7814, 0x9085, 0x0080, 0x7816, 0xd184, 0x0108, 0x8108, 0x810c,</div><div class='del'>-	0x20a9, 0x0001, 0xa860, 0x20e8, 0xa85c, 0x9200, 0x20a0, 0x20e1,</div><div class='del'>-	0x0000, 0x2300, 0x9e00, 0x2098, 0x4003, 0x8318, 0x9386, 0x0020,</div><div class='del'>-	0x1148, 0x2018, 0x2300, 0x9e00, 0x2098, 0x7814, 0x8000, 0x9085,</div><div class='del'>-	0x0080, 0x7816, 0x8109, 0x1d80, 0x7817, 0x0000, 0x00fe, 0x0005,</div><div class='del'>-	0x6920, 0x9186, 0x0003, 0x0118, 0x9186, 0x0002, 0x11d0, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x2d60, 0x0096, 0x6014, 0x2048, 0x080c, 0xd0d8,</div><div class='del'>-	0x0150, 0x2001, 0x0006, 0xa980, 0xc1d5, 0x080c, 0x710b, 0x080c,</div><div class='del'>-	0x6e92, 0x080c, 0xd2c3, 0x009e, 0x080c, 0xb306, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x0005, 0x00c6, 0x702c, 0xd084, 0x1170, 0x6008, 0x2060,</div><div class='del'>-	0x6020, 0x9086, 0x0002, 0x1140, 0x6104, 0x9186, 0x0085, 0x0118,</div><div class='del'>-	0x9186, 0x008b, 0x1108, 0x9006, 0x00ce, 0x0005, 0x0066, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2031, 0x0001, 0x6020, 0x9084, 0x000f, 0x0083,</div><div class='del'>-	0x012e, 0x006e, 0x0005, 0x0126, 0x2091, 0x8000, 0x0066, 0x2031,</div><div class='del'>-	0x0000, 0x6020, 0x9084, 0x000f, 0x001b, 0x006e, 0x012e, 0x0005,</div><div class='del'>-	0xcd1d, 0xcd1d, 0xcd18, 0xcd3f, 0xcd0f, 0xcd18, 0xcd3f, 0xcd18,</div><div class='del'>-	0xcd18, 0x9265, 0xcd18, 0xcd18, 0xcd18, 0xcd0f, 0xcd0f, 0x080c,</div><div class='del'>-	0x0dc5, 0x0036, 0x2019, 0x0010, 0x080c, 0xe746, 0x003e, 0x0005,</div><div class='del'>-	0x9006, 0x0005, 0x9085, 0x0001, 0x0005, 0x0096, 0x86ff, 0x11d8,</div><div class='del'>-	0x6014, 0x2048, 0x080c, 0xd0d8, 0x01c0, 0xa864, 0x9086, 0x0139,</div><div class='del'>-	0x1128, 0xa87b, 0x0005, 0xa883, 0x0000, 0x0028, 0x900e, 0x2001,</div><div class='del'>-	0x0005, 0x080c, 0x710b, 0x080c, 0xd3d4, 0x080c, 0x6e92, 0x080c,</div><div class='del'>-	0xb306, 0x9085, 0x0001, 0x009e, 0x0005, 0x9006, 0x0ce0, 0x6000,</div><div class='del'>-	0x908a, 0x0010, 0x1a0c, 0x0dc5, 0x0002, 0xcd55, 0xcd85, 0xcd57,</div><div class='del'>-	0xcda6, 0xcd80, 0xcd55, 0xcd18, 0xcd1d, 0xcd1d, 0xcd18, 0xcd18,</div><div class='del'>-	0xcd18, 0xcd18, 0xcd18, 0xcd18, 0xcd18, 0x080c, 0x0dc5, 0x86ff,</div><div class='del'>-	0x1520, 0x6020, 0x9086, 0x0006, 0x0500, 0x0096, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0xd0d8, 0x0168, 0xa87c, 0xd0cc, 0x0140, 0x0096, 0xc0cc,</div><div class='del'>-	0xa87e, 0xa878, 0x2048, 0x080c, 0x0fc0, 0x009e, 0x080c, 0xd3d4,</div><div class='del'>-	0x009e, 0x080c, 0xd79d, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023,</div><div class='del'>-	0x0002, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x0066, 0x080c, 0x1a8e, 0x006e, 0x0890, 0x00e6, 0x2071, 0x19e8,</div><div class='del'>-	0x7024, 0x9c06, 0x1120, 0x080c, 0xa9d3, 0x00ee, 0x0840, 0x6020,</div><div class='del'>-	0x9084, 0x000f, 0x9086, 0x0006, 0x1150, 0x0086, 0x0096, 0x2049,</div><div class='del'>-	0x0001, 0x2c40, 0x080c, 0xaafb, 0x009e, 0x008e, 0x0010, 0x080c,</div><div class='del'>-	0xa8d0, 0x00ee, 0x1904, 0xcd57, 0x0804, 0xcd18, 0x0036, 0x00e6,</div><div class='del'>-	0x2071, 0x19e8, 0x703c, 0x9c06, 0x1138, 0x901e, 0x080c, 0xaa49,</div><div class='del'>-	0x00ee, 0x003e, 0x0804, 0xcd57, 0x080c, 0xac2b, 0x00ee, 0x003e,</div><div class='del'>-	0x1904, 0xcd57, 0x0804, 0xcd18, 0x00c6, 0x6020, 0x9084, 0x000f,</div><div class='del'>-	0x0013, 0x00ce, 0x0005, 0xcdd9, 0xcea3, 0xd011, 0xcde3, 0xb306,</div><div class='del'>-	0xcdd9, 0xe73c, 0xd805, 0xcea3, 0x9237, 0xd09d, 0xcdd2, 0xcdd2,</div><div class='del'>-	0xcdd2, 0xcdd2, 0x080c, 0x0dc5, 0x080c, 0xd2e0, 0x1110, 0x080c,</div><div class='del'>-	0xbcb6, 0x0005, 0x080c, 0x99a5, 0x080c, 0x9ab1, 0x0804, 0xb2d3,</div><div class='del'>-	0x601b, 0x0001, 0x0005, 0x080c, 0xd0d8, 0x0130, 0x6014, 0x0096,</div><div class='del'>-	0x2048, 0x2c00, 0xa896, 0x009e, 0x6000, 0x908a, 0x0010, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x0002, 0xce02, 0xce04, 0xce28, 0xce3c, 0xce62, 0xce02,</div><div class='del'>-	0xcdd9, 0xcdd9, 0xcdd9, 0xce3c, 0xce3c, 0xce02, 0xce02, 0xce02,</div><div class='del'>-	0xce02, 0xce46, 0x080c, 0x0dc5, 0x00e6, 0x6014, 0x0096, 0x2048,</div><div class='del'>-	0xa880, 0xc0b5, 0xa882, 0x009e, 0x2071, 0x19e8, 0x7024, 0x9c06,</div><div class='del'>-	0x01a0, 0x080c, 0xa8d0, 0x080c, 0xd79d, 0x6007, 0x0085, 0x6003,</div><div class='del'>-	0x000b, 0x6023, 0x0002, 0x2001, 0x1987, 0x2004, 0x601a, 0x080c,</div><div class='del'>-	0x94ff, 0x080c, 0x9ab1, 0x00ee, 0x0005, 0x601b, 0x0001, 0x0cd8,</div><div class='del'>-	0x0096, 0x6014, 0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e, 0x080c,</div><div class='del'>-	0xd79d, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002, 0x080c,</div><div class='del'>-	0x94ff, 0x080c, 0x9ab1, 0x0005, 0x0096, 0x601b, 0x0001, 0x6014,</div><div class='del'>-	0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e, 0x0005, 0x080c, 0x57dd,</div><div class='del'>-	0x01b8, 0x6014, 0x0096, 0x904d, 0x0190, 0xa864, 0xa867, 0x0103,</div><div class='del'>-	0xa87b, 0x0006, 0x9086, 0x0139, 0x1150, 0xa867, 0x0139, 0xa87b,</div><div class='del'>-	0x0030, 0xa897, 0x4005, 0xa89b, 0x0004, 0x080c, 0x6e9f, 0x009e,</div><div class='del'>-	0x0804, 0xb2d3, 0x6014, 0x0096, 0x904d, 0x05c0, 0xa97c, 0xd1e4,</div><div class='del'>-	0x05a8, 0x2001, 0x180f, 0x2004, 0xd0c4, 0x0110, 0x009e, 0x0005,</div><div class='del'>-	0xa884, 0x009e, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a, 0x2001,</div><div class='del'>-	0x0030, 0x2c08, 0x080c, 0x1611, 0x2001, 0x030c, 0x2004, 0x9086,</div><div class='del'>-	0x0041, 0x1198, 0x6014, 0x0096, 0x904d, 0x090c, 0x0dc5, 0xa880,</div><div class='del'>-	0xd0f4, 0x1130, 0xc0f5, 0xa882, 0x009e, 0x601b, 0x0002, 0x0068,</div><div class='del'>-	0x009e, 0x00c6, 0x080c, 0x236e, 0x00ce, 0x6000, 0x9086, 0x0004,</div><div class='del'>-	0x1120, 0x2009, 0x0048, 0x080c, 0xb352, 0x0005, 0x009e, 0x080c,</div><div class='del'>-	0x1a8e, 0x0804, 0xce28, 0x6000, 0x908a, 0x0010, 0x1a0c, 0x0dc5,</div><div class='del'>-	0x000b, 0x0005, 0xceba, 0xcde0, 0xcebc, 0xceba, 0xcebc, 0xcebc,</div><div class='del'>-	0xcdda, 0xceba, 0xcdd4, 0xcdd4, 0xceba, 0xceba, 0xceba, 0xceba,</div><div class='del'>-	0xceba, 0xceba, 0x080c, 0x0dc5, 0x6010, 0x00b6, 0x2058, 0xb804,</div><div class='del'>-	0x9084, 0x00ff, 0x00be, 0x908a, 0x000c, 0x1a0c, 0x0dc5, 0x00b6,</div><div class='del'>-	0x0013, 0x00be, 0x0005, 0xced7, 0xcfa8, 0xced9, 0xcf19, 0xced9,</div><div class='del'>-	0xcf19, 0xced9, 0xcee7, 0xced7, 0xcf19, 0xced7, 0xcf08, 0x080c,</div><div class='del'>-	0x0dc5, 0x6004, 0x908e, 0x0016, 0x05c0, 0x908e, 0x0004, 0x05a8,</div><div class='del'>-	0x908e, 0x0002, 0x0590, 0x908e, 0x0052, 0x0904, 0xcfa4, 0x6004,</div><div class='del'>-	0x080c, 0xd2e0, 0x0904, 0xcfc1, 0x908e, 0x0004, 0x1110, 0x080c,</div><div class='del'>-	0x3279, 0x908e, 0x0021, 0x0904, 0xcfc5, 0x908e, 0x0022, 0x0904,</div><div class='del'>-	0xd00c, 0x908e, 0x003d, 0x0904, 0xcfc5, 0x908e, 0x0039, 0x0904,</div><div class='del'>-	0xcfc9, 0x908e, 0x0035, 0x0904, 0xcfc9, 0x908e, 0x001e, 0x0178,</div><div class='del'>-	0x908e, 0x0001, 0x1140, 0x6010, 0x2058, 0xb804, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x0006, 0x0110, 0x080c, 0x3250, 0x080c, 0xbcb6, 0x0804,</div><div class='del'>-	0xb306, 0x00c6, 0x00d6, 0x6104, 0x9186, 0x0016, 0x0904, 0xcf95,</div><div class='del'>-	0x9186, 0x0002, 0x1904, 0xcf6a, 0x2001, 0x1837, 0x2004, 0xd08c,</div><div class='del'>-	0x11c8, 0x080c, 0x7637, 0x11b0, 0x080c, 0xd7e3, 0x0138, 0x080c,</div><div class='del'>-	0x765a, 0x1120, 0x080c, 0x7541, 0x0804, 0xcff5, 0x2001, 0x197d,</div><div class='del'>-	0x2003, 0x0001, 0x2001, 0x1800, 0x2003, 0x0001, 0x080c, 0x7563,</div><div class='del'>-	0x0804, 0xcff5, 0x6010, 0x2058, 0xb8a0, 0x9086, 0x0080, 0x0130,</div><div class='del'>-	0x2001, 0x1837, 0x2004, 0xd0ac, 0x1904, 0xcff5, 0xb8a0, 0x9082,</div><div class='del'>-	0x0081, 0x1a04, 0xcff5, 0xb840, 0x9084, 0x00ff, 0x9005, 0x0190,</div><div class='del'>-	0x8001, 0xb842, 0x6017, 0x0000, 0x6023, 0x0007, 0x601b, 0x0398,</div><div class='del'>-	0x6043, 0x0000, 0x080c, 0xb27d, 0x0128, 0x2b00, 0x6012, 0x6023,</div><div class='del'>-	0x0001, 0x0458, 0x00de, 0x00ce, 0x6004, 0x908e, 0x0002, 0x11a0,</div><div class='del'>-	0x6010, 0x2058, 0xb8a0, 0x9086, 0x007e, 0x1170, 0x2009, 0x1837,</div><div class='del'>-	0x2104, 0xc085, 0x200a, 0x00e6, 0x2071, 0x1800, 0x080c, 0x60c1,</div><div class='del'>-	0x00ee, 0x080c, 0xbcb6, 0x0030, 0x080c, 0xbcb6, 0x080c, 0x3250,</div><div class='del'>-	0x080c, 0xd7f8, 0x00e6, 0x0126, 0x2091, 0x8000, 0x080c, 0x3279,</div><div class='del'>-	0x012e, 0x00ee, 0x080c, 0xb306, 0x0005, 0x2001, 0x0002, 0x080c,</div><div class='del'>-	0x666a, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x9547, 0x080c,</div><div class='del'>-	0x9ab1, 0x00de, 0x00ce, 0x0c80, 0x080c, 0x3279, 0x0804, 0xcf15,</div><div class='del'>-	0x00c6, 0x00d6, 0x6104, 0x9186, 0x0016, 0x0d38, 0x6010, 0x2058,</div><div class='del'>-	0xb840, 0x9084, 0x00ff, 0x9005, 0x0904, 0xcf6a, 0x8001, 0xb842,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x00de, 0x00ce,</div><div class='del'>-	0x0898, 0x080c, 0xbcb6, 0x0804, 0xcf17, 0x080c, 0xbcf2, 0x0804,</div><div class='del'>-	0xcf17, 0x00d6, 0x2c68, 0x6104, 0x080c, 0xd759, 0x00de, 0x0118,</div><div class='del'>-	0x080c, 0xb2d3, 0x0408, 0x6004, 0x8007, 0x6134, 0x918c, 0x00ff,</div><div class='del'>-	0x9105, 0x6036, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002,</div><div class='del'>-	0x603c, 0x600a, 0x2001, 0x1987, 0x2004, 0x601a, 0x602c, 0x2c08,</div><div class='del'>-	0x2060, 0x6024, 0xd0b4, 0x0108, 0xc085, 0xc0b5, 0x6026, 0x2160,</div><div class='del'>-	0x080c, 0x94ff, 0x080c, 0x9ab1, 0x0005, 0x00de, 0x00ce, 0x080c,</div><div class='del'>-	0xbcb6, 0x080c, 0x3250, 0x00e6, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x3279, 0x6017, 0x0000, 0x6023, 0x0007, 0x601b, 0x0398, 0x6043,</div><div class='del'>-	0x0000, 0x012e, 0x00ee, 0x0005, 0x080c, 0xb708, 0x1904, 0xcfc1,</div><div class='del'>-	0x0005, 0x6000, 0x908a, 0x0010, 0x1a0c, 0x0dc5, 0x0096, 0x00d6,</div><div class='del'>-	0x001b, 0x00de, 0x009e, 0x0005, 0xd02c, 0xd02c, 0xd02c, 0xd02c,</div><div class='del'>-	0xd02c, 0xd02c, 0xd02c, 0xd02c, 0xd02c, 0xcdd9, 0xd02c, 0xcde0,</div><div class='del'>-	0xd02e, 0xcde0, 0xd048, 0xd02c, 0x080c, 0x0dc5, 0x6004, 0x9086,</div><div class='del'>-	0x008b, 0x01b0, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0035,</div><div class='del'>-	0x1130, 0x602c, 0x9080, 0x0009, 0x200c, 0xc185, 0x2102, 0x6007,</div><div class='del'>-	0x008b, 0x6003, 0x000d, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x0005,</div><div class='del'>-	0x080c, 0xd7d7, 0x0118, 0x080c, 0xd7ea, 0x0010, 0x080c, 0xd7f8,</div><div class='del'>-	0x080c, 0xd2c3, 0x080c, 0xd0d8, 0x0570, 0x080c, 0x3250, 0x080c,</div><div class='del'>-	0xd0d8, 0x0168, 0x6014, 0x2048, 0xa867, 0x0103, 0xa87b, 0x0006,</div><div class='del'>-	0xa877, 0x0000, 0xa880, 0xc0ed, 0xa882, 0x080c, 0x6e9f, 0x2c68,</div><div class='del'>-	0x080c, 0xb27d, 0x0150, 0x6810, 0x6012, 0x080c, 0xd554, 0x00c6,</div><div class='del'>-	0x2d60, 0x080c, 0xb306, 0x00ce, 0x0008, 0x2d60, 0x6017, 0x0000,</div><div class='del'>-	0x6023, 0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x9547,</div><div class='del'>-	0x080c, 0x9ab1, 0x00c8, 0x080c, 0xd7d7, 0x0138, 0x6034, 0x9086,</div><div class='del'>-	0x4000, 0x1118, 0x080c, 0x3250, 0x08d0, 0x6034, 0x908c, 0xff00,</div><div class='del'>-	0x810f, 0x9186, 0x0039, 0x0118, 0x9186, 0x0035, 0x1118, 0x080c,</div><div class='del'>-	0x3250, 0x0868, 0x080c, 0xb306, 0x0005, 0x6000, 0x908a, 0x0010,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x0002, 0xd0b3, 0xd0b3, 0xd0b7, 0xd0b5, 0xd0c1,</div><div class='del'>-	0xd0b3, 0xd0b3, 0xb306, 0xd0b3, 0xd0b3, 0xd0b3, 0xd0b3, 0xd0b3,</div><div class='del'>-	0xd0b3, 0xd0b3, 0xd0b3, 0x080c, 0x0dc5, 0x080c, 0xac2b, 0x6114,</div><div class='del'>-	0x0096, 0x2148, 0xa87b, 0x0006, 0x080c, 0x6e9f, 0x009e, 0x0804,</div><div class='del'>-	0xb2d3, 0x601c, 0xd084, 0x190c, 0x1a8e, 0x0c88, 0x9284, 0x0007,</div><div class='del'>-	0x1158, 0x9282, 0x1cd0, 0x0240, 0x2001, 0x181a, 0x2004, 0x9202,</div><div class='del'>-	0x1218, 0x9085, 0x0001, 0x0005, 0x9006, 0x0ce8, 0x0096, 0x0028,</div><div class='del'>-	0x0096, 0x0006, 0x6014, 0x2048, 0x000e, 0x0006, 0x9984, 0xf000,</div><div class='del'>-	0x9086, 0xf000, 0x0110, 0x080c, 0x10b9, 0x000e, 0x009e, 0x0005,</div><div class='del'>-	0x00e6, 0x00c6, 0x0036, 0x0006, 0x0126, 0x2091, 0x8000, 0x2061,</div><div class='del'>-	0x1cd0, 0x2071, 0x1800, 0x7354, 0x7074, 0x9302, 0x1640, 0x6020,</div><div class='del'>-	0x9206, 0x11f8, 0x080c, 0xd7e3, 0x0180, 0x9286, 0x0001, 0x1168,</div><div class='del'>-	0x6004, 0x9086, 0x0004, 0x1148, 0x080c, 0x3250, 0x080c, 0xd7f8,</div><div class='del'>-	0x00c6, 0x080c, 0xb306, 0x00ce, 0x0060, 0x080c, 0xd4ce, 0x0148,</div><div class='del'>-	0x080c, 0xd2e0, 0x1110, 0x080c, 0xbcb6, 0x00c6, 0x080c, 0xb2d3,</div><div class='del'>-	0x00ce, 0x9ce0, 0x0018, 0x7068, 0x9c02, 0x1208, 0x08a0, 0x012e,</div><div class='del'>-	0x000e, 0x003e, 0x00ce, 0x00ee, 0x0005, 0x00e6, 0x00c6, 0x0016,</div><div class='del'>-	0x9188, 0x1000, 0x210c, 0x81ff, 0x0128, 0x2061, 0x1ab7, 0x6112,</div><div class='del'>-	0x080c, 0x3250, 0x9006, 0x0010, 0x9085, 0x0001, 0x001e, 0x00ce,</div><div class='del'>-	0x00ee, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0xb27d,</div><div class='del'>-	0x01b0, 0x6656, 0x2b00, 0x6012, 0x080c, 0x57dd, 0x0118, 0x080c,</div><div class='del'>-	0xd207, 0x0168, 0x080c, 0xd554, 0x6023, 0x0003, 0x2009, 0x004b,</div><div class='del'>-	0x080c, 0xb352, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006,</div><div class='del'>-	0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0xbaa0, 0x080c, 0xb325,</div><div class='del'>-	0x0560, 0x6057, 0x0000, 0x2b00, 0x6012, 0x080c, 0xd554, 0x6023,</div><div class='del'>-	0x0003, 0x0016, 0x080c, 0x96a4, 0x0076, 0x903e, 0x080c, 0x9577,</div><div class='del'>-	0x2c08, 0x080c, 0xe91c, 0x007e, 0x001e, 0xd184, 0x0128, 0x080c,</div><div class='del'>-	0xb2d3, 0x9085, 0x0001, 0x0070, 0x080c, 0x57dd, 0x0128, 0xd18c,</div><div class='del'>-	0x1170, 0x080c, 0xd207, 0x0148, 0x2009, 0x004c, 0x080c, 0xb352,</div><div class='del'>-	0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x2900,</div><div class='del'>-	0x6016, 0x0c90, 0x2009, 0x004d, 0x0010, 0x2009, 0x004e, 0x00f6,</div><div class='del'>-	0x00c6, 0x0046, 0x0016, 0x080c, 0xb27d, 0x2c78, 0x05a0, 0x7e56,</div><div class='del'>-	0x2b00, 0x7812, 0x7823, 0x0003, 0x0016, 0x2021, 0x0005, 0x080c,</div><div class='del'>-	0xd219, 0x001e, 0x9186, 0x004d, 0x0118, 0x9186, 0x004e, 0x0148,</div><div class='del'>-	0x2001, 0x1980, 0x200c, 0xd1fc, 0x0168, 0x2f60, 0x080c, 0xb2d3,</div><div class='del'>-	0x00d0, 0x2001, 0x197f, 0x200c, 0xd1fc, 0x0120, 0x2f60, 0x080c,</div><div class='del'>-	0xb2d3, 0x0088, 0x2f60, 0x080c, 0x57dd, 0x0138, 0xd18c, 0x1118,</div><div class='del'>-	0x04f1, 0x0148, 0x0010, 0x2900, 0x7816, 0x001e, 0x0016, 0x080c,</div><div class='del'>-	0xb352, 0x9085, 0x0001, 0x001e, 0x004e, 0x00ce, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x00c6, 0x0046, 0x080c, 0xb27d, 0x2c78, 0x0508, 0x7e56,</div><div class='del'>-	0x2b00, 0x7812, 0x7823, 0x0003, 0x0096, 0x2021, 0x0004, 0x0489,</div><div class='del'>-	0x009e, 0x2001, 0x197e, 0x200c, 0xd1fc, 0x0120, 0x2f60, 0x080c,</div><div class='del'>-	0xb2d3, 0x0060, 0x2f60, 0x080c, 0x57dd, 0x0120, 0xd18c, 0x1160,</div><div class='del'>-	0x0071, 0x0130, 0x2009, 0x0052, 0x080c, 0xb352, 0x9085, 0x0001,</div><div class='del'>-	0x004e, 0x00ce, 0x00fe, 0x0005, 0x2900, 0x7816, 0x0c98, 0x00c6,</div><div class='del'>-	0x080c, 0x4be4, 0x00ce, 0x1120, 0x080c, 0xb2d3, 0x9006, 0x0005,</div><div class='del'>-	0xa867, 0x0000, 0xa86b, 0x8000, 0x2900, 0x6016, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x0096, 0x0076, 0x0126, 0x2091, 0x8000, 0x080c, 0x6858,</div><div class='del'>-	0x0158, 0x2001, 0xd21e, 0x0006, 0x900e, 0x2400, 0x080c, 0x710b,</div><div class='del'>-	0x080c, 0x6e9f, 0x000e, 0x0807, 0x2418, 0x080c, 0x993f, 0xbaa0,</div><div class='del'>-	0x0086, 0x2041, 0x0001, 0x2039, 0x0001, 0x2608, 0x080c, 0x96bc,</div><div class='del'>-	0x008e, 0x080c, 0x9577, 0x2f08, 0x2648, 0x080c, 0xe91c, 0xb93c,</div><div class='del'>-	0x81ff, 0x090c, 0x978f, 0x080c, 0x9ab1, 0x012e, 0x007e, 0x009e,</div><div class='del'>-	0x0005, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0xb27d, 0x0190,</div><div class='del'>-	0x660a, 0x2b08, 0x6112, 0x080c, 0xd554, 0x6023, 0x0001, 0x2900,</div><div class='del'>-	0x6016, 0x2009, 0x001f, 0x080c, 0xb352, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x00ce, 0x0005, 0x9006, 0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0xb325, 0x01b8, 0x660a, 0x2b08, 0x6112, 0x080c, 0xd554,</div><div class='del'>-	0x6023, 0x0008, 0x2900, 0x6016, 0x00f6, 0x2c78, 0x080c, 0x1768,</div><div class='del'>-	0x00fe, 0x2009, 0x0021, 0x080c, 0xb352, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x00ce, 0x0005, 0x9006, 0x0cd8, 0x2009, 0x003d, 0x00c6, 0x0126,</div><div class='del'>-	0x0016, 0x2091, 0x8000, 0x080c, 0xb27d, 0x0198, 0x660a, 0x2b08,</div><div class='del'>-	0x6112, 0x080c, 0xd554, 0x6023, 0x0001, 0x2900, 0x6016, 0x001e,</div><div class='del'>-	0x0016, 0x080c, 0xb352, 0x9085, 0x0001, 0x001e, 0x012e, 0x00ce,</div><div class='del'>-	0x0005, 0x9006, 0x0cd0, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0xb325, 0x0188, 0x2b08, 0x6112, 0x080c, 0xd554, 0x6023, 0x0001,</div><div class='del'>-	0x2900, 0x6016, 0x2009, 0x0000, 0x080c, 0xb352, 0x9085, 0x0001,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x2009, 0x0044, 0x0830,</div><div class='del'>-	0x2009, 0x0049, 0x0818, 0x0026, 0x00b6, 0x6210, 0x2258, 0xba3c,</div><div class='del'>-	0x82ff, 0x0110, 0x8211, 0xba3e, 0x00be, 0x002e, 0x0005, 0x0006,</div><div class='del'>-	0x0016, 0x6004, 0x908e, 0x0002, 0x0140, 0x908e, 0x0003, 0x0128,</div><div class='del'>-	0x908e, 0x0004, 0x0110, 0x9085, 0x0001, 0x001e, 0x000e, 0x0005,</div><div class='del'>-	0x0006, 0x0086, 0x0096, 0x6020, 0x9086, 0x0004, 0x01a8, 0x6014,</div><div class='del'>-	0x904d, 0x080c, 0xd0d8, 0x0180, 0xa864, 0x9086, 0x0139, 0x0170,</div><div class='del'>-	0x6020, 0x90c6, 0x0003, 0x0140, 0x90c6, 0x0002, 0x0128, 0xa868,</div><div class='del'>-	0xd0fc, 0x0110, 0x9006, 0x0010, 0x9085, 0x0001, 0x009e, 0x008e,</div><div class='del'>-	0x000e, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0xb325,</div><div class='del'>-	0x0198, 0x2b08, 0x6112, 0x080c, 0xd554, 0x6023, 0x0001, 0x2900,</div><div class='del'>-	0x6016, 0x080c, 0x3250, 0x2009, 0x0028, 0x080c, 0xb352, 0x9085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x9186, 0x0015,</div><div class='del'>-	0x11a8, 0x2011, 0x1824, 0x2204, 0x9086, 0x0074, 0x1178, 0x00b6,</div><div class='del'>-	0x080c, 0xbf63, 0x00be, 0x080c, 0xc1df, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0029, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x0078, 0x6014, 0x0096,</div><div class='del'>-	0x2048, 0xa868, 0x009e, 0xd0fc, 0x0148, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0xd71a, 0x080c, 0xbcb6, 0x080c, 0xb2d3, 0x0005, 0x0096, 0x6014,</div><div class='del'>-	0x904d, 0x090c, 0x0dc5, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897,</div><div class='del'>-	0x4005, 0xa89b, 0x0004, 0xa867, 0x0139, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x6e9f, 0x012e, 0x009e, 0x080c, 0xb2d3, 0x0c30, 0x0096,</div><div class='del'>-	0x9186, 0x0016, 0x1128, 0x2001, 0x0004, 0x080c, 0x666a, 0x00e8,</div><div class='del'>-	0x9186, 0x0015, 0x1510, 0x2011, 0x1824, 0x2204, 0x9086, 0x0014,</div><div class='del'>-	0x11e0, 0x6010, 0x00b6, 0x2058, 0x080c, 0x67bf, 0x00be, 0x080c,</div><div class='del'>-	0xc2b5, 0x1198, 0x6010, 0x00b6, 0x2058, 0xb890, 0x00be, 0x9005,</div><div class='del'>-	0x0160, 0x2001, 0x0006, 0x080c, 0x666a, 0x6014, 0x2048, 0xa868,</div><div class='del'>-	0xd0fc, 0x0170, 0x080c, 0xb6dc, 0x0048, 0x6014, 0x2048, 0xa868,</div><div class='del'>-	0xd0fc, 0x0528, 0x080c, 0xbcb6, 0x080c, 0xb2d3, 0x009e, 0x0005,</div><div class='del'>-	0x6014, 0x6310, 0x2358, 0x904d, 0x090c, 0x0dc5, 0xa87b, 0x0000,</div><div class='del'>-	0xa883, 0x0000, 0xa897, 0x4000, 0x900e, 0x080c, 0x6944, 0x1108,</div><div class='del'>-	0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0xa99a, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x6e9f, 0x012e, 0x080c, 0xb2d3, 0x08f8, 0x6014,</div><div class='del'>-	0x904d, 0x090c, 0x0dc5, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897,</div><div class='del'>-	0x4005, 0xa89b, 0x0004, 0xa867, 0x0139, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x6e9f, 0x012e, 0x080c, 0xb2d3, 0x0840, 0xa878, 0x9086,</div><div class='del'>-	0x0005, 0x1108, 0x0009, 0x0005, 0xa880, 0xc0ad, 0xa882, 0x0005,</div><div class='del'>-	0x6043, 0x0000, 0x6017, 0x0000, 0x6003, 0x0001, 0x6007, 0x0050,</div><div class='del'>-	0x080c, 0x94ff, 0x080c, 0x9ab1, 0x0005, 0x00c6, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb800, 0x00be, 0xd0bc, 0x0120, 0x6020, 0x9084, 0x000f,</div><div class='del'>-	0x0013, 0x00ce, 0x0005, 0xcdd9, 0xd404, 0xd404, 0xd407, 0xec80,</div><div class='del'>-	0xec9b, 0xec9e, 0xcdd9, 0xcdd9, 0xcdd9, 0xcdd9, 0xcdd9, 0xcdd9,</div><div class='del'>-	0xcdd9, 0xcdd9, 0x080c, 0x0dc5, 0xa001, 0xa001, 0x0005, 0x0096,</div><div class='del'>-	0x6014, 0x904d, 0x0118, 0xa87c, 0xd0e4, 0x1110, 0x009e, 0x0010,</div><div class='del'>-	0x009e, 0x0005, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,</div><div class='del'>-	0x0550, 0x2001, 0x1834, 0x2004, 0x9005, 0x1540, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0xb27d, 0x0508, 0x7810, 0x6012, 0x080c, 0xd554, 0x7820,</div><div class='del'>-	0x9086, 0x0003, 0x0128, 0x7808, 0x603a, 0x2f00, 0x603e, 0x0020,</div><div class='del'>-	0x7808, 0x603e, 0x2f00, 0x603a, 0x602e, 0x6023, 0x0001, 0x6007,</div><div class='del'>-	0x0035, 0x6003, 0x0001, 0x7954, 0x6156, 0x080c, 0x94ff, 0x080c,</div><div class='del'>-	0x9ab1, 0x2f60, 0x00fe, 0x0005, 0x2f60, 0x00fe, 0x2001, 0x1988,</div><div class='del'>-	0x2004, 0x6042, 0x0005, 0x0016, 0x0096, 0x6814, 0x2048, 0xa87c,</div><div class='del'>-	0xd0e4, 0x0180, 0xc0e4, 0xa87e, 0xa877, 0x0000, 0xa893, 0x0000,</div><div class='del'>-	0xa88f, 0x0000, 0xd0cc, 0x0130, 0xc0cc, 0xa87e, 0xa878, 0x2048,</div><div class='del'>-	0x080c, 0x0fc0, 0x6830, 0x6036, 0x908e, 0x0001, 0x0148, 0x6803,</div><div class='del'>-	0x0002, 0x9086, 0x0005, 0x0170, 0x9006, 0x602e, 0x6032, 0x00d0,</div><div class='del'>-	0x681c, 0xc085, 0x681e, 0x6803, 0x0004, 0x6824, 0xc0f4, 0x9085,</div><div class='del'>-	0x0c00, 0x6826, 0x6814, 0x2048, 0xa8ac, 0x6938, 0x9102, 0xa8b0,</div><div class='del'>-	0x693c, 0x9103, 0x1e48, 0x683c, 0x602e, 0x6838, 0x9084, 0xfffc,</div><div class='del'>-	0x683a, 0x6032, 0x2d00, 0x603a, 0x6808, 0x603e, 0x6910, 0x6112,</div><div class='del'>-	0x6954, 0x6156, 0x6023, 0x0001, 0x6007, 0x0039, 0x6003, 0x0001,</div><div class='del'>-	0x080c, 0x94ff, 0x080c, 0x9ab1, 0x009e, 0x001e, 0x0005, 0x6024,</div><div class='del'>-	0xd0d4, 0x0510, 0xd0f4, 0x11f8, 0x6038, 0x940a, 0x603c, 0x9303,</div><div class='del'>-	0x0230, 0x9105, 0x0120, 0x6024, 0xc0d4, 0xc0f5, 0x0098, 0x643a,</div><div class='del'>-	0x633e, 0xac3e, 0xab42, 0x0046, 0x0036, 0x2400, 0xacac, 0x9402,</div><div class='del'>-	0xa836, 0x2300, 0xabb0, 0x9303, 0xa83a, 0x003e, 0x004e, 0x6024,</div><div class='del'>-	0xc0d4, 0x0000, 0x6026, 0x0005, 0xd0f4, 0x1138, 0xa83c, 0x603a,</div><div class='del'>-	0xa840, 0x603e, 0x6024, 0xc0f5, 0x6026, 0x0005, 0x0006, 0x0016,</div><div class='del'>-	0x6004, 0x908e, 0x0034, 0x01b8, 0x908e, 0x0035, 0x01a0, 0x908e,</div><div class='del'>-	0x0036, 0x0188, 0x908e, 0x0037, 0x0170, 0x908e, 0x0038, 0x0158,</div><div class='del'>-	0x908e, 0x0039, 0x0140, 0x908e, 0x003a, 0x0128, 0x908e, 0x003b,</div><div class='del'>-	0x0110, 0x9085, 0x0001, 0x001e, 0x000e, 0x0005, 0x0006, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x00e6, 0x2001, 0x1982, 0x200c, 0x8000, 0x2014,</div><div class='del'>-	0x2001, 0x0032, 0x080c, 0x9375, 0x2001, 0x1986, 0x82ff, 0x1110,</div><div class='del'>-	0x2011, 0x0014, 0x2202, 0x2001, 0x1984, 0x200c, 0x8000, 0x2014,</div><div class='del'>-	0x2071, 0x196c, 0x711a, 0x721e, 0x2001, 0x0064, 0x080c, 0x9375,</div><div class='del'>-	0x2001, 0x1987, 0x82ff, 0x1110, 0x2011, 0x0014, 0x2202, 0x2001,</div><div class='del'>-	0x1988, 0x9288, 0x000a, 0x2102, 0x2001, 0x1a98, 0x2102, 0x2001,</div><div class='del'>-	0x0032, 0x080c, 0x1611, 0x080c, 0x6a84, 0x00ee, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x0006, 0x0016, 0x00e6, 0x2001, 0x1986,</div><div class='del'>-	0x2003, 0x0028, 0x2001, 0x1987, 0x2003, 0x0014, 0x2071, 0x196c,</div><div class='del'>-	0x701b, 0x0000, 0x701f, 0x07d0, 0x2001, 0x1988, 0x2009, 0x001e,</div><div class='del'>-	0x2102, 0x2001, 0x1a98, 0x2102, 0x2001, 0x0032, 0x080c, 0x1611,</div><div class='del'>-	0x00ee, 0x001e, 0x000e, 0x0005, 0x0096, 0x6058, 0x904d, 0x0110,</div><div class='del'>-	0x080c, 0x1040, 0x009e, 0x0005, 0x0005, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xb27d, 0x0180, 0x2b08, 0x6112, 0x0ca9, 0x6023,</div><div class='del'>-	0x0001, 0x2900, 0x6016, 0x2009, 0x0033, 0x080c, 0xb352, 0x9085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x0096, 0x00e6,</div><div class='del'>-	0x00f6, 0x2071, 0x1800, 0x9186, 0x0015, 0x1520, 0x7090, 0x9086,</div><div class='del'>-	0x0018, 0x0120, 0x7090, 0x9086, 0x0014, 0x11e0, 0x6014, 0x2048,</div><div class='del'>-	0xaa3c, 0xd2e4, 0x1160, 0x2c78, 0x080c, 0x9d4c, 0x01d8, 0x707c,</div><div class='del'>-	0xaa50, 0x9206, 0x1160, 0x7080, 0xaa54, 0x9206, 0x1140, 0x6210,</div><div class='del'>-	0x00b6, 0x2258, 0xbaa0, 0x00be, 0x900e, 0x080c, 0x3299, 0x080c,</div><div class='del'>-	0xb6dc, 0x0020, 0x080c, 0xbcb6, 0x080c, 0xb2d3, 0x00fe, 0x00ee,</div><div class='del'>-	0x009e, 0x0005, 0x7060, 0xaa54, 0x9206, 0x0d48, 0x0c80, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0xb27d, 0x0188, 0x2b08, 0x6112,</div><div class='del'>-	0x080c, 0xd554, 0x6023, 0x0001, 0x2900, 0x6016, 0x2009, 0x004d,</div><div class='del'>-	0x080c, 0xb352, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006,</div><div class='del'>-	0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x0016, 0x080c, 0xb27d,</div><div class='del'>-	0x0180, 0x2b08, 0x6112, 0x080c, 0xd554, 0x6023, 0x0001, 0x2900,</div><div class='del'>-	0x6016, 0x001e, 0x080c, 0xb352, 0x9085, 0x0001, 0x012e, 0x00ce,</div><div class='del'>-	0x0005, 0x001e, 0x9006, 0x0cd0, 0x0016, 0x0026, 0x0036, 0x0046,</div><div class='del'>-	0x0056, 0x0066, 0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186,</div><div class='del'>-	0x0015, 0x1568, 0x7190, 0x6014, 0x2048, 0xa814, 0x8003, 0x9106,</div><div class='del'>-	0x1530, 0x20e1, 0x0000, 0x2001, 0x19a1, 0x2003, 0x0000, 0x6014,</div><div class='del'>-	0x2048, 0xa830, 0x20a8, 0x8906, 0x8006, 0x8007, 0x9094, 0x003f,</div><div class='del'>-	0x22e8, 0x9084, 0xffc0, 0x9080, 0x001b, 0x20a0, 0x2001, 0x19a1,</div><div class='del'>-	0x0016, 0x200c, 0x080c, 0xde2e, 0x001e, 0xa804, 0x9005, 0x0110,</div><div class='del'>-	0x2048, 0x0c38, 0x6014, 0x2048, 0xa867, 0x0103, 0x0010, 0x080c,</div><div class='del'>-	0xbcb6, 0x080c, 0xb2d3, 0x00fe, 0x00ee, 0x009e, 0x006e, 0x005e,</div><div class='del'>-	0x004e, 0x003e, 0x002e, 0x001e, 0x0005, 0x0096, 0x00e6, 0x00f6,</div><div class='del'>-	0x2071, 0x1800, 0x9186, 0x0015, 0x11b8, 0x7090, 0x9086, 0x0004,</div><div class='del'>-	0x1198, 0x6014, 0x2048, 0x2c78, 0x080c, 0x9d4c, 0x01a8, 0x707c,</div><div class='del'>-	0xaa74, 0x9206, 0x1130, 0x7080, 0xaa78, 0x9206, 0x1110, 0x080c,</div><div class='del'>-	0x3250, 0x080c, 0xb6dc, 0x0020, 0x080c, 0xbcb6, 0x080c, 0xb2d3,</div><div class='del'>-	0x00fe, 0x00ee, 0x009e, 0x0005, 0x7060, 0xaa78, 0x9206, 0x0d78,</div><div class='del'>-	0x0c80, 0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186, 0x0015,</div><div class='del'>-	0x1550, 0x7090, 0x9086, 0x0004, 0x1530, 0x6014, 0x2048, 0x2c78,</div><div class='del'>-	0x080c, 0x9d4c, 0x05f0, 0x707c, 0xaacc, 0x9206, 0x1180, 0x7080,</div><div class='del'>-	0xaad0, 0x9206, 0x1160, 0x080c, 0x3250, 0x0016, 0xa998, 0xaab0,</div><div class='del'>-	0x9284, 0x1000, 0xc0fd, 0x080c, 0x5784, 0x001e, 0x0010, 0x080c,</div><div class='del'>-	0x556f, 0x080c, 0xd0d8, 0x0508, 0xa87b, 0x0000, 0xa883, 0x0000,</div><div class='del'>-	0xa897, 0x4000, 0x0080, 0x080c, 0xd0d8, 0x01b8, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0x556f, 0x1d70, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897,</div><div class='del'>-	0x4005, 0xa89b, 0x0004, 0x0126, 0x2091, 0x8000, 0xa867, 0x0139,</div><div class='del'>-	0x080c, 0x6e9f, 0x012e, 0x080c, 0xb2d3, 0x00fe, 0x00ee, 0x009e,</div><div class='del'>-	0x0005, 0x7060, 0xaad0, 0x9206, 0x0930, 0x0888, 0x0016, 0x0026,</div><div class='del'>-	0xa87c, 0xd0ac, 0x0178, 0xa938, 0xaa34, 0x2100, 0x9205, 0x0150,</div><div class='del'>-	0xa890, 0x9106, 0x1118, 0xa88c, 0x9206, 0x0120, 0xa992, 0xaa8e,</div><div class='del'>-	0x9085, 0x0001, 0x002e, 0x001e, 0x0005, 0x00b6, 0x00d6, 0x0036,</div><div class='del'>-	0x080c, 0xd0d8, 0x0904, 0xd716, 0x0096, 0x6314, 0x2348, 0xa87a,</div><div class='del'>-	0xa982, 0x929e, 0x4000, 0x1580, 0x6310, 0x00c6, 0x2358, 0x2009,</div><div class='del'>-	0x0000, 0xa868, 0xd0f4, 0x1140, 0x080c, 0x6944, 0x1108, 0xc185,</div><div class='del'>-	0xb800, 0xd0bc, 0x0108, 0xc18d, 0xaa96, 0xa99a, 0x20a9, 0x0004,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x0031, 0x20a0, 0xb8c4, 0x20e0,</div><div class='del'>-	0xb8c8, 0x9080, 0x0006, 0x2098, 0x080c, 0x0f8b, 0x20a9, 0x0004,</div><div class='del'>-	0xa85c, 0x9080, 0x0035, 0x20a0, 0xb8c8, 0x9080, 0x000a, 0x2098,</div><div class='del'>-	0x080c, 0x0f8b, 0x00ce, 0x0090, 0xaa96, 0x3918, 0x9398, 0x0007,</div><div class='del'>-	0x231c, 0x6004, 0x9086, 0x0016, 0x0110, 0xa89b, 0x0004, 0xaba2,</div><div class='del'>-	0x6310, 0x2358, 0xb804, 0x9084, 0x00ff, 0xa89e, 0xa868, 0xc0f4,</div><div class='del'>-	0xa86a, 0x080c, 0x6e92, 0x6017, 0x0000, 0x009e, 0x003e, 0x00de,</div><div class='del'>-	0x00be, 0x0005, 0x0026, 0x0036, 0x0046, 0x00b6, 0x0096, 0x00f6,</div><div class='del'>-	0x6214, 0x2248, 0x6210, 0x2258, 0x2079, 0x0260, 0x9096, 0x0000,</div><div class='del'>-	0x11a0, 0xb814, 0x9084, 0x00ff, 0x900e, 0x080c, 0x2873, 0x2118,</div><div class='del'>-	0x831f, 0x939c, 0xff00, 0x7838, 0x9084, 0x00ff, 0x931d, 0x7c3c,</div><div class='del'>-	0x2011, 0x8018, 0x080c, 0x4c44, 0x00a8, 0x9096, 0x0001, 0x1148,</div><div class='del'>-	0x89ff, 0x0180, 0xa89b, 0x000d, 0x7838, 0xa8a6, 0x783c, 0xa8aa,</div><div class='del'>-	0x0048, 0x9096, 0x0002, 0x1130, 0xa89b, 0x000d, 0x7838, 0xa8a6,</div><div class='del'>-	0x783c, 0xa8aa, 0x00fe, 0x009e, 0x00be, 0x004e, 0x003e, 0x002e,</div><div class='del'>-	0x0005, 0x00c6, 0x0026, 0x0016, 0x9186, 0x0035, 0x0110, 0x6a38,</div><div class='del'>-	0x0008, 0x6a2c, 0x080c, 0xd0c6, 0x01f0, 0x2260, 0x6120, 0x9186,</div><div class='del'>-	0x0003, 0x0118, 0x9186, 0x0006, 0x1190, 0x6838, 0x9206, 0x0140,</div><div class='del'>-	0x683c, 0x9206, 0x1160, 0x6108, 0x6838, 0x9106, 0x1140, 0x0020,</div><div class='del'>-	0x6008, 0x693c, 0x9106, 0x1118, 0x6010, 0x6910, 0x9106, 0x001e,</div><div class='del'>-	0x002e, 0x00ce, 0x0005, 0x9085, 0x0001, 0x0cc8, 0xa974, 0xd1cc,</div><div class='del'>-	0x0198, 0x918c, 0x00ff, 0x918e, 0x0002, 0x1170, 0xa9a8, 0x918c,</div><div class='del'>-	0x000f, 0x918e, 0x0001, 0x1140, 0xa87c, 0xd0ac, 0x0128, 0xa834,</div><div class='del'>-	0xa938, 0x9115, 0x190c, 0xc78b, 0x0005, 0x0036, 0x2019, 0x0001,</div><div class='del'>-	0x0010, 0x0036, 0x901e, 0x0499, 0x01e0, 0x080c, 0xd0d8, 0x01c8,</div><div class='del'>-	0x080c, 0xd2c3, 0x6037, 0x4000, 0x6014, 0x6017, 0x0000, 0x0096,</div><div class='del'>-	0x2048, 0xa87c, 0x080c, 0xd2e0, 0x1118, 0x080c, 0xbcb6, 0x0040,</div><div class='del'>-	0xa867, 0x0103, 0xa877, 0x0000, 0x83ff, 0x1129, 0x080c, 0x6e9f,</div><div class='del'>-	0x009e, 0x003e, 0x0005, 0xa880, 0xd0b4, 0x0128, 0xa87b, 0x0006,</div><div class='del'>-	0xc0ec, 0xa882, 0x0048, 0xd0bc, 0x0118, 0xa87b, 0x0002, 0x0020,</div><div class='del'>-	0xa87b, 0x0005, 0x080c, 0xd3d4, 0xa877, 0x0000, 0x0005, 0x2001,</div><div class='del'>-	0x1810, 0x2004, 0xd0ec, 0x0005, 0x0006, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0xd0f4, 0x000e, 0x0005, 0x0006, 0x2001, 0x1810, 0x2004, 0xd0e4,</div><div class='del'>-	0x000e, 0x0005, 0x0036, 0x0046, 0x6010, 0x00b6, 0x2058, 0xbba0,</div><div class='del'>-	0x00be, 0x2021, 0x0007, 0x080c, 0x4dfb, 0x004e, 0x003e, 0x0005,</div><div class='del'>-	0x0c51, 0x1d81, 0x0005, 0x2001, 0x1986, 0x2004, 0x601a, 0x0005,</div><div class='del'>-	0x2001, 0x1988, 0x2004, 0x6042, 0x0005, 0x080c, 0xb2d3, 0x0804,</div><div class='del'>-	0x9ab1, 0x2001, 0x0109, 0x2004, 0xd084, 0x01e0, 0x0126, 0x2091,</div><div class='del'>-	0x2800, 0x0006, 0x0016, 0x0026, 0x0036, 0x00f6, 0x00e6, 0x00c6,</div><div class='del'>-	0x2079, 0x19e8, 0x2071, 0x1800, 0x2061, 0x0100, 0x080c, 0x93e2,</div><div class='del'>-	0x00ce, 0x00ee, 0x00fe, 0x003e, 0x002e, 0x001e, 0x000e, 0x012e,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x00b6, 0x0066, 0x6000, 0x90b2, 0x0010,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x001b, 0x006e, 0x00be, 0x0005, 0xd846, 0xdf8d,</div><div class='del'>-	0xe102, 0xd846, 0xd846, 0xd846, 0xd846, 0xd846, 0xd87d, 0xe186,</div><div class='del'>-	0xd846, 0xd846, 0xd846, 0xd846, 0xd846, 0xd846, 0x080c, 0x0dc5,</div><div class='del'>-	0x0066, 0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0dc5, 0x0013, 0x006e,</div><div class='del'>-	0x0005, 0xd861, 0xe6d5, 0xd861, 0xd861, 0xd861, 0xd861, 0xd861,</div><div class='del'>-	0xd861, 0xe682, 0xe729, 0xd861, 0xedb4, 0xedea, 0xedb4, 0xedea,</div><div class='del'>-	0xd861, 0x080c, 0x0dc5, 0x6000, 0x9082, 0x0010, 0x1a0c, 0x0dc5,</div><div class='del'>-	0x6000, 0x000a, 0x0005, 0xd87b, 0xe364, 0xe433, 0xe456, 0xe516,</div><div class='del'>-	0xd87b, 0xe5f5, 0xe59e, 0xe192, 0xe658, 0xe66d, 0xd87b, 0xd87b,</div><div class='del'>-	0xd87b, 0xd87b, 0xd87b, 0x080c, 0x0dc5, 0x91b2, 0x0053, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x2100, 0x91b2, 0x0040, 0x1a04, 0xdcfd, 0x0002, 0xd8c7,</div><div class='del'>-	0xdacb, 0xd8c7, 0xd8c7, 0xd8c7, 0xdad4, 0xd8c7, 0xd8c7, 0xd8c7,</div><div class='del'>-	0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7,</div><div class='del'>-	0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c9, 0xd92c,</div><div class='del'>-	0xd93b, 0xd99f, 0xd9ca, 0xda43, 0xdab6, 0xd8c7, 0xd8c7, 0xdad7,</div><div class='del'>-	0xd8c7, 0xd8c7, 0xdaec, 0xdaf9, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7,</div><div class='del'>-	0xd8c7, 0xdb9f, 0xd8c7, 0xd8c7, 0xdbb3, 0xd8c7, 0xd8c7, 0xdb6e,</div><div class='del'>-	0xd8c7, 0xd8c7, 0xd8c7, 0xdbcb, 0xd8c7, 0xd8c7, 0xd8c7, 0xdc48,</div><div class='del'>-	0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xd8c7, 0xdcc5, 0x080c,</div><div class='del'>-	0x0dc5, 0x080c, 0x6a61, 0x1150, 0x2001, 0x1837, 0x2004, 0xd0cc,</div><div class='del'>-	0x1128, 0x9084, 0x0009, 0x9086, 0x0008, 0x1140, 0x6007, 0x0009,</div><div class='del'>-	0x602f, 0x0009, 0x6017, 0x0000, 0x0804, 0xdac4, 0x080c, 0x69fd,</div><div class='del'>-	0x00e6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x6210, 0x2258, 0xbaa0,</div><div class='del'>-	0x0026, 0x2019, 0x0029, 0x080c, 0x96a4, 0x0076, 0x903e, 0x080c,</div><div class='del'>-	0x9577, 0x2c08, 0x080c, 0xe91c, 0x007e, 0x001e, 0x001e, 0x002e,</div><div class='del'>-	0x003e, 0x00ce, 0x00ee, 0x6610, 0x2658, 0x080c, 0x6733, 0xbe04,</div><div class='del'>-	0x9684, 0x00ff, 0x9082, 0x0006, 0x1268, 0x0016, 0x0026, 0x6210,</div><div class='del'>-	0x00b6, 0x2258, 0xbaa0, 0x00be, 0x2c08, 0x080c, 0xf015, 0x002e,</div><div class='del'>-	0x001e, 0x1178, 0x080c, 0xe84e, 0x1904, 0xd997, 0x080c, 0xe7ea,</div><div class='del'>-	0x1120, 0x6007, 0x0008, 0x0804, 0xdac4, 0x6007, 0x0009, 0x0804,</div><div class='del'>-	0xdac4, 0x080c, 0xeab9, 0x0128, 0x080c, 0xe84e, 0x0d78, 0x0804,</div><div class='del'>-	0xd997, 0x6017, 0x1900, 0x0c88, 0x080c, 0x3374, 0x1904, 0xdcfa,</div><div class='del'>-	0x6106, 0x080c, 0xe78e, 0x6007, 0x0006, 0x0804, 0xdac4, 0x6007,</div><div class='del'>-	0x0007, 0x0804, 0xdac4, 0x080c, 0xee26, 0x1904, 0xdcfa, 0x080c,</div><div class='del'>-	0x3374, 0x1904, 0xdcfa, 0x00d6, 0x6610, 0x2658, 0xbe04, 0x9684,</div><div class='del'>-	0x00ff, 0x9082, 0x0006, 0x1220, 0x2001, 0x0001, 0x080c, 0x6656,</div><div class='del'>-	0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x0188, 0x9686, 0x0004,</div><div class='del'>-	0x0170, 0xbe04, 0x96b4, 0x00ff, 0x9686, 0x0006, 0x0140, 0x9686,</div><div class='del'>-	0x0004, 0x0128, 0x9686, 0x0005, 0x0110, 0x00de, 0x0480, 0x00e6,</div><div class='del'>-	0x2071, 0x0260, 0x7034, 0x9084, 0x0003, 0x1140, 0x7034, 0x9082,</div><div class='del'>-	0x0014, 0x0220, 0x7030, 0x9084, 0x0003, 0x0130, 0x00ee, 0x6017,</div><div class='del'>-	0x0000, 0x602f, 0x0007, 0x00b0, 0x00ee, 0x080c, 0xe8b2, 0x1190,</div><div class='del'>-	0x9686, 0x0006, 0x1140, 0x0026, 0x6210, 0x2258, 0xbaa0, 0x900e,</div><div class='del'>-	0x080c, 0x3299, 0x002e, 0x080c, 0x67bf, 0x6007, 0x000a, 0x00de,</div><div class='del'>-	0x0804, 0xdac4, 0x6007, 0x000b, 0x00de, 0x0804, 0xdac4, 0x080c,</div><div class='del'>-	0x3250, 0x080c, 0xd7f8, 0x6007, 0x0001, 0x0804, 0xdac4, 0x080c,</div><div class='del'>-	0xee26, 0x1904, 0xdcfa, 0x080c, 0x3374, 0x1904, 0xdcfa, 0x2071,</div><div class='del'>-	0x0260, 0x7034, 0x90b4, 0x0003, 0x1948, 0x90b2, 0x0014, 0x0a30,</div><div class='del'>-	0x7030, 0x9084, 0x0003, 0x1910, 0x6610, 0x2658, 0xbe04, 0x9686,</div><div class='del'>-	0x0707, 0x09e8, 0x0026, 0x6210, 0x2258, 0xbaa0, 0x900e, 0x080c,</div><div class='del'>-	0x3299, 0x002e, 0x6007, 0x000c, 0x2001, 0x0001, 0x080c, 0xeff4,</div><div class='del'>-	0x0804, 0xdac4, 0x080c, 0x6a61, 0x1140, 0x2001, 0x1837, 0x2004,</div><div class='del'>-	0x9084, 0x0009, 0x9086, 0x0008, 0x1110, 0x0804, 0xd8d6, 0x080c,</div><div class='del'>-	0x69fd, 0x6610, 0x2658, 0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006,</div><div class='del'>-	0x06c8, 0x1138, 0x0026, 0x2001, 0x0006, 0x080c, 0x6696, 0x002e,</div><div class='del'>-	0x0050, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0004, 0x0120, 0x9686,</div><div class='del'>-	0x0006, 0x1904, 0xd997, 0x080c, 0xe8bf, 0x1120, 0x6007, 0x000e,</div><div class='del'>-	0x0804, 0xdac4, 0x0046, 0x6410, 0x2458, 0xbca0, 0x0046, 0x080c,</div><div class='del'>-	0x3250, 0x080c, 0xd7f8, 0x004e, 0x0016, 0x9006, 0x2009, 0x1848,</div><div class='del'>-	0x210c, 0xd1a4, 0x0148, 0x2009, 0x0029, 0x080c, 0xec31, 0x6010,</div><div class='del'>-	0x2058, 0xb800, 0xc0e5, 0xb802, 0x001e, 0x004e, 0x6007, 0x0001,</div><div class='del'>-	0x0804, 0xdac4, 0x2001, 0x0001, 0x080c, 0x6656, 0x0156, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x20a9, 0x0004, 0x2019, 0x1805, 0x2011, 0x0270,</div><div class='del'>-	0x080c, 0xc365, 0x003e, 0x002e, 0x001e, 0x015e, 0x9005, 0x0168,</div><div class='del'>-	0x96b4, 0xff00, 0x8637, 0x9682, 0x0004, 0x0a04, 0xd997, 0x9682,</div><div class='del'>-	0x0007, 0x0a04, 0xd9f3, 0x0804, 0xd997, 0x6017, 0x1900, 0x6007,</div><div class='del'>-	0x0009, 0x0804, 0xdac4, 0x080c, 0x6a61, 0x1140, 0x2001, 0x1837,</div><div class='del'>-	0x2004, 0x9084, 0x0009, 0x9086, 0x0008, 0x1110, 0x0804, 0xd8d6,</div><div class='del'>-	0x080c, 0x69fd, 0x6610, 0x2658, 0xbe04, 0x9684, 0x00ff, 0x0006,</div><div class='del'>-	0x0016, 0x908e, 0x0001, 0x0118, 0x908e, 0x0000, 0x1118, 0x001e,</div><div class='del'>-	0x000e, 0x0080, 0x001e, 0x000e, 0x9082, 0x0006, 0x06a0, 0x0150,</div><div class='del'>-	0x96b4, 0xff00, 0x8637, 0x9686, 0x0004, 0x0120, 0x9686, 0x0006,</div><div class='del'>-	0x1904, 0xd997, 0x080c, 0xe8ed, 0x1138, 0x080c, 0xe7ea, 0x1120,</div><div class='del'>-	0x6007, 0x0010, 0x0804, 0xdac4, 0x0046, 0x6410, 0x2458, 0xbca0,</div><div class='del'>-	0x0046, 0x080c, 0x3250, 0x080c, 0xd7f8, 0x004e, 0x0016, 0x9006,</div><div class='del'>-	0x2009, 0x1848, 0x210c, 0xd1a4, 0x0148, 0x2009, 0x0029, 0x080c,</div><div class='del'>-	0xec31, 0x6010, 0x2058, 0xb800, 0xc0e5, 0xb802, 0x001e, 0x004e,</div><div class='del'>-	0x6007, 0x0001, 0x0448, 0x080c, 0xeab9, 0x0198, 0x0016, 0x968c,</div><div class='del'>-	0x00ff, 0x9186, 0x0002, 0x0160, 0x9186, 0x0003, 0x0148, 0x001e,</div><div class='del'>-	0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x0920, 0x0804, 0xd997,</div><div class='del'>-	0x001e, 0x6017, 0x1900, 0x6007, 0x0009, 0x0070, 0x080c, 0x3374,</div><div class='del'>-	0x1904, 0xdcfa, 0x080c, 0xee26, 0x1904, 0xdcfa, 0x080c, 0xdecb,</div><div class='del'>-	0x1904, 0xd997, 0x6007, 0x0012, 0x6003, 0x0001, 0x080c, 0x9547,</div><div class='del'>-	0x080c, 0x9ab1, 0x0005, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x9547, 0x080c, 0x9ab1, 0x0cb0, 0x6007, 0x0005, 0x0c68, 0x080c,</div><div class='del'>-	0xee26, 0x1904, 0xdcfa, 0x080c, 0x3374, 0x1904, 0xdcfa, 0x080c,</div><div class='del'>-	0xdecb, 0x1904, 0xd997, 0x6007, 0x0020, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x9547, 0x080c, 0x9ab1, 0x0005, 0x080c, 0x3374, 0x1904, 0xdcfa,</div><div class='del'>-	0x6007, 0x0023, 0x6003, 0x0001, 0x080c, 0x9547, 0x080c, 0x9ab1,</div><div class='del'>-	0x0005, 0x080c, 0xee26, 0x1904, 0xdcfa, 0x080c, 0x3374, 0x1904,</div><div class='del'>-	0xdcfa, 0x080c, 0xdecb, 0x1904, 0xd997, 0x0016, 0x0026, 0x00e6,</div><div class='del'>-	0x2071, 0x0260, 0x2c08, 0x2011, 0x1820, 0x2214, 0x703c, 0x9206,</div><div class='del'>-	0x11e0, 0x2011, 0x181f, 0x2214, 0x7038, 0x9084, 0x00ff, 0x9206,</div><div class='del'>-	0x11a0, 0x7240, 0x080c, 0xd0c6, 0x0570, 0x2260, 0x6008, 0x9086,</div><div class='del'>-	0xffff, 0x0120, 0x7244, 0x6008, 0x9206, 0x1528, 0x6020, 0x9086,</div><div class='del'>-	0x0007, 0x1508, 0x080c, 0xb2d3, 0x04a0, 0x7244, 0x9286, 0xffff,</div><div class='del'>-	0x0180, 0x2c08, 0x080c, 0xd0c6, 0x01b0, 0x2260, 0x7240, 0x6008,</div><div class='del'>-	0x9206, 0x1188, 0x6010, 0x9190, 0x0004, 0x2214, 0x9206, 0x01b8,</div><div class='del'>-	0x0050, 0x7240, 0x2c08, 0x9006, 0x080c, 0xebfb, 0x1180, 0x7244,</div><div class='del'>-	0x9286, 0xffff, 0x01b0, 0x2160, 0x6007, 0x0026, 0x6017, 0x1700,</div><div class='del'>-	0x7214, 0x9296, 0xffff, 0x1180, 0x6007, 0x0025, 0x0068, 0x6020,</div><div class='del'>-	0x9086, 0x0007, 0x1d80, 0x6004, 0x9086, 0x0024, 0x1110, 0x080c,</div><div class='del'>-	0xb2d3, 0x2160, 0x6007, 0x0025, 0x6003, 0x0001, 0x080c, 0x9547,</div><div class='del'>-	0x080c, 0x9ab1, 0x00ee, 0x002e, 0x001e, 0x0005, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x6656, 0x0156, 0x0016, 0x0026, 0x0036, 0x20a9, 0x0004,</div><div class='del'>-	0x2019, 0x1805, 0x2011, 0x0276, 0x080c, 0xc365, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x015e, 0x0120, 0x6007, 0x0031, 0x0804, 0xdac4, 0x080c,</div><div class='del'>-	0xbf7b, 0x080c, 0x7637, 0x1190, 0x0006, 0x0026, 0x0036, 0x080c,</div><div class='del'>-	0x7651, 0x1138, 0x080c, 0x7932, 0x080c, 0x612e, 0x080c, 0x7563,</div><div class='del'>-	0x0010, 0x080c, 0x760f, 0x003e, 0x002e, 0x000e, 0x0005, 0x080c,</div><div class='del'>-	0x3374, 0x1904, 0xdcfa, 0x080c, 0xdecb, 0x1904, 0xd997, 0x6106,</div><div class='del'>-	0x080c, 0xdee7, 0x1120, 0x6007, 0x002b, 0x0804, 0xdac4, 0x6007,</div><div class='del'>-	0x002c, 0x0804, 0xdac4, 0x080c, 0xee26, 0x1904, 0xdcfa, 0x080c,</div><div class='del'>-	0x3374, 0x1904, 0xdcfa, 0x080c, 0xdecb, 0x1904, 0xd997, 0x6106,</div><div class='del'>-	0x080c, 0xdeec, 0x1120, 0x6007, 0x002e, 0x0804, 0xdac4, 0x6007,</div><div class='del'>-	0x002f, 0x0804, 0xdac4, 0x080c, 0x3374, 0x1904, 0xdcfa, 0x00e6,</div><div class='del'>-	0x00d6, 0x00c6, 0x6010, 0x2058, 0xb904, 0x9184, 0x00ff, 0x9086,</div><div class='del'>-	0x0006, 0x0158, 0x9184, 0xff00, 0x8007, 0x9086, 0x0006, 0x0128,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x0804, 0xdacb, 0x080c, 0x57d9, 0xd0e4,</div><div class='del'>-	0x0904, 0xdc45, 0x2071, 0x026c, 0x7010, 0x603a, 0x7014, 0x603e,</div><div class='del'>-	0x7108, 0x720c, 0x080c, 0x6a9f, 0x0140, 0x6010, 0x2058, 0xb810,</div><div class='del'>-	0x9106, 0x1118, 0xb814, 0x9206, 0x0510, 0x080c, 0x6a9b, 0x15b8,</div><div class='del'>-	0x2069, 0x1800, 0x6880, 0x9206, 0x1590, 0x687c, 0x9106, 0x1578,</div><div class='del'>-	0x7210, 0x080c, 0xd0c6, 0x0590, 0x080c, 0xddb8, 0x0578, 0x080c,</div><div class='del'>-	0xecad, 0x0560, 0x622e, 0x6007, 0x0036, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x94ff, 0x080c, 0x9ab1, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x7214,</div><div class='del'>-	0x9286, 0xffff, 0x0150, 0x080c, 0xd0c6, 0x01c0, 0x9280, 0x0002,</div><div class='del'>-	0x2004, 0x7110, 0x9106, 0x1190, 0x08e0, 0x7210, 0x2c08, 0x9085,</div><div class='del'>-	0x0001, 0x080c, 0xebfb, 0x2c10, 0x2160, 0x0140, 0x0890, 0x6007,</div><div class='del'>-	0x0037, 0x602f, 0x0009, 0x6017, 0x1500, 0x08b8, 0x6007, 0x0037,</div><div class='del'>-	0x602f, 0x0003, 0x6017, 0x1700, 0x0880, 0x6007, 0x0012, 0x0868,</div><div class='del'>-	0x080c, 0x3374, 0x1904, 0xdcfa, 0x6010, 0x2058, 0xb804, 0x9084,</div><div class='del'>-	0xff00, 0x8007, 0x9086, 0x0006, 0x1904, 0xdacb, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x080c, 0x57d9, 0xd0e4, 0x0904, 0xdcbd, 0x2069, 0x1800,</div><div class='del'>-	0x2071, 0x026c, 0x7008, 0x603a, 0x720c, 0x623e, 0x9286, 0xffff,</div><div class='del'>-	0x1150, 0x7208, 0x00c6, 0x2c08, 0x9085, 0x0001, 0x080c, 0xebfb,</div><div class='del'>-	0x2c10, 0x00ce, 0x05e8, 0x080c, 0xd0c6, 0x05d0, 0x7108, 0x9280,</div><div class='del'>-	0x0002, 0x2004, 0x9106, 0x15a0, 0x00c6, 0x0026, 0x2260, 0x080c,</div><div class='del'>-	0xcce6, 0x002e, 0x00ce, 0x7118, 0x918c, 0xff00, 0x810f, 0x9186,</div><div class='del'>-	0x0001, 0x0178, 0x9186, 0x0005, 0x0118, 0x9186, 0x0007, 0x1198,</div><div class='del'>-	0x9280, 0x0005, 0x2004, 0x9005, 0x0170, 0x080c, 0xddb8, 0x0904,</div><div class='del'>-	0xdc3e, 0x0056, 0x7510, 0x7614, 0x080c, 0xecc6, 0x005e, 0x00ce,</div><div class='del'>-	0x00de, 0x00ee, 0x0005, 0x6007, 0x003b, 0x602f, 0x0009, 0x6017,</div><div class='del'>-	0x2a00, 0x6003, 0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x0c78,</div><div class='del'>-	0x6007, 0x003b, 0x602f, 0x0003, 0x6017, 0x0300, 0x6003, 0x0001,</div><div class='del'>-	0x080c, 0x94ff, 0x080c, 0x9ab1, 0x0c10, 0x6007, 0x003b, 0x602f,</div><div class='del'>-	0x000b, 0x6017, 0x0000, 0x0804, 0xdc15, 0x00e6, 0x0026, 0x080c,</div><div class='del'>-	0x6a61, 0x0550, 0x080c, 0x69fd, 0x080c, 0xee97, 0x1518, 0x2071,</div><div class='del'>-	0x1800, 0x70dc, 0x9085, 0x0003, 0x70de, 0x00f6, 0x2079, 0x0100,</div><div class='del'>-	0x72b0, 0x9284, 0x00ff, 0x707e, 0x78e6, 0x9284, 0xff00, 0x7280,</div><div class='del'>-	0x9205, 0x7082, 0x78ea, 0x00fe, 0x70e7, 0x0000, 0x080c, 0x6a9f,</div><div class='del'>-	0x0120, 0x2011, 0x1a01, 0x2013, 0x07d0, 0xd0ac, 0x1128, 0x080c,</div><div class='del'>-	0x3000, 0x0010, 0x080c, 0xeecb, 0x002e, 0x00ee, 0x080c, 0xb2d3,</div><div class='del'>-	0x0804, 0xdaca, 0x080c, 0xb2d3, 0x0005, 0x2600, 0x0002, 0xdd11,</div><div class='del'>-	0xdd3f, 0xdd50, 0xdd11, 0xdd11, 0xdd13, 0xdd61, 0xdd11, 0xdd11,</div><div class='del'>-	0xdd11, 0xdd2d, 0xdd11, 0xdd11, 0xdd11, 0xdd6c, 0xdd82, 0xddb3,</div><div class='del'>-	0xdd11, 0x080c, 0x0dc5, 0x080c, 0xee26, 0x1d20, 0x080c, 0x3374,</div><div class='del'>-	0x1d08, 0x7038, 0x6016, 0x6007, 0x0045, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x9547, 0x0005, 0x080c, 0x3250, 0x080c, 0xd7f8, 0x6007, 0x0001,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x9547, 0x0005, 0x080c, 0xee26, 0x1950,</div><div class='del'>-	0x080c, 0x3374, 0x1938, 0x080c, 0xdecb, 0x1d60, 0x703c, 0x6016,</div><div class='del'>-	0x6007, 0x004a, 0x6003, 0x0001, 0x080c, 0x9547, 0x0005, 0x080c,</div><div class='del'>-	0x3374, 0x1904, 0xdcfa, 0x2009, 0x0041, 0x080c, 0xeed4, 0x6007,</div><div class='del'>-	0x0047, 0x6003, 0x0001, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x0005,</div><div class='del'>-	0x080c, 0x3374, 0x1904, 0xdcfa, 0x2009, 0x0042, 0x080c, 0xeed4,</div><div class='del'>-	0x6007, 0x0047, 0x6003, 0x0001, 0x080c, 0x9547, 0x080c, 0x9ab1,</div><div class='del'>-	0x0005, 0x080c, 0x3374, 0x1904, 0xdcfa, 0x2009, 0x0046, 0x080c,</div><div class='del'>-	0xeed4, 0x080c, 0xb2d3, 0x0005, 0x2001, 0x1824, 0x2004, 0x9082,</div><div class='del'>-	0x00e1, 0x1268, 0x080c, 0xddd5, 0x0904, 0xdcfa, 0x6007, 0x004e,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x0005, 0x6007,</div><div class='del'>-	0x0012, 0x0cb0, 0x6007, 0x004f, 0x6017, 0x0000, 0x7134, 0x918c,</div><div class='del'>-	0x00ff, 0x81ff, 0x0508, 0x9186, 0x0001, 0x1160, 0x7140, 0x2001,</div><div class='del'>-	0x19be, 0x2004, 0x9106, 0x11b0, 0x7144, 0x2001, 0x19bf, 0x2004,</div><div class='del'>-	0x9106, 0x0190, 0x9186, 0x0002, 0x1168, 0x2011, 0x0276, 0x20a9,</div><div class='del'>-	0x0004, 0x6010, 0x0096, 0x2048, 0x2019, 0x000a, 0x080c, 0xc379,</div><div class='del'>-	0x009e, 0x0110, 0x6017, 0x0001, 0x6003, 0x0001, 0x080c, 0x9547,</div><div class='del'>-	0x080c, 0x9ab1, 0x0005, 0x6007, 0x0050, 0x703c, 0x6016, 0x0ca0,</div><div class='del'>-	0x0016, 0x00e6, 0x2071, 0x0260, 0x00b6, 0x00c6, 0x2260, 0x6010,</div><div class='del'>-	0x2058, 0xb8cc, 0xd084, 0x0150, 0x7128, 0x6044, 0x9106, 0x1120,</div><div class='del'>-	0x712c, 0x6048, 0x9106, 0x0110, 0x9006, 0x0010, 0x9085, 0x0001,</div><div class='del'>-	0x00ce, 0x00be, 0x00ee, 0x001e, 0x0005, 0x0016, 0x0096, 0x0086,</div><div class='del'>-	0x00e6, 0x01c6, 0x01d6, 0x0126, 0x2091, 0x8000, 0x2071, 0x1800,</div><div class='del'>-	0x20e1, 0x0000, 0x2001, 0x19a1, 0x2003, 0x0000, 0x080c, 0x1027,</div><div class='del'>-	0x05a0, 0x2900, 0x6016, 0x7090, 0x8004, 0xa816, 0x908a, 0x001e,</div><div class='del'>-	0x02d0, 0xa833, 0x001e, 0x20a9, 0x001e, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x9080, 0x001b, 0x20a0, 0x2001, 0x19a1, 0x0016, 0x200c, 0x0471,</div><div class='del'>-	0x001e, 0x81ff, 0x01b8, 0x2940, 0x080c, 0x1027, 0x01b0, 0x2900,</div><div class='del'>-	0xa006, 0x2100, 0x0c18, 0xa832, 0x20a8, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x9080, 0x001b, 0x20a0, 0x2001, 0x19a1, 0x0016, 0x200c, 0x00b1,</div><div class='del'>-	0x001e, 0x0000, 0x9085, 0x0001, 0x0048, 0x2071, 0x1800, 0x7093,</div><div class='del'>-	0x0000, 0x6014, 0x2048, 0x080c, 0x0fc0, 0x9006, 0x012e, 0x01de,</div><div class='del'>-	0x01ce, 0x00ee, 0x008e, 0x009e, 0x001e, 0x0005, 0x0006, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x00c6, 0x918c, 0xffff, 0x11b0, 0x080c, 0x23e2,</div><div class='del'>-	0x2099, 0x026c, 0x2001, 0x0014, 0x3518, 0x9312, 0x0108, 0x1218,</div><div class='del'>-	0x23a8, 0x4003, 0x0400, 0x20a8, 0x4003, 0x22a8, 0x8108, 0x080c,</div><div class='del'>-	0x23e2, 0x2099, 0x0260, 0x0ca8, 0x080c, 0x23e2, 0x2061, 0x19a1,</div><div class='del'>-	0x6004, 0x2098, 0x6008, 0x3518, 0x9312, 0x0108, 0x1218, 0x23a8,</div><div class='del'>-	0x4003, 0x0048, 0x20a8, 0x4003, 0x22a8, 0x8108, 0x080c, 0x23e2,</div><div class='del'>-	0x2099, 0x0260, 0x0ca8, 0x2061, 0x19a1, 0x2019, 0x0280, 0x3300,</div><div class='del'>-	0x931e, 0x0110, 0x6006, 0x0020, 0x2001, 0x0260, 0x6006, 0x8108,</div><div class='del'>-	0x2162, 0x9292, 0x0021, 0x9296, 0xffff, 0x620a, 0x00ce, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x000e, 0x0005, 0x0006, 0x0016, 0x0026, 0x0036,</div><div class='del'>-	0x00c6, 0x81ff, 0x11b8, 0x080c, 0x23fa, 0x20a1, 0x024c, 0x2001,</div><div class='del'>-	0x0014, 0x3518, 0x9312, 0x1218, 0x23a8, 0x4003, 0x0418, 0x20a8,</div><div class='del'>-	0x4003, 0x82ff, 0x01f8, 0x22a8, 0x8108, 0x080c, 0x23fa, 0x20a1,</div><div class='del'>-	0x0240, 0x0c98, 0x080c, 0x23fa, 0x2061, 0x19a4, 0x6004, 0x20a0,</div><div class='del'>-	0x6008, 0x3518, 0x9312, 0x1218, 0x23a8, 0x4003, 0x0058, 0x20a8,</div><div class='del'>-	0x4003, 0x82ff, 0x0138, 0x22a8, 0x8108, 0x080c, 0x23fa, 0x20a1,</div><div class='del'>-	0x0240, 0x0c98, 0x2061, 0x19a4, 0x2019, 0x0260, 0x3400, 0x931e,</div><div class='del'>-	0x0110, 0x6006, 0x0020, 0x2001, 0x0240, 0x6006, 0x8108, 0x2162,</div><div class='del'>-	0x9292, 0x0021, 0x9296, 0xffff, 0x620a, 0x00ce, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x00b6, 0x0066, 0x6610, 0x2658, 0xbe04,</div><div class='del'>-	0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x0170, 0x9686, 0x0004,</div><div class='del'>-	0x0158, 0xbe04, 0x96b4, 0x00ff, 0x9686, 0x0006, 0x0128, 0x9686,</div><div class='del'>-	0x0004, 0x0110, 0x9085, 0x0001, 0x006e, 0x00be, 0x0005, 0x00d6,</div><div class='del'>-	0x080c, 0xdf63, 0x00de, 0x0005, 0x00d6, 0x080c, 0xdf70, 0x1520,</div><div class='del'>-	0x680c, 0x908c, 0xff00, 0x6820, 0x9084, 0x00ff, 0x9115, 0x6216,</div><div class='del'>-	0x6824, 0x602e, 0xd1e4, 0x0130, 0x9006, 0x080c, 0xeff4, 0x2009,</div><div class='del'>-	0x0001, 0x0078, 0xd1ec, 0x0180, 0x6920, 0x918c, 0x00ff, 0x6824,</div><div class='del'>-	0x080c, 0x2873, 0x1148, 0x2001, 0x0001, 0x080c, 0xeff4, 0x2110,</div><div class='del'>-	0x900e, 0x080c, 0x3299, 0x0018, 0x9085, 0x0001, 0x0008, 0x9006,</div><div class='del'>-	0x00de, 0x0005, 0x00b6, 0x00c6, 0x080c, 0xb325, 0x05a8, 0x0016,</div><div class='del'>-	0x0026, 0x00c6, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c, 0x080c,</div><div class='del'>-	0x2873, 0x1578, 0x080c, 0x66b9, 0x1560, 0xbe12, 0xbd16, 0x00ce,</div><div class='del'>-	0x002e, 0x001e, 0x2b00, 0x6012, 0x080c, 0xee26, 0x11d8, 0x080c,</div><div class='del'>-	0x3374, 0x11c0, 0x080c, 0xdecb, 0x0510, 0x2001, 0x0007, 0x080c,</div><div class='del'>-	0x666a, 0x2001, 0x0007, 0x080c, 0x6696, 0x6017, 0x0000, 0x6023,</div><div class='del'>-	0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x9547, 0x080c,</div><div class='del'>-	0x9ab1, 0x0010, 0x080c, 0xb2d3, 0x9085, 0x0001, 0x00ce, 0x00be,</div><div class='del'>-	0x0005, 0x080c, 0xb2d3, 0x00ce, 0x002e, 0x001e, 0x0ca8, 0x080c,</div><div class='del'>-	0xb2d3, 0x9006, 0x0c98, 0x2069, 0x026d, 0x6800, 0x9082, 0x0010,</div><div class='del'>-	0x1228, 0x6017, 0x0000, 0x9085, 0x0001, 0x0008, 0x9006, 0x0005,</div><div class='del'>-	0x6017, 0x0000, 0x2069, 0x026c, 0x6808, 0x9084, 0xff00, 0x9086,</div><div class='del'>-	0x0800, 0x1190, 0x6904, 0x9186, 0x0018, 0x0118, 0x9186, 0x0014,</div><div class='del'>-	0x1158, 0x810f, 0x6800, 0x9084, 0x00ff, 0x910d, 0x615a, 0x908e,</div><div class='del'>-	0x0014, 0x0110, 0x908e, 0x0010, 0x0005, 0x6004, 0x90b2, 0x0053,</div><div class='del'>-	0x1a0c, 0x0dc5, 0x91b6, 0x0013, 0x1130, 0x2008, 0x91b2, 0x0040,</div><div class='del'>-	0x1a04, 0xe0d2, 0x040a, 0x91b6, 0x0027, 0x0198, 0x9186, 0x0015,</div><div class='del'>-	0x0118, 0x9186, 0x0016, 0x1148, 0x080c, 0xd809, 0x0128, 0x6000,</div><div class='del'>-	0x9086, 0x0002, 0x0904, 0xbcfd, 0x0005, 0x91b6, 0x0014, 0x190c,</div><div class='del'>-	0x0dc5, 0x2001, 0x0007, 0x080c, 0x6696, 0x080c, 0x99a5, 0x080c,</div><div class='del'>-	0xb306, 0x080c, 0x9ab1, 0x0005, 0xdffc, 0xdffe, 0xdffc, 0xdffc,</div><div class='del'>-	0xdffc, 0xdffe, 0xe00d, 0xe0cb, 0xe051, 0xe0cb, 0xe079, 0xe0cb,</div><div class='del'>-	0xe00d, 0xe0cb, 0xe0c3, 0xe0cb, 0xe0c3, 0xe0cb, 0xe0cb, 0xdffc,</div><div class='del'>-	0xdffc, 0xdffc, 0xdffc, 0xdffc, 0xdffc, 0xdffc, 0xdffc, 0xdffc,</div><div class='del'>-	0xdffc, 0xdffc, 0xdffe, 0xdffc, 0xe0cb, 0xdffc, 0xdffc, 0xe0cb,</div><div class='del'>-	0xdffc, 0xe0c8, 0xe0cb, 0xdffc, 0xdffc, 0xdffc, 0xdffc, 0xe0cb,</div><div class='del'>-	0xe0cb, 0xdffc, 0xe0cb, 0xe0cb, 0xdffc, 0xe008, 0xdffc, 0xdffc,</div><div class='del'>-	0xdffc, 0xdffc, 0xe0c7, 0xe0cb, 0xdffc, 0xdffc, 0xe0cb, 0xe0cb,</div><div class='del'>-	0xdffc, 0xdffc, 0xdffc, 0xdffc, 0x080c, 0x0dc5, 0x080c, 0x99a5,</div><div class='del'>-	0x080c, 0xd7fb, 0x6003, 0x0002, 0x080c, 0x9ab1, 0x0804, 0xe0d1,</div><div class='del'>-	0x9006, 0x080c, 0x6656, 0x0804, 0xe0cb, 0x080c, 0x6a9b, 0x1904,</div><div class='del'>-	0xe0cb, 0x9006, 0x080c, 0x6656, 0x6010, 0x2058, 0xb810, 0x9086,</div><div class='del'>-	0x00ff, 0x1140, 0x00f6, 0x2079, 0x1800, 0x78a8, 0x8000, 0x78aa,</div><div class='del'>-	0x00fe, 0x00b8, 0x6010, 0x2058, 0xb8c0, 0x9005, 0x0904, 0xe0cb,</div><div class='del'>-	0x080c, 0x33a5, 0x1904, 0xe0cb, 0x2001, 0x1800, 0x2004, 0x9086,</div><div class='del'>-	0x0002, 0x1138, 0x00f6, 0x2079, 0x1800, 0x78a8, 0x8000, 0x78aa,</div><div class='del'>-	0x00fe, 0x2001, 0x0002, 0x080c, 0x666a, 0x080c, 0x99a5, 0x6023,</div><div class='del'>-	0x0001, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x9547, 0x080c,</div><div class='del'>-	0x9ab1, 0x6110, 0x2158, 0x2009, 0x0001, 0x080c, 0x884b, 0x0804,</div><div class='del'>-	0xe0d1, 0x6610, 0x2658, 0xbe04, 0x96b4, 0xff00, 0x8637, 0x9686,</div><div class='del'>-	0x0006, 0x0148, 0x9686, 0x0004, 0x0130, 0x080c, 0x9031, 0x2001,</div><div class='del'>-	0x0004, 0x080c, 0x6696, 0x080c, 0xf043, 0x0904, 0xe0cb, 0x080c,</div><div class='del'>-	0x99a5, 0x2001, 0x0004, 0x080c, 0x666a, 0x6023, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0003, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x0804,</div><div class='del'>-	0xe0d1, 0x2001, 0x1800, 0x2004, 0x9086, 0x0003, 0x1158, 0x0036,</div><div class='del'>-	0x0046, 0x6010, 0x2058, 0xbba0, 0x2021, 0x0006, 0x080c, 0x4dfb,</div><div class='del'>-	0x004e, 0x003e, 0x2001, 0x0006, 0x080c, 0xe0ef, 0x6610, 0x2658,</div><div class='del'>-	0xbe04, 0x0066, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x006e,</div><div class='del'>-	0x0180, 0x2001, 0x0006, 0x080c, 0x6696, 0x9284, 0x00ff, 0x908e,</div><div class='del'>-	0x0007, 0x0118, 0x908e, 0x0004, 0x1120, 0x2001, 0x0006, 0x080c,</div><div class='del'>-	0x666a, 0x080c, 0x6a9b, 0x11f8, 0x2001, 0x1837, 0x2004, 0xd0a4,</div><div class='del'>-	0x01d0, 0xbe04, 0x96b4, 0x00ff, 0x9686, 0x0006, 0x01a0, 0x00f6,</div><div class='del'>-	0x2079, 0x1800, 0x78a8, 0x8000, 0x78aa, 0x00fe, 0x0804, 0xe039,</div><div class='del'>-	0x2001, 0x0004, 0x0030, 0x2001, 0x0006, 0x0449, 0x0020, 0x0018,</div><div class='del'>-	0x0010, 0x080c, 0x6696, 0x080c, 0x99a5, 0x080c, 0xb2d3, 0x080c,</div><div class='del'>-	0x9ab1, 0x0005, 0x2600, 0x0002, 0xe0e6, 0xe0e6, 0xe0e6, 0xe0e6,</div><div class='del'>-	0xe0e6, 0xe0e8, 0xe0e6, 0xe0e8, 0xe0e6, 0xe0e6, 0xe0e8, 0xe0e6,</div><div class='del'>-	0xe0e6, 0xe0e6, 0xe0e8, 0xe0e8, 0xe0e8, 0xe0e8, 0x080c, 0x0dc5,</div><div class='del'>-	0x080c, 0x99a5, 0x080c, 0xb2d3, 0x080c, 0x9ab1, 0x0005, 0x0016,</div><div class='del'>-	0x00b6, 0x00d6, 0x6110, 0x2158, 0xb900, 0xd184, 0x0138, 0x080c,</div><div class='del'>-	0x666a, 0x9006, 0x080c, 0x6656, 0x080c, 0x3279, 0x00de, 0x00be,</div><div class='del'>-	0x001e, 0x0005, 0x6610, 0x2658, 0xb804, 0x9084, 0xff00, 0x8007,</div><div class='del'>-	0x90b2, 0x000c, 0x1a0c, 0x0dc5, 0x91b6, 0x0015, 0x1110, 0x003b,</div><div class='del'>-	0x0028, 0x91b6, 0x0016, 0x190c, 0x0dc5, 0x006b, 0x0005, 0xbd9f,</div><div class='del'>-	0xbd9f, 0xbd9f, 0xbd9f, 0xe184, 0xbd9f, 0xe16e, 0xe12f, 0xbd9f,</div><div class='del'>-	0xbd9f, 0xbd9f, 0xbd9f, 0xbd9f, 0xbd9f, 0xbd9f, 0xbd9f, 0xe184,</div><div class='del'>-	0xbd9f, 0xe16e, 0xe175, 0xbd9f, 0xbd9f, 0xbd9f, 0xbd9f, 0x00f6,</div><div class='del'>-	0x080c, 0x6a9b, 0x11d8, 0x080c, 0xd7e3, 0x11c0, 0x6010, 0x905d,</div><div class='del'>-	0x01a8, 0xb8c0, 0x9005, 0x0190, 0x9006, 0x080c, 0x6656, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0x666a, 0x6023, 0x0001, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x080c, 0x9547, 0x080c, 0x9ab1, 0x00f0, 0x2011, 0x0263,</div><div class='del'>-	0x2204, 0x8211, 0x220c, 0x080c, 0x2873, 0x11b0, 0x080c, 0x6724,</div><div class='del'>-	0x0118, 0x080c, 0xb2d3, 0x0080, 0xb810, 0x0006, 0xb814, 0x0006,</div><div class='del'>-	0xb8c0, 0x0006, 0x080c, 0x6148, 0x000e, 0xb8c2, 0x000e, 0xb816,</div><div class='del'>-	0x000e, 0xb812, 0x080c, 0xb2d3, 0x00fe, 0x0005, 0x6604, 0x96b6,</div><div class='del'>-	0x001e, 0x1110, 0x080c, 0xb2d3, 0x0005, 0x080c, 0xc1dc, 0x1148,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x9547, 0x080c, 0x9ab1,</div><div class='del'>-	0x0010, 0x080c, 0xb2d3, 0x0005, 0x0804, 0xb2d3, 0x6004, 0x908a,</div><div class='del'>-	0x0053, 0x1a0c, 0x0dc5, 0x080c, 0x99a5, 0x080c, 0xb306, 0x080c,</div><div class='del'>-	0x9ab1, 0x0005, 0x9182, 0x0040, 0x0002, 0xe1a9, 0xe1a9, 0xe1a9,</div><div class='del'>-	0xe1a9, 0xe1ab, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9,</div><div class='del'>-	0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9, 0xe1a9,</div><div class='del'>-	0xe1a9, 0x080c, 0x0dc5, 0x0096, 0x00b6, 0x00d6, 0x00e6, 0x00f6,</div><div class='del'>-	0x0046, 0x0026, 0x6210, 0x2258, 0xb8bc, 0x9005, 0x11a8, 0x6106,</div><div class='del'>-	0x2071, 0x0260, 0x7444, 0x94a4, 0xff00, 0x0904, 0xe211, 0x080c,</div><div class='del'>-	0xefe8, 0x1170, 0x9486, 0x2000, 0x1158, 0x2009, 0x0001, 0x2011,</div><div class='del'>-	0x0200, 0x080c, 0x8a50, 0x0020, 0x9026, 0x080c, 0xee6b, 0x0c38,</div><div class='del'>-	0x080c, 0x100e, 0x090c, 0x0dc5, 0x6003, 0x0007, 0xa867, 0x010d,</div><div class='del'>-	0x9006, 0xa802, 0xa86a, 0xac8a, 0x2c00, 0xa88e, 0x6008, 0xa8e2,</div><div class='del'>-	0x6010, 0x2058, 0xb8a0, 0x7130, 0xa97a, 0x0016, 0xa876, 0xa87f,</div><div class='del'>-	0x0000, 0xa883, 0x0000, 0xa887, 0x0036, 0x080c, 0x6e9f, 0x001e,</div><div class='del'>-	0x080c, 0xefe8, 0x1904, 0xe271, 0x9486, 0x2000, 0x1130, 0x2019,</div><div class='del'>-	0x0017, 0x080c, 0xeba1, 0x0804, 0xe271, 0x9486, 0x0200, 0x1120,</div><div class='del'>-	0x080c, 0xeb38, 0x0804, 0xe271, 0x9486, 0x0400, 0x0120, 0x9486,</div><div class='del'>-	0x1000, 0x1904, 0xe271, 0x2019, 0x0002, 0x080c, 0xeb53, 0x0804,</div><div class='del'>-	0xe271, 0x2069, 0x1a74, 0x6a00, 0xd284, 0x0904, 0xe2db, 0x9284,</div><div class='del'>-	0x0300, 0x1904, 0xe2d4, 0x6804, 0x9005, 0x0904, 0xe2bc, 0x2d78,</div><div class='del'>-	0x6003, 0x0007, 0x080c, 0x1027, 0x0904, 0xe27d, 0x7800, 0xd08c,</div><div class='del'>-	0x1118, 0x7804, 0x8001, 0x7806, 0x6017, 0x0000, 0x2001, 0x180f,</div><div class='del'>-	0x2004, 0xd084, 0x1904, 0xe2df, 0x9006, 0xa802, 0xa867, 0x0116,</div><div class='del'>-	0xa86a, 0x6008, 0xa8e2, 0x2c00, 0xa87a, 0x6010, 0x2058, 0xb8a0,</div><div class='del'>-	0x7130, 0xa9b6, 0xa876, 0xb928, 0xa9ba, 0xb92c, 0xa9be, 0xb930,</div><div class='del'>-	0xa9c2, 0xb934, 0xa9c6, 0xa883, 0x003d, 0x7044, 0x9084, 0x0003,</div><div class='del'>-	0x9080, 0xe279, 0x2005, 0xa87e, 0x20a9, 0x000a, 0x2001, 0x0270,</div><div class='del'>-	0xaa5c, 0x9290, 0x0021, 0x2009, 0x0205, 0x200b, 0x0080, 0x20e1,</div><div class='del'>-	0x0000, 0xab60, 0x23e8, 0x2098, 0x22a0, 0x4003, 0x200b, 0x0000,</div><div class='del'>-	0x2001, 0x027a, 0x200c, 0xa9b2, 0x8000, 0x200c, 0xa9ae, 0x080c,</div><div class='del'>-	0x6e9f, 0x002e, 0x004e, 0x00fe, 0x00ee, 0x00de, 0x00be, 0x009e,</div><div class='del'>-	0x0005, 0x0000, 0x0080, 0x0040, 0x0000, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0xd084, 0x0120, 0x080c, 0x100e, 0x1904, 0xe226, 0x6017, 0xf100,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x94ff, 0x080c, 0x9ab1,</div><div class='del'>-	0x0c00, 0x2069, 0x0260, 0x6848, 0x9084, 0xff00, 0x9086, 0x1200,</div><div class='del'>-	0x1198, 0x686c, 0x9084, 0x00ff, 0x0016, 0x6114, 0x918c, 0xf700,</div><div class='del'>-	0x910d, 0x6116, 0x001e, 0x6003, 0x0001, 0x6007, 0x0043, 0x080c,</div><div class='del'>-	0x94ff, 0x080c, 0x9ab1, 0x0828, 0x6868, 0x602e, 0x686c, 0x6032,</div><div class='del'>-	0x6017, 0xf200, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x94ff,</div><div class='del'>-	0x080c, 0x9ab1, 0x0804, 0xe271, 0x2001, 0x180e, 0x2004, 0xd0ec,</div><div class='del'>-	0x0120, 0x2011, 0x8049, 0x080c, 0x4c44, 0x6017, 0xf300, 0x0010,</div><div class='del'>-	0x6017, 0xf100, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x94ff,</div><div class='del'>-	0x080c, 0x9ab1, 0x0804, 0xe271, 0x6017, 0xf500, 0x0c98, 0x6017,</div><div class='del'>-	0xf600, 0x0804, 0xe291, 0x6017, 0xf200, 0x0804, 0xe291, 0xa867,</div><div class='del'>-	0x0146, 0xa86b, 0x0000, 0x6008, 0xa886, 0x2c00, 0xa87a, 0x7044,</div><div class='del'>-	0x9084, 0x0003, 0x9080, 0xe279, 0x2005, 0xa87e, 0x2928, 0x6010,</div><div class='del'>-	0x2058, 0xb8a0, 0xa876, 0xb828, 0xa88a, 0xb82c, 0xa88e, 0xb830,</div><div class='del'>-	0xa892, 0xb834, 0xa896, 0xa883, 0x003d, 0x2009, 0x0205, 0x2104,</div><div class='del'>-	0x9085, 0x0080, 0x200a, 0x20e1, 0x0000, 0x2011, 0x0210, 0x2214,</div><div class='del'>-	0x9294, 0x0fff, 0xaaa2, 0x9282, 0x0111, 0x1a0c, 0x0dc5, 0x8210,</div><div class='del'>-	0x821c, 0x2001, 0x026c, 0x2098, 0xa860, 0x20e8, 0xa85c, 0x9080,</div><div class='del'>-	0x0029, 0x20a0, 0x2011, 0xe35b, 0x2041, 0x0001, 0x223d, 0x9784,</div><div class='del'>-	0x00ff, 0x9322, 0x1208, 0x2300, 0x20a8, 0x4003, 0x931a, 0x0530,</div><div class='del'>-	0x8210, 0xd7fc, 0x1130, 0x8d68, 0x2d0a, 0x2001, 0x0260, 0x2098,</div><div class='del'>-	0x0c68, 0x2950, 0x080c, 0x1027, 0x0170, 0x2900, 0xb002, 0xa867,</div><div class='del'>-	0x0147, 0xa86b, 0x0000, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x001b,</div><div class='del'>-	0x20a0, 0x8840, 0x08d8, 0x2548, 0xa800, 0x902d, 0x0118, 0x080c,</div><div class='del'>-	0x1040, 0x0cc8, 0x080c, 0x1040, 0x0804, 0xe27d, 0x2548, 0x8847,</div><div class='del'>-	0x9885, 0x0046, 0xa866, 0x2009, 0x0205, 0x200b, 0x0000, 0x080c,</div><div class='del'>-	0xebd4, 0x0804, 0xe271, 0x8010, 0x0004, 0x801a, 0x0006, 0x8018,</div><div class='del'>-	0x0008, 0x8016, 0x000a, 0x8014, 0x9186, 0x0013, 0x1160, 0x6004,</div><div class='del'>-	0x908a, 0x0054, 0x1a0c, 0x0dc5, 0x9082, 0x0040, 0x0a0c, 0x0dc5,</div><div class='del'>-	0x2008, 0x0804, 0xe3ea, 0x9186, 0x0051, 0x0108, 0x0048, 0x080c,</div><div class='del'>-	0xd809, 0x0500, 0x6000, 0x9086, 0x0002, 0x11e0, 0x0804, 0xe433,</div><div class='del'>-	0x9186, 0x0027, 0x0190, 0x9186, 0x0048, 0x0128, 0x9186, 0x0014,</div><div class='del'>-	0x0160, 0x190c, 0x0dc5, 0x080c, 0xd809, 0x0160, 0x6000, 0x9086,</div><div class='del'>-	0x0004, 0x190c, 0x0dc5, 0x0804, 0xe516, 0x6004, 0x9082, 0x0040,</div><div class='del'>-	0x2008, 0x001a, 0x080c, 0xb36d, 0x0005, 0xe3b1, 0xe3b3, 0xe3b3,</div><div class='del'>-	0xe3da, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1,</div><div class='del'>-	0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1, 0xe3b1,</div><div class='del'>-	0xe3b1, 0x080c, 0x0dc5, 0x080c, 0x99a5, 0x080c, 0x9ab1, 0x0036,</div><div class='del'>-	0x0096, 0x6014, 0x904d, 0x01d8, 0x080c, 0xd0d8, 0x01c0, 0x6003,</div><div class='del'>-	0x0002, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x1178,</div><div class='del'>-	0x2019, 0x0004, 0x080c, 0xebd4, 0x6017, 0x0000, 0x6018, 0x9005,</div><div class='del'>-	0x1120, 0x2001, 0x1987, 0x2004, 0x601a, 0x6003, 0x0007, 0x009e,</div><div class='del'>-	0x003e, 0x0005, 0x0096, 0x080c, 0x99a5, 0x080c, 0x9ab1, 0x080c,</div><div class='del'>-	0xd0d8, 0x0120, 0x6014, 0x2048, 0x080c, 0x1040, 0x080c, 0xb306,</div><div class='del'>-	0x009e, 0x0005, 0x0002, 0xe3ff, 0xe416, 0xe401, 0xe42d, 0xe3ff,</div><div class='del'>-	0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff,</div><div class='del'>-	0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0xe3ff, 0x080c,</div><div class='del'>-	0x0dc5, 0x0096, 0x080c, 0x99a5, 0x6014, 0x2048, 0xa87c, 0xd0b4,</div><div class='del'>-	0x0138, 0x6003, 0x0007, 0x2009, 0x0043, 0x080c, 0xb352, 0x0010,</div><div class='del'>-	0x6003, 0x0004, 0x080c, 0x9ab1, 0x009e, 0x0005, 0x080c, 0x99a5,</div><div class='del'>-	0x080c, 0xd0d8, 0x0138, 0x6114, 0x0096, 0x2148, 0xa97c, 0x009e,</div><div class='del'>-	0xd1ec, 0x1138, 0x080c, 0x8a25, 0x080c, 0xb2d3, 0x080c, 0x9ab1,</div><div class='del'>-	0x0005, 0x080c, 0xee2f, 0x0db0, 0x0cc8, 0x080c, 0x99a5, 0x2009,</div><div class='del'>-	0x0041, 0x0804, 0xe59e, 0x9182, 0x0040, 0x0002, 0xe44a, 0xe44c,</div><div class='del'>-	0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a,</div><div class='del'>-	0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44d,</div><div class='del'>-	0xe44a, 0xe44a, 0x080c, 0x0dc5, 0x0005, 0x00d6, 0x080c, 0x8a25,</div><div class='del'>-	0x00de, 0x080c, 0xee87, 0x080c, 0xb2d3, 0x0005, 0x9182, 0x0040,</div><div class='del'>-	0x0002, 0xe46d, 0xe46d, 0xe46d, 0xe46d, 0xe46d, 0xe46d, 0xe46d,</div><div class='del'>-	0xe46d, 0xe46d, 0xe46f, 0xe4de, 0xe46d, 0xe46d, 0xe46d, 0xe46d,</div><div class='del'>-	0xe4de, 0xe46d, 0xe46d, 0xe46d, 0xe46d, 0x080c, 0x0dc5, 0x2001,</div><div class='del'>-	0x0105, 0x2004, 0x9084, 0x1800, 0x01c8, 0x2001, 0x0132, 0x200c,</div><div class='del'>-	0x2001, 0x0131, 0x2004, 0x9105, 0x1904, 0xe4de, 0x2009, 0x180c,</div><div class='del'>-	0x2104, 0xd0d4, 0x0904, 0xe4de, 0xc0d4, 0x200a, 0x2009, 0x0105,</div><div class='del'>-	0x2104, 0x9084, 0xe7fd, 0x9085, 0x0010, 0x200a, 0x2001, 0x1867,</div><div class='del'>-	0x2004, 0xd0e4, 0x1528, 0x603b, 0x0000, 0x080c, 0x9a61, 0x6014,</div><div class='del'>-	0x0096, 0x2048, 0xa87c, 0xd0fc, 0x0188, 0x908c, 0x0003, 0x918e,</div><div class='del'>-	0x0002, 0x0508, 0x2001, 0x180c, 0x2004, 0xd0d4, 0x11e0, 0x080c,</div><div class='del'>-	0x9bd3, 0x2009, 0x0041, 0x009e, 0x0804, 0xe59e, 0x080c, 0x9bd3,</div><div class='del'>-	0x6003, 0x0007, 0x601b, 0x0000, 0x080c, 0x8a25, 0x009e, 0x0005,</div><div class='del'>-	0x2001, 0x0100, 0x2004, 0x9082, 0x0005, 0x0aa8, 0x2001, 0x011f,</div><div class='del'>-	0x2004, 0x603a, 0x0890, 0x2001, 0x180c, 0x200c, 0xc1d4, 0x2102,</div><div class='del'>-	0xd1cc, 0x0110, 0x080c, 0x2c7b, 0x080c, 0x9bd3, 0x6014, 0x2048,</div><div class='del'>-	0xa97c, 0xd1ec, 0x1130, 0x080c, 0x8a25, 0x080c, 0xb2d3, 0x009e,</div><div class='del'>-	0x0005, 0x080c, 0xee2f, 0x0db8, 0x009e, 0x0005, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0xc1d4, 0x2102, 0x0036, 0x080c, 0x9a61, 0x080c, 0x9bd3,</div><div class='del'>-	0x6014, 0x0096, 0x2048, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be,</div><div class='del'>-	0xd0bc, 0x0188, 0xa87c, 0x9084, 0x0003, 0x9086, 0x0002, 0x0140,</div><div class='del'>-	0xa8ac, 0x6330, 0x931a, 0x6332, 0xa8b0, 0x632c, 0x931b, 0x632e,</div><div class='del'>-	0x6003, 0x0002, 0x0080, 0x2019, 0x0004, 0x080c, 0xebd4, 0x6018,</div><div class='del'>-	0x9005, 0x1128, 0x2001, 0x1987, 0x2004, 0x8003, 0x601a, 0x6017,</div><div class='del'>-	0x0000, 0x6003, 0x0007, 0x009e, 0x003e, 0x0005, 0x9182, 0x0040,</div><div class='del'>-	0x0002, 0xe52d, 0xe52d, 0xe52d, 0xe52d, 0xe52d, 0xe52d, 0xe52d,</div><div class='del'>-	0xe52d, 0xe52f, 0xe52d, 0xe52d, 0xe52d, 0xe52d, 0xe52d, 0xe52d,</div><div class='del'>-	0xe52d, 0xe52d, 0xe52d, 0xe52d, 0xe57a, 0x080c, 0x0dc5, 0x6014,</div><div class='del'>-	0x0096, 0x2048, 0xa834, 0xaa38, 0x6110, 0x00b6, 0x2158, 0xb900,</div><div class='del'>-	0x00be, 0xd1bc, 0x1190, 0x920d, 0x1518, 0xa87c, 0xd0fc, 0x0128,</div><div class='del'>-	0x2009, 0x0041, 0x009e, 0x0804, 0xe59e, 0x6003, 0x0007, 0x601b,</div><div class='del'>-	0x0000, 0x080c, 0x8a25, 0x009e, 0x0005, 0x6124, 0xd1f4, 0x1d58,</div><div class='del'>-	0x0006, 0x0046, 0xacac, 0x9422, 0xa9b0, 0x2200, 0x910b, 0x6030,</div><div class='del'>-	0x9420, 0x6432, 0x602c, 0x9109, 0x612e, 0x004e, 0x000e, 0x08d8,</div><div class='del'>-	0x6110, 0x00b6, 0x2158, 0xb900, 0x00be, 0xd1bc, 0x1178, 0x2009,</div><div class='del'>-	0x180e, 0x210c, 0xd19c, 0x0118, 0x6003, 0x0007, 0x0010, 0x6003,</div><div class='del'>-	0x0006, 0x00e9, 0x080c, 0x8a27, 0x009e, 0x0005, 0x6003, 0x0002,</div><div class='del'>-	0x009e, 0x0005, 0x6024, 0xd0f4, 0x0128, 0x080c, 0x1608, 0x1904,</div><div class='del'>-	0xe52f, 0x0005, 0x6014, 0x0096, 0x2048, 0xa834, 0xa938, 0x009e,</div><div class='del'>-	0x9105, 0x1120, 0x080c, 0x1608, 0x1904, 0xe52f, 0x0005, 0xd2fc,</div><div class='del'>-	0x0140, 0x8002, 0x8000, 0x8212, 0x9291, 0x0000, 0x2009, 0x0009,</div><div class='del'>-	0x0010, 0x2009, 0x0015, 0xaa9a, 0xa896, 0x0005, 0x9182, 0x0040,</div><div class='del'>-	0x0208, 0x0062, 0x9186, 0x0013, 0x0120, 0x9186, 0x0014, 0x190c,</div><div class='del'>-	0x0dc5, 0x6024, 0xd0dc, 0x090c, 0x0dc5, 0x0005, 0xe5c2, 0xe5ce,</div><div class='del'>-	0xe5da, 0xe5e6, 0xe5c2, 0xe5c2, 0xe5c2, 0xe5c2, 0xe5c9, 0xe5c4,</div><div class='del'>-	0xe5c4, 0xe5c2, 0xe5c2, 0xe5c2, 0xe5c2, 0xe5c4, 0xe5c2, 0xe5c4,</div><div class='del'>-	0xe5c2, 0xe5c9, 0x080c, 0x0dc5, 0x6024, 0xd0dc, 0x090c, 0x0dc5,</div><div class='del'>-	0x0005, 0x6014, 0x9005, 0x190c, 0x0dc5, 0x0005, 0x6003, 0x0001,</div><div class='del'>-	0x6106, 0x080c, 0x94ff, 0x0126, 0x2091, 0x8000, 0x080c, 0x9ab1,</div><div class='del'>-	0x012e, 0x0005, 0x6003, 0x0001, 0x6106, 0x080c, 0x94ff, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x9ab1, 0x012e, 0x0005, 0x6003, 0x0003,</div><div class='del'>-	0x6106, 0x2c10, 0x080c, 0x1be0, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x9564, 0x080c, 0x9bd3, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0036, 0x0096, 0x9182, 0x0040, 0x0023, 0x009e, 0x003e, 0x012e,</div><div class='del'>-	0x0005, 0xe615, 0xe617, 0xe629, 0xe643, 0xe615, 0xe615, 0xe615,</div><div class='del'>-	0xe615, 0xe615, 0xe615, 0xe615, 0xe615, 0xe615, 0xe615, 0xe615,</div><div class='del'>-	0xe615, 0xe615, 0xe615, 0xe615, 0xe615, 0x080c, 0x0dc5, 0x6014,</div><div class='del'>-	0x2048, 0xa87c, 0xd0fc, 0x01f8, 0x909c, 0x0003, 0x939e, 0x0003,</div><div class='del'>-	0x01d0, 0x6003, 0x0001, 0x6106, 0x080c, 0x94ff, 0x080c, 0x9ab1,</div><div class='del'>-	0x0470, 0x6014, 0x2048, 0xa87c, 0xd0fc, 0x0168, 0x909c, 0x0003,</div><div class='del'>-	0x939e, 0x0003, 0x0140, 0x6003, 0x0001, 0x6106, 0x080c, 0x94ff,</div><div class='del'>-	0x080c, 0x9ab1, 0x00e0, 0x901e, 0x6316, 0x631a, 0x2019, 0x0004,</div><div class='del'>-	0x080c, 0xebd4, 0x00a0, 0x6014, 0x2048, 0xa87c, 0xd0fc, 0x0d98,</div><div class='del'>-	0x909c, 0x0003, 0x939e, 0x0003, 0x0d70, 0x6003, 0x0003, 0x6106,</div><div class='del'>-	0x2c10, 0x080c, 0x1be0, 0x080c, 0x9564, 0x080c, 0x9bd3, 0x0005,</div><div class='del'>-	0x080c, 0x99a5, 0x6114, 0x81ff, 0x0158, 0x0096, 0x2148, 0x080c,</div><div class='del'>-	0xef85, 0x0036, 0x2019, 0x0029, 0x080c, 0xebd4, 0x003e, 0x009e,</div><div class='del'>-	0x080c, 0xb306, 0x080c, 0x9ab1, 0x0005, 0x080c, 0x9a61, 0x6114,</div><div class='del'>-	0x81ff, 0x0158, 0x0096, 0x2148, 0x080c, 0xef85, 0x0036, 0x2019,</div><div class='del'>-	0x0029, 0x080c, 0xebd4, 0x003e, 0x009e, 0x080c, 0xb306, 0x080c,</div><div class='del'>-	0x9bd3, 0x0005, 0x9182, 0x0085, 0x0002, 0xe694, 0xe692, 0xe692,</div><div class='del'>-	0xe6a0, 0xe692, 0xe692, 0xe692, 0xe692, 0xe692, 0xe692, 0xe692,</div><div class='del'>-	0xe692, 0xe692, 0x080c, 0x0dc5, 0x6003, 0x000b, 0x6106, 0x080c,</div><div class='del'>-	0x94ff, 0x0126, 0x2091, 0x8000, 0x080c, 0x9ab1, 0x012e, 0x0005,</div><div class='del'>-	0x0026, 0x00e6, 0x080c, 0xee26, 0x0118, 0x080c, 0xb2d3, 0x0450,</div><div class='del'>-	0x2071, 0x0260, 0x7224, 0x6216, 0x2001, 0x180e, 0x2004, 0xd0e4,</div><div class='del'>-	0x0150, 0x6010, 0x00b6, 0x2058, 0xbca0, 0x00be, 0x2c00, 0x2011,</div><div class='del'>-	0x014e, 0x080c, 0xb5f5, 0x7220, 0x080c, 0xea29, 0x0118, 0x6007,</div><div class='del'>-	0x0086, 0x0040, 0x6007, 0x0087, 0x7224, 0x9296, 0xffff, 0x1110,</div><div class='del'>-	0x6007, 0x0086, 0x6003, 0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1,</div><div class='del'>-	0x080c, 0x9bd3, 0x00ee, 0x002e, 0x0005, 0x9186, 0x0013, 0x1160,</div><div class='del'>-	0x6004, 0x908a, 0x0085, 0x0a0c, 0x0dc5, 0x908a, 0x0092, 0x1a0c,</div><div class='del'>-	0x0dc5, 0x9082, 0x0085, 0x00a2, 0x9186, 0x0027, 0x0130, 0x9186,</div><div class='del'>-	0x0014, 0x0118, 0x080c, 0xb36d, 0x0050, 0x2001, 0x0007, 0x080c,</div><div class='del'>-	0x6696, 0x080c, 0x99a5, 0x080c, 0xb306, 0x080c, 0x9ab1, 0x0005,</div><div class='del'>-	0xe705, 0xe707, 0xe707, 0xe705, 0xe705, 0xe705, 0xe705, 0xe705,</div><div class='del'>-	0xe705, 0xe705, 0xe705, 0xe705, 0xe705, 0x080c, 0x0dc5, 0x080c,</div><div class='del'>-	0x99a5, 0x080c, 0xb306, 0x080c, 0x9ab1, 0x0005, 0x9182, 0x0085,</div><div class='del'>-	0x0a0c, 0x0dc5, 0x9182, 0x0092, 0x1a0c, 0x0dc5, 0x9182, 0x0085,</div><div class='del'>-	0x0002, 0xe726, 0xe726, 0xe726, 0xe728, 0xe726, 0xe726, 0xe726,</div><div class='del'>-	0xe726, 0xe726, 0xe726, 0xe726, 0xe726, 0xe726, 0x080c, 0x0dc5,</div><div class='del'>-	0x0005, 0x9186, 0x0013, 0x0148, 0x9186, 0x0014, 0x0130, 0x9186,</div><div class='del'>-	0x0027, 0x0118, 0x080c, 0xb36d, 0x0030, 0x080c, 0x99a5, 0x080c,</div><div class='del'>-	0xb306, 0x080c, 0x9ab1, 0x0005, 0x0036, 0x080c, 0xee87, 0x6043,</div><div class='del'>-	0x0000, 0x2019, 0x000b, 0x0011, 0x003e, 0x0005, 0x6010, 0x0006,</div><div class='del'>-	0x0059, 0x000e, 0x6012, 0x6023, 0x0006, 0x6003, 0x0007, 0x601b,</div><div class='del'>-	0x0000, 0x6043, 0x0000, 0x0005, 0x0126, 0x0036, 0x2091, 0x8000,</div><div class='del'>-	0x0086, 0x2c40, 0x0096, 0x904e, 0x080c, 0xaafb, 0x009e, 0x008e,</div><div class='del'>-	0x1550, 0x0076, 0x2c38, 0x080c, 0xaba6, 0x007e, 0x1520, 0x6000,</div><div class='del'>-	0x9086, 0x0000, 0x0500, 0x6020, 0x9086, 0x0007, 0x01e0, 0x0096,</div><div class='del'>-	0x601c, 0xd084, 0x0140, 0x080c, 0xee87, 0x080c, 0xd7fb, 0x080c,</div><div class='del'>-	0x1a8e, 0x6023, 0x0007, 0x6014, 0x2048, 0x080c, 0xd0d8, 0x0110,</div><div class='del'>-	0x080c, 0xebd4, 0x009e, 0x6017, 0x0000, 0x080c, 0xee87, 0x6023,</div><div class='del'>-	0x0007, 0x080c, 0xd7fb, 0x003e, 0x012e, 0x0005, 0x00f6, 0x00c6,</div><div class='del'>-	0x00b6, 0x0036, 0x0156, 0x2079, 0x0260, 0x7938, 0x783c, 0x080c,</div><div class='del'>-	0x2873, 0x1904, 0xe7e4, 0x0016, 0x00c6, 0x080c, 0x6724, 0x1904,</div><div class='del'>-	0xe7e2, 0x001e, 0x00c6, 0x080c, 0xd7e3, 0x1130, 0xb8c0, 0x9005,</div><div class='del'>-	0x0118, 0x080c, 0x33a5, 0x0148, 0x2b10, 0x2160, 0x6010, 0x0006,</div><div class='del'>-	0x6212, 0x080c, 0xd7ea, 0x000e, 0x6012, 0x00ce, 0x002e, 0x0026,</div><div class='del'>-	0x0016, 0x2019, 0x0029, 0x080c, 0xac6c, 0x080c, 0x96a4, 0x0076,</div><div class='del'>-	0x903e, 0x080c, 0x9577, 0x007e, 0x001e, 0x0076, 0x903e, 0x080c,</div><div class='del'>-	0xe91c, 0x007e, 0x0026, 0xba04, 0x9294, 0xff00, 0x8217, 0x9286,</div><div class='del'>-	0x0006, 0x0118, 0x9286, 0x0004, 0x1118, 0xbaa0, 0x080c, 0x330e,</div><div class='del'>-	0x002e, 0xbcc0, 0x001e, 0x080c, 0x6148, 0xbe12, 0xbd16, 0xbcc2,</div><div class='del'>-	0x9006, 0x0010, 0x00ce, 0x001e, 0x015e, 0x003e, 0x00be, 0x00ce,</div><div class='del'>-	0x00fe, 0x0005, 0x00c6, 0x00d6, 0x00b6, 0x0016, 0x2009, 0x1824,</div><div class='del'>-	0x2104, 0x9086, 0x0074, 0x1904, 0xe843, 0x2069, 0x0260, 0x6944,</div><div class='del'>-	0x9182, 0x0100, 0x06e0, 0x6940, 0x9184, 0x8000, 0x0904, 0xe840,</div><div class='del'>-	0x2001, 0x197c, 0x2004, 0x9005, 0x1140, 0x6010, 0x2058, 0xb8c0,</div><div class='del'>-	0x9005, 0x0118, 0x9184, 0x0800, 0x0598, 0x6948, 0x918a, 0x0001,</div><div class='del'>-	0x0648, 0x080c, 0xefed, 0x0118, 0x6978, 0xd1fc, 0x11b8, 0x2009,</div><div class='del'>-	0x0205, 0x200b, 0x0001, 0x693c, 0x81ff, 0x1198, 0x6944, 0x9182,</div><div class='del'>-	0x0100, 0x02a8, 0x6940, 0x81ff, 0x1178, 0x6948, 0x918a, 0x0001,</div><div class='del'>-	0x0288, 0x6950, 0x918a, 0x0001, 0x0298, 0x00d0, 0x6017, 0x0100,</div><div class='del'>-	0x00a0, 0x6017, 0x0300, 0x0088, 0x6017, 0x0500, 0x0070, 0x6017,</div><div class='del'>-	0x0700, 0x0058, 0x6017, 0x0900, 0x0040, 0x6017, 0x0b00, 0x0028,</div><div class='del'>-	0x6017, 0x0f00, 0x0010, 0x6017, 0x2d00, 0x9085, 0x0001, 0x0008,</div><div class='del'>-	0x9006, 0x001e, 0x00be, 0x00de, 0x00ce, 0x0005, 0x00c6, 0x00b6,</div><div class='del'>-	0x0026, 0x0036, 0x0156, 0x6210, 0x2258, 0xbb04, 0x9394, 0x00ff,</div><div class='del'>-	0x9286, 0x0006, 0x0180, 0x9286, 0x0004, 0x0168, 0x9394, 0xff00,</div><div class='del'>-	0x8217, 0x9286, 0x0006, 0x0138, 0x9286, 0x0004, 0x0120, 0x080c,</div><div class='del'>-	0x6733, 0x0804, 0xe8ab, 0x2011, 0x0276, 0x20a9, 0x0004, 0x0096,</div><div class='del'>-	0x2b48, 0x2019, 0x000a, 0x080c, 0xc379, 0x009e, 0x15a8, 0x2011,</div><div class='del'>-	0x027a, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x0006, 0x080c,</div><div class='del'>-	0xc379, 0x009e, 0x1548, 0x0046, 0x0016, 0xbaa0, 0x2220, 0x9006,</div><div class='del'>-	0x2009, 0x1848, 0x210c, 0xd1a4, 0x0138, 0x2009, 0x0029, 0x080c,</div><div class='del'>-	0xec31, 0xb800, 0xc0e5, 0xb802, 0x2019, 0x0029, 0x080c, 0x96a4,</div><div class='del'>-	0x0076, 0x2039, 0x0000, 0x080c, 0x9577, 0x2c08, 0x080c, 0xe91c,</div><div class='del'>-	0x007e, 0x2001, 0x0007, 0x080c, 0x6696, 0x2001, 0x0007, 0x080c,</div><div class='del'>-	0x666a, 0x001e, 0x004e, 0x9006, 0x015e, 0x003e, 0x002e, 0x00be,</div><div class='del'>-	0x00ce, 0x0005, 0x00d6, 0x2069, 0x026e, 0x6800, 0x9086, 0x0800,</div><div class='del'>-	0x0118, 0x6017, 0x0000, 0x0008, 0x9006, 0x00de, 0x0005, 0x00b6,</div><div class='del'>-	0x00f6, 0x0016, 0x0026, 0x0036, 0x0156, 0x2079, 0x026c, 0x7930,</div><div class='del'>-	0x7834, 0x080c, 0x2873, 0x11d0, 0x080c, 0x6724, 0x11b8, 0x2011,</div><div class='del'>-	0x0270, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x000a, 0x080c,</div><div class='del'>-	0xc379, 0x009e, 0x1158, 0x2011, 0x0274, 0x20a9, 0x0004, 0x0096,</div><div class='del'>-	0x2b48, 0x2019, 0x0006, 0x080c, 0xc379, 0x009e, 0x015e, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x00fe, 0x00be, 0x0005, 0x00b6, 0x0006, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x0156, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c,</div><div class='del'>-	0x080c, 0x2873, 0x11d0, 0x080c, 0x6724, 0x11b8, 0x2011, 0x0276,</div><div class='del'>-	0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x000a, 0x080c, 0xc379,</div><div class='del'>-	0x009e, 0x1158, 0x2011, 0x027a, 0x20a9, 0x0004, 0x0096, 0x2b48,</div><div class='del'>-	0x2019, 0x0006, 0x080c, 0xc379, 0x009e, 0x015e, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x00be, 0x0005, 0x00e6, 0x00c6, 0x0086, 0x0076,</div><div class='del'>-	0x0066, 0x0056, 0x0046, 0x0026, 0x0126, 0x2091, 0x8000, 0x2740,</div><div class='del'>-	0x2029, 0x19f1, 0x252c, 0x2021, 0x19f7, 0x2424, 0x2061, 0x1cd0,</div><div class='del'>-	0x2071, 0x1800, 0x7654, 0x7074, 0x81ff, 0x0150, 0x0006, 0x9186,</div><div class='del'>-	0x1ab7, 0x000e, 0x0128, 0x8001, 0x9602, 0x1a04, 0xe9ba, 0x0018,</div><div class='del'>-	0x9606, 0x0904, 0xe9ba, 0x080c, 0x8cf7, 0x0904, 0xe9b1, 0x2100,</div><div class='del'>-	0x9c06, 0x0904, 0xe9b1, 0x6720, 0x9786, 0x0007, 0x0904, 0xe9b1,</div><div class='del'>-	0x080c, 0xec72, 0x1904, 0xe9b1, 0x080c, 0xf00b, 0x0904, 0xe9b1,</div><div class='del'>-	0x080c, 0xec62, 0x0904, 0xe9b1, 0x6720, 0x9786, 0x0001, 0x1148,</div><div class='del'>-	0x080c, 0x33a5, 0x0904, 0xe9f9, 0x6004, 0x9086, 0x0000, 0x1904,</div><div class='del'>-	0xe9f9, 0x9786, 0x0004, 0x0904, 0xe9f9, 0x2500, 0x9c06, 0x0904,</div><div class='del'>-	0xe9b1, 0x2400, 0x9c06, 0x05e8, 0x88ff, 0x0118, 0x6054, 0x9906,</div><div class='del'>-	0x15c0, 0x0096, 0x6000, 0x9086, 0x0004, 0x1120, 0x0016, 0x080c,</div><div class='del'>-	0x1a8e, 0x001e, 0x9786, 0x000a, 0x0148, 0x080c, 0xd2e0, 0x1130,</div><div class='del'>-	0x080c, 0xbcb6, 0x009e, 0x080c, 0xb306, 0x0418, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0xd0d8, 0x01d8, 0x9786, 0x0003, 0x1570, 0xa867, 0x0103,</div><div class='del'>-	0xa87c, 0xd0cc, 0x0130, 0x0096, 0xa878, 0x2048, 0x080c, 0x0fc0,</div><div class='del'>-	0x009e, 0xab7a, 0xa877, 0x0000, 0x080c, 0xef85, 0x0016, 0x080c,</div><div class='del'>-	0xd3ce, 0x080c, 0x6e92, 0x001e, 0x080c, 0xd2c3, 0x009e, 0x080c,</div><div class='del'>-	0xb306, 0x9ce0, 0x0018, 0x2001, 0x181a, 0x2004, 0x9c02, 0x1210,</div><div class='del'>-	0x0804, 0xe930, 0x012e, 0x002e, 0x004e, 0x005e, 0x006e, 0x007e,</div><div class='del'>-	0x008e, 0x00ce, 0x00ee, 0x0005, 0x9786, 0x0006, 0x1150, 0x9386,</div><div class='del'>-	0x0005, 0x0128, 0x080c, 0xef85, 0x080c, 0xebd4, 0x08f8, 0x009e,</div><div class='del'>-	0x0c00, 0x9786, 0x0009, 0x11f8, 0x6000, 0x9086, 0x0004, 0x01c0,</div><div class='del'>-	0x6000, 0x9086, 0x0003, 0x11a0, 0x080c, 0x9a61, 0x0096, 0x6114,</div><div class='del'>-	0x2148, 0x080c, 0xd0d8, 0x0118, 0x6010, 0x080c, 0x6e9f, 0x009e,</div><div class='del'>-	0x00c6, 0x080c, 0xb2d3, 0x00ce, 0x0036, 0x080c, 0x9bd3, 0x003e,</div><div class='del'>-	0x009e, 0x0804, 0xe9b1, 0x9786, 0x000a, 0x0904, 0xe9a1, 0x0804,</div><div class='del'>-	0xe996, 0x81ff, 0x0904, 0xe9b1, 0x9180, 0x0001, 0x2004, 0x9086,</div><div class='del'>-	0x0018, 0x0138, 0x9180, 0x0001, 0x2004, 0x9086, 0x002d, 0x1904,</div><div class='del'>-	0xe9b1, 0x6000, 0x9086, 0x0002, 0x1904, 0xe9b1, 0x080c, 0xd2cf,</div><div class='del'>-	0x0138, 0x080c, 0xd2e0, 0x1904, 0xe9b1, 0x080c, 0xbcb6, 0x0038,</div><div class='del'>-	0x080c, 0x3279, 0x080c, 0xd2e0, 0x1110, 0x080c, 0xbcb6, 0x080c,</div><div class='del'>-	0xb306, 0x0804, 0xe9b1, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039,</div><div class='del'>-	0x0005, 0x00c6, 0x00e6, 0x0016, 0x2c08, 0x2170, 0x9006, 0x080c,</div><div class='del'>-	0xebfb, 0x001e, 0x0120, 0x6020, 0x9084, 0x000f, 0x001b, 0x00ee,</div><div class='del'>-	0x00ce, 0x0005, 0xea48, 0xea48, 0xea48, 0xea48, 0xea48, 0xea48,</div><div class='del'>-	0xea4a, 0xea48, 0xea48, 0xea48, 0xea73, 0xb306, 0xb306, 0xea48,</div><div class='del'>-	0x9006, 0x0005, 0x0036, 0x0046, 0x0016, 0x7010, 0x00b6, 0x2058,</div><div class='del'>-	0xbca0, 0x00be, 0x2c00, 0x2009, 0x0020, 0x080c, 0xec31, 0x001e,</div><div class='del'>-	0x004e, 0x2019, 0x0002, 0x080c, 0xe754, 0x003e, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x0096, 0x080c, 0xd0d8, 0x0140, 0x6014, 0x904d, 0x080c,</div><div class='del'>-	0xccf3, 0x687b, 0x0005, 0x080c, 0x6e9f, 0x009e, 0x080c, 0xb306,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x0019, 0x9085, 0x0001, 0x0005, 0x6000,</div><div class='del'>-	0x908a, 0x0010, 0x1a0c, 0x0dc5, 0x000b, 0x0005, 0xea8e, 0xea8e,</div><div class='del'>-	0xeaa5, 0xea95, 0xeab4, 0xea8e, 0xea8e, 0xea90, 0xea8e, 0xea8e,</div><div class='del'>-	0xea8e, 0xea8e, 0xea8e, 0xea8e, 0xea8e, 0xea8e, 0x080c, 0x0dc5,</div><div class='del'>-	0x080c, 0xb306, 0x9085, 0x0001, 0x0005, 0x0036, 0x00e6, 0x2071,</div><div class='del'>-	0x19e8, 0x703c, 0x9c06, 0x1128, 0x2019, 0x0001, 0x080c, 0xaa49,</div><div class='del'>-	0x0010, 0x080c, 0xac2b, 0x00ee, 0x003e, 0x0096, 0x00d6, 0x6014,</div><div class='del'>-	0x2048, 0xa87b, 0x0005, 0x080c, 0x6e9f, 0x080c, 0xb306, 0x00de,</div><div class='del'>-	0x009e, 0x9085, 0x0001, 0x0005, 0x601c, 0xd084, 0x190c, 0x1a8e,</div><div class='del'>-	0x0c60, 0x2001, 0x0001, 0x080c, 0x6656, 0x0156, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x20a9, 0x0004, 0x2019, 0x1805, 0x2011, 0x0276, 0x080c,</div><div class='del'>-	0xc365, 0x003e, 0x002e, 0x001e, 0x015e, 0x9005, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x00c6, 0x0086, 0x0076, 0x0066, 0x00b6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2740, 0x2061, 0x1cd0, 0x2079, 0x0001, 0x8fff, 0x0904,</div><div class='del'>-	0xeb2b, 0x2071, 0x1800, 0x7654, 0x7074, 0x8001, 0x9602, 0x1a04,</div><div class='del'>-	0xeb2b, 0x88ff, 0x0120, 0x2800, 0x9c06, 0x15a0, 0x2078, 0x080c,</div><div class='del'>-	0xec62, 0x0580, 0x2400, 0x9c06, 0x0568, 0x6720, 0x9786, 0x0006,</div><div class='del'>-	0x1548, 0x9786, 0x0007, 0x0530, 0x88ff, 0x1150, 0xd58c, 0x1118,</div><div class='del'>-	0x6010, 0x9b06, 0x11f8, 0xd584, 0x0118, 0x6054, 0x9106, 0x11d0,</div><div class='del'>-	0x0096, 0x601c, 0xd084, 0x0140, 0x080c, 0xee87, 0x080c, 0xd7fb,</div><div class='del'>-	0x080c, 0x1a8e, 0x6023, 0x0007, 0x6014, 0x2048, 0x080c, 0xd0d8,</div><div class='del'>-	0x0120, 0x0046, 0x080c, 0xebd4, 0x004e, 0x009e, 0x080c, 0xb306,</div><div class='del'>-	0x88ff, 0x1198, 0x9ce0, 0x0018, 0x2001, 0x181a, 0x2004, 0x9c02,</div><div class='del'>-	0x1210, 0x0804, 0xeade, 0x9006, 0x012e, 0x00be, 0x006e, 0x007e,</div><div class='del'>-	0x008e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x98c5, 0x0001, 0x0ca0,</div><div class='del'>-	0x00b6, 0x0076, 0x0056, 0x0086, 0x9046, 0x2029, 0x0001, 0x2c20,</div><div class='del'>-	0x2019, 0x0002, 0x6210, 0x2258, 0x0096, 0x904e, 0x080c, 0xaafb,</div><div class='del'>-	0x009e, 0x008e, 0x903e, 0x080c, 0xaba6, 0x080c, 0xeacf, 0x005e,</div><div class='del'>-	0x007e, 0x00be, 0x0005, 0x00b6, 0x0046, 0x0056, 0x0076, 0x00c6,</div><div class='del'>-	0x0156, 0x2c20, 0x2128, 0x20a9, 0x007f, 0x900e, 0x0016, 0x0036,</div><div class='del'>-	0x080c, 0x6724, 0x1180, 0x0056, 0x0086, 0x9046, 0x2508, 0x2029,</div><div class='del'>-	0x0001, 0x0096, 0x904e, 0x080c, 0xaafb, 0x009e, 0x008e, 0x903e,</div><div class='del'>-	0x080c, 0xaba6, 0x005e, 0x003e, 0x001e, 0x8108, 0x1f04, 0xeb5e,</div><div class='del'>-	0x0036, 0x2508, 0x2029, 0x0003, 0x080c, 0xeacf, 0x003e, 0x015e,</div><div class='del'>-	0x00ce, 0x007e, 0x005e, 0x004e, 0x00be, 0x0005, 0x00b6, 0x0076,</div><div class='del'>-	0x0056, 0x6210, 0x2258, 0x0086, 0x9046, 0x2029, 0x0001, 0x2019,</div><div class='del'>-	0x0048, 0x0096, 0x904e, 0x080c, 0xaafb, 0x009e, 0x008e, 0x903e,</div><div class='del'>-	0x080c, 0xaba6, 0x2c20, 0x080c, 0xeacf, 0x005e, 0x007e, 0x00be,</div><div class='del'>-	0x0005, 0x00b6, 0x0046, 0x0056, 0x0076, 0x00c6, 0x0156, 0x2c20,</div><div class='del'>-	0x20a9, 0x0800, 0x900e, 0x0016, 0x0036, 0x080c, 0x6724, 0x1190,</div><div class='del'>-	0x0086, 0x9046, 0x2828, 0x0046, 0x2021, 0x0001, 0x080c, 0xee6b,</div><div class='del'>-	0x004e, 0x0096, 0x904e, 0x080c, 0xaafb, 0x009e, 0x008e, 0x903e,</div><div class='del'>-	0x080c, 0xaba6, 0x003e, 0x001e, 0x8108, 0x1f04, 0xebab, 0x0036,</div><div class='del'>-	0x2029, 0x0002, 0x080c, 0xeacf, 0x003e, 0x015e, 0x00ce, 0x007e,</div><div class='del'>-	0x005e, 0x004e, 0x00be, 0x0005, 0x0016, 0x00f6, 0x080c, 0xd0d6,</div><div class='del'>-	0x0198, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0046, 0x0180, 0xa800,</div><div class='del'>-	0x907d, 0x0138, 0xa803, 0x0000, 0xab82, 0x080c, 0x6e9f, 0x2f48,</div><div class='del'>-	0x0cb0, 0xab82, 0x080c, 0x6e9f, 0x00fe, 0x001e, 0x0005, 0xa800,</div><div class='del'>-	0x907d, 0x0130, 0xa803, 0x0000, 0x080c, 0x6e9f, 0x2f48, 0x0cb8,</div><div class='del'>-	0x080c, 0x6e9f, 0x0c88, 0x00e6, 0x0046, 0x0036, 0x2061, 0x1cd0,</div><div class='del'>-	0x9005, 0x1138, 0x2071, 0x1800, 0x7454, 0x7074, 0x8001, 0x9402,</div><div class='del'>-	0x12f8, 0x2100, 0x9c06, 0x0188, 0x6000, 0x9086, 0x0000, 0x0168,</div><div class='del'>-	0x6008, 0x9206, 0x1150, 0x6320, 0x9386, 0x0009, 0x01b0, 0x6010,</div><div class='del'>-	0x91a0, 0x0004, 0x2424, 0x9406, 0x0140, 0x9ce0, 0x0018, 0x2001,</div><div class='del'>-	0x181a, 0x2004, 0x9c02, 0x1220, 0x0c20, 0x9085, 0x0001, 0x0008,</div><div class='del'>-	0x9006, 0x003e, 0x004e, 0x00ee, 0x0005, 0x631c, 0xd3c4, 0x1d68,</div><div class='del'>-	0x0c30, 0x0096, 0x0006, 0x080c, 0x100e, 0x000e, 0x090c, 0x0dc5,</div><div class='del'>-	0xaae2, 0xa867, 0x010d, 0xa88e, 0x0026, 0x2010, 0x080c, 0xd0c6,</div><div class='del'>-	0x2001, 0x0000, 0x0120, 0x2200, 0x9080, 0x0015, 0x2004, 0x002e,</div><div class='del'>-	0xa87a, 0x9186, 0x0020, 0x0110, 0xa8e3, 0xffff, 0xa986, 0xac76,</div><div class='del'>-	0xa87f, 0x0000, 0x2001, 0x198e, 0x2004, 0xa882, 0x9006, 0xa802,</div><div class='del'>-	0xa86a, 0xa88a, 0x0126, 0x2091, 0x8000, 0x080c, 0x6e9f, 0x012e,</div><div class='del'>-	0x009e, 0x0005, 0x6700, 0x9786, 0x0000, 0x0158, 0x9786, 0x0001,</div><div class='del'>-	0x0140, 0x9786, 0x000a, 0x0128, 0x9786, 0x0009, 0x0110, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x00e6, 0x6010, 0x9075, 0x0138, 0x00b6, 0x2058,</div><div class='del'>-	0xb8a0, 0x00be, 0x9206, 0x00ee, 0x0005, 0x9085, 0x0001, 0x0cd8,</div><div class='del'>-	0x0016, 0x6004, 0x908e, 0x001e, 0x11a0, 0x8007, 0x6134, 0x918c,</div><div class='del'>-	0x00ff, 0x9105, 0x6036, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023,</div><div class='del'>-	0x0005, 0x2001, 0x1987, 0x2004, 0x601a, 0x080c, 0x94ff, 0x080c,</div><div class='del'>-	0x9ab1, 0x001e, 0x0005, 0xa001, 0xa001, 0x0005, 0x6024, 0xd0e4,</div><div class='del'>-	0x0158, 0xd0cc, 0x0118, 0x080c, 0xd412, 0x0030, 0x080c, 0xee87,</div><div class='del'>-	0x080c, 0x8a25, 0x080c, 0xb2d3, 0x0005, 0x9280, 0x0008, 0x2004,</div><div class='del'>-	0x9084, 0x000f, 0x0002, 0xecc1, 0xecc1, 0xecc1, 0xecc3, 0xecc1,</div><div class='del'>-	0xecc3, 0xecc3, 0xecc1, 0xecc3, 0xecc1, 0xecc1, 0xecc1, 0xecc1,</div><div class='del'>-	0xecc1, 0x9006, 0x0005, 0x9085, 0x0001, 0x0005, 0x9280, 0x0008,</div><div class='del'>-	0x2004, 0x9084, 0x000f, 0x0002, 0xecda, 0xecda, 0xecda, 0xecda,</div><div class='del'>-	0xecda, 0xecda, 0xece7, 0xecda, 0xecda, 0xecda, 0xecda, 0xecda,</div><div class='del'>-	0xecda, 0xecda, 0x6007, 0x003b, 0x602f, 0x0009, 0x6017, 0x2a00,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x0005, 0x0096,</div><div class='del'>-	0x00c6, 0x2260, 0x080c, 0xee87, 0x6043, 0x0000, 0x6024, 0xc0f4,</div><div class='del'>-	0xc0e4, 0x6026, 0x603b, 0x0000, 0x00ce, 0x00d6, 0x2268, 0x9186,</div><div class='del'>-	0x0007, 0x1904, 0xed40, 0x6814, 0x9005, 0x0138, 0x2048, 0xa87c,</div><div class='del'>-	0xd0fc, 0x1118, 0x00de, 0x009e, 0x08a8, 0x6007, 0x003a, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x00c6, 0x2d60, 0x6100,</div><div class='del'>-	0x9186, 0x0002, 0x1904, 0xedb0, 0x6014, 0x9005, 0x1138, 0x6000,</div><div class='del'>-	0x9086, 0x0007, 0x190c, 0x0dc5, 0x0804, 0xedb0, 0x2048, 0x080c,</div><div class='del'>-	0xd0d8, 0x1130, 0x0028, 0x2048, 0xa800, 0x9005, 0x1de0, 0x2900,</div><div class='del'>-	0x2048, 0xa87c, 0x9084, 0x0003, 0x9086, 0x0002, 0x1168, 0xa87c,</div><div class='del'>-	0xc0dc, 0xc0f4, 0xa87e, 0xa880, 0xc0fc, 0xa882, 0x2009, 0x0043,</div><div class='del'>-	0x080c, 0xe59e, 0x0804, 0xedb0, 0x2009, 0x0041, 0x0804, 0xedaa,</div><div class='del'>-	0x9186, 0x0005, 0x15a0, 0x6814, 0x2048, 0xa87c, 0xd0bc, 0x1120,</div><div class='del'>-	0x00de, 0x009e, 0x0804, 0xecda, 0xd0b4, 0x0128, 0xd0fc, 0x090c,</div><div class='del'>-	0x0dc5, 0x0804, 0xecfb, 0x6007, 0x003a, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x94ff, 0x080c, 0x9ab1, 0x00c6, 0x2d60, 0x6100, 0x9186, 0x0002,</div><div class='del'>-	0x0120, 0x9186, 0x0004, 0x1904, 0xedb0, 0x6814, 0x2048, 0xa97c,</div><div class='del'>-	0xc1f4, 0xc1dc, 0xa97e, 0xa980, 0xc1fc, 0xc1bc, 0xa982, 0x00f6,</div><div class='del'>-	0x2c78, 0x080c, 0x1768, 0x00fe, 0x2009, 0x0042, 0x0498, 0x0036,</div><div class='del'>-	0x080c, 0x100e, 0x090c, 0x0dc5, 0xa867, 0x010d, 0x9006, 0xa802,</div><div class='del'>-	0xa86a, 0xa88a, 0x2d18, 0xab8e, 0xa887, 0x0045, 0x2c00, 0xa892,</div><div class='del'>-	0x6038, 0xa8a2, 0x2360, 0x6024, 0xc0dd, 0x6026, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb8a0, 0x00be, 0x2004, 0x6354, 0xab7a, 0xa876, 0x9006,</div><div class='del'>-	0xa87e, 0xa882, 0xad9a, 0xae96, 0xa89f, 0x0001, 0x080c, 0x6e9f,</div><div class='del'>-	0x2019, 0x0045, 0x6008, 0x2068, 0x080c, 0xe746, 0x2d00, 0x600a,</div><div class='del'>-	0x003e, 0x0038, 0x6043, 0x0000, 0x6003, 0x0007, 0x080c, 0xe59e,</div><div class='del'>-	0x00ce, 0x00de, 0x009e, 0x0005, 0x9186, 0x0013, 0x1128, 0x6004,</div><div class='del'>-	0x9082, 0x0085, 0x2008, 0x00c2, 0x9186, 0x0027, 0x1178, 0x080c,</div><div class='del'>-	0x99a5, 0x0036, 0x0096, 0x6014, 0x2048, 0x2019, 0x0004, 0x080c,</div><div class='del'>-	0xebd4, 0x009e, 0x003e, 0x080c, 0x9ab1, 0x0005, 0x9186, 0x0014,</div><div class='del'>-	0x0d70, 0x080c, 0xb36d, 0x0005, 0xede3, 0xede1, 0xede1, 0xede1,</div><div class='del'>-	0xede1, 0xede1, 0xede3, 0xede1, 0xede1, 0xede1, 0xede1, 0xede1,</div><div class='del'>-	0xede1, 0x080c, 0x0dc5, 0x080c, 0x99a5, 0x6003, 0x000c, 0x080c,</div><div class='del'>-	0x9ab1, 0x0005, 0x9182, 0x0092, 0x1220, 0x9182, 0x0085, 0x0208,</div><div class='del'>-	0x001a, 0x080c, 0xb36d, 0x0005, 0xee01, 0xee01, 0xee01, 0xee01,</div><div class='del'>-	0xee03, 0xee23, 0xee01, 0xee01, 0xee01, 0xee01, 0xee01, 0xee01,</div><div class='del'>-	0xee01, 0x080c, 0x0dc5, 0x00d6, 0x2c68, 0x080c, 0xb27d, 0x01b0,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x001e, 0x2009, 0x026e, 0x210c, 0x613a,</div><div class='del'>-	0x2009, 0x026f, 0x210c, 0x613e, 0x600b, 0xffff, 0x6910, 0x6112,</div><div class='del'>-	0x6023, 0x0004, 0x080c, 0x94ff, 0x080c, 0x9ab1, 0x2d60, 0x080c,</div><div class='del'>-	0xb2d3, 0x00de, 0x0005, 0x080c, 0xb2d3, 0x0005, 0x00e6, 0x6010,</div><div class='del'>-	0x00b6, 0x2058, 0xb800, 0x00be, 0xd0ec, 0x00ee, 0x0005, 0x2009,</div><div class='del'>-	0x1867, 0x210c, 0xd1ec, 0x05b0, 0x6003, 0x0002, 0x6024, 0xc0e5,</div><div class='del'>-	0x6026, 0xd0cc, 0x0150, 0x2001, 0x1988, 0x2004, 0x6042, 0x2009,</div><div class='del'>-	0x1867, 0x210c, 0xd1f4, 0x1520, 0x00a0, 0x2009, 0x1867, 0x210c,</div><div class='del'>-	0xd1f4, 0x0128, 0x6024, 0xc0e4, 0x6026, 0x9006, 0x00d8, 0x2001,</div><div class='del'>-	0x1988, 0x200c, 0x2001, 0x1986, 0x2004, 0x9100, 0x9080, 0x000a,</div><div class='del'>-	0x6042, 0x6010, 0x00b6, 0x2058, 0xb8bc, 0x00be, 0x0008, 0x2104,</div><div class='del'>-	0x9005, 0x0118, 0x9088, 0x0003, 0x0cd0, 0x2c0a, 0x600f, 0x0000,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x0016, 0x00c6, 0x00e6, 0x6154, 0xb8bc,</div><div class='del'>-	0x2060, 0x8cff, 0x0180, 0x84ff, 0x1118, 0x6054, 0x9106, 0x1138,</div><div class='del'>-	0x600c, 0x2072, 0x080c, 0x8a25, 0x080c, 0xb2d3, 0x0010, 0x9cf0,</div><div class='del'>-	0x0003, 0x2e64, 0x0c70, 0x00ee, 0x00ce, 0x001e, 0x0005, 0x00d6,</div><div class='del'>-	0x00b6, 0x6010, 0x2058, 0xb8bc, 0x906d, 0x0130, 0x9c06, 0x0110,</div><div class='del'>-	0x680c, 0x0cd0, 0x600c, 0x680e, 0x00be, 0x00de, 0x0005, 0x0026,</div><div class='del'>-	0x0036, 0x0156, 0x2011, 0x182c, 0x2204, 0x9084, 0x00ff, 0x2019,</div><div class='del'>-	0x026e, 0x2334, 0x96b4, 0x00ff, 0x9636, 0x1508, 0x8318, 0x2334,</div><div class='del'>-	0x2204, 0x9084, 0xff00, 0x9636, 0x11d0, 0x2011, 0x0270, 0x20a9,</div><div class='del'>-	0x0004, 0x6010, 0x0096, 0x2048, 0x2019, 0x000a, 0x080c, 0xc379,</div><div class='del'>-	0x009e, 0x1168, 0x2011, 0x0274, 0x20a9, 0x0004, 0x6010, 0x0096,</div><div class='del'>-	0x2048, 0x2019, 0x0006, 0x080c, 0xc379, 0x009e, 0x1100, 0x015e,</div><div class='del'>-	0x003e, 0x002e, 0x0005, 0x00e6, 0x2071, 0x1800, 0x080c, 0x60c1,</div><div class='del'>-	0x080c, 0x3000, 0x00ee, 0x0005, 0x0096, 0x0026, 0x080c, 0x100e,</div><div class='del'>-	0x090c, 0x0dc5, 0xa85c, 0x9080, 0x001a, 0x20a0, 0x20a9, 0x000c,</div><div class='del'>-	0xa860, 0x20e8, 0x9006, 0x4004, 0x9186, 0x0046, 0x1118, 0xa867,</div><div class='del'>-	0x0136, 0x0038, 0xa867, 0x0138, 0x9186, 0x0041, 0x0110, 0xa87b,</div><div class='del'>-	0x0001, 0x7038, 0x9084, 0xff00, 0x7240, 0x9294, 0xff00, 0x8007,</div><div class='del'>-	0x9215, 0xaa9a, 0x9186, 0x0046, 0x1168, 0x7038, 0x9084, 0x00ff,</div><div class='del'>-	0x723c, 0x9294, 0xff00, 0x9215, 0xaa9e, 0x723c, 0x9294, 0x00ff,</div><div class='del'>-	0xaaa2, 0x0060, 0x7040, 0x9084, 0x00ff, 0x7244, 0x9294, 0xff00,</div><div class='del'>-	0x9215, 0xaa9e, 0x7244, 0x9294, 0x00ff, 0xaaa2, 0x9186, 0x0046,</div><div class='del'>-	0x1118, 0x9e90, 0x0012, 0x0010, 0x9e90, 0x001a, 0x2204, 0x8007,</div><div class='del'>-	0xa8a6, 0x8210, 0x2204, 0x8007, 0xa8aa, 0x8210, 0x2204, 0x8007,</div><div class='del'>-	0xa8ae, 0x8210, 0x2204, 0x8007, 0xa8b2, 0x8210, 0x9186, 0x0046,</div><div class='del'>-	0x11b8, 0x9e90, 0x0016, 0x2204, 0x8007, 0xa8b6, 0x8210, 0x2204,</div><div class='del'>-	0x8007, 0xa8ba, 0x8210, 0x2204, 0x8007, 0xa8be, 0x8210, 0x2204,</div><div class='del'>-	0x8007, 0xa8c2, 0x8210, 0x2011, 0x0205, 0x2013, 0x0001, 0x00b0,</div><div class='del'>-	0x9e90, 0x001e, 0x2204, 0x8007, 0xa8b6, 0x8210, 0x2204, 0x8007,</div><div class='del'>-	0xa8ba, 0x2011, 0x0205, 0x2013, 0x0001, 0x2011, 0x0260, 0x2204,</div><div class='del'>-	0x8007, 0xa8be, 0x8210, 0x2204, 0x8007, 0xa8c2, 0x9186, 0x0046,</div><div class='del'>-	0x1118, 0x2011, 0x0262, 0x0010, 0x2011, 0x026a, 0x0146, 0x01d6,</div><div class='del'>-	0x0036, 0x20a9, 0x0001, 0x2019, 0x0008, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x9080, 0x0031, 0x20a0, 0x2204, 0x8007, 0x4004, 0x8210, 0x8319,</div><div class='del'>-	0x1dd0, 0x003e, 0x01ce, 0x013e, 0x2011, 0x0205, 0x2013, 0x0000,</div><div class='del'>-	0x002e, 0x080c, 0x6e9f, 0x009e, 0x0005, 0x00e6, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb800, 0x00be, 0xd0fc, 0x0108, 0x0011, 0x00ee, 0x0005,</div><div class='del'>-	0xa880, 0xc0e5, 0xa882, 0x0005, 0x00e6, 0x00d6, 0x00c6, 0x0076,</div><div class='del'>-	0x0066, 0x0056, 0x0046, 0x0026, 0x0016, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2029, 0x19f1, 0x252c, 0x2021, 0x19f7, 0x2424, 0x2061, 0x1cd0,</div><div class='del'>-	0x2071, 0x1800, 0x7654, 0x7074, 0x9606, 0x0578, 0x6720, 0x9786,</div><div class='del'>-	0x0001, 0x0118, 0x9786, 0x0008, 0x1500, 0x2500, 0x9c06, 0x01e8,</div><div class='del'>-	0x2400, 0x9c06, 0x01d0, 0x080c, 0xec62, 0x01b8, 0x080c, 0xec72,</div><div class='del'>-	0x11a0, 0x6000, 0x9086, 0x0004, 0x1120, 0x0016, 0x080c, 0x1a8e,</div><div class='del'>-	0x001e, 0x080c, 0xd2cf, 0x1110, 0x080c, 0x3279, 0x080c, 0xd2e0,</div><div class='del'>-	0x1110, 0x080c, 0xbcb6, 0x080c, 0xb306, 0x9ce0, 0x0018, 0x2001,</div><div class='del'>-	0x181a, 0x2004, 0x9c02, 0x1208, 0x0858, 0x012e, 0x001e, 0x002e,</div><div class='del'>-	0x004e, 0x005e, 0x006e, 0x007e, 0x00ce, 0x00de, 0x00ee, 0x0005,</div><div class='del'>-	0x2001, 0x1810, 0x2004, 0xd0dc, 0x0005, 0x0006, 0x2001, 0x1837,</div><div class='del'>-	0x2004, 0xd09c, 0x000e, 0x0005, 0x0006, 0x0036, 0x0046, 0x080c,</div><div class='del'>-	0xd7e3, 0x0168, 0x2019, 0xffff, 0x9005, 0x0128, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xbba0, 0x00be, 0x2021, 0x0004, 0x080c, 0x4dfb, 0x004e,</div><div class='del'>-	0x003e, 0x000e, 0x0005, 0x6004, 0x9086, 0x0001, 0x1128, 0x080c,</div><div class='del'>-	0xac6c, 0x080c, 0xb306, 0x9006, 0x0005, 0x00e6, 0x00c6, 0x00b6,</div><div class='del'>-	0x0046, 0x2061, 0x1cd0, 0x2071, 0x1800, 0x7454, 0x7074, 0x8001,</div><div class='del'>-	0x9402, 0x12d8, 0x2100, 0x9c06, 0x0168, 0x6000, 0x9086, 0x0000,</div><div class='del'>-	0x0148, 0x6010, 0x2058, 0xb8a0, 0x9206, 0x1120, 0x6004, 0x9086,</div><div class='del'>-	0x0002, 0x0140, 0x9ce0, 0x0018, 0x2001, 0x181a, 0x2004, 0x9c02,</div><div class='del'>-	0x1220, 0x0c40, 0x9085, 0x0001, 0x0008, 0x9006, 0x004e, 0x00be,</div><div class='del'>-	0x00ce, 0x00ee, 0x0005, 0x2001, 0x1810, 0x2004, 0xd0a4, 0x0160,</div><div class='del'>-	0x2001, 0x1837, 0x2004, 0xd0a4, 0x0138, 0x2001, 0x1848, 0x2004,</div><div class='del'>-	0xd0a4, 0x1118, 0x9085, 0x0001, 0x0005, 0x9006, 0x0ce8, 0x0126,</div><div class='del'>-	0x0006, 0x00e6, 0x0016, 0x2091, 0x8000, 0x2071, 0x1840, 0xd5a4,</div><div class='del'>-	0x0118, 0x7004, 0x8000, 0x7006, 0xd5b4, 0x0118, 0x7000, 0x8000,</div><div class='del'>-	0x7002, 0xd5ac, 0x0178, 0x2500, 0x9084, 0x0007, 0x908e, 0x0003,</div><div class='del'>-	0x0148, 0x908e, 0x0004, 0x0130, 0x908e, 0x0005, 0x0118, 0x2071,</div><div class='del'>-	0xfff6, 0x0089, 0x001e, 0x00ee, 0x000e, 0x012e, 0x0005, 0x0126,</div><div class='del'>-	0x0006, 0x00e6, 0x2091, 0x8000, 0x2071, 0xffee, 0x0021, 0x00ee,</div><div class='del'>-	0x000e, 0x012e, 0x0005, 0x2e05, 0x8000, 0x2077, 0x1220, 0x8e70,</div><div class='del'>-	0x2e05, 0x8000, 0x2077, 0x0005, 0x00e6, 0x2071, 0xffec, 0x0c99,</div><div class='del'>-	0x00ee, 0x0005, 0x00e6, 0x2071, 0xfff0, 0x0c69, 0x00ee, 0x0005,</div><div class='del'>-	0x0126, 0x0006, 0x00e6, 0x2091, 0x8000, 0x2071, 0x1840, 0x7014,</div><div class='del'>-	0x8000, 0x7016, 0x00ee, 0x000e, 0x012e, 0x0005, 0x0003, 0x000b,</div><div class='del'>-	0x07d2, 0x0000, 0xc000, 0x0001, 0x8064, 0x0008, 0x0010, 0x0000,</div><div class='del'>-	0x8066, 0x0000, 0x0101, 0x0008, 0x4407, 0x0003, 0x8060, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x580d, 0x000b, 0x79c0, 0x0003, 0x5106, 0x0003,</div><div class='del'>-	0x4c0a, 0x0003, 0xbac0, 0x0009, 0x008a, 0x0000, 0x0c0a, 0x000b,</div><div class='del'>-	0x15fe, 0x0008, 0x340a, 0x0003, 0xc4c0, 0x0009, 0x7000, 0x0000,</div><div class='del'>-	0xffa0, 0x0001, 0x2000, 0x0000, 0x1680, 0x000b, 0x808c, 0x0008,</div><div class='del'>-	0x0001, 0x0000, 0x0000, 0x0007, 0x4028, 0x0000, 0x4047, 0x000a,</div><div class='del'>-	0x808c, 0x0008, 0x0002, 0x0000, 0x0822, 0x0003, 0x4022, 0x0000,</div><div class='del'>-	0x0028, 0x000b, 0x4122, 0x0008, 0x94c0, 0x0009, 0xff00, 0x0008,</div><div class='del'>-	0xffe0, 0x0009, 0x0500, 0x0008, 0x0aab, 0x0003, 0x4447, 0x0002,</div><div class='del'>-	0x0ea8, 0x000b, 0x0bfe, 0x0008, 0x11a0, 0x0001, 0x1286, 0x0003,</div><div class='del'>-	0x0ca0, 0x0001, 0x1286, 0x0003, 0x9180, 0x0001, 0x0004, 0x0000,</div><div class='del'>-	0x8060, 0x0000, 0x0400, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000,</div><div class='del'>-	0x0009, 0x0008, 0x4436, 0x000b, 0x808c, 0x0008, 0x0000, 0x0008,</div><div class='del'>-	0x0060, 0x0008, 0x8062, 0x0008, 0x0004, 0x0000, 0x8066, 0x0000,</div><div class='del'>-	0x0411, 0x0000, 0x443e, 0x0003, 0x03fe, 0x0000, 0x43e0, 0x0001,</div><div class='del'>-	0x0e83, 0x000b, 0xc2c0, 0x0009, 0x00ff, 0x0008, 0x02e0, 0x0001,</div><div class='del'>-	0x0e83, 0x000b, 0x9180, 0x0001, 0x0005, 0x0008, 0x8060, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000, 0x0019, 0x0000,</div><div class='del'>-	0x444d, 0x000b, 0x0240, 0x0002, 0x0a80, 0x0003, 0x00fe, 0x0000,</div><div class='del'>-	0x3283, 0x000b, 0x0248, 0x000a, 0x085c, 0x0003, 0x9180, 0x0001,</div><div class='del'>-	0x0006, 0x0008, 0x7f62, 0x0008, 0x8002, 0x0008, 0x0003, 0x0008,</div><div class='del'>-	0x8066, 0x0000, 0x020a, 0x0000, 0x445b, 0x0003, 0x112a, 0x0000,</div><div class='del'>-	0x002e, 0x0008, 0x022c, 0x0008, 0x3a44, 0x0002, 0x0c0a, 0x000b,</div><div class='del'>-	0x808c, 0x0008, 0x0002, 0x0000, 0x1760, 0x0008, 0x8062, 0x0008,</div><div class='del'>-	0x000f, 0x0008, 0x8066, 0x0000, 0x0011, 0x0008, 0x4468, 0x0003,</div><div class='del'>-	0x01fe, 0x0008, 0x42e0, 0x0009, 0x0e74, 0x0003, 0x00fe, 0x0000,</div><div class='del'>-	0x43e0, 0x0001, 0x0e74, 0x0003, 0x1734, 0x0000, 0x1530, 0x0000,</div><div class='del'>-	0x1632, 0x0008, 0x0d2a, 0x0008, 0x9880, 0x0001, 0x0010, 0x0000,</div><div class='del'>-	0x8060, 0x0000, 0x0400, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000,</div><div class='del'>-	0x1e0a, 0x0008, 0x447a, 0x0003, 0x808a, 0x0008, 0x0003, 0x0008,</div><div class='del'>-	0x1a60, 0x0000, 0x8062, 0x0008, 0x0002, 0x0000, 0x5880, 0x000b,</div><div class='del'>-	0x8066, 0x0000, 0x3679, 0x0000, 0x4483, 0x0003, 0x5884, 0x0003,</div><div class='del'>-	0x3efe, 0x0008, 0x7f4f, 0x0002, 0x088a, 0x000b, 0x0d00, 0x0000,</div><div class='del'>-	0x0092, 0x000c, 0x8054, 0x0008, 0x0011, 0x0008, 0x8074, 0x0000,</div><div class='del'>-	0x1010, 0x0008, 0x1efe, 0x0000, 0x300a, 0x000b, 0x00e0, 0x000c,</div><div class='del'>-	0x000a, 0x000b, 0x00fe, 0x0000, 0x349a, 0x0003, 0x1a60, 0x0000,</div><div class='del'>-	0x8062, 0x0008, 0x0007, 0x0000, 0x8066, 0x0000, 0x0231, 0x0008,</div><div class='del'>-	0x4499, 0x000b, 0x03fe, 0x0000, 0x04d0, 0x0001, 0x0cd4, 0x000b,</div><div class='del'>-	0x82c0, 0x0001, 0x1f00, 0x0000, 0xffa0, 0x0001, 0x0400, 0x0000,</div><div class='del'>-	0x08b2, 0x0003, 0x14dc, 0x0003, 0x01fe, 0x0008, 0x0580, 0x0009,</div><div class='del'>-	0x7f06, 0x0000, 0x8690, 0x0009, 0x0000, 0x0008, 0x7f0c, 0x0000,</div><div class='del'>-	0x02fe, 0x0008, 0xffc0, 0x0001, 0x00ff, 0x0008, 0x0680, 0x0009,</div><div class='del'>-	0x10b2, 0x0003, 0x7f08, 0x0008, 0x84c0, 0x0001, 0xff00, 0x0008,</div><div class='del'>-	0x08d4, 0x0003, 0xb9c0, 0x0009, 0x0030, 0x0008, 0x0cc3, 0x000b,</div><div class='del'>-	0x8060, 0x0000, 0x0400, 0x0000, 0x80fe, 0x0008, 0x1a0a, 0x0009,</div><div class='del'>-	0x7f62, 0x0008, 0x8066, 0x0000, 0x0409, 0x0000, 0x44bc, 0x0003,</div><div class='del'>-	0x80fe, 0x0008, 0x1a09, 0x0009, 0x7f62, 0x0008, 0x8066, 0x0000,</div><div class='del'>-	0x040a, 0x0000, 0x44c2, 0x0003, 0x00fe, 0x0000, 0x34ca, 0x0003,</div><div class='del'>-	0x8072, 0x0000, 0x1010, 0x0008, 0x3944, 0x0002, 0x08c5, 0x0003,</div><div class='del'>-	0x00ce, 0x0003, 0x8072, 0x0000, 0x2020, 0x0008, 0x3945, 0x000a,</div><div class='del'>-	0x08ca, 0x0003, 0x3946, 0x000a, 0x0cdb, 0x000b, 0x0000, 0x0007,</div><div class='del'>-	0x3943, 0x000a, 0x08db, 0x0003, 0x00ce, 0x0003, 0x00fe, 0x0000,</div><div class='del'>-	0x34d9, 0x000b, 0x8072, 0x0000, 0x1000, 0x0000, 0x00db, 0x000b,</div><div class='del'>-	0x8072, 0x0000, 0x2000, 0x0000, 0x4000, 0x000f, 0x86c0, 0x0009,</div><div class='del'>-	0xfc00, 0x0008, 0x08d4, 0x0003, 0x00b2, 0x000b, 0x1c60, 0x0000,</div><div class='del'>-	0x1b62, 0x0000, 0x8066, 0x0000, 0x0231, 0x0008, 0x44e4, 0x000b,</div><div class='del'>-	0x58e5, 0x000b, 0x0140, 0x0008, 0x0242, 0x0000, 0x1f43, 0x0002,</div><div class='del'>-	0x0cf3, 0x000b, 0x0d44, 0x0000, 0x0d46, 0x0008, 0x0348, 0x0008,</div><div class='del'>-	0x044a, 0x0008, 0x030a, 0x0008, 0x040c, 0x0000, 0x0d06, 0x0000,</div><div class='del'>-	0x0d08, 0x0008, 0x00f7, 0x0003, 0x0344, 0x0008, 0x0446, 0x0008,</div><div class='del'>-	0x0548, 0x0008, 0x064a, 0x0000, 0x1948, 0x000a, 0x08fa, 0x0003,</div><div class='del'>-	0x0d4a, 0x0008, 0x58fa, 0x0003, 0x3efe, 0x0008, 0x7f4f, 0x0002,</div><div class='del'>-	0x0901, 0x0003, 0x8000, 0x0000, 0x0001, 0x0000, 0x0092, 0x000c,</div><div class='del'>-	0x8054, 0x0008, 0x0001, 0x0000, 0x8074, 0x0000, 0x2020, 0x0008,</div><div class='del'>-	0x4000, 0x000f, 0x3a40, 0x000a, 0x0c0d, 0x0003, 0x2b24, 0x0008,</div><div class='del'>-	0x2b24, 0x0008, 0x590a, 0x000b, 0x8054, 0x0008, 0x0002, 0x0000,</div><div class='del'>-	0x1242, 0x0002, 0x0958, 0x0003, 0x3a45, 0x000a, 0x0947, 0x000b,</div><div class='del'>-	0x8072, 0x0000, 0x1000, 0x0000, 0x3945, 0x000a, 0x0917, 0x000b,</div><div class='del'>-	0x8072, 0x0000, 0x3010, 0x0000, 0x1e10, 0x000a, 0x7f3c, 0x0000,</div><div class='del'>-	0x0942, 0x000b, 0x1d00, 0x0002, 0x7f3a, 0x0000, 0x0d60, 0x0000,</div><div class='del'>-	0x7f62, 0x0008, 0x8066, 0x0000, 0x0009, 0x0008, 0x4520, 0x000b,</div><div class='del'>-	0x00fe, 0x0000, 0x353f, 0x000b, 0x1c60, 0x0000, 0x8062, 0x0008,</div><div class='del'>-	0x0001, 0x0000, 0x8066, 0x0000, 0x0009, 0x0008, 0x4528, 0x0003,</div><div class='del'>-	0x00fe, 0x0000, 0x325b, 0x000b, 0x0038, 0x0000, 0x0060, 0x0008,</div><div class='del'>-	0x8062, 0x0008, 0x0019, 0x0000, 0x8066, 0x0000, 0x0009, 0x0008,</div><div class='del'>-	0x4531, 0x000b, 0x80c0, 0x0009, 0x00ff, 0x0008, 0x7f3e, 0x0008,</div><div class='del'>-	0x0d60, 0x0000, 0x0efe, 0x0008, 0x1f80, 0x0001, 0x7f62, 0x0008,</div><div class='del'>-	0x8066, 0x0000, 0x0009, 0x0008, 0x453b, 0x000b, 0x003a, 0x0008,</div><div class='del'>-	0x1dfe, 0x0000, 0x011c, 0x000b, 0x0036, 0x0008, 0x00e0, 0x000c,</div><div class='del'>-	0x0158, 0x000b, 0x8074, 0x0000, 0x2000, 0x0000, 0x8072, 0x0000,</div><div class='del'>-	0x2000, 0x0000, 0x0158, 0x000b, 0x3a44, 0x0002, 0x0a89, 0x0003,</div><div class='del'>-	0x8074, 0x0000, 0x1000, 0x0000, 0x8072, 0x0000, 0x1000, 0x0000,</div><div class='del'>-	0x2d0e, 0x0000, 0x2d0e, 0x0000, 0x3658, 0x0003, 0x26fe, 0x0008,</div><div class='del'>-	0x26fe, 0x0008, 0x2700, 0x0008, 0x2700, 0x0008, 0x00d0, 0x0009,</div><div class='del'>-	0x0d6a, 0x0003, 0x8074, 0x0000, 0x4040, 0x0008, 0x5958, 0x0003,</div><div class='del'>-	0x5106, 0x0003, 0x3a46, 0x000a, 0x0d6a, 0x0003, 0x3a47, 0x0002,</div><div class='del'>-	0x0965, 0x000b, 0x8054, 0x0008, 0x0004, 0x0000, 0x8074, 0x0000,</div><div class='del'>-	0x8000, 0x0000, 0x8072, 0x0000, 0x3000, 0x0008, 0x01b4, 0x0003,</div><div class='del'>-	0x92c0, 0x0009, 0x0fc8, 0x0000, 0x080a, 0x0003, 0x1246, 0x000a,</div><div class='del'>-	0x0e52, 0x000b, 0x1a60, 0x0000, 0x8062, 0x0008, 0x0002, 0x0000,</div><div class='del'>-	0x8066, 0x0000, 0x362a, 0x0000, 0x456f, 0x0003, 0x2000, 0x0000,</div><div class='del'>-	0x2000, 0x0000, 0x2102, 0x0000, 0x2102, 0x0000, 0x2204, 0x0000,</div><div class='del'>-	0x2204, 0x0000, 0x2306, 0x0000, 0x2306, 0x0000, 0x2408, 0x0000,</div><div class='del'>-	0x2408, 0x0000, 0x250a, 0x0000, 0x250a, 0x0000, 0x260c, 0x0000,</div><div class='del'>-	0x260c, 0x0000, 0x270e, 0x0000, 0x270e, 0x0000, 0x2810, 0x0000,</div><div class='del'>-	0x2810, 0x0000, 0x2912, 0x0000, 0x2912, 0x0000, 0x1a60, 0x0000,</div><div class='del'>-	0x8062, 0x0008, 0x0007, 0x0000, 0x8066, 0x0000, 0x0052, 0x0000,</div><div class='del'>-	0x4589, 0x000b, 0x92c0, 0x0009, 0x0780, 0x0008, 0x0e6e, 0x000b,</div><div class='del'>-	0x124b, 0x0002, 0x0992, 0x0003, 0x2e4d, 0x0002, 0x2e4d, 0x0002,</div><div class='del'>-	0x0a58, 0x0003, 0x3a46, 0x000a, 0x0da2, 0x000b, 0x5994, 0x0003,</div><div class='del'>-	0x8054, 0x0008, 0x0004, 0x0000, 0x1243, 0x000a, 0x09b0, 0x0003,</div><div class='del'>-	0x8010, 0x0008, 0x000d, 0x0000, 0x0233, 0x000c, 0x1948, 0x000a,</div><div class='del'>-	0x099f, 0x000b, 0x0228, 0x000c, 0x1810, 0x0000, 0x0233, 0x000c,</div><div class='del'>-	0x01b0, 0x000b, 0x1948, 0x000a, 0x09a6, 0x000b, 0x1243, 0x000a,</div><div class='del'>-	0x0a5b, 0x0003, 0x194d, 0x000a, 0x09aa, 0x000b, 0x1243, 0x000a,</div><div class='del'>-	0x0a62, 0x0003, 0x59aa, 0x000b, 0x8054, 0x0008, 0x0004, 0x0000,</div><div class='del'>-	0x0228, 0x000c, 0x1810, 0x0000, 0x0233, 0x000c, 0x8074, 0x0000,</div><div class='del'>-	0xf000, 0x0008, 0x8072, 0x0000, 0x3000, 0x0008, 0x0d30, 0x0000,</div><div class='del'>-	0x3a42, 0x0002, 0x0dba, 0x000b, 0x15fe, 0x0008, 0x3461, 0x000b,</div><div class='del'>-	0x000a, 0x000b, 0x8074, 0x0000, 0x0501, 0x0000, 0x8010, 0x0008,</div><div class='del'>-	0x000c, 0x0008, 0x0233, 0x000c, 0x000a, 0x000b, 0xbbe0, 0x0009,</div><div class='del'>-	0x0030, 0x0008, 0x0dd0, 0x000b, 0x18fe, 0x0000, 0x3ce0, 0x0009,</div><div class='del'>-	0x09cd, 0x0003, 0x15fe, 0x0008, 0x3ce0, 0x0009, 0x09cd, 0x0003,</div><div class='del'>-	0x0223, 0x0004, 0x8076, 0x0008, 0x0040, 0x0000, 0x0220, 0x000b,</div><div class='del'>-	0x8076, 0x0008, 0x0041, 0x0008, 0x0220, 0x000b, 0xbbe0, 0x0009,</div><div class='del'>-	0x0032, 0x0000, 0x0dd5, 0x000b, 0x3c1e, 0x0008, 0x0220, 0x000b,</div><div class='del'>-	0xbbe0, 0x0009, 0x003b, 0x0000, 0x0dda, 0x000b, 0x3c20, 0x0000,</div><div class='del'>-	0x0220, 0x000b, 0xbbe0, 0x0009, 0x0035, 0x0008, 0x0de0, 0x000b,</div><div class='del'>-	0x8072, 0x0000, 0x8000, 0x0000, 0x039e, 0x0003, 0xbbe0, 0x0009,</div><div class='del'>-	0x0036, 0x0008, 0x0abd, 0x000b, 0xbbe0, 0x0009, 0x0037, 0x0000,</div><div class='del'>-	0x0e01, 0x000b, 0x18fe, 0x0000, 0x3ce0, 0x0009, 0x0dcd, 0x000b,</div><div class='del'>-	0x8076, 0x0008, 0x0040, 0x0000, 0x1a60, 0x0000, 0x8062, 0x0008,</div><div class='del'>-	0x000d, 0x0000, 0x2604, 0x0008, 0x2604, 0x0008, 0x2706, 0x0008,</div><div class='del'>-	0x2706, 0x0008, 0x2808, 0x0000, 0x2808, 0x0000, 0x290a, 0x0000,</div><div class='del'>-	0x290a, 0x0000, 0x8066, 0x0000, 0x0422, 0x0000, 0x45f8, 0x000b,</div><div class='del'>-	0x0228, 0x000c, 0x8054, 0x0008, 0x0004, 0x0000, 0x8074, 0x0000,</div><div class='del'>-	0xf000, 0x0008, 0x8072, 0x0000, 0xb000, 0x0000, 0x01b4, 0x0003,</div><div class='del'>-	0xbbe0, 0x0009, 0x0038, 0x0000, 0x0e13, 0x000b, 0x18fe, 0x0000,</div><div class='del'>-	0x3ce0, 0x0009, 0x0a10, 0x0003, 0x15fe, 0x0008, 0x3ce0, 0x0009,</div><div class='del'>-	0x0dc9, 0x0003, 0x0223, 0x0004, 0x8076, 0x0008, 0x0040, 0x0000,</div><div class='del'>-	0x8072, 0x0000, 0x8000, 0x0000, 0x0280, 0x000b, 0x8076, 0x0008,</div><div class='del'>-	0x0042, 0x0008, 0x0220, 0x000b, 0xbbe0, 0x0009, 0x0016, 0x0000,</div><div class='del'>-	0x0e20, 0x000b, 0x8074, 0x0000, 0x0808, 0x0008, 0x3a44, 0x0002,</div><div class='del'>-	0x0c0c, 0x000b, 0x8074, 0x0000, 0x0800, 0x0000, 0x8072, 0x0000,</div><div class='del'>-	0x8000, 0x0000, 0x8000, 0x000f, 0x000a, 0x000b, 0x8072, 0x0000,</div><div class='del'>-	0x8000, 0x0000, 0x000a, 0x000b, 0x3d30, 0x000a, 0x7f00, 0x0000,</div><div class='del'>-	0xbc80, 0x0001, 0x0007, 0x0000, 0x022c, 0x000b, 0x1930, 0x000a,</div><div class='del'>-	0x7f00, 0x0000, 0x9880, 0x0001, 0x0007, 0x0000, 0x8060, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000, 0x000a, 0x0008,</div><div class='del'>-	0x4631, 0x000b, 0x4000, 0x000f, 0x2236, 0x000b, 0x0870, 0x0008,</div><div class='del'>-	0x4000, 0x000f, 0x7e33, 0x000b, 0xbbe0, 0x0009, 0x0030, 0x0008,</div><div class='del'>-	0x0e33, 0x0003, 0x18fe, 0x0000, 0x3ce0, 0x0009, 0x0a44, 0x000b,</div><div class='del'>-	0x15fe, 0x0008, 0x3ce0, 0x0009, 0x0a44, 0x000b, 0x0223, 0x0004,</div><div class='del'>-	0x8076, 0x0008, 0x0040, 0x0000, 0x0246, 0x000b, 0x8076, 0x0008,</div><div class='del'>-	0x0041, 0x0008, 0x8072, 0x0000, 0x8000, 0x0000, 0x0233, 0x0003,</div><div class='del'>-	0xbac0, 0x0009, 0x0090, 0x0008, 0x0a4f, 0x0003, 0x8074, 0x0000,</div><div class='del'>-	0x0706, 0x0000, 0x0251, 0x000b, 0x8074, 0x0000, 0x0703, 0x0000,</div><div class='del'>-	0x4000, 0x000f, 0x8010, 0x0008, 0x0023, 0x0000, 0x028e, 0x0003,</div><div class='del'>-	0x8010, 0x0008, 0x0008, 0x0000, 0x028e, 0x0003, 0x8010, 0x0008,</div><div class='del'>-	0x0022, 0x0008, 0x028e, 0x0003, 0x0228, 0x000c, 0x8010, 0x0008,</div><div class='del'>-	0x0007, 0x0000, 0x0233, 0x000c, 0x1810, 0x0000, 0x0233, 0x000c,</div><div class='del'>-	0x029a, 0x0003, 0x0228, 0x000c, 0x8010, 0x0008, 0x001b, 0x0008,</div><div class='del'>-	0x0233, 0x000c, 0x1810, 0x0000, 0x0233, 0x000c, 0x8074, 0x0000,</div><div class='del'>-	0xf080, 0x0000, 0x8072, 0x0000, 0x3000, 0x0008, 0x0d30, 0x0000,</div><div class='del'>-	0x000a, 0x000b, 0x8010, 0x0008, 0x0009, 0x0008, 0x028e, 0x0003,</div><div class='del'>-	0x8010, 0x0008, 0x0005, 0x0008, 0x028e, 0x0003, 0x1648, 0x000a,</div><div class='del'>-	0x0c6f, 0x000b, 0x808c, 0x0008, 0x0001, 0x0000, 0x8010, 0x0008,</div><div class='del'>-	0x0004, 0x0000, 0x4143, 0x000a, 0x086f, 0x0003, 0x3a44, 0x0002,</div><div class='del'>-	0x0c0a, 0x000b, 0x0d2a, 0x0008, 0x028e, 0x0003, 0x8010, 0x0008,</div><div class='del'>-	0x0003, 0x0008, 0x0292, 0x000b, 0x8010, 0x0008, 0x000b, 0x0000,</div><div class='del'>-	0x0292, 0x000b, 0x8010, 0x0008, 0x0002, 0x0000, 0x0292, 0x000b,</div><div class='del'>-	0x3a47, 0x0002, 0x0d58, 0x000b, 0x8010, 0x0008, 0x0006, 0x0008,</div><div class='del'>-	0x0292, 0x000b, 0x8074, 0x0000, 0xf000, 0x0008, 0x8072, 0x0000,</div><div class='del'>-	0x3000, 0x0008, 0x0233, 0x000c, 0x0249, 0x0004, 0x3a40, 0x000a,</div><div class='del'>-	0x080a, 0x0003, 0x8010, 0x0008, 0x000c, 0x0008, 0x0233, 0x000c,</div><div class='del'>-	0x000a, 0x000b, 0x8074, 0x0000, 0xf080, 0x0000, 0x8072, 0x0000,</div><div class='del'>-	0x3000, 0x0008, 0x0d30, 0x0000, 0x2e4d, 0x0002, 0x2e4d, 0x0002,</div><div class='del'>-	0x0aa5, 0x000b, 0x8054, 0x0008, 0x0019, 0x0000, 0x000a, 0x000b,</div><div class='del'>-	0x8054, 0x0008, 0x0009, 0x0008, 0x000a, 0x000b, 0x3a44, 0x0002,</div><div class='del'>-	0x0c0a, 0x000b, 0x0283, 0x000b, 0x808c, 0x0008, 0x0000, 0x0008,</div><div class='del'>-	0x4447, 0x0002, 0x0ad1, 0x000b, 0xc0c0, 0x0001, 0x00ff, 0x0008,</div><div class='del'>-	0xffe0, 0x0009, 0x00ff, 0x0008, 0x0ea8, 0x000b, 0xc1e0, 0x0001,</div><div class='del'>-	0xffff, 0x0008, 0x0ea8, 0x000b, 0x8010, 0x0008, 0x0013, 0x0000,</div><div class='del'>-	0x0233, 0x000c, 0x8074, 0x0000, 0x0202, 0x0008, 0x000a, 0x000b,</div><div class='del'>-	0x3a40, 0x000a, 0x0ece, 0x000b, 0x8074, 0x0000, 0x0200, 0x0000,</div><div class='del'>-	0x3d00, 0x0000, 0x3cfe, 0x0000, 0x8072, 0x0000, 0x8000, 0x0000,</div><div class='del'>-	0x43e0, 0x0001, 0x0ecc, 0x0003, 0x42fe, 0x0000, 0xffc0, 0x0001,</div><div class='del'>-	0x00ff, 0x0008, 0x00e0, 0x0009, 0x0aa8, 0x0003, 0x0d08, 0x0008,</div><div class='del'>-	0x0321, 0x000b, 0x8072, 0x0000, 0x8000, 0x0000, 0x000a, 0x000b,</div><div class='del'>-	0x03a7, 0x000c, 0x808c, 0x0008, 0x0001, 0x0000, 0x04fe, 0x0008,</div><div class='del'>-	0x338a, 0x0003, 0x0460, 0x0000, 0x8062, 0x0008, 0x0001, 0x0000,</div><div class='del'>-	0x8066, 0x0000, 0x0009, 0x0008, 0x46db, 0x0003, 0x0004, 0x0000,</div><div class='del'>-	0x80c0, 0x0009, 0x00ff, 0x0008, 0x7f00, 0x0000, 0x80e0, 0x0001,</div><div class='del'>-	0x0004, 0x0000, 0x0af5, 0x000b, 0x80e0, 0x0001, 0x0005, 0x0008,</div><div class='del'>-	0x0af5, 0x000b, 0x80e0, 0x0001, 0x0006, 0x0008, 0x0af5, 0x000b,</div><div class='del'>-	0x82c0, 0x0001, 0xff00, 0x0008, 0x7f04, 0x0008, 0x82e0, 0x0009,</div><div class='del'>-	0x0600, 0x0008, 0x0af5, 0x000b, 0x82e0, 0x0009, 0x0500, 0x0008,</div><div class='del'>-	0x0af5, 0x000b, 0x82e0, 0x0009, 0x0400, 0x0000, 0x0f8a, 0x0003,</div><div class='del'>-	0xc4c0, 0x0009, 0x7000, 0x0000, 0xffe0, 0x0009, 0x1000, 0x0000,</div><div class='del'>-	0x0b21, 0x0003, 0x0398, 0x000c, 0x3941, 0x0002, 0x0b00, 0x0003,</div><div class='del'>-	0x8072, 0x0000, 0x0400, 0x0000, 0x000a, 0x000b, 0x0460, 0x0000,</div><div class='del'>-	0x80fe, 0x0008, 0x002b, 0x0008, 0x7f62, 0x0008, 0x8066, 0x0000,</div><div class='del'>-	0x2209, 0x0008, 0x4706, 0x000b, 0x11fe, 0x0000, 0x331c, 0x0003,</div><div class='del'>-	0x9180, 0x0001, 0x0002, 0x0000, 0x8060, 0x0000, 0x0400, 0x0000,</div><div class='del'>-	0x7f62, 0x0008, 0x8066, 0x0000, 0x0609, 0x0008, 0x4710, 0x0003,</div><div class='del'>-	0x42fe, 0x0000, 0xffc0, 0x0001, 0xff00, 0x0008, 0x03e0, 0x0009,</div><div class='del'>-	0x0f19, 0x0003, 0x8072, 0x0000, 0x0400, 0x0000, 0x0046, 0x0003,</div><div class='del'>-	0x9180, 0x0001, 0x0003, 0x0008, 0x0303, 0x000b, 0x8072, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x8010, 0x0008, 0x0010, 0x0000, 0x037b, 0x000b,</div><div class='del'>-	0x0398, 0x000c, 0x3941, 0x0002, 0x0b27, 0x0003, 0x8072, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x000a, 0x000b, 0x1042, 0x000a, 0x0b2c, 0x000b,</div><div class='del'>-	0x0360, 0x0004, 0x11fe, 0x0000, 0x3731, 0x000b, 0x8072, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x8010, 0x0008, 0x000e, 0x0000, 0x037b, 0x000b,</div><div class='del'>-	0x8060, 0x0000, 0x0400, 0x0000, 0x04fe, 0x0008, 0x3746, 0x000b,</div><div class='del'>-	0x808c, 0x0008, 0x0000, 0x0008, 0x9180, 0x0001, 0x0005, 0x0008,</div><div class='del'>-	0x7f62, 0x0008, 0x8066, 0x0000, 0x0009, 0x0008, 0x473c, 0x000b,</div><div class='del'>-	0x0060, 0x0008, 0x8062, 0x0008, 0x001b, 0x0008, 0x4304, 0x0008,</div><div class='del'>-	0x4206, 0x0008, 0x8066, 0x0000, 0x0412, 0x0000, 0x4744, 0x000b,</div><div class='del'>-	0x035d, 0x0003, 0x808c, 0x0008, 0x0001, 0x0000, 0x0460, 0x0000,</div><div class='del'>-	0x8062, 0x0008, 0x002b, 0x0008, 0x8066, 0x0000, 0x0609, 0x0008,</div><div class='del'>-	0x474d, 0x000b, 0x8066, 0x0000, 0x220a, 0x0008, 0x4750, 0x000b,</div><div class='del'>-	0x42fe, 0x0000, 0xffc0, 0x0001, 0xff00, 0x0008, 0x7f04, 0x0008,</div><div class='del'>-	0x8060, 0x0000, 0x0400, 0x0000, 0x9180, 0x0001, 0x0002, 0x0000,</div><div class='del'>-	0x7f62, 0x0008, 0x8066, 0x0000, 0x041a, 0x0008, 0x475c, 0x000b,</div><div class='del'>-	0x8072, 0x0000, 0x0400, 0x0000, 0x0046, 0x0003, 0x8060, 0x0000,</div><div class='del'>-	0x0400, 0x0000, 0x1362, 0x0008, 0x8066, 0x0000, 0x0411, 0x0000,</div><div class='del'>-	0x4765, 0x000b, 0x02fe, 0x0008, 0x03e0, 0x0009, 0x0f6b, 0x0003,</div><div class='del'>-	0x0d22, 0x0000, 0x4000, 0x000f, 0x8280, 0x0009, 0x0002, 0x0000,</div><div class='del'>-	0x1380, 0x0001, 0x7f62, 0x0008, 0x8066, 0x0000, 0x2209, 0x0008,</div><div class='del'>-	0x4771, 0x000b, 0x0200, 0x000a, 0xffc0, 0x0001, 0x0007, 0x0000,</div><div class='del'>-	0x7f06, 0x0000, 0x1362, 0x0008, 0x8066, 0x0000, 0x060a, 0x0008,</div><div class='del'>-	0x4779, 0x0003, 0x4000, 0x000f, 0x3a44, 0x0002, 0x0c0a, 0x000b,</div><div class='del'>-	0x2f44, 0x000a, 0x2f44, 0x000a, 0x0e83, 0x000b, 0x808a, 0x0008,</div><div class='del'>-	0x0003, 0x0008, 0x8074, 0x0000, 0xf080, 0x0000, 0x8072, 0x0000,</div><div class='del'>-	0x3000, 0x0008, 0x5b86, 0x000b, 0x8054, 0x0008, 0x0019, 0x0000,</div><div class='del'>-	0x000a, 0x000b, 0x3a44, 0x0002, 0x0c0a, 0x000b, 0x808c, 0x0008,</div><div class='del'>-	0x0000, 0x0008, 0x8010, 0x0008, 0x0011, 0x0008, 0x0233, 0x000c,</div><div class='del'>-	0x42fe, 0x0000, 0xffc0, 0x0001, 0x00ff, 0x0008, 0x7f10, 0x0008,</div><div class='del'>-	0x0233, 0x000c, 0x4310, 0x0008, 0x0292, 0x000b, 0x3941, 0x0002,</div><div class='del'>-	0x0b9b, 0x000b, 0x4000, 0x000f, 0x8072, 0x0000, 0x0404, 0x0008,</div><div class='del'>-	0x4000, 0x000f, 0x8010, 0x0008, 0x0012, 0x0008, 0x0233, 0x000c,</div><div class='del'>-	0x0360, 0x0004, 0x1110, 0x0000, 0x0233, 0x000c, 0x11fe, 0x0000,</div><div class='del'>-	0x37a1, 0x000b, 0x000a, 0x000b, 0xc2c0, 0x0009, 0x00ff, 0x0008,</div><div class='del'>-	0x7f00, 0x0000, 0xc3c0, 0x0001, 0xff00, 0x0008, 0x00d0, 0x0009,</div><div class='del'>-	0x0bcc, 0x0003, 0x0d0a, 0x0000, 0x8580, 0x0001, 0x1000, 0x0000,</div><div class='del'>-	0x7f62, 0x0008, 0x8060, 0x0000, 0x0400, 0x0000, 0x8066, 0x0000,</div><div class='del'>-	0x0809, 0x0000, 0x47b6, 0x0003, 0x04fe, 0x0008, 0x33c5, 0x000b,</div><div class='del'>-	0x0460, 0x0000, 0x8062, 0x0008, 0x0004, 0x0000, 0x8066, 0x0000,</div><div class='del'>-	0x0211, 0x0000, 0x47be, 0x000b, 0x01fe, 0x0008, 0x00e0, 0x0009,</div><div class='del'>-	0x0fc5, 0x000b, 0x02fe, 0x0008, 0x43e0, 0x0001, 0x0bcb, 0x000b,</div><div class='del'>-	0x0500, 0x0002, 0x7f0a, 0x0000, 0xffe0, 0x0009, 0x0800, 0x0000,</div><div class='del'>-	0x0faf, 0x000b, 0x0d08, 0x0008, 0x4000, 0x000f, 0x43fe, 0x0008,</div><div class='del'>-	0x3e80, 0x0001, 0xffc0, 0x0001, 0x7fff, 0x0000, 0x0d60, 0x0000,</div><div class='del'>-	0x7f62, 0x0008, 0x8066, 0x0000, 0x0809, 0x0000, 0x47d4, 0x000b,</div><div class='del'>-	0x8060, 0x0000, 0x0400, 0x0000, 0x84c0, 0x0001, 0xff00, 0x0008,</div><div class='del'>-	0x7f60, 0x000a, 0x7f60, 0x000a, 0x7f60, 0x000a, 0x7f60, 0x000a,</div><div class='del'>-	0x7f60, 0x000a, 0x7f60, 0x000a, 0x7f60, 0x000a, 0x7f60, 0x000a,</div><div class='del'>-	0xff80, 0x0009, 0x1000, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000,</div><div class='del'>-	0x0809, 0x0000, 0x47e6, 0x0003, 0x4000, 0x000f, 0x8d5b, 0xeac4,</div><div class='del'>-	0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,</div><div class='del'>-	0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000,</div><div class='del'>-	0x12b0</div><div class='del'>-};</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2300ipx_length01 = 0xf091;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_length01 = 0xf091;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2322.c b/drivers/scsi/qla2xxx/ql2322.c<br/>deleted file mode 100644<br/>index 3c8cafc12eee..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2322.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2322.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include "qla_def.h"</div><div class='del'>-</div><div class='del'>-static char qla_driver_name[] = "qla2322";</div><div class='del'>-</div><div class='del'>-extern unsigned char  fw2322ipx_version[];</div><div class='del'>-extern unsigned char  fw2322ipx_version_str[];</div><div class='del'>-extern unsigned short fw2322ipx_addr01;</div><div class='del'>-extern unsigned short fw2322ipx_code01[];</div><div class='del'>-extern unsigned short fw2322ipx_length01;</div><div class='del'>-extern unsigned long rseqipx_code_addr01;</div><div class='del'>-extern unsigned short rseqipx_code01[];</div><div class='del'>-extern unsigned short rseqipx_code_length01;</div><div class='del'>-extern unsigned long xseqipx_code_addr01;</div><div class='del'>-extern unsigned short xseqipx_code01[];</div><div class='del'>-extern unsigned short xseqipx_code_length01;</div><div class='del'>-</div><div class='del'>-static struct qla_fw_info qla_fw_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_NORMAL,</div><div class='del'>-		.fwcode		= &amp;fw2322ipx_code01[0],</div><div class='del'>-		.fwlen		= &amp;fw2322ipx_length01,</div><div class='del'>-		.fwstart	= &amp;fw2322ipx_addr01,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_EXTENDED,</div><div class='del'>-		.fwcode		= &amp;rseqipx_code01[0],</div><div class='del'>-		.fwlen		= &amp;rseqipx_code_length01,</div><div class='del'>-		.lfwstart	= &amp;rseqipx_code_addr01,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_EXTENDED,</div><div class='del'>-		.fwcode		= &amp;xseqipx_code01[0],</div><div class='del'>-		.fwlen		= &amp;xseqipx_code_length01,</div><div class='del'>-		.lfwstart	= &amp;xseqipx_code_addr01,</div><div class='del'>-	},</div><div class='del'>-	{ FW_INFO_ADDR_NOMORE, },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct qla_board_info qla_board_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP2322",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP6322",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_device_id qla2322_pci_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2322,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[0],</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP6322,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[1],</div><div class='del'>-	},</div><div class='del'>-	{0, 0},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, qla2322_pci_tbl);</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-qla2322_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return qla2x00_probe_one(pdev,</div><div class='del'>-	    (struct qla_board_info *)id-&gt;driver_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit</div><div class='del'>-qla2322_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	qla2x00_remove_one(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver qla2322_pci_driver = {</div><div class='del'>-	.name		= "qla2322",</div><div class='del'>-	.id_table	= qla2322_pci_tbl,</div><div class='del'>-	.probe		= qla2322_probe_one,</div><div class='del'>-	.remove		= __devexit_p(qla2322_remove_one),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-qla2322_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_module_init(&amp;qla2322_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-qla2322_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;qla2322_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(qla2322_init);</div><div class='del'>-module_exit(qla2322_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("QLogic Corporation");</div><div class='del'>-MODULE_DESCRIPTION("QLogic ISP2322 FC-SCSI Host Bus Adapter driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(QLA2XXX_VERSION);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2322_fw.c b/drivers/scsi/qla2xxx/ql2322_fw.c<br/>deleted file mode 100644<br/>index 53599a8e2a92..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2322_fw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2322_fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8376 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Firmware Version 3.03.20 (15:42 Feb 01, 2006)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2322ipx_version = 3*1024+3;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_version = 3*1024+3;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned char fw2322ipx_version_str[] = {3, 3,20};</div><div class='del'>-#else</div><div class='del'>-unsigned char firmware_version[] = {3, 3,20};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-#define fw2322ipx_VERSION_STRING "3.03.20"</div><div class='del'>-#else</div><div class='del'>-#define FW_VERSION_STRING "3.03.20"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2322ipx_addr01 = 0x0800 ;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_addr01 = 0x0800 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2322ipx_code01[] = { </div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code01[] = { </div><div class='del'>-#endif</div><div class='del'>-	0x0470, 0x0000, 0x0000, 0xe719, 0x0000, 0x0003, 0x0003, 0x0014,</div><div class='del'>-	0x0137, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,</div><div class='del'>-	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,</div><div class='del'>-	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3233, 0x3030, 0x2046, 0x6972,</div><div class='del'>-	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,</div><div class='del'>-	0x332e, 0x3033, 0x2e32, 0x3020, 0x2020, 0x2020, 0x2400, 0x20a9,</div><div class='del'>-	0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2200, 0x20a9, 0x000f,</div><div class='del'>-	0x2001, 0x0000, 0x400f, 0x2091, 0x2400, 0x20a9, 0x000f, 0x2001,</div><div class='del'>-	0x0000, 0x400f, 0x2091, 0x2600, 0x20a9, 0x000f, 0x2001, 0x0000,</div><div class='del'>-	0x400f, 0x2091, 0x2800, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f,</div><div class='del'>-	0x2091, 0x2a00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091,</div><div class='del'>-	0x2c00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2e00,</div><div class='del'>-	0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2000, 0x2001,</div><div class='del'>-	0x0000, 0x20c1, 0x0004, 0x20c9, 0x1cff, 0x2059, 0x0000, 0x2b78,</div><div class='del'>-	0x7883, 0x0004, 0x2089, 0x2bc2, 0x2051, 0x1800, 0x2a70, 0x20e1,</div><div class='del'>-	0x0001, 0x20e9, 0x0001, 0x2009, 0x0000, 0x080c, 0x0e74, 0x00f6,</div><div class='del'>-	0x7888, 0x9005, 0x11f8, 0x2061, 0xc000, 0x080c, 0x20c6, 0x1170,</div><div class='del'>-	0x2079, 0x0300, 0x080c, 0x20dc, 0x2061, 0xe000, 0x080c, 0x20c6,</div><div class='del'>-	0x1128, 0x2079, 0x0380, 0x080c, 0x20dc, 0x0060, 0x00fe, 0x7883,</div><div class='del'>-	0x4010, 0x7837, 0x4010, 0x7833, 0x0011, 0x2091, 0x5000, 0x2091,</div><div class='del'>-	0x4080, 0x0cf8, 0x00fe, 0x2029, 0x5600, 0x2031, 0xffff, 0x2039,</div><div class='del'>-	0x55dc, 0x2021, 0x0200, 0x20e9, 0x0001, 0x20a1, 0x0000, 0x20a9,</div><div class='del'>-	0x0800, 0x900e, 0x4104, 0x20e9, 0x0001, 0x20a1, 0x1000, 0x900e,</div><div class='del'>-	0x2001, 0x0dc1, 0x9084, 0x0fff, 0x20a8, 0x4104, 0x2001, 0x0000,</div><div class='del'>-	0x9086, 0x0000, 0x0120, 0x21a8, 0x4104, 0x8001, 0x1de0, 0x756e,</div><div class='del'>-	0x7672, 0x776a, 0x7476, 0x747a, 0x00e6, 0x2071, 0x1b73, 0x2472,</div><div class='del'>-	0x00ee, 0x20a1, 0x1ddc, 0x7170, 0x810d, 0x810d, 0x810d, 0x810d,</div><div class='del'>-	0x918c, 0x000f, 0x2001, 0x0001, 0x9112, 0x900e, 0x21a8, 0x4104,</div><div class='del'>-	0x8211, 0x1de0, 0x7170, 0x3400, 0x8001, 0x9102, 0x0120, 0x0218,</div><div class='del'>-	0x20a8, 0x900e, 0x4104, 0x2009, 0x1800, 0x810d, 0x810d, 0x810d,</div><div class='del'>-	0x810d, 0x810d, 0x918c, 0x001f, 0x2001, 0x0001, 0x9112, 0x20e9,</div><div class='del'>-	0x0001, 0x20a1, 0x0800, 0x900e, 0x20a9, 0x0800, 0x4104, 0x8211,</div><div class='del'>-	0x1dd8, 0x080c, 0x0f71, 0x080c, 0x61ab, 0x080c, 0xb102, 0x080c,</div><div class='del'>-	0x1128, 0x080c, 0x1352, 0x080c, 0x1c1c, 0x080c, 0x9582, 0x080c,</div><div class='del'>-	0x0d17, 0x080c, 0x10ad, 0x080c, 0x358e, 0x080c, 0x7aca, 0x080c,</div><div class='del'>-	0x6cea, 0x080c, 0x8c5d, 0x080c, 0x88be, 0x080c, 0x22bf, 0x080c,</div><div class='del'>-	0x81f5, 0x080c, 0x20f5, 0x080c, 0x2233, 0x080c, 0x22b4, 0x2091,</div><div class='del'>-	0x3009, 0x7883, 0x0000, 0x1004, 0x0943, 0x7880, 0x9086, 0x0002,</div><div class='del'>-	0x1190, 0x7883, 0x4000, 0x7837, 0x4000, 0x7833, 0x0010, 0x0e04,</div><div class='del'>-	0x0937, 0x2091, 0x5000, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,</div><div class='del'>-	0xd084, 0x190c, 0x1200, 0x2071, 0x1800, 0x7003, 0x0000, 0x780c,</div><div class='del'>-	0x9084, 0x0030, 0x9086, 0x0020, 0x1168, 0x7034, 0xc08d, 0x7036,</div><div class='del'>-	0x2001, 0x0050, 0x7076, 0x707a, 0x7056, 0x606b, 0x269c, 0x2071,</div><div class='del'>-	0x1b73, 0x2072, 0x2071, 0x1800, 0x7000, 0x908e, 0x0003, 0x1168,</div><div class='del'>-	0x080c, 0x4d66, 0x080c, 0x35b5, 0x080c, 0x7b32, 0x080c, 0x7275,</div><div class='del'>-	0x080c, 0x8d44, 0x080c, 0x88e7, 0x0c68, 0x000b, 0x0c88, 0x0979,</div><div class='del'>-	0x097a, 0x0b15, 0x0977, 0x0bcf, 0x0d16, 0x0d16, 0x0d16, 0x080c,</div><div class='del'>-	0x0d85, 0x0005, 0x0126, 0x00f6, 0x2091, 0x8000, 0x7000, 0x9086,</div><div class='del'>-	0x0001, 0x1904, 0x0ae8, 0x080c, 0x0ec4, 0x080c, 0x779e, 0x0150,</div><div class='del'>-	0x080c, 0x77c1, 0x15b0, 0x2079, 0x0100, 0x7828, 0x9085, 0x1800,</div><div class='del'>-	0x782a, 0x0478, 0x080c, 0x76cd, 0x7000, 0x9086, 0x0001, 0x1904,</div><div class='del'>-	0x0ae8, 0x7098, 0x9086, 0x0029, 0x1904, 0x0ae8, 0x080c, 0x88a7,</div><div class='del'>-	0x080c, 0x8899, 0x2001, 0x0161, 0x2003, 0x0001, 0x2079, 0x0100,</div><div class='del'>-	0x2011, 0xffff, 0x080c, 0x2ad3, 0x7a28, 0x9295, 0x5e2c, 0x7a2a,</div><div class='del'>-	0x2011, 0x7612, 0x080c, 0x8993, 0x2011, 0x7605, 0x080c, 0x8a9f,</div><div class='del'>-	0x2011, 0x6002, 0x080c, 0x8993, 0x2011, 0x8030, 0x901e, 0x7396,</div><div class='del'>-	0x04d0, 0x080c, 0x58aa, 0x2079, 0x0100, 0x7844, 0x9005, 0x1904,</div><div class='del'>-	0x0ae8, 0x2011, 0x6002, 0x080c, 0x8993, 0x2011, 0x7612, 0x080c,</div><div class='del'>-	0x8993, 0x2011, 0x7605, 0x080c, 0x8a9f, 0x2001, 0x0265, 0x2001,</div><div class='del'>-	0x0205, 0x2003, 0x0000, 0x7840, 0x9084, 0xfffb, 0x7842, 0x2001,</div><div class='del'>-	0x19a7, 0x2004, 0x9005, 0x1140, 0x00c6, 0x2061, 0x0100, 0x080c,</div><div class='del'>-	0x6153, 0x00ce, 0x0804, 0x0ae8, 0x780f, 0x006b, 0x7a28, 0x080c,</div><div class='del'>-	0x77a6, 0x0118, 0x9295, 0x5e2c, 0x0010, 0x9295, 0x402c, 0x7a2a,</div><div class='del'>-	0x2011, 0x8010, 0x73d8, 0x2001, 0x19a8, 0x2003, 0x0001, 0x080c,</div><div class='del'>-	0x299b, 0x080c, 0x4ca1, 0x7248, 0xc284, 0x724a, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0xc1ac, 0xc1cc, 0x2102, 0x2001, 0x0390, 0x2003, 0x0400,</div><div class='del'>-	0x080c, 0xacfc, 0x080c, 0xa4f1, 0x2011, 0x0004, 0x080c, 0xcf2b,</div><div class='del'>-	0x080c, 0xad18, 0x080c, 0x6ab1, 0x080c, 0x779e, 0x1120, 0x080c,</div><div class='del'>-	0x29fc, 0x0600, 0x0420, 0x080c, 0x615a, 0x0140, 0x7097, 0x0001,</div><div class='del'>-	0x70d3, 0x0000, 0x080c, 0x5a7c, 0x0804, 0x0ae8, 0x2001, 0x0390,</div><div class='del'>-	0x2003, 0x0404, 0x080c, 0x5840, 0xd094, 0x0188, 0x2011, 0x180c,</div><div class='del'>-	0x2204, 0xc0cd, 0x2012, 0x080c, 0x5844, 0xd0d4, 0x1118, 0x080c,</div><div class='del'>-	0x29fc, 0x1270, 0x2011, 0x180c, 0x2204, 0xc0bc, 0x00a8, 0x080c,</div><div class='del'>-	0x5844, 0xd0d4, 0x1db8, 0x2011, 0x180c, 0x2204, 0xc0bd, 0x0060,</div><div class='del'>-	0x2011, 0x180c, 0x2204, 0xc0bd, 0x2012, 0x080c, 0x6c09, 0x1128,</div><div class='del'>-	0xd0a4, 0x0118, 0x2204, 0xc0fd, 0x2012, 0x080c, 0x6bcf, 0x0120,</div><div class='del'>-	0x7a0c, 0xc2b4, 0x7a0e, 0x00a8, 0x707f, 0x0000, 0x080c, 0x779e,</div><div class='del'>-	0x1130, 0x70b0, 0x9005, 0x1168, 0x080c, 0xd389, 0x0050, 0x080c,</div><div class='del'>-	0xd389, 0x70dc, 0xd09c, 0x1128, 0x70b0, 0x9005, 0x0110, 0x080c,</div><div class='del'>-	0x6130, 0x70e7, 0x0000, 0x70e3, 0x0000, 0x70a7, 0x0000, 0x080c,</div><div class='del'>-	0x2a04, 0x0228, 0x2011, 0x0101, 0x2204, 0xc0c4, 0x2012, 0x72dc,</div><div class='del'>-	0x080c, 0x779e, 0x1178, 0x9016, 0x0016, 0x080c, 0x27a4, 0x2019,</div><div class='del'>-	0x196d, 0x211a, 0x001e, 0x705f, 0xffff, 0x7063, 0x00ef, 0x7083,</div><div class='del'>-	0x0000, 0x0020, 0x2019, 0x196d, 0x201b, 0x0000, 0x2079, 0x1847,</div><div class='del'>-	0x7804, 0xd0ac, 0x0108, 0xc295, 0x72de, 0x080c, 0x779e, 0x0118,</div><div class='del'>-	0x9296, 0x0004, 0x0518, 0x2011, 0x0001, 0x080c, 0xcf2b, 0x70ab,</div><div class='del'>-	0x0000, 0x70af, 0xffff, 0x7003, 0x0002, 0x00fe, 0x080c, 0x30bf,</div><div class='del'>-	0x080c, 0xacfc, 0x2011, 0x0005, 0x080c, 0xa62b, 0x080c, 0xad18,</div><div class='del'>-	0x080c, 0x779e, 0x0148, 0x00c6, 0x2061, 0x0100, 0x0016, 0x080c,</div><div class='del'>-	0x27a4, 0x61e2, 0x001e, 0x00ce, 0x012e, 0x00e0, 0x70ab, 0x0000,</div><div class='del'>-	0x70af, 0xffff, 0x7003, 0x0002, 0x080c, 0xacfc, 0x2011, 0x0005,</div><div class='del'>-	0x080c, 0xa62b, 0x080c, 0xad18, 0x080c, 0x779e, 0x0148, 0x00c6,</div><div class='del'>-	0x2061, 0x0100, 0x0016, 0x080c, 0x27a4, 0x61e2, 0x001e, 0x00ce,</div><div class='del'>-	0x00fe, 0x012e, 0x0005, 0x00c6, 0x00b6, 0x080c, 0x779e, 0x1118,</div><div class='del'>-	0x20a9, 0x0800, 0x0010, 0x20a9, 0x0782, 0x080c, 0x779e, 0x1110,</div><div class='del'>-	0x900e, 0x0010, 0x2009, 0x007e, 0x86ff, 0x0138, 0x9180, 0x1000,</div><div class='del'>-	0x2004, 0x905d, 0x0110, 0xb800, 0xd0bc, 0x090c, 0x341e, 0x8108,</div><div class='del'>-	0x1f04, 0x0afc, 0x707f, 0x0000, 0x7080, 0x9084, 0x00ff, 0x7082,</div><div class='del'>-	0x70b3, 0x0000, 0x00be, 0x00ce, 0x0005, 0x00b6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x7000, 0x9086, 0x0002, 0x1904, 0x0bcc, 0x70ac, 0x9086,</div><div class='del'>-	0xffff, 0x0120, 0x080c, 0x30bf, 0x0804, 0x0bcc, 0x70dc, 0xd0ac,</div><div class='del'>-	0x1110, 0xd09c, 0x0538, 0xd084, 0x0528, 0x0006, 0x2001, 0x0103,</div><div class='del'>-	0x2003, 0x002b, 0x000e, 0xd08c, 0x01e8, 0x080c, 0x3487, 0x11b0,</div><div class='del'>-	0x70e0, 0x9086, 0xffff, 0x0190, 0x080c, 0x327b, 0x70dc, 0xd094,</div><div class='del'>-	0x1904, 0x0bcc, 0x2011, 0x0001, 0x080c, 0xd645, 0x0110, 0x2011,</div><div class='del'>-	0x0003, 0x901e, 0x080c, 0x32b5, 0x0804, 0x0bcc, 0x70e4, 0x9005,</div><div class='del'>-	0x1904, 0x0bcc, 0x70a8, 0x9005, 0x1904, 0x0bcc, 0x70dc, 0xd0a4,</div><div class='del'>-	0x0118, 0xd0b4, 0x0904, 0x0bcc, 0x080c, 0x6bcf, 0x1904, 0x0bcc,</div><div class='del'>-	0x080c, 0x6c22, 0x1904, 0x0bcc, 0x080c, 0x6c09, 0x01c0, 0x0156,</div><div class='del'>-	0x00c6, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x67b4, 0x1118,</div><div class='del'>-	0xb800, 0xd0ec, 0x1138, 0x001e, 0x8108, 0x1f04, 0x0b6c, 0x00ce,</div><div class='del'>-	0x015e, 0x0028, 0x001e, 0x00ce, 0x015e, 0x0804, 0x0bcc, 0x0006,</div><div class='del'>-	0x2001, 0x0103, 0x2003, 0x002b, 0x000e, 0x2011, 0x19b4, 0x080c,</div><div class='del'>-	0x0fe1, 0x2011, 0x19ce, 0x080c, 0x0fe1, 0x7030, 0xc08c, 0x7032,</div><div class='del'>-	0x7003, 0x0003, 0x70af, 0xffff, 0x080c, 0x0e98, 0x9006, 0x080c,</div><div class='del'>-	0x2631, 0x080c, 0x3487, 0x0118, 0x080c, 0x4e3e, 0x0050, 0x0036,</div><div class='del'>-	0x0046, 0x2019, 0xffff, 0x2021, 0x0006, 0x080c, 0x4e58, 0x004e,</div><div class='del'>-	0x003e, 0x00f6, 0x2079, 0x0100, 0x080c, 0x77c1, 0x0150, 0x080c,</div><div class='del'>-	0x779e, 0x7828, 0x0118, 0x9084, 0xe1ff, 0x0010, 0x9084, 0xffdf,</div><div class='del'>-	0x782a, 0x00fe, 0x080c, 0xacfc, 0x2001, 0x19e9, 0x2004, 0x9086,</div><div class='del'>-	0x0005, 0x1120, 0x2011, 0x0000, 0x080c, 0xa62b, 0x2011, 0x0000,</div><div class='del'>-	0x080c, 0xa635, 0x080c, 0xad18, 0x012e, 0x00be, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x0046, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2079, 0x0100,</div><div class='del'>-	0x7904, 0x918c, 0xfffd, 0x7906, 0x2009, 0x00f7, 0x080c, 0x6119,</div><div class='del'>-	0x7940, 0x918c, 0x0010, 0x7942, 0x7924, 0xd1b4, 0x0120, 0x2011,</div><div class='del'>-	0x0040, 0x080c, 0x2ad3, 0xd19c, 0x0120, 0x2011, 0x0008, 0x080c,</div><div class='del'>-	0x2ad3, 0x0006, 0x0036, 0x0156, 0x0000, 0x2001, 0x19a8, 0x2004,</div><div class='del'>-	0x9005, 0x1518, 0x080c, 0x2a67, 0x1148, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x29ca, 0x2001, 0x0001, 0x080c, 0x29ad, 0x00b8, 0x080c, 0x2a6f,</div><div class='del'>-	0x1138, 0x9006, 0x080c, 0x29ca, 0x9006, 0x080c, 0x29ad, 0x0068,</div><div class='del'>-	0x080c, 0x2a77, 0x1d50, 0x2001, 0x1998, 0x2004, 0xd0fc, 0x0108,</div><div class='del'>-	0x0020, 0x080c, 0x27d8, 0x0804, 0x0cc9, 0x20a9, 0x003a, 0x1d04,</div><div class='del'>-	0x0c1f, 0x080c, 0x8a7f, 0x1f04, 0x0c1f, 0x080c, 0x77af, 0x0148,</div><div class='del'>-	0x080c, 0x77c1, 0x1118, 0x080c, 0x7ac5, 0x0050, 0x080c, 0x77a6,</div><div class='del'>-	0x0dd0, 0x080c, 0x7ac0, 0x080c, 0x7ab6, 0x080c, 0x76cd, 0x0020,</div><div class='del'>-	0x2009, 0x00f8, 0x080c, 0x6119, 0x7850, 0xc0e5, 0x7852, 0x080c,</div><div class='del'>-	0x779e, 0x0120, 0x7843, 0x0090, 0x7843, 0x0010, 0x2021, 0xe678,</div><div class='del'>-	0x2019, 0xea60, 0x0d0c, 0x8a7f, 0x7820, 0xd09c, 0x15a0, 0x080c,</div><div class='del'>-	0x779e, 0x0904, 0x0cab, 0x7824, 0xd0ac, 0x1904, 0x0cce, 0x080c,</div><div class='del'>-	0x77c1, 0x1548, 0x0046, 0x2021, 0x0320, 0x8421, 0x1df0, 0x004e,</div><div class='del'>-	0x2011, 0x1800, 0x080c, 0x2ad3, 0x080c, 0x2a7f, 0x7824, 0x9084,</div><div class='del'>-	0x1800, 0x1168, 0x9484, 0x0fff, 0x1140, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0x9084, 0x9000, 0x0110, 0x080c, 0x0cf1, 0x8421, 0x1160, 0x1d04,</div><div class='del'>-	0x0c7b, 0x080c, 0x8a7f, 0x080c, 0x7ac0, 0x080c, 0x7ab6, 0x7003,</div><div class='del'>-	0x0001, 0x0804, 0x0cce, 0x8319, 0x1928, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0x9084, 0x9000, 0x0110, 0x080c, 0x0cf1, 0x1d04, 0x0c91, 0x080c,</div><div class='del'>-	0x8a7f, 0x2009, 0x199b, 0x2104, 0x9005, 0x0118, 0x8001, 0x200a,</div><div class='del'>-	0x1188, 0x200b, 0x000a, 0x2011, 0x0048, 0x080c, 0x2ad3, 0x20a9,</div><div class='del'>-	0x0002, 0x080c, 0x2a60, 0x7924, 0x080c, 0x2a7f, 0xd19c, 0x0110,</div><div class='del'>-	0x080c, 0x299b, 0x00f0, 0x080c, 0x77af, 0x1140, 0x94a2, 0x03e8,</div><div class='del'>-	0x1128, 0x080c, 0x7772, 0x7003, 0x0001, 0x00c0, 0x2011, 0x1800,</div><div class='del'>-	0x080c, 0x2ad3, 0x080c, 0x2a7f, 0x7824, 0x080c, 0x77b8, 0x0110,</div><div class='del'>-	0xd0ac, 0x1160, 0x9084, 0x1800, 0x0904, 0x0c83, 0x7003, 0x0001,</div><div class='del'>-	0x0028, 0x2001, 0x0001, 0x080c, 0x2631, 0x00a0, 0x7850, 0xc0e4,</div><div class='del'>-	0x7852, 0x2009, 0x180c, 0x210c, 0xd19c, 0x1120, 0x7904, 0x918d,</div><div class='del'>-	0x0002, 0x7906, 0x2011, 0x0048, 0x080c, 0x2ad3, 0x7828, 0x9085,</div><div class='del'>-	0x0028, 0x782a, 0x2001, 0x19a8, 0x2003, 0x0000, 0x9006, 0x78f2,</div><div class='del'>-	0x015e, 0x003e, 0x000e, 0x012e, 0x00fe, 0x004e, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x0006, 0x0016, 0x0026, 0x0036, 0x0046, 0x00b6, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x00f6, 0x0156, 0x0071, 0x0d0c, 0x8a7f, 0x015e,</div><div class='del'>-	0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x004e, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x00e6, 0x2071, 0x189e, 0x7004, 0x9086,</div><div class='del'>-	0x0001, 0x1110, 0x080c, 0x35b5, 0x00ee, 0x0005, 0x0005, 0x2a70,</div><div class='del'>-	0x2061, 0x19ac, 0x2063, 0x0003, 0x6007, 0x0003, 0x600b, 0x0014,</div><div class='del'>-	0x600f, 0x0137, 0x2001, 0x197c, 0x900e, 0x2102, 0x7196, 0x2001,</div><div class='del'>-	0x0100, 0x2004, 0x9082, 0x0002, 0x0218, 0x705f, 0xffff, 0x0008,</div><div class='del'>-	0x715e, 0x7067, 0xffff, 0x717e, 0x7182, 0x080c, 0xd389, 0x70ef,</div><div class='del'>-	0x00c0, 0x2061, 0x196c, 0x6003, 0x0909, 0x6106, 0x600b, 0x8800,</div><div class='del'>-	0x600f, 0x0200, 0x6013, 0x00ff, 0x6017, 0x001f, 0x611a, 0x601f,</div><div class='del'>-	0x07d0, 0x2061, 0x1974, 0x6003, 0x8000, 0x6106, 0x610a, 0x600f,</div><div class='del'>-	0x0200, 0x6013, 0x00ff, 0x6116, 0x601b, 0x0001, 0x611e, 0x2061,</div><div class='del'>-	0x1989, 0x6003, 0x514c, 0x6007, 0x4f47, 0x600b, 0x4943, 0x600f,</div><div class='del'>-	0x2020, 0x2001, 0x182c, 0x2102, 0x0005, 0x9016, 0x080c, 0x67b4,</div><div class='del'>-	0x1178, 0xb804, 0x90c4, 0x00ff, 0x98c6, 0x0006, 0x0128, 0x90c4,</div><div class='del'>-	0xff00, 0x98c6, 0x0600, 0x1120, 0x9186, 0x0080, 0x0108, 0x8210,</div><div class='del'>-	0x8108, 0x9186, 0x0800, 0x1d50, 0x2208, 0x0005, 0x2091, 0x8000,</div><div class='del'>-	0x2079, 0x0000, 0x000e, 0x00f6, 0x0010, 0x2091, 0x8000, 0x0e04,</div><div class='del'>-	0x0d87, 0x0006, 0x0016, 0x2001, 0x8002, 0x0006, 0x2079, 0x0000,</div><div class='del'>-	0x000e, 0x7882, 0x7836, 0x001e, 0x798e, 0x000e, 0x788a, 0x000e,</div><div class='del'>-	0x7886, 0x3900, 0x789a, 0x00d6, 0x2069, 0x0300, 0x6818, 0x78ae,</div><div class='del'>-	0x681c, 0x78b2, 0x6808, 0x78be, 0x00de, 0x7833, 0x0012, 0x2091,</div><div class='del'>-	0x5000, 0x0156, 0x00d6, 0x0036, 0x0026, 0x2079, 0x0300, 0x2069,</div><div class='del'>-	0x1b2b, 0x7a08, 0x226a, 0x2069, 0x1b2c, 0x7a18, 0x226a, 0x8d68,</div><div class='del'>-	0x7a1c, 0x226a, 0x782c, 0x2019, 0x1b39, 0x201a, 0x2019, 0x1b3c,</div><div class='del'>-	0x9016, 0x7808, 0xd09c, 0x0168, 0x7820, 0x201a, 0x8210, 0x8318,</div><div class='del'>-	0x9386, 0x1b55, 0x0108, 0x0ca8, 0x7808, 0xd09c, 0x0110, 0x2011,</div><div class='del'>-	0xdead, 0x2019, 0x1b3a, 0x782c, 0x201a, 0x8318, 0x221a, 0x7803,</div><div class='del'>-	0x0000, 0x2069, 0x1a81, 0x901e, 0x20a9, 0x0020, 0x7b26, 0x7a28,</div><div class='del'>-	0x226a, 0x8d68, 0x8318, 0x1f04, 0x0dde, 0x2069, 0x1aa1, 0x2019,</div><div class='del'>-	0x0050, 0x20a9, 0x0020, 0x7b26, 0x7a28, 0x226a, 0x8d68, 0x8318,</div><div class='del'>-	0x1f04, 0x0deb, 0x0491, 0x002e, 0x003e, 0x00de, 0x015e, 0x2079,</div><div class='del'>-	0x1800, 0x7803, 0x0005, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,</div><div class='del'>-	0xd084, 0x0180, 0x2001, 0x1a25, 0x2004, 0x9005, 0x0128, 0x2001,</div><div class='del'>-	0x008b, 0x2004, 0xd0fc, 0x0dd8, 0x2001, 0x008a, 0x2003, 0x0002,</div><div class='del'>-	0x2003, 0x1001, 0x080c, 0x584f, 0x1170, 0x080c, 0x0f32, 0x0110,</div><div class='del'>-	0x080c, 0x0e85, 0x080c, 0x584f, 0x1130, 0x2071, 0x1800, 0x2011,</div><div class='del'>-	0x8000, 0x080c, 0x0f46, 0x0c70, 0x0005, 0x2001, 0x0382, 0x2004,</div><div class='del'>-	0x9084, 0x0007, 0x9086, 0x0001, 0x1120, 0x2001, 0x0015, 0x080c,</div><div class='del'>-	0xaced, 0x2079, 0x0380, 0x2069, 0x1b0b, 0x7818, 0x6802, 0x781c,</div><div class='del'>-	0x6806, 0x7840, 0x680a, 0x7844, 0x680e, 0x782c, 0x6812, 0x2019,</div><div class='del'>-	0x1b16, 0x9016, 0x7808, 0xd09c, 0x0150, 0x7820, 0x201a, 0x8210,</div><div class='del'>-	0x8318, 0x8210, 0x9282, 0x0011, 0x0ea8, 0x2011, 0xdead, 0x6a2a,</div><div class='del'>-	0x7830, 0x681a, 0x7834, 0x681e, 0x7838, 0x6822, 0x783c, 0x6826,</div><div class='del'>-	0x7803, 0x0000, 0x2069, 0x1acb, 0x901e, 0x20a9, 0x0020, 0x7b26,</div><div class='del'>-	0x7828, 0x206a, 0x8d68, 0x8318, 0x1f04, 0x0e5f, 0x2069, 0x1aeb,</div><div class='del'>-	0x2019, 0x00b0, 0x20a9, 0x0020, 0x7b26, 0x7828, 0x206a, 0x8d68,</div><div class='del'>-	0x8318, 0x1f04, 0x0e6c, 0x0005, 0x918c, 0x03ff, 0x2001, 0x0003,</div><div class='del'>-	0x2004, 0x9084, 0x0600, 0x1118, 0x918d, 0x6c00, 0x0010, 0x918d,</div><div class='del'>-	0x6400, 0x2001, 0x017f, 0x2102, 0x0005, 0x0026, 0x0126, 0x2011,</div><div class='del'>-	0x0080, 0x080c, 0x0f24, 0x20a9, 0x0900, 0x080c, 0x0f5a, 0x2011,</div><div class='del'>-	0x0040, 0x080c, 0x0f24, 0x20a9, 0x0900, 0x080c, 0x0f5a, 0x0c78,</div><div class='del'>-	0x0026, 0x080c, 0x0f32, 0x1188, 0x2011, 0x010e, 0x2214, 0x9294,</div><div class='del'>-	0x0007, 0x9296, 0x0007, 0x0118, 0x2011, 0x0947, 0x0010, 0x2011,</div><div class='del'>-	0x1b47, 0x080c, 0x0f46, 0x002e, 0x0005, 0x2011, 0x010e, 0x2214,</div><div class='del'>-	0x9294, 0x0007, 0x9296, 0x0007, 0x0118, 0x2011, 0xa880, 0x0010,</div><div class='del'>-	0x2011, 0x6840, 0xd0e4, 0x70f3, 0x0000, 0x1120, 0x70f3, 0x0fa0,</div><div class='del'>-	0x080c, 0x0f37, 0x002e, 0x0005, 0x0026, 0x080c, 0x0f32, 0x0148,</div><div class='del'>-	0xd0a4, 0x1138, 0x2011, 0xcdd5, 0x0010, 0x2011, 0x0080, 0x080c,</div><div class='del'>-	0x0f37, 0x002e, 0x0005, 0x0026, 0x70f3, 0x0000, 0x080c, 0x0f32,</div><div class='del'>-	0x1130, 0x2011, 0x8040, 0x080c, 0x0f46, 0x002e, 0x0005, 0x080c,</div><div class='del'>-	0x2a77, 0x1118, 0x2011, 0xcdc5, 0x0010, 0x2011, 0xcac2, 0x080c,</div><div class='del'>-	0x0f37, 0x002e, 0x0005, 0x00e6, 0x0016, 0x0006, 0x2071, 0x1800,</div><div class='del'>-	0xd0b4, 0x70ec, 0x71e8, 0x1118, 0xc0e4, 0xc1f4, 0x0050, 0x0006,</div><div class='del'>-	0x3b00, 0x9084, 0xff3e, 0x20d8, 0x000e, 0x70f3, 0x0000, 0xc0e5,</div><div class='del'>-	0xc1f5, 0x0099, 0x000e, 0x001e, 0x00ee, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x1800, 0xd0e4, 0x70ec, 0x1110, 0xc0dc, 0x0008, 0xc0dd, 0x0016,</div><div class='del'>-	0x71e8, 0x0019, 0x001e, 0x00ee, 0x0005, 0x70ee, 0x71ea, 0x7000,</div><div class='del'>-	0x9084, 0x0007, 0x000b, 0x0005, 0x0eea, 0x0ec4, 0x0ec4, 0x0e98,</div><div class='del'>-	0x0ed3, 0x0ec4, 0x0ec4, 0x0ed3, 0xc284, 0x0016, 0x3b08, 0x3a00,</div><div class='del'>-	0x9104, 0x918d, 0x00c1, 0x21d8, 0x9084, 0xff3e, 0x9205, 0x20d0,</div><div class='del'>-	0x001e, 0x0005, 0x2001, 0x183b, 0x2004, 0xd0dc, 0x0005, 0x9e86,</div><div class='del'>-	0x1800, 0x190c, 0x0d85, 0x70ec, 0xd0e4, 0x0108, 0xc2e5, 0x72ee,</div><div class='del'>-	0xd0e4, 0x1118, 0x9294, 0x00c1, 0x08f9, 0x0005, 0x9e86, 0x1800,</div><div class='del'>-	0x190c, 0x0d85, 0x70e8, 0xd0f4, 0x0108, 0xc2f5, 0x72ea, 0xd0f4,</div><div class='del'>-	0x1140, 0x9284, 0x8000, 0x8005, 0xc284, 0x9215, 0x9294, 0x00c1,</div><div class='del'>-	0x0861, 0x0005, 0x1d04, 0x0f5a, 0x2091, 0x6000, 0x1f04, 0x0f5a,</div><div class='del'>-	0x0005, 0x890e, 0x810e, 0x810f, 0x9194, 0x003f, 0x918c, 0xffc0,</div><div class='del'>-	0x0005, 0x0006, 0x2200, 0x914d, 0x894f, 0x894d, 0x894d, 0x000e,</div><div class='del'>-	0x0005, 0x01d6, 0x0146, 0x0036, 0x0096, 0x2061, 0x188d, 0x600b,</div><div class='del'>-	0x0000, 0x600f, 0x0000, 0x6003, 0x0000, 0x6007, 0x0000, 0x2009,</div><div class='del'>-	0xffc0, 0x2105, 0x0006, 0x2001, 0xaaaa, 0x200f, 0x2019, 0x5555,</div><div class='del'>-	0x9016, 0x2049, 0x0bff, 0xab02, 0xa001, 0xa001, 0xa800, 0x9306,</div><div class='del'>-	0x1138, 0x2105, 0x9306, 0x0120, 0x8210, 0x99c8, 0x0400, 0x0c98,</div><div class='del'>-	0x000e, 0x200f, 0x2001, 0x189d, 0x928a, 0x000e, 0x1638, 0x928a,</div><div class='del'>-	0x0006, 0x2011, 0x0006, 0x1210, 0x2011, 0x0000, 0x2202, 0x9006,</div><div class='del'>-	0x2008, 0x82ff, 0x01b0, 0x8200, 0x600a, 0x600f, 0xffff, 0x6003,</div><div class='del'>-	0x0002, 0x6007, 0x0000, 0x0026, 0x2019, 0x0010, 0x9280, 0x0001,</div><div class='del'>-	0x20e8, 0x21a0, 0x21a8, 0x4104, 0x8319, 0x1de0, 0x8211, 0x1da0,</div><div class='del'>-	0x002e, 0x009e, 0x003e, 0x014e, 0x01de, 0x0005, 0x2011, 0x000e,</div><div class='del'>-	0x08e8, 0x0016, 0x0026, 0x0096, 0x3348, 0x080c, 0x0f61, 0x2100,</div><div class='del'>-	0x9300, 0x2098, 0x22e0, 0x009e, 0x002e, 0x001e, 0x0036, 0x3518,</div><div class='del'>-	0x20a9, 0x0001, 0x4002, 0x8007, 0x4004, 0x8319, 0x1dd8, 0x003e,</div><div class='del'>-	0x0005, 0x20e9, 0x0001, 0x71b8, 0x81ff, 0x11c0, 0x9006, 0x2009,</div><div class='del'>-	0x0200, 0x20a9, 0x0002, 0x9298, 0x0018, 0x23a0, 0x4001, 0x2009,</div><div class='del'>-	0x0700, 0x20a9, 0x0002, 0x9298, 0x0008, 0x23a0, 0x4001, 0x707c,</div><div class='del'>-	0x8007, 0x7180, 0x810f, 0x20a9, 0x0002, 0x4001, 0x9298, 0x000c,</div><div class='del'>-	0x23a0, 0x900e, 0x080c, 0x0d65, 0x2001, 0x0000, 0x810f, 0x20a9,</div><div class='del'>-	0x0002, 0x4001, 0x0005, 0x89ff, 0x0140, 0xa804, 0xa807, 0x0000,</div><div class='del'>-	0x0006, 0x080c, 0x108b, 0x009e, 0x0cb0, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x1800, 0x080c, 0x1104, 0x090c, 0x0d85, 0x00ee, 0x0005, 0x0086,</div><div class='del'>-	0x00e6, 0x0006, 0x0026, 0x0036, 0x0126, 0x2091, 0x8000, 0x00c9,</div><div class='del'>-	0x2071, 0x1800, 0x73c0, 0x702c, 0x9016, 0x9045, 0x0158, 0x8210,</div><div class='del'>-	0x9906, 0x090c, 0x0d85, 0x2300, 0x9202, 0x0120, 0x1a0c, 0x0d85,</div><div class='del'>-	0xa000, 0x0c98, 0x012e, 0x003e, 0x002e, 0x000e, 0x00ee, 0x008e,</div><div class='del'>-	0x0005, 0x0086, 0x00e6, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x1910, 0x7010, 0x9005, 0x0140, 0x7018, 0x9045, 0x0128, 0x9906,</div><div class='del'>-	0x090c, 0x0d85, 0xa000, 0x0cc8, 0x012e, 0x000e, 0x00ee, 0x008e,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0x1800, 0x0126, 0x2091, 0x8000, 0x70c0,</div><div class='del'>-	0x8001, 0x0270, 0x70c2, 0x702c, 0x2048, 0x9085, 0x0001, 0xa800,</div><div class='del'>-	0x702e, 0xa803, 0x0000, 0xa807, 0x0000, 0x012e, 0x00ee, 0x0005,</div><div class='del'>-	0x904e, 0x0cd8, 0x00e6, 0x0126, 0x2091, 0x8000, 0x2071, 0x1800,</div><div class='del'>-	0x70c0, 0x90ca, 0x0020, 0x0268, 0x8001, 0x70c2, 0x702c, 0x2048,</div><div class='del'>-	0xa800, 0x702e, 0xa803, 0x0000, 0xa807, 0x0000, 0x012e, 0x00ee,</div><div class='del'>-	0x0005, 0x904e, 0x0cd8, 0x00e6, 0x0126, 0x2091, 0x8000, 0x0016,</div><div class='del'>-	0x890e, 0x810e, 0x810f, 0x9184, 0x003f, 0xa862, 0x9184, 0xffc0,</div><div class='del'>-	0xa85e, 0x001e, 0x0020, 0x00e6, 0x0126, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x1800, 0x702c, 0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2,</div><div class='del'>-	0x080c, 0x8899, 0x012e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x9026,</div><div class='del'>-	0x2009, 0x0000, 0x2049, 0x0400, 0x2900, 0x702e, 0x8940, 0x2800,</div><div class='del'>-	0xa802, 0xa95e, 0xa863, 0x0001, 0x8420, 0x9886, 0x0440, 0x0120,</div><div class='del'>-	0x2848, 0x9188, 0x0040, 0x0c90, 0x2071, 0x188d, 0x7000, 0x9005,</div><div class='del'>-	0x11a0, 0x2001, 0x0558, 0xa802, 0x2048, 0x2009, 0x5600, 0x8940,</div><div class='del'>-	0x2800, 0xa802, 0xa95e, 0xa863, 0x0001, 0x8420, 0x9886, 0x0800,</div><div class='del'>-	0x0120, 0x2848, 0x9188, 0x0040, 0x0c90, 0x2071, 0x188d, 0x7104,</div><div class='del'>-	0x7200, 0x82ff, 0x01d0, 0x7308, 0x8318, 0x831f, 0x831b, 0x831b,</div><div class='del'>-	0x7312, 0x8319, 0x2001, 0x0800, 0xa802, 0x2048, 0x8900, 0xa802,</div><div class='del'>-	0x2040, 0xa95e, 0xaa62, 0x8420, 0x2300, 0x9906, 0x0130, 0x2848,</div><div class='del'>-	0x9188, 0x0040, 0x9291, 0x0000, 0x0c88, 0xa803, 0x0000, 0x2071,</div><div class='del'>-	0x1800, 0x74be, 0x74c2, 0x0005, 0x00e6, 0x0016, 0x9984, 0xfc00,</div><div class='del'>-	0x01e8, 0x908c, 0xf800, 0x1168, 0x9982, 0x0400, 0x02b8, 0x9982,</div><div class='del'>-	0x0440, 0x0278, 0x9982, 0x0558, 0x0288, 0x9982, 0x0800, 0x1270,</div><div class='del'>-	0x0040, 0x9982, 0x0800, 0x0250, 0x2071, 0x188d, 0x7010, 0x9902,</div><div class='del'>-	0x1228, 0x9085, 0x0001, 0x001e, 0x00ee, 0x0005, 0x9006, 0x0cd8,</div><div class='del'>-	0x00e6, 0x2071, 0x1a24, 0x7007, 0x0000, 0x9006, 0x701e, 0x7022,</div><div class='del'>-	0x7002, 0x2071, 0x0000, 0x7010, 0x9085, 0x8044, 0x7012, 0x2071,</div><div class='del'>-	0x0080, 0x9006, 0x702b, 0x0060, 0x20a9, 0x0040, 0x7022, 0x1f04,</div><div class='del'>-	0x113e, 0x702b, 0x0060, 0x702b, 0x0020, 0x20a9, 0x0040, 0x7022,</div><div class='del'>-	0x1f04, 0x1147, 0x702b, 0x0020, 0x00ee, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x00e6, 0xa06f, 0x0000, 0x2071, 0x1a24, 0x701c, 0x9088,</div><div class='del'>-	0x1a2e, 0x280a, 0x8000, 0x9084, 0x003f, 0x701e, 0x7120, 0x9106,</div><div class='del'>-	0x090c, 0x0d85, 0x7004, 0x9005, 0x1128, 0x00f6, 0x2079, 0x0080,</div><div class='del'>-	0x00a9, 0x00fe, 0x00ee, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x00e6, 0x2071, 0x1a24, 0x7004, 0x9005, 0x1128, 0x00f6, 0x2079,</div><div class='del'>-	0x0080, 0x0021, 0x00fe, 0x00ee, 0x012e, 0x0005, 0x7004, 0x9086,</div><div class='del'>-	0x0000, 0x1110, 0x7007, 0x0006, 0x7000, 0x0002, 0x1190, 0x1313,</div><div class='del'>-	0x118e, 0x118e, 0x1307, 0x1307, 0x1307, 0x1307, 0x080c, 0x0d85,</div><div class='del'>-	0x701c, 0x7120, 0x9106, 0x1148, 0x792c, 0x9184, 0x0001, 0x1120,</div><div class='del'>-	0xd1fc, 0x1110, 0x7007, 0x0000, 0x0005, 0x0096, 0x9180, 0x1a2e,</div><div class='del'>-	0x2004, 0x700a, 0x2048, 0x8108, 0x918c, 0x003f, 0x7122, 0x782b,</div><div class='del'>-	0x0026, 0xa88c, 0x7802, 0xa890, 0x7806, 0xa894, 0x780a, 0xa898,</div><div class='del'>-	0x780e, 0xa878, 0x700e, 0xa870, 0x7016, 0xa874, 0x701a, 0xa868,</div><div class='del'>-	0x009e, 0xd084, 0x0120, 0x7007, 0x0001, 0x0029, 0x0005, 0x7007,</div><div class='del'>-	0x0002, 0x00b1, 0x0005, 0x0016, 0x0026, 0x710c, 0x2011, 0x0040,</div><div class='del'>-	0x9182, 0x0040, 0x1210, 0x2110, 0x9006, 0x700e, 0x7212, 0x8203,</div><div class='del'>-	0x7812, 0x782b, 0x0020, 0x782b, 0x0041, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x0016, 0x0026, 0x0136, 0x0146, 0x0156, 0x7014, 0x20e0, 0x7018,</div><div class='del'>-	0x2098, 0x20e9, 0x0000, 0x20a1, 0x0088, 0x782b, 0x0026, 0x710c,</div><div class='del'>-	0x2011, 0x0040, 0x9182, 0x0040, 0x1210, 0x2110, 0x9006, 0x700e,</div><div class='del'>-	0x22a8, 0x4006, 0x8203, 0x7812, 0x782b, 0x0020, 0x3300, 0x701a,</div><div class='del'>-	0x782b, 0x0001, 0x015e, 0x014e, 0x013e, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x2009, 0x1a24, 0x2104, 0xc095, 0x200a, 0x080c, 0x116d, 0x0005,</div><div class='del'>-	0x0016, 0x00e6, 0x2071, 0x1a24, 0x00f6, 0x2079, 0x0080, 0x792c,</div><div class='del'>-	0xd1bc, 0x190c, 0x0d7e, 0x782b, 0x0002, 0xd1fc, 0x0120, 0x918c,</div><div class='del'>-	0x0700, 0x7004, 0x0023, 0x00fe, 0x00ee, 0x001e, 0x0005, 0x117e,</div><div class='del'>-	0x1226, 0x125a, 0x1332, 0x0d85, 0x134d, 0x0d85, 0x918c, 0x0700,</div><div class='del'>-	0x1550, 0x0136, 0x0146, 0x0156, 0x7014, 0x20e8, 0x7018, 0x20a0,</div><div class='del'>-	0x20e1, 0x0000, 0x2099, 0x0088, 0x782b, 0x0040, 0x7010, 0x20a8,</div><div class='del'>-	0x4005, 0x3400, 0x701a, 0x015e, 0x014e, 0x013e, 0x700c, 0x9005,</div><div class='del'>-	0x0578, 0x7800, 0x7802, 0x7804, 0x7806, 0x080c, 0x11c3, 0x0005,</div><div class='del'>-	0x7008, 0x0096, 0x2048, 0xa86f, 0x0100, 0x009e, 0x7007, 0x0000,</div><div class='del'>-	0x080c, 0x117e, 0x0005, 0x7008, 0x0096, 0x2048, 0xa86f, 0x0200,</div><div class='del'>-	0x009e, 0x0ca0, 0x918c, 0x0700, 0x1150, 0x700c, 0x9005, 0x0180,</div><div class='del'>-	0x7800, 0x7802, 0x7804, 0x7806, 0x080c, 0x11d8, 0x0005, 0x7008,</div><div class='del'>-	0x0096, 0x2048, 0xa86f, 0x0200, 0x009e, 0x7007, 0x0000, 0x0080,</div><div class='del'>-	0x0096, 0x7008, 0x2048, 0x7800, 0xa88e, 0x7804, 0xa892, 0x7808,</div><div class='del'>-	0xa896, 0x780c, 0xa89a, 0xa86f, 0x0100, 0x009e, 0x7007, 0x0000,</div><div class='del'>-	0x0096, 0x00d6, 0x7008, 0x2048, 0x2001, 0x18b9, 0x2004, 0x9906,</div><div class='del'>-	0x1128, 0xa89c, 0x080f, 0x00de, 0x009e, 0x00a0, 0x00de, 0x009e,</div><div class='del'>-	0x0096, 0x00d6, 0x7008, 0x2048, 0x0081, 0x0150, 0xa89c, 0x0086,</div><div class='del'>-	0x2940, 0x080f, 0x008e, 0x00de, 0x009e, 0x080c, 0x116d, 0x0005,</div><div class='del'>-	0x00de, 0x009e, 0x080c, 0x116d, 0x0005, 0xa8a8, 0xd08c, 0x0005,</div><div class='del'>-	0x0096, 0xa0a0, 0x904d, 0x090c, 0x0d85, 0xa06c, 0x908e, 0x0100,</div><div class='del'>-	0x0130, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897, 0x4002, 0x080c,</div><div class='del'>-	0x7006, 0xa09f, 0x0000, 0xa0a3, 0x0000, 0x2848, 0x080c, 0x108b,</div><div class='del'>-	0x009e, 0x0005, 0x00a6, 0xa0a0, 0x904d, 0x090c, 0x0d85, 0xa06c,</div><div class='del'>-	0x908e, 0x0100, 0x0128, 0xa87b, 0x0001, 0xa883, 0x0000, 0x00c0,</div><div class='del'>-	0xa80c, 0x2050, 0xb004, 0x9005, 0x0198, 0xa80e, 0x2050, 0x8006,</div><div class='del'>-	0x8006, 0x8007, 0x908c, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002,</div><div class='del'>-	0xa076, 0xa172, 0xb000, 0xa07a, 0x2810, 0x080c, 0x114e, 0x00e8,</div><div class='del'>-	0xa97c, 0xa894, 0x0016, 0x0006, 0x080c, 0x7006, 0x000e, 0x001e,</div><div class='del'>-	0xd1fc, 0x1138, 0xd1f4, 0x0128, 0x00c6, 0x2060, 0x080c, 0xb16c,</div><div class='del'>-	0x00ce, 0x7008, 0x2048, 0xa89f, 0x0000, 0xa8a3, 0x0000, 0x080c,</div><div class='del'>-	0x108b, 0x7007, 0x0000, 0x080c, 0x116d, 0x00ae, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x782b, 0x1001, 0x7007, 0x0005, 0x7000, 0xc094,</div><div class='del'>-	0x7002, 0x012e, 0x0005, 0x0096, 0x2001, 0x192f, 0x204c, 0xa87c,</div><div class='del'>-	0x7812, 0xa88c, 0x7802, 0xa890, 0x7806, 0xa894, 0x780a, 0xa898,</div><div class='del'>-	0x780e, 0x782b, 0x0020, 0x0126, 0x2091, 0x8000, 0x782b, 0x0041,</div><div class='del'>-	0x7007, 0x0003, 0x7000, 0xc084, 0x7002, 0x2900, 0x700a, 0x012e,</div><div class='del'>-	0x009e, 0x0005, 0x20e1, 0x0000, 0x2099, 0x0088, 0x782b, 0x0040,</div><div class='del'>-	0x0096, 0x2001, 0x192f, 0x204c, 0xaa7c, 0x009e, 0x080c, 0x8f88,</div><div class='del'>-	0x2009, 0x188c, 0x2104, 0x9084, 0xfffc, 0x200a, 0x080c, 0x8de7,</div><div class='del'>-	0x7007, 0x0000, 0x080c, 0x117e, 0x0005, 0x7007, 0x0000, 0x080c,</div><div class='del'>-	0x117e, 0x0005, 0x0126, 0x2091, 0x2200, 0x2079, 0x0300, 0x2071,</div><div class='del'>-	0x1a6e, 0x7003, 0x0000, 0x78bf, 0x00f6, 0x0041, 0x7807, 0x0007,</div><div class='del'>-	0x7803, 0x0000, 0x7803, 0x0001, 0x012e, 0x0005, 0x00c6, 0x7803,</div><div class='del'>-	0x0000, 0x2001, 0x0165, 0x2003, 0x4198, 0x7808, 0xd09c, 0x0120,</div><div class='del'>-	0x7820, 0x080c, 0x13b6, 0x0cc8, 0x2001, 0x1a6f, 0x2003, 0x0000,</div><div class='del'>-	0x78ab, 0x0004, 0x78ac, 0xd0ac, 0x1de8, 0x78ab, 0x0002, 0x7807,</div><div class='del'>-	0x0007, 0x7827, 0x0030, 0x782b, 0x0400, 0x7827, 0x0031, 0x782b,</div><div class='del'>-	0x1a81, 0x78e3, 0xff00, 0x781f, 0xff00, 0x781b, 0xff00, 0x2001,</div><div class='del'>-	0x1a70, 0x2003, 0x0000, 0x2001, 0x0200, 0x2004, 0xd0dc, 0x0110,</div><div class='del'>-	0x781f, 0x0303, 0x2061, 0x1a81, 0x602f, 0x1ddc, 0x2001, 0x181a,</div><div class='del'>-	0x2004, 0x9082, 0x1ddc, 0x6032, 0x603b, 0x1ec1, 0x602b, 0x1ac1,</div><div class='del'>-	0x6007, 0x1aa1, 0x2061, 0x1aa1, 0x606f, 0x193d, 0x2001, 0x1928,</div><div class='del'>-	0x2004, 0x607a, 0x783f, 0x348e, 0x00ce, 0x0005, 0x9086, 0x000d,</div><div class='del'>-	0x11d0, 0x7808, 0xd09c, 0x01b8, 0x7820, 0x0026, 0x2010, 0x080c,</div><div class='del'>-	0xcf09, 0x0180, 0x2260, 0x6000, 0x9086, 0x0004, 0x1158, 0x0016,</div><div class='del'>-	0x6120, 0x9186, 0x0009, 0x0108, 0x0020, 0x2009, 0x004c, 0x080c,</div><div class='del'>-	0xb20a, 0x001e, 0x002e, 0x0005, 0x0126, 0x2091, 0x2200, 0x7908,</div><div class='del'>-	0x9184, 0x0070, 0x190c, 0x0d7e, 0xd19c, 0x05a0, 0x7820, 0x908c,</div><div class='del'>-	0xf000, 0x0540, 0x2060, 0x6020, 0x9086, 0x0003, 0x1550, 0x6000,</div><div class='del'>-	0x9086, 0x0004, 0x1530, 0x6114, 0x2148, 0xa876, 0xa87a, 0xa867,</div><div class='del'>-	0x0103, 0x080c, 0x6e27, 0x00b6, 0x6010, 0x2058, 0xba3c, 0x8211,</div><div class='del'>-	0x0208, 0xba3e, 0xb8d0, 0x9005, 0x190c, 0x68df, 0x00be, 0x6044,</div><div class='del'>-	0xd0fc, 0x190c, 0xad25, 0x080c, 0xb195, 0x7808, 0xd09c, 0x19b0,</div><div class='del'>-	0x012e, 0x0005, 0x908a, 0x0024, 0x1a0c, 0x0d85, 0x002b, 0x012e,</div><div class='del'>-	0x0005, 0x04b0, 0x012e, 0x0005, 0x1438, 0x145e, 0x148e, 0x1493,</div><div class='del'>-	0x1497, 0x149c, 0x14c4, 0x14c8, 0x14d6, 0x14da, 0x1438, 0x15a7,</div><div class='del'>-	0x15ab, 0x161d, 0x1624, 0x1438, 0x1625, 0x1626, 0x1631, 0x1638,</div><div class='del'>-	0x1438, 0x1438, 0x1438, 0x1438, 0x1438, 0x1438, 0x1438, 0x149e,</div><div class='del'>-	0x1438, 0x1466, 0x148b, 0x1452, 0x1438, 0x1472, 0x143c, 0x143a,</div><div class='del'>-	0x080c, 0x0d85, 0x080c, 0x0d7e, 0x080c, 0x1643, 0x2009, 0x1a7d,</div><div class='del'>-	0x2104, 0x8000, 0x200a, 0x080c, 0x82b8, 0x080c, 0x1b1e, 0x0005,</div><div class='del'>-	0x6044, 0xd0fc, 0x190c, 0xad25, 0x2009, 0x0055, 0x080c, 0xb20a,</div><div class='del'>-	0x012e, 0x0005, 0x080c, 0x1643, 0x2060, 0x6044, 0xd0fc, 0x190c,</div><div class='del'>-	0xad25, 0x2009, 0x0055, 0x080c, 0xb20a, 0x0005, 0x2009, 0x0048,</div><div class='del'>-	0x080c, 0x1643, 0x2060, 0x080c, 0xb20a, 0x0005, 0x2009, 0x0054,</div><div class='del'>-	0x080c, 0x1643, 0x2060, 0x6044, 0xd0fc, 0x190c, 0xad25, 0x080c,</div><div class='del'>-	0xb20a, 0x0005, 0x080c, 0x1643, 0x2060, 0x0056, 0x0066, 0x080c,</div><div class='del'>-	0x1643, 0x2028, 0x080c, 0x1643, 0x2030, 0x0036, 0x0046, 0x2021,</div><div class='del'>-	0x0000, 0x2418, 0x2009, 0x0056, 0x080c, 0xb20a, 0x004e, 0x003e,</div><div class='del'>-	0x006e, 0x005e, 0x0005, 0x080c, 0x1643, 0x0005, 0x7004, 0xc085,</div><div class='del'>-	0xc0b5, 0x7006, 0x0005, 0x7004, 0xc085, 0x7006, 0x0005, 0x080c,</div><div class='del'>-	0x1643, 0x080c, 0x1740, 0x0005, 0x080c, 0x0d85, 0x080c, 0x1643,</div><div class='del'>-	0x2060, 0x6014, 0x0096, 0x2048, 0xa83b, 0xffff, 0x009e, 0x2009,</div><div class='del'>-	0x0048, 0x080c, 0xb20a, 0x2001, 0x015d, 0x2003, 0x0000, 0x2009,</div><div class='del'>-	0x03e8, 0x8109, 0x0160, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8,</div><div class='del'>-	0x2001, 0x0218, 0x2004, 0xd0ec, 0x1110, 0x080c, 0x1648, 0x2001,</div><div class='del'>-	0x0307, 0x2003, 0x8000, 0x0005, 0x7004, 0xc095, 0x7006, 0x0005,</div><div class='del'>-	0x080c, 0x1643, 0x2060, 0x6014, 0x0096, 0x2048, 0xa83b, 0xffff,</div><div class='del'>-	0x009e, 0x2009, 0x0048, 0x080c, 0xb20a, 0x0005, 0x080c, 0x1643,</div><div class='del'>-	0x080c, 0x0d85, 0x080c, 0x1643, 0x080c, 0x1592, 0x7827, 0x0018,</div><div class='del'>-	0x79ac, 0xd1dc, 0x0904, 0x1543, 0x7827, 0x0015, 0x7828, 0x782b,</div><div class='del'>-	0x0000, 0x9065, 0x0140, 0x2001, 0x020d, 0x2003, 0x0050, 0x2003,</div><div class='del'>-	0x0020, 0x0804, 0x1549, 0x7004, 0x9005, 0x01c8, 0x1188, 0x78ab,</div><div class='del'>-	0x0004, 0x7827, 0x0018, 0x782b, 0x0000, 0xd1bc, 0x090c, 0x0d85,</div><div class='del'>-	0x2001, 0x020d, 0x2003, 0x0050, 0x2003, 0x0020, 0x0804, 0x1577,</div><div class='del'>-	0x78ab, 0x0004, 0x7803, 0x0001, 0x080c, 0x15ab, 0x0005, 0x7827,</div><div class='del'>-	0x0018, 0xa001, 0x7828, 0x7827, 0x0011, 0xa001, 0x7928, 0x9106,</div><div class='del'>-	0x0110, 0x79ac, 0x08e0, 0x00e6, 0x2071, 0x0200, 0x702c, 0xd0c4,</div><div class='del'>-	0x0140, 0x00ee, 0x080c, 0x1b1e, 0x080c, 0x1366, 0x7803, 0x0001,</div><div class='del'>-	0x0005, 0x7037, 0x0001, 0xa001, 0x7150, 0x00ee, 0x918c, 0xff00,</div><div class='del'>-	0x9186, 0x0500, 0x0110, 0x79ac, 0x0810, 0x7004, 0xc09d, 0x7006,</div><div class='del'>-	0x78ab, 0x0004, 0x7803, 0x0001, 0x080c, 0x15ab, 0x2001, 0x020d,</div><div class='del'>-	0x2003, 0x0020, 0x0005, 0x7828, 0x782b, 0x0000, 0x9065, 0x090c,</div><div class='del'>-	0x0d85, 0x6014, 0x2048, 0x78ab, 0x0004, 0x918c, 0x0700, 0x01a8,</div><div class='del'>-	0x080c, 0x82b8, 0x080c, 0x1b1e, 0x080c, 0xcf1b, 0x0158, 0xa9ac,</div><div class='del'>-	0xa936, 0xa9b0, 0xa93a, 0xa83f, 0xffff, 0xa843, 0xffff, 0xa880,</div><div class='del'>-	0xc0bd, 0xa882, 0x080c, 0xcae9, 0x0005, 0x6020, 0x9086, 0x0009,</div><div class='del'>-	0x1128, 0x2009, 0x004c, 0x080c, 0xb20a, 0x0048, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xb800, 0x00be, 0xd0bc, 0x6024, 0x190c, 0xd31e, 0x2029,</div><div class='del'>-	0x00c8, 0x8529, 0x0128, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8,</div><div class='del'>-	0x7dbc, 0x080c, 0xeeb1, 0xd5a4, 0x1118, 0x080c, 0x1648, 0x0005,</div><div class='del'>-	0x080c, 0x82b8, 0x080c, 0x1b1e, 0x0005, 0x781f, 0x0300, 0x7803,</div><div class='del'>-	0x0001, 0x0005, 0x0016, 0x0066, 0x0076, 0x00f6, 0x2079, 0x0300,</div><div class='del'>-	0x7908, 0x918c, 0x0007, 0x9186, 0x0003, 0x0120, 0x2001, 0x0016,</div><div class='del'>-	0x080c, 0x16b9, 0x00fe, 0x007e, 0x006e, 0x001e, 0x0005, 0x7004,</div><div class='del'>-	0xc09d, 0x7006, 0x0005, 0x7104, 0x9184, 0x0004, 0x190c, 0x0d85,</div><div class='del'>-	0xd184, 0x11b1, 0xd19c, 0x0180, 0xc19c, 0x7106, 0x0016, 0x080c,</div><div class='del'>-	0x1723, 0x001e, 0x0148, 0x2001, 0x020d, 0x2003, 0x0050, 0x2003,</div><div class='del'>-	0x0020, 0x080c, 0x1648, 0x0005, 0x81ff, 0x190c, 0x0d85, 0x0005,</div><div class='del'>-	0x2100, 0xc184, 0xc1b4, 0x7106, 0xd0b4, 0x0016, 0x00e6, 0x1904,</div><div class='del'>-	0x1612, 0x2071, 0x0200, 0x080c, 0x1710, 0x05e0, 0x080c, 0x1723,</div><div class='del'>-	0x05b0, 0x6014, 0x9005, 0x05b0, 0x0096, 0x2048, 0xa864, 0x009e,</div><div class='del'>-	0x9084, 0x00ff, 0x908e, 0x0029, 0x0160, 0x908e, 0x0048, 0x1550,</div><div class='del'>-	0x601c, 0xd084, 0x11e0, 0x00f6, 0x2c78, 0x080c, 0x17ad, 0x00fe,</div><div class='del'>-	0x00b0, 0x00f6, 0x2c78, 0x080c, 0x1942, 0x00fe, 0x2009, 0x01f4,</div><div class='del'>-	0x8109, 0x0168, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8, 0x2001,</div><div class='del'>-	0x0218, 0x2004, 0xd0ec, 0x1118, 0x080c, 0x1648, 0x0040, 0x2001,</div><div class='del'>-	0x020d, 0x2003, 0x0020, 0x080c, 0x1366, 0x7803, 0x0001, 0x00ee,</div><div class='del'>-	0x001e, 0x0005, 0x080c, 0x1723, 0x0dd0, 0x2001, 0x020d, 0x2003,</div><div class='del'>-	0x0050, 0x2003, 0x0020, 0x0461, 0x0c90, 0x0429, 0x2060, 0x2009,</div><div class='del'>-	0x0053, 0x080c, 0xb20a, 0x0005, 0x0005, 0x0005, 0x00e1, 0x2008,</div><div class='del'>-	0x00d1, 0x0006, 0x7004, 0xc09d, 0x7006, 0x000e, 0x080c, 0x92d5,</div><div class='del'>-	0x0005, 0x0089, 0x9005, 0x0118, 0x080c, 0x8ed9, 0x0cd0, 0x0005,</div><div class='del'>-	0x2001, 0x0036, 0x2009, 0x1820, 0x210c, 0x2011, 0x181f, 0x2214,</div><div class='del'>-	0x080c, 0x16b9, 0x0005, 0x7808, 0xd09c, 0x0de8, 0x7820, 0x0005,</div><div class='del'>-	0x080c, 0x1592, 0x00d6, 0x2069, 0x0200, 0x2009, 0x01f4, 0x8109,</div><div class='del'>-	0x0510, 0x6804, 0x9005, 0x0dd8, 0x2001, 0x015d, 0x2003, 0x0000,</div><div class='del'>-	0x79bc, 0xd1a4, 0x1528, 0x79b8, 0x918c, 0x0fff, 0x0180, 0x9182,</div><div class='del'>-	0x0841, 0x1268, 0x9188, 0x0007, 0x918c, 0x0ff8, 0x810c, 0x810c,</div><div class='del'>-	0x810c, 0x080c, 0x16ab, 0x6827, 0x0001, 0x8109, 0x1dd0, 0x04d9,</div><div class='del'>-	0x6827, 0x0002, 0x04c1, 0x6804, 0x9005, 0x1130, 0x682c, 0xd0e4,</div><div class='del'>-	0x1500, 0x6804, 0x9005, 0x0de8, 0x79b8, 0xd1ec, 0x1130, 0x08c0,</div><div class='del'>-	0x080c, 0x82b8, 0x080c, 0x1b1e, 0x0090, 0x7827, 0x0015, 0x782b,</div><div class='del'>-	0x0000, 0x7827, 0x0018, 0x782b, 0x0000, 0x2001, 0x020d, 0x2003,</div><div class='del'>-	0x0020, 0x2001, 0x0307, 0x2003, 0x0300, 0x7803, 0x0001, 0x00de,</div><div class='del'>-	0x0005, 0x682c, 0x9084, 0x5400, 0x9086, 0x5400, 0x0d30, 0x7827,</div><div class='del'>-	0x0015, 0x782b, 0x0000, 0x7803, 0x0001, 0x6800, 0x9085, 0x1800,</div><div class='del'>-	0x6802, 0x00de, 0x0005, 0x6824, 0x9084, 0x0003, 0x1de0, 0x0005,</div><div class='del'>-	0x2001, 0x0030, 0x2c08, 0x621c, 0x0021, 0x7830, 0x9086, 0x0041,</div><div class='del'>-	0x0005, 0x00f6, 0x00e6, 0x2079, 0x0300, 0x0006, 0x2071, 0x1a6e,</div><div class='del'>-	0x7008, 0x9005, 0x1110, 0x78e3, 0x0c0c, 0x8000, 0x700a, 0x0026,</div><div class='del'>-	0x2011, 0x0006, 0x7808, 0xd09c, 0x0150, 0x0016, 0x0026, 0x00c6,</div><div class='del'>-	0x080c, 0x13d4, 0x00ce, 0x002e, 0x001e, 0x8211, 0x1d98, 0x002e,</div><div class='del'>-	0x000e, 0x0006, 0x7832, 0x7936, 0x7a3a, 0x781b, 0x8080, 0x00b9,</div><div class='del'>-	0x1178, 0x2071, 0x1a6e, 0x7008, 0x9005, 0x0130, 0x8001, 0x0a0c,</div><div class='del'>-	0x0d85, 0x700a, 0x78e3, 0x0c00, 0x000e, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x000e, 0x792c, 0x3900, 0x8000, 0x2004, 0x080c, 0x0d85, 0x2009,</div><div class='del'>-	0xff00, 0x8109, 0x0120, 0x7818, 0xd0bc, 0x1dd8, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x7832, 0x7936, 0x7a3a, 0x781b, 0x8080, 0x0c79,</div><div class='del'>-	0x1108, 0x0005, 0x792c, 0x3900, 0x8000, 0x2004, 0x080c, 0x0d85,</div><div class='del'>-	0x7037, 0x0001, 0x7150, 0x7037, 0x0002, 0x7050, 0x2060, 0xd1bc,</div><div class='del'>-	0x1110, 0x7054, 0x2060, 0x918c, 0xff00, 0x9186, 0x0500, 0x0110,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x0006, 0x0046, 0x00e6, 0x2071, 0x0200,</div><div class='del'>-	0x7037, 0x0002, 0x7058, 0x9084, 0xff00, 0x8007, 0x9086, 0x00bc,</div><div class='del'>-	0x1158, 0x2021, 0x1a7e, 0x2404, 0x8000, 0x0208, 0x2022, 0x080c,</div><div class='del'>-	0x82b8, 0x080c, 0x1b1e, 0x9006, 0x00ee, 0x004e, 0x000e, 0x0005,</div><div class='del'>-	0x0c11, 0x1108, 0x0005, 0x00e6, 0x0016, 0x2071, 0x0200, 0x0841,</div><div class='del'>-	0x6124, 0xd1dc, 0x01f8, 0x701c, 0xd08c, 0x0904, 0x17a2, 0x7017,</div><div class='del'>-	0x0000, 0x2001, 0x0264, 0x2004, 0xd0bc, 0x0904, 0x17a2, 0x2001,</div><div class='del'>-	0x0268, 0x00c6, 0x2064, 0x6104, 0x6038, 0x00ce, 0x918e, 0x0039,</div><div class='del'>-	0x1904, 0x17a2, 0x9c06, 0x15f0, 0x0126, 0x2091, 0x2600, 0x080c,</div><div class='del'>-	0x8210, 0x012e, 0x7358, 0x745c, 0x6014, 0x905d, 0x0598, 0x2b48,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x190c, 0xd2f9,</div><div class='del'>-	0xab42, 0xac3e, 0x2001, 0x1869, 0x2004, 0xd0b4, 0x1170, 0x601c,</div><div class='del'>-	0xd0e4, 0x1158, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,</div><div class='del'>-	0x1120, 0xa83b, 0x7fff, 0xa837, 0xffff, 0x080c, 0x1ee1, 0x1190,</div><div class='del'>-	0x080c, 0x199f, 0x2a00, 0xa816, 0x0130, 0x2800, 0xa80e, 0x2c05,</div><div class='del'>-	0xa80a, 0x2c00, 0xa812, 0x7037, 0x0020, 0x781f, 0x0300, 0x001e,</div><div class='del'>-	0x00ee, 0x0005, 0x7037, 0x0050, 0x7037, 0x0020, 0x001e, 0x00ee,</div><div class='del'>-	0x080c, 0x1648, 0x0005, 0x080c, 0x0d85, 0x2001, 0x180d, 0x2004,</div><div class='del'>-	0xd08c, 0x190c, 0x6ccc, 0x2cf0, 0x0126, 0x2091, 0x2200, 0x0016,</div><div class='del'>-	0x00c6, 0x3e60, 0x6014, 0x2048, 0x2940, 0x903e, 0x2730, 0xa864,</div><div class='del'>-	0x2068, 0xa81a, 0x9d84, 0x000f, 0x9088, 0x1ec1, 0x2165, 0x0002,</div><div class='del'>-	0x17df, 0x184d, 0x17df, 0x17df, 0x17e3, 0x182e, 0x17df, 0x1803,</div><div class='del'>-	0x17d8, 0x1844, 0x17df, 0x17df, 0x17e8, 0x193a, 0x1817, 0x180d,</div><div class='del'>-	0xa964, 0x918c, 0x00ff, 0x918e, 0x0048, 0x0904, 0x1844, 0x9085,</div><div class='del'>-	0x0001, 0x0804, 0x1930, 0xa87c, 0xd0ac, 0x0dc8, 0x0804, 0x1854,</div><div class='del'>-	0xa87c, 0xd0ac, 0x0da0, 0x0804, 0x18bf, 0xa898, 0x901d, 0x1108,</div><div class='del'>-	0xab9c, 0x9016, 0xaab2, 0xaa3e, 0xaa42, 0x3e00, 0x9080, 0x0008,</div><div class='del'>-	0x2004, 0x9080, 0x9536, 0x2005, 0x9005, 0x090c, 0x0d85, 0x2004,</div><div class='del'>-	0xa8ae, 0x0804, 0x1918, 0xa87c, 0xd0bc, 0x09c8, 0xa890, 0xa842,</div><div class='del'>-	0xa88c, 0xa83e, 0xa888, 0x0804, 0x1854, 0xa87c, 0xd0bc, 0x0978,</div><div class='del'>-	0xa890, 0xa842, 0xa88c, 0xa83e, 0xa888, 0x0804, 0x18bf, 0xa87c,</div><div class='del'>-	0xd0bc, 0x0928, 0xa890, 0xa842, 0xa88c, 0xa83e, 0xa804, 0x9045,</div><div class='del'>-	0x090c, 0x0d85, 0xa164, 0xa91a, 0x91ec, 0x000f, 0x9d80, 0x1ec1,</div><div class='del'>-	0x2065, 0xa888, 0xd19c, 0x1904, 0x18bf, 0x0430, 0xa87c, 0xd0ac,</div><div class='del'>-	0x0904, 0x17df, 0xa804, 0x9045, 0x090c, 0x0d85, 0xa164, 0xa91a,</div><div class='del'>-	0x91ec, 0x000f, 0x9d80, 0x1ec1, 0x2065, 0x9006, 0xa842, 0xa83e,</div><div class='del'>-	0xd19c, 0x1904, 0x18bf, 0x0080, 0xa87c, 0xd0ac, 0x0904, 0x17df,</div><div class='del'>-	0x9006, 0xa842, 0xa83e, 0x0804, 0x18bf, 0xa87c, 0xd0ac, 0x0904,</div><div class='del'>-	0x17df, 0x9006, 0xa842, 0xa83e, 0x2c05, 0x908a, 0x0036, 0x1a0c,</div><div class='del'>-	0x0d85, 0x9082, 0x001b, 0x0002, 0x1877, 0x1877, 0x1879, 0x1877,</div><div class='del'>-	0x1877, 0x1877, 0x1883, 0x1877, 0x1877, 0x1877, 0x188d, 0x1877,</div><div class='del'>-	0x1877, 0x1877, 0x1897, 0x1877, 0x1877, 0x1877, 0x18a1, 0x1877,</div><div class='del'>-	0x1877, 0x1877, 0x18ab, 0x1877, 0x1877, 0x1877, 0x18b5, 0x080c,</div><div class='del'>-	0x0d85, 0xa574, 0xa478, 0x9d86, 0x0024, 0x0904, 0x17ed, 0xa37c,</div><div class='del'>-	0xa280, 0x0804, 0x1918, 0xa584, 0xa488, 0x9d86, 0x0024, 0x0904,</div><div class='del'>-	0x17ed, 0xa38c, 0xa290, 0x0804, 0x1918, 0xa594, 0xa498, 0x9d86,</div><div class='del'>-	0x0024, 0x0904, 0x17ed, 0xa39c, 0xa2a0, 0x0804, 0x1918, 0xa5a4,</div><div class='del'>-	0xa4a8, 0x9d86, 0x0024, 0x0904, 0x17ed, 0xa3ac, 0xa2b0, 0x0804,</div><div class='del'>-	0x1918, 0xa5b4, 0xa4b8, 0x9d86, 0x0024, 0x0904, 0x17ed, 0xa3bc,</div><div class='del'>-	0xa2c0, 0x0804, 0x1918, 0xa5c4, 0xa4c8, 0x9d86, 0x0024, 0x0904,</div><div class='del'>-	0x17ed, 0xa3cc, 0xa2d0, 0x0804, 0x1918, 0xa5d4, 0xa4d8, 0x9d86,</div><div class='del'>-	0x0024, 0x0904, 0x17ed, 0xa3dc, 0xa2e0, 0x0804, 0x1918, 0x2c05,</div><div class='del'>-	0x908a, 0x0034, 0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002, 0x18e2,</div><div class='del'>-	0x18e0, 0x18e0, 0x18e0, 0x18e0, 0x18e0, 0x18ed, 0x18e0, 0x18e0,</div><div class='del'>-	0x18e0, 0x18e0, 0x18e0, 0x18f8, 0x18e0, 0x18e0, 0x18e0, 0x18e0,</div><div class='del'>-	0x18e0, 0x1903, 0x18e0, 0x18e0, 0x18e0, 0x18e0, 0x18e0, 0x190e,</div><div class='del'>-	0x080c, 0x0d85, 0xa56c, 0xa470, 0xa774, 0xa678, 0x9d86, 0x002c,</div><div class='del'>-	0x0904, 0x17ed, 0xa37c, 0xa280, 0x0458, 0xa584, 0xa488, 0xa78c,</div><div class='del'>-	0xa690, 0x9d86, 0x002c, 0x0904, 0x17ed, 0xa394, 0xa298, 0x0400,</div><div class='del'>-	0xa59c, 0xa4a0, 0xa7a4, 0xa6a8, 0x9d86, 0x002c, 0x0904, 0x17ed,</div><div class='del'>-	0xa3ac, 0xa2b0, 0x00a8, 0xa5b4, 0xa4b8, 0xa7bc, 0xa6c0, 0x9d86,</div><div class='del'>-	0x002c, 0x0904, 0x17ed, 0xa3c4, 0xa2c8, 0x0050, 0xa5cc, 0xa4d0,</div><div class='del'>-	0xa7d4, 0xa6d8, 0x9d86, 0x002c, 0x0904, 0x17ed, 0xa3dc, 0xa2e0,</div><div class='del'>-	0xab2e, 0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a, 0xa988, 0x8c60,</div><div class='del'>-	0x2c1d, 0xa8ac, 0xaab0, 0xa836, 0xaa3a, 0x8109, 0xa916, 0x1160,</div><div class='del'>-	0x3e60, 0x601c, 0xc085, 0x601e, 0xa87c, 0xc0dd, 0xa87e, 0x9006,</div><div class='del'>-	0x00ce, 0x001e, 0x012e, 0x0005, 0x2800, 0xa80e, 0xab0a, 0x2c00,</div><div class='del'>-	0xa812, 0x0c70, 0x0804, 0x17df, 0x2001, 0x180d, 0x2004, 0xd08c,</div><div class='del'>-	0x190c, 0x6ccc, 0x2ff0, 0x0126, 0x2091, 0x2200, 0x0016, 0x00c6,</div><div class='del'>-	0x3e60, 0x6014, 0x2048, 0x2940, 0xa80e, 0x2061, 0x1ebc, 0xa813,</div><div class='del'>-	0x1ebc, 0x2c05, 0xa80a, 0xa964, 0xa91a, 0xa87c, 0xd0ac, 0x090c,</div><div class='del'>-	0x0d85, 0x9006, 0xa842, 0xa83e, 0x2c05, 0x908a, 0x0034, 0x1a0c,</div><div class='del'>-	0x0d85, 0xadcc, 0xacd0, 0xafd4, 0xaed8, 0xabdc, 0xaae0, 0xab2e,</div><div class='del'>-	0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a, 0xa8ac, 0xaab0, 0xa836,</div><div class='del'>-	0xaa3a, 0xa988, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0008, 0x1120,</div><div class='del'>-	0x8109, 0xa916, 0x0128, 0x0080, 0x918a, 0x0002, 0xa916, 0x1160,</div><div class='del'>-	0x3e60, 0x601c, 0xc085, 0x601e, 0xa87c, 0xc0dd, 0xa87e, 0x9006,</div><div class='del'>-	0x00ce, 0x001e, 0x012e, 0x0005, 0xa804, 0x9045, 0x090c, 0x0d85,</div><div class='del'>-	0xa80e, 0xa064, 0xa81a, 0x9084, 0x000f, 0x9080, 0x1ec1, 0x2015,</div><div class='del'>-	0x82ff, 0x090c, 0x0d85, 0xaa12, 0x2205, 0xa80a, 0x0c08, 0x903e,</div><div class='del'>-	0x2730, 0xa880, 0xd0fc, 0x1190, 0x2d00, 0x0002, 0x1a94, 0x19f6,</div><div class='del'>-	0x19f6, 0x1a94, 0x1a94, 0x1a8e, 0x1a94, 0x19f6, 0x1a45, 0x1a45,</div><div class='del'>-	0x1a45, 0x1a94, 0x1a94, 0x1a94, 0x1a8b, 0x1a45, 0xc0fc, 0xa882,</div><div class='del'>-	0xab2c, 0xaa30, 0xad1c, 0xac20, 0xdd9c, 0x0904, 0x1a96, 0x2c05,</div><div class='del'>-	0x908a, 0x0034, 0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002, 0x19e2,</div><div class='del'>-	0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e6, 0x19e0, 0x19e0,</div><div class='del'>-	0x19e0, 0x19e0, 0x19e0, 0x19ea, 0x19e0, 0x19e0, 0x19e0, 0x19e0,</div><div class='del'>-	0x19e0, 0x19ee, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19e0, 0x19f2,</div><div class='del'>-	0x080c, 0x0d85, 0xa774, 0xa678, 0x0804, 0x1a96, 0xa78c, 0xa690,</div><div class='del'>-	0x0804, 0x1a96, 0xa7a4, 0xa6a8, 0x0804, 0x1a96, 0xa7bc, 0xa6c0,</div><div class='del'>-	0x0804, 0x1a96, 0xa7d4, 0xa6d8, 0x0804, 0x1a96, 0x2c05, 0x908a,</div><div class='del'>-	0x0036, 0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002, 0x1a19, 0x1a19,</div><div class='del'>-	0x1a1b, 0x1a19, 0x1a19, 0x1a19, 0x1a21, 0x1a19, 0x1a19, 0x1a19,</div><div class='del'>-	0x1a27, 0x1a19, 0x1a19, 0x1a19, 0x1a2d, 0x1a19, 0x1a19, 0x1a19,</div><div class='del'>-	0x1a33, 0x1a19, 0x1a19, 0x1a19, 0x1a39, 0x1a19, 0x1a19, 0x1a19,</div><div class='del'>-	0x1a3f, 0x080c, 0x0d85, 0xa574, 0xa478, 0xa37c, 0xa280, 0x0804,</div><div class='del'>-	0x1a96, 0xa584, 0xa488, 0xa38c, 0xa290, 0x0804, 0x1a96, 0xa594,</div><div class='del'>-	0xa498, 0xa39c, 0xa2a0, 0x0804, 0x1a96, 0xa5a4, 0xa4a8, 0xa3ac,</div><div class='del'>-	0xa2b0, 0x0804, 0x1a96, 0xa5b4, 0xa4b8, 0xa3bc, 0xa2c0, 0x0804,</div><div class='del'>-	0x1a96, 0xa5c4, 0xa4c8, 0xa3cc, 0xa2d0, 0x0804, 0x1a96, 0xa5d4,</div><div class='del'>-	0xa4d8, 0xa3dc, 0xa2e0, 0x0804, 0x1a96, 0x2c05, 0x908a, 0x0034,</div><div class='del'>-	0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002, 0x1a68, 0x1a66, 0x1a66,</div><div class='del'>-	0x1a66, 0x1a66, 0x1a66, 0x1a6f, 0x1a66, 0x1a66, 0x1a66, 0x1a66,</div><div class='del'>-	0x1a66, 0x1a76, 0x1a66, 0x1a66, 0x1a66, 0x1a66, 0x1a66, 0x1a7d,</div><div class='del'>-	0x1a66, 0x1a66, 0x1a66, 0x1a66, 0x1a66, 0x1a84, 0x080c, 0x0d85,</div><div class='del'>-	0xa56c, 0xa470, 0xa774, 0xa678, 0xa37c, 0xa280, 0x0438, 0xa584,</div><div class='del'>-	0xa488, 0xa78c, 0xa690, 0xa394, 0xa298, 0x0400, 0xa59c, 0xa4a0,</div><div class='del'>-	0xa7a4, 0xa6a8, 0xa3ac, 0xa2b0, 0x00c8, 0xa5b4, 0xa4b8, 0xa7bc,</div><div class='del'>-	0xa6c0, 0xa3c4, 0xa2c8, 0x0090, 0xa5cc, 0xa4d0, 0xa7d4, 0xa6d8,</div><div class='del'>-	0xa3dc, 0xa2e0, 0x0058, 0x9d86, 0x000e, 0x1130, 0x080c, 0x1e97,</div><div class='del'>-	0x1904, 0x199f, 0x900e, 0x0050, 0x080c, 0x0d85, 0xab2e, 0xaa32,</div><div class='del'>-	0xad1e, 0xac22, 0xaf26, 0xae2a, 0x080c, 0x1e97, 0x0005, 0x6014,</div><div class='del'>-	0x2048, 0x6118, 0x81ff, 0x0148, 0x810c, 0x810c, 0x810c, 0x81ff,</div><div class='del'>-	0x1118, 0xa887, 0x0001, 0x0008, 0xa986, 0x601b, 0x0002, 0xa874,</div><div class='del'>-	0x9084, 0x00ff, 0x9084, 0x0008, 0x0150, 0x00e9, 0x6000, 0x9086,</div><div class='del'>-	0x0004, 0x1120, 0x2009, 0x0048, 0x080c, 0xb20a, 0x0005, 0xa974,</div><div class='del'>-	0xd1dc, 0x1108, 0x0005, 0xa934, 0xa88c, 0x9106, 0x1158, 0xa938,</div><div class='del'>-	0xa890, 0x9106, 0x1138, 0x601c, 0xc084, 0x601e, 0x2009, 0x0048,</div><div class='del'>-	0x0804, 0xb20a, 0x0005, 0x0126, 0x00c6, 0x2091, 0x2200, 0x00ce,</div><div class='del'>-	0x7908, 0x918c, 0x0007, 0x9186, 0x0000, 0x05b0, 0x9186, 0x0003,</div><div class='del'>-	0x0598, 0x6020, 0x6023, 0x0000, 0x0006, 0x2031, 0x0008, 0x00c6,</div><div class='del'>-	0x781f, 0x0808, 0x7808, 0xd09c, 0x0120, 0x080c, 0x13d4, 0x8631,</div><div class='del'>-	0x1db8, 0x00ce, 0x781f, 0x0800, 0x2031, 0x0168, 0x00c6, 0x7808,</div><div class='del'>-	0xd09c, 0x190c, 0x13d4, 0x00ce, 0x2001, 0x0038, 0x080c, 0x1bae,</div><div class='del'>-	0x7930, 0x9186, 0x0040, 0x0160, 0x9186, 0x0042, 0x190c, 0x0d85,</div><div class='del'>-	0x2001, 0x001e, 0x8001, 0x1df0, 0x8631, 0x1d40, 0x080c, 0x1bbd,</div><div class='del'>-	0x000e, 0x6022, 0x012e, 0x0005, 0x080c, 0x1baa, 0x7827, 0x0015,</div><div class='del'>-	0x7828, 0x9c06, 0x1db8, 0x782b, 0x0000, 0x0ca0, 0x00f6, 0x2079,</div><div class='del'>-	0x0300, 0x7803, 0x0000, 0x78ab, 0x0004, 0x2001, 0xf000, 0x8001,</div><div class='del'>-	0x090c, 0x0d85, 0x7aac, 0xd2ac, 0x1dd0, 0x00fe, 0x080c, 0x779e,</div><div class='del'>-	0x1188, 0x2001, 0x0138, 0x2003, 0x0000, 0x2001, 0x0160, 0x2003,</div><div class='del'>-	0x0000, 0x2011, 0x012c, 0xa001, 0xa001, 0x8211, 0x1de0, 0x0059,</div><div class='del'>-	0x0804, 0x7840, 0x0479, 0x0039, 0x2001, 0x0160, 0x2502, 0x2001,</div><div class='del'>-	0x0138, 0x2202, 0x0005, 0x00e6, 0x2071, 0x0200, 0x080c, 0x2a8b,</div><div class='del'>-	0x2009, 0x003c, 0x080c, 0x2220, 0x2001, 0x015d, 0x2003, 0x0000,</div><div class='del'>-	0x7000, 0x9084, 0x003c, 0x1de0, 0x080c, 0x8899, 0x70a0, 0x70a2,</div><div class='del'>-	0x7098, 0x709a, 0x709c, 0x709e, 0x2001, 0x020d, 0x2003, 0x0020,</div><div class='del'>-	0x00f6, 0x2079, 0x0300, 0x080c, 0x1366, 0x7803, 0x0001, 0x00fe,</div><div class='del'>-	0x00ee, 0x0005, 0x2001, 0x0138, 0x2014, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x0160, 0x202c, 0x2003, 0x0000, 0x080c, 0x779e, 0x1108, 0x0005,</div><div class='del'>-	0x2021, 0x0260, 0x2001, 0x0141, 0x201c, 0xd3dc, 0x1168, 0x2001,</div><div class='del'>-	0x0109, 0x201c, 0x939c, 0x0048, 0x1160, 0x2001, 0x0111, 0x201c,</div><div class='del'>-	0x83ff, 0x1110, 0x8421, 0x1d70, 0x2001, 0x015d, 0x2003, 0x0000,</div><div class='del'>-	0x0005, 0x0046, 0x2021, 0x0019, 0x2003, 0x0048, 0xa001, 0xa001,</div><div class='del'>-	0x201c, 0x939c, 0x0048, 0x0120, 0x8421, 0x1db0, 0x004e, 0x0c60,</div><div class='del'>-	0x004e, 0x0c40, 0x601c, 0xc084, 0x601e, 0x0005, 0x2c08, 0x621c,</div><div class='del'>-	0x080c, 0x16b9, 0x7930, 0x0005, 0x2c08, 0x621c, 0x080c, 0x1702,</div><div class='del'>-	0x7930, 0x0005, 0x8001, 0x1df0, 0x0005, 0x2031, 0x0064, 0x781c,</div><div class='del'>-	0x9084, 0x0007, 0x0170, 0x2001, 0x0038, 0x0c41, 0x9186, 0x0040,</div><div class='del'>-	0x0904, 0x1c1b, 0x2001, 0x001e, 0x0c69, 0x8631, 0x1d80, 0x080c,</div><div class='del'>-	0x0d85, 0x781f, 0x0202, 0x2001, 0x015d, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x0dac, 0x0c01, 0x781c, 0xd084, 0x0110, 0x0861, 0x04e0, 0x2001,</div><div class='del'>-	0x0030, 0x0891, 0x9186, 0x0040, 0x0568, 0x781c, 0xd084, 0x1da8,</div><div class='del'>-	0x781f, 0x0101, 0x2001, 0x0014, 0x0869, 0x2001, 0x0037, 0x0821,</div><div class='del'>-	0x9186, 0x0040, 0x0140, 0x2001, 0x0030, 0x080c, 0x1bb4, 0x9186,</div><div class='del'>-	0x0040, 0x190c, 0x0d85, 0x00d6, 0x2069, 0x0200, 0x692c, 0xd1f4,</div><div class='del'>-	0x1170, 0xd1c4, 0x0160, 0xd19c, 0x0130, 0x6800, 0x9085, 0x1800,</div><div class='del'>-	0x6802, 0x00de, 0x0080, 0x6908, 0x9184, 0x0007, 0x1db0, 0x00de,</div><div class='del'>-	0x781f, 0x0100, 0x791c, 0x9184, 0x0007, 0x090c, 0x0d85, 0xa001,</div><div class='del'>-	0xa001, 0x781f, 0x0200, 0x0005, 0x0126, 0x2091, 0x2400, 0x2079,</div><div class='del'>-	0x0380, 0x2001, 0x19e8, 0x2070, 0x012e, 0x0005, 0x2cf0, 0x0126,</div><div class='del'>-	0x2091, 0x2400, 0x3e60, 0x6014, 0x2048, 0xa964, 0xa91a, 0x918c,</div><div class='del'>-	0x00ff, 0x9184, 0x000f, 0x0002, 0x1c50, 0x1c50, 0x1c50, 0x1c52,</div><div class='del'>-	0x1c50, 0x1c50, 0x1c50, 0x1c50, 0x1c44, 0x1c5a, 0x1c50, 0x1c56,</div><div class='del'>-	0x1c50, 0x1c50, 0x1c50, 0x1c50, 0x9086, 0x0008, 0x1148, 0xa87c,</div><div class='del'>-	0xd0b4, 0x0904, 0x1dca, 0x2011, 0x1ebc, 0x2205, 0xab88, 0x00a8,</div><div class='del'>-	0x080c, 0x0d85, 0x9186, 0x0013, 0x0128, 0x0cd0, 0x9186, 0x001b,</div><div class='del'>-	0x0108, 0x0cb0, 0xa87c, 0xd0b4, 0x0904, 0x1dca, 0x9184, 0x000f,</div><div class='del'>-	0x9080, 0x1ec1, 0x2015, 0x2205, 0xab88, 0x2908, 0xa80a, 0xa90e,</div><div class='del'>-	0xaa12, 0xab16, 0x9006, 0xa842, 0xa83e, 0x012e, 0x0005, 0x2cf0,</div><div class='del'>-	0x0126, 0x2091, 0x2400, 0x3e60, 0x6014, 0x2048, 0xa88c, 0xa990,</div><div class='del'>-	0xaaac, 0xabb0, 0xaa36, 0xab3a, 0xa83e, 0xa942, 0xa846, 0xa94a,</div><div class='del'>-	0xa964, 0x918c, 0x00ff, 0x9186, 0x001e, 0x0198, 0x2940, 0xa064,</div><div class='del'>-	0xa81a, 0x90ec, 0x000f, 0x9d80, 0x1ec1, 0x2065, 0x2c05, 0x2808,</div><div class='del'>-	0x2c10, 0xab88, 0xa80a, 0xa90e, 0xaa12, 0xab16, 0x012e, 0x3e60,</div><div class='del'>-	0x0005, 0xa804, 0x2040, 0x0c58, 0x2cf0, 0x0126, 0x2091, 0x2400,</div><div class='del'>-	0x3e60, 0x6014, 0x2048, 0xa97c, 0x2950, 0xd1dc, 0x1904, 0x1d94,</div><div class='del'>-	0xc1dd, 0xa97e, 0x9006, 0xa842, 0xa83e, 0xa988, 0x8109, 0xa916,</div><div class='del'>-	0xa964, 0xa91a, 0x9184, 0x000f, 0x9088, 0x1ec1, 0x2145, 0x0002,</div><div class='del'>-	0x1cc8, 0x1cd6, 0x1cc8, 0x1cc8, 0x1cc8, 0x1cca, 0x1cc8, 0x1cc8,</div><div class='del'>-	0x1d2b, 0x1d2b, 0x1cc8, 0x1cc8, 0x1cc8, 0x1d29, 0x1cc8, 0x1cc8,</div><div class='del'>-	0x080c, 0x0d85, 0xa804, 0x2050, 0xb164, 0xa91a, 0x9184, 0x000f,</div><div class='del'>-	0x9080, 0x1ec1, 0x2045, 0xd19c, 0x1904, 0x1d2b, 0x9036, 0x2638,</div><div class='del'>-	0x2805, 0x908a, 0x0036, 0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002,</div><div class='del'>-	0x1cfb, 0x1cfb, 0x1cfd, 0x1cfb, 0x1cfb, 0x1cfb, 0x1d03, 0x1cfb,</div><div class='del'>-	0x1cfb, 0x1cfb, 0x1d09, 0x1cfb, 0x1cfb, 0x1cfb, 0x1d0f, 0x1cfb,</div><div class='del'>-	0x1cfb, 0x1cfb, 0x1d15, 0x1cfb, 0x1cfb, 0x1cfb, 0x1d1b, 0x1cfb,</div><div class='del'>-	0x1cfb, 0x1cfb, 0x1d21, 0x080c, 0x0d85, 0xb574, 0xb478, 0xb37c,</div><div class='del'>-	0xb280, 0x0804, 0x1d70, 0xb584, 0xb488, 0xb38c, 0xb290, 0x0804,</div><div class='del'>-	0x1d70, 0xb594, 0xb498, 0xb39c, 0xb2a0, 0x0804, 0x1d70, 0xb5a4,</div><div class='del'>-	0xb4a8, 0xb3ac, 0xb2b0, 0x0804, 0x1d70, 0xb5b4, 0xb4b8, 0xb3bc,</div><div class='del'>-	0xb2c0, 0x0804, 0x1d70, 0xb5c4, 0xb4c8, 0xb3cc, 0xb2d0, 0x0804,</div><div class='del'>-	0x1d70, 0xb5d4, 0xb4d8, 0xb3dc, 0xb2e0, 0x0804, 0x1d70, 0x0804,</div><div class='del'>-	0x1d70, 0x080c, 0x0d85, 0x2805, 0x908a, 0x0034, 0x1a0c, 0x0d85,</div><div class='del'>-	0x9082, 0x001b, 0x0002, 0x1d4e, 0x1d4c, 0x1d4c, 0x1d4c, 0x1d4c,</div><div class='del'>-	0x1d4c, 0x1d55, 0x1d4c, 0x1d4c, 0x1d4c, 0x1d4c, 0x1d4c, 0x1d5c,</div><div class='del'>-	0x1d4c, 0x1d4c, 0x1d4c, 0x1d4c, 0x1d4c, 0x1d63, 0x1d4c, 0x1d4c,</div><div class='del'>-	0x1d4c, 0x1d4c, 0x1d4c, 0x1d6a, 0x080c, 0x0d85, 0xb56c, 0xb470,</div><div class='del'>-	0xb774, 0xb678, 0xb37c, 0xb280, 0x00d8, 0xb584, 0xb488, 0xb78c,</div><div class='del'>-	0xb690, 0xb394, 0xb298, 0x00a0, 0xb59c, 0xb4a0, 0xb7a4, 0xb6a8,</div><div class='del'>-	0xb3ac, 0xb2b0, 0x0068, 0xb5b4, 0xb4b8, 0xb7bc, 0xb6c0, 0xb3c4,</div><div class='del'>-	0xb2c8, 0x0030, 0xb5cc, 0xb4d0, 0xb7d4, 0xb6d8, 0xb3dc, 0xb2e0,</div><div class='del'>-	0xab2e, 0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a, 0xa988, 0x8109,</div><div class='del'>-	0xa916, 0x1118, 0x9006, 0x012e, 0x0005, 0x8840, 0x2805, 0x9005,</div><div class='del'>-	0x1168, 0xb004, 0x9005, 0x090c, 0x0d85, 0x2050, 0xb164, 0xa91a,</div><div class='del'>-	0x9184, 0x000f, 0x9080, 0x1ec1, 0x2045, 0x2805, 0x2810, 0x2a08,</div><div class='del'>-	0xa80a, 0xa90e, 0xaa12, 0x0c30, 0x3e60, 0x6344, 0xd3fc, 0x190c,</div><div class='del'>-	0x0d85, 0xa93c, 0xaa40, 0xa844, 0x9106, 0x1118, 0xa848, 0x9206,</div><div class='del'>-	0x0508, 0x2958, 0xab48, 0xac44, 0x2940, 0x080c, 0x1ee1, 0x1998,</div><div class='del'>-	0x2850, 0x2c40, 0xab14, 0xa880, 0xd0fc, 0x1140, 0xa810, 0x2005,</div><div class='del'>-	0xa80a, 0x2a00, 0xa80e, 0x2009, 0x8015, 0x0070, 0x00c6, 0x3e60,</div><div class='del'>-	0x6044, 0xc0a4, 0x9085, 0x8005, 0x6046, 0x00ce, 0x8319, 0xab16,</div><div class='del'>-	0x1904, 0x1d7d, 0x2009, 0x8005, 0x3e60, 0x6044, 0x9105, 0x6046,</div><div class='del'>-	0x0804, 0x1d7a, 0x080c, 0x0d85, 0x00f6, 0x00e6, 0x0096, 0x00c6,</div><div class='del'>-	0x0026, 0x704c, 0x9c06, 0x190c, 0x0d85, 0x2079, 0x0090, 0x2001,</div><div class='del'>-	0x0105, 0x2003, 0x0010, 0x782b, 0x0004, 0x7057, 0x0000, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xcf1b, 0x0118, 0xa880, 0xc0bd, 0xa882, 0x6020,</div><div class='del'>-	0x9086, 0x0006, 0x1170, 0x2061, 0x0100, 0x62c8, 0x2001, 0x00fa,</div><div class='del'>-	0x8001, 0x1df0, 0x60c8, 0x9206, 0x1dc0, 0x60c4, 0xa89a, 0x60c8,</div><div class='del'>-	0xa896, 0x704c, 0x2060, 0x00c6, 0x080c, 0xcae9, 0x080c, 0xacfc,</div><div class='del'>-	0x00ce, 0x704c, 0x9c06, 0x1150, 0x2009, 0x0040, 0x080c, 0x2220,</div><div class='del'>-	0x080c, 0xa7a1, 0x2011, 0x0000, 0x080c, 0xa635, 0x002e, 0x00ce,</div><div class='del'>-	0x009e, 0x00ee, 0x00fe, 0x0005, 0x00f6, 0x2079, 0x0090, 0x781c,</div><div class='del'>-	0x0006, 0x7818, 0x0006, 0x2079, 0x0100, 0x7a14, 0x9284, 0x1984,</div><div class='del'>-	0x9085, 0x0012, 0x7816, 0x2019, 0x1000, 0x8319, 0x090c, 0x0d85,</div><div class='del'>-	0x7820, 0xd0bc, 0x1dd0, 0x79c8, 0x000e, 0x9102, 0x001e, 0x0006,</div><div class='del'>-	0x0016, 0x79c4, 0x000e, 0x9103, 0x78c6, 0x000e, 0x78ca, 0x9284,</div><div class='del'>-	0x1984, 0x9085, 0x0012, 0x7816, 0x2079, 0x0090, 0x782b, 0x0008,</div><div class='del'>-	0x7057, 0x0000, 0x00fe, 0x0005, 0x00f6, 0x00e6, 0x2071, 0x19e8,</div><div class='del'>-	0x7054, 0x9086, 0x0000, 0x0904, 0x1e92, 0x2079, 0x0090, 0x2009,</div><div class='del'>-	0x0207, 0x210c, 0xd194, 0x01b8, 0x2009, 0x020c, 0x210c, 0x9184,</div><div class='del'>-	0x0003, 0x0188, 0x080c, 0xeefa, 0x2001, 0x0133, 0x2004, 0x9005,</div><div class='del'>-	0x090c, 0x0d85, 0x0016, 0x2009, 0x0040, 0x080c, 0x2220, 0x001e,</div><div class='del'>-	0x2001, 0x020c, 0x2102, 0x2009, 0x0206, 0x2104, 0x2009, 0x0203,</div><div class='del'>-	0x210c, 0x9106, 0x1120, 0x2009, 0x0040, 0x080c, 0x2220, 0x782c,</div><div class='del'>-	0xd0fc, 0x09a8, 0x080c, 0xad18, 0x782c, 0xd0fc, 0x1de8, 0x080c,</div><div class='del'>-	0xacfc, 0x7054, 0x9086, 0x0000, 0x1950, 0x782b, 0x0004, 0x782c,</div><div class='del'>-	0xd0ac, 0x1de8, 0x2009, 0x0040, 0x080c, 0x2220, 0x782b, 0x0002,</div><div class='del'>-	0x7057, 0x0000, 0x00ee, 0x00fe, 0x0005, 0x080c, 0x0d85, 0x8c60,</div><div class='del'>-	0x2c05, 0x9005, 0x0110, 0x8a51, 0x0005, 0xa004, 0x9005, 0x0168,</div><div class='del'>-	0xa85a, 0x2040, 0xa064, 0x9084, 0x000f, 0x9080, 0x1ec1, 0x2065,</div><div class='del'>-	0x8cff, 0x090c, 0x0d85, 0x8a51, 0x0005, 0x2050, 0x0005, 0x0000,</div><div class='del'>-	0x001d, 0x0021, 0x0025, 0x0029, 0x002d, 0x0031, 0x0035, 0x0000,</div><div class='del'>-	0x001b, 0x0021, 0x0027, 0x002d, 0x0033, 0x0000, 0x0000, 0x0023,</div><div class='del'>-	0x0000, 0x0000, 0x1eb4, 0x1eb0, 0x1eb4, 0x1eb4, 0x1ebe, 0x0000,</div><div class='del'>-	0x1eb4, 0x1ebb, 0x1ebb, 0x1eb8, 0x1ebb, 0x1ebb, 0x0000, 0x1ebe,</div><div class='del'>-	0x1ebb, 0x0000, 0x1eb6, 0x1eb6, 0x0000, 0x1eb6, 0x1ebe, 0x0000,</div><div class='del'>-	0x1eb6, 0x1ebc, 0x1ebc, 0x1ebc, 0x0000, 0x1ebc, 0x0000, 0x1ebe,</div><div class='del'>-	0x1ebc, 0x00c6, 0x00d6, 0x0086, 0xab42, 0xac3e, 0xa888, 0x9055,</div><div class='del'>-	0x0904, 0x20c0, 0x2940, 0xa064, 0x90ec, 0x000f, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x0008, 0x1118, 0x2061, 0x1ebc, 0x00d0, 0x9de0, 0x1ec1,</div><div class='del'>-	0x9d86, 0x0007, 0x0130, 0x9d86, 0x000e, 0x0118, 0x9d86, 0x000f,</div><div class='del'>-	0x1120, 0xa08c, 0x9422, 0xa090, 0x931b, 0x2c05, 0x9065, 0x1140,</div><div class='del'>-	0x0310, 0x0804, 0x20c0, 0xa004, 0x9045, 0x0904, 0x20c0, 0x08d8,</div><div class='del'>-	0x2c05, 0x9005, 0x0904, 0x1fa8, 0xdd9c, 0x1904, 0x1f64, 0x908a,</div><div class='del'>-	0x0036, 0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002, 0x1f39, 0x1f39,</div><div class='del'>-	0x1f3b, 0x1f39, 0x1f39, 0x1f39, 0x1f41, 0x1f39, 0x1f39, 0x1f39,</div><div class='del'>-	0x1f47, 0x1f39, 0x1f39, 0x1f39, 0x1f4d, 0x1f39, 0x1f39, 0x1f39,</div><div class='del'>-	0x1f53, 0x1f39, 0x1f39, 0x1f39, 0x1f59, 0x1f39, 0x1f39, 0x1f39,</div><div class='del'>-	0x1f5f, 0x080c, 0x0d85, 0xa07c, 0x9422, 0xa080, 0x931b, 0x0804,</div><div class='del'>-	0x1f9e, 0xa08c, 0x9422, 0xa090, 0x931b, 0x0804, 0x1f9e, 0xa09c,</div><div class='del'>-	0x9422, 0xa0a0, 0x931b, 0x0804, 0x1f9e, 0xa0ac, 0x9422, 0xa0b0,</div><div class='del'>-	0x931b, 0x0804, 0x1f9e, 0xa0bc, 0x9422, 0xa0c0, 0x931b, 0x0804,</div><div class='del'>-	0x1f9e, 0xa0cc, 0x9422, 0xa0d0, 0x931b, 0x0804, 0x1f9e, 0xa0dc,</div><div class='del'>-	0x9422, 0xa0e0, 0x931b, 0x04d0, 0x908a, 0x0034, 0x1a0c, 0x0d85,</div><div class='del'>-	0x9082, 0x001b, 0x0002, 0x1f86, 0x1f84, 0x1f84, 0x1f84, 0x1f84,</div><div class='del'>-	0x1f84, 0x1f8b, 0x1f84, 0x1f84, 0x1f84, 0x1f84, 0x1f84, 0x1f90,</div><div class='del'>-	0x1f84, 0x1f84, 0x1f84, 0x1f84, 0x1f84, 0x1f95, 0x1f84, 0x1f84,</div><div class='del'>-	0x1f84, 0x1f84, 0x1f84, 0x1f9a, 0x080c, 0x0d85, 0xa07c, 0x9422,</div><div class='del'>-	0xa080, 0x931b, 0x0098, 0xa094, 0x9422, 0xa098, 0x931b, 0x0070,</div><div class='del'>-	0xa0ac, 0x9422, 0xa0b0, 0x931b, 0x0048, 0xa0c4, 0x9422, 0xa0c8,</div><div class='del'>-	0x931b, 0x0020, 0xa0dc, 0x9422, 0xa0e0, 0x931b, 0x0630, 0x2300,</div><div class='del'>-	0x9405, 0x0160, 0x8a51, 0x0904, 0x20c0, 0x8c60, 0x0804, 0x1f10,</div><div class='del'>-	0xa004, 0x9045, 0x0904, 0x20c0, 0x0804, 0x1eeb, 0x8a51, 0x0904,</div><div class='del'>-	0x20c0, 0x8c60, 0x2c05, 0x9005, 0x1158, 0xa004, 0x9045, 0x0904,</div><div class='del'>-	0x20c0, 0xa064, 0x90ec, 0x000f, 0x9de0, 0x1ec1, 0x2c05, 0x2060,</div><div class='del'>-	0xa880, 0xc0fc, 0xa882, 0x0804, 0x20b5, 0x2c05, 0x8422, 0x8420,</div><div class='del'>-	0x831a, 0x9399, 0x0000, 0xac2e, 0xab32, 0xdd9c, 0x1904, 0x2052,</div><div class='del'>-	0x9082, 0x001b, 0x0002, 0x1fee, 0x1fee, 0x1ff0, 0x1fee, 0x1fee,</div><div class='del'>-	0x1fee, 0x1ffe, 0x1fee, 0x1fee, 0x1fee, 0x200c, 0x1fee, 0x1fee,</div><div class='del'>-	0x1fee, 0x201a, 0x1fee, 0x1fee, 0x1fee, 0x2028, 0x1fee, 0x1fee,</div><div class='del'>-	0x1fee, 0x2036, 0x1fee, 0x1fee, 0x1fee, 0x2044, 0x080c, 0x0d85,</div><div class='del'>-	0xa17c, 0x2400, 0x9122, 0xa180, 0x2300, 0x911b, 0x0a0c, 0x0d85,</div><div class='del'>-	0xa074, 0x9420, 0xa078, 0x9319, 0x0804, 0x20b0, 0xa18c, 0x2400,</div><div class='del'>-	0x9122, 0xa190, 0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa084, 0x9420,</div><div class='del'>-	0xa088, 0x9319, 0x0804, 0x20b0, 0xa19c, 0x2400, 0x9122, 0xa1a0,</div><div class='del'>-	0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa094, 0x9420, 0xa098, 0x9319,</div><div class='del'>-	0x0804, 0x20b0, 0xa1ac, 0x2400, 0x9122, 0xa1b0, 0x2300, 0x911b,</div><div class='del'>-	0x0a0c, 0x0d85, 0xa0a4, 0x9420, 0xa0a8, 0x9319, 0x0804, 0x20b0,</div><div class='del'>-	0xa1bc, 0x2400, 0x9122, 0xa1c0, 0x2300, 0x911b, 0x0a0c, 0x0d85,</div><div class='del'>-	0xa0b4, 0x9420, 0xa0b8, 0x9319, 0x0804, 0x20b0, 0xa1cc, 0x2400,</div><div class='del'>-	0x9122, 0xa1d0, 0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa0c4, 0x9420,</div><div class='del'>-	0xa0c8, 0x9319, 0x0804, 0x20b0, 0xa1dc, 0x2400, 0x9122, 0xa1e0,</div><div class='del'>-	0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa0d4, 0x9420, 0xa0d8, 0x9319,</div><div class='del'>-	0x0804, 0x20b0, 0x9082, 0x001b, 0x0002, 0x2070, 0x206e, 0x206e,</div><div class='del'>-	0x206e, 0x206e, 0x206e, 0x207d, 0x206e, 0x206e, 0x206e, 0x206e,</div><div class='del'>-	0x206e, 0x208a, 0x206e, 0x206e, 0x206e, 0x206e, 0x206e, 0x2097,</div><div class='del'>-	0x206e, 0x206e, 0x206e, 0x206e, 0x206e, 0x20a4, 0x080c, 0x0d85,</div><div class='del'>-	0xa17c, 0x2400, 0x9122, 0xa180, 0x2300, 0x911b, 0x0a0c, 0x0d85,</div><div class='del'>-	0xa06c, 0x9420, 0xa070, 0x9319, 0x0498, 0xa194, 0x2400, 0x9122,</div><div class='del'>-	0xa198, 0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa084, 0x9420, 0xa088,</div><div class='del'>-	0x9319, 0x0430, 0xa1ac, 0x2400, 0x9122, 0xa1b0, 0x2300, 0x911b,</div><div class='del'>-	0x0a0c, 0x0d85, 0xa09c, 0x9420, 0xa0a0, 0x9319, 0x00c8, 0xa1c4,</div><div class='del'>-	0x2400, 0x9122, 0xa1c8, 0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa0b4,</div><div class='del'>-	0x9420, 0xa0b8, 0x9319, 0x0060, 0xa1dc, 0x2400, 0x9122, 0xa1e0,</div><div class='del'>-	0x2300, 0x911b, 0x0a0c, 0x0d85, 0xa0cc, 0x9420, 0xa0d0, 0x9319,</div><div class='del'>-	0xac1e, 0xab22, 0xa880, 0xc0fd, 0xa882, 0x2800, 0xa85a, 0x2c00,</div><div class='del'>-	0xa812, 0x2a00, 0xa816, 0x000e, 0x000e, 0x000e, 0x9006, 0x0028,</div><div class='del'>-	0x008e, 0x00de, 0x00ce, 0x9085, 0x0001, 0x0005, 0x00c6, 0x610c,</div><div class='del'>-	0x0016, 0x9026, 0x2410, 0x6004, 0x9420, 0x9291, 0x0000, 0x2c04,</div><div class='del'>-	0x9210, 0x9ce0, 0x0002, 0x918a, 0x0002, 0x1da8, 0x9284, 0x000f,</div><div class='del'>-	0x9405, 0x001e, 0x00ce, 0x0005, 0x7803, 0x0003, 0x780f, 0x0000,</div><div class='del'>-	0x6004, 0x7812, 0x2c04, 0x7816, 0x9ce0, 0x0002, 0x918a, 0x0002,</div><div class='del'>-	0x1db8, 0x0005, 0x2001, 0x0005, 0x2004, 0xd0bc, 0x190c, 0x0d7e,</div><div class='del'>-	0xd094, 0x0110, 0x080c, 0x1208, 0x0005, 0x0126, 0x2091, 0x2600,</div><div class='del'>-	0x2079, 0x0200, 0x2071, 0x0260, 0x2069, 0x1800, 0x7817, 0x0000,</div><div class='del'>-	0x789b, 0x0814, 0x78a3, 0x0406, 0x789f, 0x0410, 0x2009, 0x013b,</div><div class='del'>-	0x200b, 0x0400, 0x781b, 0x0002, 0x783b, 0x001f, 0x7837, 0x0020,</div><div class='del'>-	0x7803, 0x1600, 0x012e, 0x0005, 0x2091, 0x2600, 0x781c, 0xd0a4,</div><div class='del'>-	0x190c, 0x221d, 0x7900, 0xd1dc, 0x1118, 0x9084, 0x0006, 0x001a,</div><div class='del'>-	0x9084, 0x000e, 0x0002, 0x213b, 0x2133, 0x8210, 0x2133, 0x2135,</div><div class='del'>-	0x2135, 0x2135, 0x2135, 0x81f6, 0x2133, 0x2137, 0x2133, 0x2135,</div><div class='del'>-	0x2133, 0x2135, 0x2133, 0x080c, 0x0d85, 0x0031, 0x0020, 0x080c,</div><div class='del'>-	0x81f6, 0x080c, 0x8210, 0x0005, 0x0006, 0x0016, 0x0026, 0x080c,</div><div class='del'>-	0xeefa, 0x7930, 0x9184, 0x0003, 0x0510, 0x080c, 0xacfc, 0x2001,</div><div class='del'>-	0x19fb, 0x2004, 0x9005, 0x01a0, 0x2001, 0x0133, 0x2004, 0x9005,</div><div class='del'>-	0x090c, 0x0d85, 0x00c6, 0x2001, 0x19fb, 0x2064, 0x080c, 0xad18,</div><div class='del'>-	0x080c, 0xcae9, 0x2009, 0x0040, 0x080c, 0x2220, 0x00ce, 0x0408,</div><div class='del'>-	0x2009, 0x0040, 0x080c, 0x2220, 0x080c, 0xad18, 0x00d0, 0x9184,</div><div class='del'>-	0x0014, 0x01a0, 0x6a00, 0x9286, 0x0003, 0x0160, 0x080c, 0x779e,</div><div class='del'>-	0x1138, 0x080c, 0x7ab6, 0x080c, 0x619d, 0x080c, 0x76cd, 0x0010,</div><div class='del'>-	0x080c, 0x6058, 0x080c, 0x82ae, 0x0041, 0x0018, 0x9184, 0x9540,</div><div class='del'>-	0x1dc8, 0x002e, 0x001e, 0x000e, 0x0005, 0x00e6, 0x0036, 0x0046,</div><div class='del'>-	0x0056, 0x2071, 0x1a6e, 0x080c, 0x1b1e, 0x005e, 0x004e, 0x003e,</div><div class='del'>-	0x00ee, 0x0005, 0x0126, 0x2091, 0x2e00, 0x2071, 0x1800, 0x7128,</div><div class='del'>-	0x2001, 0x196f, 0x2102, 0x2001, 0x1977, 0x2102, 0x2001, 0x013b,</div><div class='del'>-	0x2102, 0x2079, 0x0200, 0x2001, 0x0201, 0x789e, 0x78a3, 0x0200,</div><div class='del'>-	0x9198, 0x0007, 0x831c, 0x831c, 0x831c, 0x9398, 0x0005, 0x2320,</div><div class='del'>-	0x9182, 0x0204, 0x1230, 0x2011, 0x0008, 0x8423, 0x8423, 0x8423,</div><div class='del'>-	0x0488, 0x9182, 0x024c, 0x1240, 0x2011, 0x0007, 0x8403, 0x8003,</div><div class='del'>-	0x9400, 0x9400, 0x9420, 0x0430, 0x9182, 0x02bc, 0x1238, 0x2011,</div><div class='del'>-	0x0006, 0x8403, 0x8003, 0x9400, 0x9420, 0x00e0, 0x9182, 0x034c,</div><div class='del'>-	0x1230, 0x2011, 0x0005, 0x8403, 0x8003, 0x9420, 0x0098, 0x9182,</div><div class='del'>-	0x042c, 0x1228, 0x2011, 0x0004, 0x8423, 0x8423, 0x0058, 0x9182,</div><div class='del'>-	0x059c, 0x1228, 0x2011, 0x0003, 0x8403, 0x9420, 0x0018, 0x2011,</div><div class='del'>-	0x0002, 0x8423, 0x9482, 0x0228, 0x8002, 0x8020, 0x8301, 0x9402,</div><div class='del'>-	0x0110, 0x0208, 0x8321, 0x8217, 0x8203, 0x9405, 0x789a, 0x012e,</div><div class='del'>-	0x0005, 0x0006, 0x00d6, 0x2069, 0x0200, 0x6814, 0x9084, 0xffc0,</div><div class='del'>-	0x910d, 0x6916, 0x00de, 0x000e, 0x0005, 0x00d6, 0x2069, 0x0200,</div><div class='del'>-	0x9005, 0x6810, 0x0110, 0xc0a5, 0x0008, 0xc0a4, 0x6812, 0x00de,</div><div class='del'>-	0x0005, 0x0006, 0x00d6, 0x2069, 0x0200, 0x6810, 0x9084, 0xfff8,</div><div class='del'>-	0x910d, 0x6912, 0x00de, 0x000e, 0x0005, 0x7938, 0x080c, 0x0d7e,</div><div class='del'>-	0x00f6, 0x2079, 0x0200, 0x7902, 0xa001, 0xa001, 0xa001, 0xa001,</div><div class='del'>-	0xa001, 0xa001, 0x7902, 0xa001, 0xa001, 0xa001, 0xa001, 0xa001,</div><div class='del'>-	0xa001, 0x00fe, 0x0005, 0x0126, 0x2091, 0x2800, 0x2061, 0x0100,</div><div class='del'>-	0x2071, 0x1800, 0x2009, 0x0000, 0x080c, 0x2a85, 0x080c, 0x299b,</div><div class='del'>-	0x2001, 0x199d, 0x2003, 0x0700, 0x2001, 0x199e, 0x2003, 0x0700,</div><div class='del'>-	0x080c, 0x2af6, 0x9006, 0x080c, 0x29ca, 0x9006, 0x080c, 0x29ad,</div><div class='del'>-	0x20a9, 0x0012, 0x1d04, 0x2252, 0x2091, 0x6000, 0x1f04, 0x2252,</div><div class='del'>-	0x602f, 0x0100, 0x602f, 0x0000, 0x6050, 0x9085, 0x0400, 0x9084,</div><div class='del'>-	0xdfff, 0x6052, 0x6224, 0x080c, 0x2ad3, 0x080c, 0x26c5, 0x2009,</div><div class='del'>-	0x00ef, 0x6132, 0x6136, 0x080c, 0x26d5, 0x60e7, 0x0000, 0x61ea,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002, 0x1110, 0x2001,</div><div class='del'>-	0x0008, 0x60e2, 0x604b, 0xf7f7, 0x6043, 0x0000, 0x602f, 0x0080,</div><div class='del'>-	0x602f, 0x0000, 0x6007, 0x349f, 0x00c6, 0x2061, 0x0140, 0x608b,</div><div class='del'>-	0x000b, 0x608f, 0x10b8, 0x6093, 0x0000, 0x6097, 0x0198, 0x00ce,</div><div class='del'>-	0x6004, 0x9085, 0x8000, 0x6006, 0x60bb, 0x0000, 0x20a9, 0x0018,</div><div class='del'>-	0x60bf, 0x0000, 0x1f04, 0x2298, 0x60bb, 0x0000, 0x60bf, 0x0108,</div><div class='del'>-	0x60bf, 0x0012, 0x60bf, 0x0405, 0x60bf, 0x0014, 0x60bf, 0x0320,</div><div class='del'>-	0x60bf, 0x0018, 0x601b, 0x00f0, 0x601f, 0x001e, 0x600f, 0x006b,</div><div class='del'>-	0x602b, 0x402c, 0x012e, 0x0005, 0x00f6, 0x2079, 0x0140, 0x78c3,</div><div class='del'>-	0x0080, 0x78c3, 0x0083, 0x78c3, 0x0000, 0x00fe, 0x0005, 0x2001,</div><div class='del'>-	0x1835, 0x2003, 0x0000, 0x2001, 0x1834, 0x2003, 0x0001, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x6124, 0x6028,</div><div class='del'>-	0x910c, 0x0066, 0x2031, 0x1837, 0x2634, 0x96b4, 0x0028, 0x006e,</div><div class='del'>-	0x1138, 0x6020, 0xd1bc, 0x0120, 0xd0bc, 0x1168, 0xd0b4, 0x1198,</div><div class='del'>-	0x9184, 0x5e2c, 0x1118, 0x9184, 0x0007, 0x00aa, 0x9195, 0x0004,</div><div class='del'>-	0x9284, 0x0007, 0x0082, 0x0016, 0x2001, 0x0387, 0x200c, 0xd1a4,</div><div class='del'>-	0x001e, 0x0d70, 0x0c98, 0x0016, 0x2001, 0x0387, 0x200c, 0xd1b4,</div><div class='del'>-	0x001e, 0x0d30, 0x0c58, 0x2306, 0x2303, 0x2303, 0x2303, 0x2305,</div><div class='del'>-	0x2303, 0x2303, 0x2303, 0x080c, 0x0d85, 0x0029, 0x002e, 0x001e,</div><div class='del'>-	0x000e, 0x012e, 0x0005, 0x00a6, 0x6124, 0x6028, 0xd09c, 0x0118,</div><div class='del'>-	0xd19c, 0x1904, 0x258b, 0xd1f4, 0x190c, 0x0d7e, 0x080c, 0x779e,</div><div class='del'>-	0x0904, 0x2363, 0x080c, 0xd645, 0x1120, 0x7000, 0x9086, 0x0003,</div><div class='del'>-	0x0580, 0x6024, 0x9084, 0x1800, 0x0560, 0x080c, 0x77c1, 0x0118,</div><div class='del'>-	0x080c, 0x77af, 0x1530, 0x2011, 0x0020, 0x080c, 0x2ad3, 0x6043,</div><div class='del'>-	0x0000, 0x080c, 0xd645, 0x0168, 0x080c, 0x77c1, 0x1150, 0x2001,</div><div class='del'>-	0x19a8, 0x2003, 0x0001, 0x6027, 0x1800, 0x080c, 0x7612, 0x0804,</div><div class='del'>-	0x258e, 0x70a4, 0x9005, 0x1150, 0x70a7, 0x0001, 0x00d6, 0x2069,</div><div class='del'>-	0x0140, 0x080c, 0x77f2, 0x00de, 0x1904, 0x258e, 0x080c, 0x7ac0,</div><div class='del'>-	0x0428, 0x080c, 0x77c1, 0x1590, 0x6024, 0x9084, 0x1800, 0x1108,</div><div class='del'>-	0x0468, 0x080c, 0x7ac0, 0x080c, 0x7ab6, 0x080c, 0x619d, 0x080c,</div><div class='del'>-	0x76cd, 0x0804, 0x258b, 0xd1ac, 0x1508, 0x6024, 0xd0dc, 0x1170,</div><div class='del'>-	0xd0e4, 0x1178, 0xd0d4, 0x1190, 0xd0cc, 0x0130, 0x7098, 0x9086,</div><div class='del'>-	0x0029, 0x1110, 0x080c, 0x7990, 0x0804, 0x258b, 0x080c, 0x7abb,</div><div class='del'>-	0x0048, 0x2001, 0x197d, 0x2003, 0x0002, 0x0020, 0x080c, 0x78e4,</div><div class='del'>-	0x0804, 0x258b, 0x080c, 0x7a3a, 0x0804, 0x258b, 0x6220, 0xd1bc,</div><div class='del'>-	0x0138, 0xd2bc, 0x1904, 0x25f6, 0xd2b4, 0x1904, 0x2608, 0x0000,</div><div class='del'>-	0xd1ac, 0x0904, 0x2498, 0x0036, 0x6328, 0xc3bc, 0x632a, 0x003e,</div><div class='del'>-	0x080c, 0x779e, 0x11d0, 0x2011, 0x0020, 0x080c, 0x2ad3, 0x0006,</div><div class='del'>-	0x0026, 0x0036, 0x080c, 0x77b8, 0x1158, 0x080c, 0x7ab6, 0x080c,</div><div class='del'>-	0x619d, 0x080c, 0x76cd, 0x003e, 0x002e, 0x000e, 0x00ae, 0x0005,</div><div class='del'>-	0x003e, 0x002e, 0x000e, 0x080c, 0x7772, 0x0016, 0x0046, 0x00c6,</div><div class='del'>-	0x644c, 0x9486, 0xf0f0, 0x1138, 0x2061, 0x0100, 0x644a, 0x6043,</div><div class='del'>-	0x0090, 0x6043, 0x0010, 0x74da, 0x948c, 0xff00, 0x7038, 0xd084,</div><div class='del'>-	0x0190, 0x080c, 0xd645, 0x1118, 0x9186, 0xf800, 0x1160, 0x7048,</div><div class='del'>-	0xd084, 0x1148, 0xc085, 0x704a, 0x0036, 0x2418, 0x2011, 0x8016,</div><div class='del'>-	0x080c, 0x4ca1, 0x003e, 0x080c, 0xd63e, 0x1904, 0x246d, 0x9196,</div><div class='del'>-	0xff00, 0x05a8, 0x7060, 0x9084, 0x00ff, 0x810f, 0x81ff, 0x0110,</div><div class='del'>-	0x9116, 0x0568, 0x7130, 0xd184, 0x1550, 0x080c, 0x3482, 0x0128,</div><div class='del'>-	0xc18d, 0x7132, 0x080c, 0x6c09, 0x1510, 0x6240, 0x9294, 0x0010,</div><div class='del'>-	0x0130, 0x6248, 0x9294, 0xff00, 0x9296, 0xff00, 0x01c0, 0x7030,</div><div class='del'>-	0xd08c, 0x0904, 0x246d, 0x7038, 0xd08c, 0x1140, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0xd1ac, 0x1904, 0x246d, 0xc1ad, 0x2102, 0x0036, 0x73d8,</div><div class='del'>-	0x2011, 0x8013, 0x080c, 0x4ca1, 0x003e, 0x0804, 0x246d, 0x7038,</div><div class='del'>-	0xd08c, 0x1140, 0x2001, 0x180c, 0x200c, 0xd1ac, 0x1904, 0x246d,</div><div class='del'>-	0xc1ad, 0x2102, 0x0036, 0x73d8, 0x2011, 0x8013, 0x080c, 0x4ca1,</div><div class='del'>-	0x003e, 0x7130, 0xc185, 0x7132, 0x2011, 0x1848, 0x220c, 0xd1a4,</div><div class='del'>-	0x01f0, 0x0016, 0x2009, 0x0001, 0x2011, 0x0100, 0x080c, 0x8c44,</div><div class='del'>-	0x2019, 0x000e, 0x00c6, 0x2061, 0x0000, 0x080c, 0xe9f9, 0x00ce,</div><div class='del'>-	0x9484, 0x00ff, 0x9080, 0x348e, 0x200d, 0x918c, 0xff00, 0x810f,</div><div class='del'>-	0x2120, 0x9006, 0x2009, 0x000e, 0x080c, 0xea8d, 0x001e, 0x0016,</div><div class='del'>-	0x2009, 0x0002, 0x2019, 0x0004, 0x080c, 0x32da, 0x001e, 0x00a8,</div><div class='del'>-	0x0156, 0x00b6, 0x20a9, 0x007f, 0x900e, 0x080c, 0x67b4, 0x1140,</div><div class='del'>-	0x7030, 0xd084, 0x1118, 0xb800, 0xd0bc, 0x1110, 0x080c, 0x61b7,</div><div class='del'>-	0x8108, 0x1f04, 0x245d, 0x00be, 0x015e, 0x00ce, 0x004e, 0x080c,</div><div class='del'>-	0xacfc, 0x080c, 0xafd2, 0x080c, 0xb09b, 0x080c, 0xad18, 0x60e3,</div><div class='del'>-	0x0000, 0x001e, 0x2001, 0x1800, 0x2014, 0x9296, 0x0004, 0x1170,</div><div class='del'>-	0xd19c, 0x11b0, 0x2011, 0x180c, 0x2214, 0xd29c, 0x1120, 0x6204,</div><div class='del'>-	0x9295, 0x0002, 0x6206, 0x6228, 0xc29d, 0x622a, 0x2003, 0x0001,</div><div class='del'>-	0x2001, 0x1826, 0x2003, 0x0000, 0x2011, 0x0020, 0x080c, 0x2ad3,</div><div class='del'>-	0xd194, 0x0904, 0x258b, 0x0016, 0x080c, 0xacfc, 0x6220, 0xd2b4,</div><div class='del'>-	0x0904, 0x2526, 0x080c, 0x8a4b, 0x080c, 0xa2a0, 0x2011, 0x0004,</div><div class='del'>-	0x080c, 0x2ad3, 0x00f6, 0x2019, 0x19f4, 0x2304, 0x907d, 0x0904,</div><div class='del'>-	0x24f3, 0x7804, 0x9086, 0x0032, 0x15f0, 0x00d6, 0x00c6, 0x00e6,</div><div class='del'>-	0x0096, 0x2069, 0x0140, 0x782c, 0x685e, 0x7808, 0x685a, 0x6043,</div><div class='del'>-	0x0002, 0x2001, 0x0003, 0x8001, 0x1df0, 0x6043, 0x0000, 0x2001,</div><div class='del'>-	0x003c, 0x8001, 0x1df0, 0x080c, 0x2aa9, 0x2001, 0x001e, 0x8001,</div><div class='del'>-	0x0240, 0x20a9, 0x0009, 0x080c, 0x2a60, 0x6904, 0xd1dc, 0x1140,</div><div class='del'>-	0x0cb0, 0x2001, 0x0100, 0x080c, 0x2a99, 0x9006, 0x080c, 0x2a99,</div><div class='del'>-	0x080c, 0x99ed, 0x080c, 0xad18, 0x7814, 0x2048, 0xa867, 0x0103,</div><div class='del'>-	0x2f60, 0x080c, 0xb16c, 0x009e, 0x00ee, 0x00ce, 0x00de, 0x00fe,</div><div class='del'>-	0x001e, 0x00ae, 0x0005, 0x00fe, 0x00d6, 0x2069, 0x0140, 0x6804,</div><div class='del'>-	0x9084, 0x4000, 0x0110, 0x080c, 0x2aa9, 0x00de, 0x00c6, 0x2061,</div><div class='del'>-	0x19e8, 0x6034, 0x080c, 0xd645, 0x0120, 0x909a, 0x0003, 0x1258,</div><div class='del'>-	0x0018, 0x909a, 0x00c8, 0x1238, 0x8000, 0x6036, 0x00ce, 0x080c,</div><div class='del'>-	0xa278, 0x0804, 0x2588, 0x2061, 0x0100, 0x62c0, 0x080c, 0xac2d,</div><div class='del'>-	0x2019, 0x19f4, 0x2304, 0x9065, 0x0130, 0x6003, 0x0001, 0x2009,</div><div class='del'>-	0x0027, 0x080c, 0xb20a, 0x00ce, 0x0804, 0x2588, 0xd2bc, 0x0904,</div><div class='del'>-	0x256b, 0x080c, 0x8a58, 0x2011, 0x0004, 0x080c, 0x2ad3, 0x00d6,</div><div class='del'>-	0x2069, 0x0140, 0x6804, 0x9084, 0x4000, 0x0110, 0x080c, 0x2aa9,</div><div class='del'>-	0x00de, 0x00c6, 0x2061, 0x19e8, 0x6050, 0x080c, 0xd645, 0x0120,</div><div class='del'>-	0x909a, 0x0003, 0x1668, 0x0018, 0x909a, 0x00c8, 0x1648, 0x8000,</div><div class='del'>-	0x6052, 0x604c, 0x00ce, 0x9005, 0x05d8, 0x2009, 0x07d0, 0x080c,</div><div class='del'>-	0x8a50, 0x9080, 0x0008, 0x2004, 0x9086, 0x0006, 0x1138, 0x2009,</div><div class='del'>-	0x1984, 0x2011, 0x0012, 0x080c, 0x2ae2, 0x0450, 0x9080, 0x0008,</div><div class='del'>-	0x2004, 0x9086, 0x0009, 0x0d98, 0x2009, 0x1984, 0x2011, 0x0016,</div><div class='del'>-	0x080c, 0x2ae2, 0x00e8, 0x2011, 0x0004, 0x080c, 0x2ad3, 0x00c0,</div><div class='del'>-	0x0036, 0x2019, 0x0001, 0x080c, 0xa596, 0x003e, 0x2019, 0x19fb,</div><div class='del'>-	0x2304, 0x9065, 0x0160, 0x2009, 0x004f, 0x6020, 0x9086, 0x0009,</div><div class='del'>-	0x1110, 0x2009, 0x004f, 0x6003, 0x0003, 0x080c, 0xb20a, 0x00ce,</div><div class='del'>-	0x080c, 0xad18, 0x001e, 0xd19c, 0x0904, 0x25ef, 0x7038, 0xd0ac,</div><div class='del'>-	0x1558, 0x0016, 0x0156, 0x2011, 0x0008, 0x080c, 0x2ad3, 0x080c,</div><div class='del'>-	0x2af6, 0x080c, 0x2b29, 0x6050, 0xc0e5, 0x6052, 0x20a9, 0x0367,</div><div class='del'>-	0x0f04, 0x25ba, 0x1d04, 0x25a2, 0x080c, 0x8a7f, 0x6020, 0xd09c,</div><div class='del'>-	0x1db8, 0x00f6, 0x2079, 0x0100, 0x080c, 0x2a0c, 0x00fe, 0x1d80,</div><div class='del'>-	0x6050, 0xc0e4, 0x6052, 0x2011, 0x0008, 0x080c, 0x2ad3, 0x015e,</div><div class='del'>-	0x001e, 0x04a8, 0x015e, 0x001e, 0x0016, 0x6028, 0xc09c, 0x602a,</div><div class='del'>-	0x080c, 0xacfc, 0x080c, 0xafd2, 0x080c, 0xb09b, 0x080c, 0xad18,</div><div class='del'>-	0x60e3, 0x0000, 0x080c, 0xeed9, 0x080c, 0xeef4, 0x080c, 0x5844,</div><div class='del'>-	0xd0fc, 0x1138, 0x080c, 0xd63e, 0x1120, 0x9085, 0x0001, 0x080c,</div><div class='del'>-	0x77e2, 0x9006, 0x080c, 0x2a99, 0x2009, 0x0002, 0x080c, 0x2a85,</div><div class='del'>-	0x00e6, 0x2071, 0x1800, 0x7003, 0x0004, 0x080c, 0x0ed3, 0x00ee,</div><div class='del'>-	0x2011, 0x0008, 0x080c, 0x2ad3, 0x080c, 0x0bcf, 0x001e, 0x918c,</div><div class='del'>-	0xffd0, 0x2110, 0x080c, 0x2ad3, 0x00ae, 0x0005, 0x0016, 0x2001,</div><div class='del'>-	0x0387, 0x200c, 0xd1a4, 0x001e, 0x0904, 0x2390, 0x0016, 0x2009,</div><div class='del'>-	0x2602, 0x00c0, 0x2001, 0x0387, 0x2003, 0x1000, 0x001e, 0x0c38,</div><div class='del'>-	0x0016, 0x2001, 0x0387, 0x200c, 0xd1b4, 0x001e, 0x0904, 0x2390,</div><div class='del'>-	0x0016, 0x2009, 0x2614, 0x0030, 0x2001, 0x0387, 0x2003, 0x4000,</div><div class='del'>-	0x001e, 0x08a8, 0x6028, 0xc0bc, 0x602a, 0x2001, 0x0156, 0x2003,</div><div class='del'>-	0xbc91, 0x8000, 0x2003, 0xffff, 0x6043, 0x0001, 0x080c, 0x2a7f,</div><div class='del'>-	0x2011, 0x0080, 0x080c, 0x2ad3, 0x6017, 0x0000, 0x6043, 0x0000,</div><div class='del'>-	0x0817, 0x0006, 0x0016, 0x0026, 0x0036, 0x00e6, 0x00f6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2071, 0x1800, 0x71d0, 0x70d2, 0x9116, 0x0904,</div><div class='del'>-	0x2684, 0x81ff, 0x01a0, 0x2009, 0x0000, 0x080c, 0x2a85, 0x2011,</div><div class='del'>-	0x8011, 0x2019, 0x010e, 0x231c, 0x939e, 0x0007, 0x1118, 0x2019,</div><div class='del'>-	0x0001, 0x0010, 0x2019, 0x0000, 0x080c, 0x4ca1, 0x0468, 0x2001,</div><div class='del'>-	0x19a9, 0x200c, 0x81ff, 0x1140, 0x2001, 0x0109, 0x2004, 0xd0b4,</div><div class='del'>-	0x0118, 0x2019, 0x0003, 0x0008, 0x2118, 0x2011, 0x8012, 0x080c,</div><div class='del'>-	0x4ca1, 0x080c, 0x0ed3, 0x080c, 0x5844, 0xd0fc, 0x11a8, 0x080c,</div><div class='del'>-	0xd63e, 0x1190, 0x00c6, 0x080c, 0x2720, 0x080c, 0xacfc, 0x080c,</div><div class='del'>-	0xa4f1, 0x080c, 0xad18, 0x2061, 0x0100, 0x2019, 0x0028, 0x2009,</div><div class='del'>-	0x0002, 0x080c, 0x32da, 0x00ce, 0x012e, 0x00fe, 0x00ee, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x000e, 0x0005, 0x2028, 0x918c, 0x00ff, 0x2130,</div><div class='del'>-	0x9094, 0xff00, 0x11f0, 0x2011, 0x1837, 0x2214, 0xd2ac, 0x11c8,</div><div class='del'>-	0x81ff, 0x01e8, 0x2011, 0x181f, 0x2204, 0x9106, 0x1190, 0x2011,</div><div class='del'>-	0x1820, 0x2214, 0x9294, 0xff00, 0x9584, 0xff00, 0x9206, 0x1148,</div><div class='del'>-	0x2011, 0x1820, 0x2214, 0x9294, 0x00ff, 0x9584, 0x00ff, 0x9206,</div><div class='del'>-	0x1120, 0x2500, 0x080c, 0x8521, 0x0048, 0x9584, 0x00ff, 0x9080,</div><div class='del'>-	0x348e, 0x200d, 0x918c, 0xff00, 0x810f, 0x9006, 0x0005, 0x9080,</div><div class='del'>-	0x348e, 0x200d, 0x918c, 0x00ff, 0x0005, 0x00d6, 0x2069, 0x0140,</div><div class='del'>-	0x2001, 0x1818, 0x2003, 0x00ef, 0x20a9, 0x0010, 0x9006, 0x6852,</div><div class='del'>-	0x6856, 0x1f04, 0x26d0, 0x00de, 0x0005, 0x0006, 0x00d6, 0x0026,</div><div class='del'>-	0x2069, 0x0140, 0x2001, 0x1818, 0x2102, 0x8114, 0x8214, 0x8214,</div><div class='del'>-	0x8214, 0x20a9, 0x0010, 0x6853, 0x0000, 0x9006, 0x82ff, 0x1128,</div><div class='del'>-	0x9184, 0x000f, 0x9080, 0xef08, 0x2005, 0x6856, 0x8211, 0x1f04,</div><div class='del'>-	0x26e5, 0x002e, 0x00de, 0x000e, 0x0005, 0x00c6, 0x2061, 0x1800,</div><div class='del'>-	0x6030, 0x0110, 0xc09d, 0x0008, 0xc09c, 0x6032, 0x00ce, 0x0005,</div><div class='del'>-	0x0156, 0x00d6, 0x0026, 0x0016, 0x0006, 0x2069, 0x0140, 0x6980,</div><div class='del'>-	0x9116, 0x0180, 0x9112, 0x1230, 0x8212, 0x8210, 0x22a8, 0x2001,</div><div class='del'>-	0x0402, 0x0018, 0x22a8, 0x2001, 0x0404, 0x680e, 0x1f04, 0x2715,</div><div class='del'>-	0x680f, 0x0000, 0x000e, 0x001e, 0x002e, 0x00de, 0x015e, 0x0005,</div><div class='del'>-	0x080c, 0x5840, 0xd0c4, 0x0150, 0xd0a4, 0x0140, 0x9006, 0x0046,</div><div class='del'>-	0x2020, 0x2009, 0x002e, 0x080c, 0xea8d, 0x004e, 0x0005, 0x00f6,</div><div class='del'>-	0x0016, 0x0026, 0x2079, 0x0140, 0x78c4, 0xd0dc, 0x0904, 0x278c,</div><div class='del'>-	0x080c, 0x29fc, 0x0660, 0x9084, 0x0700, 0x908e, 0x0600, 0x1120,</div><div class='del'>-	0x2011, 0x4000, 0x900e, 0x0458, 0x908e, 0x0500, 0x1120, 0x2011,</div><div class='del'>-	0x8000, 0x900e, 0x0420, 0x908e, 0x0400, 0x1120, 0x9016, 0x2009,</div><div class='del'>-	0x0001, 0x00e8, 0x908e, 0x0300, 0x1120, 0x9016, 0x2009, 0x0002,</div><div class='del'>-	0x00b0, 0x908e, 0x0200, 0x1120, 0x9016, 0x2009, 0x0004, 0x0078,</div><div class='del'>-	0x908e, 0x0100, 0x1548, 0x9016, 0x2009, 0x0008, 0x0040, 0x9084,</div><div class='del'>-	0x0700, 0x908e, 0x0300, 0x1500, 0x2011, 0x0030, 0x0058, 0x2300,</div><div class='del'>-	0x9080, 0x0020, 0x2018, 0x080c, 0x955b, 0x928c, 0xff00, 0x0110,</div><div class='del'>-	0x2011, 0x00ff, 0x2200, 0x8007, 0x9085, 0x004c, 0x78c2, 0x2009,</div><div class='del'>-	0x0138, 0x220a, 0x080c, 0x779e, 0x1118, 0x2009, 0x196d, 0x220a,</div><div class='del'>-	0x002e, 0x001e, 0x00fe, 0x0005, 0x78c3, 0x0000, 0x0cc8, 0x0126,</div><div class='del'>-	0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x2001, 0x0170, 0x200c,</div><div class='del'>-	0x8000, 0x2014, 0x9184, 0x0003, 0x0110, 0x080c, 0x0d7e, 0x002e,</div><div class='del'>-	0x001e, 0x000e, 0x012e, 0x0005, 0x2001, 0x180d, 0x2004, 0xd08c,</div><div class='del'>-	0x0118, 0x2009, 0x0002, 0x0005, 0x2001, 0x0171, 0x2004, 0xd0dc,</div><div class='del'>-	0x0168, 0x2001, 0x0170, 0x200c, 0x918c, 0x00ff, 0x918e, 0x004c,</div><div class='del'>-	0x1128, 0x200c, 0x918c, 0xff00, 0x810f, 0x0005, 0x900e, 0x2001,</div><div class='del'>-	0x0227, 0x2004, 0x8007, 0x9084, 0x00ff, 0x8004, 0x9108, 0x2001,</div><div class='del'>-	0x0226, 0x2004, 0x8007, 0x9084, 0x00ff, 0x8004, 0x9108, 0x0005,</div><div class='del'>-	0x0018, 0x000c, 0x0018, 0x0020, 0x1000, 0x0800, 0x1000, 0x1800,</div><div class='del'>-	0x0156, 0x0006, 0x0016, 0x0026, 0x00e6, 0x2001, 0x1990, 0x2004,</div><div class='del'>-	0x908a, 0x0007, 0x1a0c, 0x0d85, 0x0033, 0x00ee, 0x002e, 0x001e,</div><div class='del'>-	0x000e, 0x015e, 0x0005, 0x27f2, 0x2810, 0x2834, 0x2836, 0x285f,</div><div class='del'>-	0x2861, 0x2863, 0x2001, 0x0001, 0x080c, 0x2631, 0x080c, 0x2a4a,</div><div class='del'>-	0x2001, 0x1992, 0x2003, 0x0000, 0x7828, 0x9084, 0xe1d7, 0x782a,</div><div class='del'>-	0x9006, 0x20a9, 0x0009, 0x080c, 0x2a18, 0x2001, 0x1990, 0x2003,</div><div class='del'>-	0x0006, 0x2009, 0x001e, 0x2011, 0x2864, 0x080c, 0x8a5d, 0x0005,</div><div class='del'>-	0x2009, 0x1995, 0x200b, 0x0000, 0x2001, 0x199a, 0x2003, 0x0036,</div><div class='del'>-	0x2001, 0x1999, 0x2003, 0x002a, 0x2001, 0x1992, 0x2003, 0x0001,</div><div class='del'>-	0x9006, 0x080c, 0x29ad, 0x2001, 0xffff, 0x20a9, 0x0009, 0x080c,</div><div class='del'>-	0x2a18, 0x2001, 0x1990, 0x2003, 0x0006, 0x2009, 0x001e, 0x2011,</div><div class='del'>-	0x2864, 0x080c, 0x8a5d, 0x0005, 0x080c, 0x0d85, 0x2001, 0x199a,</div><div class='del'>-	0x2003, 0x0036, 0x2001, 0x1992, 0x2003, 0x0003, 0x7a38, 0x9294,</div><div class='del'>-	0x0005, 0x9296, 0x0004, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x29ad, 0x2001, 0x1996, 0x2003, 0x0000, 0x2001, 0xffff,</div><div class='del'>-	0x20a9, 0x0009, 0x080c, 0x2a18, 0x2001, 0x1990, 0x2003, 0x0006,</div><div class='del'>-	0x2009, 0x001e, 0x2011, 0x2864, 0x080c, 0x8a5d, 0x0005, 0x080c,</div><div class='del'>-	0x0d85, 0x080c, 0x0d85, 0x0005, 0x0006, 0x0016, 0x0026, 0x00e6,</div><div class='del'>-	0x00f6, 0x0156, 0x0126, 0x2091, 0x8000, 0x2079, 0x0100, 0x2001,</div><div class='del'>-	0x1992, 0x2004, 0x908a, 0x0007, 0x1a0c, 0x0d85, 0x0043, 0x012e,</div><div class='del'>-	0x015e, 0x00fe, 0x00ee, 0x002e, 0x001e, 0x000e, 0x0005, 0x2886,</div><div class='del'>-	0x28a2, 0x28de, 0x290a, 0x292a, 0x2936, 0x2938, 0x080c, 0x2a0c,</div><div class='del'>-	0x1190, 0x2009, 0x1998, 0x2104, 0x7a38, 0x9294, 0x0005, 0x9296,</div><div class='del'>-	0x0004, 0x0110, 0xc08d, 0x0008, 0xc085, 0x200a, 0x2001, 0x1990,</div><div class='del'>-	0x2003, 0x0001, 0x0030, 0x080c, 0x295c, 0x2001, 0xffff, 0x080c,</div><div class='del'>-	0x2801, 0x0005, 0x080c, 0x293a, 0x05c0, 0x2009, 0x1999, 0x2104,</div><div class='del'>-	0x8001, 0x200a, 0x080c, 0x2a0c, 0x1158, 0x7a38, 0x9294, 0x0005,</div><div class='del'>-	0x9296, 0x0005, 0x0518, 0x2009, 0x1998, 0x2104, 0xc085, 0x200a,</div><div class='del'>-	0x2009, 0x1995, 0x2104, 0x8000, 0x200a, 0x9086, 0x0005, 0x0118,</div><div class='del'>-	0x080c, 0x2942, 0x00c0, 0x200b, 0x0000, 0x7a38, 0x9294, 0x0006,</div><div class='del'>-	0x9296, 0x0004, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x29ca, 0x2001, 0x1992, 0x2003, 0x0002, 0x0028, 0x2001, 0x1990,</div><div class='del'>-	0x2003, 0x0003, 0x0010, 0x080c, 0x2823, 0x0005, 0x080c, 0x293a,</div><div class='del'>-	0x0540, 0x2009, 0x1999, 0x2104, 0x8001, 0x200a, 0x080c, 0x2a0c,</div><div class='del'>-	0x1148, 0x2001, 0x1990, 0x2003, 0x0003, 0x2001, 0x1991, 0x2003,</div><div class='del'>-	0x0000, 0x00b8, 0x2009, 0x1999, 0x2104, 0x9005, 0x1118, 0x080c,</div><div class='del'>-	0x297f, 0x0010, 0x080c, 0x294f, 0x080c, 0x2942, 0x2009, 0x1995,</div><div class='del'>-	0x200b, 0x0000, 0x2001, 0x1992, 0x2003, 0x0001, 0x080c, 0x2823,</div><div class='del'>-	0x0000, 0x0005, 0x0479, 0x01e8, 0x080c, 0x2a0c, 0x1198, 0x2009,</div><div class='del'>-	0x1996, 0x2104, 0x8000, 0x200a, 0x9086, 0x0007, 0x0108, 0x0078,</div><div class='del'>-	0x2001, 0x199b, 0x2003, 0x000a, 0x2009, 0x1998, 0x2104, 0xc0fd,</div><div class='del'>-	0x200a, 0x0038, 0x00f9, 0x2001, 0x1992, 0x2003, 0x0004, 0x080c,</div><div class='del'>-	0x284e, 0x0005, 0x0079, 0x0148, 0x080c, 0x2a0c, 0x1118, 0x080c,</div><div class='del'>-	0x283a, 0x0018, 0x0079, 0x080c, 0x284e, 0x0005, 0x080c, 0x0d85,</div><div class='del'>-	0x080c, 0x0d85, 0x2009, 0x199a, 0x2104, 0x8001, 0x200a, 0x090c,</div><div class='del'>-	0x299b, 0x0005, 0x7a38, 0x9294, 0x0005, 0x9296, 0x0005, 0x0110,</div><div class='del'>-	0x9006, 0x0010, 0x2001, 0x0001, 0x080c, 0x29ca, 0x0005, 0x7a38,</div><div class='del'>-	0x9294, 0x0006, 0x9296, 0x0006, 0x0110, 0x9006, 0x0010, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0x29ad, 0x0005, 0x2009, 0x1995, 0x2104, 0x8000,</div><div class='del'>-	0x200a, 0x9086, 0x0005, 0x0108, 0x0068, 0x200b, 0x0000, 0x7a38,</div><div class='del'>-	0x9294, 0x0006, 0x9296, 0x0006, 0x0110, 0x9006, 0x0010, 0x2001,</div><div class='del'>-	0x0001, 0x04d9, 0x7a38, 0x9294, 0x0005, 0x9296, 0x0005, 0x0110,</div><div class='del'>-	0x9006, 0x0010, 0x2001, 0x0001, 0x080c, 0x29ca, 0x0005, 0x0086,</div><div class='del'>-	0x2001, 0x1998, 0x2004, 0x9084, 0x7fff, 0x090c, 0x0d85, 0x2009,</div><div class='del'>-	0x1997, 0x2144, 0x8846, 0x280a, 0x9844, 0x0dd8, 0xd08c, 0x1120,</div><div class='del'>-	0xd084, 0x1120, 0x080c, 0x0d85, 0x9006, 0x0010, 0x2001, 0x0001,</div><div class='del'>-	0x00a1, 0x008e, 0x0005, 0x0006, 0x0156, 0x2001, 0x1990, 0x20a9,</div><div class='del'>-	0x0009, 0x2003, 0x0000, 0x8000, 0x1f04, 0x29a1, 0x2001, 0x1997,</div><div class='del'>-	0x2003, 0x8000, 0x015e, 0x000e, 0x0005, 0x00f6, 0x2079, 0x0100,</div><div class='del'>-	0x9085, 0x0000, 0x0158, 0x7838, 0x9084, 0xfff9, 0x9085, 0x0004,</div><div class='del'>-	0x783a, 0x2009, 0x199d, 0x210c, 0x795a, 0x0050, 0x7838, 0x9084,</div><div class='del'>-	0xfffb, 0x9085, 0x0006, 0x783a, 0x2009, 0x199e, 0x210c, 0x795a,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x2079, 0x0100, 0x9085, 0x0000, 0x0158,</div><div class='del'>-	0x7838, 0x9084, 0xfffa, 0x9085, 0x0004, 0x783a, 0x7850, 0x9084,</div><div class='del'>-	0xfff0, 0x7852, 0x00f8, 0x7838, 0x9084, 0xfffb, 0x9085, 0x0005,</div><div class='del'>-	0x783a, 0x7850, 0x9084, 0xfff0, 0x0016, 0x2009, 0x017f, 0x210c,</div><div class='del'>-	0x918e, 0x0005, 0x0140, 0x2009, 0x0003, 0x210c, 0x918c, 0x0600,</div><div class='del'>-	0x918e, 0x0400, 0x0118, 0x9085, 0x000a, 0x0010, 0x9085, 0x0000,</div><div class='del'>-	0x001e, 0x7852, 0x00fe, 0x0005, 0x0006, 0x2001, 0x0100, 0x2004,</div><div class='del'>-	0x9082, 0x0007, 0x000e, 0x0005, 0x0006, 0x2001, 0x0100, 0x2004,</div><div class='del'>-	0x9082, 0x0009, 0x000e, 0x0005, 0x0156, 0x20a9, 0x0064, 0x7820,</div><div class='del'>-	0x080c, 0x2a7f, 0xd09c, 0x1110, 0x1f04, 0x2a0f, 0x015e, 0x0005,</div><div class='del'>-	0x0126, 0x0016, 0x0006, 0x2091, 0x8000, 0x000e, 0x2008, 0x9186,</div><div class='del'>-	0x0000, 0x1118, 0x783b, 0x0007, 0x0090, 0x9186, 0x0001, 0x1118,</div><div class='del'>-	0x783b, 0x0006, 0x0060, 0x9186, 0x0002, 0x1118, 0x783b, 0x0005,</div><div class='del'>-	0x0030, 0x9186, 0x0003, 0x1118, 0x783b, 0x0004, 0x0000, 0x0006,</div><div class='del'>-	0x1d04, 0x2a38, 0x080c, 0x8a7f, 0x1f04, 0x2a38, 0x080c, 0x2af6,</div><div class='del'>-	0x080c, 0x2b29, 0x7850, 0x9085, 0x1000, 0x7852, 0x000e, 0x001e,</div><div class='del'>-	0x012e, 0x0005, 0x080c, 0x2b29, 0x0005, 0x0006, 0x0156, 0x00f6,</div><div class='del'>-	0x2079, 0x0100, 0x20a9, 0x000a, 0x7854, 0xd0ac, 0x1100, 0x7854,</div><div class='del'>-	0xd08c, 0x1110, 0x1f04, 0x2a57, 0x00fe, 0x015e, 0x000e, 0x0005,</div><div class='del'>-	0x1d04, 0x2a60, 0x080c, 0x8a7f, 0x1f04, 0x2a60, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x199c, 0x2004, 0x9086, 0x0000, 0x000e, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x199c, 0x2004, 0x9086, 0x0001, 0x000e, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x199c, 0x2004, 0x9086, 0x0002, 0x000e, 0x0005, 0xa001,</div><div class='del'>-	0xa001, 0xa001, 0xa001, 0xa001, 0x0005, 0x0006, 0x2001, 0x19a9,</div><div class='del'>-	0x2102, 0x000e, 0x0005, 0x2009, 0x0171, 0x2104, 0xd0dc, 0x0140,</div><div class='del'>-	0x2009, 0x0170, 0x2104, 0x200b, 0x0080, 0xa001, 0xa001, 0x200a,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x080c, 0x77b8, 0x0108, 0xc0bc, 0x2009,</div><div class='del'>-	0x0140, 0x2114, 0x9294, 0x0001, 0x9215, 0x220a, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x2009, 0x0140, 0x2114, 0x9294, 0x0001,</div><div class='del'>-	0x9285, 0x1000, 0x200a, 0x220a, 0x002e, 0x001e, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x2009, 0x0140, 0x2114, 0x9294, 0x0001, 0x9215, 0x220a,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0006, 0x0016, 0x2009, 0x0140, 0x2104,</div><div class='del'>-	0x1128, 0x080c, 0x77b8, 0x0110, 0xc0bc, 0x0008, 0xc0bd, 0x200a,</div><div class='del'>-	0x001e, 0x000e, 0x0005, 0x00f6, 0x2079, 0x0380, 0x7843, 0x0101,</div><div class='del'>-	0x7844, 0xd084, 0x1de8, 0x2001, 0x0109, 0x2202, 0x7843, 0x0100,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x2079, 0x0380, 0x7843, 0x0202, 0x7844,</div><div class='del'>-	0xd08c, 0x1de8, 0x2079, 0x0100, 0x7814, 0x9104, 0x9205, 0x7a16,</div><div class='del'>-	0x2079, 0x0380, 0x7843, 0x0200, 0x00fe, 0x0005, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x00c6, 0x2061, 0x0100, 0x6050, 0x9084, 0xfbff, 0x9085,</div><div class='del'>-	0x0040, 0x6052, 0x20a9, 0x0002, 0x080c, 0x2a60, 0x6050, 0x9085,</div><div class='del'>-	0x0400, 0x9084, 0xff9f, 0x6052, 0x20a9, 0x0005, 0x080c, 0x2a60,</div><div class='del'>-	0x6054, 0xd0bc, 0x090c, 0x0d85, 0x20a9, 0x0005, 0x080c, 0x2a60,</div><div class='del'>-	0x6054, 0xd0ac, 0x090c, 0x0d85, 0x2009, 0x19b0, 0x9084, 0x7e00,</div><div class='del'>-	0x8007, 0x8004, 0x8004, 0x200a, 0x00ce, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x0006, 0x00c6, 0x2061, 0x0100, 0x6050, 0xc0cd, 0x6052,</div><div class='del'>-	0x00ce, 0x000e, 0x0005, 0x0016, 0x00c6, 0x00d6, 0x0006, 0x2061,</div><div class='del'>-	0x0100, 0x2069, 0x0140, 0x6030, 0x0006, 0x6048, 0x0006, 0x60e4,</div><div class='del'>-	0x0006, 0x60e8, 0x0006, 0x6050, 0x0006, 0x60ec, 0x0006, 0x600c,</div><div class='del'>-	0x0006, 0x6004, 0x0006, 0xc0fc, 0x6006, 0x2009, 0x0800, 0x2001,</div><div class='del'>-	0x0338, 0x2003, 0x0301, 0x8109, 0x090c, 0x0d85, 0x2001, 0x0338,</div><div class='del'>-	0x2004, 0xd084, 0x1dc0, 0x6028, 0x0006, 0x60e0, 0x0006, 0x6888,</div><div class='del'>-	0x0006, 0x688c, 0x0006, 0x6890, 0x0006, 0x080c, 0x779e, 0x1110,</div><div class='del'>-	0x6884, 0x0006, 0x602f, 0x0100, 0x602f, 0x0000, 0xa001, 0xa001,</div><div class='del'>-	0xa001, 0xa001, 0x602f, 0x0040, 0x602f, 0x0000, 0x080c, 0x779e,</div><div class='del'>-	0x1120, 0x6803, 0x0080, 0x000e, 0x6886, 0x6897, 0x4198, 0x000e,</div><div class='del'>-	0x6892, 0x000e, 0x688e, 0x000e, 0x688a, 0x000e, 0x60e2, 0x000e,</div><div class='del'>-	0x602a, 0x000e, 0x6006, 0x000e, 0x600e, 0x000e, 0x60ee, 0x000e,</div><div class='del'>-	0x6052, 0x000e, 0x60ea, 0x000e, 0x60e6, 0x000e, 0x604a, 0x000e,</div><div class='del'>-	0x6032, 0x6036, 0x2008, 0x080c, 0x26d5, 0x000e, 0x00de, 0x00ce,</div><div class='del'>-	0x001e, 0x0005, 0x0006, 0x0156, 0x6050, 0x9085, 0x0040, 0x6052,</div><div class='del'>-	0x6050, 0x9084, 0xfbcf, 0x6052, 0x080c, 0x2a7f, 0x9085, 0x2000,</div><div class='del'>-	0x6052, 0x20a9, 0x0012, 0x1d04, 0x2bb3, 0x080c, 0x8a7f, 0x1f04,</div><div class='del'>-	0x2bb3, 0x6050, 0x9085, 0x0400, 0x9084, 0xdfbf, 0x6052, 0x015e,</div><div class='del'>-	0x000e, 0x0005, 0x30be, 0x30be, 0x2cc2, 0x2cc2, 0x2cce, 0x2cce,</div><div class='del'>-	0x2cda, 0x2cda, 0x2ce8, 0x2ce8, 0x2cf4, 0x2cf4, 0x2d02, 0x2d02,</div><div class='del'>-	0x2d10, 0x2d10, 0x2d22, 0x2d22, 0x2d2e, 0x2d2e, 0x2d3c, 0x2d3c,</div><div class='del'>-	0x2d5a, 0x2d5a, 0x2d7a, 0x2d7a, 0x2d4a, 0x2d4a, 0x2d6a, 0x2d6a,</div><div class='del'>-	0x2d88, 0x2d88, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d9a, 0x2d9a, 0x2da6, 0x2da6, 0x2db4, 0x2db4,</div><div class='del'>-	0x2dc2, 0x2dc2, 0x2dd2, 0x2dd2, 0x2de0, 0x2de0, 0x2df0, 0x2df0,</div><div class='del'>-	0x2e00, 0x2e00, 0x2e12, 0x2e12, 0x2e20, 0x2e20, 0x2e30, 0x2e30,</div><div class='del'>-	0x2e52, 0x2e52, 0x2e76, 0x2e76, 0x2e40, 0x2e40, 0x2e64, 0x2e64,</div><div class='del'>-	0x2e86, 0x2e86, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2e9a, 0x2e9a, 0x2ea6, 0x2ea6, 0x2eb4, 0x2eb4,</div><div class='del'>-	0x2ec2, 0x2ec2, 0x2ed2, 0x2ed2, 0x2ee0, 0x2ee0, 0x2ef0, 0x2ef0,</div><div class='del'>-	0x2f00, 0x2f00, 0x2f12, 0x2f12, 0x2f20, 0x2f20, 0x2f30, 0x2f30,</div><div class='del'>-	0x2f40, 0x2f40, 0x2f52, 0x2f52, 0x2f62, 0x2f62, 0x2f74, 0x2f74,</div><div class='del'>-	0x2f86, 0x2f86, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2f9a, 0x2f9a, 0x2fa8, 0x2fa8, 0x2fb8, 0x2fb8,</div><div class='del'>-	0x2fc8, 0x2fc8, 0x2fda, 0x2fda, 0x2fea, 0x2fea, 0x2ffc, 0x2ffc,</div><div class='del'>-	0x300e, 0x300e, 0x3022, 0x3022, 0x3032, 0x3032, 0x3044, 0x3044,</div><div class='del'>-	0x3056, 0x3056, 0x306a, 0x306a, 0x307b, 0x307b, 0x308e, 0x308e,</div><div class='del'>-	0x30a1, 0x30a1, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20, 0x2d20,</div><div class='del'>-	0x2d20, 0x2d20, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x22c8, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x20ea,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0x22c8, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x22c8, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0x22c8, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0xa001, 0x0cf0, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x13d4, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x22c8,</div><div class='del'>-	0x080c, 0x13d4, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0x13d4,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0x22c8, 0x080c, 0x13d4,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x13d4, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f,</div><div class='del'>-	0x080c, 0x22c8, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x20ea,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0x22c8,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x22c8, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0x22c8, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x13d4, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0x13d4, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0x22c8,</div><div class='del'>-	0x080c, 0x13d4, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x20ea,</div><div class='del'>-	0x080c, 0x13d4, 0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f,</div><div class='del'>-	0x080c, 0x13d4, 0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0xad62, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0xad62,</div><div class='del'>-	0x080c, 0x22c8, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0xad62,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x22c8,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0xad62, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x2114, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0xad62, 0x080c, 0x13d4, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x13d4, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x13d4,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0xad62, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x13d4,</div><div class='del'>-	0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x20ea, 0x080c, 0xad62,</div><div class='del'>-	0x080c, 0x13d4, 0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x20ea,</div><div class='del'>-	0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0xad62, 0x080c, 0x22c8, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0xad62, 0x0804, 0x30b6,</div><div class='del'>-	0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156,</div><div class='del'>-	0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x22c8,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x080c, 0x22c8,</div><div class='del'>-	0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x20ea,</div><div class='del'>-	0x080c, 0xad62, 0x080c, 0x2114, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x2114,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x080c, 0x13d4,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x080c, 0x22c8,</div><div class='del'>-	0x080c, 0x13d4, 0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6,</div><div class='del'>-	0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0x20ea,</div><div class='del'>-	0x080c, 0xad62, 0x080c, 0x13d4, 0x0804, 0x30b6, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0xad62, 0x080c, 0x22c8, 0x080c, 0x13d4,</div><div class='del'>-	0x0804, 0x30b6, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,</div><div class='del'>-	0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x080c, 0x13d4,</div><div class='del'>-	0x080c, 0x2114, 0x04d8, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,</div><div class='del'>-	0x0136, 0x0146, 0x0156, 0x080c, 0x278f, 0x080c, 0xad62, 0x080c,</div><div class='del'>-	0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114, 0x0440, 0x0106, 0x0006,</div><div class='del'>-	0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x278f,</div><div class='del'>-	0x080c, 0x20ea, 0x080c, 0x13d4, 0x080c, 0xad62, 0x080c, 0x2114,</div><div class='del'>-	0x00a8, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,</div><div class='del'>-	0x0156, 0x080c, 0x278f, 0x080c, 0x20ea, 0x080c, 0xad62, 0x080c,</div><div class='del'>-	0x22c8, 0x080c, 0x13d4, 0x080c, 0x2114, 0x0000, 0x015e, 0x014e,</div><div class='del'>-	0x013e, 0x01de, 0x01ce, 0x012e, 0x000e, 0x010e, 0x000d, 0x00b6,</div><div class='del'>-	0x00c6, 0x0026, 0x0046, 0x9026, 0x080c, 0x6bcf, 0x1904, 0x31f6,</div><div class='del'>-	0x72dc, 0x2001, 0x197c, 0x2004, 0x9005, 0x1110, 0xd29c, 0x0148,</div><div class='del'>-	0xd284, 0x1138, 0xd2bc, 0x1904, 0x31f6, 0x080c, 0x31fb, 0x0804,</div><div class='del'>-	0x31f6, 0xd2cc, 0x1904, 0x31f6, 0x080c, 0x779e, 0x1120, 0x70af,</div><div class='del'>-	0xffff, 0x0804, 0x31f6, 0xd294, 0x0120, 0x70af, 0xffff, 0x0804,</div><div class='del'>-	0x31f6, 0x080c, 0x347d, 0x0160, 0x080c, 0xd645, 0x0128, 0x2001,</div><div class='del'>-	0x1818, 0x203c, 0x0804, 0x316f, 0x70af, 0xffff, 0x0804, 0x31f6,</div><div class='del'>-	0x2001, 0x1818, 0x203c, 0x7294, 0xd284, 0x0904, 0x316f, 0xd28c,</div><div class='del'>-	0x1904, 0x316f, 0x0036, 0x73ac, 0x938e, 0xffff, 0x1110, 0x2019,</div><div class='del'>-	0x0001, 0x8314, 0x92e0, 0x1d80, 0x2c04, 0x938c, 0x0001, 0x0120,</div><div class='del'>-	0x9084, 0xff00, 0x8007, 0x0010, 0x9084, 0x00ff, 0x970e, 0x0904,</div><div class='del'>-	0x3165, 0x908e, 0x0000, 0x0904, 0x3165, 0x908e, 0x00ff, 0x1160,</div><div class='del'>-	0x7230, 0xd284, 0x1904, 0x316a, 0x7294, 0xc28d, 0x7296, 0x70af,</div><div class='del'>-	0xffff, 0x003e, 0x0804, 0x316f, 0x2009, 0x180d, 0x210c, 0xd18c,</div><div class='del'>-	0x0150, 0x0026, 0x2011, 0x0010, 0x080c, 0x6c35, 0x002e, 0x0118,</div><div class='del'>-	0x70af, 0xffff, 0x0488, 0x900e, 0x080c, 0x268c, 0x080c, 0x6749,</div><div class='del'>-	0x1538, 0x9006, 0xb8bb, 0x0520, 0xb8ac, 0x9005, 0x0148, 0x00c6,</div><div class='del'>-	0x2060, 0x080c, 0x8eee, 0x00ce, 0x090c, 0x928d, 0xb8af, 0x0000,</div><div class='del'>-	0x080c, 0x6c11, 0x1168, 0x7030, 0xd08c, 0x0130, 0xb800, 0xd0bc,</div><div class='del'>-	0x0138, 0x080c, 0x6aae, 0x0120, 0x080c, 0x3214, 0x0148, 0x0028,</div><div class='del'>-	0x080c, 0x3360, 0x080c, 0x3240, 0x0118, 0x8318, 0x0804, 0x3109,</div><div class='del'>-	0x73ae, 0x0010, 0x70af, 0xffff, 0x003e, 0x0804, 0x31f6, 0x9780,</div><div class='del'>-	0x348e, 0x203d, 0x97bc, 0xff00, 0x873f, 0x2041, 0x007e, 0x70ac,</div><div class='del'>-	0x9096, 0xffff, 0x1118, 0x900e, 0x28a8, 0x0050, 0x9812, 0x0220,</div><div class='del'>-	0x2008, 0x9802, 0x20a8, 0x0020, 0x70af, 0xffff, 0x0804, 0x31f6,</div><div class='del'>-	0x2700, 0x0156, 0x0016, 0x9106, 0x0904, 0x31eb, 0x2001, 0x180d,</div><div class='del'>-	0x2004, 0xd08c, 0x0158, 0x0026, 0x2011, 0x0010, 0x080c, 0x6c35,</div><div class='del'>-	0x002e, 0x0120, 0x2009, 0xffff, 0x0804, 0x31f3, 0xc484, 0x080c,</div><div class='del'>-	0x67b4, 0x0168, 0x080c, 0xd645, 0x1904, 0x31eb, 0x080c, 0x347d,</div><div class='del'>-	0x1904, 0x31eb, 0x080c, 0x6749, 0x1904, 0x31f3, 0x0008, 0xc485,</div><div class='del'>-	0xb8bb, 0x0520, 0xb8ac, 0x9005, 0x0148, 0x00c6, 0x2060, 0x080c,</div><div class='del'>-	0x8eee, 0x00ce, 0x090c, 0x928d, 0xb8af, 0x0000, 0x080c, 0x6c11,</div><div class='del'>-	0x1130, 0x7030, 0xd08c, 0x01f8, 0xb800, 0xd0bc, 0x11e0, 0x7294,</div><div class='del'>-	0xd28c, 0x0180, 0x080c, 0x6c11, 0x9082, 0x0006, 0x02e0, 0xd484,</div><div class='del'>-	0x1118, 0x080c, 0x676e, 0x0028, 0x080c, 0x33f3, 0x01a0, 0x080c,</div><div class='del'>-	0x341e, 0x0088, 0x080c, 0x3360, 0x080c, 0xd645, 0x1160, 0x080c,</div><div class='del'>-	0x3240, 0x0188, 0x0040, 0x080c, 0xd645, 0x1118, 0x080c, 0x33f3,</div><div class='del'>-	0x0110, 0x0451, 0x0140, 0x001e, 0x8108, 0x015e, 0x1f04, 0x3188,</div><div class='del'>-	0x70af, 0xffff, 0x0018, 0x001e, 0x015e, 0x71ae, 0x004e, 0x002e,</div><div class='del'>-	0x00ce, 0x00be, 0x0005, 0x00c6, 0x0016, 0x70af, 0x0001, 0x2009,</div><div class='del'>-	0x007e, 0x080c, 0x6749, 0x1168, 0xb813, 0x00ff, 0xb817, 0xfffe,</div><div class='del'>-	0x080c, 0x3360, 0x04a9, 0x0128, 0x70dc, 0xc0bd, 0x70de, 0x080c,</div><div class='del'>-	0xd389, 0x001e, 0x00ce, 0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6,</div><div class='del'>-	0x2001, 0x184c, 0x2004, 0x9084, 0x00ff, 0xb842, 0x080c, 0xb1dd,</div><div class='del'>-	0x01d0, 0x2b00, 0x6012, 0x080c, 0xd3b6, 0x6023, 0x0001, 0x9006,</div><div class='del'>-	0x080c, 0x66e6, 0x2001, 0x0000, 0x080c, 0x66fa, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x70a8, 0x8000, 0x70aa, 0x012e, 0x2009, 0x0004, 0x080c,</div><div class='del'>-	0xb20a, 0x9085, 0x0001, 0x00ce, 0x00de, 0x007e, 0x001e, 0x0005,</div><div class='del'>-	0x0016, 0x0076, 0x00d6, 0x00c6, 0x2001, 0x184c, 0x2004, 0x9084,</div><div class='del'>-	0x00ff, 0xb842, 0x080c, 0xb1dd, 0x0548, 0x2b00, 0x6012, 0xb800,</div><div class='del'>-	0xc0c4, 0xb802, 0xb8a0, 0x9086, 0x007e, 0x0140, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0006, 0x1110, 0x080c, 0x3315, 0x080c, 0xd3b6,</div><div class='del'>-	0x6023, 0x0001, 0x9006, 0x080c, 0x66e6, 0x2001, 0x0002, 0x080c,</div><div class='del'>-	0x66fa, 0x0126, 0x2091, 0x8000, 0x70a8, 0x8000, 0x70aa, 0x012e,</div><div class='del'>-	0x2009, 0x0002, 0x080c, 0xb20a, 0x9085, 0x0001, 0x00ce, 0x00de,</div><div class='del'>-	0x007e, 0x001e, 0x0005, 0x00b6, 0x00c6, 0x0026, 0x2009, 0x0080,</div><div class='del'>-	0x080c, 0x6749, 0x1140, 0xb813, 0x00ff, 0xb817, 0xfffc, 0x0039,</div><div class='del'>-	0x0110, 0x70e3, 0xffff, 0x002e, 0x00ce, 0x00be, 0x0005, 0x0016,</div><div class='del'>-	0x0076, 0x00d6, 0x00c6, 0x080c, 0xb116, 0x01d0, 0x2b00, 0x6012,</div><div class='del'>-	0x080c, 0xd3b6, 0x6023, 0x0001, 0x9006, 0x080c, 0x66e6, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0x66fa, 0x0126, 0x2091, 0x8000, 0x70e4, 0x8000,</div><div class='del'>-	0x70e6, 0x012e, 0x2009, 0x0002, 0x080c, 0xb20a, 0x9085, 0x0001,</div><div class='del'>-	0x00ce, 0x00de, 0x007e, 0x001e, 0x0005, 0x00c6, 0x00d6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2009, 0x007f, 0x080c, 0x6749, 0x11b8, 0xb813,</div><div class='del'>-	0x00ff, 0xb817, 0xfffd, 0xb8d7, 0x0004, 0x080c, 0xb116, 0x0170,</div><div class='del'>-	0x2b00, 0x6012, 0x6316, 0x6023, 0x0001, 0x620a, 0x080c, 0xd3b6,</div><div class='del'>-	0x2009, 0x0022, 0x080c, 0xb20a, 0x9085, 0x0001, 0x012e, 0x00de,</div><div class='del'>-	0x00ce, 0x0005, 0x00e6, 0x00c6, 0x0066, 0x0036, 0x0026, 0x00b6,</div><div class='del'>-	0x21f0, 0x080c, 0xacfc, 0x0106, 0x080c, 0x97bb, 0x080c, 0x9727,</div><div class='del'>-	0x080c, 0xac4d, 0x080c, 0xc179, 0x010e, 0x090c, 0xad18, 0x3e08,</div><div class='del'>-	0x2130, 0x81ff, 0x0120, 0x20a9, 0x007e, 0x900e, 0x0018, 0x20a9,</div><div class='del'>-	0x007f, 0x900e, 0x0016, 0x080c, 0x67b4, 0x1140, 0x9686, 0x0002,</div><div class='del'>-	0x1118, 0xb800, 0xd0bc, 0x1110, 0x080c, 0x61b7, 0x001e, 0x8108,</div><div class='del'>-	0x1f04, 0x32fa, 0x9686, 0x0001, 0x190c, 0x3451, 0x00be, 0x002e,</div><div class='del'>-	0x003e, 0x006e, 0x00ce, 0x00ee, 0x0005, 0x00e6, 0x00c6, 0x0046,</div><div class='del'>-	0x0036, 0x0026, 0x0016, 0x00b6, 0x080c, 0xacfc, 0x0106, 0x6210,</div><div class='del'>-	0x2258, 0xbaa0, 0x0026, 0x2019, 0x0029, 0x080c, 0x97b0, 0x0076,</div><div class='del'>-	0x2039, 0x0000, 0x080c, 0x966d, 0x2c08, 0x080c, 0xe75d, 0x007e,</div><div class='del'>-	0x001e, 0x010e, 0x090c, 0xad18, 0xba10, 0xbb14, 0xbc84, 0x080c,</div><div class='del'>-	0x61b7, 0xba12, 0xbb16, 0xbc86, 0x00be, 0x001e, 0x002e, 0x003e,</div><div class='del'>-	0x004e, 0x00ce, 0x00ee, 0x0005, 0x00e6, 0x0006, 0x00b6, 0x6010,</div><div class='del'>-	0x2058, 0xb8a0, 0x00be, 0x9086, 0x0080, 0x0150, 0x2071, 0x1800,</div><div class='del'>-	0x70a8, 0x9005, 0x0110, 0x8001, 0x70aa, 0x000e, 0x00ee, 0x0005,</div><div class='del'>-	0x2071, 0x1800, 0x70e4, 0x9005, 0x0dc0, 0x8001, 0x70e6, 0x0ca8,</div><div class='del'>-	0xb800, 0xc08c, 0xb802, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x00b6,</div><div class='del'>-	0x0046, 0x0036, 0x0026, 0x0016, 0x0156, 0x2178, 0x080c, 0xacfc,</div><div class='del'>-	0x0106, 0x81ff, 0x1118, 0x20a9, 0x0001, 0x0078, 0x080c, 0x5840,</div><div class='del'>-	0xd0c4, 0x0140, 0xd0a4, 0x0130, 0x9006, 0x2020, 0x2009, 0x002d,</div><div class='del'>-	0x080c, 0xea8d, 0x20a9, 0x0800, 0x9016, 0x0026, 0x928e, 0x007e,</div><div class='del'>-	0x0904, 0x33cf, 0x928e, 0x007f, 0x0904, 0x33cf, 0x928e, 0x0080,</div><div class='del'>-	0x05f0, 0x9288, 0x1000, 0x210c, 0x81ff, 0x05c8, 0x8fff, 0x1150,</div><div class='del'>-	0x2001, 0x198e, 0x0006, 0x2003, 0x0001, 0x080c, 0x33e0, 0x000e,</div><div class='del'>-	0x2003, 0x0000, 0x00b6, 0x00c6, 0x2158, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x6bdb, 0x00ce, 0x00be, 0x2019, 0x0029, 0x080c, 0x97b0, 0x0076,</div><div class='del'>-	0x2039, 0x0000, 0x080c, 0x966d, 0x00b6, 0x00c6, 0x0026, 0x2158,</div><div class='del'>-	0xba04, 0x9294, 0x00ff, 0x9286, 0x0006, 0x1118, 0xb807, 0x0404,</div><div class='del'>-	0x0028, 0x2001, 0x0004, 0x8007, 0x9215, 0xba06, 0x002e, 0x00ce,</div><div class='del'>-	0x00be, 0x0016, 0x2c08, 0x080c, 0xe75d, 0x001e, 0x007e, 0x002e,</div><div class='del'>-	0x8210, 0x1f04, 0x3385, 0x010e, 0x090c, 0xad18, 0x015e, 0x001e,</div><div class='del'>-	0x002e, 0x003e, 0x004e, 0x00be, 0x00ce, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x0046, 0x0026, 0x0016, 0x080c, 0x5840, 0xd0c4, 0x0140, 0xd0a4,</div><div class='del'>-	0x0130, 0x9006, 0x2220, 0x2009, 0x0029, 0x080c, 0xea8d, 0x001e,</div><div class='del'>-	0x002e, 0x004e, 0x0005, 0x0016, 0x0026, 0x0036, 0x00c6, 0x7294,</div><div class='del'>-	0x82ff, 0x01e8, 0x080c, 0x6c09, 0x11d0, 0x2100, 0x080c, 0x26bf,</div><div class='del'>-	0x81ff, 0x01b8, 0x2019, 0x0001, 0x8314, 0x92e0, 0x1d80, 0x2c04,</div><div class='del'>-	0xd384, 0x0120, 0x9084, 0xff00, 0x8007, 0x0010, 0x9084, 0x00ff,</div><div class='del'>-	0x9116, 0x0138, 0x9096, 0x00ff, 0x0110, 0x8318, 0x0c68, 0x9085,</div><div class='del'>-	0x0001, 0x00ce, 0x003e, 0x002e, 0x001e, 0x0005, 0x0016, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0xacfc, 0x0106, 0x0036, 0x2019,</div><div class='del'>-	0x0029, 0x00c1, 0x003e, 0x010e, 0x090c, 0xad18, 0x9180, 0x1000,</div><div class='del'>-	0x2004, 0x9065, 0x0158, 0x0016, 0x00c6, 0x2061, 0x1b39, 0x001e,</div><div class='del'>-	0x6112, 0x080c, 0x3315, 0x001e, 0x080c, 0x676e, 0x012e, 0x00ce,</div><div class='del'>-	0x001e, 0x0005, 0x0016, 0x0026, 0x2110, 0x080c, 0xa7e2, 0x080c,</div><div class='del'>-	0xedee, 0x002e, 0x001e, 0x0005, 0x2001, 0x1837, 0x2004, 0xd0cc,</div><div class='del'>-	0x0005, 0x00c6, 0x00b6, 0x080c, 0x779e, 0x1118, 0x20a9, 0x0800,</div><div class='del'>-	0x0010, 0x20a9, 0x0782, 0x080c, 0x779e, 0x1110, 0x900e, 0x0010,</div><div class='del'>-	0x2009, 0x007e, 0x9180, 0x1000, 0x2004, 0x905d, 0x0130, 0x86ff,</div><div class='del'>-	0x0110, 0xb800, 0xd0bc, 0x090c, 0x676e, 0x8108, 0x1f04, 0x3462,</div><div class='del'>-	0x2061, 0x1800, 0x607f, 0x0000, 0x6080, 0x9084, 0x00ff, 0x6082,</div><div class='del'>-	0x60b3, 0x0000, 0x00be, 0x00ce, 0x0005, 0x2001, 0x1869, 0x2004,</div><div class='del'>-	0xd0bc, 0x0005, 0x2011, 0x1848, 0x2214, 0xd2ec, 0x0005, 0x0026,</div><div class='del'>-	0x2011, 0x1867, 0x2214, 0xd2dc, 0x002e, 0x0005, 0x7eef, 0x7de8,</div><div class='del'>-	0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc, 0x80da, 0x7ad9, 0x80d6,</div><div class='del'>-	0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1, 0x79ce, 0x78cd, 0x80cc,</div><div class='del'>-	0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6, 0x77c5, 0x76c3, 0x80bc,</div><div class='del'>-	0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4, 0x72b3, 0x80b2, 0x80b1,</div><div class='del'>-	0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa, 0x6ea9, 0x80a7, 0x6da6,</div><div class='del'>-	0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d, 0x809b, 0x8098, 0x6797,</div><div class='del'>-	0x6690, 0x658f, 0x6488, 0x6384, 0x6282, 0x8081, 0x8080, 0x617c,</div><div class='del'>-	0x607a, 0x8079, 0x5f76, 0x8075, 0x8074, 0x8073, 0x8072, 0x8071,</div><div class='del'>-	0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a, 0x5b69, 0x8067, 0x5a66,</div><div class='del'>-	0x5965, 0x5863, 0x575c, 0x565a, 0x5559, 0x8056, 0x8055, 0x5454,</div><div class='del'>-	0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d, 0x804c, 0x804b, 0x4e4a,</div><div class='del'>-	0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043, 0x803c, 0x803a, 0x8039,</div><div class='del'>-	0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932, 0x4831, 0x802e, 0x472d,</div><div class='del'>-	0x462c, 0x452b, 0x442a, 0x4329, 0x4227, 0x8026, 0x8025, 0x4123,</div><div class='del'>-	0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18, 0x8017, 0x8010, 0x3b0f,</div><div class='del'>-	0x3a08, 0x8004, 0x3902, 0x8001, 0x8000, 0x8000, 0x3800, 0x3700,</div><div class='del'>-	0x3600, 0x8000, 0x3500, 0x8000, 0x8000, 0x8000, 0x3400, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3300, 0x3200, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3100, 0x3000, 0x8000,</div><div class='del'>-	0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00, 0x2c00, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900, 0x2800, 0x8000, 0x2700,</div><div class='del'>-	0x2600, 0x2500, 0x2400, 0x2300, 0x2200, 0x8000, 0x8000, 0x2100,</div><div class='del'>-	0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x8000, 0x8000, 0x1b00,</div><div class='del'>-	0x1a00, 0x8000, 0x1900, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x1800, 0x8000, 0x1700, 0x1600, 0x1500, 0x8000, 0x1400,</div><div class='del'>-	0x1300, 0x1200, 0x1100, 0x1000, 0x0f00, 0x8000, 0x8000, 0x0e00,</div><div class='del'>-	0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900, 0x8000, 0x8000, 0x0800,</div><div class='del'>-	0x0700, 0x8000, 0x0600, 0x8000, 0x8000, 0x8000, 0x0500, 0x0400,</div><div class='del'>-	0x0300, 0x8000, 0x0200, 0x8000, 0x8000, 0x8000, 0x0100, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,</div><div class='del'>-	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x2071, 0x189e,</div><div class='del'>-	0x7003, 0x0002, 0x9006, 0x7016, 0x701a, 0x704a, 0x704e, 0x700e,</div><div class='del'>-	0x7042, 0x7046, 0x703b, 0x18ba, 0x703f, 0x18ba, 0x7007, 0x0001,</div><div class='del'>-	0x080c, 0x1072, 0x090c, 0x0d85, 0x2900, 0x706a, 0xa867, 0x0002,</div><div class='del'>-	0xa8ab, 0xdcb0, 0x080c, 0x1072, 0x090c, 0x0d85, 0x2900, 0x706e,</div><div class='del'>-	0xa867, 0x0002, 0xa8ab, 0xdcb0, 0x0005, 0x2071, 0x189e, 0x7004,</div><div class='del'>-	0x0002, 0x35bd, 0x35be, 0x35d1, 0x35e5, 0x0005, 0x1004, 0x35ce,</div><div class='del'>-	0x0e04, 0x35ce, 0x2079, 0x0000, 0x0126, 0x2091, 0x8000, 0x700c,</div><div class='del'>-	0x9005, 0x1128, 0x700f, 0x0001, 0x012e, 0x0468, 0x0005, 0x012e,</div><div class='del'>-	0x0ce8, 0x2079, 0x0000, 0x2061, 0x18b8, 0x2c4c, 0xa86c, 0x908e,</div><div class='del'>-	0x0100, 0x0128, 0x9086, 0x0200, 0x0904, 0x36b9, 0x0005, 0x7018,</div><div class='del'>-	0x2048, 0x2061, 0x1800, 0x701c, 0x0807, 0x7014, 0x2048, 0xa864,</div><div class='del'>-	0x9094, 0x00ff, 0x9296, 0x0029, 0x1120, 0xaa78, 0xd2fc, 0x0128,</div><div class='del'>-	0x0005, 0x9086, 0x0103, 0x0108, 0x0005, 0x2079, 0x0000, 0x2061,</div><div class='del'>-	0x1800, 0x701c, 0x0807, 0x2061, 0x1800, 0x7880, 0x908a, 0x0040,</div><div class='del'>-	0x1210, 0x61d0, 0x0042, 0x2100, 0x908a, 0x003f, 0x1a04, 0x36b6,</div><div class='del'>-	0x61d0, 0x0804, 0x364b, 0x368d, 0x36c5, 0x36b6, 0x36d1, 0x36db,</div><div class='del'>-	0x36e1, 0x36e5, 0x36f5, 0x36f9, 0x370f, 0x3715, 0x371b, 0x3726,</div><div class='del'>-	0x3731, 0x3740, 0x374f, 0x375d, 0x3774, 0x378f, 0x36b6, 0x383a,</div><div class='del'>-	0x3878, 0x391d, 0x392e, 0x3951, 0x36b6, 0x36b6, 0x36b6, 0x3989,</div><div class='del'>-	0x39a9, 0x39b2, 0x39de, 0x39e4, 0x36b6, 0x3a2a, 0x36b6, 0x36b6,</div><div class='del'>-	0x36b6, 0x36b6, 0x36b6, 0x3a35, 0x3a3e, 0x3a46, 0x3a48, 0x36b6,</div><div class='del'>-	0x36b6, 0x36b6, 0x36b6, 0x36b6, 0x36b6, 0x3a78, 0x36b6, 0x36b6,</div><div class='del'>-	0x36b6, 0x36b6, 0x36b6, 0x3a95, 0x3b19, 0x36b6, 0x36b6, 0x36b6,</div><div class='del'>-	0x36b6, 0x36b6, 0x36b6, 0x0002, 0x3b43, 0x3b46, 0x3ba5, 0x3bbe,</div><div class='del'>-	0x3bee, 0x3e94, 0x36b6, 0x53f5, 0x36b6, 0x36b6, 0x36b6, 0x36b6,</div><div class='del'>-	0x36b6, 0x36b6, 0x36b6, 0x36b6, 0x370f, 0x3715, 0x4397, 0x5864,</div><div class='del'>-	0x43b5, 0x5484, 0x54d6, 0x55e1, 0x36b6, 0x5643, 0x567f, 0x56b0,</div><div class='del'>-	0x57c0, 0x56dd, 0x5740, 0x36b6, 0x43b9, 0x457f, 0x4595, 0x45ba,</div><div class='del'>-	0x461f, 0x4693, 0x46b3, 0x472a, 0x4786, 0x47e2, 0x47e5, 0x480a,</div><div class='del'>-	0x487c, 0x48e6, 0x48ee, 0x4a23, 0x4bcb, 0x4bff, 0x4e63, 0x36b6,</div><div class='del'>-	0x4e81, 0x4f48, 0x5031, 0x508b, 0x36b6, 0x511e, 0x36b6, 0x5134,</div><div class='del'>-	0x514f, 0x48ee, 0x5395, 0x714c, 0x0000, 0x2021, 0x4000, 0x080c,</div><div class='del'>-	0x4c7d, 0x0126, 0x2091, 0x8000, 0x0e04, 0x3697, 0x0010, 0x012e,</div><div class='del'>-	0x0cc0, 0x7c36, 0x9486, 0x4000, 0x0118, 0x7833, 0x0011, 0x0010,</div><div class='del'>-	0x7833, 0x0010, 0x7c82, 0x7986, 0x7a8a, 0x7b8e, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200, 0x7007, 0x0001,</div><div class='del'>-	0x2091, 0x5000, 0x700f, 0x0000, 0x012e, 0x0005, 0x2021, 0x4001,</div><div class='del'>-	0x08b0, 0x2021, 0x4002, 0x0898, 0x2021, 0x4003, 0x0880, 0x2021,</div><div class='del'>-	0x4005, 0x0868, 0x2021, 0x4006, 0x0850, 0x2039, 0x0001, 0x902e,</div><div class='del'>-	0x2520, 0x7b88, 0x7a8c, 0x7884, 0x7990, 0x81ff, 0x0d98, 0x0804,</div><div class='del'>-	0x4c8a, 0x2039, 0x0001, 0x902e, 0x2520, 0x7b88, 0x7a8c, 0x7884,</div><div class='del'>-	0x7990, 0x0804, 0x4c8d, 0x7984, 0x7888, 0x2114, 0x200a, 0x0804,</div><div class='del'>-	0x368d, 0x7984, 0x2114, 0x0804, 0x368d, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x0021, 0x20e9, 0x0000, 0x20a1, 0x0021, 0x20a9, 0x001f, 0x4003,</div><div class='del'>-	0x7984, 0x7a88, 0x7b8c, 0x0804, 0x368d, 0x7884, 0x2060, 0x0804,</div><div class='del'>-	0x3742, 0x2009, 0x0003, 0x2011, 0x0003, 0x2019, 0x0014, 0x789b,</div><div class='del'>-	0x0137, 0x7893, 0xffff, 0x2001, 0x188f, 0x2004, 0x9005, 0x0118,</div><div class='del'>-	0x7896, 0x0804, 0x368d, 0x7897, 0x0001, 0x0804, 0x368d, 0x2039,</div><div class='del'>-	0x0001, 0x7d98, 0x7c9c, 0x0804, 0x36c9, 0x2039, 0x0001, 0x7d98,</div><div class='del'>-	0x7c9c, 0x0804, 0x36d5, 0x79a0, 0x9182, 0x0040, 0x0210, 0x0804,</div><div class='del'>-	0x36c2, 0x2138, 0x7d98, 0x7c9c, 0x0804, 0x36c9, 0x79a0, 0x9182,</div><div class='del'>-	0x0040, 0x0210, 0x0804, 0x36c2, 0x2138, 0x7d98, 0x7c9c, 0x0804,</div><div class='del'>-	0x36d5, 0x79a0, 0x9182, 0x0040, 0x0210, 0x0804, 0x36c2, 0x21e8,</div><div class='del'>-	0x7984, 0x7888, 0x20a9, 0x0001, 0x21a0, 0x4004, 0x0804, 0x368d,</div><div class='del'>-	0x2061, 0x0800, 0xe10c, 0x9006, 0x2c15, 0x9200, 0x8c60, 0x8109,</div><div class='del'>-	0x1dd8, 0x2010, 0x9005, 0x0904, 0x368d, 0x0804, 0x36bc, 0x79a0,</div><div class='del'>-	0x9182, 0x0040, 0x0210, 0x0804, 0x36c2, 0x21e0, 0x20a9, 0x0001,</div><div class='del'>-	0x7984, 0x2198, 0x4012, 0x0804, 0x368d, 0x2069, 0x1847, 0x7884,</div><div class='del'>-	0x7990, 0x911a, 0x1a04, 0x36c2, 0x8019, 0x0904, 0x36c2, 0x684a,</div><div class='del'>-	0x6942, 0x788c, 0x6852, 0x7888, 0x6856, 0x9006, 0x685a, 0x685e,</div><div class='del'>-	0x080c, 0x7ae7, 0x0804, 0x368d, 0x2069, 0x1847, 0x7884, 0x7994,</div><div class='del'>-	0x911a, 0x1a04, 0x36c2, 0x8019, 0x0904, 0x36c2, 0x684e, 0x6946,</div><div class='del'>-	0x788c, 0x6862, 0x7888, 0x6866, 0x9006, 0x686a, 0x686e, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x6d66, 0x012e, 0x0804, 0x368d, 0x902e,</div><div class='del'>-	0x2520, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x36bf, 0x7984,</div><div class='del'>-	0x7b88, 0x7a8c, 0x20a9, 0x0005, 0x20e9, 0x0001, 0x20a1, 0x18a6,</div><div class='del'>-	0x4101, 0x080c, 0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf,</div><div class='del'>-	0x2009, 0x0020, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4c8a,</div><div class='del'>-	0x701f, 0x37b3, 0x0005, 0xa864, 0x2008, 0x9084, 0x00ff, 0x9096,</div><div class='del'>-	0x0011, 0x0168, 0x9096, 0x0019, 0x0150, 0x9096, 0x0015, 0x0138,</div><div class='del'>-	0x9096, 0x0048, 0x0120, 0x9096, 0x0029, 0x1904, 0x36bf, 0x810f,</div><div class='del'>-	0x918c, 0x00ff, 0x0904, 0x36bf, 0x7112, 0x7010, 0x8001, 0x0560,</div><div class='del'>-	0x7012, 0x080c, 0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf,</div><div class='del'>-	0x2009, 0x0020, 0x7068, 0x2040, 0xa28c, 0xa390, 0xa494, 0xa598,</div><div class='del'>-	0x9290, 0x0040, 0x9399, 0x0000, 0x94a1, 0x0000, 0x95a9, 0x0000,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4c8a, 0x701f, 0x37f1,</div><div class='del'>-	0x0005, 0xa864, 0x9084, 0x00ff, 0x9096, 0x0002, 0x0120, 0x9096,</div><div class='del'>-	0x000a, 0x1904, 0x36bf, 0x0888, 0x0126, 0x2091, 0x8000, 0x7014,</div><div class='del'>-	0x2048, 0xa868, 0xc0fd, 0xa86a, 0xa864, 0x9084, 0x00ff, 0x9096,</div><div class='del'>-	0x0029, 0x1148, 0xc2fd, 0xaa7a, 0x080c, 0x630a, 0x0138, 0xa87a,</div><div class='del'>-	0xa982, 0x012e, 0x0060, 0x080c, 0x663a, 0x1130, 0x7007, 0x0003,</div><div class='del'>-	0x701f, 0x381f, 0x012e, 0x0005, 0x080c, 0x725e, 0x012e, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x20a9, 0x0005, 0x20e1, 0x0001, 0x2099, 0x18a6,</div><div class='del'>-	0x400a, 0x2100, 0x9210, 0x9399, 0x0000, 0x94a1, 0x0000, 0x95a9,</div><div class='del'>-	0x0000, 0xa85c, 0x9080, 0x0019, 0x2009, 0x0020, 0x012e, 0xaf60,</div><div class='del'>-	0x0804, 0x4c8d, 0x2091, 0x8000, 0x7837, 0x4000, 0x7833, 0x0010,</div><div class='del'>-	0x7883, 0x4000, 0x7887, 0x4953, 0x788b, 0x5020, 0x788f, 0x2020,</div><div class='del'>-	0x2009, 0x017f, 0x2104, 0x7892, 0x3f00, 0x7896, 0x2061, 0x0100,</div><div class='del'>-	0x6200, 0x2061, 0x0200, 0x603c, 0x8007, 0x9205, 0x789a, 0x2009,</div><div class='del'>-	0x04fd, 0x2104, 0x789e, 0x2091, 0x5000, 0x2091, 0x4080, 0x2001,</div><div class='del'>-	0x0089, 0x2004, 0xd084, 0x0180, 0x2001, 0x1a25, 0x2004, 0x9005,</div><div class='del'>-	0x0128, 0x2001, 0x008b, 0x2004, 0xd0fc, 0x0dd8, 0x2001, 0x008a,</div><div class='del'>-	0x2003, 0x0002, 0x2003, 0x1001, 0x2071, 0x0080, 0x0804, 0x0427,</div><div class='del'>-	0x81ff, 0x1904, 0x36bf, 0x7984, 0x080c, 0x67b4, 0x1904, 0x36c2,</div><div class='del'>-	0x7e98, 0x9684, 0x3fff, 0x9082, 0x4000, 0x1a04, 0x36c2, 0x7c88,</div><div class='del'>-	0x7d8c, 0x080c, 0x69f1, 0x080c, 0x697e, 0x1518, 0x2061, 0x1ddc,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x6000, 0x9086, 0x0000, 0x0148, 0x6014,</div><div class='del'>-	0x904d, 0x0130, 0xa86c, 0x9406, 0x1118, 0xa870, 0x9506, 0x0150,</div><div class='del'>-	0x012e, 0x9ce0, 0x001c, 0x2001, 0x181a, 0x2004, 0x9c02, 0x1a04,</div><div class='del'>-	0x36bf, 0x0c30, 0x080c, 0xcae9, 0x012e, 0x0904, 0x36bf, 0x0804,</div><div class='del'>-	0x368d, 0x900e, 0x2001, 0x0005, 0x080c, 0x725e, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xd226, 0x080c, 0x7012, 0x012e, 0x0804, 0x368d,</div><div class='del'>-	0x00a6, 0x2950, 0xb198, 0x080c, 0x67b4, 0x1904, 0x390a, 0xb6a4,</div><div class='del'>-	0x9684, 0x3fff, 0x9082, 0x4000, 0x16e8, 0xb49c, 0xb5a0, 0x080c,</div><div class='del'>-	0x69f1, 0x080c, 0x697e, 0x1520, 0x2061, 0x1ddc, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x6000, 0x9086, 0x0000, 0x0148, 0x6014, 0x904d, 0x0130,</div><div class='del'>-	0xa86c, 0x9406, 0x1118, 0xa870, 0x9506, 0x0158, 0x012e, 0x9ce0,</div><div class='del'>-	0x001c, 0x2001, 0x181a, 0x2004, 0x9c02, 0x2009, 0x000d, 0x12b0,</div><div class='del'>-	0x0c28, 0x080c, 0xcae9, 0x012e, 0x2009, 0x0003, 0x0178, 0x00e0,</div><div class='del'>-	0x900e, 0x2001, 0x0005, 0x080c, 0x725e, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0xd226, 0x080c, 0x7006, 0x012e, 0x0070, 0xb097, 0x4005,</div><div class='del'>-	0xb19a, 0x0010, 0xb097, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001,</div><div class='del'>-	0x0030, 0x2a48, 0x00ae, 0x0005, 0xb097, 0x4000, 0x9006, 0x918d,</div><div class='del'>-	0x0001, 0x2008, 0x2a48, 0x00ae, 0x0005, 0x81ff, 0x1904, 0x36bf,</div><div class='del'>-	0x080c, 0x4c58, 0x0904, 0x36c2, 0x080c, 0x687b, 0x0904, 0x36bf,</div><div class='del'>-	0x080c, 0x69f7, 0x0904, 0x36bf, 0x0804, 0x46aa, 0x81ff, 0x1904,</div><div class='del'>-	0x36bf, 0x080c, 0x4c74, 0x0904, 0x36c2, 0x080c, 0x6a85, 0x0904,</div><div class='del'>-	0x36bf, 0x2019, 0x0005, 0x79a8, 0x080c, 0x6a12, 0x0904, 0x36bf,</div><div class='del'>-	0x7888, 0x908a, 0x1000, 0x1a04, 0x36c2, 0x8003, 0x800b, 0x810b,</div><div class='del'>-	0x9108, 0x080c, 0x89a1, 0x79a8, 0xd184, 0x1904, 0x368d, 0x0804,</div><div class='del'>-	0x46aa, 0x0126, 0x2091, 0x8000, 0x81ff, 0x0118, 0x2009, 0x0001,</div><div class='del'>-	0x0450, 0x2029, 0x07ff, 0x645c, 0x2400, 0x9506, 0x01f8, 0x2508,</div><div class='del'>-	0x080c, 0x67b4, 0x11d8, 0x080c, 0x6a85, 0x1128, 0x2009, 0x0002,</div><div class='del'>-	0x62c0, 0x2518, 0x00c0, 0x2019, 0x0004, 0x900e, 0x080c, 0x6a12,</div><div class='del'>-	0x1118, 0x2009, 0x0006, 0x0078, 0x7884, 0x908a, 0x1000, 0x1270,</div><div class='del'>-	0x8003, 0x800b, 0x810b, 0x9108, 0x080c, 0x89a1, 0x8529, 0x1ae0,</div><div class='del'>-	0x012e, 0x0804, 0x368d, 0x012e, 0x0804, 0x36bf, 0x012e, 0x0804,</div><div class='del'>-	0x36c2, 0x080c, 0x4c58, 0x0904, 0x36c2, 0x080c, 0x687b, 0x0904,</div><div class='del'>-	0x36bf, 0x080c, 0xacfc, 0xbaa0, 0x2019, 0x0005, 0x00c6, 0x9066,</div><div class='del'>-	0x080c, 0x97b0, 0x0076, 0x903e, 0x080c, 0x966d, 0x900e, 0x080c,</div><div class='del'>-	0xe75d, 0x007e, 0x00ce, 0x080c, 0xad18, 0x080c, 0x69f1, 0x0804,</div><div class='del'>-	0x368d, 0x080c, 0x4c58, 0x0904, 0x36c2, 0x080c, 0x69f1, 0x2208,</div><div class='del'>-	0x0804, 0x368d, 0x0156, 0x00d6, 0x00e6, 0x00c6, 0x2069, 0x1910,</div><div class='del'>-	0x6810, 0x6914, 0x910a, 0x1208, 0x900e, 0x6816, 0x9016, 0x901e,</div><div class='del'>-	0x2071, 0x19e8, 0x7028, 0x9065, 0x0118, 0x8210, 0x600c, 0x0cd8,</div><div class='del'>-	0x2300, 0x9218, 0x00ce, 0x00ee, 0x00de, 0x015e, 0x0804, 0x368d,</div><div class='del'>-	0x00f6, 0x0016, 0x907d, 0x0138, 0x9006, 0x8000, 0x2f0c, 0x81ff,</div><div class='del'>-	0x0110, 0x2178, 0x0cd0, 0x001e, 0x00fe, 0x0005, 0x2069, 0x1910,</div><div class='del'>-	0x6910, 0x62bc, 0x0804, 0x368d, 0x81ff, 0x0120, 0x2009, 0x0001,</div><div class='del'>-	0x0804, 0x36bf, 0x0126, 0x2091, 0x8000, 0x080c, 0x5854, 0x0128,</div><div class='del'>-	0x2009, 0x0007, 0x012e, 0x0804, 0x36bf, 0x012e, 0x615c, 0x9190,</div><div class='del'>-	0x348e, 0x2215, 0x9294, 0x00ff, 0x637c, 0x83ff, 0x0108, 0x6280,</div><div class='del'>-	0x67dc, 0x97c4, 0x000a, 0x98c6, 0x000a, 0x1118, 0x2031, 0x0001,</div><div class='del'>-	0x00e8, 0x97c4, 0x0022, 0x98c6, 0x0022, 0x1118, 0x2031, 0x0003,</div><div class='del'>-	0x00a8, 0x97c4, 0x0012, 0x98c6, 0x0012, 0x1118, 0x2031, 0x0002,</div><div class='del'>-	0x0068, 0x080c, 0x779e, 0x1118, 0x2031, 0x0004, 0x0038, 0xd79c,</div><div class='del'>-	0x0120, 0x2009, 0x0005, 0x0804, 0x36bf, 0x9036, 0x7e9a, 0x7f9e,</div><div class='del'>-	0x0804, 0x368d, 0x614c, 0x6250, 0x2019, 0x1986, 0x231c, 0x2001,</div><div class='del'>-	0x1987, 0x2004, 0x789a, 0x0804, 0x368d, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6138, 0x623c, 0x6340, 0x012e, 0x0804, 0x368d, 0x080c, 0x4c74,</div><div class='del'>-	0x0904, 0x36c2, 0xba44, 0xbb38, 0x0804, 0x368d, 0x080c, 0x0d85,</div><div class='del'>-	0x080c, 0x4c74, 0x2110, 0x0904, 0x36c2, 0xb804, 0x908c, 0x00ff,</div><div class='del'>-	0x918e, 0x0006, 0x0140, 0x9084, 0xff00, 0x9086, 0x0600, 0x2009,</div><div class='del'>-	0x0009, 0x1904, 0x36bf, 0x0126, 0x2091, 0x8000, 0x2019, 0x0005,</div><div class='del'>-	0x00c6, 0x9066, 0x080c, 0xacfc, 0x080c, 0xa7e2, 0x080c, 0x97b0,</div><div class='del'>-	0x0076, 0x903e, 0x080c, 0x966d, 0x900e, 0x080c, 0xe75d, 0x007e,</div><div class='del'>-	0x00ce, 0x080c, 0xad18, 0xb807, 0x0407, 0x012e, 0x0804, 0x368d,</div><div class='del'>-	0x614c, 0x6250, 0x7884, 0x604e, 0x7b88, 0x6352, 0x2069, 0x1847,</div><div class='del'>-	0x831f, 0x9305, 0x6816, 0x788c, 0x2069, 0x1986, 0x2d1c, 0x206a,</div><div class='del'>-	0x7e98, 0x9682, 0x0014, 0x1210, 0x2031, 0x07d0, 0x2069, 0x1987,</div><div class='del'>-	0x2d04, 0x266a, 0x789a, 0x0804, 0x368d, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6138, 0x7884, 0x603a, 0x910e, 0xd1b4, 0x190c, 0x0eeb, 0xd0c4,</div><div class='del'>-	0x01a8, 0x00d6, 0x78a8, 0x2009, 0x199d, 0x200a, 0x78ac, 0x2011,</div><div class='del'>-	0x199e, 0x2012, 0x2069, 0x0100, 0x6838, 0x9086, 0x0007, 0x1118,</div><div class='del'>-	0x2214, 0x6a5a, 0x0010, 0x210c, 0x695a, 0x00de, 0x7888, 0xd0ec,</div><div class='del'>-	0x0178, 0x6034, 0xc08d, 0x6036, 0x2001, 0x0050, 0x6076, 0x607a,</div><div class='del'>-	0x6056, 0x606b, 0x269c, 0x00c6, 0x2061, 0x1b73, 0x2062, 0x00ce,</div><div class='del'>-	0x2011, 0x0116, 0x220c, 0x7888, 0xd08c, 0x0118, 0x918d, 0x0040,</div><div class='del'>-	0x0010, 0x918c, 0xff7f, 0x2112, 0x6134, 0xd18c, 0x2001, 0x0000,</div><div class='del'>-	0x0108, 0x603c, 0x7988, 0x613e, 0x6140, 0x910d, 0x788c, 0x6042,</div><div class='del'>-	0x6234, 0xd28c, 0x0120, 0x7a88, 0x9294, 0x1000, 0x9205, 0x910e,</div><div class='del'>-	0xd1e4, 0x190c, 0x0f06, 0x9084, 0x0020, 0x0130, 0x78b4, 0x6046,</div><div class='del'>-	0x9084, 0x0001, 0x090c, 0x4397, 0x6040, 0xd0cc, 0x0120, 0x78b0,</div><div class='del'>-	0x2011, 0x0114, 0x2012, 0x012e, 0x0804, 0x368d, 0x00f6, 0x2079,</div><div class='del'>-	0x1800, 0x7a38, 0xa898, 0x9084, 0xfebf, 0x9215, 0xa89c, 0x9084,</div><div class='del'>-	0xfebf, 0x8002, 0x9214, 0x7838, 0x9084, 0x0140, 0x9215, 0x7a3a,</div><div class='del'>-	0xa897, 0x4000, 0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x00fe,</div><div class='del'>-	0x0005, 0x7898, 0x9005, 0x01a8, 0x7888, 0x9025, 0x0904, 0x36c2,</div><div class='del'>-	0x788c, 0x902d, 0x0904, 0x36c2, 0x900e, 0x080c, 0x67b4, 0x1120,</div><div class='del'>-	0xba44, 0xbb38, 0xbc46, 0xbd3a, 0x9186, 0x07ff, 0x0190, 0x8108,</div><div class='del'>-	0x0ca0, 0x080c, 0x4c74, 0x0904, 0x36c2, 0x7888, 0x900d, 0x0904,</div><div class='del'>-	0x36c2, 0x788c, 0x9005, 0x0904, 0x36c2, 0xba44, 0xb946, 0xbb38,</div><div class='del'>-	0xb83a, 0x0804, 0x368d, 0x2011, 0xbc09, 0x0010, 0x2011, 0xbc05,</div><div class='del'>-	0x080c, 0x5854, 0x1904, 0x36bf, 0x00c6, 0x2061, 0x0100, 0x7984,</div><div class='del'>-	0x9186, 0x00ff, 0x1130, 0x2001, 0x1818, 0x2004, 0x9085, 0xff00,</div><div class='del'>-	0x0088, 0x9182, 0x007f, 0x16e0, 0x9188, 0x348e, 0x210d, 0x918c,</div><div class='del'>-	0x00ff, 0x2001, 0x1818, 0x2004, 0x0026, 0x9116, 0x002e, 0x0580,</div><div class='del'>-	0x810f, 0x9105, 0x0126, 0x2091, 0x8000, 0x0006, 0x080c, 0xb116,</div><div class='del'>-	0x000e, 0x0510, 0x602e, 0x620a, 0x7984, 0x00b6, 0x080c, 0x674f,</div><div class='del'>-	0x2b08, 0x00be, 0x1500, 0x6112, 0x6023, 0x0001, 0x080c, 0x4c41,</div><div class='del'>-	0x01d0, 0x9006, 0xa866, 0x7007, 0x0003, 0xa832, 0xa868, 0xc0fd,</div><div class='del'>-	0xa86a, 0x701f, 0x3b9e, 0x2900, 0x6016, 0x2009, 0x0032, 0x080c,</div><div class='del'>-	0xb20a, 0x012e, 0x00ce, 0x0005, 0x012e, 0x00ce, 0x0804, 0x36bf,</div><div class='del'>-	0x00ce, 0x0804, 0x36c2, 0x080c, 0xb16c, 0x0cb0, 0xa830, 0x9086,</div><div class='del'>-	0x0100, 0x0904, 0x36bf, 0x0804, 0x368d, 0x2061, 0x1a73, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x6000, 0xd084, 0x0170, 0x6104, 0x6208, 0x2061,</div><div class='del'>-	0x1800, 0x6354, 0x6074, 0x789a, 0x60c0, 0x789e, 0x60bc, 0x78aa,</div><div class='del'>-	0x012e, 0x0804, 0x368d, 0x900e, 0x2110, 0x0c88, 0x81ff, 0x1904,</div><div class='del'>-	0x36bf, 0x080c, 0x779e, 0x0904, 0x36bf, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x6254, 0x6074, 0x9202, 0x0248, 0x9085, 0x0001, 0x080c, 0x26f5,</div><div class='del'>-	0x080c, 0x5a7c, 0x012e, 0x0804, 0x368d, 0x012e, 0x0804, 0x36c2,</div><div class='del'>-	0x0006, 0x0016, 0x00c6, 0x00e6, 0x2001, 0x19aa, 0x2070, 0x2061,</div><div class='del'>-	0x1847, 0x6008, 0x2072, 0x900e, 0x2011, 0x1400, 0x080c, 0x955b,</div><div class='del'>-	0x7206, 0x00ee, 0x00ce, 0x001e, 0x000e, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x81ff, 0x0128, 0x012e, 0x2021, 0x400b, 0x0804, 0x368f,</div><div class='del'>-	0x7884, 0xd0fc, 0x0158, 0x2001, 0x002a, 0x2004, 0x9005, 0x0180,</div><div class='del'>-	0x9082, 0x00e1, 0x0298, 0x012e, 0x0804, 0x36c2, 0x2001, 0x002a,</div><div class='del'>-	0x2004, 0x9005, 0x0128, 0x2069, 0x1847, 0x6908, 0x9102, 0x1230,</div><div class='del'>-	0x012e, 0x0804, 0x36c2, 0x012e, 0x0804, 0x36bf, 0x080c, 0xb094,</div><div class='del'>-	0x0dd0, 0x7884, 0xd0fc, 0x0904, 0x3c6d, 0x00c6, 0x080c, 0x4c41,</div><div class='del'>-	0x00ce, 0x0d88, 0xa867, 0x0000, 0x7884, 0xa80a, 0x7898, 0xa80e,</div><div class='del'>-	0x789c, 0xa812, 0x2001, 0x002e, 0x2004, 0xa81a, 0x2001, 0x002f,</div><div class='del'>-	0x2004, 0xa81e, 0x2001, 0x0030, 0x2004, 0xa822, 0x2001, 0x0031,</div><div class='del'>-	0x2004, 0xa826, 0x2001, 0x0034, 0x2004, 0xa82a, 0x2001, 0x0035,</div><div class='del'>-	0x2004, 0xa82e, 0x2001, 0x002a, 0x2004, 0x9080, 0x0003, 0x9084,</div><div class='del'>-	0x00fc, 0x8004, 0xa816, 0x080c, 0x3df7, 0x0928, 0x7014, 0x2048,</div><div class='del'>-	0xad2c, 0xac28, 0xab1c, 0xaa18, 0xa930, 0xa808, 0xd0b4, 0x1120,</div><div class='del'>-	0x2029, 0x0000, 0x2021, 0x0000, 0x8906, 0x8006, 0x8007, 0x90bc,</div><div class='del'>-	0x003f, 0x9084, 0xffc0, 0x9080, 0x001b, 0x080c, 0x4c8a, 0x701f,</div><div class='del'>-	0x3d34, 0x7023, 0x0001, 0x012e, 0x0005, 0x080c, 0xacfc, 0x0046,</div><div class='del'>-	0x0086, 0x0096, 0x00a6, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6,</div><div class='del'>-	0x080c, 0x3bd8, 0x2001, 0x19a0, 0x2003, 0x0000, 0x2021, 0x000a,</div><div class='del'>-	0x2061, 0x0100, 0x6104, 0x0016, 0x60bb, 0x0000, 0x60bf, 0x32e1,</div><div class='del'>-	0x60bf, 0x0012, 0x080c, 0x3e66, 0x080c, 0x3e25, 0x00f6, 0x00e6,</div><div class='del'>-	0x0086, 0x2940, 0x2071, 0x19e8, 0x2079, 0x0090, 0x00d6, 0x2069,</div><div class='del'>-	0x0000, 0x6884, 0xd0b4, 0x0140, 0x2001, 0x0035, 0x2004, 0x780e,</div><div class='del'>-	0x2001, 0x0034, 0x2004, 0x780a, 0x00de, 0x2011, 0x0001, 0x080c,</div><div class='del'>-	0x41db, 0x008e, 0x00ee, 0x00fe, 0x080c, 0x40fd, 0x080c, 0x402a,</div><div class='del'>-	0x05b8, 0x2001, 0x020b, 0x2004, 0x9084, 0x0140, 0x1db8, 0x080c,</div><div class='del'>-	0x424f, 0x00f6, 0x2079, 0x0300, 0x78bc, 0x00fe, 0x908c, 0x0070,</div><div class='del'>-	0x1560, 0x2071, 0x0200, 0x7037, 0x0000, 0x7050, 0x9084, 0xff00,</div><div class='del'>-	0x9086, 0x3200, 0x1510, 0x7037, 0x0001, 0x7050, 0x9084, 0xff00,</div><div class='del'>-	0x9086, 0xe100, 0x11d0, 0x7037, 0x0000, 0x7054, 0x7037, 0x0000,</div><div class='del'>-	0x715c, 0x9106, 0x1190, 0x2001, 0x1820, 0x2004, 0x9106, 0x1168,</div><div class='del'>-	0x00c6, 0x2061, 0x0100, 0x6024, 0x9084, 0x1e00, 0x00ce, 0x0138,</div><div class='del'>-	0x080c, 0x4034, 0x080c, 0x3e20, 0x0058, 0x080c, 0x3e20, 0x080c,</div><div class='del'>-	0x4173, 0x080c, 0x40f3, 0x2001, 0x020b, 0x2004, 0xd0e4, 0x0dd8,</div><div class='del'>-	0x2001, 0x032a, 0x2003, 0x0004, 0x2061, 0x0100, 0x6027, 0x0002,</div><div class='del'>-	0x001e, 0x6106, 0x2011, 0x020d, 0x2013, 0x0020, 0x60bb, 0x0000,</div><div class='del'>-	0x60bf, 0x0108, 0x60bf, 0x0012, 0x2001, 0x0004, 0x200c, 0x918c,</div><div class='del'>-	0xfffd, 0x2102, 0x080c, 0x1352, 0x2009, 0x0028, 0x080c, 0x2220,</div><div class='del'>-	0x2001, 0x0227, 0x200c, 0x2102, 0x080c, 0xad18, 0x00fe, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e, 0x008e, 0x004e, 0x2001,</div><div class='del'>-	0x19a0, 0x2004, 0x9005, 0x1118, 0x012e, 0x0804, 0x368d, 0x012e,</div><div class='del'>-	0x2021, 0x400c, 0x0804, 0x368f, 0x0016, 0x0026, 0x0036, 0x0046,</div><div class='del'>-	0x0056, 0x0076, 0x0086, 0x0096, 0x00d6, 0x0156, 0x7014, 0x2048,</div><div class='del'>-	0x7020, 0x20a8, 0x8000, 0x7022, 0xa804, 0x9005, 0x0904, 0x3d90,</div><div class='del'>-	0x2048, 0x1f04, 0x3d44, 0x7068, 0x2040, 0xa28c, 0xa390, 0xa494,</div><div class='del'>-	0xa598, 0xa930, 0xa808, 0xd0b4, 0x1120, 0x2029, 0x0000, 0x2021,</div><div class='del'>-	0x0000, 0x0096, 0x7014, 0x2048, 0xa864, 0x009e, 0x9086, 0x0103,</div><div class='del'>-	0x0170, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0,</div><div class='del'>-	0x9080, 0x001b, 0x080c, 0x4c8a, 0x701f, 0x3d34, 0x00b0, 0x8906,</div><div class='del'>-	0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x001b,</div><div class='del'>-	0x21a8, 0x27e0, 0x2098, 0x27e8, 0x20a0, 0x0006, 0x080c, 0x0fd6,</div><div class='del'>-	0x000e, 0x080c, 0x4c8d, 0x701f, 0x3d34, 0x015e, 0x00de, 0x009e,</div><div class='del'>-	0x008e, 0x007e, 0x005e, 0x004e, 0x003e, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x7014, 0x2048, 0xa864, 0x9086, 0x0103, 0x1118, 0x701f, 0x3df5,</div><div class='del'>-	0x0450, 0x7014, 0x2048, 0xa868, 0xc0fd, 0xa86a, 0x2009, 0x007f,</div><div class='del'>-	0x080c, 0x6749, 0x0110, 0x9006, 0x0030, 0xb813, 0x00ff, 0xb817,</div><div class='del'>-	0xfffd, 0x080c, 0xd409, 0x015e, 0x00de, 0x009e, 0x008e, 0x007e,</div><div class='del'>-	0x005e, 0x004e, 0x003e, 0x002e, 0x001e, 0x0904, 0x36bf, 0x0016,</div><div class='del'>-	0x0026, 0x0036, 0x0046, 0x0056, 0x0076, 0x0086, 0x0096, 0x00d6,</div><div class='del'>-	0x0156, 0x701f, 0x3dc7, 0x7007, 0x0003, 0x0804, 0x3d85, 0xa830,</div><div class='del'>-	0x9086, 0x0100, 0x2021, 0x400c, 0x0904, 0x368f, 0x0076, 0xad10,</div><div class='del'>-	0xac0c, 0xab24, 0xaa20, 0xa930, 0xa808, 0xd0b4, 0x1120, 0x2029,</div><div class='del'>-	0x0000, 0x2021, 0x0000, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f,</div><div class='del'>-	0x9084, 0xffc0, 0x9080, 0x001b, 0x21a8, 0x27e0, 0x2098, 0x27e8,</div><div class='del'>-	0x20a0, 0x0006, 0x080c, 0x0fd6, 0x000e, 0x080c, 0x4c8d, 0x007e,</div><div class='del'>-	0x701f, 0x3d34, 0x7023, 0x0001, 0x0005, 0x0804, 0x368d, 0x0156,</div><div class='del'>-	0x00c6, 0xa814, 0x908a, 0x001e, 0x0218, 0xa833, 0x001e, 0x0010,</div><div class='del'>-	0xa832, 0x0078, 0x81ff, 0x0168, 0x0016, 0x080c, 0x4c41, 0x001e,</div><div class='del'>-	0x0130, 0xa800, 0x2040, 0xa008, 0xa80a, 0x2100, 0x0c58, 0x9006,</div><div class='del'>-	0x0010, 0x9085, 0x0001, 0x00ce, 0x015e, 0x0005, 0x0006, 0x00f6,</div><div class='del'>-	0x2079, 0x0000, 0x7880, 0x9086, 0x0044, 0x00fe, 0x000e, 0x0005,</div><div class='del'>-	0x2001, 0x19a0, 0x2003, 0x0001, 0x0005, 0x00f6, 0x00e6, 0x00c6,</div><div class='del'>-	0x2061, 0x0200, 0x2001, 0x19ab, 0x2004, 0x601a, 0x2061, 0x0100,</div><div class='del'>-	0x2001, 0x19aa, 0x2004, 0x60ce, 0x6104, 0xc1ac, 0x6106, 0x080c,</div><div class='del'>-	0x4c41, 0xa813, 0x0019, 0xa817, 0x0001, 0x2900, 0xa85a, 0x2001,</div><div class='del'>-	0x002e, 0x2004, 0xa866, 0x2001, 0x002f, 0x2004, 0xa86a, 0x2061,</div><div class='del'>-	0x0090, 0x2079, 0x0100, 0x2001, 0x19aa, 0x2004, 0x6036, 0x2009,</div><div class='del'>-	0x0040, 0x080c, 0x2220, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8,</div><div class='del'>-	0xa86e, 0x601a, 0xa873, 0x0000, 0x601f, 0x0000, 0x78ca, 0x9006,</div><div class='del'>-	0x600a, 0x600e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x00e6, 0x080c,</div><div class='del'>-	0x4c41, 0x2940, 0xa013, 0x0019, 0xa017, 0x0001, 0x2800, 0xa05a,</div><div class='del'>-	0x2001, 0x0030, 0x2004, 0xa866, 0x2001, 0x0031, 0x2004, 0xa86a,</div><div class='del'>-	0x2001, 0x002a, 0x2004, 0x9084, 0xfff8, 0xa86e, 0xa873, 0x0000,</div><div class='del'>-	0x2001, 0x032a, 0x2003, 0x0004, 0x2001, 0x0300, 0x2003, 0x0000,</div><div class='del'>-	0x2001, 0x020d, 0x2003, 0x0000, 0x2001, 0x0004, 0x200c, 0x918d,</div><div class='del'>-	0x0002, 0x2102, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x81ff,</div><div class='del'>-	0x0148, 0x080c, 0x2a77, 0x1130, 0x9006, 0x080c, 0x29ca, 0x9006,</div><div class='del'>-	0x080c, 0x29ad, 0x2001, 0x199f, 0x2003, 0x0000, 0x7884, 0x9084,</div><div class='del'>-	0x0007, 0x0002, 0x3eb5, 0x3eb6, 0x3eb7, 0x3eb2, 0x3eb2, 0x3eb2,</div><div class='del'>-	0x3eb2, 0x3eb2, 0x012e, 0x0804, 0x36c2, 0x0ce0, 0x0cd8, 0x080c,</div><div class='del'>-	0x779e, 0x1128, 0x012e, 0x2009, 0x0016, 0x0804, 0x36bf, 0x81ff,</div><div class='del'>-	0x0128, 0x012e, 0x2021, 0x400b, 0x0804, 0x368f, 0x2001, 0x0141,</div><div class='del'>-	0x2004, 0xd0dc, 0x0db0, 0x080c, 0xacfc, 0x0086, 0x0096, 0x00a6,</div><div class='del'>-	0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x080c, 0x3bd8, 0x2009,</div><div class='del'>-	0x0101, 0x210c, 0x0016, 0x7ec8, 0x7dcc, 0x9006, 0x2068, 0x2060,</div><div class='del'>-	0x2058, 0x080c, 0x432a, 0x080c, 0x427a, 0x903e, 0x2720, 0x00f6,</div><div class='del'>-	0x00e6, 0x0086, 0x2940, 0x2071, 0x19e8, 0x2079, 0x0090, 0x00d6,</div><div class='del'>-	0x2069, 0x0000, 0x6884, 0xd0b4, 0x0120, 0x68d4, 0x780e, 0x68d0,</div><div class='del'>-	0x780a, 0x00de, 0x2011, 0x0001, 0x080c, 0x41db, 0x080c, 0x2a7f,</div><div class='del'>-	0x080c, 0x2a7f, 0x080c, 0x2a7f, 0x080c, 0x2a7f, 0x080c, 0x41db,</div><div class='del'>-	0x008e, 0x00ee, 0x00fe, 0x080c, 0x40fd, 0x2009, 0x9c40, 0x8109,</div><div class='del'>-	0x11b0, 0x080c, 0x4034, 0x2001, 0x0004, 0x200c, 0x918c, 0xfffd,</div><div class='del'>-	0x2102, 0x001e, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x00ae,</div><div class='del'>-	0x009e, 0x008e, 0x2009, 0x0017, 0x080c, 0x36bf, 0x0cf8, 0x2001,</div><div class='del'>-	0x020b, 0x2004, 0x9084, 0x0140, 0x1d10, 0x00f6, 0x2079, 0x0000,</div><div class='del'>-	0x7884, 0x00fe, 0xd0bc, 0x0178, 0x2001, 0x0201, 0x200c, 0x81ff,</div><div class='del'>-	0x0150, 0x080c, 0x40db, 0x2d00, 0x9c05, 0x9b05, 0x0120, 0x080c,</div><div class='del'>-	0x4034, 0x0804, 0x3fdd, 0x080c, 0x424f, 0x080c, 0x4173, 0x080c,</div><div class='del'>-	0x40be, 0x080c, 0x40f3, 0x00f6, 0x2079, 0x0100, 0x7824, 0xd0ac,</div><div class='del'>-	0x0130, 0x8b58, 0x080c, 0x4034, 0x00fe, 0x0804, 0x3fdd, 0x00fe,</div><div class='del'>-	0x080c, 0x402a, 0x1150, 0x8d68, 0x2001, 0x0032, 0x2602, 0x2001,</div><div class='del'>-	0x0033, 0x2502, 0x080c, 0x4034, 0x0080, 0x87ff, 0x0138, 0x2001,</div><div class='del'>-	0x0201, 0x2004, 0x9005, 0x1908, 0x8739, 0x0038, 0x2001, 0x1a6e,</div><div class='del'>-	0x2004, 0x9086, 0x0000, 0x1904, 0x3f2d, 0x2001, 0x032f, 0x2003,</div><div class='del'>-	0x00f6, 0x8631, 0x1208, 0x8529, 0x2500, 0x9605, 0x0904, 0x3fdd,</div><div class='del'>-	0x7884, 0xd0bc, 0x0128, 0x2d00, 0x9c05, 0x9b05, 0x1904, 0x3fdd,</div><div class='del'>-	0xa013, 0x0019, 0x2001, 0x032a, 0x2003, 0x0004, 0x7884, 0xd0ac,</div><div class='del'>-	0x1148, 0x2001, 0x1a6e, 0x2003, 0x0003, 0x2001, 0x032a, 0x2003,</div><div class='del'>-	0x0009, 0x0030, 0xa017, 0x0001, 0x78b4, 0x9005, 0x0108, 0xa016,</div><div class='del'>-	0x2800, 0xa05a, 0x2009, 0x0040, 0x080c, 0x2220, 0x2900, 0xa85a,</div><div class='del'>-	0xa813, 0x0019, 0x7884, 0xd0a4, 0x1180, 0xa817, 0x0000, 0x00c6,</div><div class='del'>-	0x20a9, 0x0004, 0x2061, 0x0090, 0x602b, 0x0008, 0x2001, 0x0203,</div><div class='del'>-	0x2004, 0x1f04, 0x3fb4, 0x00ce, 0x0030, 0xa817, 0x0001, 0x78b0,</div><div class='del'>-	0x9005, 0x0108, 0xa816, 0x00f6, 0x00c6, 0x2079, 0x0100, 0x2061,</div><div class='del'>-	0x0090, 0x7827, 0x0002, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8,</div><div class='del'>-	0x601a, 0x0006, 0x2001, 0x002b, 0x2004, 0x601e, 0x78c6, 0x000e,</div><div class='del'>-	0x78ca, 0x00ce, 0x00fe, 0x0804, 0x3ee7, 0x001e, 0x00c6, 0x2001,</div><div class='del'>-	0x032a, 0x2003, 0x0004, 0x2061, 0x0100, 0x6027, 0x0002, 0x6106,</div><div class='del'>-	0x2011, 0x020d, 0x2013, 0x0020, 0x2001, 0x0004, 0x200c, 0x918c,</div><div class='del'>-	0xfffd, 0x2102, 0x080c, 0x1352, 0x7884, 0x9084, 0x0003, 0x9086,</div><div class='del'>-	0x0002, 0x01b0, 0x2009, 0x0028, 0x080c, 0x2220, 0x2001, 0x0227,</div><div class='del'>-	0x200c, 0x2102, 0x6050, 0x9084, 0xb7ff, 0x080c, 0x2b29, 0x6052,</div><div class='del'>-	0x602f, 0x0000, 0x604b, 0xf7f7, 0x6043, 0x0090, 0x6043, 0x0010,</div><div class='del'>-	0x080c, 0xad18, 0x00ce, 0x2d08, 0x2c10, 0x2b18, 0x2b00, 0x9c05,</div><div class='del'>-	0x9d05, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e,</div><div class='del'>-	0x008e, 0x1118, 0x012e, 0x0804, 0x368d, 0x012e, 0x2021, 0x400c,</div><div class='del'>-	0x0804, 0x368f, 0x9085, 0x0001, 0x1d04, 0x4033, 0x2091, 0x6000,</div><div class='del'>-	0x8420, 0x9486, 0x0064, 0x0005, 0x2001, 0x0105, 0x2003, 0x0010,</div><div class='del'>-	0x2001, 0x032a, 0x2003, 0x0004, 0x2001, 0x1a6e, 0x2003, 0x0000,</div><div class='del'>-	0x0071, 0x2009, 0x0048, 0x080c, 0x2220, 0x2001, 0x0227, 0x2024,</div><div class='del'>-	0x2402, 0x2001, 0x0109, 0x2003, 0x4000, 0x9026, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x2071, 0x19e8, 0x7054, 0x9086, 0x0000, 0x0520, 0x2079,</div><div class='del'>-	0x0090, 0x2009, 0x0206, 0x2104, 0x2009, 0x0203, 0x210c, 0x9106,</div><div class='del'>-	0x1120, 0x2009, 0x0040, 0x080c, 0x2220, 0x782c, 0xd0fc, 0x0d88,</div><div class='del'>-	0x080c, 0x424f, 0x7054, 0x9086, 0x0000, 0x1d58, 0x782b, 0x0004,</div><div class='del'>-	0x782c, 0xd0ac, 0x1de8, 0x2009, 0x0040, 0x080c, 0x2220, 0x782b,</div><div class='del'>-	0x0002, 0x7057, 0x0000, 0x00ee, 0x00fe, 0x0005, 0x00f6, 0x2079,</div><div class='del'>-	0x0100, 0x2001, 0x1818, 0x200c, 0x7932, 0x7936, 0x080c, 0x26d5,</div><div class='del'>-	0x080c, 0x2af6, 0x080c, 0x2b29, 0x784b, 0xf7f7, 0x7843, 0x0090,</div><div class='del'>-	0x7843, 0x0010, 0x7850, 0xc0e5, 0x7852, 0x2019, 0x61a8, 0x7820,</div><div class='del'>-	0xd09c, 0x0110, 0x8319, 0x1dd8, 0x7850, 0xc0e4, 0x7852, 0x2011,</div><div class='del'>-	0x0048, 0x080c, 0x2ad3, 0x7843, 0x0040, 0x2019, 0x01f4, 0xa001,</div><div class='del'>-	0xa001, 0x8319, 0x1de0, 0x2001, 0x0100, 0x080c, 0x2a99, 0x2011,</div><div class='del'>-	0x0020, 0x080c, 0x2ad3, 0x7843, 0x0000, 0x9006, 0x080c, 0x2a99,</div><div class='del'>-	0x2011, 0x0048, 0x080c, 0x2ad3, 0x00fe, 0x0005, 0x7884, 0xd0ac,</div><div class='del'>-	0x11c8, 0x00f6, 0x00e6, 0x2071, 0x1a6e, 0x2079, 0x0320, 0x2001,</div><div class='del'>-	0x0201, 0x2004, 0x9005, 0x0160, 0x7000, 0x9086, 0x0000, 0x1140,</div><div class='del'>-	0x0051, 0xd0bc, 0x0108, 0x8738, 0x7003, 0x0003, 0x782b, 0x0019,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0x00f6, 0x2079, 0x0300, 0x78bc, 0x00fe,</div><div class='del'>-	0x908c, 0x0070, 0x0178, 0x2009, 0x0032, 0x260a, 0x2009, 0x0033,</div><div class='del'>-	0x250a, 0xd0b4, 0x0108, 0x8c60, 0xd0ac, 0x0108, 0x8d68, 0xd0a4,</div><div class='del'>-	0x0108, 0x8b58, 0x0005, 0x00f6, 0x2079, 0x0200, 0x781c, 0xd084,</div><div class='del'>-	0x0110, 0x7837, 0x0050, 0x00fe, 0x0005, 0x00e6, 0x2071, 0x0100,</div><div class='del'>-	0x2001, 0x19ab, 0x2004, 0x70e2, 0x080c, 0x3e16, 0x1188, 0x2001,</div><div class='del'>-	0x1820, 0x2004, 0x2009, 0x181f, 0x210c, 0x918c, 0x00ff, 0x706e,</div><div class='del'>-	0x716a, 0x7066, 0x918d, 0x3200, 0x7162, 0x7073, 0xe109, 0x0080,</div><div class='del'>-	0x702c, 0x9085, 0x0002, 0x702e, 0x2009, 0x1818, 0x210c, 0x716e,</div><div class='del'>-	0x7063, 0x0100, 0x7166, 0x719e, 0x706b, 0x0000, 0x7073, 0x0809,</div><div class='del'>-	0x7077, 0x0008, 0x7078, 0x9080, 0x0100, 0x707a, 0x7080, 0x8000,</div><div class='del'>-	0x7082, 0x7087, 0xaaaa, 0x9006, 0x708a, 0x708e, 0x707e, 0x70d6,</div><div class='del'>-	0x70ab, 0x0036, 0x70af, 0x95d5, 0x7014, 0x9084, 0x1984, 0x9085,</div><div class='del'>-	0x0092, 0x7016, 0x080c, 0x424f, 0x00f6, 0x2071, 0x1a6e, 0x2079,</div><div class='del'>-	0x0320, 0x00d6, 0x2069, 0x0000, 0x6884, 0xd0b4, 0x0120, 0x689c,</div><div class='del'>-	0x780e, 0x6898, 0x780a, 0x00de, 0x080c, 0x3e16, 0x0140, 0x2001,</div><div class='del'>-	0x199f, 0x200c, 0x2003, 0x0001, 0x918e, 0x0001, 0x0120, 0x2009,</div><div class='del'>-	0x03e8, 0x8109, 0x1df0, 0x792c, 0xd1fc, 0x0110, 0x782b, 0x0004,</div><div class='del'>-	0x2011, 0x0011, 0x080c, 0x41db, 0x2011, 0x0001, 0x080c, 0x41db,</div><div class='del'>-	0x00fe, 0x00ee, 0x0005, 0x00f6, 0x00e6, 0x2071, 0x1a6e, 0x2079,</div><div class='del'>-	0x0320, 0x792c, 0xd1fc, 0x0904, 0x41d8, 0x782b, 0x0002, 0x9026,</div><div class='del'>-	0xd19c, 0x1904, 0x41d4, 0x7000, 0x0002, 0x41d8, 0x4189, 0x41b9,</div><div class='del'>-	0x41d4, 0xd1bc, 0x1170, 0xd1dc, 0x1190, 0x8001, 0x7002, 0x2011,</div><div class='del'>-	0x0001, 0x080c, 0x41db, 0x0904, 0x41d8, 0x080c, 0x41db, 0x0804,</div><div class='del'>-	0x41d8, 0x00f6, 0x2079, 0x0300, 0x78bf, 0x0000, 0x00fe, 0x7810,</div><div class='del'>-	0x7914, 0x782b, 0x0004, 0x7812, 0x7916, 0x2001, 0x0201, 0x200c,</div><div class='del'>-	0x81ff, 0x0de8, 0x080c, 0x40db, 0x2009, 0x0001, 0x00f6, 0x2079,</div><div class='del'>-	0x0300, 0x78b8, 0x00fe, 0xd0ec, 0x0110, 0x2009, 0x0011, 0x792a,</div><div class='del'>-	0x00f8, 0x8001, 0x7002, 0x9184, 0x0880, 0x1140, 0x782c, 0xd0fc,</div><div class='del'>-	0x1904, 0x417d, 0x2011, 0x0001, 0x00b1, 0x0090, 0xa010, 0x9092,</div><div class='del'>-	0x0004, 0x9086, 0x0015, 0x1120, 0xa000, 0xa05a, 0x2011, 0x0031,</div><div class='del'>-	0xa212, 0xd1dc, 0x1960, 0x0828, 0x782b, 0x0004, 0x7003, 0x0000,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0xa014, 0x9005, 0x0550, 0x8001, 0x0036,</div><div class='del'>-	0x0096, 0xa016, 0xa058, 0x2048, 0xa010, 0x2009, 0x0031, 0x911a,</div><div class='del'>-	0x831c, 0x831c, 0x938a, 0x0007, 0x1a0c, 0x0d85, 0x9398, 0x4209,</div><div class='del'>-	0x231d, 0x083f, 0x9080, 0x0004, 0x7a2a, 0x7100, 0x8108, 0x7102,</div><div class='del'>-	0x009e, 0x003e, 0x908a, 0x0035, 0x1140, 0x0096, 0xa058, 0x2048,</div><div class='del'>-	0xa804, 0xa05a, 0x2001, 0x0019, 0x009e, 0xa012, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x4246, 0x423d, 0x4234, 0x422b, 0x4222, 0x4219, 0x4210,</div><div class='del'>-	0xa964, 0x7902, 0xa968, 0x7906, 0xa96c, 0x7912, 0xa970, 0x7916,</div><div class='del'>-	0x0005, 0xa974, 0x7902, 0xa978, 0x7906, 0xa97c, 0x7912, 0xa980,</div><div class='del'>-	0x7916, 0x0005, 0xa984, 0x7902, 0xa988, 0x7906, 0xa98c, 0x7912,</div><div class='del'>-	0xa990, 0x7916, 0x0005, 0xa994, 0x7902, 0xa998, 0x7906, 0xa99c,</div><div class='del'>-	0x7912, 0xa9a0, 0x7916, 0x0005, 0xa9a4, 0x7902, 0xa9a8, 0x7906,</div><div class='del'>-	0xa9ac, 0x7912, 0xa9b0, 0x7916, 0x0005, 0xa9b4, 0x7902, 0xa9b8,</div><div class='del'>-	0x7906, 0xa9bc, 0x7912, 0xa9c0, 0x7916, 0x0005, 0xa9c4, 0x7902,</div><div class='del'>-	0xa9c8, 0x7906, 0xa9cc, 0x7912, 0xa9d0, 0x7916, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x0086, 0x2071, 0x19e8, 0x2079, 0x0090, 0x792c, 0xd1fc,</div><div class='del'>-	0x01e8, 0x782b, 0x0002, 0x2940, 0x9026, 0x7054, 0x0002, 0x4276,</div><div class='del'>-	0x4262, 0x426d, 0x8001, 0x7056, 0xd19c, 0x1180, 0x2011, 0x0001,</div><div class='del'>-	0x080c, 0x41db, 0x190c, 0x41db, 0x0048, 0x8001, 0x7056, 0x782c,</div><div class='del'>-	0xd0fc, 0x1d38, 0x2011, 0x0001, 0x080c, 0x41db, 0x008e, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0086, 0x2061, 0x0200,</div><div class='del'>-	0x2001, 0x19ab, 0x2004, 0x601a, 0x2061, 0x0100, 0x2001, 0x19aa,</div><div class='del'>-	0x2004, 0x60ce, 0x6104, 0xc1ac, 0x6106, 0x2001, 0x002c, 0x2004,</div><div class='del'>-	0x9005, 0x0520, 0x2038, 0x2001, 0x002e, 0x2024, 0x2001, 0x002f,</div><div class='del'>-	0x201c, 0x080c, 0x4c41, 0xa813, 0x0019, 0xaf16, 0x2900, 0xa85a,</div><div class='del'>-	0x978a, 0x0007, 0x0220, 0x2138, 0x2009, 0x0007, 0x0010, 0x2708,</div><div class='del'>-	0x903e, 0x0096, 0xa858, 0x2048, 0xa85c, 0x9080, 0x0019, 0x009e,</div><div class='del'>-	0x080c, 0x42f2, 0x1d68, 0x2900, 0xa85a, 0x00d0, 0x080c, 0x4c41,</div><div class='del'>-	0xa813, 0x0019, 0xa817, 0x0001, 0x2900, 0xa85a, 0x2001, 0x002e,</div><div class='del'>-	0x2004, 0xa866, 0x2001, 0x002f, 0x2004, 0xa86a, 0x2001, 0x002a,</div><div class='del'>-	0x2004, 0x9084, 0xfff8, 0xa86e, 0x2001, 0x002b, 0x2004, 0xa872,</div><div class='del'>-	0x2061, 0x0090, 0x2079, 0x0100, 0x2001, 0x19aa, 0x2004, 0x6036,</div><div class='del'>-	0x2009, 0x0040, 0x080c, 0x2220, 0x2001, 0x002a, 0x2004, 0x9084,</div><div class='del'>-	0xfff8, 0x601a, 0x0006, 0x2001, 0x002b, 0x2004, 0x601e, 0x78c6,</div><div class='del'>-	0x000e, 0x78ca, 0x9006, 0x600a, 0x600e, 0x008e, 0x00ce, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x00e6, 0x2071, 0x0080, 0xaa60, 0x22e8, 0x20a0,</div><div class='del'>-	0x20e1, 0x0000, 0x2099, 0x0088, 0x702b, 0x0026, 0x7402, 0x7306,</div><div class='del'>-	0x9006, 0x700a, 0x700e, 0x810b, 0x810b, 0x21a8, 0x810b, 0x7112,</div><div class='del'>-	0x702b, 0x0041, 0x702c, 0xd0fc, 0x0de8, 0x702b, 0x0002, 0x702b,</div><div class='del'>-	0x0040, 0x4005, 0x7400, 0x7304, 0x87ff, 0x0190, 0x0086, 0x0096,</div><div class='del'>-	0x2940, 0x0086, 0x080c, 0x4c41, 0x008e, 0xa058, 0x00a6, 0x2050,</div><div class='del'>-	0x2900, 0xb006, 0xa05a, 0x00ae, 0x009e, 0x008e, 0x9085, 0x0001,</div><div class='del'>-	0x00ee, 0x0005, 0x00e6, 0x2001, 0x002d, 0x2004, 0x9005, 0x0528,</div><div class='del'>-	0x2038, 0x2001, 0x0030, 0x2024, 0x2001, 0x0031, 0x201c, 0x080c,</div><div class='del'>-	0x4c41, 0x2940, 0xa813, 0x0019, 0xaf16, 0x2900, 0xa85a, 0x978a,</div><div class='del'>-	0x0007, 0x0220, 0x2138, 0x2009, 0x0007, 0x0010, 0x2708, 0x903e,</div><div class='del'>-	0x0096, 0xa858, 0x2048, 0xa85c, 0x9080, 0x0019, 0x009e, 0x080c,</div><div class='del'>-	0x42f2, 0x1d68, 0x2900, 0xa85a, 0x00d8, 0x080c, 0x4c41, 0x2940,</div><div class='del'>-	0xa013, 0x0019, 0xa017, 0x0001, 0x2800, 0xa05a, 0x2001, 0x0030,</div><div class='del'>-	0x2004, 0xa066, 0x2001, 0x0031, 0x2004, 0xa06a, 0x2001, 0x002a,</div><div class='del'>-	0x2004, 0x9084, 0xfff8, 0xa06e, 0x2001, 0x002b, 0x2004, 0xa072,</div><div class='del'>-	0x2001, 0x032a, 0x2003, 0x0004, 0x7884, 0xd0ac, 0x1180, 0x2001,</div><div class='del'>-	0x0101, 0x200c, 0x918d, 0x0200, 0x2102, 0xa017, 0x0000, 0x2001,</div><div class='del'>-	0x1a6e, 0x2003, 0x0003, 0x2001, 0x032a, 0x2003, 0x0009, 0x2001,</div><div class='del'>-	0x0300, 0x2003, 0x0000, 0x2001, 0x020d, 0x2003, 0x0000, 0x2001,</div><div class='del'>-	0x0004, 0x200c, 0x918d, 0x0002, 0x2102, 0x00ee, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x20a9, 0x0007, 0x20a1, 0x1840, 0x20e9, 0x0001,</div><div class='del'>-	0x9006, 0x4004, 0x20a9, 0x0014, 0x20a1, 0xffec, 0x20e9, 0x0000,</div><div class='del'>-	0x9006, 0x4004, 0x2009, 0x013c, 0x200a, 0x012e, 0x7880, 0x9086,</div><div class='del'>-	0x0052, 0x0108, 0x0005, 0x0804, 0x368d, 0x7d98, 0x7c9c, 0x0804,</div><div class='del'>-	0x3791, 0x080c, 0x779e, 0x190c, 0x6162, 0x6040, 0x9084, 0x0020,</div><div class='del'>-	0x09b1, 0x2069, 0x1847, 0x2d00, 0x2009, 0x0030, 0x7a8c, 0x7b88,</div><div class='del'>-	0x7c9c, 0x7d98, 0x2039, 0x0001, 0x080c, 0x4c8a, 0x701f, 0x43d1,</div><div class='del'>-	0x0005, 0x080c, 0x584f, 0x1130, 0x3b00, 0x3a08, 0xc194, 0xc095,</div><div class='del'>-	0x20d8, 0x21d0, 0x2069, 0x1847, 0x6800, 0x9005, 0x0904, 0x36c2,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x6804, 0x0118, 0xc0a4, 0xc0ac,</div><div class='del'>-	0x6806, 0xd0ac, 0x0118, 0xd0a4, 0x0904, 0x36c2, 0xd094, 0x00c6,</div><div class='del'>-	0x2061, 0x0100, 0x6104, 0x0138, 0x6200, 0x9292, 0x0005, 0x0218,</div><div class='del'>-	0x918c, 0xffdf, 0x0010, 0x918d, 0x0020, 0x6106, 0x00ce, 0xd08c,</div><div class='del'>-	0x00c6, 0x2061, 0x0100, 0x6104, 0x0118, 0x918d, 0x0010, 0x0010,</div><div class='del'>-	0x918c, 0xffef, 0x6106, 0x00ce, 0xd084, 0x0158, 0x6a28, 0x928a,</div><div class='del'>-	0x007f, 0x1a04, 0x36c2, 0x9288, 0x348e, 0x210d, 0x918c, 0x00ff,</div><div class='del'>-	0x6166, 0xd0dc, 0x0130, 0x6828, 0x908a, 0x007f, 0x1a04, 0x36c2,</div><div class='del'>-	0x605e, 0x6888, 0x9084, 0x0030, 0x8004, 0x8004, 0x8004, 0x8004,</div><div class='del'>-	0x0006, 0x2009, 0x19b2, 0x9080, 0x27d0, 0x2005, 0x200a, 0x2008,</div><div class='del'>-	0x2001, 0x0018, 0x080c, 0xaced, 0x2009, 0x0390, 0x200b, 0x0400,</div><div class='del'>-	0x000e, 0x2009, 0x19b3, 0x9080, 0x27d4, 0x2005, 0x200a, 0x6808,</div><div class='del'>-	0x908a, 0x0100, 0x0a04, 0x36c2, 0x908a, 0x0841, 0x1a04, 0x36c2,</div><div class='del'>-	0x9084, 0x0007, 0x1904, 0x36c2, 0x680c, 0x9005, 0x0904, 0x36c2,</div><div class='del'>-	0x6810, 0x9005, 0x0904, 0x36c2, 0x6848, 0x6940, 0x910a, 0x1a04,</div><div class='del'>-	0x36c2, 0x8001, 0x0904, 0x36c2, 0x684c, 0x6944, 0x910a, 0x1a04,</div><div class='del'>-	0x36c2, 0x8001, 0x0904, 0x36c2, 0x6814, 0x908c, 0x00ff, 0x614e,</div><div class='del'>-	0x8007, 0x9084, 0x00ff, 0x6052, 0x080c, 0x7ae7, 0x080c, 0x6cfc,</div><div class='del'>-	0x080c, 0x6d66, 0x6808, 0x602a, 0x080c, 0x2192, 0x2009, 0x0170,</div><div class='del'>-	0x200b, 0x0080, 0xa001, 0xa001, 0x200b, 0x0000, 0x0036, 0x6b08,</div><div class='del'>-	0x080c, 0x272f, 0x003e, 0x6000, 0x9086, 0x0000, 0x1904, 0x456d,</div><div class='del'>-	0x6818, 0x691c, 0x6a20, 0x6b24, 0x8007, 0x810f, 0x8217, 0x831f,</div><div class='del'>-	0x6016, 0x611a, 0x621e, 0x6322, 0x6c04, 0xd4f4, 0x0148, 0x6830,</div><div class='del'>-	0x6934, 0x6a38, 0x6b3c, 0x8007, 0x810f, 0x8217, 0x831f, 0x0010,</div><div class='del'>-	0x9084, 0xf0ff, 0x6006, 0x610a, 0x620e, 0x6312, 0x8007, 0x810f,</div><div class='del'>-	0x8217, 0x831f, 0x20a9, 0x0004, 0x20a1, 0x19b4, 0x20e9, 0x0001,</div><div class='del'>-	0x4001, 0x20a9, 0x0004, 0x20a1, 0x19ce, 0x20e9, 0x0001, 0x4001,</div><div class='del'>-	0x080c, 0x8b26, 0x00c6, 0x900e, 0x20a9, 0x0001, 0x6b70, 0xd384,</div><div class='del'>-	0x01c8, 0x0020, 0x839d, 0x12b0, 0x3508, 0x8109, 0x080c, 0x80fe,</div><div class='del'>-	0x6878, 0x6016, 0x6874, 0x2008, 0x9084, 0xff00, 0x8007, 0x600a,</div><div class='del'>-	0x9184, 0x00ff, 0x6006, 0x8108, 0x1118, 0x6003, 0x0003, 0x0010,</div><div class='del'>-	0x6003, 0x0001, 0x1f04, 0x44c2, 0x00ce, 0x00c6, 0x2061, 0x199c,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x11a8, 0x6a88, 0x9284, 0xc000,</div><div class='del'>-	0x2010, 0x9286, 0x0000, 0x1158, 0x2063, 0x0000, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x29ca, 0x2001, 0x0001, 0x080c, 0x29ad, 0x0088, 0x9286,</div><div class='del'>-	0x4000, 0x1148, 0x2063, 0x0001, 0x9006, 0x080c, 0x29ca, 0x9006,</div><div class='del'>-	0x080c, 0x29ad, 0x0028, 0x9286, 0x8000, 0x1d30, 0x2063, 0x0002,</div><div class='del'>-	0x00ce, 0x00e6, 0x2c70, 0x080c, 0x0ed3, 0x00ee, 0x080c, 0x2af6,</div><div class='del'>-	0x080c, 0x2b29, 0x6888, 0xd0ec, 0x0130, 0x2011, 0x0114, 0x2204,</div><div class='del'>-	0x9085, 0x0180, 0x2012, 0x6a80, 0x9284, 0x0030, 0x9086, 0x0030,</div><div class='del'>-	0x1128, 0x9294, 0xffcf, 0x9295, 0x0020, 0x6a82, 0x2001, 0x197c,</div><div class='del'>-	0x6a80, 0x9294, 0x0030, 0x928e, 0x0000, 0x0170, 0x928e, 0x0010,</div><div class='del'>-	0x0118, 0x928e, 0x0020, 0x0140, 0x2003, 0xaaaa, 0x080c, 0x27a4,</div><div class='del'>-	0x2001, 0x196d, 0x2102, 0x0008, 0x2102, 0x00c6, 0x2061, 0x0100,</div><div class='del'>-	0x602f, 0x0040, 0x602f, 0x0000, 0x00ce, 0x080c, 0x779e, 0x0128,</div><div class='del'>-	0x080c, 0x5128, 0x0110, 0x080c, 0x26f5, 0x60d4, 0x9005, 0x01c0,</div><div class='del'>-	0x6003, 0x0001, 0x2009, 0x4555, 0x00e0, 0x080c, 0x779e, 0x1168,</div><div class='del'>-	0x2011, 0x7612, 0x080c, 0x8993, 0x2011, 0x7605, 0x080c, 0x8a9f,</div><div class='del'>-	0x080c, 0x7abb, 0x080c, 0x76cd, 0x0040, 0x080c, 0x6058, 0x0028,</div><div class='del'>-	0x6003, 0x0004, 0x2009, 0x456d, 0x0020, 0x080c, 0x6b73, 0x0804,</div><div class='del'>-	0x368d, 0x2001, 0x0170, 0x2004, 0x9084, 0x00ff, 0x9086, 0x004c,</div><div class='del'>-	0x1118, 0x2091, 0x31bd, 0x0817, 0x2091, 0x313d, 0x0817, 0x6000,</div><div class='del'>-	0x9086, 0x0000, 0x0904, 0x36bf, 0x2069, 0x1847, 0x7890, 0x6842,</div><div class='del'>-	0x7894, 0x6846, 0x2d00, 0x2009, 0x0030, 0x7a8c, 0x7b88, 0x7c9c,</div><div class='del'>-	0x7d98, 0x2039, 0x0001, 0x0804, 0x4c8d, 0x9006, 0x080c, 0x26f5,</div><div class='del'>-	0x81ff, 0x1904, 0x36bf, 0x080c, 0x779e, 0x11b0, 0x080c, 0x7ab6,</div><div class='del'>-	0x080c, 0x619d, 0x080c, 0x3482, 0x0118, 0x6130, 0xc18d, 0x6132,</div><div class='del'>-	0x080c, 0xd645, 0x0130, 0x080c, 0x77c1, 0x1118, 0x080c, 0x7772,</div><div class='del'>-	0x0038, 0x080c, 0x76cd, 0x0020, 0x080c, 0x6162, 0x080c, 0x6058,</div><div class='del'>-	0x0804, 0x368d, 0x81ff, 0x1904, 0x36bf, 0x080c, 0x779e, 0x1110,</div><div class='del'>-	0x0804, 0x36bf, 0x0126, 0x2091, 0x8000, 0x6194, 0x81ff, 0x0190,</div><div class='del'>-	0x704f, 0x0000, 0x2001, 0x1d80, 0x2009, 0x0040, 0x7a8c, 0x7b88,</div><div class='del'>-	0x7c9c, 0x7d98, 0x2039, 0x0001, 0x080c, 0x4c8d, 0x701f, 0x368b,</div><div class='del'>-	0x012e, 0x0005, 0x704f, 0x0001, 0x00d6, 0x2069, 0x1d80, 0x20a9,</div><div class='del'>-	0x0040, 0x20e9, 0x0001, 0x20a1, 0x1d80, 0x2019, 0xffff, 0x4304,</div><div class='del'>-	0x655c, 0x9588, 0x348e, 0x210d, 0x918c, 0x00ff, 0x216a, 0x900e,</div><div class='del'>-	0x2011, 0x0002, 0x2100, 0x9506, 0x01a8, 0x080c, 0x67b4, 0x1190,</div><div class='del'>-	0xb814, 0x821c, 0x0238, 0x9398, 0x1d80, 0x9085, 0xff00, 0x8007,</div><div class='del'>-	0x201a, 0x0038, 0x9398, 0x1d80, 0x2324, 0x94a4, 0xff00, 0x9405,</div><div class='del'>-	0x201a, 0x8210, 0x8108, 0x9182, 0x0080, 0x1208, 0x0c18, 0x8201,</div><div class='del'>-	0x8007, 0x2d0c, 0x9105, 0x206a, 0x00de, 0x20a9, 0x0040, 0x20a1,</div><div class='del'>-	0x1d80, 0x2099, 0x1d80, 0x080c, 0x60ed, 0x0804, 0x45ca, 0x080c,</div><div class='del'>-	0x4c74, 0x0904, 0x36c2, 0x080c, 0x4c41, 0x1120, 0x2009, 0x0002,</div><div class='del'>-	0x0804, 0x36bf, 0x080c, 0x5840, 0xd0b4, 0x0558, 0x7884, 0x908e,</div><div class='del'>-	0x007e, 0x0538, 0x908e, 0x007f, 0x0520, 0x908e, 0x0080, 0x0508,</div><div class='del'>-	0x080c, 0x347d, 0x1148, 0xb800, 0xd08c, 0x11d8, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0006, 0x11a8, 0xa867, 0x0000, 0xa868, 0xc0fd,</div><div class='del'>-	0xa86a, 0x080c, 0xd0ec, 0x1120, 0x2009, 0x0003, 0x0804, 0x36bf,</div><div class='del'>-	0x7007, 0x0003, 0x701f, 0x4655, 0x0005, 0x080c, 0x4c74, 0x0904,</div><div class='del'>-	0x36c2, 0x20a9, 0x002b, 0xb8c4, 0x20e0, 0xb8c8, 0x2098, 0xa860,</div><div class='del'>-	0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003, 0x20a9, 0x0008,</div><div class='del'>-	0x9080, 0x0006, 0x20a0, 0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x0006,</div><div class='del'>-	0x2098, 0x080c, 0x0fd6, 0x0070, 0x20a9, 0x0004, 0xa85c, 0x9080,</div><div class='del'>-	0x000a, 0x20a0, 0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x000a, 0x2098,</div><div class='del'>-	0x080c, 0x0fd6, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,</div><div class='del'>-	0xffc0, 0x9080, 0x0002, 0x2009, 0x002b, 0x7a8c, 0x7b88, 0x7c9c,</div><div class='del'>-	0x7d98, 0x0804, 0x4c8d, 0x81ff, 0x1904, 0x36bf, 0x080c, 0x4c58,</div><div class='del'>-	0x0904, 0x36c2, 0x080c, 0x6a00, 0x0904, 0x36bf, 0x0058, 0xa878,</div><div class='del'>-	0x9005, 0x0120, 0x2009, 0x0004, 0x0804, 0x36bf, 0xa974, 0xaa94,</div><div class='del'>-	0x0804, 0x368d, 0x080c, 0x5848, 0x0904, 0x368d, 0x701f, 0x469f,</div><div class='del'>-	0x7007, 0x0003, 0x0005, 0x81ff, 0x1904, 0x36bf, 0x7888, 0x908a,</div><div class='del'>-	0x1000, 0x1a04, 0x36c2, 0x080c, 0x4c74, 0x0904, 0x36c2, 0x080c,</div><div class='del'>-	0x6c11, 0x0120, 0x080c, 0x6c19, 0x1904, 0x36c2, 0x080c, 0x6a85,</div><div class='del'>-	0x0904, 0x36bf, 0x2019, 0x0004, 0x900e, 0x080c, 0x6a12, 0x0904,</div><div class='del'>-	0x36bf, 0x7984, 0x7a88, 0x04c9, 0x08a8, 0xa89c, 0x908a, 0x1000,</div><div class='del'>-	0x12f8, 0x080c, 0x4c72, 0x01e0, 0x080c, 0x6c11, 0x0118, 0x080c,</div><div class='del'>-	0x6c19, 0x11b0, 0x080c, 0x6a85, 0x2009, 0x0002, 0x0168, 0x2009,</div><div class='del'>-	0x0002, 0x2019, 0x0004, 0x080c, 0x6a12, 0x2009, 0x0003, 0x0120,</div><div class='del'>-	0xa998, 0xaa9c, 0x00d1, 0x0060, 0xa897, 0x4005, 0xa99a, 0x0010,</div><div class='del'>-	0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x0005,</div><div class='del'>-	0xa897, 0x4000, 0x080c, 0x5848, 0x0110, 0x9006, 0x0018, 0x900e,</div><div class='del'>-	0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x9186, 0x00ff, 0x0110,</div><div class='del'>-	0x0071, 0x0060, 0x2029, 0x007e, 0x2061, 0x1800, 0x645c, 0x2400,</div><div class='del'>-	0x9506, 0x0110, 0x2508, 0x0019, 0x8529, 0x1ec8, 0x0005, 0x080c,</div><div class='del'>-	0x67b4, 0x1138, 0x2200, 0x8003, 0x800b, 0x810b, 0x9108, 0x080c,</div><div class='del'>-	0x89a1, 0x0005, 0x81ff, 0x1904, 0x36bf, 0x798c, 0x2001, 0x1980,</div><div class='del'>-	0x918c, 0x8000, 0x2102, 0x080c, 0x4c58, 0x0904, 0x36c2, 0x080c,</div><div class='del'>-	0x6c11, 0x0120, 0x080c, 0x6c19, 0x1904, 0x36c2, 0x080c, 0x687b,</div><div class='del'>-	0x0904, 0x36bf, 0x080c, 0x6a09, 0x0904, 0x36bf, 0x2001, 0x1980,</div><div class='del'>-	0x2004, 0xd0fc, 0x1904, 0x368d, 0x0804, 0x46aa, 0xa9a0, 0x2001,</div><div class='del'>-	0x1980, 0x918c, 0x8000, 0xc18d, 0x2102, 0x080c, 0x4c65, 0x01a0,</div><div class='del'>-	0x080c, 0x6c11, 0x0118, 0x080c, 0x6c19, 0x1170, 0x080c, 0x687b,</div><div class='del'>-	0x2009, 0x0002, 0x0128, 0x080c, 0x6a09, 0x1170, 0x2009, 0x0003,</div><div class='del'>-	0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085,</div><div class='del'>-	0x0001, 0x2001, 0x0030, 0x0005, 0xa897, 0x4000, 0x2001, 0x1980,</div><div class='del'>-	0x2004, 0xd0fc, 0x1128, 0x080c, 0x5848, 0x0110, 0x9006, 0x0018,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x81ff, 0x1904,</div><div class='del'>-	0x36bf, 0x798c, 0x2001, 0x197f, 0x918c, 0x8000, 0x2102, 0x080c,</div><div class='del'>-	0x4c58, 0x0904, 0x36c2, 0x080c, 0x6c11, 0x0120, 0x080c, 0x6c19,</div><div class='del'>-	0x1904, 0x36c2, 0x080c, 0x687b, 0x0904, 0x36bf, 0x080c, 0x69f7,</div><div class='del'>-	0x0904, 0x36bf, 0x2001, 0x197f, 0x2004, 0xd0fc, 0x1904, 0x368d,</div><div class='del'>-	0x0804, 0x46aa, 0xa9a0, 0x2001, 0x197f, 0x918c, 0x8000, 0xc18d,</div><div class='del'>-	0x2102, 0x080c, 0x4c65, 0x01a0, 0x080c, 0x6c11, 0x0118, 0x080c,</div><div class='del'>-	0x6c19, 0x1170, 0x080c, 0x687b, 0x2009, 0x0002, 0x0128, 0x080c,</div><div class='del'>-	0x69f7, 0x1170, 0x2009, 0x0003, 0xa897, 0x4005, 0xa99a, 0x0010,</div><div class='del'>-	0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x0005,</div><div class='del'>-	0xa897, 0x4000, 0x2001, 0x197f, 0x2004, 0xd0fc, 0x1128, 0x080c,</div><div class='del'>-	0x5848, 0x0110, 0x9006, 0x0018, 0x900e, 0x9085, 0x0001, 0x2001,</div><div class='del'>-	0x0000, 0x0005, 0x6100, 0x0804, 0x368d, 0x080c, 0x4c74, 0x0904,</div><div class='del'>-	0x36c2, 0x080c, 0x5854, 0x1904, 0x36bf, 0x79a8, 0xd184, 0x1158,</div><div class='del'>-	0xb834, 0x8007, 0x789e, 0xb830, 0x8007, 0x789a, 0xbb2c, 0x831f,</div><div class='del'>-	0xba28, 0x8217, 0x0050, 0xb824, 0x8007, 0x789e, 0xb820, 0x8007,</div><div class='del'>-	0x789a, 0xbb1c, 0x831f, 0xba18, 0x8217, 0xb900, 0x918c, 0x0202,</div><div class='del'>-	0x0804, 0x368d, 0x78a8, 0x909c, 0x0003, 0xd0ac, 0x1150, 0xd0b4,</div><div class='del'>-	0x1140, 0x939a, 0x0003, 0x1a04, 0x36bf, 0x625c, 0x7884, 0x9206,</div><div class='del'>-	0x1548, 0x080c, 0x8b10, 0x2001, 0xffec, 0x2009, 0x000c, 0x7a8c,</div><div class='del'>-	0x7b88, 0x7c9c, 0x7d98, 0x2039, 0x0000, 0x0006, 0x78a8, 0x9084,</div><div class='del'>-	0x0080, 0x1118, 0x000e, 0x0804, 0x4c8d, 0x000e, 0x2031, 0x0000,</div><div class='del'>-	0x2061, 0x18b8, 0x2c44, 0xa66a, 0xa17a, 0xa772, 0xa076, 0xa28e,</div><div class='del'>-	0xa392, 0xa496, 0xa59a, 0x080c, 0x114e, 0x7007, 0x0002, 0x701f,</div><div class='del'>-	0x4862, 0x0005, 0x81ff, 0x1904, 0x36bf, 0x080c, 0x4c74, 0x0904,</div><div class='del'>-	0x36c2, 0x080c, 0x6c11, 0x1904, 0x36bf, 0x00c6, 0x080c, 0x4c41,</div><div class='del'>-	0x00ce, 0x0904, 0x36bf, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a,</div><div class='del'>-	0x7ea8, 0x080c, 0xd092, 0x0904, 0x36bf, 0x7007, 0x0003, 0x701f,</div><div class='del'>-	0x4866, 0x0005, 0x080c, 0x4397, 0x0804, 0x368d, 0xa830, 0x9086,</div><div class='del'>-	0x0100, 0x0904, 0x36bf, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f,</div><div class='del'>-	0x9084, 0xffc0, 0x9080, 0x001b, 0x2009, 0x000c, 0x7a8c, 0x7b88,</div><div class='del'>-	0x7c9c, 0x7d98, 0x0804, 0x4c8d, 0x9006, 0x080c, 0x26f5, 0x78a8,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x00ff, 0x0118, 0x81ff, 0x1904, 0x36bf,</div><div class='del'>-	0x080c, 0x779e, 0x0110, 0x080c, 0x6162, 0x7888, 0x908a, 0x1000,</div><div class='del'>-	0x1a04, 0x36c2, 0x7984, 0x9186, 0x00ff, 0x0138, 0x9182, 0x007f,</div><div class='del'>-	0x1a04, 0x36c2, 0x2100, 0x080c, 0x26bf, 0x0026, 0x00c6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2061, 0x1a04, 0x601b, 0x0000, 0x601f, 0x0000,</div><div class='del'>-	0x607b, 0x0000, 0x607f, 0x0000, 0x080c, 0x779e, 0x1158, 0x080c,</div><div class='del'>-	0x7ab6, 0x080c, 0x619d, 0x9085, 0x0001, 0x080c, 0x77e2, 0x080c,</div><div class='del'>-	0x76cd, 0x00f0, 0x080c, 0xacfc, 0x080c, 0xb09b, 0x080c, 0xad18,</div><div class='del'>-	0x2061, 0x0100, 0x2001, 0x1818, 0x2004, 0x9084, 0x00ff, 0x810f,</div><div class='del'>-	0x9105, 0x604a, 0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0x1999,</div><div class='del'>-	0x200b, 0x0000, 0x2009, 0x002d, 0x2011, 0x6088, 0x080c, 0x8a5d,</div><div class='del'>-	0x7984, 0x080c, 0x779e, 0x1110, 0x2009, 0x00ff, 0x7a88, 0x080c,</div><div class='del'>-	0x470d, 0x012e, 0x00ce, 0x002e, 0x0804, 0x368d, 0x7984, 0x080c,</div><div class='del'>-	0x6749, 0x2b08, 0x1904, 0x36c2, 0x0804, 0x368d, 0x81ff, 0x0120,</div><div class='del'>-	0x2009, 0x0001, 0x0804, 0x36bf, 0x60dc, 0xd0ac, 0x1130, 0xd09c,</div><div class='del'>-	0x1120, 0x2009, 0x0005, 0x0804, 0x36bf, 0x080c, 0x4c41, 0x1120,</div><div class='del'>-	0x2009, 0x0002, 0x0804, 0x36bf, 0x7984, 0x81ff, 0x0904, 0x36c2,</div><div class='del'>-	0x9192, 0x0021, 0x1a04, 0x36c2, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0x702a, 0xaf60, 0x7736, 0x080c, 0x4c8a,</div><div class='del'>-	0x701f, 0x4921, 0x7880, 0x9086, 0x006e, 0x0110, 0x701f, 0x52da,</div><div class='del'>-	0x0005, 0x2009, 0x0080, 0x080c, 0x67b4, 0x1118, 0x080c, 0x6c11,</div><div class='del'>-	0x0120, 0x2021, 0x400a, 0x0804, 0x368f, 0x00d6, 0x0096, 0xa964,</div><div class='del'>-	0xaa6c, 0xab70, 0xac74, 0xad78, 0xae7c, 0xa884, 0x90be, 0x0100,</div><div class='del'>-	0x0904, 0x49ba, 0x90be, 0x0112, 0x0904, 0x49ba, 0x90be, 0x0113,</div><div class='del'>-	0x0904, 0x49ba, 0x90be, 0x0114, 0x0904, 0x49ba, 0x90be, 0x0117,</div><div class='del'>-	0x0904, 0x49ba, 0x90be, 0x011a, 0x0904, 0x49ba, 0x90be, 0x011c,</div><div class='del'>-	0x0904, 0x49ba, 0x90be, 0x0121, 0x0904, 0x49a1, 0x90be, 0x0131,</div><div class='del'>-	0x0904, 0x49a1, 0x90be, 0x0171, 0x0904, 0x49ba, 0x90be, 0x0173,</div><div class='del'>-	0x0904, 0x49ba, 0x90be, 0x01a1, 0x1128, 0xa894, 0x8007, 0xa896,</div><div class='del'>-	0x0804, 0x49c5, 0x90be, 0x0212, 0x0904, 0x49ae, 0x90be, 0x0213,</div><div class='del'>-	0x05e8, 0x90be, 0x0214, 0x0500, 0x90be, 0x0217, 0x0188, 0x90be,</div><div class='del'>-	0x021a, 0x1120, 0xa89c, 0x8007, 0xa89e, 0x04e0, 0x90be, 0x021f,</div><div class='del'>-	0x05c8, 0x90be, 0x0300, 0x05b0, 0x009e, 0x00de, 0x0804, 0x36c2,</div><div class='del'>-	0x7028, 0x9080, 0x0010, 0x2098, 0x20a0, 0x7034, 0x20e0, 0x20e8,</div><div class='del'>-	0x20a9, 0x0007, 0x080c, 0x4a03, 0x7028, 0x9080, 0x000e, 0x2098,</div><div class='del'>-	0x20a0, 0x7034, 0x20e0, 0x20e8, 0x20a9, 0x0001, 0x080c, 0x4a03,</div><div class='del'>-	0x00c8, 0x7028, 0x9080, 0x000c, 0x2098, 0x20a0, 0x7034, 0x20e0,</div><div class='del'>-	0x20e8, 0x20a9, 0x0001, 0x080c, 0x4a10, 0x00b8, 0x7028, 0x9080,</div><div class='del'>-	0x000e, 0x2098, 0x20a0, 0x7034, 0x20e0, 0x20e8, 0x20a9, 0x0001,</div><div class='del'>-	0x080c, 0x4a10, 0x7028, 0x9080, 0x000c, 0x2098, 0x20a0, 0x7034,</div><div class='del'>-	0x20e0, 0x20e8, 0x20a9, 0x0001, 0x04f1, 0x00c6, 0x080c, 0x4c41,</div><div class='del'>-	0x0550, 0xa868, 0xc0fd, 0xa86a, 0xa867, 0x0119, 0x9006, 0xa882,</div><div class='del'>-	0xa87f, 0x0020, 0xa88b, 0x0001, 0x810b, 0xa9ae, 0xa8b2, 0xaab6,</div><div class='del'>-	0xabba, 0xacbe, 0xadc2, 0xa9c6, 0xa8ca, 0x00ce, 0x009e, 0x00de,</div><div class='del'>-	0xa866, 0xa822, 0xa868, 0xc0fd, 0xa86a, 0xa804, 0x2048, 0x080c,</div><div class='del'>-	0xd0ad, 0x1120, 0x2009, 0x0003, 0x0804, 0x36bf, 0x7007, 0x0003,</div><div class='del'>-	0x701f, 0x49fa, 0x0005, 0x00ce, 0x009e, 0x00de, 0x2009, 0x0002,</div><div class='del'>-	0x0804, 0x36bf, 0xa820, 0x9086, 0x8001, 0x1904, 0x368d, 0x2009,</div><div class='del'>-	0x0004, 0x0804, 0x36bf, 0x0016, 0x0026, 0x3510, 0x20a9, 0x0002,</div><div class='del'>-	0x4002, 0x4104, 0x4004, 0x8211, 0x1dc8, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x0016, 0x0026, 0x0036, 0x0046, 0x3520, 0x20a9, 0x0004, 0x4002,</div><div class='del'>-	0x4304, 0x4204, 0x4104, 0x4004, 0x8421, 0x1db8, 0x004e, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,</div><div class='del'>-	0x36bf, 0x60dc, 0xd0ac, 0x1188, 0x2009, 0x180d, 0x210c, 0xd18c,</div><div class='del'>-	0x0130, 0xd09c, 0x0120, 0x2009, 0x0016, 0x0804, 0x36bf, 0xd09c,</div><div class='del'>-	0x1120, 0x2009, 0x0005, 0x0804, 0x36bf, 0x7984, 0x78a8, 0x2040,</div><div class='del'>-	0x080c, 0xb094, 0x1120, 0x9182, 0x007f, 0x0a04, 0x36c2, 0x9186,</div><div class='del'>-	0x00ff, 0x0904, 0x36c2, 0x9182, 0x0800, 0x1a04, 0x36c2, 0x7a8c,</div><div class='del'>-	0x7b88, 0x607c, 0x9306, 0x1158, 0x6080, 0x924e, 0x0904, 0x36c2,</div><div class='del'>-	0x080c, 0xb094, 0x1120, 0x99cc, 0xff00, 0x0904, 0x36c2, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2001, 0x180d, 0x2004, 0xd08c, 0x0198, 0x9386,</div><div class='del'>-	0x00ff, 0x0180, 0x0026, 0x2011, 0x8008, 0x080c, 0x6c35, 0x002e,</div><div class='del'>-	0x0148, 0x918d, 0x8000, 0x080c, 0x6c7f, 0x1120, 0x2001, 0x4009,</div><div class='del'>-	0x0804, 0x4ac1, 0x080c, 0x4b54, 0x0904, 0x4ac7, 0x0086, 0x90c6,</div><div class='del'>-	0x4000, 0x008e, 0x1538, 0x00c6, 0x0006, 0x0036, 0xb818, 0xbb1c,</div><div class='del'>-	0x9305, 0xbb20, 0x9305, 0xbb24, 0x9305, 0xbb28, 0x9305, 0xbb2c,</div><div class='del'>-	0x9305, 0xbb30, 0x9305, 0xbb34, 0x9305, 0x003e, 0x0570, 0xd88c,</div><div class='del'>-	0x1128, 0x080c, 0x6c11, 0x0110, 0xc89d, 0x0438, 0x900e, 0x080c,</div><div class='del'>-	0x6aae, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x000e,</div><div class='del'>-	0x00ce, 0x00b8, 0x90c6, 0x4007, 0x1110, 0x2408, 0x0090, 0x90c6,</div><div class='del'>-	0x4008, 0x1118, 0x2708, 0x2610, 0x0060, 0x90c6, 0x4009, 0x1108,</div><div class='del'>-	0x0040, 0x90c6, 0x4006, 0x1108, 0x0020, 0x2001, 0x4005, 0x2009,</div><div class='del'>-	0x000a, 0x2020, 0x012e, 0x0804, 0x368f, 0x000e, 0x00ce, 0x2b00,</div><div class='del'>-	0x7026, 0x0016, 0x00b6, 0x00c6, 0x00e6, 0x2c70, 0x080c, 0xb1dd,</div><div class='del'>-	0x0904, 0x4b1c, 0x2b00, 0x6012, 0x080c, 0xd3b6, 0x2e58, 0x00ee,</div><div class='del'>-	0x00e6, 0x00c6, 0x080c, 0x4c41, 0x00ce, 0x2b70, 0x1158, 0x080c,</div><div class='del'>-	0xb16c, 0x00ee, 0x00ce, 0x00be, 0x001e, 0x012e, 0x2009, 0x0002,</div><div class='del'>-	0x0804, 0x36bf, 0x900e, 0xa966, 0xa96a, 0x2900, 0x6016, 0xa932,</div><div class='del'>-	0xa868, 0xc0fd, 0xd88c, 0x0108, 0xc0f5, 0xa86a, 0xd89c, 0x1110,</div><div class='del'>-	0x080c, 0x3315, 0x6023, 0x0001, 0x9006, 0x080c, 0x66e6, 0xd89c,</div><div class='del'>-	0x0138, 0x2001, 0x0004, 0x080c, 0x66fa, 0x2009, 0x0003, 0x0030,</div><div class='del'>-	0x2001, 0x0002, 0x080c, 0x66fa, 0x2009, 0x0002, 0x080c, 0xb20a,</div><div class='del'>-	0x78a8, 0xd094, 0x0138, 0x00ee, 0x7024, 0x00e6, 0x2058, 0xb8d4,</div><div class='del'>-	0xc08d, 0xb8d6, 0x9085, 0x0001, 0x00ee, 0x00ce, 0x00be, 0x001e,</div><div class='del'>-	0x012e, 0x1120, 0x2009, 0x0003, 0x0804, 0x36bf, 0x7007, 0x0003,</div><div class='del'>-	0x701f, 0x4b2b, 0x0005, 0xa830, 0x2009, 0x180d, 0x210c, 0xd18c,</div><div class='del'>-	0x0140, 0x2008, 0x918e, 0xdead, 0x1120, 0x2021, 0x4009, 0x0804,</div><div class='del'>-	0x368f, 0x9086, 0x0100, 0x7024, 0x2058, 0x1138, 0x2009, 0x0004,</div><div class='del'>-	0xba04, 0x9294, 0x00ff, 0x0804, 0x578e, 0x900e, 0xa868, 0xd0f4,</div><div class='del'>-	0x1904, 0x368d, 0x080c, 0x6aae, 0x1108, 0xc185, 0xb800, 0xd0bc,</div><div class='del'>-	0x0108, 0xc18d, 0x0804, 0x368d, 0x00e6, 0x00d6, 0x0096, 0x83ff,</div><div class='del'>-	0x0904, 0x4ba3, 0x902e, 0x080c, 0xb094, 0x0130, 0x9026, 0x20a9,</div><div class='del'>-	0x0800, 0x2071, 0x1000, 0x0030, 0x2021, 0x007f, 0x20a9, 0x0781,</div><div class='del'>-	0x2071, 0x107f, 0x2e04, 0x9005, 0x11b8, 0x2100, 0x9406, 0x1904,</div><div class='del'>-	0x4bb4, 0x2428, 0x94ce, 0x007f, 0x1120, 0x92ce, 0xfffd, 0x1558,</div><div class='del'>-	0x0030, 0x94ce, 0x0080, 0x1130, 0x92ce, 0xfffc, 0x1520, 0x93ce,</div><div class='del'>-	0x00ff, 0x1508, 0xc5fd, 0x0480, 0x2058, 0xbf10, 0x2700, 0x9306,</div><div class='del'>-	0x11e8, 0xbe14, 0x2600, 0x9206, 0x11c8, 0x2400, 0x9106, 0x1180,</div><div class='del'>-	0xd884, 0x0598, 0xd894, 0x1588, 0x080c, 0x6bb1, 0x1570, 0x2001,</div><div class='del'>-	0x4000, 0x0460, 0x080c, 0x6c11, 0x1540, 0x2001, 0x4000, 0x0430,</div><div class='del'>-	0x2001, 0x4007, 0x0418, 0x2001, 0x4006, 0x0400, 0x2400, 0x9106,</div><div class='del'>-	0x1158, 0xbe14, 0x87ff, 0x1128, 0x86ff, 0x0918, 0x080c, 0xb094,</div><div class='del'>-	0x1900, 0x2001, 0x4008, 0x0090, 0x8420, 0x8e70, 0x1f04, 0x4b6a,</div><div class='del'>-	0x85ff, 0x1130, 0x2001, 0x4009, 0x0048, 0x2001, 0x0001, 0x0030,</div><div class='del'>-	0x080c, 0x6749, 0x1dd0, 0xbb12, 0xba16, 0x9006, 0x9005, 0x009e,</div><div class='del'>-	0x00de, 0x00ee, 0x0005, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,</div><div class='del'>-	0x36bf, 0x080c, 0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf,</div><div class='del'>-	0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x7884, 0x9005, 0x0904,</div><div class='del'>-	0x36c2, 0x9096, 0x00ff, 0x0120, 0x9092, 0x0004, 0x1a04, 0x36c2,</div><div class='del'>-	0x2010, 0x2918, 0x080c, 0x32b5, 0x1120, 0x2009, 0x0003, 0x0804,</div><div class='del'>-	0x36bf, 0x7007, 0x0003, 0x701f, 0x4bf6, 0x0005, 0xa830, 0x9086,</div><div class='del'>-	0x0100, 0x1904, 0x368d, 0x2009, 0x0004, 0x0804, 0x36bf, 0x7984,</div><div class='del'>-	0x080c, 0xb094, 0x1120, 0x9182, 0x007f, 0x0a04, 0x36c2, 0x9186,</div><div class='del'>-	0x00ff, 0x0904, 0x36c2, 0x9182, 0x0800, 0x1a04, 0x36c2, 0x2001,</div><div class='del'>-	0x9400, 0x080c, 0x57e9, 0x1904, 0x36bf, 0x0804, 0x368d, 0xa998,</div><div class='del'>-	0x080c, 0xb094, 0x1118, 0x9182, 0x007f, 0x0280, 0x9186, 0x00ff,</div><div class='del'>-	0x0168, 0x9182, 0x0800, 0x1250, 0x2001, 0x9400, 0x080c, 0x57e9,</div><div class='del'>-	0x11a8, 0x0060, 0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x0005, 0xa897, 0x4000,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x2009, 0x000a,</div><div class='del'>-	0x0c48, 0x080c, 0x1059, 0x0198, 0x9006, 0xa802, 0x7014, 0x9005,</div><div class='del'>-	0x1120, 0x2900, 0x7016, 0x701a, 0x0040, 0x7018, 0xa802, 0x0086,</div><div class='del'>-	0x2040, 0x2900, 0xa006, 0x701a, 0x008e, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x7984, 0x080c, 0x67b4, 0x1130, 0x7e88, 0x9684, 0x3fff, 0x9082,</div><div class='del'>-	0x4000, 0x0208, 0x905e, 0x8bff, 0x0005, 0xa998, 0x080c, 0x67b4,</div><div class='del'>-	0x1130, 0xae9c, 0x9684, 0x3fff, 0x9082, 0x4000, 0x0208, 0x905e,</div><div class='del'>-	0x8bff, 0x0005, 0xae98, 0x0008, 0x7e84, 0x2608, 0x080c, 0x67b4,</div><div class='del'>-	0x1108, 0x0008, 0x905e, 0x8bff, 0x0005, 0x0016, 0x7114, 0x81ff,</div><div class='del'>-	0x0128, 0x2148, 0xa904, 0x080c, 0x108b, 0x0cc8, 0x7116, 0x711a,</div><div class='del'>-	0x001e, 0x0005, 0x2031, 0x0001, 0x0010, 0x2031, 0x0000, 0x2061,</div><div class='del'>-	0x18b8, 0x2c44, 0xa66a, 0xa17a, 0xa772, 0xa076, 0xa28e, 0xa392,</div><div class='del'>-	0xa496, 0xa59a, 0x080c, 0x114e, 0x7007, 0x0002, 0x701f, 0x368d,</div><div class='del'>-	0x0005, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2079, 0x0000, 0x2001,</div><div class='del'>-	0x18b0, 0x2004, 0x9005, 0x1190, 0x0e04, 0x4cbe, 0x7a36, 0x7833,</div><div class='del'>-	0x0012, 0x7a82, 0x7b86, 0x7c8a, 0x2091, 0x4080, 0x2001, 0x0089,</div><div class='del'>-	0x2004, 0xd084, 0x190c, 0x1200, 0x0804, 0x4d24, 0x0016, 0x0086,</div><div class='del'>-	0x0096, 0x00c6, 0x00e6, 0x2071, 0x189e, 0x7044, 0x9005, 0x1540,</div><div class='del'>-	0x7148, 0x9182, 0x0010, 0x0288, 0x7038, 0x2060, 0x080c, 0x1059,</div><div class='del'>-	0x0904, 0x4d1c, 0xa84b, 0x0000, 0x2900, 0x7046, 0x2001, 0x0002,</div><div class='del'>-	0x9080, 0x1ec1, 0x2005, 0xa846, 0x0098, 0x7038, 0x90e0, 0x0004,</div><div class='del'>-	0x2001, 0x18ba, 0x9c82, 0x18fa, 0x0210, 0x2061, 0x18ba, 0x2c00,</div><div class='del'>-	0x703a, 0x7148, 0x81ff, 0x1108, 0x703e, 0x8108, 0x714a, 0x0460,</div><div class='del'>-	0x7148, 0x8108, 0x714a, 0x7044, 0x2040, 0xa144, 0x2105, 0x0016,</div><div class='del'>-	0x908a, 0x0036, 0x1a0c, 0x0d85, 0x2060, 0x001e, 0x8108, 0x2105,</div><div class='del'>-	0x9005, 0xa146, 0x1520, 0x080c, 0x1059, 0x1130, 0x8109, 0xa946,</div><div class='del'>-	0x7148, 0x8109, 0x714a, 0x00d8, 0x9006, 0xa806, 0xa84a, 0xa046,</div><div class='del'>-	0x2800, 0xa802, 0x2900, 0xa006, 0x7046, 0x2001, 0x0002, 0x9080,</div><div class='del'>-	0x1ec1, 0x2005, 0xa846, 0x0058, 0x2262, 0x6306, 0x640a, 0x00ee,</div><div class='del'>-	0x00ce, 0x009e, 0x008e, 0x001e, 0x012e, 0x00fe, 0x0005, 0x2c00,</div><div class='del'>-	0x9082, 0x001b, 0x0002, 0x4d46, 0x4d46, 0x4d48, 0x4d46, 0x4d46,</div><div class='del'>-	0x4d46, 0x4d4c, 0x4d46, 0x4d46, 0x4d46, 0x4d50, 0x4d46, 0x4d46,</div><div class='del'>-	0x4d46, 0x4d54, 0x4d46, 0x4d46, 0x4d46, 0x4d58, 0x4d46, 0x4d46,</div><div class='del'>-	0x4d46, 0x4d5c, 0x4d46, 0x4d46, 0x4d46, 0x4d61, 0x080c, 0x0d85,</div><div class='del'>-	0xa276, 0xa37a, 0xa47e, 0x0898, 0xa286, 0xa38a, 0xa48e, 0x0878,</div><div class='del'>-	0xa296, 0xa39a, 0xa49e, 0x0858, 0xa2a6, 0xa3aa, 0xa4ae, 0x0838,</div><div class='del'>-	0xa2b6, 0xa3ba, 0xa4be, 0x0818, 0xa2c6, 0xa3ca, 0xa4ce, 0x0804,</div><div class='del'>-	0x4d1f, 0xa2d6, 0xa3da, 0xa4de, 0x0804, 0x4d1f, 0x00e6, 0x2071,</div><div class='del'>-	0x189e, 0x7048, 0x9005, 0x0904, 0x4df8, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0e04, 0x4df7, 0x00f6, 0x2079, 0x0000, 0x00c6, 0x0096, 0x0086,</div><div class='del'>-	0x0076, 0x9006, 0x2038, 0x7040, 0x2048, 0x9005, 0x0500, 0xa948,</div><div class='del'>-	0x2105, 0x0016, 0x908a, 0x0036, 0x1a0c, 0x0d85, 0x2060, 0x001e,</div><div class='del'>-	0x8108, 0x2105, 0x9005, 0xa94a, 0x1904, 0x4dfa, 0xa804, 0x9005,</div><div class='del'>-	0x090c, 0x0d85, 0x7042, 0x2938, 0x2040, 0xa003, 0x0000, 0x2001,</div><div class='del'>-	0x0002, 0x9080, 0x1ec1, 0x2005, 0xa04a, 0x0804, 0x4dfa, 0x703c,</div><div class='del'>-	0x2060, 0x2c14, 0x6304, 0x6408, 0x650c, 0x2200, 0x7836, 0x7833,</div><div class='del'>-	0x0012, 0x7882, 0x2300, 0x7886, 0x2400, 0x788a, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200, 0x87ff, 0x0118,</div><div class='del'>-	0x2748, 0x080c, 0x108b, 0x7048, 0x8001, 0x704a, 0x9005, 0x1170,</div><div class='del'>-	0x7040, 0x2048, 0x9005, 0x0128, 0x080c, 0x108b, 0x9006, 0x7042,</div><div class='del'>-	0x7046, 0x703b, 0x18ba, 0x703f, 0x18ba, 0x0420, 0x7040, 0x9005,</div><div class='del'>-	0x1508, 0x7238, 0x2c00, 0x9206, 0x0148, 0x9c80, 0x0004, 0x90fa,</div><div class='del'>-	0x18fa, 0x0210, 0x2001, 0x18ba, 0x703e, 0x00a0, 0x9006, 0x703e,</div><div class='del'>-	0x703a, 0x7044, 0x9005, 0x090c, 0x0d85, 0x2048, 0xa800, 0x9005,</div><div class='del'>-	0x1de0, 0x2900, 0x7042, 0x2001, 0x0002, 0x9080, 0x1ec1, 0x2005,</div><div class='del'>-	0xa84a, 0x0000, 0x007e, 0x008e, 0x009e, 0x00ce, 0x00fe, 0x012e,</div><div class='del'>-	0x00ee, 0x0005, 0x2c00, 0x9082, 0x001b, 0x0002, 0x4e19, 0x4e19,</div><div class='del'>-	0x4e1b, 0x4e19, 0x4e19, 0x4e19, 0x4e20, 0x4e19, 0x4e19, 0x4e19,</div><div class='del'>-	0x4e25, 0x4e19, 0x4e19, 0x4e19, 0x4e2a, 0x4e19, 0x4e19, 0x4e19,</div><div class='del'>-	0x4e2f, 0x4e19, 0x4e19, 0x4e19, 0x4e34, 0x4e19, 0x4e19, 0x4e19,</div><div class='del'>-	0x4e39, 0x080c, 0x0d85, 0xaa74, 0xab78, 0xac7c, 0x0804, 0x4da5,</div><div class='del'>-	0xaa84, 0xab88, 0xac8c, 0x0804, 0x4da5, 0xaa94, 0xab98, 0xac9c,</div><div class='del'>-	0x0804, 0x4da5, 0xaaa4, 0xaba8, 0xacac, 0x0804, 0x4da5, 0xaab4,</div><div class='del'>-	0xabb8, 0xacbc, 0x0804, 0x4da5, 0xaac4, 0xabc8, 0xaccc, 0x0804,</div><div class='del'>-	0x4da5, 0xaad4, 0xabd8, 0xacdc, 0x0804, 0x4da5, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x00b6, 0x00c6, 0x2009, 0x007e, 0x080c, 0x67b4, 0x2019,</div><div class='del'>-	0x0001, 0xb85c, 0xd0ac, 0x0110, 0x2019, 0x0000, 0x2011, 0x801b,</div><div class='del'>-	0x080c, 0x4ca1, 0x00ce, 0x00be, 0x003e, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x0026, 0x080c, 0x5840, 0xd0c4, 0x0120, 0x2011, 0x8014, 0x080c,</div><div class='del'>-	0x4ca1, 0x002e, 0x0005, 0x81ff, 0x1904, 0x36bf, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x6030, 0xc08d, 0xc085, 0xc0ac, 0x6032, 0x080c, 0x779e,</div><div class='del'>-	0x1158, 0x080c, 0x7ab6, 0x080c, 0x619d, 0x9085, 0x0001, 0x080c,</div><div class='del'>-	0x77e2, 0x080c, 0x76cd, 0x0010, 0x080c, 0x6058, 0x012e, 0x0804,</div><div class='del'>-	0x368d, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x36bf, 0x080c,</div><div class='del'>-	0x5854, 0x0120, 0x2009, 0x0007, 0x0804, 0x36bf, 0x080c, 0x6c09,</div><div class='del'>-	0x0120, 0x2009, 0x0008, 0x0804, 0x36bf, 0x2001, 0x180d, 0x2004,</div><div class='del'>-	0xd08c, 0x0178, 0x0026, 0x2011, 0x0010, 0x080c, 0x6c35, 0x002e,</div><div class='del'>-	0x0140, 0x7984, 0x080c, 0x6c7f, 0x1120, 0x2009, 0x4009, 0x0804,</div><div class='del'>-	0x36bf, 0x7984, 0x080c, 0x6749, 0x1904, 0x36c2, 0x080c, 0x4c74,</div><div class='del'>-	0x0904, 0x36c2, 0x2b00, 0x7026, 0x080c, 0x6c11, 0x7888, 0x1170,</div><div class='del'>-	0x9084, 0x0005, 0x1158, 0x900e, 0x080c, 0x6aae, 0x1108, 0xc185,</div><div class='del'>-	0xb800, 0xd0bc, 0x0108, 0xc18d, 0x0804, 0x368d, 0x080c, 0x4c41,</div><div class='del'>-	0x0904, 0x36bf, 0x9006, 0xa866, 0xa832, 0xa868, 0xc0fd, 0xa86a,</div><div class='del'>-	0x080c, 0xd154, 0x0904, 0x36bf, 0x7888, 0xd094, 0x0118, 0xb8d4,</div><div class='del'>-	0xc08d, 0xb8d6, 0x7007, 0x0003, 0x701f, 0x4f28, 0x0005, 0x2061,</div><div class='del'>-	0x1800, 0x080c, 0x5854, 0x2009, 0x0007, 0x1560, 0x080c, 0x6c09,</div><div class='del'>-	0x0118, 0x2009, 0x0008, 0x0430, 0xa998, 0x080c, 0x6749, 0x1530,</div><div class='del'>-	0x080c, 0x4c72, 0x0518, 0x080c, 0x6c11, 0xa89c, 0x1168, 0x9084,</div><div class='del'>-	0x0005, 0x1150, 0x900e, 0x080c, 0x6aae, 0x1108, 0xc185, 0xb800,</div><div class='del'>-	0xd0bc, 0x0108, 0xc18d, 0x00d0, 0xa868, 0xc0fc, 0xa86a, 0x080c,</div><div class='del'>-	0xd154, 0x11e0, 0xa89c, 0xd094, 0x0118, 0xb8d4, 0xc08d, 0xb8d6,</div><div class='del'>-	0x2009, 0x0003, 0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x0005, 0xa897, 0x4000,</div><div class='del'>-	0xa99a, 0x9006, 0x918d, 0x0001, 0x2008, 0x0005, 0x9006, 0x0005,</div><div class='del'>-	0xa830, 0x2009, 0x180d, 0x210c, 0xd18c, 0x0140, 0x2008, 0x918e,</div><div class='del'>-	0xdead, 0x1120, 0x2021, 0x4009, 0x0804, 0x368f, 0x9086, 0x0100,</div><div class='del'>-	0x7024, 0x2058, 0x1110, 0x0804, 0x578e, 0x900e, 0x080c, 0x6aae,</div><div class='del'>-	0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x0804, 0x368d,</div><div class='del'>-	0x080c, 0x5854, 0x0120, 0x2009, 0x0007, 0x0804, 0x36bf, 0x7f84,</div><div class='del'>-	0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x080c, 0x4c41, 0x1120, 0x2009,</div><div class='del'>-	0x0002, 0x0804, 0x36bf, 0x900e, 0x2130, 0x7126, 0x7132, 0xa860,</div><div class='del'>-	0x20e8, 0x7036, 0xa85c, 0x9080, 0x0005, 0x702a, 0x20a0, 0x080c,</div><div class='del'>-	0x67b4, 0x1904, 0x4fde, 0x080c, 0x6c11, 0x0138, 0x080c, 0x6c19,</div><div class='del'>-	0x0120, 0x080c, 0x6bb1, 0x1904, 0x4fde, 0xd794, 0x1110, 0xd784,</div><div class='del'>-	0x01a8, 0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x0006, 0x2098, 0x3400,</div><div class='del'>-	0xd794, 0x0198, 0x20a9, 0x0008, 0x4003, 0x2098, 0x20a0, 0x3d00,</div><div class='del'>-	0x20e0, 0x20a9, 0x0002, 0x080c, 0x4a10, 0x0080, 0xb8c4, 0x20e0,</div><div class='del'>-	0xb8c8, 0x9080, 0x000a, 0x2098, 0x3400, 0x20a9, 0x0004, 0x4003,</div><div class='del'>-	0x2098, 0x20a0, 0x3d00, 0x20e0, 0x080c, 0x4a10, 0x9186, 0x007e,</div><div class='del'>-	0x0170, 0x9186, 0x0080, 0x0158, 0x080c, 0x6c11, 0x90c2, 0x0006,</div><div class='del'>-	0x1210, 0xc1fd, 0x0020, 0x080c, 0x6aae, 0x1108, 0xc1fd, 0x4104,</div><div class='del'>-	0xc1fc, 0xd794, 0x0528, 0xb8c4, 0x20e0, 0xb8c8, 0x2060, 0x9c80,</div><div class='del'>-	0x0000, 0x2098, 0x20a9, 0x0002, 0x4003, 0x9c80, 0x0003, 0x2098,</div><div class='del'>-	0x20a9, 0x0001, 0x4005, 0x9c80, 0x0004, 0x2098, 0x3400, 0x20a9,</div><div class='del'>-	0x0002, 0x4003, 0x2098, 0x20a0, 0x3d00, 0x20e0, 0x080c, 0x4a03,</div><div class='del'>-	0x9c80, 0x0026, 0x2098, 0xb8c4, 0x20e0, 0x20a9, 0x0002, 0x4003,</div><div class='del'>-	0xd794, 0x0110, 0x96b0, 0x000b, 0x96b0, 0x0005, 0x8108, 0x080c,</div><div class='del'>-	0xb094, 0x0118, 0x9186, 0x0800, 0x0040, 0xd78c, 0x0120, 0x9186,</div><div class='del'>-	0x0800, 0x0170, 0x0018, 0x9186, 0x007e, 0x0150, 0xd794, 0x0118,</div><div class='del'>-	0x9686, 0x0020, 0x0010, 0x9686, 0x0028, 0x0150, 0x0804, 0x4f67,</div><div class='del'>-	0x86ff, 0x1120, 0x7124, 0x810b, 0x0804, 0x368d, 0x7033, 0x0001,</div><div class='del'>-	0x7122, 0x7024, 0x9600, 0x7026, 0x772e, 0x2061, 0x18b8, 0x2c44,</div><div class='del'>-	0xa06b, 0x0000, 0xa67a, 0x7034, 0xa072, 0x7028, 0xa076, 0xa28e,</div><div class='del'>-	0xa392, 0xa496, 0xa59a, 0x080c, 0x114e, 0x7007, 0x0002, 0x701f,</div><div class='del'>-	0x501a, 0x0005, 0x7030, 0x9005, 0x1180, 0x7120, 0x7028, 0x20a0,</div><div class='del'>-	0x772c, 0x9036, 0x7034, 0x20e8, 0x2061, 0x18b8, 0x2c44, 0xa28c,</div><div class='del'>-	0xa390, 0xa494, 0xa598, 0x0804, 0x4f67, 0x7124, 0x810b, 0x0804,</div><div class='del'>-	0x368d, 0x2029, 0x007e, 0x7984, 0x7a88, 0x7b8c, 0x7c98, 0x9184,</div><div class='del'>-	0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04, 0x36c2, 0x9502, 0x0a04,</div><div class='del'>-	0x36c2, 0x9184, 0x00ff, 0x90e2, 0x0020, 0x0a04, 0x36c2, 0x9502,</div><div class='del'>-	0x0a04, 0x36c2, 0x9284, 0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04,</div><div class='del'>-	0x36c2, 0x9502, 0x0a04, 0x36c2, 0x9284, 0x00ff, 0x90e2, 0x0020,</div><div class='del'>-	0x0a04, 0x36c2, 0x9502, 0x0a04, 0x36c2, 0x9384, 0xff00, 0x8007,</div><div class='del'>-	0x90e2, 0x0020, 0x0a04, 0x36c2, 0x9502, 0x0a04, 0x36c2, 0x9384,</div><div class='del'>-	0x00ff, 0x90e2, 0x0020, 0x0a04, 0x36c2, 0x9502, 0x0a04, 0x36c2,</div><div class='del'>-	0x9484, 0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04, 0x36c2, 0x9502,</div><div class='del'>-	0x0a04, 0x36c2, 0x9484, 0x00ff, 0x90e2, 0x0020, 0x0a04, 0x36c2,</div><div class='del'>-	0x9502, 0x0a04, 0x36c2, 0x2061, 0x1989, 0x6102, 0x6206, 0x630a,</div><div class='del'>-	0x640e, 0x0804, 0x368d, 0x080c, 0x4c41, 0x0904, 0x36bf, 0x2009,</div><div class='del'>-	0x0016, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080, 0x0019,</div><div class='del'>-	0xaf60, 0x080c, 0x4c8a, 0x701f, 0x509e, 0x0005, 0x20a9, 0x0016,</div><div class='del'>-	0x896e, 0x8d6e, 0x8d6f, 0x9d84, 0xffc0, 0x9080, 0x0019, 0x2098,</div><div class='del'>-	0x9d84, 0x003f, 0x20e0, 0x2069, 0x1877, 0x20e9, 0x0001, 0x2da0,</div><div class='del'>-	0x4003, 0x6800, 0x9005, 0x0904, 0x5105, 0x6804, 0x2008, 0x918c,</div><div class='del'>-	0xfff8, 0x1904, 0x5105, 0x680c, 0x9005, 0x0904, 0x5105, 0x9082,</div><div class='del'>-	0xff01, 0x1a04, 0x5105, 0x6810, 0x9082, 0x005c, 0x06f0, 0x6824,</div><div class='del'>-	0x2008, 0x9082, 0x0008, 0x06c8, 0x9182, 0x0400, 0x16b0, 0x0056,</div><div class='del'>-	0x2029, 0x0000, 0x080c, 0x9077, 0x005e, 0x6944, 0x6820, 0x9102,</div><div class='del'>-	0x0660, 0x6820, 0x9082, 0x0019, 0x1640, 0x6828, 0x6944, 0x810c,</div><div class='del'>-	0x9102, 0x0618, 0x6840, 0x9082, 0x000f, 0x12f8, 0x080c, 0x1072,</div><div class='del'>-	0x2900, 0x0590, 0x684e, 0x00e6, 0x2071, 0x1931, 0x00b6, 0x2059,</div><div class='del'>-	0x0000, 0x080c, 0x8f33, 0x00be, 0x00ee, 0x01e8, 0x080c, 0x8c78,</div><div class='del'>-	0x080c, 0x8cc7, 0x1160, 0x6857, 0x0000, 0x00c6, 0x6b10, 0x2061,</div><div class='del'>-	0x1a6e, 0x630e, 0x00ce, 0x0804, 0x368d, 0x0804, 0x36c2, 0x080c,</div><div class='del'>-	0x8cc0, 0x00e6, 0x2071, 0x1931, 0x080c, 0x90f7, 0x080c, 0x9106,</div><div class='del'>-	0x080c, 0x8f18, 0x00ee, 0x2001, 0x188a, 0x204c, 0x080c, 0x108b,</div><div class='del'>-	0x2001, 0x188a, 0x2003, 0x0000, 0x0804, 0x36bf, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x94b8, 0x080c, 0x8cc0, 0x012e, 0x0804, 0x368d,</div><div class='del'>-	0x0006, 0x080c, 0x5840, 0xd0cc, 0x000e, 0x0005, 0x0006, 0x080c,</div><div class='del'>-	0x5844, 0xd0bc, 0x000e, 0x0005, 0x6174, 0x7a84, 0x6300, 0x82ff,</div><div class='del'>-	0x1118, 0x7986, 0x0804, 0x368d, 0x83ff, 0x1904, 0x36c2, 0x2001,</div><div class='del'>-	0xfff0, 0x9200, 0x1a04, 0x36c2, 0x2019, 0xffff, 0x6078, 0x9302,</div><div class='del'>-	0x9200, 0x0a04, 0x36c2, 0x7986, 0x6276, 0x0804, 0x368d, 0x080c,</div><div class='del'>-	0x5854, 0x1904, 0x36bf, 0x7c88, 0x7d84, 0x7e98, 0x7f8c, 0x080c,</div><div class='del'>-	0x4c41, 0x0904, 0x36bf, 0x900e, 0x901e, 0x7326, 0x7332, 0xa860,</div><div class='del'>-	0x20e8, 0x7036, 0xa85c, 0x9080, 0x0003, 0x702a, 0x20a0, 0x91d8,</div><div class='del'>-	0x1000, 0x2b5c, 0x8bff, 0x0178, 0x080c, 0x6c11, 0x0118, 0x080c,</div><div class='del'>-	0x6c19, 0x1148, 0x20a9, 0x0001, 0xb814, 0x4004, 0xb810, 0x4004,</div><div class='del'>-	0x4104, 0x9398, 0x0003, 0x8108, 0x9182, 0x0800, 0x0120, 0x9386,</div><div class='del'>-	0x003c, 0x0170, 0x0c20, 0x83ff, 0x1148, 0x7224, 0x900e, 0x2001,</div><div class='del'>-	0x0003, 0x080c, 0x955b, 0x2208, 0x0804, 0x368d, 0x7033, 0x0001,</div><div class='del'>-	0x7122, 0x7024, 0x9300, 0x7026, 0x2061, 0x18b8, 0x2c44, 0xa06b,</div><div class='del'>-	0x0000, 0xa37a, 0x7028, 0xa076, 0x7034, 0xa072, 0xa48e, 0xa592,</div><div class='del'>-	0xa696, 0xa79a, 0x080c, 0x114e, 0x7007, 0x0002, 0x701f, 0x51a9,</div><div class='del'>-	0x0005, 0x7030, 0x9005, 0x1178, 0x7120, 0x7028, 0x20a0, 0x901e,</div><div class='del'>-	0x7034, 0x20e8, 0x2061, 0x18b8, 0x2c44, 0xa48c, 0xa590, 0xa694,</div><div class='del'>-	0xa798, 0x0804, 0x5167, 0x7224, 0x900e, 0x2001, 0x0003, 0x080c,</div><div class='del'>-	0x955b, 0x2208, 0x0804, 0x368d, 0x00f6, 0x00e6, 0x080c, 0x5854,</div><div class='del'>-	0x2009, 0x0007, 0x1904, 0x523c, 0x2071, 0x189e, 0x745c, 0x84ff,</div><div class='del'>-	0x2009, 0x000e, 0x1904, 0x523c, 0xac9c, 0xad98, 0xaea4, 0xafa0,</div><div class='del'>-	0x0096, 0x080c, 0x1072, 0x2009, 0x0002, 0x0904, 0x523c, 0x2900,</div><div class='del'>-	0x705e, 0x900e, 0x901e, 0x7356, 0x7362, 0xa860, 0x7066, 0xa85c,</div><div class='del'>-	0x9080, 0x0003, 0x705a, 0x20a0, 0x91d8, 0x1000, 0x2b5c, 0x8bff,</div><div class='del'>-	0x0178, 0x080c, 0x6c11, 0x0118, 0x080c, 0x6c19, 0x1148, 0xb814,</div><div class='del'>-	0x20a9, 0x0001, 0x4004, 0xb810, 0x4004, 0x4104, 0x9398, 0x0003,</div><div class='del'>-	0x8108, 0x9182, 0x0800, 0x0120, 0x9386, 0x003c, 0x01e8, 0x0c20,</div><div class='del'>-	0x83ff, 0x11c0, 0x7254, 0x900e, 0x2001, 0x0003, 0x080c, 0x955b,</div><div class='del'>-	0x2208, 0x009e, 0xa897, 0x4000, 0xa99a, 0x715c, 0x81ff, 0x090c,</div><div class='del'>-	0x0d85, 0x2148, 0x080c, 0x108b, 0x9006, 0x705e, 0x918d, 0x0001,</div><div class='del'>-	0x2008, 0x0418, 0x7063, 0x0001, 0x7152, 0x7054, 0x9300, 0x7056,</div><div class='del'>-	0x2061, 0x18b9, 0x2c44, 0xa37a, 0x7058, 0xa076, 0x7064, 0xa072,</div><div class='del'>-	0xa48e, 0xa592, 0xa696, 0xa79a, 0xa09f, 0x5248, 0x000e, 0xa0a2,</div><div class='del'>-	0x080c, 0x114e, 0x9006, 0x0048, 0x009e, 0xa897, 0x4005, 0xa99a,</div><div class='del'>-	0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0xa0a0, 0x904d, 0x090c, 0x0d85, 0x00e6, 0x2071, 0x189e,</div><div class='del'>-	0xa06c, 0x908e, 0x0100, 0x0138, 0xa87b, 0x0030, 0xa883, 0x0000,</div><div class='del'>-	0xa897, 0x4002, 0x00d8, 0x7060, 0x9005, 0x1158, 0x7150, 0x7058,</div><div class='del'>-	0x20a0, 0x901e, 0x7064, 0x20e8, 0xa48c, 0xa590, 0xa694, 0xa798,</div><div class='del'>-	0x0428, 0xa87b, 0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0x7254,</div><div class='del'>-	0x900e, 0x2001, 0x0003, 0x080c, 0x955b, 0xaa9a, 0x715c, 0x81ff,</div><div class='del'>-	0x090c, 0x0d85, 0x2148, 0x080c, 0x108b, 0x705f, 0x0000, 0xa0a0,</div><div class='del'>-	0x2048, 0x0126, 0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0xa09f,</div><div class='del'>-	0x0000, 0xa0a3, 0x0000, 0x00ee, 0x00fe, 0x0005, 0x91d8, 0x1000,</div><div class='del'>-	0x2b5c, 0x8bff, 0x0178, 0x080c, 0x6c11, 0x0118, 0x080c, 0x6c19,</div><div class='del'>-	0x1148, 0xb814, 0x20a9, 0x0001, 0x4004, 0xb810, 0x4004, 0x4104,</div><div class='del'>-	0x9398, 0x0003, 0x8108, 0x9182, 0x0800, 0x0120, 0x9386, 0x003c,</div><div class='del'>-	0x0518, 0x0c20, 0x83ff, 0x11f0, 0x7154, 0x810c, 0xa99a, 0xa897,</div><div class='del'>-	0x4000, 0x715c, 0x81ff, 0x090c, 0x0d85, 0x2148, 0x080c, 0x108b,</div><div class='del'>-	0x9006, 0x705e, 0x918d, 0x0001, 0x2008, 0xa0a0, 0x2048, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0xa09f, 0x0000, 0xa0a3,</div><div class='del'>-	0x0000, 0x0070, 0x7063, 0x0001, 0x7152, 0x7054, 0x9300, 0x7056,</div><div class='del'>-	0xa37a, 0xa48e, 0xa592, 0xa696, 0xa79a, 0x080c, 0x114e, 0x9006,</div><div class='del'>-	0x00ee, 0x0005, 0x0096, 0xa88c, 0x90be, 0x7000, 0x0148, 0x90be,</div><div class='del'>-	0x7100, 0x0130, 0x90be, 0x7200, 0x0118, 0x009e, 0x0804, 0x36c2,</div><div class='del'>-	0xa884, 0xa988, 0x080c, 0x268c, 0x1518, 0x080c, 0x6749, 0x1500,</div><div class='del'>-	0x7126, 0xbe12, 0xbd16, 0xae7c, 0x080c, 0x4c41, 0x01c8, 0x080c,</div><div class='del'>-	0x4c41, 0x01b0, 0x009e, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a,</div><div class='del'>-	0xa823, 0x0000, 0xa804, 0x2048, 0x080c, 0xd0cd, 0x1120, 0x2009,</div><div class='del'>-	0x0003, 0x0804, 0x36bf, 0x7007, 0x0003, 0x701f, 0x5315, 0x0005,</div><div class='del'>-	0x009e, 0x2009, 0x0002, 0x0804, 0x36bf, 0x7124, 0x080c, 0x341e,</div><div class='del'>-	0xa820, 0x9086, 0x8001, 0x1120, 0x2009, 0x0004, 0x0804, 0x36bf,</div><div class='del'>-	0x2900, 0x7022, 0xa804, 0x0096, 0x2048, 0x8906, 0x8006, 0x8007,</div><div class='del'>-	0x90bc, 0x003f, 0x9084, 0xffc0, 0x009e, 0x9080, 0x0002, 0x0076,</div><div class='del'>-	0x0006, 0x2098, 0x20a0, 0x27e0, 0x27e8, 0x20a9, 0x002a, 0x080c,</div><div class='del'>-	0x0fd6, 0xaa6c, 0xab70, 0xac74, 0xad78, 0x2061, 0x18b8, 0x2c44,</div><div class='del'>-	0xa06b, 0x0000, 0xae64, 0xaf8c, 0x97c6, 0x7000, 0x0118, 0x97c6,</div><div class='del'>-	0x7100, 0x1148, 0x96c2, 0x0004, 0x0600, 0x2009, 0x0004, 0x000e,</div><div class='del'>-	0x007e, 0x0804, 0x4c8d, 0x97c6, 0x7200, 0x11b8, 0x96c2, 0x0054,</div><div class='del'>-	0x02a0, 0x000e, 0x007e, 0x2061, 0x18b8, 0x2c44, 0xa076, 0xa772,</div><div class='del'>-	0xa07b, 0x002a, 0xa28e, 0xa392, 0xa496, 0xa59a, 0x080c, 0x114e,</div><div class='del'>-	0x7007, 0x0002, 0x701f, 0x5371, 0x0005, 0x000e, 0x007e, 0x0804,</div><div class='del'>-	0x36c2, 0x7020, 0x2048, 0xa804, 0x2048, 0xa804, 0x2048, 0x8906,</div><div class='del'>-	0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002,</div><div class='del'>-	0x2098, 0x20a0, 0x27e0, 0x27e8, 0x20a9, 0x002a, 0x080c, 0x0fd6,</div><div class='del'>-	0x2100, 0x2238, 0x2061, 0x18b8, 0x2c44, 0xa28c, 0xa390, 0xa494,</div><div class='del'>-	0xa598, 0x2009, 0x002a, 0x0804, 0x4c8d, 0x81ff, 0x1904, 0x36bf,</div><div class='del'>-	0x798c, 0x2001, 0x197e, 0x918c, 0x8000, 0x2102, 0x080c, 0x4c58,</div><div class='del'>-	0x0904, 0x36c2, 0x080c, 0x6c11, 0x0120, 0x080c, 0x6c19, 0x1904,</div><div class='del'>-	0x36c2, 0x080c, 0x687b, 0x0904, 0x36bf, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x6a1b, 0x012e, 0x0904, 0x36bf, 0x2001, 0x197e, 0x2004,</div><div class='del'>-	0xd0fc, 0x1904, 0x368d, 0x0804, 0x46aa, 0xa9a0, 0x2001, 0x197e,</div><div class='del'>-	0x918c, 0x8000, 0xc18d, 0x2102, 0x080c, 0x4c65, 0x01a0, 0x080c,</div><div class='del'>-	0x6c11, 0x0118, 0x080c, 0x6c19, 0x1170, 0x080c, 0x687b, 0x2009,</div><div class='del'>-	0x0002, 0x0128, 0x080c, 0x6a1b, 0x1170, 0x2009, 0x0003, 0xa897,</div><div class='del'>-	0x4005, 0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001,</div><div class='del'>-	0x2001, 0x0030, 0x0005, 0xa897, 0x4000, 0x2001, 0x197e, 0x2004,</div><div class='del'>-	0xd0fc, 0x1128, 0x080c, 0x5848, 0x0110, 0x9006, 0x0018, 0x900e,</div><div class='del'>-	0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x78a8, 0xd08c, 0x1118,</div><div class='del'>-	0xd084, 0x0904, 0x461f, 0x080c, 0x4c74, 0x0904, 0x36c2, 0x080c,</div><div class='del'>-	0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf, 0x080c, 0x6c11,</div><div class='del'>-	0x0130, 0x908e, 0x0004, 0x0118, 0x908e, 0x0005, 0x15a0, 0x78a8,</div><div class='del'>-	0xd08c, 0x0120, 0xb800, 0xc08c, 0xb802, 0x0028, 0x080c, 0x5840,</div><div class='del'>-	0xd0b4, 0x0904, 0x4659, 0x7884, 0x908e, 0x007e, 0x0904, 0x4659,</div><div class='del'>-	0x908e, 0x007f, 0x0904, 0x4659, 0x908e, 0x0080, 0x0904, 0x4659,</div><div class='del'>-	0xb800, 0xd08c, 0x1904, 0x4659, 0xa867, 0x0000, 0xa868, 0xc0fd,</div><div class='del'>-	0xa86a, 0x080c, 0xd0ec, 0x1120, 0x2009, 0x0003, 0x0804, 0x36bf,</div><div class='del'>-	0x7007, 0x0003, 0x701f, 0x543d, 0x0005, 0x080c, 0x4c74, 0x0904,</div><div class='del'>-	0x36c2, 0x0804, 0x4659, 0x080c, 0x347d, 0x0108, 0x0005, 0x2009,</div><div class='del'>-	0x1834, 0x210c, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x36bf,</div><div class='del'>-	0x080c, 0x5854, 0x0120, 0x2009, 0x0007, 0x0804, 0x36bf, 0x080c,</div><div class='del'>-	0x6c09, 0x0120, 0x2009, 0x0008, 0x0804, 0x36bf, 0xb89c, 0xd0a4,</div><div class='del'>-	0x1118, 0xd0ac, 0x1904, 0x4659, 0x9006, 0xa866, 0xa832, 0xa868,</div><div class='del'>-	0xc0fd, 0xa86a, 0x080c, 0xd154, 0x1120, 0x2009, 0x0003, 0x0804,</div><div class='del'>-	0x36bf, 0x7007, 0x0003, 0x701f, 0x5476, 0x0005, 0xa830, 0x9086,</div><div class='del'>-	0x0100, 0x1120, 0x2009, 0x0004, 0x0804, 0x578e, 0x080c, 0x4c74,</div><div class='del'>-	0x0904, 0x36c2, 0x0804, 0x540f, 0x81ff, 0x2009, 0x0001, 0x1904,</div><div class='del'>-	0x36bf, 0x080c, 0x5854, 0x2009, 0x0007, 0x1904, 0x36bf, 0x080c,</div><div class='del'>-	0x6c09, 0x0120, 0x2009, 0x0008, 0x0804, 0x36bf, 0x080c, 0x4c74,</div><div class='del'>-	0x0904, 0x36c2, 0x080c, 0x6c11, 0x2009, 0x0009, 0x1904, 0x36bf,</div><div class='del'>-	0x080c, 0x4c41, 0x2009, 0x0002, 0x0904, 0x36bf, 0x9006, 0xa866,</div><div class='del'>-	0xa832, 0xa868, 0xc0fd, 0xa86a, 0x7988, 0xa95a, 0x9194, 0xfd00,</div><div class='del'>-	0x918c, 0x00ff, 0x9006, 0x82ff, 0x1128, 0xc0ed, 0xa952, 0x798c,</div><div class='del'>-	0xa956, 0x0038, 0x928e, 0x0100, 0x1904, 0x36c2, 0xc0e5, 0xa952,</div><div class='del'>-	0xa956, 0xa83e, 0x080c, 0xd3b7, 0x2009, 0x0003, 0x0904, 0x36bf,</div><div class='del'>-	0x7007, 0x0003, 0x701f, 0x54cd, 0x0005, 0xa830, 0x9086, 0x0100,</div><div class='del'>-	0x2009, 0x0004, 0x0904, 0x36bf, 0x0804, 0x368d, 0x7aa8, 0x9284,</div><div class='del'>-	0xc000, 0x0148, 0xd2ec, 0x01a0, 0x080c, 0x5854, 0x1188, 0x2009,</div><div class='del'>-	0x0014, 0x0804, 0x36bf, 0xd2dc, 0x1578, 0x81ff, 0x2009, 0x0001,</div><div class='del'>-	0x1904, 0x36bf, 0x080c, 0x5854, 0x2009, 0x0007, 0x1904, 0x36bf,</div><div class='del'>-	0xd2f4, 0x0138, 0x9284, 0x5000, 0xc0d5, 0x080c, 0x581a, 0x0804,</div><div class='del'>-	0x368d, 0xd2fc, 0x0160, 0x080c, 0x4c74, 0x0904, 0x36c2, 0x7984,</div><div class='del'>-	0x9284, 0x9000, 0xc0d5, 0x080c, 0x57e9, 0x0804, 0x368d, 0x080c,</div><div class='del'>-	0x4c74, 0x0904, 0x36c2, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006,</div><div class='del'>-	0x2009, 0x0009, 0x1904, 0x55bc, 0x080c, 0x4c41, 0x2009, 0x0002,</div><div class='del'>-	0x0904, 0x55bc, 0xa85c, 0x9080, 0x001b, 0xaf60, 0x2009, 0x0008,</div><div class='del'>-	0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x080c, 0x4c8a, 0x701f, 0x5529,</div><div class='del'>-	0x0005, 0xa86c, 0x9086, 0x0500, 0x1138, 0xa870, 0x9005, 0x1120,</div><div class='del'>-	0xa874, 0x9084, 0xff00, 0x0110, 0x1904, 0x36c2, 0xa866, 0xa832,</div><div class='del'>-	0xa868, 0xc0fd, 0xa86a, 0x080c, 0x4c74, 0x1110, 0x0804, 0x36c2,</div><div class='del'>-	0x2009, 0x0043, 0x080c, 0xd423, 0x2009, 0x0003, 0x0904, 0x55bc,</div><div class='del'>-	0x7007, 0x0003, 0x701f, 0x554d, 0x0005, 0xa830, 0x9086, 0x0100,</div><div class='del'>-	0x2009, 0x0004, 0x0904, 0x55bc, 0x7984, 0x7aa8, 0x9284, 0x1000,</div><div class='del'>-	0xc0d5, 0x080c, 0x57e9, 0x0804, 0x368d, 0x00c6, 0xaab0, 0x9284,</div><div class='del'>-	0xc000, 0x0148, 0xd2ec, 0x0170, 0x080c, 0x5854, 0x1158, 0x2009,</div><div class='del'>-	0x0014, 0x0804, 0x55ab, 0x2061, 0x1800, 0x080c, 0x5854, 0x2009,</div><div class='del'>-	0x0007, 0x15c8, 0xd2f4, 0x0130, 0x9284, 0x5000, 0xc0d5, 0x080c,</div><div class='del'>-	0x581a, 0x0058, 0xd2fc, 0x0180, 0x080c, 0x4c72, 0x0590, 0xa998,</div><div class='del'>-	0x9284, 0x9000, 0xc0d5, 0x080c, 0x57e9, 0xa87b, 0x0000, 0xa883,</div><div class='del'>-	0x0000, 0xa897, 0x4000, 0x0438, 0x080c, 0x4c72, 0x0510, 0x080c,</div><div class='del'>-	0x6c11, 0x2009, 0x0009, 0x11b8, 0xa8c4, 0x9086, 0x0500, 0x11c8,</div><div class='del'>-	0xa8c8, 0x9005, 0x11b0, 0xa8cc, 0x9084, 0xff00, 0x1190, 0x080c,</div><div class='del'>-	0x4c72, 0x1108, 0x0070, 0x2009, 0x004b, 0x080c, 0xd423, 0x2009,</div><div class='del'>-	0x0003, 0x0108, 0x0078, 0x0431, 0x19c0, 0xa897, 0x4005, 0xa99a,</div><div class='del'>-	0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030,</div><div class='del'>-	0x00ce, 0x0005, 0x9006, 0x0ce0, 0x7aa8, 0xd2dc, 0x0904, 0x36bf,</div><div class='del'>-	0x0016, 0x7984, 0x9284, 0x1000, 0xc0fd, 0x080c, 0x57e9, 0x001e,</div><div class='del'>-	0x1904, 0x36bf, 0x0804, 0x368d, 0x00f6, 0x2d78, 0xaab0, 0x0021,</div><div class='del'>-	0x00fe, 0x0005, 0xaab0, 0xc2d5, 0xd2dc, 0x0150, 0x0016, 0xa998,</div><div class='del'>-	0x9284, 0x1400, 0xc0fd, 0x080c, 0x57e9, 0x001e, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x36bf, 0x080c,</div><div class='del'>-	0x5854, 0x0120, 0x2009, 0x0007, 0x0804, 0x36bf, 0x7984, 0x7ea8,</div><div class='del'>-	0x96b4, 0x00ff, 0x080c, 0x67b4, 0x1904, 0x36c2, 0x9186, 0x007f,</div><div class='del'>-	0x0138, 0x080c, 0x6c11, 0x0120, 0x2009, 0x0009, 0x0804, 0x36bf,</div><div class='del'>-	0x080c, 0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf, 0xa867,</div><div class='del'>-	0x0000, 0xa868, 0xc0fd, 0xa86a, 0x2001, 0x0100, 0x8007, 0xa80a,</div><div class='del'>-	0x080c, 0xd106, 0x1120, 0x2009, 0x0003, 0x0804, 0x36bf, 0x7007,</div><div class='del'>-	0x0003, 0x701f, 0x561c, 0x0005, 0xa808, 0x8007, 0x9086, 0x0100,</div><div class='del'>-	0x1120, 0x2009, 0x0004, 0x0804, 0x36bf, 0xa8e0, 0xa866, 0xa810,</div><div class='del'>-	0x8007, 0x9084, 0x00ff, 0x800c, 0xa814, 0x8007, 0x9084, 0x00ff,</div><div class='del'>-	0x8004, 0x9080, 0x0002, 0x9108, 0x8906, 0x8006, 0x8007, 0x90bc,</div><div class='del'>-	0x003f, 0x9084, 0xffc0, 0x9080, 0x0004, 0x7a8c, 0x7b88, 0x7c9c,</div><div class='del'>-	0x7d98, 0x0804, 0x4c8d, 0x080c, 0x4c41, 0x1120, 0x2009, 0x0002,</div><div class='del'>-	0x0804, 0x36bf, 0x7984, 0x9194, 0xff00, 0x918c, 0x00ff, 0x8217,</div><div class='del'>-	0x82ff, 0x1118, 0x7023, 0x19b4, 0x0040, 0x92c6, 0x0001, 0x1118,</div><div class='del'>-	0x7023, 0x19ce, 0x0010, 0x0804, 0x36c2, 0x2009, 0x001a, 0x7a8c,</div><div class='del'>-	0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c,</div><div class='del'>-	0x4c8a, 0x701f, 0x566c, 0x0005, 0x2001, 0x182e, 0x2003, 0x0001,</div><div class='del'>-	0xa85c, 0x9080, 0x0019, 0x2098, 0xa860, 0x20e0, 0x20a9, 0x001a,</div><div class='del'>-	0x7020, 0x20a0, 0x20e9, 0x0001, 0x4003, 0x0804, 0x368d, 0x080c,</div><div class='del'>-	0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf, 0x7984, 0x9194,</div><div class='del'>-	0xff00, 0x918c, 0x00ff, 0x8217, 0x82ff, 0x1118, 0x2099, 0x19b4,</div><div class='del'>-	0x0040, 0x92c6, 0x0001, 0x1118, 0x2099, 0x19ce, 0x0010, 0x0804,</div><div class='del'>-	0x36c2, 0xa85c, 0x9080, 0x0019, 0x20a0, 0xa860, 0x20e8, 0x20a9,</div><div class='del'>-	0x001a, 0x20e1, 0x0001, 0x4003, 0x2009, 0x001a, 0x7a8c, 0x7b88,</div><div class='del'>-	0x7c9c, 0x7d98, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x0804, 0x4c8d,</div><div class='del'>-	0x7884, 0x908a, 0x1000, 0x1a04, 0x36c2, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x8003, 0x800b, 0x810b, 0x9108, 0x00c6, 0x2061, 0x1a04, 0x614a,</div><div class='del'>-	0x00ce, 0x012e, 0x0804, 0x368d, 0x00c6, 0x080c, 0x779e, 0x1160,</div><div class='del'>-	0x080c, 0x7ab6, 0x080c, 0x619d, 0x9085, 0x0001, 0x080c, 0x77e2,</div><div class='del'>-	0x080c, 0x76cd, 0x080c, 0x0d85, 0x2061, 0x1800, 0x6030, 0xc09d,</div><div class='del'>-	0x6032, 0x080c, 0x6058, 0x00ce, 0x0005, 0x00c6, 0x2001, 0x1800,</div><div class='del'>-	0x2004, 0x908e, 0x0000, 0x0904, 0x36bf, 0x7884, 0x9005, 0x0188,</div><div class='del'>-	0x7888, 0x2061, 0x199c, 0x2c0c, 0x2062, 0x080c, 0x2a67, 0x01a0,</div><div class='del'>-	0x080c, 0x2a6f, 0x0188, 0x080c, 0x2a77, 0x0170, 0x2162, 0x0804,</div><div class='del'>-	0x36c2, 0x2061, 0x0100, 0x6038, 0x9086, 0x0007, 0x1118, 0x2009,</div><div class='del'>-	0x0001, 0x0010, 0x2009, 0x0000, 0x7884, 0x9086, 0x0002, 0x15a8,</div><div class='del'>-	0x2061, 0x0100, 0x6028, 0xc09c, 0x602a, 0x080c, 0xacfc, 0x0026,</div><div class='del'>-	0x2011, 0x0003, 0x080c, 0xa62b, 0x2011, 0x0002, 0x080c, 0xa635,</div><div class='del'>-	0x002e, 0x080c, 0xa516, 0x0036, 0x901e, 0x080c, 0xa596, 0x003e,</div><div class='del'>-	0x080c, 0xad18, 0x60e3, 0x0000, 0x080c, 0xeed9, 0x080c, 0xeef4,</div><div class='del'>-	0x9085, 0x0001, 0x080c, 0x77e2, 0x9006, 0x080c, 0x2a99, 0x2001,</div><div class='del'>-	0x1800, 0x2003, 0x0004, 0x2001, 0x19a8, 0x2003, 0x0000, 0x0026,</div><div class='del'>-	0x2011, 0x0008, 0x080c, 0x2ad3, 0x002e, 0x00ce, 0x0804, 0x368d,</div><div class='del'>-	0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x36bf, 0x080c, 0x5854,</div><div class='del'>-	0x0120, 0x2009, 0x0007, 0x0804, 0x36bf, 0x7984, 0x7ea8, 0x96b4,</div><div class='del'>-	0x00ff, 0x080c, 0x67b4, 0x1904, 0x36c2, 0x9186, 0x007f, 0x0138,</div><div class='del'>-	0x080c, 0x6c11, 0x0120, 0x2009, 0x0009, 0x0804, 0x36bf, 0x080c,</div><div class='del'>-	0x4c41, 0x1120, 0x2009, 0x0002, 0x0804, 0x36bf, 0xa867, 0x0000,</div><div class='del'>-	0xa868, 0xc0fd, 0xa86a, 0x080c, 0xd109, 0x1120, 0x2009, 0x0003,</div><div class='del'>-	0x0804, 0x36bf, 0x7007, 0x0003, 0x701f, 0x5777, 0x0005, 0xa830,</div><div class='del'>-	0x9086, 0x0100, 0x1120, 0x2009, 0x0004, 0x0804, 0x36bf, 0xa8e0,</div><div class='del'>-	0xa866, 0xa834, 0x8007, 0x800c, 0xa85c, 0x9080, 0x000c, 0x7a8c,</div><div class='del'>-	0x7b88, 0x7c9c, 0x7d98, 0xaf60, 0x0804, 0x4c8d, 0xa898, 0x9086,</div><div class='del'>-	0x000d, 0x1904, 0x36bf, 0x2021, 0x4005, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x0e04, 0x579b, 0x0010, 0x012e, 0x0cc0, 0x7c36, 0x9486, 0x4000,</div><div class='del'>-	0x0118, 0x7833, 0x0011, 0x0010, 0x7833, 0x0010, 0x7883, 0x4005,</div><div class='del'>-	0xa998, 0x7986, 0xa9a4, 0x799a, 0xa9a8, 0x799e, 0x080c, 0x4c7d,</div><div class='del'>-	0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200,</div><div class='del'>-	0x7007, 0x0001, 0x2091, 0x5000, 0x700f, 0x0000, 0x012e, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x00c6, 0x2061, 0x1a04, 0x7984, 0x615a,</div><div class='del'>-	0x6156, 0x605f, 0x0000, 0x6053, 0x0009, 0x7898, 0x6072, 0x789c,</div><div class='del'>-	0x606e, 0x7888, 0x606a, 0x788c, 0x6066, 0x2001, 0x1a14, 0x2044,</div><div class='del'>-	0x2001, 0x1a1b, 0xa076, 0xa060, 0xa072, 0xa07b, 0x0001, 0xa07f,</div><div class='del'>-	0x0002, 0xa06b, 0x0000, 0xa09f, 0x0000, 0x00ce, 0x012e, 0x0804,</div><div class='del'>-	0x368d, 0x0126, 0x2091, 0x8000, 0x00b6, 0x00c6, 0x90e4, 0xc000,</div><div class='del'>-	0x0198, 0x0006, 0xd0d4, 0x0160, 0x0036, 0x2019, 0x0029, 0x080c,</div><div class='del'>-	0xacfc, 0x0106, 0x080c, 0x3442, 0x010e, 0x090c, 0xad18, 0x003e,</div><div class='del'>-	0x080c, 0xcf68, 0x000e, 0x1198, 0xd0e4, 0x0160, 0x9180, 0x1000,</div><div class='del'>-	0x2004, 0x905d, 0x0160, 0x080c, 0x61b7, 0x080c, 0xb094, 0x0110,</div><div class='del'>-	0xb817, 0x0000, 0x9006, 0x00ce, 0x00be, 0x012e, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0cc8, 0x0126, 0x2091, 0x8000, 0x0156, 0x2010, 0x900e,</div><div class='del'>-	0x20a9, 0x0800, 0x0016, 0x9180, 0x1000, 0x2004, 0x9005, 0x0188,</div><div class='del'>-	0x9186, 0x007e, 0x0170, 0x9186, 0x007f, 0x0158, 0x9186, 0x0080,</div><div class='del'>-	0x0140, 0x9186, 0x00ff, 0x0128, 0x0026, 0x2200, 0x080c, 0x57e9,</div><div class='del'>-	0x002e, 0x001e, 0x8108, 0x1f04, 0x5822, 0x015e, 0x012e, 0x0005,</div><div class='del'>-	0x2001, 0x1848, 0x2004, 0x0005, 0x2001, 0x1867, 0x2004, 0x0005,</div><div class='del'>-	0x0006, 0x2001, 0x1810, 0x2004, 0xd0d4, 0x000e, 0x0005, 0x2001,</div><div class='del'>-	0x180e, 0x2004, 0xd0b4, 0x0005, 0x2001, 0x1800, 0x2004, 0x9086,</div><div class='del'>-	0x0003, 0x0005, 0x0016, 0x00e6, 0x2071, 0x189e, 0x7108, 0x910d,</div><div class='del'>-	0x710a, 0x00ee, 0x001e, 0x0005, 0x79a4, 0x81ff, 0x0904, 0x36c2,</div><div class='del'>-	0x9182, 0x0081, 0x1a04, 0x36c2, 0x810c, 0x0016, 0x080c, 0x4c41,</div><div class='del'>-	0x0170, 0x080c, 0x0f61, 0x2100, 0x2238, 0x7d84, 0x7c88, 0x7b8c,</div><div class='del'>-	0x7a90, 0x001e, 0x080c, 0x4c8a, 0x701f, 0x5884, 0x0005, 0x001e,</div><div class='del'>-	0x2009, 0x0002, 0x0804, 0x36bf, 0x2079, 0x0000, 0x7d94, 0x7c98,</div><div class='del'>-	0x7ba8, 0x7aac, 0x79a4, 0x810c, 0x2061, 0x18b8, 0x2c44, 0xa770,</div><div class='del'>-	0xa074, 0x2071, 0x189e, 0x080c, 0x4c8d, 0x701f, 0x5898, 0x0005,</div><div class='del'>-	0x2061, 0x18b8, 0x2c44, 0x0016, 0x0026, 0xa270, 0xa174, 0x080c,</div><div class='del'>-	0x0f69, 0x002e, 0x001e, 0x080c, 0x1016, 0x9006, 0xa802, 0xa806,</div><div class='del'>-	0x0804, 0x368d, 0x0126, 0x0156, 0x0136, 0x0146, 0x01c6, 0x01d6,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2061, 0x0100, 0x2069, 0x0200,</div><div class='del'>-	0x2071, 0x1800, 0x6044, 0xd0a4, 0x11e8, 0xd084, 0x0118, 0x080c,</div><div class='del'>-	0x5a58, 0x0068, 0xd08c, 0x0118, 0x080c, 0x5961, 0x0040, 0xd094,</div><div class='del'>-	0x0118, 0x080c, 0x5931, 0x0018, 0xd09c, 0x0108, 0x0099, 0x00fe,</div><div class='del'>-	0x00ee, 0x00de, 0x00ce, 0x01de, 0x01ce, 0x014e, 0x013e, 0x015e,</div><div class='del'>-	0x012e, 0x0005, 0x0016, 0x6128, 0xd19c, 0x1110, 0xc19d, 0x612a,</div><div class='del'>-	0x001e, 0x0c68, 0x7030, 0xd09c, 0x1120, 0x6004, 0x9085, 0x0002,</div><div class='del'>-	0x6006, 0x7098, 0x9005, 0x0120, 0x709b, 0x0000, 0x7093, 0x0000,</div><div class='del'>-	0x624c, 0x9286, 0xf0f0, 0x1150, 0x6048, 0x9086, 0xf0f0, 0x0130,</div><div class='del'>-	0x624a, 0x6043, 0x0090, 0x6043, 0x0010, 0x0490, 0x9294, 0xff00,</div><div class='del'>-	0x9296, 0xf700, 0x0178, 0x7138, 0xd1a4, 0x1160, 0x6240, 0x9295,</div><div class='del'>-	0x0100, 0x6242, 0x9294, 0x0010, 0x0128, 0x2009, 0x00f7, 0x080c,</div><div class='del'>-	0x6119, 0x00f0, 0x6040, 0x9084, 0x0010, 0x9085, 0x0140, 0x6042,</div><div class='del'>-	0x6043, 0x0000, 0x7087, 0x0000, 0x70a3, 0x0001, 0x70c7, 0x0000,</div><div class='del'>-	0x70df, 0x0000, 0x2009, 0x1d80, 0x200b, 0x0000, 0x7097, 0x0000,</div><div class='del'>-	0x708b, 0x000f, 0x2009, 0x000f, 0x2011, 0x5ffb, 0x080c, 0x8a5d,</div><div class='del'>-	0x0005, 0x2001, 0x1869, 0x2004, 0xd08c, 0x0110, 0x705f, 0xffff,</div><div class='del'>-	0x7088, 0x9005, 0x1528, 0x2011, 0x5ffb, 0x080c, 0x8993, 0x6040,</div><div class='del'>-	0x9094, 0x0010, 0x9285, 0x0020, 0x6042, 0x20a9, 0x00c8, 0x6044,</div><div class='del'>-	0xd08c, 0x1168, 0x1f04, 0x5947, 0x6242, 0x709b, 0x0000, 0x6040,</div><div class='del'>-	0x9094, 0x0010, 0x9285, 0x0080, 0x6042, 0x6242, 0x0048, 0x6242,</div><div class='del'>-	0x709b, 0x0000, 0x708f, 0x0000, 0x9006, 0x080c, 0x61a2, 0x0000,</div><div class='del'>-	0x0005, 0x708c, 0x908a, 0x0003, 0x1a0c, 0x0d85, 0x000b, 0x0005,</div><div class='del'>-	0x596b, 0x59bc, 0x5a57, 0x00f6, 0x0016, 0x6900, 0x918c, 0x0800,</div><div class='del'>-	0x708f, 0x0001, 0x2001, 0x015d, 0x2003, 0x0000, 0x6803, 0x00fc,</div><div class='del'>-	0x20a9, 0x0004, 0x6800, 0x9084, 0x00fc, 0x0120, 0x1f04, 0x597a,</div><div class='del'>-	0x080c, 0x0d85, 0x68a0, 0x68a2, 0x689c, 0x689e, 0x6898, 0x689a,</div><div class='del'>-	0xa001, 0x918d, 0x1600, 0x6902, 0x001e, 0x6837, 0x0020, 0x080c,</div><div class='del'>-	0x617e, 0x2079, 0x1d00, 0x7833, 0x1101, 0x7837, 0x0000, 0x20e1,</div><div class='del'>-	0x0001, 0x2099, 0x1805, 0x20e9, 0x0001, 0x20a1, 0x1d0e, 0x20a9,</div><div class='del'>-	0x0004, 0x4003, 0x080c, 0xaaf1, 0x20e1, 0x0001, 0x2099, 0x1d00,</div><div class='del'>-	0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x0014, 0x4003, 0x60c3,</div><div class='del'>-	0x000c, 0x600f, 0x0000, 0x080c, 0x602c, 0x00fe, 0x9006, 0x7092,</div><div class='del'>-	0x6043, 0x0008, 0x6042, 0x0005, 0x00f6, 0x7090, 0x7093, 0x0000,</div><div class='del'>-	0x9025, 0x0904, 0x5a34, 0x6020, 0xd0b4, 0x1904, 0x5a32, 0x71a0,</div><div class='del'>-	0x81ff, 0x0904, 0x5a20, 0x9486, 0x000c, 0x1904, 0x5a2d, 0x9480,</div><div class='del'>-	0x0018, 0x8004, 0x20a8, 0x080c, 0x6177, 0x2011, 0x0260, 0x2019,</div><div class='del'>-	0x1d00, 0x220c, 0x2304, 0x9106, 0x11e8, 0x8210, 0x8318, 0x1f04,</div><div class='del'>-	0x59d9, 0x6043, 0x0004, 0x2061, 0x0140, 0x605b, 0xbc94, 0x605f,</div><div class='del'>-	0xf0f0, 0x2061, 0x0100, 0x6043, 0x0006, 0x708f, 0x0002, 0x709b,</div><div class='del'>-	0x0002, 0x2009, 0x07d0, 0x2011, 0x6002, 0x080c, 0x8a5d, 0x080c,</div><div class='del'>-	0x617e, 0x04c0, 0x080c, 0x6177, 0x2079, 0x0260, 0x7930, 0x918e,</div><div class='del'>-	0x1101, 0x1558, 0x7834, 0x9005, 0x1540, 0x7900, 0x918c, 0x00ff,</div><div class='del'>-	0x1118, 0x7804, 0x9005, 0x0190, 0x080c, 0x6177, 0x2011, 0x026e,</div><div class='del'>-	0x2019, 0x1805, 0x20a9, 0x0004, 0x220c, 0x2304, 0x9102, 0x0230,</div><div class='del'>-	0x11a0, 0x8210, 0x8318, 0x1f04, 0x5a14, 0x0078, 0x70a3, 0x0000,</div><div class='del'>-	0x080c, 0x6177, 0x20e1, 0x0000, 0x2099, 0x0260, 0x20e9, 0x0001,</div><div class='del'>-	0x20a1, 0x1d00, 0x20a9, 0x0014, 0x4003, 0x6043, 0x0008, 0x6043,</div><div class='del'>-	0x0000, 0x0010, 0x00fe, 0x0005, 0x6040, 0x9085, 0x0100, 0x6042,</div><div class='del'>-	0x6020, 0xd0b4, 0x1db8, 0x080c, 0xaaf1, 0x20e1, 0x0001, 0x2099,</div><div class='del'>-	0x1d00, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x0014, 0x4003,</div><div class='del'>-	0x60c3, 0x000c, 0x2011, 0x19f5, 0x2013, 0x0000, 0x7093, 0x0000,</div><div class='del'>-	0x60a3, 0x0056, 0x60a7, 0x9575, 0x080c, 0xa293, 0x08d8, 0x0005,</div><div class='del'>-	0x7098, 0x908a, 0x001d, 0x1a0c, 0x0d85, 0x000b, 0x0005, 0x5a89,</div><div class='del'>-	0x5a9c, 0x5ac5, 0x5ae5, 0x5b0b, 0x5b3a, 0x5b60, 0x5b98, 0x5bbe,</div><div class='del'>-	0x5bec, 0x5c27, 0x5c5f, 0x5c7d, 0x5ca8, 0x5cca, 0x5ce5, 0x5cef,</div><div class='del'>-	0x5d23, 0x5d49, 0x5d78, 0x5d9e, 0x5dd6, 0x5e1a, 0x5e57, 0x5e78,</div><div class='del'>-	0x5ed1, 0x5ef3, 0x5f21, 0x5f21, 0x00c6, 0x2061, 0x1800, 0x6003,</div><div class='del'>-	0x0007, 0x2061, 0x0100, 0x6004, 0x9084, 0xfff9, 0x6006, 0x00ce,</div><div class='del'>-	0x0005, 0x2061, 0x0140, 0x605b, 0xbc94, 0x605f, 0xf0f0, 0x2061,</div><div class='del'>-	0x0100, 0x6043, 0x0002, 0x709b, 0x0001, 0x2009, 0x07d0, 0x2011,</div><div class='del'>-	0x6002, 0x080c, 0x8a5d, 0x0005, 0x00f6, 0x7090, 0x9086, 0x0014,</div><div class='del'>-	0x1510, 0x6042, 0x6020, 0xd0b4, 0x11f0, 0x080c, 0x6177, 0x2079,</div><div class='del'>-	0x0260, 0x7a30, 0x9296, 0x1102, 0x11a0, 0x7834, 0x9005, 0x1188,</div><div class='del'>-	0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001,</div><div class='del'>-	0x2011, 0x6002, 0x080c, 0x8993, 0x709b, 0x0010, 0x080c, 0x5cef,</div><div class='del'>-	0x0010, 0x7093, 0x0000, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x0003,</div><div class='del'>-	0x6043, 0x0004, 0x2011, 0x6002, 0x080c, 0x8993, 0x080c, 0x60fb,</div><div class='del'>-	0x2079, 0x0240, 0x7833, 0x1102, 0x7837, 0x0000, 0x20a9, 0x0008,</div><div class='del'>-	0x9f88, 0x000e, 0x200b, 0x0000, 0x8108, 0x1f04, 0x5ada, 0x60c3,</div><div class='del'>-	0x0014, 0x080c, 0x602c, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005,</div><div class='del'>-	0x0500, 0x2011, 0x6002, 0x080c, 0x8993, 0x9086, 0x0014, 0x11b8,</div><div class='del'>-	0x080c, 0x6177, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1102, 0x1178,</div><div class='del'>-	0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005,</div><div class='del'>-	0x1110, 0x70c7, 0x0001, 0x709b, 0x0004, 0x0029, 0x0010, 0x080c,</div><div class='del'>-	0x6153, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x0005, 0x080c, 0x60fb,</div><div class='del'>-	0x2079, 0x0240, 0x7833, 0x1103, 0x7837, 0x0000, 0x080c, 0x6177,</div><div class='del'>-	0x080c, 0x615a, 0x1170, 0x7084, 0x9005, 0x1158, 0x715c, 0x9186,</div><div class='del'>-	0xffff, 0x0138, 0x2011, 0x0008, 0x080c, 0x5faf, 0x0168, 0x080c,</div><div class='del'>-	0x6130, 0x20a9, 0x0008, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9,</div><div class='del'>-	0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x602c,</div><div class='del'>-	0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005, 0x0500, 0x2011, 0x6002,</div><div class='del'>-	0x080c, 0x8993, 0x9086, 0x0014, 0x11b8, 0x080c, 0x6177, 0x2079,</div><div class='del'>-	0x0260, 0x7a30, 0x9296, 0x1103, 0x1178, 0x7834, 0x9005, 0x1160,</div><div class='del'>-	0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001,</div><div class='del'>-	0x709b, 0x0006, 0x0029, 0x0010, 0x080c, 0x6153, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x709b, 0x0007, 0x080c, 0x60fb, 0x2079, 0x0240, 0x7833,</div><div class='del'>-	0x1104, 0x7837, 0x0000, 0x080c, 0x6177, 0x080c, 0x615a, 0x11b8,</div><div class='del'>-	0x7084, 0x9005, 0x11a0, 0x7164, 0x9186, 0xffff, 0x0180, 0x9180,</div><div class='del'>-	0x348e, 0x200d, 0x918c, 0xff00, 0x810f, 0x2011, 0x0008, 0x080c,</div><div class='del'>-	0x5faf, 0x0180, 0x080c, 0x512e, 0x0110, 0x080c, 0x26f5, 0x20a9,</div><div class='del'>-	0x0008, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x602c, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x7090, 0x9005, 0x0500, 0x2011, 0x6002, 0x080c, 0x8993,</div><div class='del'>-	0x9086, 0x0014, 0x11b8, 0x080c, 0x6177, 0x2079, 0x0260, 0x7a30,</div><div class='del'>-	0x9296, 0x1104, 0x1178, 0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc,</div><div class='del'>-	0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x709b, 0x0008,</div><div class='del'>-	0x0029, 0x0010, 0x080c, 0x6153, 0x00fe, 0x0005, 0x00f6, 0x709b,</div><div class='del'>-	0x0009, 0x080c, 0x60fb, 0x2079, 0x0240, 0x7833, 0x1105, 0x7837,</div><div class='del'>-	0x0100, 0x080c, 0x615a, 0x1150, 0x7084, 0x9005, 0x1138, 0x080c,</div><div class='del'>-	0x5f22, 0x1188, 0x9085, 0x0001, 0x080c, 0x26f5, 0x20a9, 0x0008,</div><div class='del'>-	0x080c, 0x6177, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x602c, 0x0010,</div><div class='del'>-	0x080c, 0x5a7c, 0x00fe, 0x0005, 0x00f6, 0x7090, 0x9005, 0x05a8,</div><div class='del'>-	0x2011, 0x6002, 0x080c, 0x8993, 0x9086, 0x0014, 0x1560, 0x080c,</div><div class='del'>-	0x6177, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1105, 0x1520, 0x7834,</div><div class='del'>-	0x9084, 0x0100, 0x2011, 0x0100, 0x921e, 0x1160, 0x7a38, 0xd2fc,</div><div class='del'>-	0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x709b, 0x000a,</div><div class='del'>-	0x00b1, 0x0098, 0x9005, 0x1178, 0x7a38, 0xd2fc, 0x0128, 0x70c4,</div><div class='del'>-	0x9005, 0x1110, 0x70c7, 0x0001, 0x7097, 0x0000, 0x709b, 0x000e,</div><div class='del'>-	0x080c, 0x5cca, 0x0010, 0x080c, 0x6153, 0x00fe, 0x0005, 0x00f6,</div><div class='del'>-	0x709b, 0x000b, 0x2011, 0x1d0e, 0x20e9, 0x0001, 0x22a0, 0x20a9,</div><div class='del'>-	0x0040, 0x2019, 0xffff, 0x4304, 0x080c, 0x60fb, 0x2079, 0x0240,</div><div class='del'>-	0x7833, 0x1106, 0x7837, 0x0000, 0x080c, 0x615a, 0x0118, 0x2013,</div><div class='del'>-	0x0000, 0x0020, 0x7060, 0x9085, 0x0100, 0x2012, 0x20a9, 0x0040,</div><div class='del'>-	0x2009, 0x024e, 0x2011, 0x1d0e, 0x220e, 0x8210, 0x8108, 0x9186,</div><div class='del'>-	0x0260, 0x1128, 0x6810, 0x8000, 0x6812, 0x2009, 0x0240, 0x1f04,</div><div class='del'>-	0x5c4c, 0x60c3, 0x0084, 0x080c, 0x602c, 0x00fe, 0x0005, 0x00f6,</div><div class='del'>-	0x7090, 0x9005, 0x01c0, 0x2011, 0x6002, 0x080c, 0x8993, 0x9086,</div><div class='del'>-	0x0084, 0x1178, 0x080c, 0x6177, 0x2079, 0x0260, 0x7a30, 0x9296,</div><div class='del'>-	0x1106, 0x1138, 0x7834, 0x9005, 0x1120, 0x709b, 0x000c, 0x0029,</div><div class='del'>-	0x0010, 0x080c, 0x6153, 0x00fe, 0x0005, 0x00f6, 0x709b, 0x000d,</div><div class='del'>-	0x080c, 0x60fb, 0x2079, 0x0240, 0x7833, 0x1107, 0x7837, 0x0000,</div><div class='del'>-	0x080c, 0x6177, 0x20a9, 0x0040, 0x2011, 0x026e, 0x2009, 0x024e,</div><div class='del'>-	0x220e, 0x8210, 0x8108, 0x9186, 0x0260, 0x1150, 0x6810, 0x8000,</div><div class='del'>-	0x6812, 0x2009, 0x0240, 0x6814, 0x8000, 0x6816, 0x2011, 0x0260,</div><div class='del'>-	0x1f04, 0x5c90, 0x60c3, 0x0084, 0x080c, 0x602c, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x7090, 0x9005, 0x01e0, 0x2011, 0x6002, 0x080c, 0x8993,</div><div class='del'>-	0x9086, 0x0084, 0x1198, 0x080c, 0x6177, 0x2079, 0x0260, 0x7a30,</div><div class='del'>-	0x9296, 0x1107, 0x1158, 0x7834, 0x9005, 0x1140, 0x7097, 0x0001,</div><div class='del'>-	0x080c, 0x60cd, 0x709b, 0x000e, 0x0029, 0x0010, 0x080c, 0x6153,</div><div class='del'>-	0x00fe, 0x0005, 0x918d, 0x0001, 0x080c, 0x61a2, 0x709b, 0x000f,</div><div class='del'>-	0x7093, 0x0000, 0x2061, 0x0140, 0x605b, 0xbc85, 0x605f, 0xb5b5,</div><div class='del'>-	0x2061, 0x0100, 0x6043, 0x0005, 0x6043, 0x0004, 0x2009, 0x07d0,</div><div class='del'>-	0x2011, 0x6002, 0x080c, 0x8987, 0x0005, 0x7090, 0x9005, 0x0130,</div><div class='del'>-	0x2011, 0x6002, 0x080c, 0x8993, 0x709b, 0x0000, 0x0005, 0x709b,</div><div class='del'>-	0x0011, 0x080c, 0xaaf1, 0x080c, 0x6177, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x0260, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x7490, 0x9480, 0x0018,</div><div class='del'>-	0x9080, 0x0007, 0x9084, 0x03f8, 0x8004, 0x20a8, 0x4003, 0x080c,</div><div class='del'>-	0x615a, 0x11a0, 0x717c, 0x81ff, 0x0188, 0x900e, 0x7080, 0x9084,</div><div class='del'>-	0x00ff, 0x0160, 0x080c, 0x268c, 0x9186, 0x007e, 0x0138, 0x9186,</div><div class='del'>-	0x0080, 0x0120, 0x2011, 0x0008, 0x080c, 0x5faf, 0x60c3, 0x0014,</div><div class='del'>-	0x080c, 0x602c, 0x0005, 0x00f6, 0x7090, 0x9005, 0x0500, 0x2011,</div><div class='del'>-	0x6002, 0x080c, 0x8993, 0x9086, 0x0014, 0x11b8, 0x080c, 0x6177,</div><div class='del'>-	0x2079, 0x0260, 0x7a30, 0x9296, 0x1103, 0x1178, 0x7834, 0x9005,</div><div class='del'>-	0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7,</div><div class='del'>-	0x0001, 0x709b, 0x0012, 0x0029, 0x0010, 0x7093, 0x0000, 0x00fe,</div><div class='del'>-	0x0005, 0x00f6, 0x709b, 0x0013, 0x080c, 0x6109, 0x2079, 0x0240,</div><div class='del'>-	0x7833, 0x1103, 0x7837, 0x0000, 0x080c, 0x6177, 0x080c, 0x615a,</div><div class='del'>-	0x1170, 0x7084, 0x9005, 0x1158, 0x715c, 0x9186, 0xffff, 0x0138,</div><div class='del'>-	0x2011, 0x0008, 0x080c, 0x5faf, 0x0168, 0x080c, 0x6130, 0x20a9,</div><div class='del'>-	0x0008, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x602c, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x7090, 0x9005, 0x0500, 0x2011, 0x6002, 0x080c, 0x8993,</div><div class='del'>-	0x9086, 0x0014, 0x11b8, 0x080c, 0x6177, 0x2079, 0x0260, 0x7a30,</div><div class='del'>-	0x9296, 0x1104, 0x1178, 0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc,</div><div class='del'>-	0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x709b, 0x0014,</div><div class='del'>-	0x0029, 0x0010, 0x7093, 0x0000, 0x00fe, 0x0005, 0x00f6, 0x709b,</div><div class='del'>-	0x0015, 0x080c, 0x6109, 0x2079, 0x0240, 0x7833, 0x1104, 0x7837,</div><div class='del'>-	0x0000, 0x080c, 0x6177, 0x080c, 0x615a, 0x11b8, 0x7084, 0x9005,</div><div class='del'>-	0x11a0, 0x7164, 0x9186, 0xffff, 0x0180, 0x9180, 0x348e, 0x200d,</div><div class='del'>-	0x918c, 0xff00, 0x810f, 0x2011, 0x0008, 0x080c, 0x5faf, 0x0180,</div><div class='del'>-	0x080c, 0x512e, 0x0110, 0x080c, 0x26f5, 0x20a9, 0x0008, 0x20e1,</div><div class='del'>-	0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003,</div><div class='del'>-	0x60c3, 0x0014, 0x080c, 0x602c, 0x00fe, 0x0005, 0x00f6, 0x7090,</div><div class='del'>-	0x9005, 0x05f0, 0x2011, 0x6002, 0x080c, 0x8993, 0x9086, 0x0014,</div><div class='del'>-	0x15a8, 0x080c, 0x6177, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1105,</div><div class='del'>-	0x1568, 0x7834, 0x9084, 0x0100, 0x2011, 0x0100, 0x921e, 0x1168,</div><div class='del'>-	0x9085, 0x0001, 0x080c, 0x61a2, 0x7a38, 0xd2fc, 0x0128, 0x70c4,</div><div class='del'>-	0x9005, 0x1110, 0x70c7, 0x0001, 0x0080, 0x9005, 0x11b8, 0x7a38,</div><div class='del'>-	0xd2fc, 0x0128, 0x70c4, 0x9005, 0x1110, 0x70c7, 0x0001, 0x9085,</div><div class='del'>-	0x0001, 0x080c, 0x61a2, 0x7097, 0x0000, 0x7a38, 0xd2f4, 0x0110,</div><div class='del'>-	0x70df, 0x0008, 0x709b, 0x0016, 0x0029, 0x0010, 0x7093, 0x0000,</div><div class='del'>-	0x00fe, 0x0005, 0x080c, 0xaaf1, 0x080c, 0x6177, 0x20e1, 0x0000,</div><div class='del'>-	0x2099, 0x0260, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000e,</div><div class='del'>-	0x4003, 0x2011, 0x026d, 0x2204, 0x9084, 0x0100, 0x2011, 0x024d,</div><div class='del'>-	0x2012, 0x2011, 0x026e, 0x709b, 0x0017, 0x080c, 0x615a, 0x1150,</div><div class='del'>-	0x7084, 0x9005, 0x1138, 0x080c, 0x5f22, 0x1188, 0x9085, 0x0001,</div><div class='del'>-	0x080c, 0x26f5, 0x20a9, 0x0008, 0x080c, 0x6177, 0x20e1, 0x0000,</div><div class='del'>-	0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3,</div><div class='del'>-	0x0014, 0x080c, 0x602c, 0x0010, 0x080c, 0x5a7c, 0x0005, 0x00f6,</div><div class='del'>-	0x7090, 0x9005, 0x01d8, 0x2011, 0x6002, 0x080c, 0x8993, 0x9086,</div><div class='del'>-	0x0084, 0x1190, 0x080c, 0x6177, 0x2079, 0x0260, 0x7a30, 0x9296,</div><div class='del'>-	0x1106, 0x1150, 0x7834, 0x9005, 0x1138, 0x9006, 0x080c, 0x61a2,</div><div class='del'>-	0x709b, 0x0018, 0x0029, 0x0010, 0x7093, 0x0000, 0x00fe, 0x0005,</div><div class='del'>-	0x00f6, 0x709b, 0x0019, 0x080c, 0x6109, 0x2079, 0x0240, 0x7833,</div><div class='del'>-	0x1106, 0x7837, 0x0000, 0x080c, 0x6177, 0x2009, 0x026e, 0x2039,</div><div class='del'>-	0x1d0e, 0x20a9, 0x0040, 0x213e, 0x8738, 0x8108, 0x9186, 0x0280,</div><div class='del'>-	0x1128, 0x6814, 0x8000, 0x6816, 0x2009, 0x0260, 0x1f04, 0x5e8b,</div><div class='del'>-	0x2039, 0x1d0e, 0x080c, 0x615a, 0x11e8, 0x2728, 0x2514, 0x8207,</div><div class='del'>-	0x9084, 0x00ff, 0x8000, 0x2018, 0x9294, 0x00ff, 0x8007, 0x9205,</div><div class='del'>-	0x202a, 0x7060, 0x2310, 0x8214, 0x92a0, 0x1d0e, 0x2414, 0x938c,</div><div class='del'>-	0x0001, 0x0118, 0x9294, 0xff00, 0x0018, 0x9294, 0x00ff, 0x8007,</div><div class='del'>-	0x9215, 0x2222, 0x20a9, 0x0040, 0x2009, 0x024e, 0x270e, 0x8738,</div><div class='del'>-	0x8108, 0x9186, 0x0260, 0x1128, 0x6810, 0x8000, 0x6812, 0x2009,</div><div class='del'>-	0x0240, 0x1f04, 0x5ebe, 0x60c3, 0x0084, 0x080c, 0x602c, 0x00fe,</div><div class='del'>-	0x0005, 0x00f6, 0x7090, 0x9005, 0x01e0, 0x2011, 0x6002, 0x080c,</div><div class='del'>-	0x8993, 0x9086, 0x0084, 0x1198, 0x080c, 0x6177, 0x2079, 0x0260,</div><div class='del'>-	0x7a30, 0x9296, 0x1107, 0x1158, 0x7834, 0x9005, 0x1140, 0x7097,</div><div class='del'>-	0x0001, 0x080c, 0x60cd, 0x709b, 0x001a, 0x0029, 0x0010, 0x7093,</div><div class='del'>-	0x0000, 0x00fe, 0x0005, 0x9085, 0x0001, 0x080c, 0x61a2, 0x709b,</div><div class='del'>-	0x001b, 0x080c, 0xaaf1, 0x080c, 0x6177, 0x2011, 0x0260, 0x2009,</div><div class='del'>-	0x0240, 0x7490, 0x9480, 0x0018, 0x9080, 0x0007, 0x9084, 0x03f8,</div><div class='del'>-	0x8004, 0x20a8, 0x220e, 0x8210, 0x8108, 0x9186, 0x0260, 0x1150,</div><div class='del'>-	0x6810, 0x8000, 0x6812, 0x2009, 0x0240, 0x6814, 0x8000, 0x6816,</div><div class='del'>-	0x2011, 0x0260, 0x1f04, 0x5f0a, 0x60c3, 0x0084, 0x080c, 0x602c,</div><div class='del'>-	0x0005, 0x0005, 0x0086, 0x0096, 0x2029, 0x1848, 0x252c, 0x20a9,</div><div class='del'>-	0x0008, 0x2041, 0x1d0e, 0x20e9, 0x0001, 0x28a0, 0x080c, 0x6177,</div><div class='del'>-	0x20e1, 0x0000, 0x2099, 0x026e, 0x4003, 0x20a9, 0x0008, 0x2011,</div><div class='del'>-	0x0007, 0xd5d4, 0x0108, 0x9016, 0x2800, 0x9200, 0x200c, 0x91a6,</div><div class='del'>-	0xffff, 0x1148, 0xd5d4, 0x0110, 0x8210, 0x0008, 0x8211, 0x1f04,</div><div class='del'>-	0x5f3c, 0x0804, 0x5fab, 0x82ff, 0x1160, 0xd5d4, 0x0120, 0x91a6,</div><div class='del'>-	0x3fff, 0x0d90, 0x0020, 0x91a6, 0x3fff, 0x0904, 0x5fab, 0x918d,</div><div class='del'>-	0xc000, 0x20a9, 0x0010, 0x2019, 0x0001, 0xd5d4, 0x0110, 0x2019,</div><div class='del'>-	0x0010, 0x2120, 0xd5d4, 0x0110, 0x8423, 0x0008, 0x8424, 0x1240,</div><div class='del'>-	0xd5d4, 0x0110, 0x8319, 0x0008, 0x8318, 0x1f04, 0x5f62, 0x04d8,</div><div class='del'>-	0x23a8, 0x2021, 0x0001, 0x8426, 0x8425, 0x1f04, 0x5f74, 0x2328,</div><div class='del'>-	0x8529, 0x92be, 0x0007, 0x0158, 0x0006, 0x2039, 0x0007, 0x2200,</div><div class='del'>-	0x973a, 0x000e, 0x27a8, 0x95a8, 0x0010, 0x1f04, 0x5f83, 0x755e,</div><div class='del'>-	0x95c8, 0x348e, 0x292d, 0x95ac, 0x00ff, 0x7582, 0x6532, 0x6536,</div><div class='del'>-	0x0016, 0x2508, 0x080c, 0x26d5, 0x001e, 0x60e7, 0x0000, 0x65ea,</div><div class='del'>-	0x2018, 0x2304, 0x9405, 0x201a, 0x7087, 0x0001, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x024e, 0x20e1, 0x0001, 0x2898, 0x20a9, 0x0008, 0x4003,</div><div class='del'>-	0x9085, 0x0001, 0x0008, 0x9006, 0x009e, 0x008e, 0x0005, 0x0156,</div><div class='del'>-	0x01c6, 0x01d6, 0x0136, 0x0146, 0x22a8, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x026e, 0x20e9, 0x0000, 0x2011, 0x024e, 0x22a0, 0x4003, 0x014e,</div><div class='del'>-	0x013e, 0x01de, 0x01ce, 0x015e, 0x2118, 0x9026, 0x2001, 0x0007,</div><div class='del'>-	0x939a, 0x0010, 0x0218, 0x8420, 0x8001, 0x0cd0, 0x2118, 0x84ff,</div><div class='del'>-	0x0120, 0x939a, 0x0010, 0x8421, 0x1de0, 0x2021, 0x0001, 0x83ff,</div><div class='del'>-	0x0118, 0x8423, 0x8319, 0x1de8, 0x9238, 0x2029, 0x026e, 0x9528,</div><div class='del'>-	0x2504, 0x942c, 0x11b8, 0x9405, 0x203a, 0x715e, 0x91a0, 0x348e,</div><div class='del'>-	0x242d, 0x95ac, 0x00ff, 0x7582, 0x6532, 0x6536, 0x0016, 0x2508,</div><div class='del'>-	0x080c, 0x26d5, 0x001e, 0x60e7, 0x0000, 0x65ea, 0x7087, 0x0001,</div><div class='del'>-	0x9084, 0x0000, 0x0005, 0x00e6, 0x2071, 0x1800, 0x708b, 0x0000,</div><div class='del'>-	0x00ee, 0x0005, 0x00e6, 0x00f6, 0x2079, 0x0100, 0x2071, 0x0140,</div><div class='del'>-	0x080c, 0x60bc, 0x080c, 0xa2a0, 0x7004, 0x9084, 0x4000, 0x0110,</div><div class='del'>-	0x080c, 0x2aa9, 0x0126, 0x2091, 0x8000, 0x2071, 0x1826, 0x2073,</div><div class='del'>-	0x0000, 0x7840, 0x0026, 0x0016, 0x2009, 0x00f7, 0x080c, 0x6119,</div><div class='del'>-	0x001e, 0x9094, 0x0010, 0x9285, 0x0080, 0x7842, 0x7a42, 0x002e,</div><div class='del'>-	0x012e, 0x00fe, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x2a04, 0x0228, 0x2011, 0x0101, 0x2204, 0xc0c5, 0x2012, 0x2011,</div><div class='del'>-	0x19f5, 0x2013, 0x0000, 0x7093, 0x0000, 0x012e, 0x60a3, 0x0056,</div><div class='del'>-	0x60a7, 0x9575, 0x080c, 0xa293, 0x6144, 0xd184, 0x0120, 0x7198,</div><div class='del'>-	0x918d, 0x2000, 0x0018, 0x718c, 0x918d, 0x1000, 0x2011, 0x1999,</div><div class='del'>-	0x2112, 0x2009, 0x07d0, 0x2011, 0x6002, 0x080c, 0x8a5d, 0x0005,</div><div class='del'>-	0x0016, 0x0026, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0xacfc,</div><div class='del'>-	0x080c, 0xb09b, 0x080c, 0xad18, 0x2009, 0x00f7, 0x080c, 0x6119,</div><div class='del'>-	0x2061, 0x1a04, 0x900e, 0x611a, 0x611e, 0x617a, 0x617e, 0x2061,</div><div class='del'>-	0x1800, 0x6003, 0x0001, 0x2061, 0x0100, 0x6043, 0x0090, 0x6043,</div><div class='del'>-	0x0010, 0x2009, 0x1999, 0x200b, 0x0000, 0x2009, 0x002d, 0x2011,</div><div class='del'>-	0x6088, 0x080c, 0x8987, 0x012e, 0x00ce, 0x002e, 0x001e, 0x0005,</div><div class='del'>-	0x00e6, 0x0006, 0x0126, 0x2091, 0x8000, 0x0471, 0x2071, 0x0100,</div><div class='del'>-	0x080c, 0xa2a0, 0x2071, 0x0140, 0x7004, 0x9084, 0x4000, 0x0110,</div><div class='del'>-	0x080c, 0x2aa9, 0x080c, 0x77a6, 0x0188, 0x080c, 0x77c1, 0x1170,</div><div class='del'>-	0x080c, 0x7ac0, 0x0016, 0x080c, 0x27a4, 0x2001, 0x196d, 0x2102,</div><div class='del'>-	0x001e, 0x080c, 0x7abb, 0x080c, 0x76cd, 0x0050, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0x2a85, 0x2001, 0x0001, 0x080c, 0x2631, 0x080c, 0x6058,</div><div class='del'>-	0x012e, 0x000e, 0x00ee, 0x0005, 0x2001, 0x180e, 0x2004, 0xd0bc,</div><div class='del'>-	0x0158, 0x0026, 0x0036, 0x2011, 0x8017, 0x2001, 0x1999, 0x201c,</div><div class='del'>-	0x080c, 0x4ca1, 0x003e, 0x002e, 0x0005, 0x20a9, 0x0012, 0x20e9,</div><div class='del'>-	0x0001, 0x20a1, 0x1d80, 0x080c, 0x6177, 0x20e9, 0x0000, 0x2099,</div><div class='del'>-	0x026e, 0x0099, 0x20a9, 0x0020, 0x080c, 0x6171, 0x2099, 0x0260,</div><div class='del'>-	0x20a1, 0x1d92, 0x0051, 0x20a9, 0x000e, 0x080c, 0x6174, 0x2099,</div><div class='del'>-	0x0260, 0x20a1, 0x1db2, 0x0009, 0x0005, 0x0016, 0x0026, 0x3410,</div><div class='del'>-	0x3308, 0x2104, 0x8007, 0x2012, 0x8108, 0x8210, 0x1f04, 0x60f1,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x080c, 0xaaf1, 0x20e1, 0x0001, 0x2099,</div><div class='del'>-	0x1d00, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000c, 0x4003,</div><div class='del'>-	0x0005, 0x080c, 0xaaf1, 0x080c, 0x6177, 0x20e1, 0x0000, 0x2099,</div><div class='del'>-	0x0260, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000c, 0x4003,</div><div class='del'>-	0x0005, 0x00c6, 0x0006, 0x2061, 0x0100, 0x810f, 0x2001, 0x1834,</div><div class='del'>-	0x2004, 0x9005, 0x1138, 0x2001, 0x1818, 0x2004, 0x9084, 0x00ff,</div><div class='del'>-	0x9105, 0x0010, 0x9185, 0x00f7, 0x604a, 0x000e, 0x00ce, 0x0005,</div><div class='del'>-	0x0016, 0x0046, 0x080c, 0x6c0d, 0x0158, 0x9006, 0x2020, 0x2009,</div><div class='del'>-	0x002a, 0x080c, 0xea8d, 0x2001, 0x180c, 0x200c, 0xc195, 0x2102,</div><div class='del'>-	0x2019, 0x002a, 0x900e, 0x080c, 0x32da, 0x080c, 0xd645, 0x0140,</div><div class='del'>-	0x0036, 0x2019, 0xffff, 0x2021, 0x0007, 0x080c, 0x4e58, 0x003e,</div><div class='del'>-	0x004e, 0x001e, 0x0005, 0x080c, 0x6058, 0x709b, 0x0000, 0x7093,</div><div class='del'>-	0x0000, 0x0005, 0x0006, 0x2001, 0x180c, 0x2004, 0xd09c, 0x0100,</div><div class='del'>-	0x000e, 0x0005, 0x0006, 0x0016, 0x0126, 0x2091, 0x8000, 0x2001,</div><div class='del'>-	0x0101, 0x200c, 0x918d, 0x0006, 0x2102, 0x012e, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x2009, 0x0001, 0x0020, 0x2009, 0x0002, 0x0008, 0x900e,</div><div class='del'>-	0x6814, 0x9084, 0xffc0, 0x910d, 0x6916, 0x0005, 0x00f6, 0x0156,</div><div class='del'>-	0x0146, 0x01d6, 0x9006, 0x20a9, 0x0080, 0x20e9, 0x0001, 0x20a1,</div><div class='del'>-	0x1d00, 0x4004, 0x2079, 0x1d00, 0x7803, 0x2200, 0x7807, 0x00ef,</div><div class='del'>-	0x780f, 0x00ef, 0x7813, 0x0138, 0x7823, 0xffff, 0x7827, 0xffff,</div><div class='del'>-	0x01de, 0x014e, 0x015e, 0x00fe, 0x0005, 0x2001, 0x1800, 0x2003,</div><div class='del'>-	0x0001, 0x0005, 0x2001, 0x19a7, 0x0118, 0x2003, 0x0001, 0x0010,</div><div class='del'>-	0x2003, 0x0000, 0x0005, 0x0156, 0x20a9, 0x0800, 0x2009, 0x1000,</div><div class='del'>-	0x9006, 0x200a, 0x8108, 0x1f04, 0x61b1, 0x015e, 0x0005, 0x00d6,</div><div class='del'>-	0x0036, 0x0156, 0x0136, 0x0146, 0x2069, 0x1847, 0x9006, 0xb802,</div><div class='del'>-	0xb8d6, 0xb807, 0x0707, 0xb80a, 0xb80e, 0xb812, 0x9198, 0x348e,</div><div class='del'>-	0x231d, 0x939c, 0x00ff, 0xbb16, 0x0016, 0x0026, 0xb886, 0x080c,</div><div class='del'>-	0xb094, 0x1120, 0x9192, 0x007e, 0x1208, 0xbb86, 0x20a9, 0x0004,</div><div class='del'>-	0xb8c4, 0x20e8, 0xb9c8, 0x9198, 0x0006, 0x9006, 0x23a0, 0x4004,</div><div class='del'>-	0x20a9, 0x0004, 0x9198, 0x000a, 0x23a0, 0x4004, 0x002e, 0x001e,</div><div class='del'>-	0xb83e, 0xb842, 0xb8ce, 0xb8d2, 0xb85e, 0xb862, 0xb866, 0xb86a,</div><div class='del'>-	0xb86f, 0x0100, 0xb872, 0xb876, 0xb87a, 0xb88a, 0xb88e, 0xb893,</div><div class='del'>-	0x0008, 0xb896, 0xb89a, 0xb89e, 0xb8be, 0xb9a2, 0x0096, 0xb8a4,</div><div class='del'>-	0x904d, 0x0110, 0x080c, 0x108b, 0xb8a7, 0x0000, 0x009e, 0x9006,</div><div class='del'>-	0xb84a, 0x6810, 0xb83a, 0x680c, 0xb846, 0xb8bb, 0x0520, 0xb8ac,</div><div class='del'>-	0x9005, 0x0198, 0x00c6, 0x2060, 0x9c82, 0x1ddc, 0x0a0c, 0x0d85,</div><div class='del'>-	0x2001, 0x181a, 0x2004, 0x9c02, 0x1a0c, 0x0d85, 0x080c, 0x8eee,</div><div class='del'>-	0x00ce, 0x090c, 0x928d, 0xb8af, 0x0000, 0x6814, 0x9084, 0x00ff,</div><div class='del'>-	0xb842, 0x014e, 0x013e, 0x015e, 0x003e, 0x00de, 0x0005, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0xa974, 0xae78, 0x9684, 0x3fff, 0x9082, 0x4000,</div><div class='del'>-	0x1a04, 0x628d, 0x9182, 0x0800, 0x1a04, 0x6291, 0x2001, 0x180c,</div><div class='del'>-	0x2004, 0x9084, 0x0003, 0x1904, 0x6297, 0x9188, 0x1000, 0x2104,</div><div class='del'>-	0x905d, 0x0198, 0xb804, 0x9084, 0x00ff, 0x908e, 0x0006, 0x1188,</div><div class='del'>-	0xb8a4, 0x900d, 0x1904, 0x62a9, 0x080c, 0x6669, 0x9006, 0x012e,</div><div class='del'>-	0x0005, 0x2001, 0x0005, 0x900e, 0x04b8, 0x2001, 0x0028, 0x900e,</div><div class='del'>-	0x0498, 0x9082, 0x0006, 0x1290, 0x080c, 0xb094, 0x1160, 0xb8a0,</div><div class='del'>-	0x9084, 0xff80, 0x1140, 0xb900, 0xd1fc, 0x0d10, 0x2001, 0x0029,</div><div class='del'>-	0x2009, 0x1000, 0x0408, 0x2001, 0x0028, 0x00a8, 0x2009, 0x180c,</div><div class='del'>-	0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0068, 0xd184, 0x0118,</div><div class='del'>-	0x2001, 0x0004, 0x0040, 0x2001, 0x0029, 0xb900, 0xd1fc, 0x0118,</div><div class='del'>-	0x2009, 0x1000, 0x0048, 0x900e, 0x0038, 0x2001, 0x0029, 0x900e,</div><div class='del'>-	0x0018, 0x2001, 0x0029, 0x900e, 0x9005, 0x012e, 0x0005, 0x2001,</div><div class='del'>-	0x180c, 0x2004, 0xd084, 0x19d0, 0x9188, 0x1000, 0x2104, 0x9065,</div><div class='del'>-	0x09a8, 0x080c, 0x6c11, 0x1990, 0xb800, 0xd0bc, 0x0978, 0x0804,</div><div class='del'>-	0x6250, 0x080c, 0x6a2a, 0x0904, 0x6259, 0x0804, 0x6254, 0x00e6,</div><div class='del'>-	0x2071, 0x19e8, 0x7004, 0x9086, 0x0002, 0x1128, 0x7030, 0x9080,</div><div class='del'>-	0x0004, 0x2004, 0x9b06, 0x00ee, 0x0005, 0x00b6, 0x00e6, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0xa874, 0x908e, 0x00ff, 0x1120, 0x2001, 0x196b,</div><div class='del'>-	0x205c, 0x0060, 0xa974, 0x9182, 0x0800, 0x1690, 0x9188, 0x1000,</div><div class='del'>-	0x2104, 0x905d, 0x01d0, 0x080c, 0x6bb1, 0x11d0, 0x080c, 0xb116,</div><div class='del'>-	0x0570, 0x2b00, 0x6012, 0x2900, 0x6016, 0x6023, 0x0009, 0x602b,</div><div class='del'>-	0x0000, 0xa874, 0x908e, 0x00ff, 0x1110, 0x602b, 0x8000, 0x2009,</div><div class='del'>-	0x0043, 0x080c, 0xb20a, 0x9006, 0x00b0, 0x2001, 0x0028, 0x0090,</div><div class='del'>-	0x2009, 0x180c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0038,</div><div class='del'>-	0xd184, 0x0118, 0x2001, 0x0004, 0x0010, 0x2001, 0x0029, 0x0010,</div><div class='del'>-	0x2001, 0x0029, 0x9005, 0x012e, 0x00ee, 0x00be, 0x0005, 0x2001,</div><div class='del'>-	0x002c, 0x0cc0, 0x00b6, 0x00e6, 0x0126, 0x2091, 0x8000, 0xa974,</div><div class='del'>-	0x9182, 0x0800, 0x1a04, 0x6388, 0x9188, 0x1000, 0x2104, 0x905d,</div><div class='del'>-	0x0904, 0x6360, 0xb8a0, 0x9086, 0x007f, 0x0190, 0xa87c, 0xd0fc,</div><div class='del'>-	0x1178, 0x080c, 0x6c19, 0x0160, 0xa994, 0x81ff, 0x0130, 0x908e,</div><div class='del'>-	0x0004, 0x0130, 0x908e, 0x0005, 0x0118, 0x080c, 0x6c11, 0x1598,</div><div class='del'>-	0xa87c, 0xd0fc, 0x01e0, 0xa894, 0x9005, 0x01c8, 0x2060, 0x0026,</div><div class='del'>-	0x2010, 0x080c, 0xcf09, 0x002e, 0x1120, 0x2001, 0x0008, 0x0804,</div><div class='del'>-	0x638a, 0x6020, 0x9086, 0x000a, 0x0120, 0x2001, 0x0008, 0x0804,</div><div class='del'>-	0x638a, 0x601a, 0x6003, 0x0008, 0x2900, 0x6016, 0x0058, 0x080c,</div><div class='del'>-	0xb116, 0x05e8, 0x2b00, 0x6012, 0x2900, 0x6016, 0x600b, 0xffff,</div><div class='del'>-	0x6023, 0x000a, 0x2009, 0x0003, 0x080c, 0xb20a, 0x9006, 0x0458,</div><div class='del'>-	0x2001, 0x0028, 0x0438, 0x9082, 0x0006, 0x1290, 0x080c, 0xb094,</div><div class='del'>-	0x1160, 0xb8a0, 0x9084, 0xff80, 0x1140, 0xb900, 0xd1fc, 0x0900,</div><div class='del'>-	0x2001, 0x0029, 0x2009, 0x1000, 0x00a8, 0x2001, 0x0028, 0x0090,</div><div class='del'>-	0x2009, 0x180c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0050,</div><div class='del'>-	0xd184, 0x0118, 0x2001, 0x0004, 0x0028, 0x2001, 0x0029, 0x0010,</div><div class='del'>-	0x2001, 0x0029, 0x9005, 0x012e, 0x00ee, 0x00be, 0x0005, 0x2001,</div><div class='del'>-	0x002c, 0x0cc0, 0x00f6, 0x00b6, 0x0126, 0x2091, 0x8000, 0xa8e0,</div><div class='del'>-	0x9005, 0x1550, 0xa8dc, 0x9082, 0x0101, 0x1630, 0xa8c8, 0x9005,</div><div class='del'>-	0x1518, 0xa8c4, 0x9082, 0x0101, 0x12f8, 0xa974, 0x2079, 0x1800,</div><div class='del'>-	0x9182, 0x0800, 0x12e8, 0x7830, 0x9084, 0x0003, 0x1130, 0xaa98,</div><div class='del'>-	0xab94, 0xa878, 0x9084, 0x0007, 0x00ea, 0x7930, 0xd18c, 0x0118,</div><div class='del'>-	0x2001, 0x0004, 0x0038, 0xd184, 0x0118, 0x2001, 0x0004, 0x0010,</div><div class='del'>-	0x2001, 0x0029, 0x900e, 0x0038, 0x2001, 0x002c, 0x900e, 0x0018,</div><div class='del'>-	0x2001, 0x0029, 0x900e, 0x9006, 0x0008, 0x9005, 0x012e, 0x00be,</div><div class='del'>-	0x00fe, 0x0005, 0x641f, 0x63da, 0x63f1, 0x641f, 0x641f, 0x641f,</div><div class='del'>-	0x641f, 0x641f, 0x2100, 0x9082, 0x007e, 0x1278, 0x080c, 0x6749,</div><div class='del'>-	0x0148, 0x9046, 0xb810, 0x9306, 0x1904, 0x6427, 0xb814, 0x9206,</div><div class='del'>-	0x15f0, 0x0028, 0xbb12, 0xba16, 0x0010, 0x080c, 0x4b54, 0x0150,</div><div class='del'>-	0x04b0, 0x080c, 0x67b4, 0x1598, 0xb810, 0x9306, 0x1580, 0xb814,</div><div class='del'>-	0x9206, 0x1568, 0x080c, 0xb116, 0x0530, 0x2b00, 0x6012, 0x080c,</div><div class='del'>-	0xd3b6, 0x2900, 0x6016, 0x600b, 0xffff, 0x6023, 0x000a, 0xa878,</div><div class='del'>-	0x9086, 0x0001, 0x1170, 0x080c, 0x3315, 0x9006, 0x080c, 0x66e6,</div><div class='del'>-	0x2001, 0x0002, 0x080c, 0x66fa, 0x2001, 0x0200, 0xb86e, 0xb893,</div><div class='del'>-	0x0002, 0x2009, 0x0003, 0x080c, 0xb20a, 0x9006, 0x0068, 0x2001,</div><div class='del'>-	0x0001, 0x900e, 0x0038, 0x2001, 0x002c, 0x900e, 0x0018, 0x2001,</div><div class='del'>-	0x0028, 0x900e, 0x9005, 0x0000, 0x012e, 0x00be, 0x00fe, 0x0005,</div><div class='del'>-	0x00b6, 0x00f6, 0x00e6, 0x0126, 0x2091, 0x8000, 0xa894, 0x90c6,</div><div class='del'>-	0x0015, 0x0904, 0x6612, 0x90c6, 0x0056, 0x0904, 0x6616, 0x90c6,</div><div class='del'>-	0x0066, 0x0904, 0x661a, 0x90c6, 0x0067, 0x0904, 0x661e, 0x90c6,</div><div class='del'>-	0x0068, 0x0904, 0x6622, 0x90c6, 0x0071, 0x0904, 0x6626, 0x90c6,</div><div class='del'>-	0x0074, 0x0904, 0x662a, 0x90c6, 0x007c, 0x0904, 0x662e, 0x90c6,</div><div class='del'>-	0x007e, 0x0904, 0x6632, 0x90c6, 0x0037, 0x0904, 0x6636, 0x9016,</div><div class='del'>-	0x2079, 0x1800, 0xa974, 0x9186, 0x00ff, 0x0904, 0x660d, 0x9182,</div><div class='del'>-	0x0800, 0x1a04, 0x660d, 0x080c, 0x67b4, 0x1198, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x9082, 0x0006, 0x1268, 0xa894, 0x90c6, 0x006f, 0x0148,</div><div class='del'>-	0x080c, 0xb094, 0x1904, 0x65f6, 0xb8a0, 0x9084, 0xff80, 0x1904,</div><div class='del'>-	0x65f6, 0xa894, 0x90c6, 0x006f, 0x0158, 0x90c6, 0x005e, 0x0904,</div><div class='del'>-	0x6556, 0x90c6, 0x0064, 0x0904, 0x657f, 0x2008, 0x0804, 0x6518,</div><div class='del'>-	0xa998, 0xa8b0, 0x2040, 0x080c, 0xb094, 0x1120, 0x9182, 0x007f,</div><div class='del'>-	0x0a04, 0x6518, 0x9186, 0x00ff, 0x0904, 0x6518, 0x9182, 0x0800,</div><div class='del'>-	0x1a04, 0x6518, 0xaaa0, 0xab9c, 0x787c, 0x9306, 0x11a8, 0x7880,</div><div class='del'>-	0x0096, 0x924e, 0x1128, 0x2208, 0x2310, 0x009e, 0x0804, 0x6518,</div><div class='del'>-	0x080c, 0xb094, 0x1140, 0x99cc, 0xff00, 0x009e, 0x1128, 0x2208,</div><div class='del'>-	0x2310, 0x0804, 0x6518, 0x009e, 0x080c, 0x4b54, 0x0904, 0x6522,</div><div class='del'>-	0x900e, 0x9016, 0x90c6, 0x4000, 0x15e0, 0x0006, 0x080c, 0x6aae,</div><div class='del'>-	0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x20a9, 0x0004,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x0031, 0x20a0, 0xb8c4, 0x20e0,</div><div class='del'>-	0xb8c8, 0x9080, 0x0006, 0x2098, 0x080c, 0x0fd6, 0x20a9, 0x0004,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x0035, 0x20a0, 0xb8c4, 0x20e0,</div><div class='del'>-	0xb8c8, 0x9080, 0x000a, 0x2098, 0x080c, 0x0fd6, 0xa8c4, 0xabc8,</div><div class='del'>-	0x9305, 0xabcc, 0x9305, 0xabd0, 0x9305, 0xabd4, 0x9305, 0xabd8,</div><div class='del'>-	0x9305, 0xabdc, 0x9305, 0xabe0, 0x9305, 0x9005, 0x0510, 0x000e,</div><div class='del'>-	0x00c8, 0x90c6, 0x4007, 0x1110, 0x2408, 0x00a0, 0x90c6, 0x4008,</div><div class='del'>-	0x1118, 0x2708, 0x2610, 0x0070, 0x90c6, 0x4009, 0x1108, 0x0050,</div><div class='del'>-	0x90c6, 0x4006, 0x0138, 0x2001, 0x4005, 0x2009, 0x000a, 0x0010,</div><div class='del'>-	0x2001, 0x4006, 0xa896, 0xa99a, 0xaa9e, 0x2001, 0x0030, 0x900e,</div><div class='del'>-	0x0478, 0x000e, 0x080c, 0xb116, 0x1130, 0x2001, 0x4005, 0x2009,</div><div class='del'>-	0x0003, 0x9016, 0x0c78, 0x2b00, 0x6012, 0x080c, 0xd3b6, 0x2900,</div><div class='del'>-	0x6016, 0x6023, 0x0001, 0xa868, 0xd88c, 0x0108, 0xc0f5, 0xa86a,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x3315, 0x012e, 0x9006, 0x080c,</div><div class='del'>-	0x66e6, 0x2001, 0x0002, 0x080c, 0x66fa, 0x2009, 0x0002, 0x080c,</div><div class='del'>-	0xb20a, 0xa8b0, 0xd094, 0x0118, 0xb8d4, 0xc08d, 0xb8d6, 0x9006,</div><div class='del'>-	0x9005, 0x012e, 0x00ee, 0x00fe, 0x00be, 0x0005, 0x080c, 0x5854,</div><div class='del'>-	0x0118, 0x2009, 0x0007, 0x00f8, 0xa998, 0xaeb0, 0x080c, 0x67b4,</div><div class='del'>-	0x1904, 0x6513, 0x9186, 0x007f, 0x0130, 0x080c, 0x6c11, 0x0118,</div><div class='del'>-	0x2009, 0x0009, 0x0080, 0x0096, 0x080c, 0x1059, 0x1120, 0x009e,</div><div class='del'>-	0x2009, 0x0002, 0x0040, 0x2900, 0x009e, 0xa806, 0x080c, 0xd109,</div><div class='del'>-	0x19b0, 0x2009, 0x0003, 0x2001, 0x4005, 0x0804, 0x651a, 0xa998,</div><div class='del'>-	0xaeb0, 0x080c, 0x67b4, 0x1904, 0x6513, 0x0096, 0x080c, 0x1059,</div><div class='del'>-	0x1128, 0x009e, 0x2009, 0x0002, 0x0804, 0x65d3, 0x2900, 0x009e,</div><div class='del'>-	0xa806, 0x0096, 0x2048, 0x20a9, 0x002b, 0xb8c4, 0x20e0, 0xb8c8,</div><div class='del'>-	0x2098, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003,</div><div class='del'>-	0x20a9, 0x0008, 0x9080, 0x0006, 0x20a0, 0xbbc8, 0x9398, 0x0006,</div><div class='del'>-	0x2398, 0x080c, 0x0fd6, 0x009e, 0xa87b, 0x0000, 0xa883, 0x0000,</div><div class='del'>-	0xa897, 0x4000, 0xd684, 0x1168, 0x080c, 0x5840, 0xd0b4, 0x1118,</div><div class='del'>-	0xa89b, 0x000b, 0x00e0, 0xb800, 0xd08c, 0x0118, 0xa89b, 0x000c,</div><div class='del'>-	0x00b0, 0x080c, 0x6c11, 0x0118, 0xa89b, 0x0009, 0x0080, 0x080c,</div><div class='del'>-	0x5854, 0x0118, 0xa89b, 0x0007, 0x0050, 0x080c, 0xd0ec, 0x1904,</div><div class='del'>-	0x654f, 0x2009, 0x0003, 0x2001, 0x4005, 0x0804, 0x651a, 0xa87b,</div><div class='del'>-	0x0030, 0xa897, 0x4005, 0xa804, 0x8006, 0x8006, 0x8007, 0x90bc,</div><div class='del'>-	0x003f, 0x9084, 0xffc0, 0x9080, 0x0002, 0x2009, 0x002b, 0xaaa0,</div><div class='del'>-	0xab9c, 0xaca8, 0xada4, 0x2031, 0x0000, 0x2041, 0x12a8, 0x080c,</div><div class='del'>-	0xb691, 0x1904, 0x654f, 0x2009, 0x0002, 0x08e8, 0x2001, 0x0028,</div><div class='del'>-	0x900e, 0x0804, 0x6550, 0x2009, 0x180c, 0x210c, 0xd18c, 0x0118,</div><div class='del'>-	0x2001, 0x0004, 0x0038, 0xd184, 0x0118, 0x2001, 0x0004, 0x0010,</div><div class='del'>-	0x2001, 0x0029, 0x900e, 0x0804, 0x6550, 0x2001, 0x0029, 0x900e,</div><div class='del'>-	0x0804, 0x6550, 0x080c, 0x38c0, 0x0804, 0x6551, 0x080c, 0x555d,</div><div class='del'>-	0x0804, 0x6551, 0x080c, 0x46d5, 0x0804, 0x6551, 0x080c, 0x474e,</div><div class='del'>-	0x0804, 0x6551, 0x080c, 0x47aa, 0x0804, 0x6551, 0x080c, 0x4c17,</div><div class='del'>-	0x0804, 0x6551, 0x080c, 0x4edf, 0x0804, 0x6551, 0x080c, 0x51c4,</div><div class='del'>-	0x0804, 0x6551, 0x080c, 0x53bd, 0x0804, 0x6551, 0x080c, 0x3afe,</div><div class='del'>-	0x0804, 0x6551, 0x00b6, 0xa974, 0xae78, 0x9684, 0x3fff, 0x9082,</div><div class='del'>-	0x4000, 0x1608, 0x9182, 0x0800, 0x1258, 0x9188, 0x1000, 0x2104,</div><div class='del'>-	0x905d, 0x0130, 0x080c, 0x6c11, 0x1138, 0x00d9, 0x9006, 0x00b0,</div><div class='del'>-	0x2001, 0x0028, 0x900e, 0x0090, 0x9082, 0x0006, 0x1240, 0xb900,</div><div class='del'>-	0xd1fc, 0x0d98, 0x2001, 0x0029, 0x2009, 0x1000, 0x0038, 0x2001,</div><div class='del'>-	0x0029, 0x900e, 0x0018, 0x2001, 0x0029, 0x900e, 0x9005, 0x00be,</div><div class='del'>-	0x0005, 0xa877, 0x0000, 0xb8d0, 0x9005, 0x1904, 0x66da, 0xb888,</div><div class='del'>-	0x9005, 0x1904, 0x66da, 0xb838, 0xb93c, 0x9102, 0x1a04, 0x66da,</div><div class='del'>-	0x2b10, 0x080c, 0xb143, 0x0904, 0x66d6, 0x8108, 0xb93e, 0x6212,</div><div class='del'>-	0x2900, 0x6016, 0x6023, 0x0003, 0x600b, 0xffff, 0x6007, 0x0040,</div><div class='del'>-	0xa878, 0x605e, 0xa880, 0x6066, 0xa883, 0x0000, 0xa87c, 0xd0ac,</div><div class='del'>-	0x05b8, 0xc0dd, 0xa87e, 0xa888, 0x8001, 0x1560, 0x2011, 0x180d,</div><div class='del'>-	0x2214, 0xd28c, 0x190c, 0x6cd6, 0xa816, 0xa864, 0x9094, 0x00f7,</div><div class='del'>-	0x9296, 0x0011, 0x11f8, 0x9084, 0x00ff, 0xc0bd, 0x601e, 0xa8ac,</div><div class='del'>-	0xaab0, 0xa836, 0xaa3a, 0x2001, 0x000f, 0x8001, 0x1df0, 0x2001,</div><div class='del'>-	0x8004, 0x6003, 0x0004, 0x6046, 0x00f6, 0x2079, 0x0380, 0x7818,</div><div class='del'>-	0xd0bc, 0x1de8, 0x7833, 0x0010, 0x2c00, 0x7836, 0x781b, 0x8080,</div><div class='del'>-	0x00fe, 0x0005, 0x080c, 0x17ad, 0x601c, 0xc0bd, 0x601e, 0x0c38,</div><div class='del'>-	0x2009, 0x180d, 0x210c, 0xd18c, 0x190c, 0x6ce0, 0xd0b4, 0x190c,</div><div class='del'>-	0x1c9c, 0x2001, 0x8004, 0x6003, 0x0002, 0x08e8, 0x81ff, 0x1110,</div><div class='del'>-	0xb88b, 0x0001, 0x2908, 0xb8cc, 0xb9ce, 0x9005, 0x1110, 0xb9d2,</div><div class='del'>-	0x0020, 0x0096, 0x2048, 0xa902, 0x009e, 0x0005, 0x00b6, 0x0126,</div><div class='del'>-	0x00c6, 0x0026, 0x2091, 0x8000, 0x6210, 0x2258, 0xba00, 0x9005,</div><div class='del'>-	0x0110, 0xc285, 0x0008, 0xc284, 0xba02, 0x002e, 0x00ce, 0x012e,</div><div class='del'>-	0x00be, 0x0005, 0x00b6, 0x0126, 0x00c6, 0x2091, 0x8000, 0x6210,</div><div class='del'>-	0x2258, 0xba04, 0x0006, 0x9086, 0x0006, 0x1170, 0xb89c, 0xd0ac,</div><div class='del'>-	0x0158, 0x080c, 0x6c0d, 0x0140, 0x9284, 0xff00, 0x8007, 0x9086,</div><div class='del'>-	0x0007, 0x1110, 0x2011, 0x0600, 0x000e, 0x9294, 0xff00, 0x9215,</div><div class='del'>-	0xba06, 0x0006, 0x9086, 0x0006, 0x1120, 0xba90, 0x82ff, 0x090c,</div><div class='del'>-	0x0d85, 0x000e, 0x00ce, 0x012e, 0x00be, 0x0005, 0x00b6, 0x0126,</div><div class='del'>-	0x00c6, 0x2091, 0x8000, 0x6210, 0x2258, 0xba04, 0x0006, 0x9086,</div><div class='del'>-	0x0006, 0x1168, 0xb89c, 0xd0a4, 0x0150, 0x080c, 0x6c09, 0x1138,</div><div class='del'>-	0x9284, 0x00ff, 0x9086, 0x0007, 0x1110, 0x2011, 0x0006, 0x000e,</div><div class='del'>-	0x9294, 0x00ff, 0x8007, 0x9215, 0xba06, 0x00ce, 0x012e, 0x00be,</div><div class='del'>-	0x0005, 0x9182, 0x0800, 0x0218, 0x9085, 0x0001, 0x0005, 0x00d6,</div><div class='del'>-	0x0026, 0x9190, 0x1000, 0x2204, 0x905d, 0x1188, 0x0096, 0x080c,</div><div class='del'>-	0x1059, 0x2958, 0x009e, 0x0168, 0x2b00, 0x2012, 0xb85c, 0xb8ca,</div><div class='del'>-	0xb860, 0xb8c6, 0x9006, 0xb8a6, 0xb8ae, 0x080c, 0x61b7, 0x9006,</div><div class='del'>-	0x0010, 0x9085, 0x0001, 0x002e, 0x00de, 0x0005, 0x00b6, 0x0096,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x0026, 0x9182, 0x0800, 0x0218, 0x9085,</div><div class='del'>-	0x0001, 0x04a8, 0x00d6, 0x9190, 0x1000, 0x2204, 0x905d, 0x0568,</div><div class='del'>-	0x2013, 0x0000, 0xb8a4, 0x904d, 0x0110, 0x080c, 0x108b, 0x00d6,</div><div class='del'>-	0x00c6, 0xb8bc, 0x2060, 0x8cff, 0x0168, 0x600c, 0x0006, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xcf1b, 0x0110, 0x080c, 0x100b, 0x080c, 0xb16c,</div><div class='del'>-	0x00ce, 0x0c88, 0x00ce, 0x00de, 0x00c6, 0xb8ac, 0x9065, 0x0128,</div><div class='del'>-	0x621c, 0xd2c4, 0x0110, 0x080c, 0x928d, 0x00ce, 0x2b48, 0xb8c8,</div><div class='del'>-	0xb85e, 0xb8c4, 0xb862, 0x080c, 0x109b, 0x00de, 0x9006, 0x002e,</div><div class='del'>-	0x012e, 0x009e, 0x00be, 0x0005, 0x0016, 0x9182, 0x0800, 0x0218,</div><div class='del'>-	0x9085, 0x0001, 0x0030, 0x9188, 0x1000, 0x2104, 0x905d, 0x0dc0,</div><div class='del'>-	0x9006, 0x001e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146, 0x9006,</div><div class='del'>-	0xb80a, 0xb80e, 0xb800, 0xc08c, 0xb802, 0x080c, 0x779e, 0x1510,</div><div class='del'>-	0xb8a0, 0x9086, 0x007e, 0x0120, 0x080c, 0xb094, 0x11d8, 0x0078,</div><div class='del'>-	0x7040, 0xd0e4, 0x01b8, 0x00c6, 0x2061, 0x1982, 0x7048, 0x2062,</div><div class='del'>-	0x704c, 0x6006, 0x7050, 0x600a, 0x7054, 0x600e, 0x00ce, 0x703c,</div><div class='del'>-	0x2069, 0x0140, 0x9005, 0x1110, 0x2001, 0x0001, 0x6886, 0x2069,</div><div class='del'>-	0x1800, 0x68b6, 0x7040, 0xb85e, 0x7048, 0xb862, 0x704c, 0xb866,</div><div class='del'>-	0x20e1, 0x0000, 0x2099, 0x0276, 0xb8c4, 0x20e8, 0xb8c8, 0x9088,</div><div class='del'>-	0x000a, 0x21a0, 0x20a9, 0x0004, 0x4003, 0x2099, 0x027a, 0x9088,</div><div class='del'>-	0x0006, 0x21a0, 0x20a9, 0x0004, 0x4003, 0x2069, 0x0200, 0x6817,</div><div class='del'>-	0x0001, 0x7040, 0xb86a, 0x7144, 0xb96e, 0x7048, 0xb872, 0x7050,</div><div class='del'>-	0xb876, 0x2069, 0x0200, 0x6817, 0x0000, 0xb8a0, 0x9086, 0x007e,</div><div class='del'>-	0x1110, 0x7144, 0xb96e, 0x9182, 0x0211, 0x1218, 0x2009, 0x0008,</div><div class='del'>-	0x0400, 0x9182, 0x0259, 0x1218, 0x2009, 0x0007, 0x00d0, 0x9182,</div><div class='del'>-	0x02c1, 0x1218, 0x2009, 0x0006, 0x00a0, 0x9182, 0x0349, 0x1218,</div><div class='del'>-	0x2009, 0x0005, 0x0070, 0x9182, 0x0421, 0x1218, 0x2009, 0x0004,</div><div class='del'>-	0x0040, 0x9182, 0x0581, 0x1218, 0x2009, 0x0003, 0x0010, 0x2009,</div><div class='del'>-	0x0002, 0xb992, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005, 0x0016,</div><div class='del'>-	0x0026, 0x00e6, 0x2071, 0x0260, 0x7034, 0xb896, 0x703c, 0xb89a,</div><div class='del'>-	0x7054, 0xb89e, 0x0036, 0xbbd4, 0xc384, 0xba00, 0x2009, 0x1867,</div><div class='del'>-	0x210c, 0xd0bc, 0x0120, 0xd1ec, 0x0110, 0xc2ad, 0x0008, 0xc2ac,</div><div class='del'>-	0xd0c4, 0x0148, 0xd1e4, 0x0138, 0xc2bd, 0xd0cc, 0x0128, 0xd38c,</div><div class='del'>-	0x1108, 0xc385, 0x0008, 0xc2bc, 0xba02, 0xbbd6, 0x003e, 0x00ee,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x0096, 0x0126, 0x2091, 0x8000, 0xb8a4,</div><div class='del'>-	0x904d, 0x0578, 0xa900, 0x81ff, 0x15c0, 0xaa04, 0x9282, 0x0010,</div><div class='del'>-	0x16c8, 0x0136, 0x0146, 0x01c6, 0x01d6, 0x8906, 0x8006, 0x8007,</div><div class='del'>-	0x908c, 0x003f, 0x21e0, 0x9084, 0xffc0, 0x9080, 0x0004, 0x2098,</div><div class='del'>-	0x2009, 0x0010, 0x20a9, 0x0001, 0x4002, 0x9086, 0xffff, 0x0120,</div><div class='del'>-	0x8109, 0x1dd0, 0x080c, 0x0d85, 0x3c00, 0x20e8, 0x3300, 0x8001,</div><div class='del'>-	0x20a0, 0x4604, 0x8210, 0xaa06, 0x01de, 0x01ce, 0x014e, 0x013e,</div><div class='del'>-	0x0060, 0x080c, 0x1059, 0x0170, 0x2900, 0xb8a6, 0xa803, 0x0000,</div><div class='del'>-	0x080c, 0x6a4a, 0xa807, 0x0001, 0xae12, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x009e, 0x0005, 0x9006, 0x0cd8, 0x0126, 0x2091, 0x8000, 0x0096,</div><div class='del'>-	0xb8a4, 0x904d, 0x0188, 0xa800, 0x9005, 0x1150, 0x080c, 0x6a59,</div><div class='del'>-	0x1158, 0xa804, 0x908a, 0x0002, 0x0218, 0x8001, 0xa806, 0x0020,</div><div class='del'>-	0x080c, 0x108b, 0xb8a7, 0x0000, 0x009e, 0x012e, 0x0005, 0x0096,</div><div class='del'>-	0x00c6, 0xb888, 0x9005, 0x1904, 0x693f, 0xb8d0, 0x904d, 0x0904,</div><div class='del'>-	0x693f, 0x2001, 0x0382, 0x2004, 0x9084, 0x0007, 0x9086, 0x0001,</div><div class='del'>-	0x1904, 0x693d, 0x080c, 0xb143, 0x0904, 0x693d, 0x8210, 0xba3e,</div><div class='del'>-	0xa800, 0xb8d2, 0x9005, 0x1108, 0xb8ce, 0x2b00, 0x6012, 0x2900,</div><div class='del'>-	0x6016, 0x6023, 0x0003, 0x600b, 0xffff, 0x6007, 0x0040, 0xa878,</div><div class='del'>-	0x605e, 0xa880, 0x9084, 0x00ff, 0x6066, 0xa883, 0x0000, 0xa87c,</div><div class='del'>-	0xd0ac, 0x01c8, 0xc0dd, 0xa87e, 0xa888, 0x8001, 0x1558, 0xa816,</div><div class='del'>-	0xa864, 0x9094, 0x00f7, 0x9296, 0x0011, 0x1520, 0x9084, 0x00ff,</div><div class='del'>-	0xc0bd, 0x601e, 0xa8ac, 0xaab0, 0xa836, 0xaa3a, 0x2001, 0x8004,</div><div class='del'>-	0x6003, 0x0004, 0x0030, 0x080c, 0x1c9c, 0x2001, 0x8004, 0x6003,</div><div class='del'>-	0x0002, 0x6046, 0x2001, 0x0010, 0x2c08, 0x080c, 0xaced, 0xb838,</div><div class='del'>-	0xba3c, 0x9202, 0x0a04, 0x68e5, 0x0010, 0xb88b, 0x0001, 0x00ce,</div><div class='del'>-	0x009e, 0x0005, 0x080c, 0x17ad, 0x601c, 0xc0bd, 0x601e, 0x08f0,</div><div class='del'>-	0x00b6, 0x0096, 0x0016, 0x20a9, 0x0800, 0x900e, 0x0016, 0x080c,</div><div class='del'>-	0x67b4, 0x1158, 0xb8d0, 0x904d, 0x0140, 0x3e00, 0x9086, 0x0002,</div><div class='del'>-	0x1118, 0xb800, 0xd0bc, 0x1108, 0x0041, 0x001e, 0x8108, 0x1f04,</div><div class='del'>-	0x694e, 0x001e, 0x00be, 0x009e, 0x0005, 0x0096, 0x0016, 0xb8d0,</div><div class='del'>-	0x904d, 0x0188, 0xa800, 0xb8d2, 0x9005, 0x1108, 0xb8ce, 0x9006,</div><div class='del'>-	0xa802, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0xd220,</div><div class='del'>-	0x080c, 0x7012, 0x0c60, 0x001e, 0x009e, 0x0005, 0x0086, 0x9046,</div><div class='del'>-	0xb8d0, 0x904d, 0x01b0, 0xa86c, 0x9406, 0x1118, 0xa870, 0x9506,</div><div class='del'>-	0x0128, 0x2940, 0xa800, 0x904d, 0x0160, 0x0ca8, 0xa800, 0x88ff,</div><div class='del'>-	0x1128, 0xb8d2, 0x9005, 0x1118, 0xb8ce, 0x0008, 0xa002, 0xa803,</div><div class='del'>-	0x0000, 0x008e, 0x0005, 0x901e, 0x0010, 0x2019, 0x0001, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x00e6, 0x0096, 0x00c6, 0x0086, 0x0026, 0x2071,</div><div class='del'>-	0x19e8, 0x9046, 0x7028, 0x9065, 0x01e8, 0x6014, 0x2068, 0x83ff,</div><div class='del'>-	0x0120, 0x605c, 0x9606, 0x0158, 0x0030, 0xa86c, 0x9406, 0x1118,</div><div class='del'>-	0xa870, 0x9506, 0x0120, 0x2c40, 0x600c, 0x2060, 0x0c60, 0x600c,</div><div class='del'>-	0x0006, 0x0066, 0x2830, 0x080c, 0xa420, 0x006e, 0x000e, 0x83ff,</div><div class='del'>-	0x0508, 0x0c08, 0x9046, 0xb8d0, 0x904d, 0x01e0, 0x83ff, 0x0120,</div><div class='del'>-	0xa878, 0x9606, 0x0158, 0x0030, 0xa86c, 0x9406, 0x1118, 0xa870,</div><div class='del'>-	0x9506, 0x0120, 0x2940, 0xa800, 0x2048, 0x0c70, 0xb8d0, 0xaa00,</div><div class='del'>-	0x0026, 0x9906, 0x1110, 0xbad2, 0x0008, 0xa202, 0x000e, 0x83ff,</div><div class='del'>-	0x0108, 0x0c10, 0x002e, 0x008e, 0x00ce, 0x009e, 0x00ee, 0x012e,</div><div class='del'>-	0x0005, 0x9016, 0x0489, 0x1110, 0x2011, 0x0001, 0x0005, 0x080c,</div><div class='del'>-	0x6aae, 0x0128, 0x080c, 0xcfdc, 0x0010, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x080c, 0x6aae, 0x0128, 0x080c, 0xcf7d, 0x0010, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x080c, 0x6aae, 0x0128, 0x080c, 0xcfd9, 0x0010, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x080c, 0x6aae, 0x0128, 0x080c, 0xcf9c, 0x0010,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x080c, 0x6aae, 0x0128, 0x080c, 0xd01f,</div><div class='del'>-	0x0010, 0x9085, 0x0001, 0x0005, 0xb8a4, 0x900d, 0x1118, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x0136, 0x01c6, 0xa800, 0x9005, 0x11b8, 0x890e,</div><div class='del'>-	0x810e, 0x810f, 0x9184, 0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080,</div><div class='del'>-	0x0004, 0x2098, 0x20a9, 0x0001, 0x2009, 0x0010, 0x4002, 0x9606,</div><div class='del'>-	0x0128, 0x8109, 0x1dd8, 0x9085, 0x0001, 0x0008, 0x9006, 0x01ce,</div><div class='del'>-	0x013e, 0x0005, 0x0146, 0x01d6, 0xa860, 0x20e8, 0xa85c, 0x9080,</div><div class='del'>-	0x0004, 0x20a0, 0x20a9, 0x0010, 0x2009, 0xffff, 0x4104, 0x01de,</div><div class='del'>-	0x014e, 0x0136, 0x01c6, 0xa800, 0x9005, 0x11b8, 0x890e, 0x810e,</div><div class='del'>-	0x810f, 0x9184, 0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0004,</div><div class='del'>-	0x2098, 0x20a9, 0x0001, 0x2009, 0x0010, 0x4002, 0x9606, 0x0128,</div><div class='del'>-	0x8109, 0x1dd8, 0x9085, 0x0001, 0x0068, 0x0146, 0x01d6, 0x3300,</div><div class='del'>-	0x8001, 0x20a0, 0x3c00, 0x20e8, 0x2001, 0xffff, 0x4004, 0x01de,</div><div class='del'>-	0x014e, 0x9006, 0x01ce, 0x013e, 0x0005, 0x0096, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0xb8a4, 0x904d, 0x1128, 0x080c, 0x1059, 0x0168, 0x2900,</div><div class='del'>-	0xb8a6, 0x080c, 0x6a4a, 0xa803, 0x0001, 0xa807, 0x0000, 0x9085,</div><div class='del'>-	0x0001, 0x012e, 0x009e, 0x0005, 0x9006, 0x0cd8, 0x0096, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0xb8a4, 0x904d, 0x0130, 0xb8a7, 0x0000, 0x080c,</div><div class='del'>-	0x108b, 0x9085, 0x0001, 0x012e, 0x009e, 0x0005, 0xb89c, 0xd0a4,</div><div class='del'>-	0x0005, 0x00b6, 0x00f6, 0x080c, 0x779e, 0x01b0, 0x71c4, 0x81ff,</div><div class='del'>-	0x1198, 0x71dc, 0xd19c, 0x0180, 0x2001, 0x007e, 0x9080, 0x1000,</div><div class='del'>-	0x2004, 0x905d, 0x0148, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006,</div><div class='del'>-	0x1118, 0xb800, 0xc0ed, 0xb802, 0x2079, 0x1847, 0x7804, 0xd0a4,</div><div class='del'>-	0x01d0, 0x0156, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x67b4,</div><div class='del'>-	0x1168, 0xb804, 0x9084, 0xff00, 0x8007, 0x9096, 0x0004, 0x0118,</div><div class='del'>-	0x9086, 0x0006, 0x1118, 0xb800, 0xc0ed, 0xb802, 0x001e, 0x8108,</div><div class='del'>-	0x1f04, 0x6ad5, 0x015e, 0x080c, 0x6bcf, 0x0120, 0x2001, 0x1985,</div><div class='del'>-	0x200c, 0x0098, 0x2079, 0x1847, 0x7804, 0xd0a4, 0x0190, 0x2009,</div><div class='del'>-	0x07d0, 0x2001, 0x182c, 0x2004, 0x9005, 0x0138, 0x2001, 0x1867,</div><div class='del'>-	0x2004, 0xd0e4, 0x0110, 0x2009, 0x5dc0, 0x2011, 0x6b0c, 0x080c,</div><div class='del'>-	0x8a5d, 0x00fe, 0x00be, 0x0005, 0x00b6, 0x2011, 0x6b0c, 0x080c,</div><div class='del'>-	0x8993, 0x080c, 0x6bcf, 0x01d8, 0x2001, 0x107e, 0x2004, 0x2058,</div><div class='del'>-	0xb900, 0xc1ec, 0xb902, 0x080c, 0x6c0d, 0x0130, 0x2009, 0x07d0,</div><div class='del'>-	0x2011, 0x6b0c, 0x080c, 0x8a5d, 0x00e6, 0x2071, 0x1800, 0x9006,</div><div class='del'>-	0x707e, 0x7060, 0x7082, 0x080c, 0x30bf, 0x00ee, 0x04d0, 0x0156,</div><div class='del'>-	0x00c6, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x67b4, 0x1558,</div><div class='del'>-	0xb800, 0xd0ec, 0x0540, 0x0046, 0xbaa0, 0x2220, 0x9006, 0x2009,</div><div class='del'>-	0x0029, 0x080c, 0xea8d, 0xb800, 0xc0e5, 0xc0ec, 0xb802, 0x080c,</div><div class='del'>-	0x6c09, 0x2001, 0x0707, 0x1128, 0xb804, 0x9084, 0x00ff, 0x9085,</div><div class='del'>-	0x0700, 0xb806, 0x080c, 0xacfc, 0x2019, 0x0029, 0x080c, 0x97b0,</div><div class='del'>-	0x0076, 0x903e, 0x080c, 0x966d, 0x900e, 0x080c, 0xe75d, 0x007e,</div><div class='del'>-	0x004e, 0x080c, 0xad18, 0x001e, 0x8108, 0x1f04, 0x6b34, 0x00ce,</div><div class='del'>-	0x015e, 0x00be, 0x0005, 0x00b6, 0x6010, 0x2058, 0xb800, 0xc0ec,</div><div class='del'>-	0xb802, 0x00be, 0x0005, 0x00b6, 0x00c6, 0x0096, 0x080c, 0x1072,</div><div class='del'>-	0x090c, 0x0d85, 0x2958, 0x009e, 0x2001, 0x196b, 0x2b02, 0x8b07,</div><div class='del'>-	0x8006, 0x8006, 0x908c, 0x003f, 0xb9c6, 0x908c, 0xffc0, 0xb9ca,</div><div class='del'>-	0xb8af, 0x0000, 0x2009, 0x00ff, 0x080c, 0x61b7, 0xb807, 0x0006,</div><div class='del'>-	0xb813, 0x00ff, 0xb817, 0xffff, 0xb86f, 0x0200, 0xb86c, 0xb893,</div><div class='del'>-	0x0002, 0xb8bb, 0x0520, 0xb8a3, 0x00ff, 0xb8af, 0x0000, 0x00ce,</div><div class='del'>-	0x00be, 0x0005, 0x7810, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0ac,</div><div class='del'>-	0x0005, 0x6010, 0x00b6, 0x905d, 0x0108, 0xb800, 0x00be, 0xd0bc,</div><div class='del'>-	0x0005, 0x0006, 0x0016, 0x0026, 0xb804, 0x908c, 0x00ff, 0x9196,</div><div class='del'>-	0x0006, 0x0188, 0x9196, 0x0004, 0x0170, 0x9196, 0x0005, 0x0158,</div><div class='del'>-	0x908c, 0xff00, 0x810f, 0x9196, 0x0006, 0x0128, 0x9196, 0x0004,</div><div class='del'>-	0x0110, 0x9196, 0x0005, 0x002e, 0x001e, 0x000e, 0x0005, 0x00b6,</div><div class='del'>-	0x00f6, 0x2001, 0x107e, 0x2004, 0x905d, 0x0110, 0xb800, 0xd0ec,</div><div class='del'>-	0x00fe, 0x00be, 0x0005, 0x0126, 0x0026, 0x2091, 0x8000, 0x0006,</div><div class='del'>-	0xbaa0, 0x9290, 0x1000, 0x2204, 0x9b06, 0x190c, 0x0d85, 0x000e,</div><div class='del'>-	0xba00, 0x9005, 0x0110, 0xc2fd, 0x0008, 0xc2fc, 0xba02, 0x002e,</div><div class='del'>-	0x012e, 0x0005, 0x2011, 0x1837, 0x2204, 0xd0cc, 0x0138, 0x2001,</div><div class='del'>-	0x1983, 0x200c, 0x2011, 0x6bff, 0x080c, 0x8a5d, 0x0005, 0x2011,</div><div class='del'>-	0x6bff, 0x080c, 0x8993, 0x2011, 0x1837, 0x2204, 0xc0cc, 0x2012,</div><div class='del'>-	0x0005, 0x080c, 0x5840, 0xd0ac, 0x0005, 0x080c, 0x5840, 0xd0a4,</div><div class='del'>-	0x0005, 0x0016, 0xb904, 0x9184, 0x00ff, 0x908e, 0x0006, 0x001e,</div><div class='del'>-	0x0005, 0x0016, 0xb904, 0x9184, 0xff00, 0x8007, 0x908e, 0x0006,</div><div class='del'>-	0x001e, 0x0005, 0x00b6, 0x00f6, 0x080c, 0xd645, 0x0158, 0x70dc,</div><div class='del'>-	0x9084, 0x0028, 0x0138, 0x2001, 0x107f, 0x2004, 0x905d, 0x0110,</div><div class='del'>-	0xb8d4, 0xd094, 0x00fe, 0x00be, 0x0005, 0x0006, 0x0016, 0x0036,</div><div class='del'>-	0x0046, 0x0076, 0x00b6, 0x2001, 0x1818, 0x203c, 0x9780, 0x348e,</div><div class='del'>-	0x203d, 0x97bc, 0xff00, 0x873f, 0x9006, 0x2018, 0x2008, 0x9284,</div><div class='del'>-	0x8000, 0x0110, 0x2019, 0x0001, 0x9294, 0x7fff, 0x2100, 0x9706,</div><div class='del'>-	0x0190, 0x91a0, 0x1000, 0x2404, 0x905d, 0x0168, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0006, 0x1138, 0x83ff, 0x0118, 0xb89c, 0xd0a4,</div><div class='del'>-	0x0110, 0x8211, 0x0158, 0x8108, 0x83ff, 0x0120, 0x9182, 0x0800,</div><div class='del'>-	0x0e28, 0x0068, 0x9182, 0x007e, 0x0e08, 0x0048, 0x00be, 0x007e,</div><div class='del'>-	0x004e, 0x003e, 0x001e, 0x9085, 0x0001, 0x000e, 0x0005, 0x00be,</div><div class='del'>-	0x007e, 0x004e, 0x003e, 0x001e, 0x9006, 0x000e, 0x0005, 0x0046,</div><div class='del'>-	0x0056, 0x0076, 0x00b6, 0x2100, 0x9084, 0x7fff, 0x9080, 0x1000,</div><div class='del'>-	0x2004, 0x905d, 0x0130, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006,</div><div class='del'>-	0x0550, 0x9184, 0x8000, 0x0580, 0x2001, 0x1818, 0x203c, 0x9780,</div><div class='del'>-	0x348e, 0x203d, 0x97bc, 0xff00, 0x873f, 0x9006, 0x2020, 0x2400,</div><div class='del'>-	0x9706, 0x01a0, 0x94a8, 0x1000, 0x2504, 0x905d, 0x0178, 0xb804,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x0006, 0x1148, 0xb89c, 0xd0a4, 0x0130,</div><div class='del'>-	0xb814, 0x9206, 0x1118, 0xb810, 0x9306, 0x0128, 0x8420, 0x9482,</div><div class='del'>-	0x0800, 0x0e28, 0x0048, 0x918c, 0x7fff, 0x00be, 0x007e, 0x005e,</div><div class='del'>-	0x004e, 0x9085, 0x0001, 0x0005, 0x918c, 0x7fff, 0x00be, 0x007e,</div><div class='del'>-	0x005e, 0x004e, 0x9006, 0x0005, 0x0006, 0x2001, 0x00a0, 0x8001,</div><div class='del'>-	0xa001, 0xa001, 0xa001, 0x1dd8, 0x000e, 0x0005, 0x0006, 0x2001,</div><div class='del'>-	0x00f8, 0x8001, 0xa001, 0xa001, 0xa001, 0x1dd8, 0x000e, 0x0005,</div><div class='del'>-	0x0006, 0x2001, 0x00e8, 0x8001, 0xa001, 0xa001, 0xa001, 0x1dd8,</div><div class='del'>-	0x000e, 0x0005, 0x2071, 0x1910, 0x7003, 0x0001, 0x7007, 0x0000,</div><div class='del'>-	0x9006, 0x7012, 0x7016, 0x701a, 0x701e, 0x700a, 0x7046, 0x2001,</div><div class='del'>-	0x1922, 0x2003, 0x0000, 0x0005, 0x0016, 0x00e6, 0x2071, 0x1948,</div><div class='del'>-	0x900e, 0x710a, 0x080c, 0x5840, 0xd0fc, 0x1140, 0x080c, 0x5840,</div><div class='del'>-	0x900e, 0xd09c, 0x0108, 0x8108, 0x7102, 0x0470, 0x2001, 0x1867,</div><div class='del'>-	0x200c, 0x9184, 0x0007, 0x0006, 0x2001, 0x180d, 0x2004, 0xd08c,</div><div class='del'>-	0x000e, 0x0108, 0x9006, 0x0002, 0x6d06, 0x6d06, 0x6d06, 0x6d06,</div><div class='del'>-	0x6d06, 0x6d24, 0x6d39, 0x6d47, 0x7003, 0x0003, 0x2009, 0x1868,</div><div class='del'>-	0x210c, 0x9184, 0xff00, 0x908e, 0xff00, 0x0140, 0x8007, 0x9005,</div><div class='del'>-	0x1110, 0x2001, 0x0002, 0x8003, 0x7006, 0x0030, 0x7007, 0x0001,</div><div class='del'>-	0x0018, 0x7003, 0x0005, 0x0c50, 0x2071, 0x1910, 0x704f, 0x0000,</div><div class='del'>-	0x2071, 0x1800, 0x70f7, 0x0001, 0x00ee, 0x001e, 0x0005, 0x7003,</div><div class='del'>-	0x0000, 0x2071, 0x1910, 0x2009, 0x1868, 0x210c, 0x9184, 0x7f00,</div><div class='del'>-	0x8007, 0x908c, 0x000f, 0x0160, 0x714e, 0x8004, 0x8004, 0x8004,</div><div class='del'>-	0x8004, 0x2071, 0x1800, 0x908c, 0x0007, 0x0128, 0x70f6, 0x0c20,</div><div class='del'>-	0x704f, 0x000f, 0x0c90, 0x70f7, 0x0005, 0x08f0, 0x00e6, 0x2071,</div><div class='del'>-	0x0050, 0x684c, 0x9005, 0x1150, 0x00e6, 0x2071, 0x1910, 0x7028,</div><div class='del'>-	0xc085, 0x702a, 0x00ee, 0x9085, 0x0001, 0x0488, 0x6844, 0x9005,</div><div class='del'>-	0x0158, 0x080c, 0x7b28, 0x6a60, 0x9200, 0x7002, 0x6864, 0x9101,</div><div class='del'>-	0x7006, 0x9006, 0x7012, 0x7016, 0x6860, 0x7002, 0x6864, 0x7006,</div><div class='del'>-	0x6868, 0x700a, 0x686c, 0x700e, 0x6844, 0x9005, 0x1110, 0x7012,</div><div class='del'>-	0x7016, 0x684c, 0x701a, 0x701c, 0x9085, 0x0040, 0x701e, 0x7037,</div><div class='del'>-	0x0019, 0x702b, 0x0001, 0x00e6, 0x2071, 0x1910, 0x7028, 0xc084,</div><div class='del'>-	0x702a, 0x7007, 0x0001, 0x700b, 0x0000, 0x00ee, 0x9006, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x0026, 0x2071, 0x1948, 0x7000, 0x9015, 0x0904,</div><div class='del'>-	0x7017, 0x9286, 0x0003, 0x0904, 0x6eac, 0x9286, 0x0005, 0x0904,</div><div class='del'>-	0x6eac, 0x2071, 0x1877, 0xa87c, 0x9005, 0x0904, 0x6e07, 0x7140,</div><div class='del'>-	0xa868, 0x9102, 0x0a04, 0x7017, 0xa878, 0xd084, 0x15d8, 0xa853,</div><div class='del'>-	0x0019, 0x2001, 0x8023, 0xa84e, 0x2071, 0x1910, 0x701c, 0x9005,</div><div class='del'>-	0x1904, 0x71c6, 0x0e04, 0x7234, 0x2071, 0x0000, 0xa850, 0x7032,</div><div class='del'>-	0xa84c, 0x7082, 0xa870, 0x7086, 0xa86c, 0x708a, 0xa880, 0x708e,</div><div class='del'>-	0x7036, 0x0146, 0x01d6, 0x0136, 0x01c6, 0x0156, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x002a, 0xa868, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080,</div><div class='del'>-	0x0021, 0x2098, 0x4003, 0x015e, 0x01ce, 0x013e, 0x01de, 0x014e,</div><div class='del'>-	0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200,</div><div class='del'>-	0x0804, 0x6e8f, 0xa853, 0x001b, 0x2001, 0x8027, 0x0820, 0x7004,</div><div class='del'>-	0xd08c, 0x1904, 0x7017, 0xa853, 0x001a, 0x2001, 0x8024, 0x0804,</div><div class='del'>-	0x6dcb, 0x00e6, 0x0026, 0x2071, 0x1948, 0x7000, 0x9015, 0x0904,</div><div class='del'>-	0x7017, 0x9286, 0x0003, 0x0904, 0x6eac, 0x9286, 0x0005, 0x0904,</div><div class='del'>-	0x6eac, 0xa84f, 0x8022, 0xa853, 0x0018, 0x0804, 0x6e74, 0xa868,</div><div class='del'>-	0xd0fc, 0x1508, 0x00e6, 0x0026, 0x2001, 0x1948, 0x2004, 0x9015,</div><div class='del'>-	0x0904, 0x7017, 0xa978, 0xa874, 0x9105, 0x1904, 0x7017, 0x9286,</div><div class='del'>-	0x0003, 0x0904, 0x6eac, 0x9286, 0x0005, 0x0904, 0x6eac, 0xa87c,</div><div class='del'>-	0xd0bc, 0x1904, 0x7017, 0x2200, 0x0002, 0x7017, 0x6e70, 0x6eac,</div><div class='del'>-	0x6eac, 0x7017, 0x6eac, 0x0005, 0xa868, 0xd0fc, 0x1500, 0x00e6,</div><div class='del'>-	0x0026, 0x2009, 0x1948, 0x210c, 0x81ff, 0x0904, 0x7017, 0xa880,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x0001, 0x1904, 0x7017, 0x9186, 0x0003,</div><div class='del'>-	0x0904, 0x6eac, 0x9186, 0x0005, 0x0904, 0x6eac, 0xa87c, 0xd0cc,</div><div class='del'>-	0x0904, 0x7017, 0xa84f, 0x8021, 0xa853, 0x0017, 0x0028, 0x0005,</div><div class='del'>-	0xa84f, 0x8020, 0xa853, 0x0016, 0x2071, 0x1910, 0x701c, 0x9005,</div><div class='del'>-	0x1904, 0x71c6, 0x0e04, 0x7234, 0x2071, 0x0000, 0xa84c, 0x7082,</div><div class='del'>-	0xa850, 0x7032, 0xa86c, 0x7086, 0x7036, 0xa870, 0x708a, 0x2091,</div><div class='del'>-	0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200, 0x2071,</div><div class='del'>-	0x1800, 0x2011, 0x0001, 0xa804, 0x900d, 0x702c, 0x1158, 0xa802,</div><div class='del'>-	0x2900, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8899, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x0096, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900,</div><div class='del'>-	0x81ff, 0x1dc8, 0x009e, 0x0c58, 0xa84f, 0x0000, 0x00f6, 0x2079,</div><div class='del'>-	0x0050, 0x2071, 0x1910, 0xa803, 0x0000, 0x7010, 0x9005, 0x1904,</div><div class='del'>-	0x6f9d, 0x782c, 0x908c, 0x0780, 0x190c, 0x7382, 0x8004, 0x8004,</div><div class='del'>-	0x8004, 0x9084, 0x0003, 0x0002, 0x6eca, 0x6f9d, 0x6eee, 0x6f3a,</div><div class='del'>-	0x080c, 0x0d85, 0x2071, 0x1800, 0x2900, 0x7822, 0xa804, 0x900d,</div><div class='del'>-	0x1168, 0x2071, 0x1a04, 0x7044, 0x9005, 0x1320, 0x2001, 0x1949,</div><div class='del'>-	0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016, 0x702c,</div><div class='del'>-	0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e,</div><div class='del'>-	0x70c0, 0x9200, 0x70c2, 0x080c, 0x8899, 0x0c18, 0x2071, 0x1800,</div><div class='del'>-	0x2900, 0x7822, 0xa804, 0x900d, 0x15a0, 0x7824, 0x00e6, 0x2071,</div><div class='del'>-	0x0040, 0x712c, 0xd19c, 0x1170, 0x2009, 0x1830, 0x210c, 0x918a,</div><div class='del'>-	0x0020, 0x0240, 0x7022, 0x2001, 0x1dc0, 0x200c, 0x8108, 0x2102,</div><div class='del'>-	0x00ee, 0x0058, 0x00ee, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e,</div><div class='del'>-	0x70c0, 0x8000, 0x70c2, 0x080c, 0x8899, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x7382, 0xd0a4, 0x19c8, 0x2071, 0x1a04, 0x7044, 0x9005,</div><div class='del'>-	0x1320, 0x2001, 0x1949, 0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee,</div><div class='del'>-	0x0005, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900,</div><div class='del'>-	0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8899,</div><div class='del'>-	0x0804, 0x6ef5, 0x0096, 0x00e6, 0x7824, 0x2048, 0x2071, 0x1800,</div><div class='del'>-	0x702c, 0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c,</div><div class='del'>-	0x8899, 0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4, 0x1d60,</div><div class='del'>-	0x00ee, 0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd09c, 0x1198,</div><div class='del'>-	0x009e, 0x2900, 0x7822, 0xa804, 0x900d, 0x1550, 0x2071, 0x1a04,</div><div class='del'>-	0x7044, 0x9005, 0x1320, 0x2001, 0x1949, 0x2004, 0x7046, 0x00fe,</div><div class='del'>-	0x002e, 0x00ee, 0x0005, 0x009e, 0x2908, 0x7010, 0x8000, 0x7012,</div><div class='del'>-	0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008, 0x711e, 0x2148,</div><div class='del'>-	0xa804, 0x900d, 0x1168, 0x2071, 0x1a04, 0x7044, 0x9005, 0x1320,</div><div class='del'>-	0x2001, 0x1949, 0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005,</div><div class='del'>-	0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210,</div><div class='del'>-	0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c,</div><div class='del'>-	0x8899, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x2908, 0x7010, 0x8000,</div><div class='del'>-	0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008, 0x711e,</div><div class='del'>-	0x2148, 0xa804, 0x900d, 0x1904, 0x6ff1, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x7382, 0xd09c, 0x1198, 0x701c, 0x904d, 0x0180, 0x7010,</div><div class='del'>-	0x8001, 0x7012, 0x1108, 0x701a, 0xa800, 0x701e, 0x2900, 0x7822,</div><div class='del'>-	0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd09c, 0x0d68, 0x782c,</div><div class='del'>-	0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4, 0x01b0, 0x00e6, 0x7824,</div><div class='del'>-	0x2048, 0x2071, 0x1800, 0x702c, 0xa802, 0x2900, 0x702e, 0x70c0,</div><div class='del'>-	0x8000, 0x70c2, 0x080c, 0x8899, 0x782c, 0x9094, 0x0780, 0x190c,</div><div class='del'>-	0x7382, 0xd0a4, 0x1d60, 0x00ee, 0x2071, 0x1a04, 0x7044, 0x9005,</div><div class='del'>-	0x1320, 0x2001, 0x1949, 0x2004, 0x7046, 0x00fe, 0x002e, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904,</div><div class='del'>-	0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200,</div><div class='del'>-	0x70c2, 0x080c, 0x8899, 0x00ee, 0x0804, 0x6fad, 0xa868, 0xd0fc,</div><div class='del'>-	0x15e0, 0x0096, 0xa804, 0xa807, 0x0000, 0x904d, 0x190c, 0x100b,</div><div class='del'>-	0x009e, 0x0018, 0xa868, 0xd0fc, 0x1580, 0x00e6, 0x0026, 0xa84f,</div><div class='del'>-	0x0000, 0x00f6, 0x2079, 0x0050, 0x2071, 0x1910, 0xa803, 0x0000,</div><div class='del'>-	0xa864, 0x9084, 0x00ff, 0x908e, 0x0016, 0x01a8, 0x7010, 0x9005,</div><div class='del'>-	0x1904, 0x7142, 0x782c, 0x908c, 0x0780, 0x190c, 0x7382, 0x8004,</div><div class='del'>-	0x8004, 0x8004, 0x9084, 0x0003, 0x0002, 0x7046, 0x7142, 0x7061,</div><div class='del'>-	0x70d3, 0x080c, 0x0d85, 0x2009, 0x1948, 0x2104, 0x0002, 0x7026,</div><div class='del'>-	0x7026, 0x7026, 0x6eb5, 0x7026, 0x6eb5, 0x0005, 0x2071, 0x1800,</div><div class='del'>-	0x2900, 0x7822, 0xa804, 0x900d, 0x1120, 0x00fe, 0x002e, 0x00ee,</div><div class='del'>-	0x0005, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900,</div><div class='del'>-	0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8899,</div><div class='del'>-	0x0c60, 0x2071, 0x1800, 0x2900, 0x7822, 0xa804, 0x900d, 0x1904,</div><div class='del'>-	0x70c2, 0x7830, 0xd0dc, 0x1120, 0x00fe, 0x002e, 0x00ee, 0x0005,</div><div class='del'>-	0x7824, 0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c, 0x1170, 0x2009,</div><div class='del'>-	0x1830, 0x210c, 0x918a, 0x0020, 0x0240, 0x7022, 0x2001, 0x1dc0,</div><div class='del'>-	0x200c, 0x8108, 0x2102, 0x00ee, 0x0058, 0x00ee, 0x2048, 0x702c,</div><div class='del'>-	0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c, 0x8899,</div><div class='del'>-	0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4, 0x19c8, 0x0e04,</div><div class='del'>-	0x70b9, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000,</div><div class='del'>-	0x6836, 0x6833, 0x0013, 0x00de, 0x2001, 0x1921, 0x200c, 0xc184,</div><div class='del'>-	0x2102, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,</div><div class='del'>-	0x1200, 0x2001, 0x1922, 0x2003, 0x0000, 0x00fe, 0x002e, 0x00ee,</div><div class='del'>-	0x0005, 0x2001, 0x1921, 0x200c, 0xc185, 0x2102, 0x00fe, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210,</div><div class='del'>-	0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c,</div><div class='del'>-	0x8899, 0x0804, 0x7070, 0x0096, 0x00e6, 0x7824, 0x2048, 0x2071,</div><div class='del'>-	0x1800, 0x702c, 0xa802, 0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2,</div><div class='del'>-	0x080c, 0x8899, 0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4,</div><div class='del'>-	0x1d60, 0x00ee, 0x0e04, 0x7115, 0x7838, 0x7938, 0x910e, 0x1de0,</div><div class='del'>-	0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x7044,</div><div class='del'>-	0xc084, 0x7046, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084,</div><div class='del'>-	0x190c, 0x1200, 0x704b, 0x0000, 0x782c, 0x9094, 0x0780, 0x190c,</div><div class='del'>-	0x7382, 0xd09c, 0x1170, 0x009e, 0x2900, 0x7822, 0xa804, 0x900d,</div><div class='del'>-	0x11e0, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x7044, 0xc085, 0x7046,</div><div class='del'>-	0x0c58, 0x009e, 0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d,</div><div class='del'>-	0x711a, 0x0110, 0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d,</div><div class='del'>-	0x1120, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x9016,</div><div class='del'>-	0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8,</div><div class='del'>-	0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8899, 0x00fe, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d,</div><div class='del'>-	0x711a, 0x0110, 0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d,</div><div class='del'>-	0x1904, 0x71b1, 0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd09c,</div><div class='del'>-	0x11b0, 0x701c, 0x904d, 0x0198, 0xa84c, 0x9005, 0x1180, 0x7010,</div><div class='del'>-	0x8001, 0x7012, 0x1108, 0x701a, 0xa800, 0x701e, 0x2900, 0x7822,</div><div class='del'>-	0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd09c, 0x0d50, 0x782c,</div><div class='del'>-	0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4, 0x05b8, 0x00e6, 0x7824,</div><div class='del'>-	0x2048, 0x2071, 0x1800, 0x702c, 0xa802, 0x2900, 0x702e, 0x70c0,</div><div class='del'>-	0x8000, 0x70c2, 0x080c, 0x8899, 0x782c, 0x9094, 0x0780, 0x190c,</div><div class='del'>-	0x7382, 0xd0a4, 0x1d60, 0x00ee, 0x0e04, 0x71aa, 0x7838, 0x7938,</div><div class='del'>-	0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013,</div><div class='del'>-	0x00de, 0x7044, 0xc084, 0x7046, 0x2091, 0x4080, 0x2001, 0x0089,</div><div class='del'>-	0x2004, 0xd084, 0x190c, 0x1200, 0x704b, 0x0000, 0x00fe, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x7044, 0xc085, 0x7046, 0x00fe, 0x002e, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904,</div><div class='del'>-	0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200,</div><div class='del'>-	0x70c2, 0x080c, 0x8899, 0x00ee, 0x0804, 0x7152, 0x2071, 0x1910,</div><div class='del'>-	0xa803, 0x0000, 0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d,</div><div class='del'>-	0x711a, 0x0110, 0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d,</div><div class='del'>-	0x1128, 0x1e04, 0x71f1, 0x002e, 0x00ee, 0x0005, 0x2071, 0x1800,</div><div class='del'>-	0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff,</div><div class='del'>-	0x1dc8, 0x702e, 0x70c0, 0x9200, 0x70c2, 0x080c, 0x8899, 0x0e04,</div><div class='del'>-	0x71db, 0x2071, 0x1910, 0x701c, 0x2048, 0xa84c, 0x900d, 0x0d18,</div><div class='del'>-	0x2071, 0x0000, 0x7182, 0xa850, 0x7032, 0xa86c, 0x7086, 0x7036,</div><div class='del'>-	0xa870, 0x708a, 0xa850, 0x9082, 0x0019, 0x1278, 0x2091, 0x4080,</div><div class='del'>-	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200, 0x2071, 0x1910,</div><div class='del'>-	0x080c, 0x736e, 0x002e, 0x00ee, 0x0005, 0xa850, 0x9082, 0x001c,</div><div class='del'>-	0x1e68, 0xa880, 0x708e, 0x7036, 0x0146, 0x01d6, 0x0136, 0x01c6,</div><div class='del'>-	0x0156, 0x20e9, 0x0000, 0x20a1, 0x002a, 0xa868, 0x20a8, 0xa860,</div><div class='del'>-	0x20e0, 0xa85c, 0x9080, 0x0021, 0x2098, 0x4003, 0x015e, 0x01ce,</div><div class='del'>-	0x013e, 0x01de, 0x014e, 0x0890, 0x2071, 0x1910, 0xa803, 0x0000,</div><div class='del'>-	0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110,</div><div class='del'>-	0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1118, 0x002e,</div><div class='del'>-	0x00ee, 0x0005, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904,</div><div class='del'>-	0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70c0, 0x9200,</div><div class='del'>-	0x70c2, 0x080c, 0x8899, 0x002e, 0x00ee, 0x0005, 0x0006, 0xa87c,</div><div class='del'>-	0x0006, 0xa867, 0x0103, 0x20a9, 0x001c, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x9080, 0x001d, 0x20a0, 0x9006, 0x4004, 0x000e, 0x9084, 0x00ff,</div><div class='del'>-	0xa87e, 0x000e, 0xa87a, 0xa982, 0x0005, 0x2071, 0x1910, 0x7004,</div><div class='del'>-	0x0002, 0x7281, 0x7282, 0x736d, 0x7282, 0x727f, 0x736d, 0x080c,</div><div class='del'>-	0x0d85, 0x0005, 0x2001, 0x1948, 0x2004, 0x0002, 0x728c, 0x728c,</div><div class='del'>-	0x7306, 0x7307, 0x728c, 0x7307, 0x0126, 0x2091, 0x8000, 0x1e0c,</div><div class='del'>-	0x738d, 0x701c, 0x904d, 0x0508, 0xa84c, 0x9005, 0x0904, 0x72d7,</div><div class='del'>-	0x0e04, 0x72b5, 0xa94c, 0x2071, 0x0000, 0x7182, 0xa850, 0x7032,</div><div class='del'>-	0xa86c, 0x7086, 0x7036, 0xa870, 0x708a, 0xa850, 0x9082, 0x0019,</div><div class='del'>-	0x1278, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,</div><div class='del'>-	0x1200, 0x2071, 0x1910, 0x080c, 0x736e, 0x012e, 0x0804, 0x7305,</div><div class='del'>-	0xa850, 0x9082, 0x001c, 0x1e68, 0xa880, 0x708e, 0x7036, 0x0146,</div><div class='del'>-	0x01d6, 0x0136, 0x01c6, 0x0156, 0x20e9, 0x0000, 0x20a1, 0x002a,</div><div class='del'>-	0xa868, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x0021, 0x2098,</div><div class='del'>-	0x4003, 0x015e, 0x01ce, 0x013e, 0x01de, 0x014e, 0x0890, 0x2001,</div><div class='del'>-	0x005b, 0x2004, 0x9094, 0x0780, 0x190c, 0x7382, 0xd09c, 0x2071,</div><div class='del'>-	0x1910, 0x1510, 0x2071, 0x1910, 0x700f, 0x0001, 0xa964, 0x9184,</div><div class='del'>-	0x00ff, 0x9086, 0x0003, 0x1130, 0x810f, 0x918c, 0x00ff, 0x8101,</div><div class='del'>-	0x0108, 0x710e, 0x2900, 0x00d6, 0x2069, 0x0050, 0x6822, 0x00de,</div><div class='del'>-	0x2071, 0x1910, 0x701c, 0x2048, 0x7010, 0x8001, 0x7012, 0xa800,</div><div class='del'>-	0x701e, 0x9005, 0x1108, 0x701a, 0x012e, 0x0005, 0x0005, 0x00d6,</div><div class='del'>-	0x2008, 0x2069, 0x1a04, 0x6844, 0x9005, 0x0760, 0x0158, 0x9186,</div><div class='del'>-	0x0003, 0x0540, 0x2001, 0x1815, 0x2004, 0x2009, 0x1b73, 0x210c,</div><div class='del'>-	0x9102, 0x1500, 0x0126, 0x2091, 0x8000, 0x2069, 0x0050, 0x693c,</div><div class='del'>-	0x6838, 0x9106, 0x0190, 0x0e04, 0x7339, 0x2069, 0x0000, 0x6837,</div><div class='del'>-	0x8040, 0x6833, 0x0012, 0x6883, 0x8040, 0x2091, 0x4080, 0x2001,</div><div class='del'>-	0x0089, 0x2004, 0xd084, 0x190c, 0x1200, 0x2069, 0x1a04, 0x6847,</div><div class='del'>-	0xffff, 0x012e, 0x00de, 0x0126, 0x2091, 0x8000, 0x1e0c, 0x73fd,</div><div class='del'>-	0x701c, 0x904d, 0x0540, 0x2001, 0x005b, 0x2004, 0x9094, 0x0780,</div><div class='del'>-	0x15c9, 0xd09c, 0x1500, 0x2071, 0x1910, 0x700f, 0x0001, 0xa964,</div><div class='del'>-	0x9184, 0x00ff, 0x9086, 0x0003, 0x1130, 0x810f, 0x918c, 0x00ff,</div><div class='del'>-	0x8101, 0x0108, 0x710e, 0x2900, 0x00d6, 0x2069, 0x0050, 0x6822,</div><div class='del'>-	0x00de, 0x701c, 0x2048, 0x7010, 0x8001, 0x7012, 0xa800, 0x701e,</div><div class='del'>-	0x9005, 0x1108, 0x701a, 0x012e, 0x0005, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x701c, 0x904d, 0x0160, 0x7010, 0x8001, 0x7012, 0xa800,</div><div class='del'>-	0x701e, 0x9005, 0x1108, 0x701a, 0x012e, 0x080c, 0x108b, 0x0005,</div><div class='del'>-	0x012e, 0x0005, 0x2091, 0x8000, 0x0e04, 0x7384, 0x0006, 0x0016,</div><div class='del'>-	0x2001, 0x8004, 0x0006, 0x0804, 0x0d8e, 0x0096, 0x00f6, 0x2079,</div><div class='del'>-	0x0050, 0x7044, 0xd084, 0x01d0, 0xc084, 0x7046, 0x7838, 0x7938,</div><div class='del'>-	0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013,</div><div class='del'>-	0x00de, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,</div><div class='del'>-	0x1200, 0x704b, 0x0000, 0x00fe, 0x009e, 0x0005, 0x782c, 0x9094,</div><div class='del'>-	0x0780, 0x1981, 0xd0a4, 0x0db8, 0x7148, 0x704c, 0x8108, 0x714a,</div><div class='del'>-	0x9102, 0x0e88, 0x00e6, 0x2071, 0x1800, 0x7824, 0x00e6, 0x2071,</div><div class='del'>-	0x0040, 0x712c, 0xd19c, 0x1170, 0x2009, 0x1830, 0x210c, 0x918a,</div><div class='del'>-	0x0020, 0x0240, 0x7022, 0x2001, 0x1dc0, 0x200c, 0x8108, 0x2102,</div><div class='del'>-	0x00ee, 0x0058, 0x00ee, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e,</div><div class='del'>-	0x70c0, 0x8000, 0x70c2, 0x080c, 0x8899, 0x782c, 0x9094, 0x0780,</div><div class='del'>-	0x190c, 0x7382, 0xd0a4, 0x19c8, 0x7838, 0x7938, 0x910e, 0x1de0,</div><div class='del'>-	0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x2091,</div><div class='del'>-	0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200, 0x00ee,</div><div class='del'>-	0x704b, 0x0000, 0x00fe, 0x009e, 0x0005, 0x00f6, 0x2079, 0x0050,</div><div class='del'>-	0x7044, 0xd084, 0x01b8, 0xc084, 0x7046, 0x7838, 0x7938, 0x910e,</div><div class='del'>-	0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de,</div><div class='del'>-	0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x1200,</div><div class='del'>-	0x00fe, 0x0005, 0x782c, 0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4,</div><div class='del'>-	0x0db8, 0x00e6, 0x2071, 0x1800, 0x7824, 0x2048, 0x702c, 0xa802,</div><div class='del'>-	0x2900, 0x702e, 0x70c0, 0x8000, 0x70c2, 0x080c, 0x8899, 0x782c,</div><div class='del'>-	0x9094, 0x0780, 0x190c, 0x7382, 0xd0a4, 0x1d70, 0x00d6, 0x2069,</div><div class='del'>-	0x0050, 0x693c, 0x2069, 0x1948, 0x6808, 0x690a, 0x2069, 0x1a04,</div><div class='del'>-	0x9102, 0x1118, 0x6844, 0x9005, 0x1320, 0x2001, 0x1949, 0x200c,</div><div class='del'>-	0x6946, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x7098, 0x908a, 0x002a,</div><div class='del'>-	0x1a0c, 0x0d85, 0x9082, 0x001d, 0x003b, 0x0026, 0x2011, 0x1e00,</div><div class='del'>-	0x080c, 0x2ad3, 0x002e, 0x0005, 0x7542, 0x74af, 0x74cb, 0x74f5,</div><div class='del'>-	0x7531, 0x7571, 0x7583, 0x74cb, 0x7559, 0x746a, 0x7498, 0x751b,</div><div class='del'>-	0x7469, 0x0005, 0x00d6, 0x2069, 0x0200, 0x6804, 0x9005, 0x1180,</div><div class='del'>-	0x6808, 0x9005, 0x1518, 0x709b, 0x0029, 0x2069, 0x198f, 0x2d04,</div><div class='del'>-	0x7002, 0x080c, 0x78e4, 0x6028, 0x9085, 0x0600, 0x602a, 0x00b0,</div><div class='del'>-	0x709b, 0x0029, 0x2069, 0x198f, 0x2d04, 0x7002, 0x6028, 0x9085,</div><div class='del'>-	0x0600, 0x602a, 0x00e6, 0x0036, 0x0046, 0x0056, 0x2071, 0x1a6e,</div><div class='del'>-	0x080c, 0x1b1e, 0x005e, 0x004e, 0x003e, 0x00ee, 0x00de, 0x0005,</div><div class='del'>-	0x00d6, 0x2069, 0x0200, 0x6804, 0x9005, 0x1178, 0x6808, 0x9005,</div><div class='del'>-	0x1160, 0x709b, 0x0029, 0x2069, 0x198f, 0x2d04, 0x7002, 0x080c,</div><div class='del'>-	0x7990, 0x6028, 0x9085, 0x0600, 0x602a, 0x00de, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x0090, 0x080c, 0x2a99, 0x000e, 0x6124, 0xd1e4, 0x1190,</div><div class='del'>-	0x080c, 0x75f4, 0xd1d4, 0x1160, 0xd1dc, 0x1138, 0xd1cc, 0x0150,</div><div class='del'>-	0x709b, 0x0020, 0x080c, 0x75f4, 0x0028, 0x709b, 0x001d, 0x0010,</div><div class='del'>-	0x709b, 0x001f, 0x0005, 0x2001, 0x0088, 0x080c, 0x2a99, 0x6124,</div><div class='del'>-	0xd1cc, 0x11e8, 0xd1dc, 0x11c0, 0xd1e4, 0x1198, 0x9184, 0x1e00,</div><div class='del'>-	0x11d8, 0x080c, 0x1b4b, 0x60e3, 0x0001, 0x600c, 0xc0b4, 0x600e,</div><div class='del'>-	0x080c, 0x77ca, 0x2001, 0x0080, 0x080c, 0x2a99, 0x709b, 0x0029,</div><div class='del'>-	0x0058, 0x709b, 0x001e, 0x0040, 0x709b, 0x001d, 0x0028, 0x709b,</div><div class='del'>-	0x0020, 0x0010, 0x709b, 0x001f, 0x0005, 0x080c, 0x1b4b, 0x60e3,</div><div class='del'>-	0x0001, 0x600c, 0xc0b4, 0x600e, 0x080c, 0x77ca, 0x2001, 0x0080,</div><div class='del'>-	0x080c, 0x2a99, 0x6124, 0xd1d4, 0x1198, 0xd1dc, 0x1170, 0xd1e4,</div><div class='del'>-	0x1148, 0x9184, 0x1e00, 0x1118, 0x709b, 0x0029, 0x0058, 0x709b,</div><div class='del'>-	0x0028, 0x0040, 0x709b, 0x001e, 0x0028, 0x709b, 0x001d, 0x0010,</div><div class='del'>-	0x709b, 0x001f, 0x0005, 0x6124, 0xd1d4, 0x1180, 0xd1dc, 0x1158,</div><div class='del'>-	0xd1e4, 0x1130, 0x9184, 0x1e00, 0x1158, 0x709b, 0x0029, 0x0040,</div><div class='del'>-	0x709b, 0x001e, 0x0028, 0x709b, 0x001d, 0x0010, 0x709b, 0x001f,</div><div class='del'>-	0x0005, 0x2001, 0x00a0, 0x080c, 0x2a99, 0x6124, 0xd1dc, 0x1138,</div><div class='del'>-	0xd1e4, 0x0138, 0x080c, 0x1b4b, 0x709b, 0x001e, 0x0010, 0x709b,</div><div class='del'>-	0x001d, 0x0005, 0x080c, 0x767d, 0x6124, 0xd1dc, 0x1188, 0x080c,</div><div class='del'>-	0x75f4, 0x0016, 0x080c, 0x1b4b, 0x001e, 0xd1d4, 0x1128, 0xd1e4,</div><div class='del'>-	0x0138, 0x709b, 0x001e, 0x0020, 0x709b, 0x001f, 0x080c, 0x75f4,</div><div class='del'>-	0x0005, 0x0006, 0x2001, 0x00a0, 0x080c, 0x2a99, 0x000e, 0x6124,</div><div class='del'>-	0xd1d4, 0x1160, 0xd1cc, 0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0140,</div><div class='del'>-	0x709b, 0x001e, 0x0028, 0x709b, 0x001d, 0x0010, 0x709b, 0x0021,</div><div class='del'>-	0x0005, 0x080c, 0x767d, 0x6124, 0xd1d4, 0x1150, 0xd1dc, 0x1128,</div><div class='del'>-	0xd1e4, 0x0140, 0x709b, 0x001e, 0x0028, 0x709b, 0x001d, 0x0010,</div><div class='del'>-	0x709b, 0x001f, 0x0005, 0x0006, 0x2001, 0x0090, 0x080c, 0x2a99,</div><div class='del'>-	0x000e, 0x6124, 0xd1d4, 0x1178, 0xd1cc, 0x1150, 0xd1dc, 0x1128,</div><div class='del'>-	0xd1e4, 0x0158, 0x709b, 0x001e, 0x0040, 0x709b, 0x001d, 0x0028,</div><div class='del'>-	0x709b, 0x0020, 0x0010, 0x709b, 0x001f, 0x0005, 0x0016, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x0126, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071,</div><div class='del'>-	0x1800, 0x2091, 0x8000, 0x080c, 0x779e, 0x11f8, 0x2001, 0x180c,</div><div class='del'>-	0x200c, 0xd1b4, 0x01d0, 0xc1b4, 0x2102, 0x0026, 0x2011, 0x0200,</div><div class='del'>-	0x080c, 0x2ad3, 0x002e, 0x080c, 0x2a7f, 0x6024, 0xd0cc, 0x0148,</div><div class='del'>-	0x2001, 0x00a0, 0x080c, 0x2a99, 0x080c, 0x7ab6, 0x080c, 0x619d,</div><div class='del'>-	0x0428, 0x6028, 0xc0cd, 0x602a, 0x0408, 0x080c, 0x77b8, 0x0150,</div><div class='del'>-	0x080c, 0x77af, 0x1138, 0x2001, 0x0001, 0x080c, 0x2631, 0x080c,</div><div class='del'>-	0x7772, 0x00a0, 0x080c, 0x767a, 0x0178, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x2631, 0x7098, 0x9086, 0x001e, 0x0120, 0x7098, 0x9086, 0x0022,</div><div class='del'>-	0x1118, 0x709b, 0x0025, 0x0010, 0x709b, 0x0021, 0x012e, 0x00ee,</div><div class='del'>-	0x00de, 0x00ce, 0x001e, 0x0005, 0x0026, 0x2011, 0x7605, 0x080c,</div><div class='del'>-	0x8a9f, 0x002e, 0x0016, 0x0026, 0x2009, 0x0064, 0x2011, 0x7605,</div><div class='del'>-	0x080c, 0x8a96, 0x002e, 0x001e, 0x0005, 0x00e6, 0x00f6, 0x0016,</div><div class='del'>-	0x080c, 0xa2a0, 0x2071, 0x1800, 0x080c, 0x759e, 0x001e, 0x00fe,</div><div class='del'>-	0x00ee, 0x0005, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x0126, 0x2071, 0x1800, 0x080c, 0xa2a0, 0x2061, 0x0100,</div><div class='del'>-	0x2069, 0x0140, 0x2091, 0x8000, 0x6028, 0xc09c, 0x602a, 0x080c,</div><div class='del'>-	0xacfc, 0x2011, 0x0003, 0x080c, 0xa62b, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0xa635, 0x080c, 0xa516, 0x080c, 0x8a4b, 0x0036, 0x901e, 0x080c,</div><div class='del'>-	0xa596, 0x003e, 0x080c, 0xad18, 0x60e3, 0x0000, 0x080c, 0xeed9,</div><div class='del'>-	0x080c, 0xeef4, 0x2009, 0x0004, 0x080c, 0x2a85, 0x080c, 0x299b,</div><div class='del'>-	0x2001, 0x1800, 0x2003, 0x0004, 0x2011, 0x0008, 0x080c, 0x2ad3,</div><div class='del'>-	0x2011, 0x7605, 0x080c, 0x8a9f, 0x080c, 0x77b8, 0x0118, 0x9006,</div><div class='del'>-	0x080c, 0x2a99, 0x080c, 0x0bcf, 0x2001, 0x0001, 0x080c, 0x2631,</div><div class='del'>-	0x012e, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x0026, 0x00e6, 0x2011, 0x7612, 0x2071, 0x1a04, 0x701c,</div><div class='del'>-	0x9206, 0x1118, 0x7018, 0x9005, 0x0110, 0x9085, 0x0001, 0x00ee,</div><div class='del'>-	0x002e, 0x0005, 0x6020, 0xd09c, 0x0005, 0x6800, 0x9084, 0xfffe,</div><div class='del'>-	0x9086, 0x00c0, 0x01b8, 0x2001, 0x00c0, 0x080c, 0x2a99, 0x0156,</div><div class='del'>-	0x20a9, 0x002d, 0x1d04, 0x768a, 0x2091, 0x6000, 0x1f04, 0x768a,</div><div class='del'>-	0x015e, 0x00d6, 0x2069, 0x1800, 0x689c, 0x8001, 0x0220, 0x0118,</div><div class='del'>-	0x689e, 0x00de, 0x0005, 0x689f, 0x0014, 0x68ec, 0xd0dc, 0x0dc8,</div><div class='del'>-	0x6800, 0x9086, 0x0001, 0x1da8, 0x080c, 0x8aab, 0x0c90, 0x00c6,</div><div class='del'>-	0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071, 0x1800,</div><div class='del'>-	0x080c, 0x7ac5, 0x2001, 0x196d, 0x2003, 0x0000, 0x9006, 0x709a,</div><div class='del'>-	0x60e2, 0x6886, 0x080c, 0x2700, 0x9006, 0x080c, 0x2a99, 0x080c,</div><div class='del'>-	0x6058, 0x0026, 0x2011, 0xffff, 0x080c, 0x2ad3, 0x002e, 0x602b,</div><div class='del'>-	0x182c, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x2061, 0x0100, 0x2069, 0x0140, 0x2071, 0x1800, 0x2001, 0x197d,</div><div class='del'>-	0x200c, 0x9186, 0x0000, 0x0158, 0x9186, 0x0001, 0x0158, 0x9186,</div><div class='del'>-	0x0002, 0x0158, 0x9186, 0x0003, 0x0158, 0x0804, 0x7762, 0x709b,</div><div class='del'>-	0x0022, 0x0040, 0x709b, 0x0021, 0x0028, 0x709b, 0x0023, 0x0010,</div><div class='del'>-	0x709b, 0x0024, 0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x2700, 0x080c, 0xacfc, 0x0026, 0x080c, 0xafd2, 0x080c,</div><div class='del'>-	0xb09b, 0x002e, 0x080c, 0xad18, 0x7000, 0x908e, 0x0004, 0x0118,</div><div class='del'>-	0x602b, 0x0028, 0x0010, 0x602b, 0x0020, 0x0156, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x20a9, 0x0005, 0x6024, 0xd0ac, 0x0150, 0x012e, 0x015e,</div><div class='del'>-	0x080c, 0xd645, 0x0118, 0x9006, 0x080c, 0x2ac3, 0x0804, 0x776e,</div><div class='del'>-	0x6800, 0x9084, 0x00a1, 0xc0bd, 0x6802, 0x080c, 0x2a7f, 0x6904,</div><div class='del'>-	0xd1d4, 0x1140, 0x2001, 0x0100, 0x080c, 0x2a99, 0x1f04, 0x7713,</div><div class='del'>-	0x080c, 0x77f2, 0x012e, 0x015e, 0x080c, 0x77af, 0x0170, 0x6044,</div><div class='del'>-	0x9005, 0x0130, 0x080c, 0x77f2, 0x9006, 0x8001, 0x1df0, 0x0028,</div><div class='del'>-	0x6804, 0xd0d4, 0x1110, 0x080c, 0x77f2, 0x080c, 0xd645, 0x0118,</div><div class='del'>-	0x9006, 0x080c, 0x2ac3, 0x0016, 0x0026, 0x7000, 0x908e, 0x0004,</div><div class='del'>-	0x0130, 0x2009, 0x00c8, 0x2011, 0x7612, 0x080c, 0x8a5d, 0x002e,</div><div class='del'>-	0x001e, 0x080c, 0x8890, 0x7034, 0xc085, 0x7036, 0x2001, 0x197d,</div><div class='del'>-	0x2003, 0x0004, 0x080c, 0x744d, 0x080c, 0x77af, 0x0138, 0x6804,</div><div class='del'>-	0xd0d4, 0x1120, 0xd0dc, 0x1100, 0x080c, 0x7abb, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x0005, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069,</div><div class='del'>-	0x0140, 0x2071, 0x1800, 0x080c, 0x88a7, 0x080c, 0x8899, 0x080c,</div><div class='del'>-	0x7ac5, 0x2001, 0x196d, 0x2003, 0x0000, 0x9006, 0x709a, 0x60e2,</div><div class='del'>-	0x6886, 0x080c, 0x2700, 0x9006, 0x080c, 0x2a99, 0x6043, 0x0090,</div><div class='del'>-	0x6043, 0x0010, 0x0026, 0x2011, 0xffff, 0x080c, 0x2ad3, 0x002e,</div><div class='del'>-	0x602b, 0x182c, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x0006, 0x2001,</div><div class='del'>-	0x197c, 0x2004, 0x9086, 0xaaaa, 0x000e, 0x0005, 0x0006, 0x080c,</div><div class='del'>-	0x5844, 0x9084, 0x0030, 0x9086, 0x0000, 0x000e, 0x0005, 0x0006,</div><div class='del'>-	0x080c, 0x5844, 0x9084, 0x0030, 0x9086, 0x0030, 0x000e, 0x0005,</div><div class='del'>-	0x0006, 0x080c, 0x5844, 0x9084, 0x0030, 0x9086, 0x0010, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x080c, 0x5844, 0x9084, 0x0030, 0x9086, 0x0020,</div><div class='del'>-	0x000e, 0x0005, 0x0036, 0x0016, 0x2001, 0x180c, 0x2004, 0x908c,</div><div class='del'>-	0x0013, 0x0168, 0x0020, 0x080c, 0x2720, 0x900e, 0x0010, 0x2009,</div><div class='del'>-	0x0002, 0x2019, 0x0028, 0x080c, 0x32da, 0x9006, 0x0019, 0x001e,</div><div class='del'>-	0x003e, 0x0005, 0x00e6, 0x2071, 0x180c, 0x2e04, 0x0130, 0x080c,</div><div class='del'>-	0xd63e, 0x1128, 0x9085, 0x0010, 0x0010, 0x9084, 0xffef, 0x2072,</div><div class='del'>-	0x00ee, 0x0005, 0x6050, 0x0006, 0x60ec, 0x0006, 0x600c, 0x0006,</div><div class='del'>-	0x6004, 0x0006, 0x6028, 0x0006, 0x080c, 0x2af6, 0x080c, 0x2b29,</div><div class='del'>-	0x602f, 0x0100, 0x602f, 0x0000, 0x602f, 0x0040, 0x602f, 0x0000,</div><div class='del'>-	0x20a9, 0x0002, 0x080c, 0x2a60, 0x0026, 0x2011, 0x0040, 0x080c,</div><div class='del'>-	0x2ad3, 0x002e, 0x000e, 0x602a, 0x000e, 0x6006, 0x000e, 0x600e,</div><div class='del'>-	0x000e, 0x60ee, 0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0x2700, 0x2001, 0x00a0, 0x0006, 0x080c, 0xd645, 0x000e,</div><div class='del'>-	0x0130, 0x080c, 0x2ab7, 0x9006, 0x080c, 0x2ac3, 0x0010, 0x080c,</div><div class='del'>-	0x2a99, 0x000e, 0x6052, 0x6050, 0x0006, 0xc0e5, 0x6052, 0x00f6,</div><div class='del'>-	0x2079, 0x0100, 0x080c, 0x2a0c, 0x00fe, 0x000e, 0x6052, 0x0005,</div><div class='del'>-	0x0156, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6, 0x2061,</div><div class='del'>-	0x0100, 0x2069, 0x0140, 0x2071, 0x1800, 0x080c, 0xad5a, 0x0158,</div><div class='del'>-	0x2001, 0x0386, 0x2004, 0xd0b4, 0x1130, 0x2001, 0x0016, 0x080c,</div><div class='del'>-	0xaced, 0x0804, 0x78d6, 0x2001, 0x180c, 0x200c, 0xc1c4, 0x2102,</div><div class='del'>-	0x6028, 0x9084, 0xe1ff, 0x602a, 0x2011, 0x0200, 0x080c, 0x2ad3,</div><div class='del'>-	0x2001, 0x0090, 0x080c, 0x2a99, 0x20a9, 0x0366, 0x6024, 0xd0cc,</div><div class='del'>-	0x1560, 0x1d04, 0x786e, 0x2091, 0x6000, 0x1f04, 0x786e, 0x080c,</div><div class='del'>-	0xacfc, 0x2011, 0x0003, 0x080c, 0xa62b, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0xa635, 0x080c, 0xa516, 0x901e, 0x080c, 0xa596, 0x2001, 0x0386,</div><div class='del'>-	0x2003, 0x7000, 0x080c, 0xad18, 0x2001, 0x00a0, 0x080c, 0x2a99,</div><div class='del'>-	0x080c, 0x7ab6, 0x080c, 0x619d, 0x080c, 0xd645, 0x0110, 0x080c,</div><div class='del'>-	0x0cf1, 0x9085, 0x0001, 0x0804, 0x78dc, 0x080c, 0x1b4b, 0x60e3,</div><div class='del'>-	0x0000, 0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002, 0x1118,</div><div class='del'>-	0x2001, 0x196d, 0x2004, 0x080c, 0x2700, 0x60e2, 0x2001, 0x0080,</div><div class='del'>-	0x080c, 0x2a99, 0x20a9, 0x0366, 0x2011, 0x1e00, 0x080c, 0x2ad3,</div><div class='del'>-	0x2009, 0x1e00, 0x080c, 0x2a7f, 0x6024, 0x910c, 0x0140, 0x1d04,</div><div class='del'>-	0x78b4, 0x2091, 0x6000, 0x1f04, 0x78b4, 0x0804, 0x7877, 0x2001,</div><div class='del'>-	0x0386, 0x2003, 0x7000, 0x6028, 0x9085, 0x1e00, 0x602a, 0x70b4,</div><div class='del'>-	0x9005, 0x1118, 0x6887, 0x0001, 0x0008, 0x6886, 0x080c, 0xd645,</div><div class='del'>-	0x0110, 0x080c, 0x0cf1, 0x9006, 0x00ee, 0x00de, 0x00ce, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036,</div><div class='del'>-	0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2071, 0x1800, 0x7000,</div><div class='del'>-	0x9086, 0x0003, 0x1168, 0x2001, 0x020b, 0x2004, 0x9084, 0x5540,</div><div class='del'>-	0x9086, 0x5540, 0x1128, 0x2069, 0x1a7b, 0x2d04, 0x8000, 0x206a,</div><div class='del'>-	0x2069, 0x0140, 0x6020, 0x9084, 0x00c0, 0x0120, 0x6884, 0x9005,</div><div class='del'>-	0x1904, 0x794d, 0x2001, 0x0088, 0x080c, 0x2a99, 0x9006, 0x60e2,</div><div class='del'>-	0x6886, 0x080c, 0x2700, 0x2069, 0x0200, 0x6804, 0x9005, 0x1118,</div><div class='del'>-	0x6808, 0x9005, 0x01d0, 0x6028, 0x9084, 0xfbff, 0x602a, 0x2011,</div><div class='del'>-	0x0400, 0x080c, 0x2ad3, 0x2069, 0x198f, 0x7000, 0x206a, 0x709b,</div><div class='del'>-	0x0026, 0x7003, 0x0001, 0x20a9, 0x0002, 0x1d04, 0x792d, 0x2091,</div><div class='del'>-	0x6000, 0x1f04, 0x792d, 0x0804, 0x7988, 0x2069, 0x0140, 0x20a9,</div><div class='del'>-	0x0384, 0x2011, 0x1e00, 0x080c, 0x2ad3, 0x2009, 0x1e00, 0x080c,</div><div class='del'>-	0x2a7f, 0x6024, 0x910c, 0x0528, 0x9084, 0x1a00, 0x1510, 0x1d04,</div><div class='del'>-	0x7939, 0x2091, 0x6000, 0x1f04, 0x7939, 0x080c, 0xacfc, 0x2011,</div><div class='del'>-	0x0003, 0x080c, 0xa62b, 0x2011, 0x0002, 0x080c, 0xa635, 0x080c,</div><div class='del'>-	0xa516, 0x901e, 0x080c, 0xa596, 0x080c, 0xad18, 0x2001, 0x00a0,</div><div class='del'>-	0x080c, 0x2a99, 0x080c, 0x7ab6, 0x080c, 0x619d, 0x9085, 0x0001,</div><div class='del'>-	0x00f8, 0x080c, 0x1b4b, 0x2001, 0x0080, 0x080c, 0x2a99, 0x2069,</div><div class='del'>-	0x0140, 0x60e3, 0x0000, 0x70b4, 0x9005, 0x1118, 0x6887, 0x0001,</div><div class='del'>-	0x0008, 0x6886, 0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002,</div><div class='del'>-	0x1118, 0x2001, 0x196d, 0x2004, 0x080c, 0x2700, 0x60e2, 0x9006,</div><div class='del'>-	0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005,</div><div class='del'>-	0x0156, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6, 0x2061,</div><div class='del'>-	0x0100, 0x2071, 0x1800, 0x6020, 0x9084, 0x00c0, 0x01e8, 0x080c,</div><div class='del'>-	0xacfc, 0x2011, 0x0003, 0x080c, 0xa62b, 0x2011, 0x0002, 0x080c,</div><div class='del'>-	0xa635, 0x080c, 0xa516, 0x901e, 0x080c, 0xa596, 0x080c, 0xad18,</div><div class='del'>-	0x2069, 0x0140, 0x2001, 0x00a0, 0x080c, 0x2a99, 0x080c, 0x7ab6,</div><div class='del'>-	0x080c, 0x619d, 0x0804, 0x7a32, 0x2001, 0x180c, 0x200c, 0xd1b4,</div><div class='del'>-	0x1160, 0xc1b5, 0x2102, 0x080c, 0x75fa, 0x2069, 0x0140, 0x2001,</div><div class='del'>-	0x0080, 0x080c, 0x2a99, 0x60e3, 0x0000, 0x2069, 0x0200, 0x6804,</div><div class='del'>-	0x9005, 0x1118, 0x6808, 0x9005, 0x0190, 0x6028, 0x9084, 0xfdff,</div><div class='del'>-	0x602a, 0x2011, 0x0200, 0x080c, 0x2ad3, 0x2069, 0x198f, 0x7000,</div><div class='del'>-	0x206a, 0x709b, 0x0027, 0x7003, 0x0001, 0x0804, 0x7a32, 0x2011,</div><div class='del'>-	0x1e00, 0x080c, 0x2ad3, 0x2009, 0x1e00, 0x080c, 0x2a7f, 0x6024,</div><div class='del'>-	0x910c, 0x01c8, 0x9084, 0x1c00, 0x11b0, 0x1d04, 0x79e7, 0x0006,</div><div class='del'>-	0x0016, 0x00c6, 0x00d6, 0x00e6, 0x080c, 0x88e7, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x001e, 0x000e, 0x00e6, 0x2071, 0x1a04, 0x7078, 0x00ee,</div><div class='del'>-	0x9005, 0x19e8, 0x0438, 0x0026, 0x2011, 0x7612, 0x080c, 0x8993,</div><div class='del'>-	0x2011, 0x7605, 0x080c, 0x8a9f, 0x002e, 0x2069, 0x0140, 0x60e3,</div><div class='del'>-	0x0000, 0x70b4, 0x9005, 0x1118, 0x6887, 0x0001, 0x0008, 0x6886,</div><div class='del'>-	0x2001, 0x180d, 0x2004, 0xd08c, 0x2001, 0x0002, 0x1118, 0x2001,</div><div class='del'>-	0x196d, 0x2004, 0x080c, 0x2700, 0x60e2, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0xc1b4, 0x2102, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036, 0x0046, 0x00c6,</div><div class='del'>-	0x00e6, 0x2061, 0x0100, 0x2071, 0x1800, 0x080c, 0xd63e, 0x1904,</div><div class='del'>-	0x7aa0, 0x7130, 0xd184, 0x1170, 0x080c, 0x3482, 0x0138, 0xc18d,</div><div class='del'>-	0x7132, 0x2011, 0x1848, 0x2214, 0xd2ac, 0x1120, 0x7030, 0xd08c,</div><div class='del'>-	0x0904, 0x7aa0, 0x2011, 0x1848, 0x220c, 0xd1a4, 0x0538, 0x0016,</div><div class='del'>-	0x2019, 0x000e, 0x080c, 0xe9f9, 0x0156, 0x00b6, 0x20a9, 0x007f,</div><div class='del'>-	0x900e, 0x9186, 0x007e, 0x01a0, 0x9186, 0x0080, 0x0188, 0x080c,</div><div class='del'>-	0x67b4, 0x1170, 0x2120, 0x9006, 0x0016, 0x2009, 0x000e, 0x080c,</div><div class='del'>-	0xea8d, 0x2009, 0x0001, 0x2011, 0x0100, 0x080c, 0x8c44, 0x001e,</div><div class='del'>-	0x8108, 0x1f04, 0x7a69, 0x00be, 0x015e, 0x001e, 0xd1ac, 0x1148,</div><div class='del'>-	0x0016, 0x2009, 0x0002, 0x2019, 0x0004, 0x080c, 0x32da, 0x001e,</div><div class='del'>-	0x0078, 0x0156, 0x00b6, 0x20a9, 0x007f, 0x900e, 0x080c, 0x67b4,</div><div class='del'>-	0x1110, 0x080c, 0x61b7, 0x8108, 0x1f04, 0x7a96, 0x00be, 0x015e,</div><div class='del'>-	0x080c, 0x1b4b, 0x080c, 0xacfc, 0x080c, 0xb09b, 0x080c, 0xad18,</div><div class='del'>-	0x60e3, 0x0000, 0x080c, 0x619d, 0x080c, 0x76cd, 0x00ee, 0x00ce,</div><div class='del'>-	0x004e, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005, 0x2001, 0x197d,</div><div class='del'>-	0x2003, 0x0001, 0x0005, 0x2001, 0x197d, 0x2003, 0x0000, 0x0005,</div><div class='del'>-	0x2001, 0x197c, 0x2003, 0xaaaa, 0x0005, 0x2001, 0x197c, 0x2003,</div><div class='del'>-	0x0000, 0x0005, 0x2071, 0x18fa, 0x7003, 0x0000, 0x7007, 0x0000,</div><div class='del'>-	0x080c, 0x1072, 0x090c, 0x0d85, 0xa8ab, 0xdcb0, 0x2900, 0x704e,</div><div class='del'>-	0x080c, 0x1072, 0x090c, 0x0d85, 0xa8ab, 0xdcb0, 0x2900, 0x7052,</div><div class='del'>-	0xa867, 0x0000, 0xa86b, 0x0001, 0xa89f, 0x0000, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0x0040, 0x6848, 0x9005, 0x1118, 0x9085, 0x0001, 0x04b0,</div><div class='del'>-	0x6840, 0x9005, 0x0150, 0x04a1, 0x6a50, 0x9200, 0x7002, 0x6854,</div><div class='del'>-	0x9101, 0x7006, 0x9006, 0x7012, 0x7016, 0x6850, 0x7002, 0x6854,</div><div class='del'>-	0x7006, 0x6858, 0x700a, 0x685c, 0x700e, 0x6840, 0x9005, 0x1110,</div><div class='del'>-	0x7012, 0x7016, 0x6848, 0x701a, 0x701c, 0x9085, 0x0040, 0x701e,</div><div class='del'>-	0x2001, 0x0019, 0x7036, 0x702b, 0x0001, 0x2001, 0x0004, 0x200c,</div><div class='del'>-	0x918c, 0xfff7, 0x918d, 0x8000, 0x2102, 0x00d6, 0x2069, 0x18fa,</div><div class='del'>-	0x6807, 0x0001, 0x00de, 0x080c, 0x8103, 0x9006, 0x00ee, 0x0005,</div><div class='del'>-	0x900e, 0x0156, 0x20a9, 0x0006, 0x8003, 0x818d, 0x1f04, 0x7b2c,</div><div class='del'>-	0x015e, 0x0005, 0x2079, 0x0040, 0x2071, 0x18fa, 0x7004, 0x0002,</div><div class='del'>-	0x7b42, 0x7b43, 0x7b8f, 0x7bea, 0x7d4a, 0x7b40, 0x7b40, 0x7d74,</div><div class='del'>-	0x080c, 0x0d85, 0x0005, 0x2079, 0x0040, 0x2001, 0x1dc0, 0x2003,</div><div class='del'>-	0x0000, 0x782c, 0x908c, 0x0780, 0x190c, 0x81e5, 0xd0a4, 0x0578,</div><div class='del'>-	0x2001, 0x1dc0, 0x2004, 0x9082, 0x0080, 0x1648, 0x1d04, 0x7b60,</div><div class='del'>-	0x2001, 0x1a07, 0x200c, 0x8109, 0x0510, 0x2091, 0x6000, 0x2102,</div><div class='del'>-	0x7824, 0x2048, 0x9006, 0xa802, 0xa806, 0xa864, 0x9084, 0x00ff,</div><div class='del'>-	0x908a, 0x0040, 0x0610, 0x00c0, 0x2001, 0x1800, 0x200c, 0x9186,</div><div class='del'>-	0x0003, 0x1168, 0x7004, 0x0002, 0x7b7f, 0x7b49, 0x7b7f, 0x7b7d,</div><div class='del'>-	0x7b7f, 0x7b7f, 0x7b7f, 0x7b7f, 0x7b7f, 0x080c, 0x7bea, 0x782c,</div><div class='del'>-	0xd09c, 0x090c, 0x8103, 0x0005, 0x9082, 0x005a, 0x1218, 0x2100,</div><div class='del'>-	0x003b, 0x0c10, 0x080c, 0x7c20, 0x0c90, 0x00e3, 0x08e8, 0x0005,</div><div class='del'>-	0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20,</div><div class='del'>-	0x7c42, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20,</div><div class='del'>-	0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20,</div><div class='del'>-	0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c2c, 0x7c20, 0x7e6a, 0x7c20,</div><div class='del'>-	0x7c20, 0x7c20, 0x7c42, 0x7c20, 0x7c2c, 0x7eab, 0x7eec, 0x7f33,</div><div class='del'>-	0x7f47, 0x7c20, 0x7c20, 0x7c42, 0x7c2c, 0x7c56, 0x7c20, 0x7d1e,</div><div class='del'>-	0x7ff2, 0x800d, 0x7c20, 0x7c42, 0x7c20, 0x7c56, 0x7c20, 0x7c20,</div><div class='del'>-	0x7d14, 0x800d, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20,</div><div class='del'>-	0x7c20, 0x7c20, 0x7c20, 0x7c6a, 0x7c20, 0x7c20, 0x7c20, 0x7c20,</div><div class='del'>-	0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x7c20, 0x8189, 0x7c20, 0x8133,</div><div class='del'>-	0x7c20, 0x8133, 0x7c20, 0x7c7f, 0x7c20, 0x7c20, 0x7c20, 0x7c20,</div><div class='del'>-	0x7c20, 0x7c20, 0x2079, 0x0040, 0x7004, 0x9086, 0x0003, 0x1198,</div><div class='del'>-	0x782c, 0x080c, 0x812c, 0xd0a4, 0x0170, 0x7824, 0x2048, 0x9006,</div><div class='del'>-	0xa802, 0xa806, 0xa864, 0x9084, 0x00ff, 0x908a, 0x001a, 0x1210,</div><div class='del'>-	0x002b, 0x0c50, 0x00e9, 0x080c, 0x8103, 0x0005, 0x7c20, 0x7c2c,</div><div class='del'>-	0x7e56, 0x7c20, 0x7c2c, 0x7c20, 0x7c2c, 0x7c2c, 0x7c20, 0x7c2c,</div><div class='del'>-	0x7e56, 0x7c2c, 0x7c2c, 0x7c2c, 0x7c2c, 0x7c2c, 0x7c20, 0x7c2c,</div><div class='del'>-	0x7e56, 0x7c20, 0x7c20, 0x7c2c, 0x7c20, 0x7c20, 0x7c20, 0x7c2c,</div><div class='del'>-	0x00e6, 0x2071, 0x18fa, 0x2009, 0x0400, 0x0071, 0x00ee, 0x0005,</div><div class='del'>-	0x2009, 0x1000, 0x0049, 0x0005, 0x2009, 0x2000, 0x0029, 0x0005,</div><div class='del'>-	0x2009, 0x0800, 0x0009, 0x0005, 0x7007, 0x0001, 0xa868, 0x9084,</div><div class='del'>-	0x00ff, 0x9105, 0xa86a, 0x0126, 0x2091, 0x8000, 0x080c, 0x7012,</div><div class='del'>-	0x012e, 0x0005, 0xa864, 0x8007, 0x9084, 0x00ff, 0x0d08, 0x8001,</div><div class='del'>-	0x1120, 0x7007, 0x0001, 0x0804, 0x7df3, 0x7007, 0x0003, 0x7012,</div><div class='del'>-	0x2900, 0x7016, 0x701a, 0x704b, 0x7df3, 0x0005, 0xa864, 0x8007,</div><div class='del'>-	0x9084, 0x00ff, 0x0968, 0x8001, 0x1120, 0x7007, 0x0001, 0x0804,</div><div class='del'>-	0x7e0e, 0x7007, 0x0003, 0x7012, 0x2900, 0x7016, 0x701a, 0x704b,</div><div class='del'>-	0x7e0e, 0x0005, 0xa864, 0x8007, 0x9084, 0x00ff, 0x0904, 0x7c28,</div><div class='del'>-	0x8001, 0x1120, 0x7007, 0x0001, 0x0804, 0x7e2a, 0x7007, 0x0003,</div><div class='del'>-	0x7012, 0x2900, 0x7016, 0x701a, 0x704b, 0x7e2a, 0x0005, 0xa864,</div><div class='del'>-	0x8007, 0x9084, 0x00ff, 0x9086, 0x0001, 0x1904, 0x7c28, 0x7007,</div><div class='del'>-	0x0001, 0x2009, 0x1834, 0x210c, 0x81ff, 0x1904, 0x7ceb, 0x2001,</div><div class='del'>-	0x180d, 0x2004, 0xd08c, 0x0904, 0x7cd6, 0xa99c, 0x9186, 0x00ff,</div><div class='del'>-	0x05e8, 0xa994, 0x9186, 0x006f, 0x0188, 0x9186, 0x0074, 0x15b0,</div><div class='del'>-	0x0026, 0x2011, 0x0010, 0x080c, 0x6c35, 0x002e, 0x0578, 0x0016,</div><div class='del'>-	0xa998, 0x080c, 0x6c7f, 0x001e, 0x1548, 0x0400, 0x080c, 0x779e,</div><div class='del'>-	0x0140, 0xa897, 0x4005, 0xa89b, 0x0016, 0x2001, 0x0030, 0x900e,</div><div class='del'>-	0x0438, 0x0026, 0x2011, 0x8008, 0x080c, 0x6c35, 0x002e, 0x01b0,</div><div class='del'>-	0x0016, 0x0026, 0x0036, 0xa998, 0xaaa0, 0xab9c, 0x918d, 0x8000,</div><div class='del'>-	0x080c, 0x6c7f, 0x003e, 0x002e, 0x001e, 0x1140, 0xa897, 0x4005,</div><div class='del'>-	0xa89b, 0x4009, 0x2001, 0x0030, 0x900e, 0x0050, 0xa868, 0x9084,</div><div class='del'>-	0x00ff, 0xa86a, 0xa883, 0x0000, 0x080c, 0x6430, 0x1108, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0xa867, 0x0139, 0xa87a, 0xa982, 0x080c,</div><div class='del'>-	0x7012, 0x012e, 0x0ca0, 0xa994, 0x9186, 0x0071, 0x0904, 0x7c8f,</div><div class='del'>-	0x9186, 0x0064, 0x0904, 0x7c8f, 0x9186, 0x007c, 0x0904, 0x7c8f,</div><div class='del'>-	0x9186, 0x0028, 0x0904, 0x7c8f, 0x9186, 0x0038, 0x0904, 0x7c8f,</div><div class='del'>-	0x9186, 0x0078, 0x0904, 0x7c8f, 0x9186, 0x005f, 0x0904, 0x7c8f,</div><div class='del'>-	0x9186, 0x0056, 0x0904, 0x7c8f, 0xa897, 0x4005, 0xa89b, 0x0001,</div><div class='del'>-	0x2001, 0x0030, 0x900e, 0x0860, 0xa87c, 0x9084, 0x00c0, 0x9086,</div><div class='del'>-	0x00c0, 0x1120, 0x7007, 0x0001, 0x0804, 0x8024, 0x2900, 0x7016,</div><div class='del'>-	0x701a, 0x20a9, 0x0004, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x0030,</div><div class='del'>-	0x2098, 0x7050, 0x2040, 0xa060, 0x20e8, 0xa05c, 0x9080, 0x0023,</div><div class='del'>-	0x20a0, 0x4003, 0xa888, 0x7012, 0x9082, 0x0401, 0x1a04, 0x7c30,</div><div class='del'>-	0xaab4, 0x928a, 0x0002, 0x1a04, 0x7c30, 0x82ff, 0x1138, 0xa8b8,</div><div class='del'>-	0xa9bc, 0x9105, 0x0118, 0x2001, 0x7db1, 0x0018, 0x9280, 0x7da7,</div><div class='del'>-	0x2005, 0x7056, 0x7010, 0x9015, 0x0904, 0x7d92, 0x080c, 0x1072,</div><div class='del'>-	0x1118, 0x7007, 0x0004, 0x0005, 0x2900, 0x7022, 0x7054, 0x2060,</div><div class='del'>-	0xe000, 0xa866, 0x7050, 0x2040, 0xa95c, 0xe004, 0x9100, 0xa076,</div><div class='del'>-	0xa860, 0xa072, 0xe008, 0x920a, 0x1210, 0x900e, 0x2200, 0x7112,</div><div class='del'>-	0xe20c, 0x8003, 0x800b, 0x9296, 0x0004, 0x0108, 0x9108, 0xa17a,</div><div class='del'>-	0x810b, 0xa17e, 0x080c, 0x114e, 0xa06c, 0x908e, 0x0100, 0x0170,</div><div class='del'>-	0x9086, 0x0200, 0x0118, 0x7007, 0x0007, 0x0005, 0x7020, 0x2048,</div><div class='del'>-	0x080c, 0x108b, 0x7014, 0x2048, 0x0804, 0x7c30, 0x7020, 0x2048,</div><div class='del'>-	0x7018, 0xa802, 0xa807, 0x0000, 0x2908, 0x2048, 0xa906, 0x711a,</div><div class='del'>-	0x0804, 0x7d4a, 0x7014, 0x2048, 0x7007, 0x0001, 0xa8b4, 0x9005,</div><div class='del'>-	0x1128, 0xa8b8, 0xa9bc, 0x9105, 0x0108, 0x00b9, 0xa864, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x001e, 0x0904, 0x8024, 0x0804, 0x7df3, 0x7da9,</div><div class='del'>-	0x7dad, 0x0002, 0x001d, 0x0007, 0x0004, 0x000a, 0x001b, 0x0005,</div><div class='del'>-	0x0006, 0x000a, 0x001d, 0x0005, 0x0004, 0x0076, 0x0066, 0xafb8,</div><div class='del'>-	0xaebc, 0xa804, 0x2050, 0xb0c0, 0xb0e2, 0xb0bc, 0xb0de, 0xb0b8,</div><div class='del'>-	0xb0d2, 0xb0b4, 0xb0ce, 0xb6da, 0xb7d6, 0xb0b0, 0xb0ca, 0xb0ac,</div><div class='del'>-	0xb0c6, 0xb0a8, 0xb0ba, 0xb0a4, 0xb0b6, 0xb6c2, 0xb7be, 0xb0a0,</div><div class='del'>-	0xb0b2, 0xb09c, 0xb0ae, 0xb098, 0xb0a2, 0xb094, 0xb09e, 0xb6aa,</div><div class='del'>-	0xb7a6, 0xb090, 0xb09a, 0xb08c, 0xb096, 0xb088, 0xb08a, 0xb084,</div><div class='del'>-	0xb086, 0xb692, 0xb78e, 0xb080, 0xb082, 0xb07c, 0xb07e, 0xb078,</div><div class='del'>-	0xb072, 0xb074, 0xb06e, 0xb67a, 0xb776, 0xb004, 0x9055, 0x1958,</div><div class='del'>-	0x006e, 0x007e, 0x0005, 0x2009, 0x1834, 0x210c, 0x81ff, 0x1178,</div><div class='del'>-	0x080c, 0x622f, 0x1108, 0x0005, 0x080c, 0x725e, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xd220, 0x080c, 0x7012, 0x012e, 0x0ca0, 0x080c,</div><div class='del'>-	0xd63e, 0x1d70, 0x2001, 0x0028, 0x900e, 0x0c70, 0x2009, 0x1834,</div><div class='del'>-	0x210c, 0x81ff, 0x1188, 0xa888, 0x9005, 0x0188, 0xa883, 0x0000,</div><div class='del'>-	0x080c, 0x62bd, 0x1108, 0x0005, 0xa87a, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x7012, 0x012e, 0x0cb8, 0x2001, 0x0028, 0x0ca8, 0x2001,</div><div class='del'>-	0x0000, 0x0c90, 0x0419, 0x11d8, 0xa888, 0x9005, 0x01e0, 0xa883,</div><div class='del'>-	0x0000, 0xa87c, 0xd0f4, 0x0120, 0x080c, 0x6392, 0x1138, 0x0005,</div><div class='del'>-	0x9006, 0xa87a, 0x080c, 0x630a, 0x1108, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0xa87a, 0xa982, 0x080c, 0x7012, 0x012e, 0x0cb0, 0x2001,</div><div class='del'>-	0x0028, 0x900e, 0x0c98, 0x2001, 0x0000, 0x0c80, 0x00c6, 0x2061,</div><div class='del'>-	0x1800, 0x60d0, 0x9005, 0x0100, 0x00ce, 0x0005, 0x7018, 0xa802,</div><div class='del'>-	0x2908, 0x2048, 0xa906, 0x711a, 0x7010, 0x8001, 0x7012, 0x0118,</div><div class='del'>-	0x7007, 0x0003, 0x0030, 0x7014, 0x2048, 0x7007, 0x0001, 0x7048,</div><div class='del'>-	0x080f, 0x0005, 0x00b6, 0x7007, 0x0001, 0xa974, 0xa878, 0x9084,</div><div class='del'>-	0x00ff, 0x9096, 0x0004, 0x0540, 0x20a9, 0x0001, 0x9096, 0x0001,</div><div class='del'>-	0x0190, 0x900e, 0x20a9, 0x0800, 0x9096, 0x0002, 0x0160, 0x9005,</div><div class='del'>-	0x11d8, 0xa974, 0x080c, 0x67b4, 0x11b8, 0x0066, 0xae80, 0x080c,</div><div class='del'>-	0x68c4, 0x006e, 0x0088, 0x0046, 0x2011, 0x180c, 0x2224, 0xc484,</div><div class='del'>-	0x2412, 0x004e, 0x00c6, 0x080c, 0x67b4, 0x1110, 0x080c, 0x6a9e,</div><div class='del'>-	0x8108, 0x1f04, 0x7e93, 0x00ce, 0xa87c, 0xd084, 0x1120, 0x080c,</div><div class='del'>-	0x108b, 0x00be, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c, 0x7012,</div><div class='del'>-	0x012e, 0x00be, 0x0005, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001,</div><div class='del'>-	0x080c, 0x6c0d, 0x0580, 0x2061, 0x1a73, 0x6100, 0xd184, 0x0178,</div><div class='del'>-	0xa888, 0x9084, 0x00ff, 0x1550, 0x6000, 0xd084, 0x0520, 0x6004,</div><div class='del'>-	0x9005, 0x1538, 0x6003, 0x0000, 0x600b, 0x0000, 0x00c8, 0x2011,</div><div class='del'>-	0x0001, 0xa890, 0x9005, 0x1110, 0x2001, 0x001e, 0x8000, 0x6016,</div><div class='del'>-	0xa888, 0x9084, 0x00ff, 0x0178, 0x6006, 0xa888, 0x8007, 0x9084,</div><div class='del'>-	0x00ff, 0x0148, 0x600a, 0xa888, 0x8000, 0x1108, 0xc28d, 0x6202,</div><div class='del'>-	0x012e, 0x0804, 0x80ed, 0x012e, 0x0804, 0x80e7, 0x012e, 0x0804,</div><div class='del'>-	0x80e1, 0x012e, 0x0804, 0x80e4, 0x0126, 0x2091, 0x8000, 0x7007,</div><div class='del'>-	0x0001, 0x080c, 0x6c0d, 0x05e0, 0x2061, 0x1a73, 0x6000, 0xd084,</div><div class='del'>-	0x05b8, 0x6204, 0x6308, 0xd08c, 0x1530, 0xac78, 0x9484, 0x0003,</div><div class='del'>-	0x0170, 0xa988, 0x918c, 0x00ff, 0x8001, 0x1120, 0x2100, 0x9210,</div><div class='del'>-	0x0620, 0x0028, 0x8001, 0x1508, 0x2100, 0x9212, 0x02f0, 0x9484,</div><div class='del'>-	0x000c, 0x0188, 0xa988, 0x810f, 0x918c, 0x00ff, 0x9082, 0x0004,</div><div class='del'>-	0x1120, 0x2100, 0x9318, 0x0288, 0x0030, 0x9082, 0x0004, 0x1168,</div><div class='del'>-	0x2100, 0x931a, 0x0250, 0xa890, 0x9005, 0x0110, 0x8000, 0x6016,</div><div class='del'>-	0x6206, 0x630a, 0x012e, 0x0804, 0x80ed, 0x012e, 0x0804, 0x80ea,</div><div class='del'>-	0x012e, 0x0804, 0x80e7, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001,</div><div class='del'>-	0x2061, 0x1a73, 0x6300, 0xd38c, 0x1120, 0x6308, 0x8318, 0x0220,</div><div class='del'>-	0x630a, 0x012e, 0x0804, 0x80fb, 0x012e, 0x0804, 0x80ea, 0x00b6,</div><div class='del'>-	0x0126, 0x00c6, 0x2091, 0x8000, 0x7007, 0x0001, 0xa87c, 0xd0ac,</div><div class='del'>-	0x0148, 0x00c6, 0x2061, 0x1a73, 0x6000, 0x9084, 0xfcff, 0x6002,</div><div class='del'>-	0x00ce, 0x0440, 0xa888, 0x9005, 0x05d8, 0xa88c, 0x9065, 0x0598,</div><div class='del'>-	0x2001, 0x1834, 0x2004, 0x9005, 0x0118, 0x080c, 0xb1a7, 0x0068,</div><div class='del'>-	0x6017, 0xf400, 0x6063, 0x0000, 0xa97c, 0xd1a4, 0x0110, 0xa980,</div><div class='del'>-	0x6162, 0x2009, 0x0041, 0x080c, 0xb20a, 0xa988, 0x918c, 0xff00,</div><div class='del'>-	0x9186, 0x2000, 0x1138, 0x0026, 0x900e, 0x2011, 0xfdff, 0x080c,</div><div class='del'>-	0x8c44, 0x002e, 0xa87c, 0xd0c4, 0x0148, 0x2061, 0x1a73, 0x6000,</div><div class='del'>-	0xd08c, 0x1120, 0x6008, 0x8000, 0x0208, 0x600a, 0x00ce, 0x012e,</div><div class='del'>-	0x00be, 0x0804, 0x80ed, 0x00ce, 0x012e, 0x00be, 0x0804, 0x80e7,</div><div class='del'>-	0xa984, 0x9186, 0x002e, 0x0d30, 0x9186, 0x002d, 0x0d18, 0x9186,</div><div class='del'>-	0x0045, 0x0510, 0x9186, 0x002a, 0x1130, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0xc194, 0x2102, 0x08b8, 0x9186, 0x0020, 0x0158, 0x9186, 0x0029,</div><div class='del'>-	0x1d10, 0xa974, 0x080c, 0x67b4, 0x1968, 0xb800, 0xc0e4, 0xb802,</div><div class='del'>-	0x0848, 0xa88c, 0x9065, 0x09b8, 0x6007, 0x0024, 0x2001, 0x1986,</div><div class='del'>-	0x2004, 0x601a, 0x0804, 0x7f82, 0xa88c, 0x9065, 0x0960, 0x00e6,</div><div class='del'>-	0xa890, 0x9075, 0x2001, 0x1834, 0x2004, 0x9005, 0x0150, 0x080c,</div><div class='del'>-	0xb1a7, 0x8eff, 0x0118, 0x2e60, 0x080c, 0xb1a7, 0x00ee, 0x0804,</div><div class='del'>-	0x7f82, 0x6024, 0xc0dc, 0xc0d5, 0x6026, 0x2e60, 0x6007, 0x003a,</div><div class='del'>-	0xa8a0, 0x9005, 0x0130, 0x6007, 0x003b, 0xa8a4, 0x602e, 0xa8a8,</div><div class='del'>-	0x6016, 0x6003, 0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x00ee,</div><div class='del'>-	0x0804, 0x7f82, 0x2061, 0x1a73, 0x6000, 0xd084, 0x0190, 0xd08c,</div><div class='del'>-	0x1904, 0x80fb, 0x0126, 0x2091, 0x8000, 0x6204, 0x8210, 0x0220,</div><div class='del'>-	0x6206, 0x012e, 0x0804, 0x80fb, 0x012e, 0xa883, 0x0016, 0x0804,</div><div class='del'>-	0x80f4, 0xa883, 0x0007, 0x0804, 0x80f4, 0xa864, 0x8007, 0x9084,</div><div class='del'>-	0x00ff, 0x0130, 0x8001, 0x1138, 0x7007, 0x0001, 0x0069, 0x0005,</div><div class='del'>-	0x080c, 0x7c28, 0x0040, 0x7007, 0x0003, 0x7012, 0x2900, 0x7016,</div><div class='del'>-	0x701a, 0x704b, 0x8024, 0x0005, 0x00b6, 0x00e6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x903e, 0x2061, 0x1800, 0x61d0, 0x81ff, 0x1904, 0x80a6,</div><div class='del'>-	0x6130, 0xd194, 0x1904, 0x80d0, 0xa878, 0x2070, 0x9e82, 0x1ddc,</div><div class='del'>-	0x0a04, 0x809a, 0x6068, 0x9e02, 0x1a04, 0x809a, 0x7120, 0x9186,</div><div class='del'>-	0x0006, 0x1904, 0x808c, 0x7010, 0x905d, 0x0904, 0x80a6, 0xb800,</div><div class='del'>-	0xd0e4, 0x1904, 0x80ca, 0x2061, 0x1a73, 0x6100, 0x9184, 0x0301,</div><div class='del'>-	0x9086, 0x0001, 0x15a0, 0x7024, 0xd0dc, 0x1904, 0x80d3, 0xa883,</div><div class='del'>-	0x0000, 0xa803, 0x0000, 0x2908, 0x7014, 0x9005, 0x1198, 0x7116,</div><div class='del'>-	0xa87c, 0xd0f4, 0x1904, 0x80d6, 0x080c, 0x5840, 0xd09c, 0x1118,</div><div class='del'>-	0xa87c, 0xc0cc, 0xa87e, 0x2e60, 0x080c, 0x8b34, 0x012e, 0x00ee,</div><div class='del'>-	0x00be, 0x0005, 0x2048, 0xa800, 0x9005, 0x1de0, 0xa902, 0x2148,</div><div class='del'>-	0xa87c, 0xd0f4, 0x1904, 0x80d6, 0x012e, 0x00ee, 0x00be, 0x0005,</div><div class='del'>-	0x012e, 0x00ee, 0xa883, 0x0006, 0x00be, 0x0804, 0x80f4, 0xd184,</div><div class='del'>-	0x0db8, 0xd1c4, 0x1190, 0x00a0, 0xa974, 0x080c, 0x67b4, 0x15d0,</div><div class='del'>-	0xb800, 0xd0e4, 0x15b8, 0x7120, 0x9186, 0x0007, 0x1118, 0xa883,</div><div class='del'>-	0x0002, 0x0490, 0xa883, 0x0008, 0x0478, 0xa883, 0x000e, 0x0460,</div><div class='del'>-	0xa883, 0x0017, 0x0448, 0xa883, 0x0035, 0x0430, 0x080c, 0x5844,</div><div class='del'>-	0xd0fc, 0x01e8, 0xa878, 0x2070, 0x9e82, 0x1ddc, 0x02c0, 0x6068,</div><div class='del'>-	0x9e02, 0x12a8, 0x7120, 0x9186, 0x0006, 0x1188, 0x7010, 0x905d,</div><div class='del'>-	0x0170, 0xb800, 0xd0bc, 0x0158, 0x2039, 0x0001, 0x7000, 0x9086,</div><div class='del'>-	0x0007, 0x1904, 0x8030, 0x7003, 0x0002, 0x0804, 0x8030, 0xa883,</div><div class='del'>-	0x0028, 0x0010, 0xa883, 0x0029, 0x012e, 0x00ee, 0x00be, 0x0420,</div><div class='del'>-	0xa883, 0x002a, 0x0cc8, 0xa883, 0x0045, 0x0cb0, 0x2e60, 0x2019,</div><div class='del'>-	0x0002, 0x601b, 0x0014, 0x080c, 0xe586, 0x012e, 0x00ee, 0x00be,</div><div class='del'>-	0x0005, 0x2009, 0x003e, 0x0058, 0x2009, 0x0004, 0x0040, 0x2009,</div><div class='del'>-	0x0006, 0x0028, 0x2009, 0x0016, 0x0010, 0x2009, 0x0001, 0xa884,</div><div class='del'>-	0x9084, 0xff00, 0x9105, 0xa886, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x7012, 0x012e, 0x0005, 0x080c, 0x108b, 0x0005, 0x00d6, 0x080c,</div><div class='del'>-	0x8b2b, 0x00de, 0x0005, 0x00d6, 0x00e6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0x0040, 0x702c, 0xd084, 0x01d8, 0x908c, 0x0780, 0x190c,</div><div class='del'>-	0x81e5, 0xd09c, 0x11a8, 0x2071, 0x1800, 0x70c0, 0x90ea, 0x0020,</div><div class='del'>-	0x0278, 0x8001, 0x70c2, 0x702c, 0x2048, 0xa800, 0x702e, 0x9006,</div><div class='del'>-	0xa802, 0xa806, 0x2071, 0x0040, 0x2900, 0x7022, 0x702c, 0x0c28,</div><div class='del'>-	0x012e, 0x00ee, 0x00de, 0x0005, 0x0006, 0x9084, 0x0780, 0x190c,</div><div class='del'>-	0x81e5, 0x000e, 0x0005, 0xa898, 0x9084, 0x0003, 0x05a8, 0x080c,</div><div class='del'>-	0xb116, 0x05d8, 0x2900, 0x6016, 0xa864, 0x9084, 0x00ff, 0x9086,</div><div class='del'>-	0x0035, 0x1138, 0x6028, 0xc0fd, 0x602a, 0x2001, 0x196b, 0x2004,</div><div class='del'>-	0x0098, 0xa8a0, 0x9084, 0x00ff, 0xa99c, 0x918c, 0xff00, 0x9105,</div><div class='del'>-	0xa99c, 0x918c, 0x00ff, 0x080c, 0x268c, 0x1540, 0x00b6, 0x080c,</div><div class='del'>-	0x67b4, 0x2b00, 0x00be, 0x1510, 0x6012, 0x6023, 0x0001, 0x2009,</div><div class='del'>-	0x0040, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0035, 0x0110, 0x2009,</div><div class='del'>-	0x0041, 0x080c, 0xb20a, 0x0005, 0xa87b, 0x0101, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x7012, 0x012e, 0x0005, 0xa87b, 0x002c, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0x0005, 0xa87b, 0x0028,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0x080c, 0xb16c,</div><div class='del'>-	0x0005, 0x00d6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x00b6, 0x7007,</div><div class='del'>-	0x0001, 0xaa74, 0x9282, 0x0004, 0x1a04, 0x81d6, 0xa97c, 0x9188,</div><div class='del'>-	0x1000, 0x2104, 0x905d, 0xb804, 0xd284, 0x0140, 0x05e8, 0x8007,</div><div class='del'>-	0x9084, 0x00ff, 0x9084, 0x0006, 0x1108, 0x04b0, 0x2b10, 0x080c,</div><div class='del'>-	0xb116, 0x1118, 0x080c, 0xb1dd, 0x05a8, 0x6212, 0xa874, 0x0002,</div><div class='del'>-	0x81b4, 0x81b9, 0x81bc, 0x81c2, 0x2019, 0x0002, 0x080c, 0xe9f9,</div><div class='del'>-	0x0060, 0x080c, 0xe984, 0x0048, 0x2019, 0x0002, 0xa980, 0x080c,</div><div class='del'>-	0xe9a3, 0x0018, 0xa980, 0x080c, 0xe984, 0x080c, 0xb16c, 0xa887,</div><div class='del'>-	0x0000, 0x0126, 0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0x00be,</div><div class='del'>-	0x001e, 0x002e, 0x003e, 0x00ce, 0x00de, 0x0005, 0xa887, 0x0006,</div><div class='del'>-	0x0c80, 0xa887, 0x0002, 0x0c68, 0xa887, 0x0005, 0x0c50, 0xa887,</div><div class='del'>-	0x0004, 0x0c38, 0xa887, 0x0007, 0x0c20, 0x2091, 0x8000, 0x0e04,</div><div class='del'>-	0x81e7, 0x0006, 0x0016, 0x2001, 0x8003, 0x0006, 0x0804, 0x0d8e,</div><div class='del'>-	0x2001, 0x1834, 0x2004, 0x9005, 0x0005, 0x0005, 0x00f6, 0x2079,</div><div class='del'>-	0x0300, 0x2001, 0x0200, 0x200c, 0xc1e5, 0xc1dc, 0x2102, 0x2009,</div><div class='del'>-	0x0218, 0x210c, 0xd1ec, 0x1120, 0x080c, 0x1648, 0x00fe, 0x0005,</div><div class='del'>-	0x2001, 0x020d, 0x2003, 0x0020, 0x781f, 0x0300, 0x00fe, 0x0005,</div><div class='del'>-	0x781c, 0xd08c, 0x0904, 0x8268, 0x68c0, 0x90aa, 0x0005, 0x0a04,</div><div class='del'>-	0x8890, 0x7d44, 0x7c40, 0xd59c, 0x190c, 0x0d85, 0x9584, 0x00f6,</div><div class='del'>-	0x1508, 0x9484, 0x7000, 0x0138, 0x908a, 0x2000, 0x1258, 0x9584,</div><div class='del'>-	0x0700, 0x8007, 0x04f0, 0x7000, 0x9084, 0xff00, 0x9086, 0x8100,</div><div class='del'>-	0x0db0, 0x00b0, 0x9484, 0x0fff, 0x1130, 0x7000, 0x9084, 0xff00,</div><div class='del'>-	0x9086, 0x8100, 0x11c0, 0x080c, 0xeeb1, 0x080c, 0x8777, 0x7817,</div><div class='del'>-	0x0140, 0x00a8, 0x9584, 0x0076, 0x1118, 0x080c, 0x87d3, 0x19c8,</div><div class='del'>-	0xd5a4, 0x0148, 0x0046, 0x0056, 0x080c, 0x82b8, 0x080c, 0x2185,</div><div class='del'>-	0x005e, 0x004e, 0x0020, 0x080c, 0xeeb1, 0x7817, 0x0140, 0x080c,</div><div class='del'>-	0x779e, 0x0168, 0x2001, 0x0111, 0x2004, 0xd08c, 0x0140, 0x6893,</div><div class='del'>-	0x0000, 0x2001, 0x0110, 0x2003, 0x0008, 0x2003, 0x0000, 0x0489,</div><div class='del'>-	0x0005, 0x0002, 0x8275, 0x8585, 0x8272, 0x8272, 0x8272, 0x8272,</div><div class='del'>-	0x8272, 0x8272, 0x7817, 0x0140, 0x0005, 0x7000, 0x908c, 0xff00,</div><div class='del'>-	0x9194, 0xf000, 0x810f, 0x9484, 0x0fff, 0x6892, 0x9286, 0x2000,</div><div class='del'>-	0x1150, 0x6800, 0x9086, 0x0001, 0x1118, 0x080c, 0x58aa, 0x0070,</div><div class='del'>-	0x080c, 0x82d8, 0x0058, 0x9286, 0x3000, 0x1118, 0x080c, 0x84bf,</div><div class='del'>-	0x0028, 0x9286, 0x8000, 0x1110, 0x080c, 0x86a4, 0x7817, 0x0140,</div><div class='del'>-	0x0005, 0x2001, 0x1810, 0x2004, 0xd08c, 0x0178, 0x2001, 0x1800,</div><div class='del'>-	0x2004, 0x9086, 0x0003, 0x1148, 0x0026, 0x0036, 0x2011, 0x8048,</div><div class='del'>-	0x2518, 0x080c, 0x4ca1, 0x003e, 0x002e, 0x0005, 0x0036, 0x0046,</div><div class='del'>-	0x0056, 0x00f6, 0x2079, 0x0200, 0x2019, 0xfffe, 0x7c30, 0x0050,</div><div class='del'>-	0x0036, 0x0046, 0x0056, 0x00f6, 0x2079, 0x0200, 0x7d44, 0x7c40,</div><div class='del'>-	0x2019, 0xffff, 0x2001, 0x1810, 0x2004, 0xd08c, 0x0160, 0x2001,</div><div class='del'>-	0x1800, 0x2004, 0x9086, 0x0003, 0x1130, 0x0026, 0x2011, 0x8048,</div><div class='del'>-	0x080c, 0x4ca1, 0x002e, 0x00fe, 0x005e, 0x004e, 0x003e, 0x0005,</div><div class='del'>-	0x00b6, 0x00c6, 0x7010, 0x9084, 0xff00, 0x8007, 0x9096, 0x0001,</div><div class='del'>-	0x0120, 0x9096, 0x0023, 0x1904, 0x8490, 0x9186, 0x0023, 0x15c0,</div><div class='del'>-	0x080c, 0x8742, 0x0904, 0x8490, 0x6120, 0x9186, 0x0001, 0x0150,</div><div class='del'>-	0x9186, 0x0004, 0x0138, 0x9186, 0x0008, 0x0120, 0x9186, 0x000a,</div><div class='del'>-	0x1904, 0x8490, 0x7124, 0x610a, 0x7030, 0x908e, 0x0200, 0x1130,</div><div class='del'>-	0x2009, 0x0015, 0x080c, 0xb20a, 0x0804, 0x8490, 0x908e, 0x0214,</div><div class='del'>-	0x0118, 0x908e, 0x0210, 0x1130, 0x2009, 0x0015, 0x080c, 0xb20a,</div><div class='del'>-	0x0804, 0x8490, 0x908e, 0x0100, 0x1904, 0x8490, 0x7034, 0x9005,</div><div class='del'>-	0x1904, 0x8490, 0x2009, 0x0016, 0x080c, 0xb20a, 0x0804, 0x8490,</div><div class='del'>-	0x9186, 0x0022, 0x1904, 0x8490, 0x7030, 0x908e, 0x0300, 0x1580,</div><div class='del'>-	0x68dc, 0xd0a4, 0x0528, 0xc0b5, 0x68de, 0x7100, 0x918c, 0x00ff,</div><div class='del'>-	0x697e, 0x7004, 0x6882, 0x00f6, 0x2079, 0x0100, 0x79e6, 0x78ea,</div><div class='del'>-	0x0006, 0x9084, 0x00ff, 0x0016, 0x2008, 0x080c, 0x26d5, 0x7932,</div><div class='del'>-	0x7936, 0x001e, 0x000e, 0x00fe, 0x080c, 0x268c, 0x695e, 0x703c,</div><div class='del'>-	0x00e6, 0x2071, 0x0140, 0x7086, 0x2071, 0x1800, 0x70b6, 0x00ee,</div><div class='del'>-	0x7034, 0x9005, 0x1904, 0x8490, 0x2009, 0x0017, 0x0804, 0x8440,</div><div class='del'>-	0x908e, 0x0400, 0x1190, 0x7034, 0x9005, 0x1904, 0x8490, 0x080c,</div><div class='del'>-	0x779e, 0x0120, 0x2009, 0x001d, 0x0804, 0x8440, 0x68dc, 0xc0a5,</div><div class='del'>-	0x68de, 0x2009, 0x0030, 0x0804, 0x8440, 0x908e, 0x0500, 0x1140,</div><div class='del'>-	0x7034, 0x9005, 0x1904, 0x8490, 0x2009, 0x0018, 0x0804, 0x8440,</div><div class='del'>-	0x908e, 0x2010, 0x1120, 0x2009, 0x0019, 0x0804, 0x8440, 0x908e,</div><div class='del'>-	0x2110, 0x1120, 0x2009, 0x001a, 0x0804, 0x8440, 0x908e, 0x5200,</div><div class='del'>-	0x1140, 0x7034, 0x9005, 0x1904, 0x8490, 0x2009, 0x001b, 0x0804,</div><div class='del'>-	0x8440, 0x908e, 0x5000, 0x1140, 0x7034, 0x9005, 0x1904, 0x8490,</div><div class='del'>-	0x2009, 0x001c, 0x0804, 0x8440, 0x908e, 0x1300, 0x1120, 0x2009,</div><div class='del'>-	0x0034, 0x0804, 0x8440, 0x908e, 0x1200, 0x1140, 0x7034, 0x9005,</div><div class='del'>-	0x1904, 0x8490, 0x2009, 0x0024, 0x0804, 0x8440, 0x908c, 0xff00,</div><div class='del'>-	0x918e, 0x2400, 0x1170, 0x2009, 0x002d, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0xd09c, 0x0904, 0x8440, 0x080c, 0xdd8d, 0x1904, 0x8490, 0x0804,</div><div class='del'>-	0x843e, 0x908c, 0xff00, 0x918e, 0x5300, 0x1120, 0x2009, 0x002a,</div><div class='del'>-	0x0804, 0x8440, 0x908e, 0x0f00, 0x1120, 0x2009, 0x0020, 0x0804,</div><div class='del'>-	0x8440, 0x908e, 0x6104, 0x1530, 0x2029, 0x0205, 0x2011, 0x026d,</div><div class='del'>-	0x8208, 0x2204, 0x9082, 0x0004, 0x8004, 0x8004, 0x20a8, 0x2011,</div><div class='del'>-	0x8015, 0x211c, 0x8108, 0x0046, 0x2124, 0x080c, 0x4ca1, 0x004e,</div><div class='del'>-	0x8108, 0x0f04, 0x83f4, 0x9186, 0x0280, 0x1d88, 0x2504, 0x8000,</div><div class='del'>-	0x202a, 0x2009, 0x0260, 0x0c58, 0x202b, 0x0000, 0x2009, 0x0023,</div><div class='del'>-	0x0804, 0x8440, 0x908e, 0x6000, 0x1120, 0x2009, 0x003f, 0x0804,</div><div class='del'>-	0x8440, 0x908e, 0x5400, 0x1138, 0x080c, 0x8840, 0x1904, 0x8490,</div><div class='del'>-	0x2009, 0x0046, 0x04a8, 0x908e, 0x5500, 0x1148, 0x080c, 0x8868,</div><div class='del'>-	0x1118, 0x2009, 0x0041, 0x0460, 0x2009, 0x0042, 0x0448, 0x908e,</div><div class='del'>-	0x7800, 0x1118, 0x2009, 0x0045, 0x0418, 0x908e, 0x1000, 0x1118,</div><div class='del'>-	0x2009, 0x004e, 0x00e8, 0x908e, 0x6300, 0x1118, 0x2009, 0x004a,</div><div class='del'>-	0x00b8, 0x908c, 0xff00, 0x918e, 0x5600, 0x1118, 0x2009, 0x004f,</div><div class='del'>-	0x0078, 0x908c, 0xff00, 0x918e, 0x5700, 0x1118, 0x2009, 0x0050,</div><div class='del'>-	0x0038, 0x2009, 0x001d, 0x6838, 0xd0d4, 0x0110, 0x2009, 0x004c,</div><div class='del'>-	0x0016, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c, 0x080c, 0x268c,</div><div class='del'>-	0x1904, 0x8493, 0x080c, 0x6749, 0x1904, 0x8493, 0xbe12, 0xbd16,</div><div class='del'>-	0x001e, 0x0016, 0x080c, 0x779e, 0x01c0, 0x68dc, 0xd08c, 0x1148,</div><div class='del'>-	0x7000, 0x9084, 0x00ff, 0x1188, 0x7004, 0x9084, 0xff00, 0x1168,</div><div class='del'>-	0x0040, 0x687c, 0x9606, 0x1148, 0x6880, 0x9506, 0x9084, 0xff00,</div><div class='del'>-	0x1120, 0x9584, 0x00ff, 0xb886, 0x0080, 0xb884, 0x9005, 0x1168,</div><div class='del'>-	0x9186, 0x0046, 0x1150, 0x687c, 0x9606, 0x1138, 0x6880, 0x9506,</div><div class='del'>-	0x9084, 0xff00, 0x1110, 0x001e, 0x0098, 0x080c, 0xb116, 0x01a8,</div><div class='del'>-	0x2b08, 0x6112, 0x6023, 0x0004, 0x7120, 0x610a, 0x001e, 0x9186,</div><div class='del'>-	0x004c, 0x1110, 0x6023, 0x000a, 0x0016, 0x001e, 0x080c, 0xb20a,</div><div class='del'>-	0x00ce, 0x00be, 0x0005, 0x001e, 0x0cd8, 0x2001, 0x180e, 0x2004,</div><div class='del'>-	0xd0ec, 0x0120, 0x2011, 0x8049, 0x080c, 0x4ca1, 0x080c, 0xb1dd,</div><div class='del'>-	0x0d90, 0x2b08, 0x6112, 0x6023, 0x0004, 0x7120, 0x610a, 0x001e,</div><div class='del'>-	0x0016, 0x9186, 0x0017, 0x0118, 0x9186, 0x0030, 0x1128, 0x6007,</div><div class='del'>-	0x0009, 0x6017, 0x2900, 0x0020, 0x6007, 0x0051, 0x6017, 0x0000,</div><div class='del'>-	0x602f, 0x0009, 0x6003, 0x0001, 0x080c, 0x961e, 0x08a0, 0x080c,</div><div class='del'>-	0x88af, 0x1158, 0x080c, 0x344c, 0x1140, 0x7010, 0x9084, 0xff00,</div><div class='del'>-	0x8007, 0x908e, 0x0008, 0x1108, 0x0009, 0x0005, 0x00b6, 0x00c6,</div><div class='del'>-	0x0046, 0x7000, 0x908c, 0xff00, 0x810f, 0x9186, 0x0033, 0x11e8,</div><div class='del'>-	0x080c, 0x8742, 0x0904, 0x851d, 0x7124, 0x610a, 0x7030, 0x908e,</div><div class='del'>-	0x0200, 0x1140, 0x7034, 0x9005, 0x15c0, 0x2009, 0x0015, 0x080c,</div><div class='del'>-	0xb20a, 0x0498, 0x908e, 0x0100, 0x1580, 0x7034, 0x9005, 0x1568,</div><div class='del'>-	0x2009, 0x0016, 0x080c, 0xb20a, 0x0440, 0x9186, 0x0032, 0x1528,</div><div class='del'>-	0x7030, 0x908e, 0x1400, 0x1508, 0x2009, 0x0038, 0x0016, 0x2011,</div><div class='del'>-	0x0263, 0x2204, 0x8211, 0x220c, 0x080c, 0x268c, 0x11a8, 0x080c,</div><div class='del'>-	0x6749, 0x1190, 0xbe12, 0xbd16, 0x080c, 0xb116, 0x0168, 0x2b08,</div><div class='del'>-	0x6112, 0x080c, 0xd3b6, 0x6023, 0x0004, 0x7120, 0x610a, 0x001e,</div><div class='del'>-	0x080c, 0xb20a, 0x0010, 0x00ce, 0x001e, 0x004e, 0x00ce, 0x00be,</div><div class='del'>-	0x0005, 0x00b6, 0x0046, 0x00e6, 0x00d6, 0x2028, 0x2130, 0x9696,</div><div class='del'>-	0x00ff, 0x11b8, 0x9592, 0xfffc, 0x02a0, 0x9596, 0xfffd, 0x1120,</div><div class='del'>-	0x2009, 0x007f, 0x0804, 0x857f, 0x9596, 0xfffe, 0x1120, 0x2009,</div><div class='del'>-	0x007e, 0x0804, 0x857f, 0x9596, 0xfffc, 0x1118, 0x2009, 0x0080,</div><div class='del'>-	0x04f0, 0x2011, 0x0000, 0x2019, 0x1837, 0x231c, 0xd3ac, 0x0130,</div><div class='del'>-	0x9026, 0x20a9, 0x0800, 0x2071, 0x1000, 0x0030, 0x2021, 0x0081,</div><div class='del'>-	0x20a9, 0x077f, 0x2071, 0x1081, 0x2e1c, 0x93dd, 0x0000, 0x1140,</div><div class='del'>-	0x82ff, 0x11d0, 0x9496, 0x00ff, 0x01b8, 0x2410, 0xc2fd, 0x00a0,</div><div class='del'>-	0xbf10, 0x2600, 0x9706, 0xb814, 0x1120, 0x9546, 0x1110, 0x2408,</div><div class='del'>-	0x00b0, 0x9745, 0x1148, 0x94c6, 0x007e, 0x0130, 0x94c6, 0x007f,</div><div class='del'>-	0x0118, 0x94c6, 0x0080, 0x1d20, 0x8420, 0x8e70, 0x1f04, 0x8554,</div><div class='del'>-	0x82ff, 0x1118, 0x9085, 0x0001, 0x0018, 0xc2fc, 0x2208, 0x9006,</div><div class='del'>-	0x00de, 0x00ee, 0x004e, 0x00be, 0x0005, 0x2001, 0x1837, 0x200c,</div><div class='del'>-	0x9184, 0x0080, 0x0110, 0xd18c, 0x0138, 0x7000, 0x908c, 0xff00,</div><div class='del'>-	0x810f, 0x9184, 0x000f, 0x001a, 0x7817, 0x0140, 0x0005, 0x85a7,</div><div class='del'>-	0x85a7, 0x85a7, 0x8754, 0x85a7, 0x85aa, 0x85cf, 0x8658, 0x85a7,</div><div class='del'>-	0x85a7, 0x85a7, 0x85a7, 0x85a7, 0x85a7, 0x85a7, 0x85a7, 0x7817,</div><div class='del'>-	0x0140, 0x0005, 0x00b6, 0x7110, 0xd1bc, 0x01e8, 0x7120, 0x2160,</div><div class='del'>-	0x9c8c, 0x0003, 0x11c0, 0x9c8a, 0x1ddc, 0x02a8, 0x6868, 0x9c02,</div><div class='del'>-	0x1290, 0x7008, 0x9084, 0x00ff, 0x6110, 0x2158, 0xb910, 0x9106,</div><div class='del'>-	0x1150, 0x700c, 0xb914, 0x9106, 0x1130, 0x7124, 0x610a, 0x2009,</div><div class='del'>-	0x0046, 0x080c, 0xb20a, 0x7817, 0x0140, 0x00be, 0x0005, 0x00b6,</div><div class='del'>-	0x00c6, 0x9484, 0x0fff, 0x0904, 0x8634, 0x7110, 0xd1bc, 0x1904,</div><div class='del'>-	0x8634, 0x7108, 0x700c, 0x2028, 0x918c, 0x00ff, 0x2130, 0x9094,</div><div class='del'>-	0xff00, 0x15c8, 0x81ff, 0x15b8, 0x9080, 0x348e, 0x200d, 0x918c,</div><div class='del'>-	0xff00, 0x810f, 0x2001, 0x0080, 0x9106, 0x0904, 0x8634, 0x9182,</div><div class='del'>-	0x0801, 0x1a04, 0x8634, 0x9190, 0x1000, 0x2204, 0x905d, 0x05e0,</div><div class='del'>-	0xbe12, 0xbd16, 0xb800, 0xd0ec, 0x15b8, 0xba04, 0x9294, 0xff00,</div><div class='del'>-	0x9286, 0x0600, 0x1190, 0x080c, 0xb116, 0x0598, 0x2b08, 0x7028,</div><div class='del'>-	0x604e, 0x702c, 0x6052, 0x6112, 0x6023, 0x0006, 0x7120, 0x610a,</div><div class='del'>-	0x7130, 0x615e, 0x080c, 0xe009, 0x00f8, 0x080c, 0x6c11, 0x1138,</div><div class='del'>-	0xb807, 0x0606, 0x0c40, 0x190c, 0x8521, 0x11b0, 0x0880, 0x080c,</div><div class='del'>-	0xb116, 0x2b08, 0x0188, 0x6112, 0x6023, 0x0004, 0x7120, 0x610a,</div><div class='del'>-	0x9286, 0x0400, 0x1118, 0x6007, 0x0005, 0x0010, 0x6007, 0x0001,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x961e, 0x7817, 0x0140, 0x00ce, 0x00be,</div><div class='del'>-	0x0005, 0x2001, 0x180e, 0x2004, 0xd0ec, 0x0120, 0x2011, 0x8049,</div><div class='del'>-	0x080c, 0x4ca1, 0x080c, 0xb1dd, 0x0d78, 0x2b08, 0x6112, 0x6023,</div><div class='del'>-	0x0006, 0x7120, 0x610a, 0x7130, 0x615e, 0x6017, 0xf300, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0041, 0x2009, 0xa022, 0x080c, 0x9617, 0x08e0,</div><div class='del'>-	0x00b6, 0x7110, 0xd1bc, 0x05d0, 0x7020, 0x2060, 0x9c84, 0x0003,</div><div class='del'>-	0x15a8, 0x9c82, 0x1ddc, 0x0690, 0x6868, 0x9c02, 0x1678, 0x9484,</div><div class='del'>-	0x0fff, 0x9082, 0x000c, 0x0650, 0x7008, 0x9084, 0x00ff, 0x6110,</div><div class='del'>-	0x2158, 0xb910, 0x9106, 0x1510, 0x700c, 0xb914, 0x9106, 0x11f0,</div><div class='del'>-	0x7124, 0x610a, 0x601c, 0xd0fc, 0x11c8, 0x2001, 0x0271, 0x2004,</div><div class='del'>-	0x9005, 0x1180, 0x9484, 0x0fff, 0x9082, 0x000c, 0x0158, 0x0066,</div><div class='del'>-	0x2031, 0x0100, 0xa001, 0xa001, 0x8631, 0x1de0, 0x006e, 0x601c,</div><div class='del'>-	0xd0fc, 0x1120, 0x2009, 0x0045, 0x080c, 0xb20a, 0x7817, 0x0140,</div><div class='del'>-	0x00be, 0x0005, 0x6120, 0x9186, 0x0002, 0x0128, 0x9186, 0x0005,</div><div class='del'>-	0x0110, 0x9085, 0x0001, 0x0005, 0x080c, 0x88af, 0x1180, 0x080c,</div><div class='del'>-	0x344c, 0x1168, 0x7010, 0x9084, 0xff00, 0x8007, 0x9086, 0x0000,</div><div class='del'>-	0x1130, 0x9184, 0x000f, 0x908a, 0x0006, 0x1208, 0x000b, 0x0005,</div><div class='del'>-	0x86be, 0x86bf, 0x86be, 0x86be, 0x8724, 0x8733, 0x0005, 0x00b6,</div><div class='del'>-	0x700c, 0x7108, 0x080c, 0x268c, 0x1904, 0x8722, 0x080c, 0x6749,</div><div class='del'>-	0x1904, 0x8722, 0xbe12, 0xbd16, 0x7110, 0xd1bc, 0x0540, 0x702c,</div><div class='del'>-	0xd084, 0x1120, 0xb800, 0xd0bc, 0x1904, 0x8722, 0x080c, 0x6c11,</div><div class='del'>-	0x0148, 0x9086, 0x0004, 0x0130, 0x080c, 0x6c19, 0x0118, 0x9086,</div><div class='del'>-	0x0004, 0x1588, 0x00c6, 0x080c, 0x8742, 0x00ce, 0x05d8, 0x080c,</div><div class='del'>-	0xb116, 0x2b08, 0x05b8, 0x6112, 0x080c, 0xd3b6, 0x6023, 0x0002,</div><div class='del'>-	0x7120, 0x610a, 0x2009, 0x0088, 0x080c, 0xb20a, 0x0458, 0x080c,</div><div class='del'>-	0x6c11, 0x0148, 0x9086, 0x0004, 0x0130, 0x080c, 0x6c19, 0x0118,</div><div class='del'>-	0x9086, 0x0004, 0x1180, 0x080c, 0xb116, 0x2b08, 0x01d8, 0x6112,</div><div class='del'>-	0x080c, 0xd3b6, 0x6023, 0x0005, 0x7120, 0x610a, 0x2009, 0x0088,</div><div class='del'>-	0x080c, 0xb20a, 0x0078, 0x080c, 0xb116, 0x2b08, 0x0158, 0x6112,</div><div class='del'>-	0x080c, 0xd3b6, 0x6023, 0x0004, 0x7120, 0x610a, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0xb20a, 0x00be, 0x0005, 0x7110, 0xd1bc, 0x0158, 0x00d1,</div><div class='del'>-	0x0148, 0x080c, 0x869a, 0x1130, 0x7124, 0x610a, 0x2009, 0x0089,</div><div class='del'>-	0x080c, 0xb20a, 0x0005, 0x7110, 0xd1bc, 0x0158, 0x0059, 0x0148,</div><div class='del'>-	0x080c, 0x869a, 0x1130, 0x7124, 0x610a, 0x2009, 0x008a, 0x080c,</div><div class='del'>-	0xb20a, 0x0005, 0x7020, 0x2060, 0x9c84, 0x0003, 0x1158, 0x9c82,</div><div class='del'>-	0x1ddc, 0x0240, 0x2001, 0x181a, 0x2004, 0x9c02, 0x1218, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x9006, 0x0ce8, 0x00b6, 0x7110, 0xd1bc, 0x11d8,</div><div class='del'>-	0x7024, 0x2060, 0x9c84, 0x0003, 0x11b0, 0x9c82, 0x1ddc, 0x0298,</div><div class='del'>-	0x6868, 0x9c02, 0x1280, 0x7008, 0x9084, 0x00ff, 0x6110, 0x2158,</div><div class='del'>-	0xb910, 0x9106, 0x1140, 0x700c, 0xb914, 0x9106, 0x1120, 0x2009,</div><div class='del'>-	0x0051, 0x080c, 0xb20a, 0x7817, 0x0140, 0x00be, 0x0005, 0x2031,</div><div class='del'>-	0x0105, 0x0069, 0x0005, 0x2031, 0x0206, 0x0049, 0x0005, 0x2031,</div><div class='del'>-	0x0207, 0x0029, 0x0005, 0x2031, 0x0213, 0x0009, 0x0005, 0x00c6,</div><div class='del'>-	0x0096, 0x00f6, 0x7000, 0x9084, 0xf000, 0x9086, 0xc000, 0x05c0,</div><div class='del'>-	0x080c, 0xb116, 0x05a8, 0x0066, 0x00c6, 0x0046, 0x2011, 0x0263,</div><div class='del'>-	0x2204, 0x8211, 0x220c, 0x080c, 0x268c, 0x1590, 0x080c, 0x6749,</div><div class='del'>-	0x1578, 0xbe12, 0xbd16, 0x2b00, 0x004e, 0x00ce, 0x6012, 0x080c,</div><div class='del'>-	0xd3b6, 0x080c, 0x1059, 0x0500, 0x2900, 0x6062, 0x9006, 0xa802,</div><div class='del'>-	0xa866, 0xac6a, 0xa85c, 0x90f8, 0x001b, 0x20a9, 0x000e, 0xa860,</div><div class='del'>-	0x20e8, 0x20e1, 0x0000, 0x2fa0, 0x2e98, 0x4003, 0x006e, 0x6616,</div><div class='del'>-	0x6007, 0x003e, 0x6023, 0x0001, 0x6003, 0x0001, 0x080c, 0x961e,</div><div class='del'>-	0x00fe, 0x009e, 0x00ce, 0x0005, 0x080c, 0xb16c, 0x006e, 0x0cc0,</div><div class='del'>-	0x004e, 0x00ce, 0x0cc8, 0x00c6, 0x7000, 0x908c, 0xff00, 0x9184,</div><div class='del'>-	0xf000, 0x810f, 0x9086, 0x2000, 0x1904, 0x882a, 0x9186, 0x0022,</div><div class='del'>-	0x15f0, 0x2001, 0x0111, 0x2004, 0x9005, 0x1904, 0x882c, 0x7030,</div><div class='del'>-	0x908e, 0x0400, 0x0904, 0x882c, 0x908e, 0x6000, 0x05e8, 0x908e,</div><div class='del'>-	0x5400, 0x05d0, 0x908e, 0x0300, 0x11d8, 0x2009, 0x1837, 0x210c,</div><div class='del'>-	0xd18c, 0x1590, 0xd1a4, 0x1580, 0x080c, 0x6bcf, 0x0588, 0x68b0,</div><div class='del'>-	0x9084, 0x00ff, 0x7100, 0x918c, 0x00ff, 0x9106, 0x1518, 0x6880,</div><div class='del'>-	0x69b0, 0x918c, 0xff00, 0x9105, 0x7104, 0x9106, 0x11d8, 0x00e0,</div><div class='del'>-	0x2009, 0x0103, 0x210c, 0xd1b4, 0x11a8, 0x908e, 0x5200, 0x09e8,</div><div class='del'>-	0x908e, 0x0500, 0x09d0, 0x908e, 0x5000, 0x09b8, 0x0058, 0x9186,</div><div class='del'>-	0x0023, 0x1140, 0x080c, 0x8742, 0x0128, 0x6004, 0x9086, 0x0002,</div><div class='del'>-	0x0118, 0x0000, 0x9006, 0x0010, 0x9085, 0x0001, 0x00ce, 0x0005,</div><div class='del'>-	0x7030, 0x908e, 0x0300, 0x0118, 0x908e, 0x5200, 0x1d98, 0x2001,</div><div class='del'>-	0x1837, 0x2004, 0x9084, 0x0009, 0x9086, 0x0008, 0x0d68, 0x0c50,</div><div class='del'>-	0x0156, 0x0046, 0x0016, 0x0036, 0x7038, 0x2020, 0x8427, 0x94a4,</div><div class='del'>-	0x0007, 0xd484, 0x0148, 0x20a9, 0x0004, 0x2019, 0x1805, 0x2011,</div><div class='del'>-	0x027a, 0x080c, 0xc20e, 0x1178, 0xd48c, 0x0148, 0x20a9, 0x0004,</div><div class='del'>-	0x2019, 0x1801, 0x2011, 0x027e, 0x080c, 0xc20e, 0x1120, 0xd494,</div><div class='del'>-	0x0110, 0x9085, 0x0001, 0x003e, 0x001e, 0x004e, 0x015e, 0x0005,</div><div class='del'>-	0x0156, 0x0046, 0x0016, 0x0036, 0x7038, 0x2020, 0x8427, 0x94a4,</div><div class='del'>-	0x0007, 0xd484, 0x0148, 0x20a9, 0x0004, 0x2019, 0x1805, 0x2011,</div><div class='del'>-	0x0272, 0x080c, 0xc20e, 0x1178, 0xd48c, 0x0148, 0x20a9, 0x0004,</div><div class='del'>-	0x2019, 0x1801, 0x2011, 0x0276, 0x080c, 0xc20e, 0x1120, 0xd494,</div><div class='del'>-	0x0110, 0x9085, 0x0001, 0x003e, 0x001e, 0x004e, 0x015e, 0x0005,</div><div class='del'>-	0x00f6, 0x2079, 0x0200, 0x7800, 0xc0e5, 0xc0cc, 0x7802, 0x00fe,</div><div class='del'>-	0x0005, 0x00f6, 0x2079, 0x1800, 0x7834, 0xd084, 0x1130, 0x2079,</div><div class='del'>-	0x0200, 0x7800, 0x9085, 0x1200, 0x7802, 0x00fe, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0x1800, 0x7034, 0xc084, 0x7036, 0x00ee, 0x0005, 0x0016,</div><div class='del'>-	0x2001, 0x1837, 0x200c, 0x9184, 0x0080, 0x0118, 0xd18c, 0x0118,</div><div class='del'>-	0x9006, 0x001e, 0x0005, 0x9085, 0x0001, 0x0cd8, 0x2071, 0x1a04,</div><div class='del'>-	0x7003, 0x0003, 0x700f, 0x0361, 0x9006, 0x701a, 0x707a, 0x7012,</div><div class='del'>-	0x7017, 0x1ddc, 0x7007, 0x0000, 0x7026, 0x702b, 0xa2c0, 0x7032,</div><div class='del'>-	0x7037, 0xa33d, 0x7047, 0xffff, 0x704a, 0x704f, 0x56c4, 0x7052,</div><div class='del'>-	0x7063, 0x8a66, 0x080c, 0x1072, 0x090c, 0x0d85, 0x2900, 0x7042,</div><div class='del'>-	0xa867, 0x0003, 0xa86f, 0x0100, 0xa8ab, 0xdcb0, 0x0005, 0x2071,</div><div class='del'>-	0x1a04, 0x1d04, 0x8982, 0x2091, 0x6000, 0x700c, 0x8001, 0x700e,</div><div class='del'>-	0x1590, 0x2001, 0x013c, 0x2004, 0x9005, 0x190c, 0x8b10, 0x2001,</div><div class='del'>-	0x1869, 0x2004, 0xd0c4, 0x0158, 0x3a00, 0xd08c, 0x1140, 0x20d1,</div><div class='del'>-	0x0000, 0x20d1, 0x0001, 0x20d1, 0x0000, 0x080c, 0x0d85, 0x700f,</div><div class='del'>-	0x0361, 0x7007, 0x0001, 0x0126, 0x2091, 0x8000, 0x2069, 0x1800,</div><div class='del'>-	0x69ec, 0xd1e4, 0x1138, 0xd1dc, 0x1118, 0x080c, 0x8ad4, 0x0010,</div><div class='del'>-	0x080c, 0x8aab, 0x7048, 0x900d, 0x0148, 0x8109, 0x714a, 0x1130,</div><div class='del'>-	0x704c, 0x080f, 0x0018, 0x0126, 0x2091, 0x8000, 0x7024, 0x900d,</div><div class='del'>-	0x0188, 0x7020, 0x8001, 0x7022, 0x1168, 0x7023, 0x0009, 0x8109,</div><div class='del'>-	0x7126, 0x9186, 0x03e8, 0x1110, 0x7028, 0x080f, 0x81ff, 0x1110,</div><div class='del'>-	0x7028, 0x080f, 0x7030, 0x900d, 0x0180, 0x702c, 0x8001, 0x702e,</div><div class='del'>-	0x1160, 0x702f, 0x0009, 0x8109, 0x7132, 0x0128, 0x9184, 0x007f,</div><div class='del'>-	0x090c, 0xa3eb, 0x0010, 0x7034, 0x080f, 0x7044, 0x9005, 0x0118,</div><div class='del'>-	0x0310, 0x8001, 0x7046, 0x7054, 0x900d, 0x0168, 0x7050, 0x8001,</div><div class='del'>-	0x7052, 0x1148, 0x7053, 0x0009, 0x8109, 0x7156, 0x1120, 0x7158,</div><div class='del'>-	0x7156, 0x7060, 0x080f, 0x7018, 0x900d, 0x01d8, 0x0016, 0x7078,</div><div class='del'>-	0x900d, 0x0158, 0x7074, 0x8001, 0x7076, 0x1138, 0x7077, 0x0009,</div><div class='del'>-	0x8109, 0x717a, 0x1110, 0x707c, 0x080f, 0x001e, 0x7008, 0x8001,</div><div class='del'>-	0x700a, 0x1138, 0x700b, 0x0009, 0x8109, 0x711a, 0x1110, 0x701c,</div><div class='del'>-	0x080f, 0x012e, 0x7004, 0x0002, 0x89aa, 0x89ab, 0x89d5, 0x00e6,</div><div class='del'>-	0x2071, 0x1a04, 0x7018, 0x9005, 0x1120, 0x711a, 0x721e, 0x700b,</div><div class='del'>-	0x0009, 0x00ee, 0x0005, 0x00e6, 0x0006, 0x2071, 0x1a04, 0x701c,</div><div class='del'>-	0x9206, 0x1120, 0x701a, 0x701e, 0x707a, 0x707e, 0x000e, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x2071, 0x1a04, 0xb888, 0x9102, 0x0208, 0xb98a,</div><div class='del'>-	0x00ee, 0x0005, 0x0005, 0x00b6, 0x2031, 0x0010, 0x7110, 0x080c,</div><div class='del'>-	0x67b4, 0x11a8, 0xb888, 0x8001, 0x0290, 0xb88a, 0x1180, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x0066, 0xb8d0, 0x9005, 0x0138, 0x0026, 0xba3c,</div><div class='del'>-	0x0016, 0x080c, 0x68df, 0x001e, 0x002e, 0x006e, 0x012e, 0x8108,</div><div class='del'>-	0x9182, 0x0800, 0x1220, 0x8631, 0x0128, 0x7112, 0x0c00, 0x900e,</div><div class='del'>-	0x7007, 0x0002, 0x7112, 0x00be, 0x0005, 0x2031, 0x0010, 0x7014,</div><div class='del'>-	0x2060, 0x0126, 0x2091, 0x8000, 0x6048, 0x9005, 0x0128, 0x8001,</div><div class='del'>-	0x604a, 0x1110, 0x080c, 0xd237, 0x6018, 0x9005, 0x0904, 0x8a2d,</div><div class='del'>-	0x00f6, 0x2079, 0x0300, 0x7918, 0xd1b4, 0x1904, 0x8a40, 0x781b,</div><div class='del'>-	0x2020, 0xa001, 0x7918, 0xd1b4, 0x0120, 0x781b, 0x2000, 0x0804,</div><div class='del'>-	0x8a40, 0x8001, 0x601a, 0x0106, 0x781b, 0x2000, 0xa001, 0x7918,</div><div class='del'>-	0xd1ac, 0x1dd0, 0x010e, 0x00fe, 0x1540, 0x6120, 0x9186, 0x0003,</div><div class='del'>-	0x0148, 0x9186, 0x0006, 0x0130, 0x9186, 0x0009, 0x11e0, 0x611c,</div><div class='del'>-	0xd1c4, 0x1100, 0x080c, 0xcf1b, 0x01b0, 0x6014, 0x2048, 0xa884,</div><div class='del'>-	0x908a, 0x199a, 0x0280, 0x9082, 0x1999, 0xa886, 0x908a, 0x199a,</div><div class='del'>-	0x0210, 0x2001, 0x1999, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a,</div><div class='del'>-	0x080c, 0xd671, 0x0110, 0x080c, 0xcbd9, 0x012e, 0x9c88, 0x001c,</div><div class='del'>-	0x7116, 0x2001, 0x181a, 0x2004, 0x9102, 0x1228, 0x8631, 0x0138,</div><div class='del'>-	0x2160, 0x0804, 0x89d9, 0x7017, 0x1ddc, 0x7007, 0x0000, 0x0005,</div><div class='del'>-	0x00fe, 0x0c58, 0x00e6, 0x2071, 0x1a04, 0x7027, 0x07d0, 0x7023,</div><div class='del'>-	0x0009, 0x00ee, 0x0005, 0x2001, 0x1a0d, 0x2003, 0x0000, 0x0005,</div><div class='del'>-	0x00e6, 0x2071, 0x1a04, 0x7132, 0x702f, 0x0009, 0x00ee, 0x0005,</div><div class='del'>-	0x2011, 0x1a10, 0x2013, 0x0000, 0x0005, 0x00e6, 0x2071, 0x1a04,</div><div class='del'>-	0x711a, 0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x0086, 0x0026,</div><div class='del'>-	0x705c, 0x8000, 0x705e, 0x2001, 0x1a14, 0x2044, 0xa06c, 0x9086,</div><div class='del'>-	0x0000, 0x0150, 0x7070, 0xa09a, 0x706c, 0xa096, 0x7068, 0xa092,</div><div class='del'>-	0x7064, 0xa08e, 0x080c, 0x114e, 0x002e, 0x008e, 0x0005, 0x0006,</div><div class='del'>-	0x0016, 0x0096, 0x00a6, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6,</div><div class='del'>-	0x0156, 0x080c, 0x88e7, 0x015e, 0x00fe, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x00be, 0x00ae, 0x009e, 0x001e, 0x000e, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x1a04, 0x717a, 0x727e, 0x7077, 0x0009, 0x00ee, 0x0005, 0x00e6,</div><div class='del'>-	0x0006, 0x2071, 0x1a04, 0x707c, 0x9206, 0x1110, 0x707a, 0x707e,</div><div class='del'>-	0x000e, 0x00ee, 0x0005, 0x2069, 0x1800, 0x69ec, 0xd1e4, 0x1518,</div><div class='del'>-	0x0026, 0xd1ec, 0x0140, 0x6a54, 0x6874, 0x9202, 0x0288, 0x8117,</div><div class='del'>-	0x9294, 0x00c1, 0x0088, 0x9184, 0x0007, 0x01a0, 0x8109, 0x9184,</div><div class='del'>-	0x0007, 0x0110, 0x69ee, 0x0070, 0x8107, 0x9084, 0x0007, 0x910d,</div><div class='del'>-	0x8107, 0x9106, 0x9094, 0x00c1, 0x9184, 0xff3e, 0x9205, 0x68ee,</div><div class='del'>-	0x080c, 0x0f24, 0x002e, 0x0005, 0x69e8, 0x9184, 0x003f, 0x05b8,</div><div class='del'>-	0x8109, 0x9184, 0x003f, 0x01a8, 0x6a54, 0x6874, 0x9202, 0x0220,</div><div class='del'>-	0xd1bc, 0x0168, 0xc1bc, 0x0018, 0xd1bc, 0x1148, 0xc1bd, 0x2110,</div><div class='del'>-	0x00e6, 0x2071, 0x1800, 0x080c, 0x0f46, 0x00ee, 0x0400, 0x69ea,</div><div class='del'>-	0x00f0, 0x0026, 0x8107, 0x9094, 0x0007, 0x0128, 0x8001, 0x8007,</div><div class='del'>-	0x9085, 0x0007, 0x0050, 0x2010, 0x8004, 0x8004, 0x8004, 0x9084,</div><div class='del'>-	0x0007, 0x9205, 0x8007, 0x9085, 0x0028, 0x9086, 0x0040, 0x2010,</div><div class='del'>-	0x00e6, 0x2071, 0x1800, 0x080c, 0x0f46, 0x00ee, 0x002e, 0x0005,</div><div class='del'>-	0x0016, 0x00c6, 0x2009, 0xfff4, 0x210d, 0x2061, 0x0100, 0x60f0,</div><div class='del'>-	0x9100, 0x60f3, 0x0000, 0x2009, 0xfff4, 0x200f, 0x1220, 0x8108,</div><div class='del'>-	0x2105, 0x8000, 0x200f, 0x00ce, 0x001e, 0x0005, 0x00c6, 0x2061,</div><div class='del'>-	0x1a73, 0x00ce, 0x0005, 0x9184, 0x000f, 0x8003, 0x8003, 0x8003,</div><div class='del'>-	0x9080, 0x1a73, 0x2060, 0x0005, 0xa884, 0x908a, 0x199a, 0x1638,</div><div class='del'>-	0x9005, 0x1150, 0x00c6, 0x2061, 0x1a73, 0x6014, 0x00ce, 0x9005,</div><div class='del'>-	0x1130, 0x2001, 0x001e, 0x0018, 0x908e, 0xffff, 0x01b0, 0x8003,</div><div class='del'>-	0x800b, 0x810b, 0x9108, 0x611a, 0xa87c, 0x908c, 0x00c0, 0x918e,</div><div class='del'>-	0x00c0, 0x0904, 0x8bee, 0xd0b4, 0x1168, 0xd0bc, 0x1904, 0x8bc7,</div><div class='del'>-	0x2009, 0x0006, 0x080c, 0x8c1b, 0x0005, 0x900e, 0x0c60, 0x2001,</div><div class='del'>-	0x1999, 0x08b0, 0xd0fc, 0x05e0, 0x908c, 0x2023, 0x1568, 0x87ff,</div><div class='del'>-	0x1558, 0xa9a8, 0x81ff, 0x1540, 0x6124, 0x918c, 0x0500, 0x1520,</div><div class='del'>-	0x6100, 0x918e, 0x0007, 0x1500, 0x2009, 0x1869, 0x210c, 0xd184,</div><div class='del'>-	0x11d8, 0x6003, 0x0003, 0x6007, 0x0043, 0x6047, 0xb035, 0x080c,</div><div class='del'>-	0x1c6f, 0xa87c, 0xc0dd, 0xa87e, 0x600f, 0x0000, 0x00f6, 0x2079,</div><div class='del'>-	0x0380, 0x7818, 0xd0bc, 0x1de8, 0x7833, 0x0013, 0x2c00, 0x7836,</div><div class='del'>-	0x781b, 0x8080, 0x00fe, 0x0005, 0x908c, 0x0003, 0x0120, 0x918e,</div><div class='del'>-	0x0003, 0x1904, 0x8c15, 0x908c, 0x2020, 0x918e, 0x2020, 0x01a8,</div><div class='del'>-	0x6024, 0xd0d4, 0x11e8, 0x2009, 0x1869, 0x2104, 0xd084, 0x1138,</div><div class='del'>-	0x87ff, 0x1120, 0x2009, 0x0043, 0x0804, 0xb20a, 0x0005, 0x87ff,</div><div class='del'>-	0x1de8, 0x2009, 0x0042, 0x0804, 0xb20a, 0x6110, 0x00b6, 0x2158,</div><div class='del'>-	0xb900, 0x00be, 0xd1ac, 0x0d20, 0x6024, 0xc0cd, 0x6026, 0x0c00,</div><div class='del'>-	0xc0d4, 0x6026, 0xa890, 0x602e, 0xa88c, 0x6032, 0x08e0, 0xd0fc,</div><div class='del'>-	0x0160, 0x908c, 0x0003, 0x0120, 0x918e, 0x0003, 0x1904, 0x8c15,</div><div class='del'>-	0x908c, 0x2020, 0x918e, 0x2020, 0x0170, 0x0076, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0x17ad, 0x00fe, 0x007e, 0x87ff, 0x1120, 0x2009, 0x0042,</div><div class='del'>-	0x080c, 0xb20a, 0x0005, 0x6110, 0x00b6, 0x2158, 0xb900, 0x00be,</div><div class='del'>-	0xd1ac, 0x0d58, 0x6124, 0xc1cd, 0x6126, 0x0c38, 0xd0fc, 0x0188,</div><div class='del'>-	0x908c, 0x2020, 0x918e, 0x2020, 0x01a8, 0x9084, 0x0003, 0x908e,</div><div class='del'>-	0x0002, 0x0148, 0x87ff, 0x1120, 0x2009, 0x0041, 0x080c, 0xb20a,</div><div class='del'>-	0x0005, 0x00b9, 0x0ce8, 0x87ff, 0x1dd8, 0x2009, 0x0043, 0x080c,</div><div class='del'>-	0xb20a, 0x0cb0, 0x6110, 0x00b6, 0x2158, 0xb900, 0x00be, 0xd1ac,</div><div class='del'>-	0x0d20, 0x6124, 0xc1cd, 0x6126, 0x0c00, 0x2009, 0x0004, 0x0019,</div><div class='del'>-	0x0005, 0x2009, 0x0001, 0x0096, 0x080c, 0xcf1b, 0x0518, 0x6014,</div><div class='del'>-	0x2048, 0xa982, 0xa800, 0x6016, 0x9186, 0x0001, 0x1188, 0xa97c,</div><div class='del'>-	0x918c, 0x8100, 0x918e, 0x8100, 0x1158, 0x00c6, 0x2061, 0x1a73,</div><div class='del'>-	0x6200, 0xd28c, 0x1120, 0x6204, 0x8210, 0x0208, 0x6206, 0x00ce,</div><div class='del'>-	0x080c, 0x6e4c, 0x6014, 0x904d, 0x0076, 0x2039, 0x0000, 0x190c,</div><div class='del'>-	0x8b34, 0x007e, 0x009e, 0x0005, 0x0156, 0x00c6, 0x2061, 0x1a73,</div><div class='del'>-	0x6000, 0x81ff, 0x0110, 0x9205, 0x0008, 0x9204, 0x6002, 0x00ce,</div><div class='del'>-	0x015e, 0x0005, 0x6800, 0xd08c, 0x1138, 0x6808, 0x9005, 0x0120,</div><div class='del'>-	0x8001, 0x680a, 0x9085, 0x0001, 0x0005, 0x2071, 0x1924, 0x7003,</div><div class='del'>-	0x0006, 0x7007, 0x0000, 0x700f, 0x0000, 0x7013, 0x0001, 0x080c,</div><div class='del'>-	0x1072, 0x090c, 0x0d85, 0xa867, 0x0006, 0xa86b, 0x0001, 0xa8ab,</div><div class='del'>-	0xdcb0, 0xa89f, 0x0000, 0x2900, 0x702e, 0x7033, 0x0000, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x0096, 0x00e6, 0x2071, 0x1924, 0x702c,</div><div class='del'>-	0x2048, 0x6a2c, 0x721e, 0x6b30, 0x7322, 0x6834, 0x7026, 0xa896,</div><div class='del'>-	0x6838, 0x702a, 0xa89a, 0x6824, 0x7016, 0x683c, 0x701a, 0x2009,</div><div class='del'>-	0x0028, 0x200a, 0x9005, 0x0148, 0x900e, 0x9188, 0x000c, 0x8001,</div><div class='del'>-	0x1de0, 0x2100, 0x9210, 0x1208, 0x8318, 0xaa8e, 0xab92, 0x7010,</div><div class='del'>-	0xd084, 0x0168, 0xc084, 0x7007, 0x0001, 0x700f, 0x0000, 0x0006,</div><div class='del'>-	0x2009, 0x1b73, 0x2104, 0x9082, 0x0007, 0x200a, 0x000e, 0xc095,</div><div class='del'>-	0x7012, 0x2008, 0x2001, 0x003b, 0x080c, 0x16b9, 0x9006, 0x2071,</div><div class='del'>-	0x193d, 0x7002, 0x7006, 0x702a, 0x00ee, 0x009e, 0x012e, 0x0005,</div><div class='del'>-	0x2009, 0x1b73, 0x2104, 0x9080, 0x0007, 0x200a, 0x0005, 0x00e6,</div><div class='del'>-	0x0126, 0x0156, 0x2091, 0x8000, 0x2071, 0x1800, 0x7154, 0x2001,</div><div class='del'>-	0x0008, 0x910a, 0x0638, 0x2001, 0x187d, 0x20ac, 0x9006, 0x9080,</div><div class='del'>-	0x0008, 0x1f04, 0x8cd7, 0x71c0, 0x9102, 0x02e0, 0x2071, 0x1877,</div><div class='del'>-	0x20a9, 0x0007, 0x00c6, 0x080c, 0xb116, 0x6023, 0x0009, 0x6003,</div><div class='del'>-	0x0004, 0x601f, 0x0101, 0x0089, 0x0126, 0x2091, 0x8000, 0x080c,</div><div class='del'>-	0x8e58, 0x012e, 0x1f04, 0x8ce3, 0x9006, 0x00ce, 0x015e, 0x012e,</div><div class='del'>-	0x00ee, 0x0005, 0x9085, 0x0001, 0x0cc8, 0x00e6, 0x00b6, 0x0096,</div><div class='del'>-	0x0086, 0x0056, 0x0046, 0x0026, 0x7118, 0x720c, 0x7620, 0x7004,</div><div class='del'>-	0xd084, 0x1128, 0x2021, 0x0024, 0x2029, 0x0002, 0x0020, 0x2021,</div><div class='del'>-	0x002c, 0x2029, 0x000a, 0x080c, 0x1059, 0x090c, 0x0d85, 0x2900,</div><div class='del'>-	0x6016, 0x2058, 0xac66, 0x9006, 0xa802, 0xa806, 0xa86a, 0xa87a,</div><div class='del'>-	0xa8aa, 0xa887, 0x0005, 0xa87f, 0x0020, 0x7008, 0xa89a, 0x7010,</div><div class='del'>-	0xa89e, 0xae8a, 0xa8af, 0xffff, 0xa8b3, 0x0000, 0x8109, 0x0160,</div><div class='del'>-	0x080c, 0x1059, 0x090c, 0x0d85, 0xad66, 0x2b00, 0xa802, 0x2900,</div><div class='del'>-	0xb806, 0x2058, 0x8109, 0x1da0, 0x002e, 0x004e, 0x005e, 0x008e,</div><div class='del'>-	0x009e, 0x00be, 0x00ee, 0x0005, 0x2079, 0x0000, 0x2071, 0x1924,</div><div class='del'>-	0x7004, 0x004b, 0x700c, 0x0002, 0x8d4f, 0x8d48, 0x8d48, 0x0005,</div><div class='del'>-	0x8d59, 0x8daf, 0x8daf, 0x8daf, 0x8db0, 0x8dc1, 0x8dc1, 0x700c,</div><div class='del'>-	0x0cba, 0x0126, 0x2091, 0x8000, 0x78a0, 0x79a0, 0x9106, 0x1904,</div><div class='del'>-	0x8da1, 0x7814, 0xd0bc, 0x1904, 0x8daa, 0x012e, 0x7018, 0x910a,</div><div class='del'>-	0x1128, 0x7030, 0x9005, 0x1904, 0x8df3, 0x0005, 0x1210, 0x7114,</div><div class='del'>-	0x910a, 0x9192, 0x000a, 0x0210, 0x2009, 0x000a, 0x2001, 0x1888,</div><div class='del'>-	0x2014, 0x2001, 0x1936, 0x2004, 0x9100, 0x9202, 0x0e50, 0x080c,</div><div class='del'>-	0x8f53, 0x2200, 0x9102, 0x0208, 0x2208, 0x0096, 0x702c, 0x2048,</div><div class='del'>-	0xa873, 0x0001, 0xa976, 0x080c, 0x905c, 0x2100, 0xa87e, 0xa86f,</div><div class='del'>-	0x0000, 0x009e, 0x0126, 0x2091, 0x8000, 0x2009, 0x1a24, 0x2104,</div><div class='del'>-	0xc085, 0x200a, 0x700f, 0x0002, 0x012e, 0x080c, 0x116d, 0x1de8,</div><div class='del'>-	0x0005, 0x78a0, 0x79a0, 0x9106, 0x0904, 0x8d61, 0x080c, 0x8f2b,</div><div class='del'>-	0x012e, 0x0005, 0x7810, 0xc0c5, 0x7812, 0x0804, 0x8d61, 0x0005,</div><div class='del'>-	0x700c, 0x0002, 0x8db5, 0x8db8, 0x8db7, 0x080c, 0x8d57, 0x0005,</div><div class='del'>-	0x8001, 0x700e, 0x0096, 0x702c, 0x2048, 0xa974, 0x009e, 0x0011,</div><div class='del'>-	0x0ca0, 0x0005, 0x0096, 0x702c, 0x2048, 0x7018, 0x9100, 0x7214,</div><div class='del'>-	0x921a, 0x1130, 0x701c, 0xa88e, 0x7020, 0xa892, 0x9006, 0x0068,</div><div class='del'>-	0x0006, 0x080c, 0x905c, 0x2100, 0xaa8c, 0x9210, 0xaa8e, 0x1220,</div><div class='del'>-	0xa890, 0x9081, 0x0000, 0xa892, 0x000e, 0x009e, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x78a2, 0x701a, 0x080c, 0x8f2b, 0x012e, 0x0005, 0x00e6,</div><div class='del'>-	0x2071, 0x1924, 0x700c, 0x0002, 0x8df1, 0x8df1, 0x8def, 0x700f,</div><div class='del'>-	0x0001, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x7030, 0x9005,</div><div class='del'>-	0x0508, 0x2078, 0x7814, 0x2048, 0xae88, 0x00b6, 0x2059, 0x0000,</div><div class='del'>-	0x080c, 0x8e61, 0x00be, 0x01b0, 0x00e6, 0x2071, 0x193d, 0x080c,</div><div class='del'>-	0x8ea8, 0x00ee, 0x0178, 0x0096, 0x080c, 0x1072, 0x2900, 0x009e,</div><div class='del'>-	0x0148, 0xa8aa, 0x04d1, 0x0041, 0x2001, 0x1947, 0x2003, 0x0000,</div><div class='del'>-	0x012e, 0x08c8, 0x012e, 0x0005, 0x00d6, 0x00c6, 0x0086, 0x00a6,</div><div class='del'>-	0x2940, 0x2650, 0x2600, 0x9005, 0x0180, 0xa864, 0x9084, 0x000f,</div><div class='del'>-	0x2068, 0x9d88, 0x1ec1, 0x2165, 0x0056, 0x2029, 0x0000, 0x080c,</div><div class='del'>-	0x8fe1, 0x080c, 0x1e97, 0x1dd8, 0x005e, 0x00ae, 0x2001, 0x187f,</div><div class='del'>-	0x2004, 0xa88a, 0x00c6, 0x2f60, 0x080c, 0x17ad, 0x00ce, 0x781f,</div><div class='del'>-	0x0101, 0x7813, 0x0000, 0x0126, 0x2091, 0x8000, 0x080c, 0x8eb7,</div><div class='del'>-	0x012e, 0x008e, 0x00ce, 0x00de, 0x0005, 0x7030, 0x9005, 0x0138,</div><div class='del'>-	0x2078, 0x780c, 0x7032, 0x2001, 0x1947, 0x2003, 0x0001, 0x0005,</div><div class='del'>-	0x00e6, 0x2071, 0x1924, 0x7030, 0x600e, 0x2c00, 0x7032, 0x00ee,</div><div class='del'>-	0x0005, 0x00d6, 0x00c6, 0x0026, 0x9b80, 0x912a, 0x2005, 0x906d,</div><div class='del'>-	0x090c, 0x0d85, 0x9b80, 0x9122, 0x2005, 0x9065, 0x090c, 0x0d85,</div><div class='del'>-	0x6114, 0x2600, 0x9102, 0x0248, 0x6828, 0x9102, 0x02f0, 0x9085,</div><div class='del'>-	0x0001, 0x002e, 0x00ce, 0x00de, 0x0005, 0x6804, 0xd094, 0x0148,</div><div class='del'>-	0x6854, 0xd084, 0x1178, 0xc085, 0x6856, 0x2011, 0x8026, 0x080c,</div><div class='del'>-	0x4ca1, 0x684c, 0x0096, 0x904d, 0x090c, 0x0d85, 0xa804, 0x8000,</div><div class='del'>-	0xa806, 0x009e, 0x9006, 0x2030, 0x0c20, 0x6854, 0xd08c, 0x1d08,</div><div class='del'>-	0xc08d, 0x6856, 0x2011, 0x8025, 0x080c, 0x4ca1, 0x684c, 0x0096,</div><div class='del'>-	0x904d, 0x090c, 0x0d85, 0xa800, 0x8000, 0xa802, 0x009e, 0x0888,</div><div class='del'>-	0x7000, 0x2019, 0x0008, 0x8319, 0x7104, 0x9102, 0x1118, 0x2300,</div><div class='del'>-	0x9005, 0x0020, 0x0210, 0x9302, 0x0008, 0x8002, 0x0005, 0x00d6,</div><div class='del'>-	0x7814, 0x9005, 0x090c, 0x0d85, 0x781c, 0x9084, 0x0101, 0x9086,</div><div class='del'>-	0x0101, 0x190c, 0x0d85, 0x7827, 0x0000, 0x2069, 0x193d, 0x6804,</div><div class='del'>-	0x9080, 0x193f, 0x2f08, 0x2102, 0x6904, 0x8108, 0x9182, 0x0008,</div><div class='del'>-	0x0208, 0x900e, 0x6906, 0x9180, 0x193f, 0x2003, 0x0000, 0x00de,</div><div class='del'>-	0x0005, 0x0096, 0x00c6, 0x2060, 0x6014, 0x2048, 0xa8a8, 0x0096,</div><div class='del'>-	0x2048, 0x9005, 0x190c, 0x108b, 0x009e, 0xa8ab, 0x0000, 0x080c,</div><div class='del'>-	0x100b, 0x080c, 0xb16c, 0x00ce, 0x009e, 0x0005, 0x6020, 0x9086,</div><div class='del'>-	0x0009, 0x1128, 0x601c, 0xd0c4, 0x0110, 0x9006, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x6000, 0x9086, 0x0000, 0x0178, 0x6010, 0x9005,</div><div class='del'>-	0x0150, 0x00b6, 0x2058, 0x080c, 0x925e, 0x00be, 0x6013, 0x0000,</div><div class='del'>-	0x601b, 0x0000, 0x0010, 0x2c00, 0x0861, 0x0005, 0x2009, 0x1928,</div><div class='del'>-	0x210c, 0xd194, 0x0005, 0x2009, 0x1928, 0x210c, 0xd1c4, 0x0005,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x00e6, 0x2071, 0x1924, 0x7110, 0xc194,</div><div class='del'>-	0xc185, 0x7007, 0x0000, 0x7112, 0x2001, 0x003b, 0x080c, 0x16b9,</div><div class='del'>-	0x00ee, 0x012e, 0x0005, 0x7814, 0xd0bc, 0x1108, 0x0005, 0x7810,</div><div class='del'>-	0xc0c5, 0x7812, 0x0cc0, 0x0096, 0x00d6, 0x9006, 0x7006, 0x700e,</div><div class='del'>-	0x701a, 0x701e, 0x7022, 0x7016, 0x702a, 0x7026, 0x702f, 0x0000,</div><div class='del'>-	0x080c, 0x90aa, 0x0170, 0x080c, 0x90df, 0x0158, 0x2900, 0x7002,</div><div class='del'>-	0x700a, 0x701a, 0x7013, 0x0001, 0x701f, 0x000a, 0x00de, 0x009e,</div><div class='del'>-	0x0005, 0x900e, 0x0cd8, 0x00e6, 0x0096, 0x0086, 0x00d6, 0x00c6,</div><div class='del'>-	0x2071, 0x1931, 0x721c, 0x2100, 0x9202, 0x1618, 0x080c, 0x90df,</div><div class='del'>-	0x090c, 0x0d85, 0x7018, 0x9005, 0x1160, 0x2900, 0x7002, 0x700a,</div><div class='del'>-	0x701a, 0x9006, 0x7006, 0x700e, 0xa806, 0xa802, 0x7012, 0x701e,</div><div class='del'>-	0x0038, 0x2040, 0xa806, 0x2900, 0xa002, 0x701a, 0xa803, 0x0000,</div><div class='del'>-	0x7010, 0x8000, 0x7012, 0x701c, 0x9080, 0x000a, 0x701e, 0x721c,</div><div class='del'>-	0x08d0, 0x721c, 0x00ce, 0x00de, 0x008e, 0x009e, 0x00ee, 0x0005,</div><div class='del'>-	0x0096, 0x0156, 0x0136, 0x0146, 0x00e6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2071, 0x1931, 0x7300, 0x831f, 0x831e, 0x831e, 0x9384, 0x003f,</div><div class='del'>-	0x20e8, 0x939c, 0xffc0, 0x9398, 0x0003, 0x7104, 0x080c, 0x905c,</div><div class='del'>-	0x810c, 0x2100, 0x9318, 0x8003, 0x2228, 0x2021, 0x0078, 0x9402,</div><div class='del'>-	0x9532, 0x0208, 0x2028, 0x2500, 0x8004, 0x20a8, 0x23a0, 0xa001,</div><div class='del'>-	0xa001, 0x4005, 0x2508, 0x080c, 0x9065, 0x2130, 0x7014, 0x9600,</div><div class='del'>-	0x7016, 0x2600, 0x711c, 0x9102, 0x701e, 0x7004, 0x9600, 0x2008,</div><div class='del'>-	0x9082, 0x000a, 0x1190, 0x7000, 0x2048, 0xa800, 0x9005, 0x1148,</div><div class='del'>-	0x2009, 0x0001, 0x0026, 0x080c, 0x8f53, 0x002e, 0x7000, 0x2048,</div><div class='del'>-	0xa800, 0x7002, 0x7007, 0x0000, 0x0008, 0x7106, 0x2500, 0x9212,</div><div class='del'>-	0x1904, 0x8f92, 0x012e, 0x00ee, 0x014e, 0x013e, 0x015e, 0x009e,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x00e6, 0x0126, 0x2091, 0x8000, 0x9580,</div><div class='del'>-	0x9122, 0x2005, 0x9075, 0x090c, 0x0d85, 0x080c, 0x9037, 0x012e,</div><div class='del'>-	0x9580, 0x911e, 0x2005, 0x9075, 0x090c, 0x0d85, 0x0156, 0x0136,</div><div class='del'>-	0x01c6, 0x0146, 0x01d6, 0x831f, 0x831e, 0x831e, 0x9384, 0x003f,</div><div class='del'>-	0x20e0, 0x9384, 0xffc0, 0x9100, 0x2098, 0xa860, 0x20e8, 0xa95c,</div><div class='del'>-	0x2c05, 0x9100, 0x20a0, 0x20a9, 0x0002, 0x4003, 0x2e0c, 0x2d00,</div><div class='del'>-	0x0002, 0x9021, 0x9021, 0x9023, 0x9021, 0x9023, 0x9021, 0x9021,</div><div class='del'>-	0x9021, 0x9021, 0x9021, 0x9029, 0x9021, 0x9029, 0x9021, 0x9021,</div><div class='del'>-	0x9021, 0x080c, 0x0d85, 0x4104, 0x20a9, 0x0002, 0x4002, 0x4003,</div><div class='del'>-	0x0028, 0x20a9, 0x0002, 0x4003, 0x4104, 0x4003, 0x01de, 0x014e,</div><div class='del'>-	0x01ce, 0x013e, 0x015e, 0x00ee, 0x002e, 0x001e, 0x0005, 0x0096,</div><div class='del'>-	0x7014, 0x8001, 0x7016, 0x710c, 0x2110, 0x00f1, 0x810c, 0x9188,</div><div class='del'>-	0x0003, 0x7308, 0x8210, 0x9282, 0x000a, 0x1198, 0x7008, 0x2048,</div><div class='del'>-	0xa800, 0x9005, 0x0158, 0x0006, 0x080c, 0x90ee, 0x009e, 0xa807,</div><div class='del'>-	0x0000, 0x2900, 0x700a, 0x7010, 0x8001, 0x7012, 0x700f, 0x0000,</div><div class='del'>-	0x0008, 0x720e, 0x009e, 0x0005, 0x0006, 0x810b, 0x810b, 0x2100,</div><div class='del'>-	0x810b, 0x9100, 0x2008, 0x000e, 0x0005, 0x0006, 0x0026, 0x2100,</div><div class='del'>-	0x9005, 0x0158, 0x9092, 0x000c, 0x0240, 0x900e, 0x8108, 0x9082,</div><div class='del'>-	0x000c, 0x1de0, 0x002e, 0x000e, 0x0005, 0x900e, 0x0cd8, 0x2d00,</div><div class='del'>-	0x90b8, 0x0008, 0x2031, 0x90a8, 0x901e, 0x6808, 0x9005, 0x0108,</div><div class='del'>-	0x8318, 0x690c, 0x910a, 0x0248, 0x0140, 0x8318, 0x6810, 0x9112,</div><div class='del'>-	0x0220, 0x0118, 0x8318, 0x2208, 0x0cd0, 0x233a, 0x6804, 0xd084,</div><div class='del'>-	0x2300, 0x2021, 0x0001, 0x1150, 0x9082, 0x0003, 0x0967, 0x0a67,</div><div class='del'>-	0x8420, 0x9082, 0x0007, 0x0967, 0x0a67, 0x0cd0, 0x9082, 0x0002,</div><div class='del'>-	0x0967, 0x0a67, 0x8420, 0x9082, 0x0005, 0x0967, 0x0a67, 0x0cd0,</div><div class='del'>-	0x6c1a, 0x0005, 0x0096, 0x0046, 0x0126, 0x2091, 0x8000, 0x2b00,</div><div class='del'>-	0x9080, 0x9126, 0x2005, 0x9005, 0x090c, 0x0d85, 0x2004, 0x90a0,</div><div class='del'>-	0x000a, 0x080c, 0x1072, 0x01d0, 0x2900, 0x7026, 0xa803, 0x0000,</div><div class='del'>-	0xa807, 0x0000, 0x080c, 0x1072, 0x0188, 0x7024, 0xa802, 0xa807,</div><div class='del'>-	0x0000, 0x2900, 0x7026, 0x94a2, 0x000a, 0x0110, 0x0208, 0x0c90,</div><div class='del'>-	0x9085, 0x0001, 0x012e, 0x004e, 0x009e, 0x0005, 0x7024, 0x9005,</div><div class='del'>-	0x0dc8, 0x2048, 0xac00, 0x080c, 0x108b, 0x2400, 0x0cc0, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x7024, 0x2048, 0x9005, 0x0130, 0xa800, 0x7026,</div><div class='del'>-	0xa803, 0x0000, 0xa807, 0x0000, 0x012e, 0x0005, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x7024, 0xa802, 0x2900, 0x7026, 0x012e, 0x0005, 0x0096,</div><div class='del'>-	0x9e80, 0x0009, 0x2004, 0x9005, 0x0138, 0x2048, 0xa800, 0x0006,</div><div class='del'>-	0x080c, 0x108b, 0x000e, 0x0cb8, 0x009e, 0x0005, 0x0096, 0x7008,</div><div class='del'>-	0x9005, 0x0138, 0x2048, 0xa800, 0x0006, 0x080c, 0x108b, 0x000e,</div><div class='del'>-	0x0cb8, 0x9006, 0x7002, 0x700a, 0x7006, 0x700e, 0x701a, 0x701e,</div><div class='del'>-	0x7022, 0x702a, 0x7026, 0x702e, 0x009e, 0x0005, 0x1a71, 0x0000,</div><div class='del'>-	0x0000, 0x0000, 0x1931, 0x0000, 0x0000, 0x0000, 0x1888, 0x0000,</div><div class='del'>-	0x0000, 0x0000, 0x1877, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00c6,</div><div class='del'>-	0x00b6, 0x00a6, 0xa8a8, 0x2040, 0x2071, 0x1877, 0x080c, 0x924a,</div><div class='del'>-	0xa067, 0x0023, 0x6010, 0x905d, 0x0904, 0x921f, 0xb814, 0xa06e,</div><div class='del'>-	0xb910, 0xa172, 0xb9a0, 0xa176, 0x2001, 0x0003, 0xa07e, 0xa834,</div><div class='del'>-	0xa082, 0xa07b, 0x0000, 0xa898, 0x9005, 0x0118, 0xa078, 0xc085,</div><div class='del'>-	0xa07a, 0x2858, 0x2031, 0x0018, 0xa068, 0x908a, 0x0019, 0x1a0c,</div><div class='del'>-	0x0d85, 0x2020, 0x2050, 0x2940, 0xa864, 0x90bc, 0x00ff, 0x908c,</div><div class='del'>-	0x000f, 0x91e0, 0x1ec1, 0x2c65, 0x9786, 0x0024, 0x2c05, 0x1590,</div><div class='del'>-	0x908a, 0x0036, 0x1a0c, 0x0d85, 0x9082, 0x001b, 0x0002, 0x918a,</div><div class='del'>-	0x918a, 0x918c, 0x918a, 0x918a, 0x918a, 0x918e, 0x918a, 0x918a,</div><div class='del'>-	0x918a, 0x9190, 0x918a, 0x918a, 0x918a, 0x9192, 0x918a, 0x918a,</div><div class='del'>-	0x918a, 0x9194, 0x918a, 0x918a, 0x918a, 0x9196, 0x918a, 0x918a,</div><div class='del'>-	0x918a, 0x9198, 0x080c, 0x0d85, 0xa180, 0x04b8, 0xa190, 0x04a8,</div><div class='del'>-	0xa1a0, 0x0498, 0xa1b0, 0x0488, 0xa1c0, 0x0478, 0xa1d0, 0x0468,</div><div class='del'>-	0xa1e0, 0x0458, 0x908a, 0x0034, 0x1a0c, 0x0d85, 0x9082, 0x001b,</div><div class='del'>-	0x0002, 0x91bc, 0x91ba, 0x91ba, 0x91ba, 0x91ba, 0x91ba, 0x91be,</div><div class='del'>-	0x91ba, 0x91ba, 0x91ba, 0x91ba, 0x91ba, 0x91c0, 0x91ba, 0x91ba,</div><div class='del'>-	0x91ba, 0x91ba, 0x91ba, 0x91c2, 0x91ba, 0x91ba, 0x91ba, 0x91ba,</div><div class='del'>-	0x91ba, 0x91c4, 0x080c, 0x0d85, 0xa180, 0x0038, 0xa198, 0x0028,</div><div class='del'>-	0xa1b0, 0x0018, 0xa1c8, 0x0008, 0xa1e0, 0x2600, 0x0002, 0x91e0,</div><div class='del'>-	0x91e2, 0x91e4, 0x91e6, 0x91e8, 0x91ea, 0x91ec, 0x91ee, 0x91f0,</div><div class='del'>-	0x91f2, 0x91f4, 0x91f6, 0x91f8, 0x91fa, 0x91fc, 0x91fe, 0x9200,</div><div class='del'>-	0x9202, 0x9204, 0x9206, 0x9208, 0x920a, 0x920c, 0x920e, 0x9210,</div><div class='del'>-	0x080c, 0x0d85, 0xb9e2, 0x0468, 0xb9de, 0x0458, 0xb9da, 0x0448,</div><div class='del'>-	0xb9d6, 0x0438, 0xb9d2, 0x0428, 0xb9ce, 0x0418, 0xb9ca, 0x0408,</div><div class='del'>-	0xb9c6, 0x00f8, 0xb9c2, 0x00e8, 0xb9be, 0x00d8, 0xb9ba, 0x00c8,</div><div class='del'>-	0xb9b6, 0x00b8, 0xb9b2, 0x00a8, 0xb9ae, 0x0098, 0xb9aa, 0x0088,</div><div class='del'>-	0xb9a6, 0x0078, 0xb9a2, 0x0068, 0xb99e, 0x0058, 0xb99a, 0x0048,</div><div class='del'>-	0xb996, 0x0038, 0xb992, 0x0028, 0xb98e, 0x0018, 0xb98a, 0x0008,</div><div class='del'>-	0xb986, 0x8631, 0x8421, 0x0130, 0x080c, 0x1e97, 0x090c, 0x0d85,</div><div class='del'>-	0x0804, 0x9164, 0x00ae, 0x00be, 0x00ce, 0x00ee, 0x0005, 0xa86c,</div><div class='del'>-	0xa06e, 0xa870, 0xa072, 0xa077, 0x00ff, 0x9006, 0x0804, 0x9146,</div><div class='del'>-	0x0006, 0x0016, 0x00b6, 0x6010, 0x2058, 0xb810, 0x9005, 0x01b0,</div><div class='del'>-	0x2001, 0x1925, 0x2004, 0x9005, 0x0188, 0x2001, 0x1800, 0x2004,</div><div class='del'>-	0x9086, 0x0003, 0x1158, 0x0036, 0x0046, 0xbba0, 0x2021, 0x0004,</div><div class='del'>-	0x2011, 0x8014, 0x080c, 0x4ca1, 0x004e, 0x003e, 0x00be, 0x001e,</div><div class='del'>-	0x000e, 0x0005, 0x9016, 0x710c, 0xa834, 0x910a, 0xa936, 0x7008,</div><div class='del'>-	0x9005, 0x0120, 0x8210, 0x910a, 0x0230, 0x0128, 0x7010, 0x8210,</div><div class='del'>-	0x910a, 0x0208, 0x1de0, 0xaa8a, 0xa26a, 0x0005, 0x00f6, 0x00d6,</div><div class='del'>-	0x0036, 0x2079, 0x0300, 0x781b, 0x0200, 0x7818, 0xd094, 0x1dd8,</div><div class='del'>-	0x781b, 0x0202, 0xa001, 0xa001, 0x7818, 0xd094, 0x1da0, 0xb8ac,</div><div class='del'>-	0x906d, 0x0198, 0x2079, 0x0000, 0x9c1e, 0x1118, 0x680c, 0xb8ae,</div><div class='del'>-	0x0050, 0x9c06, 0x0130, 0x2d78, 0x680c, 0x906d, 0x1dd0, 0x080c,</div><div class='del'>-	0x0d85, 0x6b0c, 0x7b0e, 0x600f, 0x0000, 0x2079, 0x0300, 0x781b,</div><div class='del'>-	0x0200, 0x003e, 0x00de, 0x00fe, 0x0005, 0x00e6, 0x00d6, 0x0096,</div><div class='del'>-	0x00c6, 0x0036, 0x0126, 0x2091, 0x8000, 0x0156, 0x20a9, 0x01ff,</div><div class='del'>-	0x2071, 0x0300, 0x701b, 0x0200, 0x7018, 0xd094, 0x0110, 0x1f04,</div><div class='del'>-	0x929a, 0x701b, 0x0202, 0xa001, 0xa001, 0x7018, 0xd094, 0x1d90,</div><div class='del'>-	0xb8ac, 0x9065, 0x01f0, 0x600c, 0xb8ae, 0x6024, 0xc08d, 0x6026,</div><div class='del'>-	0x6003, 0x0004, 0x601b, 0x0000, 0x6013, 0x0000, 0x601f, 0x0101,</div><div class='del'>-	0x6014, 0x904d, 0x090c, 0x0d85, 0xa88b, 0x0000, 0xa8a8, 0xa8ab,</div><div class='del'>-	0x0000, 0x904d, 0x090c, 0x0d85, 0x080c, 0x108b, 0x080c, 0x8e58,</div><div class='del'>-	0x08f8, 0x2071, 0x0300, 0x701b, 0x0200, 0x015e, 0x012e, 0x003e,</div><div class='del'>-	0x00ce, 0x009e, 0x00de, 0x00ee, 0x0005, 0x00c6, 0x00b6, 0x0016,</div><div class='del'>-	0x0006, 0x0156, 0x080c, 0x268c, 0x015e, 0x11b0, 0x080c, 0x6749,</div><div class='del'>-	0x190c, 0x0d85, 0x000e, 0x001e, 0xb912, 0xb816, 0x080c, 0xb116,</div><div class='del'>-	0x0140, 0x2b00, 0x6012, 0x6023, 0x0001, 0x2009, 0x0001, 0x080c,</div><div class='del'>-	0xb20a, 0x00be, 0x00ce, 0x0005, 0x000e, 0x001e, 0x0cd0, 0x0066,</div><div class='del'>-	0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0d85, 0x0013, 0x006e, 0x0005,</div><div class='del'>-	0x9310, 0x9310, 0x9310, 0x9312, 0x935b, 0x9310, 0x9310, 0x9310,</div><div class='del'>-	0x93d5, 0x9310, 0x940d, 0x9310, 0x9310, 0x9310, 0x9310, 0x9310,</div><div class='del'>-	0x080c, 0x0d85, 0x9182, 0x0040, 0x0002, 0x9325, 0x9325, 0x9325,</div><div class='del'>-	0x9325, 0x9325, 0x9325, 0x9325, 0x9325, 0x9325, 0x9327, 0x9338,</div><div class='del'>-	0x9325, 0x9325, 0x9325, 0x9325, 0x9349, 0x080c, 0x0d85, 0x0096,</div><div class='del'>-	0x6114, 0x2148, 0xa87b, 0x0000, 0x6010, 0x00b6, 0x2058, 0xb8bb,</div><div class='del'>-	0x0500, 0x00be, 0x080c, 0x6e11, 0x080c, 0xb16c, 0x009e, 0x0005,</div><div class='del'>-	0x080c, 0x9a48, 0x00d6, 0x6114, 0x080c, 0xcf1b, 0x0130, 0x0096,</div><div class='del'>-	0x6114, 0x2148, 0x080c, 0x7012, 0x009e, 0x00de, 0x080c, 0xb16c,</div><div class='del'>-	0x0005, 0x080c, 0x9a48, 0x080c, 0x3315, 0x6114, 0x0096, 0x2148,</div><div class='del'>-	0x080c, 0xcf1b, 0x0120, 0xa87b, 0x0029, 0x080c, 0x7012, 0x009e,</div><div class='del'>-	0x080c, 0xb16c, 0x0005, 0x601b, 0x0000, 0x9182, 0x0040, 0x0096,</div><div class='del'>-	0x0002, 0x9376, 0x9376, 0x9376, 0x9376, 0x9376, 0x9376, 0x9376,</div><div class='del'>-	0x9376, 0x9378, 0x9376, 0x9376, 0x9376, 0x93d1, 0x9376, 0x9376,</div><div class='del'>-	0x9376, 0x9376, 0x9376, 0x9376, 0x937f, 0x9376, 0x080c, 0x0d85,</div><div class='del'>-	0x6114, 0x2148, 0xa938, 0x918e, 0xffff, 0x0904, 0x93d1, 0x6024,</div><div class='del'>-	0xd08c, 0x15d8, 0x080c, 0x8f0e, 0x05e0, 0x00e6, 0x6114, 0x2148,</div><div class='del'>-	0x080c, 0x912e, 0x0096, 0xa8a8, 0x2048, 0x080c, 0x6da9, 0x009e,</div><div class='del'>-	0xa8ab, 0x0000, 0x6010, 0x9005, 0x0128, 0x00b6, 0x2058, 0x080c,</div><div class='del'>-	0x925e, 0x00be, 0xae88, 0x00b6, 0x2059, 0x0000, 0x080c, 0x8e61,</div><div class='del'>-	0x00be, 0x01e0, 0x2071, 0x193d, 0x080c, 0x8ea8, 0x01b8, 0x9086,</div><div class='del'>-	0x0001, 0x1128, 0x2001, 0x1947, 0x2004, 0x9005, 0x1178, 0x0096,</div><div class='del'>-	0x080c, 0x1059, 0x2900, 0x009e, 0x0148, 0xa8aa, 0x00f6, 0x2c78,</div><div class='del'>-	0x080c, 0x8e1c, 0x00fe, 0x00ee, 0x009e, 0x0005, 0x080c, 0x8e58,</div><div class='del'>-	0x0cd0, 0x080c, 0x8f13, 0x1160, 0x6010, 0x9005, 0x0130, 0x2058,</div><div class='del'>-	0xb8ac, 0x9005, 0x190c, 0x0d85, 0x6012, 0x2c00, 0x080c, 0x8ed9,</div><div class='del'>-	0x0005, 0x080c, 0x9489, 0x009e, 0x0005, 0x9182, 0x0040, 0x0096,</div><div class='del'>-	0x0002, 0x93e9, 0x93e9, 0x93e9, 0x93eb, 0x93e9, 0x93e9, 0x93e9,</div><div class='del'>-	0x940b, 0x93e9, 0x93e9, 0x93e9, 0x93e9, 0x93e9, 0x93e9, 0x93e9,</div><div class='del'>-	0x93e9, 0x080c, 0x0d85, 0x6003, 0x0003, 0x6106, 0x6014, 0x2048,</div><div class='del'>-	0xa8ac, 0xa836, 0xa8b0, 0xa83a, 0xa847, 0x0000, 0xa84b, 0x0000,</div><div class='del'>-	0xa884, 0x9092, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x8013,</div><div class='del'>-	0x8213, 0x9210, 0x621a, 0x080c, 0x1c26, 0x2009, 0x8030, 0x080c,</div><div class='del'>-	0x965e, 0x009e, 0x0005, 0x080c, 0x0d85, 0x080c, 0x9a48, 0x6114,</div><div class='del'>-	0x2148, 0xa87b, 0x0000, 0x6010, 0x00b6, 0x2058, 0xb8bb, 0x0500,</div><div class='del'>-	0x00be, 0x080c, 0x7012, 0x080c, 0xb16c, 0x009e, 0x0005, 0x080c,</div><div class='del'>-	0xacfc, 0x6144, 0xd1fc, 0x0120, 0xd1ac, 0x1110, 0x6003, 0x0003,</div><div class='del'>-	0x6000, 0x908a, 0x0010, 0x1a0c, 0x0d85, 0x0096, 0x0023, 0x009e,</div><div class='del'>-	0x080c, 0xad18, 0x0005, 0x9443, 0x9443, 0x9443, 0x9445, 0x9456,</div><div class='del'>-	0x9443, 0x9443, 0x9443, 0x9443, 0x9443, 0x9443, 0x9443, 0x9443,</div><div class='del'>-	0x9443, 0x9443, 0x9443, 0x080c, 0x0d85, 0x080c, 0xaee3, 0x6114,</div><div class='del'>-	0x2148, 0xa87b, 0x0006, 0x6010, 0x00b6, 0x2058, 0xb8bb, 0x0500,</div><div class='del'>-	0x00be, 0x080c, 0x7012, 0x080c, 0xb16c, 0x0005, 0x0491, 0x0005,</div><div class='del'>-	0x080c, 0xacfc, 0x6000, 0x6144, 0xd1fc, 0x0130, 0xd1ac, 0x1120,</div><div class='del'>-	0x6003, 0x0003, 0x2009, 0x0003, 0x908a, 0x0010, 0x1a0c, 0x0d85,</div><div class='del'>-	0x0096, 0x0033, 0x009e, 0x0106, 0x080c, 0xad18, 0x010e, 0x0005,</div><div class='del'>-	0x9480, 0x9480, 0x9480, 0x9482, 0x9489, 0x9480, 0x9480, 0x9480,</div><div class='del'>-	0x9480, 0x9480, 0x9480, 0x9480, 0x9480, 0x9480, 0x9480, 0x9480,</div><div class='del'>-	0x080c, 0x0d85, 0x0036, 0x00e6, 0x080c, 0xaee3, 0x00ee, 0x003e,</div><div class='del'>-	0x0005, 0x6024, 0xd08c, 0x11f0, 0x00f6, 0x00e6, 0x601b, 0x0000,</div><div class='del'>-	0x6014, 0x2048, 0x6010, 0x9005, 0x0128, 0x00b6, 0x2058, 0x080c,</div><div class='del'>-	0x925e, 0x00be, 0x2071, 0x193d, 0x080c, 0x8ea8, 0x0160, 0x2001,</div><div class='del'>-	0x187f, 0x2004, 0xa88a, 0x2031, 0x0000, 0x2c78, 0x080c, 0x8e1c,</div><div class='del'>-	0x00ee, 0x00fe, 0x0005, 0x0096, 0xa88b, 0x0000, 0xa8a8, 0x2048,</div><div class='del'>-	0x080c, 0x108b, 0x009e, 0xa8ab, 0x0000, 0x080c, 0x8e58, 0x0c80,</div><div class='del'>-	0x2001, 0x1925, 0x200c, 0x918e, 0x0000, 0x190c, 0x8f0e, 0x05c8,</div><div class='del'>-	0x00e6, 0x2071, 0x1924, 0x7110, 0xc1c5, 0x7112, 0x080c, 0x8f18,</div><div class='del'>-	0x00f6, 0x00c6, 0x2071, 0x1000, 0x00b6, 0x2e04, 0x905d, 0x0138,</div><div class='del'>-	0xb8ac, 0x9065, 0x0120, 0x080c, 0x8eee, 0x090c, 0x928d, 0x8e70,</div><div class='del'>-	0x9e86, 0x1800, 0x1d90, 0x00be, 0x00d6, 0x0096, 0x0046, 0x2061,</div><div class='del'>-	0x1ddc, 0x2001, 0x181a, 0x2024, 0x6020, 0x9086, 0x0000, 0x1191,</div><div class='del'>-	0x9ce0, 0x001c, 0x2400, 0x9c06, 0x1db8, 0x004e, 0x009e, 0x00de,</div><div class='del'>-	0x00d1, 0x00ce, 0x00fe, 0x2071, 0x1924, 0x7110, 0xc1c4, 0x7112,</div><div class='del'>-	0x00ee, 0x0005, 0x6020, 0x9086, 0x0009, 0x1160, 0x6100, 0x9186,</div><div class='del'>-	0x0004, 0x1138, 0x6110, 0x81ff, 0x190c, 0x0d85, 0x2c00, 0x080c,</div><div class='del'>-	0x8ed9, 0x9006, 0x0005, 0x2071, 0x193f, 0x2073, 0x0000, 0x8e70,</div><div class='del'>-	0x9e86, 0x1947, 0x1dd0, 0x2071, 0x193d, 0x7006, 0x7002, 0x2001,</div><div class='del'>-	0x1930, 0x2064, 0x8cff, 0x0130, 0x6120, 0x918e, 0x0000, 0x190c,</div><div class='del'>-	0x0d85, 0x2102, 0x2001, 0x188a, 0x200c, 0x81ff, 0x0148, 0x0096,</div><div class='del'>-	0x2148, 0x080c, 0x108b, 0x009e, 0x2001, 0x188a, 0x2003, 0x0000,</div><div class='del'>-	0x2071, 0x1931, 0x080c, 0x90f7, 0x0804, 0x9106, 0x0000, 0x0000,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x187a,</div><div class='del'>-	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x0036, 0x0046, 0x20a9, 0x0010, 0x9006, 0x8004, 0x8086,</div><div class='del'>-	0x818e, 0x1208, 0x9200, 0x1f04, 0x954f, 0x8086, 0x818e, 0x004e,</div><div class='del'>-	0x003e, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x0076, 0x0156,</div><div class='del'>-	0x20a9, 0x0010, 0x9005, 0x01c8, 0x911a, 0x12b8, 0x8213, 0x818d,</div><div class='del'>-	0x0228, 0x911a, 0x1220, 0x1f04, 0x9566, 0x0028, 0x911a, 0x2308,</div><div class='del'>-	0x8210, 0x1f04, 0x9566, 0x0006, 0x3200, 0x9084, 0xefff, 0x2080,</div><div class='del'>-	0x000e, 0x015e, 0x007e, 0x012e, 0x0005, 0x0006, 0x3200, 0x9085,</div><div class='del'>-	0x1000, 0x0ca8, 0x0126, 0x2091, 0x2800, 0x2079, 0x19e8, 0x012e,</div><div class='del'>-	0x00d6, 0x2069, 0x19e8, 0x6803, 0x0005, 0x0156, 0x0146, 0x01d6,</div><div class='del'>-	0x20e9, 0x0000, 0x2069, 0x0200, 0x080c, 0xaaf1, 0x04c9, 0x080c,</div><div class='del'>-	0xaadc, 0x04b1, 0x080c, 0xaadf, 0x0499, 0x080c, 0xaae2, 0x0481,</div><div class='del'>-	0x080c, 0xaae5, 0x0469, 0x080c, 0xaae8, 0x0451, 0x080c, 0xaaeb,</div><div class='del'>-	0x0439, 0x080c, 0xaaee, 0x0421, 0x01de, 0x014e, 0x015e, 0x6857,</div><div class='del'>-	0x0000, 0x00f6, 0x2079, 0x0380, 0x0419, 0x7807, 0x0003, 0x7803,</div><div class='del'>-	0x0000, 0x7803, 0x0001, 0x2069, 0x0004, 0x2d04, 0x9084, 0xfffe,</div><div class='del'>-	0x9085, 0x8000, 0x206a, 0x2069, 0x0100, 0x6828, 0x9084, 0xfffc,</div><div class='del'>-	0x682a, 0x00fe, 0x2001, 0x1b5d, 0x2003, 0x0000, 0x00de, 0x0005,</div><div class='del'>-	0x20a9, 0x0020, 0x20a1, 0x0240, 0x2001, 0x0000, 0x4004, 0x0005,</div><div class='del'>-	0x00c6, 0x7803, 0x0000, 0x9006, 0x7827, 0x0030, 0x782b, 0x0400,</div><div class='del'>-	0x7827, 0x0031, 0x782b, 0x1af6, 0x781f, 0xff00, 0x781b, 0xff00,</div><div class='del'>-	0x2061, 0x1aeb, 0x602f, 0x19e8, 0x6033, 0x1800, 0x6037, 0x1a04,</div><div class='del'>-	0x603b, 0x1ec1, 0x603f, 0x1ed1, 0x6042, 0x6047, 0x1ac1, 0x00ce,</div><div class='del'>-	0x0005, 0x2001, 0x0382, 0x2004, 0x9084, 0x0007, 0x9086, 0x0001,</div><div class='del'>-	0x01b0, 0x00c6, 0x6146, 0x600f, 0x0000, 0x2c08, 0x2061, 0x19e8,</div><div class='del'>-	0x602c, 0x8000, 0x602e, 0x601c, 0x9005, 0x0130, 0x9080, 0x0003,</div><div class='del'>-	0x2102, 0x611e, 0x00ce, 0x0005, 0x6122, 0x611e, 0x0cd8, 0x6146,</div><div class='del'>-	0x2c08, 0x2001, 0x0012, 0x080c, 0xaced, 0x0005, 0x0016, 0x2009,</div><div class='del'>-	0x8020, 0x6146, 0x2c08, 0x2001, 0x0382, 0x2004, 0x9084, 0x0007,</div><div class='del'>-	0x9086, 0x0001, 0x1128, 0x2001, 0x0019, 0x080c, 0xaced, 0x0088,</div><div class='del'>-	0x00c6, 0x2061, 0x19e8, 0x602c, 0x8000, 0x602e, 0x600c, 0x9005,</div><div class='del'>-	0x0128, 0x9080, 0x0003, 0x2102, 0x610e, 0x0010, 0x6112, 0x610e,</div><div class='del'>-	0x00ce, 0x001e, 0x0005, 0x2001, 0x0382, 0x2004, 0x9084, 0x0007,</div><div class='del'>-	0x9086, 0x0001, 0x0198, 0x00c6, 0x6146, 0x600f, 0x0000, 0x2c08,</div><div class='del'>-	0x2061, 0x19e8, 0x6044, 0x9005, 0x0130, 0x9080, 0x0003, 0x2102,</div><div class='del'>-	0x6146, 0x00ce, 0x0005, 0x614a, 0x6146, 0x0cd8, 0x6146, 0x600f,</div><div class='del'>-	0x0000, 0x2c08, 0x2001, 0x0013, 0x080c, 0xaced, 0x0005, 0x6044,</div><div class='del'>-	0xd0dc, 0x0110, 0x080c, 0xa78a, 0x0005, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x00b6, 0x0096, 0x0076, 0x0066, 0x0056, 0x0036, 0x0026,</div><div class='del'>-	0x0016, 0x0006, 0x0126, 0x902e, 0x2071, 0x19e8, 0x7648, 0x2660,</div><div class='del'>-	0x2678, 0x2091, 0x8000, 0x8cff, 0x0904, 0x96f1, 0x9c86, 0x1b55,</div><div class='del'>-	0x0904, 0x96ec, 0x6010, 0x2058, 0xb8a0, 0x9206, 0x1904, 0x96ec,</div><div class='del'>-	0x87ff, 0x0120, 0x605c, 0x9106, 0x1904, 0x96ec, 0x704c, 0x9c06,</div><div class='del'>-	0x1188, 0x0036, 0x2019, 0x0001, 0x080c, 0xa596, 0x703f, 0x0000,</div><div class='del'>-	0x9006, 0x704e, 0x706a, 0x7052, 0x706e, 0x080c, 0xaff4, 0x003e,</div><div class='del'>-	0x2029, 0x0001, 0x080c, 0x9667, 0x7048, 0x9c36, 0x1110, 0x660c,</div><div class='del'>-	0x764a, 0x7044, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00,</div><div class='del'>-	0x7046, 0x0010, 0x7047, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0xcf1b,</div><div class='del'>-	0x01f0, 0x6014, 0x2048, 0x6020, 0x9086, 0x0003, 0x1588, 0x6004,</div><div class='del'>-	0x9086, 0x0040, 0x090c, 0xa78a, 0xa867, 0x0103, 0xab7a, 0xa877,</div><div class='del'>-	0x0000, 0x0016, 0x0036, 0x0076, 0x080c, 0xd220, 0x080c, 0xeddf,</div><div class='del'>-	0x080c, 0x7012, 0x007e, 0x003e, 0x001e, 0x080c, 0xd10c, 0x080c,</div><div class='del'>-	0xb1a7, 0x00ce, 0x0804, 0x9683, 0x2c78, 0x600c, 0x2060, 0x0804,</div><div class='del'>-	0x9683, 0x012e, 0x000e, 0x001e, 0x002e, 0x003e, 0x005e, 0x006e,</div><div class='del'>-	0x007e, 0x009e, 0x00be, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005,</div><div class='del'>-	0x6020, 0x9086, 0x0006, 0x1158, 0x0016, 0x0036, 0x0076, 0x080c,</div><div class='del'>-	0xeddf, 0x080c, 0xea30, 0x007e, 0x003e, 0x001e, 0x08c0, 0x6020,</div><div class='del'>-	0x9086, 0x0009, 0x1168, 0xa87b, 0x0006, 0x0016, 0x0036, 0x0076,</div><div class='del'>-	0x080c, 0x7012, 0x080c, 0xb16c, 0x007e, 0x003e, 0x001e, 0x0848,</div><div class='del'>-	0x6020, 0x9086, 0x000a, 0x0904, 0x96d6, 0x0804, 0x96cf, 0x0006,</div><div class='del'>-	0x0066, 0x0096, 0x00c6, 0x00d6, 0x00f6, 0x9036, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2079, 0x19e8, 0x7848, 0x9065, 0x0904, 0x9790, 0x600c,</div><div class='del'>-	0x0006, 0x600f, 0x0000, 0x784c, 0x9c06, 0x11b0, 0x0036, 0x2019,</div><div class='del'>-	0x0001, 0x080c, 0xa596, 0x783f, 0x0000, 0x901e, 0x7b4e, 0x7b6a,</div><div class='del'>-	0x7b52, 0x7b6e, 0x080c, 0xaff4, 0x003e, 0x000e, 0x9005, 0x1118,</div><div class='del'>-	0x600c, 0x600f, 0x0000, 0x0006, 0x9c86, 0x1b55, 0x05b0, 0x00e6,</div><div class='del'>-	0x2f70, 0x080c, 0x9667, 0x00ee, 0x080c, 0xcf1b, 0x0548, 0x6014,</div><div class='del'>-	0x2048, 0x6020, 0x9086, 0x0003, 0x15a8, 0x3e08, 0x918e, 0x0002,</div><div class='del'>-	0x1188, 0x6010, 0x9005, 0x0170, 0x00b6, 0x2058, 0xb800, 0x00be,</div><div class='del'>-	0xd0bc, 0x0140, 0x6048, 0x9005, 0x11c0, 0x2001, 0x1988, 0x2004,</div><div class='del'>-	0x604a, 0x0098, 0x6004, 0x9086, 0x0040, 0x090c, 0xa78a, 0xa867,</div><div class='del'>-	0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x7006, 0x080c, 0xd10c,</div><div class='del'>-	0x6044, 0xc0fc, 0x6046, 0x080c, 0xb1a7, 0x000e, 0x0804, 0x9734,</div><div class='del'>-	0x7e4a, 0x7e46, 0x012e, 0x00fe, 0x00de, 0x00ce, 0x009e, 0x006e,</div><div class='del'>-	0x000e, 0x0005, 0x6020, 0x9086, 0x0006, 0x1118, 0x080c, 0xea30,</div><div class='del'>-	0x0c38, 0x6020, 0x9086, 0x0009, 0x1130, 0xab7a, 0x080c, 0x7012,</div><div class='del'>-	0x080c, 0xb16c, 0x0c10, 0x6020, 0x9086, 0x000a, 0x0990, 0x0850,</div><div class='del'>-	0x0016, 0x0026, 0x0086, 0x9046, 0x00a9, 0x080c, 0x98a3, 0x008e,</div><div class='del'>-	0x002e, 0x001e, 0x0005, 0x00f6, 0x0126, 0x2079, 0x19e8, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x98ec, 0x080c, 0x9982, 0x080c, 0x6948, 0x012e,</div><div class='del'>-	0x00fe, 0x0005, 0x00b6, 0x0096, 0x00f6, 0x00e6, 0x00d6, 0x00c6,</div><div class='del'>-	0x0066, 0x0016, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19e8,</div><div class='del'>-	0x7620, 0x2660, 0x2678, 0x8cff, 0x0904, 0x9868, 0x6010, 0x2058,</div><div class='del'>-	0xb8a0, 0x9206, 0x1904, 0x9863, 0x88ff, 0x0120, 0x605c, 0x9106,</div><div class='del'>-	0x1904, 0x9863, 0x7030, 0x9c06, 0x1580, 0x2069, 0x0100, 0x6820,</div><div class='del'>-	0xd0a4, 0x0110, 0xd0cc, 0x1508, 0x080c, 0x8a4b, 0x080c, 0xa2a0,</div><div class='del'>-	0x68c3, 0x0000, 0x080c, 0xa78a, 0x7033, 0x0000, 0x0036, 0x2069,</div><div class='del'>-	0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c,</div><div class='del'>-	0x2a99, 0x9006, 0x080c, 0x2a99, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0110, 0x6827, 0x0001, 0x003e, 0x0040, 0x7008, 0xc0ad, 0x700a,</div><div class='del'>-	0x6003, 0x0009, 0x630a, 0x0804, 0x9863, 0x7020, 0x9c36, 0x1110,</div><div class='del'>-	0x660c, 0x7622, 0x701c, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118,</div><div class='del'>-	0x2f00, 0x701e, 0x0010, 0x701f, 0x0000, 0x660c, 0x0066, 0x2c00,</div><div class='del'>-	0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x6044,</div><div class='del'>-	0xc0fc, 0x6046, 0x6014, 0x2048, 0x080c, 0xcf1b, 0x01e8, 0x6020,</div><div class='del'>-	0x9086, 0x0003, 0x1580, 0x080c, 0xd132, 0x1118, 0x080c, 0xbb5c,</div><div class='del'>-	0x0098, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x0016, 0x0036,</div><div class='del'>-	0x0086, 0x080c, 0xd220, 0x080c, 0xeddf, 0x080c, 0x7012, 0x008e,</div><div class='del'>-	0x003e, 0x001e, 0x080c, 0xd10c, 0x080c, 0xb1a7, 0x080c, 0xa65d,</div><div class='del'>-	0x00ce, 0x0804, 0x97db, 0x2c78, 0x600c, 0x2060, 0x0804, 0x97db,</div><div class='del'>-	0x012e, 0x000e, 0x001e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00fe,</div><div class='del'>-	0x009e, 0x00be, 0x0005, 0x6020, 0x9086, 0x0006, 0x1158, 0x0016,</div><div class='del'>-	0x0036, 0x0086, 0x080c, 0xeddf, 0x080c, 0xea30, 0x008e, 0x003e,</div><div class='del'>-	0x001e, 0x08d0, 0x080c, 0xbb5c, 0x6020, 0x9086, 0x0002, 0x1160,</div><div class='del'>-	0x6004, 0x0006, 0x9086, 0x0085, 0x000e, 0x0904, 0x9849, 0x9086,</div><div class='del'>-	0x008b, 0x0904, 0x9849, 0x0840, 0x6020, 0x9086, 0x0005, 0x1920,</div><div class='del'>-	0x6004, 0x0006, 0x9086, 0x0085, 0x000e, 0x09c8, 0x9086, 0x008b,</div><div class='del'>-	0x09b0, 0x0804, 0x985c, 0x0006, 0x00f6, 0x00e6, 0x0096, 0x00b6,</div><div class='del'>-	0x00c6, 0x0066, 0x0016, 0x0126, 0x2091, 0x8000, 0x9280, 0x1000,</div><div class='del'>-	0x2004, 0x905d, 0x2079, 0x19e8, 0x9036, 0x7828, 0x2060, 0x8cff,</div><div class='del'>-	0x0538, 0x6010, 0x9b06, 0x1500, 0x6043, 0xffff, 0x080c, 0xaf2e,</div><div class='del'>-	0x01d8, 0x610c, 0x0016, 0x080c, 0xa420, 0x6014, 0x2048, 0xa867,</div><div class='del'>-	0x0103, 0xab7a, 0xa877, 0x0000, 0x0016, 0x0036, 0x0086, 0x080c,</div><div class='del'>-	0xd220, 0x080c, 0xeddf, 0x080c, 0x7012, 0x008e, 0x003e, 0x001e,</div><div class='del'>-	0x080c, 0xb1a7, 0x00ce, 0x08d8, 0x2c30, 0x600c, 0x2060, 0x08b8,</div><div class='del'>-	0x080c, 0x6965, 0x012e, 0x001e, 0x006e, 0x00ce, 0x00be, 0x009e,</div><div class='del'>-	0x00ee, 0x00fe, 0x000e, 0x0005, 0x0096, 0x0006, 0x0066, 0x00c6,</div><div class='del'>-	0x00d6, 0x9036, 0x7820, 0x9065, 0x0904, 0x9955, 0x600c, 0x0006,</div><div class='del'>-	0x6044, 0xc0fc, 0x6046, 0x600f, 0x0000, 0x7830, 0x9c06, 0x1598,</div><div class='del'>-	0x2069, 0x0100, 0x6820, 0xd0a4, 0x0110, 0xd0cc, 0x1508, 0x080c,</div><div class='del'>-	0x8a4b, 0x080c, 0xa2a0, 0x68c3, 0x0000, 0x080c, 0xa78a, 0x7833,</div><div class='del'>-	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138,</div><div class='del'>-	0x2001, 0x0100, 0x080c, 0x2a99, 0x9006, 0x080c, 0x2a99, 0x2069,</div><div class='del'>-	0x0100, 0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x0058,</div><div class='del'>-	0x080c, 0x6ba9, 0x1538, 0x6003, 0x0009, 0x630a, 0x7808, 0xc0ad,</div><div class='del'>-	0x780a, 0x2c30, 0x00f8, 0x6014, 0x2048, 0x080c, 0xcf19, 0x01b0,</div><div class='del'>-	0x6020, 0x9086, 0x0003, 0x1508, 0x080c, 0xd132, 0x1118, 0x080c,</div><div class='del'>-	0xbb5c, 0x0060, 0x080c, 0x6ba9, 0x1168, 0xa867, 0x0103, 0xab7a,</div><div class='del'>-	0xa877, 0x0000, 0x080c, 0x7012, 0x080c, 0xd10c, 0x080c, 0xb1a7,</div><div class='del'>-	0x080c, 0xa65d, 0x000e, 0x0804, 0x98f3, 0x7e22, 0x7e1e, 0x00de,</div><div class='del'>-	0x00ce, 0x006e, 0x000e, 0x009e, 0x0005, 0x6020, 0x9086, 0x0006,</div><div class='del'>-	0x1118, 0x080c, 0xea30, 0x0c50, 0x080c, 0xbb5c, 0x6020, 0x9086,</div><div class='del'>-	0x0002, 0x1150, 0x6004, 0x0006, 0x9086, 0x0085, 0x000e, 0x0990,</div><div class='del'>-	0x9086, 0x008b, 0x0978, 0x08d0, 0x6020, 0x9086, 0x0005, 0x19b0,</div><div class='del'>-	0x6004, 0x0006, 0x9086, 0x0085, 0x000e, 0x0d18, 0x9086, 0x008b,</div><div class='del'>-	0x0d00, 0x0860, 0x0006, 0x0096, 0x00b6, 0x00c6, 0x0066, 0x9036,</div><div class='del'>-	0x7828, 0x9065, 0x0510, 0x6010, 0x2058, 0x600c, 0x0006, 0x3e08,</div><div class='del'>-	0x918e, 0x0002, 0x1118, 0xb800, 0xd0bc, 0x11a8, 0x6043, 0xffff,</div><div class='del'>-	0x080c, 0xaf2e, 0x0180, 0x610c, 0x080c, 0xa420, 0x6014, 0x2048,</div><div class='del'>-	0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x7012, 0x080c,</div><div class='del'>-	0xb1a7, 0x000e, 0x08f0, 0x2c30, 0x0ce0, 0x006e, 0x00ce, 0x00be,</div><div class='del'>-	0x009e, 0x000e, 0x0005, 0x00e6, 0x00d6, 0x0096, 0x0066, 0x080c,</div><div class='del'>-	0x62af, 0x11b0, 0x2071, 0x19e8, 0x7030, 0x9080, 0x0005, 0x2004,</div><div class='del'>-	0x904d, 0x0170, 0xa878, 0x9606, 0x1158, 0x2071, 0x19e8, 0x7030,</div><div class='del'>-	0x9035, 0x0130, 0x9080, 0x0005, 0x2004, 0x9906, 0x1108, 0x0029,</div><div class='del'>-	0x006e, 0x009e, 0x00de, 0x00ee, 0x0005, 0x00c6, 0x2660, 0x6043,</div><div class='del'>-	0xffff, 0x080c, 0xaf2e, 0x0178, 0x080c, 0xa420, 0x6014, 0x2048,</div><div class='del'>-	0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0xd220, 0x080c,</div><div class='del'>-	0x7012, 0x080c, 0xb1a7, 0x00ce, 0x0005, 0x00b6, 0x00e6, 0x00c6,</div><div class='del'>-	0x080c, 0xacfc, 0x0106, 0x2071, 0x0101, 0x2e04, 0xc0c4, 0x2072,</div><div class='del'>-	0x6044, 0xd0fc, 0x1138, 0x010e, 0x090c, 0xad18, 0x00ce, 0x00ee,</div><div class='del'>-	0x00be, 0x0005, 0x2071, 0x19e8, 0x7030, 0x9005, 0x0da0, 0x9c06,</div><div class='del'>-	0x190c, 0x0d85, 0x7036, 0x080c, 0x8a4b, 0x7004, 0x9084, 0x0007,</div><div class='del'>-	0x0002, 0x9a1b, 0x9a1d, 0x9a24, 0x9a2e, 0x9a3c, 0x9a1b, 0x9a29,</div><div class='del'>-	0x9a19, 0x080c, 0x0d85, 0x0428, 0x0005, 0x080c, 0xaf19, 0x7007,</div><div class='del'>-	0x0000, 0x7033, 0x0000, 0x00e8, 0x0066, 0x9036, 0x080c, 0xa420,</div><div class='del'>-	0x006e, 0x7007, 0x0000, 0x7033, 0x0000, 0x0098, 0x080c, 0xaf04,</div><div class='del'>-	0x0140, 0x080c, 0xaf19, 0x0128, 0x0066, 0x9036, 0x080c, 0xa420,</div><div class='del'>-	0x006e, 0x7033, 0x0000, 0x0028, 0x080c, 0xaf04, 0x080c, 0xa78a,</div><div class='del'>-	0x0000, 0x010e, 0x090c, 0xad18, 0x00ce, 0x00ee, 0x00be, 0x0005,</div><div class='del'>-	0x00d6, 0x00c6, 0x080c, 0xacfc, 0x0106, 0x6044, 0xd0fc, 0x1130,</div><div class='del'>-	0x010e, 0x090c, 0xad18, 0x00ce, 0x00de, 0x0005, 0x2069, 0x19e8,</div><div class='del'>-	0x684c, 0x9005, 0x0da8, 0x9c06, 0x190c, 0x0d85, 0x6852, 0x00e6,</div><div class='del'>-	0x2d70, 0x080c, 0x9667, 0x00ee, 0x080c, 0x8a58, 0x0016, 0x2009,</div><div class='del'>-	0x0040, 0x080c, 0x2220, 0x001e, 0x683c, 0x9084, 0x0003, 0x0002,</div><div class='del'>-	0x9a76, 0x9a77, 0x9a96, 0x9a74, 0x080c, 0x0d85, 0x0490, 0x6868,</div><div class='del'>-	0x9086, 0x0001, 0x0198, 0x600c, 0x9015, 0x0168, 0x6a4a, 0x600f,</div><div class='del'>-	0x0000, 0x6044, 0x9084, 0x7f7f, 0x6046, 0x9006, 0x6842, 0x684e,</div><div class='del'>-	0x683f, 0x0000, 0x00f0, 0x684a, 0x6846, 0x0c98, 0x686b, 0x0000,</div><div class='del'>-	0x6848, 0x9065, 0x0d70, 0x6003, 0x0002, 0x0c58, 0x6044, 0x9084,</div><div class='del'>-	0x7f7f, 0x6046, 0x9006, 0x6842, 0x684e, 0x686a, 0x6852, 0x686e,</div><div class='del'>-	0x600c, 0x9015, 0x0120, 0x6a4a, 0x600f, 0x0000, 0x0010, 0x684a,</div><div class='del'>-	0x6846, 0x080c, 0xaff4, 0x684f, 0x0000, 0x010e, 0x090c, 0xad18,</div><div class='del'>-	0x00ce, 0x00de, 0x0005, 0x0005, 0x6020, 0x9084, 0x000f, 0x000b,</div><div class='del'>-	0x0005, 0x9ac9, 0x9acc, 0x9f80, 0xa019, 0x9acc, 0x9f80, 0xa019,</div><div class='del'>-	0x9ac9, 0x9acc, 0x9ac9, 0x9ac9, 0x9ac9, 0x9ac9, 0x9ac9, 0x9ac9,</div><div class='del'>-	0x9ac9, 0x080c, 0x99ed, 0x0005, 0x00b6, 0x0156, 0x0136, 0x0146,</div><div class='del'>-	0x01c6, 0x01d6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2069, 0x0200,</div><div class='del'>-	0x2071, 0x0240, 0x6004, 0x908a, 0x0053, 0x1a0c, 0x0d85, 0x6110,</div><div class='del'>-	0x2158, 0xb984, 0x2c78, 0x2061, 0x0100, 0x619a, 0x908a, 0x0040,</div><div class='del'>-	0x1a04, 0x9b38, 0x005b, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x01de,</div><div class='del'>-	0x01ce, 0x014e, 0x013e, 0x015e, 0x00be, 0x0005, 0x9ce1, 0x9d1c,</div><div class='del'>-	0x9d45, 0x9e0f, 0x9e31, 0x9e37, 0x9e44, 0x9e4c, 0x9e58, 0x9e5e,</div><div class='del'>-	0x9e6f, 0x9e5e, 0x9ec7, 0x9e4c, 0x9ed3, 0x9ed9, 0x9e58, 0x9ed9,</div><div class='del'>-	0x9ee5, 0x9b36, 0x9b36, 0x9b36, 0x9b36, 0x9b36, 0x9b36, 0x9b36,</div><div class='del'>-	0x9b36, 0x9b36, 0x9b36, 0x9b36, 0xa441, 0xa464, 0xa475, 0xa495,</div><div class='del'>-	0xa4c7, 0x9e44, 0x9b36, 0x9e44, 0x9e5e, 0x9b36, 0x9d45, 0x9e0f,</div><div class='del'>-	0x9b36, 0xa888, 0x9e5e, 0x9b36, 0xa8a4, 0x9e5e, 0x9b36, 0x9e58,</div><div class='del'>-	0x9cdb, 0x9b59, 0x9b36, 0xa8c0, 0xa92d, 0xaa11, 0x9b36, 0xaa1e,</div><div class='del'>-	0x9e41, 0xaa49, 0x9b36, 0xa4d1, 0xaa55, 0x9b36, 0x080c, 0x0d85,</div><div class='del'>-	0x2100, 0x005b, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x01de, 0x01ce,</div><div class='del'>-	0x014e, 0x013e, 0x015e, 0x00be, 0x0005, 0xaaf5, 0xaba7, 0x9b57,</div><div class='del'>-	0x9b91, 0x9c3d, 0x9c48, 0x9b57, 0x9e44, 0x9b57, 0x9ca2, 0x9cae,</div><div class='del'>-	0x9bac, 0x9b57, 0x9bc7, 0x9bfb, 0xb008, 0xb04d, 0x9e5e, 0x080c,</div><div class='del'>-	0x0d85, 0x00d6, 0x0096, 0x080c, 0x9ef8, 0x0026, 0x0036, 0x7814,</div><div class='del'>-	0x2048, 0xa958, 0xd1cc, 0x1138, 0x2009, 0x2414, 0x2011, 0x0018,</div><div class='del'>-	0x2019, 0x0018, 0x0030, 0x2009, 0x2410, 0x2011, 0x0014, 0x2019,</div><div class='del'>-	0x0014, 0x7102, 0x7206, 0x700b, 0x0800, 0xa83c, 0x700e, 0xa850,</div><div class='del'>-	0x7022, 0xa854, 0x7026, 0x63c2, 0x080c, 0xa270, 0x003e, 0x002e,</div><div class='del'>-	0x009e, 0x00de, 0x0005, 0x7810, 0x00b6, 0x2058, 0xb8a0, 0x00be,</div><div class='del'>-	0x080c, 0xb094, 0x1118, 0x9084, 0xff80, 0x0110, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x00d6, 0x0096, 0x080c, 0x9ef8, 0x7003, 0x0500, 0x7814,</div><div class='del'>-	0x2048, 0xa874, 0x700a, 0xa878, 0x700e, 0xa87c, 0x7012, 0xa880,</div><div class='del'>-	0x7016, 0xa884, 0x701a, 0xa888, 0x701e, 0x60c3, 0x0010, 0x080c,</div><div class='del'>-	0xa270, 0x009e, 0x00de, 0x0005, 0x00d6, 0x0096, 0x080c, 0x9ef8,</div><div class='del'>-	0x7003, 0x0500, 0x7814, 0x2048, 0xa8cc, 0x700a, 0xa8d0, 0x700e,</div><div class='del'>-	0xa8d4, 0x7012, 0xa8d8, 0x7016, 0xa8dc, 0x701a, 0xa8e0, 0x701e,</div><div class='del'>-	0x60c3, 0x0010, 0x080c, 0xa270, 0x009e, 0x00de, 0x0005, 0x00d6,</div><div class='del'>-	0x0096, 0x0126, 0x2091, 0x8000, 0x080c, 0x9ef8, 0x20e9, 0x0000,</div><div class='del'>-	0x2001, 0x19a4, 0x2003, 0x0000, 0x7814, 0x2048, 0xa814, 0x8003,</div><div class='del'>-	0x60c2, 0xa830, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x001b,</div><div class='del'>-	0x2098, 0x2001, 0x19a4, 0x0016, 0x200c, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x2205, 0x080c, 0xdcef, 0x9006, 0x080c, 0x2205, 0x001e, 0xa804,</div><div class='del'>-	0x9005, 0x0110, 0x2048, 0x0c28, 0x04d9, 0x080c, 0xa270, 0x012e,</div><div class='del'>-	0x009e, 0x00de, 0x0005, 0x00d6, 0x0096, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0x9f43, 0x20e9, 0x0000, 0x2001, 0x19a4, 0x2003, 0x0000,</div><div class='del'>-	0x7814, 0x2048, 0xa86f, 0x0200, 0xa873, 0x0000, 0xa814, 0x8003,</div><div class='del'>-	0x60c2, 0xa830, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x001b,</div><div class='del'>-	0x2098, 0x2001, 0x19a4, 0x0016, 0x200c, 0x080c, 0xdcef, 0x001e,</div><div class='del'>-	0xa804, 0x9005, 0x0110, 0x2048, 0x0c60, 0x0051, 0x7814, 0x2048,</div><div class='del'>-	0x080c, 0x100b, 0x080c, 0xa270, 0x012e, 0x009e, 0x00de, 0x0005,</div><div class='del'>-	0x60c0, 0x8004, 0x9084, 0x0003, 0x9005, 0x0130, 0x9082, 0x0004,</div><div class='del'>-	0x20a3, 0x0000, 0x8000, 0x1de0, 0x0005, 0x080c, 0x9ef8, 0x7003,</div><div class='del'>-	0x7800, 0x7808, 0x8007, 0x700a, 0x60c3, 0x0008, 0x0804, 0xa270,</div><div class='del'>-	0x00d6, 0x00e6, 0x080c, 0x9f43, 0x7814, 0x9084, 0xff00, 0x2073,</div><div class='del'>-	0x0200, 0x8e70, 0x8e70, 0x9096, 0xdf00, 0x0138, 0x9096, 0xe000,</div><div class='del'>-	0x0120, 0x2073, 0x0010, 0x8e70, 0x0030, 0x9095, 0x0010, 0x2272,</div><div class='del'>-	0x8e70, 0x2073, 0x0034, 0x8e70, 0x2069, 0x1805, 0x20a9, 0x0004,</div><div class='del'>-	0x2d76, 0x8d68, 0x8e70, 0x1f04, 0x9c68, 0x2069, 0x1801, 0x20a9,</div><div class='del'>-	0x0004, 0x2d76, 0x8d68, 0x8e70, 0x1f04, 0x9c71, 0x9096, 0xdf00,</div><div class='del'>-	0x0130, 0x9096, 0xe000, 0x0118, 0x60c3, 0x0018, 0x00f0, 0x2069,</div><div class='del'>-	0x19b4, 0x9086, 0xdf00, 0x0110, 0x2069, 0x19ce, 0x20a9, 0x001a,</div><div class='del'>-	0x9e86, 0x0260, 0x1148, 0x00c6, 0x2061, 0x0200, 0x6010, 0x8000,</div><div class='del'>-	0x6012, 0x00ce, 0x2071, 0x0240, 0x2d04, 0x8007, 0x2072, 0x8d68,</div><div class='del'>-	0x8e70, 0x1f04, 0x9c88, 0x60c3, 0x004c, 0x080c, 0xa270, 0x00ee,</div><div class='del'>-	0x00de, 0x0005, 0x080c, 0x9ef8, 0x7003, 0x6300, 0x7007, 0x0028,</div><div class='del'>-	0x7808, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa270, 0x00d6, 0x0026,</div><div class='del'>-	0x0016, 0x080c, 0x9f43, 0x7003, 0x0200, 0x7814, 0x700e, 0x00e6,</div><div class='del'>-	0x9ef0, 0x0004, 0x2009, 0x0001, 0x2011, 0x000c, 0x2069, 0x1924,</div><div class='del'>-	0x6810, 0xd084, 0x1148, 0x2073, 0x0500, 0x8e70, 0x2073, 0x0000,</div><div class='del'>-	0x8e70, 0x8108, 0x9290, 0x0004, 0x2073, 0x0800, 0x8e70, 0x2073,</div><div class='del'>-	0x0000, 0x00ee, 0x7206, 0x710a, 0x62c2, 0x080c, 0xa270, 0x001e,</div><div class='del'>-	0x002e, 0x00de, 0x0005, 0x2001, 0x1818, 0x2004, 0x609a, 0x0804,</div><div class='del'>-	0xa270, 0x080c, 0x9ef8, 0x7003, 0x5200, 0x2069, 0x1847, 0x6804,</div><div class='del'>-	0xd084, 0x0130, 0x6828, 0x0016, 0x080c, 0x26bf, 0x710e, 0x001e,</div><div class='del'>-	0x20a9, 0x0004, 0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9, 0x0000,</div><div class='del'>-	0x20a1, 0x0250, 0x4003, 0x20a9, 0x0004, 0x2099, 0x1801, 0x20a1,</div><div class='del'>-	0x0254, 0x4003, 0x080c, 0xb094, 0x1120, 0xb8a0, 0x9082, 0x007f,</div><div class='del'>-	0x0248, 0x2001, 0x181f, 0x2004, 0x7032, 0x2001, 0x1820, 0x2004,</div><div class='del'>-	0x7036, 0x0030, 0x2001, 0x1818, 0x2004, 0x9084, 0x00ff, 0x7036,</div><div class='del'>-	0x60c3, 0x001c, 0x0804, 0xa270, 0x080c, 0x9ef8, 0x7003, 0x0500,</div><div class='del'>-	0x080c, 0xb094, 0x1120, 0xb8a0, 0x9082, 0x007f, 0x0248, 0x2001,</div><div class='del'>-	0x181f, 0x2004, 0x700a, 0x2001, 0x1820, 0x2004, 0x700e, 0x0030,</div><div class='del'>-	0x2001, 0x1818, 0x2004, 0x9084, 0x00ff, 0x700e, 0x20a9, 0x0004,</div><div class='del'>-	0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1, 0x0250,</div><div class='del'>-	0x4003, 0x60c3, 0x0010, 0x0804, 0xa270, 0x080c, 0x9ef8, 0x9006,</div><div class='del'>-	0x080c, 0x6bdb, 0xb8a0, 0x9086, 0x007e, 0x1170, 0x2011, 0x0240,</div><div class='del'>-	0x2013, 0x22ff, 0x2011, 0x0241, 0x2013, 0xfffe, 0x7003, 0x0400,</div><div class='del'>-	0x620c, 0xc2b4, 0x620e, 0x0058, 0x7814, 0x0096, 0x904d, 0x0120,</div><div class='del'>-	0x9006, 0xa89a, 0xa8a6, 0xa8aa, 0x009e, 0x7003, 0x0300, 0xb8a0,</div><div class='del'>-	0x9086, 0x007e, 0x1904, 0x9dcf, 0x00d6, 0x2069, 0x196c, 0x2001,</div><div class='del'>-	0x1837, 0x2004, 0xd0a4, 0x0188, 0x6800, 0x700a, 0x6808, 0x9084,</div><div class='del'>-	0x2000, 0x7012, 0x080c, 0xb0ab, 0x680c, 0x7016, 0x701f, 0x2710,</div><div class='del'>-	0x6818, 0x7022, 0x681c, 0x7026, 0x0428, 0x6800, 0x700a, 0x6804,</div><div class='del'>-	0x700e, 0x2009, 0x180d, 0x210c, 0xd18c, 0x0110, 0x2001, 0x0002,</div><div class='del'>-	0x00f6, 0x2079, 0x0100, 0x080c, 0x779e, 0x1128, 0x78e3, 0x0000,</div><div class='del'>-	0x080c, 0x2700, 0x78e2, 0x00fe, 0x6808, 0x080c, 0x779e, 0x1118,</div><div class='del'>-	0x9084, 0x37ff, 0x0010, 0x9084, 0x3fff, 0x7012, 0x080c, 0xb0ab,</div><div class='del'>-	0x680c, 0x7016, 0x00de, 0x20a9, 0x0004, 0x20e1, 0x0001, 0x2099,</div><div class='del'>-	0x1805, 0x20e9, 0x0000, 0x20a1, 0x0256, 0x4003, 0x20a9, 0x0004,</div><div class='del'>-	0x2099, 0x1801, 0x20a1, 0x025a, 0x4003, 0x00d6, 0x080c, 0xaadc,</div><div class='del'>-	0x2069, 0x1974, 0x2071, 0x024e, 0x6800, 0xc0dd, 0x7002, 0x080c,</div><div class='del'>-	0x5844, 0xd0e4, 0x0110, 0x680c, 0x700e, 0x00de, 0x04e0, 0x2001,</div><div class='del'>-	0x1837, 0x2004, 0xd0a4, 0x01a8, 0x0016, 0x2001, 0x180d, 0x2004,</div><div class='del'>-	0xd08c, 0x2009, 0x0002, 0x1118, 0x2001, 0x196d, 0x200c, 0x60e0,</div><div class='del'>-	0x9106, 0x0130, 0x2100, 0x60e3, 0x0000, 0x080c, 0x2700, 0x61e2,</div><div class='del'>-	0x001e, 0x20e1, 0x0001, 0x2099, 0x196c, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x024e, 0x20a9, 0x0008, 0x4003, 0x20a9, 0x0004, 0x2099, 0x1805,</div><div class='del'>-	0x20a1, 0x0256, 0x4003, 0x20a9, 0x0004, 0x2099, 0x1801, 0x20a1,</div><div class='del'>-	0x025a, 0x4003, 0x080c, 0xaadc, 0x20a1, 0x024e, 0x20a9, 0x0008,</div><div class='del'>-	0x2099, 0x1974, 0x4003, 0x60c3, 0x0074, 0x0804, 0xa270, 0x080c,</div><div class='del'>-	0x9ef8, 0x7003, 0x2010, 0x7007, 0x0014, 0x700b, 0x0800, 0x700f,</div><div class='del'>-	0x2000, 0x9006, 0x00f6, 0x2079, 0x1847, 0x7904, 0x00fe, 0xd1ac,</div><div class='del'>-	0x1110, 0x9085, 0x0020, 0xd1a4, 0x0110, 0x9085, 0x0010, 0x9085,</div><div class='del'>-	0x0002, 0x00d6, 0x0804, 0x9ea8, 0x7026, 0x60c3, 0x0014, 0x0804,</div><div class='del'>-	0xa270, 0x080c, 0x9ef8, 0x7003, 0x5000, 0x0804, 0x9d67, 0x080c,</div><div class='del'>-	0x9ef8, 0x7003, 0x2110, 0x7007, 0x0014, 0x60c3, 0x0014, 0x0804,</div><div class='del'>-	0xa270, 0x080c, 0x9f3a, 0x0010, 0x080c, 0x9f43, 0x7003, 0x0200,</div><div class='del'>-	0x60c3, 0x0004, 0x0804, 0xa270, 0x080c, 0x9f43, 0x7003, 0x0100,</div><div class='del'>-	0x700b, 0x0003, 0x700f, 0x2a00, 0x60c3, 0x0008, 0x0804, 0xa270,</div><div class='del'>-	0x080c, 0x9f43, 0x7003, 0x0200, 0x0804, 0x9d67, 0x080c, 0x9f43,</div><div class='del'>-	0x7003, 0x0100, 0x782c, 0x9005, 0x0110, 0x700a, 0x0010, 0x700b,</div><div class='del'>-	0x0003, 0x7814, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa270, 0x00d6,</div><div class='del'>-	0x080c, 0x9f43, 0x7003, 0x0210, 0x7007, 0x0014, 0x700b, 0x0800,</div><div class='del'>-	0xb894, 0x9086, 0x0014, 0x1198, 0xb99c, 0x9184, 0x0030, 0x0190,</div><div class='del'>-	0xb998, 0x9184, 0xc000, 0x1140, 0xd1ec, 0x0118, 0x700f, 0x2100,</div><div class='del'>-	0x0058, 0x700f, 0x0100, 0x0040, 0x700f, 0x0400, 0x0028, 0x700f,</div><div class='del'>-	0x0700, 0x0010, 0x700f, 0x0800, 0x00f6, 0x2079, 0x1847, 0x7904,</div><div class='del'>-	0x00fe, 0xd1ac, 0x1110, 0x9085, 0x0020, 0xd1a4, 0x0110, 0x9085,</div><div class='del'>-	0x0010, 0x2009, 0x1869, 0x210c, 0xd184, 0x1110, 0x9085, 0x0002,</div><div class='del'>-	0x0026, 0x2009, 0x1867, 0x210c, 0xd1e4, 0x0150, 0xc0c5, 0xbad4,</div><div class='del'>-	0xd28c, 0x1108, 0xc0cd, 0x9094, 0x0030, 0x9296, 0x0010, 0x0140,</div><div class='del'>-	0xd1ec, 0x0130, 0x9094, 0x0030, 0x9296, 0x0010, 0x0108, 0xc0bd,</div><div class='del'>-	0x002e, 0x7026, 0x60c3, 0x0014, 0x00de, 0x0804, 0xa270, 0x080c,</div><div class='del'>-	0x9f43, 0x7003, 0x0210, 0x7007, 0x0014, 0x700f, 0x0100, 0x60c3,</div><div class='del'>-	0x0014, 0x0804, 0xa270, 0x080c, 0x9f43, 0x7003, 0x0200, 0x0804,</div><div class='del'>-	0x9ce5, 0x080c, 0x9f43, 0x7003, 0x0100, 0x700b, 0x0003, 0x700f,</div><div class='del'>-	0x2a00, 0x60c3, 0x0008, 0x0804, 0xa270, 0x080c, 0x9f43, 0x7003,</div><div class='del'>-	0x0100, 0x700b, 0x000b, 0x60c3, 0x0008, 0x0804, 0xa270, 0x0026,</div><div class='del'>-	0x00d6, 0x0036, 0x0046, 0x2019, 0x3200, 0x2021, 0x0800, 0x0040,</div><div class='del'>-	0x0026, 0x00d6, 0x0036, 0x0046, 0x2019, 0x2200, 0x2021, 0x0100,</div><div class='del'>-	0x080c, 0xaaf1, 0xb810, 0x9305, 0x7002, 0xb814, 0x7006, 0x2069,</div><div class='del'>-	0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x9485, 0x0029, 0x7012,</div><div class='del'>-	0x004e, 0x003e, 0x00de, 0x080c, 0xa264, 0x721a, 0x9f95, 0x0000,</div><div class='del'>-	0x7222, 0x7027, 0xffff, 0x2071, 0x024c, 0x002e, 0x0005, 0x0026,</div><div class='del'>-	0x080c, 0xaaf1, 0x7003, 0x02ff, 0x7007, 0xfffc, 0x00d6, 0x2069,</div><div class='del'>-	0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x00de, 0x7013, 0x2029,</div><div class='del'>-	0x0c10, 0x7003, 0x0100, 0x7007, 0x0000, 0x700b, 0xfc02, 0x700f,</div><div class='del'>-	0x0000, 0x0005, 0x0026, 0x00d6, 0x0036, 0x0046, 0x2019, 0x3300,</div><div class='del'>-	0x2021, 0x0800, 0x0040, 0x0026, 0x00d6, 0x0036, 0x0046, 0x2019,</div><div class='del'>-	0x2300, 0x2021, 0x0100, 0x080c, 0xaaf1, 0xb810, 0x9305, 0x7002,</div><div class='del'>-	0xb814, 0x7006, 0x2069, 0x1800, 0xb810, 0x9005, 0x1140, 0xb814,</div><div class='del'>-	0x9005, 0x1128, 0x700b, 0x00ff, 0x700f, 0xfffe, 0x0020, 0x687c,</div><div class='del'>-	0x700a, 0x6880, 0x700e, 0x0000, 0x9485, 0x0098, 0x7012, 0x004e,</div><div class='del'>-	0x003e, 0x00de, 0x080c, 0xa264, 0x721a, 0x7a08, 0x7222, 0x2f10,</div><div class='del'>-	0x7226, 0x2071, 0x024c, 0x002e, 0x0005, 0x080c, 0xa264, 0x721a,</div><div class='del'>-	0x7a08, 0x7222, 0x7814, 0x7026, 0x2071, 0x024c, 0x002e, 0x0005,</div><div class='del'>-	0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2069, 0x0200, 0x2071,</div><div class='del'>-	0x0240, 0x6004, 0x908a, 0x0085, 0x0a0c, 0x0d85, 0x908a, 0x0092,</div><div class='del'>-	0x1a0c, 0x0d85, 0x6110, 0x2158, 0xb984, 0x2c78, 0x2061, 0x0100,</div><div class='del'>-	0x619a, 0x9082, 0x0085, 0x0033, 0x00fe, 0x00ee, 0x00de, 0x00ce,</div><div class='del'>-	0x00be, 0x0005, 0x9fb1, 0x9fc0, 0x9fcb, 0x9faf, 0x9faf, 0x9faf,</div><div class='del'>-	0x9fb1, 0x9faf, 0x9faf, 0x9faf, 0x9faf, 0x9faf, 0x9faf, 0x080c,</div><div class='del'>-	0x0d85, 0x0411, 0x60c3, 0x0000, 0x0026, 0x080c, 0x2a04, 0x0228,</div><div class='del'>-	0x2011, 0x0101, 0x2204, 0xc0c5, 0x2012, 0x002e, 0x0804, 0xa270,</div><div class='del'>-	0x0431, 0x7808, 0x700a, 0x7814, 0x700e, 0x7017, 0xffff, 0x60c3,</div><div class='del'>-	0x000c, 0x0804, 0xa270, 0x04a1, 0x7003, 0x0003, 0x7007, 0x0300,</div><div class='del'>-	0x60c3, 0x0004, 0x0804, 0xa270, 0x0026, 0x080c, 0xaaf1, 0xb810,</div><div class='del'>-	0x9085, 0x8100, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x687c,</div><div class='del'>-	0x700a, 0x6880, 0x700e, 0x7013, 0x0009, 0x0804, 0x9f13, 0x0026,</div><div class='del'>-	0x080c, 0xaaf1, 0xb810, 0x9085, 0x8400, 0x7002, 0xb814, 0x7006,</div><div class='del'>-	0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x2001, 0x0099,</div><div class='del'>-	0x7a20, 0x9296, 0x0005, 0x0108, 0xc0bc, 0x7012, 0x0804, 0x9f75,</div><div class='del'>-	0x0026, 0x080c, 0xaaf1, 0xb810, 0x9085, 0x8500, 0x7002, 0xb814,</div><div class='del'>-	0x7006, 0x2069, 0x1800, 0x687c, 0x700a, 0x6880, 0x700e, 0x2001,</div><div class='del'>-	0x0099, 0x7a20, 0x9296, 0x0005, 0x0108, 0xc0bc, 0x7012, 0x0804,</div><div class='del'>-	0x9f75, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2c78, 0x2069,</div><div class='del'>-	0x0200, 0x2071, 0x0240, 0x7804, 0x908a, 0x0040, 0x0a0c, 0x0d85,</div><div class='del'>-	0x908a, 0x0057, 0x1a0c, 0x0d85, 0x7910, 0x2158, 0xb984, 0x2061,</div><div class='del'>-	0x0100, 0x619a, 0x9082, 0x0040, 0x0033, 0x00fe, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x00be, 0x0005, 0xa04e, 0xa04e, 0xa04e, 0xa07f, 0xa04e,</div><div class='del'>-	0xa04e, 0xa04e, 0xa04e, 0xa04e, 0xa04e, 0xa04e, 0xa644, 0xa649,</div><div class='del'>-	0xa64e, 0xa653, 0xa04e, 0xa04e, 0xa04e, 0xa63f, 0x080c, 0x0d85,</div><div class='del'>-	0x6813, 0x0008, 0xba8c, 0x8210, 0xb8d4, 0xd084, 0x0180, 0x2001,</div><div class='del'>-	0x1b72, 0x200c, 0x8108, 0x2102, 0x2001, 0x1b71, 0x201c, 0x1218,</div><div class='del'>-	0x8318, 0x2302, 0x0ea0, 0x7952, 0x712e, 0x7b4e, 0x732a, 0x9294,</div><div class='del'>-	0x00ff, 0xba8e, 0x8217, 0x721a, 0xba10, 0x9295, 0x0600, 0x7202,</div><div class='del'>-	0xba14, 0x7206, 0x2069, 0x1800, 0x6a7c, 0x720a, 0x6a80, 0x720e,</div><div class='del'>-	0x7013, 0x0829, 0x2f10, 0x7222, 0x7027, 0xffff, 0x0005, 0x0016,</div><div class='del'>-	0x7814, 0x9084, 0x0700, 0x8007, 0x0013, 0x001e, 0x0005, 0xa08f,</div><div class='del'>-	0xa08f, 0xa091, 0xa08f, 0xa08f, 0xa08f, 0xa0ab, 0xa08f, 0x080c,</div><div class='del'>-	0x0d85, 0x7914, 0x918c, 0x08ff, 0x918d, 0xf600, 0x7916, 0x2009,</div><div class='del'>-	0x0003, 0x00b9, 0x2069, 0x1847, 0x6804, 0xd0bc, 0x0130, 0x682c,</div><div class='del'>-	0x9084, 0x00ff, 0x8007, 0x7032, 0x0010, 0x7033, 0x3f00, 0x60c3,</div><div class='del'>-	0x0001, 0x0804, 0xa270, 0x2009, 0x0003, 0x0019, 0x7033, 0x7f00,</div><div class='del'>-	0x0cb0, 0x0016, 0x080c, 0xaaf1, 0x001e, 0xb810, 0x9085, 0x0100,</div><div class='del'>-	0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x6a7c, 0x720a, 0x6a80,</div><div class='del'>-	0x720e, 0x7013, 0x0888, 0x918d, 0x0008, 0x7116, 0x080c, 0xa264,</div><div class='del'>-	0x721a, 0x7a08, 0x7222, 0x2f10, 0x7226, 0x0005, 0x00b6, 0x00e6,</div><div class='del'>-	0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046, 0x0036, 0x2061, 0x0100,</div><div class='del'>-	0x2071, 0x1800, 0x7160, 0x7810, 0x2058, 0x76dc, 0x96b4, 0x0028,</div><div class='del'>-	0x0110, 0x737c, 0x7480, 0x2500, 0x76dc, 0x96b4, 0x0028, 0x0140,</div><div class='del'>-	0x2001, 0x04ff, 0x6062, 0x6067, 0xffff, 0x636a, 0x646e, 0x0050,</div><div class='del'>-	0x2001, 0x00ff, 0x9085, 0x0400, 0x6062, 0x6067, 0xffff, 0x606b,</div><div class='del'>-	0x0000, 0x616e, 0xb8b8, 0x6073, 0x0530, 0x6077, 0x0008, 0xb88c,</div><div class='del'>-	0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007, 0x9085, 0x0020, 0x607a,</div><div class='del'>-	0x607f, 0x0000, 0x2b00, 0x6082, 0x6087, 0xffff, 0x7814, 0x0096,</div><div class='del'>-	0x2048, 0xa848, 0x608a, 0xa844, 0x608e, 0xa838, 0x60c6, 0xa834,</div><div class='del'>-	0x60ca, 0x009e, 0xb86c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5,</div><div class='del'>-	0x60d7, 0x0000, 0x2001, 0x1837, 0x2004, 0x9084, 0x0028, 0x0128,</div><div class='del'>-	0x609f, 0x0000, 0x2001, 0x0092, 0x0058, 0x6028, 0xc0bd, 0x602a,</div><div class='del'>-	0x609f, 0x00ff, 0x2011, 0xffff, 0x080c, 0x2ad3, 0x2001, 0x00b2,</div><div class='del'>-	0x2010, 0x900e, 0x080c, 0x2ae2, 0x2009, 0x07d0, 0x080c, 0x8a50,</div><div class='del'>-	0x003e, 0x004e, 0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00be,</div><div class='del'>-	0x0005, 0x00b6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046,</div><div class='del'>-	0x0036, 0x2061, 0x0100, 0x2071, 0x1800, 0x7160, 0x7810, 0x2058,</div><div class='del'>-	0xb8a0, 0x2028, 0x76dc, 0xd6ac, 0x1168, 0x9582, 0x007e, 0x1250,</div><div class='del'>-	0x2500, 0x9094, 0xff80, 0x1130, 0x9080, 0x348e, 0x2015, 0x9294,</div><div class='del'>-	0x00ff, 0x0020, 0xb910, 0xba14, 0x737c, 0x7480, 0x70dc, 0xd0ac,</div><div class='del'>-	0x1130, 0x9582, 0x007e, 0x1218, 0x9584, 0xff80, 0x0138, 0x9185,</div><div class='del'>-	0x0400, 0x6062, 0x6266, 0x636a, 0x646e, 0x0030, 0x6063, 0x0400,</div><div class='del'>-	0x6266, 0x606b, 0x0000, 0x616e, 0xb8b8, 0x6072, 0x6077, 0x0000,</div><div class='del'>-	0xb864, 0xd0a4, 0x0110, 0x6077, 0x0008, 0xb88c, 0x8000, 0x9084,</div><div class='del'>-	0x00ff, 0xb88e, 0x8007, 0x9085, 0x0020, 0x607a, 0x607f, 0x0000,</div><div class='del'>-	0x2b00, 0x6082, 0x6087, 0xffff, 0x7814, 0x0096, 0x2048, 0xa848,</div><div class='del'>-	0x608a, 0xa844, 0x608e, 0xa838, 0x60c6, 0xa834, 0x60ca, 0x009e,</div><div class='del'>-	0xb86c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000,</div><div class='del'>-	0xba84, 0x629e, 0x00f6, 0x2079, 0x0140, 0x7803, 0x0000, 0x00fe,</div><div class='del'>-	0x900e, 0x2011, 0x0092, 0x080c, 0x2ae2, 0x2009, 0x07d0, 0x080c,</div><div class='del'>-	0x8a50, 0x003e, 0x004e, 0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee,</div><div class='del'>-	0x00be, 0x0005, 0x00b6, 0x0096, 0x00e6, 0x00d6, 0x00c6, 0x0056,</div><div class='del'>-	0x0046, 0x0036, 0x2061, 0x0100, 0x2071, 0x1800, 0x7810, 0x2058,</div><div class='del'>-	0xb8a0, 0x2028, 0xb910, 0xba14, 0x737c, 0x7480, 0x7820, 0x0002,</div><div class='del'>-	0xa1ef, 0xa1ef, 0xa1ef, 0xa1ef, 0xa1ef, 0xa1ef, 0xa1ef, 0xa1ef,</div><div class='del'>-	0xa1ef, 0xa1ef, 0xa1f1, 0xa1ef, 0xa1ef, 0xa1ef, 0xa1ef, 0x080c,</div><div class='del'>-	0x0d85, 0xb884, 0x609e, 0x7814, 0x2048, 0xa87c, 0xd0fc, 0x0558,</div><div class='del'>-	0xaf90, 0x9784, 0xff00, 0x9105, 0x6062, 0x873f, 0x9784, 0xff00,</div><div class='del'>-	0x0006, 0x7814, 0x2048, 0xa878, 0xc0fc, 0x9005, 0x000e, 0x1160,</div><div class='del'>-	0xaf94, 0x87ff, 0x0198, 0x2039, 0x0098, 0x9705, 0x6072, 0x7808,</div><div class='del'>-	0x6082, 0x2f00, 0x6086, 0x0038, 0x9185, 0x2200, 0x6062, 0x6073,</div><div class='del'>-	0x0129, 0x6077, 0x0000, 0xb884, 0x609e, 0x0050, 0x2039, 0x0029,</div><div class='del'>-	0x9705, 0x6072, 0x0cc0, 0x9185, 0x0200, 0x6062, 0x6073, 0x2029,</div><div class='del'>-	0xa87c, 0xd0fc, 0x0118, 0xaf94, 0x87ff, 0x1120, 0x2f00, 0x6082,</div><div class='del'>-	0x7808, 0x6086, 0x6266, 0x636a, 0x646e, 0x6077, 0x0000, 0xb88c,</div><div class='del'>-	0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007, 0x607a, 0x607f, 0x0000,</div><div class='del'>-	0xa848, 0x608a, 0xa844, 0x608e, 0xa838, 0x60c6, 0xa834, 0x60ca,</div><div class='del'>-	0xb86c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0x080c, 0xaad1,</div><div class='del'>-	0x2009, 0x07d0, 0x60c4, 0x9084, 0xfff0, 0x9005, 0x0110, 0x2009,</div><div class='del'>-	0x1b58, 0x080c, 0x8a50, 0x003e, 0x004e, 0x005e, 0x00ce, 0x00de,</div><div class='del'>-	0x00ee, 0x009e, 0x00be, 0x0005, 0x7a40, 0x9294, 0x00ff, 0x8217,</div><div class='del'>-	0x0005, 0x00d6, 0x2069, 0x19e8, 0x686b, 0x0001, 0x00de, 0x0005,</div><div class='del'>-	0x60a3, 0x0056, 0x60a7, 0x9575, 0x00f1, 0x080c, 0x8a42, 0x0005,</div><div class='del'>-	0x0016, 0x2001, 0x180c, 0x200c, 0x9184, 0x0600, 0x9086, 0x0600,</div><div class='del'>-	0x0128, 0x0089, 0x080c, 0x8a42, 0x001e, 0x0005, 0xc1e5, 0x2001,</div><div class='del'>-	0x180c, 0x2102, 0x2001, 0x19e9, 0x2003, 0x0000, 0x2001, 0x19f4,</div><div class='del'>-	0x2003, 0x0000, 0x0c88, 0x0006, 0x0016, 0x0026, 0x2009, 0x1804,</div><div class='del'>-	0x2011, 0x0009, 0x080c, 0x2ae2, 0x002e, 0x001e, 0x000e, 0x0005,</div><div class='del'>-	0x0016, 0x00c6, 0x0006, 0x080c, 0xacfc, 0x0106, 0x2061, 0x0100,</div><div class='del'>-	0x61a4, 0x60a7, 0x95f5, 0x0016, 0x0026, 0x2009, 0x1804, 0x2011,</div><div class='del'>-	0x0008, 0x080c, 0x2ae2, 0x002e, 0x001e, 0x010e, 0x090c, 0xad18,</div><div class='del'>-	0x000e, 0xa001, 0xa001, 0xa001, 0x61a6, 0x00ce, 0x001e, 0x0005,</div><div class='del'>-	0x00c6, 0x00d6, 0x0016, 0x0026, 0x2061, 0x0100, 0x2069, 0x0140,</div><div class='del'>-	0x080c, 0x779e, 0x1510, 0x2001, 0x1a0d, 0x2004, 0x9005, 0x1904,</div><div class='del'>-	0xa31f, 0x080c, 0x7840, 0x11a8, 0x2069, 0x0380, 0x6843, 0x0101,</div><div class='del'>-	0x6844, 0xd084, 0x1de8, 0x2061, 0x0100, 0x6020, 0xd0b4, 0x1120,</div><div class='del'>-	0x6024, 0xd084, 0x090c, 0x0d85, 0x6843, 0x0100, 0x080c, 0x8a42,</div><div class='del'>-	0x04b0, 0x00c6, 0x2061, 0x19e8, 0x00f0, 0x6904, 0x9194, 0x4000,</div><div class='del'>-	0x0598, 0x080c, 0xa2a0, 0x080c, 0x2aa9, 0x00c6, 0x2061, 0x19e8,</div><div class='del'>-	0x6134, 0x9192, 0x0008, 0x1278, 0x8108, 0x6136, 0x080c, 0xacfc,</div><div class='del'>-	0x6130, 0x080c, 0xad18, 0x00ce, 0x81ff, 0x01c8, 0x080c, 0x8a42,</div><div class='del'>-	0x080c, 0xa293, 0x00a0, 0x080c, 0xacfc, 0x6130, 0x91e5, 0x0000,</div><div class='del'>-	0x0150, 0x080c, 0xeeee, 0x080c, 0x8a4b, 0x6003, 0x0001, 0x2009,</div><div class='del'>-	0x0014, 0x080c, 0xb20a, 0x080c, 0xad18, 0x00ce, 0x0000, 0x002e,</div><div class='del'>-	0x001e, 0x00de, 0x00ce, 0x0005, 0x2001, 0x1a0d, 0x2004, 0x9005,</div><div class='del'>-	0x1db0, 0x00c6, 0x2061, 0x19e8, 0x6134, 0x9192, 0x0003, 0x1ad8,</div><div class='del'>-	0x8108, 0x6136, 0x00ce, 0x080c, 0x8a42, 0x080c, 0x6058, 0x2009,</div><div class='del'>-	0x1846, 0x2114, 0x8210, 0x220a, 0x0c10, 0x0096, 0x00c6, 0x00d6,</div><div class='del'>-	0x00e6, 0x0016, 0x0026, 0x080c, 0x8a58, 0x080c, 0xacfc, 0x2001,</div><div class='del'>-	0x0387, 0x2003, 0x0202, 0x2071, 0x19e8, 0x714c, 0x81ff, 0x0904,</div><div class='del'>-	0xa3d9, 0x2061, 0x0100, 0x2069, 0x0140, 0x080c, 0x779e, 0x1518,</div><div class='del'>-	0x0036, 0x2019, 0x0002, 0x080c, 0xa596, 0x003e, 0x080c, 0xeeee,</div><div class='del'>-	0x704c, 0x9065, 0x0180, 0x2009, 0x004a, 0x6220, 0x9296, 0x0009,</div><div class='del'>-	0x1130, 0x6114, 0x2148, 0xa87b, 0x0006, 0x2009, 0x004a, 0x6003,</div><div class='del'>-	0x0003, 0x080c, 0xb20a, 0x2001, 0x0386, 0x2003, 0x5040, 0x080c,</div><div class='del'>-	0x7840, 0x0804, 0xa3d9, 0x6904, 0xd1f4, 0x0904, 0xa3e6, 0x080c,</div><div class='del'>-	0x2aa9, 0x00c6, 0x704c, 0x9065, 0x090c, 0x0d85, 0x6020, 0x00ce,</div><div class='del'>-	0x9086, 0x0006, 0x1520, 0x61c8, 0x60c4, 0x9105, 0x1500, 0x714c,</div><div class='del'>-	0x9188, 0x0011, 0x2104, 0xd0e4, 0x01d0, 0x6214, 0x9294, 0x1800,</div><div class='del'>-	0x1128, 0x6224, 0x9294, 0x0002, 0x15e0, 0x0010, 0xc0e4, 0x200a,</div><div class='del'>-	0x6014, 0x9084, 0xe7fd, 0x9085, 0x0010, 0x6016, 0x704c, 0x2060,</div><div class='del'>-	0x080c, 0x9a48, 0x2009, 0x0049, 0x080c, 0xb20a, 0x0450, 0x080c,</div><div class='del'>-	0xeeee, 0x704c, 0x9065, 0x9086, 0x1b55, 0x1158, 0x080c, 0xafd2,</div><div class='del'>-	0x1500, 0x2061, 0x1b55, 0x6064, 0x8000, 0x6066, 0x080c, 0x6058,</div><div class='del'>-	0x00c0, 0x0036, 0x2019, 0x0001, 0x080c, 0xa596, 0x003e, 0x714c,</div><div class='del'>-	0x2160, 0x2009, 0x004a, 0x6220, 0x9296, 0x0009, 0x1130, 0x6114,</div><div class='del'>-	0x2148, 0xa87b, 0x0006, 0x2009, 0x004a, 0x6003, 0x0003, 0x080c,</div><div class='del'>-	0xb20a, 0x2001, 0x0387, 0x2003, 0x0200, 0x080c, 0xad18, 0x002e,</div><div class='del'>-	0x001e, 0x00ee, 0x00de, 0x00ce, 0x009e, 0x0005, 0xd1ec, 0x1904,</div><div class='del'>-	0xa37f, 0x0804, 0xa381, 0x0026, 0x00e6, 0x2071, 0x19e8, 0x706c,</div><div class='del'>-	0xd084, 0x01e8, 0xc084, 0x706e, 0x714c, 0x81ff, 0x01c0, 0x2071,</div><div class='del'>-	0x0100, 0x9188, 0x0008, 0x2114, 0x928e, 0x0006, 0x1138, 0x2009,</div><div class='del'>-	0x1984, 0x2011, 0x0012, 0x080c, 0x2ae2, 0x0048, 0x928e, 0x0009,</div><div class='del'>-	0x0db0, 0x2009, 0x1984, 0x2011, 0x0016, 0x080c, 0x2ae2, 0x00ee,</div><div class='del'>-	0x002e, 0x0005, 0x9036, 0x2001, 0x19f2, 0x2004, 0x9005, 0x0128,</div><div class='del'>-	0x9c06, 0x0128, 0x2c30, 0x600c, 0x0cc8, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x00f6, 0x2079, 0x19e8, 0x610c, 0x9006, 0x600e, 0x6044, 0xc0fc,</div><div class='del'>-	0x6046, 0x86ff, 0x1140, 0x7824, 0x9c06, 0x1118, 0x7826, 0x782a,</div><div class='del'>-	0x0050, 0x792a, 0x0040, 0x00c6, 0x2660, 0x610e, 0x00ce, 0x7824,</div><div class='del'>-	0x9c06, 0x1108, 0x7e26, 0x080c, 0xa65d, 0x080c, 0xd10c, 0x00fe,</div><div class='del'>-	0x0005, 0x080c, 0x9ef8, 0x7003, 0x1200, 0x7838, 0x7012, 0x783c,</div><div class='del'>-	0x7016, 0x00c6, 0x7820, 0x9086, 0x0004, 0x1148, 0x7810, 0x9005,</div><div class='del'>-	0x0130, 0x00b6, 0x2058, 0xb810, 0xb914, 0x00be, 0x0020, 0x2061,</div><div class='del'>-	0x1800, 0x607c, 0x6180, 0x9084, 0x00ff, 0x700a, 0x710e, 0x00ce,</div><div class='del'>-	0x60c3, 0x002c, 0x0804, 0xa270, 0x080c, 0x9ef8, 0x7003, 0x0f00,</div><div class='del'>-	0x7808, 0xd09c, 0x0128, 0xb810, 0x9084, 0x00ff, 0x700a, 0xb814,</div><div class='del'>-	0x700e, 0x60c3, 0x0008, 0x0804, 0xa270, 0x0156, 0x080c, 0x9f43,</div><div class='del'>-	0x7003, 0x0200, 0x080c, 0x8b10, 0x20a9, 0x0006, 0x2011, 0xffec,</div><div class='del'>-	0x2019, 0xffed, 0x9ef0, 0x0002, 0x2305, 0x2072, 0x8e70, 0x2205,</div><div class='del'>-	0x2072, 0x8e70, 0x9398, 0x0002, 0x9290, 0x0002, 0x1f04, 0xa484,</div><div class='del'>-	0x60c3, 0x001c, 0x015e, 0x0804, 0xa270, 0x0016, 0x0026, 0x080c,</div><div class='del'>-	0x9f1f, 0x080c, 0x9f31, 0x9e80, 0x0004, 0x20e9, 0x0000, 0x20a0,</div><div class='del'>-	0x7814, 0x0096, 0x2048, 0xa800, 0x2048, 0xa860, 0x20e0, 0xa85c,</div><div class='del'>-	0x9080, 0x0021, 0x2098, 0x009e, 0x7808, 0x9088, 0x0002, 0x21a8,</div><div class='del'>-	0x9192, 0x0010, 0x1250, 0x4003, 0x9080, 0x0004, 0x8003, 0x60c2,</div><div class='del'>-	0x080c, 0xa270, 0x002e, 0x001e, 0x0005, 0x20a9, 0x0010, 0x4003,</div><div class='del'>-	0x080c, 0xaadc, 0x20a1, 0x0240, 0x22a8, 0x4003, 0x0c68, 0x080c,</div><div class='del'>-	0x9ef8, 0x7003, 0x6200, 0x7808, 0x700e, 0x60c3, 0x0008, 0x0804,</div><div class='del'>-	0xa270, 0x0016, 0x0026, 0x080c, 0x9ef8, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x024c, 0x7814, 0x0096, 0x2048, 0xa800, 0x2048, 0xa860, 0x20e0,</div><div class='del'>-	0xa85c, 0x9080, 0x0023, 0x2098, 0x009e, 0x7808, 0x9088, 0x0002,</div><div class='del'>-	0x21a8, 0x4003, 0x8003, 0x60c2, 0x080c, 0xa270, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x00e6, 0x00c6, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x19e8, 0x7010, 0x2060, 0x8cff, 0x0188, 0x080c, 0xd132, 0x1110,</div><div class='del'>-	0x080c, 0xbb5c, 0x600c, 0x0006, 0x080c, 0xd3ae, 0x600f, 0x0000,</div><div class='del'>-	0x080c, 0xb16c, 0x080c, 0xa65d, 0x00ce, 0x0c68, 0x2c00, 0x7012,</div><div class='del'>-	0x700e, 0x012e, 0x000e, 0x00ce, 0x00ee, 0x0005, 0x0126, 0x0156,</div><div class='del'>-	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0026, 0x0016, 0x0006,</div><div class='del'>-	0x2091, 0x8000, 0x2001, 0x180c, 0x200c, 0x918c, 0xe7ff, 0x2102,</div><div class='del'>-	0x2069, 0x0100, 0x2079, 0x0140, 0x2071, 0x19e8, 0x7030, 0x2060,</div><div class='del'>-	0x8cff, 0x0548, 0x080c, 0xa2a0, 0x6ac0, 0x68c3, 0x0000, 0x080c,</div><div class='del'>-	0x8a4b, 0x00c6, 0x2061, 0x0100, 0x080c, 0xac2d, 0x00ce, 0x20a9,</div><div class='del'>-	0x01f4, 0x04b1, 0x080c, 0x99ed, 0x6044, 0xd0ac, 0x1128, 0x2001,</div><div class='del'>-	0x1988, 0x2004, 0x604a, 0x0020, 0x2009, 0x0013, 0x080c, 0xb20a,</div><div class='del'>-	0x000e, 0x001e, 0x002e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00fe,</div><div class='del'>-	0x015e, 0x012e, 0x0005, 0x2001, 0x1800, 0x2004, 0x9096, 0x0001,</div><div class='del'>-	0x0d78, 0x9096, 0x0004, 0x0d60, 0x080c, 0x8a4b, 0x6814, 0x9084,</div><div class='del'>-	0x0001, 0x0110, 0x68a7, 0x95f5, 0x6817, 0x0008, 0x68c3, 0x0000,</div><div class='del'>-	0x2011, 0x6002, 0x080c, 0x8993, 0x20a9, 0x01f4, 0x0009, 0x08c0,</div><div class='del'>-	0x6824, 0xd094, 0x0140, 0x6827, 0x0004, 0x7804, 0x9084, 0x4000,</div><div class='del'>-	0x190c, 0x2aa9, 0x0090, 0xd084, 0x0118, 0x6827, 0x4001, 0x0010,</div><div class='del'>-	0x1f04, 0xa578, 0x7804, 0x9084, 0x1000, 0x0138, 0x2001, 0x0100,</div><div class='del'>-	0x080c, 0x2a99, 0x9006, 0x080c, 0x2a99, 0x0005, 0x0126, 0x0156,</div><div class='del'>-	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0026, 0x0016, 0x0006,</div><div class='del'>-	0x2091, 0x8000, 0x2001, 0x180c, 0x200c, 0x918c, 0xdbff, 0x2102,</div><div class='del'>-	0x2069, 0x0100, 0x2079, 0x0140, 0x2071, 0x0380, 0x701c, 0x0006,</div><div class='del'>-	0x701f, 0x0202, 0x2071, 0x19e8, 0x704c, 0x2060, 0x8cff, 0x0904,</div><div class='del'>-	0xa619, 0x080c, 0xaf84, 0x0904, 0xa619, 0x9386, 0x0002, 0x1128,</div><div class='del'>-	0x6814, 0x9084, 0x0002, 0x0904, 0xa619, 0x68af, 0x95f5, 0x6817,</div><div class='del'>-	0x0010, 0x2009, 0x00fa, 0x8109, 0x1df0, 0x69c6, 0x68cb, 0x0008,</div><div class='del'>-	0x080c, 0x8a58, 0x080c, 0x1e44, 0x2001, 0x0032, 0x6920, 0xd1bc,</div><div class='del'>-	0x0130, 0x8001, 0x1dd8, 0x692c, 0x918d, 0x0008, 0x692e, 0x0016,</div><div class='del'>-	0x2009, 0x0040, 0x080c, 0x2220, 0x001e, 0x20a9, 0x03e8, 0x6824,</div><div class='del'>-	0xd094, 0x0140, 0x6827, 0x0004, 0x7804, 0x9084, 0x4000, 0x190c,</div><div class='del'>-	0x2aa9, 0x0090, 0xd08c, 0x0118, 0x6827, 0x0002, 0x0010, 0x1f04,</div><div class='del'>-	0xa5e7, 0x7804, 0x9084, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c,</div><div class='del'>-	0x2a99, 0x9006, 0x080c, 0x2a99, 0x6827, 0x4000, 0x6824, 0x83ff,</div><div class='del'>-	0x1180, 0x2009, 0x0049, 0x6020, 0x9086, 0x0009, 0x0150, 0x080c,</div><div class='del'>-	0x9a48, 0x6044, 0xd0ac, 0x1118, 0x6003, 0x0002, 0x0010, 0x080c,</div><div class='del'>-	0xb20a, 0x000e, 0x2071, 0x0380, 0xd08c, 0x1110, 0x701f, 0x0200,</div><div class='del'>-	0x000e, 0x001e, 0x002e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00fe,</div><div class='del'>-	0x015e, 0x012e, 0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x2069,</div><div class='del'>-	0x19e8, 0x6a06, 0x012e, 0x00de, 0x0005, 0x00d6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2069, 0x19e8, 0x6a3e, 0x012e, 0x00de, 0x0005, 0x080c,</div><div class='del'>-	0xa050, 0x7047, 0x1000, 0x0098, 0x080c, 0xa050, 0x7047, 0x4000,</div><div class='del'>-	0x0070, 0x080c, 0xa050, 0x7047, 0x2000, 0x0048, 0x080c, 0xa050,</div><div class='del'>-	0x7047, 0x0400, 0x0020, 0x080c, 0xa050, 0x7047, 0x0200, 0x785c,</div><div class='del'>-	0x7032, 0x60c3, 0x0020, 0x0804, 0xa270, 0x00e6, 0x2071, 0x19e8,</div><div class='del'>-	0x702c, 0x9005, 0x0110, 0x8001, 0x702e, 0x00ee, 0x0005, 0x00f6,</div><div class='del'>-	0x00e6, 0x00d6, 0x00c6, 0x0076, 0x0066, 0x0006, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0x19e8, 0x7620, 0x2660, 0x2678, 0x2039, 0x0001,</div><div class='del'>-	0x87ff, 0x0904, 0xa702, 0x8cff, 0x0904, 0xa702, 0x6020, 0x9086,</div><div class='del'>-	0x0006, 0x1904, 0xa6fd, 0x88ff, 0x0138, 0x2800, 0x9c06, 0x1904,</div><div class='del'>-	0xa6fd, 0x2039, 0x0000, 0x0050, 0x6010, 0x9b06, 0x1904, 0xa6fd,</div><div class='del'>-	0x85ff, 0x0120, 0x605c, 0x9106, 0x1904, 0xa6fd, 0x7030, 0x9c06,</div><div class='del'>-	0x15b0, 0x2069, 0x0100, 0x68c0, 0x9005, 0x1160, 0x6824, 0xd084,</div><div class='del'>-	0x0148, 0x6827, 0x0001, 0x080c, 0x8a4b, 0x080c, 0xa78a, 0x7033,</div><div class='del'>-	0x0000, 0x0428, 0x080c, 0x8a4b, 0x6820, 0xd0b4, 0x0110, 0x68a7,</div><div class='del'>-	0x95f5, 0x6817, 0x0008, 0x68c3, 0x0000, 0x080c, 0xa78a, 0x7033,</div><div class='del'>-	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138,</div><div class='del'>-	0x2001, 0x0100, 0x080c, 0x2a99, 0x9006, 0x080c, 0x2a99, 0x2069,</div><div class='del'>-	0x0100, 0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x7020,</div><div class='del'>-	0x9c36, 0x1110, 0x660c, 0x7622, 0x701c, 0x9c36, 0x1140, 0x2c00,</div><div class='del'>-	0x9f36, 0x0118, 0x2f00, 0x701e, 0x0010, 0x701f, 0x0000, 0x660c,</div><div class='del'>-	0x0066, 0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x89ff,</div><div class='del'>-	0x1168, 0x600f, 0x0000, 0x6014, 0x0096, 0x2048, 0x080c, 0xcf19,</div><div class='del'>-	0x0110, 0x080c, 0xea30, 0x009e, 0x080c, 0xb1a7, 0x080c, 0xa65d,</div><div class='del'>-	0x88ff, 0x1190, 0x00ce, 0x0804, 0xa678, 0x2c78, 0x600c, 0x2060,</div><div class='del'>-	0x0804, 0xa678, 0x9006, 0x012e, 0x000e, 0x006e, 0x007e, 0x00ce,</div><div class='del'>-	0x00de, 0x00ee, 0x00fe, 0x0005, 0x601b, 0x0000, 0x00ce, 0x98c5,</div><div class='del'>-	0x0001, 0x0c88, 0x00f6, 0x00e6, 0x00d6, 0x0096, 0x00c6, 0x0066,</div><div class='del'>-	0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19e8, 0x7648,</div><div class='del'>-	0x2660, 0x2678, 0x8cff, 0x0904, 0xa779, 0x6020, 0x9086, 0x0006,</div><div class='del'>-	0x1904, 0xa774, 0x87ff, 0x0128, 0x2700, 0x9c06, 0x1904, 0xa774,</div><div class='del'>-	0x0048, 0x6010, 0x9b06, 0x1904, 0xa774, 0x85ff, 0x0118, 0x605c,</div><div class='del'>-	0x9106, 0x15d0, 0x704c, 0x9c06, 0x1178, 0x0036, 0x2019, 0x0001,</div><div class='del'>-	0x080c, 0xa596, 0x703f, 0x0000, 0x9006, 0x704e, 0x706a, 0x7052,</div><div class='del'>-	0x706e, 0x080c, 0xaff4, 0x003e, 0x7048, 0x9c36, 0x1110, 0x660c,</div><div class='del'>-	0x764a, 0x7044, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00,</div><div class='del'>-	0x7046, 0x0010, 0x7047, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0xcf19, 0x0110, 0x080c, 0xea30, 0x080c, 0xb1a7, 0x87ff,</div><div class='del'>-	0x1198, 0x00ce, 0x0804, 0xa722, 0x2c78, 0x600c, 0x2060, 0x0804,</div><div class='del'>-	0xa722, 0x9006, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce, 0x009e,</div><div class='del'>-	0x00de, 0x00ee, 0x00fe, 0x0005, 0x601b, 0x0000, 0x00ce, 0x97bd,</div><div class='del'>-	0x0001, 0x0c80, 0x00e6, 0x2071, 0x19e8, 0x9006, 0x7032, 0x700a,</div><div class='del'>-	0x7004, 0x9086, 0x0003, 0x0158, 0x2001, 0x1800, 0x2004, 0x9086,</div><div class='del'>-	0x0002, 0x1118, 0x7007, 0x0005, 0x0010, 0x7007, 0x0000, 0x00ee,</div><div class='del'>-	0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0066, 0x0026, 0x0006, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2071, 0x19e8, 0x2c10, 0x7648, 0x2660, 0x2678,</div><div class='del'>-	0x8cff, 0x0540, 0x2200, 0x9c06, 0x1508, 0x7048, 0x9c36, 0x1110,</div><div class='del'>-	0x660c, 0x764a, 0x7044, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118,</div><div class='del'>-	0x2f00, 0x7046, 0x0010, 0x7047, 0x0000, 0x660c, 0x2c00, 0x9f06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x6004, 0x9086,</div><div class='del'>-	0x0040, 0x090c, 0x99ed, 0x9085, 0x0001, 0x0020, 0x2c78, 0x600c,</div><div class='del'>-	0x2060, 0x08b0, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce, 0x00ee,</div><div class='del'>-	0x00fe, 0x0005, 0x0096, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066,</div><div class='del'>-	0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19e8, 0x7610,</div><div class='del'>-	0x2660, 0x2678, 0x8cff, 0x0904, 0xa877, 0x6010, 0x00b6, 0x2058,</div><div class='del'>-	0xb8a0, 0x00be, 0x9206, 0x1904, 0xa872, 0x7030, 0x9c06, 0x1520,</div><div class='del'>-	0x2069, 0x0100, 0x68c0, 0x9005, 0x0904, 0xa849, 0x080c, 0xa2a0,</div><div class='del'>-	0x68c3, 0x0000, 0x080c, 0xa78a, 0x7033, 0x0000, 0x0036, 0x2069,</div><div class='del'>-	0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c,</div><div class='del'>-	0x2a99, 0x9006, 0x080c, 0x2a99, 0x2069, 0x0100, 0x6824, 0xd084,</div><div class='del'>-	0x0110, 0x6827, 0x0001, 0x003e, 0x7010, 0x9c36, 0x1110, 0x660c,</div><div class='del'>-	0x7612, 0x700c, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00,</div><div class='del'>-	0x700e, 0x0010, 0x700f, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06,</div><div class='del'>-	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0xd121,</div><div class='del'>-	0x1180, 0x080c, 0x3344, 0x080c, 0xd132, 0x1518, 0x080c, 0xbb5c,</div><div class='del'>-	0x0400, 0x080c, 0xa78a, 0x6824, 0xd084, 0x09b0, 0x6827, 0x0001,</div><div class='del'>-	0x0898, 0x080c, 0xd132, 0x1118, 0x080c, 0xbb5c, 0x0090, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xcf19, 0x0168, 0x6020, 0x9086, 0x0003, 0x1508,</div><div class='del'>-	0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x7006, 0x080c,</div><div class='del'>-	0xd10c, 0x080c, 0xd3ae, 0x080c, 0xb1a7, 0x080c, 0xa65d, 0x00ce,</div><div class='del'>-	0x0804, 0xa7f2, 0x2c78, 0x600c, 0x2060, 0x0804, 0xa7f2, 0x012e,</div><div class='del'>-	0x000e, 0x002e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x009e,</div><div class='del'>-	0x0005, 0x6020, 0x9086, 0x0006, 0x1d20, 0x080c, 0xea30, 0x0c08,</div><div class='del'>-	0x00d6, 0x080c, 0x9f43, 0x7003, 0x0200, 0x7007, 0x0014, 0x60c3,</div><div class='del'>-	0x0014, 0x20e1, 0x0001, 0x2099, 0x1989, 0x20e9, 0x0000, 0x20a1,</div><div class='del'>-	0x0250, 0x20a9, 0x0004, 0x4003, 0x7023, 0x0004, 0x7027, 0x7878,</div><div class='del'>-	0x080c, 0xa270, 0x00de, 0x0005, 0x080c, 0x9f43, 0x700b, 0x0800,</div><div class='del'>-	0x7814, 0x9084, 0xff00, 0x700e, 0x7814, 0x9084, 0x00ff, 0x7022,</div><div class='del'>-	0x782c, 0x7026, 0x7860, 0x9084, 0x00ff, 0x9085, 0x0200, 0x7002,</div><div class='del'>-	0x7860, 0x9084, 0xff00, 0x8007, 0x7006, 0x60c2, 0x0804, 0xa270,</div><div class='del'>-	0x00b6, 0x00d6, 0x0016, 0x00d6, 0x2f68, 0x2009, 0x0035, 0x080c,</div><div class='del'>-	0xd5bb, 0x00de, 0x1904, 0xa925, 0x080c, 0x9ef8, 0x7003, 0x1300,</div><div class='del'>-	0x782c, 0x080c, 0xaa34, 0x2068, 0x6820, 0x9086, 0x0003, 0x0560,</div><div class='del'>-	0x7810, 0x2058, 0xbaa0, 0x080c, 0xb094, 0x11d8, 0x9286, 0x007e,</div><div class='del'>-	0x1128, 0x700b, 0x00ff, 0x700f, 0xfffe, 0x0498, 0x9286, 0x007f,</div><div class='del'>-	0x1128, 0x700b, 0x00ff, 0x700f, 0xfffd, 0x0458, 0x9284, 0xff80,</div><div class='del'>-	0x0180, 0x9286, 0x0080, 0x1128, 0x700b, 0x00ff, 0x700f, 0xfffc,</div><div class='del'>-	0x0400, 0x92d8, 0x1000, 0x2b5c, 0xb810, 0x700a, 0xb814, 0x700e,</div><div class='del'>-	0x00c0, 0xb884, 0x700e, 0x00a8, 0x080c, 0xb094, 0x1130, 0x7810,</div><div class='del'>-	0x2058, 0xb8a0, 0x9082, 0x007e, 0x0250, 0x00d6, 0x2069, 0x181f,</div><div class='del'>-	0x2d04, 0x700a, 0x8d68, 0x2d04, 0x700e, 0x00de, 0x0010, 0x6034,</div><div class='del'>-	0x700e, 0x7838, 0x7012, 0x783c, 0x7016, 0x60c3, 0x000c, 0x001e,</div><div class='del'>-	0x00de, 0x080c, 0xa270, 0x00be, 0x0005, 0x781b, 0x0001, 0x7803,</div><div class='del'>-	0x0006, 0x001e, 0x00de, 0x00be, 0x0005, 0x792c, 0x9180, 0x0008,</div><div class='del'>-	0x200c, 0x9186, 0x0006, 0x01c0, 0x9186, 0x0003, 0x0904, 0xa9a4,</div><div class='del'>-	0x9186, 0x0005, 0x0904, 0xa98c, 0x9186, 0x0004, 0x05f0, 0x9186,</div><div class='del'>-	0x0008, 0x0904, 0xa995, 0x7807, 0x0037, 0x782f, 0x0003, 0x7817,</div><div class='del'>-	0x1700, 0x080c, 0xaa11, 0x0005, 0x080c, 0xa9d2, 0x00d6, 0x0026,</div><div class='del'>-	0x792c, 0x2168, 0x2009, 0x4000, 0x6800, 0x6a44, 0xd2fc, 0x11f8,</div><div class='del'>-	0x0002, 0xa96c, 0xa977, 0xa96e, 0xa977, 0xa973, 0xa96c, 0xa96c,</div><div class='del'>-	0xa977, 0xa977, 0xa977, 0xa977, 0xa96c, 0xa96c, 0xa96c, 0xa96c,</div><div class='del'>-	0xa96c, 0xa977, 0xa96c, 0xa977, 0x080c, 0x0d85, 0x6824, 0xd0e4,</div><div class='del'>-	0x0110, 0xd0cc, 0x0110, 0x900e, 0x0010, 0x2009, 0x2000, 0x682c,</div><div class='del'>-	0x7022, 0x6830, 0x7026, 0x0804, 0xa9cb, 0x080c, 0xa9d2, 0x00d6,</div><div class='del'>-	0x0026, 0x792c, 0x2168, 0x2009, 0x4000, 0x6a00, 0x9286, 0x0002,</div><div class='del'>-	0x1108, 0x900e, 0x0804, 0xa9cb, 0x080c, 0xa9d2, 0x00d6, 0x0026,</div><div class='del'>-	0x792c, 0x2168, 0x2009, 0x4000, 0x04b0, 0x04e1, 0x00d6, 0x0026,</div><div class='del'>-	0x792c, 0x2168, 0x2009, 0x4000, 0x9286, 0x0005, 0x0118, 0x9286,</div><div class='del'>-	0x0002, 0x1108, 0x900e, 0x0438, 0x0469, 0x00d6, 0x0026, 0x792c,</div><div class='del'>-	0x2168, 0x6814, 0x6924, 0xc185, 0x6926, 0x0096, 0x2048, 0xa9ac,</div><div class='del'>-	0xa834, 0x9112, 0xa9b0, 0xa838, 0x009e, 0x9103, 0x7022, 0x7226,</div><div class='del'>-	0x792c, 0x9180, 0x0011, 0x2004, 0xd0fc, 0x1148, 0x9180, 0x0000,</div><div class='del'>-	0x2004, 0x908e, 0x0002, 0x0130, 0x908e, 0x0004, 0x0118, 0x2009,</div><div class='del'>-	0x4000, 0x0008, 0x900e, 0x712a, 0x60c3, 0x0018, 0x002e, 0x00de,</div><div class='del'>-	0x0804, 0xa270, 0x00b6, 0x0036, 0x0046, 0x0056, 0x0066, 0x080c,</div><div class='del'>-	0x9f43, 0x9006, 0x7003, 0x0200, 0x7938, 0x710a, 0x793c, 0x710e,</div><div class='del'>-	0x7810, 0x2058, 0xb8a0, 0x080c, 0xb094, 0x1118, 0x9092, 0x007e,</div><div class='del'>-	0x0268, 0x00d6, 0x2069, 0x181f, 0x2d2c, 0x8d68, 0x2d34, 0x90d8,</div><div class='del'>-	0x1000, 0x2b5c, 0xbb10, 0xbc14, 0x00de, 0x0028, 0x901e, 0xbc84,</div><div class='del'>-	0x2029, 0x0000, 0x6634, 0x782c, 0x9080, 0x0008, 0x2004, 0x9086,</div><div class='del'>-	0x0003, 0x1128, 0x7512, 0x7616, 0x731a, 0x741e, 0x0020, 0x7312,</div><div class='del'>-	0x7416, 0x751a, 0x761e, 0x006e, 0x005e, 0x004e, 0x003e, 0x00be,</div><div class='del'>-	0x0005, 0x080c, 0x9f43, 0x7003, 0x0100, 0x782c, 0x700a, 0x7814,</div><div class='del'>-	0x700e, 0x700e, 0x60c3, 0x0008, 0x0804, 0xa270, 0x080c, 0x9eef,</div><div class='del'>-	0x7003, 0x1400, 0x7838, 0x700a, 0x0079, 0x783c, 0x700e, 0x782c,</div><div class='del'>-	0x7012, 0x7830, 0x7016, 0x7834, 0x9084, 0x00ff, 0x8007, 0x701a,</div><div class='del'>-	0x60c3, 0x0010, 0x0804, 0xa270, 0x00e6, 0x2071, 0x0240, 0x0006,</div><div class='del'>-	0x00f6, 0x2078, 0x7810, 0x00b6, 0x2058, 0xb8d4, 0xd084, 0x0120,</div><div class='del'>-	0x784c, 0x702a, 0x7850, 0x702e, 0x00be, 0x00fe, 0x000e, 0x00ee,</div><div class='del'>-	0x0005, 0x080c, 0x9f3a, 0x7003, 0x0100, 0x782c, 0x700a, 0x7814,</div><div class='del'>-	0x700e, 0x60c3, 0x0008, 0x0804, 0xa270, 0x00a9, 0x7914, 0x712a,</div><div class='del'>-	0x60c3, 0x0000, 0x60a7, 0x9575, 0x0026, 0x080c, 0x2a04, 0x0228,</div><div class='del'>-	0x2011, 0x0101, 0x2204, 0xc0c5, 0x2012, 0x002e, 0x080c, 0xa293,</div><div class='del'>-	0x080c, 0x8a42, 0x0005, 0x0036, 0x0096, 0x00d6, 0x00e6, 0x7860,</div><div class='del'>-	0x2048, 0xaa7c, 0x9296, 0x00c0, 0x9294, 0x00fd, 0xaa7e, 0xaa80,</div><div class='del'>-	0x9294, 0x0300, 0xaa82, 0xa96c, 0x9194, 0x00ff, 0xab74, 0x9384,</div><div class='del'>-	0x00ff, 0x908d, 0xc200, 0xa96e, 0x9384, 0xff00, 0x9215, 0xaa76,</div><div class='del'>-	0xa870, 0xaa78, 0xa87a, 0xaa72, 0x00d6, 0x2069, 0x0200, 0x080c,</div><div class='del'>-	0xaaf1, 0x00de, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000a,</div><div class='del'>-	0xa860, 0x20e0, 0xa85c, 0x9080, 0x001b, 0x2098, 0x4003, 0x60a3,</div><div class='del'>-	0x0035, 0xaa68, 0x9294, 0x7000, 0x9286, 0x3000, 0x0110, 0x60a3,</div><div class='del'>-	0x0037, 0x00ee, 0x00de, 0x009e, 0x003e, 0x0005, 0x900e, 0x7814,</div><div class='del'>-	0x0096, 0x2048, 0xa87c, 0xd0fc, 0x01c0, 0x9084, 0x0003, 0x11a8,</div><div class='del'>-	0x2001, 0x180c, 0x2004, 0xd0bc, 0x0180, 0x7824, 0xd0cc, 0x1168,</div><div class='del'>-	0xd0c4, 0x1158, 0xa8a8, 0x9005, 0x1140, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0xc1d5, 0x2102, 0x2009, 0x19b3, 0x210c, 0x009e, 0x918d, 0x0092,</div><div class='del'>-	0x0010, 0x2009, 0x0096, 0x60ab, 0x0036, 0x0026, 0x2110, 0x900e,</div><div class='del'>-	0x080c, 0x2ae2, 0x002e, 0x0005, 0x2009, 0x0009, 0x00a0, 0x2009,</div><div class='del'>-	0x000a, 0x0088, 0x2009, 0x000b, 0x0070, 0x2009, 0x000c, 0x0058,</div><div class='del'>-	0x2009, 0x000d, 0x0040, 0x2009, 0x000e, 0x0028, 0x2009, 0x000f,</div><div class='del'>-	0x0010, 0x2009, 0x0008, 0x6912, 0x0005, 0x080c, 0x9ef8, 0x0016,</div><div class='del'>-	0x0026, 0x0096, 0x00d6, 0x7814, 0x2048, 0x7013, 0x0138, 0x2001,</div><div class='del'>-	0x1837, 0x2004, 0x9084, 0x0028, 0x1138, 0x2001, 0x197c, 0x2004,</div><div class='del'>-	0x9086, 0xaaaa, 0x1904, 0xab96, 0x7003, 0x5400, 0x00c6, 0x2061,</div><div class='del'>-	0x1800, 0x607c, 0x9084, 0x00ff, 0xa998, 0x810f, 0x918c, 0xff00,</div><div class='del'>-	0x9105, 0x700a, 0x6080, 0x700e, 0xa998, 0x918c, 0xff00, 0x7112,</div><div class='del'>-	0x20a9, 0x0004, 0x2009, 0x1805, 0x2e10, 0x9290, 0x0006, 0x2104,</div><div class='del'>-	0x2012, 0x8108, 0x8210, 0x1f04, 0xab27, 0x20a9, 0x0004, 0x2009,</div><div class='del'>-	0x1801, 0x2104, 0x2012, 0x8108, 0x8210, 0x1f04, 0xab31, 0xa860,</div><div class='del'>-	0x20e0, 0xa85c, 0x9080, 0x0029, 0x2098, 0x2009, 0x0006, 0x20a9,</div><div class='del'>-	0x0001, 0x4002, 0x8007, 0x2012, 0x8210, 0x8109, 0x1dc0, 0x00d6,</div><div class='del'>-	0x2069, 0x0200, 0x080c, 0xaadc, 0x00de, 0x2071, 0x0240, 0x2011,</div><div class='del'>-	0x0240, 0x2009, 0x0002, 0x20a9, 0x0001, 0x4002, 0x8007, 0x2012,</div><div class='del'>-	0x8210, 0x8109, 0x1dc0, 0x2009, 0x0008, 0x20a9, 0x0001, 0x4002,</div><div class='del'>-	0x8007, 0x2012, 0x8210, 0x8109, 0x1dc0, 0xa85c, 0x9080, 0x0031,</div><div class='del'>-	0x2098, 0x2009, 0x0008, 0x20a9, 0x0001, 0x4002, 0x8007, 0x2012,</div><div class='del'>-	0x8210, 0x8109, 0x1dc0, 0x00ce, 0x60c3, 0x004c, 0x60a3, 0x0056,</div><div class='del'>-	0x60a7, 0x9575, 0x2001, 0x1837, 0x2004, 0x9084, 0x0028, 0x1168,</div><div class='del'>-	0x080c, 0x779e, 0x0150, 0x6028, 0xc0bd, 0x602a, 0x2009, 0x1804,</div><div class='del'>-	0x2011, 0x0029, 0x080c, 0x2ae2, 0x0010, 0x080c, 0xa270, 0x080c,</div><div class='del'>-	0x8a42, 0x00de, 0x009e, 0x002e, 0x001e, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0x0240, 0x2001, 0x2200, 0x9085, 0x00ff, 0x7002, 0x7007, 0xffff,</div><div class='del'>-	0x2071, 0x0100, 0x709b, 0x00ff, 0x00ee, 0x0804, 0xab0c, 0x080c,</div><div class='del'>-	0x9ef8, 0x0016, 0x0026, 0x0096, 0x00d6, 0x7814, 0x2048, 0x7013,</div><div class='del'>-	0x0138, 0x7003, 0x5500, 0x00c6, 0xa89c, 0x9084, 0x00ff, 0xa998,</div><div class='del'>-	0x810f, 0x918c, 0xff00, 0x9105, 0x700a, 0xa99c, 0x918c, 0xff00,</div><div class='del'>-	0xa8a0, 0x9084, 0x00ff, 0x9105, 0x700e, 0xa998, 0x918c, 0xff00,</div><div class='del'>-	0x2061, 0x1800, 0x607c, 0x9084, 0x00ff, 0x910d, 0x7112, 0x6180,</div><div class='del'>-	0x7116, 0x2009, 0x0008, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x0029,</div><div class='del'>-	0x2098, 0x2e10, 0x9290, 0x0006, 0x20a9, 0x0001, 0x4002, 0x8007,</div><div class='del'>-	0x2012, 0x8210, 0x8109, 0x1dc0, 0x20a9, 0x0004, 0x2009, 0x1805,</div><div class='del'>-	0x2104, 0x2012, 0x8108, 0x8210, 0x1f04, 0xabe8, 0x20a9, 0x0002,</div><div class='del'>-	0x2009, 0x1801, 0x2104, 0x2012, 0x8108, 0x8210, 0x1f04, 0xabf2,</div><div class='del'>-	0x00d6, 0x0016, 0x2069, 0x0200, 0x080c, 0xaadc, 0x001e, 0x00de,</div><div class='del'>-	0x2071, 0x0240, 0x20a9, 0x0002, 0x2009, 0x1803, 0x2011, 0x0240,</div><div class='del'>-	0x2104, 0x2012, 0x8108, 0x8210, 0x1f04, 0xac08, 0x2009, 0x0008,</div><div class='del'>-	0x4002, 0x8007, 0x2012, 0x8210, 0x8109, 0x1dd0, 0x9006, 0x20a9,</div><div class='del'>-	0x0008, 0x2012, 0x8210, 0x1f04, 0xac19, 0x00ce, 0x60c3, 0x004c,</div><div class='del'>-	0x60a3, 0x0056, 0x60a7, 0x9575, 0x080c, 0xa270, 0x080c, 0x8a42,</div><div class='del'>-	0x00de, 0x009e, 0x002e, 0x001e, 0x0005, 0x00d6, 0x9290, 0x0018,</div><div class='del'>-	0x8214, 0x20e9, 0x0000, 0x2069, 0x0200, 0x6813, 0x0000, 0x22a8,</div><div class='del'>-	0x9284, 0x00e0, 0x0128, 0x20a9, 0x0020, 0x9292, 0x0020, 0x0008,</div><div class='del'>-	0x9016, 0x20a1, 0x0240, 0x9006, 0x4004, 0x82ff, 0x0120, 0x6810,</div><div class='del'>-	0x8000, 0x6812, 0x0c60, 0x00de, 0x0005, 0x00f6, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x00a6, 0x0096, 0x0066, 0x0126, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x19e8, 0x7610, 0x2660, 0x2678, 0x8cff, 0x0904, 0xacd9, 0x7030,</div><div class='del'>-	0x9c06, 0x1520, 0x2069, 0x0100, 0x68c0, 0x9005, 0x0904, 0xacab,</div><div class='del'>-	0x080c, 0xa2a0, 0x68c3, 0x0000, 0x080c, 0xa78a, 0x7033, 0x0000,</div><div class='del'>-	0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001,</div><div class='del'>-	0x0100, 0x080c, 0x2a99, 0x9006, 0x080c, 0x2a99, 0x2069, 0x0100,</div><div class='del'>-	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x7010, 0x9c36,</div><div class='del'>-	0x1110, 0x660c, 0x7612, 0x700c, 0x9c36, 0x1140, 0x2c00, 0x9f36,</div><div class='del'>-	0x0118, 0x2f00, 0x700e, 0x0010, 0x700f, 0x0000, 0x660c, 0x0066,</div><div class='del'>-	0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000,</div><div class='del'>-	0x080c, 0xd121, 0x1180, 0x080c, 0x3344, 0x080c, 0xd132, 0x1518,</div><div class='del'>-	0x080c, 0xbb5c, 0x0400, 0x080c, 0xa78a, 0x6824, 0xd084, 0x09b0,</div><div class='del'>-	0x6827, 0x0001, 0x0898, 0x080c, 0xd132, 0x1118, 0x080c, 0xbb5c,</div><div class='del'>-	0x0090, 0x6014, 0x2048, 0x080c, 0xcf19, 0x0168, 0x6020, 0x9086,</div><div class='del'>-	0x0003, 0x1520, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c,</div><div class='del'>-	0x7012, 0x080c, 0xd10c, 0x080c, 0xd3ae, 0x080c, 0xb1a7, 0x080c,</div><div class='del'>-	0xa65d, 0x00ce, 0x0804, 0xac5c, 0x2c78, 0x600c, 0x2060, 0x0804,</div><div class='del'>-	0xac5c, 0x7013, 0x0000, 0x700f, 0x0000, 0x012e, 0x006e, 0x009e,</div><div class='del'>-	0x00ae, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x6020, 0x9086,</div><div class='del'>-	0x0006, 0x1d08, 0x080c, 0xea30, 0x08f0, 0x00f6, 0x0036, 0x2079,</div><div class='del'>-	0x0380, 0x7b18, 0xd3bc, 0x1de8, 0x7832, 0x7936, 0x7a3a, 0x781b,</div><div class='del'>-	0x8080, 0x003e, 0x00fe, 0x0005, 0x0016, 0x2001, 0x0382, 0x2004,</div><div class='del'>-	0x9084, 0x0007, 0x9086, 0x0001, 0x1188, 0x2001, 0x0015, 0x0c29,</div><div class='del'>-	0x2009, 0x1000, 0x2001, 0x0382, 0x2004, 0x9084, 0x0007, 0x9086,</div><div class='del'>-	0x0003, 0x0120, 0x8109, 0x1db0, 0x080c, 0x0d85, 0x001e, 0x0005,</div><div class='del'>-	0x2001, 0x0382, 0x2004, 0x9084, 0x0007, 0x9086, 0x0003, 0x1120,</div><div class='del'>-	0x2001, 0x0380, 0x2003, 0x0001, 0x0005, 0x0156, 0x0016, 0x0026,</div><div class='del'>-	0x00e6, 0x900e, 0x2071, 0x19e8, 0x0469, 0x0106, 0x0190, 0x7004,</div><div class='del'>-	0x9086, 0x0003, 0x0148, 0x20a9, 0x1000, 0x6044, 0xd0fc, 0x01d8,</div><div class='del'>-	0x1f04, 0xad35, 0x080c, 0x0d85, 0x080c, 0xacfc, 0x6044, 0xd0fc,</div><div class='del'>-	0x0190, 0x7030, 0x9c06, 0x1148, 0x080c, 0x99ed, 0x6044, 0xd0dc,</div><div class='del'>-	0x0150, 0xc0dc, 0x6046, 0x700a, 0x7042, 0x704c, 0x9c06, 0x190c,</div><div class='del'>-	0x0d85, 0x080c, 0x9a48, 0x010e, 0x1919, 0x00ee, 0x002e, 0x001e,</div><div class='del'>-	0x015e, 0x0005, 0x2001, 0x0382, 0x2004, 0x9084, 0x0007, 0x9086,</div><div class='del'>-	0x0003, 0x0005, 0x0126, 0x2091, 0x2400, 0x7808, 0xd0a4, 0x190c,</div><div class='del'>-	0x0d7e, 0xd09c, 0x0128, 0x7820, 0x908c, 0xf000, 0x11b8, 0x0012,</div><div class='del'>-	0x012e, 0x0005, 0xad82, 0xadc0, 0xadef, 0xae37, 0xae47, 0xae58,</div><div class='del'>-	0xae67, 0xae75, 0xaea2, 0xaea6, 0xad82, 0xad82, 0xaea9, 0xaec5,</div><div class='del'>-	0xad82, 0xad82, 0x080c, 0x0d85, 0x012e, 0x0005, 0x2060, 0x6044,</div><div class='del'>-	0xd0bc, 0x0140, 0xc0bc, 0x6046, 0x6000, 0x908a, 0x0010, 0x1a0c,</div><div class='del'>-	0x0d85, 0x0012, 0x012e, 0x0005, 0xada7, 0xada9, 0xada7, 0xadaf,</div><div class='del'>-	0xada7, 0xada7, 0xada7, 0xada7, 0xada7, 0xada9, 0xada7, 0xada9,</div><div class='del'>-	0xada7, 0xada9, 0xada7, 0xada7, 0xada7, 0xada9, 0xada7, 0x080c,</div><div class='del'>-	0x0d85, 0x2009, 0x0013, 0x080c, 0xb20a, 0x012e, 0x0005, 0x6014,</div><div class='del'>-	0x2048, 0xa87c, 0xd0dc, 0x0130, 0x080c, 0x8c19, 0x080c, 0xb16c,</div><div class='del'>-	0x012e, 0x0005, 0x2009, 0x0049, 0x080c, 0xb20a, 0x012e, 0x0005,</div><div class='del'>-	0x080c, 0xacfc, 0x2001, 0x1a0d, 0x2003, 0x0000, 0x7030, 0x9065,</div><div class='del'>-	0x1130, 0x7004, 0x9086, 0x0003, 0x01e0, 0x080c, 0x0d85, 0x7034,</div><div class='del'>-	0x9092, 0xc350, 0x1258, 0x8000, 0x7036, 0x7004, 0x9086, 0x0003,</div><div class='del'>-	0x0110, 0x7007, 0x0000, 0x781f, 0x0808, 0x0058, 0x080c, 0xb0c0,</div><div class='del'>-	0x0140, 0x080c, 0xeeee, 0x6003, 0x0001, 0x2009, 0x0014, 0x080c,</div><div class='del'>-	0xb20a, 0x781f, 0x0100, 0x080c, 0xad18, 0x012e, 0x0005, 0x080c,</div><div class='del'>-	0xacfc, 0x714c, 0x81ff, 0x1128, 0x2011, 0x1a10, 0x2013, 0x0000,</div><div class='del'>-	0x04c0, 0x2061, 0x0100, 0x7150, 0x9192, 0x7530, 0x1678, 0x8108,</div><div class='del'>-	0x7152, 0x714c, 0x9186, 0x1b55, 0x0120, 0x2001, 0x0391, 0x2003,</div><div class='del'>-	0x0400, 0x9188, 0x0008, 0x210c, 0x918e, 0x0006, 0x1160, 0x6014,</div><div class='del'>-	0x9084, 0x1984, 0x9085, 0x0012, 0x714c, 0x918e, 0x1b55, 0x1108,</div><div class='del'>-	0xc0fd, 0x6016, 0x00b0, 0x714c, 0x9188, 0x0008, 0x210c, 0x918e,</div><div class='del'>-	0x0009, 0x0d68, 0x6014, 0x9084, 0x1984, 0x9085, 0x0016, 0x714c,</div><div class='del'>-	0x918e, 0x1b55, 0x1108, 0xc0fd, 0x6016, 0x0018, 0x706c, 0xc085,</div><div class='del'>-	0x706e, 0x781f, 0x0200, 0x080c, 0xad18, 0x012e, 0x0005, 0x080c,</div><div class='del'>-	0xacfc, 0x714c, 0x2160, 0x6003, 0x0003, 0x2009, 0x004a, 0x080c,</div><div class='del'>-	0xb20a, 0x781f, 0x0200, 0x080c, 0xad18, 0x012e, 0x0005, 0x7808,</div><div class='del'>-	0xd09c, 0x0de8, 0x7820, 0x2060, 0x6003, 0x0003, 0x080c, 0xacfc,</div><div class='del'>-	0x080c, 0x1dcc, 0x781f, 0x0400, 0x080c, 0xad18, 0x012e, 0x0005,</div><div class='del'>-	0x7808, 0xd09c, 0x0de8, 0x7820, 0x2060, 0x080c, 0xacfc, 0x080c,</div><div class='del'>-	0x1e14, 0x781f, 0x0400, 0x080c, 0xad18, 0x012e, 0x0005, 0x7030,</div><div class='del'>-	0x9065, 0x0148, 0x6044, 0xc0bc, 0x6046, 0x7104, 0x9186, 0x0003,</div><div class='del'>-	0x0110, 0x080c, 0x9ab4, 0x012e, 0x0005, 0x00f6, 0x703c, 0x9086,</div><div class='del'>-	0x0002, 0x0528, 0x704c, 0x907d, 0x0510, 0x7844, 0xc0bc, 0x7846,</div><div class='del'>-	0x7820, 0x9086, 0x0009, 0x0118, 0x080c, 0xa1ca, 0x00c0, 0x7828,</div><div class='del'>-	0xd0fc, 0x1118, 0x080c, 0xa149, 0x0090, 0x2001, 0x1837, 0x2004,</div><div class='del'>-	0x9084, 0x0028, 0x1130, 0x2001, 0x197c, 0x2004, 0x9086, 0xaaaa,</div><div class='del'>-	0x1120, 0x2001, 0x0387, 0x2003, 0x1000, 0x080c, 0xa0ce, 0x00fe,</div><div class='del'>-	0x012e, 0x0005, 0x080c, 0x7840, 0x012e, 0x0005, 0x080c, 0x0d85,</div><div class='del'>-	0x0005, 0x2009, 0x1b66, 0x2104, 0xd0bc, 0x01a8, 0xc0bc, 0x200a,</div><div class='del'>-	0x2009, 0x010b, 0x2104, 0x9085, 0x0002, 0x200a, 0x2009, 0x0101,</div><div class='del'>-	0x2104, 0xc0ac, 0x200a, 0x2009, 0x0105, 0x2104, 0x9084, 0x1984,</div><div class='del'>-	0x9085, 0x8092, 0x200a, 0x012e, 0x0005, 0x080c, 0x8a58, 0x2009,</div><div class='del'>-	0x010b, 0x2104, 0xd08c, 0x01a8, 0xc08c, 0x200a, 0x2001, 0x1848,</div><div class='del'>-	0x2004, 0xd094, 0x1130, 0x2009, 0x0101, 0x2104, 0x9085, 0x0020,</div><div class='del'>-	0x200a, 0x2009, 0x1b66, 0x200b, 0x0000, 0x2001, 0x001b, 0x080c,</div><div class='del'>-	0xaced, 0x012e, 0x0005, 0x00e6, 0x2071, 0x19e8, 0x6044, 0xc0bc,</div><div class='del'>-	0x6046, 0xd0fc, 0x01b8, 0x704c, 0x9c06, 0x1190, 0x2019, 0x0001,</div><div class='del'>-	0x080c, 0xa596, 0x704f, 0x0000, 0x2001, 0x0109, 0x2004, 0xd08c,</div><div class='del'>-	0x1138, 0x2001, 0x0108, 0x2004, 0xd0bc, 0x1110, 0x703f, 0x0000,</div><div class='del'>-	0x080c, 0xa7a1, 0x00ee, 0x0005, 0x0026, 0x7010, 0x9c06, 0x1178,</div><div class='del'>-	0x080c, 0xa65d, 0x6044, 0xc0fc, 0x6046, 0x600c, 0x9015, 0x0120,</div><div class='del'>-	0x7212, 0x600f, 0x0000, 0x0010, 0x7212, 0x720e, 0x9006, 0x002e,</div><div class='del'>-	0x0005, 0x0026, 0x7020, 0x9c06, 0x1178, 0x080c, 0xa65d, 0x6044,</div><div class='del'>-	0xc0fc, 0x6046, 0x600c, 0x9015, 0x0120, 0x7222, 0x600f, 0x0000,</div><div class='del'>-	0x0010, 0x7222, 0x721e, 0x9006, 0x002e, 0x0005, 0x00d6, 0x0036,</div><div class='del'>-	0x7830, 0x9c06, 0x1558, 0x2069, 0x0100, 0x68c0, 0x9005, 0x01f8,</div><div class='del'>-	0x080c, 0x8a4b, 0x080c, 0xa2a0, 0x68c3, 0x0000, 0x080c, 0xa78a,</div><div class='del'>-	0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100,</div><div class='del'>-	0x080c, 0x2a99, 0x9006, 0x080c, 0x2a99, 0x2069, 0x0100, 0x6824,</div><div class='del'>-	0xd084, 0x0110, 0x6827, 0x0001, 0x9085, 0x0001, 0x0038, 0x7808,</div><div class='del'>-	0xc0ad, 0x780a, 0x6003, 0x0009, 0x630a, 0x9006, 0x003e, 0x00de,</div><div class='del'>-	0x0005, 0x0016, 0x0026, 0x0036, 0x6100, 0x2019, 0x0100, 0x2001,</div><div class='del'>-	0x0382, 0x2004, 0xd09c, 0x0190, 0x00c6, 0x0126, 0x2091, 0x2800,</div><div class='del'>-	0x0016, 0x0036, 0x080c, 0xad62, 0x003e, 0x001e, 0x012e, 0x00ce,</div><div class='del'>-	0x6200, 0x2200, 0x9106, 0x0d58, 0x2200, 0x0010, 0x8319, 0x1d38,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x0005, 0x00e6, 0x00d6, 0x00c6, 0x080c,</div><div class='del'>-	0xacfc, 0x0106, 0x2071, 0x19e8, 0x2069, 0x0100, 0x704c, 0x2060,</div><div class='del'>-	0x9086, 0x1b55, 0x15b8, 0x6814, 0xd08c, 0x0188, 0x6817, 0x0010,</div><div class='del'>-	0x2009, 0x0019, 0x8109, 0x1df0, 0x2001, 0x0032, 0x6920, 0xd1bc,</div><div class='del'>-	0x0130, 0x8001, 0x1dd8, 0x692c, 0x918d, 0x0008, 0x692e, 0x6824,</div><div class='del'>-	0xd08c, 0x0110, 0x6827, 0x0002, 0x68d0, 0x9005, 0x0118, 0x9082,</div><div class='del'>-	0x0005, 0x0238, 0x6060, 0x8000, 0x6062, 0x2001, 0x0391, 0x2003,</div><div class='del'>-	0x0400, 0x080c, 0x9a48, 0x682c, 0x9084, 0xfffd, 0x682e, 0x2001,</div><div class='del'>-	0x1848, 0x2004, 0xd094, 0x1120, 0x6804, 0x9085, 0x0020, 0x6806,</div><div class='del'>-	0x2069, 0x0000, 0x010e, 0x090c, 0xad18, 0x8dff, 0x00ce, 0x00de,</div><div class='del'>-	0x00ee, 0x0005, 0x00e6, 0x00d6, 0x00c6, 0x080c, 0xacfc, 0x0106,</div><div class='del'>-	0x2071, 0x19e8, 0x2069, 0x0100, 0x080c, 0xaf84, 0x68d0, 0x9005,</div><div class='del'>-	0x0158, 0x9082, 0x0005, 0x1240, 0x080c, 0x2b33, 0x2001, 0x0391,</div><div class='del'>-	0x2003, 0x0400, 0x2069, 0x0000, 0x010e, 0x090c, 0xad18, 0x8dff,</div><div class='del'>-	0x00ce, 0x00de, 0x00ee, 0x0005, 0x0016, 0x2001, 0x0134, 0x2004,</div><div class='del'>-	0x9005, 0x0140, 0x9082, 0x0005, 0x1228, 0x2001, 0x0391, 0x2003,</div><div class='del'>-	0x0404, 0x0020, 0x2001, 0x0391, 0x2003, 0x0400, 0x001e, 0x0005,</div><div class='del'>-	0x00d6, 0x0156, 0x080c, 0x9f43, 0x7a14, 0x82ff, 0x0138, 0x7003,</div><div class='del'>-	0x0100, 0x700b, 0x0003, 0x60c3, 0x0008, 0x0490, 0x7003, 0x0200,</div><div class='del'>-	0x7007, 0x0000, 0x2069, 0x1800, 0x901e, 0x6800, 0x9086, 0x0004,</div><div class='del'>-	0x1110, 0xc38d, 0x0060, 0x080c, 0x779e, 0x1110, 0xc3ad, 0x0008,</div><div class='del'>-	0xc3a5, 0x6adc, 0xd29c, 0x1110, 0xd2ac, 0x0108, 0xc39d, 0x730e,</div><div class='del'>-	0x080c, 0x8b10, 0x20a9, 0x0006, 0x2011, 0xffec, 0x2019, 0xffed,</div><div class='del'>-	0x2071, 0x0250, 0x2305, 0x2072, 0x8e70, 0x2205, 0x2072, 0x8e70,</div><div class='del'>-	0x9398, 0x0002, 0x9290, 0x0002, 0x1f04, 0xb03a, 0x60c3, 0x0020,</div><div class='del'>-	0x080c, 0xa270, 0x015e, 0x00de, 0x0005, 0x0156, 0x080c, 0x9f43,</div><div class='del'>-	0x7a14, 0x82ff, 0x0168, 0x9286, 0xffff, 0x0118, 0x9282, 0x000e,</div><div class='del'>-	0x1238, 0x7003, 0x0100, 0x700b, 0x0003, 0x60c3, 0x0008, 0x0488,</div><div class='del'>-	0x7003, 0x0200, 0x7007, 0x001c, 0x700f, 0x0001, 0x2011, 0x19be,</div><div class='del'>-	0x2204, 0x8007, 0x701a, 0x8210, 0x2204, 0x8007, 0x701e, 0x0421,</div><div class='del'>-	0x1120, 0xb8a0, 0x9082, 0x007f, 0x0248, 0x2001, 0x181f, 0x2004,</div><div class='del'>-	0x7022, 0x2001, 0x1820, 0x2004, 0x7026, 0x0030, 0x2001, 0x1818,</div><div class='del'>-	0x2004, 0x9084, 0x00ff, 0x7026, 0x20a9, 0x0004, 0x20e1, 0x0001,</div><div class='del'>-	0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1, 0x0256, 0x4003, 0x60c3,</div><div class='del'>-	0x001c, 0x015e, 0x0804, 0xa270, 0x0006, 0x2001, 0x1837, 0x2004,</div><div class='del'>-	0xd0ac, 0x000e, 0x0005, 0x2011, 0x0003, 0x080c, 0xa62b, 0x2011,</div><div class='del'>-	0x0002, 0x080c, 0xa635, 0x080c, 0xa516, 0x0036, 0x901e, 0x080c,</div><div class='del'>-	0xa596, 0x003e, 0x0005, 0x080c, 0x3487, 0x0188, 0x0016, 0x00b6,</div><div class='del'>-	0x00c6, 0x7010, 0x9085, 0x0020, 0x7012, 0x2009, 0x007e, 0x080c,</div><div class='del'>-	0x67b4, 0xb85c, 0xc0ac, 0xb85e, 0x00ce, 0x00be, 0x001e, 0x0005,</div><div class='del'>-	0x00d6, 0x00f6, 0x7104, 0x9186, 0x0004, 0x1130, 0x7410, 0x9e90,</div><div class='del'>-	0x0004, 0x9e98, 0x0003, 0x0088, 0x9186, 0x0001, 0x1130, 0x7420,</div><div class='del'>-	0x9e90, 0x0008, 0x9e98, 0x0007, 0x0040, 0x9186, 0x0002, 0x1538,</div><div class='del'>-	0x7428, 0x9e90, 0x000a, 0x9e98, 0x0009, 0x6110, 0x2468, 0x680c,</div><div class='del'>-	0x907d, 0x01e8, 0x7810, 0x9106, 0x1128, 0x2f68, 0x780c, 0x907d,</div><div class='del'>-	0x1dc8, 0x00a8, 0x780c, 0x680e, 0x7c0e, 0x2f12, 0x2304, 0x9f06,</div><div class='del'>-	0x1108, 0x2d1a, 0x9006, 0x7032, 0x7036, 0x7004, 0x9086, 0x0003,</div><div class='del'>-	0x0110, 0x7007, 0x0000, 0x9006, 0x00fe, 0x00de, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0cd0, 0x2071, 0x188d, 0x7000, 0x9005, 0x0140, 0x2001,</div><div class='del'>-	0x0812, 0x2071, 0x1800, 0x7076, 0x707a, 0x706b, 0xffd4, 0x2071,</div><div class='del'>-	0x1800, 0x7074, 0x7056, 0x705b, 0x1ddc, 0x0005, 0x00e6, 0x0126,</div><div class='del'>-	0x2071, 0x1800, 0x2091, 0x8000, 0x7554, 0x9582, 0x0010, 0x0608,</div><div class='del'>-	0x7058, 0x2060, 0x6000, 0x9086, 0x0000, 0x0148, 0x9ce0, 0x001c,</div><div class='del'>-	0x7068, 0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1ddc, 0x0c98, 0x6003,</div><div class='del'>-	0x0008, 0x8529, 0x7556, 0x9ca8, 0x001c, 0x7068, 0x9502, 0x1230,</div><div class='del'>-	0x755a, 0x9085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x705b, 0x1ddc,</div><div class='del'>-	0x0cc0, 0x9006, 0x0cc0, 0x00e6, 0x2071, 0x1800, 0x7554, 0x9582,</div><div class='del'>-	0x0010, 0x0600, 0x7058, 0x2060, 0x6000, 0x9086, 0x0000, 0x0148,</div><div class='del'>-	0x9ce0, 0x001c, 0x7068, 0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1ddc,</div><div class='del'>-	0x0c98, 0x6003, 0x0008, 0x8529, 0x7556, 0x9ca8, 0x001c, 0x7068,</div><div class='del'>-	0x9502, 0x1228, 0x755a, 0x9085, 0x0001, 0x00ee, 0x0005, 0x705b,</div><div class='del'>-	0x1ddc, 0x0cc8, 0x9006, 0x0cc8, 0x9c82, 0x1ddc, 0x0a0c, 0x0d85,</div><div class='del'>-	0x2001, 0x181a, 0x2004, 0x9c02, 0x1a0c, 0x0d85, 0x9006, 0x6006,</div><div class='del'>-	0x600a, 0x600e, 0x6016, 0x601a, 0x6012, 0x6023, 0x0000, 0x6003,</div><div class='del'>-	0x0000, 0x601e, 0x605e, 0x6062, 0x6026, 0x602a, 0x602e, 0x6032,</div><div class='del'>-	0x6036, 0x603a, 0x603e, 0x604a, 0x602a, 0x6046, 0x6042, 0x2061,</div><div class='del'>-	0x1800, 0x6054, 0x8000, 0x6056, 0x0005, 0x9006, 0x600e, 0x6016,</div><div class='del'>-	0x601a, 0x6012, 0x6022, 0x6002, 0x601e, 0x605e, 0x6062, 0x604a,</div><div class='del'>-	0x6046, 0x2061, 0x1800, 0x6054, 0x8000, 0x6056, 0x0005, 0x0006,</div><div class='del'>-	0x6000, 0x9086, 0x0000, 0x01d8, 0x601c, 0xd084, 0x190c, 0x1ad3,</div><div class='del'>-	0x6023, 0x0007, 0x2001, 0x1986, 0x2004, 0x0006, 0x9082, 0x0051,</div><div class='del'>-	0x000e, 0x0208, 0x8004, 0x601a, 0x080c, 0xece1, 0x604b, 0x0000,</div><div class='del'>-	0x6044, 0xd0fc, 0x1131, 0x9006, 0x6046, 0x6016, 0x6012, 0x000e,</div><div class='del'>-	0x0005, 0x080c, 0xacfc, 0x0106, 0x2001, 0x19fb, 0x2004, 0x9c06,</div><div class='del'>-	0x1130, 0x0036, 0x2019, 0x0001, 0x080c, 0xa596, 0x003e, 0x080c,</div><div class='del'>-	0xa7a1, 0x010e, 0x090c, 0xad18, 0x0005, 0x00e6, 0x0126, 0x2071,</div><div class='del'>-	0x1800, 0x2091, 0x8000, 0x7554, 0x9582, 0x0001, 0x0608, 0x7058,</div><div class='del'>-	0x2060, 0x6000, 0x9086, 0x0000, 0x0148, 0x9ce0, 0x001c, 0x7068,</div><div class='del'>-	0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1ddc, 0x0c98, 0x6003, 0x0008,</div><div class='del'>-	0x8529, 0x7556, 0x9ca8, 0x001c, 0x7068, 0x9502, 0x1230, 0x755a,</div><div class='del'>-	0x9085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x705b, 0x1ddc, 0x0cc0,</div><div class='del'>-	0x9006, 0x0cc0, 0x6020, 0x9084, 0x000f, 0x0002, 0xb21e, 0xb228,</div><div class='del'>-	0xb243, 0xb25e, 0xd69a, 0xd6b7, 0xd6d2, 0xb21e, 0xb228, 0x92f7,</div><div class='del'>-	0xb277, 0xb21e, 0xb21e, 0xb21e, 0xb21e, 0xb21e, 0x9186, 0x0013,</div><div class='del'>-	0x1130, 0x6044, 0xd0fc, 0x0110, 0x080c, 0x99ed, 0x0005, 0x0005,</div><div class='del'>-	0x0066, 0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0d85, 0x0013, 0x006e,</div><div class='del'>-	0x0005, 0xb241, 0xb9bc, 0xbba3, 0xb241, 0xbc39, 0xb540, 0xb241,</div><div class='del'>-	0xb241, 0xb93e, 0xc25a, 0xb241, 0xb241, 0xb241, 0xb241, 0xb241,</div><div class='del'>-	0xb241, 0x080c, 0x0d85, 0x0066, 0x6000, 0x90b2, 0x0010, 0x1a0c,</div><div class='del'>-	0x0d85, 0x0013, 0x006e, 0x0005, 0xb25c, 0xc875, 0xb25c, 0xb25c,</div><div class='del'>-	0xb25c, 0xb25c, 0xb25c, 0xb25c, 0xc80c, 0xc9f8, 0xb25c, 0xc8b2,</div><div class='del'>-	0xc936, 0xc8b2, 0xc936, 0xb25c, 0x080c, 0x0d85, 0x6000, 0x9082,</div><div class='del'>-	0x0010, 0x1a0c, 0x0d85, 0x6000, 0x0002, 0xb275, 0xc2a4, 0xc33e,</div><div class='del'>-	0xc4c1, 0xc530, 0xb275, 0xb275, 0xb275, 0xc273, 0xc78d, 0xc790,</div><div class='del'>-	0xb275, 0xb275, 0xb275, 0xb275, 0xc7c0, 0x080c, 0x0d85, 0x0066,</div><div class='del'>-	0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0d85, 0x0013, 0x006e, 0x0005,</div><div class='del'>-	0xb290, 0xb290, 0xb2ce, 0xb36d, 0xb3ed, 0xb290, 0xb290, 0xb290,</div><div class='del'>-	0xb292, 0xb290, 0xb290, 0xb290, 0xb290, 0xb290, 0xb290, 0xb290,</div><div class='del'>-	0x080c, 0x0d85, 0x9186, 0x004c, 0x0560, 0x9186, 0x0003, 0x190c,</div><div class='del'>-	0x0d85, 0x0096, 0x601c, 0xc0ed, 0x601e, 0x6003, 0x0003, 0x6106,</div><div class='del'>-	0x6014, 0x2048, 0xa87c, 0x9084, 0xa000, 0xc0b5, 0xa87e, 0xa8ac,</div><div class='del'>-	0xa836, 0xa8b0, 0xa83a, 0x9006, 0xa846, 0xa84a, 0xa884, 0x9092,</div><div class='del'>-	0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x8013, 0x8213, 0x9210,</div><div class='del'>-	0x621a, 0x009e, 0x080c, 0x1c26, 0x2009, 0x8030, 0x080c, 0x965e,</div><div class='del'>-	0x0005, 0x6010, 0x00b6, 0x2058, 0xbca0, 0x00be, 0x2c00, 0x080c,</div><div class='del'>-	0xb40f, 0x080c, 0xd65d, 0x6003, 0x0007, 0x0005, 0x00d6, 0x0096,</div><div class='del'>-	0x00f6, 0x2079, 0x1800, 0x7a90, 0x6014, 0x2048, 0xa87c, 0xd0ec,</div><div class='del'>-	0x1110, 0x9290, 0x0018, 0xac78, 0xc4fc, 0x0046, 0xa8e0, 0x9005,</div><div class='del'>-	0x1140, 0xa8dc, 0x921a, 0x0140, 0x0220, 0xa87b, 0x0007, 0x2010,</div><div class='del'>-	0x0028, 0xa87b, 0x0015, 0x0010, 0xa87b, 0x0000, 0x8214, 0xa883,</div><div class='del'>-	0x0000, 0xaa02, 0x0006, 0x0016, 0x0026, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x00f6, 0x2400, 0x9005, 0x1108, 0x009a, 0x2100, 0x9086, 0x0015,</div><div class='del'>-	0x1118, 0x2001, 0x0001, 0x0038, 0x2100, 0x9086, 0x0016, 0x0118,</div><div class='del'>-	0x2001, 0x0001, 0x002a, 0x94a4, 0x0007, 0x8423, 0x9405, 0x0002,</div><div class='del'>-	0xb335, 0xb335, 0xb330, 0xb333, 0xb335, 0xb32d, 0xb320, 0xb320,</div><div class='del'>-	0xb320, 0xb320, 0xb320, 0xb320, 0xb320, 0xb320, 0xb320, 0xb320,</div><div class='del'>-	0x00fe, 0x00ee, 0x00de, 0x00ce, 0x002e, 0x001e, 0x000e, 0x004e,</div><div class='del'>-	0x00fe, 0x009e, 0x00de, 0x080c, 0x0d85, 0x080c, 0xbe51, 0x0028,</div><div class='del'>-	0x080c, 0xbf8f, 0x0010, 0x080c, 0xc085, 0x00fe, 0x00ee, 0x00de,</div><div class='del'>-	0x00ce, 0x002e, 0x001e, 0x2c00, 0xa896, 0x000e, 0x080c, 0xb4cd,</div><div class='del'>-	0x0530, 0xa804, 0xa80e, 0x00a6, 0x2050, 0xb100, 0x00ae, 0x8006,</div><div class='del'>-	0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002,</div><div class='del'>-	0xaacc, 0xabd0, 0xacd4, 0xadd8, 0x2031, 0x0000, 0x2041, 0x12c2,</div><div class='del'>-	0x080c, 0xb691, 0x0160, 0x000e, 0x9005, 0x0120, 0x00fe, 0x009e,</div><div class='del'>-	0x00de, 0x0005, 0x00fe, 0x009e, 0x00de, 0x0804, 0xb16c, 0x2001,</div><div class='del'>-	0x002c, 0x900e, 0x080c, 0xb533, 0x0c70, 0x91b6, 0x0015, 0x0170,</div><div class='del'>-	0x91b6, 0x0016, 0x0158, 0x91b2, 0x0047, 0x0a0c, 0x0d85, 0x91b2,</div><div class='del'>-	0x0050, 0x1a0c, 0x0d85, 0x9182, 0x0047, 0x0042, 0x080c, 0xaf61,</div><div class='del'>-	0x0120, 0x9086, 0x0002, 0x0904, 0xb2ce, 0x0005, 0xb38f, 0xb38f,</div><div class='del'>-	0xb391, 0xb3c3, 0xb38f, 0xb38f, 0xb38f, 0xb38f, 0xb3d6, 0x080c,</div><div class='del'>-	0x0d85, 0x00d6, 0x0016, 0x0096, 0x6003, 0x0004, 0x6114, 0x2148,</div><div class='del'>-	0xa87c, 0xd0fc, 0x01c0, 0xa878, 0xc0fc, 0x9005, 0x1158, 0xa894,</div><div class='del'>-	0x9005, 0x0140, 0x2001, 0x0000, 0x900e, 0x080c, 0xb533, 0x080c,</div><div class='del'>-	0xb16c, 0x00a8, 0x6003, 0x0002, 0xa8a4, 0xa9a8, 0x9105, 0x1178,</div><div class='del'>-	0xa8ae, 0xa8b2, 0x0c78, 0xa87f, 0x0020, 0xa88c, 0xa88a, 0xa8a4,</div><div class='del'>-	0xa8ae, 0xa8a8, 0xa8b2, 0xa8c7, 0x0000, 0xa8cb, 0x0000, 0x009e,</div><div class='del'>-	0x001e, 0x00de, 0x0005, 0x080c, 0x9a48, 0x00d6, 0x0096, 0x6114,</div><div class='del'>-	0x2148, 0x080c, 0xcf1b, 0x0120, 0xa87b, 0x0006, 0x080c, 0x7012,</div><div class='del'>-	0x009e, 0x00de, 0x080c, 0xb16c, 0x0804, 0x9ab3, 0x080c, 0x9a48,</div><div class='del'>-	0x080c, 0x3315, 0x080c, 0xd65a, 0x00d6, 0x0096, 0x6114, 0x2148,</div><div class='del'>-	0x080c, 0xcf1b, 0x0120, 0xa87b, 0x0029, 0x080c, 0x7012, 0x009e,</div><div class='del'>-	0x00de, 0x080c, 0xb16c, 0x0804, 0x9ab3, 0x9182, 0x0047, 0x0002,</div><div class='del'>-	0xb3fd, 0xb3ff, 0xb3fd, 0xb3fd, 0xb3fd, 0xb3fd, 0xb3fd, 0xb3fd,</div><div class='del'>-	0xb3fd, 0xb3fd, 0xb3fd, 0xb3fd, 0xb3ff, 0x080c, 0x0d85, 0x00d6,</div><div class='del'>-	0x0096, 0x601f, 0x0000, 0x6114, 0x2148, 0xa87b, 0x0000, 0xa883,</div><div class='del'>-	0x0000, 0x080c, 0x7012, 0x009e, 0x00de, 0x0804, 0xb16c, 0x0026,</div><div class='del'>-	0x0036, 0x0056, 0x0066, 0x0096, 0x00a6, 0x00f6, 0x0006, 0x080c,</div><div class='del'>-	0x1059, 0x000e, 0x090c, 0x0d85, 0xa960, 0x21e8, 0xa95c, 0x9188,</div><div class='del'>-	0x0019, 0x21a0, 0x900e, 0x20a9, 0x0020, 0x4104, 0xa87a, 0x2079,</div><div class='del'>-	0x1800, 0x7990, 0x9188, 0x0018, 0x918c, 0x0fff, 0xa972, 0xac76,</div><div class='del'>-	0x2950, 0x00a6, 0x2001, 0x0205, 0x2003, 0x0000, 0x901e, 0x2029,</div><div class='del'>-	0x0001, 0x9182, 0x0035, 0x1228, 0x2011, 0x001f, 0x080c, 0xca7b,</div><div class='del'>-	0x04c0, 0x2130, 0x2009, 0x0034, 0x2011, 0x001f, 0x080c, 0xca7b,</div><div class='del'>-	0x96b2, 0x0034, 0xb004, 0x904d, 0x0110, 0x080c, 0x100b, 0x080c,</div><div class='del'>-	0x1059, 0x01d0, 0x8528, 0xa867, 0x0110, 0xa86b, 0x0000, 0x2920,</div><div class='del'>-	0xb406, 0x968a, 0x003d, 0x1230, 0x2608, 0x2011, 0x001b, 0x080c,</div><div class='del'>-	0xca7b, 0x00b8, 0x96b2, 0x003c, 0x2009, 0x003c, 0x2950, 0x2011,</div><div class='del'>-	0x001b, 0x080c, 0xca7b, 0x0c18, 0x2001, 0x0205, 0x2003, 0x0000,</div><div class='del'>-	0x00ae, 0x852f, 0x95ad, 0x0050, 0xb566, 0xb070, 0xc0fd, 0xb072,</div><div class='del'>-	0x0048, 0x2001, 0x0205, 0x2003, 0x0000, 0x00ae, 0x852f, 0x95ad,</div><div class='del'>-	0x0050, 0xb566, 0x2a48, 0xa804, 0xa807, 0x0000, 0x0006, 0x080c,</div><div class='del'>-	0x7012, 0x000e, 0x2048, 0x9005, 0x1db0, 0x00fe, 0x00ae, 0x009e,</div><div class='del'>-	0x006e, 0x005e, 0x003e, 0x002e, 0x0005, 0x00d6, 0x00f6, 0x0096,</div><div class='del'>-	0x0006, 0x080c, 0x1059, 0x000e, 0x090c, 0x0d85, 0xa960, 0x21e8,</div><div class='del'>-	0xa95c, 0x9188, 0x0019, 0x21a0, 0x900e, 0x20a9, 0x0020, 0x4104,</div><div class='del'>-	0xaa66, 0xa87a, 0x2079, 0x1800, 0x7990, 0x810c, 0x9188, 0x000c,</div><div class='del'>-	0x9182, 0x001a, 0x0210, 0x2009, 0x001a, 0x21a8, 0x810b, 0xa972,</div><div class='del'>-	0xac76, 0x2e98, 0xa85c, 0x9080, 0x001f, 0x20a0, 0x2001, 0x0205,</div><div class='del'>-	0x200c, 0x918d, 0x0080, 0x2102, 0x4003, 0x2003, 0x0000, 0x080c,</div><div class='del'>-	0x7012, 0x009e, 0x00fe, 0x00de, 0x0005, 0x0016, 0x00d6, 0x00f6,</div><div class='del'>-	0x0096, 0x0016, 0x2001, 0x0205, 0x200c, 0x918d, 0x0080, 0x2102,</div><div class='del'>-	0x001e, 0x2079, 0x0200, 0x2e98, 0xa87c, 0xd0ec, 0x0118, 0x9e80,</div><div class='del'>-	0x000c, 0x2098, 0x2021, 0x003e, 0x901e, 0x9282, 0x0020, 0x0218,</div><div class='del'>-	0x2011, 0x0020, 0x2018, 0x9486, 0x003e, 0x1170, 0x0096, 0x080c,</div><div class='del'>-	0x1059, 0x2900, 0x009e, 0x05c0, 0xa806, 0x2048, 0xa860, 0x20e8,</div><div class='del'>-	0xa85c, 0x9080, 0x0002, 0x20a0, 0x3300, 0x908e, 0x0260, 0x0140,</div><div class='del'>-	0x2009, 0x0280, 0x9102, 0x920a, 0x0218, 0x2010, 0x2100, 0x9318,</div><div class='del'>-	0x2200, 0x9402, 0x1228, 0x2400, 0x9202, 0x2410, 0x9318, 0x9006,</div><div class='del'>-	0x2020, 0x22a8, 0xa800, 0x9200, 0xa802, 0x20e1, 0x0000, 0x4003,</div><div class='del'>-	0x83ff, 0x0180, 0x3300, 0x9086, 0x0280, 0x1130, 0x7814, 0x8000,</div><div class='del'>-	0x9085, 0x0080, 0x7816, 0x2e98, 0x2310, 0x84ff, 0x0904, 0xb4e2,</div><div class='del'>-	0x0804, 0xb4e4, 0x9085, 0x0001, 0x7817, 0x0000, 0x009e, 0x00fe,</div><div class='del'>-	0x00de, 0x001e, 0x0005, 0x00d6, 0x0036, 0x0096, 0x6314, 0x2348,</div><div class='del'>-	0xa87a, 0xa982, 0x080c, 0x7006, 0x009e, 0x003e, 0x00de, 0x0005,</div><div class='del'>-	0x91b6, 0x0015, 0x1118, 0x080c, 0xb16c, 0x0030, 0x91b6, 0x0016,</div><div class='del'>-	0x190c, 0x0d85, 0x080c, 0xb16c, 0x0005, 0x20a9, 0x000e, 0x20e1,</div><div class='del'>-	0x0000, 0x2e98, 0x6014, 0x0096, 0x2048, 0xa860, 0x20e8, 0xa85c,</div><div class='del'>-	0x20a0, 0x009e, 0x4003, 0x9196, 0x0016, 0x01f0, 0x0136, 0x9080,</div><div class='del'>-	0x001b, 0x20a0, 0x2011, 0x0006, 0x20a9, 0x0001, 0x3418, 0x8318,</div><div class='del'>-	0x23a0, 0x4003, 0x3318, 0x8318, 0x2398, 0x8211, 0x1db8, 0x2011,</div><div class='del'>-	0x0006, 0x013e, 0x20a0, 0x3318, 0x8318, 0x2398, 0x4003, 0x3418,</div><div class='del'>-	0x8318, 0x23a0, 0x8211, 0x1db8, 0x0096, 0x080c, 0xcf1b, 0x0130,</div><div class='del'>-	0x6014, 0x2048, 0xa807, 0x0000, 0xa867, 0x0103, 0x009e, 0x0804,</div><div class='del'>-	0xb16c, 0x0096, 0x00d6, 0x0036, 0x7330, 0x9386, 0x0200, 0x11a8,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb8d7, 0x0000, 0x00be, 0x6014, 0x9005,</div><div class='del'>-	0x0130, 0x2048, 0xa807, 0x0000, 0xa867, 0x0103, 0xab32, 0x080c,</div><div class='del'>-	0xb16c, 0x003e, 0x00de, 0x009e, 0x0005, 0x0011, 0x1d48, 0x0cc8,</div><div class='del'>-	0x0006, 0x0016, 0x080c, 0xd645, 0x0188, 0x6014, 0x9005, 0x1170,</div><div class='del'>-	0x600b, 0x0003, 0x601b, 0x0000, 0x604b, 0x0000, 0x2009, 0x0022,</div><div class='del'>-	0x080c, 0xb994, 0x9006, 0x001e, 0x000e, 0x0005, 0x9085, 0x0001,</div><div class='del'>-	0x0cd0, 0x0096, 0x0016, 0x20a9, 0x0014, 0x9e80, 0x000c, 0x20e1,</div><div class='del'>-	0x0000, 0x2098, 0x6014, 0x2048, 0xa860, 0x20e8, 0xa85c, 0x9080,</div><div class='del'>-	0x0002, 0x20a0, 0x4003, 0x2001, 0x0205, 0x2003, 0x0001, 0x2099,</div><div class='del'>-	0x0260, 0x20a9, 0x0016, 0x4003, 0x20a9, 0x000a, 0xa804, 0x2048,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003, 0x2001,</div><div class='del'>-	0x0205, 0x2003, 0x0002, 0x2099, 0x0260, 0x20a9, 0x0020, 0x4003,</div><div class='del'>-	0x2003, 0x0000, 0x6014, 0x2048, 0xa800, 0x2048, 0xa867, 0x0103,</div><div class='del'>-	0x080c, 0xb16c, 0x001e, 0x009e, 0x0005, 0x0096, 0x0016, 0x900e,</div><div class='del'>-	0x7030, 0x9086, 0x0100, 0x0140, 0x7038, 0x9084, 0x00ff, 0x800c,</div><div class='del'>-	0x703c, 0x9084, 0x00ff, 0x8004, 0x9080, 0x0004, 0x9108, 0x810b,</div><div class='del'>-	0x2011, 0x0002, 0x2019, 0x000c, 0x6014, 0x2048, 0x080c, 0xca7b,</div><div class='del'>-	0x080c, 0xcf1b, 0x0140, 0x6014, 0x2048, 0xa807, 0x0000, 0xa864,</div><div class='del'>-	0xa8e2, 0xa867, 0x0103, 0x080c, 0xb16c, 0x001e, 0x009e, 0x0005,</div><div class='del'>-	0x0016, 0x2009, 0x0000, 0x7030, 0x9086, 0x0200, 0x0110, 0x2009,</div><div class='del'>-	0x0001, 0x0096, 0x6014, 0x904d, 0x090c, 0x0d85, 0xa97a, 0x080c,</div><div class='del'>-	0x7012, 0x009e, 0x080c, 0xb16c, 0x001e, 0x0005, 0x0016, 0x0096,</div><div class='del'>-	0x7030, 0x9086, 0x0100, 0x1118, 0x2009, 0x0004, 0x0010, 0x7034,</div><div class='del'>-	0x800c, 0x810b, 0x2011, 0x000c, 0x2019, 0x000c, 0x6014, 0x2048,</div><div class='del'>-	0xa804, 0x0096, 0x9005, 0x0108, 0x2048, 0x080c, 0xca7b, 0x009e,</div><div class='del'>-	0x080c, 0xcf1b, 0x0148, 0xa804, 0x9005, 0x1158, 0xa807, 0x0000,</div><div class='del'>-	0xa864, 0xa8e2, 0xa867, 0x0103, 0x080c, 0xb16c, 0x009e, 0x001e,</div><div class='del'>-	0x0005, 0x0086, 0x2040, 0xa030, 0x8007, 0x9086, 0x0100, 0x1118,</div><div class='del'>-	0x080c, 0xbb5c, 0x00e0, 0xa034, 0x8007, 0x800c, 0x8806, 0x8006,</div><div class='del'>-	0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x000c, 0xa87b,</div><div class='del'>-	0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0xaaa0, 0xab9c, 0xaca8,</div><div class='del'>-	0xada4, 0x2031, 0x0000, 0x2041, 0x12a8, 0x0019, 0x0d08, 0x008e,</div><div class='del'>-	0x0898, 0x0096, 0x0006, 0x080c, 0x1059, 0x000e, 0x01b0, 0xa8ab,</div><div class='del'>-	0x0dcb, 0xa876, 0x000e, 0xa8a2, 0x0006, 0xae6a, 0x2800, 0xa89e,</div><div class='del'>-	0xa97a, 0xaf72, 0xaa8e, 0xab92, 0xac96, 0xad9a, 0x0086, 0x2940,</div><div class='del'>-	0x080c, 0x114e, 0x008e, 0x9085, 0x0001, 0x009e, 0x0005, 0x00e6,</div><div class='del'>-	0x00d6, 0x0026, 0x7008, 0x9084, 0x00ff, 0x6210, 0x00b6, 0x2258,</div><div class='del'>-	0xba10, 0x00be, 0x9206, 0x1520, 0x700c, 0x6210, 0x00b6, 0x2258,</div><div class='del'>-	0xba14, 0x00be, 0x9206, 0x11e0, 0x604b, 0x0000, 0x2c68, 0x0016,</div><div class='del'>-	0x2009, 0x0035, 0x080c, 0xd5bb, 0x001e, 0x1158, 0x622c, 0x2268,</div><div class='del'>-	0x2071, 0x026c, 0x6b20, 0x9386, 0x0003, 0x0130, 0x9386, 0x0006,</div><div class='del'>-	0x0128, 0x080c, 0xb16c, 0x0020, 0x0039, 0x0010, 0x080c, 0xb7c7,</div><div class='del'>-	0x002e, 0x00de, 0x00ee, 0x0005, 0x0096, 0x6814, 0x2048, 0x9186,</div><div class='del'>-	0x0015, 0x0904, 0xb7a6, 0x918e, 0x0016, 0x1904, 0xb7c5, 0x700c,</div><div class='del'>-	0x908c, 0xff00, 0x9186, 0x1700, 0x0120, 0x9186, 0x0300, 0x1904,</div><div class='del'>-	0xb780, 0x89ff, 0x1138, 0x6800, 0x9086, 0x000f, 0x0904, 0xb762,</div><div class='del'>-	0x0804, 0xb7c3, 0x6808, 0x9086, 0xffff, 0x1904, 0xb7a8, 0xa87c,</div><div class='del'>-	0x9084, 0x0060, 0x9086, 0x0020, 0x1150, 0xa8ac, 0xa934, 0x9106,</div><div class='del'>-	0x1904, 0xb7a8, 0xa8b0, 0xa938, 0x9106, 0x1904, 0xb7a8, 0x6824,</div><div class='del'>-	0xd084, 0x1904, 0xb7a8, 0xd0b4, 0x0158, 0x0016, 0x2001, 0x1986,</div><div class='del'>-	0x200c, 0x6018, 0x9102, 0x9082, 0x0005, 0x001e, 0x1a04, 0xb7a8,</div><div class='del'>-	0x080c, 0xd10c, 0x6810, 0x0096, 0x2048, 0xa9a0, 0x009e, 0x685c,</div><div class='del'>-	0xa87a, 0xa976, 0x6864, 0xa882, 0xa87c, 0xc0dc, 0xc0f4, 0xc0d4,</div><div class='del'>-	0xa87e, 0x0026, 0x900e, 0x6a18, 0x2001, 0x000a, 0x080c, 0x955b,</div><div class='del'>-	0xa884, 0x920a, 0x0208, 0x8011, 0xaa86, 0x82ff, 0x002e, 0x1138,</div><div class='del'>-	0x00c6, 0x2d60, 0x080c, 0xcc01, 0x00ce, 0x0804, 0xb7c3, 0x00c6,</div><div class='del'>-	0xa868, 0xd0fc, 0x1118, 0x080c, 0x622f, 0x0010, 0x080c, 0x663a,</div><div class='del'>-	0x00ce, 0x1904, 0xb7a8, 0x00c6, 0x2d60, 0x080c, 0xb16c, 0x00ce,</div><div class='del'>-	0x0804, 0xb7c3, 0x00c6, 0x080c, 0xb1dd, 0x0198, 0x6017, 0x0000,</div><div class='del'>-	0x6810, 0x6012, 0x080c, 0xd3b6, 0x6023, 0x0003, 0x6904, 0x00c6,</div><div class='del'>-	0x2d60, 0x080c, 0xb16c, 0x00ce, 0x080c, 0xb20a, 0x00ce, 0x0804,</div><div class='del'>-	0xb7c3, 0x2001, 0x1988, 0x2004, 0x684a, 0x00ce, 0x0804, 0xb7c3,</div><div class='del'>-	0x7008, 0x9086, 0x000b, 0x11c8, 0x6010, 0x00b6, 0x2058, 0xb900,</div><div class='del'>-	0xc1bc, 0xb902, 0x00be, 0x00c6, 0x2d60, 0xa87b, 0x0003, 0x080c,</div><div class='del'>-	0xd5ff, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002, 0x2009,</div><div class='del'>-	0x8020, 0x080c, 0x9617, 0x00ce, 0x0430, 0x700c, 0x9086, 0x2a00,</div><div class='del'>-	0x1138, 0x2001, 0x1988, 0x2004, 0x684a, 0x00e8, 0x04c1, 0x00e8,</div><div class='del'>-	0x89ff, 0x090c, 0x0d85, 0x00c6, 0x00d6, 0x2d60, 0xa867, 0x0103,</div><div class='del'>-	0xa87b, 0x0003, 0x080c, 0x6e27, 0x080c, 0xd10c, 0x080c, 0xb1a7,</div><div class='del'>-	0x0026, 0x6010, 0x00b6, 0x2058, 0xba3c, 0x080c, 0x68df, 0x00be,</div><div class='del'>-	0x002e, 0x00de, 0x00ce, 0x080c, 0xb16c, 0x009e, 0x0005, 0x9186,</div><div class='del'>-	0x0015, 0x1128, 0x2001, 0x1988, 0x2004, 0x684a, 0x0068, 0x918e,</div><div class='del'>-	0x0016, 0x1160, 0x00c6, 0x2d00, 0x2060, 0x080c, 0xece1, 0x080c,</div><div class='del'>-	0x8c19, 0x080c, 0xb16c, 0x00ce, 0x080c, 0xb16c, 0x0005, 0x0026,</div><div class='del'>-	0x0036, 0x0046, 0x7228, 0xacb0, 0xabac, 0xd2f4, 0x0130, 0x2001,</div><div class='del'>-	0x1988, 0x2004, 0x684a, 0x0804, 0xb841, 0x00c6, 0x2d60, 0x080c,</div><div class='del'>-	0xcadc, 0x00ce, 0x6804, 0x9086, 0x0050, 0x1168, 0x00c6, 0x2d00,</div><div class='del'>-	0x2060, 0x6003, 0x0001, 0x6007, 0x0050, 0x2009, 0x8023, 0x080c,</div><div class='del'>-	0x9617, 0x00ce, 0x04f0, 0x6800, 0x9086, 0x000f, 0x01a8, 0x89ff,</div><div class='del'>-	0x090c, 0x0d85, 0x6800, 0x9086, 0x0004, 0x1190, 0xa87c, 0xd0ac,</div><div class='del'>-	0x0178, 0xa843, 0x0fff, 0xa83f, 0x0fff, 0xa880, 0xc0fc, 0xa882,</div><div class='del'>-	0x2001, 0x0001, 0x6832, 0x0400, 0x2001, 0x0007, 0x6832, 0x00e0,</div><div class='del'>-	0xa87c, 0xd0b4, 0x1150, 0xd0ac, 0x0db8, 0x6824, 0xd0f4, 0x1d48,</div><div class='del'>-	0xa838, 0xa934, 0x9105, 0x0d80, 0x0c20, 0xd2ec, 0x1d68, 0x7024,</div><div class='del'>-	0x9306, 0x1118, 0x7020, 0x9406, 0x0d38, 0x7020, 0x683e, 0x7024,</div><div class='del'>-	0x683a, 0x2001, 0x0005, 0x6832, 0x080c, 0xd2a0, 0x080c, 0x9ab3,</div><div class='del'>-	0x0010, 0x080c, 0xb16c, 0x004e, 0x003e, 0x002e, 0x0005, 0x00e6,</div><div class='del'>-	0x00d6, 0x0026, 0x7008, 0x9084, 0x00ff, 0x6210, 0x00b6, 0x2258,</div><div class='del'>-	0xba10, 0x00be, 0x9206, 0x1904, 0xb8ac, 0x700c, 0x6210, 0x00b6,</div><div class='del'>-	0x2258, 0xba14, 0x00be, 0x9206, 0x1904, 0xb8ac, 0x6038, 0x2068,</div><div class='del'>-	0x6824, 0xc0dc, 0x6826, 0x6a20, 0x9286, 0x0007, 0x0904, 0xb8ac,</div><div class='del'>-	0x9286, 0x0002, 0x0904, 0xb8ac, 0x9286, 0x0000, 0x05e8, 0x6808,</div><div class='del'>-	0x633c, 0x9306, 0x15c8, 0x2071, 0x026c, 0x9186, 0x0015, 0x0570,</div><div class='del'>-	0x918e, 0x0016, 0x1100, 0x00c6, 0x6038, 0x2060, 0x6104, 0x9186,</div><div class='del'>-	0x004b, 0x01c0, 0x9186, 0x004c, 0x01a8, 0x9186, 0x004d, 0x0190,</div><div class='del'>-	0x9186, 0x004e, 0x0178, 0x9186, 0x0052, 0x0160, 0x6014, 0x0096,</div><div class='del'>-	0x2048, 0x080c, 0xcf1b, 0x090c, 0x0d85, 0xa87b, 0x0003, 0x009e,</div><div class='del'>-	0x080c, 0xd5ff, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002,</div><div class='del'>-	0x2009, 0x8020, 0x080c, 0x9617, 0x00ce, 0x0030, 0x6038, 0x2070,</div><div class='del'>-	0x2001, 0x1988, 0x2004, 0x704a, 0x080c, 0xb16c, 0x002e, 0x00de,</div><div class='del'>-	0x00ee, 0x0005, 0x00b6, 0x0096, 0x00f6, 0x6014, 0x2048, 0x6010,</div><div class='del'>-	0x2058, 0x91b6, 0x0015, 0x0130, 0xba08, 0xbb0c, 0xbc00, 0xc48c,</div><div class='del'>-	0xbc02, 0x0470, 0x0096, 0x0156, 0x0036, 0x0026, 0x2b48, 0x9e90,</div><div class='del'>-	0x0010, 0x2019, 0x000a, 0x20a9, 0x0004, 0x080c, 0xc222, 0x002e,</div><div class='del'>-	0x003e, 0x015e, 0x009e, 0x1904, 0xb91d, 0x0096, 0x0156, 0x0036,</div><div class='del'>-	0x0026, 0x2b48, 0x9e90, 0x0014, 0x2019, 0x0006, 0x20a9, 0x0004,</div><div class='del'>-	0x080c, 0xc222, 0x002e, 0x003e, 0x015e, 0x009e, 0x15b0, 0x7238,</div><div class='del'>-	0xba0a, 0x733c, 0xbb0e, 0x83ff, 0x0118, 0xbc00, 0xc48d, 0xbc02,</div><div class='del'>-	0xa804, 0x9005, 0x1128, 0x00fe, 0x009e, 0x00be, 0x0804, 0xb57c,</div><div class='del'>-	0x0096, 0x2048, 0xaa12, 0xab16, 0xac0a, 0x009e, 0x8006, 0x8006,</div><div class='del'>-	0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002, 0x2009,</div><div class='del'>-	0x002b, 0xaaa0, 0xab9c, 0xaca8, 0xada4, 0x2031, 0x0000, 0x2041,</div><div class='del'>-	0x12a8, 0x080c, 0xb691, 0x0130, 0x00fe, 0x009e, 0x080c, 0xb16c,</div><div class='del'>-	0x00be, 0x0005, 0x080c, 0xbb5c, 0x0cb8, 0x2b78, 0x00f6, 0x080c,</div><div class='del'>-	0x3315, 0x080c, 0xd65a, 0x00fe, 0x00c6, 0x080c, 0xb116, 0x2f00,</div><div class='del'>-	0x6012, 0x6017, 0x0000, 0x6023, 0x0001, 0x6007, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x2001, 0x0007, 0x080c, 0x66fa, 0x080c, 0x6726, 0x080c,</div><div class='del'>-	0x961e, 0x080c, 0x9ab3, 0x00ce, 0x0804, 0xb8f0, 0x2100, 0x91b2,</div><div class='del'>-	0x0053, 0x1a0c, 0x0d85, 0x91b2, 0x0040, 0x1a04, 0xb9a6, 0x0002,</div><div class='del'>-	0xb994, 0xb994, 0xb98a, 0xb994, 0xb994, 0xb994, 0xb988, 0xb988,</div><div class='del'>-	0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988,</div><div class='del'>-	0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988,</div><div class='del'>-	0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb994,</div><div class='del'>-	0xb988, 0xb994, 0xb994, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988,</div><div class='del'>-	0xb98a, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb988,</div><div class='del'>-	0xb988, 0xb988, 0xb994, 0xb994, 0xb988, 0xb988, 0xb988, 0xb988,</div><div class='del'>-	0xb988, 0xb988, 0xb988, 0xb988, 0xb988, 0xb994, 0xb988, 0xb988,</div><div class='del'>-	0x080c, 0x0d85, 0x0066, 0x00b6, 0x6610, 0x2658, 0xb8d4, 0xc08c,</div><div class='del'>-	0xb8d6, 0x00be, 0x006e, 0x0000, 0x6003, 0x0001, 0x6106, 0x9186,</div><div class='del'>-	0x0032, 0x0118, 0x080c, 0x961e, 0x0010, 0x080c, 0x9617, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x9ab3, 0x012e, 0x0005, 0x2600, 0x0002,</div><div class='del'>-	0xb994, 0xb994, 0xb9ba, 0xb994, 0xb994, 0xb9ba, 0xb9ba, 0xb9ba,</div><div class='del'>-	0xb9ba, 0xb994, 0xb9ba, 0xb994, 0xb9ba, 0xb994, 0xb9ba, 0xb9ba,</div><div class='del'>-	0xb9ba, 0xb9ba, 0x080c, 0x0d85, 0x6004, 0x90b2, 0x0053, 0x1a0c,</div><div class='del'>-	0x0d85, 0x91b6, 0x0013, 0x0904, 0xba91, 0x91b6, 0x0027, 0x1904,</div><div class='del'>-	0xba3d, 0x080c, 0x99ed, 0x6004, 0x080c, 0xd121, 0x01b0, 0x080c,</div><div class='del'>-	0xd132, 0x01a8, 0x908e, 0x0021, 0x0904, 0xba3a, 0x908e, 0x0022,</div><div class='del'>-	0x1130, 0x080c, 0xb5a8, 0x0904, 0xba36, 0x0804, 0xba37, 0x908e,</div><div class='del'>-	0x003d, 0x0904, 0xba3a, 0x0804, 0xba30, 0x080c, 0x3344, 0x2001,</div><div class='del'>-	0x0007, 0x080c, 0x66fa, 0x6010, 0x00b6, 0x2058, 0xb9a0, 0x00be,</div><div class='del'>-	0x080c, 0xbb5c, 0x9186, 0x007e, 0x1148, 0x2001, 0x1837, 0x2014,</div><div class='del'>-	0xc285, 0x080c, 0x779e, 0x1108, 0xc2ad, 0x2202, 0x080c, 0xacfc,</div><div class='del'>-	0x0036, 0x0026, 0x2019, 0x0028, 0x2110, 0x080c, 0xedee, 0x002e,</div><div class='del'>-	0x003e, 0x0016, 0x0026, 0x0036, 0x2110, 0x2019, 0x0028, 0x080c,</div><div class='del'>-	0x97b0, 0x0076, 0x903e, 0x080c, 0x966d, 0x6010, 0x00b6, 0x905d,</div><div class='del'>-	0x0100, 0x00be, 0x2c08, 0x080c, 0xe75d, 0x007e, 0x003e, 0x002e,</div><div class='del'>-	0x001e, 0x080c, 0xad18, 0x080c, 0xd65a, 0x0016, 0x080c, 0xd3ae,</div><div class='del'>-	0x080c, 0xb16c, 0x001e, 0x080c, 0x341e, 0x080c, 0x9ab3, 0x0030,</div><div class='del'>-	0x080c, 0xd3ae, 0x080c, 0xb16c, 0x080c, 0x9ab3, 0x0005, 0x080c,</div><div class='del'>-	0xbb5c, 0x0cb0, 0x080c, 0xbb98, 0x0c98, 0x9186, 0x0015, 0x0118,</div><div class='del'>-	0x9186, 0x0016, 0x1140, 0x080c, 0xaf61, 0x0d80, 0x9086, 0x0002,</div><div class='del'>-	0x0904, 0xbba3, 0x0c58, 0x9186, 0x0014, 0x1d40, 0x080c, 0x99ed,</div><div class='del'>-	0x6004, 0x908e, 0x0022, 0x1118, 0x080c, 0xb5a8, 0x09f8, 0x080c,</div><div class='del'>-	0x3315, 0x080c, 0xd65a, 0x080c, 0xd121, 0x1190, 0x080c, 0x3344,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb9a0, 0x00be, 0x080c, 0xbb5c, 0x9186,</div><div class='del'>-	0x007e, 0x1128, 0x2001, 0x1837, 0x200c, 0xc185, 0x2102, 0x0800,</div><div class='del'>-	0x080c, 0xd132, 0x1120, 0x080c, 0xbb5c, 0x0804, 0xba30, 0x6004,</div><div class='del'>-	0x908e, 0x0032, 0x1160, 0x00e6, 0x00f6, 0x2071, 0x189e, 0x2079,</div><div class='del'>-	0x0000, 0x080c, 0x36bf, 0x00fe, 0x00ee, 0x0804, 0xba30, 0x6004,</div><div class='del'>-	0x908e, 0x0021, 0x0d40, 0x908e, 0x0022, 0x090c, 0xbb5c, 0x0804,</div><div class='del'>-	0xba30, 0x90b2, 0x0040, 0x1a04, 0xbb3c, 0x2008, 0x0002, 0xbad9,</div><div class='del'>-	0xbada, 0xbadd, 0xbae0, 0xbae3, 0xbaf0, 0xbad7, 0xbad7, 0xbad7,</div><div class='del'>-	0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7,</div><div class='del'>-	0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7,</div><div class='del'>-	0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbaf3, 0xbafe, 0xbad7,</div><div class='del'>-	0xbaff, 0xbafe, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbafe,</div><div class='del'>-	0xbafe, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7, 0xbad7,</div><div class='del'>-	0xbad7, 0xbb27, 0xbafe, 0xbad7, 0xbafa, 0xbad7, 0xbad7, 0xbad7,</div><div class='del'>-	0xbafb, 0xbad7, 0xbad7, 0xbad7, 0xbafe, 0xbb22, 0xbad7, 0x080c,</div><div class='del'>-	0x0d85, 0x0420, 0x2001, 0x000b, 0x0448, 0x2001, 0x0003, 0x0430,</div><div class='del'>-	0x2001, 0x0005, 0x0418, 0x6010, 0x00b6, 0x2058, 0xb804, 0x00be,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x0000, 0x11d8, 0x2001, 0x0001, 0x00b0,</div><div class='del'>-	0x2001, 0x0009, 0x0098, 0x6003, 0x0005, 0x080c, 0xd65d, 0x080c,</div><div class='del'>-	0x9ab3, 0x0058, 0x0018, 0x0010, 0x080c, 0x66fa, 0x04b8, 0x080c,</div><div class='del'>-	0xd65d, 0x6003, 0x0004, 0x080c, 0x9ab3, 0x0005, 0x080c, 0x66fa,</div><div class='del'>-	0x6003, 0x0002, 0x0036, 0x2019, 0x1852, 0x2304, 0x9084, 0xff00,</div><div class='del'>-	0x1120, 0x2001, 0x1986, 0x201c, 0x0040, 0x8007, 0x909a, 0x0004,</div><div class='del'>-	0x0ec0, 0x8003, 0x801b, 0x831b, 0x9318, 0x631a, 0x003e, 0x080c,</div><div class='del'>-	0x9ab3, 0x0c18, 0x080c, 0xd3ae, 0x080c, 0xb16c, 0x08f0, 0x00e6,</div><div class='del'>-	0x00f6, 0x2071, 0x189e, 0x2079, 0x0000, 0x080c, 0x36bf, 0x00fe,</div><div class='del'>-	0x00ee, 0x080c, 0x99ed, 0x080c, 0xb16c, 0x0878, 0x6003, 0x0002,</div><div class='del'>-	0x080c, 0xd65d, 0x0804, 0x9ab3, 0x2600, 0x2008, 0x0002, 0xbb53,</div><div class='del'>-	0xbb36, 0xbb51, 0xbb36, 0xbb36, 0xbb51, 0xbb51, 0xbb51, 0xbb51,</div><div class='del'>-	0xbb36, 0xbb51, 0xbb36, 0xbb51, 0xbb36, 0xbb51, 0xbb51, 0xbb51,</div><div class='del'>-	0xbb51, 0x080c, 0x0d85, 0x0096, 0x6014, 0x2048, 0x080c, 0x7012,</div><div class='del'>-	0x009e, 0x080c, 0xb16c, 0x0005, 0x00e6, 0x0096, 0x0026, 0x0016,</div><div class='del'>-	0x080c, 0xcf1b, 0x0568, 0x6014, 0x2048, 0xa864, 0x9086, 0x0139,</div><div class='del'>-	0x11a8, 0xa894, 0x9086, 0x0056, 0x1148, 0x080c, 0x55cc, 0x0130,</div><div class='del'>-	0x2001, 0x0000, 0x900e, 0x2011, 0x4000, 0x0028, 0x2001, 0x0030,</div><div class='del'>-	0x900e, 0x2011, 0x4005, 0x080c, 0xd51f, 0x0090, 0xa868, 0xd0fc,</div><div class='del'>-	0x0178, 0xa807, 0x0000, 0x0016, 0x6004, 0x908e, 0x0021, 0x0168,</div><div class='del'>-	0x908e, 0x003d, 0x0150, 0x001e, 0xa867, 0x0103, 0xa833, 0x0100,</div><div class='del'>-	0x001e, 0x002e, 0x009e, 0x00ee, 0x0005, 0x001e, 0x0009, 0x0cc0,</div><div class='del'>-	0x0096, 0x6014, 0x2048, 0xa800, 0x2048, 0xa867, 0x0103, 0xa823,</div><div class='del'>-	0x8001, 0x009e, 0x0005, 0x00b6, 0x6610, 0x2658, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x90b2, 0x000c, 0x1a0c, 0x0d85, 0x6604, 0x96b6, 0x004d,</div><div class='del'>-	0x1120, 0x080c, 0xd43e, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x0043,</div><div class='del'>-	0x1120, 0x080c, 0xd487, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x004b,</div><div class='del'>-	0x1120, 0x080c, 0xd4b3, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x0033,</div><div class='del'>-	0x1120, 0x080c, 0xd3d0, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x0028,</div><div class='del'>-	0x1120, 0x080c, 0xd170, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x0029,</div><div class='del'>-	0x1120, 0x080c, 0xd1b1, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x001f,</div><div class='del'>-	0x1120, 0x080c, 0xb54d, 0x0804, 0xbc28, 0x6604, 0x96b6, 0x0000,</div><div class='del'>-	0x1118, 0x080c, 0xb8b2, 0x04e0, 0x6604, 0x96b6, 0x0022, 0x1118,</div><div class='del'>-	0x080c, 0xb589, 0x04a8, 0x6604, 0x96b6, 0x0035, 0x1118, 0x080c,</div><div class='del'>-	0xb6af, 0x0470, 0x6604, 0x96b6, 0x0039, 0x1118, 0x080c, 0xb847,</div><div class='del'>-	0x0438, 0x6604, 0x96b6, 0x003d, 0x1118, 0x080c, 0xb5c1, 0x0400,</div><div class='del'>-	0x6604, 0x96b6, 0x0044, 0x1118, 0x080c, 0xb5fd, 0x00c8, 0x6604,</div><div class='del'>-	0x96b6, 0x0049, 0x1118, 0x080c, 0xb63e, 0x0090, 0x6604, 0x96b6,</div><div class='del'>-	0x0041, 0x1118, 0x080c, 0xb628, 0x0058, 0x91b6, 0x0015, 0x1110,</div><div class='del'>-	0x0063, 0x0030, 0x91b6, 0x0016, 0x1128, 0x00be, 0x0804, 0xbf34,</div><div class='del'>-	0x00be, 0x0005, 0x080c, 0xb227, 0x0cd8, 0xbc45, 0xbc53, 0xbc45,</div><div class='del'>-	0xbc9a, 0xbc45, 0xbe51, 0xbf41, 0xbc45, 0xbc45, 0xbf0a, 0xbc45,</div><div class='del'>-	0xbf20, 0x0096, 0x601f, 0x0000, 0x6014, 0x2048, 0xa800, 0x2048,</div><div class='del'>-	0xa867, 0x0103, 0x009e, 0x0804, 0xb16c, 0xa001, 0xa001, 0x0005,</div><div class='del'>-	0x6604, 0x96b6, 0x0004, 0x1130, 0x2001, 0x0001, 0x080c, 0x66e6,</div><div class='del'>-	0x0804, 0xb16c, 0x0005, 0x00e6, 0x2071, 0x1800, 0x7090, 0x9086,</div><div class='del'>-	0x0074, 0x1540, 0x080c, 0xe72e, 0x11b0, 0x6010, 0x00b6, 0x2058,</div><div class='del'>-	0x7030, 0xd08c, 0x0128, 0xb800, 0xd0bc, 0x0110, 0xc0c5, 0xb802,</div><div class='del'>-	0x00f9, 0x00be, 0x2001, 0x0006, 0x080c, 0x66fa, 0x080c, 0x3344,</div><div class='del'>-	0x080c, 0xb16c, 0x0098, 0x2001, 0x000a, 0x080c, 0x66fa, 0x080c,</div><div class='del'>-	0x3344, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x961e, 0x080c,</div><div class='del'>-	0x9ab3, 0x0020, 0x2001, 0x0001, 0x080c, 0xbe21, 0x00ee, 0x0005,</div><div class='del'>-	0x00d6, 0xb800, 0xd084, 0x0160, 0x9006, 0x080c, 0x66e6, 0x2069,</div><div class='del'>-	0x1847, 0x6804, 0xd0a4, 0x0120, 0x2001, 0x0006, 0x080c, 0x6726,</div><div class='del'>-	0x00de, 0x0005, 0x00b6, 0x0096, 0x00d6, 0x2011, 0x1824, 0x2204,</div><div class='del'>-	0x9086, 0x0074, 0x1904, 0xbdf6, 0x6010, 0x2058, 0xbaa0, 0x9286,</div><div class='del'>-	0x007e, 0x1120, 0x080c, 0xc090, 0x0804, 0xbd63, 0x2001, 0x180d,</div><div class='del'>-	0x2004, 0xd08c, 0x0904, 0xbd05, 0x00d6, 0x080c, 0x779e, 0x01a0,</div><div class='del'>-	0x0026, 0x2011, 0x0010, 0x080c, 0x6c35, 0x002e, 0x0904, 0xbd04,</div><div class='del'>-	0x080c, 0x5854, 0x1598, 0x6014, 0x2048, 0xa807, 0x0000, 0xa867,</div><div class='del'>-	0x0103, 0xa833, 0xdead, 0x0450, 0x6010, 0x00b6, 0x2058, 0xb910,</div><div class='del'>-	0x00be, 0x9186, 0x00ff, 0x0580, 0x0026, 0x2011, 0x8008, 0x080c,</div><div class='del'>-	0x6c35, 0x002e, 0x0548, 0x6014, 0x9005, 0x090c, 0x0d85, 0x2048,</div><div class='del'>-	0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1140, 0x2001, 0x0030,</div><div class='del'>-	0x900e, 0x2011, 0x4009, 0x080c, 0xd51f, 0x0040, 0x6014, 0x2048,</div><div class='del'>-	0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0xdead, 0x6010, 0x2058,</div><div class='del'>-	0xb9a0, 0x0016, 0x080c, 0x3344, 0x080c, 0xb16c, 0x001e, 0x080c,</div><div class='del'>-	0x341e, 0x00de, 0x0804, 0xbdfb, 0x00de, 0x080c, 0xc085, 0x6010,</div><div class='del'>-	0x2058, 0xbaa0, 0x9286, 0x0080, 0x1510, 0x6014, 0x9005, 0x01a8,</div><div class='del'>-	0x2048, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1140, 0x2001,</div><div class='del'>-	0x0000, 0x900e, 0x2011, 0x4000, 0x080c, 0xd51f, 0x0030, 0xa807,</div><div class='del'>-	0x0000, 0xa867, 0x0103, 0xa833, 0x0200, 0x2001, 0x0006, 0x080c,</div><div class='del'>-	0x66fa, 0x080c, 0x3344, 0x080c, 0xb16c, 0x0804, 0xbdfb, 0x080c,</div><div class='del'>-	0xbe09, 0x6014, 0x9005, 0x0190, 0x2048, 0xa868, 0xd0f4, 0x01e8,</div><div class='del'>-	0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1d08, 0x2001, 0x0000,</div><div class='del'>-	0x900e, 0x2011, 0x4000, 0x080c, 0xd51f, 0x08f8, 0x080c, 0xbdff,</div><div class='del'>-	0x0160, 0x9006, 0x080c, 0x66e6, 0x2001, 0x0004, 0x080c, 0x6726,</div><div class='del'>-	0x2001, 0x0007, 0x080c, 0x66fa, 0x08a0, 0x2001, 0x0004, 0x080c,</div><div class='del'>-	0x66fa, 0x6003, 0x0001, 0x6007, 0x0003, 0x080c, 0x961e, 0x080c,</div><div class='del'>-	0x9ab3, 0x0804, 0xbdfb, 0xb85c, 0xd0e4, 0x0178, 0x080c, 0xd348,</div><div class='del'>-	0x080c, 0x779e, 0x0118, 0xd0dc, 0x1904, 0xbd25, 0x2011, 0x1837,</div><div class='del'>-	0x2204, 0xc0ad, 0x2012, 0x0804, 0xbd25, 0x080c, 0xd389, 0x2011,</div><div class='del'>-	0x1837, 0x2204, 0xc0a5, 0x2012, 0x0006, 0x080c, 0xe905, 0x000e,</div><div class='del'>-	0x1904, 0xbd25, 0xc0b5, 0x2012, 0x2001, 0x0006, 0x080c, 0x66fa,</div><div class='del'>-	0x9006, 0x080c, 0x66e6, 0x00c6, 0x2001, 0x180f, 0x2004, 0xd09c,</div><div class='del'>-	0x0520, 0x00f6, 0x2079, 0x0100, 0x00e6, 0x2071, 0x1800, 0x700c,</div><div class='del'>-	0x9084, 0x00ff, 0x78e6, 0x707e, 0x7010, 0x78ea, 0x7082, 0x908c,</div><div class='del'>-	0x00ff, 0x00ee, 0x780c, 0xc0b5, 0x780e, 0x00fe, 0x080c, 0x26d5,</div><div class='del'>-	0x00f6, 0x2100, 0x900e, 0x080c, 0x268c, 0x795e, 0x00fe, 0x9186,</div><div class='del'>-	0x0081, 0x01f0, 0x2009, 0x0081, 0x00e0, 0x2009, 0x00ef, 0x00f6,</div><div class='del'>-	0x2079, 0x0100, 0x79ea, 0x78e7, 0x0000, 0x7932, 0x7936, 0x780c,</div><div class='del'>-	0xc0b5, 0x780e, 0x00fe, 0x080c, 0x26d5, 0x00f6, 0x2079, 0x1800,</div><div class='del'>-	0x7982, 0x2100, 0x900e, 0x797e, 0x080c, 0x268c, 0x795e, 0x00fe,</div><div class='del'>-	0x8108, 0x080c, 0x6749, 0x2b00, 0x00ce, 0x1904, 0xbd25, 0x6012,</div><div class='del'>-	0x2009, 0x180f, 0x210c, 0xd19c, 0x0150, 0x2009, 0x027c, 0x210c,</div><div class='del'>-	0x918c, 0x00ff, 0xb912, 0x2009, 0x027d, 0x210c, 0xb916, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0x66fa, 0x6023, 0x0001, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0028, 0x080c, 0xbb5c,</div><div class='del'>-	0x2001, 0x0001, 0x0431, 0x00de, 0x009e, 0x00be, 0x0005, 0x2001,</div><div class='del'>-	0x1810, 0x2004, 0xd0a4, 0x0120, 0x2001, 0x1848, 0x2004, 0xd0ac,</div><div class='del'>-	0x0005, 0x00e6, 0x080c, 0xee47, 0x0190, 0x2071, 0x0260, 0x7108,</div><div class='del'>-	0x720c, 0x918c, 0x00ff, 0x1118, 0x9284, 0xff00, 0x0140, 0x6010,</div><div class='del'>-	0x2058, 0xb8a0, 0x9084, 0xff80, 0x1110, 0xb912, 0xba16, 0x00ee,</div><div class='del'>-	0x0005, 0x2030, 0x9005, 0x0158, 0x2001, 0x0007, 0x080c, 0x66fa,</div><div class='del'>-	0x080c, 0x5854, 0x1120, 0x2001, 0x0007, 0x080c, 0x6726, 0x2600,</div><div class='del'>-	0x9005, 0x11b0, 0x6014, 0x0096, 0x2048, 0xa868, 0x009e, 0xd0fc,</div><div class='del'>-	0x1178, 0x0036, 0x0046, 0x6010, 0x00b6, 0x2058, 0xbba0, 0x00be,</div><div class='del'>-	0x2021, 0x0004, 0x2011, 0x8014, 0x080c, 0x4ca1, 0x004e, 0x003e,</div><div class='del'>-	0x080c, 0x3344, 0x6020, 0x9086, 0x000a, 0x1108, 0x0005, 0x0804,</div><div class='del'>-	0xb16c, 0x00b6, 0x00e6, 0x0026, 0x0016, 0x2071, 0x1800, 0x7090,</div><div class='del'>-	0x9086, 0x0014, 0x1904, 0xbf00, 0x2001, 0x180d, 0x2004, 0xd08c,</div><div class='del'>-	0x0904, 0xbeb3, 0x00d6, 0x080c, 0x779e, 0x01a0, 0x0026, 0x2011,</div><div class='del'>-	0x0010, 0x080c, 0x6c35, 0x002e, 0x0904, 0xbeb2, 0x080c, 0x5854,</div><div class='del'>-	0x1598, 0x6014, 0x2048, 0xa807, 0x0000, 0xa867, 0x0103, 0xa833,</div><div class='del'>-	0xdead, 0x0450, 0x6010, 0x00b6, 0x2058, 0xb910, 0x00be, 0x9186,</div><div class='del'>-	0x00ff, 0x0580, 0x0026, 0x2011, 0x8008, 0x080c, 0x6c35, 0x002e,</div><div class='del'>-	0x0548, 0x6014, 0x9005, 0x090c, 0x0d85, 0x2048, 0xa864, 0x9084,</div><div class='del'>-	0x00ff, 0x9086, 0x0039, 0x1140, 0x2001, 0x0030, 0x900e, 0x2011,</div><div class='del'>-	0x4009, 0x080c, 0xd51f, 0x0040, 0x6014, 0x2048, 0xa807, 0x0000,</div><div class='del'>-	0xa867, 0x0103, 0xa833, 0xdead, 0x6010, 0x2058, 0xb9a0, 0x0016,</div><div class='del'>-	0x080c, 0x3344, 0x080c, 0xb16c, 0x001e, 0x080c, 0x341e, 0x00de,</div><div class='del'>-	0x0804, 0xbf05, 0x00de, 0x080c, 0x5854, 0x1170, 0x6014, 0x9005,</div><div class='del'>-	0x1158, 0x0036, 0x0046, 0x6010, 0x2058, 0xbba0, 0x2021, 0x0006,</div><div class='del'>-	0x080c, 0x4e58, 0x004e, 0x003e, 0x00d6, 0x6010, 0x2058, 0x080c,</div><div class='del'>-	0x684f, 0x080c, 0xbc88, 0x00de, 0x080c, 0xc15b, 0x1588, 0x6010,</div><div class='del'>-	0x2058, 0xb890, 0x9005, 0x0560, 0x2001, 0x0006, 0x080c, 0x66fa,</div><div class='del'>-	0x0096, 0x6014, 0x904d, 0x01d0, 0xa864, 0x9084, 0x00ff, 0x9086,</div><div class='del'>-	0x0039, 0x1140, 0x2001, 0x0000, 0x900e, 0x2011, 0x4000, 0x080c,</div><div class='del'>-	0xd51f, 0x0060, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0029, 0x0130,</div><div class='del'>-	0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0x0200, 0x009e, 0x080c,</div><div class='del'>-	0x3344, 0x6020, 0x9086, 0x000a, 0x0140, 0x080c, 0xb16c, 0x0028,</div><div class='del'>-	0x080c, 0xbb5c, 0x9006, 0x080c, 0xbe21, 0x001e, 0x002e, 0x00ee,</div><div class='del'>-	0x00be, 0x0005, 0x2011, 0x1824, 0x2204, 0x9086, 0x0014, 0x1160,</div><div class='del'>-	0x2001, 0x0002, 0x080c, 0x66fa, 0x6003, 0x0001, 0x6007, 0x0001,</div><div class='del'>-	0x080c, 0x961e, 0x0804, 0x9ab3, 0x2001, 0x0001, 0x0804, 0xbe21,</div><div class='del'>-	0x2030, 0x2011, 0x1824, 0x2204, 0x9086, 0x0004, 0x1148, 0x96b6,</div><div class='del'>-	0x000b, 0x1120, 0x2001, 0x0007, 0x080c, 0x66fa, 0x0804, 0xb16c,</div><div class='del'>-	0x2001, 0x0001, 0x0804, 0xbe21, 0x0002, 0xbc45, 0xbf4c, 0xbc45,</div><div class='del'>-	0xbf8f, 0xbc45, 0xc03c, 0xbf41, 0xbc48, 0xbc45, 0xc050, 0xbc45,</div><div class='del'>-	0xc062, 0x6604, 0x9686, 0x0003, 0x0904, 0xbe51, 0x96b6, 0x001e,</div><div class='del'>-	0x1110, 0x080c, 0xb16c, 0x0005, 0x00b6, 0x00d6, 0x00c6, 0x080c,</div><div class='del'>-	0xc074, 0x11a0, 0x9006, 0x080c, 0x66e6, 0x080c, 0x3315, 0x080c,</div><div class='del'>-	0xd65a, 0x2001, 0x0002, 0x080c, 0x66fa, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0428, 0x2009, 0x026e,</div><div class='del'>-	0x2104, 0x9086, 0x0009, 0x1160, 0x6010, 0x2058, 0xb840, 0x9084,</div><div class='del'>-	0x00ff, 0x9005, 0x0180, 0x8001, 0xb842, 0x601b, 0x000a, 0x0098,</div><div class='del'>-	0x2009, 0x026f, 0x2104, 0x9084, 0xff00, 0x908e, 0x1900, 0x0158,</div><div class='del'>-	0x908e, 0x1e00, 0x0990, 0x080c, 0x3315, 0x080c, 0xd65a, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0xbe21, 0x00ce, 0x00de, 0x00be, 0x0005, 0x0096,</div><div class='del'>-	0x00b6, 0x0026, 0x9016, 0x080c, 0xc082, 0x00d6, 0x2069, 0x197c,</div><div class='del'>-	0x2d04, 0x9005, 0x0168, 0x6010, 0x2058, 0xb8a0, 0x9086, 0x007e,</div><div class='del'>-	0x1138, 0x2069, 0x1820, 0x2d04, 0x8000, 0x206a, 0x00de, 0x0010,</div><div class='del'>-	0x00de, 0x0088, 0x9006, 0x080c, 0x66e6, 0x2001, 0x0002, 0x080c,</div><div class='del'>-	0x66fa, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x961e, 0x080c,</div><div class='del'>-	0x9ab3, 0x0804, 0xc00c, 0x080c, 0xcf1b, 0x01b0, 0x6014, 0x2048,</div><div class='del'>-	0xa864, 0x2010, 0x9086, 0x0139, 0x1138, 0x6007, 0x0016, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0xd57c, 0x00b0, 0x6014, 0x2048, 0xa864, 0xd0fc,</div><div class='del'>-	0x0118, 0x2001, 0x0001, 0x0ca8, 0x2001, 0x180e, 0x2004, 0xd0dc,</div><div class='del'>-	0x0148, 0x6010, 0x2058, 0xb840, 0x9084, 0x00ff, 0x9005, 0x1110,</div><div class='del'>-	0x9006, 0x0c38, 0x080c, 0xbb5c, 0x2009, 0x026e, 0x2134, 0x96b4,</div><div class='del'>-	0x00ff, 0x9686, 0x0005, 0x0520, 0x9686, 0x000b, 0x01c8, 0x2009,</div><div class='del'>-	0x026f, 0x2104, 0x9084, 0xff00, 0x1118, 0x9686, 0x0009, 0x01c0,</div><div class='del'>-	0x9086, 0x1900, 0x1168, 0x9686, 0x0009, 0x0190, 0x2001, 0x0004,</div><div class='del'>-	0x080c, 0x66fa, 0x2001, 0x0028, 0x601a, 0x6007, 0x0052, 0x0020,</div><div class='del'>-	0x2001, 0x0001, 0x080c, 0xbe21, 0x002e, 0x00be, 0x009e, 0x0005,</div><div class='del'>-	0x9286, 0x0139, 0x0160, 0x6014, 0x2048, 0x080c, 0xcf1b, 0x0140,</div><div class='del'>-	0xa864, 0x9086, 0x0139, 0x0118, 0xa868, 0xd0fc, 0x0108, 0x0c40,</div><div class='del'>-	0x6010, 0x2058, 0xb840, 0x9084, 0x00ff, 0x9005, 0x0138, 0x8001,</div><div class='del'>-	0xb842, 0x601b, 0x000a, 0x6007, 0x0016, 0x08f0, 0xb8a0, 0x9086,</div><div class='del'>-	0x007e, 0x1138, 0x00e6, 0x2071, 0x1800, 0x080c, 0x6130, 0x00ee,</div><div class='del'>-	0x0010, 0x080c, 0x3315, 0x0860, 0x2001, 0x0004, 0x080c, 0x66fa,</div><div class='del'>-	0x080c, 0xc082, 0x1140, 0x6003, 0x0001, 0x6007, 0x0003, 0x080c,</div><div class='del'>-	0x961e, 0x0804, 0x9ab3, 0x080c, 0xbb5c, 0x9006, 0x0804, 0xbe21,</div><div class='del'>-	0x0489, 0x1160, 0x2001, 0x0008, 0x080c, 0x66fa, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0005, 0x080c, 0x961e, 0x0804, 0x9ab3, 0x2001, 0x0001,</div><div class='del'>-	0x0804, 0xbe21, 0x00f9, 0x1160, 0x2001, 0x000a, 0x080c, 0x66fa,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x961e, 0x0804, 0x9ab3,</div><div class='del'>-	0x2001, 0x0001, 0x0804, 0xbe21, 0x2009, 0x026e, 0x2104, 0x9086,</div><div class='del'>-	0x0003, 0x1138, 0x2009, 0x026f, 0x2104, 0x9084, 0xff00, 0x9086,</div><div class='del'>-	0x2a00, 0x0005, 0x9085, 0x0001, 0x0005, 0x00b6, 0x00c6, 0x0016,</div><div class='del'>-	0x6110, 0x2158, 0x080c, 0x67c3, 0x001e, 0x00ce, 0x00be, 0x0005,</div><div class='del'>-	0x00b6, 0x00f6, 0x00e6, 0x00d6, 0x0036, 0x0016, 0x6010, 0x2058,</div><div class='del'>-	0x2009, 0x1837, 0x2104, 0x9085, 0x0003, 0x200a, 0x080c, 0xc12d,</div><div class='del'>-	0x0560, 0x2009, 0x1837, 0x2104, 0xc0cd, 0x200a, 0x080c, 0x6c0d,</div><div class='del'>-	0x0158, 0x9006, 0x2020, 0x2009, 0x002a, 0x080c, 0xea8d, 0x2001,</div><div class='del'>-	0x180c, 0x200c, 0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0001,</div><div class='del'>-	0x080c, 0x32da, 0x00e6, 0x2071, 0x1800, 0x080c, 0x30bf, 0x00ee,</div><div class='del'>-	0x00c6, 0x0156, 0x20a9, 0x0781, 0x2009, 0x007f, 0x080c, 0x341e,</div><div class='del'>-	0x8108, 0x1f04, 0xc0c6, 0x015e, 0x00ce, 0x080c, 0xc085, 0x2071,</div><div class='del'>-	0x0260, 0x2079, 0x0200, 0x7817, 0x0001, 0x2001, 0x1837, 0x200c,</div><div class='del'>-	0xc1c5, 0x7018, 0xd0fc, 0x0110, 0xd0dc, 0x0118, 0x7038, 0xd0dc,</div><div class='del'>-	0x1108, 0xc1c4, 0x7817, 0x0000, 0x2001, 0x1837, 0x2102, 0x9184,</div><div class='del'>-	0x0050, 0x9086, 0x0050, 0x05d0, 0x2079, 0x0100, 0x2e04, 0x9084,</div><div class='del'>-	0x00ff, 0x2069, 0x181f, 0x206a, 0x78e6, 0x0006, 0x8e70, 0x2e04,</div><div class='del'>-	0x2069, 0x1820, 0x206a, 0x78ea, 0x7832, 0x7836, 0x2010, 0x9084,</div><div class='del'>-	0xff00, 0x001e, 0x9105, 0x2009, 0x182c, 0x200a, 0x2200, 0x9084,</div><div class='del'>-	0x00ff, 0x2008, 0x080c, 0x26d5, 0x080c, 0x779e, 0x0170, 0x2071,</div><div class='del'>-	0x0260, 0x2069, 0x1982, 0x7048, 0x206a, 0x704c, 0x6806, 0x7050,</div><div class='del'>-	0x680a, 0x7054, 0x680e, 0x080c, 0xd348, 0x0040, 0x2001, 0x0006,</div><div class='del'>-	0x080c, 0x66fa, 0x080c, 0x3344, 0x080c, 0xb16c, 0x001e, 0x003e,</div><div class='del'>-	0x00de, 0x00ee, 0x00fe, 0x00be, 0x0005, 0x0096, 0x0026, 0x0036,</div><div class='del'>-	0x00e6, 0x0156, 0x2019, 0x182c, 0x231c, 0x83ff, 0x01f0, 0x2071,</div><div class='del'>-	0x0260, 0x7200, 0x9294, 0x00ff, 0x7004, 0x9084, 0xff00, 0x9205,</div><div class='del'>-	0x9306, 0x1198, 0x2011, 0x0276, 0x20a9, 0x0004, 0x2b48, 0x2019,</div><div class='del'>-	0x000a, 0x080c, 0xc222, 0x1148, 0x2011, 0x027a, 0x20a9, 0x0004,</div><div class='del'>-	0x2019, 0x0006, 0x080c, 0xc222, 0x1100, 0x015e, 0x00ee, 0x003e,</div><div class='del'>-	0x002e, 0x009e, 0x0005, 0x00e6, 0x2071, 0x0260, 0x7034, 0x9086,</div><div class='del'>-	0x0014, 0x11a8, 0x7038, 0x9086, 0x0800, 0x1188, 0x703c, 0xd0ec,</div><div class='del'>-	0x0160, 0x9084, 0x0f00, 0x9086, 0x0100, 0x1138, 0x7054, 0xd0a4,</div><div class='del'>-	0x1110, 0xd0ac, 0x0110, 0x9006, 0x0010, 0x9085, 0x0001, 0x00ee,</div><div class='del'>-	0x0005, 0x00e6, 0x0096, 0x00c6, 0x0076, 0x0056, 0x0046, 0x0026,</div><div class='del'>-	0x0006, 0x0126, 0x2091, 0x8000, 0x2029, 0x19f4, 0x252c, 0x2021,</div><div class='del'>-	0x19fb, 0x2424, 0x2061, 0x1ddc, 0x2071, 0x1800, 0x7254, 0x7074,</div><div class='del'>-	0x9202, 0x1a04, 0xc1ee, 0x080c, 0x8eee, 0x0904, 0xc1e7, 0x080c,</div><div class='del'>-	0xeabe, 0x0904, 0xc1e7, 0x6720, 0x9786, 0x0007, 0x0904, 0xc1e7,</div><div class='del'>-	0x2500, 0x9c06, 0x0904, 0xc1e7, 0x2400, 0x9c06, 0x0904, 0xc1e7,</div><div class='del'>-	0x3e08, 0x9186, 0x0002, 0x1148, 0x6010, 0x9005, 0x0130, 0x00b6,</div><div class='del'>-	0x2058, 0xb800, 0x00be, 0xd0bc, 0x1590, 0x00c6, 0x6043, 0xffff,</div><div class='del'>-	0x6000, 0x9086, 0x0004, 0x1110, 0x080c, 0x1ad3, 0x9786, 0x000a,</div><div class='del'>-	0x0148, 0x080c, 0xd132, 0x1130, 0x00ce, 0x080c, 0xbb5c, 0x080c,</div><div class='del'>-	0xb1a7, 0x00e8, 0x6014, 0x2048, 0x080c, 0xcf1b, 0x01a8, 0x9786,</div><div class='del'>-	0x0003, 0x1530, 0xa867, 0x0103, 0xa87c, 0xd0cc, 0x0130, 0x0096,</div><div class='del'>-	0xa878, 0x2048, 0x080c, 0x100b, 0x009e, 0xab7a, 0xa877, 0x0000,</div><div class='del'>-	0x080c, 0x7006, 0x080c, 0xd10c, 0x080c, 0xb1a7, 0x00ce, 0x9ce0,</div><div class='del'>-	0x001c, 0x7068, 0x9c02, 0x1210, 0x0804, 0xc18e, 0x012e, 0x000e,</div><div class='del'>-	0x002e, 0x004e, 0x005e, 0x007e, 0x00ce, 0x009e, 0x00ee, 0x0005,</div><div class='del'>-	0x9786, 0x0006, 0x1118, 0x080c, 0xea30, 0x0c30, 0x9786, 0x0009,</div><div class='del'>-	0x1148, 0x6000, 0x9086, 0x0004, 0x0d08, 0x2009, 0x004c, 0x080c,</div><div class='del'>-	0xb20a, 0x08e0, 0x9786, 0x000a, 0x0980, 0x0820, 0x220c, 0x2304,</div><div class='del'>-	0x9106, 0x1130, 0x8210, 0x8318, 0x1f04, 0xc20e, 0x9006, 0x0005,</div><div class='del'>-	0x2304, 0x9102, 0x0218, 0x2001, 0x0001, 0x0008, 0x9006, 0x918d,</div><div class='del'>-	0x0001, 0x0005, 0x0136, 0x01c6, 0x0016, 0x8906, 0x8006, 0x8007,</div><div class='del'>-	0x908c, 0x003f, 0x21e0, 0x9084, 0xffc0, 0x9300, 0x2098, 0x3518,</div><div class='del'>-	0x20a9, 0x0001, 0x220c, 0x4002, 0x910e, 0x1140, 0x8210, 0x8319,</div><div class='del'>-	0x1dc8, 0x9006, 0x001e, 0x01ce, 0x013e, 0x0005, 0x220c, 0x9102,</div><div class='del'>-	0x0218, 0x2001, 0x0001, 0x0010, 0x2001, 0x0000, 0x918d, 0x0001,</div><div class='del'>-	0x001e, 0x01ce, 0x013e, 0x0005, 0x220c, 0x810f, 0x2304, 0x9106,</div><div class='del'>-	0x1130, 0x8210, 0x8318, 0x1f04, 0xc24c, 0x9006, 0x0005, 0x918d,</div><div class='del'>-	0x0001, 0x0005, 0x6004, 0x908a, 0x0053, 0x1a0c, 0x0d85, 0x080c,</div><div class='del'>-	0xd121, 0x0120, 0x080c, 0xd132, 0x0158, 0x0028, 0x080c, 0x3344,</div><div class='del'>-	0x080c, 0xd132, 0x0128, 0x080c, 0x99ed, 0x080c, 0xb16c, 0x0005,</div><div class='del'>-	0x080c, 0xbb5c, 0x0cc0, 0x9182, 0x0057, 0x1220, 0x9182, 0x0040,</div><div class='del'>-	0x0208, 0x000a, 0x0005, 0xc292, 0xc292, 0xc292, 0xc292, 0xc292,</div><div class='del'>-	0xc292, 0xc292, 0xc292, 0xc292, 0xc292, 0xc292, 0xc294, 0xc294,</div><div class='del'>-	0xc294, 0xc294, 0xc292, 0xc292, 0xc292, 0xc294, 0xc292, 0xc292,</div><div class='del'>-	0xc292, 0xc292, 0x080c, 0x0d85, 0x600b, 0xffff, 0x6003, 0x000f,</div><div class='del'>-	0x6106, 0x0126, 0x2091, 0x8000, 0x080c, 0xd65d, 0x2009, 0x8000,</div><div class='del'>-	0x080c, 0x9617, 0x012e, 0x0005, 0x9186, 0x0013, 0x1128, 0x6004,</div><div class='del'>-	0x9082, 0x0040, 0x0804, 0xc31c, 0x9186, 0x0027, 0x1520, 0x080c,</div><div class='del'>-	0x99ed, 0x080c, 0x3315, 0x080c, 0xd65a, 0x0096, 0x6114, 0x2148,</div><div class='del'>-	0x080c, 0xcf1b, 0x0198, 0x080c, 0xd132, 0x1118, 0x080c, 0xbb5c,</div><div class='del'>-	0x0068, 0xa867, 0x0103, 0xa87b, 0x0029, 0xa877, 0x0000, 0xa97c,</div><div class='del'>-	0xc1c5, 0xa97e, 0x080c, 0x7012, 0x080c, 0xd10c, 0x009e, 0x080c,</div><div class='del'>-	0xb16c, 0x0804, 0x9ab3, 0x9186, 0x0014, 0x1120, 0x6004, 0x9082,</div><div class='del'>-	0x0040, 0x0030, 0x9186, 0x0053, 0x0110, 0x080c, 0x0d85, 0x0005,</div><div class='del'>-	0x0002, 0xc2fa, 0xc2f8, 0xc2f8, 0xc2f8, 0xc2f8, 0xc2f8, 0xc2f8,</div><div class='del'>-	0xc2f8, 0xc2f8, 0xc2f8, 0xc2f8, 0xc313, 0xc313, 0xc313, 0xc313,</div><div class='del'>-	0xc2f8, 0xc313, 0xc2f8, 0xc313, 0xc2f8, 0xc2f8, 0xc2f8, 0xc2f8,</div><div class='del'>-	0x080c, 0x0d85, 0x080c, 0x99ed, 0x0096, 0x6114, 0x2148, 0x080c,</div><div class='del'>-	0xcf1b, 0x0168, 0xa867, 0x0103, 0xa87b, 0x0006, 0xa877, 0x0000,</div><div class='del'>-	0xa880, 0xc0ec, 0xa882, 0x080c, 0x7012, 0x080c, 0xd10c, 0x009e,</div><div class='del'>-	0x080c, 0xb16c, 0x0005, 0x080c, 0x99ed, 0x080c, 0xd132, 0x090c,</div><div class='del'>-	0xbb5c, 0x080c, 0xb16c, 0x0005, 0x0002, 0xc336, 0xc334, 0xc334,</div><div class='del'>-	0xc334, 0xc334, 0xc334, 0xc334, 0xc334, 0xc334, 0xc334, 0xc334,</div><div class='del'>-	0xc338, 0xc338, 0xc338, 0xc338, 0xc334, 0xc33a, 0xc334, 0xc338,</div><div class='del'>-	0xc334, 0xc334, 0xc334, 0xc334, 0x080c, 0x0d85, 0x080c, 0x0d85,</div><div class='del'>-	0x080c, 0x0d85, 0x080c, 0xb16c, 0x0804, 0x9ab3, 0x9182, 0x0057,</div><div class='del'>-	0x1220, 0x9182, 0x0040, 0x0208, 0x000a, 0x0005, 0xc35d, 0xc35d,</div><div class='del'>-	0xc35d, 0xc35d, 0xc35d, 0xc396, 0xc488, 0xc35d, 0xc494, 0xc35d,</div><div class='del'>-	0xc35d, 0xc35d, 0xc35d, 0xc35d, 0xc35d, 0xc35d, 0xc35d, 0xc35d,</div><div class='del'>-	0xc35d, 0xc494, 0xc35f, 0xc35d, 0xc492, 0x080c, 0x0d85, 0x00b6,</div><div class='del'>-	0x0096, 0x6114, 0x2148, 0x6010, 0x2058, 0xb800, 0xd0bc, 0x1508,</div><div class='del'>-	0xa87b, 0x0000, 0xa867, 0x0103, 0xa877, 0x0000, 0xa87c, 0xd0ac,</div><div class='del'>-	0x0128, 0xa834, 0xa938, 0x9115, 0x190c, 0xc519, 0x080c, 0x6e27,</div><div class='del'>-	0x6210, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e, 0xb8d0,</div><div class='del'>-	0x9005, 0x0110, 0x080c, 0x68df, 0x080c, 0xb16c, 0x009e, 0x00be,</div><div class='del'>-	0x0005, 0xa87c, 0xd0ac, 0x09e0, 0xa838, 0xa934, 0x9105, 0x09c0,</div><div class='del'>-	0xa880, 0xd0bc, 0x19a8, 0x080c, 0xd267, 0x0c80, 0x00b6, 0x0096,</div><div class='del'>-	0x6114, 0x2148, 0x601c, 0xd0fc, 0x1110, 0x7644, 0x0008, 0x9036,</div><div class='del'>-	0x96b4, 0x0fff, 0x86ff, 0x1590, 0x6010, 0x2058, 0xb800, 0xd0bc,</div><div class='del'>-	0x1904, 0xc477, 0xa87b, 0x0000, 0xa867, 0x0103, 0xae76, 0xa87c,</div><div class='del'>-	0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115, 0x190c, 0xc519, 0x080c,</div><div class='del'>-	0x6e27, 0x6210, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e,</div><div class='del'>-	0xb8d0, 0x9005, 0x0110, 0x080c, 0x68df, 0x601c, 0xd0fc, 0x1148,</div><div class='del'>-	0x7044, 0xd0e4, 0x1904, 0xc458, 0x080c, 0xb16c, 0x009e, 0x00be,</div><div class='del'>-	0x0005, 0x2009, 0x0211, 0x210c, 0x080c, 0x0d85, 0x968c, 0x0c00,</div><div class='del'>-	0x0150, 0x6010, 0x2058, 0xb800, 0xd0bc, 0x1904, 0xc45c, 0x7348,</div><div class='del'>-	0xab92, 0x734c, 0xab8e, 0x968c, 0x00ff, 0x9186, 0x0002, 0x0508,</div><div class='del'>-	0x9186, 0x0028, 0x1118, 0xa87b, 0x001c, 0x00e8, 0xd6dc, 0x01a0,</div><div class='del'>-	0xa87b, 0x0015, 0xa87c, 0xd0ac, 0x0170, 0xa938, 0xaa34, 0x2100,</div><div class='del'>-	0x9205, 0x0148, 0x7048, 0x9106, 0x1118, 0x704c, 0x9206, 0x0118,</div><div class='del'>-	0xa992, 0xaa8e, 0xc6dc, 0x0038, 0xd6d4, 0x0118, 0xa87b, 0x0007,</div><div class='del'>-	0x0010, 0xa87b, 0x0000, 0xa867, 0x0103, 0xae76, 0x901e, 0xd6c4,</div><div class='del'>-	0x01d8, 0x9686, 0x0100, 0x1130, 0x7064, 0x9005, 0x1118, 0xc6c4,</div><div class='del'>-	0x0804, 0xc3a2, 0x735c, 0xab86, 0x83ff, 0x0170, 0x938a, 0x0009,</div><div class='del'>-	0x0210, 0x2019, 0x0008, 0x0036, 0x2308, 0x2019, 0x0018, 0x2011,</div><div class='del'>-	0x0025, 0x080c, 0xca7b, 0x003e, 0xd6cc, 0x0904, 0xc3b7, 0x7154,</div><div class='del'>-	0xa98a, 0x81ff, 0x0904, 0xc3b7, 0x9192, 0x0021, 0x1278, 0x8304,</div><div class='del'>-	0x9098, 0x0018, 0x2011, 0x0029, 0x080c, 0xca7b, 0x2011, 0x0205,</div><div class='del'>-	0x2013, 0x0000, 0x080c, 0xd5e8, 0x0804, 0xc3b7, 0xa868, 0xd0fc,</div><div class='del'>-	0x0120, 0x2009, 0x0020, 0xa98a, 0x0c50, 0x00a6, 0x2950, 0x080c,</div><div class='del'>-	0xca1a, 0x00ae, 0x080c, 0xd5e8, 0x080c, 0xca6b, 0x0804, 0xc3b9,</div><div class='del'>-	0x080c, 0xd22a, 0x0804, 0xc3ce, 0xa87c, 0xd0ac, 0x0904, 0xc3df,</div><div class='del'>-	0xa880, 0xd0bc, 0x1904, 0xc3df, 0x9684, 0x0400, 0x0130, 0xa838,</div><div class='del'>-	0xab34, 0x9305, 0x0904, 0xc3df, 0x00b8, 0x7348, 0xa838, 0x9306,</div><div class='del'>-	0x1198, 0x734c, 0xa834, 0x931e, 0x0904, 0xc3df, 0x0068, 0xa87c,</div><div class='del'>-	0xd0ac, 0x0904, 0xc3aa, 0xa838, 0xa934, 0x9105, 0x0904, 0xc3aa,</div><div class='del'>-	0xa880, 0xd0bc, 0x1904, 0xc3aa, 0x080c, 0xd267, 0x0804, 0xc3ce,</div><div class='del'>-	0x00f6, 0x2079, 0x026c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08, 0x00fe,</div><div class='del'>-	0x0021, 0x0005, 0x0011, 0x0005, 0x0005, 0x0096, 0x6003, 0x0002,</div><div class='del'>-	0x6007, 0x0043, 0x6014, 0x2048, 0xa87c, 0xd0ac, 0x0128, 0x009e,</div><div class='del'>-	0x0005, 0x2130, 0x2228, 0x0058, 0x2400, 0xa9ac, 0x910a, 0x2300,</div><div class='del'>-	0xaab0, 0x9213, 0x2600, 0x9102, 0x2500, 0x9203, 0x0e90, 0xac46,</div><div class='del'>-	0xab4a, 0xae36, 0xad3a, 0x6044, 0xd0fc, 0x190c, 0xad25, 0x604b,</div><div class='del'>-	0x0000, 0x080c, 0x1c9c, 0x1118, 0x6144, 0x080c, 0x9643, 0x009e,</div><div class='del'>-	0x0005, 0x9182, 0x0057, 0x1220, 0x9182, 0x0040, 0x0208, 0x000a,</div><div class='del'>-	0x0005, 0xc4e0, 0xc4e0, 0xc4e0, 0xc4e0, 0xc4e0, 0xc4e0, 0xc4e0,</div><div class='del'>-	0xc4e0, 0xc4e0, 0xc4e0, 0xc4e2, 0xc4e0, 0xc4e0, 0xc4e0, 0xc4e0,</div><div class='del'>-	0xc4f3, 0xc4e0, 0xc4e0, 0xc4e0, 0xc4e0, 0xc517, 0xc4e0, 0xc4e0,</div><div class='del'>-	0x080c, 0x0d85, 0x6004, 0x9086, 0x0040, 0x1110, 0x080c, 0x99ed,</div><div class='del'>-	0x2019, 0x0001, 0x080c, 0xa596, 0x6003, 0x0002, 0x080c, 0xd662,</div><div class='del'>-	0x080c, 0x9a48, 0x0005, 0x6004, 0x9086, 0x0040, 0x1110, 0x080c,</div><div class='del'>-	0x99ed, 0x2019, 0x0001, 0x080c, 0xa596, 0x080c, 0x9a48, 0x080c,</div><div class='del'>-	0x3315, 0x080c, 0xd65a, 0x0096, 0x6114, 0x2148, 0x080c, 0xcf1b,</div><div class='del'>-	0x0150, 0xa867, 0x0103, 0xa87b, 0x0029, 0xa877, 0x0000, 0x080c,</div><div class='del'>-	0x7012, 0x080c, 0xd10c, 0x009e, 0x080c, 0xb16c, 0x0005, 0x080c,</div><div class='del'>-	0x0d85, 0xa87b, 0x0015, 0xd1fc, 0x0180, 0xa87b, 0x0007, 0x8002,</div><div class='del'>-	0x8000, 0x810a, 0x9189, 0x0000, 0x0006, 0x0016, 0x2009, 0x1a7c,</div><div class='del'>-	0x2104, 0x8000, 0x200a, 0x001e, 0x000e, 0xa992, 0xa88e, 0x0005,</div><div class='del'>-	0x9182, 0x0057, 0x1220, 0x9182, 0x0040, 0x0208, 0x000a, 0x0005,</div><div class='del'>-	0xc54f, 0xc54f, 0xc54f, 0xc54f, 0xc54f, 0xc551, 0xc54f, 0xc54f,</div><div class='del'>-	0xc60e, 0xc54f, 0xc54f, 0xc54f, 0xc54f, 0xc54f, 0xc54f, 0xc54f,</div><div class='del'>-	0xc54f, 0xc54f, 0xc54f, 0xc74e, 0xc54f, 0xc758, 0xc54f, 0x080c,</div><div class='del'>-	0x0d85, 0x601c, 0xd0bc, 0x0178, 0xd084, 0x0168, 0xd0f4, 0x0120,</div><div class='del'>-	0xc084, 0x601e, 0x0804, 0xc33e, 0x6114, 0x0096, 0x2148, 0xa87c,</div><div class='del'>-	0xc0e5, 0xa87e, 0x009e, 0x0076, 0x00a6, 0x00e6, 0x0096, 0x2071,</div><div class='del'>-	0x0260, 0x6114, 0x2150, 0x601c, 0xd0fc, 0x1110, 0x7644, 0x0008,</div><div class='del'>-	0x9036, 0xb676, 0x96b4, 0x0fff, 0xb77c, 0xc7e5, 0xb77e, 0x6210,</div><div class='del'>-	0x00b6, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e, 0x00be,</div><div class='del'>-	0x86ff, 0x0904, 0xc607, 0x9694, 0xff00, 0x9284, 0x0c00, 0x0120,</div><div class='del'>-	0x7048, 0xb092, 0x704c, 0xb08e, 0x9284, 0x0300, 0x0904, 0xc607,</div><div class='del'>-	0x9686, 0x0100, 0x1130, 0x7064, 0x9005, 0x1118, 0xc6c4, 0xb676,</div><div class='del'>-	0x0c38, 0x080c, 0x1059, 0x090c, 0x0d85, 0x2900, 0xb07a, 0xb77c,</div><div class='del'>-	0x97bd, 0x0200, 0xb77e, 0xa867, 0x0103, 0xb068, 0xa86a, 0xb06c,</div><div class='del'>-	0xa86e, 0xb070, 0xa872, 0x7044, 0x9084, 0xf000, 0x9635, 0xae76,</div><div class='del'>-	0x968c, 0x0c00, 0x0120, 0x7348, 0xab92, 0x734c, 0xab8e, 0x968c,</div><div class='del'>-	0x00ff, 0x9186, 0x0002, 0x0180, 0x9186, 0x0028, 0x1118, 0xa87b,</div><div class='del'>-	0x001c, 0x0060, 0xd6dc, 0x0118, 0xa87b, 0x0015, 0x0038, 0xd6d4,</div><div class='del'>-	0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b, 0x0000, 0xaf7e, 0xb080,</div><div class='del'>-	0xa882, 0xb084, 0xa886, 0x901e, 0xd6c4, 0x0190, 0x735c, 0xab86,</div><div class='del'>-	0x83ff, 0x0170, 0x938a, 0x0009, 0x0210, 0x2019, 0x0008, 0x0036,</div><div class='del'>-	0x2308, 0x2019, 0x0018, 0x2011, 0x0025, 0x080c, 0xca7b, 0x003e,</div><div class='del'>-	0xd6cc, 0x01e8, 0x7154, 0xa98a, 0x81ff, 0x01c8, 0x9192, 0x0021,</div><div class='del'>-	0x1260, 0x8304, 0x9098, 0x0018, 0x2011, 0x0029, 0x080c, 0xca7b,</div><div class='del'>-	0x2011, 0x0205, 0x2013, 0x0000, 0x0050, 0xb068, 0xd0fc, 0x0120,</div><div class='del'>-	0x2009, 0x0020, 0xa98a, 0x0c68, 0x2950, 0x080c, 0xca1a, 0x080c,</div><div class='del'>-	0x1a9f, 0x009e, 0x00ee, 0x00ae, 0x007e, 0x0005, 0x2001, 0x1988,</div><div class='del'>-	0x2004, 0x604a, 0x0096, 0x6114, 0x2148, 0xa83c, 0xa940, 0x9105,</div><div class='del'>-	0x1118, 0xa87c, 0xc0dc, 0xa87e, 0x6003, 0x0002, 0x080c, 0xd66b,</div><div class='del'>-	0x0904, 0xc749, 0x604b, 0x0000, 0x6010, 0x00b6, 0x2058, 0xb800,</div><div class='del'>-	0x00be, 0xd0bc, 0x1500, 0xd1cc, 0x0904, 0xc70d, 0xa978, 0xa868,</div><div class='del'>-	0xd0fc, 0x0904, 0xc6ce, 0x0016, 0xa87c, 0x0006, 0xa880, 0x0006,</div><div class='del'>-	0x00a6, 0x2150, 0xb174, 0x9184, 0x00ff, 0x90b6, 0x0002, 0x0904,</div><div class='del'>-	0xc69b, 0x9086, 0x0028, 0x1904, 0xc687, 0xa87b, 0x001c, 0xb07b,</div><div class='del'>-	0x001c, 0x0804, 0xc6a3, 0x6024, 0xd0f4, 0x11d0, 0xa838, 0xaa34,</div><div class='del'>-	0x9205, 0x09c8, 0xa838, 0xaa90, 0x9206, 0x1120, 0xa88c, 0xaa34,</div><div class='del'>-	0x9206, 0x0988, 0x6024, 0xd0d4, 0x1148, 0xa9ac, 0xa834, 0x9102,</div><div class='del'>-	0x603a, 0xa9b0, 0xa838, 0x9103, 0x603e, 0x6024, 0xc0f5, 0x6026,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb83c, 0x8000, 0xb83e, 0x00be, 0x601c,</div><div class='del'>-	0xc0fc, 0x601e, 0x9006, 0xa876, 0xa892, 0xa88e, 0xa87c, 0xc0e4,</div><div class='del'>-	0xa87e, 0xd0cc, 0x0140, 0xc0cc, 0xa87e, 0x0096, 0xa878, 0x2048,</div><div class='del'>-	0x080c, 0x100b, 0x009e, 0x080c, 0xd267, 0x0804, 0xc749, 0xd1dc,</div><div class='del'>-	0x0158, 0xa87b, 0x0015, 0xb07b, 0x0015, 0x080c, 0xd508, 0x0118,</div><div class='del'>-	0xb174, 0xc1dc, 0xb176, 0x0078, 0xd1d4, 0x0128, 0xa87b, 0x0007,</div><div class='del'>-	0xb07b, 0x0007, 0x0040, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938,</div><div class='del'>-	0x9115, 0x190c, 0xc519, 0xa87c, 0xb07e, 0xa890, 0xb092, 0xa88c,</div><div class='del'>-	0xb08e, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0019, 0x20a0, 0x20a9,</div><div class='del'>-	0x0020, 0x8a06, 0x8006, 0x8007, 0x9094, 0x003f, 0x22e0, 0x9084,</div><div class='del'>-	0xffc0, 0x9080, 0x0019, 0x2098, 0x4003, 0x00ae, 0x000e, 0xa882,</div><div class='del'>-	0x000e, 0xc0cc, 0xa87e, 0x080c, 0xd5e8, 0x001e, 0xa874, 0x0006,</div><div class='del'>-	0x2148, 0x080c, 0x100b, 0x001e, 0x0804, 0xc73a, 0x0016, 0x00a6,</div><div class='del'>-	0x2150, 0xb174, 0x9184, 0x00ff, 0x90b6, 0x0002, 0x01e0, 0x9086,</div><div class='del'>-	0x0028, 0x1128, 0xa87b, 0x001c, 0xb07b, 0x001c, 0x00e0, 0xd1dc,</div><div class='del'>-	0x0158, 0xa87b, 0x0015, 0xb07b, 0x0015, 0x080c, 0xd508, 0x0118,</div><div class='del'>-	0xb174, 0xc1dc, 0xb176, 0x0078, 0xd1d4, 0x0128, 0xa87b, 0x0007,</div><div class='del'>-	0xb07b, 0x0007, 0x0040, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938,</div><div class='del'>-	0x9115, 0x190c, 0xc519, 0xa890, 0xb092, 0xa88c, 0xb08e, 0xa87c,</div><div class='del'>-	0xb07e, 0x00ae, 0x080c, 0x100b, 0x009e, 0x080c, 0xd5e8, 0xa974,</div><div class='del'>-	0x0016, 0x080c, 0xca6b, 0x001e, 0x0468, 0xa867, 0x0103, 0xa974,</div><div class='del'>-	0x9184, 0x00ff, 0x90b6, 0x0002, 0x01b0, 0x9086, 0x0028, 0x1118,</div><div class='del'>-	0xa87b, 0x001c, 0x00d0, 0xd1dc, 0x0148, 0xa87b, 0x0015, 0x080c,</div><div class='del'>-	0xd508, 0x0118, 0xa974, 0xc1dc, 0xa976, 0x0078, 0xd1d4, 0x0118,</div><div class='del'>-	0xa87b, 0x0007, 0x0050, 0xa87b, 0x0000, 0xa87c, 0xd0ac, 0x0128,</div><div class='del'>-	0xa834, 0xa938, 0x9115, 0x190c, 0xc519, 0xa974, 0x0016, 0x080c,</div><div class='del'>-	0x6e27, 0x001e, 0x6010, 0x00b6, 0x2058, 0xba3c, 0xb8d0, 0x0016,</div><div class='del'>-	0x9005, 0x190c, 0x68df, 0x001e, 0x00be, 0xd1e4, 0x1120, 0x080c,</div><div class='del'>-	0xb16c, 0x009e, 0x0005, 0x080c, 0xd22a, 0x0cd8, 0x6114, 0x0096,</div><div class='del'>-	0x2148, 0xa97c, 0x080c, 0xd66b, 0x190c, 0x1abf, 0x009e, 0x0005,</div><div class='del'>-	0x0096, 0x6114, 0x2148, 0xa83c, 0xa940, 0x9105, 0x01e8, 0xa877,</div><div class='del'>-	0x0000, 0xa87b, 0x0000, 0xa867, 0x0103, 0x00b6, 0x6010, 0x2058,</div><div class='del'>-	0xa834, 0xa938, 0x9115, 0x11a0, 0x080c, 0x6e27, 0xba3c, 0x8211,</div><div class='del'>-	0x0208, 0xba3e, 0xb8d0, 0x9005, 0x0110, 0x080c, 0x68df, 0x080c,</div><div class='del'>-	0xb16c, 0x00be, 0x009e, 0x0005, 0xa87c, 0xc0dc, 0xa87e, 0x08f8,</div><div class='del'>-	0xb800, 0xd0bc, 0x1120, 0xa834, 0x080c, 0xc519, 0x0c28, 0xa880,</div><div class='del'>-	0xd0bc, 0x1dc8, 0x080c, 0xd267, 0x0c60, 0x080c, 0x99ed, 0x0010,</div><div class='del'>-	0x080c, 0x9a48, 0x601c, 0xd084, 0x0110, 0x080c, 0x1ad3, 0x080c,</div><div class='del'>-	0xcf1b, 0x01f0, 0x0096, 0x6114, 0x2148, 0x080c, 0xd132, 0x1118,</div><div class='del'>-	0x080c, 0xbb5c, 0x00a0, 0xa867, 0x0103, 0x2009, 0x180c, 0x210c,</div><div class='del'>-	0xd18c, 0x1198, 0xd184, 0x1170, 0x6108, 0xa97a, 0x918e, 0x0029,</div><div class='del'>-	0x1110, 0x080c, 0xeddf, 0xa877, 0x0000, 0x080c, 0x7012, 0x009e,</div><div class='del'>-	0x0804, 0xb1a7, 0xa87b, 0x0004, 0x0cb0, 0xa87b, 0x0004, 0x0c98,</div><div class='del'>-	0x9182, 0x0057, 0x1220, 0x9182, 0x0040, 0x0208, 0x000a, 0x0005,</div><div class='del'>-	0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc7e1, 0xc7df, 0xc7df,</div><div class='del'>-	0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc7df,</div><div class='del'>-	0xc7df, 0xc7df, 0xc7df, 0xc7df, 0xc805, 0xc7df, 0xc7df, 0x080c,</div><div class='del'>-	0x0d85, 0x080c, 0x5848, 0x01f8, 0x6014, 0x7144, 0x918c, 0x0fff,</div><div class='del'>-	0x9016, 0xd1c4, 0x0118, 0x7264, 0x9294, 0x00ff, 0x0096, 0x904d,</div><div class='del'>-	0x0188, 0xa87b, 0x0000, 0xa864, 0x9086, 0x0139, 0x0128, 0xa867,</div><div class='del'>-	0x0103, 0xa976, 0xaa96, 0x0030, 0xa897, 0x4000, 0xa99a, 0xaa9e,</div><div class='del'>-	0x080c, 0x7012, 0x009e, 0x0804, 0xb16c, 0x080c, 0x5848, 0x0dd8,</div><div class='del'>-	0x6014, 0x900e, 0x9016, 0x0c10, 0x9182, 0x0085, 0x0002, 0xc81e,</div><div class='del'>-	0xc81c, 0xc81c, 0xc82a, 0xc81c, 0xc81c, 0xc81c, 0xc81c, 0xc81c,</div><div class='del'>-	0xc81c, 0xc81c, 0xc81c, 0xc81c, 0x080c, 0x0d85, 0x6003, 0x0001,</div><div class='del'>-	0x6106, 0x0126, 0x2091, 0x8000, 0x2009, 0x8020, 0x080c, 0x9617,</div><div class='del'>-	0x012e, 0x0005, 0x0026, 0x0056, 0x00d6, 0x00e6, 0x2071, 0x0260,</div><div class='del'>-	0x7224, 0x6216, 0x7220, 0x080c, 0xcf09, 0x01f8, 0x2268, 0x6800,</div><div class='del'>-	0x9086, 0x0000, 0x01d0, 0x6010, 0x6d10, 0x952e, 0x11b0, 0x00c6,</div><div class='del'>-	0x2d60, 0x00d6, 0x080c, 0xcadc, 0x00de, 0x00ce, 0x0158, 0x702c,</div><div class='del'>-	0xd084, 0x1118, 0x080c, 0xcaa6, 0x0010, 0x6803, 0x0002, 0x6007,</div><div class='del'>-	0x0086, 0x0028, 0x080c, 0xcac8, 0x0d90, 0x6007, 0x0087, 0x6003,</div><div class='del'>-	0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x7220, 0x080c, 0xcf09,</div><div class='del'>-	0x0178, 0x6810, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x0140,</div><div class='del'>-	0x6824, 0xd0ec, 0x0128, 0x00c6, 0x2d60, 0x080c, 0xd267, 0x00ce,</div><div class='del'>-	0x00ee, 0x00de, 0x005e, 0x002e, 0x0005, 0x9186, 0x0013, 0x1160,</div><div class='del'>-	0x6004, 0x908a, 0x0085, 0x0a0c, 0x0d85, 0x908a, 0x0092, 0x1a0c,</div><div class='del'>-	0x0d85, 0x9082, 0x0085, 0x00e2, 0x9186, 0x0027, 0x0120, 0x9186,</div><div class='del'>-	0x0014, 0x190c, 0x0d85, 0x080c, 0x99ed, 0x0096, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0xcf1b, 0x0140, 0xa867, 0x0103, 0xa877, 0x0000, 0xa87b,</div><div class='del'>-	0x0029, 0x080c, 0x7012, 0x009e, 0x080c, 0xb1a7, 0x0804, 0x9ab3,</div><div class='del'>-	0xc8ad, 0xc8af, 0xc8af, 0xc8ad, 0xc8ad, 0xc8ad, 0xc8ad, 0xc8ad,</div><div class='del'>-	0xc8ad, 0xc8ad, 0xc8ad, 0xc8ad, 0xc8ad, 0x080c, 0x0d85, 0x080c,</div><div class='del'>-	0xb1a7, 0x0005, 0x9186, 0x0013, 0x1130, 0x6004, 0x9082, 0x0085,</div><div class='del'>-	0x2008, 0x0804, 0xc8fe, 0x9186, 0x0027, 0x1558, 0x080c, 0x99ed,</div><div class='del'>-	0x080c, 0x3315, 0x080c, 0xd65a, 0x0096, 0x6014, 0x2048, 0x080c,</div><div class='del'>-	0xcf1b, 0x0150, 0xa867, 0x0103, 0xa877, 0x0000, 0xa87b, 0x0029,</div><div class='del'>-	0x080c, 0x7012, 0x080c, 0xd10c, 0x009e, 0x080c, 0xb16c, 0x0005,</div><div class='del'>-	0x9186, 0x0089, 0x0118, 0x9186, 0x008a, 0x1140, 0x080c, 0xaf61,</div><div class='del'>-	0x0128, 0x9086, 0x000c, 0x0904, 0xc936, 0x0000, 0x080c, 0xb227,</div><div class='del'>-	0x0c70, 0x9186, 0x0014, 0x1d60, 0x080c, 0x99ed, 0x0096, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xcf1b, 0x0d00, 0xa867, 0x0103, 0xa877, 0x0000,</div><div class='del'>-	0xa87b, 0x0006, 0xa880, 0xc0ec, 0xa882, 0x0890, 0x0002, 0xc90e,</div><div class='del'>-	0xc90c, 0xc90c, 0xc90c, 0xc90c, 0xc90c, 0xc922, 0xc90c, 0xc90c,</div><div class='del'>-	0xc90c, 0xc90c, 0xc90c, 0xc90c, 0x080c, 0x0d85, 0x6034, 0x908c,</div><div class='del'>-	0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186, 0x0035, 0x1118,</div><div class='del'>-	0x2001, 0x1986, 0x0010, 0x2001, 0x1987, 0x2004, 0x601a, 0x6003,</div><div class='del'>-	0x000c, 0x0005, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0039,</div><div class='del'>-	0x0118, 0x9186, 0x0035, 0x1118, 0x2001, 0x1986, 0x0010, 0x2001,</div><div class='del'>-	0x1987, 0x2004, 0x601a, 0x6003, 0x000e, 0x0005, 0x9182, 0x0092,</div><div class='del'>-	0x1220, 0x9182, 0x0085, 0x0208, 0x0012, 0x0804, 0xb227, 0xc94c,</div><div class='del'>-	0xc94c, 0xc94c, 0xc94c, 0xc94e, 0xc99b, 0xc94c, 0xc94c, 0xc94c,</div><div class='del'>-	0xc94c, 0xc94c, 0xc94c, 0xc94c, 0x080c, 0x0d85, 0x0096, 0x6010,</div><div class='del'>-	0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x0168, 0x6034, 0x908c,</div><div class='del'>-	0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186, 0x0035, 0x1118,</div><div class='del'>-	0x009e, 0x0804, 0xc9af, 0x080c, 0xcf1b, 0x1118, 0x080c, 0xd10c,</div><div class='del'>-	0x0068, 0x6014, 0x2048, 0x080c, 0xd671, 0x1110, 0x080c, 0xd10c,</div><div class='del'>-	0xa867, 0x0103, 0x080c, 0xd625, 0x080c, 0x7012, 0x00d6, 0x2c68,</div><div class='del'>-	0x080c, 0xb116, 0x01d0, 0x6003, 0x0001, 0x6007, 0x001e, 0x600b,</div><div class='del'>-	0xffff, 0x2009, 0x026e, 0x210c, 0x613a, 0x2009, 0x026f, 0x210c,</div><div class='del'>-	0x613e, 0x6910, 0x6112, 0x080c, 0xd3b6, 0x695c, 0x615e, 0x6023,</div><div class='del'>-	0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x2d60, 0x00de, 0x080c,</div><div class='del'>-	0xb16c, 0x009e, 0x0005, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be,</div><div class='del'>-	0xd0bc, 0x05a0, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0035,</div><div class='del'>-	0x0130, 0x9186, 0x001e, 0x0118, 0x9186, 0x0039, 0x1538, 0x00d6,</div><div class='del'>-	0x2c68, 0x080c, 0xd5bb, 0x11f0, 0x080c, 0xb116, 0x01d8, 0x6106,</div><div class='del'>-	0x6003, 0x0001, 0x6023, 0x0001, 0x6910, 0x6112, 0x692c, 0x612e,</div><div class='del'>-	0x6930, 0x6132, 0x6934, 0x918c, 0x00ff, 0x6136, 0x6938, 0x613a,</div><div class='del'>-	0x693c, 0x613e, 0x695c, 0x615e, 0x080c, 0xd3b6, 0x2009, 0x8020,</div><div class='del'>-	0x080c, 0x9617, 0x2d60, 0x00de, 0x0804, 0xb16c, 0x0096, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xcf1b, 0x01c8, 0xa867, 0x0103, 0xa880, 0xd0b4,</div><div class='del'>-	0x0128, 0xc0ec, 0xa882, 0xa87b, 0x0006, 0x0048, 0xd0bc, 0x0118,</div><div class='del'>-	0xa87b, 0x0002, 0x0020, 0xa87b, 0x0005, 0x080c, 0xd226, 0xa877,</div><div class='del'>-	0x0000, 0x080c, 0x7012, 0x080c, 0xd10c, 0x009e, 0x0804, 0xb16c,</div><div class='del'>-	0x0016, 0x0096, 0x6014, 0x2048, 0x080c, 0xcf1b, 0x0140, 0xa867,</div><div class='del'>-	0x0103, 0xa87b, 0x0028, 0xa877, 0x0000, 0x080c, 0x7012, 0x009e,</div><div class='del'>-	0x001e, 0x9186, 0x0013, 0x0158, 0x9186, 0x0014, 0x0130, 0x9186,</div><div class='del'>-	0x0027, 0x0118, 0x080c, 0xb227, 0x0020, 0x080c, 0x99ed, 0x080c,</div><div class='del'>-	0xb1a7, 0x0005, 0x0056, 0x0066, 0x0096, 0x00a6, 0x2029, 0x0001,</div><div class='del'>-	0x9182, 0x0101, 0x1208, 0x0010, 0x2009, 0x0100, 0x2130, 0x8304,</div><div class='del'>-	0x9098, 0x0018, 0x2009, 0x0020, 0x2011, 0x0029, 0x080c, 0xca7b,</div><div class='del'>-	0x96b2, 0x0020, 0xb004, 0x904d, 0x0110, 0x080c, 0x100b, 0x080c,</div><div class='del'>-	0x1059, 0x0520, 0x8528, 0xa867, 0x0110, 0xa86b, 0x0000, 0x2920,</div><div class='del'>-	0xb406, 0x968a, 0x003d, 0x1228, 0x2608, 0x2011, 0x001b, 0x0499,</div><div class='del'>-	0x00a8, 0x96b2, 0x003c, 0x2009, 0x003c, 0x2950, 0x2011, 0x001b,</div><div class='del'>-	0x0451, 0x0c28, 0x2001, 0x0205, 0x2003, 0x0000, 0x00ae, 0x852f,</div><div class='del'>-	0x95ad, 0x0003, 0xb566, 0x95ac, 0x0000, 0x0048, 0x2001, 0x0205,</div><div class='del'>-	0x2003, 0x0000, 0x00ae, 0x852f, 0x95ad, 0x0003, 0xb566, 0x009e,</div><div class='del'>-	0x006e, 0x005e, 0x0005, 0x00a6, 0x89ff, 0x0158, 0xa804, 0x9055,</div><div class='del'>-	0x0130, 0xa807, 0x0000, 0x080c, 0x7012, 0x2a48, 0x0cb8, 0x080c,</div><div class='del'>-	0x7012, 0x00ae, 0x0005, 0x00f6, 0x2079, 0x0200, 0x7814, 0x9085,</div><div class='del'>-	0x0080, 0x7816, 0xd184, 0x0108, 0x8108, 0x810c, 0x20a9, 0x0001,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9200, 0x20a0, 0x20e1, 0x0000, 0x2300,</div><div class='del'>-	0x9e00, 0x2098, 0x4003, 0x8318, 0x9386, 0x0020, 0x1148, 0x2018,</div><div class='del'>-	0x2300, 0x9e00, 0x2098, 0x7814, 0x8000, 0x9085, 0x0080, 0x7816,</div><div class='del'>-	0x8109, 0x1d80, 0x7817, 0x0000, 0x00fe, 0x0005, 0x6920, 0x9186,</div><div class='del'>-	0x0003, 0x0118, 0x9186, 0x0002, 0x11d0, 0x00c6, 0x00d6, 0x00e6,</div><div class='del'>-	0x2d60, 0x0096, 0x6014, 0x2048, 0x080c, 0xcf1b, 0x0150, 0x2001,</div><div class='del'>-	0x0006, 0xa980, 0xc1d5, 0x080c, 0x725e, 0x080c, 0x7006, 0x080c,</div><div class='del'>-	0xd10c, 0x009e, 0x080c, 0xb1a7, 0x00ee, 0x00de, 0x00ce, 0x0005,</div><div class='del'>-	0x00c6, 0x702c, 0xd084, 0x1170, 0x6008, 0x2060, 0x6020, 0x9086,</div><div class='del'>-	0x0002, 0x1140, 0x6104, 0x9186, 0x0085, 0x0118, 0x9186, 0x008b,</div><div class='del'>-	0x1108, 0x9006, 0x00ce, 0x0005, 0x0066, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x2031, 0x0001, 0x6020, 0x9084, 0x000f, 0x0083, 0x012e, 0x006e,</div><div class='del'>-	0x0005, 0x0126, 0x2091, 0x8000, 0x0066, 0x2031, 0x0000, 0x6020,</div><div class='del'>-	0x9084, 0x000f, 0x001b, 0x006e, 0x012e, 0x0005, 0xcb2a, 0xcb2a,</div><div class='del'>-	0xcb25, 0xcb4e, 0xcb06, 0xcb25, 0xcb08, 0xcb25, 0xcb25, 0x9458,</div><div class='del'>-	0xcb25, 0xcb25, 0xcb25, 0xcb06, 0xcb06, 0xcb06, 0x080c, 0x0d85,</div><div class='del'>-	0x6010, 0x9080, 0x0000, 0x2004, 0xd0bc, 0x190c, 0xcb4e, 0x0036,</div><div class='del'>-	0x6014, 0x0096, 0x2048, 0xa880, 0x009e, 0xd0cc, 0x0118, 0x2019,</div><div class='del'>-	0x000c, 0x0038, 0xd094, 0x0118, 0x2019, 0x000d, 0x0010, 0x2019,</div><div class='del'>-	0x0010, 0x080c, 0xe578, 0x003e, 0x0005, 0x9006, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x0096, 0x86ff, 0x11e8, 0x6014, 0x2048, 0x080c,</div><div class='del'>-	0xcf1b, 0x01d0, 0x6043, 0xffff, 0xa864, 0x9086, 0x0139, 0x1128,</div><div class='del'>-	0xa87b, 0x0005, 0xa883, 0x0000, 0x0028, 0x900e, 0x2001, 0x0005,</div><div class='del'>-	0x080c, 0x725e, 0x080c, 0xd226, 0x080c, 0x7006, 0x080c, 0xb1a7,</div><div class='del'>-	0x9085, 0x0001, 0x009e, 0x0005, 0x9006, 0x0ce0, 0x080c, 0xacfc,</div><div class='del'>-	0x080c, 0xd67f, 0x908a, 0x0010, 0x1a0c, 0x0d85, 0x002b, 0x0106,</div><div class='del'>-	0x080c, 0xad18, 0x010e, 0x0005, 0xcb6c, 0xcb9c, 0xcb6e, 0xcbc3,</div><div class='del'>-	0xcb97, 0xcb6c, 0xcb25, 0xcb2a, 0xcb2a, 0xcb25, 0xcb25, 0xcb25,</div><div class='del'>-	0xcb25, 0xcb25, 0xcb25, 0xcb25, 0x080c, 0x0d85, 0x86ff, 0x1520,</div><div class='del'>-	0x6020, 0x9086, 0x0006, 0x0500, 0x0096, 0x6014, 0x2048, 0x080c,</div><div class='del'>-	0xcf1b, 0x0168, 0xa87c, 0xd0cc, 0x0140, 0x0096, 0xc0cc, 0xa87e,</div><div class='del'>-	0xa878, 0x2048, 0x080c, 0x100b, 0x009e, 0x080c, 0xd226, 0x009e,</div><div class='del'>-	0x080c, 0xd5ff, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002,</div><div class='del'>-	0x2009, 0x8020, 0x080c, 0x95f9, 0x9085, 0x0001, 0x0005, 0x0066,</div><div class='del'>-	0x080c, 0x1ad3, 0x006e, 0x0890, 0x00e6, 0x2071, 0x19e8, 0x7030,</div><div class='del'>-	0x9c06, 0x1120, 0x080c, 0xa516, 0x00ee, 0x0840, 0x6020, 0x9084,</div><div class='del'>-	0x000f, 0x9086, 0x0006, 0x1150, 0x0086, 0x0096, 0x2049, 0x0001,</div><div class='del'>-	0x2c40, 0x080c, 0xa667, 0x009e, 0x008e, 0x0040, 0x0066, 0x080c,</div><div class='del'>-	0xa412, 0x190c, 0x0d85, 0x080c, 0xa420, 0x006e, 0x00ee, 0x1904,</div><div class='del'>-	0xcb6e, 0x0804, 0xcb25, 0x0036, 0x00e6, 0x2071, 0x19e8, 0x704c,</div><div class='del'>-	0x9c06, 0x1138, 0x901e, 0x080c, 0xa596, 0x00ee, 0x003e, 0x0804,</div><div class='del'>-	0xcb6e, 0x080c, 0xa7a1, 0x00ee, 0x003e, 0x1904, 0xcb6e, 0x0804,</div><div class='del'>-	0xcb25, 0x00c6, 0x0066, 0x6020, 0x9084, 0x000f, 0x001b, 0x006e,</div><div class='del'>-	0x00ce, 0x0005, 0xcbf9, 0xcce2, 0xce50, 0xcc01, 0xb1a7, 0xcbf9,</div><div class='del'>-	0xe56e, 0xd667, 0xcce2, 0x941f, 0xcedc, 0xcbf2, 0xcbf2, 0xcbf2,</div><div class='del'>-	0xcbf2, 0xcbf2, 0x080c, 0x0d85, 0x080c, 0xd132, 0x1110, 0x080c,</div><div class='del'>-	0xbb5c, 0x0005, 0x080c, 0x99ed, 0x0804, 0xb16c, 0x601b, 0x0001,</div><div class='del'>-	0x0005, 0x080c, 0xcf1b, 0x0130, 0x6014, 0x0096, 0x2048, 0x2c00,</div><div class='del'>-	0xa896, 0x009e, 0x080c, 0xacfc, 0x080c, 0xd67f, 0x908a, 0x0010,</div><div class='del'>-	0x1a0c, 0x0d85, 0x0013, 0x0804, 0xad18, 0xcc25, 0xcc27, 0xcc51,</div><div class='del'>-	0xcc65, 0xcc92, 0xcc25, 0xcbf9, 0xcbf9, 0xcbf9, 0xcc6c, 0xcc6c,</div><div class='del'>-	0xcc25, 0xcc25, 0xcc25, 0xcc25, 0xcc76, 0x080c, 0x0d85, 0x00e6,</div><div class='del'>-	0x6014, 0x0096, 0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e, 0x2071,</div><div class='del'>-	0x19e8, 0x7030, 0x9c06, 0x01d0, 0x0066, 0x080c, 0xa412, 0x190c,</div><div class='del'>-	0x0d85, 0x080c, 0xa420, 0x006e, 0x080c, 0xd5ff, 0x6007, 0x0085,</div><div class='del'>-	0x6003, 0x000b, 0x6023, 0x0002, 0x2001, 0x1987, 0x2004, 0x601a,</div><div class='del'>-	0x2009, 0x8020, 0x080c, 0x95f9, 0x00ee, 0x0005, 0x601b, 0x0001,</div><div class='del'>-	0x0cd8, 0x0096, 0x6014, 0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e,</div><div class='del'>-	0x080c, 0xd5ff, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002,</div><div class='del'>-	0x2009, 0x8020, 0x080c, 0x95f9, 0x0005, 0x080c, 0xacfc, 0x080c,</div><div class='del'>-	0xaee3, 0x080c, 0xad18, 0x0c28, 0x0096, 0x601b, 0x0001, 0x6014,</div><div class='del'>-	0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e, 0x0005, 0x080c, 0x5848,</div><div class='del'>-	0x01b8, 0x6014, 0x0096, 0x904d, 0x0190, 0xa864, 0xa867, 0x0103,</div><div class='del'>-	0xa87b, 0x0006, 0x9086, 0x0139, 0x1150, 0xa867, 0x0139, 0xa87b,</div><div class='del'>-	0x0030, 0xa897, 0x4005, 0xa89b, 0x0004, 0x080c, 0x7012, 0x009e,</div><div class='del'>-	0x0804, 0xb16c, 0x6014, 0x0096, 0x904d, 0x0904, 0xccdd, 0xa97c,</div><div class='del'>-	0xd1e4, 0x1160, 0x611c, 0xd1fc, 0x0904, 0xccdd, 0x6110, 0x00b6,</div><div class='del'>-	0x2158, 0xb93c, 0x8109, 0x0208, 0xb93e, 0x00be, 0x080c, 0xad18,</div><div class='del'>-	0x2001, 0x180f, 0x2004, 0xd0c4, 0x0110, 0x009e, 0x0005, 0xa884,</div><div class='del'>-	0x009e, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a, 0x2001, 0x0030,</div><div class='del'>-	0x2c08, 0x080c, 0x16b9, 0x2001, 0x030c, 0x2004, 0x9086, 0x0041,</div><div class='del'>-	0x1198, 0x6014, 0x0096, 0x904d, 0x090c, 0x0d85, 0xa880, 0xd0f4,</div><div class='del'>-	0x1130, 0xc0f5, 0xa882, 0x009e, 0x601b, 0x0002, 0x0068, 0x009e,</div><div class='del'>-	0x00c6, 0x080c, 0x2185, 0x00ce, 0x6000, 0x9086, 0x0004, 0x1120,</div><div class='del'>-	0x2009, 0x0048, 0x080c, 0xb20a, 0x0005, 0x009e, 0x080c, 0x1ad3,</div><div class='del'>-	0x0804, 0xcc51, 0x6000, 0x908a, 0x0010, 0x1a0c, 0x0d85, 0x000b,</div><div class='del'>-	0x0005, 0xccf9, 0xcbfe, 0xccfb, 0xccf9, 0xccfb, 0xccfb, 0xcbfa,</div><div class='del'>-	0xccf9, 0xcbf4, 0xcbf4, 0xccf9, 0xccf9, 0xccf9, 0xccf9, 0xccf9,</div><div class='del'>-	0xccf9, 0x080c, 0x0d85, 0x6010, 0x00b6, 0x2058, 0xb804, 0x9084,</div><div class='del'>-	0x00ff, 0x00be, 0x908a, 0x000c, 0x1a0c, 0x0d85, 0x00b6, 0x0013,</div><div class='del'>-	0x00be, 0x0005, 0xcd16, 0xcde7, 0xcd18, 0xcd58, 0xcd18, 0xcd58,</div><div class='del'>-	0xcd18, 0xcd26, 0xcd16, 0xcd58, 0xcd16, 0xcd47, 0x080c, 0x0d85,</div><div class='del'>-	0x6004, 0x908e, 0x0016, 0x05c0, 0x908e, 0x0004, 0x05a8, 0x908e,</div><div class='del'>-	0x0002, 0x0590, 0x908e, 0x0052, 0x0904, 0xcde3, 0x6004, 0x080c,</div><div class='del'>-	0xd132, 0x0904, 0xce00, 0x908e, 0x0004, 0x1110, 0x080c, 0x3344,</div><div class='del'>-	0x908e, 0x0021, 0x0904, 0xce04, 0x908e, 0x0022, 0x0904, 0xce4b,</div><div class='del'>-	0x908e, 0x003d, 0x0904, 0xce04, 0x908e, 0x0039, 0x0904, 0xce08,</div><div class='del'>-	0x908e, 0x0035, 0x0904, 0xce08, 0x908e, 0x001e, 0x0178, 0x908e,</div><div class='del'>-	0x0001, 0x1140, 0x6010, 0x2058, 0xb804, 0x9084, 0x00ff, 0x9086,</div><div class='del'>-	0x0006, 0x0110, 0x080c, 0x3315, 0x080c, 0xbb5c, 0x0804, 0xb1a7,</div><div class='del'>-	0x00c6, 0x00d6, 0x6104, 0x9186, 0x0016, 0x0904, 0xcdd4, 0x9186,</div><div class='del'>-	0x0002, 0x1904, 0xcda9, 0x2001, 0x1837, 0x2004, 0xd08c, 0x11c8,</div><div class='del'>-	0x080c, 0x779e, 0x11b0, 0x080c, 0xd645, 0x0138, 0x080c, 0x77c1,</div><div class='del'>-	0x1120, 0x080c, 0x76a7, 0x0804, 0xce34, 0x2001, 0x197d, 0x2003,</div><div class='del'>-	0x0001, 0x2001, 0x1800, 0x2003, 0x0001, 0x080c, 0x76cd, 0x0804,</div><div class='del'>-	0xce34, 0x6010, 0x2058, 0xb8a0, 0x9086, 0x0080, 0x0130, 0x2001,</div><div class='del'>-	0x1837, 0x2004, 0xd0ac, 0x1904, 0xce34, 0xb8a0, 0x9082, 0x0081,</div><div class='del'>-	0x1a04, 0xce34, 0xb840, 0x9084, 0x00ff, 0x9005, 0x0190, 0x8001,</div><div class='del'>-	0xb842, 0x6017, 0x0000, 0x6023, 0x0007, 0x601b, 0x0398, 0x604b,</div><div class='del'>-	0x0000, 0x080c, 0xb116, 0x0128, 0x2b00, 0x6012, 0x6023, 0x0001,</div><div class='del'>-	0x0458, 0x00de, 0x00ce, 0x6004, 0x908e, 0x0002, 0x11a0, 0x6010,</div><div class='del'>-	0x2058, 0xb8a0, 0x9086, 0x007e, 0x1170, 0x2009, 0x1837, 0x2104,</div><div class='del'>-	0xc085, 0x200a, 0x00e6, 0x2071, 0x1800, 0x080c, 0x6130, 0x00ee,</div><div class='del'>-	0x080c, 0xbb5c, 0x0030, 0x080c, 0xbb5c, 0x080c, 0x3315, 0x080c,</div><div class='del'>-	0xd65a, 0x00e6, 0x0126, 0x2091, 0x8000, 0x080c, 0x3344, 0x012e,</div><div class='del'>-	0x00ee, 0x080c, 0xb1a7, 0x0005, 0x2001, 0x0002, 0x080c, 0x66fa,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x961e, 0x080c, 0x9ab3,</div><div class='del'>-	0x00de, 0x00ce, 0x0c80, 0x080c, 0x3344, 0x0804, 0xcd54, 0x00c6,</div><div class='del'>-	0x00d6, 0x6104, 0x9186, 0x0016, 0x0d38, 0x6010, 0x2058, 0xb840,</div><div class='del'>-	0x9084, 0x00ff, 0x9005, 0x0904, 0xcda9, 0x8001, 0xb842, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x00de, 0x00ce, 0x0898,</div><div class='del'>-	0x080c, 0xbb5c, 0x0804, 0xcd56, 0x080c, 0xbb98, 0x0804, 0xcd56,</div><div class='del'>-	0x00d6, 0x2c68, 0x6104, 0x080c, 0xd5bb, 0x00de, 0x0118, 0x080c,</div><div class='del'>-	0xb16c, 0x0408, 0x6004, 0x8007, 0x6134, 0x918c, 0x00ff, 0x9105,</div><div class='del'>-	0x6036, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002, 0x603c,</div><div class='del'>-	0x600a, 0x2001, 0x1987, 0x2004, 0x601a, 0x602c, 0x2c08, 0x2060,</div><div class='del'>-	0x6024, 0xd0b4, 0x0108, 0xc085, 0xc0b5, 0x6026, 0x2160, 0x2009,</div><div class='del'>-	0x8020, 0x080c, 0x9617, 0x0005, 0x00de, 0x00ce, 0x080c, 0xbb5c,</div><div class='del'>-	0x080c, 0x3315, 0x00e6, 0x0126, 0x2091, 0x8000, 0x080c, 0x3344,</div><div class='del'>-	0x6017, 0x0000, 0x6023, 0x0007, 0x601b, 0x0398, 0x604b, 0x0000,</div><div class='del'>-	0x012e, 0x00ee, 0x0005, 0x080c, 0xb5a8, 0x1904, 0xce00, 0x0005,</div><div class='del'>-	0x6000, 0x908a, 0x0010, 0x1a0c, 0x0d85, 0x0096, 0x00d6, 0x001b,</div><div class='del'>-	0x00de, 0x009e, 0x0005, 0xce6b, 0xce6b, 0xce6b, 0xce6b, 0xce6b,</div><div class='del'>-	0xce6b, 0xce6b, 0xce6b, 0xce6b, 0xcbf9, 0xce6b, 0xcbfe, 0xce6d,</div><div class='del'>-	0xcbfe, 0xce87, 0xce6b, 0x080c, 0x0d85, 0x6004, 0x9086, 0x008b,</div><div class='del'>-	0x01b0, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0035, 0x1130,</div><div class='del'>-	0x602c, 0x9080, 0x0009, 0x200c, 0xc185, 0x2102, 0x6007, 0x008b,</div><div class='del'>-	0x6003, 0x000d, 0x2009, 0x8020, 0x080c, 0x9617, 0x0005, 0x080c,</div><div class='del'>-	0xd639, 0x0118, 0x080c, 0xd64c, 0x0010, 0x080c, 0xd65a, 0x080c,</div><div class='del'>-	0xd10c, 0x080c, 0xcf1b, 0x0570, 0x080c, 0x3315, 0x080c, 0xcf1b,</div><div class='del'>-	0x0168, 0x6014, 0x2048, 0xa867, 0x0103, 0xa87b, 0x0006, 0xa877,</div><div class='del'>-	0x0000, 0xa880, 0xc0ed, 0xa882, 0x080c, 0x7012, 0x2c68, 0x080c,</div><div class='del'>-	0xb116, 0x0150, 0x6810, 0x6012, 0x080c, 0xd3b6, 0x00c6, 0x2d60,</div><div class='del'>-	0x080c, 0xb1a7, 0x00ce, 0x0008, 0x2d60, 0x6017, 0x0000, 0x6023,</div><div class='del'>-	0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x961e, 0x080c,</div><div class='del'>-	0x9ab3, 0x00c8, 0x080c, 0xd639, 0x0138, 0x6034, 0x9086, 0x4000,</div><div class='del'>-	0x1118, 0x080c, 0x3315, 0x08d0, 0x6034, 0x908c, 0xff00, 0x810f,</div><div class='del'>-	0x9186, 0x0039, 0x0118, 0x9186, 0x0035, 0x1118, 0x080c, 0x3315,</div><div class='del'>-	0x0868, 0x080c, 0xb1a7, 0x0005, 0x6000, 0x908a, 0x0010, 0x1a0c,</div><div class='del'>-	0x0d85, 0x0002, 0xcef2, 0xcef2, 0xcefa, 0xcef4, 0xcf04, 0xcef2,</div><div class='del'>-	0xcef2, 0xb1a7, 0xcef2, 0xcef2, 0xcef2, 0xcef2, 0xcef2, 0xcef2,</div><div class='del'>-	0xcef2, 0xcef2, 0x080c, 0x0d85, 0x080c, 0xacfc, 0x080c, 0xaee3,</div><div class='del'>-	0x080c, 0xad18, 0x6114, 0x0096, 0x2148, 0xa87b, 0x0006, 0x080c,</div><div class='del'>-	0x7012, 0x009e, 0x0804, 0xb16c, 0x601c, 0xd084, 0x190c, 0x1ad3,</div><div class='del'>-	0x0c88, 0x9284, 0x0003, 0x1158, 0x9282, 0x1ddc, 0x0240, 0x2001,</div><div class='del'>-	0x181a, 0x2004, 0x9202, 0x1218, 0x9085, 0x0001, 0x0005, 0x9006,</div><div class='del'>-	0x0ce8, 0x0096, 0x0028, 0x0096, 0x0006, 0x6014, 0x2048, 0x000e,</div><div class='del'>-	0x0006, 0x9984, 0xf000, 0x9086, 0xf000, 0x0110, 0x080c, 0x1104,</div><div class='del'>-	0x000e, 0x009e, 0x0005, 0x00e6, 0x00c6, 0x0036, 0x0006, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2061, 0x1ddc, 0x2071, 0x1800, 0x7354, 0x7074,</div><div class='del'>-	0x9302, 0x1640, 0x6020, 0x9206, 0x11f8, 0x080c, 0xd645, 0x0180,</div><div class='del'>-	0x9286, 0x0001, 0x1168, 0x6004, 0x9086, 0x0004, 0x1148, 0x080c,</div><div class='del'>-	0x3315, 0x080c, 0xd65a, 0x00c6, 0x080c, 0xb1a7, 0x00ce, 0x0060,</div><div class='del'>-	0x080c, 0xd328, 0x0148, 0x080c, 0xd132, 0x1110, 0x080c, 0xbb5c,</div><div class='del'>-	0x00c6, 0x080c, 0xb16c, 0x00ce, 0x9ce0, 0x001c, 0x7068, 0x9c02,</div><div class='del'>-	0x1208, 0x08a0, 0x012e, 0x000e, 0x003e, 0x00ce, 0x00ee, 0x0005,</div><div class='del'>-	0x00e6, 0x00c6, 0x0016, 0x9188, 0x1000, 0x210c, 0x81ff, 0x0128,</div><div class='del'>-	0x2061, 0x1b39, 0x6112, 0x080c, 0x3315, 0x9006, 0x0010, 0x9085,</div><div class='del'>-	0x0001, 0x001e, 0x00ce, 0x00ee, 0x0005, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xb116, 0x01b0, 0x665e, 0x2b00, 0x6012, 0x080c,</div><div class='del'>-	0x5848, 0x0118, 0x080c, 0xd04e, 0x0168, 0x080c, 0xd3b6, 0x6023,</div><div class='del'>-	0x0003, 0x2009, 0x004b, 0x080c, 0xb20a, 0x9085, 0x0001, 0x012e,</div><div class='del'>-	0x00ce, 0x0005, 0x9006, 0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0xbaa0, 0x080c, 0xb1dd, 0x0580, 0x605f, 0x0000, 0x2b00, 0x6012,</div><div class='del'>-	0x080c, 0xd3b6, 0x6023, 0x0003, 0x0016, 0x080c, 0xacfc, 0x080c,</div><div class='del'>-	0x97b0, 0x0076, 0x903e, 0x080c, 0x966d, 0x2c08, 0x080c, 0xe75d,</div><div class='del'>-	0x007e, 0x080c, 0xad18, 0x001e, 0xd184, 0x0128, 0x080c, 0xb16c,</div><div class='del'>-	0x9085, 0x0001, 0x0070, 0x080c, 0x5848, 0x0128, 0xd18c, 0x1170,</div><div class='del'>-	0x080c, 0xd04e, 0x0148, 0x2009, 0x004c, 0x080c, 0xb20a, 0x9085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x2900, 0x6016,</div><div class='del'>-	0x0c90, 0x2009, 0x004d, 0x0010, 0x2009, 0x004e, 0x00f6, 0x00c6,</div><div class='del'>-	0x0046, 0x0016, 0x080c, 0xb116, 0x2c78, 0x05a0, 0x7e5e, 0x2b00,</div><div class='del'>-	0x7812, 0x7823, 0x0003, 0x0016, 0x2021, 0x0005, 0x080c, 0xd060,</div><div class='del'>-	0x001e, 0x9186, 0x004d, 0x0118, 0x9186, 0x004e, 0x0148, 0x2001,</div><div class='del'>-	0x1980, 0x200c, 0xd1fc, 0x0168, 0x2f60, 0x080c, 0xb16c, 0x00d0,</div><div class='del'>-	0x2001, 0x197f, 0x200c, 0xd1fc, 0x0120, 0x2f60, 0x080c, 0xb16c,</div><div class='del'>-	0x0088, 0x2f60, 0x080c, 0x5848, 0x0138, 0xd18c, 0x1118, 0x04f1,</div><div class='del'>-	0x0148, 0x0010, 0x2900, 0x7816, 0x001e, 0x0016, 0x080c, 0xb20a,</div><div class='del'>-	0x9085, 0x0001, 0x001e, 0x004e, 0x00ce, 0x00fe, 0x0005, 0x00f6,</div><div class='del'>-	0x00c6, 0x0046, 0x080c, 0xb116, 0x2c78, 0x0508, 0x7e5e, 0x2b00,</div><div class='del'>-	0x7812, 0x7823, 0x0003, 0x0096, 0x2021, 0x0004, 0x0489, 0x009e,</div><div class='del'>-	0x2001, 0x197e, 0x200c, 0xd1fc, 0x0120, 0x2f60, 0x080c, 0xb16c,</div><div class='del'>-	0x0060, 0x2f60, 0x080c, 0x5848, 0x0120, 0xd18c, 0x1160, 0x0071,</div><div class='del'>-	0x0130, 0x2009, 0x0052, 0x080c, 0xb20a, 0x9085, 0x0001, 0x004e,</div><div class='del'>-	0x00ce, 0x00fe, 0x0005, 0x2900, 0x7816, 0x0c98, 0x00c6, 0x080c,</div><div class='del'>-	0x4c41, 0x00ce, 0x1120, 0x080c, 0xb16c, 0x9006, 0x0005, 0xa867,</div><div class='del'>-	0x0000, 0xa86b, 0x8000, 0x2900, 0x6016, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x0096, 0x0076, 0x0126, 0x2091, 0x8000, 0x080c, 0xacfc, 0x080c,</div><div class='del'>-	0x699d, 0x0158, 0x2001, 0xd067, 0x0006, 0x900e, 0x2400, 0x080c,</div><div class='del'>-	0x725e, 0x080c, 0x7012, 0x000e, 0x0807, 0x2418, 0x080c, 0x99b3,</div><div class='del'>-	0xbaa0, 0x0086, 0x2041, 0x0001, 0x2039, 0x0001, 0x2608, 0x080c,</div><div class='del'>-	0x97ca, 0x008e, 0x080c, 0x966d, 0x2f08, 0x2648, 0x080c, 0xe75d,</div><div class='del'>-	0xb93c, 0x81ff, 0x090c, 0x98a3, 0x080c, 0xad18, 0x012e, 0x007e,</div><div class='del'>-	0x009e, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0xb116,</div><div class='del'>-	0x0190, 0x660a, 0x2b08, 0x6112, 0x080c, 0xd3b6, 0x6023, 0x0001,</div><div class='del'>-	0x2900, 0x6016, 0x2009, 0x001f, 0x080c, 0xb20a, 0x9085, 0x0001,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x00c6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0xb1dd, 0x01b8, 0x660a, 0x2b08, 0x6112, 0x080c,</div><div class='del'>-	0xd3b6, 0x6023, 0x0008, 0x2900, 0x6016, 0x00f6, 0x2c78, 0x080c,</div><div class='del'>-	0x17ad, 0x00fe, 0x2009, 0x0021, 0x080c, 0xb20a, 0x9085, 0x0001,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x2009, 0x003d, 0x00c6,</div><div class='del'>-	0x0126, 0x0016, 0x2091, 0x8000, 0x080c, 0xb116, 0x0198, 0x660a,</div><div class='del'>-	0x2b08, 0x6112, 0x080c, 0xd3b6, 0x6023, 0x0001, 0x2900, 0x6016,</div><div class='del'>-	0x001e, 0x0016, 0x080c, 0xb20a, 0x9085, 0x0001, 0x001e, 0x012e,</div><div class='del'>-	0x00ce, 0x0005, 0x9006, 0x0cd0, 0x00c6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0xb1dd, 0x0188, 0x2b08, 0x6112, 0x080c, 0xd3b6, 0x6023,</div><div class='del'>-	0x0001, 0x2900, 0x6016, 0x2009, 0x0000, 0x080c, 0xb20a, 0x9085,</div><div class='del'>-	0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x2009, 0x0044,</div><div class='del'>-	0x0830, 0x2009, 0x0049, 0x0818, 0x0026, 0x00b6, 0x6210, 0x2258,</div><div class='del'>-	0xba3c, 0x82ff, 0x0118, 0x8211, 0xba3e, 0x1140, 0xb8d0, 0x9005,</div><div class='del'>-	0x0128, 0xb888, 0x9005, 0x1110, 0xb88b, 0x0001, 0x00be, 0x002e,</div><div class='del'>-	0x0005, 0x0006, 0x0016, 0x6004, 0x908e, 0x0002, 0x0140, 0x908e,</div><div class='del'>-	0x0003, 0x0128, 0x908e, 0x0004, 0x0110, 0x9085, 0x0001, 0x001e,</div><div class='del'>-	0x000e, 0x0005, 0x0006, 0x0086, 0x0096, 0x6020, 0x9086, 0x0004,</div><div class='del'>-	0x01a8, 0x6014, 0x904d, 0x080c, 0xcf1b, 0x0180, 0xa864, 0x9086,</div><div class='del'>-	0x0139, 0x0170, 0x6020, 0x90c6, 0x0003, 0x0140, 0x90c6, 0x0002,</div><div class='del'>-	0x0128, 0xa868, 0xd0fc, 0x0110, 0x9006, 0x0010, 0x9085, 0x0001,</div><div class='del'>-	0x009e, 0x008e, 0x000e, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0xb1dd, 0x0198, 0x2b08, 0x6112, 0x080c, 0xd3b6, 0x6023,</div><div class='del'>-	0x0001, 0x2900, 0x6016, 0x080c, 0x3315, 0x2009, 0x0028, 0x080c,</div><div class='del'>-	0xb20a, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8,</div><div class='del'>-	0x9186, 0x0015, 0x11a8, 0x2011, 0x1824, 0x2204, 0x9086, 0x0074,</div><div class='del'>-	0x1178, 0x00b6, 0x080c, 0xbe09, 0x00be, 0x080c, 0xc085, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0029, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0078,</div><div class='del'>-	0x6014, 0x0096, 0x2048, 0xa868, 0x009e, 0xd0fc, 0x0148, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0xd57c, 0x080c, 0xbb5c, 0x080c, 0xb16c, 0x0005,</div><div class='del'>-	0x0096, 0x6014, 0x904d, 0x090c, 0x0d85, 0xa87b, 0x0030, 0xa883,</div><div class='del'>-	0x0000, 0xa897, 0x4005, 0xa89b, 0x0004, 0xa867, 0x0139, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0x009e, 0x080c, 0xb16c,</div><div class='del'>-	0x0c30, 0x0096, 0x9186, 0x0016, 0x1128, 0x2001, 0x0004, 0x080c,</div><div class='del'>-	0x66fa, 0x00e8, 0x9186, 0x0015, 0x1510, 0x2011, 0x1824, 0x2204,</div><div class='del'>-	0x9086, 0x0014, 0x11e0, 0x6010, 0x00b6, 0x2058, 0x080c, 0x684f,</div><div class='del'>-	0x00be, 0x080c, 0xc15b, 0x1198, 0x6010, 0x00b6, 0x2058, 0xb890,</div><div class='del'>-	0x00be, 0x9005, 0x0160, 0x2001, 0x0006, 0x080c, 0x66fa, 0x6014,</div><div class='del'>-	0x2048, 0xa868, 0xd0fc, 0x0170, 0x080c, 0xb57c, 0x0048, 0x6014,</div><div class='del'>-	0x2048, 0xa868, 0xd0fc, 0x0528, 0x080c, 0xbb5c, 0x080c, 0xb16c,</div><div class='del'>-	0x009e, 0x0005, 0x6014, 0x6310, 0x2358, 0x904d, 0x090c, 0x0d85,</div><div class='del'>-	0xa87b, 0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0x900e, 0x080c,</div><div class='del'>-	0x6aae, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0xa99a,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0x080c, 0xb16c,</div><div class='del'>-	0x08f8, 0x6014, 0x904d, 0x090c, 0x0d85, 0xa87b, 0x0030, 0xa883,</div><div class='del'>-	0x0000, 0xa897, 0x4005, 0xa89b, 0x0004, 0xa867, 0x0139, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0x7012, 0x012e, 0x080c, 0xb16c, 0x0840,</div><div class='del'>-	0xa878, 0x9086, 0x0005, 0x1108, 0x0009, 0x0005, 0xa880, 0xc0ad,</div><div class='del'>-	0xa882, 0x0005, 0x604b, 0x0000, 0x6017, 0x0000, 0x6003, 0x0001,</div><div class='del'>-	0x6007, 0x0050, 0x2009, 0x8023, 0x080c, 0x9617, 0x0005, 0x00c6,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x0130, 0x0066,</div><div class='del'>-	0x6020, 0x9084, 0x000f, 0x001b, 0x006e, 0x00ce, 0x0005, 0xcbf9,</div><div class='del'>-	0xd259, 0xd259, 0xd25c, 0xeadc, 0xeaf7, 0xeafa, 0xcbf9, 0xcbf9,</div><div class='del'>-	0xcbf9, 0xcbf9, 0xcbf9, 0xcbf9, 0xcbf9, 0xcbf9, 0xcbf9, 0x080c,</div><div class='del'>-	0x0d85, 0xa001, 0xa001, 0x0005, 0x0096, 0x6014, 0x904d, 0x0118,</div><div class='del'>-	0xa87c, 0xd0e4, 0x1110, 0x009e, 0x0010, 0x009e, 0x0005, 0x6010,</div><div class='del'>-	0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x0550, 0x2001, 0x1834,</div><div class='del'>-	0x2004, 0x9005, 0x1540, 0x00f6, 0x2c78, 0x080c, 0xb116, 0x0508,</div><div class='del'>-	0x7810, 0x6012, 0x080c, 0xd3b6, 0x7820, 0x9086, 0x0003, 0x0128,</div><div class='del'>-	0x7808, 0x603a, 0x2f00, 0x603e, 0x0020, 0x7808, 0x603e, 0x2f00,</div><div class='del'>-	0x603a, 0x602e, 0x6023, 0x0001, 0x6007, 0x0035, 0x6003, 0x0001,</div><div class='del'>-	0x795c, 0x615e, 0x2009, 0x8020, 0x080c, 0x9617, 0x2f60, 0x00fe,</div><div class='del'>-	0x0005, 0x2f60, 0x00fe, 0x2001, 0x1988, 0x2004, 0x604a, 0x0005,</div><div class='del'>-	0x0016, 0x0096, 0x6814, 0x2048, 0x681c, 0xd0fc, 0xc0fc, 0x681e,</div><div class='del'>-	0xa87c, 0x1108, 0xd0e4, 0x0180, 0xc0e4, 0xa87e, 0xa877, 0x0000,</div><div class='del'>-	0xa893, 0x0000, 0xa88f, 0x0000, 0xd0cc, 0x0130, 0xc0cc, 0xa87e,</div><div class='del'>-	0xa878, 0x2048, 0x080c, 0x100b, 0x6830, 0x6036, 0x908e, 0x0001,</div><div class='del'>-	0x0148, 0x6803, 0x0002, 0x9086, 0x0005, 0x0170, 0x9006, 0x602e,</div><div class='del'>-	0x6032, 0x00d0, 0x681c, 0xc085, 0x681e, 0x6803, 0x0004, 0x6824,</div><div class='del'>-	0xc0f4, 0x9085, 0x0c00, 0x6826, 0x6814, 0x2048, 0xa8ac, 0x6938,</div><div class='del'>-	0x9102, 0xa8b0, 0x693c, 0x9103, 0x1e48, 0x683c, 0x602e, 0x6838,</div><div class='del'>-	0x9084, 0xfffc, 0x683a, 0x6032, 0x2d00, 0x603a, 0x6808, 0x603e,</div><div class='del'>-	0x6910, 0x6112, 0x695c, 0x615e, 0x6023, 0x0001, 0x6007, 0x0039,</div><div class='del'>-	0x6003, 0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x009e, 0x001e,</div><div class='del'>-	0x0005, 0x6024, 0xd0d4, 0x0510, 0xd0f4, 0x11f8, 0x6038, 0x940a,</div><div class='del'>-	0x603c, 0x9303, 0x0230, 0x9105, 0x0120, 0x6024, 0xc0d4, 0xc0f5,</div><div class='del'>-	0x0098, 0x643a, 0x633e, 0xac3e, 0xab42, 0x0046, 0x0036, 0x2400,</div><div class='del'>-	0xacac, 0x9402, 0xa836, 0x2300, 0xabb0, 0x9303, 0xa83a, 0x003e,</div><div class='del'>-	0x004e, 0x6024, 0xc0d4, 0x0000, 0x6026, 0x0005, 0xd0f4, 0x1138,</div><div class='del'>-	0xa83c, 0x603a, 0xa840, 0x603e, 0x6024, 0xc0f5, 0x6026, 0x0005,</div><div class='del'>-	0x0006, 0x0016, 0x6004, 0x908e, 0x0034, 0x01b8, 0x908e, 0x0035,</div><div class='del'>-	0x01a0, 0x908e, 0x0036, 0x0188, 0x908e, 0x0037, 0x0170, 0x908e,</div><div class='del'>-	0x0038, 0x0158, 0x908e, 0x0039, 0x0140, 0x908e, 0x003a, 0x0128,</div><div class='del'>-	0x908e, 0x003b, 0x0110, 0x9085, 0x0001, 0x001e, 0x000e, 0x0005,</div><div class='del'>-	0x0006, 0x0016, 0x0026, 0x0036, 0x00e6, 0x2001, 0x1982, 0x200c,</div><div class='del'>-	0x8000, 0x2014, 0x2001, 0x0032, 0x080c, 0x955b, 0x2001, 0x1986,</div><div class='del'>-	0x82ff, 0x1110, 0x2011, 0x0014, 0x2202, 0x2001, 0x1984, 0x200c,</div><div class='del'>-	0x8000, 0x2014, 0x2071, 0x196c, 0x711a, 0x721e, 0x2001, 0x0064,</div><div class='del'>-	0x080c, 0x955b, 0x2001, 0x1987, 0x82ff, 0x1110, 0x2011, 0x0014,</div><div class='del'>-	0x2202, 0x2001, 0x1988, 0x9288, 0x000a, 0x2102, 0x2001, 0x0017,</div><div class='del'>-	0x080c, 0xaced, 0x2001, 0x1a90, 0x2102, 0x2001, 0x0032, 0x080c,</div><div class='del'>-	0x16b9, 0x080c, 0x6bf2, 0x00ee, 0x003e, 0x002e, 0x001e, 0x000e,</div><div class='del'>-	0x0005, 0x0006, 0x0016, 0x00e6, 0x2001, 0x1986, 0x2003, 0x0028,</div><div class='del'>-	0x2001, 0x1987, 0x2003, 0x0014, 0x2071, 0x196c, 0x701b, 0x0000,</div><div class='del'>-	0x701f, 0x07d0, 0x2001, 0x1988, 0x2009, 0x001e, 0x2102, 0x2001,</div><div class='del'>-	0x0017, 0x080c, 0xaced, 0x2001, 0x1a90, 0x2102, 0x2001, 0x0032,</div><div class='del'>-	0x080c, 0x16b9, 0x00ee, 0x001e, 0x000e, 0x0005, 0x0096, 0x6060,</div><div class='del'>-	0x904d, 0x0110, 0x080c, 0x108b, 0x009e, 0x0005, 0x0005, 0x00c6,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x080c, 0xb116, 0x0180, 0x2b08, 0x6112,</div><div class='del'>-	0x0ca9, 0x6023, 0x0001, 0x2900, 0x6016, 0x2009, 0x0033, 0x080c,</div><div class='del'>-	0xb20a, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8,</div><div class='del'>-	0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186, 0x0015, 0x1520,</div><div class='del'>-	0x7090, 0x9086, 0x0018, 0x0120, 0x7090, 0x9086, 0x0014, 0x11e0,</div><div class='del'>-	0x6014, 0x2048, 0xaa3c, 0xd2e4, 0x1160, 0x2c78, 0x080c, 0x9b83,</div><div class='del'>-	0x01d8, 0x707c, 0xaa50, 0x9206, 0x1160, 0x7080, 0xaa54, 0x9206,</div><div class='del'>-	0x1140, 0x6210, 0x00b6, 0x2258, 0xbaa0, 0x00be, 0x900e, 0x080c,</div><div class='del'>-	0x3364, 0x080c, 0xb57c, 0x0020, 0x080c, 0xbb5c, 0x080c, 0xb16c,</div><div class='del'>-	0x00fe, 0x00ee, 0x009e, 0x0005, 0x7060, 0xaa54, 0x9206, 0x0d48,</div><div class='del'>-	0x0c80, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0xb116, 0x0188,</div><div class='del'>-	0x2b08, 0x6112, 0x080c, 0xd3b6, 0x6023, 0x0001, 0x2900, 0x6016,</div><div class='del'>-	0x2009, 0x004d, 0x080c, 0xb20a, 0x9085, 0x0001, 0x012e, 0x00ce,</div><div class='del'>-	0x0005, 0x9006, 0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x0016,</div><div class='del'>-	0x080c, 0xb116, 0x0180, 0x2b08, 0x6112, 0x080c, 0xd3b6, 0x6023,</div><div class='del'>-	0x0001, 0x2900, 0x6016, 0x001e, 0x080c, 0xb20a, 0x9085, 0x0001,</div><div class='del'>-	0x012e, 0x00ce, 0x0005, 0x001e, 0x9006, 0x0cd0, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x0046, 0x0056, 0x0066, 0x0096, 0x00e6, 0x00f6, 0x2071,</div><div class='del'>-	0x1800, 0x9186, 0x0015, 0x1568, 0x7190, 0x6014, 0x2048, 0xa814,</div><div class='del'>-	0x8003, 0x9106, 0x1530, 0x20e1, 0x0000, 0x2001, 0x19a1, 0x2003,</div><div class='del'>-	0x0000, 0x6014, 0x2048, 0xa830, 0x20a8, 0x8906, 0x8006, 0x8007,</div><div class='del'>-	0x9094, 0x003f, 0x22e8, 0x9084, 0xffc0, 0x9080, 0x001b, 0x20a0,</div><div class='del'>-	0x2001, 0x19a1, 0x0016, 0x200c, 0x080c, 0xdca1, 0x001e, 0xa804,</div><div class='del'>-	0x9005, 0x0110, 0x2048, 0x0c38, 0x6014, 0x2048, 0xa867, 0x0103,</div><div class='del'>-	0x0010, 0x080c, 0xbb5c, 0x080c, 0xb16c, 0x00fe, 0x00ee, 0x009e,</div><div class='del'>-	0x006e, 0x005e, 0x004e, 0x003e, 0x002e, 0x001e, 0x0005, 0x0096,</div><div class='del'>-	0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186, 0x0015, 0x11b8, 0x7090,</div><div class='del'>-	0x9086, 0x0004, 0x1198, 0x6014, 0x2048, 0x2c78, 0x080c, 0x9b83,</div><div class='del'>-	0x01a8, 0x707c, 0xaa74, 0x9206, 0x1130, 0x7080, 0xaa78, 0x9206,</div><div class='del'>-	0x1110, 0x080c, 0x3315, 0x080c, 0xb57c, 0x0020, 0x080c, 0xbb5c,</div><div class='del'>-	0x080c, 0xb16c, 0x00fe, 0x00ee, 0x009e, 0x0005, 0x7060, 0xaa78,</div><div class='del'>-	0x9206, 0x0d78, 0x0c80, 0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800,</div><div class='del'>-	0x9186, 0x0015, 0x1550, 0x7090, 0x9086, 0x0004, 0x1530, 0x6014,</div><div class='del'>-	0x2048, 0x2c78, 0x080c, 0x9b83, 0x05f0, 0x707c, 0xaacc, 0x9206,</div><div class='del'>-	0x1180, 0x7080, 0xaad0, 0x9206, 0x1160, 0x080c, 0x3315, 0x0016,</div><div class='del'>-	0xa998, 0xaab0, 0x9284, 0x1000, 0xc0fd, 0x080c, 0x57e9, 0x001e,</div><div class='del'>-	0x0010, 0x080c, 0x55cc, 0x080c, 0xcf1b, 0x0508, 0xa87b, 0x0000,</div><div class='del'>-	0xa883, 0x0000, 0xa897, 0x4000, 0x0080, 0x080c, 0xcf1b, 0x01b8,</div><div class='del'>-	0x6014, 0x2048, 0x080c, 0x55cc, 0x1d70, 0xa87b, 0x0030, 0xa883,</div><div class='del'>-	0x0000, 0xa897, 0x4005, 0xa89b, 0x0004, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0xa867, 0x0139, 0x080c, 0x7012, 0x012e, 0x080c, 0xb16c, 0x00fe,</div><div class='del'>-	0x00ee, 0x009e, 0x0005, 0x7060, 0xaad0, 0x9206, 0x0930, 0x0888,</div><div class='del'>-	0x0016, 0x0026, 0xa87c, 0xd0ac, 0x0178, 0xa938, 0xaa34, 0x2100,</div><div class='del'>-	0x9205, 0x0150, 0xa890, 0x9106, 0x1118, 0xa88c, 0x9206, 0x0120,</div><div class='del'>-	0xa992, 0xaa8e, 0x9085, 0x0001, 0x002e, 0x001e, 0x0005, 0x00b6,</div><div class='del'>-	0x00d6, 0x0036, 0x080c, 0xcf1b, 0x0904, 0xd578, 0x0096, 0x6314,</div><div class='del'>-	0x2348, 0xa87a, 0xa982, 0x929e, 0x4000, 0x1580, 0x6310, 0x00c6,</div><div class='del'>-	0x2358, 0x2009, 0x0000, 0xa868, 0xd0f4, 0x1140, 0x080c, 0x6aae,</div><div class='del'>-	0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0xaa96, 0xa99a,</div><div class='del'>-	0x20a9, 0x0004, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0031, 0x20a0,</div><div class='del'>-	0xb8c4, 0x20e0, 0xb8c8, 0x9080, 0x0006, 0x2098, 0x080c, 0x0fd6,</div><div class='del'>-	0x20a9, 0x0004, 0xa85c, 0x9080, 0x0035, 0x20a0, 0xb8c8, 0x9080,</div><div class='del'>-	0x000a, 0x2098, 0x080c, 0x0fd6, 0x00ce, 0x0090, 0xaa96, 0x3918,</div><div class='del'>-	0x9398, 0x0007, 0x231c, 0x6004, 0x9086, 0x0016, 0x0110, 0xa89b,</div><div class='del'>-	0x0004, 0xaba2, 0x6310, 0x2358, 0xb804, 0x9084, 0x00ff, 0xa89e,</div><div class='del'>-	0xa868, 0xc0f4, 0xa86a, 0x080c, 0x7006, 0x6017, 0x0000, 0x009e,</div><div class='del'>-	0x003e, 0x00de, 0x00be, 0x0005, 0x0026, 0x0036, 0x0046, 0x00b6,</div><div class='del'>-	0x0096, 0x00f6, 0x6214, 0x2248, 0x6210, 0x2258, 0x2079, 0x0260,</div><div class='del'>-	0x9096, 0x0000, 0x11a0, 0xb814, 0x9084, 0x00ff, 0x900e, 0x080c,</div><div class='del'>-	0x268c, 0x2118, 0x831f, 0x939c, 0xff00, 0x7838, 0x9084, 0x00ff,</div><div class='del'>-	0x931d, 0x7c3c, 0x2011, 0x8018, 0x080c, 0x4ca1, 0x00a8, 0x9096,</div><div class='del'>-	0x0001, 0x1148, 0x89ff, 0x0180, 0xa89b, 0x000d, 0x7838, 0xa8a6,</div><div class='del'>-	0x783c, 0xa8aa, 0x0048, 0x9096, 0x0002, 0x1130, 0xa89b, 0x000d,</div><div class='del'>-	0x7838, 0xa8a6, 0x783c, 0xa8aa, 0x00fe, 0x009e, 0x00be, 0x004e,</div><div class='del'>-	0x003e, 0x002e, 0x0005, 0x00c6, 0x0026, 0x0016, 0x9186, 0x0035,</div><div class='del'>-	0x0110, 0x6a38, 0x0008, 0x6a2c, 0x080c, 0xcf09, 0x01f0, 0x2260,</div><div class='del'>-	0x6120, 0x9186, 0x0003, 0x0118, 0x9186, 0x0006, 0x1190, 0x6838,</div><div class='del'>-	0x9206, 0x0140, 0x683c, 0x9206, 0x1160, 0x6108, 0x6838, 0x9106,</div><div class='del'>-	0x1140, 0x0020, 0x6008, 0x693c, 0x9106, 0x1118, 0x6010, 0x6910,</div><div class='del'>-	0x9106, 0x001e, 0x002e, 0x00ce, 0x0005, 0x9085, 0x0001, 0x0cc8,</div><div class='del'>-	0xa974, 0xd1cc, 0x0198, 0x918c, 0x00ff, 0x918e, 0x0002, 0x1170,</div><div class='del'>-	0xa9a8, 0x918c, 0x000f, 0x918e, 0x0001, 0x1140, 0xa87c, 0xd0ac,</div><div class='del'>-	0x0128, 0xa834, 0xa938, 0x9115, 0x190c, 0xc519, 0x0005, 0x0036,</div><div class='del'>-	0x2019, 0x0001, 0x0010, 0x0036, 0x901e, 0x0499, 0x01e0, 0x080c,</div><div class='del'>-	0xcf1b, 0x01c8, 0x080c, 0xd10c, 0x6037, 0x4000, 0x6014, 0x6017,</div><div class='del'>-	0x0000, 0x0096, 0x2048, 0xa87c, 0x080c, 0xd132, 0x1118, 0x080c,</div><div class='del'>-	0xbb5c, 0x0040, 0xa867, 0x0103, 0xa877, 0x0000, 0x83ff, 0x1129,</div><div class='del'>-	0x080c, 0x7012, 0x009e, 0x003e, 0x0005, 0xa880, 0xd0b4, 0x0128,</div><div class='del'>-	0xa87b, 0x0006, 0xc0ec, 0xa882, 0x0048, 0xd0bc, 0x0118, 0xa87b,</div><div class='del'>-	0x0002, 0x0020, 0xa87b, 0x0005, 0x080c, 0xd226, 0xa877, 0x0000,</div><div class='del'>-	0x0005, 0x2001, 0x1810, 0x2004, 0xd0ec, 0x0005, 0x0006, 0x2001,</div><div class='del'>-	0x1810, 0x2004, 0xd0f4, 0x000e, 0x0005, 0x0006, 0x2001, 0x1810,</div><div class='del'>-	0x2004, 0xd0e4, 0x000e, 0x0005, 0x0036, 0x0046, 0x6010, 0x00b6,</div><div class='del'>-	0x2058, 0xbba0, 0x00be, 0x2021, 0x0007, 0x080c, 0x4e58, 0x004e,</div><div class='del'>-	0x003e, 0x0005, 0x0c51, 0x1d81, 0x0005, 0x2001, 0x1986, 0x2004,</div><div class='del'>-	0x601a, 0x0005, 0x2001, 0x1988, 0x2004, 0x604a, 0x0005, 0x080c,</div><div class='del'>-	0xb16c, 0x0804, 0x9ab3, 0x611c, 0xd1fc, 0xa97c, 0x1108, 0xd1e4,</div><div class='del'>-	0x0005, 0x601c, 0xd0fc, 0xa87c, 0x1108, 0xd0e4, 0x0005, 0x601c,</div><div class='del'>-	0xd0fc, 0xc0fc, 0x601e, 0xa87c, 0x1108, 0xd0e4, 0x0005, 0x6044,</div><div class='del'>-	0xd0fc, 0x1138, 0xd0bc, 0x01a0, 0xc0bc, 0x6046, 0x2001, 0x0002,</div><div class='del'>-	0x0080, 0xd0ac, 0x1168, 0xd0dc, 0x1128, 0x908c, 0x000f, 0x9186,</div><div class='del'>-	0x0005, 0x1118, 0x2001, 0x0003, 0x0020, 0x2001, 0x0001, 0x0008,</div><div class='del'>-	0x6000, 0x0005, 0x00b6, 0x0066, 0x6000, 0x90b2, 0x0010, 0x1a0c,</div><div class='del'>-	0x0d85, 0x001b, 0x006e, 0x00be, 0x0005, 0xd6b5, 0xddfe, 0xdf62,</div><div class='del'>-	0xd6b5, 0xd6b5, 0xd6b5, 0xd6b5, 0xd6b5, 0xd6ec, 0xdfe6, 0xd6b5,</div><div class='del'>-	0xd6b5, 0xd6b5, 0xd6b5, 0xd6b5, 0xd6b5, 0x080c, 0x0d85, 0x0066,</div><div class='del'>-	0x6000, 0x90b2, 0x0010, 0x1a0c, 0x0d85, 0x0013, 0x006e, 0x0005,</div><div class='del'>-	0xd6d0, 0xe50b, 0xd6d0, 0xd6d0, 0xd6d0, 0xd6d0, 0xd6d0, 0xd6d0,</div><div class='del'>-	0xe4ba, 0xe55d, 0xd6d0, 0xec10, 0xec44, 0xec10, 0xec44, 0xd6d0,</div><div class='del'>-	0x080c, 0x0d85, 0x6000, 0x9082, 0x0010, 0x1a0c, 0x0d85, 0x6000,</div><div class='del'>-	0x000a, 0x0005, 0xd6ea, 0xe1c3, 0xe28e, 0xe2b1, 0xe32d, 0xd6ea,</div><div class='del'>-	0xe42a, 0xe3b5, 0xdff0, 0xe492, 0xe4a7, 0xd6ea, 0xd6ea, 0xd6ea,</div><div class='del'>-	0xd6ea, 0xd6ea, 0x080c, 0x0d85, 0x91b2, 0x0053, 0x1a0c, 0x0d85,</div><div class='del'>-	0x2100, 0x91b2, 0x0040, 0x1a04, 0xdb70, 0x0002, 0xd736, 0xd93e,</div><div class='del'>-	0xd736, 0xd736, 0xd736, 0xd947, 0xd736, 0xd736, 0xd736, 0xd736,</div><div class='del'>-	0xd736, 0xd736, 0xd736, 0xd736, 0xd736, 0xd736, 0xd736, 0xd736,</div><div class='del'>-	0xd736, 0xd736, 0xd736, 0xd736, 0xd736, 0xd738, 0xd79f, 0xd7ae,</div><div class='del'>-	0xd812, 0xd83d, 0xd8b6, 0xd929, 0xd736, 0xd736, 0xd94a, 0xd736,</div><div class='del'>-	0xd736, 0xd95f, 0xd96c, 0xd736, 0xd736, 0xd736, 0xd736, 0xd736,</div><div class='del'>-	0xda12, 0xd736, 0xd736, 0xda26, 0xd736, 0xd736, 0xd9e1, 0xd736,</div><div class='del'>-	0xd736, 0xd736, 0xda3e, 0xd736, 0xd736, 0xd736, 0xdabb, 0xd736,</div><div class='del'>-	0xd736, 0xd736, 0xd736, 0xd736, 0xd736, 0xdb38, 0x080c, 0x0d85,</div><div class='del'>-	0x080c, 0x6bcf, 0x1150, 0x2001, 0x1837, 0x2004, 0xd0cc, 0x1128,</div><div class='del'>-	0x9084, 0x0009, 0x9086, 0x0008, 0x1140, 0x6007, 0x0009, 0x602f,</div><div class='del'>-	0x0009, 0x6017, 0x0000, 0x0804, 0xd937, 0x080c, 0x6b6b, 0x00e6,</div><div class='del'>-	0x00c6, 0x0036, 0x0026, 0x0016, 0x6210, 0x2258, 0xbaa0, 0x0026,</div><div class='del'>-	0x2019, 0x0029, 0x080c, 0xacfc, 0x080c, 0x97b0, 0x0076, 0x903e,</div><div class='del'>-	0x080c, 0x966d, 0x2c08, 0x080c, 0xe75d, 0x007e, 0x001e, 0x080c,</div><div class='del'>-	0xad18, 0x001e, 0x002e, 0x003e, 0x00ce, 0x00ee, 0x6610, 0x2658,</div><div class='del'>-	0x080c, 0x67c3, 0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006, 0x1268,</div><div class='del'>-	0x0016, 0x0026, 0x6210, 0x00b6, 0x2258, 0xbaa0, 0x00be, 0x2c08,</div><div class='del'>-	0x080c, 0xee6f, 0x002e, 0x001e, 0x1178, 0x080c, 0xe68b, 0x1904,</div><div class='del'>-	0xd80a, 0x080c, 0xe627, 0x1120, 0x6007, 0x0008, 0x0804, 0xd937,</div><div class='del'>-	0x6007, 0x0009, 0x0804, 0xd937, 0x080c, 0xe905, 0x0128, 0x080c,</div><div class='del'>-	0xe68b, 0x0d78, 0x0804, 0xd80a, 0x6017, 0x1900, 0x0c88, 0x080c,</div><div class='del'>-	0x344c, 0x1904, 0xdb6d, 0x6106, 0x080c, 0xe5c7, 0x6007, 0x0006,</div><div class='del'>-	0x0804, 0xd937, 0x6007, 0x0007, 0x0804, 0xd937, 0x080c, 0xec80,</div><div class='del'>-	0x1904, 0xdb6d, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x00d6, 0x6610,</div><div class='del'>-	0x2658, 0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006, 0x1220, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0x66e6, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0006,</div><div class='del'>-	0x0188, 0x9686, 0x0004, 0x0170, 0xbe04, 0x96b4, 0x00ff, 0x9686,</div><div class='del'>-	0x0006, 0x0140, 0x9686, 0x0004, 0x0128, 0x9686, 0x0005, 0x0110,</div><div class='del'>-	0x00de, 0x0480, 0x00e6, 0x2071, 0x0260, 0x7034, 0x9084, 0x0003,</div><div class='del'>-	0x1140, 0x7034, 0x9082, 0x0014, 0x0220, 0x7030, 0x9084, 0x0003,</div><div class='del'>-	0x0130, 0x00ee, 0x6017, 0x0000, 0x602f, 0x0007, 0x00b0, 0x00ee,</div><div class='del'>-	0x080c, 0xe6f3, 0x1190, 0x9686, 0x0006, 0x1140, 0x0026, 0x6210,</div><div class='del'>-	0x2258, 0xbaa0, 0x900e, 0x080c, 0x3364, 0x002e, 0x080c, 0x684f,</div><div class='del'>-	0x6007, 0x000a, 0x00de, 0x0804, 0xd937, 0x6007, 0x000b, 0x00de,</div><div class='del'>-	0x0804, 0xd937, 0x080c, 0x3315, 0x080c, 0xd65a, 0x6007, 0x0001,</div><div class='del'>-	0x0804, 0xd937, 0x080c, 0xec80, 0x1904, 0xdb6d, 0x080c, 0x344c,</div><div class='del'>-	0x1904, 0xdb6d, 0x2071, 0x0260, 0x7034, 0x90b4, 0x0003, 0x1948,</div><div class='del'>-	0x90b2, 0x0014, 0x0a30, 0x7030, 0x9084, 0x0003, 0x1910, 0x6610,</div><div class='del'>-	0x2658, 0xbe04, 0x9686, 0x0707, 0x09e8, 0x0026, 0x6210, 0x2258,</div><div class='del'>-	0xbaa0, 0x900e, 0x080c, 0x3364, 0x002e, 0x6007, 0x000c, 0x2001,</div><div class='del'>-	0x0001, 0x080c, 0xee4e, 0x0804, 0xd937, 0x080c, 0x6bcf, 0x1140,</div><div class='del'>-	0x2001, 0x1837, 0x2004, 0x9084, 0x0009, 0x9086, 0x0008, 0x1110,</div><div class='del'>-	0x0804, 0xd745, 0x080c, 0x6b6b, 0x6610, 0x2658, 0xbe04, 0x9684,</div><div class='del'>-	0x00ff, 0x9082, 0x0006, 0x06c8, 0x1138, 0x0026, 0x2001, 0x0006,</div><div class='del'>-	0x080c, 0x6726, 0x002e, 0x0050, 0x96b4, 0xff00, 0x8637, 0x9686,</div><div class='del'>-	0x0004, 0x0120, 0x9686, 0x0006, 0x1904, 0xd80a, 0x080c, 0xe700,</div><div class='del'>-	0x1120, 0x6007, 0x000e, 0x0804, 0xd937, 0x0046, 0x6410, 0x2458,</div><div class='del'>-	0xbca0, 0x0046, 0x080c, 0x3315, 0x080c, 0xd65a, 0x004e, 0x0016,</div><div class='del'>-	0x9006, 0x2009, 0x1848, 0x210c, 0xd1a4, 0x0148, 0x2009, 0x0029,</div><div class='del'>-	0x080c, 0xea8d, 0x6010, 0x2058, 0xb800, 0xc0e5, 0xb802, 0x001e,</div><div class='del'>-	0x004e, 0x6007, 0x0001, 0x0804, 0xd937, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x66e6, 0x0156, 0x0016, 0x0026, 0x0036, 0x20a9, 0x0004, 0x2019,</div><div class='del'>-	0x1805, 0x2011, 0x0270, 0x080c, 0xc20e, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x015e, 0x9005, 0x0168, 0x96b4, 0xff00, 0x8637, 0x9682, 0x0004,</div><div class='del'>-	0x0a04, 0xd80a, 0x9682, 0x0007, 0x0a04, 0xd866, 0x0804, 0xd80a,</div><div class='del'>-	0x6017, 0x1900, 0x6007, 0x0009, 0x0804, 0xd937, 0x080c, 0x6bcf,</div><div class='del'>-	0x1140, 0x2001, 0x1837, 0x2004, 0x9084, 0x0009, 0x9086, 0x0008,</div><div class='del'>-	0x1110, 0x0804, 0xd745, 0x080c, 0x6b6b, 0x6610, 0x2658, 0xbe04,</div><div class='del'>-	0x9684, 0x00ff, 0x0006, 0x0016, 0x908e, 0x0001, 0x0118, 0x908e,</div><div class='del'>-	0x0000, 0x1118, 0x001e, 0x000e, 0x0080, 0x001e, 0x000e, 0x9082,</div><div class='del'>-	0x0006, 0x06a0, 0x0150, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0004,</div><div class='del'>-	0x0120, 0x9686, 0x0006, 0x1904, 0xd80a, 0x080c, 0xe72e, 0x1138,</div><div class='del'>-	0x080c, 0xe627, 0x1120, 0x6007, 0x0010, 0x0804, 0xd937, 0x0046,</div><div class='del'>-	0x6410, 0x2458, 0xbca0, 0x0046, 0x080c, 0x3315, 0x080c, 0xd65a,</div><div class='del'>-	0x004e, 0x0016, 0x9006, 0x2009, 0x1848, 0x210c, 0xd1a4, 0x0148,</div><div class='del'>-	0x2009, 0x0029, 0x080c, 0xea8d, 0x6010, 0x2058, 0xb800, 0xc0e5,</div><div class='del'>-	0xb802, 0x001e, 0x004e, 0x6007, 0x0001, 0x0448, 0x080c, 0xe905,</div><div class='del'>-	0x0198, 0x0016, 0x968c, 0x00ff, 0x9186, 0x0002, 0x0160, 0x9186,</div><div class='del'>-	0x0003, 0x0148, 0x001e, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0006,</div><div class='del'>-	0x0920, 0x0804, 0xd80a, 0x001e, 0x6017, 0x1900, 0x6007, 0x0009,</div><div class='del'>-	0x0070, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x080c, 0xec80, 0x1904,</div><div class='del'>-	0xdb6d, 0x080c, 0xdd3e, 0x1904, 0xd80a, 0x6007, 0x0012, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0005, 0x6007, 0x0001,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0cb0, 0x6007,</div><div class='del'>-	0x0005, 0x0c68, 0x080c, 0xec80, 0x1904, 0xdb6d, 0x080c, 0x344c,</div><div class='del'>-	0x1904, 0xdb6d, 0x080c, 0xdd3e, 0x1904, 0xd80a, 0x6007, 0x0020,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0005, 0x080c,</div><div class='del'>-	0x344c, 0x1904, 0xdb6d, 0x6007, 0x0023, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x961e, 0x080c, 0x9ab3, 0x0005, 0x080c, 0xec80, 0x1904, 0xdb6d,</div><div class='del'>-	0x080c, 0x344c, 0x1904, 0xdb6d, 0x080c, 0xdd3e, 0x1904, 0xd80a,</div><div class='del'>-	0x0016, 0x0026, 0x00e6, 0x2071, 0x0260, 0x2c08, 0x2011, 0x1820,</div><div class='del'>-	0x2214, 0x703c, 0x9206, 0x11e0, 0x2011, 0x181f, 0x2214, 0x7038,</div><div class='del'>-	0x9084, 0x00ff, 0x9206, 0x11a0, 0x7240, 0x080c, 0xcf09, 0x0570,</div><div class='del'>-	0x2260, 0x6008, 0x9086, 0xffff, 0x0120, 0x7244, 0x6008, 0x9206,</div><div class='del'>-	0x1528, 0x6020, 0x9086, 0x0007, 0x1508, 0x080c, 0xb16c, 0x04a0,</div><div class='del'>-	0x7244, 0x9286, 0xffff, 0x0180, 0x2c08, 0x080c, 0xcf09, 0x01b0,</div><div class='del'>-	0x2260, 0x7240, 0x6008, 0x9206, 0x1188, 0x6010, 0x9190, 0x0004,</div><div class='del'>-	0x2214, 0x9206, 0x01b8, 0x0050, 0x7240, 0x2c08, 0x9006, 0x080c,</div><div class='del'>-	0xea57, 0x1180, 0x7244, 0x9286, 0xffff, 0x01b0, 0x2160, 0x6007,</div><div class='del'>-	0x0026, 0x6017, 0x1700, 0x7214, 0x9296, 0xffff, 0x1180, 0x6007,</div><div class='del'>-	0x0025, 0x0068, 0x6020, 0x9086, 0x0007, 0x1d80, 0x6004, 0x9086,</div><div class='del'>-	0x0024, 0x1110, 0x080c, 0xb16c, 0x2160, 0x6007, 0x0025, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x00ee, 0x002e, 0x001e,</div><div class='del'>-	0x0005, 0x2001, 0x0001, 0x080c, 0x66e6, 0x0156, 0x0016, 0x0026,</div><div class='del'>-	0x0036, 0x20a9, 0x0004, 0x2019, 0x1805, 0x2011, 0x0276, 0x080c,</div><div class='del'>-	0xc20e, 0x003e, 0x002e, 0x001e, 0x015e, 0x0120, 0x6007, 0x0031,</div><div class='del'>-	0x0804, 0xd937, 0x080c, 0xbe21, 0x080c, 0x779e, 0x1190, 0x0006,</div><div class='del'>-	0x0026, 0x0036, 0x080c, 0x77b8, 0x1138, 0x080c, 0x7ab6, 0x080c,</div><div class='del'>-	0x619d, 0x080c, 0x76cd, 0x0010, 0x080c, 0x7772, 0x003e, 0x002e,</div><div class='del'>-	0x000e, 0x0005, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x080c, 0xdd3e,</div><div class='del'>-	0x1904, 0xd80a, 0x6106, 0x080c, 0xdd5a, 0x1120, 0x6007, 0x002b,</div><div class='del'>-	0x0804, 0xd937, 0x6007, 0x002c, 0x0804, 0xd937, 0x080c, 0xec80,</div><div class='del'>-	0x1904, 0xdb6d, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x080c, 0xdd3e,</div><div class='del'>-	0x1904, 0xd80a, 0x6106, 0x080c, 0xdd5f, 0x1120, 0x6007, 0x002e,</div><div class='del'>-	0x0804, 0xd937, 0x6007, 0x002f, 0x0804, 0xd937, 0x080c, 0x344c,</div><div class='del'>-	0x1904, 0xdb6d, 0x00e6, 0x00d6, 0x00c6, 0x6010, 0x2058, 0xb904,</div><div class='del'>-	0x9184, 0x00ff, 0x9086, 0x0006, 0x0158, 0x9184, 0xff00, 0x8007,</div><div class='del'>-	0x9086, 0x0006, 0x0128, 0x00ce, 0x00de, 0x00ee, 0x0804, 0xd93e,</div><div class='del'>-	0x080c, 0x5844, 0xd0e4, 0x0904, 0xdab8, 0x2071, 0x026c, 0x7010,</div><div class='del'>-	0x603a, 0x7014, 0x603e, 0x7108, 0x720c, 0x080c, 0x6c0d, 0x0140,</div><div class='del'>-	0x6010, 0x2058, 0xb810, 0x9106, 0x1118, 0xb814, 0x9206, 0x0510,</div><div class='del'>-	0x080c, 0x6c09, 0x15b8, 0x2069, 0x1800, 0x6880, 0x9206, 0x1590,</div><div class='del'>-	0x687c, 0x9106, 0x1578, 0x7210, 0x080c, 0xcf09, 0x0590, 0x080c,</div><div class='del'>-	0xdc2b, 0x0578, 0x080c, 0xeb09, 0x0560, 0x622e, 0x6007, 0x0036,</div><div class='del'>-	0x6003, 0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x00ce, 0x00de,</div><div class='del'>-	0x00ee, 0x0005, 0x7214, 0x9286, 0xffff, 0x0150, 0x080c, 0xcf09,</div><div class='del'>-	0x01c0, 0x9280, 0x0002, 0x2004, 0x7110, 0x9106, 0x1190, 0x08e0,</div><div class='del'>-	0x7210, 0x2c08, 0x9085, 0x0001, 0x080c, 0xea57, 0x2c10, 0x2160,</div><div class='del'>-	0x0140, 0x0890, 0x6007, 0x0037, 0x602f, 0x0009, 0x6017, 0x1500,</div><div class='del'>-	0x08b8, 0x6007, 0x0037, 0x602f, 0x0003, 0x6017, 0x1700, 0x0880,</div><div class='del'>-	0x6007, 0x0012, 0x0868, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x6010,</div><div class='del'>-	0x2058, 0xb804, 0x9084, 0xff00, 0x8007, 0x9086, 0x0006, 0x1904,</div><div class='del'>-	0xd93e, 0x00e6, 0x00d6, 0x00c6, 0x080c, 0x5844, 0xd0e4, 0x0904,</div><div class='del'>-	0xdb30, 0x2069, 0x1800, 0x2071, 0x026c, 0x7008, 0x603a, 0x720c,</div><div class='del'>-	0x623e, 0x9286, 0xffff, 0x1150, 0x7208, 0x00c6, 0x2c08, 0x9085,</div><div class='del'>-	0x0001, 0x080c, 0xea57, 0x2c10, 0x00ce, 0x05e8, 0x080c, 0xcf09,</div><div class='del'>-	0x05d0, 0x7108, 0x9280, 0x0002, 0x2004, 0x9106, 0x15a0, 0x00c6,</div><div class='del'>-	0x0026, 0x2260, 0x080c, 0xcadc, 0x002e, 0x00ce, 0x7118, 0x918c,</div><div class='del'>-	0xff00, 0x810f, 0x9186, 0x0001, 0x0178, 0x9186, 0x0005, 0x0118,</div><div class='del'>-	0x9186, 0x0007, 0x1198, 0x9280, 0x0005, 0x2004, 0x9005, 0x0170,</div><div class='del'>-	0x080c, 0xdc2b, 0x0904, 0xdab1, 0x0056, 0x7510, 0x7614, 0x080c,</div><div class='del'>-	0xeb22, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x6007, 0x003b,</div><div class='del'>-	0x602f, 0x0009, 0x6017, 0x2a00, 0x6003, 0x0001, 0x2009, 0x8020,</div><div class='del'>-	0x080c, 0x9617, 0x0c78, 0x6007, 0x003b, 0x602f, 0x0003, 0x6017,</div><div class='del'>-	0x0300, 0x6003, 0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x0c10,</div><div class='del'>-	0x6007, 0x003b, 0x602f, 0x000b, 0x6017, 0x0000, 0x0804, 0xda88,</div><div class='del'>-	0x00e6, 0x0026, 0x080c, 0x6bcf, 0x0550, 0x080c, 0x6b6b, 0x080c,</div><div class='del'>-	0xecf1, 0x1518, 0x2071, 0x1800, 0x70dc, 0x9085, 0x0003, 0x70de,</div><div class='del'>-	0x00f6, 0x2079, 0x0100, 0x72b0, 0x9284, 0x00ff, 0x707e, 0x78e6,</div><div class='del'>-	0x9284, 0xff00, 0x7280, 0x9205, 0x7082, 0x78ea, 0x00fe, 0x70e7,</div><div class='del'>-	0x0000, 0x080c, 0x6c0d, 0x0120, 0x2011, 0x1a0a, 0x2013, 0x07d0,</div><div class='del'>-	0xd0ac, 0x1128, 0x080c, 0x30bf, 0x0010, 0x080c, 0xed25, 0x002e,</div><div class='del'>-	0x00ee, 0x080c, 0xb16c, 0x0804, 0xd93d, 0x080c, 0xb16c, 0x0005,</div><div class='del'>-	0x2600, 0x0002, 0xdb84, 0xdbb2, 0xdbc3, 0xdb84, 0xdb84, 0xdb86,</div><div class='del'>-	0xdbd4, 0xdb84, 0xdb84, 0xdb84, 0xdba0, 0xdb84, 0xdb84, 0xdb84,</div><div class='del'>-	0xdbdf, 0xdbf5, 0xdc26, 0xdb84, 0x080c, 0x0d85, 0x080c, 0xec80,</div><div class='del'>-	0x1d20, 0x080c, 0x344c, 0x1d08, 0x7038, 0x6016, 0x6007, 0x0045,</div><div class='del'>-	0x6003, 0x0001, 0x080c, 0x961e, 0x0005, 0x080c, 0x3315, 0x080c,</div><div class='del'>-	0xd65a, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x961e, 0x0005,</div><div class='del'>-	0x080c, 0xec80, 0x1950, 0x080c, 0x344c, 0x1938, 0x080c, 0xdd3e,</div><div class='del'>-	0x1d60, 0x703c, 0x6016, 0x6007, 0x004a, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x961e, 0x0005, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x2009, 0x0041,</div><div class='del'>-	0x080c, 0xed2e, 0x6007, 0x0047, 0x6003, 0x0001, 0x080c, 0x961e,</div><div class='del'>-	0x080c, 0x9ab3, 0x0005, 0x080c, 0x344c, 0x1904, 0xdb6d, 0x2009,</div><div class='del'>-	0x0042, 0x080c, 0xed2e, 0x6007, 0x0047, 0x6003, 0x0001, 0x080c,</div><div class='del'>-	0x961e, 0x080c, 0x9ab3, 0x0005, 0x080c, 0x344c, 0x1904, 0xdb6d,</div><div class='del'>-	0x2009, 0x0046, 0x080c, 0xed2e, 0x080c, 0xb16c, 0x0005, 0x2001,</div><div class='del'>-	0x1824, 0x2004, 0x9082, 0x00e1, 0x1268, 0x080c, 0xdc48, 0x0904,</div><div class='del'>-	0xdb6d, 0x6007, 0x004e, 0x6003, 0x0001, 0x080c, 0x961e, 0x080c,</div><div class='del'>-	0x9ab3, 0x0005, 0x6007, 0x0012, 0x0cb0, 0x6007, 0x004f, 0x6017,</div><div class='del'>-	0x0000, 0x7134, 0x918c, 0x00ff, 0x81ff, 0x0508, 0x9186, 0x0001,</div><div class='del'>-	0x1160, 0x7140, 0x2001, 0x19be, 0x2004, 0x9106, 0x11b0, 0x7144,</div><div class='del'>-	0x2001, 0x19bf, 0x2004, 0x9106, 0x0190, 0x9186, 0x0002, 0x1168,</div><div class='del'>-	0x2011, 0x0276, 0x20a9, 0x0004, 0x6010, 0x0096, 0x2048, 0x2019,</div><div class='del'>-	0x000a, 0x080c, 0xc222, 0x009e, 0x0110, 0x6017, 0x0001, 0x6003,</div><div class='del'>-	0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x0005, 0x6007, 0x0050,</div><div class='del'>-	0x703c, 0x6016, 0x0ca0, 0x0016, 0x00e6, 0x2071, 0x0260, 0x00b6,</div><div class='del'>-	0x00c6, 0x2260, 0x6010, 0x2058, 0xb8d4, 0xd084, 0x0150, 0x7128,</div><div class='del'>-	0x604c, 0x9106, 0x1120, 0x712c, 0x6050, 0x9106, 0x0110, 0x9006,</div><div class='del'>-	0x0010, 0x9085, 0x0001, 0x00ce, 0x00be, 0x00ee, 0x001e, 0x0005,</div><div class='del'>-	0x0016, 0x0096, 0x0086, 0x00e6, 0x01c6, 0x01d6, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x2071, 0x1800, 0x20e1, 0x0000, 0x2001, 0x19a1, 0x2003,</div><div class='del'>-	0x0000, 0x080c, 0x1072, 0x05a0, 0x2900, 0x6016, 0x7090, 0x8004,</div><div class='del'>-	0xa816, 0x908a, 0x001e, 0x02d0, 0xa833, 0x001e, 0x20a9, 0x001e,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x001b, 0x20a0, 0x2001, 0x19a1,</div><div class='del'>-	0x0016, 0x200c, 0x0471, 0x001e, 0x81ff, 0x01b8, 0x2940, 0x080c,</div><div class='del'>-	0x1072, 0x01b0, 0x2900, 0xa006, 0x2100, 0x0c18, 0xa832, 0x20a8,</div><div class='del'>-	0xa860, 0x20e8, 0xa85c, 0x9080, 0x001b, 0x20a0, 0x2001, 0x19a1,</div><div class='del'>-	0x0016, 0x200c, 0x00b1, 0x001e, 0x0000, 0x9085, 0x0001, 0x0048,</div><div class='del'>-	0x2071, 0x1800, 0x7093, 0x0000, 0x6014, 0x2048, 0x080c, 0x100b,</div><div class='del'>-	0x9006, 0x012e, 0x01de, 0x01ce, 0x00ee, 0x008e, 0x009e, 0x001e,</div><div class='del'>-	0x0005, 0x0006, 0x0016, 0x0026, 0x0036, 0x00c6, 0x918c, 0xffff,</div><div class='del'>-	0x11b0, 0x080c, 0x21f9, 0x2099, 0x026c, 0x2001, 0x0014, 0x3518,</div><div class='del'>-	0x9312, 0x0108, 0x1218, 0x23a8, 0x4003, 0x0400, 0x20a8, 0x4003,</div><div class='del'>-	0x22a8, 0x8108, 0x080c, 0x21f9, 0x2099, 0x0260, 0x0ca8, 0x080c,</div><div class='del'>-	0x21f9, 0x2061, 0x19a1, 0x6004, 0x2098, 0x6008, 0x3518, 0x9312,</div><div class='del'>-	0x0108, 0x1218, 0x23a8, 0x4003, 0x0048, 0x20a8, 0x4003, 0x22a8,</div><div class='del'>-	0x8108, 0x080c, 0x21f9, 0x2099, 0x0260, 0x0ca8, 0x2061, 0x19a1,</div><div class='del'>-	0x2019, 0x0280, 0x3300, 0x931e, 0x0110, 0x6006, 0x0020, 0x2001,</div><div class='del'>-	0x0260, 0x6006, 0x8108, 0x2162, 0x9292, 0x0021, 0x9296, 0xffff,</div><div class='del'>-	0x620a, 0x00ce, 0x003e, 0x002e, 0x001e, 0x000e, 0x0005, 0x0006,</div><div class='del'>-	0x0016, 0x0026, 0x0036, 0x00c6, 0x81ff, 0x11b8, 0x080c, 0x2211,</div><div class='del'>-	0x20a1, 0x024c, 0x2001, 0x0014, 0x3518, 0x9312, 0x1218, 0x23a8,</div><div class='del'>-	0x4003, 0x0418, 0x20a8, 0x4003, 0x82ff, 0x01f8, 0x22a8, 0x8108,</div><div class='del'>-	0x080c, 0x2211, 0x20a1, 0x0240, 0x0c98, 0x080c, 0x2211, 0x2061,</div><div class='del'>-	0x19a4, 0x6004, 0x20a0, 0x6008, 0x3518, 0x9312, 0x1218, 0x23a8,</div><div class='del'>-	0x4003, 0x0058, 0x20a8, 0x4003, 0x82ff, 0x0138, 0x22a8, 0x8108,</div><div class='del'>-	0x080c, 0x2211, 0x20a1, 0x0240, 0x0c98, 0x2061, 0x19a4, 0x2019,</div><div class='del'>-	0x0260, 0x3400, 0x931e, 0x0110, 0x6006, 0x0020, 0x2001, 0x0240,</div><div class='del'>-	0x6006, 0x8108, 0x2162, 0x9292, 0x0021, 0x9296, 0xffff, 0x620a,</div><div class='del'>-	0x00ce, 0x003e, 0x002e, 0x001e, 0x000e, 0x0005, 0x00b6, 0x0066,</div><div class='del'>-	0x6610, 0x2658, 0xbe04, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0006,</div><div class='del'>-	0x0170, 0x9686, 0x0004, 0x0158, 0xbe04, 0x96b4, 0x00ff, 0x9686,</div><div class='del'>-	0x0006, 0x0128, 0x9686, 0x0004, 0x0110, 0x9085, 0x0001, 0x006e,</div><div class='del'>-	0x00be, 0x0005, 0x00d6, 0x080c, 0xddd4, 0x00de, 0x0005, 0x00d6,</div><div class='del'>-	0x080c, 0xdde1, 0x1520, 0x680c, 0x908c, 0xff00, 0x6820, 0x9084,</div><div class='del'>-	0x00ff, 0x9115, 0x6216, 0x6824, 0x602e, 0xd1e4, 0x0130, 0x9006,</div><div class='del'>-	0x080c, 0xee4e, 0x2009, 0x0001, 0x0078, 0xd1ec, 0x0180, 0x6920,</div><div class='del'>-	0x918c, 0x00ff, 0x6824, 0x080c, 0x268c, 0x1148, 0x2001, 0x0001,</div><div class='del'>-	0x080c, 0xee4e, 0x2110, 0x900e, 0x080c, 0x3364, 0x0018, 0x9085,</div><div class='del'>-	0x0001, 0x0008, 0x9006, 0x00de, 0x0005, 0x00b6, 0x00c6, 0x080c,</div><div class='del'>-	0xb1dd, 0x0598, 0x0016, 0x0026, 0x00c6, 0x2011, 0x0263, 0x2204,</div><div class='del'>-	0x8211, 0x220c, 0x080c, 0x268c, 0x1568, 0x080c, 0x6749, 0x1550,</div><div class='del'>-	0xbe12, 0xbd16, 0x00ce, 0x002e, 0x001e, 0x2b00, 0x6012, 0x080c,</div><div class='del'>-	0xec80, 0x11c8, 0x080c, 0x344c, 0x11b0, 0x080c, 0xdd3e, 0x0500,</div><div class='del'>-	0x2001, 0x0007, 0x080c, 0x66fa, 0x2001, 0x0007, 0x080c, 0x6726,</div><div class='del'>-	0x6017, 0x0000, 0x6023, 0x0001, 0x6007, 0x0001, 0x6003, 0x0001,</div><div class='del'>-	0x080c, 0x961e, 0x0010, 0x080c, 0xb16c, 0x9085, 0x0001, 0x00ce,</div><div class='del'>-	0x00be, 0x0005, 0x080c, 0xb16c, 0x00ce, 0x002e, 0x001e, 0x0ca8,</div><div class='del'>-	0x080c, 0xb16c, 0x9006, 0x0c98, 0x2069, 0x026d, 0x6800, 0x9082,</div><div class='del'>-	0x0010, 0x1228, 0x6017, 0x0000, 0x9085, 0x0001, 0x0008, 0x9006,</div><div class='del'>-	0x0005, 0x6017, 0x0000, 0x2069, 0x026c, 0x6808, 0x9084, 0xff00,</div><div class='del'>-	0x9086, 0x0800, 0x1190, 0x6904, 0x9186, 0x0018, 0x0118, 0x9186,</div><div class='del'>-	0x0014, 0x1158, 0x810f, 0x6800, 0x9084, 0x00ff, 0x910d, 0x6162,</div><div class='del'>-	0x908e, 0x0014, 0x0110, 0x908e, 0x0010, 0x0005, 0x6004, 0x90b2,</div><div class='del'>-	0x0053, 0x1a0c, 0x0d85, 0x91b6, 0x0013, 0x1130, 0x2008, 0x91b2,</div><div class='del'>-	0x0040, 0x1a04, 0xdf36, 0x0402, 0x91b6, 0x0027, 0x0190, 0x9186,</div><div class='del'>-	0x0015, 0x0118, 0x9186, 0x0016, 0x1140, 0x080c, 0xaf61, 0x0120,</div><div class='del'>-	0x9086, 0x0002, 0x0904, 0xbba3, 0x0005, 0x91b6, 0x0014, 0x190c,</div><div class='del'>-	0x0d85, 0x2001, 0x0007, 0x080c, 0x6726, 0x080c, 0x99ed, 0x080c,</div><div class='del'>-	0xb1a7, 0x080c, 0x9ab3, 0x0005, 0xde6c, 0xde6e, 0xde6c, 0xde6c,</div><div class='del'>-	0xde6c, 0xde6e, 0xde7b, 0xdf33, 0xdebd, 0xdf33, 0xdee1, 0xdf33,</div><div class='del'>-	0xde7b, 0xdf33, 0xdf2b, 0xdf33, 0xdf2b, 0xdf33, 0xdf33, 0xde6c,</div><div class='del'>-	0xde6c, 0xde6c, 0xde6c, 0xde6c, 0xde6c, 0xde6c, 0xde6c, 0xde6c,</div><div class='del'>-	0xde6c, 0xde6c, 0xde6e, 0xde6c, 0xdf33, 0xde6c, 0xde6c, 0xdf33,</div><div class='del'>-	0xde6c, 0xdf30, 0xdf33, 0xde6c, 0xde6c, 0xde6c, 0xde6c, 0xdf33,</div><div class='del'>-	0xdf33, 0xde6c, 0xdf33, 0xdf33, 0xde6c, 0xde76, 0xde6c, 0xde6c,</div><div class='del'>-	0xde6c, 0xde6c, 0xdf2f, 0xdf33, 0xde6c, 0xde6c, 0xdf33, 0xdf33,</div><div class='del'>-	0xde6c, 0xde6c, 0xde6c, 0xde6c, 0x080c, 0x0d85, 0x080c, 0xd65d,</div><div class='del'>-	0x6003, 0x0002, 0x080c, 0x9ab3, 0x0804, 0xdf35, 0x9006, 0x080c,</div><div class='del'>-	0x66e6, 0x0804, 0xdf33, 0x080c, 0x6c09, 0x1904, 0xdf33, 0x9006,</div><div class='del'>-	0x080c, 0x66e6, 0x6010, 0x2058, 0xb810, 0x9086, 0x00ff, 0x1140,</div><div class='del'>-	0x00f6, 0x2079, 0x1800, 0x78a8, 0x8000, 0x78aa, 0x00fe, 0x00b8,</div><div class='del'>-	0x6010, 0x2058, 0xb884, 0x9005, 0x0904, 0xdf33, 0x080c, 0x347d,</div><div class='del'>-	0x1904, 0xdf33, 0x2001, 0x1800, 0x2004, 0x9086, 0x0002, 0x1138,</div><div class='del'>-	0x00f6, 0x2079, 0x1800, 0x78a8, 0x8000, 0x78aa, 0x00fe, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0x66fa, 0x6023, 0x0001, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x6110, 0x2158, 0x2009,</div><div class='del'>-	0x0001, 0x080c, 0x89a1, 0x0804, 0xdf35, 0x6610, 0x2658, 0xbe04,</div><div class='del'>-	0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x0148, 0x9686, 0x0004,</div><div class='del'>-	0x0130, 0x080c, 0x9228, 0x2001, 0x0004, 0x080c, 0x6726, 0x080c,</div><div class='del'>-	0xee9d, 0x0904, 0xdf33, 0x2001, 0x0004, 0x080c, 0x66fa, 0x6023,</div><div class='del'>-	0x0001, 0x6003, 0x0001, 0x6007, 0x0003, 0x080c, 0x961e, 0x0804,</div><div class='del'>-	0xdf35, 0x2001, 0x1800, 0x2004, 0x9086, 0x0003, 0x1158, 0x0036,</div><div class='del'>-	0x0046, 0x6010, 0x2058, 0xbba0, 0x2021, 0x0006, 0x080c, 0x4e58,</div><div class='del'>-	0x004e, 0x003e, 0x2001, 0x0006, 0x080c, 0xdf4f, 0x6610, 0x2658,</div><div class='del'>-	0xbe04, 0x0066, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x006e,</div><div class='del'>-	0x0180, 0x2001, 0x0006, 0x080c, 0x6726, 0x9284, 0x00ff, 0x908e,</div><div class='del'>-	0x0007, 0x0118, 0x908e, 0x0004, 0x1120, 0x2001, 0x0006, 0x080c,</div><div class='del'>-	0x66fa, 0x080c, 0x6c09, 0x11f8, 0x2001, 0x1837, 0x2004, 0xd0a4,</div><div class='del'>-	0x01d0, 0xbe04, 0x96b4, 0x00ff, 0x9686, 0x0006, 0x01a0, 0x00f6,</div><div class='del'>-	0x2079, 0x1800, 0x78a8, 0x8000, 0x78aa, 0x00fe, 0x0804, 0xdea7,</div><div class='del'>-	0x2001, 0x0004, 0x0030, 0x2001, 0x0006, 0x0409, 0x0020, 0x0018,</div><div class='del'>-	0x0010, 0x080c, 0x6726, 0x080c, 0xb16c, 0x0005, 0x2600, 0x0002,</div><div class='del'>-	0xdf4a, 0xdf4a, 0xdf4a, 0xdf4a, 0xdf4a, 0xdf4c, 0xdf4a, 0xdf4c,</div><div class='del'>-	0xdf4a, 0xdf4a, 0xdf4c, 0xdf4a, 0xdf4a, 0xdf4a, 0xdf4c, 0xdf4c,</div><div class='del'>-	0xdf4c, 0xdf4c, 0x080c, 0x0d85, 0x080c, 0xb16c, 0x0005, 0x0016,</div><div class='del'>-	0x00b6, 0x00d6, 0x6110, 0x2158, 0xb900, 0xd184, 0x0138, 0x080c,</div><div class='del'>-	0x66fa, 0x9006, 0x080c, 0x66e6, 0x080c, 0x3344, 0x00de, 0x00be,</div><div class='del'>-	0x001e, 0x0005, 0x6610, 0x2658, 0xb804, 0x9084, 0xff00, 0x8007,</div><div class='del'>-	0x90b2, 0x000c, 0x1a0c, 0x0d85, 0x91b6, 0x0015, 0x1110, 0x003b,</div><div class='del'>-	0x0028, 0x91b6, 0x0016, 0x190c, 0x0d85, 0x006b, 0x0005, 0xbc45,</div><div class='del'>-	0xbc45, 0xbc45, 0xbc45, 0xdfe4, 0xbc45, 0xdfce, 0xdf8f, 0xbc45,</div><div class='del'>-	0xbc45, 0xbc45, 0xbc45, 0xbc45, 0xbc45, 0xbc45, 0xbc45, 0xdfe4,</div><div class='del'>-	0xbc45, 0xdfce, 0xdfd5, 0xbc45, 0xbc45, 0xbc45, 0xbc45, 0x00f6,</div><div class='del'>-	0x080c, 0x6c09, 0x11d8, 0x080c, 0xd645, 0x11c0, 0x6010, 0x905d,</div><div class='del'>-	0x01a8, 0xb884, 0x9005, 0x0190, 0x9006, 0x080c, 0x66e6, 0x2001,</div><div class='del'>-	0x0002, 0x080c, 0x66fa, 0x6023, 0x0001, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0002, 0x080c, 0x961e, 0x080c, 0x9ab3, 0x00f0, 0x2011, 0x0263,</div><div class='del'>-	0x2204, 0x8211, 0x220c, 0x080c, 0x268c, 0x11b0, 0x080c, 0x67b4,</div><div class='del'>-	0x0118, 0x080c, 0xb16c, 0x0080, 0xb810, 0x0006, 0xb814, 0x0006,</div><div class='del'>-	0xb884, 0x0006, 0x080c, 0x61b7, 0x000e, 0xb886, 0x000e, 0xb816,</div><div class='del'>-	0x000e, 0xb812, 0x080c, 0xb16c, 0x00fe, 0x0005, 0x6604, 0x96b6,</div><div class='del'>-	0x001e, 0x1110, 0x080c, 0xb16c, 0x0005, 0x080c, 0xc082, 0x1148,</div><div class='del'>-	0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x961e, 0x080c, 0x9ab3,</div><div class='del'>-	0x0010, 0x080c, 0xb16c, 0x0005, 0x0804, 0xb16c, 0x6004, 0x908a,</div><div class='del'>-	0x0053, 0x1a0c, 0x0d85, 0x080c, 0x99ed, 0x080c, 0xb1a7, 0x0005,</div><div class='del'>-	0x9182, 0x0040, 0x0002, 0xe007, 0xe007, 0xe007, 0xe007, 0xe009,</div><div class='del'>-	0xe007, 0xe007, 0xe007, 0xe007, 0xe007, 0xe007, 0xe007, 0xe007,</div><div class='del'>-	0xe007, 0xe007, 0xe007, 0xe007, 0xe007, 0xe007, 0xe007, 0x080c,</div><div class='del'>-	0x0d85, 0x0096, 0x00b6, 0x00d6, 0x00e6, 0x00f6, 0x0046, 0x0026,</div><div class='del'>-	0x6210, 0x2258, 0xb8bc, 0x9005, 0x11b0, 0x6007, 0x0044, 0x2071,</div><div class='del'>-	0x0260, 0x7444, 0x94a4, 0xff00, 0x0904, 0xe070, 0x080c, 0xee42,</div><div class='del'>-	0x1170, 0x9486, 0x2000, 0x1158, 0x2009, 0x0001, 0x2011, 0x0200,</div><div class='del'>-	0x080c, 0x8c44, 0x0020, 0x9026, 0x080c, 0xecc5, 0x0c30, 0x080c,</div><div class='del'>-	0x1059, 0x090c, 0x0d85, 0x6003, 0x0007, 0xa867, 0x010d, 0x9006,</div><div class='del'>-	0xa802, 0xa86a, 0xac8a, 0x2c00, 0xa88e, 0x6008, 0xa8e2, 0x6010,</div><div class='del'>-	0x2058, 0xb8a0, 0x7130, 0xa97a, 0x0016, 0xa876, 0xa87f, 0x0000,</div><div class='del'>-	0xa883, 0x0000, 0xa887, 0x0036, 0x080c, 0x7012, 0x001e, 0x080c,</div><div class='del'>-	0xee42, 0x1904, 0xe0d0, 0x9486, 0x2000, 0x1130, 0x2019, 0x0017,</div><div class='del'>-	0x080c, 0xe9f9, 0x0804, 0xe0d0, 0x9486, 0x0200, 0x1120, 0x080c,</div><div class='del'>-	0xe984, 0x0804, 0xe0d0, 0x9486, 0x0400, 0x0120, 0x9486, 0x1000,</div><div class='del'>-	0x1904, 0xe0d0, 0x2019, 0x0002, 0x080c, 0xe9a3, 0x0804, 0xe0d0,</div><div class='del'>-	0x2069, 0x1a73, 0x6a00, 0xd284, 0x0904, 0xe13a, 0x9284, 0x0300,</div><div class='del'>-	0x1904, 0xe133, 0x6804, 0x9005, 0x0904, 0xe11b, 0x2d78, 0x6003,</div><div class='del'>-	0x0007, 0x080c, 0x1072, 0x0904, 0xe0dc, 0x7800, 0xd08c, 0x1118,</div><div class='del'>-	0x7804, 0x8001, 0x7806, 0x6017, 0x0000, 0x2001, 0x180f, 0x2004,</div><div class='del'>-	0xd084, 0x1904, 0xe13e, 0x9006, 0xa802, 0xa867, 0x0116, 0xa86a,</div><div class='del'>-	0x6008, 0xa8e2, 0x2c00, 0xa87a, 0x6010, 0x2058, 0xb8a0, 0x7130,</div><div class='del'>-	0xa9b6, 0xa876, 0xb928, 0xa9ba, 0xb92c, 0xa9be, 0xb930, 0xa9c2,</div><div class='del'>-	0xb934, 0xa9c6, 0xa883, 0x003d, 0x7044, 0x9084, 0x0003, 0x9080,</div><div class='del'>-	0xe0d8, 0x2005, 0xa87e, 0x20a9, 0x000a, 0x2001, 0x0270, 0xaa5c,</div><div class='del'>-	0x9290, 0x0021, 0x2009, 0x0205, 0x200b, 0x0080, 0x20e1, 0x0000,</div><div class='del'>-	0xab60, 0x23e8, 0x2098, 0x22a0, 0x4003, 0x200b, 0x0000, 0x2001,</div><div class='del'>-	0x027a, 0x200c, 0xa9b2, 0x8000, 0x200c, 0xa9ae, 0x080c, 0x7015,</div><div class='del'>-	0x002e, 0x004e, 0x00fe, 0x00ee, 0x00de, 0x00be, 0x009e, 0x0005,</div><div class='del'>-	0x0000, 0x0080, 0x0040, 0x0000, 0x2001, 0x1810, 0x2004, 0xd084,</div><div class='del'>-	0x0120, 0x080c, 0x1059, 0x1904, 0xe085, 0x6017, 0xf100, 0x6003,</div><div class='del'>-	0x0001, 0x6007, 0x0041, 0x2009, 0xa022, 0x080c, 0x9617, 0x0c00,</div><div class='del'>-	0x2069, 0x0260, 0x6848, 0x9084, 0xff00, 0x9086, 0x1200, 0x1198,</div><div class='del'>-	0x686c, 0x9084, 0x00ff, 0x0016, 0x6114, 0x918c, 0xf700, 0x910d,</div><div class='del'>-	0x6116, 0x001e, 0x6003, 0x0001, 0x6007, 0x0043, 0x2009, 0xa025,</div><div class='del'>-	0x080c, 0x9617, 0x0828, 0x6868, 0x602e, 0x686c, 0x6032, 0x6017,</div><div class='del'>-	0xf200, 0x6003, 0x0001, 0x6007, 0x0041, 0x2009, 0xa022, 0x080c,</div><div class='del'>-	0x9617, 0x0804, 0xe0d0, 0x2001, 0x180e, 0x2004, 0xd0ec, 0x0120,</div><div class='del'>-	0x2011, 0x8049, 0x080c, 0x4ca1, 0x6017, 0xf300, 0x0010, 0x6017,</div><div class='del'>-	0xf100, 0x6003, 0x0001, 0x6007, 0x0041, 0x2009, 0xa022, 0x080c,</div><div class='del'>-	0x9617, 0x0804, 0xe0d0, 0x6017, 0xf500, 0x0c98, 0x6017, 0xf600,</div><div class='del'>-	0x0804, 0xe0f0, 0x6017, 0xf200, 0x0804, 0xe0f0, 0xa867, 0x0146,</div><div class='del'>-	0xa86b, 0x0000, 0x6008, 0xa886, 0x2c00, 0xa87a, 0x7044, 0x9084,</div><div class='del'>-	0x0003, 0x9080, 0xe0d8, 0x2005, 0xa87e, 0x2928, 0x6010, 0x2058,</div><div class='del'>-	0xb8a0, 0xa876, 0xb828, 0xa88a, 0xb82c, 0xa88e, 0xb830, 0xa892,</div><div class='del'>-	0xb834, 0xa896, 0xa883, 0x003d, 0x2009, 0x0205, 0x2104, 0x9085,</div><div class='del'>-	0x0080, 0x200a, 0x20e1, 0x0000, 0x2011, 0x0210, 0x2214, 0x9294,</div><div class='del'>-	0x0fff, 0xaaa2, 0x9282, 0x0111, 0x1a0c, 0x0d85, 0x8210, 0x821c,</div><div class='del'>-	0x2001, 0x026c, 0x2098, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0029,</div><div class='del'>-	0x20a0, 0x2011, 0xe1ba, 0x2041, 0x0001, 0x223d, 0x9784, 0x00ff,</div><div class='del'>-	0x9322, 0x1208, 0x2300, 0x20a8, 0x4003, 0x931a, 0x0530, 0x8210,</div><div class='del'>-	0xd7fc, 0x1130, 0x8d68, 0x2d0a, 0x2001, 0x0260, 0x2098, 0x0c68,</div><div class='del'>-	0x2950, 0x080c, 0x1072, 0x0170, 0x2900, 0xb002, 0xa867, 0x0147,</div><div class='del'>-	0xa86b, 0x0000, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x001b, 0x20a0,</div><div class='del'>-	0x8840, 0x08d8, 0x2548, 0xa800, 0x902d, 0x0118, 0x080c, 0x108b,</div><div class='del'>-	0x0cc8, 0x080c, 0x108b, 0x0804, 0xe0dc, 0x2548, 0x8847, 0x9885,</div><div class='del'>-	0x0046, 0xa866, 0x2009, 0x0205, 0x200b, 0x0000, 0x080c, 0xea30,</div><div class='del'>-	0x0804, 0xe0d0, 0x8010, 0x0004, 0x801a, 0x0006, 0x8018, 0x0008,</div><div class='del'>-	0x8016, 0x000a, 0x8014, 0x9186, 0x0013, 0x1160, 0x6004, 0x908a,</div><div class='del'>-	0x0057, 0x1a0c, 0x0d85, 0x9082, 0x0040, 0x0a0c, 0x0d85, 0x2008,</div><div class='del'>-	0x0804, 0xe246, 0x9186, 0x0051, 0x0108, 0x0040, 0x080c, 0xaf61,</div><div class='del'>-	0x01e8, 0x9086, 0x0002, 0x0904, 0xe28e, 0x00c0, 0x9186, 0x0027,</div><div class='del'>-	0x0180, 0x9186, 0x0048, 0x0128, 0x9186, 0x0014, 0x0150, 0x190c,</div><div class='del'>-	0x0d85, 0x080c, 0xaf61, 0x0150, 0x9086, 0x0004, 0x0904, 0xe32d,</div><div class='del'>-	0x0028, 0x6004, 0x9082, 0x0040, 0x2008, 0x001a, 0x080c, 0xb227,</div><div class='del'>-	0x0005, 0xe20d, 0xe20f, 0xe20f, 0xe236, 0xe20d, 0xe20d, 0xe20d,</div><div class='del'>-	0xe20d, 0xe20d, 0xe20d, 0xe20d, 0xe20d, 0xe20d, 0xe20d, 0xe20d,</div><div class='del'>-	0xe20d, 0xe20d, 0xe20d, 0xe20d, 0xe20d, 0x080c, 0x0d85, 0x080c,</div><div class='del'>-	0x99ed, 0x080c, 0x9ab3, 0x0036, 0x0096, 0x6014, 0x904d, 0x01d8,</div><div class='del'>-	0x080c, 0xcf1b, 0x01c0, 0x6003, 0x0002, 0x6010, 0x00b6, 0x2058,</div><div class='del'>-	0xb800, 0x00be, 0xd0bc, 0x1178, 0x2019, 0x0004, 0x080c, 0xea30,</div><div class='del'>-	0x6017, 0x0000, 0x6018, 0x9005, 0x1120, 0x2001, 0x1987, 0x2004,</div><div class='del'>-	0x601a, 0x6003, 0x0007, 0x009e, 0x003e, 0x0005, 0x0096, 0x080c,</div><div class='del'>-	0x99ed, 0x080c, 0x9ab3, 0x080c, 0xcf1b, 0x0120, 0x6014, 0x2048,</div><div class='del'>-	0x080c, 0x108b, 0x080c, 0xb1a7, 0x009e, 0x0005, 0x0002, 0xe25b,</div><div class='del'>-	0xe270, 0xe25d, 0xe285, 0xe25b, 0xe25b, 0xe25b, 0xe25b, 0xe25b,</div><div class='del'>-	0xe25b, 0xe25b, 0xe25b, 0xe25b, 0xe25b, 0xe25b, 0xe25b, 0xe25b,</div><div class='del'>-	0xe25b, 0xe25b, 0xe25b, 0x080c, 0x0d85, 0x0096, 0x6014, 0x2048,</div><div class='del'>-	0xa87c, 0xd0b4, 0x0138, 0x6003, 0x0007, 0x2009, 0x0043, 0x080c,</div><div class='del'>-	0xb20a, 0x0010, 0x6003, 0x0004, 0x080c, 0x9ab3, 0x009e, 0x0005,</div><div class='del'>-	0x080c, 0xcf1b, 0x0138, 0x6114, 0x0096, 0x2148, 0xa97c, 0x009e,</div><div class='del'>-	0xd1ec, 0x1138, 0x080c, 0x8c19, 0x080c, 0xb16c, 0x080c, 0x9ab3,</div><div class='del'>-	0x0005, 0x080c, 0xec89, 0x0db0, 0x0cc8, 0x6003, 0x0001, 0x6007,</div><div class='del'>-	0x0041, 0x2009, 0xa022, 0x080c, 0x9617, 0x0005, 0x9182, 0x0040,</div><div class='del'>-	0x0002, 0xe2a5, 0xe2a7, 0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5,</div><div class='del'>-	0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5, 0xe2a5,</div><div class='del'>-	0xe2a5, 0xe2a5, 0xe2a8, 0xe2a5, 0xe2a5, 0x080c, 0x0d85, 0x0005,</div><div class='del'>-	0x00d6, 0x080c, 0x8c19, 0x00de, 0x080c, 0xece1, 0x080c, 0xb16c,</div><div class='del'>-	0x0005, 0x9182, 0x0040, 0x0002, 0xe2c8, 0xe2c8, 0xe2c8, 0xe2c8,</div><div class='del'>-	0xe2c8, 0xe2c8, 0xe2c8, 0xe2c8, 0xe2c8, 0xe2ca, 0xe2f5, 0xe2c8,</div><div class='del'>-	0xe2c8, 0xe2c8, 0xe2c8, 0xe2f5, 0xe2c8, 0xe2c8, 0xe2c8, 0xe2c8,</div><div class='del'>-	0x080c, 0x0d85, 0x6014, 0x0096, 0x2048, 0xa87c, 0xd0fc, 0x0168,</div><div class='del'>-	0x908c, 0x0003, 0x918e, 0x0002, 0x0180, 0x6144, 0xd1e4, 0x1168,</div><div class='del'>-	0x2009, 0x0041, 0x009e, 0x0804, 0xe3b5, 0x6003, 0x0007, 0x601b,</div><div class='del'>-	0x0000, 0x080c, 0x8c19, 0x009e, 0x0005, 0x6014, 0x2048, 0xa97c,</div><div class='del'>-	0xd1ec, 0x1130, 0x080c, 0x8c19, 0x080c, 0xb16c, 0x009e, 0x0005,</div><div class='del'>-	0x080c, 0xec89, 0x0db8, 0x009e, 0x0005, 0x2001, 0x180c, 0x200c,</div><div class='del'>-	0xc1d4, 0x2102, 0x0036, 0x080c, 0x9a48, 0x080c, 0x9ab3, 0x6014,</div><div class='del'>-	0x0096, 0x2048, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,</div><div class='del'>-	0x0188, 0xa87c, 0x9084, 0x0003, 0x9086, 0x0002, 0x0140, 0xa8ac,</div><div class='del'>-	0x6330, 0x931a, 0x6332, 0xa8b0, 0x632c, 0x931b, 0x632e, 0x6003,</div><div class='del'>-	0x0002, 0x0080, 0x2019, 0x0004, 0x080c, 0xea30, 0x6018, 0x9005,</div><div class='del'>-	0x1128, 0x2001, 0x1987, 0x2004, 0x8003, 0x601a, 0x6017, 0x0000,</div><div class='del'>-	0x6003, 0x0007, 0x009e, 0x003e, 0x0005, 0x9182, 0x0040, 0x0002,</div><div class='del'>-	0xe344, 0xe344, 0xe344, 0xe344, 0xe344, 0xe344, 0xe344, 0xe344,</div><div class='del'>-	0xe346, 0xe344, 0xe344, 0xe344, 0xe344, 0xe344, 0xe344, 0xe344,</div><div class='del'>-	0xe344, 0xe344, 0xe344, 0xe391, 0x080c, 0x0d85, 0x6014, 0x0096,</div><div class='del'>-	0x2048, 0xa834, 0xaa38, 0x6110, 0x00b6, 0x2158, 0xb900, 0x00be,</div><div class='del'>-	0xd1bc, 0x1190, 0x920d, 0x1518, 0xa87c, 0xd0fc, 0x0128, 0x2009,</div><div class='del'>-	0x0041, 0x009e, 0x0804, 0xe3b5, 0x6003, 0x0007, 0x601b, 0x0000,</div><div class='del'>-	0x080c, 0x8c19, 0x009e, 0x0005, 0x6124, 0xd1f4, 0x1d58, 0x0006,</div><div class='del'>-	0x0046, 0xacac, 0x9422, 0xa9b0, 0x2200, 0x910b, 0x6030, 0x9420,</div><div class='del'>-	0x6432, 0x602c, 0x9109, 0x612e, 0x004e, 0x000e, 0x08d8, 0x6110,</div><div class='del'>-	0x00b6, 0x2158, 0xb900, 0x00be, 0xd1bc, 0x1178, 0x2009, 0x180e,</div><div class='del'>-	0x210c, 0xd19c, 0x0118, 0x6003, 0x0007, 0x0010, 0x6003, 0x0006,</div><div class='del'>-	0x00e9, 0x080c, 0x8c1b, 0x009e, 0x0005, 0x6003, 0x0002, 0x009e,</div><div class='del'>-	0x0005, 0x6024, 0xd0f4, 0x0128, 0x080c, 0x16b0, 0x1904, 0xe346,</div><div class='del'>-	0x0005, 0x6014, 0x0096, 0x2048, 0xa834, 0xa938, 0x009e, 0x9105,</div><div class='del'>-	0x1120, 0x080c, 0x16b0, 0x1904, 0xe346, 0x0005, 0xd2fc, 0x0140,</div><div class='del'>-	0x8002, 0x8000, 0x8212, 0x9291, 0x0000, 0x2009, 0x0009, 0x0010,</div><div class='del'>-	0x2009, 0x0015, 0xaa9a, 0xa896, 0x0005, 0x9182, 0x0040, 0x0208,</div><div class='del'>-	0x0062, 0x9186, 0x0013, 0x0120, 0x9186, 0x0014, 0x190c, 0x0d85,</div><div class='del'>-	0x6024, 0xd0dc, 0x090c, 0x0d85, 0x0005, 0xe3d9, 0xe3e5, 0xe3f1,</div><div class='del'>-	0xe3fd, 0xe3d9, 0xe3d9, 0xe3d9, 0xe3d9, 0xe3e0, 0xe3db, 0xe3db,</div><div class='del'>-	0xe3d9, 0xe3d9, 0xe3d9, 0xe3d9, 0xe3db, 0xe3d9, 0xe3db, 0xe3d9,</div><div class='del'>-	0xe3e0, 0x080c, 0x0d85, 0x6024, 0xd0dc, 0x090c, 0x0d85, 0x0005,</div><div class='del'>-	0x6014, 0x9005, 0x190c, 0x0d85, 0x0005, 0x6003, 0x0001, 0x6106,</div><div class='del'>-	0x0126, 0x2091, 0x8000, 0x2009, 0xa022, 0x080c, 0x95f9, 0x012e,</div><div class='del'>-	0x0005, 0x6003, 0x0004, 0x6106, 0x0126, 0x2091, 0x8000, 0x2009,</div><div class='del'>-	0xa001, 0x080c, 0x9617, 0x012e, 0x0005, 0x6003, 0x0003, 0x6106,</div><div class='del'>-	0x6047, 0x0000, 0x080c, 0x1c6f, 0x0126, 0x2091, 0x8000, 0x6014,</div><div class='del'>-	0x0096, 0x2048, 0xa87c, 0xd0fc, 0x0188, 0x9084, 0x0003, 0x9086,</div><div class='del'>-	0x0002, 0x01a0, 0x6024, 0xd0cc, 0x1148, 0xd0c4, 0x1138, 0xa8a8,</div><div class='del'>-	0x9005, 0x1120, 0x6144, 0x918d, 0xb035, 0x0018, 0x6144, 0x918d,</div><div class='del'>-	0xa035, 0x009e, 0x080c, 0x965e, 0x012e, 0x0005, 0x6144, 0x918d,</div><div class='del'>-	0xa032, 0x0cb8, 0x0126, 0x2091, 0x8000, 0x0036, 0x0096, 0x9182,</div><div class='del'>-	0x0040, 0x0023, 0x009e, 0x003e, 0x012e, 0x0005, 0xe44a, 0xe44c,</div><div class='del'>-	0xe461, 0xe47b, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a,</div><div class='del'>-	0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a, 0xe44a,</div><div class='del'>-	0xe44a, 0xe44a, 0x080c, 0x0d85, 0x6014, 0x2048, 0xa87c, 0xd0fc,</div><div class='del'>-	0x0510, 0x909c, 0x0003, 0x939e, 0x0003, 0x01e8, 0x6003, 0x0001,</div><div class='del'>-	0x6106, 0x0126, 0x2091, 0x8000, 0x2009, 0xa022, 0x080c, 0x9617,</div><div class='del'>-	0x0480, 0x6014, 0x2048, 0xa87c, 0xd0fc, 0x0168, 0x909c, 0x0003,</div><div class='del'>-	0x939e, 0x0003, 0x0140, 0x6003, 0x0001, 0x6106, 0x2009, 0xa001,</div><div class='del'>-	0x080c, 0x9617, 0x00f0, 0x901e, 0x6316, 0x631a, 0x2019, 0x0004,</div><div class='del'>-	0x080c, 0xea30, 0x00b0, 0x6014, 0x2048, 0xa87c, 0xd0fc, 0x0d98,</div><div class='del'>-	0x909c, 0x0003, 0x939e, 0x0003, 0x0d70, 0x6003, 0x0003, 0x6106,</div><div class='del'>-	0x6047, 0x0000, 0x080c, 0x1c6f, 0x6144, 0x918d, 0xa035, 0x080c,</div><div class='del'>-	0x965e, 0x0005, 0x080c, 0x99ed, 0x6114, 0x81ff, 0x0158, 0x0096,</div><div class='del'>-	0x2148, 0x080c, 0xeddf, 0x0036, 0x2019, 0x0029, 0x080c, 0xea30,</div><div class='del'>-	0x003e, 0x009e, 0x080c, 0xb1a7, 0x080c, 0x9ab3, 0x0005, 0x080c,</div><div class='del'>-	0x9a48, 0x6114, 0x81ff, 0x0158, 0x0096, 0x2148, 0x080c, 0xeddf,</div><div class='del'>-	0x0036, 0x2019, 0x0029, 0x080c, 0xea30, 0x003e, 0x009e, 0x080c,</div><div class='del'>-	0xb1a7, 0x0005, 0x9182, 0x0085, 0x0002, 0xe4cc, 0xe4ca, 0xe4ca,</div><div class='del'>-	0xe4d8, 0xe4ca, 0xe4ca, 0xe4ca, 0xe4ca, 0xe4ca, 0xe4ca, 0xe4ca,</div><div class='del'>-	0xe4ca, 0xe4ca, 0x080c, 0x0d85, 0x6003, 0x000b, 0x6106, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2009, 0x8020, 0x080c, 0x9617, 0x012e, 0x0005,</div><div class='del'>-	0x0026, 0x00e6, 0x080c, 0xec80, 0x0118, 0x080c, 0xb16c, 0x0440,</div><div class='del'>-	0x2071, 0x0260, 0x7224, 0x6216, 0x2001, 0x180e, 0x2004, 0xd0e4,</div><div class='del'>-	0x0150, 0x6010, 0x00b6, 0x2058, 0xbca0, 0x00be, 0x2c00, 0x2011,</div><div class='del'>-	0x014e, 0x080c, 0xb495, 0x7220, 0x080c, 0xe875, 0x0118, 0x6007,</div><div class='del'>-	0x0086, 0x0040, 0x6007, 0x0087, 0x7224, 0x9296, 0xffff, 0x1110,</div><div class='del'>-	0x6007, 0x0086, 0x6003, 0x0001, 0x2009, 0x8020, 0x080c, 0x9617,</div><div class='del'>-	0x00ee, 0x002e, 0x0005, 0x9186, 0x0013, 0x1160, 0x6004, 0x908a,</div><div class='del'>-	0x0085, 0x0a0c, 0x0d85, 0x908a, 0x0092, 0x1a0c, 0x0d85, 0x9082,</div><div class='del'>-	0x0085, 0x00a2, 0x9186, 0x0027, 0x0130, 0x9186, 0x0014, 0x0118,</div><div class='del'>-	0x080c, 0xb227, 0x0050, 0x2001, 0x0007, 0x080c, 0x6726, 0x080c,</div><div class='del'>-	0x99ed, 0x080c, 0xb1a7, 0x080c, 0x9ab3, 0x0005, 0xe53b, 0xe53d,</div><div class='del'>-	0xe53d, 0xe53b, 0xe53b, 0xe53b, 0xe53b, 0xe53b, 0xe53b, 0xe53b,</div><div class='del'>-	0xe53b, 0xe53b, 0xe53b, 0x080c, 0x0d85, 0x080c, 0xb1a7, 0x080c,</div><div class='del'>-	0x9ab3, 0x0005, 0x9182, 0x0085, 0x0a0c, 0x0d85, 0x9182, 0x0092,</div><div class='del'>-	0x1a0c, 0x0d85, 0x9182, 0x0085, 0x0002, 0xe55a, 0xe55a, 0xe55a,</div><div class='del'>-	0xe55c, 0xe55a, 0xe55a, 0xe55a, 0xe55a, 0xe55a, 0xe55a, 0xe55a,</div><div class='del'>-	0xe55a, 0xe55a, 0x080c, 0x0d85, 0x0005, 0x9186, 0x0013, 0x0148,</div><div class='del'>-	0x9186, 0x0014, 0x0130, 0x9186, 0x0027, 0x0118, 0x080c, 0xb227,</div><div class='del'>-	0x0020, 0x080c, 0x99ed, 0x080c, 0xb1a7, 0x0005, 0x0036, 0x080c,</div><div class='del'>-	0xece1, 0x604b, 0x0000, 0x2019, 0x000b, 0x0011, 0x003e, 0x0005,</div><div class='del'>-	0x6010, 0x0006, 0x0059, 0x000e, 0x6012, 0x6023, 0x0006, 0x6003,</div><div class='del'>-	0x0007, 0x601b, 0x0000, 0x604b, 0x0000, 0x0005, 0x0126, 0x0036,</div><div class='del'>-	0x2091, 0x8000, 0x080c, 0xacfc, 0x0106, 0x0086, 0x2c40, 0x0096,</div><div class='del'>-	0x904e, 0x080c, 0xa667, 0x009e, 0x008e, 0x1558, 0x0076, 0x2c38,</div><div class='del'>-	0x080c, 0xa712, 0x007e, 0x1528, 0x6000, 0x9086, 0x0000, 0x0508,</div><div class='del'>-	0x6020, 0x9086, 0x0007, 0x01e8, 0x0096, 0x601c, 0xd084, 0x0140,</div><div class='del'>-	0x080c, 0xece1, 0x080c, 0xd65d, 0x080c, 0x1ad3, 0x6023, 0x0007,</div><div class='del'>-	0x6014, 0x2048, 0x080c, 0xcf1b, 0x0110, 0x080c, 0xea30, 0x009e,</div><div class='del'>-	0x9006, 0x6046, 0x6016, 0x080c, 0xece1, 0x6023, 0x0007, 0x080c,</div><div class='del'>-	0xd65d, 0x010e, 0x090c, 0xad18, 0x003e, 0x012e, 0x0005, 0x00f6,</div><div class='del'>-	0x00c6, 0x00b6, 0x0036, 0x0156, 0x2079, 0x0260, 0x7938, 0x783c,</div><div class='del'>-	0x080c, 0x268c, 0x1904, 0xe621, 0x0016, 0x00c6, 0x080c, 0x67b4,</div><div class='del'>-	0x1904, 0xe61f, 0x001e, 0x00c6, 0x080c, 0xd645, 0x1130, 0xb884,</div><div class='del'>-	0x9005, 0x0118, 0x080c, 0x347d, 0x0148, 0x2b10, 0x2160, 0x6010,</div><div class='del'>-	0x0006, 0x6212, 0x080c, 0xd64c, 0x000e, 0x6012, 0x00ce, 0x002e,</div><div class='del'>-	0x0026, 0x0016, 0x080c, 0xacfc, 0x2019, 0x0029, 0x080c, 0xa7e2,</div><div class='del'>-	0x080c, 0x97b0, 0x0076, 0x903e, 0x080c, 0x966d, 0x007e, 0x001e,</div><div class='del'>-	0x0076, 0x903e, 0x080c, 0xe75d, 0x007e, 0x080c, 0xad18, 0x0026,</div><div class='del'>-	0xba04, 0x9294, 0xff00, 0x8217, 0x9286, 0x0006, 0x0118, 0x9286,</div><div class='del'>-	0x0004, 0x1118, 0xbaa0, 0x080c, 0x33e0, 0x002e, 0xbc84, 0x001e,</div><div class='del'>-	0x080c, 0x61b7, 0xbe12, 0xbd16, 0xbc86, 0x9006, 0x0010, 0x00ce,</div><div class='del'>-	0x001e, 0x015e, 0x003e, 0x00be, 0x00ce, 0x00fe, 0x0005, 0x00c6,</div><div class='del'>-	0x00d6, 0x00b6, 0x0016, 0x2009, 0x1824, 0x2104, 0x9086, 0x0074,</div><div class='del'>-	0x1904, 0xe680, 0x2069, 0x0260, 0x6944, 0x9182, 0x0100, 0x06e0,</div><div class='del'>-	0x6940, 0x9184, 0x8000, 0x0904, 0xe67d, 0x2001, 0x197c, 0x2004,</div><div class='del'>-	0x9005, 0x1140, 0x6010, 0x2058, 0xb884, 0x9005, 0x0118, 0x9184,</div><div class='del'>-	0x0800, 0x0598, 0x6948, 0x918a, 0x0001, 0x0648, 0x080c, 0xee47,</div><div class='del'>-	0x0118, 0x6978, 0xd1fc, 0x11b8, 0x2009, 0x0205, 0x200b, 0x0001,</div><div class='del'>-	0x693c, 0x81ff, 0x1198, 0x6944, 0x9182, 0x0100, 0x02a8, 0x6940,</div><div class='del'>-	0x81ff, 0x1178, 0x6948, 0x918a, 0x0001, 0x0288, 0x6950, 0x918a,</div><div class='del'>-	0x0001, 0x0298, 0x00d0, 0x6017, 0x0100, 0x00a0, 0x6017, 0x0300,</div><div class='del'>-	0x0088, 0x6017, 0x0500, 0x0070, 0x6017, 0x0700, 0x0058, 0x6017,</div><div class='del'>-	0x0900, 0x0040, 0x6017, 0x0b00, 0x0028, 0x6017, 0x0f00, 0x0010,</div><div class='del'>-	0x6017, 0x2d00, 0x9085, 0x0001, 0x0008, 0x9006, 0x001e, 0x00be,</div><div class='del'>-	0x00de, 0x00ce, 0x0005, 0x00c6, 0x00b6, 0x0026, 0x0036, 0x0156,</div><div class='del'>-	0x6210, 0x2258, 0xbb04, 0x9394, 0x00ff, 0x9286, 0x0006, 0x0180,</div><div class='del'>-	0x9286, 0x0004, 0x0168, 0x9394, 0xff00, 0x8217, 0x9286, 0x0006,</div><div class='del'>-	0x0138, 0x9286, 0x0004, 0x0120, 0x080c, 0x67c3, 0x0804, 0xe6ec,</div><div class='del'>-	0x2011, 0x0276, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x000a,</div><div class='del'>-	0x080c, 0xc222, 0x009e, 0x15c8, 0x2011, 0x027a, 0x20a9, 0x0004,</div><div class='del'>-	0x0096, 0x2b48, 0x2019, 0x0006, 0x080c, 0xc222, 0x009e, 0x1568,</div><div class='del'>-	0x0046, 0x0016, 0xbaa0, 0x2220, 0x9006, 0x2009, 0x1848, 0x210c,</div><div class='del'>-	0xd1a4, 0x0138, 0x2009, 0x0029, 0x080c, 0xea8d, 0xb800, 0xc0e5,</div><div class='del'>-	0xb802, 0x080c, 0xacfc, 0x2019, 0x0029, 0x080c, 0x97b0, 0x0076,</div><div class='del'>-	0x2039, 0x0000, 0x080c, 0x966d, 0x2c08, 0x080c, 0xe75d, 0x007e,</div><div class='del'>-	0x080c, 0xad18, 0x2001, 0x0007, 0x080c, 0x6726, 0x2001, 0x0007,</div><div class='del'>-	0x080c, 0x66fa, 0x001e, 0x004e, 0x9006, 0x015e, 0x003e, 0x002e,</div><div class='del'>-	0x00be, 0x00ce, 0x0005, 0x00d6, 0x2069, 0x026e, 0x6800, 0x9086,</div><div class='del'>-	0x0800, 0x0118, 0x6017, 0x0000, 0x0008, 0x9006, 0x00de, 0x0005,</div><div class='del'>-	0x00b6, 0x00f6, 0x0016, 0x0026, 0x0036, 0x0156, 0x2079, 0x026c,</div><div class='del'>-	0x7930, 0x7834, 0x080c, 0x268c, 0x11d0, 0x080c, 0x67b4, 0x11b8,</div><div class='del'>-	0x2011, 0x0270, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x000a,</div><div class='del'>-	0x080c, 0xc222, 0x009e, 0x1158, 0x2011, 0x0274, 0x20a9, 0x0004,</div><div class='del'>-	0x0096, 0x2b48, 0x2019, 0x0006, 0x080c, 0xc222, 0x009e, 0x015e,</div><div class='del'>-	0x003e, 0x002e, 0x001e, 0x00fe, 0x00be, 0x0005, 0x00b6, 0x0006,</div><div class='del'>-	0x0016, 0x0026, 0x0036, 0x0156, 0x2011, 0x0263, 0x2204, 0x8211,</div><div class='del'>-	0x220c, 0x080c, 0x268c, 0x11d0, 0x080c, 0x67b4, 0x11b8, 0x2011,</div><div class='del'>-	0x0276, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x000a, 0x080c,</div><div class='del'>-	0xc222, 0x009e, 0x1158, 0x2011, 0x027a, 0x20a9, 0x0004, 0x0096,</div><div class='del'>-	0x2b48, 0x2019, 0x0006, 0x080c, 0xc222, 0x009e, 0x015e, 0x003e,</div><div class='del'>-	0x002e, 0x001e, 0x000e, 0x00be, 0x0005, 0x00e6, 0x00c6, 0x0086,</div><div class='del'>-	0x0076, 0x0066, 0x0056, 0x0046, 0x0026, 0x0126, 0x2091, 0x8000,</div><div class='del'>-	0x080c, 0xad5a, 0x0106, 0x190c, 0xacfc, 0x2740, 0x2029, 0x19f4,</div><div class='del'>-	0x252c, 0x2021, 0x19fb, 0x2424, 0x2061, 0x1ddc, 0x2071, 0x1800,</div><div class='del'>-	0x7654, 0x7074, 0x81ff, 0x0150, 0x0006, 0x9186, 0x1b39, 0x000e,</div><div class='del'>-	0x0128, 0x8001, 0x9602, 0x1a04, 0xe803, 0x0018, 0x9606, 0x0904,</div><div class='del'>-	0xe803, 0x080c, 0x8eee, 0x0904, 0xe7fa, 0x2100, 0x9c06, 0x0904,</div><div class='del'>-	0xe7fa, 0x6720, 0x9786, 0x0007, 0x0904, 0xe7fa, 0x080c, 0xeace,</div><div class='del'>-	0x1904, 0xe7fa, 0x080c, 0xee65, 0x0904, 0xe7fa, 0x080c, 0xeabe,</div><div class='del'>-	0x0904, 0xe7fa, 0x6720, 0x9786, 0x0001, 0x1148, 0x080c, 0x347d,</div><div class='del'>-	0x0904, 0xe845, 0x6004, 0x9086, 0x0000, 0x1904, 0xe845, 0x9786,</div><div class='del'>-	0x0004, 0x0904, 0xe845, 0x2500, 0x9c06, 0x0904, 0xe7fa, 0x2400,</div><div class='del'>-	0x9c06, 0x0904, 0xe7fa, 0x88ff, 0x0118, 0x605c, 0x9906, 0x15d0,</div><div class='del'>-	0x0096, 0x6043, 0xffff, 0x6000, 0x9086, 0x0004, 0x1120, 0x0016,</div><div class='del'>-	0x080c, 0x1ad3, 0x001e, 0x9786, 0x000a, 0x0148, 0x080c, 0xd132,</div><div class='del'>-	0x1130, 0x080c, 0xbb5c, 0x009e, 0x080c, 0xb1a7, 0x0418, 0x6014,</div><div class='del'>-	0x2048, 0x080c, 0xcf1b, 0x01d8, 0x9786, 0x0003, 0x1588, 0xa867,</div><div class='del'>-	0x0103, 0xa87c, 0xd0cc, 0x0130, 0x0096, 0xa878, 0x2048, 0x080c,</div><div class='del'>-	0x100b, 0x009e, 0xab7a, 0xa877, 0x0000, 0x080c, 0xeddf, 0x0016,</div><div class='del'>-	0x080c, 0xd220, 0x080c, 0x7006, 0x001e, 0x080c, 0xd10c, 0x009e,</div><div class='del'>-	0x080c, 0xb1a7, 0x9ce0, 0x001c, 0x2001, 0x181a, 0x2004, 0x9c02,</div><div class='del'>-	0x1210, 0x0804, 0xe776, 0x010e, 0x190c, 0xad18, 0x012e, 0x002e,</div><div class='del'>-	0x004e, 0x005e, 0x006e, 0x007e, 0x008e, 0x00ce, 0x00ee, 0x0005,</div><div class='del'>-	0x9786, 0x0006, 0x1150, 0x9386, 0x0005, 0x0128, 0x080c, 0xeddf,</div><div class='del'>-	0x080c, 0xea30, 0x08e0, 0x009e, 0x08e8, 0x9786, 0x0009, 0x11f8,</div><div class='del'>-	0x6000, 0x9086, 0x0004, 0x01c0, 0x6000, 0x9086, 0x0003, 0x11a0,</div><div class='del'>-	0x080c, 0x9a48, 0x0096, 0x6114, 0x2148, 0x080c, 0xcf1b, 0x0118,</div><div class='del'>-	0x6010, 0x080c, 0x7012, 0x009e, 0x00c6, 0x080c, 0xb16c, 0x00ce,</div><div class='del'>-	0x0036, 0x080c, 0x9ab3, 0x003e, 0x009e, 0x0804, 0xe7fa, 0x9786,</div><div class='del'>-	0x000a, 0x0904, 0xe7ea, 0x0804, 0xe7df, 0x81ff, 0x0904, 0xe7fa,</div><div class='del'>-	0x9180, 0x0001, 0x2004, 0x9086, 0x0018, 0x0138, 0x9180, 0x0001,</div><div class='del'>-	0x2004, 0x9086, 0x002d, 0x1904, 0xe7fa, 0x6000, 0x9086, 0x0002,</div><div class='del'>-	0x1904, 0xe7fa, 0x080c, 0xd121, 0x0138, 0x080c, 0xd132, 0x1904,</div><div class='del'>-	0xe7fa, 0x080c, 0xbb5c, 0x0038, 0x080c, 0x3344, 0x080c, 0xd132,</div><div class='del'>-	0x1110, 0x080c, 0xbb5c, 0x080c, 0xb1a7, 0x0804, 0xe7fa, 0xa864,</div><div class='del'>-	0x9084, 0x00ff, 0x9086, 0x0039, 0x0005, 0x00c6, 0x00e6, 0x0016,</div><div class='del'>-	0x2c08, 0x2170, 0x9006, 0x080c, 0xea57, 0x001e, 0x0120, 0x6020,</div><div class='del'>-	0x9084, 0x000f, 0x001b, 0x00ee, 0x00ce, 0x0005, 0xe894, 0xe894,</div><div class='del'>-	0xe894, 0xe894, 0xe894, 0xe894, 0xe896, 0xe894, 0xe894, 0xe894,</div><div class='del'>-	0xe8bf, 0xb1a7, 0xb1a7, 0xe894, 0x9006, 0x0005, 0x0036, 0x0046,</div><div class='del'>-	0x0016, 0x7010, 0x00b6, 0x2058, 0xbca0, 0x00be, 0x2c00, 0x2009,</div><div class='del'>-	0x0020, 0x080c, 0xea8d, 0x001e, 0x004e, 0x2019, 0x0002, 0x080c,</div><div class='del'>-	0xe586, 0x003e, 0x9085, 0x0001, 0x0005, 0x0096, 0x080c, 0xcf1b,</div><div class='del'>-	0x0140, 0x6014, 0x904d, 0x080c, 0xcae9, 0x687b, 0x0005, 0x080c,</div><div class='del'>-	0x7012, 0x009e, 0x080c, 0xb1a7, 0x9085, 0x0001, 0x0005, 0x0019,</div><div class='del'>-	0x9085, 0x0001, 0x0005, 0x6000, 0x908a, 0x0010, 0x1a0c, 0x0d85,</div><div class='del'>-	0x000b, 0x0005, 0xe8da, 0xe8da, 0xe8f1, 0xe8e1, 0xe900, 0xe8da,</div><div class='del'>-	0xe8da, 0xe8dc, 0xe8da, 0xe8da, 0xe8da, 0xe8da, 0xe8da, 0xe8da,</div><div class='del'>-	0xe8da, 0xe8da, 0x080c, 0x0d85, 0x080c, 0xb1a7, 0x9085, 0x0001,</div><div class='del'>-	0x0005, 0x0036, 0x00e6, 0x2071, 0x19e8, 0x704c, 0x9c06, 0x1128,</div><div class='del'>-	0x2019, 0x0001, 0x080c, 0xa596, 0x0010, 0x080c, 0xa7a1, 0x00ee,</div><div class='del'>-	0x003e, 0x0096, 0x00d6, 0x6014, 0x2048, 0xa87b, 0x0005, 0x080c,</div><div class='del'>-	0x7012, 0x080c, 0xb1a7, 0x00de, 0x009e, 0x9085, 0x0001, 0x0005,</div><div class='del'>-	0x601c, 0xd084, 0x190c, 0x1ad3, 0x0c60, 0x2001, 0x0001, 0x080c,</div><div class='del'>-	0x66e6, 0x0156, 0x0016, 0x0026, 0x0036, 0x20a9, 0x0004, 0x2019,</div><div class='del'>-	0x1805, 0x2011, 0x0276, 0x080c, 0xc20e, 0x003e, 0x002e, 0x001e,</div><div class='del'>-	0x015e, 0x9005, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0086, 0x0076,</div><div class='del'>-	0x0066, 0x00b6, 0x0126, 0x2091, 0x8000, 0x2740, 0x2061, 0x1ddc,</div><div class='del'>-	0x2079, 0x0001, 0x8fff, 0x0904, 0xe977, 0x2071, 0x1800, 0x7654,</div><div class='del'>-	0x7074, 0x8001, 0x9602, 0x1a04, 0xe977, 0x88ff, 0x0120, 0x2800,</div><div class='del'>-	0x9c06, 0x15a0, 0x2078, 0x080c, 0xeabe, 0x0580, 0x2400, 0x9c06,</div><div class='del'>-	0x0568, 0x6720, 0x9786, 0x0006, 0x1548, 0x9786, 0x0007, 0x0530,</div><div class='del'>-	0x88ff, 0x1150, 0xd58c, 0x1118, 0x6010, 0x9b06, 0x11f8, 0xd584,</div><div class='del'>-	0x0118, 0x605c, 0x9106, 0x11d0, 0x0096, 0x601c, 0xd084, 0x0140,</div><div class='del'>-	0x080c, 0xece1, 0x080c, 0xd65d, 0x080c, 0x1ad3, 0x6023, 0x0007,</div><div class='del'>-	0x6014, 0x2048, 0x080c, 0xcf1b, 0x0120, 0x0046, 0x080c, 0xea30,</div><div class='del'>-	0x004e, 0x009e, 0x080c, 0xb1a7, 0x88ff, 0x1198, 0x9ce0, 0x001c,</div><div class='del'>-	0x2001, 0x181a, 0x2004, 0x9c02, 0x1210, 0x0804, 0xe92a, 0x9006,</div><div class='del'>-	0x012e, 0x00be, 0x006e, 0x007e, 0x008e, 0x00ce, 0x00ee, 0x00fe,</div><div class='del'>-	0x0005, 0x98c5, 0x0001, 0x0ca0, 0x080c, 0xacfc, 0x00b6, 0x0076,</div><div class='del'>-	0x0056, 0x0086, 0x9046, 0x2029, 0x0001, 0x2c20, 0x2019, 0x0002,</div><div class='del'>-	0x6210, 0x2258, 0x0096, 0x904e, 0x080c, 0xa667, 0x009e, 0x008e,</div><div class='del'>-	0x903e, 0x080c, 0xa712, 0x080c, 0xe91b, 0x005e, 0x007e, 0x00be,</div><div class='del'>-	0x080c, 0xad18, 0x0005, 0x080c, 0xacfc, 0x00b6, 0x0046, 0x0056,</div><div class='del'>-	0x0076, 0x00c6, 0x0156, 0x2c20, 0x2128, 0x20a9, 0x007f, 0x900e,</div><div class='del'>-	0x0016, 0x0036, 0x080c, 0x67b4, 0x1180, 0x0056, 0x0086, 0x9046,</div><div class='del'>-	0x2508, 0x2029, 0x0001, 0x0096, 0x904e, 0x080c, 0xa667, 0x009e,</div><div class='del'>-	0x008e, 0x903e, 0x080c, 0xa712, 0x005e, 0x003e, 0x001e, 0x8108,</div><div class='del'>-	0x1f04, 0xe9b0, 0x0036, 0x2508, 0x2029, 0x0003, 0x080c, 0xe91b,</div><div class='del'>-	0x003e, 0x015e, 0x00ce, 0x007e, 0x005e, 0x004e, 0x00be, 0x080c,</div><div class='del'>-	0xad18, 0x0005, 0x080c, 0xacfc, 0x00b6, 0x0076, 0x0056, 0x6210,</div><div class='del'>-	0x2258, 0x0086, 0x9046, 0x2029, 0x0001, 0x2019, 0x0048, 0x0096,</div><div class='del'>-	0x904e, 0x080c, 0xa667, 0x009e, 0x008e, 0x903e, 0x080c, 0xa712,</div><div class='del'>-	0x2c20, 0x080c, 0xe91b, 0x005e, 0x007e, 0x00be, 0x080c, 0xad18,</div><div class='del'>-	0x0005, 0x080c, 0xacfc, 0x00b6, 0x0046, 0x0056, 0x0076, 0x00c6,</div><div class='del'>-	0x0156, 0x2c20, 0x20a9, 0x0800, 0x900e, 0x0016, 0x0036, 0x080c,</div><div class='del'>-	0x67b4, 0x1190, 0x0086, 0x9046, 0x2828, 0x0046, 0x2021, 0x0001,</div><div class='del'>-	0x080c, 0xecc5, 0x004e, 0x0096, 0x904e, 0x080c, 0xa667, 0x009e,</div><div class='del'>-	0x008e, 0x903e, 0x080c, 0xa712, 0x003e, 0x001e, 0x8108, 0x1f04,</div><div class='del'>-	0xea05, 0x0036, 0x2029, 0x0002, 0x080c, 0xe91b, 0x003e, 0x015e,</div><div class='del'>-	0x00ce, 0x007e, 0x005e, 0x004e, 0x00be, 0x080c, 0xad18, 0x0005,</div><div class='del'>-	0x0016, 0x00f6, 0x080c, 0xcf19, 0x0198, 0xa864, 0x9084, 0x00ff,</div><div class='del'>-	0x9086, 0x0046, 0x0180, 0xa800, 0x907d, 0x0138, 0xa803, 0x0000,</div><div class='del'>-	0xab82, 0x080c, 0x7012, 0x2f48, 0x0cb0, 0xab82, 0x080c, 0x7012,</div><div class='del'>-	0x00fe, 0x001e, 0x0005, 0xa800, 0x907d, 0x0130, 0xa803, 0x0000,</div><div class='del'>-	0x080c, 0x7012, 0x2f48, 0x0cb8, 0x080c, 0x7012, 0x0c88, 0x00e6,</div><div class='del'>-	0x0046, 0x0036, 0x2061, 0x1ddc, 0x9005, 0x1138, 0x2071, 0x1800,</div><div class='del'>-	0x7454, 0x7074, 0x8001, 0x9402, 0x12f8, 0x2100, 0x9c06, 0x0188,</div><div class='del'>-	0x6000, 0x9086, 0x0000, 0x0168, 0x6008, 0x9206, 0x1150, 0x6320,</div><div class='del'>-	0x9386, 0x0009, 0x01b0, 0x6010, 0x91a0, 0x0004, 0x2424, 0x9406,</div><div class='del'>-	0x0140, 0x9ce0, 0x001c, 0x2001, 0x181a, 0x2004, 0x9c02, 0x1220,</div><div class='del'>-	0x0c20, 0x9085, 0x0001, 0x0008, 0x9006, 0x003e, 0x004e, 0x00ee,</div><div class='del'>-	0x0005, 0x631c, 0xd3c4, 0x1d68, 0x0c30, 0x0096, 0x0006, 0x080c,</div><div class='del'>-	0x1059, 0x000e, 0x090c, 0x0d85, 0xaae2, 0xa867, 0x010d, 0xa88e,</div><div class='del'>-	0x0026, 0x2010, 0x080c, 0xcf09, 0x2001, 0x0000, 0x0120, 0x2200,</div><div class='del'>-	0x9080, 0x0017, 0x2004, 0x002e, 0xa87a, 0x9186, 0x0020, 0x0110,</div><div class='del'>-	0xa8e3, 0xffff, 0xa986, 0xac76, 0xa87f, 0x0000, 0x2001, 0x198e,</div><div class='del'>-	0x2004, 0xa882, 0x9006, 0xa802, 0xa86a, 0xa88a, 0x0126, 0x2091,</div><div class='del'>-	0x8000, 0x080c, 0x7012, 0x012e, 0x009e, 0x0005, 0x6700, 0x9786,</div><div class='del'>-	0x0000, 0x0158, 0x9786, 0x0001, 0x0140, 0x9786, 0x000a, 0x0128,</div><div class='del'>-	0x9786, 0x0009, 0x0110, 0x9085, 0x0001, 0x0005, 0x00e6, 0x6010,</div><div class='del'>-	0x9075, 0x0138, 0x00b6, 0x2058, 0xb8a0, 0x00be, 0x9206, 0x00ee,</div><div class='del'>-	0x0005, 0x9085, 0x0001, 0x0cd8, 0x0016, 0x6004, 0x908e, 0x001e,</div><div class='del'>-	0x11a0, 0x8007, 0x6134, 0x918c, 0x00ff, 0x9105, 0x6036, 0x6007,</div><div class='del'>-	0x0085, 0x6003, 0x000b, 0x6023, 0x0005, 0x2001, 0x1987, 0x2004,</div><div class='del'>-	0x601a, 0x2009, 0x8020, 0x080c, 0x9617, 0x001e, 0x0005, 0xa001,</div><div class='del'>-	0xa001, 0x0005, 0x6024, 0xd0e4, 0x0158, 0xd0cc, 0x0118, 0x080c,</div><div class='del'>-	0xd267, 0x0030, 0x080c, 0xece1, 0x080c, 0x8c19, 0x080c, 0xb16c,</div><div class='del'>-	0x0005, 0x9280, 0x0008, 0x2004, 0x9084, 0x000f, 0x0002, 0xeb1d,</div><div class='del'>-	0xeb1d, 0xeb1d, 0xeb1f, 0xeb1d, 0xeb1f, 0xeb1f, 0xeb1d, 0xeb1f,</div><div class='del'>-	0xeb1d, 0xeb1d, 0xeb1d, 0xeb1d, 0xeb1d, 0x9006, 0x0005, 0x9085,</div><div class='del'>-	0x0001, 0x0005, 0x9280, 0x0008, 0x2004, 0x9084, 0x000f, 0x0002,</div><div class='del'>-	0xeb36, 0xeb36, 0xeb36, 0xeb36, 0xeb36, 0xeb36, 0xeb43, 0xeb36,</div><div class='del'>-	0xeb36, 0xeb36, 0xeb36, 0xeb36, 0xeb36, 0xeb36, 0x6007, 0x003b,</div><div class='del'>-	0x602f, 0x0009, 0x6017, 0x2a00, 0x6003, 0x0001, 0x2009, 0x8020,</div><div class='del'>-	0x080c, 0x9617, 0x0005, 0x0096, 0x00c6, 0x2260, 0x080c, 0xece1,</div><div class='del'>-	0x604b, 0x0000, 0x6024, 0xc0f4, 0xc0e4, 0x6026, 0x603b, 0x0000,</div><div class='del'>-	0x00ce, 0x00d6, 0x2268, 0x9186, 0x0007, 0x1904, 0xeb9c, 0x6814,</div><div class='del'>-	0x9005, 0x0138, 0x2048, 0xa87c, 0xd0fc, 0x1118, 0x00de, 0x009e,</div><div class='del'>-	0x08a8, 0x6007, 0x003a, 0x6003, 0x0001, 0x2009, 0x8020, 0x080c,</div><div class='del'>-	0x9617, 0x00c6, 0x2d60, 0x6100, 0x9186, 0x0002, 0x1904, 0xec0c,</div><div class='del'>-	0x6014, 0x9005, 0x1138, 0x6000, 0x9086, 0x0007, 0x190c, 0x0d85,</div><div class='del'>-	0x0804, 0xec0c, 0x2048, 0x080c, 0xcf1b, 0x1130, 0x0028, 0x2048,</div><div class='del'>-	0xa800, 0x9005, 0x1de0, 0x2900, 0x2048, 0xa87c, 0x9084, 0x0003,</div><div class='del'>-	0x9086, 0x0002, 0x1168, 0xa87c, 0xc0dc, 0xc0f4, 0xa87e, 0xa880,</div><div class='del'>-	0xc0fc, 0xa882, 0x2009, 0x0043, 0x080c, 0xe3b5, 0x0804, 0xec0c,</div><div class='del'>-	0x2009, 0x0041, 0x0804, 0xec06, 0x9186, 0x0005, 0x15a0, 0x6814,</div><div class='del'>-	0x2048, 0xa87c, 0xd0bc, 0x1120, 0x00de, 0x009e, 0x0804, 0xeb36,</div><div class='del'>-	0xd0b4, 0x0128, 0xd0fc, 0x090c, 0x0d85, 0x0804, 0xeb57, 0x6007,</div><div class='del'>-	0x003a, 0x6003, 0x0001, 0x2009, 0x8020, 0x080c, 0x9617, 0x00c6,</div><div class='del'>-	0x2d60, 0x6100, 0x9186, 0x0002, 0x0120, 0x9186, 0x0004, 0x1904,</div><div class='del'>-	0xec0c, 0x6814, 0x2048, 0xa97c, 0xc1f4, 0xc1dc, 0xa97e, 0xa980,</div><div class='del'>-	0xc1fc, 0xc1bc, 0xa982, 0x00f6, 0x2c78, 0x080c, 0x17ad, 0x00fe,</div><div class='del'>-	0x2009, 0x0042, 0x0498, 0x0036, 0x080c, 0x1059, 0x090c, 0x0d85,</div><div class='del'>-	0xa867, 0x010d, 0x9006, 0xa802, 0xa86a, 0xa88a, 0x2d18, 0xab8e,</div><div class='del'>-	0xa887, 0x0045, 0x2c00, 0xa892, 0x6038, 0xa8a2, 0x2360, 0x6024,</div><div class='del'>-	0xc0dd, 0x6026, 0x6010, 0x00b6, 0x2058, 0xb8a0, 0x00be, 0x2004,</div><div class='del'>-	0x635c, 0xab7a, 0xa876, 0x9006, 0xa87e, 0xa882, 0xad9a, 0xae96,</div><div class='del'>-	0xa89f, 0x0001, 0x080c, 0x7012, 0x2019, 0x0045, 0x6008, 0x2068,</div><div class='del'>-	0x080c, 0xe578, 0x2d00, 0x600a, 0x003e, 0x0038, 0x604b, 0x0000,</div><div class='del'>-	0x6003, 0x0007, 0x080c, 0xe3b5, 0x00ce, 0x00de, 0x009e, 0x0005,</div><div class='del'>-	0x9186, 0x0013, 0x1128, 0x6004, 0x9082, 0x0085, 0x2008, 0x00c2,</div><div class='del'>-	0x9186, 0x0027, 0x1178, 0x080c, 0x99ed, 0x0036, 0x0096, 0x6014,</div><div class='del'>-	0x2048, 0x2019, 0x0004, 0x080c, 0xea30, 0x009e, 0x003e, 0x080c,</div><div class='del'>-	0x9ab3, 0x0005, 0x9186, 0x0014, 0x0d70, 0x080c, 0xb227, 0x0005,</div><div class='del'>-	0xec3f, 0xec3d, 0xec3d, 0xec3d, 0xec3d, 0xec3d, 0xec3f, 0xec3d,</div><div class='del'>-	0xec3d, 0xec3d, 0xec3d, 0xec3d, 0xec3d, 0x080c, 0x0d85, 0x6003,</div><div class='del'>-	0x000c, 0x080c, 0x9ab3, 0x0005, 0x9182, 0x0092, 0x1220, 0x9182,</div><div class='del'>-	0x0085, 0x0208, 0x001a, 0x080c, 0xb227, 0x0005, 0xec5b, 0xec5b,</div><div class='del'>-	0xec5b, 0xec5b, 0xec5d, 0xec7d, 0xec5b, 0xec5b, 0xec5b, 0xec5b,</div><div class='del'>-	0xec5b, 0xec5b, 0xec5b, 0x080c, 0x0d85, 0x00d6, 0x2c68, 0x080c,</div><div class='del'>-	0xb116, 0x01b0, 0x6003, 0x0001, 0x6007, 0x001e, 0x2009, 0x026e,</div><div class='del'>-	0x210c, 0x613a, 0x2009, 0x026f, 0x210c, 0x613e, 0x600b, 0xffff,</div><div class='del'>-	0x6910, 0x6112, 0x6023, 0x0004, 0x2009, 0x8020, 0x080c, 0x9617,</div><div class='del'>-	0x2d60, 0x080c, 0xb16c, 0x00de, 0x0005, 0x080c, 0xb16c, 0x0005,</div><div class='del'>-	0x00e6, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0ec, 0x00ee,</div><div class='del'>-	0x0005, 0x2009, 0x1867, 0x210c, 0xd1ec, 0x05b0, 0x6003, 0x0002,</div><div class='del'>-	0x6024, 0xc0e5, 0x6026, 0xd0cc, 0x0150, 0x2001, 0x1988, 0x2004,</div><div class='del'>-	0x604a, 0x2009, 0x1867, 0x210c, 0xd1f4, 0x1520, 0x00a0, 0x2009,</div><div class='del'>-	0x1867, 0x210c, 0xd1f4, 0x0128, 0x6024, 0xc0e4, 0x6026, 0x9006,</div><div class='del'>-	0x00d8, 0x2001, 0x1988, 0x200c, 0x2001, 0x1986, 0x2004, 0x9100,</div><div class='del'>-	0x9080, 0x000a, 0x604a, 0x6010, 0x00b6, 0x2058, 0xb8bc, 0x00be,</div><div class='del'>-	0x0008, 0x2104, 0x9005, 0x0118, 0x9088, 0x0003, 0x0cd0, 0x2c0a,</div><div class='del'>-	0x600f, 0x0000, 0x9085, 0x0001, 0x0005, 0x0016, 0x00c6, 0x00e6,</div><div class='del'>-	0x615c, 0xb8bc, 0x2060, 0x8cff, 0x0180, 0x84ff, 0x1118, 0x605c,</div><div class='del'>-	0x9106, 0x1138, 0x600c, 0x2072, 0x080c, 0x8c19, 0x080c, 0xb16c,</div><div class='del'>-	0x0010, 0x9cf0, 0x0003, 0x2e64, 0x0c70, 0x00ee, 0x00ce, 0x001e,</div><div class='del'>-	0x0005, 0x00d6, 0x00b6, 0x6010, 0x2058, 0xb8bc, 0x906d, 0x0130,</div><div class='del'>-	0x9c06, 0x0110, 0x680c, 0x0cd0, 0x600c, 0x680e, 0x00be, 0x00de,</div><div class='del'>-	0x0005, 0x0026, 0x0036, 0x0156, 0x2011, 0x182c, 0x2204, 0x9084,</div><div class='del'>-	0x00ff, 0x2019, 0x026e, 0x2334, 0x96b4, 0x00ff, 0x9636, 0x1508,</div><div class='del'>-	0x8318, 0x2334, 0x2204, 0x9084, 0xff00, 0x9636, 0x11d0, 0x2011,</div><div class='del'>-	0x0270, 0x20a9, 0x0004, 0x6010, 0x0096, 0x2048, 0x2019, 0x000a,</div><div class='del'>-	0x080c, 0xc222, 0x009e, 0x1168, 0x2011, 0x0274, 0x20a9, 0x0004,</div><div class='del'>-	0x6010, 0x0096, 0x2048, 0x2019, 0x0006, 0x080c, 0xc222, 0x009e,</div><div class='del'>-	0x1100, 0x015e, 0x003e, 0x002e, 0x0005, 0x00e6, 0x2071, 0x1800,</div><div class='del'>-	0x080c, 0x6130, 0x080c, 0x30bf, 0x00ee, 0x0005, 0x0096, 0x0026,</div><div class='del'>-	0x080c, 0x1059, 0x090c, 0x0d85, 0xa85c, 0x9080, 0x001a, 0x20a0,</div><div class='del'>-	0x20a9, 0x000c, 0xa860, 0x20e8, 0x9006, 0x4004, 0x9186, 0x0046,</div><div class='del'>-	0x1118, 0xa867, 0x0136, 0x0038, 0xa867, 0x0138, 0x9186, 0x0041,</div><div class='del'>-	0x0110, 0xa87b, 0x0001, 0x7038, 0x9084, 0xff00, 0x7240, 0x9294,</div><div class='del'>-	0xff00, 0x8007, 0x9215, 0xaa9a, 0x9186, 0x0046, 0x1168, 0x7038,</div><div class='del'>-	0x9084, 0x00ff, 0x723c, 0x9294, 0xff00, 0x9215, 0xaa9e, 0x723c,</div><div class='del'>-	0x9294, 0x00ff, 0xaaa2, 0x0060, 0x7040, 0x9084, 0x00ff, 0x7244,</div><div class='del'>-	0x9294, 0xff00, 0x9215, 0xaa9e, 0x7244, 0x9294, 0x00ff, 0xaaa2,</div><div class='del'>-	0x9186, 0x0046, 0x1118, 0x9e90, 0x0012, 0x0010, 0x9e90, 0x001a,</div><div class='del'>-	0x2204, 0x8007, 0xa8a6, 0x8210, 0x2204, 0x8007, 0xa8aa, 0x8210,</div><div class='del'>-	0x2204, 0x8007, 0xa8ae, 0x8210, 0x2204, 0x8007, 0xa8b2, 0x8210,</div><div class='del'>-	0x9186, 0x0046, 0x11b8, 0x9e90, 0x0016, 0x2204, 0x8007, 0xa8b6,</div><div class='del'>-	0x8210, 0x2204, 0x8007, 0xa8ba, 0x8210, 0x2204, 0x8007, 0xa8be,</div><div class='del'>-	0x8210, 0x2204, 0x8007, 0xa8c2, 0x8210, 0x2011, 0x0205, 0x2013,</div><div class='del'>-	0x0001, 0x00b0, 0x9e90, 0x001e, 0x2204, 0x8007, 0xa8b6, 0x8210,</div><div class='del'>-	0x2204, 0x8007, 0xa8ba, 0x2011, 0x0205, 0x2013, 0x0001, 0x2011,</div><div class='del'>-	0x0260, 0x2204, 0x8007, 0xa8be, 0x8210, 0x2204, 0x8007, 0xa8c2,</div><div class='del'>-	0x9186, 0x0046, 0x1118, 0x2011, 0x0262, 0x0010, 0x2011, 0x026a,</div><div class='del'>-	0x0146, 0x01d6, 0x0036, 0x20a9, 0x0001, 0x2019, 0x0008, 0xa860,</div><div class='del'>-	0x20e8, 0xa85c, 0x9080, 0x0031, 0x20a0, 0x2204, 0x8007, 0x4004,</div><div class='del'>-	0x8210, 0x8319, 0x1dd0, 0x003e, 0x01ce, 0x013e, 0x2011, 0x0205,</div><div class='del'>-	0x2013, 0x0000, 0x002e, 0x080c, 0x7012, 0x009e, 0x0005, 0x00e6,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0fc, 0x0108, 0x0011,</div><div class='del'>-	0x00ee, 0x0005, 0xa880, 0xc0e5, 0xa882, 0x0005, 0x00e6, 0x00d6,</div><div class='del'>-	0x00c6, 0x0076, 0x0066, 0x0056, 0x0046, 0x0026, 0x0016, 0x0126,</div><div class='del'>-	0x2091, 0x8000, 0x2029, 0x19f4, 0x252c, 0x2021, 0x19fb, 0x2424,</div><div class='del'>-	0x2061, 0x1ddc, 0x2071, 0x1800, 0x7654, 0x7074, 0x9606, 0x0578,</div><div class='del'>-	0x6720, 0x9786, 0x0001, 0x0118, 0x9786, 0x0008, 0x1500, 0x2500,</div><div class='del'>-	0x9c06, 0x01e8, 0x2400, 0x9c06, 0x01d0, 0x080c, 0xeabe, 0x01b8,</div><div class='del'>-	0x080c, 0xeace, 0x11a0, 0x6000, 0x9086, 0x0004, 0x1120, 0x0016,</div><div class='del'>-	0x080c, 0x1ad3, 0x001e, 0x080c, 0xd121, 0x1110, 0x080c, 0x3344,</div><div class='del'>-	0x080c, 0xd132, 0x1110, 0x080c, 0xbb5c, 0x080c, 0xb1a7, 0x9ce0,</div><div class='del'>-	0x001c, 0x2001, 0x181a, 0x2004, 0x9c02, 0x1208, 0x0858, 0x012e,</div><div class='del'>-	0x001e, 0x002e, 0x004e, 0x005e, 0x006e, 0x007e, 0x00ce, 0x00de,</div><div class='del'>-	0x00ee, 0x0005, 0x2001, 0x1810, 0x2004, 0xd0dc, 0x0005, 0x0006,</div><div class='del'>-	0x2001, 0x1837, 0x2004, 0xd09c, 0x000e, 0x0005, 0x0006, 0x0036,</div><div class='del'>-	0x0046, 0x080c, 0xd645, 0x0168, 0x2019, 0xffff, 0x9005, 0x0128,</div><div class='del'>-	0x6010, 0x00b6, 0x2058, 0xbba0, 0x00be, 0x2021, 0x0004, 0x080c,</div><div class='del'>-	0x4e58, 0x004e, 0x003e, 0x000e, 0x0005, 0x6004, 0x9086, 0x0001,</div><div class='del'>-	0x1128, 0x080c, 0xa7e2, 0x080c, 0xb1a7, 0x9006, 0x0005, 0x00e6,</div><div class='del'>-	0x00c6, 0x00b6, 0x0046, 0x2061, 0x1ddc, 0x2071, 0x1800, 0x7454,</div><div class='del'>-	0x7074, 0x8001, 0x9402, 0x12d8, 0x2100, 0x9c06, 0x0168, 0x6000,</div><div class='del'>-	0x9086, 0x0000, 0x0148, 0x6010, 0x2058, 0xb8a0, 0x9206, 0x1120,</div><div class='del'>-	0x6004, 0x9086, 0x0002, 0x0140, 0x9ce0, 0x001c, 0x2001, 0x181a,</div><div class='del'>-	0x2004, 0x9c02, 0x1220, 0x0c40, 0x9085, 0x0001, 0x0008, 0x9006,</div><div class='del'>-	0x004e, 0x00be, 0x00ce, 0x00ee, 0x0005, 0x2001, 0x1810, 0x2004,</div><div class='del'>-	0xd0a4, 0x0160, 0x2001, 0x1837, 0x2004, 0xd0a4, 0x0138, 0x2001,</div><div class='del'>-	0x1848, 0x2004, 0xd0a4, 0x1118, 0x9085, 0x0001, 0x0005, 0x9006,</div><div class='del'>-	0x0ce8, 0x0126, 0x0006, 0x00e6, 0x0016, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x1840, 0xd5a4, 0x0118, 0x7004, 0x8000, 0x7006, 0xd5b4, 0x0118,</div><div class='del'>-	0x7000, 0x8000, 0x7002, 0xd5ac, 0x0178, 0x2500, 0x9084, 0x0007,</div><div class='del'>-	0x908e, 0x0003, 0x0148, 0x908e, 0x0004, 0x0130, 0x908e, 0x0005,</div><div class='del'>-	0x0118, 0x2071, 0xfff6, 0x0089, 0x001e, 0x00ee, 0x000e, 0x012e,</div><div class='del'>-	0x0005, 0x0126, 0x0006, 0x00e6, 0x2091, 0x8000, 0x2071, 0xffee,</div><div class='del'>-	0x0021, 0x00ee, 0x000e, 0x012e, 0x0005, 0x2e05, 0x8000, 0x2077,</div><div class='del'>-	0x1220, 0x8e70, 0x2e05, 0x8000, 0x2077, 0x0005, 0x00e6, 0x2071,</div><div class='del'>-	0xffec, 0x0c99, 0x00ee, 0x0005, 0x00e6, 0x2071, 0xfff0, 0x0c69,</div><div class='del'>-	0x00ee, 0x0005, 0x0126, 0x0006, 0x00e6, 0x2091, 0x8000, 0x2071,</div><div class='del'>-	0x1840, 0x7014, 0x8000, 0x7016, 0x00ee, 0x000e, 0x012e, 0x0005,</div><div class='del'>-	0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,</div><div class='del'>-	0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000,</div><div class='del'>-	0xaa6e</div><div class='del'>-};</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-unsigned short fw2322ipx_length01 = 0xe719;</div><div class='del'>-#else</div><div class='del'>-unsigned short risc_code_length01 = 0xe719;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-unsigned long rseqipx_code_addr01 = 0x0001c000 ;</div><div class='del'>-unsigned short rseqipx_code01[] = { </div><div class='del'>-0x000b, 0x0003, 0x0000, 0x0a4e, 0x0001, 0xc000, 0x0008, 0x8064,</div><div class='del'>-	0x0000, 0x0010, 0x0000, 0x8066, 0x0008, 0x0101, 0x0003, 0xc007,</div><div class='del'>-	0x0008, 0x80e0, 0x0008, 0xff00, 0x0000, 0x80e2, 0x0008, 0xff00,</div><div class='del'>-	0x0008, 0x0162, 0x0000, 0x8066, 0x0008, 0xa101, 0x000b, 0xc00f,</div><div class='del'>-	0x0008, 0x0d02, 0x0000, 0x8060, 0x0000, 0x0400, 0x000b, 0x60c6,</div><div class='del'>-	0x0008, 0x80e0, 0x0000, 0x0100, 0x000b, 0x5819, 0x0003, 0x7b08,</div><div class='del'>-	0x0003, 0x5241, 0x000b, 0xc813, 0x0009, 0xbac0, 0x0000, 0x008a,</div><div class='del'>-	0x0003, 0x8813, 0x000a, 0x7042, 0x0003, 0x8813, 0x0000, 0x15fc,</div><div class='del'>-	0x000b, 0xb013, 0x0009, 0xc4c0, 0x0000, 0x7000, 0x0001, 0xffa0,</div><div class='del'>-	0x0000, 0x2000, 0x0003, 0x93cd, 0x0008, 0x808c, 0x0000, 0x0001,</div><div class='del'>-	0x0007, 0x0000, 0x0007, 0x0000, 0x0000, 0x40d4, 0x000a, 0x4047,</div><div class='del'>-	0x0008, 0x808c, 0x0000, 0x0002, 0x0007, 0x0000, 0x000b, 0x0832,</div><div class='del'>-	0x0000, 0x4022, 0x0003, 0x0038, 0x0008, 0x4122, 0x0009, 0xeac0,</div><div class='del'>-	0x0008, 0xff00, 0x0009, 0xffe0, 0x0008, 0x0500, 0x000b, 0x0bf4,</div><div class='del'>-	0x0002, 0x4447, 0x0003, 0x8bf1, 0x0008, 0x0bfe, 0x0001, 0x11a0,</div><div class='del'>-	0x000b, 0x13d3, 0x0001, 0x0ca0, 0x000b, 0x13d3, 0x0001, 0x9180,</div><div class='del'>-	0x0000, 0x0004, 0x0000, 0x8060, 0x0000, 0x0400, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0009, 0x0003, 0xc046, 0x0008, 0x808c,</div><div class='del'>-	0x0008, 0x0000, 0x0008, 0x0060, 0x0008, 0x8062, 0x0000, 0x0004,</div><div class='del'>-	0x0000, 0x8066, 0x0000, 0x0411, 0x000b, 0xc04e, 0x0000, 0x03fe,</div><div class='del'>-	0x0001, 0x43e0, 0x0003, 0x8bd0, 0x0009, 0xc2c0, 0x0008, 0x00ff,</div><div class='del'>-	0x0001, 0x02e0, 0x0003, 0x8bd0, 0x0001, 0x9180, 0x0008, 0x0005,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x0019, 0x0003, 0xc05d, 0x0002, 0x0240, 0x000b, 0x0bcd,</div><div class='del'>-	0x0008, 0x00fc, 0x0003, 0x33d0, 0x000a, 0x0244, 0x0003, 0x086f,</div><div class='del'>-	0x0004, 0x021a, 0x0001, 0x9180, 0x0000, 0x0007, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0002, 0x0234, 0x0008, 0x7f04,</div><div class='del'>-	0x0000, 0x8066, 0x0000, 0x040a, 0x0003, 0xc06e, 0x000a, 0x0248,</div><div class='del'>-	0x000b, 0x0879, 0x0001, 0x9180, 0x0008, 0x0006, 0x0008, 0x7f62,</div><div class='del'>-	0x0008, 0x8002, 0x0008, 0x0003, 0x0000, 0x8066, 0x0000, 0x020a,</div><div class='del'>-	0x000b, 0xc078, 0x0000, 0x112a, 0x0008, 0x002e, 0x0008, 0x022c,</div><div class='del'>-	0x0002, 0x3a44, 0x0003, 0x8813, 0x0008, 0x808c, 0x0000, 0x0002,</div><div class='del'>-	0x0008, 0x1760, 0x0008, 0x8062, 0x0008, 0x000f, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x0011, 0x0003, 0xc085, 0x0008, 0x01fe, 0x0009, 0x42e0,</div><div class='del'>-	0x000b, 0x8bc0, 0x0000, 0x00fe, 0x0001, 0x43e0, 0x000b, 0x8bc0,</div><div class='del'>-	0x0000, 0x1734, 0x0000, 0x1530, 0x0008, 0x1632, 0x0008, 0x0d2a,</div><div class='del'>-	0x0001, 0x9880, 0x0008, 0x0012, 0x0000, 0x8060, 0x0000, 0x0400,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x1e0a, 0x0003, 0xc097,</div><div class='del'>-	0x0008, 0x808a, 0x0008, 0x0003, 0x0000, 0x1a60, 0x0008, 0x8062,</div><div class='del'>-	0x0000, 0x0002, 0x000b, 0x589d, 0x0000, 0x8066, 0x0000, 0x3679,</div><div class='del'>-	0x000b, 0xc0a0, 0x000b, 0x58a1, 0x0008, 0x8054, 0x0008, 0x0011,</div><div class='del'>-	0x0000, 0x8074, 0x0008, 0x1010, 0x0008, 0x1efc, 0x0003, 0x3013,</div><div class='del'>-	0x0004, 0x00aa, 0x0003, 0x0013, 0x0000, 0x1c60, 0x0000, 0x1b62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0231, 0x0003, 0xc0ae, 0x0003, 0x58af,</div><div class='del'>-	0x0008, 0x0140, 0x0000, 0x0242, 0x0002, 0x1f43, 0x0003, 0x88b9,</div><div class='del'>-	0x0000, 0x0d44, 0x0008, 0x0d46, 0x0008, 0x0348, 0x0008, 0x044a,</div><div class='del'>-	0x000b, 0x00bd, 0x0008, 0x0344, 0x0008, 0x0446, 0x0008, 0x0548,</div><div class='del'>-	0x0000, 0x064a, 0x000a, 0x1948, 0x0003, 0x08c0, 0x0008, 0x0d4a,</div><div class='del'>-	0x0003, 0x58c0, 0x0008, 0x8054, 0x0000, 0x0001, 0x0000, 0x8074,</div><div class='del'>-	0x0008, 0x2020, 0x000f, 0x4000, 0x0002, 0x7043, 0x0003, 0x8816,</div><div class='del'>-	0x0002, 0x7040, 0x000b, 0x8949, 0x0000, 0x4820, 0x0008, 0x0bfe,</div><div class='del'>-	0x0009, 0x10a0, 0x0003, 0x1140, 0x0001, 0x0ca0, 0x0003, 0x1140,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0009, 0x9080, 0x0000, 0x0008,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x0009, 0x000b, 0xc0d7,</div><div class='del'>-	0x0001, 0x80e0, 0x0008, 0x0003, 0x000b, 0x8940, 0x0000, 0x8060,</div><div class='del'>-	0x0000, 0x0400, 0x0009, 0x9080, 0x0000, 0x0004, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0009, 0x000b, 0xc0e2, 0x0008, 0x0060,</div><div class='del'>-	0x0008, 0x8062, 0x0000, 0x0004, 0x0000, 0x8066, 0x0000, 0x0411,</div><div class='del'>-	0x000b, 0xc0e8, 0x0008, 0x4afe, 0x0009, 0x03e0, 0x000b, 0x8940,</div><div class='del'>-	0x0009, 0xcbc0, 0x0008, 0x00ff, 0x0001, 0x02e0, 0x000b, 0x8940,</div><div class='del'>-	0x0000, 0x49b4, 0x0002, 0x4b4e, 0x000b, 0x8951, 0x0008, 0x808a,</div><div class='del'>-	0x0000, 0x0004, 0x0000, 0x18fe, 0x0001, 0x10e0, 0x000b, 0x88fa,</div><div class='del'>-	0x0002, 0x192f, 0x0008, 0x7f32, 0x0008, 0x15fe, 0x0001, 0x10e0,</div><div class='del'>-	0x000b, 0x88ff, 0x0002, 0x162f, 0x0008, 0x7f2c, 0x0000, 0x8060,</div><div class='del'>-	0x0000, 0x0400, 0x0009, 0x9080, 0x0000, 0x0007, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0009, 0x0003, 0xc106, 0x000a, 0x004f,</div><div class='del'>-	0x000b, 0x8937, 0x000a, 0x0040, 0x000b, 0x0921, 0x0002, 0x004e,</div><div class='del'>-	0x000b, 0x0921, 0x0002, 0x0030, 0x0002, 0x7f2f, 0x0000, 0x7f00,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x000a, 0x0003, 0xc112, 0x0008, 0x1010,</div><div class='del'>-	0x0004, 0x0201, 0x0003, 0xb11a, 0x0004, 0x0387, 0x000c, 0x01eb,</div><div class='del'>-	0x0003, 0x7816, 0x0003, 0x0013, 0x0000, 0x0806, 0x0008, 0x8010,</div><div class='del'>-	0x0000, 0x001f, 0x0004, 0x0387, 0x0000, 0x0310, 0x0004, 0x0387,</div><div class='del'>-	0x0003, 0x0118, 0x000a, 0x002f, 0x0000, 0x7f00, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x000a, 0x000b, 0xc125, 0x0004, 0x01c4, 0x000a, 0x0040,</div><div class='del'>-	0x000b, 0x093a, 0x0004, 0x0231, 0x0000, 0x8000, 0x0000, 0x0002,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0009, 0x9080, 0x0008, 0x0006,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x000a, 0x0003, 0xc133,</div><div class='del'>-	0x0000, 0x8072, 0x0000, 0x4000, 0x0003, 0x0118, 0x0008, 0x8010,</div><div class='del'>-	0x0008, 0x001e, 0x0003, 0x013c, 0x0008, 0x8010, 0x0008, 0x001d,</div><div class='del'>-	0x0004, 0x0387, 0x0008, 0x1010, 0x0004, 0x0387, 0x0003, 0x0016,</div><div class='del'>-	0x0002, 0x4b4e, 0x0003, 0x0946, 0x0008, 0x808a, 0x0000, 0x0004,</div><div class='del'>-	0x000b, 0x6146, 0x000f, 0x8000, 0x0008, 0x808a, 0x0000, 0x0004,</div><div class='del'>-	0x0003, 0x0016, 0x0008, 0x808a, 0x0000, 0x0004, 0x0007, 0x0000,</div><div class='del'>-	0x0007, 0x0000, 0x0008, 0x80e0, 0x0008, 0x0202, 0x000b, 0x6149,</div><div class='del'>-	0x000b, 0x0014, 0x0000, 0x8060, 0x0000, 0x0400, 0x0009, 0x9080,</div><div class='del'>-	0x0008, 0x0011, 0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x0009,</div><div class='del'>-	0x000b, 0xc158, 0x000a, 0x004f, 0x000b, 0x89b5, 0x0000, 0x8060,</div><div class='del'>-	0x0000, 0x0400, 0x0009, 0x9080, 0x0008, 0x0005, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0009, 0x000b, 0xc162, 0x0008, 0x0060,</div><div class='del'>-	0x0008, 0x8062, 0x0000, 0x001f, 0x0000, 0x8066, 0x0000, 0x0209,</div><div class='del'>-	0x000b, 0xc168, 0x000a, 0x014b, 0x0003, 0x09b5, 0x0008, 0x8062,</div><div class='del'>-	0x0008, 0x000f, 0x0000, 0x8066, 0x0000, 0x0211, 0x0003, 0xc16f,</div><div class='del'>-	0x0008, 0x01fe, 0x0001, 0x02d0, 0x000b, 0x89b5, 0x0004, 0x01cd,</div><div class='del'>-	0x0003, 0x09b5, 0x0008, 0x03a0, 0x0008, 0x8004, 0x0000, 0x0002,</div><div class='del'>-	0x0000, 0x8006, 0x0000, 0x0043, 0x0008, 0x4908, 0x0008, 0x808a,</div><div class='del'>-	0x0000, 0x0004, 0x0000, 0x8060, 0x0000, 0x0400, 0x0009, 0x9080,</div><div class='del'>-	0x0008, 0x0000, 0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x041a,</div><div class='del'>-	0x0003, 0xc184, 0x0003, 0xe185, 0x0008, 0x4908, 0x0008, 0x480a,</div><div class='del'>-	0x0008, 0x808a, 0x0000, 0x0004, 0x0008, 0x0060, 0x0008, 0x8062,</div><div class='del'>-	0x0008, 0x002b, 0x0000, 0x8066, 0x0000, 0x0411, 0x000b, 0xc18f,</div><div class='del'>-	0x0008, 0x04fe, 0x0009, 0x02a0, 0x0003, 0x9196, 0x0002, 0x0500,</div><div class='del'>-	0x000b, 0x09b2, 0x000b, 0x0197, 0x0000, 0x05fe, 0x0001, 0x03a0,</div><div class='del'>-	0x000b, 0x11b2, 0x0000, 0x0d0c, 0x0008, 0x0d0e, 0x0008, 0x0d10,</div><div class='del'>-	0x0000, 0x0d12, 0x0008, 0x0060, 0x0008, 0x8062, 0x0000, 0x000d,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0832, 0x000b, 0xc1a2, 0x0000, 0x800a,</div><div class='del'>-	0x0000, 0x8005, 0x0000, 0x8060, 0x0000, 0x0400, 0x0009, 0x9080,</div><div class='del'>-	0x0008, 0x0011, 0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x0a12,</div><div class='del'>-	0x0003, 0xc1ac, 0x0008, 0x5006, 0x0008, 0x100e, 0x000c, 0x01d8,</div><div class='del'>-	0x0003, 0x7816, 0x0003, 0x0013, 0x0008, 0x0208, 0x0008, 0x030a,</div><div class='del'>-	0x0003, 0x0199, 0x0004, 0x01c4, 0x0008, 0x808a, 0x0000, 0x0004,</div><div class='del'>-	0x0008, 0x8010, 0x0008, 0x0021, 0x0004, 0x0387, 0x0008, 0x1010,</div><div class='del'>-	0x0004, 0x0387, 0x0000, 0x4810, 0x0004, 0x0387, 0x0008, 0x4910,</div><div class='del'>-	0x0004, 0x0387, 0x0008, 0x808a, 0x0000, 0x0004, 0x0003, 0x0016,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0009, 0x9080, 0x0000, 0x0002,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0xb40a, 0x000b, 0xc1cb,</div><div class='del'>-	0x000f, 0x4000, 0x0000, 0x8060, 0x0000, 0x0400, 0x0000, 0x0a62,</div><div class='del'>-	0x0000, 0x8066, 0x0000, 0x0411, 0x0003, 0xc1d2, 0x0002, 0x0210,</div><div class='del'>-	0x0001, 0xffc0, 0x0000, 0x0007, 0x0009, 0x03e0, 0x000f, 0x4000,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0001, 0x8380, 0x0000, 0x0002,</div><div class='del'>-	0x0009, 0x0a80, 0x0008, 0x7f62, 0x0000, 0x8066, 0x0000, 0x0e0a,</div><div class='del'>-	0x000b, 0xc1e0, 0x0002, 0x0300, 0x0001, 0xffc0, 0x0000, 0x0007,</div><div class='del'>-	0x0000, 0x7f06, 0x0002, 0x0a00, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x060a, 0x000b, 0xc1e9, 0x000f, 0x4000, 0x0000, 0x0da0,</div><div class='del'>-	0x0008, 0x0da2, 0x0008, 0x0da4, 0x0009, 0x8880, 0x0000, 0x0001,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8060, 0x0000, 0x0400, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0xa012, 0x0000, 0x0da6, 0x0008, 0x0da8, 0x0000, 0x0daa,</div><div class='del'>-	0x0000, 0x0dac, 0x0003, 0xc1f9, 0x0009, 0x8880, 0x0008, 0x0009,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0xa03a, 0x0003, 0xc1ff,</div><div class='del'>-	0x000f, 0x4000, 0x0009, 0x8880, 0x0008, 0x0005, 0x0000, 0x8060,</div><div class='del'>-	0x0000, 0x0400, 0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x0009,</div><div class='del'>-	0x000b, 0xc208, 0x0008, 0x0060, 0x0008, 0x8062, 0x0000, 0x000d,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0021, 0x000b, 0xc20e, 0x0000, 0x00fe,</div><div class='del'>-	0x0001, 0x01d0, 0x0003, 0x8a17, 0x0008, 0x02fe, 0x0009, 0x03d0,</div><div class='del'>-	0x000b, 0x0a17, 0x0000, 0x0d06, 0x000f, 0x4000, 0x0000, 0x8006,</div><div class='del'>-	0x0000, 0x0001, 0x000f, 0x4000, 0x0008, 0x0060, 0x0008, 0x8062,</div><div class='del'>-	0x0008, 0x002b, 0x0000, 0x8066, 0x0008, 0xa041, 0x000b, 0xc21f,</div><div class='del'>-	0x0002, 0x0243, 0x000b, 0x8a26, 0x0000, 0x54ac, 0x0000, 0x55ae,</div><div class='del'>-	0x0008, 0x0da8, 0x0000, 0x0daa, 0x0000, 0x50b0, 0x0000, 0x51b2,</div><div class='del'>-	0x0000, 0x0db4, 0x0008, 0x0db6, 0x0008, 0x0060, 0x0008, 0x8062,</div><div class='del'>-	0x0000, 0x0007, 0x0000, 0x8066, 0x0008, 0xa452, 0x000b, 0xc22f,</div><div class='del'>-	0x000f, 0x4000, 0x000a, 0x3945, 0x000b, 0x8a3b, 0x0000, 0x8072,</div><div class='del'>-	0x0008, 0x4040, 0x0007, 0x0000, 0x000a, 0x3945, 0x0003, 0x8a39,</div><div class='del'>-	0x000f, 0x4000, 0x0000, 0x8072, 0x0000, 0x4000, 0x0007, 0x0000,</div><div class='del'>-	0x0007, 0x0000, 0x0007, 0x0000, 0x000a, 0x3945, 0x000b, 0x0a33,</div><div class='del'>-	0x000b, 0x023b, 0x000a, 0x3a40, 0x0003, 0x8819, 0x0001, 0xabd0,</div><div class='del'>-	0x0008, 0x0000, 0x0000, 0x7f24, 0x0003, 0x5a46, 0x0008, 0x8054,</div><div class='del'>-	0x0000, 0x0002, 0x0002, 0x1242, 0x0003, 0x0a8c, 0x000a, 0x3a45,</div><div class='del'>-	0x000b, 0x0a7b, 0x000a, 0x1e10, 0x0000, 0x7f3c, 0x000b, 0x0a78,</div><div class='del'>-	0x0002, 0x1d00, 0x0000, 0x7f3a, 0x0000, 0x0d60, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0009, 0x0003, 0xc256, 0x0008, 0x00fc,</div><div class='del'>-	0x0003, 0xb275, 0x0000, 0x1c60, 0x0008, 0x8062, 0x0000, 0x0001,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0009, 0x000b, 0xc25e, 0x0008, 0x00fc,</div><div class='del'>-	0x000b, 0x33a9, 0x0000, 0x0038, 0x0008, 0x0060, 0x0008, 0x8062,</div><div class='del'>-	0x0000, 0x0019, 0x0000, 0x8066, 0x0008, 0x0009, 0x000b, 0xc267,</div><div class='del'>-	0x0009, 0x80c0, 0x0008, 0x00ff, 0x0008, 0x7f3e, 0x0000, 0x0d60,</div><div class='del'>-	0x0008, 0x0efe, 0x0001, 0x1f80, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x0009, 0x0003, 0xc271, 0x0008, 0x003a, 0x0000, 0x1dfe,</div><div class='del'>-	0x000b, 0x0252, 0x0008, 0x0036, 0x0004, 0x00aa, 0x000b, 0x028c,</div><div class='del'>-	0x0000, 0x8074, 0x0000, 0x2000, 0x000b, 0x028c, 0x0002, 0x3a44,</div><div class='del'>-	0x000b, 0x0bd6, 0x0000, 0x8074, 0x0000, 0x1000, 0x0001, 0xadd0,</div><div class='del'>-	0x0008, 0x0000, 0x0008, 0x7f0e, 0x0003, 0xb3a6, 0x0001, 0xa7d0,</div><div class='del'>-	0x0008, 0x0000, 0x0000, 0x7f00, 0x0009, 0xa6d0, 0x0008, 0x0000,</div><div class='del'>-	0x0009, 0x00d0, 0x0003, 0x8a9c, 0x0000, 0x8074, 0x0008, 0x4040,</div><div class='del'>-	0x0003, 0x5a8c, 0x0003, 0x5241, 0x000a, 0x3a46, 0x0003, 0x8a9c,</div><div class='del'>-	0x0002, 0x3a47, 0x0003, 0x0a97, 0x0008, 0x8054, 0x0000, 0x0004,</div><div class='del'>-	0x0000, 0x8074, 0x0000, 0x8000, 0x0003, 0x02fc, 0x0009, 0x92c0,</div><div class='del'>-	0x0000, 0x0fc8, 0x000b, 0x0813, 0x000a, 0x1246, 0x000b, 0x8ba0,</div><div class='del'>-	0x0000, 0x1a60, 0x0008, 0x8062, 0x0000, 0x0002, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x367a, 0x000b, 0xc2a1, 0x0009, 0x92c0, 0x0008, 0x0780,</div><div class='del'>-	0x0003, 0x8bba, 0x0002, 0x124b, 0x000b, 0x0aaa, 0x0002, 0x2e4d,</div><div class='del'>-	0x0002, 0x2e4d, 0x0003, 0x0ba6, 0x000a, 0x3a46, 0x000b, 0x8aba,</div><div class='del'>-	0x000b, 0x5aac, 0x0008, 0x8054, 0x0000, 0x0004, 0x000a, 0x1243,</div><div class='del'>-	0x000b, 0x0afa, 0x0008, 0x8010, 0x0000, 0x000d, 0x0004, 0x0387,</div><div class='del'>-	0x000a, 0x1948, 0x000b, 0x0ab7, 0x000c, 0x037c, 0x0000, 0x1810,</div><div class='del'>-	0x0004, 0x0387, 0x0003, 0x02fa, 0x000a, 0x1948, 0x000b, 0x0abe,</div><div class='del'>-	0x000a, 0x1243, 0x0003, 0x0ba9, 0x000a, 0x194d, 0x0003, 0x0ac2,</div><div class='del'>-	0x000a, 0x1243, 0x000b, 0x0bb0, 0x0003, 0x5ac2, 0x0008, 0x8054,</div><div class='del'>-	0x0000, 0x0004, 0x000a, 0x192e, 0x0008, 0x7f32, 0x000a, 0x1947,</div><div class='del'>-	0x0003, 0x0af4, 0x0002, 0x194f, 0x000b, 0x0ad2, 0x000c, 0x037c,</div><div class='del'>-	0x0000, 0x1810, 0x0004, 0x0201, 0x000b, 0xb2ed, 0x0004, 0x0387,</div><div class='del'>-	0x000c, 0x01eb, 0x0003, 0x02fa, 0x0000, 0x1a60, 0x0008, 0x8062,</div><div class='del'>-	0x0000, 0x001f, 0x0000, 0x8066, 0x0008, 0x0009, 0x0003, 0xc2d7,</div><div class='del'>-	0x000a, 0x004c, 0x000b, 0x8af4, 0x0000, 0x8060, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0x9880, 0x0000, 0x0007, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x320a, 0x0003, 0xc2e1, 0x0000, 0x8060, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0x9880, 0x0008, 0x0012, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x1e0a, 0x000b, 0xc2e9, 0x0000, 0x1826, 0x0000, 0x1928,</div><div class='del'>-	0x0003, 0x02fa, 0x0000, 0x0806, 0x0008, 0x8010, 0x0000, 0x001f,</div><div class='del'>-	0x0004, 0x0387, 0x0000, 0x0310, 0x0004, 0x0387, 0x0003, 0x02fa,</div><div class='del'>-	0x000c, 0x037c, 0x0008, 0x8010, 0x0000, 0x0001, 0x0004, 0x0387,</div><div class='del'>-	0x0000, 0x1810, 0x0004, 0x0387, 0x0000, 0x8074, 0x0008, 0xf000,</div><div class='del'>-	0x0000, 0x0d30, 0x0002, 0x3a42, 0x0003, 0x8b02, 0x0000, 0x15fc,</div><div class='del'>-	0x0003, 0xb07e, 0x0003, 0x0013, 0x0000, 0x8074, 0x0000, 0x0501,</div><div class='del'>-	0x0008, 0x8010, 0x0008, 0x000c, 0x0004, 0x0387, 0x0003, 0x0013,</div><div class='del'>-	0x0009, 0xbbe0, 0x0008, 0x0030, 0x000b, 0x8b1e, 0x0000, 0x18fe,</div><div class='del'>-	0x0009, 0x3ce0, 0x0003, 0x0b1b, 0x0008, 0x15fe, 0x0009, 0x3ce0,</div><div class='del'>-	0x0003, 0x0b1b, 0x0008, 0x13fe, 0x0009, 0x3ce0, 0x000b, 0x8b17,</div><div class='del'>-	0x000c, 0x0375, 0x0008, 0x0d26, 0x000b, 0x0318, 0x0004, 0x0377,</div><div class='del'>-	0x0008, 0x8076, 0x0000, 0x0040, 0x000b, 0x0372, 0x0008, 0x8076,</div><div class='del'>-	0x0008, 0x0041, 0x000b, 0x0372, 0x0009, 0xbbe0, 0x0000, 0x0032,</div><div class='del'>-	0x0003, 0x8b23, 0x0008, 0x3c1e, 0x000b, 0x0372, 0x0009, 0xbbe0,</div><div class='del'>-	0x0000, 0x003b, 0x000b, 0x8b28, 0x0000, 0x3cdc, 0x000b, 0x0372,</div><div class='del'>-	0x0009, 0xbbe0, 0x0008, 0x0035, 0x000b, 0x8b2e, 0x0000, 0x8072,</div><div class='del'>-	0x0000, 0x8000, 0x000b, 0x04e5, 0x0009, 0xbbe0, 0x0008, 0x0036,</div><div class='del'>-	0x000b, 0x0c06, 0x0009, 0xbbe0, 0x0000, 0x0037, 0x000b, 0x8b53,</div><div class='del'>-	0x0000, 0x18fe, 0x0009, 0x3ce0, 0x000b, 0x8b1b, 0x0008, 0x8076,</div><div class='del'>-	0x0000, 0x0040, 0x0000, 0x1a60, 0x0008, 0x8062, 0x0000, 0x000d,</div><div class='del'>-	0x0009, 0xa6d0, 0x0008, 0x0000, 0x0008, 0x7f04, 0x0001, 0xa7d0,</div><div class='del'>-	0x0008, 0x0000, 0x0000, 0x7f06, 0x0001, 0xa8d0, 0x0008, 0x0000,</div><div class='del'>-	0x0008, 0x7f08, 0x0009, 0xa9d0, 0x0008, 0x0000, 0x0000, 0x7f0a,</div><div class='del'>-	0x0000, 0x8066, 0x0000, 0x0422, 0x0003, 0xc34a, 0x000c, 0x037c,</div><div class='del'>-	0x0008, 0x8054, 0x0000, 0x0004, 0x0000, 0x8074, 0x0008, 0xf000,</div><div class='del'>-	0x0000, 0x8072, 0x0000, 0x8000, 0x0003, 0x02fc, 0x0009, 0xbbe0,</div><div class='del'>-	0x0000, 0x0038, 0x000b, 0x8b65, 0x0000, 0x18fe, 0x0009, 0x3ce0,</div><div class='del'>-	0x000b, 0x0b62, 0x0008, 0x15fe, 0x0009, 0x3ce0, 0x000b, 0x8b11,</div><div class='del'>-	0x0004, 0x0377, 0x0008, 0x8076, 0x0000, 0x0040, 0x0000, 0x8072,</div><div class='del'>-	0x0000, 0x8000, 0x0003, 0x03cd, 0x0008, 0x8076, 0x0008, 0x0042,</div><div class='del'>-	0x000b, 0x0372, 0x0009, 0xbbe0, 0x0000, 0x0016, 0x000b, 0x8b72,</div><div class='del'>-	0x0000, 0x8074, 0x0008, 0x0808, 0x0002, 0x3a44, 0x000b, 0x8818,</div><div class='del'>-	0x0000, 0x8074, 0x0000, 0x0800, 0x0000, 0x8072, 0x0000, 0x8000,</div><div class='del'>-	0x000f, 0x8000, 0x0003, 0x0013, 0x0000, 0x8072, 0x0000, 0x8000,</div><div class='del'>-	0x0003, 0x0013, 0x0002, 0x1430, 0x000b, 0x0378, 0x000a, 0x3d30,</div><div class='del'>-	0x0000, 0x7f00, 0x0001, 0xbc80, 0x0000, 0x0007, 0x0003, 0x0380,</div><div class='del'>-	0x000a, 0x1930, 0x0000, 0x7f00, 0x0001, 0x9880, 0x0000, 0x0007,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x000a, 0x0003, 0xc385, 0x000f, 0x4000, 0x000b, 0x238a,</div><div class='del'>-	0x0008, 0x0870, 0x000f, 0x4000, 0x0002, 0x7040, 0x0003, 0x0b87,</div><div class='del'>-	0x000b, 0xe394, 0x0008, 0x808a, 0x0000, 0x0004, 0x0007, 0x0000,</div><div class='del'>-	0x0007, 0x0000, 0x0008, 0x80e0, 0x0008, 0x0202, 0x000b, 0x638d,</div><div class='del'>-	0x0008, 0x80e0, 0x0000, 0x0100, 0x000b, 0x0387, 0x0009, 0xbac0,</div><div class='del'>-	0x0008, 0x0090, 0x000b, 0x0b9d, 0x0000, 0x8074, 0x0000, 0x0706,</div><div class='del'>-	0x000b, 0x039f, 0x0000, 0x8074, 0x0000, 0x0703, 0x000f, 0x4000,</div><div class='del'>-	0x0008, 0x8010, 0x0000, 0x0023, 0x000b, 0x03db, 0x0008, 0x8010,</div><div class='del'>-	0x0000, 0x0008, 0x000b, 0x03db, 0x0008, 0x8010, 0x0008, 0x0022,</div><div class='del'>-	0x000b, 0x03db, 0x000c, 0x037c, 0x0008, 0x8010, 0x0000, 0x0007,</div><div class='del'>-	0x0004, 0x0387, 0x0000, 0x1810, 0x0004, 0x0387, 0x0003, 0x03e5,</div><div class='del'>-	0x000c, 0x037c, 0x0008, 0x8010, 0x0008, 0x001b, 0x0004, 0x0387,</div><div class='del'>-	0x0000, 0x1810, 0x0004, 0x0387, 0x0000, 0x8074, 0x0000, 0xf080,</div><div class='del'>-	0x0000, 0x0d30, 0x0003, 0x0013, 0x0008, 0x8010, 0x0008, 0x0009,</div><div class='del'>-	0x000b, 0x03db, 0x0008, 0x8010, 0x0008, 0x0005, 0x000b, 0x03db,</div><div class='del'>-	0x000a, 0x1648, 0x0003, 0x888c, 0x0008, 0x808c, 0x0000, 0x0001,</div><div class='del'>-	0x0007, 0x0000, 0x0008, 0x8010, 0x0000, 0x0004, 0x000a, 0x4143,</div><div class='del'>-	0x000b, 0x088c, 0x0002, 0x3a44, 0x0003, 0x8813, 0x0008, 0x0d2a,</div><div class='del'>-	0x000b, 0x03db, 0x0008, 0x8010, 0x0008, 0x0003, 0x000b, 0x03dd,</div><div class='del'>-	0x0008, 0x8010, 0x0000, 0x000b, 0x000b, 0x03dd, 0x0008, 0x8010,</div><div class='del'>-	0x0000, 0x0002, 0x000b, 0x03dd, 0x0002, 0x3a47, 0x000b, 0x8a8c,</div><div class='del'>-	0x0008, 0x8010, 0x0008, 0x0006, 0x000b, 0x03dd, 0x0000, 0x8074,</div><div class='del'>-	0x0008, 0xf000, 0x0004, 0x0387, 0x000c, 0x0397, 0x000a, 0x3a40,</div><div class='del'>-	0x000b, 0x0813, 0x0008, 0x8010, 0x0008, 0x000c, 0x0004, 0x0387,</div><div class='del'>-	0x0003, 0x0013, 0x0000, 0x8074, 0x0000, 0xf080, 0x0000, 0x0d30,</div><div class='del'>-	0x0002, 0x2e4d, 0x0002, 0x2e4d, 0x0003, 0x0bee, 0x0008, 0x8054,</div><div class='del'>-	0x0000, 0x0019, 0x0003, 0x0013, 0x0008, 0x8054, 0x0008, 0x0009,</div><div class='del'>-	0x0003, 0x0013, 0x0002, 0x3a44, 0x0003, 0x8813, 0x0003, 0x03d0,</div><div class='del'>-	0x0008, 0x808c, 0x0008, 0x0000, 0x0002, 0x4447, 0x0003, 0x0c1a,</div><div class='del'>-	0x0001, 0xc0c0, 0x0008, 0x00ff, 0x0009, 0xffe0, 0x0008, 0x00ff,</div><div class='del'>-	0x0003, 0x8bf1, 0x0001, 0xc1e0, 0x0008, 0xffff, 0x0003, 0x8bf1,</div><div class='del'>-	0x0008, 0x8010, 0x0000, 0x0013, 0x0004, 0x0387, 0x0000, 0x8074,</div><div class='del'>-	0x0008, 0x0202, 0x0003, 0x0013, 0x000a, 0x3a40, 0x0003, 0x8c17,</div><div class='del'>-	0x0000, 0x8074, 0x0000, 0x0200, 0x0000, 0x3d00, 0x0000, 0x3cfe,</div><div class='del'>-	0x0000, 0x8072, 0x0000, 0x8000, 0x0001, 0x43e0, 0x000b, 0x8c15,</div><div class='del'>-	0x0000, 0x42fe, 0x0001, 0xffc0, 0x0008, 0x00ff, 0x0009, 0x00e0,</div><div class='del'>-	0x000b, 0x0bf1, 0x0008, 0x0d08, 0x0003, 0x046a, 0x0000, 0x8072,</div><div class='del'>-	0x0000, 0x8000, 0x0003, 0x0013, 0x000c, 0x04ee, 0x0008, 0x808c,</div><div class='del'>-	0x0000, 0x0001, 0x0000, 0x04fc, 0x0003, 0x34d1, 0x0000, 0x0460,</div><div class='del'>-	0x0008, 0x8062, 0x0000, 0x0001, 0x0000, 0x8066, 0x0008, 0x0009,</div><div class='del'>-	0x0003, 0xc424, 0x0000, 0x0004, 0x0009, 0x80c0, 0x0008, 0x00ff,</div><div class='del'>-	0x0000, 0x7f00, 0x0001, 0x80e0, 0x0000, 0x0004, 0x0003, 0x0c3e,</div><div class='del'>-	0x0001, 0x80e0, 0x0008, 0x0005, 0x0003, 0x0c3e, 0x0001, 0x80e0,</div><div class='del'>-	0x0008, 0x0006, 0x0003, 0x0c3e, 0x0001, 0x82c0, 0x0008, 0xff00,</div><div class='del'>-	0x0008, 0x7f04, 0x0009, 0x82e0, 0x0008, 0x0600, 0x0003, 0x0c3e,</div><div class='del'>-	0x0009, 0x82e0, 0x0008, 0x0500, 0x0003, 0x0c3e, 0x0009, 0x82e0,</div><div class='del'>-	0x0000, 0x0400, 0x0003, 0x8cd1, 0x0009, 0xc4c0, 0x0000, 0x7000,</div><div class='del'>-	0x0009, 0xffe0, 0x0000, 0x1000, 0x000b, 0x0c6a, 0x0004, 0x04df,</div><div class='del'>-	0x0002, 0x3941, 0x0003, 0x0c49, 0x0000, 0x8072, 0x0000, 0x0400,</div><div class='del'>-	0x0003, 0x0013, 0x0000, 0x0460, 0x0008, 0x80fe, 0x0008, 0x002b,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8066, 0x0008, 0x2209, 0x000b, 0xc44f,</div><div class='del'>-	0x0008, 0x11fc, 0x0003, 0x3465, 0x0001, 0x9180, 0x0000, 0x0002,</div><div class='del'>-	0x0000, 0x8060, 0x0000, 0x0400, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x0609, 0x0003, 0xc459, 0x0000, 0x42fe, 0x0001, 0xffc0,</div><div class='del'>-	0x0008, 0xff00, 0x0009, 0x03e0, 0x000b, 0x8c62, 0x0000, 0x8072,</div><div class='del'>-	0x0000, 0x0400, 0x000b, 0x0056, 0x0001, 0x9180, 0x0008, 0x0003,</div><div class='del'>-	0x000b, 0x044c, 0x0000, 0x8072, 0x0000, 0x0400, 0x0008, 0x8010,</div><div class='del'>-	0x0000, 0x0010, 0x000b, 0x04c4, 0x0004, 0x04df, 0x0002, 0x3941,</div><div class='del'>-	0x0003, 0x0c70, 0x0000, 0x8072, 0x0000, 0x0400, 0x0003, 0x0013,</div><div class='del'>-	0x000a, 0x6e42, 0x0003, 0x0c75, 0x000c, 0x04a9, 0x0008, 0x11fc,</div><div class='del'>-	0x0003, 0xb47a, 0x0000, 0x8072, 0x0000, 0x0400, 0x0008, 0x8010,</div><div class='del'>-	0x0000, 0x000e, 0x000b, 0x04c4, 0x0000, 0x8060, 0x0000, 0x0400,</div><div class='del'>-	0x0000, 0x04fc, 0x0003, 0xb48f, 0x0008, 0x808c, 0x0008, 0x0000,</div><div class='del'>-	0x0001, 0x9180, 0x0008, 0x0005, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x0009, 0x000b, 0xc485, 0x0008, 0x0060, 0x0008, 0x8062,</div><div class='del'>-	0x0008, 0x001b, 0x0008, 0x4304, 0x0008, 0x4206, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x0412, 0x0003, 0xc48d, 0x0003, 0x04a6, 0x0008, 0x808c,</div><div class='del'>-	0x0000, 0x0001, 0x0000, 0x0460, 0x0008, 0x8062, 0x0008, 0x002b,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x0609, 0x0003, 0xc496, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x220a, 0x0003, 0xc499, 0x0000, 0x42fe, 0x0001, 0xffc0,</div><div class='del'>-	0x0008, 0xff00, 0x0008, 0x7f04, 0x0000, 0x8060, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0x9180, 0x0000, 0x0002, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0008, 0x041a, 0x0003, 0xc4a5, 0x0000, 0x8072, 0x0000, 0x0400,</div><div class='del'>-	0x000b, 0x0056, 0x0000, 0x8060, 0x0000, 0x0400, 0x0008, 0x6b62,</div><div class='del'>-	0x0000, 0x8066, 0x0000, 0x0411, 0x000b, 0xc4ae, 0x0008, 0x02fe,</div><div class='del'>-	0x0009, 0x03e0, 0x0003, 0x8cb4, 0x0000, 0x0d22, 0x000f, 0x4000,</div><div class='del'>-	0x0009, 0x8280, 0x0000, 0x0002, 0x0001, 0x6b80, 0x0008, 0x7f62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x2209, 0x000b, 0xc4ba, 0x000a, 0x0200,</div><div class='del'>-	0x0001, 0xffc0, 0x0000, 0x0007, 0x0000, 0x7f06, 0x0008, 0x6b62,</div><div class='del'>-	0x0000, 0x8066, 0x0008, 0x060a, 0x000b, 0xc4c2, 0x000f, 0x4000,</div><div class='del'>-	0x0002, 0x3a44, 0x0003, 0x8813, 0x000a, 0x2f44, 0x000a, 0x2f44,</div><div class='del'>-	0x0003, 0x8bd0, 0x0008, 0x808a, 0x0008, 0x0003, 0x0000, 0x8074,</div><div class='del'>-	0x0000, 0xf080, 0x0003, 0x5ccd, 0x0008, 0x8054, 0x0000, 0x0019,</div><div class='del'>-	0x0003, 0x0013, 0x0002, 0x3a44, 0x0003, 0x8813, 0x0008, 0x808c,</div><div class='del'>-	0x0008, 0x0000, 0x0008, 0x8010, 0x0008, 0x0011, 0x0004, 0x0387,</div><div class='del'>-	0x0000, 0x42fe, 0x0001, 0xffc0, 0x0008, 0x00ff, 0x0008, 0x7f10,</div><div class='del'>-	0x0004, 0x0387, 0x0008, 0x4310, 0x000b, 0x03dd, 0x0002, 0x3941,</div><div class='del'>-	0x000b, 0x0ce2, 0x000f, 0x4000, 0x0000, 0x8072, 0x0008, 0x0404,</div><div class='del'>-	0x000f, 0x4000, 0x0008, 0x8010, 0x0008, 0x0012, 0x0004, 0x0387,</div><div class='del'>-	0x000c, 0x04a9, 0x0000, 0x1110, 0x0004, 0x0387, 0x0008, 0x11fc,</div><div class='del'>-	0x000b, 0xb4e8, 0x0003, 0x0013, 0x0009, 0xc2c0, 0x0008, 0x00ff,</div><div class='del'>-	0x0000, 0x7f00, 0x0001, 0xc3c0, 0x0008, 0xff00, 0x0009, 0x00d0,</div><div class='del'>-	0x000b, 0x0d13, 0x0000, 0x0d0a, 0x0001, 0x8580, 0x0000, 0x1000,</div><div class='del'>-	0x0008, 0x7f62, 0x0000, 0x8060, 0x0000, 0x0400, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x0809, 0x000b, 0xc4fd, 0x0000, 0x04fc, 0x000b, 0x350c,</div><div class='del'>-	0x0000, 0x0460, 0x0008, 0x8062, 0x0000, 0x0004, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x0211, 0x000b, 0xc505, 0x0008, 0x01fe, 0x0009, 0x00e0,</div><div class='del'>-	0x000b, 0x8d0c, 0x0008, 0x02fe, 0x0001, 0x43e0, 0x0003, 0x0d12,</div><div class='del'>-	0x0002, 0x0500, 0x0000, 0x7f0a, 0x0009, 0xffe0, 0x0000, 0x0800,</div><div class='del'>-	0x0003, 0x8cf6, 0x0008, 0x0d08, 0x000f, 0x4000, 0x0008, 0x43fe,</div><div class='del'>-	0x0001, 0x3e80, 0x0000, 0x0d60, 0x0008, 0x7f62, 0x0000, 0x8066,</div><div class='del'>-	0x0000, 0x0809, 0x0003, 0xc519, 0x0000, 0x8060, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0x84c0, 0x0008, 0xff00, 0x0002, 0x7f70, 0x0009, 0xff80,</div><div class='del'>-	0x0000, 0x1000, 0x0008, 0x7f62, 0x0000, 0x8066, 0x0000, 0x0809,</div><div class='del'>-	0x000b, 0xc524, 0x000f, 0x4000, 0xe4a8, 0xa3b9</div><div class='del'>-};</div><div class='del'>-unsigned short rseqipx_code_length01 = 0x0a4e;</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-unsigned long xseqipx_code_addr01 = 0x0001e000 ;</div><div class='del'>-unsigned short xseqipx_code01[] = { </div><div class='del'>-0x0013, 0x0003, 0x0000, 0x1252, 0x0001, 0xe000, 0x0005, 0x0032,</div><div class='del'>-	0x0000, 0x0010, 0x0015, 0x0033, 0x0010, 0xbb39, 0x000b, 0x8007,</div><div class='del'>-	0x0004, 0x0113, 0x0004, 0x0125, 0x0010, 0xc000, 0x0000, 0xc001,</div><div class='del'>-	0x0000, 0xc0b0, 0x0010, 0xc0b1, 0x0010, 0xc0b2, 0x0000, 0xc0b3,</div><div class='del'>-	0x0010, 0xc0b4, 0x0000, 0xc0b5, 0x0000, 0xc0b6, 0x0010, 0xc0b7,</div><div class='del'>-	0x0010, 0xc0b8, 0x0000, 0xc0b9, 0x0000, 0xc0ba, 0x0000, 0xc0c2,</div><div class='del'>-	0x0010, 0xc0c3, 0x0000, 0xc0c4, 0x0010, 0xc0c5, 0x0010, 0xc0c6,</div><div class='del'>-	0x0000, 0xc0c7, 0x0000, 0xc0c8, 0x0010, 0xc0c9, 0x0010, 0xc0ca,</div><div class='del'>-	0x0000, 0xc0cb, 0x0010, 0xc0cc, 0x0000, 0xc0cd, 0x0000, 0xc0ce,</div><div class='del'>-	0x0010, 0xc0cf, 0x0015, 0x0039, 0x0010, 0xff00, 0x0015, 0x003a,</div><div class='del'>-	0x0010, 0xff00, 0x0005, 0x00d0, 0x0010, 0xff00, 0x0015, 0x00d1,</div><div class='del'>-	0x0010, 0xff00, 0x0012, 0x3a40, 0x000b, 0x1031, 0x0002, 0x7940,</div><div class='del'>-	0x001b, 0x1137, 0x0002, 0x3a42, 0x001b, 0x1035, 0x0003, 0xb035,</div><div class='del'>-	0x0003, 0xa1e2, 0x0002, 0x3a41, 0x001b, 0x1039, 0x0012, 0x7941,</div><div class='del'>-	0x001b, 0x1317, 0x0013, 0xe054, 0x0001, 0x0fe8, 0x0000, 0x0001,</div><div class='del'>-	0x0013, 0x1054, 0x0000, 0x0cfe, 0x0013, 0x6047, 0x0002, 0x3a44,</div><div class='del'>-	0x001b, 0x1047, 0x0011, 0x02e8, 0x0010, 0x0000, 0x0013, 0x13cd,</div><div class='del'>-	0x0011, 0x02e8, 0x0010, 0x0005, 0x0013, 0x145f, 0x0012, 0x3a46,</div><div class='del'>-	0x000b, 0x1054, 0x0011, 0x02e8, 0x0010, 0x0000, 0x0013, 0x104f,</div><div class='del'>-	0x0011, 0x02e8, 0x0010, 0x0005, 0x000b, 0x1054, 0x0000, 0x12fe,</div><div class='del'>-	0x0003, 0x6054, 0x0001, 0x0fe8, 0x0010, 0x0000, 0x0003, 0x1695,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0010, 0xc131, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb211, 0x001b, 0x8059, 0x0010, 0xb2ff, 0x0001, 0xb3e0,</div><div class='del'>-	0x001c, 0x10d5, 0x000b, 0xf02d, 0x0011, 0x3be8, 0x0000, 0x0010,</div><div class='del'>-	0x001b, 0x1071, 0x0000, 0x0afe, 0x000b, 0x6065, 0x0000, 0x3c0b,</div><div class='del'>-	0x0003, 0x006d, 0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0x0a88,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0x3c0a,</div><div class='del'>-	0x001b, 0x806c, 0x0010, 0x3c0a, 0x0002, 0x0c00, 0x0010, 0xff0c,</div><div class='del'>-	0x0013, 0x00d2, 0x0011, 0x3be8, 0x0010, 0x0012, 0x001b, 0x1084,</div><div class='del'>-	0x0010, 0x08fe, 0x000b, 0x6078, 0x0010, 0x3c09, 0x0003, 0x0080,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0888, 0x0010, 0x0003,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0x3c0a, 0x000b, 0x807f,</div><div class='del'>-	0x0000, 0x3c08, 0x0002, 0x0c00, 0x0010, 0xff0c, 0x0013, 0x00d2,</div><div class='del'>-	0x0011, 0x3be8, 0x0000, 0x0013, 0x000b, 0x108a, 0x0000, 0x3cb0,</div><div class='del'>-	0x0014, 0x00e5, 0x0013, 0x00d2, 0x0011, 0x3be8, 0x0000, 0x0019,</div><div class='del'>-	0x000b, 0x109d, 0x0010, 0x04fe, 0x001b, 0x6091, 0x0010, 0x3c05,</div><div class='del'>-	0x0013, 0x0099, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0488,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0x3c0a,</div><div class='del'>-	0x000b, 0x8098, 0x0000, 0x3c04, 0x0002, 0x0c00, 0x0010, 0xff0c,</div><div class='del'>-	0x0013, 0x00d2, 0x0011, 0x3be8, 0x0010, 0x001b, 0x001b, 0x10a6,</div><div class='del'>-	0x0010, 0xc014, 0x0000, 0xc013, 0x0000, 0xc010, 0x0015, 0x000f,</div><div class='del'>-	0x0010, 0x0000, 0x0013, 0x00d2, 0x0011, 0x3be8, 0x0000, 0x0015,</div><div class='del'>-	0x001b, 0x10b2, 0x0004, 0x011c, 0x0014, 0x012e, 0x0015, 0x0039,</div><div class='del'>-	0x0000, 0x8000, 0x0017, 0x8000, 0x0004, 0x0113, 0x0004, 0x0125,</div><div class='del'>-	0x0014, 0x00fe, 0x0013, 0x002d, 0x0011, 0x3be8, 0x0000, 0x0016,</div><div class='del'>-	0x000b, 0x10c4, 0x0001, 0x0fe8, 0x0010, 0x0000, 0x0003, 0x10be,</div><div class='del'>-	0x0001, 0x0fe8, 0x0000, 0x0002, 0x0003, 0x10be, 0x0015, 0x0039,</div><div class='del'>-	0x0010, 0x1010, 0x0013, 0x00d2, 0x0015, 0x0039, 0x0000, 0x5040,</div><div class='del'>-	0x0015, 0x00b8, 0x0000, 0x0008, 0x0014, 0x0925, 0x0013, 0x00d2,</div><div class='del'>-	0x0011, 0x3be8, 0x0010, 0x0017, 0x001b, 0x10c9, 0x0010, 0x3cc3,</div><div class='del'>-	0x0013, 0x00d2, 0x0011, 0x3be8, 0x0010, 0x0018, 0x000b, 0x10ce,</div><div class='del'>-	0x0000, 0x3cc2, 0x0013, 0x00d2, 0x0005, 0x00ce, 0x0000, 0x0001,</div><div class='del'>-	0x0000, 0x3bcf, 0x0014, 0x08e7, 0x0015, 0x0039, 0x0000, 0x8000,</div><div class='del'>-	0x0013, 0x002d, 0x0001, 0xb288, 0x0000, 0x0002, 0x0001, 0xc180,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x80db,</div><div class='del'>-	0x0002, 0xb200, 0x0011, 0xffc8, 0x0000, 0x0007, 0x0010, 0xffb2,</div><div class='del'>-	0x0010, 0xc131, 0x0015, 0x0033, 0x0010, 0xb20a, 0x0001, 0xb0d0,</div><div class='del'>-	0x001b, 0x80e4, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0xb088,</div><div class='del'>-	0x0000, 0x0010, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xb109,</div><div class='del'>-	0x000b, 0x80ec, 0x0001, 0xb1e8, 0x0010, 0xffff, 0x0013, 0x10fd,</div><div class='del'>-	0x0000, 0x11fe, 0x001b, 0x60f4, 0x0000, 0xb012, 0x0013, 0x00fc,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0x1188, 0x0010, 0x0003,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb00a, 0x000b, 0x80fb,</div><div class='del'>-	0x0000, 0xb011, 0x0017, 0x4000, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0xbc88, 0x0000, 0x001f, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xc411, 0x000b, 0x8105, 0x0011, 0xbc88, 0x0010, 0x0018,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xc609, 0x001b, 0x810b,</div><div class='del'>-	0x0011, 0xbc88, 0x0000, 0x0037, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xc709, 0x000b, 0x8111, 0x0017, 0x4000, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0001, 0xbb88, 0x0000, 0x0001, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0x0269, 0x001b, 0x811a, 0x0017, 0x4000,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0xbb88, 0x0000, 0x0001,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0x026a, 0x001b, 0x8123,</div><div class='del'>-	0x0017, 0x4000, 0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0xbb88,</div><div class='del'>-	0x0010, 0x000f, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0x0f59,</div><div class='del'>-	0x001b, 0x812c, 0x0017, 0x4000, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0xbb88, 0x0010, 0x000f, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0x0f5a, 0x000b, 0x8135, 0x0017, 0x4000, 0x0000, 0xd0ff,</div><div class='del'>-	0x0012, 0xff40, 0x000b, 0x1031, 0x0015, 0x00d1, 0x0010, 0x0101,</div><div class='del'>-	0x0003, 0x913c, 0x0005, 0x0079, 0x0000, 0x0001, 0x0003, 0x913f,</div><div class='del'>-	0x0015, 0x00d1, 0x0000, 0x0100, 0x0011, 0x02e8, 0x0000, 0x0002,</div><div class='del'>-	0x0003, 0x1167, 0x0011, 0x02e8, 0x0000, 0x0001, 0x0003, 0x117f,</div><div class='del'>-	0x0011, 0x02e8, 0x0000, 0x0004, 0x0003, 0x119d, 0x0011, 0x02e8,</div><div class='del'>-	0x0010, 0x0003, 0x0003, 0x11ce, 0x0005, 0x0002, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xc00e, 0x0000, 0xc00d, 0x0010, 0xc003, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0001, 0xbd88, 0x0010, 0x0009, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xc00a, 0x000b, 0x815a, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xc00a, 0x001b, 0x815e, 0x0012, 0x3a45,</div><div class='del'>-	0x0013, 0x1166, 0x0015, 0x003a, 0x0000, 0x2000, 0x0015, 0x003a,</div><div class='del'>-	0x0010, 0x1010, 0x0004, 0x0911, 0x0003, 0x004f, 0x0012, 0x7849,</div><div class='del'>-	0x0003, 0x11dc, 0x0010, 0x0dfe, 0x0003, 0x6150, 0x0012, 0x0c10,</div><div class='del'>-	0x0010, 0xff0c, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb309,</div><div class='del'>-	0x000b, 0x8174, 0x0010, 0xb3fe, 0x0013, 0x617c, 0x0010, 0xb30b,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xc00a, 0x001b, 0x817a, 0x0003, 0x01d1,</div><div class='del'>-	0x0000, 0xc00b, 0x0010, 0xc00a, 0x0003, 0x01d1, 0x0000, 0x78b0,</div><div class='del'>-	0x0012, 0xb044, 0x0003, 0x11dc, 0x0002, 0xb049, 0x0003, 0x11dc,</div><div class='del'>-	0x0010, 0x71ff, 0x0012, 0xff38, 0x0010, 0xff71, 0x0010, 0x0dfe,</div><div class='del'>-	0x0003, 0x614e, 0x0012, 0x0c10, 0x0010, 0xff0c, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0010, 0x0003, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb309, 0x001b, 0x8192, 0x0010, 0xb3fe,</div><div class='del'>-	0x0003, 0x619a, 0x0000, 0xb309, 0x0015, 0x0033, 0x0010, 0xc00a,</div><div class='del'>-	0x001b, 0x8198, 0x0003, 0x01d1, 0x0010, 0xc009, 0x0000, 0xc008,</div><div class='del'>-	0x0003, 0x01d1, 0x0000, 0x78b0, 0x0012, 0xb044, 0x0003, 0x11dc,</div><div class='del'>-	0x0002, 0xb049, 0x0003, 0x11dc, 0x0010, 0x71ff, 0x0012, 0xff38,</div><div class='del'>-	0x0010, 0xff71, 0x0010, 0x0dfe, 0x0003, 0x614e, 0x0012, 0x0c10,</div><div class='del'>-	0x0010, 0xff0c, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb309,</div><div class='del'>-	0x001b, 0x81b0, 0x0010, 0xb3fe, 0x0003, 0x61b8, 0x0000, 0xb305,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xc00a, 0x001b, 0x81b6, 0x0013, 0x01ba,</div><div class='del'>-	0x0010, 0xc005, 0x0000, 0xc004, 0x0002, 0x033f, 0x0002, 0xff27,</div><div class='del'>-	0x0000, 0x0db8, 0x0014, 0x03c2, 0x0000, 0x0db8, 0x0014, 0x0925,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0xbc88, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb309, 0x001b, 0x81c7,</div><div class='del'>-	0x0011, 0xb3e8, 0x0000, 0x0002, 0x000b, 0x114e, 0x0005, 0x0002,</div><div class='del'>-	0x0010, 0x0005, 0x0003, 0x0150, 0x0012, 0x7849, 0x0003, 0x11dc,</div><div class='del'>-	0x0003, 0x0150, 0x0000, 0x0db8, 0x0012, 0x0345, 0x000b, 0x11d7,</div><div class='del'>-	0x0002, 0x033f, 0x0014, 0x03c2, 0x0003, 0x014e, 0x0002, 0x033f,</div><div class='del'>-	0x0002, 0xff27, 0x0014, 0x03c2, 0x0014, 0x0925, 0x0003, 0x014e,</div><div class='del'>-	0x0015, 0x00b8, 0x0000, 0x0001, 0x0015, 0x003a, 0x0010, 0x0101,</div><div class='del'>-	0x0014, 0x0925, 0x0003, 0x015f, 0x0001, 0x2bd8, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xffba, 0x0003, 0xb1e5, 0x0005, 0x002a, 0x0000, 0x0002,</div><div class='del'>-	0x0001, 0xbac8, 0x0000, 0x0700, 0x000b, 0x12d2, 0x0011, 0x15e8,</div><div class='del'>-	0x0000, 0x0002, 0x0013, 0x1248, 0x0011, 0x15e8, 0x0000, 0x0001,</div><div class='del'>-	0x0003, 0x11f4, 0x0005, 0x0015, 0x0010, 0x0000, 0x0003, 0x022b,</div><div class='del'>-	0x0005, 0x0015, 0x0010, 0x0000, 0x0002, 0xba43, 0x0003, 0x122c,</div><div class='del'>-	0x0003, 0xb1f8, 0x0005, 0x002a, 0x0000, 0x0004, 0x0012, 0xba42,</div><div class='del'>-	0x0003, 0x1232, 0x0012, 0x104b, 0x000b, 0x122b, 0x0000, 0x1a30,</div><div class='del'>-	0x0005, 0x0031, 0x0000, 0x0002, 0x0015, 0x0033, 0x0000, 0x1b2a,</div><div class='del'>-	0x001b, 0x8204, 0x0011, 0x20d8, 0x0010, 0x0000, 0x0000, 0xffb0,</div><div class='del'>-	0x0001, 0x21d8, 0x0010, 0x0000, 0x0010, 0xffb1, 0x0001, 0x22d8,</div><div class='del'>-	0x0010, 0x0000, 0x0010, 0xffb2, 0x0011, 0x23d8, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xffb3, 0x0001, 0x24d8, 0x0010, 0x0000, 0x0010, 0xffb4,</div><div class='del'>-	0x0011, 0x25d8, 0x0010, 0x0000, 0x0000, 0xffb5, 0x0001, 0x28d8,</div><div class='del'>-	0x0010, 0x0000, 0x0010, 0xffb8, 0x0011, 0x29d8, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xffb9, 0x0000, 0x1a30, 0x0005, 0x0031, 0x0000, 0x0007,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xb032, 0x000b, 0x8222, 0x0000, 0x1a30,</div><div class='del'>-	0x0005, 0x0031, 0x0010, 0x000f, 0x0015, 0x0033, 0x0010, 0xb812,</div><div class='del'>-	0x000b, 0x8228, 0x0005, 0x0015, 0x0010, 0x0000, 0x0013, 0x0035,</div><div class='del'>-	0x0000, 0x1efe, 0x0013, 0x6240, 0x0014, 0x0277, 0x0000, 0x1efe,</div><div class='del'>-	0x000c, 0x6277, 0x0003, 0x022b, 0x0000, 0x1a30, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0020, 0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x8237,</div><div class='del'>-	0x0002, 0xb02f, 0x0000, 0xffb0, 0x0005, 0x0031, 0x0000, 0x0020,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb00a, 0x001b, 0x823e, 0x0003, 0x01ff,</div><div class='del'>-	0x0015, 0x00b8, 0x0010, 0x0005, 0x0014, 0x0925, 0x0000, 0x13b8,</div><div class='del'>-	0x0015, 0x003a, 0x0010, 0x0404, 0x0014, 0x0925, 0x0003, 0x022b,</div><div class='del'>-	0x0005, 0x0015, 0x0000, 0x0001, 0x0012, 0xba42, 0x0013, 0x1256,</div><div class='del'>-	0x0003, 0xb24c, 0x0001, 0x2bd8, 0x0010, 0x0000, 0x0012, 0xff4f,</div><div class='del'>-	0x000b, 0x11e2, 0x0002, 0xba43, 0x001b, 0x1232, 0x0000, 0x1efe,</div><div class='del'>-	0x000c, 0x6277, 0x0003, 0x022b, 0x0001, 0x28d8, 0x0010, 0x0000,</div><div class='del'>-	0x0010, 0xffb8, 0x0011, 0x29d8, 0x0010, 0x0000, 0x0000, 0xffb9,</div><div class='del'>-	0x0014, 0x02e8, 0x0002, 0x3a42, 0x000b, 0x122b, 0x0000, 0x1c30,</div><div class='del'>-	0x0015, 0x00ff, 0x0000, 0x0002, 0x0002, 0x1f43, 0x001b, 0x1267,</div><div class='del'>-	0x0001, 0xff88, 0x0000, 0x0002, 0x0003, 0x0269, 0x0001, 0xff88,</div><div class='del'>-	0x0000, 0x0004, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb011,</div><div class='del'>-	0x000b, 0x826c, 0x0000, 0xb0ff, 0x0011, 0x16a0, 0x0000, 0xff16,</div><div class='del'>-	0x001b, 0x2273, 0x0002, 0xb100, 0x0003, 0x0274, 0x0010, 0xb1ff,</div><div class='del'>-	0x0001, 0x17a0, 0x0010, 0xff17, 0x0013, 0x0232, 0x0000, 0x16ff,</div><div class='del'>-	0x0001, 0x18a0, 0x0010, 0xff00, 0x000b, 0x227e, 0x0002, 0x1700,</div><div class='del'>-	0x0013, 0x12d1, 0x0013, 0x027f, 0x0010, 0x17ff, 0x0011, 0x19a0,</div><div class='del'>-	0x0013, 0x22d1, 0x0011, 0x00d0, 0x0013, 0x12d1, 0x0000, 0x1c30,</div><div class='del'>-	0x0000, 0x1b31, 0x0015, 0x0033, 0x0000, 0xb131, 0x000b, 0x8287,</div><div class='del'>-	0x0013, 0xb288, 0x0000, 0xb120, 0x0010, 0xb221, 0x0002, 0x1f43,</div><div class='del'>-	0x001b, 0x1294, 0x0010, 0xc022, 0x0000, 0xc023, 0x0000, 0xb324,</div><div class='del'>-	0x0000, 0xb425, 0x0010, 0xb3b5, 0x0000, 0xb4b6, 0x0013, 0x0298,</div><div class='del'>-	0x0000, 0xb322, 0x0000, 0xb423, 0x0000, 0xb524, 0x0010, 0xb625,</div><div class='del'>-	0x0003, 0xb298, 0x0005, 0x002a, 0x0000, 0x0001, 0x0012, 0x1500,</div><div class='del'>-	0x0000, 0xff15, 0x0000, 0x16ff, 0x0001, 0xb580, 0x0000, 0xff16,</div><div class='del'>-	0x000b, 0x22a3, 0x0002, 0x1700, 0x0013, 0x02a4, 0x0010, 0x17ff,</div><div class='del'>-	0x0001, 0xb680, 0x0010, 0xff17, 0x0012, 0x1e10, 0x0010, 0xff1e,</div><div class='del'>-	0x0003, 0x62d1, 0x0002, 0x1d00, 0x0010, 0xff1d, 0x0010, 0xc030,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009, 0x000b, 0x82af,</div><div class='del'>-	0x0010, 0xb0fe, 0x000b, 0x62d0, 0x0000, 0x1c30, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0001, 0x0015, 0x0033, 0x0000, 0xb009, 0x000b, 0x82b7,</div><div class='del'>-	0x0010, 0xb0fe, 0x001b, 0x62bd, 0x0005, 0x00ce, 0x0010, 0x0005,</div><div class='del'>-	0x0003, 0x08e7, 0x0010, 0xb01c, 0x0000, 0x1c30, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0019, 0x0015, 0x0033, 0x0000, 0xb009, 0x000b, 0x82c3,</div><div class='del'>-	0x0001, 0xb0c8, 0x0010, 0x00ff, 0x0000, 0xff1f, 0x0010, 0xc030,</div><div class='del'>-	0x0011, 0xbe80, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x000b, 0x82cc, 0x0000, 0xb01d, 0x0010, 0x1dff, 0x0013, 0x02ab,</div><div class='del'>-	0x0000, 0xb01b, 0x0017, 0x4000, 0x0002, 0x3a41, 0x0003, 0x12da,</div><div class='del'>-	0x0013, 0xb2d4, 0x0005, 0x002a, 0x0000, 0x0004, 0x0005, 0x0015,</div><div class='del'>-	0x0010, 0x0000, 0x0003, 0x022b, 0x0000, 0x1a30, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0002, 0x0015, 0x0033, 0x0000, 0x1b2a, 0x001b, 0x82df,</div><div class='del'>-	0x0015, 0x00b8, 0x0000, 0x0004, 0x0014, 0x0925, 0x0000, 0x13b8,</div><div class='del'>-	0x0015, 0x003a, 0x0010, 0x0404, 0x0014, 0x0925, 0x0013, 0x0039,</div><div class='del'>-	0x0002, 0x1e00, 0x0010, 0xff1e, 0x0012, 0x1d10, 0x0010, 0xff1d,</div><div class='del'>-	0x0010, 0xc030, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x000b, 0x82f0, 0x0010, 0xb0fe, 0x001b, 0x6315, 0x0000, 0x1cff,</div><div class='del'>-	0x0001, 0x1ae0, 0x0013, 0x12ff, 0x0000, 0x1c30, 0x0005, 0x0031,</div><div class='del'>-	0x0010, 0x0000, 0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x82fb,</div><div class='del'>-	0x0010, 0xb0fe, 0x001b, 0x62ff, 0x0000, 0x1aff, 0x0000, 0xff1c,</div><div class='del'>-	0x0000, 0x1c30, 0x0005, 0x0031, 0x0000, 0x0019, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb009, 0x001b, 0x8305, 0x0001, 0xb0c8, 0x0010, 0x000f,</div><div class='del'>-	0x0000, 0xff1f, 0x0001, 0xbf80, 0x0010, 0xff1d, 0x0010, 0xc030,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x830f,</div><div class='del'>-	0x0010, 0xb0fe, 0x001b, 0x6315, 0x0005, 0x00ce, 0x0010, 0x0006,</div><div class='del'>-	0x0003, 0x08e7, 0x0000, 0xb01b, 0x0017, 0x4000, 0x0010, 0x79b0,</div><div class='del'>-	0x0000, 0xd0ff, 0x0012, 0xff40, 0x001b, 0x1039, 0x0015, 0x00d1,</div><div class='del'>-	0x0010, 0x0101, 0x0013, 0x931d, 0x0005, 0x0079, 0x0000, 0x0002,</div><div class='del'>-	0x0003, 0x9320, 0x0015, 0x00d1, 0x0000, 0x0100, 0x0010, 0x13fe,</div><div class='del'>-	0x0013, 0x6371, 0x0012, 0xb04e, 0x001b, 0x139a, 0x0000, 0x78b0,</div><div class='del'>-	0x0002, 0xb045, 0x0003, 0x13a0, 0x0012, 0x784a, 0x0003, 0x13a0,</div><div class='del'>-	0x0000, 0x75ff, 0x0011, 0xffc8, 0x0010, 0x1800, 0x001b, 0x13a0,</div><div class='del'>-	0x0001, 0x0fe8, 0x0000, 0x0001, 0x001b, 0x133c, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x1388, 0x0000, 0x000e, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0x8f0a, 0x001b, 0x833a, 0x0013, 0x03a6,</div><div class='del'>-	0x0001, 0x0fe8, 0x0000, 0x0002, 0x001b, 0x1347, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0005, 0x0031, 0x0000, 0x001a, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xc00a, 0x000b, 0x8345, 0x0013, 0x03a6, 0x0001, 0x0fe8,</div><div class='del'>-	0x0010, 0x0000, 0x0003, 0x134e, 0x0005, 0x00ce, 0x0000, 0x0007,</div><div class='del'>-	0x0010, 0x0fcf, 0x0003, 0x08e1, 0x0002, 0xd142, 0x0013, 0x1367,</div><div class='del'>-	0x0015, 0x00d1, 0x0000, 0x0400, 0x0011, 0x13e8, 0x0001, 0x1b55,</div><div class='del'>-	0x000b, 0x1367, 0x0005, 0x0031, 0x0011, 0x1b6d, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb409, 0x001b, 0x8359, 0x0002, 0xb400, 0x0010, 0xffb4,</div><div class='del'>-	0x0005, 0x0031, 0x0011, 0x1b6d, 0x0015, 0x0033, 0x0010, 0xb40a,</div><div class='del'>-	0x001b, 0x8360, 0x0012, 0xd042, 0x0003, 0x1371, 0x0015, 0x00b8,</div><div class='del'>-	0x0000, 0x000d, 0x0014, 0x0925, 0x0003, 0x0054, 0x0000, 0x13b8,</div><div class='del'>-	0x0002, 0x1045, 0x0003, 0x136f, 0x0012, 0x103f, 0x0002, 0xff27,</div><div class='del'>-	0x0014, 0x03c2, 0x0014, 0x0925, 0x0013, 0x0371, 0x0012, 0x103f,</div><div class='del'>-	0x0014, 0x03c2, 0x0015, 0x000f, 0x0010, 0x0000, 0x0002, 0x3944,</div><div class='del'>-	0x0013, 0x137a, 0x0015, 0x0039, 0x0000, 0x5040, 0x0015, 0x00b8,</div><div class='del'>-	0x0000, 0x0008, 0x0014, 0x0925, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0xbd88, 0x0010, 0x000c, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xc00a, 0x001b, 0x8381, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xc00a, 0x000b, 0x8385, 0x0010, 0xc014, 0x0000, 0xc013,</div><div class='del'>-	0x0000, 0xc010, 0x0000, 0xa4ff, 0x0003, 0x6392, 0x0011, 0xffa8,</div><div class='del'>-	0x0010, 0x0005, 0x000b, 0x2392, 0x0015, 0x00d1, 0x0010, 0x0404,</div><div class='del'>-	0x0015, 0x003a, 0x0000, 0x8000, 0x0002, 0x3a47, 0x0003, 0x1399,</div><div class='del'>-	0x0015, 0x003a, 0x0000, 0x8000, 0x0015, 0x003a, 0x0010, 0x4040,</div><div class='del'>-	0x0004, 0x08ec, 0x0013, 0x0039, 0x0015, 0x00b8, 0x0010, 0x0003,</div><div class='del'>-	0x0015, 0x003a, 0x0010, 0x0202, 0x0014, 0x0925, 0x0003, 0x0389,</div><div class='del'>-	0x0015, 0x00b8, 0x0000, 0x0002, 0x0015, 0x003a, 0x0010, 0x0202,</div><div class='del'>-	0x0014, 0x0925, 0x0003, 0x0389, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x1388, 0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb009, 0x000b, 0x83ad, 0x0011, 0x1388, 0x0010, 0x0003,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xc00a, 0x000b, 0x83b3,</div><div class='del'>-	0x0010, 0xb0fe, 0x0013, 0x63b8, 0x0000, 0xb012, 0x0003, 0x03ba,</div><div class='del'>-	0x0010, 0xc012, 0x0010, 0xc011, 0x0012, 0x104b, 0x0003, 0x134e,</div><div class='del'>-	0x0002, 0x103b, 0x0010, 0xff03, 0x0005, 0x0002, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xc00d, 0x0013, 0x034e, 0x0000, 0xffb0, 0x0010, 0xc3b1,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0xb888, 0x0010, 0x0011,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb012, 0x000b, 0x83cb,</div><div class='del'>-	0x0017, 0x4000, 0x0002, 0xd142, 0x001b, 0x1485, 0x0012, 0x3a43,</div><div class='del'>-	0x0003, 0x13de, 0x0015, 0x003a, 0x0000, 0x0800, 0x0010, 0x0db0,</div><div class='del'>-	0x0013, 0x63de, 0x0000, 0x0bff, 0x0001, 0xb0e0, 0x0003, 0x1407,</div><div class='del'>-	0x0010, 0x09ff, 0x0001, 0xb0e0, 0x0003, 0x13eb, 0x0010, 0x05ff,</div><div class='del'>-	0x0001, 0xb0e0, 0x0003, 0x13e2, 0x0000, 0xc00e, 0x0000, 0x05fe,</div><div class='del'>-	0x0013, 0x63e8, 0x0000, 0x050d, 0x0005, 0x0002, 0x0000, 0x0004,</div><div class='del'>-	0x0014, 0x046c, 0x0002, 0x3a47, 0x001b, 0x146b, 0x0013, 0x0402,</div><div class='del'>-	0x0000, 0x09fe, 0x0013, 0x6404, 0x0000, 0x090d, 0x0005, 0x0002,</div><div class='del'>-	0x0000, 0x0001, 0x0014, 0x049a, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0000, 0x0004, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xba09, 0x001b, 0x83f5, 0x0011, 0x03c8, 0x0010, 0x000f,</div><div class='del'>-	0x0000, 0xffb6, 0x0011, 0xb6e8, 0x0000, 0x0001, 0x0003, 0x153f,</div><div class='del'>-	0x0011, 0xb6e8, 0x0000, 0x0002, 0x0013, 0x1561, 0x0011, 0xb6e8,</div><div class='del'>-	0x0010, 0x0003, 0x0003, 0x1653, 0x0004, 0x08ec, 0x0013, 0x046b,</div><div class='del'>-	0x0010, 0x0bfe, 0x0013, 0x646b, 0x0010, 0x0b0d, 0x0005, 0x0002,</div><div class='del'>-	0x0000, 0x0002, 0x0014, 0x049a, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0000, 0x0004, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xba09, 0x000b, 0x8411, 0x0000, 0xb930, 0x0005, 0x0031,</div><div class='del'>-	0x0010, 0x0021, 0x0015, 0x0033, 0x0000, 0xb009, 0x000b, 0x8417,</div><div class='del'>-	0x0001, 0xb0a8, 0x0000, 0x199a, 0x0013, 0x241d, 0x0005, 0x00b0,</div><div class='del'>-	0x0000, 0x1999, 0x0012, 0xb050, 0x0000, 0xffb0, 0x0002, 0xff50,</div><div class='del'>-	0x0002, 0xff50, 0x0001, 0xb080, 0x0000, 0xffb0, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0010, 0x0006, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb00a, 0x001b, 0x842a, 0x0000, 0xb930,</div><div class='del'>-	0x0005, 0x0031, 0x0000, 0x0019, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x000b, 0x8430, 0x0001, 0xb0c8, 0x0010, 0x00ff, 0x0001, 0xffe8,</div><div class='del'>-	0x0010, 0x0048, 0x000b, 0x14a9, 0x0005, 0x0002, 0x0010, 0x0006,</div><div class='del'>-	0x0012, 0x0c10, 0x0010, 0xff0c, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb109, 0x000b, 0x8441, 0x0000, 0xb10b, 0x000b, 0x6445,</div><div class='del'>-	0x0010, 0xb10a, 0x0015, 0x0033, 0x0010, 0xc00a, 0x000b, 0x8447,</div><div class='del'>-	0x0002, 0x032b, 0x0010, 0xff03, 0x0011, 0x0d88, 0x0010, 0x0011,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0x030a, 0x001b, 0x844f,</div><div class='del'>-	0x0000, 0x11fe, 0x000b, 0x6454, 0x0000, 0x0d12, 0x0013, 0x045d,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0x1188, 0x0010, 0x0003,</div><div class='del'>-	0x0000, 0xff31, 0x0010, 0x0db0, 0x0015, 0x0033, 0x0000, 0xb00a,</div><div class='del'>-	0x000b, 0x845c, 0x0000, 0x0d11, 0x0013, 0x046b, 0x0002, 0xd142,</div><div class='del'>-	0x0003, 0x1462, 0x0013, 0x0485, 0x0000, 0x05fe, 0x0013, 0x646b,</div><div class='del'>-	0x0005, 0x0002, 0x0000, 0x0004, 0x0000, 0x050d, 0x0014, 0x046c,</div><div class='del'>-	0x0002, 0x3a47, 0x001b, 0x146b, 0x0004, 0x08ec, 0x0013, 0x0047,</div><div class='del'>-	0x0001, 0xc7c8, 0x0010, 0x0028, 0x000b, 0x1484, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0010, 0x000a, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x8476, 0x0002, 0xb04f,</div><div class='del'>-	0x0013, 0x1484, 0x0001, 0x0fe8, 0x0010, 0x0000, 0x0013, 0x1482,</div><div class='del'>-	0x0001, 0x0fe8, 0x0000, 0x0002, 0x0013, 0x1482, 0x0015, 0x003a,</div><div class='del'>-	0x0010, 0x8080, 0x0003, 0x0484, 0x0015, 0x003a, 0x0010, 0x4040,</div><div class='del'>-	0x0017, 0x4000, 0x0000, 0x12fe, 0x001b, 0x604f, 0x0015, 0x0012,</div><div class='del'>-	0x0001, 0x1b55, 0x0015, 0x0011, 0x0001, 0x1b55, 0x0001, 0x1288,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xc00a,</div><div class='del'>-	0x000b, 0x8490, 0x0005, 0x00b0, 0x0000, 0x8000, 0x0001, 0x1288,</div><div class='del'>-	0x0010, 0x0011, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb00a,</div><div class='del'>-	0x001b, 0x8498, 0x0003, 0x004f, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0010, 0x0011, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0x0309, 0x001b, 0x84a1, 0x0011, 0x0d88, 0x0010, 0x0005,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb909, 0x001b, 0x84a7,</div><div class='del'>-	0x0017, 0x4000, 0x0005, 0x00b6, 0x0010, 0x0600, 0x0014, 0x0683,</div><div class='del'>-	0x0004, 0x051b, 0x0000, 0xb05a, 0x0000, 0xb15b, 0x0005, 0x0054,</div><div class='del'>-	0x0010, 0x0829, 0x0010, 0x0d58, 0x0015, 0x0059, 0x0010, 0xffff,</div><div class='del'>-	0x0000, 0xb930, 0x0005, 0x0031, 0x0010, 0x001e, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb009, 0x001b, 0x84b9, 0x0000, 0xb05c, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x001f, 0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x84bf,</div><div class='del'>-	0x0001, 0xb0c8, 0x0010, 0x000f, 0x000b, 0x14c6, 0x0015, 0x00ff,</div><div class='del'>-	0x0010, 0x0005, 0x0013, 0x04ce, 0x0002, 0xb040, 0x0003, 0x14cb,</div><div class='del'>-	0x0015, 0x00ff, 0x0000, 0x0004, 0x0013, 0x04ce, 0x0001, 0xb0c8,</div><div class='del'>-	0x0010, 0x0006, 0x0002, 0xff60, 0x0010, 0xffb2, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0000, 0x0019, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xb109, 0x001b, 0x84d6, 0x0012, 0xb170,</div><div class='del'>-	0x0011, 0xffc8, 0x0010, 0xff00, 0x0011, 0xb2d0, 0x0010, 0xff60,</div><div class='del'>-	0x0002, 0xb045, 0x0013, 0x14e1, 0x0015, 0x00b2, 0x0000, 0x0002,</div><div class='del'>-	0x0003, 0x04eb, 0x0002, 0xb046, 0x0003, 0x14e6, 0x0015, 0x00b2,</div><div class='del'>-	0x0000, 0x0001, 0x0003, 0x04eb, 0x0015, 0x00b2, 0x0010, 0x0000,</div><div class='del'>-	0x0000, 0xc0b0, 0x0010, 0xc0b1, 0x0013, 0x04f1, 0x0000, 0xb930,</div><div class='del'>-	0x0005, 0x0031, 0x0010, 0x002b, 0x0015, 0x0033, 0x0000, 0xb011,</div><div class='del'>-	0x000b, 0x84f0, 0x0010, 0xb16a, 0x0010, 0xb06b, 0x0000, 0xb261,</div><div class='del'>-	0x0015, 0x0044, 0x0010, 0x0018, 0x0000, 0xb930, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0023, 0x0015, 0x0033, 0x0000, 0x6241, 0x001b, 0x84fb,</div><div class='del'>-	0x0003, 0x94fc, 0x0015, 0x00a0, 0x0000, 0x0020, 0x0012, 0xd041,</div><div class='del'>-	0x000b, 0x14ff, 0x0015, 0x00d1, 0x0010, 0x0202, 0x0013, 0x9503,</div><div class='del'>-	0x0000, 0x75ff, 0x0011, 0xffc8, 0x0000, 0x1804, 0x0001, 0xffd8,</div><div class='del'>-	0x0010, 0x0009, 0x0013, 0x9509, 0x0000, 0xff75, 0x0003, 0x950b,</div><div class='del'>-	0x0015, 0x00d1, 0x0000, 0x0200, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0xbd88, 0x0000, 0x0008, 0x0000, 0xff31, 0x0015, 0x00b1,</div><div class='del'>-	0x0010, 0x07d0, 0x0005, 0x00b0, 0x0010, 0x0009, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb012, 0x000b, 0x8519, 0x0013, 0x046b, 0x0000, 0xba30,</div><div class='del'>-	0x0005, 0x0031, 0x0010, 0x0035, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x000b, 0x8520, 0x0002, 0xb040, 0x0003, 0x153c, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0005, 0x0031, 0x0001, 0x1b71, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb011, 0x000b, 0x8529, 0x0002, 0xb100, 0x0010, 0xffb1,</div><div class='del'>-	0x001b, 0x2530, 0x0012, 0xb000, 0x0000, 0xffb0, 0x0013, 0x252a,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb012, 0x000b, 0x8532, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0000, 0x0013, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb012, 0x001b, 0x853a, 0x0003, 0x053e,</div><div class='del'>-	0x0010, 0xc0b1, 0x0000, 0xc0b0, 0x0017, 0x4000, 0x0005, 0x00b6,</div><div class='del'>-	0x0010, 0x0500, 0x0014, 0x0683, 0x0005, 0x0054, 0x0010, 0x0889,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88, 0x0000, 0x0002,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x854b,</div><div class='del'>-	0x0010, 0xb058, 0x0000, 0x0d59, 0x0000, 0xb930, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0023, 0x0015, 0x0033, 0x0000, 0xb011, 0x001b, 0x8553,</div><div class='del'>-	0x0010, 0xb15c, 0x0010, 0xb05d, 0x0005, 0x0031, 0x0010, 0x002b,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb011, 0x001b, 0x855a, 0x0000, 0xb15e,</div><div class='del'>-	0x0000, 0xb05f, 0x0003, 0x955d, 0x0015, 0x00a0, 0x0010, 0x000c,</div><div class='del'>-	0x0003, 0x0668, 0x0005, 0x00b6, 0x0000, 0x0700, 0x0014, 0x0683,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88, 0x0010, 0x0009,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xb709, 0x000b, 0x856b,</div><div class='del'>-	0x0012, 0xb749, 0x0003, 0x1571, 0x0005, 0x0054, 0x0010, 0x0889,</div><div class='del'>-	0x0003, 0x0573, 0x0005, 0x0054, 0x0010, 0x0898, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0000, 0x0002, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb009, 0x000b, 0x857a, 0x0010, 0xb058,</div><div class='del'>-	0x0000, 0x0d59, 0x0001, 0xb9c8, 0x0010, 0xf000, 0x0001, 0xffe8,</div><div class='del'>-	0x0010, 0xf000, 0x001b, 0x15a3, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0010, 0x0005, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb009, 0x000b, 0x8589, 0x0001, 0xb0c8, 0x0000, 0xf700,</div><div class='del'>-	0x0000, 0xffb0, 0x0011, 0xb0e8, 0x0000, 0xf100, 0x0013, 0x15ea,</div><div class='del'>-	0x0011, 0xb0e8, 0x0000, 0xf200, 0x0013, 0x15ef, 0x0011, 0xb0e8,</div><div class='del'>-	0x0010, 0xf300, 0x0003, 0x1614, 0x0011, 0xb0e8, 0x0000, 0xf400,</div><div class='del'>-	0x0013, 0x1619, 0x0011, 0xb0e8, 0x0010, 0xf500, 0x0013, 0x15ea,</div><div class='del'>-	0x0011, 0xb0e8, 0x0010, 0xf600, 0x0003, 0x162b, 0x0005, 0x00ce,</div><div class='del'>-	0x0010, 0x0009, 0x0000, 0xb0cf, 0x0003, 0x08e1, 0x0000, 0xb930,</div><div class='del'>-	0x0005, 0x0031, 0x0000, 0x0025, 0x0015, 0x0033, 0x0000, 0xb039,</div><div class='del'>-	0x000b, 0x85a8, 0x0012, 0xb749, 0x0013, 0x15ad, 0x0002, 0xb52c,</div><div class='del'>-	0x0000, 0xffb5, 0x0000, 0xb162, 0x0000, 0xb063, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x001f, 0x0015, 0x0033, 0x0000, 0xb309, 0x000b, 0x85b3,</div><div class='del'>-	0x0001, 0xb3c8, 0x0010, 0x0003, 0x0003, 0x15bb, 0x0010, 0xffb2,</div><div class='del'>-	0x0001, 0xffe8, 0x0010, 0x0003, 0x001b, 0x15bd, 0x0000, 0xc2b7,</div><div class='del'>-	0x0013, 0x0647, 0x0001, 0xb2e8, 0x0000, 0x0001, 0x0013, 0x15c4,</div><div class='del'>-	0x0005, 0x00ce, 0x0010, 0x000a, 0x0010, 0xb2cf, 0x0003, 0x08e1,</div><div class='del'>-	0x0010, 0xb465, 0x0010, 0xb667, 0x0015, 0x00b7, 0x0010, 0x0018,</div><div class='del'>-	0x0001, 0xb5c8, 0x0010, 0x0300, 0x0013, 0x15e9, 0x0012, 0xb548,</div><div class='del'>-	0x0013, 0x15d0, 0x0000, 0xb6ff, 0x0011, 0xb780, 0x0010, 0xffb7,</div><div class='del'>-	0x0002, 0xb549, 0x0013, 0x15d5, 0x0010, 0xb4ff, 0x0011, 0xb780,</div><div class='del'>-	0x0010, 0xffb7, 0x0015, 0x0044, 0x0010, 0x0018, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x002c, 0x0015, 0x0033, 0x0000, 0x6841, 0x001b, 0x85db,</div><div class='del'>-	0x0015, 0x0044, 0x0000, 0x0019, 0x0005, 0x0031, 0x0000, 0x0034,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0x5029, 0x001b, 0x85e2, 0x0015, 0x0044,</div><div class='del'>-	0x0000, 0x0008, 0x0011, 0xb7c8, 0x0010, 0x0003, 0x0013, 0x15e9,</div><div class='del'>-	0x0010, 0xff55, 0x0013, 0x0647, 0x0005, 0x00b5, 0x0000, 0x0008,</div><div class='del'>-	0x0015, 0x00b7, 0x0010, 0x0018, 0x0013, 0x0647, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0000, 0x000b, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb011, 0x001b, 0x85f6, 0x0010, 0xb1ff,</div><div class='del'>-	0x0001, 0xb0d0, 0x0003, 0x15ff, 0x0005, 0x00b5, 0x0010, 0x0b02,</div><div class='del'>-	0x0010, 0xb062, 0x0010, 0xb163, 0x0003, 0x0601, 0x0005, 0x00b5,</div><div class='del'>-	0x0000, 0x0302, 0x0015, 0x0065, 0x0010, 0x0012, 0x0005, 0x0067,</div><div class='del'>-	0x0000, 0x0008, 0x0015, 0x006c, 0x0000, 0x7000, 0x0005, 0x006d,</div><div class='del'>-	0x0010, 0x0500, 0x0015, 0x006f, 0x0010, 0x000a, 0x0015, 0x0044,</div><div class='del'>-	0x0000, 0x0001, 0x0005, 0x0052, 0x0000, 0x2500, 0x0015, 0x0044,</div><div class='del'>-	0x0000, 0x0008, 0x0015, 0x00b7, 0x0000, 0x0032, 0x0013, 0x0647,</div><div class='del'>-	0x0005, 0x00b5, 0x0010, 0x0028, 0x0015, 0x00b7, 0x0010, 0x0018,</div><div class='del'>-	0x0013, 0x0647, 0x0005, 0x00b5, 0x0000, 0x0100, 0x0005, 0x0067,</div><div class='del'>-	0x0000, 0x0008, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88,</div><div class='del'>-	0x0010, 0x0018, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x001b, 0x8624, 0x0001, 0xb0c8, 0x0010, 0x00ff, 0x0010, 0xff69,</div><div class='del'>-	0x0015, 0x00b7, 0x0000, 0x0020, 0x0013, 0x0647, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0010, 0x0005, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb609, 0x000b, 0x8632, 0x0001, 0xb6c8,</div><div class='del'>-	0x0010, 0xff00, 0x0000, 0xffb0, 0x0015, 0x0033, 0x0000, 0xb00a,</div><div class='del'>-	0x000b, 0x8638, 0x0001, 0xb6c8, 0x0010, 0x00ff, 0x0012, 0xff10,</div><div class='del'>-	0x001b, 0x1641, 0x0000, 0xffb5, 0x0015, 0x00b7, 0x0010, 0x0018,</div><div class='del'>-	0x0013, 0x0647, 0x0010, 0xff63, 0x0005, 0x00b5, 0x0000, 0x0800,</div><div class='del'>-	0x0015, 0x00b7, 0x0010, 0x0018, 0x0013, 0x0647, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x0d88, 0x0010, 0x0009, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x864e, 0x0010, 0xb561,</div><div class='del'>-	0x0013, 0x9650, 0x0010, 0xb7a0, 0x0003, 0x0668, 0x0005, 0x00b6,</div><div class='del'>-	0x0010, 0x0300, 0x0014, 0x0683, 0x0005, 0x0054, 0x0010, 0x0819,</div><div class='del'>-	0x0010, 0x0d58, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88,</div><div class='del'>-	0x0000, 0x0002, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x001b, 0x8660, 0x0000, 0xb059, 0x0003, 0x9662, 0x0010, 0xc0a0,</div><div class='del'>-	0x0010, 0x71ff, 0x0002, 0xff28, 0x0010, 0xff71, 0x0003, 0x0668,</div><div class='del'>-	0x0012, 0xd041, 0x000b, 0x1668, 0x0015, 0x00d1, 0x0010, 0x0202,</div><div class='del'>-	0x0000, 0x75ff, 0x0011, 0xffc8, 0x0000, 0x1804, 0x0001, 0xffd8,</div><div class='del'>-	0x0010, 0x0009, 0x0013, 0x9671, 0x0000, 0xff75, 0x0003, 0x9673,</div><div class='del'>-	0x0015, 0x00d1, 0x0000, 0x0200, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0xbd88, 0x0000, 0x0008, 0x0000, 0xff31, 0x0005, 0x00b0,</div><div class='del'>-	0x0010, 0x0009, 0x0015, 0x00b1, 0x0010, 0x07d0, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb012, 0x001b, 0x8681, 0x0013, 0x046b, 0x0015, 0x0044,</div><div class='del'>-	0x0000, 0x0008, 0x0005, 0x0098, 0x0010, 0x0056, 0x0015, 0x0099,</div><div class='del'>-	0x0000, 0x9575, 0x0004, 0x08a8, 0x0000, 0xb096, 0x0012, 0xb270,</div><div class='del'>-	0x0010, 0xff56, 0x0014, 0x08ca, 0x0010, 0xb052, 0x0010, 0xb153,</div><div class='del'>-	0x0000, 0xb6ff, 0x0011, 0xb2d0, 0x0010, 0xff50, 0x0010, 0xb351,</div><div class='del'>-	0x0017, 0x4000, 0x0001, 0x12e8, 0x0001, 0x1b55, 0x0003, 0x1845,</div><div class='del'>-	0x0015, 0x00d1, 0x0000, 0x0400, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0001, 0x1288, 0x0010, 0x0011, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0x1009, 0x000b, 0x86a1, 0x0015, 0x000f, 0x0000, 0x0001,</div><div class='del'>-	0x0010, 0xc014, 0x0000, 0x1213, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x1388, 0x0000, 0x0004, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xba09, 0x000b, 0x86ad, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x1388, 0x0010, 0x0005, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0x1a09, 0x000b, 0x86b5, 0x0012, 0x104b, 0x001b, 0x16be,</div><div class='del'>-	0x0000, 0x1a30, 0x0005, 0x0031, 0x0000, 0x000b, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0x1621, 0x001b, 0x86bd, 0x0010, 0x15fe, 0x000b, 0x66dd,</div><div class='del'>-	0x0004, 0x0704, 0x0002, 0x3a42, 0x000b, 0x1703, 0x0001, 0x10c8,</div><div class='del'>-	0x0010, 0x000f, 0x000b, 0x1766, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x1388, 0x0000, 0x0008, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb009, 0x000b, 0x86cd, 0x0011, 0xb0e8, 0x0010, 0x0009,</div><div class='del'>-	0x0003, 0x16d4, 0x0011, 0xb0e8, 0x0000, 0x0001, 0x001b, 0x1702,</div><div class='del'>-	0x0011, 0x1388, 0x0010, 0x000a, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb009, 0x000b, 0x86d9, 0x0002, 0xb04f, 0x001b, 0x16f9,</div><div class='del'>-	0x0013, 0x0702, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x1388,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x001b, 0x86e4, 0x0015, 0x0033, 0x0010, 0xc00a, 0x001b, 0x86e7,</div><div class='del'>-	0x0010, 0xb0fe, 0x0003, 0x66ec, 0x0000, 0xb012, 0x0013, 0x06ee,</div><div class='del'>-	0x0010, 0xc012, 0x0010, 0xc011, 0x0015, 0x000f, 0x0010, 0x0000,</div><div class='del'>-	0x0002, 0x3944, 0x0013, 0x16f7, 0x0015, 0x0039, 0x0000, 0x5040,</div><div class='del'>-	0x0015, 0x00b8, 0x0000, 0x0008, 0x0014, 0x0925, 0x0000, 0xc013,</div><div class='del'>-	0x0003, 0x0703, 0x0010, 0x02fe, 0x0003, 0x66fe, 0x0015, 0x003a,</div><div class='del'>-	0x0010, 0x2020, 0x0003, 0x0703, 0x0015, 0x003a, 0x0000, 0x2000,</div><div class='del'>-	0x0015, 0x003a, 0x0010, 0x1010, 0x0004, 0x0911, 0x0003, 0x0054,</div><div class='del'>-	0x0003, 0xb704, 0x0005, 0x002a, 0x0000, 0x0004, 0x0000, 0xba30,</div><div class='del'>-	0x0005, 0x0031, 0x0010, 0x001b, 0x0015, 0x0033, 0x0000, 0xb009,</div><div class='del'>-	0x000b, 0x870c, 0x0000, 0xc02c, 0x0000, 0xb02d, 0x0012, 0x104b,</div><div class='del'>-	0x0013, 0x1727, 0x0000, 0x1a30, 0x0005, 0x0031, 0x0000, 0x0023,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb129, 0x001b, 0x8716, 0x0000, 0xb120,</div><div class='del'>-	0x0010, 0xb221, 0x0000, 0xb322, 0x0000, 0xb423, 0x0000, 0xb524,</div><div class='del'>-	0x0000, 0xc025, 0x0010, 0xb526, 0x0010, 0xc027, 0x0010, 0xb516,</div><div class='del'>-	0x0010, 0xc017, 0x0000, 0xb518, 0x0000, 0xc019, 0x0010, 0xc028,</div><div class='del'>-	0x0000, 0xc029, 0x0010, 0xc01e, 0x0013, 0x075d, 0x0012, 0x1044,</div><div class='del'>-	0x0003, 0x1757, 0x0002, 0x1034, 0x0000, 0xff10, 0x0000, 0x1a30,</div><div class='del'>-	0x0005, 0x0031, 0x0000, 0x0002, 0x0015, 0x0033, 0x0000, 0x1b29,</div><div class='del'>-	0x000b, 0x8730, 0x0000, 0x1c30, 0x0000, 0x1b31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb131, 0x000b, 0x8735, 0x0002, 0x1f43, 0x000b, 0x173c,</div><div class='del'>-	0x0010, 0xb3b5, 0x0000, 0xb4b6, 0x0000, 0xc0b3, 0x0010, 0xc0b4,</div><div class='del'>-	0x0000, 0xb120, 0x0010, 0xb221, 0x0000, 0xb322, 0x0000, 0xb423,</div><div class='del'>-	0x0000, 0xb524, 0x0010, 0xb625, 0x0010, 0xb516, 0x0000, 0xb617,</div><div class='del'>-	0x0000, 0x1826, 0x0000, 0x1927, 0x0000, 0x1a30, 0x0005, 0x0031,</div><div class='del'>-	0x0010, 0x000f, 0x0015, 0x0033, 0x0000, 0xb011, 0x000b, 0x874b,</div><div class='del'>-	0x0000, 0xb028, 0x0000, 0xb129, 0x0012, 0x1e10, 0x0010, 0xff1e,</div><div class='del'>-	0x0013, 0x675d, 0x0002, 0x1d00, 0x0010, 0xff1d, 0x0004, 0x02ab,</div><div class='del'>-	0x0002, 0x3a42, 0x0003, 0x175d, 0x0003, 0x0765, 0x0000, 0x1a30,</div><div class='del'>-	0x0005, 0x0031, 0x0000, 0x0002, 0x0015, 0x0033, 0x0000, 0x1b79,</div><div class='del'>-	0x000b, 0x875c, 0x0003, 0xb75d, 0x0005, 0x002a, 0x0000, 0x0001,</div><div class='del'>-	0x0005, 0x0015, 0x0000, 0x0001, 0x0000, 0x1efe, 0x0003, 0x6765,</div><div class='del'>-	0x0003, 0x0277, 0x0017, 0x4000, 0x0000, 0xba30, 0x0005, 0x0031,</div><div class='del'>-	0x0010, 0x001b, 0x0015, 0x0033, 0x0010, 0xb051, 0x001b, 0x876b,</div><div class='del'>-	0x0000, 0xb0a3, 0x0010, 0xb697, 0x0010, 0xb946, 0x0015, 0x00a5,</div><div class='del'>-	0x0000, 0x0010, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x1388,</div><div class='del'>-	0x0000, 0x0002, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb509,</div><div class='del'>-	0x000b, 0x8778, 0x0014, 0x08ca, 0x0004, 0x08b9, 0x0012, 0xb470,</div><div class='del'>-	0x0010, 0xffb4, 0x0010, 0xb48e, 0x0010, 0xb08a, 0x0010, 0xb18b,</div><div class='del'>-	0x0012, 0x104d, 0x0003, 0x1783, 0x0013, 0x07b0, 0x0012, 0x104b,</div><div class='del'>-	0x0013, 0x1796, 0x0005, 0x008c, 0x0010, 0x0829, 0x0010, 0xc08d,</div><div class='del'>-	0x0001, 0xb2d8, 0x0010, 0x0600, 0x0010, 0xff88, 0x0010, 0xb389,</div><div class='del'>-	0x0000, 0x1390, 0x0010, 0xb591, 0x0000, 0xc08f, 0x0010, 0x1ab9,</div><div class='del'>-	0x0004, 0x051b, 0x0013, 0x9791, 0x0010, 0xb092, 0x0010, 0xb193,</div><div class='del'>-	0x0013, 0x9794, 0x0013, 0x07ab, 0x0005, 0x008c, 0x0000, 0x0809,</div><div class='del'>-	0x0015, 0x008d, 0x0000, 0x0008, 0x0001, 0xb2d8, 0x0000, 0x0100,</div><div class='del'>-	0x0010, 0xff88, 0x0010, 0xb389, 0x0000, 0x1390, 0x0010, 0xb591,</div><div class='del'>-	0x0000, 0xc08f, 0x0000, 0x1a30, 0x0005, 0x0031, 0x0010, 0x000f,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb011, 0x000b, 0x87a6, 0x0013, 0x97a7,</div><div class='del'>-	0x0000, 0xb192, 0x0000, 0xb093, 0x0003, 0x97aa, 0x0010, 0x19a1,</div><div class='del'>-	0x0000, 0x18a2, 0x0015, 0x00b1, 0x0010, 0x0096, 0x0003, 0x0821,</div><div class='del'>-	0x0000, 0xb590, 0x0010, 0x1391, 0x0001, 0x10c8, 0x0010, 0x000f,</div><div class='del'>-	0x0001, 0xffe8, 0x0010, 0x0005, 0x0013, 0x17d7, 0x0001, 0xb2d8,</div><div class='del'>-	0x0000, 0x0700, 0x0010, 0xff88, 0x0010, 0xb389, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x1388, 0x0010, 0x0009, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x87c2, 0x0002, 0xb049,</div><div class='del'>-	0x0013, 0x17ca, 0x0005, 0x008c, 0x0010, 0x0889, 0x0015, 0x00b1,</div><div class='del'>-	0x0010, 0x0096, 0x0013, 0x07ce, 0x0005, 0x008c, 0x0010, 0x0898,</div><div class='del'>-	0x0015, 0x00b1, 0x0000, 0x0092, 0x0010, 0xc08d, 0x0000, 0xc08f,</div><div class='del'>-	0x0013, 0x97d0, 0x0000, 0xc092, 0x0010, 0xc093, 0x0013, 0x97d3,</div><div class='del'>-	0x0010, 0x19a1, 0x0000, 0x18a2, 0x0003, 0x0821, 0x0001, 0xb2d8,</div><div class='del'>-	0x0000, 0x0100, 0x0010, 0xff88, 0x0010, 0xb389, 0x0005, 0x008c,</div><div class='del'>-	0x0010, 0x0880, 0x0015, 0x008d, 0x0000, 0x0008, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x1388, 0x0000, 0x000e, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb009, 0x001b, 0x87e6, 0x0010, 0xb08f,</div><div class='del'>-	0x0000, 0xb590, 0x0010, 0x1391, 0x0000, 0x1a30, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x000d, 0x0015, 0x0033, 0x0000, 0xb021, 0x001b, 0x87ef,</div><div class='del'>-	0x0003, 0x97f0, 0x0010, 0xb392, 0x0010, 0xb293, 0x0003, 0x97f3,</div><div class='del'>-	0x0000, 0xb1a1, 0x0010, 0xb0a2, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x1388, 0x0000, 0x000b, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb211, 0x001b, 0x87fd, 0x0000, 0xb3ff, 0x0001, 0xb080,</div><div class='del'>-	0x0000, 0xffb3, 0x001b, 0x2804, 0x0002, 0xb200, 0x0003, 0x0805,</div><div class='del'>-	0x0010, 0xb2ff, 0x0011, 0xb180, 0x0010, 0xffb2, 0x0011, 0x1388,</div><div class='del'>-	0x0000, 0x000b, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xb212,</div><div class='del'>-	0x000b, 0x880c, 0x0015, 0x00b1, 0x0000, 0x0092, 0x0002, 0x104c,</div><div class='del'>-	0x0003, 0x181f, 0x0011, 0xc2e8, 0x0010, 0x000c, 0x000b, 0x1817,</div><div class='del'>-	0x0015, 0x00ff, 0x0000, 0x0800, 0x0013, 0x081f, 0x0011, 0xc2e8,</div><div class='del'>-	0x0000, 0x0020, 0x000b, 0x181d, 0x0015, 0x00ff, 0x0010, 0x1800,</div><div class='del'>-	0x0013, 0x081f, 0x0015, 0x00ff, 0x0000, 0x1000, 0x0011, 0xb1d0,</div><div class='del'>-	0x0010, 0xffb1, 0x0015, 0x009a, 0x0010, 0x0036, 0x0005, 0x009b,</div><div class='del'>-	0x0000, 0x95d5, 0x0012, 0xd041, 0x001b, 0x1825, 0x0015, 0x00d1,</div><div class='del'>-	0x0010, 0x0202, 0x0013, 0x9829, 0x0012, 0x104e, 0x0013, 0x182e,</div><div class='del'>-	0x0012, 0xb12f, 0x0010, 0xffb1, 0x0000, 0xb175, 0x0013, 0x982f,</div><div class='del'>-	0x0015, 0x00d1, 0x0000, 0x0200, 0x0001, 0x19c8, 0x0010, 0xfff0,</div><div class='del'>-	0x001b, 0x1838, 0x0015, 0x00b1, 0x0010, 0x07d0, 0x0003, 0x083a,</div><div class='del'>-	0x0015, 0x00b1, 0x0000, 0x1b58, 0x0005, 0x00b0, 0x0010, 0x0009,</div><div class='del'>-	0x0015, 0x0030, 0x0000, 0x0400, 0x0001, 0xbd88, 0x0000, 0x000b,</div><div class='del'>-	0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xb012, 0x001b, 0x8843,</div><div class='del'>-	0x0003, 0x0703, 0x0015, 0x0030, 0x0000, 0x0400, 0x0000, 0xa4ff,</div><div class='del'>-	0x0003, 0x6893, 0x0011, 0xffa8, 0x0010, 0x0005, 0x000b, 0x2893,</div><div class='del'>-	0x0005, 0x0031, 0x0001, 0x1b6c, 0x0015, 0x0033, 0x0010, 0xb211,</div><div class='del'>-	0x000b, 0x8850, 0x0002, 0xb200, 0x0010, 0xffb2, 0x0005, 0x0031,</div><div class='del'>-	0x0001, 0x1b6c, 0x0015, 0x0033, 0x0010, 0xb20a, 0x001b, 0x8857,</div><div class='del'>-	0x0015, 0x000f, 0x0000, 0x0001, 0x0000, 0x1213, 0x0005, 0x0010,</div><div class='del'>-	0x0000, 0x8000, 0x0015, 0x00a3, 0x0000, 0x0200, 0x0000, 0xc697,</div><div class='del'>-	0x0005, 0x0046, 0x0000, 0x0002, 0x0015, 0x00a5, 0x0000, 0x0010,</div><div class='del'>-	0x0011, 0xc4d8, 0x0000, 0x3200, 0x0010, 0xff88, 0x0000, 0xc589,</div><div class='del'>-	0x0010, 0xc48a, 0x0010, 0xc58b, 0x0010, 0xc08e, 0x0005, 0x008c,</div><div class='del'>-	0x0010, 0xe109, 0x0010, 0xc08d, 0x0015, 0x0090, 0x0001, 0x1b55,</div><div class='del'>-	0x0005, 0x0091, 0x0010, 0xffff, 0x0000, 0xb292, 0x0000, 0xb393,</div><div class='del'>-	0x0015, 0x009a, 0x0010, 0x0056, 0x0005, 0x009b, 0x0010, 0x95f5,</div><div class='del'>-	0x0012, 0xd042, 0x0003, 0x1886, 0x0005, 0x00b0, 0x0010, 0x8080,</div><div class='del'>-	0x0011, 0x1388, 0x0010, 0x0011, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb00a, 0x000b, 0x8881, 0x0015, 0x00b8, 0x0010, 0x000c,</div><div class='del'>-	0x0014, 0x0925, 0x0003, 0x0888, 0x0005, 0x0075, 0x0010, 0x8092,</div><div class='del'>-	0x0015, 0x00b1, 0x0010, 0x07d0, 0x0005, 0x00b0, 0x0010, 0x0009,</div><div class='del'>-	0x0001, 0xbd88, 0x0000, 0x000b, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0000, 0xb012, 0x001b, 0x8891, 0x0003, 0x0703, 0x0015, 0x00d1,</div><div class='del'>-	0x0000, 0x0400, 0x0001, 0x1288, 0x0010, 0x0003, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0000, 0xb009, 0x000b, 0x889a, 0x0001, 0x1288,</div><div class='del'>-	0x0010, 0x0003, 0x0000, 0xff31, 0x0015, 0x0033, 0x0010, 0xc00a,</div><div class='del'>-	0x000b, 0x88a0, 0x0010, 0xb0fe, 0x0003, 0x68a5, 0x0000, 0xb012,</div><div class='del'>-	0x0003, 0x0703, 0x0010, 0xc012, 0x0010, 0xc011, 0x0003, 0x0703,</div><div class='del'>-	0x0000, 0xba30, 0x0005, 0x0031, 0x0010, 0x0021, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb019, 0x001b, 0x88ad, 0x0002, 0xb200, 0x0011, 0xffc8,</div><div class='del'>-	0x0010, 0x00ff, 0x0010, 0xffb2, 0x0010, 0xb2b7, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0023, 0x0015, 0x0033, 0x0010, 0xb20a, 0x000b, 0x88b7,</div><div class='del'>-	0x0017, 0x4000, 0x0000, 0xba30, 0x0005, 0x0031, 0x0000, 0x0023,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xb409, 0x000b, 0x88be, 0x0002, 0xb400,</div><div class='del'>-	0x0011, 0xffc8, 0x0010, 0x00ff, 0x0010, 0xffb4, 0x0010, 0xb4b7,</div><div class='del'>-	0x0005, 0x0031, 0x0000, 0x0023, 0x0015, 0x0033, 0x0010, 0xb40a,</div><div class='del'>-	0x001b, 0x88c8, 0x0017, 0x4000, 0x0000, 0xba30, 0x0001, 0xc7c8,</div><div class='del'>-	0x0000, 0x0020, 0x001b, 0x18d6, 0x0005, 0x0031, 0x0010, 0x0028,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xb209, 0x000b, 0x88d2, 0x0011, 0xb2c8,</div><div class='del'>-	0x0000, 0xff80, 0x0003, 0x18d9, 0x0010, 0xc4b0, 0x0010, 0xc5b1,</div><div class='del'>-	0x0003, 0x08db, 0x0010, 0xc6b1, 0x0000, 0xc0b0, 0x0005, 0x0031,</div><div class='del'>-	0x0000, 0x0004, 0x0015, 0x0033, 0x0010, 0xb211, 0x001b, 0x88df,</div><div class='del'>-	0x0017, 0x4000, 0x0015, 0x00b8, 0x0010, 0x0009, 0x0015, 0x003a,</div><div class='del'>-	0x0010, 0x0707, 0x0014, 0x0925, 0x0013, 0x002d, 0x0015, 0x00b8,</div><div class='del'>-	0x0010, 0x0009, 0x0015, 0x003a, 0x0010, 0x0707, 0x0003, 0x0925,</div><div class='del'>-	0x0004, 0x011c, 0x0015, 0x0030, 0x0000, 0x0400, 0x0011, 0x0d88,</div><div class='del'>-	0x0000, 0x0004, 0x0000, 0xff31, 0x0015, 0x0033, 0x0000, 0xba09,</div><div class='del'>-	0x001b, 0x88f4, 0x0004, 0x08a8, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0000, 0x0010, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb20a, 0x001b, 0x88fd, 0x0015, 0x0030, 0x0000, 0x0400,</div><div class='del'>-	0x0011, 0x0d88, 0x0010, 0x0011, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0x0309, 0x001b, 0x8905, 0x0002, 0x0327, 0x0010, 0xffb2,</div><div class='del'>-	0x0011, 0x0d88, 0x0010, 0x0011, 0x0000, 0xff31, 0x0015, 0x0033,</div><div class='del'>-	0x0010, 0xb20a, 0x000b, 0x890d, 0x0015, 0x00b8, 0x0010, 0x0006,</div><div class='del'>-	0x0003, 0x0925, 0x0014, 0x012e, 0x0004, 0x08a8, 0x0015, 0x0030,</div><div class='del'>-	0x0000, 0x0400, 0x0011, 0x1388, 0x0000, 0x0010, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xb20a, 0x000b, 0x891a, 0x0012, 0x1027,</div><div class='del'>-	0x0010, 0xffb2, 0x0011, 0x1388, 0x0010, 0x0011, 0x0000, 0xff31,</div><div class='del'>-	0x0015, 0x0033, 0x0010, 0xb20a, 0x001b, 0x8922, 0x0015, 0x00b8,</div><div class='del'>-	0x0000, 0x0007, 0x0013, 0x4925, 0x0000, 0xb838, 0x0017, 0x4000,</div><div class='del'>-	0x9a8c, 0xaf3d</div><div class='del'>-};</div><div class='del'>-unsigned short xseqipx_code_length01 = 0x1252;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2400.c b/drivers/scsi/qla2xxx/ql2400.c<br/>deleted file mode 100644<br/>index 77914fcfa2bc..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2400.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2400.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include "qla_def.h"</div><div class='del'>-</div><div class='del'>-static char qla_driver_name[] = "qla2400";</div><div class='del'>-</div><div class='del'>-extern uint32_t fw2400_version_str[];</div><div class='del'>-extern uint32_t fw2400_addr01;</div><div class='del'>-extern uint32_t fw2400_code01[];</div><div class='del'>-extern uint32_t fw2400_length01;</div><div class='del'>-extern uint32_t fw2400_addr02;</div><div class='del'>-extern uint32_t fw2400_code02[];</div><div class='del'>-extern uint32_t fw2400_length02;</div><div class='del'>-</div><div class='del'>-static struct qla_fw_info qla_fw_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_EXTENDED,</div><div class='del'>-		.fwcode		= (unsigned short *)&amp;fw2400_code01[0],</div><div class='del'>-		.fwlen		= (unsigned short *)&amp;fw2400_length01,</div><div class='del'>-		.lfwstart	= (unsigned long *)&amp;fw2400_addr01,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.addressing	= FW_INFO_ADDR_EXTENDED,</div><div class='del'>-		.fwcode		= (unsigned short *)&amp;fw2400_code02[0],</div><div class='del'>-		.fwlen		= (unsigned short *)&amp;fw2400_length02,</div><div class='del'>-		.lfwstart	= (unsigned long *)&amp;fw2400_addr02,</div><div class='del'>-	},</div><div class='del'>-	{ FW_INFO_ADDR_NOMORE, },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct qla_board_info qla_board_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP2422",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-		.fw_fname	= "ql2400_fw.bin",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP2432",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-		.fw_fname	= "ql2400_fw.bin",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP5422",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-		.fw_fname	= "ql2400_fw.bin",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.drv_name	= qla_driver_name,</div><div class='del'>-		.isp_name	= "ISP5432",</div><div class='del'>-		.fw_info	= qla_fw_tbl,</div><div class='del'>-		.fw_fname	= "ql2400_fw.bin",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_device_id qla24xx_pci_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2422,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[0],</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP2432,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[1],</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP5422,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[2],</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.vendor		= PCI_VENDOR_ID_QLOGIC,</div><div class='del'>-		.device		= PCI_DEVICE_ID_QLOGIC_ISP5432,</div><div class='del'>-		.subvendor	= PCI_ANY_ID,</div><div class='del'>-		.subdevice	= PCI_ANY_ID,</div><div class='del'>-		.driver_data	= (unsigned long)&amp;qla_board_tbl[3],</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{0, 0},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, qla24xx_pci_tbl);</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-qla24xx_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return qla2x00_probe_one(pdev,</div><div class='del'>-	    (struct qla_board_info *)id-&gt;driver_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit</div><div class='del'>-qla24xx_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	qla2x00_remove_one(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver qla24xx_pci_driver = {</div><div class='del'>-	.name		= "qla2400",</div><div class='del'>-	.id_table	= qla24xx_pci_tbl,</div><div class='del'>-	.probe		= qla24xx_probe_one,</div><div class='del'>-	.remove		= __devexit_p(qla24xx_remove_one),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-qla24xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_module_init(&amp;qla24xx_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-qla24xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;qla24xx_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(qla24xx_init);</div><div class='del'>-module_exit(qla24xx_exit);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("QLogic Corporation");</div><div class='del'>-MODULE_DESCRIPTION("QLogic ISP24xx FC-SCSI Host Bus Adapter driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(QLA2XXX_VERSION);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/ql2400_fw.c b/drivers/scsi/qla2xxx/ql2400_fw.c<br/>deleted file mode 100644<br/>index 282b2d33ebf2..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/ql2400_fw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/ql2400_fw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12346 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Firmware Version 4.00.18 (14:53 Jan 30, 2006)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_version = 4*1024+0;</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code_version = 4*1024+0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_version_str[] = {4, 0,18};</div><div class='del'>-#else</div><div class='del'>-uint32_t firmware_version[] = {4, 0,18};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-#define fw2400_VERSION_STRING "4.00.18"</div><div class='del'>-#else</div><div class='del'>-#define FW_VERSION_STRING "4.00.18"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_addr01 = 0x00100000 ;</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code_addr01 = 0x00100000 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_code01[] = {</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code01[] = {</div><div class='del'>-#endif</div><div class='del'>-	0x0401f17c, 0x0010d000, 0x00100000, 0x0000a971,</div><div class='del'>-	0x00000004, 0x00000000, 0x00000012, 0x00000002,</div><div class='del'>-	0x00000003, 0x00000000, 0x20434f50, 0x59524947,</div><div class='del'>-	0x48542032, 0x30303520, 0x514c4f47, 0x49432043,</div><div class='del'>-	0x4f52504f, 0x52415449, 0x4f4e2020, 0x20495350,</div><div class='del'>-	0x32347878, 0x20466972, 0x6d776172, 0x65202020,</div><div class='del'>-	0x56657273, 0x696f6e20, 0x342e302e, 0x31382020,</div><div class='del'>-	0x20202024, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x42001800, 0x0010014f, 0x42002000, 0x0010b6fd,</div><div class='del'>-	0x500c0800, 0x800c1800, 0x500c1000, 0x800c1800,</div><div class='del'>-	0x54042000, 0x80102000, 0x80040800, 0x80081040,</div><div class='del'>-	0x040207fc, 0x500c0800, 0x800409c0, 0x040207f6,</div><div class='del'>-	0x44002000, 0x80102000, 0x40100000, 0x44040000,</div><div class='del'>-	0x80000000, 0x44080000, 0x80000000, 0x440c0000,</div><div class='del'>-	0x80000000, 0x44100000, 0x80000000, 0x44140000,</div><div class='del'>-	0x80000000, 0x44180000, 0x80000000, 0x441c0000,</div><div class='del'>-	0x80000000, 0x44200000, 0x80000000, 0x44240000,</div><div class='del'>-	0x80000000, 0x44280000, 0x80000000, 0x442c0000,</div><div class='del'>-	0x80000000, 0x44300000, 0x80000000, 0x44340000,</div><div class='del'>-	0x80000000, 0x44380000, 0x80000000, 0x443c0000,</div><div class='del'>-	0x80000000, 0x44400000, 0x80000000, 0x44440000,</div><div class='del'>-	0x80000000, 0x44480000, 0x80000000, 0x444c0000,</div><div class='del'>-	0x80000000, 0x44500000, 0x80000000, 0x44540000,</div><div class='del'>-	0x80000000, 0x44580000, 0x80000000, 0x445c0000,</div><div class='del'>-	0x80000000, 0x44600000, 0x80000000, 0x44640000,</div><div class='del'>-	0x80000000, 0x44680000, 0x80000000, 0x446c0000,</div><div class='del'>-	0x80000000, 0x44700000, 0x80000000, 0x44740000,</div><div class='del'>-	0x80000000, 0x44780000, 0x80000000, 0x447c0000,</div><div class='del'>-	0x80000000, 0x44800000, 0x80000000, 0x44840000,</div><div class='del'>-	0x80000000, 0x44880000, 0x80000000, 0x448c0000,</div><div class='del'>-	0x80000000, 0x44900000, 0x80000000, 0x44940000,</div><div class='del'>-	0x80000000, 0x44980000, 0x80000000, 0x449c0000,</div><div class='del'>-	0x80000000, 0x44a00000, 0x80000000, 0x44a40000,</div><div class='del'>-	0x80000000, 0x44a80000, 0x80000000, 0x44ac0000,</div><div class='del'>-	0x80000000, 0x44b00000, 0x80000000, 0x44b40000,</div><div class='del'>-	0x80000000, 0x44b80000, 0x80000000, 0x44bc0000,</div><div class='del'>-	0x80000000, 0x44c00000, 0x80000000, 0x44c40000,</div><div class='del'>-	0x80000000, 0x44c80000, 0x80000000, 0x44cc0000,</div><div class='del'>-	0x80000000, 0x44d00000, 0x80000000, 0x44d80000,</div><div class='del'>-	0x80000000, 0x44d40000, 0x80000000, 0x44dc0000,</div><div class='del'>-	0x80000000, 0x44e00000, 0x80000000, 0x44e40000,</div><div class='del'>-	0x80000000, 0x44e80000, 0x80000000, 0x44ec0000,</div><div class='del'>-	0x80000000, 0x44f00000, 0x80000000, 0x44f40000,</div><div class='del'>-	0x80000000, 0x44f80000, 0x80000000, 0x44fc0000,</div><div class='del'>-	0x80000000, 0x45000000, 0x80000000, 0x45040000,</div><div class='del'>-	0x80000000, 0x45080000, 0x80000000, 0x450c0000,</div><div class='del'>-	0x80000000, 0x45100000, 0x80000000, 0x45140000,</div><div class='del'>-	0x80000000, 0x45180000, 0x80000000, 0x451c0000,</div><div class='del'>-	0x80000000, 0x45200000, 0x80000000, 0x45240000,</div><div class='del'>-	0x80000000, 0x45280000, 0x80000000, 0x452c0000,</div><div class='del'>-	0x80000000, 0x45300000, 0x80000000, 0x45340000,</div><div class='del'>-	0x80000000, 0x45380000, 0x80000000, 0x453c0000,</div><div class='del'>-	0x80000000, 0x45400000, 0x80000000, 0x45440000,</div><div class='del'>-	0x80000000, 0x45480000, 0x80000000, 0x454c0000,</div><div class='del'>-	0x80000000, 0x45500000, 0x80000000, 0x45540000,</div><div class='del'>-	0x80000000, 0x45580000, 0x80000000, 0x455c0000,</div><div class='del'>-	0x80000000, 0x45600000, 0x80000000, 0x45640000,</div><div class='del'>-	0x80000000, 0x45680000, 0x80000000, 0x456c0000,</div><div class='del'>-	0x80000000, 0x45700000, 0x80000000, 0x45740000,</div><div class='del'>-	0x80000000, 0x45780000, 0x80000000, 0x457c0000,</div><div class='del'>-	0x80000000, 0x45800000, 0x80000000, 0x45840000,</div><div class='del'>-	0x80000000, 0x45880000, 0x80000000, 0x458c0000,</div><div class='del'>-	0x80000000, 0x45900000, 0x80000000, 0x45940000,</div><div class='del'>-	0x80000000, 0x45980000, 0x80000000, 0x459c0000,</div><div class='del'>-	0x80000000, 0x45a00000, 0x80000000, 0x45a40000,</div><div class='del'>-	0x80000000, 0x45a80000, 0x80000000, 0x45ac0000,</div><div class='del'>-	0x80000000, 0x45b00000, 0x80000000, 0x45b40000,</div><div class='del'>-	0x80000000, 0x45b80000, 0x80000000, 0x45bc0000,</div><div class='del'>-	0x80000000, 0x45c00000, 0x80000000, 0x45c40000,</div><div class='del'>-	0x80000000, 0x45c80000, 0x80000000, 0x45cc0000,</div><div class='del'>-	0x80000000, 0x45d00000, 0x80000000, 0x45d40000,</div><div class='del'>-	0x80000000, 0x45d80000, 0x80000000, 0x45dc0000,</div><div class='del'>-	0x80000000, 0x45e00000, 0x80000000, 0x45e40000,</div><div class='del'>-	0x80000000, 0x45e80000, 0x80000000, 0x45ec0000,</div><div class='del'>-	0x80000000, 0x45f00000, 0x80000000, 0x45f40000,</div><div class='del'>-	0x80000000, 0x45f80000, 0x80000000, 0x45fc0000,</div><div class='del'>-	0x4a03c020, 0x00004000, 0x4a03c011, 0x40000010,</div><div class='del'>-	0x04006000, 0x4203e000, 0x40000000, 0x59e00017,</div><div class='del'>-	0x8c000508, 0x04000003, 0x4a03c017, 0x00000000,</div><div class='del'>-	0x4203e000, 0x30000001, 0x0401f000, 0x0000bf00,</div><div class='del'>-	0x00000080, 0x0000bfe0, 0x00000020, 0x0000ff00,</div><div class='del'>-	0x00000080, 0x0000ffd0, 0x00000030, 0x00007100,</div><div class='del'>-	0x00000010, 0x00007200, 0x00000008, 0x00007209,</div><div class='del'>-	0x00000007, 0x00007300, 0x00000008, 0x00007309,</div><div class='del'>-	0x00000007, 0x00007400, 0x00000008, 0x00007409,</div><div class='del'>-	0x00000007, 0x00007600, 0x000000b0, 0x00007700,</div><div class='del'>-	0x00000040, 0x00003000, 0x00000070, 0x00004000,</div><div class='del'>-	0x000000c0, 0x00006000, 0x00000050, 0x00006100,</div><div class='del'>-	0x00000010, 0x00006130, 0x00000010, 0x00006150,</div><div class='del'>-	0x00000010, 0x00006170, 0x00000010, 0x00006190,</div><div class='del'>-	0x00000010, 0x000061b0, 0x00000010, 0x00000000,</div><div class='del'>-	0x42000000, 0x00000100, 0x4202f000, 0x00000000,</div><div class='del'>-	0x42000800, 0x00021f00, 0x45780800, 0x80040800,</div><div class='del'>-	0x80000040, 0x040207fd, 0x4203f000, 0x00021fff,</div><div class='del'>-	0x40000000, 0x4203e000, 0x90000100, 0x40000000,</div><div class='del'>-	0x0201f800, 0x00100743, 0x42000000, 0x00001000,</div><div class='del'>-	0x50000000, 0x82000480, 0x24320002, 0x04020015,</div><div class='del'>-	0x42000800, 0x00000064, 0x80040840, 0x04000007,</div><div class='del'>-	0x4a030000, 0x00000001, 0x40000000, 0x59800000,</div><div class='del'>-	0x8c000500, 0x040007f9, 0x04000008, 0x42000800,</div><div class='del'>-	0x00007a17, 0x50040000, 0x8c00050e, 0x04020003,</div><div class='del'>-	0x8400054e, 0x44000800, 0x4a030000, 0x00000000,</div><div class='del'>-	0x4a03c020, 0x00000004, 0x4203e000, 0x6000000f,</div><div class='del'>-	0x59e00023, 0x8c000500, 0x04020039, 0x42000000,</div><div class='del'>-	0x00100001, 0x50000800, 0x82040c00, 0x00000004,</div><div class='del'>-	0x58042003, 0x42001000, 0xffffffff, 0x0201f800,</div><div class='del'>-	0x0010073a, 0x0402004e, 0x58042003, 0x42001000,</div><div class='del'>-	0xffffffff, 0x0201f800, 0x0010073a, 0x04020048,</div><div class='del'>-	0x58042003, 0x42001000, 0x00ffffff, 0x0201f800,</div><div class='del'>-	0x0010073a, 0x04020042, 0x58042003, 0x42001000,</div><div class='del'>-	0x00ffffff, 0x0201f800, 0x0010073a, 0x0402003c,</div><div class='del'>-	0x42000000, 0x00100001, 0x5000a000, 0x8250a400,</div><div class='del'>-	0x00000004, 0x4200a800, 0x00020000, 0x5850b003,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x8250a400, 0x00000005,</div><div class='del'>-	0x4a0370e8, 0x00000003, 0x4200a800, 0x0000c000,</div><div class='del'>-	0x5850b003, 0x0201f800, 0x0010a93e, 0x4a0378e8,</div><div class='del'>-	0x00000003, 0x4200a800, 0x00008000, 0x5850b003,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x0401f02b, 0x42000800,</div><div class='del'>-	0x00020000, 0x58042003, 0x42001000, 0xffffffff,</div><div class='del'>-	0x0201f800, 0x0010073a, 0x04020019, 0x4a0370e8,</div><div class='del'>-	0x00000003, 0x42000800, 0x0000c000, 0x58042003,</div><div class='del'>-	0x82102500, 0x00ffffff, 0x42001000, 0x00ffffff,</div><div class='del'>-	0x0201f800, 0x0010073a, 0x0402000d, 0x4a0378e8,</div><div class='del'>-	0x00000003, 0x42000800, 0x00008000, 0x58042003,</div><div class='del'>-	0x82102500, 0x00ffffff, 0x42001000, 0x00ffffff,</div><div class='del'>-	0x0201f800, 0x0010073a, 0x0400000b, 0x4a03c020,</div><div class='del'>-	0x00004010, 0x4a03c011, 0x40100011, 0x04006000,</div><div class='del'>-	0x4203e000, 0x40000000, 0x4203e000, 0x30000001,</div><div class='del'>-	0x0401f000, 0x0201f800, 0x001007d7, 0x42001000,</div><div class='del'>-	0x0010a971, 0x40080000, 0x80140480, 0x82001d00,</div><div class='del'>-	0xffffff00, 0x04020003, 0x40001800, 0x0401f003,</div><div class='del'>-	0x42001800, 0x000000ff, 0x480bc840, 0x480fc842,</div><div class='del'>-	0x04011000, 0x400c0000, 0x80081400, 0x40140000,</div><div class='del'>-	0x80080580, 0x040207f0, 0x4817500d, 0x45782800,</div><div class='del'>-	0x59c40000, 0x82000500, 0xffff0000, 0x80000120,</div><div class='del'>-	0x82000580, 0x00002422, 0x04020005, 0x59a8006f,</div><div class='del'>-	0x84000540, 0x4803506f, 0x0401f00a, 0x59e00003,</div><div class='del'>-	0x82000500, 0x00030000, 0x82000580, 0x00010000,</div><div class='del'>-	0x04020004, 0x59a8006f, 0x84000542, 0x4803506f,</div><div class='del'>-	0x42000800, 0x00000040, 0x59a8006f, 0x8c000502,</div><div class='del'>-	0x0402000e, 0x42000800, 0x00001000, 0x82141480,</div><div class='del'>-	0x0017ffff, 0x04021009, 0x80040902, 0x82141480,</div><div class='del'>-	0x0013ffff, 0x04021005, 0x80040902, 0x82141480,</div><div class='del'>-	0x0011ffff, 0x04001bc8, 0x4807500e, 0x42001000,</div><div class='del'>-	0x00000024, 0x0201f800, 0x001063cf, 0x82040c00,</div><div class='del'>-	0x0010cfc0, 0x4807500b, 0x4a03c810, 0x00100000,</div><div class='del'>-	0x4a03c811, 0x0010a971, 0x4a03c829, 0x00000004,</div><div class='del'>-	0x59e40001, 0x82000540, 0x0003001d, 0x4803c801,</div><div class='del'>-	0x4a03c014, 0x001c001c, 0x42001000, 0x0000001c,</div><div class='del'>-	0x0201f800, 0x00100728, 0x4202c000, 0x0010cfc0,</div><div class='del'>-	0x59aab00b, 0x59aaa00b, 0x59aaa80b, 0x59aac80e,</div><div class='del'>-	0x49675069, 0x59a8000b, 0x4803500c, 0x0201f800,</div><div class='del'>-	0x001006a3, 0x0201f800, 0x0010768a, 0x0201f800,</div><div class='del'>-	0x00100804, 0x0201f800, 0x0010084d, 0x0201f800,</div><div class='del'>-	0x00101a60, 0x0201f800, 0x001013a4, 0x0201f800,</div><div class='del'>-	0x001009b6, 0x0201f800, 0x001013a4, 0x0201f800,</div><div class='del'>-	0x00100f9a, 0x0201f800, 0x0010640f, 0x0401fb54,</div><div class='del'>-	0x0201f800, 0x00101fb5, 0x0201f800, 0x0010508b,</div><div class='del'>-	0x0201f800, 0x00104b36, 0x0201f800, 0x00105ecd,</div><div class='del'>-	0x0201f800, 0x00105c61, 0x0201f800, 0x0010143d,</div><div class='del'>-	0x0201f800, 0x001012bf, 0x4203e000, 0xf0000001,</div><div class='del'>-	0x4a035070, 0x00000014, 0x4a035071, 0x0000000b,</div><div class='del'>-	0x4a035072, 0x00000001, 0x4a035073, 0x00000000,</div><div class='del'>-	0x42000000, 0x00001000, 0x50000000, 0x82000480,</div><div class='del'>-	0x24220001, 0x0400004a, 0x59e00002, 0x8c00051e,</div><div class='del'>-	0x42000000, 0x7ffe00fe, 0x04000003, 0x42000000,</div><div class='del'>-	0x7ffe01fe, 0x50000800, 0x48075058, 0x80040920,</div><div class='del'>-	0x82040580, 0x0000013e, 0x0402000b, 0x59a8006f,</div><div class='del'>-	0x84000548, 0x4803506f, 0x4a035070, 0x00000055,</div><div class='del'>-	0x4a035071, 0x00000051, 0x4a035073, 0x0000000f,</div><div class='del'>-	0x0401f033, 0x82040580, 0x0000013f, 0x0402000b,</div><div class='del'>-	0x59a8006f, 0x8400054a, 0x4803506f, 0x4a035070,</div><div class='del'>-	0x00000055, 0x4a035071, 0x00000051, 0x4a035073,</div><div class='del'>-	0x0000000f, 0x0401f026, 0x59e00003, 0x82000500,</div><div class='del'>-	0x00030000, 0x82000580, 0x00000000, 0x04020020,</div><div class='del'>-	0x82040580, 0x00000147, 0x04000010, 0x82040580,</div><div class='del'>-	0x00000145, 0x0402001a, 0x59a8006f, 0x84000546,</div><div class='del'>-	0x4803506f, 0x4a035070, 0x00000033, 0x4a035071,</div><div class='del'>-	0x00000030, 0x4a035072, 0x00000020, 0x4a035073,</div><div class='del'>-	0x00000001, 0x0401f00c, 0x59a8006f, 0x84000544,</div><div class='del'>-	0x4803506f, 0x4a035070, 0x00000033, 0x4a035071,</div><div class='del'>-	0x00000030, 0x4a035072, 0x00000020, 0x4a035073,</div><div class='del'>-	0x00000001, 0x4a0378e4, 0x000c0000, 0x59a8006f,</div><div class='del'>-	0x8c000502, 0x04000004, 0x82000500, 0x00000030,</div><div class='del'>-	0x04000b25, 0x4a03c018, 0x0000000f, 0x4203e000,</div><div class='del'>-	0x20000511, 0x4203e000, 0x50010000, 0x4a03c020,</div><div class='del'>-	0x00000000, 0x04027013, 0x59e00020, 0x82000580,</div><div class='del'>-	0x00000002, 0x0402000f, 0x4a03c020, 0x00004000,</div><div class='del'>-	0x4a03c011, 0x40000010, 0x04006000, 0x4203e000,</div><div class='del'>-	0x40000000, 0x59e00017, 0x8c000508, 0x04000003,</div><div class='del'>-	0x4a03c017, 0x00000000, 0x4203e000, 0x30000001,</div><div class='del'>-	0x4202d800, 0x00000000, 0x4203e000, 0xb0600000,</div><div class='del'>-	0x59a80873, 0x4007f800, 0x0201f000, 0x00020004,</div><div class='del'>-	0x4df00000, 0x4203e000, 0x50000000, 0x416c0000,</div><div class='del'>-	0x82000c80, 0x00000008, 0x04021afb, 0x0c01f804,</div><div class='del'>-	0x5c03e000, 0x0201f000, 0x00020008, 0x00100328,</div><div class='del'>-	0x0010033b, 0x00100411, 0x00100327, 0x0010048c,</div><div class='del'>-	0x00100327, 0x00100327, 0x001005d0, 0x0401faee,</div><div class='del'>-	0x42000800, 0x0010b2a0, 0x5804001d, 0x4803c857,</div><div class='del'>-	0x8c000500, 0x0400000d, 0x84000500, 0x4800081d,</div><div class='del'>-	0x4202d800, 0x00000004, 0x0401fbe8, 0x49f3c857,</div><div class='del'>-	0x5c000800, 0x5c000000, 0x82000540, 0x00003e00,</div><div class='del'>-	0x4c000000, 0x4c040000, 0x1c01f000, 0x0401fbd2,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04000010, 0x0201f800,</div><div class='del'>-	0x00104e23, 0x04020035, 0x59940023, 0x82000580,</div><div class='del'>-	0x0010401b, 0x04020004, 0x59940022, 0x800001c0,</div><div class='del'>-	0x0402002e, 0x59c40006, 0x82000540, 0x000000c0,</div><div class='del'>-	0x48038806, 0x0401f029, 0x0201f800, 0x00104d76,</div><div class='del'>-	0x836c0580, 0x00000001, 0x040200be, 0x59a80017,</div><div class='del'>-	0x82000580, 0x00000009, 0x040200ba, 0x497b5010,</div><div class='del'>-	0x4a038893, 0x00000001, 0x42001000, 0x000000f0,</div><div class='del'>-	0x0201f800, 0x001019aa, 0x0201f800, 0x00104e1b,</div><div class='del'>-	0x59c41006, 0x04020006, 0x82081540, 0x000000f1,</div><div class='del'>-	0x82081500, 0xbbffffff, 0x0401f003, 0x82081540,</div><div class='del'>-	0x440000f1, 0x480b8806, 0x0201f800, 0x00105de2,</div><div class='del'>-	0x0201f800, 0x001069b8, 0x42000000, 0x0010b638,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42001000, 0x00008030,</div><div class='del'>-	0x497b5013, 0x0401f037, 0x0201f800, 0x00103951,</div><div class='del'>-	0x59c400a4, 0x82000500, 0x0000000f, 0x82000480,</div><div class='del'>-	0x00000007, 0x04021093, 0x0201f800, 0x00105de2,</div><div class='del'>-	0x59c400a3, 0x82000500, 0xffefffff, 0x480388a3,</div><div class='del'>-	0x59a8004b, 0x800001c0, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00103f53, 0x0401f087, 0x59a80015, 0x84000546,</div><div class='del'>-	0x48035015, 0x0201f800, 0x00104e13, 0x59c41006,</div><div class='del'>-	0x04020006, 0x82081540, 0x44000001, 0x82081500,</div><div class='del'>-	0xffffff0f, 0x0401f003, 0x82081540, 0x440000f1,</div><div class='del'>-	0x480b8806, 0x497b9005, 0x4a038802, 0x0000ffff,</div><div class='del'>-	0x4a0378e4, 0x00003000, 0x4a0378e4, 0x000c0000,</div><div class='del'>-	0x42000000, 0x0010b60a, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x59a81010, 0x42000800, 0x00000003, 0x0201f800,</div><div class='del'>-	0x001069af, 0x42001000, 0x00008010, 0x59a8180a,</div><div class='del'>-	0x0201f800, 0x00103857, 0x0201f800, 0x00101886,</div><div class='del'>-	0x59a80805, 0x82040d00, 0xffffffdf, 0x48075005,</div><div class='del'>-	0x0201f800, 0x0010468b, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x0400000a, 0x0201f800, 0x00103f58, 0x04000007,</div><div class='del'>-	0x4a035013, 0x00000001, 0x497b5021, 0x0201f800,</div><div class='del'>-	0x00103a9f, 0x0401f04f, 0x0201f800, 0x0010473b,</div><div class='del'>-	0x04000005, 0x59c41002, 0x8408150c, 0x480b8802,</div><div class='del'>-	0x0401f012, 0x0201f800, 0x00104e0d, 0x04020006,</div><div class='del'>-	0x59a8001d, 0x80000540, 0x02000800, 0x001090d5,</div><div class='del'>-	0x0401f00a, 0x0201f800, 0x001090d5, 0x59a80026,</div><div class='del'>-	0x8c000506, 0x04020005, 0x59a8001d, 0x80000540,</div><div class='del'>-	0x02020800, 0x00104075, 0x497b5028, 0x497b5027,</div><div class='del'>-	0x497b5018, 0x0201f800, 0x00104e0d, 0x59a81026,</div><div class='del'>-	0x0402000a, 0x0201f800, 0x00101694, 0x80001580,</div><div class='del'>-	0x59a8002a, 0x82000500, 0xffff0000, 0x80040d40,</div><div class='del'>-	0x4807502a, 0x0401f005, 0x59a8002a, 0x82000500,</div><div class='del'>-	0xffff0000, 0x4803502a, 0x599c0017, 0x8c00050a,</div><div class='del'>-	0x04000002, 0x84081544, 0x480b5026, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04000004, 0x0201f800, 0x00101694,</div><div class='del'>-	0x48078880, 0x42001000, 0x00000005, 0x0201f800,</div><div class='del'>-	0x00106e07, 0x497b5028, 0x497b501b, 0x4a03501c,</div><div class='del'>-	0x0000ffff, 0x4a0378e4, 0x000000c0, 0x4202d800,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00104e0d, 0x04000007,</div><div class='del'>-	0x59a80026, 0x82000500, 0x0000000c, 0x82000580,</div><div class='del'>-	0x00000004, 0x04000003, 0x0201f800, 0x00101bf0,</div><div class='del'>-	0x1c01f000, 0x59a8001c, 0x82000580, 0x0000ffff,</div><div class='del'>-	0x04000004, 0x0201f800, 0x00101bf0, 0x0401f074,</div><div class='del'>-	0x59a80026, 0x8c00050a, 0x04020003, 0x8c000506,</div><div class='del'>-	0x0400001c, 0x8c000500, 0x0400001a, 0x4a038802,</div><div class='del'>-	0x0000ffbf, 0x8c000502, 0x04000016, 0x599c0018,</div><div class='del'>-	0x8c000516, 0x04020010, 0x59a80027, 0x82000580,</div><div class='del'>-	0x0000ffff, 0x0400000c, 0x0201f800, 0x00101d45,</div><div class='del'>-	0x59a80026, 0x8c000504, 0x0402005d, 0x42001000,</div><div class='del'>-	0x00000003, 0x417a5800, 0x0201f800, 0x00101d6a,</div><div class='del'>-	0x0401f057, 0x59a80028, 0x80000540, 0x04020054,</div><div class='del'>-	0x59a80026, 0x8c000508, 0x04020005, 0x59a8001b,</div><div class='del'>-	0x80000540, 0x0402004e, 0x0401f003, 0x8c000516,</div><div class='del'>-	0x0400004b, 0x0201f800, 0x0010473b, 0x04020048,</div><div class='del'>-	0x599c0018, 0x8c000516, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00104abe, 0x04020042, 0x599c0017, 0x8c00050a,</div><div class='del'>-	0x0400000d, 0x4200b000, 0x000007f0, 0x417a8800,</div><div class='del'>-	0x0201f800, 0x00020267, 0x04020004, 0x59340200,</div><div class='del'>-	0x8c00051a, 0x04020036, 0x81468800, 0x8058b040,</div><div class='del'>-	0x040207f8, 0x4a038802, 0x0000ffff, 0x42001800,</div><div class='del'>-	0x0010b2e7, 0x0401fb98, 0x42001800, 0x0010b2f4,</div><div class='del'>-	0x0401fb95, 0x59a80005, 0x84000502, 0x48035005,</div><div class='del'>-	0x4a0378e4, 0x00000080, 0x4202d800, 0x00000003,</div><div class='del'>-	0x4a03501c, 0x0000ffff, 0x0401fa8b, 0x80000580,</div><div class='del'>-	0x0201f800, 0x001015fa, 0x599c0018, 0x8c000516,</div><div class='del'>-	0x04000004, 0x0201f800, 0x00103929, 0x0401f009,</div><div class='del'>-	0x42001800, 0x0000ffff, 0x42002000, 0x00000006,</div><div class='del'>-	0x42003000, 0x00000000, 0x0201f800, 0x001038c7,</div><div class='del'>-	0x0201f800, 0x00104e23, 0x0400000b, 0x59c40006,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04000004, 0x82000500,</div><div class='del'>-	0xffffff0f, 0x0401f003, 0x82000500, 0xfbffffff,</div><div class='del'>-	0x48038806, 0x0201f800, 0x00106c8a, 0x1c01f000,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x4c100000, 0x59a8003e,</div><div class='del'>-	0x82000c80, 0x00000004, 0x04021983, 0x0c01f805,</div><div class='del'>-	0x5c002000, 0x5c001000, 0x5c000800, 0x1c01f000,</div><div class='del'>-	0x0010049c, 0x00100527, 0x00100553, 0x001005b4,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x001015fa,</div><div class='del'>-	0x0201f800, 0x00105de2, 0x59c408a3, 0x82040d00,</div><div class='del'>-	0xfffffff7, 0x480788a3, 0x0201f800, 0x00104e13,</div><div class='del'>-	0x0400000e, 0x0201f800, 0x00104e23, 0x0400000b,</div><div class='del'>-	0x0201f800, 0x00104e1b, 0x04020967, 0x59c400a3,</div><div class='del'>-	0x84000532, 0x84000570, 0x480388a3, 0x4a038808,</div><div class='del'>-	0x00000008, 0x0401f013, 0x59c400a3, 0x84000530,</div><div class='del'>-	0x82000500, 0xbf7fffff, 0x480388a3, 0x42000800,</div><div class='del'>-	0x000000f8, 0x0201f800, 0x00104030, 0x59c400a3,</div><div class='del'>-	0x82000540, 0x00018000, 0x8400051c, 0x480388a3,</div><div class='del'>-	0x82000500, 0xfffeffff, 0x480388a3, 0x497b8808,</div><div class='del'>-	0x59c40006, 0x82000500, 0xfbffff0e, 0x48038806,</div><div class='del'>-	0x497b2822, 0x497b2823, 0x42000800, 0x000001f4,</div><div class='del'>-	0x42001000, 0x001005ce, 0x0201f800, 0x00105cbc,</div><div class='del'>-	0x59c40805, 0x42001000, 0x00000001, 0x0201f800,</div><div class='del'>-	0x001019aa, 0x0201f800, 0x001016ac, 0x0402000a,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x001018fa,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x00101892,</div><div class='del'>-	0x0401f022, 0x0201f800, 0x001016b3, 0x04020008,</div><div class='del'>-	0x41780000, 0x0201f800, 0x001018fa, 0x41780000,</div><div class='del'>-	0x0201f800, 0x00101892, 0x0401f018, 0x0201f800,</div><div class='del'>-	0x001016ba, 0x0402000a, 0x42000000, 0x00000002,</div><div class='del'>-	0x0201f800, 0x001018fa, 0x42000000, 0x00000002,</div><div class='del'>-	0x0201f800, 0x00101892, 0x0401f00c, 0x0201f800,</div><div class='del'>-	0x001016c1, 0x04020918, 0x59a80049, 0x800001c0,</div><div class='del'>-	0x04000006, 0x0201f800, 0x001016c7, 0x4a03503e,</div><div class='del'>-	0x00000001, 0x0401f021, 0x0201f800, 0x00101994,</div><div class='del'>-	0x4a03503e, 0x00000001, 0x0201f800, 0x00104e13,</div><div class='del'>-	0x0400000c, 0x0201f800, 0x00104e23, 0x04000009,</div><div class='del'>-	0x0201f800, 0x00104e1b, 0x04020903, 0x4a035033,</div><div class='del'>-	0x00000001, 0x0201f800, 0x00104d76, 0x0401f00f,</div><div class='del'>-	0x59c400a4, 0x82000500, 0x0000000f, 0x82000580,</div><div class='del'>-	0x00000008, 0x04000003, 0x4a038805, 0x04000000,</div><div class='del'>-	0x59c400a3, 0x82000540, 0x0001c000, 0x480388a3,</div><div class='del'>-	0x84000520, 0x480388a3, 0x1c01f000, 0x0401f8a3,</div><div class='del'>-	0x04020004, 0x4a03503e, 0x00000003, 0x0401f027,</div><div class='del'>-	0x0201f800, 0x001016c1, 0x04020011, 0x59a80049,</div><div class='del'>-	0x800001c0, 0x0400000e, 0x0201f800, 0x001016c7,</div><div class='del'>-	0x59a80048, 0x8c00051e, 0x0400001c, 0x0201f800,</div><div class='del'>-	0x00104e1b, 0x04020009, 0x4a035033, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00104d76, 0x0401f004, 0x0201f800,</div><div class='del'>-	0x00101941, 0x04020011, 0x0201f800, 0x00101886,</div><div class='del'>-	0x4a03503e, 0x00000002, 0x497b5049, 0x59c400a3,</div><div class='del'>-	0x84000520, 0x480388a3, 0x497b2822, 0x497b2823,</div><div class='del'>-	0x42000800, 0x0000002d, 0x42001000, 0x001005ce,</div><div class='del'>-	0x0201f800, 0x00105cbc, 0x1c01f000, 0x0401f877,</div><div class='del'>-	0x04020004, 0x4a03503e, 0x00000003, 0x0401f05b,</div><div class='del'>-	0x4a038805, 0x000000f0, 0x0201f800, 0x00101941,</div><div class='del'>-	0x04020050, 0x0201f800, 0x00104e1b, 0x04000044,</div><div class='del'>-	0x59c400a4, 0x82000500, 0x0000000f, 0x82000580,</div><div class='del'>-	0x00000008, 0x04000020, 0x59c40005, 0x8c000534,</div><div class='del'>-	0x0402001d, 0x59940022, 0x82000580, 0x00000001,</div><div class='del'>-	0x04020046, 0x0201f800, 0x00104e23, 0x04020043,</div><div class='del'>-	0x4a038805, 0x000000f0, 0x0201f800, 0x00104e67,</div><div class='del'>-	0x4a035032, 0x0000aaaa, 0x4a035033, 0x00000000,</div><div class='del'>-	0x59c408a3, 0x82040d40, 0x00000008, 0x480788a3,</div><div class='del'>-	0x4202d800, 0x00000001, 0x4a03503e, 0x00000000,</div><div class='del'>-	0x4a038805, 0x00000001, 0x497b2822, 0x497b2823,</div><div class='del'>-	0x0401f01f, 0x0201f800, 0x00104e23, 0x04020007,</div><div class='del'>-	0x59a80032, 0x82000580, 0x0000aaaa, 0x04020003,</div><div class='del'>-	0x4a035010, 0x00ffffff, 0x497b5032, 0x59c40006,</div><div class='del'>-	0x82000540, 0x04000001, 0x48038806, 0x59a80805,</div><div class='del'>-	0x8c040d06, 0x04020005, 0x59c408a3, 0x82040d40,</div><div class='del'>-	0x00000008, 0x480788a3, 0x4202d800, 0x00000001,</div><div class='del'>-	0x4a03503e, 0x00000000, 0x4a038805, 0x00000001,</div><div class='del'>-	0x497b2822, 0x497b2823, 0x0401f010, 0x59c40005,</div><div class='del'>-	0x82000500, 0x000000c0, 0x0400000c, 0x59c40006,</div><div class='del'>-	0x82000540, 0x000000f1, 0x48038806, 0x0401f7ef,</div><div class='del'>-	0x0201f800, 0x001016c1, 0x04020004, 0x59a80049,</div><div class='del'>-	0x800001c0, 0x040207a4, 0x497b8885, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x42000000, 0x00000001, 0x0201f800,</div><div class='del'>-	0x001015fa, 0x4a03503e, 0x00000000, 0x0201f800,</div><div class='del'>-	0x001016c1, 0x0402000b, 0x59a80052, 0x800001c0,</div><div class='del'>-	0x04000004, 0x80000040, 0x48035052, 0x04020005,</div><div class='del'>-	0x4a035052, 0x0000000a, 0x4a035049, 0x00000001,</div><div class='del'>-	0x497b8885, 0x0401f0f6, 0x59940022, 0x59940823,</div><div class='del'>-	0x80040540, 0x1c01f000, 0x497b2823, 0x1c01f000,</div><div class='del'>-	0x4c080000, 0x42001000, 0x000000f0, 0x0201f800,</div><div class='del'>-	0x001019aa, 0x5c001000, 0x1c01f000, 0x4a03505c,</div><div class='del'>-	0x00000004, 0x4a03505d, 0x00000000, 0x4a03505e,</div><div class='del'>-	0x00000012, 0x4a03505f, 0x00000002, 0x4a035010,</div><div class='del'>-	0x00ffffff, 0x0201f800, 0x001090d5, 0x4a03502a,</div><div class='del'>-	0x20200000, 0x4a03502b, 0x88000200, 0x4a03502c,</div><div class='del'>-	0x00ff001f, 0x4a03502d, 0x000007d0, 0x4a03502e,</div><div class='del'>-	0x80000000, 0x4a03502f, 0x00000200, 0x4a035030,</div><div class='del'>-	0x00ff0000, 0x4a035031, 0x00010000, 0x4a03503a,</div><div class='del'>-	0x514c4f47, 0x4a03503b, 0x49432020, 0x1c01f000,</div><div class='del'>-	0x4d440000, 0x417a8800, 0x41780800, 0x0201f800,</div><div class='del'>-	0x00020267, 0x04020005, 0x0201f800, 0x00104836,</div><div class='del'>-	0x04020002, 0x80040800, 0x81468800, 0x83440580,</div><div class='del'>-	0x000007f0, 0x040207f6, 0x5c028800, 0x1c01f000,</div><div class='del'>-	0x4803c857, 0x5c000000, 0x4c000000, 0x4803c857,</div><div class='del'>-	0x0401f809, 0x485fc857, 0x4203e000, 0x50000000,</div><div class='del'>-	0x5c000000, 0x4d780000, 0x4200b800, 0x00008002,</div><div class='del'>-	0x0401f006, 0x485fc857, 0x4203e000, 0x50000000,</div><div class='del'>-	0x4200b800, 0x00008002, 0x04006000, 0x4c000000,</div><div class='del'>-	0x4c040000, 0x59bc00ea, 0x82000500, 0x00000007,</div><div class='del'>-	0x82000580, 0x00000001, 0x04020005, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001069a3, 0x5c000800,</div><div class='del'>-	0x4807c025, 0x80040920, 0x4807c026, 0x5c000000,</div><div class='del'>-	0x4803c023, 0x80000120, 0x4803c024, 0x5c000000,</div><div class='del'>-	0x4803c857, 0x4803c021, 0x80000120, 0x4803c022,</div><div class='del'>-	0x41f80000, 0x4803c027, 0x80000120, 0x4803c028,</div><div class='del'>-	0x42000000, 0x00001000, 0x50000000, 0x82000480,</div><div class='del'>-	0x24320001, 0x4803c857, 0x04001053, 0x42000800,</div><div class='del'>-	0x00000064, 0x80040840, 0x04000007, 0x4a030000,</div><div class='del'>-	0x00000001, 0x40000000, 0x59800000, 0x8c000500,</div><div class='del'>-	0x040007f9, 0x04000046, 0x42000800, 0x0010bfa2,</div><div class='del'>-	0x46000800, 0xfaceface, 0x80040800, 0x4c080000,</div><div class='del'>-	0x4c0c0000, 0x42001000, 0x00007a00, 0x58080013,</div><div class='del'>-	0x44000800, 0x80040800, 0x58080019, 0x44000800,</div><div class='del'>-	0x80040800, 0x5808001a, 0x44000800, 0x80040800,</div><div class='del'>-	0x5808001b, 0x44000800, 0x80040800, 0x5808001c,</div><div class='del'>-	0x44000800, 0x80040800, 0x5808001f, 0x44000800,</div><div class='del'>-	0x80040800, 0x42001000, 0x00007a40, 0x42001800,</div><div class='del'>-	0x0000000b, 0x50080000, 0x44000800, 0x80081000,</div><div class='del'>-	0x80040800, 0x800c1840, 0x040207fb, 0x42001800,</div><div class='del'>-	0x00000003, 0x42001000, 0x00007b00, 0x480c1003,</div><div class='del'>-	0x58080005, 0x44000800, 0x80040800, 0x800c1840,</div><div class='del'>-	0x040217fb, 0x42001000, 0x00007c00, 0x58080002,</div><div class='del'>-	0x44000800, 0x80040800, 0x58080003, 0x44000800,</div><div class='del'>-	0x80040800, 0x58080020, 0x44000800, 0x80040800,</div><div class='del'>-	0x58080021, 0x44000800, 0x80040800, 0x58080022,</div><div class='del'>-	0x44000800, 0x80040800, 0x58080023, 0x44000800,</div><div class='del'>-	0x80040800, 0x5c001800, 0x5c001000, 0x4a030000,</div><div class='del'>-	0x00000000, 0x485fc020, 0x905cb9c0, 0x825cbd40,</div><div class='del'>-	0x00000012, 0x485fc011, 0x4203e000, 0x40000000,</div><div class='del'>-	0x4202d800, 0x00000005, 0x59e00017, 0x8c000508,</div><div class='del'>-	0x04000003, 0x4a03c017, 0x00000002, 0x4203e000,</div><div class='del'>-	0x30000001, 0x0401f81f, 0x0401f7ff, 0x4a03c850,</div><div class='del'>-	0x0010bfbe, 0x4a03c851, 0x0010cfbd, 0x4a03c853,</div><div class='del'>-	0x00000800, 0x4a03c855, 0x0001eb5a, 0x59e40001,</div><div class='del'>-	0x82000540, 0x00003f00, 0x4803c801, 0x4a03b104,</div><div class='del'>-	0x70000002, 0x4a03a804, 0x70000002, 0x4a03b004,</div><div class='del'>-	0x70000002, 0x42000000, 0x0010b6eb, 0x49780001,</div><div class='del'>-	0x49780002, 0x1c01f000, 0x5c036000, 0x4db00000,</div><div class='del'>-	0x49b3c857, 0x4803c857, 0x1c01f000, 0x1c01f000,</div><div class='del'>-	0x59a8006b, 0x8c000530, 0x040207fe, 0x4c080000,</div><div class='del'>-	0x42001000, 0x00000004, 0x0401f862, 0x5c001000,</div><div class='del'>-	0x4201d000, 0x00028b0a, 0x0201f800, 0x00105dd2,</div><div class='del'>-	0x4c080000, 0x42001000, 0x00000008, 0x0401f859,</div><div class='del'>-	0x5c001000, 0x4201d000, 0x00028b0a, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x4c080000, 0x42001000, 0x00000010,</div><div class='del'>-	0x0401f850, 0x5c001000, 0x4201d000, 0x00028b0a,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x0401f7e2, 0x8c00050c,</div><div class='del'>-	0x59a8086b, 0x04020003, 0x84040d30, 0x0401f006,</div><div class='del'>-	0x84040d70, 0x4807506b, 0x42001000, 0x00000000,</div><div class='del'>-	0x0401f040, 0x4807506b, 0x836c0500, 0x00000007,</div><div class='del'>-	0x0c01f001, 0x00100727, 0x0010070d, 0x0010070d,</div><div class='del'>-	0x001006f5, 0x0010071a, 0x0010070d, 0x0010070d,</div><div class='del'>-	0x0010071a, 0x59a8006f, 0x8c000502, 0x04020013,</div><div class='del'>-	0x59c40801, 0x82040d00, 0x00018000, 0x82040580,</div><div class='del'>-	0x00010000, 0x0400000a, 0x82040580, 0x00008000,</div><div class='del'>-	0x04000004, 0x42001000, 0x42004000, 0x0401f006,</div><div class='del'>-	0x42001000, 0x22002000, 0x0401f003, 0x42001000,</div><div class='del'>-	0x12001000, 0x0401f025, 0x42001000, 0x00001004,</div><div class='del'>-	0x0401f022, 0x59a8006f, 0x8c000502, 0x04020008,</div><div class='del'>-	0x59a8006b, 0x8c000534, 0x04020004, 0x42001000,</div><div class='del'>-	0x74057005, 0x0401f819, 0x1c01f000, 0x42001000,</div><div class='del'>-	0x00002008, 0x0401f7fc, 0x59a8006b, 0x8c000534,</div><div class='del'>-	0x0402000a, 0x59a8006f, 0x8c000502, 0x04000004,</div><div class='del'>-	0x42001000, 0x24052005, 0x0401f00c, 0x42001000,</div><div class='del'>-	0x74057005, 0x0401f009, 0x1c01f000, 0x1c01f000,</div><div class='del'>-	0x82081500, 0x0000001c, 0x82081540, 0x001c0000,</div><div class='del'>-	0x480bc013, 0x1c01f000, 0x59a8006b, 0x8c000530,</div><div class='del'>-	0x04000002, 0x84081570, 0x480b506b, 0x8c000530,</div><div class='del'>-	0x04020005, 0x82081500, 0x00007000, 0x80081114,</div><div class='del'>-	0x0401fff0, 0x1c01f000, 0x41780000, 0x50041800,</div><div class='del'>-	0x800c0400, 0x80040800, 0x80102040, 0x040207fc,</div><div class='del'>-	0x80080500, 0x80000540, 0x1c01f000, 0x4202f000,</div><div class='del'>-	0x00000000, 0x41780000, 0x41780800, 0x41781000,</div><div class='del'>-	0x41781800, 0x41782000, 0x41782800, 0x41783000,</div><div class='del'>-	0x41783800, 0x41784000, 0x41784800, 0x41785000,</div><div class='del'>-	0x41785800, 0x41786000, 0x41786800, 0x41787000,</div><div class='del'>-	0x41787800, 0x41788000, 0x41788800, 0x41789000,</div><div class='del'>-	0x41789800, 0x4178a000, 0x4178a800, 0x4178b000,</div><div class='del'>-	0x4178b800, 0x4178c000, 0x4178c800, 0x4178d000,</div><div class='del'>-	0x4178d800, 0x4178e000, 0x4178e800, 0x4178f000,</div><div class='del'>-	0x4178f800, 0x41790000, 0x41790800, 0x41791000,</div><div class='del'>-	0x41791800, 0x41792000, 0x41792800, 0x41793000,</div><div class='del'>-	0x41793800, 0x41794000, 0x41794800, 0x41795000,</div><div class='del'>-	0x41795800, 0x41796000, 0x41796800, 0x41797000,</div><div class='del'>-	0x41797800, 0x41798000, 0x41798800, 0x42019000,</div><div class='del'>-	0x0010b333, 0x42019800, 0x0010b30a, 0x4179a000,</div><div class='del'>-	0x4179a800, 0x4179b000, 0x4179b800, 0x4179c800,</div><div class='del'>-	0x4179c000, 0x4179d000, 0x4179d800, 0x4179e000,</div><div class='del'>-	0x4179e800, 0x4179f000, 0x4179f800, 0x417a0000,</div><div class='del'>-	0x417a0800, 0x417a1000, 0x417a1800, 0x417a2000,</div><div class='del'>-	0x42022800, 0x00006100, 0x417a3000, 0x417a3800,</div><div class='del'>-	0x417a4000, 0x417a4800, 0x417a5000, 0x417a5800,</div><div class='del'>-	0x417a6000, 0x417a6800, 0x417a7000, 0x417a7800,</div><div class='del'>-	0x417a8000, 0x417a8800, 0x417a9000, 0x417a9800,</div><div class='del'>-	0x417ae800, 0x417af800, 0x42030000, 0x00007c00,</div><div class='del'>-	0x42031000, 0x0010b604, 0x42031800, 0x0000bf1d,</div><div class='del'>-	0x42032000, 0x0000bf32, 0x42032800, 0x0010b5cc,</div><div class='del'>-	0x42033000, 0x0010b274, 0x42034000, 0x0010b2a0,</div><div class='del'>-	0x42033800, 0x0010b2bf, 0x42034800, 0x0010b342,</div><div class='del'>-	0x42035000, 0x0010b200, 0x42035800, 0x0010aa00,</div><div class='del'>-	0x42030800, 0x0010b301, 0x417b6000, 0x42036800,</div><div class='del'>-	0x00006f00, 0x4203c800, 0x00003000, 0x42037000,</div><div class='del'>-	0x0000ff00, 0x42037800, 0x0000bf00, 0x42038000,</div><div class='del'>-	0x00007700, 0x42038800, 0x00004000, 0x42039000,</div><div class='del'>-	0x00006000, 0x42039800, 0x0010bcda, 0x4203a000,</div><div class='del'>-	0x00007600, 0x4203a800, 0x00007400, 0x4203b000,</div><div class='del'>-	0x00007200, 0x4203b800, 0x00007100, 0x4203c000,</div><div class='del'>-	0x00007000, 0x4203d000, 0x00000000, 0x4203e800,</div><div class='del'>-	0x000200f9, 0x417bd800, 0x1c01f000, 0x42000800,</div><div class='del'>-	0x00100000, 0x50040000, 0x4c000000, 0x42000000,</div><div class='del'>-	0x0000aaaa, 0x44000800, 0x42001800, 0x00005555,</div><div class='del'>-	0x41782000, 0x82102400, 0x00010000, 0x40100000,</div><div class='del'>-	0x80042c00, 0x440c2800, 0x42003000, 0x0000000a,</div><div class='del'>-	0x80183040, 0x040207ff, 0x50140000, 0x800c0580,</div><div class='del'>-	0x04020004, 0x50040000, 0x800c0580, 0x040207f2,</div><div class='del'>-	0x5c000000, 0x44000800, 0x80142840, 0x4817c861,</div><div class='del'>-	0x1c01f000, 0x59a8081f, 0x800409c0, 0x04020009,</div><div class='del'>-	0x49781c0c, 0x4a001a0c, 0x00000200, 0x4a001804,</div><div class='del'>-	0x07000000, 0x59a80010, 0x9c0001c0, 0x48001805,</div><div class='del'>-	0x0401fdf8, 0x9c0409c0, 0x48041806, 0x1c01f000,</div><div class='del'>-	0x59a8080c, 0x4006d000, 0x4202b800, 0x00000001,</div><div class='del'>-	0x59a8180d, 0x480fc857, 0x82041400, 0x00000014,</div><div class='del'>-	0x82082400, 0x00000014, 0x40100000, 0x800c0480,</div><div class='del'>-	0x04001006, 0x44080800, 0x40080800, 0x40101000,</div><div class='del'>-	0x815eb800, 0x0401f7f7, 0x45780800, 0x495f5020,</div><div class='del'>-	0x1c01f000, 0x835c0480, 0x00000020, 0x04001009,</div><div class='del'>-	0x496bc857, 0x815eb840, 0x416a5800, 0x592ed000,</div><div class='del'>-	0x497a5800, 0x497a5801, 0x812e59c0, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b652, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x417a5800, 0x0401f7f9, 0x815eb840, 0x04001008,</div><div class='del'>-	0x416a5800, 0x492fc857, 0x592ed000, 0x497a5800,</div><div class='del'>-	0x497a5801, 0x812e59c0, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b652, 0x0201f800, 0x0010a86e, 0x417ab800,</div><div class='del'>-	0x417a5800, 0x0401f7f8, 0x492fc857, 0x496a5800,</div><div class='del'>-	0x412ed000, 0x815eb800, 0x59c80000, 0x82000540,</div><div class='del'>-	0x00001200, 0x48039000, 0x1c01f000, 0x492fc857,</div><div class='del'>-	0x812e59c0, 0x04000007, 0x592c0001, 0x497a5801,</div><div class='del'>-	0x4c000000, 0x0401fff1, 0x5c025800, 0x0401f7f9,</div><div class='del'>-	0x1c01f000, 0x4807c856, 0x42007000, 0x0010b5f6,</div><div class='del'>-	0x4a007001, 0x00000000, 0x59e00003, 0x82000540,</div><div class='del'>-	0x00008080, 0x4803c003, 0x4a03b805, 0x90000001,</div><div class='del'>-	0x59dc0006, 0x4a03b805, 0x70000000, 0x59dc0006,</div><div class='del'>-	0x4a03b805, 0x30000000, 0x59dc0006, 0x4a03b805,</div><div class='del'>-	0x80000000, 0x4200b000, 0x00000020, 0x497bb807,</div><div class='del'>-	0x8058b040, 0x040207fe, 0x4a03b805, 0x30000000,</div><div class='del'>-	0x59dc0006, 0x4a03b805, 0x60000001, 0x59dc0006,</div><div class='del'>-	0x4a03b805, 0x70000001, 0x59dc0006, 0x4a03b805,</div><div class='del'>-	0x30000002, 0x4200b000, 0x00000020, 0x497bb807,</div><div class='del'>-	0x8058b040, 0x040207fe, 0x4a03b805, 0x30000000,</div><div class='del'>-	0x59dc0006, 0x4a03b805, 0x60000001, 0x0401ff9e,</div><div class='del'>-	0x04000d99, 0x42001000, 0x0010b5f4, 0x452c1000,</div><div class='del'>-	0x4a025801, 0x00000001, 0x4a025802, 0x00000100,</div><div class='del'>-	0x4a025809, 0x00106eac, 0x497a580a, 0x497a580b,</div><div class='del'>-	0x497a580c, 0x0401ff90, 0x04000d8b, 0x42001000,</div><div class='del'>-	0x0010b5f5, 0x452c1000, 0x4a025801, 0x00000000,</div><div class='del'>-	0x4a025802, 0x00000100, 0x4a025809, 0x0010120c,</div><div class='del'>-	0x497a5803, 0x497a5807, 0x497a5808, 0x497a580a,</div><div class='del'>-	0x59a8006f, 0x8c000500, 0x04000006, 0x4a03b805,</div><div class='del'>-	0xe0000001, 0x59dc0006, 0x8c000522, 0x040007fc,</div><div class='del'>-	0x1c01f000, 0x4df00000, 0x4203e000, 0x50000000,</div><div class='del'>-	0x4c380000, 0x40087000, 0x4a007002, 0x00000000,</div><div class='del'>-	0x42007000, 0x0010b5f6, 0x82080400, 0x00000000,</div><div class='del'>-	0x45780000, 0x58380005, 0x48087005, 0x80000540,</div><div class='del'>-	0x04000006, 0x480bc857, 0x82000400, 0x00000000,</div><div class='del'>-	0x44080000, 0x0401f003, 0x480bc857, 0x48087006,</div><div class='del'>-	0x58380001, 0x80000540, 0x0400080c, 0x5c007000,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x4c380000, 0x42007000,</div><div class='del'>-	0x0010b5f6, 0x58380001, 0x80000540, 0x04000803,</div><div class='del'>-	0x5c007000, 0x1c01f000, 0x42007000, 0x0010b5f6,</div><div class='del'>-	0x58380001, 0x82000580, 0x00000000, 0x04020012,</div><div class='del'>-	0x58380000, 0x0c01f001, 0x001008d7, 0x001008d6,</div><div class='del'>-	0x001008d6, 0x001008d6, 0x001008d6, 0x001008d6,</div><div class='del'>-	0x001008d6, 0x001008d6, 0x0401fd3f, 0x58380808,</div><div class='del'>-	0x800409c0, 0x04020027, 0x58380006, 0x80000540,</div><div class='del'>-	0x04020002, 0x1c01f000, 0x4803c857, 0x48007002,</div><div class='del'>-	0x40006800, 0x58340000, 0x80000540, 0x04020002,</div><div class='del'>-	0x48007005, 0x48007006, 0x4a03b805, 0x20000000,</div><div class='del'>-	0x59dc0006, 0x4a03b805, 0x30000000, 0x58340007,</div><div class='del'>-	0x4803b800, 0x4803c857, 0x58340008, 0x4803b801,</div><div class='del'>-	0x4803c857, 0x58340004, 0x48007003, 0x58340003,</div><div class='del'>-	0x48007004, 0x4803b803, 0x4803c857, 0x58340001,</div><div class='del'>-	0x8c000500, 0x04000004, 0x4a007001, 0x00000001,</div><div class='del'>-	0x0401f028, 0x4a007001, 0x00000002, 0x0401f03e,</div><div class='del'>-	0x0201f800, 0x001091b3, 0x0201f800, 0x0010a4b8,</div><div class='del'>-	0x04000017, 0x4a03b805, 0x20000000, 0x59dc0006,</div><div class='del'>-	0x4a03b805, 0x30000000, 0x4807b800, 0x480bb801,</div><div class='del'>-	0x4a007003, 0x00000010, 0x480c7009, 0x42001000,</div><div class='del'>-	0x001008be, 0x0201f800, 0x00105cd3, 0x58380008,</div><div class='del'>-	0x82000400, 0x00000004, 0x48007004, 0x4803b803,</div><div class='del'>-	0x4a007001, 0x00000007, 0x0401f023, 0x0201f800,</div><div class='del'>-	0x001091cb, 0x42000800, 0x00000001, 0x42001000,</div><div class='del'>-	0x001008be, 0x0201f800, 0x00105caf, 0x0401f7b7,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x58380803, 0x42001000,</div><div class='del'>-	0x00003fff, 0x82040480, 0x00003fff, 0x04021003,</div><div class='del'>-	0x40041000, 0x80000580, 0x48007003, 0x4803c857,</div><div class='del'>-	0x800800c4, 0x4803b802, 0x4a03b805, 0x30000002,</div><div class='del'>-	0x59dc0006, 0x4a03b805, 0x70000001, 0x59dc0006,</div><div class='del'>-	0x4a03b805, 0x10000000, 0x5c001000, 0x5c000800,</div><div class='del'>-	0x1c01f000, 0x483bc857, 0x4c040000, 0x4c080000,</div><div class='del'>-	0x58380803, 0x42001000, 0x00003fff, 0x82040480,</div><div class='del'>-	0x00003fff, 0x04021003, 0x40041000, 0x80000580,</div><div class='del'>-	0x48007003, 0x800800c4, 0x4803b802, 0x4803c857,</div><div class='del'>-	0x4a03b805, 0x10000002, 0x5c001000, 0x5c000800,</div><div class='del'>-	0x1c01f000, 0x4c040000, 0x4c380000, 0x42007000,</div><div class='del'>-	0x0010b5f6, 0x59dc0806, 0x4807c857, 0x4a03b805,</div><div class='del'>-	0x20000000, 0x8c040d3e, 0x04000007, 0x8c040d08,</div><div class='del'>-	0x04020cb9, 0x58380001, 0x82000500, 0x00000007,</div><div class='del'>-	0x0c01f804, 0x5c007000, 0x5c000800, 0x1c01f000,</div><div class='del'>-	0x001008c6, 0x0010096c, 0x0010097c, 0x00100615,</div><div class='del'>-	0x00100615, 0x00100615, 0x00100615, 0x0010123a,</div><div class='del'>-	0x4807c856, 0x82040d00, 0x43000f80, 0x04020009,</div><div class='del'>-	0x58380003, 0x80000540, 0x0400001c, 0x59dc0000,</div><div class='del'>-	0x4803b800, 0x59dc0001, 0x4803b801, 0x0401f7ad,</div><div class='del'>-	0x58380802, 0x4a000802, 0x00000200, 0x0401f01d,</div><div class='del'>-	0x4807c856, 0x82040d00, 0x43000f80, 0x04020009,</div><div class='del'>-	0x58380003, 0x80000540, 0x0400000c, 0x59dc0000,</div><div class='del'>-	0x4803b800, 0x59dc0001, 0x4803b801, 0x0401f7b6,</div><div class='del'>-	0x58380002, 0x82000400, 0x00000002, 0x46000000,</div><div class='del'>-	0x00000200, 0x0401f00b, 0x4c340000, 0x58386802,</div><div class='del'>-	0x59dc0000, 0x4803c857, 0x48006807, 0x59dc0001,</div><div class='del'>-	0x48006808, 0x4a006802, 0x00000100, 0x5c006800,</div><div class='del'>-	0x4a007001, 0x00000000, 0x4c300000, 0x58386002,</div><div class='del'>-	0x4833c857, 0x0401f80c, 0x04000009, 0x58300009,</div><div class='del'>-	0x82000c80, 0x0010a971, 0x04021c73, 0x82000c80,</div><div class='del'>-	0x00020000, 0x04001c70, 0x0801f800, 0x5c006000,</div><div class='del'>-	0x0401f71e, 0x803061c0, 0x04000009, 0x59a8000c,</div><div class='del'>-	0x80300480, 0x04001007, 0x59a8000d, 0x80300480,</div><div class='del'>-	0x04021004, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x80000580, 0x1c01f000, 0x4803c856, 0x4dc00000,</div><div class='del'>-	0x42007000, 0x0010b601, 0x4a007400, 0x00000000,</div><div class='del'>-	0x49787001, 0x42038000, 0x00007720, 0x4a038006,</div><div class='del'>-	0x60000001, 0x4a038009, 0xf4f60000, 0x42038000,</div><div class='del'>-	0x00007700, 0x4a038006, 0x60000001, 0x4a038009,</div><div class='del'>-	0xf4f60000, 0x4a03c822, 0x00000010, 0x4a0370e8,</div><div class='del'>-	0x00000000, 0x0401f809, 0x4a0370e9, 0x00003a0f,</div><div class='del'>-	0x4a0370e8, 0x00000000, 0x4a0370e8, 0x00000001,</div><div class='del'>-	0x5c038000, 0x1c01f000, 0x4c5c0000, 0x4178b800,</div><div class='del'>-	0x0401f80a, 0x5c00b800, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4c5c0000, 0x825cbd40, 0x00000001, 0x0401f803,</div><div class='del'>-	0x5c00b800, 0x1c01f000, 0x4803c856, 0x4dc00000,</div><div class='del'>-	0x4c500000, 0x4c580000, 0x4c540000, 0x4a0370e8,</div><div class='del'>-	0x00000000, 0x805cb9c0, 0x04000009, 0x4a038807,</div><div class='del'>-	0x00000004, 0x59b800ea, 0x8c000510, 0x04000004,</div><div class='del'>-	0x59b800e0, 0x0401f87b, 0x0401f7fb, 0x42038000,</div><div class='del'>-	0x00007720, 0x0201f800, 0x00100f0f, 0x59c00007,</div><div class='del'>-	0x4a038006, 0x20000000, 0x59c00007, 0x4a038006,</div><div class='del'>-	0x8000000a, 0x59c00007, 0x4a038006, 0x8000000b,</div><div class='del'>-	0x59c00007, 0x4a038006, 0x40000001, 0x83c00580,</div><div class='del'>-	0x00007700, 0x04000004, 0x42038000, 0x00007700,</div><div class='del'>-	0x0401f7ed, 0x42038000, 0x00007720, 0x42000800,</div><div class='del'>-	0x00000800, 0x59c00007, 0x8c00051e, 0x04000006,</div><div class='del'>-	0x4a038006, 0x90000001, 0x80040840, 0x040207fa,</div><div class='del'>-	0x0401fc01, 0x83c00580, 0x00007700, 0x04000004,</div><div class='del'>-	0x42038000, 0x00007700, 0x0401f7f1, 0x805cb9c0,</div><div class='del'>-	0x0402001d, 0x4200b000, 0x00000020, 0x83b8ac00,</div><div class='del'>-	0x00000020, 0x0201f800, 0x0010a947, 0x4a0370fb,</div><div class='del'>-	0x00000001, 0x4a037020, 0x0010110d, 0x59a80039,</div><div class='del'>-	0x82000500, 0x0000ffff, 0x48037021, 0x4a037035,</div><div class='del'>-	0x0010bbda, 0x4a037030, 0x0010b210, 0x4a037031,</div><div class='del'>-	0x0010aa00, 0x4a037032, 0x0010b315, 0x4a037036,</div><div class='del'>-	0x0010b320, 0x59840002, 0x48037034, 0x4a037038,</div><div class='del'>-	0x00101104, 0x4a0370fb, 0x00000001, 0x4178a000,</div><div class='del'>-	0x4200b000, 0x00000020, 0x83b8ac00, 0x00000000,</div><div class='del'>-	0x0201f800, 0x0010a947, 0x4200b000, 0x00000040,</div><div class='del'>-	0x83b8ac00, 0x00000040, 0x0201f800, 0x0010a947,</div><div class='del'>-	0x805cb9c0, 0x04020004, 0x4a0370e4, 0xaaaaaaaa,</div><div class='del'>-	0x0401f003, 0x4a0370e4, 0xa2aaaa82, 0x4a0370e5,</div><div class='del'>-	0xaaaaaaaa, 0x4a0370e6, 0xaaaaaaaa, 0x4a0370fb,</div><div class='del'>-	0x00000000, 0x4a0370e6, 0xaaaaaaaa, 0x42038000,</div><div class='del'>-	0x00007720, 0x4a038006, 0x90000000, 0x59c00007,</div><div class='del'>-	0x8c00051e, 0x02020800, 0x00100615, 0x42038000,</div><div class='del'>-	0x00007700, 0x4a038006, 0x90000000, 0x59c00007,</div><div class='del'>-	0x8c00051e, 0x02020800, 0x00100615, 0x5c00a800,</div><div class='del'>-	0x5c00b000, 0x5c00a000, 0x5c038000, 0x1c01f000,</div><div class='del'>-	0x4d300000, 0x4d380000, 0x40026000, 0x82000500,</div><div class='del'>-	0x7f000000, 0x82000580, 0x00000003, 0x0402000f,</div><div class='del'>-	0x83326500, 0x00ffffff, 0x59300203, 0x82000580,</div><div class='del'>-	0x00000004, 0x04020009, 0x59300c06, 0x82040580,</div><div class='del'>-	0x00000009, 0x04020005, 0x42027000, 0x00000047,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x5c026000,</div><div class='del'>-	0x1c01f000, 0x4d300000, 0x4d2c0000, 0x4d340000,</div><div class='del'>-	0x4d400000, 0x4cfc0000, 0x4d380000, 0x4d3c0000,</div><div class='del'>-	0x4d440000, 0x4d4c0000, 0x4d480000, 0x4c5c0000,</div><div class='del'>-	0x4c600000, 0x4c640000, 0x4d040000, 0x4cc80000,</div><div class='del'>-	0x4ccc0000, 0x4cf40000, 0x4cf80000, 0x4cfc0000,</div><div class='del'>-	0x0201f800, 0x00020016, 0x5c01f800, 0x5c01f000,</div><div class='del'>-	0x5c01e800, 0x5c019800, 0x5c019000, 0x5c020800,</div><div class='del'>-	0x5c00c800, 0x5c00c000, 0x5c00b800, 0x5c029000,</div><div class='del'>-	0x5c029800, 0x5c028800, 0x5c027800, 0x5c027000,</div><div class='del'>-	0x5c01f800, 0x5c028000, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x493bc857, 0x0201f000,</div><div class='del'>-	0x00020045, 0x83300500, 0x1f000000, 0x04000008,</div><div class='del'>-	0x81326580, 0x80000130, 0x82000c80, 0x00000014,</div><div class='del'>-	0x02021800, 0x00100615, 0x0c01f013, 0x83300500,</div><div class='del'>-	0x000000ff, 0x82000c80, 0x00000007, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f025, 0x1c01f000, 0x82000d00,</div><div class='del'>-	0xc0000038, 0x02020800, 0x0010060d, 0x0201f800,</div><div class='del'>-	0x00100615, 0x00000000, 0x00000048, 0x00000054,</div><div class='del'>-	0x00000053, 0x00100ae4, 0x00100b08, 0x00100b03,</div><div class='del'>-	0x00100b28, 0x00100aef, 0x00100afb, 0x00100ae4,</div><div class='del'>-	0x00100b23, 0x00100b64, 0x00100ae4, 0x00100ae4,</div><div class='del'>-	0x00100ae4, 0x00100ae4, 0x00100b67, 0x00100b6d,</div><div class='del'>-	0x00100b7e, 0x00100b8f, 0x00100ae4, 0x00100b98,</div><div class='del'>-	0x00100ba4, 0x00100ae4, 0x00100ae4, 0x00100ae4,</div><div class='del'>-	0x0201f800, 0x00100615, 0x00100aed, 0x00100c3f,</div><div class='del'>-	0x00100b35, 0x00100b59, 0x00100aed, 0x00100aed,</div><div class='del'>-	0x00100aed, 0x0201f800, 0x00100615, 0x4803c856,</div><div class='del'>-	0x59300004, 0x8c00053e, 0x04020005, 0x42027000,</div><div class='del'>-	0x00000055, 0x0201f000, 0x000208d8, 0x0201f800,</div><div class='del'>-	0x00106cb4, 0x040007fa, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x0401f8aa, 0x40002800, 0x41782000, 0x42027000,</div><div class='del'>-	0x00000056, 0x0201f000, 0x000208d8, 0x4803c856,</div><div class='del'>-	0x42027000, 0x00000057, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x4803c856, 0x59300007, 0x8c00051a, 0x04020010,</div><div class='del'>-	0x59325808, 0x812e59c0, 0x04000014, 0x592c0408,</div><div class='del'>-	0x8c00051c, 0x04020003, 0x4a026011, 0xffffffff,</div><div class='del'>-	0x59300004, 0x8c00053e, 0x04020009, 0x42027000,</div><div class='del'>-	0x00000048, 0x0201f000, 0x000208d8, 0x59325808,</div><div class='del'>-	0x4a025a06, 0x00000007, 0x0401f7f4, 0x0201f800,</div><div class='del'>-	0x00106cb4, 0x040007f6, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x83300500, 0x00ffffff, 0x0201f000, 0x0010620f,</div><div class='del'>-	0x1c01f000, 0x4c040000, 0x59b808ea, 0x82040d00,</div><div class='del'>-	0x00000007, 0x82040580, 0x00000003, 0x04000004,</div><div class='del'>-	0x42000000, 0x60000000, 0x0401f8ac, 0x5c000800,</div><div class='del'>-	0x1c01f000, 0x0401f8fa, 0x0400001b, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x04000018, 0x592c0204, 0x82000500,</div><div class='del'>-	0x000000ff, 0x82000d80, 0x00000029, 0x04020012,</div><div class='del'>-	0x59300203, 0x82000580, 0x00000003, 0x0400000b,</div><div class='del'>-	0x59300807, 0x84040d26, 0x48066007, 0x0201f800,</div><div class='del'>-	0x00020087, 0x4a03900d, 0x00000040, 0x4a0370e5,</div><div class='del'>-	0x00000008, 0x1c01f000, 0x0201f800, 0x00106cb4,</div><div class='del'>-	0x040007f4, 0x59880053, 0x80000000, 0x48031053,</div><div class='del'>-	0x4a03900d, 0x00000040, 0x42000000, 0xc0000000,</div><div class='del'>-	0x0401f05a, 0x42007800, 0x0010bbe1, 0x42002000,</div><div class='del'>-	0x00003000, 0x42003000, 0x00000105, 0x0201f800,</div><div class='del'>-	0x00105b3d, 0x4a0370e4, 0x02000000, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x0201f000, 0x000208b4, 0x41300800,</div><div class='del'>-	0x800409c0, 0x02020800, 0x00100615, 0x0201f800,</div><div class='del'>-	0x0010060d, 0x4933c857, 0x813261c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x0401f835, 0x40002800, 0x0201f800,</div><div class='del'>-	0x0010a7c3, 0x0401f8ae, 0x04000007, 0x59326809,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x59300414, 0x02020800,</div><div class='del'>-	0x00109094, 0x1c01f000, 0x4933c857, 0x813261c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x0401f8a1, 0x0400000b,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108df4, 0x04000007,</div><div class='del'>-	0x592c0208, 0x8400054e, 0x48025a08, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00108997, 0x1c01f000, 0x485fc857,</div><div class='del'>-	0x5c000000, 0x4d780000, 0x4203e000, 0x50000000,</div><div class='del'>-	0x4200b800, 0x00008005, 0x0201f000, 0x0010061a,</div><div class='del'>-	0x4933c857, 0x83300480, 0x00000020, 0x02021800,</div><div class='del'>-	0x00100615, 0x83300c00, 0x0010b6cb, 0x50040000,</div><div class='del'>-	0x80000000, 0x04001002, 0x44000800, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x0401f7f4, 0x4807c856, 0x59b800ea,</div><div class='del'>-	0x8c000510, 0x040007fd, 0x59b800e0, 0x4803c857,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x42000000, 0x10000000,</div><div class='del'>-	0x41300800, 0x0401f02d, 0x82000500, 0xf0000000,</div><div class='del'>-	0x82040d00, 0x0fffffff, 0x80040d40, 0x4807c857,</div><div class='del'>-	0x59b800ea, 0x8c000516, 0x04020003, 0x480770e1,</div><div class='del'>-	0x1c01f000, 0x8c000510, 0x040007fa, 0x4c040000,</div><div class='del'>-	0x0401f809, 0x5c000800, 0x82100480, 0x00000008,</div><div class='del'>-	0x040017f4, 0x4c040000, 0x0401febf, 0x5c000800,</div><div class='del'>-	0x0401f7f0, 0x59b800e2, 0x59b820e2, 0x80100580,</div><div class='del'>-	0x040207fd, 0x80102114, 0x0401f006, 0x59b800e2,</div><div class='del'>-	0x59b820e2, 0x80100580, 0x040207fd, 0x0401f001,</div><div class='del'>-	0x40101800, 0x800c190a, 0x82100500, 0x0000001f,</div><div class='del'>-	0x820c1d00, 0x0000001f, 0x800c2480, 0x82102500,</div><div class='del'>-	0x0000001f, 0x1c01f000, 0x82000500, 0xf0000000,</div><div class='del'>-	0x82040d00, 0x0fffffff, 0x80040d40, 0x4807c857,</div><div class='del'>-	0x42001000, 0x0010b602, 0x50080000, 0x80000540,</div><div class='del'>-	0x04020005, 0x4a0370e5, 0x00000003, 0x4a0370e4,</div><div class='del'>-	0x00000300, 0x80000000, 0x44001000, 0x42001000,</div><div class='del'>-	0x00000400, 0x59b800ea, 0x8c000510, 0x0400000c,</div><div class='del'>-	0x0401ffd5, 0x82100480, 0x00000008, 0x04001007,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x0401fe8b, 0x5c001000,</div><div class='del'>-	0x5c000800, 0x0401f020, 0x59b800ea, 0x8c000516,</div><div class='del'>-	0x0402001d, 0x4a0370e4, 0x00300000, 0x480770e1,</div><div class='del'>-	0x42001000, 0x0000ff00, 0x80081040, 0x04000012,</div><div class='del'>-	0x59b808e4, 0x8c040d28, 0x040207fc, 0x42001000,</div><div class='del'>-	0x0010b602, 0x50080000, 0x80000040, 0x04020005,</div><div class='del'>-	0x4a0370e5, 0x00000002, 0x4a0370e4, 0x00000200,</div><div class='del'>-	0x02001800, 0x00100615, 0x44001000, 0x8c040d2c,</div><div class='del'>-	0x1c01f000, 0x41f80000, 0x50000000, 0x0201f800,</div><div class='del'>-	0x00100615, 0x80081040, 0x040207d3, 0x41f80000,</div><div class='del'>-	0x50000000, 0x0201f800, 0x00100615, 0x4d380000,</div><div class='del'>-	0x59300c06, 0x82040580, 0x00000009, 0x04020006,</div><div class='del'>-	0x42027000, 0x00000047, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x80000580, 0x5c027000, 0x1c01f000, 0x4c500000,</div><div class='del'>-	0x4a03900d, 0x00000001, 0x59c8a020, 0x4a03900d,</div><div class='del'>-	0x00000002, 0x59c80820, 0x8c50a52e, 0x04000002,</div><div class='del'>-	0x900409c0, 0x82040d00, 0x0000ffff, 0x0201f800,</div><div class='del'>-	0x00105b0f, 0x5c00a000, 0x1c01f000, 0x0401fff0,</div><div class='del'>-	0x04000045, 0x4933c857, 0x59300406, 0x82000580,</div><div class='del'>-	0x00000000, 0x04000040, 0x59c82021, 0x4a03900d,</div><div class='del'>-	0x00000001, 0x59c82821, 0x82142d00, 0x0000ffff,</div><div class='del'>-	0x59325808, 0x812e59c0, 0x04000037, 0x59326809,</div><div class='del'>-	0x0201f800, 0x00104728, 0x02020800, 0x0010907c,</div><div class='del'>-	0x599c0019, 0x8c00050c, 0x04020018, 0x0201f800,</div><div class='del'>-	0x00104728, 0x04020015, 0x59300811, 0x4807c857,</div><div class='del'>-	0x592c0408, 0x8c00051c, 0x0402000e, 0x8400055c,</div><div class='del'>-	0x48025c08, 0x592c0a04, 0x82040d00, 0x000000ff,</div><div class='del'>-	0x82040580, 0x00000048, 0x04000004, 0x82040580,</div><div class='del'>-	0x00000018, 0x04020003, 0x59300811, 0x48065803,</div><div class='del'>-	0x4a026011, 0x7fffffff, 0x48166013, 0x0201f800,</div><div class='del'>-	0x0010112d, 0x04020014, 0x0401fa07, 0x40280000,</div><div class='del'>-	0x4802600d, 0x04000005, 0x4832600b, 0x50200000,</div><div class='del'>-	0x4802600a, 0x4822600c, 0x59300414, 0x8c00051c,</div><div class='del'>-	0x04020004, 0x599c0019, 0x8c00050c, 0x0402086e,</div><div class='del'>-	0x4a03900d, 0x00000040, 0x4a0370e5, 0x00000008,</div><div class='del'>-	0x1c01f000, 0x59880053, 0x80000000, 0x48031053,</div><div class='del'>-	0x4a03900d, 0x00000040, 0x42000000, 0xc0000000,</div><div class='del'>-	0x0401f726, 0x4cf80000, 0x58f40000, 0x8001f540,</div><div class='del'>-	0x0401f820, 0x41781800, 0x0401f8e7, 0x04020014,</div><div class='del'>-	0x44140800, 0x0401f82a, 0x04000011, 0x40043800,</div><div class='del'>-	0x42001800, 0x00000001, 0x40142000, 0x0401f8de,</div><div class='del'>-	0x0402000b, 0x801c3800, 0x501c0000, 0x44000800,</div><div class='del'>-	0x0401f810, 0x801c0580, 0x04000004, 0x44103800,</div><div class='del'>-	0x801c3840, 0x44143800, 0x0401f819, 0x5c01f000,</div><div class='del'>-	0x1c01f000, 0x80f9f1c0, 0x04020003, 0x58f41202,</div><div class='del'>-	0x0401f003, 0x42001000, 0x00000007, 0x1c01f000,</div><div class='del'>-	0x80f9f1c0, 0x04020006, 0x58f40401, 0x82000480,</div><div class='del'>-	0x00000002, 0x80f40400, 0x0401f005, 0x58f80401,</div><div class='del'>-	0x82000480, 0x00000002, 0x80f80400, 0x50002800,</div><div class='del'>-	0x80000000, 0x50002000, 0x1c01f000, 0x80f9f1c0,</div><div class='del'>-	0x04020008, 0x58f40401, 0x82000480, 0x00000002,</div><div class='del'>-	0x02001800, 0x00100615, 0x4801ec01, 0x0401f00b,</div><div class='del'>-	0x58f80401, 0x82000480, 0x00000002, 0x02001800,</div><div class='del'>-	0x00100615, 0x4801f401, 0x82000580, 0x00000002,</div><div class='del'>-	0x04020002, 0x0401f809, 0x58f40202, 0x80000040,</div><div class='del'>-	0x4801ea02, 0x02000800, 0x00100615, 0x82000580,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x4d2c0000, 0x40fa5800,</div><div class='del'>-	0x0201f800, 0x0010083a, 0x4979e800, 0x4179f000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x80f5e9c0, 0x04000009,</div><div class='del'>-	0x80f9f1c0, 0x04020ff5, 0x4d2c0000, 0x40f65800,</div><div class='del'>-	0x0201f800, 0x0010083a, 0x4179e800, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4cf40000, 0x0201f800, 0x00104728,</div><div class='del'>-	0x04020036, 0x59300807, 0x82040500, 0x00003100,</div><div class='del'>-	0x04020032, 0x8c040d22, 0x04000032, 0x5930001f,</div><div class='del'>-	0x8001ed40, 0x02000800, 0x00100615, 0x82000580,</div><div class='del'>-	0xffffffff, 0x04000029, 0x58f40201, 0x82000580,</div><div class='del'>-	0x0000dcb3, 0x02020800, 0x00100615, 0x58f40a02,</div><div class='del'>-	0x82040500, 0x0000fffe, 0x04000003, 0x0401ff86,</div><div class='del'>-	0x58f40a02, 0x82040480, 0x0000000f, 0x04021059,</div><div class='del'>-	0x80040800, 0x4805ea02, 0x82040580, 0x00000008,</div><div class='del'>-	0x0400005d, 0x82040480, 0x00000008, 0x0400100a,</div><div class='del'>-	0x58f40000, 0x8001ed40, 0x02000800, 0x00100615,</div><div class='del'>-	0x58f40201, 0x82000580, 0x0000ddb9, 0x02020800,</div><div class='del'>-	0x00100615, 0x58f40401, 0x82000c00, 0x00000002,</div><div class='del'>-	0x4805ec01, 0x80f40400, 0x59300812, 0x44040000,</div><div class='del'>-	0x80000000, 0x45780000, 0x5c01e800, 0x1c01f000,</div><div class='del'>-	0x42001000, 0x00000400, 0x59b800e4, 0x8c000524,</div><div class='del'>-	0x04020023, 0x4a0370e4, 0x00030000, 0x40000000,</div><div class='del'>-	0x59b800e4, 0x8c000524, 0x0402001b, 0x59300807,</div><div class='del'>-	0x84040d62, 0x48066007, 0x4a0370e4, 0x00020000,</div><div class='del'>-	0x4d2c0000, 0x0201f800, 0x00100819, 0x04000025,</div><div class='del'>-	0x492e601f, 0x4a025a01, 0x0000dcb3, 0x59300008,</div><div class='del'>-	0x80001d40, 0x02000800, 0x00100615, 0x580c080f,</div><div class='del'>-	0x48065803, 0x59301811, 0x40040000, 0x800c0580,</div><div class='del'>-	0x0402000d, 0x497a5a02, 0x4a025c01, 0x00000004,</div><div class='del'>-	0x0401f011, 0x4a0370e4, 0x00020000, 0x40000000,</div><div class='del'>-	0x40000000, 0x80081040, 0x02000800, 0x00100615,</div><div class='del'>-	0x0401f7d6, 0x4a025a02, 0x00000001, 0x4a025c01,</div><div class='del'>-	0x00000006, 0x497a5804, 0x400c0000, 0x80040480,</div><div class='del'>-	0x48025805, 0x412de800, 0x5c025800, 0x0401f7a9,</div><div class='del'>-	0x5c025800, 0x4a02601f, 0xffffffff, 0x0401f7c3,</div><div class='del'>-	0x4d2c0000, 0x58f65800, 0x0201f800, 0x0010083a,</div><div class='del'>-	0x40f65800, 0x0201f800, 0x0010083a, 0x5c025800,</div><div class='del'>-	0x0401f7f5, 0x4d2c0000, 0x0201f800, 0x00100819,</div><div class='del'>-	0x040007f8, 0x4a025a01, 0x0000ddb9, 0x4a025c01,</div><div class='del'>-	0x00000002, 0x492de800, 0x412de800, 0x5c025800,</div><div class='del'>-	0x0401f7a5, 0x0401ff30, 0x82f40400, 0x00000004,</div><div class='del'>-	0x800c0400, 0x40000800, 0x50040000, 0x80100580,</div><div class='del'>-	0x04000016, 0x82040c00, 0x00000002, 0x80081040,</div><div class='del'>-	0x040207fa, 0x80f9f1c0, 0x04000011, 0x58f41202,</div><div class='del'>-	0x82081480, 0x00000007, 0x82f80400, 0x00000002,</div><div class='del'>-	0x800c0400, 0x40000800, 0x50040000, 0x80100580,</div><div class='del'>-	0x04000006, 0x82040c00, 0x00000002, 0x80081040,</div><div class='del'>-	0x040207fa, 0x0401f002, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f7fd, 0x4cf40000, 0x4cf80000,</div><div class='del'>-	0x4001e800, 0x592c0a06, 0x800409c0, 0x04020021,</div><div class='del'>-	0x82f40580, 0xffffffff, 0x0400001b, 0x58f40201,</div><div class='del'>-	0x82000580, 0x0000dcb3, 0x02020800, 0x00100615,</div><div class='del'>-	0x58f40000, 0x8001f540, 0x04000006, 0x58f80201,</div><div class='del'>-	0x82000580, 0x0000ddb9, 0x02020800, 0x00100615,</div><div class='del'>-	0x41783800, 0x58f44003, 0x0401f83d, 0x04020009,</div><div class='del'>-	0x0401ff2e, 0x497a601f, 0x59300807, 0x84040d22,</div><div class='del'>-	0x48066007, 0x5c01f000, 0x5c01e800, 0x1c01f000,</div><div class='del'>-	0x0401ff26, 0x4a025a06, 0x00000011, 0x0401f7f6,</div><div class='del'>-	0x82f40580, 0xffffffff, 0x04020f20, 0x0401f7f2,</div><div class='del'>-	0x4cf40000, 0x4cf80000, 0x4001e800, 0x82040580,</div><div class='del'>-	0x00000001, 0x04020020, 0x82f40580, 0xffffffff,</div><div class='del'>-	0x0400001a, 0x58f40201, 0x82000580, 0x0000dcb3,</div><div class='del'>-	0x02020800, 0x00100615, 0x58f40000, 0x8001f540,</div><div class='del'>-	0x04000006, 0x58f80201, 0x82000580, 0x0000ddb9,</div><div class='del'>-	0x02020800, 0x00100615, 0x41783800, 0x58f44003,</div><div class='del'>-	0x0401f813, 0x04020008, 0x0401ff04, 0x42000800,</div><div class='del'>-	0x00000001, 0x497a601f, 0x5c01f000, 0x5c01e800,</div><div class='del'>-	0x1c01f000, 0x0401fefd, 0x42000800, 0x00000011,</div><div class='del'>-	0x0401f7f9, 0x4c040000, 0x82f40580, 0xffffffff,</div><div class='del'>-	0x04020ef6, 0x5c000800, 0x0401f7f3, 0x4803c856,</div><div class='del'>-	0x401c2000, 0x41781800, 0x4c200000, 0x0401ff86,</div><div class='del'>-	0x5c004000, 0x0402002c, 0x40202000, 0x42001800,</div><div class='del'>-	0x00000001, 0x0401ff80, 0x04020027, 0x0401feae,</div><div class='del'>-	0x40082800, 0x82f40400, 0x00000004, 0x40003000,</div><div class='del'>-	0x50182000, 0x40100000, 0x801c0580, 0x04000005,</div><div class='del'>-	0x42001800, 0x00000001, 0x0401ff73, 0x0402001a,</div><div class='del'>-	0x82183400, 0x00000002, 0x80142840, 0x040207f5,</div><div class='del'>-	0x80f9f1c0, 0x04000013, 0x58f42a02, 0x82142c80,</div><div class='del'>-	0x00000007, 0x82f80400, 0x00000003, 0x40003000,</div><div class='del'>-	0x50182000, 0x40100000, 0x801c0580, 0x04000005,</div><div class='del'>-	0x42001800, 0x00000001, 0x0401ff5f, 0x04020006,</div><div class='del'>-	0x82183400, 0x00000002, 0x80142840, 0x040207f5,</div><div class='del'>-	0x1c01f000, 0x82000540, 0x00000001, 0x0401f7fd,</div><div class='del'>-	0x0201f800, 0x00100615, 0x58380207, 0x8c000502,</div><div class='del'>-	0x040007fc, 0x50200000, 0x80387c00, 0x583c2800,</div><div class='del'>-	0x583c2001, 0x58380404, 0x80001540, 0x04020002,</div><div class='del'>-	0x58381407, 0x58c83401, 0x58380c08, 0x59303807,</div><div class='del'>-	0x497a6012, 0x497a6013, 0x0201f000, 0x000200bf,</div><div class='del'>-	0x592c0408, 0x8c000502, 0x040007ea, 0x592c0409,</div><div class='del'>-	0x80000540, 0x040007e7, 0x82000c80, 0x00000002,</div><div class='del'>-	0x04001011, 0x58380001, 0x80007540, 0x02000800,</div><div class='del'>-	0x00100615, 0x58380204, 0x82000500, 0x0000000f,</div><div class='del'>-	0x82000400, 0x0010110d, 0x50004000, 0x40040000,</div><div class='del'>-	0x800409c0, 0x04000005, 0x82040c80, 0x00000005,</div><div class='del'>-	0x040217f1, 0x80204400, 0x50200000, 0x80387c00,</div><div class='del'>-	0x583c2800, 0x583c2001, 0x583c1002, 0x592c0a07,</div><div class='del'>-	0x592c4c08, 0x592c300d, 0x59303807, 0x497a6012,</div><div class='del'>-	0x497a6013, 0x4816600e, 0x4812600f, 0x480a6010,</div><div class='del'>-	0x481a6011, 0x80040840, 0x4806600d, 0x02000000,</div><div class='del'>-	0x000200c7, 0x80204000, 0x50201800, 0x800c19c0,</div><div class='del'>-	0x0402000c, 0x58380001, 0x80007540, 0x02000800,</div><div class='del'>-	0x00100615, 0x58380204, 0x82000500, 0x0000000f,</div><div class='del'>-	0x82000400, 0x0010110d, 0x50004000, 0x50201800,</div><div class='del'>-	0x483a600b, 0x480e600a, 0x4822600c, 0x0201f000,</div><div class='del'>-	0x000200c7, 0x4803c856, 0x592c0208, 0x8c00051e,</div><div class='del'>-	0x04020017, 0x50200000, 0x80306c00, 0x40240000,</div><div class='del'>-	0x0c01f001, 0x00100e91, 0x00100e91, 0x00100e9a,</div><div class='del'>-	0x00100e91, 0x00100e91, 0x00100e91, 0x00100e91,</div><div class='del'>-	0x00100e91, 0x00100e9a, 0x00100e91, 0x00100e9a,</div><div class='del'>-	0x00100e91, 0x00100e91, 0x00100e9a, 0x00100e91,</div><div class='del'>-	0x00100e91, 0x0201f800, 0x00100615, 0x8400051e,</div><div class='del'>-	0x48025a08, 0x50200000, 0x80306c00, 0x58343801,</div><div class='del'>-	0x481e600f, 0x0401f007, 0x58341802, 0x58342800,</div><div class='del'>-	0x58343801, 0x480e6010, 0x4816600e, 0x481e600f,</div><div class='del'>-	0x0401f24b, 0x4933c857, 0x5931f808, 0x59300a06,</div><div class='del'>-	0x800409c0, 0x04000005, 0x80040906, 0x04020002,</div><div class='del'>-	0x80040800, 0x4805fc06, 0x4a026206, 0x00000002,</div><div class='del'>-	0x592c0409, 0x82000500, 0x00000008, 0x0400000b,</div><div class='del'>-	0x0401f834, 0x59300203, 0x82000580, 0x00000004,</div><div class='del'>-	0x04020005, 0x42027000, 0x00000048, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x1c01f000, 0x4cfc0000, 0x58fc0204,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82000580, 0x00000048,</div><div class='del'>-	0x0402000c, 0x58fc000b, 0x800001c0, 0x04000009,</div><div class='del'>-	0x58fc0407, 0x800001c0, 0x04000006, 0x58fc080b,</div><div class='del'>-	0x8c040d16, 0x04000017, 0x58fc0007, 0x0401f00a,</div><div class='del'>-	0x58fc0408, 0x8c000512, 0x04020014, 0x58fc0c09,</div><div class='del'>-	0x8c040d16, 0x04020003, 0x5c01f800, 0x1c01f000,</div><div class='del'>-	0x58fc000a, 0x59300811, 0x80040580, 0x04020009,</div><div class='del'>-	0x59300007, 0x84000500, 0x48026007, 0x42027000,</div><div class='del'>-	0x00000048, 0x5c01f800, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x5c01f800, 0x1c01f000, 0x58fdf809, 0x0401f7ec,</div><div class='del'>-	0x5c000000, 0x4c000000, 0x4803c857, 0x4933c857,</div><div class='del'>-	0x59b808ea, 0x82040d00, 0x00000007, 0x82040580,</div><div class='del'>-	0x00000000, 0x0400001e, 0x82040580, 0x00000003,</div><div class='del'>-	0x0400001b, 0x59300406, 0x4c000000, 0x4a026406,</div><div class='del'>-	0x00000000, 0x42003000, 0x00000041, 0x42000000,</div><div class='del'>-	0x50000000, 0x41300800, 0x4c180000, 0x0401fce3,</div><div class='del'>-	0x5c003000, 0x0400000b, 0x42000000, 0x0000001e,</div><div class='del'>-	0x80000040, 0x040207ff, 0x80183040, 0x040207f4,</div><div class='del'>-	0x42000000, 0x40000000, 0x41300800, 0x0401fcd7,</div><div class='del'>-	0x5c000000, 0x48026406, 0x1c01f000, 0x59300007,</div><div class='del'>-	0x84000500, 0x48026007, 0x0401f7fc, 0x59c00007,</div><div class='del'>-	0x4a038006, 0x30000000, 0x40000000, 0x59c00007,</div><div class='del'>-	0x8c00050a, 0x040207fe, 0x1c01f000, 0x5c000000,</div><div class='del'>-	0x4c000000, 0x4803c857, 0x4dc00000, 0x4a0370e8,</div><div class='del'>-	0x00000000, 0x42038000, 0x00007720, 0x0401fff0,</div><div class='del'>-	0x42038000, 0x00007700, 0x0401ffed, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04020013, 0x4a038891, 0x0000ffff,</div><div class='del'>-	0x497b8880, 0x497b8892, 0x42001000, 0x00000190,</div><div class='del'>-	0x40000000, 0x40000000, 0x80081040, 0x040207fd,</div><div class='del'>-	0x42000000, 0x0010b6a5, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0401f80e, 0x5c038000, 0x0201f000, 0x00104f29,</div><div class='del'>-	0x0401f82d, 0x42000000, 0x0010b6a6, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0401f805, 0x48178892, 0x480b8880,</div><div class='del'>-	0x5c038000, 0x1c01f000, 0x496fc857, 0x836c0580,</div><div class='del'>-	0x00000003, 0x0402000b, 0x4c080000, 0x4c0c0000,</div><div class='del'>-	0x42001000, 0x00008048, 0x42001800, 0x0000ffff,</div><div class='del'>-	0x0201f800, 0x00103857, 0x5c001800, 0x5c001000,</div><div class='del'>-	0x42000800, 0x0000003c, 0x0201f800, 0x00101395,</div><div class='del'>-	0x59a8006c, 0x80000540, 0x04000006, 0x59a8106d,</div><div class='del'>-	0x800811c0, 0x04000003, 0x0201f800, 0x00101b0a,</div><div class='del'>-	0x4a038891, 0x0000ffff, 0x4a03900d, 0x00000040,</div><div class='del'>-	0x0201f800, 0x001009db, 0x4a0370e8, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x5c000000, 0x4c000000, 0x4803c857,</div><div class='del'>-	0x59c41080, 0x497b8880, 0x59c42892, 0x497b8892,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04020002, 0x1c01f000,</div><div class='del'>-	0x42002000, 0x00000260, 0x59c418a4, 0x820c1d00,</div><div class='del'>-	0x0000000f, 0x820c0580, 0x00000000, 0x04000010,</div><div class='del'>-	0x59c41805, 0x820c1d00, 0x00000001, 0x0402000e,</div><div class='del'>-	0x59c418a4, 0x820c1d00, 0x0000000f, 0x820c0480,</div><div class='del'>-	0x00000007, 0x04001004, 0x820c0480, 0x0000000c,</div><div class='del'>-	0x04001003, 0x80102040, 0x040207ec, 0x497b8891,</div><div class='del'>-	0x1c01f000, 0x4c100000, 0x42002000, 0x00000019,</div><div class='del'>-	0x46000000, 0x00000001, 0x0201f800, 0x001019a4,</div><div class='del'>-	0x50001800, 0x820c1d00, 0x00000001, 0x04000005,</div><div class='del'>-	0x80102040, 0x040207f7, 0x5c002000, 0x0401f7f0,</div><div class='del'>-	0x5c002000, 0x0401f7ec, 0x4803c856, 0x1c01f000,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x592c0a04, 0x4807c857,</div><div class='del'>-	0x82040d00, 0x000000ff, 0x82040500, 0x0000000f,</div><div class='del'>-	0x0c01f001, 0x00100fb5, 0x00100fb5, 0x00100fb5,</div><div class='del'>-	0x00100fcd, 0x00100fb5, 0x00100fb5, 0x00100fb5,</div><div class='del'>-	0x00100fb5, 0x00100fb5, 0x00100fcd, 0x00100fb5,</div><div class='del'>-	0x00100fb7, 0x00100fb5, 0x00100fb5, 0x00100fb5,</div><div class='del'>-	0x00100fb5, 0x0201f800, 0x00100615, 0x82040580,</div><div class='del'>-	0x0000003b, 0x02020800, 0x00100615, 0x592c020a,</div><div class='del'>-	0x8c000500, 0x0400005f, 0x592c1a07, 0x82040500,</div><div class='del'>-	0x0000000f, 0x82000400, 0x0010110d, 0x50001000,</div><div class='del'>-	0x50080000, 0x59302013, 0x4802600a, 0x492e600b,</div><div class='del'>-	0x480a600c, 0x480e600d, 0x48126012, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x82040500, 0x0000000f, 0x82000400,</div><div class='del'>-	0x0010110d, 0x50001000, 0x50080000, 0x592c1a07,</div><div class='del'>-	0x4802600a, 0x492e600b, 0x480a600c, 0x480e600d,</div><div class='del'>-	0x497a6012, 0x0401f7f2, 0x8c040d00, 0x04020041,</div><div class='del'>-	0x82040d00, 0x00000080, 0x0400003e, 0x0201f000,</div><div class='del'>-	0x000200d0, 0x59300013, 0x59301012, 0x80080580,</div><div class='del'>-	0x0402000c, 0x42007800, 0x80000005, 0x592c1208,</div><div class='del'>-	0x82080500, 0xffff7fff, 0x48025a08, 0x8c08151e,</div><div class='del'>-	0x0402002d, 0x823c7d40, 0x00000020, 0x0401f02a,</div><div class='del'>-	0x480bc857, 0x42000000, 0x0010b64f, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59300414, 0x4803c857, 0x8c000514,</div><div class='del'>-	0x04020007, 0x599c1819, 0x8c0c1d12, 0x04020004,</div><div class='del'>-	0x820c1d40, 0x00000001, 0x0401f01d, 0x59302013,</div><div class='del'>-	0x0401f92d, 0x0402001a, 0x42007800, 0x80000005,</div><div class='del'>-	0x5930500d, 0x592c0208, 0x4803c857, 0x8c00051e,</div><div class='del'>-	0x04020005, 0x823c7d40, 0x00000020, 0x5930400c,</div><div class='del'>-	0x0401f004, 0x8400051e, 0x48025a08, 0x0401f8dc,</div><div class='del'>-	0x50201800, 0x480e600a, 0x4832600b, 0x4822600c,</div><div class='del'>-	0x482a600d, 0x480fc857, 0x4833c857, 0x4823c857,</div><div class='del'>-	0x482bc857, 0x80000580, 0x483e6004, 0x1c01f000,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4933c857, 0x4d2c0000,</div><div class='del'>-	0x59900004, 0x81300580, 0x02020800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x02000800, 0x00100615,</div><div class='del'>-	0x59325808, 0x4d3c0000, 0x4d400000, 0x59300004,</div><div class='del'>-	0x4803c857, 0x4c000000, 0x0201f800, 0x00106b13,</div><div class='del'>-	0x0201f800, 0x001068c1, 0x5c000000, 0x8c000516,</div><div class='del'>-	0x04000010, 0x592c000f, 0x4803c857, 0x48025807,</div><div class='del'>-	0x41780800, 0x42028000, 0x00000002, 0x0201f800,</div><div class='del'>-	0x00104bee, 0x4a025c06, 0x0000ffff, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00107698, 0x0401f015,</div><div class='del'>-	0x4a026203, 0x00000002, 0x592c0208, 0x8400054e,</div><div class='del'>-	0x48025a08, 0x59300406, 0x82000580, 0x00000006,</div><div class='del'>-	0x04020009, 0x811800ca, 0x81c80c00, 0x58040939,</div><div class='del'>-	0x592c000d, 0x80040480, 0x592c080f, 0x80040480,</div><div class='del'>-	0x4802580b, 0x417a7800, 0x0201f800, 0x00108997,</div><div class='del'>-	0x5c028000, 0x5c027800, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x4d2c0000, 0x59900004, 0x81300580,</div><div class='del'>-	0x02020800, 0x00100615, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x02000800, 0x00100615, 0x59325808, 0x592c0208,</div><div class='del'>-	0x84000540, 0x48025a08, 0x0401f7bf, 0x491bc857,</div><div class='del'>-	0x49d3c857, 0x4dd00000, 0x41780800, 0x8007a0ca,</div><div class='del'>-	0x83d3a400, 0x00007600, 0x4a03a005, 0x80000002,</div><div class='del'>-	0x42000000, 0x00001000, 0x50000000, 0x82000480,</div><div class='del'>-	0x24220001, 0x04020029, 0x59d01006, 0x82080500,</div><div class='del'>-	0x00006000, 0x82000580, 0x00006000, 0x04000031,</div><div class='del'>-	0x82080500, 0x40008000, 0x040007f8, 0x800409c0,</div><div class='del'>-	0x0402002c, 0x811a31c0, 0x0400002a, 0x42000000,</div><div class='del'>-	0x00001002, 0x50001000, 0x46000000, 0x00000512,</div><div class='del'>-	0x42001800, 0x0000000a, 0x59e00000, 0x8c00051a,</div><div class='del'>-	0x040207fc, 0x800c1840, 0x040207fc, 0x42000000,</div><div class='del'>-	0x00001002, 0x46000000, 0x00000514, 0x42001800,</div><div class='del'>-	0x0000000a, 0x59e00000, 0x8c00053a, 0x040207fc,</div><div class='del'>-	0x800c1840, 0x040207fc, 0x42000000, 0x00001002,</div><div class='del'>-	0x44080000, 0x0401f00f, 0x02004800, 0x000207c8,</div><div class='del'>-	0x59d01006, 0x82080500, 0x00006000, 0x82000580,</div><div class='del'>-	0x00006000, 0x04000007, 0x8c08151e, 0x040007f7,</div><div class='del'>-	0x59d01006, 0x82080500, 0x00006000, 0x040207f3,</div><div class='del'>-	0x83d3a400, 0x00000020, 0x80040800, 0x82040480,</div><div class='del'>-	0x00000005, 0x040017bd, 0x5c03a000, 0x1c01f000,</div><div class='del'>-	0x491bc857, 0x49d3c857, 0x4dd00000, 0x41780800,</div><div class='del'>-	0x8007a0ca, 0x83d3a400, 0x00007600, 0x4a03a005,</div><div class='del'>-	0x80000001, 0x59d00006, 0x83d3a400, 0x00000020,</div><div class='del'>-	0x80040800, 0x82040480, 0x00000005, 0x040017f8,</div><div class='del'>-	0x5c03a000, 0x1c01f000, 0x59d00006, 0x8c00053e,</div><div class='del'>-	0x0400001e, 0x59902804, 0x4817c857, 0x801429c0,</div><div class='del'>-	0x04000013, 0x5990000a, 0x5990080b, 0x5990100c,</div><div class='del'>-	0x5990180d, 0x4800280a, 0x4804280b, 0x4808280c,</div><div class='del'>-	0x480c280d, 0x59d00000, 0x59d00801, 0x59d01002,</div><div class='del'>-	0x59d01803, 0x59d02004, 0x4800280e, 0x4804280f,</div><div class='del'>-	0x48082810, 0x480c2811, 0x48102812, 0x59900006,</div><div class='del'>-	0x82000500, 0xffff0000, 0x48032006, 0x4a03a005,</div><div class='del'>-	0x30000000, 0x59d00006, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x80204000, 0x50200000, 0x80000540, 0x04000003,</div><div class='del'>-	0x80285040, 0x1c01f000, 0x58300001, 0x80000540,</div><div class='del'>-	0x0400000e, 0x4802600b, 0x40006000, 0x58300204,</div><div class='del'>-	0x82000500, 0x0000000f, 0x82000400, 0x0010110d,</div><div class='del'>-	0x50004000, 0x802041c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x80285040, 0x1c01f000, 0x40005000, 0x1c01f000,</div><div class='del'>-	0x00000005, 0x00000008, 0x0000000b, 0x0000000e,</div><div class='del'>-	0x00000011, 0x00000000, 0x00000000, 0x0000000b,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00101108,</div><div class='del'>-	0x00101107, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00101108, 0x00101107, 0x00101104,</div><div class='del'>-	0x00101108, 0x00101107, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00101108,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00101108, 0x00101108, 0x00101108,</div><div class='del'>-	0x00000000, 0x00101108, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x4813c857, 0x492fc857, 0x4933c857,</div><div class='del'>-	0x48126012, 0x592c5207, 0x802851c0, 0x0400004a,</div><div class='del'>-	0x412c6000, 0x0401f84b, 0x04000009, 0x82240580,</div><div class='del'>-	0x00000002, 0x04020003, 0x5830000d, 0x80102480,</div><div class='del'>-	0x50200000, 0x80004540, 0x0400003f, 0x50200000,</div><div class='del'>-	0x80000540, 0x0400000b, 0x80301400, 0x58080002,</div><div class='del'>-	0x80102480, 0x0400101e, 0x801021c0, 0x04000009,</div><div class='del'>-	0x80285040, 0x04000034, 0x80204000, 0x0401f7f4,</div><div class='del'>-	0x58300001, 0x80006540, 0x0400002f, 0x0401f7e6,</div><div class='del'>-	0x80285040, 0x0400002c, 0x80204000, 0x50200000,</div><div class='del'>-	0x80000540, 0x0402000a, 0x58300001, 0x80006540,</div><div class='del'>-	0x04000025, 0x58300204, 0x82004d00, 0x0000000f,</div><div class='del'>-	0x82244400, 0x0010110d, 0x50204000, 0x592c0208,</div><div class='del'>-	0x8400051e, 0x48025a08, 0x0401f013, 0x80102080,</div><div class='del'>-	0x80102000, 0x48126010, 0x4813c857, 0x58080802,</div><div class='del'>-	0x40100000, 0x80042480, 0x02001800, 0x00100615,</div><div class='del'>-	0x58080000, 0x58081801, 0x80102400, 0x4812600e,</div><div class='del'>-	0x480e600f, 0x4813c857, 0x592c0208, 0x8400055e,</div><div class='del'>-	0x48025a08, 0x4833c857, 0x4823c857, 0x482bc857,</div><div class='del'>-	0x4832600b, 0x4822600c, 0x482a600d, 0x80000580,</div><div class='del'>-	0x0401f003, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x58300204, 0x82004d00, 0x0000000f, 0x82244400,</div><div class='del'>-	0x0010110d, 0x82000500, 0x000000ff, 0x82000580,</div><div class='del'>-	0x00000029, 0x0402001b, 0x50204000, 0x592c0409,</div><div class='del'>-	0x80000540, 0x02000800, 0x00100615, 0x82000c80,</div><div class='del'>-	0x00000002, 0x04001011, 0x58300001, 0x80006540,</div><div class='del'>-	0x02000800, 0x00100615, 0x58300204, 0x82000500,</div><div class='del'>-	0x0000000f, 0x82000400, 0x0010110d, 0x50004000,</div><div class='del'>-	0x40040000, 0x800409c0, 0x04000006, 0x82040c80,</div><div class='del'>-	0x00000005, 0x040217f1, 0x80204400, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x59e00004, 0x8c00050e, 0x02020000,</div><div class='del'>-	0x00100951, 0x1c01f000, 0x4c5c0000, 0x59e4b800,</div><div class='del'>-	0x485fc857, 0x825c0500, 0x0000001f, 0x04000004,</div><div class='del'>-	0x59e40862, 0x0201f800, 0x00100615, 0x825c0500,</div><div class='del'>-	0x000000e0, 0x02000800, 0x00100615, 0x8c5cbd0e,</div><div class='del'>-	0x04020807, 0x8c5cbd0c, 0x04020809, 0x8c5cbd0a,</div><div class='del'>-	0x04020878, 0x5c00b800, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4a03c800, 0x00000080, 0x1c01f000, 0x4d2c0000,</div><div class='del'>-	0x42007800, 0x0010b6eb, 0x583c0001, 0x583c0802,</div><div class='del'>-	0x80040540, 0x0400003f, 0x42000800, 0x0010b5f5,</div><div class='del'>-	0x50065800, 0x592c0002, 0x82000580, 0x00000000,</div><div class='del'>-	0x0400000e, 0x59e40850, 0x59e41853, 0x400c0000,</div><div class='del'>-	0x80040400, 0x59e40852, 0x4807c857, 0x80041480,</div><div class='del'>-	0x04021008, 0x40001000, 0x480bc857, 0x4a007800,</div><div class='del'>-	0x00000001, 0x0401f006, 0x4803c857, 0x0401f029,</div><div class='del'>-	0x59e41050, 0x480bc857, 0x49787800, 0x480bc857,</div><div class='del'>-	0x480fc857, 0x592c0003, 0x80000540, 0x04000006,</div><div class='del'>-	0x80080580, 0x04020004, 0x592c0003, 0x4803c857,</div><div class='del'>-	0x480bc857, 0x480a5803, 0x592c0007, 0x800001c0,</div><div class='del'>-	0x04000007, 0x592c1007, 0x480bc857, 0x583c0003,</div><div class='del'>-	0x4803c857, 0x80080480, 0x04001003, 0x583c1001,</div><div class='del'>-	0x480bc857, 0x583c0802, 0x480bc857, 0x4807c857,</div><div class='del'>-	0x4a025801, 0x00000000, 0x4a025809, 0x0010120c,</div><div class='del'>-	0x480a5807, 0x48065808, 0x59e40053, 0x48025804,</div><div class='del'>-	0x412c1000, 0x492fc857, 0x0201f800, 0x001008a1,</div><div class='del'>-	0x5c025800, 0x4a03c800, 0x00000040, 0x1c01f000,</div><div class='del'>-	0x42007800, 0x0010b5f5, 0x503c7800, 0x4a007802,</div><div class='del'>-	0x00000100, 0x42007800, 0x0010b6eb, 0x583c0000,</div><div class='del'>-	0x4803c857, 0x82000d80, 0x00000001, 0x04000004,</div><div class='del'>-	0x80000000, 0x48007800, 0x0401f019, 0x49787800,</div><div class='del'>-	0x583c1806, 0x583c0005, 0x800c1800, 0x480c7806,</div><div class='del'>-	0x800c0580, 0x04020002, 0x49787806, 0x583c0807,</div><div class='del'>-	0x800409c0, 0x0400000e, 0x583c0008, 0x80000000,</div><div class='del'>-	0x48007808, 0x80040580, 0x04020009, 0x49787808,</div><div class='del'>-	0x583c2006, 0x42001800, 0x00000001, 0x42001000,</div><div class='del'>-	0x00008028, 0x0201f800, 0x00103857, 0x1c01f000,</div><div class='del'>-	0x4a03c800, 0x00000020, 0x0201f800, 0x0010a867,</div><div class='del'>-	0x59e40000, 0x1c01f000, 0x4d2c0000, 0x4a007001,</div><div class='del'>-	0x00000000, 0x82040d00, 0x43000f80, 0x02020800,</div><div class='del'>-	0x00100615, 0x58380009, 0x4803c00f, 0x0201f800,</div><div class='del'>-	0x001091cb, 0x583a5808, 0x592c0000, 0x48007008,</div><div class='del'>-	0x800001c0, 0x04020002, 0x49787007, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x5c025800, 0x0201f000, 0x001008c6,</div><div class='del'>-	0x4803c856, 0x4c3c0000, 0x4d2c0000, 0x4d300000,</div><div class='del'>-	0x5830000a, 0x80025d40, 0x02000800, 0x00100615,</div><div class='del'>-	0x592e6008, 0x4c300000, 0x0201f800, 0x001091e3,</div><div class='del'>-	0x5c006000, 0x02000800, 0x00100615, 0x58300002,</div><div class='del'>-	0x82000580, 0x00000100, 0x04020010, 0x5930780b,</div><div class='del'>-	0x583c0001, 0x80000540, 0x0400000e, 0x4802600b,</div><div class='del'>-	0x40007800, 0x82000400, 0x00000002, 0x48006003,</div><div class='del'>-	0x583c0000, 0x48006004, 0x40301000, 0x0201f800,</div><div class='del'>-	0x001008a1, 0x0401f00c, 0x4a025a06, 0x00000002,</div><div class='del'>-	0x4c300000, 0x0201f800, 0x00020381, 0x5c006000,</div><div class='del'>-	0x40325800, 0x0201f800, 0x0010083a, 0x0201f800,</div><div class='del'>-	0x000208b4, 0x5c026000, 0x5c025800, 0x5c007800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4d2c0000, 0x4d300000,</div><div class='del'>-	0x42007000, 0x0010b5f6, 0x58380801, 0x82040580,</div><div class='del'>-	0x00000002, 0x04020011, 0x58386002, 0x5830000a,</div><div class='del'>-	0x812c0580, 0x0402000d, 0x59e00004, 0x8c00050e,</div><div class='del'>-	0x040007fe, 0x59dc0006, 0x4803c857, 0x4a03b805,</div><div class='del'>-	0x20000000, 0x8c00053e, 0x040007f8, 0x4a007001,</div><div class='del'>-	0x00000000, 0x0401f019, 0x58386006, 0x40305000,</div><div class='del'>-	0x803061c0, 0x02000800, 0x00100615, 0x5830000a,</div><div class='del'>-	0x812c0580, 0x04000004, 0x40305000, 0x58306000,</div><div class='del'>-	0x0401f7f8, 0x40280000, 0x80300580, 0x58300000,</div><div class='del'>-	0x04000006, 0x48005000, 0x800001c0, 0x04020007,</div><div class='del'>-	0x48287005, 0x0401f005, 0x800001c0, 0x04020002,</div><div class='del'>-	0x48007005, 0x48007006, 0x40325800, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x42007000, 0x0010b5f6, 0x58380001,</div><div class='del'>-	0x82000580, 0x00000000, 0x02000800, 0x001008c6,</div><div class='del'>-	0x5c026000, 0x5c025800, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x42000800, 0x0000003c, 0x48079000, 0x59c80000,</div><div class='del'>-	0x80040500, 0x040207fe, 0x497b9005, 0x4a039035,</div><div class='del'>-	0x00880200, 0x59a8000e, 0x800000e0, 0x4803900e,</div><div class='del'>-	0x4a039011, 0x00000024, 0x4a03900f, 0x0010cfc0,</div><div class='del'>-	0x4a039010, 0x0010cfc0, 0x4a039015, 0x0000007f,</div><div class='del'>-	0x4a03900d, 0x00000040, 0x4a039000, 0x00001600,</div><div class='del'>-	0x1c01f000, 0x59c80007, 0x8c000508, 0x040208b7,</div><div class='del'>-	0x59c80800, 0x8c040d16, 0x04020004, 0x82000500,</div><div class='del'>-	0x00000006, 0x0c01f005, 0x4807c857, 0x82000500,</div><div class='del'>-	0x0000000e, 0x0c01f001, 0x001012f8, 0x001012f6,</div><div class='del'>-	0x0010567d, 0x001012f6, 0x001012fa, 0x001012f6,</div><div class='del'>-	0x001012fa, 0x001012fa, 0x001012f6, 0x001012f6,</div><div class='del'>-	0x001012f6, 0x001012f6, 0x001012fa, 0x001012f6,</div><div class='del'>-	0x001012fa, 0x001012f6, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4803c857, 0x1c01f000, 0x59c8080c, 0x4807c857,</div><div class='del'>-	0x82040500, 0x00006000, 0x04000004, 0x0201f800,</div><div class='del'>-	0x0010a82a, 0x0401f006, 0x82040500, 0x007f0000,</div><div class='del'>-	0x04000006, 0x0201f800, 0x0010a7fc, 0x0201f800,</div><div class='del'>-	0x00106c07, 0x0401f02b, 0x82040500, 0x00000014,</div><div class='del'>-	0x04000014, 0x0201f800, 0x0010a859, 0x836c0580,</div><div class='del'>-	0x00000003, 0x0400000d, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04000004, 0x0201f800, 0x00103f37, 0x0401f007,</div><div class='del'>-	0x4a035033, 0x00000001, 0x4202d800, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00104d76, 0x0401f817, 0x0401f015,</div><div class='del'>-	0x82040500, 0x00001c00, 0x04000005, 0x0201f800,</div><div class='del'>-	0x0010a838, 0x0401f810, 0x0401f00e, 0x82040500,</div><div class='del'>-	0x00000140, 0x04000005, 0x0201f800, 0x0010a84b,</div><div class='del'>-	0x0401f809, 0x0401f007, 0x82040500, 0x00008000,</div><div class='del'>-	0x04000004, 0x0201f800, 0x0010a823, 0x0401f802,</div><div class='del'>-	0x1c01f000, 0x4c0c0000, 0x4c100000, 0x4c140000,</div><div class='del'>-	0x0201f800, 0x00100f17, 0x5c002800, 0x5c002000,</div><div class='del'>-	0x5c001800, 0x1c01f000, 0x4803c856, 0x59a80804,</div><div class='del'>-	0x59a8002b, 0x82000500, 0xfffff000, 0x80040540,</div><div class='del'>-	0x4803502b, 0x59a8002f, 0x82000500, 0xfffff000,</div><div class='del'>-	0x80040540, 0x4803502f, 0x48078882, 0x82041c00,</div><div class='del'>-	0x0000000f, 0x800c1908, 0x820c1c00, 0x00000004,</div><div class='del'>-	0x400c2000, 0x901029c0, 0x82040480, 0x000001e4,</div><div class='del'>-	0x04021005, 0x42001000, 0x00000008, 0x801020c6,</div><div class='del'>-	0x0401f031, 0x82040480, 0x00000230, 0x04021009,</div><div class='del'>-	0x42001000, 0x00000007, 0x801000c2, 0x800000c2,</div><div class='del'>-	0x80100400, 0x80100400, 0x80102400, 0x0401f026,</div><div class='del'>-	0x82040480, 0x00000298, 0x04021008, 0x42001000,</div><div class='del'>-	0x00000006, 0x801000c2, 0x800000c2, 0x80100400,</div><div class='del'>-	0x80102400, 0x0401f01c, 0x82040480, 0x00000328,</div><div class='del'>-	0x04021007, 0x42001000, 0x00000005, 0x801000c2,</div><div class='del'>-	0x800000c2, 0x80102400, 0x0401f013, 0x82040480,</div><div class='del'>-	0x00000404, 0x04021005, 0x42001000, 0x00000004,</div><div class='del'>-	0x801020c4, 0x0401f00c, 0x82040480, 0x0000056c,</div><div class='del'>-	0x04021006, 0x42001000, 0x00000003, 0x801000c2,</div><div class='del'>-	0x80102400, 0x0401f004, 0x42001000, 0x00000002,</div><div class='del'>-	0x801020c2, 0x82100480, 0x00000110, 0x80000080,</div><div class='del'>-	0x80002000, 0x800800d0, 0x80140540, 0x80100540,</div><div class='del'>-	0x48039035, 0x1c01f000, 0x59c80815, 0x0201f800,</div><div class='del'>-	0x0010060d, 0x82040d00, 0x0000007c, 0x48079000,</div><div class='del'>-	0x59c80000, 0x80040500, 0x040207fe, 0x8c040d04,</div><div class='del'>-	0x04000003, 0x59c80035, 0x48039035, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x497b88a9, 0x4a038807, 0x00000001,</div><div class='del'>-	0x497b8807, 0x59c40005, 0x48038805, 0x0201f800,</div><div class='del'>-	0x00101886, 0x4201d000, 0x000001f4, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x497b880e, 0x4200b000, 0x000001f4,</div><div class='del'>-	0x42000000, 0x00000001, 0x42000800, 0x00000014,</div><div class='del'>-	0x0201f800, 0x001019b1, 0x42000800, 0x00000014,</div><div class='del'>-	0x0201f800, 0x001019ac, 0x8c040d00, 0x04000005,</div><div class='del'>-	0x8058b040, 0x040207f3, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4200b000, 0x00000032, 0x42000000, 0x00000001,</div><div class='del'>-	0x42000800, 0x000000b4, 0x0201f800, 0x001019b1,</div><div class='del'>-	0x42000800, 0x000000b4, 0x0201f800, 0x001019ac,</div><div class='del'>-	0x8c040d00, 0x04000005, 0x8058b040, 0x040207f3,</div><div class='del'>-	0x0201f800, 0x00100615, 0x59c40005, 0x48038805,</div><div class='del'>-	0x42000000, 0x00000089, 0x800008d0, 0x48075054,</div><div class='del'>-	0x48075055, 0x48075056, 0x42000800, 0x000000e0,</div><div class='del'>-	0x0201f800, 0x001019b1, 0x42000800, 0x000000f4,</div><div class='del'>-	0x0201f800, 0x001019ac, 0x82040500, 0xffffffd1,</div><div class='del'>-	0x82000540, 0x00000002, 0x42000800, 0x000000f4,</div><div class='del'>-	0x0201f800, 0x001019b1, 0x42000800, 0x000000a0,</div><div class='del'>-	0x0201f800, 0x001019ac, 0x82040540, 0x00000001,</div><div class='del'>-	0x42000800, 0x000000a0, 0x0201f800, 0x001019b1,</div><div class='del'>-	0x42000800, 0x00000000, 0x0201f800, 0x001019ac,</div><div class='del'>-	0x82040540, 0x00000001, 0x42000800, 0x00000000,</div><div class='del'>-	0x0201f800, 0x001019b1, 0x4201d000, 0x0001d4c0,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x0401fa45, 0x4a0388a7,</div><div class='del'>-	0x0000f7f7, 0x4a0388a3, 0x8000403c, 0x4a0388ae,</div><div class='del'>-	0x000061a8, 0x4a038801, 0x00032063, 0x4a038810,</div><div class='del'>-	0x00410108, 0x4a038811, 0x00520608, 0x4a038812,</div><div class='del'>-	0x00450320, 0x4a038813, 0x00440405, 0x4a03881c,</div><div class='del'>-	0x004132e1, 0x4a038850, 0x80000108, 0x4a038860,</div><div class='del'>-	0x00000008, 0x4a038870, 0x00000008, 0x4a038851,</div><div class='del'>-	0x80000508, 0x4a038861, 0x00800000, 0x4a038871,</div><div class='del'>-	0x00800000, 0x4a038852, 0x80000708, 0x4a038862,</div><div class='del'>-	0x00800000, 0x4a038872, 0x00800000, 0x4a038853,</div><div class='del'>-	0x80000608, 0x497b8863, 0x4a038873, 0x00800000,</div><div class='del'>-	0x4a038882, 0x00000840, 0x4a0388a5, 0x0000001e,</div><div class='del'>-	0x4a0388a6, 0x0000001e, 0x4a0388b0, 0x00007530,</div><div class='del'>-	0x4a038802, 0x0000ffff, 0x4a038806, 0xc0e00800,</div><div class='del'>-	0x1c01f000, 0x497b5022, 0x4a035021, 0x00000001,</div><div class='del'>-	0x42000800, 0x00000040, 0x0201f800, 0x001019ac,</div><div class='del'>-	0x82040500, 0xffffffaf, 0x82000540, 0x00000000,</div><div class='del'>-	0x42000800, 0x00000040, 0x0201f800, 0x001019b1,</div><div class='del'>-	0x42000800, 0x000000f4, 0x0201f800, 0x001019ac,</div><div class='del'>-	0x4c040000, 0x40040000, 0x84000548, 0x42000800,</div><div class='del'>-	0x000000f4, 0x0201f800, 0x001019b1, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001019ac, 0x82040500,</div><div class='del'>-	0xffffffc1, 0x82000540, 0x00000038, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001019b1, 0x5c000000,</div><div class='del'>-	0x42000800, 0x000000f4, 0x0201f000, 0x001019b1,</div><div class='del'>-	0x59c40805, 0x59c40006, 0x80040d00, 0x02000800,</div><div class='del'>-	0x00100615, 0x82040500, 0x00e00800, 0x04020004,</div><div class='del'>-	0x8c040d3e, 0x040208df, 0x0401f007, 0x82040500,</div><div class='del'>-	0x00800800, 0x02020800, 0x0010060d, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4c5c0000, 0x4c600000, 0x59c4b805,</div><div class='del'>-	0x59c40006, 0x8c000500, 0x04000003, 0x8c5cbd00,</div><div class='del'>-	0x04020095, 0x485fc857, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x0400001e, 0x59c40005, 0x82000500, 0x000000c0,</div><div class='del'>-	0x0400004b, 0x0201f800, 0x00104e23, 0x04020048,</div><div class='del'>-	0x59c40006, 0x82000500, 0x000000f0, 0x04020004,</div><div class='del'>-	0x4a038805, 0x000000c0, 0x0401f041, 0x59a80015,</div><div class='del'>-	0x84000506, 0x48035015, 0x42006000, 0xff203fff,</div><div class='del'>-	0x42006800, 0x40000000, 0x0201f800, 0x001040ad,</div><div class='del'>-	0x42000800, 0x00000010, 0x42001000, 0x00104020,</div><div class='del'>-	0x0201f800, 0x00105dc7, 0x8c5cbd34, 0x04020030,</div><div class='del'>-	0x4a035032, 0x0000aaaa, 0x59c40005, 0x8c00050c,</div><div class='del'>-	0x04020012, 0x8c00050e, 0x0402001c, 0x8c00050a,</div><div class='del'>-	0x0402001d, 0x8c000508, 0x0400000b, 0x59a80017,</div><div class='del'>-	0x82000580, 0x00000009, 0x04020007, 0x42000000,</div><div class='del'>-	0x0010b642, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x00104fe9, 0x0401f05a, 0x0201f800, 0x00104e23,</div><div class='del'>-	0x04020007, 0x42000800, 0x0000000f, 0x42001000,</div><div class='del'>-	0x00103f37, 0x0201f800, 0x00105da7, 0x4a035033,</div><div class='del'>-	0x00000000, 0x0401f00b, 0x4a035033, 0x00000002,</div><div class='del'>-	0x0401f008, 0x42000000, 0x0010b644, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00104f93, 0x0401f044,</div><div class='del'>-	0x0201f800, 0x00105049, 0x0401f041, 0x8c5cbd34,</div><div class='del'>-	0x0400003d, 0x59c40005, 0x8c00053a, 0x04020005,</div><div class='del'>-	0x42000000, 0x0010b616, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4a038805, 0x02000000, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04020010, 0x4a038805, 0x04000000, 0x0201f800,</div><div class='del'>-	0x00104e1b, 0x04020008, 0x4a035033, 0x00000001,</div><div class='del'>-	0x4202d800, 0x00000001, 0x0201f800, 0x00104d76,</div><div class='del'>-	0x0401f061, 0x41780000, 0x0201f800, 0x00104de5,</div><div class='del'>-	0x0201f800, 0x00101a59, 0x4000c000, 0x0201f800,</div><div class='del'>-	0x001019d0, 0x836c1580, 0x00000004, 0x0402000d,</div><div class='del'>-	0x8c5cbd00, 0x04020018, 0x59a81005, 0x8c081506,</div><div class='del'>-	0x04020005, 0x59c410a3, 0x82081540, 0x00000008,</div><div class='del'>-	0x480b88a3, 0x59c41006, 0x84081540, 0x480b8806,</div><div class='del'>-	0x4a038805, 0x04000000, 0x4202d800, 0x00000001,</div><div class='del'>-	0x497b5014, 0x59a80005, 0x8c000518, 0x04020004,</div><div class='del'>-	0x0401f95c, 0x0201f800, 0x00103f5c, 0x0201f800,</div><div class='del'>-	0x00103951, 0x8c5cbd3c, 0x04020858, 0x8c5cbd00,</div><div class='del'>-	0x04000036, 0x42000000, 0x0010b6c9, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x4a038805, 0x00000001, 0x4200b000,</div><div class='del'>-	0x00000352, 0x4201d000, 0x00000064, 0x4c580000,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x0201f800, 0x00101941,</div><div class='del'>-	0x5c00b000, 0x04000004, 0x8058b040, 0x040207f6,</div><div class='del'>-	0x0401f004, 0x4a038805, 0x00000001, 0x0401f01f,</div><div class='del'>-	0x59c40006, 0x84000500, 0x48038806, 0x0201f800,</div><div class='del'>-	0x00106c32, 0x497b8880, 0x0201f800, 0x0010a7e7,</div><div class='del'>-	0x59c4000d, 0x8c000500, 0x02020800, 0x0010a7f5,</div><div class='del'>-	0x59c400a3, 0x82000500, 0xfcf8ffff, 0x480388a3,</div><div class='del'>-	0x4a03504c, 0x00000002, 0x4202d800, 0x00000004,</div><div class='del'>-	0x4a038805, 0x00000001, 0x0201f800, 0x0010071a,</div><div class='del'>-	0x0401fb42, 0x497b5052, 0x4a035049, 0x00000001,</div><div class='del'>-	0x0201f800, 0x0010048c, 0x825cbd00, 0xbbfffffe,</div><div class='del'>-	0x485f8805, 0x5c00c000, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x59c41004, 0x480bc857, 0x8c081500, 0x04000006,</div><div class='del'>-	0x4803c856, 0x497b2807, 0x0201f800, 0x00106cf9,</div><div class='del'>-	0x0401f00a, 0x82080500, 0x000001f0, 0x04000007,</div><div class='del'>-	0x4803c856, 0x417a3000, 0x0201f800, 0x00105d9b,</div><div class='del'>-	0x0201f800, 0x00106d1b, 0x4a038805, 0x80000000,</div><div class='del'>-	0x1c01f000, 0x59c408a3, 0x4807c857, 0x84040d40,</div><div class='del'>-	0x480788a3, 0x1c01f000, 0x4d900000, 0x4dd00000,</div><div class='del'>-	0x4da40000, 0x4d140000, 0x4a038805, 0x40000000,</div><div class='del'>-	0x42000000, 0x0010b6c5, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x59c41004, 0x8c081500,</div><div class='del'>-	0x04000054, 0x598e600d, 0x497b2807, 0x813261c0,</div><div class='del'>-	0x04000032, 0x59300403, 0x82000580, 0x00000032,</div><div class='del'>-	0x0402002e, 0x5930001c, 0x48038833, 0x4a038807,</div><div class='del'>-	0x00018000, 0x4201d000, 0x00000002, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x497b8807, 0x4201d000, 0x00000002,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x0201f800, 0x00106b71,</div><div class='del'>-	0x4201d000, 0x00007530, 0x0201f800, 0x00105dd2,</div><div class='del'>-	0x59c408a4, 0x82040d00, 0x0000000f, 0x82040d80,</div><div class='del'>-	0x00000000, 0x04000005, 0x42000000, 0x00200000,</div><div class='del'>-	0x0201f800, 0x001019b6, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x59300008, 0x80000540, 0x02000800, 0x00100615,</div><div class='del'>-	0x40025800, 0x4a025a04, 0x00000103, 0x5931d821,</div><div class='del'>-	0x58ef400b, 0x58ec0009, 0x0801f800, 0x0201f800,</div><div class='del'>-	0x000208b4, 0x0401f047, 0x598c000f, 0x82001c80,</div><div class='del'>-	0x000000c8, 0x0402100f, 0x80000000, 0x4803180f,</div><div class='del'>-	0x59c400a4, 0x82000500, 0x0000000f, 0x82000580,</div><div class='del'>-	0x00000002, 0x04020004, 0x42000000, 0x00200000,</div><div class='del'>-	0x0401fbfa, 0x0201f800, 0x00105d86, 0x0401f035,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x00106b71, 0x813261c0,</div><div class='del'>-	0x04000030, 0x4a026203, 0x00000001, 0x42027000,</div><div class='del'>-	0x00000027, 0x0201f800, 0x000208d8, 0x0401f029,</div><div class='del'>-	0x8c081508, 0x04000027, 0x417a3000, 0x0201f800,</div><div class='del'>-	0x00106e2f, 0x42032000, 0x0000bf32, 0x0201f800,</div><div class='del'>-	0x00105d9b, 0x59926004, 0x813261c0, 0x04000012,</div><div class='del'>-	0x42001800, 0x000000c8, 0x0201f800, 0x00106dfb,</div><div class='del'>-	0x0402000d, 0x59c400a4, 0x82000500, 0x0000000f,</div><div class='del'>-	0x82000580, 0x00000002, 0x04020004, 0x42000000,</div><div class='del'>-	0x00200000, 0x0401fbd1, 0x0201f800, 0x00105d8b,</div><div class='del'>-	0x0401f00c, 0x4933c857, 0x0201f800, 0x00106b13,</div><div class='del'>-	0x813261c0, 0x04000007, 0x42027000, 0x0000004f,</div><div class='del'>-	0x4a026203, 0x00000003, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x5c022800, 0x5c034800, 0x5c03a000, 0x5c032000,</div><div class='del'>-	0x0201f000, 0x00106982, 0x4803c857, 0x59a80821,</div><div class='del'>-	0x48035021, 0x80041580, 0x04000045, 0x800409c0,</div><div class='del'>-	0x04000023, 0x497b504c, 0x42000000, 0x0010b60b,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x0201f800, 0x0010a920,</div><div class='del'>-	0x42001000, 0x00008011, 0x59c40001, 0x82000500,</div><div class='del'>-	0x00018000, 0x82001d80, 0x00000000, 0x04000009,</div><div class='del'>-	0x82001d80, 0x00008000, 0x04000009, 0x82001d80,</div><div class='del'>-	0x00010000, 0x04000009, 0x0201f800, 0x00100615,</div><div class='del'>-	0x42001800, 0x00000000, 0x0401f006, 0x42001800,</div><div class='del'>-	0x00000001, 0x0401f003, 0x42001800, 0x00000003,</div><div class='del'>-	0x0201f800, 0x00103857, 0x0401f021, 0x59a8084c,</div><div class='del'>-	0x800409c0, 0x04020007, 0x59c4000d, 0x8c000520,</div><div class='del'>-	0x04000004, 0x42001800, 0x00000003, 0x0401f002,</div><div class='del'>-	0x40041800, 0x0201f800, 0x0010a904, 0x42001000,</div><div class='del'>-	0x00008012, 0x0201f800, 0x00103857, 0x0201f800,</div><div class='del'>-	0x0010071a, 0x0201f800, 0x0010a95a, 0x0402000c,</div><div class='del'>-	0x0401f853, 0x4d400000, 0x4d3c0000, 0x42028000,</div><div class='del'>-	0x00000028, 0x42027800, 0x00000008, 0x0201f800,</div><div class='del'>-	0x00101d90, 0x5c027800, 0x5c028000, 0x1c01f000,</div><div class='del'>-	0x4803c857, 0x82000400, 0x00101eb5, 0x50000800,</div><div class='del'>-	0x82040d00, 0x000000ff, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4c580000, 0x4200b000, 0x00000010, 0x497b88ac,</div><div class='del'>-	0x497b88ad, 0x8058b040, 0x040207fe, 0x5c00b000,</div><div class='del'>-	0x1c01f000, 0x4807c857, 0x48075010, 0x80041108,</div><div class='del'>-	0x4200b000, 0x00000010, 0x497b88ac, 0x80000580,</div><div class='del'>-	0x800811c0, 0x04020006, 0x82040500, 0x0000000f,</div><div class='del'>-	0x82000400, 0x0010a95f, 0x50000000, 0x480388ad,</div><div class='del'>-	0x80081040, 0x8058b040, 0x040207f5, 0x1c01f000,</div><div class='del'>-	0x59a80005, 0x04000003, 0x84000546, 0x0401f002,</div><div class='del'>-	0x84000506, 0x48035005, 0x4803c857, 0x1c01f000,</div><div class='del'>-	0x4803c857, 0x4c080000, 0x4c040000, 0x4c000000,</div><div class='del'>-	0x59c40892, 0x4807c857, 0x80041580, 0x04000010,</div><div class='del'>-	0x80041480, 0x04021007, 0x80081080, 0x80081000,</div><div class='del'>-	0x4008b000, 0x42000000, 0x00000201, 0x0401f004,</div><div class='del'>-	0x4008b000, 0x42000000, 0x00000210, 0x48038886,</div><div class='del'>-	0x8058b040, 0x040207fe, 0x497b8886, 0x5c000000,</div><div class='del'>-	0x5c000800, 0x5c001000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x0201f800, 0x0010393e, 0x04000005, 0x42028000,</div><div class='del'>-	0x0000002e, 0x0201f000, 0x0010a25b, 0x1c01f000,</div><div class='del'>-	0x59a8086f, 0x82040500, 0x00000010, 0x04000004,</div><div class='del'>-	0x42000800, 0x00000002, 0x0401f010, 0x82040500,</div><div class='del'>-	0x00000020, 0x42000800, 0x00000002, 0x0402000b,</div><div class='del'>-	0x59c80835, 0x82040d00, 0x00001f00, 0x80040910,</div><div class='del'>-	0x80040800, 0x59a8006c, 0x80000540, 0x04000003,</div><div class='del'>-	0x42000800, 0x0000025a, 0x4807c857, 0x1c01f000,</div><div class='del'>-	0x4c000000, 0x59a80053, 0x4803c857, 0x82000580,</div><div class='del'>-	0x00000000, 0x5c000000, 0x1c01f000, 0x4c000000,</div><div class='del'>-	0x59a80053, 0x4803c857, 0x82000580, 0x00000001,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x4c000000, 0x59a80053,</div><div class='del'>-	0x4803c857, 0x82000580, 0x00000003, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x4c000000, 0x59a80053, 0x82000580,</div><div class='del'>-	0x00000002, 0x5c000000, 0x1c01f000, 0x4c000000,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x4c380000, 0x59a80040,</div><div class='del'>-	0x82000c80, 0x00000007, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f806, 0x5c007000, 0x5c001000, 0x5c000800,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x001016dd, 0x001016f0,</div><div class='del'>-	0x00101704, 0x00101706, 0x0010172d, 0x0010172f,</div><div class='del'>-	0x00101731, 0x4803c856, 0x4a035042, 0x00000000,</div><div class='del'>-	0x42000000, 0x00000002, 0x0401fa18, 0x42000000,</div><div class='del'>-	0x00000002, 0x0401f9ad, 0x0401faae, 0x4803c856,</div><div class='del'>-	0x4a035040, 0x00000006, 0x42000800, 0x0000001e,</div><div class='del'>-	0x42001000, 0x00101732, 0x0201f000, 0x00105da7,</div><div class='del'>-	0x497b5045, 0x4a035050, 0x00000036, 0x4a03504f,</div><div class='del'>-	0x0000002a, 0x4803c856, 0x4a035042, 0x00000001,</div><div class='del'>-	0x42000000, 0x00000002, 0x0401f998, 0x4803c856,</div><div class='del'>-	0x4a035040, 0x00000006, 0x42000800, 0x0000001e,</div><div class='del'>-	0x42001000, 0x00101732, 0x0201f000, 0x00105da7,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4a035050, 0x00000036,</div><div class='del'>-	0x4803c856, 0x4a035042, 0x00000003, 0x42000800,</div><div class='del'>-	0x00000000, 0x0401fa9f, 0x82040d00, 0x00000090,</div><div class='del'>-	0x82040580, 0x00000090, 0x04000009, 0x82040580,</div><div class='del'>-	0x00000010, 0x04000009, 0x82040580, 0x00000000,</div><div class='del'>-	0x04000008, 0x0201f800, 0x00100615, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f005, 0x41780000, 0x0401f003,</div><div class='del'>-	0x42000000, 0x00000002, 0x0401f970, 0x497b5046,</div><div class='del'>-	0x4803c856, 0x4a035040, 0x00000006, 0x42000800,</div><div class='del'>-	0x0000001e, 0x42001000, 0x00101732, 0x0201f000,</div><div class='del'>-	0x00105da7, 0x0201f800, 0x00100615, 0x0201f800,</div><div class='del'>-	0x00100615, 0x1c01f000, 0x4c000000, 0x4c040000,</div><div class='del'>-	0x4c080000, 0x4c380000, 0x59a80042, 0x82000c80,</div><div class='del'>-	0x00000007, 0x02021800, 0x00100615, 0x0c01f806,</div><div class='del'>-	0x5c007000, 0x5c001000, 0x5c000800, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x00101748, 0x00101767, 0x001017bb,</div><div class='del'>-	0x001017d2, 0x001017e9, 0x001017f2, 0x001017f4,</div><div class='del'>-	0x0401f9f9, 0x0402001b, 0x59a81048, 0x42000800,</div><div class='del'>-	0x00000000, 0x0401fa5f, 0x82040d00, 0x00000090,</div><div class='del'>-	0x82040580, 0x00000090, 0x04000009, 0x82040580,</div><div class='del'>-	0x00000010, 0x04000008, 0x82040580, 0x00000000,</div><div class='del'>-	0x04000007, 0x0201f800, 0x00100615, 0x84081540,</div><div class='del'>-	0x0401f004, 0x84081542, 0x0401f002, 0x84081544,</div><div class='del'>-	0x480b5048, 0x4a035040, 0x00000001, 0x0401f003,</div><div class='del'>-	0x0401f8cb, 0x0401ff82, 0x1c01f000, 0x0401f88f,</div><div class='del'>-	0x04000052, 0x0401f9d8, 0x0402002a, 0x42000800,</div><div class='del'>-	0x00000000, 0x0401fa3f, 0x82040d00, 0x00000090,</div><div class='del'>-	0x82040580, 0x00000000, 0x04000044, 0x82040580,</div><div class='del'>-	0x00000010, 0x04000006, 0x82040580, 0x00000090,</div><div class='del'>-	0x04000009, 0x0201f800, 0x00100615, 0x59c40801,</div><div class='del'>-	0x82040d00, 0x00018000, 0x82040580, 0x00000000,</div><div class='del'>-	0x04000036, 0x42000800, 0x00000000, 0x0401fa29,</div><div class='del'>-	0x82040d00, 0x00000090, 0x82040580, 0x00000010,</div><div class='del'>-	0x04000006, 0x82040580, 0x00000090, 0x04000006,</div><div class='del'>-	0x02020800, 0x00100615, 0x59a80048, 0x84000542,</div><div class='del'>-	0x0401f003, 0x59a80048, 0x84000540, 0x48035048,</div><div class='del'>-	0x59a80045, 0x80000000, 0x48035045, 0x82000580,</div><div class='del'>-	0x00000005, 0x04000003, 0x0401f861, 0x0401f01e,</div><div class='del'>-	0x497b5045, 0x59c40801, 0x82040d00, 0x00018000,</div><div class='del'>-	0x82040580, 0x00000000, 0x04000009, 0x82040580,</div><div class='del'>-	0x00008000, 0x04000009, 0x82040580, 0x00010000,</div><div class='del'>-	0x04000008, 0x0201f800, 0x00100615, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f005, 0x41780000, 0x0401f003,</div><div class='del'>-	0x42000000, 0x00000002, 0x0401f948, 0x4a035042,</div><div class='del'>-	0x00000002, 0x0401f004, 0x4a035040, 0x00000003,</div><div class='del'>-	0x0401f002, 0x0401ff42, 0x1c01f000, 0x0401f83b,</div><div class='del'>-	0x04000015, 0x59a8004f, 0x80000040, 0x4803504f,</div><div class='del'>-	0x0401f981, 0x04020005, 0x4a035040, 0x00000003,</div><div class='del'>-	0x497b5041, 0x0401f00c, 0x59a8004f, 0x80000540,</div><div class='del'>-	0x04020003, 0x0401f89e, 0x0401f002, 0x0401f84b,</div><div class='del'>-	0x0401f82f, 0x497b5045, 0x4a035042, 0x00000001,</div><div class='del'>-	0x0401ff2b, 0x1c01f000, 0x0401f824, 0x04000015,</div><div class='del'>-	0x0401f96d, 0x0402000f, 0x59a80046, 0x80000000,</div><div class='del'>-	0x48035046, 0x82000580, 0x00000007, 0x0402000c,</div><div class='del'>-	0x4a035052, 0x0000000a, 0x497b5049, 0x59a80048,</div><div class='del'>-	0x8400055e, 0x48035048, 0x4803c857, 0x0401f005,</div><div class='del'>-	0x0401f817, 0x4a035042, 0x00000004, 0x0401ff3d,</div><div class='del'>-	0x1c01f000, 0x0401f80d, 0x04000007, 0x0401f956,</div><div class='del'>-	0x04020003, 0x0401ff1b, 0x0401f003, 0x0401f80c,</div><div class='del'>-	0x0401ff34, 0x1c01f000, 0x0201f800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00100615, 0x59a80050, 0x80000040,</div><div class='del'>-	0x48035050, 0x0400088d, 0x1c01f000, 0x4c040000,</div><div class='del'>-	0x42000800, 0x00000000, 0x0401f9ae, 0x82040d00,</div><div class='del'>-	0x00000090, 0x82040580, 0x00000090, 0x04000009,</div><div class='del'>-	0x82040580, 0x00000010, 0x04000009, 0x82040580,</div><div class='del'>-	0x00000000, 0x04000009, 0x0201f800, 0x00100615,</div><div class='del'>-	0x42000000, 0x00000002, 0x0401f005, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f002, 0x41780000, 0x0401f8e7,</div><div class='del'>-	0x5c000800, 0x1c01f000, 0x4c040000, 0x59c40801,</div><div class='del'>-	0x82040d00, 0x00018000, 0x82040580, 0x00000000,</div><div class='del'>-	0x04000009, 0x82040580, 0x00008000, 0x04000009,</div><div class='del'>-	0x82040580, 0x00010000, 0x04000009, 0x0201f800,</div><div class='del'>-	0x00100615, 0x42000000, 0x00000002, 0x0401f005,</div><div class='del'>-	0x42000000, 0x00000001, 0x0401f002, 0x41780000,</div><div class='del'>-	0x0401f866, 0x5c000800, 0x1c01f000, 0x4c040000,</div><div class='del'>-	0x59a80045, 0x80000000, 0x48035045, 0x82000580,</div><div class='del'>-	0x00000005, 0x04020018, 0x497b5045, 0x59c40801,</div><div class='del'>-	0x82040d00, 0x00018000, 0x82040580, 0x00000000,</div><div class='del'>-	0x04000009, 0x82040580, 0x00008000, 0x04000009,</div><div class='del'>-	0x82040580, 0x00010000, 0x04000009, 0x0201f800,</div><div class='del'>-	0x00100615, 0x42000000, 0x00000002, 0x0401f005,</div><div class='del'>-	0x42000000, 0x00000001, 0x0401f002, 0x41780000,</div><div class='del'>-	0x0401f846, 0x42000800, 0x00000000, 0x0401f95d,</div><div class='del'>-	0x82040d00, 0x00000090, 0x82040580, 0x00000090,</div><div class='del'>-	0x04000009, 0x82040580, 0x00000010, 0x04000009,</div><div class='del'>-	0x82040580, 0x00000000, 0x04000009, 0x0201f800,</div><div class='del'>-	0x00100615, 0x42000000, 0x00000002, 0x0401f005,</div><div class='del'>-	0x42000000, 0x00000001, 0x0401f002, 0x41780000,</div><div class='del'>-	0x0401f896, 0x5c000800, 0x1c01f000, 0x4c200000,</div><div class='del'>-	0x59a80048, 0x82000500, 0x00007fff, 0x02000800,</div><div class='del'>-	0x00100615, 0x59a84047, 0x80204102, 0x02001800,</div><div class='del'>-	0x00100615, 0x48235047, 0x80204500, 0x040007fa,</div><div class='del'>-	0x8c000504, 0x04020007, 0x8c000502, 0x04020008,</div><div class='del'>-	0x8c000500, 0x04020008, 0x0201f800, 0x00100615,</div><div class='del'>-	0x42000000, 0x00000002, 0x0401f005, 0x41780000,</div><div class='del'>-	0x0401f003, 0x42000000, 0x00000001, 0x0401f80f,</div><div class='del'>-	0x5c004000, 0x1c01f000, 0x04011000, 0x4a03c840,</div><div class='del'>-	0x0010b240, 0x4a03c842, 0x00000009, 0x40000000,</div><div class='del'>-	0x040117ff, 0x4a035047, 0x00000004, 0x4a03503e,</div><div class='del'>-	0x00000000, 0x1c01f000, 0x59a80858, 0x82040d80,</div><div class='del'>-	0x01391077, 0x04020008, 0x59e00813, 0x8c040d00,</div><div class='del'>-	0x04000005, 0x82000d80, 0x00000002, 0x04020002,</div><div class='del'>-	0x41780000, 0x800001c0, 0x04000040, 0x82000d80,</div><div class='del'>-	0x00000001, 0x0402001d, 0x42000800, 0x000000a0,</div><div class='del'>-	0x0401f908, 0x82040540, 0x00000004, 0x42000800,</div><div class='del'>-	0x000000a0, 0x0401f908, 0x42000800, 0x000000c0,</div><div class='del'>-	0x0401f900, 0x82040540, 0x00000020, 0x42000800,</div><div class='del'>-	0x000000c0, 0x0401f900, 0x59c40001, 0x82000500,</div><div class='del'>-	0xfffe7fff, 0x82000540, 0x00000000, 0x48038801,</div><div class='del'>-	0x59a80054, 0x80000110, 0x42000800, 0x000000e0,</div><div class='del'>-	0x0401f8f5, 0x0401f03c, 0x82000d80, 0x00000002,</div><div class='del'>-	0x02020800, 0x00100615, 0x42000800, 0x000000a0,</div><div class='del'>-	0x0401f8e8, 0x82040500, 0xfffffffb, 0x42000800,</div><div class='del'>-	0x000000a0, 0x0401f8e8, 0x42000800, 0x000000c0,</div><div class='del'>-	0x0401f8e0, 0x82040500, 0xffffffdf, 0x42000800,</div><div class='del'>-	0x000000c0, 0x0401f8e0, 0x59c40001, 0x82000500,</div><div class='del'>-	0xfffe7fff, 0x82000540, 0x00010000, 0x48038801,</div><div class='del'>-	0x59a80056, 0x80000110, 0x42000800, 0x000000e0,</div><div class='del'>-	0x0401f8d5, 0x0401f01c, 0x42000800, 0x000000a0,</div><div class='del'>-	0x0401f8cc, 0x82040540, 0x00000004, 0x42000800,</div><div class='del'>-	0x000000a0, 0x0401f8cc, 0x42000800, 0x000000c0,</div><div class='del'>-	0x0401f8c4, 0x82040500, 0xffffffdf, 0x42000800,</div><div class='del'>-	0x000000c0, 0x0401f8c4, 0x59c40001, 0x82000500,</div><div class='del'>-	0xfffe7fff, 0x82000540, 0x00008000, 0x48038801,</div><div class='del'>-	0x59a80055, 0x80000110, 0x42000800, 0x000000e0,</div><div class='del'>-	0x0401f8b9, 0x1c01f000, 0x4803c857, 0x59a80858,</div><div class='del'>-	0x82040d80, 0x01391077, 0x04020008, 0x59e00813,</div><div class='del'>-	0x8c040d00, 0x04000005, 0x82000d80, 0x00000002,</div><div class='del'>-	0x04020002, 0x41780000, 0x4c000000, 0x0401f942,</div><div class='del'>-	0x5c000000, 0x800001c0, 0x04000026, 0x82000d80,</div><div class='del'>-	0x00000001, 0x04020010, 0x59a8006c, 0x80000540,</div><div class='del'>-	0x04000004, 0x42001000, 0x00000000, 0x0401f9f7,</div><div class='del'>-	0x42000800, 0x00000000, 0x0401f896, 0x82040540,</div><div class='del'>-	0x00000090, 0x42000800, 0x00000000, 0x0401f896,</div><div class='del'>-	0x0401f024, 0x82000d80, 0x00000002, 0x02020800,</div><div class='del'>-	0x00100615, 0x59a8006c, 0x80000540, 0x04000004,</div><div class='del'>-	0x42001000, 0x00010000, 0x0401f9e4, 0x42000800,</div><div class='del'>-	0x00000000, 0x0401f883, 0x82040500, 0xffffff6f,</div><div class='del'>-	0x42000800, 0x00000000, 0x0401f883, 0x0401f011,</div><div class='del'>-	0x59a8006c, 0x80000540, 0x04000004, 0x42001000,</div><div class='del'>-	0x00008000, 0x0401f9d5, 0x42000800, 0x00000000,</div><div class='del'>-	0x0401f874, 0x82040500, 0xffffff6f, 0x82000540,</div><div class='del'>-	0x00000010, 0x42000800, 0x00000000, 0x0401f872,</div><div class='del'>-	0x0401f111, 0x4c580000, 0x4200b000, 0x00000014,</div><div class='del'>-	0x8058b040, 0x04000042, 0x59c4000d, 0x8c000520,</div><div class='del'>-	0x040207fc, 0x0401f85b, 0x59c4000d, 0x8c000520,</div><div class='del'>-	0x040207f8, 0x59c40808, 0x84040d50, 0x48078808,</div><div class='del'>-	0x4200b000, 0x000000c8, 0x8058b040, 0x040207ff,</div><div class='del'>-	0x4200b000, 0x00000014, 0x8058b040, 0x04000030,</div><div class='del'>-	0x59c4000d, 0x8c000520, 0x0402002d, 0x42000800,</div><div class='del'>-	0x00001000, 0x50040800, 0x82040c80, 0x24220001,</div><div class='del'>-	0x04020003, 0x8c000504, 0x040007f4, 0x0401f841,</div><div class='del'>-	0x59c4000d, 0x8c000520, 0x04020021, 0x42000800,</div><div class='del'>-	0x00001000, 0x50040800, 0x82040c80, 0x24220001,</div><div class='del'>-	0x04020003, 0x8c000504, 0x040007e8, 0x4200b000,</div><div class='del'>-	0x0000000a, 0x8058b040, 0x04000003, 0x0401f831,</div><div class='del'>-	0x0401f7fd, 0x4200b000, 0x00000064, 0x59c4000d,</div><div class='del'>-	0x8c00051e, 0x0400000e, 0x8058b040, 0x040207fc,</div><div class='del'>-	0x42000000, 0x00001000, 0x50000000, 0x82000480,</div><div class='del'>-	0x24220001, 0x04020004, 0x59c40808, 0x84040d10,</div><div class='del'>-	0x48078808, 0x80000580, 0x0401f00c, 0x42000000,</div><div class='del'>-	0x00001000, 0x50000000, 0x82000480, 0x24220001,</div><div class='del'>-	0x04020004, 0x59c40808, 0x84040d10, 0x48078808,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c00b000, 0x1c01f000,</div><div class='del'>-	0x42000800, 0x000000a0, 0x0401f816, 0x82040500,</div><div class='del'>-	0xfffffffe, 0x42000800, 0x000000a0, 0x0401f816,</div><div class='del'>-	0x42000800, 0x00000000, 0x0401f80e, 0x82040500,</div><div class='del'>-	0xfffffffe, 0x42000800, 0x00000000, 0x0401f00e,</div><div class='del'>-	0x40000000, 0x40000000, 0x40000000, 0x40000000,</div><div class='del'>-	0x40000000, 0x1c01f000, 0x480b8805, 0x1c01f000,</div><div class='del'>-	0x4807880e, 0x59c4080f, 0x82040d00, 0x000000ff,</div><div class='del'>-	0x1c01f000, 0x900001c0, 0x80040d40, 0x84040d40,</div><div class='del'>-	0x4807880e, 0x1c01f000, 0x82000d80, 0x00200000,</div><div class='del'>-	0x04000009, 0x82000d80, 0x02000000, 0x04000006,</div><div class='del'>-	0x82000d80, 0x01000000, 0x04000006, 0x59c408a3,</div><div class='del'>-	0x0401f006, 0x59c408a3, 0x84040d30, 0x0401f003,</div><div class='del'>-	0x59c408a3, 0x84040d32, 0x80040540, 0x480388a3,</div><div class='del'>-	0x480788a3, 0x1c01f000, 0x59c400a3, 0x84000556,</div><div class='del'>-	0x480388a3, 0x84000516, 0x480388a3, 0x1c01f000,</div><div class='del'>-	0x485fc857, 0x4863c857, 0x4c640000, 0x4d3c0000,</div><div class='del'>-	0x4d400000, 0x0201f800, 0x00106c32, 0x4863500a,</div><div class='del'>-	0x0201f800, 0x0010a95a, 0x0402006a, 0x82600d00,</div><div class='del'>-	0x0000ff00, 0x800409c0, 0x0400000c, 0x4200c800,</div><div class='del'>-	0x00000001, 0x59a80010, 0x82000500, 0x000000ff,</div><div class='del'>-	0x80041110, 0x80081580, 0x04000021, 0x82041580,</div><div class='del'>-	0x0000ff00, 0x0400000a, 0x59c410a3, 0x82081500,</div><div class='del'>-	0x00008000, 0x04000009, 0x59c410a7, 0x82081500,</div><div class='del'>-	0x0000ff00, 0x82081580, 0x0000ff00, 0x4200c800,</div><div class='del'>-	0x00000000, 0x04000012, 0x59a80005, 0x8c000502,</div><div class='del'>-	0x04020008, 0x8c000500, 0x0402000d, 0x599c1017,</div><div class='del'>-	0x8c08151a, 0x0400003c, 0x84000542, 0x48035005,</div><div class='del'>-	0x4200c800, 0x00000002, 0x42028000, 0x00000004,</div><div class='del'>-	0x42027800, 0x00000008, 0x0401f007, 0x59a80805,</div><div class='del'>-	0x84040d40, 0x48075005, 0x42028000, 0x00000004,</div><div class='del'>-	0x417a7800, 0x59a80006, 0x8c000502, 0x04020006,</div><div class='del'>-	0x59a80805, 0x8c040d0a, 0x04020032, 0x84040d4a,</div><div class='del'>-	0x48075005, 0x42000000, 0x0010b610, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59a8180a, 0x42001000, 0x00008013,</div><div class='del'>-	0x0201f800, 0x00103857, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04000015, 0x4d400000, 0x82600500, 0x000000ff,</div><div class='del'>-	0x42028800, 0x0000ffff, 0x40643000, 0x42028000,</div><div class='del'>-	0x0000000e, 0x0201f800, 0x0010a258, 0x42000800,</div><div class='del'>-	0x00000001, 0x42001000, 0x00000100, 0x0201f800,</div><div class='del'>-	0x00105ec4, 0x5c028000, 0x599c0817, 0x8c040d0a,</div><div class='del'>-	0x04020010, 0x493fc857, 0x4943c857, 0x0401fb59,</div><div class='del'>-	0x0401f00c, 0x0201f800, 0x0010393e, 0x04000009,</div><div class='del'>-	0x42028000, 0x0000000f, 0x42028800, 0x0000ffff,</div><div class='del'>-	0x42003000, 0x00000000, 0x0201f800, 0x0010a25b,</div><div class='del'>-	0x497b8880, 0x5c028000, 0x5c027800, 0x5c00c800,</div><div class='del'>-	0x1c01f000, 0x42000800, 0x00000000, 0x0401ff61,</div><div class='del'>-	0x82040540, 0x00000002, 0x42000800, 0x00000000,</div><div class='del'>-	0x0401f761, 0x42000800, 0x00000000, 0x0401ff59,</div><div class='del'>-	0x82040500, 0xfffffffd, 0x42000800, 0x00000000,</div><div class='del'>-	0x0401f759, 0x59c408a8, 0x0401ff4a, 0x0401ff49,</div><div class='del'>-	0x59c400a8, 0x80040d80, 0x040207fb, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4a038807, 0x00000001, 0x497b8807,</div><div class='del'>-	0x59c40005, 0x48038805, 0x497b506c, 0x497b506d,</div><div class='del'>-	0x41785800, 0x42006000, 0x00000001, 0x42006800,</div><div class='del'>-	0x00000003, 0x0401f824, 0x0401f82f, 0x40400000,</div><div class='del'>-	0x4803c857, 0x82408580, 0x00000000, 0x0402001d,</div><div class='del'>-	0x41785800, 0x42006000, 0x0000001e, 0x42006800,</div><div class='del'>-	0x00000014, 0x0401f818, 0x0401f823, 0x40400000,</div><div class='del'>-	0x4803c857, 0x82408580, 0x00000800, 0x04020011,</div><div class='del'>-	0x42005800, 0x00000001, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000014, 0x0401f80b, 0x0401f816,</div><div class='del'>-	0x40400000, 0x4803c857, 0x82408580, 0x0000ffff,</div><div class='del'>-	0x04020004, 0x4a03506c, 0x00000001, 0x4803c856,</div><div class='del'>-	0x1c01f000, 0x41785000, 0x0401f812, 0x0401f838,</div><div class='del'>-	0x40347000, 0x40340800, 0x0401f03d, 0x42005000,</div><div class='del'>-	0x00000001, 0x0401f80b, 0x0401f831, 0x40340800,</div><div class='del'>-	0x0401f037, 0x42005000, 0x00000002, 0x0401f805,</div><div class='del'>-	0x0401f81d, 0x0401f835, 0x40048000, 0x1c01f000,</div><div class='del'>-	0x0401f808, 0x0401f814, 0x40280800, 0x0401f826,</div><div class='del'>-	0x402c0800, 0x0401f827, 0x40300800, 0x0401f025,</div><div class='del'>-	0x42000800, 0x0000ffff, 0x42001000, 0x00000001,</div><div class='del'>-	0x0401f829, 0x42001000, 0x00000010, 0x0401f826,</div><div class='del'>-	0x42000800, 0x0000ffff, 0x42001000, 0x00000010,</div><div class='del'>-	0x0401f021, 0x41780800, 0x42001000, 0x00000002,</div><div class='del'>-	0x0401f01d, 0x0401f92e, 0x4a03d000, 0x00050004,</div><div class='del'>-	0x0401f92b, 0x4a03d000, 0x00050005, 0x0401f928,</div><div class='del'>-	0x4a03d000, 0x00050004, 0x42000800, 0x00000001,</div><div class='del'>-	0x42001000, 0x00000001, 0x0401f00f, 0x42000800,</div><div class='del'>-	0x00000002, 0x42001000, 0x00000002, 0x0401f00a,</div><div class='del'>-	0x42001000, 0x00000005, 0x0401f007, 0x42001000,</div><div class='del'>-	0x00000010, 0x0401f004, 0x42001000, 0x00000010,</div><div class='del'>-	0x0401f01b, 0x0401f912, 0x82082c00, 0x0010a95f,</div><div class='del'>-	0x50142800, 0x82081500, 0xffffffff, 0x04000013,</div><div class='del'>-	0x0401f90b, 0x80081040, 0x80142902, 0x40040000,</div><div class='del'>-	0x80140500, 0x04000007, 0x4a03d000, 0x00070006,</div><div class='del'>-	0x0401f903, 0x4a03d000, 0x00070007, 0x0401f006,</div><div class='del'>-	0x4a03d000, 0x00070004, 0x0401f8fd, 0x4a03d000,</div><div class='del'>-	0x00070005, 0x0401f7ec, 0x1c01f000, 0x41780800,</div><div class='del'>-	0x82082c00, 0x0010a95f, 0x50142800, 0x82081500,</div><div class='del'>-	0xffffffff, 0x04000010, 0x0401f8f1, 0x4a03d000,</div><div class='del'>-	0x00050001, 0x0401f8ee, 0x59e81800, 0x80081040,</div><div class='del'>-	0x80142902, 0x8c0c1d06, 0x04000004, 0x40140000,</div><div class='del'>-	0x80040d40, 0x0401f8e6, 0x4a03d000, 0x00070000,</div><div class='del'>-	0x0401f7ef, 0x1c01f000, 0x480bc857, 0x480b506d,</div><div class='del'>-	0x59c40001, 0x82000500, 0xffffefff, 0x48038801,</div><div class='del'>-	0x41781800, 0x0401f8c4, 0x41785800, 0x42006000,</div><div class='del'>-	0x0000001e, 0x42006800, 0x00000004, 0x0401ff7a,</div><div class='del'>-	0x42006800, 0x0000003c, 0x0401ff7d, 0x41785800,</div><div class='del'>-	0x42006000, 0x0000001e, 0x42006800, 0x00000004,</div><div class='del'>-	0x0401ff71, 0x41786800, 0x0401ff75, 0x41785800,</div><div class='del'>-	0x42006000, 0x0000001e, 0x41786800, 0x0401ff6a,</div><div class='del'>-	0x42006800, 0x00000002, 0x0401ff6d, 0x42006800,</div><div class='del'>-	0x00000001, 0x0401ff64, 0x42006800, 0x000000f5,</div><div class='del'>-	0x0401ff67, 0x41785800, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000004, 0x0401ff5b, 0x42006800,</div><div class='del'>-	0x00000020, 0x0401ff5e, 0x59a8106d, 0x0401f865,</div><div class='del'>-	0x42001800, 0x000200f5, 0x0401f897, 0x59a8106d,</div><div class='del'>-	0x0401f879, 0x41785800, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000004, 0x0401ff4b, 0x41786800,</div><div class='del'>-	0x0401ff4f, 0x59c40001, 0x82000540, 0x00001000,</div><div class='del'>-	0x48038801, 0x41785800, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000015, 0x0401ff3f, 0x0401ff4a,</div><div class='del'>-	0x40400000, 0x82000540, 0x00000002, 0x4c000000,</div><div class='del'>-	0x41785800, 0x42006000, 0x0000001e, 0x42006800,</div><div class='del'>-	0x00000015, 0x0401ff34, 0x5c000000, 0x40006800,</div><div class='del'>-	0x0401ff37, 0x41785800, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000015, 0x0401ff2b, 0x0401ff36,</div><div class='del'>-	0x40400000, 0x82000500, 0x0000fffd, 0x4c000000,</div><div class='del'>-	0x41785800, 0x42006000, 0x0000001e, 0x42006800,</div><div class='del'>-	0x00000015, 0x0401ff20, 0x5c000000, 0x40006800,</div><div class='del'>-	0x0401ff23, 0x41785800, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000014, 0x0401ff17, 0x0401ff22,</div><div class='del'>-	0x40400000, 0x82000540, 0x00000040, 0x4c000000,</div><div class='del'>-	0x41785800, 0x42006000, 0x0000001e, 0x42006800,</div><div class='del'>-	0x00000014, 0x0401ff0c, 0x5c000000, 0x40006800,</div><div class='del'>-	0x0401ff0f, 0x41785800, 0x42006000, 0x0000001e,</div><div class='del'>-	0x42006800, 0x00000014, 0x0401ff03, 0x0401ff0e,</div><div class='del'>-	0x40400000, 0x82000500, 0x0000ffbf, 0x4c000000,</div><div class='del'>-	0x41785800, 0x42006000, 0x0000001e, 0x42006800,</div><div class='del'>-	0x00000014, 0x0401fef8, 0x5c000000, 0x40006800,</div><div class='del'>-	0x0401fefb, 0x4a038886, 0x00002020, 0x0401f04c,</div><div class='del'>-	0x480bc857, 0x82080580, 0x00010000, 0x04020007,</div><div class='del'>-	0x82040d40, 0x00010000, 0x42001800, 0x00000001,</div><div class='del'>-	0x0401f82d, 0x0401f00f, 0x82080580, 0x00008000,</div><div class='del'>-	0x04000007, 0x82040d40, 0x00000000, 0x42001800,</div><div class='del'>-	0x00900001, 0x0401f824, 0x0401f006, 0x82040d40,</div><div class='del'>-	0x00008000, 0x42001800, 0x00100001, 0x0401f81e,</div><div class='del'>-	0x1c01f000, 0x480bc857, 0x82080580, 0x00010000,</div><div class='del'>-	0x04020008, 0x42001800, 0x000000a1, 0x0401f816,</div><div class='del'>-	0x42001800, 0x000000c1, 0x0401f813, 0x0401f011,</div><div class='del'>-	0x82080580, 0x00008000, 0x04000008, 0x42001800,</div><div class='del'>-	0x000400a1, 0x0401f80c, 0x42001800, 0x002000c1,</div><div class='del'>-	0x0401f809, 0x0401f007, 0x42001800, 0x000400a1,</div><div class='del'>-	0x0401f805, 0x42001800, 0x000000c1, 0x0401f802,</div><div class='del'>-	0x1c01f000, 0x480fc857, 0x41785800, 0x42006000,</div><div class='del'>-	0x0000001e, 0x41786800, 0x0401feb7, 0x400c6800,</div><div class='del'>-	0x80346960, 0x0401feba, 0x42006800, 0x00000001,</div><div class='del'>-	0x0401feb1, 0x400c6800, 0x0401feb5, 0x42006800,</div><div class='del'>-	0x00000003, 0x0401feac, 0x0401feb7, 0x40400000,</div><div class='del'>-	0x8c000504, 0x040207fc, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x00000064, 0x80000040, 0x040207ff, 0x1c01f000,</div><div class='del'>-	0x4c5c0000, 0x4c600000, 0x4178b800, 0x0201f800,</div><div class='del'>-	0x0010473b, 0x040200fd, 0x59a8c026, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04000003, 0x8c60c506, 0x0400000e,</div><div class='del'>-	0x8c60c500, 0x04020004, 0x8c60c50e, 0x040008f6,</div><div class='del'>-	0x0401f0f2, 0x0401faaf, 0x040200f0, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04020004, 0x4a03501c, 0x0000ffff,</div><div class='del'>-	0x0401f0ea, 0x8c60c504, 0x04000004, 0x4a03501c,</div><div class='del'>-	0x0000ffff, 0x0401f0e5, 0x59a8c010, 0x8260c500,</div><div class='del'>-	0x000000ff, 0x59a81013, 0x8c081500, 0x0400005d,</div><div class='del'>-	0x8c081502, 0x0402005b, 0x59a8b81c, 0x825c0d80,</div><div class='del'>-	0x0000ffff, 0x04020003, 0x4200b800, 0x00000001,</div><div class='del'>-	0x805c1104, 0x82086400, 0x0010bc20, 0x50300800,</div><div class='del'>-	0x825c0500, 0x00000003, 0x0c01f001, 0x00101c2c,</div><div class='del'>-	0x00101c27, 0x00101c2b, 0x00101c29, 0x80040910,</div><div class='del'>-	0x0401f004, 0x80040930, 0x0401f002, 0x80040920,</div><div class='del'>-	0x82040500, 0x000000ff, 0x82000d80, 0x000000ff,</div><div class='del'>-	0x0400000f, 0x4c000000, 0x82000400, 0x00101eb5,</div><div class='del'>-	0x50000800, 0x80040910, 0x82040580, 0x00000080,</div><div class='del'>-	0x5c000000, 0x04000030, 0x80600d80, 0x0400002e,</div><div class='del'>-	0x80000540, 0x0400002c, 0x0401f00b, 0x59a81005,</div><div class='del'>-	0x82081500, 0x00000003, 0x0402002b, 0x59a81013,</div><div class='del'>-	0x84081542, 0x480b5013, 0x4a03501c, 0x0000ffff,</div><div class='del'>-	0x0401f028, 0x4c000000, 0x59a8006f, 0x8c000502,</div><div class='del'>-	0x42001000, 0x00000010, 0x02020800, 0x00104ada,</div><div class='del'>-	0x5c000000, 0x0402001c, 0x417a8800, 0x0201f800,</div><div class='del'>-	0x001059b9, 0x04020016, 0x0201f800, 0x0010443b,</div><div class='del'>-	0x04000006, 0x0201f800, 0x00104acf, 0x0401f8b1,</div><div class='del'>-	0x0400000f, 0x0401f00c, 0x599c0019, 0x8c00050e,</div><div class='del'>-	0x04020009, 0x0201f800, 0x001043fc, 0x04020008,</div><div class='del'>-	0x0201f800, 0x00104acf, 0x0401f9dd, 0x0401f8be,</div><div class='del'>-	0x04000003, 0x805cb800, 0x0401f7b2, 0x485f501c,</div><div class='del'>-	0x0401f086, 0x4a03501c, 0x0000ffff, 0x0401f083,</div><div class='del'>-	0x42003000, 0x0000007e, 0x59a8001c, 0x82001580,</div><div class='del'>-	0x0000ffff, 0x04020005, 0x80000d80, 0x4018b000,</div><div class='del'>-	0x4803c856, 0x0401f009, 0x8018b480, 0x04001004,</div><div class='del'>-	0x40000800, 0x4803c856, 0x0401f004, 0x4a03501c,</div><div class='del'>-	0x0000ffff, 0x0401f071, 0x4c040000, 0x4c580000,</div><div class='del'>-	0x82040400, 0x00101eb5, 0x50000000, 0x82000500,</div><div class='del'>-	0x000000ff, 0x80604580, 0x0400005c, 0x0201f800,</div><div class='del'>-	0x001059ba, 0x04020061, 0x59a8006f, 0x8c000502,</div><div class='del'>-	0x42001000, 0x00000010, 0x02020800, 0x00104ada,</div><div class='del'>-	0x5c00b000, 0x5c000800, 0x040207d7, 0x4c040000,</div><div class='del'>-	0x4c580000, 0x845cbd00, 0x0201f800, 0x00020267,</div><div class='del'>-	0x04000008, 0x599c0019, 0x8c00050e, 0x04020047,</div><div class='del'>-	0x0201f800, 0x00104401, 0x0402004c, 0x0401f002,</div><div class='del'>-	0x845cbd40, 0x0201f800, 0x00104acf, 0x0201f800,</div><div class='del'>-	0x00104836, 0x04020007, 0x59a80005, 0x8c000502,</div><div class='del'>-	0x04000033, 0x59340200, 0x8c00050e, 0x04020030,</div><div class='del'>-	0x59a81013, 0x8c081502, 0x04000025, 0x0201f800,</div><div class='del'>-	0x00104858, 0x04000031, 0x8c5cbd00, 0x04020004,</div><div class='del'>-	0x0201f800, 0x00104455, 0x0401f02c, 0x0401f9c8,</div><div class='del'>-	0x0400002a, 0x42026000, 0x0010bbe8, 0x49366009,</div><div class='del'>-	0x497a6008, 0x417a7800, 0x0401f920, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x0010393e, 0x0400001d, 0x41782800, 0x42003000,</div><div class='del'>-	0x00000008, 0x4d400000, 0x4d440000, 0x59368c03,</div><div class='del'>-	0x42028000, 0x00000029, 0x0201f800, 0x0010a258,</div><div class='del'>-	0x5c028800, 0x5c028000, 0x0401f010, 0x4937c857,</div><div class='del'>-	0x599c0019, 0x8c00050e, 0x0402000c, 0x0401f968,</div><div class='del'>-	0x0401f849, 0x04000011, 0x0401f008, 0x59a80013,</div><div class='del'>-	0x8c000500, 0x04000003, 0x0401f9a1, 0x04000003,</div><div class='del'>-	0x0401f828, 0x04000009, 0x5c00b000, 0x5c000800,</div><div class='del'>-	0x80040800, 0x8058b040, 0x04020798, 0x4a03501c,</div><div class='del'>-	0x0000ffff, 0x0401f005, 0x4937c857, 0x5c00b000,</div><div class='del'>-	0x5c000800, 0x4807501c, 0x5c00c000, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4a03501c, 0x00000001,</div><div class='del'>-	0x42028800, 0x000007fe, 0x42003000, 0x00fffffe,</div><div class='del'>-	0x0201f800, 0x001043fc, 0x0402000c, 0x0401f944,</div><div class='del'>-	0x0401f825, 0x04000009, 0x59a80026, 0x8400054e,</div><div class='del'>-	0x48035026, 0x0201f800, 0x001090d5, 0x82000540,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x80000580, 0x0401f7fe,</div><div class='del'>-	0x4937c857, 0x0201f800, 0x001076c9, 0x04000015,</div><div class='del'>-	0x49366009, 0x4a026406, 0x00000001, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x59a8001b, 0x80000000,</div><div class='del'>-	0x4803501b, 0x42027000, 0x00000004, 0x599c0019,</div><div class='del'>-	0x8c00050e, 0x04000003, 0x42027000, 0x00000000,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x4937c857, 0x0201f800, 0x001076c9,</div><div class='del'>-	0x0400001c, 0x49366009, 0x59340403, 0x82000580,</div><div class='del'>-	0x000007fe, 0x04000005, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0401f8b2, 0x5c027800, 0x4a026406, 0x00000001,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x001043bd, 0x42000800,</div><div class='del'>-	0x00000003, 0x0201f800, 0x001043c7, 0x59a8001b,</div><div class='del'>-	0x80000000, 0x4803501b, 0x42027000, 0x00000002,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x42028800, 0x000007fc,</div><div class='del'>-	0x42003000, 0x00fffffc, 0x0201f800, 0x001043fc,</div><div class='del'>-	0x04020005, 0x0401f805, 0x04000003, 0x4a035027,</div><div class='del'>-	0x0000ffff, 0x1c01f000, 0x4937c857, 0x0201f800,</div><div class='del'>-	0x001076c9, 0x04000014, 0x49366009, 0x4a026406,</div><div class='del'>-	0x00000001, 0x417a7800, 0x0201f800, 0x001043bd,</div><div class='del'>-	0x42000800, 0x00000003, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x59a80028, 0x80000000, 0x48035028, 0x42027000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x000208d8, 0x82000540,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x480bc857, 0x492fc857,</div><div class='del'>-	0x4c5c0000, 0x4008b800, 0x42028800, 0x000007fd,</div><div class='del'>-	0x42003000, 0x00fffffd, 0x0201f800, 0x001043fc,</div><div class='del'>-	0x0402001a, 0x0201f800, 0x00020892, 0x04000017,</div><div class='del'>-	0x49366009, 0x5934000a, 0x84000544, 0x4802680a,</div><div class='del'>-	0x812e59c0, 0x04000005, 0x592c0404, 0x8c00051e,</div><div class='del'>-	0x04000002, 0x48ee6021, 0x492e6008, 0x4a026406,</div><div class='del'>-	0x00000001, 0x485e601c, 0x42027000, 0x00000022,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c00b800, 0x1c01f000, 0x80000580, 0x0401f7fd,</div><div class='del'>-	0x5c000000, 0x4c000000, 0x4803c857, 0x4943c857,</div><div class='del'>-	0x493fc857, 0x4d340000, 0x4d440000, 0x4c580000,</div><div class='del'>-	0x4d2c0000, 0x4c5c0000, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x0201f800, 0x0010673a, 0x0201f800,</div><div class='del'>-	0x001067ee, 0x0201f800, 0x0010647f, 0x0201f800,</div><div class='del'>-	0x0010822b, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x4200b000, 0x000007f0, 0x417a8800, 0x0201f800,</div><div class='del'>-	0x00020267, 0x0402001a, 0x8d3e7d06, 0x04000004,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x04020015, 0x8d3e7d18,</div><div class='del'>-	0x04000010, 0x5934b80f, 0x805cb9c0, 0x04000009,</div><div class='del'>-	0x49425a06, 0x592cb800, 0x0201f800, 0x00020381,</div><div class='del'>-	0x805cb9c0, 0x040207fb, 0x497a680f, 0x497a6810,</div><div class='del'>-	0x4937c857, 0x4a026c00, 0x00000707, 0x0401f004,</div><div class='del'>-	0x4937c857, 0x0201f800, 0x001040e4, 0x81468800,</div><div class='del'>-	0x8058b040, 0x040207e2, 0x8d3e7d02, 0x04000011,</div><div class='del'>-	0x497b501d, 0x42028800, 0x000007f0, 0x4200b000,</div><div class='del'>-	0x00000010, 0x0201f800, 0x00020267, 0x04020006,</div><div class='del'>-	0x4937c857, 0x4a026c00, 0x00000707, 0x0201f800,</div><div class='del'>-	0x001040e4, 0x81468800, 0x8058b040, 0x040207f6,</div><div class='del'>-	0x5c00b800, 0x5c025800, 0x5c00b000, 0x5c028800,</div><div class='del'>-	0x5c026800, 0x1c01f000, 0x5c000000, 0x4c000000,</div><div class='del'>-	0x4803c857, 0x4933c857, 0x493fc857, 0x4d340000,</div><div class='del'>-	0x4d400000, 0x4d440000, 0x4d2c0000, 0x4c5c0000,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x4df00000, 0x59326809,</div><div class='del'>-	0x813669c0, 0x04000021, 0x59368c03, 0x42028000,</div><div class='del'>-	0x00000029, 0x0201f800, 0x0010679b, 0x0201f800,</div><div class='del'>-	0x001067f6, 0x0201f800, 0x00106543, 0x0201f800,</div><div class='del'>-	0x0010a0da, 0x4937c857, 0x8d3e7d18, 0x04000011,</div><div class='del'>-	0x5934b80f, 0x805cb9c0, 0x0400000a, 0x405e5800,</div><div class='del'>-	0x49425a06, 0x592cb800, 0x0201f800, 0x00020381,</div><div class='del'>-	0x805cb9c0, 0x040207fa, 0x497a680f, 0x497a6810,</div><div class='del'>-	0x4937c857, 0x4a026c00, 0x00000707, 0x0401f003,</div><div class='del'>-	0x0201f800, 0x001040e4, 0x5c03e000, 0x02000800,</div><div class='del'>-	0x00106982, 0x5c00b800, 0x5c025800, 0x5c028800,</div><div class='del'>-	0x5c028000, 0x5c026800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x59a80026, 0x8c000508, 0x04020012, 0x59305009,</div><div class='del'>-	0x482bc857, 0x836c0580, 0x00000002, 0x0402000d,</div><div class='del'>-	0x0401f813, 0x0402000b, 0x58280403, 0x82000580,</div><div class='del'>-	0x000007fc, 0x04000008, 0x59a8001b, 0x80000040,</div><div class='del'>-	0x4803c857, 0x02001800, 0x00100615, 0x4803501b,</div><div class='del'>-	0x1c01f000, 0x59a80028, 0x80000040, 0x4803c857,</div><div class='del'>-	0x040017fc, 0x48035028, 0x1c01f000, 0x59300008,</div><div class='del'>-	0x800001c0, 0x04020009, 0x59300403, 0x82000580,</div><div class='del'>-	0x00000001, 0x04020004, 0x82000540, 0x00000001,</div><div class='del'>-	0x0401f002, 0x80000580, 0x1c01f000, 0x4937c857,</div><div class='del'>-	0x59340200, 0x84000502, 0x48026a00, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x493fc857, 0x4947c857, 0x4d400000,</div><div class='del'>-	0x4d340000, 0x4d440000, 0x4c580000, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x4df00000, 0x8060c1c0, 0x04020004,</div><div class='del'>-	0x4200b000, 0x00000001, 0x0401f004, 0x4200b000,</div><div class='del'>-	0x000007f0, 0x417a8800, 0x41440000, 0x81ac0400,</div><div class='del'>-	0x50000000, 0x80026d40, 0x0400001a, 0x4d3c0000,</div><div class='del'>-	0x42027800, 0x00000001, 0x0201f800, 0x00104745,</div><div class='del'>-	0x5c027800, 0x42028000, 0x00000029, 0x0201f800,</div><div class='del'>-	0x0010679b, 0x0201f800, 0x001067f6, 0x0201f800,</div><div class='del'>-	0x00106543, 0x0201f800, 0x00104836, 0x04020005,</div><div class='del'>-	0x4937c857, 0x4a026c00, 0x00000404, 0x0401f003,</div><div class='del'>-	0x0201f800, 0x00104863, 0x0201f800, 0x0010a0da,</div><div class='del'>-	0x81468800, 0x8058b040, 0x040207e0, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x5c00b000, 0x5c028800,</div><div class='del'>-	0x5c026800, 0x5c028000, 0x1c01f000, 0x4937c857,</div><div class='del'>-	0x4947c857, 0x4c5c0000, 0x4c600000, 0x4c640000,</div><div class='del'>-	0x59a80013, 0x8c000500, 0x0400001f, 0x599c0017,</div><div class='del'>-	0x8c00050a, 0x0402001c, 0x5934ba02, 0x825cbd00,</div><div class='del'>-	0x000000ff, 0x485fc857, 0x4178c000, 0x4178c800,</div><div class='del'>-	0x82600400, 0x0010bc20, 0x50002000, 0x8060c1c0,</div><div class='del'>-	0x04000008, 0x82100500, 0x000000ff, 0x82002d80,</div><div class='del'>-	0x000000ff, 0x0400000c, 0x805c0580, 0x0400000d,</div><div class='del'>-	0x80102110, 0x8064c800, 0x82640580, 0x00000004,</div><div class='del'>-	0x040207f5, 0x8060c000, 0x82600580, 0x00000020,</div><div class='del'>-	0x040207eb, 0x4813c857, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c00c800, 0x5c00c000, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x59a80026, 0x8c000512, 0x02020800, 0x001006ba,</div><div class='del'>-	0x1c01f000, 0x00007eef, 0x00007de8, 0x00007ce4,</div><div class='del'>-	0x000080e2, 0x00007be1, 0x000080e0, 0x000080dc,</div><div class='del'>-	0x000080da, 0x00007ad9, 0x000080d6, 0x000080d5,</div><div class='del'>-	0x000080d4, 0x000080d3, 0x000080d2, 0x000080d1,</div><div class='del'>-	0x000079ce, 0x000078cd, 0x000080cc, 0x000080cb,</div><div class='del'>-	0x000080ca, 0x000080c9, 0x000080c7, 0x000080c6,</div><div class='del'>-	0x000077c5, 0x000076c3, 0x000080bc, 0x000080ba,</div><div class='del'>-	0x000075b9, 0x000080b6, 0x000074b5, 0x000073b4,</div><div class='del'>-	0x000072b3, 0x000080b2, 0x000080b1, 0x000080ae,</div><div class='del'>-	0x000071ad, 0x000080ac, 0x000070ab, 0x00006faa,</div><div class='del'>-	0x00006ea9, 0x000080a7, 0x00006da6, 0x00006ca5,</div><div class='del'>-	0x00006ba3, 0x00006a9f, 0x0000699e, 0x0000689d,</div><div class='del'>-	0x0000809b, 0x00008098, 0x00006797, 0x00006690,</div><div class='del'>-	0x0000658f, 0x00006488, 0x00006384, 0x00006282,</div><div class='del'>-	0x00008081, 0x00008080, 0x0000617c, 0x0000607a,</div><div class='del'>-	0x00008079, 0x00005f76, 0x00008075, 0x00008074,</div><div class='del'>-	0x00008073, 0x00008072, 0x00008071, 0x0000806e,</div><div class='del'>-	0x00005e6d, 0x0000806c, 0x00005d6b, 0x00005c6a,</div><div class='del'>-	0x00005b69, 0x00008067, 0x00005a66, 0x00005965,</div><div class='del'>-	0x00005863, 0x0000575c, 0x0000565a, 0x00005559,</div><div class='del'>-	0x00008056, 0x00008055, 0x00005454, 0x00005353,</div><div class='del'>-	0x00005252, 0x00005151, 0x0000504e, 0x00004f4d,</div><div class='del'>-	0x0000804c, 0x0000804b, 0x00004e4a, 0x00004d49,</div><div class='del'>-	0x00008047, 0x00004c46, 0x00008045, 0x00008043,</div><div class='del'>-	0x0000803c, 0x0000803a, 0x00008039, 0x00008036,</div><div class='del'>-	0x00004b35, 0x00008034, 0x00004a33, 0x00004932,</div><div class='del'>-	0x00004831, 0x0000802e, 0x0000472d, 0x0000462c,</div><div class='del'>-	0x0000452b, 0x0000442a, 0x00004329, 0x00004227,</div><div class='del'>-	0x00008026, 0x00008025, 0x00004123, 0x0000401f,</div><div class='del'>-	0x00003f1e, 0x00003e1d, 0x00003d1b, 0x00003c18,</div><div class='del'>-	0x00008017, 0x00008010, 0x00003b0f, 0x00003a08,</div><div class='del'>-	0x00008004, 0x00003902, 0x00008001, 0x00008000,</div><div class='del'>-	0x00008000, 0x00003800, 0x00003700, 0x00003600,</div><div class='del'>-	0x00008000, 0x00003500, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00003400, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00003300, 0x00003200, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00003100, 0x00003000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00002f00, 0x00008000, 0x00002e00, 0x00002d00,</div><div class='del'>-	0x00002c00, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00002b00, 0x00008000, 0x00002a00, 0x00002900,</div><div class='del'>-	0x00002800, 0x00008000, 0x00002700, 0x00002600,</div><div class='del'>-	0x00002500, 0x00002400, 0x00002300, 0x00002200,</div><div class='del'>-	0x00008000, 0x00008000, 0x00002100, 0x00002000,</div><div class='del'>-	0x00001f00, 0x00001e00, 0x00001d00, 0x00001c00,</div><div class='del'>-	0x00008000, 0x00008000, 0x00001b00, 0x00001a00,</div><div class='del'>-	0x00008000, 0x00001900, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00001800, 0x00008000, 0x00001700, 0x00001600,</div><div class='del'>-	0x00001500, 0x00008000, 0x00001400, 0x00001300,</div><div class='del'>-	0x00001200, 0x00001100, 0x00001000, 0x00000f00,</div><div class='del'>-	0x00008000, 0x00008000, 0x00000e00, 0x00000d00,</div><div class='del'>-	0x00000c00, 0x00000b00, 0x00000a00, 0x00000900,</div><div class='del'>-	0x00008000, 0x00008000, 0x00000800, 0x00000700,</div><div class='del'>-	0x00008000, 0x00000600, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00000500, 0x00000400, 0x00000300,</div><div class='del'>-	0x00008000, 0x00000200, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00000100, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00000000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x00008000, 0x00008000, 0x00008000,</div><div class='del'>-	0x00008000, 0x0201f800, 0x00100819, 0x02000800,</div><div class='del'>-	0x00100615, 0x492f4016, 0x1c01f000, 0x83a0ac00,</div><div class='del'>-	0x00000006, 0x83a00580, 0x0010b2a0, 0x0400000c,</div><div class='del'>-	0x492fc857, 0x812e59c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x832ca400, 0x00000006, 0x4200b000, 0x0000000d,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x0401f00f, 0x4200b000,</div><div class='del'>-	0x00000010, 0x83e0a400, 0x00000020, 0x50500000,</div><div class='del'>-	0x8050a000, 0x50500800, 0x900409c0, 0x80040540,</div><div class='del'>-	0x4400a800, 0x8050a000, 0x8054a800, 0x8058b040,</div><div class='del'>-	0x040207f7, 0x1c01f000, 0x59a00206, 0x82000c80,</div><div class='del'>-	0x0000007f, 0x040210c9, 0x59a80821, 0x0c01f001,</div><div class='del'>-	0x00102066, 0x001020a6, 0x001020a6, 0x001020f0,</div><div class='del'>-	0x00102112, 0x001020a6, 0x00102066, 0x00102134,</div><div class='del'>-	0x00102145, 0x001020a6, 0x001020a6, 0x00102152,</div><div class='del'>-	0x0010216a, 0x00102182, 0x001020a6, 0x001021b1,</div><div class='del'>-	0x001021e3, 0x001020a6, 0x0010220c, 0x001020a6,</div><div class='del'>-	0x00102269, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x00102280, 0x001022b9, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001022ee, 0x001020a6, 0x00102340, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x00102345,</div><div class='del'>-	0x001023be, 0x001020a6, 0x001023c5, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001023c7, 0x00102445, 0x00102585, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x00102594, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001025b1, 0x00102604, 0x00102660, 0x00102674,</div><div class='del'>-	0x00102696, 0x001028d1, 0x00102c60, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001020a6, 0x001020a6, 0x00102d9f,</div><div class='del'>-	0x00102e13, 0x001020a6, 0x001020a6, 0x00102e81,</div><div class='del'>-	0x001020a6, 0x00102f1f, 0x00102fd1, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x00103008, 0x00103064, 0x001020a6,</div><div class='del'>-	0x001030bc, 0x00103220, 0x001020a6, 0x00103234,</div><div class='del'>-	0x001032bf, 0x001020a6, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x0010332f, 0x00103333, 0x00103352,</div><div class='del'>-	0x001020a6, 0x001033f4, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x00103421, 0x001020a6, 0x0010344f, 0x001020a6,</div><div class='del'>-	0x001020a6, 0x001034b6, 0x001035c3, 0x00103620,</div><div class='del'>-	0x001020a6, 0x00103686, 0x001020a6, 0x001020a6,</div><div class='del'>-	0x001036db, 0x0010373e, 0x001020a6, 0x48efc857,</div><div class='del'>-	0x4031d800, 0x58ef400b, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x04000045, 0x48efc857, 0x4a034206,</div><div class='del'>-	0x00004000, 0x0201f800, 0x0010382f, 0x83a00580,</div><div class='del'>-	0x0010b2a0, 0x0400000d, 0x58ee580a, 0x4d2c0000,</div><div class='del'>-	0x0401f856, 0x41a25800, 0x0201f800, 0x0010083a,</div><div class='del'>-	0x40ee5800, 0x0201f800, 0x0010083a, 0x5c025800,</div><div class='del'>-	0x0201f000, 0x00020381, 0x04026007, 0x59a0001d,</div><div class='del'>-	0x84000542, 0x4803401d, 0x4a01d809, 0x0010207a,</div><div class='del'>-	0x1c01f000, 0x59a00206, 0x82000d80, 0x00004000,</div><div class='del'>-	0x04000006, 0x900001c0, 0x82000540, 0x00000011,</div><div class='del'>-	0x4803c011, 0x0401f005, 0x900001c0, 0x82000540,</div><div class='del'>-	0x00000010, 0x4803c011, 0x0401f844, 0x59e00017,</div><div class='del'>-	0x8c000508, 0x0402000c, 0x4203e000, 0x30000001,</div><div class='del'>-	0x4203e000, 0x40000000, 0x40ee5800, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x59a0001d, 0x84000504, 0x4803401d,</div><div class='del'>-	0x1c01f000, 0x4a03c017, 0x00000000, 0x59a00206,</div><div class='del'>-	0x82000d80, 0x00004000, 0x040007f0, 0x4a03c017,</div><div class='del'>-	0x00000001, 0x0401f7ed, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x00004001, 0x0401f7c0, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x00004002, 0x0401f7bc, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x00004003, 0x0401f7b8, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x00004005, 0x0401f7b4, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x00004006, 0x0401f7b0, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x0000400b, 0x0401f7ac, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x0000400c, 0x0401f7a8, 0x4803c856, 0x4a034206,</div><div class='del'>-	0x0000400c, 0x0401f7a4, 0x58eca80a, 0x8054a9c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x83a0a400, 0x00000006,</div><div class='del'>-	0x8254ac00, 0x00000006, 0x4200b000, 0x0000000d,</div><div class='del'>-	0x0201f000, 0x0010a93e, 0x59a00206, 0x4803c857,</div><div class='del'>-	0x59a00406, 0x4803c857, 0x59a00207, 0x4803c857,</div><div class='del'>-	0x59a00407, 0x4803c857, 0x59a00208, 0x4803c857,</div><div class='del'>-	0x59a00408, 0x4803c857, 0x59a00209, 0x4803c857,</div><div class='del'>-	0x83e0ac00, 0x00000020, 0x83a0a400, 0x00000006,</div><div class='del'>-	0x4200b000, 0x00000010, 0x50500000, 0x4400a800,</div><div class='del'>-	0x8054a800, 0x900001c0, 0x4400a800, 0x8054a800,</div><div class='del'>-	0x8050a000, 0x8058b040, 0x040207f8, 0x1c01f000,</div><div class='del'>-	0x59a00406, 0x800000c2, 0x59a00a07, 0x900409c0,</div><div class='del'>-	0x80040540, 0x84000540, 0x59a00c07, 0x8c040d00,</div><div class='del'>-	0x04000018, 0x59a8086f, 0x8c040d00, 0x040207bb,</div><div class='del'>-	0x42000800, 0x00000064, 0x80040840, 0x04000007,</div><div class='del'>-	0x4a030000, 0x00000001, 0x40000000, 0x59801000,</div><div class='del'>-	0x8c081500, 0x040007f9, 0x04000005, 0x48030004,</div><div class='del'>-	0x4a030000, 0x00000000, 0x0401f75c, 0x4a030000,</div><div class='del'>-	0x00000000, 0x4a034406, 0x00000004, 0x040007a3,</div><div class='del'>-	0x4803880e, 0x0401f755, 0x59a00406, 0x800000c2,</div><div class='del'>-	0x59a00c07, 0x8c040d00, 0x0400001a, 0x59a8086f,</div><div class='del'>-	0x8c040d00, 0x0402079d, 0x42000800, 0x00000064,</div><div class='del'>-	0x80040840, 0x04000007, 0x4a030000, 0x00000001,</div><div class='del'>-	0x40000000, 0x59801000, 0x8c081500, 0x040007f9,</div><div class='del'>-	0x04000007, 0x48030004, 0x59800805, 0x48074406,</div><div class='del'>-	0x4a030000, 0x00000000, 0x0401f73c, 0x4a030000,</div><div class='del'>-	0x00000000, 0x4a034406, 0x00000004, 0x04000783,</div><div class='del'>-	0x4803880e, 0x59c4080f, 0x48074406, 0x0401f733,</div><div class='del'>-	0x59a01c06, 0x59a00207, 0x900c19c0, 0x800c1d40,</div><div class='del'>-	0x580c0803, 0x80000580, 0x500c1000, 0x80080400,</div><div class='del'>-	0x800c1800, 0x80040840, 0x040207fc, 0x48034406,</div><div class='del'>-	0x900001c0, 0x48034207, 0x800001c0, 0x04000723,</div><div class='del'>-	0x0401f76a, 0x4a034406, 0x00000004, 0x4a034207,</div><div class='del'>-	0x00000000, 0x4a034407, 0x00000012, 0x59a8000d,</div><div class='del'>-	0x48034208, 0x900001c0, 0x48034408, 0x4a034209,</div><div class='del'>-	0x00000002, 0x0401f715, 0x59a00407, 0x59a01207,</div><div class='del'>-	0x900811c0, 0x80081540, 0x59a00409, 0x59a01a09,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x59a00a08, 0x59a00408,</div><div class='del'>-	0x900409c0, 0x80040d40, 0x59a0020a, 0x82002480,</div><div class='del'>-	0x00000010, 0x04001755, 0x59a02406, 0x900001c0,</div><div class='del'>-	0x80100540, 0x59a8280d, 0x80142480, 0x0400174f,</div><div class='del'>-	0x0201f000, 0x0010383e, 0x59a00407, 0x59a01207,</div><div class='del'>-	0x900811c0, 0x80081540, 0x59a00409, 0x59a01a09,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x59a00a08, 0x59a00408,</div><div class='del'>-	0x900409c0, 0x80040d40, 0x59a0020a, 0x82002480,</div><div class='del'>-	0x00000010, 0x0400173d, 0x59a02406, 0x900001c0,</div><div class='del'>-	0x80100540, 0x59a8280d, 0x80142480, 0x04001737,</div><div class='del'>-	0x0201f000, 0x00103841, 0x59a02407, 0x59a00207,</div><div class='del'>-	0x901021c0, 0x80102540, 0x59a01a0a, 0x59a00406,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x41781000, 0x42000000,</div><div class='del'>-	0x00001000, 0x50000000, 0x82000480, 0x24320001,</div><div class='del'>-	0x04001016, 0x820c0580, 0x00007c00, 0x04000013,</div><div class='del'>-	0x820c0480, 0x00007a00, 0x04001010, 0x820c0480,</div><div class='del'>-	0x00007cff, 0x0402100d, 0x42000800, 0x00000064,</div><div class='del'>-	0x80040840, 0x04000007, 0x4a030000, 0x00000001,</div><div class='del'>-	0x40000000, 0x59800000, 0x8c000500, 0x040007f9,</div><div class='del'>-	0x04000008, 0x80081000, 0x44101800, 0x800811c0,</div><div class='del'>-	0x040006be, 0x4a030000, 0x00000000, 0x0401f6bb,</div><div class='del'>-	0x4a030000, 0x00000000, 0x4a034406, 0x00000004,</div><div class='del'>-	0x0401f702, 0x59a01a0a, 0x59a00406, 0x900c19c0,</div><div class='del'>-	0x800c1d40, 0x41781000, 0x42000000, 0x00001000,</div><div class='del'>-	0x50000000, 0x82000480, 0x24320001, 0x04001016,</div><div class='del'>-	0x820c0580, 0x00007c00, 0x04000013, 0x820c0480,</div><div class='del'>-	0x00007a00, 0x04001010, 0x820c0480, 0x00007cff,</div><div class='del'>-	0x0402100d, 0x42000800, 0x00000064, 0x80040840,</div><div class='del'>-	0x04000007, 0x4a030000, 0x00000001, 0x40000000,</div><div class='del'>-	0x59800000, 0x8c000500, 0x040007f9, 0x0400000f,</div><div class='del'>-	0x80081000, 0x500c0000, 0x82000d00, 0x0000ffff,</div><div class='del'>-	0x48074207, 0x82000d00, 0xffff0000, 0x900409c0,</div><div class='del'>-	0x48074407, 0x800811c0, 0x0400068c, 0x4a030000,</div><div class='del'>-	0x00000000, 0x0401f689, 0x4a030000, 0x00000000,</div><div class='del'>-	0x4a034406, 0x00000004, 0x0401f6d0, 0x59a00406,</div><div class='del'>-	0x8c000500, 0x04000020, 0x59a01207, 0x59a01c07,</div><div class='del'>-	0x59a02208, 0x480b5054, 0x480f5055, 0x48135056,</div><div class='del'>-	0x59c40801, 0x82040d00, 0x00018000, 0x82040580,</div><div class='del'>-	0x00000000, 0x04000009, 0x82040580, 0x00008000,</div><div class='del'>-	0x04000008, 0x82040580, 0x00010000, 0x04000007,</div><div class='del'>-	0x0201f800, 0x00100615, 0x40080000, 0x0401f004,</div><div class='del'>-	0x400c0000, 0x0401f002, 0x40100000, 0x80000110,</div><div class='del'>-	0x42000800, 0x000000e0, 0x0201f800, 0x001019b1,</div><div class='del'>-	0x0401f007, 0x59a81054, 0x59a81855, 0x59a82056,</div><div class='del'>-	0x480b4207, 0x480f4407, 0x48134208, 0x0401f65b,</div><div class='del'>-	0x4d2c0000, 0x4d340000, 0x4d300000, 0x4d440000,</div><div class='del'>-	0x59a28c06, 0x0201f800, 0x00020267, 0x04000006,</div><div class='del'>-	0x5c028800, 0x5c026000, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x0401f69e, 0x59a04407, 0x59a00207, 0x900001c0,</div><div class='del'>-	0x80204540, 0x0401f81e, 0x04000009, 0x4a034208,</div><div class='del'>-	0x00000001, 0x4a034406, 0x0000ffff, 0x4a034207,</div><div class='del'>-	0x0000ffff, 0x497b4407, 0x0401f00b, 0x0401f822,</div><div class='del'>-	0x0400000e, 0x4a034208, 0x00000002, 0x59300402,</div><div class='del'>-	0x48034406, 0x59300202, 0x48034207, 0x59300206,</div><div class='del'>-	0x48034407, 0x5c028800, 0x5c026000, 0x5c026800,</div><div class='del'>-	0x5c025800, 0x0401f631, 0x5c028800, 0x5c026000,</div><div class='del'>-	0x5c026800, 0x5c025800, 0x0401f678, 0x4937c856,</div><div class='del'>-	0x4823c856, 0x4d2c0000, 0x5934000f, 0x80025d40,</div><div class='del'>-	0x04000007, 0x592c0005, 0x80200580, 0x592c0000,</div><div class='del'>-	0x040207fb, 0x82000540, 0x00000001, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4823c857, 0x4d2c0000, 0x4d300000,</div><div class='del'>-	0x42026000, 0x0010cfc0, 0x59300406, 0x82000d80,</div><div class='del'>-	0x00000003, 0x04000004, 0x82000d80, 0x00000006,</div><div class='del'>-	0x04020007, 0x59325808, 0x812e59c0, 0x04000004,</div><div class='del'>-	0x592c0005, 0x80200580, 0x0400000a, 0x83326400,</div><div class='del'>-	0x00000024, 0x41580000, 0x81300480, 0x040017ef,</div><div class='del'>-	0x80000580, 0x5c026000, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c026000, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x83a00580, 0x0010b2a0, 0x0402063b,</div><div class='del'>-	0x59a8006f, 0x8c000500, 0x04020003, 0x4a030000,</div><div class='del'>-	0x00000000, 0x4a034206, 0x00004000, 0x4a03c011,</div><div class='del'>-	0x40000010, 0x0401fe5d, 0x59e00017, 0x8c000508,</div><div class='del'>-	0x04000003, 0x4a03c017, 0x00000000, 0x4203e000,</div><div class='del'>-	0x30000001, 0x4203e000, 0x40000000, 0x0401f000,</div><div class='del'>-	0x59a00c06, 0x800409c0, 0x04000007, 0x836c0580,</div><div class='del'>-	0x00000000, 0x04000004, 0x4a034406, 0x0000001a,</div><div class='del'>-	0x0401f62a, 0x42007000, 0x0010b33f, 0x58381c01,</div><div class='del'>-	0x58382202, 0x8c040d00, 0x0400000b, 0x59a01207,</div><div class='del'>-	0x82080500, 0x0000f003, 0x04020624, 0x82080480,</div><div class='del'>-	0x00000841, 0x04021621, 0x82080480, 0x00000100,</div><div class='del'>-	0x0400161e, 0x8c040d06, 0x04000003, 0x4a0378e4,</div><div class='del'>-	0x000c0000, 0x8c040d04, 0x0400000c, 0x42000000,</div><div class='del'>-	0x00001000, 0x50000000, 0x82000480, 0x24220001,</div><div class='del'>-	0x04020003, 0x84040d04, 0x0401f004, 0x59e00002,</div><div class='del'>-	0x84000548, 0x4803c002, 0x8c040d02, 0x04000005,</div><div class='del'>-	0x42002800, 0x00007600, 0x4a002805, 0xd0000000,</div><div class='del'>-	0x40040000, 0x800c0540, 0x48007401, 0x8c040d00,</div><div class='del'>-	0x04000002, 0x48087202, 0x480f4406, 0x48134207,</div><div class='del'>-	0x0401f5ae, 0x4d440000, 0x4d340000, 0x59a28c06,</div><div class='del'>-	0x0201f800, 0x00020267, 0x04020009, 0x0201f800,</div><div class='del'>-	0x00104842, 0x04000009, 0x4a034406, 0x00000009,</div><div class='del'>-	0x5c026800, 0x5c028800, 0x0401f5ec, 0x5c026800,</div><div class='del'>-	0x5c028800, 0x0401f5ed, 0x59a01207, 0x59a01c07,</div><div class='del'>-	0x5934400a, 0x82203d00, 0x0000e000, 0x801c391a,</div><div class='del'>-	0x8c081500, 0x04000019, 0x820c0d00, 0x00000007,</div><div class='del'>-	0x82040580, 0x00000000, 0x04000007, 0x82040580,</div><div class='del'>-	0x00000001, 0x04000004, 0x82040580, 0x00000003,</div><div class='del'>-	0x040207eb, 0x82204500, 0xffff1fff, 0x800400da,</div><div class='del'>-	0x80200540, 0x4802680a, 0x4c1c0000, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x0201f800, 0x00104afd, 0x0201f800,</div><div class='del'>-	0x00106982, 0x5c003800, 0x481f4407, 0x5c026800,</div><div class='del'>-	0x5c028800, 0x0401f579, 0x800409c0, 0x04000004,</div><div class='del'>-	0x4a034406, 0x00000001, 0x0401f5c0, 0x836c0580,</div><div class='del'>-	0x00000003, 0x04020010, 0x59a80010, 0x497b4406,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x0400000f, 0x82000d00,</div><div class='del'>-	0x00ffff00, 0x0402000c, 0x82000c00, 0x00101eb5,</div><div class='del'>-	0x50040800, 0x80040910, 0x82041580, 0x00000080,</div><div class='del'>-	0x04020004, 0x4a034406, 0x00000007, 0x0401f5ab,</div><div class='del'>-	0x48074406, 0x82000d00, 0x0000ffff, 0x48074207,</div><div class='del'>-	0x80000120, 0x48034407, 0x59a80026, 0x82001500,</div><div class='del'>-	0x00000100, 0x480b4409, 0x8c000502, 0x0400001f,</div><div class='del'>-	0x8c000506, 0x04000009, 0x82000d00, 0x0000000a,</div><div class='del'>-	0x82040d80, 0x0000000a, 0x04020004, 0x4a034209,</div><div class='del'>-	0x00000001, 0x0401f022, 0x8c00050a, 0x04000009,</div><div class='del'>-	0x82000d00, 0x00000022, 0x82040d80, 0x00000022,</div><div class='del'>-	0x04020004, 0x4a034209, 0x00000003, 0x0401f018,</div><div class='del'>-	0x8c000508, 0x04000009, 0x82000d00, 0x00000012,</div><div class='del'>-	0x82040d80, 0x00000012, 0x04020004, 0x4a034209,</div><div class='del'>-	0x00000002, 0x0401f00e, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04020004, 0x4a034209, 0x00000004, 0x0401f52f,</div><div class='del'>-	0x8c000506, 0x04000004, 0x4a034406, 0x00000005,</div><div class='del'>-	0x0401f576, 0x4a034209, 0x00000000, 0x0401f527,</div><div class='del'>-	0x59a80037, 0x48034407, 0x59a80038, 0x48034209,</div><div class='del'>-	0x0401f522, 0x42007800, 0x0010b6eb, 0x59a00406,</div><div class='del'>-	0x4803c857, 0x82000c80, 0x00000007, 0x0402156b,</div><div class='del'>-	0x0c01f001, 0x00102354, 0x00102355, 0x00102363,</div><div class='del'>-	0x00102376, 0x00102397, 0x00102354, 0x00102354,</div><div class='del'>-	0x0401f562, 0x836c0580, 0x00000000, 0x0400055b,</div><div class='del'>-	0x59a00a07, 0x59a00407, 0x900001c0, 0x80040d40,</div><div class='del'>-	0x4807c857, 0x59a00a08, 0x59a00408, 0x900001c0,</div><div class='del'>-	0x80040d40, 0x4807c857, 0x0401f056, 0x836c0580,</div><div class='del'>-	0x00000000, 0x0400054d, 0x59a00407, 0x59a01207,</div><div class='del'>-	0x900001c0, 0x80081540, 0x59a00408, 0x59a01a08,</div><div class='del'>-	0x900001c0, 0x800c1d40, 0x42000000, 0x0010bfbe,</div><div class='del'>-	0x480fc857, 0x480bc857, 0x42000800, 0x00001000,</div><div class='del'>-	0x0201f000, 0x00103841, 0x59a00a07, 0x59a00407,</div><div class='del'>-	0x900001c0, 0x80041d40, 0x820c0c80, 0x0010a971,</div><div class='del'>-	0x0402153a, 0x820c0c80, 0x00100000, 0x04001537,</div><div class='del'>-	0x480fc857, 0x823c7c00, 0x00000009, 0x503c0800,</div><div class='del'>-	0x800409c0, 0x04000006, 0x823c0580, 0x0000000d,</div><div class='del'>-	0x0400052e, 0x803c7800, 0x0401f7f9, 0x59e41001,</div><div class='del'>-	0x82080d00, 0xfffeffcf, 0x4807c801, 0x440c7800,</div><div class='del'>-	0x46001800, 0x0201f800, 0x800c1800, 0x46001800,</div><div class='del'>-	0x00100608, 0x480bc801, 0x0401f022, 0x59a01a07,</div><div class='del'>-	0x59a00407, 0x900001c0, 0x800c1d40, 0x480c7801,</div><div class='del'>-	0x59a02208, 0x59a00408, 0x900001c0, 0x80102540,</div><div class='del'>-	0x48107802, 0x59a00209, 0x80000040, 0x04001513,</div><div class='del'>-	0x48007806, 0x80000000, 0x48007805, 0x42000800,</div><div class='del'>-	0x00004000, 0x40001000, 0x0201f800, 0x001063cf,</div><div class='del'>-	0x80000540, 0x04000003, 0x49787801, 0x0401f507,</div><div class='del'>-	0x40040000, 0x800c1c00, 0x04001504, 0x480c7803,</div><div class='del'>-	0x48107804, 0x49787808, 0x59a00409, 0x48007807,</div><div class='del'>-	0x59e40001, 0x4803c857, 0x82000540, 0x00040000,</div><div class='del'>-	0x4803c801, 0x0401f4a9, 0x59a80006, 0x48034406,</div><div class='del'>-	0x59a80007, 0x48034207, 0x59a80008, 0x48034407,</div><div class='del'>-	0x0401f4a2, 0x0201f800, 0x00100615, 0x4803c856,</div><div class='del'>-	0x4a03c013, 0x03800300, 0x4a03c014, 0x03800380,</div><div class='del'>-	0x59a00c06, 0x82040580, 0x000000a0, 0x04000004,</div><div class='del'>-	0x82040580, 0x000000a2, 0x04020028, 0x59a0140a,</div><div class='del'>-	0x82080480, 0x00000100, 0x04021024, 0x59a0020b,</div><div class='del'>-	0x8c000500, 0x0402002b, 0x59a00a0a, 0x800409c0,</div><div class='del'>-	0x0400001e, 0x82040480, 0x00000041, 0x0402101b,</div><div class='del'>-	0x82040c00, 0x00000003, 0x82040d00, 0x000000fc,</div><div class='del'>-	0x80040904, 0x59a00407, 0x59a01207, 0x900811c0,</div><div class='del'>-	0x80081540, 0x59a00409, 0x59a01a09, 0x900c19c0,</div><div class='del'>-	0x800c1d40, 0x0201f800, 0x0010381a, 0x04020006,</div><div class='del'>-	0x4a034406, 0x00000002, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x0401f4be, 0x0201f800, 0x0010383e, 0x4a01d809,</div><div class='del'>-	0x001023fd, 0x1c01f000, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x0401f4ba, 0x4031d800, 0x58ef400b, 0x58ee580d,</div><div class='del'>-	0x58ec0002, 0x82000580, 0x00000200, 0x040004a7,</div><div class='del'>-	0x59a00c06, 0x59a0140a, 0x59a0020b, 0x8c000500,</div><div class='del'>-	0x04020031, 0x832e5c00, 0x00000004, 0x41783800,</div><div class='del'>-	0x59a04a0a, 0x401c0000, 0x812c0400, 0x50004000,</div><div class='del'>-	0x82201d00, 0x000000ff, 0x4c040000, 0x0401f8af,</div><div class='del'>-	0x5c000800, 0x0400002d, 0x80244840, 0x04000028,</div><div class='del'>-	0x80081000, 0x82201d00, 0x0000ff00, 0x800c1910,</div><div class='del'>-	0x4c040000, 0x0401f8a5, 0x5c000800, 0x04000023,</div><div class='del'>-	0x80244840, 0x0400001e, 0x80081000, 0x82201d00,</div><div class='del'>-	0x00ff0000, 0x800c1920, 0x4c040000, 0x0401f89b,</div><div class='del'>-	0x5c000800, 0x04000019, 0x80244840, 0x04000014,</div><div class='del'>-	0x80081000, 0x82201d00, 0xff000000, 0x800c1930,</div><div class='del'>-	0x4c040000, 0x0401f891, 0x5c000800, 0x0400000f,</div><div class='del'>-	0x80244840, 0x0400000a, 0x80081000, 0x801c3800,</div><div class='del'>-	0x0401f7d5, 0x59a0020a, 0x82000500, 0x000000ff,</div><div class='del'>-	0x40001800, 0x0401f885, 0x04000004, 0x4a03c014,</div><div class='del'>-	0x03800000, 0x0401f425, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x0401f46e, 0x4803c856, 0x4a03c013, 0x03800300,</div><div class='del'>-	0x4a03c014, 0x03800380, 0x59a00c06, 0x82040580,</div><div class='del'>-	0x000000a0, 0x04000004, 0x82040580, 0x000000a2,</div><div class='del'>-	0x0402006e, 0x59a0140a, 0x82080480, 0x00000100,</div><div class='del'>-	0x0402106a, 0x59a0020b, 0x8c000500, 0x0402005c,</div><div class='del'>-	0x59a01a0a, 0x800c19c0, 0x04000064, 0x820c0480,</div><div class='del'>-	0x00000041, 0x04021061, 0x0201f800, 0x0010381a,</div><div class='del'>-	0x04020006, 0x4a034406, 0x00000002, 0x4a03c014,</div><div class='del'>-	0x03800000, 0x0401f44d, 0x832e5c00, 0x00000004,</div><div class='del'>-	0x41783800, 0x59a04a0a, 0x401c0000, 0x812c0400,</div><div class='del'>-	0x40004000, 0x4c040000, 0x4c080000, 0x0401f877,</div><div class='del'>-	0x5c001000, 0x5c000800, 0x04000048, 0x44144000,</div><div class='del'>-	0x80244840, 0x0400002b, 0x80081000, 0x4c040000,</div><div class='del'>-	0x4c080000, 0x0401f86d, 0x5c001000, 0x5c000800,</div><div class='del'>-	0x0400003e, 0x50200000, 0x801428d0, 0x80140540,</div><div class='del'>-	0x44004000, 0x80244840, 0x0400001e, 0x80081000,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x0401f860, 0x5c001000,</div><div class='del'>-	0x5c000800, 0x04000031, 0x50200000, 0x801428e0,</div><div class='del'>-	0x80140540, 0x44004000, 0x80244840, 0x04000011,</div><div class='del'>-	0x80081000, 0x4c040000, 0x4c080000, 0x0401f853,</div><div class='del'>-	0x5c001000, 0x5c000800, 0x04000024, 0x50200000,</div><div class='del'>-	0x801428f0, 0x80140540, 0x44004000, 0x80244840,</div><div class='del'>-	0x04000004, 0x80081000, 0x801c3800, 0x0401f7cb,</div><div class='del'>-	0x59a00a0a, 0x82040c00, 0x00000003, 0x82040d00,</div><div class='del'>-	0x000000fc, 0x80040904, 0x59a00407, 0x59a01207,</div><div class='del'>-	0x900811c0, 0x80081540, 0x59a00409, 0x59a01a09,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x412c0000, 0x0201f000, 0x00103841, 0x0401f833,</div><div class='del'>-	0x04000006, 0x48174406, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x0201f000, 0x00102066, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x4a03c014, 0x03800000,</div><div class='del'>-	0x0201f000, 0x001020b6, 0x0401f836, 0x04000010,</div><div class='del'>-	0x0401f862, 0x0402000f, 0x40080800, 0x0401f85f,</div><div class='del'>-	0x0402000c, 0x400c0800, 0x0401f85c, 0x04020009,</div><div class='del'>-	0x0401f84b, 0x42000000, 0x00030d40, 0x80000040,</div><div class='del'>-	0x040207ff, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x0401f843, 0x80000580, 0x0401f7fd, 0x0401f821,</div><div class='del'>-	0x0400000a, 0x82040d40, 0x00000001, 0x0401f84b,</div><div class='del'>-	0x04020007, 0x0401f87e, 0x0401f898, 0x0401f838,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x0401f834,</div><div class='del'>-	0x80000580, 0x0401f7fd, 0x40041800, 0x0401f811,</div><div class='del'>-	0x0400000c, 0x0401f83d, 0x0402000b, 0x40080800,</div><div class='del'>-	0x0401f83a, 0x04020008, 0x400c0800, 0x0401ffe8,</div><div class='del'>-	0x04000004, 0x0401f826, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x0401f822, 0x80000580, 0x0401f7fd,</div><div class='del'>-	0x4c040000, 0x42000800, 0x00000064, 0x4a03c013,</div><div class='del'>-	0x03800300, 0x80040840, 0x04000016, 0x59e00013,</div><div class='del'>-	0x82000500, 0x00000300, 0x82000580, 0x00000300,</div><div class='del'>-	0x040207f7, 0x42000000, 0x00000064, 0x80000040,</div><div class='del'>-	0x040207ff, 0x4a03c013, 0x01000000, 0x42000000,</div><div class='del'>-	0x00000064, 0x80000040, 0x040207ff, 0x4a03c013,</div><div class='del'>-	0x02000000, 0x82000540, 0x00000001, 0x0401f002,</div><div class='del'>-	0x80000580, 0x5c000800, 0x1c01f000, 0x4a03c013,</div><div class='del'>-	0x01000000, 0x42000000, 0x00000064, 0x80000040,</div><div class='del'>-	0x040207ff, 0x4a03c013, 0x02000200, 0x42000000,</div><div class='del'>-	0x00000064, 0x80000040, 0x040207ff, 0x4a03c013,</div><div class='del'>-	0x01000100, 0x1c01f000, 0x42002000, 0x00000008,</div><div class='del'>-	0x82040500, 0x00000080, 0x800000c2, 0x82000540,</div><div class='del'>-	0x01000000, 0x4803c013, 0x42000000, 0x00000064,</div><div class='del'>-	0x80000040, 0x040207ff, 0x4a03c013, 0x02000200,</div><div class='del'>-	0x42000000, 0x00000064, 0x80000040, 0x040207ff,</div><div class='del'>-	0x4a03c013, 0x02000000, 0x800408c2, 0x80102040,</div><div class='del'>-	0x040207ec, 0x4a03c013, 0x01000100, 0x42000000,</div><div class='del'>-	0x00000064, 0x80000040, 0x040207ff, 0x4a03c013,</div><div class='del'>-	0x02000200, 0x42000000, 0x00000064, 0x80000040,</div><div class='del'>-	0x040207ff, 0x59e00013, 0x82000500, 0x00000100,</div><div class='del'>-	0x4a03c013, 0x02000000, 0x4c040000, 0x42000800,</div><div class='del'>-	0x00000064, 0x59e00013, 0x82000500, 0x00000100,</div><div class='del'>-	0x80040840, 0x04000003, 0x80000540, 0x040207fa,</div><div class='del'>-	0x80000540, 0x5c000800, 0x1c01f000, 0x4a03c013,</div><div class='del'>-	0x01000100, 0x42001000, 0x00000008, 0x80000d80,</div><div class='del'>-	0x42000000, 0x00000064, 0x80000040, 0x040207ff,</div><div class='del'>-	0x4a03c013, 0x02000200, 0x42000000, 0x00000064,</div><div class='del'>-	0x80000040, 0x040207ff, 0x59e00013, 0x82000500,</div><div class='del'>-	0x00000100, 0x80000110, 0x800408c2, 0x80040d40,</div><div class='del'>-	0x4a03c013, 0x02000000, 0x80081040, 0x040207ed,</div><div class='del'>-	0x40042800, 0x1c01f000, 0x4a03c013, 0x01000100,</div><div class='del'>-	0x42000000, 0x00000064, 0x80000040, 0x040207ff,</div><div class='del'>-	0x4a03c013, 0x02000200, 0x42000000, 0x00000064,</div><div class='del'>-	0x80000040, 0x040207ff, 0x4a03c013, 0x02000000,</div><div class='del'>-	0x1c01f000, 0x59a00407, 0x59a80837, 0x48035037,</div><div class='del'>-	0x48074407, 0x59a00a09, 0x82040480, 0x00000014,</div><div class='del'>-	0x04021003, 0x42000800, 0x000007d0, 0x59a80038,</div><div class='del'>-	0x48075038, 0x48034209, 0x0201f000, 0x00102066,</div><div class='del'>-	0x836c0580, 0x00000000, 0x0400000e, 0x59a80006,</div><div class='del'>-	0x59a00c06, 0x80041580, 0x82081500, 0x00000040,</div><div class='del'>-	0x02000000, 0x00102066, 0x80080580, 0x48035006,</div><div class='del'>-	0x0201f800, 0x001006df, 0x0201f000, 0x00102066,</div><div class='del'>-	0x59a00406, 0x59a80806, 0x48035006, 0x80040d80,</div><div class='del'>-	0x8c040d0c, 0x02020800, 0x001006df, 0x59a00207,</div><div class='del'>-	0x48035007, 0x59a00407, 0x48035008, 0x0201f000,</div><div class='del'>-	0x00102066, 0x800409c0, 0x04000005, 0x4a034406,</div><div class='del'>-	0x00000001, 0x0201f000, 0x001020b2, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04020005, 0x4a034406, 0x00000016,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x836c0580, 0x00000003,</div><div class='del'>-	0x04000005, 0x4a034406, 0x00000007, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x59a00c06, 0x82040500, 0xffffff00,</div><div class='del'>-	0x02020000, 0x001020b6, 0x82041580, 0x000000ff,</div><div class='del'>-	0x04020007, 0x59a80010, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82001540, 0x0000ff00, 0x0401f011, 0x82040400,</div><div class='del'>-	0x00101eb5, 0x50000000, 0x80000110, 0x82000580,</div><div class='del'>-	0x00000080, 0x02000000, 0x001020b6, 0x59a80010,</div><div class='del'>-	0x82000500, 0x000000ff, 0x80041580, 0x02000000,</div><div class='del'>-	0x001020b6, 0x840409c0, 0x80041540, 0x0201f800,</div><div class='del'>-	0x00020892, 0x04020005, 0x4a034406, 0x00000003,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x48ee6021, 0x480a621c,</div><div class='del'>-	0x4a02641c, 0x0000bc09, 0x4a026406, 0x00000001,</div><div class='del'>-	0x0201f800, 0x0010381a, 0x04020007, 0x0201f800,</div><div class='del'>-	0x000208b4, 0x4a034406, 0x00000002, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x497a5a04, 0x497a5805, 0x4a025c04,</div><div class='del'>-	0x00008000, 0x4a01d809, 0x00102657, 0x492e6008,</div><div class='del'>-	0x42027000, 0x00000032, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x800409c0, 0x04000005, 0x4a034406, 0x00000001,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000016, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x836c0580, 0x00000003, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000007, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x59a00c06, 0x82040500, 0xffffff00, 0x02020000,</div><div class='del'>-	0x001020b6, 0x82041580, 0x000000ff, 0x04020007,</div><div class='del'>-	0x59a80010, 0x82000500, 0x000000ff, 0x82001540,</div><div class='del'>-	0x0000ff00, 0x0401f011, 0x82040400, 0x00101eb5,</div><div class='del'>-	0x50000000, 0x80000110, 0x82000580, 0x00000080,</div><div class='del'>-	0x02000000, 0x001020b6, 0x59a80010, 0x82000500,</div><div class='del'>-	0x000000ff, 0x80041580, 0x02000000, 0x001020b6,</div><div class='del'>-	0x840409c0, 0x80041540, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000003, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x48ee6021, 0x480a621c, 0x4a02641c,</div><div class='del'>-	0x0000bc05, 0x4a026406, 0x00000001, 0x0201f800,</div><div class='del'>-	0x0010381a, 0x04020007, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x4a034406, 0x00000002, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x497a5a04, 0x497a5805, 0x4a025c04, 0x00008000,</div><div class='del'>-	0x4a01d809, 0x00102657, 0x492e6008, 0x42027000,</div><div class='del'>-	0x00000032, 0x0201f000, 0x000208d8, 0x592c0005,</div><div class='del'>-	0x82000580, 0x01000000, 0x02020000, 0x00102066,</div><div class='del'>-	0x4a034406, 0x00000004, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x497b4406, 0x497b4207, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04000008, 0x59a80066, 0x59a8086a, 0x80040480,</div><div class='del'>-	0x59a80867, 0x48074406, 0x80041480, 0x480b4207,</div><div class='del'>-	0x49674407, 0x59a8000e, 0x48034209, 0x495f4409,</div><div class='del'>-	0x59a80020, 0x4803420b, 0x0201f000, 0x00102066,</div><div class='del'>-	0x800409c0, 0x04000005, 0x4a034406, 0x00000001,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a00406, 0x8c000500,</div><div class='del'>-	0x0402000f, 0x59a80069, 0x81640480, 0x04001008,</div><div class='del'>-	0x59a8000b, 0x81500580, 0x04000009, 0x59a8006a,</div><div class='del'>-	0x59a81066, 0x80080580, 0x04000005, 0x4a034406,</div><div class='del'>-	0x00000018, 0x0201f000, 0x001020b2, 0x59a80005,</div><div class='del'>-	0x84000558, 0x48035005, 0x82000540, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00101668, 0x0201f800, 0x00103a9f,</div><div class='del'>-	0x0201f000, 0x00102066, 0x4803c856, 0x800409c0,</div><div class='del'>-	0x02020000, 0x001020ba, 0x59a00406, 0x8c00051e,</div><div class='del'>-	0x04000008, 0x4803c856, 0x59a0020b, 0x82000480,</div><div class='del'>-	0x00000800, 0x04001015, 0x0201f000, 0x001020b6,</div><div class='del'>-	0x4803c856, 0x59a0020b, 0x599c0a01, 0x80040480,</div><div class='del'>-	0x04021003, 0x0201f000, 0x001020b6, 0x59a8000e,</div><div class='del'>-	0x81640580, 0x04000009, 0x4a034406, 0x00000018,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x4a034406, 0x00000005,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a80026, 0x8c00050a,</div><div class='del'>-	0x040007fa, 0x59a00406, 0x8c00051e, 0x04000036,</div><div class='del'>-	0x0201f800, 0x00020892, 0x040007f4, 0x0201f800,</div><div class='del'>-	0x0010381a, 0x040007f1, 0x497a5a04, 0x59a00406,</div><div class='del'>-	0x4802620a, 0x59a00209, 0x4802640a, 0x59a00409,</div><div class='del'>-	0x4802620b, 0x59a0020d, 0x4802620c, 0x59a0040d,</div><div class='del'>-	0x4802640c, 0x59a0020e, 0x4802620d, 0x59a0040e,</div><div class='del'>-	0x4802640d, 0x59a00210, 0x4802620e, 0x59a00410,</div><div class='del'>-	0x4802640e, 0x59a0020b, 0x82000500, 0x0000fffc,</div><div class='del'>-	0x80000104, 0x4802640b, 0x0401f9d9, 0x040007d7,</div><div class='del'>-	0x48ee6021, 0x58ee580d, 0x5930020e, 0x59301c0e,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x5930020c, 0x5930140c,</div><div class='del'>-	0x900811c0, 0x80081540, 0x592c0a05, 0x832c0400,</div><div class='del'>-	0x00000006, 0x0201f800, 0x0010383e, 0x4a01d809,</div><div class='del'>-	0x00102846, 0x4a034000, 0x00000001, 0x49334001,</div><div class='del'>-	0x1c01f000, 0x0201f800, 0x0010698c, 0x0201f800,</div><div class='del'>-	0x00100b29, 0x0401f86d, 0x497b5057, 0x4201d000,</div><div class='del'>-	0x00002710, 0x0201f800, 0x00105e06, 0x59c40880,</div><div class='del'>-	0x4c040000, 0x59c408a3, 0x4c040000, 0x497b4002,</div><div class='del'>-	0x0401f876, 0x0401f893, 0x4a03a005, 0x10000000,</div><div class='del'>-	0x0401f8b4, 0x0401f901, 0x04000048, 0x59c80001,</div><div class='del'>-	0x800001c0, 0x040007fc, 0x59c80018, 0x82000500,</div><div class='del'>-	0xf0000000, 0x59c00808, 0x82040d00, 0x0fffffff,</div><div class='del'>-	0x80040540, 0x48038008, 0x0201f800, 0x00100f0f,</div><div class='del'>-	0x59c00006, 0x4a038006, 0x10000000, 0x59c00009,</div><div class='del'>-	0x82000d00, 0x00e00000, 0x04020024, 0x4a03900d,</div><div class='del'>-	0x00000000, 0x59c80020, 0x82000500, 0xff000000,</div><div class='del'>-	0x82000580, 0x32000000, 0x0402001c, 0x4a03900d,</div><div class='del'>-	0x00000001, 0x59c80020, 0x82000500, 0xff000000,</div><div class='del'>-	0x82000580, 0xe1000000, 0x04020014, 0x4a03900d,</div><div class='del'>-	0x00000000, 0x59c80020, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x4a03900d, 0x00000000, 0x59c80821, 0x82040d00,</div><div class='del'>-	0x00ffffff, 0x80040580, 0x04020008, 0x59a80010,</div><div class='del'>-	0x80040580, 0x04020005, 0x59c40005, 0x82000500,</div><div class='del'>-	0x000000f0, 0x04000006, 0x4803c856, 0x0401f8d7,</div><div class='del'>-	0x4a035057, 0x00000001, 0x0401f002, 0x0401f8e1,</div><div class='del'>-	0x42000000, 0x00000064, 0x80000040, 0x02000800,</div><div class='del'>-	0x00100615, 0x59c00807, 0x82040d00, 0x0000000c,</div><div class='del'>-	0x040007fa, 0x0401f003, 0x4a035057, 0x00000001,</div><div class='del'>-	0x0401f8da, 0x0201f800, 0x00106c8a, 0x0401f818,</div><div class='del'>-	0x4201d000, 0x000186a0, 0x0201f800, 0x00105e06,</div><div class='del'>-	0x5c000800, 0x480788a3, 0x5c000800, 0x48078880,</div><div class='del'>-	0x59a80057, 0x800001c0, 0x02000000, 0x00102066,</div><div class='del'>-	0x0201f000, 0x001020be, 0x599c0201, 0x48035059,</div><div class='del'>-	0x41780800, 0x42001000, 0x00003b10, 0x0201f800,</div><div class='del'>-	0x001063ee, 0x480b505a, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00106982, 0x59b800ea, 0x82000500, 0x00000007,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020003, 0x4a0370e8,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x42038000, 0x00007700,</div><div class='del'>-	0x4a038006, 0x30000000, 0x59c00007, 0x8c00050a,</div><div class='del'>-	0x040207fe, 0x59c00006, 0x59a00209, 0x59a00c09,</div><div class='del'>-	0x900409c0, 0x80040d40, 0x48078001, 0x59a0020e,</div><div class='del'>-	0x59a00c0e, 0x900409c0, 0x80040d40, 0x48078000,</div><div class='del'>-	0x59a0020b, 0x82000500, 0x0000fffc, 0x48038002,</div><div class='del'>-	0x48038003, 0x48038005, 0x497b9009, 0x59e00003,</div><div class='del'>-	0x82000540, 0x00008060, 0x4803c003, 0x1c01f000,</div><div class='del'>-	0x41780800, 0x8007a0ca, 0x83d3a400, 0x00007600,</div><div class='del'>-	0x42000800, 0x00000040, 0x0201f800, 0x00101395,</div><div class='del'>-	0x4a03a00a, 0x00000001, 0x4a03a005, 0x20000000,</div><div class='del'>-	0x59d00006, 0x4a03a005, 0x30000000, 0x59d00006,</div><div class='del'>-	0x8c00050a, 0x040207fe, 0x59d00005, 0x59a00210,</div><div class='del'>-	0x59a00c10, 0x900409c0, 0x80040d40, 0x4807a001,</div><div class='del'>-	0x59a0020d, 0x59a00c0d, 0x900409c0, 0x80040d40,</div><div class='del'>-	0x4807a000, 0x59a0020b, 0x82000500, 0x0000fffc,</div><div class='del'>-	0x4803a003, 0x4803a002, 0x4803a008, 0x1c01f000,</div><div class='del'>-	0x59a00002, 0x4803c857, 0x800001c0, 0x0402004a,</div><div class='del'>-	0x59a8005a, 0x48038880, 0x59c400a3, 0x82000540,</div><div class='del'>-	0x00002008, 0x8400053a, 0x480388a3, 0x59c40008,</div><div class='del'>-	0x8400054e, 0x82000500, 0xffffffe1, 0x48038808,</div><div class='del'>-	0x59c80040, 0x84000534, 0x48039040, 0x0401f902,</div><div class='del'>-	0x04020013, 0x59a80010, 0x800000d0, 0x82000540,</div><div class='del'>-	0x00000011, 0x48039120, 0x59a80010, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x82000540, 0x32000000, 0x48039121,</div><div class='del'>-	0x4a039123, 0xe1290008, 0x59a80010, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x48039122, 0x0401f016, 0x59a80010,</div><div class='del'>-	0x82000500, 0x000000ff, 0x900009c0, 0x840001c0,</div><div class='del'>-	0x80040540, 0x82000540, 0x00000000, 0x48039120,</div><div class='del'>-	0x59a80010, 0x82000500, 0x000000ff, 0x82000540,</div><div class='del'>-	0x01000000, 0x48039121, 0x4a039123, 0x08210008,</div><div class='del'>-	0x59a80010, 0x82000500, 0x000000ff, 0x48039122,</div><div class='del'>-	0x497b9124, 0x59a80c5b, 0x80040800, 0x4807545b,</div><div class='del'>-	0x900409c0, 0x82040540, 0x0000aaaa, 0x48039125,</div><div class='del'>-	0x497b9126, 0x497b9127, 0x0401f8cf, 0x04020004,</div><div class='del'>-	0x4a039100, 0x0000e980, 0x0401f003, 0x4a039100,</div><div class='del'>-	0x0000e9a0, 0x1c01f000, 0x82000540, 0x00000001,</div><div class='del'>-	0x0402500d, 0x4203e000, 0x80000000, 0x40e81000,</div><div class='del'>-	0x41780800, 0x42000000, 0x00000064, 0x0201f800,</div><div class='del'>-	0x001063ee, 0x59940024, 0x80080400, 0x48032824,</div><div class='del'>-	0x80000580, 0x1c01f000, 0x4d900000, 0x4dd00000,</div><div class='del'>-	0x4da40000, 0x4d140000, 0x417a3000, 0x0201f800,</div><div class='del'>-	0x00106e2f, 0x0201f800, 0x00106b13, 0x5c022800,</div><div class='del'>-	0x5c034800, 0x5c03a000, 0x5c032000, 0x1c01f000,</div><div class='del'>-	0x59c80007, 0x8c000500, 0x04000003, 0x4a03900d,</div><div class='del'>-	0x00000030, 0x1c01f000, 0x4a038805, 0x00020000,</div><div class='del'>-	0x42000800, 0x0000003c, 0x0201f800, 0x00101395,</div><div class='del'>-	0x4a038891, 0x0000ffff, 0x59c80035, 0x48039035,</div><div class='del'>-	0x4a03900d, 0x00000040, 0x42038000, 0x00007700,</div><div class='del'>-	0x0201f800, 0x00100f0f, 0x42038000, 0x00007720,</div><div class='del'>-	0x0201f800, 0x00100f0f, 0x4a03a005, 0x20000000,</div><div class='del'>-	0x4a03a005, 0x30000000, 0x59d00806, 0x8c040d0a,</div><div class='del'>-	0x040207fe, 0x1c01f000, 0x4d300000, 0x4031d800,</div><div class='del'>-	0x58ef400b, 0x58ee580d, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x5c026000, 0x02000000, 0x001020aa,</div><div class='del'>-	0x4d300000, 0x59a26001, 0x59a00000, 0x4000b000,</div><div class='del'>-	0x80000000, 0x48034000, 0x592c0001, 0x80000540,</div><div class='del'>-	0x0400001e, 0x40025800, 0x8058b040, 0x040207fb,</div><div class='del'>-	0x58ec1007, 0x58ec1808, 0x592c0a05, 0x4d2c0000,</div><div class='del'>-	0x58ec000d, 0x40025800, 0x592c0204, 0x5c025800,</div><div class='del'>-	0x82000580, 0x00000103, 0x04000008, 0x832c0400,</div><div class='del'>-	0x00000006, 0x0201f800, 0x0010383e, 0x4a01d809,</div><div class='del'>-	0x00102846, 0x0401f007, 0x832c0400, 0x00000006,</div><div class='del'>-	0x0201f800, 0x00103841, 0x4a01d809, 0x00102846,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x58ec000d, 0x40025800,</div><div class='del'>-	0x592c0204, 0x82000580, 0x00000103, 0x04020006,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x5c026000, 0x0201f000,</div><div class='del'>-	0x00102066, 0x58ec000d, 0x40025800, 0x592c0404,</div><div class='del'>-	0x8400055e, 0x48025c04, 0x42028800, 0x000007fd,</div><div class='del'>-	0x42003000, 0x00fffffd, 0x0201f800, 0x001043fc,</div><div class='del'>-	0x04000003, 0x80000580, 0x0401f004, 0x59a26001,</div><div class='del'>-	0x0201f800, 0x00109146, 0x5c026000, 0x02000000,</div><div class='del'>-	0x001020b2, 0x4d300000, 0x4a01d809, 0x00102899,</div><div class='del'>-	0x0401f7dc, 0x592c0005, 0x82000580, 0x01000000,</div><div class='del'>-	0x02000000, 0x001020be, 0x4d300000, 0x59a26001,</div><div class='del'>-	0x5930020b, 0x59301c0a, 0x900001c0, 0x800c1d40,</div><div class='del'>-	0x5930040d, 0x5930120d, 0x900001c0, 0x80081540,</div><div class='del'>-	0x592c0a05, 0x832c0400, 0x00000006, 0x0201f800,</div><div class='del'>-	0x00103841, 0x4a01d809, 0x00102846, 0x4a034000,</div><div class='del'>-	0x00000001, 0x5c026000, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4c300000, 0x5930040b, 0x82000c80, 0x0000000e,</div><div class='del'>-	0x04001004, 0x4a025a05, 0x0000000e, 0x0401f003,</div><div class='del'>-	0x48025a05, 0x0401f00c, 0x800409c0, 0x0400000a,</div><div class='del'>-	0x4c040000, 0x0201f800, 0x0010381a, 0x5c000800,</div><div class='del'>-	0x04000003, 0x40040000, 0x0401f7f0, 0x80000580,</div><div class='del'>-	0x0401f003, 0x82000540, 0x00000001, 0x5c006000,</div><div class='del'>-	0x1c01f000, 0x59a00206, 0x82000580, 0x00000044,</div><div class='del'>-	0x1c01f000, 0x4807c857, 0x800409c0, 0x0400000c,</div><div class='del'>-	0x0201f800, 0x001016c1, 0x04020009, 0x42000000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x001018fa, 0x42000000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00101892, 0x59a00406,</div><div class='del'>-	0x82000500, 0x00000007, 0x0c01f001, 0x001028ed,</div><div class='del'>-	0x00102902, 0x00102918, 0x001028eb, 0x001028eb,</div><div class='del'>-	0x001028eb, 0x001028eb, 0x001028eb, 0x0201f000,</div><div class='del'>-	0x001020b6, 0x42000800, 0x000000c0, 0x0201f800,</div><div class='del'>-	0x001019ac, 0x82040540, 0x00000002, 0x42000800,</div><div class='del'>-	0x000000c0, 0x0201f800, 0x001019b1, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001019ac, 0x82040540,</div><div class='del'>-	0x00000008, 0x42000800, 0x00000000, 0x0201f800,</div><div class='del'>-	0x001019b1, 0x0401f00b, 0x42000800, 0x000000c0,</div><div class='del'>-	0x0201f800, 0x001019ac, 0x82040540, 0x00000001,</div><div class='del'>-	0x42000800, 0x000000c0, 0x0201f800, 0x001019b1,</div><div class='del'>-	0x59c80040, 0x4c000000, 0x59a80010, 0x4c000000,</div><div class='del'>-	0x59c400a3, 0x4c000000, 0x59c40008, 0x4c000000,</div><div class='del'>-	0x0401f911, 0x04000021, 0x0201f800, 0x00100615,</div><div class='del'>-	0x59a80821, 0x800409c0, 0x02020000, 0x001020ba,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000016, 0x0201f000, 0x001020b2, 0x836c0580,</div><div class='del'>-	0x00000003, 0x02020000, 0x001020ba, 0x59c408a4,</div><div class='del'>-	0x82040d00, 0x0000000f, 0x82040580, 0x00000000,</div><div class='del'>-	0x02020000, 0x001020ba, 0x59c80040, 0x4c000000,</div><div class='del'>-	0x59a80010, 0x4c000000, 0x59c400a3, 0x4c000000,</div><div class='del'>-	0x59c40008, 0x4c000000, 0x59c40080, 0x4c000000,</div><div class='del'>-	0x59a0020f, 0x59a0bc0f, 0x905cb9c0, 0x805cbd40,</div><div class='del'>-	0x41784800, 0x41785000, 0x41785800, 0x41789000,</div><div class='del'>-	0x41789800, 0x0401fe21, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x0201f800, 0x00100b29, 0x4178c000, 0x497b4002,</div><div class='del'>-	0x0401f95c, 0x0401f9aa, 0x59a0020c, 0x59a00c0c,</div><div class='del'>-	0x80040d40, 0x04000002, 0x0401f9fb, 0x0401f9fa,</div><div class='del'>-	0x0401fe68, 0x8060c1c0, 0x04020014, 0x0401fa98,</div><div class='del'>-	0x0401feb2, 0x0402000e, 0x0201f800, 0x00101941,</div><div class='del'>-	0x04020008, 0x4a034406, 0x00000017, 0x0201f800,</div><div class='del'>-	0x001020b2, 0x4203e000, 0x50000000, 0x0401f000,</div><div class='del'>-	0x42005800, 0x0000aaaa, 0x0401f058, 0x59c80001,</div><div class='del'>-	0x800001c0, 0x040007ee, 0x59c80801, 0x800409c0,</div><div class='del'>-	0x04000006, 0x0401fa70, 0x40240000, 0x80280540,</div><div class='del'>-	0x802c0540, 0x0402004d, 0x59a00002, 0x82000580,</div><div class='del'>-	0xfeedbeef, 0x04000004, 0x42008800, 0x10000000,</div><div class='del'>-	0x0401f003, 0x42008800, 0x10000004, 0x0401fa19,</div><div class='del'>-	0x4a034002, 0xfeedbeef, 0x0401fa71, 0x0401fa97,</div><div class='del'>-	0x0401fea8, 0x59c40005, 0x8c000534, 0x04000004,</div><div class='del'>-	0x42005800, 0x0000bbbb, 0x0401f038, 0x0401fe83,</div><div class='del'>-	0x04020007, 0x42005800, 0x0000cccc, 0x485f420f,</div><div class='del'>-	0x905cb9c0, 0x485f440f, 0x0401f030, 0x59a0040c,</div><div class='del'>-	0x800001c0, 0x0400000e, 0x59a26000, 0x5930000d,</div><div class='del'>-	0x800001c0, 0x040207be, 0x59a26001, 0x5930080d,</div><div class='del'>-	0x800409c0, 0x040207ba, 0x804891c0, 0x040207b8,</div><div class='del'>-	0x804c99c0, 0x040207b6, 0x0401f87a, 0x805cb840,</div><div class='del'>-	0x04000005, 0x40240000, 0x80280540, 0x802c0540,</div><div class='del'>-	0x0402001a, 0x42000000, 0x00030d40, 0x80000040,</div><div class='del'>-	0x04020012, 0x59c00007, 0x82000500, 0x000501c0,</div><div class='del'>-	0x0402000b, 0x0201f800, 0x00101941, 0x04020008,</div><div class='del'>-	0x4a034406, 0x00000017, 0x0201f800, 0x001020b2,</div><div class='del'>-	0x4203e000, 0x50000000, 0x0401f000, 0x42005800,</div><div class='del'>-	0x0000dddd, 0x0401f005, 0x59c00807, 0x82040d00,</div><div class='del'>-	0x0000000c, 0x040007ea, 0x0401fe5c, 0x59a0040c,</div><div class='del'>-	0x800001c0, 0x04000002, 0x0401f856, 0x0401fe6b,</div><div class='del'>-	0x40240000, 0x80280540, 0x802c0540, 0x04020003,</div><div class='del'>-	0x805cb9c0, 0x04020781, 0x0201f800, 0x00106c8a,</div><div class='del'>-	0x0401fda3, 0x4201d000, 0x000186a0, 0x0201f800,</div><div class='del'>-	0x00105e06, 0x5c000800, 0x48078880, 0x5c000800,</div><div class='del'>-	0x48078808, 0x5c000800, 0x480788a3, 0x5c000800,</div><div class='del'>-	0x48075010, 0x5c000800, 0x48079040, 0x0201f800,</div><div class='del'>-	0x001009b6, 0x59a00406, 0x82000500, 0x00000003,</div><div class='del'>-	0x82000580, 0x00000002, 0x0400002c, 0x42000800,</div><div class='del'>-	0x000000c0, 0x0201f800, 0x001019ac, 0x82040500,</div><div class='del'>-	0xfffffffc, 0x42000800, 0x000000c0, 0x0201f800,</div><div class='del'>-	0x001019b1, 0x42000800, 0x00000000, 0x0201f800,</div><div class='del'>-	0x001019ac, 0x82040500, 0xfffffff7, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001019b1, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001019ac, 0x82040500,</div><div class='del'>-	0xfffffffb, 0x42000800, 0x00000000, 0x0201f800,</div><div class='del'>-	0x001019b1, 0x4a0388a7, 0x0000f7f7, 0x42006000,</div><div class='del'>-	0xbeffffff, 0x42006800, 0x80018000, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x42006000, 0xfffeffff, 0x41786800,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x402c0000, 0x80280540,</div><div class='del'>-	0x80240540, 0x02000000, 0x00102066, 0x48274406,</div><div class='del'>-	0x482b4207, 0x482f4407, 0x0201f000, 0x001020c2,</div><div class='del'>-	0x59a26000, 0x813261c0, 0x0400000e, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x0400000b, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x0201f800, 0x00100843, 0x59a26001, 0x59325808,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x0201f800, 0x00100843,</div><div class='del'>-	0x1c01f000, 0x42000800, 0x000000ef, 0x0201f800,</div><div class='del'>-	0x00101655, 0x59c400a3, 0x8400055a, 0x8400053a,</div><div class='del'>-	0x480388a3, 0x0201f800, 0x001016ac, 0x0402000a,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x001018fa,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x00101892,</div><div class='del'>-	0x0401f013, 0x0201f800, 0x001016b3, 0x04020008,</div><div class='del'>-	0x41780000, 0x0201f800, 0x001018fa, 0x41780000,</div><div class='del'>-	0x0201f800, 0x00101892, 0x0401f009, 0x42000000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x001018fa, 0x42000000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00101892, 0x42000800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x001019ac, 0x82040540,</div><div class='del'>-	0x00000004, 0x42000800, 0x00000000, 0x0201f800,</div><div class='del'>-	0x001019b1, 0x4201d000, 0x00000014, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x59c40008, 0x8400054e, 0x82000500,</div><div class='del'>-	0xffffffe1, 0x48038808, 0x4a0388a7, 0x0000f7f7,</div><div class='del'>-	0x42001000, 0x04000001, 0x0201f800, 0x001019aa,</div><div class='del'>-	0x42006000, 0xbe20bfff, 0x42006800, 0x80018000,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x42006000, 0xfffeffff,</div><div class='del'>-	0x41786800, 0x0201f800, 0x001040ad, 0x4200b000,</div><div class='del'>-	0x00001388, 0x4201d000, 0x00000014, 0x4c580000,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x0201f800, 0x00101941,</div><div class='del'>-	0x5c00b000, 0x04000004, 0x8058b040, 0x040207f6,</div><div class='del'>-	0x0401f025, 0x59c40005, 0x8c000534, 0x04020007,</div><div class='del'>-	0x59c400a4, 0x82000500, 0x0000000f, 0x82000580,</div><div class='del'>-	0x00000008, 0x0402001c, 0x42006000, 0x00020000,</div><div class='del'>-	0x0201f800, 0x001040b2, 0x4201d000, 0x00000064,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x42006000, 0xfeffffff,</div><div class='del'>-	0x42006800, 0x02000000, 0x0201f800, 0x001040ad,</div><div class='del'>-	0x42006000, 0xfdffffff, 0x41786800, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x4a038805, 0x04000001, 0x59c400a4,</div><div class='del'>-	0x82000500, 0x0000000f, 0x82000580, 0x00000000,</div><div class='del'>-	0x04000003, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x42038000, 0x00007700, 0x0201f800,</div><div class='del'>-	0x00100f0f, 0x59c00006, 0x59a0040c, 0x800001c0,</div><div class='del'>-	0x0400003f, 0x59a03c0c, 0x59a00209, 0x59a01c09,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x59a0020e, 0x59a0240e,</div><div class='del'>-	0x901021c0, 0x80102540, 0x59a0020b, 0x82000500,</div><div class='del'>-	0x0000fffc, 0x59a0140b, 0x900811c0, 0x80081540,</div><div class='del'>-	0x480b8003, 0x0201f800, 0x00020892, 0x02000800,</div><div class='del'>-	0x00100615, 0x49334000, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x4a025a04, 0x00000018, 0x4a025805, 0x00abcdef,</div><div class='del'>-	0x492e6008, 0x492e600b, 0x481e600d, 0x4a02600c,</div><div class='del'>-	0x00000004, 0x832c0400, 0x00000011, 0x4802600a,</div><div class='del'>-	0x42001000, 0x0000000c, 0x821c0d80, 0x00000001,</div><div class='del'>-	0x04000004, 0x801c3840, 0x0401f963, 0x0401f004,</div><div class='del'>-	0x41783800, 0x0401f960, 0x0401f011, 0x821c0c80,</div><div class='del'>-	0x00000005, 0x04001005, 0x40043800, 0x42001000,</div><div class='del'>-	0x0000003c, 0x0401f006, 0x80001580, 0x82081400,</div><div class='del'>-	0x0000000c, 0x801c3840, 0x040207fd, 0x832c0400,</div><div class='del'>-	0x00000005, 0x0401f950, 0x040207f1, 0x497b9009,</div><div class='del'>-	0x59e00003, 0x82000540, 0x00008060, 0x4803c003,</div><div class='del'>-	0x4a038009, 0x00e00000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x41780800, 0x8007a0ca, 0x83d3a400, 0x00007600,</div><div class='del'>-	0x42000800, 0x00000040, 0x0201f800, 0x00101395,</div><div class='del'>-	0x4a03a00a, 0x00000001, 0x4a03a005, 0x20000000,</div><div class='del'>-	0x59d00006, 0x4a03a005, 0x30000000, 0x59d00006,</div><div class='del'>-	0x8c00050a, 0x040207fe, 0x59d00005, 0x59a0020c,</div><div class='del'>-	0x800001c0, 0x0400003f, 0x59a03a0c, 0x59a00210,</div><div class='del'>-	0x59a01c10, 0x900c19c0, 0x800c1d40, 0x59a0020d,</div><div class='del'>-	0x59a0240d, 0x901021c0, 0x80102540, 0x59a0120b,</div><div class='del'>-	0x82081500, 0x0000fffc, 0x59a0040b, 0x900001c0,</div><div class='del'>-	0x80081540, 0x480ba003, 0x0201f800, 0x00020892,</div><div class='del'>-	0x02000800, 0x00100615, 0x49334001, 0x0201f800,</div><div class='del'>-	0x0010082a, 0x4a025a04, 0x00000018, 0x4a025805,</div><div class='del'>-	0x00abcdef, 0x492e6008, 0x492e600b, 0x481e600d,</div><div class='del'>-	0x4a02600c, 0x00000004, 0x832c0400, 0x00000011,</div><div class='del'>-	0x4802600a, 0x42001000, 0x0000000c, 0x821c0d80,</div><div class='del'>-	0x00000001, 0x04000004, 0x801c3840, 0x0401f906,</div><div class='del'>-	0x0401f004, 0x41783800, 0x0401f903, 0x0401f011,</div><div class='del'>-	0x821c0c80, 0x00000005, 0x04001005, 0x40043800,</div><div class='del'>-	0x42001000, 0x0000003c, 0x0401f006, 0x80001580,</div><div class='del'>-	0x82081400, 0x0000000c, 0x801c3840, 0x040207fd,</div><div class='del'>-	0x832c0400, 0x00000005, 0x0401f8f3, 0x040207f1,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x59a0020c, 0x800001c0,</div><div class='del'>-	0x04000024, 0x824c0580, 0x00000002, 0x04000040,</div><div class='del'>-	0x59a26001, 0x5930380d, 0x801c39c0, 0x0400003c,</div><div class='del'>-	0x801c3840, 0x481e600d, 0x5932580b, 0x5930080a,</div><div class='del'>-	0x50042000, 0x58041801, 0x58041002, 0x82081500,</div><div class='del'>-	0xfffffffc, 0x5930000c, 0x80000000, 0x82000d80,</div><div class='del'>-	0x00000005, 0x04020009, 0x497a600c, 0x592e5801,</div><div class='del'>-	0x812e59c0, 0x0400001a, 0x492e600b, 0x832c0c00,</div><div class='del'>-	0x00000005, 0x0401f005, 0x4802600c, 0x5930080a,</div><div class='del'>-	0x82040c00, 0x00000003, 0x4806600a, 0x0401f010,</div><div class='del'>-	0x59a0120b, 0x82081500, 0x0000fffc, 0x59a0040b,</div><div class='del'>-	0x900001c0, 0x80081540, 0x480ba003, 0x59a0020d,</div><div class='del'>-	0x59a0240d, 0x901021c0, 0x80102540, 0x59a00210,</div><div class='del'>-	0x59a01c10, 0x900c19c0, 0x800c1d40, 0x4201d000,</div><div class='del'>-	0x00003a98, 0x0201f800, 0x00105e06, 0x480ba002,</div><div class='del'>-	0x59a80059, 0x4803a008, 0x4813a000, 0x480fa001,</div><div class='del'>-	0x4a03a005, 0x10000000, 0x02005800, 0x00100615,</div><div class='del'>-	0x804c9800, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x4847c857, 0x59a0040c, 0x800001c0, 0x04000024,</div><div class='del'>-	0x82480580, 0x00000002, 0x04000042, 0x59a26000,</div><div class='del'>-	0x5930380d, 0x801c39c0, 0x0400003e, 0x801c3840,</div><div class='del'>-	0x481e600d, 0x5932580b, 0x5930080a, 0x50042000,</div><div class='del'>-	0x58041801, 0x58041002, 0x82081500, 0xfffffffc,</div><div class='del'>-	0x5930000c, 0x80000000, 0x82000d80, 0x00000005,</div><div class='del'>-	0x04020009, 0x497a600c, 0x592e5801, 0x812e59c0,</div><div class='del'>-	0x0400001d, 0x492e600b, 0x832c0c00, 0x00000005,</div><div class='del'>-	0x0401f005, 0x4802600c, 0x5930080a, 0x82040c00,</div><div class='del'>-	0x00000003, 0x4806600a, 0x0401f013, 0x82440580,</div><div class='del'>-	0x10000000, 0x0402001f, 0x59a0020e, 0x59a0240e,</div><div class='del'>-	0x901021c0, 0x80102540, 0x59a00209, 0x59a01c09,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x59a0020b, 0x82000500,</div><div class='del'>-	0x0000fffc, 0x59a0140b, 0x900811c0, 0x80081540,</div><div class='del'>-	0x480b8003, 0x48138000, 0x480f8001, 0x480b8002,</div><div class='del'>-	0x59c80018, 0x82000500, 0xf0000000, 0x59c02008,</div><div class='del'>-	0x82102500, 0x0fffffff, 0x80100540, 0x48038008,</div><div class='del'>-	0x48478006, 0x80489000, 0x8260c540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x59c00009, 0x4803c857, 0x82000d00,</div><div class='del'>-	0x00e00000, 0x0400000d, 0x485f420f, 0x905cb9c0,</div><div class='del'>-	0x485f440f, 0x8c00052e, 0x04000002, 0x80285000,</div><div class='del'>-	0x8c00052c, 0x04000002, 0x80244800, 0x8c00052a,</div><div class='del'>-	0x04000002, 0x802c5800, 0x1c01f000, 0x59a0020c,</div><div class='del'>-	0x800001c0, 0x04000024, 0x59d00806, 0x4807c857,</div><div class='del'>-	0x8c040d3e, 0x04000020, 0x4a03a005, 0x20000000,</div><div class='del'>-	0x4a03a005, 0x30000000, 0x59d00806, 0x8c040d0a,</div><div class='del'>-	0x040207fe, 0x824c0480, 0x00000003, 0x02021800,</div><div class='del'>-	0x00100615, 0x404c0000, 0x0c01f001, 0x00102c02,</div><div class='del'>-	0x00102c04, 0x00102c0a, 0x0201f800, 0x00100615,</div><div class='del'>-	0x80000040, 0x40009800, 0x0401ff43, 0x0400000a,</div><div class='del'>-	0x0401ff41, 0x0401f008, 0x80000040, 0x40009800,</div><div class='del'>-	0x59d00806, 0x4807c857, 0x8c040d3e, 0x040207e3,</div><div class='del'>-	0x0401ff39, 0x1c01f000, 0x59a0040c, 0x800001c0,</div><div class='del'>-	0x04000024, 0x59c00807, 0x4807c857, 0x8c040d3e,</div><div class='del'>-	0x04000020, 0x59c00807, 0x4a038006, 0x20000000,</div><div class='del'>-	0x82480480, 0x00000003, 0x02021800, 0x00100615,</div><div class='del'>-	0x40480000, 0x0c01f001, 0x00102c25, 0x00102c27,</div><div class='del'>-	0x00102c2f, 0x0201f800, 0x00100615, 0x80000040,</div><div class='del'>-	0x40009000, 0x42008800, 0x10000004, 0x0401ff65,</div><div class='del'>-	0x0400000c, 0x0401ff63, 0x0401f00a, 0x80000040,</div><div class='del'>-	0x40009000, 0x59c00807, 0x4807c857, 0x8c040d3e,</div><div class='del'>-	0x040207e5, 0x42008800, 0x10000004, 0x0401ff59,</div><div class='del'>-	0x1c01f000, 0x492fc857, 0x4000a800, 0x4a03b805,</div><div class='del'>-	0x20000000, 0x59dc0006, 0x4a03b805, 0x30000000,</div><div class='del'>-	0x4813b800, 0x480fb801, 0x480bb802, 0x4857b803,</div><div class='del'>-	0x4a03b805, 0x30000002, 0x59dc0006, 0x4a03b805,</div><div class='del'>-	0x70000001, 0x59dc0006, 0x4a03b805, 0x10000000,</div><div class='del'>-	0x59dc0006, 0x8c00053e, 0x040007fe, 0x4a03b805,</div><div class='del'>-	0x20000000, 0x59dc0006, 0x59dc2000, 0x59dc1801,</div><div class='del'>-	0x801c39c0, 0x0400000a, 0x4d2c0000, 0x0201f800,</div><div class='del'>-	0x0010082a, 0x5c000800, 0x02000800, 0x00100615,</div><div class='del'>-	0x4a025a04, 0x0000000a, 0x492c0801, 0x1c01f000,</div><div class='del'>-	0x42006000, 0x00102d9d, 0x42000800, 0x0000007c,</div><div class='del'>-	0x0201f800, 0x00101395, 0x4a03902c, 0x00200000,</div><div class='del'>-	0x4200b000, 0x000001f4, 0x59c8002c, 0x8c00052c,</div><div class='del'>-	0x04000007, 0x8058b040, 0x040207fc, 0x42000000,</div><div class='del'>-	0x00004003, 0x41781000, 0x0401f11e, 0x50301000,</div><div class='del'>-	0x41784800, 0x4a03902d, 0x00008000, 0x4200b000,</div><div class='del'>-	0x000001f4, 0x59c8002c, 0x8c000534, 0x04000007,</div><div class='del'>-	0x8058b040, 0x040207fc, 0x42000000, 0x00004003,</div><div class='del'>-	0x41781000, 0x0401f10f, 0x0401f895, 0x80244800,</div><div class='del'>-	0x82240580, 0x000003b1, 0x040207fc, 0x0401f911,</div><div class='del'>-	0x41784800, 0x0401f8bb, 0x80244800, 0x82240580,</div><div class='del'>-	0x000003b1, 0x040207fc, 0x80306000, 0x82300580,</div><div class='del'>-	0x00102d9f, 0x040207e2, 0x59a80863, 0x800409c0,</div><div class='del'>-	0x04000007, 0x42000000, 0x00004004, 0x42001000,</div><div class='del'>-	0x00000002, 0x59a81862, 0x0401f0f6, 0x42006000,</div><div class='del'>-	0x00102d9d, 0x50301000, 0x41784800, 0x4a03902d,</div><div class='del'>-	0x00000800, 0x0401f876, 0x80244800, 0x82240580,</div><div class='del'>-	0x00000018, 0x040207fc, 0x0401f8f2, 0x41784800,</div><div class='del'>-	0x0401f89c, 0x80244800, 0x82240580, 0x00000018,</div><div class='del'>-	0x040207fc, 0x80306000, 0x82300580, 0x00102d9f,</div><div class='del'>-	0x040207ed, 0x59a80863, 0x800409c0, 0x04000007,</div><div class='del'>-	0x42000000, 0x00004004, 0x42001000, 0x00000010,</div><div class='del'>-	0x59a81862, 0x0401f0d7, 0x42006000, 0x00102d9d,</div><div class='del'>-	0x50301000, 0x41784800, 0x4a03902d, 0x00000400,</div><div class='del'>-	0x0401f857, 0x80244800, 0x82240580, 0x00000088,</div><div class='del'>-	0x040207fc, 0x0401f8d3, 0x41784800, 0x0401f87d,</div><div class='del'>-	0x80244800, 0x82240580, 0x00000088, 0x040207fc,</div><div class='del'>-	0x80306000, 0x82300580, 0x00102d9f, 0x040207ed,</div><div class='del'>-	0x59a80863, 0x800409c0, 0x04000007, 0x42000000,</div><div class='del'>-	0x00004004, 0x42001000, 0x00000008, 0x59a81862,</div><div class='del'>-	0x0401f0b8, 0x42006000, 0x00102d9d, 0x50301000,</div><div class='del'>-	0x41784800, 0x4a03902d, 0x00002000, 0x4200b000,</div><div class='del'>-	0x000001f4, 0x59c8002c, 0x8c000530, 0x04000007,</div><div class='del'>-	0x8058b040, 0x040207fc, 0x42000000, 0x00004003,</div><div class='del'>-	0x41781000, 0x0401f0a7, 0x59c8002c, 0x82000500,</div><div class='del'>-	0xffe0ffff, 0x82080d00, 0x001f0000, 0x80040540,</div><div class='del'>-	0x4803902c, 0x0401f826, 0x80244800, 0x82240580,</div><div class='del'>-	0x00000110, 0x040207fc, 0x0401f8a2, 0x41784800,</div><div class='del'>-	0x0401f84c, 0x59c80034, 0x82080d00, 0x001f0000,</div><div class='del'>-	0x82000500, 0x001f0000, 0x80040580, 0x04000006,</div><div class='del'>-	0x59a80063, 0x80000000, 0x48035063, 0x40240000,</div><div class='del'>-	0x48035062, 0x80244800, 0x82240580, 0x00000110,</div><div class='del'>-	0x040207f0, 0x80306000, 0x82300580, 0x00102d9f,</div><div class='del'>-	0x040207cf, 0x59a80863, 0x800409c0, 0x04000006,</div><div class='del'>-	0x42000000, 0x00004004, 0x42001000, 0x00000020,</div><div class='del'>-	0x59a81862, 0x0201f000, 0x00102066, 0x59c8002c,</div><div class='del'>-	0x82000500, 0xffff0000, 0x82080d00, 0x0000ffff,</div><div class='del'>-	0x80040540, 0x4803902c, 0x480b9028, 0x480b9029,</div><div class='del'>-	0x59a80064, 0x82000580, 0x00000004, 0x04000003,</div><div class='del'>-	0x480b902a, 0x480b902b, 0x59c8002d, 0x82000500,</div><div class='del'>-	0xfffffc00, 0x80240540, 0x4803902d, 0x4200b000,</div><div class='del'>-	0x000001f4, 0x59c8002c, 0x82000500, 0x18000000,</div><div class='del'>-	0x04000007, 0x8058b040, 0x040207fb, 0x42000000,</div><div class='del'>-	0x00004003, 0x41781000, 0x0401f05a, 0x4a03902e,</div><div class='del'>-	0x00000001, 0x4200b000, 0x000001f4, 0x59c8002e,</div><div class='del'>-	0x8c000500, 0x04000006, 0x8058b040, 0x040207fc,</div><div class='del'>-	0x42000000, 0x00004003, 0x0401f04e, 0x1c01f000,</div><div class='del'>-	0x41783800, 0x59c8002d, 0x82000500, 0xfffffc00,</div><div class='del'>-	0x80240d40, 0x4807902d, 0x4200b000, 0x000001f4,</div><div class='del'>-	0x59c8002c, 0x82000500, 0x18000000, 0x04000007,</div><div class='del'>-	0x8058b040, 0x040207fb, 0x42000000, 0x00004003,</div><div class='del'>-	0x41781000, 0x0401f03b, 0x59c81830, 0x59c80030,</div><div class='del'>-	0x800c0d80, 0x040207fd, 0x80080d80, 0x04000002,</div><div class='del'>-	0x801c3800, 0x59c82031, 0x59c80031, 0x80100d80,</div><div class='del'>-	0x040207fd, 0x80080d80, 0x04000002, 0x801c3800,</div><div class='del'>-	0x59a80064, 0x82000580, 0x00000004, 0x04000019,</div><div class='del'>-	0x59c82832, 0x59c80032, 0x80140d80, 0x040207fd,</div><div class='del'>-	0x80080d80, 0x04000002, 0x801c3800, 0x59c83033,</div><div class='del'>-	0x59c80033, 0x80180d80, 0x040207fd, 0x80080d80,</div><div class='del'>-	0x04000002, 0x801c3800, 0x59c80034, 0x59c80834,</div><div class='del'>-	0x80040d80, 0x040207fd, 0x80080d80, 0x82040d00,</div><div class='del'>-	0x0000ffff, 0x0400000c, 0x801c3800, 0x0401f00a,</div><div class='del'>-	0x59c80034, 0x59c80834, 0x80040d80, 0x040207fd,</div><div class='del'>-	0x80080d80, 0x82040d00, 0x000000ff, 0x04000002,</div><div class='del'>-	0x801c3800, 0x801c39c0, 0x04000005, 0x59a80063,</div><div class='del'>-	0x801c0400, 0x48035063, 0x48275062, 0x1c01f000,</div><div class='del'>-	0x48034206, 0x48074406, 0x480b4207, 0x480f4407,</div><div class='del'>-	0x48134208, 0x48174408, 0x0201f000, 0x00102069,</div><div class='del'>-	0x42000000, 0x00600000, 0x80000040, 0x040207ff,</div><div class='del'>-	0x1c01f000, 0x5a5a5a5a, 0xa5a5a5a5, 0x59a00c0a,</div><div class='del'>-	0x800409c0, 0x02000000, 0x001020b6, 0x82040480,</div><div class='del'>-	0x00000021, 0x02021000, 0x001020b6, 0x82040480,</div><div class='del'>-	0x00000011, 0x04001003, 0x42000800, 0x00000010,</div><div class='del'>-	0x59a00208, 0x59a01407, 0x900811c0, 0x80081540,</div><div class='del'>-	0x59a00207, 0x59a01c06, 0x900c19c0, 0x800c1d40,</div><div class='del'>-	0x0201f800, 0x0010381a, 0x04000006, 0x0201f800,</div><div class='del'>-	0x0010383e, 0x4a01d809, 0x00102dc0, 0x1c01f000,</div><div class='del'>-	0x4a034406, 0x00000002, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x4031d800, 0x58ef400b, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x59a00c0a,</div><div class='del'>-	0x82040480, 0x00000011, 0x04001003, 0x42000800,</div><div class='del'>-	0x00000010, 0x59a0040b, 0x59a0120b, 0x900811c0,</div><div class='del'>-	0x80081540, 0x59a00209, 0x59a01c08, 0x900c19c0,</div><div class='del'>-	0x800c1d40, 0x58ec0003, 0x0201f800, 0x00103841,</div><div class='del'>-	0x4a01d809, 0x00102ddb, 0x1c01f000, 0x4031d800,</div><div class='del'>-	0x58ef400b, 0x58ec0002, 0x82000580, 0x00000200,</div><div class='del'>-	0x02000000, 0x001020aa, 0x59a00c0a, 0x82040480,</div><div class='del'>-	0x00000011, 0x02001000, 0x00102066, 0x82040c80,</div><div class='del'>-	0x00000010, 0x59a00208, 0x59a01407, 0x900811c0,</div><div class='del'>-	0x80081540, 0x59a00207, 0x59a01c06, 0x900c19c0,</div><div class='del'>-	0x800c1d40, 0x82081400, 0x00000040, 0x58ec0003,</div><div class='del'>-	0x0201f800, 0x0010383e, 0x4a01d809, 0x00102df9,</div><div class='del'>-	0x1c01f000, 0x4031d800, 0x58ef400b, 0x58ec0002,</div><div class='del'>-	0x82000580, 0x00000200, 0x02000000, 0x001020aa,</div><div class='del'>-	0x59a0040a, 0x82000c80, 0x00000010, 0x59a0040b,</div><div class='del'>-	0x59a0120b, 0x900811c0, 0x80081540, 0x59a00209,</div><div class='del'>-	0x59a01c08, 0x900c19c0, 0x800c1d40, 0x82081400,</div><div class='del'>-	0x00000040, 0x58ec0003, 0x0201f800, 0x00103841,</div><div class='del'>-	0x4a01d809, 0x0010205f, 0x1c01f000, 0x48efc857,</div><div class='del'>-	0x59a00207, 0x59a01407, 0x900001c0, 0x80081540,</div><div class='del'>-	0x59a00209, 0x59a01c09, 0x900001c0, 0x800c1d40,</div><div class='del'>-	0x59a00406, 0x48034000, 0x480b4001, 0x480f4002,</div><div class='del'>-	0x0201f800, 0x0010381a, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000002, 0x0201f000, 0x001020b2, 0x42000800,</div><div class='del'>-	0x00000010, 0x0201f800, 0x0010383e, 0x4a01d809,</div><div class='del'>-	0x00102e2e, 0x1c01f000, 0x4031d800, 0x58ef400b,</div><div class='del'>-	0x58ee580d, 0x58ec0002, 0x82000580, 0x00000200,</div><div class='del'>-	0x02000000, 0x001020aa, 0x48efc857, 0x49a3c857,</div><div class='del'>-	0x492fc857, 0x592c0a04, 0x80040910, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000019, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x4805d80c, 0x0401f00a, 0x4031d800, 0x58ef400b,</div><div class='del'>-	0x58ec0002, 0x82000580, 0x00000200, 0x02000000,</div><div class='del'>-	0x001020aa, 0x48efc857, 0x49a3c857, 0x48efc857,</div><div class='del'>-	0x49a3c857, 0x58ec000c, 0x80000040, 0x04000012,</div><div class='del'>-	0x4801d80c, 0x0201f800, 0x0010381a, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000002, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x42000800, 0x00000010, 0x58ec1007, 0x58ec1808,</div><div class='del'>-	0x0201f800, 0x0010383e, 0x4a01d809, 0x00102e42,</div><div class='del'>-	0x1c01f000, 0x58ee580d, 0x48efc857, 0x49a3c857,</div><div class='del'>-	0x492fc857, 0x492f3006, 0x592c0404, 0x8400055e,</div><div class='del'>-	0x48025c04, 0x4a01d809, 0x00102e6c, 0x1c01f000,</div><div class='del'>-	0x4d2c0000, 0x58ee580d, 0x48efc857, 0x49a3c857,</div><div class='del'>-	0x492fc857, 0x592c0404, 0x8400051e, 0x48025c04,</div><div class='del'>-	0x59a00000, 0x59a01001, 0x59a01802, 0x80081400,</div><div class='del'>-	0x820c1c40, 0x00000000, 0x832c0400, 0x00000004,</div><div class='del'>-	0x42000800, 0x00000010, 0x5c025800, 0x0201f000,</div><div class='del'>-	0x00103841, 0x800409c0, 0x04000005, 0x4a034406,</div><div class='del'>-	0x00000001, 0x0201f000, 0x001020b2, 0x836c0580,</div><div class='del'>-	0x00000003, 0x04000005, 0x4a034406, 0x00000007,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a0320b, 0x82183500,</div><div class='del'>-	0x000000ff, 0x59a28c06, 0x0201f800, 0x00020267,</div><div class='del'>-	0x02020000, 0x001020b6, 0x83440580, 0x000007fd,</div><div class='del'>-	0x04000008, 0x0201f800, 0x00104836, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000009, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x0201f800, 0x0010381a, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000002, 0x0201f000, 0x001020b2, 0x801831c0,</div><div class='del'>-	0x0400000a, 0x412c0800, 0x0201f800, 0x0010381a,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000002, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x40065800, 0x4a025c04, 0x00008000,</div><div class='del'>-	0x497a5a04, 0x0201f800, 0x00108ebd, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000003, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x4a01d809, 0x00102ebf, 0x1c01f000, 0x592c0005,</div><div class='del'>-	0x82000580, 0x01000000, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000004, 0x0201f000, 0x001020b2, 0x592c0406,</div><div class='del'>-	0x82002d00, 0x0000ff00, 0x82000500, 0x000000ff,</div><div class='del'>-	0x80000904, 0x80040800, 0x82040480, 0x00000006,</div><div class='del'>-	0x04001003, 0x42000800, 0x00000005, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x4c580000, 0x832ca400, 0x00000006,</div><div class='del'>-	0x4050a800, 0x4004b000, 0x0201f800, 0x0010a94f,</div><div class='del'>-	0x59a00407, 0x59a01207, 0x900811c0, 0x80081540,</div><div class='del'>-	0x59a00409, 0x59a01a09, 0x900c19c0, 0x800c1d40,</div><div class='del'>-	0x832c0400, 0x00000006, 0x4c140000, 0x0201f800,</div><div class='del'>-	0x00103841, 0x5c002800, 0x801429c0, 0x04000003,</div><div class='del'>-	0x4a01d809, 0x00102ef2, 0x5c00b000, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x1c01f000, 0x4031d800, 0x58ef400b,</div><div class='del'>-	0x58ee580d, 0x58ec0002, 0x82000580, 0x00000200,</div><div class='del'>-	0x02000000, 0x001020aa, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x592c0006, 0x82000500, 0xff000000,</div><div class='del'>-	0x80000904, 0x800409c0, 0x02000000, 0x001020aa,</div><div class='del'>-	0x82040480, 0x0000000e, 0x04001003, 0x42000800,</div><div class='del'>-	0x0000000d, 0x592e5801, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x4c500000, 0x4c540000, 0x4c580000,</div><div class='del'>-	0x832ca400, 0x00000005, 0x4050a800, 0x4004b000,</div><div class='del'>-	0x0201f800, 0x0010a94f, 0x5c00b000, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x58ec1007, 0x58ec1808, 0x832c0400,</div><div class='del'>-	0x00000005, 0x0201f000, 0x00103841, 0x0201f800,</div><div class='del'>-	0x0010381a, 0x04020005, 0x4a034406, 0x00000002,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a00c06, 0x82040500,</div><div class='del'>-	0x0000ff00, 0x840001c0, 0x82001480, 0x00000007,</div><div class='del'>-	0x02021000, 0x001020b6, 0x0c01f001, 0x00102f36,</div><div class='del'>-	0x00102f3d, 0x00102f44, 0x00102f44, 0x00102f44,</div><div class='del'>-	0x00102f46, 0x00102f4b, 0x42000800, 0x0000000d,</div><div class='del'>-	0x42003800, 0x00102f5f, 0x4a034000, 0x0010b2e7,</div><div class='del'>-	0x0401f013, 0x42000800, 0x0000000d, 0x42003800,</div><div class='del'>-	0x00102f5f, 0x4a034000, 0x0010b2f4, 0x0401f00c,</div><div class='del'>-	0x0201f000, 0x001020b6, 0x42000800, 0x00000008,</div><div class='del'>-	0x42003800, 0x00102f72, 0x0401f005, 0x42000800,</div><div class='del'>-	0x00000004, 0x42003800, 0x00102fbc, 0x59a00207,</div><div class='del'>-	0x59a01407, 0x900001c0, 0x80081540, 0x59a00209,</div><div class='del'>-	0x59a01c09, 0x900001c0, 0x800c1d40, 0x832c0400,</div><div class='del'>-	0x00000005, 0x4c1c0000, 0x0201f800, 0x0010383e,</div><div class='del'>-	0x5c003800, 0x481dd809, 0x1c01f000, 0x4031d800,</div><div class='del'>-	0x58ef400b, 0x58ee580d, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x4a03501f,</div><div class='del'>-	0x00000001, 0x4200b000, 0x0000000d, 0x59a0a800,</div><div class='del'>-	0x832ca400, 0x00000005, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x0201f000, 0x00102066, 0x4031d800, 0x58ef400b,</div><div class='del'>-	0x58ee580d, 0x58ec0002, 0x82000580, 0x00000200,</div><div class='del'>-	0x02000000, 0x001020aa, 0x832ca400, 0x00000005,</div><div class='del'>-	0x50500000, 0x82001500, 0x000c0016, 0x02020000,</div><div class='del'>-	0x001020b6, 0x82500c00, 0x00000003, 0x50040000,</div><div class='del'>-	0x82001500, 0x00000001, 0x02020000, 0x001020b6,</div><div class='del'>-	0x50500000, 0x82001500, 0x00000028, 0x0400001d,</div><div class='del'>-	0x82081580, 0x00000028, 0x02020000, 0x001020b6,</div><div class='del'>-	0x80500800, 0x50040000, 0x82001500, 0x00000013,</div><div class='del'>-	0x82081580, 0x00000013, 0x02020000, 0x001020b6,</div><div class='del'>-	0x80040800, 0x50040000, 0x82001500, 0x00010000,</div><div class='del'>-	0x82081580, 0x00010000, 0x02020000, 0x001020b6,</div><div class='del'>-	0x836c0580, 0x00000000, 0x04000012, 0x599c0019,</div><div class='del'>-	0x8c00050e, 0x0402000f, 0x0201f000, 0x001020b6,</div><div class='del'>-	0x80500800, 0x50040000, 0x82001500, 0x00000013,</div><div class='del'>-	0x02020000, 0x001020b6, 0x80040800, 0x50040000,</div><div class='del'>-	0x82001500, 0x00010000, 0x02020000, 0x001020b6,</div><div class='del'>-	0x4200b000, 0x00000008, 0x4200a800, 0x0010b2df,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x0201f000, 0x00102066,</div><div class='del'>-	0x4031d800, 0x58ef400b, 0x58ee580d, 0x58ec0002,</div><div class='del'>-	0x82000580, 0x00000200, 0x02000000, 0x001020aa,</div><div class='del'>-	0x4200b000, 0x00000004, 0x4200a800, 0x0010b6f9,</div><div class='del'>-	0x832ca400, 0x00000005, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x59a80005, 0x84000550, 0x48035005, 0x0201f000,</div><div class='del'>-	0x00102066, 0x0201f800, 0x0010381a, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000002, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x59a00c06, 0x82040500, 0x0000ff00, 0x840001c0,</div><div class='del'>-	0x82001480, 0x00000006, 0x02021000, 0x001020b6,</div><div class='del'>-	0x0c01f001, 0x00102fe7, 0x00102fec, 0x00102ff1,</div><div class='del'>-	0x00102ff1, 0x00102ff1, 0x00102ff3, 0x42000800,</div><div class='del'>-	0x0000000d, 0x4200a000, 0x0010b2e7, 0x0401f00c,</div><div class='del'>-	0x42000800, 0x0000000d, 0x4200a000, 0x0010b2f4,</div><div class='del'>-	0x0401f007, 0x0201f000, 0x001020b6, 0x42000800,</div><div class='del'>-	0x00000008, 0x4200a000, 0x0010b2df, 0x4004b000,</div><div class='del'>-	0x832cac00, 0x00000005, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x59a00207, 0x59a01407, 0x900001c0, 0x80081540,</div><div class='del'>-	0x59a00209, 0x59a01c09, 0x900001c0, 0x800c1d40,</div><div class='del'>-	0x832c0400, 0x00000005, 0x0201f000, 0x00103841,</div><div class='del'>-	0x836c0580, 0x00000000, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000007, 0x0201f000, 0x001020b2, 0x59a01406,</div><div class='del'>-	0x800811c0, 0x04020017, 0x59c40801, 0x82040d00,</div><div class='del'>-	0x00018000, 0x82040580, 0x00000000, 0x04020004,</div><div class='del'>-	0x4a034406, 0x00000000, 0x0401f048, 0x82040580,</div><div class='del'>-	0x00008000, 0x04020004, 0x4a034406, 0x00000001,</div><div class='del'>-	0x0401f042, 0x82040580, 0x00010000, 0x02020800,</div><div class='del'>-	0x00100615, 0x4a034406, 0x00000003, 0x0401f03b,</div><div class='del'>-	0x59a8006f, 0x8c000508, 0x04000005, 0x42000000,</div><div class='del'>-	0x00000001, 0x40000800, 0x0401f003, 0x59a00207,</div><div class='del'>-	0x59a80853, 0x48035053, 0x0201f800, 0x001016ac,</div><div class='del'>-	0x0400000d, 0x0201f800, 0x001016b3, 0x0400000a,</div><div class='del'>-	0x0201f800, 0x001016ba, 0x04000007, 0x0201f800,</div><div class='del'>-	0x001016c1, 0x04000004, 0x48075053, 0x0201f000,</div><div class='del'>-	0x001020b6, 0x82080580, 0x00000002, 0x0402001f,</div><div class='del'>-	0x59c40006, 0x84000500, 0x48038806, 0x0201f800,</div><div class='del'>-	0x00106c32, 0x497b8880, 0x0201f800, 0x0010a7e7,</div><div class='del'>-	0x0201f800, 0x0010a7f5, 0x42000000, 0x0010b6c9,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x82000540, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00104e5d, 0x4a038808, 0x00000000,</div><div class='del'>-	0x4202d800, 0x00000004, 0x42001000, 0x00000001,</div><div class='del'>-	0x0201f800, 0x001019aa, 0x4a035049, 0x00000001,</div><div class='del'>-	0x0201f800, 0x0010071a, 0x0201f000, 0x00102066,</div><div class='del'>-	0x800409c0, 0x04000005, 0x4a034406, 0x00000001,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x836c0580, 0x00000003,</div><div class='del'>-	0x04000005, 0x4a034406, 0x00000007, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x59a28c06, 0x59a0320b, 0x82183500,</div><div class='del'>-	0x000000ff, 0x0201f800, 0x00020267, 0x02020000,</div><div class='del'>-	0x001020b6, 0x83440580, 0x000007fd, 0x04000008,</div><div class='del'>-	0x0201f800, 0x00104836, 0x04000005, 0x42000800,</div><div class='del'>-	0x00000009, 0x0201f000, 0x001020b2, 0x0201f800,</div><div class='del'>-	0x0010381a, 0x04020005, 0x4a034406, 0x00000002,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x497a5a04, 0x4a025c04,</div><div class='del'>-	0x00008000, 0x0201f800, 0x00108ed2, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000003, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x4a01d809, 0x00103097, 0x1c01f000, 0x592c0005,</div><div class='del'>-	0x82000d00, 0x0000ffff, 0x82000500, 0xffff0000,</div><div class='del'>-	0x82000580, 0x01000000, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000004, 0x0201f000, 0x001020b2, 0x80040904,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4c580000, 0x832ca400,</div><div class='del'>-	0x00000005, 0x4050a800, 0x4004b000, 0x0201f800,</div><div class='del'>-	0x0010a94f, 0x5c00b000, 0x5c00a800, 0x5c00a000,</div><div class='del'>-	0x59a00207, 0x59a01407, 0x900001c0, 0x80081540,</div><div class='del'>-	0x59a00209, 0x59a01c09, 0x900001c0, 0x800c1d40,</div><div class='del'>-	0x832c0400, 0x00000005, 0x0201f000, 0x00103841,</div><div class='del'>-	0x496fc857, 0x836c0580, 0x00000000, 0x04000005,</div><div class='del'>-	0x4a034406, 0x0000001a, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x02020800, 0x00103f5c,</div><div class='del'>-	0x42000800, 0x00000020, 0x59a00407, 0x59a01207,</div><div class='del'>-	0x900811c0, 0x80081540, 0x59a00409, 0x59a01a09,</div><div class='del'>-	0x900c19c0, 0x800c1d40, 0x419c0000, 0x49a3c857,</div><div class='del'>-	0x0201f800, 0x0010383e, 0x4a01d809, 0x001030d9,</div><div class='del'>-	0x1c01f000, 0x4833c857, 0x4031d800, 0x58ef400b,</div><div class='del'>-	0x58ec0002, 0x82000580, 0x00000200, 0x02000000,</div><div class='del'>-	0x001020aa, 0x599c0200, 0x800001c0, 0x02000000,</div><div class='del'>-	0x001020b6, 0x59a8006f, 0x8c000504, 0x04020003,</div><div class='del'>-	0x8c000506, 0x04000004, 0x599c0019, 0x8400050c,</div><div class='del'>-	0x48033819, 0x0201f800, 0x001095a3, 0x59a8006f,</div><div class='del'>-	0x8c000502, 0x04000004, 0x599c0017, 0x84000508,</div><div class='del'>-	0x48033817, 0x0201f800, 0x0010393e, 0x04020004,</div><div class='del'>-	0x8c00050a, 0x02020000, 0x001020b6, 0x4803c857,</div><div class='del'>-	0x8c000504, 0x04020004, 0x59c408a3, 0x84040d7a,</div><div class='del'>-	0x480788a3, 0x8c000502, 0x04020004, 0x59c408a3,</div><div class='del'>-	0x84040d08, 0x480788a3, 0x599c0c02, 0x8c000500,</div><div class='del'>-	0x04020004, 0x8c000516, 0x04000012, 0x0401f001,</div><div class='del'>-	0x82041480, 0x0000007f, 0x02021000, 0x001020b6,</div><div class='del'>-	0x82041400, 0x00101eb5, 0x50081000, 0x82081500,</div><div class='del'>-	0x000000ff, 0x8c000500, 0x04020006, 0x480b5010,</div><div class='del'>-	0x42000800, 0x00000003, 0x0201f800, 0x001069af,</div><div class='del'>-	0x599c0019, 0x8c000506, 0x04000003, 0x4a03b805,</div><div class='del'>-	0x90000000, 0x8c00050e, 0x0402000b, 0x59a80806,</div><div class='del'>-	0x8c040d14, 0x04000008, 0x42000800, 0x0010b2df,</div><div class='del'>-	0x50040800, 0x82040d00, 0x00000028, 0x02020000,</div><div class='del'>-	0x001020b6, 0x82000500, 0x00000030, 0x04000003,</div><div class='del'>-	0x80000108, 0x0401f003, 0x42000000, 0x00000002,</div><div class='del'>-	0x48039040, 0x42000800, 0x00000002, 0x82000400,</div><div class='del'>-	0x0010321c, 0x50001000, 0x0201f800, 0x001069af,</div><div class='del'>-	0x599c0201, 0x82000c80, 0x00000100, 0x02001000,</div><div class='del'>-	0x001020b6, 0x82000c80, 0x00000841, 0x02021000,</div><div class='del'>-	0x001020b6, 0x82000500, 0x00000007, 0x02020000,</div><div class='del'>-	0x001020b6, 0x599c0401, 0x80000540, 0x02000000,</div><div class='del'>-	0x001020b6, 0x599c0409, 0x599c0c07, 0x80040c80,</div><div class='del'>-	0x02021000, 0x001020b6, 0x80000040, 0x02000000,</div><div class='del'>-	0x001020b6, 0x599c0209, 0x599c0a07, 0x80040c80,</div><div class='del'>-	0x02021000, 0x001020b6, 0x80000040, 0x02000000,</div><div class='del'>-	0x001020b6, 0x0201f800, 0x0010509d, 0x0201f800,</div><div class='del'>-	0x00104b53, 0x599c0201, 0x48035004, 0x0201f800,</div><div class='del'>-	0x0010133e, 0x599c020a, 0x800001c0, 0x04000003,</div><div class='del'>-	0x4803504d, 0x0401f003, 0x4a03504d, 0x000000c8,</div><div class='del'>-	0x0201f800, 0x0010393e, 0x04000004, 0x0201f800,</div><div class='del'>-	0x00105e18, 0x417a5000, 0x836c0580, 0x00000000,</div><div class='del'>-	0x0402009a, 0x599c0003, 0x599c0804, 0x9c0001c0,</div><div class='del'>-	0x9c0409c0, 0x48035002, 0x48075003, 0x599c1017,</div><div class='del'>-	0x8c08151c, 0x04000006, 0x599c0005, 0x599c0806,</div><div class='del'>-	0x9c0001c0, 0x9c0409c0, 0x0401f003, 0x82000500,</div><div class='del'>-	0xf0ffffff, 0x48035000, 0x48075001, 0x42001000,</div><div class='del'>-	0x0010b2e7, 0x48001000, 0x48041001, 0x42001000,</div><div class='del'>-	0x0010b2f4, 0x48001000, 0x48041001, 0x59a8006f,</div><div class='del'>-	0x8c000508, 0x04020017, 0x8c00050a, 0x04020021,</div><div class='del'>-	0x599c1019, 0x82081500, 0x0000e000, 0x82080580,</div><div class='del'>-	0x00000000, 0x0402000c, 0x4a035053, 0x00000000,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x001018fa,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x00101892,</div><div class='del'>-	0x0401f02b, 0x82080580, 0x00002000, 0x0402000a,</div><div class='del'>-	0x4a035053, 0x00000001, 0x41780000, 0x0201f800,</div><div class='del'>-	0x001018fa, 0x41780000, 0x0201f800, 0x00101892,</div><div class='del'>-	0x0401f01f, 0x82080580, 0x00004000, 0x04020006,</div><div class='del'>-	0x4a035053, 0x00000002, 0x4a035049, 0x00000001,</div><div class='del'>-	0x0401f017, 0x82080580, 0x00006000, 0x02020000,</div><div class='del'>-	0x001020b6, 0x59a80858, 0x82040d80, 0x01391077,</div><div class='del'>-	0x04020005, 0x59e00813, 0x8c040d00, 0x02020000,</div><div class='del'>-	0x001020b6, 0x4a035053, 0x00000003, 0x42000000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x001018fa, 0x42000000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00101892, 0x599c0019,</div><div class='del'>-	0x8c000520, 0x0400000d, 0x42000000, 0x00000004,</div><div class='del'>-	0x42000800, 0x00000040, 0x0201f800, 0x001019b1,</div><div class='del'>-	0x42000000, 0x00000010, 0x42000800, 0x000000c0,</div><div class='del'>-	0x0201f800, 0x001019b1, 0x4a035032, 0x0000aaaa,</div><div class='del'>-	0x599c1018, 0x82081500, 0x00000030, 0x59a8006c,</div><div class='del'>-	0x80000540, 0x0400000c, 0x82080580, 0x00000000,</div><div class='del'>-	0x02000000, 0x001020b6, 0x599c1018, 0x82081500,</div><div class='del'>-	0xffffffcf, 0x82081540, 0x00000010, 0x480b3818,</div><div class='del'>-	0x0401f010, 0x82080d80, 0x00000000, 0x04000007,</div><div class='del'>-	0x82080d80, 0x00000010, 0x0400000a, 0x82080d80,</div><div class='del'>-	0x00000020, 0x04020002, 0x48075032, 0x0201f800,</div><div class='del'>-	0x001038d3, 0x04000008, 0x0201f800, 0x00101668,</div><div class='del'>-	0x0201f800, 0x00101694, 0x59a8002a, 0x80040540,</div><div class='del'>-	0x4803502a, 0x49f3c857, 0x42001000, 0x00104d39,</div><div class='del'>-	0x0201f800, 0x00105cc9, 0x42001000, 0x00104d2c,</div><div class='del'>-	0x0201f800, 0x00105dbd, 0x4a038805, 0xffffffff,</div><div class='del'>-	0x4a03c014, 0x00400040, 0x4a03c013, 0x00400000,</div><div class='del'>-	0x0201f800, 0x00104717, 0x59a0001d, 0x84000540,</div><div class='del'>-	0x4803401d, 0x49f3c857, 0x0201f000, 0x00102066,</div><div class='del'>-	0x00000018, 0x0000000c, 0x00000018, 0x00000020,</div><div class='del'>-	0x836c0580, 0x00000000, 0x04020005, 0x42000800,</div><div class='del'>-	0x00000007, 0x0201f000, 0x001020b2, 0x42000800,</div><div class='del'>-	0x00000020, 0x59a00407, 0x59a01207, 0x900811c0,</div><div class='del'>-	0x80081540, 0x59a00409, 0x59a01a09, 0x900c19c0,</div><div class='del'>-	0x800c1d40, 0x419c0000, 0x0201f000, 0x00103841,</div><div class='del'>-	0x800409c0, 0x04000005, 0x4a034406, 0x00000001,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000016, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x59a80013, 0x8c000500, 0x04000011,</div><div class='del'>-	0x4a034406, 0x00000000, 0x42000800, 0x00000020,</div><div class='del'>-	0x59a00407, 0x59a01207, 0x900811c0, 0x80081540,</div><div class='del'>-	0x59a00409, 0x59a01a09, 0x900c19c0, 0x800c1d40,</div><div class='del'>-	0x42000000, 0x0010bc20, 0x0201f000, 0x00103841,</div><div class='del'>-	0x4a034406, 0x00000001, 0x4200b000, 0x00000020,</div><div class='del'>-	0x4200a800, 0x0010bc20, 0x4200a000, 0xffffffff,</div><div class='del'>-	0x4450a800, 0x8054a800, 0x8058b040, 0x040207fd,</div><div class='del'>-	0x4d440000, 0x4d340000, 0x42028800, 0xffffffff,</div><div class='del'>-	0x42002000, 0xffffffff, 0x42003000, 0x00000001,</div><div class='del'>-	0x42003800, 0x00000001, 0x42001800, 0x0010bc20,</div><div class='del'>-	0x59a81010, 0x82081500, 0x000000ff, 0x40180000,</div><div class='del'>-	0x0c01f001, 0x00103275, 0x00103278, 0x0010327c,</div><div class='del'>-	0x00103280, 0x82102500, 0xffffff00, 0x0401f014,</div><div class='del'>-	0x82102500, 0xffff00ff, 0x840811c0, 0x0401f010,</div><div class='del'>-	0x82102500, 0xff00ffff, 0x900811c0, 0x0401f00c,</div><div class='del'>-	0x82102500, 0x00ffffff, 0x9c0801c0, 0x80102540,</div><div class='del'>-	0x44101800, 0x42003000, 0xffffffff, 0x42002000,</div><div class='del'>-	0xffffffff, 0x800c1800, 0x0401f003, 0x40080000,</div><div class='del'>-	0x80102540, 0x81468800, 0x83442c80, 0x0000007f,</div><div class='del'>-	0x04021014, 0x4c080000, 0x4c0c0000, 0x4c180000,</div><div class='del'>-	0x4c1c0000, 0x0201f800, 0x00020267, 0x5c003800,</div><div class='del'>-	0x5c003000, 0x5c001800, 0x5c001000, 0x040207f2,</div><div class='del'>-	0x0201f800, 0x00104842, 0x040207ef, 0x80183000,</div><div class='del'>-	0x801c3800, 0x59341202, 0x40180000, 0x0c01f7ce,</div><div class='del'>-	0x82100580, 0xffffffff, 0x04000002, 0x44101800,</div><div class='del'>-	0x42001800, 0x0010bc20, 0x500c0000, 0x82000500,</div><div class='del'>-	0xffffff00, 0x801c0540, 0x44001800, 0x5c026800,</div><div class='del'>-	0x5c028800, 0x42000800, 0x00000020, 0x59a00407,</div><div class='del'>-	0x59a01207, 0x900811c0, 0x80081540, 0x59a00409,</div><div class='del'>-	0x59a01a09, 0x900c19c0, 0x800c1d40, 0x42000000,</div><div class='del'>-	0x0010bc20, 0x0201f000, 0x00103841, 0x59a28c06,</div><div class='del'>-	0x59a0020b, 0x8c000500, 0x0400000e, 0x59a01208,</div><div class='del'>-	0x59a00408, 0x82000500, 0x000000ff, 0x900001c0,</div><div class='del'>-	0x80081540, 0x41784000, 0x0201f800, 0x00104768,</div><div class='del'>-	0x04000008, 0x48034406, 0x0201f000, 0x001020b6,</div><div class='del'>-	0x0201f800, 0x00020267, 0x02020000, 0x001020b6,</div><div class='del'>-	0x0201f800, 0x0010381a, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000002, 0x0201f000, 0x001020b2, 0x59a0020b,</div><div class='del'>-	0x8c000500, 0x04000005, 0x0201f800, 0x00104842,</div><div class='del'>-	0x02020000, 0x001038dd, 0x59a0020b, 0x8c000502,</div><div class='del'>-	0x04000019, 0x83440480, 0x000007f0, 0x04021016,</div><div class='del'>-	0x0201f800, 0x0010484b, 0x04020013, 0x497a5a04,</div><div class='del'>-	0x4a025c04, 0x00008000, 0x0201f800, 0x00108ea3,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000003, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x4a01d809, 0x001032f8, 0x1c01f000,</div><div class='del'>-	0x59a28c06, 0x0201f800, 0x00020267, 0x02020000,</div><div class='del'>-	0x001020b6, 0x4c580000, 0x4c500000, 0x4c540000,</div><div class='del'>-	0x4200b000, 0x0000000a, 0x4134a000, 0x832e5c00,</div><div class='del'>-	0x00000002, 0x412ca800, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x832cac00, 0x00000006, 0x4054a000, 0x4200b000,</div><div class='del'>-	0x00000004, 0x0201f800, 0x0010a94f, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c00b000, 0x592c0802, 0x82040500,</div><div class='del'>-	0x00ff00ff, 0x900001c0, 0x82041500, 0xff00ff00,</div><div class='del'>-	0x80080540, 0x48025802, 0x592c0801, 0x82040500,</div><div class='del'>-	0x00ff00ff, 0x900001c0, 0x82041500, 0xff00ff00,</div><div class='del'>-	0x80080540, 0x48025801, 0x42000800, 0x0000000a,</div><div class='del'>-	0x59a00407, 0x59a01207, 0x900811c0, 0x80081540,</div><div class='del'>-	0x59a00409, 0x59a01a09, 0x900c19c0, 0x800c1d40,</div><div class='del'>-	0x412c0000, 0x0201f000, 0x00103841, 0x496fc857,</div><div class='del'>-	0x496f4406, 0x0201f000, 0x00102066, 0x59a28c06,</div><div class='del'>-	0x0201f800, 0x00020267, 0x02020000, 0x001020b6,</div><div class='del'>-	0x836c0580, 0x00000003, 0x04000005, 0x4a034406,</div><div class='del'>-	0x00000007, 0x0201f000, 0x001020b2, 0x83340c00,</div><div class='del'>-	0x00000006, 0x59a0020b, 0x8c000500, 0x04000003,</div><div class='del'>-	0x83340c00, 0x00000008, 0x58040001, 0x48034409,</div><div class='del'>-	0x900001c0, 0x48034209, 0x50040000, 0x48034407,</div><div class='del'>-	0x900001c0, 0x48034207, 0x59340200, 0x48034406,</div><div class='del'>-	0x0201f000, 0x00102066, 0x800409c0, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000001, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x59a0220b, 0x8c102500, 0x0402002e, 0x8c102506,</div><div class='del'>-	0x04020006, 0x59a03208, 0x82180480, 0x00000003,</div><div class='del'>-	0x02021000, 0x001020b6, 0x59a28c06, 0x0201f800,</div><div class='del'>-	0x00020267, 0x02020000, 0x001020b6, 0x0201f800,</div><div class='del'>-	0x00104836, 0x04000005, 0x4a034406, 0x00000009,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x0201f800, 0x0010381a,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000002, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x59a0220b, 0x8c102506, 0x04000004,</div><div class='del'>-	0x59343002, 0x82183500, 0x00ffffff, 0x497a5a04,</div><div class='del'>-	0x4a025c04, 0x00008000, 0x0201f800, 0x00108e65,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000003, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x4a01d809, 0x001033de, 0x1c01f000,</div><div class='del'>-	0x59a28c06, 0x0201f800, 0x00020267, 0x02020000,</div><div class='del'>-	0x001020b6, 0x0201f800, 0x00104836, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000009, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x0201f800, 0x0010381a, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000002, 0x0201f000, 0x001020b2, 0x497a5a04,</div><div class='del'>-	0x4a025c04, 0x00008000, 0x0201f800, 0x0010381a,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000002, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x592e5800, 0x0201f800, 0x00108e7a,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000003, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x4a01d809, 0x001033b0, 0x1c01f000,</div><div class='del'>-	0x592c2805, 0x82140d80, 0x01000000, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000004, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x42000800, 0x00000008, 0x59a00207, 0x59a01407,</div><div class='del'>-	0x900001c0, 0x80081540, 0x59a00209, 0x59a01c09,</div><div class='del'>-	0x900001c0, 0x800c1d40, 0x832c0400, 0x00000005,</div><div class='del'>-	0x0201f800, 0x00103841, 0x8c142d00, 0x04000003,</div><div class='del'>-	0x4a01d809, 0x001033cb, 0x1c01f000, 0x4031d800,</div><div class='del'>-	0x58ef400b, 0x58ee580e, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x812e59c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x42000800, 0x00000008,</div><div class='del'>-	0x832c0400, 0x00000005, 0x58ec1007, 0x58ec1808,</div><div class='del'>-	0x0201f000, 0x00103841, 0x592c0005, 0x82000580,</div><div class='del'>-	0x01000000, 0x04020005, 0x4a034406, 0x00000004,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a00207, 0x59a01407,</div><div class='del'>-	0x900001c0, 0x80081540, 0x59a00209, 0x59a01c09,</div><div class='del'>-	0x900001c0, 0x800c1d40, 0x42000800, 0x00000006,</div><div class='del'>-	0x832c0400, 0x00000006, 0x0201f000, 0x00103841,</div><div class='del'>-	0x59a00a0a, 0x800409c0, 0x02000000, 0x001020b6,</div><div class='del'>-	0x82040480, 0x000000e8, 0x04001003, 0x42000800,</div><div class='del'>-	0x000000e7, 0x59a00207, 0x59a01407, 0x900001c0,</div><div class='del'>-	0x80081540, 0x59a00209, 0x59a01c09, 0x900001c0,</div><div class='del'>-	0x800c1d40, 0x83880400, 0x00000000, 0x0201f800,</div><div class='del'>-	0x00103841, 0x4a01d809, 0x0010340c, 0x1c01f000,</div><div class='del'>-	0x4031d800, 0x58ef400b, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x59a0020b,</div><div class='del'>-	0x8c000500, 0x04000008, 0x83880400, 0x00000000,</div><div class='del'>-	0x4803c840, 0x4a03c842, 0x00000006, 0x04011000,</div><div class='del'>-	0x497b8885, 0x4a034207, 0x000000e7, 0x0201f000,</div><div class='del'>-	0x00102066, 0x800409c0, 0x04000005, 0x4a034406,</div><div class='del'>-	0x00000001, 0x0201f000, 0x001020b2, 0x0401fbf3,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000002, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x497a5a04, 0x4a025c04, 0x00008000,</div><div class='del'>-	0x59a00406, 0x800001c0, 0x02000000, 0x001020b6,</div><div class='del'>-	0x82001580, 0x000000ff, 0x04000005, 0x82001480,</div><div class='del'>-	0x00000004, 0x02021000, 0x001020b6, 0x40001000,</div><div class='del'>-	0x0201f800, 0x00101d6a, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000003, 0x0201f000, 0x001020b2, 0x4a01d809,</div><div class='del'>-	0x00103446, 0x1c01f000, 0x592c0005, 0x82000580,</div><div class='del'>-	0x01000000, 0x02020000, 0x00102066, 0x4a034406,</div><div class='del'>-	0x00000004, 0x0201f000, 0x001020b2, 0x59a01406,</div><div class='del'>-	0x8c081508, 0x04020007, 0x800409c0, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000001, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x59a01c07, 0x820c0480, 0x00001000, 0x02021000,</div><div class='del'>-	0x001020b6, 0x497b2804, 0x497b2805, 0x497b281c,</div><div class='del'>-	0x497b281d, 0x497b281f, 0x497b2820, 0x497b2822,</div><div class='del'>-	0x497b2823, 0x80000580, 0x0201f800, 0x00101668,</div><div class='del'>-	0x59a80805, 0x8c081500, 0x04000004, 0x82040d40,</div><div class='del'>-	0x00000011, 0x0401f004, 0x8c081506, 0x04000002,</div><div class='del'>-	0x84040d42, 0x84040d0a, 0x48075005, 0x4202d800,</div><div class='del'>-	0x00000001, 0x82081500, 0x000000e0, 0x8008010a,</div><div class='del'>-	0x0c020036, 0x0201f800, 0x00104e0d, 0x04020009,</div><div class='del'>-	0x4a035033, 0x00000001, 0x0201f800, 0x00104d76,</div><div class='del'>-	0x0401f01f, 0x4a035033, 0x00000000, 0x0401f7fb,</div><div class='del'>-	0x497b5032, 0x0201f800, 0x00103f5c, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x0201f800, 0x00106c32, 0x0201f800,</div><div class='del'>-	0x00106982, 0x59a00a07, 0x480788a7, 0x59c400a3,</div><div class='del'>-	0x82000500, 0xfeffffff, 0x82000540, 0x80018000,</div><div class='del'>-	0x40000800, 0x84040d20, 0x480388a3, 0x480788a3,</div><div class='del'>-	0x497b504e, 0x42000800, 0x0000002d, 0x42001000,</div><div class='del'>-	0x00103fe4, 0x0201f800, 0x00105ca2, 0x59a00407,</div><div class='del'>-	0x800000c2, 0x800008c4, 0x8005d400, 0x42000000,</div><div class='del'>-	0x0000ffff, 0x0201f800, 0x00104e0d, 0x04000003,</div><div class='del'>-	0x59a00207, 0x80000110, 0x0201f800, 0x00103915,</div><div class='del'>-	0x0201f000, 0x00102066, 0x00103479, 0x0010347c,</div><div class='del'>-	0x00103484, 0x001020b6, 0x00103481, 0x001020b6,</div><div class='del'>-	0x001020b6, 0x001020b6, 0x836c0580, 0x00000003,</div><div class='del'>-	0x04000005, 0x4a034406, 0x00000007, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x59a03c06, 0x59a00407, 0x59a04a07,</div><div class='del'>-	0x902449c0, 0x80244d40, 0x59a00409, 0x59a05209,</div><div class='del'>-	0x902851c0, 0x80285540, 0x0401fb54, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000002, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x417a8800, 0x41783000, 0x497b4001, 0x497b4004,</div><div class='del'>-	0x832c4400, 0x00000005, 0x48234002, 0x8c1c3d04,</div><div class='del'>-	0x04020078, 0x0201f800, 0x00020267, 0x0402002a,</div><div class='del'>-	0x0201f800, 0x00104836, 0x04000004, 0x0201f800,</div><div class='del'>-	0x00104732, 0x04020024, 0x8c1c3d00, 0x04000008,</div><div class='del'>-	0x59340009, 0x44004000, 0x59340008, 0x80204000,</div><div class='del'>-	0x44004000, 0x80204000, 0x0401f007, 0x59340007,</div><div class='del'>-	0x44004000, 0x59340006, 0x80204000, 0x44004000,</div><div class='del'>-	0x80204000, 0x83440580, 0x000007fe, 0x0400000d,</div><div class='del'>-	0x83440580, 0x000007fc, 0x0400000a, 0x0201f800,</div><div class='del'>-	0x00104842, 0x04000003, 0x85468d5e, 0x0401f005,</div><div class='del'>-	0x0201f800, 0x00104686, 0x04020002, 0x85468d5e,</div><div class='del'>-	0x45444000, 0x85468d1e, 0x80204000, 0x82183400,</div><div class='del'>-	0x00000003, 0x81468800, 0x83440480, 0x000007f0,</div><div class='del'>-	0x0400100e, 0x8c1c3d06, 0x04000010, 0x83440580,</div><div class='del'>-	0x000007f0, 0x04020004, 0x42028800, 0x000007fe,</div><div class='del'>-	0x0401f006, 0x83440580, 0x000007ff, 0x04020007,</div><div class='del'>-	0x42028800, 0x000007fc, 0x82180580, 0x0000000f,</div><div class='del'>-	0x0400000b, 0x0401f7c0, 0x801831c0, 0x04020006,</div><div class='del'>-	0x59a00801, 0x800408c4, 0x48074406, 0x0201f000,</div><div class='del'>-	0x00102066, 0x4a034004, 0x00000001, 0x49474000,</div><div class='del'>-	0x59a00001, 0x80180400, 0x48034001, 0x481f4003,</div><div class='del'>-	0x4a01d801, 0x00000000, 0x4819d804, 0x59a00002,</div><div class='del'>-	0x4801d803, 0x4825d807, 0x4829d808, 0x4000a800,</div><div class='del'>-	0x4000a000, 0x4018b000, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x40ec1000, 0x0201f800, 0x001008a1, 0x4a01d809,</div><div class='del'>-	0x00103536, 0x1c01f000, 0x4031d800, 0x58ef400b,</div><div class='del'>-	0x58ec0002, 0x82000580, 0x00000200, 0x02000000,</div><div class='del'>-	0x001020aa, 0x59a00004, 0x80000540, 0x04020008,</div><div class='del'>-	0x59a28800, 0x59a04002, 0x59a03803, 0x41783000,</div><div class='del'>-	0x58ec4807, 0x58ec5008, 0x0401f78f, 0x59a00801,</div><div class='del'>-	0x800408c4, 0x48074406, 0x0201f000, 0x00102066,</div><div class='del'>-	0x0201f800, 0x00020267, 0x0402002f, 0x0201f800,</div><div class='del'>-	0x00104836, 0x04000004, 0x0201f800, 0x00104732,</div><div class='del'>-	0x04020029, 0x83440580, 0x000007fe, 0x04000011,</div><div class='del'>-	0x83440580, 0x000007fc, 0x0400000e, 0x0201f800,</div><div class='del'>-	0x00104842, 0x04000005, 0x59340403, 0x8400055e,</div><div class='del'>-	0x48026c03, 0x0401f007, 0x0201f800, 0x00104686,</div><div class='del'>-	0x04020004, 0x59340403, 0x8400055e, 0x48026c03,</div><div class='del'>-	0x4134a000, 0x4020a800, 0x4200b000, 0x00000006,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x59340007, 0x4400a800,</div><div class='del'>-	0x59340006, 0x4800a801, 0x59340009, 0x4800a802,</div><div class='del'>-	0x59340008, 0x4800a803, 0x59340403, 0x8400051e,</div><div class='del'>-	0x48026c03, 0x82204400, 0x0000000a, 0x82183400,</div><div class='del'>-	0x0000000a, 0x81468800, 0x83440480, 0x000007f0,</div><div class='del'>-	0x0400100e, 0x8c1c3d06, 0x04000010, 0x83440580,</div><div class='del'>-	0x000007f0, 0x04020004, 0x42028800, 0x000007fe,</div><div class='del'>-	0x0401f006, 0x83440580, 0x000007ff, 0x04020007,</div><div class='del'>-	0x42028800, 0x000007fc, 0x82180580, 0x0000000a,</div><div class='del'>-	0x0400000b, 0x0401f7bb, 0x801831c0, 0x04020006,</div><div class='del'>-	0x59a00801, 0x800408c4, 0x48074406, 0x0201f000,</div><div class='del'>-	0x00102066, 0x4a034004, 0x00000001, 0x49474000,</div><div class='del'>-	0x59a00001, 0x80180400, 0x48034001, 0x481f4003,</div><div class='del'>-	0x4a01d801, 0x00000000, 0x4819d804, 0x59a00002,</div><div class='del'>-	0x4801d803, 0x4825d807, 0x4829d808, 0x40ec1000,</div><div class='del'>-	0x0201f800, 0x001008a1, 0x4a01d809, 0x001035ad,</div><div class='del'>-	0x1c01f000, 0x4031d800, 0x58ef400b, 0x58ec0002,</div><div class='del'>-	0x82000580, 0x00000200, 0x02000000, 0x001020aa,</div><div class='del'>-	0x59a00004, 0x80000540, 0x04020008, 0x59a28800,</div><div class='del'>-	0x59a04002, 0x59a03803, 0x41783000, 0x58ec4807,</div><div class='del'>-	0x58ec5008, 0x0401f78f, 0x59a00801, 0x800408c4,</div><div class='del'>-	0x48074406, 0x0201f000, 0x00102066, 0x42002800,</div><div class='del'>-	0x0000007e, 0x59a00c06, 0x59a01207, 0x59a01c07,</div><div class='del'>-	0x59a02209, 0x82040500, 0x0000ff00, 0x840001c0,</div><div class='del'>-	0x82003480, 0x00000020, 0x02001000, 0x001020b6,</div><div class='del'>-	0x80140480, 0x02001000, 0x001020b6, 0x82040500,</div><div class='del'>-	0x000000ff, 0x82003480, 0x00000020, 0x02001000,</div><div class='del'>-	0x001020b6, 0x80140480, 0x02001000, 0x001020b6,</div><div class='del'>-	0x82080500, 0x0000ff00, 0x840001c0, 0x82003480,</div><div class='del'>-	0x00000020, 0x02001000, 0x001020b6, 0x80140480,</div><div class='del'>-	0x02001000, 0x001020b6, 0x82080500, 0x000000ff,</div><div class='del'>-	0x82003480, 0x00000020, 0x02001000, 0x001020b6,</div><div class='del'>-	0x80140480, 0x02001000, 0x001020b6, 0x820c0500,</div><div class='del'>-	0x0000ff00, 0x840001c0, 0x82003480, 0x00000020,</div><div class='del'>-	0x02001000, 0x001020b6, 0x80140480, 0x02001000,</div><div class='del'>-	0x001020b6, 0x820c0500, 0x000000ff, 0x82003480,</div><div class='del'>-	0x00000020, 0x02001000, 0x001020b6, 0x80140480,</div><div class='del'>-	0x02001000, 0x001020b6, 0x82100500, 0x0000ff00,</div><div class='del'>-	0x840001c0, 0x82003480, 0x00000020, 0x02001000,</div><div class='del'>-	0x001020b6, 0x80140480, 0x02001000, 0x001020b6,</div><div class='del'>-	0x82100500, 0x000000ff, 0x82003480, 0x00000020,</div><div class='del'>-	0x02001000, 0x001020b6, 0x80140480, 0x02001000,</div><div class='del'>-	0x001020b6, 0x900401c0, 0x80080d40, 0x900c01c0,</div><div class='del'>-	0x80101d40, 0x83a83400, 0x0000003a, 0x44043000,</div><div class='del'>-	0x80183000, 0x440c3000, 0x0201f000, 0x00102066,</div><div class='del'>-	0x0401f9fa, 0x04020005, 0x4a034406, 0x00000002,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x42000800, 0x0000000c,</div><div class='del'>-	0x0401f853, 0x4a01d809, 0x0010362c, 0x1c01f000,</div><div class='del'>-	0x4031d800, 0x58ee580d, 0x58ef400b, 0x58ec0002,</div><div class='del'>-	0x82000580, 0x00000200, 0x02000000, 0x001020aa,</div><div class='del'>-	0x832ca400, 0x00000004, 0x4200b000, 0x0000000c,</div><div class='del'>-	0x40c8a800, 0x0201f800, 0x0010a93e, 0x58c80200,</div><div class='del'>-	0x80000540, 0x04000034, 0x58c80400, 0x82000500,</div><div class='del'>-	0xfffffffb, 0x04020030, 0x58c80401, 0x80000540,</div><div class='del'>-	0x0400002d, 0x82000480, 0x0000ff01, 0x0402102a,</div><div class='del'>-	0x58c80202, 0x82000480, 0x0000005c, 0x04001026,</div><div class='del'>-	0x0201f800, 0x001060db, 0x58c80c08, 0x58c80204,</div><div class='del'>-	0x80040480, 0x04001020, 0x58c80204, 0x82000480,</div><div class='del'>-	0x00000005, 0x0402101c, 0x58c80205, 0x58c80c08,</div><div class='del'>-	0x80040902, 0x80040480, 0x04001017, 0x58c80c08,</div><div class='del'>-	0x0201f800, 0x0010602a, 0x0400001b, 0x0201f800,</div><div class='del'>-	0x00105ef2, 0x04020012, 0x4979940b, 0x59c408a3,</div><div class='del'>-	0x82040d40, 0x00000002, 0x480788a3, 0x4a038830,</div><div class='del'>-	0x00000001, 0x4a038832, 0x01ffffff, 0x58c80202,</div><div class='del'>-	0x48030804, 0x0201f800, 0x00105ed4, 0x0201f000,</div><div class='del'>-	0x00102066, 0x0201f000, 0x001020b6, 0x0201f800,</div><div class='del'>-	0x0010612d, 0x0201f800, 0x0010613a, 0x0201f800,</div><div class='del'>-	0x0010601d, 0x0201f000, 0x001020b2, 0x4c000000,</div><div class='del'>-	0x59a01207, 0x59a00407, 0x900811c0, 0x80081540,</div><div class='del'>-	0x59a01a09, 0x59a00409, 0x900c19c0, 0x800c1d40,</div><div class='del'>-	0x5c000000, 0x0401f1b9, 0x59840000, 0x82000580,</div><div class='del'>-	0x00000000, 0x04000050, 0x59840002, 0x8c000504,</div><div class='del'>-	0x0400004d, 0x84000546, 0x48030802, 0x0201f800,</div><div class='del'>-	0x0010601d, 0x59c408a3, 0x82040d00, 0xfffffffd,</div><div class='del'>-	0x480788a3, 0x4c5c0000, 0x4200b800, 0x0010aa00,</div><div class='del'>-	0x505e6800, 0x813669c0, 0x04000008, 0x5936600e,</div><div class='del'>-	0x813261c0, 0x04000005, 0x0201f800, 0x0010600e,</div><div class='del'>-	0x02000800, 0x001061e5, 0x805cb800, 0x825c0580,</div><div class='del'>-	0x0010b1f0, 0x040207f3, 0x59866003, 0x813261c0,</div><div class='del'>-	0x0400000b, 0x59300406, 0x82000580, 0x00000009,</div><div class='del'>-	0x02020800, 0x00100615, 0x5930b800, 0x0201f800,</div><div class='del'>-	0x00105ffa, 0x405e6000, 0x0401f7f5, 0x497b0803,</div><div class='del'>-	0x4200b800, 0x0010b317, 0x505e6000, 0x813261c0,</div><div class='del'>-	0x04000011, 0x59300406, 0x82000580, 0x00000009,</div><div class='del'>-	0x0402000d, 0x59300203, 0x82000580, 0x00000004,</div><div class='del'>-	0x04020009, 0x59326809, 0x813669c0, 0x02020800,</div><div class='del'>-	0x00100615, 0x0201f800, 0x00100ee4, 0x0201f800,</div><div class='del'>-	0x00105ffa, 0x4578b800, 0x805cb800, 0x825c0580,</div><div class='del'>-	0x0010b31f, 0x040207e9, 0x42000800, 0x0010b315,</div><div class='del'>-	0x49780801, 0x49780800, 0x0201f800, 0x0010612d,</div><div class='del'>-	0x0201f800, 0x0010613a, 0x5c00b800, 0x0201f800,</div><div class='del'>-	0x00105eed, 0x0201f000, 0x00102066, 0x836c0580,</div><div class='del'>-	0x00000003, 0x04000005, 0x4a034406, 0x00000007,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a00407, 0x59a02207,</div><div class='del'>-	0x901021c0, 0x80102540, 0x59a00409, 0x59a02a09,</div><div class='del'>-	0x901429c0, 0x80142d40, 0x0401f930, 0x04020005,</div><div class='del'>-	0x4a034406, 0x00000002, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x417a8800, 0x41781800, 0x497b4001, 0x497b4003,</div><div class='del'>-	0x832c3400, 0x00000004, 0x481b4002, 0x41440000,</div><div class='del'>-	0x81ac0400, 0x50026800, 0x813669c0, 0x0400000b,</div><div class='del'>-	0x0201f800, 0x00104836, 0x04020008, 0x59340002,</div><div class='del'>-	0x48003000, 0x49443001, 0x82183400, 0x00000002,</div><div class='del'>-	0x820c1c00, 0x00000002, 0x81468800, 0x83440480,</div><div class='del'>-	0x00000800, 0x04000005, 0x820c0480, 0x00000010,</div><div class='del'>-	0x0402100b, 0x0401f7ea, 0x800c19c0, 0x04020006,</div><div class='del'>-	0x59a00801, 0x80040902, 0x48074406, 0x0201f000,</div><div class='del'>-	0x00102066, 0x4a034003, 0x00000001, 0x49474000,</div><div class='del'>-	0x59a00001, 0x800c0400, 0x48034001, 0x40ec1000,</div><div class='del'>-	0x4a001001, 0x00000000, 0x480c1004, 0x59a00002,</div><div class='del'>-	0x48001003, 0x48101007, 0x48141008, 0x0201f800,</div><div class='del'>-	0x001008a1, 0x4a01d809, 0x00103728, 0x1c01f000,</div><div class='del'>-	0x4031d800, 0x58ef400b, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x59a00003,</div><div class='del'>-	0x80000540, 0x04020008, 0x59a28800, 0x59a03002,</div><div class='del'>-	0x41781800, 0x40ec1000, 0x58082007, 0x58082808,</div><div class='del'>-	0x0401f7bf, 0x59a00801, 0x80040902, 0x48074406,</div><div class='del'>-	0x0201f000, 0x00102066, 0x800409c0, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000001, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x59a80026, 0x8c00050a, 0x04020007, 0x8c000506,</div><div class='del'>-	0x04020005, 0x4a034406, 0x00000016, 0x0201f000,</div><div class='del'>-	0x001020b2, 0x0401f8cd, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000002, 0x0201f000, 0x001020b2, 0x59a00c06,</div><div class='del'>-	0x80040902, 0x59a00407, 0x59a01207, 0x900811c0,</div><div class='del'>-	0x80081540, 0x59a00409, 0x59a01a09, 0x900c19c0,</div><div class='del'>-	0x800c1d40, 0x832c0400, 0x00000005, 0x0401f8df,</div><div class='del'>-	0x4a01d809, 0x00103763, 0x1c01f000, 0x4031d800,</div><div class='del'>-	0x58ef400b, 0x58ee580d, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x592c0009,</div><div class='del'>-	0x0201f800, 0x001059b9, 0x02000800, 0x001043fc,</div><div class='del'>-	0x02020000, 0x001020b6, 0x49474001, 0x481a6802,</div><div class='del'>-	0x592c000a, 0x82001d80, 0x70000000, 0x04020007,</div><div class='del'>-	0x0401f8a2, 0x04020011, 0x4a034406, 0x00000002,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x82001d80, 0x72000000,</div><div class='del'>-	0x02020000, 0x001020b6, 0x0401f898, 0x04020897,</div><div class='del'>-	0x04020896, 0x04020005, 0x4a034406, 0x00000002,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x58ee580d, 0x4a025c04,</div><div class='del'>-	0x00008000, 0x497a5a04, 0x592c3208, 0x80183102,</div><div class='del'>-	0x592c1801, 0x4a001805, 0x01000000, 0x0201f800,</div><div class='del'>-	0x00108e8e, 0x04020005, 0x4a034406, 0x00000003,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x4a01d809, 0x0010379d,</div><div class='del'>-	0x1c01f000, 0x592c4000, 0x592c0005, 0x82000580,</div><div class='del'>-	0x01000000, 0x04020005, 0x4a034406, 0x00000004,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x4c580000, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x832c3c00, 0x00000005, 0x401ca000,</div><div class='del'>-	0x401ca800, 0x5820280a, 0x4200b000, 0x00000002,</div><div class='del'>-	0x82143580, 0x70000000, 0x04000003, 0x4200b000,</div><div class='del'>-	0x0000000f, 0x0201f800, 0x0010a94f, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c00b000, 0x401c0000, 0x58201006,</div><div class='del'>-	0x58201807, 0x58202205, 0x80102102, 0x82143580,</div><div class='del'>-	0x70000000, 0x04020008, 0x82103480, 0x00000002,</div><div class='del'>-	0x02001000, 0x001020b6, 0x42000800, 0x00000002,</div><div class='del'>-	0x0401f079, 0x82143580, 0x72000000, 0x02020000,</div><div class='del'>-	0x001020b6, 0x82103480, 0x0000002a, 0x02001000,</div><div class='del'>-	0x001020b6, 0x42000800, 0x0000000f, 0x0401f86e,</div><div class='del'>-	0x4a01d809, 0x001037d7, 0x1c01f000, 0x4031d800,</div><div class='del'>-	0x58ef400b, 0x58ee580e, 0x58ec0002, 0x82000580,</div><div class='del'>-	0x00000200, 0x02000000, 0x001020aa, 0x592e5800,</div><div class='del'>-	0x832c0c00, 0x00000005, 0x4c580000, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x4004a000, 0x4004a800, 0x4200b000,</div><div class='del'>-	0x0000000f, 0x0201f800, 0x0010a94f, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c00b000, 0x40ec1000, 0x4a001001,</div><div class='del'>-	0x00000000, 0x4a001004, 0x0000000f, 0x48041003,</div><div class='del'>-	0x0201f800, 0x001008a1, 0x4a01d809, 0x001037f9,</div><div class='del'>-	0x1c01f000, 0x4031d800, 0x58ef400b, 0x58ee580e,</div><div class='del'>-	0x58ec0002, 0x82000580, 0x00000200, 0x02000000,</div><div class='del'>-	0x001020aa, 0x832c0c00, 0x00000005, 0x4c580000,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4004a000, 0x4004a800,</div><div class='del'>-	0x4200b000, 0x0000000c, 0x0201f800, 0x0010a94f,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x5c00b000, 0x40ec1000,</div><div class='del'>-	0x4a001001, 0x00000000, 0x4a001004, 0x0000000c,</div><div class='del'>-	0x48041003, 0x0201f800, 0x001008a1, 0x4a01d809,</div><div class='del'>-	0x0010205f, 0x1c01f000, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x04000010, 0x497a5800, 0x58ec000d, 0x80000540,</div><div class='del'>-	0x04020004, 0x492dd80d, 0x492dd80e, 0x0401f007,</div><div class='del'>-	0x58ec000e, 0x48025800, 0x82000400, 0x00000001,</div><div class='del'>-	0x452c0000, 0x492dd80e, 0x832c0400, 0x00000004,</div><div class='del'>-	0x492fc857, 0x4803c857, 0x1c01f000, 0x4d2c0000,</div><div class='del'>-	0x58ec400d, 0x802041c0, 0x04000008, 0x4823c857,</div><div class='del'>-	0x40225800, 0x592c4001, 0x497a5801, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x0401f7f8, 0x4979d80d, 0x4979d80e,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x42003000, 0x00000001,</div><div class='del'>-	0x0401f003, 0x42003000, 0x00000000, 0x4803c857,</div><div class='del'>-	0x4807c857, 0x480bc857, 0x480fc857, 0x481bc857,</div><div class='del'>-	0x48efc857, 0x4819d801, 0x800409c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x4805d804, 0x4801d803, 0x4809d807,</div><div class='del'>-	0x480dd808, 0x40ec1000, 0x0201f800, 0x001008a1,</div><div class='del'>-	0x4a01d809, 0x0010205f, 0x1c01f000, 0x80002d80,</div><div class='del'>-	0x480bc857, 0x480fc857, 0x4813c857, 0x4817c857,</div><div class='del'>-	0x4d2c0000, 0x4da00000, 0x42034000, 0x0010b2a0,</div><div class='del'>-	0x59a00017, 0x800001c0, 0x04020013, 0x04006012,</div><div class='del'>-	0x480bc020, 0x480fc021, 0x4813c022, 0x4817c023,</div><div class='del'>-	0x900811c0, 0x82081540, 0x00000012, 0x480bc011,</div><div class='del'>-	0x59e00017, 0x8c000508, 0x04020004, 0x4203e000,</div><div class='del'>-	0x30000001, 0x0401f053, 0x4a03c017, 0x00000002,</div><div class='del'>-	0x0401f7fb, 0x4c040000, 0x4c1c0000, 0x80000800,</div><div class='del'>-	0x48074017, 0x59a0381a, 0x481fc857, 0x801c39c0,</div><div class='del'>-	0x04020027, 0x82000480, 0x0000000a, 0x04021010,</div><div class='del'>-	0x59a00018, 0x80000000, 0x48034018, 0x59a00219,</div><div class='del'>-	0x82000400, 0x00000002, 0x82000c80, 0x00000013,</div><div class='del'>-	0x48034219, 0x04001003, 0x497b4219, 0x41780000,</div><div class='del'>-	0x59a03816, 0x801c3c00, 0x0401f030, 0x4803c856,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000007, 0x492f401a,</div><div class='del'>-	0x492f401b, 0x412c3800, 0x497b421c, 0x497a5813,</div><div class='del'>-	0x0401f026, 0x59880052, 0x80000000, 0x48031052,</div><div class='del'>-	0x59a00017, 0x80000040, 0x48034017, 0x59a00219,</div><div class='del'>-	0x59a03816, 0x801c3c00, 0x0401f01c, 0x59a0021c,</div><div class='del'>-	0x82000400, 0x00000002, 0x82000c80, 0x00000012,</div><div class='del'>-	0x04021004, 0x4803421c, 0x801c3c00, 0x0401f013,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x0402000b, 0x59880052,</div><div class='del'>-	0x80000000, 0x48031052, 0x59a00017, 0x80000040,</div><div class='del'>-	0x48034017, 0x4803c856, 0x59a0021c, 0x801c3c00,</div><div class='del'>-	0x0401f006, 0x492f401a, 0x492c3813, 0x412c3800,</div><div class='del'>-	0x497b421c, 0x497a5813, 0x48083c00, 0x480c3a00,</div><div class='del'>-	0x48103c01, 0x48143a01, 0x5c003800, 0x5c000800,</div><div class='del'>-	0x5c034000, 0x5c025800, 0x1c01f000, 0x480fc857,</div><div class='del'>-	0x4813c857, 0x481bc857, 0x42000000, 0x0010b611,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x801800d0, 0x40002800,</div><div class='del'>-	0x42001000, 0x00008014, 0x0401f786, 0x4c000000,</div><div class='del'>-	0x599c0017, 0x8c000512, 0x5c000000, 0x1c01f000,</div><div class='del'>-	0x4c000000, 0x599c0018, 0x8c00050e, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x59a80821, 0x800409c0, 0x04000005,</div><div class='del'>-	0x4a034406, 0x00000001, 0x0201f000, 0x001020b2,</div><div class='del'>-	0x836c0580, 0x00000003, 0x04000005, 0x4a034406,</div><div class='del'>-	0x00000007, 0x0201f000, 0x001020b2, 0x599c0017,</div><div class='del'>-	0x8c00050a, 0x04000005, 0x4a034406, 0x00000008,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59340405, 0x8c000508,</div><div class='del'>-	0x04020004, 0x8c00050a, 0x02020000, 0x001032e2,</div><div class='del'>-	0x497a5a04, 0x497a5805, 0x4a025c04, 0x00008000,</div><div class='del'>-	0x0201f800, 0x00108f2d, 0x04020005, 0x4a034406,</div><div class='del'>-	0x00000003, 0x0201f000, 0x001020b2, 0x4a01d809,</div><div class='del'>-	0x00103906, 0x1c01f000, 0x592c0005, 0x82000580,</div><div class='del'>-	0x01000000, 0x04020005, 0x4a034406, 0x00000004,</div><div class='del'>-	0x0201f000, 0x001020b2, 0x59a28c06, 0x0201f800,</div><div class='del'>-	0x00020267, 0x02020000, 0x001020b6, 0x0201f000,</div><div class='del'>-	0x001032e2, 0x82001580, 0x0000ffff, 0x04000009,</div><div class='del'>-	0x0201f800, 0x001059b9, 0x02000800, 0x00020267,</div><div class='del'>-	0x0402000c, 0x0201f800, 0x00105ce7, 0x0401f009,</div><div class='del'>-	0x42028800, 0x000007ef, 0x0201f800, 0x00020267,</div><div class='del'>-	0x02000800, 0x00105ce7, 0x81468840, 0x040217fb,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c0c0000, 0x4d340000,</div><div class='del'>-	0x4d440000, 0x42028800, 0x000007fe, 0x0201f800,</div><div class='del'>-	0x00020267, 0x04020009, 0x5934180a, 0x820c1d00,</div><div class='del'>-	0x00000001, 0x820c1d80, 0x00000001, 0x42001000,</div><div class='del'>-	0x0000801b, 0x0401ff1e, 0x5c028800, 0x5c026800,</div><div class='del'>-	0x5c001800, 0x1c01f000, 0x599c0017, 0x8c000508,</div><div class='del'>-	0x1c01f000, 0x48efc857, 0x04011000, 0x48efc840,</div><div class='del'>-	0x4a03c842, 0x00000011, 0x40000000, 0x040117ff,</div><div class='del'>-	0x4a01d80f, 0xbeefbeef, 0x1c01f000, 0x497b4000,</div><div class='del'>-	0x497b4001, 0x497b4002, 0x497b4003, 0x497b4004,</div><div class='del'>-	0x1c01f000, 0x59c400a4, 0x4c580000, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x82000500, 0x0000000f, 0x82000480,</div><div class='del'>-	0x00000007, 0x0400100a, 0x82006c80, 0x00000007,</div><div class='del'>-	0x02021800, 0x00100615, 0x0c01f807, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c00b000, 0x1c01f000, 0x0401f90c,</div><div class='del'>-	0x0401f7fb, 0x0010396c, 0x00103972, 0x00103997,</div><div class='del'>-	0x001039b9, 0x00103a78, 0x0010396b, 0x1c01f000,</div><div class='del'>-	0x59c40806, 0x8c040d00, 0x04020003, 0x84040d40,</div><div class='del'>-	0x48078806, 0x1c01f000, 0x59c40005, 0x8c000534,</div><div class='del'>-	0x02020000, 0x001040ce, 0x4a038805, 0xffffffff,</div><div class='del'>-	0x42006000, 0x00020000, 0x0201f800, 0x001040b2,</div><div class='del'>-	0x59a80015, 0x82000500, 0xfffffffa, 0x84000542,</div><div class='del'>-	0x48035015, 0x497b5026, 0x42000800, 0x0010bc20,</div><div class='del'>-	0x45780800, 0x497b5013, 0x42006000, 0xffefffff,</div><div class='del'>-	0x42006800, 0x40000000, 0x0201f800, 0x001040ad,</div><div class='del'>-	0x59c40006, 0x82000500, 0xffffff0f, 0x48038806,</div><div class='del'>-	0x42000800, 0x00000010, 0x42001000, 0x0010401b,</div><div class='del'>-	0x0201f800, 0x00105cbc, 0x0401f001, 0x42006000,</div><div class='del'>-	0xffffffff, 0x42006800, 0x00800000, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x4200b000, 0x000000c8, 0x59c400a4,</div><div class='del'>-	0x82000500, 0x0000000f, 0x82000580, 0x0000000a,</div><div class='del'>-	0x0400000f, 0x8058b040, 0x040207f9, 0x497b5014,</div><div class='del'>-	0x42006000, 0xbf7fffff, 0x42006800, 0x00018000,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x42006000, 0xfffeffff,</div><div class='del'>-	0x41786800, 0x0201f000, 0x001040ad, 0x497b5014,</div><div class='del'>-	0x4a035012, 0x00000000, 0x80000580, 0x0201f000,</div><div class='del'>-	0x001040b9, 0x4a038805, 0xffffffff, 0x59a80012,</div><div class='del'>-	0x82000c80, 0x00000004, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x001039c4, 0x001039f1, 0x00103a6e,</div><div class='del'>-	0x4803c856, 0x59c400a3, 0x8400051e, 0x480388a3,</div><div class='del'>-	0x4a035012, 0x00000001, 0x59c40008, 0x8400054e,</div><div class='del'>-	0x48038808, 0x0201f800, 0x00104093, 0x42007800,</div><div class='del'>-	0x0010b34a, 0x4a007806, 0x11010000, 0x4200a000,</div><div class='del'>-	0x0010b202, 0x4200a800, 0x0010b351, 0x4200b000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x0010a93e, 0x497b8802,</div><div class='del'>-	0x42000800, 0x00000003, 0x497b504a, 0x0201f800,</div><div class='del'>-	0x00103f8e, 0x4a03504a, 0x00000001, 0x497b5016,</div><div class='del'>-	0x0201f800, 0x001040c0, 0x42006000, 0xffffffff,</div><div class='del'>-	0x42006800, 0x00080000, 0x0201f800, 0x001040ad,</div><div class='del'>-	0x42006000, 0xfff7ffff, 0x41786800, 0x0201f000,</div><div class='del'>-	0x001040ad, 0x59a80016, 0x497b5016, 0x80002540,</div><div class='del'>-	0x0400006a, 0x59c40004, 0x82000500, 0x00000003,</div><div class='del'>-	0x04020075, 0x59a80815, 0x8c040d02, 0x0400004f,</div><div class='del'>-	0x82100580, 0x0000000c, 0x04020053, 0x82100400,</div><div class='del'>-	0x00000018, 0x8000b104, 0x41cc1000, 0x42001800,</div><div class='del'>-	0x0010b34a, 0x50080800, 0x500c0000, 0x80040580,</div><div class='del'>-	0x0402001e, 0x80081000, 0x800c1800, 0x8058b040,</div><div class='del'>-	0x040207f9, 0x0201f800, 0x001040c0, 0x42006000,</div><div class='del'>-	0xffffffff, 0x42006800, 0x00500000, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x4a035012, 0x00000002, 0x4a035014,</div><div class='del'>-	0x00000002, 0x0201f800, 0x0010164b, 0x42000800,</div><div class='del'>-	0x000007d0, 0x42001000, 0x00103f62, 0x0201f800,</div><div class='del'>-	0x00105da7, 0x59a80015, 0x84000506, 0x48035015,</div><div class='del'>-	0x0201f000, 0x00104093, 0x59cc0806, 0x82040d80,</div><div class='del'>-	0x11010000, 0x04020028, 0x59cc0800, 0x82040500,</div><div class='del'>-	0x00ffffff, 0x0400001a, 0x82000580, 0x000000ef,</div><div class='del'>-	0x04020017, 0x59cc0801, 0x82040500, 0x00ffffff,</div><div class='del'>-	0x82000580, 0x000000ef, 0x04020011, 0x83cca400,</div><div class='del'>-	0x00000007, 0x4200a800, 0x0010b202, 0x4200b000,</div><div class='del'>-	0x00000002, 0x50500800, 0x50540000, 0x80040480,</div><div class='del'>-	0x04001007, 0x04020010, 0x8050a000, 0x8054a800,</div><div class='del'>-	0x8058b040, 0x040207f8, 0x0401f00b, 0x59a80015,</div><div class='del'>-	0x84000502, 0x48035015, 0x41cca000, 0x4200a800,</div><div class='del'>-	0x0010b34a, 0x4200b000, 0x00000009, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x0201f800, 0x001040c0, 0x42006000,</div><div class='del'>-	0xffffffff, 0x42006800, 0x00080000, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x42006000, 0xfff7ffff, 0x41786800,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x42006000, 0xffffffff,</div><div class='del'>-	0x42006800, 0x00004000, 0x0201f800, 0x001040ad,</div><div class='del'>-	0x59c40004, 0x82000500, 0x00000003, 0x04020006,</div><div class='del'>-	0x497b5016, 0x42000800, 0x00000003, 0x0201f000,</div><div class='del'>-	0x00103f8e, 0x1c01f000, 0x1c01f000, 0x59a80014,</div><div class='del'>-	0x82006d80, 0x0000000f, 0x04000005, 0x82000580,</div><div class='del'>-	0x0000001b, 0x02020800, 0x00103f53, 0x1c01f000,</div><div class='del'>-	0x59a80015, 0x84000506, 0x48035015, 0x497b504a,</div><div class='del'>-	0x59a80014, 0x82000c80, 0x0000001e, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f001, 0x00103ab6, 0x00103acd,</div><div class='del'>-	0x00103af6, 0x00103b11, 0x00103b34, 0x00103b65,</div><div class='del'>-	0x00103b87, 0x00103bba, 0x00103bdc, 0x00103c00,</div><div class='del'>-	0x00103c3c, 0x00103c63, 0x00103c79, 0x00103c8b,</div><div class='del'>-	0x00103ca3, 0x00103cba, 0x00103cbf, 0x00103ce7,</div><div class='del'>-	0x00103d0a, 0x00103d30, 0x00103d53, 0x00103d86,</div><div class='del'>-	0x00103dc8, 0x00103df2, 0x00103e0a, 0x00103e4a,</div><div class='del'>-	0x00103e63, 0x00103e76, 0x00103e77, 0x4803c856,</div><div class='del'>-	0x4202d800, 0x00000007, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04000007, 0x42006000, 0xffffffd7, 0x41786800,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x0401f00b, 0x59c40006,</div><div class='del'>-	0x82000500, 0xffffff0f, 0x48038806, 0x42001000,</div><div class='del'>-	0x000000f0, 0x0201f800, 0x001019aa, 0x0201f800,</div><div class='del'>-	0x00104d6c, 0x1c01f000, 0x4803c856, 0x42006000,</div><div class='del'>-	0xbf7fffff, 0x42006800, 0x00400000, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x0201f800, 0x0010164b, 0x4a035014,</div><div class='del'>-	0x00000001, 0x42001000, 0x0010401b, 0x0201f800,</div><div class='del'>-	0x00105cdd, 0x0201f800, 0x00104024, 0x42000800,</div><div class='del'>-	0x000007d0, 0x42001000, 0x00103f62, 0x0201f000,</div><div class='del'>-	0x00105da7, 0x59a80016, 0x82000580, 0x00000014,</div><div class='del'>-	0x04020023, 0x4803c857, 0x42006000, 0xffbfffff,</div><div class='del'>-	0x41786800, 0x0201f800, 0x001040ad, 0x59c40004,</div><div class='del'>-	0x82000500, 0x00000003, 0x04020019, 0x42001000,</div><div class='del'>-	0x00103f62, 0x0201f800, 0x00105cc9, 0x59cc1006,</div><div class='del'>-	0x82081580, 0x11020000, 0x04020012, 0x59cc1007,</div><div class='del'>-	0x8c08153e, 0x0400000b, 0x59a80015, 0x8c000504,</div><div class='del'>-	0x04020008, 0x42000000, 0x0010b63d, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59a80015, 0x84000544, 0x48035015,</div><div class='del'>-	0x4a035014, 0x00000010, 0x0401f1cd, 0x1c01f000,</div><div class='del'>-	0x0201f000, 0x00103f53, 0x4803c856, 0x4a035014,</div><div class='del'>-	0x00000003, 0x42006000, 0xbf3fffff, 0x42006800,</div><div class='del'>-	0x00100000, 0x0201f800, 0x001040ad, 0x42001000,</div><div class='del'>-	0x0010401b, 0x0201f800, 0x00105cdd, 0x0201f800,</div><div class='del'>-	0x00104024, 0x42001000, 0x00103f62, 0x0201f800,</div><div class='del'>-	0x00105cc9, 0x42007800, 0x0010b350, 0x46007800,</div><div class='del'>-	0x11020000, 0x42000800, 0x00000005, 0x0201f000,</div><div class='del'>-	0x00103f8e, 0x59a80016, 0x80000540, 0x0400001e,</div><div class='del'>-	0x4803c857, 0x42001000, 0x00103f62, 0x0201f800,</div><div class='del'>-	0x00105cc9, 0x59a80016, 0x82000580, 0x00000014,</div><div class='del'>-	0x04020016, 0x59cc1006, 0x82081580, 0x11020000,</div><div class='del'>-	0x04020012, 0x59cc1007, 0x8c08153e, 0x0400000b,</div><div class='del'>-	0x59a80015, 0x8c000504, 0x04020008, 0x42000000,</div><div class='del'>-	0x0010b63d, 0x0201f800, 0x0010a86e, 0x59a80015,</div><div class='del'>-	0x84000544, 0x48035015, 0x4a035014, 0x00000004,</div><div class='del'>-	0x0401f004, 0x1c01f000, 0x0201f000, 0x00103f53,</div><div class='del'>-	0x4803c856, 0x4a035014, 0x00000005, 0x83cca400,</div><div class='del'>-	0x00000006, 0x4200a800, 0x0010b350, 0x4200b000,</div><div class='del'>-	0x00000005, 0x0201f800, 0x0010a93e, 0x42007800,</div><div class='del'>-	0x0010b350, 0x46007800, 0x11030000, 0x0201f800,</div><div class='del'>-	0x00103f58, 0x04020014, 0x59a80015, 0x8c000500,</div><div class='del'>-	0x04020011, 0x59a80810, 0x82040580, 0x00ffffff,</div><div class='del'>-	0x0400000d, 0x82040d00, 0x000000ff, 0x82040400,</div><div class='del'>-	0x00101eb5, 0x50000800, 0x80040910, 0x42001000,</div><div class='del'>-	0x00000004, 0x0401fb95, 0x0400000b, 0x0201f800,</div><div class='del'>-	0x0010403d, 0x4200b000, 0x00000004, 0x83cca400,</div><div class='del'>-	0x00000007, 0x4200a800, 0x0010b351, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x42000800, 0x00000005, 0x0201f000,</div><div class='del'>-	0x00103f8e, 0x59a80016, 0x80000540, 0x0400001e,</div><div class='del'>-	0x4803c857, 0x42001000, 0x00103f62, 0x0201f800,</div><div class='del'>-	0x00105cc9, 0x59a80016, 0x82000580, 0x00000014,</div><div class='del'>-	0x04020016, 0x59cc1006, 0x82081580, 0x11030000,</div><div class='del'>-	0x04020012, 0x59cc1007, 0x8c08153e, 0x0400000b,</div><div class='del'>-	0x59a80015, 0x8c000504, 0x04020008, 0x42000000,</div><div class='del'>-	0x0010b63d, 0x0201f800, 0x0010a86e, 0x59a80015,</div><div class='del'>-	0x84000544, 0x48035015, 0x4a035014, 0x00000006,</div><div class='del'>-	0x0401f003, 0x1c01f000, 0x0401f3cd, 0x4803c856,</div><div class='del'>-	0x4a035014, 0x00000007, 0x83cca400, 0x00000006,</div><div class='del'>-	0x4200a800, 0x0010b350, 0x4200b000, 0x00000005,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x42007800, 0x0010b350,</div><div class='del'>-	0x46007800, 0x11040000, 0x0401fbc2, 0x04020020,</div><div class='del'>-	0x59a80015, 0x8c000500, 0x0402001d, 0x599c0017,</div><div class='del'>-	0x8c000500, 0x0400001a, 0x599c1402, 0x82080480,</div><div class='del'>-	0x0000007f, 0x02021800, 0x00100615, 0x4c080000,</div><div class='del'>-	0x82081400, 0x00101eb5, 0x50081000, 0x82081500,</div><div class='del'>-	0x000000ff, 0x480b5010, 0x42000800, 0x00000003,</div><div class='del'>-	0x0201f800, 0x001069af, 0x5c000800, 0x42001000,</div><div class='del'>-	0x00000004, 0x0401fb39, 0x04000005, 0x0401fd25,</div><div class='del'>-	0x04000003, 0x0201f800, 0x00101668, 0x42000800,</div><div class='del'>-	0x00000005, 0x0401f3d5, 0x59a80016, 0x80000540,</div><div class='del'>-	0x0400001e, 0x4803c857, 0x42001000, 0x00103f62,</div><div class='del'>-	0x0201f800, 0x00105cc9, 0x59a80016, 0x82000580,</div><div class='del'>-	0x00000014, 0x04020016, 0x59cc1006, 0x82081580,</div><div class='del'>-	0x11040000, 0x04020012, 0x59cc1007, 0x8c08153e,</div><div class='del'>-	0x0400000b, 0x59a80015, 0x8c000504, 0x04020008,</div><div class='del'>-	0x42000000, 0x0010b63d, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x59a80015, 0x84000544, 0x48035015, 0x4a035014,</div><div class='del'>-	0x00000008, 0x0401f003, 0x1c01f000, 0x0401f378,</div><div class='del'>-	0x4803c856, 0x4a035014, 0x00000009, 0x83cca400,</div><div class='del'>-	0x00000006, 0x4200a800, 0x0010b350, 0x4200b000,</div><div class='del'>-	0x00000005, 0x0201f800, 0x0010a93e, 0x42007800,</div><div class='del'>-	0x0010b350, 0x46007800, 0x11050100, 0x0401fb6d,</div><div class='del'>-	0x0402000a, 0x59a80015, 0x8c000500, 0x04020007,</div><div class='del'>-	0x0401fa88, 0x04020005, 0x82000540, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00101668, 0x42000800, 0x00000005,</div><div class='del'>-	0x0401fb96, 0x4d3c0000, 0x42027800, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00109640, 0x5c027800, 0x1c01f000,</div><div class='del'>-	0x59a80016, 0x80000540, 0x04000038, 0x4803c857,</div><div class='del'>-	0x42001000, 0x00103f62, 0x0201f800, 0x00105cc9,</div><div class='del'>-	0x59a80016, 0x82000580, 0x00000014, 0x04020030,</div><div class='del'>-	0x59cc1006, 0x82080500, 0x11050000, 0x82000580,</div><div class='del'>-	0x11050000, 0x0402002a, 0x8c081510, 0x04000014,</div><div class='del'>-	0x59cc1007, 0x8c08153e, 0x0400000b, 0x59a80015,</div><div class='del'>-	0x8c000504, 0x04020008, 0x42000000, 0x0010b63d,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x59a80015, 0x84000544,</div><div class='del'>-	0x48035015, 0x4a035013, 0x00000001, 0x4a035014,</div><div class='del'>-	0x0000000a, 0x0401f817, 0x0401f014, 0x80000540,</div><div class='del'>-	0x04020013, 0x59cc1007, 0x8c08153e, 0x0400000b,</div><div class='del'>-	0x59a80015, 0x8c000504, 0x04020008, 0x42000000,</div><div class='del'>-	0x0010b63d, 0x0201f800, 0x0010a86e, 0x59a80015,</div><div class='del'>-	0x84000544, 0x48035015, 0x497b5013, 0x4a035014,</div><div class='del'>-	0x0000000e, 0x0401f06a, 0x1c01f000, 0x0401f318,</div><div class='del'>-	0x4803c856, 0x4a035014, 0x0000000b, 0x42001000,</div><div class='del'>-	0x0010b351, 0x4008a800, 0x4200b000, 0x00000020,</div><div class='del'>-	0x4600a800, 0xffffffff, 0x8054a800, 0x8058b040,</div><div class='del'>-	0x040207fc, 0x42007800, 0x0010b350, 0x46007800,</div><div class='del'>-	0x11060000, 0x42001000, 0x0010b351, 0x0401fb09,</div><div class='del'>-	0x04000005, 0x50080000, 0x46001000, 0x00ffffff,</div><div class='del'>-	0x0401f00c, 0x50080800, 0x82040d00, 0x0000ffff,</div><div class='del'>-	0x59a80010, 0x82000500, 0x000000ff, 0x82000540,</div><div class='del'>-	0x00000100, 0x800000e0, 0x80040d40, 0x44041000,</div><div class='del'>-	0x42000800, 0x00000021, 0x0401f32c, 0x59a80016,</div><div class='del'>-	0x80000540, 0x04000012, 0x4803c857, 0x59a80016,</div><div class='del'>-	0x42001000, 0x00103f62, 0x0201f800, 0x00105cc9,</div><div class='del'>-	0x59a80016, 0x82000580, 0x00000084, 0x04020009,</div><div class='del'>-	0x59cc1006, 0x82081580, 0x11060000, 0x04020005,</div><div class='del'>-	0x4a035014, 0x0000000c, 0x0401f003, 0x1c01f000,</div><div class='del'>-	0x0401f2db, 0x4803c856, 0x4a035014, 0x0000000d,</div><div class='del'>-	0x83cca400, 0x00000006, 0x4200a800, 0x0010b350,</div><div class='del'>-	0x4200b000, 0x00000021, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x42007800, 0x0010b350, 0x46007800, 0x11070000,</div><div class='del'>-	0x42000800, 0x00000021, 0x0401f304, 0x59a80016,</div><div class='del'>-	0x80000540, 0x04000014, 0x4803c857, 0x59a80016,</div><div class='del'>-	0x42001000, 0x00103f62, 0x0201f800, 0x00105cc9,</div><div class='del'>-	0x82000580, 0x00000084, 0x0402000c, 0x59cc1006,</div><div class='del'>-	0x82081580, 0x11070000, 0x04020008, 0x4a035013,</div><div class='del'>-	0x00000001, 0x0401fa91, 0x4a035014, 0x0000000e,</div><div class='del'>-	0x0401f003, 0x1c01f000, 0x0401f2b1, 0x4803c856,</div><div class='del'>-	0x82040d40, 0x00000001, 0x0201f800, 0x001040b9,</div><div class='del'>-	0x4a035014, 0x0000000f, 0x497b5016, 0x42006000,</div><div class='del'>-	0xffffffff, 0x42006800, 0x00300000, 0x0401fbfe,</div><div class='del'>-	0x42006000, 0xffdfffff, 0x41786800, 0x0401fbfa,</div><div class='del'>-	0x42000800, 0x000007d0, 0x42001000, 0x00103f62,</div><div class='del'>-	0x0201f000, 0x00105ca2, 0x4803c856, 0x59a80016,</div><div class='del'>-	0x80000540, 0x04020296, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4a035014, 0x00000011, 0x83cca400, 0x00000006,</div><div class='del'>-	0x4200a800, 0x0010b350, 0x4200b000, 0x00000005,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x4200a800, 0x0010b350,</div><div class='del'>-	0x4600a800, 0x11020000, 0x0401fa8a, 0x04020015,</div><div class='del'>-	0x59a80010, 0x82000d00, 0xffff0000, 0x04000011,</div><div class='del'>-	0x82000500, 0x000000ff, 0x0400000e, 0x82000c00,</div><div class='del'>-	0x00101eb5, 0x50040800, 0x80040910, 0x82040580,</div><div class='del'>-	0x0000007e, 0x04000007, 0x82040580, 0x00000080,</div><div class='del'>-	0x04000004, 0x42001000, 0x00000004, 0x0401fa07,</div><div class='del'>-	0x42000800, 0x00000005, 0x0401f2a8, 0x59a80016,</div><div class='del'>-	0x80000540, 0x04000020, 0x4803c857, 0x42001000,</div><div class='del'>-	0x00103f62, 0x0201f800, 0x00105cc9, 0x59a80016,</div><div class='del'>-	0x82000580, 0x00000014, 0x04020016, 0x59cc1006,</div><div class='del'>-	0x82081580, 0x11030000, 0x04020012, 0x59cc1007,</div><div class='del'>-	0x8c08153e, 0x0400000b, 0x59a80015, 0x8c000504,</div><div class='del'>-	0x04020008, 0x42000000, 0x0010b63d, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59a80015, 0x84000544, 0x48035015,</div><div class='del'>-	0x4a035014, 0x00000012, 0x0401f804, 0x0401f002,</div><div class='del'>-	0x0401fa4b, 0x1c01f000, 0x4803c856, 0x4a035014,</div><div class='del'>-	0x00000013, 0x83cca400, 0x00000006, 0x4200a800,</div><div class='del'>-	0x0010b350, 0x4200b000, 0x00000005, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x4200a800, 0x0010b350, 0x4600a800,</div><div class='del'>-	0x11030000, 0x0401fa3f, 0x04020013, 0x59a80015,</div><div class='del'>-	0x8c000500, 0x04020010, 0x59a80810, 0x82040580,</div><div class='del'>-	0x00ffffff, 0x0400000c, 0x82040d00, 0x000000ff,</div><div class='del'>-	0x82040400, 0x00101eb5, 0x50000800, 0x80040910,</div><div class='del'>-	0x42001000, 0x00000004, 0x0401f9c0, 0x04000002,</div><div class='del'>-	0x0401fb11, 0x42000800, 0x00000005, 0x0401f25f,</div><div class='del'>-	0x59a80016, 0x80000540, 0x04000020, 0x4803c857,</div><div class='del'>-	0x42001000, 0x00103f62, 0x0201f800, 0x00105cc9,</div><div class='del'>-	0x59a80016, 0x82000580, 0x00000014, 0x04020016,</div><div class='del'>-	0x59cc1006, 0x82081580, 0x11040000, 0x04020012,</div><div class='del'>-	0x59cc1007, 0x8c08153e, 0x0400000b, 0x59a80015,</div><div class='del'>-	0x8c000504, 0x04020008, 0x42000000, 0x0010b63d,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x59a80015, 0x84000544,</div><div class='del'>-	0x48035015, 0x4a035014, 0x00000014, 0x0401f804,</div><div class='del'>-	0x0401f002, 0x0401fa02, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4a035014, 0x00000015, 0x83cca400, 0x00000006,</div><div class='del'>-	0x4200a800, 0x0010b350, 0x4200b000, 0x00000005,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x4200a800, 0x0010b350,</div><div class='del'>-	0x4600a800, 0x11040000, 0x0401f9f6, 0x04020020,</div><div class='del'>-	0x59a80015, 0x8c000500, 0x0402001d, 0x599c0017,</div><div class='del'>-	0x8c000500, 0x0400001a, 0x599c1402, 0x82080480,</div><div class='del'>-	0x0000007f, 0x02021800, 0x00100615, 0x4c080000,</div><div class='del'>-	0x82081400, 0x00101eb5, 0x50081000, 0x82081500,</div><div class='del'>-	0x000000ff, 0x480b5010, 0x42000800, 0x00000003,</div><div class='del'>-	0x0201f800, 0x001069af, 0x5c000800, 0x42001000,</div><div class='del'>-	0x00000004, 0x0401f96d, 0x04000005, 0x0201f800,</div><div class='del'>-	0x001038d8, 0x02020800, 0x00101668, 0x42000800,</div><div class='del'>-	0x00000005, 0x0401f209, 0x59a80016, 0x80000540,</div><div class='del'>-	0x0400003f, 0x4803c857, 0x42001000, 0x00103f62,</div><div class='del'>-	0x0201f800, 0x00105cc9, 0x59a80016, 0x82000580,</div><div class='del'>-	0x00000014, 0x04020035, 0x59cc1006, 0x82080500,</div><div class='del'>-	0x11050000, 0x82000580, 0x11050000, 0x0402002f,</div><div class='del'>-	0x8c081510, 0x04000010, 0x0401fb1f, 0x59cc1007,</div><div class='del'>-	0x8c08153e, 0x0400000b, 0x59a80015, 0x8c000504,</div><div class='del'>-	0x04020008, 0x42000000, 0x0010b63d, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59a80015, 0x84000544, 0x48035015,</div><div class='del'>-	0x0401f013, 0x59cc1007, 0x8c08153e, 0x0400000b,</div><div class='del'>-	0x59a80015, 0x8c000504, 0x04020008, 0x42000000,</div><div class='del'>-	0x0010b63d, 0x0201f800, 0x0010a86e, 0x59a80015,</div><div class='del'>-	0x84000544, 0x48035015, 0x82000540, 0x00000001,</div><div class='del'>-	0x0401fb01, 0x497b5013, 0x0401f003, 0x4a035013,</div><div class='del'>-	0x00000001, 0x59cc1007, 0x8c08153c, 0x04000003,</div><div class='del'>-	0x4a035026, 0x00000008, 0x4a035014, 0x00000016,</div><div class='del'>-	0x0401f804, 0x0401f002, 0x0401f98d, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x83cca400, 0x00000006, 0x4200a800,</div><div class='del'>-	0x0010b350, 0x4200b000, 0x00000005, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x4a035014, 0x00000017, 0x59a80013,</div><div class='del'>-	0x8c000500, 0x04000006, 0x42001000, 0x0010b350,</div><div class='del'>-	0x46001000, 0x11050100, 0x0401f003, 0x4a035014,</div><div class='del'>-	0x0000001b, 0x0401f97b, 0x0402000a, 0x59a80015,</div><div class='del'>-	0x8c000500, 0x04020007, 0x0401f896, 0x04020005,</div><div class='del'>-	0x82000540, 0x00000001, 0x0201f800, 0x00101668,</div><div class='del'>-	0x42000800, 0x00000005, 0x0401f9a4, 0x4d3c0000,</div><div class='del'>-	0x42027800, 0x00000001, 0x0201f800, 0x00109640,</div><div class='del'>-	0x5c027800, 0x1c01f000, 0x59a80016, 0x80000540,</div><div class='del'>-	0x04000015, 0x4803c857, 0x42001000, 0x00103f62,</div><div class='del'>-	0x0201f800, 0x00105cc9, 0x59a80016, 0x82000580,</div><div class='del'>-	0x00000084, 0x0402000b, 0x59cc1006, 0x82081580,</div><div class='del'>-	0x11060000, 0x04020007, 0x80000580, 0x0401fab6,</div><div class='del'>-	0x4a035014, 0x00000018, 0x0401f804, 0x0401f002,</div><div class='del'>-	0x0401f94b, 0x1c01f000, 0x4803c856, 0x4a035014,</div><div class='del'>-	0x00000019, 0x83cca400, 0x00000006, 0x4200a800,</div><div class='del'>-	0x0010b350, 0x4200b000, 0x00000021, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x42003800, 0x0010b351, 0x0401f941,</div><div class='del'>-	0x04020018, 0x401c2800, 0x50141000, 0x80080130,</div><div class='del'>-	0x80000000, 0x40001800, 0x82081500, 0x00ffffff,</div><div class='del'>-	0x800000f0, 0x80080540, 0x44002800, 0x59a80810,</div><div class='del'>-	0x82040d00, 0x000000ff, 0x400c1000, 0x80081104,</div><div class='del'>-	0x82082400, 0x0010b351, 0x50101000, 0x820c0500,</div><div class='del'>-	0x00000003, 0x0c01f806, 0x80081540, 0x44082000,</div><div class='del'>-	0x42000800, 0x00000021, 0x0401f15c, 0x00103e37,</div><div class='del'>-	0x00103e3c, 0x00103e41, 0x00103e46, 0x800408f0,</div><div class='del'>-	0x40040000, 0x82081500, 0x00ffffff, 0x1c01f000,</div><div class='del'>-	0x800408e0, 0x40040000, 0x82081500, 0xff00ffff,</div><div class='del'>-	0x1c01f000, 0x800408d0, 0x40040000, 0x82081500,</div><div class='del'>-	0xffff00ff, 0x1c01f000, 0x40040000, 0x82081500,</div><div class='del'>-	0xffffff00, 0x1c01f000, 0x59a80016, 0x80000540,</div><div class='del'>-	0x04000016, 0x4803c857, 0x42001000, 0x00103f62,</div><div class='del'>-	0x0201f800, 0x00105cc9, 0x59a80016, 0x82000580,</div><div class='del'>-	0x00000084, 0x0402000c, 0x59cc1006, 0x82081580,</div><div class='del'>-	0x11070000, 0x04020008, 0x4a035013, 0x00000001,</div><div class='del'>-	0x0401f8d2, 0x4a035014, 0x0000001a, 0x0401f804,</div><div class='del'>-	0x0401f002, 0x0401f8f2, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401fa54, 0x4a035014, 0x0000001b,</div><div class='del'>-	0x83cca400, 0x00000006, 0x4200a800, 0x0010b350,</div><div class='del'>-	0x59a82016, 0x40100000, 0x8000b104, 0x40580800,</div><div class='del'>-	0x5450a800, 0x8050a000, 0x8054a800, 0x8058b040,</div><div class='del'>-	0x040207fc, 0x0401f119, 0x1c01f000, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x42003000, 0x00000004, 0x42004000,</div><div class='del'>-	0x0010b351, 0x599c2817, 0x8c142d14, 0x0402001f,</div><div class='del'>-	0x42001000, 0x00000003, 0x40200000, 0x80080400,</div><div class='del'>-	0x50000800, 0x82042580, 0xffffffff, 0x04020005,</div><div class='del'>-	0x80081040, 0x80183040, 0x040207f8, 0x0401f05e,</div><div class='del'>-	0x800811c0, 0x04020006, 0x82042580, 0x3fffffff,</div><div class='del'>-	0x04000058, 0x82040d40, 0xc0000000, 0x4200b000,</div><div class='del'>-	0x00000020, 0x42001800, 0x00000001, 0x40042000,</div><div class='del'>-	0x80102102, 0x04021021, 0x800c18c2, 0x8058b040,</div><div class='del'>-	0x040207fc, 0x0401f04b, 0x41781000, 0x40200000,</div><div class='del'>-	0x80080400, 0x50000800, 0x82042580, 0xffffffff,</div><div class='del'>-	0x04020005, 0x80081000, 0x80183040, 0x040207f8,</div><div class='del'>-	0x0401f040, 0x800811c0, 0x04020003, 0x82040d40,</div><div class='del'>-	0xc0000000, 0x4200b000, 0x00000001, 0x42001800,</div><div class='del'>-	0x80000000, 0x40042000, 0x801020c2, 0x04021007,</div><div class='del'>-	0x800c1902, 0x8058b000, 0x82580480, 0x00000021,</div><div class='del'>-	0x040017fa, 0x0401f02f, 0x40200000, 0x80082400,</div><div class='del'>-	0x50100000, 0x800c0540, 0x44002000, 0x59a80015,</div><div class='del'>-	0x84000540, 0x48035015, 0x40580000, 0x42002800,</div><div class='del'>-	0x00000020, 0x80142c80, 0x40080000, 0x42003800,</div><div class='del'>-	0x00000003, 0x801c0480, 0x800000ca, 0x80142d40,</div><div class='del'>-	0x82144c00, 0x00101eb5, 0x50242800, 0x82142d00,</div><div class='del'>-	0x000000ff, 0x48175010, 0x4c040000, 0x40140800,</div><div class='del'>-	0x0201f800, 0x00101655, 0x5c000800, 0x40001800,</div><div class='del'>-	0x500c0000, 0x80100540, 0x44001800, 0x59a80015,</div><div class='del'>-	0x84000540, 0x48035015, 0x4200a800, 0x0010b351,</div><div class='del'>-	0x4020a000, 0x4200b000, 0x00000004, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x82000540, 0x00000001, 0x0401f002,</div><div class='del'>-	0x80000580, 0x1c01f000, 0x4807c857, 0x480bc857,</div><div class='del'>-	0x4008b000, 0x83cca400, 0x00000007, 0x4200a800,</div><div class='del'>-	0x0010b351, 0x40541000, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x40041800, 0x41782000, 0x42000000, 0x00000003,</div><div class='del'>-	0x820c1c80, 0x00000020, 0x04001004, 0x80102000,</div><div class='del'>-	0x80000040, 0x0401f7fb, 0x40041800, 0x801021c0,</div><div class='del'>-	0x04000005, 0x820c1c80, 0x00000020, 0x80102040,</div><div class='del'>-	0x040207fd, 0x42002000, 0x00000001, 0x800c19c0,</div><div class='del'>-	0x04000004, 0x801020c2, 0x800c1840, 0x040207fe,</div><div class='del'>-	0x80083c00, 0x83cc2c00, 0x00000007, 0x80142c00,</div><div class='del'>-	0x50140000, 0x80102d00, 0x04020012, 0x80100540,</div><div class='del'>-	0x44003800, 0x82042400, 0x00101eb5, 0x50102800,</div><div class='del'>-	0x82142d00, 0x000000ff, 0x48175010, 0x4c040000,</div><div class='del'>-	0x40140800, 0x0201f800, 0x00101655, 0x5c000800,</div><div class='del'>-	0x59a80015, 0x84000540, 0x48035015, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x4807c856, 0x42001000, 0x00008017,</div><div class='del'>-	0x59a8184e, 0x0201f800, 0x0010a876, 0x0201f800,</div><div class='del'>-	0x00103857, 0x1c01f000, 0x4807c856, 0x4200b000,</div><div class='del'>-	0x00000020, 0x83cca400, 0x00000007, 0x4200a800,</div><div class='del'>-	0x0010bc20, 0x0201f000, 0x0010a94f, 0x4807c856,</div><div class='del'>-	0x0201f800, 0x00106c32, 0x42000800, 0x000000f7,</div><div class='del'>-	0x0401f8f4, 0x497b2804, 0x497b2805, 0x497b281c,</div><div class='del'>-	0x497b281d, 0x4202d800, 0x00000001, 0x42006000,</div><div class='del'>-	0xbf7fffff, 0x42006800, 0x00018000, 0x0401f966,</div><div class='del'>-	0x42006000, 0xfffeffff, 0x41786800, 0x0401f962,</div><div class='del'>-	0x497b504e, 0x42000800, 0x0000002d, 0x42001000,</div><div class='del'>-	0x00103fe4, 0x0201f000, 0x00105ca2, 0x4807c856,</div><div class='del'>-	0x0401ffe3, 0x497b5014, 0x497b5016, 0x1c01f000,</div><div class='del'>-	0x4807c856, 0x59a80005, 0x8c000506, 0x1c01f000,</div><div class='del'>-	0x4807c856, 0x42006000, 0xffffffff, 0x42006800,</div><div class='del'>-	0x00000028, 0x0401f14c, 0x4807c856, 0x0401ffc2,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x4df00000, 0x0201f800,</div><div class='del'>-	0x00106b71, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x59c400a4, 0x82000500, 0x0000000f, 0x82000580,</div><div class='del'>-	0x00000002, 0x0402000a, 0x42006000, 0xffffffff,</div><div class='del'>-	0x42006800, 0x00200000, 0x0401f937, 0x42006000,</div><div class='del'>-	0xffdfffff, 0x41786800, 0x0401f933, 0x497b5014,</div><div class='del'>-	0x42000800, 0x000000f7, 0x0401f8b2, 0x59c400a3,</div><div class='del'>-	0x82000500, 0xbf20bfff, 0x82000540, 0x0001c000,</div><div class='del'>-	0x480388a3, 0x84000520, 0x480388a3, 0x497b504e,</div><div class='del'>-	0x42000800, 0x0000002d, 0x42001000, 0x00103fe4,</div><div class='del'>-	0x0201f000, 0x00105ca2, 0x497b5016, 0x59b400f5,</div><div class='del'>-	0x8c000500, 0x04020004, 0x82000540, 0x00000001,</div><div class='del'>-	0x480368f5, 0x800400c4, 0x82000400, 0x00002000,</div><div class='del'>-	0x4803910a, 0x59b400f6, 0x82000500, 0x00000018,</div><div class='del'>-	0x040207fd, 0x4a0368f0, 0x0010b349, 0x42000000,</div><div class='del'>-	0x0010b350, 0x4c040000, 0x50000800, 0x82040d80,</div><div class='del'>-	0x11010000, 0x04000003, 0x50000800, 0x4807c857,</div><div class='del'>-	0x5c000800, 0x480368f1, 0x82040400, 0x0000dc00,</div><div class='del'>-	0x480368f3, 0x59c400a4, 0x82000500, 0x0000000f,</div><div class='del'>-	0x82000580, 0x00000008, 0x04020017, 0x4c5c0000,</div><div class='del'>-	0x4c600000, 0x59c4b805, 0x8c5cbd3a, 0x04020005,</div><div class='del'>-	0x42000000, 0x0010b616, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4a038805, 0x02000000, 0x0201f800, 0x00101a59,</div><div class='del'>-	0x4000c000, 0x0201f800, 0x001019d0, 0x4202d800,</div><div class='del'>-	0x00000001, 0x497b5014, 0x5c00c000, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x59c8010b, 0x8c000502, 0x040007e2,</div><div class='del'>-	0x59c408a4, 0x82040d00, 0x0000000f, 0x82040d80,</div><div class='del'>-	0x0000000b, 0x04020005, 0x59a80814, 0x82040d40,</div><div class='del'>-	0x00002000, 0x0401f004, 0x59a80812, 0x82040d40,</div><div class='del'>-	0x00001000, 0x4807504e, 0x59a8084a, 0x800409c0,</div><div class='del'>-	0x04020007, 0x42000800, 0x000007d0, 0x42001000,</div><div class='del'>-	0x00103f62, 0x0201f800, 0x00105da7, 0x1c01f000,</div><div class='del'>-	0x4807c856, 0x0401ff40, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x0201f800, 0x00106b71, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x59c400a4, 0x82000500,</div><div class='del'>-	0x0000000f, 0x82000580, 0x00000002, 0x0402000a,</div><div class='del'>-	0x42006000, 0xffffffff, 0x42006800, 0x00200000,</div><div class='del'>-	0x0401f8b5, 0x42006000, 0xffdfffff, 0x41786800,</div><div class='del'>-	0x0401f8b1, 0x0201f800, 0x00104e13, 0x04000014,</div><div class='del'>-	0x0201f800, 0x00104e23, 0x04020011, 0x4a035032,</div><div class='del'>-	0x0000aaaa, 0x4c040000, 0x0201f800, 0x00101694,</div><div class='del'>-	0x59a8002a, 0x82000500, 0xffff0000, 0x80040540,</div><div class='del'>-	0x4803502a, 0x5c000800, 0x4a035033, 0x00000000,</div><div class='del'>-	0x0201f800, 0x00104d76, 0x0401f008, 0x4a03504c,</div><div class='del'>-	0x00000005, 0x42000000, 0x00000001, 0x0201f800,</div><div class='del'>-	0x001015fa, 0x0401ff1e, 0x1c01f000, 0x0401f809,</div><div class='del'>-	0x42006000, 0xbf7f7fff, 0x41786800, 0x0401f08e,</div><div class='del'>-	0x42006000, 0xbf7f7fff, 0x41786800, 0x0401f08a,</div><div class='del'>-	0x0201f800, 0x00104e23, 0x04020009, 0x59c40006,</div><div class='del'>-	0x82000540, 0x000000f0, 0x48038806, 0x42006000,</div><div class='del'>-	0xbfffffff, 0x41786800, 0x0401f87f, 0x1c01f000,</div><div class='del'>-	0x800408d0, 0x59a80015, 0x8c000506, 0x04000006,</div><div class='del'>-	0x59a80010, 0x82000500, 0x000000ff, 0x80040540,</div><div class='del'>-	0x0401f003, 0x82040540, 0x000000f7, 0x480388a7,</div><div class='del'>-	0x1c01f000, 0x4807c856, 0x42000000, 0x0010b639,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42003000, 0x00000005,</div><div class='del'>-	0x4d3c0000, 0x4c180000, 0x42003000, 0x0000000d,</div><div class='del'>-	0x42027800, 0x00000002, 0x0401f038, 0x4807c856,</div><div class='del'>-	0x42000000, 0x0010b66a, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x42003000, 0x00000000, 0x4d3c0000, 0x4c180000,</div><div class='del'>-	0x42003000, 0x0000000f, 0x42027800, 0x00000002,</div><div class='del'>-	0x0401f02a, 0x4807c856, 0x42000000, 0x0010b669,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42003000, 0x00000003,</div><div class='del'>-	0x4d3c0000, 0x4c180000, 0x42003000, 0x0000000e,</div><div class='del'>-	0x42027800, 0x00000202, 0x0401f01c, 0x4807c856,</div><div class='del'>-	0x42000000, 0x0010b668, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x42003000, 0x00000004, 0x4d3c0000, 0x4c180000,</div><div class='del'>-	0x42003000, 0x00000010, 0x42027800, 0x00000202,</div><div class='del'>-	0x0401f00e, 0x4807c856, 0x42000000, 0x0010b63c,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42003000, 0x00000001,</div><div class='del'>-	0x4d3c0000, 0x4c180000, 0x42003000, 0x0000000c,</div><div class='del'>-	0x42027800, 0x00000202, 0x42001800, 0x0000ffff,</div><div class='del'>-	0x42002000, 0x00000007, 0x0201f800, 0x001038c7,</div><div class='del'>-	0x5c003000, 0x4d400000, 0x0201f800, 0x0010a784,</div><div class='del'>-	0x42028000, 0x0000002a, 0x0201f800, 0x00101d90,</div><div class='del'>-	0x5c028000, 0x5c027800, 0x1c01f000, 0x4807c856,</div><div class='del'>-	0x04011000, 0x4a03c840, 0x0010b349, 0x4a03c842,</div><div class='del'>-	0x00000040, 0x40000000, 0x040117ff, 0x42007800,</div><div class='del'>-	0x0010b349, 0x46007800, 0x00000011, 0x803c7800,</div><div class='del'>-	0x4a007800, 0x220000ef, 0x4a007801, 0x000000ef,</div><div class='del'>-	0x4a007802, 0x01380000, 0x4a007803, 0x00000000,</div><div class='del'>-	0x4a007804, 0xffffffff, 0x4a007805, 0x00000000,</div><div class='del'>-	0x1c01f000, 0x59c400a3, 0x80300500, 0x80340540,</div><div class='del'>-	0x480388a3, 0x1c01f000, 0x4833c857, 0x59c400a3,</div><div class='del'>-	0x80300540, 0x480388a3, 0x80300580, 0x480388a3,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x04000004, 0x4a03504b,</div><div class='del'>-	0x00000001, 0x0401f002, 0x497b504b, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x59c80002, 0x80000540, 0x0400000a,</div><div class='del'>-	0x80000040, 0x04000008, 0x4a039005, 0x00000140,</div><div class='del'>-	0x42000000, 0x00000006, 0x80000040, 0x040207ff,</div><div class='del'>-	0x0401f7f4, 0x1c01f000, 0x4c5c0000, 0x4c600000,</div><div class='del'>-	0x59c4b805, 0x485fc856, 0x8c5cbd3a, 0x04020005,</div><div class='del'>-	0x42000000, 0x0010b616, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4a038805, 0x02000000, 0x0201f800, 0x00101a59,</div><div class='del'>-	0x4000c000, 0x0201f800, 0x001019d0, 0x4a038805,</div><div class='del'>-	0x04000000, 0x5c00c000, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x497a6a00, 0x4a026c00, 0x00000707, 0x497a6801,</div><div class='del'>-	0x497a6808, 0x497a6809, 0x497a6806, 0x497a6807,</div><div class='del'>-	0x497a6c0b, 0x497a680c, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04020006, 0x5934080f, 0x59340010, 0x80040540,</div><div class='del'>-	0x02020800, 0x00100615, 0x4a026a04, 0x00000100,</div><div class='del'>-	0x497a6a03, 0x59340402, 0x82000500, 0x000000ff,</div><div class='del'>-	0x48026c02, 0x497a6c04, 0x497a6a05, 0x497a6c05,</div><div class='del'>-	0x497a6811, 0x4d2c0000, 0x5934000d, 0x49466c03,</div><div class='del'>-	0x80025d40, 0x04000004, 0x0201f800, 0x00100843,</div><div class='del'>-	0x497a680d, 0x5c025800, 0x599c0401, 0x48026a0b,</div><div class='del'>-	0x599c0208, 0x48026c12, 0x4a02680a, 0x00006000,</div><div class='del'>-	0x0201f000, 0x00104acf, 0x42000000, 0x00000005,</div><div class='del'>-	0x80000d80, 0x0401f02d, 0x0201f800, 0x00104858,</div><div class='del'>-	0x04020017, 0x59a80026, 0x8c00050a, 0x04020010,</div><div class='del'>-	0x59340212, 0x82000500, 0x0000ff00, 0x4803c857,</div><div class='del'>-	0x0400000b, 0x59340a00, 0x8c040d1e, 0x02000000,</div><div class='del'>-	0x000201f8, 0x42000000, 0x00000029, 0x42000800,</div><div class='del'>-	0x00001000, 0x492fc857, 0x0401f018, 0x492fc857,</div><div class='del'>-	0x42000000, 0x00000028, 0x0401f012, 0x59a80805,</div><div class='del'>-	0x8c040d02, 0x04020003, 0x8c040d00, 0x04000004,</div><div class='del'>-	0x42000000, 0x00000004, 0x0401f00a, 0x42000000,</div><div class='del'>-	0x00000029, 0x59340a00, 0x8c040d1e, 0x04000005,</div><div class='del'>-	0x492fc857, 0x42000800, 0x00001000, 0x0401f003,</div><div class='del'>-	0x492fc857, 0x80000d80, 0x4803c857, 0x80028540,</div><div class='del'>-	0x1c01f000, 0x4803c857, 0x59a80005, 0x8c000500,</div><div class='del'>-	0x040207ec, 0x0201f800, 0x00104836, 0x040207e4,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x040007e1, 0x0201f000,</div><div class='del'>-	0x000201f8, 0x0201f800, 0x00104639, 0x040007bf,</div><div class='del'>-	0x0201f000, 0x000201fc, 0x592c0206, 0x492fc857,</div><div class='del'>-	0x82000d80, 0x000007ff, 0x04020006, 0x4a025c0a,</div><div class='del'>-	0x00000030, 0x42026800, 0x0010b320, 0x0401f021,</div><div class='del'>-	0x82000c80, 0x000007f0, 0x04021046, 0x81ac0400,</div><div class='del'>-	0x50000000, 0x80026d40, 0x04000038, 0x0201f800,</div><div class='del'>-	0x00104732, 0x04020038, 0x592c040a, 0x8c00050a,</div><div class='del'>-	0x04020014, 0x592e6009, 0x83300480, 0x0010cfc0,</div><div class='del'>-	0x0400103b, 0x41580000, 0x81300480, 0x04021038,</div><div class='del'>-	0x59300c06, 0x82040580, 0x00000009, 0x04020037,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x497a5800, 0x59300008,</div><div class='del'>-	0x80000540, 0x04020018, 0x492e6008, 0x0401f010,</div><div class='del'>-	0x0201f800, 0x00020892, 0x04000019, 0x592c0206,</div><div class='del'>-	0x49366009, 0x492e6008, 0x4a026406, 0x00000009,</div><div class='del'>-	0x497a6015, 0x49325809, 0x82000d80, 0x000007ff,</div><div class='del'>-	0x04020003, 0x4a026015, 0x00008000, 0x42027000,</div><div class='del'>-	0x00000043, 0x0201f800, 0x000208d8, 0x80000580,</div><div class='del'>-	0x0401f020, 0x40000800, 0x58040000, 0x80000d40,</div><div class='del'>-	0x040207fd, 0x492c0800, 0x0401f01a, 0x42000000,</div><div class='del'>-	0x0000002c, 0x0401f016, 0x42000000, 0x00000028,</div><div class='del'>-	0x0401f013, 0x59a80805, 0x82040500, 0x00000003,</div><div class='del'>-	0x04000004, 0x42000000, 0x00000004, 0x0401f00c,</div><div class='del'>-	0x42000000, 0x00000029, 0x0401f009, 0x42000000,</div><div class='del'>-	0x00000008, 0x0401f006, 0x82040580, 0x00000007,</div><div class='del'>-	0x040207fb, 0x42000000, 0x00000005, 0x80000540,</div><div class='del'>-	0x1c01f000, 0x492fc857, 0x592e8c06, 0x83440d80,</div><div class='del'>-	0x000007fc, 0x04000004, 0x83440480, 0x000007f0,</div><div class='del'>-	0x04021014, 0x0201f800, 0x00020267, 0x04020011,</div><div class='del'>-	0x0201f800, 0x00104842, 0x04020011, 0x0201f800,</div><div class='del'>-	0x00020892, 0x0400001c, 0x49366009, 0x492e6008,</div><div class='del'>-	0x4a026406, 0x0000000a, 0x42027000, 0x00000040,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x80000580, 0x0401f011,</div><div class='del'>-	0x42000000, 0x00000028, 0x0401f00d, 0x0201f800,</div><div class='del'>-	0x00104858, 0x040007fb, 0x59a80805, 0x82040d00,</div><div class='del'>-	0x00000003, 0x04000004, 0x42000000, 0x00000004,</div><div class='del'>-	0x0401f003, 0x42000000, 0x00000029, 0x80000540,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0000002c, 0x0401f7fc,</div><div class='del'>-	0x492fc857, 0x592e8c06, 0x4947c857, 0x83440c80,</div><div class='del'>-	0x00000800, 0x42000000, 0x0000000a, 0x0402119c,</div><div class='del'>-	0x592c4207, 0x4823c857, 0x82200500, 0x0000000f,</div><div class='del'>-	0x0c01f001, 0x00104205, 0x0010428d, 0x001042dd,</div><div class='del'>-	0x001042e8, 0x001042f3, 0x00104201, 0x00104201,</div><div class='del'>-	0x00104201, 0x00104303, 0x00104361, 0x00104386,</div><div class='del'>-	0x00104201, 0x00104201, 0x00104201, 0x00104201,</div><div class='del'>-	0x00104201, 0x4803c857, 0x42000000, 0x0000000c,</div><div class='del'>-	0x0401f183, 0x592c1008, 0x82081500, 0x00ffffff,</div><div class='del'>-	0x59a80010, 0x80084d80, 0x42000000, 0x00000010,</div><div class='del'>-	0x0400017b, 0x0201f800, 0x00104768, 0x04000036,</div><div class='del'>-	0x4803c857, 0x82004d80, 0x0000001d, 0x0402001a,</div><div class='del'>-	0x0201f800, 0x00105439, 0x59340405, 0x4c000000,</div><div class='del'>-	0x0201f800, 0x00104836, 0x5c000000, 0x04000004,</div><div class='del'>-	0x8c20450a, 0x04000028, 0x80000580, 0x44002800,</div><div class='del'>-	0x59340008, 0x48002802, 0x59340009, 0x48002801,</div><div class='del'>-	0x59340006, 0x48002804, 0x59340007, 0x48002803,</div><div class='del'>-	0x4200b000, 0x00000005, 0x0201f800, 0x00109328,</div><div class='del'>-	0x0401f18c, 0x4803c857, 0x82004d80, 0x0000001a,</div><div class='del'>-	0x04020003, 0x40101000, 0x0401f15c, 0x4803c857,</div><div class='del'>-	0x82004d80, 0x0000001b, 0x04020003, 0x40181000,</div><div class='del'>-	0x0401f156, 0x4803c857, 0x82004d80, 0x0000001c,</div><div class='del'>-	0x04000157, 0x82004d80, 0x00000019, 0x42000000,</div><div class='del'>-	0x0000000a, 0x04000146, 0x42000000, 0x0000000a,</div><div class='del'>-	0x0402015d, 0x59a8006f, 0x8c000502, 0x0400001b,</div><div class='del'>-	0x0201f800, 0x00104836, 0x04000018, 0x59340212,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x42001000, 0x00000010,</div><div class='del'>-	0x0402000c, 0x42001000, 0x00000008, 0x59a80026,</div><div class='del'>-	0x8c000506, 0x04020009, 0x59340002, 0x82000500,</div><div class='del'>-	0x00ff0000, 0x82000580, 0x00ff0000, 0x04000007,</div><div class='del'>-	0x0201f800, 0x00104ada, 0x42000000, 0x0000001c,</div><div class='del'>-	0x40181000, 0x0402012d, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000137, 0x49366009, 0x492e6008, 0x4a026406,</div><div class='del'>-	0x00000001, 0x8c20450a, 0x04000004, 0x592c0404,</div><div class='del'>-	0x8400055c, 0x48025c04, 0x4c200000, 0x4d3c0000,</div><div class='del'>-	0x42027800, 0x00001800, 0x0201f800, 0x00101de2,</div><div class='del'>-	0x5c027800, 0x5c004000, 0x8c204512, 0x0400000b,</div><div class='del'>-	0x599c0018, 0x8c000518, 0x04000008, 0x592c0009,</div><div class='del'>-	0x82000500, 0x00000380, 0x5934080a, 0x80040d40,</div><div class='del'>-	0x84040d54, 0x4806680a, 0x417a7800, 0x0401f93a,</div><div class='del'>-	0x42000800, 0x00000003, 0x0401f941, 0x42027000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x000208d8, 0x80000580,</div><div class='del'>-	0x0401f130, 0x0201f800, 0x00020267, 0x04020112,</div><div class='del'>-	0x0201f800, 0x0010483c, 0x0400000c, 0x0201f800,</div><div class='del'>-	0x00104836, 0x04020112, 0x4c600000, 0x4178c000,</div><div class='del'>-	0x42027800, 0x00001800, 0x417a6000, 0x0201f800,</div><div class='del'>-	0x00101e48, 0x5c00c000, 0x59a8006f, 0x8c000502,</div><div class='del'>-	0x0400001b, 0x0201f800, 0x00104836, 0x04000018,</div><div class='del'>-	0x59340212, 0x82000500, 0x0000ff00, 0x42001000,</div><div class='del'>-	0x00000010, 0x0402000c, 0x42001000, 0x00000008,</div><div class='del'>-	0x59a80026, 0x8c000506, 0x04020009, 0x59340002,</div><div class='del'>-	0x82000500, 0x00ff0000, 0x82000580, 0x00ff0000,</div><div class='del'>-	0x04000007, 0x0201f800, 0x00104ada, 0x42000000,</div><div class='del'>-	0x0000001c, 0x40181000, 0x040200d4, 0x0201f800,</div><div class='del'>-	0x00020892, 0x040000de, 0x5934080a, 0x8c204512,</div><div class='del'>-	0x0400000c, 0x599c0018, 0x8c000518, 0x04000009,</div><div class='del'>-	0x592c0009, 0x82000500, 0x00000380, 0x82041500,</div><div class='del'>-	0xfffffc7f, 0x80080d40, 0x84040d54, 0x0401f002,</div><div class='del'>-	0x84040d14, 0x4806680a, 0x49366009, 0x492e6008,</div><div class='del'>-	0x4a026406, 0x00000001, 0x417a7800, 0x0401f8ea,</div><div class='del'>-	0x42000800, 0x00000005, 0x0401f8f1, 0x42027000,</div><div class='del'>-	0x00000003, 0x0201f800, 0x000208d8, 0x80000580,</div><div class='del'>-	0x0401f0e0, 0x0201f800, 0x00020267, 0x040200c2,</div><div class='del'>-	0x0201f800, 0x0010484b, 0x040200c5, 0x0201f800,</div><div class='del'>-	0x001092e0, 0x040000b6, 0x80000580, 0x0401f0d5,</div><div class='del'>-	0x0201f800, 0x00020267, 0x040200b7, 0x0201f800,</div><div class='del'>-	0x0010484b, 0x040200ba, 0x0201f800, 0x00108ea3,</div><div class='del'>-	0x040000ab, 0x80000580, 0x0401f0ca, 0x0201f800,</div><div class='del'>-	0x00020267, 0x040200ac, 0x83444d80, 0x000007fe,</div><div class='del'>-	0x42000000, 0x0000000a, 0x0402008d, 0x0201f800,</div><div class='del'>-	0x00104836, 0x040200aa, 0x0201f800, 0x001092f8,</div><div class='del'>-	0x0400009b, 0x80000580, 0x0401f0ba, 0x82200500,</div><div class='del'>-	0x00000070, 0x04020005, 0x8c20450e, 0x42000000,</div><div class='del'>-	0x0000000c, 0x0402007e, 0x8c20450a, 0x0400000d,</div><div class='del'>-	0x4d3c0000, 0x42027800, 0x00001000, 0x8c20450e,</div><div class='del'>-	0x04020002, 0x853e7d56, 0x82200500, 0x000000a0,</div><div class='del'>-	0x0201f800, 0x00104822, 0x5c027800, 0x0401f0a1,</div><div class='del'>-	0x8c204508, 0x04020024, 0x592c1008, 0x82081500,</div><div class='del'>-	0x00ffffff, 0x59a80010, 0x80084d80, 0x42000000,</div><div class='del'>-	0x00000010, 0x04000066, 0x0201f800, 0x00104768,</div><div class='del'>-	0x0400002b, 0x4803c857, 0x82004d80, 0x0000001a,</div><div class='del'>-	0x04020003, 0x40101000, 0x0401f064, 0x4803c857,</div><div class='del'>-	0x82004d80, 0x0000001b, 0x04020003, 0x40181000,</div><div class='del'>-	0x0401f05e, 0x4803c857, 0x82004d80, 0x0000001c,</div><div class='del'>-	0x0400005f, 0x82004d80, 0x00000019, 0x42000000,</div><div class='del'>-	0x0000000a, 0x0400004e, 0x42000000, 0x0000000a,</div><div class='del'>-	0x0401f065, 0x0201f800, 0x00020267, 0x04020062,</div><div class='del'>-	0x4d3c0000, 0x42027800, 0x00001000, 0x8c20450e,</div><div class='del'>-	0x04020002, 0x853e7d56, 0x82200500, 0x00000090,</div><div class='del'>-	0x0201f800, 0x0010480a, 0x5c027800, 0x42000000,</div><div class='del'>-	0x0000000a, 0x0402003a, 0x0401f06a, 0x836c0580,</div><div class='del'>-	0x00000003, 0x42000800, 0x00000007, 0x04020006,</div><div class='del'>-	0x0201f800, 0x0010928e, 0x04000007, 0x80000580,</div><div class='del'>-	0x0401f064, 0x0201f800, 0x00104871, 0x04000059,</div><div class='del'>-	0x0401f05c, 0x0201f800, 0x00104871, 0x0400003c,</div><div class='del'>-	0x0401f058, 0x0201f800, 0x00020267, 0x0402003e,</div><div class='del'>-	0x836c0580, 0x00000003, 0x04020048, 0x8c204508,</div><div class='del'>-	0x0400000a, 0x4c600000, 0x4178c000, 0x42027800,</div><div class='del'>-	0x00001800, 0x417a6000, 0x0201f800, 0x00101e48,</div><div class='del'>-	0x5c00c000, 0x0401f047, 0x0201f800, 0x0010483c,</div><div class='del'>-	0x0400000c, 0x0201f800, 0x00104836, 0x04020030,</div><div class='del'>-	0x4c600000, 0x4178c000, 0x42027800, 0x00001800,</div><div class='del'>-	0x417a6000, 0x0201f800, 0x00101e48, 0x5c00c000,</div><div class='del'>-	0x480bc856, 0x0201f800, 0x001090f8, 0x04000018,</div><div class='del'>-	0x80000580, 0x0401f037, 0x0401f7db, 0x480bc857,</div><div class='del'>-	0x42000800, 0x00000019, 0x40001000, 0x4200b000,</div><div class='del'>-	0x00000002, 0x0401f00a, 0x480bc857, 0x40000800,</div><div class='del'>-	0x4200b000, 0x00000002, 0x0401f005, 0x480bc857,</div><div class='del'>-	0x40000800, 0x4200b000, 0x00000001, 0x480bc857,</div><div class='del'>-	0x42028000, 0x00000031, 0x0401f020, 0x480bc857,</div><div class='del'>-	0x42000800, 0x00000003, 0x4200b000, 0x00000001,</div><div class='del'>-	0x0401f7f7, 0x480bc857, 0x42000800, 0x0000000a,</div><div class='del'>-	0x4200b000, 0x00000001, 0x0401f7f1, 0x480bc857,</div><div class='del'>-	0x42000800, 0x00000009, 0x40001000, 0x4200b000,</div><div class='del'>-	0x00000002, 0x0401f7ea, 0x480bc857, 0x42000800,</div><div class='del'>-	0x00000007, 0x4200b000, 0x00000001, 0x0401f7e4,</div><div class='del'>-	0x480bc857, 0x4200b000, 0x00000001, 0x0401f7e0,</div><div class='del'>-	0x80028580, 0x4178b000, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x4937c857, 0x59326809, 0x59341200,</div><div class='del'>-	0x813e79c0, 0x04000003, 0x84081540, 0x0401f002,</div><div class='del'>-	0x84081500, 0x480a6a00, 0x1c01f000, 0x59326809,</div><div class='del'>-	0x5c000000, 0x4c000000, 0x4803c857, 0x4937c857,</div><div class='del'>-	0x82040580, 0x00000006, 0x04020004, 0x42000000,</div><div class='del'>-	0x00000606, 0x0401f021, 0x82040580, 0x00000004,</div><div class='del'>-	0x04020004, 0x42000000, 0x00000404, 0x0401f01b,</div><div class='del'>-	0x82040580, 0x00000007, 0x42000000, 0x00000707,</div><div class='del'>-	0x04000016, 0x82040580, 0x00000003, 0x42000000,</div><div class='del'>-	0x00000703, 0x04000011, 0x82040580, 0x00000005,</div><div class='del'>-	0x42000000, 0x00000405, 0x0400000c, 0x82040580,</div><div class='del'>-	0x00000009, 0x42000000, 0x00000409, 0x04000007,</div><div class='del'>-	0x82040580, 0x0000000b, 0x42000000, 0x0000070b,</div><div class='del'>-	0x02020800, 0x00100615, 0x4803c857, 0x48026c00,</div><div class='del'>-	0x82040d80, 0x00000006, 0x04020005, 0x59341404,</div><div class='del'>-	0x800811c0, 0x02000800, 0x00100615, 0x1c01f000,</div><div class='del'>-	0x5c000000, 0x4c000000, 0x4803c857, 0x4947c857,</div><div class='del'>-	0x481bc857, 0x83440480, 0x00000800, 0x04021034,</div><div class='del'>-	0x83441400, 0x0010aa00, 0x50080000, 0x80026d40,</div><div class='del'>-	0x04020011, 0x4c180000, 0x4d2c0000, 0x0201f800,</div><div class='del'>-	0x00100819, 0x412e6800, 0x5c025800, 0x5c003000,</div><div class='del'>-	0x04000027, 0x45341000, 0x497a680d, 0x497a6810,</div><div class='del'>-	0x497a680f, 0x497a680e, 0x4c180000, 0x0401fccd,</div><div class='del'>-	0x5c003000, 0x59340a12, 0x4c040000, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x5c000800, 0x04000009, 0x82180500,</div><div class='del'>-	0x00ffff00, 0x04000008, 0x59a81010, 0x82081500,</div><div class='del'>-	0x00ffff00, 0x80080580, 0x04000003, 0x80000580,</div><div class='del'>-	0x0401f004, 0x82180500, 0x000000ff, 0x800000d0,</div><div class='del'>-	0x80040d80, 0x04000003, 0x4803c857, 0x48026a12,</div><div class='del'>-	0x59340002, 0x80180580, 0x04000003, 0x481bc857,</div><div class='del'>-	0x481a6802, 0x80000580, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f7fc, 0x4947c857,</div><div class='del'>-	0x83440480, 0x00000800, 0x04021011, 0x83441400,</div><div class='del'>-	0x0010aa00, 0x50080000, 0x80026d40, 0x0400000b,</div><div class='del'>-	0x0401fbf2, 0x0402000a, 0x59a80005, 0x8c000502,</div><div class='del'>-	0x04000004, 0x59340200, 0x8c00050e, 0x04000004,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x80000580,</div><div class='del'>-	0x0401f7fe, 0x5c000000, 0x4c000000, 0x4803c857,</div><div class='del'>-	0x4947c857, 0x4d2c0000, 0x4d300000, 0x83440480,</div><div class='del'>-	0x00000800, 0x04021024, 0x83441400, 0x0010aa00,</div><div class='del'>-	0x50080000, 0x80026d40, 0x0400001b, 0x45781000,</div><div class='del'>-	0x5934000d, 0x80025d40, 0x02020800, 0x00100843,</div><div class='del'>-	0x59366011, 0x813261c0, 0x0400000e, 0x4c640000,</div><div class='del'>-	0x5930c800, 0x59325808, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x02020800, 0x00100843, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x82666540, 0x00000000, 0x040207f6, 0x5c00c800,</div><div class='del'>-	0x0201f800, 0x00104acf, 0x41365800, 0x0201f800,</div><div class='del'>-	0x0010083b, 0x80000580, 0x5c026000, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x82000540, 0x00000001, 0x0401f7fb,</div><div class='del'>-	0x4937c857, 0x4c580000, 0x59cc0001, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x48026802, 0x497a6c01, 0x497a6a01,</div><div class='del'>-	0x59340200, 0x84000502, 0x48026a00, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04020017, 0x59340403, 0x82000580,</div><div class='del'>-	0x000007fe, 0x04000005, 0x59a80026, 0x8c00050a,</div><div class='del'>-	0x04020010, 0x0401f008, 0x59cc0408, 0x8c000518,</div><div class='del'>-	0x0400000c, 0x59cc0009, 0x48035035, 0x59cc000a,</div><div class='del'>-	0x48035036, 0x59cc0207, 0x80000540, 0x04020003,</div><div class='del'>-	0x42000000, 0x00000001, 0x48038893, 0x4803501e,</div><div class='del'>-	0x59cc0a09, 0x82040d00, 0x00000010, 0x59cc0408,</div><div class='del'>-	0x82000500, 0x00000020, 0x04000002, 0x84040d40,</div><div class='del'>-	0x5934000a, 0x82000500, 0xffffffee, 0x80040540,</div><div class='del'>-	0x4802680a, 0x83cca400, 0x0000000b, 0x8334ac00,</div><div class='del'>-	0x00000006, 0x4200b000, 0x00000002, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x83cca400, 0x0000000d, 0x8334ac00,</div><div class='del'>-	0x00000008, 0x4200b000, 0x00000002, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x59cc0a18, 0x82040480, 0x00000800,</div><div class='del'>-	0x0402100c, 0x82040480, 0x00000400, 0x04001004,</div><div class='del'>-	0x42000800, 0x00000400, 0x0401f006, 0x82040480,</div><div class='del'>-	0x00000200, 0x04001003, 0x42000800, 0x00000200,</div><div class='del'>-	0x42001000, 0x0010b33f, 0x58080202, 0x80041480,</div><div class='del'>-	0x04001002, 0x40000800, 0x48066a04, 0x59340403,</div><div class='del'>-	0x82000580, 0x000007fe, 0x04020003, 0x59cc0a08,</div><div class='del'>-	0x48066a04, 0x0201f800, 0x00104afd, 0x5c00b000,</div><div class='del'>-	0x1c01f000, 0x4937c857, 0x59a80026, 0x8c000508,</div><div class='del'>-	0x04000004, 0x84000556, 0x4803c857, 0x48035026,</div><div class='del'>-	0x59cc0207, 0x4803c857, 0x48026a05, 0x59cc020a,</div><div class='del'>-	0x4803c857, 0x48026c05, 0x59341200, 0x599c0818,</div><div class='del'>-	0x5934180a, 0x4807c857, 0x480bc857, 0x480fc857,</div><div class='del'>-	0x59cc2006, 0x82102500, 0xff000000, 0x82102580,</div><div class='del'>-	0x02000000, 0x04000007, 0x8c00050e, 0x04000009,</div><div class='del'>-	0x8c0c1d14, 0x04000003, 0x8c0c1d0e, 0x04000005,</div><div class='del'>-	0x8c040d18, 0x04000003, 0x8408154a, 0x0401f002,</div><div class='del'>-	0x8408150a, 0x8c000510, 0x04000009, 0x8c0c1d14,</div><div class='del'>-	0x04000003, 0x8c0c1d10, 0x04000005, 0x8c040d18,</div><div class='del'>-	0x04000003, 0x8408154e, 0x0401f002, 0x8408150e,</div><div class='del'>-	0x8c000512, 0x04000009, 0x8c0c1d14, 0x04000003,</div><div class='del'>-	0x8c0c1d12, 0x04000005, 0x8c040d18, 0x04000003,</div><div class='del'>-	0x8408155c, 0x0401f002, 0x8408151c, 0x480a6a00,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c5c0000, 0x4d2c0000,</div><div class='del'>-	0x4c580000, 0x5934000d, 0x80025d40, 0x04000029,</div><div class='del'>-	0x592c0003, 0x82000480, 0x00000008, 0x0400100b,</div><div class='del'>-	0x412cb800, 0x592c0001, 0x80025d40, 0x040207f9,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000037, 0x492fc857,</div><div class='del'>-	0x492cb801, 0x0401f020, 0x832c0c00, 0x00000004,</div><div class='del'>-	0x4200b000, 0x00000008, 0x50040000, 0x82000580,</div><div class='del'>-	0xffffffff, 0x04020006, 0x80041000, 0x50080000,</div><div class='del'>-	0x82000580, 0xffffffff, 0x04000007, 0x82040c00,</div><div class='del'>-	0x00000002, 0x8058b040, 0x040207f4, 0x0201f800,</div><div class='del'>-	0x00100615, 0x45480800, 0x454c1000, 0x592c1803,</div><div class='del'>-	0x800c1800, 0x480e5803, 0x480fc857, 0x0401f014,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000017, 0x492fc857,</div><div class='del'>-	0x492e680d, 0x497a5802, 0x4a025803, 0x00000001,</div><div class='del'>-	0x494a5804, 0x494e5805, 0x832c0c00, 0x00000006,</div><div class='del'>-	0x4200b000, 0x0000000e, 0x46000800, 0xffffffff,</div><div class='del'>-	0x80040800, 0x8058b040, 0x040207fc, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c00b000, 0x5c025800, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x80000580, 0x0401f7fb, 0x4803c856,</div><div class='del'>-	0x4d3c0000, 0x4d2c0000, 0x5934000d, 0x80025d40,</div><div class='del'>-	0x0400001f, 0x592c0002, 0x80000540, 0x0402001f,</div><div class='del'>-	0x412e7800, 0x0401f8c8, 0x0402001c, 0x46000800,</div><div class='del'>-	0xffffffff, 0x46001000, 0xffffffff, 0x4813c857,</div><div class='del'>-	0x480fc857, 0x580c0003, 0x82000c80, 0x00000002,</div><div class='del'>-	0x04021014, 0x480fc857, 0x400c0000, 0x812c0580,</div><div class='del'>-	0x04020004, 0x580c0001, 0x4802680d, 0x0401f003,</div><div class='del'>-	0x580c0001, 0x48002001, 0x400e5800, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x82000540, 0x00000001, 0x5c025800,</div><div class='del'>-	0x5c027800, 0x1c01f000, 0x80000580, 0x0401f7fc,</div><div class='del'>-	0x80000040, 0x48001803, 0x4803c857, 0x0401f7f6,</div><div class='del'>-	0x0201f800, 0x00020087, 0x59300007, 0x8400054e,</div><div class='del'>-	0x48026007, 0x592c1a04, 0x820c1d00, 0x000000ff,</div><div class='del'>-	0x820c0580, 0x00000048, 0x04000013, 0x0201f000,</div><div class='del'>-	0x000202b0, 0x8c000500, 0x02020800, 0x000200e6,</div><div class='del'>-	0x4a026203, 0x00000002, 0x592c1a04, 0x820c1d00,</div><div class='del'>-	0x000000ff, 0x820c0580, 0x00000018, 0x02000000,</div><div class='del'>-	0x000202b0, 0x820c0580, 0x00000048, 0x02020000,</div><div class='del'>-	0x000202b0, 0x42000800, 0x80000804, 0x0201f800,</div><div class='del'>-	0x00106466, 0x0201f000, 0x000202b9, 0x4a025a06,</div><div class='del'>-	0x00000008, 0x0201f000, 0x00020381, 0x4a025a06,</div><div class='del'>-	0x00000029, 0x0201f000, 0x00020381, 0x4a025a06,</div><div class='del'>-	0x0000002a, 0x0201f000, 0x00020381, 0x4a025a06,</div><div class='del'>-	0x00000028, 0x0201f000, 0x00020381, 0x4943c857,</div><div class='del'>-	0x4d440000, 0x4d340000, 0x4d2c0000, 0x4c580000,</div><div class='del'>-	0x4200b000, 0x000007f0, 0x417a8800, 0x0201f800,</div><div class='del'>-	0x00020267, 0x04020007, 0x8d3e7d06, 0x04000004,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x04020002, 0x0401f813,</div><div class='del'>-	0x81468800, 0x8058b040, 0x040207f5, 0x83440480,</div><div class='del'>-	0x00000800, 0x04021008, 0x8d3e7d02, 0x04000006,</div><div class='del'>-	0x42028800, 0x000007f0, 0x4200b000, 0x00000010,</div><div class='del'>-	0x0401f7eb, 0x5c00b000, 0x5c025800, 0x5c026800,</div><div class='del'>-	0x5c028800, 0x1c01f000, 0x4d2c0000, 0x41783000,</div><div class='del'>-	0x5936580f, 0x812e59c0, 0x04000029, 0x592c0204,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82000580, 0x00000012,</div><div class='del'>-	0x04000020, 0x8d3e7d00, 0x04000003, 0x0401f83c,</div><div class='del'>-	0x0402001c, 0x592c2000, 0x497a5800, 0x801831c0,</div><div class='del'>-	0x04020009, 0x59340010, 0x812c0580, 0x04020004,</div><div class='del'>-	0x497a680f, 0x497a6810, 0x0401f008, 0x4812680f,</div><div class='del'>-	0x0401f006, 0x48103000, 0x59340010, 0x812c0580,</div><div class='del'>-	0x04020002, 0x481a6810, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x49425a06, 0x497a5c09, 0x0201f800, 0x00108f7d,</div><div class='del'>-	0x0201f800, 0x00020381, 0x40125800, 0x0401f7da,</div><div class='del'>-	0x412c3000, 0x592e5800, 0x0401f7d7, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x41781800, 0x5934000f,</div><div class='del'>-	0x80025d40, 0x04000010, 0x592c0005, 0x80200580,</div><div class='del'>-	0x592c0000, 0x04000003, 0x412c1800, 0x0401f7f9,</div><div class='del'>-	0x497a5800, 0x800c19c0, 0x04000008, 0x48001800,</div><div class='del'>-	0x80000540, 0x04020004, 0x480e6810, 0x82000540,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x4802680f, 0x80000540,</div><div class='del'>-	0x040207fd, 0x497a6810, 0x0401f7f9, 0x592c0008,</div><div class='del'>-	0x81480580, 0x04020003, 0x592c0009, 0x814c0580,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c580000, 0x413c1800,</div><div class='del'>-	0x400c2000, 0x593c0002, 0x80000540, 0x04020018,</div><div class='del'>-	0x4200b000, 0x00000008, 0x820c0c00, 0x00000004,</div><div class='del'>-	0x50040000, 0x81480580, 0x04020005, 0x80041000,</div><div class='del'>-	0x50080000, 0x814c0580, 0x0400000d, 0x82040c00,</div><div class='del'>-	0x00000002, 0x8058b040, 0x040207f6, 0x400c2000,</div><div class='del'>-	0x580c0001, 0x80001d40, 0x040207ee, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c00b000, 0x1c01f000, 0x80000580,</div><div class='del'>-	0x0401f7fd, 0x4937c857, 0x4c580000, 0x4d2c0000,</div><div class='del'>-	0x5934000d, 0x80025d40, 0x04020016, 0x0201f800,</div><div class='del'>-	0x0010082a, 0x04000010, 0x492e680d, 0x4a025802,</div><div class='del'>-	0x00000001, 0x497a5803, 0x832c0c00, 0x00000004,</div><div class='del'>-	0x4200b000, 0x00000010, 0x46000800, 0xffffffff,</div><div class='del'>-	0x80040800, 0x8058b040, 0x040207fc, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c025800, 0x5c00b000, 0x1c01f000,</div><div class='del'>-	0x4d2c0000, 0x592e5801, 0x0201f800, 0x00100843,</div><div class='del'>-	0x5c025800, 0x0401f7ea, 0x4d2c0000, 0x5936580d,</div><div class='del'>-	0x812e59c0, 0x04000007, 0x4937c857, 0x497a680d,</div><div class='del'>-	0x0201f800, 0x00100843, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x59340405, 0x4937c857,</div><div class='del'>-	0x4803c857, 0x8c000508, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04000011, 0x59a80815,</div><div class='del'>-	0x8c040d04, 0x0402000e, 0x59a80826, 0x8c040d06,</div><div class='del'>-	0x0400000b, 0x83ac0400, 0x000007fe, 0x50000000,</div><div class='del'>-	0x80026d40, 0x04000006, 0x0401f9a8, 0x04020004,</div><div class='del'>-	0x59340200, 0x8400055a, 0x48026a00, 0x599c0017,</div><div class='del'>-	0x8c000508, 0x04000015, 0x4200b000, 0x000007f0,</div><div class='del'>-	0x417a8800, 0x0201f800, 0x00020267, 0x0402000c,</div><div class='del'>-	0x0401f99a, 0x0402000a, 0x59a80010, 0x59340802,</div><div class='del'>-	0x80040580, 0x82000500, 0x00ffff00, 0x04020004,</div><div class='del'>-	0x59340200, 0x8400055a, 0x48026a00, 0x81468800,</div><div class='del'>-	0x8058b040, 0x040207f0, 0x0401f885, 0x04000003,</div><div class='del'>-	0x59a80836, 0x0401f006, 0x599c0017, 0x8c000508,</div><div class='del'>-	0x04000007, 0x42000800, 0x000007d0, 0x42001000,</div><div class='del'>-	0x001046c4, 0x0201f800, 0x00105da7, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4d300000, 0x4d340000, 0x4d440000,</div><div class='del'>-	0x4d3c0000, 0x4c580000, 0x42001000, 0x001046c4,</div><div class='del'>-	0x0201f800, 0x00105cc9, 0x59a80826, 0x8c040d06,</div><div class='del'>-	0x04000015, 0x0401f86a, 0x04000013, 0x83ae6c00,</div><div class='del'>-	0x000007fe, 0x51366800, 0x59340200, 0x8400051a,</div><div class='del'>-	0x48026a00, 0x599c0017, 0x8c000508, 0x04000007,</div><div class='del'>-	0x42000800, 0x000007d0, 0x42001000, 0x001046c4,</div><div class='del'>-	0x0201f800, 0x00105da7, 0x0201f800, 0x00101bf0,</div><div class='del'>-	0x0401f027, 0x4200b000, 0x000007f0, 0x80028d80,</div><div class='del'>-	0x0201f800, 0x00020267, 0x0402001e, 0x59340200,</div><div class='del'>-	0x8c00051a, 0x0400001b, 0x59368c03, 0x417a7800,</div><div class='del'>-	0x42028000, 0x00000029, 0x41783000, 0x0201f800,</div><div class='del'>-	0x0010a258, 0x59340200, 0x84000558, 0x8400051a,</div><div class='del'>-	0x48026a00, 0x4937c857, 0x4a026c00, 0x00000707,</div><div class='del'>-	0x42028000, 0x00000029, 0x0201f800, 0x001067f6,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00106543, 0x417a6000,</div><div class='del'>-	0x0201f800, 0x0010a0da, 0x0201f800, 0x00106982,</div><div class='del'>-	0x81468800, 0x8058b040, 0x040207de, 0x5c00b000,</div><div class='del'>-	0x5c027800, 0x5c028800, 0x5c026800, 0x5c026000,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x59303809, 0x581c0200,</div><div class='del'>-	0x8400051a, 0x48003a00, 0x1c01f000, 0x42026800,</div><div class='del'>-	0x0010b320, 0x497a680e, 0x42028800, 0x000007ff,</div><div class='del'>-	0x0201f800, 0x001040e4, 0x4937c857, 0x4a026c00,</div><div class='del'>-	0x00000606, 0x4a026802, 0x00ffffff, 0x4a026a04,</div><div class='del'>-	0x00000200, 0x4a026c04, 0x00000002, 0x1c01f000,</div><div class='del'>-	0x59300009, 0x50000000, 0x4933c857, 0x4803c857,</div><div class='del'>-	0x8c00050e, 0x1c01f000, 0x59300009, 0x50000000,</div><div class='del'>-	0x8c00050a, 0x1c01f000, 0x4933c856, 0x0401f90f,</div><div class='del'>-	0x04000006, 0x59340400, 0x82000d00, 0x000000ff,</div><div class='del'>-	0x82041580, 0x00000005, 0x1c01f000, 0x4d340000,</div><div class='del'>-	0x83ac0400, 0x000007fe, 0x50000000, 0x80026d40,</div><div class='del'>-	0x04000003, 0x59340200, 0x8c00051a, 0x5c026800,</div><div class='del'>-	0x1c01f000, 0x4937c857, 0x493fc857, 0x59340403,</div><div class='del'>-	0x81ac0400, 0x50000000, 0x81340580, 0x02020800,</div><div class='del'>-	0x00100615, 0x59341200, 0x813e79c0, 0x04000003,</div><div class='del'>-	0x8408155e, 0x0401f002, 0x8408151e, 0x480a6a00,</div><div class='del'>-	0x1c01f000, 0x4937c857, 0x0201f800, 0x00101eb0,</div><div class='del'>-	0x04000006, 0x59a80835, 0x42001000, 0x0010475f,</div><div class='del'>-	0x0201f800, 0x00105da7, 0x1c01f000, 0x4937c857,</div><div class='del'>-	0x42001000, 0x0010475f, 0x0201f800, 0x00105cc9,</div><div class='del'>-	0x59a81026, 0x84081512, 0x480b5026, 0x1c01f000,</div><div class='del'>-	0x4c380000, 0x4c340000, 0x4c240000, 0x4c600000,</div><div class='del'>-	0x4008c000, 0x83440480, 0x00000800, 0x04021045,</div><div class='del'>-	0x80002d80, 0x41442000, 0x83447400, 0x0010aa00,</div><div class='del'>-	0x4200b000, 0x000007f0, 0x83444c80, 0x000007f0,</div><div class='del'>-	0x04001003, 0x4200b000, 0x00000010, 0x50380000,</div><div class='del'>-	0x80000540, 0x0402001e, 0x41440000, 0x80100580,</div><div class='del'>-	0x04020043, 0x40102800, 0x82104c80, 0x000007f0,</div><div class='del'>-	0x04001015, 0x82104d80, 0x000007fc, 0x04020005,</div><div class='del'>-	0x82604d80, 0x00fffffc, 0x0402002a, 0x0401f00e,</div><div class='del'>-	0x82104d80, 0x000007fd, 0x04020005, 0x82604d80,</div><div class='del'>-	0x00fffffd, 0x04020023, 0x0401f007, 0x82104d80,</div><div class='del'>-	0x000007ff, 0x0402001f, 0x82604d80, 0x00ffffff,</div><div class='del'>-	0x0402001c, 0x84142d5e, 0x0401f029, 0x40006800,</div><div class='del'>-	0x58343002, 0x82183500, 0x00ffffff, 0x40180000,</div><div class='del'>-	0x80600580, 0x04020019, 0x40100000, 0x81440580,</div><div class='del'>-	0x0402000a, 0x40366800, 0x8c204508, 0x04000053,</div><div class='del'>-	0x0401ff8a, 0x04020051, 0x4947c857, 0x42000000,</div><div class='del'>-	0x0000001d, 0x0401f04e, 0x4947c857, 0x480bc857,</div><div class='del'>-	0x4823c857, 0x42000000, 0x0000001a, 0x0401f048,</div><div class='del'>-	0x4947c857, 0x4863c857, 0x4813c857, 0x42000000,</div><div class='del'>-	0x00000019, 0x0401f042, 0x40100000, 0x81440580,</div><div class='del'>-	0x04020007, 0x58343002, 0x4947c857, 0x481bc857,</div><div class='del'>-	0x42000000, 0x0000001b, 0x0401f039, 0x80102000,</div><div class='del'>-	0x80387000, 0x83444c80, 0x000007f0, 0x04001009,</div><div class='del'>-	0x82104d80, 0x00000800, 0x0402000c, 0x42002000,</div><div class='del'>-	0x000007f0, 0x42007000, 0x0010b1f0, 0x0401f007,</div><div class='del'>-	0x82104d80, 0x000007f0, 0x04020004, 0x41782000,</div><div class='del'>-	0x42007000, 0x0010aa00, 0x8058b040, 0x040207a4,</div><div class='del'>-	0x801429c0, 0x04020007, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4947c857, 0x42000000, 0x0000000a, 0x0401f01c,</div><div class='del'>-	0x4d2c0000, 0x4c180000, 0x40603000, 0x0401fc19,</div><div class='del'>-	0x4947c857, 0x4937c857, 0x5c003000, 0x5c025800,</div><div class='del'>-	0x040207f4, 0x497a6a12, 0x59a80026, 0x8c00050a,</div><div class='del'>-	0x0402000d, 0x82600500, 0x00ffff00, 0x04000006,</div><div class='del'>-	0x59a84810, 0x82244d00, 0x00ffff00, 0x80240580,</div><div class='del'>-	0x04020005, 0x82600500, 0x000000ff, 0x800000d0,</div><div class='del'>-	0x48026a12, 0x48626802, 0x80000580, 0x80000540,</div><div class='del'>-	0x5c00c000, 0x5c004800, 0x5c006800, 0x5c007000,</div><div class='del'>-	0x1c01f000, 0x5934000f, 0x5934140b, 0x80081040,</div><div class='del'>-	0x04001002, 0x480a6c0b, 0x80000540, 0x02020800,</div><div class='del'>-	0x00020275, 0x1c01f000, 0x4803c857, 0x4947c857,</div><div class='del'>-	0x4c300000, 0x82006500, 0x00000030, 0x04000006,</div><div class='del'>-	0x4c000000, 0x0201f800, 0x001091f3, 0x5c000000,</div><div class='del'>-	0x0402000b, 0x8c00050e, 0x04000006, 0x0201f800,</div><div class='del'>-	0x00020267, 0x04020006, 0x4937c857, 0x0401fc36,</div><div class='del'>-	0x80000580, 0x5c006000, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f7fc, 0x4803c857, 0x4c580000,</div><div class='del'>-	0x4d440000, 0x40001000, 0x80000d80, 0x4200b000,</div><div class='del'>-	0x000007f0, 0x4c040000, 0x40068800, 0x4c080000,</div><div class='del'>-	0x40080000, 0x0401ffdd, 0x5c001000, 0x5c000800,</div><div class='del'>-	0x80040800, 0x8058b040, 0x040207f7, 0x5c028800,</div><div class='del'>-	0x5c00b000, 0x1c01f000, 0x4c5c0000, 0x59340400,</div><div class='del'>-	0x8200bd80, 0x00000606, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x4c5c0000, 0x59340400, 0x8200bd80, 0x00000404,</div><div class='del'>-	0x5c00b800, 0x1c01f000, 0x4c5c0000, 0x59340400,</div><div class='del'>-	0x8200bd80, 0x00000404, 0x04000003, 0x8200bd80,</div><div class='del'>-	0x00000606, 0x5c00b800, 0x1c01f000, 0x4c5c0000,</div><div class='del'>-	0x4c600000, 0x59340400, 0x8200bd00, 0x0000ff00,</div><div class='del'>-	0x825cc580, 0x00000400, 0x04000003, 0x825cc580,</div><div class='del'>-	0x00000600, 0x5c00c000, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x4c5c0000, 0x59340400, 0x82000500, 0x000000ff,</div><div class='del'>-	0x8200bd80, 0x00000003, 0x04000003, 0x8200bd80,</div><div class='del'>-	0x00000005, 0x5c00b800, 0x1c01f000, 0x5c000000,</div><div class='del'>-	0x4c000000, 0x4803c857, 0x4c5c0000, 0x59340400,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x8400b9c0, 0x805c0580,</div><div class='del'>-	0x4937c857, 0x4803c857, 0x48026c00, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x4c040000, 0x4c080000, 0x592c0207,</div><div class='del'>-	0x8c00050c, 0x0400000f, 0x592e8c06, 0x82000500,</div><div class='del'>-	0x00000080, 0x84000548, 0x4d3c0000, 0x42027800,</div><div class='del'>-	0x00001000, 0x0401ff8d, 0x5c027800, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c001000, 0x5c000800, 0x1c01f000,</div><div class='del'>-	0x80000580, 0x0401f7fc, 0x592c040b, 0x82000500,</div><div class='del'>-	0x0000e000, 0x82000580, 0x00006000, 0x04000019,</div><div class='del'>-	0x836c0580, 0x00000003, 0x04000016, 0x836c0580,</div><div class='del'>-	0x00000002, 0x04020106, 0x59a80026, 0x82000d00,</div><div class='del'>-	0x00000038, 0x04020005, 0x59a80832, 0x800409c0,</div><div class='del'>-	0x0400000c, 0x0401f0fe, 0x82000d00, 0x00000003,</div><div class='del'>-	0x82040d80, 0x00000003, 0x040200f9, 0x82000d00,</div><div class='del'>-	0x00000028, 0x04020003, 0x8c00050c, 0x040000f4,</div><div class='del'>-	0x592c100a, 0x82080500, 0xff000000, 0x040200d2,</div><div class='del'>-	0x59a80010, 0x80080580, 0x040000cc, 0x592c0c0b,</div><div class='del'>-	0x82040d00, 0x0000e000, 0x82040480, 0x00008000,</div><div class='del'>-	0x040210cc, 0x592e8c06, 0x83440480, 0x00000800,</div><div class='del'>-	0x04001007, 0x83440580, 0x0000ffff, 0x040200b3,</div><div class='del'>-	0x800409c0, 0x040200fe, 0x0401f0b0, 0x800409c0,</div><div class='del'>-	0x040200fb, 0x41784000, 0x0401feaa, 0x040200e2,</div><div class='del'>-	0x59342204, 0x592c000d, 0x80100480, 0x040010bc,</div><div class='del'>-	0x42027000, 0x00000053, 0x592c2409, 0x82100500,</div><div class='del'>-	0xffffff00, 0x040200aa, 0x4813c857, 0x592c000c,</div><div class='del'>-	0x800001c0, 0x04000083, 0x82100580, 0x00000004,</div><div class='del'>-	0x040000a0, 0x82100580, 0x00000051, 0x0400009d,</div><div class='del'>-	0x82100580, 0x00000003, 0x04000016, 0x82100580,</div><div class='del'>-	0x00000020, 0x0400004b, 0x82100580, 0x00000024,</div><div class='del'>-	0x04000042, 0x82100580, 0x00000021, 0x04000042,</div><div class='del'>-	0x82100580, 0x00000050, 0x04000037, 0x82100580,</div><div class='del'>-	0x00000052, 0x04000031, 0x82100580, 0x00000005,</div><div class='del'>-	0x0402006b, 0x42027000, 0x00000001, 0x0401f01b,</div><div class='del'>-	0x42027000, 0x00000002, 0x59a8006f, 0x8c000502,</div><div class='del'>-	0x04000016, 0x0401ff45, 0x04000014, 0x59340212,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x42001000, 0x00000010,</div><div class='del'>-	0x0402000c, 0x59a80026, 0x8c000506, 0x0402006f,</div><div class='del'>-	0x42001000, 0x00000008, 0x59340002, 0x82000500,</div><div class='del'>-	0x00ff0000, 0x82000580, 0x00ff0000, 0x04000003,</div><div class='del'>-	0x0401f9d6, 0x04020065, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000081, 0x4a026406, 0x00000010, 0x49366009,</div><div class='del'>-	0x42000800, 0x00000003, 0x83380580, 0x00000002,</div><div class='del'>-	0x04000003, 0x42000800, 0x0000000b, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x0401f044, 0x42027000, 0x00000000,</div><div class='del'>-	0x0401f003, 0x42027000, 0x00000004, 0x0401ff30,</div><div class='del'>-	0x04020074, 0x0401f036, 0x42027000, 0x00000033,</div><div class='del'>-	0x0401f006, 0x42027000, 0x00000005, 0x0401f003,</div><div class='del'>-	0x42027000, 0x00000003, 0x0401ff1c, 0x04020069,</div><div class='del'>-	0x59a8006f, 0x8c000502, 0x04000016, 0x0401ff0b,</div><div class='del'>-	0x04000014, 0x59340212, 0x82000500, 0x0000ff00,</div><div class='del'>-	0x42001000, 0x00000010, 0x0402000c, 0x59a80026,</div><div class='del'>-	0x8c000506, 0x04020035, 0x42001000, 0x00000008,</div><div class='del'>-	0x59340002, 0x82000500, 0x00ff0000, 0x82000580,</div><div class='del'>-	0x00ff0000, 0x04000003, 0x0401f99c, 0x0402002b,</div><div class='del'>-	0x0201f800, 0x00020892, 0x04000047, 0x4a026406,</div><div class='del'>-	0x00000010, 0x49366009, 0x42000800, 0x00000005,</div><div class='del'>-	0x83380580, 0x00000003, 0x04000003, 0x42000800,</div><div class='del'>-	0x00000009, 0x0201f800, 0x001043c7, 0x0401f00a,</div><div class='del'>-	0x82102580, 0x00000011, 0x04020030, 0x0201f800,</div><div class='del'>-	0x00020892, 0x04000034, 0x4a026406, 0x00000010,</div><div class='del'>-	0x49366009, 0x492e6008, 0x49325808, 0x813669c0,</div><div class='del'>-	0x04000007, 0x592c0c0b, 0x8c040d18, 0x04000004,</div><div class='del'>-	0x59340200, 0x84000514, 0x48026a00, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x80000580, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f7fd, 0x42001000, 0x0000000a,</div><div class='del'>-	0x0401f018, 0x42001000, 0x00000010, 0x0401f015,</div><div class='del'>-	0x42001000, 0x00000016, 0x0401f012, 0x42001000,</div><div class='del'>-	0x00000017, 0x0401f00f, 0x42001000, 0x00000018,</div><div class='del'>-	0x0401f00c, 0x42001000, 0x0000001b, 0x0401f009,</div><div class='del'>-	0x42001000, 0x0000001e, 0x0401f006, 0x42001000,</div><div class='del'>-	0x00000024, 0x0401f003, 0x42001000, 0x00000020,</div><div class='del'>-	0x42000800, 0x00000019, 0x42028000, 0x00000031,</div><div class='del'>-	0x0401f7df, 0x42000800, 0x00000003, 0x0401f003,</div><div class='del'>-	0x42000800, 0x0000000a, 0x41781000, 0x0401f7f7,</div><div class='del'>-	0x42000800, 0x00000009, 0x59341400, 0x0401f7f3,</div><div class='del'>-	0x42028000, 0x00000008, 0x0401f005, 0x42000800,</div><div class='del'>-	0x00000007, 0x416c1000, 0x0401f7ec, 0x41780800,</div><div class='del'>-	0x41781000, 0x0401f7ca, 0x42028000, 0x00000000,</div><div class='del'>-	0x0401f7fb, 0x82004d80, 0x0000001d, 0x02000800,</div><div class='del'>-	0x00100615, 0x82004d80, 0x0000001a, 0x04020004,</div><div class='del'>-	0x40101000, 0x40000800, 0x0401f7dc, 0x82004d80,</div><div class='del'>-	0x0000001b, 0x04020003, 0x40181000, 0x0401f7fa,</div><div class='del'>-	0x82004d80, 0x0000001c, 0x040007f7, 0x82004d80,</div><div class='del'>-	0x00000019, 0x040007b5, 0x0401f7d6, 0x592e6008,</div><div class='del'>-	0x0201f800, 0x001091e3, 0x040007b3, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000011, 0x040207d6, 0x83440580,</div><div class='del'>-	0x0000ffff, 0x04020005, 0x59326809, 0x813669c0,</div><div class='del'>-	0x0400000e, 0x0401f7cf, 0x592c100a, 0x82081500,</div><div class='del'>-	0x00ffffff, 0x41784000, 0x0401fd9e, 0x040207d6,</div><div class='del'>-	0x59300009, 0x800001c0, 0x04000003, 0x81340580,</div><div class='del'>-	0x040207c4, 0x49366009, 0x592c0c0b, 0x82041500,</div><div class='del'>-	0x0000e000, 0x82080580, 0x00006000, 0x04000011,</div><div class='del'>-	0x42000800, 0x00000100, 0x813669c0, 0x04000002,</div><div class='del'>-	0x59340a04, 0x592c000d, 0x80040480, 0x040017a0,</div><div class='del'>-	0x59300a03, 0x82040580, 0x00000007, 0x040207b1,</div><div class='del'>-	0x492e6008, 0x42027000, 0x00000054, 0x0401f774,</div><div class='del'>-	0x0201f800, 0x0010a6e6, 0x040007b4, 0x0401f7a9,</div><div class='del'>-	0x492fc857, 0x592e6008, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x001091e3, 0x04000047, 0x59301406, 0x82080580,</div><div class='del'>-	0x00000005, 0x04020061, 0x592c0207, 0x8c000500,</div><div class='del'>-	0x04020085, 0x59a80021, 0x800001c0, 0x0402006a,</div><div class='del'>-	0x59301203, 0x82080580, 0x00000007, 0x04020057,</div><div class='del'>-	0x592e8c06, 0x83440480, 0x00000800, 0x04021032,</div><div class='del'>-	0x41784000, 0x592c1009, 0x82081500, 0x00ffffff,</div><div class='del'>-	0x0401fd60, 0x0402005f, 0x59300009, 0x800001c0,</div><div class='del'>-	0x04000003, 0x81340580, 0x04020048, 0x4d300000,</div><div class='del'>-	0x592e6013, 0x4933c857, 0x83300580, 0xffffffff,</div><div class='del'>-	0x0400000d, 0x0201f800, 0x001091e3, 0x5c026000,</div><div class='del'>-	0x04000029, 0x591c1406, 0x82080580, 0x00000006,</div><div class='del'>-	0x04000046, 0x82080580, 0x00000011, 0x04000043,</div><div class='del'>-	0x0401f002, 0x5c026000, 0x59a80010, 0x592c100a,</div><div class='del'>-	0x82081500, 0x00ffffff, 0x80081580, 0x04020017,</div><div class='del'>-	0x592c1009, 0x82081500, 0x00ffffff, 0x80081580,</div><div class='del'>-	0x0400000f, 0x49366009, 0x492e6008, 0x42027000,</div><div class='del'>-	0x00000092, 0x0201f800, 0x000208d8, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x42001000, 0x0000000a, 0x0401f00c,</div><div class='del'>-	0x42001000, 0x00000010, 0x0401f009, 0x42001000,</div><div class='del'>-	0x00000014, 0x0401f006, 0x42001000, 0x00000018,</div><div class='del'>-	0x0401f003, 0x42001000, 0x0000003c, 0x492fc857,</div><div class='del'>-	0x480bc857, 0x42000800, 0x00000019, 0x42028000,</div><div class='del'>-	0x00000031, 0x82000540, 0x00000001, 0x0401f7e9,</div><div class='del'>-	0x492fc857, 0x4803c857, 0x480bc857, 0x40000800,</div><div class='del'>-	0x0401f7f7, 0x492fc857, 0x42000800, 0x0000000a,</div><div class='del'>-	0x41781000, 0x0401f7f2, 0x4933c857, 0x59300406,</div><div class='del'>-	0x4803c857, 0x59300203, 0x4803c857, 0x59300009,</div><div class='del'>-	0x4803c857, 0x42028000, 0x00000008, 0x41780800,</div><div class='del'>-	0x41781000, 0x0401f7e8, 0x42000800, 0x0000001e,</div><div class='del'>-	0x0401f7f0, 0x42000800, 0x00000001, 0x0401f7ed,</div><div class='del'>-	0x82004d80, 0x0000001d, 0x02000800, 0x00100615,</div><div class='del'>-	0x82004d80, 0x0000001a, 0x04020003, 0x40101000,</div><div class='del'>-	0x0401f7dc, 0x82004d80, 0x0000001b, 0x04020003,</div><div class='del'>-	0x40181000, 0x0401f7d7, 0x82004d80, 0x0000001c,</div><div class='del'>-	0x040007d4, 0x82004d80, 0x00000019, 0x040007d1,</div><div class='del'>-	0x0401f7d5, 0x0201f800, 0x0010a6e6, 0x040207d7,</div><div class='del'>-	0x42028000, 0x00000000, 0x0401f7dd, 0x5c000000,</div><div class='del'>-	0x4c000000, 0x4803c857, 0x59302009, 0x801021c0,</div><div class='del'>-	0x04000035, 0x58101400, 0x4813c857, 0x480bc857,</div><div class='del'>-	0x82081d00, 0x000000ff, 0x59300c03, 0x82040580,</div><div class='del'>-	0x00000008, 0x04000022, 0x82040580, 0x0000000a,</div><div class='del'>-	0x04000017, 0x82040580, 0x0000000c, 0x04000010,</div><div class='del'>-	0x82040580, 0x00000002, 0x04000019, 0x82040580,</div><div class='del'>-	0x00000001, 0x04000012, 0x82040580, 0x00000003,</div><div class='del'>-	0x0400000b, 0x82040580, 0x00000005, 0x04000004,</div><div class='del'>-	0x82040580, 0x00000033, 0x04020017, 0x820c0580,</div><div class='del'>-	0x00000009, 0x0400000d, 0x0401f013, 0x820c0580,</div><div class='del'>-	0x00000005, 0x04000009, 0x0401f00f, 0x820c0580,</div><div class='del'>-	0x0000000b, 0x04000005, 0x0401f00b, 0x820c0580,</div><div class='del'>-	0x00000003, 0x04020008, 0x82081d00, 0xffffff00,</div><div class='del'>-	0x840c01c0, 0x800c0540, 0x4807c857, 0x4803c857,</div><div class='del'>-	0x48002400, 0x1c01f000, 0x599c0017, 0x8c00050a,</div><div class='del'>-	0x04000003, 0x80000580, 0x1c01f000, 0x59a80026,</div><div class='del'>-	0x82000500, 0x00000028, 0x04000008, 0x42028800,</div><div class='del'>-	0x000007fd, 0x0201f800, 0x00020267, 0x04020003,</div><div class='del'>-	0x5934000a, 0x8c000504, 0x1c01f000, 0x4d300000,</div><div class='del'>-	0x5934000e, 0x80026540, 0x04000006, 0x0201f800,</div><div class='del'>-	0x0010600e, 0x02000800, 0x001061e5, 0x497a680e,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4d440000, 0x4d340000,</div><div class='del'>-	0x80000580, 0x40001800, 0x40028800, 0x82080580,</div><div class='del'>-	0x00000008, 0x04020003, 0x42001800, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00020267, 0x0402000a, 0x0401fd4f,</div><div class='del'>-	0x04020008, 0x800c19c0, 0x04000004, 0x59340405,</div><div class='del'>-	0x8c000508, 0x04000003, 0x80081040, 0x04000009,</div><div class='del'>-	0x81468800, 0x83440480, 0x00000800, 0x040017f1,</div><div class='del'>-	0x80000580, 0x5c026800, 0x5c028800, 0x1c01f000,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c026800, 0x5c028800,</div><div class='del'>-	0x1c01f000, 0x42000800, 0x00000001, 0x0401fb0e,</div><div class='del'>-	0x04020034, 0x59a80026, 0x8c000508, 0x04020031,</div><div class='del'>-	0x5934100a, 0x82081500, 0x0000e000, 0x42007000,</div><div class='del'>-	0x0010b33f, 0x58380401, 0x8c000504, 0x0402001c,</div><div class='del'>-	0x42000800, 0x00000001, 0x82080580, 0x00006000,</div><div class='del'>-	0x04000024, 0x59341a04, 0x820c0480, 0x00000800,</div><div class='del'>-	0x04001004, 0x42000800, 0x00000a00, 0x0401f009,</div><div class='del'>-	0x820c0480, 0x00000400, 0x04001004, 0x42000800,</div><div class='del'>-	0x00000500, 0x0401f003, 0x42000800, 0x00000200,</div><div class='del'>-	0x82080580, 0x00002000, 0x04000002, 0x800408c2,</div><div class='del'>-	0x82040d40, 0x00000001, 0x0401f00e, 0x42000800,</div><div class='del'>-	0x00000008, 0x82080580, 0x00002000, 0x04020004,</div><div class='del'>-	0x42000800, 0x00000004, 0x0401f006, 0x82080580,</div><div class='del'>-	0x00000000, 0x04020003, 0x42000800, 0x00000002,</div><div class='del'>-	0x48066c04, 0x1c01f000, 0x4a033020, 0x00000000,</div><div class='del'>-	0x4a03b104, 0x80000000, 0x497b3026, 0x497b3027,</div><div class='del'>-	0x497b3028, 0x497b3029, 0x497b302b, 0x497b3021,</div><div class='del'>-	0x4a03b104, 0x60000001, 0x1c01f000, 0x599c0018,</div><div class='del'>-	0x4803c856, 0x497b3024, 0x497b3025, 0x82000500,</div><div class='del'>-	0x0000000f, 0x48033022, 0x04000008, 0x599c0216,</div><div class='del'>-	0x82000500, 0x0000ffff, 0x04020003, 0x42000000,</div><div class='del'>-	0x00000002, 0x48033023, 0x1c01f000, 0x0401fff0,</div><div class='del'>-	0x4a03c826, 0x00000004, 0x599c0209, 0x80000540,</div><div class='del'>-	0x0400001f, 0x599c0207, 0x80000540, 0x04000007,</div><div class='del'>-	0x800000cc, 0x599c080d, 0x80040400, 0x4803b100,</div><div class='del'>-	0x497bb102, 0x59d80101, 0x599c000d, 0x4803b100,</div><div class='del'>-	0x599c000e, 0x4803b101, 0x599c0207, 0x80000540,</div><div class='del'>-	0x04020002, 0x497bb102, 0x599c0a09, 0x82040540,</div><div class='del'>-	0x00400000, 0x59980822, 0x4803b103, 0x4a03b109,</div><div class='del'>-	0x00000004, 0x4a03b104, 0x10000001, 0x800409c0,</div><div class='del'>-	0x04020004, 0x4a033020, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x4a033020, 0x00000002, 0x0401f7fd, 0x592c0204,</div><div class='del'>-	0x492fc857, 0x80000540, 0x04000008, 0x42034000,</div><div class='del'>-	0x0010b2a0, 0x59a1d81e, 0x80edd9c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x0401f003, 0x5931d821, 0x58ef400b,</div><div class='del'>-	0x58ec0009, 0x800001c0, 0x08020000, 0x0201f800,</div><div class='del'>-	0x00100615, 0x5998002b, 0x84000540, 0x4803302b,</div><div class='del'>-	0x0201f000, 0x00020403, 0x42000000, 0x0010b654,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x492fc857, 0x59980026,</div><div class='del'>-	0x59980828, 0x80000000, 0x48033026, 0x800409c0,</div><div class='del'>-	0x492f3028, 0x04000003, 0x492c0800, 0x0401f002,</div><div class='del'>-	0x492f3029, 0x592c0001, 0x80000d40, 0x02020000,</div><div class='del'>-	0x000202fb, 0x1c01f000, 0x59980026, 0x59980828,</div><div class='del'>-	0x80000000, 0x48033026, 0x492fc857, 0x800409c0,</div><div class='del'>-	0x492f3028, 0x04000003, 0x492c0800, 0x0401f002,</div><div class='del'>-	0x492f3029, 0x592c0001, 0x80000d40, 0x02020800,</div><div class='del'>-	0x000202fb, 0x0402d00e, 0x59980029, 0x80025d40,</div><div class='del'>-	0x0400000f, 0x59980026, 0x80000040, 0x48033026,</div><div class='del'>-	0x04020002, 0x48033028, 0x592c0000, 0x48033029,</div><div class='del'>-	0x492fc857, 0x492fb107, 0x0400d7f4, 0x42000000,</div><div class='del'>-	0x0010b654, 0x0201f800, 0x0010a86e, 0x0402e01d,</div><div class='del'>-	0x59da5908, 0x496a5800, 0x412ed000, 0x815eb800,</div><div class='del'>-	0x0400e7fc, 0x59c80000, 0x82000540, 0x00001200,</div><div class='del'>-	0x48039000, 0x04006019, 0x59d8010a, 0x59d8090a,</div><div class='del'>-	0x80040d80, 0x040207fd, 0x900001c0, 0x82000540,</div><div class='del'>-	0x00000013, 0x4803c011, 0x5998002b, 0x84000500,</div><div class='del'>-	0x4803302b, 0x59e00017, 0x8c000508, 0x04000003,</div><div class='del'>-	0x4a03c017, 0x00000003, 0x4203e000, 0x30000001,</div><div class='del'>-	0x59d80105, 0x82000500, 0x00018780, 0x02020000,</div><div class='del'>-	0x00020482, 0x1c01f000, 0x5998002b, 0x84000540,</div><div class='del'>-	0x4803302b, 0x0401f7f7, 0x5c000000, 0x4c000000,</div><div class='del'>-	0x4803c857, 0x492fc857, 0x4943c857, 0x4807c857,</div><div class='del'>-	0x4a025a04, 0x00000103, 0x49425a06, 0x48065a08,</div><div class='del'>-	0x4a025c06, 0x0000ffff, 0x813261c0, 0x04000003,</div><div class='del'>-	0x59300402, 0x48025c06, 0x832c0400, 0x00000009,</div><div class='del'>-	0x04011000, 0x4803c840, 0x4a03c842, 0x0000000b,</div><div class='del'>-	0x04011000, 0x1c01f000, 0x42000000, 0x0010b654,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x0201f000, 0x00020464,</div><div class='del'>-	0x59a80017, 0x82000c80, 0x0000000a, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f809, 0x4a038805, 0x000000f0,</div><div class='del'>-	0x59c400a3, 0x82000500, 0x02870000, 0x02020800,</div><div class='del'>-	0x00100615, 0x1c01f000, 0x00104c99, 0x00104c25,</div><div class='del'>-	0x00104c40, 0x00104c69, 0x00104c8c, 0x00104cc6,</div><div class='del'>-	0x00104cd8, 0x00104c40, 0x00104caa, 0x00104c24,</div><div class='del'>-	0x1c01f000, 0x4a038808, 0x00000004, 0x0401f8f9,</div><div class='del'>-	0x0201f800, 0x0010507b, 0x59c40805, 0x8c040d0e,</div><div class='del'>-	0x04020013, 0x8c040d0a, 0x0402000b, 0x8c040d0c,</div><div class='del'>-	0x04020006, 0x8c040d08, 0x0400000d, 0x4a035017,</div><div class='del'>-	0x00000003, 0x0401f00a, 0x4a035017, 0x00000000,</div><div class='del'>-	0x0401f007, 0x42000000, 0x0010b642, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x4a035017, 0x00000002, 0x1c01f000,</div><div class='del'>-	0x4a038808, 0x00000002, 0x0401f8de, 0x59c40805,</div><div class='del'>-	0x8c040d08, 0x04020021, 0x8c040d0c, 0x0402001c,</div><div class='del'>-	0x8c040d0e, 0x04020017, 0x82040500, 0x000000f0,</div><div class='del'>-	0x0402001c, 0x0201f800, 0x0010507b, 0x4a038808,</div><div class='del'>-	0x00000080, 0x59c40002, 0x8400050c, 0x48038802,</div><div class='del'>-	0x0401f9d7, 0x4d3c0000, 0x42027800, 0x00000001,</div><div class='del'>-	0x0201f800, 0x00109640, 0x5c027800, 0x4a038808,</div><div class='del'>-	0x00000080, 0x4a035017, 0x00000009, 0x0401f009,</div><div class='del'>-	0x4a035017, 0x00000001, 0x0401f006, 0x4a035017,</div><div class='del'>-	0x00000000, 0x0401f003, 0x4a035017, 0x00000003,</div><div class='del'>-	0x1c01f000, 0x0401f8b7, 0x4a038808, 0x00000080,</div><div class='del'>-	0x59c40805, 0x8c040d0a, 0x0402001b, 0x8c040d0c,</div><div class='del'>-	0x04020016, 0x8c040d0e, 0x04020011, 0x82040500,</div><div class='del'>-	0x000000f0, 0x04020016, 0x59c40002, 0x8400050c,</div><div class='del'>-	0x48038802, 0x0401f9b2, 0x4d3c0000, 0x42027800,</div><div class='del'>-	0x00000001, 0x0201f800, 0x00109640, 0x5c027800,</div><div class='del'>-	0x4a035017, 0x00000009, 0x0401f009, 0x4a035017,</div><div class='del'>-	0x00000001, 0x0401f006, 0x4a035017, 0x00000000,</div><div class='del'>-	0x0401f003, 0x4a035017, 0x00000002, 0x1c01f000,</div><div class='del'>-	0x4a038808, 0x00000008, 0x59c40805, 0x8c040d0c,</div><div class='del'>-	0x04020006, 0x8c040d0e, 0x04000006, 0x4a035017,</div><div class='del'>-	0x00000001, 0x0401f003, 0x4a035017, 0x00000000,</div><div class='del'>-	0x1c01f000, 0x0401f8d3, 0x59c40805, 0x8c040d0c,</div><div class='del'>-	0x0402000d, 0x4c040000, 0x0401f882, 0x5c000800,</div><div class='del'>-	0x8c040d0a, 0x04020006, 0x8c040d0e, 0x04000006,</div><div class='del'>-	0x4a035017, 0x00000001, 0x0401f003, 0x4a035017,</div><div class='del'>-	0x00000002, 0x1c01f000, 0x4a038808, 0x00000008,</div><div class='del'>-	0x42001000, 0x00104d2c, 0x0201f800, 0x00105dbd,</div><div class='del'>-	0x59c40805, 0x8c040d0a, 0x0402000d, 0x8c040d08,</div><div class='del'>-	0x0402000b, 0x8c040d0c, 0x04020006, 0x8c040d0e,</div><div class='del'>-	0x0400000d, 0x4a035017, 0x00000001, 0x0401f00a,</div><div class='del'>-	0x4a035017, 0x00000000, 0x0401f007, 0x42000000,</div><div class='del'>-	0x0010b642, 0x0201f800, 0x0010a86e, 0x4a035017,</div><div class='del'>-	0x00000004, 0x1c01f000, 0x0401f8a6, 0x0401f859,</div><div class='del'>-	0x59c40805, 0x8c040d0a, 0x0402000b, 0x8c040d0c,</div><div class='del'>-	0x04020006, 0x8c040d0e, 0x04000009, 0x4a035017,</div><div class='del'>-	0x00000001, 0x0401f006, 0x4a035017, 0x00000000,</div><div class='del'>-	0x0401f003, 0x4a035017, 0x00000002, 0x1c01f000,</div><div class='del'>-	0x4a038808, 0x00000004, 0x0401f846, 0x59c40805,</div><div class='del'>-	0x8c040d0a, 0x04020010, 0x8c040d08, 0x0402000b,</div><div class='del'>-	0x8c040d0c, 0x04020006, 0x8c040d0e, 0x0400000c,</div><div class='del'>-	0x4a035017, 0x00000001, 0x0401f009, 0x4a035017,</div><div class='del'>-	0x00000000, 0x0401f006, 0x4a035017, 0x00000003,</div><div class='del'>-	0x0401f003, 0x4a035017, 0x00000002, 0x1c01f000,</div><div class='del'>-	0x0401f91d, 0x02020800, 0x00100615, 0x59a80805,</div><div class='del'>-	0x8c040d0c, 0x04000015, 0x84040d0c, 0x48075005,</div><div class='del'>-	0x4a038805, 0x00000010, 0x0201f800, 0x001019a4,</div><div class='del'>-	0x59c40005, 0x8c000508, 0x04000008, 0x4a038808,</div><div class='del'>-	0x00000008, 0x4a035033, 0x00000001, 0x4202d800,</div><div class='del'>-	0x00000001, 0x0401f01a, 0x59c40006, 0x84000548,</div><div class='del'>-	0x48038806, 0x0401f016, 0x59a80017, 0x82000580,</div><div class='del'>-	0x00000001, 0x0400000c, 0x59a80017, 0x82000580,</div><div class='del'>-	0x00000005, 0x0402000c, 0x42000000, 0x0010b642,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x4a035017, 0x00000008,</div><div class='del'>-	0x0401f007, 0x42000000, 0x0010b642, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x4a035017, 0x00000004, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4c040000, 0x4c080000, 0x42000800,</div><div class='del'>-	0x00000064, 0x42001000, 0x00104d2c, 0x0201f800,</div><div class='del'>-	0x00105db2, 0x5c001000, 0x5c000800, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4c040000, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x0201f800, 0x00106b71, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x0401ffba, 0x5c000800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c040000, 0x4c080000,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x4df00000, 0x0201f800,</div><div class='del'>-	0x00106b71, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x59c40006, 0x84000500, 0x48038806, 0x0201f800,</div><div class='del'>-	0x00106c32, 0x497b8880, 0x0201f800, 0x0010a7e7,</div><div class='del'>-	0x0201f800, 0x0010a7f5, 0x0201f800, 0x00101886,</div><div class='del'>-	0x4a03504c, 0x00000004, 0x4202d800, 0x00000004,</div><div class='del'>-	0x4a038805, 0x00000001, 0x42001000, 0x00104d2c,</div><div class='del'>-	0x0201f800, 0x00105dbd, 0x0201f800, 0x0010071a,</div><div class='del'>-	0x0401f8bf, 0x04000006, 0x42006000, 0xfeffffff,</div><div class='del'>-	0x41786800, 0x0201f800, 0x001040ad, 0x0201f800,</div><div class='del'>-	0x0010048c, 0x42000000, 0x00000001, 0x0201f800,</div><div class='del'>-	0x001015fa, 0x5c001000, 0x5c000800, 0x1c01f000,</div><div class='del'>-	0x59c40008, 0x8c000508, 0x04020007, 0x4a038808,</div><div class='del'>-	0x00000010, 0x4201d000, 0x00001388, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x1c01f000, 0x4c040000, 0x59a80833,</div><div class='del'>-	0x82040580, 0x00000000, 0x0400000b, 0x82040580,</div><div class='del'>-	0x00000001, 0x0400000b, 0x82040580, 0x00000002,</div><div class='del'>-	0x0400000b, 0x82040580, 0x00000003, 0x0400000b,</div><div class='del'>-	0x0401f055, 0x4a035017, 0x00000000, 0x0401f009,</div><div class='del'>-	0x4a035017, 0x00000004, 0x0401f006, 0x4a035017,</div><div class='del'>-	0x00000001, 0x0401f003, 0x4a035017, 0x00000007,</div><div class='del'>-	0x497b8880, 0x4a038893, 0x00000001, 0x41780000,</div><div class='del'>-	0x0201f800, 0x00101670, 0x0201f800, 0x00106c32,</div><div class='del'>-	0x836c0d80, 0x00000004, 0x04000008, 0x59c40006,</div><div class='del'>-	0x82000500, 0xffffff0f, 0x82000540, 0x04000001,</div><div class='del'>-	0x48038806, 0x0401f007, 0x59c40006, 0x82000500,</div><div class='del'>-	0xffffff0f, 0x82000540, 0x04000000, 0x48038806,</div><div class='del'>-	0x0401f873, 0x04020005, 0x59c40806, 0x82040d00,</div><div class='del'>-	0xfbffff0f, 0x48078806, 0x59c40005, 0x8c000534,</div><div class='del'>-	0x04020033, 0x42006000, 0xfc18ffff, 0x42006800,</div><div class='del'>-	0x01000000, 0x0201f800, 0x001040ad, 0x0201f800,</div><div class='del'>-	0x001019a4, 0x59c408a4, 0x82040d00, 0x0000000f,</div><div class='del'>-	0x82040d80, 0x0000000c, 0x040208a9, 0x0401f85c,</div><div class='del'>-	0x04000006, 0x42006000, 0xfeffffff, 0x41786800,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x836c0d80, 0x00000004,</div><div class='del'>-	0x0400000f, 0x0401f85a, 0x04020008, 0x59940005,</div><div class='del'>-	0x82000580, 0x00103f37, 0x04020004, 0x59940004,</div><div class='del'>-	0x800001c0, 0x04020006, 0x59a8084d, 0x42001000,</div><div class='del'>-	0x00104d39, 0x0201f800, 0x00105da7, 0x4a035033,</div><div class='del'>-	0x00000004, 0x0401fe33, 0x0401f841, 0x04020008,</div><div class='del'>-	0x59c408a4, 0x82040d00, 0x0000000f, 0x82040580,</div><div class='del'>-	0x0000000c, 0x02020800, 0x00100615, 0x5c000800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c000000, 0x0201f800,</div><div class='del'>-	0x00105de2, 0x4a035010, 0x00ffffff, 0x497b5032,</div><div class='del'>-	0x59a8002a, 0x82000500, 0xffff0000, 0x4803502a,</div><div class='del'>-	0x497b8880, 0x497b8893, 0x41780000, 0x0201f800,</div><div class='del'>-	0x00101670, 0x59c40001, 0x82000500, 0xfffffcff,</div><div class='del'>-	0x48038801, 0x42006000, 0xfc18ffff, 0x41786800,</div><div class='del'>-	0x0201f800, 0x001040ad, 0x4a038808, 0x00000000,</div><div class='del'>-	0x5c000000, 0x800001c0, 0x02020800, 0x00103f37,</div><div class='del'>-	0x4a038805, 0x040000f0, 0x59c40006, 0x82000500,</div><div class='del'>-	0xffffffcf, 0x82000540, 0x440000c1, 0x48038806,</div><div class='del'>-	0x1c01f000, 0x4c5c0000, 0x59a8b832, 0x825cbd80,</div><div class='del'>-	0x0000aaaa, 0x5c00b800, 0x1c01f000, 0x4c5c0000,</div><div class='del'>-	0x599cb818, 0x825cbd00, 0x00000030, 0x825cbd80,</div><div class='del'>-	0x00000000, 0x5c00b800, 0x1c01f000, 0x4c5c0000,</div><div class='del'>-	0x599cb818, 0x825cbd00, 0x00000030, 0x825cbd80,</div><div class='del'>-	0x00000010, 0x5c00b800, 0x1c01f000, 0x4c5c0000,</div><div class='del'>-	0x599cb818, 0x825cbd00, 0x00000030, 0x825cbd80,</div><div class='del'>-	0x00000020, 0x5c00b800, 0x1c01f000, 0x59a80005,</div><div class='del'>-	0x4803c857, 0x82000d00, 0x00000013, 0x04000024,</div><div class='del'>-	0x599c1017, 0x4d3c0000, 0x82000500, 0x00000011,</div><div class='del'>-	0x04000006, 0x417a7800, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x0402000a, 0x0401f012, 0x42027800, 0x00000008,</div><div class='del'>-	0x0201f800, 0x0010393e, 0x0400000d, 0x42003000,</div><div class='del'>-	0x00000003, 0x0401f003, 0x42003000, 0x00000004,</div><div class='del'>-	0x42028000, 0x0000000e, 0x0201f800, 0x0010a25b,</div><div class='del'>-	0x599c1017, 0x8c08150a, 0x04020007, 0x42028000,</div><div class='del'>-	0x00000004, 0x0201f800, 0x00101d90, 0x80000580,</div><div class='del'>-	0x0401f80d, 0x5c027800, 0x0401f00a, 0x0201f800,</div><div class='del'>-	0x0010393e, 0x04000007, 0x42028000, 0x0000000f,</div><div class='del'>-	0x42003000, 0x00000001, 0x0201f800, 0x0010a25b,</div><div class='del'>-	0x1c01f000, 0x59a80005, 0x04000004, 0x82000540,</div><div class='del'>-	0x00000010, 0x0401f003, 0x82000500, 0xffffffef,</div><div class='del'>-	0x48035005, 0x4803c857, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4c580000, 0x42000000, 0x0010b6ca, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x42000800, 0x0010bef0, 0x59c40003,</div><div class='del'>-	0x44000800, 0x59c40004, 0x48000801, 0x59c4000b,</div><div class='del'>-	0x48000802, 0x59c4008e, 0x48000803, 0x59c4008f,</div><div class='del'>-	0x48000804, 0x59c40090, 0x48000805, 0x59c40091,</div><div class='del'>-	0x48000806, 0x59c40092, 0x48000807, 0x59c40093,</div><div class='del'>-	0x48000808, 0x59c40099, 0x48000809, 0x59c4009e,</div><div class='del'>-	0x4800080a, 0x59c400aa, 0x4800080b, 0x59c400af,</div><div class='del'>-	0x4800080c, 0x59c400b2, 0x4800080d, 0x59c400b1,</div><div class='del'>-	0x4800080e, 0x82040c00, 0x0000000f, 0x41c41800,</div><div class='del'>-	0x4200b000, 0x00000030, 0x580c0050, 0x44000800,</div><div class='del'>-	0x80040800, 0x800c1800, 0x8058b040, 0x040207fb,</div><div class='del'>-	0x41c41800, 0x4200b000, 0x00000020, 0x580c0010,</div><div class='del'>-	0x44000800, 0x80040800, 0x800c1800, 0x8058b040,</div><div class='del'>-	0x040207fb, 0x497b8830, 0x4200b000, 0x00000040,</div><div class='del'>-	0x59c40031, 0x44000800, 0x80040800, 0x8058b040,</div><div class='del'>-	0x040207fc, 0x497b88ac, 0x4200b000, 0x00000010,</div><div class='del'>-	0x59c400ad, 0x44000800, 0x80040800, 0x8058b040,</div><div class='del'>-	0x040207fc, 0x59c41001, 0x4c080000, 0x8408150c,</div><div class='del'>-	0x480b8801, 0x4a0370e4, 0x00000300, 0x4a0370e5,</div><div class='del'>-	0xb0000000, 0x42000800, 0x00000800, 0x80040840,</div><div class='del'>-	0x02000800, 0x00100615, 0x59b800e5, 0x8c000538,</div><div class='del'>-	0x040207fb, 0x4a0370e4, 0x00000200, 0x42006000,</div><div class='del'>-	0xffffffff, 0x42006800, 0x80000000, 0x0201f800,</div><div class='del'>-	0x001040ad, 0x4a038807, 0x00000001, 0x497b8807,</div><div class='del'>-	0x4a038808, 0x00000010, 0x42006000, 0xfcf8ffff,</div><div class='del'>-	0x42006800, 0x01000000, 0x0201f800, 0x001040ad,</div><div class='del'>-	0x5c001000, 0x480b8801, 0x42000800, 0x0010bef0,</div><div class='del'>-	0x50040000, 0x48038803, 0x58040001, 0x48038804,</div><div class='del'>-	0x58040002, 0x4803880b, 0x58040003, 0x4803888e,</div><div class='del'>-	0x58040004, 0x4803888f, 0x58040005, 0x48038890,</div><div class='del'>-	0x58040006, 0x48038891, 0x58040007, 0x48038892,</div><div class='del'>-	0x58040008, 0x48038893, 0x58040009, 0x48038899,</div><div class='del'>-	0x5804000a, 0x4803889e, 0x5804000b, 0x480388aa,</div><div class='del'>-	0x5804000c, 0x480388af, 0x5804000d, 0x480388b2,</div><div class='del'>-	0x5804000e, 0x480388b1, 0x82040c00, 0x0000000f,</div><div class='del'>-	0x41c41800, 0x4200b000, 0x00000030, 0x50040000,</div><div class='del'>-	0x48001850, 0x80040800, 0x800c1800, 0x8058b040,</div><div class='del'>-	0x040207fb, 0x41c41800, 0x4200b000, 0x00000020,</div><div class='del'>-	0x50040000, 0x48001810, 0x80040800, 0x800c1800,</div><div class='del'>-	0x8058b040, 0x040207fb, 0x497b8830, 0x4200b000,</div><div class='del'>-	0x00000040, 0x50040000, 0x48038831, 0x80040800,</div><div class='del'>-	0x8058b040, 0x040207fc, 0x497b88ac, 0x4200b000,</div><div class='del'>-	0x00000010, 0x50040000, 0x480388ad, 0x80040800,</div><div class='del'>-	0x8058b040, 0x040207fc, 0x497b8880, 0x41780000,</div><div class='del'>-	0x0201f800, 0x00101670, 0x59c408a4, 0x82040d00,</div><div class='del'>-	0x0000000f, 0x82040580, 0x0000000c, 0x02020800,</div><div class='del'>-	0x00100615, 0x4a038805, 0x04000000, 0x5c00b000,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c580000, 0x4ce80000,</div><div class='del'>-	0x42000000, 0x0010b643, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x59c41008, 0x4c080000, 0x82080500, 0xffffff7f,</div><div class='del'>-	0x48038808, 0x59c40004, 0x82000500, 0x00003e02,</div><div class='del'>-	0x04000005, 0x4201d000, 0x00000014, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x59c40006, 0x82000500, 0xffffff0f,</div><div class='del'>-	0x48038806, 0x4a038805, 0x00000010, 0x4a038808,</div><div class='del'>-	0x00000004, 0x4200b000, 0x00000065, 0x59c40005,</div><div class='del'>-	0x8c000508, 0x04020012, 0x4201d000, 0x000003e8,</div><div class='del'>-	0x0201f800, 0x00105dd2, 0x8058b040, 0x040207f8,</div><div class='del'>-	0x0201f800, 0x00106c32, 0x4a038808, 0x00000008,</div><div class='del'>-	0x4a035033, 0x00000001, 0x4202d800, 0x00000001,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f030, 0x0201f800,</div><div class='del'>-	0x00100b29, 0x42000000, 0x0010b6a7, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00100f42, 0x497b8880,</div><div class='del'>-	0x59a8002a, 0x82000500, 0x0000ffff, 0x4c000000,</div><div class='del'>-	0x0201f800, 0x00101670, 0x5c000000, 0x48038880,</div><div class='del'>-	0x4a038808, 0x00000000, 0x4200b000, 0x00000065,</div><div class='del'>-	0x4a038805, 0x000000f0, 0x0201f800, 0x001019a4,</div><div class='del'>-	0x42000800, 0x000000f0, 0x59c40005, 0x80040d00,</div><div class='del'>-	0x04000008, 0x4201d000, 0x000003e8, 0x0201f800,</div><div class='del'>-	0x00105dd2, 0x8058b040, 0x040207f2, 0x0401f7d1,</div><div class='del'>-	0x59c40006, 0x82000540, 0x000000f0, 0x48038806,</div><div class='del'>-	0x59a8001e, 0x80000540, 0x04020002, 0x80000000,</div><div class='del'>-	0x48038893, 0x80000580, 0x5c001000, 0x4df00000,</div><div class='del'>-	0x0201f800, 0x001019ca, 0x5c03e000, 0x480b8808,</div><div class='del'>-	0x5c01d000, 0x5c00b000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4c580000, 0x4ce80000, 0x59c41008, 0x82080500,</div><div class='del'>-	0xffffff7f, 0x48038808, 0x4c080000, 0x59c40004,</div><div class='del'>-	0x82000500, 0x00003e02, 0x04000005, 0x4201d000,</div><div class='del'>-	0x00000014, 0x0201f800, 0x00105dd2, 0x0201f800,</div><div class='del'>-	0x00100b29, 0x42000000, 0x0010b6a8, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00100f42, 0x4a038808,</div><div class='del'>-	0x00000002, 0x80000580, 0x48038880, 0x48038893,</div><div class='del'>-	0x0201f800, 0x00101670, 0x4200b000, 0x00000384,</div><div class='del'>-	0x4a038805, 0x000000f0, 0x0201f800, 0x001019a4,</div><div class='del'>-	0x42000800, 0x000000f0, 0x59c40005, 0x80040d00,</div><div class='del'>-	0x04000015, 0x82000500, 0x000000d0, 0x04020012,</div><div class='del'>-	0x4201d000, 0x00000067, 0x0201f800, 0x00105dd2,</div><div class='del'>-	0x8058b040, 0x040207ef, 0x0201f800, 0x00106c32,</div><div class='del'>-	0x4a038808, 0x00000008, 0x4a035033, 0x00000001,</div><div class='del'>-	0x4202d800, 0x00000001, 0x82000540, 0x00000001,</div><div class='del'>-	0x0401f010, 0x497b8880, 0x59a8001e, 0x80000540,</div><div class='del'>-	0x04020002, 0x80000000, 0x48038893, 0x59a8002a,</div><div class='del'>-	0x82000500, 0x0000ffff, 0x4c000000, 0x0201f800,</div><div class='del'>-	0x00101670, 0x5c000000, 0x48038880, 0x80000580,</div><div class='del'>-	0x5c001000, 0x4df00000, 0x0201f800, 0x001019ca,</div><div class='del'>-	0x5c03e000, 0x480b8808, 0x5c01d000, 0x5c00b000,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x59c40004, 0x82000500,</div><div class='del'>-	0x00003e02, 0x0400000a, 0x0201f800, 0x00106c32,</div><div class='del'>-	0x4a038808, 0x00000008, 0x4a035033, 0x00000001,</div><div class='del'>-	0x4202d800, 0x00000001, 0x0401f052, 0x0201f800,</div><div class='del'>-	0x00100b29, 0x42000000, 0x0010b6a9, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00100f42, 0x59c40006,</div><div class='del'>-	0x84000508, 0x48038806, 0x4a038805, 0x00000010,</div><div class='del'>-	0x59a80805, 0x84040d4c, 0x48075005, 0x42000800,</div><div class='del'>-	0x00000064, 0x42001000, 0x00104d2c, 0x0201f800,</div><div class='del'>-	0x00105da7, 0x4a038808, 0x00000000, 0x497b8880,</div><div class='del'>-	0x4a038805, 0x000000f0, 0x0201f800, 0x001019a4,</div><div class='del'>-	0x42000800, 0x000000f0, 0x59c40005, 0x80040d00,</div><div class='del'>-	0x0400000e, 0x82000500, 0x000000e0, 0x0402000b,</div><div class='del'>-	0x4201d000, 0x000003e8, 0x0201f800, 0x00105dd2,</div><div class='del'>-	0x0201f800, 0x00105c81, 0x59940004, 0x80000540,</div><div class='del'>-	0x040207ec, 0x0401f023, 0x4c080000, 0x42001000,</div><div class='del'>-	0x00104d39, 0x0201f800, 0x00105cc9, 0x42001000,</div><div class='del'>-	0x00104d2c, 0x0201f800, 0x00105dbd, 0x5c001000,</div><div class='del'>-	0x497b8880, 0x59a8001e, 0x80000540, 0x04020002,</div><div class='del'>-	0x80000000, 0x48038893, 0x59a8002a, 0x82000500,</div><div class='del'>-	0x0000ffff, 0x4c000000, 0x0201f800, 0x00101670,</div><div class='del'>-	0x5c000000, 0x48038880, 0x59a80805, 0x84040d0c,</div><div class='del'>-	0x48075005, 0x59c40006, 0x84000548, 0x48038806,</div><div class='del'>-	0x0201f800, 0x001019ca, 0x4a038808, 0x00000080,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4d400000, 0x4d3c0000,</div><div class='del'>-	0x0201f800, 0x00106c32, 0x0201f800, 0x0010a95a,</div><div class='del'>-	0x04020024, 0x599c1017, 0x59a80805, 0x8c040d00,</div><div class='del'>-	0x0402000c, 0x8c08151a, 0x0400001e, 0x84040d42,</div><div class='del'>-	0x48075005, 0x42028000, 0x00000004, 0x42027800,</div><div class='del'>-	0x00000008, 0x8c081508, 0x04020007, 0x0401f011,</div><div class='del'>-	0x42028000, 0x00000004, 0x417a7800, 0x8c081508,</div><div class='del'>-	0x0400000c, 0x4d400000, 0x42028000, 0x0000000e,</div><div class='del'>-	0x42028800, 0x0000ffff, 0x0201f800, 0x0010a258,</div><div class='del'>-	0x5c028000, 0x599c0817, 0x8c040d0a, 0x04020005,</div><div class='del'>-	0x4943c857, 0x493fc857, 0x0201f800, 0x00101d90,</div><div class='del'>-	0x497b8880, 0x4202d800, 0x00000001, 0x0401fcff,</div><div class='del'>-	0x5c027800, 0x5c028000, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00100b29, 0x42000000, 0x0010b6aa, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00100f42, 0x42000000,</div><div class='del'>-	0x00000001, 0x0201f800, 0x00101670, 0x4a038880,</div><div class='del'>-	0x00000001, 0x0201f000, 0x001019ca, 0x4202e000,</div><div class='del'>-	0x00000000, 0x4a033015, 0x00000001, 0x497b301d,</div><div class='del'>-	0x497b3006, 0x4a03b004, 0x60000001, 0x59d80005,</div><div class='del'>-	0x4a03b004, 0x90000001, 0x4a03a804, 0x60000001,</div><div class='del'>-	0x59d40005, 0x4a03a804, 0x90000001, 0x0201f000,</div><div class='del'>-	0x00105667, 0x4a03c825, 0x00000004, 0x4a03c827,</div><div class='del'>-	0x00000004, 0x599c0409, 0x80000d40, 0x04000020,</div><div class='del'>-	0x599c0407, 0x80000540, 0x04000007, 0x800000cc,</div><div class='del'>-	0x599c100b, 0x80080400, 0x4803b000, 0x497bb002,</div><div class='del'>-	0x59d80001, 0x599c000b, 0x4803b000, 0x599c000c,</div><div class='del'>-	0x4803b001, 0x599c0407, 0x80000540, 0x04020002,</div><div class='del'>-	0x497bb002, 0x599c0c09, 0x82040540, 0x00400000,</div><div class='del'>-	0x4803b003, 0x4a03b009, 0x00000004, 0x4a03b004,</div><div class='del'>-	0x10000001, 0x59e00803, 0x82040d00, 0xfffffeff,</div><div class='del'>-	0x82040d40, 0x00008000, 0x4807c003, 0x599c040a,</div><div class='del'>-	0x80000540, 0x04000020, 0x599c0408, 0x80000540,</div><div class='del'>-	0x04000007, 0x800000cc, 0x599c100f, 0x80080400,</div><div class='del'>-	0x4803a800, 0x497ba802, 0x59d40001, 0x599c000f,</div><div class='del'>-	0x4803a800, 0x599c0010, 0x4803a801, 0x599c0408,</div><div class='del'>-	0x80000540, 0x04020002, 0x497ba802, 0x599c0c0a,</div><div class='del'>-	0x82040540, 0x00400000, 0x4803a803, 0x4a03a809,</div><div class='del'>-	0x00000004, 0x4a03a804, 0x10000001, 0x59e00803,</div><div class='del'>-	0x82040d00, 0xfffffbff, 0x82040d40, 0x00008000,</div><div class='del'>-	0x4807c003, 0x800409c0, 0x04000007, 0x4202e000,</div><div class='del'>-	0x00000001, 0x0200b800, 0x00020685, 0x0200f000,</div><div class='del'>-	0x0002069a, 0x1c01f000, 0x0201f800, 0x00100615,</div><div class='del'>-	0x1c01f000, 0x4df00000, 0x4203e000, 0x50000000,</div><div class='del'>-	0x59981005, 0x800811c0, 0x0400001e, 0x58080005,</div><div class='del'>-	0x82000d00, 0x43018780, 0x02020000, 0x0010552a,</div><div class='del'>-	0x8c000508, 0x04000015, 0x580a5808, 0x592c0204,</div><div class='del'>-	0x497a5800, 0x497a5801, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82000c80, 0x0000004b, 0x0402100b, 0x0c01f80f,</div><div class='del'>-	0x5c03e000, 0x83700580, 0x00000003, 0x040007e6,</div><div class='del'>-	0x0200f800, 0x0002069a, 0x0200b000, 0x00020685,</div><div class='del'>-	0x1c01f000, 0x0401f850, 0x5c03e000, 0x0401f7f9,</div><div class='del'>-	0x0401f8ee, 0x0401f7fd, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105171, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x001051f9, 0x00105161, 0x00105161, 0x00105171,</div><div class='del'>-	0x00105171, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x492fc857, 0x42000000, 0x0010b65d,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42000000, 0x00000400,</div><div class='del'>-	0x0401f019, 0x492fc857, 0x42000000, 0x0010b65c,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42000000, 0x00001000,</div><div class='del'>-	0x0401f011, 0x492fc857, 0x42000000, 0x0010b65b,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42000000, 0x00002000,</div><div class='del'>-	0x0401f009, 0x492fc857, 0x42000000, 0x0010b65e,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x42000000, 0x00000800,</div><div class='del'>-	0x0401f001, 0x4803c857, 0x4202e000, 0x00000001,</div><div class='del'>-	0x592c0c04, 0x82040d00, 0xffff80ff, 0x80040540,</div><div class='del'>-	0x48025c04, 0x0201f000, 0x00020381, 0x592c0204,</div><div class='del'>-	0x492fc857, 0x80000110, 0x040007db, 0x80000040,</div><div class='del'>-	0x04000035, 0x48033002, 0x492f3003, 0x492f3004,</div><div class='del'>-	0x4a033008, 0x001051c5, 0x4202e000, 0x00000003,</div><div class='del'>-	0x1c01f000, 0x592c0204, 0x492fc857, 0x80000110,</div><div class='del'>-	0x040007cd, 0x80000040, 0x04000043, 0x48033002,</div><div class='del'>-	0x492f3003, 0x492f3004, 0x4a033008, 0x001051e1,</div><div class='del'>-	0x4202e000, 0x00000003, 0x1c01f000, 0x492fc857,</div><div class='del'>-	0x0201f800, 0x0010a95a, 0x02020000, 0x0002060c,</div><div class='del'>-	0x492fc857, 0x592e8a06, 0x83440c80, 0x000007f0,</div><div class='del'>-	0x0402100b, 0x83440400, 0x0010aa00, 0x50000000,</div><div class='del'>-	0x80026d40, 0x04000006, 0x4937c857, 0x59340200,</div><div class='del'>-	0x8c00050e, 0x02020000, 0x0002060c, 0x42028000,</div><div class='del'>-	0x00000028, 0x41780800, 0x417a6000, 0x0201f800,</div><div class='del'>-	0x00104bee, 0x0201f800, 0x00108f7d, 0x0201f000,</div><div class='del'>-	0x00020381, 0x592c0a0a, 0x8c040d02, 0x04020016,</div><div class='del'>-	0x59a80021, 0x492fc857, 0x80000540, 0x0402000f,</div><div class='del'>-	0x592c0207, 0x80000540, 0x04000005, 0x0201f800,</div><div class='del'>-	0x00104156, 0x04020004, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x00000000, 0x592c0a06, 0x48065c06, 0x48025a06,</div><div class='del'>-	0x0201f000, 0x00020381, 0x42000000, 0x00000028,</div><div class='del'>-	0x0401f7f9, 0x42000800, 0x00000009, 0x0201f000,</div><div class='del'>-	0x001063a9, 0x592c0208, 0x492fc857, 0x82000c80,</div><div class='del'>-	0x0000199a, 0x04021794, 0x592c0408, 0x80000540,</div><div class='del'>-	0x04020791, 0x59a80821, 0x800409c0, 0x04020009,</div><div class='del'>-	0x592c0207, 0x80000540, 0x0400078b, 0x497a5a06,</div><div class='del'>-	0x0201f800, 0x001041b5, 0x04020004, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x00000028, 0x48025a06, 0x0201f000,</div><div class='del'>-	0x00020381, 0x59980804, 0x59980002, 0x48065800,</div><div class='del'>-	0x492c0801, 0x492f3004, 0x80000040, 0x48033002,</div><div class='del'>-	0x04000002, 0x1c01f000, 0x599a5803, 0x59980008,</div><div class='del'>-	0x4202e000, 0x00000001, 0x0801f000, 0x592e8a06,</div><div class='del'>-	0x592c0406, 0x4803c856, 0x82000500, 0x000000ff,</div><div class='del'>-	0x4200b800, 0x00000001, 0x82000d80, 0x00000001,</div><div class='del'>-	0x04000015, 0x417a8800, 0x4200b800, 0x000007f0,</div><div class='del'>-	0x82000d80, 0x00000002, 0x0400000f, 0x80000540,</div><div class='del'>-	0x02020000, 0x00020381, 0x592e8a06, 0x0201f800,</div><div class='del'>-	0x00020267, 0x02020000, 0x00020381, 0x592e9008,</div><div class='del'>-	0x592e9809, 0x0201f800, 0x00104567, 0x0201f000,</div><div class='del'>-	0x00020381, 0x59a80805, 0x84040d00, 0x48075005,</div><div class='del'>-	0x0201f800, 0x00020267, 0x02000800, 0x0010467a,</div><div class='del'>-	0x81468800, 0x805cb840, 0x040207fa, 0x0201f000,</div><div class='del'>-	0x00020381, 0x592c0a08, 0x4807c857, 0x82040580,</div><div class='del'>-	0x0000000e, 0x04000045, 0x82040580, 0x00000046,</div><div class='del'>-	0x04000046, 0x82040580, 0x00000045, 0x04000020,</div><div class='del'>-	0x82040580, 0x00000029, 0x04000010, 0x82040580,</div><div class='del'>-	0x0000002a, 0x04000009, 0x82040580, 0x0000000f,</div><div class='del'>-	0x04000200, 0x82040580, 0x0000002e, 0x040001fd,</div><div class='del'>-	0x4807c856, 0x0401f1f6, 0x59a80805, 0x84040d04,</div><div class='del'>-	0x48075005, 0x0401f1f7, 0x592e8a06, 0x0201f800,</div><div class='del'>-	0x00020267, 0x040201f3, 0x59340200, 0x84000518,</div><div class='del'>-	0x48026a00, 0x592e6009, 0x4933c857, 0x83300580,</div><div class='del'>-	0xffffffff, 0x0402002a, 0x0401f1ea, 0x592c1407,</div><div class='del'>-	0x480bc857, 0x0201f800, 0x001091d9, 0x411e6000,</div><div class='del'>-	0x04020003, 0x4803c856, 0x0401f1dd, 0x592e3809,</div><div class='del'>-	0x591c1414, 0x84081516, 0x84081554, 0x480a3c14,</div><div class='del'>-	0x4a026403, 0x0000003a, 0x592c040b, 0x80000540,</div><div class='del'>-	0x04000007, 0x4a026403, 0x0000003b, 0x592c020c,</div><div class='del'>-	0x4802641a, 0x592c040c, 0x4802621a, 0x4a026203,</div><div class='del'>-	0x00000001, 0x42000800, 0x80000040, 0x0201f800,</div><div class='del'>-	0x00020855, 0x0401f1cb, 0x59a80068, 0x84000510,</div><div class='del'>-	0x48035068, 0x0401f1c7, 0x592c1207, 0x8c081500,</div><div class='del'>-	0x040201c4, 0x592e8a06, 0x592e6009, 0x0201f800,</div><div class='del'>-	0x001091e3, 0x04020003, 0x4803c856, 0x0401f1b8,</div><div class='del'>-	0x59300c06, 0x82040580, 0x00000004, 0x04000003,</div><div class='del'>-	0x4803c856, 0x0401f1b2, 0x59300a03, 0x82040580,</div><div class='del'>-	0x00000007, 0x04000003, 0x4803c856, 0x0401f1ac,</div><div class='del'>-	0x59300c03, 0x82040580, 0x00000001, 0x04000025,</div><div class='del'>-	0x82040580, 0x00000003, 0x0400001a, 0x82040580,</div><div class='del'>-	0x00000006, 0x04000024, 0x82040580, 0x00000008,</div><div class='del'>-	0x04000019, 0x82040580, 0x0000000a, 0x0400000a,</div><div class='del'>-	0x82040580, 0x0000000c, 0x04000004, 0x82040580,</div><div class='del'>-	0x0000002e, 0x0402001c, 0x42000800, 0x00000009,</div><div class='del'>-	0x0401f017, 0x59326809, 0x0201f800, 0x0010484b,</div><div class='del'>-	0x04020015, 0x42000800, 0x00000005, 0x0401f010,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x4a026406,</div><div class='del'>-	0x00000001, 0x42000800, 0x00000003, 0x0401f008,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x4a026406,</div><div class='del'>-	0x00000001, 0x42000800, 0x0000000b, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026203, 0x00000001, 0x0201f800,</div><div class='del'>-	0x00106470, 0x0401f17b, 0x40000800, 0x58040000,</div><div class='del'>-	0x80000540, 0x040207fd, 0x492c0800, 0x1c01f000,</div><div class='del'>-	0x492fc857, 0x59300c06, 0x82040580, 0x00000006,</div><div class='del'>-	0x04020094, 0x0201f800, 0x00104836, 0x04020005,</div><div class='del'>-	0x59340200, 0x8c00051a, 0x02000000, 0x00020667,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x0400008a, 0x59300203,</div><div class='del'>-	0x42027800, 0x00000001, 0x82000580, 0x00000007,</div><div class='del'>-	0x02020000, 0x00020667, 0x4a026203, 0x00000002,</div><div class='del'>-	0x0201f000, 0x00020667, 0x42028000, 0x00000002,</div><div class='del'>-	0x4a026206, 0x00000014, 0x4d2c0000, 0x0201f800,</div><div class='del'>-	0x00109fc0, 0x5c025800, 0x59300c06, 0x4807c857,</div><div class='del'>-	0x82040580, 0x00000007, 0x04020063, 0x492fc857,</div><div class='del'>-	0x4a025a06, 0x00000001, 0x0201f000, 0x00020381,</div><div class='del'>-	0x592c240a, 0x492fc857, 0x4813c857, 0x8c10251c,</div><div class='del'>-	0x04020016, 0x8c10251a, 0x04000003, 0x8c10250a,</div><div class='del'>-	0x04000069, 0x59340a00, 0x8c040d0e, 0x04000003,</div><div class='del'>-	0x8c10251e, 0x04000064, 0x0201f800, 0x00020892,</div><div class='del'>-	0x0400006b, 0x592c240a, 0x49366009, 0x49325809,</div><div class='del'>-	0x4a026406, 0x00000006, 0x4a026203, 0x00000007,</div><div class='del'>-	0x0201f000, 0x00020663, 0x592c0a0c, 0x5934000f,</div><div class='del'>-	0x41784000, 0x80001540, 0x0400006d, 0x58080204,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82000580, 0x00000012,</div><div class='del'>-	0x04020004, 0x5808020c, 0x80040580, 0x04000004,</div><div class='del'>-	0x58080000, 0x40084000, 0x0401f7f3, 0x58080000,</div><div class='del'>-	0x49781000, 0x802041c0, 0x04000006, 0x48004000,</div><div class='del'>-	0x80000540, 0x04020007, 0x48226810, 0x0401f005,</div><div class='del'>-	0x4802680f, 0x80000540, 0x04020002, 0x497a6810,</div><div class='del'>-	0x4d2c0000, 0x400a5800, 0x4a025a06, 0x00000002,</div><div class='del'>-	0x0201f800, 0x00020381, 0x5c025800, 0x0401f7bc,</div><div class='del'>-	0x592c040a, 0x8c00051c, 0x04000016, 0x592c0206,</div><div class='del'>-	0x82000580, 0x0000ffff, 0x04020012, 0x592e6009,</div><div class='del'>-	0x83300580, 0xffffffff, 0x040007b1, 0x83300480,</div><div class='del'>-	0x0010cfc0, 0x04001010, 0x59a8000b, 0x81300480,</div><div class='del'>-	0x0402100d, 0x59300008, 0x800001c0, 0x04020005,</div><div class='del'>-	0x59300203, 0x82000580, 0x00000007, 0x04000797,</div><div class='del'>-	0x492fc857, 0x4a025a06, 0x00000029, 0x0201f000,</div><div class='del'>-	0x00020381, 0x492fc857, 0x4a025a06, 0x00000008,</div><div class='del'>-	0x0201f000, 0x00020381, 0x492fc857, 0x4a025a06,</div><div class='del'>-	0x00000045, 0x0201f000, 0x00020381, 0x492fc857,</div><div class='del'>-	0x4a025a06, 0x0000002a, 0x0201f000, 0x00020381,</div><div class='del'>-	0x492fc857, 0x4a025a06, 0x00000028, 0x0201f000,</div><div class='del'>-	0x00020381, 0x492fc857, 0x4a025a06, 0x00000006,</div><div class='del'>-	0x0201f000, 0x00020381, 0x492fc857, 0x4a025a06,</div><div class='del'>-	0x0000000e, 0x0201f000, 0x00020381, 0x59340010,</div><div class='del'>-	0x492e6810, 0x492fc857, 0x80000d40, 0x04000003,</div><div class='del'>-	0x492c0800, 0x1c01f000, 0x5934040b, 0x492e680f,</div><div class='del'>-	0x492fc857, 0x4803c857, 0x80000540, 0x04020003,</div><div class='del'>-	0x4a026a03, 0x00000001, 0x1c01f000, 0x59a8000e,</div><div class='del'>-	0x81640480, 0x0402176e, 0x42026000, 0x0010cfc0,</div><div class='del'>-	0x59300009, 0x81340580, 0x04020004, 0x59300202,</div><div class='del'>-	0x80040580, 0x04000759, 0x83326400, 0x00000024,</div><div class='del'>-	0x41580000, 0x81300480, 0x040017f6, 0x0401f760,</div><div class='del'>-	0x492fc857, 0x592c0407, 0x82000c80, 0x0000199a,</div><div class='del'>-	0x040215dd, 0x592c0204, 0x80000112, 0x040205ca,</div><div class='del'>-	0x592e8a06, 0x0201f800, 0x00020267, 0x04020059,</div><div class='del'>-	0x0201f800, 0x00104836, 0x04020059, 0x592e780a,</div><div class='del'>-	0x493fc857, 0x8d3e7d3e, 0x04020007, 0x59a80021,</div><div class='del'>-	0x80000540, 0x0402004f, 0x0201f800, 0x00104686,</div><div class='del'>-	0x040005c9, 0x833c1d00, 0x0000001f, 0x040005c6,</div><div class='del'>-	0x592c0207, 0x82000c80, 0x00001000, 0x040215c2,</div><div class='del'>-	0x800000c2, 0x800008c4, 0x8005d400, 0x592e9008,</div><div class='del'>-	0x592e9809, 0x5934080d, 0x800409c0, 0x0402002e,</div><div class='del'>-	0x833c1d00, 0x0000001f, 0x81780040, 0x80000000,</div><div class='del'>-	0x800c1902, 0x040217fe, 0x040205b3, 0x0c01f001,</div><div class='del'>-	0x001053cd, 0x001053d0, 0x001053dd, 0x001053e0,</div><div class='del'>-	0x001053e3, 0x0201f800, 0x00108dfb, 0x0401f01a,</div><div class='del'>-	0x0201f800, 0x00104659, 0x04000027, 0x80e9d1c0,</div><div class='del'>-	0x02020800, 0x00105ce7, 0x42028000, 0x00000005,</div><div class='del'>-	0x417a9000, 0x417a9800, 0x0201f800, 0x00108e0b,</div><div class='del'>-	0x0401f00d, 0x42027000, 0x0000004d, 0x0401f006,</div><div class='del'>-	0x42027000, 0x0000004e, 0x0401f003, 0x42027000,</div><div class='del'>-	0x00000052, 0x0201f800, 0x0010451d, 0x02020800,</div><div class='del'>-	0x00108e3b, 0x04000010, 0x8d3e7d3e, 0x04020017,</div><div class='del'>-	0x1c01f000, 0x58040002, 0x80000540, 0x04020007,</div><div class='del'>-	0x4d3c0000, 0x40067800, 0x0201f800, 0x00104639,</div><div class='del'>-	0x5c027800, 0x040207cb, 0x4a025a06, 0x00000030,</div><div class='del'>-	0x0401f00d, 0x4a025a06, 0x0000002c, 0x0401f00a,</div><div class='del'>-	0x4a025a06, 0x00000028, 0x0401f007, 0x4a025a06,</div><div class='del'>-	0x00000029, 0x0401f004, 0x497a5c09, 0x4a025a06,</div><div class='del'>-	0x00000000, 0x4a025a04, 0x00000103, 0x0201f000,</div><div class='del'>-	0x00020381, 0x492fc857, 0x592c0204, 0x80000110,</div><div class='del'>-	0x80000040, 0x04000002, 0x0401f55b, 0x592c0207,</div><div class='del'>-	0x82000500, 0x000003ff, 0x48025a07, 0x8c000506,</div><div class='del'>-	0x04000004, 0x82000500, 0x00000070, 0x04020004,</div><div class='del'>-	0x59a80821, 0x800409c0, 0x04020018, 0x4a025a06,</div><div class='del'>-	0x0000dead, 0x592c0408, 0x82000500, 0x0000f0ff,</div><div class='del'>-	0x48025c08, 0x0201f800, 0x001041e4, 0x04020002,</div><div class='del'>-	0x1c01f000, 0x49425a06, 0x8058b1c0, 0x04000009,</div><div class='del'>-	0x0201f800, 0x00109328, 0x0401f80f, 0x44042800,</div><div class='del'>-	0x82580580, 0x00000002, 0x04020002, 0x48082801,</div><div class='del'>-	0x0201f000, 0x00020381, 0x42028000, 0x00000031,</div><div class='del'>-	0x42000800, 0x00000001, 0x4200b000, 0x00000001,</div><div class='del'>-	0x0401f7ed, 0x592c0408, 0x80000118, 0x832c2c00,</div><div class='del'>-	0x00000009, 0x80142c00, 0x1c01f000, 0x492fc857,</div><div class='del'>-	0x4a025a08, 0x00000006, 0x0201f000, 0x00020381,</div><div class='del'>-	0x492fc857, 0x4a025a08, 0x00000001, 0x0201f000,</div><div class='del'>-	0x00020381, 0x492fc857, 0x592c040a, 0x82000500,</div><div class='del'>-	0x00000003, 0x04000020, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000021, 0x592c0204, 0x492e6008, 0x82000500,</div><div class='del'>-	0x000000ff, 0x82000580, 0x00000045, 0x0400000e,</div><div class='del'>-	0x592c000b, 0x0201f800, 0x001059b9, 0x02000800,</div><div class='del'>-	0x00020267, 0x04020018, 0x42027000, 0x00000041,</div><div class='del'>-	0x49366009, 0x4a026406, 0x00000001, 0x0201f000,</div><div class='del'>-	0x000208d8, 0x59300015, 0x8400055e, 0x48026015,</div><div class='del'>-	0x42026800, 0x0010b320, 0x42027000, 0x00000040,</div><div class='del'>-	0x0401f7f4, 0x4a025a06, 0x00000101, 0x0201f000,</div><div class='del'>-	0x00020381, 0x4a025a06, 0x0000002c, 0x0201f000,</div><div class='del'>-	0x00020381, 0x4a025a06, 0x00000028, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f000, 0x000208b4, 0x492fc857,</div><div class='del'>-	0x0201f800, 0x0010601a, 0x0400000b, 0x592c0204,</div><div class='del'>-	0x80000110, 0x80000040, 0x040204e7, 0x592c0c06,</div><div class='del'>-	0x800409c0, 0x04000009, 0x42000000, 0x00000102,</div><div class='del'>-	0x0401f003, 0x42000000, 0x00000104, 0x48025a06,</div><div class='del'>-	0x0201f000, 0x00020381, 0x592c0c07, 0x800409c0,</div><div class='del'>-	0x04000024, 0x82040480, 0x00000005, 0x04021021,</div><div class='del'>-	0x4c040000, 0x80040800, 0x0201f800, 0x0010603f,</div><div class='del'>-	0x5c001000, 0x04020018, 0x832c0400, 0x00000008,</div><div class='del'>-	0x4000a000, 0x0201f800, 0x00106068, 0x04020012,</div><div class='del'>-	0x592c1207, 0x82cc0580, 0x0010b30a, 0x04020009,</div><div class='del'>-	0x58c80c0b, 0x84040d00, 0x84040d02, 0x8c081500,</div><div class='del'>-	0x04000002, 0x84040d5e, 0x4805940b, 0x0401f001,</div><div class='del'>-	0x42000000, 0x00000000, 0x48025a06, 0x0201f000,</div><div class='del'>-	0x00020381, 0x42000000, 0x00000103, 0x0401f7fb,</div><div class='del'>-	0x42000000, 0x00000102, 0x0401f7f8, 0x492fc857,</div><div class='del'>-	0x592e7c06, 0x833c0500, 0xfffffffe, 0x04020043,</div><div class='del'>-	0x592c4007, 0x42026000, 0x0010cfc0, 0x41581800,</div><div class='del'>-	0x400c0000, 0x81300480, 0x04021023, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000000, 0x04000007, 0x59300008,</div><div class='del'>-	0x80000d40, 0x04000004, 0x58040005, 0x80200580,</div><div class='del'>-	0x04000004, 0x83326400, 0x00000024, 0x0401f7f1,</div><div class='del'>-	0x58040204, 0x82000500, 0x000000ff, 0x82000d80,</div><div class='del'>-	0x00000053, 0x04000007, 0x82000d80, 0x00000048,</div><div class='del'>-	0x04000004, 0x82000580, 0x00000018, 0x04020023,</div><div class='del'>-	0x4d2c0000, 0x0201f800, 0x00108997, 0x5c025800,</div><div class='del'>-	0x0400001e, 0x4a025a06, 0x00000000, 0x0201f000,</div><div class='del'>-	0x00020381, 0x592e8a06, 0x83440480, 0x000007f0,</div><div class='del'>-	0x04021016, 0x83440400, 0x0010aa00, 0x50000000,</div><div class='del'>-	0x80026d40, 0x04000011, 0x4d2c0000, 0x0201f800,</div><div class='del'>-	0x00104619, 0x0400000c, 0x42028000, 0x00000005,</div><div class='del'>-	0x592c0a08, 0x0201f800, 0x00104bee, 0x0201f800,</div><div class='del'>-	0x00108f83, 0x0201f800, 0x00020381, 0x5c025800,</div><div class='del'>-	0x0401f7e5, 0x5c025800, 0x4a025a06, 0x00000031,</div><div class='del'>-	0x0201f000, 0x00020381, 0x492fc857, 0x4d2c0000,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000016, 0x492fc857,</div><div class='del'>-	0x412f4000, 0x0201f800, 0x0010082a, 0x0400000e,</div><div class='del'>-	0x492fc857, 0x412dd800, 0x0201f800, 0x00103941,</div><div class='del'>-	0x0201f800, 0x0010394b, 0x49a1d80b, 0x5c025800,</div><div class='del'>-	0x492dd80a, 0x0201f800, 0x00101fbb, 0x0201f000,</div><div class='del'>-	0x00101fda, 0x41a25800, 0x0201f800, 0x0010083a,</div><div class='del'>-	0x5c025800, 0x4a025a06, 0x00004005, 0x4a025c06,</div><div class='del'>-	0x00000002, 0x0201f000, 0x00020381, 0x4807c857,</div><div class='del'>-	0x485fc857, 0x4200b800, 0x00000001, 0x5c000800,</div><div class='del'>-	0x4c5c0000, 0x0401f005, 0x4807c857, 0x485fc857,</div><div class='del'>-	0x5c000800, 0x4d780000, 0x4803c857, 0x492fc857,</div><div class='del'>-	0x8c00050e, 0x02020800, 0x0010060d, 0x4203e000,</div><div class='del'>-	0x50000000, 0x4200b800, 0x00008003, 0x0201f000,</div><div class='del'>-	0x0010061a, 0x592c0204, 0x80000110, 0x80000040,</div><div class='del'>-	0x0402042d, 0x0201f800, 0x00104886, 0x04020002,</div><div class='del'>-	0x1c01f000, 0x49425a06, 0x4806580d, 0x480a580e,</div><div class='del'>-	0x4943c857, 0x4807c857, 0x480bc857, 0x0201f000,</div><div class='del'>-	0x00020381, 0x592c0204, 0x80000110, 0x80000040,</div><div class='del'>-	0x0402041d, 0x0201f800, 0x001049ec, 0x04020002,</div><div class='del'>-	0x1c01f000, 0x49425a06, 0x48065811, 0x480a5812,</div><div class='del'>-	0x0201f000, 0x00020381, 0x592c0204, 0x80000110,</div><div class='del'>-	0x04000411, 0x80000040, 0x0402000c, 0x4202e000,</div><div class='del'>-	0x00000001, 0x592c020a, 0x8c000504, 0x02000000,</div><div class='del'>-	0x00020603, 0x592c0207, 0x82000c80, 0x00001001,</div><div class='del'>-	0x04021415, 0x0401f009, 0x4202e000, 0x00000003,</div><div class='del'>-	0x48033002, 0x492f3003, 0x492f3004, 0x4a033008,</div><div class='del'>-	0x00020603, 0x1c01f000, 0x4202e000, 0x00000002,</div><div class='del'>-	0x42000000, 0x0010bcd9, 0x50007000, 0x492c700b,</div><div class='del'>-	0x4978700e, 0x4978700c, 0x592c0011, 0x592c0812,</div><div class='del'>-	0x48007007, 0x48047008, 0x592c1013, 0x82080500,</div><div class='del'>-	0xffff0000, 0x04000003, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4978700d, 0x82080480, 0x00000180, 0x4803c857,</div><div class='del'>-	0x04001007, 0x4800700f, 0x4a007005, 0x00000180,</div><div class='del'>-	0x4a007004, 0x00000060, 0x0401f005, 0x4978700f,</div><div class='del'>-	0x48087005, 0x80081104, 0x48087004, 0x5838000a,</div><div class='del'>-	0x48007003, 0x40381000, 0x0201f000, 0x001008a1,</div><div class='del'>-	0x0201f800, 0x00100819, 0x04000003, 0x59980007,</div><div class='del'>-	0x0801f000, 0x1c01f000, 0x40307000, 0x5838000b,</div><div class='del'>-	0x80025d40, 0x0400001b, 0x58380002, 0x82000580,</div><div class='del'>-	0x00000100, 0x0400001d, 0x4c380000, 0x592c0204,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82000580, 0x00000012,</div><div class='del'>-	0x0400000b, 0x592c0208, 0x8400054e, 0x48025a08,</div><div class='del'>-	0x4a025a06, 0x00000002, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0401f005, 0x4a025a06,</div><div class='del'>-	0x00000010, 0x0201f800, 0x00020381, 0x5c007000,</div><div class='del'>-	0x4202e000, 0x00000001, 0x4a007002, 0x00000100,</div><div class='del'>-	0x49787010, 0x1c01f000, 0x58380004, 0x82000480,</div><div class='del'>-	0x00000003, 0x04000087, 0x58380010, 0x8c000500,</div><div class='del'>-	0x04020019, 0x4200b000, 0x00000003, 0x832cac00,</div><div class='del'>-	0x00000011, 0x5838000a, 0x5838100d, 0x8008a400,</div><div class='del'>-	0x4c380000, 0x0201f800, 0x0010a93e, 0x5c007000,</div><div class='del'>-	0x5838000d, 0x82000400, 0x00000003, 0x4800700d,</div><div class='del'>-	0x4a007010, 0x00000001, 0x58380004, 0x82000480,</div><div class='del'>-	0x00000003, 0x48007004, 0x82000580, 0x00000003,</div><div class='del'>-	0x0400006c, 0x5838000e, 0x80001d40, 0x04020020,</div><div class='del'>-	0x4c380000, 0x0201f800, 0x00100819, 0x5c007000,</div><div class='del'>-	0x04000010, 0x4a025a04, 0x0000010a, 0x42001800,</div><div class='del'>-	0x00000005, 0x480c700e, 0x5838000c, 0x80000540,</div><div class='del'>-	0x04020002, 0x5838000b, 0x40000800, 0x492c0801,</div><div class='del'>-	0x492c700c, 0x42000800, 0x0000000f, 0x0401f011,</div><div class='del'>-	0x4202e000, 0x00000008, 0x4a033007, 0x001055f9,</div><div class='del'>-	0x1c01f000, 0x4202e000, 0x00000002, 0x42000000,</div><div class='del'>-	0x0010bcd9, 0x50007000, 0x0401f7e7, 0x583a580c,</div><div class='del'>-	0x400c0000, 0x42000800, 0x00000014, 0x80040c80,</div><div class='del'>-	0x58381004, 0x5838000f, 0x41783000, 0x80000540,</div><div class='del'>-	0x04020005, 0x84183540, 0x82081480, 0x00000003,</div><div class='del'>-	0x0400003c, 0x40080000, 0x80040480, 0x04001002,</div><div class='del'>-	0x40080800, 0x4004b000, 0x412c0000, 0x800c0400,</div><div class='del'>-	0x4000a800, 0x5838000a, 0x5838100d, 0x8008a400,</div><div class='del'>-	0x4c080000, 0x4c040000, 0x4c0c0000, 0x4c380000,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x5c007000, 0x5c001800,</div><div class='del'>-	0x5c000800, 0x40040000, 0x58381004, 0x80080480,</div><div class='del'>-	0x48007004, 0x82000580, 0x00000003, 0x04000002,</div><div class='del'>-	0x84183500, 0x5c000000, 0x80041400, 0x82080480,</div><div class='del'>-	0x00000060, 0x04020003, 0x84183542, 0x41781000,</div><div class='del'>-	0x400c0000, 0x80041c00, 0x820c0480, 0x00000014,</div><div class='del'>-	0x04020003, 0x84183544, 0x40001800, 0x40080800,</div><div class='del'>-	0x4804700d, 0x480c700e, 0x40180000, 0x0c01f001,</div><div class='del'>-	0x00105644, 0x00105648, 0x00105646, 0x00105644,</div><div class='del'>-	0x001055e0, 0x00105648, 0x00105646, 0x00105644,</div><div class='del'>-	0x0201f800, 0x00100615, 0x5838100f, 0x0401f739,</div><div class='del'>-	0x5838080d, 0x82040400, 0x00000002, 0x5838100a,</div><div class='del'>-	0x80080400, 0x50001000, 0x800811c0, 0x0402000f,</div><div class='del'>-	0x4202e000, 0x00000001, 0x583a580b, 0x4978700b,</div><div class='del'>-	0x49787010, 0x592c0204, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82000580, 0x00000012, 0x02000000, 0x0002063b,</div><div class='del'>-	0x0201f000, 0x00020603, 0x5838000a, 0x80040c00,</div><div class='del'>-	0x82381c00, 0x00000007, 0x54041800, 0x80040800,</div><div class='del'>-	0x800c1800, 0x54041800, 0x0401f71a, 0x0201f800,</div><div class='del'>-	0x00100819, 0x02000800, 0x00100615, 0x4a02580a,</div><div class='del'>-	0x0010bc78, 0x42000800, 0x0010bcd9, 0x452c0800,</div><div class='del'>-	0x497a580b, 0x497a580c, 0x497a580d, 0x497a580e,</div><div class='del'>-	0x497a580f, 0x4a025809, 0x0010559a, 0x497a5810,</div><div class='del'>-	0x4a025802, 0x00000100, 0x4a025801, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x59c80007, 0x8c000502, 0x04000071,</div><div class='del'>-	0x835c2c80, 0x00000005, 0x02001000, 0x00105c5c,</div><div class='del'>-	0x59c82817, 0x4817506e, 0x497b9005, 0x82140500,</div><div class='del'>-	0x00e00000, 0x0402004f, 0x82140500, 0x000003ff,</div><div class='del'>-	0x82001c00, 0x00000006, 0x41cc2000, 0x42003000,</div><div class='del'>-	0x00006080, 0x820c0480, 0x00000040, 0x04001006,</div><div class='del'>-	0x42001000, 0x00000040, 0x820c1c80, 0x00000040,</div><div class='del'>-	0x0401f003, 0x400c1000, 0x41781800, 0x54182000,</div><div class='del'>-	0x80102000, 0x80183000, 0x80081040, 0x040207fc,</div><div class='del'>-	0x800c19c0, 0x04000005, 0x59c80005, 0x80000000,</div><div class='del'>-	0x48039005, 0x0401f7ea, 0x82140500, 0x01f60000,</div><div class='del'>-	0x04020029, 0x82140500, 0x0000f000, 0x0400000b,</div><div class='del'>-	0x82000c80, 0x00002000, 0x0402100f, 0x4a039005,</div><div class='del'>-	0x00000140, 0x82140500, 0x0e000000, 0x80000132,</div><div class='del'>-	0x0c01f83e, 0x1c01f000, 0x59cc0400, 0x82000500,</div><div class='del'>-	0x0000ff00, 0x82000580, 0x00008100, 0x040007f4,</div><div class='del'>-	0x0401f01c, 0x4817c857, 0x82140500, 0x000003ff,</div><div class='del'>-	0x04020007, 0x59cc0400, 0x82000500, 0x0000ff00,</div><div class='del'>-	0x82000580, 0x00008100, 0x04020012, 0x42000000,</div><div class='del'>-	0x0010b6bc, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x00105b32, 0x4803c856, 0x4a039005, 0x00000140,</div><div class='del'>-	0x0401f020, 0x4817c857, 0x82140500, 0x00f60000,</div><div class='del'>-	0x04020004, 0x0201f800, 0x00105b6e, 0x040207d2,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04000010, 0x59c400a4,</div><div class='del'>-	0x4803c857, 0x82000500, 0x0000000f, 0x82000580,</div><div class='del'>-	0x0000000a, 0x04020009, 0x497b5016, 0x59c400a3,</div><div class='del'>-	0x82000540, 0x00080000, 0x480388a3, 0x82000500,</div><div class='del'>-	0xfff7ffff, 0x480388a3, 0x4817c856, 0x0201f800,</div><div class='del'>-	0x0010a79f, 0x4a039005, 0x00000140, 0x0401f842,</div><div class='del'>-	0x4803c856, 0x1c01f000, 0x00105702, 0x00105a13,</div><div class='del'>-	0x001056fa, 0x001056fa, 0x001056fa, 0x001056fa,</div><div class='del'>-	0x001056fa, 0x001056fa, 0x4803c857, 0x42000000,</div><div class='del'>-	0x0010b659, 0x0201f800, 0x0010a86e, 0x4a039005,</div><div class='del'>-	0x00000140, 0x1c01f000, 0x59cc0400, 0x82000d00,</div><div class='del'>-	0x0000ff00, 0x82041500, 0x0000f000, 0x840409c0,</div><div class='del'>-	0x82140500, 0x000003ff, 0x800018c4, 0x8c142d14,</div><div class='del'>-	0x04000005, 0x59cc0002, 0x82000500, 0x00000003,</div><div class='del'>-	0x800c1c80, 0x480f5016, 0x82080580, 0x00002000,</div><div class='del'>-	0x04020013, 0x836c0580, 0x00000001, 0x0402000e,</div><div class='del'>-	0x59cc0006, 0x82000500, 0xff000000, 0x82000580,</div><div class='del'>-	0x11000000, 0x02020800, 0x001006ba, 0x04020011,</div><div class='del'>-	0x0201f800, 0x00103951, 0x0201f800, 0x00105c81,</div><div class='del'>-	0x0401f00c, 0x0401f81f, 0x0401f00a, 0x82080580,</div><div class='del'>-	0x00003000, 0x04020003, 0x0401fa40, 0x0401f005,</div><div class='del'>-	0x82080580, 0x00008000, 0x04020002, 0x0401fb36,</div><div class='del'>-	0x1c01f000, 0x4817c857, 0x42000000, 0x0010b658,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x836c0580, 0x00000003,</div><div class='del'>-	0x0402000b, 0x4c080000, 0x4c0c0000, 0x42001000,</div><div class='del'>-	0x00008048, 0x40141800, 0x80142120, 0x0201f800,</div><div class='del'>-	0x00103857, 0x5c001800, 0x5c001000, 0x1c01f000,</div><div class='del'>-	0x59cc0002, 0x82000500, 0xff000000, 0x82001580,</div><div class='del'>-	0x01000000, 0x04000006, 0x82001580, 0x23000000,</div><div class='del'>-	0x02020800, 0x001006ba, 0x040201c9, 0x82040580,</div><div class='del'>-	0x00000023, 0x04020055, 0x59cc0004, 0x4803c857,</div><div class='del'>-	0x59cc0006, 0x82000500, 0xff000000, 0x59cc0801,</div><div class='del'>-	0x82040d00, 0x00ffffff, 0x80040540, 0x4803c857,</div><div class='del'>-	0x0401fbb2, 0x02000800, 0x001006ba, 0x040001b8,</div><div class='del'>-	0x59300c06, 0x82040580, 0x00000010, 0x04000012,</div><div class='del'>-	0x82040580, 0x00000011, 0x0400000f, 0x82040580,</div><div class='del'>-	0x00000001, 0x0400000c, 0x82040580, 0x00000004,</div><div class='del'>-	0x04000009, 0x82040580, 0x00000008, 0x04000006,</div><div class='del'>-	0x82040580, 0x0000000a, 0x02020800, 0x001006ba,</div><div class='del'>-	0x040201a3, 0x59300004, 0x82000500, 0x80010000,</div><div class='del'>-	0x04000006, 0x0201f800, 0x00106cb4, 0x02020800,</div><div class='del'>-	0x001006ba, 0x0402019a, 0x59cc0a04, 0x48066202,</div><div class='del'>-	0x59a80016, 0x800001c0, 0x02000800, 0x001006ba,</div><div class='del'>-	0x04000193, 0x59cc0006, 0x82000500, 0xffff0000,</div><div class='del'>-	0x82000d80, 0x02000000, 0x04020005, 0x42027000,</div><div class='del'>-	0x00000015, 0x0201f000, 0x000208d8, 0x82000d80,</div><div class='del'>-	0x02140000, 0x040007fa, 0x82000d80, 0x02100000,</div><div class='del'>-	0x040007f7, 0x82000d80, 0x02100000, 0x040007f4,</div><div class='del'>-	0x82000d80, 0x01000000, 0x02020800, 0x001006ba,</div><div class='del'>-	0x0402017b, 0x59cc0006, 0x82000500, 0x0000ffff,</div><div class='del'>-	0x02020800, 0x001006ba, 0x04020175, 0x42027000,</div><div class='del'>-	0x00000016, 0x0401f7e8, 0x82040580, 0x00000022,</div><div class='del'>-	0x02020800, 0x001006ba, 0x0402016d, 0x59cc0004,</div><div class='del'>-	0x4803c857, 0x59cc0006, 0x4803c857, 0x59cc0001,</div><div class='del'>-	0x4803c857, 0x59a80016, 0x800001c0, 0x02000800,</div><div class='del'>-	0x001006ba, 0x04000162, 0x59a80806, 0x8c040d14,</div><div class='del'>-	0x04000011, 0x0401f97d, 0x0402000f, 0x0401f993,</div><div class='del'>-	0x0400000d, 0x42027000, 0x0000004c, 0x59cc0001,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x0201f800, 0x00105c25,</div><div class='del'>-	0x0400013e, 0x42028800, 0x0000ffff, 0x417a6800,</div><div class='del'>-	0x0401f13a, 0x59cc0006, 0x82000500, 0xffff0000,</div><div class='del'>-	0x82000d80, 0x03000000, 0x04020023, 0x59a80026,</div><div class='del'>-	0x8c000508, 0x04000017, 0x8400054c, 0x48035026,</div><div class='del'>-	0x59cc0800, 0x82040d00, 0x00ffffff, 0x48075010,</div><div class='del'>-	0x497b8830, 0x84040d70, 0x48078832, 0x59c40802,</div><div class='del'>-	0x84040d4c, 0x48078802, 0x59cc0007, 0x82000500,</div><div class='del'>-	0x0000ffff, 0x48038893, 0x4803501e, 0x42000800,</div><div class='del'>-	0x00000003, 0x59a81010, 0x0201f800, 0x001069af,</div><div class='del'>-	0x59cc0006, 0x82000500, 0x0000ffff, 0x02020800,</div><div class='del'>-	0x001006ba, 0x0402012a, 0x42027000, 0x00000017,</div><div class='del'>-	0x0401f0e5, 0x82000d80, 0x04000000, 0x04020013,</div><div class='del'>-	0x59cc0006, 0x82000500, 0x0000ffff, 0x02020800,</div><div class='del'>-	0x001006ba, 0x0402011e, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04000004, 0x42027000, 0x0000001d, 0x0401f0d6,</div><div class='del'>-	0x59a80026, 0x84000548, 0x48035026, 0x42027000,</div><div class='del'>-	0x00000030, 0x0401f0d0, 0x82000d80, 0x05000000,</div><div class='del'>-	0x0402000a, 0x59cc0006, 0x82000500, 0x0000ffff,</div><div class='del'>-	0x02020800, 0x001006ba, 0x04020109, 0x42027000,</div><div class='del'>-	0x00000018, 0x0401f0c4, 0x82000d80, 0x20100000,</div><div class='del'>-	0x04020004, 0x42027000, 0x00000019, 0x0401f0be,</div><div class='del'>-	0x82000d80, 0x21100000, 0x04020004, 0x42027000,</div><div class='del'>-	0x0000001a, 0x0401f0b8, 0x82000d80, 0x52000000,</div><div class='del'>-	0x0402000a, 0x59cc0006, 0x82000500, 0x0000ffff,</div><div class='del'>-	0x02020800, 0x001006ba, 0x040200f1, 0x42027000,</div><div class='del'>-	0x0000001b, 0x0401f0ac, 0x82000d80, 0x50000000,</div><div class='del'>-	0x0402000a, 0x59cc0006, 0x82000500, 0x0000ffff,</div><div class='del'>-	0x02020800, 0x001006ba, 0x040200e5, 0x42027000,</div><div class='del'>-	0x0000001c, 0x0401f0a0, 0x82000d80, 0x13000000,</div><div class='del'>-	0x04020004, 0x42027000, 0x00000034, 0x0401f09a,</div><div class='del'>-	0x82000d80, 0x12000000, 0x0402000a, 0x59cc0006,</div><div class='del'>-	0x82000500, 0x0000ffff, 0x02020800, 0x001006ba,</div><div class='del'>-	0x040200d3, 0x42027000, 0x00000024, 0x0401f08e,</div><div class='del'>-	0x82000d00, 0xff000000, 0x82040d80, 0x24000000,</div><div class='del'>-	0x04020004, 0x42027000, 0x0000002d, 0x0401f086,</div><div class='del'>-	0x82000d00, 0xff000000, 0x82040d80, 0x53000000,</div><div class='del'>-	0x04020004, 0x42027000, 0x0000002a, 0x0401f07e,</div><div class='del'>-	0x82000d80, 0x0f000000, 0x04020004, 0x42027000,</div><div class='del'>-	0x00000020, 0x0401f078, 0x82000d80, 0x61040000,</div><div class='del'>-	0x04020036, 0x83cc1400, 0x00000006, 0x80080800,</div><div class='del'>-	0x50080000, 0x82000500, 0x0000ffff, 0x82000480,</div><div class='del'>-	0x00000004, 0x4c580000, 0x8000b104, 0x8058b1c0,</div><div class='del'>-	0x04000026, 0x4c100000, 0x50041800, 0x820c1500,</div><div class='del'>-	0x03000000, 0x80081130, 0x42000000, 0x0010b615,</div><div class='del'>-	0x82082580, 0x00000000, 0x04020004, 0x42000000,</div><div class='del'>-	0x0010b612, 0x0401f00c, 0x82082580, 0x00000001,</div><div class='del'>-	0x04020004, 0x42000000, 0x0010b613, 0x0401f006,</div><div class='del'>-	0x82082580, 0x00000002, 0x04020003, 0x42000000,</div><div class='del'>-	0x0010b614, 0x0201f800, 0x0010a86e, 0x42001000,</div><div class='del'>-	0x00008015, 0x820c2500, 0x0000ffff, 0x800c1920,</div><div class='del'>-	0x0201f800, 0x00103857, 0x5c002000, 0x80040800,</div><div class='del'>-	0x8058b040, 0x040207da, 0x5c00b000, 0x42027000,</div><div class='del'>-	0x00000023, 0x0401f040, 0x82000d80, 0x60000000,</div><div class='del'>-	0x04020004, 0x42027000, 0x0000003f, 0x0401f03a,</div><div class='del'>-	0x82000d80, 0x54000000, 0x04020008, 0x0401fb36,</div><div class='del'>-	0x02020800, 0x001006ba, 0x04020075, 0x42027000,</div><div class='del'>-	0x00000046, 0x0401f030, 0x82000d80, 0x55000000,</div><div class='del'>-	0x04020009, 0x0401fb54, 0x04020004, 0x42027000,</div><div class='del'>-	0x00000041, 0x0401f028, 0x42027000, 0x00000042,</div><div class='del'>-	0x0401f025, 0x82000d80, 0x78000000, 0x04020004,</div><div class='del'>-	0x42027000, 0x00000045, 0x0401f01f, 0x82000d80,</div><div class='del'>-	0x10000000, 0x04020004, 0x42027000, 0x0000004e,</div><div class='del'>-	0x0401f019, 0x82000d80, 0x63000000, 0x04020004,</div><div class='del'>-	0x42027000, 0x0000004a, 0x0401f013, 0x82000d00,</div><div class='del'>-	0xff000000, 0x82040d80, 0x56000000, 0x04020004,</div><div class='del'>-	0x42027000, 0x0000004f, 0x0401f00b, 0x82000d00,</div><div class='del'>-	0xff000000, 0x82040d80, 0x57000000, 0x04020004,</div><div class='del'>-	0x42027000, 0x00000050, 0x0401f003, 0x42027000,</div><div class='del'>-	0x0000001d, 0x59cc3800, 0x821c3d00, 0x00ffffff,</div><div class='del'>-	0x821c0580, 0x00fffffe, 0x59cc0001, 0x04020005,</div><div class='del'>-	0x40003000, 0x42028800, 0x000007fe, 0x0401f005,</div><div class='del'>-	0x0401f8da, 0x02020800, 0x001006ba, 0x04020034,</div><div class='del'>-	0x0201f800, 0x00104401, 0x02020800, 0x001006ba,</div><div class='del'>-	0x0402002f, 0x83380580, 0x00000046, 0x04020006,</div><div class='del'>-	0x59a80010, 0x80180580, 0x02000800, 0x001006ba,</div><div class='del'>-	0x04000027, 0x59340200, 0x8c000514, 0x0400000f,</div><div class='del'>-	0x83380580, 0x00000030, 0x0400000c, 0x83380580,</div><div class='del'>-	0x0000003f, 0x04000009, 0x83380580, 0x00000034,</div><div class='del'>-	0x04000006, 0x83380580, 0x00000024, 0x04000003,</div><div class='del'>-	0x42027000, 0x0000004c, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000018, 0x49366009, 0x4a026406, 0x00000004,</div><div class='del'>-	0x59cc0c04, 0x48066202, 0x83380580, 0x0000004c,</div><div class='del'>-	0x04020009, 0x4a026406, 0x00000011, 0x813669c0,</div><div class='del'>-	0x04020005, 0x59cc0001, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x4802601e, 0x0201f000, 0x000208d8, 0x59880053,</div><div class='del'>-	0x4803c857, 0x80000000, 0x48031053, 0x1c01f000,</div><div class='del'>-	0x42001000, 0x00008049, 0x59cc1806, 0x800c1930,</div><div class='del'>-	0x0201f800, 0x00103857, 0x0201f800, 0x001076c9,</div><div class='del'>-	0x02000800, 0x001006ba, 0x040007f1, 0x49366009,</div><div class='del'>-	0x4a026406, 0x00000004, 0x59cc0c04, 0x48066202,</div><div class='del'>-	0x4a026403, 0x00000009, 0x4a02641a, 0x00000009,</div><div class='del'>-	0x4a02621a, 0x00002900, 0x4a026203, 0x00000001,</div><div class='del'>-	0x0201f000, 0x00106470, 0x59a80026, 0x4803c857,</div><div class='del'>-	0x8c000508, 0x04000010, 0x59cc0006, 0x82000500,</div><div class='del'>-	0xff000000, 0x82000d80, 0x03000000, 0x0400000c,</div><div class='del'>-	0x82000d80, 0x20000000, 0x04000009, 0x82000d80,</div><div class='del'>-	0x05000000, 0x04000006, 0x82000d80, 0x21000000,</div><div class='del'>-	0x04000003, 0x80000580, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f7fd, 0x59cc2006, 0x82102500,</div><div class='del'>-	0xff000000, 0x9c1021c0, 0x0401f807, 0x820c1c00,</div><div class='del'>-	0x0010b2df, 0x500c1800, 0x800c0500, 0x4803c857,</div><div class='del'>-	0x1c01f000, 0x40100800, 0x41781800, 0x82040480,</div><div class='del'>-	0x00000020, 0x04001004, 0x800c1800, 0x40000800,</div><div class='del'>-	0x0401f7fb, 0x82040500, 0x0000000f, 0x82000400,</div><div class='del'>-	0x0010a95f, 0x50000000, 0x8c040d08, 0x04000002,</div><div class='del'>-	0x900001c0, 0x1c01f000, 0x4803c856, 0x0401fadd,</div><div class='del'>-	0x0402000a, 0x0201f800, 0x00101eb0, 0x04020007,</div><div class='del'>-	0x59cc0002, 0x82000500, 0xff000000, 0x82000d80,</div><div class='del'>-	0x08000000, 0x04000802, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x59cc0400, 0x82000d00, 0x0000ff00, 0x840409c0,</div><div class='del'>-	0x82040580, 0x00000033, 0x0402001f, 0x0401f98f,</div><div class='del'>-	0x04000038, 0x59cc0a04, 0x48066202, 0x59cc0006,</div><div class='del'>-	0x4803c857, 0x82000500, 0xffff0000, 0x82000d80,</div><div class='del'>-	0x02000000, 0x04020009, 0x59cc0006, 0x82000500,</div><div class='del'>-	0x0000ffff, 0x0402002b, 0x42027000, 0x00000015,</div><div class='del'>-	0x0201f000, 0x000208d8, 0x82000d80, 0x01000000,</div><div class='del'>-	0x04020024, 0x59cc0006, 0x82000500, 0x0000ffff,</div><div class='del'>-	0x04020020, 0x42027000, 0x00000016, 0x0201f000,</div><div class='del'>-	0x000208d8, 0x82040580, 0x00000032, 0x04020019,</div><div class='del'>-	0x59cc0006, 0x82000500, 0xffff0000, 0x82000d80,</div><div class='del'>-	0x14000000, 0x04020013, 0x42027000, 0x00000038,</div><div class='del'>-	0x59cc0001, 0x0401f810, 0x0402000e, 0x0201f800,</div><div class='del'>-	0x001043fc, 0x0402000b, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000008, 0x49366009, 0x4a026406, 0x00000004,</div><div class='del'>-	0x59cc0c04, 0x48066202, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x1c01f000, 0x4803c857, 0x4c580000, 0x4c100000,</div><div class='del'>-	0x4c380000, 0x4c340000, 0x82003500, 0x00ffffff,</div><div class='del'>-	0x82181500, 0x00ff0000, 0x82081580, 0x00ff0000,</div><div class='del'>-	0x04020016, 0x82181480, 0x00fffffc, 0x04001013,</div><div class='del'>-	0x82181580, 0x00fffffd, 0x04020004, 0x42028800,</div><div class='del'>-	0x000007fd, 0x0401f040, 0x82181580, 0x00fffffe,</div><div class='del'>-	0x04020004, 0x42028800, 0x000007fe, 0x0401f03a,</div><div class='del'>-	0x82181580, 0x00fffffc, 0x04020004, 0x42028800,</div><div class='del'>-	0x000007fc, 0x0401f034, 0x41781000, 0x42002000,</div><div class='del'>-	0x00000000, 0x4200b000, 0x000007f0, 0x41ac7000,</div><div class='del'>-	0x50380000, 0x80006d40, 0x04020005, 0x800811c0,</div><div class='del'>-	0x0402001e, 0x8410155e, 0x0401f01c, 0x58340212,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x04000011, 0x59a84010,</div><div class='del'>-	0x82204500, 0x00ffff00, 0x82180500, 0x00ffff00,</div><div class='del'>-	0x04000002, 0x80200580, 0x58340002, 0x0402000f,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82184500, 0x000000ff,</div><div class='del'>-	0x80204580, 0x04020009, 0x0401f006, 0x58340002,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x80184580, 0x04020003,</div><div class='del'>-	0x40128800, 0x0401f00c, 0x80102000, 0x80387000,</div><div class='del'>-	0x8058b040, 0x040207db, 0x800811c0, 0x04020005,</div><div class='del'>-	0x481bc857, 0x82000540, 0x00000001, 0x0401f003,</div><div class='del'>-	0x840a8d1e, 0x80000580, 0x5c006800, 0x5c007000,</div><div class='del'>-	0x5c002000, 0x5c00b000, 0x1c01f000, 0x59a80026,</div><div class='del'>-	0x8c00050e, 0x04000003, 0x8c000502, 0x04000006,</div><div class='del'>-	0x59cc0c00, 0x80040910, 0x82040500, 0x0000000f,</div><div class='del'>-	0x0c01f002, 0x1c01f000, 0x00105a2e, 0x00105a2e,</div><div class='del'>-	0x00105a2e, 0x00105b1d, 0x00105a2e, 0x00105a30,</div><div class='del'>-	0x00105a48, 0x00105a4b, 0x00105a2e, 0x00105a2e,</div><div class='del'>-	0x00105a2e, 0x00105a2e, 0x00105a2e, 0x00105a2e,</div><div class='del'>-	0x00105a2e, 0x00105a2e, 0x4803c856, 0x1c01f000,</div><div class='del'>-	0x0401f8de, 0x04000014, 0x82140500, 0x000003ff,</div><div class='del'>-	0x800000c4, 0x82000480, 0x00000008, 0x0400100e,</div><div class='del'>-	0x59cc0001, 0x59326809, 0x59340802, 0x80040580,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x04020007, 0x59cc0a04,</div><div class='del'>-	0x48066202, 0x42027000, 0x00000046, 0x0201f000,</div><div class='del'>-	0x000208d8, 0x59cc0004, 0x4803c857, 0x1c01f000,</div><div class='del'>-	0x59cc0004, 0x4803c857, 0x1c01f000, 0x0401f8c3,</div><div class='del'>-	0x04000016, 0x82140500, 0x000003ff, 0x800000c4,</div><div class='del'>-	0x82000480, 0x0000000c, 0x04001010, 0x59cc0001,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x59326809, 0x59340802,</div><div class='del'>-	0x82040d00, 0x00ffffff, 0x80040580, 0x04020007,</div><div class='del'>-	0x59cc0a04, 0x48066202, 0x42027000, 0x00000045,</div><div class='del'>-	0x0201f000, 0x000208d8, 0x59cc0004, 0x4803c857,</div><div class='del'>-	0x1c01f000, 0x59cc0004, 0x4803c857, 0x59cc0000,</div><div class='del'>-	0x82000500, 0xff000000, 0x59cc1001, 0x82081500,</div><div class='del'>-	0x00ffffff, 0x80080540, 0x4803c857, 0x4817c857,</div><div class='del'>-	0x0401f9d8, 0x02020800, 0x001006ba, 0x04020016,</div><div class='del'>-	0x0201f800, 0x00101eb0, 0x02020800, 0x001006ba,</div><div class='del'>-	0x04020011, 0x59cc0002, 0x82000500, 0xff000000,</div><div class='del'>-	0x82000580, 0x00000000, 0x02020800, 0x001006ba,</div><div class='del'>-	0x04020009, 0x82040500, 0x0000000f, 0x82000c80,</div><div class='del'>-	0x00000006, 0x02021800, 0x001006ba, 0x04021002,</div><div class='del'>-	0x0c01f003, 0x4803c856, 0x1c01f000, 0x00105a91,</div><div class='del'>-	0x00105a93, 0x00105a91, 0x00105a91, 0x00105aec,</div><div class='del'>-	0x00105afb, 0x4803c856, 0x1c01f000, 0x59a80016,</div><div class='del'>-	0x800001c0, 0x02020800, 0x001006ba, 0x040207fa,</div><div class='del'>-	0x59cc0802, 0x4807c856, 0x8c040d2e, 0x0402001d,</div><div class='del'>-	0x0201f800, 0x001076c9, 0x02000800, 0x00100615,</div><div class='del'>-	0x59cc0001, 0x0401ff18, 0x0402000d, 0x0201f800,</div><div class='del'>-	0x00020267, 0x0402000a, 0x4a026406, 0x00000005,</div><div class='del'>-	0x49366009, 0x59cc0804, 0x4806601c, 0x42027000,</div><div class='del'>-	0x00000088, 0x0201f000, 0x000208d8, 0x4803c857,</div><div class='del'>-	0x42028800, 0x0000ffff, 0x417a6800, 0x59cc0001,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x4802601e, 0x0401f7ef,</div><div class='del'>-	0x59cc0001, 0x4803c857, 0x0401feff, 0x02020800,</div><div class='del'>-	0x001006ba, 0x040207d4, 0x0201f800, 0x001043fc,</div><div class='del'>-	0x02020800, 0x001006ba, 0x040207cf, 0x59cc0005,</div><div class='del'>-	0x8c000500, 0x04020006, 0x59340200, 0x8c00050e,</div><div class='del'>-	0x02020800, 0x001006ba, 0x040207c7, 0x0201f800,</div><div class='del'>-	0x00104842, 0x04020013, 0x0401f840, 0x02000800,</div><div class='del'>-	0x001006ba, 0x040007c0, 0x0201f800, 0x00020892,</div><div class='del'>-	0x02000800, 0x001006ba, 0x040007bb, 0x49366009,</div><div class='del'>-	0x4a026406, 0x00000002, 0x59cc0804, 0x4806601c,</div><div class='del'>-	0x42027000, 0x00000088, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x0201f800, 0x00020892, 0x040007af, 0x49366009,</div><div class='del'>-	0x4a026406, 0x00000004, 0x59cc0c04, 0x48066202,</div><div class='del'>-	0x42027000, 0x00000001, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x59cc0802, 0x8c040d2e, 0x0400000b, 0x0401f81f,</div><div class='del'>-	0x04000009, 0x0401f961, 0x04020007, 0x59cc0a04,</div><div class='del'>-	0x48066202, 0x42027000, 0x00000089, 0x0201f000,</div><div class='del'>-	0x000208d8, 0x4933c857, 0x1c01f000, 0x59cc0004,</div><div class='del'>-	0x4803c857, 0x59cc0802, 0x8c040d2e, 0x0400000b,</div><div class='del'>-	0x0401f80e, 0x04000009, 0x0401f950, 0x04020007,</div><div class='del'>-	0x59cc0a04, 0x48066202, 0x42027000, 0x0000008a,</div><div class='del'>-	0x0201f000, 0x000208d8, 0x4933c857, 0x1c01f000,</div><div class='del'>-	0x59cc0a04, 0x0401f002, 0x59cc0c04, 0x59a8000e,</div><div class='del'>-	0x59a81067, 0x80080400, 0x80040480, 0x04021008,</div><div class='del'>-	0x40040000, 0x800000c4, 0x800408ca, 0x80040c00,</div><div class='del'>-	0x82066400, 0x0010cfc0, 0x1c01f000, 0x80000580,</div><div class='del'>-	0x0401f7fe, 0x59cc0802, 0x8c040d2e, 0x04020010,</div><div class='del'>-	0x0401ffec, 0x0400000e, 0x59cc0001, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x59326809, 0x59340802, 0x82040d00,</div><div class='del'>-	0x00ffffff, 0x80040580, 0x04020005, 0x42027000,</div><div class='del'>-	0x00000051, 0x0201f000, 0x000208d8, 0x59cc0004,</div><div class='del'>-	0x4803c857, 0x1c01f000, 0x4803c856, 0x42003000,</div><div class='del'>-	0x00000105, 0x0401f001, 0x4803c856, 0x4c3c0000,</div><div class='del'>-	0x41cc7800, 0x40142000, 0x0401f803, 0x5c007800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c580000, 0x583c0400,</div><div class='del'>-	0x82000500, 0x0000f000, 0x82000580, 0x0000c000,</div><div class='del'>-	0x04000024, 0x0201f800, 0x00020892, 0x04000021,</div><div class='del'>-	0x4c180000, 0x583c0001, 0x0401fe6f, 0x0402001f,</div><div class='del'>-	0x0201f800, 0x001043fc, 0x0402001c, 0x49366009,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000018, 0x492e6017,</div><div class='del'>-	0x497a5800, 0x497a5a04, 0x48125c04, 0x832cac00,</div><div class='del'>-	0x00000005, 0x4200b000, 0x00000007, 0x403ca000,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x5c003000, 0x481a641a,</div><div class='del'>-	0x4a026403, 0x0000003e, 0x4a026406, 0x00000001,</div><div class='del'>-	0x4a026203, 0x00000001, 0x0201f800, 0x00106470,</div><div class='del'>-	0x5c00b000, 0x1c01f000, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x5c003000, 0x0401f7fb, 0x4803c856, 0x59cc0400,</div><div class='del'>-	0x82000d00, 0x0000ff00, 0x82040500, 0x0000f000,</div><div class='del'>-	0x840409c0, 0x82000580, 0x00002000, 0x04020049,</div><div class='del'>-	0x82040580, 0x00000022, 0x0402003a, 0x59c400a4,</div><div class='del'>-	0x82000500, 0x0000000f, 0x82000c80, 0x00000007,</div><div class='del'>-	0x04001004, 0x82000480, 0x0000000c, 0x0400103f,</div><div class='del'>-	0x59cc0006, 0x82000500, 0xffff0000, 0x82000d80,</div><div class='del'>-	0x04000000, 0x04000039, 0x82000d80, 0x60000000,</div><div class='del'>-	0x04000036, 0x82000d80, 0x54000000, 0x04000033,</div><div class='del'>-	0x82000d80, 0x03000000, 0x04020015, 0x59a80826,</div><div class='del'>-	0x8c040d02, 0x0402002d, 0x8c040d08, 0x0402002b,</div><div class='del'>-	0x0201f800, 0x0010473b, 0x0400002b, 0x59a8001d,</div><div class='del'>-	0x800000d0, 0x59a80810, 0x82040d00, 0x000000ff,</div><div class='del'>-	0x80040540, 0x59cc0800, 0x82040d00, 0x00ffffff,</div><div class='del'>-	0x80040580, 0x0402001b, 0x0401f01c, 0x59c40802,</div><div class='del'>-	0x8c040d0c, 0x04020017, 0x82000d80, 0x52000000,</div><div class='del'>-	0x040007ec, 0x82000d80, 0x05000000, 0x040007e9,</div><div class='del'>-	0x82000d80, 0x50000000, 0x040007e6, 0x0401f00d,</div><div class='del'>-	0x82040580, 0x00000023, 0x0402000a, 0x0401ff57,</div><div class='del'>-	0x04000008, 0x59300c03, 0x82040580, 0x00000002,</div><div class='del'>-	0x04000006, 0x82040580, 0x00000051, 0x04000003,</div><div class='del'>-	0x80000580, 0x0401f003, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x59cc0006, 0x82000500, 0xffff0000,</div><div class='del'>-	0x82000d80, 0x03000000, 0x04000004, 0x82000d80,</div><div class='del'>-	0x52000000, 0x040207f3, 0x59a80026, 0x82000500,</div><div class='del'>-	0x00000009, 0x82000580, 0x00000008, 0x040007ef,</div><div class='del'>-	0x0401f7ec, 0x4803c856, 0x4c5c0000, 0x4c580000,</div><div class='del'>-	0x59a80016, 0x82000580, 0x0000004c, 0x0402001f,</div><div class='del'>-	0x59ccb807, 0x9c5cb9c0, 0x825cbd00, 0x00000007,</div><div class='del'>-	0x8c5cbd00, 0x0400000a, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83a81c00, 0x00000002, 0x83cc1400, 0x0000000d,</div><div class='del'>-	0x0201f800, 0x001082ff, 0x04020010, 0x8c5cbd02,</div><div class='del'>-	0x0400000a, 0x4200b000, 0x00000002, 0x83a81c00,</div><div class='del'>-	0x00000000, 0x83cc1400, 0x0000000f, 0x0201f800,</div><div class='del'>-	0x001082ff, 0x04020005, 0x8c5cbd04, 0x04000003,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c00b000, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c5c0000, 0x4c580000,</div><div class='del'>-	0x59a80016, 0x82000580, 0x0000004c, 0x0402001f,</div><div class='del'>-	0x59ccb807, 0x9c5cb9c0, 0x825cbd00, 0x00000007,</div><div class='del'>-	0x8c5cbd00, 0x0400000a, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83a81c00, 0x00000002, 0x83cc1400, 0x00000009,</div><div class='del'>-	0x0201f800, 0x001082ff, 0x04020010, 0x8c5cbd02,</div><div class='del'>-	0x0400000a, 0x4200b000, 0x00000002, 0x83a81c00,</div><div class='del'>-	0x00000000, 0x83cc1400, 0x0000000b, 0x0201f800,</div><div class='del'>-	0x001082ff, 0x04020005, 0x8c5cbd04, 0x04000003,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c00b000, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x4803c857, 0x4c580000, 0x40003000,</div><div class='del'>-	0x42002000, 0x000007f0, 0x4200b000, 0x00000010,</div><div class='del'>-	0x83ac7400, 0x000007f0, 0x50380000, 0x80026d40,</div><div class='del'>-	0x04000006, 0x59340002, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x80180580, 0x04000010, 0x80102000, 0x80387000,</div><div class='del'>-	0x8058b040, 0x040207f5, 0x82100480, 0x00000800,</div><div class='del'>-	0x42002000, 0x00000000, 0x4200b000, 0x000007f0,</div><div class='del'>-	0x41ac7000, 0x040217ed, 0x82000540, 0x00000001,</div><div class='del'>-	0x0401f002, 0x40128800, 0x5c00b000, 0x1c01f000,</div><div class='del'>-	0x59a80026, 0x8c00050e, 0x04000004, 0x8c000502,</div><div class='del'>-	0x04000003, 0x80000580, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f7fd, 0x59300c06, 0x82040580,</div><div class='del'>-	0x00000002, 0x04000006, 0x82040580, 0x00000005,</div><div class='del'>-	0x04000003, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x59c80000, 0x84000558, 0x84000512, 0x48039000,</div><div class='del'>-	0x1c01f000, 0x4a03281a, 0x000003e8, 0x4a032802,</div><div class='del'>-	0x0010cfc0, 0x4a032800, 0x00000000, 0x4a032808,</div><div class='del'>-	0x00106d9f, 0x42000000, 0x00000005, 0x83947c00,</div><div class='del'>-	0x00000009, 0x49787801, 0x4a007802, 0x00106d54,</div><div class='del'>-	0x823c7c00, 0x00000003, 0x80000040, 0x040207fa,</div><div class='del'>-	0x4a032819, 0xffff0000, 0x4201d000, 0x00000064,</div><div class='del'>-	0x0401f97c, 0x4201d000, 0x000186a0, 0x0401f18b,</div><div class='del'>-	0x00000000, 0x00000003, 0x00000006, 0x00000009,</div><div class='del'>-	0x0000000c, 0x4d300000, 0x4d2c0000, 0x4d340000,</div><div class='del'>-	0x4d400000, 0x4cfc0000, 0x4d380000, 0x4d3c0000,</div><div class='del'>-	0x4d440000, 0x4d4c0000, 0x4d480000, 0x4c5c0000,</div><div class='del'>-	0x4c600000, 0x4c640000, 0x4cc80000, 0x4ccc0000,</div><div class='del'>-	0x0201f800, 0x000206af, 0x5c019800, 0x5c019000,</div><div class='del'>-	0x5c00c800, 0x5c00c000, 0x5c00b800, 0x5c029000,</div><div class='del'>-	0x5c029800, 0x5c028800, 0x5c027800, 0x5c027000,</div><div class='del'>-	0x5c01f800, 0x5c028000, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x59940004, 0x80000540,</div><div class='del'>-	0x0402000a, 0x59940025, 0x80040400, 0x02001800,</div><div class='del'>-	0x00100615, 0x48032804, 0x480b2805, 0x4a032803,</div><div class='del'>-	0x0000000a, 0x80000580, 0x1c01f000, 0x5994001f,</div><div class='del'>-	0x80000540, 0x0402000a, 0x59940025, 0x80040400,</div><div class='del'>-	0x02001800, 0x00100615, 0x4803281f, 0x480b2820,</div><div class='del'>-	0x4a03281e, 0x00000001, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x59940022, 0x80000540, 0x0402000a, 0x59940025,</div><div class='del'>-	0x80040400, 0x02001800, 0x00100615, 0x48032822,</div><div class='del'>-	0x480b2823, 0x4a032821, 0x0000000a, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x4c000000, 0x59940005, 0x4803c857,</div><div class='del'>-	0x480bc857, 0x80080580, 0x04020003, 0x497b2804,</div><div class='del'>-	0x497b2805, 0x5c000000, 0x1c01f000, 0x4c000000,</div><div class='del'>-	0x59940020, 0x4803c857, 0x480bc857, 0x80080580,</div><div class='del'>-	0x04020003, 0x497b281f, 0x497b2820, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x4c000000, 0x59940023, 0x4803c857,</div><div class='del'>-	0x480bc857, 0x80080580, 0x04020003, 0x497b2822,</div><div class='del'>-	0x497b2823, 0x5c000000, 0x1c01f000, 0x4937c857,</div><div class='del'>-	0x48ebc857, 0x59340203, 0x80e80480, 0x04001002,</div><div class='del'>-	0x48ea6a03, 0x1c01f000, 0x5c03e000, 0x1c01f000,</div><div class='del'>-	0x4d440000, 0x42007800, 0x00000010, 0x59968801,</div><div class='del'>-	0x0201f800, 0x00020267, 0x04020012, 0x59341a03,</div><div class='del'>-	0x800c1840, 0x0400100f, 0x59940027, 0x800c0480,</div><div class='del'>-	0x04000003, 0x48026a03, 0x0402100a, 0x5934000f,</div><div class='del'>-	0x497a6a03, 0x80000540, 0x04000006, 0x4c3c0000,</div><div class='del'>-	0x5934140b, 0x0201f800, 0x00020275, 0x5c007800,</div><div class='del'>-	0x81468800, 0x83440480, 0x00000800, 0x04021007,</div><div class='del'>-	0x803c7840, 0x040207e7, 0x49472801, 0x5c028800,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x4a032800, 0x00000002,</div><div class='del'>-	0x497b2801, 0x0401f7fa, 0x42007800, 0x00000010,</div><div class='del'>-	0x59966002, 0x59300205, 0x80000d40, 0x04000006,</div><div class='del'>-	0x59940027, 0x80040480, 0x48026205, 0x0400102d,</div><div class='del'>-	0x0400002c, 0x59300206, 0x80000d40, 0x04000014,</div><div class='del'>-	0x59b800e4, 0x8c000524, 0x04020011, 0x4a0370e4,</div><div class='del'>-	0x00030000, 0x40000000, 0x59b800e4, 0x8c000524,</div><div class='del'>-	0x04000004, 0x4a0370e4, 0x00020000, 0x0401f008,</div><div class='del'>-	0x59940027, 0x80040480, 0x48026206, 0x4a0370e4,</div><div class='del'>-	0x00020000, 0x0400101c, 0x0400001b, 0x83326400,</div><div class='del'>-	0x00000024, 0x49332802, 0x41540000, 0x81300480,</div><div class='del'>-	0x04021005, 0x803c7840, 0x040207db, 0x5c03e000,</div><div class='del'>-	0x1c01f000, 0x59940026, 0x48032827, 0x4a032802,</div><div class='del'>-	0x0010cfc0, 0x497b2826, 0x80000540, 0x0400000f,</div><div class='del'>-	0x4a032800, 0x00000001, 0x5c03e000, 0x1c01f000,</div><div class='del'>-	0x4c3c0000, 0x0201f800, 0x00108f92, 0x5c007800,</div><div class='del'>-	0x0401f7d1, 0x4c3c0000, 0x0201f800, 0x00108b11,</div><div class='del'>-	0x5c007800, 0x0401f7e2, 0x4a032800, 0x00000000,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x59a8086b, 0x8c040d30,</div><div class='del'>-	0x04020029, 0x8c040d32, 0x0400000f, 0x59a80069,</div><div class='del'>-	0x81640480, 0x04001019, 0x59a8000b, 0x81500580,</div><div class='del'>-	0x04000005, 0x59a8006a, 0x59a81066, 0x80080580,</div><div class='del'>-	0x04020012, 0x900411c0, 0x82081500, 0x00007000,</div><div class='del'>-	0x0401f012, 0x82040500, 0x0000001f, 0x04000016,</div><div class='del'>-	0x80040840, 0x82040500, 0x0000001f, 0x04000003,</div><div class='del'>-	0x4807506b, 0x0401f010, 0x900401c0, 0x82000500,</div><div class='del'>-	0x0000001f, 0x80040d40, 0x900401c0, 0x80040580,</div><div class='del'>-	0x82001500, 0x00007000, 0x82040500, 0xffff8fff,</div><div class='del'>-	0x80080540, 0x4803506b, 0x80081114, 0x0201f800,</div><div class='del'>-	0x00100728, 0x1c01f000, 0x4a032807, 0x000007d0,</div><div class='del'>-	0x4a032806, 0x0000000a, 0x1c01f000, 0x42000800,</div><div class='del'>-	0x000007d0, 0x83180480, 0x00000005, 0x02021800,</div><div class='del'>-	0x00100615, 0x83947c00, 0x00000009, 0x83180400,</div><div class='del'>-	0x00105c7c, 0x50000000, 0x803c7c00, 0x48047801,</div><div class='del'>-	0x4a007800, 0x0000000a, 0x1c01f000, 0x83180480,</div><div class='del'>-	0x00000005, 0x02021800, 0x00100615, 0x83947c00,</div><div class='del'>-	0x00000009, 0x83180400, 0x00105c7c, 0x50000000,</div><div class='del'>-	0x803c7c00, 0x49787801, 0x1c01f000, 0x4807c857,</div><div class='del'>-	0x480bc857, 0x59940025, 0x80040400, 0x02001800,</div><div class='del'>-	0x00100615, 0x48032804, 0x480b2805, 0x4a032803,</div><div class='del'>-	0x0000000a, 0x1c01f000, 0x4807c857, 0x480bc857,</div><div class='del'>-	0x59940025, 0x80040400, 0x02001800, 0x00100615,</div><div class='del'>-	0x4803281c, 0x480b281d, 0x4a03281b, 0x0000000a,</div><div class='del'>-	0x1c01f000, 0x4c000000, 0x5994001d, 0x4803c857,</div><div class='del'>-	0x480bc857, 0x80080580, 0x04020003, 0x4803281c,</div><div class='del'>-	0x4803281d, 0x5c000000, 0x1c01f000, 0x4807c857,</div><div class='del'>-	0x480bc857, 0x59940025, 0x80040400, 0x02001800,</div><div class='del'>-	0x00100615, 0x48032822, 0x480b2823, 0x4a032821,</div><div class='del'>-	0x0000000a, 0x1c01f000, 0x80e9d1c0, 0x0400000e,</div><div class='del'>-	0x0401f832, 0x04025000, 0x4203e000, 0x80000000,</div><div class='del'>-	0x40e81000, 0x41780800, 0x42000000, 0x00000064,</div><div class='del'>-	0x0201f800, 0x001063ee, 0x59940024, 0x80080400,</div><div class='del'>-	0x48032824, 0x1c01f000, 0x42001000, 0x00104d39,</div><div class='del'>-	0x0401fee5, 0x42001000, 0x00104d2c, 0x0401ffd6,</div><div class='del'>-	0x42001000, 0x00103f62, 0x0401fedf, 0x42001000,</div><div class='del'>-	0x00103fe4, 0x0401fedc, 0x42001000, 0x00103f37,</div><div class='del'>-	0x0401fed9, 0x42001000, 0x0010401b, 0x0401f6ea,</div><div class='del'>-	0x4203e000, 0x70000000, 0x4203e000, 0xb0300000,</div><div class='del'>-	0x40ebf800, 0x42000000, 0x0000003c, 0x04004004,</div><div class='del'>-	0x80000040, 0x040207fe, 0x0401f007, 0x4203e000,</div><div class='del'>-	0x70000000, 0x42000000, 0x0010b67d, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x1c01f000, 0x4203e000, 0x80000000,</div><div class='del'>-	0x4203e000, 0xb0400000, 0x40ebf800, 0x42000000,</div><div class='del'>-	0x0000003c, 0x04005004, 0x80000040, 0x040207fe,</div><div class='del'>-	0x0401f007, 0x4203e000, 0x80000000, 0x42000000,</div><div class='del'>-	0x0010b67e, 0x0201f800, 0x0010a86e, 0x1c01f000,</div><div class='del'>-	0x59a8000e, 0x82000480, 0x00000100, 0x599c0a02,</div><div class='del'>-	0x800409c0, 0x04020002, 0x80040800, 0x80041480,</div><div class='del'>-	0x04001002, 0x40000800, 0x48075067, 0x59a8100e,</div><div class='del'>-	0x40040000, 0x800acc80, 0x4967500e, 0x49675069,</div><div class='del'>-	0x59aaa80b, 0x41640800, 0x42001000, 0x00000024,</div><div class='del'>-	0x0201f800, 0x001063cf, 0x8206a400, 0x0010cfc0,</div><div class='del'>-	0x49535065, 0x4152b000, 0x42006000, 0x0010bc64,</div><div class='del'>-	0x4a006004, 0x0000012c, 0x4a006005, 0xda10da10,</div><div class='del'>-	0x4a006008, 0x00000011, 0x4a006009, 0x0010bc64,</div><div class='del'>-	0x4a00600a, 0x00101108, 0x599c0014, 0x48006011,</div><div class='del'>-	0x599c0015, 0x48006012, 0x42006000, 0x0010bc40,</div><div class='del'>-	0x4a006203, 0x00000008, 0x4a006406, 0x00000006,</div><div class='del'>-	0x4a006002, 0xffff0000, 0x4a006008, 0x0010bc64,</div><div class='del'>-	0x4a006014, 0x0010bc64, 0x599c0014, 0x48006015,</div><div class='del'>-	0x599c0015, 0x48006016, 0x599c0413, 0x48006017,</div><div class='del'>-	0x49506018, 0x49546019, 0x59a80067, 0x4800601a,</div><div class='del'>-	0x4a00601b, 0x0010b265, 0x4a00601c, 0x0010b266,</div><div class='del'>-	0x4a00601d, 0x0010b26a, 0x42000000, 0xb0000000,</div><div class='del'>-	0x42000800, 0x0010bc40, 0x0201f800, 0x00100bb2,</div><div class='del'>-	0x1c01f000, 0x82000d00, 0x000000c0, 0x04000004,</div><div class='del'>-	0x82040d80, 0x000000c0, 0x04020055, 0x82000d00,</div><div class='del'>-	0x00002020, 0x59300414, 0x84000512, 0x82040d80,</div><div class='del'>-	0x00002020, 0x0400000b, 0x8c000514, 0x0402000f,</div><div class='del'>-	0x48026414, 0x813e79c0, 0x02020000, 0x00020804,</div><div class='del'>-	0x42027000, 0x00000043, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x59326809, 0x59340a00, 0x8c040d0a, 0x040007f3,</div><div class='del'>-	0x84000552, 0x0401f7f1, 0x84000514, 0x592c080d,</div><div class='del'>-	0x48066015, 0x0401f7ef, 0x59326809, 0x59340a00,</div><div class='del'>-	0x8c040d0a, 0x02000000, 0x00020817, 0x59300c14,</div><div class='del'>-	0x84040d52, 0x48066414, 0x0201f000, 0x00020817,</div><div class='del'>-	0x0201f800, 0x00020087, 0x813e79c0, 0x02020000,</div><div class='del'>-	0x00020804, 0x0201f000, 0x00020825, 0x8c00051e,</div><div class='del'>-	0x02000000, 0x00020831, 0x82000d00, 0x00002020,</div><div class='del'>-	0x82040d80, 0x00002020, 0x04000014, 0x82000500,</div><div class='del'>-	0x000000c0, 0x82000d80, 0x00000080, 0x04000008,</div><div class='del'>-	0x813e79c0, 0x02020000, 0x00020804, 0x42027000,</div><div class='del'>-	0x00000041, 0x0201f000, 0x000208d8, 0x813e79c0,</div><div class='del'>-	0x02020000, 0x00020804, 0x42027000, 0x00000043,</div><div class='del'>-	0x0201f000, 0x000208d8, 0x59326809, 0x59340a00,</div><div class='del'>-	0x8c040d0a, 0x040007ea, 0x59300c14, 0x84040d52,</div><div class='del'>-	0x48066414, 0x0401f7e6, 0x492fc857, 0x42000800,</div><div class='del'>-	0x00000006, 0x0201f000, 0x0002082c, 0x492fc857,</div><div class='del'>-	0x42000800, 0x00000004, 0x0201f000, 0x0002082c,</div><div class='del'>-	0x4807c856, 0x59a80068, 0x800409c0, 0x04000003,</div><div class='del'>-	0x80080540, 0x0401f002, 0x80080500, 0x48035068,</div><div class='del'>-	0x1c01f000, 0x4a030800, 0x00000000, 0x4a030802,</div><div class='del'>-	0x00000001, 0x497b0803, 0x497b0804, 0x1c01f000,</div><div class='del'>-	0x59840002, 0x8c000500, 0x04000004, 0x84000500,</div><div class='del'>-	0x4a030800, 0x00000001, 0x84000544, 0x84000506,</div><div class='del'>-	0x48030802, 0x82000d00, 0x0fffffff, 0x42000000,</div><div class='del'>-	0x90000000, 0x0201f800, 0x00100bde, 0x59a80069,</div><div class='del'>-	0x82000480, 0x00000007, 0x48035069, 0x80000580,</div><div class='del'>-	0x42000800, 0x0010b315, 0x48000800, 0x48000801,</div><div class='del'>-	0x1c01f000, 0x59a80069, 0x82000400, 0x00000007,</div><div class='del'>-	0x48035069, 0x1c01f000, 0x83640480, 0x00000008,</div><div class='del'>-	0x0400101b, 0x58c80a03, 0x80000580, 0x82000400,</div><div class='del'>-	0x00000008, 0x80040840, 0x040207fd, 0x815c0480,</div><div class='del'>-	0x04001013, 0x4200b000, 0x00000007, 0x0201f800,</div><div class='del'>-	0x00020892, 0x4a026203, 0x00000004, 0x4a026406,</div><div class='del'>-	0x00000009, 0x4a026203, 0x00000004, 0x4a026007,</div><div class='del'>-	0x00000101, 0x0401f809, 0x0401f880, 0x8058b040,</div><div class='del'>-	0x040207f3, 0x80000580, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f7fd, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x492e6008, 0x58c80a03, 0x4a025a04, 0x0000002c,</div><div class='del'>-	0x497a5800, 0x497a5801, 0x497a5c04, 0x497a5c06,</div><div class='del'>-	0x497a5805, 0x4a025a08, 0x00000005, 0x4a025a07,</div><div class='del'>-	0x00000002, 0x58c80201, 0x48025c04, 0x58c80202,</div><div class='del'>-	0x48025c07, 0x58c80204, 0x48025c08, 0x4a02580d,</div><div class='del'>-	0x0000ffff, 0x80040840, 0x0400000c, 0x412c2000,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x4a025a04, 0x0000000a,</div><div class='del'>-	0x497a5c04, 0x48125800, 0x492c2001, 0x412c2000,</div><div class='del'>-	0x80040840, 0x040207f7, 0x1c01f000, 0x4d7c0000,</div><div class='del'>-	0x4202f800, 0x00000010, 0x4df00000, 0x4203e000,</div><div class='del'>-	0x50000000, 0x59847803, 0x803c79c0, 0x0400001e,</div><div class='del'>-	0x4c5c0000, 0x583cb808, 0x585c3408, 0x801831c0,</div><div class='del'>-	0x0400000b, 0x0401f84a, 0x04000016, 0x42001000,</div><div class='del'>-	0x0010b315, 0x0401f87f, 0x04000012, 0x0201f800,</div><div class='del'>-	0x00100819, 0x0400000f, 0x492cb805, 0x585c0005,</div><div class='del'>-	0x80000540, 0x02000800, 0x00100615, 0x0401f830,</div><div class='del'>-	0x585c5408, 0x0401f80b, 0x5c00b800, 0x5c03e000,</div><div class='del'>-	0x817ef840, 0x040207e1, 0x5c02f800, 0x1c01f000,</div><div class='del'>-	0x5c00b800, 0x5c03e000, 0x5c02f800, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x405c6000, 0x802851c0, 0x04000018,</div><div class='del'>-	0x585c0204, 0x82000d00, 0x0000000f, 0x82040c00,</div><div class='del'>-	0x0010110d, 0x50044000, 0x4c600000, 0x4c640000,</div><div class='del'>-	0x4d040000, 0x4020c000, 0x40320800, 0x5984c804,</div><div class='del'>-	0x4c280000, 0x0401f934, 0x5c005000, 0x40604000,</div><div class='del'>-	0x41046000, 0x0201f800, 0x001010eb, 0x040207f6,</div><div class='del'>-	0x5c020800, 0x5c00c800, 0x5c00c000, 0x58c80204,</div><div class='del'>-	0x4800bc08, 0x0201f800, 0x00020087, 0x4a026007,</div><div class='del'>-	0x00000101, 0x497a6009, 0x0401f055, 0x4803c856,</div><div class='del'>-	0x59840003, 0x80026540, 0x04000003, 0x59300000,</div><div class='del'>-	0x48030803, 0x1c01f000, 0x4803c856, 0x59840003,</div><div class='del'>-	0x48026000, 0x49330803, 0x1c01f000, 0x58cc0805,</div><div class='del'>-	0x40180000, 0x80040480, 0x0400100d, 0x82cc0580,</div><div class='del'>-	0x0010b30a, 0x02020800, 0x00100615, 0x58c80205,</div><div class='del'>-	0x80040480, 0x0400101d, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x80003580, 0x0401f7fe, 0x82cc0580,</div><div class='del'>-	0x0010b30a, 0x02020800, 0x00100615, 0x58c80400,</div><div class='del'>-	0x8c000504, 0x040007f8, 0x58c8040b, 0x8c00051e,</div><div class='del'>-	0x040007f5, 0x8c000500, 0x040207f3, 0x84000540,</div><div class='del'>-	0x4801940b, 0x42000000, 0x0010b637, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x42001000, 0x00008026, 0x0201f800,</div><div class='del'>-	0x00103857, 0x0401f7e8, 0x58c8040b, 0x8c00051e,</div><div class='del'>-	0x040007e2, 0x8c000502, 0x040207e0, 0x84000542,</div><div class='del'>-	0x4801940b, 0x42000000, 0x0010b636, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x42001000, 0x00008025, 0x42001800,</div><div class='del'>-	0x00000000, 0x0201f800, 0x00103857, 0x0401f7d3,</div><div class='del'>-	0x4803c856, 0x58080000, 0x42001800, 0x00000007,</div><div class='del'>-	0x58080801, 0x80040480, 0x04020004, 0x400c0000,</div><div class='del'>-	0x80000540, 0x0401f005, 0x04001003, 0x800c0480,</div><div class='del'>-	0x0401f002, 0x80000080, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x59300008, 0x80000d40, 0x02000800, 0x00100615,</div><div class='del'>-	0x58040005, 0x80000540, 0x02000800, 0x00100615,</div><div class='del'>-	0x59300007, 0x82000500, 0x00000101, 0x82000580,</div><div class='del'>-	0x00000101, 0x02020800, 0x00100615, 0x42001000,</div><div class='del'>-	0x0010b315, 0x58080801, 0x82040400, 0x0010b317,</div><div class='del'>-	0x497a6414, 0x4a026015, 0x0000ffff, 0x45300000,</div><div class='del'>-	0x80040800, 0x82040480, 0x00000008, 0x04001002,</div><div class='del'>-	0x80000d80, 0x48041001, 0x82040400, 0x0010b317,</div><div class='del'>-	0x45780000, 0x1c01f000, 0x4933c857, 0x59300808,</div><div class='del'>-	0x800409c0, 0x02000800, 0x00100615, 0x4d2c0000,</div><div class='del'>-	0x58065805, 0x812e59c0, 0x02020800, 0x0010083a,</div><div class='del'>-	0x49780805, 0x40065800, 0x0201f800, 0x00100843,</div><div class='del'>-	0x5c025800, 0x4d300000, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x59300406, 0x82000580,</div><div class='del'>-	0x00000009, 0x04020006, 0x59300007, 0x8c000510,</div><div class='del'>-	0x04000003, 0x80000580, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x59840802, 0x8c040d04,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x59840802, 0x84040d04,</div><div class='del'>-	0x84040d40, 0x4a030800, 0x00000000, 0x48070802,</div><div class='del'>-	0x82040d00, 0x0fffffff, 0x42000000, 0x90000000,</div><div class='del'>-	0x0201f000, 0x00100bde, 0x4807c857, 0x4805980a,</div><div class='del'>-	0x49799801, 0x49799803, 0x49799806, 0x49799807,</div><div class='del'>-	0x49799808, 0x49799805, 0x49799809, 0x0401f8c8,</div><div class='del'>-	0x0400000a, 0x0401f8ea, 0x04000008, 0x48359800,</div><div class='del'>-	0x48359802, 0x48359806, 0x4a019804, 0x00000001,</div><div class='del'>-	0x4a019807, 0x00000005, 0x1c01f000, 0x4807c857,</div><div class='del'>-	0x58cc1007, 0x40040000, 0x80080480, 0x04021020,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x0401f8d9, 0x5c001000,</div><div class='del'>-	0x5c000800, 0x0400001c, 0x58cc0006, 0x80006540,</div><div class='del'>-	0x0402000b, 0x48359800, 0x48359802, 0x48359806,</div><div class='del'>-	0x49799801, 0x49799803, 0x49786801, 0x49786800,</div><div class='del'>-	0x49799804, 0x49799807, 0x0401f005, 0x48306801,</div><div class='del'>-	0x48346000, 0x48359806, 0x49786800, 0x58cc0004,</div><div class='del'>-	0x58cc1007, 0x80000000, 0x82081400, 0x00000005,</div><div class='del'>-	0x48019804, 0x48099807, 0x0401f7df, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x480bc857, 0x4c500000, 0x4c540000, 0x4c580000,</div><div class='del'>-	0x40083000, 0x58cc0801, 0x82040480, 0x00000005,</div><div class='del'>-	0x02021800, 0x00100615, 0x82040400, 0x00106150,</div><div class='del'>-	0x50000000, 0x58cca800, 0x8054ac00, 0x42001800,</div><div class='del'>-	0x00000005, 0x40040000, 0x800c0480, 0x80082480,</div><div class='del'>-	0x04021002, 0x40080000, 0x8000b0c2, 0x8058b400,</div><div class='del'>-	0x5450a800, 0x8050a000, 0x8054a800, 0x8058b040,</div><div class='del'>-	0x040207fc, 0x40001000, 0x58cc2805, 0x58cc0807,</div><div class='del'>-	0x58cc2001, 0x80142c00, 0x80040c80, 0x80102400,</div><div class='del'>-	0x48159805, 0x48059807, 0x48119801, 0x82100580,</div><div class='del'>-	0x00000005, 0x0400000c, 0x48119801, 0x40080000,</div><div class='del'>-	0x80181480, 0x40083000, 0x04000003, 0x040217d6,</div><div class='del'>-	0x80000580, 0x5c00b000, 0x5c00a800, 0x5c00a000,</div><div class='del'>-	0x1c01f000, 0x58cc0800, 0x800409c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x58040800, 0x48059800, 0x41782000,</div><div class='del'>-	0x0401f7ee, 0x0401f812, 0x50600000, 0x81041c00,</div><div class='del'>-	0x585c0204, 0x4803c857, 0x82000580, 0x0000002c,</div><div class='del'>-	0x02020800, 0x00100615, 0x58040202, 0x800000e0,</div><div class='del'>-	0x80640540, 0x48001802, 0x58040000, 0x48001800,</div><div class='del'>-	0x58040001, 0x48001801, 0x1c01f000, 0x4807c856,</div><div class='del'>-	0x58cc0005, 0x80000040, 0x02001800, 0x00100615,</div><div class='del'>-	0x48019805, 0x58cc1003, 0x82080480, 0x00000005,</div><div class='del'>-	0x02021800, 0x00100615, 0x82080400, 0x00106150,</div><div class='del'>-	0x50000000, 0x58cc0802, 0x80040c00, 0x80081000,</div><div class='del'>-	0x82080480, 0x00000005, 0x0402000f, 0x58cc2002,</div><div class='del'>-	0x58100000, 0x80006d40, 0x04000009, 0x4c340000,</div><div class='del'>-	0x0401f858, 0x5c006800, 0x49786801, 0x48359802,</div><div class='del'>-	0x58cc0004, 0x80000040, 0x48019804, 0x49799803,</div><div class='del'>-	0x0401f002, 0x48099803, 0x1c01f000, 0x4807c856,</div><div class='del'>-	0x41781800, 0x58c80201, 0x80000540, 0x04000002,</div><div class='del'>-	0x800c1800, 0x58c80c01, 0x80040c80, 0x0400100a,</div><div class='del'>-	0x04000009, 0x800c1800, 0x58c80202, 0x80041480,</div><div class='del'>-	0x04001005, 0x04000004, 0x800c1800, 0x40080800,</div><div class='del'>-	0x0401f7fb, 0x480d9204, 0x400c0000, 0x42002000,</div><div class='del'>-	0x00000001, 0x80000040, 0x04000007, 0x04001006,</div><div class='del'>-	0x80102000, 0x82000480, 0x00000005, 0x04000002,</div><div class='del'>-	0x040217fc, 0x48119203, 0x1c01f000, 0x4807c856,</div><div class='del'>-	0x4d2c0000, 0x58cc000a, 0x80000540, 0x02000800,</div><div class='del'>-	0x00100615, 0x82002400, 0x00000005, 0x0201f800,</div><div class='del'>-	0x00100819, 0x04000012, 0x492d9809, 0x497a5800,</div><div class='del'>-	0x497a5801, 0x0201f800, 0x00100819, 0x0400000c,</div><div class='del'>-	0x58cc0009, 0x48025800, 0x497a5801, 0x492d9809,</div><div class='del'>-	0x82102480, 0x00000005, 0x040217f7, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c025800, 0x1c01f000, 0x58cc0009,</div><div class='del'>-	0x80025d40, 0x040007fc, 0x592c2000, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x40100000, 0x0401f7fa, 0x58cc0009,</div><div class='del'>-	0x48cfc857, 0x80006d40, 0x04000005, 0x50340000,</div><div class='del'>-	0x48019809, 0x49786800, 0x49786801, 0x1c01f000,</div><div class='del'>-	0x4813c857, 0x58cc0009, 0x48002000, 0x48119809,</div><div class='del'>-	0x1c01f000, 0x4807c856, 0x4d2c0000, 0x58cc0009,</div><div class='del'>-	0x80025d40, 0x04000007, 0x592c0000, 0x4c000000,</div><div class='del'>-	0x0201f800, 0x0010083a, 0x5c000000, 0x0401f7f9,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4807c856, 0x4d2c0000,</div><div class='del'>-	0x58cc0002, 0x80025d40, 0x04000007, 0x592c0000,</div><div class='del'>-	0x4c000000, 0x0201f800, 0x0010083a, 0x5c000000,</div><div class='del'>-	0x0401f7f9, 0x49799800, 0x49799802, 0x49799801,</div><div class='del'>-	0x49799803, 0x49799806, 0x49799807, 0x49799808,</div><div class='del'>-	0x49799809, 0x4979980a, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x00000003, 0x00000006, 0x00000009, 0x0000000c,</div><div class='del'>-	0x0000000f, 0x00000012, 0x4803c856, 0x0401f857,</div><div class='del'>-	0x4a00c204, 0x0000003c, 0x59301009, 0x82080580,</div><div class='del'>-	0x0010b320, 0x04000013, 0x58080802, 0x82040d00,</div><div class='del'>-	0x00ffffff, 0x58080403, 0x4804c005, 0x4800c406,</div><div class='del'>-	0x4a00c207, 0x00000003, 0x59300811, 0x585c0404,</div><div class='del'>-	0x4978c206, 0x4804c407, 0x80000540, 0x0400000d,</div><div class='del'>-	0x58600206, 0x84000540, 0x4800c206, 0x0401f009,</div><div class='del'>-	0x585c080a, 0x82040d00, 0x00ffffff, 0x4804c005,</div><div class='del'>-	0x4a00c406, 0x000007ff, 0x4978c207, 0x0401f7ef,</div><div class='del'>-	0x82603c00, 0x00000008, 0x58605404, 0x40282000,</div><div class='del'>-	0x405c6000, 0x585c0a04, 0x82040d00, 0x0000000f,</div><div class='del'>-	0x82040c00, 0x0010110d, 0x50044000, 0x80004d80,</div><div class='del'>-	0x50200000, 0x80307400, 0x58380402, 0x8c244d00,</div><div class='del'>-	0x04020003, 0x48003a00, 0x0401f003, 0x48003c00,</div><div class='del'>-	0x801c3800, 0x80244800, 0x80102040, 0x04000006,</div><div class='del'>-	0x0201f800, 0x001010eb, 0x02000800, 0x00100615,</div><div class='del'>-	0x0401f7f0, 0x1c01f000, 0x4803c856, 0x4d340000,</div><div class='del'>-	0x59300009, 0x80026d40, 0x02000800, 0x00100615,</div><div class='del'>-	0x59340401, 0x80000540, 0x0400000e, 0x59840000,</div><div class='del'>-	0x80000540, 0x0400000b, 0x836c0580, 0x00000003,</div><div class='del'>-	0x04020008, 0x59341c03, 0x42002000, 0x00000004,</div><div class='del'>-	0x42003000, 0x00000004, 0x0201f800, 0x001038c7,</div><div class='del'>-	0x5c026800, 0x1c01f000, 0x4803c856, 0x80001580,</div><div class='del'>-	0x58c80c01, 0x59300011, 0x80040c80, 0x48066011,</div><div class='del'>-	0x58c80201, 0x80000540, 0x04000005, 0x80081000,</div><div class='del'>-	0x80040c80, 0x04001007, 0x04000006, 0x58c80202,</div><div class='del'>-	0x80081000, 0x80040c80, 0x04001002, 0x040207fd,</div><div class='del'>-	0x4808bc08, 0x4808c404, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4a0370e5, 0x00020000, 0x59b800e5, 0x8c000524,</div><div class='del'>-	0x040207fc, 0x4a0370e5, 0x00030000, 0x40000000,</div><div class='del'>-	0x40000000, 0x59b800e5, 0x8c000524, 0x040207f5,</div><div class='del'>-	0x5934000e, 0x80006d40, 0x04000010, 0x81300580,</div><div class='del'>-	0x04020004, 0x58340000, 0x4802680e, 0x0401f00a,</div><div class='del'>-	0x40347800, 0x58340000, 0x80006d40, 0x02000800,</div><div class='del'>-	0x00100615, 0x81300580, 0x040207fa, 0x58340000,</div><div class='del'>-	0x48007800, 0x497a6000, 0x4a0370e5, 0x00020000,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4d300000, 0x4d2c0000,</div><div class='del'>-	0x42000800, 0x000003ff, 0x4a0370e5, 0x00020000,</div><div class='del'>-	0x59b800e5, 0x8c000524, 0x04000005, 0x80040840,</div><div class='del'>-	0x040207fa, 0x0201f800, 0x00100615, 0x4a0370e5,</div><div class='del'>-	0x00030000, 0x40000000, 0x40000000, 0x59b800e5,</div><div class='del'>-	0x8c000524, 0x040207f1, 0x5934000e, 0x80026540,</div><div class='del'>-	0x0400000e, 0x4933c857, 0x59300000, 0x4802680e,</div><div class='del'>-	0x4a026203, 0x00000004, 0x497a6206, 0x497a6009,</div><div class='del'>-	0x4a026007, 0x00000101, 0x59325808, 0x497a5c08,</div><div class='del'>-	0x0401fd82, 0x0401f7f1, 0x4a0370e5, 0x00020000,</div><div class='del'>-	0x5c025800, 0x5c026000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4c000000, 0x0201f800, 0x001059b9, 0x04020011,</div><div class='del'>-	0x0201f800, 0x001043fc, 0x02020800, 0x00100615,</div><div class='del'>-	0x5c000000, 0x48026802, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000009, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x42027000, 0x00000001, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x59300203, 0x82000c80,</div><div class='del'>-	0x0000000e, 0x02021800, 0x00100615, 0x4803c857,</div><div class='del'>-	0x0c01f001, 0x0010623b, 0x0010623b, 0x0010623b,</div><div class='del'>-	0x0010623d, 0x0010629d, 0x0010623b, 0x0010623b,</div><div class='del'>-	0x001062ef, 0x001062f0, 0x0010623b, 0x0010623b,</div><div class='del'>-	0x0010623b, 0x0010623b, 0x0010623b, 0x0201f800,</div><div class='del'>-	0x00100615, 0x493bc857, 0x83380480, 0x00000050,</div><div class='del'>-	0x02021800, 0x00100615, 0x83380480, 0x00000049,</div><div class='del'>-	0x02001800, 0x00100615, 0x0c01f001, 0x00106250,</div><div class='del'>-	0x00106272, 0x0010624e, 0x0010624e, 0x0010624e,</div><div class='del'>-	0x0010624e, 0x00106281, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x592c0206, 0x48025c06,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x4c5c0000, 0x592cbc0a,</div><div class='del'>-	0x592c0000, 0x48026008, 0x0201f800, 0x00020385,</div><div class='del'>-	0x59300008, 0x80000540, 0x04000008, 0x4a026203,</div><div class='del'>-	0x00000007, 0x42027000, 0x00000043, 0x5c00b800,</div><div class='del'>-	0x5c025800, 0x0401f08a, 0x8c5cbd08, 0x04020006,</div><div class='del'>-	0x4a026203, 0x00000007, 0x497a6206, 0x497a6008,</div><div class='del'>-	0x0401f003, 0x0201f800, 0x000208b4, 0x5c00b800,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x0201f800, 0x001068c1,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000006, 0x4d400000, 0x42028000, 0x00000001,</div><div class='del'>-	0x0401f90e, 0x5c028000, 0x5c025800, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x0201f800, 0x001068c1, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x42003000, 0x00000014, 0x0201f800, 0x0010a766,</div><div class='del'>-	0x42000000, 0x0010b663, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000006, 0x4d400000, 0x42028000, 0x00000029,</div><div class='del'>-	0x0401f8f2, 0x5c028000, 0x5c025800, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x493bc857, 0x497a6206, 0x83380480,</div><div class='del'>-	0x00000054, 0x02021800, 0x00100615, 0x83380480,</div><div class='del'>-	0x00000047, 0x02001800, 0x00100615, 0x0c01f001,</div><div class='del'>-	0x001062ee, 0x001062b7, 0x001062b5, 0x001062b5,</div><div class='del'>-	0x001062b5, 0x001062b5, 0x001062b5, 0x001062b5,</div><div class='del'>-	0x001062b5, 0x001062b5, 0x001062b5, 0x001062b5,</div><div class='del'>-	0x001062bb, 0x0201f800, 0x00100615, 0x59300011,</div><div class='del'>-	0x82000500, 0xffff0000, 0x04020034, 0x59840802,</div><div class='del'>-	0x8c040d04, 0x04000025, 0x59300009, 0x80026d40,</div><div class='del'>-	0x0400001f, 0x4c5c0000, 0x4c600000, 0x497a6206,</div><div class='del'>-	0x5930b808, 0x585c0005, 0x8000c540, 0x02000800,</div><div class='del'>-	0x00100615, 0x0401fe8d, 0x40625800, 0x0201f800,</div><div class='del'>-	0x00020385, 0x4978b805, 0x0401fef5, 0x497a6009,</div><div class='del'>-	0x585c3408, 0x0401fcbe, 0x0400000e, 0x42001000,</div><div class='del'>-	0x0010b315, 0x0401fcf3, 0x0400000a, 0x0201f800,</div><div class='del'>-	0x0010082a, 0x04000007, 0x492cb805, 0x585c5408,</div><div class='del'>-	0x0401fc84, 0x5c00c000, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x0401fcaa, 0x0401f7fc, 0x8c040d06, 0x040207fc,</div><div class='del'>-	0x59300009, 0x80026d40, 0x04000006, 0x5934000e,</div><div class='del'>-	0x80000540, 0x02020800, 0x00100615, 0x497a6009,</div><div class='del'>-	0x0401fd0e, 0x0401f7f2, 0x0401f085, 0x4803c856,</div><div class='del'>-	0x4803c856, 0x83380580, 0x00000043, 0x02020800,</div><div class='del'>-	0x00100615, 0x4a026203, 0x00000003, 0x493a6403,</div><div class='del'>-	0x59325808, 0x592c000f, 0x48026011, 0x497a6013,</div><div class='del'>-	0x592c0406, 0x800000c2, 0x800010c4, 0x80081400,</div><div class='del'>-	0x480a6206, 0x0201f800, 0x00100f9c, 0x42000800,</div><div class='del'>-	0x80000060, 0x0401f161, 0x42000000, 0x0010b674,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x59300203, 0x82000c80,</div><div class='del'>-	0x0000000e, 0x02021800, 0x00100615, 0x4803c857,</div><div class='del'>-	0x82000d80, 0x00000003, 0x04000006, 0x82000d80,</div><div class='del'>-	0x00000004, 0x0400005b, 0x0201f800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x59300004, 0x8c00053e,</div><div class='del'>-	0x04020007, 0x0201f800, 0x001068a3, 0x02020800,</div><div class='del'>-	0x00100615, 0x0201f000, 0x00106982, 0x0401f9d3,</div><div class='del'>-	0x0201f800, 0x00106982, 0x59325808, 0x42028000,</div><div class='del'>-	0x00000006, 0x0401f861, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x4803c856, 0x59300203, 0x82000c80, 0x0000000e,</div><div class='del'>-	0x02021800, 0x00100615, 0x82000d80, 0x00000002,</div><div class='del'>-	0x04000009, 0x82000d80, 0x00000003, 0x04000019,</div><div class='del'>-	0x82000d80, 0x00000004, 0x04000036, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4933c857, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x02000800, 0x00100615, 0x592c1a08,</div><div class='del'>-	0x8c0c1d0e, 0x02000800, 0x00100615, 0x4d400000,</div><div class='del'>-	0x42028000, 0x00000001, 0x0401f840, 0x0201f800,</div><div class='del'>-	0x00107698, 0x5c028000, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x0010698c, 0x4df00000,</div><div class='del'>-	0x59300004, 0x8c00053e, 0x04020006, 0x0201f800,</div><div class='del'>-	0x00106cb4, 0x02020800, 0x00100615, 0x0401f010,</div><div class='del'>-	0x0201f800, 0x00108a8a, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00106bb2, 0x0402000a, 0x0401f994, 0x02020800,</div><div class='del'>-	0x00100615, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x00100ee4, 0x4933c857,</div><div class='del'>-	0x4c5c0000, 0x4d340000, 0x497a6206, 0x5930b808,</div><div class='del'>-	0x59300009, 0x80026d40, 0x04020e49, 0x42001000,</div><div class='del'>-	0x0010b315, 0x0401fc4b, 0x04000009, 0x58c80204,</div><div class='del'>-	0x4800bc08, 0x41785000, 0x0201f800, 0x00105f60,</div><div class='del'>-	0x5c026800, 0x5c00b800, 0x1c01f000, 0x4978bc08,</div><div class='del'>-	0x0401fc02, 0x0401f7fb, 0x4803c856, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x0400000f, 0x592c0000, 0x80000d40,</div><div class='del'>-	0x04000009, 0x497a5800, 0x49425a06, 0x4c040000,</div><div class='del'>-	0x0201f800, 0x00020381, 0x5c000800, 0x40065800,</div><div class='del'>-	0x0401f7f6, 0x49425a06, 0x0201f800, 0x00020381,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x59300c06, 0x82040580,</div><div class='del'>-	0x0000000e, 0x04000004, 0x82040580, 0x00000009,</div><div class='del'>-	0x04020004, 0x0401ffe5, 0x497a6008, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x592e6009, 0x83300480, 0x0010cfc0,</div><div class='del'>-	0x04001016, 0x41580000, 0x81300480, 0x04021013,</div><div class='del'>-	0x40040000, 0x59300c06, 0x80040580, 0x04020012,</div><div class='del'>-	0x59300a03, 0x82040580, 0x00000007, 0x02020800,</div><div class='del'>-	0x00100615, 0x59300008, 0x80000540, 0x02020800,</div><div class='del'>-	0x00100615, 0x0201f800, 0x000208b4, 0x42000000,</div><div class='del'>-	0x00000000, 0x0401f009, 0x42000000, 0x00000008,</div><div class='del'>-	0x0401f006, 0x82040580, 0x00000007, 0x040207fb,</div><div class='del'>-	0x42000000, 0x00000005, 0x592c0a06, 0x48065c06,</div><div class='del'>-	0x48025a06, 0x0201f000, 0x00020381, 0x4c0c0000,</div><div class='del'>-	0x4c100000, 0x4c140000, 0x4c180000, 0x80001d80,</div><div class='del'>-	0x80002580, 0x42003000, 0x00000020, 0x82040500,</div><div class='del'>-	0x00000001, 0x04000003, 0x40080000, 0x800c1c00,</div><div class='del'>-	0x400c2800, 0x800c1902, 0x80102102, 0x82140500,</div><div class='del'>-	0x00000001, 0x04000003, 0x82102540, 0x80000000,</div><div class='del'>-	0x80040902, 0x80183040, 0x040207f1, 0x40100800,</div><div class='del'>-	0x400c0000, 0x5c003000, 0x5c002800, 0x5c002000,</div><div class='del'>-	0x5c001800, 0x1c01f000, 0x4c580000, 0x4200b000,</div><div class='del'>-	0x00000020, 0x80000540, 0x04000018, 0x80041c80,</div><div class='del'>-	0x04021016, 0x800810c2, 0x80040982, 0x04001006,</div><div class='del'>-	0x80041c80, 0x04021005, 0x8058b040, 0x040207fa,</div><div class='del'>-	0x0401f006, 0x80041c80, 0x400c0800, 0x80081000,</div><div class='del'>-	0x8058b040, 0x040207f4, 0x4c000000, 0x41f00000,</div><div class='del'>-	0x82000500, 0xf7ffffff, 0x4003e000, 0x5c000000,</div><div class='del'>-	0x5c00b000, 0x1c01f000, 0x4c000000, 0x41f00000,</div><div class='del'>-	0x82000540, 0x08000000, 0x0401f7f8, 0x42007000,</div><div class='del'>-	0x0010b33f, 0x4a007000, 0x00000005, 0x4a007401,</div><div class='del'>-	0x00000000, 0x4a007202, 0x00000840, 0x4a0378e8,</div><div class='del'>-	0x00000000, 0x4a03c821, 0x00000010, 0x4a03c823,</div><div class='del'>-	0x00000004, 0x0401f81d, 0x4a0378e9, 0x00003a0d,</div><div class='del'>-	0x4a0378e8, 0x00000001, 0x42000800, 0x00000005,</div><div class='del'>-	0x4203a000, 0x00007600, 0x4a03a005, 0xd0000001,</div><div class='del'>-	0x59d00006, 0x4a03a005, 0x90000001, 0x83d3a400,</div><div class='del'>-	0x00000020, 0x80040840, 0x040207fa, 0x59e00003,</div><div class='del'>-	0x82000500, 0xffffffe0, 0x82000540, 0x00008000,</div><div class='del'>-	0x4803c003, 0x59c40006, 0x82000500, 0xfffcffff,</div><div class='del'>-	0x48038806, 0x1c01f000, 0x4d900000, 0x4d180000,</div><div class='del'>-	0x4a0378e7, 0xaaaaaaaa, 0x4a0378e6, 0xaaaaaaaa,</div><div class='del'>-	0x4a0378e5, 0xaaaaaaaa, 0x4a0378e4, 0xaaaaaaaa,</div><div class='del'>-	0x4a03781a, 0x0010b5d2, 0x4a03781b, 0x0010110d,</div><div class='del'>-	0x4a03781c, 0x0010111d, 0x4a031800, 0x00000000,</div><div class='del'>-	0x4a031801, 0x0010b342, 0x4a031802, 0x0010b349,</div><div class='del'>-	0x42000800, 0x0010b5d5, 0x417a3000, 0x811b20c8,</div><div class='del'>-	0x83932400, 0x0000bf32, 0x48072000, 0x4a032001,</div><div class='del'>-	0x00000000, 0x83180400, 0x00106e41, 0x50000000,</div><div class='del'>-	0x48032002, 0x82040c00, 0x00000003, 0x811a3000,</div><div class='del'>-	0x83180480, 0x00000005, 0x040017f1, 0x5c023000,</div><div class='del'>-	0x5c032000, 0x1c01f000, 0x48066004, 0x497a6000,</div><div class='del'>-	0x497a6001, 0x59bc00ea, 0x8c000516, 0x040207fe,</div><div class='del'>-	0x83300400, 0xa0000000, 0x480378e1, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59300804, 0x82040d00, 0x00000100,</div><div class='del'>-	0x82040d40, 0x80000040, 0x48066004, 0x497a6000,</div><div class='del'>-	0x59bc00ea, 0x8c000516, 0x040207fe, 0x83300400,</div><div class='del'>-	0x60000000, 0x480378e1, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x4df00000, 0x4d300000, 0x4d340000,</div><div class='del'>-	0x4d2c0000, 0x4d180000, 0x4c5c0000, 0x4c600000,</div><div class='del'>-	0x4d900000, 0x4dd00000, 0x4da40000, 0x4d140000,</div><div class='del'>-	0x42003000, 0x0000bf2e, 0x581a6001, 0x813261c0,</div><div class='del'>-	0x0400002c, 0x41302800, 0x4178c000, 0x59300000,</div><div class='del'>-	0x4c000000, 0x59326809, 0x5930b801, 0x59300406,</div><div class='del'>-	0x82000d80, 0x00000006, 0x04020003, 0x8d3e7d18,</div><div class='del'>-	0x04000010, 0x8d3e7d06, 0x04000007, 0x82000580,</div><div class='del'>-	0x00000003, 0x04020004, 0x59340200, 0x8c00050e,</div><div class='del'>-	0x04020008, 0x0401f92d, 0x4c0c0000, 0x4c140000,</div><div class='del'>-	0x0401fb59, 0x5c002800, 0x5c001800, 0x0401f005,</div><div class='del'>-	0x41301800, 0x8060c1c0, 0x04020002, 0x400cc000,</div><div class='del'>-	0x805cb9c0, 0x04000003, 0x405e6000, 0x0401f7e3,</div><div class='del'>-	0x5c026000, 0x813261c0, 0x04000006, 0x8060c1c0,</div><div class='del'>-	0x04000002, 0x40602800, 0x4178c000, 0x0401f7d8,</div><div class='del'>-	0x417a3000, 0x0201f800, 0x00106e2f, 0x59926004,</div><div class='del'>-	0x813261c0, 0x04000023, 0x59326809, 0x4130c000,</div><div class='del'>-	0x59300001, 0x8000bd40, 0x04000016, 0x40026000,</div><div class='del'>-	0x40602800, 0x5930b801, 0x59300406, 0x82000d80,</div><div class='del'>-	0x00000006, 0x0400000e, 0x8d3e7d06, 0x04000007,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020004, 0x59340200,</div><div class='del'>-	0x8c00050e, 0x04020006, 0x0401f8da, 0x4c140000,</div><div class='del'>-	0x0401fb29, 0x5c002800, 0x0401f002, 0x41302800,</div><div class='del'>-	0x405e6000, 0x813261c0, 0x040207eb, 0x8060c1c0,</div><div class='del'>-	0x04000004, 0x40626000, 0x4178c000, 0x0401f7e7,</div><div class='del'>-	0x811a3000, 0x83180480, 0x00000005, 0x040017d6,</div><div class='del'>-	0x5c022800, 0x5c034800, 0x5c03a000, 0x5c032000,</div><div class='del'>-	0x5c00c000, 0x5c00b800, 0x5c023000, 0x5c025800,</div><div class='del'>-	0x5c026800, 0x5c026000, 0x5c03e000, 0x02000800,</div><div class='del'>-	0x00106982, 0x1c01f000, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x4df00000, 0x4d340000, 0x4d180000,</div><div class='del'>-	0x4d900000, 0x42003000, 0x0000bf2e, 0x59326809,</div><div class='del'>-	0x58182001, 0x40102800, 0x801021c0, 0x04000016,</div><div class='del'>-	0x41300000, 0x80100580, 0x04000011, 0x58100009,</div><div class='del'>-	0x81340580, 0x0402000b, 0x40101800, 0x58102001,</div><div class='del'>-	0x41300000, 0x801021c0, 0x0400000b, 0x80100d80,</div><div class='del'>-	0x04000007, 0x40101800, 0x58102001, 0x0401f7fa,</div><div class='del'>-	0x40102800, 0x58102000, 0x0401f7ec, 0x0401f8bb,</div><div class='del'>-	0x0401f01a, 0x42032000, 0x0000bf32, 0x417a3000,</div><div class='del'>-	0x59902004, 0x40102800, 0x801021c0, 0x0400000b,</div><div class='del'>-	0x58100009, 0x81340580, 0x04020008, 0x41300000,</div><div class='del'>-	0x80100580, 0x0400000c, 0x40102800, 0x58102001,</div><div class='del'>-	0x801021c0, 0x040207fa, 0x811a3000, 0x83180480,</div><div class='del'>-	0x00000005, 0x0402100d, 0x83932400, 0x00000010,</div><div class='del'>-	0x0401f7ec, 0x0401f87f, 0x5c032000, 0x5c023000,</div><div class='del'>-	0x5c026800, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x80000580, 0x1c01f000, 0x5c032000, 0x5c023000,</div><div class='del'>-	0x5c026800, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x4df00000, 0x4d300000, 0x4d340000,</div><div class='del'>-	0x4d180000, 0x4d2c0000, 0x4c5c0000, 0x4c600000,</div><div class='del'>-	0x4d900000, 0x4dd00000, 0x4da40000, 0x4d140000,</div><div class='del'>-	0x42003000, 0x0000bf2e, 0x581a6001, 0x813261c0,</div><div class='del'>-	0x04000023, 0x41302800, 0x5930b800, 0x59326809,</div><div class='del'>-	0x59340403, 0x81440580, 0x04000006, 0x805cb9c0,</div><div class='del'>-	0x0400001b, 0x41302800, 0x405e6000, 0x0401f7f7,</div><div class='del'>-	0x5930b801, 0x8d3e7d00, 0x04000003, 0x0401fb58,</div><div class='del'>-	0x0402000e, 0x59300406, 0x82000580, 0x00000006,</div><div class='del'>-	0x04020003, 0x8d3e7d18, 0x04000008, 0x0401f867,</div><div class='del'>-	0x4c0c0000, 0x4c140000, 0x0401fa93, 0x5c002800,</div><div class='del'>-	0x5c001800, 0x0401f002, 0x41301800, 0x405e6000,</div><div class='del'>-	0x813261c0, 0x040207eb, 0x0401f02d, 0x417a3000,</div><div class='del'>-	0x0201f800, 0x00106e2f, 0x59926004, 0x813261c0,</div><div class='del'>-	0x04000005, 0x59326809, 0x59340403, 0x81440580,</div><div class='del'>-	0x04000006, 0x811a3000, 0x83180480, 0x00000005,</div><div class='del'>-	0x040017f4, 0x0401f01e, 0x4130c000, 0x59300001,</div><div class='del'>-	0x8000bd40, 0x04000012, 0x40026000, 0x40602800,</div><div class='del'>-	0x5930b801, 0x8d3e7d00, 0x04000003, 0x0401fb2c,</div><div class='del'>-	0x0402000a, 0x59300406, 0x82000580, 0x00000006,</div><div class='del'>-	0x04000006, 0x0401f81b, 0x4c140000, 0x0401fa6a,</div><div class='del'>-	0x5c002800, 0x0401f002, 0x41302800, 0x405e6000,</div><div class='del'>-	0x813261c0, 0x040207ef, 0x8060c1c0, 0x04000004,</div><div class='del'>-	0x40626000, 0x4178c000, 0x0401f7eb, 0x5c022800,</div><div class='del'>-	0x5c034800, 0x5c03a000, 0x5c032000, 0x5c00c000,</div><div class='del'>-	0x5c00b800, 0x5c025800, 0x5c023000, 0x5c026800,</div><div class='del'>-	0x5c026000, 0x5c03e000, 0x04000bd4, 0x1c01f000,</div><div class='del'>-	0x0401fbb9, 0x59900004, 0x81300580, 0x04020018,</div><div class='del'>-	0x4c140000, 0x0201f800, 0x00106b13, 0x0401fba9,</div><div class='del'>-	0x5c002800, 0x59300001, 0x800001c0, 0x04020003,</div><div class='del'>-	0x497a680c, 0x1c01f000, 0x42003000, 0x0000bf2e,</div><div class='del'>-	0x497a6001, 0x58180801, 0x800409c0, 0x04020004,</div><div class='del'>-	0x48003000, 0x48003001, 0x1c01f000, 0x58180800,</div><div class='del'>-	0x48000800, 0x48003000, 0x1c01f000, 0x59300001,</div><div class='del'>-	0x48002801, 0x800001c0, 0x04020002, 0x4816680c,</div><div class='del'>-	0x497a6001, 0x1c01f000, 0x0401fb97, 0x42003000,</div><div class='del'>-	0x0000bf2e, 0x58180001, 0x81300580, 0x0402001c,</div><div class='del'>-	0x59300801, 0x800409c0, 0x0400000e, 0x59300000,</div><div class='del'>-	0x800001c0, 0x04020005, 0x48043001, 0x48043000,</div><div class='del'>-	0x497a6001, 0x1c01f000, 0x59300000, 0x48000800,</div><div class='del'>-	0x48043001, 0x497a6000, 0x497a6001, 0x1c01f000,</div><div class='del'>-	0x59300800, 0x800409c0, 0x04020005, 0x49783001,</div><div class='del'>-	0x49783000, 0x497a680c, 0x1c01f000, 0x48043001,</div><div class='del'>-	0x497a6000, 0x497a680c, 0x1c01f000, 0x58180000,</div><div class='del'>-	0x81300580, 0x0402000c, 0x59300001, 0x800001c0,</div><div class='del'>-	0x04020005, 0x48143000, 0x49782800, 0x497a680c,</div><div class='del'>-	0x1c01f000, 0x48003000, 0x48002800, 0x497a6001,</div><div class='del'>-	0x1c01f000, 0x59300000, 0x800001c0, 0x04020008,</div><div class='del'>-	0x59300001, 0x48001801, 0x800001c0, 0x04020002,</div><div class='del'>-	0x480e680c, 0x497a6001, 0x1c01f000, 0x59300801,</div><div class='del'>-	0x800409c0, 0x04020006, 0x59300800, 0x48042800,</div><div class='del'>-	0x497a6000, 0x497a680c, 0x1c01f000, 0x59300000,</div><div class='del'>-	0x48000800, 0x48042800, 0x497a6000, 0x497a6001,</div><div class='del'>-	0x1c01f000, 0x0401fb73, 0x4df00000, 0x0401f83a,</div><div class='del'>-	0x040208c7, 0x0402094a, 0x04020005, 0x5c03e000,</div><div class='del'>-	0x04000b62, 0x80000580, 0x1c01f000, 0x5c03e000,</div><div class='del'>-	0x04000b5e, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x4d2c0000, 0x4d340000, 0x4d300000, 0x41783000,</div><div class='del'>-	0x598e6009, 0x813261c0, 0x04000023, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000006, 0x04020004, 0x8d3e7d18,</div><div class='del'>-	0x0402000c, 0x0401f019, 0x82040580, 0x00000005,</div><div class='del'>-	0x04020008, 0x8d3e7d18, 0x04000003, 0x8d3e7d16,</div><div class='del'>-	0x04000004, 0x59300420, 0x8c000500, 0x0402000f,</div><div class='del'>-	0x0401fa49, 0x59300000, 0x4c000000, 0x8d3e7d06,</div><div class='del'>-	0x04000004, 0x0201f800, 0x0010909d, 0x04000005,</div><div class='del'>-	0x0401f869, 0x4c180000, 0x0401f9b7, 0x5c003000,</div><div class='del'>-	0x5c026000, 0x0401f7e0, 0x41303000, 0x59326000,</div><div class='del'>-	0x0401f7dd, 0x5c026000, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4c5c0000, 0x813261c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x41300000, 0x598cb809,</div><div class='del'>-	0x41783000, 0x805cb9c0, 0x04000013, 0x805c0d80,</div><div class='del'>-	0x04000004, 0x405c3000, 0x5818b800, 0x0401f7fa,</div><div class='del'>-	0x0401f84d, 0x598c000d, 0x81300580, 0x02000800,</div><div class='del'>-	0x00106e10, 0x59300403, 0x82000580, 0x00000042,</div><div class='del'>-	0x04020002, 0x497a6007, 0x80000580, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x82000540, 0x00000001, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x0401fb17, 0x4df00000, 0x4d2c0000,</div><div class='del'>-	0x4d340000, 0x4d300000, 0x41783000, 0x598e6009,</div><div class='del'>-	0x813261c0, 0x0400002e, 0x59300c06, 0x82040580,</div><div class='del'>-	0x00000006, 0x04020004, 0x8d3e7d18, 0x0402000c,</div><div class='del'>-	0x0401f024, 0x82040580, 0x00000005, 0x04020008,</div><div class='del'>-	0x8d3e7d18, 0x04000003, 0x8d3e7d16, 0x04000004,</div><div class='del'>-	0x59300420, 0x8c000500, 0x0402001a, 0x59326809,</div><div class='del'>-	0x59340403, 0x81440580, 0x04020016, 0x8d3e7d00,</div><div class='del'>-	0x04000006, 0x82040580, 0x00000003, 0x04020011,</div><div class='del'>-	0x0401fa23, 0x0402000f, 0x0401f9ef, 0x59300000,</div><div class='del'>-	0x4c000000, 0x8d3e7d06, 0x04000004, 0x0201f800,</div><div class='del'>-	0x0010909d, 0x04000005, 0x0401f80f, 0x4c180000,</div><div class='del'>-	0x0401f95d, 0x5c003000, 0x5c026000, 0x0401f7d5,</div><div class='del'>-	0x41303000, 0x59326000, 0x0401f7d2, 0x5c026000,</div><div class='del'>-	0x5c026800, 0x5c025800, 0x5c03e000, 0x04000ad3,</div><div class='del'>-	0x1c01f000, 0x59300800, 0x497a6000, 0x0401fab6,</div><div class='del'>-	0x801831c0, 0x04020009, 0x598c0008, 0x81300580,</div><div class='del'>-	0x04020004, 0x48031808, 0x48031809, 0x0401f008,</div><div class='del'>-	0x48071809, 0x0401f006, 0x48043000, 0x598c0008,</div><div class='del'>-	0x81300580, 0x04020002, 0x481b1808, 0x0401f2b8,</div><div class='del'>-	0x4d2c0000, 0x4d300000, 0x4d340000, 0x41783000,</div><div class='del'>-	0x598e600b, 0x813261c0, 0x04000013, 0x8d3e7d06,</div><div class='del'>-	0x04000005, 0x59326809, 0x59340200, 0x8c00050e,</div><div class='del'>-	0x0402000a, 0x0401f9b8, 0x59300000, 0x4c000000,</div><div class='del'>-	0x0401f853, 0x4c180000, 0x0401f92b, 0x5c003000,</div><div class='del'>-	0x5c026000, 0x0401f7f0, 0x41303000, 0x59326000,</div><div class='del'>-	0x0401f7ed, 0x0201f800, 0x001045c7, 0x5c026800,</div><div class='del'>-	0x5c026000, 0x5c025800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4c5c0000, 0x813261c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x41300000, 0x598cb80b, 0x41783000, 0x805cb9c0,</div><div class='del'>-	0x0400000f, 0x805c0d80, 0x04000004, 0x405c3000,</div><div class='del'>-	0x5818b800, 0x0401f7fa, 0x0401f835, 0x598c000d,</div><div class='del'>-	0x81300580, 0x02000800, 0x00106e10, 0x497a6007,</div><div class='del'>-	0x80000580, 0x5c00b800, 0x1c01f000, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c00b800, 0x1c01f000, 0x0401fa8d,</div><div class='del'>-	0x4df00000, 0x4d340000, 0x4d300000, 0x4d2c0000,</div><div class='del'>-	0x0201f800, 0x00020267, 0x02020800, 0x00100615,</div><div class='del'>-	0x41783000, 0x598e600b, 0x813261c0, 0x04000014,</div><div class='del'>-	0x59300009, 0x81340580, 0x0402000e, 0x8d3e7d00,</div><div class='del'>-	0x04000003, 0x0401f9aa, 0x0402000a, 0x0401f976,</div><div class='del'>-	0x59300000, 0x4c000000, 0x0401f811, 0x4c180000,</div><div class='del'>-	0x0401f8e9, 0x5c003000, 0x5c026000, 0x0401f7ef,</div><div class='del'>-	0x41303000, 0x59326000, 0x0401f7ec, 0x0201f800,</div><div class='del'>-	0x001045ea, 0x5c025800, 0x5c026000, 0x5c026800,</div><div class='del'>-	0x5c03e000, 0x04000a5d, 0x1c01f000, 0x59300800,</div><div class='del'>-	0x497a6000, 0x0401fa40, 0x801831c0, 0x04020009,</div><div class='del'>-	0x598c000a, 0x81300580, 0x04020004, 0x4803180a,</div><div class='del'>-	0x4803180b, 0x0401f008, 0x4807180b, 0x0401f006,</div><div class='del'>-	0x48043000, 0x598c000a, 0x81300580, 0x04020002,</div><div class='del'>-	0x481b180a, 0x0401f242, 0x0401fa52, 0x4df00000,</div><div class='del'>-	0x4d300000, 0x4c5c0000, 0x4178b800, 0x8d3e7d18,</div><div class='del'>-	0x04000004, 0x8d3e7d16, 0x04020002, 0x805cb800,</div><div class='del'>-	0x598e6005, 0x813261c0, 0x0400001a, 0x59300000,</div><div class='del'>-	0x4c000000, 0x805cb9c0, 0x0402000b, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000011, 0x04000010, 0x82040580,</div><div class='del'>-	0x00000004, 0x04020004, 0x59300420, 0x8c000500,</div><div class='del'>-	0x0402000a, 0x0201f800, 0x00108f05, 0x02000800,</div><div class='del'>-	0x00107da6, 0x0201f800, 0x001090ec, 0x0201f800,</div><div class='del'>-	0x000208b4, 0x0401fa1e, 0x5c026000, 0x0401f7e6,</div><div class='del'>-	0x497b1805, 0x497b1804, 0x5c00b800, 0x5c026000,</div><div class='del'>-	0x5c03e000, 0x04000a1d, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4c5c0000, 0x4c600000, 0x813261c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x41300000, 0x598cb805, 0x405cc000,</div><div class='del'>-	0x805cb9c0, 0x04000025, 0x805c0d80, 0x04000004,</div><div class='del'>-	0x405cc000, 0x5860b800, 0x0401f7fa, 0x598c000d,</div><div class='del'>-	0x81300580, 0x02000800, 0x00106e10, 0x0401f9ee,</div><div class='del'>-	0x598c0005, 0x805c0580, 0x04020009, 0x585c0000,</div><div class='del'>-	0x48031805, 0x4978b800, 0x598c0004, 0x805c0580,</div><div class='del'>-	0x0402000d, 0x497b1804, 0x0401f00b, 0x598c0004,</div><div class='del'>-	0x805c0580, 0x04020005, 0x48631804, 0x4978b800,</div><div class='del'>-	0x4978c000, 0x0401f004, 0x585c0000, 0x4800c000,</div><div class='del'>-	0x4978b800, 0x0401f9ea, 0x80000580, 0x5c00c000,</div><div class='del'>-	0x5c00b800, 0x1c01f000, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c00c000, 0x5c00b800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x0401f9f0, 0x4df00000, 0x4d2c0000, 0x4d340000,</div><div class='del'>-	0x4d300000, 0x4c5c0000, 0x4178b800, 0x8d3e7d18,</div><div class='del'>-	0x04000004, 0x8d3e7d16, 0x04020002, 0x805cb800,</div><div class='del'>-	0x41783000, 0x598e6005, 0x813261c0, 0x04000029,</div><div class='del'>-	0x59326809, 0x813669c0, 0x04000023, 0x59340403,</div><div class='del'>-	0x81440580, 0x04020020, 0x805cb9c0, 0x0402000b,</div><div class='del'>-	0x59300c06, 0x82040580, 0x00000011, 0x0400001a,</div><div class='del'>-	0x82040580, 0x00000004, 0x04020004, 0x59300420,</div><div class='del'>-	0x8c000500, 0x04020014, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000008, 0x0201f800, 0x00109360, 0x04020005,</div><div class='del'>-	0x59300403, 0x82000580, 0x00000043, 0x0400000a,</div><div class='del'>-	0x0401f8c1, 0x59300000, 0x4c000000, 0x0401f810,</div><div class='del'>-	0x4c180000, 0x0401f834, 0x5c003000, 0x5c026000,</div><div class='del'>-	0x0401f7da, 0x41303000, 0x59326000, 0x0401f7d7,</div><div class='del'>-	0x5c00b800, 0x5c026000, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x5c03e000, 0x040009a9, 0x1c01f000, 0x59300800,</div><div class='del'>-	0x497a6000, 0x0401f98c, 0x801831c0, 0x04020009,</div><div class='del'>-	0x598c0004, 0x81300580, 0x04020004, 0x48031804,</div><div class='del'>-	0x48031805, 0x0401f008, 0x48071805, 0x0401f006,</div><div class='del'>-	0x48043000, 0x598c0004, 0x81300580, 0x04020002,</div><div class='del'>-	0x481b1804, 0x0401f18e, 0x4943c857, 0x0401f99d,</div><div class='del'>-	0x4df00000, 0x0401fe37, 0x0401fed2, 0x5c03e000,</div><div class='del'>-	0x0400098e, 0x1c01f000, 0x4947c857, 0x0401f995,</div><div class='del'>-	0x4df00000, 0x4d3c0000, 0x853e7d00, 0x0401fe7a,</div><div class='del'>-	0x0401ff03, 0x5c027800, 0x5c03e000, 0x04000983,</div><div class='del'>-	0x1c01f000, 0x5c000000, 0x4c000000, 0x4803c857,</div><div class='del'>-	0x4d340000, 0x4d2c0000, 0x59326809, 0x59325808,</div><div class='del'>-	0x59300406, 0x82000c80, 0x00000012, 0x02021800,</div><div class='del'>-	0x00100615, 0x4933c857, 0x4943c857, 0x493fc857,</div><div class='del'>-	0x4803c857, 0x0c01f804, 0x5c025800, 0x5c026800,</div><div class='del'>-	0x1c01f000, 0x00106827, 0x00106829, 0x00106833,</div><div class='del'>-	0x0010684d, 0x00106829, 0x0010683d, 0x00106865,</div><div class='del'>-	0x00106827, 0x00106827, 0x00106878, 0x0010686f,</div><div class='del'>-	0x00106827, 0x00106827, 0x00106827, 0x00106827,</div><div class='del'>-	0x00106827, 0x0010687e, 0x0010687e, 0x0201f800,</div><div class='del'>-	0x00100615, 0x0201f800, 0x00108ef1, 0x02000800,</div><div class='del'>-	0x00101e1b, 0x0201f800, 0x001090ec, 0x0201f800,</div><div class='del'>-	0x00107da6, 0x0201f000, 0x00107698, 0x812e59c0,</div><div class='del'>-	0x02020800, 0x00100615, 0x5930021d, 0x82000580,</div><div class='del'>-	0x00000003, 0x02000800, 0x00108ee7, 0x0201f000,</div><div class='del'>-	0x00107698, 0x0201f800, 0x00108df4, 0x02000000,</div><div class='del'>-	0x00107698, 0x592c1204, 0x82081500, 0x000000ff,</div><div class='del'>-	0x82080580, 0x00000055, 0x02020800, 0x00100615,</div><div class='del'>-	0x49425a06, 0x0201f800, 0x00020381, 0x0201f000,</div><div class='del'>-	0x00107698, 0x59300004, 0x8400055c, 0x48026004,</div><div class='del'>-	0x59300007, 0x8c000500, 0x02020800, 0x00100ee4,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400000d, 0x4a025a04,</div><div class='del'>-	0x00000103, 0x49425a06, 0x497a5c09, 0x0201f800,</div><div class='del'>-	0x00108f7d, 0x0201f800, 0x0010a4ae, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00108ee7, 0x0201f000,</div><div class='del'>-	0x00107698, 0x59300007, 0x8c000500, 0x02020800,</div><div class='del'>-	0x00100ee4, 0x0201f800, 0x00108df4, 0x02020800,</div><div class='del'>-	0x0010a201, 0x0201f000, 0x00107698, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000005, 0x49425a06, 0x497a5c09,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f000, 0x00107698,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x02020800, 0x0010639d,</div><div class='del'>-	0x0201f000, 0x00107698, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000004, 0x49425a06, 0x0201f800, 0x00020381,</div><div class='del'>-	0x59325817, 0x0201f800, 0x00100843, 0x0201f000,</div><div class='del'>-	0x00107698, 0x598c000d, 0x81300580, 0x04000003,</div><div class='del'>-	0x497a6007, 0x1c01f000, 0x59c40004, 0x82000500,</div><div class='del'>-	0x0000000c, 0x04000005, 0x4a038804, 0x0000000c,</div><div class='del'>-	0x497b2807, 0x0401f00a, 0x0401fadb, 0x59300403,</div><div class='del'>-	0x82000d80, 0x00000040, 0x04000004, 0x82000580,</div><div class='del'>-	0x00000042, 0x04020002, 0x497a6007, 0x0201f800,</div><div class='del'>-	0x00106e10, 0x80000580, 0x1c01f000, 0x59300804,</div><div class='del'>-	0x8c040d20, 0x04020004, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4d380000, 0x59300804,</div><div class='del'>-	0x84040d20, 0x48066004, 0x42027000, 0x00000049,</div><div class='del'>-	0x59300203, 0x82000580, 0x00000003, 0x04000003,</div><div class='del'>-	0x42027000, 0x00000013, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x80000580, 0x5c027000, 0x1c01f000, 0x59300017,</div><div class='del'>-	0x81480580, 0x04020003, 0x59300018, 0x814c0580,</div><div class='del'>-	0x1c01f000, 0x4d2c0000, 0x4d300000, 0x0401f8c9,</div><div class='del'>-	0x4df00000, 0x0201f800, 0x00105d9b, 0x59900001,</div><div class='del'>-	0x82000500, 0x00000003, 0x0c01f001, 0x001068f1,</div><div class='del'>-	0x001068d1, 0x001068cf, 0x001068cf, 0x0201f800,</div><div class='del'>-	0x00100615, 0x59926004, 0x0401f88e, 0x813261c0,</div><div class='del'>-	0x0400001d, 0x59300004, 0x8c000516, 0x04000004,</div><div class='del'>-	0x59325808, 0x497a5808, 0x497a5809, 0x0401f88e,</div><div class='del'>-	0x59300001, 0x800001c0, 0x0400000e, 0x497a6001,</div><div class='del'>-	0x42003000, 0x0000bf2e, 0x58180801, 0x800409c0,</div><div class='del'>-	0x04020004, 0x48003001, 0x48003000, 0x0401f00a,</div><div class='del'>-	0x58180800, 0x48000800, 0x48003000, 0x0401f006,</div><div class='del'>-	0x59300809, 0x800409c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x4978080c, 0x5c03e000, 0x04000890, 0x5c026000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4d300000, 0x497b2807,</div><div class='del'>-	0x0401f894, 0x4df00000, 0x598c0000, 0x82000500,</div><div class='del'>-	0x00000007, 0x4803c857, 0x0c01f001, 0x00106926,</div><div class='del'>-	0x00106909, 0x00106912, 0x00106916, 0x00106921,</div><div class='del'>-	0x00106926, 0x00106907, 0x00106907, 0x0201f800,</div><div class='del'>-	0x00100615, 0x598c000d, 0x80026540, 0x04000004,</div><div class='del'>-	0x0401f81e, 0x02020800, 0x00100615, 0x0201f800,</div><div class='del'>-	0x00106e10, 0x0401f015, 0x0401f827, 0x0201f800,</div><div class='del'>-	0x00106e10, 0x0401f011, 0x598c000d, 0x80026540,</div><div class='del'>-	0x0400000e, 0x0401f838, 0x04000004, 0x0401f80f,</div><div class='del'>-	0x04000002, 0x0401f81c, 0x0201f800, 0x00106e10,</div><div class='del'>-	0x0401f006, 0x0401f830, 0x02020800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00106e10, 0x5c03e000, 0x0400085b,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x598c0009, 0x81300580,</div><div class='del'>-	0x0402000c, 0x0401f84e, 0x0401f83b, 0x59300000,</div><div class='del'>-	0x800001c0, 0x04000004, 0x48031809, 0x497a6000,</div><div class='del'>-	0x0401f003, 0x497b1809, 0x497b1808, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x4d2c0000, 0x59300406, 0x82000580,</div><div class='del'>-	0x00000003, 0x04020012, 0x598c000b, 0x81300580,</div><div class='del'>-	0x0402000f, 0x0401f83a, 0x59325808, 0x497a5808,</div><div class='del'>-	0x497a5809, 0x0401f824, 0x59300000, 0x800001c0,</div><div class='del'>-	0x04000004, 0x4803180b, 0x497a6000, 0x0401f003,</div><div class='del'>-	0x497b180a, 0x497b180b, 0x80000580, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x598c0005, 0x81300580, 0x0402000c,</div><div class='del'>-	0x0401f827, 0x0401f814, 0x59300000, 0x800001c0,</div><div class='del'>-	0x04000004, 0x48031805, 0x497a6000, 0x0401f003,</div><div class='del'>-	0x497b1805, 0x497b1804, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x4a032001, 0x00000000, 0x497b2004, 0x497b2005,</div><div class='del'>-	0x59900006, 0x82000500, 0x0000ffff, 0x48032006,</div><div class='del'>-	0x1c01f000, 0x4c040000, 0x59300004, 0x82000500,</div><div class='del'>-	0x7ffeffff, 0x48026004, 0x59bc00e4, 0x8c000514,</div><div class='del'>-	0x04000009, 0x42000800, 0x0000bf00, 0x58040012,</div><div class='del'>-	0x81300580, 0x04020004, 0x49780812, 0x4a0378e4,</div><div class='del'>-	0x00000800, 0x5c000800, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x598c000c, 0x80000540, 0x04000003, 0x80000040,</div><div class='del'>-	0x4803180c, 0x1c01f000, 0x59bc00ea, 0x82000500,</div><div class='del'>-	0x00000007, 0x82000580, 0x00000003, 0x04020004,</div><div class='del'>-	0x4803c856, 0x4a0378e8, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x59bc00ea, 0x82000500, 0x00000007, 0x82000580,</div><div class='del'>-	0x00000001, 0x04020011, 0x4803c856, 0x42000800,</div><div class='del'>-	0x00000000, 0x0401f80e, 0x42000800, 0x00001000,</div><div class='del'>-	0x59bc00ea, 0x82000500, 0x00000007, 0x82000580,</div><div class='del'>-	0x00000003, 0x04000005, 0x80040840, 0x040207f9,</div><div class='del'>-	0x0201f800, 0x00100615, 0x1c01f000, 0x59bc00ea,</div><div class='del'>-	0x82000500, 0x00000007, 0x82000580, 0x00000001,</div><div class='del'>-	0x02020800, 0x00100615, 0x59bc00ea, 0x8c000516,</div><div class='del'>-	0x040207fe, 0x480778e1, 0x1c01f000, 0x59bc00ea,</div><div class='del'>-	0x8c000516, 0x040207fe, 0x480778e1, 0x59bc00ea,</div><div class='del'>-	0x8c000516, 0x040207fe, 0x480b78e1, 0x1c01f000,</div><div class='del'>-	0x4a0378e4, 0x00002000, 0x59a8006f, 0x82000500,</div><div class='del'>-	0x0000000c, 0x04020008, 0x42007000, 0x0010b33f,</div><div class='del'>-	0x58380401, 0x8c000506, 0x04020003, 0x4a0378e4,</div><div class='del'>-	0x00080000, 0x1c01f000, 0x82000d00, 0x80000018,</div><div class='del'>-	0x02020800, 0x0010060d, 0x0201f800, 0x00100615,</div><div class='del'>-	0x001069dc, 0x00106a81, 0x00106a9b, 0x001069dc,</div><div class='del'>-	0x001069de, 0x001069ff, 0x00106a1e, 0x00106a53,</div><div class='del'>-	0x001069dc, 0x00106a7f, 0x001069dc, 0x001069dc,</div><div class='del'>-	0x001069dc, 0x001069dc, 0x001069dc, 0x001069dc,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4d300000, 0x4d900000,</div><div class='del'>-	0x4dd00000, 0x4da40000, 0x4d140000, 0x0201f800,</div><div class='del'>-	0x00106e2f, 0x59bc00ea, 0x8c000510, 0x040007fe,</div><div class='del'>-	0x59be60e0, 0x59300004, 0x8c000520, 0x04000011,</div><div class='del'>-	0x82000500, 0xfffefeff, 0x48026004, 0x4a026203,</div><div class='del'>-	0x00000003, 0x0401ff9b, 0x0201f800, 0x0010101e,</div><div class='del'>-	0x5c022800, 0x5c034800, 0x5c03a000, 0x5c032000,</div><div class='del'>-	0x5c026000, 0x4a0378e4, 0x00000008, 0x0401f787,</div><div class='del'>-	0x84000510, 0x48026004, 0x0401f7f6, 0x4d300000,</div><div class='del'>-	0x4d900000, 0x4dd00000, 0x4da40000, 0x4d140000,</div><div class='del'>-	0x0201f800, 0x00106e2f, 0x59bc00ea, 0x8c000510,</div><div class='del'>-	0x040007fe, 0x59be60e0, 0x59300004, 0x8c000520,</div><div class='del'>-	0x0400000f, 0x82000500, 0xfffefeff, 0x48026004,</div><div class='del'>-	0x0401ff7c, 0x0201f800, 0x0010105c, 0x5c022800,</div><div class='del'>-	0x5c034800, 0x5c03a000, 0x5c032000, 0x5c026000,</div><div class='del'>-	0x4a0378e4, 0x00000008, 0x0401f768, 0x84000510,</div><div class='del'>-	0x48026004, 0x0401f7f6, 0x4d300000, 0x4d2c0000,</div><div class='del'>-	0x4d340000, 0x4da40000, 0x4cd00000, 0x59bc00ea,</div><div class='del'>-	0x8c000510, 0x040007fe, 0x59be60e0, 0x813261c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x59300004, 0x8c000520,</div><div class='del'>-	0x0400001e, 0x82000500, 0xfffefeff, 0x48026004,</div><div class='del'>-	0x59326809, 0x42034800, 0x0010b342, 0x04011000,</div><div class='del'>-	0x4a03c840, 0x0010b349, 0x4a03c842, 0x00000012,</div><div class='del'>-	0x04011000, 0x4a03c840, 0x0010b35b, 0x4a03c842,</div><div class='del'>-	0x000000ff, 0x04011000, 0x4a03c840, 0x0010b45a,</div><div class='del'>-	0x4a03c842, 0x000000ff, 0x0201f800, 0x00106e46,</div><div class='del'>-	0x5c01a000, 0x5c034800, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x84000510, 0x48026004,</div><div class='del'>-	0x5c01a000, 0x5c034800, 0x5c026800, 0x5c025800,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x1c01f000, 0x4d300000,</div><div class='del'>-	0x4d2c0000, 0x4d340000, 0x4cd00000, 0x4d900000,</div><div class='del'>-	0x4dd00000, 0x4da40000, 0x4d140000, 0x0401fbd4,</div><div class='del'>-	0x59bc00ea, 0x8c000510, 0x040007fe, 0x59be60e0,</div><div class='del'>-	0x813261c0, 0x02000800, 0x00100615, 0x59300004,</div><div class='del'>-	0x8c000520, 0x0400000f, 0x82000500, 0xfffefeff,</div><div class='del'>-	0x48026004, 0x0201f800, 0x001075b9, 0x5c022800,</div><div class='del'>-	0x5c034800, 0x5c03a000, 0x5c032000, 0x5c01a000,</div><div class='del'>-	0x5c026800, 0x5c025800, 0x5c026000, 0x1c01f000,</div><div class='del'>-	0x84000510, 0x48026004, 0x5c022800, 0x5c034800,</div><div class='del'>-	0x5c03a000, 0x5c032000, 0x5c01a000, 0x5c026800,</div><div class='del'>-	0x5c025800, 0x5c026000, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4d300000, 0x4d380000, 0x42000000,</div><div class='del'>-	0x0010b6c3, 0x0201f800, 0x0010a86e, 0x0401ff05,</div><div class='del'>-	0x598e600d, 0x59c40004, 0x8c000506, 0x04000004,</div><div class='del'>-	0x0401f8e5, 0x4a038804, 0x00000008, 0x813261c0,</div><div class='del'>-	0x04000006, 0x0401fb98, 0x42027000, 0x00000014,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x4a0378e4, 0x00000002,</div><div class='del'>-	0x5c027000, 0x5c026000, 0x0401f6e8, 0x4d180000,</div><div class='del'>-	0x4d300000, 0x4d380000, 0x4d900000, 0x4dd00000,</div><div class='del'>-	0x4da40000, 0x4d140000, 0x0401feea, 0x417a3000,</div><div class='del'>-	0x59c40804, 0x83180400, 0x00106df6, 0x50000000,</div><div class='del'>-	0x80040500, 0x0400001b, 0x42000000, 0x0010b6c4,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x0401fb81, 0x59926004,</div><div class='del'>-	0x0401f863, 0x83180400, 0x00106df6, 0x50000000,</div><div class='del'>-	0x48038804, 0x813261c0, 0x0400000a, 0x59300004,</div><div class='del'>-	0x8c00050c, 0x04020003, 0x4a026203, 0x00000003,</div><div class='del'>-	0x42027000, 0x0000004a, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x59c40004, 0x82000500, 0x00f80000, 0x04000005,</div><div class='del'>-	0x811a3000, 0x83180480, 0x00000005, 0x040017dd,</div><div class='del'>-	0x4a0378e4, 0x00000008, 0x5c022800, 0x5c034800,</div><div class='del'>-	0x5c03a000, 0x5c032000, 0x5c027000, 0x5c026000,</div><div class='del'>-	0x5c023000, 0x0401f6b1, 0x4d2c0000, 0x4d340000,</div><div class='del'>-	0x59326809, 0x598c0800, 0x82040580, 0x00000004,</div><div class='del'>-	0x04020006, 0x838c1400, 0x00000005, 0x838c1c00,</div><div class='del'>-	0x00000004, 0x0401f010, 0x82040580, 0x00000001,</div><div class='del'>-	0x04020006, 0x838c1400, 0x00000009, 0x838c1c00,</div><div class='del'>-	0x00000008, 0x0401f008, 0x82040580, 0x00000002,</div><div class='del'>-	0x04020028, 0x838c1400, 0x0000000b, 0x838c1c00,</div><div class='del'>-	0x0000000a, 0x41306800, 0x58340000, 0x80007d40,</div><div class='del'>-	0x04000020, 0x583c0009, 0x81340580, 0x04020006,</div><div class='del'>-	0x403c6800, 0x583c0000, 0x80007d40, 0x040207fa,</div><div class='del'>-	0x0401f018, 0x4933c857, 0x483fc857, 0x583c0000,</div><div class='del'>-	0x48006800, 0x49307800, 0x443c1000, 0x500c0000,</div><div class='del'>-	0x803c0580, 0x04020002, 0x44341800, 0x80000580,</div><div class='del'>-	0x4803180d, 0x4803180f, 0x598c0000, 0x82000580,</div><div class='del'>-	0x00000003, 0x04000003, 0x4a031800, 0x00000000,</div><div class='del'>-	0x80000580, 0x5c026800, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f7fb, 0x491bc857,</div><div class='del'>-	0x59c80840, 0x82040540, 0x00000010, 0x48039040,</div><div class='del'>-	0x59c41008, 0x82080500, 0xffffff7f, 0x48038808,</div><div class='del'>-	0x4c040000, 0x4c080000, 0x0401fac2, 0x04020007,</div><div class='del'>-	0x0401fac6, 0x04000022, 0x48038804, 0x0201f800,</div><div class='del'>-	0x001010ca, 0x0401f042, 0x4a038803, 0x00000008,</div><div class='del'>-	0x59c40003, 0x82000500, 0x00000003, 0x040007fd,</div><div class='del'>-	0x8c000502, 0x04020007, 0x0401fab8, 0x04000014,</div><div class='del'>-	0x48038804, 0x0201f800, 0x001010ca, 0x0401f034,</div><div class='del'>-	0x59c80040, 0x8400056a, 0x48039040, 0x59c80040,</div><div class='del'>-	0x8c00052a, 0x040207fe, 0x59c40005, 0x82000500,</div><div class='del'>-	0xc0000000, 0x04000006, 0x59c400a3, 0x84000540,</div><div class='del'>-	0x480388a3, 0x4a038805, 0xc0000000, 0x0201f800,</div><div class='del'>-	0x0010106b, 0x4a03a005, 0x30000000, 0x59d00006,</div><div class='del'>-	0x4a03a005, 0x30000000, 0x59900006, 0x82000500,</div><div class='del'>-	0xffff0000, 0x48032006, 0x59d00005, 0x8c000504,</div><div class='del'>-	0x040207fe, 0x42000800, 0x00007600, 0x83180540,</div><div class='del'>-	0x60000000, 0x480008a1, 0x811800dc, 0x59c80840,</div><div class='del'>-	0x80040540, 0x48039040, 0x82000540, 0x00003000,</div><div class='del'>-	0x48039040, 0x59c80040, 0x82000500, 0x00003000,</div><div class='del'>-	0x040207fd, 0x0201f800, 0x001010b8, 0x83180400,</div><div class='del'>-	0x00106df6, 0x50000000, 0x48038804, 0x80000580,</div><div class='del'>-	0x4df00000, 0x0201f800, 0x00105d9b, 0x5c03e000,</div><div class='del'>-	0x5c001000, 0x5c000800, 0x480b8808, 0x48079040,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x59c80840, 0x82040540,</div><div class='del'>-	0x00000010, 0x48039040, 0x59c41008, 0x82080500,</div><div class='del'>-	0xffffff7f, 0x48038808, 0x4c040000, 0x4c080000,</div><div class='del'>-	0x59c40004, 0x82000500, 0x00000003, 0x04020010,</div><div class='del'>-	0x59c40004, 0x82000500, 0x0000000c, 0x04000005,</div><div class='del'>-	0x4a038804, 0x0000000c, 0x8c000504, 0x0401f025,</div><div class='del'>-	0x59c80040, 0x8400056e, 0x48039040, 0x59c80040,</div><div class='del'>-	0x8c00052e, 0x040207fe, 0x0401f01e, 0x4a038803,</div><div class='del'>-	0x00000008, 0x59c40003, 0x82000500, 0x00000003,</div><div class='del'>-	0x040007fd, 0x8c000502, 0x04020006, 0x59c40004,</div><div class='del'>-	0x4a038804, 0x0000000c, 0x8c000504, 0x0401f011,</div><div class='del'>-	0x59c80040, 0x8400056a, 0x48039040, 0x59c80040,</div><div class='del'>-	0x8c00052a, 0x040207fe, 0x59c40005, 0x82000500,</div><div class='del'>-	0xc0000000, 0x04000007, 0x59c400a3, 0x84000540,</div><div class='del'>-	0x480388a3, 0x4a038805, 0xc0000000, 0x80000580,</div><div class='del'>-	0x497b2807, 0x5c001000, 0x5c000800, 0x480b8808,</div><div class='del'>-	0x48079040, 0x1c01f000, 0x5c000000, 0x4c000000,</div><div class='del'>-	0x4803c857, 0x491bc857, 0x4933c857, 0x4d900000,</div><div class='del'>-	0x4dd00000, 0x4da40000, 0x4d140000, 0x0401fdd1,</div><div class='del'>-	0x4df00000, 0x0401fa72, 0x59900004, 0x800001c0,</div><div class='del'>-	0x04000011, 0x81300580, 0x0402000f, 0x59300004,</div><div class='del'>-	0x84000520, 0x48026004, 0x0401ff4d, 0x04020009,</div><div class='del'>-	0x5c03e000, 0x04000db9, 0x80000580, 0x5c022800,</div><div class='del'>-	0x5c034800, 0x5c03a000, 0x5c032000, 0x1c01f000,</div><div class='del'>-	0x0401fcf1, 0x42027000, 0x00000049, 0x59300004,</div><div class='del'>-	0x84000520, 0x48026004, 0x8c00050c, 0x02020800,</div><div class='del'>-	0x000208d8, 0x5c03e000, 0x04000da8, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c022800, 0x5c034800, 0x5c03a000,</div><div class='del'>-	0x5c032000, 0x1c01f000, 0x4933c857, 0x0401fda9,</div><div class='del'>-	0x4df00000, 0x598c000d, 0x80026540, 0x04000012,</div><div class='del'>-	0x59300004, 0x84000520, 0x48026004, 0x0401ff86,</div><div class='del'>-	0x04000017, 0x0401fd09, 0x42027000, 0x00000013,</div><div class='del'>-	0x59300004, 0x8c00050c, 0x02020800, 0x000208d8,</div><div class='del'>-	0x5c03e000, 0x04000d8d, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x836c1580, 0x00000001, 0x040007f9,</div><div class='del'>-	0x836c1580, 0x00000004, 0x040007f6, 0x42001000,</div><div class='del'>-	0x00103f62, 0x0201f800, 0x00105cc9, 0x5c03e000,</div><div class='del'>-	0x04000d7e, 0x80000580, 0x1c01f000, 0x4d300000,</div><div class='del'>-	0x4d180000, 0x4d3c0000, 0x0401fd82, 0x4df00000,</div><div class='del'>-	0x4a0378e4, 0x0000000f, 0x0401fa02, 0x417a3000,</div><div class='del'>-	0x59926004, 0x813261c0, 0x04000010, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00104728, 0x0400000a, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000003, 0x04000004, 0x82040580,</div><div class='del'>-	0x00000006, 0x04020003, 0x42027800, 0x00000002,</div><div class='del'>-	0x0201f800, 0x00108997, 0x811a3000, 0x83180480,</div><div class='del'>-	0x00000005, 0x040017eb, 0x42000800, 0x00000040,</div><div class='del'>-	0x0201f800, 0x00101395, 0x4a0378e4, 0x0000000a,</div><div class='del'>-	0x5c03e000, 0x04000d55, 0x5c027800, 0x5c023000,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4803c856, 0x4d300000,</div><div class='del'>-	0x0401fd58, 0x4df00000, 0x59c80840, 0x82040540,</div><div class='del'>-	0x00000010, 0x48039040, 0x59c41008, 0x82080500,</div><div class='del'>-	0xffffff7f, 0x48038808, 0x4c040000, 0x4c080000,</div><div class='del'>-	0x42001000, 0x00000003, 0x0401f9c5, 0x598e600d,</div><div class='del'>-	0x813261c0, 0x04020f9d, 0x040009ca, 0x497b2807,</div><div class='del'>-	0x0401f80a, 0x5c001000, 0x5c000800, 0x480b8808,</div><div class='del'>-	0x84040d74, 0x48079040, 0x5c03e000, 0x04000d33,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4d380000, 0x4d180000,</div><div class='del'>-	0x4d300000, 0x4d900000, 0x4dd00000, 0x4da40000,</div><div class='del'>-	0x4d140000, 0x59c41004, 0x480bc857, 0x82080500,</div><div class='del'>-	0x00003ff0, 0x04000025, 0x417a3000, 0x4c080000,</div><div class='del'>-	0x0201f800, 0x00105d9b, 0x5c001000, 0x82080500,</div><div class='del'>-	0x00000210, 0x04020004, 0x811a3000, 0x80081102,</div><div class='del'>-	0x0401f7f7, 0x0401f9c6, 0x59926004, 0x4933c857,</div><div class='del'>-	0x813261c0, 0x04020005, 0x59c400a3, 0x8c00051a,</div><div class='del'>-	0x02000800, 0x00100615, 0x0401fea1, 0x04000009,</div><div class='del'>-	0x0401fc4d, 0x42027000, 0x00000049, 0x59300004,</div><div class='del'>-	0x8c00050c, 0x02020800, 0x000208d8, 0x0401f007,</div><div class='del'>-	0x42027000, 0x0000004a, 0x4a026203, 0x00000003,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c022800, 0x5c034800,</div><div class='del'>-	0x5c03a000, 0x5c032000, 0x5c026000, 0x5c023000,</div><div class='del'>-	0x5c027000, 0x1c01f000, 0x4d300000, 0x4d180000,</div><div class='del'>-	0x4d900000, 0x0401fcff, 0x42001000, 0x00000000,</div><div class='del'>-	0x598c0000, 0x82000580, 0x00000005, 0x04000974,</div><div class='del'>-	0x417a3000, 0x811b20c8, 0x83932400, 0x0000bf32,</div><div class='del'>-	0x59900001, 0x82000580, 0x00000001, 0x0402000d,</div><div class='del'>-	0x42000800, 0x000007d0, 0x59926004, 0x59300011,</div><div class='del'>-	0x82000500, 0xfff00000, 0x80000540, 0x04000003,</div><div class='del'>-	0x42000800, 0x00001b58, 0x0201f800, 0x00105d8d,</div><div class='del'>-	0x811a3000, 0x83180480, 0x00000005, 0x040017ea,</div><div class='del'>-	0x59c81040, 0x84081534, 0x480b9040, 0x0401fcd3,</div><div class='del'>-	0x5c032000, 0x5c023000, 0x5c026000, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x4d900000, 0x4dd00000, 0x4da40000,</div><div class='del'>-	0x4d140000, 0x4d380000, 0x0401fcd2, 0x4df00000,</div><div class='del'>-	0x59300004, 0x8c00053e, 0x04020007, 0x8c000520,</div><div class='del'>-	0x04000026, 0x0201f800, 0x001068a3, 0x04000023,</div><div class='del'>-	0x0401f02b, 0x598c000d, 0x81300580, 0x04000012,</div><div class='del'>-	0x0201f800, 0x00108a8a, 0x04020025, 0x0401f91b,</div><div class='del'>-	0x04000023, 0x48038804, 0x0401f961, 0x0201f800,</div><div class='del'>-	0x001010ca, 0x0201f800, 0x001068c1, 0x42027000,</div><div class='del'>-	0x00000049, 0x59300004, 0x8c00050c, 0x0402000d,</div><div class='del'>-	0x0401f00e, 0x59c40004, 0x8c000504, 0x04000014,</div><div class='del'>-	0x4a038804, 0x00000004, 0x0401fc18, 0x42027000,</div><div class='del'>-	0x00000013, 0x59300004, 0x8c00050c, 0x04000003,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c03e000, 0x04000c9b,</div><div class='del'>-	0x5c027000, 0x5c022800, 0x5c034800, 0x5c03a000,</div><div class='del'>-	0x5c032000, 0x80000580, 0x1c01f000, 0x5c03e000,</div><div class='del'>-	0x04000c92, 0x5c027000, 0x5c022800, 0x5c034800,</div><div class='del'>-	0x5c03a000, 0x5c032000, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x497b2807, 0x0401fc92, 0x59c400af,</div><div class='del'>-	0x800001c0, 0x04020004, 0x0401fc84, 0x0201f000,</div><div class='del'>-	0x00101565, 0x598c000f, 0x82001480, 0x00000002,</div><div class='del'>-	0x04021007, 0x80000000, 0x4803180f, 0x80000580,</div><div class='del'>-	0x0201f800, 0x00105d86, 0x0400000e, 0x0401fed7,</div><div class='del'>-	0x0402000c, 0x0401fdc5, 0x0400000a, 0x0201f800,</div><div class='del'>-	0x0010a7ee, 0x0401f918, 0x4d380000, 0x42027000,</div><div class='del'>-	0x00000014, 0x0201f800, 0x000208d8, 0x5c027000,</div><div class='del'>-	0x0401fc6a, 0x0201f000, 0x00101565, 0x4d900000,</div><div class='del'>-	0x4dd00000, 0x4da40000, 0x4d140000, 0x4d300000,</div><div class='del'>-	0x0201f800, 0x00105d9b, 0x0401fc6a, 0x59c400af,</div><div class='del'>-	0x800001c0, 0x04000027, 0x0401f909, 0x59926004,</div><div class='del'>-	0x4933c857, 0x59300004, 0x8c000516, 0x0400000b,</div><div class='del'>-	0x0401fe86, 0x0402001f, 0x0201f800, 0x001068c1,</div><div class='del'>-	0x0401fc52, 0x42000800, 0x80000804, 0x0201f800,</div><div class='del'>-	0x00106466, 0x0401f017, 0x42001800, 0x00007530,</div><div class='del'>-	0x0401f8c3, 0x04020004, 0x0201f800, 0x00105d8b,</div><div class='del'>-	0x0401f010, 0x0401fe75, 0x0402000e, 0x0201f800,</div><div class='del'>-	0x0010a7ee, 0x59300004, 0x8c00050c, 0x04020003,</div><div class='del'>-	0x4a026203, 0x00000003, 0x4d380000, 0x42027000,</div><div class='del'>-	0x0000004a, 0x0201f800, 0x000208d8, 0x5c027000,</div><div class='del'>-	0x0401fc36, 0x5c026000, 0x5c022800, 0x5c034800,</div><div class='del'>-	0x5c03a000, 0x5c032000, 0x0201f000, 0x00101565,</div><div class='del'>-	0x4d900000, 0x4dd00000, 0x4da40000, 0x4d140000,</div><div class='del'>-	0x4d300000, 0x4d2c0000, 0x0401fc32, 0x0401f8d4,</div><div class='del'>-	0x59926004, 0x4933c857, 0x0401f882, 0x04000016,</div><div class='del'>-	0x0201f800, 0x00105d9b, 0x813261c0, 0x04000034,</div><div class='del'>-	0x59325808, 0x812e59c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x0402001d, 0x592c0208,</div><div class='del'>-	0x84000550, 0x48025a08, 0x0201f800, 0x00104f29,</div><div class='del'>-	0x04020027, 0x592c0208, 0x84000510, 0x48025a08,</div><div class='del'>-	0x0401f023, 0x0201f800, 0x00105d8b, 0x0401f020,</div><div class='del'>-	0x0201f800, 0x0010a7ee, 0x0401fd99, 0x592c0208,</div><div class='del'>-	0x84000550, 0x48025a08, 0x4d380000, 0x42027000,</div><div class='del'>-	0x0000004a, 0x4a026203, 0x00000003, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x5c027000, 0x0401f011, 0x59900006,</div><div class='del'>-	0x82000500, 0xffff0000, 0x040207ee, 0x59c408af,</div><div class='del'>-	0x82040480, 0x000003e8, 0x040217ea, 0x59900006,</div><div class='del'>-	0x82000400, 0x00010000, 0x48032006, 0x0201f800,</div><div class='del'>-	0x00105d8b, 0x0201f800, 0x00103f37, 0x5c025800,</div><div class='del'>-	0x5c026000, 0x5c022800, 0x5c034800, 0x5c03a000,</div><div class='del'>-	0x5c032000, 0x0201f000, 0x00106982, 0x4d300000,</div><div class='del'>-	0x4d2c0000, 0x0201f800, 0x0010698c, 0x598e600d,</div><div class='del'>-	0x4933c857, 0x59c41004, 0x8c081500, 0x04000007,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04020007, 0x0201f800,</div><div class='del'>-	0x00104f29, 0x0402002f, 0x0201f800, 0x00105d86,</div><div class='del'>-	0x0401f02c, 0x598c000f, 0x80000540, 0x04020011,</div><div class='del'>-	0x59c408af, 0x82040480, 0x000003e8, 0x0402100d,</div><div class='del'>-	0x598c080f, 0x80040800, 0x4807180f, 0x0201f800,</div><div class='del'>-	0x00105d86, 0x42000000, 0x0010b650, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00103f37, 0x0401f019,</div><div class='del'>-	0x0401fdad, 0x813261c0, 0x04020003, 0x0401f849,</div><div class='del'>-	0x0401f014, 0x0201f800, 0x0010a7ee, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020007, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x04000004, 0x592c0208, 0x84000550,</div><div class='del'>-	0x48025a08, 0x0401f854, 0x4d380000, 0x42027000,</div><div class='del'>-	0x00000014, 0x0201f800, 0x000208d8, 0x5c027000,</div><div class='del'>-	0x5c025800, 0x5c026000, 0x0201f000, 0x00106982,</div><div class='del'>-	0x59c40804, 0x83180400, 0x00106dec, 0x50000000,</div><div class='del'>-	0x80040500, 0x1c01f000, 0x59c40804, 0x83180400,</div><div class='del'>-	0x00106df1, 0x50000000, 0x80040500, 0x1c01f000,</div><div class='del'>-	0x00000210, 0x00000420, 0x00000840, 0x00001080,</div><div class='del'>-	0x00002100, 0x00004000, 0x00008000, 0x00010000,</div><div class='del'>-	0x00020000, 0x00040000, 0x00080000, 0x00100000,</div><div class='del'>-	0x00200000, 0x00400000, 0x00800000, 0x59900806,</div><div class='del'>-	0x80040120, 0x800c0480, 0x04021004, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f005, 0x82040c00, 0x00010000,</div><div class='del'>-	0x48072006, 0x80000580, 0x1c01f000, 0x480bc857,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x4df00000, 0x480b1800,</div><div class='del'>-	0x5c03e000, 0x02000800, 0x00106982, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x0201f800, 0x0010698c, 0x4df00000,</div><div class='del'>-	0x497b180d, 0x497b1803, 0x497b180e, 0x497b180f,</div><div class='del'>-	0x497b1810, 0x598c0000, 0x82000580, 0x00000003,</div><div class='del'>-	0x04000009, 0x836c0580, 0x00000002, 0x04020004,</div><div class='del'>-	0x4a031800, 0x00000005, 0x0401f003, 0x4a031800,</div><div class='del'>-	0x00000000, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x1c01f000, 0x59300004, 0x8c00050c, 0x04020003,</div><div class='del'>-	0x4a026203, 0x00000001, 0x1c01f000, 0x83180480,</div><div class='del'>-	0x00000005, 0x02021800, 0x00100615, 0x491bc857,</div><div class='del'>-	0x811b20c8, 0x83932400, 0x0000bf32, 0x811ba0ca,</div><div class='del'>-	0x83d3a400, 0x00007600, 0x83180400, 0x00106e41,</div><div class='del'>-	0x50034800, 0x811a28c2, 0x83162c00, 0x00006100,</div><div class='del'>-	0x1c01f000, 0x0010b559, 0x0010b570, 0x0010b587,</div><div class='del'>-	0x0010b59e, 0x0010b5b5, 0x4933c857, 0x59300406,</div><div class='del'>-	0x82000c80, 0x00000012, 0x04021016, 0x4803c857,</div><div class='del'>-	0x04011000, 0x0c01f001, 0x00106e60, 0x00106f03,</div><div class='del'>-	0x00107249, 0x001072cf, 0x00106f03, 0x00107249,</div><div class='del'>-	0x001072cf, 0x00106e60, 0x00106f03, 0x00106e60,</div><div class='del'>-	0x00106e60, 0x00106e60, 0x00106e60, 0x00106e60,</div><div class='del'>-	0x00106e60, 0x00106e60, 0x00106e66, 0x00106e66,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x0201f000, 0x00106982, 0x42001000, 0x0010b5f4,</div><div class='del'>-	0x50081000, 0x4930100c, 0x58080002, 0x82000580,</div><div class='del'>-	0x00000100, 0x0402003e, 0x59325808, 0x812e59c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x59326809, 0x813669c0,</div><div class='del'>-	0x04000025, 0x592c040b, 0x82000500, 0x0000e000,</div><div class='del'>-	0x04000003, 0x0401fbc9, 0x0401f002, 0x0401fbb9,</div><div class='del'>-	0x592c000d, 0x82000500, 0x00000003, 0x04000007,</div><div class='del'>-	0x82000580, 0x00000003, 0x80000000, 0x58d00802,</div><div class='del'>-	0x80040540, 0x4801a002, 0x42001000, 0x0010b5f4,</div><div class='del'>-	0x50081000, 0x4930100b, 0x492c100a, 0x82d00400,</div><div class='del'>-	0x00000006, 0x48001003, 0x592c000d, 0x82000400,</div><div class='del'>-	0x00000003, 0x80000104, 0x48001004, 0x592c000e,</div><div class='del'>-	0x48001007, 0x592c000f, 0x48001008, 0x0201f000,</div><div class='del'>-	0x001008a1, 0x42026800, 0x0010bc0c, 0x592c080a,</div><div class='del'>-	0x48066802, 0x82040500, 0x00ffff00, 0x04000007,</div><div class='del'>-	0x497a6a12, 0x59a81010, 0x82081500, 0x00ffff00,</div><div class='del'>-	0x80080580, 0x040207d0, 0x82040d00, 0x000000ff,</div><div class='del'>-	0x800408d0, 0x48066a12, 0x0401f7cb, 0x1c01f000,</div><div class='del'>-	0x4d2c0000, 0x4d300000, 0x4c580000, 0x4c540000,</div><div class='del'>-	0x4c500000, 0x5832580a, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x58300002, 0x4a006002, 0x00000100,</div><div class='del'>-	0x82000580, 0x00000100, 0x04020020, 0x5830000b,</div><div class='del'>-	0x5832600c, 0x81300580, 0x04020012, 0x0401f82f,</div><div class='del'>-	0x04020014, 0x592c080d, 0x82040c00, 0x00000003,</div><div class='del'>-	0x80040904, 0x4004b000, 0x4200a000, 0x0010b349,</div><div class='del'>-	0x4050a800, 0x0201f800, 0x0010a94f, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0201f800, 0x0010763b, 0x0401f005,</div><div class='del'>-	0x4803c857, 0x4933c857, 0x0401f81c, 0x04000f93,</div><div class='del'>-	0x5c00a000, 0x5c00a800, 0x5c00b000, 0x5c026000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x5830000b, 0x5832600c,</div><div class='del'>-	0x4803c857, 0x4933c857, 0x81300580, 0x040207f1,</div><div class='del'>-	0x0401f80e, 0x040207f3, 0x4803c857, 0x0201f800,</div><div class='del'>-	0x00106619, 0x02020800, 0x00100615, 0x4a025a06,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00020381, 0x0201f800,</div><div class='del'>-	0x00107698, 0x0401f7e7, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x598c000d, 0x81300580, 0x04020009,</div><div class='del'>-	0x598c0005, 0x81300580, 0x04020006, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x4803c857, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x59300403,</div><div class='del'>-	0x82000c80, 0x00000056, 0x02021800, 0x00100615,</div><div class='del'>-	0x4803c857, 0x0c01f001, 0x0010707a, 0x00107095,</div><div class='del'>-	0x001070a6, 0x001071a9, 0x00107169, 0x0010716d,</div><div class='del'>-	0x0010717e, 0x00107192, 0x00107187, 0x00107192,</div><div class='del'>-	0x001071cd, 0x00107192, 0x0010720f, 0x00107192,</div><div class='del'>-	0x0010721d, 0x00107192, 0x00107187, 0x00107192,</div><div class='del'>-	0x00107221, 0x00106f60, 0x00106f60, 0x00106f60,</div><div class='del'>-	0x00106f60, 0x00106f60, 0x00106f60, 0x00106f60,</div><div class='del'>-	0x00106f60, 0x00106f60, 0x00106f60, 0x00106f60,</div><div class='del'>-	0x001072ed, 0x0010730c, 0x00107316, 0x00106f60,</div><div class='del'>-	0x0010732c, 0x0010717e, 0x00106f60, 0x0010717e,</div><div class='del'>-	0x00107192, 0x00106f60, 0x001070a6, 0x001071a9,</div><div class='del'>-	0x00106f60, 0x0010737c, 0x00107192, 0x00106f60,</div><div class='del'>-	0x0010738c, 0x00107192, 0x00106f60, 0x00107187,</div><div class='del'>-	0x0010706b, 0x00106f62, 0x00106f60, 0x001073a3,</div><div class='del'>-	0x001073dc, 0x00107456, 0x00106f60, 0x00107466,</div><div class='del'>-	0x0010717c, 0x00107459, 0x00106f60, 0x00107338,</div><div class='del'>-	0x0010747f, 0x00106f60, 0x001074b4, 0x00107507,</div><div class='del'>-	0x00106f60, 0x00106f77, 0x00106fdd, 0x00106fea,</div><div class='del'>-	0x00106f60, 0x0010717e, 0x00106f60, 0x00107031,</div><div class='del'>-	0x0010703c, 0x00106f60, 0x00106f60, 0x00106f8b,</div><div class='del'>-	0x00106fb0, 0x00107546, 0x00107587, 0x001075ad,</div><div class='del'>-	0x00106f60, 0x00106f60, 0x00106f60, 0x0010757b,</div><div class='del'>-	0x0201f800, 0x00100615, 0x0401fad2, 0x59325808,</div><div class='del'>-	0x592c0009, 0x4801a006, 0x592c000a, 0x4801a007,</div><div class='del'>-	0x592c000b, 0x4801a008, 0x592c000c, 0x4801a009,</div><div class='del'>-	0x592c000d, 0x4801a00a, 0x4979a00b, 0x592c0809,</div><div class='del'>-	0x82040d00, 0x00000fff, 0x80040904, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0201f000, 0x0010763b, 0x4a026202,</div><div class='del'>-	0x0000ffff, 0x0401fabb, 0x4d2c0000, 0x4a01a006,</div><div class='del'>-	0x05000000, 0x59325808, 0x592c0009, 0x4801a007,</div><div class='del'>-	0x592c000a, 0x4801a008, 0x592c000b, 0x4801a009,</div><div class='del'>-	0x42000800, 0x00000004, 0x42001000, 0x0000dc00,</div><div class='del'>-	0x5c025800, 0x0201f000, 0x0010763b, 0x4c580000,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4d2c0000, 0x0401faa5,</div><div class='del'>-	0x59325808, 0x5930040b, 0x800000c2, 0x4200a800,</div><div class='del'>-	0x0010b349, 0x592cb205, 0x832ca400, 0x00000006,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x40580000, 0x8054ac00,</div><div class='del'>-	0x592c0001, 0x80000540, 0x04000003, 0x40025800,</div><div class='del'>-	0x0401f7f5, 0x4200a000, 0x0010b349, 0x4050a800,</div><div class='del'>-	0x5930b40b, 0x0201f800, 0x0010a94f, 0x59300c0b,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x5c025800, 0x5c00a800,</div><div class='del'>-	0x5c00b000, 0x5c00a000, 0x0201f000, 0x0010763b,</div><div class='del'>-	0x4c580000, 0x4c500000, 0x4c540000, 0x4d2c0000,</div><div class='del'>-	0x42034800, 0x0010b342, 0x0401fa8c, 0x59325808,</div><div class='del'>-	0x592c0802, 0x4807c857, 0x40041000, 0x80040904,</div><div class='del'>-	0x82081500, 0x00000003, 0x04000008, 0x80040800,</div><div class='del'>-	0x82081580, 0x00000003, 0x80081000, 0x58d00002,</div><div class='del'>-	0x80080540, 0x4801a002, 0x4a025805, 0x02000000,</div><div class='del'>-	0x82d0ac00, 0x00000006, 0x592cb011, 0x832ca400,</div><div class='del'>-	0x00000005, 0x0201f800, 0x0010a93e, 0x40580000,</div><div class='del'>-	0x8054ac00, 0x592e5801, 0x41780000, 0x812e5d40,</div><div class='del'>-	0x040207f6, 0x42001000, 0x0000dc00, 0x5c025800,</div><div class='del'>-	0x5c00a800, 0x5c00b000, 0x5c00a000, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x0401fa57, 0x4a01a006, 0x78000000,</div><div class='del'>-	0x5930001c, 0x840001c0, 0x4801a407, 0x4979a207,</div><div class='del'>-	0x42000800, 0x00000002, 0x42001000, 0x0000dc00,</div><div class='del'>-	0x0201f000, 0x0010763b, 0x4c580000, 0x4c540000,</div><div class='del'>-	0x4c500000, 0x0401fa55, 0x4a01a006, 0x02000000,</div><div class='del'>-	0x59a80002, 0x4801a008, 0x59a80003, 0x4801a009,</div><div class='del'>-	0x59a80000, 0x4801a00a, 0x59a80001, 0x4801a00b,</div><div class='del'>-	0x5930001c, 0x82000d80, 0x0000e000, 0x04000016,</div><div class='del'>-	0x82000d80, 0x0000df00, 0x04000006, 0x4a01a407,</div><div class='del'>-	0x00000010, 0x42000800, 0x00000006, 0x0401f027,</div><div class='del'>-	0x4a03c840, 0x0010b2e7, 0x4a03c842, 0x0000000d,</div><div class='del'>-	0x42001800, 0x0010b2e7, 0x0201f800, 0x001007f5,</div><div class='del'>-	0x42000000, 0x0000df00, 0x4200a000, 0x0010b2e7,</div><div class='del'>-	0x0401f00d, 0x4a03c840, 0x0010b2f4, 0x4a03c842,</div><div class='del'>-	0x0000000d, 0x42001800, 0x0010b2f4, 0x0201f800,</div><div class='del'>-	0x001007f5, 0x42000000, 0x0000e000, 0x4200a000,</div><div class='del'>-	0x0010b2f4, 0x82000540, 0x00000010, 0x4801a407,</div><div class='del'>-	0x4a01a207, 0x00000034, 0x4200b000, 0x0000000d,</div><div class='del'>-	0x82d0ac00, 0x0000000c, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x42000800, 0x00000013, 0x42001000, 0x0000dc00,</div><div class='del'>-	0x5c00a000, 0x5c00a800, 0x5c00b000, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x0401fa03, 0x4a01a006, 0x63000028,</div><div class='del'>-	0x5930001c, 0x4801a007, 0x42000800, 0x00000002,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0201f000, 0x0010763b,</div><div class='del'>-	0x0401fa06, 0x41780000, 0x41780800, 0x42002000,</div><div class='del'>-	0x00080000, 0x0c01f81b, 0x80000000, 0x80040800,</div><div class='del'>-	0x42001000, 0x0000000c, 0x59841802, 0x8c0c1d00,</div><div class='del'>-	0x04020008, 0x42002000, 0x00050000, 0x0c01f811,</div><div class='del'>-	0x80000000, 0x80040800, 0x82081400, 0x00000004,</div><div class='del'>-	0x82080540, 0x02000000, 0x4801a006, 0x800408e0,</div><div class='del'>-	0x5930001c, 0x80040540, 0x4801a007, 0x80080904,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0201f000, 0x0010763b,</div><div class='del'>-	0x00107061, 0x00107063, 0x00107065, 0x00107067,</div><div class='del'>-	0x00107069, 0x4811a008, 0x1c01f000, 0x4811a009,</div><div class='del'>-	0x1c01f000, 0x4811a00a, 0x1c01f000, 0x4811a00b,</div><div class='del'>-	0x1c01f000, 0x4811a00c, 0x1c01f000, 0x4a026009,</div><div class='del'>-	0x0010bc0c, 0x59a80010, 0x82000500, 0x000000ff,</div><div class='del'>-	0x800000d0, 0x42026800, 0x0010bc0c, 0x48026a12,</div><div class='del'>-	0x0401fa3c, 0x41780800, 0x42001000, 0x00005c00,</div><div class='del'>-	0x0201f000, 0x0010763b, 0x0401f9ba, 0x4a01a006,</div><div class='del'>-	0x52000000, 0x4979a007, 0x599c0017, 0x8c000500,</div><div class='del'>-	0x04000005, 0x599c0402, 0x0201f800, 0x00101644,</div><div class='del'>-	0x4805a007, 0x59a80002, 0x4801a008, 0x59a80003,</div><div class='del'>-	0x4801a009, 0x59a80000, 0x4801a00a, 0x59a80001,</div><div class='del'>-	0x4801a00b, 0x59a80010, 0x4801a00c, 0x42000800,</div><div class='del'>-	0x00000007, 0x42001000, 0x0000dc00, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x4a026202, 0x0000ffff, 0x0401f99d,</div><div class='del'>-	0x4a01a006, 0x05000000, 0x59a80010, 0x4801a007,</div><div class='del'>-	0x59a80002, 0x59a80803, 0x4801a008, 0x4805a009,</div><div class='del'>-	0x42000800, 0x00000004, 0x42001000, 0x0000dc00,</div><div class='del'>-	0x0201f000, 0x0010763b, 0x4a026202, 0x0000ffff,</div><div class='del'>-	0x0401f98c, 0x4d3c0000, 0x417a7800, 0x0201f800,</div><div class='del'>-	0x00104745, 0x5c027800, 0x4a01a006, 0x03000000,</div><div class='del'>-	0x59340403, 0x82000580, 0x000007fe, 0x0402006e,</div><div class='del'>-	0x4a01a006, 0x04000000, 0x81a40800, 0x4a000800,</div><div class='del'>-	0x22fffffe, 0x5934000a, 0x84000500, 0x4802680a,</div><div class='del'>-	0x59c41002, 0x8408150c, 0x480b8802, 0x59a80026,</div><div class='del'>-	0x8c000508, 0x04000010, 0x59a8002a, 0x4801a007,</div><div class='del'>-	0x59a8002b, 0x82000500, 0xffff2000, 0x599c0818,</div><div class='del'>-	0x8c040d16, 0x04000002, 0x8400056a, 0x4801a008,</div><div class='del'>-	0x4a01a009, 0x00002710, 0x59a8002d, 0x4801a00a,</div><div class='del'>-	0x0401f039, 0x59a8002a, 0x4801a007, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04020009, 0x497b8880, 0x82000500,</div><div class='del'>-	0x0000ffff, 0x4c000000, 0x0201f800, 0x00101670,</div><div class='del'>-	0x5c000000, 0x48038880, 0x59a8002b, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04020004, 0x82000500, 0x37ffffff,</div><div class='del'>-	0x0401f003, 0x82000500, 0x3fffffff, 0x599c0818,</div><div class='del'>-	0x8c040d16, 0x04000002, 0x8400056a, 0x59a80805,</div><div class='del'>-	0x8c040d10, 0x04000019, 0x59300c03, 0x82041580,</div><div class='del'>-	0x00000051, 0x04000015, 0x82041580, 0x00000031,</div><div class='del'>-	0x04000012, 0x4c580000, 0x4c500000, 0x4c540000,</div><div class='del'>-	0x4200b000, 0x00000004, 0x4200a000, 0x0010b6f9,</div><div class='del'>-	0x82d0ac00, 0x0000001f, 0x4c000000, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x5c000000, 0x5c00a800, 0x5c00a000,</div><div class='del'>-	0x5c00b000, 0x8400057a, 0x4801a008, 0x4979a009,</div><div class='del'>-	0x4979a00a, 0x59a80002, 0x59a80803, 0x4801a00b,</div><div class='del'>-	0x4805a00c, 0x59a80000, 0x59a80801, 0x4801a00d,</div><div class='del'>-	0x4805a00e, 0x4979a00f, 0x4979a010, 0x4979a011,</div><div class='del'>-	0x4979a012, 0x4979a013, 0x4979a014, 0x4979a015,</div><div class='del'>-	0x4979a016, 0x59a8002e, 0x84000576, 0x4801a017,</div><div class='del'>-	0x59a8002f, 0x4801a018, 0x4979a019, 0x4979a01a,</div><div class='del'>-	0x0401f043, 0x59a80026, 0x8c000508, 0x0400000d,</div><div class='del'>-	0x59a8002a, 0x82000500, 0x0000ffff, 0x59c40880,</div><div class='del'>-	0x80040d80, 0x04000007, 0x497b8880, 0x4c000000,</div><div class='del'>-	0x0201f800, 0x00101670, 0x5c000000, 0x48038880,</div><div class='del'>-	0x59a8002a, 0x4801a007, 0x4c640000, 0x4d2c0000,</div><div class='del'>-	0x59a8c82b, 0x0201f800, 0x00108df4, 0x0400000d,</div><div class='del'>-	0x0201f800, 0x00109360, 0x0402000a, 0x592c0207,</div><div class='del'>-	0x8c00050e, 0x04000007, 0x8264cd00, 0x0000ffff,</div><div class='del'>-	0x592c0009, 0x82000500, 0xffff0000, 0x8064cd40,</div><div class='del'>-	0x4865a008, 0x5c025800, 0x5c00c800, 0x59a8002c,</div><div class='del'>-	0x4801a009, 0x59a8002d, 0x4801a00a, 0x59a80002,</div><div class='del'>-	0x59a80803, 0x4801a00b, 0x4805a00c, 0x59a80000,</div><div class='del'>-	0x59a80801, 0x4801a00d, 0x4805a00e, 0x4979a00f,</div><div class='del'>-	0x4979a010, 0x4979a011, 0x4979a012, 0x4979a013,</div><div class='del'>-	0x4979a014, 0x4979a015, 0x4979a016, 0x59a8002e,</div><div class='del'>-	0x4801a017, 0x59a8002f, 0x4801a018, 0x59a80030,</div><div class='del'>-	0x4801a019, 0x59a80031, 0x4801a01a, 0x42000800,</div><div class='del'>-	0x0000001d, 0x42001000, 0x0000dc00, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x0401f8cb, 0x4a01a006, 0x50000000,</div><div class='del'>-	0x0401f7b5, 0x0401f8c7, 0x4a01a406, 0x21000010,</div><div class='del'>-	0x4a01a206, 0x00000014, 0x4979a007, 0x4979a008,</div><div class='del'>-	0x4979a009, 0x4979a00a, 0x42000800, 0x00000005,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0201f000, 0x0010763b,</div><div class='del'>-	0x0401f8bf, 0x0401f002, 0x0401f8c4, 0x4a01a006,</div><div class='del'>-	0x02000000, 0x42000800, 0x00000001, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0201f000, 0x0010763b, 0x0401f8bb,</div><div class='del'>-	0x4a01a006, 0x02000000, 0x59300403, 0x82000580,</div><div class='del'>-	0x00000031, 0x04020794, 0x81a40800, 0x4a000801,</div><div class='del'>-	0x00fffffe, 0x0401f72b, 0x0401f8b0, 0x4a01a006,</div><div class='del'>-	0x01000000, 0x5930041a, 0x80000540, 0x04000003,</div><div class='del'>-	0x4801a407, 0x0401f003, 0x4a01a407, 0x00000003,</div><div class='del'>-	0x5930021a, 0x80000540, 0x04000003, 0x4801a207,</div><div class='del'>-	0x0401f003, 0x4a01a207, 0x00002a00, 0x42000800,</div><div class='del'>-	0x00000002, 0x42001000, 0x0000dc00, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x4a026202, 0x0000ffff, 0x0401f889,</div><div class='del'>-	0x4a01a406, 0x00002010, 0x4a01a206, 0x00000014,</div><div class='del'>-	0x4a01a407, 0x00000800, 0x4a01a207, 0x00002000,</div><div class='del'>-	0x80000580, 0x599c0817, 0x8c040d0a, 0x04020003,</div><div class='del'>-	0x82000540, 0x00000020, 0x8c040d08, 0x04000003,</div><div class='del'>-	0x82000540, 0x00000010, 0x82000540, 0x00000002,</div><div class='del'>-	0x5934080a, 0x8c040d14, 0x04000005, 0x82040d00,</div><div class='del'>-	0x00000380, 0x80040540, 0x0401f006, 0x599c0818,</div><div class='del'>-	0x8c040d18, 0x04000003, 0x82000540, 0x00000380,</div><div class='del'>-	0x0401f03c, 0x0401f875, 0x4a01a406, 0x00000210,</div><div class='del'>-	0x4a01a206, 0x00000014, 0x4a01a407, 0x00000800,</div><div class='del'>-	0x5934000a, 0x8c000516, 0x04000014, 0x59340c05,</div><div class='del'>-	0x82040500, 0x00000030, 0x04000013, 0x59340a05,</div><div class='del'>-	0x82040500, 0x0000c000, 0x04020009, 0x8c040d1a,</div><div class='del'>-	0x04000004, 0x4a01a207, 0x00002100, 0x0401f00c,</div><div class='del'>-	0x4a01a207, 0x00000100, 0x0401f009, 0x4a01a207,</div><div class='del'>-	0x00000400, 0x0401f006, 0x4a01a207, 0x00000700,</div><div class='del'>-	0x0401f003, 0x4a01a207, 0x00000800, 0x80000580,</div><div class='del'>-	0x599c0817, 0x8c040d0a, 0x04020003, 0x82000540,</div><div class='del'>-	0x00000020, 0x8c040d08, 0x04000003, 0x82000540,</div><div class='del'>-	0x00000010, 0x82000540, 0x00000002, 0x59340a00,</div><div class='del'>-	0x8c040d0e, 0x0400000b, 0x84000550, 0x599c1017,</div><div class='del'>-	0x8c08150a, 0x04020004, 0x8c040d0a, 0x04000002,</div><div class='del'>-	0x8400054e, 0x8c040d1c, 0x04000002, 0x84000552,</div><div class='del'>-	0x4801a20a, 0x42000800, 0x00000005, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0201f000, 0x0010763b, 0x0401f833,</div><div class='del'>-	0x4a01a006, 0x02100014, 0x4a01a007, 0x01000000,</div><div class='del'>-	0x4979a008, 0x4979a009, 0x4979a00a, 0x42000800,</div><div class='del'>-	0x00000005, 0x42001000, 0x0000dc00, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x0401f825, 0x4a01a006, 0x02000000,</div><div class='del'>-	0x0401f65d, 0x4933c857, 0x0401f820, 0x4a01a006,</div><div class='del'>-	0x01000000, 0x4a01a407, 0x0000000b, 0x42000800,</div><div class='del'>-	0x00000002, 0x42001000, 0x0000dc00, 0x0201f000,</div><div class='del'>-	0x0010763b, 0x42005000, 0x32000000, 0x42006000,</div><div class='del'>-	0x08290000, 0x41786800, 0x41787800, 0x0401f3e6,</div><div class='del'>-	0x42005000, 0x22000000, 0x42006000, 0x01290000,</div><div class='del'>-	0x41786800, 0x41787800, 0x0401f3df, 0x42005000,</div><div class='del'>-	0x33000000, 0x42006000, 0x08980000, 0x41786800,</div><div class='del'>-	0x41787800, 0x0401f3d8, 0x42005000, 0x23000000,</div><div class='del'>-	0x42006000, 0x01980000, 0x41786800, 0x41787800,</div><div class='del'>-	0x0401f3d1, 0x59300403, 0x82000c80, 0x00000085,</div><div class='del'>-	0x02001800, 0x00100615, 0x82000c80, 0x00000093,</div><div class='del'>-	0x02021800, 0x00100615, 0x82000480, 0x00000085,</div><div class='del'>-	0x0c01f001, 0x00107263, 0x00107265, 0x00107272,</div><div class='del'>-	0x00107263, 0x00107263, 0x00107263, 0x00107263,</div><div class='del'>-	0x00107263, 0x00107263, 0x00107263, 0x00107263,</div><div class='del'>-	0x00107263, 0x00107263, 0x0010727f, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4933c857, 0x0401f851, 0x5930001c,</div><div class='del'>-	0x4801a004, 0x4801a007, 0x4979a408, 0x4a01a208,</div><div class='del'>-	0x0000ffff, 0x42000800, 0x00000003, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0401f3ca, 0x4933c857, 0x0401f850,</div><div class='del'>-	0x5930001c, 0x4801a004, 0x4a01a406, 0x00000003,</div><div class='del'>-	0x4a01a206, 0x00000300, 0x42000800, 0x00000001,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0401f3bd, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x4933c857, 0x492fc857, 0x812e59c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x59340a12, 0x82040d00,</div><div class='del'>-	0x0000ff00, 0x592c000a, 0x82000500, 0x000000ff,</div><div class='del'>-	0x900001c0, 0x80040540, 0x82000540, 0x00000011,</div><div class='del'>-	0x44034800, 0x81a5a000, 0x42001000, 0x00000009,</div><div class='del'>-	0x42000800, 0x00000003, 0x592c0009, 0x82000500,</div><div class='del'>-	0xff000000, 0x82001d80, 0x84000000, 0x04000009,</div><div class='del'>-	0x82001d80, 0x85000000, 0x02020800, 0x00100615,</div><div class='del'>-	0x42001000, 0x00000007, 0x42000800, 0x00000001,</div><div class='del'>-	0x832c1c00, 0x00000009, 0x500c0000, 0x4401a000,</div><div class='del'>-	0x800c1800, 0x80d1a000, 0x80081040, 0x040207fb,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x5c025800, 0x0401f38c,</div><div class='del'>-	0x42005000, 0x81000000, 0x42006000, 0x00090000,</div><div class='del'>-	0x41786800, 0x41787800, 0x0401f363, 0x42005000,</div><div class='del'>-	0x84000000, 0x42006000, 0x00990000, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000005, 0x04000002, 0x8430652e,</div><div class='del'>-	0x41786800, 0x41787800, 0x0401f357, 0x42005000,</div><div class='del'>-	0x85000000, 0x42006000, 0x00990000, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000005, 0x04000002, 0x8430652e,</div><div class='del'>-	0x41786800, 0x41787800, 0x0401f34b, 0x59300403,</div><div class='del'>-	0x82000c80, 0x00000053, 0x02021800, 0x00100615,</div><div class='del'>-	0x82000480, 0x0000004b, 0x02001800, 0x00100615,</div><div class='del'>-	0x59326809, 0x59368c03, 0x4803c857, 0x0c01f001,</div><div class='del'>-	0x00107353, 0x0010735b, 0x00107363, 0x0010736b,</div><div class='del'>-	0x001072e4, 0x001072e4, 0x001072e4, 0x0010734b,</div><div class='del'>-	0x0201f800, 0x00100615, 0x42005000, 0x06000000,</div><div class='del'>-	0x42006000, 0x08290000, 0x41786800, 0x41787800,</div><div class='del'>-	0x0401f32d, 0x4933c857, 0x0401ff46, 0x4a01a006,</div><div class='del'>-	0x12000000, 0x59300406, 0x82000580, 0x00000004,</div><div class='del'>-	0x04020003, 0x59340002, 0x0401f002, 0x59a80010,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x4801a007, 0x59300419,</div><div class='del'>-	0x4801a408, 0x59300219, 0x4801a208, 0x4979a009,</div><div class='del'>-	0x4979a00a, 0x4979a00b, 0x4979a00c, 0x4979a00d,</div><div class='del'>-	0x4979a00e, 0x4979a00f, 0x4979a010, 0x42000800,</div><div class='del'>-	0x0000000b, 0x42001000, 0x0000dc00, 0x0401f330,</div><div class='del'>-	0x0401ff28, 0x4a01a006, 0x0f000000, 0x5930001c,</div><div class='del'>-	0x4801a007, 0x42000800, 0x00000002, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0401f326, 0x0401ff2c, 0x4a01a006,</div><div class='del'>-	0x02000000, 0x59c40085, 0x48031004, 0x59880000,</div><div class='del'>-	0x4801a007, 0x59880001, 0x4801a008, 0x59880002,</div><div class='del'>-	0x4801a009, 0x59880003, 0x4801a00a, 0x59880004,</div><div class='del'>-	0x4801a00b, 0x59880005, 0x4801a00c, 0x42000800,</div><div class='del'>-	0x00000007, 0x42001000, 0x0000dc00, 0x0401f310,</div><div class='del'>-	0x4a026202, 0x0000ffff, 0x0401ff06, 0x4a01a006,</div><div class='del'>-	0x62000000, 0x5930001c, 0x4801a007, 0x42000800,</div><div class='del'>-	0x00000002, 0x42001000, 0x0000dc00, 0x0401f304,</div><div class='del'>-	0x0401fefc, 0x59300808, 0x4c500000, 0x4c540000,</div><div class='del'>-	0x4c580000, 0x8204a400, 0x0000000a, 0x5930b01c,</div><div class='del'>-	0x82d0ac00, 0x00000006, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x5930081c, 0x42001000, 0x0000dc00, 0x5c00b000,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x0401f2f1, 0x0401ff9b,</div><div class='del'>-	0x59300017, 0x4801a006, 0x59300018, 0x4801a007,</div><div class='del'>-	0x4a01a008, 0x00001000, 0x0401f020, 0x0401ff93,</div><div class='del'>-	0x59300017, 0x4801a006, 0x59300018, 0x4801a007,</div><div class='del'>-	0x4a01a008, 0x00004000, 0x0401f018, 0x0401ff8b,</div><div class='del'>-	0x59300017, 0x4801a006, 0x59300018, 0x4801a007,</div><div class='del'>-	0x4a01a008, 0x00002000, 0x0401f010, 0x0401ff83,</div><div class='del'>-	0x59300017, 0x4801a006, 0x59300018, 0x4801a007,</div><div class='del'>-	0x4a01a008, 0x00000400, 0x0401f008, 0x0401ff7b,</div><div class='del'>-	0x59300017, 0x4801a006, 0x59300018, 0x4801a007,</div><div class='del'>-	0x4a01a008, 0x00000200, 0x4979a009, 0x4979a00a,</div><div class='del'>-	0x4979a00b, 0x4979a00c, 0x4979a00d, 0x42000800,</div><div class='del'>-	0x00000008, 0x42001000, 0x0000dc00, 0x0401f2c0,</div><div class='del'>-	0x0401fec6, 0x4a01a006, 0x02000014, 0x4979a407,</div><div class='del'>-	0x4979a207, 0x59a8003a, 0x4801a008, 0x59a8003b,</div><div class='del'>-	0x4801a009, 0x4a01a00a, 0x00047878, 0x42000800,</div><div class='del'>-	0x00000005, 0x42001000, 0x0000dc00, 0x0401f2b0,</div><div class='del'>-	0x0401feb6, 0x4a01a006, 0x02140018, 0x4a01a407,</div><div class='del'>-	0x00000800, 0x5930001c, 0x82000d00, 0xff000000,</div><div class='del'>-	0x900409c0, 0x4805a207, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x4801a00a, 0x4979a408, 0x4979a208, 0x4979a409,</div><div class='del'>-	0x4979a209, 0x4979a00b, 0x42000800, 0x00000006,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0401f299, 0x4933c857,</div><div class='del'>-	0x4937c857, 0x4d380000, 0x4d1c0000, 0x42027000,</div><div class='del'>-	0x00000035, 0x0201f800, 0x00109183, 0x04020022,</div><div class='del'>-	0x0401fe88, 0x4a01a006, 0x13000000, 0x5932381e,</div><div class='del'>-	0x591c0414, 0x8c000502, 0x02000800, 0x00100615,</div><div class='del'>-	0x591c0019, 0x4801a005, 0x591c0406, 0x82000580,</div><div class='del'>-	0x00000003, 0x04000007, 0x59300809, 0x58040002,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x4801a007, 0x0401f003,</div><div class='del'>-	0x59a80010, 0x4801a007, 0x59300419, 0x4801a408,</div><div class='del'>-	0x59300219, 0x4801a208, 0x42000800, 0x00000003,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x5c023800, 0x5c027000,</div><div class='del'>-	0x0401f26f, 0x4803c856, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x598c000d, 0x81300580, 0x02020800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x001068f6, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x5c023800, 0x5c027000, 0x0201f000, 0x00106982,</div><div class='del'>-	0x4803c856, 0x4d2c0000, 0x4d1c0000, 0x5932381e,</div><div class='del'>-	0x811e39c0, 0x02000800, 0x00100615, 0x591c0c06,</div><div class='del'>-	0x82040580, 0x00000006, 0x0400000d, 0x82040580,</div><div class='del'>-	0x00000003, 0x04000036, 0x4a026403, 0x00000037,</div><div class='del'>-	0x4a02641a, 0x00000003, 0x4a02621a, 0x00001700,</div><div class='del'>-	0x5c023800, 0x5c025800, 0x0401f064, 0x0401f84b,</div><div class='del'>-	0x42001000, 0x40000000, 0x591c0203, 0x591c0804,</div><div class='del'>-	0x8c040d3e, 0x04020023, 0x82000c80, 0x0000000e,</div><div class='del'>-	0x0c001003, 0x0201f800, 0x00100615, 0x00107410,</div><div class='del'>-	0x0010741c, 0x00107412, 0x0010741c, 0x00107418,</div><div class='del'>-	0x00107410, 0x00107410, 0x0010741c, 0x0010741c,</div><div class='del'>-	0x00107410, 0x00107410, 0x00107410, 0x00107410,</div><div class='del'>-	0x00107410, 0x0010741c, 0x00107410, 0x0010741c,</div><div class='del'>-	0x0201f800, 0x00100615, 0x591c0414, 0x4803c857,</div><div class='del'>-	0x8c000518, 0x04000003, 0x8c000512, 0x04000003,</div><div class='del'>-	0x80001580, 0x0401f003, 0x42001000, 0x20000000,</div><div class='del'>-	0x591c0015, 0x4801a00a, 0x0401f018, 0x0401f81f,</div><div class='del'>-	0x591e5808, 0x812e59c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x592c100f, 0x591c0011, 0x80080480, 0x4801a00a,</div><div class='del'>-	0x591c0203, 0x591c0804, 0x8c040d3e, 0x04020007,</div><div class='del'>-	0x82000d80, 0x00000002, 0x04000007, 0x82000d80,</div><div class='del'>-	0x00000004, 0x04000004, 0x42001000, 0x40000000,</div><div class='del'>-	0x0401f002, 0x80001580, 0x4809a00b, 0x42000800,</div><div class='del'>-	0x00000006, 0x42001000, 0x0000dc00, 0x5c023800,</div><div class='del'>-	0x5c025800, 0x0401f1fe, 0x4803c856, 0x0401fe03,</div><div class='del'>-	0x4a01a006, 0x02000000, 0x59300c19, 0x4805a407,</div><div class='del'>-	0x59300a19, 0x4805a207, 0x59a81010, 0x59300809,</div><div class='del'>-	0x58041802, 0x820c1d00, 0x00ffffff, 0x5930081e,</div><div class='del'>-	0x58040406, 0x82000580, 0x00000003, 0x04020004,</div><div class='del'>-	0x4809a008, 0x480da009, 0x0401f003, 0x480da008,</div><div class='del'>-	0x4809a009, 0x1c01f000, 0x4803c856, 0x0401fdeb,</div><div class='del'>-	0x0401f003, 0x4803c856, 0x0401fde1, 0x4a01a006,</div><div class='del'>-	0x01000000, 0x5930041a, 0x4801a407, 0x5930021a,</div><div class='del'>-	0x4801a207, 0x42000800, 0x00000002, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0401f1d6, 0x4803c856, 0x4d1c0000,</div><div class='del'>-	0x0401fdc5, 0x4a01a006, 0x14000000, 0x5932381e,</div><div class='del'>-	0x591c0019, 0x4801a005, 0x59300419, 0x4801a407,</div><div class='del'>-	0x59300219, 0x4801a207, 0x59300015, 0x4801a008,</div><div class='del'>-	0x59300216, 0x82000500, 0x000000ff, 0x840001c0,</div><div class='del'>-	0x4801a409, 0x42000800, 0x00000004, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x5c023800, 0x0401f1bd, 0x4803c856,</div><div class='del'>-	0x0401f80b, 0x5930041a, 0x900001c0, 0x4801a005,</div><div class='del'>-	0x0401f9f4, 0x41780800, 0x42001000, 0x00005c00,</div><div class='del'>-	0x0401f9b3, 0x0201f000, 0x00105d86, 0x4803c856,</div><div class='del'>-	0x59300817, 0x82041c00, 0x00000005, 0x46034800,</div><div class='del'>-	0x00000021, 0x58040404, 0x82000500, 0x0000f000,</div><div class='del'>-	0x82000580, 0x00003000, 0x04000003, 0x46034800,</div><div class='del'>-	0x00000041, 0x81a5a000, 0x580c0001, 0x82000d00,</div><div class='del'>-	0x00ffffff, 0x82040d40, 0xc2000000, 0x4805a000,</div><div class='del'>-	0x580c0800, 0x82041500, 0x00ffffff, 0x82000500,</div><div class='del'>-	0xff000000, 0x80080540, 0x4801a001, 0x580c0002,</div><div class='del'>-	0x82000580, 0x00c00000, 0x82000500, 0x00fd0300,</div><div class='del'>-	0x4801a002, 0x580c0003, 0x4801a003, 0x580c0404,</div><div class='del'>-	0x4801a404, 0x580c0204, 0x4801a204, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x59a80026, 0x82000500, 0x00000028,</div><div class='del'>-	0x04020009, 0x59a80026, 0x82000500, 0x00000028,</div><div class='del'>-	0x04000003, 0x497a6a12, 0x0401f003, 0x4a026a12,</div><div class='del'>-	0x0000ff00, 0x42005000, 0x22000000, 0x42006000,</div><div class='del'>-	0x01380000, 0x41786800, 0x41787800, 0x0401f952,</div><div class='del'>-	0x59301008, 0x4a01a006, 0x54000000, 0x59a80010,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x58080c0a, 0x800408f0,</div><div class='del'>-	0x80040540, 0x4801a007, 0x5808000a, 0x82000500,</div><div class='del'>-	0xff000000, 0x4801a008, 0x59a80002, 0x4801a009,</div><div class='del'>-	0x59a80003, 0x4801a00a, 0x59a80000, 0x4801a00b,</div><div class='del'>-	0x59a80001, 0x4801a00c, 0x5808000c, 0x9c0001c0,</div><div class='del'>-	0x4801a00d, 0x5808000d, 0x9c0001c0, 0x4801a00e,</div><div class='del'>-	0x5808000e, 0x9c0001c0, 0x4801a00f, 0x5808000f,</div><div class='del'>-	0x9c0001c0, 0x4801a010, 0x58080010, 0x9c0001c0,</div><div class='del'>-	0x4801a011, 0x58080011, 0x9c0001c0, 0x4801a012,</div><div class='del'>-	0x58080012, 0x9c0001c0, 0x4801a013, 0x58080013,</div><div class='del'>-	0x9c0001c0, 0x4801a014, 0x58080010, 0x9c0001c0,</div><div class='del'>-	0x4801a015, 0x58080011, 0x9c0001c0, 0x4801a016,</div><div class='del'>-	0x58080012, 0x9c0001c0, 0x4801a017, 0x58080013,</div><div class='del'>-	0x9c0001c0, 0x4801a018, 0x42000800, 0x00000013,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0401f135, 0x4803c856,</div><div class='del'>-	0x42005000, 0x22000000, 0x42006000, 0x01290000,</div><div class='del'>-	0x41786800, 0x41787800, 0x0401f90b, 0x59301008,</div><div class='del'>-	0x4a01a006, 0x55000000, 0x5808000b, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x58080c0a, 0x800408f0, 0x80040540,</div><div class='del'>-	0x4801a007, 0x5808080a, 0x82040d00, 0xff000000,</div><div class='del'>-	0x59a80010, 0x82000500, 0x00ffffff, 0x80040540,</div><div class='del'>-	0x4801a008, 0x5808000c, 0x9c0001c0, 0x4801a009,</div><div class='del'>-	0x5808000d, 0x9c0001c0, 0x4801a00a, 0x5808000e,</div><div class='del'>-	0x9c0001c0, 0x4801a00b, 0x5808000f, 0x9c0001c0,</div><div class='del'>-	0x4801a00c, 0x59a80002, 0x4801a00d, 0x59a80003,</div><div class='del'>-	0x4801a00e, 0x59a80000, 0x4801a00f, 0x59a80001,</div><div class='del'>-	0x4801a010, 0x58080010, 0x4801a011, 0x58080011,</div><div class='del'>-	0x4801a012, 0x58080012, 0x4801a013, 0x58080013,</div><div class='del'>-	0x4801a014, 0x4979a015, 0x4979a016, 0x4979a017,</div><div class='del'>-	0x4979a018, 0x42000800, 0x00000013, 0x42001000,</div><div class='del'>-	0x0000dc00, 0x0401f0f6, 0x0401fcfc, 0x5930001c,</div><div class='del'>-	0x800001c0, 0x04000008, 0x4a01a006, 0x01000000,</div><div class='del'>-	0x4a01a407, 0x00000003, 0x42000800, 0x00000002,</div><div class='del'>-	0x0401f028, 0x4a01a006, 0x02000000, 0x41780800,</div><div class='del'>-	0x836c0580, 0x00000004, 0x04020003, 0x84040d42,</div><div class='del'>-	0x0401f00d, 0x0201f800, 0x00104e0d, 0x04020003,</div><div class='del'>-	0x84040d4a, 0x0401f002, 0x84040d48, 0x59a80026,</div><div class='del'>-	0x8c000506, 0x04020003, 0x8c00050a, 0x04000002,</div><div class='del'>-	0x84040d46, 0x4805a207, 0x59c40085, 0x48031004,</div><div class='del'>-	0x4c580000, 0x4c500000, 0x4c540000, 0x4200b000,</div><div class='del'>-	0x00000006, 0x8388a400, 0x00000000, 0x82d0ac00,</div><div class='del'>-	0x00000008, 0x0201f800, 0x0010a93e, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c00b000, 0x42000800, 0x00000008,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0401f0c1, 0x0401fcb9,</div><div class='del'>-	0x4a01a006, 0x56000000, 0x59340006, 0x4801a007,</div><div class='del'>-	0x59340007, 0x4801a008, 0x42000800, 0x00000003,</div><div class='del'>-	0x42001000, 0x0000dc00, 0x0401f0b5, 0x4803c856,</div><div class='del'>-	0x0401fcba, 0x5930081c, 0x800409c0, 0x0400000e,</div><div class='del'>-	0x82040580, 0x0000ffff, 0x04000004, 0x82040480,</div><div class='del'>-	0x00000007, 0x04021008, 0x4a01a006, 0x01000000,</div><div class='del'>-	0x4a01a407, 0x00000003, 0x42000800, 0x00000002,</div><div class='del'>-	0x0401f012, 0x4a01a006, 0x0200001c, 0x4a01a007,</div><div class='del'>-	0x00000001, 0x42001000, 0x0010b2ec, 0x50080000,</div><div class='del'>-	0x9c0001c0, 0x4801a009, 0x59a80010, 0x4801a00a,</div><div class='del'>-	0x59a80002, 0x59a80803, 0x4801a00b, 0x4805a00c,</div><div class='del'>-	0x42000800, 0x00000007, 0x42001000, 0x0000dc00,</div><div class='del'>-	0x0401f08f, 0x4d2c0000, 0x0401fc86, 0x59325808,</div><div class='del'>-	0x592c0008, 0x82000500, 0x00ffffff, 0x4801a001,</div><div class='del'>-	0x4a01a006, 0x51000000, 0x5c025800, 0x0201f000,</div><div class='del'>-	0x001070bc, 0x4803c856, 0x59a80810, 0x82040d00,</div><div class='del'>-	0x000000ff, 0x59325808, 0x59326809, 0x59a83026,</div><div class='del'>-	0x8c18350a, 0x04020008, 0x8c00050e, 0x04020006,</div><div class='del'>-	0x80001d80, 0x59a82010, 0x82102500, 0x000000ff,</div><div class='del'>-	0x0401f001, 0x59300406, 0x4803c857, 0x82000d80,</div><div class='del'>-	0x00000009, 0x04000006, 0x82000d80, 0x0000000a,</div><div class='del'>-	0x0400002e, 0x0201f800, 0x00100615, 0x59300015,</div><div class='del'>-	0x8c00051e, 0x04020020, 0x42005000, 0x04000000,</div><div class='del'>-	0x42006000, 0x05000000, 0x592c040a, 0x82000500,</div><div class='del'>-	0x00000030, 0x800000e0, 0x80306540, 0x5934000a,</div><div class='del'>-	0x8c000508, 0x04000002, 0x84306546, 0x41786800,</div><div class='del'>-	0x41787800, 0x0401f831, 0x59300c14, 0x80040000,</div><div class='del'>-	0x48026414, 0x40040000, 0x800000d0, 0x82000540,</div><div class='del'>-	0x00000020, 0x4801a403, 0x83180d40, 0x00000038,</div><div class='del'>-	0x42001000, 0x0000c920, 0x0401f868, 0x0201f000,</div><div class='del'>-	0x00105d8b, 0x59a80026, 0x82000500, 0x00000028,</div><div class='del'>-	0x04000003, 0x497a6a12, 0x0401f7dc, 0x4a026a12,</div><div class='del'>-	0x0000ff00, 0x0401f7d9, 0x42005000, 0x02000000,</div><div class='del'>-	0x42006000, 0x20290000, 0x41786800, 0x41787800,</div><div class='del'>-	0x0401f812, 0x83180d40, 0x00000038, 0x42001000,</div><div class='del'>-	0x0000c9a0, 0x0401f851, 0x42000800, 0x000007d0,</div><div class='del'>-	0x59300011, 0x82000500, 0xfff00000, 0x80000540,</div><div class='del'>-	0x04000003, 0x42000800, 0x00001b58, 0x41781000,</div><div class='del'>-	0x0201f000, 0x00105d8d, 0x4201a000, 0x00000000,</div><div class='del'>-	0x0401f003, 0x4201a000, 0x00000011, 0x59340a12,</div><div class='del'>-	0x82040d00, 0x0000ff00, 0x59a80010, 0x82000500,</div><div class='del'>-	0x000000ff, 0x900001c0, 0x80040540, 0x80d00540,</div><div class='del'>-	0x44034800, 0x81a5a000, 0x59340002, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x80280540, 0x4801a000, 0x59a80010,</div><div class='del'>-	0x4801a001, 0x4831a002, 0x82340540, 0x00000000,</div><div class='del'>-	0x4801a003, 0x59300402, 0x4801a404, 0x59300a02,</div><div class='del'>-	0x4805a204, 0x8c30652e, 0x04000003, 0x4805a404,</div><div class='del'>-	0x4801a204, 0x483da005, 0x1c01f000, 0x4807c857,</div><div class='del'>-	0x4c040000, 0x0401f82a, 0x5c000800, 0x40040000,</div><div class='del'>-	0x80081540, 0x800000c4, 0x82000540, 0x00002000,</div><div class='del'>-	0x4803910a, 0x59b400f6, 0x82000500, 0x00000018,</div><div class='del'>-	0x040207fd, 0x4a0368f0, 0x0010b342, 0x42001800,</div><div class='del'>-	0x0010b343, 0x580c0000, 0x4803c857, 0x580c0002,</div><div class='del'>-	0x4803c857, 0x580c0004, 0x4803c857, 0x4a0368f1,</div><div class='del'>-	0x0010b349, 0x480b68f3, 0x4a0378e4, 0x00008000,</div><div class='del'>-	0x0201f000, 0x00105d86, 0x4807c857, 0x480a2800,</div><div class='del'>-	0x4c040000, 0x0401f80a, 0x5c000800, 0x59b400f6,</div><div class='del'>-	0x8c00050a, 0x040207fe, 0x49a768f2, 0x480768f4,</div><div class='del'>-	0x4a0378e4, 0x00008000, 0x1c01f000, 0x4a0378e4,</div><div class='del'>-	0x0000c000, 0x59bc00e4, 0x8c000520, 0x0400000c,</div><div class='del'>-	0x4a0378e4, 0x00008000, 0x42007000, 0x000003e8,</div><div class='del'>-	0x59bc00e4, 0x8c000520, 0x040007f5, 0x80387040,</div><div class='del'>-	0x02000800, 0x00100615, 0x0401f7fa, 0x1c01f000,</div><div class='del'>-	0x82000500, 0xffff0000, 0x82000580, 0x01050000,</div><div class='del'>-	0x0402000d, 0x599c0818, 0x8c040d10, 0x0400000a,</div><div class='del'>-	0x59a80807, 0x8c040d0a, 0x04000007, 0x42001000,</div><div class='del'>-	0x0000804f, 0x41781800, 0x41782000, 0x0201f800,</div><div class='del'>-	0x00103857, 0x1c01f000, 0x41781000, 0x42026000,</div><div class='del'>-	0x0010cfc0, 0x59a8180e, 0x480a6402, 0x4a026202,</div><div class='del'>-	0x0000ffff, 0x80081000, 0x800c1840, 0x04000004,</div><div class='del'>-	0x83326400, 0x00000024, 0x0401f7f8, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59300203, 0x82000580, 0x00000000,</div><div class='del'>-	0x0400002c, 0x59300406, 0x4803c857, 0x82000d80,</div><div class='del'>-	0x00000004, 0x04000011, 0x82000d80, 0x00000001,</div><div class='del'>-	0x0400000e, 0x82000d80, 0x00000003, 0x04000006,</div><div class='del'>-	0x82000d80, 0x00000006, 0x04020011, 0x0201f800,</div><div class='del'>-	0x0010a3fa, 0x5930001c, 0x800001c0, 0x02020800,</div><div class='del'>-	0x0010961a, 0x0401f00a, 0x5930081e, 0x4807c857,</div><div class='del'>-	0x800409c0, 0x04000006, 0x5804001c, 0x4803c857,</div><div class='del'>-	0x81300580, 0x04020002, 0x4978081c, 0x497a6008,</div><div class='del'>-	0x4a026004, 0x00004000, 0x59a80037, 0x82000c80,</div><div class='del'>-	0x00000051, 0x04001002, 0x80000102, 0x48026206,</div><div class='del'>-	0x497a6205, 0x497a6009, 0x4a026406, 0x00000007,</div><div class='del'>-	0x1c01f000, 0x8166c9c0, 0x0400001c, 0x41626000,</div><div class='del'>-	0x41580000, 0x59300a03, 0x82040d80, 0x00000000,</div><div class='del'>-	0x04000008, 0x83326400, 0x00000024, 0x81300c80,</div><div class='del'>-	0x040017f9, 0x42026000, 0x0010cfc0, 0x0401f7f6,</div><div class='del'>-	0x4933c857, 0x8166c840, 0x83300c00, 0x00000024,</div><div class='del'>-	0x80040480, 0x04021006, 0x4006c000, 0x4a026203,</div><div class='del'>-	0x00000008, 0x813261c0, 0x1c01f000, 0x4202c000,</div><div class='del'>-	0x0010cfc0, 0x0401f7fa, 0x42000000, 0x0010b653,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x4933c856, 0x417a6000,</div><div class='del'>-	0x0401f7f5, 0x4933c857, 0x83380580, 0x00000013,</div><div class='del'>-	0x0402000b, 0x59300004, 0x8c00053e, 0x04000007,</div><div class='del'>-	0x0201f800, 0x0010698c, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x0201f800, 0x00106982, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x59880053, 0x80000000, 0x48031053, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59300203, 0x82003480, 0x0000000e,</div><div class='del'>-	0x02021800, 0x00100615, 0x4d2c0000, 0x0c01f803,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x00107718, 0x00107c84,</div><div class='del'>-	0x00107dd4, 0x00107718, 0x00107e3a, 0x0010787c,</div><div class='del'>-	0x00107718, 0x00107718, 0x00107c1a, 0x00107718,</div><div class='del'>-	0x00107718, 0x00107718, 0x00107718, 0x00107718,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4933c857, 0x59300203,</div><div class='del'>-	0x82003480, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x0010772f, 0x001087f0, 0x0010772f,</div><div class='del'>-	0x0010772f, 0x0010772f, 0x0010772f, 0x0010772f,</div><div class='del'>-	0x0010772f, 0x0010879a, 0x0010880c, 0x0010887a,</div><div class='del'>-	0x0010880c, 0x0010887a, 0x0010772f, 0x0201f800,</div><div class='del'>-	0x00100615, 0x0201f800, 0x00100615, 0x4933c857,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x59300203, 0x82003480,</div><div class='del'>-	0x0000000e, 0x02021800, 0x00100615, 0x0c01f803,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x0010774c, 0x0010774c,</div><div class='del'>-	0x0010774c, 0x00107768, 0x001077b4, 0x0010774c,</div><div class='del'>-	0x0010774c, 0x0010774c, 0x0010774e, 0x0010774c,</div><div class='del'>-	0x0010774c, 0x0010774c, 0x0010774c, 0x0010774c,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4933c857, 0x83380580,</div><div class='del'>-	0x00000040, 0x02020800, 0x00100615, 0x4a026007,</div><div class='del'>-	0x00082000, 0x4a026203, 0x00000003, 0x493a6403,</div><div class='del'>-	0x4a025c08, 0x00000001, 0x592c000d, 0x48026011,</div><div class='del'>-	0x497a6013, 0x592c0208, 0x800000c2, 0x800010c4,</div><div class='del'>-	0x80081400, 0x480a6206, 0x0201f800, 0x00100f9c,</div><div class='del'>-	0x42000800, 0x80000060, 0x0201f000, 0x00106466,</div><div class='del'>-	0x4933c857, 0x83380480, 0x00000050, 0x02021800,</div><div class='del'>-	0x00100615, 0x83380480, 0x00000049, 0x02001800,</div><div class='del'>-	0x00100615, 0x0c01f001, 0x0010777b, 0x00107786,</div><div class='del'>-	0x00107779, 0x00107779, 0x00107779, 0x00107779,</div><div class='del'>-	0x00107791, 0x0201f800, 0x00100615, 0x4a026203,</div><div class='del'>-	0x00000004, 0x4a025c08, 0x00000002, 0x592c0207,</div><div class='del'>-	0x48025c09, 0x592c0209, 0x48025a07, 0x592c000c,</div><div class='del'>-	0x4802580d, 0x1c01f000, 0x0201f800, 0x001068c1,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x04000005, 0x4a025a06,</div><div class='del'>-	0x00000006, 0x0201f800, 0x00020381, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x0201f800, 0x001068c1, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x42003000, 0x00000014, 0x41782800, 0x42002000,</div><div class='del'>-	0x00000002, 0x4d400000, 0x4d440000, 0x59368c03,</div><div class='del'>-	0x42028000, 0x00000029, 0x0201f800, 0x0010962a,</div><div class='del'>-	0x5c028800, 0x5c028000, 0x42000000, 0x0010b663,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x02000000, 0x000208b4, 0x4a025a06, 0x00000029,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x4933c857, 0x83380580, 0x00000048, 0x04000005,</div><div class='del'>-	0x83380580, 0x00000053, 0x02020800, 0x00100615,</div><div class='del'>-	0x592c0206, 0x82000580, 0x00000007, 0x04000009,</div><div class='del'>-	0x59300011, 0x80000540, 0x04000006, 0x592c080c,</div><div class='del'>-	0x80040480, 0x4802580c, 0x4a025a06, 0x00000015,</div><div class='del'>-	0x592c0206, 0x80000540, 0x04020003, 0x4a025a06,</div><div class='del'>-	0x00000000, 0x0201f800, 0x00020381, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4933c857, 0x4d2c0000, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x4c580000, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x02000800, 0x00100615, 0x497a5a06, 0x59a8006e,</div><div class='del'>-	0x82000500, 0x0000f000, 0x48025c07, 0x59a80816,</div><div class='del'>-	0x82040c00, 0x00000018, 0x48065a07, 0x412c7800,</div><div class='del'>-	0x4d2c0000, 0x41cca000, 0x42002800, 0x00000001,</div><div class='del'>-	0x42001000, 0x0000002c, 0x82040480, 0x0000002d,</div><div class='del'>-	0x04021006, 0x832cac00, 0x00000009, 0x0201f800,</div><div class='del'>-	0x0010894a, 0x0401f02e, 0x40043000, 0x42000800,</div><div class='del'>-	0x0000002c, 0x832cac00, 0x00000009, 0x0201f800,</div><div class='del'>-	0x0010894a, 0x82183480, 0x0000002c, 0x0201f800,</div><div class='del'>-	0x0010082a, 0x0400001a, 0x80142800, 0x4a025804,</div><div class='del'>-	0x00000110, 0x492c7801, 0x82180c80, 0x0000003d,</div><div class='del'>-	0x04021007, 0x40180800, 0x832cac00, 0x00000005,</div><div class='del'>-	0x0201f800, 0x0010894a, 0x0401f015, 0x82081400,</div><div class='del'>-	0x0000003c, 0x82183480, 0x0000003c, 0x42000800,</div><div class='del'>-	0x0000003c, 0x412c7800, 0x832cac00, 0x00000005,</div><div class='del'>-	0x0201f800, 0x0010894a, 0x0401f7e5, 0x5c025800,</div><div class='del'>-	0x592c0206, 0x8400055e, 0x48025a06, 0x592c0407,</div><div class='del'>-	0x80080540, 0x48025c07, 0x0401f002, 0x5c025800,</div><div class='del'>-	0x813669c0, 0x04000003, 0x59343403, 0x0401f003,</div><div class='del'>-	0x42003000, 0x0000ffff, 0x49325808, 0x481a5c06,</div><div class='del'>-	0x82100580, 0x00000054, 0x04020002, 0x491e5813,</div><div class='del'>-	0x841401c0, 0x80100540, 0x48025804, 0x592c0001,</div><div class='del'>-	0x497a5801, 0x4c000000, 0x0201f800, 0x00020381,</div><div class='del'>-	0x5c025800, 0x812e59c0, 0x040207f9, 0x5c00b000,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4c5c0000, 0x4d2c0000, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x4c580000, 0x412cb800, 0x592c040b,</div><div class='del'>-	0x8c000516, 0x04000003, 0x41cca000, 0x0401f003,</div><div class='del'>-	0x83cca400, 0x00000006, 0x4008b000, 0x41781000,</div><div class='del'>-	0x82580480, 0x00000012, 0x04001004, 0x4200b000,</div><div class='del'>-	0x00000012, 0x40001000, 0x4c080000, 0x4d2c0000,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000023, 0x5c001800,</div><div class='del'>-	0x492c1801, 0x485a5800, 0x832cac00, 0x00000002,</div><div class='del'>-	0x0201f800, 0x0010a94f, 0x585c040b, 0x8c000500,</div><div class='del'>-	0x0400000e, 0x832c1400, 0x00000002, 0x8c000516,</div><div class='del'>-	0x04000003, 0x82081400, 0x00000006, 0x46001000,</div><div class='del'>-	0x00000001, 0x80081000, 0x46001000, 0x00000900,</div><div class='del'>-	0x84000500, 0x4800bc0b, 0x5c001000, 0x800811c0,</div><div class='del'>-	0x040207da, 0x82000540, 0x00000001, 0x5c00b000,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x5c025800, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x5c025800, 0x5c001000, 0x0401f7f8,</div><div class='del'>-	0x4933c857, 0x83380d80, 0x00000015, 0x04020003,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x83380d80, 0x00000016,</div><div class='del'>-	0x02020800, 0x00100615, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x4933c857, 0x4d2c0000, 0x4c500000, 0x4c540000,</div><div class='del'>-	0x4c580000, 0x59325808, 0x83cca400, 0x00000006,</div><div class='del'>-	0x59cc1806, 0x820c0580, 0x01000000, 0x04020004,</div><div class='del'>-	0x4200b000, 0x00000002, 0x0401f00f, 0x4200b000,</div><div class='del'>-	0x00000008, 0x832cac00, 0x00000005, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x8c0c1d00, 0x0400000b, 0x4200b000,</div><div class='del'>-	0x00000008, 0x592e5801, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x832cac00, 0x00000005, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x0401f816, 0x5c00b000, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c025800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4c580000, 0x83cca400,</div><div class='del'>-	0x00000006, 0x5930a808, 0x8254ac00, 0x00000005,</div><div class='del'>-	0x4200b000, 0x00000007, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x5c00b000, 0x5c00a800, 0x5c00a000, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x02000000, 0x000208b4,</div><div class='del'>-	0x4d2c0000, 0x0201f800, 0x00109360, 0x0402000b,</div><div class='del'>-	0x41780800, 0x4d400000, 0x42028000, 0x00000000,</div><div class='del'>-	0x0201f800, 0x00109204, 0x5c028000, 0x5c025800,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x5931d821, 0x58ef400b,</div><div class='del'>-	0x58ee580d, 0x4a025a04, 0x00000103, 0x58ec0009,</div><div class='del'>-	0x0801f800, 0x5c025800, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x4933c857, 0x59cc1806, 0x820c0580, 0x02000000,</div><div class='del'>-	0x04020014, 0x4a026802, 0x00fffffd, 0x5934000a,</div><div class='del'>-	0x84000504, 0x4802680a, 0x59300808, 0x800409c0,</div><div class='del'>-	0x02000000, 0x000208b4, 0x4a000a04, 0x00000103,</div><div class='del'>-	0x480c0805, 0x5931d821, 0x58ef400b, 0x58ee580d,</div><div class='del'>-	0x58ec0009, 0x0801f800, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x42000000, 0x0010b66b, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4c0c0000, 0x0401f804, 0x5c001800, 0x040207eb,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x04020009, 0x497a6206, 0x497a6205,</div><div class='del'>-	0x4d380000, 0x42027000, 0x00000022, 0x0401fb77,</div><div class='del'>-	0x5c027000, 0x80000580, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x4d2c0000, 0x4c500000, 0x4c540000,</div><div class='del'>-	0x4c580000, 0x59325808, 0x592e5801, 0x832cac00,</div><div class='del'>-	0x00000005, 0x83cca400, 0x00000006, 0x59a8086e,</div><div class='del'>-	0x82040d00, 0x000003ff, 0x82041480, 0x0000000f,</div><div class='del'>-	0x0400101b, 0x4200b000, 0x0000000f, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x592e5801, 0x832cac00, 0x00000005,</div><div class='del'>-	0x82080c80, 0x0000000f, 0x0400100d, 0x4200b000,</div><div class='del'>-	0x0000000f, 0x0201f800, 0x0010a93e, 0x592e5801,</div><div class='del'>-	0x832cac00, 0x00000005, 0x82041480, 0x0000000f,</div><div class='del'>-	0x04001007, 0x42001000, 0x0000000f, 0x4008b000,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x0401f004, 0x4004b000,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x5931d821, 0x58ef400b,</div><div class='del'>-	0x58ee580d, 0x4a025a04, 0x00000103, 0x592e5801,</div><div class='del'>-	0x58ec0009, 0x0801f800, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x5c00b000, 0x5c00a800, 0x5c00a000, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4d2c0000, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x4c580000, 0x59cc0006, 0x82000d80,</div><div class='del'>-	0x01000000, 0x0400002c, 0x59cc0007, 0x9000b1c0,</div><div class='del'>-	0x8258b500, 0x000000ff, 0x8058b104, 0x8258b400,</div><div class='del'>-	0x00000002, 0x82580c80, 0x00000007, 0x04001003,</div><div class='del'>-	0x4200b000, 0x00000006, 0x83cca400, 0x00000006,</div><div class='del'>-	0x59301008, 0x800811c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x8208ac00, 0x00000005, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x82000d00, 0xff000000, 0x800409c0, 0x04000019,</div><div class='del'>-	0x8200b500, 0x000000ff, 0x8058b104, 0x82580c80,</div><div class='del'>-	0x0000000e, 0x04001003, 0x4200b000, 0x0000000d,</div><div class='del'>-	0x58081001, 0x800811c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x8208ac00, 0x00000005, 0x0201f800, 0x0010a93e,</div><div class='del'>-	0x0401f008, 0x59301008, 0x800811c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x48001005, 0x59cc0007, 0x48001006,</div><div class='del'>-	0x0401ff3b, 0x5c00b000, 0x5c00a800, 0x5c00a000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4933c857, 0x42000800,</div><div class='del'>-	0x00000000, 0x59cc0006, 0x82000580, 0x02000000,</div><div class='del'>-	0x04000003, 0x42000800, 0x00000001, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x812e59c0, 0x02000800, 0x00100615,</div><div class='del'>-	0x48065a06, 0x0201f800, 0x00020381, 0x5c025800,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x4933c857, 0x4d2c0000,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4c580000, 0x4200b000,</div><div class='del'>-	0x00000002, 0x59cc0806, 0x82040580, 0x01000000,</div><div class='del'>-	0x04000004, 0x8204b500, 0x0000ffff, 0x8058b104,</div><div class='del'>-	0x83cca400, 0x00000006, 0x59300008, 0x8200ac00,</div><div class='del'>-	0x00000005, 0x0201f800, 0x0010a93e, 0x0401ff0c,</div><div class='del'>-	0x5c00b000, 0x5c00a800, 0x5c00a000, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4803c857, 0x4807c857,</div><div class='del'>-	0x480bc857, 0x480fc857, 0x4813c857, 0x481bc857,</div><div class='del'>-	0x492fc857, 0x4d2c0000, 0x4c000000, 0x0201f800,</div><div class='del'>-	0x00100819, 0x5c000000, 0x0400000f, 0x48025803,</div><div class='del'>-	0x5c000000, 0x4802580a, 0x4c000000, 0x481a5801,</div><div class='del'>-	0x48125809, 0x48065804, 0x480a5807, 0x480e5808,</div><div class='del'>-	0x412c1000, 0x0201f800, 0x001008a1, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c025800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4d1c0000, 0x59cc0001, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x59341002, 0x82081500, 0x00ffffff, 0x80080580,</div><div class='del'>-	0x0402001f, 0x497a6205, 0x4d380000, 0x42027000,</div><div class='del'>-	0x00000035, 0x0201f800, 0x00109183, 0x5c027000,</div><div class='del'>-	0x04020012, 0x591c001c, 0x800001c0, 0x0400000f,</div><div class='del'>-	0x497a381c, 0x591c0414, 0x8c000502, 0x02000800,</div><div class='del'>-	0x00100615, 0x84000502, 0x48023c14, 0x591c1406,</div><div class='del'>-	0x82080580, 0x00000003, 0x04000006, 0x82080580,</div><div class='del'>-	0x00000006, 0x04000005, 0x0401fc9e, 0x0401f004,</div><div class='del'>-	0x0401f805, 0x0401f002, 0x0401f8c0, 0x5c023800,</div><div class='del'>-	0x1c01f000, 0x4d2c0000, 0x591e5808, 0x4933c857,</div><div class='del'>-	0x491fc857, 0x493bc857, 0x492fc857, 0x83380580,</div><div class='del'>-	0x00000015, 0x040000b3, 0x83380580, 0x00000016,</div><div class='del'>-	0x040200ae, 0x4d300000, 0x411e6000, 0x59cc0207,</div><div class='del'>-	0x4803c857, 0x82000d00, 0x0000ff00, 0x82040580,</div><div class='del'>-	0x00001700, 0x04000004, 0x82040580, 0x00000300,</div><div class='del'>-	0x0402005b, 0x591c0203, 0x4803c857, 0x82000580,</div><div class='del'>-	0x0000000d, 0x0400003f, 0x812e59c0, 0x0400009a,</div><div class='del'>-	0x591c0202, 0x4803c857, 0x82000580, 0x0000ffff,</div><div class='del'>-	0x0402007e, 0x592c020a, 0x4803c857, 0x82000500,</div><div class='del'>-	0x00000003, 0x82000580, 0x00000002, 0x04020007,</div><div class='del'>-	0x592c080f, 0x591c0011, 0x4803c857, 0x4807c857,</div><div class='del'>-	0x80040580, 0x04020071, 0x591c0414, 0x4803c857,</div><div class='del'>-	0x8c000500, 0x0402006d, 0x41780800, 0x591c1206,</div><div class='del'>-	0x42000000, 0x0000000a, 0x0201f800, 0x001063ee,</div><div class='del'>-	0x592c0406, 0x4803c857, 0x800001c0, 0x0400000c,</div><div class='del'>-	0x80080c80, 0x04001004, 0x02020800, 0x00100615,</div><div class='del'>-	0x80001040, 0x480a5c06, 0x800811c0, 0x04020004,</div><div class='del'>-	0x0201f800, 0x00108b3c, 0x0401f06b, 0x0201f800,</div><div class='del'>-	0x00108ee7, 0x591c0817, 0x591c0018, 0x48065808,</div><div class='del'>-	0x48025809, 0x59300007, 0x8c000500, 0x02020800,</div><div class='del'>-	0x00100ee4, 0x497a3808, 0x0201f800, 0x000201ee,</div><div class='del'>-	0x0402004a, 0x411e6000, 0x0401fc3e, 0x0401f05a,</div><div class='del'>-	0x0401fc6d, 0x04000013, 0x49366009, 0x4a026406,</div><div class='del'>-	0x00000003, 0x492e6008, 0x591c0817, 0x591c1018,</div><div class='del'>-	0x48066017, 0x480a6018, 0x4d380000, 0x591e7403,</div><div class='del'>-	0x4d300000, 0x411e6000, 0x0401fc2e, 0x5c026000,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x0401f046,</div><div class='del'>-	0x59a80039, 0x48023a05, 0x0401f043, 0x59cc0407,</div><div class='del'>-	0x82000580, 0x0000000b, 0x04020025, 0x59340a00,</div><div class='del'>-	0x84040d0e, 0x48066a00, 0x592c0a04, 0x82040d00,</div><div class='del'>-	0x000000ff, 0x82040d80, 0x00000014, 0x04000003,</div><div class='del'>-	0x4a02621d, 0x00000003, 0x59300007, 0x8c000500,</div><div class='del'>-	0x02020800, 0x00100ee4, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000003, 0x592c0a08, 0x0201f800, 0x00104bee,</div><div class='del'>-	0x0201f800, 0x00020381, 0x5c028000, 0x497a6008,</div><div class='del'>-	0x4a026403, 0x00000085, 0x4a026203, 0x00000009,</div><div class='del'>-	0x4a026406, 0x00000002, 0x42000800, 0x8000404b,</div><div class='del'>-	0x0201f800, 0x00020855, 0x0401f01b, 0x59cc0207,</div><div class='del'>-	0x82000580, 0x00002a00, 0x04020004, 0x59a80039,</div><div class='del'>-	0x48023a05, 0x0401f014, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x4a025a04, 0x00000103, 0x591c0007,</div><div class='del'>-	0x8c000500, 0x02020800, 0x00100ee4, 0x591c0402,</div><div class='del'>-	0x48025c06, 0x4a025a06, 0x00000003, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00107698, 0x0201f800,</div><div class='del'>-	0x00104801, 0x5c026000, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x0401f002, 0x5c026000, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x0401f819, 0x0401f7fd, 0x4933c857, 0x83380580,</div><div class='del'>-	0x00000015, 0x04020004, 0x59a80039, 0x48023a05,</div><div class='del'>-	0x0401f00d, 0x83380580, 0x00000016, 0x0402000d,</div><div class='del'>-	0x4d300000, 0x411e6000, 0x0201f800, 0x0010a3fa,</div><div class='del'>-	0x0201f800, 0x00020831, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x5c026000, 0x497a381c, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x1c01f000, 0x591c0414, 0x84000540, 0x48023c14,</div><div class='del'>-	0x59cc100b, 0x4933c857, 0x491fc857, 0x492fc857,</div><div class='del'>-	0x4803c857, 0x480bc857, 0x8c08153c, 0x04000006,</div><div class='del'>-	0x59a80039, 0x48023a05, 0x497a381c, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4d300000, 0x411e6000, 0x0201f800,</div><div class='del'>-	0x0010898b, 0x5c026000, 0x591c0406, 0x82000580,</div><div class='del'>-	0x00000000, 0x02000000, 0x000208b4, 0x591c0403,</div><div class='del'>-	0x82000580, 0x00000050, 0x0402000d, 0x4d300000,</div><div class='del'>-	0x411e6000, 0x4a026203, 0x00000001, 0x42000800,</div><div class='del'>-	0x80000043, 0x0201f800, 0x00020855, 0x5c026000,</div><div class='del'>-	0x497a381c, 0x0201f000, 0x000208b4, 0x591c0203,</div><div class='del'>-	0x82000580, 0x0000000d, 0x04000014, 0x812e59c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x591c0203, 0x82000580,</div><div class='del'>-	0x00000004, 0x04020011, 0x592c020a, 0x8c000502,</div><div class='del'>-	0x0400000e, 0x4a023812, 0x0fffffff, 0x592c0208,</div><div class='del'>-	0x8400051e, 0x48025a08, 0x42000000, 0x00000001,</div><div class='del'>-	0x48023a14, 0x0401f021, 0x42000000, 0x00000007,</div><div class='del'>-	0x48023a14, 0x0401f01d, 0x592c020a, 0x4803c857,</div><div class='del'>-	0x8c000500, 0x0402000b, 0x8c000502, 0x040007f7,</div><div class='del'>-	0x591c0414, 0x8c00051c, 0x040207eb, 0x591c0011,</div><div class='del'>-	0x4803c857, 0x800001c0, 0x040007f0, 0x0401f7e6,</div><div class='del'>-	0x8c08153a, 0x040207ed, 0x59cc000a, 0x592c180f,</div><div class='del'>-	0x4803c857, 0x480fc857, 0x800c0580, 0x040007e7,</div><div class='del'>-	0x59cc000a, 0x4803c857, 0x48023816, 0x42000000,</div><div class='del'>-	0x00000005, 0x48023a14, 0x0201f000, 0x0010901b,</div><div class='del'>-	0x4933c857, 0x4d1c0000, 0x59cc0001, 0x59341002,</div><div class='del'>-	0x80080580, 0x82000500, 0x00ffffff, 0x04020041,</div><div class='del'>-	0x59301419, 0x0201f800, 0x001091d9, 0x02000800,</div><div class='del'>-	0x00100615, 0x591c1406, 0x82080580, 0x00000007,</div><div class='del'>-	0x04000038, 0x82080580, 0x00000002, 0x04000035,</div><div class='del'>-	0x82080580, 0x00000000, 0x04000032, 0x591c0202,</div><div class='del'>-	0x82000d80, 0x0000ffff, 0x04000004, 0x59301a19,</div><div class='del'>-	0x800c0580, 0x0402002b, 0x83380580, 0x00000015,</div><div class='del'>-	0x04000026, 0x4d300000, 0x4d2c0000, 0x411e6000,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108df4, 0x02000800,</div><div class='del'>-	0x00100615, 0x592c0204, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82000580, 0x00000014, 0x04000003, 0x4a02621d,</div><div class='del'>-	0x00000003, 0x42028000, 0x00000003, 0x592c0a08,</div><div class='del'>-	0x0201f800, 0x00104bee, 0x0201f800, 0x00020381,</div><div class='del'>-	0x5c025800, 0x497a6008, 0x4a026403, 0x00000085,</div><div class='del'>-	0x4a026203, 0x00000009, 0x4a026406, 0x00000002,</div><div class='del'>-	0x42000800, 0x8000404b, 0x0201f800, 0x00020855,</div><div class='del'>-	0x5c026000, 0x0401f003, 0x59a80039, 0x48023a05,</div><div class='del'>-	0x497a381c, 0x0201f800, 0x000208b4, 0x5c023800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4c580000, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x83383580, 0x00000015, 0x04000010,</div><div class='del'>-	0x59342200, 0x84102502, 0x48126a00, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000066, 0x0201f800, 0x00109360,</div><div class='del'>-	0x04020005, 0x4200b000, 0x00000002, 0x0201f800,</div><div class='del'>-	0x00109346, 0x0401fa0d, 0x0401f079, 0x83cc1400,</div><div class='del'>-	0x00000008, 0x4200b000, 0x00000002, 0x83341c00,</div><div class='del'>-	0x00000006, 0x0201f800, 0x001082ff, 0x04020015,</div><div class='del'>-	0x83cc1400, 0x0000000a, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83341c00, 0x00000008, 0x0201f800, 0x001082ff,</div><div class='del'>-	0x0402000c, 0x0201f800, 0x00101e1b, 0x59342200,</div><div class='del'>-	0x59cc1007, 0x800811c0, 0x04000003, 0x480a6801,</div><div class='del'>-	0x84102542, 0x8410251a, 0x48126a00, 0x0401f05f,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x00101de2,</div><div class='del'>-	0x5c027800, 0x42000000, 0x0010b663, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59340200, 0x84000558, 0x48026a00,</div><div class='del'>-	0x4d300000, 0x0201f800, 0x00020892, 0x02000800,</div><div class='del'>-	0x00100615, 0x49366009, 0x497a6008, 0x4a026406,</div><div class='del'>-	0x00000001, 0x4a026403, 0x00000001, 0x42003000,</div><div class='del'>-	0x00000003, 0x0201f800, 0x0010a766, 0x0201f800,</div><div class='del'>-	0x0010393e, 0x04000011, 0x41782800, 0x42003000,</div><div class='del'>-	0x00000001, 0x4d400000, 0x42028000, 0x00000029,</div><div class='del'>-	0x0201f800, 0x0010a250, 0x5c028000, 0x4a026406,</div><div class='del'>-	0x00000004, 0x4a026203, 0x00000007, 0x4a026420,</div><div class='del'>-	0x00000001, 0x0401f009, 0x4a026203, 0x00000001,</div><div class='del'>-	0x42000800, 0x0000000b, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0201f800, 0x00106470, 0x5c026000, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000022, 0x0201f800, 0x00109360,</div><div class='del'>-	0x04020022, 0x0401f9b1, 0x0401f01d, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x59340200,</div><div class='del'>-	0x84000558, 0x48026a00, 0x42003000, 0x00000003,</div><div class='del'>-	0x41782800, 0x42002000, 0x00000005, 0x4d400000,</div><div class='del'>-	0x4d440000, 0x59368c03, 0x42028000, 0x00000029,</div><div class='del'>-	0x0201f800, 0x0010962a, 0x5c028800, 0x5c028000,</div><div class='del'>-	0x5c027800, 0x0201f800, 0x00101e1b, 0x0201f800,</div><div class='del'>-	0x000208b4, 0x0401f002, 0x0401fca9, 0x5c025800,</div><div class='del'>-	0x5c00b000, 0x1c01f000, 0x4933c857, 0x41380000,</div><div class='del'>-	0x83383480, 0x00000056, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x00107c7e, 0x00107c79, 0x00107c7e,</div><div class='del'>-	0x00107c7e, 0x00107c7e, 0x00107c7e, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c7e, 0x00107c77, 0x00107c7e, 0x00107c7e,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c7e, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c7e,</div><div class='del'>-	0x00107c7e, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c7e, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c7e, 0x00107c7e, 0x00107c77,</div><div class='del'>-	0x00107c7e, 0x00107c7e, 0x00107c77, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c7e, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c7e, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c7e, 0x00107c77,</div><div class='del'>-	0x00107c77, 0x00107c77, 0x00107c7e, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4a026203, 0x00000001, 0x493a6403,</div><div class='del'>-	0x0201f000, 0x00106470, 0x4933c857, 0x4a026203,</div><div class='del'>-	0x00000001, 0x493a6403, 0x0201f000, 0x00106470,</div><div class='del'>-	0x59300403, 0x82003480, 0x00000056, 0x02021800,</div><div class='del'>-	0x00100615, 0x83383580, 0x00000013, 0x04000096,</div><div class='del'>-	0x83383580, 0x00000027, 0x0402004c, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x001068f6, 0x0201f800, 0x00108ef1,</div><div class='del'>-	0x0400000b, 0x0201f800, 0x00108f05, 0x04000041,</div><div class='del'>-	0x59300403, 0x82000d80, 0x00000022, 0x04020038,</div><div class='del'>-	0x0401fc61, 0x0400003a, 0x0401f03a, 0x0201f800,</div><div class='del'>-	0x00101e1b, 0x42000800, 0x00000007, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x0401f901, 0x4d440000, 0x59368c03,</div><div class='del'>-	0x83440580, 0x000007fe, 0x04020008, 0x59a81026,</div><div class='del'>-	0x84081540, 0x0201f800, 0x00104e0d, 0x04020002,</div><div class='del'>-	0x8408154a, 0x480b5026, 0x42028000, 0x00000029,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x00101de2,</div><div class='del'>-	0x5c027800, 0x836c0580, 0x00000003, 0x0400000c,</div><div class='del'>-	0x59326809, 0x59340008, 0x800001c0, 0x04020008,</div><div class='del'>-	0x59368c03, 0x4933c857, 0x4937c857, 0x4947c857,</div><div class='del'>-	0x0201f800, 0x00104451, 0x0401f00c, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x42003000,</div><div class='del'>-	0x00000015, 0x41782800, 0x42002000, 0x00000003,</div><div class='del'>-	0x0201f800, 0x0010962a, 0x5c028800, 0x0201f800,</div><div class='del'>-	0x001090ec, 0x0201f000, 0x000208b4, 0x1c01f000,</div><div class='del'>-	0x0401f8ce, 0x0401f7fa, 0x83380580, 0x00000014,</div><div class='del'>-	0x0400000c, 0x4933c857, 0x0201f800, 0x00106cb4,</div><div class='del'>-	0x02020000, 0x001076fb, 0x59300203, 0x82000580,</div><div class='del'>-	0x00000002, 0x040000ef, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x001068f6, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x42003000, 0x00000016, 0x41782800, 0x4d400000,</div><div class='del'>-	0x4d440000, 0x59368c03, 0x42002000, 0x00000009,</div><div class='del'>-	0x42028000, 0x00000029, 0x0201f800, 0x0010962a,</div><div class='del'>-	0x5c028800, 0x5c028000, 0x42000000, 0x0010b663,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x0201f800, 0x00108ef1,</div><div class='del'>-	0x0402000c, 0x0201f800, 0x00101e1b, 0x0401f89f,</div><div class='del'>-	0x59340c03, 0x82040580, 0x000007fe, 0x040207c8,</div><div class='del'>-	0x59a80826, 0x84040d40, 0x48075026, 0x0401f7c4,</div><div class='del'>-	0x0201f800, 0x00108f05, 0x04020003, 0x0401f893,</div><div class='del'>-	0x0401f7bf, 0x59300403, 0x82000d80, 0x00000032,</div><div class='del'>-	0x04020004, 0x0201f800, 0x001020b2, 0x0401f7b8,</div><div class='del'>-	0x59300403, 0x82000d80, 0x00000022, 0x04000887,</div><div class='del'>-	0x0401f7b3, 0x4933c857, 0x4803c857, 0x0c01f001,</div><div class='del'>-	0x00107da0, 0x00107da0, 0x00107da0, 0x00107da0,</div><div class='del'>-	0x00107da0, 0x00107da0, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d83, 0x00107da0,</div><div class='del'>-	0x00107d7a, 0x00107da0, 0x00107da0, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107da0, 0x00107da0, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d7a, 0x00107d91, 0x00107da0,</div><div class='del'>-	0x00107d7a, 0x00107d8a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107d8a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107da0, 0x00107d8d, 0x00107d7a,</div><div class='del'>-	0x00107d7c, 0x00107da0, 0x00107d7a, 0x00107da0,</div><div class='del'>-	0x00107da0, 0x00107d7a, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107da0, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107da0, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107da0, 0x00107d7a, 0x00107d7a,</div><div class='del'>-	0x00107d7a, 0x00107da0, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x0201f800, 0x00020381,</div><div class='del'>-	0x5c025800, 0x0201f000, 0x000208b4, 0x4a026203,</div><div class='del'>-	0x00000005, 0x59a80039, 0x48026205, 0x59a80037,</div><div class='del'>-	0x48026206, 0x1c01f000, 0x5930081e, 0x49780a05,</div><div class='del'>-	0x0401f014, 0x0201f800, 0x001090ec, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x0201f800, 0x001020b2, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x04000005, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x0201f000, 0x00106982,</div><div class='del'>-	0x4933c857, 0x4a026203, 0x00000002, 0x59a80037,</div><div class='del'>-	0x48026206, 0x1c01f000, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x0400002a, 0x4d2c0000, 0x0201f800,</div><div class='del'>-	0x00109360, 0x0402000a, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000031, 0x42000800, 0x00000004, 0x0201f800,</div><div class='del'>-	0x00109204, 0x5c028000, 0x0401f01c, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000010, 0x04000004, 0x82040580,</div><div class='del'>-	0x00000011, 0x0402000a, 0x4a025a06, 0x00000031,</div><div class='del'>-	0x4a02580d, 0x00000004, 0x4a02580e, 0x000000ff,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0401f00c, 0x592c0404,</div><div class='del'>-	0x8c00051e, 0x04000009, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x4a025805, 0x01000000, 0x5931d821, 0x58ef400b,</div><div class='del'>-	0x58ec0009, 0x0801f800, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59340400, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82003480, 0x0000000c, 0x02021800, 0x00100615,</div><div class='del'>-	0x59303403, 0x82180d80, 0x0000004d, 0x02000000,</div><div class='del'>-	0x00109154, 0x82180d80, 0x00000033, 0x02000000,</div><div class='del'>-	0x0010910f, 0x82180d80, 0x00000028, 0x02000000,</div><div class='del'>-	0x00108f46, 0x82180d80, 0x00000029, 0x02000000,</div><div class='del'>-	0x00108f5a, 0x82180d80, 0x0000001f, 0x02000000,</div><div class='del'>-	0x001078af, 0x82180d80, 0x00000055, 0x02000000,</div><div class='del'>-	0x00107888, 0x82180d80, 0x00000000, 0x0400058e,</div><div class='del'>-	0x82180d80, 0x00000022, 0x02000000, 0x001078dc,</div><div class='del'>-	0x82180d80, 0x00000035, 0x02000000, 0x001079d7,</div><div class='del'>-	0x82180d80, 0x00000039, 0x04000536, 0x82180d80,</div><div class='del'>-	0x0000003d, 0x02000000, 0x0010790c, 0x82180d80,</div><div class='del'>-	0x00000044, 0x02000000, 0x00107949, 0x82180d80,</div><div class='del'>-	0x00000049, 0x02000000, 0x0010799e, 0x82180d80,</div><div class='del'>-	0x00000041, 0x02000000, 0x0010798a, 0x82180d80,</div><div class='del'>-	0x00000043, 0x02000000, 0x001092a5, 0x82180d80,</div><div class='del'>-	0x00000051, 0x02000000, 0x0010930b, 0x82180d80,</div><div class='del'>-	0x00000004, 0x04020003, 0x42000000, 0x00000001,</div><div class='del'>-	0x83380d80, 0x00000015, 0x04000006, 0x83380d80,</div><div class='del'>-	0x00000016, 0x02020000, 0x001076fb, 0x0401f226,</div><div class='del'>-	0x4d2c0000, 0x4d3c0000, 0x0c01f804, 0x5c027800,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x00107e42, 0x00107e46,</div><div class='del'>-	0x00107e42, 0x00107ebb, 0x00107e42, 0x00107fc7,</div><div class='del'>-	0x00108060, 0x00107e42, 0x00107e42, 0x00108029,</div><div class='del'>-	0x00107e42, 0x0010803b, 0x4933c857, 0x497a6007,</div><div class='del'>-	0x59300808, 0x58040000, 0x4a000a04, 0x00000103,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x4933c857, 0x40000000,</div><div class='del'>-	0x40000000, 0x1c01f000, 0x4933c857, 0x59a80016,</div><div class='del'>-	0x82000580, 0x00000074, 0x0402005c, 0x0201f800,</div><div class='del'>-	0x0010a0b1, 0x04020016, 0x0401f85c, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x0400000c, 0x0201f800, 0x00109360,</div><div class='del'>-	0x04020009, 0x41780800, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000000, 0x0201f800, 0x00109204, 0x5c028000,</div><div class='del'>-	0x0401f003, 0x0201f800, 0x00101e1b, 0x0201f800,</div><div class='del'>-	0x00104711, 0x0201f000, 0x000208b4, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000007, 0x0201f800, 0x00109360,</div><div class='del'>-	0x04020004, 0x0401ff3d, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x59340200,</div><div class='del'>-	0x84000558, 0x48026a00, 0x42003000, 0x00000003,</div><div class='del'>-	0x0201f800, 0x0010a766, 0x4d300000, 0x0201f800,</div><div class='del'>-	0x00020892, 0x02000800, 0x00100615, 0x49366009,</div><div class='del'>-	0x497a6008, 0x4a026406, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000001, 0x0201f800, 0x0010393e, 0x04000011,</div><div class='del'>-	0x4a026406, 0x00000004, 0x4a026203, 0x00000007,</div><div class='del'>-	0x4a026420, 0x00000001, 0x42003000, 0x00000001,</div><div class='del'>-	0x4d400000, 0x42028000, 0x00000029, 0x41782800,</div><div class='del'>-	0x0201f800, 0x0010a250, 0x5c028000, 0x0401f009,</div><div class='del'>-	0x42000800, 0x0000000b, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x4a026203, 0x00000001, 0x0201f800, 0x00106470,</div><div class='del'>-	0x5c026000, 0x0401ff05, 0x0201f800, 0x00101e1b,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x0401ff00, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f0de, 0x4933c857, 0x59340200,</div><div class='del'>-	0x8c000500, 0x0400000d, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x5c027800, 0x0201f800,</div><div class='del'>-	0x0010393e, 0x04000005, 0x42000800, 0x00000006,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x59a80816, 0x82040580, 0x00000074, 0x0400000e,</div><div class='del'>-	0x4807c857, 0x82040580, 0x00000100, 0x040200b7,</div><div class='del'>-	0x59cc0408, 0x4803c857, 0x8c000500, 0x040000b3,</div><div class='del'>-	0x59341403, 0x82080580, 0x000007fe, 0x04000006,</div><div class='del'>-	0x0401f0ae, 0x59341403, 0x82080580, 0x000007fe,</div><div class='del'>-	0x0402001a, 0x59a80026, 0x8c000506, 0x04000015,</div><div class='del'>-	0x59cc0000, 0x82000500, 0x000000ff, 0x59a80810,</div><div class='del'>-	0x82040d00, 0x000000ff, 0x80040580, 0x0400000d,</div><div class='del'>-	0x0201f800, 0x00101e1b, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x42000000, 0x0010b651, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4202d800, 0x00000001, 0x0201f000, 0x00103f37,</div><div class='del'>-	0x0401fa9c, 0x0401f04c, 0x0201f800, 0x00104480,</div><div class='del'>-	0x59341403, 0x82080580, 0x000007fc, 0x0402001f,</div><div class='del'>-	0x4a026802, 0x00fffffc, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000012, 0x0201f800, 0x00109360, 0x0402000f,</div><div class='del'>-	0x0401f8a9, 0x41780800, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000000, 0x0201f800, 0x00109204, 0x5c028000,</div><div class='del'>-	0x42000800, 0x00000004, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x42000800, 0x00000004,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x0201f800, 0x00101e1b,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x59a8006f, 0x8c000502,</div><div class='del'>-	0x04000011, 0x0201f800, 0x00104e0d, 0x42001000,</div><div class='del'>-	0x00000010, 0x04020009, 0x59340002, 0x82000500,</div><div class='del'>-	0x00ff0000, 0x82000580, 0x00ff0000, 0x04000006,</div><div class='del'>-	0x42001000, 0x00000008, 0x0201f800, 0x00104ada,</div><div class='del'>-	0x0402005a, 0x0201f800, 0x00108df4, 0x0400005b,</div><div class='del'>-	0x0201f800, 0x00109360, 0x04020005, 0x592c0404,</div><div class='del'>-	0x8c00051c, 0x040207c9, 0x0401f877, 0x42000800,</div><div class='del'>-	0x00000005, 0x0201f800, 0x001043c7, 0x4a026203,</div><div class='del'>-	0x00000001, 0x4a026403, 0x00000003, 0x0201f000,</div><div class='del'>-	0x00106470, 0x59cc0408, 0x8c000518, 0x04000010,</div><div class='del'>-	0x0201f800, 0x001090ab, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04000004, 0x59cc0408, 0x8c000516, 0x040207b3,</div><div class='del'>-	0x59a80026, 0x8400054a, 0x48035026, 0x59a80010,</div><div class='del'>-	0x84000570, 0x48038832, 0x0401f7ac, 0x42001000,</div><div class='del'>-	0x000000ef, 0x480b5010, 0x497b8830, 0x84081570,</div><div class='del'>-	0x480b8832, 0x59c40802, 0x84040d4c, 0x48078802,</div><div class='del'>-	0x0201f800, 0x001090d5, 0x59a80026, 0x84000548,</div><div class='del'>-	0x48035026, 0x0201f800, 0x0010a1ec, 0x0402079b,</div><div class='del'>-	0x59a80026, 0x8400054c, 0x48035026, 0x42000800,</div><div class='del'>-	0x00000006, 0x0201f800, 0x001043c7, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x42000000, 0x000000e8,</div><div class='del'>-	0x0201f800, 0x001059b9, 0x02000800, 0x001043fc,</div><div class='del'>-	0x02020800, 0x00100615, 0x49366009, 0x59340200,</div><div class='del'>-	0x8400051a, 0x48026a00, 0x42000800, 0x00000003,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x4a026406, 0x00000001,</div><div class='del'>-	0x4a026203, 0x00000001, 0x4a026403, 0x00000002,</div><div class='del'>-	0x0201f000, 0x00106470, 0x0401fe2c, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f00a, 0x599c0017, 0x8c00050a,</div><div class='del'>-	0x040007ab, 0x42000800, 0x00000004, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x0201f000, 0x000208b4, 0x4933c857,</div><div class='del'>-	0x80003540, 0x04000005, 0x42000800, 0x00000007,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x801831c0, 0x0402000e,</div><div class='del'>-	0x59302008, 0x801021c0, 0x04000004, 0x58100404,</div><div class='del'>-	0x8c00051e, 0x04020008, 0x59341c03, 0x42002000,</div><div class='del'>-	0x00000004, 0x42003000, 0x00000012, 0x0201f800,</div><div class='del'>-	0x001038c7, 0x0201f800, 0x00101e1b, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4c5c0000, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x0201f800, 0x00105439, 0x5c025800, 0x59cc0008,</div><div class='del'>-	0x48002805, 0x59cc0009, 0x48002806, 0x49782807,</div><div class='del'>-	0x49782808, 0x49782809, 0x4978280a, 0x59cc0013,</div><div class='del'>-	0x8c00053e, 0x04000009, 0x59cc0414, 0x900001c0,</div><div class='del'>-	0x59ccbc15, 0x805c0540, 0x48002807, 0x59cc0416,</div><div class='del'>-	0x900001c0, 0x48002808, 0x59cc0017, 0x8c00053e,</div><div class='del'>-	0x04000009, 0x59cc0418, 0x900001c0, 0x59ccbc19,</div><div class='del'>-	0x805c0540, 0x48002809, 0x59cc041a, 0x900001c0,</div><div class='del'>-	0x4800280a, 0x5c00b800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x59a80016, 0x82000580, 0x00000014, 0x04020048,</div><div class='del'>-	0x59a8006f, 0x8c000502, 0x04000015, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x42001000, 0x00000010, 0x04020009,</div><div class='del'>-	0x59340002, 0x82000500, 0x00ff0000, 0x82000580,</div><div class='del'>-	0x00ff0000, 0x0400000a, 0x42001000, 0x00000008,</div><div class='del'>-	0x0201f800, 0x00104ada, 0x04000005, 0x59a8006f,</div><div class='del'>-	0x8400054c, 0x4803506f, 0x0401f031, 0x836c0580,</div><div class='del'>-	0x00000003, 0x0402000b, 0x59300008, 0x80000540,</div><div class='del'>-	0x04020008, 0x59341c03, 0x42002000, 0x00000006,</div><div class='del'>-	0x42003000, 0x00000013, 0x0201f800, 0x001038c7,</div><div class='del'>-	0x0201f800, 0x001044e1, 0x0401feb8, 0x0401fa1d,</div><div class='del'>-	0x0402001f, 0x59340404, 0x80000540, 0x0400001c,</div><div class='del'>-	0x42000800, 0x00000006, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x04000011, 0x0201f800,</div><div class='del'>-	0x00109360, 0x0402000a, 0x41780800, 0x4d400000,</div><div class='del'>-	0x42028000, 0x00000000, 0x0201f800, 0x00109204,</div><div class='del'>-	0x5c028000, 0x0201f000, 0x000208b4, 0x4a025a04,</div><div class='del'>-	0x00000103, 0x4a025805, 0x02000000, 0x0201f800,</div><div class='del'>-	0x00101e1b, 0x0201f000, 0x000208b4, 0x0201f800,</div><div class='del'>-	0x00104a83, 0x0201f800, 0x00108df4, 0x04000007,</div><div class='del'>-	0x0201f800, 0x00109360, 0x04020004, 0x0401fd8b,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x0401fd88, 0x80000580,</div><div class='del'>-	0x59a8006f, 0x8c00050c, 0x04000005, 0x8400050c,</div><div class='del'>-	0x4803506f, 0x82000540, 0x00000001, 0x0401ff60,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x59a80016, 0x82000580,</div><div class='del'>-	0x00000014, 0x0402000b, 0x42000800, 0x0000000b,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x4a026203, 0x00000001,</div><div class='del'>-	0x4a026403, 0x00000001, 0x0201f000, 0x00106470,</div><div class='del'>-	0x42000000, 0x00000001, 0x0401f74d, 0x4933c857,</div><div class='del'>-	0x40003000, 0x59a80016, 0x82000580, 0x00000004,</div><div class='del'>-	0x0402000a, 0x82183580, 0x0000000b, 0x04020005,</div><div class='del'>-	0x42000800, 0x00000007, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x42000000, 0x00000001,</div><div class='del'>-	0x0401f73b, 0x4803c857, 0x4d2c0000, 0x4d3c0000,</div><div class='del'>-	0x0c01f804, 0x5c027800, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x00107e42, 0x0010806f, 0x00107e42, 0x001080c4,</div><div class='del'>-	0x00107e42, 0x00108132, 0x00108060, 0x00107e42,</div><div class='del'>-	0x00107e42, 0x00108152, 0x00107e42, 0x00108162,</div><div class='del'>-	0x4933c857, 0x4d1c0000, 0x59301403, 0x82080580,</div><div class='del'>-	0x00000003, 0x04000008, 0x82081580, 0x0000001e,</div><div class='del'>-	0x04020003, 0x0201f800, 0x000208b4, 0x5c023800,</div><div class='del'>-	0x1c01f000, 0x0401ff5a, 0x0401f7fd, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400000b, 0x0201f800,</div><div class='del'>-	0x00109360, 0x04020008, 0x4200b000, 0x00000002,</div><div class='del'>-	0x0201f800, 0x00109346, 0x0401fd2c, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x0401f8f5, 0x04020030, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x417a7800, 0x0201f800,</div><div class='del'>-	0x00101de2, 0x42000000, 0x0010b663, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x59340200, 0x84000558, 0x48026a00,</div><div class='del'>-	0x4a026403, 0x00000002, 0x42003000, 0x00000003,</div><div class='del'>-	0x0201f800, 0x0010a766, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04000011, 0x4d400000, 0x41782800, 0x42003000,</div><div class='del'>-	0x00000005, 0x42028000, 0x00000029, 0x0201f800,</div><div class='del'>-	0x0010a250, 0x5c028000, 0x4a026203, 0x00000007,</div><div class='del'>-	0x4a026406, 0x00000004, 0x4a026420, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x42000800, 0x00000003, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026203, 0x00000001, 0x0201f800,</div><div class='del'>-	0x00106470, 0x0401f7f7, 0x59cc0407, 0x82000580,</div><div class='del'>-	0x00000009, 0x0402000a, 0x59340412, 0x82000500,</div><div class='del'>-	0x000000ff, 0x0400000c, 0x80000040, 0x48026c12,</div><div class='del'>-	0x4a026206, 0x0000000a, 0x0401f7ea, 0x59cc0207,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x82000580, 0x00001900,</div><div class='del'>-	0x040007c2, 0x0401fce5, 0x80000580, 0x0401f6c4,</div><div class='del'>-	0x4933c857, 0x59a80032, 0x80000540, 0x04000015,</div><div class='del'>-	0x59340403, 0x82000580, 0x000007fe, 0x04020011,</div><div class='del'>-	0x59a80010, 0x80000000, 0x48035010, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x42000800, 0x00000003,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x4a026203, 0x00000001,</div><div class='del'>-	0x4a026403, 0x00000002, 0x0201f000, 0x00106470,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x04000011, 0x0201f800,</div><div class='del'>-	0x00109360, 0x0402000e, 0x4c580000, 0x4200b000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00109346, 0x5c00b000,</div><div class='del'>-	0x0401fcbe, 0x42000800, 0x00000007, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x0201f000, 0x000208b4, 0x0401fcb7,</div><div class='del'>-	0x59cc3407, 0x82183500, 0x000000ff, 0x82180580,</div><div class='del'>-	0x00000005, 0x0400001c, 0x82180580, 0x0000000b,</div><div class='del'>-	0x04000016, 0x59cc0207, 0x82000500, 0x0000ff00,</div><div class='del'>-	0x04020004, 0x82180580, 0x00000009, 0x04000012,</div><div class='del'>-	0x82000580, 0x00001900, 0x0402000c, 0x82180580,</div><div class='del'>-	0x00000009, 0x0400000c, 0x42000800, 0x00000004,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x0201f800, 0x00101e1b,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x42000000, 0x00000001,</div><div class='del'>-	0x0401f677, 0x0201f800, 0x00108df4, 0x59325808,</div><div class='del'>-	0x04000008, 0x592c0204, 0x82000580, 0x00000139,</div><div class='del'>-	0x040007f6, 0x592c0404, 0x8c00051e, 0x040207f3,</div><div class='del'>-	0x59340403, 0x82000580, 0x000007fe, 0x04020007,</div><div class='del'>-	0x59a80026, 0x84000540, 0x48035026, 0x0201f800,</div><div class='del'>-	0x00104059, 0x0401f7e9, 0x417a7800, 0x0201f800,</div><div class='del'>-	0x00101de2, 0x42003000, 0x00000005, 0x0201f800,</div><div class='del'>-	0x0010a766, 0x42000000, 0x0010b663, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0401f7dd, 0x4933c857, 0x0401f84d,</div><div class='del'>-	0x0402000b, 0x42000800, 0x00000005, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000003, 0x0201f000, 0x00106470, 0x42000800,</div><div class='del'>-	0x00000004, 0x0201f800, 0x001043c7, 0x0201f800,</div><div class='del'>-	0x00109360, 0x0402000a, 0x4c580000, 0x4200b000,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00109346, 0x5c00b000,</div><div class='del'>-	0x0401fc5a, 0x0201f000, 0x000208b4, 0x0401fc57,</div><div class='del'>-	0x80000580, 0x0401f636, 0x4933c857, 0x0401f82d,</div><div class='del'>-	0x0402000b, 0x42000800, 0x00000009, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000005, 0x0201f000, 0x00106470, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f626, 0x4933c857, 0x0401f81d,</div><div class='del'>-	0x0402000b, 0x42000800, 0x0000000b, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000001, 0x0201f000, 0x00106470, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f616, 0x4933c857, 0x59cc0407,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020009, 0x59cc0207,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x82000d80, 0x00002a00,</div><div class='del'>-	0x04000003, 0x82000d80, 0x00001e00, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x4d400000, 0x4c580000, 0x59a80026,</div><div class='del'>-	0x82000540, 0x00000003, 0x48035026, 0x0401f85c,</div><div class='del'>-	0x04000038, 0x4d340000, 0x4d440000, 0x59a80026,</div><div class='del'>-	0x84000552, 0x48035026, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x0400000c, 0x42028000, 0x0000002a, 0x42028800,</div><div class='del'>-	0x0000ffff, 0x42003000, 0x00000002, 0x0201f800,</div><div class='del'>-	0x0010a258, 0x59a80805, 0x84040d44, 0x48075005,</div><div class='del'>-	0x42028000, 0x0000002a, 0x4d3c0000, 0x42027800,</div><div class='del'>-	0x00000200, 0x0201f800, 0x00101d90, 0x5c027800,</div><div class='del'>-	0x42000000, 0x0010b663, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0201f800, 0x00101bf0, 0x4200b000, 0x00000010,</div><div class='del'>-	0x42028800, 0x000007f0, 0x4d2c0000, 0x83440580,</div><div class='del'>-	0x000007fe, 0x04000003, 0x0201f800, 0x00104451,</div><div class='del'>-	0x81468800, 0x8058b040, 0x040207f9, 0x5c025800,</div><div class='del'>-	0x59cc0408, 0x8c00051e, 0x04000004, 0x59a80026,</div><div class='del'>-	0x84000512, 0x48035026, 0x5c028800, 0x5c026800,</div><div class='del'>-	0x0201f800, 0x00104480, 0x4a026802, 0x00fffffe,</div><div class='del'>-	0x59a80826, 0x84040d50, 0x59cc0013, 0x8c00053e,</div><div class='del'>-	0x04000003, 0x8c000536, 0x04000004, 0x59cc0017,</div><div class='del'>-	0x8c000536, 0x04020002, 0x84040d10, 0x48075026,</div><div class='del'>-	0x59cc0800, 0x82040d00, 0x00ffffff, 0x48075010,</div><div class='del'>-	0x80040110, 0x4803501d, 0x48038881, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x04000007, 0x59cc0009, 0x48035035,</div><div class='del'>-	0x59cc000a, 0x48035036, 0x0201f800, 0x001090ab,</div><div class='del'>-	0x5c00b000, 0x5c028000, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4c580000, 0x59a80010, 0x82000500, 0x00ffff00,</div><div class='del'>-	0x04000022, 0x59cc1000, 0x82081500, 0x00ffff00,</div><div class='del'>-	0x80080580, 0x04000004, 0x42000000, 0x0010b639,</div><div class='del'>-	0x0401f016, 0x83cc1400, 0x0000000b, 0x4200b000,</div><div class='del'>-	0x00000002, 0x83341c00, 0x00000006, 0x0401f904,</div><div class='del'>-	0x04000004, 0x42000000, 0x0010b63a, 0x0401f00b,</div><div class='del'>-	0x83cc1400, 0x0000000d, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83341c00, 0x00000008, 0x0401f8f9, 0x04000007,</div><div class='del'>-	0x42000000, 0x0010b63b, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c00b000, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59cc0206, 0x82000580, 0x00000014,</div><div class='del'>-	0x04020016, 0x59cc0407, 0x82000580, 0x00000800,</div><div class='del'>-	0x04020012, 0x59cc0207, 0x8c00051a, 0x0400000d,</div><div class='del'>-	0x82000500, 0x00000f00, 0x82000580, 0x00000100,</div><div class='del'>-	0x04020008, 0x59cc020a, 0x8c000508, 0x04020003,</div><div class='del'>-	0x8c00050a, 0x04000003, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4943c857, 0x493fc857, 0x4c5c0000, 0x4d300000,</div><div class='del'>-	0x4d340000, 0x4d2c0000, 0x4d380000, 0x4130b800,</div><div class='del'>-	0x42026000, 0x0010cfc0, 0x59a8000e, 0x81640480,</div><div class='del'>-	0x040210c1, 0x8d3e7d12, 0x04000004, 0x405c0000,</div><div class='del'>-	0x81300580, 0x040000b7, 0x59300406, 0x82000c80,</div><div class='del'>-	0x00000012, 0x04021015, 0x59326809, 0x0c01f001,</div><div class='del'>-	0x001082f4, 0x0010825f, 0x00108278, 0x00108283,</div><div class='del'>-	0x00108258, 0x00108271, 0x001082ac, 0x001082f4,</div><div class='del'>-	0x00108256, 0x001082c0, 0x001082cf, 0x00108256,</div><div class='del'>-	0x00108256, 0x00108256, 0x00108256, 0x001082f4,</div><div class='del'>-	0x001082e5, 0x001082dd, 0x0201f800, 0x00100615,</div><div class='del'>-	0x8d3e7d18, 0x04000003, 0x8d3e7d16, 0x04000004,</div><div class='del'>-	0x59300420, 0x8c000500, 0x04020096, 0x59300403,</div><div class='del'>-	0x82000580, 0x00000043, 0x04000092, 0x0201f800,</div><div class='del'>-	0x00108ef1, 0x02000800, 0x00101e1b, 0x0201f800,</div><div class='del'>-	0x00108f05, 0x02000800, 0x00107da6, 0x8d3e7d06,</div><div class='del'>-	0x04000086, 0x0201f800, 0x0010909d, 0x04000085,</div><div class='del'>-	0x0401f082, 0x8d3e7d18, 0x04000003, 0x8d3e7d16,</div><div class='del'>-	0x04000004, 0x59300420, 0x8c000500, 0x0402007d,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108df4, 0x04000077,</div><div class='del'>-	0x49425a06, 0x497a5c09, 0x0201f800, 0x00020381,</div><div class='del'>-	0x0201f800, 0x00108ee7, 0x0401f070, 0x813669c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x8d3e7d06, 0x04000004,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x0402006a, 0x59300004,</div><div class='del'>-	0x8400055c, 0x48026004, 0x59300203, 0x82000580,</div><div class='del'>-	0x00000004, 0x02000800, 0x00100ee4, 0x59325808,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400005c, 0x4a025a04,</div><div class='del'>-	0x00000103, 0x59300402, 0x48025c06, 0x592c0408,</div><div class='del'>-	0x8c000512, 0x04000006, 0x4d2c0000, 0x592e5809,</div><div class='del'>-	0x0201f800, 0x00100843, 0x5c025800, 0x49425a06,</div><div class='del'>-	0x497a5c09, 0x0201f800, 0x00109365, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00108ee7, 0x0401f047,</div><div class='del'>-	0x8c000518, 0x04000047, 0x59300203, 0x82000580,</div><div class='del'>-	0x00000004, 0x02000800, 0x00100ee4, 0x59325808,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400003c, 0x49425a06,</div><div class='del'>-	0x497a5c09, 0x0201f800, 0x0010a4ae, 0x0201f800,</div><div class='del'>-	0x00109365, 0x0201f800, 0x00020381, 0x0401f033,</div><div class='del'>-	0x0201f800, 0x0010600e, 0x04000032, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000004, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00100ee4, 0x0401f02b, 0x42027000, 0x00000047,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x0401f026, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000004, 0x02000800, 0x00100ee4,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108df4, 0x0400001b,</div><div class='del'>-	0x49425a06, 0x497a5c09, 0x0201f800, 0x00020381,</div><div class='del'>-	0x0401f016, 0x833c0500, 0x00001800, 0x04000015,</div><div class='del'>-	0x8d3e7d16, 0x04020013, 0x59325817, 0x0201f800,</div><div class='del'>-	0x00100843, 0x59300203, 0x82000580, 0x00000004,</div><div class='del'>-	0x02000800, 0x00100ee4, 0x59325808, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000005, 0x49425a06, 0x497a5c09,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f800, 0x00107698,</div><div class='del'>-	0x83326400, 0x00000024, 0x41580000, 0x81300480,</div><div class='del'>-	0x0400173e, 0x5c027000, 0x5c025800, 0x5c026800,</div><div class='del'>-	0x5c026000, 0x5c00b800, 0x1c01f000, 0x5c000000,</div><div class='del'>-	0x4c000000, 0x4803c857, 0x480bc857, 0x480fc857,</div><div class='del'>-	0x485bc857, 0x50080800, 0x500c0000, 0x80042580,</div><div class='del'>-	0x04020007, 0x80081000, 0x800c1800, 0x8058b040,</div><div class='del'>-	0x040207f9, 0x80000580, 0x1c01f000, 0x4803c857,</div><div class='del'>-	0x4807c857, 0x480bc857, 0x480fc857, 0x80040480,</div><div class='del'>-	0x04001006, 0x42000000, 0x00000001, 0x82040d40,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x41780000, 0x0401f7fc,</div><div class='del'>-	0x83380480, 0x00000053, 0x02021800, 0x00100615,</div><div class='del'>-	0x83380480, 0x0000004b, 0x02001800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x0010832f, 0x0010832f, 0x0010832f,</div><div class='del'>-	0x0010832f, 0x0010832d, 0x0010832d, 0x0010832d,</div><div class='del'>-	0x0010832f, 0x0201f800, 0x00100615, 0x493bc857,</div><div class='del'>-	0x4a026203, 0x0000000d, 0x493a6403, 0x42000800,</div><div class='del'>-	0x80000000, 0x0201f000, 0x00020855, 0x83380580,</div><div class='del'>-	0x00000013, 0x04020008, 0x59300403, 0x82000580,</div><div class='del'>-	0x00000050, 0x02020800, 0x00100615, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4933c857, 0x83380580, 0x00000027,</div><div class='del'>-	0x04020030, 0x4933c857, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x00101de2,</div><div class='del'>-	0x5c027800, 0x42000000, 0x0010b663, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x4d2c0000, 0x59325808, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x492fc857, 0x0400000d, 0x4a025a04,</div><div class='del'>-	0x00000103, 0x59300c02, 0x48065c06, 0x4a025a06,</div><div class='del'>-	0x00000029, 0x497a5c09, 0x592c0c08, 0x84040d50,</div><div class='del'>-	0x48065c08, 0x0201f800, 0x00020381, 0x5c025800,</div><div class='del'>-	0x42003000, 0x00000015, 0x41782800, 0x42002000,</div><div class='del'>-	0x00000003, 0x4d400000, 0x4d440000, 0x59368c03,</div><div class='del'>-	0x42028000, 0x00000029, 0x0201f800, 0x0010962a,</div><div class='del'>-	0x5c028800, 0x5c028000, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x83380580, 0x00000014, 0x0402000d, 0x59300403,</div><div class='del'>-	0x82000c80, 0x00000053, 0x02021800, 0x00100615,</div><div class='del'>-	0x82000480, 0x00000040, 0x02001800, 0x00100615,</div><div class='del'>-	0x4933c857, 0x4803c857, 0x0c01f00e, 0x83380580,</div><div class='del'>-	0x00000053, 0x0400000a, 0x83380580, 0x00000048,</div><div class='del'>-	0x02020800, 0x00100615, 0x59300403, 0x82000580,</div><div class='del'>-	0x00000050, 0x02020800, 0x00100615, 0x1c01f000,</div><div class='del'>-	0x001083a5, 0x001083a3, 0x001083a3, 0x001083a3,</div><div class='del'>-	0x001083a3, 0x001083a3, 0x001083a3, 0x001083a3,</div><div class='del'>-	0x001083a3, 0x001083a3, 0x001083a3, 0x001083bc,</div><div class='del'>-	0x001083bc, 0x001083bc, 0x001083bc, 0x001083a3,</div><div class='del'>-	0x001083bc, 0x001083a3, 0x001083bc, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4933c857, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x02000000, 0x000208b4,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x59300402, 0x48025c06, 0x4a025a06, 0x00000006,</div><div class='del'>-	0x497a5c09, 0x0201f800, 0x00020381, 0x5c025800,</div><div class='del'>-	0x0201f800, 0x00108ee7, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x001068f6, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x0201f800, 0x00100615, 0x5930001c,</div><div class='del'>-	0x800001c0, 0x02020800, 0x0010961a, 0x59300004,</div><div class='del'>-	0x8c00053e, 0x04020029, 0x59325808, 0x592c0c08,</div><div class='del'>-	0x59cc2a08, 0x82141d00, 0x00000c00, 0x04000002,</div><div class='del'>-	0x59cc1809, 0x84040d58, 0x48065c08, 0x82143500,</div><div class='del'>-	0x00000fff, 0x04020027, 0x59340200, 0x8c00050e,</div><div class='del'>-	0x04020080, 0x0201f800, 0x00020962, 0x04020006,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x59300811, 0x800409c0,</div><div class='del'>-	0x04020951, 0x4a025a04, 0x00000103, 0x48065807,</div><div class='del'>-	0x480e580a, 0x48165c09, 0x59300c02, 0x48065c06,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f800, 0x00104801,</div><div class='del'>-	0x59cc0208, 0x8c000518, 0x02020000, 0x00108f88,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x0201f800, 0x00106cb4,</div><div class='del'>-	0x040007d6, 0x4d3c0000, 0x42027800, 0x00000002,</div><div class='del'>-	0x0201f800, 0x00108997, 0x5c027800, 0x0401f7cf,</div><div class='del'>-	0x4817c857, 0x480fc857, 0x82180500, 0x000000ff,</div><div class='del'>-	0x0400000e, 0x592c0204, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82000580, 0x00000048, 0x04020008, 0x592c0407,</div><div class='del'>-	0x800001c0, 0x04000005, 0x0201f800, 0x0010950b,</div><div class='del'>-	0x0201f000, 0x00109553, 0x82180d00, 0x00000c00,</div><div class='del'>-	0x04000004, 0x59340200, 0x8c00050e, 0x04020032,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x41782000, 0x8c183510,</div><div class='del'>-	0x04000007, 0x59cc000c, 0x82000500, 0x000000ff,</div><div class='del'>-	0x04000002, 0x4803c857, 0x59cc200b, 0x4812580c,</div><div class='del'>-	0x41780000, 0x8c183512, 0x04000002, 0x59cc000a,</div><div class='del'>-	0x4802580b, 0x80100c00, 0x040007b8, 0x82041480,</div><div class='del'>-	0x0000001d, 0x04001006, 0x592c0404, 0x8c00051e,</div><div class='del'>-	0x0400000e, 0x42000800, 0x0000001c, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x83cca400, 0x0000000c, 0x832cac00,</div><div class='del'>-	0x0000000d, 0x0201f800, 0x00108953, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x0401f7a5, 0x59300011, 0x59301402,</div><div class='del'>-	0x480a5c06, 0x48025807, 0x480e580a, 0x48165c09,</div><div class='del'>-	0x0201f800, 0x001088fc, 0x0201f800, 0x00108938,</div><div class='del'>-	0x0401f7a6, 0x592c020a, 0x8c000502, 0x040007cd,</div><div class='del'>-	0x592c0208, 0x8c00050e, 0x040207ca, 0x59300011,</div><div class='del'>-	0x800c0d80, 0x040007c7, 0x4803c857, 0x480fc857,</div><div class='del'>-	0x8c183514, 0x02000000, 0x00108fc6, 0x80000540,</div><div class='del'>-	0x040007c0, 0x4807c856, 0x0201f000, 0x00108fc6,</div><div class='del'>-	0x592c020a, 0x8c000502, 0x04000782, 0x59300011,</div><div class='del'>-	0x800001c0, 0x0400077f, 0x592c0208, 0x8c00050e,</div><div class='del'>-	0x0402077c, 0x0201f000, 0x00108fc6, 0x59cc2006,</div><div class='del'>-	0x59cc2807, 0x0401f037, 0x0401f036, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x5930001c, 0x800001c0, 0x02020800,</div><div class='del'>-	0x0010961a, 0x59325808, 0x592c0c08, 0x41782800,</div><div class='del'>-	0x41781800, 0x84040d58, 0x48065c08, 0x41783000,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x0402001a, 0x0201f800,</div><div class='del'>-	0x00020962, 0x04020007, 0x4a025a06, 0x00000000,</div><div class='del'>-	0x59300811, 0x4807c857, 0x800409c0, 0x040208b2,</div><div class='del'>-	0x4a025a04, 0x00000103, 0x48065807, 0x480e580a,</div><div class='del'>-	0x48165c09, 0x4933c857, 0x59300c02, 0x48065c06,</div><div class='del'>-	0x0201f800, 0x00109365, 0x0201f800, 0x00020381,</div><div class='del'>-	0x0201f800, 0x00104801, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x592c020a, 0x8c000502, 0x040007e8, 0x59300011,</div><div class='del'>-	0x4803c857, 0x800001c0, 0x040007e4, 0x592c0208,</div><div class='del'>-	0x8c00050e, 0x040207e1, 0x0201f000, 0x00108fc6,</div><div class='del'>-	0x5930001c, 0x800001c0, 0x4c100000, 0x4c140000,</div><div class='del'>-	0x02020800, 0x0010961a, 0x5c002800, 0x5c002000,</div><div class='del'>-	0x4a026203, 0x00000002, 0x4a026403, 0x00000043,</div><div class='del'>-	0x59325808, 0x592c020a, 0x8c000502, 0x0402001c,</div><div class='del'>-	0x40100000, 0x592c080f, 0x80040c80, 0x40140000,</div><div class='del'>-	0x80040480, 0x04001018, 0x59300004, 0x8c00053e,</div><div class='del'>-	0x0402000a, 0x48126013, 0x48166011, 0x497a6205,</div><div class='del'>-	0x0201f800, 0x00100fe1, 0x0402000d, 0x59300804,</div><div class='del'>-	0x0201f000, 0x00106466, 0x4c100000, 0x4c140000,</div><div class='del'>-	0x0201f800, 0x00106cb4, 0x5c002800, 0x5c002000,</div><div class='del'>-	0x040007f1, 0x0201f000, 0x001076fb, 0x4933c857,</div><div class='del'>-	0x1c01f000, 0x4807c857, 0x40042800, 0x0401f7e7,</div><div class='del'>-	0x83380480, 0x00000058, 0x04021005, 0x83380480,</div><div class='del'>-	0x00000040, 0x04001002, 0x0c01f002, 0x1c01f000,</div><div class='del'>-	0x001084ec, 0x001084ec, 0x001084ec, 0x001084ec,</div><div class='del'>-	0x001084ec, 0x001084ec, 0x001084ec, 0x001084ec,</div><div class='del'>-	0x001084ec, 0x001084ec, 0x001084ee, 0x001084ec,</div><div class='del'>-	0x001084ec, 0x001084ec, 0x001084ec, 0x001084fb,</div><div class='del'>-	0x001084ec, 0x001084ec, 0x001084ec, 0x001084ec,</div><div class='del'>-	0x00108529, 0x001084ec, 0x001084ec, 0x001084ec,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x00106b13, 0x4a026203, 0x00000002, 0x59a80039,</div><div class='del'>-	0x48026205, 0x59300011, 0x59300815, 0x80040c80,</div><div class='del'>-	0x48066015, 0x0201f000, 0x001068c1, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x001068c1, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00101de2, 0x5c027800, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000010, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x4a025a04, 0x00000103, 0x59300402, 0x48025c06,</div><div class='del'>-	0x4a025a06, 0x00000029, 0x497a5c09, 0x592c0c08,</div><div class='del'>-	0x84040d50, 0x48065c08, 0x0201f800, 0x00020381,</div><div class='del'>-	0x5c025800, 0x42003000, 0x00000014, 0x41782800,</div><div class='del'>-	0x4d400000, 0x4d440000, 0x59368c03, 0x42002000,</div><div class='del'>-	0x00000002, 0x42028000, 0x00000029, 0x0201f800,</div><div class='del'>-	0x0010962a, 0x5c028800, 0x5c028000, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4933c857, 0x59300808, 0x49780c09,</div><div class='del'>-	0x4978080a, 0x58041408, 0x84081558, 0x48080c08,</div><div class='del'>-	0x1c01f000, 0x4807c857, 0x8c040d3e, 0x04020024,</div><div class='del'>-	0x497a5a06, 0x5930001f, 0x80000540, 0x04000018,</div><div class='del'>-	0x497a5a06, 0x4c040000, 0x4c080000, 0x4c0c0000,</div><div class='del'>-	0x4c100000, 0x4c140000, 0x40002800, 0x58141003,</div><div class='del'>-	0x40040000, 0x80081480, 0x48082803, 0x40140000,</div><div class='del'>-	0x0201f800, 0x00100d9a, 0x5c002800, 0x5c002000,</div><div class='del'>-	0x5c001800, 0x5c001000, 0x5c000800, 0x592c0206,</div><div class='del'>-	0x80000540, 0x04020009, 0x0401f005, 0x592c0408,</div><div class='del'>-	0x8c00051c, 0x04000002, 0x592c0803, 0x4807c857,</div><div class='del'>-	0x4a025a06, 0x00000015, 0x1c01f000, 0x5930001f,</div><div class='del'>-	0x80000540, 0x04000009, 0x4a025a06, 0x00000011,</div><div class='del'>-	0x5930001f, 0x4c040000, 0x0201f800, 0x00100d9a,</div><div class='del'>-	0x5c000800, 0x0401f7f5, 0x4807c856, 0x4a025a06,</div><div class='del'>-	0x00000007, 0x1c01f000, 0x83380480, 0x00000058,</div><div class='del'>-	0x04021007, 0x83380480, 0x00000040, 0x04001004,</div><div class='del'>-	0x4d2c0000, 0x0c01f803, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x00108588, 0x00108588, 0x00108588, 0x00108588,</div><div class='del'>-	0x00108588, 0x0010858a, 0x00108588, 0x00108588,</div><div class='del'>-	0x0010860d, 0x00108588, 0x00108588, 0x00108588,</div><div class='del'>-	0x00108588, 0x00108588, 0x00108588, 0x00108588,</div><div class='del'>-	0x00108588, 0x00108588, 0x00108588, 0x001086c5,</div><div class='del'>-	0x001086ee, 0x001086cd, 0x00108588, 0x001086fa,</div><div class='del'>-	0x0201f800, 0x00100615, 0x5930001c, 0x800001c0,</div><div class='del'>-	0x02020800, 0x0010961a, 0x59300007, 0x8c00050e,</div><div class='del'>-	0x0400007c, 0x8c000500, 0x0400006e, 0x8c00051c,</div><div class='del'>-	0x04000009, 0x84000500, 0x48026007, 0x59325808,</div><div class='del'>-	0x592c3c08, 0x841c3d58, 0x481e5c08, 0x0201f000,</div><div class='del'>-	0x00020914, 0x59325808, 0x592c3c08, 0x841c3d58,</div><div class='del'>-	0x59300007, 0x8c00051c, 0x040207f3, 0x481e5c08,</div><div class='del'>-	0x42000000, 0x00000005, 0x40000000, 0x80000040,</div><div class='del'>-	0x040207fe, 0x59300007, 0x8c00051c, 0x040207ea,</div><div class='del'>-	0x59cc0a08, 0x592c0204, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82000580, 0x00000048, 0x0402000c, 0x497a580b,</div><div class='del'>-	0x82040500, 0x000000ff, 0x04000008, 0x592c0407,</div><div class='del'>-	0x800001c0, 0x04000005, 0x0201f800, 0x0010950b,</div><div class='del'>-	0x0201f000, 0x00100ea1, 0x48065c09, 0x41782000,</div><div class='del'>-	0x82040500, 0x00000c00, 0x04000002, 0x59cc2009,</div><div class='del'>-	0x82043500, 0x00000fff, 0x04020027, 0x481e5c08,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x801831c0, 0x02000000,</div><div class='del'>-	0x00100ea1, 0x41782000, 0x8c183510, 0x04000002,</div><div class='del'>-	0x59cc200b, 0x4812580c, 0x41780000, 0x8c183512,</div><div class='del'>-	0x04000002, 0x59cc000a, 0x4802580b, 0x80100c00,</div><div class='del'>-	0x02001800, 0x00100615, 0x02000000, 0x00100ea1,</div><div class='del'>-	0x82041480, 0x0000001d, 0x0402100c, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x83cca400, 0x0000000c, 0x832cac00,</div><div class='del'>-	0x0000000d, 0x0401fb6e, 0x5c00a800, 0x5c00a000,</div><div class='del'>-	0x0201f000, 0x00100ea1, 0x0401fb12, 0x0201f000,</div><div class='del'>-	0x00100ea1, 0x412c7800, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x02000800, 0x00100615, 0x492c7809, 0x841c3d52,</div><div class='del'>-	0x481c7c08, 0x4a025a04, 0x00000103, 0x4812580a,</div><div class='del'>-	0x48065c09, 0x583c0404, 0x583c1005, 0x583c2208,</div><div class='del'>-	0x48025c04, 0x480a5805, 0x48125a08, 0x0401f7c8,</div><div class='del'>-	0x8c000524, 0x04000794, 0x59325808, 0x4c000000,</div><div class='del'>-	0x592c0408, 0x8c00051c, 0x5c000000, 0x04020003,</div><div class='del'>-	0x4a026011, 0xffffffff, 0x84000524, 0x0401f78a,</div><div class='del'>-	0x1c01f000, 0x59a80039, 0x48026205, 0x59325808,</div><div class='del'>-	0x4a026203, 0x00000002, 0x592c2408, 0x59300807,</div><div class='del'>-	0x4933c857, 0x4807c857, 0x592c0204, 0x82000500,</div><div class='del'>-	0x000000ff, 0x82000580, 0x00000048, 0x04020004,</div><div class='del'>-	0x8c102500, 0x02020000, 0x00109553, 0x4a025a06,</div><div class='del'>-	0x00000000, 0x8c040d1e, 0x04000027, 0x41780800,</div><div class='del'>-	0x497a5c09, 0x592c1c09, 0x59300011, 0x59341200,</div><div class='del'>-	0x497a6205, 0x8c08150e, 0x0402006e, 0x4807c857,</div><div class='del'>-	0x4806580a, 0x80000d40, 0x04020f03, 0x59300402,</div><div class='del'>-	0x48025c06, 0x48065807, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x4c040000, 0x4c0c0000, 0x4c100000, 0x0201f800,</div><div class='del'>-	0x00109365, 0x5c002000, 0x5c001800, 0x5c000800,</div><div class='del'>-	0x8c102512, 0x0402001a, 0x4c0c0000, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00104801, 0x5c001800,</div><div class='del'>-	0x8c0c1d18, 0x02000000, 0x000208b4, 0x0201f000,</div><div class='del'>-	0x00108f88, 0x4813c857, 0x8c102518, 0x0400004b,</div><div class='del'>-	0x41780800, 0x592c1c09, 0x820c0580, 0x00001000,</div><div class='del'>-	0x040007d6, 0x8c102512, 0x040007d4, 0x592c7809,</div><div class='del'>-	0x583c080a, 0x583c1c09, 0x0401f7d0, 0x4807c857,</div><div class='del'>-	0x592c7809, 0x59300402, 0x592c1404, 0x8c08151e,</div><div class='del'>-	0x0402000d, 0x592c1206, 0x48007c06, 0x48047807,</div><div class='del'>-	0x48087a06, 0x84102512, 0x48107c08, 0x4c0c0000,</div><div class='del'>-	0x0201f800, 0x00100843, 0x403e5800, 0x0401fad1,</div><div class='del'>-	0x0401f7d9, 0x48025c06, 0x48065807, 0x583c080c,</div><div class='del'>-	0x583c000b, 0x80040c00, 0x82041480, 0x0000001d,</div><div class='del'>-	0x04001006, 0x583c1001, 0x480a5801, 0x49787801,</div><div class='del'>-	0x42000800, 0x0000001c, 0x82040c00, 0x00000014,</div><div class='del'>-	0x4c0c0000, 0x4c500000, 0x4c540000, 0x823ca400,</div><div class='del'>-	0x00000008, 0x832cac00, 0x00000008, 0x4c100000,</div><div class='del'>-	0x4c3c0000, 0x0401fad2, 0x5c007800, 0x5c002000,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x84102512, 0x48125c08,</div><div class='del'>-	0x403e5800, 0x0201f800, 0x00100843, 0x42034000,</div><div class='del'>-	0x0010b2a0, 0x59a1d81e, 0x80edd9c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x48efc857, 0x58ec0009, 0x4803c857,</div><div class='del'>-	0x0801f800, 0x0401f7ac, 0x4933c857, 0x1c01f000,</div><div class='del'>-	0x59301414, 0x480bc857, 0x8c08151c, 0x0402000e,</div><div class='del'>-	0x80000540, 0x4803c857, 0x0400078d, 0x80042c80,</div><div class='del'>-	0x0402178b, 0x8c081514, 0x04020005, 0x592c080f,</div><div class='del'>-	0x4807c857, 0x80040480, 0x48026016, 0x8408155c,</div><div class='del'>-	0x480a6414, 0x59301007, 0x8408151e, 0x480a6007,</div><div class='del'>-	0x4c100000, 0x4c3c0000, 0x4d400000, 0x592e8206,</div><div class='del'>-	0x4a025a06, 0x00000001, 0x0201f800, 0x00109365,</div><div class='del'>-	0x49425a06, 0x5c028000, 0x5c007800, 0x5c002000,</div><div class='del'>-	0x497a5c09, 0x8c102512, 0x04000006, 0x4d2c0000,</div><div class='del'>-	0x403e5800, 0x0201f800, 0x00100843, 0x5c025800,</div><div class='del'>-	0x82102500, 0xffffedff, 0x48125c08, 0x0201f000,</div><div class='del'>-	0x00108fc6, 0x59325808, 0x592c0408, 0x8c000518,</div><div class='del'>-	0x04000004, 0x412df800, 0x0201f000, 0x00100eba,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x59325808, 0x497a5c09,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x59300811, 0x4807c857, 0x800409c0, 0x0402000a,</div><div class='del'>-	0x48065807, 0x59300c02, 0x48065c06, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00104801, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x59340200, 0x8c00050e, 0x04020005,</div><div class='del'>-	0x59300811, 0x0401fe4c, 0x48065807, 0x0401f7f2,</div><div class='del'>-	0x592c0208, 0x8c00050e, 0x040207fa, 0x4933c857,</div><div class='del'>-	0x0201f000, 0x00108fc6, 0x4933c857, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x02000800, 0x00100615, 0x592c020a,</div><div class='del'>-	0x8c000502, 0x02000800, 0x00100615, 0x4a026206,</div><div class='del'>-	0x00000002, 0x1c01f000, 0x5930001c, 0x800001c0,</div><div class='del'>-	0x02020800, 0x0010961a, 0x59300007, 0x4933c857,</div><div class='del'>-	0x4803c857, 0x8c00050e, 0x04000037, 0x8c000500,</div><div class='del'>-	0x04000029, 0x8c00051c, 0x0400000a, 0x84000500,</div><div class='del'>-	0x48026007, 0x59325808, 0x592c3c08, 0x481fc857,</div><div class='del'>-	0x841c3d58, 0x481e5c08, 0x0201f000, 0x00020914,</div><div class='del'>-	0x59325808, 0x592c3c08, 0x841c3d58, 0x59300007,</div><div class='del'>-	0x8c00051c, 0x040207f2, 0x481e5c08, 0x42000000,</div><div class='del'>-	0x00000005, 0x40000000, 0x80000040, 0x040207fe,</div><div class='del'>-	0x59300007, 0x8c00051c, 0x040207e9, 0x592c0204,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82000580, 0x00000048,</div><div class='del'>-	0x04020003, 0x497a580b, 0x0401f002, 0x497a5c09,</div><div class='del'>-	0x481e5c08, 0x4a025a06, 0x00000000, 0x0201f000,</div><div class='del'>-	0x00100ea1, 0x8c000524, 0x040007d9, 0x59325808,</div><div class='del'>-	0x4c000000, 0x592c0408, 0x8c00051c, 0x5c000000,</div><div class='del'>-	0x04020003, 0x4a026011, 0xffffffff, 0x84000524,</div><div class='del'>-	0x0401f7cf, 0x1c01f000, 0x4933c857, 0x41780800,</div><div class='del'>-	0x83380480, 0x00000058, 0x0402100b, 0x83380480,</div><div class='del'>-	0x00000040, 0x04001008, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x812e59c0, 0x0c020806, 0x5c025800, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x493bc857, 0x1c01f000, 0x00108763,</div><div class='del'>-	0x00108763, 0x00108763, 0x00108763, 0x00108763,</div><div class='del'>-	0x00108765, 0x00108763, 0x00108763, 0x00108763,</div><div class='del'>-	0x00108763, 0x00108763, 0x00108763, 0x00108763,</div><div class='del'>-	0x00108763, 0x00108763, 0x00108763, 0x00108763,</div><div class='del'>-	0x00108763, 0x00108763, 0x00108763, 0x0010876a,</div><div class='del'>-	0x00108763, 0x00108763, 0x00108763, 0x0201f800,</div><div class='del'>-	0x00100615, 0x59cc0a08, 0x497a5807, 0x4807c857,</div><div class='del'>-	0x82040d00, 0x00000fff, 0x59300402, 0x48025c06,</div><div class='del'>-	0x4a025a04, 0x00000103, 0x48065c09, 0x4a025a06,</div><div class='del'>-	0x00000000, 0x800409c0, 0x02000000, 0x00020381,</div><div class='del'>-	0x59cc0009, 0x4802580a, 0x82042500, 0x00000100,</div><div class='del'>-	0x04000002, 0x59cc200b, 0x4812580c, 0x82040500,</div><div class='del'>-	0x00000200, 0x04000002, 0x59cc000a, 0x4802580b,</div><div class='del'>-	0x80100c00, 0x02001800, 0x00100615, 0x02000000,</div><div class='del'>-	0x00020381, 0x82041480, 0x0000001d, 0x04001006,</div><div class='del'>-	0x592c0404, 0x8c00051e, 0x0400000e, 0x42000800,</div><div class='del'>-	0x0000001c, 0x4c500000, 0x4c540000, 0x83cca400,</div><div class='del'>-	0x0000000c, 0x832cac00, 0x0000000d, 0x0401f9c0,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x0201f000, 0x00020381,</div><div class='del'>-	0x0401f964, 0x0401f19f, 0x83380480, 0x00000093,</div><div class='del'>-	0x02021800, 0x00100615, 0x83380480, 0x00000085,</div><div class='del'>-	0x02001800, 0x00100615, 0x0c01f001, 0x001087b2,</div><div class='del'>-	0x001087b0, 0x001087b0, 0x001087b9, 0x001087b0,</div><div class='del'>-	0x001087b0, 0x001087b0, 0x001087b0, 0x001087b0,</div><div class='del'>-	0x001087b0, 0x001087b0, 0x001087b0, 0x001087b0,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4a026203, 0x00000001,</div><div class='del'>-	0x493a6403, 0x42000800, 0x80000040, 0x0201f000,</div><div class='del'>-	0x00020855, 0x4933c857, 0x59cc1404, 0x0201f800,</div><div class='del'>-	0x001091d9, 0x0400001b, 0x591c0203, 0x82000580,</div><div class='del'>-	0x00000000, 0x04000017, 0x591c0009, 0x81340580,</div><div class='del'>-	0x04020014, 0x4d300000, 0x4d1c0000, 0x411e6000,</div><div class='del'>-	0x0401f9c3, 0x5c023800, 0x5c026000, 0x0400000b,</div><div class='del'>-	0x59cc0005, 0x8c000500, 0x04020003, 0x0401f98d,</div><div class='del'>-	0x0401f003, 0x4a023a03, 0x00000002, 0x4a026403,</div><div class='del'>-	0x00000086, 0x0401f005, 0x0401f9a7, 0x040007f5,</div><div class='del'>-	0x4a026403, 0x00000087, 0x4a026203, 0x00000001,</div><div class='del'>-	0x42000800, 0x80000040, 0x0201f800, 0x00020855,</div><div class='del'>-	0x59340200, 0x8c00050e, 0x0400000d, 0x59cc1404,</div><div class='del'>-	0x0201f800, 0x001091d9, 0x04000009, 0x591c0414,</div><div class='del'>-	0x8c00051a, 0x04000006, 0x4d300000, 0x411e6000,</div><div class='del'>-	0x0201f800, 0x00108fdb, 0x5c026000, 0x1c01f000,</div><div class='del'>-	0x83380580, 0x00000013, 0x0402000b, 0x59300403,</div><div class='del'>-	0x4803c857, 0x82000d80, 0x00000086, 0x04000012,</div><div class='del'>-	0x82000d80, 0x00000087, 0x02020800, 0x00100615,</div><div class='del'>-	0x0401f00d, 0x83380580, 0x00000027, 0x04000005,</div><div class='del'>-	0x83380580, 0x00000014, 0x02020800, 0x00100615,</div><div class='del'>-	0x493bc857, 0x0201f800, 0x001068f6, 0x0201f000,</div><div class='del'>-	0x00107698, 0x4933c857, 0x0201f000, 0x00107698,</div><div class='del'>-	0x83380580, 0x00000013, 0x04020005, 0x59300403,</div><div class='del'>-	0x82000480, 0x00000085, 0x0c01f04d, 0x83380580,</div><div class='del'>-	0x00000027, 0x04020041, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x001068f6, 0x4d3c0000, 0x417a7800, 0x0201f800,</div><div class='del'>-	0x00101de2, 0x5c027800, 0x42003000, 0x00000015,</div><div class='del'>-	0x41782800, 0x42002000, 0x00000003, 0x42028000,</div><div class='del'>-	0x00000029, 0x4d400000, 0x4d440000, 0x59368c03,</div><div class='del'>-	0x0201f800, 0x0010962a, 0x5c028800, 0x5c028000,</div><div class='del'>-	0x42000000, 0x0010b663, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400000c, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x4a025a04, 0x00000103, 0x59300402,</div><div class='del'>-	0x48025c06, 0x497a5c09, 0x49425a06, 0x0201f800,</div><div class='del'>-	0x00020381, 0x5c025800, 0x0201f800, 0x00108ee7,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x83380580, 0x00000089,</div><div class='del'>-	0x04000005, 0x83380580, 0x0000008a, 0x02020000,</div><div class='del'>-	0x001076fb, 0x0201f800, 0x00106cb4, 0x02020000,</div><div class='del'>-	0x001076fb, 0x59300a03, 0x82040580, 0x0000000a,</div><div class='del'>-	0x0400002a, 0x82040580, 0x0000000c, 0x04000027,</div><div class='del'>-	0x0201f800, 0x00100615, 0x83380580, 0x00000014,</div><div class='del'>-	0x040207ea, 0x4933c857, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x42028000, 0x00000006, 0x0401f7d2, 0x0010886e,</div><div class='del'>-	0x0010886c, 0x0010886c, 0x0010886c, 0x0010886c,</div><div class='del'>-	0x0010886c, 0x00108874, 0x0010886c, 0x0010886c,</div><div class='del'>-	0x0010886c, 0x0010886c, 0x0010886c, 0x0010886c,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4933c857, 0x59a80037,</div><div class='del'>-	0x48026206, 0x4a026203, 0x0000000a, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59a80037, 0x48026206, 0x4a026203,</div><div class='del'>-	0x0000000c, 0x1c01f000, 0x83380580, 0x00000089,</div><div class='del'>-	0x04000008, 0x83380580, 0x0000008a, 0x04000032,</div><div class='del'>-	0x4933c857, 0x493bc857, 0x0201f000, 0x001076fb,</div><div class='del'>-	0x4933c857, 0x59325808, 0x59300a1d, 0x82040580,</div><div class='del'>-	0x00000003, 0x04020004, 0x0201f800, 0x00104801,</div><div class='del'>-	0x0401f00c, 0x5930021d, 0x82000580, 0x00000001,</div><div class='del'>-	0x04020008, 0x59300c16, 0x82040580, 0x00000039,</div><div class='del'>-	0x0400002c, 0x82040580, 0x00000035, 0x04000029,</div><div class='del'>-	0x4c5c0000, 0x4130b800, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000010, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x0000001e, 0x59cc0c07, 0x48066419, 0x59cc0a07,</div><div class='del'>-	0x48066219, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x42000800, 0x80000040, 0x0201f800, 0x00020855,</div><div class='del'>-	0x405e6000, 0x0201f800, 0x000208b4, 0x5c00b800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x5930021d, 0x82000580,</div><div class='del'>-	0x00000001, 0x04020040, 0x59300c16, 0x82040580,</div><div class='del'>-	0x00000035, 0x04000007, 0x82040580, 0x0000001e,</div><div class='del'>-	0x04000004, 0x82040580, 0x00000039, 0x04020036,</div><div class='del'>-	0x4933c857, 0x4c500000, 0x4d1c0000, 0x4130a000,</div><div class='del'>-	0x40067000, 0x0201f800, 0x00109183, 0x04020029,</div><div class='del'>-	0x0201f800, 0x00020892, 0x04000026, 0x491fc857,</div><div class='del'>-	0x4933c857, 0x83380580, 0x00000035, 0x04000004,</div><div class='del'>-	0x83380580, 0x00000039, 0x04020002, 0x4932381c,</div><div class='del'>-	0x493a6403, 0x4a026203, 0x00000001, 0x4a026406,</div><div class='del'>-	0x00000001, 0x58500809, 0x4807c857, 0x48066009,</div><div class='del'>-	0x58500c15, 0x4807c857, 0x48066415, 0x58500a15,</div><div class='del'>-	0x4807c857, 0x48066215, 0x58500a16, 0x4807c857,</div><div class='del'>-	0x48066216, 0x58500c19, 0x4807c857, 0x48066419,</div><div class='del'>-	0x58500a19, 0x4807c857, 0x48066219, 0x491e601e,</div><div class='del'>-	0x42000800, 0x80000040, 0x0201f800, 0x00020855,</div><div class='del'>-	0x40526000, 0x5c023800, 0x5c00a000, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x5930021d, 0x82000580, 0x00000003,</div><div class='del'>-	0x02000800, 0x00104801, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x4803c856, 0x4c500000, 0x4c540000, 0x412c7800,</div><div class='del'>-	0x4c3c0000, 0x42002800, 0x00000001, 0x82040480,</div><div class='del'>-	0x00000101, 0x04001003, 0x42000800, 0x00000100,</div><div class='del'>-	0x40043000, 0x42000800, 0x0000001c, 0x83cca400,</div><div class='del'>-	0x0000000c, 0x832cac00, 0x0000000d, 0x0401f844,</div><div class='del'>-	0x82183480, 0x0000001c, 0x592e5801, 0x812e59c0,</div><div class='del'>-	0x02020800, 0x00100843, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x04000017, 0x80142800, 0x4a025a04, 0x00000110,</div><div class='del'>-	0x497a5c04, 0x492c7801, 0x82180c80, 0x0000003d,</div><div class='del'>-	0x04021006, 0x40180800, 0x832cac00, 0x00000005,</div><div class='del'>-	0x0401f82f, 0x0401f00a, 0x82183480, 0x0000003c,</div><div class='del'>-	0x42000800, 0x0000003c, 0x412c7800, 0x832cac00,</div><div class='del'>-	0x00000005, 0x0401f826, 0x0401f7e8, 0x5c007800,</div><div class='del'>-	0x841429c0, 0x82142d40, 0x00000003, 0x48147a04,</div><div class='del'>-	0x403e5800, 0x5c00a800, 0x5c00a000, 0x1c01f000,</div><div class='del'>-	0x492fc857, 0x812e59c0, 0x0400000f, 0x4d2c0000,</div><div class='del'>-	0x4c3c0000, 0x592c7801, 0x803c79c0, 0x04000006,</div><div class='del'>-	0x497a5801, 0x0201f800, 0x00020381, 0x403e5800,</div><div class='del'>-	0x0401f7f9, 0x5c007800, 0x0201f800, 0x00020381,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4803c856, 0x4c580000,</div><div class='del'>-	0x82040c00, 0x00000003, 0x8004b104, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x5c00b000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4c580000, 0x82040c00, 0x00000003, 0x8004b104,</div><div class='del'>-	0x0201f800, 0x0010a93e, 0x5c00b000, 0x1c01f000,</div><div class='del'>-	0x591c0c06, 0x82040580, 0x00000003, 0x04000004,</div><div class='del'>-	0x82040580, 0x00000002, 0x0402001a, 0x4d300000,</div><div class='del'>-	0x4d2c0000, 0x411e6000, 0x59325808, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x0400000f, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000013, 0x592c0a08, 0x84040d54, 0x0201f800,</div><div class='del'>-	0x00104bee, 0x5c028000, 0x0201f800, 0x00109365,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f800, 0x00108ee7,</div><div class='del'>-	0x0201f800, 0x00107698, 0x5c025800, 0x5c026000,</div><div class='del'>-	0x1c01f000, 0x59cc0005, 0x8c000500, 0x0402000b,</div><div class='del'>-	0x591c0406, 0x82000580, 0x00000002, 0x04020007,</div><div class='del'>-	0x591c0c03, 0x82040580, 0x00000085, 0x04000003,</div><div class='del'>-	0x82040580, 0x0000008b, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4d3c0000, 0x42027800, 0x00000002, 0x59300406,</div><div class='del'>-	0x82000c80, 0x00000012, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f80a, 0x5c027800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x59300406, 0x82000c80, 0x00000012, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f001, 0x001089b5, 0x001089b2,</div><div class='del'>-	0x001089b2, 0x001089dd, 0x001089b0, 0x001089b2,</div><div class='del'>-	0x001089ce, 0x001089b2, 0x001089b0, 0x0010632c,</div><div class='del'>-	0x001089b2, 0x001089b2, 0x001089b2, 0x001089b0,</div><div class='del'>-	0x001089b0, 0x001089b0, 0x00108aad, 0x001089b2,</div><div class='del'>-	0x0201f800, 0x00100615, 0x4803c856, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x8d3e7d02, 0x04020016,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400000f, 0x59325808,</div><div class='del'>-	0x41780800, 0x4d400000, 0x42028000, 0x00000005,</div><div class='del'>-	0x0201f800, 0x00104bee, 0x5c028000, 0x0201f800,</div><div class='del'>-	0x00109365, 0x0201f800, 0x00108f83, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00107698, 0x82000540,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x00104728, 0x0402000c, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000010, 0x0201f800, 0x00109fc0, 0x4a026406,</div><div class='del'>-	0x00000006, 0x4a026203, 0x00000007, 0x5c028000,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x0401f8b8, 0x82000c80, 0x0000000e,</div><div class='del'>-	0x02021800, 0x00100615, 0x0c01f001, 0x001089f7,</div><div class='del'>-	0x00108a64, 0x00108a0e, 0x00108a77, 0x00108a5f,</div><div class='del'>-	0x001089f5, 0x001089f7, 0x001089f7, 0x001089fb,</div><div class='del'>-	0x001089f7, 0x001089f7, 0x001089f7, 0x001089f7,</div><div class='del'>-	0x00108a0e, 0x0201f800, 0x00100615, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x0401f7b8, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x59300406, 0x82000580,</div><div class='del'>-	0x00000003, 0x040207b4, 0x59300203, 0x82000580,</div><div class='del'>-	0x0000000d, 0x040007b0, 0x8d3e7d02, 0x040207ae,</div><div class='del'>-	0x4d340000, 0x59326809, 0x0201f800, 0x00104801,</div><div class='del'>-	0x5c026800, 0x0401f7a8, 0x59300004, 0x8400055c,</div><div class='del'>-	0x48026004, 0x0201f800, 0x00106982, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000006, 0x04000043, 0x8d3e7d02,</div><div class='del'>-	0x04020041, 0x497a621d, 0x59300203, 0x82000580,</div><div class='del'>-	0x0000000d, 0x04000003, 0x4a02621d, 0x00000003,</div><div class='del'>-	0x0401fbd4, 0x04000024, 0x4d2c0000, 0x4d400000,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108f83, 0x592c0408,</div><div class='del'>-	0x8c000512, 0x04000009, 0x4d2c0000, 0x84000512,</div><div class='del'>-	0x48025c08, 0x592c0809, 0x40065800, 0x0201f800,</div><div class='del'>-	0x00100843, 0x5c025800, 0x4d400000, 0x42028000,</div><div class='del'>-	0x00000005, 0x592c0a08, 0x8c040d0e, 0x04000004,</div><div class='del'>-	0x42028000, 0x00000002, 0x0401f001, 0x0201f800,</div><div class='del'>-	0x00104bee, 0x5c028000, 0x0201f800, 0x00109365,</div><div class='del'>-	0x0201f800, 0x00020381, 0x497a6008, 0x5c028000,</div><div class='del'>-	0x5c025800, 0x8d3e7d00, 0x04000009, 0x4d340000,</div><div class='del'>-	0x59326809, 0x0201f800, 0x00104801, 0x5c026800,</div><div class='del'>-	0x0201f800, 0x00107698, 0x0401f00b, 0x4a026403,</div><div class='del'>-	0x00000085, 0x4a026203, 0x00000009, 0x4a026406,</div><div class='del'>-	0x00000002, 0x42000800, 0x8000404b, 0x0201f800,</div><div class='del'>-	0x00020855, 0x5c03e000, 0x02020800, 0x0010698c,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00106982, 0x0201f800, 0x00100ee4, 0x0401f7ab,</div><div class='del'>-	0x598c000d, 0x81300580, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00106be2, 0x0402001b, 0x0201f800, 0x00106619,</div><div class='del'>-	0x04020006, 0x59300c03, 0x82040580, 0x00000040,</div><div class='del'>-	0x0400078b, 0x0401f79d, 0x0201f800, 0x001068a3,</div><div class='del'>-	0x04000010, 0x0201f800, 0x00100615, 0x0401f813,</div><div class='del'>-	0x04020004, 0x0201f800, 0x00106bb2, 0x04020009,</div><div class='del'>-	0x0201f800, 0x001064f6, 0x040207f4, 0x59300c03,</div><div class='del'>-	0x82040580, 0x00000040, 0x04000779, 0x0401f78b,</div><div class='del'>-	0x59300203, 0x82000c80, 0x0000000e, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f75e, 0x417a3000, 0x42032000,</div><div class='del'>-	0x0000bf32, 0x59900004, 0x81300580, 0x04000009,</div><div class='del'>-	0x83932400, 0x00000010, 0x811a3000, 0x83180480,</div><div class='del'>-	0x00000005, 0x040017f8, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x59300004, 0x8c00053e, 0x04000010,</div><div class='del'>-	0x8c00050c, 0x0402000e, 0x8c000516, 0x04020006,</div><div class='del'>-	0x82000d00, 0x0000001f, 0x82040580, 0x00000005,</div><div class='del'>-	0x04020004, 0x42000000, 0x00000003, 0x0401f005,</div><div class='del'>-	0x42000000, 0x00000001, 0x0401f002, 0x59300203,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x59300203, 0x82000c80, 0x0000000e,</div><div class='del'>-	0x02021800, 0x00100615, 0x0c01f001, 0x00108ac7,</div><div class='del'>-	0x00108ae4, 0x00108acb, 0x00108ac5, 0x00108ac5,</div><div class='del'>-	0x00108ac5, 0x00108ac5, 0x00108ac5, 0x00108ac5,</div><div class='del'>-	0x00108ac5, 0x00108ac5, 0x00108ac5, 0x00108ac5,</div><div class='del'>-	0x00108ac5, 0x0201f800, 0x00100615, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x0401f6e8, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x59300403, 0x82000580, 0x00000052, 0x02000800,</div><div class='del'>-	0x00101281, 0x0401fb1f, 0x02000800, 0x00100615,</div><div class='del'>-	0x4a025a06, 0x00000005, 0x0201f800, 0x00020381,</div><div class='del'>-	0x0201f800, 0x00104a83, 0x0201f800, 0x00107698,</div><div class='del'>-	0x5c025800, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x598c000d, 0x81300580, 0x0402001a, 0x59300004,</div><div class='del'>-	0x8c000520, 0x04000004, 0x84000520, 0x48026004,</div><div class='del'>-	0x0401f01a, 0x42001000, 0x0010b5f4, 0x50081000,</div><div class='del'>-	0x58080002, 0x82000580, 0x00000100, 0x0400000a,</div><div class='del'>-	0x5808000c, 0x81300580, 0x02020800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00106619, 0x02020800, 0x00100615,</div><div class='del'>-	0x0401f7cf, 0x0201f800, 0x00106be2, 0x0402000c,</div><div class='del'>-	0x59300004, 0x8c000520, 0x04000004, 0x84000520,</div><div class='del'>-	0x48026004, 0x0401f7c6, 0x0201f800, 0x00106619,</div><div class='del'>-	0x040007c3, 0x0201f800, 0x00100615, 0x59300203,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f7a7, 0x59300406, 0x4933c857, 0x4803c857,</div><div class='del'>-	0x82000c80, 0x00000012, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x00108b30, 0x00108bfe, 0x00108d36,</div><div class='del'>-	0x00108b3c, 0x00107698, 0x00108b30, 0x00109faf,</div><div class='del'>-	0x000208b4, 0x00108bfe, 0x00106306, 0x00108d97,</div><div class='del'>-	0x00108b2b, 0x00108b2b, 0x00108b2b, 0x00108b2b,</div><div class='del'>-	0x00108b2b, 0x001094b7, 0x001094b7, 0x0201f800,</div><div class='del'>-	0x00100615, 0x0401fbd8, 0x02000000, 0x00107da6,</div><div class='del'>-	0x1c01f000, 0x0201f800, 0x0010698c, 0x0201f800,</div><div class='del'>-	0x001068f6, 0x0201f800, 0x00106982, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4a026206, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b671, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4d2c0000, 0x4d400000, 0x417a5800, 0x0401fab1,</div><div class='del'>-	0x04000007, 0x59325808, 0x592c0208, 0x8400054c,</div><div class='del'>-	0x48025a08, 0x42028000, 0x00000006, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x0401ff4c, 0x4803c857, 0x82000c80,</div><div class='del'>-	0x0000000e, 0x02021800, 0x00100615, 0x0c01f806,</div><div class='del'>-	0x0201f800, 0x00106982, 0x5c028000, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x00108bfd, 0x00108b69, 0x00108b79,</div><div class='del'>-	0x00108ba0, 0x00108bce, 0x00108b67, 0x00108b30,</div><div class='del'>-	0x00108b30, 0x00108b30, 0x00108b67, 0x00108b67,</div><div class='del'>-	0x00108b67, 0x00108b67, 0x00108b79, 0x0201f800,</div><div class='del'>-	0x00100615, 0x598c000d, 0x4803c857, 0x81300580,</div><div class='del'>-	0x04020004, 0x0201f800, 0x00106be2, 0x0402003f,</div><div class='del'>-	0x0201f800, 0x00106619, 0x04000043, 0x4803c856,</div><div class='del'>-	0x0201f800, 0x001068a3, 0x04000038, 0x0201f800,</div><div class='del'>-	0x00100615, 0x497a621d, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x592c0204, 0x4803c857, 0x82000500,</div><div class='del'>-	0x000000ff, 0x82000580, 0x00000014, 0x04000003,</div><div class='del'>-	0x4a02621d, 0x00000003, 0x592c0a08, 0x0201f800,</div><div class='del'>-	0x00104bee, 0x0201f800, 0x00109365, 0x0201f800,</div><div class='del'>-	0x00020381, 0x497a6008, 0x4a026403, 0x00000085,</div><div class='del'>-	0x4a026203, 0x00000009, 0x4a026406, 0x00000002,</div><div class='del'>-	0x59300804, 0x82040d00, 0x00000100, 0x82040d40,</div><div class='del'>-	0x8000404b, 0x48066004, 0x0201f800, 0x00106982,</div><div class='del'>-	0x42000800, 0x8000404b, 0x0201f000, 0x00020855,</div><div class='del'>-	0x0401feea, 0x04020004, 0x0201f800, 0x00106bb2,</div><div class='del'>-	0x0402000a, 0x0201f800, 0x001064f6, 0x040207cc,</div><div class='del'>-	0x59300c03, 0x4807c857, 0x82040580, 0x00000040,</div><div class='del'>-	0x04000009, 0x0401f7cc, 0x59300203, 0x4803c857,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f7a5, 0x0201f800, 0x00106982, 0x812e59c0,</div><div class='del'>-	0x04000013, 0x592c0a08, 0x0201f800, 0x00104bee,</div><div class='del'>-	0x0201f800, 0x00109365, 0x0201f800, 0x00020381,</div><div class='del'>-	0x59300203, 0x82000580, 0x0000000d, 0x04000008,</div><div class='del'>-	0x0201f800, 0x00106982, 0x4d340000, 0x59326809,</div><div class='del'>-	0x0201f800, 0x00104801, 0x5c026800, 0x0201f800,</div><div class='del'>-	0x00107698, 0x0401f030, 0x812e59c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x0201f800, 0x001091d3, 0x04020004,</div><div class='del'>-	0x0201f800, 0x00100ee4, 0x0401f7a3, 0x0201f800,</div><div class='del'>-	0x00106982, 0x592c0208, 0x8400050c, 0x48025a08,</div><div class='del'>-	0x592c0406, 0x800000c2, 0x800008c4, 0x80040c00,</div><div class='del'>-	0x48066206, 0x42000000, 0x10000000, 0x41300800,</div><div class='del'>-	0x0201f800, 0x00100bde, 0x0400000d, 0x592c0208,</div><div class='del'>-	0x8c00051c, 0x04020006, 0x8400055c, 0x48025a08,</div><div class='del'>-	0x4a026206, 0x00000002, 0x0401f00f, 0x4d300000,</div><div class='del'>-	0x0201f800, 0x00101335, 0x5c026000, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000004, 0x04020007, 0x4d380000,</div><div class='del'>-	0x42027000, 0x00000048, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x5c027000, 0x1c01f000, 0x42000000, 0x0010b66d,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x59300203, 0x82000c80,</div><div class='del'>-	0x0000000e, 0x02021800, 0x00100615, 0x4803c857,</div><div class='del'>-	0x0c01f001, 0x00108c17, 0x00108b39, 0x00108c19,</div><div class='del'>-	0x00108c17, 0x00108c19, 0x00108c19, 0x00108b31,</div><div class='del'>-	0x00108c17, 0x00108b2d, 0x00108c17, 0x00108c17,</div><div class='del'>-	0x00108c17, 0x00108c17, 0x00108c17, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4d340000, 0x4d2c0000, 0x59326809,</div><div class='del'>-	0x59340400, 0x82000500, 0x000000ff, 0x82000c80,</div><div class='del'>-	0x0000000c, 0x02021800, 0x00100615, 0x59303403,</div><div class='del'>-	0x82180d80, 0x00000004, 0x04020004, 0x42000000,</div><div class='del'>-	0x00000001, 0x0401f006, 0x82180d80, 0x00000000,</div><div class='del'>-	0x04020003, 0x42000000, 0x00000001, 0x4803c857,</div><div class='del'>-	0x0c01f804, 0x5c025800, 0x5c026800, 0x1c01f000,</div><div class='del'>-	0x00108c40, 0x00108cdf, 0x00108c42, 0x00108c77,</div><div class='del'>-	0x00108c42, 0x00108cfc, 0x00108c42, 0x00108c4c,</div><div class='del'>-	0x00108c40, 0x00108cfc, 0x00108c40, 0x00108c5b,</div><div class='del'>-	0x0201f800, 0x00100615, 0x59300403, 0x82000d80,</div><div class='del'>-	0x00000016, 0x0400002e, 0x82000d80, 0x00000004,</div><div class='del'>-	0x0400002b, 0x82000d80, 0x00000002, 0x04000028,</div><div class='del'>-	0x0401fab9, 0x04000079, 0x59300403, 0x82000d80,</div><div class='del'>-	0x00000022, 0x040000ae, 0x82000d80, 0x00000039,</div><div class='del'>-	0x040000b3, 0x82000d80, 0x00000035, 0x040000b0,</div><div class='del'>-	0x82000d80, 0x0000001e, 0x0400001b, 0x0401f999,</div><div class='del'>-	0x04000007, 0x0201f800, 0x00109360, 0x04020004,</div><div class='del'>-	0x0201f800, 0x00104863, 0x0401f011, 0x59300403,</div><div class='del'>-	0x82000d80, 0x00000001, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00104836, 0x0400000a, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00101de2, 0x5c027800, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x00107da6, 0x0201f000, 0x00107698, 0x0401f97d,</div><div class='del'>-	0x04000004, 0x0201f800, 0x00109360, 0x040000a9,</div><div class='del'>-	0x59300c03, 0x82040580, 0x00000016, 0x04000056,</div><div class='del'>-	0x82040580, 0x00000002, 0x04020034, 0x59a80026,</div><div class='del'>-	0x8c000502, 0x04020013, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x04020010, 0x0201f800, 0x00104e23, 0x04020006,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x00104de5,</div><div class='del'>-	0x0401f094, 0x4a035033, 0x00000001, 0x4202d800,</div><div class='del'>-	0x00000001, 0x0201f800, 0x00104d76, 0x0401f08d,</div><div class='del'>-	0x59340403, 0x82000580, 0x000007fc, 0x04000008,</div><div class='del'>-	0x59a80026, 0x8c00050a, 0x04020084, 0x59340212,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x04000082, 0x59340412,</div><div class='del'>-	0x82000500, 0x000000ff, 0x04000010, 0x80000040,</div><div class='del'>-	0x48026c12, 0x497a6008, 0x4a026406, 0x00000007,</div><div class='del'>-	0x4a026206, 0x00000398, 0x497a6205, 0x0201f800,</div><div class='del'>-	0x00020892, 0x04000005, 0x49366009, 0x4a026406,</div><div class='del'>-	0x00000001, 0x0401f020, 0x59300403, 0x82000d80,</div><div class='del'>-	0x00000002, 0x0402000d, 0x59340403, 0x82000580,</div><div class='del'>-	0x000007fe, 0x04020009, 0x59a80026, 0x84000540,</div><div class='del'>-	0x48035026, 0x0201f800, 0x00104067, 0x0201f800,</div><div class='del'>-	0x00107da6, 0x0401f00c, 0x0201f800, 0x00107da6,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x00101de2,</div><div class='del'>-	0x5c027800, 0x42000000, 0x0010b663, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x00101e1b, 0x0201f000,</div><div class='del'>-	0x00107698, 0x42000800, 0x00000003, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000002, 0x0201f000, 0x00106470, 0x0401f915,</div><div class='del'>-	0x04020793, 0x0201f800, 0x00101e1b, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x42000000, 0x0010b663, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x42003000, 0x00000018, 0x41782800, 0x42002000,</div><div class='del'>-	0x00000000, 0x4d400000, 0x4d440000, 0x59368c03,</div><div class='del'>-	0x42028000, 0x00000029, 0x0201f800, 0x0010962a,</div><div class='del'>-	0x5c028800, 0x5c028000, 0x0201f000, 0x00107698,</div><div class='del'>-	0x0201f800, 0x00104863, 0x0401f7c8, 0x42000000,</div><div class='del'>-	0x0010b66c, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x001078fd, 0x040207c1, 0x1c01f000, 0x4d380000,</div><div class='del'>-	0x59327403, 0x0201f800, 0x00109183, 0x5c027000,</div><div class='del'>-	0x02020000, 0x000208b4, 0x836c0580, 0x00000003,</div><div class='del'>-	0x04000004, 0x4a026206, 0x00000002, 0x1c01f000,</div><div class='del'>-	0x59300403, 0x48026416, 0x4a02621d, 0x00000001,</div><div class='del'>-	0x4a026403, 0x00000085, 0x4a026203, 0x00000009,</div><div class='del'>-	0x4a026406, 0x00000002, 0x42000800, 0x8000004b,</div><div class='del'>-	0x0201f000, 0x00020855, 0x0201f800, 0x00101e1b,</div><div class='del'>-	0x0201f800, 0x00107da6, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00101de2, 0x5c027800, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x497a6008,</div><div class='del'>-	0x4a026406, 0x00000007, 0x4a026206, 0x00000398,</div><div class='del'>-	0x497a6205, 0x1c01f000, 0x42000000, 0x0010b66f,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x4d340000, 0x59326809,</div><div class='del'>-	0x59300203, 0x82000c80, 0x0000000e, 0x02021800,</div><div class='del'>-	0x00100615, 0x4803c857, 0x0c01f803, 0x5c026800,</div><div class='del'>-	0x1c01f000, 0x00108d53, 0x00108b39, 0x00108d53,</div><div class='del'>-	0x00108d53, 0x00108d53, 0x00108d53, 0x00108d53,</div><div class='del'>-	0x00108d53, 0x00108d53, 0x00108b39, 0x00108d55,</div><div class='del'>-	0x00108b39, 0x00108d5d, 0x00108d53, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4a026403, 0x0000008b, 0x4a026203,</div><div class='del'>-	0x0000000b, 0x42000800, 0x8000404b, 0x0201f000,</div><div class='del'>-	0x00020855, 0x59300a1d, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00101de2, 0x5c027800, 0x42003000,</div><div class='del'>-	0x00000011, 0x0201f800, 0x0010a766, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x41306800,</div><div class='del'>-	0x0201f800, 0x00020892, 0x04000008, 0x49366009,</div><div class='del'>-	0x4d300000, 0x40366000, 0x0201f800, 0x00107698,</div><div class='del'>-	0x5c026000, 0x0401f002, 0x40366000, 0x497a6008,</div><div class='del'>-	0x4a026406, 0x00000001, 0x4a026403, 0x00000001,</div><div class='del'>-	0x0201f800, 0x0010393e, 0x04000011, 0x4a026406,</div><div class='del'>-	0x00000004, 0x4a026203, 0x00000007, 0x4a026420,</div><div class='del'>-	0x00000001, 0x42003000, 0x00000004, 0x4d400000,</div><div class='del'>-	0x42028000, 0x00000029, 0x41782800, 0x0201f800,</div><div class='del'>-	0x0010a250, 0x5c028000, 0x1c01f000, 0x42000800,</div><div class='del'>-	0x0000000b, 0x0201f800, 0x001043c7, 0x4a026203,</div><div class='del'>-	0x00000001, 0x0201f000, 0x00106470, 0x42000000,</div><div class='del'>-	0x0010b675, 0x0201f800, 0x0010a86e, 0x59300203,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x4803c857, 0x0c01f001, 0x00108dc8, 0x00108db0,</div><div class='del'>-	0x00108db4, 0x00108dc9, 0x00108db2, 0x00108db0,</div><div class='del'>-	0x00108db0, 0x00108db0, 0x00108db0, 0x00108db0,</div><div class='del'>-	0x00108db0, 0x00108db0, 0x00108db0, 0x00108db0,</div><div class='del'>-	0x0201f800, 0x00100615, 0x0201f800, 0x00100ee4,</div><div class='del'>-	0x4d2c0000, 0x59325808, 0x4a025a06, 0x00000006,</div><div class='del'>-	0x0201f800, 0x00020381, 0x5c025800, 0x497a6008,</div><div class='del'>-	0x4a02621d, 0x0000000a, 0x4a026403, 0x00000085,</div><div class='del'>-	0x4a026203, 0x00000009, 0x4a026406, 0x00000002,</div><div class='del'>-	0x42000800, 0x8000404b, 0x0201f000, 0x00020855,</div><div class='del'>-	0x1c01f000, 0x0201f800, 0x0010698c, 0x4df00000,</div><div class='del'>-	0x0401fcbe, 0x04020004, 0x0201f800, 0x00106bb2,</div><div class='del'>-	0x0402000c, 0x0201f800, 0x001064f6, 0x04020005,</div><div class='del'>-	0x5c03e000, 0x0201f800, 0x00106982, 0x0401f7dd,</div><div class='del'>-	0x0201f800, 0x001068a3, 0x02020800, 0x00100615,</div><div class='del'>-	0x5c03e000, 0x0201f800, 0x00106982, 0x59300203,</div><div class='del'>-	0x82000d80, 0x00000003, 0x02000800, 0x00100615,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f7ba, 0x4803c856, 0x59a8000e, 0x59a80867,</div><div class='del'>-	0x80040400, 0x80080480, 0x04021004, 0x82000540,</div><div class='del'>-	0x00000001, 0x1c01f000, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4c080000, 0x59301008, 0x82081500,</div><div class='del'>-	0xfff00000, 0x5c001000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4d300000, 0x0201f800, 0x00020892, 0x0400000a,</div><div class='del'>-	0x0401f82f, 0x4d380000, 0x42027000, 0x0000004b,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c026000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4d300000, 0x0201f800, 0x001076c9, 0x0400001b,</div><div class='del'>-	0x0401f81f, 0x4d300000, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x001067f6,</div><div class='del'>-	0x0201f800, 0x00106543, 0x5c027800, 0x0201f800,</div><div class='del'>-	0x0010a0da, 0x0201f800, 0x00106982, 0x5c026000,</div><div class='del'>-	0x8d3e7d3e, 0x0402000b, 0x4d380000, 0x42027000,</div><div class='del'>-	0x0000004c, 0x0201f800, 0x000208d8, 0x5c027000,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c026000, 0x1c01f000,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x0401f7fa, 0x592c0407,</div><div class='del'>-	0x494a6017, 0x494e6018, 0x49366009, 0x492e6008,</div><div class='del'>-	0x4a026406, 0x00000003, 0x800000c2, 0x800008c4,</div><div class='del'>-	0x80040400, 0x48026206, 0x1c01f000, 0x493bc857,</div><div class='del'>-	0x4d300000, 0x0201f800, 0x00020892, 0x0400000d,</div><div class='del'>-	0x0401ffef, 0x4d400000, 0x42028000, 0x00000005,</div><div class='del'>-	0x0401f80d, 0x5c028000, 0x8d3e7d3e, 0x04020007,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x0401f7fa, 0x4803c856, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4d3c0000, 0x4d440000, 0x59368c03, 0x42027800,</div><div class='del'>-	0x00000001, 0x0201f800, 0x001066ff, 0x0201f800,</div><div class='del'>-	0x00106675, 0x0201f800, 0x00106543, 0x0201f800,</div><div class='del'>-	0x0010a0da, 0x5c028800, 0x5c027800, 0x0201f000,</div><div class='del'>-	0x00106982, 0x4803c856, 0x4d300000, 0x0201f800,</div><div class='del'>-	0x00020892, 0x0400000f, 0x481a601c, 0x48ee6021,</div><div class='del'>-	0x49366009, 0x4a026406, 0x00000001, 0x492e6008,</div><div class='del'>-	0x4d380000, 0x42027000, 0x0000001f, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x5c027000, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4803c856, 0x4d300000,</div><div class='del'>-	0x0201f800, 0x00020892, 0x0400000e, 0x48ee6021,</div><div class='del'>-	0x49366009, 0x4a026406, 0x00000001, 0x492e6008,</div><div class='del'>-	0x4d380000, 0x42027000, 0x00000055, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x5c027000, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4803c856, 0x4d300000,</div><div class='del'>-	0x0201f800, 0x00020892, 0x0400000f, 0x481a601c,</div><div class='del'>-	0x48ee6021, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x492e6008, 0x4d380000, 0x42027000, 0x0000003d,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c026000, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4d300000, 0x0201f800, 0x001076c9, 0x04000014,</div><div class='del'>-	0x49366009, 0x492fc857, 0x4933c857, 0x592c0404,</div><div class='del'>-	0x8c00051e, 0x04000003, 0x48efc857, 0x48ee6021,</div><div class='del'>-	0x4a026406, 0x00000001, 0x492e6008, 0x4d380000,</div><div class='del'>-	0x42027000, 0x00000000, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x5c027000, 0x82000540, 0x00000001, 0x5c026000,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4d300000, 0x0201f800,</div><div class='del'>-	0x00020892, 0x0400000f, 0x48ee6021, 0x481a601c,</div><div class='del'>-	0x49366009, 0x4a026406, 0x00000001, 0x492e6008,</div><div class='del'>-	0x4d380000, 0x42027000, 0x00000044, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x5c027000, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4803c856, 0x4d300000,</div><div class='del'>-	0x0201f800, 0x00020892, 0x0400000f, 0x481a601c,</div><div class='del'>-	0x48ee6021, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x492e6008, 0x4d380000, 0x42027000, 0x00000049,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c026000, 0x1c01f000, 0x59300009,</div><div class='del'>-	0x80001540, 0x02000800, 0x00100615, 0x5808040b,</div><div class='del'>-	0x4803c856, 0x80000040, 0x04001002, 0x4800140b,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x59300403, 0x82000d80,</div><div class='del'>-	0x00000002, 0x0400000f, 0x82000d80, 0x00000003,</div><div class='del'>-	0x0400000c, 0x82000d80, 0x00000004, 0x04000009,</div><div class='del'>-	0x599c0819, 0x8c040d0e, 0x04000004, 0x82000d80,</div><div class='del'>-	0x00000000, 0x04000003, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4c000000, 0x4d2c0000,</div><div class='del'>-	0x59300406, 0x82000580, 0x00000004, 0x0400001d,</div><div class='del'>-	0x59300008, 0x80025d40, 0x800001c0, 0x04000019,</div><div class='del'>-	0x0201f800, 0x00109360, 0x04000014, 0x59300406,</div><div class='del'>-	0x82004580, 0x00000010, 0x04000010, 0x82004580,</div><div class='del'>-	0x00000011, 0x0400000d, 0x82004580, 0x00000003,</div><div class='del'>-	0x0400000c, 0x82004580, 0x00000002, 0x04000009,</div><div class='del'>-	0x82004580, 0x0000000a, 0x04000006, 0x592c0404,</div><div class='del'>-	0x8c00051e, 0x04000003, 0x80000580, 0x0401f003,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c025800, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x4803c856, 0x4d300000, 0x0201f800,</div><div class='del'>-	0x001076c9, 0x04000013, 0x49366009, 0x48ee6021,</div><div class='del'>-	0x4a026406, 0x00000001, 0x492e6008, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x4d380000, 0x42027000, 0x00000028, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x5c027000, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4803c856, 0x83380580,</div><div class='del'>-	0x00000015, 0x0402000d, 0x59a80016, 0x82000580,</div><div class='del'>-	0x00000074, 0x04020009, 0x0201f800, 0x00104480,</div><div class='del'>-	0x4a026203, 0x00000001, 0x4a026403, 0x00000029,</div><div class='del'>-	0x0201f000, 0x00106470, 0x0201f800, 0x00107da6,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x4803c856, 0x83380580,</div><div class='del'>-	0x00000016, 0x04020007, 0x42000800, 0x00000004,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x0201f000, 0x001078bf,</div><div class='del'>-	0x83380580, 0x00000015, 0x04020013, 0x59a80016,</div><div class='del'>-	0x82000580, 0x00000014, 0x0402000f, 0x0201f800,</div><div class='del'>-	0x001044e1, 0x0201f800, 0x00108210, 0x0402000a,</div><div class='del'>-	0x59340404, 0x80000540, 0x04000007, 0x42000800,</div><div class='del'>-	0x00000006, 0x0201f800, 0x001043c7, 0x0201f000,</div><div class='del'>-	0x001078bf, 0x0201f800, 0x00107da6, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x4803c856, 0x592c0206, 0x82000580,</div><div class='del'>-	0x00000005, 0x04000002, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x592c0208, 0x8400054a, 0x48025a08, 0x1c01f000,</div><div class='del'>-	0x497a6205, 0x497a6008, 0x4a026203, 0x00000001,</div><div class='del'>-	0x4a026403, 0x00000050, 0x42000800, 0x80000043,</div><div class='del'>-	0x0201f000, 0x00020855, 0x4933c857, 0x4d340000,</div><div class='del'>-	0x59326809, 0x59340200, 0x8c00050e, 0x04000006,</div><div class='del'>-	0x59300406, 0x82000c80, 0x00000012, 0x04021004,</div><div class='del'>-	0x0c01f806, 0x5c026800, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00108b30, 0x0401f7fc, 0x00108b30, 0x00108fb4,</div><div class='del'>-	0x00108fb8, 0x00108fbb, 0x0010a2b9, 0x0010a2d6,</div><div class='del'>-	0x0010a2da, 0x00108b30, 0x00108b30, 0x00108b30,</div><div class='del'>-	0x00108b30, 0x00108b30, 0x00108b30, 0x00108b30,</div><div class='del'>-	0x00108b30, 0x00108b30, 0x00108b30, 0x00108b30,</div><div class='del'>-	0x4803c856, 0x40000000, 0x40000000, 0x1c01f000,</div><div class='del'>-	0x40000000, 0x40000000, 0x1c01f000, 0x5930001c,</div><div class='del'>-	0x4803c857, 0x59300414, 0x4933c857, 0x4803c857,</div><div class='del'>-	0x8c000502, 0x04000005, 0x4803c857, 0x84000540,</div><div class='del'>-	0x48026414, 0x1c01f000, 0x42000000, 0xd0000000,</div><div class='del'>-	0x41300800, 0x0201f800, 0x00100bde, 0x0401f810,</div><div class='del'>-	0x0402000e, 0x59300c14, 0x59300403, 0x82000580,</div><div class='del'>-	0x00000040, 0x04000003, 0x84040d40, 0x0401f005,</div><div class='del'>-	0x59a80037, 0x82000400, 0x0000000a, 0x48026205,</div><div class='del'>-	0x84040d42, 0x48066414, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4d340000, 0x59326809, 0x59340200, 0x8c00050e,</div><div class='del'>-	0x02000800, 0x00100615, 0x5930001c, 0x80000540,</div><div class='del'>-	0x04020034, 0x59300403, 0x4803c857, 0x82000580,</div><div class='del'>-	0x00000040, 0x04000004, 0x59a80021, 0x80000540,</div><div class='del'>-	0x0402002a, 0x4d1c0000, 0x41323800, 0x0201f800,</div><div class='del'>-	0x00020892, 0x04000023, 0x4932381c, 0x591c0414,</div><div class='del'>-	0x84000542, 0x48023c14, 0x49366009, 0x591c0406,</div><div class='del'>-	0x82000580, 0x00000003, 0x04000006, 0x591c0202,</div><div class='del'>-	0x48026419, 0x591c0402, 0x48026219, 0x0401f005,</div><div class='del'>-	0x591c0202, 0x48026219, 0x591c0402, 0x48026419,</div><div class='del'>-	0x491e601e, 0x4a026406, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000035, 0x4a026203, 0x00000001, 0x42000800,</div><div class='del'>-	0x80000040, 0x0201f800, 0x00020855, 0x411e6000,</div><div class='del'>-	0x5c023800, 0x80000580, 0x5c026800, 0x1c01f000,</div><div class='del'>-	0x411e6000, 0x5c023800, 0x59a80039, 0x48026205,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f7f8, 0x4933c857,</div><div class='del'>-	0x4d2c0000, 0x4932381c, 0x4a026202, 0x0000ffff,</div><div class='del'>-	0x591e5808, 0x591c0007, 0x8c00051e, 0x04000005,</div><div class='del'>-	0x8400051e, 0x48023807, 0x497a5c09, 0x0401f018,</div><div class='del'>-	0x592c0408, 0x8c000518, 0x04000015, 0x84000518,</div><div class='del'>-	0x48025c08, 0x4d400000, 0x592e8206, 0x4a025a06,</div><div class='del'>-	0x00000001, 0x0401fb34, 0x49425a06, 0x5c028000,</div><div class='del'>-	0x497a5c09, 0x592c0408, 0x8c000512, 0x04000008,</div><div class='del'>-	0x4d2c0000, 0x84000512, 0x48025c08, 0x592e5809,</div><div class='del'>-	0x0201f800, 0x00100843, 0x5c025800, 0x59a80039,</div><div class='del'>-	0x48026205, 0x591c0214, 0x48026216, 0x82000d80,</div><div class='del'>-	0x00000001, 0x04000008, 0x4a023a03, 0x00000002,</div><div class='del'>-	0x82000580, 0x00000005, 0x04000008, 0x497a6015,</div><div class='del'>-	0x0401f01e, 0x591c0007, 0x84000540, 0x48023807,</div><div class='del'>-	0x4a023a03, 0x00000004, 0x591c0414, 0x4803c857,</div><div class='del'>-	0x8400051c, 0x84000554, 0x48023c14, 0x592c000f,</div><div class='del'>-	0x40001000, 0x591c0816, 0x80040480, 0x040217f0,</div><div class='del'>-	0x591c0016, 0x82000500, 0xfffffffc, 0x48026015,</div><div class='del'>-	0x48023816, 0x591c0a14, 0x4807c857, 0x82040d80,</div><div class='del'>-	0x00000005, 0x04020005, 0x480bc857, 0x4803c857,</div><div class='del'>-	0x4a023812, 0xffffffff, 0x591c0402, 0x48026419,</div><div class='del'>-	0x591c0202, 0x48026219, 0x591e6809, 0x49366009,</div><div class='del'>-	0x4a026406, 0x00000001, 0x4a026403, 0x00000039,</div><div class='del'>-	0x4a026203, 0x00000001, 0x42000800, 0x80000040,</div><div class='del'>-	0x0201f800, 0x00020855, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x59300414, 0x8c000514, 0x04000015,</div><div class='del'>-	0x8c00051c, 0x04020012, 0x59300016, 0x80100480,</div><div class='del'>-	0x04001006, 0x04000005, 0x59300414, 0x84000514,</div><div class='del'>-	0x8400055c, 0x0401f009, 0x48126016, 0x48126012,</div><div class='del'>-	0x40100000, 0x592c180f, 0x800c0480, 0x48026011,</div><div class='del'>-	0x59300414, 0x84000514, 0x48026414, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x8c00051c, 0x04020006, 0x59300012,</div><div class='del'>-	0x48026016, 0x59300414, 0x8400055c, 0x48026414,</div><div class='del'>-	0x1c01f000, 0x59300c03, 0x4933c857, 0x4807c857,</div><div class='del'>-	0x82040480, 0x00000034, 0x04001006, 0x82040480,</div><div class='del'>-	0x0000003c, 0x04021003, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f7fd, 0x41780800,</div><div class='del'>-	0x59a81035, 0x42000000, 0x00000032, 0x0201f800,</div><div class='del'>-	0x001063ee, 0x800811c0, 0x04020003, 0x42001000,</div><div class='del'>-	0x00000014, 0x480b5037, 0x59a81036, 0x480b502d,</div><div class='del'>-	0x41780800, 0x42000000, 0x00000064, 0x0201f800,</div><div class='del'>-	0x001063ee, 0x800811c0, 0x04020003, 0x42001000,</div><div class='del'>-	0x00000014, 0x480b5038, 0x82081400, 0x0000000a,</div><div class='del'>-	0x480b5039, 0x42000800, 0x00000001, 0x0201f800,</div><div class='del'>-	0x001069af, 0x42000000, 0x30000000, 0x40080800,</div><div class='del'>-	0x0201f800, 0x00100bb2, 0x42000800, 0x00000003,</div><div class='del'>-	0x59a81010, 0x0201f800, 0x001069af, 0x0201f000,</div><div class='del'>-	0x00104755, 0x4a035037, 0x00000028, 0x4a035038,</div><div class='del'>-	0x00000014, 0x4a03502d, 0x000007d0, 0x42001000,</div><div class='del'>-	0x0000001e, 0x480b5039, 0x42000800, 0x00000001,</div><div class='del'>-	0x0201f800, 0x001069af, 0x42000000, 0x30000000,</div><div class='del'>-	0x40080800, 0x0201f800, 0x00100bb2, 0x42000800,</div><div class='del'>-	0x00000003, 0x59a81010, 0x0201f000, 0x001069af,</div><div class='del'>-	0x4933c857, 0x4d2c0000, 0x59300403, 0x82000580,</div><div class='del'>-	0x0000003e, 0x04020005, 0x59325817, 0x812e59c0,</div><div class='del'>-	0x02020800, 0x0010083a, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4937c857, 0x4d300000, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000011, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x492e6008, 0x42000800, 0x00000009, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4d380000, 0x42027000, 0x00000033,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c026000, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4d2c0000, 0x4c580000, 0x4d3c0000, 0x59325808,</div><div class='del'>-	0x83380580, 0x00000015, 0x04020025, 0x59a8b016,</div><div class='del'>-	0x82580c80, 0x00000019, 0x04001003, 0x4200b000,</div><div class='del'>-	0x00000018, 0x8058b104, 0x0401fa0a, 0x80000580,</div><div class='del'>-	0x0401fa1a, 0x832cac00, 0x00000009, 0x83cca400,</div><div class='del'>-	0x00000006, 0x0201f800, 0x0010a93e, 0x4c600000,</div><div class='del'>-	0x4200c000, 0x00000001, 0x592c100a, 0x8c081518,</div><div class='del'>-	0x04020006, 0x59a80010, 0x592c100d, 0x80080580,</div><div class='del'>-	0x04020007, 0x4178c000, 0x59301009, 0x58081403,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101e48, 0x5c00c000,</div><div class='del'>-	0x0201f800, 0x001078bf, 0x0401f008, 0x4200b000,</div><div class='del'>-	0x00000002, 0x0401fa09, 0x0201f800, 0x00107da6,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x5c027800, 0x5c00b000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4933c856, 0x49366009,</div><div class='del'>-	0x4a026406, 0x00000001, 0x492e6008, 0x4d380000,</div><div class='del'>-	0x42027000, 0x0000004d, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x5c027000, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4d2c0000, 0x83380580, 0x00000015,</div><div class='del'>-	0x04020027, 0x59a80816, 0x59325808, 0x5930040b,</div><div class='del'>-	0x800000c4, 0x80040580, 0x04020021, 0x4c500000,</div><div class='del'>-	0x4c540000, 0x4c580000, 0x83cca400, 0x00000006,</div><div class='del'>-	0x4050a800, 0x5930b40b, 0x0201f800, 0x0010a94f,</div><div class='del'>-	0x83cca400, 0x00000006, 0x592cb205, 0x832cac00,</div><div class='del'>-	0x00000006, 0x0201f800, 0x0010a93e, 0x592e5801,</div><div class='del'>-	0x812e59c0, 0x040207f9, 0x5931d821, 0x58ef400b,</div><div class='del'>-	0x58ee580d, 0x4a025a04, 0x00000103, 0x58ec0009,</div><div class='del'>-	0x0801f800, 0x59300402, 0x5c00b000, 0x5c00a800,</div><div class='del'>-	0x5c00a000, 0x5c025800, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00107da6, 0x5c025800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x83380580, 0x00000035, 0x04000005, 0x59301419,</div><div class='del'>-	0x0401f851, 0x04000027, 0x0401f006, 0x4d300000,</div><div class='del'>-	0x5932601e, 0x0401f856, 0x5c026000, 0x04000020,</div><div class='del'>-	0x591c0c06, 0x82040580, 0x00000003, 0x04000004,</div><div class='del'>-	0x82040580, 0x00000006, 0x0402001c, 0x591c0c02,</div><div class='del'>-	0x59300419, 0x80040580, 0x04000009, 0x59300219,</div><div class='del'>-	0x80040580, 0x04020015, 0x591c0a02, 0x59300419,</div><div class='del'>-	0x80040580, 0x04020011, 0x0401f009, 0x59300a19,</div><div class='del'>-	0x82040580, 0x0000ffff, 0x04000005, 0x591c0202,</div><div class='del'>-	0x59300a19, 0x80040580, 0x04020008, 0x591c0009,</div><div class='del'>-	0x59300809, 0x80040580, 0x1c01f000, 0x417a3800,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x59b800e4, 0x8c000538, 0x02020800, 0x00100615,</div><div class='del'>-	0x42000800, 0x0000012c, 0x4a0370e4, 0x20000000,</div><div class='del'>-	0x59b800e4, 0x80040840, 0x02000800, 0x00100615,</div><div class='del'>-	0x8c00053c, 0x040207f9, 0x4a0370e4, 0x30000000,</div><div class='del'>-	0x40000000, 0x40000000, 0x40000000, 0x59b800e4,</div><div class='del'>-	0x8c00053c, 0x040207f1, 0x1c01f000, 0x4803c856,</div><div class='del'>-	0x4a0370e4, 0x20000000, 0x40000000, 0x59b800e4,</div><div class='del'>-	0x8c000538, 0x040207fb, 0x1c01f000, 0x59300807,</div><div class='del'>-	0x8c040d1e, 0x592c0c08, 0x04020002, 0x8c040d18,</div><div class='del'>-	0x1c01f000, 0x0401fc10, 0x04000008, 0x42000800,</div><div class='del'>-	0x00000024, 0x0201f800, 0x001063cf, 0x82063c00,</div><div class='del'>-	0x0010cfc0, 0x491fc857, 0x1c01f000, 0x83300480,</div><div class='del'>-	0x0010cfc0, 0x0400100a, 0x59a8000b, 0x81300480,</div><div class='del'>-	0x04021007, 0x59301402, 0x0401ffef, 0x04000007,</div><div class='del'>-	0x411c0000, 0x81300580, 0x04000003, 0x81780500,</div><div class='del'>-	0x0401f002, 0x81300540, 0x1c01f000, 0x4947c857,</div><div class='del'>-	0x4d300000, 0x0201f800, 0x00020267, 0x0402000a,</div><div class='del'>-	0x42026000, 0x0010bbe8, 0x49366009, 0x492e6008,</div><div class='del'>-	0x0201f800, 0x00101de2, 0x80000580, 0x5c026000,</div><div class='del'>-	0x1c01f000, 0x82000540, 0x00000001, 0x0401f7fc,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x00108df4, 0x02000800,</div><div class='del'>-	0x00100615, 0x4d2c0000, 0x4d340000, 0x4d440000,</div><div class='del'>-	0x4c580000, 0x59325808, 0x59326809, 0x49425a06,</div><div class='del'>-	0x0201f800, 0x00105439, 0x592e8c06, 0x592c4207,</div><div class='del'>-	0x82200500, 0x0000000f, 0x0c01f806, 0x5c00b000,</div><div class='del'>-	0x5c028800, 0x5c026800, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x0010922f, 0x00109251, 0x00109258, 0x0010925c,</div><div class='del'>-	0x00109265, 0x0010922c, 0x0010922c, 0x0010922c,</div><div class='del'>-	0x00109269, 0x00109275, 0x00109275, 0x0010922c,</div><div class='del'>-	0x0010922c, 0x0010922c, 0x0010922c, 0x0010922c,</div><div class='del'>-	0x4803c857, 0x0201f800, 0x00100615, 0x814281c0,</div><div class='del'>-	0x04020012, 0x41785800, 0x592c0404, 0x8c00051c,</div><div class='del'>-	0x04020002, 0x59345c05, 0x442c2800, 0x59340008,</div><div class='del'>-	0x48002802, 0x59340009, 0x48002801, 0x59340006,</div><div class='del'>-	0x48002804, 0x59340007, 0x48002803, 0x4200b000,</div><div class='del'>-	0x0000000b, 0x0401f037, 0x592c0207, 0x8c00051e,</div><div class='del'>-	0x4200b000, 0x00000002, 0x04020032, 0x8204b540,</div><div class='del'>-	0x00000000, 0x0400002f, 0x44042800, 0x59326809,</div><div class='del'>-	0x59340400, 0x48002801, 0x4200b000, 0x00000002,</div><div class='del'>-	0x0401f028, 0x814281c0, 0x04020030, 0x59345c05,</div><div class='del'>-	0x442c2800, 0x4200b000, 0x00000001, 0x0401f021,</div><div class='del'>-	0x8340b540, 0x00000000, 0x0400001e, 0x0401f027,</div><div class='del'>-	0x814281c0, 0x04020025, 0x59340200, 0x44002800,</div><div class='del'>-	0x59340001, 0x48002801, 0x4200b000, 0x00000002,</div><div class='del'>-	0x0401f014, 0x8340b540, 0x00000000, 0x0402001b,</div><div class='del'>-	0x0401f010, 0x8340b540, 0x00000000, 0x0400000d,</div><div class='del'>-	0x0201f800, 0x00104871, 0x04000014, 0x8c20450e,</div><div class='del'>-	0x04000002, 0x497a6009, 0x4178b000, 0x497a5a06,</div><div class='del'>-	0x0401f004, 0x8340b540, 0x00000000, 0x0402000b,</div><div class='del'>-	0x592c0404, 0x8400051c, 0x48025c04, 0x592c0207,</div><div class='del'>-	0x8400051e, 0x48025a07, 0x0401f8aa, 0x497a6008,</div><div class='del'>-	0x0201f000, 0x00020381, 0x592c0207, 0x8c00051e,</div><div class='del'>-	0x4200b000, 0x00000002, 0x040207f2, 0x8204b540,</div><div class='del'>-	0x00000000, 0x040007ef, 0x44042800, 0x4200b000,</div><div class='del'>-	0x00000001, 0x0401f7eb, 0x4937c857, 0x4d300000,</div><div class='del'>-	0x0201f800, 0x00020892, 0x04000011, 0x49366009,</div><div class='del'>-	0x4a026406, 0x00000001, 0x492e6008, 0x42000800,</div><div class='del'>-	0x0000000b, 0x0201f800, 0x001043c7, 0x4d380000,</div><div class='del'>-	0x42027000, 0x00000043, 0x0201f800, 0x000208d8,</div><div class='del'>-	0x5c027000, 0x82000540, 0x00000001, 0x5c026000,</div><div class='del'>-	0x1c01f000, 0x4937c857, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x83380580, 0x00000015, 0x04020025, 0x59a80016,</div><div class='del'>-	0x82000580, 0x00000004, 0x04020021, 0x59a80010,</div><div class='del'>-	0x592c1009, 0x80080580, 0x04020010, 0x4d440000,</div><div class='del'>-	0x592e8c06, 0x592c0207, 0x4803c856, 0x82000500,</div><div class='del'>-	0x00000080, 0x84000548, 0x4d3c0000, 0x42027800,</div><div class='del'>-	0x00001000, 0x0201f800, 0x0010480a, 0x5c027800,</div><div class='del'>-	0x5c028800, 0x0401f004, 0x4803c856, 0x0201f800,</div><div class='del'>-	0x00104871, 0x0201f800, 0x00108df4, 0x04000017,</div><div class='del'>-	0x4d400000, 0x42028000, 0x00000000, 0x41780800,</div><div class='del'>-	0x0401ff38, 0x5c028000, 0x0401f00e, 0x0201f800,</div><div class='del'>-	0x00104871, 0x040207f4, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x0400000a, 0x4c580000, 0x4200b000, 0x00000002,</div><div class='del'>-	0x0401f86e, 0x5c00b000, 0x0201f800, 0x00107da6,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4937c857, 0x4d300000, 0x0201f800, 0x00020892,</div><div class='del'>-	0x04000012, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x4d3c0000, 0x4d380000, 0x417a7800, 0x0201f800,</div><div class='del'>-	0x001043bd, 0x492e6008, 0x42027000, 0x00000004,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x5c027800,</div><div class='del'>-	0x82000540, 0x00000001, 0x5c026000, 0x1c01f000,</div><div class='del'>-	0x4937c857, 0x4d300000, 0x0201f800, 0x001076c9,</div><div class='del'>-	0x0400000d, 0x49366009, 0x4a026406, 0x00000001,</div><div class='del'>-	0x492e6008, 0x4d380000, 0x42027000, 0x00000051,</div><div class='del'>-	0x0201f800, 0x000208d8, 0x5c027000, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c026000, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4c580000, 0x59325808, 0x83383580, 0x00000015,</div><div class='del'>-	0x04020011, 0x592c0008, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x0402000a, 0x0201f800, 0x00105439, 0x59cc0000,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x44002800, 0x4200b000,</div><div class='del'>-	0x00000001, 0x0401f80b, 0x0201f800, 0x001078bf,</div><div class='del'>-	0x0401f006, 0x4200b000, 0x00000002, 0x0401f823,</div><div class='del'>-	0x0201f800, 0x00107da6, 0x5c00b000, 0x1c01f000,</div><div class='del'>-	0x492fc857, 0x4c580000, 0x4c000000, 0x8058b1c0,</div><div class='del'>-	0x0400000b, 0x82580500, 0xfffffff0, 0x02020800,</div><div class='del'>-	0x00100615, 0x8058b0d0, 0x592c0408, 0x82000500,</div><div class='del'>-	0xfffff0ff, 0x80580540, 0x48025c08, 0x5c000000,</div><div class='del'>-	0x5c00b000, 0x1c01f000, 0x492fc857, 0x4c000000,</div><div class='del'>-	0x4c040000, 0x800000d8, 0x592c0c08, 0x82040d00,</div><div class='del'>-	0xffff0fff, 0x80040540, 0x48025c08, 0x5c000800,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x4933c857, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x592c0207, 0x8400055e, 0x48025a07,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4c580000, 0x0401ffd9,</div><div class='del'>-	0x0201f800, 0x00105439, 0x46002800, 0x00000018,</div><div class='del'>-	0x80142800, 0x8058b040, 0x83cca400, 0x00000007,</div><div class='del'>-	0x4014a800, 0x0201f800, 0x0010a93e, 0x5c00b000,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x59325808, 0x592c0204, 0x82000580, 0x00000152,</div><div class='del'>-	0x1c01f000, 0x5930001f, 0x80000540, 0x02020800,</div><div class='del'>-	0x00100d9a, 0x1c01f000, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x59300203, 0x4933c857, 0x492fc857, 0x493bc857,</div><div class='del'>-	0x4803c857, 0x82003480, 0x0000000e, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f803, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x00109386, 0x00109391, 0x001093cf, 0x00109386,</div><div class='del'>-	0x00109386, 0x00109386, 0x00109386, 0x00109386,</div><div class='del'>-	0x00109388, 0x00109386, 0x00109386, 0x00109386,</div><div class='del'>-	0x00109386, 0x00109386, 0x0201f800, 0x00100615,</div><div class='del'>-	0x83383480, 0x00000056, 0x02021800, 0x00100615,</div><div class='del'>-	0x493a6403, 0x4a026203, 0x00000001, 0x0201f000,</div><div class='del'>-	0x00106470, 0x83380580, 0x00000013, 0x04020010,</div><div class='del'>-	0x4937c857, 0x592c000c, 0x800001c0, 0x04000006,</div><div class='del'>-	0x4a026203, 0x00000002, 0x59a80037, 0x48026206,</div><div class='del'>-	0x1c01f000, 0x4a025a06, 0x00000000, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f000, 0x000208b4, 0x83380580,</div><div class='del'>-	0x00000027, 0x0400001b, 0x83380580, 0x00000014,</div><div class='del'>-	0x04000012, 0x83380580, 0x00000015, 0x04000005,</div><div class='del'>-	0x83380580, 0x00000016, 0x02020800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00106cb4, 0x02020000, 0x001076fb,</div><div class='del'>-	0x59300203, 0x82000580, 0x00000002, 0x02020800,</div><div class='del'>-	0x00100615, 0x0401f016, 0x4937c857, 0x0201f800,</div><div class='del'>-	0x001068f6, 0x4a02580e, 0x00000011, 0x0401f006,</div><div class='del'>-	0x4937c857, 0x0201f800, 0x001068f6, 0x4a02580e,</div><div class='del'>-	0x00000010, 0x4a025a06, 0x00000031, 0x4a02580d,</div><div class='del'>-	0x00000004, 0x0201f800, 0x00020381, 0x0201f800,</div><div class='del'>-	0x00104a83, 0x0201f000, 0x00107698, 0x59341400,</div><div class='del'>-	0x82081d00, 0x000000ff, 0x59300c03, 0x480bc857,</div><div class='del'>-	0x4807c857, 0x82040580, 0x00000053, 0x0400002e,</div><div class='del'>-	0x82040580, 0x00000002, 0x04000016, 0x82040580,</div><div class='del'>-	0x00000001, 0x04000017, 0x82040580, 0x00000003,</div><div class='del'>-	0x0400001c, 0x82040580, 0x00000005, 0x0400001d,</div><div class='del'>-	0x82040580, 0x00000033, 0x0400001a, 0x82040580,</div><div class='del'>-	0x00000000, 0x0400001b, 0x82040580, 0x00000004,</div><div class='del'>-	0x02020800, 0x00100615, 0x0401f8a1, 0x0401f016,</div><div class='del'>-	0x820c0580, 0x00000003, 0x0400084c, 0x0401f012,</div><div class='del'>-	0x820c0580, 0x0000000b, 0x0402000f, 0x42000800,</div><div class='del'>-	0x00000007, 0x0201f800, 0x001043c7, 0x0401f00a,</div><div class='del'>-	0x820c0580, 0x00000005, 0x04000864, 0x0401f006,</div><div class='del'>-	0x820c0580, 0x00000009, 0x04000889, 0x0401f002,</div><div class='del'>-	0x0401f893, 0x4a026403, 0x00000052, 0x59a81016,</div><div class='del'>-	0x592c040b, 0x8c000500, 0x04000003, 0x42001000,</div><div class='del'>-	0x00000008, 0x592c040b, 0x8c000516, 0x04000003,</div><div class='del'>-	0x82081400, 0x00000018, 0x592c000c, 0x497a580d,</div><div class='del'>-	0x497a580e, 0x80080c80, 0x04000009, 0x04001005,</div><div class='del'>-	0x4a025a06, 0x00000007, 0x40001000, 0x0401f006,</div><div class='del'>-	0x4a025a06, 0x00000015, 0x0401f003, 0x4a025a06,</div><div class='del'>-	0x00000000, 0x480a580c, 0x82081400, 0x00000003,</div><div class='del'>-	0x80081104, 0x0201f800, 0x0010783c, 0x04000010,</div><div class='del'>-	0x592c1001, 0x480a600b, 0x58080800, 0x82080400,</div><div class='del'>-	0x00000002, 0x592c1011, 0x592c1812, 0x42003000,</div><div class='del'>-	0x00000000, 0x42002000, 0x00101250, 0x0201f800,</div><div class='del'>-	0x001079b9, 0x04000002, 0x1c01f000, 0x4a025a06,</div><div class='del'>-	0x0000002c, 0x497a580c, 0x0201f800, 0x00020381,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x83380580, 0x00000015,</div><div class='del'>-	0x0402000a, 0x59a8006f, 0x8c000502, 0x0402000b,</div><div class='del'>-	0x0201f800, 0x00104480, 0x42000800, 0x00000004,</div><div class='del'>-	0x0201f000, 0x001043c7, 0x42000800, 0x00000007,</div><div class='del'>-	0x0201f000, 0x001043c7, 0x0201f800, 0x00104e0d,</div><div class='del'>-	0x42001000, 0x00000010, 0x04020009, 0x59340002,</div><div class='del'>-	0x82000500, 0x00ff0000, 0x82000580, 0x00ff0000,</div><div class='del'>-	0x040007ec, 0x42001000, 0x00000008, 0x0201f800,</div><div class='del'>-	0x00104ada, 0x040007e7, 0x592c040b, 0x84000540,</div><div class='del'>-	0x48025c0b, 0x0401f7e9, 0x83380580, 0x00000015,</div><div class='del'>-	0x0402000f, 0x59a8006f, 0x8c000502, 0x04020010,</div><div class='del'>-	0x0201f800, 0x001044e1, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x5c027800, 0x42000800,</div><div class='del'>-	0x00000006, 0x0201f000, 0x001043c7, 0x42000800,</div><div class='del'>-	0x00000004, 0x0201f000, 0x001043c7, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x42001000, 0x00000010, 0x04020009,</div><div class='del'>-	0x59340002, 0x82000500, 0x00ff0000, 0x82000580,</div><div class='del'>-	0x00ff0000, 0x040007e7, 0x42001000, 0x00000008,</div><div class='del'>-	0x0201f800, 0x00104ada, 0x040007e2, 0x592c040b,</div><div class='del'>-	0x84000540, 0x48025c0b, 0x0401f7e9, 0x42000800,</div><div class='del'>-	0x00000004, 0x0201f000, 0x001043c7, 0x83380580,</div><div class='del'>-	0x00000015, 0x04020005, 0x0201f800, 0x0010a0b1,</div><div class='del'>-	0x02000800, 0x00104711, 0x1c01f000, 0x83380580,</div><div class='del'>-	0x00000015, 0x0402001d, 0x4c580000, 0x83cc1400,</div><div class='del'>-	0x00000008, 0x4200b000, 0x00000002, 0x83341c00,</div><div class='del'>-	0x00000006, 0x0201f800, 0x001082ff, 0x04020012,</div><div class='del'>-	0x83cc1400, 0x0000000a, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83341c00, 0x00000008, 0x0201f800, 0x001082ff,</div><div class='del'>-	0x04020009, 0x59342200, 0x59cc1007, 0x800811c0,</div><div class='del'>-	0x04000003, 0x480a6801, 0x84102542, 0x8410251a,</div><div class='del'>-	0x48126a00, 0x5c00b000, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b67a, 0x0201f800, 0x0010a86e, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x59300203, 0x4933c857, 0x4803c857,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f803, 0x0201f000, 0x00106982, 0x001094d7,</div><div class='del'>-	0x001094e6, 0x001094d8, 0x001094d5, 0x001094d5,</div><div class='del'>-	0x001094d5, 0x001094d5, 0x001094d5, 0x001094d5,</div><div class='del'>-	0x001094d5, 0x001094d5, 0x001094d5, 0x001094d5,</div><div class='del'>-	0x001094d5, 0x0201f800, 0x00100615, 0x1c01f000,</div><div class='del'>-	0x59300403, 0x82000580, 0x00000052, 0x02000000,</div><div class='del'>-	0x00108b39, 0x0201f800, 0x00104a83, 0x59325808,</div><div class='del'>-	0x4a025a06, 0x00000006, 0x0201f800, 0x00020381,</div><div class='del'>-	0x0201f000, 0x00107698, 0x59301804, 0x840c0520,</div><div class='del'>-	0x48026004, 0x598c000d, 0x81300580, 0x04020010,</div><div class='del'>-	0x8c0c1d20, 0x04020010, 0x42001000, 0x0010b5f4,</div><div class='del'>-	0x50081000, 0x58080002, 0x82000580, 0x00000100,</div><div class='del'>-	0x0400000e, 0x5808000c, 0x81300580, 0x02020800,</div><div class='del'>-	0x00100615, 0x4978100c, 0x0401f003, 0x8c0c1d20,</div><div class='del'>-	0x040207dc, 0x0201f800, 0x00106619, 0x040007d9,</div><div class='del'>-	0x0201f800, 0x00100615, 0x0201f800, 0x00106be2,</div><div class='del'>-	0x040007f9, 0x59300203, 0x82000c80, 0x0000000e,</div><div class='del'>-	0x02021800, 0x00100615, 0x0c01f7bd, 0x4933c857,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4c580000, 0x592c0c07,</div><div class='del'>-	0x4806580a, 0x59cc0809, 0x48065807, 0x59cc0a08,</div><div class='del'>-	0x4806580b, 0x59a8086e, 0x82040500, 0x000003ff,</div><div class='del'>-	0x800010c4, 0x8c040d14, 0x04000005, 0x59cc0002,</div><div class='del'>-	0x82000500, 0x00000003, 0x80081480, 0x82080480,</div><div class='del'>-	0x000000f1, 0x02021800, 0x00100615, 0x480a621a,</div><div class='del'>-	0x412c0800, 0x0201f800, 0x00100819, 0x02000800,</div><div class='del'>-	0x00100615, 0x492c0809, 0x58040408, 0x84000552,</div><div class='del'>-	0x84000540, 0x48000c08, 0x82081400, 0x00000003,</div><div class='del'>-	0x80081104, 0x83cca400, 0x00000006, 0x832cac00,</div><div class='del'>-	0x00000004, 0x42000800, 0x00000010, 0x82080480,</div><div class='del'>-	0x00000010, 0x04021003, 0x40080800, 0x80000580,</div><div class='del'>-	0x4004b000, 0x4c000000, 0x0201f800, 0x0010a94f,</div><div class='del'>-	0x5c000000, 0x800001c0, 0x0400000d, 0x412c1000,</div><div class='del'>-	0x4c000000, 0x0201f800, 0x00100819, 0x02000800,</div><div class='del'>-	0x00100615, 0x492c1001, 0x832cac00, 0x00000004,</div><div class='del'>-	0x5c000000, 0x40001000, 0x0401f7e9, 0x5c00b000,</div><div class='del'>-	0x5c00a800, 0x5c00a000, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4d2c0000, 0x4c380000, 0x59325808, 0x5930021a,</div><div class='del'>-	0x48025a08, 0x59301011, 0x800811c0, 0x04020008,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x592c000b, 0x82000500,</div><div class='del'>-	0x00000c00, 0x0400000b, 0x0401f00b, 0x8c08153e,</div><div class='del'>-	0x04000006, 0x4a025a06, 0x00000007, 0x80081080,</div><div class='del'>-	0x80081000, 0x0401f003, 0x4a025a06, 0x00000015,</div><div class='del'>-	0x480a5807, 0x42000000, 0x0010bcd8, 0x50007000,</div><div class='del'>-	0x5838000b, 0x80000540, 0x04020008, 0x4930700c,</div><div class='del'>-	0x4930700b, 0x58380002, 0x82000580, 0x00000000,</div><div class='del'>-	0x04020809, 0x0401f005, 0x82001400, 0x00000000,</div><div class='del'>-	0x45301000, 0x4930700b, 0x5c007000, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x592c0009, 0x40001000,</div><div class='del'>-	0x4800700a, 0x82080400, 0x00000004, 0x48007003,</div><div class='del'>-	0x592c000d, 0x592c100e, 0x48007007, 0x48087008,</div><div class='del'>-	0x592c000a, 0x592c1208, 0x80080c80, 0x04001002,</div><div class='del'>-	0x40001000, 0x82081400, 0x00000003, 0x80081104,</div><div class='del'>-	0x82080480, 0x00000010, 0x04021003, 0x80000580,</div><div class='del'>-	0x0401f003, 0x42001000, 0x00000010, 0x4800700d,</div><div class='del'>-	0x48087004, 0x800810c4, 0x48087005, 0x40381000,</div><div class='del'>-	0x0201f800, 0x001008a1, 0x1c01f000, 0x4d2c0000,</div><div class='del'>-	0x0201f800, 0x00100819, 0x02000800, 0x00100615,</div><div class='del'>-	0x42000800, 0x0010bcd8, 0x452c0800, 0x497a580b,</div><div class='del'>-	0x497a580c, 0x497a580d, 0x4a025809, 0x001095b6,</div><div class='del'>-	0x4a025802, 0x00000100, 0x4a025801, 0x00000000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4833c857, 0x4d300000,</div><div class='del'>-	0x4d2c0000, 0x4c5c0000, 0x4030b800, 0x585c000a,</div><div class='del'>-	0x80025d40, 0x04020004, 0x585c000c, 0x4c000000,</div><div class='del'>-	0x0401f044, 0x585c0002, 0x82000580, 0x00000100,</div><div class='del'>-	0x04020022, 0x592c0801, 0x4c040000, 0x0201f800,</div><div class='del'>-	0x0010083a, 0x5c000800, 0x800409c0, 0x0400001c,</div><div class='del'>-	0x4804b80a, 0x585c100d, 0x800811c0, 0x04020005,</div><div class='del'>-	0x40065800, 0x0201f800, 0x00100843, 0x0401f014,</div><div class='del'>-	0x82080480, 0x00000010, 0x04021003, 0x80000580,</div><div class='del'>-	0x0401f003, 0x42001000, 0x00000010, 0x4800b80d,</div><div class='del'>-	0x4808b804, 0x800810c4, 0x4808b805, 0x82040400,</div><div class='del'>-	0x00000004, 0x4800b803, 0x405c1000, 0x0201f800,</div><div class='del'>-	0x001008a1, 0x0401f025, 0x0401f828, 0x585c000c,</div><div class='del'>-	0x80026540, 0x59300000, 0x80000d40, 0x04020002,</div><div class='del'>-	0x4800b80b, 0x4800b80c, 0x497a6000, 0x4c000000,</div><div class='del'>-	0x4978b80a, 0x59325808, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x59300402, 0x48025c06, 0x592c100b, 0x4c080000,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f800, 0x00108ee7,</div><div class='del'>-	0x5c001000, 0x8c081518, 0x04000004, 0x0201f800,</div><div class='del'>-	0x00108f88, 0x0401f003, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x405c7000, 0x5c000000, 0x80026540, 0x04000003,</div><div class='del'>-	0x59325808, 0x0401ff78, 0x5c00b800, 0x5c025800,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x483bc857, 0x5838000a,</div><div class='del'>-	0x40025800, 0x0201f800, 0x00100843, 0x5838000c,</div><div class='del'>-	0x80026540, 0x59300008, 0x80025d40, 0x4a025a06,</div><div class='del'>-	0x00000002, 0x1c01f000, 0x4803c857, 0x4d1c0000,</div><div class='del'>-	0x497a601c, 0x41323800, 0x40026000, 0x4d3c0000,</div><div class='del'>-	0x42027800, 0x00000005, 0x0401f840, 0x5c027800,</div><div class='del'>-	0x411e6000, 0x59300414, 0x84000502, 0x48026414,</div><div class='del'>-	0x5c023800, 0x1c01f000, 0x481bc857, 0x4933c857,</div><div class='del'>-	0x4c5c0000, 0x4c600000, 0x4010b800, 0x4014c000,</div><div class='del'>-	0x0201f800, 0x0010a766, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04000008, 0x40602800, 0x405c3000, 0x0201f800,</div><div class='del'>-	0x0010a258, 0x82000540, 0x00000001, 0x0401f002,</div><div class='del'>-	0x80000580, 0x5c00c000, 0x5c00b800, 0x1c01f000,</div><div class='del'>-	0x4803c856, 0x4d300000, 0x42026000, 0x0010cfc0,</div><div class='del'>-	0x59a8000e, 0x81640580, 0x0400001a, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000001, 0x0400000d, 0x82040580,</div><div class='del'>-	0x00000004, 0x04000006, 0x82040580, 0x00000010,</div><div class='del'>-	0x02000800, 0x00108aad, 0x0401f009, 0x59300203,</div><div class='del'>-	0x82000d80, 0x00000007, 0x04000005, 0x4807c857,</div><div class='del'>-	0x0201f800, 0x0010909d, 0x04020808, 0x83326400,</div><div class='del'>-	0x00000024, 0x41580000, 0x81300480, 0x040017e5,</div><div class='del'>-	0x5c026000, 0x1c01f000, 0x4933c857, 0x59300403,</div><div class='del'>-	0x4803c857, 0x0201f800, 0x0010698c, 0x4df00000,</div><div class='del'>-	0x59300406, 0x4803c857, 0x82000d80, 0x00000002,</div><div class='del'>-	0x04000018, 0x82000d80, 0x00000001, 0x04000009,</div><div class='del'>-	0x82000d80, 0x00000004, 0x04000006, 0x4933c856,</div><div class='del'>-	0x5c03e000, 0x02000800, 0x00106982, 0x0401f03c,</div><div class='del'>-	0x59300203, 0x82000d80, 0x00000001, 0x04000018,</div><div class='del'>-	0x82000d80, 0x00000002, 0x04000026, 0x82000d80,</div><div class='del'>-	0x00000005, 0x04000023, 0x0201f800, 0x00100615,</div><div class='del'>-	0x59300203, 0x82000d80, 0x00000009, 0x0400000c,</div><div class='del'>-	0x82000d80, 0x0000000b, 0x04000009, 0x82000d80,</div><div class='del'>-	0x0000000a, 0x04000017, 0x82000d80, 0x0000000c,</div><div class='del'>-	0x04000014, 0x0201f800, 0x00100615, 0x598c000d,</div><div class='del'>-	0x81300580, 0x04020004, 0x0201f800, 0x00106be2,</div><div class='del'>-	0x0402000c, 0x59300004, 0x4803c857, 0x8c000520,</div><div class='del'>-	0x04000004, 0x84000520, 0x48026004, 0x0401f005,</div><div class='del'>-	0x0201f800, 0x00106619, 0x02020800, 0x00100615,</div><div class='del'>-	0x5c03e000, 0x02000800, 0x00106982, 0x59300406,</div><div class='del'>-	0x82000d80, 0x00000002, 0x04000009, 0x0201f800,</div><div class='del'>-	0x00104a83, 0x0201f800, 0x00108f05, 0x02000800,</div><div class='del'>-	0x00107da6, 0x8d3e7d00, 0x04000003, 0x0201f000,</div><div class='del'>-	0x00107698, 0x4a02621d, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000085, 0x4a026203, 0x00000009, 0x4a026406,</div><div class='del'>-	0x00000002, 0x42000800, 0x8000004b, 0x0201f000,</div><div class='del'>-	0x00020855, 0x4933c857, 0x59368c03, 0x4c180000,</div><div class='del'>-	0x59300203, 0x82003480, 0x0000000e, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f803, 0x5c003000, 0x1c01f000,</div><div class='del'>-	0x001096da, 0x00109bb9, 0x00109cbd, 0x001096da,</div><div class='del'>-	0x001096da, 0x001096da, 0x001096da, 0x001096da,</div><div class='del'>-	0x001096fd, 0x001096da, 0x001096da, 0x001096da,</div><div class='del'>-	0x001096da, 0x001096da, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4933c857, 0x42028800, 0x0000ffff, 0x813669c0,</div><div class='del'>-	0x04000002, 0x59368c03, 0x4c180000, 0x59300203,</div><div class='del'>-	0x82003480, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f803, 0x5c003000, 0x1c01f000, 0x001096f9,</div><div class='del'>-	0x00109f70, 0x001096f9, 0x001096f9, 0x001096f9,</div><div class='del'>-	0x001096f9, 0x001096f9, 0x0010a779, 0x00109edd,</div><div class='del'>-	0x0010a34a, 0x0010a380, 0x0010a34a, 0x0010a380,</div><div class='del'>-	0x001096f9, 0x0201f800, 0x00100615, 0x0201f800,</div><div class='del'>-	0x00100615, 0x83383480, 0x00000051, 0x02021800,</div><div class='del'>-	0x00100615, 0x41380000, 0x493bc857, 0x4d1c0000,</div><div class='del'>-	0x4d400000, 0x0c01f804, 0x5c028000, 0x5c023800,</div><div class='del'>-	0x1c01f000, 0x0010975a, 0x0010993d, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x00109948, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010977c, 0x001097ba, 0x001097d1, 0x0010982d,</div><div class='del'>-	0x00109894, 0x001098d2, 0x00109902, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x00109950, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010995e, 0x00109967, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x001099e9,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x00109868, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x001099c0, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x001099f7, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x00109a40, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x0010975a,</div><div class='del'>-	0x00109a8d, 0x0010975a, 0x00109ab9, 0x00109ac4,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975c, 0x00109acf,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x0010976b,</div><div class='del'>-	0x0010975a, 0x0010975a, 0x0010975a, 0x00109ad6,</div><div class='del'>-	0x00109ade, 0x00109afc, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x0010a3b0, 0x040203a8,</div><div class='del'>-	0x0201f800, 0x00101eb0, 0x040203a5, 0x59cc0407,</div><div class='del'>-	0x4802601c, 0x4a026403, 0x00000045, 0x4a026203,</div><div class='del'>-	0x00000001, 0x0201f000, 0x00106470, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x0010a3b0, 0x04020399, 0x0201f800,</div><div class='del'>-	0x00101eb0, 0x04020396, 0x0401fbd6, 0x0402019e,</div><div class='del'>-	0x59cc0007, 0x4802601c, 0x4a026403, 0x0000004a,</div><div class='del'>-	0x4a026203, 0x00000001, 0x0201f000, 0x00106470,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x00101eb0, 0x04020009,</div><div class='del'>-	0x0201f800, 0x0010473b, 0x04020006, 0x82000500,</div><div class='del'>-	0x00000009, 0x82000580, 0x00000008, 0x04020008,</div><div class='del'>-	0x4a026403, 0x00000009, 0x4a02641a, 0x00000009,</div><div class='del'>-	0x4a02621a, 0x00000000, 0x0401f1b6, 0x0201f800,</div><div class='del'>-	0x00104858, 0x04000018, 0x0201f800, 0x0010a041,</div><div class='del'>-	0x0402001f, 0x42028000, 0x00000029, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x0201f800, 0x00104480, 0x4a026403, 0x00000008,</div><div class='del'>-	0x42003000, 0x00000003, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x040001a0, 0x4a026203, 0x00000007, 0x41782800,</div><div class='del'>-	0x0401f18b, 0x0201f800, 0x0010a1ec, 0x040207e7,</div><div class='del'>-	0x4a026403, 0x00000009, 0x4a02641a, 0x0000000e,</div><div class='del'>-	0x4a02621a, 0x00001900, 0x0401f192, 0x4a026403,</div><div class='del'>-	0x00000009, 0x4a02641a, 0x00000003, 0x4a02621a,</div><div class='del'>-	0x00000f00, 0x0401f18b, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x00101eb0, 0x0402034a, 0x0201f800, 0x0010473b,</div><div class='del'>-	0x04020347, 0x493a6403, 0x0201f800, 0x0010a01c,</div><div class='del'>-	0x04020006, 0x42003000, 0x00000005, 0x4a026403,</div><div class='del'>-	0x00000006, 0x0401f7d9, 0x4a026403, 0x00000007,</div><div class='del'>-	0x4a02641a, 0x00000009, 0x4a02621a, 0x00000000,</div><div class='del'>-	0x0401f174, 0x4933c857, 0x0201f800, 0x0010473b,</div><div class='del'>-	0x04020333, 0x0201f800, 0x0010a3b0, 0x02000800,</div><div class='del'>-	0x00101eb0, 0x0402032e, 0x0201f800, 0x00104858,</div><div class='del'>-	0x04020005, 0x42027800, 0x00000001, 0x0201f800,</div><div class='del'>-	0x001043bd, 0x0201f800, 0x0010484b, 0x04020031,</div><div class='del'>-	0x59cc0206, 0x82003500, 0x00000003, 0x04020034,</div><div class='del'>-	0x82003480, 0x00000014, 0x04001031, 0x5934300a,</div><div class='del'>-	0x84183516, 0x82000580, 0x00000014, 0x04020002,</div><div class='del'>-	0x84183556, 0x481a680a, 0x59cc0406, 0x82000500,</div><div class='del'>-	0x00000003, 0x04020026, 0x0201f800, 0x0010a08e,</div><div class='del'>-	0x0402002e, 0x0201f800, 0x00104836, 0x04020007,</div><div class='del'>-	0x4c600000, 0x4178c000, 0x417a7800, 0x0201f800,</div><div class='del'>-	0x00101e48, 0x5c00c000, 0x836c0580, 0x00000003,</div><div class='del'>-	0x04020009, 0x42003000, 0x00000006, 0x0201f800,</div><div class='del'>-	0x0010a75e, 0x42000000, 0x0010b664, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x0201f800, 0x001044e1, 0x4a026403,</div><div class='del'>-	0x0000000a, 0x42003000, 0x00000020, 0x0401f78f,</div><div class='del'>-	0x4a026403, 0x0000000b, 0x4a02641a, 0x00000009,</div><div class='del'>-	0x4a02621a, 0x00001e00, 0x0401f12a, 0x42000000,</div><div class='del'>-	0x0010b65f, 0x0201f800, 0x0010a86e, 0x4a026403,</div><div class='del'>-	0x0000000b, 0x4a02641a, 0x00000007, 0x4a02621a,</div><div class='del'>-	0x00000000, 0x0401f11f, 0x4a026403, 0x0000000b,</div><div class='del'>-	0x4a02641a, 0x00000003, 0x4a02621a, 0x00000000,</div><div class='del'>-	0x0401f118, 0x4933c857, 0x0201f800, 0x0010473b,</div><div class='del'>-	0x040202d7, 0x0201f800, 0x0010a3b0, 0x040202d4,</div><div class='del'>-	0x0201f800, 0x00101eb0, 0x040202d1, 0x59cc0206,</div><div class='del'>-	0x82003500, 0x00000003, 0x04020020, 0x82003480,</div><div class='del'>-	0x00000014, 0x0400101d, 0x59cc0406, 0x82000500,</div><div class='del'>-	0x00000003, 0x04020019, 0x59340400, 0x82000580,</div><div class='del'>-	0x00000707, 0x0400001c, 0x417a7800, 0x4c600000,</div><div class='del'>-	0x4178c000, 0x0201f800, 0x00101e48, 0x5c00c000,</div><div class='del'>-	0x42003000, 0x0000000a, 0x0201f800, 0x0010a75e,</div><div class='del'>-	0x42000000, 0x0010b661, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4a026403, 0x0000000c, 0x41782800, 0x42003000,</div><div class='del'>-	0x00000021, 0x0401f749, 0x4a026403, 0x0000000d,</div><div class='del'>-	0x4a02641a, 0x00000007, 0x4a02621a, 0x00000000,</div><div class='del'>-	0x0401f0e4, 0x4a026403, 0x0000000d, 0x4a02641a,</div><div class='del'>-	0x00000009, 0x4a02621a, 0x00001e00, 0x0401f0dd,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x0010473b, 0x0402029c,</div><div class='del'>-	0x0201f800, 0x0010a3b0, 0x04020299, 0x0201f800,</div><div class='del'>-	0x00101eb0, 0x04020296, 0x0401fad6, 0x0402001a,</div><div class='del'>-	0x493a6403, 0x4c5c0000, 0x0401fadc, 0x0402000e,</div><div class='del'>-	0x4a026403, 0x0000002e, 0x4014b800, 0x0201f800,</div><div class='del'>-	0x0010393e, 0x0400000e, 0x4a026203, 0x00000007,</div><div class='del'>-	0x405c2800, 0x42003000, 0x00000024, 0x5c00b800,</div><div class='del'>-	0x0401f0af, 0x4a026403, 0x0000000d, 0x4a02641a,</div><div class='del'>-	0x00000007, 0x4a02621a, 0x00000000, 0x5c00b800,</div><div class='del'>-	0x0401f0b8, 0x4a026403, 0x0000000d, 0x4a02641a,</div><div class='del'>-	0x00000009, 0x4a02621a, 0x00001e00, 0x0401f0b1,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x0010473b, 0x040206f1,</div><div class='del'>-	0x59a80026, 0x82000500, 0x00000009, 0x82000580,</div><div class='del'>-	0x00000008, 0x040006eb, 0x0201f800, 0x0010484b,</div><div class='del'>-	0x0402002d, 0x0201f800, 0x0010a096, 0x04020007,</div><div class='del'>-	0x4a026403, 0x0000000e, 0x41782800, 0x42003000,</div><div class='del'>-	0x00000052, 0x0401f6f9, 0x4933c857, 0x42003000,</div><div class='del'>-	0x00000003, 0x0201f800, 0x0010a766, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x42000000, 0x0010b663, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x59340200, 0x84000558, 0x48026a00, 0x42000800,</div><div class='del'>-	0x0000000b, 0x0201f800, 0x001043c7, 0x0201f800,</div><div class='del'>-	0x0010393e, 0x0400007c, 0x42003000, 0x00000007,</div><div class='del'>-	0x0401f061, 0x4933c857, 0x4a026403, 0x0000000f,</div><div class='del'>-	0x4a02641a, 0x00000003, 0x4a02621a, 0x00001e00,</div><div class='del'>-	0x0401f078, 0x59340400, 0x82000580, 0x00000703,</div><div class='del'>-	0x040007f5, 0x0401f040, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x0010473b, 0x04020232, 0x59a80026, 0x82000500,</div><div class='del'>-	0x00000009, 0x82000580, 0x00000008, 0x0400022c,</div><div class='del'>-	0x0201f800, 0x00104842, 0x0402002f, 0x0201f800,</div><div class='del'>-	0x0010a0b1, 0x02000800, 0x0010a041, 0x04020007,</div><div class='del'>-	0x4a026403, 0x00000010, 0x41782800, 0x42003000,</div><div class='del'>-	0x00000050, 0x0401f6b9, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x00101de2, 0x5c027800, 0x42003000,</div><div class='del'>-	0x00000003, 0x0201f800, 0x0010a766, 0x42000000,</div><div class='del'>-	0x0010b663, 0x0201f800, 0x0010a86e, 0x59340200,</div><div class='del'>-	0x84000558, 0x48026a00, 0x0401f7c5, 0x4a026403,</div><div class='del'>-	0x00000011, 0x4a02641a, 0x00000003, 0x4a02621a,</div><div class='del'>-	0x00001e00, 0x0401f043, 0x4933c857, 0x0201f800,</div><div class='del'>-	0x00101eb0, 0x02000800, 0x0010a3b0, 0x04020200,</div><div class='del'>-	0x0401fa40, 0x04020008, 0x4a026403, 0x00000012,</div><div class='del'>-	0x0401f038, 0x59340400, 0x82000580, 0x00000703,</div><div class='del'>-	0x040007eb, 0x4d3c0000, 0x417a7800, 0x42028000,</div><div class='del'>-	0x00000029, 0x0201f800, 0x00101de2, 0x5c027800,</div><div class='del'>-	0x42003000, 0x00000017, 0x0201f800, 0x0010a766,</div><div class='del'>-	0x42000000, 0x0010b663, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0201f800, 0x0010393e, 0x0400001b, 0x42003000,</div><div class='del'>-	0x00000006, 0x42028000, 0x00000029, 0x4933c857,</div><div class='del'>-	0x4a026403, 0x00000001, 0x4a026203, 0x00000007,</div><div class='del'>-	0x4c180000, 0x0201f800, 0x0010a79b, 0x5c003000,</div><div class='del'>-	0x41782800, 0x0201f000, 0x0010a250, 0x42028000,</div><div class='del'>-	0x00000046, 0x4c140000, 0x4c180000, 0x0201f800,</div><div class='del'>-	0x0010a79b, 0x5c003000, 0x5c002800, 0x0201f000,</div><div class='del'>-	0x0010a250, 0x4933c857, 0x4a026403, 0x00000001,</div><div class='del'>-	0x42000800, 0x0000000b, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x4a026203, 0x00000001, 0x0201f000, 0x00106470,</div><div class='del'>-	0x4933c857, 0x42000800, 0x00000009, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x4a026403, 0x00000005, 0x0401f7f5,</div><div class='del'>-	0x0201f800, 0x0010a3b0, 0x040201b5, 0x0201f800,</div><div class='del'>-	0x00101eb0, 0x040201b2, 0x0401f9f2, 0x040207ba,</div><div class='del'>-	0x4a026403, 0x00000020, 0x4a026203, 0x00000001,</div><div class='del'>-	0x0201f000, 0x00106470, 0x0201f800, 0x00101eb0,</div><div class='del'>-	0x040201a7, 0x4a026403, 0x00000023, 0x4a026203,</div><div class='del'>-	0x00000001, 0x0201f000, 0x00106470, 0x0201f800,</div><div class='del'>-	0x0010a3b0, 0x02000800, 0x00101eb0, 0x0402019c,</div><div class='del'>-	0x0401f9dc, 0x040207a4, 0x40300800, 0x59a81010,</div><div class='del'>-	0x59cc0007, 0x82000500, 0x00ffffff, 0x80080580,</div><div class='del'>-	0x04000019, 0x59cc1408, 0x0201f800, 0x00108de9,</div><div class='del'>-	0x0400002d, 0x59cc0c08, 0x4d300000, 0x0201f800,</div><div class='del'>-	0x00105b0f, 0x41323800, 0x5c026000, 0x04000026,</div><div class='del'>-	0x591c0202, 0x82000580, 0x0000ffff, 0x04000005,</div><div class='del'>-	0x59cc1208, 0x591c0202, 0x80080580, 0x0402001e,</div><div class='del'>-	0x591c0406, 0x82000580, 0x00000007, 0x0402001a,</div><div class='del'>-	0x0401f02c, 0x59cc1208, 0x82080580, 0x0000ffff,</div><div class='del'>-	0x0400000c, 0x0201f800, 0x001091d9, 0x04000012,</div><div class='del'>-	0x59cc1408, 0x591c0202, 0x80080580, 0x0402000e,</div><div class='del'>-	0x591c0009, 0x81340580, 0x04000016, 0x0401f00a,</div><div class='del'>-	0x59cc1408, 0x417a7800, 0x0201f800, 0x0010a217,</div><div class='del'>-	0x04020010, 0x59cc1208, 0x82080580, 0x0000ffff,</div><div class='del'>-	0x04000019, 0x4a026403, 0x00000026, 0x4a02621a,</div><div class='del'>-	0x00001700, 0x59cc1204, 0x82081580, 0x0000ffff,</div><div class='del'>-	0x04020798, 0x4a026403, 0x00000025, 0x0401f795,</div><div class='del'>-	0x591c0406, 0x82000580, 0x00000007, 0x040207f2,</div><div class='del'>-	0x591c0403, 0x82000580, 0x00000024, 0x04020006,</div><div class='del'>-	0x4d300000, 0x411e6000, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x5c026000, 0x4a026403, 0x00000025, 0x0401f785,</div><div class='del'>-	0x4933c857, 0x4d3c0000, 0x42027800, 0x00000001,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x5c027800, 0x4c580000,</div><div class='del'>-	0x4200b000, 0x00000002, 0x83a81c00, 0x00000002,</div><div class='del'>-	0x83cc1400, 0x0000000b, 0x0201f800, 0x001082ff,</div><div class='del'>-	0x5c00b000, 0x04000004, 0x4a026403, 0x00000031,</div><div class='del'>-	0x0401f770, 0x0201f800, 0x00107698, 0x0201f800,</div><div class='del'>-	0x00104e0d, 0x0402000f, 0x0201f800, 0x00104e1b,</div><div class='del'>-	0x04020008, 0x4a035033, 0x00000001, 0x4202d800,</div><div class='del'>-	0x00000001, 0x0201f800, 0x00104d76, 0x0401f005,</div><div class='del'>-	0x42000000, 0x00000001, 0x0201f800, 0x00104de5,</div><div class='del'>-	0x1c01f000, 0x0201f800, 0x00101eb0, 0x0402011c,</div><div class='del'>-	0x0401f95c, 0x04020724, 0x493a6403, 0x0401f9ac,</div><div class='del'>-	0x04020004, 0x4a026403, 0x0000002b, 0x0401f751,</div><div class='del'>-	0x4a026403, 0x0000002c, 0x0401f74e, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x00101eb0, 0x0402010d, 0x0201f800,</div><div class='del'>-	0x00104836, 0x04020740, 0x0201f800, 0x00104728,</div><div class='del'>-	0x0400003c, 0x59cc0408, 0x48026419, 0x59cc0208,</div><div class='del'>-	0x48026219, 0x59cc0807, 0x59340002, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x80040580, 0x04000012, 0x59a80010,</div><div class='del'>-	0x80040580, 0x04020021, 0x59cc1408, 0x0201f800,</div><div class='del'>-	0x001091d9, 0x04000023, 0x0201f800, 0x0010a2e8,</div><div class='del'>-	0x04000020, 0x0201f800, 0x0010a745, 0x0400001d,</div><div class='del'>-	0x491e601e, 0x4a026403, 0x00000036, 0x0401f0e6,</div><div class='del'>-	0x59cc1208, 0x82080580, 0x0000ffff, 0x04000009,</div><div class='del'>-	0x0201f800, 0x001091d9, 0x04000012, 0x591c0202,</div><div class='del'>-	0x59cc0c08, 0x80040580, 0x0402000e, 0x0401f7eb,</div><div class='del'>-	0x59cc1408, 0x41327800, 0x0201f800, 0x0010a217,</div><div class='del'>-	0x04000008, 0x0401f7e5, 0x4803c856, 0x4a02641a,</div><div class='del'>-	0x00000009, 0x4a02621a, 0x00001500, 0x0401f006,</div><div class='del'>-	0x4803c856, 0x4a02641a, 0x00000003, 0x4a02621a,</div><div class='del'>-	0x00001700, 0x4a026403, 0x00000037, 0x0401f0c6,</div><div class='del'>-	0x4803c856, 0x4a026403, 0x00000012, 0x0401f0c2,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x00101eb0, 0x040200c4,</div><div class='del'>-	0x0201f800, 0x00104836, 0x040206f7, 0x0201f800,</div><div class='del'>-	0x00104728, 0x0400003e, 0x59cc0407, 0x48026419,</div><div class='del'>-	0x59cc1207, 0x480a6219, 0x82080580, 0x0000ffff,</div><div class='del'>-	0x04000005, 0x0201f800, 0x001091d9, 0x0400002c,</div><div class='del'>-	0x0401f006, 0x59cc1407, 0x41327800, 0x0201f800,</div><div class='del'>-	0x0010a217, 0x04000026, 0x59cc0c07, 0x591c0202,</div><div class='del'>-	0x80040580, 0x04020022, 0x4d300000, 0x411e6000,</div><div class='del'>-	0x0201f800, 0x0010898b, 0x5c026000, 0x59cc0c09,</div><div class='del'>-	0x82040d00, 0x0000ff00, 0x840409c0, 0x0201f800,</div><div class='del'>-	0x0010a745, 0x04000016, 0x82040580, 0x00000001,</div><div class='del'>-	0x0400000a, 0x82040580, 0x00000005, 0x04000004,</div><div class='del'>-	0x82040580, 0x00000007, 0x04020007, 0x591c0008,</div><div class='del'>-	0x80000540, 0x04000004, 0x59cc2808, 0x0201f000,</div><div class='del'>-	0x0010a2fc, 0x4803c856, 0x4a02641a, 0x00000009,</div><div class='del'>-	0x4a02621a, 0x00002a00, 0x0401f006, 0x4803c856,</div><div class='del'>-	0x4a02641a, 0x00000003, 0x4a02621a, 0x00000300,</div><div class='del'>-	0x4a026403, 0x0000003b, 0x0401f07b, 0x4803c856,</div><div class='del'>-	0x4a02641a, 0x0000000b, 0x4a02621a, 0x00000000,</div><div class='del'>-	0x0401f7f8, 0x4c080000, 0x0201f800, 0x0010473b,</div><div class='del'>-	0x04000026, 0x0201f800, 0x00104711, 0x0201f800,</div><div class='del'>-	0x0010a41c, 0x0402001e, 0x59a80026, 0x82000540,</div><div class='del'>-	0x00000003, 0x48035026, 0x59a8001d, 0x800000d0,</div><div class='del'>-	0x59a80810, 0x82040d00, 0x000000ff, 0x80041540,</div><div class='del'>-	0x480b5010, 0x42000800, 0x00000003, 0x0201f800,</div><div class='del'>-	0x001069af, 0x497b5028, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04000003, 0x4a032804, 0x000007d0, 0x8c00050a,</div><div class='del'>-	0x0402000a, 0x0201f800, 0x000208b4, 0x0201f800,</div><div class='del'>-	0x00101bf0, 0x5c001000, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x0010a43e, 0x0401f7fc, 0x5c001000, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x0201f800, 0x00101eb0, 0x0402004c,</div><div class='del'>-	0x0201f800, 0x0010a443, 0x4a026403, 0x00000047,</div><div class='del'>-	0x4a026203, 0x00000001, 0x0201f000, 0x00106470,</div><div class='del'>-	0x0201f800, 0x00101eb0, 0x04020041, 0x0201f800,</div><div class='del'>-	0x0010a443, 0x4a026403, 0x00000047, 0x4a026203,</div><div class='del'>-	0x00000001, 0x0201f000, 0x00106470, 0x0201f800,</div><div class='del'>-	0x00101eb0, 0x04020036, 0x0201f800, 0x0010a443,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x0401f834, 0x04000030,</div><div class='del'>-	0x4a026403, 0x0000004e, 0x4a026203, 0x00000001,</div><div class='del'>-	0x0201f000, 0x00106470, 0x4a026403, 0x0000004f,</div><div class='del'>-	0x497a601c, 0x59cc0a06, 0x82040d00, 0x000000ff,</div><div class='del'>-	0x800409c0, 0x0400065f, 0x82040580, 0x00000001,</div><div class='del'>-	0x04020005, 0x59cc0808, 0x59a80005, 0x80040580,</div><div class='del'>-	0x04000658, 0x82040580, 0x00000002, 0x0402000a,</div><div class='del'>-	0x83cc1400, 0x0000000b, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83341c00, 0x00000006, 0x0201f800, 0x001082ff,</div><div class='del'>-	0x0400064c, 0x4a02601c, 0x00000001, 0x0401f649,</div><div class='del'>-	0x4a026403, 0x00000050, 0x59cc0207, 0x4802601c,</div><div class='del'>-	0x0401f644, 0x4a026203, 0x00000001, 0x42000800,</div><div class='del'>-	0x80000040, 0x0201f000, 0x00020855, 0x4803c857,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x4d2c0000, 0x4c500000,</div><div class='del'>-	0x4c580000, 0x4c540000, 0x59a80016, 0x82000c80,</div><div class='del'>-	0x00000841, 0x0402102d, 0x0201f800, 0x00100819,</div><div class='del'>-	0x0400002a, 0x492e6008, 0x59a80016, 0x48025802,</div><div class='del'>-	0x82000400, 0x00000003, 0x80000104, 0x83cca400,</div><div class='del'>-	0x00000006, 0x82000c80, 0x0000000b, 0x04001015,</div><div class='del'>-	0x4a025811, 0x0000000b, 0x4200b000, 0x0000000b,</div><div class='del'>-	0x832c0400, 0x00000005, 0x4000a800, 0x0201f800,</div><div class='del'>-	0x0010a93e, 0x412c7000, 0x800409c0, 0x04020003,</div><div class='del'>-	0x49787001, 0x0401f00e, 0x0201f800, 0x00100819,</div><div class='del'>-	0x0400000e, 0x492c7001, 0x40040000, 0x0401f7ea,</div><div class='del'>-	0x48025811, 0x4000b000, 0x832c0400, 0x00000005,</div><div class='del'>-	0x4000a800, 0x0201f800, 0x0010a93e, 0x82000540,</div><div class='del'>-	0x00000001, 0x0401f006, 0x497b5016, 0x59325808,</div><div class='del'>-	0x0201f800, 0x00100843, 0x80000580, 0x5c00a800,</div><div class='del'>-	0x5c00b000, 0x5c00a000, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x4d340000, 0x59326809, 0x59343400, 0x4933c857,</div><div class='del'>-	0x4937c857, 0x481bc857, 0x0201f800, 0x00104842,</div><div class='del'>-	0x5c026800, 0x1c01f000, 0x4933c857, 0x4c600000,</div><div class='del'>-	0x4c5c0000, 0x4d3c0000, 0x4d440000, 0x4d340000,</div><div class='del'>-	0x0401f84f, 0x04020037, 0x59cc0207, 0x82000d00,</div><div class='del'>-	0x0000ff00, 0x900411c0, 0x59cc000a, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x80081540, 0x480a601c, 0x8c040d18,</div><div class='del'>-	0x04000011, 0x42003000, 0x00000008, 0x0201f800,</div><div class='del'>-	0x0010a756, 0x42000000, 0x0010b662, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x4200b800, 0x00000002, 0x4200c000,</div><div class='del'>-	0x00000001, 0x417a7800, 0x0201f800, 0x00101e48,</div><div class='del'>-	0x0401f01f, 0x4178b800, 0x8c040d1a, 0x04000019,</div><div class='del'>-	0x59cc000a, 0x0201f800, 0x001059b9, 0x02000800,</div><div class='del'>-	0x00020267, 0x04020013, 0x59300009, 0x4c000000,</div><div class='del'>-	0x49366009, 0x42003000, 0x00000009, 0x0201f800,</div><div class='del'>-	0x0010a75e, 0x42000000, 0x0010b662, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x417a7800, 0x4178c000, 0x0201f800,</div><div class='del'>-	0x00101e48, 0x5c000000, 0x48026009, 0x0401f004,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f003, 0x405c2800,</div><div class='del'>-	0x80000580, 0x5c026800, 0x5c028800, 0x5c027800,</div><div class='del'>-	0x5c00b800, 0x5c00c000, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x59cc0206, 0x82000480, 0x00000010, 0x04021006,</div><div class='del'>-	0x4a02621a, 0x00000000, 0x82000540, 0x00000001,</div><div class='del'>-	0x0401f002, 0x80000580, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x4a02621a, 0x00000000, 0x59cc0407, 0x82000500,</div><div class='del'>-	0x0000ff00, 0x82000580, 0x00000800, 0x04020009,</div><div class='del'>-	0x59cc0006, 0x82000500, 0x00ff0000, 0x82000d80,</div><div class='del'>-	0x00140000, 0x04000003, 0x82000d80, 0x00100000,</div><div class='del'>-	0x1c01f000, 0x59300403, 0x82003480, 0x00000051,</div><div class='del'>-	0x02021800, 0x00100615, 0x83383580, 0x00000013,</div><div class='del'>-	0x04020003, 0x4803c857, 0x0c01f016, 0x4933c857,</div><div class='del'>-	0x493bc857, 0x83383580, 0x00000027, 0x04000005,</div><div class='del'>-	0x83383580, 0x00000014, 0x02020800, 0x00100615,</div><div class='del'>-	0x493bc857, 0x4937c857, 0x0201f800, 0x00104711,</div><div class='del'>-	0x42000800, 0x00000007, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0201f800, 0x001068f6, 0x0201f000, 0x00107698,</div><div class='del'>-	0x00109c29, 0x00109c32, 0x00109c29, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c32, 0x00109c3d, 0x00109cb0,</div><div class='del'>-	0x00109c82, 0x00109cb0, 0x00109c9a, 0x00109cb0,</div><div class='del'>-	0x00109ca1, 0x00109cb0, 0x00109ca9, 0x00109cb0,</div><div class='del'>-	0x00109ca9, 0x00109cb0, 0x00109cb0, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c29, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c29, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c32, 0x00109c29,</div><div class='del'>-	0x00109cb0, 0x00109c29, 0x00109c29, 0x00109cb0,</div><div class='del'>-	0x00109c29, 0x00109cad, 0x00109cb0, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c29, 0x00109cb0,</div><div class='del'>-	0x00109cb0, 0x00109c29, 0x00109ca6, 0x00109cb0,</div><div class='del'>-	0x00109c29, 0x00109c37, 0x00109c29, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109cac, 0x00109cb0,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109cb0, 0x00109cb0,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c29, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c29, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c2b, 0x00109c29, 0x00109c2b,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c2b, 0x00109c29,</div><div class='del'>-	0x00109c29, 0x00109c29, 0x00109c2b, 0x00109c2b,</div><div class='del'>-	0x00109c2b, 0x0201f800, 0x00100615, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00100843, 0x5c025800,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x59a80037, 0x48026206,</div><div class='del'>-	0x4a026203, 0x00000002, 0x1c01f000, 0x4d3c0000,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x001043bd, 0x5c027800,</div><div class='del'>-	0x0401f074, 0x42000800, 0x00000007, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x59a80026, 0x8c000508, 0x04000012,</div><div class='del'>-	0x59326809, 0x4c580000, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83a81c00, 0x00000002, 0x83341400, 0x00000006,</div><div class='del'>-	0x0201f800, 0x001082ff, 0x80000540, 0x5c00b000,</div><div class='del'>-	0x04020060, 0x59340200, 0x8400051a, 0x48026a00,</div><div class='del'>-	0x0401f01b, 0x599c0017, 0x8c00050a, 0x04020059,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x001043bd,</div><div class='del'>-	0x5c027800, 0x42000800, 0x00000007, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x59340212, 0x82000500, 0x0000ff00,</div><div class='del'>-	0x0400004c, 0x599c0019, 0x8c00050e, 0x04020049,</div><div class='del'>-	0x416c0000, 0x82000580, 0x00000002, 0x04020004,</div><div class='del'>-	0x59a8001b, 0x80000000, 0x4803501b, 0x42000800,</div><div class='del'>-	0x00000003, 0x0201f800, 0x001043c7, 0x4a026406,</div><div class='del'>-	0x00000001, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000002, 0x0201f800, 0x00106470, 0x4ce80000,</div><div class='del'>-	0x4201d000, 0x00000001, 0x0201f800, 0x00105ce7,</div><div class='del'>-	0x5c01d000, 0x1c01f000, 0x0201f800, 0x00104842,</div><div class='del'>-	0x0400002c, 0x0201f800, 0x00106196, 0x42000800,</div><div class='del'>-	0x00000004, 0x0201f800, 0x001043c7, 0x0201f800,</div><div class='del'>-	0x0010a791, 0x04020023, 0x42000800, 0x00000005,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x4a026406, 0x00000001,</div><div class='del'>-	0x4a026203, 0x00000001, 0x4a026403, 0x00000003,</div><div class='del'>-	0x0201f000, 0x00106470, 0x0201f800, 0x0010484b,</div><div class='del'>-	0x04020014, 0x42000800, 0x00000006, 0x0401f813,</div><div class='del'>-	0x0401f010, 0x42000800, 0x00000004, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x0401f79c, 0x42000800, 0x00000004,</div><div class='del'>-	0x0401f006, 0x0201f800, 0x00104711, 0x0401f005,</div><div class='del'>-	0x0401f004, 0x0401f003, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x4933c857, 0x4807c857,</div><div class='del'>-	0x0201f800, 0x001043c7, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x5c027800, 0x0201f000,</div><div class='del'>-	0x00104711, 0x59340400, 0x4803c857, 0x80000110,</div><div class='del'>-	0x82003480, 0x0000000c, 0x02021800, 0x00100615,</div><div class='del'>-	0x83383580, 0x00000015, 0x04020002, 0x0c01f006,</div><div class='del'>-	0x83383580, 0x00000016, 0x02020800, 0x00100615,</div><div class='del'>-	0x0c01f00d, 0x00107e42, 0x00107e42, 0x00107e42,</div><div class='del'>-	0x00107e42, 0x00107e42, 0x00107e42, 0x00109d11,</div><div class='del'>-	0x00109ce5, 0x00107e42, 0x00107e42, 0x00107e42,</div><div class='del'>-	0x00107e42, 0x00107e42, 0x00107e42, 0x00107e42,</div><div class='del'>-	0x00107e42, 0x00107e42, 0x00107e42, 0x00109d11,</div><div class='del'>-	0x00109d18, 0x00107e42, 0x00107e42, 0x00107e42,</div><div class='del'>-	0x00107e42, 0x4933c857, 0x599c0017, 0x8c00050a,</div><div class='del'>-	0x0402001b, 0x813669c0, 0x04000019, 0x59340212,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x04000015, 0x599c0019,</div><div class='del'>-	0x8c00050e, 0x04020012, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x001043bd, 0x5c027800, 0x42000800,</div><div class='del'>-	0x00000003, 0x0201f800, 0x001043c7, 0x4a026406,</div><div class='del'>-	0x00000001, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000002, 0x0201f000, 0x00106470, 0x59cc0001,</div><div class='del'>-	0x59340802, 0x80040580, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x02020000, 0x000208b4, 0x59345002, 0x0201f800,</div><div class='del'>-	0x001040e4, 0x482a6802, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x59303403, 0x82183580,</div><div class='del'>-	0x0000001e, 0x02000000, 0x000208b4, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x0201f800, 0x00108180, 0x02020000,</div><div class='del'>-	0x000208b4, 0x4a026203, 0x00000001, 0x4a026403,</div><div class='del'>-	0x00000001, 0x0201f000, 0x00106470, 0x493bc857,</div><div class='del'>-	0x83380580, 0x00000051, 0x0402000b, 0x0201f800,</div><div class='del'>-	0x00106cb4, 0x02020000, 0x001076fb, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000002, 0x0400006e, 0x0201f800,</div><div class='del'>-	0x00100615, 0x83380580, 0x00000027, 0x04000014,</div><div class='del'>-	0x83380580, 0x00000048, 0x04000006, 0x83380580,</div><div class='del'>-	0x00000014, 0x0400000e, 0x02020800, 0x00100615,</div><div class='del'>-	0x0201f800, 0x00106cb4, 0x02020000, 0x001076fb,</div><div class='del'>-	0x59300203, 0x82000580, 0x00000004, 0x02000000,</div><div class='del'>-	0x000209a5, 0x0201f800, 0x00100615, 0x4933c857,</div><div class='del'>-	0x59300403, 0x82000c80, 0x00000044, 0x02021800,</div><div class='del'>-	0x00100615, 0x82000480, 0x00000040, 0x02001800,</div><div class='del'>-	0x00100615, 0x40027000, 0x4803c857, 0x0c01f001,</div><div class='del'>-	0x00109d58, 0x00109d5a, 0x00109d5a, 0x00109d75,</div><div class='del'>-	0x0201f800, 0x00100615, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x59325808, 0x812e59c0, 0x04000016, 0x832c0500,</div><div class='del'>-	0x00ff0000, 0x04000013, 0x4a026203, 0x00000002,</div><div class='del'>-	0x59326809, 0x59340200, 0x8c00050e, 0x0402000d,</div><div class='del'>-	0x42028000, 0x00000004, 0x0201f800, 0x0010a201,</div><div class='del'>-	0x497a6008, 0x59300206, 0x80000540, 0x04020003,</div><div class='del'>-	0x59a80038, 0x48026206, 0x4a026203, 0x00000007,</div><div class='del'>-	0x1c01f000, 0x0201f800, 0x001068f6, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x02000000, 0x00107698, 0x59325808,</div><div class='del'>-	0x0201f800, 0x0010083a, 0x0201f000, 0x00107698,</div><div class='del'>-	0x0201f800, 0x00100615, 0x59325808, 0x592c040a,</div><div class='del'>-	0x8c000502, 0x04000007, 0x4a026203, 0x00000007,</div><div class='del'>-	0x42027000, 0x00000043, 0x0201f000, 0x000208d8,</div><div class='del'>-	0x4a026203, 0x00000004, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x0010a3b6, 0x02000000, 0x000209a3, 0x1c01f000,</div><div class='del'>-	0x4a026203, 0x00000001, 0x4a026403, 0x00000041,</div><div class='del'>-	0x42027800, 0x80002042, 0x0201f000, 0x00020855,</div><div class='del'>-	0x83380580, 0x00000051, 0x04000006, 0x83380580,</div><div class='del'>-	0x00000041, 0x02020800, 0x00100615, 0x1c01f000,</div><div class='del'>-	0x0201f800, 0x00020831, 0x0201f800, 0x0010a3fa,</div><div class='del'>-	0x0201f000, 0x000208b4, 0x83380480, 0x00000052,</div><div class='del'>-	0x02021800, 0x00100615, 0x83380480, 0x00000049,</div><div class='del'>-	0x02001800, 0x00100615, 0x0c01f001, 0x00109dbe,</div><div class='del'>-	0x00109ddf, 0x00109dbc, 0x00109dbc, 0x00109dbc,</div><div class='del'>-	0x00109dbc, 0x00109ddf, 0x00109dbc, 0x00109e01,</div><div class='del'>-	0x0201f800, 0x00100615, 0x59325808, 0x592c040a,</div><div class='del'>-	0x8c00051e, 0x0400000d, 0x82000d00, 0x000000c0,</div><div class='del'>-	0x82040d80, 0x00000080, 0x0400000d, 0x59300804,</div><div class='del'>-	0x8c040d18, 0x0402000a, 0x42027000, 0x00000041,</div><div class='del'>-	0x0201f000, 0x000209c4, 0x4a026203, 0x00000007,</div><div class='del'>-	0x497a6206, 0x0201f000, 0x00020831, 0x59325808,</div><div class='del'>-	0x592c0c0a, 0x8c040d1a, 0x04020005, 0x0201f800,</div><div class='del'>-	0x00020831, 0x0201f000, 0x000208b4, 0x0201f800,</div><div class='del'>-	0x0010a3b6, 0x040007fa, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x001068c1, 0x59325808, 0x59326809, 0x59340200,</div><div class='del'>-	0x8c00050e, 0x0400000e, 0x592c040a, 0x82000500,</div><div class='del'>-	0x000000c0, 0x82000580, 0x00000080, 0x04000005,</div><div class='del'>-	0x592c000f, 0x59301815, 0x800c1c80, 0x480e6015,</div><div class='del'>-	0x4a026203, 0x00000002, 0x0401f00e, 0x42028000,</div><div class='del'>-	0x00000004, 0x0201f800, 0x0010a201, 0x59300206,</div><div class='del'>-	0x80000540, 0x04020004, 0x59a80038, 0x800000c2,</div><div class='del'>-	0x48026206, 0x497a6008, 0x4a026203, 0x00000007,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x0201f800, 0x00106cb4,</div><div class='del'>-	0x02020800, 0x00100615, 0x59300203, 0x82000580,</div><div class='del'>-	0x00000002, 0x04000793, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4a026203, 0x00000007, 0x497a6206, 0x0201f000,</div><div class='del'>-	0x00020831, 0x4a026203, 0x00000007, 0x497a6206,</div><div class='del'>-	0x0201f000, 0x0002082c, 0x59300414, 0x8c00051c,</div><div class='del'>-	0x02020000, 0x000209b5, 0x59325808, 0x592c200f,</div><div class='del'>-	0x40080000, 0x80102480, 0x59300015, 0x80102400,</div><div class='del'>-	0x48126015, 0x0201f000, 0x000209b5, 0x8c040d0e,</div><div class='del'>-	0x0402000a, 0x4a026203, 0x00000006, 0x0401f823,</div><div class='del'>-	0x5930001f, 0x80000540, 0x02020800, 0x00100dc4,</div><div class='del'>-	0x0201f000, 0x0002082c, 0x4a026203, 0x00000002,</div><div class='del'>-	0x1c01f000, 0x42000800, 0x00000001, 0x0201f800,</div><div class='del'>-	0x00100dc4, 0x82040580, 0x00000001, 0x02000000,</div><div class='del'>-	0x000209bc, 0x0401f7d8, 0x59300414, 0x8c00051c,</div><div class='del'>-	0x04000006, 0x0201f800, 0x00100bad, 0x02000000,</div><div class='del'>-	0x000209ae, 0x1c01f000, 0x59300011, 0x80000540,</div><div class='del'>-	0x04020005, 0x0201f800, 0x00100bad, 0x02000000,</div><div class='del'>-	0x000209ae, 0x1c01f000, 0x492fc857, 0x480bc857,</div><div class='del'>-	0x8c08153e, 0x04000006, 0x80081080, 0x80081000,</div><div class='del'>-	0x42000800, 0x00000009, 0x0401f003, 0x42000800,</div><div class='del'>-	0x00000015, 0x480a580b, 0x1c01f000, 0x83380580,</div><div class='del'>-	0x00000013, 0x04000005, 0x83380580, 0x00000014,</div><div class='del'>-	0x02020800, 0x00100615, 0x59300414, 0x8c000516,</div><div class='del'>-	0x02000800, 0x00100615, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x00100615, 0x59300008, 0x80000540, 0x02020800,</div><div class='del'>-	0x00100615, 0x1c01f000, 0x59300414, 0x8c000516,</div><div class='del'>-	0x02000800, 0x00100615, 0x1c01f000, 0x4a026203,</div><div class='del'>-	0x00000004, 0x493a6403, 0x42000800, 0x80002001,</div><div class='del'>-	0x0201f000, 0x00020855, 0x4a026203, 0x00000003,</div><div class='del'>-	0x493a6403, 0x0201f800, 0x000200ca, 0x59325808,</div><div class='del'>-	0x592c040a, 0x8c00051e, 0x04000012, 0x82000500,</div><div class='del'>-	0x000000c0, 0x82000580, 0x00000080, 0x04000011,</div><div class='del'>-	0x59300414, 0x8c000512, 0x0402000a, 0x8c000510,</div><div class='del'>-	0x04020008, 0x592c040c, 0x80000540, 0x04020005,</div><div class='del'>-	0x82080d40, 0x80003065, 0x0201f000, 0x00106466,</div><div class='del'>-	0x82080d40, 0x80002065, 0x0201f000, 0x00106466,</div><div class='del'>-	0x82080d40, 0x80002042, 0x0201f000, 0x00106466,</div><div class='del'>-	0x4933c857, 0x493bc857, 0x83380480, 0x00000044,</div><div class='del'>-	0x02021800, 0x00100615, 0x83380480, 0x00000041,</div><div class='del'>-	0x02001800, 0x00100615, 0x0c01f001, 0x00109ea6,</div><div class='del'>-	0x00109eb6, 0x00109ecb, 0x59325808, 0x592c040a,</div><div class='del'>-	0x8c00051e, 0x0400001d, 0x82001d00, 0x000000c0,</div><div class='del'>-	0x820c1d80, 0x000000c0, 0x04000018, 0x4a026203,</div><div class='del'>-	0x00000001, 0x493a6403, 0x42000800, 0x80002042,</div><div class='del'>-	0x0201f000, 0x00020855, 0x59325808, 0x592c040a,</div><div class='del'>-	0x8c00051e, 0x0400000d, 0x82001d00, 0x000000c0,</div><div class='del'>-	0x820c1d80, 0x000000c0, 0x04000008, 0x4a026203,</div><div class='del'>-	0x00000001, 0x493a6403, 0x42000800, 0x80002001,</div><div class='del'>-	0x0201f000, 0x00020855, 0x497a6008, 0x497a6206,</div><div class='del'>-	0x42028000, 0x00000004, 0x0401f337, 0x59325808,</div><div class='del'>-	0x592c040a, 0x8c00051e, 0x040007f8, 0x82001d00,</div><div class='del'>-	0x000000c0, 0x820c1d80, 0x000000c0, 0x040007f3,</div><div class='del'>-	0x4a026203, 0x00000003, 0x493a6403, 0x0201f800,</div><div class='del'>-	0x000200ca, 0x82080d40, 0x80002065, 0x0201f000,</div><div class='del'>-	0x00106466, 0x4933c857, 0x493bc857, 0x83380580,</div><div class='del'>-	0x00000085, 0x04000006, 0x83380580, 0x00000088,</div><div class='del'>-	0x0400000a, 0x0201f800, 0x00100615, 0x4a026203,</div><div class='del'>-	0x00000009, 0x493a6403, 0x42000800, 0x8000004b,</div><div class='del'>-	0x0201f000, 0x00020855, 0x4d1c0000, 0x813669c0,</div><div class='del'>-	0x04000004, 0x0201f800, 0x0010a3b0, 0x04020044,</div><div class='del'>-	0x59cc1404, 0x0401f846, 0x04000018, 0x591c0406,</div><div class='del'>-	0x82000500, 0x0000001f, 0x82002580, 0x00000006,</div><div class='del'>-	0x04000007, 0x82002580, 0x00000004, 0x0400002e,</div><div class='del'>-	0x82002580, 0x00000011, 0x0402000c, 0x497a3a05,</div><div class='del'>-	0x42002000, 0x00000054, 0x0201f800, 0x001077d1,</div><div class='del'>-	0x4a026203, 0x00000007, 0x493a6403, 0x0201f800,</div><div class='del'>-	0x0010a79b, 0x0401f02c, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x04000004, 0x42023800, 0xffffffff, 0x0401f7f1,</div><div class='del'>-	0x813669c0, 0x04020009, 0x59cc0001, 0x0201f800,</div><div class='del'>-	0x001059b9, 0x0402001e, 0x0201f800, 0x001043fc,</div><div class='del'>-	0x0402001b, 0x49366009, 0x4a026403, 0x00000087,</div><div class='del'>-	0x59cc1204, 0x82081580, 0x0000ffff, 0x04020003,</div><div class='del'>-	0x4a026403, 0x00000086, 0x4a026203, 0x00000001,</div><div class='del'>-	0x42000800, 0x80000040, 0x0201f800, 0x00020855,</div><div class='del'>-	0x0401f00d, 0x591c0203, 0x82000580, 0x00000007,</div><div class='del'>-	0x040207de, 0x4d300000, 0x411e6000, 0x0201f800,</div><div class='del'>-	0x00107698, 0x5c026000, 0x0401f7d8, 0x0201f800,</div><div class='del'>-	0x00107698, 0x5c023800, 0x1c01f000, 0x4933c857,</div><div class='del'>-	0x480bc857, 0x42002800, 0x0010cfc0, 0x41300000,</div><div class='del'>-	0x80140580, 0x04000017, 0x58140203, 0x82000580,</div><div class='del'>-	0x00000000, 0x04000013, 0x58140202, 0x80080580,</div><div class='del'>-	0x04020010, 0x58141c06, 0x820c0580, 0x00000005,</div><div class='del'>-	0x0400000c, 0x820c0580, 0x00000009, 0x0400001d,</div><div class='del'>-	0x59302009, 0x58140009, 0x800001c0, 0x0400000b,</div><div class='del'>-	0x801021c0, 0x04000003, 0x80100580, 0x04000010,</div><div class='del'>-	0x82142c00, 0x00000024, 0x41540000, 0x80140480,</div><div class='del'>-	0x0402100e, 0x0401f7e2, 0x5814001e, 0x801021c0,</div><div class='del'>-	0x04000005, 0x58102002, 0x82102500, 0x00ffffff,</div><div class='del'>-	0x0401f7f2, 0x5810201e, 0x0401f7f0, 0x40163800,</div><div class='del'>-	0x81300540, 0x0401f002, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x58141807, 0x8c0c1d10, 0x040207ea, 0x0401f7e1,</div><div class='del'>-	0x83380580, 0x00000013, 0x0402000e, 0x59300403,</div><div class='del'>-	0x4803c857, 0x82000c80, 0x00000085, 0x02001800,</div><div class='del'>-	0x00100615, 0x82000c80, 0x00000093, 0x02021800,</div><div class='del'>-	0x00100615, 0x82000480, 0x00000085, 0x0c01f019,</div><div class='del'>-	0x83380580, 0x00000027, 0x04000005, 0x83380580,</div><div class='del'>-	0x00000014, 0x02020000, 0x001076fb, 0x493bc857,</div><div class='del'>-	0x0201f800, 0x001068f6, 0x59325808, 0x812e59c0,</div><div class='del'>-	0x02000000, 0x00107698, 0x4a025a06, 0x00000031,</div><div class='del'>-	0x4a025811, 0x00000004, 0x4a025812, 0x000000ff,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f000, 0x00107698,</div><div class='del'>-	0x00109fa6, 0x00109fad, 0x00109fad, 0x00109fa6,</div><div class='del'>-	0x00109fa6, 0x00109fa6, 0x00109fa6, 0x00109fa6,</div><div class='del'>-	0x00109fa6, 0x00109fa6, 0x00109fa6, 0x00109fa6,</div><div class='del'>-	0x00109fa6, 0x00109fa8, 0x0201f800, 0x00100615,</div><div class='del'>-	0x59325808, 0x4a025a06, 0x00000000, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f000, 0x000208b4, 0x4933c857,</div><div class='del'>-	0x42000000, 0x0010b672, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0201f800, 0x0010a3fa, 0x497a6205, 0x42028000,</div><div class='del'>-	0x0000000b, 0x0401f807, 0x4a026406, 0x00000006,</div><div class='del'>-	0x4a026203, 0x00000007, 0x497a6206, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x4943c857, 0x59300406, 0x82000580,</div><div class='del'>-	0x00000007, 0x04020002, 0x1c01f000, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x4df00000, 0x0201f800, 0x00108a99,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x00109ff4, 0x00109ff8, 0x00109fdf,</div><div class='del'>-	0x0010a006, 0x0010a019, 0x00109fdf, 0x00109fdf,</div><div class='del'>-	0x00109fdf, 0x00109fdf, 0x00109fdf, 0x00109fdf,</div><div class='del'>-	0x00109fdf, 0x00109fdf, 0x00109fdf, 0x4d400000,</div><div class='del'>-	0x5930001f, 0x80000540, 0x04000005, 0x41400800,</div><div class='del'>-	0x0201f800, 0x00100dc4, 0x40068000, 0x4d2c0000,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108df4, 0x04020a16,</div><div class='del'>-	0x4c5c0000, 0x5930b809, 0x0201f800, 0x00107698,</div><div class='del'>-	0x485e6009, 0x5c00b800, 0x5c025800, 0x5c028000,</div><div class='del'>-	0x5c03e000, 0x02000000, 0x00106982, 0x1c01f000,</div><div class='del'>-	0x598c000d, 0x81300580, 0x04020004, 0x0201f800,</div><div class='del'>-	0x00106be2, 0x04020016, 0x0201f800, 0x00106619,</div><div class='del'>-	0x040007df, 0x0201f800, 0x001068a3, 0x04000010,</div><div class='del'>-	0x0201f800, 0x00100615, 0x0201f800, 0x00108a8a,</div><div class='del'>-	0x04020004, 0x0201f800, 0x00106bb2, 0x04020008,</div><div class='del'>-	0x0201f800, 0x001064f6, 0x040007d1, 0x0201f800,</div><div class='del'>-	0x001068a3, 0x02020800, 0x00100615, 0x59300203,</div><div class='del'>-	0x82000c80, 0x0000000e, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f7b9, 0x0201f800, 0x00100ee4, 0x0401f7c4,</div><div class='del'>-	0x4933c857, 0x4d440000, 0x4d340000, 0x59cc0007,</div><div class='del'>-	0x0201f800, 0x001059b9, 0x02000800, 0x00020267,</div><div class='del'>-	0x0402001a, 0x59300009, 0x4c000000, 0x49366009,</div><div class='del'>-	0x42003000, 0x0000000b, 0x0201f800, 0x0010a766,</div><div class='del'>-	0x42000000, 0x0010b660, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x4d3c0000, 0x4d400000, 0x42028000, 0x00000029,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00101de2, 0x5c028000,</div><div class='del'>-	0x5c027800, 0x5c000000, 0x48026009, 0x59cc0007,</div><div class='del'>-	0x48026802, 0x80000580, 0x5c026800, 0x5c028800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4c040000, 0x59a80016,</div><div class='del'>-	0x82000580, 0x00000074, 0x04020040, 0x59cc0a08,</div><div class='del'>-	0x82040480, 0x00000100, 0x04001033, 0x59cc0c08,</div><div class='del'>-	0x82040500, 0x00008000, 0x04000035, 0x59a80032,</div><div class='del'>-	0x80000540, 0x04020009, 0x59301009, 0x58080212,</div><div class='del'>-	0x82000500, 0x0000ff00, 0x04000004, 0x82040500,</div><div class='del'>-	0x00000800, 0x0400002a, 0x59cc0c09, 0x80040840,</div><div class='del'>-	0x04001024, 0x59a80826, 0x8c040d06, 0x04000004,</div><div class='del'>-	0x59cc0c0f, 0x8c040d1e, 0x04020012, 0x59cc0a17,</div><div class='del'>-	0x800409c0, 0x04020012, 0x59cc0a18, 0x82040480,</div><div class='del'>-	0x00000100, 0x04001014, 0x59cc0c18, 0x800409c0,</div><div class='del'>-	0x0402000e, 0x59cc0c19, 0x80040840, 0x04001011,</div><div class='del'>-	0x59cc0c1a, 0x80040840, 0x04001011, 0x0401f018,</div><div class='del'>-	0x4a02621a, 0x00000100, 0x0401f012, 0x4a02621a,</div><div class='del'>-	0x00000300, 0x0401f00f, 0x4a02621a, 0x00000500,</div><div class='del'>-	0x0401f00c, 0x4a02621a, 0x00000700, 0x0401f009,</div><div class='del'>-	0x4a02621a, 0x00000900, 0x0401f006, 0x4a02621a,</div><div class='del'>-	0x00000f00, 0x0401f003, 0x4a02621a, 0x00002d00,</div><div class='del'>-	0x82000540, 0x00000001, 0x0401f002, 0x80000580,</div><div class='del'>-	0x5c000800, 0x1c01f000, 0x59cc0407, 0x4803c857,</div><div class='del'>-	0x82000580, 0x00000800, 0x04000003, 0x4a02621a,</div><div class='del'>-	0x00000000, 0x1c01f000, 0x4933c857, 0x4c580000,</div><div class='del'>-	0x59cc000c, 0x59340802, 0x82040d00, 0x00ffffff,</div><div class='del'>-	0x80040580, 0x04020012, 0x83cc1400, 0x00000008,</div><div class='del'>-	0x4200b000, 0x00000002, 0x83341c00, 0x00000006,</div><div class='del'>-	0x0201f800, 0x001082ff, 0x04020009, 0x83cc1400,</div><div class='del'>-	0x0000000a, 0x4200b000, 0x00000002, 0x83341c00,</div><div class='del'>-	0x00000008, 0x0201f800, 0x001082ff, 0x5c00b000,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x4c580000, 0x83cc1400,</div><div class='del'>-	0x0000000b, 0x4200b000, 0x00000002, 0x83341c00,</div><div class='del'>-	0x00000006, 0x0201f800, 0x001082ff, 0x0402000c,</div><div class='del'>-	0x83cc1400, 0x0000000d, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83341c00, 0x00000008, 0x0201f800, 0x001082ff,</div><div class='del'>-	0x04000014, 0x4933c856, 0x4933c856, 0x4933c857,</div><div class='del'>-	0x59340009, 0x4803c857, 0x5934000e, 0x4803c857,</div><div class='del'>-	0x59340008, 0x4803c857, 0x5934000d, 0x4803c857,</div><div class='del'>-	0x59340007, 0x4803c857, 0x5934000c, 0x4803c857,</div><div class='del'>-	0x59340006, 0x4803c857, 0x5934000b, 0x4803c857,</div><div class='del'>-	0x5c00b000, 0x1c01f000, 0x4933c857, 0x4947c857,</div><div class='del'>-	0x4943c857, 0x4c600000, 0x0201f800, 0x0010698c,</div><div class='del'>-	0x4df00000, 0x4d2c0000, 0x4d300000, 0x4d340000,</div><div class='del'>-	0x0401f8d8, 0x4130c000, 0x42026000, 0x0010cfc0,</div><div class='del'>-	0x59a8000e, 0x8060c1c0, 0x04000005, 0x82601580,</div><div class='del'>-	0x0010bbe8, 0x04000002, 0x80000040, 0x81640480,</div><div class='del'>-	0x040210c4, 0x40600000, 0x81300580, 0x040000bc,</div><div class='del'>-	0x0401f9bc, 0x040200ba, 0x59326809, 0x59300406,</div><div class='del'>-	0x82000c80, 0x00000012, 0x02021800, 0x00100615,</div><div class='del'>-	0x0c01f001, 0x0010a1af, 0x0010a118, 0x0010a133,</div><div class='del'>-	0x0010a13e, 0x0010a111, 0x0010a12c, 0x0010a169,</div><div class='del'>-	0x0010a1af, 0x0010a10f, 0x0010a17c, 0x0010a190,</div><div class='del'>-	0x0010a10f, 0x0010a10f, 0x0010a10f, 0x0010a10f,</div><div class='del'>-	0x0010a1af, 0x0010a1a6, 0x0010a19e, 0x0201f800,</div><div class='del'>-	0x00100615, 0x8d3e7d18, 0x04000003, 0x8d3e7d16,</div><div class='del'>-	0x04000004, 0x59300420, 0x8c000500, 0x04020098,</div><div class='del'>-	0x59300403, 0x82000580, 0x00000043, 0x04000094,</div><div class='del'>-	0x0201f800, 0x00108ef1, 0x04000007, 0x0201f800,</div><div class='del'>-	0x00108f05, 0x0402008c, 0x0201f800, 0x00107da6,</div><div class='del'>-	0x0401f089, 0x0201f800, 0x00101e1b, 0x0201f800,</div><div class='del'>-	0x00108f05, 0x02000800, 0x00107da6, 0x0401f082,</div><div class='del'>-	0x8d3e7d18, 0x04000003, 0x8d3e7d16, 0x04000004,</div><div class='del'>-	0x59300420, 0x8c000500, 0x0402007d, 0x59325808,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x04000077, 0x49425a06,</div><div class='del'>-	0x497a5c09, 0x0201f800, 0x00020381, 0x0201f800,</div><div class='del'>-	0x00108ee7, 0x0401f070, 0x8d3e7d00, 0x04000007,</div><div class='del'>-	0x59300017, 0x81480580, 0x0402006d, 0x59300018,</div><div class='del'>-	0x814c0580, 0x0402006a, 0x59300203, 0x82000580,</div><div class='del'>-	0x00000004, 0x02000800, 0x00100ee4, 0x59325808,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x0400005f, 0x4a025a04,</div><div class='del'>-	0x00000103, 0x59300004, 0x8400055c, 0x48026004,</div><div class='del'>-	0x592c0408, 0x8c000512, 0x04000007, 0x4d2c0000,</div><div class='del'>-	0x592c0009, 0x40025800, 0x0201f800, 0x00100843,</div><div class='del'>-	0x5c025800, 0x49425a06, 0x497a5c09, 0x0401fb4f,</div><div class='del'>-	0x0201f800, 0x00109365, 0x0201f800, 0x00108f7d,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f800, 0x00108ee7,</div><div class='del'>-	0x0401f045, 0x8d3e7d18, 0x04000045, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000004, 0x02000800, 0x00100ee4,</div><div class='del'>-	0x59325808, 0x0201f800, 0x00108df4, 0x0400003a,</div><div class='del'>-	0x49425a06, 0x497a5c09, 0x0401fb38, 0x0201f800,</div><div class='del'>-	0x00109365, 0x0201f800, 0x00020381, 0x0401f032,</div><div class='del'>-	0x0201f800, 0x0010600e, 0x04000031, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000004, 0x0400002d, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020029, 0x0201f800,</div><div class='del'>-	0x001068c1, 0x59325808, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000021, 0x0201f800, 0x00020381, 0x0401f01e,</div><div class='del'>-	0x59300203, 0x82000580, 0x00000004, 0x02000800,</div><div class='del'>-	0x00100ee4, 0x59325808, 0x0201f800, 0x00108df4,</div><div class='del'>-	0x04000015, 0x49425a06, 0x497a5c09, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0401f010, 0x833c0500, 0x00001800,</div><div class='del'>-	0x0400000f, 0x8d3e7d16, 0x0402000d, 0x59325817,</div><div class='del'>-	0x0201f800, 0x00100843, 0x59325808, 0x0201f800,</div><div class='del'>-	0x00108df4, 0x04000004, 0x49425a06, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x00107698, 0x83326400,</div><div class='del'>-	0x00000024, 0x41580000, 0x81300480, 0x04001735,</div><div class='del'>-	0x5c026800, 0x5c026000, 0x5c025800, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x5c00c000, 0x1c01f000,</div><div class='del'>-	0x4933c857, 0x813261c0, 0x0400002d, 0x83300d80,</div><div class='del'>-	0x0010bbe8, 0x0400002a, 0x8d3e7d06, 0x04020028,</div><div class='del'>-	0x59300c06, 0x82040580, 0x00000001, 0x0400000a,</div><div class='del'>-	0x82040580, 0x00000002, 0x04020021, 0x5930021d,</div><div class='del'>-	0x82000580, 0x00000001, 0x0402001d, 0x59300c16,</div><div class='del'>-	0x0401f002, 0x59300c03, 0x82040580, 0x00000039,</div><div class='del'>-	0x04000004, 0x82040580, 0x00000035, 0x04020014,</div><div class='del'>-	0x4d300000, 0x4d1c0000, 0x5932601e, 0x4933c857,</div><div class='del'>-	0x0201f800, 0x001091e3, 0x02000800, 0x00100615,</div><div class='del'>-	0x591c001c, 0x497a381c, 0x591c0c14, 0x84040d02,</div><div class='del'>-	0x48063c14, 0x5c023800, 0x5c026000, 0x81300580,</div><div class='del'>-	0x02020800, 0x00100615, 0x497a601e, 0x1c01f000,</div><div class='del'>-	0x5c000000, 0x4c000000, 0x4803c857, 0x4d3c0000,</div><div class='del'>-	0x42027800, 0x00000001, 0x0201f800, 0x001043bd,</div><div class='del'>-	0x5c027800, 0x4c580000, 0x4200b000, 0x00000002,</div><div class='del'>-	0x83a81c00, 0x00000002, 0x83cc1400, 0x0000000b,</div><div class='del'>-	0x0201f800, 0x001082ff, 0x5c00b000, 0x80000540,</div><div class='del'>-	0x1c01f000, 0x492fc857, 0x4943c857, 0x59a8000c,</div><div class='del'>-	0x812c0480, 0x04001011, 0x59a8000d, 0x812c0480,</div><div class='del'>-	0x0402100e, 0x592c0000, 0x80005d40, 0x04000008,</div><div class='del'>-	0x497a5800, 0x49425a06, 0x4c2c0000, 0x0201f800,</div><div class='del'>-	0x00020381, 0x5c025800, 0x0401f7f7, 0x49425a06,</div><div class='del'>-	0x0201f000, 0x00020381, 0x1c01f000, 0x493fc857,</div><div class='del'>-	0x4933c857, 0x480bc857, 0x0201f800, 0x0010393e,</div><div class='del'>-	0x0400002e, 0x41502800, 0x813e79c0, 0x04020006,</div><div class='del'>-	0x59a80066, 0x80000000, 0x59a8086a, 0x80040580,</div><div class='del'>-	0x04000026, 0x41300000, 0x80140580, 0x0400001a,</div><div class='del'>-	0x58140203, 0x82000580, 0x00000000, 0x04000016,</div><div class='del'>-	0x58140202, 0x80080580, 0x04020013, 0x58141c06,</div><div class='del'>-	0x820c0580, 0x00000005, 0x0400000f, 0x820c0580,</div><div class='del'>-	0x00000009, 0x04000017, 0x59300009, 0x58142009,</div><div class='del'>-	0x801021c0, 0x04020006, 0x5814201e, 0x59301809,</div><div class='del'>-	0x580c0002, 0x82000500, 0x00ffffff, 0x80100580,</div><div class='del'>-	0x04000007, 0x82142c00, 0x00000024, 0x41540000,</div><div class='del'>-	0x80140480, 0x04021005, 0x0401f7df, 0x40163800,</div><div class='del'>-	0x81300540, 0x0401f002, 0x80000580, 0x1c01f000,</div><div class='del'>-	0x58141807, 0x8c0c1d10, 0x040207f3, 0x0401f7e7,</div><div class='del'>-	0x42002000, 0x0000ffff, 0x59301009, 0x800811c0,</div><div class='del'>-	0x04000002, 0x58082403, 0x41301000, 0x0401f007,</div><div class='del'>-	0x41781000, 0x41442000, 0x0401f004, 0x41781000,</div><div class='del'>-	0x42002000, 0x0000ffff, 0x5c000000, 0x4c000000,</div><div class='del'>-	0x4803c857, 0x480bc857, 0x4813c857, 0x492fc857,</div><div class='del'>-	0x4943c857, 0x4d2c0000, 0x4c080000, 0x4c100000,</div><div class='del'>-	0x4c140000, 0x4c180000, 0x0201f800, 0x0010082a,</div><div class='del'>-	0x02000800, 0x00100615, 0x5c003000, 0x5c002800,</div><div class='del'>-	0x5c002000, 0x5c001000, 0x4a025a04, 0x0000010d,</div><div class='del'>-	0x800811c0, 0x04000017, 0x83400580, 0x00000029,</div><div class='del'>-	0x04020010, 0x82180580, 0x00000002, 0x0400000a,</div><div class='del'>-	0x82180580, 0x00000003, 0x04000007, 0x82180580,</div><div class='del'>-	0x00000008, 0x04000004, 0x82180580, 0x00000009,</div><div class='del'>-	0x04020004, 0x4a025809, 0xffffffff, 0x0401f002,</div><div class='del'>-	0x480a5809, 0x58080202, 0x48025c13, 0x0401f005,</div><div class='del'>-	0x4a025809, 0xffffffff, 0x4a025c13, 0x0000ffff,</div><div class='del'>-	0x49425a08, 0x48125a06, 0x82100580, 0x0000ffff,</div><div class='del'>-	0x04000012, 0x4c140000, 0x4c180000, 0x4d440000,</div><div class='del'>-	0x4d340000, 0x40128800, 0x0201f800, 0x00020267,</div><div class='del'>-	0x02020800, 0x00100615, 0x59340002, 0x82000500,</div><div class='del'>-	0x00ffffff, 0x48025812, 0x5c026800, 0x5c028800,</div><div class='del'>-	0x5c003000, 0x5c002800, 0x497a5800, 0x497a5c04,</div><div class='del'>-	0x83400580, 0x00000046, 0x04020002, 0x48165a07,</div><div class='del'>-	0x481a5c08, 0x0401fbe0, 0x5c025800, 0x1c01f000,</div><div class='del'>-	0x59300809, 0x800409c0, 0x04000004, 0x58040403,</div><div class='del'>-	0x81440580, 0x1c01f000, 0x82000540, 0x00000001,</div><div class='del'>-	0x0401f7fd, 0x4933c857, 0x4c040000, 0x59300403,</div><div class='del'>-	0x82000d80, 0x0000001e, 0x04020016, 0x800000d0,</div><div class='del'>-	0x59300a16, 0x82040d00, 0x000000ff, 0x80040540,</div><div class='del'>-	0x4803c857, 0x48026416, 0x4a026403, 0x00000085,</div><div class='del'>-	0x4a026203, 0x00000009, 0x4a026406, 0x00000005,</div><div class='del'>-	0x4a02621d, 0x00000004, 0x59a80038, 0x48026206,</div><div class='del'>-	0x42000800, 0x8000004b, 0x0201f800, 0x00020855,</div><div class='del'>-	0x5c000800, 0x1c01f000, 0x4933c857, 0x40000000,</div><div class='del'>-	0x40000000, 0x1c01f000, 0x59300414, 0x4933c857,</div><div class='del'>-	0x4803c857, 0x8c000518, 0x04000009, 0x8c000512,</div><div class='del'>-	0x02020000, 0x00108fdb, 0x0401f918, 0x0201f800,</div><div class='del'>-	0x00020831, 0x0201f800, 0x000208b4, 0x1c01f000,</div><div class='del'>-	0x591c0406, 0x4803c857, 0x82000c80, 0x00000009,</div><div class='del'>-	0x0402100b, 0x0c01f001, 0x0010a2f7, 0x0010a2f7,</div><div class='del'>-	0x0010a2f7, 0x0010a2f9, 0x0010a2f7, 0x0010a2f9,</div><div class='del'>-	0x0010a2f9, 0x0010a2f7, 0x0010a2f9, 0x80000580,</div><div class='del'>-	0x1c01f000, 0x82000540, 0x00000001, 0x1c01f000,</div><div class='del'>-	0x591c0406, 0x82000500, 0x0000001f, 0x82000580,</div><div class='del'>-	0x00000006, 0x0400000e, 0x4803c857, 0x4a026403,</div><div class='del'>-	0x0000003b, 0x4a02641a, 0x00000009, 0x4a02621a,</div><div class='del'>-	0x00002a00, 0x4a026203, 0x00000001, 0x42000800,</div><div class='del'>-	0x80000040, 0x0201f000, 0x00020855, 0x4803c856,</div><div class='del'>-	0x4c040000, 0x4c140000, 0x4d300000, 0x411e6000,</div><div class='del'>-	0x0401f8e6, 0x497a6205, 0x59300414, 0x4803c857,</div><div class='del'>-	0x82000500, 0xffffadff, 0x48026414, 0x497a6405,</div><div class='del'>-	0x5c026000, 0x0201f800, 0x0010082a, 0x02000800,</div><div class='del'>-	0x00100615, 0x5c002800, 0x5c000800, 0x4a025a04,</div><div class='del'>-	0x0000010d, 0x497a5800, 0x497a5c04, 0x4a025a08,</div><div class='del'>-	0x00000045, 0x491e5809, 0x59300402, 0x48025c07,</div><div class='del'>-	0x59300419, 0x48025c0b, 0x591c0414, 0x84000556,</div><div class='del'>-	0x48023c14, 0x591c1809, 0x580c0403, 0x48025a06,</div><div class='del'>-	0x4816580a, 0x48065a0b, 0x0401fb57, 0x4d400000,</div><div class='del'>-	0x42028000, 0x00000045, 0x591c0202, 0x4c000000,</div><div class='del'>-	0x4d300000, 0x411e6000, 0x0401fc82, 0x5c026000,</div><div class='del'>-	0x5c000000, 0x48023a02, 0x5c028000, 0x4a023c06,</div><div class='del'>-	0x00000006, 0x4a023a03, 0x00000007, 0x497a3a06,</div><div class='del'>-	0x497a3a05, 0x1c01f000, 0x4933c857, 0x83380580,</div><div class='del'>-	0x00000013, 0x0402000b, 0x59300403, 0x4803c857,</div><div class='del'>-	0x82000d80, 0x00000085, 0x0400002b, 0x82000d80,</div><div class='del'>-	0x0000008b, 0x04000028, 0x0201f800, 0x00100615,</div><div class='del'>-	0x83380580, 0x00000027, 0x0402000c, 0x0201f800,</div><div class='del'>-	0x001068f6, 0x4d2c0000, 0x4d400000, 0x59325808,</div><div class='del'>-	0x42028000, 0x00000004, 0x0401fe9f, 0x5c028000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x83380580, 0x00000014,</div><div class='del'>-	0x040007f3, 0x83380580, 0x00000089, 0x04000005,</div><div class='del'>-	0x83380580, 0x0000008a, 0x02020000, 0x001076fb,</div><div class='del'>-	0x0201f800, 0x00106cb4, 0x02020000, 0x001076fb,</div><div class='del'>-	0x59300a03, 0x82040580, 0x0000000a, 0x04000009,</div><div class='del'>-	0x82040580, 0x0000000c, 0x04000006, 0x0201f800,</div><div class='del'>-	0x00100615, 0x4a026203, 0x0000000a, 0x1c01f000,</div><div class='del'>-	0x83380480, 0x00000093, 0x0402100c, 0x83380480,</div><div class='del'>-	0x00000085, 0x04001009, 0x83380580, 0x00000089,</div><div class='del'>-	0x0400000a, 0x83380580, 0x0000008a, 0x04000022,</div><div class='del'>-	0x0201f800, 0x00100615, 0x493bc857, 0x4933c857,</div><div class='del'>-	0x0201f000, 0x001076fb, 0x4933c857, 0x4c340000,</div><div class='del'>-	0x41306800, 0x0201f800, 0x00020892, 0x04000011,</div><div class='del'>-	0x4a026203, 0x00000001, 0x4a026403, 0x0000001e,</div><div class='del'>-	0x59cc0c07, 0x48066419, 0x59cc0a07, 0x48066219,</div><div class='del'>-	0x58340809, 0x48066009, 0x4a026406, 0x00000004,</div><div class='del'>-	0x42000800, 0x80000040, 0x0201f800, 0x00020855,</div><div class='del'>-	0x40366000, 0x0201f800, 0x000208b4, 0x5c006800,</div><div class='del'>-	0x1c01f000, 0x4933c857, 0x0201f000, 0x000208b4,</div><div class='del'>-	0x59300809, 0x58040200, 0x8c00051a, 0x02020800,</div><div class='del'>-	0x001006ba, 0x1c01f000, 0x0201f800, 0x0010472e,</div><div class='del'>-	0x0400001e, 0x4a026203, 0x00000002, 0x59300414,</div><div class='del'>-	0x84000558, 0x48026414, 0x8c000512, 0x04000004,</div><div class='del'>-	0x59a80039, 0x48026205, 0x0401f007, 0x59a80839,</div><div class='del'>-	0x59a80037, 0x80040400, 0x82000400, 0x0000001e,</div><div class='del'>-	0x48026205, 0x59300009, 0x82000c00, 0x00000011,</div><div class='del'>-	0x50040000, 0x80000540, 0x04000004, 0x82000c00,</div><div class='del'>-	0x00000000, 0x0401f7fb, 0x45300800, 0x497a6000,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x82100500,</div><div class='del'>-	0xfffffeef, 0x0402001c, 0x4d2c0000, 0x4937c857,</div><div class='del'>-	0x59340811, 0x83341400, 0x00000011, 0x800409c0,</div><div class='del'>-	0x0400000e, 0x40040000, 0x81300580, 0x04000005,</div><div class='del'>-	0x58040800, 0x82041400, 0x00000000, 0x0401f7f8,</div><div class='del'>-	0x59300800, 0x497a6000, 0x44041000, 0x0201f800,</div><div class='del'>-	0x00020831, 0x0401f002, 0x4933c857, 0x5c025800,</div><div class='del'>-	0x492e6008, 0x0201f800, 0x00020831, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x492fc857, 0x4a025a06, 0x00000006,</div><div class='del'>-	0x0201f000, 0x00020381, 0x4c340000, 0x59300009,</div><div class='del'>-	0x800001c0, 0x04000010, 0x82006c00, 0x00000011,</div><div class='del'>-	0x50340000, 0x80000540, 0x04000009, 0x81300580,</div><div class='del'>-	0x04000005, 0x50340000, 0x82006c00, 0x00000000,</div><div class='del'>-	0x0401f7f8, 0x59300000, 0x44006800, 0x5c006800,</div><div class='del'>-	0x1c01f000, 0x59300c06, 0x82040580, 0x00000005,</div><div class='del'>-	0x040007fb, 0x82040580, 0x00000011, 0x040007f8,</div><div class='del'>-	0x82040580, 0x00000006, 0x040007f5, 0x82040580,</div><div class='del'>-	0x00000001, 0x040007f2, 0x0201f800, 0x00100615,</div><div class='del'>-	0x4933c857, 0x4c080000, 0x4c0c0000, 0x4c580000,</div><div class='del'>-	0x59a8101d, 0x59cc1807, 0x820c1d00, 0x00ffffff,</div><div class='del'>-	0x800c0110, 0x80083580, 0x04020014, 0x83cc1400,</div><div class='del'>-	0x00000008, 0x4200b000, 0x00000002, 0x59300009,</div><div class='del'>-	0x82001c00, 0x00000006, 0x0201f800, 0x001082ff,</div><div class='del'>-	0x0402000a, 0x83cc1400, 0x0000000a, 0x4200b000,</div><div class='del'>-	0x00000002, 0x59300009, 0x82001c00, 0x00000008,</div><div class='del'>-	0x0201f800, 0x001082ff, 0x5c00b000, 0x5c001800,</div><div class='del'>-	0x5c001000, 0x1c01f000, 0x4933c856, 0x0201f800,</div><div class='del'>-	0x0010404b, 0x0201f000, 0x00101bf0, 0x493bc857,</div><div class='del'>-	0x4d2c0000, 0x0201f800, 0x0010082a, 0x02000800,</div><div class='del'>-	0x00100615, 0x832cac00, 0x00000005, 0x4c580000,</div><div class='del'>-	0x4c540000, 0x4200b000, 0x00000006, 0x4578a800,</div><div class='del'>-	0x8054a800, 0x8058b040, 0x040207fd, 0x83380580,</div><div class='del'>-	0x00000046, 0x04020004, 0x4a025a04, 0x00000144,</div><div class='del'>-	0x0401f008, 0x4a025a04, 0x00000146, 0x83380580,</div><div class='del'>-	0x00000041, 0x04000003, 0x4a025a06, 0x00000001,</div><div class='del'>-	0x59cc0007, 0x82000500, 0xff000000, 0x80000110,</div><div class='del'>-	0x59cc1008, 0x82081500, 0xff000000, 0x80081540,</div><div class='del'>-	0x480a580a, 0x83380580, 0x00000046, 0x04020006,</div><div class='del'>-	0x59cc0007, 0x82000500, 0x00ffffff, 0x4802580b,</div><div class='del'>-	0x0401f005, 0x59cc0008, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x4802580b, 0x83380580, 0x00000046, 0x04020004,</div><div class='del'>-	0x83cc1400, 0x00000009, 0x0401f003, 0x83cc1400,</div><div class='del'>-	0x0000000d, 0x50080000, 0x9c0001c0, 0x4802580c,</div><div class='del'>-	0x80081000, 0x50080000, 0x9c0001c0, 0x4802580d,</div><div class='del'>-	0x83380580, 0x00000046, 0x04020008, 0x59cc000b,</div><div class='del'>-	0x9c0001c0, 0x4802580e, 0x59cc000c, 0x9c0001c0,</div><div class='del'>-	0x4802580f, 0x0401f007, 0x59cc000f, 0x9c0001c0,</div><div class='del'>-	0x4802580e, 0x59cc0010, 0x9c0001c0, 0x4802580f,</div><div class='del'>-	0x83380580, 0x00000046, 0x04020004, 0x83cc1400,</div><div class='del'>-	0x00000011, 0x0401f003, 0x83cc1400, 0x00000015,</div><div class='del'>-	0x412c3000, 0x82183400, 0x00000010, 0x4200b000,</div><div class='del'>-	0x00000004, 0x50080000, 0x9c0001c0, 0x44003000,</div><div class='del'>-	0x80081000, 0x80183000, 0x8058b040, 0x040207fa,</div><div class='del'>-	0x5c00a800, 0x5c00b000, 0x0201f800, 0x00020381,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4933c857, 0x492fc857,</div><div class='del'>-	0x59300809, 0x58040200, 0x8c00051e, 0x04000004,</div><div class='del'>-	0x592c0208, 0x84000558, 0x48025a08, 0x1c01f000,</div><div class='del'>-	0x59e0180f, 0x599c0413, 0x800c1000, 0x80080580,</div><div class='del'>-	0x04020002, 0x41781000, 0x59e00010, 0x59e00810,</div><div class='del'>-	0x80040d80, 0x040207fd, 0x80080580, 0x0400000b,</div><div class='del'>-	0x4c080000, 0x599c0814, 0x599c1015, 0x800c00cc,</div><div class='del'>-	0x80040c00, 0x82081440, 0x00000000, 0x5c001800,</div><div class='del'>-	0x82000540, 0x00000001, 0x4803c857, 0x1c01f000,</div><div class='del'>-	0x59300203, 0x4933c857, 0x4937c857, 0x493bc857,</div><div class='del'>-	0x4803c857, 0x82003480, 0x0000000e, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f001, 0x0010a4e8, 0x0010a63a,</div><div class='del'>-	0x0010a4e8, 0x0010a4e8, 0x0010a4e8, 0x0010a4e8,</div><div class='del'>-	0x0010a4e8, 0x0010a59f, 0x0010a4ea, 0x0010a4e8,</div><div class='del'>-	0x0010a4e8, 0x0010a4e8, 0x0010a4e8, 0x0010a4e8,</div><div class='del'>-	0x0201f800, 0x00100615, 0x83380580, 0x0000004c,</div><div class='del'>-	0x02020800, 0x00100615, 0x0201f800, 0x0010473b,</div><div class='del'>-	0x04020020, 0x59a80826, 0x82040500, 0x00000009,</div><div class='del'>-	0x82000580, 0x00000008, 0x0400001a, 0x8c040d12,</div><div class='del'>-	0x0400003d, 0x59cc0806, 0x82040d00, 0xff000000,</div><div class='del'>-	0x82040580, 0x03000000, 0x0400001f, 0x82040580,</div><div class='del'>-	0x50000000, 0x04000005, 0x82040580, 0x52000000,</div><div class='del'>-	0x02020000, 0x000208b4, 0x813669c0, 0x04000006,</div><div class='del'>-	0x4d3c0000, 0x417a7800, 0x0201f800, 0x00101de2,</div><div class='del'>-	0x5c027800, 0x4a026403, 0x00000001, 0x0401f014,</div><div class='del'>-	0x59cc0806, 0x82040d00, 0xff000000, 0x82040580,</div><div class='del'>-	0x03000000, 0x04000008, 0x82040580, 0x50000000,</div><div class='del'>-	0x04000005, 0x82040580, 0x52000000, 0x02020000,</div><div class='del'>-	0x000208b4, 0x4a026403, 0x00000009, 0x4a02641a,</div><div class='del'>-	0x00000009, 0x4a02621a, 0x00000000, 0x813669c0,</div><div class='del'>-	0x0402000b, 0x59cc0001, 0x0201f800, 0x001059b9,</div><div class='del'>-	0x02020000, 0x000208b4, 0x0201f800, 0x001043fc,</div><div class='del'>-	0x02020000, 0x000208b4, 0x49366009, 0x4a026406,</div><div class='del'>-	0x00000004, 0x4a026203, 0x00000001, 0x0201f000,</div><div class='del'>-	0x00106470, 0x0201f800, 0x0010393e, 0x04000023,</div><div class='del'>-	0x59cc0806, 0x4807c857, 0x82040d00, 0xff000000,</div><div class='del'>-	0x82040580, 0x03000000, 0x04000033, 0x82040580,</div><div class='del'>-	0x20000000, 0x04000041, 0x82040580, 0x21000000,</div><div class='del'>-	0x04000052, 0x82040580, 0x24000000, 0x0400004f,</div><div class='del'>-	0x82040580, 0x50000000, 0x0400004c, 0x82040580,</div><div class='del'>-	0x52000000, 0x04000049, 0x82040580, 0x05000000,</div><div class='del'>-	0x0402000d, 0x59cc0806, 0x82040d00, 0xff000000,</div><div class='del'>-	0x9c0431c0, 0x42028000, 0x00000046, 0x42002800,</div><div class='del'>-	0x00000001, 0x0401fcf7, 0x0401f940, 0x02000800,</div><div class='del'>-	0x00100615, 0x42002000, 0x00000051, 0x0201f800,</div><div class='del'>-	0x001077d1, 0x59cc0000, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x82000580, 0x00ffffff, 0x04000005, 0x4a026203,</div><div class='del'>-	0x00000007, 0x493a6403, 0x1c01f000, 0x59325817,</div><div class='del'>-	0x812e59c0, 0x02020800, 0x00100843, 0x0201f000,</div><div class='del'>-	0x000208b4, 0x813669c0, 0x040007df, 0x59340400,</div><div class='del'>-	0x82000500, 0x000000ff, 0x82000580, 0x00000003,</div><div class='del'>-	0x040207d9, 0x0401fc73, 0x040207d7, 0x4a026403,</div><div class='del'>-	0x00000009, 0x4a02641a, 0x0000000e, 0x4a02621a,</div><div class='del'>-	0x00001900, 0x0401f7a2, 0x813669c0, 0x0400000c,</div><div class='del'>-	0x59340c00, 0x82040500, 0x000000ff, 0x82000580,</div><div class='del'>-	0x00000009, 0x04000794, 0x82040500, 0x0000ff00,</div><div class='del'>-	0x82000580, 0x00000700, 0x040207c3, 0x4a026403,</div><div class='del'>-	0x00000009, 0x4a02641a, 0x00000009, 0x4a02621a,</div><div class='del'>-	0x00001e00, 0x0401f78e, 0x813669c0, 0x040007f8,</div><div class='del'>-	0x59340c00, 0x82040500, 0x0000ff00, 0x82000580,</div><div class='del'>-	0x00000700, 0x040007f2, 0x0401f7b3, 0x4d2c0000,</div><div class='del'>-	0x4c580000, 0x4c500000, 0x4c540000, 0x41385000,</div><div class='del'>-	0x83380580, 0x00000054, 0x02020800, 0x00100615,</div><div class='del'>-	0x59325808, 0x592c0c0b, 0x82040d00, 0x0000e000,</div><div class='del'>-	0x82040580, 0x00002000, 0x04020076, 0x59300817,</div><div class='del'>-	0x800409c0, 0x04000014, 0x58041404, 0x41cca800,</div><div class='del'>-	0x8204a400, 0x00000005, 0x82080480, 0x00000010,</div><div class='del'>-	0x04021004, 0x4008b000, 0x0401fb84, 0x0401f00a,</div><div class='del'>-	0x40001000, 0x4200b000, 0x0000000f, 0x0401fb7f,</div><div class='del'>-	0x58040801, 0x800409c0, 0x040207f2, 0x0201f800,</div><div class='del'>-	0x00100615, 0x813669c0, 0x0400005e, 0x59344c00,</div><div class='del'>-	0x592c0c09, 0x4807c857, 0x4827c857, 0x82040d00,</div><div class='del'>-	0x000000ff, 0x82040580, 0x00000003, 0x0400002a,</div><div class='del'>-	0x82040580, 0x00000005, 0x04000032, 0x82040580,</div><div class='del'>-	0x00000020, 0x04000036, 0x82040580, 0x00000052,</div><div class='del'>-	0x04000042, 0x82040580, 0x00000050, 0x04000042,</div><div class='del'>-	0x82040580, 0x00000021, 0x04000004, 0x82040580,</div><div class='del'>-	0x00000024, 0x04020043, 0x82240500, 0x0000ff00,</div><div class='del'>-	0x82000580, 0x00000007, 0x04000008, 0x42000800,</div><div class='del'>-	0x00000009, 0x0201f800, 0x001043c7, 0x42005000,</div><div class='del'>-	0x0000000c, 0x0401f037, 0x4a025a06, 0x00000031,</div><div class='del'>-	0x4a02580d, 0x00000009, 0x59340400, 0x4802580e,</div><div class='del'>-	0x0201f800, 0x00020381, 0x0201f800, 0x00107698,</div><div class='del'>-	0x0401f03d, 0x0201f800, 0x001040e4, 0x0201f800,</div><div class='del'>-	0x00104480, 0x42000800, 0x00000003, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x42005000, 0x00000008, 0x0401f021,</div><div class='del'>-	0x59cc0007, 0x0201f800, 0x00105c25, 0x0402001d,</div><div class='del'>-	0x0201f800, 0x001040e4, 0x0401f01a, 0x82240500,</div><div class='del'>-	0x0000ff00, 0x82000580, 0x00000007, 0x040007df,</div><div class='del'>-	0x82240500, 0x000000ff, 0x82000580, 0x00000009,</div><div class='del'>-	0x040007da, 0x0201f800, 0x001044e1, 0x42005000,</div><div class='del'>-	0x0000000a, 0x0401f00b, 0x42005000, 0x0000000e,</div><div class='del'>-	0x0401f003, 0x42005000, 0x00000010, 0x82240500,</div><div class='del'>-	0x0000ff00, 0x82000580, 0x00000007, 0x040007cb,</div><div class='del'>-	0x482a6403, 0x4a026203, 0x00000001, 0x592c000d,</div><div class='del'>-	0x48026011, 0x497a6013, 0x59a80038, 0x48026206,</div><div class='del'>-	0x417a7800, 0x0201f800, 0x00106470, 0x59325817,</div><div class='del'>-	0x812e59c0, 0x04000004, 0x0201f800, 0x00100843,</div><div class='del'>-	0x497a6017, 0x5c00a800, 0x5c00a000, 0x5c00b000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4d2c0000, 0x59325808,</div><div class='del'>-	0x83380580, 0x00000013, 0x0402002a, 0x492fc857,</div><div class='del'>-	0x59300c03, 0x82040580, 0x00000054, 0x0400001e,</div><div class='del'>-	0x82040580, 0x00000010, 0x04000018, 0x82040580,</div><div class='del'>-	0x0000000e, 0x04000015, 0x82040580, 0x00000008,</div><div class='del'>-	0x0400000d, 0x82040580, 0x0000000c, 0x0400000a,</div><div class='del'>-	0x82040580, 0x0000000a, 0x02020800, 0x00100615,</div><div class='del'>-	0x42000800, 0x00000006, 0x0201f800, 0x001043c7,</div><div class='del'>-	0x0401f009, 0x42000800, 0x00000004, 0x0201f800,</div><div class='del'>-	0x001043c7, 0x0401f004, 0x59340200, 0x8400051a,</div><div class='del'>-	0x48026a00, 0x4a025a06, 0x00000000, 0x0201f800,</div><div class='del'>-	0x00020381, 0x0201f800, 0x000208b4, 0x0401f024,</div><div class='del'>-	0x83380580, 0x00000027, 0x0400000f, 0x83380580,</div><div class='del'>-	0x00000014, 0x02020800, 0x00100615, 0x492fc857,</div><div class='del'>-	0x0201f800, 0x001068f6, 0x42028000, 0x00000031,</div><div class='del'>-	0x42000800, 0x00000004, 0x42001000, 0x000000ff,</div><div class='del'>-	0x0401f00a, 0x492fc857, 0x0201f800, 0x001068f6,</div><div class='del'>-	0x42028000, 0x00000031, 0x42000800, 0x00000004,</div><div class='del'>-	0x42001000, 0x00000010, 0x49425a06, 0x4806580d,</div><div class='del'>-	0x480a580e, 0x0201f800, 0x00020381, 0x0201f800,</div><div class='del'>-	0x00104a83, 0x0201f800, 0x00107698, 0x5c025800,</div><div class='del'>-	0x1c01f000, 0x492fc857, 0x42007000, 0x0010b5f6,</div><div class='del'>-	0x58380807, 0x800409c0, 0x04020005, 0x492c7008,</div><div class='del'>-	0x492c7007, 0x0201f000, 0x001008be, 0x492c0800,</div><div class='del'>-	0x492c7007, 0x1c01f000, 0x4d2c0000, 0x4c580000,</div><div class='del'>-	0x4c500000, 0x4c540000, 0x4933c857, 0x4937c857,</div><div class='del'>-	0x59cc0806, 0x4807c857, 0x82040d00, 0xff000000,</div><div class='del'>-	0x82040580, 0x03000000, 0x0400000d, 0x82040580,</div><div class='del'>-	0x05000000, 0x0400000a, 0x82040580, 0x21000000,</div><div class='del'>-	0x04000030, 0x82040580, 0x24000000, 0x0400002d,</div><div class='del'>-	0x82040580, 0x20000000, 0x0402002f, 0x0201f800,</div><div class='del'>-	0x0010082a, 0x0400002c, 0x492fc857, 0x492e6017,</div><div class='del'>-	0x59a8b016, 0x8258b400, 0x0000001b, 0x8258b500,</div><div class='del'>-	0xfffffffc, 0x8058b104, 0x485a5c04, 0x412c7800,</div><div class='del'>-	0x41cca000, 0x82580480, 0x00000010, 0x04021005,</div><div class='del'>-	0x832cac00, 0x00000005, 0x0401fa78, 0x0401f015,</div><div class='del'>-	0x40580800, 0x4200b000, 0x0000000f, 0x832cac00,</div><div class='del'>-	0x00000005, 0x0401fa71, 0x8204b480, 0x0000000f,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x04000004, 0x492c7801,</div><div class='del'>-	0x412c7800, 0x0401f7ec, 0x59325817, 0x0201f800,</div><div class='del'>-	0x00100843, 0x497a6017, 0x80000580, 0x0401f006,</div><div class='del'>-	0x59340200, 0x84000554, 0x48026a00, 0x82000540,</div><div class='del'>-	0x00000001, 0x5c00a800, 0x5c00a000, 0x5c00b000,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x4933c857, 0x492fc857,</div><div class='del'>-	0x4d2c0000, 0x4c5c0000, 0x5930bc06, 0x59300a03,</div><div class='del'>-	0x82040580, 0x00000007, 0x0400003c, 0x82040580,</div><div class='del'>-	0x00000001, 0x02020800, 0x00100615, 0x0201f800,</div><div class='del'>-	0x0010698c, 0x4df00000, 0x598c000d, 0x81300580,</div><div class='del'>-	0x04020019, 0x59300004, 0x8c000520, 0x04000004,</div><div class='del'>-	0x84000520, 0x48026004, 0x0401f019, 0x825c0580,</div><div class='del'>-	0x00000011, 0x0402000d, 0x42001000, 0x0010b5f4,</div><div class='del'>-	0x50081000, 0x58080002, 0x82000580, 0x00000100,</div><div class='del'>-	0x04000006, 0x5808000c, 0x81300580, 0x02020800,</div><div class='del'>-	0x00100615, 0x0401f00a, 0x0201f800, 0x00106be2,</div><div class='del'>-	0x04020027, 0x59300004, 0x8c000520, 0x04000004,</div><div class='del'>-	0x84000520, 0x48026004, 0x0401f003, 0x0201f800,</div><div class='del'>-	0x00106619, 0x5c03e000, 0x02000800, 0x00106982,</div><div class='del'>-	0x0201f800, 0x00108df4, 0x02000800, 0x00100615,</div><div class='del'>-	0x59325808, 0x4a025a06, 0x00000005, 0x0201f800,</div><div class='del'>-	0x00020381, 0x825c0580, 0x00000005, 0x0400001b,</div><div class='del'>-	0x0201f800, 0x00104a83, 0x825c0580, 0x00000005,</div><div class='del'>-	0x04000016, 0x59325817, 0x812e59c0, 0x02020800,</div><div class='del'>-	0x00100843, 0x0201f800, 0x00107698, 0x80000580,</div><div class='del'>-	0x5c00b800, 0x5c025800, 0x1c01f000, 0x5c03e000,</div><div class='del'>-	0x02000800, 0x00106982, 0x59300c06, 0x82040580,</div><div class='del'>-	0x00000011, 0x040007ae, 0x82040580, 0x00000005,</div><div class='del'>-	0x040007ab, 0x0401f7f3, 0x0201f800, 0x000208b4,</div><div class='del'>-	0x0401f7ef, 0x4c040000, 0x59340200, 0x4803c857,</div><div class='del'>-	0x8c00051c, 0x04000009, 0x59cc0805, 0x591c0019,</div><div class='del'>-	0x4803c857, 0x80040580, 0x04000004, 0x80000580,</div><div class='del'>-	0x4803c856, 0x0401f003, 0x82000540, 0x00000001,</div><div class='del'>-	0x5c000800, 0x1c01f000, 0x4c000000, 0x4c0c0000,</div><div class='del'>-	0x4c100000, 0x42001800, 0x0000ffff, 0x42002000,</div><div class='del'>-	0x00000004, 0x0401f013, 0x4c000000, 0x4c0c0000,</div><div class='del'>-	0x4c100000, 0x59302009, 0x58101c03, 0x42002000,</div><div class='del'>-	0x00000004, 0x0401f00b, 0x4c000000, 0x4c0c0000,</div><div class='del'>-	0x4c100000, 0x59302009, 0x801021c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x58101c03, 0x42002000, 0x00000007,</div><div class='del'>-	0x480fc857, 0x4813c857, 0x481bc857, 0x0201f800,</div><div class='del'>-	0x001038c7, 0x5c002000, 0x5c001800, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x83380580, 0x00000092, 0x02020800,</div><div class='del'>-	0x00100615, 0x42000800, 0x80000040, 0x4a026203,</div><div class='del'>-	0x00000001, 0x493a6403, 0x0201f000, 0x00020855,</div><div class='del'>-	0x4d400000, 0x0201f800, 0x0010393e, 0x04000008,</div><div class='del'>-	0x59a80005, 0x84000544, 0x48035005, 0x42028000,</div><div class='del'>-	0x0000002a, 0x0201f800, 0x0010a25b, 0x5c028000,</div><div class='del'>-	0x1c01f000, 0x59a80026, 0x8c000508, 0x04000005,</div><div class='del'>-	0x599c0017, 0x8c00050a, 0x04020002, 0x1c01f000,</div><div class='del'>-	0x82000540, 0x00000001, 0x1c01f000, 0x59300420,</div><div class='del'>-	0x84000540, 0x48026420, 0x1c01f000, 0x4817c857,</div><div class='del'>-	0x4c000000, 0x4c040000, 0x8c142d2a, 0x04000004,</div><div class='del'>-	0x598800b9, 0x80000000, 0x480310b9, 0x8c142d2e,</div><div class='del'>-	0x04000004, 0x598800ba, 0x80000000, 0x480310ba,</div><div class='del'>-	0x8c142d2c, 0x04000013, 0x40140000, 0x82000500,</div><div class='del'>-	0x00070000, 0x82000d80, 0x00030000, 0x0400000d,</div><div class='del'>-	0x82000d80, 0x00040000, 0x0400000a, 0x82000d80,</div><div class='del'>-	0x00050000, 0x04000007, 0x59880005, 0x80000000,</div><div class='del'>-	0x48031005, 0x598800bb, 0x80000000, 0x480310bb,</div><div class='del'>-	0x5c000800, 0x5c000000, 0x1c01f000, 0x4817c857,</div><div class='del'>-	0x4c000000, 0x4c040000, 0x8c142d2a, 0x04000004,</div><div class='del'>-	0x598800bc, 0x80000000, 0x480310bc, 0x8c142d2e,</div><div class='del'>-	0x04000004, 0x598800bd, 0x80000000, 0x480310bd,</div><div class='del'>-	0x8c142d2c, 0x04000013, 0x40140000, 0x82000500,</div><div class='del'>-	0x00070000, 0x82000d80, 0x00030000, 0x0400000d,</div><div class='del'>-	0x82000d80, 0x00040000, 0x0400000a, 0x82000d80,</div><div class='del'>-	0x00050000, 0x04000007, 0x59880005, 0x80000000,</div><div class='del'>-	0x48031005, 0x598800be, 0x80000000, 0x480310be,</div><div class='del'>-	0x5c000800, 0x5c000000, 0x1c01f000, 0x4c000000,</div><div class='del'>-	0x59880001, 0x80000000, 0x4803c857, 0x48031001,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x4c000000, 0x59880000,</div><div class='del'>-	0x80000000, 0x4803c857, 0x48031000, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x4c000000, 0x59880002, 0x80000000,</div><div class='del'>-	0x4803c857, 0x48031002, 0x5c000000, 0x1c01f000,</div><div class='del'>-	0x4807c857, 0x4c000000, 0x8c040d2c, 0x04000004,</div><div class='del'>-	0x598800a7, 0x80000000, 0x480310a7, 0x8c040d2a,</div><div class='del'>-	0x04000004, 0x598800a8, 0x80000000, 0x480310a8,</div><div class='del'>-	0x8c040d28, 0x04000004, 0x598800a9, 0x80000000,</div><div class='del'>-	0x480310a9, 0x8c040d26, 0x04000004, 0x598800aa,</div><div class='del'>-	0x80000000, 0x480310aa, 0x8c040d24, 0x04000004,</div><div class='del'>-	0x598800ab, 0x80000000, 0x480310ab, 0x8c040d22,</div><div class='del'>-	0x04000004, 0x598800ac, 0x80000000, 0x480310ac,</div><div class='del'>-	0x8c040d20, 0x04000004, 0x598800ad, 0x80000000,</div><div class='del'>-	0x480310ad, 0x5c000000, 0x1c01f000, 0x4807c857,</div><div class='del'>-	0x4c000000, 0x598800ae, 0x80000000, 0x480310ae,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x4807c857, 0x4c000000,</div><div class='del'>-	0x8c040d1c, 0x04000004, 0x598800af, 0x80000000,</div><div class='del'>-	0x480310af, 0x8c040d1a, 0x04000004, 0x598800b0,</div><div class='del'>-	0x80000000, 0x480310b0, 0x5c000000, 0x1c01f000,</div><div class='del'>-	0x4807c857, 0x4c000000, 0x8c040d18, 0x04000004,</div><div class='del'>-	0x598800b1, 0x80000000, 0x480310b1, 0x8c040d16,</div><div class='del'>-	0x04000004, 0x598800b2, 0x80000000, 0x480310b2,</div><div class='del'>-	0x8c040d14, 0x04000004, 0x598800b3, 0x80000000,</div><div class='del'>-	0x480310b3, 0x5c000000, 0x1c01f000, 0x4807c857,</div><div class='del'>-	0x4c000000, 0x8c040d10, 0x04000004, 0x598800b4,</div><div class='del'>-	0x80000000, 0x480310b4, 0x8c040d0c, 0x04000004,</div><div class='del'>-	0x598800b5, 0x80000000, 0x480310b5, 0x5c000000,</div><div class='del'>-	0x1c01f000, 0x4807c857, 0x4c000000, 0x8c040d08,</div><div class='del'>-	0x04000004, 0x598800b6, 0x80000000, 0x480310b6,</div><div class='del'>-	0x8c040d04, 0x04000004, 0x598800b7, 0x80000000,</div><div class='del'>-	0x480310b7, 0x5c000000, 0x1c01f000, 0x4807c856,</div><div class='del'>-	0x4c000000, 0x59880080, 0x80000000, 0x48031080,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x4803c857, 0x4c040000,</div><div class='del'>-	0x50000800, 0x80040800, 0x4807c857, 0x44040000,</div><div class='del'>-	0x5c000800, 0x1c01f000, 0x480fc857, 0x4c000000,</div><div class='del'>-	0x820c0580, 0x00000000, 0x04020004, 0x42000000,</div><div class='del'>-	0x0010b617, 0x0401f014, 0x820c0580, 0x00001001,</div><div class='del'>-	0x04020004, 0x42000000, 0x0010b618, 0x0401f00e,</div><div class='del'>-	0x820c0580, 0x00001002, 0x04020004, 0x42000000,</div><div class='del'>-	0x0010b619, 0x0401f008, 0x820c0c80, 0x0000201c,</div><div class='del'>-	0x02021800, 0x00100615, 0x820c0500, 0x0000001f,</div><div class='del'>-	0x0c01f804, 0x0401ffdd, 0x5c000000, 0x1c01f000,</div><div class='del'>-	0x0010a8b0, 0x0010a8b3, 0x0010a8b6, 0x0010a8b9,</div><div class='del'>-	0x0010a8bc, 0x0010a8bf, 0x0010a8c2, 0x0010a8c5,</div><div class='del'>-	0x0010a8c8, 0x0010a8cb, 0x0010a8ce, 0x0010a8d1,</div><div class='del'>-	0x0010a8d4, 0x0010a8d7, 0x0010a8da, 0x0010a8dd,</div><div class='del'>-	0x0010a8e0, 0x0010a8e3, 0x0010a8e6, 0x0010a8e9,</div><div class='del'>-	0x0010a8ec, 0x0010a8ef, 0x0010a8f2, 0x0010a8f5,</div><div class='del'>-	0x0010a8f8, 0x0010a8fb, 0x0010a8fe, 0x0010a901,</div><div class='del'>-	0x42000000, 0x0010b61a, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b61b, 0x1c01f000, 0x42000000, 0x0010b61c,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b61d, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b61e, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b61f, 0x1c01f000, 0x42000000, 0x0010b620,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b621, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b622, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b623, 0x1c01f000, 0x42000000, 0x0010b624,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b625, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b626, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b627, 0x1c01f000, 0x42000000, 0x0010b628,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b629, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b62a, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b62b, 0x1c01f000, 0x42000000, 0x0010b62c,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b62d, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b62e, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b62f, 0x1c01f000, 0x42000000, 0x0010b630,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b631, 0x1c01f000,</div><div class='del'>-	0x42000000, 0x0010b632, 0x1c01f000, 0x42000000,</div><div class='del'>-	0x0010b633, 0x1c01f000, 0x42000000, 0x0010b634,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b635, 0x1c01f000,</div><div class='del'>-	0x480fc857, 0x4c000000, 0x820c0580, 0x00000001,</div><div class='del'>-	0x04020004, 0x42000000, 0x0010b60c, 0x0401f012,</div><div class='del'>-	0x820c0580, 0x00000002, 0x04020004, 0x42000000,</div><div class='del'>-	0x0010b60d, 0x0401f00c, 0x820c0580, 0x00000003,</div><div class='del'>-	0x04020004, 0x42000000, 0x0010b60e, 0x0401f006,</div><div class='del'>-	0x820c0580, 0x00000004, 0x04020004, 0x42000000,</div><div class='del'>-	0x0010b60f, 0x0401ff51, 0x5c000000, 0x1c01f000,</div><div class='del'>-	0x4c000000, 0x59a80026, 0x4803c857, 0x8c000502,</div><div class='del'>-	0x04000010, 0x8c000506, 0x04000004, 0x42000000,</div><div class='del'>-	0x0010b63f, 0x0401f012, 0x8c00050a, 0x04000004,</div><div class='del'>-	0x42000000, 0x0010b63e, 0x0401f00d, 0x8c000508,</div><div class='del'>-	0x04000004, 0x42000000, 0x0010b641, 0x0401f008,</div><div class='del'>-	0x0201f800, 0x00104e0d, 0x04000006, 0x8c000506,</div><div class='del'>-	0x04020004, 0x42000000, 0x0010b640, 0x0401ff33,</div><div class='del'>-	0x5c000000, 0x1c01f000, 0x8058b1c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x5450a800, 0x8050a000, 0x8054a800,</div><div class='del'>-	0x8058b040, 0x040207fc, 0x1c01f000, 0x8058b1c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x4450a800, 0x8054a800,</div><div class='del'>-	0x8058b040, 0x040207fd, 0x1c01f000, 0x8058b1c0,</div><div class='del'>-	0x02000800, 0x00100615, 0x50500000, 0x9c0001c0,</div><div class='del'>-	0x4400a800, 0x8050a000, 0x8054a800, 0x8058b040,</div><div class='del'>-	0x040207fa, 0x1c01f000, 0x4c000000, 0x59a80008,</div><div class='del'>-	0x8c00051c, 0x5c000000, 0x1c01f000, 0x00000001,</div><div class='del'>-	0x00000002, 0x00000004, 0x00000008, 0x00000010,</div><div class='del'>-	0x00000020, 0x00000040, 0x00000080, 0x00000100,</div><div class='del'>-	0x00000200, 0x00000400, 0x00000800, 0x00001000,</div><div class='del'>-	0x00002000, 0x00004000, 0x00008000, 0x00010000,</div><div class='del'>-	0xd2764e14</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_length01 = 0x0000a971 ;</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code_length01 = 0x0000a971 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_addr02 = 0x0010d000  ;</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code_addr02 = 0x0010d000 ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_code02[] = {</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code02[] = {</div><div class='del'>-#endif</div><div class='del'>-	0x00000000, 0x00000000, 0x0010d000, 0x0000165e,</div><div class='del'>-	0x00000000, 0x00000000, 0x00020000, 0x000009f7,</div><div class='del'>-	0x836c0580, 0x00000003, 0x02020000, 0x00100314,</div><div class='del'>-	0x42000000, 0x0010b2b7, 0x50000000, 0x800001c0,</div><div class='del'>-	0x0402098a, 0x0401f94d, 0x0201f800, 0x00020524,</div><div class='del'>-	0x0401fbfe, 0x0201f800, 0x0002084c, 0x0201f800,</div><div class='del'>-	0x000206af, 0x0401f7ef, 0x59b800ea, 0x82000d00,</div><div class='del'>-	0xf0000038, 0x02020000, 0x00100ac3, 0x8c000510,</div><div class='del'>-	0x02000000, 0x00100ac2, 0x59ba60e0, 0x81300182,</div><div class='del'>-	0x0402104e, 0x04002030, 0x8532653e, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020028, 0x59300203,</div><div class='del'>-	0x82000580, 0x00000004, 0x04020024, 0x59325808,</div><div class='del'>-	0x59300402, 0x4a025a04, 0x00000103, 0x900001c0,</div><div class='del'>-	0x48025806, 0x497a5807, 0x497a5c09, 0x5930001f,</div><div class='del'>-	0x80000540, 0x02020800, 0x00100d9a, 0x59300004,</div><div class='del'>-	0x8c00053e, 0x04020010, 0x0401fb47, 0x59326809,</div><div class='del'>-	0x0201f800, 0x000208b4, 0x5934000f, 0x5934140b,</div><div class='del'>-	0x80081040, 0x04001002, 0x480a6c0b, 0x80000540,</div><div class='del'>-	0x04020a31, 0x59b800ea, 0x8c000510, 0x040207d7,</div><div class='del'>-	0x1c01f000, 0x0201f800, 0x00106cb4, 0x040007ef,</div><div class='del'>-	0x0201f000, 0x00100aae, 0x42027000, 0x00000055,</div><div class='del'>-	0x0401f027, 0x83326500, 0x3fffffff, 0x59300406,</div><div class='del'>-	0x82000580, 0x00000003, 0x04020015, 0x59325808,</div><div class='del'>-	0x59326809, 0x59301402, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x900811c0, 0x480a5806, 0x497a5c09, 0x497a5807,</div><div class='del'>-	0x0401fb21, 0x0201f800, 0x000208b4, 0x5934000f,</div><div class='del'>-	0x5934140b, 0x80081040, 0x04001002, 0x480a6c0b,</div><div class='del'>-	0x80000540, 0x04020a0c, 0x0401f7db, 0x42027000,</div><div class='del'>-	0x00000054, 0x0401f00a, 0x83300500, 0x60000000,</div><div class='del'>-	0x02000000, 0x00100ab1, 0x81326580, 0x8000013a,</div><div class='del'>-	0x82000400, 0x00100ac9, 0x50027000, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000002, 0x02000000, 0x00100aae,</div><div class='del'>-	0x59300004, 0x8c00053e, 0x04020004, 0x0201f800,</div><div class='del'>-	0x000208d8, 0x0401f7c4, 0x0201f800, 0x00106cb4,</div><div class='del'>-	0x040007fb, 0x0201f000, 0x00100aae, 0x59325808,</div><div class='del'>-	0x412c7000, 0x58380a04, 0x82040500, 0x0000000f,</div><div class='del'>-	0x82000c00, 0x0010110d, 0x50044000, 0x0c01f001,</div><div class='del'>-	0x00100e24, 0x00100e24, 0x000200a0, 0x00100e24,</div><div class='del'>-	0x00100e24, 0x00100e24, 0x00100e24, 0x00100e24,</div><div class='del'>-	0x000200b0, 0x00100e38, 0x00100e24, 0x00100e24,</div><div class='del'>-	0x00100e26, 0x00100e24, 0x00100e24, 0x00100e24,</div><div class='del'>-	0x5838040a, 0x8c000500, 0x02000800, 0x00100615,</div><div class='del'>-	0x50200000, 0x80387c00, 0x583c1002, 0x583c2800,</div><div class='del'>-	0x583c2001, 0x58380a07, 0x5838300f, 0x59303807,</div><div class='del'>-	0x58384c08, 0x5838000d, 0x48026012, 0x0401f010,</div><div class='del'>-	0x5838020a, 0x8c000502, 0x02000000, 0x00100e24,</div><div class='del'>-	0x50200000, 0x80387c00, 0x583c2800, 0x583c2001,</div><div class='del'>-	0x583c1002, 0x592c0a07, 0x592c4c08, 0x592c300f,</div><div class='del'>-	0x59303807, 0x497a6012, 0x497a6013, 0x4816600e,</div><div class='del'>-	0x4812600f, 0x480a6010, 0x481a6011, 0x80040840,</div><div class='del'>-	0x4806600d, 0x02020000, 0x00100e65, 0x841c3d40,</div><div class='del'>-	0x481e6007, 0x1c01f000, 0x41787800, 0x59325808,</div><div class='del'>-	0x592c0c0a, 0x8c040d02, 0x02000000, 0x00100fda,</div><div class='del'>-	0x592c000d, 0x592c100f, 0x592c0a04, 0x480a6011,</div><div class='del'>-	0x48026012, 0x48026013, 0x412c3000, 0x82040500,</div><div class='del'>-	0x0000000f, 0x82000400, 0x0010110d, 0x50003800,</div><div class='del'>-	0x501c0000, 0x401c1000, 0x592c1a07, 0x4802600a,</div><div class='del'>-	0x481a600b, 0x480a600c, 0x480e600d, 0x843c7d4a,</div><div class='del'>-	0x403c1000, 0x1c01f000, 0x41787800, 0x497a6012,</div><div class='del'>-	0x592c0a04, 0x412c3000, 0x592c1a07, 0x82040500,</div><div class='del'>-	0x0000000f, 0x82000400, 0x0010110d, 0x50004000,</div><div class='del'>-	0x50200000, 0x40201000, 0x4802600a, 0x481a600b,</div><div class='del'>-	0x480a600c, 0x480e600d, 0x80000580, 0x483e6004,</div><div class='del'>-	0x1c01f000, 0x0002014c, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x00020139, 0x00020139, 0x00020139,</div><div class='del'>-	0x00020139, 0x4c000000, 0x4df00000, 0x4203e000,</div><div class='del'>-	0xb0100000, 0x41f00000, 0x81fe1500, 0x8d0a1512,</div><div class='del'>-	0x02020800, 0x00101468, 0x8d0a1518, 0x02020800,</div><div class='del'>-	0x00020861, 0x8d0a151a, 0x04020ed0, 0x83080500,</div><div class='del'>-	0x00000d00, 0x04020804, 0x5c03e000, 0x5c000000,</div><div class='del'>-	0x1801f000, 0x8d0a1516, 0x02020800, 0x001012d9,</div><div class='del'>-	0x8d0a1514, 0x02020800, 0x001011a5, 0x8d0a1508,</div><div class='del'>-	0x02020800, 0x001011aa, 0x8d0a1500, 0x02020000,</div><div class='del'>-	0x000207c8, 0x1c01f000, 0x42000000, 0x0010b2bd,</div><div class='del'>-	0x50000000, 0x8c000504, 0x04000014, 0x42000000,</div><div class='del'>-	0x0010b2bd, 0x50000000, 0x8c000502, 0x04020002,</div><div class='del'>-	0x1c01f000, 0x4df00000, 0x4203e000, 0x50000000,</div><div class='del'>-	0x42034000, 0x0010b2a0, 0x59a0001d, 0x59a1d81e,</div><div class='del'>-	0x84000502, 0x4803401d, 0x58ec0009, 0x0801f800,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x04027002, 0x04026002,</div><div class='del'>-	0x1c01f000, 0x4df00000, 0x4203e000, 0x50000000,</div><div class='del'>-	0x0201f800, 0x0010082a, 0x0400001a, 0x412dd800,</div><div class='del'>-	0x48efc857, 0x0201f800, 0x00103941, 0x42034000,</div><div class='del'>-	0x0010b2a0, 0x49a1d80b, 0x48ef401e, 0x59a0001d,</div><div class='del'>-	0x84000544, 0x4803401d, 0x59e00020, 0x4803c857,</div><div class='del'>-	0x59e00021, 0x4803c857, 0x59e00022, 0x4803c857,</div><div class='del'>-	0x59e00023, 0x4803c857, 0x59e00024, 0x4803c857,</div><div class='del'>-	0x0201f800, 0x00101fbb, 0x0201f800, 0x00101fda,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x4da00000, 0x4df00000,</div><div class='del'>-	0x4203e000, 0x50000000, 0x04006051, 0x42034000,</div><div class='del'>-	0x0010b2a0, 0x59a01017, 0x59a01818, 0x800c19c0,</div><div class='del'>-	0x04020008, 0x59a0381b, 0x801c39c0, 0x02000800,</div><div class='del'>-	0x00100615, 0x59a0041c, 0x801c3c00, 0x0401f00c,</div><div class='del'>-	0x59a00419, 0x82000400, 0x00000002, 0x48034419,</div><div class='del'>-	0x82000c80, 0x00000013, 0x04001003, 0x497b4419,</div><div class='del'>-	0x41780000, 0x59a03816, 0x801c3c00, 0x80081040,</div><div class='del'>-	0x480b4017, 0x581c0200, 0x4803c021, 0x581c0401,</div><div class='del'>-	0x4803c022, 0x581c0201, 0x4803c023, 0x581c0400,</div><div class='del'>-	0x4803c020, 0x900001c0, 0x82000540, 0x00000012,</div><div class='del'>-	0x4803c011, 0x59e00017, 0x8c000508, 0x04000003,</div><div class='del'>-	0x4a03c017, 0x00000002, 0x4203e000, 0x30000001,</div><div class='del'>-	0x800c19c0, 0x04000007, 0x800c1840, 0x480f4018,</div><div class='del'>-	0x0402001f, 0x497b4419, 0x497b4219, 0x0401f01c,</div><div class='del'>-	0x800811c0, 0x0402000b, 0x4d2c0000, 0x59a2581b,</div><div class='del'>-	0x0201f800, 0x0010083a, 0x5c025800, 0x497b401b,</div><div class='del'>-	0x497b401a, 0x497b441c, 0x497b421c, 0x0401f010,</div><div class='del'>-	0x59a0041c, 0x82000400, 0x00000002, 0x82000c80,</div><div class='del'>-	0x00000012, 0x4803441c, 0x04001009, 0x4d2c0000,</div><div class='del'>-	0x59a2581b, 0x592c3813, 0x481f401b, 0x497b441c,</div><div class='del'>-	0x0201f800, 0x0010083a, 0x5c025800, 0x5c03e000,</div><div class='del'>-	0x5c034000, 0x1c01f000, 0x59a80005, 0x82000500,</div><div class='del'>-	0x00000003, 0x02020000, 0x00104145, 0x59340400,</div><div class='del'>-	0x82000580, 0x00000606, 0x02020000, 0x00104116,</div><div class='del'>-	0x5934000d, 0x80027d40, 0x02020000, 0x00104151,</div><div class='del'>-	0x0401f803, 0x80000580, 0x1c01f000, 0x5934000f,</div><div class='del'>-	0x59341203, 0x80080540, 0x0402005d, 0x5934020b,</div><div class='del'>-	0x5934140b, 0x80080480, 0x04021059, 0x0201f800,</div><div class='del'>-	0x00020892, 0x04000052, 0x592c0406, 0x49366009,</div><div class='del'>-	0x492e6008, 0x4a026406, 0x00000003, 0x4a026403,</div><div class='del'>-	0x00000040, 0x80081000, 0x480a6c0b, 0x800000c2,</div><div class='del'>-	0x800018c4, 0x800c0400, 0x48026206, 0x592c0808,</div><div class='del'>-	0x592c1809, 0x592c020a, 0x48066017, 0x480e6018,</div><div class='del'>-	0x8c000502, 0x0400002a, 0x4a026203, 0x00000004,</div><div class='del'>-	0x592c0207, 0x80000040, 0x0402001a, 0x59a80070,</div><div class='del'>-	0x80000040, 0x040207ff, 0x592c0204, 0x82000500,</div><div class='del'>-	0x000000ff, 0x82000580, 0x00000018, 0x04020011,</div><div class='del'>-	0x592c180f, 0x59300007, 0x82000540, 0x00000091,</div><div class='del'>-	0x480e6011, 0x48026007, 0x42000000, 0x80000004,</div><div class='del'>-	0x48026004, 0x59bc00ea, 0x8c000516, 0x040207fe,</div><div class='del'>-	0x83300400, 0x20000000, 0x480378e1, 0x1c01f000,</div><div class='del'>-	0x0401fe4b, 0x59300007, 0x8400054e, 0x48026007,</div><div class='del'>-	0x592c1a04, 0x820c1d00, 0x000000ff, 0x820c0580,</div><div class='del'>-	0x00000048, 0x04000012, 0x0401f7ec, 0x8c000500,</div><div class='del'>-	0x04020e9e, 0x4a026203, 0x00000002, 0x59a80071,</div><div class='del'>-	0x80000040, 0x040207ff, 0x592c1a04, 0x820c1d00,</div><div class='del'>-	0x000000ff, 0x820c0580, 0x00000018, 0x040007df,</div><div class='del'>-	0x820c0580, 0x00000048, 0x040207dc, 0x42000800,</div><div class='del'>-	0x80000804, 0x0201f000, 0x00106466, 0x800811c0,</div><div class='del'>-	0x04020003, 0x4a026a03, 0x00000001, 0x59340010,</div><div class='del'>-	0x492e6810, 0x80000d40, 0x04020003, 0x492e680f,</div><div class='del'>-	0x1c01f000, 0x492c0800, 0x1c01f000, 0x83440c80,</div><div class='del'>-	0x00000800, 0x04021009, 0x83440400, 0x0010aa00,</div><div class='del'>-	0x50000000, 0x80000540, 0x04000004, 0x40026800,</div><div class='del'>-	0x80000580, 0x1c01f000, 0x82000540, 0x00000001,</div><div class='del'>-	0x1c01f000, 0x59340203, 0x80000540, 0x0402004b,</div><div class='del'>-	0x4d300000, 0x4d2c0000, 0x5934000f, 0x80025d40,</div><div class='del'>-	0x04000044, 0x0201f800, 0x00020892, 0x0400003f,</div><div class='del'>-	0x592c0000, 0x4802680f, 0x80000540, 0x04020002,</div><div class='del'>-	0x48026810, 0x592c2a04, 0x80081000, 0x480a6c0b,</div><div class='del'>-	0x49366009, 0x492e6008, 0x82142d00, 0x000000ff,</div><div class='del'>-	0x82140580, 0x00000012, 0x04000035, 0x4a026406,</div><div class='del'>-	0x00000003, 0x4a026403, 0x00000040, 0x592c0406,</div><div class='del'>-	0x800000c2, 0x800018c4, 0x800c0400, 0x48026206,</div><div class='del'>-	0x592c0808, 0x592c1809, 0x592c020a, 0x48066017,</div><div class='del'>-	0x480e6018, 0x8c000502, 0x02000000, 0x001045a1,</div><div class='del'>-	0x4a026203, 0x00000004, 0x592c0207, 0x80000040,</div><div class='del'>-	0x02020000, 0x00104594, 0x82140580, 0x00000018,</div><div class='del'>-	0x02020000, 0x00104594, 0x592c180f, 0x59300007,</div><div class='del'>-	0x82000540, 0x00000091, 0x480e6011, 0x48026007,</div><div class='del'>-	0x42000000, 0x80000004, 0x48026004, 0x59bc00ea,</div><div class='del'>-	0x8c000516, 0x040207fe, 0x83300400, 0x20000000,</div><div class='del'>-	0x480378e1, 0x5934020b, 0x5934140b, 0x80080480,</div><div class='del'>-	0x040017be, 0x0401f003, 0x4a026a03, 0x00000001,</div><div class='del'>-	0x5c025800, 0x5c026000, 0x1c01f000, 0x497a5800,</div><div class='del'>-	0x49325809, 0x4a026406, 0x00000006, 0x4a026203,</div><div class='del'>-	0x00000007, 0x0401f802, 0x0401f7ef, 0x59a80021,</div><div class='del'>-	0x800001c0, 0x02020000, 0x001045c3, 0x59a80005,</div><div class='del'>-	0x8c000504, 0x02020000, 0x001045bf, 0x59340200,</div><div class='del'>-	0x8c000518, 0x02020000, 0x001045bb, 0x592c0a0c,</div><div class='del'>-	0x48066202, 0x4a025a06, 0x00000000, 0x8c000508,</div><div class='del'>-	0x02020000, 0x001045b7, 0x4d3c0000, 0x417a7800,</div><div class='del'>-	0x0201f800, 0x000207ce, 0x5c027800, 0x1c01f000,</div><div class='del'>-	0x59980026, 0x497a5800, 0x80000540, 0x04020067,</div><div class='del'>-	0x59d80105, 0x82000d00, 0x00018780, 0x04020197,</div><div class='del'>-	0x800000f6, 0x8000013c, 0x0c01f001, 0x000202f3,</div><div class='del'>-	0x0002034e, 0x00020308, 0x00020326, 0x592c0001,</div><div class='del'>-	0x492fb107, 0x80000d40, 0x04020805, 0x59940019,</div><div class='del'>-	0x80000540, 0x04002085, 0x1c01f000, 0x497a5801,</div><div class='del'>-	0x40065800, 0x592c0001, 0x496a5800, 0x815eb800,</div><div class='del'>-	0x412ed000, 0x80000d40, 0x040207f9, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x1c01f000,</div><div class='del'>-	0x492fb107, 0x592c0001, 0x80000d40, 0x04020ff0,</div><div class='del'>-	0x59da5908, 0x835c0480, 0x00000020, 0x0400100d,</div><div class='del'>-	0x0402b00b, 0x492fb007, 0x0400e7fa, 0x59d80105,</div><div class='del'>-	0x82000500, 0x00018780, 0x0402016c, 0x59940019,</div><div class='del'>-	0x80000540, 0x04002065, 0x1c01f000, 0x0400f009,</div><div class='del'>-	0x496a5800, 0x412ed000, 0x815eb800, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x0401f7ef,</div><div class='del'>-	0x492fa807, 0x0401f7ed, 0x59d81108, 0x45681000,</div><div class='del'>-	0x400ad000, 0x815eb800, 0x0400e7fc, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x0402d009,</div><div class='del'>-	0x592c0001, 0x492fb107, 0x80000d40, 0x04020fc8,</div><div class='del'>-	0x59940019, 0x80000540, 0x04002048, 0x1c01f000,</div><div class='del'>-	0x59d80105, 0x82000500, 0x00018780, 0x04020147,</div><div class='del'>-	0x42000000, 0x0010b654, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x59980026, 0x59980828, 0x80000000, 0x48033026,</div><div class='del'>-	0x492f3028, 0x800409c0, 0x04000003, 0x492c0800,</div><div class='del'>-	0x0401f002, 0x492f3029, 0x592c0001, 0x80000d40,</div><div class='del'>-	0x04020faf, 0x0401f7e7, 0x59980026, 0x59980828,</div><div class='del'>-	0x80000000, 0x48033026, 0x492f3028, 0x800409c0,</div><div class='del'>-	0x04000003, 0x492c0800, 0x0401f002, 0x492f3029,</div><div class='del'>-	0x592c0001, 0x80000d40, 0x04020fa1, 0x0402d00d,</div><div class='del'>-	0x59980029, 0x80025d40, 0x0400000e, 0x59980026,</div><div class='del'>-	0x80000040, 0x48033026, 0x04020002, 0x48033028,</div><div class='del'>-	0x592c0000, 0x48033029, 0x492fb107, 0x0400d7f5,</div><div class='del'>-	0x42000000, 0x0010b654, 0x0201f800, 0x0010a86e,</div><div class='del'>-	0x0402e00a, 0x59da5908, 0x496a5800, 0x412ed000,</div><div class='del'>-	0x815eb800, 0x0400e7fc, 0x59c80000, 0x82000540,</div><div class='del'>-	0x00001200, 0x48039000, 0x59d80105, 0x82000500,</div><div class='del'>-	0x00018780, 0x04020109, 0x59940019, 0x80000540,</div><div class='del'>-	0x04002002, 0x1c01f000, 0x59980023, 0x48032819,</div><div class='del'>-	0x1c01f000, 0x592c0404, 0x8c00051e, 0x02020000,</div><div class='del'>-	0x00104b7b, 0x59980022, 0x80000540, 0x0402075d,</div><div class='del'>-	0x59980026, 0x497a5800, 0x80000540, 0x02020000,</div><div class='del'>-	0x00104ba6, 0x59d80105, 0x82000d00, 0x00018780,</div><div class='del'>-	0x040200f2, 0x800000f6, 0x8000013c, 0x0c01f001,</div><div class='del'>-	0x00020398, 0x00104ba6, 0x0002039d, 0x000203e6,</div><div class='del'>-	0x592c0001, 0x492fb107, 0x80000d40, 0x04020760,</div><div class='del'>-	0x1c01f000, 0x592c0001, 0x492fb107, 0x80000d40,</div><div class='del'>-	0x04020f5b, 0x59da5908, 0x835c0480, 0x00000020,</div><div class='del'>-	0x0400102b, 0x0402b033, 0x492fb007, 0x0400e7fa,</div><div class='del'>-	0x59d80105, 0x82000500, 0x00018780, 0x040200d7,</div><div class='del'>-	0x0400601f, 0x59d8010a, 0x59d8090a, 0x80040580,</div><div class='del'>-	0x040207fd, 0x800408e0, 0x599c1017, 0x8c081508,</div><div class='del'>-	0x04020028, 0x82040d40, 0x00000013, 0x5998002b,</div><div class='del'>-	0x4807c011, 0x84000500, 0x4803302b, 0x59e00017,</div><div class='del'>-	0x8c000508, 0x04020004, 0x4203e000, 0x30000001,</div><div class='del'>-	0x1c01f000, 0x4a03c017, 0x00000003, 0x82040500,</div><div class='del'>-	0x000000ff, 0x82000580, 0x0000001d, 0x040207f7,</div><div class='del'>-	0x4a03c017, 0x0000000d, 0x0401f7f4, 0x5998082b,</div><div class='del'>-	0x84040d40, 0x4807302b, 0x1c01f000, 0x496a5800,</div><div class='del'>-	0x412ed000, 0x815eb800, 0x59c80000, 0x82000540,</div><div class='del'>-	0x00001200, 0x48039000, 0x0400e7cb, 0x0401f7d1,</div><div class='del'>-	0x0402f7f7, 0x492fa807, 0x0400e7c7, 0x0401f7cd,</div><div class='del'>-	0x59e0000f, 0x59e0100f, 0x80081580, 0x040207fd,</div><div class='del'>-	0x81281580, 0x040007d4, 0x40025000, 0x82040d40,</div><div class='del'>-	0x0000001d, 0x0401f7d2, 0x59d80908, 0x45680800,</div><div class='del'>-	0x4006d000, 0x815eb800, 0x0400e7fc, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x02006000,</div><div class='del'>-	0x00104b8d, 0x59d8010a, 0x59d8090a, 0x80040d80,</div><div class='del'>-	0x040207fd, 0x900001c0, 0x82000540, 0x00000013,</div><div class='del'>-	0x4803c011, 0x5998002b, 0x84000500, 0x4803302b,</div><div class='del'>-	0x59e00017, 0x8c000508, 0x04000003, 0x4a03c017,</div><div class='del'>-	0x00000003, 0x4203e000, 0x30000001, 0x59d80105,</div><div class='del'>-	0x82000500, 0x00018780, 0x0402007c, 0x0202d000,</div><div class='del'>-	0x00104b92, 0x592c0001, 0x492fb107, 0x80000d40,</div><div class='del'>-	0x040206ef, 0x1c01f000, 0x59980020, 0x0c01f001,</div><div class='del'>-	0x00020413, 0x00020414, 0x00020434, 0x1c01f000,</div><div class='del'>-	0x4df00000, 0x4203e000, 0x50000000, 0x04026876,</div><div class='del'>-	0x04006004, 0x599c0017, 0x8c000508, 0x040208f5,</div><div class='del'>-	0x59980029, 0x80025d40, 0x0400000a, 0x0402d00b,</div><div class='del'>-	0x59980026, 0x80000040, 0x48033026, 0x592c0000,</div><div class='del'>-	0x492fb107, 0x48033029, 0x04020002, 0x48033028,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x59d80105, 0x82000500,</div><div class='del'>-	0x00018780, 0x04020055, 0x42000000, 0x0010b654,</div><div class='del'>-	0x0201f800, 0x0010a86e, 0x5c03e000, 0x1c01f000,</div><div class='del'>-	0x4df00000, 0x4203e000, 0x50000000, 0x599cb817,</div><div class='del'>-	0x59940019, 0x80000540, 0x04002023, 0x0400000e,</div><div class='del'>-	0x59980022, 0x82000580, 0x00000005, 0x0400001e,</div><div class='del'>-	0x59a80069, 0x81640580, 0x0402001b, 0x8c5cbd08,</div><div class='del'>-	0x04000007, 0x59a8006a, 0x59a80866, 0x80040580,</div><div class='del'>-	0x04020015, 0x8c5cbd08, 0x0402002b, 0x59d8090b,</div><div class='del'>-	0x59d8010a, 0x80040580, 0x0400000d, 0x0400600e,</div><div class='del'>-	0x4a03c011, 0x80400012, 0x4a03c020, 0x00008040,</div><div class='del'>-	0x59e00017, 0x8c000508, 0x04000003, 0x4a03c017,</div><div class='del'>-	0x00000002, 0x4203e000, 0x30000001, 0x4a032819,</div><div class='del'>-	0xffff0000, 0x0400e879, 0x04006003, 0x8c5cbd08,</div><div class='del'>-	0x0402088e, 0x59980029, 0x80025d40, 0x04020003,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x59d80105, 0x82000500,</div><div class='del'>-	0x00018780, 0x04020019, 0x0202d000, 0x00104c06,</div><div class='del'>-	0x59980826, 0x592c0000, 0x80040840, 0x48073026,</div><div class='del'>-	0x492fb107, 0x48033029, 0x040207f2, 0x48033028,</div><div class='del'>-	0x0401f7f0, 0x59e0000f, 0x59e0080f, 0x80040580,</div><div class='del'>-	0x040207fd, 0x59e00010, 0x59e01010, 0x80081580,</div><div class='del'>-	0x040207fd, 0x40065000, 0x80041580, 0x040007cc,</div><div class='del'>-	0x040067e1, 0x0401f7cf, 0x4803c857, 0x485fc857,</div><div class='del'>-	0x8c00050e, 0x02020800, 0x0010060d, 0x4203e000,</div><div class='del'>-	0x50000000, 0x4200b800, 0x00008004, 0x0201f000,</div><div class='del'>-	0x0010061a, 0x5998002b, 0x8c000500, 0x04020039,</div><div class='del'>-	0x0400e006, 0x59d80105, 0x82000500, 0x00018780,</div><div class='del'>-	0x040207ee, 0x1c01f000, 0x59da5908, 0x835c0c80,</div><div class='del'>-	0x00000020, 0x04001003, 0x0400b028, 0x0400f02a,</div><div class='del'>-	0x496a5800, 0x412ed000, 0x815eb800, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x0400e7f3,</div><div class='del'>-	0x59d8010a, 0x59d8090a, 0x80040580, 0x040207fd,</div><div class='del'>-	0x800408e0, 0x599c1017, 0x8c081508, 0x04020021,</div><div class='del'>-	0x82040d40, 0x00000013, 0x4807c011, 0x59e00017,</div><div class='del'>-	0x8c000508, 0x0400000a, 0x4a03c017, 0x00000003,</div><div class='del'>-	0x82040500, 0x000000ff, 0x82000580, 0x0000001d,</div><div class='del'>-	0x04020003, 0x4a03c017, 0x0000000d, 0x4203e000,</div><div class='del'>-	0x30000001, 0x59d80105, 0x82000500, 0x00018780,</div><div class='del'>-	0x040207c2, 0x1c01f000, 0x492fb007, 0x0400e7d3,</div><div class='del'>-	0x0401f7e0, 0x492fa807, 0x0400e7d0, 0x0401f7dd,</div><div class='del'>-	0x84000500, 0x4803302b, 0x0400e7cc, 0x0401f7d9,</div><div class='del'>-	0x59e0000f, 0x59e0100f, 0x80081580, 0x040207fd,</div><div class='del'>-	0x81281580, 0x040007db, 0x40025000, 0x82040d40,</div><div class='del'>-	0x0000001d, 0x0401f7d9, 0x59da5908, 0x496a5800,</div><div class='del'>-	0x412ed000, 0x815eb800, 0x0400e7fc, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x59d8090b,</div><div class='del'>-	0x59980024, 0x48073024, 0x80040480, 0x04020004,</div><div class='del'>-	0x59940019, 0x80000540, 0x04022003, 0x59980823,</div><div class='del'>-	0x48072819, 0x59d80105, 0x82000500, 0x00018780,</div><div class='del'>-	0x04020796, 0x1c01f000, 0x59981025, 0x59e00010,</div><div class='del'>-	0x59e00810, 0x80041d80, 0x040207fd, 0x80080580,</div><div class='del'>-	0x04000011, 0x48073025, 0x59e0000f, 0x59e0100f,</div><div class='del'>-	0x80081d80, 0x040207fd, 0x81280580, 0x04000006,</div><div class='del'>-	0x400a5000, 0x40080000, 0x80040580, 0x0402067f,</div><div class='del'>-	0x1c01f000, 0x59940019, 0x80000540, 0x040227fa,</div><div class='del'>-	0x1c01f000, 0x59e0000f, 0x59e0100f, 0x80081d80,</div><div class='del'>-	0x040207fd, 0x81280580, 0x040007f6, 0x400a5000,</div><div class='del'>-	0x59940019, 0x80000540, 0x040027ef, 0x1c01f000,</div><div class='del'>-	0x59e0000f, 0x59e0100f, 0x80080d80, 0x040207fd,</div><div class='del'>-	0x81280580, 0x04020002, 0x1c01f000, 0x400a5000,</div><div class='del'>-	0x900811c0, 0x82081540, 0x0000001c, 0x480bc011,</div><div class='del'>-	0x59e00017, 0x8c000508, 0x04000003, 0x4a03c017,</div><div class='del'>-	0x0000000c, 0x4203e000, 0x30000001, 0x1c01f000,</div><div class='del'>-	0x41700000, 0x0c01f001, 0x001050f0, 0x0002052f,</div><div class='del'>-	0x001050f0, 0x001050f1, 0x001050ee, 0x001050ee,</div><div class='del'>-	0x001050ee, 0x001050ee, 0x00105594, 0x04010037,</div><div class='del'>-	0x59980006, 0x80000540, 0x0402003c, 0x0402c01c,</div><div class='del'>-	0x4202f800, 0x00000010, 0x4df00000, 0x4203e000,</div><div class='del'>-	0x50000000, 0x49db3005, 0x59da5808, 0x592c0204,</div><div class='del'>-	0x497a5800, 0x497a5801, 0x82000500, 0x000000ff,</div><div class='del'>-	0x82000c80, 0x00000079, 0x04021036, 0x0c01f839,</div><div class='del'>-	0x5c03e000, 0x817ef840, 0x04000009, 0x836c0580,</div><div class='del'>-	0x00000003, 0x04020006, 0x83700580, 0x00000001,</div><div class='del'>-	0x04020010, 0x0401001b, 0x0400c7e8, 0x0400f94b,</div><div class='del'>-	0x0400b135, 0x59d40005, 0x82000500, 0x43018780,</div><div class='del'>-	0x02020000, 0x00105523, 0x59d80005, 0x82000500,</div><div class='del'>-	0x43018780, 0x02020000, 0x0010552a, 0x1c01f000,</div><div class='del'>-	0x83700580, 0x00000003, 0x02000800, 0x001050f1,</div><div class='del'>-	0x83700580, 0x00000001, 0x040207ed, 0x04010005,</div><div class='del'>-	0x0400c7d2, 0x0401f7ea, 0x4202f800, 0x00000010,</div><div class='del'>-	0x4df00000, 0x4203e000, 0x50000000, 0x49d73005,</div><div class='del'>-	0x59d65808, 0x0401f7ce, 0x4df00000, 0x4203e000,</div><div class='del'>-	0x50000000, 0x40025800, 0x592c0204, 0x497b3005,</div><div class='del'>-	0x497b3006, 0x4202f800, 0x00000010, 0x0401f7c7,</div><div class='del'>-	0x0201f800, 0x00105161, 0x5c03e000, 0x0401f7d4,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105207, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105171, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105231, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00020623, 0x00105161,</div><div class='del'>-	0x00105398, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x000205f5, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105199, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x001054b7,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105502, 0x00105161, 0x0010518b,</div><div class='del'>-	0x00105161, 0x0010547b, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105449, 0x00105161, 0x00105449,</div><div class='del'>-	0x00105556, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105409, 0x00105539,</div><div class='del'>-	0x00105161, 0x00105549, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x00105161, 0x00105161, 0x00105161,</div><div class='del'>-	0x00105161, 0x592c0204, 0x80000110, 0x80000040,</div><div class='del'>-	0x0400000b, 0x02001000, 0x00105169, 0x48033002,</div><div class='del'>-	0x492f3003, 0x492f3004, 0x4a033008, 0x00020603,</div><div class='del'>-	0x4202e000, 0x00000003, 0x1c01f000, 0x592c0406,</div><div class='del'>-	0x82000c80, 0x0000199a, 0x02021000, 0x00105179,</div><div class='del'>-	0x59a80021, 0x80000540, 0x02020000, 0x001051a7,</div><div class='del'>-	0x592e8a06, 0x83440c80, 0x000007f0, 0x02021000,</div><div class='del'>-	0x00105179, 0x83440400, 0x0010aa00, 0x50000000,</div><div class='del'>-	0x80026d40, 0x02000000, 0x001051bb, 0x59340002,</div><div class='del'>-	0x592c0810, 0x80040580, 0x82000500, 0x00ffffff,</div><div class='del'>-	0x02020000, 0x00105179, 0x0201f800, 0x000201ee,</div><div class='del'>-	0x02020000, 0x001051be, 0x1c01f000, 0x592c0204,</div><div class='del'>-	0x80000110, 0x02000000, 0x00105169, 0x80000040,</div><div class='del'>-	0x0402000b, 0x592c040a, 0x8c000504, 0x04000010,</div><div class='del'>-	0x592c0207, 0x82000c80, 0x00001001, 0x02021000,</div><div class='del'>-	0x00105179, 0x0201f000, 0x0010556e, 0x48033002,</div><div class='del'>-	0x492f3003, 0x492f3004, 0x4a033008, 0x0002063b,</div><div class='del'>-	0x4202e000, 0x00000003, 0x1c01f000, 0x592c0406,</div><div class='del'>-	0x82000c80, 0x0000199a, 0x02021000, 0x00105179,</div><div class='del'>-	0x592e8a06, 0x417a7800, 0x0401fc25, 0x02020000,</div><div class='del'>-	0x0010533c, 0x59340002, 0x592c0808, 0x80040580,</div><div class='del'>-	0x82000500, 0x00ffffff, 0x02020000, 0x00105179,</div><div class='del'>-	0x497a5808, 0x592e6009, 0x83300580, 0xffffffff,</div><div class='del'>-	0x02000000, 0x001052fc, 0x83300480, 0x0010cfc0,</div><div class='del'>-	0x02001000, 0x00105359, 0x59a8000b, 0x81300480,</div><div class='del'>-	0x02021000, 0x00105359, 0x592c240a, 0x49366009,</div><div class='del'>-	0x8c10251c, 0x02020000, 0x001052ea, 0x59a80068,</div><div class='del'>-	0x8c000510, 0x02020000, 0x00105372, 0x59a80821,</div><div class='del'>-	0x800409c0, 0x02020000, 0x001052d0, 0x59a80805,</div><div class='del'>-	0x8c040d04, 0x02020000, 0x00105363, 0x59340200,</div><div class='del'>-	0x8c000518, 0x02020000, 0x00105354, 0x59300c06,</div><div class='del'>-	0x82040580, 0x00000006, 0x02020000, 0x001052f4,</div><div class='del'>-	0x59300414, 0x8c000516, 0x02020000, 0x0010535e,</div><div class='del'>-	0x8c102508, 0x02020000, 0x0010a3d7, 0x59300808,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x800409c0, 0x02020000,</div><div class='del'>-	0x001052cb, 0x592c0a0c, 0x48066202, 0x492e6008,</div><div class='del'>-	0x0401f14a, 0x4df00000, 0x4203e000, 0x50000000,</div><div class='del'>-	0x0402b00b, 0x835c0480, 0x00000020, 0x0400100d,</div><div class='del'>-	0x815eb840, 0x416a5800, 0x592ed000, 0x492fb007,</div><div class='del'>-	0x497a5800, 0x497a5801, 0x0400b7f7, 0x59d80005,</div><div class='del'>-	0x82000500, 0x43018780, 0x02020000, 0x0010552a,</div><div class='del'>-	0x5c03e000, 0x1c01f000, 0x4df00000, 0x4203e000,</div><div class='del'>-	0x50000000, 0x0402f00b, 0x835c0480, 0x00000020,</div><div class='del'>-	0x0400100d, 0x815eb840, 0x416a5800, 0x592ed000,</div><div class='del'>-	0x492fa807, 0x497a5800, 0x497a5801, 0x0400f7f7,</div><div class='del'>-	0x59d40005, 0x82000500, 0x43018780, 0x02020000,</div><div class='del'>-	0x00105523, 0x5c03e000, 0x1c01f000, 0x4df00000,</div><div class='del'>-	0x4203e000, 0x50000000, 0x59940024, 0x80000540,</div><div class='del'>-	0x0400010f, 0x4c000000, 0x42000000, 0x00001000,</div><div class='del'>-	0x50000000, 0x82000480, 0x24320001, 0x04020015,</div><div class='del'>-	0x42000800, 0x00000064, 0x80040840, 0x04000007,</div><div class='del'>-	0x4a030000, 0x00000001, 0x40000000, 0x59800000,</div><div class='del'>-	0x8c000500, 0x040007f9, 0x04000008, 0x42000800,</div><div class='del'>-	0x00007a01, 0x50040000, 0x8c000510, 0x04000003,</div><div class='del'>-	0x84000510, 0x44000800, 0x4a030000, 0x00000000,</div><div class='del'>-	0x59e00002, 0x8c00051e, 0x0402001b, 0x42000000,</div><div class='del'>-	0x00001000, 0x50000000, 0x82000480, 0x24320002,</div><div class='del'>-	0x04020015, 0x42000800, 0x00000064, 0x80040840,</div><div class='del'>-	0x04000007, 0x4a030000, 0x00000001, 0x40000000,</div><div class='del'>-	0x59800000, 0x8c000500, 0x040007f9, 0x04000008,</div><div class='del'>-	0x42000800, 0x00007a17, 0x50040000, 0x8c00050e,</div><div class='del'>-	0x04020003, 0x8400054e, 0x44000800, 0x4a030000,</div><div class='del'>-	0x00000000, 0x5c000000, 0x5994781a, 0x48032825,</div><div class='del'>-	0x803c0480, 0x04001004, 0x04000003, 0x4803281a,</div><div class='del'>-	0x0401f022, 0x41787800, 0x803c7800, 0x82000400,</div><div class='del'>-	0x000003e8, 0x040027fd, 0x4803281a, 0x59a80024,</div><div class='del'>-	0x803c1400, 0x480b5024, 0x803c0040, 0x04000002,</div><div class='del'>-	0x483fc857, 0x59e40852, 0x59a80025, 0x80040580,</div><div class='del'>-	0x04000004, 0x480bc857, 0x59e40052, 0x48035025,</div><div class='del'>-	0x59940026, 0x803c0400, 0x48032826, 0x0201f800,</div><div class='del'>-	0x00105d5a, 0x59940000, 0x82000580, 0x00000000,</div><div class='del'>-	0x04020006, 0x59940026, 0x48032827, 0x497b2826,</div><div class='del'>-	0x4a032800, 0x00000001, 0x4c0c0000, 0x59940007,</div><div class='del'>-	0x80000d40, 0x0400001d, 0x59941006, 0x59940025,</div><div class='del'>-	0x80081c80, 0x04001004, 0x04000003, 0x480f2806,</div><div class='del'>-	0x0401f016, 0x80040840, 0x48072807, 0x82040580,</div><div class='del'>-	0x000003e8, 0x04020007, 0x4c040000, 0x4c0c0000,</div><div class='del'>-	0x59940008, 0x0801f800, 0x5c001800, 0x5c000800,</div><div class='del'>-	0x800409c0, 0x04020004, 0x59940008, 0x0801f800,</div><div class='del'>-	0x0401f006, 0x400c0000, 0x820c1c00, 0x0000000a,</div><div class='del'>-	0x040027ed, 0x480f2806, 0x5c001800, 0x4d180000,</div><div class='del'>-	0x59c40008, 0x8c000534, 0x04020025, 0x417a3000,</div><div class='del'>-	0x83947c00, 0x00000009, 0x583c0001, 0x80000d40,</div><div class='del'>-	0x04020008, 0x823c7c00, 0x00000003, 0x811a3000,</div><div class='del'>-	0x83180580, 0x00000005, 0x040207f8, 0x0401f018,</div><div class='del'>-	0x583c1000, 0x59940025, 0x80080480, 0x04001005,</div><div class='del'>-	0x04000004, 0x48007800, 0x80000040, 0x04021010,</div><div class='del'>-	0x80040840, 0x48047801, 0x04000008, 0x82000400,</div><div class='del'>-	0x0000000a, 0x48007800, 0x040027fa, 0x82040500,</div><div class='del'>-	0x0000007f, 0x0401f7e8, 0x583c0002, 0x4c3c0000,</div><div class='del'>-	0x0801f800, 0x5c007800, 0x0401f7e3, 0x5c023000,</div><div class='del'>-	0x59940019, 0x80001540, 0x04000007, 0x04002006,</div><div class='del'>-	0x59940025, 0x80080480, 0x04021002, 0x80000580,</div><div class='del'>-	0x48032819, 0x5994001c, 0x80000d40, 0x04000013,</div><div class='del'>-	0x5994101b, 0x59940025, 0x80080480, 0x04001005,</div><div class='del'>-	0x04000004, 0x4803281b, 0x80000040, 0x0402100b,</div><div class='del'>-	0x80040840, 0x4807281c, 0x04020004, 0x5994001d,</div><div class='del'>-	0x0801f800, 0x0401f005, 0x82000400, 0x0000000a,</div><div class='del'>-	0x4803281b, 0x040027f7, 0x59940004, 0x80000d40,</div><div class='del'>-	0x04000013, 0x59941003, 0x59940025, 0x80080480,</div><div class='del'>-	0x04001005, 0x04000004, 0x48032803, 0x80000040,</div><div class='del'>-	0x0402100b, 0x80040840, 0x48072804, 0x04020004,</div><div class='del'>-	0x59940005, 0x0801f800, 0x0401f005, 0x82000400,</div><div class='del'>-	0x0000000a, 0x48032803, 0x040027f7, 0x5994001f,</div><div class='del'>-	0x80000d40, 0x04000013, 0x5994101e, 0x59940025,</div><div class='del'>-	0x80080480, 0x04001005, 0x04000004, 0x4803281e,</div><div class='del'>-	0x80000040, 0x0402100b, 0x80040840, 0x4807281f,</div><div class='del'>-	0x04020004, 0x59940020, 0x0801f800, 0x0401f005,</div><div class='del'>-	0x82000400, 0x00000001, 0x4803281e, 0x040027f7,</div><div class='del'>-	0x59940022, 0x80000d40, 0x04000013, 0x59941021,</div><div class='del'>-	0x59940025, 0x80080480, 0x04001005, 0x04000004,</div><div class='del'>-	0x48032821, 0x80000040, 0x0402100b, 0x80040840,</div><div class='del'>-	0x48072822, 0x04020004, 0x59940023, 0x0801f800,</div><div class='del'>-	0x0401f005, 0x82000400, 0x0000000a, 0x48032821,</div><div class='del'>-	0x040027f7, 0x59940824, 0x59940025, 0x80040480,</div><div class='del'>-	0x02001800, 0x00100615, 0x48032824, 0x59940000,</div><div class='del'>-	0x0c01f001, 0x00105cee, 0x00105cf0, 0x00105d16,</div><div class='del'>-	0x59940024, 0x80000000, 0x48032824, 0x4203e000,</div><div class='del'>-	0x70000000, 0x1c01f000, 0x592c0406, 0x800000c2,</div><div class='del'>-	0x800008c4, 0x80040c00, 0x592c040a, 0x48066206,</div><div class='del'>-	0x82000d00, 0x00000003, 0x02000000, 0x00105e97,</div><div class='del'>-	0x8c000500, 0x0402002c, 0x59a80872, 0x80040840,</div><div class='del'>-	0x040207ff, 0x8c00051e, 0x02000000, 0x00105e72,</div><div class='del'>-	0x82000d00, 0x000000c0, 0x02020000, 0x00105e68,</div><div class='del'>-	0x82000d00, 0x00002020, 0x02020000, 0x00105e65,</div><div class='del'>-	0x813e79c0, 0x02020000, 0x00105e65, 0x592c0c0c,</div><div class='del'>-	0x800409c0, 0x02020000, 0x00105e65, 0x59300a03,</div><div class='del'>-	0x82040d80, 0x00000007, 0x02020000, 0x00105e65,</div><div class='del'>-	0x4a026203, 0x00000003, 0x4a026403, 0x00000043,</div><div class='del'>-	0x0201f800, 0x000200ca, 0x82080d40, 0x80003465,</div><div class='del'>-	0x48066004, 0x497a6000, 0x59bc00ea, 0x8c000516,</div><div class='del'>-	0x040207fe, 0x83300400, 0xa0000000, 0x480378e1,</div><div class='del'>-	0x1c01f000, 0x8c000502, 0x02020000, 0x00105eba,</div><div class='del'>-	0x8c00051e, 0x0400000e, 0x82000d00, 0x000000c0,</div><div class='del'>-	0x04000005, 0x82040d80, 0x000000c0, 0x02020000,</div><div class='del'>-	0x00105ebf, 0x82000d00, 0x00002020, 0x82040d80,</div><div class='del'>-	0x00002020, 0x02000000, 0x00105e86, 0x592c0207,</div><div class='del'>-	0x80000040, 0x02020000, 0x00105e90, 0x592c180d,</div><div class='del'>-	0x800c19c0, 0x02020000, 0x00105e90, 0x592c180f,</div><div class='del'>-	0x59300007, 0x82000540, 0x00000011, 0x480e6011,</div><div class='del'>-	0x48026007, 0x4a026203, 0x00000004, 0x4a026403,</div><div class='del'>-	0x00000042, 0x42000800, 0x80002001, 0x0401f02a,</div><div class='del'>-	0x5c000000, 0x4c000000, 0x4803c857, 0x4807c857,</div><div class='del'>-	0x0401f003, 0x42000800, 0x00000001, 0x59325808,</div><div class='del'>-	0x832c0500, 0x00ff0000, 0x0400000d, 0x592c0000,</div><div class='del'>-	0x48065a06, 0x48026008, 0x592c040a, 0x8c000510,</div><div class='del'>-	0x04020008, 0x0201f800, 0x00020381, 0x417a7800,</div><div class='del'>-	0x59300008, 0x80025d40, 0x0402078c, 0x1c01f000,</div><div class='del'>-	0x456a5800, 0x412ed000, 0x815eb800, 0x59c80000,</div><div class='del'>-	0x82000540, 0x00001200, 0x48039000, 0x0401f7f4,</div><div class='del'>-	0x59840000, 0x80000540, 0x04020002, 0x1c01f000,</div><div class='del'>-	0x59840003, 0x80000540, 0x02020000, 0x00105f37,</div><div class='del'>-	0x1c01f000, 0x59300004, 0x82000500, 0x00000100,</div><div class='del'>-	0x80040d40, 0x48066004, 0x59bc00ea, 0x8c000516,</div><div class='del'>-	0x040207fe, 0x83300400, 0x40000000, 0x480378e1,</div><div class='del'>-	0x1c01f000, 0x59bc00ea, 0x82001500, 0xb0000018,</div><div class='del'>-	0x02020000, 0x001069c6, 0x8c000510, 0x0400002a,</div><div class='del'>-	0x59bc10e0, 0x82080500, 0xfffff000, 0x0402000a,</div><div class='del'>-	0x80080108, 0x820a3500, 0x0000000f, 0x4803c857,</div><div class='del'>-	0x1201f000, 0x001069cc, 0x84000510, 0x48026004,</div><div class='del'>-	0x0401f016, 0x840a653e, 0x59300004, 0x8c000520,</div><div class='del'>-	0x040007fa, 0x82000500, 0xfffefeff, 0x48026004,</div><div class='del'>-	0x8c08153e, 0x04020005, 0x42027000, 0x00000013,</div><div class='del'>-	0x0401f858, 0x0401f009, 0x59300004, 0x8c000514,</div><div class='del'>-	0x04000003, 0x0401ffac, 0x0401f02e, 0x42027000,</div><div class='del'>-	0x00000049, 0x0401f84f, 0x59bc00ea, 0x82001500,</div><div class='del'>-	0xb0000018, 0x02020000, 0x001069c6, 0x8c000510,</div><div class='del'>-	0x040207d8, 0x1c01f000, 0x83640480, 0x00000010,</div><div class='del'>-	0x04001019, 0x41626000, 0x41580000, 0x59300a03,</div><div class='del'>-	0x82040d80, 0x00000000, 0x04000008, 0x83326400,</div><div class='del'>-	0x00000024, 0x81300c80, 0x040017f9, 0x42026000,</div><div class='del'>-	0x0010cfc0, 0x0401f7f6, 0x4a026203, 0x00000008,</div><div class='del'>-	0x8166c840, 0x8332c400, 0x00000024, 0x81600480,</div><div class='del'>-	0x04021002, 0x1c01f000, 0x837ac540, 0x0010cfc0,</div><div class='del'>-	0x1c01f000, 0x42000000, 0x0010b653, 0x0201f800,</div><div class='del'>-	0x0010a86e, 0x4967c857, 0x80026580, 0x1c01f000,</div><div class='del'>-	0x83300480, 0x0010cfc0, 0x02001800, 0x00100615,</div><div class='del'>-	0x41580000, 0x81300480, 0x0402100c, 0x04011000,</div><div class='del'>-	0x457a6000, 0x4a026202, 0x0000ffff, 0x83300400,</div><div class='del'>-	0x00000003, 0x4803c840, 0x4a03c842, 0x00000021,</div><div class='del'>-	0x8166c800, 0x1c01f000, 0x41540000, 0x81300480,</div><div class='del'>-	0x02021800, 0x00100615, 0x04011000, 0x457a6000,</div><div class='del'>-	0x4a026202, 0x0000ffff, 0x83300400, 0x00000003,</div><div class='del'>-	0x4803c840, 0x4a03c842, 0x00000021, 0x59a80066,</div><div class='del'>-	0x49335065, 0x80000000, 0x48035066, 0x1c01f000,</div><div class='del'>-	0x4d340000, 0x59326809, 0x59300406, 0x82000500,</div><div class='del'>-	0x0000001f, 0x0c01f803, 0x5c026800, 0x1c01f000,</div><div class='del'>-	0x001076ed, 0x00107700, 0x0010771a, 0x00020900,</div><div class='del'>-	0x001096c1, 0x001096dc, 0x00020975, 0x001076ed,</div><div class='del'>-	0x00107700, 0x00106226, 0x00107733, 0x001076ed,</div><div class='del'>-	0x001076ed, 0x001076ed, 0x001076ed, 0x001076ed,</div><div class='del'>-	0x0010936a, 0x0010a4d0, 0x001076ed, 0x001076ed,</div><div class='del'>-	0x001076ed, 0x001076ed, 0x001076ed, 0x001076ed,</div><div class='del'>-	0x001076ed, 0x001076ed, 0x001076ed, 0x001076ed,</div><div class='del'>-	0x001076ed, 0x001076ed, 0x001076ed, 0x001076ed,</div><div class='del'>-	0x59300203, 0x82000c80, 0x0000000e, 0x02021800,</div><div class='del'>-	0x00100615, 0x0c01f001, 0x00107731, 0x00108337,</div><div class='del'>-	0x00020914, 0x001084cc, 0x00108566, 0x00107731,</div><div class='del'>-	0x00107731, 0x00107731, 0x0010831c, 0x00107731,</div><div class='del'>-	0x00107731, 0x00107731, 0x00107731, 0x0010873a,</div><div class='del'>-	0x83380480, 0x00000058, 0x04021007, 0x83380480,</div><div class='del'>-	0x00000040, 0x04001004, 0x4d2c0000, 0x0c01f803,</div><div class='del'>-	0x5c025800, 0x1c01f000, 0x001083c1, 0x001083c1,</div><div class='del'>-	0x001083c1, 0x001083c1, 0x001083c1, 0x001083c3,</div><div class='del'>-	0x00108463, 0x001083c1, 0x001083c1, 0x001083c1,</div><div class='del'>-	0x001083c1, 0x001083c1, 0x001083c1, 0x001083c1,</div><div class='del'>-	0x001083c1, 0x001083c1, 0x001083c1, 0x001083c1,</div><div class='del'>-	0x001083c1, 0x00108467, 0x00020936, 0x001083c1,</div><div class='del'>-	0x00108466, 0x00108468, 0x59325808, 0x59300811,</div><div class='del'>-	0x59301402, 0x59340200, 0x8c00050e, 0x0402001c,</div><div class='del'>-	0x0401f826, 0x04000005, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x497a5c09, 0x0401f009, 0x4a025a04, 0x00000103,</div><div class='del'>-	0x4a025a06, 0x00000000, 0x497a5c09, 0x800409c0,</div><div class='del'>-	0x02020800, 0x00108531, 0x48065807, 0x480a5c06,</div><div class='del'>-	0x0201f800, 0x00020381, 0x5934000f, 0x5934140b,</div><div class='del'>-	0x80081040, 0x04001002, 0x480a6c0b, 0x80000540,</div><div class='del'>-	0x02020800, 0x00020275, 0x0401f75e, 0x592c020a,</div><div class='del'>-	0x8c000502, 0x040007e9, 0x800409c0, 0x040007e7,</div><div class='del'>-	0x592c0208, 0x8c00050e, 0x040207e4, 0x4933c857,</div><div class='del'>-	0x0201f000, 0x00108fc6, 0x592c020a, 0x8c000500,</div><div class='del'>-	0x04000010, 0x59300015, 0x592c380f, 0x801c3c80,</div><div class='del'>-	0x0400000c, 0x4a025a06, 0x00000015, 0x8c1c3d3e,</div><div class='del'>-	0x04000005, 0x4a025a06, 0x00000007, 0x801c3880,</div><div class='del'>-	0x801c3800, 0x481fc857, 0x821c0d40, 0x00000000,</div><div class='del'>-	0x1c01f000, 0x59300203, 0x82003480, 0x0000000e,</div><div class='del'>-	0x02021800, 0x00100615, 0x0c01f001, 0x001096fb,</div><div class='del'>-	0x00020989, 0x00109d9c, 0x00109daa, 0x000209a5,</div><div class='del'>-	0x001096fb, 0x00109e98, 0x000209c4, 0x001096fb,</div><div class='del'>-	0x001096fb, 0x001096fb, 0x001096fb, 0x001096fb,</div><div class='del'>-	0x001096fb, 0x83380580, 0x00000013, 0x02020000,</div><div class='del'>-	0x00109d23, 0x59300403, 0x82027480, 0x00000044,</div><div class='del'>-	0x02021800, 0x00100615, 0x82000480, 0x00000040,</div><div class='del'>-	0x02001800, 0x00100615, 0x0c01f001, 0x00109d80,</div><div class='del'>-	0x0002099b, 0x00109d82, 0x00109d94, 0x59325808,</div><div class='del'>-	0x832c0500, 0x00ff0000, 0x04000005, 0x592c0c0a,</div><div class='del'>-	0x8c040d1a, 0x02020000, 0x00109d8f, 0x0401fe8e,</div><div class='del'>-	0x0401f710, 0x83380580, 0x00000048, 0x04000007,</div><div class='del'>-	0x83380580, 0x00000053, 0x02000000, 0x00109e3a,</div><div class='del'>-	0x0201f800, 0x00100615, 0x5930001f, 0x59301011,</div><div class='del'>-	0x59300809, 0x58040a00, 0x8c040d0e, 0x02020000,</div><div class='del'>-	0x00109e16, 0x800811c0, 0x02020000, 0x00109e23,</div><div class='del'>-	0x5930001f, 0x80000540, 0x02020000, 0x00109e31,</div><div class='del'>-	0x59325808, 0x592c040a, 0x8c00051e, 0x02000000,</div><div class='del'>-	0x00109e0c, 0x42027000, 0x00000041, 0x0401f001,</div><div class='del'>-	0x83380480, 0x00000054, 0x02021800, 0x00100615,</div><div class='del'>-	0x83380480, 0x00000040, 0x02001000, 0x00109e57,</div><div class='del'>-	0x0c01f001, 0x00109e63, 0x000209e1, 0x00109e6f,</div><div class='del'>-	0x00109e76, 0x00109e63, 0x00109e63, 0x00109e63,</div><div class='del'>-	0x00109e63, 0x00109e65, 0x00109e6a, 0x00109e6a,</div><div class='del'>-	0x00109e63, 0x00109e63, 0x00109e63, 0x00109e63,</div><div class='del'>-	0x00109e6a, 0x00109e63, 0x00109e6a, 0x00109e63,</div><div class='del'>-	0x00109e65, 0x4a026203, 0x00000001, 0x493a6403,</div><div class='del'>-	0x42000800, 0x80002042, 0x0401f66f, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0xa36ec441, 0x00000000,</div><div class='del'>-	0x00000000, 0x00000000, 0x00000005, 0xfffffffb,</div><div class='del'>-	0x02800004, 0x00000000, 0x0000c000, 0x0000071b,</div><div class='del'>-	0x073fca5a, 0x0705a5a5, 0x01928009, 0x070ff0e1,</div><div class='del'>-	0x03800006, 0x04958010, 0x05308000, 0x05008000,</div><div class='del'>-	0x0600902f, 0x04a004dc, 0x0202f051, 0x042e4020,</div><div class='del'>-	0x018f021b, 0x033e5000, 0x03020000, 0x078d0018,</div><div class='del'>-	0x0493041a, 0x0092041c, 0x038a0305, 0x078b0303,</div><div class='del'>-	0x048e8010, 0x0678aae5, 0x06000001, 0x07818174,</div><div class='del'>-	0x040010e6, 0x0448e0e6, 0x04818010, 0x002fb008,</div><div class='del'>-	0x0448e0e6, 0x04818010, 0x060ff0e6, 0x00580401,</div><div class='del'>-	0x054880ff, 0x04818010, 0x022a5001, 0x030430d4,</div><div class='del'>-	0x06780043, 0x030e0000, 0x030450ff, 0x06780043,</div><div class='del'>-	0x03019000, 0x048185c4, 0x027c0045, 0x03020000,</div><div class='del'>-	0x06810037, 0x027c0045, 0x03040000, 0x068100c7,</div><div class='del'>-	0x027c0045, 0x03080000, 0x0681061c, 0x04908037,</div><div class='del'>-	0x029105c2, 0x010410a6, 0x0379ff41, 0x037fffff,</div><div class='del'>-	0x072d6000, 0x07601241, 0x050f80ff, 0x032fa009,</div><div class='del'>-	0x05600400, 0x050f80ff, 0x056c04ff, 0x068105da,</div><div class='del'>-	0x073fa009, 0x06000001, 0x0279ff02, 0x0700ffff,</div><div class='del'>-	0x070ff0d1, 0x0179feff, 0x0700ffff, 0x045c0402,</div><div class='del'>-	0x048185da, 0x060ff0d0, 0x0179feff, 0x0700ffff,</div><div class='del'>-	0x057dfeff, 0x0700ffff, 0x068105bc, 0x05600e41,</div><div class='del'>-	0x050f80ff, 0x032fa069, 0x07480000, 0x068105ce,</div><div class='del'>-	0x06780043, 0x070000f0, 0x0781005f, 0x037c00ff,</div><div class='del'>-	0x06000010, 0x0781005f, 0x038005ca, 0x0379ff00,</div><div class='del'>-	0x070fffff, 0x06780043, 0x07f00000, 0x075a0000,</div><div class='del'>-	0x020ef001, 0x038605cc, 0x05484000, 0x02a1819e,</div><div class='del'>-	0x062d6001, 0x002fb001, 0x070ff069, 0x01868072,</div><div class='del'>-	0x060ff079, 0x055c0441, 0x06810010, 0x012fb000,</div><div class='del'>-	0x060560fb, 0x03800078, 0x060ff079, 0x02868198,</div><div class='del'>-	0x070ff069, 0x055c0441, 0x06810010, 0x060560fb,</div><div class='del'>-	0x0400d0d0, 0x062d6002, 0x0648300d, 0x06810086,</div><div class='del'>-	0x070ff0d1, 0x062d6001, 0x045c040b, 0x06810089,</div><div class='del'>-	0x05488000, 0x04818086, 0x072e500c, 0x00208001,</div><div class='del'>-	0x05a004e1, 0x02800010, 0x062d6001, 0x07f00000,</div><div class='del'>-	0x07f00000, 0x070ff0d1, 0x0179feff, 0x070000ff,</div><div class='del'>-	0x055c040c, 0x058180bb, 0x0007b001, 0x03079041,</div><div class='del'>-	0x0307a000, 0x06600a79, 0x050f80ff, 0x053fa80a,</div><div class='del'>-	0x06000010, 0x072d5003, 0x078d0096, 0x0307c003,</div><div class='del'>-	0x0007d004, 0x0107e005, 0x0307f006, 0x02080007,</div><div class='del'>-	0x00081008, 0x01082009, 0x0308300a, 0x0008400b,</div><div class='del'>-	0x0308500c, 0x068d00a1, 0x0678007a, 0x07f00000,</div><div class='del'>-	0x010880ff, 0x03386000, 0x03010000, 0x072e6300,</div><div class='del'>-	0x020ef07f, 0x02860010, 0x070ff07d, 0x0450047c,</div><div class='del'>-	0x050f80ff, 0x002fa819, 0x068d00ae, 0x02080001,</div><div class='del'>-	0x00081002, 0x0448807a, 0x068100b5, 0x0379ff03,</div><div class='del'>-	0x070000ff, 0x01082003, 0x068d00b6, 0x02386004,</div><div class='del'>-	0x03010000, 0x072e6c00, 0x02800010, 0x06780043,</div><div class='del'>-	0x070000f0, 0x068105d5, 0x050020ff, 0x027c0002,</div><div class='del'>-	0x06000010, 0x078100c3, 0x028005d5, 0x0700c0d1,</div><div class='del'>-	0x0379ff0c, 0x070000ff, 0x0380008e, 0x0204a051,</div><div class='del'>-	0x06780043, 0x070000f0, 0x037c00ff, 0x06000010,</div><div class='del'>-	0x0781816a, 0x072d6000, 0x019485be, 0x050fb056,</div><div class='del'>-	0x044880e6, 0x04818010, 0x060ff0d0, 0x0179feff,</div><div class='del'>-	0x0700ffff, 0x057dfeff, 0x0700ffff, 0x068105bc,</div><div class='del'>-	0x05a00212, 0x0349c0e4, 0x0781811d, 0x070ff093,</div><div class='del'>-	0x050010ff, 0x070ff093, 0x045c0401, 0x058180db,</div><div class='del'>-	0x02046092, 0x04002046, 0x04600202, 0x00540401,</div><div class='del'>-	0x048280e6, 0x04500425, 0x070060ff, 0x0730ffff,</div><div class='del'>-	0x0700000f, 0x0742000f, 0x05810190, 0x06a005a4,</div><div class='del'>-	0x0648a002, 0x048180e9, 0x00047089, 0x070ff047,</div><div class='del'>-	0x045c0443, 0x077800ff, 0x07f00000, 0x0781818e,</div><div class='del'>-	0x07780047, 0x0500e000, 0x048185ab, 0x070ff006,</div><div class='del'>-	0x01860117, 0x0179fe47, 0x0700000f, 0x010480ff,</div><div class='del'>-	0x056c7048, 0x06818102, 0x007a0d4a, 0x04003801,</div><div class='del'>-	0x0220f001, 0x0180010f, 0x07608e48, 0x034a60ff,</div><div class='del'>-	0x0700f0ff, 0x074b88ff, 0x037000ff, 0x07000600,</div><div class='del'>-	0x05500448, 0x074d00ff, 0x045a044a, 0x0304a0ff,</div><div class='del'>-	0x070ff00f, 0x01540406, 0x05820117, 0x04950120,</div><div class='del'>-	0x05a001bd, 0x02868123, 0x0134bfff, 0x070fffff,</div><div class='del'>-	0x0104102e, 0x050fd041, 0x00800126, 0x0595011d,</div><div class='del'>-	0x05a001bd, 0x0186011d, 0x0202f00e, 0x052e4030,</div><div class='del'>-	0x040fd02f, 0x070fc0ff, 0x05a00218, 0x02800010,</div><div class='del'>-	0x0400e02f, 0x042e4020, 0x0202f051, 0x0004100e,</div><div class='del'>-	0x0004b00e, 0x050fd041, 0x024a6c46, 0x04500423,</div><div class='del'>-	0x050070ff, 0x03620024, 0x050080ff, 0x04004046,</div><div class='del'>-	0x0700500f, 0x03206000, 0x05601048, 0x0700a0ff,</div><div class='del'>-	0x0700900a, 0x070ff005, 0x04500446, 0x00540425,</div><div class='del'>-	0x04820157, 0x05601622, 0x050f80ff, 0x063fa032,</div><div class='del'>-	0x06000002, 0x03203000, 0x01204000, 0x03205000,</div><div class='del'>-	0x0120b000, 0x0320c000, 0x07601441, 0x050f80ff,</div><div class='del'>-	0x043fa852, 0x06000001, 0x070ff056, 0x056c02ff,</div><div class='del'>-	0x050fb0ff, 0x070560ff, 0x03079041, 0x05600e41,</div><div class='del'>-	0x050f80ff, 0x073fa011, 0x0600003d, 0x06780043,</div><div class='del'>-	0x07f00000, 0x065a007a, 0x010880ff, 0x04a001b6,</div><div class='del'>-	0x058d0150, 0x0208a04a, 0x0108b04b, 0x02386001,</div><div class='del'>-	0x03010000, 0x072e6300, 0x028000a8, 0x0500d00a,</div><div class='del'>-	0x05500405, 0x014a68ff, 0x070090ff, 0x0154040a,</div><div class='del'>-	0x0700c0ff, 0x0600a023, 0x0500b024, 0x02206001,</div><div class='del'>-	0x05601622, 0x050f80ff, 0x063fa04a, 0x06000002,</div><div class='del'>-	0x05601022, 0x050f80ff, 0x043fa819, 0x06000001,</div><div class='del'>-	0x0600a00d, 0x0180013c, 0x06780043, 0x070000f0,</div><div class='del'>-	0x050010ff, 0x027c0001, 0x07000030, 0x078105b2,</div><div class='del'>-	0x027c0001, 0x06000020, 0x078105b2, 0x038005ca,</div><div class='del'>-	0x054880ff, 0x06810010, 0x070ff056, 0x050fb0ff,</div><div class='del'>-	0x044880e5, 0x0581017d, 0x044880e6, 0x04818010,</div><div class='del'>-	0x00800183, 0x056c02ff, 0x050fb0ff, 0x070560ff,</div><div class='del'>-	0x072e5300, 0x044880e6, 0x04818010, 0x072d5003,</div><div class='del'>-	0x06780043, 0x07f00000, 0x010880ff, 0x058d0187,</div><div class='del'>-	0x03386005, 0x03010000, 0x033e6000, 0x0700000c,</div><div class='del'>-	0x052e5200, 0x02800010, 0x0120918e, 0x018004e4,</div><div class='del'>-	0x01209190, 0x018004e4, 0x00209192, 0x018004e4,</div><div class='del'>-	0x03209000, 0x018004e4, 0x01209196, 0x018004e4,</div><div class='del'>-	0x00209198, 0x018004e4, 0x02493075, 0x0681050b,</div><div class='del'>-	0x0120919a, 0x018004e4, 0x06601e01, 0x050f80ff,</div><div class='del'>-	0x063fa029, 0x06000008, 0x02015010, 0x02016051,</div><div class='del'>-	0x00017051, 0x00011051, 0x05601a41, 0x050f80ff,</div><div class='del'>-	0x053fa83a, 0x06000008, 0x05600e41, 0x050f80ff,</div><div class='del'>-	0x01464000, 0x032fa00a, 0x07006011, 0x05007012,</div><div class='del'>-	0x04008013, 0x07009014, 0x0600a015, 0x0400b016,</div><div class='del'>-	0x0700c017, 0x07c00000, 0x072d5003, 0x06601479,</div><div class='del'>-	0x050f80ff, 0x048d01b9, 0x063fa051, 0x0600003e,</div><div class='del'>-	0x07c00000, 0x06005051, 0x0400e02c, 0x0660060e,</div><div class='del'>-	0x050f80ff, 0x032fa009, 0x0379ff00, 0x070000ff,</div><div class='del'>-	0x076c0000, 0x058101dd, 0x0660480e, 0x0500e0ff,</div><div class='del'>-	0x034000ff, 0x01540427, 0x0582020a, 0x03400005,</div><div class='del'>-	0x070ff005, 0x055c0428, 0x0481020e, 0x01680e05,</div><div class='del'>-	0x056c0405, 0x068181bf, 0x040f8029, 0x053fa809,</div><div class='del'>-	0x07000024, 0x06600649, 0x050f80ff, 0x032fa009,</div><div class='del'>-	0x0379ff00, 0x070000ff, 0x076c0000, 0x068181bf,</div><div class='del'>-	0x0400e049, 0x0340002d, 0x050f802b, 0x053fa80a,</div><div class='del'>-	0x06000016, 0x0660480e, 0x0302c0ff, 0x034000ff,</div><div class='del'>-	0x01540427, 0x0582020c, 0x072d6000, 0x0460040e,</div><div class='del'>-	0x050f80ff, 0x0104e0d1, 0x0379ff4e, 0x0700ffff,</div><div class='del'>-	0x062d6002, 0x032fa009, 0x0004d0d0, 0x074b004d,</div><div class='del'>-	0x07780000, 0x07ffff00, 0x055a044d, 0x070000ff,</div><div class='del'>-	0x00201008, 0x04002051, 0x06003051, 0x05304000,</div><div class='del'>-	0x07000060, 0x03205009, 0x07006022, 0x0460040e,</div><div class='del'>-	0x050f80ff, 0x032fa03a, 0x06603c0e, 0x050f80ff,</div><div class='del'>-	0x073fa00a, 0x07000027, 0x050010d1, 0x0460320e,</div><div class='del'>-	0x050f80ff, 0x012fa80a, 0x060ff00e, 0x055c042e,</div><div class='del'>-	0x04810210, 0x07c00000, 0x0400e026, 0x008001cb,</div><div class='del'>-	0x0202c026, 0x008001e6, 0x0500e02e, 0x008001e6,</div><div class='del'>-	0x0400e051, 0x01800209, 0x0349c0e4, 0x04810215,</div><div class='del'>-	0x07c00000, 0x013e4000, 0x070c0000, 0x07c00000,</div><div class='del'>-	0x013e4000, 0x03080000, 0x07c00000, 0x009702f4,</div><div class='del'>-	0x022a5002, 0x0790821d, 0x00910291, 0x030400a6,</div><div class='del'>-	0x0678aae5, 0x06000001, 0x01a1860c, 0x06600c40,</div><div class='del'>-	0x050f80ff, 0x032fa021, 0x074b0000, 0x076c0600,</div><div class='del'>-	0x07818293, 0x05600403, 0x050f80ff, 0x073fa009,</div><div class='del'>-	0x06000002, 0x0279ff04, 0x0700ffff, 0x010440d7,</div><div class='del'>-	0x0179fe44, 0x0700ffff, 0x045c0404, 0x07818295,</div><div class='del'>-	0x0349f044, 0x0681829e, 0x02495001, 0x06818297,</div><div class='del'>-	0x060ff079, 0x045c0440, 0x0781823c, 0x0644f07a,</div><div class='del'>-	0x002fb008, 0x060ff079, 0x045c0440, 0x07818241,</div><div class='del'>-	0x0644f07a, 0x002fb008, 0x0648f001, 0x07818288,</div><div class='del'>-	0x04600e40, 0x050f80ff, 0x06480001, 0x04810257,</div><div class='del'>-	0x0448e001, 0x04810273, 0x02460001, 0x0644f001,</div><div class='del'>-	0x012fa80a, 0x04008040, 0x05a004ee, 0x0286828c,</div><div class='del'>-	0x05a004d8, 0x062da001, 0x013e4000, 0x06000080,</div><div class='del'>-	0x06930013, 0x02920013, 0x02800010, 0x0644f001,</div><div class='del'>-	0x012fa80a, 0x020ef002, 0x00860275, 0x04600840,</div><div class='del'>-	0x050f80ff, 0x053fa809, 0x06000002, 0x05780105,</div><div class='del'>-	0x00800440, 0x017c0105, 0x05000400, 0x06818275,</div><div class='del'>-	0x06601e02, 0x050f80ff, 0x053fa809, 0x06000002,</div><div class='del'>-	0x04602a40, 0x050f80ff, 0x070ff005, 0x053fa809,</div><div class='del'>-	0x06000002, 0x055c0405, 0x06818275, 0x04008040,</div><div class='del'>-	0x0045e008, 0x05a004d8, 0x00800251, 0x0644f001,</div><div class='del'>-	0x012fa80a, 0x050020d8, 0x04600440, 0x050f80ff,</div><div class='del'>-	0x073fa00a, 0x06000001, 0x06480001, 0x07818281,</div><div class='del'>-	0x05308000, 0x03040000, 0x06009040, 0x04a004dc,</div><div class='del'>-	0x00800251, 0x07a0060c, 0x054b0800, 0x056a0700,</div><div class='del'>-	0x06600c40, 0x050f80ff, 0x032fa00a, 0x00800251,</div><div class='del'>-	0x013e4000, 0x06000080, 0x01209288, 0x018004e4,</div><div class='del'>-	0x06009008, 0x05308000, 0x05004000, 0x04a004dc,</div><div class='del'>-	0x00800251, 0x02209002, 0x008002e5, 0x03209000,</div><div class='del'>-	0x008002e5, 0x02209004, 0x008002e5, 0x04a002fd,</div><div class='del'>-	0x062da001, 0x05308000, 0x05002000, 0x06009040,</div><div class='del'>-	0x04a004dc, 0x00800252, 0x013e4000, 0x06000080,</div><div class='del'>-	0x02495001, 0x078182db, 0x04600840, 0x050f80ff,</div><div class='del'>-	0x053fa809, 0x06000001, 0x0721f000, 0x0349f003,</div><div class='del'>-	0x058102aa, 0x0245f01f, 0x06000002, 0x018602db,</div><div class='del'>-	0x07601400, 0x050f80ff, 0x012fa809, 0x06480001,</div><div class='del'>-	0x058102db, 0x06602440, 0x050f80ff, 0x012fa809,</div><div class='del'>-	0x020ef001, 0x038682db, 0x019b02db, 0x050020d8,</div><div class='del'>-	0x062da001, 0x06303002, 0x05000430, 0x04600440,</div><div class='del'>-	0x050f80ff, 0x073fa012, 0x06000001, 0x028f82bf,</div><div class='del'>-	0x050040d8, 0x062da001, 0x07601e00, 0x050f80ff,</div><div class='del'>-	0x073fa009, 0x06000001, 0x060ff004, 0x00540402,</div><div class='del'>-	0x048202d9, 0x06005051, 0x06006051, 0x06602240,</div><div class='del'>-	0x050f80ff, 0x063fa01a, 0x06000002, 0x06600a40,</div><div class='del'>-	0x050f80ff, 0x073fa00a, 0x07000003, 0x060ff040,</div><div class='del'>-	0x045a041f, 0x010eb0ff, 0x06930013, 0x02920013,</div><div class='del'>-	0x02800010, 0x04004002, 0x018002c9, 0x04a002fd,</div><div class='del'>-	0x062da001, 0x05308000, 0x07005000, 0x06009040,</div><div class='del'>-	0x04a004dc, 0x050080d8, 0x05a004e1, 0x062da001,</div><div class='del'>-	0x02800013, 0x050fd009, 0x050fd041, 0x013e4000,</div><div class='del'>-	0x06000080, 0x05308000, 0x03013000, 0x04a004dc,</div><div class='del'>-	0x010440d7, 0x0349f044, 0x048102f2, 0x062da001,</div><div class='del'>-	0x008f02f2, 0x03e00000, 0x062da001, 0x02800013,</div><div class='del'>-	0x0249c0e5, 0x06810013, 0x062da001, 0x07f00000,</div><div class='del'>-	0x07f00000, 0x033e5000, 0x070c0000, 0x018f02f6,</div><div class='del'>-	0x03800011, 0x050020d8, 0x04600440, 0x050f80ff,</div><div class='del'>-	0x073fa00a, 0x06000001, 0x07c00000, 0x002fb001,</div><div class='del'>-	0x03800306, 0x012fb000, 0x03075087, 0x068d0307,</div><div class='del'>-	0x03386000, 0x03020000, 0x04482075, 0x06810352,</div><div class='del'>-	0x0648a0e6, 0x07810347, 0x0642007f, 0x06810345,</div><div class='del'>-	0x0340007e, 0x060ff038, 0x0154047e, 0x02d00334,</div><div class='del'>-	0x0560027d, 0x050f80ff, 0x032fa009, 0x030ef000,</div><div class='del'>-	0x02860504, 0x0107d000, 0x05600800, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x03681e00, 0x04500420, 0x050f80ff,</div><div class='del'>-	0x073fa009, 0x0700003f, 0x03800311, 0x070ff07d,</div><div class='del'>-	0x0450047c, 0x050f80ff, 0x002fa819, 0x078d0327,</div><div class='del'>-	0x02080001, 0x00081002, 0x0448807a, 0x0781032e,</div><div class='del'>-	0x0379ff03, 0x070000ff, 0x01082003, 0x068d032f,</div><div class='del'>-	0x02386004, 0x03010000, 0x072e6c00, 0x02800352,</div><div class='del'>-	0x0380033a, 0x0380033c, 0x0280033e, 0x02800340,</div><div class='del'>-	0x03800342, 0x03800344, 0x0727c005, 0x02800323,</div><div class='del'>-	0x0627c008, 0x02800323, 0x0627c00b, 0x02800323,</div><div class='del'>-	0x0627c00e, 0x02800323, 0x0727c011, 0x02800323,</div><div class='del'>-	0x03800314, 0x052e6800, 0x02800352, 0x044880e6,</div><div class='del'>-	0x06810531, 0x052e6200, 0x070ff088, 0x0179feff,</div><div class='del'>-	0x070fffff, 0x04818501, 0x060ff083, 0x0086836d,</div><div class='del'>-	0x033e6000, 0x07000003, 0x068d0352, 0x07286000,</div><div class='del'>-	0x07f00000, 0x078d0355, 0x038c0306, 0x0648c0e6,</div><div class='del'>-	0x05818372, 0x0448e0e6, 0x0781036a, 0x004920e6,</div><div class='del'>-	0x07810365, 0x06a0056d, 0x05001088, 0x00700101,</div><div class='del'>-	0x03100000, 0x00088001, 0x033e6000, 0x07000088,</div><div class='del'>-	0x0280055e, 0x02386001, 0x07030000, 0x033e6000,</div><div class='del'>-	0x06000008, 0x028003f1, 0x02799075, 0x0500040f,</div><div class='del'>-	0x06810010, 0x06601479, 0x050080ff, 0x06309052,</div><div class='del'>-	0x0600003e, 0x02800376, 0x06602279, 0x050080ff,</div><div class='del'>-	0x05309812, 0x07000041, 0x0648007a, 0x0781037e,</div><div class='del'>-	0x04488075, 0x0581837e, 0x040f8008, 0x070fa009,</div><div class='del'>-	0x0049107a, 0x01a183f3, 0x00798075, 0x06000507,</div><div class='del'>-	0x0481851c, 0x0448b075, 0x06810385, 0x02493075,</div><div class='del'>-	0x07810509, 0x0249c0e6, 0x048183e0, 0x0648c0e6,</div><div class='del'>-	0x0581839a, 0x068d0389, 0x02386001, 0x07030000,</div><div class='del'>-	0x0049107a, 0x07810390, 0x020ef083, 0x0386039a,</div><div class='del'>-	0x06483075, 0x068103ef, 0x0678007a, 0x07000035,</div><div class='del'>-	0x03a184cf, 0x05308000, 0x07060000, 0x06009079,</div><div class='del'>-	0x04a004dc, 0x028003ef, 0x0448807a, 0x0681039e,</div><div class='del'>-	0x06483075, 0x058104f9, 0x0448d07a, 0x068103a2,</div><div class='del'>-	0x06483075, 0x058104f9, 0x068d03a2, 0x02386001,</div><div class='del'>-	0x07030000, 0x0444e07a, 0x0648307a, 0x048183c7,</div><div class='del'>-	0x0448707a, 0x068103ea, 0x0648f07a, 0x078103b2,</div><div class='del'>-	0x05a004cf, 0x04008079, 0x05a004ee, 0x008683c2,</div><div class='del'>-	0x05a004d8, 0x028003ef, 0x0560107b, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x0349c000, 0x058183c0, 0x04600e79,</div><div class='del'>-	0x050f80ff, 0x073fa00a, 0x0600003d, 0x06600a79,</div><div class='del'>-	0x050f80ff, 0x053fa80a, 0x06000010, 0x028003ef,</div><div class='del'>-	0x0046e07a, 0x028003ea, 0x06009008, 0x05308000,</div><div class='del'>-	0x05004000, 0x04a004dc, 0x028003ef, 0x0560167b,</div><div class='del'>-	0x050f80ff, 0x032fa011, 0x070ff000, 0x04500401,</div><div class='del'>-	0x030460ff, 0x060ff025, 0x00540446, 0x078203d1,</div><div class='del'>-	0x030460ff, 0x04092046, 0x05a00218, 0x06600679,</div><div class='del'>-	0x050f80ff, 0x00201007, 0x012fa80a, 0x0046047a,</div><div class='del'>-	0x034630ff, 0x050020ff, 0x06003051, 0x04600e79,</div><div class='del'>-	0x050f80ff, 0x073fa012, 0x06000001, 0x028003ef,</div><div class='del'>-	0x033e6a00, 0x0202000e, 0x02079051, 0x07000088,</div><div class='del'>-	0x078d03e4, 0x0744c000, 0x01088000, 0x03386006,</div><div class='del'>-	0x03010000, 0x02800010, 0x05a004cf, 0x05308000,</div><div class='del'>-	0x03020000, 0x06009079, 0x04a004dc, 0x033e6a00,</div><div class='del'>-	0x0302000a, 0x02079051, 0x02800010, 0x04603e79,</div><div class='del'>-	0x050f80ff, 0x032fa009, 0x070ff000, 0x0186040c,</div><div class='del'>-	0x057dfeff, 0x07ffffff, 0x0581040c, 0x050f8000,</div><div class='del'>-	0x012fa811, 0x0079fe02, 0x070000ff, 0x077d66ff,</div><div class='del'>-	0x060000dc, 0x0781840c, 0x060ff001, 0x0286840d,</div><div class='del'>-	0x064b0002, 0x06420002, 0x060ff002, 0x05500400,</div><div class='del'>-	0x050f80ff, 0x05004084, 0x073fa00a, 0x06000002,</div><div class='del'>-	0x07c00000, 0x04600201, 0x050f80ff, 0x073fa009,</div><div class='del'>-	0x06000001, 0x0079fe02, 0x070000ff, 0x077d72ff,</div><div class='del'>-	0x070000dd, 0x0781840c, 0x064b0002, 0x06420002,</div><div class='del'>-	0x06000001, 0x01800406, 0x0605004c, 0x0180041e,</div><div class='del'>-	0x0493041a, 0x04a004d5, 0x054bc450, 0x05810421,</div><div class='del'>-	0x01d00422, 0x01800421, 0x00800432, 0x00800434,</div><div class='del'>-	0x00800432, 0x008004a7, 0x0180043f, 0x00800434,</div><div class='del'>-	0x01800471, 0x00800432, 0x00800432, 0x008004ab,</div><div class='del'>-	0x00800432, 0x018004af, 0x008004c4, 0x01800488,</div><div class='del'>-	0x00800432, 0x00800432, 0x00209432, 0x018004e4,</div><div class='del'>-	0x0379ff50, 0x070fffff, 0x060ff079, 0x055c0450,</div><div class='del'>-	0x048104a4, 0x002fb008, 0x060ff079, 0x055c0450,</div><div class='del'>-	0x058104a3, 0x04a004c7, 0x0180049c, 0x0179fe50,</div><div class='del'>-	0x070fffff, 0x070050ff, 0x060ff079, 0x055c0405,</div><div class='del'>-	0x04810449, 0x002fb008, 0x060ff079, 0x055c0405,</div><div class='del'>-	0x078184a0, 0x070ff087, 0x017980ff, 0x06000507,</div><div class='del'>-	0x06818451, 0x02203040, 0x05002087, 0x0049d002,</div><div class='del'>-	0x0481046b, 0x04930458, 0x01257000, 0x073c3fff,</div><div class='del'>-	0x0700000f, 0x052e4003, 0x072e5030, 0x0304c050,</div><div class='del'>-	0x02400057, 0x06740057, 0x06000002, 0x06820016,</div><div class='del'>-	0x04002083, 0x07003084, 0x04004085, 0x06602279,</div><div class='del'>-	0x050f80ff, 0x063fa01a, 0x06000001, 0x05a004cf,</div><div class='del'>-	0x06a00576, 0x033e6a00, 0x0302000a, 0x062e5020,</div><div class='del'>-	0x003e4002, 0x07000a00, 0x028003f1, 0x07420003,</div><div class='del'>-	0x0781844e, 0x00798002, 0x06000507, 0x06818451,</div><div class='del'>-	0x0180045c, 0x05930478, 0x01257000, 0x073c3fff,</div><div class='del'>-	0x0700000f, 0x052e4003, 0x072e5030, 0x0304c050,</div><div class='del'>-	0x067800e6, 0x07000041, 0x0581047d, 0x06a0057f,</div><div class='del'>-	0x04818016, 0x002fb008, 0x067800e6, 0x07000041,</div><div class='del'>-	0x04810483, 0x06a0057f, 0x04818016, 0x062e5020,</div><div class='del'>-	0x003e4002, 0x07000a00, 0x03e00000, 0x02800010,</div><div class='del'>-	0x0379ff50, 0x070fffff, 0x060ff079, 0x055c0450,</div><div class='del'>-	0x0781848e, 0x0245507a, 0x002fb008, 0x060ff079,</div><div class='del'>-	0x055c0450, 0x07818493, 0x0245507a, 0x002fb008,</div><div class='del'>-	0x05600e50, 0x050f80ff, 0x012fa809, 0x02455001,</div><div class='del'>-	0x05600e50, 0x050f80ff, 0x012fa80a, 0x0080049d,</div><div class='del'>-	0x002fb008, 0x003e4002, 0x07000a00, 0x02800016,</div><div class='del'>-	0x079384a3, 0x062e5020, 0x042e4002, 0x002fb008,</div><div class='del'>-	0x013e4000, 0x05000e00, 0x02800016, 0x0179fe50,</div><div class='del'>-	0x070fffff, 0x010210ff, 0x02800016, 0x0179fe50,</div><div class='del'>-	0x070fffff, 0x050340ff, 0x0080049d, 0x0179fe50,</div><div class='del'>-	0x070fffff, 0x0102e0ff, 0x0760282e, 0x050f80ff,</div><div class='del'>-	0x05222000, 0x07223000, 0x05224000, 0x07225000,</div><div class='del'>-	0x07226000, 0x05227000, 0x05228000, 0x07229000,</div><div class='del'>-	0x0722a000, 0x0522b000, 0x063fa051, 0x07000011,</div><div class='del'>-	0x0202c026, 0x0522d000, 0x052e400c, 0x02800016,</div><div class='del'>-	0x030430d4, 0x062e5008, 0x00800176, 0x05600e50,</div><div class='del'>-	0x050f80ff, 0x032fa009, 0x03460000, 0x018004d2,</div><div class='del'>-	0x0246007a, 0x0045207a, 0x008004d0, 0x0246007a,</div><div class='del'>-	0x0600007a, 0x04600e79, 0x050f80ff, 0x032fa00a,</div><div class='del'>-	0x07c00000, 0x029284d5, 0x070500e1, 0x07c00000,</div><div class='del'>-	0x0245f008, 0x048404d9, 0x020e0008, 0x07c00000,</div><div class='del'>-	0x070ff009, 0x065a0008, 0x058404de, 0x020e0008,</div><div class='del'>-	0x07c00000, 0x058404e1, 0x020e0008, 0x07c00000,</div><div class='del'>-	0x05308000, 0x0500d000, 0x04a004dc, 0x04a004e9,</div><div class='del'>-	0x02800010, 0x052e4300, 0x072e500c, 0x073c3fff,</div><div class='del'>-	0x0700000f, 0x07c00000, 0x06602208, 0x050f80ff,</div><div class='del'>-	0x032fa011, 0x076a0000, 0x068184f7, 0x066a0001,</div><div class='del'>-	0x048104f7, 0x04002051, 0x07c00000, 0x00202001,</div><div class='del'>-	0x07c00000, 0x0648307a, 0x01a18606, 0x05a004cc,</div><div class='del'>-	0x05308000, 0x05001000, 0x06009079, 0x04a004dc,</div><div class='del'>-	0x0280055e, 0x0249c0e6, 0x058104f9, 0x0280036d,</div><div class='del'>-	0x0648307a, 0x07818196, 0x05a004cf, 0x02209504,</div><div class='del'>-	0x018004e4, 0x02490075, 0x06810519, 0x04002089,</div><div class='del'>-	0x04780102, 0x07f00000, 0x05001088, 0x06a0056d,</div><div class='del'>-	0x04740101, 0x03100000, 0x060ff002, 0x045c0401,</div><div class='del'>-	0x0481851a, 0x00088001, 0x033e6000, 0x070000c0,</div><div class='del'>-	0x0380055a, 0x07f00000, 0x0220951a, 0x018004e4,</div><div class='del'>-	0x040fd075, 0x040fd07a, 0x040fd079, 0x0648307a,</div><div class='del'>-	0x06810525, 0x06780075, 0x06000007, 0x0481852c,</div><div class='del'>-	0x07a00606, 0x06486075, 0x06818194, 0x02490075,</div><div class='del'>-	0x0781819a, 0x04487075, 0x04818534, 0x0280053b,</div><div class='del'>-	0x05308000, 0x03010000, 0x06009079, 0x04a004dc,</div><div class='del'>-	0x02800010, 0x0448e0e6, 0x04818352, 0x00800192,</div><div class='del'>-	0x05308000, 0x0500e000, 0x06009079, 0x04a004dc,</div><div class='del'>-	0x04008089, 0x05a004e1, 0x0380055a, 0x05a004cc,</div><div class='del'>-	0x05308000, 0x0700f000, 0x06009079, 0x07000088,</div><div class='del'>-	0x06a00543, 0x04a004dc, 0x02800010, 0x03386000,</div><div class='del'>-	0x07030000, 0x07f00000, 0x068d0546, 0x033e6a00,</div><div class='del'>-	0x0202000e, 0x02079051, 0x0448b075, 0x06810551,</div><div class='del'>-	0x02493075, 0x06810551, 0x05301005, 0x03010000,</div><div class='del'>-	0x03800553, 0x05301006, 0x03010000, 0x05002087,</div><div class='del'>-	0x06485002, 0x05818553, 0x0744c000, 0x01088000,</div><div class='del'>-	0x02086001, 0x07c00000, 0x05001088, 0x06a0056d,</div><div class='del'>-	0x0644c001, 0x00088001, 0x033e6a00, 0x0202000e,</div><div class='del'>-	0x004920e6, 0x05818563, 0x02079051, 0x078d0563,</div><div class='del'>-	0x060ff089, 0x034990ff, 0x0781056a, 0x03386005,</div><div class='del'>-	0x03010000, 0x02800010, 0x03386006, 0x03010000,</div><div class='del'>-	0x02800010, 0x068d056d, 0x03386000, 0x07030000,</div><div class='del'>-	0x07f00000, 0x078d0571, 0x070ff087, 0x074850ff,</div><div class='del'>-	0x05818572, 0x07c00000, 0x068d0576, 0x02386001,</div><div class='del'>-	0x07030000, 0x07f00000, 0x068d057a, 0x070ff087,</div><div class='del'>-	0x074850ff, 0x0581857b, 0x07c00000, 0x05002087,</div><div class='del'>-	0x0049d002, 0x0581858e, 0x002fb008, 0x067800e6,</div><div class='del'>-	0x07000041, 0x002fb008, 0x0581858e, 0x06a005a4,</div><div class='del'>-	0x0448e002, 0x06810591, 0x0648a002, 0x0481859b,</div><div class='del'>-	0x06486002, 0x07810595, 0x02400057, 0x056a02ff,</div><div class='del'>-	0x07c00000, 0x06a005a4, 0x06788102, 0x06000004,</div><div class='del'>-	0x0581858e, 0x04002089, 0x070ff0d4, 0x045c0402,</div><div class='del'>-	0x077800ff, 0x07f00000, 0x0581858e, 0x00202010,</div><div class='del'>-	0x038c058e, 0x07f00000, 0x06420002, 0x0581859c,</div><div class='del'>-	0x06a00576, 0x033e6a00, 0x0302000a, 0x07c00000,</div><div class='del'>-	0x07f00000, 0x060ff0a2, 0x050020ff, 0x060ff0a2,</div><div class='del'>-	0x045c0402, 0x058185a5, 0x07c00000, 0x05a00218,</div><div class='del'>-	0x03495047, 0x068105b0, 0x0320901d, 0x02800602,</div><div class='del'>-	0x0220901f, 0x02800602, 0x014980e4, 0x04818010,</div><div class='del'>-	0x013e4000, 0x07003000, 0x05600e35, 0x050f80ff,</div><div class='del'>-	0x07a006fa, 0x01208003, 0x05a004e1, 0x038005ca,</div><div class='del'>-	0x03209009, 0x02800602, 0x03209011, 0x02800602,</div><div class='del'>-	0x02209007, 0x02800602, 0x03209003, 0x02800602,</div><div class='del'>-	0x00498043, 0x048185bc, 0x00497043, 0x058185c0,</div><div class='del'>-	0x02209001, 0x02800602, 0x0220900d, 0x02800602,</div><div class='del'>-	0x0320900f, 0x02800602, 0x03493000, 0x068105d3,</div><div class='del'>-	0x027c0045, 0x070a0000, 0x068105dc, 0x0220900b,</div><div class='del'>-	0x02800602, 0x02209013, 0x05308000, 0x01012000,</div><div class='del'>-	0x04a004dc, 0x00800183, 0x03209005, 0x02800602,</div><div class='del'>-	0x072e500c, 0x00208002, 0x05a004e1, 0x02800010,</div><div class='del'>-	0x02209015, 0x02800602, 0x072d6000, 0x05308000,</div><div class='del'>-	0x05007000, 0x07f00000, 0x070090d1, 0x0379ff09,</div><div class='del'>-	0x0700ffff, 0x04a004dc, 0x03209017, 0x02800602,</div><div class='del'>-	0x033e5000, 0x06000080, 0x02209019, 0x02800602,</div><div class='del'>-	0x072d6000, 0x033e5000, 0x06000080, 0x07f00000,</div><div class='del'>-	0x060ff0d0, 0x0179feff, 0x0700ffff, 0x057dfeff,</div><div class='del'>-	0x0700ffff, 0x04818010, 0x02400058, 0x00642058,</div><div class='del'>-	0x06820010, 0x033e5000, 0x06000080, 0x04058051,</div><div class='del'>-	0x0320901b, 0x02800602, 0x05308000, 0x01012000,</div><div class='del'>-	0x04a004dc, 0x00800176, 0x05a00218, 0x05308000,</div><div class='del'>-	0x05008000, 0x06009079, 0x04a004dc, 0x07c00000,</div><div class='del'>-	0x034900e4, 0x04818616, 0x013e4000, 0x070000c0,</div><div class='del'>-	0x07f00000, 0x034900e4, 0x05818614, 0x07c00000,</div><div class='del'>-	0x013e4000, 0x06000080, 0x07f00000, 0x07f00000,</div><div class='del'>-	0x07f00000, 0x034900e4, 0x0681060e, 0x02800616,</div><div class='del'>-	0x072d6000, 0x00498043, 0x07810630, 0x060ff0d0,</div><div class='del'>-	0x0179feff, 0x0700ffff, 0x057dfeff, 0x0700ffff,</div><div class='del'>-	0x048185e0, 0x050f8030, 0x032fa009, 0x0379ff00,</div><div class='del'>-	0x0700ffff, 0x070ff0d1, 0x0179feff, 0x0700ffff,</div><div class='del'>-	0x055c0400, 0x068105e0, 0x04004051, 0x03800678,</div><div class='del'>-	0x06a006da, 0x062d6001, 0x020ef004, 0x038605e2,</div><div class='del'>-	0x06600004, 0x050f80ff, 0x032fa009, 0x074b0000,</div><div class='del'>-	0x05002000, 0x0769ff00, 0x01640800, 0x078205e2,</div><div class='del'>-	0x01640e00, 0x058285e2, 0x070ff036, 0x045c0404,</div><div class='del'>-	0x0581864b, 0x072d6000, 0x050f8030, 0x032fa009,</div><div class='del'>-	0x0379ff00, 0x0700ffff, 0x070ff0d1, 0x0179feff,</div><div class='del'>-	0x0700ffff, 0x055c0400, 0x068105e0, 0x04482034,</div><div class='del'>-	0x068105fd, 0x06483034, 0x048185fd, 0x070ff0d4,</div><div class='del'>-	0x077800ff, 0x070000f0, 0x037c00ff, 0x06000010,</div><div class='del'>-	0x07810678, 0x07a006d4, 0x024900e5, 0x0681065b,</div><div class='del'>-	0x033e5000, 0x06000080, 0x02800010, 0x04601c04,</div><div class='del'>-	0x050f80ff, 0x053fa809, 0x06000020, 0x030ef041,</div><div class='del'>-	0x028605ec, 0x062d6002, 0x05602a41, 0x050f80ff,</div><div class='del'>-	0x012fa809, 0x060ff0d0, 0x074b00ff, 0x045c0401,</div><div class='del'>-	0x04818676, 0x062d6001, 0x07602841, 0x050f80ff,</div><div class='del'>-	0x053fa809, 0x06000001, 0x070ff0d1, 0x054b80ff,</div><div class='del'>-	0x074b0003, 0x055c0403, 0x04818676, 0x033e5000,</div><div class='del'>-	0x06000080, 0x0180070c, 0x07600041, 0x0380065c,</div><div class='del'>-	0x07a006d4, 0x024900e5, 0x0781067e, 0x033e5000,</div><div class='del'>-	0x06000080, 0x02800010, 0x07a006c0, 0x030ef041,</div><div class='del'>-	0x038605f0, 0x04058051, 0x072d6000, 0x05601041,</div><div class='del'>-	0x050f80ff, 0x012fa809, 0x0600a0d0, 0x0500b0d1,</div><div class='del'>-	0x062d6001, 0x07f00000, 0x07f00000, 0x0600c0d0,</div><div class='del'>-	0x0500d0d1, 0x062d6002, 0x0279ff0d, 0x07ff0000,</div><div class='del'>-	0x044d800d, 0x060ff0d0, 0x074b00ff, 0x065a000d,</div><div class='del'>-	0x06601201, 0x050f80ff, 0x073fa022, 0x07000005,</div><div class='del'>-	0x0079fe0d, 0x070000ff, 0x050020ff, 0x05602a41,</div><div class='del'>-	0x050f80ff, 0x073fa00a, 0x06000001, 0x020ef004,</div><div class='del'>-	0x038606bd, 0x04601c04, 0x050f80ff, 0x053fa809,</div><div class='del'>-	0x06000001, 0x050f80ff, 0x053fa80a, 0x06000020,</div><div class='del'>-	0x07602841, 0x050f80ff, 0x073fa009, 0x06000001,</div><div class='del'>-	0x0279ff02, 0x070000ff, 0x0678000d, 0x0700ff00,</div><div class='del'>-	0x065a0002, 0x07602841, 0x050f80ff, 0x073fa00a,</div><div class='del'>-	0x06000001, 0x07600041, 0x050f80ff, 0x053fa80a,</div><div class='del'>-	0x06000001, 0x07601241, 0x050f80ff, 0x073fa00a,</div><div class='del'>-	0x06000002, 0x033e5000, 0x06000080, 0x0180070c,</div><div class='del'>-	0x040f8032, 0x073fa011, 0x06000001, 0x060ff002,</div><div class='del'>-	0x055c0403, 0x048186c8, 0x00041051, 0x07c00000,</div><div class='del'>-	0x04600402, 0x04500432, 0x050f80ff, 0x053fa809,</div><div class='del'>-	0x06000020, 0x00400402, 0x01680eff, 0x070030ff,</div><div class='del'>-	0x040f8032, 0x053fa80a, 0x06000001, 0x07c00000,</div><div class='del'>-	0x024900e5, 0x078106d7, 0x07c00000, 0x033e5000,</div><div class='del'>-	0x070000c0, 0x07c00000, 0x05004036, 0x060000d0,</div><div class='del'>-	0x0179fe00, 0x0700ffff, 0x057dfeff, 0x0700ffff,</div><div class='del'>-	0x078106f9, 0x070000d1, 0x0379ff00, 0x0700ffff,</div><div class='del'>-	0x06005051, 0x060ff031, 0x05500405, 0x050f80ff,</div><div class='del'>-	0x073fa009, 0x06000002, 0x020ef004, 0x038606f3,</div><div class='del'>-	0x04600404, 0x050f80ff, 0x012fa809, 0x0079fe01,</div><div class='del'>-	0x0700ffff, 0x055c0400, 0x078106f9, 0x01400405,</div><div class='del'>-	0x070050ff, 0x057de0ff, 0x06000007, 0x048186e5,</div><div class='del'>-	0x04004051, 0x07c00000, 0x072d6000, 0x07f00000,</div><div class='del'>-	0x07f00000, 0x000110d0, 0x010120d1, 0x062d6001,</div><div class='del'>-	0x07f00000, 0x07f00000, 0x020130d0, 0x010140d1,</div><div class='del'>-	0x062d6002, 0x010170d4, 0x07f00000, 0x020150d0,</div><div class='del'>-	0x030160d1, 0x053fa83a, 0x06000008, 0x07c00000,</div><div class='del'>-	0x07600c41, 0x050f80ff, 0x073fa009, 0x06000001,</div><div class='del'>-	0x04780102, 0x07ffff00, 0x046a0702, 0x050f80ff,</div><div class='del'>-	0x073fa00a, 0x06000001, 0x05600e41, 0x050f80ff,</div><div class='del'>-	0x032fa069, 0x03800053, 0xdb4ee9e2, 0x02800004,</div><div class='del'>-	0x00000000, 0x00008000, 0x00000542, 0x040f801f,</div><div class='del'>-	0x012fa8c9, 0x040f801f, 0x073fa081, 0x06000010,</div><div class='del'>-	0x03200005, 0x07420000, 0x050fb000, 0x040f801f,</div><div class='del'>-	0x073fa011, 0x06000038, 0x040f801f, 0x053fa859,</div><div class='del'>-	0x0700003a, 0x050fe000, 0x0581800a, 0x0784003c,</div><div class='del'>-	0x04958019, 0x030e0011, 0x072e4200, 0x03800014,</div><div class='del'>-	0x0291001f, 0x050010c0, 0x04482001, 0x058180fa,</div><div class='del'>-	0x06483001, 0x0681815d, 0x02920029, 0x068b0029,</div><div class='del'>-	0x008a0162, 0x050010c0, 0x06780001, 0x050007c0,</div><div class='del'>-	0x06818240, 0x06780001, 0x0500f800, 0x06818280,</div><div class='del'>-	0x03910030, 0x040fe029, 0x03860030, 0x076c001d,</div><div class='del'>-	0x058102b1, 0x076c0a1d, 0x048102da, 0x029200ab,</div><div class='del'>-	0x040fe02f, 0x0386003c, 0x06000013, 0x050fb000,</div><div class='del'>-	0x066c0073, 0x068103ec, 0x014920e4, 0x0581803c,</div><div class='del'>-	0x03400000, 0x076c0a00, 0x04818034, 0x0696003e,</div><div class='del'>-	0x03b900ca, 0x05908014, 0x010170e1, 0x07780017,</div><div class='del'>-	0x03e00000, 0x06810091, 0x050010ff, 0x0179fe17,</div><div class='del'>-	0x031fffff, 0x070000ff, 0x05600800, 0x050f80ff,</div><div class='del'>-	0x073fa009, 0x06000001, 0x06780002, 0x02800040,</div><div class='del'>-	0x037c00ff, 0x03800000, 0x0681005d, 0x0249f002,</div><div class='del'>-	0x078100aa, 0x0448e002, 0x0681005d, 0x07600c00,</div><div class='del'>-	0x050f80ff, 0x073fa009, 0x06000001, 0x06780002,</div><div class='del'>-	0x07ffff00, 0x037c00ff, 0x05000200, 0x058180aa,</div><div class='del'>-	0x064bd401, 0x03d0005f, 0x028000a8, 0x02800067,</div><div class='del'>-	0x03800071, 0x0380007b, 0x02800085, 0x0280008f,</div><div class='del'>-	0x028000a8, 0x028000a8, 0x050fe027, 0x0086806b,</div><div class='del'>-	0x01028000, 0x0280006e, 0x07600027, 0x050f80ff,</div><div class='del'>-	0x032fa00a, 0x01027000, 0x02400029, 0x038000aa,</div><div class='del'>-	0x040fe025, 0x00868075, 0x03026000, 0x03800078,</div><div class='del'>-	0x06600025, 0x050f80ff, 0x032fa00a, 0x03025000,</div><div class='del'>-	0x02400029, 0x038000aa, 0x050fe021, 0x0086807f,</div><div class='del'>-	0x01022000, 0x03800082, 0x07600021, 0x050f80ff,</div><div class='del'>-	0x032fa00a, 0x01021000, 0x02400029, 0x038000aa,</div><div class='del'>-	0x040fe023, 0x00868089, 0x01024000, 0x0280008c,</div><div class='del'>-	0x06600023, 0x050f80ff, 0x032fa00a, 0x03023000,</div><div class='del'>-	0x02400029, 0x038000aa, 0x06a000da, 0x038000aa,</div><div class='del'>-	0x01640817, 0x048280a8, 0x070ff017, 0x03d00095,</div><div class='del'>-	0x0280009d, 0x0380009f, 0x028000a2, 0x038000a5,</div><div class='del'>-	0x028000a8, 0x028000a8, 0x028000a8, 0x028000a8,</div><div class='del'>-	0x03e00000, 0x03800014, 0x0590809f, 0x030160e1,</div><div class='del'>-	0x038000aa, 0x049080a2, 0x030150e1, 0x038000aa,</div><div class='del'>-	0x059080a5, 0x010140e1, 0x038000aa, 0x060fc013,</div><div class='del'>-	0x07a0053a, 0x03800014, 0x014940e4, 0x00a180ae,</div><div class='del'>-	0x0380003c, 0x02681e0d, 0x050fb0ff, 0x04600876,</div><div class='del'>-	0x050f80ff, 0x053fa809, 0x06000001, 0x05488003,</div><div class='del'>-	0x058180bd, 0x0400800d, 0x0120d000, 0x013e4000,</div><div class='del'>-	0x05000200, 0x06009076, 0x04002075, 0x06a00526,</div><div class='del'>-	0x07c00000, 0x072e4800, 0x07000012, 0x028000cd,</div><div class='del'>-	0x0747f000, 0x05600800, 0x050f80ff, 0x012fa809,</div><div class='del'>-	0x0249f001, 0x068100cd, 0x01012000, 0x052e4c00,</div><div class='del'>-	0x07c00000, 0x070000eb, 0x0349f000, 0x048180c1,</div><div class='del'>-	0x05600800, 0x050f80ff, 0x012fa809, 0x0448e001,</div><div class='del'>-	0x068100d3, 0x07c00000, 0x0079c101, 0x07ffffff,</div><div class='del'>-	0x027a4b01, 0x03800000, 0x05600800, 0x050f80ff,</div><div class='del'>-	0x012fa80a, 0x07600c00, 0x050f80ff, 0x012fa821,</div><div class='del'>-	0x06780001, 0x07ffff00, 0x037c00ff, 0x05000700,</div><div class='del'>-	0x068100ef, 0x06601804, 0x070030ff, 0x050f80ff,</div><div class='del'>-	0x012fa809, 0x05002000, 0x050f8003, 0x073fa00a,</div><div class='del'>-	0x06000001, 0x040fe001, 0x038600f0, 0x04600201,</div><div class='del'>-	0x050f80ff, 0x032fa00a, 0x07c00000, 0x050fe02e,</div><div class='del'>-	0x018680f5, 0x0102e000, 0x0302f000, 0x038000f9,</div><div class='del'>-	0x0760002e, 0x050f80ff, 0x032fa00a, 0x0102e000,</div><div class='del'>-	0x07c00000, 0x022c0004, 0x056c041d, 0x0481010e,</div><div class='del'>-	0x056c021d, 0x04810125, 0x056c081d, 0x04810137,</div><div class='del'>-	0x076c061d, 0x04810151, 0x0521d000, 0x0202c013,</div><div class='del'>-	0x0202a013, 0x02020013, 0x0460021a, 0x050f80ff,</div><div class='del'>-	0x053fa80a, 0x07000009, 0x03b600be, 0x0484801f,</div><div class='del'>-	0x0380003c, 0x040fe02a, 0x00860104, 0x06000013,</div><div class='del'>-	0x04001013, 0x0560102b, 0x050f80ff, 0x032fa012,</div><div class='del'>-	0x06420029, 0x0660002a, 0x050f80ff, 0x053fa809,</div><div class='del'>-	0x06000001, 0x050fe003, 0x01860122, 0x01028003,</div><div class='del'>-	0x0660002a, 0x050f80ff, 0x053fa80a, 0x07000009,</div><div class='del'>-	0x00800152, 0x00028013, 0x00027013, 0x00800152,</div><div class='del'>-	0x040fe02a, 0x01860103, 0x06420029, 0x0660002a,</div><div class='del'>-	0x050f80ff, 0x053fa809, 0x06000001, 0x050fe003,</div><div class='del'>-	0x00860134, 0x03026003, 0x0660002a, 0x050f80ff,</div><div class='del'>-	0x053fa80a, 0x07000009, 0x00800152, 0x02026013,</div><div class='del'>-	0x02025013, 0x00800152, 0x040fe02a, 0x01860103,</div><div class='del'>-	0x06420029, 0x0660002a, 0x050f80ff, 0x053fa809,</div><div class='del'>-	0x06000001, 0x050fe003, 0x00860146, 0x01022003,</div><div class='del'>-	0x0660002a, 0x050f80ff, 0x053fa80a, 0x07000009,</div><div class='del'>-	0x01800148, 0x00022013, 0x00021013, 0x0647f020,</div><div class='del'>-	0x007a0120, 0x04000101, 0x04a002a2, 0x0400802a,</div><div class='del'>-	0x06a0051f, 0x03948103, 0x0521d005, 0x00800104,</div><div class='del'>-	0x0180010c, 0x0647f020, 0x06486020, 0x06818157,</div><div class='del'>-	0x04a002a2, 0x01800103, 0x007a0120, 0x04000101,</div><div class='del'>-	0x04a002a2, 0x0400802a, 0x06a0051f, 0x01800103,</div><div class='del'>-	0x040fd02a, 0x052e4003, 0x00208010, 0x06a0051f,</div><div class='del'>-	0x0180010c, 0x00018098, 0x07480018, 0x06818173,</div><div class='del'>-	0x05481018, 0x07818171, 0x05482018, 0x0781816f,</div><div class='del'>-	0x07483018, 0x0681816d, 0x002fb004, 0x01800174,</div><div class='del'>-	0x012fb003, 0x01800174, 0x002fb002, 0x01800174,</div><div class='del'>-	0x002fb001, 0x01800174, 0x012fb000, 0x0179fe78,</div><div class='del'>-	0x070000ff, 0x030190ff, 0x00017086, 0x058b0178,</div><div class='del'>-	0x03385000, 0x03020000, 0x07780017, 0x00430407,</div><div class='del'>-	0x07818200, 0x046c0419, 0x058101b4, 0x046c0219,</div><div class='del'>-	0x05810184, 0x07219000, 0x00800198, 0x07219000,</div><div class='del'>-	0x07483017, 0x0481019e, 0x05482017, 0x058101a5,</div><div class='del'>-	0x0448b075, 0x06818198, 0x06601476, 0x050f80ff,</div><div class='del'>-	0x073fa022, 0x0600003e, 0x06000080, 0x05001081,</div><div class='del'>-	0x05002082, 0x06003083, 0x05004084, 0x04601c76,</div><div class='del'>-	0x050f80ff, 0x022fa02a, 0x07219000, 0x07780078,</div><div class='del'>-	0x07ffff00, 0x045a0419, 0x010780ff, 0x0484801f,</div><div class='del'>-	0x0380003c, 0x040fe07f, 0x008601ad, 0x04a001cd,</div><div class='del'>-	0x00920198, 0x040fe07f, 0x06a681cd, 0x00800198,</div><div class='del'>-	0x0560107b, 0x050f80ff, 0x032fa009, 0x0744f000,</div><div class='del'>-	0x0560107b, 0x050f80ff, 0x032fa00a, 0x0180018b,</div><div class='del'>-	0x052e400c, 0x040080fb, 0x046aa108, 0x06009076,</div><div class='del'>-	0x04002075, 0x06a00526, 0x00800198, 0x06219001,</div><div class='del'>-	0x05482017, 0x048101c1, 0x058b01b7, 0x060ff086,</div><div class='del'>-	0x0349f0ff, 0x07818177, 0x07483017, 0x058101be,</div><div class='del'>-	0x050fd0ff, 0x040fe07f, 0x06a681cd, 0x00800198,</div><div class='del'>-	0x05004084, 0x05a00222, 0x00920198, 0x070ff07d,</div><div class='del'>-	0x0450047c, 0x056004ff, 0x050f80ff, 0x032fa009,</div><div class='del'>-	0x070ff000, 0x00540479, 0x030790ff, 0x018001a5,</div><div class='del'>-	0x060ff079, 0x0054047a, 0x058201f9, 0x058101f9,</div><div class='del'>-	0x070ff07d, 0x0450047c, 0x050f80ff, 0x002fa819,</div><div class='del'>-	0x048b01d5, 0x02080001, 0x00081002, 0x01082003,</div><div class='del'>-	0x048b01d9, 0x03385000, 0x03010000, 0x02400019,</div><div class='del'>-	0x070ff003, 0x04500479, 0x030790ff, 0x0340007e,</div><div class='del'>-	0x0642007f, 0x058101f9, 0x070ff07e, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x050fe000, 0x028681f8, 0x070ff07d,</div><div class='del'>-	0x056002ff, 0x050f80ff, 0x032fa009, 0x0107d000,</div><div class='del'>-	0x018601fa, 0x0560087d, 0x050f80ff, 0x032fa009,</div><div class='del'>-	0x03681e00, 0x0550041b, 0x050f80ff, 0x032fa009,</div><div class='del'>-	0x0107e000, 0x070ff07e, 0x018001e4, 0x0307c000,</div><div class='del'>-	0x07c00000, 0x052e400c, 0x040080fb, 0x046aa108,</div><div class='del'>-	0x06009076, 0x04002075, 0x02800526, 0x040fd076,</div><div class='del'>-	0x050fd017, 0x060ff086, 0x077800ff, 0x07000060,</div><div class='del'>-	0x037c00ff, 0x07000060, 0x06818202, 0x07780078,</div><div class='del'>-	0x07ffff00, 0x045a0419, 0x010780ff, 0x06601476,</div><div class='del'>-	0x050f80ff, 0x073fa022, 0x0600003e, 0x052e400c,</div><div class='del'>-	0x04600876, 0x050f80ff, 0x053fa809, 0x06000001,</div><div class='del'>-	0x05488003, 0x0481021c, 0x0400d0fb, 0x066a810d,</div><div class='del'>-	0x013e4000, 0x07000300, 0x02800029, 0x040080fb,</div><div class='del'>-	0x066a8108, 0x06009076, 0x04002075, 0x06a00526,</div><div class='del'>-	0x02800029, 0x0240007f, 0x0742007e, 0x050f807e,</div><div class='del'>-	0x032fa009, 0x050fe000, 0x0386823c, 0x070ff07d,</div><div class='del'>-	0x055c047b, 0x04810231, 0x0760007d, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x050fe000, 0x02868231, 0x070ff07b,</div><div class='del'>-	0x0107d0ff, 0x0560087d, 0x050f80ff, 0x032fa009,</div><div class='del'>-	0x03681e00, 0x0450041c, 0x0107e0ff, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x050fe000, 0x0086023e, 0x0307c000,</div><div class='del'>-	0x07c00000, 0x040fd076, 0x0380053a, 0x010180c0,</div><div class='del'>-	0x0548e018, 0x07818259, 0x0748f018, 0x07818255,</div><div class='del'>-	0x03490018, 0x06818251, 0x01491018, 0x0781824d,</div><div class='del'>-	0x073c0000, 0x06000040, 0x02200004, 0x0180025c,</div><div class='del'>-	0x073c0000, 0x06000020, 0x03200003, 0x0180025c,</div><div class='del'>-	0x073c0000, 0x06000010, 0x02200002, 0x0180025c,</div><div class='del'>-	0x073c0000, 0x06000008, 0x02200001, 0x0180025c,</div><div class='del'>-	0x073c0000, 0x06000004, 0x06000013, 0x050fb000,</div><div class='del'>-	0x040fe076, 0x00860275, 0x046c0273, 0x04810285,</div><div class='del'>-	0x066c0073, 0x05810266, 0x040fd076, 0x07a0053a,</div><div class='del'>-	0x03800014, 0x040fd076, 0x01800269, 0x00452075,</div><div class='del'>-	0x00077013, 0x0647f075, 0x06486075, 0x0781826f,</div><div class='del'>-	0x04a002a8, 0x00800275, 0x007a0175, 0x04000101,</div><div class='del'>-	0x04a002a8, 0x04008076, 0x0245f008, 0x06a0051f,</div><div class='del'>-	0x07273000, 0x05600272, 0x050f80ff, 0x053fa80a,</div><div class='del'>-	0x07000009, 0x0379ff78, 0x070000ff, 0x02076013,</div><div class='del'>-	0x02075013, 0x0484801f, 0x0380003c, 0x070fc0ff,</div><div class='del'>-	0x052e400c, 0x00208020, 0x06a0051f, 0x0180027e,</div><div class='del'>-	0x04600276, 0x050010ff, 0x040f8001, 0x032fa009,</div><div class='del'>-	0x040f8001, 0x053fa80a, 0x07000009, 0x070ff000,</div><div class='del'>-	0x02868297, 0x06601276, 0x050f80ff, 0x073fa009,</div><div class='del'>-	0x0700000c, 0x07601818, 0x050f80ff, 0x053fa80a,</div><div class='del'>-	0x07000009, 0x00800298, 0x07a000f0, 0x0448b075,</div><div class='del'>-	0x04810268, 0x06000013, 0x04001013, 0x0560107b,</div><div class='del'>-	0x050f80ff, 0x032fa012, 0x0046b075, 0x03b600be,</div><div class='del'>-	0x01800269, 0x06000020, 0x04001016, 0x0460082a,</div><div class='del'>-	0x050f80ff, 0x032fa012, 0x07c00000, 0x06000075,</div><div class='del'>-	0x040010a2, 0x044b0801, 0x060ff016, 0x065a0001,</div><div class='del'>-	0x04600876, 0x050f80ff, 0x032fa012, 0x07c00000,</div><div class='del'>-	0x050fe022, 0x008602bc, 0x0421d004, 0x0302a022,</div><div class='del'>-	0x04a002e9, 0x04488020, 0x048102ce, 0x040fd02a,</div><div class='del'>-	0x0521d000, 0x0202a013, 0x02020013, 0x040fe026,</div><div class='del'>-	0x018602d4, 0x0421d001, 0x0202a026, 0x04a002e9,</div><div class='del'>-	0x0202c013, 0x00683e20, 0x070060ff, 0x056c0206,</div><div class='del'>-	0x0681031c, 0x056c0406, 0x06810332, 0x076c0606,</div><div class='del'>-	0x078103a3, 0x04488020, 0x068182d0, 0x056c1606,</div><div class='del'>-	0x078103b1, 0x06a00516, 0x018002e2, 0x040fd02a,</div><div class='del'>-	0x0521d000, 0x0202a013, 0x02020013, 0x050fe028,</div><div class='del'>-	0x018602e2, 0x0302a028, 0x0421d002, 0x04a002e9,</div><div class='del'>-	0x018002f0, 0x050fe022, 0x018602e2, 0x0421d004,</div><div class='del'>-	0x0302a022, 0x04a002e9, 0x04488020, 0x078182e4,</div><div class='del'>-	0x06a00516, 0x05848030, 0x0380003c, 0x040fd02a,</div><div class='del'>-	0x0521d000, 0x0202a013, 0x02020013, 0x018002e2,</div><div class='del'>-	0x0460082a, 0x050f80ff, 0x022fa031, 0x03020000,</div><div class='del'>-	0x0002b004, 0x01018005, 0x07c00000, 0x0400702a,</div><div class='del'>-	0x07a003e4, 0x007a0101, 0x07060000, 0x07303000,</div><div class='del'>-	0x07008290, 0x07600018, 0x050f80ff, 0x053fa809,</div><div class='del'>-	0x07000003, 0x0448e007, 0x068182fe, 0x06006013,</div><div class='del'>-	0x03800305, 0x02400010, 0x048102fe, 0x06006010,</div><div class='del'>-	0x0460322a, 0x050f80ff, 0x073fa00a, 0x07000003,</div><div class='del'>-	0x050f801e, 0x032fa03a, 0x063aa020, 0x06000002,</div><div class='del'>-	0x013e4000, 0x07000030, 0x0298030b, 0x070ff0f6,</div><div class='del'>-	0x036830ff, 0x0581830c, 0x070f001e, 0x0560102b,</div><div class='del'>-	0x050f10ff, 0x063f3c08, 0x0600000d, 0x013e4000,</div><div class='del'>-	0x06000020, 0x040f801a, 0x0320000a, 0x022017d0,</div><div class='del'>-	0x032fa012, 0x0202c013, 0x018002e2, 0x04007013,</div><div class='del'>-	0x07a003e4, 0x007a0101, 0x07050000, 0x07303000,</div><div class='del'>-	0x07008890, 0x074d0005, 0x06006013, 0x050f801e,</div><div class='del'>-	0x032fa03a, 0x05601a2b, 0x050f80ff, 0x022fa019,</div><div class='del'>-	0x04001002, 0x04002013, 0x040f801f, 0x022fa01a,</div><div class='del'>-	0x073aa00c, 0x06000002, 0x07300c03, 0x0600000d,</div><div class='del'>-	0x038003d1, 0x04007013, 0x07a003e4, 0x007a0101,</div><div class='del'>-	0x03070000, 0x0660282a, 0x050f80ff, 0x073fa009,</div><div class='del'>-	0x06000004, 0x02499008, 0x0781033f, 0x07303000,</div><div class='del'>-	0x07008890, 0x03800341, 0x07303000, 0x04008980,</div><div class='del'>-	0x05007003, 0x074d0005, 0x06006013, 0x050f801e,</div><div class='del'>-	0x032fa03a, 0x0760142b, 0x050f80ff, 0x032fa021,</div><div class='del'>-	0x064b0002, 0x02499008, 0x0781034d, 0x0644c002,</div><div class='del'>-	0x054b0400, 0x050040ff, 0x06698104, 0x04818362,</div><div class='del'>-	0x06000013, 0x04001013, 0x04780102, 0x06000010,</div><div class='del'>-	0x06003013, 0x04004013, 0x06005013, 0x06006013,</div><div class='del'>-	0x04007013, 0x00644015, 0x0682035e, 0x04448002,</div><div class='del'>-	0x02205008, 0x040f801f, 0x032fa042, 0x04008015,</div><div class='del'>-	0x0280039b, 0x046c8004, 0x04818370, 0x01208018,</div><div class='del'>-	0x06780002, 0x07000003, 0x04818373, 0x06003001,</div><div class='del'>-	0x06000013, 0x04001013, 0x04004013, 0x06005013,</div><div class='del'>-	0x040f801f, 0x022fa032, 0x0280039b, 0x040fd02a,</div><div class='del'>-	0x07a0053a, 0x03800014, 0x0379ff03, 0x070000ff,</div><div class='del'>-	0x04488002, 0x0681037a, 0x070ff003, 0x04500408,</div><div class='del'>-	0x050080ff, 0x0379ff00, 0x070000ff, 0x06489002,</div><div class='del'>-	0x07810381, 0x070ff000, 0x04500408, 0x050080ff,</div><div class='del'>-	0x07005003, 0x05004000, 0x06003001, 0x06000013,</div><div class='del'>-	0x04001013, 0x040f801f, 0x022fa032, 0x05601c2b,</div><div class='del'>-	0x050f80ff, 0x022fa031, 0x06600c1f, 0x050f80ff,</div><div class='del'>-	0x022fa032, 0x02680608, 0x0681039b, 0x016408ff,</div><div class='del'>-	0x057dfeff, 0x07ffffff, 0x034000ff, 0x045a0407,</div><div class='del'>-	0x070000ff, 0x0760061e, 0x050f80ff, 0x032fa00a,</div><div class='del'>-	0x06600908, 0x0669f908, 0x027a0008, 0x06000020,</div><div class='del'>-	0x070aa0ff, 0x014a20ff, 0x037a00ff, 0x060000dc,</div><div class='del'>-	0x070000ff, 0x038003d1, 0x04007013, 0x07a003e4,</div><div class='del'>-	0x007a0101, 0x07030000, 0x07303000, 0x07008190,</div><div class='del'>-	0x06006013, 0x050f801e, 0x032fa03a, 0x073aa000,</div><div class='del'>-	0x06000002, 0x07300c00, 0x07000005, 0x038003d1,</div><div class='del'>-	0x04007013, 0x07a003e4, 0x007a0101, 0x07810000,</div><div class='del'>-	0x07303000, 0x07000090, 0x06006013, 0x06600c2a,</div><div class='del'>-	0x050f80ff, 0x053fa809, 0x07000003, 0x04780107,</div><div class='del'>-	0x07ffff00, 0x007c0107, 0x07000500, 0x048183c4,</div><div class='del'>-	0x07303000, 0x05000890, 0x074d0005, 0x0660282a,</div><div class='del'>-	0x050f80ff, 0x053fa809, 0x07000003, 0x0049d007,</div><div class='del'>-	0x068103cb, 0x02206001, 0x050f801e, 0x032fa03a,</div><div class='del'>-	0x073aa000, 0x06000002, 0x07300c00, 0x07000005,</div><div class='del'>-	0x013e4000, 0x07000030, 0x029803d3, 0x070ff0f6,</div><div class='del'>-	0x036830ff, 0x058183d4, 0x070f001e, 0x040f101f,</div><div class='del'>-	0x070f3000, 0x013e4000, 0x06000020, 0x040f801a,</div><div class='del'>-	0x0320000a, 0x022017d0, 0x032fa012, 0x018002e2,</div><div class='del'>-	0x03200000, 0x06006076, 0x028003e6, 0x03200011,</div><div class='del'>-	0x0600602a, 0x04a0046b, 0x05600406, 0x050f80ff,</div><div class='del'>-	0x053fa809, 0x06000002, 0x07c00000, 0x0207602f,</div><div class='del'>-	0x04600876, 0x050f80ff, 0x022fa031, 0x03075000,</div><div class='del'>-	0x0007b004, 0x01018005, 0x06600076, 0x050020ff,</div><div class='del'>-	0x050f80ff, 0x012fa809, 0x0202f001, 0x018683fa,</div><div class='del'>-	0x0002e013, 0x040f8002, 0x053fa80a, 0x07000009,</div><div class='del'>-	0x06273001, 0x0448b075, 0x06818404, 0x04602076,</div><div class='del'>-	0x050f80ff, 0x053fa811, 0x0700003c, 0x0179fe78,</div><div class='del'>-	0x070000ff, 0x030190ff, 0x0386840c, 0x04a00420,</div><div class='del'>-	0x00078019, 0x0092041f, 0x00800464, 0x040fd076,</div><div class='del'>-	0x040fd019, 0x04600276, 0x050020ff, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x040f8002, 0x053fa80a, 0x07000009,</div><div class='del'>-	0x050fe000, 0x0286841c, 0x07601818, 0x050f80ff,</div><div class='del'>-	0x053fa80a, 0x07000009, 0x0180041d, 0x07a000f0,</div><div class='del'>-	0x07273000, 0x02076013, 0x0380003c, 0x048b0420,</div><div class='del'>-	0x03385000, 0x07030000, 0x05600818, 0x050f80ff,</div><div class='del'>-	0x032fa009, 0x054b0400, 0x0308a0ff, 0x0179fe00,</div><div class='del'>-	0x070000ff, 0x010880ff, 0x0448b075, 0x0581043a,</div><div class='del'>-	0x0760147b, 0x050f80ff, 0x002fa819, 0x064b0001,</div><div class='del'>-	0x02080002, 0x01081003, 0x00082001, 0x02083001,</div><div class='del'>-	0x02079001, 0x0207a001, 0x00084013, 0x0207f013,</div><div class='del'>-	0x0180045c, 0x06485075, 0x04810452, 0x02465075,</div><div class='del'>-	0x06601476, 0x050f80ff, 0x073fa021, 0x0600003e,</div><div class='del'>-	0x070ff07d, 0x0450047c, 0x050f80ff, 0x002fa819,</div><div class='del'>-	0x048b0445, 0x02080001, 0x00081002, 0x01082003,</div><div class='del'>-	0x03079003, 0x0208307a, 0x0340007e, 0x0642007f,</div><div class='del'>-	0x04810457, 0x070ff07e, 0x05a001e4, 0x02928457,</div><div class='del'>-	0x01800463, 0x048b0452, 0x06601476, 0x050f80ff,</div><div class='del'>-	0x073fa041, 0x0600003e, 0x06602476, 0x050f80ff,</div><div class='del'>-	0x073fa009, 0x06000007, 0x0008400e, 0x058b045c,</div><div class='del'>-	0x03385000, 0x03010000, 0x06219001, 0x040fe07f,</div><div class='del'>-	0x01860463, 0x008001cd, 0x07c00000, 0x00683e75,</div><div class='del'>-	0x05810469, 0x0448d075, 0x0481048f, 0x018004bd,</div><div class='del'>-	0x06a0051a, 0x0080041f, 0x02978476, 0x07602418,</div><div class='del'>-	0x050f80ff, 0x012fa809, 0x06780001, 0x070000ff,</div><div class='del'>-	0x075a0000, 0x070ff014, 0x0569feff, 0x054b08ff,</div><div class='del'>-	0x075a0000, 0x05600418, 0x050f80ff, 0x012fa809,</div><div class='del'>-	0x040fe007, 0x0386847d, 0x01204000, 0x0180048b,</div><div class='del'>-	0x00700101, 0x03010000, 0x06780001, 0x07ff0000,</div><div class='del'>-	0x076c00ff, 0x06818485, 0x00700101, 0x03010000,</div><div class='del'>-	0x05600418, 0x050f80ff, 0x012fa80a, 0x06780001,</div><div class='del'>-	0x07ff0000, 0x050040ff, 0x0279ff01, 0x0700ffff,</div><div class='del'>-	0x05002014, 0x07c00000, 0x04007076, 0x0448b075,</div><div class='del'>-	0x058104a9, 0x03200011, 0x06006076, 0x06a003e6,</div><div class='del'>-	0x007a0101, 0x07060000, 0x07303000, 0x07008290,</div><div class='del'>-	0x07600018, 0x050f80ff, 0x053fa809, 0x07000003,</div><div class='del'>-	0x0448e007, 0x068184a1, 0x06006013, 0x018004b8,</div><div class='del'>-	0x02400010, 0x048104a1, 0x06006010, 0x04603276,</div><div class='del'>-	0x050f80ff, 0x073fa00a, 0x07000003, 0x018004b8,</div><div class='del'>-	0x04602a76, 0x050f80ff, 0x032fa009, 0x060ff07a,</div><div class='del'>-	0x05500400, 0x070000ff, 0x04602a76, 0x050f80ff,</div><div class='del'>-	0x032fa00a, 0x07a003e1, 0x007a0101, 0x03010000,</div><div class='del'>-	0x06303008, 0x05008000, 0x0600600e, 0x050f8074,</div><div class='del'>-	0x032fa03a, 0x053079a0, 0x0700000c, 0x008004fd,</div><div class='del'>-	0x00683e75, 0x076c0aff, 0x048104dc, 0x04007013,</div><div class='del'>-	0x03200011, 0x06006076, 0x06a003e6, 0x007a0101,</div><div class='del'>-	0x03070000, 0x06602876, 0x050f80ff, 0x053fa809,</div><div class='del'>-	0x06000001, 0x03499003, 0x058104d1, 0x07303000,</div><div class='del'>-	0x07008890, 0x053079a0, 0x0700000c, 0x008004d5,</div><div class='del'>-	0x07303000, 0x04008980, 0x04307920, 0x0700000c,</div><div class='del'>-	0x074d0005, 0x06006013, 0x050f8074, 0x032fa03a,</div><div class='del'>-	0x04307920, 0x0700000c, 0x008004fd, 0x04602a76,</div><div class='del'>-	0x050f80ff, 0x032fa009, 0x060ff07a, 0x05500400,</div><div class='del'>-	0x070000ff, 0x04602a76, 0x050f80ff, 0x032fa00a,</div><div class='del'>-	0x04007076, 0x07a003e1, 0x007a0101, 0x03010000,</div><div class='del'>-	0x06303008, 0x07008800, 0x074d0005, 0x06600a76,</div><div class='del'>-	0x050f80ff, 0x073fa009, 0x07000003, 0x054b0406,</div><div class='del'>-	0x045a0404, 0x050040ff, 0x0600600e, 0x050f8074,</div><div class='del'>-	0x032fa03a, 0x0648c075, 0x048104fb, 0x06307d20,</div><div class='del'>-	0x0700000c, 0x008004fd, 0x04307920, 0x0700000c,</div><div class='del'>-	0x013e4000, 0x07000030, 0x019804ff, 0x070ff0f6,</div><div class='del'>-	0x074850ff, 0x05818500, 0x050f2074, 0x060a0007,</div><div class='del'>-	0x040070fb, 0x046a7007, 0x050f40ff, 0x013e4000,</div><div class='del'>-	0x06000020, 0x0678007a, 0x07fff000, 0x04818510,</div><div class='del'>-	0x0320000a, 0x022017d0, 0x02800513, 0x0320000a,</div><div class='del'>-	0x06301b58, 0x06000001, 0x050f8072, 0x032fa012,</div><div class='del'>-	0x0080041f, 0x01208060, 0x0600902a, 0x04002020,</div><div class='del'>-	0x02800526, 0x040080fb, 0x066ae108, 0x06009076,</div><div class='del'>-	0x04002075, 0x02800526, 0x03201100, 0x05848524,</div><div class='del'>-	0x06420001, 0x04818520, 0x0280053d, 0x020e0008,</div><div class='del'>-	0x07c00000, 0x050fd009, 0x040fd008, 0x03201100,</div><div class='del'>-	0x0584852d, 0x06420001, 0x04818529, 0x0280053d,</div><div class='del'>-	0x007a0102, 0x04000101, 0x05600809, 0x050f80ff,</div><div class='del'>-	0x073fa00a, 0x06000001, 0x020e0008, 0x06840537,</div><div class='del'>-	0x030e0009, 0x07c00000, 0x01011009, 0x052e4300,</div><div class='del'>-	0x07c00000, 0x052e400f, 0x01208090, 0x0280051f,</div><div class='del'>-	0x070fc0ff, 0x040f8013, 0x032fa009, 0x02800540,</div><div class='del'>-	0x6321d92e, 0xffef19a2</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef UNIQUE_FW_NAME</div><div class='del'>-uint32_t fw2400_length02 = 0x0000165e ;</div><div class='del'>-#else</div><div class='del'>-uint32_t risc_code_length02 = 0x0000165e ;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c<br/>index fee0c493775b..87f90c4f08e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_attr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_attr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_attr.c</a></div><div class='hunk'>@@ -16,15 +16,16 @@ qla2x00_sysfs_read_fw_dump(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,</div><div class='ctx'> 	    struct device, kobj)));</div><div class='add'>+	char *rbuf = (char *)ha-&gt;fw_dump;</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;fw_dump_reading == 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (off &gt; ha-&gt;fw_dump_buffer_len)</div><div class='del'>-		return 0;</div><div class='del'>-	if (off + count &gt; ha-&gt;fw_dump_buffer_len)</div><div class='del'>-		count = ha-&gt;fw_dump_buffer_len - off;</div><div class='add'>+	if (off &gt; ha-&gt;fw_dump_len)</div><div class='add'>+                return 0;</div><div class='add'>+	if (off + count &gt; ha-&gt;fw_dump_len)</div><div class='add'>+		count = ha-&gt;fw_dump_len - off;</div><div class='ctx'> </div><div class='del'>-	memcpy(buf, &amp;ha-&gt;fw_dump_buffer[off], count);</div><div class='add'>+	memcpy(buf, &amp;rbuf[off], count);</div><div class='ctx'> </div><div class='ctx'> 	return (count);</div><div class='ctx'> }</div><div class='hunk'>@@ -36,7 +37,6 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,</div><div class='ctx'> 	    struct device, kobj)));</div><div class='ctx'> 	int reading;</div><div class='del'>-	uint32_t dump_size;</div><div class='ctx'> </div><div class='ctx'> 	if (off != 0)</div><div class='ctx'> 		return (0);</div><div class='hunk'>@@ -44,52 +44,27 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	reading = simple_strtol(buf, NULL, 10);</div><div class='ctx'> 	switch (reading) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		if (ha-&gt;fw_dump_reading == 1) {</div><div class='del'>-			qla_printk(KERN_INFO, ha,</div><div class='del'>-			    "Firmware dump cleared on (%ld).\n",</div><div class='del'>-			    ha-&gt;host_no);</div><div class='add'>+		if (!ha-&gt;fw_dump_reading)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-			vfree(ha-&gt;fw_dump_buffer);</div><div class='del'>-			if (!IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha))</div><div class='del'>-				free_pages((unsigned long)ha-&gt;fw_dump,</div><div class='del'>-				    ha-&gt;fw_dump_order);</div><div class='add'>+		qla_printk(KERN_INFO, ha,</div><div class='add'>+		    "Firmware dump cleared on (%ld).\n", ha-&gt;host_no);</div><div class='ctx'> </div><div class='del'>-			ha-&gt;fw_dump_reading = 0;</div><div class='del'>-			ha-&gt;fw_dump_buffer = NULL;</div><div class='del'>-			ha-&gt;fw_dump = NULL;</div><div class='del'>-			ha-&gt;fw_dumped = 0;</div><div class='del'>-		}</div><div class='add'>+		ha-&gt;fw_dump_reading = 0;</div><div class='add'>+		ha-&gt;fw_dumped = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		if ((ha-&gt;fw_dump || ha-&gt;fw_dumped) &amp;&amp; !ha-&gt;fw_dump_reading) {</div><div class='add'>+		if (ha-&gt;fw_dumped &amp;&amp; !ha-&gt;fw_dump_reading) {</div><div class='ctx'> 			ha-&gt;fw_dump_reading = 1;</div><div class='ctx'> </div><div class='del'>-			if (IS_QLA24XX(ha) || IS_QLA54XX(ha))</div><div class='del'>-				dump_size = FW_DUMP_SIZE_24XX;</div><div class='del'>-			else {</div><div class='del'>-				dump_size = FW_DUMP_SIZE_1M;</div><div class='del'>-				if (ha-&gt;fw_memory_size &lt; 0x20000)</div><div class='del'>-					dump_size = FW_DUMP_SIZE_128K;</div><div class='del'>-				else if (ha-&gt;fw_memory_size &lt; 0x80000)</div><div class='del'>-					dump_size = FW_DUMP_SIZE_512K;</div><div class='del'>-			}</div><div class='del'>-			ha-&gt;fw_dump_buffer = (char *)vmalloc(dump_size);</div><div class='del'>-			if (ha-&gt;fw_dump_buffer == NULL) {</div><div class='del'>-				qla_printk(KERN_WARNING, ha,</div><div class='del'>-				    "Unable to allocate memory for firmware "</div><div class='del'>-				    "dump buffer (%d).\n", dump_size);</div><div class='del'>-</div><div class='del'>-				ha-&gt;fw_dump_reading = 0;</div><div class='del'>-				return (count);</div><div class='del'>-			}</div><div class='ctx'> 			qla_printk(KERN_INFO, ha,</div><div class='del'>-			    "Firmware dump ready for read on (%ld).\n",</div><div class='add'>+			    "Raw firmware dump ready for read on (%ld).\n",</div><div class='ctx'> 			    ha-&gt;host_no);</div><div class='del'>-			memset(ha-&gt;fw_dump_buffer, 0, dump_size);</div><div class='del'>-			ha-&gt;isp_ops.ascii_fw_dump(ha);</div><div class='del'>-			ha-&gt;fw_dump_buffer_len = strlen(ha-&gt;fw_dump_buffer);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='add'>+	case 2:</div><div class='add'>+		qla2x00_alloc_fw_dump(ha);</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return (count);</div><div class='ctx'> }</div><div class='hunk'>@@ -319,9 +294,6 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN) || off != 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	/* Read NVRAM. */</div><div class='ctx'> 	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	ha-&gt;isp_ops.read_nvram(ha, (uint8_t *)buf, ha-&gt;vpd_base, ha-&gt;vpd_size);</div><div class='hunk'>@@ -341,9 +313,6 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha-&gt;vpd_size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha))</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-</div><div class='ctx'> 	/* Write NVRAM. */</div><div class='ctx'> 	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 	ha-&gt;isp_ops.write_nvram(ha, (uint8_t *)buf, ha-&gt;vpd_base, count);</div><div class='hunk'>@@ -363,6 +332,53 @@ static struct bin_attribute sysfs_vpd_attr = {</div><div class='ctx'> 	.write = qla2x00_sysfs_write_vpd,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static ssize_t</div><div class='add'>+qla2x00_sysfs_read_sfp(struct kobject *kobj, char *buf, loff_t off,</div><div class='add'>+    size_t count)</div><div class='add'>+{</div><div class='add'>+	struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,</div><div class='add'>+	    struct device, kobj)));</div><div class='add'>+	uint16_t iter, addr, offset;</div><div class='add'>+	int rval;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN) || off != 0 || count != SFP_DEV_SIZE * 2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	addr = 0xa0;</div><div class='add'>+	for (iter = 0, offset = 0; iter &lt; (SFP_DEV_SIZE * 2) / SFP_BLOCK_SIZE;</div><div class='add'>+	    iter++, offset += SFP_BLOCK_SIZE) {</div><div class='add'>+		if (iter == 4) {</div><div class='add'>+			/* Skip to next device address. */</div><div class='add'>+			addr = 0xa2;</div><div class='add'>+			offset = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rval = qla2x00_read_sfp(ha, ha-&gt;sfp_data_dma, addr, offset,</div><div class='add'>+		    SFP_BLOCK_SIZE);</div><div class='add'>+		if (rval != QLA_SUCCESS) {</div><div class='add'>+			qla_printk(KERN_WARNING, ha,</div><div class='add'>+			    "Unable to read SFP data (%x/%x/%x).\n", rval,</div><div class='add'>+			    addr, offset);</div><div class='add'>+			count = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		memcpy(buf, ha-&gt;sfp_data, SFP_BLOCK_SIZE);</div><div class='add'>+		buf += SFP_BLOCK_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bin_attribute sysfs_sfp_attr = {</div><div class='add'>+	.attr = {</div><div class='add'>+		.name = "sfp",</div><div class='add'>+		.mode = S_IRUSR | S_IWUSR,</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+	.size = SFP_DEV_SIZE * 2,</div><div class='add'>+	.read = qla2x00_sysfs_read_sfp,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='hunk'>@@ -373,7 +389,12 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)</div><div class='ctx'> 	sysfs_create_bin_file(&amp;host-&gt;shost_gendev.kobj, &amp;sysfs_optrom_attr);</div><div class='ctx'> 	sysfs_create_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='ctx'> 	    &amp;sysfs_optrom_ctl_attr);</div><div class='del'>-	sysfs_create_bin_file(&amp;host-&gt;shost_gendev.kobj, &amp;sysfs_vpd_attr);</div><div class='add'>+	if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='add'>+		sysfs_create_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='add'>+		    &amp;sysfs_vpd_attr);</div><div class='add'>+		sysfs_create_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='add'>+		    &amp;sysfs_sfp_attr);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -386,7 +407,12 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)</div><div class='ctx'> 	sysfs_remove_bin_file(&amp;host-&gt;shost_gendev.kobj, &amp;sysfs_optrom_attr);</div><div class='ctx'> 	sysfs_remove_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='ctx'> 	    &amp;sysfs_optrom_ctl_attr);</div><div class='del'>-	sysfs_remove_bin_file(&amp;host-&gt;shost_gendev.kobj, &amp;sysfs_vpd_attr);</div><div class='add'>+	if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='add'>+		sysfs_remove_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='add'>+		    &amp;sysfs_vpd_attr);</div><div class='add'>+		sysfs_remove_bin_file(&amp;host-&gt;shost_gendev.kobj,</div><div class='add'>+		    &amp;sysfs_sfp_attr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;beacon_blink_led == 1)</div><div class='ctx'> 		ha-&gt;isp_ops.beacon_off(ha);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c<br/>index 2d9b12ffe09c..f6ed6962bc2b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_dbg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_dbg.c</a></div><div class='hunk'>@@ -8,7 +8,34 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='del'>-static int qla_uprintf(char **, char *, ...);</div><div class='add'>+static inline void</div><div class='add'>+qla2xxx_prep_dump(scsi_qla_host_t *ha, struct qla2xxx_fw_dump *fw_dump)</div><div class='add'>+{</div><div class='add'>+	fw_dump-&gt;fw_major_version = htonl(ha-&gt;fw_major_version);</div><div class='add'>+	fw_dump-&gt;fw_minor_version = htonl(ha-&gt;fw_minor_version);</div><div class='add'>+	fw_dump-&gt;fw_subminor_version = htonl(ha-&gt;fw_subminor_version);</div><div class='add'>+	fw_dump-&gt;fw_attributes = htonl(ha-&gt;fw_attributes);</div><div class='add'>+</div><div class='add'>+	fw_dump-&gt;vendor = htonl(ha-&gt;pdev-&gt;vendor);</div><div class='add'>+	fw_dump-&gt;device = htonl(ha-&gt;pdev-&gt;device);</div><div class='add'>+	fw_dump-&gt;subsystem_vendor = htonl(ha-&gt;pdev-&gt;subsystem_vendor);</div><div class='add'>+	fw_dump-&gt;subsystem_device = htonl(ha-&gt;pdev-&gt;subsystem_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *</div><div class='add'>+qla2xxx_copy_queues(scsi_qla_host_t *ha, void *ptr)</div><div class='add'>+{</div><div class='add'>+	/* Request queue. */</div><div class='add'>+	memcpy(ptr, ha-&gt;request_ring, ha-&gt;request_q_length *</div><div class='add'>+	    sizeof(request_t));</div><div class='add'>+</div><div class='add'>+	/* Response queue. */</div><div class='add'>+	ptr += ha-&gt;request_q_length * sizeof(request_t);</div><div class='add'>+	memcpy(ptr, ha-&gt;response_ring, ha-&gt;response_q_length  *</div><div class='add'>+	    sizeof(response_t));</div><div class='add'>+</div><div class='add'>+	return ptr + (ha-&gt;response_q_length * sizeof(response_t));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * qla2300_fw_dump() - Dumps binary data from the 2300 firmware.</div><div class='hunk'>@@ -28,7 +55,7 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	uint16_t __iomem *dmp_reg;</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	struct qla2300_fw_dump	*fw;</div><div class='del'>-	uint32_t	dump_size, data_ram_cnt;</div><div class='add'>+	uint32_t	data_ram_cnt;</div><div class='ctx'> </div><div class='ctx'> 	risc_address = data_ram_cnt = 0;</div><div class='ctx'> 	mb0 = mb2 = 0;</div><div class='hunk'>@@ -37,29 +64,23 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	if (!hardware_locked)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;fw_dump != NULL) {</div><div class='add'>+	if (!ha-&gt;fw_dump) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='del'>-		    "Firmware has been previously dumped (%p) -- ignoring "</div><div class='del'>-		    "request...\n", ha-&gt;fw_dump);</div><div class='add'>+		    "No buffer available for dump!!!\n");</div><div class='ctx'> 		goto qla2300_fw_dump_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Allocate (large) dump buffer. */</div><div class='del'>-	dump_size = sizeof(struct qla2300_fw_dump);</div><div class='del'>-	dump_size += (ha-&gt;fw_memory_size - 0x11000) * sizeof(uint16_t);</div><div class='del'>-	ha-&gt;fw_dump_order = get_order(dump_size);</div><div class='del'>-	ha-&gt;fw_dump = (struct qla2300_fw_dump *) __get_free_pages(GFP_ATOMIC,</div><div class='del'>-	    ha-&gt;fw_dump_order);</div><div class='del'>-	if (ha-&gt;fw_dump == NULL) {</div><div class='add'>+	if (ha-&gt;fw_dumped) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='del'>-		    "Unable to allocated memory for firmware dump (%d/%d).\n",</div><div class='del'>-		    ha-&gt;fw_dump_order, dump_size);</div><div class='add'>+		    "Firmware has been previously dumped (%p) -- ignoring "</div><div class='add'>+		    "request...\n", ha-&gt;fw_dump);</div><div class='ctx'> 		goto qla2300_fw_dump_failed;</div><div class='ctx'> 	}</div><div class='del'>-	fw = ha-&gt;fw_dump;</div><div class='add'>+	fw = &amp;ha-&gt;fw_dump-&gt;isp.isp23;</div><div class='add'>+	qla2xxx_prep_dump(ha, ha-&gt;fw_dump);</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='del'>-	fw-&gt;hccr = RD_REG_WORD(&amp;reg-&gt;hccr);</div><div class='add'>+	fw-&gt;hccr = htons(RD_REG_WORD(&amp;reg-&gt;hccr));</div><div class='ctx'> </div><div class='ctx'> 	/* Pause RISC. */</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;hccr, HCCR_PAUSE_RISC);</div><div class='hunk'>@@ -80,85 +101,86 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	if (rval == QLA_SUCCESS) {</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)(reg + 0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;pbiu_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;pbiu_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;pbiu_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x10);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_host_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_host_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_host_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x40);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;mailbox_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;mailbox_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;mailbox_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x40);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;resp_dma_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;resp_dma_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;resp_dma_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x50);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;dma_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;dma_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;dma_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x00);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0xA0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_hdw_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_hdw_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2000);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp0_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp0_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp0_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2200);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp1_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp1_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp1_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2400);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp2_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp2_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp2_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2600);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp3_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp3_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp3_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2800);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp4_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp4_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp4_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2A00);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp5_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp5_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp5_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2C00);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp6_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp6_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp6_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2E00);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp7_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp7_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp7_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x10);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;frame_buf_hdw_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;frame_buf_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;frame_buf_hdw_reg[cnt] =</div><div class='add'>+			    htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x20);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;fpm_b0_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;fpm_b0_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;fpm_b0_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x30);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;fpm_b1_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;fpm_b1_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;fpm_b1_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Reset RISC. */</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, CSR_ISP_SOFT_RESET);</div><div class='hunk'>@@ -233,7 +255,7 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='ctx'> 			rval = mb0 &amp; MBS_MASK;</div><div class='del'>-			fw-&gt;risc_ram[cnt] = mb2;</div><div class='add'>+			fw-&gt;risc_ram[cnt] = htons(mb2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -292,7 +314,7 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='ctx'> 			rval = mb0 &amp; MBS_MASK;</div><div class='del'>-			fw-&gt;stack_ram[cnt] = mb2;</div><div class='add'>+			fw-&gt;stack_ram[cnt] = htons(mb2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -352,23 +374,25 @@ qla2300_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='ctx'> 			rval = mb0 &amp; MBS_MASK;</div><div class='del'>-			fw-&gt;data_ram[cnt] = mb2;</div><div class='add'>+			fw-&gt;data_ram[cnt] = htons(mb2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rval == QLA_SUCCESS)</div><div class='add'>+		qla2xxx_copy_queues(ha, &amp;fw-&gt;data_ram[cnt]);</div><div class='ctx'> </div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Failed to dump firmware (%x)!!!\n", rval);</div><div class='add'>+		ha-&gt;fw_dumped = 0;</div><div class='ctx'> </div><div class='del'>-		free_pages((unsigned long)ha-&gt;fw_dump, ha-&gt;fw_dump_order);</div><div class='del'>-		ha-&gt;fw_dump = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		qla_printk(KERN_INFO, ha,</div><div class='ctx'> 		    "Firmware dump saved to temp buffer (%ld/%p).\n",</div><div class='ctx'> 		    ha-&gt;host_no, ha-&gt;fw_dump);</div><div class='add'>+		ha-&gt;fw_dumped = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> qla2300_fw_dump_failed:</div><div class='hunk'>@@ -377,193 +401,6 @@ qla2300_fw_dump_failed:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * qla2300_ascii_fw_dump() - Converts a binary firmware dump to ASCII.</div><div class='del'>- * @ha: HA context</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-qla2300_ascii_fw_dump(scsi_qla_host_t *ha)</div><div class='del'>-{</div><div class='del'>-	uint32_t cnt;</div><div class='del'>-	char *uiter;</div><div class='del'>-	char fw_info[30];</div><div class='del'>-	struct qla2300_fw_dump *fw;</div><div class='del'>-	uint32_t data_ram_cnt;</div><div class='del'>-</div><div class='del'>-	uiter = ha-&gt;fw_dump_buffer;</div><div class='del'>-	fw = ha-&gt;fw_dump;</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "%s Firmware Version %s\n", ha-&gt;model_number,</div><div class='del'>-	    ha-&gt;isp_ops.fw_version_str(ha, fw_info));</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n[==&gt;BEG]\n");</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "HCCR Register:\n%04x\n\n", fw-&gt;hccr);</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "PBIU Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;pbiu_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;pbiu_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nReqQ-RspQ-Risc2Host Status registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_host_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_host_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nMailbox Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;mailbox_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;mailbox_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nAuto Request Response DMA Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;resp_dma_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;resp_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nDMA Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;dma_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC Hardware Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_hdw_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_hdw_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP0 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp0_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp0_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP1 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp1_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp1_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP2 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp2_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp2_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP3 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp3_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp3_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP4 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp4_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp4_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP5 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp5_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp5_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP6 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp6_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp6_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP7 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp7_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp7_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFrame Buffer Hardware Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;frame_buf_hdw_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;frame_buf_hdw_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFPM B0 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;fpm_b0_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;fpm_b0_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFPM B1 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;fpm_b1_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;fpm_b1_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nCode RAM Dump:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_ram) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n%04x: ", cnt + 0x0800);</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_ram[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nStack RAM Dump:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;stack_ram) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n%05x: ", cnt + 0x10000);</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;stack_ram[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nData RAM Dump:");</div><div class='del'>-	data_ram_cnt = ha-&gt;fw_memory_size - 0x11000 + 1;</div><div class='del'>-	for (cnt = 0; cnt &lt; data_ram_cnt; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n%05x: ", cnt + 0x11000);</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;data_ram[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\n[&lt;==END] ISP Debug Dump.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * qla2100_fw_dump() - Dumps binary data from the 2100/2200 firmware.</div><div class='ctx'>  * @ha: HA context</div><div class='ctx'>  * @hardware_locked: Called with the hardware_lock</div><div class='hunk'>@@ -587,27 +424,23 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	if (!hardware_locked)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;fw_dump != NULL) {</div><div class='add'>+	if (!ha-&gt;fw_dump) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='del'>-		    "Firmware has been previously dumped (%p) -- ignoring "</div><div class='del'>-		    "request...\n", ha-&gt;fw_dump);</div><div class='add'>+		    "No buffer available for dump!!!\n");</div><div class='ctx'> 		goto qla2100_fw_dump_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Allocate (large) dump buffer. */</div><div class='del'>-	ha-&gt;fw_dump_order = get_order(sizeof(struct qla2100_fw_dump));</div><div class='del'>-	ha-&gt;fw_dump = (struct qla2100_fw_dump *) __get_free_pages(GFP_ATOMIC,</div><div class='del'>-	    ha-&gt;fw_dump_order);</div><div class='del'>-	if (ha-&gt;fw_dump == NULL) {</div><div class='add'>+	if (ha-&gt;fw_dumped) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='del'>-		    "Unable to allocated memory for firmware dump (%d/%Zd).\n",</div><div class='del'>-		    ha-&gt;fw_dump_order, sizeof(struct qla2100_fw_dump));</div><div class='add'>+		    "Firmware has been previously dumped (%p) -- ignoring "</div><div class='add'>+		    "request...\n", ha-&gt;fw_dump);</div><div class='ctx'> 		goto qla2100_fw_dump_failed;</div><div class='ctx'> 	}</div><div class='del'>-	fw = ha-&gt;fw_dump;</div><div class='add'>+	fw = &amp;ha-&gt;fw_dump-&gt;isp.isp21;</div><div class='add'>+	qla2xxx_prep_dump(ha, ha-&gt;fw_dump);</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='del'>-	fw-&gt;hccr = RD_REG_WORD(&amp;reg-&gt;hccr);</div><div class='add'>+	fw-&gt;hccr = htons(RD_REG_WORD(&amp;reg-&gt;hccr));</div><div class='ctx'> </div><div class='ctx'> 	/* Pause RISC. */</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;hccr, HCCR_PAUSE_RISC);</div><div class='hunk'>@@ -621,79 +454,81 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	if (rval == QLA_SUCCESS) {</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)(reg + 0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;pbiu_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;pbiu_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;pbiu_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x10);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; ha-&gt;mbx_count; cnt++) {</div><div class='ctx'> 			if (cnt == 8) {</div><div class='del'>-				dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0xe0);</div><div class='add'>+				dmp_reg = (uint16_t __iomem *)</div><div class='add'>+					((uint8_t __iomem *)reg + 0xe0);</div><div class='ctx'> 			}</div><div class='del'>-			fw-&gt;mailbox_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;mailbox_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x20);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;dma_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;dma_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;dma_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x00);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0xA0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_hdw_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_hdw_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2000);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp0_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp0_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp0_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2100);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp1_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp1_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp1_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2200);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp2_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp2_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp2_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2300);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp3_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp3_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp3_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2400);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp4_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp4_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp4_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2500);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp5_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp5_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp5_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2600);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp6_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp6_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp6_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;pcr, 0x2700);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp7_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;risc_gp7_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;risc_gp7_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x10);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;frame_buf_hdw_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;frame_buf_hdw_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;frame_buf_hdw_reg[cnt] =</div><div class='add'>+			    htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x20);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;fpm_b0_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;fpm_b0_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;fpm_b0_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, 0x30);</div><div class='ctx'> 		dmp_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;fpm_b1_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;fpm_b1_reg[cnt] = RD_REG_WORD(dmp_reg++);</div><div class='add'>+			fw-&gt;fpm_b1_reg[cnt] = htons(RD_REG_WORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Reset the ISP. */</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;ctrl_status, CSR_ISP_SOFT_RESET);</div><div class='hunk'>@@ -768,22 +603,25 @@ qla2100_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='ctx'> 			rval = mb0 &amp; MBS_MASK;</div><div class='del'>-			fw-&gt;risc_ram[cnt] = mb2;</div><div class='add'>+			fw-&gt;risc_ram[cnt] = htons(mb2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rval == QLA_SUCCESS)</div><div class='add'>+		qla2xxx_copy_queues(ha, &amp;fw-&gt;risc_ram[cnt]);</div><div class='add'>+</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Failed to dump firmware (%x)!!!\n", rval);</div><div class='add'>+		ha-&gt;fw_dumped = 0;</div><div class='ctx'> </div><div class='del'>-		free_pages((unsigned long)ha-&gt;fw_dump, ha-&gt;fw_dump_order);</div><div class='del'>-		ha-&gt;fw_dump = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		qla_printk(KERN_INFO, ha,</div><div class='ctx'> 		    "Firmware dump saved to temp buffer (%ld/%p).\n",</div><div class='ctx'> 		    ha-&gt;host_no, ha-&gt;fw_dump);</div><div class='add'>+		ha-&gt;fw_dumped = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> qla2100_fw_dump_failed:</div><div class='hunk'>@@ -791,179 +629,6 @@ qla2100_fw_dump_failed:</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * qla2100_ascii_fw_dump() - Converts a binary firmware dump to ASCII.</div><div class='del'>- * @ha: HA context</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-qla2100_ascii_fw_dump(scsi_qla_host_t *ha)</div><div class='del'>-{</div><div class='del'>-	uint32_t cnt;</div><div class='del'>-	char *uiter;</div><div class='del'>-	char fw_info[30];</div><div class='del'>-	struct qla2100_fw_dump *fw;</div><div class='del'>-</div><div class='del'>-	uiter = ha-&gt;fw_dump_buffer;</div><div class='del'>-	fw = ha-&gt;fw_dump;</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "%s Firmware Version %s\n", ha-&gt;model_number,</div><div class='del'>-	    ha-&gt;isp_ops.fw_version_str(ha, fw_info));</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n[==&gt;BEG]\n");</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "HCCR Register:\n%04x\n\n", fw-&gt;hccr);</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "PBIU Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;pbiu_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;pbiu_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nMailbox Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;mailbox_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;mailbox_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nDMA Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;dma_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC Hardware Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_hdw_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_hdw_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP0 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp0_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp0_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP1 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp1_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp1_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP2 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp2_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp2_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP3 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp3_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp3_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP4 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp4_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp4_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP5 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp5_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp5_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP6 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp6_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp6_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP7 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_gp7_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_gp7_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFrame Buffer Hardware Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;frame_buf_hdw_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;frame_buf_hdw_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFPM B0 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;fpm_b0_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;fpm_b0_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFPM B1 Registers:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;fpm_b1_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;fpm_b1_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC SRAM:");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;risc_ram) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n%04x: ", cnt + 0x1000);</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%04x ", fw-&gt;risc_ram[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\n[&lt;==END] ISP Debug Dump.");</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qla_uprintf(char **uiter, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	int	iter, len;</div><div class='del'>-	char	buf[128];</div><div class='del'>-	va_list	args;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	len = vsprintf(buf, fmt, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	for (iter = 0; iter &lt; len; iter++, *uiter += 1)</div><div class='del'>-		*uiter[0] = buf[iter];</div><div class='del'>-</div><div class='del'>-	return (len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> void</div><div class='ctx'> qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> {</div><div class='hunk'>@@ -980,6 +645,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	unsigned long	flags;</div><div class='ctx'> 	struct qla24xx_fw_dump *fw;</div><div class='ctx'> 	uint32_t	ext_mem_cnt;</div><div class='add'>+	void		*eft;</div><div class='ctx'> </div><div class='ctx'> 	risc_address = ext_mem_cnt = 0;</div><div class='ctx'> 	memset(mb, 0, sizeof(mb));</div><div class='hunk'>@@ -988,7 +654,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	if (!hardware_locked)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (!ha-&gt;fw_dump24) {</div><div class='add'>+	if (!ha-&gt;fw_dump) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "No buffer available for dump!!!\n");</div><div class='ctx'> 		goto qla24xx_fw_dump_failed;</div><div class='hunk'>@@ -997,13 +663,14 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	if (ha-&gt;fw_dumped) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Firmware has been previously dumped (%p) -- ignoring "</div><div class='del'>-		    "request...\n", ha-&gt;fw_dump24);</div><div class='add'>+		    "request...\n", ha-&gt;fw_dump);</div><div class='ctx'> 		goto qla24xx_fw_dump_failed;</div><div class='ctx'> 	}</div><div class='del'>-	fw = (struct qla24xx_fw_dump *) ha-&gt;fw_dump24;</div><div class='add'>+	fw = &amp;ha-&gt;fw_dump-&gt;isp.isp24;</div><div class='add'>+	qla2xxx_prep_dump(ha, ha-&gt;fw_dump);</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='del'>-	fw-&gt;host_status = RD_REG_DWORD(&amp;reg-&gt;host_status);</div><div class='add'>+	fw-&gt;host_status = htonl(RD_REG_DWORD(&amp;reg-&gt;host_status));</div><div class='ctx'> </div><div class='ctx'> 	/* Pause RISC. */</div><div class='ctx'> 	if ((RD_REG_DWORD(&amp;reg-&gt;hccr) &amp; HCCRX_RISC_PAUSE) == 0) {</div><div class='hunk'>@@ -1025,7 +692,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 		/* Host interface registers. */</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)(reg + 0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;host_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;host_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;host_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Disable interrupts. */</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;ictrl, 0);</div><div class='hunk'>@@ -1037,470 +704,471 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0000000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[0] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[0] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0100000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[1] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[1] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0200000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[2] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[2] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0300000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[3] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[3] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0400000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[4] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[4] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0500000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[5] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[5] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);</div><div class='ctx'> 		WRT_REG_DWORD(dmp_reg, 0xB0600000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);</div><div class='del'>-		fw-&gt;shadow_reg[6] = RD_REG_DWORD(dmp_reg);</div><div class='add'>+		fw-&gt;shadow_reg[6] = htonl(RD_REG_DWORD(dmp_reg));</div><div class='ctx'> </div><div class='ctx'> 		/* Mailbox registers. */</div><div class='ctx'> 		mbx_reg = (uint16_t __iomem *)((uint8_t __iomem *)reg + 0x80);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;mailbox_reg) / 2; cnt++)</div><div class='del'>-			fw-&gt;mailbox_reg[cnt] = RD_REG_WORD(mbx_reg++);</div><div class='add'>+			fw-&gt;mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Transfer sequence registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;xseq_gp_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF00);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF10);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF20);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF30);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF40);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF50);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF60);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBF70);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBFE0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;xseq_0_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;xseq_0_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;xseq_0_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xBFF0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;xseq_1_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;xseq_1_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;xseq_1_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Receive sequence registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;rseq_gp_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF00);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF10);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF20);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF30);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF40);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF50);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF60);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFF70);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFFD0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_0_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;rseq_0_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;rseq_0_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFFE0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_1_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;rseq_1_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;rseq_1_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0xFFF0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_2_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;rseq_2_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;rseq_2_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Command DMA registers. */</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7100);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;cmd_dma_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;cmd_dma_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;cmd_dma_reg[cnt] = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Queues. */</div><div class='ctx'> 		iter_reg = fw-&gt;req0_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7200);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 8; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xE4);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 7; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;resp0_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7300);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 8; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xE4);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 7; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;req1_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7400);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 8; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xE4);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 7; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Transmit DMA registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;xmt0_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7600);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7610);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;xmt1_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7620);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7630);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;xmt2_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7640);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7650);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;xmt3_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7660);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7670);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;xmt4_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7680);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7690);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x76A0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt_data_dma_reg) / 4; cnt++)</div><div class='del'>-			fw-&gt;xmt_data_dma_reg[cnt] = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			fw-&gt;xmt_data_dma_reg[cnt] =</div><div class='add'>+			    htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Receive DMA registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;rcvt0_data_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7700);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7710);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		iter_reg = fw-&gt;rcvt1_data_dma_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7720);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x7730);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* RISC registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;risc_gp_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F00);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F10);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F20);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F30);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F40);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F50);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F60);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x0F70);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Local memory controller registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;lmc_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3010);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3020);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3030);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3040);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3050);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x3060);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Fibre Protocol Module registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;fpm_hdw_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4010);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4020);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4030);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4040);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4050);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4060);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4070);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4080);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x4090);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x40A0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x40B0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Frame Buffer registers. */</div><div class='ctx'> 		iter_reg = fw-&gt;fb_hdw_reg;</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6000);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6010);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6020);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6030);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6040);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6100);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6130);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6150);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6170);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x6190);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;iobase_addr, 0x61B0);</div><div class='ctx'> 		dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xC0);</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 16; cnt++)</div><div class='del'>-			*iter_reg++ = RD_REG_DWORD(dmp_reg++);</div><div class='add'>+			*iter_reg++ = htonl(RD_REG_DWORD(dmp_reg++));</div><div class='ctx'> </div><div class='ctx'> 		/* Reset RISC. */</div><div class='ctx'> 		WRT_REG_DWORD(&amp;reg-&gt;ctrl_status,</div><div class='hunk'>@@ -1590,7 +1258,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='ctx'> 			rval = mb[0] &amp; MBS_MASK;</div><div class='del'>-			fw-&gt;code_ram[cnt] = (mb[3] &lt;&lt; 16) | mb[2];</div><div class='add'>+			fw-&gt;code_ram[cnt] = htonl((mb[3] &lt;&lt; 16) | mb[2]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1640,12 +1308,18 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> </div><div class='ctx'> 		if (test_and_clear_bit(MBX_INTERRUPT, &amp;ha-&gt;mbx_cmd_flags)) {</div><div class='ctx'> 			rval = mb[0] &amp; MBS_MASK;</div><div class='del'>-			fw-&gt;ext_mem[cnt] = (mb[3] &lt;&lt; 16) | mb[2];</div><div class='add'>+			fw-&gt;ext_mem[cnt] = htonl((mb[3] &lt;&lt; 16) | mb[2]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (rval == QLA_SUCCESS) {</div><div class='add'>+		eft = qla2xxx_copy_queues(ha, &amp;fw-&gt;ext_mem[cnt]);</div><div class='add'>+		if (ha-&gt;eft)</div><div class='add'>+			memcpy(eft, ha-&gt;eft, ntohl(ha-&gt;fw_dump-&gt;eft_size));</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Failed to dump firmware (%x)!!!\n", rval);</div><div class='hunk'>@@ -1654,7 +1328,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		qla_printk(KERN_INFO, ha,</div><div class='ctx'> 		    "Firmware dump saved to temp buffer (%ld/%p).\n",</div><div class='del'>-		    ha-&gt;host_no, ha-&gt;fw_dump24);</div><div class='add'>+		    ha-&gt;host_no, ha-&gt;fw_dump);</div><div class='ctx'> 		ha-&gt;fw_dumped = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1663,252 +1337,6 @@ qla24xx_fw_dump_failed:</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-qla24xx_ascii_fw_dump(scsi_qla_host_t *ha)</div><div class='del'>-{</div><div class='del'>-	uint32_t cnt;</div><div class='del'>-	char *uiter;</div><div class='del'>-	struct qla24xx_fw_dump *fw;</div><div class='del'>-	uint32_t ext_mem_cnt;</div><div class='del'>-</div><div class='del'>-	uiter = ha-&gt;fw_dump_buffer;</div><div class='del'>-	fw = ha-&gt;fw_dump24;</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "ISP FW Version %d.%02d.%02d Attributes %04x\n",</div><div class='del'>-	    ha-&gt;fw_major_version, ha-&gt;fw_minor_version,</div><div class='del'>-	    ha-&gt;fw_subminor_version, ha-&gt;fw_attributes);</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\nR2H Status Register\n%04x\n", fw-&gt;host_status);</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\nHost Interface Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;host_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;host_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nShadow Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;shadow_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;shadow_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nMailbox Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;mailbox_reg) / 2; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;mailbox_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXSEQ GP Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xseq_gp_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xseq_gp_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXSEQ-0 Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xseq_0_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xseq_0_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXSEQ-1 Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xseq_1_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xseq_1_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRSEQ GP Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_gp_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;rseq_gp_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRSEQ-0 Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_0_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;rseq_0_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRSEQ-1 Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_1_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;rseq_1_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRSEQ-2 Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;rseq_2_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;rseq_2_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nCommand DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;cmd_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;cmd_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRequest0 Queue DMA Channel Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;req0_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;req0_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nResponse0 Queue DMA Channel Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;resp0_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;resp0_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRequest1 Queue DMA Channel Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;req1_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;req1_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXMT0 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt0_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xmt0_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXMT1 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt1_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xmt1_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXMT2 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt2_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xmt2_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXMT3 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt3_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xmt3_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXMT4 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt4_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xmt4_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nXMT Data DMA Common Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;xmt_data_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;xmt_data_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRCV Thread 0 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;rcvt0_data_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;rcvt0_data_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRCV Thread 1 Data DMA Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;rcvt1_data_dma_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;rcvt1_data_dma_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nRISC GP Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;risc_gp_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;risc_gp_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nLMC Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;lmc_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;lmc_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFPM Hardware Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;fpm_hdw_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;fpm_hdw_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nFB Hardware Registers");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof(fw-&gt;fb_hdw_reg) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0)</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n");</div><div class='del'>-</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;fb_hdw_reg[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nCode RAM");</div><div class='del'>-	for (cnt = 0; cnt &lt; sizeof (fw-&gt;code_ram) / 4; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n%08x: ", cnt + 0x20000);</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;code_ram[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n\nExternal Memory");</div><div class='del'>-	ext_mem_cnt = ha-&gt;fw_memory_size - 0x100000 + 1;</div><div class='del'>-	for (cnt = 0; cnt &lt; ext_mem_cnt; cnt++) {</div><div class='del'>-		if (cnt % 8 == 0) {</div><div class='del'>-			qla_uprintf(&amp;uiter, "\n%08x: ", cnt + 0x100000);</div><div class='del'>-		}</div><div class='del'>-		qla_uprintf(&amp;uiter, "%08x ", fw-&gt;ext_mem[cnt]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla_uprintf(&amp;uiter, "\n[&lt;==END] ISP Debug Dump");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*                         Driver Debug Functions.                          */</div><div class='ctx'> /****************************************************************************/</div><div class='hunk'>@@ -1995,7 +1423,6 @@ qla2x00_print_scsi_cmd(struct scsi_cmnd * cmd)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	printk("  sp flags=0x%x\n", sp-&gt;flags);</div><div class='del'>-	printk("  state=%d\n", sp-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h<br/>index ab6afeaa2f2c..533425338e05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_dbg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_dbg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_dbg.h</a></div><div class='hunk'>@@ -37,134 +37,86 @@</div><div class='ctx'> /*</div><div class='ctx'> * Macros use for debugging the driver.</div><div class='ctx'> */</div><div class='del'>-#undef ENTER_TRACE</div><div class='del'>-#if defined(ENTER_TRACE)</div><div class='del'>-#define ENTER(x)	do { printk("qla2100 : Entering %s()\n", x); } while (0)</div><div class='del'>-#define LEAVE(x)	do { printk("qla2100 : Leaving %s()\n", x);  } while (0)</div><div class='del'>-#define ENTER_INTR(x)	do { printk("qla2100 : Entering %s()\n", x); } while (0)</div><div class='del'>-#define LEAVE_INTR(x)	do { printk("qla2100 : Leaving %s()\n", x);  } while (0)</div><div class='del'>-#else</div><div class='del'>-#define ENTER(x)	do {} while (0)</div><div class='del'>-#define LEAVE(x)	do {} while (0)</div><div class='del'>-#define ENTER_INTR(x) 	do {} while (0)</div><div class='del'>-#define LEAVE_INTR(x)   do {} while (0)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#if  DEBUG_QLA2100</div><div class='del'>-#define DEBUG(x)	do {x;} while (0);</div><div class='del'>-#else</div><div class='del'>-#define DEBUG(x)	do {} while (0);</div><div class='del'>-#endif</div><div class='add'>+#define DEBUG(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_1)</div><div class='del'>-#define DEBUG1(x)	do {x;} while (0);</div><div class='add'>+#define DEBUG1(x)	do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG1(x)	do {} while (0);</div><div class='add'>+#define DEBUG1(x)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(QL_DEBUG_LEVEL_2)</div><div class='del'>-#define DEBUG2(x)       do {x;} while (0);</div><div class='del'>-#define DEBUG2_3(x)     do {x;} while (0);</div><div class='del'>-#define DEBUG2_3_11(x)  do {x;} while (0);</div><div class='del'>-#define DEBUG2_9_10(x)    do {x;} while (0);</div><div class='del'>-#define DEBUG2_11(x)    do {x;} while (0);</div><div class='del'>-#define DEBUG2_13(x)    do {x;} while (0);</div><div class='del'>-#else</div><div class='del'>-#define DEBUG2(x)	do {} while (0);</div><div class='del'>-#endif</div><div class='add'>+#define DEBUG2(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='add'>+#define DEBUG2_3(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='add'>+#define DEBUG2_3_11(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='add'>+#define DEBUG2_9_10(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='add'>+#define DEBUG2_11(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='add'>+#define DEBUG2_13(x)	do { if (extended_error_logging) { x; } } while (0)</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_3)</div><div class='del'>-#define DEBUG3(x)	do {x;} while (0);</div><div class='del'>-#define DEBUG2_3(x)	do {x;} while (0);</div><div class='del'>-#define DEBUG2_3_11(x)	do {x;} while (0);</div><div class='del'>-#define DEBUG3_11(x)	do {x;} while (0);</div><div class='add'>+#define DEBUG3(x)	do {x;} while (0)</div><div class='add'>+#define DEBUG3_11(x)	do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG3(x)	do {} while (0);</div><div class='del'>-  #if !defined(QL_DEBUG_LEVEL_2)</div><div class='del'>-  #define DEBUG2_3(x)	do {} while (0);</div><div class='del'>-  #endif</div><div class='add'>+#define DEBUG3(x)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_4)</div><div class='del'>-#define DEBUG4(x)	do {x;} while (0);</div><div class='add'>+#define DEBUG4(x)	do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG4(x)	do {} while (0);</div><div class='add'>+#define DEBUG4(x)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_5)</div><div class='del'>-#define DEBUG5(x)          do {x;} while (0);</div><div class='add'>+#define DEBUG5(x)          do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG5(x)	do {} while (0);</div><div class='add'>+#define DEBUG5(x)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_7)</div><div class='del'>-#define DEBUG7(x)          do {x;} while (0);</div><div class='add'>+#define DEBUG7(x)          do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG7(x)	   do {} while (0);</div><div class='add'>+#define DEBUG7(x)	   do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_9)</div><div class='del'>-#define DEBUG9(x)       do {x;} while (0);</div><div class='del'>-#define DEBUG9_10(x)    do {x;} while (0);</div><div class='del'>-#define DEBUG2_9_10(x)	do {x;} while (0);</div><div class='add'>+#define DEBUG9(x)       do {x;} while (0)</div><div class='add'>+#define DEBUG9_10(x)    do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG9(x)	do {} while (0);</div><div class='add'>+#define DEBUG9(x)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_10)</div><div class='del'>-#define DEBUG10(x)      do {x;} while (0);</div><div class='del'>-#define DEBUG2_9_10(x)	do {x;} while (0);</div><div class='del'>-#define DEBUG9_10(x)	do {x;} while (0);</div><div class='add'>+#define DEBUG10(x)      do {x;} while (0)</div><div class='add'>+#define DEBUG9_10(x)	do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG10(x)	do {} while (0);</div><div class='del'>-  #if !defined(DEBUG2_9_10)</div><div class='del'>-  #define DEBUG2_9_10(x)	do {} while (0);</div><div class='del'>-  #endif</div><div class='add'>+#define DEBUG10(x)	do {} while (0)</div><div class='ctx'>   #if !defined(DEBUG9_10)</div><div class='del'>-  #define DEBUG9_10(x)	do {} while (0);</div><div class='add'>+  #define DEBUG9_10(x)	do {} while (0)</div><div class='ctx'>   #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_11)</div><div class='del'>-#define DEBUG11(x)      do{x;} while(0);</div><div class='del'>-#if !defined(DEBUG2_11)</div><div class='del'>-#define DEBUG2_11(x)    do{x;} while(0);</div><div class='del'>-#endif</div><div class='del'>-#if !defined(DEBUG2_3_11)</div><div class='del'>-#define DEBUG2_3_11(x)  do{x;} while(0);</div><div class='del'>-#endif</div><div class='add'>+#define DEBUG11(x)      do{x;} while(0)</div><div class='ctx'> #if !defined(DEBUG3_11)</div><div class='del'>-#define DEBUG3_11(x)    do{x;} while(0);</div><div class='add'>+#define DEBUG3_11(x)    do{x;} while(0)</div><div class='ctx'> #endif</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG11(x)	do{} while(0);</div><div class='del'>-  #if !defined(QL_DEBUG_LEVEL_2)</div><div class='del'>-  #define DEBUG2_11(x)	do{} while(0);</div><div class='del'>-    #if !defined(QL_DEBUG_LEVEL_3)</div><div class='del'>-    #define DEBUG2_3_11(x) do{} while(0);</div><div class='del'>-    #endif</div><div class='del'>-  #endif</div><div class='add'>+#define DEBUG11(x)	do{} while(0)</div><div class='ctx'>   #if !defined(QL_DEBUG_LEVEL_3)</div><div class='del'>-  #define DEBUG3_11(x)	do{} while(0);</div><div class='add'>+  #define DEBUG3_11(x)	do{} while(0)</div><div class='ctx'>   #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_12)</div><div class='del'>-#define DEBUG12(x)      do {x;} while (0);</div><div class='add'>+#define DEBUG12(x)      do {x;} while (0)</div><div class='ctx'> #else</div><div class='del'>-#define DEBUG12(x)	do {} while (0);</div><div class='add'>+#define DEBUG12(x)	do {} while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_13)</div><div class='ctx'> #define DEBUG13(x)      do {x;} while (0)</div><div class='del'>-#if !defined(DEBUG2_13)</div><div class='del'>-#define DEBUG2_13(x)    do {x;} while(0)</div><div class='del'>-#endif</div><div class='ctx'> #else</div><div class='ctx'> #define DEBUG13(x)	do {} while (0)</div><div class='del'>-#if !defined(QL_DEBUG_LEVEL_2)</div><div class='del'>-#define DEBUG2_13(x)	do {} while(0)</div><div class='del'>-#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(QL_DEBUG_LEVEL_14)</div><div class='hunk'>@@ -176,9 +128,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Firmware Dump structure definition</div><div class='ctx'>  */</div><div class='del'>-#define FW_DUMP_SIZE_128K	0xBC000</div><div class='del'>-#define FW_DUMP_SIZE_512K	0x2FC000</div><div class='del'>-#define FW_DUMP_SIZE_1M		0x5FC000</div><div class='ctx'> </div><div class='ctx'> struct qla2300_fw_dump {</div><div class='ctx'> 	uint16_t hccr;</div><div class='hunk'>@@ -224,8 +173,6 @@ struct qla2100_fw_dump {</div><div class='ctx'> 	uint16_t risc_ram[0xf000];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define FW_DUMP_SIZE_24XX	0x2B0000</div><div class='del'>-</div><div class='ctx'> struct qla24xx_fw_dump {</div><div class='ctx'> 	uint32_t host_status;</div><div class='ctx'> 	uint32_t host_reg[32];</div><div class='hunk'>@@ -257,3 +204,39 @@ struct qla24xx_fw_dump {</div><div class='ctx'> 	uint32_t code_ram[0x2000];</div><div class='ctx'> 	uint32_t ext_mem[1];</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+#define EFT_NUM_BUFFERS		4</div><div class='add'>+#define EFT_BYTES_PER_BUFFER	0x4000</div><div class='add'>+#define EFT_SIZE		((EFT_BYTES_PER_BUFFER) * (EFT_NUM_BUFFERS))</div><div class='add'>+</div><div class='add'>+struct qla2xxx_fw_dump {</div><div class='add'>+	uint8_t signature[4];</div><div class='add'>+	uint32_t version;</div><div class='add'>+</div><div class='add'>+	uint32_t fw_major_version;</div><div class='add'>+	uint32_t fw_minor_version;</div><div class='add'>+	uint32_t fw_subminor_version;</div><div class='add'>+	uint32_t fw_attributes;</div><div class='add'>+</div><div class='add'>+	uint32_t vendor;</div><div class='add'>+	uint32_t device;</div><div class='add'>+	uint32_t subsystem_vendor;</div><div class='add'>+	uint32_t subsystem_device;</div><div class='add'>+</div><div class='add'>+	uint32_t fixed_size;</div><div class='add'>+	uint32_t mem_size;</div><div class='add'>+	uint32_t req_q_size;</div><div class='add'>+	uint32_t rsp_q_size;</div><div class='add'>+</div><div class='add'>+	uint32_t eft_size;</div><div class='add'>+	uint32_t eft_addr_l;</div><div class='add'>+	uint32_t eft_addr_h;</div><div class='add'>+</div><div class='add'>+	uint32_t header_size;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct qla2100_fw_dump isp21;</div><div class='add'>+		struct qla2300_fw_dump isp23;</div><div class='add'>+		struct qla24xx_fw_dump isp24;</div><div class='add'>+	} isp;</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h<br/>index 53508f3c4ae9..139ea0e27fd7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_def.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_def.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_def.h</a></div><div class='hunk'>@@ -31,6 +31,8 @@</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport_fc.h&gt;</div><div class='ctx'> </div><div class='add'>+#define QLA2XXX_DRIVER_NAME  "qla2xxx"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We have MAILBOX_REGISTER_COUNT sized arrays in a few places,</div><div class='ctx'>  * but that's fine as we don't look at the last 24 ones for</div><div class='hunk'>@@ -189,22 +191,13 @@ typedef struct srb {</div><div class='ctx'> </div><div class='ctx'> 	struct scsi_cmnd *cmd;		/* Linux SCSI command pkt */</div><div class='ctx'> </div><div class='del'>-	struct timer_list timer;	/* Command timer */</div><div class='del'>-	atomic_t ref_count;	/* Reference count for this structure */</div><div class='ctx'> 	uint16_t flags;</div><div class='ctx'> </div><div class='del'>-	/* Request state */</div><div class='del'>-	uint16_t state;</div><div class='del'>-</div><div class='ctx'> 	/* Single transfer DMA context */</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='ctx'> </div><div class='ctx'> 	uint32_t request_sense_length;</div><div class='ctx'> 	uint8_t *request_sense_ptr;</div><div class='del'>-</div><div class='del'>-	/* SRB magic number */</div><div class='del'>-	uint16_t magic;</div><div class='del'>-#define SRB_MAGIC       0x10CB</div><div class='ctx'> } srb_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -226,21 +219,6 @@ typedef struct srb {</div><div class='ctx'> #define SRB_TAPE		BIT_11	/* FCP2 (Tape) command. */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * SRB state definitions</div><div class='del'>- */</div><div class='del'>-#define SRB_FREE_STATE		0	/*   returned back */</div><div class='del'>-#define SRB_PENDING_STATE	1	/*   queued in LUN Q */</div><div class='del'>-#define SRB_ACTIVE_STATE	2	/*   in Active Array */</div><div class='del'>-#define SRB_DONE_STATE		3	/*   queued in Done Queue */</div><div class='del'>-#define SRB_RETRY_STATE		4	/*   in Retry Queue */</div><div class='del'>-#define SRB_SUSPENDED_STATE	5	/*   in suspended state */</div><div class='del'>-#define SRB_NO_QUEUE_STATE	6	/*   is in between states */</div><div class='del'>-#define SRB_ACTIVE_TIMEOUT_STATE 7	/*   in Active Array but timed out */</div><div class='del'>-#define SRB_FAILOVER_STATE	8	/*   in Failover Queue */</div><div class='del'>-#define SRB_SCSI_RETRY_STATE	9	/*   in Scsi Retry Queue */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * ISP I/O Register Set structure definitions.</div><div class='ctx'>  */</div><div class='ctx'> struct device_reg_2xxx {</div><div class='hunk'>@@ -270,6 +248,8 @@ struct device_reg_2xxx {</div><div class='ctx'> #define NVR_SELECT		BIT_1</div><div class='ctx'> #define NVR_CLOCK		BIT_0</div><div class='ctx'> </div><div class='add'>+#define NVR_WAIT_CNT		20000</div><div class='add'>+</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			uint16_t mailbox0;</div><div class='hunk'>@@ -628,7 +608,9 @@ typedef struct {</div><div class='ctx'> #define MBC_SERDES_PARAMS		0x10	/* Serdes Tx Parameters. */</div><div class='ctx'> #define MBC_GET_IOCB_STATUS		0x12	/* Get IOCB status command. */</div><div class='ctx'> #define MBC_GET_TIMEOUT_PARAMS		0x22	/* Get FW timeouts. */</div><div class='add'>+#define MBC_TRACE_CONTROL		0x27	/* Trace control command. */</div><div class='ctx'> #define MBC_GEN_SYSTEM_ERROR		0x2a	/* Generate System Error. */</div><div class='add'>+#define MBC_READ_SFP			0x31	/* Read SFP Data. */</div><div class='ctx'> #define MBC_SET_TIMEOUT_PARAMS		0x32	/* Set FW timeouts. */</div><div class='ctx'> #define MBC_MID_INITIALIZE_FIRMWARE	0x48	/* MID Initialize firmware. */</div><div class='ctx'> #define MBC_MID_GET_VP_DATABASE		0x49	/* MID Get VP Database. */</div><div class='hunk'>@@ -638,6 +620,9 @@ typedef struct {</div><div class='ctx'> #define MBC_GET_LINK_PRIV_STATS		0x6d	/* Get link &amp; private data. */</div><div class='ctx'> #define MBC_SET_VENDOR_ID		0x76	/* Set Vendor ID. */</div><div class='ctx'> </div><div class='add'>+#define TC_ENABLE			4</div><div class='add'>+#define TC_DISABLE			5</div><div class='add'>+</div><div class='ctx'> /* Firmware return data sizes */</div><div class='ctx'> #define FCAL_MAP_SIZE	128</div><div class='ctx'> </div><div class='hunk'>@@ -1514,62 +1499,6 @@ typedef struct {</div><div class='ctx'> } sw_info_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Inquiry command structure.</div><div class='del'>- */</div><div class='del'>-#define INQ_DATA_SIZE	36</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Inquiry mailbox IOCB packet definition.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	union {</div><div class='del'>-		cmd_a64_entry_t cmd;</div><div class='del'>-		sts_entry_t rsp;</div><div class='del'>-		struct cmd_type_7 cmd24;</div><div class='del'>-		struct sts_entry_24xx rsp24;</div><div class='del'>-	} p;</div><div class='del'>-	uint8_t inq[INQ_DATA_SIZE];</div><div class='del'>-} inq_cmd_rsp_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Report LUN command structure.</div><div class='del'>- */</div><div class='del'>-#define CHAR_TO_SHORT(a, b)	(uint16_t)((uint8_t)b &lt;&lt; 8 | (uint8_t)a)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	uint32_t len;</div><div class='del'>-	uint32_t rsrv;</div><div class='del'>-} rpt_hdr_t;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	struct {</div><div class='del'>-		uint8_t b : 6;</div><div class='del'>-		uint8_t address_method : 2;</div><div class='del'>-	} msb;</div><div class='del'>-	uint8_t lsb;</div><div class='del'>-	uint8_t unused[6];</div><div class='del'>-} rpt_lun_t;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	rpt_hdr_t hdr;</div><div class='del'>-	rpt_lun_t lst[MAX_LUNS];</div><div class='del'>-} rpt_lun_lst_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Report Lun mailbox IOCB packet definition.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	union {</div><div class='del'>-		cmd_a64_entry_t cmd;</div><div class='del'>-		sts_entry_t rsp;</div><div class='del'>-		struct cmd_type_7 cmd24;</div><div class='del'>-		struct sts_entry_24xx rsp24;</div><div class='del'>-	} p;</div><div class='del'>-	rpt_lun_lst_t list;</div><div class='del'>-} rpt_lun_cmd_rsp_t;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Fibre channel port type.</div><div class='ctx'>  */</div><div class='ctx'>  typedef enum {</div><div class='hunk'>@@ -1587,7 +1516,6 @@ typedef struct {</div><div class='ctx'> typedef struct fc_port {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct scsi_qla_host *ha;</div><div class='del'>-	struct scsi_qla_host *vis_ha;	/* only used when suspending lun */</div><div class='ctx'> </div><div class='ctx'> 	uint8_t node_name[WWN_SIZE];</div><div class='ctx'> 	uint8_t port_name[WWN_SIZE];</div><div class='hunk'>@@ -1602,23 +1530,13 @@ typedef struct fc_port {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int os_target_id;</div><div class='ctx'> </div><div class='del'>-	uint16_t iodesc_idx_sent;</div><div class='del'>-</div><div class='ctx'> 	int port_login_retry_count;</div><div class='ctx'> 	int login_retry;</div><div class='ctx'> 	atomic_t port_down_timer;</div><div class='ctx'> </div><div class='del'>-	uint8_t device_type;</div><div class='del'>-	uint8_t unused;</div><div class='del'>-</div><div class='del'>-	uint8_t mp_byte;		/* multi-path byte (not used) */</div><div class='del'>-    	uint8_t cur_path;		/* current path id */</div><div class='del'>-</div><div class='ctx'> 	spinlock_t rport_lock;</div><div class='ctx'> 	struct fc_rport *rport, *drport;</div><div class='ctx'> 	u32 supported_classes;</div><div class='del'>-	struct work_struct rport_add_work;</div><div class='del'>-	struct work_struct rport_del_work;</div><div class='ctx'> } fc_port_t;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2027,54 +1945,6 @@ struct sns_cmd_pkt {</div><div class='ctx'> 	} p;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* IO descriptors */</div><div class='del'>-#define MAX_IO_DESCRIPTORS	32</div><div class='del'>-</div><div class='del'>-#define ABORT_IOCB_CB		0</div><div class='del'>-#define ADISC_PORT_IOCB_CB	1</div><div class='del'>-#define LOGOUT_PORT_IOCB_CB	2</div><div class='del'>-#define LOGIN_PORT_IOCB_CB	3</div><div class='del'>-#define LAST_IOCB_CB		4</div><div class='del'>-</div><div class='del'>-#define IODESC_INVALID_INDEX	0xFFFF</div><div class='del'>-#define IODESC_ADISC_NEEDED	0xFFFE</div><div class='del'>-#define IODESC_LOGIN_NEEDED	0xFFFD</div><div class='del'>-</div><div class='del'>-struct io_descriptor {</div><div class='del'>-	uint16_t used:1;</div><div class='del'>-	uint16_t idx:11;</div><div class='del'>-	uint16_t cb_idx:4;</div><div class='del'>-</div><div class='del'>-	struct timer_list timer;</div><div class='del'>-</div><div class='del'>-	struct scsi_qla_host *ha;</div><div class='del'>-</div><div class='del'>-	port_id_t d_id;</div><div class='del'>-	fc_port_t *remote_fcport;</div><div class='del'>-</div><div class='del'>-	uint32_t signature;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct qla_fw_info {</div><div class='del'>-	unsigned short addressing;	/* addressing method used to load fw */</div><div class='del'>-#define FW_INFO_ADDR_NORMAL	0</div><div class='del'>-#define FW_INFO_ADDR_EXTENDED	1</div><div class='del'>-#define FW_INFO_ADDR_NOMORE	0xffff</div><div class='del'>-	unsigned short *fwcode;		/* pointer to FW array */</div><div class='del'>-	unsigned short *fwlen;		/* number of words in array */</div><div class='del'>-	unsigned short *fwstart;	/* start address for F/W */</div><div class='del'>-	unsigned long *lfwstart;	/* start address (long) for F/W */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct qla_board_info {</div><div class='del'>-	char *drv_name;</div><div class='del'>-</div><div class='del'>-	char isp_name[8];</div><div class='del'>-	struct qla_fw_info *fw_info;</div><div class='del'>-	char *fw_fname;</div><div class='del'>-	struct scsi_host_template *sht;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct fw_blob {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	uint32_t segs[4];</div><div class='hunk'>@@ -2132,7 +2002,6 @@ struct isp_operations {</div><div class='ctx'> 		uint32_t);</div><div class='ctx'> </div><div class='ctx'> 	void (*fw_dump) (struct scsi_qla_host *, int);</div><div class='del'>-	void (*ascii_fw_dump) (struct scsi_qla_host *);</div><div class='ctx'> </div><div class='ctx'> 	int (*beacon_on) (struct scsi_qla_host *);</div><div class='ctx'> 	int (*beacon_off) (struct scsi_qla_host *);</div><div class='hunk'>@@ -2176,6 +2045,7 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 		uint32_t	enable_led_scheme	:1;</div><div class='ctx'> 		uint32_t	msi_enabled		:1;</div><div class='ctx'> 		uint32_t	msix_enabled		:1;</div><div class='add'>+		uint32_t	disable_serdes		:1;</div><div class='ctx'> 	} flags;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t	loop_state;</div><div class='hunk'>@@ -2269,7 +2139,7 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	mempool_t	*srb_mempool;</div><div class='ctx'> </div><div class='ctx'> 	/* This spinlock is used to protect "io transactions", you must</div><div class='del'>-	 * aquire it before doing any IO to the card, eg with RD_REG*() and</div><div class='add'>+	 * acquire it before doing any IO to the card, eg with RD_REG*() and</div><div class='ctx'> 	 * WRT_REG*() for the duration of your entire commandtransaction.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * This spinlock is of lower priority than the io request lock.</div><div class='hunk'>@@ -2303,9 +2173,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	uint32_t	current_outstanding_cmd;</div><div class='ctx'> 	srb_t		*status_srb;	/* Status continuation entry. */</div><div class='ctx'> </div><div class='del'>-	uint16_t           revision;</div><div class='del'>-	uint8_t           ports;</div><div class='del'>-</div><div class='ctx'> 	/* ISP configuration data. */</div><div class='ctx'> 	uint16_t	loop_id;		/* Host adapter loop id */</div><div class='ctx'> 	uint16_t	fb_rev;</div><div class='hunk'>@@ -2361,10 +2228,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> </div><div class='ctx'> 	/* Fibre Channel Device List. */</div><div class='ctx'> 	struct list_head	fcports;</div><div class='del'>-	struct list_head	rscn_fcports;</div><div class='del'>-</div><div class='del'>-	struct io_descriptor	io_descriptors[MAX_IO_DESCRIPTORS];</div><div class='del'>-	uint16_t		iodesc_signature;</div><div class='ctx'> </div><div class='ctx'> 	/* RSCN queue. */</div><div class='ctx'> 	uint32_t rscn_queue[MAX_RSCN_COUNT];</div><div class='hunk'>@@ -2380,6 +2243,11 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	struct sns_cmd_pkt	*sns_cmd;</div><div class='ctx'> 	dma_addr_t		sns_cmd_dma;</div><div class='ctx'> </div><div class='add'>+#define SFP_DEV_SIZE	256</div><div class='add'>+#define SFP_BLOCK_SIZE	64</div><div class='add'>+	void			*sfp_data;</div><div class='add'>+	dma_addr_t		sfp_data_dma;</div><div class='add'>+</div><div class='ctx'> 	struct task_struct	*dpc_thread;</div><div class='ctx'> 	uint8_t dpc_active;                  /* DPC routine is active */</div><div class='ctx'> </div><div class='hunk'>@@ -2395,9 +2263,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	struct gid_list_info *gid_list;</div><div class='ctx'> 	int		gid_list_info_size;</div><div class='ctx'> </div><div class='del'>-	dma_addr_t	rlc_rsp_dma;</div><div class='del'>-	rpt_lun_cmd_rsp_t *rlc_rsp;</div><div class='del'>-</div><div class='ctx'> 	/* Small DMA pool allocations -- maximum 256 bytes in length. */</div><div class='ctx'> #define DMA_POOL_SIZE	256</div><div class='ctx'> 	struct dma_pool *s_dma_pool;</div><div class='hunk'>@@ -2406,9 +2271,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	init_cb_t	*init_cb;</div><div class='ctx'> 	int		init_cb_size;</div><div class='ctx'> </div><div class='del'>-	dma_addr_t	iodesc_pd_dma;</div><div class='del'>-	port_database_t *iodesc_pd;</div><div class='del'>-</div><div class='ctx'> 	/* These are used by mailbox operations. */</div><div class='ctx'> 	volatile uint16_t mailbox_out[MAILBOX_REGISTER_COUNT];</div><div class='ctx'> </div><div class='hunk'>@@ -2435,28 +2297,28 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	mbx_cmd_t 	mc;</div><div class='ctx'> </div><div class='ctx'> 	/* Basic firmware related information. */</div><div class='del'>-	struct qla_board_info	*brd_info;</div><div class='ctx'> 	uint16_t	fw_major_version;</div><div class='ctx'> 	uint16_t	fw_minor_version;</div><div class='ctx'> 	uint16_t	fw_subminor_version;</div><div class='ctx'> 	uint16_t	fw_attributes;</div><div class='ctx'> 	uint32_t	fw_memory_size;</div><div class='ctx'> 	uint32_t	fw_transfer_size;</div><div class='add'>+	uint32_t	fw_srisc_address;</div><div class='add'>+#define RISC_START_ADDRESS_2100 0x1000</div><div class='add'>+#define RISC_START_ADDRESS_2300 0x800</div><div class='add'>+#define RISC_START_ADDRESS_2400 0x100000</div><div class='ctx'> </div><div class='ctx'> 	uint16_t	fw_options[16];		/* slots: 1,2,3,10,11 */</div><div class='ctx'> 	uint8_t		fw_seriallink_options[4];</div><div class='ctx'> 	uint16_t	fw_seriallink_options24[4];</div><div class='ctx'> </div><div class='ctx'> 	/* Firmware dump information. */</div><div class='del'>-	void		*fw_dump;</div><div class='del'>-	int		fw_dump_order;</div><div class='del'>-	int		fw_dump_reading;</div><div class='del'>-	char		*fw_dump_buffer;</div><div class='del'>-	int		fw_dump_buffer_len;</div><div class='del'>-</div><div class='add'>+	struct qla2xxx_fw_dump *fw_dump;</div><div class='add'>+	uint32_t	fw_dump_len;</div><div class='ctx'> 	int		fw_dumped;</div><div class='del'>-	void		*fw_dump24;</div><div class='del'>-	int		fw_dump24_len;</div><div class='add'>+	int		fw_dump_reading;</div><div class='add'>+	dma_addr_t	eft_dma;</div><div class='add'>+	void		*eft;</div><div class='ctx'> </div><div class='ctx'> 	uint8_t		host_str[16];</div><div class='ctx'> 	uint32_t	pci_attr;</div><div class='hunk'>@@ -2503,8 +2365,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> 	 test_bit(LOOP_RESYNC_NEEDED, &amp;ha-&gt;dpc_flags) || \</div><div class='ctx'> 	 atomic_read(&amp;ha-&gt;loop_state) == LOOP_DOWN)</div><div class='ctx'> </div><div class='del'>-#define TGT_Q(ha, t) (ha-&gt;otgt[t])</div><div class='del'>-</div><div class='ctx'> #define to_qla_host(x)		((scsi_qla_host_t *) (x)-&gt;hostdata)</div><div class='ctx'> </div><div class='ctx'> #define qla_printk(level, ha, format, arg...) \</div><div class='hunk'>@@ -2537,19 +2397,6 @@ typedef struct scsi_qla_host {</div><div class='ctx'> #define QLA_RSCNS_HANDLED		0x108</div><div class='ctx'> #define QLA_ALREADY_REGISTERED		0x109</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-* Stat info for all adpaters</div><div class='del'>-*/</div><div class='del'>-struct _qla2x00stats  {</div><div class='del'>-        unsigned long   mboxtout;            /* mailbox timeouts */</div><div class='del'>-        unsigned long   mboxerr;             /* mailbox errors */</div><div class='del'>-        unsigned long   ispAbort;            /* ISP aborts */</div><div class='del'>-        unsigned long   debugNo;</div><div class='del'>-        unsigned long   loop_resync;</div><div class='del'>-        unsigned long   outarray_full;</div><div class='del'>-        unsigned long   retry_q_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define NVRAM_DELAY()		udelay(10)</div><div class='ctx'> </div><div class='ctx'> #define INVALID_HANDLE	(MAX_OUTSTANDING_COMMANDS+1)</div><div class='hunk'>@@ -2565,12 +2412,6 @@ struct _qla2x00stats  {</div><div class='ctx'> #include "qla_dbg.h"</div><div class='ctx'> #include "qla_inline.h"</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-* String arrays</div><div class='del'>-*/</div><div class='del'>-#define LINESIZE    256</div><div class='del'>-#define MAXARGS      26</div><div class='del'>-</div><div class='ctx'> #define CMD_SP(Cmnd)		((Cmnd)-&gt;SCp.ptr)</div><div class='ctx'> #define CMD_COMPL_STATUS(Cmnd)  ((Cmnd)-&gt;SCp.this_residual)</div><div class='ctx'> #define CMD_RESID_LEN(Cmnd)	((Cmnd)-&gt;SCp.buffers_residual)</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h<br/>index a8fc0ffc7fc5..dd435410dfa2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_devtbl.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_devtbl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_devtbl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_devtbl.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-#define QLA_MODEL_NAMES         0x4A</div><div class='add'>+#define QLA_MODEL_NAMES		0x57</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Adapter model names and descriptions.</div><div class='hunk'>@@ -76,6 +76,19 @@ static char *qla2x00_model_name[QLA_MODEL_NAMES*2] = {</div><div class='ctx'> 	"QLE2440",	"PCI-Express to 4Gb FC, Single Channel",	/* 0x145 */</div><div class='ctx'> 	"QLE2464",	"PCI-Express to 4Gb FC, Quad Channel",		/* 0x146 */</div><div class='ctx'> 	"QLA2440",	"PCI-X 2.0 to 4Gb FC, Single Channel",		/* 0x147 */</div><div class='del'>-	" ",		" ",						/* 0x148 */</div><div class='add'>+	"HP AE369A",	"PCI-X 2.0 to 4Gb FC, Dual Channel",		/* 0x148 */</div><div class='ctx'> 	"QLA2340",	"Sun 133MHz PCI-X to 2Gb FC, Single Channel",	/* 0x149 */</div><div class='add'>+	" ",		" ",						/* 0x14a */</div><div class='add'>+	" ",		" ",						/* 0x14b */</div><div class='add'>+	"QMC2432M",	"IBM eServer BC 4Gb FC Expansion Card CFFE",	/* 0x14c */</div><div class='add'>+	"QMC2422M",	"IBM eServer BC 4Gb FC Expansion Card CFFX",	/* 0x14d */</div><div class='add'>+	"QLE220",	"Sun PCI-Express to 4Gb FC, Single Channel",	/* 0x14e */</div><div class='add'>+	" ",		" ",						/* 0x14f */</div><div class='add'>+	" ",		" ",						/* 0x150 */</div><div class='add'>+	" ",		" ",						/* 0x151 */</div><div class='add'>+	"QME2462",	"PCI-Express to 4Gb FC, Dual Channel Mezz HBA",	/* 0x152 */</div><div class='add'>+	"QMH2462",	"PCI-Express to 4Gb FC, Dual Channel Mezz HBA",	/* 0x153 */</div><div class='add'>+	" ",		" ",						/* 0x154 */</div><div class='add'>+	"QLE220",	"PCI-Express to 4Gb FC, Single Channel",	/* 0x155 */</div><div class='add'>+	"QLE220",	"PCI-Express to 4Gb FC, Single Channel",	/* 0x156 */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h<br/>index 1ee58ad2f4dd..a0a722cf4237 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_fw.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_fw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_fw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_fw.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef __QLA_FW_H</div><div class='ctx'> #define __QLA_FW_H</div><div class='ctx'> </div><div class='del'>-#define RISC_SADDRESS		0x100000</div><div class='ctx'> #define MBS_CHECKSUM_ERROR	0x4010</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -142,7 +141,7 @@ struct nvram_24xx {</div><div class='ctx'> 	 * BIT 2  = Enable Memory Map BIOS</div><div class='ctx'> 	 * BIT 3  = Enable Selectable Boot</div><div class='ctx'> 	 * BIT 4  = Disable RISC code load</div><div class='del'>-	 * BIT 5  =</div><div class='add'>+	 * BIT 5  = Disable Serdes</div><div class='ctx'> 	 * BIT 6  =</div><div class='ctx'> 	 * BIT 7  =</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -279,7 +278,7 @@ struct init_cb_24xx {</div><div class='ctx'> 	uint16_t response_q_length;</div><div class='ctx'> 	uint16_t request_q_length;</div><div class='ctx'> </div><div class='del'>-	uint16_t link_down_timeout;		/* Milliseconds. */</div><div class='add'>+	uint16_t link_down_on_nos;		/* Milliseconds. */</div><div class='ctx'> </div><div class='ctx'> 	uint16_t prio_request_q_length;</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +462,7 @@ struct sts_entry_24xx {</div><div class='ctx'> 	uint16_t comp_status;		/* Completion status. */</div><div class='ctx'> 	uint16_t ox_id;			/* OX_ID used by the firmware. */</div><div class='ctx'> </div><div class='del'>-	uint32_t residual_len;		/* Residual transfer length. */</div><div class='add'>+	uint32_t residual_len;		/* FW calc residual transfer length. */</div><div class='ctx'> </div><div class='ctx'> 	uint16_t reserved_1;</div><div class='ctx'> 	uint16_t state_flags;		/* State flags. */</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h<br/>index 91e83e2c1eb8..8311ac2b93a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_gbl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_gbl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_gbl.h</a></div><div class='hunk'>@@ -9,9 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void qla2x00_remove_one(struct pci_dev *);</div><div class='del'>-extern int qla2x00_probe_one(struct pci_dev *, struct qla_board_info *);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_init.c source file.</div><div class='ctx'>  */</div><div class='hunk'>@@ -34,13 +31,9 @@ extern void qla2x00_update_fw_options(struct scsi_qla_host *);</div><div class='ctx'> extern void qla24xx_update_fw_options(scsi_qla_host_t *);</div><div class='ctx'> extern int qla2x00_load_risc(struct scsi_qla_host *, uint32_t *);</div><div class='ctx'> extern int qla24xx_load_risc(scsi_qla_host_t *, uint32_t *);</div><div class='del'>-extern int qla24xx_load_risc_flash(scsi_qla_host_t *, uint32_t *);</div><div class='del'>-</div><div class='del'>-extern fc_port_t *qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t);</div><div class='ctx'> </div><div class='ctx'> extern int qla2x00_loop_resync(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='del'>-extern int qla2x00_find_new_loop_id(scsi_qla_host_t *, fc_port_t *);</div><div class='ctx'> extern int qla2x00_fabric_login(scsi_qla_host_t *, fc_port_t *, uint16_t *);</div><div class='ctx'> extern int qla2x00_local_device_login(scsi_qla_host_t *, fc_port_t *);</div><div class='ctx'> </div><div class='hunk'>@@ -54,6 +47,8 @@ extern int qla2x00_abort_isp(scsi_qla_host_t *);</div><div class='ctx'> extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);</div><div class='ctx'> extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);</div><div class='ctx'> </div><div class='add'>+extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Global Data in qla_os.c source file.</div><div class='ctx'>  */</div><div class='hunk'>@@ -64,14 +59,13 @@ extern int qlport_down_retry;</div><div class='ctx'> extern int ql2xplogiabsentdevice;</div><div class='ctx'> extern int ql2xloginretrycount;</div><div class='ctx'> extern int ql2xfdmienable;</div><div class='del'>-extern int ql2xprocessrscn;</div><div class='add'>+extern int ql2xallocfwdump;</div><div class='add'>+extern int extended_error_logging;</div><div class='ctx'> </div><div class='ctx'> extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);</div><div class='ctx'> </div><div class='ctx'> extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);</div><div class='ctx'> </div><div class='del'>-extern void qla2x00_cmd_timeout(srb_t *);</div><div class='del'>-</div><div class='ctx'> extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);</div><div class='ctx'> extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);</div><div class='ctx'> </div><div class='hunk'>@@ -86,8 +80,6 @@ extern void qla2xxx_wake_dpc(scsi_qla_host_t *);</div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_iocb.c source file.</div><div class='ctx'>  */</div><div class='del'>-extern void qla2x00_isp_cmd(scsi_qla_host_t *);</div><div class='del'>-</div><div class='ctx'> extern uint16_t qla2x00_calc_iocbs_32(uint16_t);</div><div class='ctx'> extern uint16_t qla2x00_calc_iocbs_64(uint16_t);</div><div class='ctx'> extern void qla2x00_build_scsi_iocbs_32(srb_t *, cmd_entry_t *, uint16_t);</div><div class='hunk'>@@ -210,6 +202,12 @@ qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);</div><div class='ctx'> extern int</div><div class='ctx'> qla2x00_stop_firmware(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='add'>+extern int</div><div class='add'>+qla2x00_trace_control(scsi_qla_host_t *, uint16_t, dma_addr_t, uint16_t);</div><div class='add'>+</div><div class='add'>+extern int</div><div class='add'>+qla2x00_read_sfp(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t, uint16_t);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Global Function Prototypes in qla_isr.c source file.</div><div class='ctx'>  */</div><div class='hunk'>@@ -260,9 +258,6 @@ extern int qla24xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,</div><div class='ctx'> extern void qla2100_fw_dump(scsi_qla_host_t *, int);</div><div class='ctx'> extern void qla2300_fw_dump(scsi_qla_host_t *, int);</div><div class='ctx'> extern void qla24xx_fw_dump(scsi_qla_host_t *, int);</div><div class='del'>-extern void qla2100_ascii_fw_dump(scsi_qla_host_t *);</div><div class='del'>-extern void qla2300_ascii_fw_dump(scsi_qla_host_t *);</div><div class='del'>-extern void qla24xx_ascii_fw_dump(scsi_qla_host_t *);</div><div class='ctx'> extern void qla2x00_dump_regs(scsi_qla_host_t *);</div><div class='ctx'> extern void qla2x00_dump_buffer(uint8_t *, uint32_t);</div><div class='ctx'> extern void qla2x00_print_scsi_cmd(struct scsi_cmnd *);</div><div class='hunk'>@@ -286,22 +281,6 @@ extern void *qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);</div><div class='ctx'> extern int qla2x00_fdmi_register(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Global Function Prototypes in qla_rscn.c source file.</div><div class='del'>- */</div><div class='del'>-extern fc_port_t *qla2x00_alloc_rscn_fcport(scsi_qla_host_t *, gfp_t);</div><div class='del'>-extern int qla2x00_handle_port_rscn(scsi_qla_host_t *, uint32_t, fc_port_t *,</div><div class='del'>-    int);</div><div class='del'>-extern void qla2x00_process_iodesc(scsi_qla_host_t *, struct mbx_entry *);</div><div class='del'>-extern void qla2x00_cancel_io_descriptors(scsi_qla_host_t *);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Global Function Prototypes in qla_xioctl.c source file.</div><div class='del'>- */</div><div class='del'>-#define qla2x00_enqueue_aen(ha, cmd, mode)	do { } while (0)</div><div class='del'>-#define qla2x00_alloc_ioctl_mem(ha)		(0)</div><div class='del'>-#define qla2x00_free_ioctl_mem(ha)		do { } while (0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Global Function Prototypes in qla_attr.c source file.</div><div class='ctx'>  */</div><div class='ctx'> struct class_device_attribute;</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c<br/>index 89a3fc0595bb..9758dba95542 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_init.c</a></div><div class='hunk'>@@ -39,6 +39,8 @@ static int qla2x00_fabric_dev_login(scsi_qla_host_t *, fc_port_t *,</div><div class='ctx'> </div><div class='ctx'> static int qla2x00_restart_isp(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='add'>+static int qla2x00_find_new_loop_id(scsi_qla_host_t *ha, fc_port_t *dev);</div><div class='add'>+</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> /*                QLogic ISP2x00 Hardware Support Functions.                */</div><div class='ctx'> /****************************************************************************/</div><div class='hunk'>@@ -89,6 +91,17 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops.nvram_config(ha);</div><div class='ctx'> </div><div class='add'>+	if (ha-&gt;flags.disable_serdes) {</div><div class='add'>+		/* Mask HBA via NVRAM settings? */</div><div class='add'>+		qla_printk(KERN_INFO, ha, "Masking HBA WWPN "</div><div class='add'>+		    "%02x%02x%02x%02x%02x%02x%02x%02x (via NVRAM).\n",</div><div class='add'>+		    ha-&gt;port_name[0], ha-&gt;port_name[1],</div><div class='add'>+		    ha-&gt;port_name[2], ha-&gt;port_name[3],</div><div class='add'>+		    ha-&gt;port_name[4], ha-&gt;port_name[5],</div><div class='add'>+		    ha-&gt;port_name[6], ha-&gt;port_name[7]);</div><div class='add'>+		return QLA_FUNCTION_FAILED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	qla_printk(KERN_INFO, ha, "Verifying loaded RISC code...\n");</div><div class='ctx'> </div><div class='ctx'> 	retry = 10;</div><div class='hunk'>@@ -194,7 +207,6 @@ qla2100_pci_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	mwi = 0;</div><div class='ctx'> 	if (pci_set_mwi(ha-&gt;pdev))</div><div class='ctx'> 		mwi = PCI_COMMAND_INVALIDATE;</div><div class='del'>-	pci_read_config_word(ha-&gt;pdev, PCI_REVISION_ID, &amp;ha-&gt;revision);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(ha-&gt;pdev, PCI_COMMAND, &amp;w);</div><div class='ctx'> 	w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);</div><div class='hunk'>@@ -232,7 +244,6 @@ qla2300_pci_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	mwi = 0;</div><div class='ctx'> 	if (pci_set_mwi(ha-&gt;pdev))</div><div class='ctx'> 		mwi = PCI_COMMAND_INVALIDATE;</div><div class='del'>-	pci_read_config_word(ha-&gt;pdev, PCI_REVISION_ID, &amp;ha-&gt;revision);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(ha-&gt;pdev, PCI_COMMAND, &amp;w);</div><div class='ctx'> 	w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);</div><div class='hunk'>@@ -320,7 +331,6 @@ qla24xx_pci_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	mwi = 0;</div><div class='ctx'> 	if (pci_set_mwi(ha-&gt;pdev))</div><div class='ctx'> 		mwi = PCI_COMMAND_INVALIDATE;</div><div class='del'>-	pci_read_config_word(ha-&gt;pdev, PCI_REVISION_ID, &amp;ha-&gt;revision);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(ha-&gt;pdev, PCI_COMMAND, &amp;w);</div><div class='ctx'> 	w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);</div><div class='hunk'>@@ -386,9 +396,7 @@ qla2x00_isp_firmware(scsi_qla_host_t *ha)</div><div class='ctx'> 		qla_printk(KERN_INFO, ha, "RISC CODE NOT loaded\n");</div><div class='ctx'> </div><div class='ctx'> 		/* Verify checksum of loaded RISC code. */</div><div class='del'>-		rval = qla2x00_verify_checksum(ha,</div><div class='del'>-		    IS_QLA24XX(ha) || IS_QLA54XX(ha) ? RISC_SADDRESS :</div><div class='del'>-		    *ha-&gt;brd_info-&gt;fw_info[0].fwstart);</div><div class='add'>+		rval = qla2x00_verify_checksum(ha, ha-&gt;fw_srisc_address);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rval) {</div><div class='hunk'>@@ -411,7 +419,6 @@ qla2x00_reset_chip(scsi_qla_host_t *ha)</div><div class='ctx'> 	unsigned long   flags = 0;</div><div class='ctx'> 	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='ctx'> 	uint32_t	cnt;</div><div class='del'>-	unsigned long	mbx_flags = 0;</div><div class='ctx'> 	uint16_t	cmd;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;isp_ops.disable_intrs(ha);</div><div class='hunk'>@@ -519,20 +526,8 @@ qla2x00_reset_chip(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA2100(ha) || IS_QLA2200(ha) || IS_QLA2300(ha)) {</div><div class='ctx'> 		for (cnt = 0; cnt &lt; 30000; cnt++) {</div><div class='del'>-			if (!(test_bit(ABORT_ISP_ACTIVE, &amp;ha-&gt;dpc_flags)))</div><div class='del'>-				spin_lock_irqsave(&amp;ha-&gt;mbx_reg_lock, mbx_flags);</div><div class='del'>-</div><div class='del'>-			if (RD_MAILBOX_REG(ha, reg, 0) != MBS_BUSY) {</div><div class='del'>-				if (!(test_bit(ABORT_ISP_ACTIVE,</div><div class='del'>-				    &amp;ha-&gt;dpc_flags)))</div><div class='del'>-					spin_unlock_irqrestore(</div><div class='del'>-					    &amp;ha-&gt;mbx_reg_lock, mbx_flags);</div><div class='add'>+			if (RD_MAILBOX_REG(ha, reg, 0) != MBS_BUSY)</div><div class='ctx'> 				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!(test_bit(ABORT_ISP_ACTIVE, &amp;ha-&gt;dpc_flags)))</div><div class='del'>-				spin_unlock_irqrestore(&amp;ha-&gt;mbx_reg_lock,</div><div class='del'>-				    mbx_flags);</div><div class='ctx'> </div><div class='ctx'> 			udelay(100);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -788,19 +783,104 @@ qla24xx_chip_diag(scsi_qla_host_t *ha)</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+void</div><div class='ctx'> qla2x00_alloc_fw_dump(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='add'>+	int rval;</div><div class='add'>+	uint32_t dump_size, fixed_size, mem_size, req_q_size, rsp_q_size,</div><div class='add'>+	    eft_size;</div><div class='add'>+	dma_addr_t eft_dma;</div><div class='add'>+	void *eft;</div><div class='add'>+</div><div class='add'>+	if (ha-&gt;fw_dump) {</div><div class='add'>+		qla_printk(KERN_WARNING, ha,</div><div class='add'>+		    "Firmware dump previously allocated.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ha-&gt;fw_dumped = 0;</div><div class='del'>-	ha-&gt;fw_dump24_len = sizeof(struct qla24xx_fw_dump);</div><div class='del'>-	ha-&gt;fw_dump24_len += (ha-&gt;fw_memory_size - 0x100000) * sizeof(uint32_t);</div><div class='del'>-	ha-&gt;fw_dump24 = vmalloc(ha-&gt;fw_dump24_len);</div><div class='del'>-	if (ha-&gt;fw_dump24)</div><div class='del'>-		qla_printk(KERN_INFO, ha, "Allocated (%d KB) for firmware "</div><div class='del'>-		    "dump...\n", ha-&gt;fw_dump24_len / 1024);</div><div class='del'>-	else</div><div class='add'>+	fixed_size = mem_size = eft_size = 0;</div><div class='add'>+	if (IS_QLA2100(ha) || IS_QLA2200(ha)) {</div><div class='add'>+		fixed_size = sizeof(struct qla2100_fw_dump);</div><div class='add'>+	} else if (IS_QLA23XX(ha)) {</div><div class='add'>+		fixed_size = offsetof(struct qla2300_fw_dump, data_ram);</div><div class='add'>+		mem_size = (ha-&gt;fw_memory_size - 0x11000 + 1) *</div><div class='add'>+		    sizeof(uint16_t);</div><div class='add'>+	} else if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='add'>+		fixed_size = offsetof(struct qla24xx_fw_dump, ext_mem);</div><div class='add'>+		mem_size = (ha-&gt;fw_memory_size - 0x100000 + 1) *</div><div class='add'>+		    sizeof(uint32_t);</div><div class='add'>+</div><div class='add'>+		/* Allocate memory for Extended Trace Buffer. */</div><div class='add'>+		eft = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev, EFT_SIZE, &amp;eft_dma,</div><div class='add'>+		    GFP_KERNEL);</div><div class='add'>+		if (!eft) {</div><div class='add'>+			qla_printk(KERN_WARNING, ha, "Unable to allocate "</div><div class='add'>+			    "(%d KB) for EFT.\n", EFT_SIZE / 1024);</div><div class='add'>+			goto cont_alloc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rval = qla2x00_trace_control(ha, TC_ENABLE, eft_dma,</div><div class='add'>+		    EFT_NUM_BUFFERS);</div><div class='add'>+		if (rval) {</div><div class='add'>+			qla_printk(KERN_WARNING, ha, "Unable to initialize "</div><div class='add'>+			    "EFT (%d).\n", rval);</div><div class='add'>+			dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, EFT_SIZE, eft,</div><div class='add'>+			    eft_dma);</div><div class='add'>+			goto cont_alloc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		qla_printk(KERN_INFO, ha, "Allocated (%d KB) for EFT...\n",</div><div class='add'>+		    EFT_SIZE / 1024);</div><div class='add'>+</div><div class='add'>+		eft_size = EFT_SIZE;</div><div class='add'>+		memset(eft, 0, eft_size);</div><div class='add'>+		ha-&gt;eft_dma = eft_dma;</div><div class='add'>+		ha-&gt;eft = eft;</div><div class='add'>+	}</div><div class='add'>+cont_alloc:</div><div class='add'>+	req_q_size = ha-&gt;request_q_length * sizeof(request_t);</div><div class='add'>+	rsp_q_size = ha-&gt;response_q_length * sizeof(response_t);</div><div class='add'>+</div><div class='add'>+	dump_size = offsetof(struct qla2xxx_fw_dump, isp);</div><div class='add'>+	dump_size += fixed_size + mem_size + req_q_size + rsp_q_size +</div><div class='add'>+	    eft_size;</div><div class='add'>+</div><div class='add'>+	ha-&gt;fw_dump = vmalloc(dump_size);</div><div class='add'>+	if (!ha-&gt;fw_dump) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha, "Unable to allocate (%d KB) for "</div><div class='del'>-		    "firmware dump!!!\n", ha-&gt;fw_dump24_len / 1024);</div><div class='add'>+		    "firmware dump!!!\n", dump_size / 1024);</div><div class='add'>+</div><div class='add'>+		if (ha-&gt;eft) {</div><div class='add'>+			dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, eft_size, ha-&gt;eft,</div><div class='add'>+			    ha-&gt;eft_dma);</div><div class='add'>+			ha-&gt;eft = NULL;</div><div class='add'>+			ha-&gt;eft_dma = 0;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qla_printk(KERN_INFO, ha, "Allocated (%d KB) for firmware dump...\n",</div><div class='add'>+	    dump_size / 1024);</div><div class='add'>+</div><div class='add'>+	ha-&gt;fw_dump_len = dump_size;</div><div class='add'>+	ha-&gt;fw_dump-&gt;signature[0] = 'Q';</div><div class='add'>+	ha-&gt;fw_dump-&gt;signature[1] = 'L';</div><div class='add'>+	ha-&gt;fw_dump-&gt;signature[2] = 'G';</div><div class='add'>+	ha-&gt;fw_dump-&gt;signature[3] = 'C';</div><div class='add'>+	ha-&gt;fw_dump-&gt;version = __constant_htonl(1);</div><div class='add'>+</div><div class='add'>+	ha-&gt;fw_dump-&gt;fixed_size = htonl(fixed_size);</div><div class='add'>+	ha-&gt;fw_dump-&gt;mem_size = htonl(mem_size);</div><div class='add'>+	ha-&gt;fw_dump-&gt;req_q_size = htonl(req_q_size);</div><div class='add'>+	ha-&gt;fw_dump-&gt;rsp_q_size = htonl(rsp_q_size);</div><div class='add'>+</div><div class='add'>+	ha-&gt;fw_dump-&gt;eft_size = htonl(eft_size);</div><div class='add'>+	ha-&gt;fw_dump-&gt;eft_addr_l = htonl(LSD(ha-&gt;eft_dma));</div><div class='add'>+	ha-&gt;fw_dump-&gt;eft_addr_h = htonl(MSD(ha-&gt;eft_dma));</div><div class='add'>+</div><div class='add'>+	ha-&gt;fw_dump-&gt;header_size =</div><div class='add'>+	    htonl(offsetof(struct qla2xxx_fw_dump, isp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -822,9 +902,6 @@ qla2x00_resize_request_q(scsi_qla_host_t *ha)</div><div class='ctx'> 	if (IS_QLA2100(ha) || IS_QLA2200(ha))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (IS_QLA24XX(ha) || IS_QLA54XX(ha))</div><div class='del'>-		qla2x00_alloc_fw_dump(ha);</div><div class='del'>-</div><div class='ctx'> 	/* Retrieve IOCB counts available to the firmware. */</div><div class='ctx'> 	rval = qla2x00_get_resource_cnts(ha, NULL, NULL, NULL, &amp;fw_iocb_cnt);</div><div class='ctx'> 	if (rval)</div><div class='hunk'>@@ -892,6 +969,9 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)</div><div class='ctx'> 				    &amp;ha-&gt;fw_subminor_version,</div><div class='ctx'> 				    &amp;ha-&gt;fw_attributes, &amp;ha-&gt;fw_memory_size);</div><div class='ctx'> 				qla2x00_resize_request_q(ha);</div><div class='add'>+</div><div class='add'>+				if (ql2xallocfwdump)</div><div class='add'>+					qla2x00_alloc_fw_dump(ha);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			DEBUG2(printk(KERN_INFO</div><div class='hunk'>@@ -1195,8 +1275,7 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)</div><div class='ctx'> 			rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> </div><div class='ctx'> 			if (atomic_read(&amp;ha-&gt;loop_down_timer) &amp;&amp;</div><div class='del'>-			    (fw_state &gt;= FSTATE_LOSS_OF_SYNC ||</div><div class='del'>-				fw_state == FSTATE_WAIT_AL_PA)) {</div><div class='add'>+			    fw_state != FSTATE_READY) {</div><div class='ctx'> 				/* Loop down. Timeout on min_wait for states</div><div class='ctx'> 				 * other than Wait for Login.</div><div class='ctx'> 				 */</div><div class='hunk'>@@ -1545,6 +1624,12 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	while (cnt--)</div><div class='ctx'> 		*dptr1++ = *dptr2++;</div><div class='ctx'> </div><div class='add'>+	/* Use alternate WWN? */</div><div class='add'>+	if (nv-&gt;host_p[1] &amp; BIT_7) {</div><div class='add'>+		memcpy(icb-&gt;node_name, nv-&gt;alternate_node_name, WWN_SIZE);</div><div class='add'>+		memcpy(icb-&gt;port_name, nv-&gt;alternate_port_name, WWN_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Prepare nodename */</div><div class='ctx'> 	if ((icb-&gt;firmware_options[1] &amp; BIT_6) == 0) {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -1558,6 +1643,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Set host adapter parameters.</div><div class='ctx'> 	 */</div><div class='add'>+	if (nv-&gt;host_p[0] &amp; BIT_7)</div><div class='add'>+		extended_error_logging = 1;</div><div class='ctx'> 	ha-&gt;flags.disable_risc_code_load = ((nv-&gt;host_p[0] &amp; BIT_4) ? 1 : 0);</div><div class='ctx'> 	/* Always load RISC code on non ISP2[12]00 chips. */</div><div class='ctx'> 	if (!IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha))</div><div class='hunk'>@@ -1566,6 +1653,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	ha-&gt;flags.enable_lip_full_login = ((nv-&gt;host_p[1] &amp; BIT_2) ? 1 : 0);</div><div class='ctx'> 	ha-&gt;flags.enable_target_reset = ((nv-&gt;host_p[1] &amp; BIT_3) ? 1 : 0);</div><div class='ctx'> 	ha-&gt;flags.enable_led_scheme = (nv-&gt;special_options[1] &amp; BIT_4) ? 1 : 0;</div><div class='add'>+	ha-&gt;flags.disable_serdes = 0;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;operating_mode =</div><div class='ctx'> 	    (icb-&gt;add_firmware_options[0] &amp; (BIT_6 | BIT_5 | BIT_4)) &gt;&gt; 4;</div><div class='hunk'>@@ -1682,14 +1770,6 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-qla2x00_rport_add(void *data)</div><div class='del'>-{</div><div class='del'>-	fc_port_t *fcport = data;</div><div class='del'>-</div><div class='del'>-	qla2x00_reg_remote_port(fcport-&gt;ha, fcport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='ctx'> qla2x00_rport_del(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	fc_port_t *fcport = data;</div><div class='hunk'>@@ -1712,7 +1792,7 @@ qla2x00_rport_del(void *data)</div><div class='ctx'>  *</div><div class='ctx'>  * Returns a pointer to the allocated fcport, or NULL, if none available.</div><div class='ctx'>  */</div><div class='del'>-fc_port_t *</div><div class='add'>+static fc_port_t *</div><div class='ctx'> qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)</div><div class='ctx'> {</div><div class='ctx'> 	fc_port_t *fcport;</div><div class='hunk'>@@ -1726,13 +1806,10 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)</div><div class='ctx'> 	fcport-&gt;ha = ha;</div><div class='ctx'> 	fcport-&gt;port_type = FCT_UNKNOWN;</div><div class='ctx'> 	fcport-&gt;loop_id = FC_NO_LOOP_ID;</div><div class='del'>-	fcport-&gt;iodesc_idx_sent = IODESC_INVALID_INDEX;</div><div class='ctx'> 	atomic_set(&amp;fcport-&gt;state, FCS_UNCONFIGURED);</div><div class='ctx'> 	fcport-&gt;flags = FCF_RLC_SUPPORT;</div><div class='ctx'> 	fcport-&gt;supported_classes = FC_COS_UNSPECIFIED;</div><div class='ctx'> 	spin_lock_init(&amp;fcport-&gt;rport_lock);</div><div class='del'>-	INIT_WORK(&amp;fcport-&gt;rport_add_work, qla2x00_rport_add, fcport);</div><div class='del'>-	INIT_WORK(&amp;fcport-&gt;rport_del_work, qla2x00_rport_del, fcport);</div><div class='ctx'> </div><div class='ctx'> 	return (fcport);</div><div class='ctx'> }</div><div class='hunk'>@@ -1792,6 +1869,9 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)</div><div class='ctx'> 		set_bit(RSCN_UPDATE, &amp;flags);</div><div class='ctx'> 		clear_bit(LOCAL_LOOP_UPDATE, &amp;flags);</div><div class='ctx'> </div><div class='add'>+	} else if (ha-&gt;current_topology == ISP_CFG_N) {</div><div class='add'>+		clear_bit(RSCN_UPDATE, &amp;flags);</div><div class='add'>+</div><div class='ctx'> 	} else if (!ha-&gt;flags.online ||</div><div class='ctx'> 	    (test_bit(ABORT_ISP_ACTIVE, &amp;flags))) {</div><div class='ctx'> </div><div class='hunk'>@@ -2055,10 +2135,6 @@ qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)</div><div class='ctx'> 	    PORT_RETRY_TIME);</div><div class='ctx'> 	fcport-&gt;flags &amp;= ~FCF_LOGIN_NEEDED;</div><div class='ctx'> </div><div class='del'>-	if (fcport-&gt;port_type == FCT_INITIATOR ||</div><div class='del'>-	    fcport-&gt;port_type == FCT_BROADCAST)</div><div class='del'>-		fcport-&gt;device_type = TYPE_PROCESSOR;</div><div class='del'>-</div><div class='ctx'> 	atomic_set(&amp;fcport-&gt;state, FCS_ONLINE);</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;flags.init_done)</div><div class='hunk'>@@ -2273,8 +2349,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Remove device from the new list and add it to DB */</div><div class='del'>-			list_del(&amp;fcport-&gt;list);</div><div class='del'>-			list_add_tail(&amp;fcport-&gt;list, &amp;ha-&gt;fcports);</div><div class='add'>+			list_move_tail(&amp;fcport-&gt;list, &amp;ha-&gt;fcports);</div><div class='ctx'> </div><div class='ctx'> 			/* Login and update database */</div><div class='ctx'> 			qla2x00_fabric_dev_login(ha, fcport, &amp;next_loopid);</div><div class='hunk'>@@ -2513,7 +2588,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)</div><div class='ctx'>  * Context:</div><div class='ctx'>  *	Kernel context.</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> qla2x00_find_new_loop_id(scsi_qla_host_t *ha, fc_port_t *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int	rval;</div><div class='hunk'>@@ -2587,7 +2662,6 @@ static int</div><div class='ctx'> qla2x00_device_resync(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='ctx'> 	int	rval;</div><div class='del'>-	int	rval2;</div><div class='ctx'> 	uint32_t mask;</div><div class='ctx'> 	fc_port_t *fcport;</div><div class='ctx'> 	uint32_t rscn_entry;</div><div class='hunk'>@@ -2643,17 +2717,6 @@ qla2x00_device_resync(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 		switch (format) {</div><div class='ctx'> 		case 0:</div><div class='del'>-			if (ql2xprocessrscn &amp;&amp;</div><div class='del'>-			    !IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha) &amp;&amp;</div><div class='del'>-			    !IS_QLA6312(ha) &amp;&amp; !IS_QLA6322(ha) &amp;&amp;</div><div class='del'>-			    !IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha) &amp;&amp;</div><div class='del'>-			    ha-&gt;flags.init_done) {</div><div class='del'>-				/* Handle port RSCN via asyncronous IOCBs */</div><div class='del'>-				rval2 = qla2x00_handle_port_rscn(ha, rscn_entry,</div><div class='del'>-				    NULL, 0);</div><div class='del'>-				if (rval2 == QLA_SUCCESS)</div><div class='del'>-					continue;</div><div class='del'>-			}</div><div class='ctx'> 			mask = 0xffffff;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 1:</div><div class='hunk'>@@ -2671,10 +2734,6 @@ qla2x00_device_resync(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 		rval = QLA_SUCCESS;</div><div class='ctx'> </div><div class='del'>-		/* Abort any outstanding IO descriptors. */</div><div class='del'>-		if (!IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha))</div><div class='del'>-			qla2x00_cancel_io_descriptors(ha);</div><div class='del'>-</div><div class='ctx'> 		list_for_each_entry(fcport, &amp;ha-&gt;fcports, list) {</div><div class='ctx'> 			if ((fcport-&gt;flags &amp; FCF_FABRIC_DEVICE) == 0 ||</div><div class='ctx'> 			    (fcport-&gt;d_id.b24 &amp; mask) != d_id.b24 ||</div><div class='hunk'>@@ -3080,14 +3139,14 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)</div><div class='ctx'> 					ha-&gt;isp_abort_cnt--;</div><div class='ctx'> 					DEBUG(printk("qla%ld: ISP abort - "</div><div class='ctx'> 					    "retry remaining %d\n",</div><div class='del'>-					    ha-&gt;host_no, ha-&gt;isp_abort_cnt);)</div><div class='add'>+					    ha-&gt;host_no, ha-&gt;isp_abort_cnt));</div><div class='ctx'> 					status = 1;</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='ctx'> 				ha-&gt;isp_abort_cnt = MAX_RETRIES_OF_ISP_ABORT;</div><div class='ctx'> 				DEBUG(printk("qla2x00(%ld): ISP error recovery "</div><div class='ctx'> 				    "- retrying (%d) more times\n",</div><div class='del'>-				    ha-&gt;host_no, ha-&gt;isp_abort_cnt);)</div><div class='add'>+				    ha-&gt;host_no, ha-&gt;isp_abort_cnt));</div><div class='ctx'> 				set_bit(ISP_ABORT_RETRY, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 				status = 1;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -3101,7 +3160,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DEBUG(printk(KERN_INFO</div><div class='ctx'> 				"qla2x00_abort_isp(%ld): exiting.\n",</div><div class='del'>-				ha-&gt;host_no);)</div><div class='add'>+				ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return(status);</div><div class='hunk'>@@ -3177,7 +3236,7 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)</div><div class='ctx'> 		clear_bit(RESET_MARKER_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 		if (!(status = qla2x00_fw_ready(ha))) {</div><div class='ctx'> 			DEBUG(printk("%s(): Start configure loop, "</div><div class='del'>-			    "status = %d\n", __func__, status);)</div><div class='add'>+			    "status = %d\n", __func__, status));</div><div class='ctx'> </div><div class='ctx'> 			/* Issue a marker after FW becomes ready. */</div><div class='ctx'> 			qla2x00_marker(ha, 0, 0, MK_SYNC_ALL);</div><div class='hunk'>@@ -3201,7 +3260,7 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 		DEBUG(printk("%s(): Configure loop done, status = 0x%x\n",</div><div class='ctx'> 				__func__,</div><div class='del'>-				status);)</div><div class='add'>+				status));</div><div class='ctx'> 	}</div><div class='ctx'> 	return (status);</div><div class='ctx'> }</div><div class='hunk'>@@ -3321,7 +3380,6 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 		nv-&gt;node_name[6] = 0x55;</div><div class='ctx'> 		nv-&gt;node_name[7] = 0x86;</div><div class='ctx'> 		nv-&gt;login_retry_count = __constant_cpu_to_le16(8);</div><div class='del'>-		nv-&gt;link_down_timeout = __constant_cpu_to_le16(200);</div><div class='ctx'> 		nv-&gt;interrupt_delay_timer = __constant_cpu_to_le16(0);</div><div class='ctx'> 		nv-&gt;login_timeout = __constant_cpu_to_le16(0);</div><div class='ctx'> 		nv-&gt;firmware_options_1 =</div><div class='hunk'>@@ -3350,7 +3408,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 		*dptr1++ = *dptr2++;</div><div class='ctx'> </div><div class='ctx'> 	icb-&gt;login_retry_count = nv-&gt;login_retry_count;</div><div class='del'>-	icb-&gt;link_down_timeout = nv-&gt;link_down_timeout;</div><div class='add'>+	icb-&gt;link_down_on_nos = nv-&gt;link_down_on_nos;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy 2nd segment. */</div><div class='ctx'> 	dptr1 = (uint8_t *)&amp;icb-&gt;interrupt_delay_timer;</div><div class='hunk'>@@ -3383,8 +3441,14 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	} else</div><div class='ctx'> 		strcpy(ha-&gt;model_number, "QLA2462");</div><div class='ctx'> </div><div class='add'>+	/* Use alternate WWN? */</div><div class='add'>+	if (nv-&gt;host_p &amp; __constant_cpu_to_le32(BIT_15)) {</div><div class='add'>+		memcpy(icb-&gt;node_name, nv-&gt;alternate_node_name, WWN_SIZE);</div><div class='add'>+		memcpy(icb-&gt;port_name, nv-&gt;alternate_port_name, WWN_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Prepare nodename */</div><div class='del'>-	if ((icb-&gt;firmware_options_1 &amp; BIT_14) == 0) {</div><div class='add'>+	if ((icb-&gt;firmware_options_1 &amp; __constant_cpu_to_le32(BIT_14)) == 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Firmware will apply the following mask if the nodename was</div><div class='ctx'> 		 * not provided.</div><div class='hunk'>@@ -3399,9 +3463,10 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	ha-&gt;flags.enable_lip_full_login = 1;</div><div class='ctx'> 	ha-&gt;flags.enable_target_reset = 1;</div><div class='ctx'> 	ha-&gt;flags.enable_led_scheme = 0;</div><div class='add'>+	ha-&gt;flags.disable_serdes = le32_to_cpu(nv-&gt;host_p) &amp; BIT_5 ? 1: 0;</div><div class='ctx'> </div><div class='del'>-	ha-&gt;operating_mode =</div><div class='del'>-	    (icb-&gt;firmware_options_2 &amp; (BIT_6 | BIT_5 | BIT_4)) &gt;&gt; 4;</div><div class='add'>+	ha-&gt;operating_mode = (le32_to_cpu(icb-&gt;firmware_options_2) &amp;</div><div class='add'>+	    (BIT_6 | BIT_5 | BIT_4)) &gt;&gt; 4;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ha-&gt;fw_seriallink_options24, nv-&gt;seriallink_options,</div><div class='ctx'> 	    sizeof(ha-&gt;fw_seriallink_options24));</div><div class='hunk'>@@ -3498,134 +3563,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)</div><div class='ctx'> 	return (rval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE)</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-qla2x00_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='del'>-{</div><div class='del'>-	int	rval, num, i;</div><div class='del'>-	uint32_t cnt;</div><div class='del'>-	uint16_t *risc_code;</div><div class='del'>-	uint32_t risc_addr, risc_size;</div><div class='del'>-	uint16_t *req_ring;</div><div class='del'>-	struct qla_fw_info *fw_iter;</div><div class='del'>-</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-	/* Load firmware sequences */</div><div class='del'>-	fw_iter = ha-&gt;brd_info-&gt;fw_info;</div><div class='del'>-	*srisc_addr = *ha-&gt;brd_info-&gt;fw_info-&gt;fwstart;</div><div class='del'>-	while (fw_iter-&gt;addressing != FW_INFO_ADDR_NOMORE) {</div><div class='del'>-		risc_code = fw_iter-&gt;fwcode;</div><div class='del'>-		risc_size = *fw_iter-&gt;fwlen;</div><div class='del'>-		if (fw_iter-&gt;addressing == FW_INFO_ADDR_NORMAL)</div><div class='del'>-			risc_addr = *fw_iter-&gt;fwstart;</div><div class='del'>-		else</div><div class='del'>-			risc_addr = *fw_iter-&gt;lfwstart;</div><div class='del'>-</div><div class='del'>-		num = 0;</div><div class='del'>-		rval = 0;</div><div class='del'>-		while (risc_size &gt; 0 &amp;&amp; !rval) {</div><div class='del'>-			cnt = (uint16_t)(ha-&gt;fw_transfer_size &gt;&gt; 1);</div><div class='del'>-			if (cnt &gt; risc_size)</div><div class='del'>-				cnt = risc_size;</div><div class='del'>-</div><div class='del'>-			DEBUG7(printk("scsi(%ld): Loading risc segment@ "</div><div class='del'>-			    "addr %p, number of bytes 0x%x, offset 0x%lx.\n",</div><div class='del'>-			    ha-&gt;host_no, risc_code, cnt, risc_addr));</div><div class='del'>-</div><div class='del'>-			req_ring = (uint16_t *)ha-&gt;request_ring;</div><div class='del'>-			for (i = 0; i &lt; cnt; i++)</div><div class='del'>-				req_ring[i] = cpu_to_le16(risc_code[i]);</div><div class='del'>-</div><div class='del'>-			rval = qla2x00_load_ram(ha, ha-&gt;request_dma, risc_addr,</div><div class='del'>-			    cnt);</div><div class='del'>-			if (rval) {</div><div class='del'>-				DEBUG(printk("scsi(%ld): [ERROR] Failed to "</div><div class='del'>-				    "load segment %d of firmware\n",</div><div class='del'>-				    ha-&gt;host_no, num));</div><div class='del'>-				qla_printk(KERN_WARNING, ha,</div><div class='del'>-				    "[ERROR] Failed to load segment %d of "</div><div class='del'>-				    "firmware\n", num);</div><div class='del'>-</div><div class='del'>-				qla2x00_dump_regs(ha);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			risc_code += cnt;</div><div class='del'>-			risc_addr += cnt;</div><div class='del'>-			risc_size -= cnt;</div><div class='del'>-			num++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Next firmware sequence */</div><div class='del'>-		fw_iter++;</div><div class='del'>-	}</div><div class='del'>-	return rval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-qla24xx_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='del'>-{</div><div class='del'>-	int	rval, num, i;</div><div class='del'>-	uint32_t cnt;</div><div class='del'>-	uint32_t *risc_code;</div><div class='del'>-	uint32_t risc_addr, risc_size;</div><div class='del'>-	uint32_t *req_ring;</div><div class='del'>-	struct qla_fw_info *fw_iter;</div><div class='del'>-</div><div class='del'>-	rval = QLA_SUCCESS;</div><div class='del'>-</div><div class='del'>-	/* Load firmware sequences */</div><div class='del'>-	fw_iter = ha-&gt;brd_info-&gt;fw_info;</div><div class='del'>-	*srisc_addr = *((uint32_t *)fw_iter-&gt;lfwstart);</div><div class='del'>-	while (fw_iter-&gt;addressing != FW_INFO_ADDR_NOMORE) {</div><div class='del'>-		risc_code = (uint32_t *)fw_iter-&gt;fwcode;</div><div class='del'>-		risc_size = *((uint32_t *)fw_iter-&gt;fwlen);</div><div class='del'>-		risc_addr = *((uint32_t *)fw_iter-&gt;lfwstart);</div><div class='del'>-</div><div class='del'>-		num = 0;</div><div class='del'>-		rval = 0;</div><div class='del'>-		while (risc_size &gt; 0 &amp;&amp; !rval) {</div><div class='del'>-			cnt = (uint32_t)(ha-&gt;fw_transfer_size &gt;&gt; 2);</div><div class='del'>-			if (cnt &gt; risc_size)</div><div class='del'>-				cnt = risc_size;</div><div class='del'>-</div><div class='del'>-			DEBUG7(printk("scsi(%ld): Loading risc segment@ "</div><div class='del'>-			    "addr %p, number of bytes 0x%x, offset 0x%lx.\n",</div><div class='del'>-			    ha-&gt;host_no, risc_code, cnt, risc_addr));</div><div class='del'>-</div><div class='del'>-			req_ring = (uint32_t *)ha-&gt;request_ring;</div><div class='del'>-			for (i = 0; i &lt; cnt; i++)</div><div class='del'>-				req_ring[i] = cpu_to_le32(risc_code[i]);</div><div class='del'>-</div><div class='del'>-			rval = qla2x00_load_ram(ha, ha-&gt;request_dma, risc_addr,</div><div class='del'>-			    cnt);</div><div class='del'>-			if (rval) {</div><div class='del'>-				DEBUG(printk("scsi(%ld): [ERROR] Failed to "</div><div class='del'>-				    "load segment %d of firmware\n",</div><div class='del'>-				    ha-&gt;host_no, num));</div><div class='del'>-				qla_printk(KERN_WARNING, ha,</div><div class='del'>-				    "[ERROR] Failed to load segment %d of "</div><div class='del'>-				    "firmware\n", num);</div><div class='del'>-</div><div class='del'>-				qla2x00_dump_regs(ha);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			risc_code += cnt;</div><div class='del'>-			risc_addr += cnt;</div><div class='del'>-			risc_size -= cnt;</div><div class='del'>-			num++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Next firmware sequence */</div><div class='del'>-		fw_iter++;</div><div class='del'>-	}</div><div class='del'>-	return rval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='add'>+static int</div><div class='ctx'> qla24xx_load_risc_flash(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='ctx'> {</div><div class='ctx'> 	int	rval;</div><div class='hunk'>@@ -3707,7 +3645,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else	/* !defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE) */</div><div class='add'>+#define QLA_FW_URL "ftp://ftp.qlogic.com/outgoing/linux/firmware/"</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> qla2x00_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='hunk'>@@ -3722,6 +3660,8 @@ qla2x00_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='ctx'> 	blob = qla2x00_request_firmware(ha);</div><div class='ctx'> 	if (!blob) {</div><div class='ctx'> 		qla_printk(KERN_ERR, ha, "Firmware image unavailable.\n");</div><div class='add'>+		qla_printk(KERN_ERR, ha, "Firmware images can be retrieved "</div><div class='add'>+		    "from: " QLA_FW_URL ".\n");</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3823,7 +3763,13 @@ qla24xx_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='ctx'> 	blob = qla2x00_request_firmware(ha);</div><div class='ctx'> 	if (!blob) {</div><div class='ctx'> 		qla_printk(KERN_ERR, ha, "Firmware image unavailable.\n");</div><div class='del'>-		return QLA_FUNCTION_FAILED;</div><div class='add'>+		qla_printk(KERN_ERR, ha, "Firmware images can be retrieved "</div><div class='add'>+		    "from: " QLA_FW_URL ".\n");</div><div class='add'>+</div><div class='add'>+		/* Try to load RISC code from flash. */</div><div class='add'>+		qla_printk(KERN_ERR, ha, "Attempting to load (potentially "</div><div class='add'>+		    "outdated) firmware from flash.\n");</div><div class='add'>+		return qla24xx_load_risc_flash(ha, srisc_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='hunk'>@@ -3909,4 +3855,3 @@ qla24xx_load_risc(scsi_qla_host_t *ha, uint32_t *srisc_addr)</div><div class='ctx'> fail_fw_integrity:</div><div class='ctx'> 	return QLA_FUNCTION_FAILED;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c<br/>index 8f0f4a298357..2b60a27eff0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_iocb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_iocb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_iocb.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@ static inline uint16_t qla2x00_get_cmd_direction(struct scsi_cmnd *cmd);</div><div class='ctx'> static inline cont_entry_t *qla2x00_prep_cont_type0_iocb(scsi_qla_host_t *);</div><div class='ctx'> static inline cont_a64_entry_t *qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *);</div><div class='ctx'> static request_t *qla2x00_req_pkt(scsi_qla_host_t *ha);</div><div class='add'>+static void qla2x00_isp_cmd(scsi_qla_host_t *ha);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_get_cmd_direction() - Determine control_flag data direction.</div><div class='hunk'>@@ -408,7 +409,6 @@ qla2x00_start_scsi(srb_t *sp)</div><div class='ctx'> 		ha-&gt;request_ring_ptr++;</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;flags |= SRB_DMA_VALID;</div><div class='del'>-	sp-&gt;state = SRB_ACTIVE_STATE;</div><div class='ctx'> </div><div class='ctx'> 	/* Set chip new ring index. */</div><div class='ctx'> 	WRT_REG_WORD(ISP_REQ_Q_IN(ha, reg), ha-&gt;req_ring_index);</div><div class='hunk'>@@ -575,7 +575,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha)</div><div class='ctx'>  *</div><div class='ctx'>  * Note: The caller must hold the hardware lock before calling this routine.</div><div class='ctx'>  */</div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> qla2x00_isp_cmd(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='ctx'> 	device_reg_t __iomem *reg = ha-&gt;iobase;</div><div class='hunk'>@@ -838,7 +838,6 @@ qla24xx_start_scsi(srb_t *sp)</div><div class='ctx'> 		ha-&gt;request_ring_ptr++;</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;flags |= SRB_DMA_VALID;</div><div class='del'>-	sp-&gt;state = SRB_ACTIVE_STATE;</div><div class='ctx'> </div><div class='ctx'> 	/* Set chip new ring index. */</div><div class='ctx'> 	WRT_REG_DWORD(&amp;reg-&gt;req_q_in, ha-&gt;req_ring_index);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c<br/>index 2003dbb70579..795bf15b1b8f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_isr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_isr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_isr.c</a></div><div class='hunk'>@@ -395,10 +395,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 		set_bit(REGISTER_FC4_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;flags.management_server_logged_in = 0;</div><div class='del'>-</div><div class='del'>-		/* Update AEN queue. */</div><div class='del'>-		qla2x00_enqueue_aen(ha, MBA_LIP_OCCURRED, NULL);</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_LOOP_UP:		/* Loop Up Event */</div><div class='hunk'>@@ -418,9 +414,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 		    link_speed);</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;flags.management_server_logged_in = 0;</div><div class='del'>-</div><div class='del'>-		/* Update AEN queue. */</div><div class='del'>-		qla2x00_enqueue_aen(ha, MBA_LOOP_UP, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_LOOP_DOWN:		/* Loop Down Event */</div><div class='hunk'>@@ -439,9 +432,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> 		ha-&gt;link_data_rate = LDR_UNKNOWN;</div><div class='ctx'> 		if (ql2xfdmienable)</div><div class='ctx'> 			set_bit(REGISTER_FDMI_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-		/* Update AEN queue. */</div><div class='del'>-		qla2x00_enqueue_aen(ha, MBA_LOOP_DOWN, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_LIP_RESET:		/* LIP reset occurred */</div><div class='hunk'>@@ -460,10 +450,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> </div><div class='ctx'> 		ha-&gt;operating_mode = LOOP;</div><div class='ctx'> 		ha-&gt;flags.management_server_logged_in = 0;</div><div class='del'>-</div><div class='del'>-		/* Update AEN queue. */</div><div class='del'>-		qla2x00_enqueue_aen(ha, MBA_LIP_RESET, NULL);</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_POINT_TO_POINT:	/* Point-to-Point */</div><div class='hunk'>@@ -515,47 +501,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> </div><div class='ctx'> 	case MBA_PORT_UPDATE:		/* Port database update */</div><div class='ctx'> 		/*</div><div class='del'>-		 * If a single remote port just logged into (or logged out of)</div><div class='del'>-		 * us, create a new entry in our rscn fcports list and handle</div><div class='del'>-		 * the event like an RSCN.</div><div class='del'>-		 */</div><div class='del'>-		if (ql2xprocessrscn &amp;&amp;</div><div class='del'>-		    !IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha) &amp;&amp; !IS_QLA6312(ha) &amp;&amp;</div><div class='del'>-		    !IS_QLA6322(ha) &amp;&amp; !IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha) &amp;&amp;</div><div class='del'>-		    ha-&gt;flags.init_done &amp;&amp; mb[1] != 0xffff &amp;&amp;</div><div class='del'>-		    ((ha-&gt;operating_mode == P2P &amp;&amp; mb[1] != 0) ||</div><div class='del'>-		    (ha-&gt;operating_mode != P2P &amp;&amp; mb[1] !=</div><div class='del'>-			SNS_FIRST_LOOP_ID)) &amp;&amp; (mb[2] == 6 || mb[2] == 7)) {</div><div class='del'>-			int rval;</div><div class='del'>-			fc_port_t *rscn_fcport;</div><div class='del'>-</div><div class='del'>-			/* Create new fcport for login. */</div><div class='del'>-			rscn_fcport = qla2x00_alloc_rscn_fcport(ha, GFP_ATOMIC);</div><div class='del'>-			if (rscn_fcport) {</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Port Update -- "</div><div class='del'>-				    "creating RSCN fcport %p for %x/%x/%x.\n",</div><div class='del'>-				    ha-&gt;host_no, rscn_fcport, mb[1], mb[2],</div><div class='del'>-				    mb[3]));</div><div class='del'>-</div><div class='del'>-				rscn_fcport-&gt;loop_id = mb[1];</div><div class='del'>-				rscn_fcport-&gt;d_id.b24 = INVALID_PORT_ID;</div><div class='del'>-				atomic_set(&amp;rscn_fcport-&gt;state,</div><div class='del'>-				    FCS_DEVICE_LOST);</div><div class='del'>-				list_add_tail(&amp;rscn_fcport-&gt;list,</div><div class='del'>-				    &amp;ha-&gt;rscn_fcports);</div><div class='del'>-</div><div class='del'>-				rval = qla2x00_handle_port_rscn(ha, 0,</div><div class='del'>-				    rscn_fcport, 1);</div><div class='del'>-				if (rval == QLA_SUCCESS)</div><div class='del'>-					break;</div><div class='del'>-			} else {</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Port Update -- "</div><div class='del'>-				    "-- unable to allocate RSCN fcport "</div><div class='del'>-				    "login.\n", ha-&gt;host_no));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='ctx'> 		 * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET</div><div class='ctx'> 		 * event etc. earlier indicating loop is down) then process</div><div class='ctx'> 		 * it.  Otherwise ignore it and Wait for RSCN to come in.</div><div class='hunk'>@@ -586,9 +531,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> </div><div class='ctx'> 		set_bit(LOOP_RESYNC_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 		set_bit(LOCAL_LOOP_UPDATE, &amp;ha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-		/* Update AEN queue. */</div><div class='del'>-		qla2x00_enqueue_aen(ha, MBA_PORT_UPDATE, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case MBA_RSCN_UPDATE:		/* State Change Registration */</div><div class='hunk'>@@ -625,9 +567,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)</div><div class='ctx'> </div><div class='ctx'> 		set_bit(LOOP_RESYNC_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 		set_bit(RSCN_UPDATE, &amp;ha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-		/* Update AEN queue. */</div><div class='del'>-		qla2x00_enqueue_aen(ha, MBA_RSCN_UPDATE, &amp;mb[0]);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	/* case MBA_RIO_RESPONSE: */</div><div class='hunk'>@@ -753,25 +692,6 @@ qla2x00_process_response_queue(struct scsi_qla_host *ha)</div><div class='ctx'> 		case MS_IOCB_TYPE:</div><div class='ctx'> 			qla2x00_ms_entry(ha, (ms_iocb_entry_t *)pkt);</div><div class='ctx'> 			break;</div><div class='del'>-		case MBX_IOCB_TYPE:</div><div class='del'>-			if (!IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha) &amp;&amp;</div><div class='del'>-			    !IS_QLA6312(ha) &amp;&amp; !IS_QLA6322(ha)) {</div><div class='del'>-				if (pkt-&gt;sys_define == SOURCE_ASYNC_IOCB) {</div><div class='del'>-					qla2x00_process_iodesc(ha,</div><div class='del'>-					    (struct mbx_entry *)pkt);</div><div class='del'>-				} else {</div><div class='del'>-					/* MBX IOCB Type Not Supported. */</div><div class='del'>-					DEBUG4(printk(KERN_WARNING</div><div class='del'>-					    "scsi(%ld): Received unknown MBX "</div><div class='del'>-					    "IOCB response pkt type=%x "</div><div class='del'>-					    "source=%x entry status=%x.\n",</div><div class='del'>-					    ha-&gt;host_no, pkt-&gt;entry_type,</div><div class='del'>-					    pkt-&gt;sys_define,</div><div class='del'>-					    pkt-&gt;entry_status));</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/* Fallthrough. */</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* Type Not Supported. */</div><div class='ctx'> 			DEBUG4(printk(KERN_WARNING</div><div class='hunk'>@@ -805,7 +725,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> 	uint16_t	scsi_status;</div><div class='ctx'> 	uint8_t		lscsi_status;</div><div class='ctx'> 	int32_t		resid;</div><div class='del'>-	uint32_t	sense_len, rsp_info_len, resid_len;</div><div class='add'>+	uint32_t	sense_len, rsp_info_len, resid_len, fw_resid_len;</div><div class='ctx'> 	uint8_t		*rsp_info, *sense_data;</div><div class='ctx'> </div><div class='ctx'> 	sts = (sts_entry_t *) pkt;</div><div class='hunk'>@@ -844,8 +764,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> 	cp = sp-&gt;cmd;</div><div class='ctx'> 	if (cp == NULL) {</div><div class='ctx'> 		DEBUG2(printk("scsi(%ld): Command already returned back to OS "</div><div class='del'>-		    "pkt-&gt;handle=%d sp=%p sp-&gt;state:%d\n",</div><div class='del'>-		    ha-&gt;host_no, sts-&gt;handle, sp, sp-&gt;state));</div><div class='add'>+		    "pkt-&gt;handle=%d sp=%p.\n", ha-&gt;host_no, sts-&gt;handle, sp));</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Command is NULL: already returned to OS (sp=%p)\n", sp);</div><div class='ctx'> </div><div class='hunk'>@@ -859,11 +778,12 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> </div><div class='ctx'> 	fcport = sp-&gt;fcport;</div><div class='ctx'> </div><div class='del'>-	sense_len = rsp_info_len = resid_len = 0;</div><div class='add'>+	sense_len = rsp_info_len = resid_len = fw_resid_len = 0;</div><div class='ctx'> 	if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='ctx'> 		sense_len = le32_to_cpu(sts24-&gt;sense_len);</div><div class='ctx'> 		rsp_info_len = le32_to_cpu(sts24-&gt;rsp_data_len);</div><div class='ctx'> 		resid_len = le32_to_cpu(sts24-&gt;rsp_residual_count);</div><div class='add'>+		fw_resid_len = le32_to_cpu(sts24-&gt;residual_len);</div><div class='ctx'> 		rsp_info = sts24-&gt;data;</div><div class='ctx'> 		sense_data = sts24-&gt;data;</div><div class='ctx'> 		host_to_fcp_swap(sts24-&gt;data, sizeof(sts24-&gt;data));</div><div class='hunk'>@@ -963,14 +883,21 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)</div><div class='ctx'> </div><div class='ctx'> 	case CS_DATA_UNDERRUN:</div><div class='ctx'> 		resid = resid_len;</div><div class='add'>+		/* Use F/W calculated residual length. */</div><div class='add'>+		if (IS_QLA24XX(ha) || IS_QLA54XX(ha))</div><div class='add'>+			resid = fw_resid_len;</div><div class='add'>+</div><div class='ctx'> 		if (scsi_status &amp; SS_RESIDUAL_UNDER) {</div><div class='ctx'> 			cp-&gt;resid = resid;</div><div class='ctx'> 			CMD_RESID_LEN(cp) = resid;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			DEBUG2(printk(KERN_INFO</div><div class='ctx'> 			    "scsi(%ld:%d:%d) UNDERRUN status detected "</div><div class='del'>-			    "0x%x-0x%x.\n", ha-&gt;host_no, cp-&gt;device-&gt;id,</div><div class='del'>-			    cp-&gt;device-&gt;lun, comp_status, scsi_status));</div><div class='add'>+			    "0x%x-0x%x. resid=0x%x fw_resid=0x%x cdb=0x%x "</div><div class='add'>+			    "os_underflow=0x%x\n", ha-&gt;host_no,</div><div class='add'>+			    cp-&gt;device-&gt;id, cp-&gt;device-&gt;lun, comp_status,</div><div class='add'>+			    scsi_status, resid_len, resid, cp-&gt;cmnd[0],</div><div class='add'>+			    cp-&gt;underflow));</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1181,7 +1108,7 @@ qla2x00_status_cont_entry(scsi_qla_host_t *ha, sts_cont_entry_t *pkt)</div><div class='ctx'> 		cp = sp-&gt;cmd;</div><div class='ctx'> 		if (cp == NULL) {</div><div class='ctx'> 			DEBUG2(printk("%s(): Cmd already returned back to OS "</div><div class='del'>-			    "sp=%p sp-&gt;state:%d\n", __func__, sp, sp-&gt;state));</div><div class='add'>+			    "sp=%p.\n", __func__, sp));</div><div class='ctx'> 			qla_printk(KERN_INFO, ha,</div><div class='ctx'> 			    "cmd is NULL: already returned to OS (sp=%p)\n",</div><div class='ctx'> 			    sp);</div><div class='hunk'>@@ -1505,8 +1432,8 @@ qla24xx_ms_entry(scsi_qla_host_t *ha, struct ct_entry_24xx *pkt)</div><div class='ctx'> 	DEBUG3(printk("%s(%ld): pkt=%p pkthandle=%d.\n",</div><div class='ctx'> 	    __func__, ha-&gt;host_no, pkt, pkt-&gt;handle));</div><div class='ctx'> </div><div class='del'>-	DEBUG9(printk("%s: ct pkt dump:\n", __func__);)</div><div class='del'>-	DEBUG9(qla2x00_dump_buffer((void *)pkt, sizeof(struct ct_entry_24xx));)</div><div class='add'>+	DEBUG9(printk("%s: ct pkt dump:\n", __func__));</div><div class='add'>+	DEBUG9(qla2x00_dump_buffer((void *)pkt, sizeof(struct ct_entry_24xx)));</div><div class='ctx'> </div><div class='ctx'> 	/* Validate handle. */</div><div class='ctx'>  	if (pkt-&gt;handle &lt; MAX_OUTSTANDING_COMMANDS)</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c<br/>index d6cb3bd1a29a..879f281e2ea2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_mbx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_mbx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_mbx.c</a></div><div class='hunk'>@@ -13,13 +13,13 @@ qla2x00_mbx_sem_timeout(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	struct semaphore	*sem_ptr = (struct semaphore *)data;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("qla2x00_sem_timeout: entered.\n");)</div><div class='add'>+	DEBUG11(printk("qla2x00_sem_timeout: entered.\n"));</div><div class='ctx'> </div><div class='ctx'> 	if (sem_ptr != NULL) {</div><div class='ctx'> 		up(sem_ptr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("qla2x00_mbx_sem_timeout: exiting.\n");)</div><div class='add'>+	DEBUG11(printk("qla2x00_mbx_sem_timeout: exiting.\n"));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -61,7 +61,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 	rval = QLA_SUCCESS;</div><div class='ctx'> 	abort_active = test_bit(ABORT_ISP_ACTIVE, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wait for active mailbox commands to finish by waiting at most tov</div><div class='hunk'>@@ -72,7 +72,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		if (qla2x00_down_timeout(&amp;ha-&gt;mbx_cmd_sem, mcp-&gt;tov * HZ)) {</div><div class='ctx'> 			/* Timeout occurred. Return error. */</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): cmd access timeout. "</div><div class='del'>-			    "Exiting.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+			    "Exiting.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 			return QLA_FUNCTION_TIMEOUT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -86,7 +86,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		spin_lock_irqsave(&amp;ha-&gt;mbx_reg_lock, mbx_flags);</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("scsi(%ld): prepare to issue mbox cmd=0x%x.\n",</div><div class='del'>-	    ha-&gt;host_no, mcp-&gt;mb[0]);)</div><div class='add'>+	    ha-&gt;host_no, mcp-&gt;mb[0]));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -131,14 +131,14 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> </div><div class='ctx'> 	/* Unlock mbx registers and wait for interrupt */</div><div class='ctx'> 	DEBUG11(printk("%s(%ld): going to unlock irq &amp; waiting for interrupt. "</div><div class='del'>-	    "jiffies=%lx.\n", __func__, ha-&gt;host_no, jiffies);)</div><div class='add'>+	    "jiffies=%lx.\n", __func__, ha-&gt;host_no, jiffies));</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for mbx cmd completion until timeout */</div><div class='ctx'> </div><div class='ctx'> 	if (!abort_active &amp;&amp; io_lock_on) {</div><div class='ctx'> 		/* sleep on completion semaphore */</div><div class='ctx'> 		DEBUG11(printk("%s(%ld): INTERRUPT MODE. Initializing timer.\n",</div><div class='del'>-		    __func__, ha-&gt;host_no);)</div><div class='add'>+		    __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 		init_timer(&amp;tmp_intr_timer);</div><div class='ctx'> 		tmp_intr_timer.data = (unsigned long)&amp;ha-&gt;mbx_intr_sem;</div><div class='hunk'>@@ -147,11 +147,11 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		    (void (*)(unsigned long))qla2x00_mbx_sem_timeout;</div><div class='ctx'> </div><div class='ctx'> 		DEBUG11(printk("%s(%ld): Adding timer.\n", __func__,</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 		add_timer(&amp;tmp_intr_timer);</div><div class='ctx'> </div><div class='ctx'> 		DEBUG11(printk("%s(%ld): going to unlock &amp; sleep. "</div><div class='del'>-		    "time=0x%lx.\n", __func__, ha-&gt;host_no, jiffies);)</div><div class='add'>+		    "time=0x%lx.\n", __func__, ha-&gt;host_no, jiffies));</div><div class='ctx'> </div><div class='ctx'> 		set_bit(MBX_INTR_WAIT, &amp;ha-&gt;mbx_cmd_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -170,14 +170,14 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		down(&amp;ha-&gt;mbx_intr_sem);</div><div class='ctx'> </div><div class='ctx'> 		DEBUG11(printk("%s(%ld): waking up. time=0x%lx\n", __func__,</div><div class='del'>-		    ha-&gt;host_no, jiffies);)</div><div class='add'>+		    ha-&gt;host_no, jiffies));</div><div class='ctx'> 		clear_bit(MBX_INTR_WAIT, &amp;ha-&gt;mbx_cmd_flags);</div><div class='ctx'> </div><div class='ctx'> 		/* delete the timer */</div><div class='ctx'> 		del_timer(&amp;tmp_intr_timer);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DEBUG3_11(printk("%s(%ld): cmd=%x POLLING MODE.\n", __func__,</div><div class='del'>-		    ha-&gt;host_no, command);)</div><div class='add'>+		    ha-&gt;host_no, command));</div><div class='ctx'> </div><div class='ctx'> 		if (IS_QLA24XX(ha) || IS_QLA54XX(ha))</div><div class='ctx'> 			WRT_REG_DWORD(&amp;reg-&gt;isp24.hccr, HCCRX_SET_HOST_INT);</div><div class='hunk'>@@ -209,7 +209,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		uint16_t *iptr2;</div><div class='ctx'> </div><div class='ctx'> 		DEBUG3_11(printk("%s(%ld): cmd %x completed.\n", __func__,</div><div class='del'>-		    ha-&gt;host_no, command);)</div><div class='add'>+		    ha-&gt;host_no, command));</div><div class='ctx'> </div><div class='ctx'> 		/* Got interrupt. Clear the flag. */</div><div class='ctx'> 		ha-&gt;flags.mbox_int = 0;</div><div class='hunk'>@@ -266,7 +266,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> </div><div class='ctx'> 	if (!abort_active) {</div><div class='ctx'> 		DEBUG11(printk("%s(%ld): checking for additional resp "</div><div class='del'>-		    "interrupt.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		    "interrupt.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 		/* polling mode for non isp_abort commands. */</div><div class='ctx'> 		qla2x00_poll(ha);</div><div class='hunk'>@@ -277,9 +277,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		if (!io_lock_on || (mcp-&gt;flags &amp; IOCTL_CMD)) {</div><div class='ctx'> 			/* not in dpc. schedule it for dpc to take over. */</div><div class='ctx'> 			DEBUG(printk("%s(%ld): timeout schedule "</div><div class='del'>-			    "isp_abort_needed.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+			    "isp_abort_needed.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): timeout schedule "</div><div class='del'>-			    "isp_abort_needed.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+			    "isp_abort_needed.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 			qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 			    "Mailbox command timeout occured. Scheduling ISP "</div><div class='ctx'> 			    "abort.\n");</div><div class='hunk'>@@ -288,9 +288,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 		} else if (!abort_active) {</div><div class='ctx'> 			/* call abort directly since we are in the DPC thread */</div><div class='ctx'> 			DEBUG(printk("%s(%ld): timeout calling abort_isp\n",</div><div class='del'>-			    __func__, ha-&gt;host_no);)</div><div class='add'>+			    __func__, ha-&gt;host_no));</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): timeout calling "</div><div class='del'>-			    "abort_isp\n", __func__, ha-&gt;host_no);)</div><div class='add'>+			    "abort_isp\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 			qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 			    "Mailbox command timeout occured. Issuing ISP "</div><div class='ctx'> 			    "abort.\n");</div><div class='hunk'>@@ -303,9 +303,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 			}</div><div class='ctx'> 			clear_bit(ABORT_ISP_ACTIVE, &amp;ha-&gt;dpc_flags);</div><div class='ctx'> 			DEBUG(printk("%s(%ld): finished abort_isp\n", __func__,</div><div class='del'>-			    ha-&gt;host_no);)</div><div class='add'>+			    ha-&gt;host_no));</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): finished abort_isp\n",</div><div class='del'>-			    __func__, ha-&gt;host_no);)</div><div class='add'>+			    __func__, ha-&gt;host_no));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -316,9 +316,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)</div><div class='ctx'> 	if (rval) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): **** FAILED. mbx0=%x, mbx1=%x, "</div><div class='ctx'> 		    "mbx2=%x, cmd=%x ****\n", __func__, ha-&gt;host_no,</div><div class='del'>-		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2], command);)</div><div class='add'>+		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2], command));</div><div class='ctx'> 	} else {</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -394,7 +394,7 @@ qla2x00_execute_fw(scsi_qla_host_t *ha, uint32_t risc_addr)</div><div class='ctx'> 	mbx_cmd_t mc;</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_EXECUTE_FIRMWARE;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='hunk'>@@ -424,10 +424,10 @@ qla2x00_execute_fw(scsi_qla_host_t *ha, uint32_t risc_addr)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='ctx'> 			DEBUG11(printk("%s(%ld): done exchanges=%x.\n",</div><div class='del'>-			    __func__, ha-&gt;host_no, mcp-&gt;mb[1]);)</div><div class='add'>+			    __func__, ha-&gt;host_no, mcp-&gt;mb[1]));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			DEBUG11(printk("%s(%ld): done.\n", __func__,</div><div class='del'>-			    ha-&gt;host_no);)</div><div class='add'>+			    ha-&gt;host_no));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -611,7 +611,7 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *ha)</div><div class='ctx'> 	mbx_cmd_t mc;</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("qla2x00_mbx_reg_test(%ld): entered.\n", ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("qla2x00_mbx_reg_test(%ld): entered.\n", ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_MAILBOX_REGISTER_TEST;</div><div class='ctx'> 	mcp-&gt;mb[1] = 0xAAAA;</div><div class='hunk'>@@ -639,11 +639,11 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *ha)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_mbx_reg_test(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_mbx_reg_test(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -671,7 +671,7 @@ qla2x00_verify_checksum(scsi_qla_host_t *ha, uint32_t risc_addr)</div><div class='ctx'> 	mbx_cmd_t mc;</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_VERIFY_CHECKSUM;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='hunk'>@@ -694,9 +694,9 @@ qla2x00_verify_checksum(scsi_qla_host_t *ha, uint32_t risc_addr)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed=%x chk sum=%x.\n", __func__,</div><div class='ctx'> 		    ha-&gt;host_no, rval, (IS_QLA24XX(ha) || IS_QLA54XX(ha) ?</div><div class='del'>-		    (mcp-&gt;mb[2] &lt;&lt; 16) | mcp-&gt;mb[1]: mcp-&gt;mb[1]));)</div><div class='add'>+		    (mcp-&gt;mb[2] &lt;&lt; 16) | mcp-&gt;mb[1]: mcp-&gt;mb[1])));</div><div class='ctx'> 	} else {</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -743,9 +743,9 @@ qla2x00_issue_iocb(scsi_qla_host_t *ha, void*  buffer, dma_addr_t phys_addr,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG(printk("qla2x00_issue_iocb(%ld): failed rval 0x%x\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 		DEBUG2(printk("qla2x00_issue_iocb(%ld): failed rval 0x%x\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sts_entry_t *sts_entry = (sts_entry_t *) buffer;</div><div class='ctx'> </div><div class='hunk'>@@ -781,7 +781,7 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)</div><div class='ctx'> 	mbx_cmd_t	mc;</div><div class='ctx'> 	mbx_cmd_t	*mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("qla2x00_abort_command(%ld): entered.\n", ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("qla2x00_abort_command(%ld): entered.\n", ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	fcport = sp-&gt;fcport;</div><div class='ctx'> </div><div class='hunk'>@@ -813,11 +813,11 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)</div><div class='ctx'> </div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_abort_command(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sp-&gt;flags |= SRB_ABORT_PENDING;</div><div class='ctx'> 		DEBUG11(printk("qla2x00_abort_command(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -848,7 +848,7 @@ qla2x00_abort_target(fc_port_t *fcport)</div><div class='ctx'> 	if (fcport == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, fcport-&gt;ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, fcport-&gt;ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	ha = fcport-&gt;ha;</div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_ABORT_TARGET;</div><div class='hunk'>@@ -872,11 +872,11 @@ qla2x00_abort_target(fc_port_t *fcport)</div><div class='ctx'> </div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_abort_target(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_abort_target(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -912,7 +912,7 @@ qla2x00_get_adapter_id(scsi_qla_host_t *ha, uint16_t *id, uint8_t *al_pa,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_get_adapter_id(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_GET_ADAPTER_LOOP_ID;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='hunk'>@@ -933,11 +933,11 @@ qla2x00_get_adapter_id(scsi_qla_host_t *ha, uint16_t *id, uint8_t *al_pa,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_get_adapter_id(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_get_adapter_id(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -968,7 +968,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *ha, uint8_t *retry_cnt, uint8_t *tov,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_get_retry_cnt(%ld): entered.\n",</div><div class='del'>-			ha-&gt;host_no);)</div><div class='add'>+			ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_GET_RETRY_COUNT;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='hunk'>@@ -980,7 +980,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *ha, uint8_t *retry_cnt, uint8_t *tov,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_get_retry_cnt(%ld): failed = %x.\n",</div><div class='del'>-		    ha-&gt;host_no, mcp-&gt;mb[0]);)</div><div class='add'>+		    ha-&gt;host_no, mcp-&gt;mb[0]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Convert returned data and check our values. */</div><div class='ctx'> 		*r_a_tov = mcp-&gt;mb[3] / 2;</div><div class='hunk'>@@ -992,7 +992,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *ha, uint8_t *retry_cnt, uint8_t *tov,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		DEBUG11(printk("qla2x00_get_retry_cnt(%ld): done. mb3=%d "</div><div class='del'>-		    "ratov=%d.\n", ha-&gt;host_no, mcp-&gt;mb[3], ratov);)</div><div class='add'>+		    "ratov=%d.\n", ha-&gt;host_no, mcp-&gt;mb[3], ratov));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1023,7 +1023,7 @@ qla2x00_init_firmware(scsi_qla_host_t *ha, uint16_t size)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_init_firmware(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_INITIALIZE_FIRMWARE;</div><div class='ctx'> 	mcp-&gt;mb[2] = MSW(ha-&gt;init_cb_dma);</div><div class='hunk'>@@ -1043,11 +1043,11 @@ qla2x00_init_firmware(scsi_qla_host_t *ha, uint16_t size)</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_init_firmware(%ld): failed=%x "</div><div class='ctx'> 		    "mb0=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval, mcp-&gt;mb[0]);)</div><div class='add'>+		    ha-&gt;host_no, rval, mcp-&gt;mb[0]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_init_firmware(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1079,7 +1079,7 @@ qla2x00_get_port_database(scsi_qla_host_t *ha, fc_port_t *fcport, uint8_t opt)</div><div class='ctx'> 	struct port_database_24xx *pd24;</div><div class='ctx'> 	dma_addr_t pd_dma;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	pd24 = NULL;</div><div class='ctx'> 	pd = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;pd_dma);</div><div class='hunk'>@@ -1220,7 +1220,7 @@ qla2x00_get_firmware_state(scsi_qla_host_t *ha, uint16_t *dptr)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_get_firmware_state(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_GET_FIRMWARE_STATE;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_0;</div><div class='hunk'>@@ -1235,11 +1235,11 @@ qla2x00_get_firmware_state(scsi_qla_host_t *ha, uint16_t *dptr)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_get_firmware_state(%ld): "</div><div class='del'>-		    "failed=%x.\n", ha-&gt;host_no, rval);)</div><div class='add'>+		    "failed=%x.\n", ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_get_firmware_state(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1272,7 +1272,7 @@ qla2x00_get_port_name(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t *name,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_get_port_name(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_GET_PORT_NAME;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_1|MBX_0;</div><div class='hunk'>@@ -1292,7 +1292,7 @@ qla2x00_get_port_name(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t *name,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_get_port_name(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (name != NULL) {</div><div class='ctx'> 			/* This function returns name in big endian. */</div><div class='hunk'>@@ -1307,7 +1307,7 @@ qla2x00_get_port_name(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t *name,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		DEBUG11(printk("qla2x00_get_port_name(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1335,7 +1335,7 @@ qla2x00_lip_reset(scsi_qla_host_t *ha)</div><div class='ctx'> 	mbx_cmd_t mc;</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='ctx'> 		mcp-&gt;mb[0] = MBC_LIP_FULL_LOGIN;</div><div class='hunk'>@@ -1364,10 +1364,10 @@ qla2x00_lip_reset(scsi_qla_host_t *ha)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",</div><div class='del'>-		    __func__, ha-&gt;host_no, rval);)</div><div class='add'>+		    __func__, ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1400,10 +1400,10 @@ qla2x00_send_sns(scsi_qla_host_t *ha, dma_addr_t sns_phys_address,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_send_sns(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_send_sns: retry cnt=%d ratov=%d total "</div><div class='del'>-	    "tov=%d.\n", ha-&gt;retry_count, ha-&gt;login_timeout, mcp-&gt;tov);)</div><div class='add'>+	    "tov=%d.\n", ha-&gt;retry_count, ha-&gt;login_timeout, mcp-&gt;tov));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_SEND_SNS_COMMAND;</div><div class='ctx'> 	mcp-&gt;mb[1] = cmd_size;</div><div class='hunk'>@@ -1421,12 +1421,12 @@ qla2x00_send_sns(scsi_qla_host_t *ha, dma_addr_t sns_phys_address,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG(printk("qla2x00_send_sns(%ld): failed=%x mb[0]=%x "</div><div class='del'>-		    "mb[1]=%x.\n", ha-&gt;host_no, rval, mcp-&gt;mb[0], mcp-&gt;mb[1]);)</div><div class='add'>+		    "mb[1]=%x.\n", ha-&gt;host_no, rval, mcp-&gt;mb[0], mcp-&gt;mb[1]));</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_send_sns(%ld): failed=%x mb[0]=%x "</div><div class='del'>-		    "mb[1]=%x.\n", ha-&gt;host_no, rval, mcp-&gt;mb[0], mcp-&gt;mb[1]);)</div><div class='add'>+		    "mb[1]=%x.\n", ha-&gt;host_no, rval, mcp-&gt;mb[0], mcp-&gt;mb[1]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='del'>-		DEBUG11(printk("qla2x00_send_sns(%ld): done.\n", ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("qla2x00_send_sns(%ld): done.\n", ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1442,7 +1442,7 @@ qla24xx_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	dma_addr_t	lg_dma;</div><div class='ctx'> 	uint32_t	iop[2];</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	lg = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;lg_dma);</div><div class='ctx'> 	if (lg == NULL) {</div><div class='hunk'>@@ -1458,13 +1458,15 @@ qla24xx_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	lg-&gt;control_flags = __constant_cpu_to_le16(LCF_COMMAND_PLOGI);</div><div class='ctx'> 	if (opt &amp; BIT_0)</div><div class='ctx'> 		lg-&gt;control_flags |= __constant_cpu_to_le16(LCF_COND_PLOGI);</div><div class='add'>+	if (opt &amp; BIT_1)</div><div class='add'>+		lg-&gt;control_flags |= __constant_cpu_to_le16(LCF_SKIP_PRLI);</div><div class='ctx'> 	lg-&gt;port_id[0] = al_pa;</div><div class='ctx'> 	lg-&gt;port_id[1] = area;</div><div class='ctx'> 	lg-&gt;port_id[2] = domain;</div><div class='ctx'> 	rval = qla2x00_issue_iocb(ha, lg, lg_dma, 0);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to issue Login IOCB "</div><div class='del'>-		    "(%x).\n", __func__, ha-&gt;host_no, rval);)</div><div class='add'>+		    "(%x).\n", __func__, ha-&gt;host_no, rval));</div><div class='ctx'> 	} else if (lg-&gt;entry_status != 0) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to complete IOCB "</div><div class='ctx'> 		    "-- error status (%x).\n", __func__, ha-&gt;host_no,</div><div class='hunk'>@@ -1505,7 +1507,7 @@ qla24xx_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 		iop[0] = le32_to_cpu(lg-&gt;io_parameter[0]);</div><div class='ctx'> </div><div class='hunk'>@@ -1559,7 +1561,7 @@ qla2x00_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	mbx_cmd_t mc;</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("qla2x00_login_fabric(%ld): entered.\n", ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("qla2x00_login_fabric(%ld): entered.\n", ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_LOGIN_FABRIC_PORT;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='hunk'>@@ -1604,11 +1606,11 @@ qla2x00_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_login_fabric(%ld): failed=%x "</div><div class='ctx'> 		    "mb[0]=%x mb[1]=%x mb[2]=%x.\n", ha-&gt;host_no, rval,</div><div class='del'>-		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2]);)</div><div class='add'>+		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[2]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_login_fabric(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1643,7 +1645,7 @@ qla2x00_login_local_device(scsi_qla_host_t *ha, fc_port_t *fcport,</div><div class='ctx'> 		    fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='ctx'> 		    fcport-&gt;d_id.b.al_pa, mb_ret, opt);</div><div class='ctx'> </div><div class='del'>-	DEBUG3(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG3(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_LOGIN_LOOP_PORT;</div><div class='ctx'> 	if (HAS_EXTENDED_IDS(ha))</div><div class='hunk'>@@ -1677,13 +1679,13 @@ qla2x00_login_local_device(scsi_qla_host_t *ha, fc_port_t *fcport,</div><div class='ctx'> </div><div class='ctx'> 		DEBUG(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x "</div><div class='ctx'> 		    "mb[6]=%x mb[7]=%x.\n", __func__, ha-&gt;host_no, rval,</div><div class='del'>-		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[6], mcp-&gt;mb[7]);)</div><div class='add'>+		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[6], mcp-&gt;mb[7]));</div><div class='ctx'> 		DEBUG2_3(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x "</div><div class='ctx'> 		    "mb[6]=%x mb[7]=%x.\n", __func__, ha-&gt;host_no, rval,</div><div class='del'>-		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[6], mcp-&gt;mb[7]);)</div><div class='add'>+		    mcp-&gt;mb[0], mcp-&gt;mb[1], mcp-&gt;mb[6], mcp-&gt;mb[7]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='del'>-		DEBUG3(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG3(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (rval);</div><div class='hunk'>@@ -1697,7 +1699,7 @@ qla24xx_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	struct logio_entry_24xx *lg;</div><div class='ctx'> 	dma_addr_t	lg_dma;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	lg = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;lg_dma);</div><div class='ctx'> 	if (lg == NULL) {</div><div class='hunk'>@@ -1718,7 +1720,7 @@ qla24xx_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	rval = qla2x00_issue_iocb(ha, lg, lg_dma, 0);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to issue Logout IOCB "</div><div class='del'>-		    "(%x).\n", __func__, ha-&gt;host_no, rval);)</div><div class='add'>+		    "(%x).\n", __func__, ha-&gt;host_no, rval));</div><div class='ctx'> 	} else if (lg-&gt;entry_status != 0) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to complete IOCB "</div><div class='ctx'> 		    "-- error status (%x).\n", __func__, ha-&gt;host_no,</div><div class='hunk'>@@ -1729,10 +1731,10 @@ qla24xx_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 		    "-- completion status (%x)  ioparam=%x/%x.\n", __func__,</div><div class='ctx'> 		    ha-&gt;host_no, le16_to_cpu(lg-&gt;comp_status),</div><div class='ctx'> 		    le32_to_cpu(lg-&gt;io_parameter[0]),</div><div class='del'>-		    le32_to_cpu(lg-&gt;io_parameter[1]));)</div><div class='add'>+		    le32_to_cpu(lg-&gt;io_parameter[1])));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_pool_free(ha-&gt;s_dma_pool, lg, lg_dma);</div><div class='hunk'>@@ -1765,7 +1767,7 @@ qla2x00_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_fabric_logout(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_LOGOUT_FABRIC_PORT;</div><div class='ctx'> 	mcp-&gt;out_mb = MBX_1|MBX_0;</div><div class='hunk'>@@ -1785,11 +1787,11 @@ qla2x00_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_fabric_logout(%ld): failed=%x "</div><div class='del'>-		    "mbx1=%x.\n", ha-&gt;host_no, rval, mcp-&gt;mb[1]);)</div><div class='add'>+		    "mbx1=%x.\n", ha-&gt;host_no, rval, mcp-&gt;mb[1]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_fabric_logout(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1818,7 +1820,7 @@ qla2x00_full_login_lip(scsi_qla_host_t *ha)</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_full_login_lip(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	mcp-&gt;mb[0] = MBC_LIP_FULL_LOGIN;</div><div class='ctx'> 	mcp-&gt;mb[1] = 0;</div><div class='hunk'>@@ -1833,11 +1835,11 @@ qla2x00_full_login_lip(scsi_qla_host_t *ha)</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_full_login_lip(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG11(printk("qla2x00_full_login_lip(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1864,7 +1866,7 @@ qla2x00_get_id_list(scsi_qla_host_t *ha, void *id_list, dma_addr_t id_list_dma,</div><div class='ctx'> 	mbx_cmd_t *mcp = &amp;mc;</div><div class='ctx'> </div><div class='ctx'> 	DEBUG11(printk("qla2x00_get_id_list(%ld): entered.\n",</div><div class='del'>-	    ha-&gt;host_no);)</div><div class='add'>+	    ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	if (id_list == NULL)</div><div class='ctx'> 		return QLA_FUNCTION_FAILED;</div><div class='hunk'>@@ -1893,11 +1895,11 @@ qla2x00_get_id_list(scsi_qla_host_t *ha, void *id_list, dma_addr_t id_list_dma,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("qla2x00_get_id_list(%ld): failed=%x.\n",</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*entries = mcp-&gt;mb[1];</div><div class='ctx'> 		DEBUG11(printk("qla2x00_get_id_list(%ld): done.\n",</div><div class='del'>-		    ha-&gt;host_no);)</div><div class='add'>+		    ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='hunk'>@@ -1936,7 +1938,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *ha, uint16_t *cur_xchg_cnt,</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		/*EMPTY*/</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed = %x.\n", __func__,</div><div class='del'>-		    ha-&gt;host_no, mcp-&gt;mb[0]);)</div><div class='add'>+		    ha-&gt;host_no, mcp-&gt;mb[0]));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DEBUG11(printk("%s(%ld): done. mb1=%x mb2=%x mb3=%x mb6=%x "</div><div class='ctx'> 		    "mb7=%x mb10=%x.\n", __func__, ha-&gt;host_no,</div><div class='hunk'>@@ -2045,7 +2047,7 @@ qla2x00_get_link_status(scsi_qla_host_t *ha, uint16_t loop_id,</div><div class='ctx'> 	link_stat_t *stat_buf;</div><div class='ctx'> 	dma_addr_t stat_buf_dma;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	stat_buf = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_ATOMIC, &amp;stat_buf_dma);</div><div class='ctx'> 	if (stat_buf == NULL) {</div><div class='hunk'>@@ -2083,7 +2085,7 @@ qla2x00_get_link_status(scsi_qla_host_t *ha, uint16_t loop_id,</div><div class='ctx'> 	if (rval == QLA_SUCCESS) {</div><div class='ctx'> 		if (mcp-&gt;mb[0] != MBS_COMMAND_COMPLETE) {</div><div class='ctx'> 			DEBUG2_3_11(printk("%s(%ld): cmd failed. mbx0=%x.\n",</div><div class='del'>-			    __func__, ha-&gt;host_no, mcp-&gt;mb[0]);)</div><div class='add'>+			    __func__, ha-&gt;host_no, mcp-&gt;mb[0]));</div><div class='ctx'> 			status[0] = mcp-&gt;mb[0];</div><div class='ctx'> 			rval = BIT_1;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2108,12 +2110,12 @@ qla2x00_get_link_status(scsi_qla_host_t *ha, uint16_t loop_id,</div><div class='ctx'> 			    stat_buf-&gt;loss_sync_cnt, stat_buf-&gt;loss_sig_cnt,</div><div class='ctx'> 			    stat_buf-&gt;prim_seq_err_cnt,</div><div class='ctx'> 			    stat_buf-&gt;inval_xmit_word_cnt,</div><div class='del'>-			    stat_buf-&gt;inval_crc_cnt);)</div><div class='add'>+			    stat_buf-&gt;inval_crc_cnt));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Failed. */</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,</div><div class='del'>-		    ha-&gt;host_no, rval);)</div><div class='add'>+		    ha-&gt;host_no, rval));</div><div class='ctx'> 		rval = BIT_1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2132,7 +2134,7 @@ qla24xx_get_isp_stats(scsi_qla_host_t *ha, uint32_t *dwbuf, uint32_t dwords,</div><div class='ctx'> 	uint32_t *sbuf, *siter;</div><div class='ctx'> 	dma_addr_t sbuf_dma;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	if (dwords &gt; (DMA_POOL_SIZE / 4)) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): Unabled to retrieve %d DWORDs "</div><div class='hunk'>@@ -2196,7 +2198,7 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)</div><div class='ctx'> 	dma_addr_t	abt_dma;</div><div class='ctx'> 	uint32_t	handle;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	fcport = sp-&gt;fcport;</div><div class='ctx'> </div><div class='hunk'>@@ -2229,7 +2231,7 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)</div><div class='ctx'> 	rval = qla2x00_issue_iocb(ha, abt, abt_dma, 0);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to issue IOCB (%x).\n",</div><div class='del'>-		    __func__, ha-&gt;host_no, rval);)</div><div class='add'>+		    __func__, ha-&gt;host_no, rval));</div><div class='ctx'> 	} else if (abt-&gt;entry_status != 0) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to complete IOCB "</div><div class='ctx'> 		    "-- error status (%x).\n", __func__, ha-&gt;host_no,</div><div class='hunk'>@@ -2238,10 +2240,10 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)</div><div class='ctx'> 	} else if (abt-&gt;nport_handle != __constant_cpu_to_le16(0)) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to complete IOCB "</div><div class='ctx'> 		    "-- completion status (%x).\n", __func__, ha-&gt;host_no,</div><div class='del'>-		    le16_to_cpu(abt-&gt;nport_handle));)</div><div class='add'>+		    le16_to_cpu(abt-&gt;nport_handle)));</div><div class='ctx'> 		rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 	} else {</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 		sp-&gt;flags |= SRB_ABORT_PENDING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2268,7 +2270,7 @@ qla24xx_abort_target(fc_port_t *fcport)</div><div class='ctx'> 	if (fcport == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	DEBUG11(printk("%s(%ld): entered.\n", __func__, fcport-&gt;ha-&gt;host_no);)</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, fcport-&gt;ha-&gt;host_no));</div><div class='ctx'> </div><div class='ctx'> 	ha = fcport-&gt;ha;</div><div class='ctx'> 	tsk = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL, &amp;tsk_dma);</div><div class='hunk'>@@ -2290,7 +2292,7 @@ qla24xx_abort_target(fc_port_t *fcport)</div><div class='ctx'> 	rval = qla2x00_issue_iocb(ha, tsk, tsk_dma, 0);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to issue Target Reset IOCB "</div><div class='del'>-		    "(%x).\n", __func__, ha-&gt;host_no, rval);)</div><div class='add'>+		    "(%x).\n", __func__, ha-&gt;host_no, rval));</div><div class='ctx'> 		goto atarget_done;</div><div class='ctx'> 	} else if (tsk-&gt;p.sts.entry_status != 0) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to complete IOCB "</div><div class='hunk'>@@ -2302,7 +2304,7 @@ qla24xx_abort_target(fc_port_t *fcport)</div><div class='ctx'> 	    __constant_cpu_to_le16(CS_COMPLETE)) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to complete IOCB "</div><div class='ctx'> 		    "-- completion status (%x).\n", __func__,</div><div class='del'>-		    ha-&gt;host_no, le16_to_cpu(tsk-&gt;p.sts.comp_status));)</div><div class='add'>+		    ha-&gt;host_no, le16_to_cpu(tsk-&gt;p.sts.comp_status)));</div><div class='ctx'> 		rval = QLA_FUNCTION_FAILED;</div><div class='ctx'> 		goto atarget_done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2311,9 +2313,9 @@ qla24xx_abort_target(fc_port_t *fcport)</div><div class='ctx'> 	rval = qla2x00_marker(ha, fcport-&gt;loop_id, 0, MK_SYNC_ID);</div><div class='ctx'> 	if (rval != QLA_SUCCESS) {</div><div class='ctx'> 		DEBUG2_3_11(printk("%s(%ld): failed to issue Marker IOCB "</div><div class='del'>-		    "(%x).\n", __func__, ha-&gt;host_no, rval);)</div><div class='add'>+		    "(%x).\n", __func__, ha-&gt;host_no, rval));</div><div class='ctx'> 	} else {</div><div class='del'>-		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no);)</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> atarget_done:</div><div class='hunk'>@@ -2460,3 +2462,81 @@ qla2x00_stop_firmware(scsi_qla_host_t *ha)</div><div class='ctx'> </div><div class='ctx'> 	return rval;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+qla2x00_trace_control(scsi_qla_host_t *ha, uint16_t ctrl, dma_addr_t eft_dma,</div><div class='add'>+    uint16_t buffers)</div><div class='add'>+{</div><div class='add'>+	int rval;</div><div class='add'>+	mbx_cmd_t mc;</div><div class='add'>+	mbx_cmd_t *mcp = &amp;mc;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha))</div><div class='add'>+		return QLA_FUNCTION_FAILED;</div><div class='add'>+</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='add'>+</div><div class='add'>+	mcp-&gt;mb[0] = MBC_TRACE_CONTROL;</div><div class='add'>+	mcp-&gt;mb[1] = ctrl;</div><div class='add'>+	mcp-&gt;out_mb = MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_1|MBX_0;</div><div class='add'>+	if (ctrl == TC_ENABLE) {</div><div class='add'>+		mcp-&gt;mb[2] = LSW(eft_dma);</div><div class='add'>+		mcp-&gt;mb[3] = MSW(eft_dma);</div><div class='add'>+		mcp-&gt;mb[4] = LSW(MSD(eft_dma));</div><div class='add'>+		mcp-&gt;mb[5] = MSW(MSD(eft_dma));</div><div class='add'>+		mcp-&gt;mb[6] = buffers;</div><div class='add'>+		mcp-&gt;mb[7] = buffers;</div><div class='add'>+		mcp-&gt;out_mb |= MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2;</div><div class='add'>+	}</div><div class='add'>+	mcp-&gt;tov = 30;</div><div class='add'>+	mcp-&gt;flags = 0;</div><div class='add'>+	rval = qla2x00_mailbox_command(ha, mcp);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x.\n",</div><div class='add'>+		    __func__, ha-&gt;host_no, rval, mcp-&gt;mb[0], mcp-&gt;mb[1]));</div><div class='add'>+	} else {</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+qla2x00_read_sfp(scsi_qla_host_t *ha, dma_addr_t sfp_dma, uint16_t addr,</div><div class='add'>+    uint16_t off, uint16_t count)</div><div class='add'>+{</div><div class='add'>+	int rval;</div><div class='add'>+	mbx_cmd_t mc;</div><div class='add'>+	mbx_cmd_t *mcp = &amp;mc;</div><div class='add'>+</div><div class='add'>+	if (!IS_QLA24XX(ha) &amp;&amp; !IS_QLA54XX(ha))</div><div class='add'>+		return QLA_FUNCTION_FAILED;</div><div class='add'>+</div><div class='add'>+	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha-&gt;host_no));</div><div class='add'>+</div><div class='add'>+	mcp-&gt;mb[0] = MBC_READ_SFP;</div><div class='add'>+	mcp-&gt;mb[1] = addr;</div><div class='add'>+	mcp-&gt;mb[2] = MSW(sfp_dma);</div><div class='add'>+	mcp-&gt;mb[3] = LSW(sfp_dma);</div><div class='add'>+	mcp-&gt;mb[6] = MSW(MSD(sfp_dma));</div><div class='add'>+	mcp-&gt;mb[7] = LSW(MSD(sfp_dma));</div><div class='add'>+	mcp-&gt;mb[8] = count;</div><div class='add'>+	mcp-&gt;mb[9] = off;</div><div class='add'>+	mcp-&gt;mb[10] = 0;</div><div class='add'>+	mcp-&gt;out_mb = MBX_10|MBX_9|MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;</div><div class='add'>+	mcp-&gt;in_mb = MBX_0;</div><div class='add'>+	mcp-&gt;tov = 30;</div><div class='add'>+	mcp-&gt;flags = 0;</div><div class='add'>+	rval = qla2x00_mailbox_command(ha, mcp);</div><div class='add'>+</div><div class='add'>+	if (rval != QLA_SUCCESS) {</div><div class='add'>+		DEBUG2_3_11(printk("%s(%ld): failed=%x (%x).\n", __func__,</div><div class='add'>+		    ha-&gt;host_no, rval, mcp-&gt;mb[0]));</div><div class='add'>+	} else {</div><div class='add'>+		DEBUG11(printk("%s(%ld): done.\n", __func__, ha-&gt;host_no));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rval;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c<br/>index 584fe5d8e507..ec7ebb6037e6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_os.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_os.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_os.c</a></div><div class='hunk'>@@ -39,14 +39,14 @@ MODULE_PARM_DESC(ql2xlogintimeout,</div><div class='ctx'> int qlport_down_retry = 30;</div><div class='ctx'> module_param(qlport_down_retry, int, S_IRUGO|S_IRUSR);</div><div class='ctx'> MODULE_PARM_DESC(qlport_down_retry,</div><div class='del'>-		"Maximum number of command retries to a port that returns"</div><div class='add'>+		"Maximum number of command retries to a port that returns "</div><div class='ctx'> 		"a PORT-DOWN status.");</div><div class='ctx'> </div><div class='ctx'> int ql2xplogiabsentdevice;</div><div class='ctx'> module_param(ql2xplogiabsentdevice, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql2xplogiabsentdevice,</div><div class='ctx'> 		"Option to enable PLOGI to devices that are not present after "</div><div class='del'>-		"a Fabric scan.  This is needed for several broken switches."</div><div class='add'>+		"a Fabric scan.  This is needed for several broken switches. "</div><div class='ctx'> 		"Default is 0 - no PLOGI. 1 - perfom PLOGI.");</div><div class='ctx'> </div><div class='ctx'> int ql2xloginretrycount = 0;</div><div class='hunk'>@@ -54,12 +54,18 @@ module_param(ql2xloginretrycount, int, S_IRUGO|S_IRUSR);</div><div class='ctx'> MODULE_PARM_DESC(ql2xloginretrycount,</div><div class='ctx'> 		"Specify an alternate value for the NVRAM login retry count.");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE)</div><div class='del'>-int ql2xfwloadflash;</div><div class='del'>-module_param(ql2xfwloadflash, int, S_IRUGO|S_IRUSR);</div><div class='del'>-MODULE_PARM_DESC(ql2xfwloadflash,</div><div class='del'>-		"Load ISP24xx firmware image from FLASH (onboard memory).");</div><div class='del'>-#endif</div><div class='add'>+int ql2xallocfwdump = 1;</div><div class='add'>+module_param(ql2xallocfwdump, int, S_IRUGO|S_IRUSR);</div><div class='add'>+MODULE_PARM_DESC(ql2xallocfwdump,</div><div class='add'>+		"Option to enable allocation of memory for a firmware dump "</div><div class='add'>+		"during HBA initialization.  Memory allocation requirements "</div><div class='add'>+		"vary by ISP type.  Default is 1 - allocate memory.");</div><div class='add'>+</div><div class='add'>+int extended_error_logging;</div><div class='add'>+module_param(extended_error_logging, int, S_IRUGO|S_IRUSR);</div><div class='add'>+MODULE_PARM_DESC(extended_error_logging,</div><div class='add'>+		"Option to enable extended error logging, "</div><div class='add'>+		"Default is 0 - no logging. 1 - log errors.");</div><div class='ctx'> </div><div class='ctx'> static void qla2x00_free_device(scsi_qla_host_t *);</div><div class='ctx'> </div><div class='hunk'>@@ -71,12 +77,6 @@ MODULE_PARM_DESC(ql2xfdmienable,</div><div class='ctx'> 		"Enables FDMI registratons "</div><div class='ctx'> 		"Default is 0 - no FDMI. 1 - perfom FDMI.");</div><div class='ctx'> </div><div class='del'>-int ql2xprocessrscn;</div><div class='del'>-module_param(ql2xprocessrscn, int, S_IRUGO|S_IRUSR);</div><div class='del'>-MODULE_PARM_DESC(ql2xprocessrscn,</div><div class='del'>-		"Option to enable port RSCN handling via a series of less"</div><div class='del'>-		"fabric intrusive ADISCs and PLOGIs.");</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * SCSI host template entry points</div><div class='ctx'>  */</div><div class='hunk'>@@ -99,7 +99,7 @@ static int qla2x00_change_queue_type(struct scsi_device *, int);</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template qla2x00_driver_template = {</div><div class='ctx'> 	.module			= THIS_MODULE,</div><div class='del'>-	.name			= "qla2xxx",</div><div class='add'>+	.name			= QLA2XXX_DRIVER_NAME,</div><div class='ctx'> 	.queuecommand		= qla2x00_queuecommand,</div><div class='ctx'> </div><div class='ctx'> 	.eh_abort_handler	= qla2xxx_eh_abort,</div><div class='hunk'>@@ -128,7 +128,7 @@ static struct scsi_host_template qla2x00_driver_template = {</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template qla24xx_driver_template = {</div><div class='ctx'> 	.module			= THIS_MODULE,</div><div class='del'>-	.name			= "qla2xxx",</div><div class='add'>+	.name			= QLA2XXX_DRIVER_NAME,</div><div class='ctx'> 	.queuecommand		= qla24xx_queuecommand,</div><div class='ctx'> </div><div class='ctx'> 	.eh_abort_handler	= qla2xxx_eh_abort,</div><div class='hunk'>@@ -340,7 +340,6 @@ qla2x00_get_new_sp(scsi_qla_host_t *ha, fc_port_t *fcport,</div><div class='ctx'> 	if (!sp)</div><div class='ctx'> 		return sp;</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;sp-&gt;ref_count, 1);</div><div class='ctx'> 	sp-&gt;ha = ha;</div><div class='ctx'> 	sp-&gt;fcport = fcport;</div><div class='ctx'> 	sp-&gt;cmd = cmd;</div><div class='hunk'>@@ -577,6 +576,10 @@ qla2x00_wait_for_loop_ready(scsi_qla_host_t *ha)</div><div class='ctx'> 	while ((!atomic_read(&amp;ha-&gt;loop_down_timer) &amp;&amp;</div><div class='ctx'> 	    atomic_read(&amp;ha-&gt;loop_state) == LOOP_DOWN) ||</div><div class='ctx'> 	    atomic_read(&amp;ha-&gt;loop_state) != LOOP_READY) {</div><div class='add'>+		if (atomic_read(&amp;ha-&gt;loop_state) == LOOP_DEAD) {</div><div class='add'>+			return_status = QLA_FUNCTION_FAILED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		msleep(1000);</div><div class='ctx'> 		if (time_after_eq(jiffies, loop_timeout)) {</div><div class='ctx'> 			return_status = QLA_FUNCTION_FAILED;</div><div class='hunk'>@@ -632,10 +635,9 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)</div><div class='ctx'> 		if (sp-&gt;cmd != cmd)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		DEBUG2(printk("%s(%ld): aborting sp %p from RISC. pid=%ld "</div><div class='del'>-		    "sp-&gt;state=%x\n", __func__, ha-&gt;host_no, sp, serial,</div><div class='del'>-		    sp-&gt;state));</div><div class='del'>-		DEBUG3(qla2x00_print_scsi_cmd(cmd);)</div><div class='add'>+		DEBUG2(printk("%s(%ld): aborting sp %p from RISC. pid=%ld.\n",</div><div class='add'>+		    __func__, ha-&gt;host_no, sp, serial));</div><div class='add'>+		DEBUG3(qla2x00_print_scsi_cmd(cmd));</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='ctx'> 		if (ha-&gt;isp_ops.abort_command(ha, sp)) {</div><div class='hunk'>@@ -777,7 +779,7 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='ctx'> 		DEBUG2(printk(KERN_INFO</div><div class='del'>-		    "%s failed: loop not ready\n",__func__);)</div><div class='add'>+		    "%s failed: loop not ready\n",__func__));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ret == FAILED) {</div><div class='hunk'>@@ -1032,12 +1034,12 @@ qla2x00_loop_reset(scsi_qla_host_t *ha)</div><div class='ctx'> 		/* Empty */</div><div class='ctx'> 		DEBUG2_3(printk("%s(%ld): **** FAILED ****\n",</div><div class='ctx'> 				__func__,</div><div class='del'>-				ha-&gt;host_no);)</div><div class='add'>+				ha-&gt;host_no));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Empty */</div><div class='ctx'> 		DEBUG3(printk("%s(%ld): exiting normally.\n",</div><div class='ctx'> 				__func__,</div><div class='del'>-				ha-&gt;host_no);)</div><div class='add'>+				ha-&gt;host_no));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return(status);</div><div class='hunk'>@@ -1157,18 +1159,22 @@ qla2x00_set_isp_flags(scsi_qla_host_t *ha)</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2100:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2100;</div><div class='ctx'> 		ha-&gt;device_type &amp;= ~DT_EXTENDED_IDS;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2100;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2200:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2200;</div><div class='ctx'> 		ha-&gt;device_type &amp;= ~DT_EXTENDED_IDS;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2100;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2300:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2300;</div><div class='ctx'> 		ha-&gt;device_type |= DT_ZIO_SUPPORTED;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2300;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2312:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2312;</div><div class='ctx'> 		ha-&gt;device_type |= DT_ZIO_SUPPORTED;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2300;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2322:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2322;</div><div class='hunk'>@@ -1176,26 +1182,33 @@ qla2x00_set_isp_flags(scsi_qla_host_t *ha)</div><div class='ctx'> 		if (ha-&gt;pdev-&gt;subsystem_vendor == 0x1028 &amp;&amp;</div><div class='ctx'> 		    ha-&gt;pdev-&gt;subsystem_device == 0x0170)</div><div class='ctx'> 			ha-&gt;device_type |= DT_OEM_001;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2300;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP6312:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP6312;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2300;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP6322:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP6322;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2300;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2422:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2422;</div><div class='ctx'> 		ha-&gt;device_type |= DT_ZIO_SUPPORTED;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP2432:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP2432;</div><div class='ctx'> 		ha-&gt;device_type |= DT_ZIO_SUPPORTED;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP5422:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP5422;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_QLOGIC_ISP5432:</div><div class='ctx'> 		ha-&gt;device_type |= DT_ISP5432;</div><div class='add'>+		ha-&gt;fw_srisc_address = RISC_START_ADDRESS_2400;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1242,7 +1255,7 @@ qla2x00_iospace_config(scsi_qla_host_t *ha)</div><div class='ctx'> 		goto iospace_error_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pci_request_regions(ha-&gt;pdev, ha-&gt;brd_info-&gt;drv_name)) {</div><div class='add'>+	if (pci_request_regions(ha-&gt;pdev, QLA2XXX_DRIVER_NAME)) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Failed to reserve PIO/MMIO regions (%s)\n",</div><div class='ctx'> 		    pci_name(ha-&gt;pdev));</div><div class='hunk'>@@ -1324,7 +1337,8 @@ qla24xx_disable_intrs(scsi_qla_host_t *ha)</div><div class='ctx'> /*</div><div class='ctx'>  * PCI driver interface</div><div class='ctx'>  */</div><div class='del'>-int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='add'>+static int __devinit</div><div class='add'>+qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	int	ret = -ENODEV;</div><div class='ctx'> 	device_reg_t __iomem *reg;</div><div class='hunk'>@@ -1358,8 +1372,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 	ha-&gt;pdev = pdev;</div><div class='ctx'> 	ha-&gt;host = host;</div><div class='ctx'> 	ha-&gt;host_no = host-&gt;host_no;</div><div class='del'>-	ha-&gt;brd_info = brd_info;</div><div class='del'>-	sprintf(ha-&gt;host_str, "%s_%ld", ha-&gt;brd_info-&gt;drv_name, ha-&gt;host_no);</div><div class='add'>+	sprintf(ha-&gt;host_str, "%s_%ld", QLA2XXX_DRIVER_NAME, ha-&gt;host_no);</div><div class='ctx'> </div><div class='ctx'> 	/* Set ISP-type information. */</div><div class='ctx'> 	qla2x00_set_isp_flags(ha);</div><div class='hunk'>@@ -1376,7 +1389,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 	spin_lock_init(&amp;ha-&gt;hardware_lock);</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;prev_topology = 0;</div><div class='del'>-	ha-&gt;ports = MAX_BUSES;</div><div class='ctx'> 	ha-&gt;init_cb_size = sizeof(init_cb_t);</div><div class='ctx'> 	ha-&gt;mgmt_svr_loop_id = MANAGEMENT_SERVER;</div><div class='ctx'> 	ha-&gt;link_data_rate = LDR_UNKNOWN;</div><div class='hunk'>@@ -1407,7 +1419,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 	ha-&gt;isp_ops.read_nvram		= qla2x00_read_nvram_data;</div><div class='ctx'> 	ha-&gt;isp_ops.write_nvram		= qla2x00_write_nvram_data;</div><div class='ctx'> 	ha-&gt;isp_ops.fw_dump		= qla2100_fw_dump;</div><div class='del'>-	ha-&gt;isp_ops.ascii_fw_dump	= qla2100_ascii_fw_dump;</div><div class='ctx'> 	ha-&gt;isp_ops.read_optrom		= qla2x00_read_optrom_data;</div><div class='ctx'> 	ha-&gt;isp_ops.write_optrom	= qla2x00_write_optrom_data;</div><div class='ctx'> 	if (IS_QLA2100(ha)) {</div><div class='hunk'>@@ -1434,7 +1445,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 		ha-&gt;isp_ops.pci_config = qla2300_pci_config;</div><div class='ctx'> 		ha-&gt;isp_ops.intr_handler = qla2300_intr_handler;</div><div class='ctx'> 		ha-&gt;isp_ops.fw_dump = qla2300_fw_dump;</div><div class='del'>-		ha-&gt;isp_ops.ascii_fw_dump = qla2300_ascii_fw_dump;</div><div class='ctx'> 		ha-&gt;isp_ops.beacon_on = qla2x00_beacon_on;</div><div class='ctx'> 		ha-&gt;isp_ops.beacon_off = qla2x00_beacon_off;</div><div class='ctx'> 		ha-&gt;isp_ops.beacon_blink = qla2x00_beacon_blink;</div><div class='hunk'>@@ -1457,10 +1467,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 		ha-&gt;isp_ops.nvram_config = qla24xx_nvram_config;</div><div class='ctx'> 		ha-&gt;isp_ops.update_fw_options = qla24xx_update_fw_options;</div><div class='ctx'> 		ha-&gt;isp_ops.load_risc = qla24xx_load_risc;</div><div class='del'>-#if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE)</div><div class='del'>-		if (ql2xfwloadflash)</div><div class='del'>-			ha-&gt;isp_ops.load_risc = qla24xx_load_risc_flash;</div><div class='del'>-#endif</div><div class='ctx'> 		ha-&gt;isp_ops.pci_info_str = qla24xx_pci_info_str;</div><div class='ctx'> 		ha-&gt;isp_ops.fw_version_str = qla24xx_fw_version_str;</div><div class='ctx'> 		ha-&gt;isp_ops.intr_handler = qla24xx_intr_handler;</div><div class='hunk'>@@ -1475,7 +1481,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 		ha-&gt;isp_ops.read_nvram = qla24xx_read_nvram_data;</div><div class='ctx'> 		ha-&gt;isp_ops.write_nvram = qla24xx_write_nvram_data;</div><div class='ctx'> 		ha-&gt;isp_ops.fw_dump = qla24xx_fw_dump;</div><div class='del'>-		ha-&gt;isp_ops.ascii_fw_dump = qla24xx_ascii_fw_dump;</div><div class='ctx'> 		ha-&gt;isp_ops.read_optrom	= qla24xx_read_optrom_data;</div><div class='ctx'> 		ha-&gt;isp_ops.write_optrom = qla24xx_write_optrom_data;</div><div class='ctx'> 		ha-&gt;isp_ops.beacon_on = qla24xx_beacon_on;</div><div class='hunk'>@@ -1494,7 +1499,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ha-&gt;list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ha-&gt;fcports);</div><div class='del'>-	INIT_LIST_HEAD(&amp;ha-&gt;rscn_fcports);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * These locks are used to prevent more than one CPU</div><div class='hunk'>@@ -1543,12 +1547,12 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)</div><div class='ctx'> 	host-&gt;cmd_per_lun = 3;</div><div class='ctx'> 	host-&gt;unique_id = ha-&gt;instance;</div><div class='ctx'> 	host-&gt;max_cmd_len = MAX_CMDSZ;</div><div class='del'>-	host-&gt;max_channel = ha-&gt;ports - 1;</div><div class='add'>+	host-&gt;max_channel = MAX_BUSES - 1;</div><div class='ctx'> 	host-&gt;max_lun = MAX_LUNS;</div><div class='ctx'> 	host-&gt;transportt = qla2xxx_transport_template;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(pdev-&gt;irq, ha-&gt;isp_ops.intr_handler,</div><div class='del'>-	    SA_INTERRUPT|SA_SHIRQ, ha-&gt;brd_info-&gt;drv_name, ha);</div><div class='add'>+	    IRQF_DISABLED|IRQF_SHARED, QLA2XXX_DRIVER_NAME, ha);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 		    "Failed to reserve interrupt %d already in use.\n",</div><div class='hunk'>@@ -1646,9 +1650,9 @@ probe_disable_device:</div><div class='ctx'> probe_out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(qla2x00_probe_one);</div><div class='ctx'> </div><div class='del'>-void qla2x00_remove_one(struct pci_dev *pdev)</div><div class='add'>+static void __devexit</div><div class='add'>+qla2x00_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	scsi_qla_host_t *ha;</div><div class='ctx'> </div><div class='hunk'>@@ -1666,15 +1670,10 @@ void qla2x00_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(qla2x00_remove_one);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> qla2x00_free_device(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='del'>-	/* Abort any outstanding IO descriptors. */</div><div class='del'>-	if (!IS_QLA2100(ha) &amp;&amp; !IS_QLA2200(ha))</div><div class='del'>-		qla2x00_cancel_io_descriptors(ha);</div><div class='del'>-</div><div class='ctx'> 	/* Disable timer */</div><div class='ctx'> 	if (ha-&gt;timer_active)</div><div class='ctx'> 		qla2x00_stop_timer(ha);</div><div class='hunk'>@@ -1691,6 +1690,9 @@ qla2x00_free_device(scsi_qla_host_t *ha)</div><div class='ctx'> 		kthread_stop(t);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (ha-&gt;eft)</div><div class='add'>+		qla2x00_trace_control(ha, TC_DISABLE, 0, 0);</div><div class='add'>+</div><div class='ctx'> 	/* Stop currently executing firmware. */</div><div class='ctx'> 	qla2x00_stop_firmware(ha);</div><div class='ctx'> </div><div class='hunk'>@@ -1884,19 +1886,8 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ha-&gt;rlc_rsp = dma_alloc_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='del'>-		    sizeof(rpt_lun_cmd_rsp_t), &amp;ha-&gt;rlc_rsp_dma, GFP_KERNEL);</div><div class='del'>-		if (ha-&gt;rlc_rsp == NULL) {</div><div class='del'>-			qla_printk(KERN_WARNING, ha,</div><div class='del'>-				"Memory Allocation failed - rlc");</div><div class='del'>-</div><div class='del'>-			qla2x00_mem_free(ha);</div><div class='del'>-			msleep(100);</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		snprintf(name, sizeof(name), "qla2xxx_%ld", ha-&gt;host_no);</div><div class='add'>+		snprintf(name, sizeof(name), "%s_%ld", QLA2XXX_DRIVER_NAME,</div><div class='add'>+		    ha-&gt;host_no);</div><div class='ctx'> 		ha-&gt;s_dma_pool = dma_pool_create(name, &amp;ha-&gt;pdev-&gt;dev,</div><div class='ctx'> 		    DMA_POOL_SIZE, 8, 0);</div><div class='ctx'> 		if (ha-&gt;s_dma_pool == NULL) {</div><div class='hunk'>@@ -1923,32 +1914,6 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)</div><div class='ctx'> 		}</div><div class='ctx'> 		memset(ha-&gt;init_cb, 0, ha-&gt;init_cb_size);</div><div class='ctx'> </div><div class='del'>-		/* Get consistent memory allocated for Get Port Database cmd */</div><div class='del'>-		ha-&gt;iodesc_pd = dma_pool_alloc(ha-&gt;s_dma_pool, GFP_KERNEL,</div><div class='del'>-		    &amp;ha-&gt;iodesc_pd_dma);</div><div class='del'>-		if (ha-&gt;iodesc_pd == NULL) {</div><div class='del'>-			/* error */</div><div class='del'>-			qla_printk(KERN_WARNING, ha,</div><div class='del'>-			    "Memory Allocation failed - iodesc_pd\n");</div><div class='del'>-</div><div class='del'>-			qla2x00_mem_free(ha);</div><div class='del'>-			msleep(100);</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		memset(ha-&gt;iodesc_pd, 0, PORT_DATABASE_SIZE);</div><div class='del'>-</div><div class='del'>-		/* Allocate ioctl related memory. */</div><div class='del'>-		if (qla2x00_alloc_ioctl_mem(ha)) {</div><div class='del'>-			qla_printk(KERN_WARNING, ha,</div><div class='del'>-			    "Memory Allocation failed - ioctl_mem\n");</div><div class='del'>-</div><div class='del'>-			qla2x00_mem_free(ha);</div><div class='del'>-			msleep(100);</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (qla2x00_allocate_sp_pool(ha)) {</div><div class='ctx'> 			qla_printk(KERN_WARNING, ha,</div><div class='ctx'> 			    "Memory Allocation failed - "</div><div class='hunk'>@@ -2011,6 +1976,26 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			memset(ha-&gt;ct_sns, 0, sizeof(struct ct_sns_pkt));</div><div class='add'>+</div><div class='add'>+			if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {</div><div class='add'>+				/*</div><div class='add'>+				 * Get consistent memory allocated for SFP</div><div class='add'>+				 * block.</div><div class='add'>+				 */</div><div class='add'>+				ha-&gt;sfp_data = dma_pool_alloc(ha-&gt;s_dma_pool,</div><div class='add'>+				    GFP_KERNEL, &amp;ha-&gt;sfp_data_dma);</div><div class='add'>+				if (ha-&gt;sfp_data == NULL) {</div><div class='add'>+					qla_printk(KERN_WARNING, ha,</div><div class='add'>+					    "Memory Allocation failed - "</div><div class='add'>+					    "sfp_data\n");</div><div class='add'>+</div><div class='add'>+					qla2x00_mem_free(ha);</div><div class='add'>+					msleep(100);</div><div class='add'>+</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				memset(ha-&gt;sfp_data, 0, SFP_BLOCK_SIZE);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Done all allocations without any error. */</div><div class='hunk'>@@ -2045,12 +2030,16 @@ qla2x00_mem_free(scsi_qla_host_t *ha)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* free ioctl memory */</div><div class='del'>-	qla2x00_free_ioctl_mem(ha);</div><div class='del'>-</div><div class='ctx'> 	/* free sp pool */</div><div class='ctx'> 	qla2x00_free_sp_pool(ha);</div><div class='ctx'> </div><div class='add'>+	if (ha-&gt;fw_dump) {</div><div class='add'>+		if (ha-&gt;eft)</div><div class='add'>+			dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='add'>+			    ntohl(ha-&gt;fw_dump-&gt;eft_size), ha-&gt;eft, ha-&gt;eft_dma);</div><div class='add'>+		vfree(ha-&gt;fw_dump);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ha-&gt;sns_cmd)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, sizeof(struct sns_cmd_pkt),</div><div class='ctx'> 		    ha-&gt;sns_cmd, ha-&gt;sns_cmd_dma);</div><div class='hunk'>@@ -2059,23 +2048,18 @@ qla2x00_mem_free(scsi_qla_host_t *ha)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, sizeof(struct ct_sns_pkt),</div><div class='ctx'> 		    ha-&gt;ct_sns, ha-&gt;ct_sns_dma);</div><div class='ctx'> </div><div class='add'>+	if (ha-&gt;sfp_data)</div><div class='add'>+		dma_pool_free(ha-&gt;s_dma_pool, ha-&gt;sfp_data, ha-&gt;sfp_data_dma);</div><div class='add'>+</div><div class='ctx'> 	if (ha-&gt;ms_iocb)</div><div class='ctx'> 		dma_pool_free(ha-&gt;s_dma_pool, ha-&gt;ms_iocb, ha-&gt;ms_iocb_dma);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;iodesc_pd)</div><div class='del'>-		dma_pool_free(ha-&gt;s_dma_pool, ha-&gt;iodesc_pd, ha-&gt;iodesc_pd_dma);</div><div class='del'>-</div><div class='ctx'> 	if (ha-&gt;init_cb)</div><div class='ctx'> 		dma_pool_free(ha-&gt;s_dma_pool, ha-&gt;init_cb, ha-&gt;init_cb_dma);</div><div class='ctx'> </div><div class='ctx'> 	if (ha-&gt;s_dma_pool)</div><div class='ctx'> 		dma_pool_destroy(ha-&gt;s_dma_pool);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;rlc_rsp)</div><div class='del'>-		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev,</div><div class='del'>-		    sizeof(rpt_lun_cmd_rsp_t), ha-&gt;rlc_rsp,</div><div class='del'>-		    ha-&gt;rlc_rsp_dma);</div><div class='del'>-</div><div class='ctx'> 	if (ha-&gt;gid_list)</div><div class='ctx'> 		dma_free_coherent(&amp;ha-&gt;pdev-&gt;dev, GID_LIST_SIZE, ha-&gt;gid_list,</div><div class='ctx'> 		    ha-&gt;gid_list_dma);</div><div class='hunk'>@@ -2090,21 +2074,19 @@ qla2x00_mem_free(scsi_qla_host_t *ha)</div><div class='ctx'> 		    (ha-&gt;request_q_length + 1) * sizeof(request_t),</div><div class='ctx'> 		    ha-&gt;request_ring, ha-&gt;request_dma);</div><div class='ctx'> </div><div class='add'>+	ha-&gt;eft = NULL;</div><div class='add'>+	ha-&gt;eft_dma = 0;</div><div class='ctx'> 	ha-&gt;sns_cmd = NULL;</div><div class='ctx'> 	ha-&gt;sns_cmd_dma = 0;</div><div class='ctx'> 	ha-&gt;ct_sns = NULL;</div><div class='ctx'> 	ha-&gt;ct_sns_dma = 0;</div><div class='ctx'> 	ha-&gt;ms_iocb = NULL;</div><div class='ctx'> 	ha-&gt;ms_iocb_dma = 0;</div><div class='del'>-	ha-&gt;iodesc_pd = NULL;</div><div class='del'>-	ha-&gt;iodesc_pd_dma = 0;</div><div class='ctx'> 	ha-&gt;init_cb = NULL;</div><div class='ctx'> 	ha-&gt;init_cb_dma = 0;</div><div class='ctx'> </div><div class='ctx'> 	ha-&gt;s_dma_pool = NULL;</div><div class='ctx'> </div><div class='del'>-	ha-&gt;rlc_rsp = NULL;</div><div class='del'>-	ha-&gt;rlc_rsp_dma = 0;</div><div class='ctx'> 	ha-&gt;gid_list = NULL;</div><div class='ctx'> 	ha-&gt;gid_list_dma = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2122,18 +2104,9 @@ qla2x00_mem_free(scsi_qla_host_t *ha)</div><div class='ctx'> 	}</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;ha-&gt;fcports);</div><div class='ctx'> </div><div class='del'>-	if (ha-&gt;fw_dump)</div><div class='del'>-		free_pages((unsigned long)ha-&gt;fw_dump, ha-&gt;fw_dump_order);</div><div class='del'>-</div><div class='del'>-	vfree(ha-&gt;fw_dump24);</div><div class='del'>-</div><div class='del'>-	vfree(ha-&gt;fw_dump_buffer);</div><div class='del'>-</div><div class='ctx'> 	ha-&gt;fw_dump = NULL;</div><div class='del'>-	ha-&gt;fw_dump24 = NULL;</div><div class='ctx'> 	ha-&gt;fw_dumped = 0;</div><div class='ctx'> 	ha-&gt;fw_dump_reading = 0;</div><div class='del'>-	ha-&gt;fw_dump_buffer = NULL;</div><div class='ctx'> </div><div class='ctx'> 	vfree(ha-&gt;optrom_buffer);</div><div class='ctx'> }</div><div class='hunk'>@@ -2148,8 +2121,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha)</div><div class='ctx'>  *</div><div class='ctx'>  * Context:</div><div class='ctx'>  *      Kernel context.</div><div class='del'>- *</div><div class='del'>- * Note: Sets the ref_count for non Null sp to one.</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> qla2x00_allocate_sp_pool(scsi_qla_host_t *ha)</div><div class='hunk'>@@ -2593,14 +2564,6 @@ qla2x00_down_timeout(struct semaphore *sema, unsigned long timeout)</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE)</div><div class='del'>-</div><div class='del'>-#define qla2x00_release_firmware()	do { } while (0)</div><div class='del'>-#define qla2x00_pci_module_init()	(0)</div><div class='del'>-#define qla2x00_pci_module_exit()	do { } while (0)</div><div class='del'>-</div><div class='del'>-#else	/* !defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE) */</div><div class='del'>-</div><div class='ctx'> /* Firmware interface routines. */</div><div class='ctx'> </div><div class='ctx'> #define FW_BLOBS	5</div><div class='hunk'>@@ -2667,73 +2630,32 @@ qla2x00_release_firmware(void)</div><div class='ctx'> 	up(&amp;qla_fw_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct qla_board_info qla_board_tbl = {</div><div class='del'>-	.drv_name       = "qla2xxx",</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct pci_device_id qla2xxx_pci_tbl[] = {</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='del'>-	{ PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432,</div><div class='del'>-		PCI_ANY_ID, PCI_ANY_ID, },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },</div><div class='ctx'> 	{ 0 },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, qla2xxx_pci_tbl);</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='del'>-qla2xxx_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return qla2x00_probe_one(pdev, &amp;qla_board_tbl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit</div><div class='del'>-qla2xxx_remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	qla2x00_remove_one(pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pci_driver qla2xxx_pci_driver = {</div><div class='del'>-	.name		= "qla2xxx",</div><div class='add'>+	.name		= QLA2XXX_DRIVER_NAME,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.id_table	= qla2xxx_pci_tbl,</div><div class='del'>-	.probe		= qla2xxx_probe_one,</div><div class='del'>-	.remove		= __devexit_p(qla2xxx_remove_one),</div><div class='add'>+	.probe		= qla2x00_probe_one,</div><div class='add'>+	.remove		= __devexit_p(qla2x00_remove_one),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int</div><div class='del'>-qla2x00_pci_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_module_init(&amp;qla2xxx_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_pci_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;qla2xxx_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * qla2x00_module_init - Module initialization.</div><div class='ctx'>  **/</div><div class='hunk'>@@ -2753,19 +2675,16 @@ qla2x00_module_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* Derive version string. */</div><div class='ctx'> 	strcpy(qla2x00_version_str, QLA2XXX_VERSION);</div><div class='del'>-#if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE)</div><div class='del'>-	strcat(qla2x00_version_str, "-fw");</div><div class='del'>-#endif</div><div class='del'>-#if DEBUG_QLA2100</div><div class='del'>-	strcat(qla2x00_version_str, "-debug");</div><div class='del'>-#endif</div><div class='add'>+	if (extended_error_logging)</div><div class='add'>+		strcat(qla2x00_version_str, "-debug");</div><div class='add'>+</div><div class='ctx'> 	qla2xxx_transport_template =</div><div class='ctx'> 	    fc_attach_transport(&amp;qla2xxx_transport_functions);</div><div class='ctx'> 	if (!qla2xxx_transport_template)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "QLogic Fibre Channel HBA Driver\n");</div><div class='del'>-	ret = qla2x00_pci_module_init();</div><div class='add'>+	ret = pci_register_driver(&amp;qla2xxx_pci_driver);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		kmem_cache_destroy(srb_cachep);</div><div class='ctx'> 		fc_release_transport(qla2xxx_transport_template);</div><div class='hunk'>@@ -2779,7 +2698,7 @@ qla2x00_module_init(void)</div><div class='ctx'> static void __exit</div><div class='ctx'> qla2x00_module_exit(void)</div><div class='ctx'> {</div><div class='del'>-	qla2x00_pci_module_exit();</div><div class='add'>+	pci_unregister_driver(&amp;qla2xxx_pci_driver);</div><div class='ctx'> 	qla2x00_release_firmware();</div><div class='ctx'> 	kmem_cache_destroy(srb_cachep);</div><div class='ctx'> 	fc_release_transport(qla2xxx_transport_template);</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c<br/>deleted file mode 100644<br/>index b70bebe18c01..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_rscn.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_rscn.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1426 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * QLogic Fibre Channel HBA Driver</div><div class='del'>- * Copyright (c)  2003-2005 QLogic Corporation</div><div class='del'>- *</div><div class='del'>- * See LICENSE.qla2xxx for copyright and licensing details.</div><div class='del'>- */</div><div class='del'>-#include "qla_def.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * IO descriptor handle definitions.</div><div class='del'>- *</div><div class='del'>- * Signature form:</div><div class='del'>- *</div><div class='del'>- *	|31------28|27-------------------12|11-------0|</div><div class='del'>- *	|   Type   |   Rolling Signature   |   Index  |</div><div class='del'>- *	|----------|-----------------------|----------|</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-#define HDL_TYPE_SCSI		0</div><div class='del'>-#define HDL_TYPE_ASYNC_IOCB	0x0A</div><div class='del'>-</div><div class='del'>-#define HDL_INDEX_BITS	12</div><div class='del'>-#define HDL_ITER_BITS	16</div><div class='del'>-#define HDL_TYPE_BITS	4</div><div class='del'>-</div><div class='del'>-#define HDL_INDEX_MASK	((1UL &lt;&lt; HDL_INDEX_BITS) - 1)</div><div class='del'>-#define HDL_ITER_MASK	((1UL &lt;&lt; HDL_ITER_BITS) - 1)</div><div class='del'>-#define HDL_TYPE_MASK	((1UL &lt;&lt; HDL_TYPE_BITS) - 1)</div><div class='del'>-</div><div class='del'>-#define HDL_INDEX_SHIFT	0</div><div class='del'>-#define HDL_ITER_SHIFT	(HDL_INDEX_SHIFT + HDL_INDEX_BITS)</div><div class='del'>-#define HDL_TYPE_SHIFT	(HDL_ITER_SHIFT + HDL_ITER_BITS)</div><div class='del'>-</div><div class='del'>-/* Local Prototypes. */</div><div class='del'>-static inline uint32_t qla2x00_to_handle(uint16_t, uint16_t, uint16_t);</div><div class='del'>-static inline uint16_t qla2x00_handle_to_idx(uint32_t);</div><div class='del'>-static inline uint32_t qla2x00_iodesc_to_handle(struct io_descriptor *);</div><div class='del'>-static inline struct io_descriptor *qla2x00_handle_to_iodesc(scsi_qla_host_t *,</div><div class='del'>-    uint32_t);</div><div class='del'>-</div><div class='del'>-static inline struct io_descriptor *qla2x00_alloc_iodesc(scsi_qla_host_t *);</div><div class='del'>-static inline void qla2x00_free_iodesc(struct io_descriptor *);</div><div class='del'>-static inline void qla2x00_init_io_descriptors(scsi_qla_host_t *);</div><div class='del'>-</div><div class='del'>-static void qla2x00_iodesc_timeout(unsigned long);</div><div class='del'>-static inline void qla2x00_add_iodesc_timer(struct io_descriptor *);</div><div class='del'>-static inline void qla2x00_remove_iodesc_timer(struct io_descriptor *);</div><div class='del'>-</div><div class='del'>-static inline void qla2x00_update_login_fcport(scsi_qla_host_t *,</div><div class='del'>-    struct mbx_entry *, fc_port_t *);</div><div class='del'>-</div><div class='del'>-static int qla2x00_send_abort_iocb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    uint32_t, int);</div><div class='del'>-static int qla2x00_send_abort_iocb_cb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    struct mbx_entry *);</div><div class='del'>-</div><div class='del'>-static int qla2x00_send_adisc_iocb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    int);</div><div class='del'>-static int qla2x00_send_adisc_iocb_cb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    struct mbx_entry *);</div><div class='del'>-</div><div class='del'>-static int qla2x00_send_logout_iocb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    int);</div><div class='del'>-static int qla2x00_send_logout_iocb_cb(scsi_qla_host_t *,</div><div class='del'>-    struct io_descriptor *, struct mbx_entry *);</div><div class='del'>-</div><div class='del'>-static int qla2x00_send_login_iocb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    port_id_t *, int);</div><div class='del'>-static int qla2x00_send_login_iocb_cb(scsi_qla_host_t *, struct io_descriptor *,</div><div class='del'>-    struct mbx_entry *);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Mailbox IOCB callback array.</div><div class='del'>- **/</div><div class='del'>-static int (*iocb_function_cb_list[LAST_IOCB_CB])</div><div class='del'>-	(scsi_qla_host_t *, struct io_descriptor *, struct mbx_entry *) = {</div><div class='del'>-</div><div class='del'>-	qla2x00_send_abort_iocb_cb,</div><div class='del'>-	qla2x00_send_adisc_iocb_cb,</div><div class='del'>-	qla2x00_send_logout_iocb_cb,</div><div class='del'>-	qla2x00_send_login_iocb_cb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Generic IO descriptor handle routines.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_to_handle() - Create a descriptor handle.</div><div class='del'>- * @type: descriptor type</div><div class='del'>- * @iter: descriptor rolling signature</div><div class='del'>- * @idx: index to the descriptor array</div><div class='del'>- *</div><div class='del'>- * Returns a composite handle based in the @type, @iter, and @idx.</div><div class='del'>- */</div><div class='del'>-static inline uint32_t</div><div class='del'>-qla2x00_to_handle(uint16_t type, uint16_t iter, uint16_t idx)</div><div class='del'>-{</div><div class='del'>-	return ((uint32_t)(((uint32_t)type &lt;&lt; HDL_TYPE_SHIFT) |</div><div class='del'>-	    ((uint32_t)iter &lt;&lt; HDL_ITER_SHIFT) |</div><div class='del'>-	    ((uint32_t)idx &lt;&lt; HDL_INDEX_SHIFT)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_handle_to_idx() - Retrive the index for a given handle.</div><div class='del'>- * @handle: descriptor handle</div><div class='del'>- *</div><div class='del'>- * Returns the index specified by the @handle.</div><div class='del'>- */</div><div class='del'>-static inline uint16_t</div><div class='del'>-qla2x00_handle_to_idx(uint32_t handle)</div><div class='del'>-{</div><div class='del'>-	return ((uint16_t)(((handle) &gt;&gt; HDL_INDEX_SHIFT) &amp; HDL_INDEX_MASK));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_iodesc_to_handle() - Convert an IO descriptor to a unique handle.</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- *</div><div class='del'>- * Returns a unique handle for @iodesc.</div><div class='del'>- */</div><div class='del'>-static inline uint32_t</div><div class='del'>-qla2x00_iodesc_to_handle(struct io_descriptor *iodesc)</div><div class='del'>-{</div><div class='del'>-	uint32_t handle;</div><div class='del'>-</div><div class='del'>-	handle = qla2x00_to_handle(HDL_TYPE_ASYNC_IOCB,</div><div class='del'>-	    ++iodesc-&gt;ha-&gt;iodesc_signature, iodesc-&gt;idx);</div><div class='del'>-	iodesc-&gt;signature = handle;</div><div class='del'>-</div><div class='del'>-	return (handle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_handle_to_iodesc() - Retrieve an IO descriptor given a unique handle.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @handle: handle to io descriptor</div><div class='del'>- *</div><div class='del'>- * Returns a pointer to the io descriptor, or NULL, if the io descriptor does</div><div class='del'>- * not exist or the io descriptors signature does not @handle.</div><div class='del'>- */</div><div class='del'>-static inline struct io_descriptor *</div><div class='del'>-qla2x00_handle_to_iodesc(scsi_qla_host_t *ha, uint32_t handle)</div><div class='del'>-{</div><div class='del'>-	uint16_t idx;</div><div class='del'>-	struct io_descriptor *iodesc;</div><div class='del'>-</div><div class='del'>-	idx = qla2x00_handle_to_idx(handle);</div><div class='del'>-	iodesc = &amp;ha-&gt;io_descriptors[idx];</div><div class='del'>-	if (iodesc)</div><div class='del'>-		if (iodesc-&gt;signature != handle)</div><div class='del'>-			iodesc = NULL;</div><div class='del'>-</div><div class='del'>-	return (iodesc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * IO descriptor allocation routines.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_alloc_iodesc() - Allocate an IO descriptor from the pool.</div><div class='del'>- * @ha: HA context</div><div class='del'>- *</div><div class='del'>- * Returns a pointer to the allocated io descriptor, or NULL, if none available.</div><div class='del'>- */</div><div class='del'>-static inline struct io_descriptor *</div><div class='del'>-qla2x00_alloc_iodesc(scsi_qla_host_t *ha)</div><div class='del'>-{</div><div class='del'>-	uint16_t iter;</div><div class='del'>-	struct io_descriptor *iodesc;</div><div class='del'>-</div><div class='del'>-	iodesc = NULL;</div><div class='del'>-	for (iter = 0; iter &lt; MAX_IO_DESCRIPTORS; iter++) {</div><div class='del'>-		if (ha-&gt;io_descriptors[iter].used)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		iodesc = &amp;ha-&gt;io_descriptors[iter];</div><div class='del'>-		iodesc-&gt;used = 1;</div><div class='del'>-		iodesc-&gt;idx = iter;</div><div class='del'>-		init_timer(&amp;iodesc-&gt;timer);</div><div class='del'>-		iodesc-&gt;ha = ha;</div><div class='del'>-		iodesc-&gt;signature = qla2x00_iodesc_to_handle(iodesc);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (iodesc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_free_iodesc() - Free an IO descriptor.</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- *</div><div class='del'>- * NOTE: The io descriptors timer *must* be stopped before it can be free'd.</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_free_iodesc(struct io_descriptor *iodesc)</div><div class='del'>-{</div><div class='del'>-	iodesc-&gt;used = 0;</div><div class='del'>-	iodesc-&gt;signature = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_remove_iodesc_timer() - Remove an active timer from an IO descriptor.</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_remove_iodesc_timer(struct io_descriptor *iodesc)</div><div class='del'>-{</div><div class='del'>-	if (iodesc-&gt;timer.function != NULL) {</div><div class='del'>-		del_timer_sync(&amp;iodesc-&gt;timer);</div><div class='del'>-		iodesc-&gt;timer.data = (unsigned long) NULL;</div><div class='del'>-		iodesc-&gt;timer.function = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_init_io_descriptors() - Initialize the pool of IO descriptors.</div><div class='del'>- * @ha: HA context</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_init_io_descriptors(scsi_qla_host_t *ha)</div><div class='del'>-{</div><div class='del'>-	uint16_t iter;</div><div class='del'>-</div><div class='del'>-	for (iter = 0; iter &lt; MAX_IO_DESCRIPTORS; iter++) {</div><div class='del'>-		if (!ha-&gt;io_descriptors[iter].used)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		qla2x00_remove_iodesc_timer(&amp;ha-&gt;io_descriptors[iter]);</div><div class='del'>-		qla2x00_free_iodesc(&amp;ha-&gt;io_descriptors[iter]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * IO descriptor timer routines.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_iodesc_timeout() - Timeout IO descriptor handler.</div><div class='del'>- * @data: io descriptor</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-qla2x00_iodesc_timeout(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct io_descriptor *iodesc;</div><div class='del'>-</div><div class='del'>-	iodesc = (struct io_descriptor *) data;</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): IO descriptor timeout, index=%x "</div><div class='del'>-	    "signature=%08x, scheduling ISP abort.\n", iodesc-&gt;ha-&gt;host_no,</div><div class='del'>-	    iodesc-&gt;idx, iodesc-&gt;signature));</div><div class='del'>-</div><div class='del'>-	qla2x00_free_iodesc(iodesc);</div><div class='del'>-</div><div class='del'>-	qla_printk(KERN_WARNING, iodesc-&gt;ha,</div><div class='del'>-	    "IO descriptor timeout. Scheduling ISP abort.\n");</div><div class='del'>-	set_bit(ISP_ABORT_NEEDED, &amp;iodesc-&gt;ha-&gt;dpc_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_add_iodesc_timer() - Add and start a timer for an IO descriptor.</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- *</div><div class='del'>- * NOTE:</div><div class='del'>- * The firmware shall timeout an outstanding mailbox IOCB in 2 * R_A_TOV (in</div><div class='del'>- * tenths of a second) after it hits the wire.  But, if there are any request</div><div class='del'>- * resource contraints (i.e. during heavy I/O), exchanges can be held off for</div><div class='del'>- * at most R_A_TOV.  Therefore, the driver will wait 4 * R_A_TOV before</div><div class='del'>- * scheduling a recovery (big hammer).</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_add_iodesc_timer(struct io_descriptor *iodesc)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-</div><div class='del'>-	timeout = (iodesc-&gt;ha-&gt;r_a_tov * 4) / 10;</div><div class='del'>-	init_timer(&amp;iodesc-&gt;timer);</div><div class='del'>-	iodesc-&gt;timer.data = (unsigned long) iodesc;</div><div class='del'>-	iodesc-&gt;timer.expires = jiffies + (timeout * HZ);</div><div class='del'>-	iodesc-&gt;timer.function =</div><div class='del'>-	    (void (*) (unsigned long)) qla2x00_iodesc_timeout;</div><div class='del'>-	add_timer(&amp;iodesc-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * IO descriptor support routines.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_update_login_fcport() - Update fcport data after login processing.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @mbxstat: Mailbox command status IOCB</div><div class='del'>- * @fcport: port to update</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-qla2x00_update_login_fcport(scsi_qla_host_t *ha, struct mbx_entry *mbxstat,</div><div class='del'>-    fc_port_t *fcport)</div><div class='del'>-{</div><div class='del'>-	if (le16_to_cpu(mbxstat-&gt;mb1) &amp; BIT_0) {</div><div class='del'>-		fcport-&gt;port_type = FCT_INITIATOR;</div><div class='del'>-	} else {</div><div class='del'>-		fcport-&gt;port_type = FCT_TARGET;</div><div class='del'>-		if (le16_to_cpu(mbxstat-&gt;mb1) &amp; BIT_1) {</div><div class='del'>-			fcport-&gt;flags |= FCF_TAPE_PRESENT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	fcport-&gt;login_retry = 0;</div><div class='del'>-	fcport-&gt;port_login_retry_count = ha-&gt;port_down_retry_count *</div><div class='del'>-	    PORT_RETRY_TIME;</div><div class='del'>-	atomic_set(&amp;fcport-&gt;port_down_timer, ha-&gt;port_down_retry_count *</div><div class='del'>-	    PORT_RETRY_TIME);</div><div class='del'>-	fcport-&gt;flags |= FCF_FABRIC_DEVICE;</div><div class='del'>-	fcport-&gt;flags &amp;= ~FCF_FAILOVER_NEEDED;</div><div class='del'>-	fcport-&gt;iodesc_idx_sent = IODESC_INVALID_INDEX;</div><div class='del'>-	atomic_set(&amp;fcport-&gt;state, FCS_ONLINE);</div><div class='del'>-	schedule_work(&amp;fcport-&gt;rport_add_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Mailbox IOCB commands.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_get_mbx_iocb_entry() - Retrieve an IOCB from the request queue.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @handle: handle to io descriptor</div><div class='del'>- *</div><div class='del'>- * Returns a pointer to the reqest entry, or NULL, if none were available.</div><div class='del'>- */</div><div class='del'>-static inline struct mbx_entry *</div><div class='del'>-qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle)</div><div class='del'>-{</div><div class='del'>-	uint16_t cnt;</div><div class='del'>-	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='del'>-	struct mbx_entry *mbxentry;</div><div class='del'>-</div><div class='del'>-	mbxentry = NULL;</div><div class='del'>-</div><div class='del'>-	if (ha-&gt;req_q_cnt &lt; 3) {</div><div class='del'>-		cnt = qla2x00_debounce_register(ISP_REQ_Q_OUT(ha, reg));</div><div class='del'>-		if  (ha-&gt;req_ring_index &lt; cnt)</div><div class='del'>-			ha-&gt;req_q_cnt = cnt - ha-&gt;req_ring_index;</div><div class='del'>-		else</div><div class='del'>-			ha-&gt;req_q_cnt = ha-&gt;request_q_length -</div><div class='del'>-			    (ha-&gt;req_ring_index - cnt);</div><div class='del'>-	}</div><div class='del'>-	if (ha-&gt;req_q_cnt &gt;= 3) {</div><div class='del'>-		mbxentry = (struct mbx_entry *)ha-&gt;request_ring_ptr;</div><div class='del'>-</div><div class='del'>-		memset(mbxentry, 0, sizeof(struct mbx_entry));</div><div class='del'>-		mbxentry-&gt;entry_type = MBX_IOCB_TYPE;</div><div class='del'>-		mbxentry-&gt;entry_count = 1;</div><div class='del'>-		mbxentry-&gt;sys_define1 = SOURCE_ASYNC_IOCB;</div><div class='del'>-		mbxentry-&gt;handle = handle;</div><div class='del'>-	}</div><div class='del'>-	return (mbxentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_abort_iocb() - Issue an abort IOCB to the firmware.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @handle_to_abort: firmware handle to abort</div><div class='del'>- * @ha_locked: is function called with the hardware lock</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if the IOCB was issued.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_abort_iocb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    uint32_t handle_to_abort, int ha_locked)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags = 0;</div><div class='del'>-	struct mbx_entry *mbxentry;</div><div class='del'>-</div><div class='del'>-	/* Send marker if required. */</div><div class='del'>-	if (qla2x00_issue_marker(ha, ha_locked) != QLA_SUCCESS)</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Build abort mailbox IOCB. */</div><div class='del'>-	mbxentry = qla2x00_get_mbx_iocb_entry(ha, iodesc-&gt;signature);</div><div class='del'>-	if (mbxentry == NULL) {</div><div class='del'>-		if (!ha_locked)</div><div class='del'>-			spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-	}</div><div class='del'>-	mbxentry-&gt;mb0 = __constant_cpu_to_le16(MBC_ABORT_COMMAND);</div><div class='del'>-	mbxentry-&gt;mb1 = mbxentry-&gt;loop_id.extended =</div><div class='del'>-	    cpu_to_le16(iodesc-&gt;remote_fcport-&gt;loop_id);</div><div class='del'>-	mbxentry-&gt;mb2 = LSW(handle_to_abort);</div><div class='del'>-	mbxentry-&gt;mb3 = MSW(handle_to_abort);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	qla2x00_add_iodesc_timer(iodesc);</div><div class='del'>-</div><div class='del'>-	/* Issue command to ISP. */</div><div class='del'>-	qla2x00_isp_cmd(ha);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Sending Abort IOCB (%08x) to [%x], aborting "</div><div class='del'>-	    "%08x.\n", ha-&gt;host_no, iodesc-&gt;signature,</div><div class='del'>-	    iodesc-&gt;remote_fcport-&gt;loop_id, handle_to_abort));</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_abort_iocb_cb() - Abort IOCB callback.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @mbxstat: mailbox status IOCB</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if @iodesc can be freed by the caller, else, @iodesc</div><div class='del'>- * will be used for a retry.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_abort_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    struct mbx_entry *mbxstat)</div><div class='del'>-{</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Abort IOCB -- sent to [%x/%02x%02x%02x], "</div><div class='del'>-	    "status=%x mb0=%x.\n", ha-&gt;host_no, iodesc-&gt;remote_fcport-&gt;loop_id,</div><div class='del'>-	    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area, iodesc-&gt;d_id.b.al_pa,</div><div class='del'>-	    le16_to_cpu(mbxstat-&gt;status), le16_to_cpu(mbxstat-&gt;mb0)));</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_adisc_iocb() - Issue a Get Port Database IOCB to the firmware.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @ha_locked: is function called with the hardware lock</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if the IOCB was issued.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_adisc_iocb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    int ha_locked)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags = 0;</div><div class='del'>-	struct mbx_entry *mbxentry;</div><div class='del'>-</div><div class='del'>-	/* Send marker if required. */</div><div class='del'>-	if (qla2x00_issue_marker(ha, ha_locked) != QLA_SUCCESS)</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Build Get Port Database IOCB. */</div><div class='del'>-	mbxentry = qla2x00_get_mbx_iocb_entry(ha, iodesc-&gt;signature);</div><div class='del'>-	if (mbxentry == NULL) {</div><div class='del'>-		if (!ha_locked)</div><div class='del'>-			spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-	}</div><div class='del'>-	mbxentry-&gt;mb0 = __constant_cpu_to_le16(MBC_GET_PORT_DATABASE);</div><div class='del'>-	mbxentry-&gt;mb1 = mbxentry-&gt;loop_id.extended =</div><div class='del'>-	    cpu_to_le16(iodesc-&gt;remote_fcport-&gt;loop_id);</div><div class='del'>-	mbxentry-&gt;mb2 = cpu_to_le16(MSW(LSD(ha-&gt;iodesc_pd_dma)));</div><div class='del'>-	mbxentry-&gt;mb3 = cpu_to_le16(LSW(LSD(ha-&gt;iodesc_pd_dma)));</div><div class='del'>-	mbxentry-&gt;mb6 = cpu_to_le16(MSW(MSD(ha-&gt;iodesc_pd_dma)));</div><div class='del'>-	mbxentry-&gt;mb7 = cpu_to_le16(LSW(MSD(ha-&gt;iodesc_pd_dma)));</div><div class='del'>-	mbxentry-&gt;mb10 = __constant_cpu_to_le16(BIT_0);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	qla2x00_add_iodesc_timer(iodesc);</div><div class='del'>-</div><div class='del'>-	/* Issue command to ISP. */</div><div class='del'>-	qla2x00_isp_cmd(ha);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Sending Adisc IOCB (%08x) to [%x].\n",</div><div class='del'>-	    ha-&gt;host_no, iodesc-&gt;signature, iodesc-&gt;remote_fcport-&gt;loop_id));</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_adisc_iocb_cb() - Get Port Database IOCB callback.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @mbxstat: mailbox status IOCB</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if @iodesc can be freed by the caller, else, @iodesc</div><div class='del'>- * will be used for a retry.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_adisc_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    struct mbx_entry *mbxstat)</div><div class='del'>-{</div><div class='del'>-	fc_port_t *remote_fcport;</div><div class='del'>-</div><div class='del'>-	remote_fcport = iodesc-&gt;remote_fcport;</div><div class='del'>-</div><div class='del'>-	/* Ensure the port IDs are consistent. */</div><div class='del'>-	if (remote_fcport-&gt;d_id.b24 != iodesc-&gt;d_id.b24) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Adisc IOCB -- ignoring, remote port "</div><div class='del'>-		    "id changed from [%02x%02x%02x] to [%02x%02x%02x].\n",</div><div class='del'>-		    ha-&gt;host_no, remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-		    remote_fcport-&gt;d_id.b.area, remote_fcport-&gt;d_id.b.al_pa,</div><div class='del'>-		    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-		    iodesc-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-		return (QLA_SUCCESS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Only process the last command. */</div><div class='del'>-	if (remote_fcport-&gt;iodesc_idx_sent != iodesc-&gt;idx) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Adisc IOCB -- ignoring, sent to "</div><div class='del'>-		    "[%02x%02x%02x], expected %x, received %x.\n", ha-&gt;host_no,</div><div class='del'>-		    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-		    iodesc-&gt;d_id.b.al_pa, remote_fcport-&gt;iodesc_idx_sent,</div><div class='del'>-		    iodesc-&gt;idx));</div><div class='del'>-</div><div class='del'>-		return (QLA_SUCCESS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(mbxstat-&gt;status) == CS_COMPLETE) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Adisc IOCB -- marking "</div><div class='del'>-		    "[%x/%02x%02x%02x] online.\n", ha-&gt;host_no,</div><div class='del'>-		    remote_fcport-&gt;loop_id, remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-		    remote_fcport-&gt;d_id.b.area, remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-		atomic_set(&amp;remote_fcport-&gt;state, FCS_ONLINE);</div><div class='del'>-	} else {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Adisc IOCB -- marking "</div><div class='del'>-		    "[%x/%02x%02x%02x] lost, status=%x mb0=%x.\n", ha-&gt;host_no,</div><div class='del'>-		    remote_fcport-&gt;loop_id, remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-		    remote_fcport-&gt;d_id.b.area, remote_fcport-&gt;d_id.b.al_pa,</div><div class='del'>-		    le16_to_cpu(mbxstat-&gt;status), le16_to_cpu(mbxstat-&gt;mb0)));</div><div class='del'>-</div><div class='del'>-		if (atomic_read(&amp;remote_fcport-&gt;state) != FCS_DEVICE_DEAD)</div><div class='del'>-			atomic_set(&amp;remote_fcport-&gt;state, FCS_DEVICE_LOST);</div><div class='del'>-	}</div><div class='del'>-	remote_fcport-&gt;iodesc_idx_sent = IODESC_INVALID_INDEX;</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_logout_iocb() - Issue a fabric port logout IOCB to the firmware.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @ha_locked: is function called with the hardware lock</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if the IOCB was issued.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_logout_iocb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    int ha_locked)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags = 0;</div><div class='del'>-	struct mbx_entry *mbxentry;</div><div class='del'>-</div><div class='del'>-	/* Send marker if required. */</div><div class='del'>-	if (qla2x00_issue_marker(ha, ha_locked) != QLA_SUCCESS)</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Build fabric port logout mailbox IOCB. */</div><div class='del'>-	mbxentry = qla2x00_get_mbx_iocb_entry(ha, iodesc-&gt;signature);</div><div class='del'>-	if (mbxentry == NULL) {</div><div class='del'>-		if (!ha_locked)</div><div class='del'>-			spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-	}</div><div class='del'>-	mbxentry-&gt;mb0 = __constant_cpu_to_le16(MBC_LOGOUT_FABRIC_PORT);</div><div class='del'>-	mbxentry-&gt;mb1 = mbxentry-&gt;loop_id.extended =</div><div class='del'>-	    cpu_to_le16(iodesc-&gt;remote_fcport-&gt;loop_id);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	qla2x00_add_iodesc_timer(iodesc);</div><div class='del'>-</div><div class='del'>-	/* Issue command to ISP. */</div><div class='del'>-	qla2x00_isp_cmd(ha);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Sending Logout IOCB (%08x) to [%x].\n",</div><div class='del'>-	    ha-&gt;host_no, iodesc-&gt;signature, iodesc-&gt;remote_fcport-&gt;loop_id));</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_logout_iocb_cb() - Fabric port logout IOCB callback.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @mbxstat: mailbox status IOCB</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if @iodesc can be freed by the caller, else, @iodesc</div><div class='del'>- * will be used for a retry.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_logout_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    struct mbx_entry *mbxstat)</div><div class='del'>-{</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Logout IOCB -- sent to [%x/%02x%02x%02x], "</div><div class='del'>-	    "status=%x mb0=%x mb1=%x.\n", ha-&gt;host_no,</div><div class='del'>-	    iodesc-&gt;remote_fcport-&gt;loop_id,</div><div class='del'>-	    iodesc-&gt;remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-	    iodesc-&gt;remote_fcport-&gt;d_id.b.area,</div><div class='del'>-	    iodesc-&gt;remote_fcport-&gt;d_id.b.al_pa, le16_to_cpu(mbxstat-&gt;status),</div><div class='del'>-	    le16_to_cpu(mbxstat-&gt;mb0), le16_to_cpu(mbxstat-&gt;mb1)));</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_login_iocb() - Issue a fabric port login IOCB to the firmware.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @d_id: port id for device</div><div class='del'>- * @ha_locked: is function called with the hardware lock</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if the IOCB was issued.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_login_iocb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    port_id_t *d_id, int ha_locked)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags = 0;</div><div class='del'>-	struct mbx_entry *mbxentry;</div><div class='del'>-</div><div class='del'>-	/* Send marker if required. */</div><div class='del'>-	if (qla2x00_issue_marker(ha, ha_locked) != QLA_SUCCESS)</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_lock_irqsave(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Build fabric port login mailbox IOCB. */</div><div class='del'>-	mbxentry = qla2x00_get_mbx_iocb_entry(ha, iodesc-&gt;signature);</div><div class='del'>-	if (mbxentry == NULL) {</div><div class='del'>-		if (!ha_locked)</div><div class='del'>-			spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-		return (QLA_FUNCTION_FAILED);</div><div class='del'>-	}</div><div class='del'>-	mbxentry-&gt;mb0 = __constant_cpu_to_le16(MBC_LOGIN_FABRIC_PORT);</div><div class='del'>-	mbxentry-&gt;mb1 = mbxentry-&gt;loop_id.extended =</div><div class='del'>-	    cpu_to_le16(iodesc-&gt;remote_fcport-&gt;loop_id);</div><div class='del'>-	mbxentry-&gt;mb2 = cpu_to_le16(d_id-&gt;b.domain);</div><div class='del'>-	mbxentry-&gt;mb3 = cpu_to_le16(d_id-&gt;b.area &lt;&lt; 8 | d_id-&gt;b.al_pa);</div><div class='del'>-	mbxentry-&gt;mb10 = __constant_cpu_to_le16(BIT_0);</div><div class='del'>-	wmb();</div><div class='del'>-</div><div class='del'>-	qla2x00_add_iodesc_timer(iodesc);</div><div class='del'>-</div><div class='del'>-	/* Issue command to ISP. */</div><div class='del'>-	qla2x00_isp_cmd(ha);</div><div class='del'>-</div><div class='del'>-	if (!ha_locked)</div><div class='del'>-		spin_unlock_irqrestore(&amp;ha-&gt;hardware_lock, flags);</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Sending Login IOCB (%08x) to "</div><div class='del'>-	    "[%x/%02x%02x%02x].\n", ha-&gt;host_no, iodesc-&gt;signature,</div><div class='del'>-	    iodesc-&gt;remote_fcport-&gt;loop_id, d_id-&gt;b.domain, d_id-&gt;b.area,</div><div class='del'>-	    d_id-&gt;b.al_pa));</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_send_login_iocb_cb() - Fabric port logout IOCB callback.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @iodesc: io descriptor</div><div class='del'>- * @mbxstat: mailbox status IOCB</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if @iodesc can be freed by the caller, else, @iodesc</div><div class='del'>- * will be used for a retry.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-qla2x00_send_login_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,</div><div class='del'>-    struct mbx_entry *mbxstat)</div><div class='del'>-{</div><div class='del'>-	int rval;</div><div class='del'>-	fc_port_t *fcport, *remote_fcport, *exist_fcport;</div><div class='del'>-	struct io_descriptor *abort_iodesc, *login_iodesc;</div><div class='del'>-	uint16_t status, mb[8];</div><div class='del'>-	uint16_t reuse;</div><div class='del'>-	uint16_t remote_loopid;</div><div class='del'>-	port_id_t remote_did, inuse_did;</div><div class='del'>-</div><div class='del'>-	remote_fcport = iodesc-&gt;remote_fcport;</div><div class='del'>-</div><div class='del'>-	/* Only process the last command. */</div><div class='del'>-	if (remote_fcport-&gt;iodesc_idx_sent != iodesc-&gt;idx) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Login IOCB -- ignoring, sent to "</div><div class='del'>-		    "[%02x%02x%02x], expected %x, received %x.\n",</div><div class='del'>-		    ha-&gt;host_no, iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-		    iodesc-&gt;d_id.b.al_pa, remote_fcport-&gt;iodesc_idx_sent,</div><div class='del'>-		    iodesc-&gt;idx));</div><div class='del'>-</div><div class='del'>-		/* Free RSCN fcport resources. */</div><div class='del'>-		if (remote_fcport-&gt;port_type == FCT_RSCN) {</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Login IOCB -- Freeing RSCN "</div><div class='del'>-			    "fcport %p [%x/%02x%02x%02x] given ignored Login "</div><div class='del'>-			    "IOCB.\n", ha-&gt;host_no, remote_fcport,</div><div class='del'>-			    remote_fcport-&gt;loop_id,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.area,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-			list_del(&amp;remote_fcport-&gt;list);</div><div class='del'>-			kfree(remote_fcport);</div><div class='del'>-		}</div><div class='del'>-		return (QLA_SUCCESS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = le16_to_cpu(mbxstat-&gt;status);</div><div class='del'>-	mb[0] = le16_to_cpu(mbxstat-&gt;mb0);</div><div class='del'>-	mb[1] = le16_to_cpu(mbxstat-&gt;mb1);</div><div class='del'>-	mb[2] = le16_to_cpu(mbxstat-&gt;mb2);</div><div class='del'>-	mb[6] = le16_to_cpu(mbxstat-&gt;mb6);</div><div class='del'>-	mb[7] = le16_to_cpu(mbxstat-&gt;mb7);</div><div class='del'>-</div><div class='del'>-	/* Good status? */</div><div class='del'>-	if ((status == CS_COMPLETE || status == CS_COMPLETE_CHKCOND) &amp;&amp;</div><div class='del'>-	    mb[0] == MBS_COMMAND_COMPLETE) {</div><div class='del'>-</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Login IOCB -- status=%x mb1=%x pn="</div><div class='del'>-		    "%02x%02x%02x%02x%02x%02x%02x%02x.\n", ha-&gt;host_no, status,</div><div class='del'>-		    mb[1], mbxstat-&gt;port_name[0], mbxstat-&gt;port_name[1],</div><div class='del'>-		    mbxstat-&gt;port_name[2], mbxstat-&gt;port_name[3],</div><div class='del'>-		    mbxstat-&gt;port_name[4], mbxstat-&gt;port_name[5],</div><div class='del'>-		    mbxstat-&gt;port_name[6], mbxstat-&gt;port_name[7]));</div><div class='del'>-</div><div class='del'>-		memcpy(remote_fcport-&gt;node_name, mbxstat-&gt;node_name, WWN_SIZE);</div><div class='del'>-		memcpy(remote_fcport-&gt;port_name, mbxstat-&gt;port_name, WWN_SIZE);</div><div class='del'>-</div><div class='del'>-		/* Is the device already in our fcports list? */</div><div class='del'>-		if (remote_fcport-&gt;port_type != FCT_RSCN) {</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Login IOCB -- marking "</div><div class='del'>-			    "[%x/%02x%02x%02x] online.\n", ha-&gt;host_no,</div><div class='del'>-			    remote_fcport-&gt;loop_id,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.area,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-			qla2x00_update_login_fcport(ha, mbxstat, remote_fcport);</div><div class='del'>-</div><div class='del'>-			return (QLA_SUCCESS);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Does the RSCN portname already exist in our fcports list? */</div><div class='del'>-		exist_fcport = NULL;</div><div class='del'>-		list_for_each_entry(fcport, &amp;ha-&gt;fcports, list) {</div><div class='del'>-			if (memcmp(remote_fcport-&gt;port_name, fcport-&gt;port_name,</div><div class='del'>-			    WWN_SIZE) == 0) {</div><div class='del'>-				exist_fcport = fcport;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (exist_fcport != NULL) {</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Login IOCB -- found RSCN "</div><div class='del'>-			    "fcport in fcports list [%p].\n", ha-&gt;host_no,</div><div class='del'>-			    exist_fcport));</div><div class='del'>-</div><div class='del'>-			/* Abort any ADISC that could have been sent. */</div><div class='del'>-			if (exist_fcport-&gt;iodesc_idx_sent != iodesc-&gt;idx &amp;&amp;</div><div class='del'>-			    exist_fcport-&gt;iodesc_idx_sent &lt;</div><div class='del'>-			    MAX_IO_DESCRIPTORS &amp;&amp;</div><div class='del'>-			    ha-&gt;io_descriptors[exist_fcport-&gt;iodesc_idx_sent].</div><div class='del'>-			    cb_idx == ADISC_PORT_IOCB_CB) {</div><div class='del'>-</div><div class='del'>-				abort_iodesc = qla2x00_alloc_iodesc(ha);</div><div class='del'>-				if (abort_iodesc) {</div><div class='del'>-					DEBUG14(printk("scsi(%ld): Login IOCB "</div><div class='del'>-					    "-- issuing abort to outstanding "</div><div class='del'>-					    "Adisc [%x/%02x%02x%02x].\n",</div><div class='del'>-					    ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.domain,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.area,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-					abort_iodesc-&gt;cb_idx = ABORT_IOCB_CB;</div><div class='del'>-					abort_iodesc-&gt;d_id.b24 =</div><div class='del'>-					    exist_fcport-&gt;d_id.b24;</div><div class='del'>-					abort_iodesc-&gt;remote_fcport =</div><div class='del'>-					    exist_fcport;</div><div class='del'>-					exist_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-					    abort_iodesc-&gt;idx;</div><div class='del'>-					qla2x00_send_abort_iocb(ha,</div><div class='del'>-					    abort_iodesc, ha-&gt;io_descriptors[</div><div class='del'>-					     exist_fcport-&gt;iodesc_idx_sent].</div><div class='del'>-					      signature, 1);</div><div class='del'>-				} else {</div><div class='del'>-					DEBUG14(printk("scsi(%ld): Login IOCB "</div><div class='del'>-					    "-- unable to abort outstanding "</div><div class='del'>-					    "Adisc [%x/%02x%02x%02x].\n",</div><div class='del'>-					    ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.domain,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.area,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * If the existing fcport is waiting to send an ADISC</div><div class='del'>-			 * or LOGIN, then reuse remote fcport (RSCN) to</div><div class='del'>-			 * continue waiting.</div><div class='del'>-			 */</div><div class='del'>-			reuse = 0;</div><div class='del'>-			remote_loopid = remote_fcport-&gt;loop_id;</div><div class='del'>-			remote_did.b24 = remote_fcport-&gt;d_id.b24;</div><div class='del'>-			if (exist_fcport-&gt;iodesc_idx_sent ==</div><div class='del'>-			    IODESC_ADISC_NEEDED ||</div><div class='del'>-			    exist_fcport-&gt;iodesc_idx_sent ==</div><div class='del'>-			    IODESC_LOGIN_NEEDED) {</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Login IOCB -- "</div><div class='del'>-				    "existing fcport [%x/%02x%02x%02x] "</div><div class='del'>-				    "waiting for IO descriptor, reuse RSCN "</div><div class='del'>-				    "fcport.\n", ha-&gt;host_no,</div><div class='del'>-				    exist_fcport-&gt;loop_id,</div><div class='del'>-				    exist_fcport-&gt;d_id.b.domain,</div><div class='del'>-				    exist_fcport-&gt;d_id.b.area,</div><div class='del'>-				    exist_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-				reuse++;</div><div class='del'>-				remote_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-				    exist_fcport-&gt;iodesc_idx_sent;</div><div class='del'>-				exist_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-				    IODESC_INVALID_INDEX;</div><div class='del'>-				remote_fcport-&gt;loop_id = exist_fcport-&gt;loop_id;</div><div class='del'>-				remote_fcport-&gt;d_id.b24 =</div><div class='del'>-				    exist_fcport-&gt;d_id.b24;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Logout the old loopid. */</div><div class='del'>-			if (!reuse &amp;&amp;</div><div class='del'>-			    exist_fcport-&gt;loop_id != remote_fcport-&gt;loop_id &amp;&amp;</div><div class='del'>-			    exist_fcport-&gt;loop_id != FC_NO_LOOP_ID) {</div><div class='del'>-				login_iodesc = qla2x00_alloc_iodesc(ha);</div><div class='del'>-				if (login_iodesc) {</div><div class='del'>-					DEBUG14(printk("scsi(%ld): Login IOCB "</div><div class='del'>-					    "-- issuing logout to free old "</div><div class='del'>-					    "loop id [%x/%02x%02x%02x].\n",</div><div class='del'>-					    ha-&gt;host_no, exist_fcport-&gt;loop_id,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.domain,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.area,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-					login_iodesc-&gt;cb_idx =</div><div class='del'>-					    LOGOUT_PORT_IOCB_CB;</div><div class='del'>-					login_iodesc-&gt;d_id.b24 =</div><div class='del'>-					    exist_fcport-&gt;d_id.b24;</div><div class='del'>-					login_iodesc-&gt;remote_fcport =</div><div class='del'>-					    exist_fcport;</div><div class='del'>-					exist_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-					    login_iodesc-&gt;idx;</div><div class='del'>-					qla2x00_send_logout_iocb(ha,</div><div class='del'>-					    login_iodesc, 1);</div><div class='del'>-				} else {</div><div class='del'>-					/* Ran out of IO descriptiors. */</div><div class='del'>-					DEBUG14(printk("scsi(%ld): Login IOCB "</div><div class='del'>-					    "-- unable to logout to free old "</div><div class='del'>-					    "loop id [%x/%02x%02x%02x].\n",</div><div class='del'>-					    ha-&gt;host_no, exist_fcport-&gt;loop_id,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.domain,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.area,</div><div class='del'>-					    exist_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-					exist_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-					    IODESC_INVALID_INDEX;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Update existing fcport with remote fcport info. */</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Login IOCB -- marking "</div><div class='del'>-			    "existing fcport [%x/%02x%02x%02x] online.\n",</div><div class='del'>-			    ha-&gt;host_no, remote_loopid, remote_did.b.domain,</div><div class='del'>-			    remote_did.b.area, remote_did.b.al_pa));</div><div class='del'>-</div><div class='del'>-			memcpy(exist_fcport-&gt;node_name,</div><div class='del'>-			    remote_fcport-&gt;node_name, WWN_SIZE);</div><div class='del'>-			exist_fcport-&gt;loop_id = remote_loopid;</div><div class='del'>-			exist_fcport-&gt;d_id.b24 = remote_did.b24;</div><div class='del'>-			qla2x00_update_login_fcport(ha, mbxstat, exist_fcport);</div><div class='del'>-</div><div class='del'>-			/* Finally, free the remote (RSCN) fcport. */</div><div class='del'>-			if (!reuse) {</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Login IOCB -- "</div><div class='del'>-				    "Freeing RSCN fcport %p "</div><div class='del'>-				    "[%x/%02x%02x%02x].\n", ha-&gt;host_no,</div><div class='del'>-				    remote_fcport, remote_fcport-&gt;loop_id,</div><div class='del'>-				    remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-				    remote_fcport-&gt;d_id.b.area,</div><div class='del'>-				    remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-				list_del(&amp;remote_fcport-&gt;list);</div><div class='del'>-				kfree(remote_fcport);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			return (QLA_SUCCESS);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * A new device has been added, move the RSCN fcport to our</div><div class='del'>-		 * fcports list.</div><div class='del'>-		 */</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Login IOCB -- adding RSCN fcport "</div><div class='del'>-		    "[%x/%02x%02x%02x] to fcports list.\n", ha-&gt;host_no,</div><div class='del'>-		    remote_fcport-&gt;loop_id, remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-		    remote_fcport-&gt;d_id.b.area, remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-		list_del(&amp;remote_fcport-&gt;list);</div><div class='del'>-		remote_fcport-&gt;flags = (FCF_RLC_SUPPORT | FCF_RESCAN_NEEDED);</div><div class='del'>-		qla2x00_update_login_fcport(ha, mbxstat, remote_fcport);</div><div class='del'>-		list_add_tail(&amp;remote_fcport-&gt;list, &amp;ha-&gt;fcports);</div><div class='del'>-		set_bit(FCPORT_RESCAN_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='del'>-	} else {</div><div class='del'>-		/* Handle login failure. */</div><div class='del'>-		if (remote_fcport-&gt;login_retry != 0) {</div><div class='del'>-			if (mb[0] == MBS_LOOP_ID_USED) {</div><div class='del'>-				inuse_did.b.domain = LSB(mb[1]);</div><div class='del'>-				inuse_did.b.area = MSB(mb[2]);</div><div class='del'>-				inuse_did.b.al_pa = LSB(mb[2]);</div><div class='del'>-</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Login IOCB -- loop "</div><div class='del'>-				    "id [%x] used by port id [%02x%02x%02x].\n",</div><div class='del'>-				    ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-				    inuse_did.b.domain, inuse_did.b.area,</div><div class='del'>-				    inuse_did.b.al_pa));</div><div class='del'>-</div><div class='del'>-				if (remote_fcport-&gt;d_id.b24 ==</div><div class='del'>-				    INVALID_PORT_ID) {</div><div class='del'>-					/*</div><div class='del'>-					 * Invalid port id means we are trying</div><div class='del'>-					 * to login to a remote port with just</div><div class='del'>-					 * a loop id without knowing about the</div><div class='del'>-					 * port id.  Copy the port id and try</div><div class='del'>-					 * again.</div><div class='del'>-					 */</div><div class='del'>-					remote_fcport-&gt;d_id.b24 = inuse_did.b24;</div><div class='del'>-					iodesc-&gt;d_id.b24 = inuse_did.b24;</div><div class='del'>-				} else {</div><div class='del'>-					remote_fcport-&gt;loop_id++;</div><div class='del'>-					rval = qla2x00_find_new_loop_id(ha,</div><div class='del'>-					    remote_fcport);</div><div class='del'>-					if (rval == QLA_FUNCTION_FAILED) {</div><div class='del'>-						/* No more loop ids. */</div><div class='del'>-						return (QLA_SUCCESS);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} else if (mb[0] == MBS_PORT_ID_USED) {</div><div class='del'>-				/*</div><div class='del'>-				 * Device has another loop ID.  The firmware</div><div class='del'>-				 * group recommends the driver perform an</div><div class='del'>-				 * implicit login with the specified ID.</div><div class='del'>-				 */</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Login IOCB -- port "</div><div class='del'>-				    "id [%02x%02x%02x] already assigned to "</div><div class='del'>-				    "loop id [%x].\n", ha-&gt;host_no,</div><div class='del'>-				    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-				    iodesc-&gt;d_id.b.al_pa, mb[1]));</div><div class='del'>-</div><div class='del'>-				remote_fcport-&gt;loop_id = mb[1];</div><div class='del'>-</div><div class='del'>-			} else {</div><div class='del'>-				/* Unable to perform login, try again. */</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Login IOCB -- "</div><div class='del'>-				    "failed login [%x/%02x%02x%02x], status=%x "</div><div class='del'>-				    "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n",</div><div class='del'>-				    ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-				    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-				    iodesc-&gt;d_id.b.al_pa, status, mb[0], mb[1],</div><div class='del'>-				    mb[2], mb[6], mb[7]));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Reissue Login with the same IO descriptor. */</div><div class='del'>-			iodesc-&gt;signature =</div><div class='del'>-			    qla2x00_iodesc_to_handle(iodesc);</div><div class='del'>-			iodesc-&gt;cb_idx = LOGIN_PORT_IOCB_CB;</div><div class='del'>-			iodesc-&gt;d_id.b24 = remote_fcport-&gt;d_id.b24;</div><div class='del'>-			remote_fcport-&gt;iodesc_idx_sent = iodesc-&gt;idx;</div><div class='del'>-			remote_fcport-&gt;login_retry--;</div><div class='del'>-</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Login IOCB -- retrying "</div><div class='del'>-			    "login to [%x/%02x%02x%02x] (%d).\n", ha-&gt;host_no,</div><div class='del'>-			    remote_fcport-&gt;loop_id,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.area,</div><div class='del'>-			    remote_fcport-&gt;d_id.b.al_pa,</div><div class='del'>-			    remote_fcport-&gt;login_retry));</div><div class='del'>-</div><div class='del'>-			qla2x00_send_login_iocb(ha, iodesc,</div><div class='del'>-			    &amp;remote_fcport-&gt;d_id, 1);</div><div class='del'>-</div><div class='del'>-			return (QLA_FUNCTION_FAILED);</div><div class='del'>-		} else {</div><div class='del'>-			/* No more logins, mark device dead. */</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Login IOCB -- failed "</div><div class='del'>-			    "login [%x/%02x%02x%02x] after retries, status=%x "</div><div class='del'>-			    "mb0=%x mb1=%x mb2=%x mb6=%x mb7=%x.\n",</div><div class='del'>-			    ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-			    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-			    iodesc-&gt;d_id.b.al_pa, status, mb[0], mb[1],</div><div class='del'>-			    mb[2], mb[6], mb[7]));</div><div class='del'>-</div><div class='del'>-			atomic_set(&amp;remote_fcport-&gt;state, FCS_DEVICE_DEAD);</div><div class='del'>-			if (remote_fcport-&gt;port_type == FCT_RSCN) {</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Login IOCB -- "</div><div class='del'>-				    "Freeing dead RSCN fcport %p "</div><div class='del'>-				    "[%x/%02x%02x%02x].\n", ha-&gt;host_no,</div><div class='del'>-				    remote_fcport, remote_fcport-&gt;loop_id,</div><div class='del'>-				    remote_fcport-&gt;d_id.b.domain,</div><div class='del'>-				    remote_fcport-&gt;d_id.b.area,</div><div class='del'>-				    remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-				list_del(&amp;remote_fcport-&gt;list);</div><div class='del'>-				kfree(remote_fcport);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * IO descriptor processing routines.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_alloc_rscn_fcport() - Allocate an RSCN type fcport.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @flags: allocation flags</div><div class='del'>- *</div><div class='del'>- * Returns a pointer to the allocated RSCN fcport, or NULL, if none available.</div><div class='del'>- */</div><div class='del'>-fc_port_t *</div><div class='del'>-qla2x00_alloc_rscn_fcport(scsi_qla_host_t *ha, gfp_t flags)</div><div class='del'>-{</div><div class='del'>-	fc_port_t *fcport;</div><div class='del'>-</div><div class='del'>-	fcport = qla2x00_alloc_fcport(ha, flags);</div><div class='del'>-	if (fcport == NULL)</div><div class='del'>-		return (fcport);</div><div class='del'>-</div><div class='del'>-	/* Setup RSCN fcport structure. */</div><div class='del'>-	fcport-&gt;port_type = FCT_RSCN;</div><div class='del'>-</div><div class='del'>-	return (fcport);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_handle_port_rscn() - Handle port RSCN.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @rscn_entry: RSCN entry</div><div class='del'>- * @fcport: fcport entry to updated</div><div class='del'>- *</div><div class='del'>- * Returns QLA_SUCCESS if the port RSCN was handled.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-qla2x00_handle_port_rscn(scsi_qla_host_t *ha, uint32_t rscn_entry,</div><div class='del'>-    fc_port_t *known_fcport, int ha_locked)</div><div class='del'>-{</div><div class='del'>-	int	rval;</div><div class='del'>-	port_id_t rscn_pid;</div><div class='del'>-	fc_port_t *fcport, *remote_fcport, *rscn_fcport;</div><div class='del'>-	struct io_descriptor *iodesc;</div><div class='del'>-</div><div class='del'>-	remote_fcport = NULL;</div><div class='del'>-	rscn_fcport = NULL;</div><div class='del'>-</div><div class='del'>-	/* Prepare port id based on incoming entries. */</div><div class='del'>-	if (known_fcport) {</div><div class='del'>-		rscn_pid.b24 = known_fcport-&gt;d_id.b24;</div><div class='del'>-		remote_fcport = known_fcport;</div><div class='del'>-</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Handle RSCN -- process RSCN for "</div><div class='del'>-		    "fcport [%02x%02x%02x].\n", ha-&gt;host_no,</div><div class='del'>-		    remote_fcport-&gt;d_id.b.domain, remote_fcport-&gt;d_id.b.area,</div><div class='del'>-		    remote_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-	} else {</div><div class='del'>-		rscn_pid.b.domain = LSB(MSW(rscn_entry));</div><div class='del'>-		rscn_pid.b.area = MSB(LSW(rscn_entry));</div><div class='del'>-		rscn_pid.b.al_pa = LSB(LSW(rscn_entry));</div><div class='del'>-</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Handle RSCN -- process RSCN for "</div><div class='del'>-		    "port id [%02x%02x%02x].\n", ha-&gt;host_no,</div><div class='del'>-		    rscn_pid.b.domain, rscn_pid.b.area, rscn_pid.b.al_pa));</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Search fcport lists for a known entry at the specified port</div><div class='del'>-		 * ID.</div><div class='del'>-		 */</div><div class='del'>-		list_for_each_entry(fcport, &amp;ha-&gt;fcports, list) {</div><div class='del'>-		    if (rscn_pid.b24 == fcport-&gt;d_id.b24) {</div><div class='del'>-			    remote_fcport = fcport;</div><div class='del'>-			    break;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-		list_for_each_entry(fcport, &amp;ha-&gt;rscn_fcports, list) {</div><div class='del'>-		    if (rscn_pid.b24 == fcport-&gt;d_id.b24) {</div><div class='del'>-			    rscn_fcport = fcport;</div><div class='del'>-			    break;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-		if (remote_fcport == NULL)</div><div class='del'>-		    remote_fcport = rscn_fcport;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the port is already in our fcport list and online, send an ADISC</div><div class='del'>-	 * to see if it's still alive.  Issue login if a new fcport or the known</div><div class='del'>-	 * fcport is currently offline.</div><div class='del'>-	 */</div><div class='del'>-	if (remote_fcport) {</div><div class='del'>-		/*</div><div class='del'>-		 * No need to send request if the remote fcport is currently</div><div class='del'>-		 * waiting for an available io descriptor.</div><div class='del'>-		 */</div><div class='del'>-		if (known_fcport == NULL &amp;&amp;</div><div class='del'>-		    (remote_fcport-&gt;iodesc_idx_sent == IODESC_ADISC_NEEDED ||</div><div class='del'>-		    remote_fcport-&gt;iodesc_idx_sent == IODESC_LOGIN_NEEDED)) {</div><div class='del'>-			/*</div><div class='del'>-			 * If previous waiting io descriptor is an ADISC, then</div><div class='del'>-			 * the new RSCN may come from a new remote fcport being</div><div class='del'>-			 * plugged into the same location.</div><div class='del'>-			 */</div><div class='del'>-			if (remote_fcport-&gt;port_type == FCT_RSCN) {</div><div class='del'>-			    remote_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-				IODESC_LOGIN_NEEDED;</div><div class='del'>-			} else if (remote_fcport-&gt;iodesc_idx_sent ==</div><div class='del'>-			    IODESC_ADISC_NEEDED) {</div><div class='del'>-				fc_port_t *new_fcport;</div><div class='del'>-</div><div class='del'>-				remote_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-				    IODESC_INVALID_INDEX;</div><div class='del'>-</div><div class='del'>-				/* Create new fcport for later login. */</div><div class='del'>-				new_fcport = qla2x00_alloc_rscn_fcport(ha,</div><div class='del'>-				    ha_locked ? GFP_ATOMIC: GFP_KERNEL);</div><div class='del'>-				if (new_fcport) {</div><div class='del'>-					DEBUG14(printk("scsi(%ld): Handle RSCN "</div><div class='del'>-					    "-- creating RSCN fcport %p for "</div><div class='del'>-					    "future login.\n", ha-&gt;host_no,</div><div class='del'>-					    new_fcport));</div><div class='del'>-</div><div class='del'>-					new_fcport-&gt;d_id.b24 =</div><div class='del'>-					    remote_fcport-&gt;d_id.b24;</div><div class='del'>-					new_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-					    IODESC_LOGIN_NEEDED;</div><div class='del'>-</div><div class='del'>-					list_add_tail(&amp;new_fcport-&gt;list,</div><div class='del'>-					    &amp;ha-&gt;rscn_fcports);</div><div class='del'>-					set_bit(IODESC_PROCESS_NEEDED,</div><div class='del'>-					    &amp;ha-&gt;dpc_flags);</div><div class='del'>-				} else {</div><div class='del'>-					DEBUG14(printk("scsi(%ld): Handle RSCN "</div><div class='del'>-					    "-- unable to allocate RSCN fcport "</div><div class='del'>-					    "for future login.\n",</div><div class='del'>-					    ha-&gt;host_no));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return (QLA_SUCCESS);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Send ADISC if the fcport is online */</div><div class='del'>-		if (atomic_read(&amp;remote_fcport-&gt;state) == FCS_ONLINE ||</div><div class='del'>-		    remote_fcport-&gt;iodesc_idx_sent == IODESC_ADISC_NEEDED) {</div><div class='del'>-</div><div class='del'>-			atomic_set(&amp;remote_fcport-&gt;state, FCS_DEVICE_LOST);</div><div class='del'>-</div><div class='del'>-			iodesc = qla2x00_alloc_iodesc(ha);</div><div class='del'>-			if (iodesc == NULL) {</div><div class='del'>-				/* Mark fcport for later adisc processing */</div><div class='del'>-				DEBUG14(printk("scsi(%ld): Handle RSCN -- not "</div><div class='del'>-				    "enough IO descriptors for Adisc, flag "</div><div class='del'>-				    "for later processing.\n", ha-&gt;host_no));</div><div class='del'>-</div><div class='del'>-				remote_fcport-&gt;iodesc_idx_sent =</div><div class='del'>-				    IODESC_ADISC_NEEDED;</div><div class='del'>-				set_bit(IODESC_PROCESS_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-				return (QLA_SUCCESS);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			iodesc-&gt;cb_idx = ADISC_PORT_IOCB_CB;</div><div class='del'>-			iodesc-&gt;d_id.b24 = rscn_pid.b24;</div><div class='del'>-			iodesc-&gt;remote_fcport = remote_fcport;</div><div class='del'>-			remote_fcport-&gt;iodesc_idx_sent = iodesc-&gt;idx;</div><div class='del'>-			qla2x00_send_adisc_iocb(ha, iodesc, ha_locked);</div><div class='del'>-</div><div class='del'>-			return (QLA_SUCCESS);</div><div class='del'>-		} else if (remote_fcport-&gt;iodesc_idx_sent &lt;</div><div class='del'>-		    MAX_IO_DESCRIPTORS &amp;&amp;</div><div class='del'>-		    ha-&gt;io_descriptors[remote_fcport-&gt;iodesc_idx_sent].cb_idx ==</div><div class='del'>-		    ADISC_PORT_IOCB_CB) {</div><div class='del'>-			/*</div><div class='del'>-			 * Receiving another RSCN while an ADISC is pending,</div><div class='del'>-			 * abort the IOCB.  Use the same descriptor for the</div><div class='del'>-			 * abort.</div><div class='del'>-			 */</div><div class='del'>-			uint32_t handle_to_abort;</div><div class='del'>-</div><div class='del'>-			iodesc = &amp;ha-&gt;io_descriptors[</div><div class='del'>-				remote_fcport-&gt;iodesc_idx_sent];</div><div class='del'>-			qla2x00_remove_iodesc_timer(iodesc);</div><div class='del'>-			handle_to_abort = iodesc-&gt;signature;</div><div class='del'>-			iodesc-&gt;signature = qla2x00_iodesc_to_handle(iodesc);</div><div class='del'>-			iodesc-&gt;cb_idx = ABORT_IOCB_CB;</div><div class='del'>-			iodesc-&gt;d_id.b24 = remote_fcport-&gt;d_id.b24;</div><div class='del'>-			iodesc-&gt;remote_fcport = remote_fcport;</div><div class='del'>-			remote_fcport-&gt;iodesc_idx_sent = iodesc-&gt;idx;</div><div class='del'>-</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Handle RSCN -- issuing "</div><div class='del'>-			    "abort to outstanding Adisc [%x/%02x%02x%02x].\n",</div><div class='del'>-			    ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-			    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area,</div><div class='del'>-			    iodesc-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-			qla2x00_send_abort_iocb(ha, iodesc, handle_to_abort,</div><div class='del'>-			    ha_locked);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We need to login to the remote port, find it. */</div><div class='del'>-	if (known_fcport) {</div><div class='del'>-		remote_fcport = known_fcport;</div><div class='del'>-	} else if (rscn_fcport &amp;&amp; rscn_fcport-&gt;d_id.b24 != INVALID_PORT_ID &amp;&amp;</div><div class='del'>-	    rscn_fcport-&gt;iodesc_idx_sent &lt; MAX_IO_DESCRIPTORS &amp;&amp;</div><div class='del'>-	    ha-&gt;io_descriptors[rscn_fcport-&gt;iodesc_idx_sent].cb_idx ==</div><div class='del'>-	    LOGIN_PORT_IOCB_CB) {</div><div class='del'>-		/*</div><div class='del'>-		 * Ignore duplicate RSCN on fcport which has already</div><div class='del'>-		 * initiated a login IOCB.</div><div class='del'>-		 */</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Handle RSCN -- ignoring, login "</div><div class='del'>-		    "already sent to [%02x%02x%02x].\n", ha-&gt;host_no,</div><div class='del'>-		    rscn_fcport-&gt;d_id.b.domain, rscn_fcport-&gt;d_id.b.area,</div><div class='del'>-		    rscn_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-		return (QLA_SUCCESS);</div><div class='del'>-	} else if (rscn_fcport &amp;&amp; rscn_fcport-&gt;d_id.b24 != INVALID_PORT_ID &amp;&amp;</div><div class='del'>-	    rscn_fcport != remote_fcport) {</div><div class='del'>-		/* Reuse same rscn fcport. */</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Handle RSCN -- reusing RSCN fcport "</div><div class='del'>-		    "[%02x%02x%02x].\n", ha-&gt;host_no,</div><div class='del'>-		    rscn_fcport-&gt;d_id.b.domain, rscn_fcport-&gt;d_id.b.area,</div><div class='del'>-		    rscn_fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-		remote_fcport = rscn_fcport;</div><div class='del'>-	} else {</div><div class='del'>-		/* Create new fcport for later login. */</div><div class='del'>-		remote_fcport = qla2x00_alloc_rscn_fcport(ha,</div><div class='del'>-		    ha_locked ? GFP_ATOMIC: GFP_KERNEL);</div><div class='del'>-		list_add_tail(&amp;remote_fcport-&gt;list, &amp;ha-&gt;rscn_fcports);</div><div class='del'>-	}</div><div class='del'>-	if (remote_fcport == NULL)</div><div class='del'>-		return (QLA_SUCCESS);</div><div class='del'>-</div><div class='del'>-	/* Prepare fcport for login. */</div><div class='del'>-	atomic_set(&amp;remote_fcport-&gt;state, FCS_DEVICE_LOST);</div><div class='del'>-	remote_fcport-&gt;login_retry = 3; /* ha-&gt;login_retry_count; */</div><div class='del'>-	remote_fcport-&gt;d_id.b24 = rscn_pid.b24;</div><div class='del'>-</div><div class='del'>-	iodesc = qla2x00_alloc_iodesc(ha);</div><div class='del'>-	if (iodesc == NULL) {</div><div class='del'>-		/* Mark fcport for later adisc processing. */</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Handle RSCN -- not enough IO "</div><div class='del'>-		    "descriptors for Login, flag for later processing.\n",</div><div class='del'>-		    ha-&gt;host_no));</div><div class='del'>-</div><div class='del'>-		remote_fcport-&gt;iodesc_idx_sent = IODESC_LOGIN_NEEDED;</div><div class='del'>-		set_bit(IODESC_PROCESS_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-		return (QLA_SUCCESS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (known_fcport == NULL || rscn_pid.b24 != INVALID_PORT_ID) {</div><div class='del'>-		remote_fcport-&gt;loop_id = ha-&gt;min_external_loopid;</div><div class='del'>-</div><div class='del'>-		rval = qla2x00_find_new_loop_id(ha, remote_fcport);</div><div class='del'>-		if (rval == QLA_FUNCTION_FAILED) {</div><div class='del'>-			/* No more loop ids, failed. */</div><div class='del'>-			DEBUG14(printk("scsi(%ld): Handle RSCN -- no available "</div><div class='del'>-			    "loop id to perform Login, failed.\n",</div><div class='del'>-			    ha-&gt;host_no));</div><div class='del'>-</div><div class='del'>-			return (rval);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iodesc-&gt;cb_idx = LOGIN_PORT_IOCB_CB;</div><div class='del'>-	iodesc-&gt;d_id.b24 = rscn_pid.b24;</div><div class='del'>-	iodesc-&gt;remote_fcport = remote_fcport;</div><div class='del'>-	remote_fcport-&gt;iodesc_idx_sent = iodesc-&gt;idx;</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Handle RSCN -- attempting login to "</div><div class='del'>-	    "[%x/%02x%02x%02x].\n", ha-&gt;host_no, remote_fcport-&gt;loop_id,</div><div class='del'>-	    iodesc-&gt;d_id.b.domain, iodesc-&gt;d_id.b.area, iodesc-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-	qla2x00_send_login_iocb(ha, iodesc, &amp;rscn_pid, ha_locked);</div><div class='del'>-</div><div class='del'>-	return (QLA_SUCCESS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_process_iodesc() - Complete IO descriptor processing.</div><div class='del'>- * @ha: HA context</div><div class='del'>- * @mbxstat: Mailbox IOCB status</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-qla2x00_process_iodesc(scsi_qla_host_t *ha, struct mbx_entry *mbxstat)</div><div class='del'>-{</div><div class='del'>-	int rval;</div><div class='del'>-	uint32_t signature;</div><div class='del'>-	fc_port_t *fcport;</div><div class='del'>-	struct io_descriptor *iodesc;</div><div class='del'>-</div><div class='del'>-	signature = mbxstat-&gt;handle;</div><div class='del'>-</div><div class='del'>-	DEBUG14(printk("scsi(%ld): Process IODesc -- processing %08x.\n",</div><div class='del'>-	    ha-&gt;host_no, signature));</div><div class='del'>-</div><div class='del'>-	/* Retrieve proper IO descriptor. */</div><div class='del'>-	iodesc = qla2x00_handle_to_iodesc(ha, signature);</div><div class='del'>-	if (iodesc == NULL) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Process IODesc -- ignoring, "</div><div class='del'>-		    "incorrect signature %08x.\n", ha-&gt;host_no, signature));</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Stop IO descriptor timer. */</div><div class='del'>-	qla2x00_remove_iodesc_timer(iodesc);</div><div class='del'>-</div><div class='del'>-	/* Verify signature match. */</div><div class='del'>-	if (iodesc-&gt;signature != signature) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Process IODesc -- ignoring, "</div><div class='del'>-		    "signature mismatch, sent %08x, received %08x.\n",</div><div class='del'>-		    ha-&gt;host_no, iodesc-&gt;signature, signature));</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Go with IOCB callback. */</div><div class='del'>-	rval = iocb_function_cb_list[iodesc-&gt;cb_idx](ha, iodesc, mbxstat);</div><div class='del'>-	if (rval != QLA_SUCCESS) {</div><div class='del'>-		/* IO descriptor reused by callback. */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qla2x00_free_iodesc(iodesc);</div><div class='del'>-</div><div class='del'>-	if (test_bit(IODESC_PROCESS_NEEDED, &amp;ha-&gt;dpc_flags)) {</div><div class='del'>-		/* Scan our fcports list for any RSCN requests. */</div><div class='del'>-		list_for_each_entry(fcport, &amp;ha-&gt;fcports, list) {</div><div class='del'>-			if (fcport-&gt;iodesc_idx_sent == IODESC_ADISC_NEEDED ||</div><div class='del'>-			    fcport-&gt;iodesc_idx_sent == IODESC_LOGIN_NEEDED) {</div><div class='del'>-				qla2x00_handle_port_rscn(ha, 0, fcport, 1);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Scan our RSCN fcports list for any RSCN requests. */</div><div class='del'>-		list_for_each_entry(fcport, &amp;ha-&gt;rscn_fcports, list) {</div><div class='del'>-			if (fcport-&gt;iodesc_idx_sent == IODESC_ADISC_NEEDED ||</div><div class='del'>-			    fcport-&gt;iodesc_idx_sent == IODESC_LOGIN_NEEDED) {</div><div class='del'>-				qla2x00_handle_port_rscn(ha, 0, fcport, 1);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	clear_bit(IODESC_PROCESS_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * qla2x00_cancel_io_descriptors() - Cancel all outstanding io descriptors.</div><div class='del'>- * @ha: HA context</div><div class='del'>- *</div><div class='del'>- * This routine will also delete any RSCN entries related to the outstanding</div><div class='del'>- * IO descriptors.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-qla2x00_cancel_io_descriptors(scsi_qla_host_t *ha)</div><div class='del'>-{</div><div class='del'>-	fc_port_t *fcport, *fcptemp;</div><div class='del'>-</div><div class='del'>-	clear_bit(IODESC_PROCESS_NEEDED, &amp;ha-&gt;dpc_flags);</div><div class='del'>-</div><div class='del'>-	/* Abort all IO descriptors. */</div><div class='del'>-	qla2x00_init_io_descriptors(ha);</div><div class='del'>-</div><div class='del'>-	/* Reset all pending IO descriptors in fcports list. */</div><div class='del'>-	list_for_each_entry(fcport, &amp;ha-&gt;fcports, list) {</div><div class='del'>-		fcport-&gt;iodesc_idx_sent = IODESC_INVALID_INDEX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset all pending IO descriptors in rscn fcports list. */</div><div class='del'>-	list_for_each_entry_safe(fcport, fcptemp, &amp;ha-&gt;rscn_fcports, list) {</div><div class='del'>-		DEBUG14(printk("scsi(%ld): Cancel IOs -- Freeing RSCN fcport "</div><div class='del'>-		    "%p [%x/%02x%02x%02x].\n", ha-&gt;host_no, fcport,</div><div class='del'>-		    fcport-&gt;loop_id, fcport-&gt;d_id.b.domain, fcport-&gt;d_id.b.area,</div><div class='del'>-		    fcport-&gt;d_id.b.al_pa));</div><div class='del'>-</div><div class='del'>-		list_del(&amp;fcport-&gt;list);</div><div class='del'>-		kfree(fcport);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_settings.h b/drivers/scsi/qla2xxx/qla_settings.h<br/>index 363205c0e84f..249e4d90fdc5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_settings.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_settings.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_settings.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_settings.h</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Max time to wait for the loop to be in LOOP_READY state */</div><div class='ctx'> #define MAX_LOOP_TIMEOUT	(60 * 5)</div><div class='del'>-#define EH_ACTIVE		1	/* Error handler active */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some vendor subsystems do not recover properly after a device reset.  Define</div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c<br/>index 8b0121dceb01..c71dbd5bd543 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_sup.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_sup.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_sup.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)</div><div class='ctx'> {</div><div class='ctx'> 	int count;</div><div class='ctx'> 	uint16_t word;</div><div class='del'>-	uint32_t nv_cmd;</div><div class='add'>+	uint32_t nv_cmd, wait_cnt;</div><div class='ctx'> 	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='ctx'> </div><div class='ctx'> 	qla2x00_nv_write(ha, NVR_DATA_OUT);</div><div class='hunk'>@@ -127,7 +127,13 @@ qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)</div><div class='ctx'> 	/* Wait for NVRAM to become ready */</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;nvram, NVR_SELECT);</div><div class='ctx'> 	RD_REG_WORD(&amp;reg-&gt;nvram);		/* PCI Posting. */</div><div class='add'>+	wait_cnt = NVR_WAIT_CNT;</div><div class='ctx'> 	do {</div><div class='add'>+		if (!--wait_cnt) {</div><div class='add'>+			DEBUG9_10(printk("%s(%ld): NVRAM didn't go ready...\n",</div><div class='add'>+			    __func__, ha-&gt;host_no));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		NVRAM_DELAY();</div><div class='ctx'> 		word = RD_REG_WORD(&amp;reg-&gt;nvram);</div><div class='ctx'> 	} while ((word &amp; NVR_DATA_IN) == 0);</div><div class='hunk'>@@ -301,16 +307,17 @@ qla2x00_clear_nvram_protection(scsi_qla_host_t *ha)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, stat;</div><div class='ctx'> 	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='del'>-	uint32_t word;</div><div class='add'>+	uint32_t word, wait_cnt;</div><div class='ctx'> 	uint16_t wprot, wprot_old;</div><div class='ctx'> </div><div class='ctx'> 	/* Clear NVRAM write protection. */</div><div class='ctx'> 	ret = QLA_FUNCTION_FAILED;</div><div class='del'>-	wprot_old = cpu_to_le16(qla2x00_get_nvram_word(ha, 0));</div><div class='del'>-	stat = qla2x00_write_nvram_word_tmo(ha, 0,</div><div class='add'>+</div><div class='add'>+	wprot_old = cpu_to_le16(qla2x00_get_nvram_word(ha, ha-&gt;nvram_base));</div><div class='add'>+	stat = qla2x00_write_nvram_word_tmo(ha, ha-&gt;nvram_base,</div><div class='ctx'> 	    __constant_cpu_to_le16(0x1234), 100000);</div><div class='del'>-	wprot = cpu_to_le16(qla2x00_get_nvram_word(ha, 0));</div><div class='del'>-	if (stat != QLA_SUCCESS || wprot != __constant_cpu_to_le16(0x1234)) {</div><div class='add'>+	wprot = cpu_to_le16(qla2x00_get_nvram_word(ha, ha-&gt;nvram_base));</div><div class='add'>+	if (stat != QLA_SUCCESS || wprot != 0x1234) {</div><div class='ctx'> 		/* Write enable. */</div><div class='ctx'> 		qla2x00_nv_write(ha, NVR_DATA_OUT);</div><div class='ctx'> 		qla2x00_nv_write(ha, 0);</div><div class='hunk'>@@ -341,14 +348,22 @@ qla2x00_clear_nvram_protection(scsi_qla_host_t *ha)</div><div class='ctx'> 		/* Wait for NVRAM to become ready. */</div><div class='ctx'> 		WRT_REG_WORD(&amp;reg-&gt;nvram, NVR_SELECT);</div><div class='ctx'> 		RD_REG_WORD(&amp;reg-&gt;nvram);	/* PCI Posting. */</div><div class='add'>+		wait_cnt = NVR_WAIT_CNT;</div><div class='ctx'> 		do {</div><div class='add'>+			if (!--wait_cnt) {</div><div class='add'>+				DEBUG9_10(printk("%s(%ld): NVRAM didn't go "</div><div class='add'>+				    "ready...\n", __func__,</div><div class='add'>+				    ha-&gt;host_no));</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 			NVRAM_DELAY();</div><div class='ctx'> 			word = RD_REG_WORD(&amp;reg-&gt;nvram);</div><div class='ctx'> 		} while ((word &amp; NVR_DATA_IN) == 0);</div><div class='ctx'> </div><div class='del'>-		ret = QLA_SUCCESS;</div><div class='add'>+		if (wait_cnt)</div><div class='add'>+			ret = QLA_SUCCESS;</div><div class='ctx'> 	} else</div><div class='del'>-		qla2x00_write_nvram_word(ha, 0, wprot_old);</div><div class='add'>+		qla2x00_write_nvram_word(ha, ha-&gt;nvram_base, wprot_old);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -357,7 +372,7 @@ static void</div><div class='ctx'> qla2x00_set_nvram_protection(scsi_qla_host_t *ha, int stat)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_reg_2xxx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp;</div><div class='del'>-	uint32_t word;</div><div class='add'>+	uint32_t word, wait_cnt;</div><div class='ctx'> </div><div class='ctx'> 	if (stat != QLA_SUCCESS)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -393,7 +408,13 @@ qla2x00_set_nvram_protection(scsi_qla_host_t *ha, int stat)</div><div class='ctx'> 	/* Wait for NVRAM to become ready. */</div><div class='ctx'> 	WRT_REG_WORD(&amp;reg-&gt;nvram, NVR_SELECT);</div><div class='ctx'> 	RD_REG_WORD(&amp;reg-&gt;nvram);		/* PCI Posting. */</div><div class='add'>+	wait_cnt = NVR_WAIT_CNT;</div><div class='ctx'> 	do {</div><div class='add'>+		if (!--wait_cnt) {</div><div class='add'>+			DEBUG9_10(printk("%s(%ld): NVRAM didn't go ready...\n",</div><div class='add'>+			    __func__, ha-&gt;host_no));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		NVRAM_DELAY();</div><div class='ctx'> 		word = RD_REG_WORD(&amp;reg-&gt;nvram);</div><div class='ctx'> 	} while ((word &amp; NVR_DATA_IN) == 0);</div><div class='hunk'>@@ -500,6 +521,20 @@ qla24xx_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id,</div><div class='ctx'> 	ids = qla24xx_read_flash_dword(ha, flash_data_to_access_addr(0xd03ab));</div><div class='ctx'> 	*man_id = LSB(ids);</div><div class='ctx'> 	*flash_id = MSB(ids);</div><div class='add'>+</div><div class='add'>+	/* Check if man_id and flash_id are valid. */</div><div class='add'>+	if (ids != 0xDEADDEAD &amp;&amp; (*man_id == 0 || *flash_id == 0)) {</div><div class='add'>+		/* Read information using 0x9f opcode</div><div class='add'>+		 * Device ID, Mfg ID would be read in the format:</div><div class='add'>+		 *   &lt;Ext Dev Info&gt;&lt;Device ID Part2&gt;&lt;Device ID Part 1&gt;&lt;Mfg ID&gt;</div><div class='add'>+		 * Example: ATMEL 0x00 01 45 1F</div><div class='add'>+		 * Extract MFG and Dev ID from last two bytes.</div><div class='add'>+		 */</div><div class='add'>+		ids = qla24xx_read_flash_dword(ha,</div><div class='add'>+		    flash_data_to_access_addr(0xd009f));</div><div class='add'>+		*man_id = LSB(ids);</div><div class='add'>+		*flash_id = MSB(ids);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int</div><div class='hunk'>@@ -508,8 +543,8 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	uint32_t liter;</div><div class='del'>-	uint32_t sec_mask, rest_addr, conf_addr;</div><div class='del'>-	uint32_t fdata;</div><div class='add'>+	uint32_t sec_mask, rest_addr, conf_addr, sec_end_mask;</div><div class='add'>+	uint32_t fdata, findex ;</div><div class='ctx'> 	uint8_t	man_id, flash_id;</div><div class='ctx'> 	struct device_reg_24xx __iomem *reg = &amp;ha-&gt;iobase-&gt;isp24;</div><div class='ctx'> </div><div class='hunk'>@@ -519,6 +554,7 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> 	DEBUG9(printk("%s(%ld): Flash man_id=%d flash_id=%d\n", __func__,</div><div class='ctx'> 	    ha-&gt;host_no, man_id, flash_id));</div><div class='ctx'> </div><div class='add'>+	sec_end_mask = 0;</div><div class='ctx'> 	conf_addr = flash_conf_to_access_addr(0x03d8);</div><div class='ctx'> 	switch (man_id) {</div><div class='ctx'> 	case 0xbf: /* STT flash. */</div><div class='hunk'>@@ -531,6 +567,12 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> 		rest_addr = 0x3fff;</div><div class='ctx'> 		sec_mask = 0x3c000;</div><div class='ctx'> 		break;</div><div class='add'>+	case 0x1f: // Atmel 26DF081A</div><div class='add'>+		rest_addr = 0x0fff;</div><div class='add'>+		sec_mask = 0xff000;</div><div class='add'>+		sec_end_mask = 0x003ff;</div><div class='add'>+		conf_addr = flash_conf_to_access_addr(0x0320);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* Default to 64 kb sector size. */</div><div class='ctx'> 		rest_addr = 0x3fff;</div><div class='hunk'>@@ -545,11 +587,30 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> </div><div class='ctx'> 	/* Disable flash write-protection. */</div><div class='ctx'> 	qla24xx_write_flash_dword(ha, flash_conf_to_access_addr(0x101), 0);</div><div class='add'>+	/* Some flash parts need an additional zero-write to clear bits.*/</div><div class='add'>+	qla24xx_write_flash_dword(ha, flash_conf_to_access_addr(0x101), 0);</div><div class='ctx'> </div><div class='ctx'> 	do {    /* Loop once to provide quick error exit. */</div><div class='ctx'> 		for (liter = 0; liter &lt; dwords; liter++, faddr++, dwptr++) {</div><div class='add'>+			if (man_id == 0x1f) {</div><div class='add'>+				findex = faddr &lt;&lt; 2;</div><div class='add'>+				fdata = findex &amp; sec_mask;</div><div class='add'>+			} else {</div><div class='add'>+				findex = faddr;</div><div class='add'>+				fdata = (findex &amp; sec_mask) &lt;&lt; 2;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/* Are we at the beginning of a sector? */</div><div class='del'>-			if ((faddr &amp; rest_addr) == 0) {</div><div class='add'>+			if ((findex &amp; rest_addr) == 0) {</div><div class='add'>+				/*</div><div class='add'>+				 * Do sector unprotect at 4K boundry for Atmel</div><div class='add'>+				 * part.</div><div class='add'>+				 */</div><div class='add'>+				if (man_id == 0x1f)</div><div class='add'>+					qla24xx_write_flash_dword(ha,</div><div class='add'>+					    flash_conf_to_access_addr(0x0339),</div><div class='add'>+					    (fdata &amp; 0xff00) | ((fdata &lt;&lt; 16) &amp;</div><div class='add'>+					    0xff0000) | ((fdata &gt;&gt; 16) &amp; 0xff));</div><div class='ctx'> 				fdata = (faddr &amp; sec_mask) &lt;&lt; 2;</div><div class='ctx'> 				ret = qla24xx_write_flash_dword(ha, conf_addr,</div><div class='ctx'> 				    (fdata &amp; 0xff00) |((fdata &lt;&lt; 16) &amp;</div><div class='hunk'>@@ -570,6 +631,14 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,</div><div class='ctx'> 				    ha-&gt;host_no, faddr, *dwptr));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* Do sector protect at 4K boundry for Atmel part. */</div><div class='add'>+			if (man_id == 0x1f &amp;&amp;</div><div class='add'>+			    ((faddr &amp; sec_end_mask) == 0x3ff))</div><div class='add'>+				qla24xx_write_flash_dword(ha,</div><div class='add'>+				    flash_conf_to_access_addr(0x0336),</div><div class='add'>+				    (fdata &amp; 0xff00) | ((fdata &lt;&lt; 16) &amp;</div><div class='add'>+				    0xff0000) | ((fdata &gt;&gt; 16) &amp; 0xff));</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (0);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h<br/>index d537192a1edb..d2d683440659 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_version.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qla2xxx/qla_version.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qla2xxx/qla_version.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qla2xxx/qla_version.h</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Driver version</div><div class='ctx'>  */</div><div class='del'>-#define QLA2XXX_VERSION      "8.01.04-k"</div><div class='add'>+#define QLA2XXX_VERSION      "8.01.05-k3"</div><div class='ctx'> </div><div class='ctx'> #define QLA_DRIVER_MAJOR_VER	8</div><div class='ctx'> #define QLA_DRIVER_MINOR_VER	1</div><div class='del'>-#define QLA_DRIVER_PATCH_VER	4</div><div class='add'>+#define QLA_DRIVER_PATCH_VER	5</div><div class='ctx'> #define QLA_DRIVER_BETA_VER	0</div><div class='head'>diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c<br/>index c7e78dcf09df..69e0551a81d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/qlogicpti.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/qlogicpti.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/qlogicpti.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/qlogicpti.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* qlogicpti.c: Performance Technologies QlogicISP sbus card driver.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu)</div><div class='add'>+ * Copyright (C) 1996, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  *</div><div class='ctx'>  * A lot of this driver was directly stolen from Erik H. Moe's PCI</div><div class='ctx'>  * Qlogic ISP driver.  Mucho kudos to him for this code.</div><div class='hunk'>@@ -43,12 +43,9 @@</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_tcq.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #define MAX_TARGETS	16</div><div class='ctx'> #define MAX_LUNS	8	/* 32 for 1.31 F/W */</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +55,6 @@</div><div class='ctx'> </div><div class='ctx'> static struct qlogicpti *qptichain = NULL;</div><div class='ctx'> static DEFINE_SPINLOCK(qptichain_lock);</div><div class='del'>-static int qptis_running = 0;</div><div class='ctx'> </div><div class='ctx'> #define PACKB(a, b)			(((a)&lt;&lt;4)|(b))</div><div class='ctx'> </div><div class='hunk'>@@ -132,7 +128,7 @@ static const u_char mbox_param[] = {</div><div class='ctx'> 	PACKB(0, 0)	/* 0x0042 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define MAX_MBOX_COMMAND	(sizeof(mbox_param)/sizeof(u_short))</div><div class='add'>+#define MAX_MBOX_COMMAND	ARRAY_SIZE(mbox_param)</div><div class='ctx'> </div><div class='ctx'> /* queue length's _must_ be power of two: */</div><div class='ctx'> #define QUEUE_DEPTH(in, out, ql)	((in - out) &amp; (ql))</div><div class='hunk'>@@ -722,10 +718,10 @@ static int __init qpti_register_irq(struct qlogicpti *qpti)</div><div class='ctx'> 	 * sanely maintain.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (request_irq(qpti-&gt;irq, qpti_intr,</div><div class='del'>-			SA_SHIRQ, "Qlogic/PTI", qpti))</div><div class='add'>+			IRQF_SHARED, "Qlogic/PTI", qpti))</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	printk("qpti%d: IRQ %s ", qpti-&gt;qpti_id, __irq_itoa(qpti-&gt;irq));</div><div class='add'>+	printk("qpti%d: IRQ %d ", qpti-&gt;qpti_id, qpti-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -816,180 +812,13 @@ static int __init qpti_map_queues(struct qlogicpti *qpti)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Detect all PTI Qlogic ISP's in the machine. */</div><div class='del'>-static int __init qlogicpti_detect(struct scsi_host_template *tpnt)</div><div class='del'>-{</div><div class='del'>-	struct qlogicpti *qpti;</div><div class='del'>-	struct Scsi_Host *qpti_host;</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='del'>-	int nqptis = 0, nqptis_in_use = 0;</div><div class='del'>-</div><div class='del'>-	tpnt-&gt;proc_name = "qlogicpti";</div><div class='del'>-	for_each_sbus(sbus) {</div><div class='del'>-		for_each_sbusdev(sdev, sbus) {</div><div class='del'>-			/* Is this a red snapper? */</div><div class='del'>-			if (strcmp(sdev-&gt;prom_name, "ptisp") &amp;&amp;</div><div class='del'>-			    strcmp(sdev-&gt;prom_name, "PTI,ptisp") &amp;&amp;</div><div class='del'>-			    strcmp(sdev-&gt;prom_name, "QLGC,isp") &amp;&amp;</div><div class='del'>-			    strcmp(sdev-&gt;prom_name, "SUNW,isp"))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* Sometimes Antares cards come up not completely</div><div class='del'>-			 * setup, and we get a report of a zero IRQ.</div><div class='del'>-			 * Skip over them in such cases so we survive.</div><div class='del'>-			 */</div><div class='del'>-			if (sdev-&gt;irqs[0] == 0) {</div><div class='del'>-				printk("qpti%d: Adapter reports no interrupt, "</div><div class='del'>-				       "skipping over this card.", nqptis);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Yep, register and allocate software state. */</div><div class='del'>-			qpti_host = scsi_register(tpnt, sizeof(struct qlogicpti));</div><div class='del'>-			if (!qpti_host) {</div><div class='del'>-				printk("QPTI: Cannot register PTI Qlogic ISP SCSI host");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			qpti = (struct qlogicpti *) qpti_host-&gt;hostdata;</div><div class='del'>-</div><div class='del'>-			/* We are wide capable, 16 targets. */</div><div class='del'>-			qpti_host-&gt;max_id = MAX_TARGETS;</div><div class='del'>-</div><div class='del'>-			/* Setup back pointers and misc. state. */</div><div class='del'>-			qpti-&gt;qhost = qpti_host;</div><div class='del'>-			qpti-&gt;sdev = sdev;</div><div class='del'>-			qpti-&gt;qpti_id = nqptis++;</div><div class='del'>-			qpti-&gt;prom_node = sdev-&gt;prom_node;</div><div class='del'>-			prom_getstring(qpti-&gt;prom_node, "name",</div><div class='del'>-				       qpti-&gt;prom_name,</div><div class='del'>-				       sizeof(qpti-&gt;prom_name));</div><div class='del'>-</div><div class='del'>-			/* This is not correct, actually. There's a switch</div><div class='del'>-			 * on the PTI cards that put them into "emulation"</div><div class='del'>-			 * mode- i.e., report themselves as QLGC,isp</div><div class='del'>-			 * instead of PTI,ptisp. The only real substantive</div><div class='del'>-			 * difference between non-pti and pti cards is</div><div class='del'>-			 * the tmon register. Which is possibly even</div><div class='del'>-			 * there for Qlogic cards, but non-functional.</div><div class='del'>-			 */</div><div class='del'>-			qpti-&gt;is_pti = (strcmp (qpti-&gt;prom_name, "QLGC,isp") != 0);</div><div class='del'>-</div><div class='del'>-			qpti_chain_add(qpti);</div><div class='del'>-			if (qpti_map_regs(qpti) &lt; 0)</div><div class='del'>-				goto fail_unlink;</div><div class='del'>-</div><div class='del'>-			if (qpti_register_irq(qpti) &lt; 0)</div><div class='del'>-				goto fail_unmap_regs;</div><div class='del'>-</div><div class='del'>-			qpti_get_scsi_id(qpti);</div><div class='del'>-			qpti_get_bursts(qpti);</div><div class='del'>-			qpti_get_clock(qpti);</div><div class='del'>-</div><div class='del'>-			/* Clear out scsi_cmnd array. */</div><div class='del'>-			memset(qpti-&gt;cmd_slots, 0, sizeof(qpti-&gt;cmd_slots));</div><div class='del'>-</div><div class='del'>-			if (qpti_map_queues(qpti) &lt; 0)</div><div class='del'>-				goto fail_free_irq;</div><div class='del'>-</div><div class='del'>-			/* Load the firmware. */</div><div class='del'>-			if (qlogicpti_load_firmware(qpti))</div><div class='del'>-				goto fail_unmap_queues;</div><div class='del'>-			if (qpti-&gt;is_pti) {</div><div class='del'>-				/* Check the PTI status reg. */</div><div class='del'>-				if (qlogicpti_verify_tmon(qpti))</div><div class='del'>-					goto fail_unmap_queues;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Reset the ISP and init res/req queues. */</div><div class='del'>-			if (qlogicpti_reset_hardware(qpti_host))</div><div class='del'>-				goto fail_unmap_queues;</div><div class='del'>-</div><div class='del'>-			printk("(Firmware v%d.%d.%d)", qpti-&gt;fware_majrev,</div><div class='del'>-			    qpti-&gt;fware_minrev, qpti-&gt;fware_micrev);</div><div class='del'>-			{</div><div class='del'>-				char buffer[60];</div><div class='del'>-				</div><div class='del'>-				prom_getstring (qpti-&gt;prom_node,</div><div class='del'>-						"isp-fcode", buffer, 60);</div><div class='del'>-				if (buffer[0])</div><div class='del'>-					printk("(Firmware %s)", buffer);</div><div class='del'>-				if (prom_getbool(qpti-&gt;prom_node, "differential"))</div><div class='del'>-					qpti-&gt;differential = 1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			printk (" [%s Wide, using %s interface]\n",</div><div class='del'>-			       (qpti-&gt;ultra ? "Ultra" : "Fast"),</div><div class='del'>-			       (qpti-&gt;differential ? "differential" : "single ended"));</div><div class='del'>-</div><div class='del'>-			nqptis_in_use++;</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		fail_unmap_queues:</div><div class='del'>-#define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='del'>-			sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-					     QSIZE(RES_QUEUE_LEN),</div><div class='del'>-					     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='del'>-			sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-					     QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='del'>-					     qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='del'>-#undef QSIZE</div><div class='del'>-		fail_free_irq:</div><div class='del'>-			free_irq(qpti-&gt;irq, qpti);</div><div class='del'>-</div><div class='del'>-		fail_unmap_regs:</div><div class='del'>-			sbus_iounmap(qpti-&gt;qregs,</div><div class='del'>-				     qpti-&gt;sdev-&gt;reg_addrs[0].reg_size);</div><div class='del'>-			if (qpti-&gt;is_pti)</div><div class='del'>-				sbus_iounmap(qpti-&gt;sreg, sizeof(unsigned char));</div><div class='del'>-		fail_unlink:</div><div class='del'>-			qpti_chain_del(qpti);</div><div class='del'>-			scsi_unregister(qpti-&gt;qhost);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (nqptis)</div><div class='del'>-		printk("QPTI: Total of %d PTI Qlogic/ISP hosts found, %d actually in use.\n",</div><div class='del'>-		       nqptis, nqptis_in_use);</div><div class='del'>-	qptis_running = nqptis_in_use;</div><div class='del'>-	return nqptis;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qlogicpti_release(struct Scsi_Host *host)</div><div class='del'>-{</div><div class='del'>-	struct qlogicpti *qpti = (struct qlogicpti *) host-&gt;hostdata;</div><div class='del'>-</div><div class='del'>-	/* Remove visibility from IRQ handlers. */</div><div class='del'>-	qpti_chain_del(qpti);</div><div class='del'>-</div><div class='del'>-	/* Shut up the card. */</div><div class='del'>-	sbus_writew(0, qpti-&gt;qregs + SBUS_CTRL);</div><div class='del'>-</div><div class='del'>-	/* Free IRQ handler and unmap Qlogic,ISP and PTI status regs. */</div><div class='del'>-	free_irq(qpti-&gt;irq, qpti);</div><div class='del'>-</div><div class='del'>-#define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='del'>-	sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-			     QSIZE(RES_QUEUE_LEN),</div><div class='del'>-			     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='del'>-	sbus_free_consistent(qpti-&gt;sdev,</div><div class='del'>-			     QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='del'>-			     qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='del'>-#undef QSIZE</div><div class='del'>-</div><div class='del'>-	sbus_iounmap(qpti-&gt;qregs, qpti-&gt;sdev-&gt;reg_addrs[0].reg_size);</div><div class='del'>-	if (qpti-&gt;is_pti)</div><div class='del'>-		sbus_iounmap(qpti-&gt;sreg, sizeof(unsigned char));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const char *qlogicpti_info(struct Scsi_Host *host)</div><div class='ctx'> {</div><div class='ctx'> 	static char buf[80];</div><div class='ctx'> 	struct qlogicpti *qpti = (struct qlogicpti *) host-&gt;hostdata;</div><div class='ctx'> </div><div class='del'>-	sprintf(buf, "PTI Qlogic,ISP SBUS SCSI irq %s regs at %p",</div><div class='del'>-		__irq_itoa(qpti-&gt;qhost-&gt;irq), qpti-&gt;qregs);</div><div class='add'>+	sprintf(buf, "PTI Qlogic,ISP SBUS SCSI irq %d regs at %p",</div><div class='add'>+		qpti-&gt;qhost-&gt;irq, qpti-&gt;qregs);</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1552,9 +1381,9 @@ static int qlogicpti_reset(struct scsi_cmnd *Cmnd)</div><div class='ctx'> 	return return_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct scsi_host_template driver_template = {</div><div class='del'>-	.detect			= qlogicpti_detect,</div><div class='del'>-	.release		= qlogicpti_release,</div><div class='add'>+static struct scsi_host_template qpti_template = {</div><div class='add'>+	.module			= THIS_MODULE,</div><div class='add'>+	.name			= "qlogicpti",</div><div class='ctx'> 	.info			= qlogicpti_info,</div><div class='ctx'> 	.queuecommand		= qlogicpti_queuecommand_slow,</div><div class='ctx'> 	.eh_abort_handler	= qlogicpti_abort,</div><div class='hunk'>@@ -1566,8 +1395,189 @@ static struct scsi_host_template driver_template = {</div><div class='ctx'> 	.use_clustering		= ENABLE_CLUSTERING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	static int nqptis;</div><div class='add'>+	struct sbus_dev *sdev = to_sbus_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct device_node *dp = dev-&gt;node;</div><div class='add'>+	struct scsi_host_template *tpnt = match-&gt;data;</div><div class='add'>+	struct Scsi_Host *host;</div><div class='add'>+	struct qlogicpti *qpti;</div><div class='add'>+	char *fcode;</div><div class='add'>+</div><div class='add'>+	/* Sometimes Antares cards come up not completely</div><div class='add'>+	 * setup, and we get a report of a zero IRQ.</div><div class='add'>+	 */</div><div class='add'>+	if (sdev-&gt;irqs[0] == 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	host = scsi_host_alloc(tpnt, sizeof(struct qlogicpti));</div><div class='add'>+	if (!host)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	qpti = (struct qlogicpti *) host-&gt;hostdata;</div><div class='add'>+</div><div class='add'>+	host-&gt;max_id = MAX_TARGETS;</div><div class='add'>+	qpti-&gt;qhost = host;</div><div class='add'>+	qpti-&gt;sdev = sdev;</div><div class='add'>+	qpti-&gt;qpti_id = nqptis;</div><div class='add'>+	qpti-&gt;prom_node = sdev-&gt;prom_node;</div><div class='add'>+	strcpy(qpti-&gt;prom_name, sdev-&gt;ofdev.node-&gt;name);</div><div class='add'>+	qpti-&gt;is_pti = strcmp(qpti-&gt;prom_name, "QLGC,isp");</div><div class='add'>+</div><div class='add'>+	if (qpti_map_regs(qpti) &lt; 0)</div><div class='add'>+		goto fail_unlink;</div><div class='add'>+</div><div class='add'>+	if (qpti_register_irq(qpti) &lt; 0)</div><div class='add'>+		goto fail_unmap_regs;</div><div class='add'>+</div><div class='add'>+	qpti_get_scsi_id(qpti);</div><div class='add'>+	qpti_get_bursts(qpti);</div><div class='add'>+	qpti_get_clock(qpti);</div><div class='add'>+</div><div class='add'>+	/* Clear out scsi_cmnd array. */</div><div class='add'>+	memset(qpti-&gt;cmd_slots, 0, sizeof(qpti-&gt;cmd_slots));</div><div class='add'>+</div><div class='add'>+	if (qpti_map_queues(qpti) &lt; 0)</div><div class='add'>+		goto fail_free_irq;</div><div class='add'>+</div><div class='add'>+	/* Load the firmware. */</div><div class='add'>+	if (qlogicpti_load_firmware(qpti))</div><div class='add'>+		goto fail_unmap_queues;</div><div class='add'>+	if (qpti-&gt;is_pti) {</div><div class='add'>+		/* Check the PTI status reg. */</div><div class='add'>+		if (qlogicpti_verify_tmon(qpti))</div><div class='add'>+			goto fail_unmap_queues;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset the ISP and init res/req queues. */</div><div class='add'>+	if (qlogicpti_reset_hardware(host))</div><div class='add'>+		goto fail_unmap_queues;</div><div class='add'>+</div><div class='add'>+	if (scsi_add_host(host, &amp;dev-&gt;dev))</div><div class='add'>+		goto fail_unmap_queues;</div><div class='add'>+</div><div class='add'>+	printk("(Firmware v%d.%d.%d)", qpti-&gt;fware_majrev,</div><div class='add'>+	       qpti-&gt;fware_minrev, qpti-&gt;fware_micrev);</div><div class='add'>+</div><div class='add'>+	fcode = of_get_property(dp, "isp-fcode", NULL);</div><div class='add'>+	if (fcode &amp;&amp; fcode[0])</div><div class='add'>+		printk("(Firmware %s)", fcode);</div><div class='add'>+	if (of_find_property(dp, "differential", NULL) != NULL)</div><div class='add'>+		qpti-&gt;differential = 1;</div><div class='add'>+			</div><div class='add'>+	printk (" [%s Wide, using %s interface]\n",</div><div class='add'>+		(qpti-&gt;ultra ? "Ultra" : "Fast"),</div><div class='add'>+		(qpti-&gt;differential ? "differential" : "single ended"));</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;sdev-&gt;ofdev.dev, qpti);</div><div class='add'>+</div><div class='add'>+	qpti_chain_add(qpti);</div><div class='add'>+</div><div class='add'>+	scsi_scan_host(host);</div><div class='add'>+	nqptis++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_unmap_queues:</div><div class='add'>+#define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='add'>+	sbus_free_consistent(qpti-&gt;sdev,</div><div class='add'>+			     QSIZE(RES_QUEUE_LEN),</div><div class='add'>+			     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='add'>+	sbus_free_consistent(qpti-&gt;sdev,</div><div class='add'>+			     QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='add'>+			     qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='add'>+#undef QSIZE</div><div class='add'>+</div><div class='add'>+fail_unmap_regs:</div><div class='add'>+	sbus_iounmap(qpti-&gt;qregs,</div><div class='add'>+		     qpti-&gt;sdev-&gt;reg_addrs[0].reg_size);</div><div class='add'>+	if (qpti-&gt;is_pti)</div><div class='add'>+		sbus_iounmap(qpti-&gt;sreg, sizeof(unsigned char));</div><div class='add'>+</div><div class='add'>+fail_free_irq:</div><div class='add'>+	free_irq(qpti-&gt;irq, qpti);</div><div class='add'>+</div><div class='add'>+fail_unlink:</div><div class='add'>+	scsi_host_put(host);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit qpti_sbus_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct qlogicpti *qpti = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	qpti_chain_del(qpti);</div><div class='add'>+</div><div class='add'>+	scsi_remove_host(qpti-&gt;qhost);</div><div class='add'>+</div><div class='add'>+	/* Shut up the card. */</div><div class='add'>+	sbus_writew(0, qpti-&gt;qregs + SBUS_CTRL);</div><div class='add'>+</div><div class='add'>+	/* Free IRQ handler and unmap Qlogic,ISP and PTI status regs. */</div><div class='add'>+	free_irq(qpti-&gt;irq, qpti);</div><div class='add'>+</div><div class='add'>+#define QSIZE(entries)	(((entries) + 1) * QUEUE_ENTRY_LEN)</div><div class='add'>+	sbus_free_consistent(qpti-&gt;sdev,</div><div class='add'>+			     QSIZE(RES_QUEUE_LEN),</div><div class='add'>+			     qpti-&gt;res_cpu, qpti-&gt;res_dvma);</div><div class='add'>+	sbus_free_consistent(qpti-&gt;sdev,</div><div class='add'>+			     QSIZE(QLOGICPTI_REQ_QUEUE_LEN),</div><div class='add'>+			     qpti-&gt;req_cpu, qpti-&gt;req_dvma);</div><div class='add'>+#undef QSIZE</div><div class='add'>+</div><div class='add'>+	sbus_iounmap(qpti-&gt;qregs, qpti-&gt;sdev-&gt;reg_addrs[0].reg_size);</div><div class='add'>+	if (qpti-&gt;is_pti)</div><div class='add'>+		sbus_iounmap(qpti-&gt;sreg, sizeof(unsigned char));</div><div class='add'>+</div><div class='add'>+	scsi_host_put(qpti-&gt;qhost);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id qpti_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "ptisp",</div><div class='add'>+		.data = &amp;qpti_template,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "PTI,ptisp",</div><div class='add'>+		.data = &amp;qpti_template,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "QLGC,isp",</div><div class='add'>+		.data = &amp;qpti_template,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,isp",</div><div class='add'>+		.data = &amp;qpti_template,</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, qpti_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver qpti_sbus_driver = {</div><div class='add'>+	.name		= "qpti",</div><div class='add'>+	.match_table	= qpti_match,</div><div class='add'>+	.probe		= qpti_sbus_probe,</div><div class='add'>+	.remove		= __devexit_p(qpti_sbus_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#include "scsi_module.c"</div><div class='add'>+static int __init qpti_init(void)</div><div class='add'>+{</div><div class='add'>+	return of_register_driver(&amp;qpti_sbus_driver, &amp;sbus_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit qpti_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;qpti_sbus_driver);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("QlogicISP SBUS driver");</div><div class='add'>+MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> </div><div class='add'>+module_init(qpti_init);</div><div class='add'>+module_exit(qpti_exit);</div><div class='head'>diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c<br/>index 50c398aab557..327b33a57b0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/raid_class.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/raid_class.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/raid_class.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/raid_class.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static const char *raid_state_name(enum raid_state state)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *name = NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(raid_states)/sizeof(raid_states[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(raid_states); i++) {</div><div class='ctx'> 		if (raid_states[i].value == state) {</div><div class='ctx'> 			name = raid_states[i].name;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -161,7 +161,7 @@ static const char *raid_level_name(enum raid_level level)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *name = NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(raid_levels)/sizeof(raid_levels[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(raid_levels); i++) {</div><div class='ctx'> 		if (raid_levels[i].value == level) {</div><div class='ctx'> 			name = raid_levels[i].name;</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c<br/>index 9b8bca1ac1f0..1053c7c76b7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_mv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_mv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_mv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_mv.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ enum {</div><div class='ctx'> 	MV_FLAG_IRQ_COALESCE	= (1 &lt;&lt; 29),  /* IRQ coalescing capability */</div><div class='ctx'> 	MV_COMMON_FLAGS		= (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='ctx'> 				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |</div><div class='del'>-				   ATA_FLAG_NO_ATAPI),</div><div class='add'>+				   ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING),</div><div class='ctx'> 	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,</div><div class='ctx'> </div><div class='ctx'> 	CRQB_FLAG_READ		= (1 &lt;&lt; 0),</div><div class='hunk'>@@ -272,33 +272,33 @@ enum chip_type {</div><div class='ctx'> </div><div class='ctx'> /* Command ReQuest Block: 32B */</div><div class='ctx'> struct mv_crqb {</div><div class='del'>-	u32			sg_addr;</div><div class='del'>-	u32			sg_addr_hi;</div><div class='del'>-	u16			ctrl_flags;</div><div class='del'>-	u16			ata_cmd[11];</div><div class='add'>+	__le32			sg_addr;</div><div class='add'>+	__le32			sg_addr_hi;</div><div class='add'>+	__le16			ctrl_flags;</div><div class='add'>+	__le16			ata_cmd[11];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv_crqb_iie {</div><div class='del'>-	u32			addr;</div><div class='del'>-	u32			addr_hi;</div><div class='del'>-	u32			flags;</div><div class='del'>-	u32			len;</div><div class='del'>-	u32			ata_cmd[4];</div><div class='add'>+	__le32			addr;</div><div class='add'>+	__le32			addr_hi;</div><div class='add'>+	__le32			flags;</div><div class='add'>+	__le32			len;</div><div class='add'>+	__le32			ata_cmd[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Command ResPonse Block: 8B */</div><div class='ctx'> struct mv_crpb {</div><div class='del'>-	u16			id;</div><div class='del'>-	u16			flags;</div><div class='del'>-	u32			tmstmp;</div><div class='add'>+	__le16			id;</div><div class='add'>+	__le16			flags;</div><div class='add'>+	__le32			tmstmp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* EDMA Physical Region Descriptor (ePRD); A.K.A. SG */</div><div class='ctx'> struct mv_sg {</div><div class='del'>-	u32			addr;</div><div class='del'>-	u32			flags_size;</div><div class='del'>-	u32			addr_hi;</div><div class='del'>-	u32			reserved;</div><div class='add'>+	__le32			addr;</div><div class='add'>+	__le32			flags_size;</div><div class='add'>+	__le32			addr_hi;</div><div class='add'>+	__le32			reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv_port_priv {</div><div class='hunk'>@@ -390,6 +390,7 @@ static struct scsi_host_template mv_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= MV_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -406,6 +407,7 @@ static const struct ata_port_operations mv5_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.qc_prep		= mv_qc_prep,</div><div class='ctx'> 	.qc_issue		= mv_qc_issue,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> </div><div class='ctx'> 	.eng_timeout		= mv_eng_timeout,</div><div class='ctx'> </div><div class='hunk'>@@ -433,6 +435,7 @@ static const struct ata_port_operations mv6_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.qc_prep		= mv_qc_prep,</div><div class='ctx'> 	.qc_issue		= mv_qc_issue,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> </div><div class='ctx'> 	.eng_timeout		= mv_eng_timeout,</div><div class='ctx'> </div><div class='hunk'>@@ -683,7 +686,7 @@ static void mv_stop_dma(struct ata_port *ap)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (EDMA_EN &amp; reg) {</div><div class='del'>-		printk(KERN_ERR "ata%u: Unable to stop eDMA\n", ap-&gt;id);</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "Unable to stop eDMA\n");</div><div class='ctx'> 		/* FIXME: Consider doing a reset here to recover */</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1028,7 +1031,7 @@ static inline unsigned mv_inc_q_index(unsigned index)</div><div class='ctx'> 	return (index + 1) &amp; MV_MAX_Q_DEPTH_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void mv_crqb_pack_cmd(u16 *cmdw, u8 data, u8 addr, unsigned last)</div><div class='add'>+static inline void mv_crqb_pack_cmd(__le16 *cmdw, u8 data, u8 addr, unsigned last)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tmp = data | (addr &lt;&lt; CRQB_CMD_ADDR_SHIFT) | CRQB_CMD_CS |</div><div class='ctx'> 		(last ? CRQB_CMD_LAST : 0);</div><div class='hunk'>@@ -1051,7 +1054,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> 	struct mv_port_priv *pp = ap-&gt;private_data;</div><div class='del'>-	u16 *cw;</div><div class='add'>+	__le16 *cw;</div><div class='ctx'> 	struct ata_taskfile *tf;</div><div class='ctx'> 	u16 flags = 0;</div><div class='ctx'> 	unsigned in_index;</div><div class='hunk'>@@ -1307,8 +1310,8 @@ static void mv_err_intr(struct ata_port *ap, int reset_allowed)</div><div class='ctx'> 	edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);</div><div class='ctx'> </div><div class='ctx'> 	if (EDMA_ERR_SERR &amp; edma_err_cause) {</div><div class='del'>-		serr = scr_read(ap, SCR_ERROR);</div><div class='del'>-		scr_write_flush(ap, SCR_ERROR, serr);</div><div class='add'>+		sata_scr_read(ap, SCR_ERROR, &amp;serr);</div><div class='add'>+		sata_scr_write_flush(ap, SCR_ERROR, serr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (EDMA_ERR_SELF_DIS &amp; edma_err_cause) {</div><div class='ctx'> 		struct mv_port_priv *pp	= ap-&gt;private_data;</div><div class='hunk'>@@ -1377,7 +1380,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,</div><div class='ctx'> 		/* Note that DEV_IRQ might happen spuriously during EDMA,</div><div class='ctx'> 		 * and should be ignored in such cases.</div><div class='ctx'> 		 * The cause of this is still under investigation.</div><div class='del'>-		 */ </div><div class='add'>+		 */</div><div class='ctx'> 		if (pp-&gt;pp_flags &amp; MV_PP_FLAG_EDMA_EN) {</div><div class='ctx'> 			/* EDMA: check for response queue interrupt */</div><div class='ctx'> 			if ((CRPB_DMA_DONE &lt;&lt; hard_port) &amp; hc_irq_cause) {</div><div class='hunk'>@@ -1398,7 +1401,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))</div><div class='add'>+		if (ap &amp;&amp; (ap-&gt;flags &amp; ATA_FLAG_DISABLED))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		err_mask = ac_err_mask(ata_status);</div><div class='hunk'>@@ -1419,7 +1422,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,</div><div class='ctx'> 				VPRINTK("port %u IRQ found for qc, "</div><div class='ctx'> 					"ata_status 0x%x\n", port,ata_status);</div><div class='ctx'> 				/* mark qc status appropriately */</div><div class='del'>-				if (!(qc-&gt;tf.ctl &amp; ATA_NIEN)) {</div><div class='add'>+				if (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)) {</div><div class='ctx'> 					qc-&gt;err_mask |= err_mask;</div><div class='ctx'> 					ata_qc_complete(qc);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1949,15 +1952,16 @@ static void __mv_phy_reset(struct ata_port *ap, int can_sleep)</div><div class='ctx'> </div><div class='ctx'> 	/* Issue COMRESET via SControl */</div><div class='ctx'> comreset_retry:</div><div class='del'>-	scr_write_flush(ap, SCR_CONTROL, 0x301);</div><div class='add'>+	sata_scr_write_flush(ap, SCR_CONTROL, 0x301);</div><div class='ctx'> 	__msleep(1, can_sleep);</div><div class='ctx'> </div><div class='del'>-	scr_write_flush(ap, SCR_CONTROL, 0x300);</div><div class='add'>+	sata_scr_write_flush(ap, SCR_CONTROL, 0x300);</div><div class='ctx'> 	__msleep(20, can_sleep);</div><div class='ctx'> </div><div class='ctx'> 	timeout = jiffies + msecs_to_jiffies(200);</div><div class='ctx'> 	do {</div><div class='del'>-		sstatus = scr_read(ap, SCR_STATUS) &amp; 0x3;</div><div class='add'>+		sata_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='add'>+		sstatus &amp;= 0x3;</div><div class='ctx'> 		if ((sstatus == 3) || (sstatus == 0))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1974,11 +1978,12 @@ comreset_retry:</div><div class='ctx'> 		"SCtrl 0x%08x\n", mv_scr_read(ap, SCR_STATUS),</div><div class='ctx'> 		mv_scr_read(ap, SCR_ERROR), mv_scr_read(ap, SCR_CONTROL));</div><div class='ctx'> </div><div class='del'>-	if (sata_dev_present(ap)) {</div><div class='add'>+	if (ata_port_online(ap)) {</div><div class='ctx'> 		ata_port_probe(ap);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_INFO "ata%u: no device found (phy stat %08x)\n",</div><div class='del'>-		       ap-&gt;id, scr_read(ap, SCR_STATUS));</div><div class='add'>+		sata_scr_read(ap, SCR_STATUS, &amp;sstatus);</div><div class='add'>+		ata_port_printk(ap, KERN_INFO,</div><div class='add'>+				"no device found (phy stat %08x)\n", sstatus);</div><div class='ctx'> 		ata_port_disable(ap);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2005,7 +2010,7 @@ comreset_retry:</div><div class='ctx'> 	tf.nsect = readb((void __iomem *) ap-&gt;ioaddr.nsect_addr);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;class = ata_dev_classify(&amp;tf);</div><div class='del'>-	if (!ata_dev_present(dev)) {</div><div class='add'>+	if (!ata_dev_enabled(dev)) {</div><div class='ctx'> 		VPRINTK("Port disabled post-sig: No device present.\n");</div><div class='ctx'> 		ata_port_disable(ap);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2035,8 +2040,9 @@ static void mv_phy_reset(struct ata_port *ap)</div><div class='ctx'> static void mv_eng_timeout(struct ata_port *ap)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_queued_cmd *qc;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR "ata%u: Entering mv_eng_timeout\n",ap-&gt;id);</div><div class='add'>+	ata_port_printk(ap, KERN_ERR, "Entering mv_eng_timeout\n");</div><div class='ctx'> 	DPRINTK("All regs @ start of eng_timeout\n");</div><div class='ctx'> 	mv_dump_all_regs(ap-&gt;host_set-&gt;mmio_base, ap-&gt;port_no,</div><div class='ctx'> 			 to_pci_dev(ap-&gt;host_set-&gt;dev));</div><div class='hunk'>@@ -2046,8 +2052,10 @@ static void mv_eng_timeout(struct ata_port *ap)</div><div class='ctx'> 	       ap-&gt;host_set-&gt;mmio_base, ap, qc, qc-&gt;scsicmd,</div><div class='ctx'> 	       &amp;qc-&gt;scsicmd-&gt;cmnd);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='ctx'> 	mv_err_intr(ap, 0);</div><div class='ctx'> 	mv_stop_and_reset(ap);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ap-&gt;host_set-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON(!(qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE));</div><div class='ctx'> 	if (qc-&gt;flags &amp; ATA_QCFLAG_ACTIVE) {</div><div class='hunk'>@@ -2387,7 +2395,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	probe_ent-&gt;port_ops = mv_port_info[board_idx].port_ops;</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = mmio_base;</div><div class='ctx'> 	probe_ent-&gt;private_data = hpriv;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c<br/>index 9f553081b5e8..56da25581f31 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_nv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_nv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_nv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_nv.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -44,7 +43,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME			"sata_nv"</div><div class='del'>-#define DRV_VERSION			"0.8"</div><div class='add'>+#define DRV_VERSION			"2.0"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	NV_PORTS			= 2,</div><div class='hunk'>@@ -54,40 +53,25 @@ enum {</div><div class='ctx'> 	NV_PORT0_SCR_REG_OFFSET		= 0x00,</div><div class='ctx'> 	NV_PORT1_SCR_REG_OFFSET		= 0x40,</div><div class='ctx'> </div><div class='add'>+	/* INT_STATUS/ENABLE */</div><div class='ctx'> 	NV_INT_STATUS			= 0x10,</div><div class='del'>-	NV_INT_STATUS_CK804		= 0x440,</div><div class='del'>-	NV_INT_STATUS_PDEV_INT		= 0x01,</div><div class='del'>-	NV_INT_STATUS_PDEV_PM		= 0x02,</div><div class='del'>-	NV_INT_STATUS_PDEV_ADDED	= 0x04,</div><div class='del'>-	NV_INT_STATUS_PDEV_REMOVED	= 0x08,</div><div class='del'>-	NV_INT_STATUS_SDEV_INT		= 0x10,</div><div class='del'>-	NV_INT_STATUS_SDEV_PM		= 0x20,</div><div class='del'>-	NV_INT_STATUS_SDEV_ADDED	= 0x40,</div><div class='del'>-	NV_INT_STATUS_SDEV_REMOVED	= 0x80,</div><div class='del'>-	NV_INT_STATUS_PDEV_HOTPLUG	= (NV_INT_STATUS_PDEV_ADDED |</div><div class='del'>-					   NV_INT_STATUS_PDEV_REMOVED),</div><div class='del'>-	NV_INT_STATUS_SDEV_HOTPLUG	= (NV_INT_STATUS_SDEV_ADDED |</div><div class='del'>-					   NV_INT_STATUS_SDEV_REMOVED),</div><div class='del'>-	NV_INT_STATUS_HOTPLUG		= (NV_INT_STATUS_PDEV_HOTPLUG |</div><div class='del'>-					   NV_INT_STATUS_SDEV_HOTPLUG),</div><div class='del'>-</div><div class='ctx'> 	NV_INT_ENABLE			= 0x11,</div><div class='add'>+	NV_INT_STATUS_CK804		= 0x440,</div><div class='ctx'> 	NV_INT_ENABLE_CK804		= 0x441,</div><div class='del'>-	NV_INT_ENABLE_PDEV_MASK		= 0x01,</div><div class='del'>-	NV_INT_ENABLE_PDEV_PM		= 0x02,</div><div class='del'>-	NV_INT_ENABLE_PDEV_ADDED	= 0x04,</div><div class='del'>-	NV_INT_ENABLE_PDEV_REMOVED	= 0x08,</div><div class='del'>-	NV_INT_ENABLE_SDEV_MASK		= 0x10,</div><div class='del'>-	NV_INT_ENABLE_SDEV_PM		= 0x20,</div><div class='del'>-	NV_INT_ENABLE_SDEV_ADDED	= 0x40,</div><div class='del'>-	NV_INT_ENABLE_SDEV_REMOVED	= 0x80,</div><div class='del'>-	NV_INT_ENABLE_PDEV_HOTPLUG	= (NV_INT_ENABLE_PDEV_ADDED |</div><div class='del'>-					   NV_INT_ENABLE_PDEV_REMOVED),</div><div class='del'>-	NV_INT_ENABLE_SDEV_HOTPLUG	= (NV_INT_ENABLE_SDEV_ADDED |</div><div class='del'>-					   NV_INT_ENABLE_SDEV_REMOVED),</div><div class='del'>-	NV_INT_ENABLE_HOTPLUG		= (NV_INT_ENABLE_PDEV_HOTPLUG |</div><div class='del'>-					   NV_INT_ENABLE_SDEV_HOTPLUG),</div><div class='ctx'> </div><div class='add'>+	/* INT_STATUS/ENABLE bits */</div><div class='add'>+	NV_INT_DEV			= 0x01,</div><div class='add'>+	NV_INT_PM			= 0x02,</div><div class='add'>+	NV_INT_ADDED			= 0x04,</div><div class='add'>+	NV_INT_REMOVED			= 0x08,</div><div class='add'>+</div><div class='add'>+	NV_INT_PORT_SHIFT		= 4,	/* each port occupies 4 bits */</div><div class='add'>+</div><div class='add'>+	NV_INT_ALL			= 0x0f,</div><div class='add'>+	NV_INT_MASK			= NV_INT_DEV |</div><div class='add'>+					  NV_INT_ADDED | NV_INT_REMOVED,</div><div class='add'>+</div><div class='add'>+	/* INT_CONFIG */</div><div class='ctx'> 	NV_INT_CONFIG			= 0x12,</div><div class='ctx'> 	NV_INT_CONFIG_METHD		= 0x01, // 0 = INT, 1 = SMI</div><div class='ctx'> </div><div class='hunk'>@@ -97,23 +81,27 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='del'>-static irqreturn_t nv_interrupt (int irq, void *dev_instance,</div><div class='del'>-				 struct pt_regs *regs);</div><div class='add'>+static void nv_ck804_host_stop(struct ata_host_set *host_set);</div><div class='add'>+static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance,</div><div class='add'>+					struct pt_regs *regs);</div><div class='add'>+static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance,</div><div class='add'>+				    struct pt_regs *regs);</div><div class='add'>+static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance,</div><div class='add'>+				      struct pt_regs *regs);</div><div class='ctx'> static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg);</div><div class='ctx'> static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='del'>-static void nv_host_stop (struct ata_host_set *host_set);</div><div class='del'>-static void nv_enable_hotplug(struct ata_probe_ent *probe_ent);</div><div class='del'>-static void nv_disable_hotplug(struct ata_host_set *host_set);</div><div class='del'>-static int nv_check_hotplug(struct ata_host_set *host_set);</div><div class='del'>-static void nv_enable_hotplug_ck804(struct ata_probe_ent *probe_ent);</div><div class='del'>-static void nv_disable_hotplug_ck804(struct ata_host_set *host_set);</div><div class='del'>-static int nv_check_hotplug_ck804(struct ata_host_set *host_set);</div><div class='add'>+</div><div class='add'>+static void nv_nf2_freeze(struct ata_port *ap);</div><div class='add'>+static void nv_nf2_thaw(struct ata_port *ap);</div><div class='add'>+static void nv_ck804_freeze(struct ata_port *ap);</div><div class='add'>+static void nv_ck804_thaw(struct ata_port *ap);</div><div class='add'>+static void nv_error_handler(struct ata_port *ap);</div><div class='ctx'> </div><div class='ctx'> enum nv_host_type</div><div class='ctx'> {</div><div class='ctx'> 	GENERIC,</div><div class='ctx'> 	NFORCE2,</div><div class='del'>-	NFORCE3,</div><div class='add'>+	NFORCE3 = NFORCE2,	/* NF2 == NF3 as far as sata_nv is concerned */</div><div class='ctx'> 	CK804</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -140,6 +128,16 @@ static const struct pci_device_id nv_pci_tbl[] = {</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='ctx'> 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3,</div><div class='add'>+		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x045c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x045d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x045e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='add'>+	{ PCI_VENDOR_ID_NVIDIA, 0x045f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },</div><div class='ctx'> 	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,</div><div class='ctx'> 		PCI_ANY_ID, PCI_ANY_ID,</div><div class='ctx'> 		PCI_CLASS_STORAGE_IDE&lt;&lt;8, 0xffff00, GENERIC },</div><div class='hunk'>@@ -149,46 +147,6 @@ static const struct pci_device_id nv_pci_tbl[] = {</div><div class='ctx'> 	{ 0, } /* terminate list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct nv_host_desc</div><div class='del'>-{</div><div class='del'>-	enum nv_host_type	host_type;</div><div class='del'>-	void			(*enable_hotplug)(struct ata_probe_ent *probe_ent);</div><div class='del'>-	void			(*disable_hotplug)(struct ata_host_set *host_set);</div><div class='del'>-	int			(*check_hotplug)(struct ata_host_set *host_set);</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-static struct nv_host_desc nv_device_tbl[] = {</div><div class='del'>-	{</div><div class='del'>-		.host_type	= GENERIC,</div><div class='del'>-		.enable_hotplug	= NULL,</div><div class='del'>-		.disable_hotplug= NULL,</div><div class='del'>-		.check_hotplug	= NULL,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.host_type	= NFORCE2,</div><div class='del'>-		.enable_hotplug	= nv_enable_hotplug,</div><div class='del'>-		.disable_hotplug= nv_disable_hotplug,</div><div class='del'>-		.check_hotplug	= nv_check_hotplug,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.host_type	= NFORCE3,</div><div class='del'>-		.enable_hotplug	= nv_enable_hotplug,</div><div class='del'>-		.disable_hotplug= nv_disable_hotplug,</div><div class='del'>-		.check_hotplug	= nv_check_hotplug,</div><div class='del'>-	},</div><div class='del'>-	{	.host_type	= CK804,</div><div class='del'>-		.enable_hotplug	= nv_enable_hotplug_ck804,</div><div class='del'>-		.disable_hotplug= nv_disable_hotplug_ck804,</div><div class='del'>-		.check_hotplug	= nv_check_hotplug_ck804,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct nv_host</div><div class='del'>-{</div><div class='del'>-	struct nv_host_desc	*host_desc;</div><div class='del'>-	unsigned long		host_flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static struct pci_driver nv_pci_driver = {</div><div class='ctx'> 	.name			= DRV_NAME,</div><div class='ctx'> 	.id_table		= nv_pci_tbl,</div><div class='hunk'>@@ -210,51 +168,119 @@ static struct scsi_host_template nv_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct ata_port_operations nv_ops = {</div><div class='add'>+static const struct ata_port_operations nv_generic_ops = {</div><div class='ctx'> 	.port_disable		= ata_port_disable,</div><div class='ctx'> 	.tf_load		= ata_tf_load,</div><div class='ctx'> 	.tf_read		= ata_tf_read,</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.check_status		= ata_check_status,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='del'>-	.phy_reset		= sata_phy_reset,</div><div class='ctx'> 	.bmdma_setup		= ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start		= ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='del'>-	.irq_handler		= nv_interrupt,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= nv_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='add'>+	.irq_handler		= nv_generic_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='ctx'> 	.scr_read		= nv_scr_read,</div><div class='ctx'> 	.scr_write		= nv_scr_write,</div><div class='ctx'> 	.port_start		= ata_port_start,</div><div class='ctx'> 	.port_stop		= ata_port_stop,</div><div class='del'>-	.host_stop		= nv_host_stop,</div><div class='add'>+	.host_stop		= ata_pci_host_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* FIXME: The hardware provides the necessary SATA PHY controls</div><div class='del'>- * to support ATA_FLAG_SATA_RESET.  However, it is currently</div><div class='del'>- * necessary to disable that flag, to solve misdetection problems.</div><div class='del'>- * See http://bugme.osdl.org/show_bug.cgi?id=3352 for more info.</div><div class='del'>- *</div><div class='del'>- * This problem really needs to be investigated further.  But in the</div><div class='del'>- * meantime, we avoid ATA_FLAG_SATA_RESET to get people working.</div><div class='del'>- */</div><div class='del'>-static struct ata_port_info nv_port_info = {</div><div class='del'>-	.sht		= &amp;nv_sht,</div><div class='del'>-	.host_flags	= ATA_FLAG_SATA |</div><div class='del'>-			  /* ATA_FLAG_SATA_RESET | */</div><div class='del'>-			  ATA_FLAG_SRST |</div><div class='del'>-			  ATA_FLAG_NO_LEGACY,</div><div class='del'>-	.pio_mask	= NV_PIO_MASK,</div><div class='del'>-	.mwdma_mask	= NV_MWDMA_MASK,</div><div class='del'>-	.udma_mask	= NV_UDMA_MASK,</div><div class='del'>-	.port_ops	= &amp;nv_ops,</div><div class='add'>+static const struct ata_port_operations nv_nf2_ops = {</div><div class='add'>+	.port_disable		= ata_port_disable,</div><div class='add'>+	.tf_load		= ata_tf_load,</div><div class='add'>+	.tf_read		= ata_tf_read,</div><div class='add'>+	.exec_command		= ata_exec_command,</div><div class='add'>+	.check_status		= ata_check_status,</div><div class='add'>+	.dev_select		= ata_std_dev_select,</div><div class='add'>+	.bmdma_setup		= ata_bmdma_setup,</div><div class='add'>+	.bmdma_start		= ata_bmdma_start,</div><div class='add'>+	.bmdma_stop		= ata_bmdma_stop,</div><div class='add'>+	.bmdma_status		= ata_bmdma_status,</div><div class='add'>+	.qc_prep		= ata_qc_prep,</div><div class='add'>+	.qc_issue		= ata_qc_issue_prot,</div><div class='add'>+	.freeze			= nv_nf2_freeze,</div><div class='add'>+	.thaw			= nv_nf2_thaw,</div><div class='add'>+	.error_handler		= nv_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='add'>+	.irq_handler		= nv_nf2_interrupt,</div><div class='add'>+	.irq_clear		= ata_bmdma_irq_clear,</div><div class='add'>+	.scr_read		= nv_scr_read,</div><div class='add'>+	.scr_write		= nv_scr_write,</div><div class='add'>+	.port_start		= ata_port_start,</div><div class='add'>+	.port_stop		= ata_port_stop,</div><div class='add'>+	.host_stop		= ata_pci_host_stop,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ata_port_operations nv_ck804_ops = {</div><div class='add'>+	.port_disable		= ata_port_disable,</div><div class='add'>+	.tf_load		= ata_tf_load,</div><div class='add'>+	.tf_read		= ata_tf_read,</div><div class='add'>+	.exec_command		= ata_exec_command,</div><div class='add'>+	.check_status		= ata_check_status,</div><div class='add'>+	.dev_select		= ata_std_dev_select,</div><div class='add'>+	.bmdma_setup		= ata_bmdma_setup,</div><div class='add'>+	.bmdma_start		= ata_bmdma_start,</div><div class='add'>+	.bmdma_stop		= ata_bmdma_stop,</div><div class='add'>+	.bmdma_status		= ata_bmdma_status,</div><div class='add'>+	.qc_prep		= ata_qc_prep,</div><div class='add'>+	.qc_issue		= ata_qc_issue_prot,</div><div class='add'>+	.freeze			= nv_ck804_freeze,</div><div class='add'>+	.thaw			= nv_ck804_thaw,</div><div class='add'>+	.error_handler		= nv_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='add'>+	.irq_handler		= nv_ck804_interrupt,</div><div class='add'>+	.irq_clear		= ata_bmdma_irq_clear,</div><div class='add'>+	.scr_read		= nv_scr_read,</div><div class='add'>+	.scr_write		= nv_scr_write,</div><div class='add'>+	.port_start		= ata_port_start,</div><div class='add'>+	.port_stop		= ata_port_stop,</div><div class='add'>+	.host_stop		= nv_ck804_host_stop,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ata_port_info nv_port_info[] = {</div><div class='add'>+	/* generic */</div><div class='add'>+	{</div><div class='add'>+		.sht		= &amp;nv_sht,</div><div class='add'>+		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,</div><div class='add'>+		.pio_mask	= NV_PIO_MASK,</div><div class='add'>+		.mwdma_mask	= NV_MWDMA_MASK,</div><div class='add'>+		.udma_mask	= NV_UDMA_MASK,</div><div class='add'>+		.port_ops	= &amp;nv_generic_ops,</div><div class='add'>+	},</div><div class='add'>+	/* nforce2/3 */</div><div class='add'>+	{</div><div class='add'>+		.sht		= &amp;nv_sht,</div><div class='add'>+		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,</div><div class='add'>+		.pio_mask	= NV_PIO_MASK,</div><div class='add'>+		.mwdma_mask	= NV_MWDMA_MASK,</div><div class='add'>+		.udma_mask	= NV_UDMA_MASK,</div><div class='add'>+		.port_ops	= &amp;nv_nf2_ops,</div><div class='add'>+	},</div><div class='add'>+	/* ck804 */</div><div class='add'>+	{</div><div class='add'>+		.sht		= &amp;nv_sht,</div><div class='add'>+		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,</div><div class='add'>+		.pio_mask	= NV_PIO_MASK,</div><div class='add'>+		.mwdma_mask	= NV_MWDMA_MASK,</div><div class='add'>+		.udma_mask	= NV_UDMA_MASK,</div><div class='add'>+		.port_ops	= &amp;nv_ck804_ops,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("NVIDIA");</div><div class='hunk'>@@ -263,11 +289,10 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, nv_pci_tbl);</div><div class='ctx'> MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='del'>-static irqreturn_t nv_interrupt (int irq, void *dev_instance,</div><div class='del'>-				 struct pt_regs *regs)</div><div class='add'>+static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance,</div><div class='add'>+					struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_host_set *host_set = dev_instance;</div><div class='del'>-	struct nv_host *host = host_set-&gt;private_data;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int handled = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -279,11 +304,11 @@ static irqreturn_t nv_interrupt (int irq, void *dev_instance,</div><div class='ctx'> </div><div class='ctx'> 		ap = host_set-&gt;ports[i];</div><div class='ctx'> 		if (ap &amp;&amp;</div><div class='del'>-		    !(ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {</div><div class='add'>+		    !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 			struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='ctx'> 			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN)))</div><div class='add'>+			if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)))</div><div class='ctx'> 				handled += ata_host_intr(ap, qc);</div><div class='ctx'> 			else</div><div class='ctx'> 				// No request pending?  Clear interrupt status</div><div class='hunk'>@@ -293,14 +318,88 @@ static irqreturn_t nv_interrupt (int irq, void *dev_instance,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (host-&gt;host_desc-&gt;check_hotplug)</div><div class='del'>-		handled += host-&gt;host_desc-&gt;check_hotplug(host_set);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;host_set-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int nv_host_intr(struct ata_port *ap, u8 irq_stat)</div><div class='add'>+{</div><div class='add'>+	struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+	int handled;</div><div class='add'>+</div><div class='add'>+	/* freeze if hotplugged */</div><div class='add'>+	if (unlikely(irq_stat &amp; (NV_INT_ADDED | NV_INT_REMOVED))) {</div><div class='add'>+		ata_port_freeze(ap);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bail out if not our interrupt */</div><div class='add'>+	if (!(irq_stat &amp; NV_INT_DEV))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* DEV interrupt w/ no active qc? */</div><div class='add'>+	if (unlikely(!qc || (qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING))) {</div><div class='add'>+		ata_check_status(ap);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* handle interrupt */</div><div class='add'>+	handled = ata_host_intr(ap, qc);</div><div class='add'>+	if (unlikely(!handled)) {</div><div class='add'>+		/* spurious, clear it */</div><div class='add'>+		ata_check_status(ap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nv_do_interrupt(struct ata_host_set *host_set, u8 irq_stat)</div><div class='add'>+{</div><div class='add'>+	int i, handled = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='add'>+		struct ata_port *ap = host_set-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		if (ap &amp;&amp; !(ap-&gt;flags &amp; ATA_FLAG_DISABLED))</div><div class='add'>+			handled += nv_host_intr(ap, irq_stat);</div><div class='add'>+</div><div class='add'>+		irq_stat &gt;&gt;= NV_INT_PORT_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_RETVAL(handled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance,</div><div class='add'>+				    struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_instance;</div><div class='add'>+	u8 irq_stat;</div><div class='add'>+	irqreturn_t ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;host_set-&gt;lock);</div><div class='add'>+	irq_stat = inb(host_set-&gt;ports[0]-&gt;ioaddr.scr_addr + NV_INT_STATUS);</div><div class='add'>+	ret = nv_do_interrupt(host_set, irq_stat);</div><div class='add'>+	spin_unlock(&amp;host_set-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance,</div><div class='add'>+				      struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_instance;</div><div class='add'>+	u8 irq_stat;</div><div class='add'>+	irqreturn_t ret;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;host_set-&gt;lock);</div><div class='add'>+	irq_stat = readb(host_set-&gt;mmio_base + NV_INT_STATUS_CK804);</div><div class='add'>+	ret = nv_do_interrupt(host_set, irq_stat);</div><div class='add'>+	spin_unlock(&amp;host_set-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg)</div><div class='ctx'> {</div><div class='ctx'> 	if (sc_reg &gt; SCR_CONTROL)</div><div class='hunk'>@@ -317,23 +416,74 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='ctx'> 	iowrite32(val, (void __iomem *)ap-&gt;ioaddr.scr_addr + (sc_reg * 4));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_host_stop (struct ata_host_set *host_set)</div><div class='add'>+static void nv_nf2_freeze(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	struct nv_host *host = host_set-&gt;private_data;</div><div class='add'>+	unsigned long scr_addr = ap-&gt;host_set-&gt;ports[0]-&gt;ioaddr.scr_addr;</div><div class='add'>+	int shift = ap-&gt;port_no * NV_INT_PORT_SHIFT;</div><div class='add'>+	u8 mask;</div><div class='ctx'> </div><div class='del'>-	// Disable hotplug event interrupts.</div><div class='del'>-	if (host-&gt;host_desc-&gt;disable_hotplug)</div><div class='del'>-		host-&gt;host_desc-&gt;disable_hotplug(host_set);</div><div class='add'>+	mask = inb(scr_addr + NV_INT_ENABLE);</div><div class='add'>+	mask &amp;= ~(NV_INT_ALL &lt;&lt; shift);</div><div class='add'>+	outb(mask, scr_addr + NV_INT_ENABLE);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	kfree(host);</div><div class='add'>+static void nv_nf2_thaw(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	unsigned long scr_addr = ap-&gt;host_set-&gt;ports[0]-&gt;ioaddr.scr_addr;</div><div class='add'>+	int shift = ap-&gt;port_no * NV_INT_PORT_SHIFT;</div><div class='add'>+	u8 mask;</div><div class='ctx'> </div><div class='del'>-	ata_pci_host_stop(host_set);</div><div class='add'>+	outb(NV_INT_ALL &lt;&lt; shift, scr_addr + NV_INT_STATUS);</div><div class='add'>+</div><div class='add'>+	mask = inb(scr_addr + NV_INT_ENABLE);</div><div class='add'>+	mask |= (NV_INT_MASK &lt;&lt; shift);</div><div class='add'>+	outb(mask, scr_addr + NV_INT_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_ck804_freeze(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmio_base = ap-&gt;host_set-&gt;mmio_base;</div><div class='add'>+	int shift = ap-&gt;port_no * NV_INT_PORT_SHIFT;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	mask = readb(mmio_base + NV_INT_ENABLE_CK804);</div><div class='add'>+	mask &amp;= ~(NV_INT_ALL &lt;&lt; shift);</div><div class='add'>+	writeb(mask, mmio_base + NV_INT_ENABLE_CK804);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_ck804_thaw(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmio_base = ap-&gt;host_set-&gt;mmio_base;</div><div class='add'>+	int shift = ap-&gt;port_no * NV_INT_PORT_SHIFT;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	writeb(NV_INT_ALL &lt;&lt; shift, mmio_base + NV_INT_STATUS_CK804);</div><div class='add'>+</div><div class='add'>+	mask = readb(mmio_base + NV_INT_ENABLE_CK804);</div><div class='add'>+	mask |= (NV_INT_MASK &lt;&lt; shift);</div><div class='add'>+	writeb(mask, mmio_base + NV_INT_ENABLE_CK804);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nv_hardreset(struct ata_port *ap, unsigned int *class)</div><div class='add'>+{</div><div class='add'>+	unsigned int dummy;</div><div class='add'>+</div><div class='add'>+	/* SATA hardreset fails to retrieve proper device signature on</div><div class='add'>+	 * some controllers.  Don't classify on hardreset.  For more</div><div class='add'>+	 * info, see http://bugme.osdl.org/show_bug.cgi?id=3352</div><div class='add'>+	 */</div><div class='add'>+	return sata_std_hardreset(ap, &amp;dummy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nv_error_handler(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	ata_bmdma_drive_eh(ap, ata_std_prereset, ata_std_softreset,</div><div class='add'>+			   nv_hardreset, ata_std_postreset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	static int printed_version = 0;</div><div class='del'>-	struct nv_host *host;</div><div class='ctx'> 	struct ata_port_info *ppi;</div><div class='ctx'> 	struct ata_probe_ent *probe_ent;</div><div class='ctx'> 	int pci_dev_busy = 0;</div><div class='hunk'>@@ -370,24 +520,15 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	rc = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ppi = &amp;nv_port_info;</div><div class='add'>+	ppi = &amp;nv_port_info[ent-&gt;driver_data];</div><div class='ctx'> 	probe_ent = ata_pci_init_native_mode(pdev, &amp;ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);</div><div class='ctx'> 	if (!probe_ent)</div><div class='ctx'> 		goto err_out_regions;</div><div class='ctx'> </div><div class='del'>-	host = kmalloc(sizeof(struct nv_host), GFP_KERNEL);</div><div class='del'>-	if (!host)</div><div class='del'>-		goto err_out_free_ent;</div><div class='del'>-</div><div class='del'>-	memset(host, 0, sizeof(struct nv_host));</div><div class='del'>-	host-&gt;host_desc = &amp;nv_device_tbl[ent-&gt;driver_data];</div><div class='del'>-</div><div class='del'>-	probe_ent-&gt;private_data = host;</div><div class='del'>-</div><div class='ctx'> 	probe_ent-&gt;mmio_base = pci_iomap(pdev, 5, 0);</div><div class='ctx'> 	if (!probe_ent-&gt;mmio_base) {</div><div class='ctx'> 		rc = -EIO;</div><div class='del'>-		goto err_out_free_host;</div><div class='add'>+		goto err_out_free_ent;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	base = (unsigned long)probe_ent-&gt;mmio_base;</div><div class='hunk'>@@ -395,24 +536,27 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	probe_ent-&gt;port[0].scr_addr = base + NV_PORT0_SCR_REG_OFFSET;</div><div class='ctx'> 	probe_ent-&gt;port[1].scr_addr = base + NV_PORT1_SCR_REG_OFFSET;</div><div class='ctx'> </div><div class='add'>+	/* enable SATA space for CK804 */</div><div class='add'>+	if (ent-&gt;driver_data == CK804) {</div><div class='add'>+		u8 regval;</div><div class='add'>+</div><div class='add'>+		pci_read_config_byte(pdev, NV_MCP_SATA_CFG_20, &amp;regval);</div><div class='add'>+		regval |= NV_MCP_SATA_CFG_20_SATA_SPACE_EN;</div><div class='add'>+		pci_write_config_byte(pdev, NV_MCP_SATA_CFG_20, regval);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	rc = ata_device_add(probe_ent);</div><div class='ctx'> 	if (rc != NV_PORTS)</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> </div><div class='del'>-	// Enable hotplug event interrupts.</div><div class='del'>-	if (host-&gt;host_desc-&gt;enable_hotplug)</div><div class='del'>-		host-&gt;host_desc-&gt;enable_hotplug(probe_ent);</div><div class='del'>-</div><div class='ctx'> 	kfree(probe_ent);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_iounmap:</div><div class='ctx'> 	pci_iounmap(pdev, probe_ent-&gt;mmio_base);</div><div class='del'>-err_out_free_host:</div><div class='del'>-	kfree(host);</div><div class='ctx'> err_out_free_ent:</div><div class='ctx'> 	kfree(probe_ent);</div><div class='ctx'> err_out_regions:</div><div class='hunk'>@@ -424,127 +568,17 @@ err_out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nv_enable_hotplug(struct ata_probe_ent *probe_ent)</div><div class='del'>-{</div><div class='del'>-	u8 intr_mask;</div><div class='del'>-</div><div class='del'>-	outb(NV_INT_STATUS_HOTPLUG,</div><div class='del'>-		probe_ent-&gt;port[0].scr_addr + NV_INT_STATUS);</div><div class='del'>-</div><div class='del'>-	intr_mask = inb(probe_ent-&gt;port[0].scr_addr + NV_INT_ENABLE);</div><div class='del'>-	intr_mask |= NV_INT_ENABLE_HOTPLUG;</div><div class='del'>-</div><div class='del'>-	outb(intr_mask, probe_ent-&gt;port[0].scr_addr + NV_INT_ENABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nv_disable_hotplug(struct ata_host_set *host_set)</div><div class='del'>-{</div><div class='del'>-	u8 intr_mask;</div><div class='del'>-</div><div class='del'>-	intr_mask = inb(host_set-&gt;ports[0]-&gt;ioaddr.scr_addr + NV_INT_ENABLE);</div><div class='del'>-</div><div class='del'>-	intr_mask &amp;= ~(NV_INT_ENABLE_HOTPLUG);</div><div class='del'>-</div><div class='del'>-	outb(intr_mask, host_set-&gt;ports[0]-&gt;ioaddr.scr_addr + NV_INT_ENABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nv_check_hotplug(struct ata_host_set *host_set)</div><div class='del'>-{</div><div class='del'>-	u8 intr_status;</div><div class='del'>-</div><div class='del'>-	intr_status = inb(host_set-&gt;ports[0]-&gt;ioaddr.scr_addr + NV_INT_STATUS);</div><div class='del'>-</div><div class='del'>-	// Clear interrupt status.</div><div class='del'>-	outb(0xff, host_set-&gt;ports[0]-&gt;ioaddr.scr_addr + NV_INT_STATUS);</div><div class='del'>-</div><div class='del'>-	if (intr_status &amp; NV_INT_STATUS_HOTPLUG) {</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_PDEV_ADDED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Primary device added\n");</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_PDEV_REMOVED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Primary device removed\n");</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_SDEV_ADDED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Secondary device added\n");</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_SDEV_REMOVED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Secondary device removed\n");</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nv_enable_hotplug_ck804(struct ata_probe_ent *probe_ent)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(probe_ent-&gt;dev);</div><div class='del'>-	u8 intr_mask;</div><div class='del'>-	u8 regval;</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(pdev, NV_MCP_SATA_CFG_20, &amp;regval);</div><div class='del'>-	regval |= NV_MCP_SATA_CFG_20_SATA_SPACE_EN;</div><div class='del'>-	pci_write_config_byte(pdev, NV_MCP_SATA_CFG_20, regval);</div><div class='del'>-</div><div class='del'>-	writeb(NV_INT_STATUS_HOTPLUG, probe_ent-&gt;mmio_base + NV_INT_STATUS_CK804);</div><div class='del'>-</div><div class='del'>-	intr_mask = readb(probe_ent-&gt;mmio_base + NV_INT_ENABLE_CK804);</div><div class='del'>-	intr_mask |= NV_INT_ENABLE_HOTPLUG;</div><div class='del'>-</div><div class='del'>-	writeb(intr_mask, probe_ent-&gt;mmio_base + NV_INT_ENABLE_CK804);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nv_disable_hotplug_ck804(struct ata_host_set *host_set)</div><div class='add'>+static void nv_ck804_host_stop(struct ata_host_set *host_set)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(host_set-&gt;dev);</div><div class='del'>-	u8 intr_mask;</div><div class='ctx'> 	u8 regval;</div><div class='ctx'> </div><div class='del'>-	intr_mask = readb(host_set-&gt;mmio_base + NV_INT_ENABLE_CK804);</div><div class='del'>-</div><div class='del'>-	intr_mask &amp;= ~(NV_INT_ENABLE_HOTPLUG);</div><div class='del'>-</div><div class='del'>-	writeb(intr_mask, host_set-&gt;mmio_base + NV_INT_ENABLE_CK804);</div><div class='del'>-</div><div class='add'>+	/* disable SATA space for CK804 */</div><div class='ctx'> 	pci_read_config_byte(pdev, NV_MCP_SATA_CFG_20, &amp;regval);</div><div class='ctx'> 	regval &amp;= ~NV_MCP_SATA_CFG_20_SATA_SPACE_EN;</div><div class='ctx'> 	pci_write_config_byte(pdev, NV_MCP_SATA_CFG_20, regval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nv_check_hotplug_ck804(struct ata_host_set *host_set)</div><div class='del'>-{</div><div class='del'>-	u8 intr_status;</div><div class='ctx'> </div><div class='del'>-	intr_status = readb(host_set-&gt;mmio_base + NV_INT_STATUS_CK804);</div><div class='del'>-</div><div class='del'>-	// Clear interrupt status.</div><div class='del'>-	writeb(0xff, host_set-&gt;mmio_base + NV_INT_STATUS_CK804);</div><div class='del'>-</div><div class='del'>-	if (intr_status &amp; NV_INT_STATUS_HOTPLUG) {</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_PDEV_ADDED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Primary device added\n");</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_PDEV_REMOVED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Primary device removed\n");</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_SDEV_ADDED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Secondary device added\n");</div><div class='del'>-</div><div class='del'>-		if (intr_status &amp; NV_INT_STATUS_SDEV_REMOVED)</div><div class='del'>-			printk(KERN_WARNING "nv_sata: "</div><div class='del'>-				"Secondary device removed\n");</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	ata_pci_host_stop(host_set);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init nv_init(void)</div><div class='head'>diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c<br/>index 7eb67a6bdc64..64631bd38952 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_promise.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_promise.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_promise.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_promise.c</a></div><div class='hunk'>@@ -76,7 +76,8 @@ enum {</div><div class='ctx'> 	PDC_RESET		= (1 &lt;&lt; 11), /* HDMA reset */</div><div class='ctx'> </div><div class='ctx'> 	PDC_COMMON_FLAGS	= ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |</div><div class='del'>-				  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI,</div><div class='add'>+				  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |</div><div class='add'>+				  ATA_FLAG_PIO_POLLING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -120,6 +121,7 @@ static struct scsi_host_template pdc_ata_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -136,6 +138,7 @@ static const struct ata_port_operations pdc_sata_ops = {</div><div class='ctx'> 	.qc_prep		= pdc_qc_prep,</div><div class='ctx'> 	.qc_issue		= pdc_qc_issue_prot,</div><div class='ctx'> 	.eng_timeout		= pdc_eng_timeout,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> 	.irq_handler		= pdc_interrupt,</div><div class='ctx'> 	.irq_clear		= pdc_irq_clear,</div><div class='ctx'> </div><div class='hunk'>@@ -158,6 +161,7 @@ static const struct ata_port_operations pdc_pata_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.qc_prep		= pdc_qc_prep,</div><div class='ctx'> 	.qc_issue		= pdc_qc_issue_prot,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> 	.eng_timeout		= pdc_eng_timeout,</div><div class='ctx'> 	.irq_handler		= pdc_interrupt,</div><div class='ctx'> 	.irq_clear		= pdc_irq_clear,</div><div class='hunk'>@@ -363,12 +367,23 @@ static void pdc_sata_phy_reset(struct ata_port *ap)</div><div class='ctx'> 	sata_phy_reset(ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pdc_pata_phy_reset(struct ata_port *ap)</div><div class='add'>+static void pdc_pata_cbl_detect(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME: add cable detect.  Don't assume 40-pin cable */</div><div class='del'>-	ap-&gt;cbl = ATA_CBL_PATA40;</div><div class='del'>-	ap-&gt;udma_mask &amp;= ATA_UDMA_MASK_40C;</div><div class='add'>+	u8 tmp;</div><div class='add'>+	void __iomem *mmio = (void *) ap-&gt;ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;</div><div class='add'>+</div><div class='add'>+	tmp = readb(mmio);</div><div class='add'>+</div><div class='add'>+	if (tmp &amp; 0x01) {</div><div class='add'>+		ap-&gt;cbl = ATA_CBL_PATA40;</div><div class='add'>+		ap-&gt;udma_mask &amp;= ATA_UDMA_MASK_40C;</div><div class='add'>+	} else</div><div class='add'>+		ap-&gt;cbl = ATA_CBL_PATA80;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void pdc_pata_phy_reset(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	pdc_pata_cbl_detect(ap);</div><div class='ctx'> 	pdc_reset_port(ap);</div><div class='ctx'> 	ata_port_probe(ap);</div><div class='ctx'> 	ata_bus_reset(ap);</div><div class='hunk'>@@ -435,7 +450,7 @@ static void pdc_eng_timeout(struct ata_port *ap)</div><div class='ctx'> 	switch (qc-&gt;tf.protocol) {</div><div class='ctx'> 	case ATA_PROT_DMA:</div><div class='ctx'> 	case ATA_PROT_NODATA:</div><div class='del'>-		printk(KERN_ERR "ata%u: command timeout\n", ap-&gt;id);</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "command timeout\n");</div><div class='ctx'> 		drv_stat = ata_wait_idle(ap);</div><div class='ctx'> 		qc-&gt;err_mask |= __ac_err_mask(drv_stat);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -443,8 +458,9 @@ static void pdc_eng_timeout(struct ata_port *ap)</div><div class='ctx'> 	default:</div><div class='ctx'> 		drv_stat = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n",</div><div class='del'>-		       ap-&gt;id, qc-&gt;tf.command, drv_stat);</div><div class='add'>+		ata_port_printk(ap, KERN_ERR,</div><div class='add'>+				"unknown timeout, cmd 0x%x stat 0x%x\n",</div><div class='add'>+				qc-&gt;tf.command, drv_stat);</div><div class='ctx'> </div><div class='ctx'> 		qc-&gt;err_mask |= ac_err_mask(drv_stat);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -533,11 +549,11 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r</div><div class='ctx'> 		ap = host_set-&gt;ports[i];</div><div class='ctx'> 		tmp = mask &amp; (1 &lt;&lt; (i + 1));</div><div class='ctx'> 		if (tmp &amp;&amp; ap &amp;&amp;</div><div class='del'>-		    !(ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {</div><div class='add'>+		    !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 			struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='ctx'> 			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN)))</div><div class='add'>+			if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)))</div><div class='ctx'> 				handled += pdc_host_intr(ap, qc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -676,10 +692,6 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 	if (!printed_version++)</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If this driver happens to only be useful on Apple's K2, then</div><div class='del'>-	 * we should check that here as it has a normal Serverworks ID</div><div class='del'>-	 */</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -731,7 +743,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 	probe_ent-&gt;port_ops	= pdc_port_info[board_idx].port_ops;</div><div class='ctx'> </div><div class='ctx'>        	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-       	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+       	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = mmio_base;</div><div class='ctx'> </div><div class='ctx'> 	pdc_ata_setup_port(&amp;probe_ent-&gt;port[0], base + 0x200);</div><div class='head'>diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c<br/>index 886f3447dd48..d374c1db0cf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_qstor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_qstor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_qstor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_qstor.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_qstor"</div><div class='del'>-#define DRV_VERSION	"0.05"</div><div class='add'>+#define DRV_VERSION	"0.06"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	QS_PORTS		= 4,</div><div class='hunk'>@@ -142,6 +142,7 @@ static struct scsi_host_template qs_ata_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= QS_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -156,6 +157,7 @@ static const struct ata_port_operations qs_ata_ops = {</div><div class='ctx'> 	.phy_reset		= qs_phy_reset,</div><div class='ctx'> 	.qc_prep		= qs_qc_prep,</div><div class='ctx'> 	.qc_issue		= qs_qc_issue,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> 	.eng_timeout		= qs_eng_timeout,</div><div class='ctx'> 	.irq_handler		= qs_intr,</div><div class='ctx'> 	.irq_clear		= qs_irq_clear,</div><div class='hunk'>@@ -175,7 +177,7 @@ static const struct ata_port_info qs_port_info[] = {</div><div class='ctx'> 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='ctx'> 				  ATA_FLAG_SATA_RESET |</div><div class='ctx'> 				  //FIXME ATA_FLAG_SRST |</div><div class='del'>-				  ATA_FLAG_MMIO,</div><div class='add'>+				  ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,</div><div class='ctx'> 		.pio_mask	= 0x10, /* pio4 */</div><div class='ctx'> 		.udma_mask	= 0x7f, /* udma0-6 */</div><div class='ctx'> 		.port_ops	= &amp;qs_ata_ops,</div><div class='hunk'>@@ -394,14 +396,13 @@ static inline unsigned int qs_intr_pkt(struct ata_host_set *host_set)</div><div class='ctx'> 			DPRINTK("SFF=%08x%08x: sCHAN=%u sHST=%d sDST=%02x\n",</div><div class='ctx'> 					sff1, sff0, port_no, sHST, sDST);</div><div class='ctx'> 			handled = 1;</div><div class='del'>-			if (ap &amp;&amp; !(ap-&gt;flags &amp;</div><div class='del'>-				    (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) {</div><div class='add'>+			if (ap &amp;&amp; !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 				struct ata_queued_cmd *qc;</div><div class='ctx'> 				struct qs_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 				if (!pp || pp-&gt;state != qs_state_pkt)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-				if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN))) {</div><div class='add'>+				if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING))) {</div><div class='ctx'> 					switch (sHST) {</div><div class='ctx'> 					case 0: /* successful CPB */</div><div class='ctx'> 					case 3: /* device error */</div><div class='hunk'>@@ -428,13 +429,13 @@ static inline unsigned int qs_intr_mmio(struct ata_host_set *host_set)</div><div class='ctx'> 		struct ata_port *ap;</div><div class='ctx'> 		ap = host_set-&gt;ports[port_no];</div><div class='ctx'> 		if (ap &amp;&amp;</div><div class='del'>-		    !(ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {</div><div class='add'>+		    !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 			struct ata_queued_cmd *qc;</div><div class='ctx'> 			struct qs_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 			if (!pp || pp-&gt;state != qs_state_mmio)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN))) {</div><div class='add'>+			if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING))) {</div><div class='ctx'> </div><div class='ctx'> 				/* check main status, clearing INTRQ */</div><div class='ctx'> 				u8 status = ata_check_status(ap);</div><div class='hunk'>@@ -679,7 +680,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	probe_ent-&gt;port_ops	= qs_port_info[board_idx].port_ops;</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;irq		= pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags	= SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags	= IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base	= mmio_base;</div><div class='ctx'> 	probe_ent-&gt;n_ports	= QS_PORTS;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c<br/>index 106627299d55..d0a85073ebf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sil.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sil.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sil.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_sil.c</a></div><div class='hunk'>@@ -46,23 +46,26 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_sil"</div><div class='del'>-#define DRV_VERSION	"0.9"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * host flags</div><div class='ctx'> 	 */</div><div class='add'>+	SIL_FLAG_NO_SATA_IRQ	= (1 &lt;&lt; 28),</div><div class='ctx'> 	SIL_FLAG_RERR_ON_DMA_ACT = (1 &lt;&lt; 29),</div><div class='ctx'> 	SIL_FLAG_MOD15WRITE	= (1 &lt;&lt; 30),</div><div class='add'>+</div><div class='ctx'> 	SIL_DFL_HOST_FLAGS	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='del'>-				  ATA_FLAG_MMIO,</div><div class='add'>+				  ATA_FLAG_MMIO | ATA_FLAG_HRST_TO_RESUME,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Controller IDs</div><div class='ctx'> 	 */</div><div class='ctx'> 	sil_3112		= 0,</div><div class='del'>-	sil_3512		= 1,</div><div class='del'>-	sil_3114		= 2,</div><div class='add'>+	sil_3112_no_sata_irq	= 1,</div><div class='add'>+	sil_3512		= 2,</div><div class='add'>+	sil_3114		= 3,</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Register offsets</div><div class='hunk'>@@ -84,6 +87,20 @@ enum {</div><div class='ctx'> 	/* BMDMA/BMDMA2 */</div><div class='ctx'> 	SIL_INTR_STEERING	= (1 &lt;&lt; 1),</div><div class='ctx'> </div><div class='add'>+	SIL_DMA_ENABLE		= (1 &lt;&lt; 0),  /* DMA run switch */</div><div class='add'>+	SIL_DMA_RDWR		= (1 &lt;&lt; 3),  /* DMA Rd-Wr */</div><div class='add'>+	SIL_DMA_SATA_IRQ	= (1 &lt;&lt; 4),  /* OR of all SATA IRQs */</div><div class='add'>+	SIL_DMA_ACTIVE		= (1 &lt;&lt; 16), /* DMA running */</div><div class='add'>+	SIL_DMA_ERROR		= (1 &lt;&lt; 17), /* PCI bus error */</div><div class='add'>+	SIL_DMA_COMPLETE	= (1 &lt;&lt; 18), /* cmd complete / IRQ pending */</div><div class='add'>+	SIL_DMA_N_SATA_IRQ	= (1 &lt;&lt; 6),  /* SATA_IRQ for the next channel */</div><div class='add'>+	SIL_DMA_N_ACTIVE	= (1 &lt;&lt; 24), /* ACTIVE for the next channel */</div><div class='add'>+	SIL_DMA_N_ERROR		= (1 &lt;&lt; 25), /* ERROR for the next channel */</div><div class='add'>+	SIL_DMA_N_COMPLETE	= (1 &lt;&lt; 26), /* COMPLETE for the next channel */</div><div class='add'>+</div><div class='add'>+	/* SIEN */</div><div class='add'>+	SIL_SIEN_N		= (1 &lt;&lt; 16), /* triggered by SError.N */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Others</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -92,10 +109,15 @@ enum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='add'>+static int sil_pci_device_resume(struct pci_dev *pdev);</div><div class='ctx'> static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);</div><div class='ctx'> static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);</div><div class='ctx'> static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);</div><div class='ctx'> static void sil_post_set_mode (struct ata_port *ap);</div><div class='add'>+static irqreturn_t sil_interrupt(int irq, void *dev_instance,</div><div class='add'>+				 struct pt_regs *regs);</div><div class='add'>+static void sil_freeze(struct ata_port *ap);</div><div class='add'>+static void sil_thaw(struct ata_port *ap);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id sil_pci_tbl[] = {</div><div class='hunk'>@@ -104,8 +126,8 @@ static const struct pci_device_id sil_pci_tbl[] = {</div><div class='ctx'> 	{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },</div><div class='ctx'> 	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },</div><div class='ctx'> 	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },</div><div class='del'>-	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },</div><div class='del'>-	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },</div><div class='add'>+	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_no_sata_irq },</div><div class='add'>+	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_no_sata_irq },</div><div class='ctx'> 	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -139,6 +161,8 @@ static struct pci_driver sil_pci_driver = {</div><div class='ctx'> 	.id_table		= sil_pci_tbl,</div><div class='ctx'> 	.probe			= sil_init_one,</div><div class='ctx'> 	.remove			= ata_pci_remove_one,</div><div class='add'>+	.suspend		= ata_pci_device_suspend,</div><div class='add'>+	.resume			= sil_pci_device_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template sil_sht = {</div><div class='hunk'>@@ -155,7 +179,10 @@ static struct scsi_host_template sil_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='add'>+	.suspend		= ata_scsi_device_suspend,</div><div class='add'>+	.resume			= ata_scsi_device_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ata_port_operations sil_ops = {</div><div class='hunk'>@@ -166,7 +193,6 @@ static const struct ata_port_operations sil_ops = {</div><div class='ctx'> 	.check_status		= ata_check_status,</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='del'>-	.probe_reset		= ata_std_probe_reset,</div><div class='ctx'> 	.post_set_mode		= sil_post_set_mode,</div><div class='ctx'> 	.bmdma_setup            = ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start            = ata_bmdma_start,</div><div class='hunk'>@@ -174,8 +200,12 @@ static const struct ata_port_operations sil_ops = {</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='del'>-	.irq_handler		= ata_interrupt,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='add'>+	.freeze			= sil_freeze,</div><div class='add'>+	.thaw			= sil_thaw,</div><div class='add'>+	.error_handler		= ata_bmdma_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='add'>+	.irq_handler		= sil_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='ctx'> 	.scr_read		= sil_scr_read,</div><div class='ctx'> 	.scr_write		= sil_scr_write,</div><div class='hunk'>@@ -194,6 +224,16 @@ static const struct ata_port_info sil_port_info[] = {</div><div class='ctx'> 		.udma_mask	= 0x3f,			/* udma0-5 */</div><div class='ctx'> 		.port_ops	= &amp;sil_ops,</div><div class='ctx'> 	},</div><div class='add'>+	/* sil_3112_no_sata_irq */</div><div class='add'>+	{</div><div class='add'>+		.sht		= &amp;sil_sht,</div><div class='add'>+		.host_flags	= SIL_DFL_HOST_FLAGS | SIL_FLAG_MOD15WRITE |</div><div class='add'>+				  SIL_FLAG_NO_SATA_IRQ,</div><div class='add'>+		.pio_mask	= 0x1f,			/* pio0-4 */</div><div class='add'>+		.mwdma_mask	= 0x07,			/* mwdma0-2 */</div><div class='add'>+		.udma_mask	= 0x3f,			/* udma0-5 */</div><div class='add'>+		.port_ops	= &amp;sil_ops,</div><div class='add'>+	},</div><div class='ctx'> 	/* sil_3512 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.sht		= &amp;sil_sht,</div><div class='hunk'>@@ -220,6 +260,7 @@ static const struct {</div><div class='ctx'> 	unsigned long tf;	/* ATA taskfile register block */</div><div class='ctx'> 	unsigned long ctl;	/* ATA control/altstatus register block */</div><div class='ctx'> 	unsigned long bmdma;	/* DMA register block */</div><div class='add'>+	unsigned long bmdma2;	/* DMA register block #2 */</div><div class='ctx'> 	unsigned long fifo_cfg;	/* FIFO Valid Byte Count and Control */</div><div class='ctx'> 	unsigned long scr;	/* SATA control register block */</div><div class='ctx'> 	unsigned long sien;	/* SATA Interrupt Enable register */</div><div class='hunk'>@@ -227,10 +268,10 @@ static const struct {</div><div class='ctx'> 	unsigned long sfis_cfg;	/* SATA FIS reception config register */</div><div class='ctx'> } sil_port[] = {</div><div class='ctx'> 	/* port 0 ... */</div><div class='del'>-	{ 0x80, 0x8A, 0x00, 0x40, 0x100, 0x148, 0xb4, 0x14c },</div><div class='del'>-	{ 0xC0, 0xCA, 0x08, 0x44, 0x180, 0x1c8, 0xf4, 0x1cc },</div><div class='del'>-	{ 0x280, 0x28A, 0x200, 0x240, 0x300, 0x348, 0x2b4, 0x34c },</div><div class='del'>-	{ 0x2C0, 0x2CA, 0x208, 0x244, 0x380, 0x3c8, 0x2f4, 0x3cc },</div><div class='add'>+	{ 0x80, 0x8A, 0x00, 0x10, 0x40, 0x100, 0x148, 0xb4, 0x14c },</div><div class='add'>+	{ 0xC0, 0xCA, 0x08, 0x18, 0x44, 0x180, 0x1c8, 0xf4, 0x1cc },</div><div class='add'>+	{ 0x280, 0x28A, 0x200, 0x210, 0x240, 0x300, 0x348, 0x2b4, 0x34c },</div><div class='add'>+	{ 0x2C0, 0x2CA, 0x208, 0x218, 0x244, 0x380, 0x3c8, 0x2f4, 0x3cc },</div><div class='ctx'> 	/* ... port 3 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -263,7 +304,7 @@ static void sil_post_set_mode (struct ata_port *ap)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		dev = &amp;ap-&gt;device[i];</div><div class='del'>-		if (!ata_dev_present(dev))</div><div class='add'>+		if (!ata_dev_enabled(dev))</div><div class='ctx'> 			dev_mode[i] = 0;	/* PIO0/1/2 */</div><div class='ctx'> 		else if (dev-&gt;flags &amp; ATA_DFLAG_PIO)</div><div class='ctx'> 			dev_mode[i] = 1;	/* PIO3/4 */</div><div class='hunk'>@@ -314,6 +355,156 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)</div><div class='ctx'> 		writel(val, mmio);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sil_host_intr(struct ata_port *ap, u32 bmdma2)</div><div class='add'>+{</div><div class='add'>+	struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	if (unlikely(bmdma2 &amp; SIL_DMA_SATA_IRQ)) {</div><div class='add'>+		u32 serror;</div><div class='add'>+</div><div class='add'>+		/* SIEN doesn't mask SATA IRQs on some 3112s.  Those</div><div class='add'>+		 * controllers continue to assert IRQ as long as</div><div class='add'>+		 * SError bits are pending.  Clear SError immediately.</div><div class='add'>+		 */</div><div class='add'>+		serror = sil_scr_read(ap, SCR_ERROR);</div><div class='add'>+		sil_scr_write(ap, SCR_ERROR, serror);</div><div class='add'>+</div><div class='add'>+		/* Trigger hotplug and accumulate SError only if the</div><div class='add'>+		 * port isn't already frozen.  Otherwise, PHY events</div><div class='add'>+		 * during hardreset makes controllers with broken SIEN</div><div class='add'>+		 * repeat probing needlessly.</div><div class='add'>+		 */</div><div class='add'>+		if (!(ap-&gt;pflags &amp; ATA_PFLAG_FROZEN)) {</div><div class='add'>+			ata_ehi_hotplugged(&amp;ap-&gt;eh_info);</div><div class='add'>+			ap-&gt;eh_info.serror |= serror;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto freeze;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!qc || qc-&gt;tf.ctl &amp; ATA_NIEN))</div><div class='add'>+		goto freeze;</div><div class='add'>+</div><div class='add'>+	/* Check whether we are expecting interrupt in this state */</div><div class='add'>+	switch (ap-&gt;hsm_task_state) {</div><div class='add'>+	case HSM_ST_FIRST:</div><div class='add'>+		/* Some pre-ATAPI-4 devices assert INTRQ</div><div class='add'>+		 * at this state when ready to receive CDB.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* Check the ATA_DFLAG_CDB_INTR flag is enough here.</div><div class='add'>+		 * The flag was turned on only for atapi devices.</div><div class='add'>+		 * No need to check is_atapi_taskfile(&amp;qc-&gt;tf) again.</div><div class='add'>+		 */</div><div class='add'>+		if (!(qc-&gt;dev-&gt;flags &amp; ATA_DFLAG_CDB_INTR))</div><div class='add'>+			goto err_hsm;</div><div class='add'>+		break;</div><div class='add'>+	case HSM_ST_LAST:</div><div class='add'>+		if (qc-&gt;tf.protocol == ATA_PROT_DMA ||</div><div class='add'>+		    qc-&gt;tf.protocol == ATA_PROT_ATAPI_DMA) {</div><div class='add'>+			/* clear DMA-Start bit */</div><div class='add'>+			ap-&gt;ops-&gt;bmdma_stop(qc);</div><div class='add'>+</div><div class='add'>+			if (bmdma2 &amp; SIL_DMA_ERROR) {</div><div class='add'>+				qc-&gt;err_mask |= AC_ERR_HOST_BUS;</div><div class='add'>+				ap-&gt;hsm_task_state = HSM_ST_ERR;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HSM_ST:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto err_hsm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check main status, clearing INTRQ */</div><div class='add'>+	status = ata_chk_status(ap);</div><div class='add'>+	if (unlikely(status &amp; ATA_BUSY))</div><div class='add'>+		goto err_hsm;</div><div class='add'>+</div><div class='add'>+	/* ack bmdma irq events */</div><div class='add'>+	ata_bmdma_irq_clear(ap);</div><div class='add'>+</div><div class='add'>+	/* kick HSM in the ass */</div><div class='add'>+	ata_hsm_move(ap, qc, status, 0);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ err_hsm:</div><div class='add'>+	qc-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+ freeze:</div><div class='add'>+	ata_port_freeze(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t sil_interrupt(int irq, void *dev_instance,</div><div class='add'>+				 struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_instance;</div><div class='add'>+	void __iomem *mmio_base = host_set-&gt;mmio_base;</div><div class='add'>+	int handled = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;host_set-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; host_set-&gt;n_ports; i++) {</div><div class='add'>+		struct ata_port *ap = host_set-&gt;ports[i];</div><div class='add'>+		u32 bmdma2 = readl(mmio_base + sil_port[ap-&gt;port_no].bmdma2);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!ap || ap-&gt;flags &amp; ATA_FLAG_DISABLED))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* turn off SATA_IRQ if not supported */</div><div class='add'>+		if (ap-&gt;flags &amp; SIL_FLAG_NO_SATA_IRQ)</div><div class='add'>+			bmdma2 &amp;= ~SIL_DMA_SATA_IRQ;</div><div class='add'>+</div><div class='add'>+		if (bmdma2 == 0xffffffff ||</div><div class='add'>+		    !(bmdma2 &amp; (SIL_DMA_COMPLETE | SIL_DMA_SATA_IRQ)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sil_host_intr(ap, bmdma2);</div><div class='add'>+		handled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;host_set-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return IRQ_RETVAL(handled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sil_freeze(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmio_base = ap-&gt;host_set-&gt;mmio_base;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* global IRQ mask doesn't block SATA IRQ, turn off explicitly */</div><div class='add'>+	writel(0, mmio_base + sil_port[ap-&gt;port_no].sien);</div><div class='add'>+</div><div class='add'>+	/* plug IRQ */</div><div class='add'>+	tmp = readl(mmio_base + SIL_SYSCFG);</div><div class='add'>+	tmp |= SIL_MASK_IDE0_INT &lt;&lt; ap-&gt;port_no;</div><div class='add'>+	writel(tmp, mmio_base + SIL_SYSCFG);</div><div class='add'>+	readl(mmio_base + SIL_SYSCFG);	/* flush */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sil_thaw(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *mmio_base = ap-&gt;host_set-&gt;mmio_base;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* clear IRQ */</div><div class='add'>+	ata_chk_status(ap);</div><div class='add'>+	ata_bmdma_irq_clear(ap);</div><div class='add'>+</div><div class='add'>+	/* turn on SATA IRQ if supported */</div><div class='add'>+	if (!(ap-&gt;flags &amp; SIL_FLAG_NO_SATA_IRQ))</div><div class='add'>+		writel(SIL_SIEN_N, mmio_base + sil_port[ap-&gt;port_no].sien);</div><div class='add'>+</div><div class='add'>+	/* turn on IRQ */</div><div class='add'>+	tmp = readl(mmio_base + SIL_SYSCFG);</div><div class='add'>+	tmp &amp;= ~(SIL_MASK_IDE0_INT &lt;&lt; ap-&gt;port_no);</div><div class='add'>+	writel(tmp, mmio_base + SIL_SYSCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	sil_dev_config - Apply device/host-specific errata fixups</div><div class='ctx'>  *	@ap: Port containing device to be examined</div><div class='hunk'>@@ -360,21 +551,67 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'> 	if (slow_down ||</div><div class='ctx'> 	    ((ap-&gt;flags &amp; SIL_FLAG_MOD15WRITE) &amp;&amp;</div><div class='ctx'> 	     (quirks &amp; SIL_QUIRK_MOD15WRITE))) {</div><div class='del'>-		printk(KERN_INFO "ata%u(%u): applying Seagate errata fix (mod15write workaround)\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno);</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO, "applying Seagate errata fix "</div><div class='add'>+			       "(mod15write workaround)\n");</div><div class='ctx'> 		dev-&gt;max_sectors = 15;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* limit to udma5 */</div><div class='ctx'> 	if (quirks &amp; SIL_QUIRK_UDMA5MAX) {</div><div class='del'>-		printk(KERN_INFO "ata%u(%u): applying Maxtor errata fix %s\n",</div><div class='del'>-		       ap-&gt;id, dev-&gt;devno, model_num);</div><div class='add'>+		ata_dev_printk(dev, KERN_INFO,</div><div class='add'>+			       "applying Maxtor errata fix %s\n", model_num);</div><div class='ctx'> 		dev-&gt;udma_mask &amp;= ATA_UDMA5;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sil_init_controller(struct pci_dev *pdev,</div><div class='add'>+				int n_ports, unsigned long host_flags,</div><div class='add'>+				void __iomem *mmio_base)</div><div class='add'>+{</div><div class='add'>+	u8 cls;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Initialize FIFO PCI bus arbitration */</div><div class='add'>+	cls = sil_get_device_cache_line(pdev);</div><div class='add'>+	if (cls) {</div><div class='add'>+		cls &gt;&gt;= 3;</div><div class='add'>+		cls++;  /* cls = (line_size/8)+1 */</div><div class='add'>+		for (i = 0; i &lt; n_ports; i++)</div><div class='add'>+			writew(cls &lt;&lt; 8 | cls,</div><div class='add'>+			       mmio_base + sil_port[i].fifo_cfg);</div><div class='add'>+	} else</div><div class='add'>+		dev_printk(KERN_WARNING, &amp;pdev-&gt;dev,</div><div class='add'>+			   "cache line size not set.  Driver may not function\n");</div><div class='add'>+</div><div class='add'>+	/* Apply R_ERR on DMA activate FIS errata workaround */</div><div class='add'>+	if (host_flags &amp; SIL_FLAG_RERR_ON_DMA_ACT) {</div><div class='add'>+		int cnt;</div><div class='add'>+</div><div class='add'>+		for (i = 0, cnt = 0; i &lt; n_ports; i++) {</div><div class='add'>+			tmp = readl(mmio_base + sil_port[i].sfis_cfg);</div><div class='add'>+			if ((tmp &amp; 0x3) != 0x01)</div><div class='add'>+				continue;</div><div class='add'>+			if (!cnt)</div><div class='add'>+				dev_printk(KERN_INFO, &amp;pdev-&gt;dev,</div><div class='add'>+					   "Applying R_ERR on DMA activate "</div><div class='add'>+					   "FIS errata fix\n");</div><div class='add'>+			writel(tmp &amp; ~0x3, mmio_base + sil_port[i].sfis_cfg);</div><div class='add'>+			cnt++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (n_ports == 4) {</div><div class='add'>+		/* flip the magic "make 4 ports work" bit */</div><div class='add'>+		tmp = readl(mmio_base + sil_port[2].bmdma);</div><div class='add'>+		if ((tmp &amp; SIL_INTR_STEERING) == 0)</div><div class='add'>+			writel(tmp | SIL_INTR_STEERING,</div><div class='add'>+			       mmio_base + sil_port[2].bmdma);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	static int printed_version;</div><div class='hunk'>@@ -384,16 +621,10 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int pci_dev_busy = 0;</div><div class='del'>-	u32 tmp, irq_mask;</div><div class='del'>-	u8 cls;</div><div class='ctx'> </div><div class='ctx'> 	if (!printed_version++)</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If this driver happens to only be useful on Apple's K2, then</div><div class='del'>-	 * we should check that here as it has a normal Serverworks ID</div><div class='del'>-	 */</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -426,7 +657,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	probe_ent-&gt;mwdma_mask = sil_port_info[ent-&gt;driver_data].mwdma_mask;</div><div class='ctx'> 	probe_ent-&gt;udma_mask = sil_port_info[ent-&gt;driver_data].udma_mask;</div><div class='ctx'>        	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-       	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+       	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;host_flags = sil_port_info[ent-&gt;driver_data].host_flags;</div><div class='ctx'> </div><div class='ctx'> 	mmio_base = pci_iomap(pdev, 5, 0);</div><div class='hunk'>@@ -448,60 +679,8 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		ata_std_ports(&amp;probe_ent-&gt;port[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize FIFO PCI bus arbitration */</div><div class='del'>-	cls = sil_get_device_cache_line(pdev);</div><div class='del'>-	if (cls) {</div><div class='del'>-		cls &gt;&gt;= 3;</div><div class='del'>-		cls++;  /* cls = (line_size/8)+1 */</div><div class='del'>-		for (i = 0; i &lt; probe_ent-&gt;n_ports; i++)</div><div class='del'>-			writew(cls &lt;&lt; 8 | cls,</div><div class='del'>-			       mmio_base + sil_port[i].fifo_cfg);</div><div class='del'>-	} else</div><div class='del'>-		dev_printk(KERN_WARNING, &amp;pdev-&gt;dev,</div><div class='del'>-			   "cache line size not set.  Driver may not function\n");</div><div class='del'>-</div><div class='del'>-	/* Apply R_ERR on DMA activate FIS errata workaround */</div><div class='del'>-	if (probe_ent-&gt;host_flags &amp; SIL_FLAG_RERR_ON_DMA_ACT) {</div><div class='del'>-		int cnt;</div><div class='del'>-</div><div class='del'>-		for (i = 0, cnt = 0; i &lt; probe_ent-&gt;n_ports; i++) {</div><div class='del'>-			tmp = readl(mmio_base + sil_port[i].sfis_cfg);</div><div class='del'>-			if ((tmp &amp; 0x3) != 0x01)</div><div class='del'>-				continue;</div><div class='del'>-			if (!cnt)</div><div class='del'>-				dev_printk(KERN_INFO, &amp;pdev-&gt;dev,</div><div class='del'>-					   "Applying R_ERR on DMA activate "</div><div class='del'>-					   "FIS errata fix\n");</div><div class='del'>-			writel(tmp &amp; ~0x3, mmio_base + sil_port[i].sfis_cfg);</div><div class='del'>-			cnt++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ent-&gt;driver_data == sil_3114) {</div><div class='del'>-		irq_mask = SIL_MASK_4PORT;</div><div class='del'>-</div><div class='del'>-		/* flip the magic "make 4 ports work" bit */</div><div class='del'>-		tmp = readl(mmio_base + sil_port[2].bmdma);</div><div class='del'>-		if ((tmp &amp; SIL_INTR_STEERING) == 0)</div><div class='del'>-			writel(tmp | SIL_INTR_STEERING,</div><div class='del'>-			       mmio_base + sil_port[2].bmdma);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		irq_mask = SIL_MASK_2PORT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure IDE0/1/2/3 interrupts are not masked */</div><div class='del'>-	tmp = readl(mmio_base + SIL_SYSCFG);</div><div class='del'>-	if (tmp &amp; irq_mask) {</div><div class='del'>-		tmp &amp;= ~irq_mask;</div><div class='del'>-		writel(tmp, mmio_base + SIL_SYSCFG);</div><div class='del'>-		readl(mmio_base + SIL_SYSCFG);	/* flush */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* mask all SATA phy-related interrupts */</div><div class='del'>-	/* TODO: unmask bit 6 (SError N bit) for hotplug */</div><div class='del'>-	for (i = 0; i &lt; probe_ent-&gt;n_ports; i++)</div><div class='del'>-		writel(0, mmio_base + sil_port[i].sien);</div><div class='add'>+	sil_init_controller(pdev, probe_ent-&gt;n_ports, probe_ent-&gt;host_flags,</div><div class='add'>+			    mmio_base);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -521,6 +700,18 @@ err_out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sil_pci_device_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ata_pci_device_do_resume(pdev);</div><div class='add'>+	sil_init_controller(pdev, host_set-&gt;n_ports, host_set-&gt;ports[0]-&gt;flags,</div><div class='add'>+			    host_set-&gt;mmio_base);</div><div class='add'>+	ata_host_set_resume(host_set);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init sil_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return pci_module_init(&amp;sil_pci_driver);</div><div class='head'>diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c<br/>index f7264fd611c2..2e0f4a4076af 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sil24.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sil24.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sil24.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_sil24.c</a></div><div class='hunk'>@@ -31,15 +31,15 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_sil24"</div><div class='del'>-#define DRV_VERSION	"0.23"</div><div class='add'>+#define DRV_VERSION	"0.3"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Port request block (PRB) 32 bytes</div><div class='ctx'>  */</div><div class='ctx'> struct sil24_prb {</div><div class='del'>-	u16	ctrl;</div><div class='del'>-	u16	prot;</div><div class='del'>-	u32	rx_cnt;</div><div class='add'>+	__le16	ctrl;</div><div class='add'>+	__le16	prot;</div><div class='add'>+	__le32	rx_cnt;</div><div class='ctx'> 	u8	fis[6 * 4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -47,17 +47,17 @@ struct sil24_prb {</div><div class='ctx'>  * Scatter gather entry (SGE) 16 bytes</div><div class='ctx'>  */</div><div class='ctx'> struct sil24_sge {</div><div class='del'>-	u64	addr;</div><div class='del'>-	u32	cnt;</div><div class='del'>-	u32	flags;</div><div class='add'>+	__le64	addr;</div><div class='add'>+	__le32	cnt;</div><div class='add'>+	__le32	flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Port multiplier</div><div class='ctx'>  */</div><div class='ctx'> struct sil24_port_multiplier {</div><div class='del'>-	u32	diag;</div><div class='del'>-	u32	sactive;</div><div class='add'>+	__le32	diag;</div><div class='add'>+	__le32	sactive;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -86,12 +86,22 @@ enum {</div><div class='ctx'> 	/* HOST_SLOT_STAT bits */</div><div class='ctx'> 	HOST_SSTAT_ATTN		= (1 &lt;&lt; 31),</div><div class='ctx'> </div><div class='add'>+	/* HOST_CTRL bits */</div><div class='add'>+	HOST_CTRL_M66EN		= (1 &lt;&lt; 16), /* M66EN PCI bus signal */</div><div class='add'>+	HOST_CTRL_TRDY		= (1 &lt;&lt; 17), /* latched PCI TRDY */</div><div class='add'>+	HOST_CTRL_STOP		= (1 &lt;&lt; 18), /* latched PCI STOP */</div><div class='add'>+	HOST_CTRL_DEVSEL	= (1 &lt;&lt; 19), /* latched PCI DEVSEL */</div><div class='add'>+	HOST_CTRL_REQ64		= (1 &lt;&lt; 20), /* latched PCI REQ64 */</div><div class='add'>+	HOST_CTRL_GLOBAL_RST	= (1 &lt;&lt; 31), /* global reset */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Port registers</div><div class='ctx'> 	 * (8192 bytes @ +0x0000, +0x2000, +0x4000 and +0x6000 @ BAR2)</div><div class='ctx'> 	 */</div><div class='ctx'> 	PORT_REGS_SIZE		= 0x2000,</div><div class='del'>-	PORT_PRB		= 0x0000, /* (32 bytes PRB + 16 bytes SGEs * 6) * 31 (3968 bytes) */</div><div class='add'>+</div><div class='add'>+	PORT_LRAM		= 0x0000, /* 31 LRAM slots and PM regs */</div><div class='add'>+	PORT_LRAM_SLOT_SZ	= 0x0080, /* 32 bytes PRB + 2 SGE, ACT... */</div><div class='ctx'> </div><div class='ctx'> 	PORT_PM			= 0x0f80, /* 8 bytes PM * 16 (128 bytes) */</div><div class='ctx'> 		/* 32 bit regs */</div><div class='hunk'>@@ -142,8 +152,16 @@ enum {</div><div class='ctx'> 	PORT_IRQ_PWR_CHG	= (1 &lt;&lt; 3), /* power management change */</div><div class='ctx'> 	PORT_IRQ_PHYRDY_CHG	= (1 &lt;&lt; 4), /* PHY ready change */</div><div class='ctx'> 	PORT_IRQ_COMWAKE	= (1 &lt;&lt; 5), /* COMWAKE received */</div><div class='del'>-	PORT_IRQ_UNK_FIS	= (1 &lt;&lt; 6), /* Unknown FIS received */</div><div class='del'>-	PORT_IRQ_SDB_FIS	= (1 &lt;&lt; 11), /* SDB FIS received */</div><div class='add'>+	PORT_IRQ_UNK_FIS	= (1 &lt;&lt; 6), /* unknown FIS received */</div><div class='add'>+	PORT_IRQ_DEV_XCHG	= (1 &lt;&lt; 7), /* device exchanged */</div><div class='add'>+	PORT_IRQ_8B10B		= (1 &lt;&lt; 8), /* 8b/10b decode error threshold */</div><div class='add'>+	PORT_IRQ_CRC		= (1 &lt;&lt; 9), /* CRC error threshold */</div><div class='add'>+	PORT_IRQ_HANDSHAKE	= (1 &lt;&lt; 10), /* handshake error threshold */</div><div class='add'>+	PORT_IRQ_SDB_NOTIFY	= (1 &lt;&lt; 11), /* SDB notify received */</div><div class='add'>+</div><div class='add'>+	DEF_PORT_IRQ		= PORT_IRQ_COMPLETE | PORT_IRQ_ERROR |</div><div class='add'>+				  PORT_IRQ_PHYRDY_CHG | PORT_IRQ_DEV_XCHG |</div><div class='add'>+				  PORT_IRQ_UNK_FIS,</div><div class='ctx'> </div><div class='ctx'> 	/* bits[27:16] are unmasked (raw) */</div><div class='ctx'> 	PORT_IRQ_RAW_SHIFT	= 16,</div><div class='hunk'>@@ -174,7 +192,7 @@ enum {</div><div class='ctx'> 	PORT_CERR_CMD_PCIPERR	= 27, /* ctrl[15:13] 110 - PCI parity err while fetching PRB */</div><div class='ctx'> 	PORT_CERR_XFR_UNDEF	= 32, /* PSD ecode 00 - undefined */</div><div class='ctx'> 	PORT_CERR_XFR_TGTABRT	= 33, /* PSD ecode 01 - target abort */</div><div class='del'>-	PORT_CERR_XFR_MSGABRT	= 34, /* PSD ecode 10 - master abort */</div><div class='add'>+	PORT_CERR_XFR_MSTABRT	= 34, /* PSD ecode 10 - master abort */</div><div class='ctx'> 	PORT_CERR_XFR_PCIPERR	= 35, /* PSD ecode 11 - PCI prity err during transfer */</div><div class='ctx'> 	PORT_CERR_SENDSERVICE	= 36, /* FIS received while sending service */</div><div class='ctx'> </div><div class='hunk'>@@ -202,11 +220,19 @@ enum {</div><div class='ctx'> 	SGE_DRD			= (1 &lt;&lt; 29), /* discard data read (/dev/null)</div><div class='ctx'> 						data address ignored */</div><div class='ctx'> </div><div class='add'>+	SIL24_MAX_CMDS		= 31,</div><div class='add'>+</div><div class='ctx'> 	/* board id */</div><div class='ctx'> 	BID_SIL3124		= 0,</div><div class='ctx'> 	BID_SIL3132		= 1,</div><div class='ctx'> 	BID_SIL3131		= 2,</div><div class='ctx'> </div><div class='add'>+	/* host flags */</div><div class='add'>+	SIL24_COMMON_FLAGS	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='add'>+				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |</div><div class='add'>+				  ATA_FLAG_NCQ | ATA_FLAG_SKIP_D2H_BSY,</div><div class='add'>+	SIL24_FLAG_PCIX_IRQ_WOC	= (1 &lt;&lt; 24), /* IRQ loss errata on PCI-X */</div><div class='add'>+</div><div class='ctx'> 	IRQ_STAT_4PORTS		= 0xf,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -226,6 +252,58 @@ union sil24_cmd_block {</div><div class='ctx'> 	struct sil24_atapi_block atapi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct sil24_cerr_info {</div><div class='add'>+	unsigned int err_mask, action;</div><div class='add'>+	const char *desc;</div><div class='add'>+} sil24_cerr_db[] = {</div><div class='add'>+	[0]			= { AC_ERR_DEV, ATA_EH_REVALIDATE,</div><div class='add'>+				    "device error" },</div><div class='add'>+	[PORT_CERR_DEV]		= { AC_ERR_DEV, ATA_EH_REVALIDATE,</div><div class='add'>+				    "device error via D2H FIS" },</div><div class='add'>+	[PORT_CERR_SDB]		= { AC_ERR_DEV, ATA_EH_REVALIDATE,</div><div class='add'>+				    "device error via SDB FIS" },</div><div class='add'>+	[PORT_CERR_DATA]	= { AC_ERR_ATA_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "error in data FIS" },</div><div class='add'>+	[PORT_CERR_SEND]	= { AC_ERR_ATA_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "failed to transmit command FIS" },</div><div class='add'>+	[PORT_CERR_INCONSISTENT] = { AC_ERR_HSM, ATA_EH_SOFTRESET,</div><div class='add'>+				     "protocol mismatch" },</div><div class='add'>+	[PORT_CERR_DIRECTION]	= { AC_ERR_HSM, ATA_EH_SOFTRESET,</div><div class='add'>+				    "data directon mismatch" },</div><div class='add'>+	[PORT_CERR_UNDERRUN]	= { AC_ERR_HSM, ATA_EH_SOFTRESET,</div><div class='add'>+				    "ran out of SGEs while writing" },</div><div class='add'>+	[PORT_CERR_OVERRUN]	= { AC_ERR_HSM, ATA_EH_SOFTRESET,</div><div class='add'>+				    "ran out of SGEs while reading" },</div><div class='add'>+	[PORT_CERR_PKT_PROT]	= { AC_ERR_HSM, ATA_EH_SOFTRESET,</div><div class='add'>+				    "invalid data directon for ATAPI CDB" },</div><div class='add'>+	[PORT_CERR_SGT_BOUNDARY] = { AC_ERR_SYSTEM, ATA_EH_SOFTRESET,</div><div class='add'>+				     "SGT no on qword boundary" },</div><div class='add'>+	[PORT_CERR_SGT_TGTABRT]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI target abort while fetching SGT" },</div><div class='add'>+	[PORT_CERR_SGT_MSTABRT]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI master abort while fetching SGT" },</div><div class='add'>+	[PORT_CERR_SGT_PCIPERR]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI parity error while fetching SGT" },</div><div class='add'>+	[PORT_CERR_CMD_BOUNDARY] = { AC_ERR_SYSTEM, ATA_EH_SOFTRESET,</div><div class='add'>+				     "PRB not on qword boundary" },</div><div class='add'>+	[PORT_CERR_CMD_TGTABRT]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI target abort while fetching PRB" },</div><div class='add'>+	[PORT_CERR_CMD_MSTABRT]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI master abort while fetching PRB" },</div><div class='add'>+	[PORT_CERR_CMD_PCIPERR]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI parity error while fetching PRB" },</div><div class='add'>+	[PORT_CERR_XFR_UNDEF]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "undefined error while transferring data" },</div><div class='add'>+	[PORT_CERR_XFR_TGTABRT]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI target abort while transferring data" },</div><div class='add'>+	[PORT_CERR_XFR_MSTABRT]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI master abort while transferring data" },</div><div class='add'>+	[PORT_CERR_XFR_PCIPERR]	= { AC_ERR_HOST_BUS, ATA_EH_SOFTRESET,</div><div class='add'>+				    "PCI parity error while transferring data" },</div><div class='add'>+	[PORT_CERR_SENDSERVICE]	= { AC_ERR_HSM, ATA_EH_SOFTRESET,</div><div class='add'>+				    "FIS received while sending service FIS" },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ap-&gt;private_data</div><div class='ctx'>  *</div><div class='hunk'>@@ -249,16 +327,19 @@ static u8 sil24_check_status(struct ata_port *ap);</div><div class='ctx'> static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg);</div><div class='ctx'> static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);</div><div class='ctx'> static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf);</div><div class='del'>-static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes);</div><div class='ctx'> static void sil24_qc_prep(struct ata_queued_cmd *qc);</div><div class='ctx'> static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc);</div><div class='ctx'> static void sil24_irq_clear(struct ata_port *ap);</div><div class='del'>-static void sil24_eng_timeout(struct ata_port *ap);</div><div class='ctx'> static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs);</div><div class='add'>+static void sil24_freeze(struct ata_port *ap);</div><div class='add'>+static void sil24_thaw(struct ata_port *ap);</div><div class='add'>+static void sil24_error_handler(struct ata_port *ap);</div><div class='add'>+static void sil24_post_internal_cmd(struct ata_queued_cmd *qc);</div><div class='ctx'> static int sil24_port_start(struct ata_port *ap);</div><div class='ctx'> static void sil24_port_stop(struct ata_port *ap);</div><div class='ctx'> static void sil24_host_stop(struct ata_host_set *host_set);</div><div class='ctx'> static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);</div><div class='add'>+static int sil24_pci_device_resume(struct pci_dev *pdev);</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id sil24_pci_tbl[] = {</div><div class='ctx'> 	{ 0x1095, 0x3124, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BID_SIL3124 },</div><div class='hunk'>@@ -274,6 +355,8 @@ static struct pci_driver sil24_pci_driver = {</div><div class='ctx'> 	.id_table		= sil24_pci_tbl,</div><div class='ctx'> 	.probe			= sil24_init_one,</div><div class='ctx'> 	.remove			= ata_pci_remove_one, /* safe? */</div><div class='add'>+	.suspend		= ata_pci_device_suspend,</div><div class='add'>+	.resume			= sil24_pci_device_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct scsi_host_template sil24_sht = {</div><div class='hunk'>@@ -281,7 +364,8 @@ static struct scsi_host_template sil24_sht = {</div><div class='ctx'> 	.name			= DRV_NAME,</div><div class='ctx'> 	.ioctl			= ata_scsi_ioctl,</div><div class='ctx'> 	.queuecommand		= ata_scsi_queuecmd,</div><div class='del'>-	.can_queue		= ATA_DEF_QUEUE,</div><div class='add'>+	.change_queue_depth	= ata_scsi_change_queue_depth,</div><div class='add'>+	.can_queue		= SIL24_MAX_CMDS,</div><div class='ctx'> 	.this_id		= ATA_SHT_THIS_ID,</div><div class='ctx'> 	.sg_tablesize		= LIBATA_MAX_PRD,</div><div class='ctx'> 	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,</div><div class='hunk'>@@ -290,7 +374,10 @@ static struct scsi_host_template sil24_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='add'>+	.suspend		= ata_scsi_device_suspend,</div><div class='add'>+	.resume			= ata_scsi_device_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ata_port_operations sil24_ops = {</div><div class='hunk'>@@ -304,19 +391,20 @@ static const struct ata_port_operations sil24_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.tf_read		= sil24_tf_read,</div><div class='ctx'> </div><div class='del'>-	.probe_reset		= sil24_probe_reset,</div><div class='del'>-</div><div class='ctx'> 	.qc_prep		= sil24_qc_prep,</div><div class='ctx'> 	.qc_issue		= sil24_qc_issue,</div><div class='ctx'> </div><div class='del'>-	.eng_timeout		= sil24_eng_timeout,</div><div class='del'>-</div><div class='ctx'> 	.irq_handler		= sil24_interrupt,</div><div class='ctx'> 	.irq_clear		= sil24_irq_clear,</div><div class='ctx'> </div><div class='ctx'> 	.scr_read		= sil24_scr_read,</div><div class='ctx'> 	.scr_write		= sil24_scr_write,</div><div class='ctx'> </div><div class='add'>+	.freeze			= sil24_freeze,</div><div class='add'>+	.thaw			= sil24_thaw,</div><div class='add'>+	.error_handler		= sil24_error_handler,</div><div class='add'>+	.post_internal_cmd	= sil24_post_internal_cmd,</div><div class='add'>+</div><div class='ctx'> 	.port_start		= sil24_port_start,</div><div class='ctx'> 	.port_stop		= sil24_port_stop,</div><div class='ctx'> 	.host_stop		= sil24_host_stop,</div><div class='hunk'>@@ -333,9 +421,8 @@ static struct ata_port_info sil24_port_info[] = {</div><div class='ctx'> 	/* sil_3124 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.sht		= &amp;sil24_sht,</div><div class='del'>-		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='del'>-				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |</div><div class='del'>-				  SIL24_NPORTS2FLAG(4),</div><div class='add'>+		.host_flags	= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(4) |</div><div class='add'>+				  SIL24_FLAG_PCIX_IRQ_WOC,</div><div class='ctx'> 		.pio_mask	= 0x1f,			/* pio0-4 */</div><div class='ctx'> 		.mwdma_mask	= 0x07,			/* mwdma0-2 */</div><div class='ctx'> 		.udma_mask	= 0x3f,			/* udma0-5 */</div><div class='hunk'>@@ -344,9 +431,7 @@ static struct ata_port_info sil24_port_info[] = {</div><div class='ctx'> 	/* sil_3132 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.sht		= &amp;sil24_sht,</div><div class='del'>-		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='del'>-				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |</div><div class='del'>-				  SIL24_NPORTS2FLAG(2),</div><div class='add'>+		.host_flags	= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2),</div><div class='ctx'> 		.pio_mask	= 0x1f,			/* pio0-4 */</div><div class='ctx'> 		.mwdma_mask	= 0x07,			/* mwdma0-2 */</div><div class='ctx'> 		.udma_mask	= 0x3f,			/* udma0-5 */</div><div class='hunk'>@@ -355,9 +440,7 @@ static struct ata_port_info sil24_port_info[] = {</div><div class='ctx'> 	/* sil_3131/sil_3531 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.sht		= &amp;sil24_sht,</div><div class='del'>-		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='del'>-				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |</div><div class='del'>-				  SIL24_NPORTS2FLAG(1),</div><div class='add'>+		.host_flags	= SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1),</div><div class='ctx'> 		.pio_mask	= 0x1f,			/* pio0-4 */</div><div class='ctx'> 		.mwdma_mask	= 0x07,			/* mwdma0-2 */</div><div class='ctx'> 		.udma_mask	= 0x3f,			/* udma0-5 */</div><div class='hunk'>@@ -365,6 +448,13 @@ static struct ata_port_info sil24_port_info[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int sil24_tag(int tag)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(ata_tag_internal(tag)))</div><div class='add'>+		return 0;</div><div class='add'>+	return tag;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='hunk'>@@ -426,56 +516,65 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf)</div><div class='ctx'> 	*tf = pp-&gt;tf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sil24_softreset(struct ata_port *ap, int verbose,</div><div class='del'>-			   unsigned int *class)</div><div class='add'>+static int sil24_init_port(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	writel(PORT_CS_INIT, port + PORT_CTRL_STAT);</div><div class='add'>+	ata_wait_register(port + PORT_CTRL_STAT,</div><div class='add'>+			  PORT_CS_INIT, PORT_CS_INIT, 10, 100);</div><div class='add'>+	tmp = ata_wait_register(port + PORT_CTRL_STAT,</div><div class='add'>+				PORT_CS_RDY, 0, 10, 100);</div><div class='add'>+</div><div class='add'>+	if ((tmp &amp; (PORT_CS_INIT | PORT_CS_RDY)) != PORT_CS_RDY)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sil24_softreset(struct ata_port *ap, unsigned int *class)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='ctx'> 	struct sil24_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 	struct sil24_prb *prb = &amp;pp-&gt;cmd_block[0].ata.prb;</div><div class='ctx'> 	dma_addr_t paddr = pp-&gt;cmd_block_dma;</div><div class='del'>-	unsigned long timeout = jiffies + ATA_TMOUT_BOOT * HZ;</div><div class='del'>-	u32 irq_enable, irq_stat;</div><div class='add'>+	u32 mask, irq_stat;</div><div class='add'>+	const char *reason;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("ENTER\n");</div><div class='ctx'> </div><div class='del'>-	if (!sata_dev_present(ap)) {</div><div class='add'>+	if (ata_port_offline(ap)) {</div><div class='ctx'> 		DPRINTK("PHY reports no device\n");</div><div class='ctx'> 		*class = ATA_DEV_NONE;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* temporarily turn off IRQs during SRST */</div><div class='del'>-	irq_enable = readl(port + PORT_IRQ_ENABLE_SET);</div><div class='del'>-	writel(irq_enable, port + PORT_IRQ_ENABLE_CLR);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * XXX: Not sure whether the following sleep is needed or not.</div><div class='del'>-	 * The original driver had it.  So....</div><div class='del'>-	 */</div><div class='del'>-	msleep(10);</div><div class='add'>+	/* put the port into known state */</div><div class='add'>+	if (sil24_init_port(ap)) {</div><div class='add'>+		reason ="port not ready";</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	prb-&gt;ctrl = PRB_CTRL_SRST;</div><div class='add'>+	/* do SRST */</div><div class='add'>+	prb-&gt;ctrl = cpu_to_le16(PRB_CTRL_SRST);</div><div class='ctx'> 	prb-&gt;fis[1] = 0; /* no PM yet */</div><div class='ctx'> </div><div class='ctx'> 	writel((u32)paddr, port + PORT_CMD_ACTIVATE);</div><div class='add'>+	writel((u64)paddr &gt;&gt; 32, port + PORT_CMD_ACTIVATE + 4);</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		irq_stat = readl(port + PORT_IRQ_STAT);</div><div class='del'>-		writel(irq_stat, port + PORT_IRQ_STAT);		/* clear irq */</div><div class='del'>-</div><div class='del'>-		irq_stat &gt;&gt;= PORT_IRQ_RAW_SHIFT;</div><div class='del'>-		if (irq_stat &amp; (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		msleep(100);</div><div class='del'>-	} while (time_before(jiffies, timeout));</div><div class='add'>+	mask = (PORT_IRQ_COMPLETE | PORT_IRQ_ERROR) &lt;&lt; PORT_IRQ_RAW_SHIFT;</div><div class='add'>+	irq_stat = ata_wait_register(port + PORT_IRQ_STAT, mask, 0x0,</div><div class='add'>+				     100, ATA_TMOUT_BOOT / HZ * 1000);</div><div class='ctx'> </div><div class='del'>-	/* restore IRQs */</div><div class='del'>-	writel(irq_enable, port + PORT_IRQ_ENABLE_SET);</div><div class='add'>+	writel(irq_stat, port + PORT_IRQ_STAT); /* clear IRQs */</div><div class='add'>+	irq_stat &gt;&gt;= PORT_IRQ_RAW_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (!(irq_stat &amp; PORT_IRQ_COMPLETE)) {</div><div class='del'>-		DPRINTK("EXIT, srst failed\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+		if (irq_stat &amp; PORT_IRQ_ERROR)</div><div class='add'>+			reason = "SRST command error";</div><div class='add'>+		else</div><div class='add'>+			reason = "timeout";</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sil24_update_tf(ap);</div><div class='hunk'>@@ -487,22 +586,57 @@ static int sil24_softreset(struct ata_port *ap, int verbose,</div><div class='ctx'>  out:</div><div class='ctx'> 	DPRINTK("EXIT, class=%u\n", *class);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ err:</div><div class='add'>+	ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sil24_hardreset(struct ata_port *ap, int verbose,</div><div class='del'>-			   unsigned int *class)</div><div class='add'>+static int sil24_hardreset(struct ata_port *ap, unsigned int *class)</div><div class='ctx'> {</div><div class='del'>-	unsigned int dummy_class;</div><div class='add'>+	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='add'>+	const char *reason;</div><div class='add'>+	int tout_msec, rc;</div><div class='add'>+	u32 tmp;</div><div class='ctx'> </div><div class='del'>-	/* sil24 doesn't report device signature after hard reset */</div><div class='del'>-	return sata_std_hardreset(ap, verbose, &amp;dummy_class);</div><div class='del'>-}</div><div class='add'>+	/* sil24 does the right thing(tm) without any protection */</div><div class='add'>+	sata_set_spd(ap);</div><div class='ctx'> </div><div class='del'>-static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes)</div><div class='del'>-{</div><div class='del'>-	return ata_drive_probe_reset(ap, ata_std_probeinit,</div><div class='del'>-				     sil24_softreset, sil24_hardreset,</div><div class='del'>-				     ata_std_postreset, classes);</div><div class='add'>+	tout_msec = 100;</div><div class='add'>+	if (ata_port_online(ap))</div><div class='add'>+		tout_msec = 5000;</div><div class='add'>+</div><div class='add'>+	writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT);</div><div class='add'>+	tmp = ata_wait_register(port + PORT_CTRL_STAT,</div><div class='add'>+				PORT_CS_DEV_RST, PORT_CS_DEV_RST, 10, tout_msec);</div><div class='add'>+</div><div class='add'>+	/* SStatus oscillates between zero and valid status after</div><div class='add'>+	 * DEV_RST, debounce it.</div><div class='add'>+	 */</div><div class='add'>+	rc = sata_phy_debounce(ap, sata_deb_timing_long);</div><div class='add'>+	if (rc) {</div><div class='add'>+		reason = "PHY debouncing failed";</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tmp &amp; PORT_CS_DEV_RST) {</div><div class='add'>+		if (ata_port_offline(ap))</div><div class='add'>+			return 0;</div><div class='add'>+		reason = "link not ready";</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sil24 doesn't store signature FIS after hardreset, so we</div><div class='add'>+	 * can't wait for BSY to clear.  Some devices take a long time</div><div class='add'>+	 * to get ready and those devices will choke if we don't wait</div><div class='add'>+	 * for BSY clearance here.  Tell libata to perform follow-up</div><div class='add'>+	 * softreset.</div><div class='add'>+	 */</div><div class='add'>+	return -EAGAIN;</div><div class='add'>+</div><div class='add'>+ err:</div><div class='add'>+	ata_port_printk(ap, KERN_ERR, "hardreset failed (%s)\n", reason);</div><div class='add'>+	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void sil24_fill_sg(struct ata_queued_cmd *qc,</div><div class='hunk'>@@ -528,17 +662,20 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='ctx'> 	struct sil24_port_priv *pp = ap-&gt;private_data;</div><div class='del'>-	union sil24_cmd_block *cb = pp-&gt;cmd_block + qc-&gt;tag;</div><div class='add'>+	union sil24_cmd_block *cb;</div><div class='ctx'> 	struct sil24_prb *prb;</div><div class='ctx'> 	struct sil24_sge *sge;</div><div class='add'>+	u16 ctrl = 0;</div><div class='add'>+</div><div class='add'>+	cb = &amp;pp-&gt;cmd_block[sil24_tag(qc-&gt;tag)];</div><div class='ctx'> </div><div class='ctx'> 	switch (qc-&gt;tf.protocol) {</div><div class='ctx'> 	case ATA_PROT_PIO:</div><div class='ctx'> 	case ATA_PROT_DMA:</div><div class='add'>+	case ATA_PROT_NCQ:</div><div class='ctx'> 	case ATA_PROT_NODATA:</div><div class='ctx'> 		prb = &amp;cb-&gt;ata.prb;</div><div class='ctx'> 		sge = cb-&gt;ata.sge;</div><div class='del'>-		prb-&gt;ctrl = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ATA_PROT_ATAPI:</div><div class='hunk'>@@ -551,12 +688,10 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> </div><div class='ctx'> 		if (qc-&gt;tf.protocol != ATA_PROT_ATAPI_NODATA) {</div><div class='ctx'> 			if (qc-&gt;tf.flags &amp; ATA_TFLAG_WRITE)</div><div class='del'>-				prb-&gt;ctrl = PRB_CTRL_PACKET_WRITE;</div><div class='add'>+				ctrl = PRB_CTRL_PACKET_WRITE;</div><div class='ctx'> 			else</div><div class='del'>-				prb-&gt;ctrl = PRB_CTRL_PACKET_READ;</div><div class='del'>-		} else</div><div class='del'>-			prb-&gt;ctrl = 0;</div><div class='del'>-</div><div class='add'>+				ctrl = PRB_CTRL_PACKET_READ;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -565,6 +700,7 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	prb-&gt;ctrl = cpu_to_le16(ctrl);</div><div class='ctx'> 	ata_tf_to_fis(&amp;qc-&gt;tf, prb-&gt;fis, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (qc-&gt;flags &amp; ATA_QCFLAG_DMAMAP)</div><div class='hunk'>@@ -574,11 +710,18 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)</div><div class='ctx'> static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ata_port *ap = qc-&gt;ap;</div><div class='del'>-	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='ctx'> 	struct sil24_port_priv *pp = ap-&gt;private_data;</div><div class='del'>-	dma_addr_t paddr = pp-&gt;cmd_block_dma + qc-&gt;tag * sizeof(*pp-&gt;cmd_block);</div><div class='add'>+	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='add'>+	unsigned int tag = sil24_tag(qc-&gt;tag);</div><div class='add'>+	dma_addr_t paddr;</div><div class='add'>+	void __iomem *activate;</div><div class='add'>+</div><div class='add'>+	paddr = pp-&gt;cmd_block_dma + tag * sizeof(*pp-&gt;cmd_block);</div><div class='add'>+	activate = port + PORT_CMD_ACTIVATE + tag * 8;</div><div class='add'>+</div><div class='add'>+	writel((u32)paddr, activate);</div><div class='add'>+	writel((u64)paddr &gt;&gt; 32, activate + 4);</div><div class='ctx'> </div><div class='del'>-	writel((u32)paddr, port + PORT_CMD_ACTIVATE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -587,162 +730,139 @@ static void sil24_irq_clear(struct ata_port *ap)</div><div class='ctx'> 	/* unused */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __sil24_restart_controller(void __iomem *port)</div><div class='add'>+static void sil24_freeze(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	u32 tmp;</div><div class='del'>-	int cnt;</div><div class='del'>-</div><div class='del'>-	writel(PORT_CS_INIT, port + PORT_CTRL_STAT);</div><div class='del'>-</div><div class='del'>-	/* Max ~10ms */</div><div class='del'>-	for (cnt = 0; cnt &lt; 10000; cnt++) {</div><div class='del'>-		tmp = readl(port + PORT_CTRL_STAT);</div><div class='del'>-		if (tmp &amp; PORT_CS_RDY)</div><div class='del'>-			return 0;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='add'>+	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='ctx'> </div><div class='del'>-	return -1;</div><div class='add'>+	/* Port-wide IRQ mask in HOST_CTRL doesn't really work, clear</div><div class='add'>+	 * PORT_IRQ_ENABLE instead.</div><div class='add'>+	 */</div><div class='add'>+	writel(0xffff, port + PORT_IRQ_ENABLE_CLR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sil24_restart_controller(struct ata_port *ap)</div><div class='add'>+static void sil24_thaw(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	if (__sil24_restart_controller((void __iomem *)ap-&gt;ioaddr.cmd_addr))</div><div class='del'>-		printk(KERN_ERR DRV_NAME</div><div class='del'>-		       " ata%u: failed to restart controller\n", ap-&gt;id);</div><div class='add'>+	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* clear IRQ */</div><div class='add'>+	tmp = readl(port + PORT_IRQ_STAT);</div><div class='add'>+	writel(tmp, port + PORT_IRQ_STAT);</div><div class='add'>+</div><div class='add'>+	/* turn IRQ back on */</div><div class='add'>+	writel(DEF_PORT_IRQ, port + PORT_IRQ_ENABLE_SET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __sil24_reset_controller(void __iomem *port)</div><div class='add'>+static void sil24_error_intr(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	int cnt;</div><div class='del'>-	u32 tmp;</div><div class='add'>+	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='add'>+	struct ata_eh_info *ehi = &amp;ap-&gt;eh_info;</div><div class='add'>+	int freeze = 0;</div><div class='add'>+	u32 irq_stat;</div><div class='ctx'> </div><div class='del'>-	/* Reset controller state.  Is this correct? */</div><div class='del'>-	writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT);</div><div class='del'>-	readl(port + PORT_CTRL_STAT);	/* sync */</div><div class='add'>+	/* on error, we need to clear IRQ explicitly */</div><div class='add'>+	irq_stat = readl(port + PORT_IRQ_STAT);</div><div class='add'>+	writel(irq_stat, port + PORT_IRQ_STAT);</div><div class='ctx'> </div><div class='del'>-	/* Max ~100ms */</div><div class='del'>-	for (cnt = 0; cnt &lt; 1000; cnt++) {</div><div class='del'>-		udelay(100);</div><div class='del'>-		tmp = readl(port + PORT_CTRL_STAT);</div><div class='del'>-		if (!(tmp &amp; PORT_CS_DEV_RST))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	/* first, analyze and record host port events */</div><div class='add'>+	ata_ehi_clear_desc(ehi);</div><div class='ctx'> </div><div class='del'>-	if (tmp &amp; PORT_CS_DEV_RST)</div><div class='del'>-		return -1;</div><div class='add'>+	ata_ehi_push_desc(ehi, "irq_stat 0x%08x", irq_stat);</div><div class='ctx'> </div><div class='del'>-	if (tmp &amp; PORT_CS_RDY)</div><div class='del'>-		return 0;</div><div class='add'>+	if (irq_stat &amp; (PORT_IRQ_PHYRDY_CHG | PORT_IRQ_DEV_XCHG)) {</div><div class='add'>+		ata_ehi_hotplugged(ehi);</div><div class='add'>+		ata_ehi_push_desc(ehi, ", %s",</div><div class='add'>+			       irq_stat &amp; PORT_IRQ_PHYRDY_CHG ?</div><div class='add'>+			       "PHY RDY changed" : "device exchanged");</div><div class='add'>+		freeze = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return __sil24_restart_controller(port);</div><div class='del'>-}</div><div class='add'>+	if (irq_stat &amp; PORT_IRQ_UNK_FIS) {</div><div class='add'>+		ehi-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+		ehi-&gt;action |= ATA_EH_SOFTRESET;</div><div class='add'>+		ata_ehi_push_desc(ehi , ", unknown FIS");</div><div class='add'>+		freeze = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void sil24_reset_controller(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_NOTICE DRV_NAME</div><div class='del'>-	       " ata%u: resetting controller...\n", ap-&gt;id);</div><div class='del'>-	if (__sil24_reset_controller((void __iomem *)ap-&gt;ioaddr.cmd_addr))</div><div class='del'>-                printk(KERN_ERR DRV_NAME</div><div class='del'>-                       " ata%u: failed to reset controller\n", ap-&gt;id);</div><div class='del'>-}</div><div class='add'>+	/* deal with command error */</div><div class='add'>+	if (irq_stat &amp; PORT_IRQ_ERROR) {</div><div class='add'>+		struct sil24_cerr_info *ci = NULL;</div><div class='add'>+		unsigned int err_mask = 0, action = 0;</div><div class='add'>+		struct ata_queued_cmd *qc;</div><div class='add'>+		u32 cerr;</div><div class='add'>+</div><div class='add'>+		/* analyze CMD_ERR */</div><div class='add'>+		cerr = readl(port + PORT_CMD_ERR);</div><div class='add'>+		if (cerr &lt; ARRAY_SIZE(sil24_cerr_db))</div><div class='add'>+			ci = &amp;sil24_cerr_db[cerr];</div><div class='add'>+</div><div class='add'>+		if (ci &amp;&amp; ci-&gt;desc) {</div><div class='add'>+			err_mask |= ci-&gt;err_mask;</div><div class='add'>+			action |= ci-&gt;action;</div><div class='add'>+			ata_ehi_push_desc(ehi, ", %s", ci-&gt;desc);</div><div class='add'>+		} else {</div><div class='add'>+			err_mask |= AC_ERR_OTHER;</div><div class='add'>+			action |= ATA_EH_SOFTRESET;</div><div class='add'>+			ata_ehi_push_desc(ehi, ", unknown command error %d",</div><div class='add'>+					  cerr);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-static void sil24_eng_timeout(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	struct ata_queued_cmd *qc;</div><div class='add'>+		/* record error info */</div><div class='add'>+		qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+		if (qc) {</div><div class='add'>+			sil24_update_tf(ap);</div><div class='add'>+			qc-&gt;err_mask |= err_mask;</div><div class='add'>+		} else</div><div class='add'>+			ehi-&gt;err_mask |= err_mask;</div><div class='ctx'> </div><div class='del'>-	qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='add'>+		ehi-&gt;action |= action;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_ERR "ata%u: command timeout\n", ap-&gt;id);</div><div class='del'>-	qc-&gt;err_mask |= AC_ERR_TIMEOUT;</div><div class='del'>-	ata_eh_qc_complete(qc);</div><div class='add'>+	/* freeze or abort */</div><div class='add'>+	if (freeze)</div><div class='add'>+		ata_port_freeze(ap);</div><div class='add'>+	else</div><div class='add'>+		ata_port_abort(ap);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	sil24_reset_controller(ap);</div><div class='add'>+static void sil24_finish_qc(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	if (qc-&gt;flags &amp; ATA_QCFLAG_RESULT_TF)</div><div class='add'>+		sil24_update_tf(qc-&gt;ap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)</div><div class='add'>+static inline void sil24_host_intr(struct ata_port *ap)</div><div class='ctx'> {</div><div class='del'>-	struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	struct sil24_port_priv *pp = ap-&gt;private_data;</div><div class='ctx'> 	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='del'>-	u32 irq_stat, cmd_err, sstatus, serror;</div><div class='del'>-	unsigned int err_mask;</div><div class='add'>+	u32 slot_stat, qc_active;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	irq_stat = readl(port + PORT_IRQ_STAT);</div><div class='del'>-	writel(irq_stat, port + PORT_IRQ_STAT);		/* clear irq */</div><div class='add'>+	slot_stat = readl(port + PORT_SLOT_STAT);</div><div class='ctx'> </div><div class='del'>-	if (!(irq_stat &amp; PORT_IRQ_ERROR)) {</div><div class='del'>-		/* ignore non-completion, non-error irqs for now */</div><div class='del'>-		printk(KERN_WARNING DRV_NAME</div><div class='del'>-		       "ata%u: non-error exception irq (irq_stat %x)\n",</div><div class='del'>-		       ap-&gt;id, irq_stat);</div><div class='add'>+	if (unlikely(slot_stat &amp; HOST_SSTAT_ATTN)) {</div><div class='add'>+		sil24_error_intr(ap);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd_err = readl(port + PORT_CMD_ERR);</div><div class='del'>-	sstatus = readl(port + PORT_SSTATUS);</div><div class='del'>-	serror = readl(port + PORT_SERROR);</div><div class='del'>-	if (serror)</div><div class='del'>-		writel(serror, port + PORT_SERROR);</div><div class='add'>+	if (ap-&gt;flags &amp; SIL24_FLAG_PCIX_IRQ_WOC)</div><div class='add'>+		writel(PORT_IRQ_COMPLETE, port + PORT_IRQ_STAT);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Don't log ATAPI device errors.  They're supposed to happen</div><div class='del'>-	 * and any serious errors will be logged using sense data by</div><div class='del'>-	 * the SCSI layer.</div><div class='del'>-	 */</div><div class='del'>-	if (ap-&gt;device[0].class != ATA_DEV_ATAPI || cmd_err &gt; PORT_CERR_SDB)</div><div class='del'>-		printk("ata%u: error interrupt on port%d\n"</div><div class='del'>-		       "  stat=0x%x irq=0x%x cmd_err=%d sstatus=0x%x serror=0x%x\n",</div><div class='del'>-		       ap-&gt;id, ap-&gt;port_no, slot_stat, irq_stat, cmd_err, sstatus, serror);</div><div class='del'>-</div><div class='del'>-	if (cmd_err == PORT_CERR_DEV || cmd_err == PORT_CERR_SDB) {</div><div class='del'>-		/*</div><div class='del'>-		 * Device is reporting error, tf registers are valid.</div><div class='del'>-		 */</div><div class='del'>-		sil24_update_tf(ap);</div><div class='del'>-		err_mask = ac_err_mask(pp-&gt;tf.command);</div><div class='del'>-		sil24_restart_controller(ap);</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * Other errors.  libata currently doesn't have any</div><div class='del'>-		 * mechanism to report these errors.  Just turn on</div><div class='del'>-		 * ATA_ERR.</div><div class='del'>-		 */</div><div class='del'>-		err_mask = AC_ERR_OTHER;</div><div class='del'>-		sil24_reset_controller(ap);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (qc) {</div><div class='del'>-		qc-&gt;err_mask |= err_mask;</div><div class='del'>-		ata_qc_complete(qc);</div><div class='add'>+	qc_active = slot_stat &amp; ~HOST_SSTAT_ATTN;</div><div class='add'>+	rc = ata_qc_complete_multiple(ap, qc_active, sil24_finish_qc);</div><div class='add'>+	if (rc &gt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		struct ata_eh_info *ehi = &amp;ap-&gt;eh_info;</div><div class='add'>+		ehi-&gt;err_mask |= AC_ERR_HSM;</div><div class='add'>+		ehi-&gt;action |= ATA_EH_SOFTRESET;</div><div class='add'>+		ata_port_freeze(ap);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void sil24_host_intr(struct ata_port *ap)</div><div class='del'>-{</div><div class='del'>-	struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-	void __iomem *port = (void __iomem *)ap-&gt;ioaddr.cmd_addr;</div><div class='del'>-	u32 slot_stat;</div><div class='del'>-</div><div class='del'>-	slot_stat = readl(port + PORT_SLOT_STAT);</div><div class='del'>-	if (!(slot_stat &amp; HOST_SSTAT_ATTN)) {</div><div class='del'>-		struct sil24_port_priv *pp = ap-&gt;private_data;</div><div class='del'>-		/*</div><div class='del'>-		 * !HOST_SSAT_ATTN guarantees successful completion,</div><div class='del'>-		 * so reading back tf registers is unnecessary for</div><div class='del'>-		 * most commands.  TODO: read tf registers for</div><div class='del'>-		 * commands which require these values on successful</div><div class='del'>-		 * completion (EXECUTE DEVICE DIAGNOSTIC, CHECK POWER,</div><div class='del'>-		 * DEVICE RESET and READ PORT MULTIPLIER (any more?).</div><div class='del'>-		 */</div><div class='del'>-		sil24_update_tf(ap);</div><div class='ctx'> </div><div class='del'>-		if (qc) {</div><div class='del'>-			qc-&gt;err_mask |= ac_err_mask(pp-&gt;tf.command);</div><div class='del'>-			ata_qc_complete(qc);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		sil24_error_intr(ap, slot_stat);</div><div class='add'>+	if (ata_ratelimit())</div><div class='add'>+		ata_port_printk(ap, KERN_INFO, "spurious interrupt "</div><div class='add'>+			"(slot_stat 0x%x active_tag %d sactive 0x%x)\n",</div><div class='add'>+			slot_stat, ap-&gt;active_tag, ap-&gt;sactive);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *regs)</div><div class='hunk'>@@ -769,7 +889,7 @@ static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *</div><div class='ctx'> 	for (i = 0; i &lt; host_set-&gt;n_ports; i++)</div><div class='ctx'> 		if (status &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 			struct ata_port *ap = host_set-&gt;ports[i];</div><div class='del'>-			if (ap &amp;&amp; !(ap-&gt;flags &amp; ATA_FLAG_PORT_DISABLED)) {</div><div class='add'>+			if (ap &amp;&amp; !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 				sil24_host_intr(host_set-&gt;ports[i]);</div><div class='ctx'> 				handled++;</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -782,9 +902,35 @@ static irqreturn_t sil24_interrupt(int irq, void *dev_instance, struct pt_regs *</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sil24_error_handler(struct ata_port *ap)</div><div class='add'>+{</div><div class='add'>+	struct ata_eh_context *ehc = &amp;ap-&gt;eh_context;</div><div class='add'>+</div><div class='add'>+	if (sil24_init_port(ap)) {</div><div class='add'>+		ata_eh_freeze_port(ap);</div><div class='add'>+		ehc-&gt;i.action |= ATA_EH_HARDRESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* perform recovery */</div><div class='add'>+	ata_do_eh(ap, ata_std_prereset, sil24_softreset, sil24_hardreset,</div><div class='add'>+		  ata_std_postreset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sil24_post_internal_cmd(struct ata_queued_cmd *qc)</div><div class='add'>+{</div><div class='add'>+	struct ata_port *ap = qc-&gt;ap;</div><div class='add'>+</div><div class='add'>+	if (qc-&gt;flags &amp; ATA_QCFLAG_FAILED)</div><div class='add'>+		qc-&gt;err_mask |= AC_ERR_OTHER;</div><div class='add'>+</div><div class='add'>+	/* make DMA engine forget about the failed command */</div><div class='add'>+	if (qc-&gt;err_mask)</div><div class='add'>+		sil24_init_port(ap);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void sil24_cblk_free(struct sil24_port_priv *pp, struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	const size_t cb_size = sizeof(*pp-&gt;cmd_block);</div><div class='add'>+	const size_t cb_size = sizeof(*pp-&gt;cmd_block) * SIL24_MAX_CMDS;</div><div class='ctx'> </div><div class='ctx'> 	dma_free_coherent(dev, cb_size, pp-&gt;cmd_block, pp-&gt;cmd_block_dma);</div><div class='ctx'> }</div><div class='hunk'>@@ -794,7 +940,7 @@ static int sil24_port_start(struct ata_port *ap)</div><div class='ctx'> 	struct device *dev = ap-&gt;host_set-&gt;dev;</div><div class='ctx'> 	struct sil24_port_priv *pp;</div><div class='ctx'> 	union sil24_cmd_block *cb;</div><div class='del'>-	size_t cb_size = sizeof(*cb);</div><div class='add'>+	size_t cb_size = sizeof(*cb) * SIL24_MAX_CMDS;</div><div class='ctx'> 	dma_addr_t cb_dma;</div><div class='ctx'> 	int rc = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -848,6 +994,64 @@ static void sil24_host_stop(struct ata_host_set *host_set)</div><div class='ctx'> 	kfree(hpriv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void sil24_init_controller(struct pci_dev *pdev, int n_ports,</div><div class='add'>+				  unsigned long host_flags,</div><div class='add'>+				  void __iomem *host_base,</div><div class='add'>+				  void __iomem *port_base)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* GPIO off */</div><div class='add'>+	writel(0, host_base + HOST_FLASH_CMD);</div><div class='add'>+</div><div class='add'>+	/* clear global reset &amp; mask interrupts during initialization */</div><div class='add'>+	writel(0, host_base + HOST_CTRL);</div><div class='add'>+</div><div class='add'>+	/* init ports */</div><div class='add'>+	for (i = 0; i &lt; n_ports; i++) {</div><div class='add'>+		void __iomem *port = port_base + i * PORT_REGS_SIZE;</div><div class='add'>+</div><div class='add'>+		/* Initial PHY setting */</div><div class='add'>+		writel(0x20c, port + PORT_PHY_CFG);</div><div class='add'>+</div><div class='add'>+		/* Clear port RST */</div><div class='add'>+		tmp = readl(port + PORT_CTRL_STAT);</div><div class='add'>+		if (tmp &amp; PORT_CS_PORT_RST) {</div><div class='add'>+			writel(PORT_CS_PORT_RST, port + PORT_CTRL_CLR);</div><div class='add'>+			tmp = ata_wait_register(port + PORT_CTRL_STAT,</div><div class='add'>+						PORT_CS_PORT_RST,</div><div class='add'>+						PORT_CS_PORT_RST, 10, 100);</div><div class='add'>+			if (tmp &amp; PORT_CS_PORT_RST)</div><div class='add'>+				dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='add'>+				           "failed to clear port RST\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Configure IRQ WoC */</div><div class='add'>+		if (host_flags &amp; SIL24_FLAG_PCIX_IRQ_WOC)</div><div class='add'>+			writel(PORT_CS_IRQ_WOC, port + PORT_CTRL_STAT);</div><div class='add'>+		else</div><div class='add'>+			writel(PORT_CS_IRQ_WOC, port + PORT_CTRL_CLR);</div><div class='add'>+</div><div class='add'>+		/* Zero error counters. */</div><div class='add'>+		writel(0x8000, port + PORT_DECODE_ERR_THRESH);</div><div class='add'>+		writel(0x8000, port + PORT_CRC_ERR_THRESH);</div><div class='add'>+		writel(0x8000, port + PORT_HSHK_ERR_THRESH);</div><div class='add'>+		writel(0x0000, port + PORT_DECODE_ERR_CNT);</div><div class='add'>+		writel(0x0000, port + PORT_CRC_ERR_CNT);</div><div class='add'>+		writel(0x0000, port + PORT_HSHK_ERR_CNT);</div><div class='add'>+</div><div class='add'>+		/* Always use 64bit activation */</div><div class='add'>+		writel(PORT_CS_32BIT_ACTV, port + PORT_CTRL_CLR);</div><div class='add'>+</div><div class='add'>+		/* Clear port multiplier enable and resume bits */</div><div class='add'>+		writel(PORT_CS_PM_EN | PORT_CS_RESUME, port + PORT_CTRL_CLR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Turn on interrupts */</div><div class='add'>+	writel(IRQ_STAT_4PORTS, host_base + HOST_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	static int printed_version = 0;</div><div class='hunk'>@@ -858,6 +1062,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	void __iomem *host_base = NULL;</div><div class='ctx'> 	void __iomem *port_base = NULL;</div><div class='ctx'> 	int i, rc;</div><div class='add'>+	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (!printed_version++)</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "version " DRV_VERSION "\n");</div><div class='hunk'>@@ -900,7 +1105,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	probe_ent-&gt;n_ports	= SIL24_FLAG2NPORTS(pinfo-&gt;host_flags);</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = port_base;</div><div class='ctx'> 	probe_ent-&gt;private_data = hpriv;</div><div class='ctx'> </div><div class='hunk'>@@ -910,92 +1115,54 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configure the device</div><div class='ctx'> 	 */</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: This device is certainly 64-bit capable.  We just</div><div class='del'>-	 * don't know how to use it.  After fixing 32bit activation in</div><div class='del'>-	 * this function, enable 64bit masks here.</div><div class='del'>-	 */</div><div class='del'>-	rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='del'>-			   "32-bit DMA enable failed\n");</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-	rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='del'>-			   "32-bit consistent DMA enable failed\n");</div><div class='del'>-		goto out_free;</div><div class='add'>+	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {</div><div class='add'>+		rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);</div><div class='add'>+		if (rc) {</div><div class='add'>+			rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+			if (rc) {</div><div class='add'>+				dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='add'>+					   "64-bit DMA enable failed\n");</div><div class='add'>+				goto out_free;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='add'>+				   "32-bit DMA enable failed\n");</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+		rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='add'>+				   "32-bit consistent DMA enable failed\n");</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* GPIO off */</div><div class='del'>-	writel(0, host_base + HOST_FLASH_CMD);</div><div class='del'>-</div><div class='del'>-	/* Mask interrupts during initialization */</div><div class='del'>-	writel(0, host_base + HOST_CTRL);</div><div class='add'>+	/* Apply workaround for completion IRQ loss on PCI-X errata */</div><div class='add'>+	if (probe_ent-&gt;host_flags &amp; SIL24_FLAG_PCIX_IRQ_WOC) {</div><div class='add'>+		tmp = readl(host_base + HOST_CTRL);</div><div class='add'>+		if (tmp &amp; (HOST_CTRL_TRDY | HOST_CTRL_STOP | HOST_CTRL_DEVSEL))</div><div class='add'>+			dev_printk(KERN_INFO, &amp;pdev-&gt;dev,</div><div class='add'>+				   "Applying completion IRQ loss on PCI-X "</div><div class='add'>+				   "errata fix\n");</div><div class='add'>+		else</div><div class='add'>+			probe_ent-&gt;host_flags &amp;= ~SIL24_FLAG_PCIX_IRQ_WOC;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; probe_ent-&gt;n_ports; i++) {</div><div class='del'>-		void __iomem *port = port_base + i * PORT_REGS_SIZE;</div><div class='del'>-		unsigned long portu = (unsigned long)port;</div><div class='del'>-		u32 tmp;</div><div class='del'>-		int cnt;</div><div class='add'>+		unsigned long portu =</div><div class='add'>+			(unsigned long)port_base + i * PORT_REGS_SIZE;</div><div class='ctx'> </div><div class='del'>-		probe_ent-&gt;port[i].cmd_addr = portu + PORT_PRB;</div><div class='add'>+		probe_ent-&gt;port[i].cmd_addr = portu;</div><div class='ctx'> 		probe_ent-&gt;port[i].scr_addr = portu + PORT_SCONTROL;</div><div class='ctx'> </div><div class='ctx'> 		ata_std_ports(&amp;probe_ent-&gt;port[i]);</div><div class='del'>-</div><div class='del'>-		/* Initial PHY setting */</div><div class='del'>-		writel(0x20c, port + PORT_PHY_CFG);</div><div class='del'>-</div><div class='del'>-		/* Clear port RST */</div><div class='del'>-		tmp = readl(port + PORT_CTRL_STAT);</div><div class='del'>-		if (tmp &amp; PORT_CS_PORT_RST) {</div><div class='del'>-			writel(PORT_CS_PORT_RST, port + PORT_CTRL_CLR);</div><div class='del'>-			readl(port + PORT_CTRL_STAT);	/* sync */</div><div class='del'>-			for (cnt = 0; cnt &lt; 10; cnt++) {</div><div class='del'>-				msleep(10);</div><div class='del'>-				tmp = readl(port + PORT_CTRL_STAT);</div><div class='del'>-				if (!(tmp &amp; PORT_CS_PORT_RST))</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (tmp &amp; PORT_CS_PORT_RST)</div><div class='del'>-				dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='del'>-				           "failed to clear port RST\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Zero error counters. */</div><div class='del'>-		writel(0x8000, port + PORT_DECODE_ERR_THRESH);</div><div class='del'>-		writel(0x8000, port + PORT_CRC_ERR_THRESH);</div><div class='del'>-		writel(0x8000, port + PORT_HSHK_ERR_THRESH);</div><div class='del'>-		writel(0x0000, port + PORT_DECODE_ERR_CNT);</div><div class='del'>-		writel(0x0000, port + PORT_CRC_ERR_CNT);</div><div class='del'>-		writel(0x0000, port + PORT_HSHK_ERR_CNT);</div><div class='del'>-</div><div class='del'>-		/* FIXME: 32bit activation? */</div><div class='del'>-		writel(0, port + PORT_ACTIVATE_UPPER_ADDR);</div><div class='del'>-		writel(PORT_CS_32BIT_ACTV, port + PORT_CTRL_STAT);</div><div class='del'>-</div><div class='del'>-		/* Configure interrupts */</div><div class='del'>-		writel(0xffff, port + PORT_IRQ_ENABLE_CLR);</div><div class='del'>-		writel(PORT_IRQ_COMPLETE | PORT_IRQ_ERROR | PORT_IRQ_SDB_FIS,</div><div class='del'>-		       port + PORT_IRQ_ENABLE_SET);</div><div class='del'>-</div><div class='del'>-		/* Clear interrupts */</div><div class='del'>-		writel(0x0fff0fff, port + PORT_IRQ_STAT);</div><div class='del'>-		writel(PORT_CS_IRQ_WOC, port + PORT_CTRL_CLR);</div><div class='del'>-</div><div class='del'>-		/* Clear port multiplier enable and resume bits */</div><div class='del'>-		writel(PORT_CS_PM_EN | PORT_CS_RESUME, port + PORT_CTRL_CLR);</div><div class='del'>-</div><div class='del'>-		/* Reset itself */</div><div class='del'>-		if (__sil24_reset_controller(port))</div><div class='del'>-			dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='del'>-			           "failed to reset controller\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Turn on interrupts */</div><div class='del'>-	writel(IRQ_STAT_4PORTS, host_base + HOST_CTRL);</div><div class='add'>+	sil24_init_controller(pdev, probe_ent-&gt;n_ports, probe_ent-&gt;host_flags,</div><div class='add'>+			      host_base, port_base);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1018,6 +1185,25 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sil24_pci_device_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct ata_host_set *host_set = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct sil24_host_priv *hpriv = host_set-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	ata_pci_device_do_resume(pdev);</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;dev.power.power_state.event == PM_EVENT_SUSPEND)</div><div class='add'>+		writel(HOST_CTRL_GLOBAL_RST, hpriv-&gt;host_base + HOST_CTRL);</div><div class='add'>+</div><div class='add'>+	sil24_init_controller(pdev, host_set-&gt;n_ports,</div><div class='add'>+			      host_set-&gt;ports[0]-&gt;flags,</div><div class='add'>+			      hpriv-&gt;host_base, hpriv-&gt;port_base);</div><div class='add'>+</div><div class='add'>+	ata_host_set_resume(host_set);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __init sil24_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	return pci_module_init(&amp;sil24_pci_driver);</div><div class='head'>diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c<br/>index 728530df2e07..ee6b5df41d30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_sis.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -43,7 +42,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_sis"</div><div class='del'>-#define DRV_VERSION	"0.5"</div><div class='add'>+#define DRV_VERSION	"0.6"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	sis_180			= 0,</div><div class='hunk'>@@ -96,6 +95,7 @@ static struct scsi_host_template sis_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -106,14 +106,17 @@ static const struct ata_port_operations sis_ops = {</div><div class='ctx'> 	.check_status		= ata_check_status,</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='del'>-	.phy_reset		= sata_phy_reset,</div><div class='ctx'> 	.bmdma_setup            = ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start            = ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= ata_bmdma_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> 	.irq_handler		= ata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='ctx'> 	.scr_read		= sis_scr_read,</div><div class='hunk'>@@ -125,8 +128,7 @@ static const struct ata_port_operations sis_ops = {</div><div class='ctx'> </div><div class='ctx'> static struct ata_port_info sis_port_info = {</div><div class='ctx'> 	.sht		= &amp;sis_sht,</div><div class='del'>-	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |</div><div class='del'>-			  ATA_FLAG_NO_LEGACY,</div><div class='add'>+	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,</div><div class='ctx'> 	.pio_mask	= 0x1f,</div><div class='ctx'> 	.mwdma_mask	= 0x7,</div><div class='ctx'> 	.udma_mask	= 0x7f,</div><div class='head'>diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c<br/>index 53b0d5c0a61f..7d0858095e1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_svw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_svw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_svw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_svw.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -54,7 +53,7 @@</div><div class='ctx'> #endif /* CONFIG_PPC_OF */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_svw"</div><div class='del'>-#define DRV_VERSION	"1.07"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	/* Taskfile registers offsets */</div><div class='hunk'>@@ -257,7 +256,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,</div><div class='ctx'> 	int len, index;</div><div class='ctx'> </div><div class='ctx'> 	/* Find  the ata_port */</div><div class='del'>-	ap = (struct ata_port *) &amp;shost-&gt;hostdata[0];</div><div class='add'>+	ap = ata_shost_to_port(shost);</div><div class='ctx'> 	if (ap == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -299,6 +298,7 @@ static struct scsi_host_template k2_sata_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> #ifdef CONFIG_PPC_OF</div><div class='ctx'> 	.proc_info		= k2_sata_proc_info,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -313,14 +313,17 @@ static const struct ata_port_operations k2_sata_ops = {</div><div class='ctx'> 	.check_status		= k2_stat_check_status,</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='del'>-	.phy_reset		= sata_phy_reset,</div><div class='ctx'> 	.bmdma_setup		= k2_bmdma_setup_mmio,</div><div class='ctx'> 	.bmdma_start		= k2_bmdma_start_mmio,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= ata_bmdma_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> 	.irq_handler		= ata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='ctx'> 	.scr_read		= k2_sata_scr_read,</div><div class='hunk'>@@ -420,12 +423,12 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e</div><div class='ctx'> 	writel(0x0, mmio_base + K2_SATA_SIM_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;sht = &amp;k2_sata_sht;</div><div class='del'>-	probe_ent-&gt;host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |</div><div class='del'>-				ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;</div><div class='add'>+	probe_ent-&gt;host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='add'>+				ATA_FLAG_MMIO;</div><div class='ctx'> 	probe_ent-&gt;port_ops = &amp;k2_sata_ops;</div><div class='ctx'> 	probe_ent-&gt;n_ports = 4;</div><div class='ctx'> 	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = mmio_base;</div><div class='ctx'> </div><div class='ctx'> 	/* We don't care much about the PIO/UDMA masks, but the core won't like us</div><div class='head'>diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c<br/>index 4139ad4b1df0..ccc8cad24f7d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sx4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_sx4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_sx4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_sx4.c</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> #include "sata_promise.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_sx4"</div><div class='del'>-#define DRV_VERSION	"0.8"</div><div class='add'>+#define DRV_VERSION	"0.9"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -191,6 +191,7 @@ static struct scsi_host_template pdc_sata_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -204,6 +205,7 @@ static const struct ata_port_operations pdc_20621_ops = {</div><div class='ctx'> 	.phy_reset		= pdc_20621_phy_reset,</div><div class='ctx'> 	.qc_prep		= pdc20621_qc_prep,</div><div class='ctx'> 	.qc_issue		= pdc20621_qc_issue_prot,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='ctx'> 	.eng_timeout		= pdc_eng_timeout,</div><div class='ctx'> 	.irq_handler		= pdc20621_interrupt,</div><div class='ctx'> 	.irq_clear		= pdc20621_irq_clear,</div><div class='hunk'>@@ -218,7 +220,7 @@ static const struct ata_port_info pdc_port_info[] = {</div><div class='ctx'> 		.sht		= &amp;pdc_sata_sht,</div><div class='ctx'> 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='ctx'> 				  ATA_FLAG_SRST | ATA_FLAG_MMIO |</div><div class='del'>-				  ATA_FLAG_NO_ATAPI,</div><div class='add'>+				  ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,</div><div class='ctx'> 		.pio_mask	= 0x1f, /* pio0-4 */</div><div class='ctx'> 		.mwdma_mask	= 0x07, /* mwdma0-2 */</div><div class='ctx'> 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */</div><div class='hunk'>@@ -833,11 +835,11 @@ static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_re</div><div class='ctx'> 		tmp = mask &amp; (1 &lt;&lt; i);</div><div class='ctx'> 		VPRINTK("seq %u, port_no %u, ap %p, tmp %x\n", i, port_no, ap, tmp);</div><div class='ctx'> 		if (tmp &amp;&amp; ap &amp;&amp;</div><div class='del'>-		    !(ap-&gt;flags &amp; (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))) {</div><div class='add'>+		    !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 			struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='ctx'> 			qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-			if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN)))</div><div class='add'>+			if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)))</div><div class='ctx'> 				handled += pdc20621_host_intr(ap, qc, (i &gt; 4),</div><div class='ctx'> 							      mmio_base);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -868,15 +870,16 @@ static void pdc_eng_timeout(struct ata_port *ap)</div><div class='ctx'> 	switch (qc-&gt;tf.protocol) {</div><div class='ctx'> 	case ATA_PROT_DMA:</div><div class='ctx'> 	case ATA_PROT_NODATA:</div><div class='del'>-		printk(KERN_ERR "ata%u: command timeout\n", ap-&gt;id);</div><div class='add'>+		ata_port_printk(ap, KERN_ERR, "command timeout\n");</div><div class='ctx'> 		qc-&gt;err_mask |= __ac_err_mask(ata_wait_idle(ap));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		drv_stat = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);</div><div class='ctx'> </div><div class='del'>-		printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n",</div><div class='del'>-		       ap-&gt;id, qc-&gt;tf.command, drv_stat);</div><div class='add'>+		ata_port_printk(ap, KERN_ERR,</div><div class='add'>+				"unknown timeout, cmd 0x%x stat 0x%x\n",</div><div class='add'>+				qc-&gt;tf.command, drv_stat);</div><div class='ctx'> </div><div class='ctx'> 		qc-&gt;err_mask |= ac_err_mask(drv_stat);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1375,10 +1378,6 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *</div><div class='ctx'> 	if (!printed_version++)</div><div class='ctx'> 		dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev, "version " DRV_VERSION "\n");</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If this driver happens to only be useful on Apple's K2, then</div><div class='del'>-	 * we should check that here as it has a normal Serverworks ID</div><div class='del'>-	 */</div><div class='ctx'> 	rc = pci_enable_device(pdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -1437,7 +1436,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *</div><div class='ctx'> 	probe_ent-&gt;port_ops	= pdc_port_info[board_idx].port_ops;</div><div class='ctx'> </div><div class='ctx'>        	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-       	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+       	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = mmio_base;</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;private_data = hpriv;</div><div class='head'>diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c<br/>index 38b52bd3fa3f..33cdb4867ef1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_uli.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_uli.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_uli.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_uli.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -37,7 +36,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_uli"</div><div class='del'>-#define DRV_VERSION	"0.5"</div><div class='add'>+#define DRV_VERSION	"1.0"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	uli_5289		= 0,</div><div class='hunk'>@@ -90,6 +89,7 @@ static struct scsi_host_template uli_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -102,16 +102,18 @@ static const struct ata_port_operations uli_ops = {</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='ctx'> </div><div class='del'>-	.phy_reset		= sata_phy_reset,</div><div class='del'>-</div><div class='ctx'> 	.bmdma_setup            = ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start            = ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='ctx'> </div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= ata_bmdma_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> </div><div class='ctx'> 	.irq_handler		= ata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='hunk'>@@ -126,8 +128,7 @@ static const struct ata_port_operations uli_ops = {</div><div class='ctx'> </div><div class='ctx'> static struct ata_port_info uli_port_info = {</div><div class='ctx'> 	.sht            = &amp;uli_sht,</div><div class='del'>-	.host_flags     = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |</div><div class='del'>-			  ATA_FLAG_NO_LEGACY,</div><div class='add'>+	.host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,</div><div class='ctx'> 	.pio_mask       = 0x1f,		/* pio0-4 */</div><div class='ctx'> 	.udma_mask      = 0x7f,		/* udma0-6 */</div><div class='ctx'> 	.port_ops       = &amp;uli_ops,</div><div class='head'>diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c<br/>index 9e7ae4e0db32..03baec2191bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_via.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_via.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_via.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_via.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_via"</div><div class='del'>-#define DRV_VERSION	"1.1"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='ctx'> </div><div class='ctx'> enum board_ids_enum {</div><div class='ctx'> 	vt6420,</div><div class='hunk'>@@ -103,6 +103,7 @@ static struct scsi_host_template svia_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -115,8 +116,6 @@ static const struct ata_port_operations svia_sata_ops = {</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='ctx'> </div><div class='del'>-	.phy_reset		= sata_phy_reset,</div><div class='del'>-</div><div class='ctx'> 	.bmdma_setup            = ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start            = ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='hunk'>@@ -124,8 +123,12 @@ static const struct ata_port_operations svia_sata_ops = {</div><div class='ctx'> </div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='add'>+	.data_xfer		= ata_pio_data_xfer,</div><div class='ctx'> </div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= ata_bmdma_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> </div><div class='ctx'> 	.irq_handler		= ata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='hunk'>@@ -140,7 +143,7 @@ static const struct ata_port_operations svia_sata_ops = {</div><div class='ctx'> </div><div class='ctx'> static struct ata_port_info svia_port_info = {</div><div class='ctx'> 	.sht		= &amp;svia_sht,</div><div class='del'>-	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST | ATA_FLAG_NO_LEGACY,</div><div class='add'>+	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,</div><div class='ctx'> 	.pio_mask	= 0x1f,</div><div class='ctx'> 	.mwdma_mask	= 0x07,</div><div class='ctx'> 	.udma_mask	= 0x7f,</div><div class='hunk'>@@ -235,12 +238,11 @@ static struct ata_probe_ent *vt6421_init_probe_ent(struct pci_dev *pdev)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;probe_ent-&gt;node);</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;sht		= &amp;svia_sht;</div><div class='del'>-	probe_ent-&gt;host_flags	= ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |</div><div class='del'>-				  ATA_FLAG_NO_LEGACY;</div><div class='add'>+	probe_ent-&gt;host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY;</div><div class='ctx'> 	probe_ent-&gt;port_ops	= &amp;svia_sata_ops;</div><div class='ctx'> 	probe_ent-&gt;n_ports	= N_PORTS;</div><div class='ctx'> 	probe_ent-&gt;irq		= pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags	= SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags	= IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;pio_mask	= 0x1f;</div><div class='ctx'> 	probe_ent-&gt;mwdma_mask	= 0x07;</div><div class='ctx'> 	probe_ent-&gt;udma_mask	= 0x7f;</div><div class='hunk'>@@ -333,10 +335,10 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		if ((pci_resource_start(pdev, i) == 0) ||</div><div class='ctx'> 		    (pci_resource_len(pdev, i) &lt; bar_sizes[i])) {</div><div class='ctx'> 			dev_printk(KERN_ERR, &amp;pdev-&gt;dev,</div><div class='del'>-				   "invalid PCI BAR %u (sz 0x%lx, val 0x%lx)\n",</div><div class='del'>-				   i,</div><div class='del'>-			           pci_resource_start(pdev, i),</div><div class='del'>-			           pci_resource_len(pdev, i));</div><div class='add'>+				"invalid PCI BAR %u (sz 0x%llx, val 0x%llx)\n",</div><div class='add'>+				i,</div><div class='add'>+			        (unsigned long long)pci_resource_start(pdev, i),</div><div class='add'>+			        (unsigned long long)pci_resource_len(pdev, i));</div><div class='ctx'> 			rc = -ENODEV;</div><div class='ctx'> 			goto err_out_regions;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c<br/>index 8a29ce340b47..ad37871594f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sata_vsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sata_vsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sata_vsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sata_vsc.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@</div><div class='ctx'> #include &lt;linux/libata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sata_vsc"</div><div class='del'>-#define DRV_VERSION	"1.2"</div><div class='add'>+#define DRV_VERSION	"2.0"</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	/* Interrupt register offsets (from chip base address) */</div><div class='hunk'>@@ -221,14 +221,21 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,</div><div class='ctx'> </div><div class='ctx'> 			ap = host_set-&gt;ports[i];</div><div class='ctx'> </div><div class='del'>-			if (ap &amp;&amp; !(ap-&gt;flags &amp;</div><div class='del'>-				    (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) {</div><div class='add'>+			if (is_vsc_sata_int_err(i, int_status)) {</div><div class='add'>+				u32 err_status;</div><div class='add'>+				printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__);</div><div class='add'>+				err_status = ap ? vsc_sata_scr_read(ap, SCR_ERROR) : 0;</div><div class='add'>+				vsc_sata_scr_write(ap, SCR_ERROR, err_status);</div><div class='add'>+				handled++;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ap &amp;&amp; !(ap-&gt;flags &amp; ATA_FLAG_DISABLED)) {</div><div class='ctx'> 				struct ata_queued_cmd *qc;</div><div class='ctx'> </div><div class='ctx'> 				qc = ata_qc_from_tag(ap, ap-&gt;active_tag);</div><div class='del'>-				if (qc &amp;&amp; (!(qc-&gt;tf.ctl &amp; ATA_NIEN))) {</div><div class='add'>+				if (qc &amp;&amp; (!(qc-&gt;tf.flags &amp; ATA_TFLAG_POLLING)))</div><div class='ctx'> 					handled += ata_host_intr(ap, qc);</div><div class='del'>-				} else if (is_vsc_sata_int_err(i, int_status)) {</div><div class='add'>+				else if (is_vsc_sata_int_err(i, int_status)) {</div><div class='ctx'> 					/*</div><div class='ctx'> 					 * On some chips (i.e. Intel 31244), an error</div><div class='ctx'> 					 * interrupt will sneak in at initialization</div><div class='hunk'>@@ -272,6 +279,7 @@ static struct scsi_host_template vsc_sata_sht = {</div><div class='ctx'> 	.proc_name		= DRV_NAME,</div><div class='ctx'> 	.dma_boundary		= ATA_DMA_BOUNDARY,</div><div class='ctx'> 	.slave_configure	= ata_scsi_slave_config,</div><div class='add'>+	.slave_destroy		= ata_scsi_slave_destroy,</div><div class='ctx'> 	.bios_param		= ata_std_bios_param,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -283,14 +291,17 @@ static const struct ata_port_operations vsc_sata_ops = {</div><div class='ctx'> 	.exec_command		= ata_exec_command,</div><div class='ctx'> 	.check_status		= ata_check_status,</div><div class='ctx'> 	.dev_select		= ata_std_dev_select,</div><div class='del'>-	.phy_reset		= sata_phy_reset,</div><div class='ctx'> 	.bmdma_setup            = ata_bmdma_setup,</div><div class='ctx'> 	.bmdma_start            = ata_bmdma_start,</div><div class='ctx'> 	.bmdma_stop		= ata_bmdma_stop,</div><div class='ctx'> 	.bmdma_status		= ata_bmdma_status,</div><div class='ctx'> 	.qc_prep		= ata_qc_prep,</div><div class='ctx'> 	.qc_issue		= ata_qc_issue_prot,</div><div class='del'>-	.eng_timeout		= ata_eng_timeout,</div><div class='add'>+	.data_xfer		= ata_mmio_data_xfer,</div><div class='add'>+	.freeze			= ata_bmdma_freeze,</div><div class='add'>+	.thaw			= ata_bmdma_thaw,</div><div class='add'>+	.error_handler		= ata_bmdma_error_handler,</div><div class='add'>+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,</div><div class='ctx'> 	.irq_handler		= vsc_sata_interrupt,</div><div class='ctx'> 	.irq_clear		= ata_bmdma_irq_clear,</div><div class='ctx'> 	.scr_read		= vsc_sata_scr_read,</div><div class='hunk'>@@ -385,11 +396,11 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d</div><div class='ctx'> </div><div class='ctx'> 	probe_ent-&gt;sht = &amp;vsc_sata_sht;</div><div class='ctx'> 	probe_ent-&gt;host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |</div><div class='del'>-				ATA_FLAG_MMIO | ATA_FLAG_SATA_RESET;</div><div class='add'>+				ATA_FLAG_MMIO;</div><div class='ctx'> 	probe_ent-&gt;port_ops = &amp;vsc_sata_ops;</div><div class='ctx'> 	probe_ent-&gt;n_ports = 4;</div><div class='ctx'> 	probe_ent-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	probe_ent-&gt;irq_flags = SA_SHIRQ;</div><div class='add'>+	probe_ent-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	probe_ent-&gt;mmio_base = mmio_base;</div><div class='ctx'> </div><div class='ctx'> 	/* We don't care much about the PIO/UDMA masks, but the core won't like us</div><div class='hunk'>@@ -432,15 +443,12 @@ err_out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 0x1725/0x7174 is the Vitesse VSC-7174</div><div class='del'>- * 0x8086/0x3200 is the Intel 31244, which is supposed to be identical</div><div class='del'>- * compatibility is untested as of yet</div><div class='del'>- */</div><div class='ctx'> static const struct pci_device_id vsc_sata_pci_tbl[] = {</div><div class='del'>-	{ 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },</div><div class='del'>-	{ 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },</div><div class='del'>-	{ }</div><div class='add'>+	{ PCI_VENDOR_ID_VITESSE, 0x7174,</div><div class='add'>+	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },</div><div class='add'>+	{ PCI_VENDOR_ID_INTEL, 0x3200,</div><div class='add'>+	  PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },</div><div class='add'>+	{ }	/* terminate list */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c<br/>index 73994e2ac2cb..2ab7df0dcfe8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi.c</a></div><div class='hunk'>@@ -63,7 +63,6 @@</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_tcq.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "scsi_priv.h"</div><div class='ctx'> #include "scsi_logging.h"</div><div class='hunk'>@@ -116,79 +115,6 @@ const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE] = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(scsi_device_types);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Function:    scsi_allocate_request</div><div class='del'>- *</div><div class='del'>- * Purpose:     Allocate a request descriptor.</div><div class='del'>- *</div><div class='del'>- * Arguments:   device		- device for which we want a request</div><div class='del'>- *		gfp_mask	- allocation flags passed to kmalloc</div><div class='del'>- *</div><div class='del'>- * Lock status: No locks assumed to be held.  This function is SMP-safe.</div><div class='del'>- *</div><div class='del'>- * Returns:     Pointer to request block.</div><div class='del'>- */</div><div class='del'>-struct scsi_request *scsi_allocate_request(struct scsi_device *sdev,</div><div class='del'>-					   gfp_t gfp_mask)</div><div class='del'>-{</div><div class='del'>-	const int offset = ALIGN(sizeof(struct scsi_request), 4);</div><div class='del'>-	const int size = offset + sizeof(struct request);</div><div class='del'>-	struct scsi_request *sreq;</div><div class='del'>-  </div><div class='del'>-	sreq = kzalloc(size, gfp_mask);</div><div class='del'>-	if (likely(sreq != NULL)) {</div><div class='del'>-		sreq-&gt;sr_request = (struct request *)(((char *)sreq) + offset);</div><div class='del'>-		sreq-&gt;sr_device = sdev;</div><div class='del'>-		sreq-&gt;sr_host = sdev-&gt;host;</div><div class='del'>-		sreq-&gt;sr_magic = SCSI_REQ_MAGIC;</div><div class='del'>-		sreq-&gt;sr_data_direction = DMA_BIDIRECTIONAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sreq;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(scsi_allocate_request);</div><div class='del'>-</div><div class='del'>-void __scsi_release_request(struct scsi_request *sreq)</div><div class='del'>-{</div><div class='del'>-	struct request *req = sreq-&gt;sr_request;</div><div class='del'>-</div><div class='del'>-	/* unlikely because the tag was usually ended earlier by the</div><div class='del'>-	 * mid-layer. However, for layering reasons ULD's don't end</div><div class='del'>-	 * the tag of commands they generate. */</div><div class='del'>-	if (unlikely(blk_rq_tagged(req))) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		struct request_queue *q = req-&gt;q;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(q-&gt;queue_lock, flags);</div><div class='del'>-		blk_queue_end_tag(q, req);</div><div class='del'>-		spin_unlock_irqrestore(q-&gt;queue_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (likely(sreq-&gt;sr_command != NULL)) {</div><div class='del'>-		struct scsi_cmnd *cmd = sreq-&gt;sr_command;</div><div class='del'>-</div><div class='del'>-		sreq-&gt;sr_command = NULL;</div><div class='del'>-		scsi_next_command(cmd);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Function:    scsi_release_request</div><div class='del'>- *</div><div class='del'>- * Purpose:     Release a request descriptor.</div><div class='del'>- *</div><div class='del'>- * Arguments:   sreq    - request to release</div><div class='del'>- *</div><div class='del'>- * Lock status: No locks assumed to be held.  This function is SMP-safe.</div><div class='del'>- */</div><div class='del'>-void scsi_release_request(struct scsi_request *sreq)</div><div class='del'>-{</div><div class='del'>-	__scsi_release_request(sreq);</div><div class='del'>-	kfree(sreq);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(scsi_release_request);</div><div class='del'>-</div><div class='ctx'> struct scsi_host_cmd_pool {</div><div class='ctx'> 	kmem_cache_t	*slab;</div><div class='ctx'> 	unsigned int	users;</div><div class='hunk'>@@ -646,73 +572,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)</div><div class='ctx'> 	return rtn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Function:    scsi_init_cmd_from_req</div><div class='del'>- *</div><div class='del'>- * Purpose:     Queue a SCSI command</div><div class='del'>- * Purpose:     Initialize a struct scsi_cmnd from a struct scsi_request</div><div class='del'>- *</div><div class='del'>- * Arguments:   cmd       - command descriptor.</div><div class='del'>- *              sreq      - Request from the queue.</div><div class='del'>- *</div><div class='del'>- * Lock status: None needed.</div><div class='del'>- *</div><div class='del'>- * Returns:     Nothing.</div><div class='del'>- *</div><div class='del'>- * Notes:       Mainly transfer data from the request structure to the</div><div class='del'>- *              command structure.  The request structure is allocated</div><div class='del'>- *              using the normal memory allocator, and requests can pile</div><div class='del'>- *              up to more or less any depth.  The command structure represents</div><div class='del'>- *              a consumable resource, as these are allocated into a pool</div><div class='del'>- *              when the SCSI subsystem initializes.  The preallocation is</div><div class='del'>- *              required so that in low-memory situations a disk I/O request</div><div class='del'>- *              won't cause the memory manager to try and write out a page.</div><div class='del'>- *              The request structure is generally used by ioctls and character</div><div class='del'>- *              devices.</div><div class='del'>- */</div><div class='del'>-void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)</div><div class='del'>-{</div><div class='del'>-	sreq-&gt;sr_command = cmd;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;cmd_len = sreq-&gt;sr_cmd_len;</div><div class='del'>-	cmd-&gt;use_sg = sreq-&gt;sr_use_sg;</div><div class='del'>-</div><div class='del'>-	cmd-&gt;request = sreq-&gt;sr_request;</div><div class='del'>-	memcpy(cmd-&gt;data_cmnd, sreq-&gt;sr_cmnd, sizeof(cmd-&gt;data_cmnd));</div><div class='del'>-	cmd-&gt;serial_number = 0;</div><div class='del'>-	cmd-&gt;bufflen = sreq-&gt;sr_bufflen;</div><div class='del'>-	cmd-&gt;buffer = sreq-&gt;sr_buffer;</div><div class='del'>-	cmd-&gt;retries = 0;</div><div class='del'>-	cmd-&gt;allowed = sreq-&gt;sr_allowed;</div><div class='del'>-	cmd-&gt;done = sreq-&gt;sr_done;</div><div class='del'>-	cmd-&gt;timeout_per_command = sreq-&gt;sr_timeout_per_command;</div><div class='del'>-	cmd-&gt;sc_data_direction = sreq-&gt;sr_data_direction;</div><div class='del'>-	cmd-&gt;sglist_len = sreq-&gt;sr_sglist_len;</div><div class='del'>-	cmd-&gt;underflow = sreq-&gt;sr_underflow;</div><div class='del'>-	cmd-&gt;sc_request = sreq;</div><div class='del'>-	memcpy(cmd-&gt;cmnd, sreq-&gt;sr_cmnd, sizeof(sreq-&gt;sr_cmnd));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Zero the sense buffer.  Some host adapters automatically request</div><div class='del'>-	 * sense on error.  0 is not a valid sense code.</div><div class='del'>-	 */</div><div class='del'>-	memset(cmd-&gt;sense_buffer, 0, sizeof(sreq-&gt;sr_sense_buffer));</div><div class='del'>-	cmd-&gt;request_buffer = sreq-&gt;sr_buffer;</div><div class='del'>-	cmd-&gt;request_bufflen = sreq-&gt;sr_bufflen;</div><div class='del'>-	cmd-&gt;old_use_sg = cmd-&gt;use_sg;</div><div class='del'>-	if (cmd-&gt;cmd_len == 0)</div><div class='del'>-		cmd-&gt;cmd_len = COMMAND_SIZE(cmd-&gt;cmnd[0]);</div><div class='del'>-	cmd-&gt;old_cmd_len = cmd-&gt;cmd_len;</div><div class='del'>-	cmd-&gt;sc_old_data_direction = cmd-&gt;sc_data_direction;</div><div class='del'>-	cmd-&gt;old_underflow = cmd-&gt;underflow;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start the timer ticking.</div><div class='del'>-	 */</div><div class='del'>-	cmd-&gt;result = 0;</div><div class='del'>-</div><div class='del'>-	SCSI_LOG_MLQUEUE(3, printk("Leaving scsi_init_cmd_from_req()\n"));</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Per-CPU I/O completion queue.</div><div class='hunk'>@@ -720,6 +579,24 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)</div><div class='ctx'> static DEFINE_PER_CPU(struct list_head, scsi_done_q);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * scsi_req_abort_cmd -- Request command recovery for the specified command</div><div class='add'>+ * cmd: pointer to the SCSI command of interest</div><div class='add'>+ *</div><div class='add'>+ * This function requests that SCSI Core start recovery for the</div><div class='add'>+ * command by deleting the timer and adding the command to the eh</div><div class='add'>+ * queue.  It can be called by either LLDDs or SCSI Core.  LLDDs who</div><div class='add'>+ * implement their own error recovery MAY ignore the timeout event if</div><div class='add'>+ * they generated scsi_req_abort_cmd.</div><div class='add'>+ */</div><div class='add'>+void scsi_req_abort_cmd(struct scsi_cmnd *cmd)</div><div class='add'>+{</div><div class='add'>+	if (!scsi_delete_timer(cmd))</div><div class='add'>+		return;</div><div class='add'>+	scsi_times_out(cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_req_abort_cmd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * scsi_done - Enqueue the finished SCSI command into the done queue.</div><div class='ctx'>  * @cmd: The SCSI Command for which a low-level device driver (LLDD) gives</div><div class='ctx'>  * ownership back to SCSI Core -- i.e. the LLDD has finished with it.</div><div class='hunk'>@@ -809,7 +686,6 @@ void scsi_finish_command(struct scsi_cmnd *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_device *sdev = cmd-&gt;device;</div><div class='ctx'> 	struct Scsi_Host *shost = sdev-&gt;host;</div><div class='del'>-	struct scsi_request *sreq;</div><div class='ctx'> </div><div class='ctx'> 	scsi_device_unbusy(sdev);</div><div class='ctx'> </div><div class='hunk'>@@ -839,21 +715,6 @@ void scsi_finish_command(struct scsi_cmnd *cmd)</div><div class='ctx'> 	 * We can get here with use_sg=0, causing a panic in the upper level</div><div class='ctx'> 	 */</div><div class='ctx'> 	cmd-&gt;use_sg = cmd-&gt;old_use_sg;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there is an associated request structure, copy the data over</div><div class='del'>-	 * before we call the completion function.</div><div class='del'>-	 */</div><div class='del'>-	sreq = cmd-&gt;sc_request;</div><div class='del'>-	if (sreq) {</div><div class='del'>-	       sreq-&gt;sr_result = sreq-&gt;sr_command-&gt;result;</div><div class='del'>-	       if (sreq-&gt;sr_result) {</div><div class='del'>-		       memcpy(sreq-&gt;sr_sense_buffer,</div><div class='del'>-			      sreq-&gt;sr_command-&gt;sense_buffer,</div><div class='del'>-			      sizeof(sreq-&gt;sr_sense_buffer));</div><div class='del'>-	       }</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	cmd-&gt;done(cmd);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_finish_command);</div><div class='head'>diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h<br/>index 5ee5d80a9931..f51e466893e7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi.h</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_tcq.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c<br/>index 5a5d2af8ee43..9c63b00773c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_debug.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *        module options to "modprobe scsi_debug num_tgts=2" [20021221]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -51,18 +50,22 @@</div><div class='ctx'> #include "scsi_logging.h"</div><div class='ctx'> #include "scsi_debug.h"</div><div class='ctx'> </div><div class='del'>-#define SCSI_DEBUG_VERSION "1.75"</div><div class='del'>-static const char * scsi_debug_version_date = "20050113";</div><div class='add'>+#define SCSI_DEBUG_VERSION "1.79"</div><div class='add'>+static const char * scsi_debug_version_date = "20060604";</div><div class='ctx'> </div><div class='ctx'> /* Additional Sense Code (ASC) used */</div><div class='del'>-#define NO_ADDED_SENSE 0x0</div><div class='add'>+#define NO_ADDITIONAL_SENSE 0x0</div><div class='add'>+#define LOGICAL_UNIT_NOT_READY 0x4</div><div class='ctx'> #define UNRECOVERED_READ_ERR 0x11</div><div class='add'>+#define PARAMETER_LIST_LENGTH_ERR 0x1a</div><div class='ctx'> #define INVALID_OPCODE 0x20</div><div class='ctx'> #define ADDR_OUT_OF_RANGE 0x21</div><div class='ctx'> #define INVALID_FIELD_IN_CDB 0x24</div><div class='add'>+#define INVALID_FIELD_IN_PARAM_LIST 0x26</div><div class='ctx'> #define POWERON_RESET 0x29</div><div class='ctx'> #define SAVING_PARAMS_UNSUP 0x39</div><div class='del'>-#define THRESHHOLD_EXCEEDED 0x5d</div><div class='add'>+#define THRESHOLD_EXCEEDED 0x5d</div><div class='add'>+#define LOW_POWER_COND_ON 0x5e</div><div class='ctx'> </div><div class='ctx'> #define SDEBUG_TAGGED_QUEUING 0 /* 0 | MSG_SIMPLE_TAG | MSG_ORDERED_TAG */</div><div class='ctx'> </div><div class='hunk'>@@ -81,6 +84,8 @@ static const char * scsi_debug_version_date = "20050113";</div><div class='ctx'> #define DEF_SCSI_LEVEL   5    /* INQUIRY, byte2 [5-&gt;SPC-3] */</div><div class='ctx'> #define DEF_PTYPE   0</div><div class='ctx'> #define DEF_D_SENSE   0</div><div class='add'>+#define DEF_NO_LUN_0   0</div><div class='add'>+#define DEF_VIRTUAL_GB   0</div><div class='ctx'> </div><div class='ctx'> /* bit mask values for scsi_debug_opts */</div><div class='ctx'> #define SCSI_DEBUG_OPT_NOISE   1</div><div class='hunk'>@@ -107,6 +112,7 @@ static const char * scsi_debug_version_date = "20050113";</div><div class='ctx'> /* If REPORT LUNS has luns &gt;= 256 it can choose "flat space" (value 1)</div><div class='ctx'>  * or "peripheral device" addressing (value 0) */</div><div class='ctx'> #define SAM2_LUN_ADDRESS_METHOD 0</div><div class='add'>+#define SAM2_WLUN_REPORT_LUNS 0xc101</div><div class='ctx'> </div><div class='ctx'> static int scsi_debug_add_host = DEF_NUM_HOST;</div><div class='ctx'> static int scsi_debug_delay = DEF_DELAY;</div><div class='hunk'>@@ -119,13 +125,16 @@ static int scsi_debug_opts = DEF_OPTS;</div><div class='ctx'> static int scsi_debug_scsi_level = DEF_SCSI_LEVEL;</div><div class='ctx'> static int scsi_debug_ptype = DEF_PTYPE; /* SCSI peripheral type (0==disk) */</div><div class='ctx'> static int scsi_debug_dsense = DEF_D_SENSE;</div><div class='add'>+static int scsi_debug_no_lun_0 = DEF_NO_LUN_0;</div><div class='add'>+static int scsi_debug_virtual_gb = DEF_VIRTUAL_GB;</div><div class='ctx'> </div><div class='ctx'> static int scsi_debug_cmnd_count = 0;</div><div class='ctx'> </div><div class='ctx'> #define DEV_READONLY(TGT)      (0)</div><div class='ctx'> #define DEV_REMOVEABLE(TGT)    (0)</div><div class='ctx'> </div><div class='del'>-static unsigned long sdebug_store_size;	/* in bytes */</div><div class='add'>+static unsigned int sdebug_store_size;	/* in bytes */</div><div class='add'>+static unsigned int sdebug_store_sectors;</div><div class='ctx'> static sector_t sdebug_capacity;	/* in sectors */</div><div class='ctx'> </div><div class='ctx'> /* old BIOS stuff, kernel may get rid of them but some mode sense pages</div><div class='hunk'>@@ -150,7 +159,9 @@ struct sdebug_dev_info {</div><div class='ctx'> 	unsigned int target;</div><div class='ctx'> 	unsigned int lun;</div><div class='ctx'> 	struct sdebug_host_info *sdbg_host;</div><div class='add'>+	unsigned int wlun;</div><div class='ctx'> 	char reset;</div><div class='add'>+	char stopped;</div><div class='ctx'> 	char used;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -194,11 +205,11 @@ static struct scsi_host_template sdebug_driver_template = {</div><div class='ctx'> 	.bios_param =		scsi_debug_biosparam,</div><div class='ctx'> 	.can_queue =		SCSI_DEBUG_CANQUEUE,</div><div class='ctx'> 	.this_id =		7,</div><div class='del'>-	.sg_tablesize =		64,</div><div class='del'>-	.cmd_per_lun =		3,</div><div class='del'>-	.max_sectors =		4096,</div><div class='add'>+	.sg_tablesize =		256,</div><div class='add'>+	.cmd_per_lun =		16,</div><div class='add'>+	.max_sectors =		0xffff,</div><div class='ctx'> 	.unchecked_isa_dma = 	0,</div><div class='del'>-	.use_clustering = 	DISABLE_CLUSTERING,</div><div class='add'>+	.use_clustering = 	ENABLE_CLUSTERING,</div><div class='ctx'> 	.module =		THIS_MODULE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -226,19 +237,32 @@ static struct device_driver sdebug_driverfs_driver = {</div><div class='ctx'> static const int check_condition_result =</div><div class='ctx'> 		(DRIVER_SENSE &lt;&lt; 24) | SAM_STAT_CHECK_CONDITION;</div><div class='ctx'> </div><div class='add'>+static unsigned char ctrl_m_pg[] = {0xa, 10, 2, 0, 0, 0, 0, 0,</div><div class='add'>+				    0, 0, 0x2, 0x4b};</div><div class='add'>+static unsigned char iec_m_pg[] = {0x1c, 0xa, 0x08, 0, 0, 0, 0, 0,</div><div class='add'>+			           0, 0, 0x0, 0x0};</div><div class='add'>+</div><div class='ctx'> /* function declarations */</div><div class='ctx'> static int resp_inquiry(struct scsi_cmnd * SCpnt, int target,</div><div class='ctx'> 			struct sdebug_dev_info * devip);</div><div class='ctx'> static int resp_requests(struct scsi_cmnd * SCpnt,</div><div class='ctx'> 			 struct sdebug_dev_info * devip);</div><div class='add'>+static int resp_start_stop(struct scsi_cmnd * scp,</div><div class='add'>+			   struct sdebug_dev_info * devip);</div><div class='ctx'> static int resp_readcap(struct scsi_cmnd * SCpnt,</div><div class='ctx'> 			struct sdebug_dev_info * devip);</div><div class='del'>-static int resp_mode_sense(struct scsi_cmnd * SCpnt, int target,</div><div class='add'>+static int resp_readcap16(struct scsi_cmnd * SCpnt,</div><div class='add'>+			  struct sdebug_dev_info * devip);</div><div class='add'>+static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 			   struct sdebug_dev_info * devip);</div><div class='del'>-static int resp_read(struct scsi_cmnd * SCpnt, int upper_blk, int block,</div><div class='del'>-		     int num, struct sdebug_dev_info * devip);</div><div class='del'>-static int resp_write(struct scsi_cmnd * SCpnt, int upper_blk, int block,</div><div class='del'>-		      int num, struct sdebug_dev_info * devip);</div><div class='add'>+static int resp_mode_select(struct scsi_cmnd * scp, int mselect6,</div><div class='add'>+			    struct sdebug_dev_info * devip);</div><div class='add'>+static int resp_log_sense(struct scsi_cmnd * scp,</div><div class='add'>+			  struct sdebug_dev_info * devip);</div><div class='add'>+static int resp_read(struct scsi_cmnd * SCpnt, unsigned long long lba,</div><div class='add'>+		     unsigned int num, struct sdebug_dev_info * devip);</div><div class='add'>+static int resp_write(struct scsi_cmnd * SCpnt, unsigned long long lba,</div><div class='add'>+		      unsigned int num, struct sdebug_dev_info * devip);</div><div class='ctx'> static int resp_report_luns(struct scsi_cmnd * SCpnt,</div><div class='ctx'> 			    struct sdebug_dev_info * devip);</div><div class='ctx'> static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,</div><div class='hunk'>@@ -249,8 +273,8 @@ static void timer_intr_handler(unsigned long);</div><div class='ctx'> static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev);</div><div class='ctx'> static void mk_sense_buffer(struct sdebug_dev_info * devip, int key,</div><div class='ctx'> 			    int asc, int asq);</div><div class='del'>-static int check_reset(struct scsi_cmnd * SCpnt,</div><div class='del'>-		       struct sdebug_dev_info * devip);</div><div class='add'>+static int check_readiness(struct scsi_cmnd * SCpnt, int reset_only,</div><div class='add'>+			   struct sdebug_dev_info * devip);</div><div class='ctx'> static int schedule_resp(struct scsi_cmnd * cmnd,</div><div class='ctx'> 			 struct sdebug_dev_info * devip,</div><div class='ctx'> 			 done_funct_t done, int scsi_result, int delta_jiff);</div><div class='hunk'>@@ -258,8 +282,10 @@ static void __init sdebug_build_parts(unsigned char * ramp);</div><div class='ctx'> static void __init init_all_queued(void);</div><div class='ctx'> static void stop_all_queued(void);</div><div class='ctx'> static int stop_queued_cmnd(struct scsi_cmnd * cmnd);</div><div class='del'>-static int inquiry_evpd_83(unsigned char * arr, int dev_id_num,</div><div class='del'>-                           const char * dev_id_str, int dev_id_str_len);</div><div class='add'>+static int inquiry_evpd_83(unsigned char * arr, int target_dev_id,</div><div class='add'>+			   int dev_id_num, const char * dev_id_str,</div><div class='add'>+			   int dev_id_str_len);</div><div class='add'>+static int inquiry_evpd_88(unsigned char * arr, int target_dev_id);</div><div class='ctx'> static void do_create_driverfs_files(void);</div><div class='ctx'> static void do_remove_driverfs_files(void);</div><div class='ctx'> </div><div class='hunk'>@@ -275,18 +301,22 @@ static</div><div class='ctx'> int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *cmd = (unsigned char *) SCpnt-&gt;cmnd;</div><div class='del'>-	int block, upper_blk, num, k;</div><div class='add'>+	int len, k, j;</div><div class='add'>+	unsigned int num;</div><div class='add'>+	unsigned long long lba;</div><div class='ctx'> 	int errsts = 0;</div><div class='del'>-	int target = scmd_id(SCpnt);</div><div class='add'>+	int target = SCpnt-&gt;device-&gt;id;</div><div class='ctx'> 	struct sdebug_dev_info * devip = NULL;</div><div class='ctx'> 	int inj_recovered = 0;</div><div class='add'>+	int delay_override = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (done == NULL)</div><div class='ctx'> 		return 0;	/* assume mid level reprocessing command */</div><div class='ctx'> </div><div class='add'>+	SCpnt-&gt;resid = 0;</div><div class='ctx'> 	if ((SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts) &amp;&amp; cmd) {</div><div class='ctx'> 		printk(KERN_INFO "scsi_debug: cmd ");</div><div class='del'>-		for (k = 0, num = SCpnt-&gt;cmd_len; k &lt; num; ++k)</div><div class='add'>+		for (k = 0, len = SCpnt-&gt;cmd_len; k &lt; len; ++k)</div><div class='ctx'> 			printk("%02x ", (int)cmd[k]);</div><div class='ctx'> 		printk("\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -297,7 +327,8 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)</div><div class='ctx'> 				     DID_NO_CONNECT &lt;&lt; 16, 0);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-	if (SCpnt-&gt;device-&gt;lun &gt;= scsi_debug_max_luns)</div><div class='add'>+	if ((SCpnt-&gt;device-&gt;lun &gt;= scsi_debug_max_luns) &amp;&amp;</div><div class='add'>+	    (SCpnt-&gt;device-&gt;lun != SAM2_WLUN_REPORT_LUNS))</div><div class='ctx'> 		return schedule_resp(SCpnt, NULL, done,</div><div class='ctx'> 				     DID_NO_CONNECT &lt;&lt; 16, 0);</div><div class='ctx'> 	devip = devInfoReg(SCpnt-&gt;device);</div><div class='hunk'>@@ -316,118 +347,150 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)</div><div class='ctx'> 			inj_recovered = 1; /* to reads and writes below */</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='add'>+	if (devip-&gt;wlun) {</div><div class='add'>+		switch (*cmd) {</div><div class='add'>+		case INQUIRY:</div><div class='add'>+		case REQUEST_SENSE:</div><div class='add'>+		case TEST_UNIT_READY:</div><div class='add'>+		case REPORT_LUNS:</div><div class='add'>+			break;  /* only allowable wlun commands */</div><div class='add'>+		default:</div><div class='add'>+			if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='add'>+				printk(KERN_INFO "scsi_debug: Opcode: 0x%x "</div><div class='add'>+				       "not supported for wlun\n", *cmd);</div><div class='add'>+			mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+					INVALID_OPCODE, 0);</div><div class='add'>+			errsts = check_condition_result;</div><div class='add'>+			return schedule_resp(SCpnt, devip, done, errsts,</div><div class='add'>+					     0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (*cmd) {</div><div class='ctx'> 	case INQUIRY:     /* mandatory, ignore unit attention */</div><div class='add'>+		delay_override = 1;</div><div class='ctx'> 		errsts = resp_inquiry(SCpnt, target, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REQUEST_SENSE:	/* mandatory, ignore unit attention */</div><div class='add'>+		delay_override = 1;</div><div class='ctx'> 		errsts = resp_requests(SCpnt, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REZERO_UNIT:	/* actually this is REWIND for SSC */</div><div class='ctx'> 	case START_STOP:</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = resp_start_stop(SCpnt, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ALLOW_MEDIUM_REMOVAL:</div><div class='del'>-		if ((errsts = check_reset(SCpnt, devip)))</div><div class='add'>+		if ((errsts = check_readiness(SCpnt, 1, devip)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='ctx'> 			printk(KERN_INFO "scsi_debug: Medium removal %s\n",</div><div class='ctx'> 			        cmd[4] ? "inhibited" : "enabled");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEND_DIAGNOSTIC:     /* mandatory */</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = check_readiness(SCpnt, 1, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TEST_UNIT_READY:     /* mandatory */</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		delay_override = 1;</div><div class='add'>+		errsts = check_readiness(SCpnt, 0, devip);</div><div class='ctx'> 		break;</div><div class='ctx'>         case RESERVE:</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = check_readiness(SCpnt, 1, devip);</div><div class='ctx'>                 break;</div><div class='ctx'>         case RESERVE_10:</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = check_readiness(SCpnt, 1, devip);</div><div class='ctx'>                 break;</div><div class='ctx'>         case RELEASE:</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = check_readiness(SCpnt, 1, devip);</div><div class='ctx'>                 break;</div><div class='ctx'>         case RELEASE_10:</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = check_readiness(SCpnt, 1, devip);</div><div class='ctx'>                 break;</div><div class='ctx'> 	case READ_CAPACITY:</div><div class='ctx'> 		errsts = resp_readcap(SCpnt, devip);</div><div class='ctx'> 		break;</div><div class='add'>+	case SERVICE_ACTION_IN:</div><div class='add'>+		if (SAI_READ_CAPACITY_16 != cmd[1]) {</div><div class='add'>+			mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+					INVALID_OPCODE, 0);</div><div class='add'>+			errsts = check_condition_result;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		errsts = resp_readcap16(SCpnt, devip);</div><div class='add'>+		break;</div><div class='ctx'> 	case READ_16:</div><div class='ctx'> 	case READ_12:</div><div class='ctx'> 	case READ_10:</div><div class='ctx'> 	case READ_6:</div><div class='del'>-		if ((errsts = check_reset(SCpnt, devip)))</div><div class='add'>+		if ((errsts = check_readiness(SCpnt, 0, devip)))</div><div class='ctx'> 			break;</div><div class='del'>-		upper_blk = 0;</div><div class='ctx'> 		if ((*cmd) == READ_16) {</div><div class='del'>-			upper_blk = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='del'>-				    (cmd[3] &lt;&lt; 16) + (cmd[2] &lt;&lt; 24);</div><div class='del'>-			block = cmd[9] + (cmd[8] &lt;&lt; 8) +</div><div class='del'>-				(cmd[7] &lt;&lt; 16) + (cmd[6] &lt;&lt; 24);</div><div class='add'>+			for (lba = 0, j = 0; j &lt; 8; ++j) {</div><div class='add'>+				if (j &gt; 0)</div><div class='add'>+					lba &lt;&lt;= 8;</div><div class='add'>+				lba += cmd[2 + j];</div><div class='add'>+			}</div><div class='ctx'> 			num = cmd[13] + (cmd[12] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[11] &lt;&lt; 16) + (cmd[10] &lt;&lt; 24);</div><div class='ctx'> 		} else if ((*cmd) == READ_12) {</div><div class='del'>-			block = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='add'>+			lba = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[3] &lt;&lt; 16) + (cmd[2] &lt;&lt; 24);</div><div class='ctx'> 			num = cmd[9] + (cmd[8] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[7] &lt;&lt; 16) + (cmd[6] &lt;&lt; 24);</div><div class='ctx'> 		} else if ((*cmd) == READ_10) {</div><div class='del'>-			block = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='add'>+			lba = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[3] &lt;&lt; 16) + (cmd[2] &lt;&lt; 24);</div><div class='ctx'> 			num = cmd[8] + (cmd[7] &lt;&lt; 8);</div><div class='del'>-		} else {</div><div class='del'>-			block = cmd[3] + (cmd[2] &lt;&lt; 8) +</div><div class='add'>+		} else {	/* READ (6) */</div><div class='add'>+			lba = cmd[3] + (cmd[2] &lt;&lt; 8) +</div><div class='ctx'> 				((cmd[1] &amp; 0x1f) &lt;&lt; 16);</div><div class='del'>-			num = cmd[4];</div><div class='add'>+			num = (0 == cmd[4]) ? 256 : cmd[4];</div><div class='ctx'> 		}</div><div class='del'>-		errsts = resp_read(SCpnt, upper_blk, block, num, devip);</div><div class='add'>+		errsts = resp_read(SCpnt, lba, num, devip);</div><div class='ctx'> 		if (inj_recovered &amp;&amp; (0 == errsts)) {</div><div class='ctx'> 			mk_sense_buffer(devip, RECOVERED_ERROR,</div><div class='del'>-					THRESHHOLD_EXCEEDED, 0);</div><div class='add'>+					THRESHOLD_EXCEEDED, 0);</div><div class='ctx'> 			errsts = check_condition_result;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case REPORT_LUNS:	/* mandatory, ignore unit attention */</div><div class='add'>+		delay_override = 1;</div><div class='ctx'> 		errsts = resp_report_luns(SCpnt, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VERIFY:		/* 10 byte SBC-2 command */</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		errsts = check_readiness(SCpnt, 0, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case WRITE_16:</div><div class='ctx'> 	case WRITE_12:</div><div class='ctx'> 	case WRITE_10:</div><div class='ctx'> 	case WRITE_6:</div><div class='del'>-		if ((errsts = check_reset(SCpnt, devip)))</div><div class='add'>+		if ((errsts = check_readiness(SCpnt, 0, devip)))</div><div class='ctx'> 			break;</div><div class='del'>-		upper_blk = 0;</div><div class='ctx'> 		if ((*cmd) == WRITE_16) {</div><div class='del'>-			upper_blk = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='del'>-				    (cmd[3] &lt;&lt; 16) + (cmd[2] &lt;&lt; 24);</div><div class='del'>-			block = cmd[9] + (cmd[8] &lt;&lt; 8) +</div><div class='del'>-				(cmd[7] &lt;&lt; 16) + (cmd[6] &lt;&lt; 24);</div><div class='add'>+			for (lba = 0, j = 0; j &lt; 8; ++j) {</div><div class='add'>+				if (j &gt; 0)</div><div class='add'>+					lba &lt;&lt;= 8;</div><div class='add'>+				lba += cmd[2 + j];</div><div class='add'>+			}</div><div class='ctx'> 			num = cmd[13] + (cmd[12] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[11] &lt;&lt; 16) + (cmd[10] &lt;&lt; 24);</div><div class='ctx'> 		} else if ((*cmd) == WRITE_12) {</div><div class='del'>-			block = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='add'>+			lba = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[3] &lt;&lt; 16) + (cmd[2] &lt;&lt; 24);</div><div class='ctx'> 			num = cmd[9] + (cmd[8] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[7] &lt;&lt; 16) + (cmd[6] &lt;&lt; 24);</div><div class='ctx'> 		} else if ((*cmd) == WRITE_10) {</div><div class='del'>-			block = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='add'>+			lba = cmd[5] + (cmd[4] &lt;&lt; 8) +</div><div class='ctx'> 				(cmd[3] &lt;&lt; 16) + (cmd[2] &lt;&lt; 24);</div><div class='ctx'> 			num = cmd[8] + (cmd[7] &lt;&lt; 8);</div><div class='del'>-		} else {</div><div class='del'>-			block = cmd[3] + (cmd[2] &lt;&lt; 8) +</div><div class='add'>+		} else {	/* WRITE (6) */</div><div class='add'>+			lba = cmd[3] + (cmd[2] &lt;&lt; 8) +</div><div class='ctx'> 				((cmd[1] &amp; 0x1f) &lt;&lt; 16);</div><div class='del'>-			num = cmd[4];</div><div class='add'>+			num = (0 == cmd[4]) ? 256 : cmd[4];</div><div class='ctx'> 		}</div><div class='del'>-		errsts = resp_write(SCpnt, upper_blk, block, num, devip);</div><div class='add'>+		errsts = resp_write(SCpnt, lba, num, devip);</div><div class='ctx'> 		if (inj_recovered &amp;&amp; (0 == errsts)) {</div><div class='ctx'> 			mk_sense_buffer(devip, RECOVERED_ERROR,</div><div class='del'>-					THRESHHOLD_EXCEEDED, 0);</div><div class='add'>+					THRESHOLD_EXCEEDED, 0);</div><div class='ctx'> 			errsts = check_condition_result;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -435,20 +498,31 @@ int scsi_debug_queuecommand(struct scsi_cmnd * SCpnt, done_funct_t done)</div><div class='ctx'> 	case MODE_SENSE_10:</div><div class='ctx'> 		errsts = resp_mode_sense(SCpnt, target, devip);</div><div class='ctx'> 		break;</div><div class='add'>+	case MODE_SELECT:</div><div class='add'>+		errsts = resp_mode_select(SCpnt, 1, devip);</div><div class='add'>+		break;</div><div class='add'>+	case MODE_SELECT_10:</div><div class='add'>+		errsts = resp_mode_select(SCpnt, 0, devip);</div><div class='add'>+		break;</div><div class='add'>+	case LOG_SENSE:</div><div class='add'>+		errsts = resp_log_sense(SCpnt, devip);</div><div class='add'>+		break;</div><div class='ctx'> 	case SYNCHRONIZE_CACHE:</div><div class='del'>-		errsts = check_reset(SCpnt, devip);</div><div class='add'>+		delay_override = 1;</div><div class='add'>+		errsts = check_readiness(SCpnt, 0, devip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='ctx'> 			printk(KERN_INFO "scsi_debug: Opcode: 0x%x not "</div><div class='ctx'> 			       "supported\n", *cmd);</div><div class='del'>-		if ((errsts = check_reset(SCpnt, devip)))</div><div class='add'>+		if ((errsts = check_readiness(SCpnt, 1, devip)))</div><div class='ctx'> 			break;	/* Unit attention takes precedence */</div><div class='ctx'> 		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_OPCODE, 0);</div><div class='ctx'> 		errsts = check_condition_result;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return schedule_resp(SCpnt, devip, done, errsts, scsi_debug_delay);</div><div class='add'>+	return schedule_resp(SCpnt, devip, done, errsts,</div><div class='add'>+			     (delay_override ? 0 : scsi_debug_delay));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int scsi_debug_ioctl(struct scsi_device *dev, int cmd, void __user *arg)</div><div class='hunk'>@@ -460,7 +534,8 @@ static int scsi_debug_ioctl(struct scsi_device *dev, int cmd, void __user *arg)</div><div class='ctx'> 	/* return -ENOTTY; // correct return but upsets fdisk */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int check_reset(struct scsi_cmnd * SCpnt, struct sdebug_dev_info * devip)</div><div class='add'>+static int check_readiness(struct scsi_cmnd * SCpnt, int reset_only,</div><div class='add'>+			   struct sdebug_dev_info * devip)</div><div class='ctx'> {</div><div class='ctx'> 	if (devip-&gt;reset) {</div><div class='ctx'> 		if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='hunk'>@@ -470,6 +545,14 @@ static int check_reset(struct scsi_cmnd * SCpnt, struct sdebug_dev_info * devip)</div><div class='ctx'> 		mk_sense_buffer(devip, UNIT_ATTENTION, POWERON_RESET, 0);</div><div class='ctx'> 		return check_condition_result;</div><div class='ctx'> 	}</div><div class='add'>+	if ((0 == reset_only) &amp;&amp; devip-&gt;stopped) {</div><div class='add'>+		if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='add'>+			printk(KERN_INFO "scsi_debug: Reporting Not "</div><div class='add'>+			       "ready: initializing command required\n");</div><div class='add'>+		mk_sense_buffer(devip, NOT_READY, LOGICAL_UNIT_NOT_READY,</div><div class='add'>+				0x2);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -493,7 +576,10 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,</div><div class='ctx'> 		req_len = scp-&gt;request_bufflen;</div><div class='ctx'> 		act_len = (req_len &lt; arr_len) ? req_len : arr_len;</div><div class='ctx'> 		memcpy(scp-&gt;request_buffer, arr, act_len);</div><div class='del'>-		scp-&gt;resid = req_len - act_len;</div><div class='add'>+		if (scp-&gt;resid)</div><div class='add'>+			scp-&gt;resid -= act_len;</div><div class='add'>+		else</div><div class='add'>+			scp-&gt;resid = req_len - act_len;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	sgpnt = (struct scatterlist *)scp-&gt;request_buffer;</div><div class='hunk'>@@ -516,7 +602,10 @@ static int fill_from_dev_buffer(struct scsi_cmnd * scp, unsigned char * arr,</div><div class='ctx'> 		}</div><div class='ctx'> 		req_len += sgpnt-&gt;length;</div><div class='ctx'> 	}</div><div class='del'>-	scp-&gt;resid = req_len - act_len;</div><div class='add'>+	if (scp-&gt;resid)</div><div class='add'>+		scp-&gt;resid -= act_len;</div><div class='add'>+	else</div><div class='add'>+		scp-&gt;resid = req_len - act_len;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -567,12 +656,14 @@ static const char * inq_vendor_id = "Linux   ";</div><div class='ctx'> static const char * inq_product_id = "scsi_debug      ";</div><div class='ctx'> static const char * inq_product_rev = "0004";</div><div class='ctx'> </div><div class='del'>-static int inquiry_evpd_83(unsigned char * arr, int dev_id_num,</div><div class='del'>-			   const char * dev_id_str, int dev_id_str_len)</div><div class='add'>+static int inquiry_evpd_83(unsigned char * arr, int target_dev_id,</div><div class='add'>+			   int dev_id_num, const char * dev_id_str,</div><div class='add'>+			   int dev_id_str_len)</div><div class='ctx'> {</div><div class='del'>-	int num;</div><div class='add'>+	int num, port_a;</div><div class='add'>+	char b[32];</div><div class='ctx'> </div><div class='del'>-	/* Two identification descriptors: */</div><div class='add'>+	port_a = target_dev_id + 1;</div><div class='ctx'> 	/* T10 vendor identifier field format (faked) */</div><div class='ctx'> 	arr[0] = 0x2;	/* ASCII */</div><div class='ctx'> 	arr[1] = 0x1;</div><div class='hunk'>@@ -583,25 +674,246 @@ static int inquiry_evpd_83(unsigned char * arr, int dev_id_num,</div><div class='ctx'> 	num = 8 + 16 + dev_id_str_len;</div><div class='ctx'> 	arr[3] = num;</div><div class='ctx'> 	num += 4;</div><div class='del'>-	/* NAA IEEE registered identifier (faked) */</div><div class='del'>-	arr[num] = 0x1;	/* binary */</div><div class='del'>-	arr[num + 1] = 0x3;</div><div class='del'>-	arr[num + 2] = 0x0;</div><div class='del'>-	arr[num + 3] = 0x8;</div><div class='del'>-	arr[num + 4] = 0x51;	/* ieee company id=0x123456 (faked) */</div><div class='del'>-	arr[num + 5] = 0x23;</div><div class='del'>-	arr[num + 6] = 0x45;</div><div class='del'>-	arr[num + 7] = 0x60;</div><div class='del'>-	arr[num + 8] = (dev_id_num &gt;&gt; 24);</div><div class='del'>-	arr[num + 9] = (dev_id_num &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	arr[num + 10] = (dev_id_num &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	arr[num + 11] = dev_id_num &amp; 0xff;</div><div class='del'>-	return num + 12;</div><div class='add'>+	if (dev_id_num &gt;= 0) {</div><div class='add'>+		/* NAA-5, Logical unit identifier (binary) */</div><div class='add'>+		arr[num++] = 0x1;	/* binary (not necessarily sas) */</div><div class='add'>+		arr[num++] = 0x3;	/* PIV=0, lu, naa */</div><div class='add'>+		arr[num++] = 0x0;</div><div class='add'>+		arr[num++] = 0x8;</div><div class='add'>+		arr[num++] = 0x53;  /* naa-5 ieee company id=0x333333 (fake) */</div><div class='add'>+		arr[num++] = 0x33;</div><div class='add'>+		arr[num++] = 0x33;</div><div class='add'>+		arr[num++] = 0x30;</div><div class='add'>+		arr[num++] = (dev_id_num &gt;&gt; 24);</div><div class='add'>+		arr[num++] = (dev_id_num &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		arr[num++] = (dev_id_num &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		arr[num++] = dev_id_num &amp; 0xff;</div><div class='add'>+		/* Target relative port number */</div><div class='add'>+		arr[num++] = 0x61;	/* proto=sas, binary */</div><div class='add'>+		arr[num++] = 0x94;	/* PIV=1, target port, rel port */</div><div class='add'>+		arr[num++] = 0x0;	/* reserved */</div><div class='add'>+		arr[num++] = 0x4;	/* length */</div><div class='add'>+		arr[num++] = 0x0;	/* reserved */</div><div class='add'>+		arr[num++] = 0x0;	/* reserved */</div><div class='add'>+		arr[num++] = 0x0;</div><div class='add'>+		arr[num++] = 0x1;	/* relative port A */</div><div class='add'>+	}</div><div class='add'>+	/* NAA-5, Target port identifier */</div><div class='add'>+	arr[num++] = 0x61;	/* proto=sas, binary */</div><div class='add'>+	arr[num++] = 0x93;	/* piv=1, target port, naa */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 0x8;</div><div class='add'>+	arr[num++] = 0x52;	/* naa-5, company id=0x222222 (fake) */</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x20;</div><div class='add'>+	arr[num++] = (port_a &gt;&gt; 24);</div><div class='add'>+	arr[num++] = (port_a &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	arr[num++] = (port_a &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	arr[num++] = port_a &amp; 0xff;</div><div class='add'>+	/* NAA-5, Target device identifier */</div><div class='add'>+	arr[num++] = 0x61;	/* proto=sas, binary */</div><div class='add'>+	arr[num++] = 0xa3;	/* piv=1, target device, naa */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 0x8;</div><div class='add'>+	arr[num++] = 0x52;	/* naa-5, company id=0x222222 (fake) */</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x20;</div><div class='add'>+	arr[num++] = (target_dev_id &gt;&gt; 24);</div><div class='add'>+	arr[num++] = (target_dev_id &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	arr[num++] = (target_dev_id &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	arr[num++] = target_dev_id &amp; 0xff;</div><div class='add'>+	/* SCSI name string: Target device identifier */</div><div class='add'>+	arr[num++] = 0x63;	/* proto=sas, UTF-8 */</div><div class='add'>+	arr[num++] = 0xa8;	/* piv=1, target device, SCSI name string */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 24;</div><div class='add'>+	memcpy(arr + num, "naa.52222220", 12);</div><div class='add'>+	num += 12;</div><div class='add'>+	snprintf(b, sizeof(b), "%08X", target_dev_id);</div><div class='add'>+	memcpy(arr + num, b, 8);</div><div class='add'>+	num += 8;</div><div class='add'>+	memset(arr + num, 0, 4);</div><div class='add'>+	num += 4;</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned char vpd84_data[] = {</div><div class='add'>+/* from 4th byte */ 0x22,0x22,0x22,0x0,0xbb,0x0,</div><div class='add'>+    0x22,0x22,0x22,0x0,0xbb,0x1,</div><div class='add'>+    0x22,0x22,0x22,0x0,0xbb,0x2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int inquiry_evpd_84(unsigned char * arr)</div><div class='add'>+{</div><div class='add'>+	memcpy(arr, vpd84_data, sizeof(vpd84_data));</div><div class='add'>+	return sizeof(vpd84_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inquiry_evpd_85(unsigned char * arr)</div><div class='add'>+{</div><div class='add'>+	int num = 0;</div><div class='add'>+	const char * na1 = "https://www.kernel.org/config";</div><div class='add'>+	const char * na2 = "http://www.kernel.org/log";</div><div class='add'>+	int plen, olen;</div><div class='add'>+</div><div class='add'>+	arr[num++] = 0x1;	/* lu, storage config */</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	olen = strlen(na1);</div><div class='add'>+	plen = olen + 1;</div><div class='add'>+	if (plen % 4)</div><div class='add'>+		plen = ((plen / 4) + 1) * 4;</div><div class='add'>+	arr[num++] = plen;	/* length, null termianted, padded */</div><div class='add'>+	memcpy(arr + num, na1, olen);</div><div class='add'>+	memset(arr + num + olen, 0, plen - olen);</div><div class='add'>+	num += plen;</div><div class='add'>+</div><div class='add'>+	arr[num++] = 0x4;	/* lu, logging */</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	olen = strlen(na2);</div><div class='add'>+	plen = olen + 1;</div><div class='add'>+	if (plen % 4)</div><div class='add'>+		plen = ((plen / 4) + 1) * 4;</div><div class='add'>+	arr[num++] = plen;	/* length, null terminated, padded */</div><div class='add'>+	memcpy(arr + num, na2, olen);</div><div class='add'>+	memset(arr + num + olen, 0, plen - olen);</div><div class='add'>+	num += plen;</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SCSI ports VPD page */</div><div class='add'>+static int inquiry_evpd_88(unsigned char * arr, int target_dev_id)</div><div class='add'>+{</div><div class='add'>+	int num = 0;</div><div class='add'>+	int port_a, port_b;</div><div class='add'>+</div><div class='add'>+	port_a = target_dev_id + 1;</div><div class='add'>+	port_b = port_a + 1;</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 0x1;	/* relative port 1 (primary) */</div><div class='add'>+	memset(arr + num, 0, 6);</div><div class='add'>+	num += 6;</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 12;	/* length tp descriptor */</div><div class='add'>+	/* naa-5 target port identifier (A) */</div><div class='add'>+	arr[num++] = 0x61;	/* proto=sas, binary */</div><div class='add'>+	arr[num++] = 0x93;	/* PIV=1, target port, NAA */</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x8;	/* length */</div><div class='add'>+	arr[num++] = 0x52;	/* NAA-5, company_id=0x222222 (fake) */</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x20;</div><div class='add'>+	arr[num++] = (port_a &gt;&gt; 24);</div><div class='add'>+	arr[num++] = (port_a &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	arr[num++] = (port_a &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	arr[num++] = port_a &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 0x2;	/* relative port 2 (secondary) */</div><div class='add'>+	memset(arr + num, 0, 6);</div><div class='add'>+	num += 6;</div><div class='add'>+	arr[num++] = 0x0;</div><div class='add'>+	arr[num++] = 12;	/* length tp descriptor */</div><div class='add'>+	/* naa-5 target port identifier (B) */</div><div class='add'>+	arr[num++] = 0x61;	/* proto=sas, binary */</div><div class='add'>+	arr[num++] = 0x93;	/* PIV=1, target port, NAA */</div><div class='add'>+	arr[num++] = 0x0;	/* reserved */</div><div class='add'>+	arr[num++] = 0x8;	/* length */</div><div class='add'>+	arr[num++] = 0x52;	/* NAA-5, company_id=0x222222 (fake) */</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x22;</div><div class='add'>+	arr[num++] = 0x20;</div><div class='add'>+	arr[num++] = (port_b &gt;&gt; 24);</div><div class='add'>+	arr[num++] = (port_b &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	arr[num++] = (port_b &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	arr[num++] = port_b &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned char vpd89_data[] = {</div><div class='add'>+/* from 4th byte */ 0,0,0,0,</div><div class='add'>+'l','i','n','u','x',' ',' ',' ',</div><div class='add'>+'S','A','T',' ','s','c','s','i','_','d','e','b','u','g',' ',' ',</div><div class='add'>+'1','2','3','4',</div><div class='add'>+0x34,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,</div><div class='add'>+0xec,0,0,0,</div><div class='add'>+0x5a,0xc,0xff,0x3f,0x37,0xc8,0x10,0,0,0,0,0,0x3f,0,0,0,</div><div class='add'>+0,0,0,0,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x20,0x20,0x20,0x20,</div><div class='add'>+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0,0,0,0x40,0x4,0,0x2e,0x33,</div><div class='add'>+0x38,0x31,0x20,0x20,0x20,0x20,0x54,0x53,0x38,0x33,0x30,0x30,0x33,0x31,</div><div class='add'>+0x53,0x41,</div><div class='add'>+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,</div><div class='add'>+0x20,0x20,</div><div class='add'>+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,</div><div class='add'>+0x10,0x80,</div><div class='add'>+0,0,0,0x2f,0,0,0,0x2,0,0x2,0x7,0,0xff,0xff,0x1,0,</div><div class='add'>+0x3f,0,0xc1,0xff,0x3e,0,0x10,0x1,0xb0,0xf8,0x50,0x9,0,0,0x7,0,</div><div class='add'>+0x3,0,0x78,0,0x78,0,0xf0,0,0x78,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0,0,</div><div class='add'>+0x7e,0,0x1b,0,0x6b,0x34,0x1,0x7d,0x3,0x40,0x69,0x34,0x1,0x3c,0x3,0x40,</div><div class='add'>+0x7f,0x40,0,0,0,0,0xfe,0xfe,0,0,0,0,0,0xfe,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0xb0,0xf8,0x50,0x9,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0x1,0,0xb0,0xf8,0x50,0x9,0xb0,0xf8,0x50,0x9,0x20,0x20,0x2,0,0xb6,0x42,</div><div class='add'>+0,0x80,0x8a,0,0x6,0x3c,0xa,0x3c,0xff,0xff,0xc6,0x7,0,0x1,0,0x8,</div><div class='add'>+0xf0,0xf,0,0x10,0x2,0,0x30,0,0,0,0,0,0,0,0x6,0xfe,</div><div class='add'>+0,0,0x2,0,0x50,0,0x8a,0,0x4f,0x95,0,0,0x21,0,0xb,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='add'>+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0xa5,0x51,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int inquiry_evpd_89(unsigned char * arr)</div><div class='add'>+{</div><div class='add'>+	memcpy(arr, vpd89_data, sizeof(vpd89_data));</div><div class='add'>+	return sizeof(vpd89_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static unsigned char vpdb0_data[] = {</div><div class='add'>+	/* from 4th byte */ 0,0,0,4,</div><div class='add'>+	0,0,0x4,0,</div><div class='add'>+	0,0,0,64,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int inquiry_evpd_b0(unsigned char * arr)</div><div class='add'>+{</div><div class='add'>+	memcpy(arr, vpdb0_data, sizeof(vpdb0_data));</div><div class='add'>+	if (sdebug_store_sectors &gt; 0x400) {</div><div class='add'>+		arr[4] = (sdebug_store_sectors &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		arr[5] = (sdebug_store_sectors &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		arr[6] = (sdebug_store_sectors &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		arr[7] = sdebug_store_sectors &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+	return sizeof(vpdb0_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define SDEBUG_LONG_INQ_SZ 96</div><div class='del'>-#define SDEBUG_MAX_INQ_ARR_SZ 128</div><div class='add'>+#define SDEBUG_MAX_INQ_ARR_SZ 584</div><div class='ctx'> </div><div class='ctx'> static int resp_inquiry(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 			struct sdebug_dev_info * devip)</div><div class='hunk'>@@ -609,64 +921,113 @@ static int resp_inquiry(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 	unsigned char pq_pdt;</div><div class='ctx'> 	unsigned char arr[SDEBUG_MAX_INQ_ARR_SZ];</div><div class='ctx'> 	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='del'>-	int alloc_len;</div><div class='add'>+	int alloc_len, n;</div><div class='ctx'> </div><div class='ctx'> 	alloc_len = (cmd[3] &lt;&lt; 8) + cmd[4];</div><div class='ctx'> 	memset(arr, 0, SDEBUG_MAX_INQ_ARR_SZ);</div><div class='del'>-	pq_pdt = (scsi_debug_ptype &amp; 0x1f);</div><div class='add'>+	if (devip-&gt;wlun)</div><div class='add'>+		pq_pdt = 0x1e;	/* present, wlun */</div><div class='add'>+	else if (scsi_debug_no_lun_0 &amp;&amp; (0 == devip-&gt;lun))</div><div class='add'>+		pq_pdt = 0x7f;	/* not present, no device type */</div><div class='add'>+	else</div><div class='add'>+		pq_pdt = (scsi_debug_ptype &amp; 0x1f);</div><div class='ctx'> 	arr[0] = pq_pdt;</div><div class='ctx'> 	if (0x2 &amp; cmd[1]) {  /* CMDDT bit set */</div><div class='ctx'> 		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,</div><div class='ctx'> 			       	0);</div><div class='ctx'> 		return check_condition_result;</div><div class='ctx'> 	} else if (0x1 &amp; cmd[1]) {  /* EVPD bit set */</div><div class='del'>-		int dev_id_num, len;</div><div class='del'>-		char dev_id_str[6];</div><div class='add'>+		int lu_id_num, target_dev_id, len;</div><div class='add'>+		char lu_id_str[6];</div><div class='add'>+		int host_no = devip-&gt;sdbg_host-&gt;shost-&gt;host_no;</div><div class='ctx'> 		</div><div class='del'>-		dev_id_num = ((devip-&gt;sdbg_host-&gt;shost-&gt;host_no + 1) * 2000) +</div><div class='del'>-			     (devip-&gt;target * 1000) + devip-&gt;lun;</div><div class='del'>-		len = scnprintf(dev_id_str, 6, "%d", dev_id_num);</div><div class='add'>+		lu_id_num = devip-&gt;wlun ? -1 : (((host_no + 1) * 2000) +</div><div class='add'>+			    (devip-&gt;target * 1000) + devip-&gt;lun);</div><div class='add'>+		target_dev_id = ((host_no + 1) * 2000) +</div><div class='add'>+				 (devip-&gt;target * 1000) - 3;</div><div class='add'>+		len = scnprintf(lu_id_str, 6, "%d", lu_id_num);</div><div class='ctx'> 		if (0 == cmd[2]) { /* supported vital product data pages */</div><div class='del'>-			arr[3] = 3;</div><div class='del'>-			arr[4] = 0x0; /* this page */</div><div class='del'>-			arr[5] = 0x80; /* unit serial number */</div><div class='del'>-			arr[6] = 0x83; /* device identification */</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			n = 4;</div><div class='add'>+			arr[n++] = 0x0;   /* this page */</div><div class='add'>+			arr[n++] = 0x80;  /* unit serial number */</div><div class='add'>+			arr[n++] = 0x83;  /* device identification */</div><div class='add'>+			arr[n++] = 0x84;  /* software interface ident. */</div><div class='add'>+			arr[n++] = 0x85;  /* management network addresses */</div><div class='add'>+			arr[n++] = 0x86;  /* extended inquiry */</div><div class='add'>+			arr[n++] = 0x87;  /* mode page policy */</div><div class='add'>+			arr[n++] = 0x88;  /* SCSI ports */</div><div class='add'>+			arr[n++] = 0x89;  /* ATA information */</div><div class='add'>+			arr[n++] = 0xb0;  /* Block limits (SBC) */</div><div class='add'>+			arr[3] = n - 4;	  /* number of supported VPD pages */</div><div class='ctx'> 		} else if (0x80 == cmd[2]) { /* unit serial number */</div><div class='del'>-			arr[1] = 0x80;</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='ctx'> 			arr[3] = len;</div><div class='del'>-			memcpy(&amp;arr[4], dev_id_str, len);</div><div class='add'>+			memcpy(&amp;arr[4], lu_id_str, len);</div><div class='ctx'> 		} else if (0x83 == cmd[2]) { /* device identification */</div><div class='del'>-			arr[1] = 0x83;</div><div class='del'>-			arr[3] = inquiry_evpd_83(&amp;arr[4], dev_id_num,</div><div class='del'>-						 dev_id_str, len);</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			arr[3] = inquiry_evpd_83(&amp;arr[4], target_dev_id,</div><div class='add'>+						 lu_id_num, lu_id_str, len);</div><div class='add'>+		} else if (0x84 == cmd[2]) { /* Software interface ident. */</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			arr[3] = inquiry_evpd_84(&amp;arr[4]);</div><div class='add'>+		} else if (0x85 == cmd[2]) { /* Management network addresses */</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			arr[3] = inquiry_evpd_85(&amp;arr[4]);</div><div class='add'>+		} else if (0x86 == cmd[2]) { /* extended inquiry */</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			arr[3] = 0x3c;	/* number of following entries */</div><div class='add'>+			arr[4] = 0x0;   /* no protection stuff */</div><div class='add'>+			arr[5] = 0x7;   /* head of q, ordered + simple q's */</div><div class='add'>+		} else if (0x87 == cmd[2]) { /* mode page policy */</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			arr[3] = 0x8;	/* number of following entries */</div><div class='add'>+			arr[4] = 0x2;	/* disconnect-reconnect mp */</div><div class='add'>+			arr[6] = 0x80;	/* mlus, shared */</div><div class='add'>+			arr[8] = 0x18;	 /* protocol specific lu */</div><div class='add'>+			arr[10] = 0x82;	 /* mlus, per initiator port */</div><div class='add'>+		} else if (0x88 == cmd[2]) { /* SCSI Ports */</div><div class='add'>+			arr[1] = cmd[2];	/*sanity */</div><div class='add'>+			arr[3] = inquiry_evpd_88(&amp;arr[4], target_dev_id);</div><div class='add'>+		} else if (0x89 == cmd[2]) { /* ATA information */</div><div class='add'>+			arr[1] = cmd[2];        /*sanity */</div><div class='add'>+			n = inquiry_evpd_89(&amp;arr[4]);</div><div class='add'>+			arr[2] = (n &gt;&gt; 8);</div><div class='add'>+			arr[3] = (n &amp; 0xff);</div><div class='add'>+		} else if (0xb0 == cmd[2]) { /* Block limits (SBC) */</div><div class='add'>+			arr[1] = cmd[2];        /*sanity */</div><div class='add'>+			arr[3] = inquiry_evpd_b0(&amp;arr[4]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Illegal request, invalid field in cdb */</div><div class='ctx'> 			mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='ctx'> 					INVALID_FIELD_IN_CDB, 0);</div><div class='ctx'> 			return check_condition_result;</div><div class='ctx'> 		}</div><div class='add'>+		len = min(((arr[2] &lt;&lt; 8) + arr[3]) + 4, alloc_len);</div><div class='ctx'> 		return fill_from_dev_buffer(scp, arr,</div><div class='del'>-			    min(alloc_len, SDEBUG_MAX_INQ_ARR_SZ));</div><div class='add'>+			    min(len, SDEBUG_MAX_INQ_ARR_SZ));</div><div class='ctx'> 	}</div><div class='ctx'> 	/* drops through here for a standard inquiry */</div><div class='ctx'> 	arr[1] = DEV_REMOVEABLE(target) ? 0x80 : 0;	/* Removable disk */</div><div class='ctx'> 	arr[2] = scsi_debug_scsi_level;</div><div class='ctx'> 	arr[3] = 2;    /* response_data_format==2 */</div><div class='ctx'> 	arr[4] = SDEBUG_LONG_INQ_SZ - 5;</div><div class='del'>-	arr[6] = 0x1; /* claim: ADDR16 */</div><div class='add'>+	arr[6] = 0x10; /* claim: MultiP */</div><div class='ctx'> 	/* arr[6] |= 0x40; ... claim: EncServ (enclosure services) */</div><div class='del'>-	arr[7] = 0x3a; /* claim: WBUS16, SYNC, LINKED + CMDQUE */</div><div class='add'>+	arr[7] = 0xa; /* claim: LINKED + CMDQUE */</div><div class='ctx'> 	memcpy(&amp;arr[8], inq_vendor_id, 8);</div><div class='ctx'> 	memcpy(&amp;arr[16], inq_product_id, 16);</div><div class='ctx'> 	memcpy(&amp;arr[32], inq_product_rev, 4);</div><div class='ctx'> 	/* version descriptors (2 bytes each) follow */</div><div class='del'>-	arr[58] = 0x0; arr[59] = 0x40; /* SAM-2 */</div><div class='del'>-	arr[60] = 0x3; arr[61] = 0x0;  /* SPC-3 */</div><div class='add'>+	arr[58] = 0x0; arr[59] = 0x77; /* SAM-3 ANSI */</div><div class='add'>+	arr[60] = 0x3; arr[61] = 0x14;  /* SPC-3 ANSI */</div><div class='add'>+	n = 62;</div><div class='ctx'> 	if (scsi_debug_ptype == 0) {</div><div class='del'>-		arr[62] = 0x1; arr[63] = 0x80; /* SBC */</div><div class='add'>+		arr[n++] = 0x3; arr[n++] = 0x3d; /* SBC-2 ANSI */</div><div class='ctx'> 	} else if (scsi_debug_ptype == 1) {</div><div class='del'>-		arr[62] = 0x2; arr[63] = 0x00; /* SSC */</div><div class='add'>+		arr[n++] = 0x3; arr[n++] = 0x60; /* SSC-2 no version */</div><div class='ctx'> 	}</div><div class='add'>+	arr[n++] = 0xc; arr[n++] = 0xf;  /* SAS-1.1 rev 10 */</div><div class='ctx'> 	return fill_from_dev_buffer(scp, arr,</div><div class='ctx'> 			    min(alloc_len, SDEBUG_LONG_INQ_SZ));</div><div class='ctx'> }</div><div class='hunk'>@@ -677,46 +1038,141 @@ static int resp_requests(struct scsi_cmnd * scp,</div><div class='ctx'> 	unsigned char * sbuff;</div><div class='ctx'> 	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='ctx'> 	unsigned char arr[SDEBUG_SENSE_LEN];</div><div class='add'>+	int want_dsense;</div><div class='ctx'> 	int len = 18;</div><div class='ctx'> </div><div class='del'>-	memset(arr, 0, SDEBUG_SENSE_LEN);</div><div class='add'>+	memset(arr, 0, sizeof(arr));</div><div class='ctx'> 	if (devip-&gt;reset == 1)</div><div class='del'>-		mk_sense_buffer(devip, 0, NO_ADDED_SENSE, 0);</div><div class='add'>+		mk_sense_buffer(devip, 0, NO_ADDITIONAL_SENSE, 0);</div><div class='add'>+	want_dsense = !!(cmd[1] &amp; 1) || scsi_debug_dsense;</div><div class='ctx'> 	sbuff = devip-&gt;sense_buff;</div><div class='del'>-	if ((cmd[1] &amp; 1) &amp;&amp; (! scsi_debug_dsense)) {</div><div class='del'>-		/* DESC bit set and sense_buff in fixed format */</div><div class='del'>-		arr[0] = 0x72;</div><div class='del'>-		arr[1] = sbuff[2];     /* sense key */</div><div class='del'>-		arr[2] = sbuff[12];    /* asc */</div><div class='del'>-		arr[3] = sbuff[13];    /* ascq */</div><div class='del'>-		len = 8;</div><div class='del'>-	} else</div><div class='add'>+	if ((iec_m_pg[2] &amp; 0x4) &amp;&amp; (6 == (iec_m_pg[3] &amp; 0xf))) {</div><div class='add'>+		if (want_dsense) {</div><div class='add'>+			arr[0] = 0x72;</div><div class='add'>+			arr[1] = 0x0;		/* NO_SENSE in sense_key */</div><div class='add'>+			arr[2] = THRESHOLD_EXCEEDED;</div><div class='add'>+			arr[3] = 0xff;		/* TEST set and MRIE==6 */</div><div class='add'>+		} else {</div><div class='add'>+			arr[0] = 0x70;</div><div class='add'>+			arr[2] = 0x0;		/* NO_SENSE in sense_key */</div><div class='add'>+			arr[7] = 0xa;   	/* 18 byte sense buffer */</div><div class='add'>+			arr[12] = THRESHOLD_EXCEEDED;</div><div class='add'>+			arr[13] = 0xff;		/* TEST set and MRIE==6 */</div><div class='add'>+		}</div><div class='add'>+	} else if (devip-&gt;stopped) {</div><div class='add'>+		if (want_dsense) {</div><div class='add'>+			arr[0] = 0x72;</div><div class='add'>+			arr[1] = 0x0;		/* NO_SENSE in sense_key */</div><div class='add'>+			arr[2] = LOW_POWER_COND_ON;</div><div class='add'>+			arr[3] = 0x0;		/* TEST set and MRIE==6 */</div><div class='add'>+		} else {</div><div class='add'>+			arr[0] = 0x70;</div><div class='add'>+			arr[2] = 0x0;		/* NO_SENSE in sense_key */</div><div class='add'>+			arr[7] = 0xa;   	/* 18 byte sense buffer */</div><div class='add'>+			arr[12] = LOW_POWER_COND_ON;</div><div class='add'>+			arr[13] = 0x0;		/* TEST set and MRIE==6 */</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='ctx'> 		memcpy(arr, sbuff, SDEBUG_SENSE_LEN);</div><div class='del'>-	mk_sense_buffer(devip, 0, NO_ADDED_SENSE, 0);</div><div class='add'>+		if ((cmd[1] &amp; 1) &amp;&amp; (! scsi_debug_dsense)) {</div><div class='add'>+			/* DESC bit set and sense_buff in fixed format */</div><div class='add'>+			memset(arr, 0, sizeof(arr));</div><div class='add'>+			arr[0] = 0x72;</div><div class='add'>+			arr[1] = sbuff[2];     /* sense key */</div><div class='add'>+			arr[2] = sbuff[12];    /* asc */</div><div class='add'>+			arr[3] = sbuff[13];    /* ascq */</div><div class='add'>+			len = 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mk_sense_buffer(devip, 0, NO_ADDITIONAL_SENSE, 0);</div><div class='ctx'> 	return fill_from_dev_buffer(scp, arr, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int resp_start_stop(struct scsi_cmnd * scp,</div><div class='add'>+			   struct sdebug_dev_info * devip)</div><div class='add'>+{</div><div class='add'>+	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='add'>+	int power_cond, errsts, start;</div><div class='add'>+</div><div class='add'>+	if ((errsts = check_readiness(scp, 1, devip)))</div><div class='add'>+		return errsts;</div><div class='add'>+	power_cond = (cmd[4] &amp; 0xf0) &gt;&gt; 4;</div><div class='add'>+	if (power_cond) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,</div><div class='add'>+			       	0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+	start = cmd[4] &amp; 1;</div><div class='add'>+	if (start == devip-&gt;stopped)</div><div class='add'>+		devip-&gt;stopped = !start;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define SDEBUG_READCAP_ARR_SZ 8</div><div class='ctx'> static int resp_readcap(struct scsi_cmnd * scp,</div><div class='ctx'> 			struct sdebug_dev_info * devip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char arr[SDEBUG_READCAP_ARR_SZ];</div><div class='del'>-	unsigned long capac;</div><div class='add'>+	unsigned int capac;</div><div class='ctx'> 	int errsts;</div><div class='ctx'> </div><div class='del'>-	if ((errsts = check_reset(scp, devip)))</div><div class='add'>+	if ((errsts = check_readiness(scp, 1, devip)))</div><div class='ctx'> 		return errsts;</div><div class='add'>+	/* following just in case virtual_gb changed */</div><div class='add'>+	if (scsi_debug_virtual_gb &gt; 0) {</div><div class='add'>+		sdebug_capacity = 2048 * 1024;</div><div class='add'>+		sdebug_capacity *= scsi_debug_virtual_gb;</div><div class='add'>+	} else</div><div class='add'>+		sdebug_capacity = sdebug_store_sectors;</div><div class='ctx'> 	memset(arr, 0, SDEBUG_READCAP_ARR_SZ);</div><div class='del'>-	capac = (unsigned long)sdebug_capacity - 1;</div><div class='del'>-	arr[0] = (capac &gt;&gt; 24);</div><div class='del'>-	arr[1] = (capac &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	arr[2] = (capac &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	arr[3] = capac &amp; 0xff;</div><div class='add'>+	if (sdebug_capacity &lt; 0xffffffff) {</div><div class='add'>+		capac = (unsigned int)sdebug_capacity - 1;</div><div class='add'>+		arr[0] = (capac &gt;&gt; 24);</div><div class='add'>+		arr[1] = (capac &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		arr[2] = (capac &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		arr[3] = capac &amp; 0xff;</div><div class='add'>+	} else {</div><div class='add'>+		arr[0] = 0xff;</div><div class='add'>+		arr[1] = 0xff;</div><div class='add'>+		arr[2] = 0xff;</div><div class='add'>+		arr[3] = 0xff;</div><div class='add'>+	}</div><div class='ctx'> 	arr[6] = (SECT_SIZE_PER(target) &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	arr[7] = SECT_SIZE_PER(target) &amp; 0xff;</div><div class='ctx'> 	return fill_from_dev_buffer(scp, arr, SDEBUG_READCAP_ARR_SZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define SDEBUG_READCAP16_ARR_SZ 32</div><div class='add'>+static int resp_readcap16(struct scsi_cmnd * scp,</div><div class='add'>+			  struct sdebug_dev_info * devip)</div><div class='add'>+{</div><div class='add'>+	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='add'>+	unsigned char arr[SDEBUG_READCAP16_ARR_SZ];</div><div class='add'>+	unsigned long long capac;</div><div class='add'>+	int errsts, k, alloc_len;</div><div class='add'>+</div><div class='add'>+	if ((errsts = check_readiness(scp, 1, devip)))</div><div class='add'>+		return errsts;</div><div class='add'>+	alloc_len = ((cmd[10] &lt;&lt; 24) + (cmd[11] &lt;&lt; 16) + (cmd[12] &lt;&lt; 8)</div><div class='add'>+		     + cmd[13]);</div><div class='add'>+	/* following just in case virtual_gb changed */</div><div class='add'>+	if (scsi_debug_virtual_gb &gt; 0) {</div><div class='add'>+		sdebug_capacity = 2048 * 1024;</div><div class='add'>+		sdebug_capacity *= scsi_debug_virtual_gb;</div><div class='add'>+	} else</div><div class='add'>+		sdebug_capacity = sdebug_store_sectors;</div><div class='add'>+	memset(arr, 0, SDEBUG_READCAP16_ARR_SZ);</div><div class='add'>+	capac = sdebug_capacity - 1;</div><div class='add'>+	for (k = 0; k &lt; 8; ++k, capac &gt;&gt;= 8)</div><div class='add'>+		arr[7 - k] = capac &amp; 0xff;</div><div class='add'>+	arr[8] = (SECT_SIZE_PER(target) &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	arr[9] = (SECT_SIZE_PER(target) &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	arr[10] = (SECT_SIZE_PER(target) &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	arr[11] = SECT_SIZE_PER(target) &amp; 0xff;</div><div class='add'>+	return fill_from_dev_buffer(scp, arr,</div><div class='add'>+				    min(alloc_len, SDEBUG_READCAP16_ARR_SZ));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* &lt;&lt;Following mode page info copied from ST318451LW&gt;&gt; */</div><div class='ctx'> </div><div class='ctx'> static int resp_err_recov_pg(unsigned char * p, int pcontrol, int target)</div><div class='hunk'>@@ -772,27 +1228,98 @@ static int resp_caching_pg(unsigned char * p, int pcontrol, int target)</div><div class='ctx'> </div><div class='ctx'> static int resp_ctrl_m_pg(unsigned char * p, int pcontrol, int target)</div><div class='ctx'> { 	/* Control mode page for mode_sense */</div><div class='del'>-	unsigned char ctrl_m_pg[] = {0xa, 10, 2, 0, 0, 0, 0, 0,</div><div class='add'>+	unsigned char ch_ctrl_m_pg[] = {/* 0xa, 10, */ 0x6, 0, 0, 0, 0, 0,</div><div class='add'>+				        0, 0, 0, 0};</div><div class='add'>+	unsigned char d_ctrl_m_pg[] = {0xa, 10, 2, 0, 0, 0, 0, 0,</div><div class='ctx'> 				     0, 0, 0x2, 0x4b};</div><div class='ctx'> </div><div class='ctx'> 	if (scsi_debug_dsense)</div><div class='ctx'> 		ctrl_m_pg[2] |= 0x4;</div><div class='add'>+	else</div><div class='add'>+		ctrl_m_pg[2] &amp;= ~0x4;</div><div class='ctx'> 	memcpy(p, ctrl_m_pg, sizeof(ctrl_m_pg));</div><div class='ctx'> 	if (1 == pcontrol)</div><div class='del'>-		memset(p + 2, 0, sizeof(ctrl_m_pg) - 2);</div><div class='add'>+		memcpy(p + 2, ch_ctrl_m_pg, sizeof(ch_ctrl_m_pg));</div><div class='add'>+	else if (2 == pcontrol)</div><div class='add'>+		memcpy(p, d_ctrl_m_pg, sizeof(d_ctrl_m_pg));</div><div class='ctx'> 	return sizeof(ctrl_m_pg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> static int resp_iec_m_pg(unsigned char * p, int pcontrol, int target)</div><div class='ctx'> {	/* Informational Exceptions control mode page for mode_sense */</div><div class='del'>-	unsigned char iec_m_pg[] = {0x1c, 0xa, 0x08, 0, 0, 0, 0, 0,</div><div class='del'>-				    0, 0, 0x0, 0x0};</div><div class='add'>+	unsigned char ch_iec_m_pg[] = {/* 0x1c, 0xa, */ 0x4, 0xf, 0, 0, 0, 0,</div><div class='add'>+				       0, 0, 0x0, 0x0};</div><div class='add'>+	unsigned char d_iec_m_pg[] = {0x1c, 0xa, 0x08, 0, 0, 0, 0, 0,</div><div class='add'>+				      0, 0, 0x0, 0x0};</div><div class='add'>+</div><div class='ctx'> 	memcpy(p, iec_m_pg, sizeof(iec_m_pg));</div><div class='ctx'> 	if (1 == pcontrol)</div><div class='del'>-		memset(p + 2, 0, sizeof(iec_m_pg) - 2);</div><div class='add'>+		memcpy(p + 2, ch_iec_m_pg, sizeof(ch_iec_m_pg));</div><div class='add'>+	else if (2 == pcontrol)</div><div class='add'>+		memcpy(p, d_iec_m_pg, sizeof(d_iec_m_pg));</div><div class='ctx'> 	return sizeof(iec_m_pg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int resp_sas_sf_m_pg(unsigned char * p, int pcontrol, int target)</div><div class='add'>+{	/* SAS SSP mode page - short format for mode_sense */</div><div class='add'>+	unsigned char sas_sf_m_pg[] = {0x19, 0x6,</div><div class='add'>+		0x6, 0x0, 0x7, 0xd0, 0x0, 0x0};</div><div class='add'>+</div><div class='add'>+	memcpy(p, sas_sf_m_pg, sizeof(sas_sf_m_pg));</div><div class='add'>+	if (1 == pcontrol)</div><div class='add'>+		memset(p + 2, 0, sizeof(sas_sf_m_pg) - 2);</div><div class='add'>+	return sizeof(sas_sf_m_pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int resp_sas_pcd_m_spg(unsigned char * p, int pcontrol, int target,</div><div class='add'>+			      int target_dev_id)</div><div class='add'>+{	/* SAS phy control and discover mode page for mode_sense */</div><div class='add'>+	unsigned char sas_pcd_m_pg[] = {0x59, 0x1, 0, 0x64, 0, 0x6, 0, 2,</div><div class='add'>+		    0, 0, 0, 0, 0x10, 0x9, 0x8, 0x0,</div><div class='add'>+		    0x52, 0x22, 0x22, 0x20, 0x0, 0x0, 0x0, 0x0,</div><div class='add'>+		    0x51, 0x11, 0x11, 0x10, 0x0, 0x0, 0x0, 0x1,</div><div class='add'>+		    0x2, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		    0x88, 0x99, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		    0, 1, 0, 0, 0x10, 0x9, 0x8, 0x0,</div><div class='add'>+		    0x52, 0x22, 0x22, 0x20, 0x0, 0x0, 0x0, 0x0,</div><div class='add'>+		    0x51, 0x11, 0x11, 0x10, 0x0, 0x0, 0x0, 0x1,</div><div class='add'>+		    0x3, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		    0x88, 0x99, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		};</div><div class='add'>+	int port_a, port_b;</div><div class='add'>+</div><div class='add'>+	port_a = target_dev_id + 1;</div><div class='add'>+	port_b = port_a + 1;</div><div class='add'>+	memcpy(p, sas_pcd_m_pg, sizeof(sas_pcd_m_pg));</div><div class='add'>+	p[20] = (port_a &gt;&gt; 24);</div><div class='add'>+	p[21] = (port_a &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	p[22] = (port_a &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	p[23] = port_a &amp; 0xff;</div><div class='add'>+	p[48 + 20] = (port_b &gt;&gt; 24);</div><div class='add'>+	p[48 + 21] = (port_b &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	p[48 + 22] = (port_b &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	p[48 + 23] = port_b &amp; 0xff;</div><div class='add'>+	if (1 == pcontrol)</div><div class='add'>+		memset(p + 4, 0, sizeof(sas_pcd_m_pg) - 4);</div><div class='add'>+	return sizeof(sas_pcd_m_pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resp_sas_sha_m_spg(unsigned char * p, int pcontrol)</div><div class='add'>+{	/* SAS SSP shared protocol specific port mode subpage */</div><div class='add'>+	unsigned char sas_sha_m_pg[] = {0x59, 0x2, 0, 0xc, 0, 0x6, 0x10, 0,</div><div class='add'>+		    0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+	memcpy(p, sas_sha_m_pg, sizeof(sas_sha_m_pg));</div><div class='add'>+	if (1 == pcontrol)</div><div class='add'>+		memset(p + 4, 0, sizeof(sas_sha_m_pg) - 4);</div><div class='add'>+	return sizeof(sas_sha_m_pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define SDEBUG_MAX_MSENSE_SZ 256</div><div class='ctx'> </div><div class='ctx'> static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='hunk'>@@ -801,12 +1328,12 @@ static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 	unsigned char dbd;</div><div class='ctx'> 	int pcontrol, pcode, subpcode;</div><div class='ctx'> 	unsigned char dev_spec;</div><div class='del'>-	int alloc_len, msense_6, offset, len, errsts;</div><div class='add'>+	int alloc_len, msense_6, offset, len, errsts, target_dev_id;</div><div class='ctx'> 	unsigned char * ap;</div><div class='ctx'> 	unsigned char arr[SDEBUG_MAX_MSENSE_SZ];</div><div class='ctx'> 	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='ctx'> </div><div class='del'>-	if ((errsts = check_reset(scp, devip)))</div><div class='add'>+	if ((errsts = check_readiness(scp, 1, devip)))</div><div class='ctx'> 		return errsts;</div><div class='ctx'> 	dbd = cmd[1] &amp; 0x8;</div><div class='ctx'> 	pcontrol = (cmd[2] &amp; 0xc0) &gt;&gt; 6;</div><div class='hunk'>@@ -820,6 +1347,8 @@ static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 			       	0);</div><div class='ctx'> 		return check_condition_result;</div><div class='ctx'> 	}</div><div class='add'>+	target_dev_id = ((devip-&gt;sdbg_host-&gt;shost-&gt;host_no + 1) * 2000) +</div><div class='add'>+			(devip-&gt;target * 1000) - 3;</div><div class='ctx'> 	dev_spec = DEV_READONLY(target) ? 0x80 : 0x0;</div><div class='ctx'> 	if (msense_6) {</div><div class='ctx'> 		arr[2] = dev_spec;</div><div class='hunk'>@@ -830,7 +1359,8 @@ static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 	}</div><div class='ctx'> 	ap = arr + offset;</div><div class='ctx'> </div><div class='del'>-	if (0 != subpcode) { /* TODO: Control Extension page */</div><div class='add'>+	if ((subpcode &gt; 0x0) &amp;&amp; (subpcode &lt; 0xff) &amp;&amp; (0x19 != pcode)) {</div><div class='add'>+		/* TODO: Control Extension page */</div><div class='ctx'> 		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,</div><div class='ctx'> 			       	0);</div><div class='ctx'> 		return check_condition_result;</div><div class='hunk'>@@ -856,17 +1386,45 @@ static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 		len = resp_ctrl_m_pg(ap, pcontrol, target);</div><div class='ctx'> 		offset += len;</div><div class='ctx'> 		break;</div><div class='add'>+	case 0x19:	/* if spc==1 then sas phy, control+discover */</div><div class='add'>+		if ((subpcode &gt; 0x2) &amp;&amp; (subpcode &lt; 0xff)) {</div><div class='add'>+		        mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+					INVALID_FIELD_IN_CDB, 0);</div><div class='add'>+			return check_condition_result;</div><div class='add'>+	        }</div><div class='add'>+		len = 0;</div><div class='add'>+		if ((0x0 == subpcode) || (0xff == subpcode))</div><div class='add'>+			len += resp_sas_sf_m_pg(ap + len, pcontrol, target);</div><div class='add'>+		if ((0x1 == subpcode) || (0xff == subpcode))</div><div class='add'>+			len += resp_sas_pcd_m_spg(ap + len, pcontrol, target,</div><div class='add'>+						  target_dev_id);</div><div class='add'>+		if ((0x2 == subpcode) || (0xff == subpcode))</div><div class='add'>+			len += resp_sas_sha_m_spg(ap + len, pcontrol);</div><div class='add'>+		offset += len;</div><div class='add'>+		break;</div><div class='ctx'> 	case 0x1c:	/* Informational Exceptions Mode page, all devices */</div><div class='ctx'> 		len = resp_iec_m_pg(ap, pcontrol, target);</div><div class='ctx'> 		offset += len;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x3f:	/* Read all Mode pages */</div><div class='del'>-		len = resp_err_recov_pg(ap, pcontrol, target);</div><div class='del'>-		len += resp_disconnect_pg(ap + len, pcontrol, target);</div><div class='del'>-		len += resp_format_pg(ap + len, pcontrol, target);</div><div class='del'>-		len += resp_caching_pg(ap + len, pcontrol, target);</div><div class='del'>-		len += resp_ctrl_m_pg(ap + len, pcontrol, target);</div><div class='del'>-		len += resp_iec_m_pg(ap + len, pcontrol, target);</div><div class='add'>+		if ((0 == subpcode) || (0xff == subpcode)) {</div><div class='add'>+			len = resp_err_recov_pg(ap, pcontrol, target);</div><div class='add'>+			len += resp_disconnect_pg(ap + len, pcontrol, target);</div><div class='add'>+			len += resp_format_pg(ap + len, pcontrol, target);</div><div class='add'>+			len += resp_caching_pg(ap + len, pcontrol, target);</div><div class='add'>+			len += resp_ctrl_m_pg(ap + len, pcontrol, target);</div><div class='add'>+			len += resp_sas_sf_m_pg(ap + len, pcontrol, target);</div><div class='add'>+			if (0xff == subpcode) {</div><div class='add'>+				len += resp_sas_pcd_m_spg(ap + len, pcontrol,</div><div class='add'>+						  target, target_dev_id);</div><div class='add'>+				len += resp_sas_sha_m_spg(ap + len, pcontrol);</div><div class='add'>+			}</div><div class='add'>+			len += resp_iec_m_pg(ap + len, pcontrol, target);</div><div class='add'>+		} else {</div><div class='add'>+			mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+					INVALID_FIELD_IN_CDB, 0);</div><div class='add'>+			return check_condition_result;</div><div class='add'>+                }</div><div class='ctx'> 		offset += len;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -883,71 +1441,274 @@ static int resp_mode_sense(struct scsi_cmnd * scp, int target,</div><div class='ctx'> 	return fill_from_dev_buffer(scp, arr, min(alloc_len, offset));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int resp_read(struct scsi_cmnd * SCpnt, int upper_blk, int block,</div><div class='del'>-		     int num, struct sdebug_dev_info * devip)</div><div class='add'>+#define SDEBUG_MAX_MSELECT_SZ 512</div><div class='add'>+</div><div class='add'>+static int resp_mode_select(struct scsi_cmnd * scp, int mselect6,</div><div class='add'>+			    struct sdebug_dev_info * devip)</div><div class='add'>+{</div><div class='add'>+	int pf, sp, ps, md_len, bd_len, off, spf, pg_len;</div><div class='add'>+	int param_len, res, errsts, mpage;</div><div class='add'>+	unsigned char arr[SDEBUG_MAX_MSELECT_SZ];</div><div class='add'>+	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='add'>+</div><div class='add'>+	if ((errsts = check_readiness(scp, 1, devip)))</div><div class='add'>+		return errsts;</div><div class='add'>+	memset(arr, 0, sizeof(arr));</div><div class='add'>+	pf = cmd[1] &amp; 0x10;</div><div class='add'>+	sp = cmd[1] &amp; 0x1;</div><div class='add'>+	param_len = mselect6 ? cmd[4] : ((cmd[7] &lt;&lt; 8) + cmd[8]);</div><div class='add'>+	if ((0 == pf) || sp || (param_len &gt; SDEBUG_MAX_MSELECT_SZ)) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+				INVALID_FIELD_IN_CDB, 0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+        res = fetch_to_dev_buffer(scp, arr, param_len);</div><div class='add'>+        if (-1 == res)</div><div class='add'>+                return (DID_ERROR &lt;&lt; 16);</div><div class='add'>+        else if ((res &lt; param_len) &amp;&amp;</div><div class='add'>+                 (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts))</div><div class='add'>+                printk(KERN_INFO "scsi_debug: mode_select: cdb indicated=%d, "</div><div class='add'>+                       " IO sent=%d bytes\n", param_len, res);</div><div class='add'>+	md_len = mselect6 ? (arr[0] + 1) : ((arr[0] &lt;&lt; 8) + arr[1] + 2);</div><div class='add'>+	bd_len = mselect6 ? arr[3] : ((arr[6] &lt;&lt; 8) + arr[7]);</div><div class='add'>+	if ((md_len &gt; 2) || (0 != bd_len)) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+				INVALID_FIELD_IN_PARAM_LIST, 0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+	off = bd_len + (mselect6 ? 4 : 8);</div><div class='add'>+	mpage = arr[off] &amp; 0x3f;</div><div class='add'>+	ps = !!(arr[off] &amp; 0x80);</div><div class='add'>+	if (ps) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+				INVALID_FIELD_IN_PARAM_LIST, 0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+	spf = !!(arr[off] &amp; 0x40);</div><div class='add'>+	pg_len = spf ? ((arr[off + 2] &lt;&lt; 8) + arr[off + 3] + 4) :</div><div class='add'>+		       (arr[off + 1] + 2);</div><div class='add'>+	if ((pg_len + off) &gt; param_len) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+				PARAMETER_LIST_LENGTH_ERR, 0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+	switch (mpage) {</div><div class='add'>+	case 0xa:      /* Control Mode page */</div><div class='add'>+		if (ctrl_m_pg[1] == arr[off + 1]) {</div><div class='add'>+			memcpy(ctrl_m_pg + 2, arr + off + 2,</div><div class='add'>+			       sizeof(ctrl_m_pg) - 2);</div><div class='add'>+			scsi_debug_dsense = !!(ctrl_m_pg[2] &amp; 0x4);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 0x1c:      /* Informational Exceptions Mode page */</div><div class='add'>+		if (iec_m_pg[1] == arr[off + 1]) {</div><div class='add'>+			memcpy(iec_m_pg + 2, arr + off + 2,</div><div class='add'>+			       sizeof(iec_m_pg) - 2);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+			INVALID_FIELD_IN_PARAM_LIST, 0);</div><div class='add'>+	return check_condition_result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resp_temp_l_pg(unsigned char * arr)</div><div class='add'>+{</div><div class='add'>+	unsigned char temp_l_pg[] = {0x0, 0x0, 0x3, 0x2, 0x0, 38,</div><div class='add'>+				     0x0, 0x1, 0x3, 0x2, 0x0, 65,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+        memcpy(arr, temp_l_pg, sizeof(temp_l_pg));</div><div class='add'>+        return sizeof(temp_l_pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resp_ie_l_pg(unsigned char * arr)</div><div class='add'>+{</div><div class='add'>+	unsigned char ie_l_pg[] = {0x0, 0x0, 0x3, 0x3, 0x0, 0x0, 38,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+        memcpy(arr, ie_l_pg, sizeof(ie_l_pg));</div><div class='add'>+	if (iec_m_pg[2] &amp; 0x4) {	/* TEST bit set */</div><div class='add'>+		arr[4] = THRESHOLD_EXCEEDED;</div><div class='add'>+		arr[5] = 0xff;</div><div class='add'>+	}</div><div class='add'>+        return sizeof(ie_l_pg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SDEBUG_MAX_LSENSE_SZ 512</div><div class='add'>+</div><div class='add'>+static int resp_log_sense(struct scsi_cmnd * scp,</div><div class='add'>+                          struct sdebug_dev_info * devip)</div><div class='add'>+{</div><div class='add'>+	int ppc, sp, pcontrol, pcode, alloc_len, errsts, len, n;</div><div class='add'>+	unsigned char arr[SDEBUG_MAX_LSENSE_SZ];</div><div class='add'>+	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='add'>+</div><div class='add'>+	if ((errsts = check_readiness(scp, 1, devip)))</div><div class='add'>+		return errsts;</div><div class='add'>+	memset(arr, 0, sizeof(arr));</div><div class='add'>+	ppc = cmd[1] &amp; 0x2;</div><div class='add'>+	sp = cmd[1] &amp; 0x1;</div><div class='add'>+	if (ppc || sp) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+				INVALID_FIELD_IN_CDB, 0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+	pcontrol = (cmd[2] &amp; 0xc0) &gt;&gt; 6;</div><div class='add'>+	pcode = cmd[2] &amp; 0x3f;</div><div class='add'>+	alloc_len = (cmd[7] &lt;&lt; 8) + cmd[8];</div><div class='add'>+	arr[0] = pcode;</div><div class='add'>+	switch (pcode) {</div><div class='add'>+	case 0x0:	/* Supported log pages log page */</div><div class='add'>+		n = 4;</div><div class='add'>+		arr[n++] = 0x0;		/* this page */</div><div class='add'>+		arr[n++] = 0xd;		/* Temperature */</div><div class='add'>+		arr[n++] = 0x2f;	/* Informational exceptions */</div><div class='add'>+		arr[3] = n - 4;</div><div class='add'>+		break;</div><div class='add'>+	case 0xd:	/* Temperature log page */</div><div class='add'>+		arr[3] = resp_temp_l_pg(arr + 4);</div><div class='add'>+		break;</div><div class='add'>+	case 0x2f:	/* Informational exceptions log page */</div><div class='add'>+		arr[3] = resp_ie_l_pg(arr + 4);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST,</div><div class='add'>+				INVALID_FIELD_IN_CDB, 0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='add'>+	len = min(((arr[2] &lt;&lt; 8) + arr[3]) + 4, alloc_len);</div><div class='add'>+	return fill_from_dev_buffer(scp, arr,</div><div class='add'>+		    min(len, SDEBUG_MAX_INQ_ARR_SZ));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int resp_read(struct scsi_cmnd * SCpnt, unsigned long long lba,</div><div class='add'>+		     unsigned int num, struct sdebug_dev_info * devip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long iflags;</div><div class='add'>+	unsigned int block, from_bottom;</div><div class='add'>+	unsigned long long u;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (upper_blk || (block + num &gt; sdebug_capacity)) {</div><div class='add'>+	if (lba + num &gt; sdebug_capacity) {</div><div class='ctx'> 		mk_sense_buffer(devip, ILLEGAL_REQUEST, ADDR_OUT_OF_RANGE,</div><div class='ctx'> 				0);</div><div class='ctx'> 		return check_condition_result;</div><div class='ctx'> 	}</div><div class='add'>+	/* transfer length excessive (tie in to block limits VPD page) */</div><div class='add'>+	if (num &gt; sdebug_store_sectors) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,</div><div class='add'>+				0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='ctx'> 	if ((SCSI_DEBUG_OPT_MEDIUM_ERR &amp; scsi_debug_opts) &amp;&amp;</div><div class='del'>-	    (block &lt;= OPT_MEDIUM_ERR_ADDR) &amp;&amp;</div><div class='del'>-	    ((block + num) &gt; OPT_MEDIUM_ERR_ADDR)) {</div><div class='add'>+	    (lba &lt;= OPT_MEDIUM_ERR_ADDR) &amp;&amp;</div><div class='add'>+	    ((lba + num) &gt; OPT_MEDIUM_ERR_ADDR)) {</div><div class='add'>+		/* claim unrecoverable read error */</div><div class='ctx'> 		mk_sense_buffer(devip, MEDIUM_ERROR, UNRECOVERED_READ_ERR,</div><div class='ctx'> 				0);</div><div class='del'>-		/* claim unrecoverable read error */</div><div class='add'>+		/* set info field and valid bit for fixed descriptor */</div><div class='add'>+		if (0x70 == (devip-&gt;sense_buff[0] &amp; 0x7f)) {</div><div class='add'>+			devip-&gt;sense_buff[0] |= 0x80;	/* Valid bit */</div><div class='add'>+			ret = OPT_MEDIUM_ERR_ADDR;</div><div class='add'>+			devip-&gt;sense_buff[3] = (ret &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+			devip-&gt;sense_buff[4] = (ret &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+			devip-&gt;sense_buff[5] = (ret &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			devip-&gt;sense_buff[6] = ret &amp; 0xff;</div><div class='add'>+		}</div><div class='ctx'> 		return check_condition_result;</div><div class='ctx'> 	}</div><div class='ctx'> 	read_lock_irqsave(&amp;atomic_rw, iflags);</div><div class='del'>-	ret = fill_from_dev_buffer(SCpnt, fake_storep + (block * SECT_SIZE),</div><div class='del'>-			   	   num * SECT_SIZE);</div><div class='add'>+	if ((lba + num) &lt;= sdebug_store_sectors)</div><div class='add'>+		ret = fill_from_dev_buffer(SCpnt,</div><div class='add'>+					   fake_storep + (lba * SECT_SIZE),</div><div class='add'>+			   		   num * SECT_SIZE);</div><div class='add'>+	else {</div><div class='add'>+		/* modulo when one arg is 64 bits needs do_div() */</div><div class='add'>+		u = lba;</div><div class='add'>+		block = do_div(u, sdebug_store_sectors);</div><div class='add'>+		from_bottom = 0;</div><div class='add'>+		if ((block + num) &gt; sdebug_store_sectors)</div><div class='add'>+			from_bottom = (block + num) - sdebug_store_sectors;</div><div class='add'>+		ret = fill_from_dev_buffer(SCpnt,</div><div class='add'>+					   fake_storep + (block * SECT_SIZE),</div><div class='add'>+			   		   (num - from_bottom) * SECT_SIZE);</div><div class='add'>+		if ((0 == ret) &amp;&amp; (from_bottom &gt; 0))</div><div class='add'>+			ret = fill_from_dev_buffer(SCpnt, fake_storep,</div><div class='add'>+						   from_bottom * SECT_SIZE);</div><div class='add'>+	}</div><div class='ctx'> 	read_unlock_irqrestore(&amp;atomic_rw, iflags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int resp_write(struct scsi_cmnd * SCpnt, int upper_blk, int block,</div><div class='del'>-		      int num, struct sdebug_dev_info * devip)</div><div class='add'>+static int resp_write(struct scsi_cmnd * SCpnt, unsigned long long lba,</div><div class='add'>+		      unsigned int num, struct sdebug_dev_info * devip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long iflags;</div><div class='add'>+	unsigned int block, to_bottom;</div><div class='add'>+	unsigned long long u;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	if (upper_blk || (block + num &gt; sdebug_capacity)) {</div><div class='add'>+	if (lba + num &gt; sdebug_capacity) {</div><div class='ctx'> 		mk_sense_buffer(devip, ILLEGAL_REQUEST, ADDR_OUT_OF_RANGE,</div><div class='ctx'> 			       	0);</div><div class='ctx'> 		return check_condition_result;</div><div class='ctx'> 	}</div><div class='add'>+	/* transfer length excessive (tie in to block limits VPD page) */</div><div class='add'>+	if (num &gt; sdebug_store_sectors) {</div><div class='add'>+		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,</div><div class='add'>+				0);</div><div class='add'>+		return check_condition_result;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	write_lock_irqsave(&amp;atomic_rw, iflags);</div><div class='del'>-	res = fetch_to_dev_buffer(SCpnt, fake_storep + (block * SECT_SIZE),</div><div class='del'>-			   	  num * SECT_SIZE);</div><div class='add'>+	if ((lba + num) &lt;= sdebug_store_sectors)</div><div class='add'>+		res = fetch_to_dev_buffer(SCpnt,</div><div class='add'>+					  fake_storep + (lba * SECT_SIZE),</div><div class='add'>+			   		  num * SECT_SIZE);</div><div class='add'>+	else {</div><div class='add'>+		/* modulo when one arg is 64 bits needs do_div() */</div><div class='add'>+		u = lba;</div><div class='add'>+		block = do_div(u, sdebug_store_sectors);</div><div class='add'>+		to_bottom = 0;</div><div class='add'>+		if ((block + num) &gt; sdebug_store_sectors)</div><div class='add'>+			to_bottom = (block + num) - sdebug_store_sectors;</div><div class='add'>+		res = fetch_to_dev_buffer(SCpnt,</div><div class='add'>+					  fake_storep + (block * SECT_SIZE),</div><div class='add'>+			   		  (num - to_bottom) * SECT_SIZE);</div><div class='add'>+		if ((0 == res) &amp;&amp; (to_bottom &gt; 0))</div><div class='add'>+			res = fetch_to_dev_buffer(SCpnt, fake_storep,</div><div class='add'>+						  to_bottom * SECT_SIZE);</div><div class='add'>+	}</div><div class='ctx'> 	write_unlock_irqrestore(&amp;atomic_rw, iflags);</div><div class='ctx'> 	if (-1 == res)</div><div class='ctx'> 		return (DID_ERROR &lt;&lt; 16);</div><div class='ctx'> 	else if ((res &lt; (num * SECT_SIZE)) &amp;&amp;</div><div class='ctx'> 		 (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts))</div><div class='del'>-		printk(KERN_INFO "scsi_debug: write: cdb indicated=%d, "</div><div class='add'>+		printk(KERN_INFO "scsi_debug: write: cdb indicated=%u, "</div><div class='ctx'> 		       " IO sent=%d bytes\n", num * SECT_SIZE, res);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SDEBUG_RLUN_ARR_SZ 128</div><div class='add'>+#define SDEBUG_RLUN_ARR_SZ 256</div><div class='ctx'> </div><div class='ctx'> static int resp_report_luns(struct scsi_cmnd * scp,</div><div class='ctx'> 			    struct sdebug_dev_info * devip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int alloc_len;</div><div class='del'>-	int lun_cnt, i, upper;</div><div class='add'>+	int lun_cnt, i, upper, num, n, wlun, lun;</div><div class='ctx'> 	unsigned char *cmd = (unsigned char *)scp-&gt;cmnd;</div><div class='ctx'> 	int select_report = (int)cmd[2];</div><div class='ctx'> 	struct scsi_lun *one_lun;</div><div class='ctx'> 	unsigned char arr[SDEBUG_RLUN_ARR_SZ];</div><div class='add'>+	unsigned char * max_addr;</div><div class='ctx'> </div><div class='ctx'> 	alloc_len = cmd[9] + (cmd[8] &lt;&lt; 8) + (cmd[7] &lt;&lt; 16) + (cmd[6] &lt;&lt; 24);</div><div class='del'>-	if ((alloc_len &lt; 16) || (select_report &gt; 2)) {</div><div class='add'>+	if ((alloc_len &lt; 4) || (select_report &gt; 2)) {</div><div class='ctx'> 		mk_sense_buffer(devip, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB,</div><div class='ctx'> 			       	0);</div><div class='ctx'> 		return check_condition_result;</div><div class='hunk'>@@ -955,18 +1716,37 @@ static int resp_report_luns(struct scsi_cmnd * scp,</div><div class='ctx'> 	/* can produce response with up to 16k luns (lun 0 to lun 16383) */</div><div class='ctx'> 	memset(arr, 0, SDEBUG_RLUN_ARR_SZ);</div><div class='ctx'> 	lun_cnt = scsi_debug_max_luns;</div><div class='del'>-	arr[2] = ((sizeof(struct scsi_lun) * lun_cnt) &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	arr[3] = (sizeof(struct scsi_lun) * lun_cnt) &amp; 0xff;</div><div class='del'>-	lun_cnt = min((int)((SDEBUG_RLUN_ARR_SZ - 8) /</div><div class='del'>-			    sizeof(struct scsi_lun)), lun_cnt);</div><div class='add'>+	if (1 == select_report)</div><div class='add'>+		lun_cnt = 0;</div><div class='add'>+	else if (scsi_debug_no_lun_0 &amp;&amp; (lun_cnt &gt; 0))</div><div class='add'>+		--lun_cnt;</div><div class='add'>+	wlun = (select_report &gt; 0) ? 1 : 0;</div><div class='add'>+	num = lun_cnt + wlun;</div><div class='add'>+	arr[2] = ((sizeof(struct scsi_lun) * num) &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	arr[3] = (sizeof(struct scsi_lun) * num) &amp; 0xff;</div><div class='add'>+	n = min((int)((SDEBUG_RLUN_ARR_SZ - 8) /</div><div class='add'>+			    sizeof(struct scsi_lun)), num);</div><div class='add'>+	if (n &lt; num) {</div><div class='add'>+		wlun = 0;</div><div class='add'>+		lun_cnt = n;</div><div class='add'>+	}</div><div class='ctx'> 	one_lun = (struct scsi_lun *) &amp;arr[8];</div><div class='del'>-	for (i = 0; i &lt; lun_cnt; i++) {</div><div class='del'>-		upper = (i &gt;&gt; 8) &amp; 0x3f;</div><div class='add'>+	max_addr = arr + SDEBUG_RLUN_ARR_SZ;</div><div class='add'>+	for (i = 0, lun = (scsi_debug_no_lun_0 ? 1 : 0);</div><div class='add'>+             ((i &lt; lun_cnt) &amp;&amp; ((unsigned char *)(one_lun + i) &lt; max_addr));</div><div class='add'>+	     i++, lun++) {</div><div class='add'>+		upper = (lun &gt;&gt; 8) &amp; 0x3f;</div><div class='ctx'> 		if (upper)</div><div class='ctx'> 			one_lun[i].scsi_lun[0] =</div><div class='ctx'> 			    (upper | (SAM2_LUN_ADDRESS_METHOD &lt;&lt; 6));</div><div class='del'>-		one_lun[i].scsi_lun[1] = i &amp; 0xff;</div><div class='add'>+		one_lun[i].scsi_lun[1] = lun &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+	if (wlun) {</div><div class='add'>+		one_lun[i].scsi_lun[0] = (SAM2_WLUN_REPORT_LUNS &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		one_lun[i].scsi_lun[1] = SAM2_WLUN_REPORT_LUNS &amp; 0xff;</div><div class='add'>+		i++;</div><div class='ctx'> 	}</div><div class='add'>+	alloc_len = (unsigned char *)(one_lun + i) - arr;</div><div class='ctx'> 	return fill_from_dev_buffer(scp, arr,</div><div class='ctx'> 				    min((int)alloc_len, SDEBUG_RLUN_ARR_SZ));</div><div class='ctx'> }</div><div class='hunk'>@@ -1002,7 +1782,8 @@ static void timer_intr_handler(unsigned long indx)</div><div class='ctx'> static int scsi_debug_slave_alloc(struct scsi_device * sdp)</div><div class='ctx'> {</div><div class='ctx'> 	if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='del'>-		sdev_printk(KERN_INFO, sdp, "scsi_debug: slave_alloc\n");</div><div class='add'>+		printk(KERN_INFO "scsi_debug: slave_alloc &lt;%u %u %u %u&gt;\n",</div><div class='add'>+		       sdp-&gt;host-&gt;host_no, sdp-&gt;channel, sdp-&gt;id, sdp-&gt;lun);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1011,7 +1792,8 @@ static int scsi_debug_slave_configure(struct scsi_device * sdp)</div><div class='ctx'> 	struct sdebug_dev_info * devip;</div><div class='ctx'> </div><div class='ctx'> 	if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='del'>-		sdev_printk(KERN_INFO, sdp, "scsi_debug: slave_configure\n");</div><div class='add'>+		printk(KERN_INFO "scsi_debug: slave_configure &lt;%u %u %u %u&gt;\n",</div><div class='add'>+		       sdp-&gt;host-&gt;host_no, sdp-&gt;channel, sdp-&gt;id, sdp-&gt;lun);</div><div class='ctx'> 	if (sdp-&gt;host-&gt;max_cmd_len != SCSI_DEBUG_MAX_CMD_LEN)</div><div class='ctx'> 		sdp-&gt;host-&gt;max_cmd_len = SCSI_DEBUG_MAX_CMD_LEN;</div><div class='ctx'> 	devip = devInfoReg(sdp);</div><div class='hunk'>@@ -1019,6 +1801,7 @@ static int scsi_debug_slave_configure(struct scsi_device * sdp)</div><div class='ctx'> 	if (sdp-&gt;host-&gt;cmd_per_lun)</div><div class='ctx'> 		scsi_adjust_queue_depth(sdp, SDEBUG_TAGGED_QUEUING,</div><div class='ctx'> 					sdp-&gt;host-&gt;cmd_per_lun);</div><div class='add'>+	blk_queue_max_segment_size(sdp-&gt;request_queue, 256 * 1024);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1028,7 +1811,8 @@ static void scsi_debug_slave_destroy(struct scsi_device * sdp)</div><div class='ctx'> 				(struct sdebug_dev_info *)sdp-&gt;hostdata;</div><div class='ctx'> </div><div class='ctx'> 	if (SCSI_DEBUG_OPT_NOISE &amp; scsi_debug_opts)</div><div class='del'>-		sdev_printk(KERN_INFO, sdp, "scsi_debug: slave_destroy\n");</div><div class='add'>+		printk(KERN_INFO "scsi_debug: slave_destroy &lt;%u %u %u %u&gt;\n",</div><div class='add'>+		       sdp-&gt;host-&gt;host_no, sdp-&gt;channel, sdp-&gt;id, sdp-&gt;lun);</div><div class='ctx'> 	if (devip) {</div><div class='ctx'> 		/* make this slot avaliable for re-use */</div><div class='ctx'> 		devip-&gt;used = 0;</div><div class='hunk'>@@ -1085,6 +1869,8 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev)</div><div class='ctx'> 			open_devip-&gt;sense_buff[0] = 0x70;</div><div class='ctx'> 			open_devip-&gt;sense_buff[7] = 0xa;</div><div class='ctx'> 		}</div><div class='add'>+		if (sdev-&gt;lun == SAM2_WLUN_REPORT_LUNS)</div><div class='add'>+			open_devip-&gt;wlun = SAM2_WLUN_REPORT_LUNS &amp; 0xff;</div><div class='ctx'> 		return open_devip;</div><div class='ctx'>         }</div><div class='ctx'>         return NULL;</div><div class='hunk'>@@ -1273,7 +2059,7 @@ static void __init sdebug_build_parts(unsigned char * ramp)</div><div class='ctx'> 		printk(KERN_WARNING "scsi_debug:build_parts: reducing "</div><div class='ctx'> 				    "partitions to %d\n", SDEBUG_MAX_PARTS);</div><div class='ctx'> 	}</div><div class='del'>-	num_sectors = (int)(sdebug_store_size / SECT_SIZE);</div><div class='add'>+	num_sectors = (int)sdebug_store_sectors;</div><div class='ctx'> 	sectors_per_part = (num_sectors - sdebug_sectors_per)</div><div class='ctx'> 			   / scsi_debug_num_parts;</div><div class='ctx'> 	heads_by_sects = sdebug_heads * sdebug_sectors_per;</div><div class='hunk'>@@ -1316,9 +2102,9 @@ static int schedule_resp(struct scsi_cmnd * cmnd,</div><div class='ctx'> 		if (scsi_result) {</div><div class='ctx'> 			struct scsi_device * sdp = cmnd-&gt;device;</div><div class='ctx'> </div><div class='del'>-			sdev_printk(KERN_INFO, sdp,</div><div class='del'>-				"non-zero result=0x%x\n",</div><div class='del'>-			       	scsi_result);</div><div class='add'>+			printk(KERN_INFO "scsi_debug:    &lt;%u %u %u %u&gt; "</div><div class='add'>+			       "non-zero result=0x%x\n", sdp-&gt;host-&gt;host_no,</div><div class='add'>+			       sdp-&gt;channel, sdp-&gt;id, sdp-&gt;lun, scsi_result);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (cmnd &amp;&amp; devip) {</div><div class='hunk'>@@ -1365,21 +2151,19 @@ static int schedule_resp(struct scsi_cmnd * cmnd,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set 'perm' (4th argument) to 0 to disable module_param's definition</div><div class='del'>- * of sysfs parameters (which module_param doesn't yet support).</div><div class='del'>- * Sysfs parameters defined explicitly below.</div><div class='del'>- */</div><div class='del'>-module_param_named(add_host, scsi_debug_add_host, int, 0); /* perm=0644 */</div><div class='del'>-module_param_named(delay, scsi_debug_delay, int, 0); /* perm=0644 */</div><div class='del'>-module_param_named(dev_size_mb, scsi_debug_dev_size_mb, int, 0);</div><div class='del'>-module_param_named(dsense, scsi_debug_dsense, int, 0);</div><div class='del'>-module_param_named(every_nth, scsi_debug_every_nth, int, 0);</div><div class='del'>-module_param_named(max_luns, scsi_debug_max_luns, int, 0);</div><div class='del'>-module_param_named(num_parts, scsi_debug_num_parts, int, 0);</div><div class='del'>-module_param_named(num_tgts, scsi_debug_num_tgts, int, 0);</div><div class='del'>-module_param_named(opts, scsi_debug_opts, int, 0); /* perm=0644 */</div><div class='del'>-module_param_named(ptype, scsi_debug_ptype, int, 0);</div><div class='del'>-module_param_named(scsi_level, scsi_debug_scsi_level, int, 0);</div><div class='add'>+module_param_named(add_host, scsi_debug_add_host, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(delay, scsi_debug_delay, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(dev_size_mb, scsi_debug_dev_size_mb, int, S_IRUGO);</div><div class='add'>+module_param_named(dsense, scsi_debug_dsense, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(every_nth, scsi_debug_every_nth, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(max_luns, scsi_debug_max_luns, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(no_lun_0, scsi_debug_no_lun_0, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(num_parts, scsi_debug_num_parts, int, S_IRUGO);</div><div class='add'>+module_param_named(num_tgts, scsi_debug_num_tgts, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(opts, scsi_debug_opts, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(ptype, scsi_debug_ptype, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param_named(scsi_level, scsi_debug_scsi_level, int, S_IRUGO);</div><div class='add'>+module_param_named(virtual_gb, scsi_debug_virtual_gb, int, S_IRUGO | S_IWUSR);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Eric Youngdale + Douglas Gilbert");</div><div class='ctx'> MODULE_DESCRIPTION("SCSI debug adapter driver");</div><div class='hunk'>@@ -1388,15 +2172,17 @@ MODULE_VERSION(SCSI_DEBUG_VERSION);</div><div class='ctx'> </div><div class='ctx'> MODULE_PARM_DESC(add_host, "0..127 hosts allowed(def=1)");</div><div class='ctx'> MODULE_PARM_DESC(delay, "# of jiffies to delay response(def=1)");</div><div class='del'>-MODULE_PARM_DESC(dev_size_mb, "size in MB of ram shared by devs");</div><div class='del'>-MODULE_PARM_DESC(dsense, "use descriptor sense format(def: fixed)");</div><div class='add'>+MODULE_PARM_DESC(dev_size_mb, "size in MB of ram shared by devs(def=8)");</div><div class='add'>+MODULE_PARM_DESC(dsense, "use descriptor sense format(def=0 -&gt; fixed)");</div><div class='ctx'> MODULE_PARM_DESC(every_nth, "timeout every nth command(def=100)");</div><div class='del'>-MODULE_PARM_DESC(max_luns, "number of SCSI LUNs per target to simulate");</div><div class='add'>+MODULE_PARM_DESC(max_luns, "number of LUNs per target to simulate(def=1)");</div><div class='add'>+MODULE_PARM_DESC(no_lun_0, "no LU number 0 (def=0 -&gt; have lun 0)");</div><div class='ctx'> MODULE_PARM_DESC(num_parts, "number of partitions(def=0)");</div><div class='del'>-MODULE_PARM_DESC(num_tgts, "number of SCSI targets per host to simulate");</div><div class='del'>-MODULE_PARM_DESC(opts, "1-&gt;noise, 2-&gt;medium_error, 4-&gt;...");</div><div class='add'>+MODULE_PARM_DESC(num_tgts, "number of targets per host to simulate(def=1)");</div><div class='add'>+MODULE_PARM_DESC(opts, "1-&gt;noise, 2-&gt;medium_error, 4-&gt;... (def=0)");</div><div class='ctx'> MODULE_PARM_DESC(ptype, "SCSI peripheral type(def=0[disk])");</div><div class='ctx'> MODULE_PARM_DESC(scsi_level, "SCSI level to simulate(def=5[SPC-3])");</div><div class='add'>+MODULE_PARM_DESC(virtual_gb, "virtual gigabyte size (def=0 -&gt; use dev_size_mb)");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static char sdebug_info[256];</div><div class='hunk'>@@ -1548,6 +2334,24 @@ static ssize_t sdebug_dsense_store(struct device_driver * ddp,</div><div class='ctx'> DRIVER_ATTR(dsense, S_IRUGO | S_IWUSR, sdebug_dsense_show,</div><div class='ctx'> 	    sdebug_dsense_store);</div><div class='ctx'> </div><div class='add'>+static ssize_t sdebug_no_lun_0_show(struct device_driver * ddp, char * buf)</div><div class='add'>+{</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_no_lun_0);</div><div class='add'>+}</div><div class='add'>+static ssize_t sdebug_no_lun_0_store(struct device_driver * ddp,</div><div class='add'>+				     const char * buf, size_t count)</div><div class='add'>+{</div><div class='add'>+        int n;</div><div class='add'>+</div><div class='add'>+	if ((count &gt; 0) &amp;&amp; (1 == sscanf(buf, "%d", &amp;n)) &amp;&amp; (n &gt;= 0)) {</div><div class='add'>+		scsi_debug_no_lun_0 = n;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+DRIVER_ATTR(no_lun_0, S_IRUGO | S_IWUSR, sdebug_no_lun_0_show,</div><div class='add'>+	    sdebug_no_lun_0_store);</div><div class='add'>+</div><div class='ctx'> static ssize_t sdebug_num_tgts_show(struct device_driver * ddp, char * buf)</div><div class='ctx'> {</div><div class='ctx'>         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_num_tgts);</div><div class='hunk'>@@ -1623,6 +2427,29 @@ static ssize_t sdebug_scsi_level_show(struct device_driver * ddp, char * buf)</div><div class='ctx'> }</div><div class='ctx'> DRIVER_ATTR(scsi_level, S_IRUGO, sdebug_scsi_level_show, NULL);</div><div class='ctx'> </div><div class='add'>+static ssize_t sdebug_virtual_gb_show(struct device_driver * ddp, char * buf)</div><div class='add'>+{</div><div class='add'>+        return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_virtual_gb);</div><div class='add'>+}</div><div class='add'>+static ssize_t sdebug_virtual_gb_store(struct device_driver * ddp,</div><div class='add'>+				       const char * buf, size_t count)</div><div class='add'>+{</div><div class='add'>+        int n;</div><div class='add'>+</div><div class='add'>+	if ((count &gt; 0) &amp;&amp; (1 == sscanf(buf, "%d", &amp;n)) &amp;&amp; (n &gt;= 0)) {</div><div class='add'>+		scsi_debug_virtual_gb = n;</div><div class='add'>+		if (scsi_debug_virtual_gb &gt; 0) {</div><div class='add'>+			sdebug_capacity = 2048 * 1024;</div><div class='add'>+			sdebug_capacity *= scsi_debug_virtual_gb;</div><div class='add'>+		} else</div><div class='add'>+			sdebug_capacity = sdebug_store_sectors;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+DRIVER_ATTR(virtual_gb, S_IRUGO | S_IWUSR, sdebug_virtual_gb_show,</div><div class='add'>+	    sdebug_virtual_gb_store);</div><div class='add'>+</div><div class='ctx'> static ssize_t sdebug_add_host_show(struct device_driver * ddp, char * buf)</div><div class='ctx'> {</div><div class='ctx'>         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_add_host);</div><div class='hunk'>@@ -1692,14 +2519,19 @@ static void do_remove_driverfs_files(void)</div><div class='ctx'> </div><div class='ctx'> static int __init scsi_debug_init(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned long sz;</div><div class='add'>+	unsigned int sz;</div><div class='ctx'> 	int host_to_add;</div><div class='ctx'> 	int k;</div><div class='ctx'> </div><div class='ctx'> 	if (scsi_debug_dev_size_mb &lt; 1)</div><div class='ctx'> 		scsi_debug_dev_size_mb = 1;  /* force minimum 1 MB ramdisk */</div><div class='del'>-	sdebug_store_size = (unsigned long)scsi_debug_dev_size_mb * 1048576;</div><div class='del'>-	sdebug_capacity = sdebug_store_size / SECT_SIZE;</div><div class='add'>+	sdebug_store_size = (unsigned int)scsi_debug_dev_size_mb * 1048576;</div><div class='add'>+	sdebug_store_sectors = sdebug_store_size / SECT_SIZE;</div><div class='add'>+	if (scsi_debug_virtual_gb &gt; 0) {</div><div class='add'>+		sdebug_capacity = 2048 * 1024;</div><div class='add'>+		sdebug_capacity *= scsi_debug_virtual_gb;</div><div class='add'>+	} else</div><div class='add'>+		sdebug_capacity = sdebug_store_sectors;</div><div class='ctx'> </div><div class='ctx'> 	/* play around with geometry, don't waste too much on track 0 */</div><div class='ctx'> 	sdebug_heads = 8;</div><div class='hunk'>@@ -1813,7 +2645,7 @@ static int sdebug_add_adapter(void)</div><div class='ctx'>         struct sdebug_dev_info *sdbg_devinfo;</div><div class='ctx'>         struct list_head *lh, *lh_sf;</div><div class='ctx'> </div><div class='del'>-        sdbg_host = kzalloc(sizeof(*sdbg_host), GFP_KERNEL);</div><div class='add'>+        sdbg_host = kzalloc(sizeof(*sdbg_host),GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'>         if (NULL == sdbg_host) {</div><div class='ctx'>                 printk(KERN_ERR "%s: out of memory at line %d\n",</div><div class='hunk'>@@ -1825,7 +2657,7 @@ static int sdebug_add_adapter(void)</div><div class='ctx'> </div><div class='ctx'> 	devs_per_host = scsi_debug_num_tgts * scsi_debug_max_luns;</div><div class='ctx'>         for (k = 0; k &lt; devs_per_host; k++) {</div><div class='del'>-                sdbg_devinfo = kzalloc(sizeof(*sdbg_devinfo), GFP_KERNEL);</div><div class='add'>+                sdbg_devinfo = kzalloc(sizeof(*sdbg_devinfo),GFP_KERNEL);</div><div class='ctx'>                 if (NULL == sdbg_devinfo) {</div><div class='ctx'>                         printk(KERN_ERR "%s: out of memory at line %d\n",</div><div class='ctx'>                                __FUNCTION__, __LINE__);</div><div class='hunk'>@@ -1906,7 +2738,7 @@ static int sdebug_driver_probe(struct device * dev)</div><div class='ctx'> 		hpnt-&gt;max_id = scsi_debug_num_tgts + 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		hpnt-&gt;max_id = scsi_debug_num_tgts;</div><div class='del'>-	hpnt-&gt;max_lun = scsi_debug_max_luns;</div><div class='add'>+	hpnt-&gt;max_lun = SAM2_WLUN_REPORT_LUNS;	/* = scsi_debug_max_luns; */</div><div class='ctx'> </div><div class='ctx'>         error = scsi_add_host(hpnt, &amp;sdbg_host-&gt;dev);</div><div class='ctx'>         if (error) {</div><div class='hunk'>@@ -1960,7 +2792,7 @@ static void sdebug_max_tgts_luns(void)</div><div class='ctx'> 			hpnt-&gt;max_id = scsi_debug_num_tgts + 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			hpnt-&gt;max_id = scsi_debug_num_tgts;</div><div class='del'>-		hpnt-&gt;max_lun = scsi_debug_max_luns;</div><div class='add'>+		hpnt-&gt;max_lun = SAM2_WLUN_REPORT_LUNS; /* scsi_debug_max_luns; */</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;sdebug_host_list_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c<br/>index 62f8cb7b3d2b..3d0429bc14ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_devinfo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_devinfo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_devinfo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_devinfo.c</a></div><div class='hunk'>@@ -159,8 +159,10 @@ static struct {</div><div class='ctx'> 	{"HITACHI", "DF400", "*", BLIST_SPARSELUN},</div><div class='ctx'> 	{"HITACHI", "DF500", "*", BLIST_SPARSELUN},</div><div class='ctx'> 	{"HITACHI", "DF600", "*", BLIST_SPARSELUN},</div><div class='add'>+	{"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},</div><div class='add'>+	{"HITACHI", "OPEN-E", "*", BLIST_ATTACH_PQ3 | BLIST_SPARSELUN | BLIST_LARGELUN},</div><div class='ctx'> 	{"HP", "A6189A", NULL, BLIST_SPARSELUN | BLIST_LARGELUN},	/* HP VA7400 */</div><div class='del'>-	{"HP", "OPEN-", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, /* HP XP Arrays */</div><div class='add'>+	{"HP", "OPEN-", "*", BLIST_REPORTLUN2}, /* HP XP Arrays */</div><div class='ctx'> 	{"HP", "NetRAID-4M", NULL, BLIST_FORCELUN},</div><div class='ctx'> 	{"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},</div><div class='ctx'> 	{"HP", "C1557A", NULL, BLIST_FORCELUN},</div><div class='head'>diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c<br/>index 1c75646f9689..6683d596234a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_error.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_error.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_error.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_error.c</a></div><div class='hunk'>@@ -26,13 +26,13 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_dbg.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_ioctl.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "scsi_priv.h"</div><div class='ctx'> #include "scsi_logging.h"</div><div class='hunk'>@@ -58,6 +58,28 @@ void scsi_eh_wakeup(struct Scsi_Host *shost)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * scsi_schedule_eh - schedule EH for SCSI host</div><div class='add'>+ * @shost:	SCSI host to invoke error handling on.</div><div class='add'>+ *</div><div class='add'>+ * Schedule SCSI EH without scmd.</div><div class='add'>+ **/</div><div class='add'>+void scsi_schedule_eh(struct Scsi_Host *shost)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (scsi_host_set_state(shost, SHOST_RECOVERY) == 0 ||</div><div class='add'>+	    scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY) == 0) {</div><div class='add'>+		shost-&gt;host_eh_scheduled++;</div><div class='add'>+		scsi_eh_wakeup(shost);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(scsi_schedule_eh);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * scsi_eh_scmd_add - add scsi cmd to error handling.</div><div class='ctx'>  * @scmd:	scmd to run eh on.</div><div class='ctx'>  * @eh_flag:	optional SCSI_EH flag.</div><div class='hunk'>@@ -452,7 +474,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)</div><div class='ctx'> 			(sdev-&gt;lun &lt;&lt; 5 &amp; 0xe0);</div><div class='ctx'> </div><div class='ctx'> 	shost-&gt;eh_action = &amp;done;</div><div class='del'>-	scmd-&gt;request-&gt;rq_status = RQ_SCSI_BUSY;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 	scsi_log_send(scmd);</div><div class='hunk'>@@ -461,7 +482,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)</div><div class='ctx'> </div><div class='ctx'> 	timeleft = wait_for_completion_timeout(&amp;done, timeout);</div><div class='ctx'> </div><div class='del'>-	scmd-&gt;request-&gt;rq_status = RQ_SCSI_DONE;</div><div class='ctx'> 	shost-&gt;eh_action = NULL;</div><div class='ctx'> </div><div class='ctx'> 	scsi_log_completion(scmd, SUCCESS);</div><div class='hunk'>@@ -1517,7 +1537,7 @@ int scsi_error_handler(void *data)</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='del'>-		if (shost-&gt;host_failed == 0 ||</div><div class='add'>+		if ((shost-&gt;host_failed == 0 &amp;&amp; shost-&gt;host_eh_scheduled == 0) ||</div><div class='ctx'> 		    shost-&gt;host_failed != shost-&gt;host_busy) {</div><div class='ctx'> 			SCSI_LOG_ERROR_RECOVERY(1,</div><div class='ctx'> 				printk("Error handler scsi_eh_%d sleeping\n",</div><div class='hunk'>@@ -1652,12 +1672,13 @@ int</div><div class='ctx'> scsi_reset_provider(struct scsi_device *dev, int flag)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_cmnd *scmd = scsi_get_command(dev, GFP_KERNEL);</div><div class='add'>+	struct Scsi_Host *shost = dev-&gt;host;</div><div class='ctx'> 	struct request req;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int rtn;</div><div class='ctx'> </div><div class='ctx'> 	scmd-&gt;request = &amp;req;</div><div class='ctx'> 	memset(&amp;scmd-&gt;eh_timeout, 0, sizeof(scmd-&gt;eh_timeout));</div><div class='del'>-	scmd-&gt;request-&gt;rq_status      	= RQ_SCSI_BUSY;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;scmd-&gt;cmnd, '\0', sizeof(scmd-&gt;cmnd));</div><div class='ctx'>     </div><div class='hunk'>@@ -1671,8 +1692,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)</div><div class='ctx'> 	scmd-&gt;cmd_len			= 0;</div><div class='ctx'> </div><div class='ctx'> 	scmd-&gt;sc_data_direction		= DMA_BIDIRECTIONAL;</div><div class='del'>-	scmd-&gt;sc_request		= NULL;</div><div class='del'>-	scmd-&gt;sc_magic			= SCSI_CMND_MAGIC;</div><div class='ctx'> </div><div class='ctx'> 	init_timer(&amp;scmd-&gt;eh_timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -1682,6 +1701,10 @@ scsi_reset_provider(struct scsi_device *dev, int flag)</div><div class='ctx'> 	 */</div><div class='ctx'> 	scmd-&gt;pid			= 0;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='add'>+	shost-&gt;tmf_in_progress = 1;</div><div class='add'>+	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	switch (flag) {</div><div class='ctx'> 	case SCSI_TRY_RESET_DEVICE:</div><div class='ctx'> 		rtn = scsi_try_bus_device_reset(scmd);</div><div class='hunk'>@@ -1700,6 +1723,22 @@ scsi_reset_provider(struct scsi_device *dev, int flag)</div><div class='ctx'> 		rtn = FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='add'>+	shost-&gt;tmf_in_progress = 0;</div><div class='add'>+	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * be sure to wake up anyone who was sleeping or had their queue</div><div class='add'>+	 * suspended while we performed the TMF.</div><div class='add'>+	 */</div><div class='add'>+	SCSI_LOG_ERROR_RECOVERY(3,</div><div class='add'>+		printk("%s: waking up host to restart after TMF\n",</div><div class='add'>+		__FUNCTION__));</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;shost-&gt;host_wait);</div><div class='add'>+</div><div class='add'>+	scsi_run_host_queues(shost);</div><div class='add'>+</div><div class='ctx'> 	scsi_next_command(scmd);</div><div class='ctx'> 	return rtn;</div><div class='ctx'> }</div><div class='hunk'>@@ -1769,14 +1808,6 @@ int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_normalize_sense);</div><div class='ctx'> </div><div class='del'>-int scsi_request_normalize_sense(struct scsi_request *sreq,</div><div class='del'>-				 struct scsi_sense_hdr *sshdr)</div><div class='del'>-{</div><div class='del'>-	return scsi_normalize_sense(sreq-&gt;sr_sense_buffer,</div><div class='del'>-			sizeof(sreq-&gt;sr_sense_buffer), sshdr);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(scsi_request_normalize_sense);</div><div class='del'>-</div><div class='ctx'> int scsi_command_normalize_sense(struct scsi_cmnd *cmd,</div><div class='ctx'> 				 struct scsi_sense_hdr *sshdr)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c<br/>index a89aff61d3d8..a89c4115cfba 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_ioctl.c</a></div><div class='hunk'>@@ -15,11 +15,11 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_ioctl.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;scsi/sg.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_dbg.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c<br/>index faee4757c03a..08af9aae7df3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_lib.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_lib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_lib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_lib.c</a></div><div class='hunk'>@@ -19,18 +19,18 @@</div><div class='ctx'> #include &lt;linux/hardirq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_dbg.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_driver.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "scsi_priv.h"</div><div class='ctx'> #include "scsi_logging.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define SG_MEMPOOL_NR		(sizeof(scsi_sg_pools)/sizeof(struct scsi_host_sg_pool))</div><div class='add'>+#define SG_MEMPOOL_NR		ARRAY_SIZE(scsi_sg_pools)</div><div class='ctx'> #define SG_MEMPOOL_SIZE		32</div><div class='ctx'> </div><div class='ctx'> struct scsi_host_sg_pool {</div><div class='hunk'>@@ -83,7 +83,7 @@ static void scsi_unprep_request(struct request *req)</div><div class='ctx'> 	struct scsi_cmnd *cmd = req-&gt;special;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;flags &amp;= ~REQ_DONTPREP;</div><div class='del'>-	req-&gt;special = (req-&gt;flags &amp; REQ_SPECIAL) ? cmd-&gt;sc_request : NULL;</div><div class='add'>+	req-&gt;special = NULL;</div><div class='ctx'> </div><div class='ctx'> 	scsi_put_command(cmd);</div><div class='ctx'> }</div><div class='hunk'>@@ -161,72 +161,6 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Function:    scsi_do_req</div><div class='del'>- *</div><div class='del'>- * Purpose:     Queue a SCSI request</div><div class='del'>- *</div><div class='del'>- * Arguments:   sreq	  - command descriptor.</div><div class='del'>- *              cmnd      - actual SCSI command to be performed.</div><div class='del'>- *              buffer    - data buffer.</div><div class='del'>- *              bufflen   - size of data buffer.</div><div class='del'>- *              done      - completion function to be run.</div><div class='del'>- *              timeout   - how long to let it run before timeout.</div><div class='del'>- *              retries   - number of retries we allow.</div><div class='del'>- *</div><div class='del'>- * Lock status: No locks held upon entry.</div><div class='del'>- *</div><div class='del'>- * Returns:     Nothing.</div><div class='del'>- *</div><div class='del'>- * Notes:	This function is only used for queueing requests for things</div><div class='del'>- *		like ioctls and character device requests - this is because</div><div class='del'>- *		we essentially just inject a request into the queue for the</div><div class='del'>- *		device.</div><div class='del'>- *</div><div class='del'>- *		In order to support the scsi_device_quiesce function, we</div><div class='del'>- *		now inject requests on the *head* of the device queue</div><div class='del'>- *		rather than the tail.</div><div class='del'>- */</div><div class='del'>-void scsi_do_req(struct scsi_request *sreq, const void *cmnd,</div><div class='del'>-		 void *buffer, unsigned bufflen,</div><div class='del'>-		 void (*done)(struct scsi_cmnd *),</div><div class='del'>-		 int timeout, int retries)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * If the upper level driver is reusing these things, then</div><div class='del'>-	 * we should release the low-level block now.  Another one will</div><div class='del'>-	 * be allocated later when this request is getting queued.</div><div class='del'>-	 */</div><div class='del'>-	__scsi_release_request(sreq);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Our own function scsi_done (which marks the host as not busy,</div><div class='del'>-	 * disables the timeout counter, etc) will be called by us or by the</div><div class='del'>-	 * scsi_hosts[host].queuecommand() function needs to also call</div><div class='del'>-	 * the completion function for the high level driver.</div><div class='del'>-	 */</div><div class='del'>-	memcpy(sreq-&gt;sr_cmnd, cmnd, sizeof(sreq-&gt;sr_cmnd));</div><div class='del'>-	sreq-&gt;sr_bufflen = bufflen;</div><div class='del'>-	sreq-&gt;sr_buffer = buffer;</div><div class='del'>-	sreq-&gt;sr_allowed = retries;</div><div class='del'>-	sreq-&gt;sr_done = done;</div><div class='del'>-	sreq-&gt;sr_timeout_per_command = timeout;</div><div class='del'>-</div><div class='del'>-	if (sreq-&gt;sr_cmd_len == 0)</div><div class='del'>-		sreq-&gt;sr_cmd_len = COMMAND_SIZE(sreq-&gt;sr_cmnd[0]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * head injection *required* here otherwise quiesce won't work</div><div class='del'>-	 *</div><div class='del'>-	 * Because users of this function are apt to reuse requests with no</div><div class='del'>-	 * modification, we have to sanitise the request flags here</div><div class='del'>-	 */</div><div class='del'>-	sreq-&gt;sr_request-&gt;flags &amp;= ~REQ_DONTPREP;</div><div class='del'>-	blk_insert_request(sreq-&gt;sr_device-&gt;request_queue, sreq-&gt;sr_request,</div><div class='del'>-		       	   1, sreq);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(scsi_do_req);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * scsi_execute - insert request and wait for the result</div><div class='ctx'>  * @sdev:	scsi device</div><div class='hunk'>@@ -566,7 +500,7 @@ void scsi_device_unbusy(struct scsi_device *sdev)</div><div class='ctx'> 	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 	shost-&gt;host_busy--;</div><div class='ctx'> 	if (unlikely(scsi_host_in_recovery(shost) &amp;&amp;</div><div class='del'>-		     shost-&gt;host_failed))</div><div class='add'>+		     (shost-&gt;host_failed || shost-&gt;host_eh_scheduled)))</div><div class='ctx'> 		scsi_eh_wakeup(shost);</div><div class='ctx'> 	spin_unlock(shost-&gt;host_lock);</div><div class='ctx'> 	spin_lock(sdev-&gt;request_queue-&gt;queue_lock);</div><div class='hunk'>@@ -921,8 +855,7 @@ static void scsi_release_buffers(struct scsi_cmnd *cmd)</div><div class='ctx'>  *		b) We can just use scsi_requeue_command() here.  This would</div><div class='ctx'>  *		   be used if we just wanted to retry, for example.</div><div class='ctx'>  */</div><div class='del'>-void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,</div><div class='del'>-			unsigned int block_bytes)</div><div class='add'>+void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	int result = cmd-&gt;result;</div><div class='ctx'> 	int this_count = cmd-&gt;bufflen;</div><div class='hunk'>@@ -987,87 +920,70 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,</div><div class='ctx'> 	 * Next deal with any sectors which we were able to correctly</div><div class='ctx'> 	 * handle.</div><div class='ctx'> 	 */</div><div class='del'>-	if (good_bytes &gt;= 0) {</div><div class='del'>-		SCSI_LOG_HLCOMPLETE(1, printk("%ld sectors total, %d bytes done.\n",</div><div class='del'>-					      req-&gt;nr_sectors, good_bytes));</div><div class='del'>-		SCSI_LOG_HLCOMPLETE(1, printk("use_sg is %d\n", cmd-&gt;use_sg));</div><div class='add'>+	SCSI_LOG_HLCOMPLETE(1, printk("%ld sectors total, "</div><div class='add'>+				      "%d bytes done.\n",</div><div class='add'>+				      req-&gt;nr_sectors, good_bytes));</div><div class='add'>+	SCSI_LOG_HLCOMPLETE(1, printk("use_sg is %d\n", cmd-&gt;use_sg));</div><div class='ctx'> </div><div class='del'>-		if (clear_errors)</div><div class='del'>-			req-&gt;errors = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * If multiple sectors are requested in one buffer, then</div><div class='del'>-		 * they will have been finished off by the first command.</div><div class='del'>-		 * If not, then we have a multi-buffer command.</div><div class='del'>-		 *</div><div class='del'>-		 * If block_bytes != 0, it means we had a medium error</div><div class='del'>-		 * of some sort, and that we want to mark some number of</div><div class='del'>-		 * sectors as not uptodate.  Thus we want to inhibit</div><div class='del'>-		 * requeueing right here - we will requeue down below</div><div class='del'>-		 * when we handle the bad sectors.</div><div class='del'>-		 */</div><div class='add'>+	if (clear_errors)</div><div class='add'>+		req-&gt;errors = 0;</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * If the command completed without error, then either</div><div class='del'>-		 * finish off the rest of the command, or start a new one.</div><div class='del'>-		 */</div><div class='del'>-		if (scsi_end_request(cmd, 1, good_bytes, result == 0) == NULL)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Now, if we were good little boys and girls, Santa left us a request</div><div class='del'>-	 * sense buffer.  We can extract information from this, so we</div><div class='del'>-	 * can choose a block to remap, etc.</div><div class='add'>+	/* A number of bytes were successfully read.  If there</div><div class='add'>+	 * are leftovers and there is some kind of error</div><div class='add'>+	 * (result != 0), retry the rest.</div><div class='add'>+	 */</div><div class='add'>+	if (scsi_end_request(cmd, 1, good_bytes, result == 0) == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* good_bytes = 0, or (inclusive) there were leftovers and</div><div class='add'>+	 * result = 0, so scsi_end_request couldn't retry.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (sense_valid &amp;&amp; !sense_deferred) {</div><div class='ctx'> 		switch (sshdr.sense_key) {</div><div class='ctx'> 		case UNIT_ATTENTION:</div><div class='ctx'> 			if (cmd-&gt;device-&gt;removable) {</div><div class='del'>-				/* detected disc change.  set a bit </div><div class='add'>+				/* Detected disc change.  Set a bit</div><div class='ctx'> 				 * and quietly refuse further access.</div><div class='ctx'> 				 */</div><div class='ctx'> 				cmd-&gt;device-&gt;changed = 1;</div><div class='del'>-				scsi_end_request(cmd, 0,</div><div class='del'>-						this_count, 1);</div><div class='add'>+				scsi_end_request(cmd, 0, this_count, 1);</div><div class='ctx'> 				return;</div><div class='ctx'> 			} else {</div><div class='del'>-				/*</div><div class='del'>-				* Must have been a power glitch, or a</div><div class='del'>-				* bus reset.  Could not have been a</div><div class='del'>-				* media change, so we just retry the</div><div class='del'>-				* request and see what happens.  </div><div class='del'>-				*/</div><div class='add'>+				/* Must have been a power glitch, or a</div><div class='add'>+				 * bus reset.  Could not have been a</div><div class='add'>+				 * media change, so we just retry the</div><div class='add'>+				 * request and see what happens.</div><div class='add'>+				 */</div><div class='ctx'> 				scsi_requeue_command(q, cmd);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case ILLEGAL_REQUEST:</div><div class='del'>-			/*</div><div class='del'>-		 	* If we had an ILLEGAL REQUEST returned, then we may</div><div class='del'>-		 	* have performed an unsupported command.  The only</div><div class='del'>-		 	* thing this should be would be a ten byte read where</div><div class='del'>-			* only a six byte read was supported.  Also, on a</div><div class='del'>-			* system where READ CAPACITY failed, we may have read</div><div class='del'>-			* past the end of the disk.</div><div class='del'>-		 	*/</div><div class='add'>+			/* If we had an ILLEGAL REQUEST returned, then</div><div class='add'>+			 * we may have performed an unsupported</div><div class='add'>+			 * command.  The only thing this should be</div><div class='add'>+			 * would be a ten byte read where only a six</div><div class='add'>+			 * byte read was supported.  Also, on a system</div><div class='add'>+			 * where READ CAPACITY failed, we may have</div><div class='add'>+			 * read past the end of the disk.</div><div class='add'>+			 */</div><div class='ctx'> 			if ((cmd-&gt;device-&gt;use_10_for_rw &amp;&amp;</div><div class='ctx'> 			    sshdr.asc == 0x20 &amp;&amp; sshdr.ascq == 0x00) &amp;&amp;</div><div class='ctx'> 			    (cmd-&gt;cmnd[0] == READ_10 ||</div><div class='ctx'> 			     cmd-&gt;cmnd[0] == WRITE_10)) {</div><div class='ctx'> 				cmd-&gt;device-&gt;use_10_for_rw = 0;</div><div class='del'>-				/*</div><div class='del'>-				 * This will cause a retry with a 6-byte</div><div class='del'>-				 * command.</div><div class='add'>+				/* This will cause a retry with a</div><div class='add'>+				 * 6-byte command.</div><div class='ctx'> 				 */</div><div class='ctx'> 				scsi_requeue_command(q, cmd);</div><div class='del'>-				result = 0;</div><div class='add'>+				return;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				scsi_end_request(cmd, 0, this_count, 1);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case NOT_READY:</div><div class='del'>-			/*</div><div class='del'>-			 * If the device is in the process of becoming</div><div class='add'>+			/* If the device is in the process of becoming</div><div class='ctx'> 			 * ready, or has a temporary blockage, retry.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (sshdr.asc == 0x04) {</div><div class='hunk'>@@ -1087,7 +1003,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,</div><div class='ctx'> 			}</div><div class='ctx'> 			if (!(req-&gt;flags &amp; REQ_QUIET)) {</div><div class='ctx'> 				scmd_printk(KERN_INFO, cmd,</div><div class='del'>-					   "Device not ready: ");</div><div class='add'>+					    "Device not ready: ");</div><div class='ctx'> 				scsi_print_sense_hdr("", &amp;sshdr);</div><div class='ctx'> 			}</div><div class='ctx'> 			scsi_end_request(cmd, 0, this_count, 1);</div><div class='hunk'>@@ -1095,21 +1011,21 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,</div><div class='ctx'> 		case VOLUME_OVERFLOW:</div><div class='ctx'> 			if (!(req-&gt;flags &amp; REQ_QUIET)) {</div><div class='ctx'> 				scmd_printk(KERN_INFO, cmd,</div><div class='del'>-					   "Volume overflow, CDB: ");</div><div class='add'>+					    "Volume overflow, CDB: ");</div><div class='ctx'> 				__scsi_print_command(cmd-&gt;data_cmnd);</div><div class='ctx'> 				scsi_print_sense("", cmd);</div><div class='ctx'> 			}</div><div class='del'>-			scsi_end_request(cmd, 0, block_bytes, 1);</div><div class='add'>+			/* See SSC3rXX or current. */</div><div class='add'>+			scsi_end_request(cmd, 0, this_count, 1);</div><div class='ctx'> 			return;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	}			/* driver byte != 0 */</div><div class='add'>+	}</div><div class='ctx'> 	if (host_byte(result) == DID_RESET) {</div><div class='del'>-		/*</div><div class='del'>-		 * Third party bus reset or reset for error</div><div class='del'>-		 * recovery reasons.  Just retry the request</div><div class='del'>-		 * and see what happens.  </div><div class='add'>+		/* Third party bus reset or reset for error recovery</div><div class='add'>+		 * reasons.  Just retry the request and see what</div><div class='add'>+		 * happens.</div><div class='ctx'> 		 */</div><div class='ctx'> 		scsi_requeue_command(q, cmd);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1117,21 +1033,13 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		if (!(req-&gt;flags &amp; REQ_QUIET)) {</div><div class='ctx'> 			scmd_printk(KERN_INFO, cmd,</div><div class='del'>-				   "SCSI error: return code = 0x%x\n", result);</div><div class='del'>-</div><div class='add'>+				    "SCSI error: return code = 0x%08x\n",</div><div class='add'>+				    result);</div><div class='ctx'> 			if (driver_byte(result) &amp; DRIVER_SENSE)</div><div class='ctx'> 				scsi_print_sense("", cmd);</div><div class='ctx'> 		}</div><div class='del'>-		/*</div><div class='del'>-		 * Mark a single buffer as not uptodate.  Queue the remainder.</div><div class='del'>-		 * We sometimes get this cruft in the event that a medium error</div><div class='del'>-		 * isn't properly reported.</div><div class='del'>-		 */</div><div class='del'>-		block_bytes = req-&gt;hard_cur_sectors &lt;&lt; 9;</div><div class='del'>-		if (!block_bytes)</div><div class='del'>-			block_bytes = req-&gt;data_len;</div><div class='del'>-		scsi_end_request(cmd, 0, block_bytes, 1);</div><div class='ctx'> 	}</div><div class='add'>+	scsi_end_request(cmd, 0, this_count, !result);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(scsi_io_completion);</div><div class='ctx'> </div><div class='hunk'>@@ -1235,7 +1143,7 @@ static void scsi_blk_pc_done(struct scsi_cmnd *cmd)</div><div class='ctx'> 	 * successfully. Since this is a REQ_BLOCK_PC command the</div><div class='ctx'> 	 * caller should check the request's errors value</div><div class='ctx'> 	 */</div><div class='del'>-	scsi_io_completion(cmd, cmd-&gt;bufflen, 0);</div><div class='add'>+	scsi_io_completion(cmd, cmd-&gt;bufflen);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd)</div><div class='hunk'>@@ -1300,15 +1208,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)</div><div class='ctx'> 	 * at request-&gt;cmd, as this tells us the real story.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (req-&gt;flags &amp; REQ_SPECIAL &amp;&amp; req-&gt;special) {</div><div class='del'>-		struct scsi_request *sreq = req-&gt;special;</div><div class='del'>-</div><div class='del'>-		if (sreq-&gt;sr_magic == SCSI_REQ_MAGIC) {</div><div class='del'>-			cmd = scsi_get_command(sreq-&gt;sr_device, GFP_ATOMIC);</div><div class='del'>-			if (unlikely(!cmd))</div><div class='del'>-				goto defer;</div><div class='del'>-			scsi_init_cmd_from_req(cmd, sreq);</div><div class='del'>-		} else</div><div class='del'>-			cmd = req-&gt;special;</div><div class='add'>+		cmd = req-&gt;special;</div><div class='ctx'> 	} else if (req-&gt;flags &amp; (REQ_CMD | REQ_BLOCK_PC)) {</div><div class='ctx'> </div><div class='ctx'> 		if(unlikely(specials_only) &amp;&amp; !(req-&gt;flags &amp; REQ_SPECIAL)) {</div><div class='hunk'>@@ -2124,6 +2024,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)</div><div class='ctx'> 		switch (oldstate) {</div><div class='ctx'> 		case SDEV_CREATED:</div><div class='ctx'> 		case SDEV_RUNNING:</div><div class='add'>+		case SDEV_QUIESCE:</div><div class='ctx'> 		case SDEV_OFFLINE:</div><div class='ctx'> 		case SDEV_BLOCK:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2134,6 +2035,9 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)</div><div class='ctx'> </div><div class='ctx'> 	case SDEV_DEL:</div><div class='ctx'> 		switch (oldstate) {</div><div class='add'>+		case SDEV_CREATED:</div><div class='add'>+		case SDEV_RUNNING:</div><div class='add'>+		case SDEV_OFFLINE:</div><div class='ctx'> 		case SDEV_CANCEL:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -2363,3 +2267,61 @@ scsi_target_unblock(struct device *dev)</div><div class='ctx'> 		device_for_each_child(dev, NULL, target_unblock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(scsi_target_unblock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_kmap_atomic_sg - find and atomically map an sg-elemnt</div><div class='add'>+ * @sg:		scatter-gather list</div><div class='add'>+ * @sg_count:	number of segments in sg</div><div class='add'>+ * @offset:	offset in bytes into sg, on return offset into the mapped area</div><div class='add'>+ * @len:	bytes to map, on return number of bytes mapped</div><div class='add'>+ *</div><div class='add'>+ * Returns virtual address of the start of the mapped page</div><div class='add'>+ */</div><div class='add'>+void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,</div><div class='add'>+			  size_t *offset, size_t *len)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	size_t sg_len = 0, len_complete = 0;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sg_count; i++) {</div><div class='add'>+		len_complete = sg_len; /* Complete sg-entries */</div><div class='add'>+		sg_len += sg[i].length;</div><div class='add'>+		if (sg_len &gt; *offset)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(i == sg_count)) {</div><div class='add'>+		printk(KERN_ERR "%s: Bytes in sg: %zu, requested offset %zu, "</div><div class='add'>+			"elements %d\n",</div><div class='add'>+		       __FUNCTION__, sg_len, *offset, sg_count);</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Offset starting from the beginning of first page in this sg-entry */</div><div class='add'>+	*offset = *offset - len_complete + sg[i].offset;</div><div class='add'>+</div><div class='add'>+	/* Assumption: contiguous pages can be accessed as "page + i" */</div><div class='add'>+	page = nth_page(sg[i].page, (*offset &gt;&gt; PAGE_SHIFT));</div><div class='add'>+	*offset &amp;= ~PAGE_MASK;</div><div class='add'>+</div><div class='add'>+	/* Bytes in this sg-entry from *offset to the end of the page */</div><div class='add'>+	sg_len = PAGE_SIZE - *offset;</div><div class='add'>+	if (*len &gt; sg_len)</div><div class='add'>+		*len = sg_len;</div><div class='add'>+</div><div class='add'>+	return kmap_atomic(page, KM_BIO_SRC_IRQ);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_kmap_atomic_sg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_kunmap_atomic_sg - atomically unmap a virtual address, previously</div><div class='add'>+ *			   mapped with scsi_kmap_atomic_sg</div><div class='add'>+ * @virt:	virtual address to be unmapped</div><div class='add'>+ */</div><div class='add'>+void scsi_kunmap_atomic_sg(void *virt)</div><div class='add'>+{</div><div class='add'>+	kunmap_atomic(virt, KM_BIO_SRC_IRQ);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_kunmap_atomic_sg);</div><div class='head'>diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h<br/>index e1722ba94586..1f65139e14f8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_logging.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_logging.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_logging.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_logging.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef _SCSI_LOGGING_H</div><div class='ctx'> #define _SCSI_LOGGING_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This defines the scsi logging feature.  It is a means by which the user</div><div class='hunk'>@@ -45,10 +44,12 @@ extern unsigned int scsi_logging_level;</div><div class='ctx'>         ((scsi_logging_level &gt;&gt; (SHIFT)) &amp; ((1 &lt;&lt; (BITS)) - 1))</div><div class='ctx'> </div><div class='ctx'> #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)		\</div><div class='del'>-{								\</div><div class='add'>+do {								\</div><div class='ctx'>         if (unlikely((SCSI_LOG_LEVEL(SHIFT, BITS)) &gt; (LEVEL)))	\</div><div class='del'>-		(CMD);						\</div><div class='del'>-}</div><div class='add'>+		do {						\</div><div class='add'>+			CMD;					\</div><div class='add'>+		} while (0);					\</div><div class='add'>+} while (0)</div><div class='ctx'> #else</div><div class='ctx'> #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)</div><div class='ctx'> #endif /* CONFIG_SCSI_LOGGING */</div><div class='head'>diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h<br/>index 27c48274e8cb..e2fbe9a9d5a9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_priv.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_priv.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_priv.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_priv.h</a></div><div class='hunk'>@@ -1,24 +1,16 @@</div><div class='ctx'> #ifndef _SCSI_PRIV_H</div><div class='ctx'> #define _SCSI_PRIV_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct request_queue;</div><div class='ctx'> struct scsi_cmnd;</div><div class='ctx'> struct scsi_device;</div><div class='ctx'> struct scsi_host_template;</div><div class='del'>-struct scsi_request;</div><div class='ctx'> struct Scsi_Host;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Magic values for certain scsi structs. Shouldn't ever be used.</div><div class='del'>- */</div><div class='del'>-#define SCSI_CMND_MAGIC		0xE25C23A5</div><div class='del'>-#define SCSI_REQ_MAGIC		0x75F6D354</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Scsi Error Handler Flags</div><div class='ctx'>  */</div><div class='ctx'> #define SCSI_EH_CANCEL_CMD	0x0001	/* Cancel this cmd */</div><div class='hunk'>@@ -34,9 +26,6 @@ extern void scsi_exit_hosts(void);</div><div class='ctx'> extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd);</div><div class='ctx'> extern int scsi_setup_command_freelist(struct Scsi_Host *shost);</div><div class='ctx'> extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);</div><div class='del'>-extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd,</div><div class='del'>-		struct scsi_request *sreq);</div><div class='del'>-extern void __scsi_release_request(struct scsi_request *sreq);</div><div class='ctx'> extern void __scsi_done(struct scsi_cmnd *cmd);</div><div class='ctx'> extern int scsi_retry_command(struct scsi_cmnd *cmd);</div><div class='ctx'> #ifdef CONFIG_SCSI_LOGGING</div><div class='hunk'>@@ -127,7 +116,7 @@ extern struct bus_type scsi_bus_type;</div><div class='ctx'>  * classes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT	(HZ*60)</div><div class='add'>+#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT	600	/* units in seconds */</div><div class='ctx'> extern int scsi_internal_device_block(struct scsi_device *sdev);</div><div class='ctx'> extern int scsi_internal_device_unblock(struct scsi_device *sdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c<br/>index 07be62bbaaea..55200e4fdf11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_proc.c</a></div><div class='hunk'>@@ -266,8 +266,6 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,</div><div class='ctx'> 		lun = simple_strtoul(p + 1, &amp;p, 0);</div><div class='ctx'> </div><div class='ctx'> 		err = scsi_add_single_device(host, channel, id, lun);</div><div class='del'>-		if (err &gt;= 0)</div><div class='del'>-			err = length;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Usage: echo "scsi remove-single-device 0 1 2 3" &gt;/proc/scsi/scsi</div><div class='hunk'>@@ -284,6 +282,13 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,</div><div class='ctx'> 		err = scsi_remove_single_device(host, channel, id, lun);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * convert success returns so that we return the </div><div class='add'>+	 * number of bytes consumed.</div><div class='add'>+	 */</div><div class='add'>+	if (!err)</div><div class='add'>+		err = length;</div><div class='add'>+</div><div class='ctx'>  out:</div><div class='ctx'> 	free_page((unsigned long)buffer);</div><div class='ctx'> 	return err;</div><div class='head'>diff --git a/drivers/scsi/scsi_sas_internal.h b/drivers/scsi/scsi_sas_internal.h<br/>index d76e6e3d8ca5..e1edab45a37b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_sas_internal.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_sas_internal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_sas_internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_sas_internal.h</a></div><div class='hunk'>@@ -2,7 +2,8 @@</div><div class='ctx'> #define _SCSI_SAS_INTERNAL_H</div><div class='ctx'> </div><div class='ctx'> #define SAS_HOST_ATTRS		0</div><div class='del'>-#define SAS_PORT_ATTRS		17</div><div class='add'>+#define SAS_PHY_ATTRS		17</div><div class='add'>+#define SAS_PORT_ATTRS		1</div><div class='ctx'> #define SAS_RPORT_ATTRS		7</div><div class='ctx'> #define SAS_END_DEV_ATTRS	3</div><div class='ctx'> #define SAS_EXPANDER_ATTRS	7</div><div class='hunk'>@@ -13,12 +14,14 @@ struct sas_internal {</div><div class='ctx'> 	struct sas_domain_function_template *dft;</div><div class='ctx'> </div><div class='ctx'> 	struct class_device_attribute private_host_attrs[SAS_HOST_ATTRS];</div><div class='del'>-	struct class_device_attribute private_phy_attrs[SAS_PORT_ATTRS];</div><div class='add'>+	struct class_device_attribute private_phy_attrs[SAS_PHY_ATTRS];</div><div class='add'>+	struct class_device_attribute private_port_attrs[SAS_PORT_ATTRS];</div><div class='ctx'> 	struct class_device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];</div><div class='ctx'> 	struct class_device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];</div><div class='ctx'> 	struct class_device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];</div><div class='ctx'> </div><div class='ctx'> 	struct transport_container phy_attr_cont;</div><div class='add'>+	struct transport_container port_attr_cont;</div><div class='ctx'> 	struct transport_container rphy_attr_cont;</div><div class='ctx'> 	struct transport_container end_dev_attr_cont;</div><div class='ctx'> 	struct transport_container expander_attr_cont;</div><div class='hunk'>@@ -28,7 +31,8 @@ struct sas_internal {</div><div class='ctx'> 	 * needed by scsi_sysfs.c</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct class_device_attribute *host_attrs[SAS_HOST_ATTRS + 1];</div><div class='del'>-	struct class_device_attribute *phy_attrs[SAS_PORT_ATTRS + 1];</div><div class='add'>+	struct class_device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];</div><div class='add'>+	struct class_device_attribute *port_attrs[SAS_PORT_ATTRS + 1];</div><div class='ctx'> 	struct class_device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];</div><div class='ctx'> 	struct class_device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];</div><div class='ctx'> 	struct class_device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];</div><div class='head'>diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c<br/>index 1a5474bd11a1..1bd92b9b46d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_scan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_scan.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * 		or a LUN is seen that cannot have a device attached to it.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -33,11 +32,11 @@</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='add'>+#include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_driver.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_devinfo.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_host.h&gt;</div><div class='del'>-#include &lt;scsi/scsi_request.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_transport.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_eh.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -810,12 +809,39 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)</div><div class='ctx'> </div><div class='ctx'> static inline void scsi_destroy_sdev(struct scsi_device *sdev)</div><div class='ctx'> {</div><div class='add'>+	scsi_device_set_state(sdev, SDEV_DEL);</div><div class='ctx'> 	if (sdev-&gt;host-&gt;hostt-&gt;slave_destroy)</div><div class='ctx'> 		sdev-&gt;host-&gt;hostt-&gt;slave_destroy(sdev);</div><div class='ctx'> 	transport_destroy_device(&amp;sdev-&gt;sdev_gendev);</div><div class='ctx'> 	put_device(&amp;sdev-&gt;sdev_gendev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SCSI_LOGGING</div><div class='add'>+/** </div><div class='add'>+ * scsi_inq_str - print INQUIRY data from min to max index,</div><div class='add'>+ * strip trailing whitespace</div><div class='add'>+ * @buf:   Output buffer with at least end-first+1 bytes of space</div><div class='add'>+ * @inq:   Inquiry buffer (input)</div><div class='add'>+ * @first: Offset of string into inq</div><div class='add'>+ * @end:   Index after last character in inq</div><div class='add'>+ */</div><div class='add'>+static unsigned char *scsi_inq_str(unsigned char *buf, unsigned char *inq,</div><div class='add'>+				   unsigned first, unsigned end)</div><div class='add'>+{</div><div class='add'>+	unsigned term = 0, idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx + first &lt; end &amp;&amp; idx + first &lt; inq[4] + 5; idx++) {</div><div class='add'>+		if (inq[idx+first] &gt; ' ') {</div><div class='add'>+			buf[idx] = inq[idx+first];</div><div class='add'>+			term = idx+1;</div><div class='add'>+		} else {</div><div class='add'>+			buf[idx] = ' ';</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	buf[term] = 0;</div><div class='add'>+	return buf;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it</div><div class='hunk'>@@ -880,10 +906,12 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'> 	if (scsi_probe_lun(sdev, result, result_len, &amp;bflags))</div><div class='ctx'> 		goto out_free_result;</div><div class='ctx'> </div><div class='add'>+	if (bflagsp)</div><div class='add'>+		*bflagsp = bflags;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * result contains valid SCSI INQUIRY data.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((result[0] &gt;&gt; 5) == 3) {</div><div class='add'>+	if (((result[0] &gt;&gt; 5) == 3) &amp;&amp; !(bflags &amp; BLIST_ATTACH_PQ3)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * For a Peripheral qualifier 3 (011b), the SCSI</div><div class='ctx'> 		 * spec says: The device server is not capable of</div><div class='hunk'>@@ -894,9 +922,22 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'> 		 * logical disk configured at sdev-&gt;lun, but there</div><div class='ctx'> 		 * is a target id responding.</div><div class='ctx'> 		 */</div><div class='del'>-		SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO</div><div class='del'>-					"scsi scan: peripheral qualifier of 3,"</div><div class='del'>-					" no device added\n"));</div><div class='add'>+		SCSI_LOG_SCAN_BUS(2, sdev_printk(KERN_INFO, sdev, "scsi scan:"</div><div class='add'>+				   " peripheral qualifier of 3, device not"</div><div class='add'>+				   " added\n"))</div><div class='add'>+		if (lun == 0) {</div><div class='add'>+			SCSI_LOG_SCAN_BUS(1, {</div><div class='add'>+				unsigned char vend[9];</div><div class='add'>+				unsigned char mod[17];</div><div class='add'>+</div><div class='add'>+				sdev_printk(KERN_INFO, sdev,</div><div class='add'>+					"scsi scan: consider passing scsi_mod."</div><div class='add'>+					"dev_flags=%s:%s:0x240 or 0x800240\n",</div><div class='add'>+					scsi_inq_str(vend, result, 8, 16),</div><div class='add'>+					scsi_inq_str(mod, result, 16, 32));</div><div class='add'>+			});</div><div class='add'>+		}</div><div class='add'>+		</div><div class='ctx'> 		res = SCSI_SCAN_TARGET_PRESENT;</div><div class='ctx'> 		goto out_free_result;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -920,8 +961,6 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'> 			sdev-&gt;lockable = 0;</div><div class='ctx'> 			scsi_unlock_floptical(sdev, result);</div><div class='ctx'> 		}</div><div class='del'>-		if (bflagsp)</div><div class='del'>-			*bflagsp = bflags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out_free_result:</div><div class='hunk'>@@ -946,7 +985,6 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'>  * scsi_sequential_lun_scan - sequentially scan a SCSI target</div><div class='ctx'>  * @starget:	pointer to target structure to scan</div><div class='ctx'>  * @bflags:	black/white list flag for LUN 0</div><div class='del'>- * @lun0_res:	result of scanning LUN 0</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *     Generally, scan from LUN 1 (LUN 0 is assumed to already have been</div><div class='hunk'>@@ -956,8 +994,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,</div><div class='ctx'>  *     Modifies sdevscan-&gt;lun.</div><div class='ctx'>  **/</div><div class='ctx'> static void scsi_sequential_lun_scan(struct scsi_target *starget,</div><div class='del'>-				     int bflags, int lun0_res, int scsi_level,</div><div class='del'>-				     int rescan)</div><div class='add'>+				     int bflags, int scsi_level, int rescan)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int sparse_lun, lun, max_dev_lun;</div><div class='ctx'> 	struct Scsi_Host *shost = dev_to_shost(starget-&gt;dev.parent);</div><div class='hunk'>@@ -978,13 +1015,6 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,</div><div class='ctx'> 		sparse_lun = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If not sparse lun and no device attached at LUN 0 do not scan</div><div class='del'>-	 * any further.</div><div class='del'>-	 */</div><div class='del'>-	if (!sparse_lun &amp;&amp; (lun0_res != SCSI_SCAN_LUN_PRESENT))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * If less than SCSI_1_CSS, and no special lun scaning, stop</div><div class='ctx'> 	 * scanning; this matches 2.4 behaviour, but could just be a bug</div><div class='ctx'> 	 * (to continue scanning a SCSI_1_CSS device).</div><div class='hunk'>@@ -1395,7 +1425,7 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,</div><div class='ctx'> 			 * do a sequential scan.</div><div class='ctx'> 			 */</div><div class='ctx'> 			scsi_sequential_lun_scan(starget, bflags,</div><div class='del'>-				       	res, starget-&gt;scsi_level, rescan);</div><div class='add'>+						 starget-&gt;scsi_level, rescan);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  out_reap:</div><div class='hunk'>@@ -1473,7 +1503,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,</div><div class='ctx'> 		__FUNCTION__, channel, id, lun));</div><div class='ctx'> </div><div class='ctx'> 	if (((channel != SCAN_WILD_CARD) &amp;&amp; (channel &gt; shost-&gt;max_channel)) ||</div><div class='del'>-	    ((id != SCAN_WILD_CARD) &amp;&amp; (id &gt; shost-&gt;max_id)) ||</div><div class='add'>+	    ((id != SCAN_WILD_CARD) &amp;&amp; (id &gt;= shost-&gt;max_id)) ||</div><div class='ctx'> 	    ((lun != SCAN_WILD_CARD) &amp;&amp; (lun &gt; shost-&gt;max_lun)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c<br/>index a6fde52946d6..e7fe565b96de 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_sysfs.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Created to pull SCSI mid layer sysfs routines into one file.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -39,7 +38,7 @@ const char *scsi_device_state_name(enum scsi_device_state state)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *name = NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(sdev_states)/sizeof(sdev_states[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sdev_states); i++) {</div><div class='ctx'> 		if (sdev_states[i].value == state) {</div><div class='ctx'> 			name = sdev_states[i].name;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -65,7 +64,7 @@ const char *scsi_host_state_name(enum scsi_host_state state)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	char *name = NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(shost_states)/sizeof(shost_states[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(shost_states); i++) {</div><div class='ctx'> 		if (shost_states[i].value == state) {</div><div class='ctx'> 			name = shost_states[i].name;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -160,7 +159,7 @@ store_shost_state(struct class_device *class_dev, const char *buf, size_t count)</div><div class='ctx'> 	struct Scsi_Host *shost = class_to_shost(class_dev);</div><div class='ctx'> 	enum scsi_host_state state = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(shost_states)/sizeof(shost_states[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(shost_states); i++) {</div><div class='ctx'> 		const int len = strlen(shost_states[i].name);</div><div class='ctx'> 		if (strncmp(shost_states[i].name, buf, len) == 0 &amp;&amp;</div><div class='ctx'> 		   buf[len] == '\n') {</div><div class='hunk'>@@ -466,7 +465,7 @@ store_state_field(struct device *dev, struct device_attribute *attr, const char</div><div class='ctx'> 	struct scsi_device *sdev = to_scsi_device(dev);</div><div class='ctx'> 	enum scsi_device_state state = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(sdev_states)/sizeof(sdev_states[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sdev_states); i++) {</div><div class='ctx'> 		const int len = strlen(sdev_states[i].name);</div><div class='ctx'> 		if (strncmp(sdev_states[i].name, buf, len) == 0 &amp;&amp;</div><div class='ctx'> 		   buf[len] == '\n') {</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_api.h b/drivers/scsi/scsi_transport_api.h<br/>new file mode 100644<br/>index 000000000000..934f0e62bb5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_api.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_transport_api.h</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#ifndef _SCSI_TRANSPORT_API_H</div><div class='add'>+#define _SCSI_TRANSPORT_API_H</div><div class='add'>+</div><div class='add'>+void scsi_schedule_eh(struct Scsi_Host *shost);</div><div class='add'>+</div><div class='add'>+#endif /* _SCSI_TRANSPORT_API_H */</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c<br/>index 95c5478dcdfd..b03aa85108e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_fc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_fc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_fc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_transport_fc.c</a></div><div class='hunk'>@@ -50,7 +50,7 @@ static const char *get_fc_##title##_name(enum table_type table_key)	\</div><div class='ctx'> 	int i;								\</div><div class='ctx'> 	char *name = NULL;						\</div><div class='ctx'> 									\</div><div class='del'>-	for (i = 0; i &lt; sizeof(table)/sizeof(table[0]); i++) {		\</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table); i++) {			\</div><div class='ctx'> 		if (table[i].value == table_key) {			\</div><div class='ctx'> 			name = table[i].name;				\</div><div class='ctx'> 			break;						\</div><div class='hunk'>@@ -65,7 +65,7 @@ static int get_fc_##title##_match(const char *table_key,		\</div><div class='ctx'> {									\</div><div class='ctx'> 	int i;								\</div><div class='ctx'> 									\</div><div class='del'>-	for (i = 0; i &lt; sizeof(table)/sizeof(table[0]); i++) {		\</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table); i++) {			\</div><div class='ctx'> 		if (strncmp(table_key, table[i].name,			\</div><div class='ctx'> 				table[i].matchlen) == 0) {		\</div><div class='ctx'> 			*value = table[i].value;			\</div><div class='hunk'>@@ -140,7 +140,7 @@ get_fc_##title##_names(u32 table_key, char *buf)		\</div><div class='ctx'> 	ssize_t len = 0;					\</div><div class='ctx'> 	int i;							\</div><div class='ctx'> 								\</div><div class='del'>-	for (i = 0; i &lt; sizeof(table)/sizeof(table[0]); i++) {	\</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table); i++) {		\</div><div class='ctx'> 		if (table[i].value &amp; table_key) {		\</div><div class='ctx'> 			len += sprintf(buf + len, "%s%s",	\</div><div class='ctx'> 				prefix, table[i].name);		\</div><div class='hunk'>@@ -368,7 +368,7 @@ static DECLARE_TRANSPORT_CLASS(fc_rport_class,</div><div class='ctx'>  *   should insulate the loss of a remote port.</div><div class='ctx'>  *   The maximum will be capped by the value of SCSI_DEVICE_BLOCK_MAX_TIMEOUT.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int fc_dev_loss_tmo = SCSI_DEVICE_BLOCK_MAX_TIMEOUT;</div><div class='add'>+static unsigned int fc_dev_loss_tmo = 60;		/* seconds */</div><div class='ctx'> </div><div class='ctx'> module_param_named(dev_loss_tmo, fc_dev_loss_tmo, int, S_IRUGO|S_IWUSR);</div><div class='ctx'> MODULE_PARM_DESC(dev_loss_tmo,</div><div class='hunk'>@@ -1284,7 +1284,9 @@ EXPORT_SYMBOL(fc_release_transport);</div><div class='ctx'>  * @work:	Work to queue for execution.</div><div class='ctx'>  *</div><div class='ctx'>  * Return value:</div><div class='del'>- * 	0 on success / != 0 for error</div><div class='add'>+ * 	1 - work queued for execution</div><div class='add'>+ *	0 - work is already queued</div><div class='add'>+ *	-EINVAL - work queue doesn't exist</div><div class='ctx'>  **/</div><div class='ctx'> static int</div><div class='ctx'> fc_queue_work(struct Scsi_Host *shost, struct work_struct *work)</div><div class='hunk'>@@ -1434,8 +1436,6 @@ fc_starget_delete(void *data)</div><div class='ctx'> 	struct Scsi_Host *shost = rport_to_shost(rport);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 	if (rport-&gt;flags &amp; FC_RPORT_DEVLOSS_PENDING) {</div><div class='ctx'> 		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='hunk'>@@ -1476,7 +1476,8 @@ fc_rport_final_delete(void *data)</div><div class='ctx'> 	transport_remove_device(dev);</div><div class='ctx'> 	device_del(dev);</div><div class='ctx'> 	transport_destroy_device(dev);</div><div class='del'>-	put_device(&amp;shost-&gt;shost_gendev);</div><div class='add'>+	put_device(&amp;shost-&gt;shost_gendev);	/* for fc_host-&gt;rport list */</div><div class='add'>+	put_device(dev);			/* for self-reference */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1537,13 +1538,13 @@ fc_rport_create(struct Scsi_Host *shost, int channel,</div><div class='ctx'> 	else</div><div class='ctx'> 		rport-&gt;scsi_target_id = -1;</div><div class='ctx'> 	list_add_tail(&amp;rport-&gt;peers, &amp;fc_host-&gt;rports);</div><div class='del'>-	get_device(&amp;shost-&gt;shost_gendev);</div><div class='add'>+	get_device(&amp;shost-&gt;shost_gendev);	/* for fc_host-&gt;rport list */</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev = &amp;rport-&gt;dev;</div><div class='del'>-	device_initialize(dev);</div><div class='del'>-	dev-&gt;parent = get_device(&amp;shost-&gt;shost_gendev);</div><div class='add'>+	device_initialize(dev);			/* takes self reference */</div><div class='add'>+	dev-&gt;parent = get_device(&amp;shost-&gt;shost_gendev); /* parent reference */</div><div class='ctx'> 	dev-&gt;release = fc_rport_dev_release;</div><div class='ctx'> 	sprintf(dev-&gt;bus_id, "rport-%d:%d-%d",</div><div class='ctx'> 		shost-&gt;host_no, channel, rport-&gt;number);</div><div class='hunk'>@@ -1567,10 +1568,9 @@ fc_rport_create(struct Scsi_Host *shost, int channel,</div><div class='ctx'> </div><div class='ctx'> delete_rport:</div><div class='ctx'> 	transport_destroy_device(dev);</div><div class='del'>-	put_device(dev-&gt;parent);</div><div class='ctx'> 	spin_lock_irqsave(shost-&gt;host_lock, flags);</div><div class='ctx'> 	list_del(&amp;rport-&gt;peers);</div><div class='del'>-	put_device(&amp;shost-&gt;shost_gendev);</div><div class='add'>+	put_device(&amp;shost-&gt;shost_gendev);	/* for fc_host-&gt;rport list */</div><div class='ctx'> 	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> 	put_device(dev-&gt;parent);</div><div class='ctx'> 	kfree(rport);</div><div class='hunk'>@@ -1707,6 +1707,8 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,</div><div class='ctx'> </div><div class='ctx'> 				spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='add'>+				scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 				return rport;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1762,9 +1764,10 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,</div><div class='ctx'> 				/* initiate a scan of the target */</div><div class='ctx'> 				rport-&gt;flags |= FC_RPORT_SCAN_PENDING;</div><div class='ctx'> 				scsi_queue_work(shost, &amp;rport-&gt;scan_work);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+				spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+				scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='add'>+			} else</div><div class='add'>+				spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 			return rport;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1938,6 +1941,7 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)</div><div class='ctx'> 		rport-&gt;flags |= FC_RPORT_SCAN_PENDING;</div><div class='ctx'> 		scsi_queue_work(shost, &amp;rport-&gt;scan_work);</div><div class='ctx'> 		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+		scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(fc_remote_port_rolechg);</div><div class='hunk'>@@ -1970,8 +1974,9 @@ fc_timeout_deleted_rport(void  *data)</div><div class='ctx'> 		dev_printk(KERN_ERR, &amp;rport-&gt;dev,</div><div class='ctx'> 			"blocked FC remote port time out: no longer"</div><div class='ctx'> 			" a FCP target, removing starget\n");</div><div class='del'>-		fc_queue_work(shost, &amp;rport-&gt;stgt_delete_work);</div><div class='ctx'> 		spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+		scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='add'>+		fc_queue_work(shost, &amp;rport-&gt;stgt_delete_work);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2035,17 +2040,15 @@ fc_timeout_deleted_rport(void  *data)</div><div class='ctx'> 	 * went away and didn't come back - we'll remove</div><div class='ctx'> 	 * all attached scsi devices.</div><div class='ctx'> 	 */</div><div class='del'>-	fc_queue_work(shost, &amp;rport-&gt;stgt_delete_work);</div><div class='del'>-</div><div class='ctx'> 	spin_unlock_irqrestore(shost-&gt;host_lock, flags);</div><div class='add'>+</div><div class='add'>+	scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='add'>+	fc_queue_work(shost, &amp;rport-&gt;stgt_delete_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * fc_scsi_scan_rport - called to perform a scsi scan on a remote port.</div><div class='ctx'>  *</div><div class='del'>- * Will unblock the target (in case it went away and has now come back),</div><div class='del'>- * then invoke a scan.</div><div class='del'>- *</div><div class='ctx'>  * @data:	remote port to be scanned.</div><div class='ctx'>  **/</div><div class='ctx'> static void</div><div class='hunk'>@@ -2057,7 +2060,6 @@ fc_scsi_scan_rport(void *data)</div><div class='ctx'> </div><div class='ctx'> 	if ((rport-&gt;port_state == FC_PORTSTATE_ONLINE) &amp;&amp;</div><div class='ctx'> 	    (rport-&gt;roles &amp; FC_RPORT_ROLE_FCP_TARGET)) {</div><div class='del'>-		scsi_target_unblock(&amp;rport-&gt;dev);</div><div class='ctx'> 		scsi_scan_target(&amp;rport-&gt;dev, rport-&gt;channel,</div><div class='ctx'> 			rport-&gt;scsi_target_id, SCAN_WILD_CARD, 1);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c<br/>index 2730d507e585..7b9e8fa1a4e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_iscsi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_iscsi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_transport_iscsi.c</a></div><div class='hunk'>@@ -31,31 +31,26 @@</div><div class='ctx'> #include &lt;scsi/scsi_transport_iscsi.h&gt;</div><div class='ctx'> #include &lt;scsi/iscsi_if.h&gt;</div><div class='ctx'> </div><div class='del'>-#define ISCSI_SESSION_ATTRS 8</div><div class='del'>-#define ISCSI_CONN_ATTRS 6</div><div class='add'>+#define ISCSI_SESSION_ATTRS 11</div><div class='add'>+#define ISCSI_CONN_ATTRS 11</div><div class='add'>+#define ISCSI_HOST_ATTRS 0</div><div class='ctx'> </div><div class='ctx'> struct iscsi_internal {</div><div class='add'>+	int daemon_pid;</div><div class='ctx'> 	struct scsi_transport_template t;</div><div class='ctx'> 	struct iscsi_transport *iscsi_transport;</div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	/*</div><div class='del'>-	 * based on transport capabilities, at register time we set these</div><div class='del'>-	 * bits to tell the transport class it wants attributes displayed</div><div class='del'>-	 * in sysfs or that it can support different iSCSI Data-Path</div><div class='del'>-	 * capabilities</div><div class='del'>-	 */</div><div class='del'>-	uint32_t param_mask;</div><div class='del'>-</div><div class='ctx'> 	struct class_device cdev;</div><div class='del'>-	/*</div><div class='del'>-	 * We do not have any private or other attrs.</div><div class='del'>-	 */</div><div class='add'>+</div><div class='add'>+	struct class_device_attribute *host_attrs[ISCSI_HOST_ATTRS + 1];</div><div class='ctx'> 	struct transport_container conn_cont;</div><div class='ctx'> 	struct class_device_attribute *conn_attrs[ISCSI_CONN_ATTRS + 1];</div><div class='ctx'> 	struct transport_container session_cont;</div><div class='ctx'> 	struct class_device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int iscsi_session_nr;	/* sysfs session id for next new session */</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * list of registered transports and lock that must</div><div class='ctx'>  * be held while accessing list. The iscsi_transport_lock must</div><div class='hunk'>@@ -120,6 +115,24 @@ static struct attribute_group iscsi_transport_group = {</div><div class='ctx'> 	.attrs = iscsi_transport_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int iscsi_setup_host(struct transport_container *tc, struct device *dev,</div><div class='add'>+			    struct class_device *cdev)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = dev_to_shost(dev);</div><div class='add'>+	struct iscsi_host *ihost = shost-&gt;shost_data;</div><div class='add'>+</div><div class='add'>+	memset(ihost, 0, sizeof(*ihost));</div><div class='add'>+	INIT_LIST_HEAD(&amp;ihost-&gt;sessions);</div><div class='add'>+	mutex_init(&amp;ihost-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_TRANSPORT_CLASS(iscsi_host_class,</div><div class='add'>+			       "iscsi_host",</div><div class='add'>+			       iscsi_setup_host,</div><div class='add'>+			       NULL,</div><div class='add'>+			       NULL);</div><div class='add'>+</div><div class='ctx'> static DECLARE_TRANSPORT_CLASS(iscsi_session_class,</div><div class='ctx'> 			       "iscsi_session",</div><div class='ctx'> 			       NULL,</div><div class='hunk'>@@ -133,7 +146,6 @@ static DECLARE_TRANSPORT_CLASS(iscsi_connection_class,</div><div class='ctx'> 			       NULL);</div><div class='ctx'> </div><div class='ctx'> static struct sock *nls;</div><div class='del'>-static int daemon_pid;</div><div class='ctx'> static DEFINE_MUTEX(rx_queue_mutex);</div><div class='ctx'> </div><div class='ctx'> struct mempool_zone {</div><div class='hunk'>@@ -165,14 +177,23 @@ static DEFINE_SPINLOCK(sesslock);</div><div class='ctx'> static LIST_HEAD(connlist);</div><div class='ctx'> static DEFINE_SPINLOCK(connlock);</div><div class='ctx'> </div><div class='del'>-static struct iscsi_cls_session *iscsi_session_lookup(uint64_t handle)</div><div class='add'>+static uint32_t iscsi_conn_get_sid(struct iscsi_cls_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cls_session *sess = iscsi_dev_to_session(conn-&gt;dev.parent);</div><div class='add'>+	return sess-&gt;sid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns the matching session to a given sid</div><div class='add'>+ */</div><div class='add'>+static struct iscsi_cls_session *iscsi_session_lookup(uint32_t sid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct iscsi_cls_session *sess;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;sesslock, flags);</div><div class='ctx'> 	list_for_each_entry(sess, &amp;sesslist, sess_list) {</div><div class='del'>-		if (sess == iscsi_ptr(handle)) {</div><div class='add'>+		if (sess-&gt;sid == sid) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='ctx'> 			return sess;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -181,14 +202,17 @@ static struct iscsi_cls_session *iscsi_session_lookup(uint64_t handle)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct iscsi_cls_conn *iscsi_conn_lookup(uint64_t handle)</div><div class='add'>+/*</div><div class='add'>+ * Returns the matching connection to a given sid / cid tuple</div><div class='add'>+ */</div><div class='add'>+static struct iscsi_cls_conn *iscsi_conn_lookup(uint32_t sid, uint32_t cid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct iscsi_cls_conn *conn;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;connlock, flags);</div><div class='ctx'> 	list_for_each_entry(conn, &amp;connlist, conn_list) {</div><div class='del'>-		if (conn == iscsi_ptr(handle)) {</div><div class='add'>+		if ((conn-&gt;cid == cid) &amp;&amp; (iscsi_conn_get_sid(conn) == sid)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;connlock, flags);</div><div class='ctx'> 			return conn;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -204,13 +228,11 @@ static struct iscsi_cls_conn *iscsi_conn_lookup(uint64_t handle)</div><div class='ctx'> static void iscsi_session_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_cls_session *session = iscsi_dev_to_session(dev);</div><div class='del'>-	struct iscsi_transport *transport = session-&gt;transport;</div><div class='ctx'> 	struct Scsi_Host *shost;</div><div class='ctx'> </div><div class='ctx'> 	shost = iscsi_session_to_shost(session);</div><div class='ctx'> 	scsi_host_put(shost);</div><div class='ctx'> 	kfree(session);</div><div class='del'>-	module_put(transport-&gt;owner);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int iscsi_is_session_dev(const struct device *dev)</div><div class='hunk'>@@ -218,51 +240,164 @@ static int iscsi_is_session_dev(const struct device *dev)</div><div class='ctx'> 	return dev-&gt;release == iscsi_session_release;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * iscsi_create_session - create iscsi class session</div><div class='del'>- * @shost: scsi host</div><div class='del'>- * @transport: iscsi transport</div><div class='del'>- *</div><div class='del'>- * This can be called from a LLD or iscsi_transport</div><div class='del'>- **/</div><div class='add'>+static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,</div><div class='add'>+			   uint id, uint lun)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_host *ihost = shost-&gt;shost_data;</div><div class='add'>+	struct iscsi_cls_session *session;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ihost-&gt;mutex);</div><div class='add'>+	list_for_each_entry(session, &amp;ihost-&gt;sessions, host_list) {</div><div class='add'>+		if ((channel == SCAN_WILD_CARD || channel == 0) &amp;&amp;</div><div class='add'>+		    (id == SCAN_WILD_CARD || id == session-&gt;target_id))</div><div class='add'>+			scsi_scan_target(&amp;session-&gt;dev, 0,</div><div class='add'>+					 session-&gt;target_id, lun, 1);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ihost-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void session_recovery_timedout(void *data)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cls_session *session = data;</div><div class='add'>+</div><div class='add'>+	dev_printk(KERN_INFO, &amp;session-&gt;dev, "iscsi: session recovery timed "</div><div class='add'>+		  "out after %d secs\n", session-&gt;recovery_tmo);</div><div class='add'>+</div><div class='add'>+	if (session-&gt;transport-&gt;session_recovery_timedout)</div><div class='add'>+		session-&gt;transport-&gt;session_recovery_timedout(session);</div><div class='add'>+</div><div class='add'>+	scsi_target_unblock(&amp;session-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void iscsi_unblock_session(struct iscsi_cls_session *session)</div><div class='add'>+{</div><div class='add'>+	if (!cancel_delayed_work(&amp;session-&gt;recovery_work))</div><div class='add'>+		flush_scheduled_work();</div><div class='add'>+	scsi_target_unblock(&amp;session-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_unblock_session);</div><div class='add'>+</div><div class='add'>+void iscsi_block_session(struct iscsi_cls_session *session)</div><div class='add'>+{</div><div class='add'>+	scsi_target_block(&amp;session-&gt;dev);</div><div class='add'>+	schedule_delayed_work(&amp;session-&gt;recovery_work,</div><div class='add'>+			     session-&gt;recovery_tmo * HZ);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_block_session);</div><div class='add'>+</div><div class='ctx'> struct iscsi_cls_session *</div><div class='del'>-iscsi_create_session(struct Scsi_Host *shost, struct iscsi_transport *transport)</div><div class='add'>+iscsi_alloc_session(struct Scsi_Host *shost,</div><div class='add'>+		    struct iscsi_transport *transport)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_cls_session *session;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	if (!try_module_get(transport-&gt;owner))</div><div class='add'>+	session = kzalloc(sizeof(*session) + transport-&gt;sessiondata_size,</div><div class='add'>+			  GFP_KERNEL);</div><div class='add'>+	if (!session)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	session = kzalloc(sizeof(*session), GFP_KERNEL);</div><div class='del'>-	if (!session)</div><div class='del'>-		goto module_put;</div><div class='ctx'> 	session-&gt;transport = transport;</div><div class='add'>+	session-&gt;recovery_tmo = 120;</div><div class='add'>+	INIT_WORK(&amp;session-&gt;recovery_work, session_recovery_timedout, session);</div><div class='add'>+	INIT_LIST_HEAD(&amp;session-&gt;host_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;session-&gt;sess_list);</div><div class='ctx'> </div><div class='ctx'> 	/* this is released in the dev's release function */</div><div class='ctx'> 	scsi_host_get(shost);</div><div class='del'>-	snprintf(session-&gt;dev.bus_id, BUS_ID_SIZE, "session%u", shost-&gt;host_no);</div><div class='ctx'> 	session-&gt;dev.parent = &amp;shost-&gt;shost_gendev;</div><div class='ctx'> 	session-&gt;dev.release = iscsi_session_release;</div><div class='del'>-	err = device_register(&amp;session-&gt;dev);</div><div class='add'>+	device_initialize(&amp;session-&gt;dev);</div><div class='add'>+	if (transport-&gt;sessiondata_size)</div><div class='add'>+		session-&gt;dd_data = &amp;session[1];</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_alloc_session);</div><div class='add'>+</div><div class='add'>+int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = iscsi_session_to_shost(session);</div><div class='add'>+	struct iscsi_host *ihost;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ihost = shost-&gt;shost_data;</div><div class='add'>+	session-&gt;sid = iscsi_session_nr++;</div><div class='add'>+	session-&gt;target_id = target_id;</div><div class='add'>+</div><div class='add'>+	snprintf(session-&gt;dev.bus_id, BUS_ID_SIZE, "session%u",</div><div class='add'>+		 session-&gt;sid);</div><div class='add'>+	err = device_add(&amp;session-&gt;dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_printk(KERN_ERR, &amp;session-&gt;dev, "iscsi: could not "</div><div class='ctx'> 			   "register session's dev\n");</div><div class='del'>-		goto free_session;</div><div class='add'>+		goto release_host;</div><div class='ctx'> 	}</div><div class='ctx'> 	transport_register_device(&amp;session-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return session;</div><div class='add'>+	mutex_lock(&amp;ihost-&gt;mutex);</div><div class='add'>+	list_add(&amp;session-&gt;host_list, &amp;ihost-&gt;sessions);</div><div class='add'>+	mutex_unlock(&amp;ihost-&gt;mutex);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='del'>-free_session:</div><div class='del'>-	kfree(session);</div><div class='del'>-module_put:</div><div class='del'>-	module_put(transport-&gt;owner);</div><div class='del'>-	return NULL;</div><div class='add'>+release_host:</div><div class='add'>+	scsi_host_put(shost);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_add_session);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_create_session - create iscsi class session</div><div class='add'>+ * @shost: scsi host</div><div class='add'>+ * @transport: iscsi transport</div><div class='add'>+ *</div><div class='add'>+ * This can be called from a LLD or iscsi_transport.</div><div class='add'>+ **/</div><div class='add'>+struct iscsi_cls_session *</div><div class='add'>+iscsi_create_session(struct Scsi_Host *shost,</div><div class='add'>+		     struct iscsi_transport *transport,</div><div class='add'>+		     unsigned int target_id)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_cls_session *session;</div><div class='add'>+</div><div class='add'>+	session = iscsi_alloc_session(shost, transport);</div><div class='add'>+	if (!session)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='add'>+	if (iscsi_add_session(session, target_id)) {</div><div class='add'>+		iscsi_free_session(session);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return session;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_create_session);</div><div class='ctx'> </div><div class='add'>+void iscsi_remove_session(struct iscsi_cls_session *session)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = iscsi_session_to_shost(session);</div><div class='add'>+	struct iscsi_host *ihost = shost-&gt;shost_data;</div><div class='add'>+</div><div class='add'>+	if (!cancel_delayed_work(&amp;session-&gt;recovery_work))</div><div class='add'>+		flush_scheduled_work();</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ihost-&gt;mutex);</div><div class='add'>+	list_del(&amp;session-&gt;host_list);</div><div class='add'>+	mutex_unlock(&amp;ihost-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	scsi_remove_target(&amp;session-&gt;dev);</div><div class='add'>+</div><div class='add'>+	transport_unregister_device(&amp;session-&gt;dev);</div><div class='add'>+	device_del(&amp;session-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_remove_session);</div><div class='add'>+</div><div class='add'>+void iscsi_free_session(struct iscsi_cls_session *session)</div><div class='add'>+{</div><div class='add'>+	put_device(&amp;session-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_free_session);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iscsi_destroy_session - destroy iscsi session</div><div class='ctx'>  * @session: iscsi_session</div><div class='hunk'>@@ -272,18 +407,65 @@ EXPORT_SYMBOL_GPL(iscsi_create_session);</div><div class='ctx'>  **/</div><div class='ctx'> int iscsi_destroy_session(struct iscsi_cls_session *session)</div><div class='ctx'> {</div><div class='del'>-	transport_unregister_device(&amp;session-&gt;dev);</div><div class='del'>-	device_unregister(&amp;session-&gt;dev);</div><div class='add'>+	iscsi_remove_session(session);</div><div class='add'>+	iscsi_free_session(session);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_destroy_session);</div><div class='ctx'> </div><div class='add'>+static void mempool_zone_destroy(struct mempool_zone *zp)</div><div class='add'>+{</div><div class='add'>+	mempool_destroy(zp-&gt;pool);</div><div class='add'>+	kfree(zp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void*</div><div class='add'>+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)</div><div class='add'>+{</div><div class='add'>+	struct mempool_zone *zone = pool_data;</div><div class='add'>+</div><div class='add'>+	return alloc_skb(zone-&gt;size, gfp_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mempool_zone_free_skb(void *element, void *pool_data)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(element);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mempool_zone *</div><div class='add'>+mempool_zone_init(unsigned max, unsigned size, unsigned hiwat)</div><div class='add'>+{</div><div class='add'>+	struct mempool_zone *zp;</div><div class='add'>+</div><div class='add'>+	zp = kzalloc(sizeof(*zp), GFP_KERNEL);</div><div class='add'>+	if (!zp)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	zp-&gt;size = size;</div><div class='add'>+	zp-&gt;hiwat = hiwat;</div><div class='add'>+	INIT_LIST_HEAD(&amp;zp-&gt;freequeue);</div><div class='add'>+	spin_lock_init(&amp;zp-&gt;freelock);</div><div class='add'>+	atomic_set(&amp;zp-&gt;allocated, 0);</div><div class='add'>+</div><div class='add'>+	zp-&gt;pool = mempool_create(max, mempool_zone_alloc_skb,</div><div class='add'>+				  mempool_zone_free_skb, zp);</div><div class='add'>+	if (!zp-&gt;pool) {</div><div class='add'>+		kfree(zp);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return zp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void iscsi_conn_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_cls_conn *conn = iscsi_dev_to_conn(dev);</div><div class='ctx'> 	struct device *parent = conn-&gt;dev.parent;</div><div class='ctx'> </div><div class='add'>+	mempool_zone_destroy(conn-&gt;z_pdu);</div><div class='add'>+	mempool_zone_destroy(conn-&gt;z_error);</div><div class='add'>+</div><div class='ctx'> 	kfree(conn);</div><div class='ctx'> 	put_device(parent);</div><div class='ctx'> }</div><div class='hunk'>@@ -293,6 +475,31 @@ static int iscsi_is_conn_dev(const struct device *dev)</div><div class='ctx'> 	return dev-&gt;release == iscsi_conn_release;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iscsi_create_event_pools(struct iscsi_cls_conn *conn)</div><div class='add'>+{</div><div class='add'>+	conn-&gt;z_pdu = mempool_zone_init(Z_MAX_PDU,</div><div class='add'>+			NLMSG_SPACE(sizeof(struct iscsi_uevent) +</div><div class='add'>+				    sizeof(struct iscsi_hdr) +</div><div class='add'>+				    DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH),</div><div class='add'>+			Z_HIWAT_PDU);</div><div class='add'>+	if (!conn-&gt;z_pdu) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "iscsi: can not allocate "</div><div class='add'>+			   "pdu zone for new conn\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conn-&gt;z_error = mempool_zone_init(Z_MAX_ERROR,</div><div class='add'>+			NLMSG_SPACE(sizeof(struct iscsi_uevent)),</div><div class='add'>+			Z_HIWAT_ERROR);</div><div class='add'>+	if (!conn-&gt;z_error) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "iscsi: can not allocate "</div><div class='add'>+			   "error zone for new conn\n");</div><div class='add'>+		mempool_zone_destroy(conn-&gt;z_pdu);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * iscsi_create_conn - create iscsi class connection</div><div class='ctx'>  * @session: iscsi cls session</div><div class='hunk'>@@ -301,12 +508,16 @@ static int iscsi_is_conn_dev(const struct device *dev)</div><div class='ctx'>  * This can be called from a LLD or iscsi_transport. The connection</div><div class='ctx'>  * is child of the session so cid must be unique for all connections</div><div class='ctx'>  * on the session.</div><div class='add'>+ *</div><div class='add'>+ * Since we do not support MCS, cid will normally be zero. In some cases</div><div class='add'>+ * for software iscsi we could be trying to preallocate a connection struct</div><div class='add'>+ * in which case there could be two connection structs and cid would be</div><div class='add'>+ * non-zero.</div><div class='ctx'>  **/</div><div class='ctx'> struct iscsi_cls_conn *</div><div class='ctx'> iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_transport *transport = session-&gt;transport;</div><div class='del'>-	struct Scsi_Host *shost = iscsi_session_to_shost(session);</div><div class='ctx'> 	struct iscsi_cls_conn *conn;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -319,12 +530,17 @@ iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid)</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;conn-&gt;conn_list);</div><div class='ctx'> 	conn-&gt;transport = transport;</div><div class='add'>+	conn-&gt;cid = cid;</div><div class='add'>+</div><div class='add'>+	if (iscsi_create_event_pools(conn))</div><div class='add'>+		goto free_conn;</div><div class='ctx'> </div><div class='ctx'> 	/* this is released in the dev's release function */</div><div class='ctx'> 	if (!get_device(&amp;session-&gt;dev))</div><div class='del'>-		goto free_conn;</div><div class='add'>+		goto free_conn_pools;</div><div class='add'>+</div><div class='ctx'> 	snprintf(conn-&gt;dev.bus_id, BUS_ID_SIZE, "connection%d:%u",</div><div class='del'>-		 shost-&gt;host_no, cid);</div><div class='add'>+		 session-&gt;sid, cid);</div><div class='ctx'> 	conn-&gt;dev.parent = &amp;session-&gt;dev;</div><div class='ctx'> 	conn-&gt;dev.release = iscsi_conn_release;</div><div class='ctx'> 	err = device_register(&amp;conn-&gt;dev);</div><div class='hunk'>@@ -338,6 +554,8 @@ iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid)</div><div class='ctx'> </div><div class='ctx'> release_parent_ref:</div><div class='ctx'> 	put_device(&amp;session-&gt;dev);</div><div class='add'>+free_conn_pools:</div><div class='add'>+</div><div class='ctx'> free_conn:</div><div class='ctx'> 	kfree(conn);</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -361,105 +579,6 @@ int iscsi_destroy_conn(struct iscsi_cls_conn *conn)</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_destroy_conn);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * These functions are used only by software iscsi_transports</div><div class='del'>- * which do not allocate and more their scsi_hosts since this</div><div class='del'>- * is initiated from userspace.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iSCSI Session's hostdata organization:</div><div class='del'>- *</div><div class='del'>- *    *------------------* &lt;== hostdata_session(host-&gt;hostdata)</div><div class='del'>- *    | ptr to class sess|</div><div class='del'>- *    |------------------| &lt;== iscsi_hostdata(host-&gt;hostdata)</div><div class='del'>- *    | transport's data |</div><div class='del'>- *    *------------------*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define hostdata_privsize(_t)	(sizeof(unsigned long) + _t-&gt;hostdata_size + \</div><div class='del'>-				 _t-&gt;hostdata_size % sizeof(unsigned long))</div><div class='del'>-</div><div class='del'>-#define hostdata_session(_hostdata) (iscsi_ptr(*(unsigned long *)_hostdata))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iscsi_transport_create_session - create iscsi cls session and host</div><div class='del'>- * scsit: scsi transport template</div><div class='del'>- * transport: iscsi transport template</div><div class='del'>- *</div><div class='del'>- * This can be used by software iscsi_transports that allocate</div><div class='del'>- * a session per scsi host.</div><div class='del'>- **/</div><div class='del'>-struct Scsi_Host *</div><div class='del'>-iscsi_transport_create_session(struct scsi_transport_template *scsit,</div><div class='del'>-			       struct iscsi_transport *transport)</div><div class='del'>-{</div><div class='del'>-	struct iscsi_cls_session *session;</div><div class='del'>-	struct Scsi_Host *shost;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	shost = scsi_host_alloc(transport-&gt;host_template,</div><div class='del'>-				hostdata_privsize(transport));</div><div class='del'>-	if (!shost) {</div><div class='del'>-		printk(KERN_ERR "iscsi: can not allocate SCSI host for "</div><div class='del'>-			"session\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shost-&gt;max_id = 1;</div><div class='del'>-	shost-&gt;max_channel = 0;</div><div class='del'>-	shost-&gt;max_lun = transport-&gt;max_lun;</div><div class='del'>-	shost-&gt;max_cmd_len = transport-&gt;max_cmd_len;</div><div class='del'>-	shost-&gt;transportt = scsit;</div><div class='del'>-	shost-&gt;transportt-&gt;create_work_queue = 1;</div><div class='del'>-</div><div class='del'>-	if (scsi_add_host(shost, NULL))</div><div class='del'>-		goto free_host;</div><div class='del'>-</div><div class='del'>-	session = iscsi_create_session(shost, transport);</div><div class='del'>-	if (!session)</div><div class='del'>-		goto remove_host;</div><div class='del'>-</div><div class='del'>-	*(unsigned long*)shost-&gt;hostdata = (unsigned long)session;</div><div class='del'>-	spin_lock_irqsave(&amp;sesslock, flags);</div><div class='del'>-	list_add(&amp;session-&gt;sess_list, &amp;sesslist);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='del'>-	return shost;</div><div class='del'>-</div><div class='del'>-remove_host:</div><div class='del'>-	scsi_remove_host(shost);</div><div class='del'>-free_host:</div><div class='del'>-	scsi_host_put(shost);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(iscsi_transport_create_session);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * iscsi_transport_destroy_session - destroy session and scsi host</div><div class='del'>- * shost: scsi host</div><div class='del'>- *</div><div class='del'>- * This can be used by software iscsi_transports that allocate</div><div class='del'>- * a session per scsi host.</div><div class='del'>- **/</div><div class='del'>-int iscsi_transport_destroy_session(struct Scsi_Host *shost)</div><div class='del'>-{</div><div class='del'>-	struct iscsi_cls_session *session;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	scsi_remove_host(shost);</div><div class='del'>-	session = hostdata_session(shost-&gt;hostdata);</div><div class='del'>-	spin_lock_irqsave(&amp;sesslock, flags);</div><div class='del'>-	list_del(&amp;session-&gt;sess_list);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='del'>-	iscsi_destroy_session(session);</div><div class='del'>-	/* ref from host alloc */</div><div class='del'>-	scsi_host_put(shost);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL_GPL(iscsi_transport_destroy_session);</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * iscsi interface functions</div><div class='ctx'>  */</div><div class='ctx'> static struct iscsi_internal *</div><div class='hunk'>@@ -484,20 +603,6 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)</div><div class='ctx'> 	return (struct list_head *)&amp;skb-&gt;cb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void*</div><div class='del'>-mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)</div><div class='del'>-{</div><div class='del'>-	struct mempool_zone *zone = pool_data;</div><div class='del'>-</div><div class='del'>-	return alloc_skb(zone-&gt;size, gfp_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mempool_zone_free_skb(void *element, void *pool_data)</div><div class='del'>-{</div><div class='del'>-	kfree_skb(element);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> mempool_zone_complete(struct mempool_zone *zone)</div><div class='ctx'> {</div><div class='hunk'>@@ -517,37 +622,6 @@ mempool_zone_complete(struct mempool_zone *zone)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;zone-&gt;freelock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct mempool_zone *</div><div class='del'>-mempool_zone_init(unsigned max, unsigned size, unsigned hiwat)</div><div class='del'>-{</div><div class='del'>-	struct mempool_zone *zp;</div><div class='del'>-</div><div class='del'>-	zp = kzalloc(sizeof(*zp), GFP_KERNEL);</div><div class='del'>-	if (!zp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	zp-&gt;size = size;</div><div class='del'>-	zp-&gt;hiwat = hiwat;</div><div class='del'>-	INIT_LIST_HEAD(&amp;zp-&gt;freequeue);</div><div class='del'>-	spin_lock_init(&amp;zp-&gt;freelock);</div><div class='del'>-	atomic_set(&amp;zp-&gt;allocated, 0);</div><div class='del'>-</div><div class='del'>-	zp-&gt;pool = mempool_create(max, mempool_zone_alloc_skb,</div><div class='del'>-				  mempool_zone_free_skb, zp);</div><div class='del'>-	if (!zp-&gt;pool) {</div><div class='del'>-		kfree(zp);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return zp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mempool_zone_destroy(struct mempool_zone *zp)</div><div class='del'>-{</div><div class='del'>-	mempool_destroy(zp-&gt;pool);</div><div class='del'>-	kfree(zp);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct sk_buff*</div><div class='ctx'> mempool_zone_get_skb(struct mempool_zone *zone)</div><div class='ctx'> {</div><div class='hunk'>@@ -560,13 +634,34 @@ mempool_zone_get_skb(struct mempool_zone *zone)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb)</div><div class='add'>+iscsi_broadcast_skb(struct mempool_zone *zone, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	skb_get(skb);</div><div class='add'>+	rc = netlink_broadcast(nls, skb, 0, 1, GFP_KERNEL);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		mempool_free(skb, zone-&gt;pool);</div><div class='add'>+		printk(KERN_ERR "iscsi: can not broadcast skb (%d)\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;zone-&gt;freelock, flags);</div><div class='add'>+	INIT_LIST_HEAD(skb_to_lh(skb));</div><div class='add'>+	list_add(skb_to_lh(skb), &amp;zone-&gt;freequeue);</div><div class='add'>+	spin_unlock_irqrestore(&amp;zone-&gt;freelock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb, int pid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	skb_get(skb);</div><div class='del'>-	rc = netlink_unicast(nls, skb, daemon_pid, MSG_DONTWAIT);</div><div class='add'>+	rc = netlink_unicast(nls, skb, pid, MSG_DONTWAIT);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		mempool_free(skb, zone-&gt;pool);</div><div class='ctx'> 		printk(KERN_ERR "iscsi: can not unicast skb (%d)\n", rc);</div><div class='hunk'>@@ -574,6 +669,7 @@ iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;zone-&gt;freelock, flags);</div><div class='add'>+	INIT_LIST_HEAD(skb_to_lh(skb));</div><div class='ctx'> 	list_add(skb_to_lh(skb), &amp;zone-&gt;freequeue);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;zone-&gt;freelock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -587,9 +683,14 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct iscsi_uevent *ev;</div><div class='ctx'> 	char *pdu;</div><div class='add'>+	struct iscsi_internal *priv;</div><div class='ctx'> 	int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) +</div><div class='ctx'> 			      data_size);</div><div class='ctx'> </div><div class='add'>+	priv = iscsi_if_transport_lookup(conn-&gt;transport);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	mempool_zone_complete(conn-&gt;z_pdu);</div><div class='ctx'> </div><div class='ctx'> 	skb = mempool_zone_get_skb(conn-&gt;z_pdu);</div><div class='hunk'>@@ -600,19 +701,20 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nlh = __nlmsg_put(skb, daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);</div><div class='add'>+	nlh = __nlmsg_put(skb, priv-&gt;daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);</div><div class='ctx'> 	ev = NLMSG_DATA(nlh);</div><div class='ctx'> 	memset(ev, 0, sizeof(*ev));</div><div class='ctx'> 	ev-&gt;transport_handle = iscsi_handle(conn-&gt;transport);</div><div class='ctx'> 	ev-&gt;type = ISCSI_KEVENT_RECV_PDU;</div><div class='ctx'> 	if (atomic_read(&amp;conn-&gt;z_pdu-&gt;allocated) &gt;= conn-&gt;z_pdu-&gt;hiwat)</div><div class='ctx'> 		ev-&gt;iferror = -ENOMEM;</div><div class='del'>-	ev-&gt;r.recv_req.conn_handle = iscsi_handle(conn);</div><div class='add'>+	ev-&gt;r.recv_req.cid = conn-&gt;cid;</div><div class='add'>+	ev-&gt;r.recv_req.sid = iscsi_conn_get_sid(conn);</div><div class='ctx'> 	pdu = (char*)ev + sizeof(*ev);</div><div class='ctx'> 	memcpy(pdu, hdr, sizeof(struct iscsi_hdr));</div><div class='ctx'> 	memcpy(pdu + sizeof(struct iscsi_hdr), data, data_size);</div><div class='ctx'> </div><div class='del'>-	return iscsi_unicast_skb(conn-&gt;z_pdu, skb);</div><div class='add'>+	return iscsi_unicast_skb(conn-&gt;z_pdu, skb, priv-&gt;daemon_pid);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(iscsi_recv_pdu);</div><div class='ctx'> </div><div class='hunk'>@@ -621,8 +723,13 @@ void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)</div><div class='ctx'> 	struct nlmsghdr	*nlh;</div><div class='ctx'> 	struct sk_buff	*skb;</div><div class='ctx'> 	struct iscsi_uevent *ev;</div><div class='add'>+	struct iscsi_internal *priv;</div><div class='ctx'> 	int len = NLMSG_SPACE(sizeof(*ev));</div><div class='ctx'> </div><div class='add'>+	priv = iscsi_if_transport_lookup(conn-&gt;transport);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mempool_zone_complete(conn-&gt;z_error);</div><div class='ctx'> </div><div class='ctx'> 	skb = mempool_zone_get_skb(conn-&gt;z_error);</div><div class='hunk'>@@ -632,16 +739,17 @@ void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nlh = __nlmsg_put(skb, daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);</div><div class='add'>+	nlh = __nlmsg_put(skb, priv-&gt;daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);</div><div class='ctx'> 	ev = NLMSG_DATA(nlh);</div><div class='ctx'> 	ev-&gt;transport_handle = iscsi_handle(conn-&gt;transport);</div><div class='ctx'> 	ev-&gt;type = ISCSI_KEVENT_CONN_ERROR;</div><div class='ctx'> 	if (atomic_read(&amp;conn-&gt;z_error-&gt;allocated) &gt;= conn-&gt;z_error-&gt;hiwat)</div><div class='ctx'> 		ev-&gt;iferror = -ENOMEM;</div><div class='ctx'> 	ev-&gt;r.connerror.error = error;</div><div class='del'>-	ev-&gt;r.connerror.conn_handle = iscsi_handle(conn);</div><div class='add'>+	ev-&gt;r.connerror.cid = conn-&gt;cid;</div><div class='add'>+	ev-&gt;r.connerror.sid = iscsi_conn_get_sid(conn);</div><div class='ctx'> </div><div class='del'>-	iscsi_unicast_skb(conn-&gt;z_error, skb);</div><div class='add'>+	iscsi_broadcast_skb(conn-&gt;z_error, skb);</div><div class='ctx'> </div><div class='ctx'> 	dev_printk(KERN_INFO, &amp;conn-&gt;dev, "iscsi: detected conn error (%d)\n",</div><div class='ctx'> 		   error);</div><div class='hunk'>@@ -671,7 +779,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,</div><div class='ctx'> 	nlh = __nlmsg_put(skb, pid, seq, t, (len - sizeof(*nlh)), 0);</div><div class='ctx'> 	nlh-&gt;nlmsg_flags = flags;</div><div class='ctx'> 	memcpy(NLMSG_DATA(nlh), payload, size);</div><div class='del'>-	return iscsi_unicast_skb(z_reply, skb);</div><div class='add'>+	return iscsi_unicast_skb(z_reply, skb, pid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -683,13 +791,18 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)</div><div class='ctx'> 	struct iscsi_cls_conn *conn;</div><div class='ctx'> 	struct nlmsghdr	*nlhstat;</div><div class='ctx'> 	struct iscsi_uevent *evstat;</div><div class='add'>+	struct iscsi_internal *priv;</div><div class='ctx'> 	int len = NLMSG_SPACE(sizeof(*ev) +</div><div class='ctx'> 			      sizeof(struct iscsi_stats) +</div><div class='ctx'> 			      sizeof(struct iscsi_stats_custom) *</div><div class='ctx'> 			      ISCSI_STATS_CUSTOM_MAX);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	conn = iscsi_conn_lookup(ev-&gt;u.get_stats.conn_handle);</div><div class='add'>+	priv = iscsi_if_transport_lookup(transport);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	conn = iscsi_conn_lookup(ev-&gt;u.get_stats.sid, ev-&gt;u.get_stats.cid);</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> </div><div class='hunk'>@@ -705,7 +818,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		nlhstat = __nlmsg_put(skbstat, daemon_pid, 0, 0,</div><div class='add'>+		nlhstat = __nlmsg_put(skbstat, priv-&gt;daemon_pid, 0, 0,</div><div class='ctx'> 				      (len - sizeof(*nlhstat)), 0);</div><div class='ctx'> 		evstat = NLMSG_DATA(nlhstat);</div><div class='ctx'> 		memset(evstat, 0, sizeof(*evstat));</div><div class='hunk'>@@ -713,8 +826,10 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)</div><div class='ctx'> 		evstat-&gt;type = nlh-&gt;nlmsg_type;</div><div class='ctx'> 		if (atomic_read(&amp;conn-&gt;z_pdu-&gt;allocated) &gt;= conn-&gt;z_pdu-&gt;hiwat)</div><div class='ctx'> 			evstat-&gt;iferror = -ENOMEM;</div><div class='del'>-		evstat-&gt;u.get_stats.conn_handle =</div><div class='del'>-			ev-&gt;u.get_stats.conn_handle;</div><div class='add'>+		evstat-&gt;u.get_stats.cid =</div><div class='add'>+			ev-&gt;u.get_stats.cid;</div><div class='add'>+		evstat-&gt;u.get_stats.sid =</div><div class='add'>+			ev-&gt;u.get_stats.sid;</div><div class='ctx'> 		stats = (struct iscsi_stats *)</div><div class='ctx'> 			((char*)evstat + sizeof(*evstat));</div><div class='ctx'> 		memset(stats, 0, sizeof(*stats));</div><div class='hunk'>@@ -729,27 +844,157 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)</div><div class='ctx'> 		skb_trim(skbstat, NLMSG_ALIGN(actual_size));</div><div class='ctx'> 		nlhstat-&gt;nlmsg_len = actual_size;</div><div class='ctx'> </div><div class='del'>-		err = iscsi_unicast_skb(conn-&gt;z_pdu, skbstat);</div><div class='add'>+		err = iscsi_unicast_skb(conn-&gt;z_pdu, skbstat, priv-&gt;daemon_pid);</div><div class='ctx'> 	} while (err &lt; 0 &amp;&amp; err != -ECONNREFUSED);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * iscsi_if_destroy_session_done - send session destr. completion event</div><div class='add'>+ * @conn: last connection for session</div><div class='add'>+ *</div><div class='add'>+ * This is called by HW iscsi LLDs to notify userpsace that its HW has</div><div class='add'>+ * removed a session.</div><div class='add'>+ **/</div><div class='add'>+int iscsi_if_destroy_session_done(struct iscsi_cls_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_internal *priv;</div><div class='add'>+	struct iscsi_cls_session *session;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	struct iscsi_uevent *ev;</div><div class='add'>+	struct sk_buff  *skb;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc, len = NLMSG_SPACE(sizeof(*ev));</div><div class='add'>+</div><div class='add'>+	priv = iscsi_if_transport_lookup(conn-&gt;transport);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	session = iscsi_dev_to_session(conn-&gt;dev.parent);</div><div class='add'>+	shost = iscsi_session_to_shost(session);</div><div class='add'>+</div><div class='add'>+	mempool_zone_complete(conn-&gt;z_pdu);</div><div class='add'>+</div><div class='add'>+	skb = mempool_zone_get_skb(conn-&gt;z_pdu);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "Cannot notify userspace of "</div><div class='add'>+			  "session creation event\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlh = __nlmsg_put(skb, priv-&gt;daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);</div><div class='add'>+	ev = NLMSG_DATA(nlh);</div><div class='add'>+	ev-&gt;transport_handle = iscsi_handle(conn-&gt;transport);</div><div class='add'>+	ev-&gt;type = ISCSI_KEVENT_DESTROY_SESSION;</div><div class='add'>+	ev-&gt;r.d_session.host_no = shost-&gt;host_no;</div><div class='add'>+	ev-&gt;r.d_session.sid = session-&gt;sid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this will occur if the daemon is not up, so we just warn</div><div class='add'>+	 * the user and when the daemon is restarted it will handle it</div><div class='add'>+	 */</div><div class='add'>+	rc = iscsi_broadcast_skb(conn-&gt;z_pdu, skb);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "Cannot notify userspace of "</div><div class='add'>+			  "session destruction event. Check iscsi daemon\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sesslock, flags);</div><div class='add'>+	list_del(&amp;session-&gt;sess_list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;connlock, flags);</div><div class='add'>+	conn-&gt;active = 0;</div><div class='add'>+	list_del(&amp;conn-&gt;conn_list);</div><div class='add'>+	spin_unlock_irqrestore(&amp;connlock, flags);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_if_destroy_session_done);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iscsi_if_create_session_done - send session creation completion event</div><div class='add'>+ * @conn: leading connection for session</div><div class='add'>+ *</div><div class='add'>+ * This is called by HW iscsi LLDs to notify userpsace that its HW has</div><div class='add'>+ * created a session or a existing session is back in the logged in state.</div><div class='add'>+ **/</div><div class='add'>+int iscsi_if_create_session_done(struct iscsi_cls_conn *conn)</div><div class='add'>+{</div><div class='add'>+	struct iscsi_internal *priv;</div><div class='add'>+	struct iscsi_cls_session *session;</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	struct iscsi_uevent *ev;</div><div class='add'>+	struct sk_buff  *skb;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc, len = NLMSG_SPACE(sizeof(*ev));</div><div class='add'>+</div><div class='add'>+	priv = iscsi_if_transport_lookup(conn-&gt;transport);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	session = iscsi_dev_to_session(conn-&gt;dev.parent);</div><div class='add'>+	shost = iscsi_session_to_shost(session);</div><div class='add'>+</div><div class='add'>+	mempool_zone_complete(conn-&gt;z_pdu);</div><div class='add'>+</div><div class='add'>+	skb = mempool_zone_get_skb(conn-&gt;z_pdu);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "Cannot notify userspace of "</div><div class='add'>+			  "session creation event\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nlh = __nlmsg_put(skb, priv-&gt;daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);</div><div class='add'>+	ev = NLMSG_DATA(nlh);</div><div class='add'>+	ev-&gt;transport_handle = iscsi_handle(conn-&gt;transport);</div><div class='add'>+	ev-&gt;type = ISCSI_UEVENT_CREATE_SESSION;</div><div class='add'>+	ev-&gt;r.c_session_ret.host_no = shost-&gt;host_no;</div><div class='add'>+	ev-&gt;r.c_session_ret.sid = session-&gt;sid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this will occur if the daemon is not up, so we just warn</div><div class='add'>+	 * the user and when the daemon is restarted it will handle it</div><div class='add'>+	 */</div><div class='add'>+	rc = iscsi_broadcast_skb(conn-&gt;z_pdu, skb);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "Cannot notify userspace of "</div><div class='add'>+			  "session creation event. Check iscsi daemon\n");</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;sesslock, flags);</div><div class='add'>+	list_add(&amp;session-&gt;sess_list, &amp;sesslist);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;connlock, flags);</div><div class='add'>+	list_add(&amp;conn-&gt;conn_list, &amp;connlist);</div><div class='add'>+	conn-&gt;active = 1;</div><div class='add'>+	spin_unlock_irqrestore(&amp;connlock, flags);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(iscsi_if_create_session_done);</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_uevent *ev)</div><div class='ctx'> {</div><div class='ctx'> 	struct iscsi_transport *transport = priv-&gt;iscsi_transport;</div><div class='ctx'> 	struct iscsi_cls_session *session;</div><div class='del'>-	uint32_t sid;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	uint32_t hostno;</div><div class='ctx'> </div><div class='del'>-	session = transport-&gt;create_session(&amp;priv-&gt;t,</div><div class='add'>+	session = transport-&gt;create_session(transport, &amp;priv-&gt;t,</div><div class='ctx'> 					    ev-&gt;u.c_session.initial_cmdsn,</div><div class='del'>-					    &amp;sid);</div><div class='add'>+					    &amp;hostno);</div><div class='ctx'> 	if (!session)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ev-&gt;r.c_session_ret.session_handle = iscsi_handle(session);</div><div class='del'>-	ev-&gt;r.c_session_ret.sid = sid;</div><div class='add'>+	spin_lock_irqsave(&amp;sesslock, flags);</div><div class='add'>+	list_add(&amp;session-&gt;sess_list, &amp;sesslist);</div><div class='add'>+	spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='add'>+</div><div class='add'>+	ev-&gt;r.c_session_ret.host_no = hostno;</div><div class='add'>+	ev-&gt;r.c_session_ret.sid = session-&gt;sid;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -760,35 +1005,23 @@ iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev)</div><div class='ctx'> 	struct iscsi_cls_session *session;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	session = iscsi_session_lookup(ev-&gt;u.c_conn.session_handle);</div><div class='del'>-	if (!session)</div><div class='add'>+	session = iscsi_session_lookup(ev-&gt;u.c_conn.sid);</div><div class='add'>+	if (!session) {</div><div class='add'>+		printk(KERN_ERR "iscsi: invalid session %d\n",</div><div class='add'>+		       ev-&gt;u.c_conn.sid);</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	conn = transport-&gt;create_conn(session, ev-&gt;u.c_conn.cid);</div><div class='del'>-	if (!conn)</div><div class='add'>+	if (!conn) {</div><div class='add'>+		printk(KERN_ERR "iscsi: couldn't create a new "</div><div class='add'>+			   "connection for session %d\n",</div><div class='add'>+			   session-&gt;sid);</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	conn-&gt;z_pdu = mempool_zone_init(Z_MAX_PDU,</div><div class='del'>-			NLMSG_SPACE(sizeof(struct iscsi_uevent) +</div><div class='del'>-				    sizeof(struct iscsi_hdr) +</div><div class='del'>-				    DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH),</div><div class='del'>-			Z_HIWAT_PDU);</div><div class='del'>-	if (!conn-&gt;z_pdu) {</div><div class='del'>-		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "iscsi: can not allocate "</div><div class='del'>-			   "pdu zone for new conn\n");</div><div class='del'>-		goto destroy_conn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conn-&gt;z_error = mempool_zone_init(Z_MAX_ERROR,</div><div class='del'>-			NLMSG_SPACE(sizeof(struct iscsi_uevent)),</div><div class='del'>-			Z_HIWAT_ERROR);</div><div class='del'>-	if (!conn-&gt;z_error) {</div><div class='del'>-		dev_printk(KERN_ERR, &amp;conn-&gt;dev, "iscsi: can not allocate "</div><div class='del'>-			   "error zone for new conn\n");</div><div class='del'>-		goto free_pdu_pool;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ev-&gt;r.handle = iscsi_handle(conn);</div><div class='add'>+	ev-&gt;r.c_conn_ret.sid = session-&gt;sid;</div><div class='add'>+	ev-&gt;r.c_conn_ret.cid = conn-&gt;cid;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;connlock, flags);</div><div class='ctx'> 	list_add(&amp;conn-&gt;conn_list, &amp;connlist);</div><div class='hunk'>@@ -796,13 +1029,6 @@ iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;connlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-free_pdu_pool:</div><div class='del'>-	mempool_zone_destroy(conn-&gt;z_pdu);</div><div class='del'>-destroy_conn:</div><div class='del'>-	if (transport-&gt;destroy_conn)</div><div class='del'>-		transport-&gt;destroy_conn(conn-&gt;dd_data);</div><div class='del'>-	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -810,9 +1036,8 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct iscsi_cls_conn *conn;</div><div class='del'>-	struct mempool_zone *z_error, *z_pdu;</div><div class='ctx'> </div><div class='del'>-	conn = iscsi_conn_lookup(ev-&gt;u.d_conn.conn_handle);</div><div class='add'>+	conn = iscsi_conn_lookup(ev-&gt;u.d_conn.sid, ev-&gt;u.d_conn.cid);</div><div class='ctx'> 	if (!conn)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	spin_lock_irqsave(&amp;connlock, flags);</div><div class='hunk'>@@ -820,16 +1045,85 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev</div><div class='ctx'> 	list_del(&amp;conn-&gt;conn_list);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;connlock, flags);</div><div class='ctx'> </div><div class='del'>-	z_pdu = conn-&gt;z_pdu;</div><div class='del'>-	z_error = conn-&gt;z_error;</div><div class='del'>-</div><div class='ctx'> 	if (transport-&gt;destroy_conn)</div><div class='ctx'> 		transport-&gt;destroy_conn(conn);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mempool_zone_destroy(z_pdu);</div><div class='del'>-	mempool_zone_destroy(z_error);</div><div class='add'>+static int</div><div class='add'>+iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev)</div><div class='add'>+{</div><div class='add'>+	char *data = (char*)ev + sizeof(*ev);</div><div class='add'>+	struct iscsi_cls_conn *conn;</div><div class='add'>+	struct iscsi_cls_session *session;</div><div class='add'>+	int err = 0, value = 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	session = iscsi_session_lookup(ev-&gt;u.set_param.sid);</div><div class='add'>+	conn = iscsi_conn_lookup(ev-&gt;u.set_param.sid, ev-&gt;u.set_param.cid);</div><div class='add'>+	if (!conn || !session)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (ev-&gt;u.set_param.param) {</div><div class='add'>+	case ISCSI_PARAM_SESS_RECOVERY_TMO:</div><div class='add'>+		sscanf(data, "%d", &amp;value);</div><div class='add'>+		if (value != 0)</div><div class='add'>+			session-&gt;recovery_tmo = value;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = transport-&gt;set_param(conn, ev-&gt;u.set_param.param,</div><div class='add'>+					   data, ev-&gt;u.set_param.len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_if_transport_ep(struct iscsi_transport *transport,</div><div class='add'>+		      struct iscsi_uevent *ev, int msg_type)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *dst_addr;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	switch (msg_type) {</div><div class='add'>+	case ISCSI_UEVENT_TRANSPORT_EP_CONNECT:</div><div class='add'>+		if (!transport-&gt;ep_connect)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		dst_addr = (struct sockaddr *)((char*)ev + sizeof(*ev));</div><div class='add'>+		rc = transport-&gt;ep_connect(dst_addr,</div><div class='add'>+					   ev-&gt;u.ep_connect.non_blocking,</div><div class='add'>+					   &amp;ev-&gt;r.ep_connect_ret.handle);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_UEVENT_TRANSPORT_EP_POLL:</div><div class='add'>+		if (!transport-&gt;ep_poll)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		ev-&gt;r.retcode = transport-&gt;ep_poll(ev-&gt;u.ep_poll.ep_handle,</div><div class='add'>+						   ev-&gt;u.ep_poll.timeout_ms);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT:</div><div class='add'>+		if (!transport-&gt;ep_disconnect)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		transport-&gt;ep_disconnect(ev-&gt;u.ep_disconnect.ep_handle);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+iscsi_tgt_dscvr(struct iscsi_transport *transport,</div><div class='add'>+		struct iscsi_uevent *ev)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *dst_addr;</div><div class='add'>+</div><div class='add'>+	if (!transport-&gt;tgt_dscvr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dst_addr = (struct sockaddr *)((char*)ev + sizeof(*ev));</div><div class='add'>+	return transport-&gt;tgt_dscvr(ev-&gt;u.tgt_dscvr.type,</div><div class='add'>+				    ev-&gt;u.tgt_dscvr.host_no,</div><div class='add'>+				    ev-&gt;u.tgt_dscvr.enable, dst_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -841,6 +1135,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 	struct iscsi_internal *priv;</div><div class='ctx'> 	struct iscsi_cls_session *session;</div><div class='ctx'> 	struct iscsi_cls_conn *conn;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	priv = iscsi_if_transport_lookup(iscsi_ptr(ev-&gt;transport_handle));</div><div class='ctx'> 	if (!priv)</div><div class='hunk'>@@ -850,15 +1145,21 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 	if (!try_module_get(transport-&gt;owner))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;daemon_pid = NETLINK_CREDS(skb)-&gt;pid;</div><div class='add'>+</div><div class='ctx'> 	switch (nlh-&gt;nlmsg_type) {</div><div class='ctx'> 	case ISCSI_UEVENT_CREATE_SESSION:</div><div class='ctx'> 		err = iscsi_if_create_session(priv, ev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_DESTROY_SESSION:</div><div class='del'>-		session = iscsi_session_lookup(ev-&gt;u.d_session.session_handle);</div><div class='del'>-		if (session)</div><div class='add'>+		session = iscsi_session_lookup(ev-&gt;u.d_session.sid);</div><div class='add'>+		if (session) {</div><div class='add'>+			spin_lock_irqsave(&amp;sesslock, flags);</div><div class='add'>+			list_del(&amp;session-&gt;sess_list);</div><div class='add'>+			spin_unlock_irqrestore(&amp;sesslock, flags);</div><div class='add'>+</div><div class='ctx'> 			transport-&gt;destroy_session(session);</div><div class='del'>-		else</div><div class='add'>+		} else</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_CREATE_CONN:</div><div class='hunk'>@@ -868,41 +1169,35 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 		err = iscsi_if_destroy_conn(transport, ev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_BIND_CONN:</div><div class='del'>-		session = iscsi_session_lookup(ev-&gt;u.b_conn.session_handle);</div><div class='del'>-		conn = iscsi_conn_lookup(ev-&gt;u.b_conn.conn_handle);</div><div class='add'>+		session = iscsi_session_lookup(ev-&gt;u.b_conn.sid);</div><div class='add'>+		conn = iscsi_conn_lookup(ev-&gt;u.b_conn.sid, ev-&gt;u.b_conn.cid);</div><div class='ctx'> </div><div class='ctx'> 		if (session &amp;&amp; conn)</div><div class='ctx'> 			ev-&gt;r.retcode =	transport-&gt;bind_conn(session, conn,</div><div class='del'>-					ev-&gt;u.b_conn.transport_fd,</div><div class='add'>+					ev-&gt;u.b_conn.transport_eph,</div><div class='ctx'> 					ev-&gt;u.b_conn.is_leading);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_SET_PARAM:</div><div class='del'>-		conn = iscsi_conn_lookup(ev-&gt;u.set_param.conn_handle);</div><div class='del'>-		if (conn)</div><div class='del'>-			ev-&gt;r.retcode =	transport-&gt;set_param(conn,</div><div class='del'>-				ev-&gt;u.set_param.param, ev-&gt;u.set_param.value);</div><div class='del'>-		else</div><div class='del'>-			err = -EINVAL;</div><div class='add'>+		err = iscsi_set_param(transport, ev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_START_CONN:</div><div class='del'>-		conn = iscsi_conn_lookup(ev-&gt;u.start_conn.conn_handle);</div><div class='add'>+		conn = iscsi_conn_lookup(ev-&gt;u.start_conn.sid, ev-&gt;u.start_conn.cid);</div><div class='ctx'> 		if (conn)</div><div class='ctx'> 			ev-&gt;r.retcode = transport-&gt;start_conn(conn);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_STOP_CONN:</div><div class='del'>-		conn = iscsi_conn_lookup(ev-&gt;u.stop_conn.conn_handle);</div><div class='add'>+		conn = iscsi_conn_lookup(ev-&gt;u.stop_conn.sid, ev-&gt;u.stop_conn.cid);</div><div class='ctx'> 		if (conn)</div><div class='ctx'> 			transport-&gt;stop_conn(conn, ev-&gt;u.stop_conn.flag);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ISCSI_UEVENT_SEND_PDU:</div><div class='del'>-		conn = iscsi_conn_lookup(ev-&gt;u.send_pdu.conn_handle);</div><div class='add'>+		conn = iscsi_conn_lookup(ev-&gt;u.send_pdu.sid, ev-&gt;u.send_pdu.cid);</div><div class='ctx'> 		if (conn)</div><div class='ctx'> 			ev-&gt;r.retcode =	transport-&gt;send_pdu(conn,</div><div class='ctx'> 				(struct iscsi_hdr*)((char*)ev + sizeof(*ev)),</div><div class='hunk'>@@ -914,6 +1209,14 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 	case ISCSI_UEVENT_GET_STATS:</div><div class='ctx'> 		err = iscsi_if_get_stats(transport, nlh);</div><div class='ctx'> 		break;</div><div class='add'>+	case ISCSI_UEVENT_TRANSPORT_EP_CONNECT:</div><div class='add'>+	case ISCSI_UEVENT_TRANSPORT_EP_POLL:</div><div class='add'>+	case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT:</div><div class='add'>+		err = iscsi_if_transport_ep(transport, ev, nlh-&gt;nlmsg_type);</div><div class='add'>+		break;</div><div class='add'>+	case ISCSI_UEVENT_TGT_DSCVR:</div><div class='add'>+		err = iscsi_tgt_dscvr(transport, ev);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -923,9 +1226,11 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Get message from skb (based on rtnetlink_rcv_skb).  Each message is</div><div class='del'>- * processed by iscsi_if_recv_msg.  Malformed skbs with wrong length are</div><div class='del'>- * or invalid creds discarded silently.  */</div><div class='add'>+/*</div><div class='add'>+ * Get message from skb (based on rtnetlink_rcv_skb).  Each message is</div><div class='add'>+ * processed by iscsi_if_recv_msg.  Malformed skbs with wrong lengths or</div><div class='add'>+ * invalid creds are discarded silently.</div><div class='add'>+ */</div><div class='ctx'> static void</div><div class='ctx'> iscsi_if_rx(struct sock *sk, int len)</div><div class='ctx'> {</div><div class='hunk'>@@ -937,7 +1242,6 @@ iscsi_if_rx(struct sock *sk, int len)</div><div class='ctx'> 			skb_pull(skb, skb-&gt;len);</div><div class='ctx'> 			goto free_skb;</div><div class='ctx'> 		}</div><div class='del'>-		daemon_pid = NETLINK_CREDS(skb)-&gt;pid;</div><div class='ctx'> </div><div class='ctx'> 		while (skb-&gt;len &gt;= NLMSG_SPACE(0)) {</div><div class='ctx'> 			int err;</div><div class='hunk'>@@ -988,31 +1292,38 @@ free_skb:</div><div class='ctx'> #define iscsi_cdev_to_conn(_cdev) \</div><div class='ctx'> 	iscsi_dev_to_conn(_cdev-&gt;dev)</div><div class='ctx'> </div><div class='add'>+#define ISCSI_CLASS_ATTR(_prefix,_name,_mode,_show,_store)		\</div><div class='add'>+struct class_device_attribute class_device_attr_##_prefix##_##_name =	\</div><div class='add'>+	__ATTR(_name,_mode,_show,_store)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * iSCSI connection attrs</div><div class='ctx'>  */</div><div class='del'>-#define iscsi_conn_int_attr_show(param, format)				\</div><div class='add'>+#define iscsi_conn_attr_show(param)					\</div><div class='ctx'> static ssize_t								\</div><div class='del'>-show_conn_int_param_##param(struct class_device *cdev, char *buf)	\</div><div class='add'>+show_conn_param_##param(struct class_device *cdev, char *buf)		\</div><div class='ctx'> {									\</div><div class='del'>-	uint32_t value = 0;						\</div><div class='ctx'> 	struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev);		\</div><div class='ctx'> 	struct iscsi_transport *t = conn-&gt;transport;			\</div><div class='del'>-									\</div><div class='del'>-	t-&gt;get_conn_param(conn, param, &amp;value);				\</div><div class='del'>-	return snprintf(buf, 20, format"\n", value);			\</div><div class='add'>+	return t-&gt;get_conn_param(conn, param, buf);			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define iscsi_conn_int_attr(field, param, format)			\</div><div class='del'>-	iscsi_conn_int_attr_show(param, format)				\</div><div class='del'>-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_conn_int_param_##param, NULL);</div><div class='del'>-</div><div class='del'>-iscsi_conn_int_attr(max_recv_dlength, ISCSI_PARAM_MAX_RECV_DLENGTH, "%u");</div><div class='del'>-iscsi_conn_int_attr(max_xmit_dlength, ISCSI_PARAM_MAX_XMIT_DLENGTH, "%u");</div><div class='del'>-iscsi_conn_int_attr(header_digest, ISCSI_PARAM_HDRDGST_EN, "%d");</div><div class='del'>-iscsi_conn_int_attr(data_digest, ISCSI_PARAM_DATADGST_EN, "%d");</div><div class='del'>-iscsi_conn_int_attr(ifmarker, ISCSI_PARAM_IFMARKER_EN, "%d");</div><div class='del'>-iscsi_conn_int_attr(ofmarker, ISCSI_PARAM_OFMARKER_EN, "%d");</div><div class='add'>+#define iscsi_conn_attr(field, param)					\</div><div class='add'>+	iscsi_conn_attr_show(param)					\</div><div class='add'>+static ISCSI_CLASS_ATTR(conn, field, S_IRUGO, show_conn_param_##param,	\</div><div class='add'>+			NULL);</div><div class='add'>+</div><div class='add'>+iscsi_conn_attr(max_recv_dlength, ISCSI_PARAM_MAX_RECV_DLENGTH);</div><div class='add'>+iscsi_conn_attr(max_xmit_dlength, ISCSI_PARAM_MAX_XMIT_DLENGTH);</div><div class='add'>+iscsi_conn_attr(header_digest, ISCSI_PARAM_HDRDGST_EN);</div><div class='add'>+iscsi_conn_attr(data_digest, ISCSI_PARAM_DATADGST_EN);</div><div class='add'>+iscsi_conn_attr(ifmarker, ISCSI_PARAM_IFMARKER_EN);</div><div class='add'>+iscsi_conn_attr(ofmarker, ISCSI_PARAM_OFMARKER_EN);</div><div class='add'>+iscsi_conn_attr(persistent_port, ISCSI_PARAM_PERSISTENT_PORT);</div><div class='add'>+iscsi_conn_attr(port, ISCSI_PARAM_CONN_PORT);</div><div class='add'>+iscsi_conn_attr(exp_statsn, ISCSI_PARAM_EXP_STATSN);</div><div class='add'>+iscsi_conn_attr(persistent_address, ISCSI_PARAM_PERSISTENT_ADDRESS);</div><div class='add'>+iscsi_conn_attr(address, ISCSI_PARAM_CONN_ADDRESS);</div><div class='ctx'> </div><div class='ctx'> #define iscsi_cdev_to_session(_cdev) \</div><div class='ctx'> 	iscsi_dev_to_session(_cdev-&gt;dev)</div><div class='hunk'>@@ -1020,42 +1331,67 @@ iscsi_conn_int_attr(ofmarker, ISCSI_PARAM_OFMARKER_EN, "%d");</div><div class='ctx'> /*</div><div class='ctx'>  * iSCSI session attrs</div><div class='ctx'>  */</div><div class='del'>-#define iscsi_session_int_attr_show(param, format)			\</div><div class='add'>+#define iscsi_session_attr_show(param)					\</div><div class='ctx'> static ssize_t								\</div><div class='del'>-show_session_int_param_##param(struct class_device *cdev, char *buf)	\</div><div class='add'>+show_session_param_##param(struct class_device *cdev, char *buf)	\</div><div class='ctx'> {									\</div><div class='del'>-	uint32_t value = 0;						\</div><div class='del'>-	struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev);	\</div><div class='add'>+	struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev); \</div><div class='ctx'> 	struct iscsi_transport *t = session-&gt;transport;			\</div><div class='del'>-									\</div><div class='del'>-	t-&gt;get_session_param(session, param, &amp;value);			\</div><div class='del'>-	return snprintf(buf, 20, format"\n", value);			\</div><div class='add'>+	return t-&gt;get_session_param(session, param, buf);		\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define iscsi_session_int_attr(field, param, format)			\</div><div class='del'>-	iscsi_session_int_attr_show(param, format)			\</div><div class='del'>-static CLASS_DEVICE_ATTR(field, S_IRUGO, show_session_int_param_##param, NULL);</div><div class='del'>-</div><div class='del'>-iscsi_session_int_attr(initial_r2t, ISCSI_PARAM_INITIAL_R2T_EN, "%d");</div><div class='del'>-iscsi_session_int_attr(max_outstanding_r2t, ISCSI_PARAM_MAX_R2T, "%hu");</div><div class='del'>-iscsi_session_int_attr(immediate_data, ISCSI_PARAM_IMM_DATA_EN, "%d");</div><div class='del'>-iscsi_session_int_attr(first_burst_len, ISCSI_PARAM_FIRST_BURST, "%u");</div><div class='del'>-iscsi_session_int_attr(max_burst_len, ISCSI_PARAM_MAX_BURST, "%u");</div><div class='del'>-iscsi_session_int_attr(data_pdu_in_order, ISCSI_PARAM_PDU_INORDER_EN, "%d");</div><div class='del'>-iscsi_session_int_attr(data_seq_in_order, ISCSI_PARAM_DATASEQ_INORDER_EN, "%d");</div><div class='del'>-iscsi_session_int_attr(erl, ISCSI_PARAM_ERL, "%d");</div><div class='del'>-</div><div class='del'>-#define SETUP_SESSION_RD_ATTR(field, param)				\</div><div class='del'>-	if (priv-&gt;param_mask &amp; (1 &lt;&lt; param)) {				\</div><div class='del'>-		priv-&gt;session_attrs[count] = &amp;class_device_attr_##field;\</div><div class='add'>+#define iscsi_session_attr(field, param)				\</div><div class='add'>+	iscsi_session_attr_show(param)					\</div><div class='add'>+static ISCSI_CLASS_ATTR(sess, field, S_IRUGO, show_session_param_##param, \</div><div class='add'>+			NULL);</div><div class='add'>+</div><div class='add'>+iscsi_session_attr(targetname, ISCSI_PARAM_TARGET_NAME);</div><div class='add'>+iscsi_session_attr(initial_r2t, ISCSI_PARAM_INITIAL_R2T_EN);</div><div class='add'>+iscsi_session_attr(max_outstanding_r2t, ISCSI_PARAM_MAX_R2T);</div><div class='add'>+iscsi_session_attr(immediate_data, ISCSI_PARAM_IMM_DATA_EN);</div><div class='add'>+iscsi_session_attr(first_burst_len, ISCSI_PARAM_FIRST_BURST);</div><div class='add'>+iscsi_session_attr(max_burst_len, ISCSI_PARAM_MAX_BURST);</div><div class='add'>+iscsi_session_attr(data_pdu_in_order, ISCSI_PARAM_PDU_INORDER_EN);</div><div class='add'>+iscsi_session_attr(data_seq_in_order, ISCSI_PARAM_DATASEQ_INORDER_EN);</div><div class='add'>+iscsi_session_attr(erl, ISCSI_PARAM_ERL);</div><div class='add'>+iscsi_session_attr(tpgt, ISCSI_PARAM_TPGT);</div><div class='add'>+</div><div class='add'>+#define iscsi_priv_session_attr_show(field, format)			\</div><div class='add'>+static ssize_t								\</div><div class='add'>+show_priv_session_##field(struct class_device *cdev, char *buf)		\</div><div class='add'>+{									\</div><div class='add'>+	struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev);\</div><div class='add'>+	return sprintf(buf, format"\n", session-&gt;field);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define iscsi_priv_session_attr(field, format)				\</div><div class='add'>+	iscsi_priv_session_attr_show(field, format)			\</div><div class='add'>+static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO, show_priv_session_##field, \</div><div class='add'>+			NULL)</div><div class='add'>+iscsi_priv_session_attr(recovery_tmo, "%d");</div><div class='add'>+</div><div class='add'>+#define SETUP_PRIV_SESSION_RD_ATTR(field)				\</div><div class='add'>+do {									\</div><div class='add'>+	priv-&gt;session_attrs[count] = &amp;class_device_attr_priv_sess_##field; \</div><div class='add'>+	count++;							\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define SETUP_SESSION_RD_ATTR(field, param_flag)			\</div><div class='add'>+do {									\</div><div class='add'>+	if (tt-&gt;param_mask &amp; param_flag) {				\</div><div class='add'>+		priv-&gt;session_attrs[count] = &amp;class_device_attr_sess_##field; \</div><div class='ctx'> 		count++;						\</div><div class='del'>-	}</div><div class='add'>+	}								\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='del'>-#define SETUP_CONN_RD_ATTR(field, param)				\</div><div class='del'>-	if (priv-&gt;param_mask &amp; (1 &lt;&lt; param)) {				\</div><div class='del'>-		priv-&gt;conn_attrs[count] = &amp;class_device_attr_##field;	\</div><div class='add'>+#define SETUP_CONN_RD_ATTR(field, param_flag)				\</div><div class='add'>+do {									\</div><div class='add'>+	if (tt-&gt;param_mask &amp; param_flag) {				\</div><div class='add'>+		priv-&gt;conn_attrs[count] = &amp;class_device_attr_conn_##field; \</div><div class='ctx'> 		count++;						\</div><div class='del'>-	}</div><div class='add'>+	}								\</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> static int iscsi_session_match(struct attribute_container *cont,</div><div class='ctx'> 			   struct device *dev)</div><div class='hunk'>@@ -1104,6 +1440,24 @@ static int iscsi_conn_match(struct attribute_container *cont,</div><div class='ctx'> 	return &amp;priv-&gt;conn_cont.ac == cont;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int iscsi_host_match(struct attribute_container *cont,</div><div class='add'>+			    struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	struct iscsi_internal *priv;</div><div class='add'>+</div><div class='add'>+	if (!scsi_is_host_device(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	shost = dev_to_shost(dev);</div><div class='add'>+	if (!shost-&gt;transportt  ||</div><div class='add'>+	    shost-&gt;transportt-&gt;host_attrs.ac.class != &amp;iscsi_host_class.class)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+        priv = to_iscsi_internal(shost-&gt;transportt);</div><div class='add'>+        return &amp;priv-&gt;t.host_attrs.ac == cont;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct scsi_transport_template *</div><div class='ctx'> iscsi_register_transport(struct iscsi_transport *tt)</div><div class='ctx'> {</div><div class='hunk'>@@ -1121,7 +1475,9 @@ iscsi_register_transport(struct iscsi_transport *tt)</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;list);</div><div class='add'>+	priv-&gt;daemon_pid = -1;</div><div class='ctx'> 	priv-&gt;iscsi_transport = tt;</div><div class='add'>+	priv-&gt;t.user_scan = iscsi_user_scan;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;cdev.class = &amp;iscsi_transport_class;</div><div class='ctx'> 	snprintf(priv-&gt;cdev.class_id, BUS_ID_SIZE, "%s", tt-&gt;name);</div><div class='hunk'>@@ -1133,18 +1489,13 @@ iscsi_register_transport(struct iscsi_transport *tt)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unregister_cdev;</div><div class='ctx'> </div><div class='del'>-	/* setup parameters mask */</div><div class='del'>-	priv-&gt;param_mask = 0xFFFFFFFF;</div><div class='del'>-	if (!(tt-&gt;caps &amp; CAP_MULTI_R2T))</div><div class='del'>-		priv-&gt;param_mask &amp;= ~(1 &lt;&lt; ISCSI_PARAM_MAX_R2T);</div><div class='del'>-	if (!(tt-&gt;caps &amp; CAP_HDRDGST))</div><div class='del'>-		priv-&gt;param_mask &amp;= ~(1 &lt;&lt; ISCSI_PARAM_HDRDGST_EN);</div><div class='del'>-	if (!(tt-&gt;caps &amp; CAP_DATADGST))</div><div class='del'>-		priv-&gt;param_mask &amp;= ~(1 &lt;&lt; ISCSI_PARAM_DATADGST_EN);</div><div class='del'>-	if (!(tt-&gt;caps &amp; CAP_MARKERS)) {</div><div class='del'>-		priv-&gt;param_mask &amp;= ~(1 &lt;&lt; ISCSI_PARAM_IFMARKER_EN);</div><div class='del'>-		priv-&gt;param_mask &amp;= ~(1 &lt;&lt; ISCSI_PARAM_OFMARKER_EN);</div><div class='del'>-	}</div><div class='add'>+	/* host parameters */</div><div class='add'>+	priv-&gt;t.host_attrs.ac.attrs = &amp;priv-&gt;host_attrs[0];</div><div class='add'>+	priv-&gt;t.host_attrs.ac.class = &amp;iscsi_host_class.class;</div><div class='add'>+	priv-&gt;t.host_attrs.ac.match = iscsi_host_match;</div><div class='add'>+	priv-&gt;t.host_size = sizeof(struct iscsi_host);</div><div class='add'>+	priv-&gt;host_attrs[0] = NULL;</div><div class='add'>+	transport_container_register(&amp;priv-&gt;t.host_attrs);</div><div class='ctx'> </div><div class='ctx'> 	/* connection parameters */</div><div class='ctx'> 	priv-&gt;conn_cont.ac.attrs = &amp;priv-&gt;conn_attrs[0];</div><div class='hunk'>@@ -1152,12 +1503,17 @@ iscsi_register_transport(struct iscsi_transport *tt)</div><div class='ctx'> 	priv-&gt;conn_cont.ac.match = iscsi_conn_match;</div><div class='ctx'> 	transport_container_register(&amp;priv-&gt;conn_cont);</div><div class='ctx'> </div><div class='del'>-	SETUP_CONN_RD_ATTR(max_recv_dlength, ISCSI_PARAM_MAX_RECV_DLENGTH);</div><div class='del'>-	SETUP_CONN_RD_ATTR(max_xmit_dlength, ISCSI_PARAM_MAX_XMIT_DLENGTH);</div><div class='del'>-	SETUP_CONN_RD_ATTR(header_digest, ISCSI_PARAM_HDRDGST_EN);</div><div class='del'>-	SETUP_CONN_RD_ATTR(data_digest, ISCSI_PARAM_DATADGST_EN);</div><div class='del'>-	SETUP_CONN_RD_ATTR(ifmarker, ISCSI_PARAM_IFMARKER_EN);</div><div class='del'>-	SETUP_CONN_RD_ATTR(ofmarker, ISCSI_PARAM_OFMARKER_EN);</div><div class='add'>+	SETUP_CONN_RD_ATTR(max_recv_dlength, ISCSI_MAX_RECV_DLENGTH);</div><div class='add'>+	SETUP_CONN_RD_ATTR(max_xmit_dlength, ISCSI_MAX_XMIT_DLENGTH);</div><div class='add'>+	SETUP_CONN_RD_ATTR(header_digest, ISCSI_HDRDGST_EN);</div><div class='add'>+	SETUP_CONN_RD_ATTR(data_digest, ISCSI_DATADGST_EN);</div><div class='add'>+	SETUP_CONN_RD_ATTR(ifmarker, ISCSI_IFMARKER_EN);</div><div class='add'>+	SETUP_CONN_RD_ATTR(ofmarker, ISCSI_OFMARKER_EN);</div><div class='add'>+	SETUP_CONN_RD_ATTR(address, ISCSI_CONN_ADDRESS);</div><div class='add'>+	SETUP_CONN_RD_ATTR(port, ISCSI_CONN_PORT);</div><div class='add'>+	SETUP_CONN_RD_ATTR(exp_statsn, ISCSI_EXP_STATSN);</div><div class='add'>+	SETUP_CONN_RD_ATTR(persistent_address, ISCSI_PERSISTENT_ADDRESS);</div><div class='add'>+	SETUP_CONN_RD_ATTR(persistent_port, ISCSI_PERSISTENT_PORT);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(count &gt; ISCSI_CONN_ATTRS);</div><div class='ctx'> 	priv-&gt;conn_attrs[count] = NULL;</div><div class='hunk'>@@ -1169,14 +1525,17 @@ iscsi_register_transport(struct iscsi_transport *tt)</div><div class='ctx'> 	priv-&gt;session_cont.ac.match = iscsi_session_match;</div><div class='ctx'> 	transport_container_register(&amp;priv-&gt;session_cont);</div><div class='ctx'> </div><div class='del'>-	SETUP_SESSION_RD_ATTR(initial_r2t, ISCSI_PARAM_INITIAL_R2T_EN);</div><div class='del'>-	SETUP_SESSION_RD_ATTR(max_outstanding_r2t, ISCSI_PARAM_MAX_R2T);</div><div class='del'>-	SETUP_SESSION_RD_ATTR(immediate_data, ISCSI_PARAM_IMM_DATA_EN);</div><div class='del'>-	SETUP_SESSION_RD_ATTR(first_burst_len, ISCSI_PARAM_FIRST_BURST);</div><div class='del'>-	SETUP_SESSION_RD_ATTR(max_burst_len, ISCSI_PARAM_MAX_BURST);</div><div class='del'>-	SETUP_SESSION_RD_ATTR(data_pdu_in_order, ISCSI_PARAM_PDU_INORDER_EN);</div><div class='del'>-	SETUP_SESSION_RD_ATTR(data_seq_in_order,ISCSI_PARAM_DATASEQ_INORDER_EN)</div><div class='del'>-	SETUP_SESSION_RD_ATTR(erl, ISCSI_PARAM_ERL);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(initial_r2t, ISCSI_INITIAL_R2T_EN);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(max_outstanding_r2t, ISCSI_MAX_R2T);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(immediate_data, ISCSI_IMM_DATA_EN);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(first_burst_len, ISCSI_FIRST_BURST);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(max_burst_len, ISCSI_MAX_BURST);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(data_pdu_in_order, ISCSI_PDU_INORDER_EN);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(data_seq_in_order, ISCSI_DATASEQ_INORDER_EN);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(erl, ISCSI_ERL);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(targetname, ISCSI_TARGET_NAME);</div><div class='add'>+	SETUP_SESSION_RD_ATTR(tpgt, ISCSI_TPGT);</div><div class='add'>+	SETUP_PRIV_SESSION_RD_ATTR(recovery_tmo);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(count &gt; ISCSI_SESSION_ATTRS);</div><div class='ctx'> 	priv-&gt;session_attrs[count] = NULL;</div><div class='hunk'>@@ -1214,6 +1573,7 @@ int iscsi_unregister_transport(struct iscsi_transport *tt)</div><div class='ctx'> </div><div class='ctx'> 	transport_container_unregister(&amp;priv-&gt;conn_cont);</div><div class='ctx'> 	transport_container_unregister(&amp;priv-&gt;session_cont);</div><div class='add'>+	transport_container_unregister(&amp;priv-&gt;t.host_attrs);</div><div class='ctx'> </div><div class='ctx'> 	sysfs_remove_group(&amp;priv-&gt;cdev.kobj, &amp;iscsi_transport_group);</div><div class='ctx'> 	class_device_unregister(&amp;priv-&gt;cdev);</div><div class='hunk'>@@ -1257,10 +1617,14 @@ static __init int iscsi_transport_init(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = transport_class_register(&amp;iscsi_connection_class);</div><div class='add'>+	err = transport_class_register(&amp;iscsi_host_class);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unregister_transport_class;</div><div class='ctx'> </div><div class='add'>+	err = transport_class_register(&amp;iscsi_connection_class);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unregister_host_class;</div><div class='add'>+</div><div class='ctx'> 	err = transport_class_register(&amp;iscsi_session_class);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unregister_conn_class;</div><div class='hunk'>@@ -1288,6 +1652,8 @@ unregister_session_class:</div><div class='ctx'> 	transport_class_unregister(&amp;iscsi_session_class);</div><div class='ctx'> unregister_conn_class:</div><div class='ctx'> 	transport_class_unregister(&amp;iscsi_connection_class);</div><div class='add'>+unregister_host_class:</div><div class='add'>+	transport_class_unregister(&amp;iscsi_host_class);</div><div class='ctx'> unregister_transport_class:</div><div class='ctx'> 	class_unregister(&amp;iscsi_transport_class);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1300,6 +1666,7 @@ static void __exit iscsi_transport_exit(void)</div><div class='ctx'> 	netlink_unregister_notifier(&amp;iscsi_nl_notifier);</div><div class='ctx'> 	transport_class_unregister(&amp;iscsi_connection_class);</div><div class='ctx'> 	transport_class_unregister(&amp;iscsi_session_class);</div><div class='add'>+	transport_class_unregister(&amp;iscsi_host_class);</div><div class='ctx'> 	class_unregister(&amp;iscsi_transport_class);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c<br/>index f3b16066387c..dd075627e605 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_sas.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_sas.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_sas.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_transport_sas.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ get_sas_##title##_names(u32 table_key, char *buf)		\</div><div class='ctx'> 	ssize_t len = 0;					\</div><div class='ctx'> 	int i;							\</div><div class='ctx'> 								\</div><div class='del'>-	for (i = 0; i &lt; sizeof(table)/sizeof(table[0]); i++) {	\</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table); i++) {		\</div><div class='ctx'> 		if (table[i].value &amp; table_key) {		\</div><div class='ctx'> 			len += sprintf(buf + len, "%s%s",	\</div><div class='ctx'> 				prefix, table[i].name);		\</div><div class='hunk'>@@ -83,7 +83,7 @@ get_sas_##title##_names(u32 table_key, char *buf)		\</div><div class='ctx'> 	ssize_t len = 0;					\</div><div class='ctx'> 	int i;							\</div><div class='ctx'> 								\</div><div class='del'>-	for (i = 0; i &lt; sizeof(table)/sizeof(table[0]); i++) {	\</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(table); i++) {		\</div><div class='ctx'> 		if (table[i].value == table_key) {		\</div><div class='ctx'> 			len += sprintf(buf + len, "%s",		\</div><div class='ctx'> 				table[i].name);			\</div><div class='hunk'>@@ -174,12 +174,29 @@ static int sas_host_match(struct attribute_container *cont,</div><div class='ctx'> </div><div class='ctx'> static int do_sas_phy_delete(struct device *dev, void *data)</div><div class='ctx'> {</div><div class='del'>-	if (scsi_is_sas_phy(dev))</div><div class='add'>+	int pass = (int)(unsigned long)data;</div><div class='add'>+</div><div class='add'>+	if (pass == 0 &amp;&amp; scsi_is_sas_port(dev))</div><div class='add'>+		sas_port_delete(dev_to_sas_port(dev));</div><div class='add'>+	else if (pass == 1 &amp;&amp; scsi_is_sas_phy(dev))</div><div class='ctx'> 		sas_phy_delete(dev_to_phy(dev));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * sas_remove_children  --  tear down a devices SAS data structures</div><div class='add'>+ * @dev:	device belonging to the sas object</div><div class='add'>+ *</div><div class='add'>+ * Removes all SAS PHYs and remote PHYs for a given object</div><div class='add'>+ */</div><div class='add'>+void sas_remove_children(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	device_for_each_child(dev, (void *)0, do_sas_phy_delete);</div><div class='add'>+	device_for_each_child(dev, (void *)1, do_sas_phy_delete);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_remove_children);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * sas_remove_host  --  tear down a Scsi_Host's SAS data structures</div><div class='ctx'>  * @shost:	Scsi Host that is torn down</div><div class='ctx'>  *</div><div class='hunk'>@@ -188,13 +205,13 @@ static int do_sas_phy_delete(struct device *dev, void *data)</div><div class='ctx'>  */</div><div class='ctx'> void sas_remove_host(struct Scsi_Host *shost)</div><div class='ctx'> {</div><div class='del'>-	device_for_each_child(&amp;shost-&gt;shost_gendev, NULL, do_sas_phy_delete);</div><div class='add'>+	sas_remove_children(&amp;shost-&gt;shost_gendev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(sas_remove_host);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * SAS Port attributes</div><div class='add'>+ * SAS Phy attributes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define sas_phy_show_simple(field, name, format_string, cast)		\</div><div class='hunk'>@@ -310,7 +327,7 @@ sas_phy_protocol_attr(identify.target_port_protocols,</div><div class='ctx'> sas_phy_simple_attr(identify.sas_address, sas_address, "0x%016llx\n",</div><div class='ctx'> 		unsigned long long);</div><div class='ctx'> sas_phy_simple_attr(identify.phy_identifier, phy_identifier, "%d\n", u8);</div><div class='del'>-sas_phy_simple_attr(port_identifier, port_identifier, "%d\n", u8);</div><div class='add'>+//sas_phy_simple_attr(port_identifier, port_identifier, "%d\n", u8);</div><div class='ctx'> sas_phy_linkspeed_attr(negotiated_linkrate);</div><div class='ctx'> sas_phy_linkspeed_attr(minimum_linkrate_hw);</div><div class='ctx'> sas_phy_linkspeed_attr(minimum_linkrate);</div><div class='hunk'>@@ -378,9 +395,10 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)</div><div class='ctx'> 	device_initialize(&amp;phy-&gt;dev);</div><div class='ctx'> 	phy-&gt;dev.parent = get_device(parent);</div><div class='ctx'> 	phy-&gt;dev.release = sas_phy_release;</div><div class='add'>+	INIT_LIST_HEAD(&amp;phy-&gt;port_siblings);</div><div class='ctx'> 	if (scsi_is_sas_expander_device(parent)) {</div><div class='ctx'> 		struct sas_rphy *rphy = dev_to_rphy(parent);</div><div class='del'>-		sprintf(phy-&gt;dev.bus_id, "phy-%d-%d:%d", shost-&gt;host_no,</div><div class='add'>+		sprintf(phy-&gt;dev.bus_id, "phy-%d:%d:%d", shost-&gt;host_no,</div><div class='ctx'> 			rphy-&gt;scsi_target_id, number);</div><div class='ctx'> 	} else</div><div class='ctx'> 		sprintf(phy-&gt;dev.bus_id, "phy-%d:%d", shost-&gt;host_no, number);</div><div class='hunk'>@@ -440,8 +458,8 @@ sas_phy_delete(struct sas_phy *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;phy-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (phy-&gt;rphy)</div><div class='del'>-		sas_rphy_delete(phy-&gt;rphy);</div><div class='add'>+	/* this happens if the phy is still part of a port when deleted */</div><div class='add'>+	BUG_ON(!list_empty(&amp;phy-&gt;port_siblings));</div><div class='ctx'> </div><div class='ctx'> 	transport_remove_device(dev);</div><div class='ctx'> 	device_del(dev);</div><div class='hunk'>@@ -464,6 +482,258 @@ int scsi_is_sas_phy(const struct device *dev)</div><div class='ctx'> EXPORT_SYMBOL(scsi_is_sas_phy);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * SAS Port attributes</div><div class='add'>+ */</div><div class='add'>+#define sas_port_show_simple(field, name, format_string, cast)		\</div><div class='add'>+static ssize_t								\</div><div class='add'>+show_sas_port_##name(struct class_device *cdev, char *buf)		\</div><div class='add'>+{									\</div><div class='add'>+	struct sas_port *port = transport_class_to_sas_port(cdev);	\</div><div class='add'>+									\</div><div class='add'>+	return snprintf(buf, 20, format_string, cast port-&gt;field);	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define sas_port_simple_attr(field, name, format_string, type)		\</div><div class='add'>+	sas_port_show_simple(field, name, format_string, (type))	\</div><div class='add'>+static CLASS_DEVICE_ATTR(name, S_IRUGO, show_sas_port_##name, NULL)</div><div class='add'>+</div><div class='add'>+sas_port_simple_attr(num_phys, num_phys, "%d\n", int);</div><div class='add'>+</div><div class='add'>+static DECLARE_TRANSPORT_CLASS(sas_port_class,</div><div class='add'>+			       "sas_port", NULL, NULL, NULL);</div><div class='add'>+</div><div class='add'>+static int sas_port_match(struct attribute_container *cont, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost;</div><div class='add'>+	struct sas_internal *i;</div><div class='add'>+</div><div class='add'>+	if (!scsi_is_sas_port(dev))</div><div class='add'>+		return 0;</div><div class='add'>+	shost = dev_to_shost(dev-&gt;parent);</div><div class='add'>+</div><div class='add'>+	if (!shost-&gt;transportt)</div><div class='add'>+		return 0;</div><div class='add'>+	if (shost-&gt;transportt-&gt;host_attrs.ac.class !=</div><div class='add'>+			&amp;sas_host_class.class)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	i = to_sas_internal(shost-&gt;transportt);</div><div class='add'>+	return &amp;i-&gt;port_attr_cont.ac == cont;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void sas_port_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct sas_port *port = dev_to_sas_port(dev);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!list_empty(&amp;port-&gt;phy_list));</div><div class='add'>+</div><div class='add'>+	put_device(dev-&gt;parent);</div><div class='add'>+	kfree(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sas_port_create_link(struct sas_port *port,</div><div class='add'>+				 struct sas_phy *phy)</div><div class='add'>+{</div><div class='add'>+	sysfs_create_link(&amp;port-&gt;dev.kobj, &amp;phy-&gt;dev.kobj, phy-&gt;dev.bus_id);</div><div class='add'>+	sysfs_create_link(&amp;phy-&gt;dev.kobj, &amp;port-&gt;dev.kobj, "port");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sas_port_delete_link(struct sas_port *port,</div><div class='add'>+				 struct sas_phy *phy)</div><div class='add'>+{</div><div class='add'>+	sysfs_remove_link(&amp;port-&gt;dev.kobj, phy-&gt;dev.bus_id);</div><div class='add'>+	sysfs_remove_link(&amp;phy-&gt;dev.kobj, "port");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** sas_port_alloc - allocate and initialize a SAS port structure</div><div class='add'>+ *</div><div class='add'>+ * @parent:	parent device</div><div class='add'>+ * @port_id:	port number</div><div class='add'>+ *</div><div class='add'>+ * Allocates a SAS port structure.  It will be added to the device tree</div><div class='add'>+ * below the device specified by @parent which must be either a Scsi_Host</div><div class='add'>+ * or a sas_expander_device.</div><div class='add'>+ *</div><div class='add'>+ * Returns %NULL on error</div><div class='add'>+ */</div><div class='add'>+struct sas_port *sas_port_alloc(struct device *parent, int port_id)</div><div class='add'>+{</div><div class='add'>+	struct Scsi_Host *shost = dev_to_shost(parent);</div><div class='add'>+	struct sas_port *port;</div><div class='add'>+</div><div class='add'>+	port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='add'>+	if (!port)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	port-&gt;port_identifier = port_id;</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;port-&gt;dev);</div><div class='add'>+</div><div class='add'>+	port-&gt;dev.parent = get_device(parent);</div><div class='add'>+	port-&gt;dev.release = sas_port_release;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;port-&gt;phy_list);</div><div class='add'>+</div><div class='add'>+	if (scsi_is_sas_expander_device(parent)) {</div><div class='add'>+		struct sas_rphy *rphy = dev_to_rphy(parent);</div><div class='add'>+		sprintf(port-&gt;dev.bus_id, "port-%d:%d:%d", shost-&gt;host_no,</div><div class='add'>+			rphy-&gt;scsi_target_id, port-&gt;port_identifier);</div><div class='add'>+	} else</div><div class='add'>+		sprintf(port-&gt;dev.bus_id, "port-%d:%d", shost-&gt;host_no,</div><div class='add'>+			port-&gt;port_identifier);</div><div class='add'>+</div><div class='add'>+	transport_setup_device(&amp;port-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return port;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_port_alloc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sas_port_add - add a SAS port to the device hierarchy</div><div class='add'>+ *</div><div class='add'>+ * @port:	port to be added</div><div class='add'>+ *</div><div class='add'>+ * publishes a port to the rest of the system</div><div class='add'>+ */</div><div class='add'>+int sas_port_add(struct sas_port *port)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	/* No phys should be added until this is made visible */</div><div class='add'>+	BUG_ON(!list_empty(&amp;port-&gt;phy_list));</div><div class='add'>+</div><div class='add'>+	error = device_add(&amp;port-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	transport_add_device(&amp;port-&gt;dev);</div><div class='add'>+	transport_configure_device(&amp;port-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_port_add);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sas_port_free  --  free a SAS PORT</div><div class='add'>+ * @port:	SAS PORT to free</div><div class='add'>+ *</div><div class='add'>+ * Frees the specified SAS PORT.</div><div class='add'>+ *</div><div class='add'>+ * Note:</div><div class='add'>+ *   This function must only be called on a PORT that has not</div><div class='add'>+ *   sucessfully been added using sas_port_add().</div><div class='add'>+ */</div><div class='add'>+void sas_port_free(struct sas_port *port)</div><div class='add'>+{</div><div class='add'>+	transport_destroy_device(&amp;port-&gt;dev);</div><div class='add'>+	put_device(&amp;port-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_port_free);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sas_port_delete  --  remove SAS PORT</div><div class='add'>+ * @port:	SAS PORT to remove</div><div class='add'>+ *</div><div class='add'>+ * Removes the specified SAS PORT.  If the SAS PORT has an</div><div class='add'>+ * associated phys, unlink them from the port as well.</div><div class='add'>+ */</div><div class='add'>+void sas_port_delete(struct sas_port *port)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;port-&gt;dev;</div><div class='add'>+	struct sas_phy *phy, *tmp_phy;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;rphy) {</div><div class='add'>+		sas_rphy_delete(port-&gt;rphy);</div><div class='add'>+		port-&gt;rphy = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+	list_for_each_entry_safe(phy, tmp_phy, &amp;port-&gt;phy_list,</div><div class='add'>+				 port_siblings) {</div><div class='add'>+		sas_port_delete_link(port, phy);</div><div class='add'>+		list_del_init(&amp;phy-&gt;port_siblings);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+</div><div class='add'>+	transport_remove_device(dev);</div><div class='add'>+	device_del(dev);</div><div class='add'>+	transport_destroy_device(dev);</div><div class='add'>+	put_device(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_port_delete);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * scsi_is_sas_port --  check if a struct device represents a SAS port</div><div class='add'>+ * @dev:	device to check</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *	%1 if the device represents a SAS Port, %0 else</div><div class='add'>+ */</div><div class='add'>+int scsi_is_sas_port(const struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;release == sas_port_release;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(scsi_is_sas_port);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sas_port_add_phy - add another phy to a port to form a wide port</div><div class='add'>+ * @port:	port to add the phy to</div><div class='add'>+ * @phy:	phy to add</div><div class='add'>+ *</div><div class='add'>+ * When a port is initially created, it is empty (has no phys).  All</div><div class='add'>+ * ports must have at least one phy to operated, and all wide ports</div><div class='add'>+ * must have at least two.  The current code makes no difference</div><div class='add'>+ * between ports and wide ports, but the only object that can be</div><div class='add'>+ * connected to a remote device is a port, so ports must be formed on</div><div class='add'>+ * all devices with phys if they're connected to anything.</div><div class='add'>+ */</div><div class='add'>+void sas_port_add_phy(struct sas_port *port, struct sas_phy *phy)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+	if (unlikely(!list_empty(&amp;phy-&gt;port_siblings))) {</div><div class='add'>+		/* make sure we're already on this port */</div><div class='add'>+		struct sas_phy *tmp;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(tmp, &amp;port-&gt;phy_list, port_siblings)</div><div class='add'>+			if (tmp == phy)</div><div class='add'>+				break;</div><div class='add'>+		/* If this trips, you added a phy that was already</div><div class='add'>+		 * part of a different port */</div><div class='add'>+		if (unlikely(tmp != phy)) {</div><div class='add'>+			dev_printk(KERN_ERR, &amp;port-&gt;dev, "trying to add phy %s fails: it's already part of another port\n", phy-&gt;dev.bus_id);</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		sas_port_create_link(port, phy);</div><div class='add'>+		list_add_tail(&amp;phy-&gt;port_siblings, &amp;port-&gt;phy_list);</div><div class='add'>+		port-&gt;num_phys++;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_port_add_phy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sas_port_delete_phy - remove a phy from a port or wide port</div><div class='add'>+ * @port:	port to remove the phy from</div><div class='add'>+ * @phy:	phy to remove</div><div class='add'>+ *</div><div class='add'>+ * This operation is used for tearing down ports again.  It must be</div><div class='add'>+ * done to every port or wide port before calling sas_port_delete.</div><div class='add'>+ */</div><div class='add'>+void sas_port_delete_phy(struct sas_port *port, struct sas_phy *phy)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+	sas_port_delete_link(port, phy);</div><div class='add'>+	list_del_init(&amp;phy-&gt;port_siblings);</div><div class='add'>+	port-&gt;num_phys--;</div><div class='add'>+	mutex_unlock(&amp;port-&gt;phy_list_mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(sas_port_delete_phy);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * SAS remote PHY attributes.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -748,6 +1018,18 @@ static void sas_end_device_release(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * sas_rphy_initialize - common rphy intialization</div><div class='add'>+ * @rphy:	rphy to initialise</div><div class='add'>+ *</div><div class='add'>+ * Used by both sas_end_device_alloc() and sas_expander_alloc() to</div><div class='add'>+ * initialise the common rphy component of each.</div><div class='add'>+ */</div><div class='add'>+static void sas_rphy_initialize(struct sas_rphy *rphy)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;rphy-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * sas_end_device_alloc - allocate an rphy for an end device</div><div class='ctx'>  *</div><div class='ctx'>  * Allocates an SAS remote PHY structure, connected to @parent.</div><div class='hunk'>@@ -755,7 +1037,7 @@ static void sas_end_device_release(struct device *dev)</div><div class='ctx'>  * Returns:</div><div class='ctx'>  *	SAS PHY allocated or %NULL if the allocation failed.</div><div class='ctx'>  */</div><div class='del'>-struct sas_rphy *sas_end_device_alloc(struct sas_phy *parent)</div><div class='add'>+struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = dev_to_shost(&amp;parent-&gt;dev);</div><div class='ctx'> 	struct sas_end_device *rdev;</div><div class='hunk'>@@ -768,9 +1050,15 @@ struct sas_rphy *sas_end_device_alloc(struct sas_phy *parent)</div><div class='ctx'> 	device_initialize(&amp;rdev-&gt;rphy.dev);</div><div class='ctx'> 	rdev-&gt;rphy.dev.parent = get_device(&amp;parent-&gt;dev);</div><div class='ctx'> 	rdev-&gt;rphy.dev.release = sas_end_device_release;</div><div class='del'>-	sprintf(rdev-&gt;rphy.dev.bus_id, "end_device-%d:%d-%d",</div><div class='del'>-		shost-&gt;host_no, parent-&gt;port_identifier, parent-&gt;number);</div><div class='add'>+	if (scsi_is_sas_expander_device(parent-&gt;dev.parent)) {</div><div class='add'>+		struct sas_rphy *rphy = dev_to_rphy(parent-&gt;dev.parent);</div><div class='add'>+		sprintf(rdev-&gt;rphy.dev.bus_id, "end_device-%d:%d:%d",</div><div class='add'>+			shost-&gt;host_no, rphy-&gt;scsi_target_id, parent-&gt;port_identifier);</div><div class='add'>+	} else</div><div class='add'>+		sprintf(rdev-&gt;rphy.dev.bus_id, "end_device-%d:%d",</div><div class='add'>+			shost-&gt;host_no, parent-&gt;port_identifier);</div><div class='ctx'> 	rdev-&gt;rphy.identify.device_type = SAS_END_DEVICE;</div><div class='add'>+	sas_rphy_initialize(&amp;rdev-&gt;rphy);</div><div class='ctx'> 	transport_setup_device(&amp;rdev-&gt;rphy.dev);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;rdev-&gt;rphy;</div><div class='hunk'>@@ -785,7 +1073,7 @@ EXPORT_SYMBOL(sas_end_device_alloc);</div><div class='ctx'>  * Returns:</div><div class='ctx'>  *	SAS PHY allocated or %NULL if the allocation failed.</div><div class='ctx'>  */</div><div class='del'>-struct sas_rphy *sas_expander_alloc(struct sas_phy *parent,</div><div class='add'>+struct sas_rphy *sas_expander_alloc(struct sas_port *parent,</div><div class='ctx'> 				    enum sas_device_type type)</div><div class='ctx'> {</div><div class='ctx'> 	struct Scsi_Host *shost = dev_to_shost(&amp;parent-&gt;dev);</div><div class='hunk'>@@ -809,6 +1097,7 @@ struct sas_rphy *sas_expander_alloc(struct sas_phy *parent,</div><div class='ctx'> 	sprintf(rdev-&gt;rphy.dev.bus_id, "expander-%d:%d",</div><div class='ctx'> 		shost-&gt;host_no, rdev-&gt;rphy.scsi_target_id);</div><div class='ctx'> 	rdev-&gt;rphy.identify.device_type = type;</div><div class='add'>+	sas_rphy_initialize(&amp;rdev-&gt;rphy);</div><div class='ctx'> 	transport_setup_device(&amp;rdev-&gt;rphy.dev);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;rdev-&gt;rphy;</div><div class='hunk'>@@ -823,7 +1112,7 @@ EXPORT_SYMBOL(sas_expander_alloc);</div><div class='ctx'>  */</div><div class='ctx'> int sas_rphy_add(struct sas_rphy *rphy)</div><div class='ctx'> {</div><div class='del'>-	struct sas_phy *parent = dev_to_phy(rphy-&gt;dev.parent);</div><div class='add'>+	struct sas_port *parent = dev_to_sas_port(rphy-&gt;dev.parent);</div><div class='ctx'> 	struct Scsi_Host *shost = dev_to_shost(parent-&gt;dev.parent);</div><div class='ctx'> 	struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);</div><div class='ctx'> 	struct sas_identify *identify = &amp;rphy-&gt;identify;</div><div class='hunk'>@@ -896,7 +1185,7 @@ void</div><div class='ctx'> sas_rphy_delete(struct sas_rphy *rphy)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;rphy-&gt;dev;</div><div class='del'>-	struct sas_phy *parent = dev_to_phy(dev-&gt;parent);</div><div class='add'>+	struct sas_port *parent = dev_to_sas_port(dev-&gt;parent);</div><div class='ctx'> 	struct Scsi_Host *shost = dev_to_shost(parent-&gt;dev.parent);</div><div class='ctx'> 	struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);</div><div class='ctx'> </div><div class='hunk'>@@ -906,7 +1195,7 @@ sas_rphy_delete(struct sas_rphy *rphy)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SAS_EDGE_EXPANDER_DEVICE:</div><div class='ctx'> 	case SAS_FANOUT_EXPANDER_DEVICE:</div><div class='del'>-		device_for_each_child(dev, NULL, do_sas_phy_delete);</div><div class='add'>+		sas_remove_children(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -953,7 +1242,7 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;sas_host-&gt;lock);</div><div class='ctx'> 	list_for_each_entry(rphy, &amp;sas_host-&gt;rphy_list, list) {</div><div class='del'>-		struct sas_phy *parent = dev_to_phy(rphy-&gt;dev.parent);</div><div class='add'>+		struct sas_port *parent = dev_to_sas_port(rphy-&gt;dev.parent);</div><div class='ctx'> </div><div class='ctx'> 		if (rphy-&gt;identify.device_type != SAS_END_DEVICE ||</div><div class='ctx'> 		    rphy-&gt;scsi_target_id == -1)</div><div class='hunk'>@@ -989,16 +1278,19 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,</div><div class='ctx'> #define SETUP_OPTIONAL_RPORT_ATTRIBUTE(field, func)			\</div><div class='ctx'> 	SETUP_TEMPLATE(rphy_attrs, field, S_IRUGO, i-&gt;f-&gt;func)</div><div class='ctx'> </div><div class='del'>-#define SETUP_PORT_ATTRIBUTE(field)					\</div><div class='add'>+#define SETUP_PHY_ATTRIBUTE(field)					\</div><div class='ctx'> 	SETUP_TEMPLATE(phy_attrs, field, S_IRUGO, 1)</div><div class='ctx'> </div><div class='del'>-#define SETUP_OPTIONAL_PORT_ATTRIBUTE(field, func)			\</div><div class='add'>+#define SETUP_PORT_ATTRIBUTE(field)					\</div><div class='add'>+	SETUP_TEMPLATE(port_attrs, field, S_IRUGO, 1)</div><div class='add'>+</div><div class='add'>+#define SETUP_OPTIONAL_PHY_ATTRIBUTE(field, func)			\</div><div class='ctx'> 	SETUP_TEMPLATE(phy_attrs, field, S_IRUGO, i-&gt;f-&gt;func)</div><div class='ctx'> </div><div class='del'>-#define SETUP_PORT_ATTRIBUTE_WRONLY(field)				\</div><div class='add'>+#define SETUP_PHY_ATTRIBUTE_WRONLY(field)				\</div><div class='ctx'> 	SETUP_TEMPLATE(phy_attrs, field, S_IWUGO, 1)</div><div class='ctx'> </div><div class='del'>-#define SETUP_OPTIONAL_PORT_ATTRIBUTE_WRONLY(field, func)		\</div><div class='add'>+#define SETUP_OPTIONAL_PHY_ATTRIBUTE_WRONLY(field, func)		\</div><div class='ctx'> 	SETUP_TEMPLATE(phy_attrs, field, S_IWUGO, i-&gt;f-&gt;func)</div><div class='ctx'> </div><div class='ctx'> #define SETUP_END_DEV_ATTRIBUTE(field)					\</div><div class='hunk'>@@ -1034,6 +1326,11 @@ sas_attach_transport(struct sas_function_template *ft)</div><div class='ctx'> 	i-&gt;phy_attr_cont.ac.match = sas_phy_match;</div><div class='ctx'> 	transport_container_register(&amp;i-&gt;phy_attr_cont);</div><div class='ctx'> </div><div class='add'>+	i-&gt;port_attr_cont.ac.class = &amp;sas_port_class.class;</div><div class='add'>+	i-&gt;port_attr_cont.ac.attrs = &amp;i-&gt;port_attrs[0];</div><div class='add'>+	i-&gt;port_attr_cont.ac.match = sas_port_match;</div><div class='add'>+	transport_container_register(&amp;i-&gt;port_attr_cont);</div><div class='add'>+</div><div class='ctx'> 	i-&gt;rphy_attr_cont.ac.class = &amp;sas_rphy_class.class;</div><div class='ctx'> 	i-&gt;rphy_attr_cont.ac.attrs = &amp;i-&gt;rphy_attrs[0];</div><div class='ctx'> 	i-&gt;rphy_attr_cont.ac.match = sas_rphy_match;</div><div class='hunk'>@@ -1052,30 +1349,35 @@ sas_attach_transport(struct sas_function_template *ft)</div><div class='ctx'> 	i-&gt;f = ft;</div><div class='ctx'> </div><div class='ctx'> 	count = 0;</div><div class='add'>+	SETUP_PORT_ATTRIBUTE(num_phys);</div><div class='ctx'> 	i-&gt;host_attrs[count] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	count = 0;</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(initiator_port_protocols);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(target_port_protocols);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(device_type);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(sas_address);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(phy_identifier);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(port_identifier);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(negotiated_linkrate);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(minimum_linkrate_hw);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(minimum_linkrate);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(maximum_linkrate_hw);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(maximum_linkrate);</div><div class='del'>-</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(invalid_dword_count);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(running_disparity_error_count);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(loss_of_dword_sync_count);</div><div class='del'>-	SETUP_PORT_ATTRIBUTE(phy_reset_problem_count);</div><div class='del'>-	SETUP_OPTIONAL_PORT_ATTRIBUTE_WRONLY(link_reset, phy_reset);</div><div class='del'>-	SETUP_OPTIONAL_PORT_ATTRIBUTE_WRONLY(hard_reset, phy_reset);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(initiator_port_protocols);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(target_port_protocols);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(device_type);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(sas_address);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(phy_identifier);</div><div class='add'>+	//SETUP_PHY_ATTRIBUTE(port_identifier);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(negotiated_linkrate);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(minimum_linkrate_hw);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(minimum_linkrate);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(maximum_linkrate_hw);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(maximum_linkrate);</div><div class='add'>+</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(invalid_dword_count);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(running_disparity_error_count);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(loss_of_dword_sync_count);</div><div class='add'>+	SETUP_PHY_ATTRIBUTE(phy_reset_problem_count);</div><div class='add'>+	SETUP_OPTIONAL_PHY_ATTRIBUTE_WRONLY(link_reset, phy_reset);</div><div class='add'>+	SETUP_OPTIONAL_PHY_ATTRIBUTE_WRONLY(hard_reset, phy_reset);</div><div class='ctx'> 	i-&gt;phy_attrs[count] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	count = 0;</div><div class='add'>+	SETUP_PORT_ATTRIBUTE(num_phys);</div><div class='add'>+	i-&gt;port_attrs[count] = NULL;</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='ctx'> 	SETUP_RPORT_ATTRIBUTE(rphy_initiator_port_protocols);</div><div class='ctx'> 	SETUP_RPORT_ATTRIBUTE(rphy_target_port_protocols);</div><div class='ctx'> 	SETUP_RPORT_ATTRIBUTE(rphy_device_type);</div><div class='hunk'>@@ -1117,6 +1419,7 @@ void sas_release_transport(struct scsi_transport_template *t)</div><div class='ctx'> </div><div class='ctx'> 	transport_container_unregister(&amp;i-&gt;t.host_attrs);</div><div class='ctx'> 	transport_container_unregister(&amp;i-&gt;phy_attr_cont);</div><div class='add'>+	transport_container_unregister(&amp;i-&gt;port_attr_cont);</div><div class='ctx'> 	transport_container_unregister(&amp;i-&gt;rphy_attr_cont);</div><div class='ctx'> 	transport_container_unregister(&amp;i-&gt;end_dev_attr_cont);</div><div class='ctx'> 	transport_container_unregister(&amp;i-&gt;expander_attr_cont);</div><div class='hunk'>@@ -1135,9 +1438,12 @@ static __init int sas_transport_init(void)</div><div class='ctx'> 	error = transport_class_register(&amp;sas_phy_class);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_unregister_transport;</div><div class='del'>-	error = transport_class_register(&amp;sas_rphy_class);</div><div class='add'>+	error = transport_class_register(&amp;sas_port_class);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_unregister_phy;</div><div class='add'>+	error = transport_class_register(&amp;sas_rphy_class);</div><div class='add'>+	if (error)</div><div class='add'>+		goto out_unregister_port;</div><div class='ctx'> 	error = transport_class_register(&amp;sas_end_dev_class);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto out_unregister_rphy;</div><div class='hunk'>@@ -1151,6 +1457,8 @@ static __init int sas_transport_init(void)</div><div class='ctx'> 	transport_class_unregister(&amp;sas_end_dev_class);</div><div class='ctx'>  out_unregister_rphy:</div><div class='ctx'> 	transport_class_unregister(&amp;sas_rphy_class);</div><div class='add'>+ out_unregister_port:</div><div class='add'>+	transport_class_unregister(&amp;sas_port_class);</div><div class='ctx'>  out_unregister_phy:</div><div class='ctx'> 	transport_class_unregister(&amp;sas_phy_class);</div><div class='ctx'>  out_unregister_transport:</div><div class='hunk'>@@ -1164,6 +1472,7 @@ static void __exit sas_transport_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	transport_class_unregister(&amp;sas_host_class);</div><div class='ctx'> 	transport_class_unregister(&amp;sas_phy_class);</div><div class='add'>+	transport_class_unregister(&amp;sas_port_class);</div><div class='ctx'> 	transport_class_unregister(&amp;sas_rphy_class);</div><div class='ctx'> 	transport_class_unregister(&amp;sas_end_dev_class);</div><div class='ctx'> 	transport_class_unregister(&amp;sas_expander_class);</div><div class='head'>diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c<br/>index 780aaedcbce9..29a9a53cdd1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_spi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_transport_spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_transport_spi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_transport_spi.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  *  along with this program; if not, write to the Free Software</div><div class='ctx'>  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -146,7 +145,7 @@ static inline const char *spi_signal_to_string(enum spi_signal_type type)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(signal_types)/sizeof(signal_types[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(signal_types); i++) {</div><div class='ctx'> 		if (type == signal_types[i].value)</div><div class='ctx'> 			return signal_types[i].name;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -156,7 +155,7 @@ static inline enum spi_signal_type spi_signal_to_value(const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int i, len;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(signal_types)/sizeof(signal_types[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(signal_types); i++) {</div><div class='ctx'> 		len =  strlen(signal_types[i].name);</div><div class='ctx'> 		if (strncmp(name, signal_types[i].name, len) == 0 &amp;&amp;</div><div class='ctx'> 		    (name[len] == '\n' || name[len] == '\0'))</div><div class='hunk'>@@ -785,6 +784,7 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct spi_internal *i = to_spi_internal(sdev-&gt;host-&gt;transportt);</div><div class='ctx'> 	struct scsi_target *starget = sdev-&gt;sdev_target;</div><div class='add'>+	struct Scsi_Host *shost = sdev-&gt;host;</div><div class='ctx'> 	int len = sdev-&gt;inquiry_len;</div><div class='ctx'> 	/* first set us up for narrow async */</div><div class='ctx'> 	DV_SET(offset, 0);</div><div class='hunk'>@@ -844,6 +844,14 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)</div><div class='ctx'> 		if (spi_min_period(starget) == 8)</div><div class='ctx'> 			DV_SET(pcomp_en, 1);</div><div class='ctx'> 	}</div><div class='add'>+	/* now that we've done all this, actually check the bus</div><div class='add'>+	 * signal type (if known).  Some devices are stupid on</div><div class='add'>+	 * a SE bus and still claim they can try LVD only settings */</div><div class='add'>+	if (i-&gt;f-&gt;get_signalling)</div><div class='add'>+		i-&gt;f-&gt;get_signalling(shost);</div><div class='add'>+	if (spi_signalling(shost) == SPI_SIGNAL_SE ||</div><div class='add'>+	    spi_signalling(shost) == SPI_SIGNAL_HVD)</div><div class='add'>+		DV_SET(dt, 0);</div><div class='ctx'> 	/* Do the read only INQUIRY tests */</div><div class='ctx'> 	spi_dv_retrain(sdev, buffer, buffer + sdev-&gt;inquiry_len,</div><div class='ctx'> 		       spi_dv_device_compare_inquiry);</div><div class='head'>diff --git a/drivers/scsi/scsi_typedefs.h b/drivers/scsi/scsi_typedefs.h<br/>index 29f038b42f60..2ed4c5cb7088 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_typedefs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsi_typedefs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsi_typedefs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsi_typedefs.h</a></div><div class='hunk'>@@ -1,3 +1,2 @@</div><div class='ctx'> </div><div class='ctx'> typedef struct scsi_cmnd Scsi_Cmnd;</div><div class='del'>-typedef struct scsi_request Scsi_Request;</div><div class='head'>diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c<br/>index b78354fc4b17..cd68a66c7bb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/scsicam.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/scsicam.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/scsicam.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/scsicam.c</a></div><div class='hunk'>@@ -57,6 +57,7 @@ EXPORT_SYMBOL(scsi_bios_ptable);</div><div class='ctx'> int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *p;</div><div class='add'>+	u64 capacity64 = capacity;	/* Suppress gcc warning */</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	p = scsi_bios_ptable(bdev);</div><div class='hunk'>@@ -68,7 +69,7 @@ int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip)</div><div class='ctx'> 			       (unsigned int *)ip + 0, (unsigned int *)ip + 1);</div><div class='ctx'> 	kfree(p);</div><div class='ctx'> </div><div class='del'>-	if (ret == -1) {</div><div class='add'>+	if (ret == -1 &amp;&amp; capacity64 &lt; (1ULL &lt;&lt; 32)) {</div><div class='ctx'> 		/* pick some standard mapping with at most 1024 cylinders,</div><div class='ctx'> 		   and at most 62 sectors per track - this works up to</div><div class='ctx'> 		   7905 MB */</div><div class='head'>diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c<br/>index c647d85d97d1..3225d31449e1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sd.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'>  *	than the level indicated above to trigger output.	</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -175,7 +174,7 @@ static ssize_t sd_store_cache_type(struct class_device *cdev, const char *buf,</div><div class='ctx'> 		 * it's not worth the risk */</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(sd_cache_types)/sizeof(sd_cache_types[0]); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(sd_cache_types); i++) {</div><div class='ctx'> 		const int len = strlen(sd_cache_types[i]);</div><div class='ctx'> 		if (strncmp(sd_cache_types[i], buf, len) == 0 &amp;&amp;</div><div class='ctx'> 		    buf[len] == '\n') {</div><div class='hunk'>@@ -208,6 +207,23 @@ static ssize_t sd_store_cache_type(struct class_device *cdev, const char *buf,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t sd_store_allow_restart(struct class_device *cdev, const char *buf,</div><div class='add'>+				      size_t count)</div><div class='add'>+{</div><div class='add'>+	struct scsi_disk *sdkp = to_scsi_disk(cdev);</div><div class='add'>+	struct scsi_device *sdp = sdkp-&gt;device;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_SYS_ADMIN))</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	if (sdp-&gt;type != TYPE_DISK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	sdp-&gt;allow_restart = simple_strtoul(buf, NULL, 10);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static ssize_t sd_show_cache_type(struct class_device *cdev, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct scsi_disk *sdkp = to_scsi_disk(cdev);</div><div class='hunk'>@@ -223,10 +239,19 @@ static ssize_t sd_show_fua(struct class_device *cdev, char *buf)</div><div class='ctx'> 	return snprintf(buf, 20, "%u\n", sdkp-&gt;DPOFUA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static ssize_t sd_show_allow_restart(struct class_device *cdev, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct scsi_disk *sdkp = to_scsi_disk(cdev);</div><div class='add'>+</div><div class='add'>+	return snprintf(buf, 40, "%d\n", sdkp-&gt;device-&gt;allow_restart);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct class_device_attribute sd_disk_attrs[] = {</div><div class='ctx'> 	__ATTR(cache_type, S_IRUGO|S_IWUSR, sd_show_cache_type,</div><div class='ctx'> 	       sd_store_cache_type),</div><div class='ctx'> 	__ATTR(FUA, S_IRUGO, sd_show_fua, NULL),</div><div class='add'>+	__ATTR(allow_restart, S_IRUGO|S_IWUSR, sd_show_allow_restart,</div><div class='add'>+	       sd_store_allow_restart),</div><div class='ctx'> 	__ATTR_NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -891,11 +916,10 @@ static struct block_device_operations sd_fops = {</div><div class='ctx'> static void sd_rw_intr(struct scsi_cmnd * SCpnt)</div><div class='ctx'> {</div><div class='ctx'> 	int result = SCpnt-&gt;result;</div><div class='del'>-	int this_count = SCpnt-&gt;bufflen;</div><div class='del'>-	int good_bytes = (result == 0 ? this_count : 0);</div><div class='del'>-	sector_t block_sectors = 1;</div><div class='del'>-	u64 first_err_block;</div><div class='del'>-	sector_t error_sector;</div><div class='add'>+ 	unsigned int xfer_size = SCpnt-&gt;request_bufflen;</div><div class='add'>+ 	unsigned int good_bytes = result ? 0 : xfer_size;</div><div class='add'>+ 	u64 start_lba = SCpnt-&gt;request-&gt;sector;</div><div class='add'>+ 	u64 bad_lba;</div><div class='ctx'> 	struct scsi_sense_hdr sshdr;</div><div class='ctx'> 	int sense_valid = 0;</div><div class='ctx'> 	int sense_deferred = 0;</div><div class='hunk'>@@ -906,7 +930,6 @@ static void sd_rw_intr(struct scsi_cmnd * SCpnt)</div><div class='ctx'> 		if (sense_valid)</div><div class='ctx'> 			sense_deferred = scsi_sense_is_deferred(&amp;sshdr);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SCSI_LOGGING</div><div class='ctx'> 	SCSI_LOG_HLCOMPLETE(1, printk("sd_rw_intr: %s: res=0x%x\n", </div><div class='ctx'> 				SCpnt-&gt;request-&gt;rq_disk-&gt;disk_name, result));</div><div class='hunk'>@@ -916,89 +939,72 @@ static void sd_rw_intr(struct scsi_cmnd * SCpnt)</div><div class='ctx'> 				sshdr.sense_key, sshdr.asc, sshdr.ascq));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	/*</div><div class='del'>-	   Handle MEDIUM ERRORs that indicate partial success.  Since this is a</div><div class='del'>-	   relatively rare error condition, no care is taken to avoid</div><div class='del'>-	   unnecessary additional work such as memcpy's that could be avoided.</div><div class='del'>-	 */</div><div class='del'>-	if (driver_byte(result) != 0 &amp;&amp;</div><div class='del'>-		 sense_valid &amp;&amp; !sense_deferred) {</div><div class='del'>-		switch (sshdr.sense_key) {</div><div class='del'>-		case MEDIUM_ERROR:</div><div class='del'>-			if (!blk_fs_request(SCpnt-&gt;request))</div><div class='del'>-				break;</div><div class='del'>-			info_valid = scsi_get_sense_info_fld(</div><div class='del'>-				SCpnt-&gt;sense_buffer, SCSI_SENSE_BUFFERSIZE,</div><div class='del'>-				&amp;first_err_block);</div><div class='del'>-			/*</div><div class='del'>-			 * May want to warn and skip if following cast results</div><div class='del'>-			 * in actual truncation (if sector_t &lt; 64 bits)</div><div class='del'>-			 */</div><div class='del'>-			error_sector = (sector_t)first_err_block;</div><div class='del'>-			if (SCpnt-&gt;request-&gt;bio != NULL)</div><div class='del'>-				block_sectors = bio_sectors(SCpnt-&gt;request-&gt;bio);</div><div class='del'>-			switch (SCpnt-&gt;device-&gt;sector_size) {</div><div class='del'>-			case 1024:</div><div class='del'>-				error_sector &lt;&lt;= 1;</div><div class='del'>-				if (block_sectors &lt; 2)</div><div class='del'>-					block_sectors = 2;</div><div class='del'>-				break;</div><div class='del'>-			case 2048:</div><div class='del'>-				error_sector &lt;&lt;= 2;</div><div class='del'>-				if (block_sectors &lt; 4)</div><div class='del'>-					block_sectors = 4;</div><div class='del'>-				break;</div><div class='del'>-			case 4096:</div><div class='del'>-				error_sector &lt;&lt;=3;</div><div class='del'>-				if (block_sectors &lt; 8)</div><div class='del'>-					block_sectors = 8;</div><div class='del'>-				break;</div><div class='del'>-			case 256:</div><div class='del'>-				error_sector &gt;&gt;= 1;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='add'>+	if (driver_byte(result) != DRIVER_SENSE &amp;&amp;</div><div class='add'>+	    (!sense_valid || sense_deferred))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-			error_sector &amp;= ~(block_sectors - 1);</div><div class='del'>-			good_bytes = (error_sector - SCpnt-&gt;request-&gt;sector) &lt;&lt; 9;</div><div class='del'>-			if (good_bytes &lt; 0 || good_bytes &gt;= this_count)</div><div class='del'>-				good_bytes = 0;</div><div class='add'>+	switch (sshdr.sense_key) {</div><div class='add'>+	case HARDWARE_ERROR:</div><div class='add'>+	case MEDIUM_ERROR:</div><div class='add'>+		if (!blk_fs_request(SCpnt-&gt;request))</div><div class='add'>+			goto out;</div><div class='add'>+		info_valid = scsi_get_sense_info_fld(SCpnt-&gt;sense_buffer,</div><div class='add'>+						     SCSI_SENSE_BUFFERSIZE,</div><div class='add'>+						     &amp;bad_lba);</div><div class='add'>+		if (!info_valid)</div><div class='add'>+			goto out;</div><div class='add'>+		if (xfer_size &lt;= SCpnt-&gt;device-&gt;sector_size)</div><div class='add'>+			goto out;</div><div class='add'>+		switch (SCpnt-&gt;device-&gt;sector_size) {</div><div class='add'>+		case 256:</div><div class='add'>+			start_lba &lt;&lt;= 1;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-		case RECOVERED_ERROR: /* an error occurred, but it recovered */</div><div class='del'>-		case NO_SENSE: /* LLDD got sense data */</div><div class='del'>-			/*</div><div class='del'>-			 * Inform the user, but make sure that it's not treated</div><div class='del'>-			 * as a hard error.</div><div class='del'>-			 */</div><div class='del'>-			scsi_print_sense("sd", SCpnt);</div><div class='del'>-			SCpnt-&gt;result = 0;</div><div class='del'>-			memset(SCpnt-&gt;sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);</div><div class='del'>-			good_bytes = this_count;</div><div class='add'>+		case 512:</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='del'>-		case ILLEGAL_REQUEST:</div><div class='del'>-			if (SCpnt-&gt;device-&gt;use_10_for_rw &amp;&amp;</div><div class='del'>-			    (SCpnt-&gt;cmnd[0] == READ_10 ||</div><div class='del'>-			     SCpnt-&gt;cmnd[0] == WRITE_10))</div><div class='del'>-				SCpnt-&gt;device-&gt;use_10_for_rw = 0;</div><div class='del'>-			if (SCpnt-&gt;device-&gt;use_10_for_ms &amp;&amp;</div><div class='del'>-			    (SCpnt-&gt;cmnd[0] == MODE_SENSE_10 ||</div><div class='del'>-			     SCpnt-&gt;cmnd[0] == MODE_SELECT_10))</div><div class='del'>-				SCpnt-&gt;device-&gt;use_10_for_ms = 0;</div><div class='add'>+		case 1024:</div><div class='add'>+			start_lba &gt;&gt;= 1;</div><div class='add'>+			break;</div><div class='add'>+		case 2048:</div><div class='add'>+			start_lba &gt;&gt;= 2;</div><div class='add'>+			break;</div><div class='add'>+		case 4096:</div><div class='add'>+			start_lba &gt;&gt;= 3;</div><div class='ctx'> 			break;</div><div class='del'>-</div><div class='ctx'> 		default:</div><div class='add'>+			/* Print something here with limiting frequency. */</div><div class='add'>+			goto out;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		/* This computation should always be done in terms of</div><div class='add'>+		 * the resolution of the device's medium.</div><div class='add'>+		 */</div><div class='add'>+		good_bytes = (bad_lba - start_lba)*SCpnt-&gt;device-&gt;sector_size;</div><div class='add'>+		break;</div><div class='add'>+	case RECOVERED_ERROR:</div><div class='add'>+	case NO_SENSE:</div><div class='add'>+		/* Inform the user, but make sure that it's not treated</div><div class='add'>+		 * as a hard error.</div><div class='add'>+		 */</div><div class='add'>+		scsi_print_sense("sd", SCpnt);</div><div class='add'>+		SCpnt-&gt;result = 0;</div><div class='add'>+		memset(SCpnt-&gt;sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);</div><div class='add'>+		good_bytes = xfer_size;</div><div class='add'>+		break;</div><div class='add'>+	case ILLEGAL_REQUEST:</div><div class='add'>+		if (SCpnt-&gt;device-&gt;use_10_for_rw &amp;&amp;</div><div class='add'>+		    (SCpnt-&gt;cmnd[0] == READ_10 ||</div><div class='add'>+		     SCpnt-&gt;cmnd[0] == WRITE_10))</div><div class='add'>+			SCpnt-&gt;device-&gt;use_10_for_rw = 0;</div><div class='add'>+		if (SCpnt-&gt;device-&gt;use_10_for_ms &amp;&amp;</div><div class='add'>+		    (SCpnt-&gt;cmnd[0] == MODE_SENSE_10 ||</div><div class='add'>+		     SCpnt-&gt;cmnd[0] == MODE_SELECT_10))</div><div class='add'>+			SCpnt-&gt;device-&gt;use_10_for_ms = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	 * This calls the generic completion function, now that we know</div><div class='del'>-	 * how many actual sectors finished, and how many sectors we need</div><div class='del'>-	 * to say have failed.</div><div class='del'>-	 */</div><div class='del'>-	scsi_io_completion(SCpnt, good_bytes, block_sectors &lt;&lt; 9);</div><div class='add'>+ out:</div><div class='add'>+	scsi_io_completion(SCpnt, good_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int media_not_present(struct scsi_disk *sdkp,</div><div class='head'>diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c<br/>index 0ff83ddf13fe..3f312a84c6a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/seagate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/seagate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/seagate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/seagate.c</a></div><div class='hunk'>@@ -312,7 +312,7 @@ static Signature __initdata signatures[] = {</div><div class='ctx'> 	{"IBM F1 V1.2009/22/93", 5, 25, FD},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NUM_SIGNATURES (sizeof(signatures) / sizeof(Signature))</div><div class='add'>+#define NUM_SIGNATURES ARRAY_SIZE(signatures)</div><div class='ctx'> #endif				/* n OVERRIDE */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -457,7 +457,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)</div><div class='ctx'>  * space for the on-board RAM instead.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; (sizeof (seagate_bases) / sizeof (unsigned int)); ++i) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(seagate_bases); ++i) {</div><div class='ctx'> 			void __iomem *p = ioremap(seagate_bases[i], 0x2000);</div><div class='ctx'> 			if (!p)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -497,7 +497,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	hostno = instance-&gt;host_no;</div><div class='del'>-	if (request_irq (irq, do_seagate_reconnect_intr, SA_INTERRUPT, (controller_type == SEAGATE) ? "seagate" : "tmc-8xx", instance)) {</div><div class='add'>+	if (request_irq (irq, do_seagate_reconnect_intr, IRQF_DISABLED, (controller_type == SEAGATE) ? "seagate" : "tmc-8xx", instance)) {</div><div class='ctx'> 		printk(KERN_ERR "scsi%d : unable to allocate IRQ%d\n", hostno, irq);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c<br/>index b098942445ec..65eef33846bb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sg.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@ static int sg_version_num = 30533;	/* 2 digits for each component */</div><div class='ctx'>  *        (otherwise the macros compile to empty statements).</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -1402,6 +1401,7 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)</div><div class='ctx'> 	Sg_device *sdp = NULL;</div><div class='ctx'> 	struct cdev * cdev = NULL;</div><div class='ctx'> 	int error, k;</div><div class='add'>+	unsigned long iflags;</div><div class='ctx'> </div><div class='ctx'> 	disk = alloc_disk(1);</div><div class='ctx'> 	if (!disk) {</div><div class='hunk'>@@ -1429,7 +1429,7 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)</div><div class='ctx'> </div><div class='ctx'> 	error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, k), 1);</div><div class='ctx'> 	if (error)</div><div class='del'>-		goto out;</div><div class='add'>+		goto cdev_add_err;</div><div class='ctx'> </div><div class='ctx'> 	sdp-&gt;cdev = cdev;</div><div class='ctx'> 	if (sg_sysfs_valid) {</div><div class='hunk'>@@ -1456,6 +1456,13 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+cdev_add_err:</div><div class='add'>+	write_lock_irqsave(&amp;sg_dev_arr_lock, iflags);</div><div class='add'>+	kfree(sg_dev_arr[k]);</div><div class='add'>+	sg_dev_arr[k] = NULL;</div><div class='add'>+	sg_nr_dev--;</div><div class='add'>+	write_unlock_irqrestore(&amp;sg_dev_arr_lock, iflags);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	put_disk(disk);</div><div class='ctx'> 	if (cdev)</div><div class='hunk'>@@ -2635,8 +2642,7 @@ static int</div><div class='ctx'> sg_proc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int k, mask;</div><div class='del'>-	int num_leaves =</div><div class='del'>-	    sizeof (sg_proc_leaf_arr) / sizeof (sg_proc_leaf_arr[0]);</div><div class='add'>+	int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);</div><div class='ctx'> 	struct proc_dir_entry *pdep;</div><div class='ctx'> 	struct sg_proc_leaf * leaf;</div><div class='ctx'> </div><div class='hunk'>@@ -2661,8 +2667,7 @@ static void</div><div class='ctx'> sg_proc_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	int k;</div><div class='del'>-	int num_leaves =</div><div class='del'>-	    sizeof (sg_proc_leaf_arr) / sizeof (sg_proc_leaf_arr[0]);</div><div class='add'>+	int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);</div><div class='ctx'> </div><div class='ctx'> 	if (!sg_proc_sgp)</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c<br/>index 255886a9ac55..b27e85428daa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sim710.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sim710.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sim710.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sim710.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -134,7 +133,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,</div><div class='ctx'> 	host-&gt;this_id = scsi_id;</div><div class='ctx'> 	host-&gt;base = base_addr;</div><div class='ctx'> 	host-&gt;irq = irq;</div><div class='del'>-	if (request_irq(irq, NCR_700_intr, SA_SHIRQ, "sim710", host)) {</div><div class='add'>+	if (request_irq(irq, NCR_700_intr, IRQF_SHARED, "sim710", host)) {</div><div class='ctx'> 		printk(KERN_ERR "sim710: request_irq failed\n");</div><div class='ctx'> 		goto out_put_host;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c<br/>index 7c80711e18ed..fd94408577e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sr.c</a></div><div class='hunk'>@@ -217,7 +217,7 @@ int sr_media_change(struct cdrom_device_info *cdi, int slot)</div><div class='ctx'> static void rw_intr(struct scsi_cmnd * SCpnt)</div><div class='ctx'> {</div><div class='ctx'> 	int result = SCpnt-&gt;result;</div><div class='del'>-	int this_count = SCpnt-&gt;bufflen;</div><div class='add'>+	int this_count = SCpnt-&gt;request_bufflen;</div><div class='ctx'> 	int good_bytes = (result == 0 ? this_count : 0);</div><div class='ctx'> 	int block_sectors = 0;</div><div class='ctx'> 	long error_sector;</div><div class='hunk'>@@ -292,7 +292,7 @@ static void rw_intr(struct scsi_cmnd * SCpnt)</div><div class='ctx'> 	 * how many actual sectors finished, and how many sectors we need</div><div class='ctx'> 	 * to say have failed.</div><div class='ctx'> 	 */</div><div class='del'>-	scsi_io_completion(SCpnt, good_bytes, block_sectors &lt;&lt; 9);</div><div class='add'>+	scsi_io_completion(SCpnt, good_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sr_init_command(struct scsi_cmnd * SCpnt)</div><div class='head'>diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c<br/>index 9dde8df2f5c9..a3e9d0f2eb5b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sr_vendor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sr_vendor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sr_vendor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sr_vendor.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  *              HP 6020 writers now supported.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/cdrom.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c<br/>index 56cb49006116..756ceb93ddc8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/st.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/st.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/st.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/st.c</a></div><div class='hunk'>@@ -1193,7 +1193,7 @@ static int st_open(struct inode *inode, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Flush the tape buffer before close */</div><div class='del'>-static int st_flush(struct file *filp)</div><div class='add'>+static int st_flush(struct file *filp, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0, result2;</div><div class='ctx'> 	unsigned char cmd[MAX_COMMAND_SIZE];</div><div class='hunk'>@@ -2818,7 +2818,7 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon</div><div class='ctx'> 		    (cmdstatp-&gt;sense_hdr.sense_key == NO_SENSE ||</div><div class='ctx'> 		     cmdstatp-&gt;sense_hdr.sense_key == RECOVERED_ERROR) &amp;&amp;</div><div class='ctx'> 		    undone == 0) {</div><div class='del'>-			ioctl_result = 0;	/* EOF written succesfully at EOM */</div><div class='add'>+			ioctl_result = 0;	/* EOF written successfully at EOM */</div><div class='ctx'> 			if (fileno &gt;= 0)</div><div class='ctx'> 				fileno++;</div><div class='ctx'> 			STps-&gt;drv_file = fileno;</div><div class='hunk'>@@ -3599,7 +3599,6 @@ static struct st_buffer *</div><div class='ctx'> 	tb-&gt;use_sg = max_sg;</div><div class='ctx'> 	tb-&gt;frp = (struct st_buf_fragment *)(&amp;(tb-&gt;sg[0]) + max_sg);</div><div class='ctx'> </div><div class='del'>-	tb-&gt;in_use = 1;</div><div class='ctx'> 	tb-&gt;dma = need_dma;</div><div class='ctx'> 	tb-&gt;buffer_size = got;</div><div class='ctx'> </div><div class='hunk'>@@ -3839,7 +3838,7 @@ static int __init st_setup(char *str)</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			if (i &gt;= sizeof(parms) / sizeof(struct st_dev_parm))</div><div class='add'>+			if (i &gt;= ARRAY_SIZE(parms))</div><div class='ctx'> 				 printk(KERN_WARNING "st: invalid parameter in '%s'\n",</div><div class='ctx'> 					stp);</div><div class='ctx'> 			stp = strchr(stp, ',');</div><div class='head'>diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h<br/>index 411209048d74..05a5cae126ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/st.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/st.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/st.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/st.h</a></div><div class='hunk'>@@ -31,7 +31,6 @@ struct st_request {</div><div class='ctx'> </div><div class='ctx'> /* The tape buffer descriptor. */</div><div class='ctx'> struct st_buffer {</div><div class='del'>-	unsigned char in_use;</div><div class='ctx'> 	unsigned char dma;	/* DMA-able buffer */</div><div class='ctx'> 	unsigned char do_dio;   /* direct i/o set up? */</div><div class='ctx'> 	int buffer_size;</div><div class='head'>diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c<br/>index 25cced91c8a6..2ebe0d663899 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sun3_NCR5380.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sun3_NCR5380.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sun3_NCR5380.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sun3_NCR5380.c</a></div><div class='hunk'>@@ -535,7 +535,6 @@ static __inline__ void initialize_SCp(Scsi_Cmnd *cmd)</div><div class='ctx'>     </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if 1</div><div class='head'>diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c<br/>index cc990bed9683..1f328cae5c05 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sun3x_esp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sun3x_esp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sun3x_esp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sun3x_esp.c</a></div><div class='hunk'>@@ -97,7 +97,7 @@ int sun3x_esp_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> 	esp-&gt;esp_command_dvma = dvma_vtob((unsigned long)esp-&gt;esp_command);</div><div class='ctx'> </div><div class='ctx'> 	esp-&gt;irq = 2;</div><div class='del'>-	if (request_irq(esp-&gt;irq, esp_intr, SA_INTERRUPT, </div><div class='add'>+	if (request_irq(esp-&gt;irq, esp_intr, IRQF_DISABLED,</div><div class='ctx'> 			"SUN3X SCSI", esp-&gt;ehost)) {</div><div class='ctx'> 		esp_deallocate(esp);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -332,11 +332,11 @@ static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)</div><div class='ctx'>     struct scatterlist *sg = sp-&gt;SCp.buffer;</div><div class='ctx'> </div><div class='ctx'>     while (sz &gt;= 0) {</div><div class='del'>-	    sg[sz].dvma_address = dvma_map((unsigned long)page_address(sg[sz].page) +</div><div class='add'>+	    sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +</div><div class='ctx'> 					   sg[sz].offset, sg[sz].length);</div><div class='ctx'> 	    sz--;</div><div class='ctx'>     }</div><div class='del'>-    sp-&gt;SCp.ptr=(char *)((unsigned long)sp-&gt;SCp.buffer-&gt;dvma_address);</div><div class='add'>+    sp-&gt;SCp.ptr=(char *)((unsigned long)sp-&gt;SCp.buffer-&gt;dma_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)</div><div class='hunk'>@@ -350,14 +350,14 @@ static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)</div><div class='ctx'>     struct scatterlist *sg = (struct scatterlist *)sp-&gt;buffer;</div><div class='ctx'>                         </div><div class='ctx'>     while(sz &gt;= 0) {</div><div class='del'>-        dvma_unmap((char *)sg[sz].dvma_address);</div><div class='add'>+        dvma_unmap((char *)sg[sz].dma_address);</div><div class='ctx'>         sz--;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dma_advance_sg (Scsi_Cmnd *sp)</div><div class='ctx'> {</div><div class='del'>-    sp-&gt;SCp.ptr = (char *)((unsigned long)sp-&gt;SCp.buffer-&gt;dvma_address);</div><div class='add'>+    sp-&gt;SCp.ptr = (char *)((unsigned long)sp-&gt;SCp.buffer-&gt;dma_address);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sun3x_esp_release(struct Scsi_Host *instance)</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym53c8xx.h b/drivers/scsi/sym53c8xx_2/sym53c8xx.h<br/>index 481103769729..7519728dfc38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym53c8xx.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym53c8xx.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym53c8xx.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sym53c8xx_2/sym53c8xx.h</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #ifndef SYM53C8XX_H</div><div class='ctx'> #define SYM53C8XX_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  DMA addressing mode.</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c<br/>index 9c83b4d39a26..8c505076c0eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym_glue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sym53c8xx_2/sym_glue.c</a></div><div class='hunk'>@@ -54,14 +54,8 @@</div><div class='ctx'> #define NAME53C		"sym53c"</div><div class='ctx'> #define NAME53C8XX	"sym53c8xx"</div><div class='ctx'> </div><div class='del'>-/* SPARC just has to be different ... */</div><div class='del'>-#ifdef __sparc__</div><div class='del'>-#define IRQ_FMT "%s"</div><div class='del'>-#define IRQ_PRM(x) __irq_itoa(x)</div><div class='del'>-#else</div><div class='ctx'> #define IRQ_FMT "%d"</div><div class='ctx'> #define IRQ_PRM(x) (x)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> struct sym_driver_setup sym_driver_setup = SYM_LINUX_DRIVER_SETUP;</div><div class='ctx'> unsigned int sym_debug_flags = 0;</div><div class='hunk'>@@ -156,7 +150,7 @@ static void __unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)</div><div class='ctx'> </div><div class='ctx'> 	switch(SYM_UCMD_PTR(cmd)-&gt;data_mapped) {</div><div class='ctx'> 	case 2:</div><div class='del'>-		pci_unmap_sg(pdev, cmd-&gt;buffer, cmd-&gt;use_sg, dma_dir);</div><div class='add'>+		pci_unmap_sg(pdev, cmd-&gt;request_buffer, cmd-&gt;use_sg, dma_dir);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		pci_unmap_single(pdev, SYM_UCMD_PTR(cmd)-&gt;data_mapping,</div><div class='hunk'>@@ -186,7 +180,7 @@ static int __map_scsi_sg_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)</div><div class='ctx'> 	int use_sg;</div><div class='ctx'> 	int dma_dir = cmd-&gt;sc_data_direction;</div><div class='ctx'> </div><div class='del'>-	use_sg = pci_map_sg(pdev, cmd-&gt;buffer, cmd-&gt;use_sg, dma_dir);</div><div class='add'>+	use_sg = pci_map_sg(pdev, cmd-&gt;request_buffer, cmd-&gt;use_sg, dma_dir);</div><div class='ctx'> 	if (use_sg &gt; 0) {</div><div class='ctx'> 		SYM_UCMD_PTR(cmd)-&gt;data_mapped  = 2;</div><div class='ctx'> 		SYM_UCMD_PTR(cmd)-&gt;data_mapping = use_sg;</div><div class='hunk'>@@ -376,7 +370,7 @@ static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd</div><div class='ctx'> 	if (!use_sg)</div><div class='ctx'> 		segment = sym_scatter_no_sglist(np, cp, cmd);</div><div class='ctx'> 	else if ((use_sg = map_scsi_sg_data(np, cmd)) &gt; 0) {</div><div class='del'>-		struct scatterlist *scatter = (struct scatterlist *)cmd-&gt;buffer;</div><div class='add'>+		struct scatterlist *scatter = (struct scatterlist *)cmd-&gt;request_buffer;</div><div class='ctx'> 		struct sym_tcb *tp = &amp;np-&gt;target[cp-&gt;target];</div><div class='ctx'> 		struct sym_tblmove *data;</div><div class='ctx'> </div><div class='hunk'>@@ -1553,7 +1547,7 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,</div><div class='ctx'> 	 *  If we synchonize the C code with SCRIPTS on interrupt, </div><div class='ctx'> 	 *  we do not want to share the INTR line at all.</div><div class='ctx'> 	 */</div><div class='del'>-	if (request_irq(pdev-&gt;irq, sym53c8xx_intr, SA_SHIRQ, NAME53C8XX, np)) {</div><div class='add'>+	if (request_irq(pdev-&gt;irq, sym53c8xx_intr, IRQF_SHARED, NAME53C8XX, np)) {</div><div class='ctx'> 		printf_err("%s: request irq %d failure\n",</div><div class='ctx'> 			sym_name(np), pdev-&gt;irq);</div><div class='ctx'> 		goto attach_failed;</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h<br/>index a446cda3f64c..e022d3c71b59 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym_glue.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_glue.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sym53c8xx_2/sym_glue.h</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #ifndef SYM_GLUE_H</div><div class='ctx'> #define SYM_GLUE_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='head'>diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c<br/>index a671bdc07450..940fa1e6f994 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_hipd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/sym53c8xx_2/sym_hipd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/sym53c8xx_2/sym_hipd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/sym53c8xx_2/sym_hipd.c</a></div><div class='hunk'>@@ -1276,8 +1276,7 @@ static struct sym_chip sym_dev_table[] = {</div><div class='ctx'>  FE_RAM|FE_IO256|FE_LEDC}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define sym_num_devs \</div><div class='del'>-	(sizeof(sym_dev_table) / sizeof(sym_dev_table[0]))</div><div class='add'>+#define sym_num_devs (ARRAY_SIZE(sym_dev_table))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Look up the chip table.</div><div class='head'>diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c<br/>index 21305fc91479..2df6747cb76f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/t128.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/t128.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/t128.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/t128.c</a></div><div class='hunk'>@@ -126,15 +126,15 @@</div><div class='ctx'> static struct override {</div><div class='ctx'>     unsigned long address;</div><div class='ctx'>     int irq;</div><div class='del'>-} overrides </div><div class='add'>+} overrides</div><div class='ctx'> #ifdef T128_OVERRIDE</div><div class='ctx'>     [] __initdata = T128_OVERRIDE;</div><div class='ctx'> #else</div><div class='del'>-    [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO}, </div><div class='add'>+    [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO},</div><div class='ctx'>         {0 ,IRQ_AUTO}, {0, IRQ_AUTO}};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))</div><div class='add'>+#define NO_OVERRIDES ARRAY_SIZE(overrides)</div><div class='ctx'> </div><div class='ctx'> static struct base {</div><div class='ctx'>     unsigned int address;</div><div class='hunk'>@@ -143,7 +143,7 @@ static struct base {</div><div class='ctx'>     { 0xcc000, 0}, { 0xc8000, 0}, { 0xdc000, 0}, { 0xd8000, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NO_BASES (sizeof (bases) / sizeof (struct base))</div><div class='add'>+#define NO_BASES ARRAY_SIZE(bases)</div><div class='ctx'> </div><div class='ctx'> static struct signature {</div><div class='ctx'>     const char *string;</div><div class='hunk'>@@ -152,7 +152,7 @@ static struct signature {</div><div class='ctx'> {"TSROM: SCSI BIOS, Version 1.12", 0x36},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NO_SIGNATURES (sizeof (signatures) /  sizeof (struct signature))</div><div class='add'>+#define NO_SIGNATURES ARRAY_SIZE(signatures)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Function : t128_setup(char *str, int *ints)</div><div class='hunk'>@@ -260,7 +260,7 @@ found:</div><div class='ctx'> 	    instance-&gt;irq = NCR5380_probe_irq(instance, T128_IRQS);</div><div class='ctx'> </div><div class='ctx'> 	if (instance-&gt;irq != SCSI_IRQ_NONE) </div><div class='del'>-	    if (request_irq(instance-&gt;irq, t128_intr, SA_INTERRUPT, "t128", instance)) {</div><div class='add'>+	    if (request_irq(instance-&gt;irq, t128_intr, IRQF_DISABLED, "t128", instance)) {</div><div class='ctx'> 		printk("scsi%d : IRQ%d not free, interrupts disabled\n", </div><div class='ctx'> 		    instance-&gt;host_no, instance-&gt;irq);</div><div class='ctx'> 		instance-&gt;irq = SCSI_IRQ_NONE;</div><div class='head'>diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c<br/>index 91322aff241d..9404ff3d4c79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/tmscsim.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/tmscsim.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/tmscsim.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/tmscsim.c</a></div><div class='hunk'>@@ -218,7 +218,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> #define DCBDEBUG1(x) C_NOP</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -2585,7 +2584,7 @@ static int __devinit dc390_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	/* Reset Pending INT */</div><div class='ctx'> 	DC390_read8_(INT_Status, io_port);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pdev-&gt;irq, do_DC390_Interrupt, SA_SHIRQ,</div><div class='add'>+	if (request_irq(pdev-&gt;irq, do_DC390_Interrupt, IRQF_SHARED,</div><div class='ctx'> 				"tmscsim", pACB)) {</div><div class='ctx'> 		printk(KERN_ERR "DC390: register IRQ error!\n");</div><div class='ctx'> 		goto out_release_region;</div><div class='head'>diff --git a/drivers/scsi/tmscsim.h b/drivers/scsi/tmscsim.h<br/>index d4495272fb40..9b66fa8d38d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/tmscsim.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/tmscsim.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/tmscsim.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/tmscsim.h</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'> #define _TMSCSIM_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SCSI_IRQ_NONE 255</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c<br/>index 33cd90fc657b..57449611e714 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/u14-34f.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/u14-34f.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/u14-34f.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/u14-34f.c</a></div><div class='hunk'>@@ -405,7 +405,6 @@</div><div class='ctx'>  *  the driver sets host-&gt;wish_block = TRUE for all ISA boards.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -873,7 +872,7 @@ static int port_detect \</div><div class='ctx'> </div><div class='ctx'>    /* Board detected, allocate its IRQ */</div><div class='ctx'>    if (request_irq(irq, do_interrupt_handler,</div><div class='del'>-             SA_INTERRUPT | ((subversion == ESA) ? SA_SHIRQ : 0),</div><div class='add'>+             IRQF_DISABLED | ((subversion == ESA) ? IRQF_SHARED : 0),</div><div class='ctx'>              driver_name, (void *) &amp;sha[j])) {</div><div class='ctx'>       printk("%s: unable to allocate IRQ %u, detaching.\n", name, irq);</div><div class='ctx'>       goto freelock;</div><div class='head'>diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c<br/>index d8a72609a31d..680f38ab60d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/wd33c93.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/wd33c93.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/wd33c93.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/wd33c93.c</a></div><div class='hunk'>@@ -71,7 +71,6 @@</div><div class='ctx'>  *	Richard Hirst &lt;richard@sleepie.demon.co.uk&gt;  August 2000</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -939,6 +938,7 @@ wd33c93_intr(struct Scsi_Host *instance)</div><div class='ctx'> 		DB(DB_INTR, printk("%02x", cmd-&gt;SCp.Status))</div><div class='ctx'> 		    if (hostdata-&gt;level2 &gt;= L2_BASIC) {</div><div class='ctx'> 			sr = read_wd33c93(regs, WD_SCSI_STATUS);	/* clear interrupt */</div><div class='add'>+			udelay(7);</div><div class='ctx'> 			hostdata-&gt;state = S_RUNNING_LEVEL2;</div><div class='ctx'> 			write_wd33c93(regs, WD_COMMAND_PHASE, 0x50);</div><div class='ctx'> 			write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);</div><div class='hunk'>@@ -955,6 +955,7 @@ wd33c93_intr(struct Scsi_Host *instance)</div><div class='ctx'> </div><div class='ctx'> 		msg = read_1_byte(regs);</div><div class='ctx'> 		sr = read_wd33c93(regs, WD_SCSI_STATUS);	/* clear interrupt */</div><div class='add'>+		udelay(7);</div><div class='ctx'> </div><div class='ctx'> 		hostdata-&gt;incoming_msg[hostdata-&gt;incoming_ptr] = msg;</div><div class='ctx'> 		if (hostdata-&gt;incoming_msg[0] == EXTENDED_MESSAGE)</div><div class='hunk'>@@ -1358,6 +1359,7 @@ wd33c93_intr(struct Scsi_Host *instance)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Verify this is a change to MSG_IN and read the message */</div><div class='ctx'> 				sr = read_wd33c93(regs, WD_SCSI_STATUS);</div><div class='add'>+				udelay(7);</div><div class='ctx'> 				if (sr == (CSR_ABORT | PHS_MESS_IN) ||</div><div class='ctx'> 				    sr == (CSR_UNEXP | PHS_MESS_IN) ||</div><div class='ctx'> 				    sr == (CSR_SRV_REQ | PHS_MESS_IN)) {</div><div class='hunk'>@@ -1374,6 +1376,7 @@ wd33c93_intr(struct Scsi_Host *instance)</div><div class='ctx'> 							     asr);</div><div class='ctx'> 					}</div><div class='ctx'> 					sr = read_wd33c93(regs, WD_SCSI_STATUS);</div><div class='add'>+					udelay(7);</div><div class='ctx'> 					if (sr != CSR_MSGIN)</div><div class='ctx'> 						printk</div><div class='ctx'> 						    ("wd33c93: Not paused with ACK on RESEL (%02x)\n",</div><div class='hunk'>@@ -1701,7 +1704,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MAX_WD33C93_HOSTS 4</div><div class='del'>-#define MAX_SETUP_ARGS ((int)(sizeof(setup_args) / sizeof(char *)))</div><div class='add'>+#define MAX_SETUP_ARGS ARRAY_SIZE(setup_args)</div><div class='ctx'> #define SETUP_BUFFER_SIZE 200</div><div class='ctx'> static char setup_buffer[SETUP_BUFFER_SIZE];</div><div class='ctx'> static char setup_used[MAX_SETUP_ARGS];</div><div class='head'>diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h<br/>index 193ec517d252..edcb0365cf0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/wd33c93.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/wd33c93.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/wd33c93.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/wd33c93.h</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #ifndef WD33C93_H</div><div class='ctx'> #define WD33C93_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PROC_INTERFACE     /* add code for /proc/scsi/wd33c93/xxx interface */</div><div class='ctx'> #ifdef  PROC_INTERFACE</div><div class='head'>diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c<br/>index fb54a87a80a3..a0b61af48f1c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/wd7000.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/wd7000.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/wd7000.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/wd7000.c</a></div><div class='hunk'>@@ -267,7 +267,7 @@ static const long wd7000_biosaddr[] = {</div><div class='ctx'> 	0xc0000, 0xc2000, 0xc4000, 0xc6000, 0xc8000, 0xca000, 0xcc000, 0xce000,</div><div class='ctx'> 	0xd0000, 0xd2000, 0xd4000, 0xd6000, 0xd8000, 0xda000, 0xdc000, 0xde000</div><div class='ctx'> };</div><div class='del'>-#define NUM_ADDRS (sizeof(wd7000_biosaddr)/sizeof(long))</div><div class='add'>+#define NUM_ADDRS ARRAY_SIZE(wd7000_biosaddr)</div><div class='ctx'> </div><div class='ctx'> static const unsigned short wd7000_iobase[] = {</div><div class='ctx'> 	0x0300, 0x0308, 0x0310, 0x0318, 0x0320, 0x0328, 0x0330, 0x0338,</div><div class='hunk'>@@ -275,13 +275,13 @@ static const unsigned short wd7000_iobase[] = {</div><div class='ctx'> 	0x0380, 0x0388, 0x0390, 0x0398, 0x03a0, 0x03a8, 0x03b0, 0x03b8,</div><div class='ctx'> 	0x03c0, 0x03c8, 0x03d0, 0x03d8, 0x03e0, 0x03e8, 0x03f0, 0x03f8</div><div class='ctx'> };</div><div class='del'>-#define NUM_IOPORTS (sizeof(wd7000_iobase)/sizeof(unsigned short))</div><div class='add'>+#define NUM_IOPORTS ARRAY_SIZE(wd7000_iobase)</div><div class='ctx'> </div><div class='ctx'> static const short wd7000_irq[] = { 3, 4, 5, 7, 9, 10, 11, 12, 14, 15 };</div><div class='del'>-#define NUM_IRQS (sizeof(wd7000_irq)/sizeof(short))</div><div class='add'>+#define NUM_IRQS ARRAY_SIZE(wd7000_irq)</div><div class='ctx'> </div><div class='ctx'> static const short wd7000_dma[] = { 5, 6, 7 };</div><div class='del'>-#define NUM_DMAS (sizeof(wd7000_dma)/sizeof(short))</div><div class='add'>+#define NUM_DMAS ARRAY_SIZE(wd7000_dma)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following is set up by wd7000_detect, and used thereafter for</div><div class='hunk'>@@ -317,7 +317,7 @@ static Config configs[] = {</div><div class='ctx'> 	{7, 6, 0x350, BUS_ON, BUS_OFF},	/* My configuration (Zaga)     */</div><div class='ctx'> 	{-1, -1, 0x0, BUS_ON, BUS_OFF}	/* Empty slot                  */</div><div class='ctx'> };</div><div class='del'>-#define NUM_CONFIGS (sizeof(configs)/sizeof(Config))</div><div class='add'>+#define NUM_CONFIGS ARRAY_SIZE(configs)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  The following list defines strings to look for in the BIOS that identify</div><div class='hunk'>@@ -333,7 +333,7 @@ typedef struct signature {</div><div class='ctx'> static const Signature signatures[] = {</div><div class='ctx'> 	{"SSTBIOS", 0x0000d, 7}	/* "SSTBIOS" @ offset 0x0000d */</div><div class='ctx'> };</div><div class='del'>-#define NUM_SIGNATURES (sizeof(signatures)/sizeof(Signature))</div><div class='add'>+#define NUM_SIGNATURES ARRAY_SIZE(signatures)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1250,7 +1250,7 @@ static int wd7000_init(Adapter * host)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if (request_irq(host-&gt;irq, wd7000_intr, SA_INTERRUPT, "wd7000", host)) {</div><div class='add'>+	if (request_irq(host-&gt;irq, wd7000_intr, IRQF_DISABLED, "wd7000", host)) {</div><div class='ctx'> 		printk("wd7000_init: can't get IRQ %d.\n", host-&gt;irq);</div><div class='ctx'> 		return (0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1391,7 +1391,7 @@ static int wd7000_proc_info(struct Scsi_Host *host, char *buffer, char **start,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int wd7000_detect(struct scsi_host_template *tpnt)</div><div class='add'>+static __init int wd7000_detect(struct scsi_host_template *tpnt)</div><div class='ctx'> {</div><div class='ctx'> 	short present = 0, biosaddr_ptr, sig_ptr, i, pass;</div><div class='ctx'> 	short biosptr[NUM_CONFIGS];</div><div class='head'>diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c<br/>index a6cfbb3b361c..4b5f908d35c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/scsi/zalon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/scsi/zalon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/scsi/zalon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/scsi/zalon.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ zalon_probe(struct parisc_device *dev)</div><div class='ctx'> 	if (!host)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(dev-&gt;irq, ncr53c8xx_intr, SA_SHIRQ, "zalon", host)) {</div><div class='add'>+	if (request_irq(dev-&gt;irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: irq problem with %d, detaching\n ",</div><div class='ctx'> 			dev-&gt;dev.bus_id, dev-&gt;irq);</div><div class='ctx'> 		goto fail;</div><div class='head'>diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c<br/>index 7572665a8855..57438326b07f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/21285.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/21285.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/21285.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/21285.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -479,7 +478,6 @@ static struct uart_driver serial21285_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "ttyFB",</div><div class='ctx'> 	.dev_name		= "ttyFB",</div><div class='del'>-	.devfs_name             = "ttyFB",</div><div class='ctx'> 	.major			= SERIAL_21285_MAJOR,</div><div class='ctx'> 	.minor			= SERIAL_21285_MINOR,</div><div class='ctx'> 	.nr			= 1,</div><div class='head'>diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c<br/>index b88a7c1158af..993a702422ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/68328serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/68328serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/68328serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/68328serial.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='hunk'>@@ -131,17 +130,6 @@ static int m68328_console_baud    = CONSOLE_BAUD_RATE;</div><div class='ctx'> static int m68328_console_cbaud   = DEFAULT_CBAUD;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * tmp_buf is used as a temporary buffer by serial_write.  We need to</div><div class='del'>- * lock it in case the memcpy_fromfs blocks while swapping in a page,</div><div class='del'>- * and some other program tries to do a serial write at the same time.</div><div class='del'>- * Since the lock will only come under contention when the system is</div><div class='del'>- * swapping and available memory is low, it makes sense to share one</div><div class='del'>- * buffer across all the serial ports, since it significantly saves</div><div class='del'>- * memory if large numbers of serial ports are open.</div><div class='del'>- */</div><div class='del'>-static unsigned char tmp_buf[SERIAL_XMIT_SIZE]; /* This is cheating */</div><div class='del'>-</div><div class='ctx'> static inline int serial_paranoia_check(struct m68k_serial *info,</div><div class='ctx'> 					char *name, const char *routine)</div><div class='ctx'> {</div><div class='hunk'>@@ -211,16 +199,16 @@ static void rs_stop(struct tty_struct *tty)</div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_stop"))</div><div class='ctx'> 		return;</div><div class='ctx'> 	</div><div class='del'>-	save_flags(flags); cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	uart-&gt;ustcnt &amp;= ~USTCNT_TXEN;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rs_put_char(char ch)</div><div class='ctx'> {</div><div class='ctx'>         int flags, loops = 0;</div><div class='ctx'> </div><div class='del'>-        save_flags(flags); cli();</div><div class='add'>+        local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	while (!(UTX &amp; UTX_TX_AVAIL) &amp;&amp; (loops &lt; 1000)) {</div><div class='ctx'>         	loops++;</div><div class='hunk'>@@ -229,7 +217,7 @@ static void rs_put_char(char ch)</div><div class='ctx'> </div><div class='ctx'> 	UTX_TXDATA = ch;</div><div class='ctx'>         udelay(5);</div><div class='del'>-        restore_flags(flags);</div><div class='add'>+        local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rs_start(struct tty_struct *tty)</div><div class='hunk'>@@ -241,7 +229,7 @@ static void rs_start(struct tty_struct *tty)</div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_start"))</div><div class='ctx'> 		return;</div><div class='ctx'> 	</div><div class='del'>-	save_flags(flags); cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	if (info-&gt;xmit_cnt &amp;&amp; info-&gt;xmit_buf &amp;&amp; !(uart-&gt;ustcnt &amp; USTCNT_TXEN)) {</div><div class='ctx'> #ifdef USE_INTS</div><div class='ctx'> 		uart-&gt;ustcnt |= USTCNT_TXEN | USTCNT_TX_INTR_MASK;</div><div class='hunk'>@@ -249,7 +237,7 @@ static void rs_start(struct tty_struct *tty)</div><div class='ctx'> 		uart-&gt;ustcnt |= USTCNT_TXEN;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Drop into either the boot monitor or kadb upon receiving a break</div><div class='hunk'>@@ -327,14 +315,6 @@ static void receive_chars(struct m68k_serial *info, struct pt_regs *regs,</div><div class='ctx'> 		if(!tty)</div><div class='ctx'> 			goto clear_and_exit;</div><div class='ctx'> 		</div><div class='del'>-		/*</div><div class='del'>-		 * Make sure that we do not overflow the buffer</div><div class='del'>-		 */</div><div class='del'>-		if (tty_request_buffer_room(tty, 1) == 0) {</div><div class='del'>-			tty_schedule_flip(tty);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		flag = TTY_NORMAL;</div><div class='ctx'> </div><div class='ctx'> 		if(rx &amp; URX_PARITY_ERROR) {</div><div class='hunk'>@@ -473,7 +453,7 @@ static int startup(struct m68k_serial * info)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	save_flags(flags); cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear the FIFO buffers and disable them</div><div class='hunk'>@@ -506,7 +486,7 @@ static int startup(struct m68k_serial * info)</div><div class='ctx'> 	change_speed(info);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;flags |= S_INITIALIZED;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -523,7 +503,7 @@ static void shutdown(struct m68k_serial * info)</div><div class='ctx'> 	if (!(info-&gt;flags &amp; S_INITIALIZED))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags); cli(); /* Disable interrupts */</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	</div><div class='ctx'> 	if (info-&gt;xmit_buf) {</div><div class='ctx'> 		free_page((unsigned long) info-&gt;xmit_buf);</div><div class='hunk'>@@ -534,7 +514,7 @@ static void shutdown(struct m68k_serial * info)</div><div class='ctx'> 		set_bit(TTY_IO_ERROR, &amp;info-&gt;tty-&gt;flags);</div><div class='ctx'> 	</div><div class='ctx'> 	info-&gt;flags &amp;= ~S_INITIALIZED;</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct {</div><div class='hunk'>@@ -655,24 +635,24 @@ static void rs_fair_output(void)</div><div class='ctx'> 	if (info == 0) return;</div><div class='ctx'> 	if (info-&gt;xmit_buf == 0) return;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);  cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	left = info-&gt;xmit_cnt;</div><div class='ctx'> 	while (left != 0) {</div><div class='ctx'> 		c = info-&gt;xmit_buf[info-&gt;xmit_tail];</div><div class='ctx'> 		info-&gt;xmit_tail = (info-&gt;xmit_tail+1) &amp; (SERIAL_XMIT_SIZE-1);</div><div class='ctx'> 		info-&gt;xmit_cnt--;</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		local_irq_restore(flags);</div><div class='ctx'> </div><div class='ctx'> 		rs_put_char(c);</div><div class='ctx'> </div><div class='del'>-		save_flags(flags);  cli();</div><div class='add'>+		local_irq_save(flags);</div><div class='ctx'> 		left = min(info-&gt;xmit_cnt, left-1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Last character is being transmitted now (hopefully). */</div><div class='ctx'> 	udelay(5);</div><div class='ctx'> </div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -720,11 +700,11 @@ static void rs_flush_chars(struct tty_struct *tty)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Enable transmitter */</div><div class='del'>-	save_flags(flags); cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;xmit_cnt &lt;= 0 || tty-&gt;stopped || tty-&gt;hw_stopped ||</div><div class='ctx'> 			!info-&gt;xmit_buf) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		local_irq_restore(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -749,7 +729,7 @@ static void rs_flush_chars(struct tty_struct *tty)</div><div class='ctx'> 	while (!(uart-&gt;utx.w &amp; UTX_TX_AVAIL)) udelay(5);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> extern void console_printn(const char * b, int count);</div><div class='hunk'>@@ -768,18 +748,22 @@ static int rs_write(struct tty_struct * tty,</div><div class='ctx'> 	if (!tty || !info-&gt;xmit_buf)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	save_flags(flags);</div><div class='add'>+	local_save_flags(flags);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		cli();		</div><div class='add'>+		local_irq_disable();		</div><div class='ctx'> 		c = min_t(int, count, min(SERIAL_XMIT_SIZE - info-&gt;xmit_cnt - 1,</div><div class='ctx'> 				   SERIAL_XMIT_SIZE - info-&gt;xmit_head));</div><div class='add'>+		local_irq_restore(flags);</div><div class='add'>+</div><div class='ctx'> 		if (c &lt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(info-&gt;xmit_buf + info-&gt;xmit_head, buf, c);</div><div class='add'>+</div><div class='add'>+		local_irq_disable();</div><div class='ctx'> 		info-&gt;xmit_head = (info-&gt;xmit_head + c) &amp; (SERIAL_XMIT_SIZE-1);</div><div class='ctx'> 		info-&gt;xmit_cnt += c;</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		local_irq_restore(flags);</div><div class='ctx'> 		buf += c;</div><div class='ctx'> 		count -= c;</div><div class='ctx'> 		total += c;</div><div class='hunk'>@@ -787,7 +771,7 @@ static int rs_write(struct tty_struct * tty,</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;xmit_cnt &amp;&amp; !tty-&gt;stopped &amp;&amp; !tty-&gt;hw_stopped) {</div><div class='ctx'> 		/* Enable transmitter */</div><div class='del'>-		cli();		</div><div class='add'>+		local_irq_disable();		</div><div class='ctx'> #ifndef USE_INTS</div><div class='ctx'> 		while(info-&gt;xmit_cnt) {</div><div class='ctx'> #endif</div><div class='hunk'>@@ -807,9 +791,9 @@ static int rs_write(struct tty_struct * tty,</div><div class='ctx'> #ifndef USE_INTS</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		local_irq_restore(flags);</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+</div><div class='ctx'> 	return total;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -838,12 +822,13 @@ static int rs_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> static void rs_flush_buffer(struct tty_struct *tty)</div><div class='ctx'> {</div><div class='ctx'> 	struct m68k_serial *info = (struct m68k_serial *)tty-&gt;driver_data;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 				</div><div class='ctx'> 	if (serial_paranoia_check(info, tty-&gt;name, "rs_flush_buffer"))</div><div class='ctx'> 		return;</div><div class='del'>-	cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	info-&gt;xmit_cnt = info-&gt;xmit_head = info-&gt;xmit_tail = 0;</div><div class='del'>-	sti();</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	tty_wakeup(tty);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -973,14 +958,15 @@ static int get_lsr_info(struct m68k_serial * info, unsigned int *value)</div><div class='ctx'> 	m68328_uart *uart = &amp;uart_addr[info-&gt;line];</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned char status;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> #ifdef CONFIG_SERIAL_68328_RTS_CTS</div><div class='ctx'> 	status = (uart-&gt;utx.w &amp; UTX_CTS_STAT) ? 1 : 0;</div><div class='ctx'> #else</div><div class='ctx'> 	status = 0;</div><div class='ctx'> #endif</div><div class='del'>-	sti();</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	put_user(status,value);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -994,14 +980,13 @@ static void send_break(struct m68k_serial * info, unsigned int duration)</div><div class='ctx'>         unsigned long flags;</div><div class='ctx'>         if (!info-&gt;port)</div><div class='ctx'>                 return;</div><div class='del'>-        save_flags(flags);</div><div class='del'>-        cli();</div><div class='add'>+        local_irq_save(flags);</div><div class='ctx'> #ifdef USE_INTS	</div><div class='ctx'> 	uart-&gt;utx.w |= UTX_SEND_BREAK;</div><div class='ctx'> 	msleep_interruptible(duration);</div><div class='ctx'> 	uart-&gt;utx.w &amp;= ~UTX_SEND_BREAK;</div><div class='ctx'> #endif		</div><div class='del'>-        restore_flags(flags);</div><div class='add'>+        local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rs_ioctl(struct tty_struct *tty, struct file * file,</div><div class='hunk'>@@ -1060,7 +1045,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,</div><div class='ctx'> 					       (struct serial_struct *) arg);</div><div class='ctx'> 		case TIOCSERGETLSR: /* Get line status register */</div><div class='ctx'> 			if (access_ok(VERIFY_WRITE, (void *) arg,</div><div class='del'>-						sizeof(unsigned int));</div><div class='add'>+						sizeof(unsigned int)))</div><div class='ctx'> 				return get_lsr_info(info, (unsigned int *) arg);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		case TIOCSERGSTRUCT:</div><div class='hunk'>@@ -1113,10 +1098,10 @@ static void rs_close(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 	if (!info || serial_paranoia_check(info, tty-&gt;name, "rs_close"))</div><div class='ctx'> 		return;</div><div class='ctx'> 	</div><div class='del'>-	save_flags(flags); cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> 	</div><div class='ctx'> 	if (tty_hung_up_p(filp)) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		local_irq_restore(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -1138,7 +1123,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 		info-&gt;count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;count) {</div><div class='del'>-		restore_flags(flags);</div><div class='add'>+		local_irq_restore(flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;flags |= S_CLOSING;</div><div class='hunk'>@@ -1186,7 +1171,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 	}</div><div class='ctx'> 	info-&gt;flags &amp;= ~(S_NORMAL_ACTIVE|S_CLOSING);</div><div class='ctx'> 	wake_up_interruptible(&amp;info-&gt;close_wait);</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1262,9 +1247,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,</div><div class='ctx'> 	info-&gt;count--;</div><div class='ctx'> 	info-&gt;blocked_open++;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		cli();</div><div class='add'>+		local_irq_disable();</div><div class='ctx'> 		m68k_rtsdtr(info, 1);</div><div class='del'>-		sti();</div><div class='add'>+		local_irq_enable();</div><div class='ctx'> 		current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='ctx'> 		if (tty_hung_up_p(filp) ||</div><div class='ctx'> 		    !(info-&gt;flags &amp; S_INITIALIZED)) {</div><div class='hunk'>@@ -1444,7 +1429,7 @@ rs68328_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	save_flags(flags); cli();</div><div class='add'>+	local_irq_save(flags);</div><div class='ctx'> </div><div class='ctx'> 	for(i=0;i&lt;NR_PORTS;i++) {</div><div class='ctx'> </div><div class='hunk'>@@ -1489,7 +1474,7 @@ rs68328_init(void)</div><div class='ctx'> 		    serial_pm[i]-&gt;data = info;</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	restore_flags(flags);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h<br/>index 978f8a609f3d..58aa2154655b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/68328serial.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/68328serial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/68328serial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/68328serial.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef _MC683XX_SERIAL_H</div><div class='ctx'> #define _MC683XX_SERIAL_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct serial_struct {</div><div class='ctx'> 	int	type;</div><div class='head'>diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c<br/>index 9843ae3d420e..e80e70e9b126 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/68360serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/68360serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/68360serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/68360serial.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *	int rs_360_init(void);</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='head'>diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c<br/>index bbf78aaf9e01..0ae9ced00ed4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/8250.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/8250.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/8250.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *  mapbase is the physical address of the IO port.</div><div class='ctx'>  *  membase is an 'ioremapped' cookie.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_8250_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -49,7 +48,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Configuration:</div><div class='del'>- *   share_irqs - whether we pass SA_SHIRQ to request_irq().  This option</div><div class='add'>+ *   share_irqs - whether we pass IRQF_SHARED to request_irq().  This option</div><div class='ctx'>  *                is unsafe when used on edge-triggered interrupts.</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;</div><div class='hunk'>@@ -300,6 +299,7 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)</div><div class='ctx'> </div><div class='ctx'> static unsigned int serial_in(struct uart_8250_port *up, int offset)</div><div class='ctx'> {</div><div class='add'>+	unsigned int tmp;</div><div class='ctx'> 	offset = map_8250_in_reg(up, offset) &lt;&lt; up-&gt;port.regshift;</div><div class='ctx'> </div><div class='ctx'> 	switch (up-&gt;port.iotype) {</div><div class='hunk'>@@ -318,6 +318,13 @@ static unsigned int serial_in(struct uart_8250_port *up, int offset)</div><div class='ctx'> 		return __raw_readl(up-&gt;port.membase + offset);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	case UPIO_TSI:</div><div class='add'>+		if (offset == UART_IIR) {</div><div class='add'>+			tmp = readl((u32 *)(up-&gt;port.membase + UART_RX));</div><div class='add'>+			return (cpu_to_le32(tmp) &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		} else</div><div class='add'>+			return readb(up-&gt;port.membase + offset);</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return inb(up-&gt;port.iobase + offset);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -347,6 +354,10 @@ serial_out(struct uart_8250_port *up, int offset, int value)</div><div class='ctx'> 		__raw_writel(value, up-&gt;port.membase + offset);</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='add'>+	case UPIO_TSI:</div><div class='add'>+		if (!((offset == UART_IER) &amp;&amp; (value &amp; UART_IER_UUE)))</div><div class='add'>+			writeb(value, up-&gt;port.membase + offset);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		outb(value, up-&gt;port.iobase + offset);</div><div class='hunk'>@@ -1401,7 +1412,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_8250_port *up)</div><div class='ctx'> static int serial_link_irq_chain(struct uart_8250_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_info *i = irq_lists + up-&gt;port.irq;</div><div class='del'>-	int ret, irq_flags = up-&gt;port.flags &amp; UPF_SHARE_IRQ ? SA_SHIRQ : 0;</div><div class='add'>+	int ret, irq_flags = up-&gt;port.flags &amp; UPF_SHARE_IRQ ? IRQF_SHARED : 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;i-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2241,10 +2252,14 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)</div><div class='ctx'> </div><div class='ctx'> 	touch_nmi_watchdog();</div><div class='ctx'> </div><div class='del'>-	if (oops_in_progress) {</div><div class='del'>-		locked = spin_trylock_irqsave(&amp;up-&gt;port.lock, flags);</div><div class='add'>+	local_irq_save(flags);</div><div class='add'>+	if (up-&gt;port.sysrq) {</div><div class='add'>+		/* serial8250_handle_port() already took the lock */</div><div class='add'>+		locked = 0;</div><div class='add'>+	} else if (oops_in_progress) {</div><div class='add'>+		locked = spin_trylock(&amp;up-&gt;port.lock);</div><div class='ctx'> 	} else</div><div class='del'>-		spin_lock_irqsave(&amp;up-&gt;port.lock, flags);</div><div class='add'>+		spin_lock(&amp;up-&gt;port.lock);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	First save the IER then disable the interrupts</div><div class='hunk'>@@ -2266,7 +2281,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)</div><div class='ctx'> 	serial_out(up, UART_IER, ier);</div><div class='ctx'> </div><div class='ctx'> 	if (locked)</div><div class='del'>-		spin_unlock_irqrestore(&amp;up-&gt;port.lock, flags);</div><div class='add'>+		spin_unlock(&amp;up-&gt;port.lock);</div><div class='add'>+	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int serial8250_console_setup(struct console *co, char *options)</div><div class='hunk'>@@ -2354,7 +2370,6 @@ int __init serial8250_start_console(struct uart_port *port, char *options)</div><div class='ctx'> static struct uart_driver serial8250_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "serial",</div><div class='del'>-	.devfs_name		= "tts/",</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> 	.minor			= 64,</div><div class='head'>diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h<br/>index 490606b87095..91bd28f2bb47 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/8250.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/8250.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/8250.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serial_8250.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct old_serial_port {</div><div class='head'>diff --git a/drivers/serial/8250_mca.c b/drivers/serial/8250_mca.c<br/>index ac205256d5f3..d10be944ad44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/8250_mca.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250_mca.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/8250_mca.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/8250_mca.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * it under the terms of the GNU General Public License version 2 as</div><div class='ctx'>  * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mca.h&gt;</div><div class='head'>diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c<br/>index 94886c000d2a..a1d322f8a16c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/8250_pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250_pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/8250_pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/8250_pci.c</a></div><div class='hunk'>@@ -134,7 +134,7 @@ afavlab_setup(struct serial_private *priv, struct pciserial_board *board,</div><div class='ctx'>  * and Keystone have one Diva chip with 3 UARTs.  Some later machines have</div><div class='ctx'>  * one Diva chip, but it has been expanded to 5 UARTs.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit pci_hp_diva_init(struct pci_dev *dev)</div><div class='add'>+static int pci_hp_diva_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +194,7 @@ pci_hp_diva_setup(struct serial_private *priv, struct pciserial_board *board,</div><div class='ctx'> /*</div><div class='ctx'>  * Added for EKF Intel i960 serial boards</div><div class='ctx'>  */</div><div class='del'>-static int __devinit pci_inteli960ni_init(struct pci_dev *dev)</div><div class='add'>+static int pci_inteli960ni_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long oldval;</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +216,7 @@ static int __devinit pci_inteli960ni_init(struct pci_dev *dev)</div><div class='ctx'>  * seems to be mainly needed on card using the PLX which also use I/O</div><div class='ctx'>  * mapped memory.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit pci_plx9050_init(struct pci_dev *dev)</div><div class='add'>+static int pci_plx9050_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 irq_config;</div><div class='ctx'> 	void __iomem *p;</div><div class='hunk'>@@ -314,7 +314,7 @@ sbs_setup(struct serial_private *priv, struct pciserial_board *board,</div><div class='ctx'> /* global control register offset for SBS PMC-OctalPro */</div><div class='ctx'> #define OCT_REG_CR_OFF		0x500</div><div class='ctx'> </div><div class='del'>-static int __devinit sbs_init(struct pci_dev *dev)</div><div class='add'>+static int sbs_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 __iomem *p;</div><div class='ctx'> </div><div class='hunk'>@@ -493,7 +493,7 @@ static const struct timedia_struct {</div><div class='ctx'> 	{ 0, NULL }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit pci_timedia_init(struct pci_dev *dev)</div><div class='add'>+static int pci_timedia_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short *ids;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -566,13 +566,13 @@ titan_400l_800l_setup(struct serial_private *priv,</div><div class='ctx'> 	return setup_port(priv, port, bar, offset, board-&gt;reg_shift);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit pci_xircom_init(struct pci_dev *dev)</div><div class='add'>+static int pci_xircom_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit pci_netmos_init(struct pci_dev *dev)</div><div class='add'>+static int pci_netmos_init(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* subdevice 0x00PS means &lt;P&gt; parallel, &lt;S&gt; serial */</div><div class='ctx'> 	unsigned int num_serial = dev-&gt;subsystem_device &amp; 0xf;</div><div class='hunk'>@@ -594,8 +594,8 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,</div><div class='ctx'> 	else</div><div class='ctx'> 		offset += idx * board-&gt;uart_offset;</div><div class='ctx'> </div><div class='del'>-	maxnr = (pci_resource_len(priv-&gt;dev, bar) - board-&gt;first_offset) /</div><div class='del'>-		(8 &lt;&lt; board-&gt;reg_shift);</div><div class='add'>+	maxnr = (pci_resource_len(priv-&gt;dev, bar) - board-&gt;first_offset) &gt;&gt;</div><div class='add'>+		(board-&gt;reg_shift + 3);</div><div class='ctx'> </div><div class='ctx'> 	if (board-&gt;flags &amp; FL_REGION_SZ_CAP &amp;&amp; idx &gt;= maxnr)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -622,7 +622,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,</div><div class='ctx'>  */</div><div class='ctx'> static struct pci_serial_quirk pci_serial_quirks[] = {</div><div class='ctx'> 	/*</div><div class='del'>-	 * AFAVLAB cards.</div><div class='add'>+	 * AFAVLAB cards - these may be called via parport_serial</div><div class='ctx'> 	 *  It is not clear whether this applies to all products.</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='hunk'>@@ -754,7 +754,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {</div><div class='ctx'> 		.exit		= __devexit_p(sbs_exit),</div><div class='ctx'> 	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * SIIG cards.</div><div class='add'>+	 * SIIG cards - these may be called via parport_serial</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor		= PCI_VENDOR_ID_SIIG,</div><div class='hunk'>@@ -811,7 +811,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {</div><div class='ctx'> 		.setup		= pci_default_setup,</div><div class='ctx'> 	},</div><div class='ctx'> 	/*</div><div class='del'>-	 * Netmos cards</div><div class='add'>+	 * Netmos cards - these may be called via parport_serial</div><div class='ctx'> 	 */</div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor		= PCI_VENDOR_ID_NETMOS,</div><div class='head'>diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c<br/>index b79ed0665d51..632f62d6ec7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/8250_pnp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/8250_pnp.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/8250_pnp.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/8250_pnp.c</a></div><div class='hunk'>@@ -323,8 +323,10 @@ static const struct pnp_device_id pnp_dev_table[] = {</div><div class='ctx'> 	{	"USR9180",		0	},</div><div class='ctx'> 	/* U.S. Robotics 56K Voice INT PnP*/</div><div class='ctx'> 	{	"USR9190",		0	},</div><div class='del'>-	/* HP Compaq Tablet PC tc1100 Wacom tablet */</div><div class='add'>+	/* Wacom tablets */</div><div class='add'>+	{	"WACF004",		0	},</div><div class='ctx'> 	{	"WACF005",		0	},</div><div class='add'>+	{       "WACF006",              0       },</div><div class='ctx'> 	/* Rockwell's (PORALiNK) 33600 INT PNP */</div><div class='ctx'> 	{	"WCI0003",		0	},</div><div class='ctx'> 	/* Unkown PnP modems */</div><div class='hunk'>@@ -429,6 +431,8 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;</div><div class='add'>+	if (pnp_irq_flags(dev, 0) &amp; IORESOURCE_IRQ_SHAREABLE)</div><div class='add'>+		port.flags |= UPF_SHARE_IRQ;</div><div class='ctx'> 	port.uartclk = 1843200;</div><div class='ctx'> 	port.dev = &amp;dev-&gt;dev;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig<br/>index 7d22dc0478d3..5b48ac22c9c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/Kconfig</a></div><div class='hunk'>@@ -300,21 +300,22 @@ config SERIAL_AMBA_PL011_CONSOLE</div><div class='ctx'> 	  kernel at boot time.)</div><div class='ctx'> </div><div class='ctx'> config SERIAL_AT91</div><div class='del'>-	bool "AT91RM9200 serial port support"</div><div class='del'>-	depends on ARM &amp;&amp; ARCH_AT91RM9200</div><div class='add'>+	bool "AT91RM9200 / AT91SAM9261 serial port support"</div><div class='add'>+	depends on ARM &amp;&amp; (ARCH_AT91RM9200 || ARCH_AT91SAM9261)</div><div class='ctx'> 	select SERIAL_CORE</div><div class='ctx'> 	help</div><div class='del'>-	  This enables the driver for the on-chip UARTs of the AT91RM9200</div><div class='del'>-	  processor.</div><div class='add'>+	  This enables the driver for the on-chip UARTs of the Atmel</div><div class='add'>+	  AT91RM9200 and AT91SAM926 processor.</div><div class='ctx'> </div><div class='ctx'> config SERIAL_AT91_CONSOLE</div><div class='del'>-	bool "Support for console on AT91RM9200 serial port"</div><div class='add'>+	bool "Support for console on AT91RM9200 / AT91SAM9261 serial port"</div><div class='ctx'> 	depends on SERIAL_AT91=y</div><div class='ctx'> 	select SERIAL_CORE_CONSOLE</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you wish to use a UART on the AT91RM9200 as the system</div><div class='del'>-	  console (the system console is the device which receives all kernel</div><div class='del'>-	  messages and warnings and which allows logins in single user mode).</div><div class='add'>+	  Say Y here if you wish to use a UART on the Atmel AT91RM9200 or</div><div class='add'>+	  AT91SAM9261 as the system console (the system console is the device</div><div class='add'>+	  which receives all kernel messages and warnings and which allows</div><div class='add'>+	  logins in single user mode).</div><div class='ctx'> </div><div class='ctx'> config SERIAL_AT91_TTYAT</div><div class='ctx'> 	bool "Install as device ttyAT0-4 instead of ttyS0-4"</div><div class='hunk'>@@ -353,21 +354,24 @@ config SERIAL_CLPS711X_CONSOLE</div><div class='ctx'> 	  kernel at boot time.)</div><div class='ctx'> </div><div class='ctx'> config SERIAL_S3C2410</div><div class='del'>-	tristate "Samsung S3C2410 Serial port support"</div><div class='add'>+	tristate "Samsung S3C2410/S3C2440/S3C2442/S3C2412 Serial port support"</div><div class='ctx'> 	depends on ARM &amp;&amp; ARCH_S3C2410</div><div class='ctx'> 	select SERIAL_CORE</div><div class='ctx'> 	help</div><div class='del'>-	  Support for the on-chip UARTs on the Samsung S3C2410X CPU,</div><div class='add'>+	  Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,</div><div class='ctx'> 	  providing /dev/ttySAC0, 1 and 2 (note, some machines may not</div><div class='ctx'> 	  provide all of these ports, depending on how the serial port</div><div class='ctx'> 	  pins are configured.</div><div class='ctx'> </div><div class='add'>+	  Currently this driver supports the UARTS on the S3C2410, S3C2440,</div><div class='add'>+	  S3C2442, S3C2412 and S3C2413 CPUs.</div><div class='add'>+</div><div class='ctx'> config SERIAL_S3C2410_CONSOLE</div><div class='ctx'> 	bool "Support for console on S3C2410 serial port"</div><div class='ctx'> 	depends on SERIAL_S3C2410=y</div><div class='ctx'> 	select SERIAL_CORE_CONSOLE</div><div class='ctx'> 	help</div><div class='del'>-	  Allow selection of the S3C2410 on-board serial ports for use as</div><div class='add'>+	  Allow selection of the S3C24XX on-board serial ports for use as</div><div class='ctx'> 	  an virtual console.</div><div class='ctx'> </div><div class='ctx'> 	  Even if you say Y here, the currently visible virtual console</div><div class='hunk'>@@ -936,4 +940,23 @@ config SERIAL_SGI_IOC3</div><div class='ctx'> 	  If you have an SGI Altix with an IOC3 serial card,</div><div class='ctx'> 	  say Y or M.  Otherwise, say N.</div><div class='ctx'> </div><div class='add'>+config SERIAL_NETX</div><div class='add'>+	bool "NetX serial port support"</div><div class='add'>+	depends on ARM &amp;&amp; ARCH_NETX</div><div class='add'>+	select SERIAL_CORE</div><div class='add'>+	help</div><div class='add'>+	  If you have a machine based on a Hilscher NetX SoC you</div><div class='add'>+	  can enable its onboard serial port by enabling this option.</div><div class='add'>+</div><div class='add'>+          To compile this driver as a module, choose M here: the</div><div class='add'>+          module will be called netx-serial.</div><div class='add'>+</div><div class='add'>+config SERIAL_NETX_CONSOLE</div><div class='add'>+	bool "Console on NetX serial port"</div><div class='add'>+	depends on SERIAL_NETX</div><div class='add'>+	select SERIAL_CORE_CONSOLE</div><div class='add'>+	help</div><div class='add'>+	  If you have enabled the serial port on the Motorola IMX</div><div class='add'>+	  CPU you can make it the console by answering Y to this option.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile<br/>index 0a71bf68a03f..927faee0362e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/Makefile</a></div><div class='hunk'>@@ -55,3 +55,4 @@ obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o</div><div class='ctx'> obj-$(CONFIG_SERIAL_AT91) += at91_serial.o</div><div class='add'>+obj-$(CONFIG_SERIAL_NETX) += netx-serial.o</div><div class='head'>diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c<br/>index 1631414000a2..7311d8487c96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/amba-pl010.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/amba-pl010.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/amba-pl010.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/amba-pl010.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * required, these have to be supplied via some other means (eg, GPIO)</div><div class='ctx'>  * and hooked into this driver.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -52,7 +51,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#define UART_NR		2</div><div class='add'>+#define UART_NR		8</div><div class='ctx'> </div><div class='ctx'> #define SERIAL_AMBA_MAJOR	204</div><div class='ctx'> #define SERIAL_AMBA_MINOR	16</div><div class='head'>diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c<br/>index 3d966cfc9a38..a8d7124e84a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/amba-pl011.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/amba-pl011.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/amba-pl011.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/amba-pl011.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * required, these have to be supplied via some other means (eg, GPIO)</div><div class='ctx'>  * and hooked into this driver.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='head'>diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c<br/>index 6547fe0cef96..54c6b2adf7b7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/at91_serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/at91_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/at91_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/at91_serial.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  linux/drivers/char/at91_serial.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Driver for Atmel AT91RM9200 Serial ports</div><div class='del'>- *</div><div class='ctx'>  *  Copyright (C) 2003 Rick Bronson</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.</div><div class='hunk'>@@ -23,24 +22,26 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/sysrq.h&gt;</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/arch/at91rm9200_usart.h&gt;</div><div class='del'>-#include &lt;asm/mach/serial_at91rm9200.h&gt;</div><div class='add'>+#include &lt;asm/arch/at91rm9200_pdc.h&gt;</div><div class='add'>+#include &lt;asm/mach/serial_at91.h&gt;</div><div class='ctx'> #include &lt;asm/arch/board.h&gt;</div><div class='del'>-#include &lt;asm/arch/pio.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;asm/arch/system.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_AT91_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -67,7 +68,6 @@</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define AT91_VA_BASE_DBGU	((unsigned long) AT91_VA_BASE_SYS + AT91_DBGU)</div><div class='ctx'> #define AT91_ISR_PASS_LIMIT	256</div><div class='ctx'> </div><div class='ctx'> #define UART_PUT_CR(port,v)	writel(v, (port)-&gt;membase + AT91_US_CR)</div><div class='hunk'>@@ -87,16 +87,33 @@</div><div class='ctx'> </div><div class='ctx'>  /* PDC registers */</div><div class='ctx'> #define UART_PUT_PTCR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_PTCR)</div><div class='add'>+#define UART_GET_PTSR(port)	readl((port)-&gt;membase + AT91_PDC_PTSR)</div><div class='add'>+</div><div class='ctx'> #define UART_PUT_RPR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_RPR)</div><div class='add'>+#define UART_GET_RPR(port)	readl((port)-&gt;membase + AT91_PDC_RPR)</div><div class='ctx'> #define UART_PUT_RCR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_RCR)</div><div class='del'>-#define UART_GET_RCR(port)	readl((port)-&gt;membase + AT91_PDC_RCR)</div><div class='ctx'> #define UART_PUT_RNPR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_RNPR)</div><div class='ctx'> #define UART_PUT_RNCR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_RNCR)</div><div class='ctx'> </div><div class='add'>+#define UART_PUT_TPR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_TPR)</div><div class='add'>+#define UART_PUT_TCR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_TCR)</div><div class='add'>+//#define UART_PUT_TNPR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_TNPR)</div><div class='add'>+//#define UART_PUT_TNCR(port,v)	writel(v, (port)-&gt;membase + AT91_PDC_TNCR)</div><div class='ctx'> </div><div class='ctx'> static int (*at91_open)(struct uart_port *);</div><div class='ctx'> static void (*at91_close)(struct uart_port *);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * We wrap our port structure around the generic uart_port.</div><div class='add'>+ */</div><div class='add'>+struct at91_uart_port {</div><div class='add'>+	struct uart_port	uart;		/* uart */</div><div class='add'>+	struct clk		*clk;		/* uart clock */</div><div class='add'>+	unsigned short		suspended;	/* is port suspended? */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct at91_uart_port at91_ports[AT91_NR_UART];</div><div class='add'>+</div><div class='ctx'> #ifdef SUPPORT_SYSRQ</div><div class='ctx'> static struct console at91_console;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -115,16 +132,19 @@ static u_int at91_tx_empty(struct uart_port *port)</div><div class='ctx'> static void at91_set_mctrl(struct uart_port *port, u_int mctrl)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int control = 0;</div><div class='add'>+	unsigned int mode;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Errata #39: RTS0 is not internally connected to PA21.  We need to drive</div><div class='del'>-	 *  the pin manually.</div><div class='del'>-	 */</div><div class='del'>-	if (port-&gt;mapbase == AT91_VA_BASE_US0) {</div><div class='del'>-		if (mctrl &amp; TIOCM_RTS)</div><div class='del'>-			at91_sys_write(AT91_PIOA + PIO_CODR, AT91_PA21_RTS0);</div><div class='del'>-		else</div><div class='del'>-			at91_sys_write(AT91_PIOA + PIO_SODR, AT91_PA21_RTS0);</div><div class='add'>+	if (arch_identify() == ARCH_ID_AT91RM9200) {</div><div class='add'>+		/*</div><div class='add'>+		 * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21.</div><div class='add'>+		 *  We need to drive the pin manually.</div><div class='add'>+		 */</div><div class='add'>+		if (port-&gt;mapbase == AT91_BASE_US0) {</div><div class='add'>+			if (mctrl &amp; TIOCM_RTS)</div><div class='add'>+				at91_set_gpio_value(AT91_PIN_PA21, 0);</div><div class='add'>+			else</div><div class='add'>+				at91_set_gpio_value(AT91_PIN_PA21, 1);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mctrl &amp; TIOCM_RTS)</div><div class='hunk'>@@ -137,7 +157,15 @@ static void at91_set_mctrl(struct uart_port *port, u_int mctrl)</div><div class='ctx'> 	else</div><div class='ctx'> 		control |= AT91_US_DTRDIS;</div><div class='ctx'> </div><div class='del'>-	UART_PUT_CR(port,control);</div><div class='add'>+	UART_PUT_CR(port, control);</div><div class='add'>+</div><div class='add'>+	/* Local loopback mode? */</div><div class='add'>+	mode = UART_GET_MR(port) &amp; ~AT91_US_CHMODE;</div><div class='add'>+	if (mctrl &amp; TIOCM_LOOP)</div><div class='add'>+		mode |= AT91_US_CHMODE_LOC_LOOP;</div><div class='add'>+	else</div><div class='add'>+		mode |= AT91_US_CHMODE_NORMAL;</div><div class='add'>+	UART_PUT_MR(port, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -169,8 +197,9 @@ static u_int at91_get_mctrl(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_stop_tx(struct uart_port *port)</div><div class='ctx'> {</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+</div><div class='ctx'> 	UART_PUT_IDR(port, AT91_US_TXRDY);</div><div class='del'>-	port-&gt;read_status_mask &amp;= ~AT91_US_TXRDY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -178,7 +207,8 @@ static void at91_stop_tx(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_start_tx(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	port-&gt;read_status_mask |= AT91_US_TXRDY;</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+</div><div class='ctx'> 	UART_PUT_IER(port, AT91_US_TXRDY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -187,6 +217,8 @@ static void at91_start_tx(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_stop_rx(struct uart_port *port)</div><div class='ctx'> {</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+</div><div class='ctx'> 	UART_PUT_IDR(port, AT91_US_RXRDY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -195,7 +227,6 @@ static void at91_stop_rx(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_enable_ms(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	port-&gt;read_status_mask |= (AT91_US_RIIC | AT91_US_DSRIC | AT91_US_DCDIC | AT91_US_CTSIC);</div><div class='ctx'> 	UART_PUT_IER(port, AT91_US_RIIC | AT91_US_DSRIC | AT91_US_DCDIC | AT91_US_CTSIC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -218,8 +249,8 @@ static void at91_rx_chars(struct uart_port *port, struct pt_regs *regs)</div><div class='ctx'> 	struct tty_struct *tty = port-&gt;info-&gt;tty;</div><div class='ctx'> 	unsigned int status, ch, flg;</div><div class='ctx'> </div><div class='del'>-	status = UART_GET_CSR(port) &amp; port-&gt;read_status_mask;</div><div class='del'>-	while (status &amp; (AT91_US_RXRDY)) {</div><div class='add'>+	status = UART_GET_CSR(port);</div><div class='add'>+	while (status &amp; AT91_US_RXRDY) {</div><div class='ctx'> 		ch = UART_GET_CHAR(port);</div><div class='ctx'> </div><div class='ctx'> 		port-&gt;icount.rx++;</div><div class='hunk'>@@ -230,40 +261,38 @@ static void at91_rx_chars(struct uart_port *port, struct pt_regs *regs)</div><div class='ctx'> 		 * note that the error handling code is</div><div class='ctx'> 		 * out of the main execution path</div><div class='ctx'> 		 */</div><div class='del'>-		if (unlikely(status &amp; (AT91_US_PARE | AT91_US_FRAME | AT91_US_OVRE))) {</div><div class='add'>+		if (unlikely(status &amp; (AT91_US_PARE | AT91_US_FRAME | AT91_US_OVRE | AT91_US_RXBRK))) {</div><div class='ctx'> 			UART_PUT_CR(port, AT91_US_RSTSTA);	/* clear error */</div><div class='del'>-			if (status &amp; (AT91_US_PARE))</div><div class='add'>+			if (status &amp; AT91_US_RXBRK) {</div><div class='add'>+				status &amp;= ~(AT91_US_PARE | AT91_US_FRAME);	/* ignore side-effect */</div><div class='add'>+				port-&gt;icount.brk++;</div><div class='add'>+				if (uart_handle_break(port))</div><div class='add'>+					goto ignore_char;</div><div class='add'>+			}</div><div class='add'>+			if (status &amp; AT91_US_PARE)</div><div class='ctx'> 				port-&gt;icount.parity++;</div><div class='del'>-			if (status &amp; (AT91_US_FRAME))</div><div class='add'>+			if (status &amp; AT91_US_FRAME)</div><div class='ctx'> 				port-&gt;icount.frame++;</div><div class='del'>-			if (status &amp; (AT91_US_OVRE))</div><div class='add'>+			if (status &amp; AT91_US_OVRE)</div><div class='ctx'> 				port-&gt;icount.overrun++;</div><div class='ctx'> </div><div class='del'>-			if (status &amp; AT91_US_PARE)</div><div class='add'>+			status &amp;= port-&gt;read_status_mask;</div><div class='add'>+</div><div class='add'>+			if (status &amp; AT91_US_RXBRK)</div><div class='add'>+				flg = TTY_BREAK;</div><div class='add'>+			else if (status &amp; AT91_US_PARE)</div><div class='ctx'> 				flg = TTY_PARITY;</div><div class='ctx'> 			else if (status &amp; AT91_US_FRAME)</div><div class='ctx'> 				flg = TTY_FRAME;</div><div class='del'>-			if (status &amp; AT91_US_OVRE) {</div><div class='del'>-				/*</div><div class='del'>-				 * overrun does *not* affect the character</div><div class='del'>-				 * we read from the FIFO</div><div class='del'>-				 */</div><div class='del'>-				tty_insert_flip_char(tty, ch, flg);</div><div class='del'>-				ch = 0;</div><div class='del'>-				flg = TTY_OVERRUN;</div><div class='del'>-			}</div><div class='del'>-#ifdef SUPPORT_SYSRQ</div><div class='del'>-			port-&gt;sysrq = 0;</div><div class='del'>-#endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (uart_handle_sysrq_char(port, ch, regs))</div><div class='ctx'> 			goto ignore_char;</div><div class='ctx'> </div><div class='del'>-		tty_insert_flip_char(tty, ch, flg);</div><div class='add'>+		uart_insert_char(port, status, AT91_US_OVRE, ch, flg);</div><div class='ctx'> </div><div class='ctx'> 	ignore_char:</div><div class='del'>-		status = UART_GET_CSR(port) &amp; port-&gt;read_status_mask;</div><div class='add'>+		status = UART_GET_CSR(port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tty_flip_buffer_push(tty);</div><div class='hunk'>@@ -308,40 +337,35 @@ static void at91_tx_chars(struct uart_port *port)</div><div class='ctx'> static irqreturn_t at91_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct uart_port *port = dev_id;</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='ctx'> 	unsigned int status, pending, pass_counter = 0;</div><div class='ctx'> </div><div class='ctx'> 	status = UART_GET_CSR(port);</div><div class='del'>-	pending = status &amp; port-&gt;read_status_mask;</div><div class='del'>-	if (pending) {</div><div class='del'>-		do {</div><div class='del'>-			if (pending &amp; AT91_US_RXRDY)</div><div class='del'>-				at91_rx_chars(port, regs);</div><div class='del'>-</div><div class='del'>-			/* Clear the relevent break bits */</div><div class='del'>-			if (pending &amp; AT91_US_RXBRK) {</div><div class='del'>-				UART_PUT_CR(port, AT91_US_RSTSTA);</div><div class='del'>-				port-&gt;icount.brk++;</div><div class='del'>-				uart_handle_break(port);</div><div class='del'>-			}</div><div class='add'>+	pending = status &amp; UART_GET_IMR(port);</div><div class='add'>+	while (pending) {</div><div class='add'>+		/* Interrupt receive */</div><div class='add'>+		if (pending &amp; AT91_US_RXRDY)</div><div class='add'>+			at91_rx_chars(port, regs);</div><div class='add'>+</div><div class='add'>+		// TODO: All reads to CSR will clear these interrupts!</div><div class='add'>+		if (pending &amp; AT91_US_RIIC) port-&gt;icount.rng++;</div><div class='add'>+		if (pending &amp; AT91_US_DSRIC) port-&gt;icount.dsr++;</div><div class='add'>+		if (pending &amp; AT91_US_DCDIC)</div><div class='add'>+			uart_handle_dcd_change(port, !(status &amp; AT91_US_DCD));</div><div class='add'>+		if (pending &amp; AT91_US_CTSIC)</div><div class='add'>+			uart_handle_cts_change(port, !(status &amp; AT91_US_CTS));</div><div class='add'>+		if (pending &amp; (AT91_US_RIIC | AT91_US_DSRIC | AT91_US_DCDIC | AT91_US_CTSIC))</div><div class='add'>+			wake_up_interruptible(&amp;port-&gt;info-&gt;delta_msr_wait);</div><div class='add'>+</div><div class='add'>+		/* Interrupt transmit */</div><div class='add'>+		if (pending &amp; AT91_US_TXRDY)</div><div class='add'>+			at91_tx_chars(port);</div><div class='add'>+</div><div class='add'>+		if (pass_counter++ &gt; AT91_ISR_PASS_LIMIT)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-			// TODO: All reads to CSR will clear these interrupts!</div><div class='del'>-			if (pending &amp; AT91_US_RIIC) port-&gt;icount.rng++;</div><div class='del'>-			if (pending &amp; AT91_US_DSRIC) port-&gt;icount.dsr++;</div><div class='del'>-			if (pending &amp; AT91_US_DCDIC)</div><div class='del'>-				uart_handle_dcd_change(port, !(status &amp; AT91_US_DCD));</div><div class='del'>-			if (pending &amp; AT91_US_CTSIC)</div><div class='del'>-				uart_handle_cts_change(port, !(status &amp; AT91_US_CTS));</div><div class='del'>-			if (pending &amp; (AT91_US_RIIC | AT91_US_DSRIC | AT91_US_DCDIC | AT91_US_CTSIC))</div><div class='del'>-				wake_up_interruptible(&amp;port-&gt;info-&gt;delta_msr_wait);</div><div class='del'>-</div><div class='del'>-			if (pending &amp; AT91_US_TXRDY)</div><div class='del'>-				at91_tx_chars(port);</div><div class='del'>-			if (pass_counter++ &gt; AT91_ISR_PASS_LIMIT)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			status = UART_GET_CSR(port);</div><div class='del'>-			pending = status &amp; port-&gt;read_status_mask;</div><div class='del'>-		} while (pending);</div><div class='add'>+		status = UART_GET_CSR(port);</div><div class='add'>+		pending = status &amp; UART_GET_IMR(port);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -351,6 +375,7 @@ static irqreturn_t at91_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'>  */</div><div class='ctx'> static int at91_startup(struct uart_port *port)</div><div class='ctx'> {</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -363,7 +388,7 @@ static int at91_startup(struct uart_port *port)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate the IRQ</div><div class='ctx'> 	 */</div><div class='del'>-	retval = request_irq(port-&gt;irq, at91_interrupt, SA_SHIRQ, "at91_serial", port);</div><div class='add'>+	retval = request_irq(port-&gt;irq, at91_interrupt, IRQF_SHARED, "at91_serial", port);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk("at91_serial: at91_startup - Can't get irq\n");</div><div class='ctx'> 		return retval;</div><div class='hunk'>@@ -381,14 +406,14 @@ static int at91_startup(struct uart_port *port)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	port-&gt;read_status_mask = AT91_US_RXRDY | AT91_US_TXRDY | AT91_US_OVRE</div><div class='del'>-			| AT91_US_FRAME | AT91_US_PARE | AT91_US_RXBRK;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Finally, enable the serial port</div><div class='ctx'> 	 */</div><div class='ctx'> 	UART_PUT_CR(port, AT91_US_RSTSTA | AT91_US_RSTRX);</div><div class='ctx'> 	UART_PUT_CR(port, AT91_US_TXEN | AT91_US_RXEN);		/* enable xmit &amp; rcvr */</div><div class='del'>-	UART_PUT_IER(port, AT91_US_RXRDY);			/* do receive only */</div><div class='add'>+</div><div class='add'>+	UART_PUT_IER(port, AT91_US_RXRDY);		/* enable receive only */</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -397,6 +422,8 @@ static int at91_startup(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_shutdown(struct uart_port *port)</div><div class='ctx'> {</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable all interrupts, port and break condition.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -421,21 +448,22 @@ static void at91_shutdown(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_serial_pm(struct uart_port *port, unsigned int state, unsigned int oldstate)</div><div class='ctx'> {</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Enable the peripheral clock for this serial port.</div><div class='ctx'> 			 * This is called on uart_open() or a resume event.</div><div class='ctx'> 			 */</div><div class='del'>-			at91_sys_write(AT91_PMC_PCER, 1 &lt;&lt; port-&gt;irq);</div><div class='add'>+			clk_enable(at91_port-&gt;clk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case 3:</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Disable the peripheral clock for this serial port.</div><div class='ctx'> 			 * This is called on uart_close() or a suspend event.</div><div class='ctx'> 			 */</div><div class='del'>-			if (port-&gt;irq != AT91_ID_SYS)			/* is this a shared clock? */</div><div class='del'>-				at91_sys_write(AT91_PMC_PCDR, 1 &lt;&lt; port-&gt;irq);</div><div class='add'>+			clk_disable(at91_port-&gt;clk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk(KERN_ERR "at91_serial: unknown pm %d\n", state);</div><div class='hunk'>@@ -494,9 +522,9 @@ static void at91_set_termios(struct uart_port *port, struct termios * termios, s</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;port-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	port-&gt;read_status_mask |= AT91_US_OVRE;</div><div class='add'>+	port-&gt;read_status_mask = AT91_US_OVRE;</div><div class='ctx'> 	if (termios-&gt;c_iflag &amp; INPCK)</div><div class='del'>-		port-&gt;read_status_mask |= AT91_US_FRAME | AT91_US_PARE;</div><div class='add'>+		port-&gt;read_status_mask |= (AT91_US_FRAME | AT91_US_PARE);</div><div class='ctx'> 	if (termios-&gt;c_iflag &amp; (BRKINT | PARMRK))</div><div class='ctx'> 		port-&gt;read_status_mask |= AT91_US_RXBRK;</div><div class='ctx'> </div><div class='hunk'>@@ -552,7 +580,7 @@ static void at91_set_termios(struct uart_port *port, struct termios * termios, s</div><div class='ctx'>  */</div><div class='ctx'> static const char *at91_type(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	return (port-&gt;type == PORT_AT91RM9200) ? "AT91_SERIAL" : NULL;</div><div class='add'>+	return (port-&gt;type == PORT_AT91) ? "AT91_SERIAL" : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -560,8 +588,15 @@ static const char *at91_type(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_release_port(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	release_mem_region(port-&gt;mapbase,</div><div class='del'>-		(port-&gt;mapbase == AT91_VA_BASE_DBGU) ? 512 : SZ_16K);</div><div class='add'>+	struct platform_device *pdev = to_platform_device(port-&gt;dev);</div><div class='add'>+	int size = pdev-&gt;resource[0].end - pdev-&gt;resource[0].start + 1;</div><div class='add'>+</div><div class='add'>+	release_mem_region(port-&gt;mapbase, size);</div><div class='add'>+</div><div class='add'>+	if (port-&gt;flags &amp; UPF_IOREMAP) {</div><div class='add'>+		iounmap(port-&gt;membase);</div><div class='add'>+		port-&gt;membase = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -569,10 +604,21 @@ static void at91_release_port(struct uart_port *port)</div><div class='ctx'>  */</div><div class='ctx'> static int at91_request_port(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	return request_mem_region(port-&gt;mapbase,</div><div class='del'>-		(port-&gt;mapbase == AT91_VA_BASE_DBGU) ? 512 : SZ_16K,</div><div class='del'>-		"at91_serial") != NULL ? 0 : -EBUSY;</div><div class='add'>+	struct platform_device *pdev = to_platform_device(port-&gt;dev);</div><div class='add'>+	int size = pdev-&gt;resource[0].end - pdev-&gt;resource[0].start + 1;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region(port-&gt;mapbase, size, "at91_serial"))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;flags &amp; UPF_IOREMAP) {</div><div class='add'>+		port-&gt;membase = ioremap(port-&gt;mapbase, size);</div><div class='add'>+		if (port-&gt;membase == NULL) {</div><div class='add'>+			release_mem_region(port-&gt;mapbase, size);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -581,7 +627,7 @@ static int at91_request_port(struct uart_port *port)</div><div class='ctx'> static void at91_config_port(struct uart_port *port, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	if (flags &amp; UART_CONFIG_TYPE) {</div><div class='del'>-		port-&gt;type = PORT_AT91RM9200;</div><div class='add'>+		port-&gt;type = PORT_AT91;</div><div class='ctx'> 		at91_request_port(port);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -592,7 +638,7 @@ static void at91_config_port(struct uart_port *port, int flags)</div><div class='ctx'> static int at91_verify_port(struct uart_port *port, struct serial_struct *ser)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	if (ser-&gt;type != PORT_UNKNOWN &amp;&amp; ser-&gt;type != PORT_AT91RM9200)</div><div class='add'>+	if (ser-&gt;type != PORT_UNKNOWN &amp;&amp; ser-&gt;type != PORT_AT91)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	if (port-&gt;irq != ser-&gt;irq)</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -624,33 +670,47 @@ static struct uart_ops at91_pops = {</div><div class='ctx'> 	.type		= at91_type,</div><div class='ctx'> 	.release_port	= at91_release_port,</div><div class='ctx'> 	.request_port	= at91_request_port,</div><div class='del'>-	.config_port 	= at91_config_port,</div><div class='del'>-	.verify_port 	= at91_verify_port,</div><div class='add'>+	.config_port	= at91_config_port,</div><div class='add'>+	.verify_port	= at91_verify_port,</div><div class='ctx'> 	.pm		= at91_serial_pm,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct uart_port at91_ports[AT91_NR_UART];</div><div class='del'>-</div><div class='del'>-void __init at91_init_ports(void)</div><div class='add'>+/*</div><div class='add'>+ * Configure the port from the platform device resource info.</div><div class='add'>+ */</div><div class='add'>+static void __devinit at91_init_port(struct at91_uart_port *at91_port, struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	static int first = 1;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!first)</div><div class='del'>-		return;</div><div class='del'>-	first = 0;</div><div class='add'>+	struct uart_port *port = &amp;at91_port-&gt;uart;</div><div class='add'>+	struct at91_uart_data *data = pdev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	port-&gt;iotype	= UPIO_MEM;</div><div class='add'>+	port-&gt;flags     = UPF_BOOT_AUTOCONF;</div><div class='add'>+	port-&gt;ops	= &amp;at91_pops;</div><div class='add'>+	port-&gt;fifosize  = 1;</div><div class='add'>+	port-&gt;line	= pdev-&gt;id;</div><div class='add'>+	port-&gt;dev	= &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	port-&gt;mapbase	= pdev-&gt;resource[0].start;</div><div class='add'>+	port-&gt;irq	= pdev-&gt;resource[1].start;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;mapbase == AT91_VA_BASE_SYS + AT91_DBGU)		/* Part of system perpherals - already mapped */</div><div class='add'>+		port-&gt;membase = (void __iomem *) port-&gt;mapbase;</div><div class='add'>+	else {</div><div class='add'>+		port-&gt;flags	|= UPF_IOREMAP;</div><div class='add'>+		port-&gt;membase	= NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>-		at91_ports[i].iotype	= UPIO_MEM;</div><div class='del'>-		at91_ports[i].flags     = UPF_BOOT_AUTOCONF;</div><div class='del'>-		at91_ports[i].uartclk   = at91_master_clock;</div><div class='del'>-		at91_ports[i].ops	= &amp;at91_pops;</div><div class='del'>-		at91_ports[i].fifosize  = 1;</div><div class='del'>-		at91_ports[i].line	= i;</div><div class='del'>- 	}</div><div class='add'>+	if (!at91_port-&gt;clk) {		/* for console, the clock could already be configured */</div><div class='add'>+		at91_port-&gt;clk = clk_get(&amp;pdev-&gt;dev, "usart");</div><div class='add'>+		clk_enable(at91_port-&gt;clk);</div><div class='add'>+		port-&gt;uartclk = clk_get_rate(at91_port-&gt;clk);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __init at91_register_uart_fns(struct at91rm9200_port_fns *fns)</div><div class='add'>+/*</div><div class='add'>+ * Register board-specific modem-control line handlers.</div><div class='add'>+ */</div><div class='add'>+void __init at91_register_uart_fns(struct at91_port_fns *fns)</div><div class='ctx'> {</div><div class='ctx'> 	if (fns-&gt;enable_ms)</div><div class='ctx'> 		at91_pops.enable_ms = fns-&gt;enable_ms;</div><div class='hunk'>@@ -664,51 +724,6 @@ void __init at91_register_uart_fns(struct at91rm9200_port_fns *fns)</div><div class='ctx'> 	at91_pops.set_wake = fns-&gt;set_wake;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Setup ports.</div><div class='del'>- */</div><div class='del'>-void __init at91_register_uart(int idx, int port)</div><div class='del'>-{</div><div class='del'>-	if ((idx &lt; 0) || (idx &gt;= AT91_NR_UART)) {</div><div class='del'>-		printk(KERN_ERR "%s: bad index number %d\n", __FUNCTION__, idx);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 0:</div><div class='del'>-		at91_ports[idx].membase = (void __iomem *) AT91_VA_BASE_US0;</div><div class='del'>-		at91_ports[idx].mapbase = AT91_VA_BASE_US0;</div><div class='del'>-		at91_ports[idx].irq     = AT91_ID_US0;</div><div class='del'>-		AT91_CfgPIO_USART0();</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		at91_ports[idx].membase = (void __iomem *) AT91_VA_BASE_US1;</div><div class='del'>-		at91_ports[idx].mapbase = AT91_VA_BASE_US1;</div><div class='del'>-		at91_ports[idx].irq     = AT91_ID_US1;</div><div class='del'>-		AT91_CfgPIO_USART1();</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		at91_ports[idx].membase = (void __iomem *) AT91_VA_BASE_US2;</div><div class='del'>-		at91_ports[idx].mapbase = AT91_VA_BASE_US2;</div><div class='del'>-		at91_ports[idx].irq     = AT91_ID_US2;</div><div class='del'>-		AT91_CfgPIO_USART2();</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		at91_ports[idx].membase = (void __iomem *) AT91_VA_BASE_US3;</div><div class='del'>-		at91_ports[idx].mapbase = AT91_VA_BASE_US3;</div><div class='del'>-		at91_ports[idx].irq     = AT91_ID_US3;</div><div class='del'>-		AT91_CfgPIO_USART3();</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		at91_ports[idx].membase = (void __iomem *) AT91_VA_BASE_DBGU;</div><div class='del'>-		at91_ports[idx].mapbase = AT91_VA_BASE_DBGU;</div><div class='del'>-		at91_ports[idx].irq     = AT91_ID_SYS;</div><div class='del'>-		AT91_CfgPIO_DBGU();</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR  "%s : bad port number %d\n", __FUNCTION__, port);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_AT91_CONSOLE</div><div class='ctx'> static void at91_console_putchar(struct uart_port *port, int ch)</div><div class='hunk'>@@ -723,7 +738,7 @@ static void at91_console_putchar(struct uart_port *port, int ch)</div><div class='ctx'>  */</div><div class='ctx'> static void at91_console_write(struct console *co, const char *s, u_int count)</div><div class='ctx'> {</div><div class='del'>-	struct uart_port *port = at91_ports + co-&gt;index;</div><div class='add'>+	struct uart_port *port = &amp;at91_ports[co-&gt;index].uart;</div><div class='ctx'> 	unsigned int status, imr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -778,23 +793,15 @@ static void __init at91_console_get_options(struct uart_port *port, int *baud, i</div><div class='ctx'> </div><div class='ctx'> static int __init at91_console_setup(struct console *co, char *options)</div><div class='ctx'> {</div><div class='del'>-	struct uart_port *port;</div><div class='add'>+	struct uart_port *port = &amp;at91_ports[co-&gt;index].uart;</div><div class='ctx'> 	int baud = 115200;</div><div class='ctx'> 	int bits = 8;</div><div class='ctx'> 	int parity = 'n';</div><div class='ctx'> 	int flow = 'n';</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Check whether an invalid uart number has been specified, and</div><div class='del'>-	 * if so, search for the first available port that does have</div><div class='del'>-	 * console support.</div><div class='del'>-	 */</div><div class='del'>-	port = uart_get_console(at91_ports, AT91_NR_UART, co);</div><div class='add'>+	if (port-&gt;membase == 0)		/* Port not initialized yet - delay setup */</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Enable the serial console, in-case bootloader did not do it.</div><div class='del'>-	 */</div><div class='del'>-	at91_sys_write(AT91_PMC_PCER, 1 &lt;&lt; port-&gt;irq);	/* enable clock */</div><div class='ctx'> 	UART_PUT_IDR(port, -1);				/* disable interrupts */</div><div class='ctx'> 	UART_PUT_CR(port, AT91_US_RSTSTA | AT91_US_RSTRX);</div><div class='ctx'> 	UART_PUT_CR(port, AT91_US_TXEN | AT91_US_RXEN);</div><div class='hunk'>@@ -821,58 +828,147 @@ static struct console at91_console = {</div><div class='ctx'> </div><div class='ctx'> #define AT91_CONSOLE_DEVICE	&amp;at91_console</div><div class='ctx'> </div><div class='del'>-static int  __init at91_console_init(void)</div><div class='add'>+/*</div><div class='add'>+ * Early console initialization (before VM subsystem initialized).</div><div class='add'>+ */</div><div class='add'>+static int __init at91_console_init(void)</div><div class='ctx'> {</div><div class='del'>-	at91_init_ports();</div><div class='add'>+	if (at91_default_console_device) {</div><div class='add'>+		add_preferred_console(AT91_DEVICENAME, at91_default_console_device-&gt;id, NULL);</div><div class='add'>+		at91_init_port(&amp;(at91_ports[at91_default_console_device-&gt;id]), at91_default_console_device);</div><div class='add'>+		register_console(&amp;at91_console);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	at91_console.index = at91_console_port;</div><div class='del'>-	register_console(&amp;at91_console);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> console_initcall(at91_console_init);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Late console initialization.</div><div class='add'>+ */</div><div class='add'>+static int __init at91_late_console_init(void)</div><div class='add'>+{</div><div class='add'>+	if (at91_default_console_device &amp;&amp; !(at91_console.flags &amp; CON_ENABLED))</div><div class='add'>+		register_console(&amp;at91_console);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+core_initcall(at91_late_console_init);</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'> #define AT91_CONSOLE_DEVICE	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct uart_driver at91_uart = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='del'>-	.driver_name		= AT91_DEVICENAME,</div><div class='add'>+	.driver_name		= "at91_serial",</div><div class='ctx'> 	.dev_name		= AT91_DEVICENAME,</div><div class='del'>-	.devfs_name		= AT91_DEVICENAME,</div><div class='ctx'> 	.major			= SERIAL_AT91_MAJOR,</div><div class='ctx'> 	.minor			= MINOR_START,</div><div class='ctx'> 	.nr			= AT91_NR_UART,</div><div class='ctx'> 	.cons			= AT91_CONSOLE_DEVICE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init at91_serial_init(void)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int at91_serial_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	int ret, i;</div><div class='add'>+	struct uart_port *port = platform_get_drvdata(pdev);</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(&amp;pdev-&gt;dev) &amp;&amp; !at91_suspend_entering_slow_clock())</div><div class='add'>+		enable_irq_wake(port-&gt;irq);</div><div class='add'>+	else {</div><div class='add'>+		disable_irq_wake(port-&gt;irq);</div><div class='add'>+		uart_suspend_port(&amp;at91_uart, port);</div><div class='add'>+		at91_port-&gt;suspended = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	at91_init_ports();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ret = uart_register_driver(&amp;at91_uart);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+static int at91_serial_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct uart_port *port = platform_get_drvdata(pdev);</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>-		if (at91_serial_map[i] &gt;= 0)</div><div class='del'>-			uart_add_one_port(&amp;at91_uart, &amp;at91_ports[i]);</div><div class='add'>+	if (at91_port-&gt;suspended) {</div><div class='add'>+		uart_resume_port(&amp;at91_uart, port);</div><div class='add'>+		at91_port-&gt;suspended = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+#define at91_serial_suspend NULL</div><div class='add'>+#define at91_serial_resume NULL</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static void __exit at91_serial_exit(void)</div><div class='add'>+static int __devinit at91_serial_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct at91_uart_port *port;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; AT91_NR_UART; i++) {</div><div class='del'>- 		if (at91_serial_map[i] &gt;= 0)</div><div class='del'>-			uart_remove_one_port(&amp;at91_uart, &amp;at91_ports[i]);</div><div class='del'>-  	}</div><div class='add'>+	port = &amp;at91_ports[pdev-&gt;id];</div><div class='add'>+	at91_init_port(port, pdev);</div><div class='ctx'> </div><div class='add'>+	ret = uart_add_one_port(&amp;at91_uart, &amp;port-&gt;uart);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		device_init_wakeup(&amp;pdev-&gt;dev, 1);</div><div class='add'>+		platform_set_drvdata(pdev, port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit at91_serial_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct uart_port *port = platform_get_drvdata(pdev);</div><div class='add'>+	struct at91_uart_port *at91_port = (struct at91_uart_port *) port;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	clk_disable(at91_port-&gt;clk);</div><div class='add'>+	clk_put(at91_port-&gt;clk);</div><div class='add'>+</div><div class='add'>+	device_init_wakeup(&amp;pdev-&gt;dev, 0);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	if (port) {</div><div class='add'>+		ret = uart_remove_one_port(&amp;at91_uart, port);</div><div class='add'>+		kfree(port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver at91_serial_driver = {</div><div class='add'>+	.probe		= at91_serial_probe,</div><div class='add'>+	.remove		= __devexit_p(at91_serial_remove),</div><div class='add'>+	.suspend	= at91_serial_suspend,</div><div class='add'>+	.resume		= at91_serial_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "at91_usart",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init at91_serial_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = uart_register_driver(&amp;at91_uart);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;at91_serial_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		uart_unregister_driver(&amp;at91_uart);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit at91_serial_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;at91_serial_driver);</div><div class='ctx'> 	uart_unregister_driver(&amp;at91_uart);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c<br/>index 2691112c84ad..f27d852ce50d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/clps711x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/clps711x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/clps711x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/clps711x.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *  $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='head'>diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c<br/>index 5cba59ad7dc5..90ff96e3339b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/cpm_uart/cpm_uart_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/cpm_uart/cpm_uart_core.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c<br/>index 17406a05ce1f..95afc37297a8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/cpm_uart/cpm_uart_cpm1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/cpm_uart/cpm_uart_cpm1.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c<br/>index cdba128250a9..ef3bb476c432 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/cpm_uart/cpm_uart_cpm2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/cpm_uart/cpm_uart_cpm2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/cpm_uart/cpm_uart_cpm2.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c<br/>index 89700141f87e..cabd048c8636 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/crisv10.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/crisv10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/crisv10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/crisv10.c</a></div><div class='hunk'>@@ -415,7 +415,7 @@</div><div class='ctx'>  * Fixed DEF_TX value that caused the serial transmitter pin (txd) to go to 0 when</div><div class='ctx'>  * closing the last filehandle, NASTY!.</div><div class='ctx'>  * Added break generation, not tested though!</div><div class='del'>- * Use SA_SHIRQ when request_irq() for ser2 and ser3 (shared with) par0 and par1.</div><div class='add'>+ * Use IRQF_SHARED when request_irq() for ser2 and ser3 (shared with) par0 and par1.</div><div class='ctx'>  * You can't use them at the same time (yet..), but you can hopefully switch</div><div class='ctx'>  * between ser2/par0, ser3/par1 with the same kernel config.</div><div class='ctx'>  * Replaced some magic constants with defines</div><div class='hunk'>@@ -425,7 +425,6 @@</div><div class='ctx'> </div><div class='ctx'> static char *serial_version = "$Revision: 1.25 $";</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -2573,12 +2572,6 @@ static void flush_to_flip_buffer(struct e100_serial *info)</div><div class='ctx'> </div><div class='ctx'> 	DFLIP(</div><div class='ctx'> 	  if (1) {</div><div class='del'>-</div><div class='del'>-		  if (test_bit(TTY_DONT_FLIP, &amp;tty-&gt;flags)) {</div><div class='del'>-			  DEBUG_LOG(info-&gt;line, "*** TTY_DONT_FLIP set flip.count %i ***\n", tty-&gt;flip.count);</div><div class='del'>-			  DEBUG_LOG(info-&gt;line, "*** recv_cnt %i\n", info-&gt;recv_cnt);</div><div class='del'>-		  } else {</div><div class='del'>-		  }</div><div class='ctx'> 		  DEBUG_LOG(info-&gt;line, "*** rxtot %i\n", info-&gt;icount.rx);</div><div class='ctx'> 		  DEBUG_LOG(info-&gt;line, "ldisc %lu\n", tty-&gt;ldisc.chars_in_buffer(tty));</div><div class='ctx'> 		  DEBUG_LOG(info-&gt;line, "room  %lu\n", tty-&gt;ldisc.receive_room(tty));</div><div class='hunk'>@@ -4884,7 +4877,7 @@ rs_init(void)</div><div class='ctx'> 	driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	driver-&gt;init_termios.c_cflag =</div><div class='ctx'> 		B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */</div><div class='del'>-	driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	driver-&gt;termios = serial_termios;</div><div class='ctx'> 	driver-&gt;termios_locked = serial_termios_locked;</div><div class='ctx'> </div><div class='hunk'>@@ -4949,55 +4942,55 @@ rs_init(void)</div><div class='ctx'> 	/* Not needed in simulator.  May only complicate stuff. */</div><div class='ctx'> 	/* hook the irq's for DMA channel 6 and 7, serial output and input, and some more... */</div><div class='ctx'> </div><div class='del'>-	if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial ", NULL))</div><div class='add'>+	if (request_irq(SERIAL_IRQ_NBR, ser_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial ", NULL))</div><div class='ctx'> 		panic("irq8");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT0</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT</div><div class='del'>-	if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 0 dma tr", NULL))</div><div class='add'>+	if (request_irq(SER0_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_DISABLED, "serial 0 dma tr", NULL))</div><div class='ctx'> 		panic("irq22");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN</div><div class='del'>-	if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 0 dma rec", NULL))</div><div class='add'>+	if (request_irq(SER0_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_DISABLED, "serial 0 dma rec", NULL))</div><div class='ctx'> 		panic("irq23");</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT1</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT</div><div class='del'>-	if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, SA_INTERRUPT, "serial 1 dma tr", NULL))</div><div class='add'>+	if (request_irq(SER1_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_DISABLED, "serial 1 dma tr", NULL))</div><div class='ctx'> 		panic("irq24");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN</div><div class='del'>-	if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, SA_INTERRUPT, "serial 1 dma rec", NULL))</div><div class='add'>+	if (request_irq(SER1_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_DISABLED, "serial 1 dma rec", NULL))</div><div class='ctx'> 		panic("irq25");</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT2</div><div class='ctx'> 	/* DMA Shared with par0 (and SCSI0 and ATA) */</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT</div><div class='del'>-	if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma tr", NULL))</div><div class='add'>+	if (request_irq(SER2_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 2 dma tr", NULL))</div><div class='ctx'> 		panic("irq18");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN</div><div class='del'>-	if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 2 dma rec", NULL))</div><div class='add'>+	if (request_irq(SER2_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 2 dma rec", NULL))</div><div class='ctx'> 		panic("irq19");</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT3</div><div class='ctx'> 	/* DMA Shared with par1 (and SCSI1 and Extern DMA 0) */</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT</div><div class='del'>-	if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma tr", NULL))</div><div class='add'>+	if (request_irq(SER3_DMA_TX_IRQ_NBR, tr_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 3 dma tr", NULL))</div><div class='ctx'> 		panic("irq20");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN</div><div class='del'>-	if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, SA_SHIRQ | SA_INTERRUPT, "serial 3 dma rec", NULL))</div><div class='add'>+	if (request_irq(SER3_DMA_RX_IRQ_NBR, rec_interrupt, IRQF_SHARED | IRQF_DISABLED, "serial 3 dma rec", NULL))</div><div class='ctx'> 		panic("irq21");</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST</div><div class='del'>-	if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, SA_SHIRQ | SA_INTERRUPT,</div><div class='add'>+	if (request_irq(TIMER1_IRQ_NBR, timeout_interrupt, IRQF_SHARED | IRQF_DISABLED,</div><div class='ctx'> 		       "fast serial dma timeout", NULL)) {</div><div class='ctx'> 		printk(KERN_CRIT "err: timer1 irq\n");</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h<br/>index 1800c0e7531a..f30b93d6ef79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/crisv10.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/crisv10.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/crisv10.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/crisv10.h</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'> #ifndef _ETRAX_SERIAL_H</div><div class='ctx'> #define _ETRAX_SERIAL_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/circ_buf.h&gt;</div><div class='ctx'> #include &lt;asm/termios.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c<br/>index bf71bad5c34f..8a98aae80e22 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/dz.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/dz.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/dz.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/dz.c</a></div><div class='hunk'>@@ -26,7 +26,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_DZ</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -674,7 +673,7 @@ static void dz_reset(struct dz_port *dport)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_DZ_CONSOLE</div><div class='del'>-static void dz_console_putchar(struct uart_port *port, int ch)</div><div class='add'>+static void dz_console_putchar(struct uart_port *uport, int ch)</div><div class='ctx'> {</div><div class='ctx'> 	struct dz_port *dport = (struct dz_port *)uport;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -768,11 +767,7 @@ void __init dz_serial_console_init(void)</div><div class='ctx'> static struct uart_driver dz_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "serial",</div><div class='del'>-#ifdef CONFIG_DEVFS</div><div class='del'>-	.dev_name		= "tts/%d",</div><div class='del'>-#else</div><div class='ctx'> 	.dev_name		= "ttyS%d",</div><div class='del'>-#endif</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> 	.minor			= 64,</div><div class='ctx'> 	.nr			= DZ_NB_PORT,</div><div class='hunk'>@@ -802,7 +797,7 @@ int __init dz_init(void)</div><div class='ctx'> 	restore_flags(flags);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(dz_ports[0].port.irq, dz_interrupt,</div><div class='del'>-			SA_INTERRUPT, "DZ", &amp;dz_ports[0]))</div><div class='add'>+			IRQF_DISABLED, "DZ", &amp;dz_ports[0]))</div><div class='ctx'> 		panic("Unable to register DZ interrupt");</div><div class='ctx'> </div><div class='ctx'> 	ret = uart_register_driver(&amp;dz_reg);</div><div class='head'>diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c<br/>index 144a7a352b28..a3c00a252149 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/icom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/icom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/icom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/icom.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>   */</div><div class='ctx'> #define SERIAL_DO_RESTART</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -1564,7 +1563,7 @@ static int __devinit icom_probe(struct pci_dev *dev,</div><div class='ctx'> </div><div class='ctx'> 	 /* save off irq and request irq line */</div><div class='ctx'> 	 if ( (retval = request_irq(dev-&gt;irq, icom_interrupt,</div><div class='del'>-				   SA_INTERRUPT | SA_SHIRQ, ICOM_DRIVER_NAME,</div><div class='add'>+				   IRQF_DISABLED | IRQF_SHARED, ICOM_DRIVER_NAME,</div><div class='ctx'> 				   (void *) icom_adapter))) {</div><div class='ctx'> 		  goto probe_exit2;</div><div class='ctx'> 	 }</div><div class='head'>diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c<br/>index d202eb4f3848..4a142d6b8f38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/imx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/imx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/imx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/imx.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * [29-Mar-2005] Mike Lee</div><div class='ctx'>  * Added hardware handshake</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_IMX_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -405,7 +404,7 @@ static int imx_startup(struct uart_port *port)</div><div class='ctx'> 	if (retval) goto error_out2;</div><div class='ctx'> </div><div class='ctx'> 	retval = request_irq(sport-&gt;rtsirq, imx_rtsint,</div><div class='del'>-			     SA_TRIGGER_FALLING | SA_TRIGGER_RISING,</div><div class='add'>+			     IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,</div><div class='ctx'> 			     DRIVER_NAME, sport);</div><div class='ctx'> 	if (retval) goto error_out3;</div><div class='ctx'> </div><div class='hunk'>@@ -888,7 +887,6 @@ static struct uart_driver imx_reg = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.driver_name    = DRIVER_NAME,</div><div class='ctx'> 	.dev_name       = "ttySMX",</div><div class='del'>-	.devfs_name	= "ttsmx/",</div><div class='ctx'> 	.major          = SERIAL_IMX_MAJOR,</div><div class='ctx'> 	.minor          = MINOR_START,</div><div class='ctx'> 	.nr             = ARRAY_SIZE(imx_ports),</div><div class='head'>diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c<br/>index c620209d7b9a..576ca1eaa2b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/ioc4_serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/ioc4_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/ioc4_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/ioc4_serial.c</a></div><div class='hunk'>@@ -2646,7 +2646,10 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)</div><div class='ctx'> 	struct ioc4_port *port;</div><div class='ctx'> 	struct ioc4_soft *soft;</div><div class='ctx'> </div><div class='add'>+	/* If serial driver did not attach, don't try to detach */</div><div class='ctx'> 	control = idd-&gt;idd_serial_data;</div><div class='add'>+	if (!control)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (port_num = 0; port_num &lt; IOC4_NUM_SERIAL_PORTS; port_num++) {</div><div class='ctx'> 		for (port_type = UART_PORT_MIN;</div><div class='hunk'>@@ -2778,6 +2781,12 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)</div><div class='ctx'> 	DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, idd-&gt;idd_pdev,</div><div class='ctx'> 							idd-&gt;idd_pci_id));</div><div class='ctx'> </div><div class='add'>+	/* PCI-RT does not bring out serial connections.</div><div class='add'>+	 * Do not attach to this particular IOC4.</div><div class='add'>+	 */</div><div class='add'>+	if (idd-&gt;idd_variant == IOC4_VARIANT_PCI_RT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* request serial registers */</div><div class='ctx'> 	tmp_addr1 = idd-&gt;idd_bar0 + IOC4_SERIAL_OFFSET;</div><div class='ctx'> </div><div class='hunk'>@@ -2846,7 +2855,7 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)</div><div class='ctx'> 	control-&gt;ic_soft = soft;</div><div class='ctx'> </div><div class='ctx'> 	/* Hook up interrupt handler */</div><div class='del'>-	if (!request_irq(idd-&gt;idd_pdev-&gt;irq, ioc4_intr, SA_SHIRQ,</div><div class='add'>+	if (!request_irq(idd-&gt;idd_pdev-&gt;irq, ioc4_intr, IRQF_SHARED,</div><div class='ctx'> 				"sgi-ioc4serial", soft)) {</div><div class='ctx'> 		control-&gt;ic_irq = idd-&gt;idd_pdev-&gt;irq;</div><div class='ctx'> 	} else {</div><div class='head'>diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c<br/>index 651772474ac1..5ff269fb604c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/ip22zilog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/ip22zilog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/ip22zilog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/ip22zilog.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *  Copyright (C) 2002 Ralf Baechle (ralf@linux-mips.org)</div><div class='ctx'>  *  Copyright (C) 2002 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -1085,7 +1084,6 @@ static struct console ip22zilog_console = {</div><div class='ctx'> static struct uart_driver ip22zilog_reg = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.driver_name	= "serial",</div><div class='del'>-	.devfs_name	= "tts/",</div><div class='ctx'> 	.dev_name	= "ttyS",</div><div class='ctx'> 	.major		= TTY_MAJOR,</div><div class='ctx'> 	.minor		= 64,</div><div class='hunk'>@@ -1145,9 +1143,8 @@ static void __init ip22zilog_prepare(void)</div><div class='ctx'> 		up[(chip * 2) + 1].port.fifosize = 1;</div><div class='ctx'> 		up[(chip * 2) + 1].port.ops = &amp;ip22zilog_pops;</div><div class='ctx'> 		up[(chip * 2) + 1].port.type = PORT_IP22ZILOG;</div><div class='del'>-		up[(chip * 2) + 1].port.flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;</div><div class='ctx'> 		up[(chip * 2) + 1].port.line = (chip * 2) + 1;</div><div class='del'>-		up[(chip * 2) + 1].flags = 0;</div><div class='add'>+		up[(chip * 2) + 1].flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c<br/>index b3e1f71be4da..244f63be3a03 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/jsm/jsm_driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/jsm/jsm_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/jsm/jsm_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/jsm/jsm_driver.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = request_irq(brd-&gt;irq, brd-&gt;bd_ops-&gt;intr,</div><div class='del'>-			SA_INTERRUPT|SA_SHIRQ, "JSM", brd);</div><div class='add'>+			IRQF_DISABLED|IRQF_SHARED, "JSM", brd);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		printk(KERN_WARNING "Failed to hook IRQ %d\n",brd-&gt;irq);</div><div class='ctx'> 		goto out_iounmap;</div><div class='head'>diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c<br/>index 7d823705193c..f8262e6ad8d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/jsm/jsm_tty.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/jsm/jsm_tty.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/jsm/jsm_tty.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/jsm/jsm_tty.c</a></div><div class='hunk'>@@ -589,13 +589,6 @@ void jsm_input(struct jsm_channel *ch)</div><div class='ctx'> 	ld = tty_ldisc_ref(tp);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If the DONT_FLIP flag is on, don't flush our buffer, and act</div><div class='del'>-	 * like the ld doesn't have any space to put the data right now.</div><div class='del'>-	 */</div><div class='del'>-	if (test_bit(TTY_DONT_FLIP, &amp;tp-&gt;flags))</div><div class='del'>-		len = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='ctx'> 	 * If we were unable to get a reference to the ld,</div><div class='ctx'> 	 * don't flush our buffer, and act like the ld doesn't</div><div class='ctx'> 	 * have any space to put the data right now.</div><div class='head'>diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c<br/>index 321a40f33b50..e7fe4bb46eca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/m32r_sio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/m32r_sio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/m32r_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/m32r_sio.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *  membase is an 'ioremapped' cookie.  This is compatible with the old</div><div class='ctx'>  *  serial.c driver, and is currently the preferred form.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -543,7 +542,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_sio_port *up)</div><div class='ctx'> static int serial_link_irq_chain(struct uart_sio_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	struct irq_info *i = irq_lists + up-&gt;port.irq;</div><div class='del'>-	int ret, irq_flags = up-&gt;port.flags &amp; UPF_SHARE_IRQ ? SA_SHIRQ : 0;</div><div class='add'>+	int ret, irq_flags = up-&gt;port.flags &amp; UPF_SHARE_IRQ ? IRQF_SHARED : 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;i-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1131,7 +1130,6 @@ console_initcall(m32r_sio_console_init);</div><div class='ctx'> static struct uart_driver m32r_sio_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "sio",</div><div class='del'>-	.devfs_name		= "tts/",</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> 	.minor			= 64,</div><div class='head'>diff --git a/drivers/serial/m32r_sio.h b/drivers/serial/m32r_sio.h<br/>index 7c3ec24f7e50..849f1b2c2531 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/m32r_sio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/m32r_sio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/m32r_sio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/m32r_sio.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct m32r_sio_probe {</div><div class='ctx'> 	struct module	*owner;</div><div class='head'>diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/serial/m32r_sio_reg.h<br/>index 9c864529451b..4671473793e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/m32r_sio_reg.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/m32r_sio_reg.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/m32r_sio_reg.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/m32r_sio_reg.h</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #ifndef _M32R_SIO_REG_H</div><div class='ctx'> #define _M32R_SIO_REG_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIAL_M32R_PLDSIO</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c<br/>index 8cbbb954df2c..832abd3c4706 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/mcfserial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mcfserial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/mcfserial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/mcfserial.c</a></div><div class='hunk'>@@ -60,11 +60,11 @@ struct timer_list mcfrs_timer_struct;</div><div class='ctx'> #if defined(CONFIG_HW_FEITH)</div><div class='ctx'> #define	CONSOLE_BAUD_RATE	38400</div><div class='ctx'> #define	DEFAULT_CBAUD		B38400</div><div class='del'>-#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB)</div><div class='add'>+#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB) || defined(CONFIG_M5329EVB)</div><div class='ctx'> #define CONSOLE_BAUD_RATE 	115200</div><div class='ctx'> #define DEFAULT_CBAUD		B115200</div><div class='ctx'> #elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \</div><div class='del'>-      defined(CONFIG_senTec) || defined(CONFIG_SNEHA)</div><div class='add'>+      defined(CONFIG_senTec) || defined(CONFIG_SNEHA) || defined(CONFIG_AVNET)</div><div class='ctx'> #define	CONSOLE_BAUD_RATE	19200</div><div class='ctx'> #define	DEFAULT_CBAUD		B19200</div><div class='ctx'> #endif</div><div class='hunk'>@@ -93,7 +93,7 @@ static struct tty_driver *mcfrs_serial_driver;</div><div class='ctx'> #undef SERIAL_DEBUG_FLOW</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \</div><div class='del'>-    defined(CONFIG_M520x)</div><div class='add'>+    defined(CONFIG_M520x) || defined(CONFIG_M532x)</div><div class='ctx'> #define	IRQBASE	(MCFINT_VECBASE+MCFINT_UART0)</div><div class='ctx'> #else</div><div class='ctx'> #define	IRQBASE	73</div><div class='hunk'>@@ -1545,6 +1545,28 @@ static void mcfrs_irqinit(struct mcf_serial *info)</div><div class='ctx'> 			*feci2c_par |=  MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2</div><div class='ctx'> 				    | MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2;</div><div class='ctx'> 		}</div><div class='add'>+#elif defined(CONFIG_M532x)</div><div class='add'>+	volatile unsigned char *uartp;</div><div class='add'>+	uartp = info-&gt;addr;</div><div class='add'>+	switch (info-&gt;line) {</div><div class='add'>+	case 0:</div><div class='add'>+		MCF_INTC0_ICR26 = 0x3;</div><div class='add'>+		MCF_INTC0_CIMR = 26;</div><div class='add'>+		/* GPIO initialization */</div><div class='add'>+		MCF_GPIO_PAR_UART |= 0x000F;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		MCF_INTC0_ICR27 = 0x3;</div><div class='add'>+		MCF_INTC0_CIMR = 27;</div><div class='add'>+		/* GPIO initialization */</div><div class='add'>+		MCF_GPIO_PAR_UART |= 0x0FF0;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		MCF_INTC0_ICR28 = 0x3;</div><div class='add'>+		MCF_INTC0_CIMR = 28;</div><div class='add'>+		/* GPIOs also must be initalized, depends on board */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> #else</div><div class='ctx'> 	volatile unsigned char	*icrp, *uartp;</div><div class='ctx'> </div><div class='hunk'>@@ -1574,7 +1596,7 @@ static void mcfrs_irqinit(struct mcf_serial *info)</div><div class='ctx'> 	/* Clear mask, so no surprise interrupts. */</div><div class='ctx'> 	uartp[MCFUART_UIMR] = 0;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(info-&gt;irq, mcfrs_interrupt, SA_INTERRUPT,</div><div class='add'>+	if (request_irq(info-&gt;irq, mcfrs_interrupt, IRQF_DISABLED,</div><div class='ctx'> 	    "ColdFire UART", NULL)) {</div><div class='ctx'> 		printk("MCFRS: Unable to attach ColdFire UART %d interrupt "</div><div class='ctx'> 			"vector=%d\n", info-&gt;line, info-&gt;irq);</div><div class='hunk'>@@ -1691,7 +1713,6 @@ mcfrs_init(void)</div><div class='ctx'> 	/* Initialize the tty_driver structure */</div><div class='ctx'> 	mcfrs_serial_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	mcfrs_serial_driver-&gt;name = "ttyS";</div><div class='del'>-	mcfrs_serial_driver-&gt;devfs_name = "ttys/";</div><div class='ctx'> 	mcfrs_serial_driver-&gt;driver_name = "serial";</div><div class='ctx'> 	mcfrs_serial_driver-&gt;major = TTY_MAJOR;</div><div class='ctx'> 	mcfrs_serial_driver-&gt;minor_start = 64;</div><div class='head'>diff --git a/drivers/serial/mcfserial.h b/drivers/serial/mcfserial.h<br/>index a2b28e8629f9..56420e2cb110 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/mcfserial.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mcfserial.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/mcfserial.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/mcfserial.h</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #ifndef _MCF_SERIAL_H</div><div class='ctx'> #define _MCF_SERIAL_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='head'>diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c<br/>index 6459edc7f5c5..7708e5dd3656 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/mpc52xx_uart.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mpc52xx_uart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/mpc52xx_uart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/mpc52xx_uart.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * will be mapped to.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='hunk'>@@ -191,7 +190,7 @@ mpc52xx_uart_startup(struct uart_port *port)</div><div class='ctx'> </div><div class='ctx'> 	/* Request IRQ */</div><div class='ctx'> 	ret = request_irq(port-&gt;irq, mpc52xx_uart_int,</div><div class='del'>-		SA_INTERRUPT | SA_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);</div><div class='add'>+		IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -693,7 +692,6 @@ static struct uart_driver mpc52xx_uart_driver = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.driver_name	= "mpc52xx_psc_uart",</div><div class='ctx'> 	.dev_name	= "ttyPSC",</div><div class='del'>-	.devfs_name	= "ttyPSC",</div><div class='ctx'> 	.major		= SERIAL_PSC_MAJOR,</div><div class='ctx'> 	.minor		= SERIAL_PSC_MINOR,</div><div class='ctx'> 	.nr		= MPC52xx_PSC_MAXNUM,</div><div class='hunk'>@@ -728,8 +726,7 @@ mpc52xx_uart_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;port-&gt;lock);</div><div class='ctx'> 	port-&gt;uartclk	= __res.bi_ipbfreq / 2; /* Look at CTLR doc */</div><div class='del'>-	port-&gt;fifosize	= 255; /* Should be 512 ! But it can't be */</div><div class='del'>-	                       /* stored in a unsigned char       */</div><div class='add'>+	port-&gt;fifosize	= 512;</div><div class='ctx'> 	port-&gt;iotype	= UPIO_MEM;</div><div class='ctx'> 	port-&gt;flags	= UPF_BOOT_AUTOCONF |</div><div class='ctx'> 			  ( uart_console(port) ? 0 : UPF_IOREMAP );</div><div class='head'>diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c<br/>index 94681922ea0a..63d2a66e563b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/mpsc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mpsc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/mpsc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/mpsc.c</a></div><div class='hunk'>@@ -50,7 +50,6 @@</div><div class='ctx'>  * 4) AFAICT, hardware flow control isn't supported by the controller --MAG.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_MPSC_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -315,7 +314,6 @@ struct mpsc_port_info *mpsc_device_remove(int index);</div><div class='ctx'> #define MPSC_MAJOR		204</div><div class='ctx'> #define MPSC_MINOR_START	44</div><div class='ctx'> #define	MPSC_DRIVER_NAME	"MPSC"</div><div class='del'>-#define	MPSC_DEVFS_NAME		"ttymm/"</div><div class='ctx'> #define	MPSC_DEV_NAME		"ttyMM"</div><div class='ctx'> #define	MPSC_VERSION		"1.00"</div><div class='ctx'> </div><div class='hunk'>@@ -1414,7 +1412,7 @@ mpsc_startup(struct uart_port *port)</div><div class='ctx'> </div><div class='ctx'> 		/* If irq's are shared, need to set flag */</div><div class='ctx'> 		if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq)</div><div class='del'>-			flag = SA_SHIRQ;</div><div class='add'>+			flag = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 		if (request_irq(pi-&gt;port.irq, mpsc_sdma_intr, flag,</div><div class='ctx'> 				"mpsc-sdma", pi))</div><div class='hunk'>@@ -1863,7 +1861,6 @@ static struct platform_driver mpsc_shared_driver = {</div><div class='ctx'> static struct uart_driver mpsc_reg = {</div><div class='ctx'> 	.owner       = THIS_MODULE,</div><div class='ctx'> 	.driver_name = MPSC_DRIVER_NAME,</div><div class='del'>-	.devfs_name  = MPSC_DEVFS_NAME,</div><div class='ctx'> 	.dev_name    = MPSC_DEV_NAME,</div><div class='ctx'> 	.major       = MPSC_MAJOR,</div><div class='ctx'> 	.minor       = MPSC_MINOR_START,</div><div class='head'>diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c<br/>index 64c0e89124c9..4a1c9983f38f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/mux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/mux.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> **</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c<br/>new file mode 100644<br/>index 000000000000..c1adc9e4b239<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/netx-serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/netx-serial.c</a></div><div class='hunk'>@@ -0,0 +1,749 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/serial/netx-serial.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2</div><div class='add'>+ * as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_SERIAL_NETX_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='add'>+#define SUPPORT_SYSRQ</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/sysrq.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/tty_flip.h&gt;</div><div class='add'>+#include &lt;linux/serial_core.h&gt;</div><div class='add'>+#include &lt;linux/serial.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/irq.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+#include &lt;asm/arch/netx-regs.h&gt;</div><div class='add'>+</div><div class='add'>+/* We've been assigned a range on the "Low-density serial ports" major */</div><div class='add'>+#define SERIAL_NX_MAJOR	204</div><div class='add'>+#define MINOR_START	170</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SERIAL_NETX_CONSOLE</div><div class='add'>+</div><div class='add'>+enum uart_regs {</div><div class='add'>+	UART_DR              = 0x00,</div><div class='add'>+	UART_SR              = 0x04,</div><div class='add'>+	UART_LINE_CR         = 0x08,</div><div class='add'>+	UART_BAUDDIV_MSB     = 0x0c,</div><div class='add'>+	UART_BAUDDIV_LSB     = 0x10,</div><div class='add'>+	UART_CR              = 0x14,</div><div class='add'>+	UART_FR              = 0x18,</div><div class='add'>+	UART_IIR             = 0x1c,</div><div class='add'>+	UART_ILPR            = 0x20,</div><div class='add'>+	UART_RTS_CR          = 0x24,</div><div class='add'>+	UART_RTS_LEAD        = 0x28,</div><div class='add'>+	UART_RTS_TRAIL       = 0x2c,</div><div class='add'>+	UART_DRV_ENABLE      = 0x30,</div><div class='add'>+	UART_BRM_CR          = 0x34,</div><div class='add'>+	UART_RXFIFO_IRQLEVEL = 0x38,</div><div class='add'>+	UART_TXFIFO_IRQLEVEL = 0x3c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SR_FE (1&lt;&lt;0)</div><div class='add'>+#define SR_PE (1&lt;&lt;1)</div><div class='add'>+#define SR_BE (1&lt;&lt;2)</div><div class='add'>+#define SR_OE (1&lt;&lt;3)</div><div class='add'>+</div><div class='add'>+#define LINE_CR_BRK       (1&lt;&lt;0)</div><div class='add'>+#define LINE_CR_PEN       (1&lt;&lt;1)</div><div class='add'>+#define LINE_CR_EPS       (1&lt;&lt;2)</div><div class='add'>+#define LINE_CR_STP2      (1&lt;&lt;3)</div><div class='add'>+#define LINE_CR_FEN       (1&lt;&lt;4)</div><div class='add'>+#define LINE_CR_5BIT      (0&lt;&lt;5)</div><div class='add'>+#define LINE_CR_6BIT      (1&lt;&lt;5)</div><div class='add'>+#define LINE_CR_7BIT      (2&lt;&lt;5)</div><div class='add'>+#define LINE_CR_8BIT      (3&lt;&lt;5)</div><div class='add'>+#define LINE_CR_BITS_MASK (3&lt;&lt;5)</div><div class='add'>+</div><div class='add'>+#define CR_UART_EN (1&lt;&lt;0)</div><div class='add'>+#define CR_SIREN   (1&lt;&lt;1)</div><div class='add'>+#define CR_SIRLP   (1&lt;&lt;2)</div><div class='add'>+#define CR_MSIE    (1&lt;&lt;3)</div><div class='add'>+#define CR_RIE     (1&lt;&lt;4)</div><div class='add'>+#define CR_TIE     (1&lt;&lt;5)</div><div class='add'>+#define CR_RTIE    (1&lt;&lt;6)</div><div class='add'>+#define CR_LBE     (1&lt;&lt;7)</div><div class='add'>+</div><div class='add'>+#define FR_CTS  (1&lt;&lt;0)</div><div class='add'>+#define FR_DSR  (1&lt;&lt;1)</div><div class='add'>+#define FR_DCD  (1&lt;&lt;2)</div><div class='add'>+#define FR_BUSY (1&lt;&lt;3)</div><div class='add'>+#define FR_RXFE (1&lt;&lt;4)</div><div class='add'>+#define FR_TXFF (1&lt;&lt;5)</div><div class='add'>+#define FR_RXFF (1&lt;&lt;6)</div><div class='add'>+#define FR_TXFE (1&lt;&lt;7)</div><div class='add'>+</div><div class='add'>+#define IIR_MIS (1&lt;&lt;0)</div><div class='add'>+#define IIR_RIS (1&lt;&lt;1)</div><div class='add'>+#define IIR_TIS (1&lt;&lt;2)</div><div class='add'>+#define IIR_RTIS (1&lt;&lt;3)</div><div class='add'>+#define IIR_MASK 0xf</div><div class='add'>+</div><div class='add'>+#define RTS_CR_AUTO (1&lt;&lt;0)</div><div class='add'>+#define RTS_CR_RTS  (1&lt;&lt;1)</div><div class='add'>+#define RTS_CR_COUNT (1&lt;&lt;2)</div><div class='add'>+#define RTS_CR_MOD2  (1&lt;&lt;3)</div><div class='add'>+#define RTS_CR_RTS_POL (1&lt;&lt;4)</div><div class='add'>+#define RTS_CR_CTS_CTR (1&lt;&lt;5)</div><div class='add'>+#define RTS_CR_CTS_POL (1&lt;&lt;6)</div><div class='add'>+#define RTS_CR_STICK   (1&lt;&lt;7)</div><div class='add'>+</div><div class='add'>+#define UART_PORT_SIZE 0x40</div><div class='add'>+#define DRIVER_NAME "netx-uart"</div><div class='add'>+</div><div class='add'>+struct netx_port {</div><div class='add'>+	struct uart_port	port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void netx_stop_tx(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	val = readl(port-&gt;membase + UART_CR);</div><div class='add'>+	writel(val &amp; ~CR_TIE,  port-&gt;membase + UART_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_stop_rx(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	val = readl(port-&gt;membase + UART_CR);</div><div class='add'>+	writel(val &amp; ~CR_RIE,  port-&gt;membase + UART_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_enable_ms(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	val = readl(port-&gt;membase + UART_CR);</div><div class='add'>+	writel(val | CR_MSIE, port-&gt;membase + UART_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void netx_transmit_buffer(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	struct circ_buf *xmit = &amp;port-&gt;info-&gt;xmit;</div><div class='add'>+</div><div class='add'>+	if (port-&gt;x_char) {</div><div class='add'>+		writel(port-&gt;x_char, port-&gt;membase + UART_DR);</div><div class='add'>+		port-&gt;icount.tx++;</div><div class='add'>+		port-&gt;x_char = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (uart_tx_stopped(port) || uart_circ_empty(xmit)) {</div><div class='add'>+		netx_stop_tx(port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/* send xmit-&gt;buf[xmit-&gt;tail]</div><div class='add'>+		 * out the port here */</div><div class='add'>+		writel(xmit-&gt;buf[xmit-&gt;tail], port-&gt;membase + UART_DR);</div><div class='add'>+		xmit-&gt;tail = (xmit-&gt;tail + 1) &amp;</div><div class='add'>+		         (UART_XMIT_SIZE - 1);</div><div class='add'>+		port-&gt;icount.tx++;</div><div class='add'>+		if (uart_circ_empty(xmit))</div><div class='add'>+			break;</div><div class='add'>+	} while (!(readl(port-&gt;membase + UART_FR) &amp; FR_TXFF));</div><div class='add'>+</div><div class='add'>+	if (uart_circ_empty(xmit))</div><div class='add'>+		netx_stop_tx(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_start_tx(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	writel(</div><div class='add'>+	    readl(port-&gt;membase + UART_CR) | CR_TIE, port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+	if (!(readl(port-&gt;membase + UART_FR) &amp; FR_TXFF))</div><div class='add'>+		netx_transmit_buffer(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int netx_tx_empty(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return readl(port-&gt;membase + UART_FR) &amp; FR_BUSY ? 0 : TIOCSER_TEMT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_txint(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	struct circ_buf *xmit = &amp;port-&gt;info-&gt;xmit;</div><div class='add'>+</div><div class='add'>+	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {</div><div class='add'>+		netx_stop_tx(port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netx_transmit_buffer(port);</div><div class='add'>+</div><div class='add'>+	if (uart_circ_chars_pending(xmit) &lt; WAKEUP_CHARS)</div><div class='add'>+		uart_write_wakeup(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_rxint(struct uart_port *port, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	unsigned char rx, flg, status;</div><div class='add'>+	struct tty_struct *tty = port-&gt;info-&gt;tty;</div><div class='add'>+</div><div class='add'>+	while (!(readl(port-&gt;membase + UART_FR) &amp; FR_RXFE)) {</div><div class='add'>+		rx = readl(port-&gt;membase + UART_DR);</div><div class='add'>+		flg = TTY_NORMAL;</div><div class='add'>+		port-&gt;icount.rx++;</div><div class='add'>+		status = readl(port-&gt;membase + UART_SR);</div><div class='add'>+		if (status &amp; SR_BE) {</div><div class='add'>+			writel(0, port-&gt;membase + UART_SR);</div><div class='add'>+			if (uart_handle_break(port))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (unlikely(status &amp; (SR_FE | SR_PE | SR_OE))) {</div><div class='add'>+</div><div class='add'>+			if (status &amp; SR_PE)</div><div class='add'>+				port-&gt;icount.parity++;</div><div class='add'>+			else if (status &amp; SR_FE)</div><div class='add'>+				port-&gt;icount.frame++;</div><div class='add'>+			if (status &amp; SR_OE)</div><div class='add'>+				port-&gt;icount.overrun++;</div><div class='add'>+</div><div class='add'>+			status &amp;= port-&gt;read_status_mask;</div><div class='add'>+</div><div class='add'>+			if (status &amp; SR_BE)</div><div class='add'>+				flg = TTY_BREAK;</div><div class='add'>+			else if (status &amp; SR_PE)</div><div class='add'>+				flg = TTY_PARITY;</div><div class='add'>+			else if (status &amp; SR_FE)</div><div class='add'>+				flg = TTY_FRAME;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (uart_handle_sysrq_char(port, rx, regs))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		uart_insert_char(port, status, SR_OE, rx, flg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tty_flip_buffer_push(tty);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t netx_int(int irq, void *dev_id, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct uart_port *port = (struct uart_port *)dev_id;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned char status;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;port-&gt;lock,flags);</div><div class='add'>+</div><div class='add'>+	status = readl(port-&gt;membase + UART_IIR) &amp; IIR_MASK;</div><div class='add'>+	while (status) {</div><div class='add'>+		if (status &amp; IIR_RIS)</div><div class='add'>+			netx_rxint(port, regs);</div><div class='add'>+		if (status &amp; IIR_TIS)</div><div class='add'>+			netx_txint(port);</div><div class='add'>+		if (status &amp; IIR_MIS) {</div><div class='add'>+			if (readl(port-&gt;membase + UART_FR) &amp; FR_CTS)</div><div class='add'>+				uart_handle_cts_change(port, 1);</div><div class='add'>+			else</div><div class='add'>+				uart_handle_cts_change(port, 0);</div><div class='add'>+		}</div><div class='add'>+		writel(0, port-&gt;membase + UART_IIR);</div><div class='add'>+		status = readl(port-&gt;membase + UART_IIR) &amp; IIR_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;port-&gt;lock,flags);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int netx_get_mctrl(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	unsigned int ret = TIOCM_DSR | TIOCM_CAR;</div><div class='add'>+</div><div class='add'>+	if (readl(port-&gt;membase + UART_FR) &amp; FR_CTS)</div><div class='add'>+		ret |= TIOCM_CTS;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_set_mctrl(struct uart_port *port, unsigned int mctrl)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (mctrl &amp; TIOCM_RTS) {</div><div class='add'>+		val = readl(port-&gt;membase + UART_RTS_CR);</div><div class='add'>+		writel(val | RTS_CR_RTS, port-&gt;membase + UART_RTS_CR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_break_ctl(struct uart_port *port, int break_state)</div><div class='add'>+{</div><div class='add'>+	unsigned int line_cr;</div><div class='add'>+	spin_lock_irq(&amp;port-&gt;lock);</div><div class='add'>+</div><div class='add'>+	line_cr = readl(port-&gt;membase + UART_LINE_CR);</div><div class='add'>+	if (break_state != 0)</div><div class='add'>+		line_cr |= LINE_CR_BRK;</div><div class='add'>+	else</div><div class='add'>+		line_cr &amp;= ~LINE_CR_BRK;</div><div class='add'>+	writel(line_cr, port-&gt;membase + UART_LINE_CR);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;port-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_startup(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(port-&gt;irq, netx_int, 0,</div><div class='add'>+			     DRIVER_NAME, port);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(port-&gt;dev, "unable to grab irq%d\n",port-&gt;irq);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(readl(port-&gt;membase + UART_LINE_CR) | LINE_CR_FEN,</div><div class='add'>+		port-&gt;membase + UART_LINE_CR);</div><div class='add'>+</div><div class='add'>+	writel(CR_MSIE | CR_RIE | CR_TIE | CR_RTIE | CR_UART_EN,</div><div class='add'>+		port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_shutdown(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	writel(0, port-&gt;membase + UART_CR) ;</div><div class='add'>+</div><div class='add'>+	free_irq(port-&gt;irq, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_set_termios(struct uart_port *port, struct termios *termios,</div><div class='add'>+		   struct termios *old)</div><div class='add'>+{</div><div class='add'>+	unsigned int baud, quot;</div><div class='add'>+	unsigned char old_cr;</div><div class='add'>+	unsigned char line_cr = LINE_CR_FEN;</div><div class='add'>+	unsigned char rts_cr = 0;</div><div class='add'>+</div><div class='add'>+	switch (termios-&gt;c_cflag &amp; CSIZE) {</div><div class='add'>+	case CS5:</div><div class='add'>+		line_cr |= LINE_CR_5BIT;</div><div class='add'>+		break;</div><div class='add'>+	case CS6:</div><div class='add'>+		line_cr |= LINE_CR_6BIT;</div><div class='add'>+		break;</div><div class='add'>+	case CS7:</div><div class='add'>+		line_cr |= LINE_CR_7BIT;</div><div class='add'>+		break;</div><div class='add'>+	case CS8:</div><div class='add'>+		line_cr |= LINE_CR_8BIT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (termios-&gt;c_cflag &amp; CSTOPB)</div><div class='add'>+		line_cr |= LINE_CR_STP2;</div><div class='add'>+</div><div class='add'>+	if (termios-&gt;c_cflag &amp; PARENB) {</div><div class='add'>+		line_cr |= LINE_CR_PEN;</div><div class='add'>+		if (!(termios-&gt;c_cflag &amp; PARODD))</div><div class='add'>+			line_cr |= LINE_CR_EPS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (termios-&gt;c_cflag &amp; CRTSCTS)</div><div class='add'>+		rts_cr = RTS_CR_AUTO | RTS_CR_CTS_CTR | RTS_CR_RTS_POL;</div><div class='add'>+</div><div class='add'>+	baud = uart_get_baud_rate(port, termios, old, 0, port-&gt;uartclk/16);</div><div class='add'>+	quot = baud * 4096;</div><div class='add'>+	quot /= 1000;</div><div class='add'>+	quot *= 256;</div><div class='add'>+	quot /= 100000;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;port-&gt;lock);</div><div class='add'>+</div><div class='add'>+	uart_update_timeout(port, termios-&gt;c_cflag, baud);</div><div class='add'>+</div><div class='add'>+	old_cr = readl(port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+	/* disable interrupts */</div><div class='add'>+	writel(old_cr &amp; ~(CR_MSIE | CR_RIE | CR_TIE | CR_RTIE),</div><div class='add'>+		port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+	/* drain transmitter */</div><div class='add'>+	while (readl(port-&gt;membase + UART_FR) &amp; FR_BUSY);</div><div class='add'>+</div><div class='add'>+	/* disable UART */</div><div class='add'>+	writel(old_cr &amp; ~CR_UART_EN, port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+	/* modem status interrupts */</div><div class='add'>+	old_cr &amp;= ~CR_MSIE;</div><div class='add'>+	if (UART_ENABLE_MS(port, termios-&gt;c_cflag))</div><div class='add'>+		old_cr |= CR_MSIE;</div><div class='add'>+</div><div class='add'>+	writel((quot&gt;&gt;8) &amp; 0xff, port-&gt;membase + UART_BAUDDIV_MSB);</div><div class='add'>+	writel(quot &amp; 0xff, port-&gt;membase + UART_BAUDDIV_LSB);</div><div class='add'>+	writel(line_cr, port-&gt;membase + UART_LINE_CR);</div><div class='add'>+</div><div class='add'>+	writel(rts_cr, port-&gt;membase + UART_RTS_CR);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Characters to ignore</div><div class='add'>+	 */</div><div class='add'>+	port-&gt;ignore_status_mask = 0;</div><div class='add'>+	if (termios-&gt;c_iflag &amp; IGNPAR)</div><div class='add'>+		port-&gt;ignore_status_mask |= SR_PE;</div><div class='add'>+	if (termios-&gt;c_iflag &amp; IGNBRK) {</div><div class='add'>+		port-&gt;ignore_status_mask |= SR_BE;</div><div class='add'>+		/*</div><div class='add'>+		 * If we're ignoring parity and break indicators,</div><div class='add'>+		 * ignore overruns too (for real raw support).</div><div class='add'>+		 */</div><div class='add'>+		if (termios-&gt;c_iflag &amp; IGNPAR)</div><div class='add'>+			port-&gt;ignore_status_mask |= SR_PE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port-&gt;read_status_mask = 0;</div><div class='add'>+	if (termios-&gt;c_iflag &amp; (BRKINT | PARMRK))</div><div class='add'>+		port-&gt;read_status_mask |= SR_BE;</div><div class='add'>+	if (termios-&gt;c_iflag &amp; INPCK)</div><div class='add'>+		port-&gt;read_status_mask |= SR_PE | SR_FE;</div><div class='add'>+</div><div class='add'>+	writel(old_cr, port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;port-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *netx_type(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return port-&gt;type == PORT_NETX ? "NETX" : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_release_port(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	release_mem_region(port-&gt;mapbase, UART_PORT_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int netx_request_port(struct uart_port *port)</div><div class='add'>+{</div><div class='add'>+	return request_mem_region(port-&gt;mapbase, UART_PORT_SIZE,</div><div class='add'>+			DRIVER_NAME) != NULL ? 0 : -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void netx_config_port(struct uart_port *port, int flags)</div><div class='add'>+{</div><div class='add'>+	if (flags &amp; UART_CONFIG_TYPE &amp;&amp; netx_request_port(port) == 0)</div><div class='add'>+		port-&gt;type = PORT_NETX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+netx_verify_port(struct uart_port *port, struct serial_struct *ser)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (ser-&gt;type != PORT_UNKNOWN &amp;&amp; ser-&gt;type != PORT_NETX)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct uart_ops netx_pops = {</div><div class='add'>+	.tx_empty	= netx_tx_empty,</div><div class='add'>+	.set_mctrl	= netx_set_mctrl,</div><div class='add'>+	.get_mctrl	= netx_get_mctrl,</div><div class='add'>+	.stop_tx	= netx_stop_tx,</div><div class='add'>+	.start_tx	= netx_start_tx,</div><div class='add'>+	.stop_rx	= netx_stop_rx,</div><div class='add'>+	.enable_ms	= netx_enable_ms,</div><div class='add'>+	.break_ctl	= netx_break_ctl,</div><div class='add'>+	.startup	= netx_startup,</div><div class='add'>+	.shutdown	= netx_shutdown,</div><div class='add'>+	.set_termios	= netx_set_termios,</div><div class='add'>+	.type		= netx_type,</div><div class='add'>+	.release_port	= netx_release_port,</div><div class='add'>+	.request_port	= netx_request_port,</div><div class='add'>+	.config_port	= netx_config_port,</div><div class='add'>+	.verify_port	= netx_verify_port,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct netx_port netx_ports[] = {</div><div class='add'>+	{</div><div class='add'>+	.port = {</div><div class='add'>+		.type = PORT_NETX,</div><div class='add'>+		.iotype = UPIO_MEM,</div><div class='add'>+		.membase = (char __iomem *)io_p2v(NETX_PA_UART0),</div><div class='add'>+		.mapbase = NETX_PA_UART0,</div><div class='add'>+		.irq = NETX_IRQ_UART0,</div><div class='add'>+		.uartclk = 100000000,</div><div class='add'>+		.fifosize = 16,</div><div class='add'>+		.flags = UPF_BOOT_AUTOCONF,</div><div class='add'>+		.ops = &amp;netx_pops,</div><div class='add'>+		.line = 0,</div><div class='add'>+	},</div><div class='add'>+	}, {</div><div class='add'>+	.port = {</div><div class='add'>+		.type = PORT_NETX,</div><div class='add'>+		.iotype = UPIO_MEM,</div><div class='add'>+		.membase = (char __iomem *)io_p2v(NETX_PA_UART1),</div><div class='add'>+		.mapbase = NETX_PA_UART1,</div><div class='add'>+		.irq = NETX_IRQ_UART1,</div><div class='add'>+		.uartclk = 100000000,</div><div class='add'>+		.fifosize = 16,</div><div class='add'>+		.flags = UPF_BOOT_AUTOCONF,</div><div class='add'>+		.ops = &amp;netx_pops,</div><div class='add'>+		.line = 1,</div><div class='add'>+	},</div><div class='add'>+	}, {</div><div class='add'>+	.port = {</div><div class='add'>+		.type = PORT_NETX,</div><div class='add'>+		.iotype = UPIO_MEM,</div><div class='add'>+		.membase = (char __iomem *)io_p2v(NETX_PA_UART2),</div><div class='add'>+		.mapbase = NETX_PA_UART2,</div><div class='add'>+		.irq = NETX_IRQ_UART2,</div><div class='add'>+		.uartclk = 100000000,</div><div class='add'>+		.fifosize = 16,</div><div class='add'>+		.flags = UPF_BOOT_AUTOCONF,</div><div class='add'>+		.ops = &amp;netx_pops,</div><div class='add'>+		.line = 2,</div><div class='add'>+	},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void netx_console_putchar(struct uart_port *port, int ch)</div><div class='add'>+{</div><div class='add'>+	while (readl(port-&gt;membase + UART_FR) &amp; FR_BUSY);</div><div class='add'>+	writel(ch, port-&gt;membase + UART_DR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+netx_console_write(struct console *co, const char *s, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct uart_port *port = &amp;netx_ports[co-&gt;index].port;</div><div class='add'>+	unsigned char cr_save;</div><div class='add'>+</div><div class='add'>+	cr_save = readl(port-&gt;membase + UART_CR);</div><div class='add'>+	writel(cr_save | CR_UART_EN, port-&gt;membase + UART_CR);</div><div class='add'>+</div><div class='add'>+	uart_console_write(port, s, count, netx_console_putchar);</div><div class='add'>+</div><div class='add'>+	while (readl(port-&gt;membase + UART_FR) &amp; FR_BUSY);</div><div class='add'>+	writel(cr_save, port-&gt;membase + UART_CR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init</div><div class='add'>+netx_console_get_options(struct uart_port *port, int *baud,</div><div class='add'>+			int *parity, int *bits, int *flow)</div><div class='add'>+{</div><div class='add'>+	unsigned char line_cr;</div><div class='add'>+</div><div class='add'>+	*baud = (readl(port-&gt;membase + UART_BAUDDIV_MSB) &lt;&lt; 8) |</div><div class='add'>+		readl(port-&gt;membase + UART_BAUDDIV_LSB);</div><div class='add'>+	*baud *= 1000;</div><div class='add'>+	*baud /= 4096;</div><div class='add'>+	*baud *= 1000;</div><div class='add'>+	*baud /= 256;</div><div class='add'>+	*baud *= 100;</div><div class='add'>+</div><div class='add'>+	line_cr = readl(port-&gt;membase + UART_LINE_CR);</div><div class='add'>+	*parity = 'n';</div><div class='add'>+	if (line_cr &amp; LINE_CR_PEN) {</div><div class='add'>+		if (line_cr &amp; LINE_CR_EPS)</div><div class='add'>+			*parity = 'e';</div><div class='add'>+		else</div><div class='add'>+			*parity = 'o';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (line_cr &amp; LINE_CR_BITS_MASK) {</div><div class='add'>+	case LINE_CR_8BIT:</div><div class='add'>+		*bits = 8;</div><div class='add'>+		break;</div><div class='add'>+	case LINE_CR_7BIT:</div><div class='add'>+		*bits = 7;</div><div class='add'>+		break;</div><div class='add'>+	case LINE_CR_6BIT:</div><div class='add'>+		*bits = 6;</div><div class='add'>+		break;</div><div class='add'>+	case LINE_CR_5BIT:</div><div class='add'>+		*bits = 5;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (readl(port-&gt;membase + UART_RTS_CR) &amp; RTS_CR_AUTO)</div><div class='add'>+		*flow = 'r';</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+netx_console_setup(struct console *co, char *options)</div><div class='add'>+{</div><div class='add'>+	struct netx_port *sport;</div><div class='add'>+	int baud = 9600;</div><div class='add'>+	int bits = 8;</div><div class='add'>+	int parity = 'n';</div><div class='add'>+	int flow = 'n';</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether an invalid uart number has been specified, and</div><div class='add'>+	 * if so, search for the first available port that does have</div><div class='add'>+	 * console support.</div><div class='add'>+	 */</div><div class='add'>+	if (co-&gt;index == -1 || co-&gt;index &gt;= ARRAY_SIZE(netx_ports))</div><div class='add'>+		co-&gt;index = 0;</div><div class='add'>+	sport = &amp;netx_ports[co-&gt;index];</div><div class='add'>+</div><div class='add'>+	if (options) {</div><div class='add'>+		uart_parse_options(options, &amp;baud, &amp;parity, &amp;bits, &amp;flow);</div><div class='add'>+	} else {</div><div class='add'>+		/* if the UART is enabled, assume it has been correctly setup</div><div class='add'>+		 * by the bootloader and get the options</div><div class='add'>+		 */</div><div class='add'>+		if (readl(sport-&gt;port.membase + UART_CR) &amp; CR_UART_EN) {</div><div class='add'>+			netx_console_get_options(&amp;sport-&gt;port, &amp;baud,</div><div class='add'>+			&amp;parity, &amp;bits, &amp;flow);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return uart_set_options(&amp;sport-&gt;port, co, baud, parity, bits, flow);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct uart_driver netx_reg;</div><div class='add'>+static struct console netx_console = {</div><div class='add'>+	.name		= "ttyNX",</div><div class='add'>+	.write		= netx_console_write,</div><div class='add'>+	.device		= uart_console_device,</div><div class='add'>+	.setup		= netx_console_setup,</div><div class='add'>+	.flags		= CON_PRINTBUFFER,</div><div class='add'>+	.index		= -1,</div><div class='add'>+	.data		= &amp;netx_reg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init netx_console_init(void)</div><div class='add'>+{</div><div class='add'>+	register_console(&amp;netx_console);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+console_initcall(netx_console_init);</div><div class='add'>+</div><div class='add'>+#define NETX_CONSOLE	&amp;netx_console</div><div class='add'>+#else</div><div class='add'>+#define NETX_CONSOLE	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct uart_driver netx_reg = {</div><div class='add'>+	.owner          = THIS_MODULE,</div><div class='add'>+	.driver_name    = DRIVER_NAME,</div><div class='add'>+	.dev_name       = "ttyNX",</div><div class='add'>+	.major          = SERIAL_NX_MAJOR,</div><div class='add'>+	.minor          = MINOR_START,</div><div class='add'>+	.nr             = ARRAY_SIZE(netx_ports),</div><div class='add'>+	.cons           = NETX_CONSOLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int serial_netx_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct netx_port *sport = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (sport)</div><div class='add'>+		uart_suspend_port(&amp;netx_reg, &amp;sport-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serial_netx_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct netx_port *sport = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (sport)</div><div class='add'>+		uart_resume_port(&amp;netx_reg, &amp;sport-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serial_netx_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct uart_port *port = &amp;netx_ports[pdev-&gt;id].port;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "initialising\n");</div><div class='add'>+</div><div class='add'>+	port-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	writel(1, port-&gt;membase + UART_RXFIFO_IRQLEVEL);</div><div class='add'>+	uart_add_one_port(&amp;netx_reg, &amp;netx_ports[pdev-&gt;id].port);</div><div class='add'>+	platform_set_drvdata(pdev, &amp;netx_ports[pdev-&gt;id]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int serial_netx_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct netx_port *sport = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	if (sport)</div><div class='add'>+		uart_remove_one_port(&amp;netx_reg, &amp;sport-&gt;port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver serial_netx_driver = {</div><div class='add'>+	.probe          = serial_netx_probe,</div><div class='add'>+	.remove         = serial_netx_remove,</div><div class='add'>+</div><div class='add'>+	.suspend	= serial_netx_suspend,</div><div class='add'>+	.resume		= serial_netx_resume,</div><div class='add'>+</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name   = DRIVER_NAME,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init netx_serial_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "Serial: NetX driver\n");</div><div class='add'>+</div><div class='add'>+	ret = uart_register_driver(&amp;netx_reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = platform_driver_register(&amp;serial_netx_driver);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		uart_unregister_driver(&amp;netx_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit netx_serial_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;serial_netx_driver);</div><div class='add'>+	uart_unregister_driver(&amp;netx_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(netx_serial_init);</div><div class='add'>+module_exit(netx_serial_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sascha Hauer");</div><div class='add'>+MODULE_DESCRIPTION("NetX serial port driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c<br/>index 513ff8597707..bfd2a22759eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/pmac_zilog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/pmac_zilog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/pmac_zilog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/pmac_zilog.c</a></div><div class='hunk'>@@ -42,7 +42,6 @@</div><div class='ctx'> #undef DEBUG_HARD</div><div class='ctx'> #undef USE_CTRL_O_SYSRQ</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -101,7 +100,6 @@ static DEFINE_MUTEX(pmz_irq_mutex);</div><div class='ctx'> static struct uart_driver pmz_uart_reg = {</div><div class='ctx'> 	.owner		=	THIS_MODULE,</div><div class='ctx'> 	.driver_name	=	"ttyS",</div><div class='del'>-	.devfs_name	=	"tts/",</div><div class='ctx'> 	.dev_name	=	"ttyS",</div><div class='ctx'> 	.major		=	TTY_MAJOR,</div><div class='ctx'> };</div><div class='hunk'>@@ -936,7 +934,7 @@ static int pmz_startup(struct uart_port *port)</div><div class='ctx'> 	}	</div><div class='ctx'> </div><div class='ctx'> 	pmz_get_port_A(uap)-&gt;flags |= PMACZILOG_FLAG_IS_IRQ_ON;</div><div class='del'>-	if (request_irq(uap-&gt;port.irq, pmz_interrupt, SA_SHIRQ, "PowerMac Zilog", uap)) {</div><div class='add'>+	if (request_irq(uap-&gt;port.irq, pmz_interrupt, IRQF_SHARED, "PowerMac Zilog", uap)) {</div><div class='ctx'> 		dev_err(&amp;uap-&gt;dev-&gt;ofdev.dev,</div><div class='ctx'> 			"Unable to register zs interrupt handler.\n");</div><div class='ctx'> 		pmz_set_scc_power(uap, 0);</div><div class='hunk'>@@ -1445,8 +1443,8 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)</div><div class='ctx'> 			uap-&gt;flags &amp;= ~PMACZILOG_FLAG_HAS_DMA;</div><div class='ctx'> 			goto no_dma;</div><div class='ctx'> 		}</div><div class='del'>-		uap-&gt;tx_dma_irq = np-&gt;intrs[1].line;</div><div class='del'>-		uap-&gt;rx_dma_irq = np-&gt;intrs[2].line;</div><div class='add'>+		uap-&gt;tx_dma_irq = irq_of_parse_and_map(np, 1);</div><div class='add'>+		uap-&gt;rx_dma_irq = irq_of_parse_and_map(np, 2);</div><div class='ctx'> 	}</div><div class='ctx'> no_dma:</div><div class='ctx'> </div><div class='hunk'>@@ -1493,7 +1491,7 @@ no_dma:</div><div class='ctx'> 	 * Init remaining bits of "port" structure</div><div class='ctx'> 	 */</div><div class='ctx'> 	uap-&gt;port.iotype = UPIO_MEM;</div><div class='del'>-	uap-&gt;port.irq = np-&gt;intrs[0].line;</div><div class='add'>+	uap-&gt;port.irq = irq_of_parse_and_map(np, 0);</div><div class='ctx'> 	uap-&gt;port.uartclk = ZS_CLOCK;</div><div class='ctx'> 	uap-&gt;port.fifosize = 1;</div><div class='ctx'> 	uap-&gt;port.ops = &amp;pmz_pops;</div><div class='head'>diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c<br/>index 77d4568ccc3a..a720953a404e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/pxa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/pxa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/pxa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/pxa.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  * with the serial core maintainer satisfaction to appear soon.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_PXA_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -269,7 +268,6 @@ static unsigned int serial_pxa_get_mctrl(struct uart_port *port)</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> 	unsigned int ret;</div><div class='ctx'> </div><div class='del'>-return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;</div><div class='ctx'> 	status = serial_in(up, UART_MSR);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='hunk'>@@ -391,7 +389,7 @@ static int serial_pxa_startup(struct uart_port *port)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Finally, enable interrupts.  Note: Modem status interrupts</div><div class='del'>-	 * are set via set_termios(), which will be occuring imminently</div><div class='add'>+	 * are set via set_termios(), which will be occurring imminently</div><div class='ctx'> 	 * anyway, so we don't enable them here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	up-&gt;ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE;</div><div class='hunk'>@@ -781,7 +779,6 @@ static struct uart_pxa_port serial_pxa_ports[] = {</div><div class='ctx'> static struct uart_driver serial_pxa_reg = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.driver_name	= "PXA serial",</div><div class='del'>-	.devfs_name	= "tts/",</div><div class='ctx'> 	.dev_name	= "ttyS",</div><div class='ctx'> 	.major		= TTY_MAJOR,</div><div class='ctx'> 	.minor		= 64,</div><div class='head'>diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c<br/>index f5aac92fb798..392bffcf96e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/s3c2410.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/s3c2410.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'>  * BJD, 04-Nov-2004</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_S3C2410_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -149,7 +148,6 @@ s3c24xx_serial_dbg(const char *fmt, ...)</div><div class='ctx'> /* UART name and device definitions */</div><div class='ctx'> </div><div class='ctx'> #define S3C24XX_SERIAL_NAME	"ttySAC"</div><div class='del'>-#define S3C24XX_SERIAL_DEVFS    "tts/"</div><div class='ctx'> #define S3C24XX_SERIAL_MAJOR	204</div><div class='ctx'> #define S3C24XX_SERIAL_MINOR	64</div><div class='ctx'> </div><div class='hunk'>@@ -872,6 +870,8 @@ static const char *s3c24xx_serial_type(struct uart_port *port)</div><div class='ctx'> 		return "S3C2410";</div><div class='ctx'> 	case PORT_S3C2440:</div><div class='ctx'> 		return "S3C2440";</div><div class='add'>+	case PORT_S3C2412:</div><div class='add'>+		return "S3C2412";</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -950,7 +950,6 @@ static struct uart_driver s3c24xx_uart_drv = {</div><div class='ctx'> 	.nr		= 3,</div><div class='ctx'> 	.cons		= S3C24XX_SERIAL_CONSOLE,</div><div class='ctx'> 	.driver_name	= S3C24XX_SERIAL_NAME,</div><div class='del'>-	.devfs_name	= S3C24XX_SERIAL_DEVFS,</div><div class='ctx'> 	.major		= S3C24XX_SERIAL_MAJOR,</div><div class='ctx'> 	.minor		= S3C24XX_SERIAL_MINOR,</div><div class='ctx'> };</div><div class='hunk'>@@ -1365,7 +1364,7 @@ static inline void s3c2410_serial_exit(void)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_CPU_S3C2410 */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CPU_S3C2440</div><div class='add'>+#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)</div><div class='ctx'> </div><div class='ctx'> static int s3c2440_serial_setsource(struct uart_port *port,</div><div class='ctx'> 				     struct s3c24xx_uart_clksrc *clk)</div><div class='hunk'>@@ -1528,6 +1527,141 @@ static inline void s3c2440_serial_exit(void)</div><div class='ctx'> #define s3c2440_uart_inf_at NULL</div><div class='ctx'> #endif /* CONFIG_CPU_S3C2440 */</div><div class='ctx'> </div><div class='add'>+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)</div><div class='add'>+</div><div class='add'>+static int s3c2412_serial_setsource(struct uart_port *port,</div><div class='add'>+				     struct s3c24xx_uart_clksrc *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long ucon = rd_regl(port, S3C2410_UCON);</div><div class='add'>+</div><div class='add'>+	ucon &amp;= ~S3C2412_UCON_CLKMASK;</div><div class='add'>+</div><div class='add'>+	if (strcmp(clk-&gt;name, "uclk") == 0)</div><div class='add'>+		ucon |= S3C2440_UCON_UCLK;</div><div class='add'>+	else if (strcmp(clk-&gt;name, "pclk") == 0)</div><div class='add'>+		ucon |= S3C2440_UCON_PCLK;</div><div class='add'>+	else if (strcmp(clk-&gt;name, "usysclk") == 0)</div><div class='add'>+		ucon |= S3C2412_UCON_USYSCLK;</div><div class='add'>+	else {</div><div class='add'>+		printk(KERN_ERR "unknown clock source %s\n", clk-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wr_regl(port, S3C2410_UCON, ucon);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int s3c2412_serial_getsource(struct uart_port *port,</div><div class='add'>+				    struct s3c24xx_uart_clksrc *clk)</div><div class='add'>+{</div><div class='add'>+	unsigned long ucon = rd_regl(port, S3C2410_UCON);</div><div class='add'>+</div><div class='add'>+	switch (ucon &amp; S3C2412_UCON_CLKMASK) {</div><div class='add'>+	case S3C2412_UCON_UCLK:</div><div class='add'>+		clk-&gt;divisor = 1;</div><div class='add'>+		clk-&gt;name = "uclk";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case S3C2412_UCON_PCLK:</div><div class='add'>+	case S3C2412_UCON_PCLK2:</div><div class='add'>+		clk-&gt;divisor = 1;</div><div class='add'>+		clk-&gt;name = "pclk";</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case S3C2412_UCON_USYSCLK:</div><div class='add'>+		clk-&gt;divisor = 1;</div><div class='add'>+		clk-&gt;name = "usysclk";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int s3c2412_serial_resetport(struct uart_port *port,</div><div class='add'>+				    struct s3c2410_uartcfg *cfg)</div><div class='add'>+{</div><div class='add'>+	unsigned long ucon = rd_regl(port, S3C2410_UCON);</div><div class='add'>+</div><div class='add'>+	dbg("%s: port=%p (%08lx), cfg=%p\n",</div><div class='add'>+	    __FUNCTION__, port, port-&gt;mapbase, cfg);</div><div class='add'>+</div><div class='add'>+	/* ensure we don't change the clock settings... */</div><div class='add'>+</div><div class='add'>+	ucon &amp;= S3C2412_UCON_CLKMASK;</div><div class='add'>+</div><div class='add'>+	wr_regl(port, S3C2410_UCON,  ucon | cfg-&gt;ucon);</div><div class='add'>+	wr_regl(port, S3C2410_ULCON, cfg-&gt;ulcon);</div><div class='add'>+</div><div class='add'>+	/* reset both fifos */</div><div class='add'>+</div><div class='add'>+	wr_regl(port, S3C2410_UFCON, cfg-&gt;ufcon | S3C2410_UFCON_RESETBOTH);</div><div class='add'>+	wr_regl(port, S3C2410_UFCON, cfg-&gt;ufcon);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct s3c24xx_uart_info s3c2412_uart_inf = {</div><div class='add'>+	.name		= "Samsung S3C2412 UART",</div><div class='add'>+	.type		= PORT_S3C2412,</div><div class='add'>+	.fifosize	= 64,</div><div class='add'>+	.rx_fifomask	= S3C2440_UFSTAT_RXMASK,</div><div class='add'>+	.rx_fifoshift	= S3C2440_UFSTAT_RXSHIFT,</div><div class='add'>+	.rx_fifofull	= S3C2440_UFSTAT_RXFULL,</div><div class='add'>+	.tx_fifofull	= S3C2440_UFSTAT_TXFULL,</div><div class='add'>+	.tx_fifomask	= S3C2440_UFSTAT_TXMASK,</div><div class='add'>+	.tx_fifoshift	= S3C2440_UFSTAT_TXSHIFT,</div><div class='add'>+	.get_clksrc	= s3c2412_serial_getsource,</div><div class='add'>+	.set_clksrc	= s3c2412_serial_setsource,</div><div class='add'>+	.reset_port	= s3c2412_serial_resetport,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* device management */</div><div class='add'>+</div><div class='add'>+static int s3c2412_serial_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	dbg("s3c2440_serial_probe: dev=%p\n", dev);</div><div class='add'>+	return s3c24xx_serial_probe(dev, &amp;s3c2440_uart_inf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver s3c2412_serial_drv = {</div><div class='add'>+	.probe		= s3c2412_serial_probe,</div><div class='add'>+	.remove		= s3c24xx_serial_remove,</div><div class='add'>+	.suspend	= s3c24xx_serial_suspend,</div><div class='add'>+	.resume		= s3c24xx_serial_resume,</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "s3c2412-uart",</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline int s3c2412_serial_init(void)</div><div class='add'>+{</div><div class='add'>+	return s3c24xx_serial_init(&amp;s3c2412_serial_drv, &amp;s3c2412_uart_inf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void s3c2412_serial_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;s3c2412_serial_drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define s3c2412_uart_inf_at &amp;s3c2412_uart_inf</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int s3c2412_serial_init(void)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void s3c2412_serial_exit(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define s3c2412_uart_inf_at NULL</div><div class='add'>+#endif /* CONFIG_CPU_S3C2440 */</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* module initialisation code */</div><div class='ctx'> </div><div class='ctx'> static int __init s3c24xx_serial_modinit(void)</div><div class='hunk'>@@ -1542,6 +1676,7 @@ static int __init s3c24xx_serial_modinit(void)</div><div class='ctx'> </div><div class='ctx'> 	s3c2400_serial_init();</div><div class='ctx'> 	s3c2410_serial_init();</div><div class='add'>+	s3c2412_serial_init();</div><div class='ctx'> 	s3c2440_serial_init();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1551,6 +1686,7 @@ static void __exit s3c24xx_serial_modexit(void)</div><div class='ctx'> {</div><div class='ctx'> 	s3c2400_serial_exit();</div><div class='ctx'> 	s3c2410_serial_exit();</div><div class='add'>+	s3c2412_serial_exit();</div><div class='ctx'> 	s3c2440_serial_exit();</div><div class='ctx'> </div><div class='ctx'> 	uart_unregister_driver(&amp;s3c24xx_uart_drv);</div><div class='hunk'>@@ -1773,6 +1909,8 @@ static int s3c24xx_serial_initconsole(void)</div><div class='ctx'> 		info = s3c2410_uart_inf_at;</div><div class='ctx'> 	} else if (strcmp(dev-&gt;name, "s3c2440-uart") == 0) {</div><div class='ctx'> 		info = s3c2440_uart_inf_at;</div><div class='add'>+	} else if (strcmp(dev-&gt;name, "s3c2412-uart") == 0) {</div><div class='add'>+		info = s3c2412_uart_inf_at;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		printk(KERN_ERR "s3c24xx: no driver for %s\n", dev-&gt;name);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1796,4 +1934,4 @@ console_initcall(s3c24xx_serial_initconsole);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Ben Dooks &lt;ben@simtec.co.uk&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Samsung S3C2410/S3C2440 Serial port driver");</div><div class='add'>+MODULE_DESCRIPTION("Samsung S3C2410/S3C2440/S3C2412 Serial port driver");</div><div class='head'>diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c<br/>index c2d9068b491d..db3486d33870 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sa1100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sa1100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sa1100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sa1100.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *  $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_SA1100_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -816,7 +815,6 @@ static struct uart_driver sa1100_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "ttySA",</div><div class='ctx'> 	.dev_name		= "ttySA",</div><div class='del'>-	.devfs_name		= "ttySA",</div><div class='ctx'> 	.major			= SERIAL_SA1100_MAJOR,</div><div class='ctx'> 	.minor			= MINOR_START,</div><div class='ctx'> 	.nr			= NR_PORTS,</div><div class='head'>diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c<br/>index 17839e753e4c..80ef7d482756 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/serial_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/serial_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/serial_core.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -50,6 +49,12 @@</div><div class='ctx'>  */</div><div class='ctx'> static DEFINE_MUTEX(port_mutex);</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * lockdep: port-&gt;lock is initialized in two places, but we</div><div class='add'>+ *          want only one lock-class:</div><div class='add'>+ */</div><div class='add'>+static struct lock_class_key port_lock_key;</div><div class='add'>+</div><div class='ctx'> #define HIGH_BITS_OFFSET	((sizeof(long)-sizeof(int))*8)</div><div class='ctx'> </div><div class='ctx'> #define uart_users(state)	((state)-&gt;count + ((state)-&gt;info ? (state)-&gt;info-&gt;blocked_open : 0))</div><div class='hunk'>@@ -691,7 +696,8 @@ static int uart_set_info(struct uart_state *state,</div><div class='ctx'> 		    (new_serial.baud_base != port-&gt;uartclk / 16) ||</div><div class='ctx'> 		    (close_delay != state-&gt;close_delay) ||</div><div class='ctx'> 		    (closing_wait != state-&gt;closing_wait) ||</div><div class='del'>-		    (new_serial.xmit_fifo_size != port-&gt;fifosize) ||</div><div class='add'>+		    (new_serial.xmit_fifo_size &amp;&amp;</div><div class='add'>+		     new_serial.xmit_fifo_size != port-&gt;fifosize) ||</div><div class='ctx'> 		    (((new_flags ^ old_flags) &amp; ~UPF_USR_MASK) != 0))</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		port-&gt;flags = ((port-&gt;flags &amp; ~UPF_USR_MASK) |</div><div class='hunk'>@@ -796,7 +802,8 @@ static int uart_set_info(struct uart_state *state,</div><div class='ctx'> 	port-&gt;custom_divisor   = new_serial.custom_divisor;</div><div class='ctx'> 	state-&gt;close_delay     = close_delay;</div><div class='ctx'> 	state-&gt;closing_wait    = closing_wait;</div><div class='del'>-	port-&gt;fifosize         = new_serial.xmit_fifo_size;</div><div class='add'>+	if (new_serial.xmit_fifo_size)</div><div class='add'>+		port-&gt;fifosize = new_serial.xmit_fifo_size;</div><div class='ctx'> 	if (state-&gt;info-&gt;tty)</div><div class='ctx'> 		state-&gt;info-&gt;tty-&gt;low_latency =</div><div class='ctx'> 			(port-&gt;flags &amp; UPF_LOW_LATENCY) ? 1 : 0;</div><div class='hunk'>@@ -1866,6 +1873,7 @@ uart_set_options(struct uart_port *port, struct console *co,</div><div class='ctx'> 	 * early.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_init(&amp;port-&gt;lock);</div><div class='add'>+	lockdep_set_class(&amp;port-&gt;lock, &amp;port_lock_key);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;termios, 0, sizeof(struct termios));</div><div class='ctx'> </div><div class='hunk'>@@ -2028,6 +2036,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)</div><div class='ctx'> 	case UPIO_MEM:</div><div class='ctx'> 	case UPIO_MEM32:</div><div class='ctx'> 	case UPIO_AU:</div><div class='add'>+	case UPIO_TSI:</div><div class='ctx'> 		snprintf(address, sizeof(address),</div><div class='ctx'> 			 "MMIO 0x%lx", port-&gt;mapbase);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2153,7 +2162,6 @@ int uart_register_driver(struct uart_driver *drv)</div><div class='ctx'> </div><div class='ctx'> 	normal-&gt;owner		= drv-&gt;owner;</div><div class='ctx'> 	normal-&gt;driver_name	= drv-&gt;driver_name;</div><div class='del'>-	normal-&gt;devfs_name	= drv-&gt;devfs_name;</div><div class='ctx'> 	normal-&gt;name		= drv-&gt;dev_name;</div><div class='ctx'> 	normal-&gt;major		= drv-&gt;major;</div><div class='ctx'> 	normal-&gt;minor_start	= drv-&gt;minor;</div><div class='hunk'>@@ -2161,7 +2169,7 @@ int uart_register_driver(struct uart_driver *drv)</div><div class='ctx'> 	normal-&gt;subtype		= SERIAL_TYPE_NORMAL;</div><div class='ctx'> 	normal-&gt;init_termios	= tty_std_termios;</div><div class='ctx'> 	normal-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-	normal-&gt;flags		= TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	normal-&gt;flags		= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	normal-&gt;driver_state    = drv;</div><div class='ctx'> 	tty_set_operations(normal, &amp;uart_ops);</div><div class='ctx'> </div><div class='hunk'>@@ -2249,8 +2257,10 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)</div><div class='ctx'> 	 * If this port is a console, then the spinlock is already</div><div class='ctx'> 	 * initialised.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(uart_console(port) &amp;&amp; (port-&gt;cons-&gt;flags &amp; CON_ENABLED)))</div><div class='add'>+	if (!(uart_console(port) &amp;&amp; (port-&gt;cons-&gt;flags &amp; CON_ENABLED))) {</div><div class='ctx'> 		spin_lock_init(&amp;port-&gt;lock);</div><div class='add'>+		lockdep_set_class(&amp;port-&gt;lock, &amp;port_lock_key);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	uart_configure_port(drv, state, port);</div><div class='ctx'> </div><div class='hunk'>@@ -2312,7 +2322,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)</div><div class='ctx'> 	mutex_unlock(&amp;state-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Remove the devices from devfs</div><div class='add'>+	 * Remove the devices from the tty layer</div><div class='ctx'> 	 */</div><div class='ctx'> 	tty_unregister_device(drv-&gt;tty_driver, port-&gt;line);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c<br/>index 2c70773543e0..cbf260bc225d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/serial_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/serial_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/serial_cs.c</a></div><div class='hunk'>@@ -786,6 +786,7 @@ static struct pcmcia_device_id serial_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),</div><div class='ctx'> 	PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),</div><div class='ctx'> 	PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),</div><div class='add'>+	PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),</div><div class='ctx'> 	/* too generic */</div><div class='ctx'> 	/* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */</div><div class='ctx'> 	/* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */</div><div class='head'>diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c<br/>index aa521b8e0d4e..23ddedbaec08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/serial_lh7a40x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_lh7a40x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/serial_lh7a40x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/serial_lh7a40x.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_LH7A40X_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -145,14 +144,15 @@ lh7a40xuart_rx_chars (struct uart_port* port)</div><div class='ctx'> {</div><div class='ctx'> 	struct tty_struct* tty = port-&gt;info-&gt;tty;</div><div class='ctx'> 	int cbRxMax = 256;	/* (Gross) limit on receive */</div><div class='del'>-	unsigned int data, flag;/* Received data and status */</div><div class='add'>+	unsigned int data;	/* Received data and status */</div><div class='add'>+	unsigned int flag;</div><div class='ctx'> </div><div class='ctx'> 	while (!(UR (port, UART_R_STATUS) &amp; nRxRdy) &amp;&amp; --cbRxMax) {</div><div class='ctx'> 		data = UR (port, UART_R_DATA);</div><div class='ctx'> 		flag = TTY_NORMAL;</div><div class='ctx'> 		++port-&gt;icount.rx;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(data &amp; RxError)) {	/* Quick check, short-circuit */</div><div class='add'>+		if (unlikely(data &amp; RxError)) {</div><div class='ctx'> 			if (data &amp; RxBreak) {</div><div class='ctx'> 				data &amp;= ~(RxFramingError | RxParityError);</div><div class='ctx'> 				++port-&gt;icount.brk;</div><div class='hunk'>@@ -303,7 +303,7 @@ static void lh7a40xuart_set_mctrl (struct uart_port* port, unsigned int mctrl)</div><div class='ctx'> 	/* Note, kernel appears to be setting DTR and RTS on console. */</div><div class='ctx'> </div><div class='ctx'> 	/* *** FIXME: this deserves more work.  There's some work in</div><div class='del'>-               tracing all of the IO pins. */</div><div class='add'>+	       tracing all of the IO pins. */</div><div class='ctx'> #if 0</div><div class='ctx'> 	if( port-&gt;mapbase == UART1_PHYS) {</div><div class='ctx'> 		gpioRegs_t *gpio = (gpioRegs_t *)IO_ADDRESS(GPIO_PHYS);</div><div class='hunk'>@@ -662,9 +662,13 @@ static int __init lh7a40xuart_init(void)</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; DEV_NR; i++)</div><div class='add'>+		for (i = 0; i &lt; DEV_NR; i++) {</div><div class='add'>+			/* UART3, when used, requires GPIO pin reallocation */</div><div class='add'>+			if (lh7a40x_ports[i].port.mapbase == UART3_PHYS)</div><div class='add'>+				GPIO_PINMUX |= 1&lt;&lt;3;</div><div class='ctx'> 			uart_add_one_port (&amp;lh7a40x_reg,</div><div class='ctx'> 					   &amp;lh7a40x_ports[i].port);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c<br/>index 3bdee64d1a99..b361669f85a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/serial_txx9.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/serial_txx9.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/serial_txx9.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/serial_txx9.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  *		Fix some spin_locks.</div><div class='ctx'>  *		Do not call uart_add_one_port for absent ports.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_TXX9_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -69,12 +68,10 @@ static char *serial_name = "TX39/49 Serial driver";</div><div class='ctx'> #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL)</div><div class='ctx'> /* "ttyS" is used for standard serial driver */</div><div class='ctx'> #define TXX9_TTY_NAME "ttyTX"</div><div class='del'>-#define TXX9_TTY_DEVFS_NAME "tttx/"</div><div class='ctx'> #define TXX9_TTY_MINOR_START	(64 + 64)	/* ttyTX0(128), ttyTX1(129) */</div><div class='ctx'> #else</div><div class='ctx'> /* acts like standard serial driver */</div><div class='ctx'> #define TXX9_TTY_NAME "ttyS"</div><div class='del'>-#define TXX9_TTY_DEVFS_NAME "tts/"</div><div class='ctx'> #define TXX9_TTY_MINOR_START	64</div><div class='ctx'> #endif</div><div class='ctx'> #define TXX9_TTY_MAJOR	TTY_MAJOR</div><div class='hunk'>@@ -498,7 +495,7 @@ static int serial_txx9_startup(struct uart_port *port)</div><div class='ctx'> 	sio_out(up, TXX9_SIDISR, 0);</div><div class='ctx'> </div><div class='ctx'> 	retval = request_irq(up-&gt;port.irq, serial_txx9_interrupt,</div><div class='del'>-			     SA_SHIRQ, "serial_txx9", up);</div><div class='add'>+			     IRQF_SHARED, "serial_txx9", up);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -971,7 +968,6 @@ console_initcall(serial_txx9_console_init);</div><div class='ctx'> static struct uart_driver serial_txx9_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "serial_txx9",</div><div class='del'>-	.devfs_name		= TXX9_TTY_DEVFS_NAME,</div><div class='ctx'> 	.dev_name		= TXX9_TTY_NAME,</div><div class='ctx'> 	.major			= TXX9_TTY_MAJOR,</div><div class='ctx'> 	.minor			= TXX9_TTY_MINOR_START,</div><div class='head'>diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c<br/>index 44f6bf79bbe1..301573373c30 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sh-sci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sh-sci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sh-sci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sh-sci.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -842,7 +841,7 @@ static int sci_request_irq(struct sci_port *port)</div><div class='ctx'> 			printk(KERN_ERR "sci: Cannot allocate irq.(IRQ=0)\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-		if (request_irq(port-&gt;irqs[0], sci_mpxed_interrupt, SA_INTERRUPT,</div><div class='add'>+		if (request_irq(port-&gt;irqs[0], sci_mpxed_interrupt, IRQF_DISABLED,</div><div class='ctx'> 				"sci", port)) {</div><div class='ctx'> 			printk(KERN_ERR "sci: Cannot allocate irq.\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='hunk'>@@ -851,7 +850,7 @@ static int sci_request_irq(struct sci_port *port)</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(handlers); i++) {</div><div class='ctx'> 			if (!port-&gt;irqs[i])</div><div class='ctx'> 				continue;</div><div class='del'>-			if (request_irq(port-&gt;irqs[i], handlers[i], SA_INTERRUPT,</div><div class='add'>+			if (request_irq(port-&gt;irqs[i], handlers[i], IRQF_DISABLED,</div><div class='ctx'> 					desc[i], port)) {</div><div class='ctx'> 				printk(KERN_ERR "sci: Cannot allocate irq.\n");</div><div class='ctx'> 				return -ENODEV;</div><div class='hunk'>@@ -1699,9 +1698,6 @@ static char banner[] __initdata =</div><div class='ctx'> static struct uart_driver sci_uart_driver = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.driver_name	= "sci",</div><div class='del'>-#ifdef CONFIG_DEVFS_FS</div><div class='del'>-	.devfs_name	= "ttsc/",</div><div class='del'>-#endif</div><div class='ctx'> 	.dev_name	= "ttySC",</div><div class='ctx'> 	.major		= SCI_MAJOR,</div><div class='ctx'> 	.minor		= SCI_MINOR_START,</div><div class='head'>diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h<br/>index 1f14bb4382f6..ab320fa3237c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sh-sci.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sh-sci.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sh-sci.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sh-sci.h</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003).</div><div class='ctx'>  *  Modified to support H8/300 Series Yoshinori Sato (Feb 2004).</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/serial_core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(__H8300H__) || defined(__H8300S__)</div><div class='head'>diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c<br/>index 60ea4a3f0713..2f148e5b9255 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sn_console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sn_console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sn_console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sn_console.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'>  * http://oss.sgi.com/projects/GenInfo/NoticeExplan</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='hunk'>@@ -649,7 +648,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)</div><div class='ctx'> static int sn_sal_connect_interrupt(struct sn_cons_port *port)</div><div class='ctx'> {</div><div class='ctx'> 	if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,</div><div class='del'>-			SA_INTERRUPT | SA_SHIRQ,</div><div class='add'>+			IRQF_DISABLED | IRQF_SHARED,</div><div class='ctx'> 			"SAL console driver", port) &gt;= 0) {</div><div class='ctx'> 		return SGI_UART_VECTOR;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c<br/>index fa4ae94243c2..e35d9ab359f1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/suncore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/suncore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/suncore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/suncore.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * Copyright (C) 2002 David S. Miller (davem@redhat.com)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='head'>diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c<br/>index f137804b3133..f851f0f44f9b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sunhv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunhv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sunhv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sunhv.c</a></div><div class='hunk'>@@ -20,8 +20,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hypervisor.h&gt;</div><div class='ctx'> #include &lt;asm/spitfire.h&gt;</div><div class='del'>-#include &lt;asm/vdev.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_MAGIC_SYSRQ)</div><div class='hunk'>@@ -353,7 +353,6 @@ static struct uart_ops sunhv_pops = {</div><div class='ctx'> static struct uart_driver sunhv_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "serial",</div><div class='del'>-	.devfs_name		= "tts/",</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> };</div><div class='hunk'>@@ -408,143 +407,120 @@ static inline struct console *SUNHV_CONSOLE(void)</div><div class='ctx'> 	return &amp;sunhv_console;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init hv_console_compatible(char *buf, int len)</div><div class='del'>-{</div><div class='del'>-	while (len) {</div><div class='del'>-		int this_len;</div><div class='del'>-</div><div class='del'>-		if (!strcmp(buf, "qcn"))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		this_len = strlen(buf) + 1;</div><div class='del'>-</div><div class='del'>-		buf += this_len;</div><div class='del'>-		len -= this_len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int __init get_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	const char *cons_str = "console";</div><div class='del'>-	const char *compat_str = "compatible";</div><div class='del'>-	int node = prom_getchild(sun4v_vdev_root);</div><div class='del'>-	char buf[64];</div><div class='del'>-	int err, len;</div><div class='del'>-</div><div class='del'>-	node = prom_searchsiblings(node, cons_str);</div><div class='del'>-	if (!node)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	len = prom_getproplen(node, compat_str);</div><div class='del'>-	if (len == 0 || len == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = prom_getproperty(node, compat_str, buf, 64);</div><div class='del'>-	if (err == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!hv_console_compatible(buf, len))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Ok, the this is the OBP node for the sun4v hypervisor</div><div class='del'>-	 * console device.  Decode the interrupt.</div><div class='del'>-	 */</div><div class='del'>-	return sun4v_vdev_device_interrupt(node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init sunhv_init(void)</div><div class='add'>+static int __devinit hv_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='ctx'> 	struct uart_port *port;</div><div class='del'>-	int ret;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (tlb_type != hypervisor)</div><div class='add'>+	if (op-&gt;irqs[0] == 0xffffffff)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	port = kmalloc(sizeof(struct uart_port), GFP_KERNEL);</div><div class='add'>+	port = kzalloc(sizeof(struct uart_port), GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!port))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memset(port, 0, sizeof(struct uart_port));</div><div class='add'>+	sunhv_port = port;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;line = 0;</div><div class='ctx'> 	port-&gt;ops = &amp;sunhv_pops;</div><div class='ctx'> 	port-&gt;type = PORT_SUNHV;</div><div class='ctx'> 	port-&gt;uartclk = ( 29491200 / 16 ); /* arbitrary */</div><div class='ctx'> </div><div class='del'>-	/* Set this just to make uart_configure_port() happy.  */</div><div class='ctx'> 	port-&gt;membase = (unsigned char __iomem *) __pa(port);</div><div class='ctx'> </div><div class='del'>-	port-&gt;irq = get_interrupt();</div><div class='del'>-	if (!port-&gt;irq) {</div><div class='del'>-		kfree(port);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	port-&gt;irq = op-&gt;irqs[0];</div><div class='add'>+</div><div class='add'>+	port-&gt;dev = &amp;op-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	sunhv_reg.minor = sunserial_current_minor;</div><div class='ctx'> 	sunhv_reg.nr = 1;</div><div class='ctx'> </div><div class='del'>-	ret = uart_register_driver(&amp;sunhv_reg);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "SUNHV: uart_register_driver() failed %d\n",</div><div class='del'>-		       ret);</div><div class='del'>-		kfree(port);</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	err = uart_register_driver(&amp;sunhv_reg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_port;</div><div class='ctx'> </div><div class='ctx'> 	sunhv_reg.tty_driver-&gt;name_base = sunhv_reg.minor - 64;</div><div class='ctx'> 	sunserial_current_minor += 1;</div><div class='ctx'> </div><div class='ctx'> 	sunhv_reg.cons = SUNHV_CONSOLE();</div><div class='ctx'> </div><div class='del'>-	sunhv_port = port;</div><div class='add'>+	err = uart_add_one_port(&amp;sunhv_reg, port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unregister_driver;</div><div class='ctx'> </div><div class='del'>-	ret = uart_add_one_port(&amp;sunhv_reg, port);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "SUNHV: uart_add_one_port() failed %d\n", ret);</div><div class='del'>-		sunserial_current_minor -= 1;</div><div class='del'>-		uart_unregister_driver(&amp;sunhv_reg);</div><div class='del'>-		kfree(port);</div><div class='del'>-		sunhv_port = NULL;</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	err = request_irq(port-&gt;irq, sunhv_interrupt, 0, "hvcons", port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_remove_port;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(port-&gt;irq, sunhv_interrupt,</div><div class='del'>-			SA_SHIRQ, "serial(sunhv)", port)) {</div><div class='del'>-		printk(KERN_ERR "sunhv: Cannot register IRQ\n");</div><div class='del'>-		uart_remove_one_port(&amp;sunhv_reg, port);</div><div class='del'>-		sunserial_current_minor -= 1;</div><div class='del'>-		uart_unregister_driver(&amp;sunhv_reg);</div><div class='del'>-		kfree(port);</div><div class='del'>-		sunhv_port = NULL;</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, port);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_remove_port:</div><div class='add'>+	uart_remove_one_port(&amp;sunhv_reg, port);</div><div class='add'>+</div><div class='add'>+out_unregister_driver:</div><div class='add'>+	sunserial_current_minor -= 1;</div><div class='add'>+	uart_unregister_driver(&amp;sunhv_reg);</div><div class='add'>+</div><div class='add'>+out_free_port:</div><div class='add'>+	kfree(port);</div><div class='add'>+	sunhv_port = NULL;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit sunhv_exit(void)</div><div class='add'>+static int __devexit hv_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct uart_port *port = sunhv_port;</div><div class='del'>-</div><div class='del'>-	BUG_ON(!port);</div><div class='add'>+	struct uart_port *port = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(port-&gt;irq, port);</div><div class='ctx'> </div><div class='ctx'> 	uart_remove_one_port(&amp;sunhv_reg, port);</div><div class='del'>-	sunserial_current_minor -= 1;</div><div class='ctx'> </div><div class='add'>+	sunserial_current_minor -= 1;</div><div class='ctx'> 	uart_unregister_driver(&amp;sunhv_reg);</div><div class='ctx'> </div><div class='del'>-	kfree(sunhv_port);</div><div class='add'>+	kfree(port);</div><div class='ctx'> 	sunhv_port = NULL;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct of_device_id hv_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "console",</div><div class='add'>+		.compatible = "qcn",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, hv_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver hv_driver = {</div><div class='add'>+	.name		= "hv",</div><div class='add'>+	.match_table	= hv_match,</div><div class='add'>+	.probe		= hv_probe,</div><div class='add'>+	.remove		= __devexit_p(hv_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sunhv_init(void)</div><div class='add'>+{</div><div class='add'>+	if (tlb_type != hypervisor)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;hv_driver, &amp;of_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sunhv_exit(void)</div><div class='add'>+{</div><div class='add'>+	of_unregister_driver(&amp;hv_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sunhv_init);</div><div class='ctx'> module_exit(sunhv_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David S. Miller");</div><div class='del'>-MODULE_DESCRIPTION("SUN4V Hypervisor console driver")</div><div class='add'>+MODULE_DESCRIPTION("SUN4V Hypervisor console driver");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c<br/>index bfbe9dc90cca..979497f108c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sunsab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunsab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sunsab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sunsab.c</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* sunsab.c: ASYNC Driver for the SIEMENS SAB82532 DUSCC.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)</div><div class='del'>- * Copyright (C) 2002  David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2002, 2006  David S. Miller (davem@davemloft.net)</div><div class='ctx'>  *</div><div class='ctx'>  * Rewrote buffer handling to use CIRC(Circular Buffer) macros.</div><div class='ctx'>  *   Maxim Krasnyanskiy &lt;maxk@qualcomm.com&gt;</div><div class='hunk'>@@ -12,10 +12,9 @@</div><div class='ctx'>  *   Theodore Ts'o &lt;tytso@mit.edu&gt;, 2001-Oct-12</div><div class='ctx'>  *</div><div class='ctx'>  * Ported to new 2.5.x UART layer.</div><div class='del'>- *   David S. Miller &lt;davem@redhat.com&gt;</div><div class='add'>+ *   David S. Miller &lt;davem@davemloft.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -37,8 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -851,7 +850,6 @@ static struct uart_ops sunsab_pops = {</div><div class='ctx'> static struct uart_driver sunsab_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "serial",</div><div class='del'>-	.devfs_name		= "tts/",</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> };</div><div class='hunk'>@@ -977,199 +975,188 @@ static inline struct console *SUNSAB_CONSOLE(void)</div><div class='ctx'> #define sunsab_console_init()	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void __init for_each_sab_edev(void (*callback)(struct linux_ebus_device *, void *), void *arg)</div><div class='add'>+static int __devinit sunsab_init_one(struct uart_sunsab_port *up,</div><div class='add'>+				     struct of_device *op,</div><div class='add'>+				     unsigned long offset,</div><div class='add'>+				     int line)</div><div class='ctx'> {</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-	struct linux_ebus_device *edev = NULL;</div><div class='del'>-</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(edev, ebus) {</div><div class='del'>-			if (!strcmp(edev-&gt;prom_name, "se")) {</div><div class='del'>-				callback(edev, arg);</div><div class='del'>-				continue;</div><div class='del'>-			} else if (!strcmp(edev-&gt;prom_name, "serial")) {</div><div class='del'>-				char compat[32];</div><div class='del'>-				int clen;</div><div class='del'>-</div><div class='del'>-				/* On RIO this can be an SE, check it.  We could</div><div class='del'>-				 * just check ebus-&gt;is_rio, but this is more portable.</div><div class='del'>-				 */</div><div class='del'>-				clen = prom_getproperty(edev-&gt;prom_node, "compatible",</div><div class='del'>-							compat, sizeof(compat));</div><div class='del'>-				if (clen &gt; 0) {</div><div class='del'>-					if (strncmp(compat, "sab82532", 8) == 0) {</div><div class='del'>-						callback(edev, arg);</div><div class='del'>-						continue;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	up-&gt;port.line = line;</div><div class='add'>+	up-&gt;port.dev = &amp;op-&gt;dev;</div><div class='add'>+</div><div class='add'>+	up-&gt;port.mapbase = op-&gt;resource[0].start + offset;</div><div class='add'>+	up-&gt;port.membase = of_ioremap(&amp;op-&gt;resource[0], offset,</div><div class='add'>+				      sizeof(union sab82532_async_regs),</div><div class='add'>+				      "sab");</div><div class='add'>+	if (!up-&gt;port.membase)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	up-&gt;regs = (union sab82532_async_regs __iomem *) up-&gt;port.membase;</div><div class='ctx'> </div><div class='del'>-static void __init sab_count_callback(struct linux_ebus_device *edev, void *arg)</div><div class='del'>-{</div><div class='del'>-	int *count_p = arg;</div><div class='add'>+	up-&gt;port.irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='del'>-	(*count_p)++;</div><div class='del'>-}</div><div class='add'>+	up-&gt;port.fifosize = SAB82532_XMIT_FIFO_SIZE;</div><div class='add'>+	up-&gt;port.iotype = UPIO_MEM;</div><div class='ctx'> </div><div class='del'>-static void __init sab_attach_callback(struct linux_ebus_device *edev, void *arg)</div><div class='del'>-{</div><div class='del'>-	int *instance_p = arg;</div><div class='del'>-	struct uart_sunsab_port *up;</div><div class='del'>-	unsigned long regs, offset;</div><div class='del'>-	int i;</div><div class='add'>+	writeb(SAB82532_IPC_IC_ACT_LOW, &amp;up-&gt;regs-&gt;w.ipc);</div><div class='ctx'> </div><div class='del'>-	/* Note: ports are located in reverse order */</div><div class='del'>-	regs = edev-&gt;resource[0].start;</div><div class='del'>-	offset = sizeof(union sab82532_async_regs);</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		up = &amp;sunsab_ports[(*instance_p * 2) + 1 - i];</div><div class='add'>+	up-&gt;port.ops = &amp;sunsab_pops;</div><div class='add'>+	up-&gt;port.type = PORT_SUNSAB;</div><div class='add'>+	up-&gt;port.uartclk = SAB_BASE_BAUD;</div><div class='ctx'> </div><div class='del'>-		memset(up, 0, sizeof(*up));</div><div class='del'>-		up-&gt;regs = ioremap(regs + offset, sizeof(union sab82532_async_regs));</div><div class='del'>-		up-&gt;port.irq = edev-&gt;irqs[0];</div><div class='del'>-		up-&gt;port.fifosize = SAB82532_XMIT_FIFO_SIZE;</div><div class='del'>-		up-&gt;port.mapbase = (unsigned long)up-&gt;regs;</div><div class='del'>-		up-&gt;port.iotype = UPIO_MEM;</div><div class='add'>+	up-&gt;type = readb(&amp;up-&gt;regs-&gt;r.vstr) &amp; 0x0f;</div><div class='add'>+	writeb(~((1 &lt;&lt; 1) | (1 &lt;&lt; 2) | (1 &lt;&lt; 4)), &amp;up-&gt;regs-&gt;w.pcr);</div><div class='add'>+	writeb(0xff, &amp;up-&gt;regs-&gt;w.pim);</div><div class='add'>+	if ((up-&gt;port.line &amp; 0x1) == 0) {</div><div class='add'>+		up-&gt;pvr_dsr_bit = (1 &lt;&lt; 0);</div><div class='add'>+		up-&gt;pvr_dtr_bit = (1 &lt;&lt; 1);</div><div class='add'>+	} else {</div><div class='add'>+		up-&gt;pvr_dsr_bit = (1 &lt;&lt; 3);</div><div class='add'>+		up-&gt;pvr_dtr_bit = (1 &lt;&lt; 2);</div><div class='add'>+	}</div><div class='add'>+	up-&gt;cached_pvr = (1 &lt;&lt; 1) | (1 &lt;&lt; 2) | (1 &lt;&lt; 4);</div><div class='add'>+	writeb(up-&gt;cached_pvr, &amp;up-&gt;regs-&gt;w.pvr);</div><div class='add'>+	up-&gt;cached_mode = readb(&amp;up-&gt;regs-&gt;rw.mode);</div><div class='add'>+	up-&gt;cached_mode |= SAB82532_MODE_FRTS;</div><div class='add'>+	writeb(up-&gt;cached_mode, &amp;up-&gt;regs-&gt;rw.mode);</div><div class='add'>+	up-&gt;cached_mode |= SAB82532_MODE_RTS;</div><div class='add'>+	writeb(up-&gt;cached_mode, &amp;up-&gt;regs-&gt;rw.mode);</div><div class='ctx'> </div><div class='del'>-		writeb(SAB82532_IPC_IC_ACT_LOW, &amp;up-&gt;regs-&gt;w.ipc);</div><div class='add'>+	up-&gt;tec_timeout = SAB82532_MAX_TEC_TIMEOUT;</div><div class='add'>+	up-&gt;cec_timeout = SAB82532_MAX_CEC_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-		offset -= sizeof(union sab82532_async_regs);</div><div class='add'>+	if (!(up-&gt;port.line &amp; 0x01)) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = request_irq(up-&gt;port.irq, sunsab_interrupt,</div><div class='add'>+				  IRQF_SHARED, "sab", up);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_iounmap(up-&gt;port.membase,</div><div class='add'>+				   sizeof(union sab82532_async_regs));</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	(*instance_p)++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init probe_for_sabs(void)</div><div class='add'>+static int __devinit sab_probe(struct of_device *op, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	int this_sab = 0;</div><div class='add'>+	static int inst;</div><div class='add'>+	struct uart_sunsab_port *up;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	up = &amp;sunsab_ports[inst * 2];</div><div class='add'>+</div><div class='add'>+	err = sunsab_init_one(&amp;up[0], op,</div><div class='add'>+			      sizeof(union sab82532_async_regs),</div><div class='add'>+			      (inst * 2) + 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = sunsab_init_one(&amp;up[1], op, 0,</div><div class='add'>+			      (inst * 2) + 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		of_iounmap(up[0].port.membase,</div><div class='add'>+			   sizeof(union sab82532_async_regs));</div><div class='add'>+		free_irq(up[0].port.irq, &amp;up[0]);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Find device instances.  */</div><div class='del'>-	for_each_sab_edev(&amp;sab_count_callback, &amp;this_sab);</div><div class='del'>-	if (!this_sab)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	uart_add_one_port(&amp;sunsab_reg, &amp;up[0].port);</div><div class='add'>+	uart_add_one_port(&amp;sunsab_reg, &amp;up[1].port);</div><div class='ctx'> </div><div class='del'>-	/* Allocate tables.  */</div><div class='del'>-	sunsab_ports = kmalloc(sizeof(struct uart_sunsab_port) * this_sab * 2,</div><div class='del'>-			       GFP_KERNEL);</div><div class='del'>-	if (!sunsab_ports)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, &amp;up[0]);</div><div class='ctx'> </div><div class='del'>-	num_channels = this_sab * 2;</div><div class='add'>+	inst++;</div><div class='ctx'> </div><div class='del'>-	this_sab = 0;</div><div class='del'>-	for_each_sab_edev(&amp;sab_attach_callback, &amp;this_sab);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init sunsab_init_hw(void)</div><div class='add'>+static void __devexit sab_remove_one(struct uart_sunsab_port *up)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_channels; i++) {</div><div class='del'>-		struct uart_sunsab_port *up = &amp;sunsab_ports[i];</div><div class='del'>-</div><div class='del'>-		up-&gt;port.line = i;</div><div class='del'>-		up-&gt;port.ops = &amp;sunsab_pops;</div><div class='del'>-		up-&gt;port.type = PORT_SUNSAB;</div><div class='del'>-		up-&gt;port.uartclk = SAB_BASE_BAUD;</div><div class='del'>-</div><div class='del'>-		up-&gt;type = readb(&amp;up-&gt;regs-&gt;r.vstr) &amp; 0x0f;</div><div class='del'>-		writeb(~((1 &lt;&lt; 1) | (1 &lt;&lt; 2) | (1 &lt;&lt; 4)), &amp;up-&gt;regs-&gt;w.pcr);</div><div class='del'>-		writeb(0xff, &amp;up-&gt;regs-&gt;w.pim);</div><div class='del'>-		if (up-&gt;port.line == 0) {</div><div class='del'>-			up-&gt;pvr_dsr_bit = (1 &lt;&lt; 0);</div><div class='del'>-			up-&gt;pvr_dtr_bit = (1 &lt;&lt; 1);</div><div class='del'>-		} else {</div><div class='del'>-			up-&gt;pvr_dsr_bit = (1 &lt;&lt; 3);</div><div class='del'>-			up-&gt;pvr_dtr_bit = (1 &lt;&lt; 2);</div><div class='del'>-		}</div><div class='del'>-		up-&gt;cached_pvr = (1 &lt;&lt; 1) | (1 &lt;&lt; 2) | (1 &lt;&lt; 4);</div><div class='del'>-		writeb(up-&gt;cached_pvr, &amp;up-&gt;regs-&gt;w.pvr);</div><div class='del'>-		up-&gt;cached_mode = readb(&amp;up-&gt;regs-&gt;rw.mode);</div><div class='del'>-		up-&gt;cached_mode |= SAB82532_MODE_FRTS;</div><div class='del'>-		writeb(up-&gt;cached_mode, &amp;up-&gt;regs-&gt;rw.mode);</div><div class='del'>-		up-&gt;cached_mode |= SAB82532_MODE_RTS;</div><div class='del'>-		writeb(up-&gt;cached_mode, &amp;up-&gt;regs-&gt;rw.mode);</div><div class='del'>-</div><div class='del'>-		up-&gt;tec_timeout = SAB82532_MAX_TEC_TIMEOUT;</div><div class='del'>-		up-&gt;cec_timeout = SAB82532_MAX_CEC_TIMEOUT;</div><div class='del'>-</div><div class='del'>-		if (!(up-&gt;port.line &amp; 0x01)) {</div><div class='del'>-			if (request_irq(up-&gt;port.irq, sunsab_interrupt,</div><div class='del'>-			                SA_SHIRQ, "serial(sab82532)", up)) {</div><div class='del'>-				printk("sunsab%d: can't get IRQ %x\n",</div><div class='del'>-				       i, up-&gt;port.irq);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	uart_remove_one_port(&amp;sunsab_reg, &amp;up-&gt;port);</div><div class='add'>+	if (!(up-&gt;port.line &amp; 1))</div><div class='add'>+		free_irq(up-&gt;port.irq, up);</div><div class='add'>+	of_iounmap(up-&gt;port.membase,</div><div class='add'>+		   sizeof(union sab82532_async_regs));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init sunsab_init(void)</div><div class='add'>+static int __devexit sab_remove(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	int ret = probe_for_sabs();</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	struct uart_sunsab_port *up = dev_get_drvdata(&amp;op-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	sunsab_init_hw();</div><div class='add'>+	sab_remove_one(&amp;up[0]);</div><div class='add'>+	sab_remove_one(&amp;up[1]);</div><div class='ctx'> </div><div class='del'>-	sunsab_reg.minor = sunserial_current_minor;</div><div class='del'>-	sunsab_reg.nr = num_channels;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, NULL);</div><div class='ctx'> </div><div class='del'>-	ret = uart_register_driver(&amp;sunsab_reg);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		int i;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; num_channels; i++) {</div><div class='del'>-			struct uart_sunsab_port *up = &amp;sunsab_ports[i];</div><div class='add'>+static struct of_device_id sab_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "se",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "serial",</div><div class='add'>+		.compatible = "sab82532",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, sab_match);</div><div class='ctx'> </div><div class='del'>-			if (!(up-&gt;port.line &amp; 0x01))</div><div class='del'>-				free_irq(up-&gt;port.irq, up);</div><div class='del'>-			iounmap(up-&gt;regs);</div><div class='del'>-		}</div><div class='del'>-		kfree(sunsab_ports);</div><div class='del'>-		sunsab_ports = NULL;</div><div class='add'>+static struct of_platform_driver sab_driver = {</div><div class='add'>+	.name		= "sab",</div><div class='add'>+	.match_table	= sab_match,</div><div class='add'>+	.probe		= sab_probe,</div><div class='add'>+	.remove		= __devexit_p(sab_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		return ret;</div><div class='add'>+static int __init sunsab_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	num_channels = 0;</div><div class='add'>+	for_each_node_by_name(dp, "su")</div><div class='add'>+		num_channels += 2;</div><div class='add'>+	for_each_node_by_name(dp, "serial") {</div><div class='add'>+		if (of_device_is_compatible(dp, "sab82532"))</div><div class='add'>+			num_channels += 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sunsab_reg.tty_driver-&gt;name_base = sunsab_reg.minor - 64;</div><div class='add'>+	if (num_channels) {</div><div class='add'>+		sunsab_ports = kzalloc(sizeof(struct uart_sunsab_port) *</div><div class='add'>+				       num_channels, GFP_KERNEL);</div><div class='add'>+		if (!sunsab_ports)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	sunsab_reg.cons = SUNSAB_CONSOLE();</div><div class='add'>+		sunsab_reg.minor = sunserial_current_minor;</div><div class='add'>+		sunsab_reg.nr = num_channels;</div><div class='ctx'> </div><div class='del'>-	sunserial_current_minor += num_channels;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; num_channels; i++) {</div><div class='del'>-		struct uart_sunsab_port *up = &amp;sunsab_ports[i];</div><div class='add'>+		err = uart_register_driver(&amp;sunsab_reg);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(sunsab_ports);</div><div class='add'>+			sunsab_ports = NULL;</div><div class='ctx'> </div><div class='del'>-		uart_add_one_port(&amp;sunsab_reg, &amp;up-&gt;port);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sunsab_reg.tty_driver-&gt;name_base = sunsab_reg.minor - 64;</div><div class='add'>+		sunsab_reg.cons = SUNSAB_CONSOLE();</div><div class='add'>+		sunserial_current_minor += num_channels;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return of_register_driver(&amp;sab_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sunsab_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_channels; i++) {</div><div class='del'>-		struct uart_sunsab_port *up = &amp;sunsab_ports[i];</div><div class='del'>-</div><div class='del'>-		uart_remove_one_port(&amp;sunsab_reg, &amp;up-&gt;port);</div><div class='del'>-</div><div class='del'>-		if (!(up-&gt;port.line &amp; 0x01))</div><div class='del'>-			free_irq(up-&gt;port.irq, up);</div><div class='del'>-		iounmap(up-&gt;regs);</div><div class='add'>+	of_unregister_driver(&amp;sab_driver);</div><div class='add'>+	if (num_channels) {</div><div class='add'>+		sunserial_current_minor -= num_channels;</div><div class='add'>+		uart_unregister_driver(&amp;sunsab_reg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sunserial_current_minor -= num_channels;</div><div class='del'>-	uart_unregister_driver(&amp;sunsab_reg);</div><div class='del'>-</div><div class='ctx'> 	kfree(sunsab_ports);</div><div class='ctx'> 	sunsab_ports = NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c<br/>index 2b4f96541b8e..d3a5aeee73a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sunsu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunsu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sunsu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sunsu.c</a></div><div class='hunk'>@@ -12,10 +12,9 @@</div><div class='ctx'>  *   Theodore Ts'o &lt;tytso@mit.edu&gt;, 2001-Oct-12</div><div class='ctx'>  *</div><div class='ctx'>  * Converted to new 2.5.x UART layer.</div><div class='del'>- *   David S. Miller (davem@redhat.com), 2002-Jul-29</div><div class='add'>+ *   David S. Miller (davem@davemloft.net), 2002-Jul-29</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -40,11 +39,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='del'>-#include &lt;asm/ebus.h&gt;</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-#include &lt;asm/isa.h&gt;</div><div class='del'>-#endif</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_SUNSU_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -94,10 +90,10 @@ struct uart_sunsu_port {</div><div class='ctx'> 	/* Probing information.  */</div><div class='ctx'> 	enum su_type		su_type;</div><div class='ctx'> 	unsigned int		type_probed;	/* XXX Stupid */</div><div class='del'>-	int			port_node;</div><div class='add'>+	unsigned long		reg_size;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='del'>-	struct serio		*serio;</div><div class='add'>+	struct serio		serio;</div><div class='ctx'> 	int			serio_open;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -509,7 +505,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *reg</div><div class='ctx'> 		/* Stop-A is handled by drivers/char/keyboard.c now. */</div><div class='ctx'> 		if (up-&gt;su_type == SU_PORT_KBD) {</div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='del'>-			serio_interrupt(up-&gt;serio, ch, 0, regs);</div><div class='add'>+			serio_interrupt(&amp;up-&gt;serio, ch, 0, regs);</div><div class='ctx'> #endif</div><div class='ctx'> 		} else if (up-&gt;su_type == SU_PORT_MS) {</div><div class='ctx'> 			int ret = suncore_mouse_baud_detection(ch, is_break);</div><div class='hunk'>@@ -523,7 +519,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, struct pt_regs *reg</div><div class='ctx'> </div><div class='ctx'> 			case 0:</div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='del'>-				serio_interrupt(up-&gt;serio, ch, 0, regs);</div><div class='add'>+				serio_interrupt(&amp;up-&gt;serio, ch, 0, regs);</div><div class='ctx'> #endif</div><div class='ctx'> 				break;</div><div class='ctx'> 			};</div><div class='hunk'>@@ -671,10 +667,10 @@ static int sunsu_startup(struct uart_port *port)</div><div class='ctx'> </div><div class='ctx'> 	if (up-&gt;su_type != SU_PORT_PORT) {</div><div class='ctx'> 		retval = request_irq(up-&gt;port.irq, sunsu_kbd_ms_interrupt,</div><div class='del'>-				     SA_SHIRQ, su_typev[up-&gt;su_type], up);</div><div class='add'>+				     IRQF_SHARED, su_typev[up-&gt;su_type], up);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		retval = request_irq(up-&gt;port.irq, sunsu_serial_interrupt,</div><div class='del'>-				     SA_SHIRQ, su_typev[up-&gt;su_type], up);</div><div class='add'>+				     IRQF_SHARED, su_typev[up-&gt;su_type], up);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk("su: Cannot register IRQ %d\n", up-&gt;port.irq);</div><div class='hunk'>@@ -1031,99 +1027,14 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char status1, status2, scratch, scratch2, scratch3;</div><div class='ctx'> 	unsigned char save_lcr, save_mcr;</div><div class='del'>-	struct linux_ebus_device *dev = NULL;</div><div class='del'>-	struct linux_ebus *ebus;</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	struct sparc_isa_bridge *isa_br;</div><div class='del'>-	struct sparc_isa_device *isa_dev;</div><div class='del'>-#endif</div><div class='del'>-#ifndef CONFIG_SPARC64</div><div class='del'>-	struct linux_prom_registers reg0;</div><div class='del'>-#endif</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (!up-&gt;port_node || !up-&gt;su_type)</div><div class='add'>+	if (up-&gt;su_type == SU_PORT_NONE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	up-&gt;type_probed = PORT_UNKNOWN;</div><div class='ctx'> 	up-&gt;port.iotype = UPIO_MEM;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * First we look for Ebus-bases su's</div><div class='del'>-	 */</div><div class='del'>-	for_each_ebus(ebus) {</div><div class='del'>-		for_each_ebusdev(dev, ebus) {</div><div class='del'>-			if (dev-&gt;prom_node == up-&gt;port_node) {</div><div class='del'>-				/*</div><div class='del'>-				 * The EBus is broken on sparc; it delivers</div><div class='del'>-				 * virtual addresses in resources. Oh well...</div><div class='del'>-				 * This is correct on sparc64, though.</div><div class='del'>-				 */</div><div class='del'>-				up-&gt;port.membase = (char *) dev-&gt;resource[0].start;</div><div class='del'>-				/*</div><div class='del'>-				 * This is correct on both architectures.</div><div class='del'>-				 */</div><div class='del'>-				up-&gt;port.mapbase = dev-&gt;resource[0].start;</div><div class='del'>-				up-&gt;port.irq = dev-&gt;irqs[0];</div><div class='del'>-				goto ebus_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	for_each_isa(isa_br) {</div><div class='del'>-		for_each_isadev(isa_dev, isa_br) {</div><div class='del'>-			if (isa_dev-&gt;prom_node == up-&gt;port_node) {</div><div class='del'>-				/* Same on sparc64. Cool architecure... */</div><div class='del'>-				up-&gt;port.membase = (char *) isa_dev-&gt;resource.start;</div><div class='del'>-				up-&gt;port.mapbase = isa_dev-&gt;resource.start;</div><div class='del'>-				up-&gt;port.irq = isa_dev-&gt;irq;</div><div class='del'>-				goto ebus_done;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	/*</div><div class='del'>-	 * Not on Ebus, bailing.</div><div class='del'>-	 */</div><div class='del'>-	return;</div><div class='del'>-#else</div><div class='del'>-	/*</div><div class='del'>-	 * Not on Ebus, must be OBIO.</div><div class='del'>-	 */</div><div class='del'>-	if (prom_getproperty(up-&gt;port_node, "reg",</div><div class='del'>-			     (char *)&amp;reg0, sizeof(reg0)) == -1) {</div><div class='del'>-		prom_printf("sunsu: no \"reg\" property\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	prom_apply_obio_ranges(&amp;reg0, 1);</div><div class='del'>-	if (reg0.which_io != 0) {	/* Just in case... */</div><div class='del'>-		prom_printf("sunsu: bus number nonzero: 0x%x:%x\n",</div><div class='del'>-		    reg0.which_io, reg0.phys_addr);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	up-&gt;port.mapbase = reg0.phys_addr;</div><div class='del'>-	if ((up-&gt;port.membase = ioremap(reg0.phys_addr, reg0.reg_size)) == 0) {</div><div class='del'>-		prom_printf("sunsu: Cannot map registers.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 0x20 is sun4m thing, Dave Redman heritage.</div><div class='del'>-	 * See arch/sparc/kernel/irq.c.</div><div class='del'>-	 */</div><div class='del'>-#define IRQ_4M(n)	((n)|0x20)</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * There is no intr property on MrCoffee, so hardwire it.</div><div class='del'>-	 */</div><div class='del'>-	up-&gt;port.irq = IRQ_4M(13);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-ebus_done:</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;up-&gt;port.lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (!(up-&gt;port.flags &amp; UPF_BUGGY_UART)) {</div><div class='hunk'>@@ -1265,23 +1176,17 @@ out:</div><div class='ctx'> static struct uart_driver sunsu_reg = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "serial",</div><div class='del'>-	.devfs_name		= "tts/",</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)</div><div class='add'>+static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)</div><div class='ctx'> {</div><div class='ctx'> 	int quot, baud;</div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='ctx'> 	struct serio *serio;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;up-&gt;port.lock);</div><div class='del'>-	up-&gt;port.line = channel;</div><div class='del'>-	up-&gt;port.type = PORT_UNKNOWN;</div><div class='del'>-	up-&gt;port.uartclk = (SU_BASE_BAUD * 16);</div><div class='del'>-</div><div class='ctx'> 	if (up-&gt;su_type == SU_PORT_KBD) {</div><div class='ctx'> 		up-&gt;cflag = B1200 | CS8 | CLOCAL | CREAD;</div><div class='ctx'> 		baud = 1200;</div><div class='hunk'>@@ -1293,41 +1198,36 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)</div><div class='ctx'> </div><div class='ctx'> 	sunsu_autoconfig(up);</div><div class='ctx'> 	if (up-&gt;port.type == PORT_UNKNOWN)</div><div class='del'>-		return -1;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "su%d at 0x%p (irq = %s) is a %s\n",</div><div class='del'>-	       channel,</div><div class='del'>-	       up-&gt;port.membase, __irq_itoa(up-&gt;port.irq),</div><div class='del'>-	       sunsu_type(&amp;up-&gt;port));</div><div class='add'>+	printk("%s: %s port at %lx, irq %u\n",</div><div class='add'>+	       to_of_device(up-&gt;port.dev)-&gt;node-&gt;full_name,</div><div class='add'>+	       (up-&gt;su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",</div><div class='add'>+	       up-&gt;port.mapbase, up-&gt;port.irq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='del'>-	up-&gt;serio = serio = kmalloc(sizeof(struct serio), GFP_KERNEL);</div><div class='del'>-	if (serio) {</div><div class='del'>-		memset(serio, 0, sizeof(*serio));</div><div class='del'>-</div><div class='del'>-		serio-&gt;port_data = up;</div><div class='del'>-</div><div class='del'>-		serio-&gt;id.type = SERIO_RS232;</div><div class='del'>-		if (up-&gt;su_type == SU_PORT_KBD) {</div><div class='del'>-			serio-&gt;id.proto = SERIO_SUNKBD;</div><div class='del'>-			strlcpy(serio-&gt;name, "sukbd", sizeof(serio-&gt;name));</div><div class='del'>-		} else {</div><div class='del'>-			serio-&gt;id.proto = SERIO_SUN;</div><div class='del'>-			serio-&gt;id.extra = 1;</div><div class='del'>-			strlcpy(serio-&gt;name, "sums", sizeof(serio-&gt;name));</div><div class='del'>-		}</div><div class='del'>-		strlcpy(serio-&gt;phys, (channel == 0 ? "su/serio0" : "su/serio1"),</div><div class='del'>-			sizeof(serio-&gt;phys));</div><div class='add'>+	serio = &amp;up-&gt;serio;</div><div class='add'>+	serio-&gt;port_data = up;</div><div class='ctx'> </div><div class='del'>-		serio-&gt;write = sunsu_serio_write;</div><div class='del'>-		serio-&gt;open = sunsu_serio_open;</div><div class='del'>-		serio-&gt;close = sunsu_serio_close;</div><div class='del'>-</div><div class='del'>-		serio_register_port(serio);</div><div class='add'>+	serio-&gt;id.type = SERIO_RS232;</div><div class='add'>+	if (up-&gt;su_type == SU_PORT_KBD) {</div><div class='add'>+		serio-&gt;id.proto = SERIO_SUNKBD;</div><div class='add'>+		strlcpy(serio-&gt;name, "sukbd", sizeof(serio-&gt;name));</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_WARNING "su%d: not enough memory for serio port\n",</div><div class='del'>-			channel);</div><div class='add'>+		serio-&gt;id.proto = SERIO_SUN;</div><div class='add'>+		serio-&gt;id.extra = 1;</div><div class='add'>+		strlcpy(serio-&gt;name, "sums", sizeof(serio-&gt;name));</div><div class='ctx'> 	}</div><div class='add'>+	strlcpy(serio-&gt;phys,</div><div class='add'>+		(!(up-&gt;port.line &amp; 1) ? "su/serio0" : "su/serio1"),</div><div class='add'>+		sizeof(serio-&gt;phys));</div><div class='add'>+</div><div class='add'>+	serio-&gt;write = sunsu_serio_write;</div><div class='add'>+	serio-&gt;open = sunsu_serio_open;</div><div class='add'>+	serio-&gt;close = sunsu_serio_close;</div><div class='add'>+	serio-&gt;dev.parent = up-&gt;port.dev;</div><div class='add'>+</div><div class='add'>+	serio_register_port(serio);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	sunsu_change_speed(&amp;up-&gt;port, up-&gt;cflag, 0, quot);</div><div class='hunk'>@@ -1459,22 +1359,20 @@ static struct console sunsu_cons = {</div><div class='ctx'>  *	Register console.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline struct console *SUNSU_CONSOLE(void)</div><div class='add'>+static inline struct console *SUNSU_CONSOLE(int num_uart)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (con_is_present())</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; UART_NR; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_uart; i++) {</div><div class='ctx'> 		int this_minor = sunsu_reg.minor + i;</div><div class='ctx'> </div><div class='ctx'> 		if ((this_minor - 64) == (serial_console - 1))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (i == UART_NR)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (sunsu_ports[i].port_node == 0)</div><div class='add'>+	if (i == num_uart)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	sunsu_cons.index = i;</div><div class='hunk'>@@ -1482,252 +1380,203 @@ static inline struct console *SUNSU_CONSOLE(void)</div><div class='ctx'> 	return &amp;sunsu_cons;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-#define SUNSU_CONSOLE()			(NULL)</div><div class='add'>+#define SUNSU_CONSOLE(num_uart)		(NULL)</div><div class='ctx'> #define sunsu_serial_console_init()	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init sunsu_serial_init(void)</div><div class='add'>+static enum su_type __devinit su_get_type(struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	int instance, ret, i;</div><div class='add'>+	struct device_node *ap = of_find_node_by_path("/aliases");</div><div class='ctx'> </div><div class='del'>-	/* How many instances do we need?  */</div><div class='del'>-	instance = 0;</div><div class='del'>-	for (i = 0; i &lt; UART_NR; i++) {</div><div class='del'>-		struct uart_sunsu_port *up = &amp;sunsu_ports[i];</div><div class='add'>+	if (ap) {</div><div class='add'>+		char *keyb = of_get_property(ap, "keyboard", NULL);</div><div class='add'>+		char *ms = of_get_property(ap, "mouse", NULL);</div><div class='ctx'> </div><div class='del'>-		if (up-&gt;su_type == SU_PORT_MS ||</div><div class='del'>-		    up-&gt;su_type == SU_PORT_KBD)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		spin_lock_init(&amp;up-&gt;port.lock);</div><div class='del'>-		up-&gt;port.flags |= UPF_BOOT_AUTOCONF;</div><div class='del'>-		up-&gt;port.type = PORT_UNKNOWN;</div><div class='del'>-		up-&gt;port.uartclk = (SU_BASE_BAUD * 16);</div><div class='add'>+		if (keyb) {</div><div class='add'>+			if (dp == of_find_node_by_path(keyb))</div><div class='add'>+				return SU_PORT_KBD;</div><div class='add'>+		}</div><div class='add'>+		if (ms) {</div><div class='add'>+			if (dp == of_find_node_by_path(ms))</div><div class='add'>+				return SU_PORT_MS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		sunsu_autoconfig(up);</div><div class='del'>-		if (up-&gt;port.type == PORT_UNKNOWN)</div><div class='del'>-			continue;</div><div class='add'>+	return SU_PORT_PORT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		up-&gt;port.line = instance++;</div><div class='del'>-		up-&gt;port.ops = &amp;sunsu_pops;</div><div class='add'>+static int __devinit su_probe(struct of_device *op, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	static int inst;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct uart_sunsu_port *up;</div><div class='add'>+	struct resource *rp;</div><div class='add'>+	enum su_type type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	type = su_get_type(dp);</div><div class='add'>+	if (type == SU_PORT_PORT) {</div><div class='add'>+		if (inst &gt;= UART_NR)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		up = &amp;sunsu_ports[inst];</div><div class='add'>+	} else {</div><div class='add'>+		up = kzalloc(sizeof(*up), GFP_KERNEL);</div><div class='add'>+		if (!up)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sunsu_reg.minor = sunserial_current_minor;</div><div class='add'>+	up-&gt;port.line = inst;</div><div class='ctx'> </div><div class='del'>-	sunsu_reg.nr = instance;</div><div class='del'>-</div><div class='del'>-	ret = uart_register_driver(&amp;sunsu_reg);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='add'>+	spin_lock_init(&amp;up-&gt;port.lock);</div><div class='ctx'> </div><div class='del'>-	sunsu_reg.tty_driver-&gt;name_base = sunsu_reg.minor - 64;</div><div class='add'>+	up-&gt;su_type = type;</div><div class='ctx'> </div><div class='del'>-	sunserial_current_minor += instance;</div><div class='add'>+	rp = &amp;op-&gt;resource[0];</div><div class='add'>+	up-&gt;port.mapbase = rp-&gt;start;</div><div class='add'>+	up-&gt;reg_size = (rp-&gt;end - rp-&gt;start) + 1;</div><div class='add'>+	up-&gt;port.membase = of_ioremap(rp, 0, up-&gt;reg_size, "su");</div><div class='add'>+	if (!up-&gt;port.membase) {</div><div class='add'>+		if (type != SU_PORT_PORT)</div><div class='add'>+			kfree(up);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sunsu_reg.cons = SUNSU_CONSOLE();</div><div class='add'>+	up-&gt;port.irq = op-&gt;irqs[0];</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; UART_NR; i++) {</div><div class='del'>-		struct uart_sunsu_port *up = &amp;sunsu_ports[i];</div><div class='add'>+	up-&gt;port.dev = &amp;op-&gt;dev;</div><div class='ctx'> </div><div class='del'>-		/* Do not register Keyboard/Mouse lines with UART</div><div class='del'>-		 * layer.</div><div class='del'>-		 */</div><div class='del'>-		if (up-&gt;su_type == SU_PORT_MS ||</div><div class='del'>-		    up-&gt;su_type == SU_PORT_KBD)</div><div class='del'>-			continue;</div><div class='add'>+	up-&gt;port.type = PORT_UNKNOWN;</div><div class='add'>+	up-&gt;port.uartclk = (SU_BASE_BAUD * 16);</div><div class='ctx'> </div><div class='del'>-		if (up-&gt;port.type == PORT_UNKNOWN)</div><div class='del'>-			continue;</div><div class='add'>+	err = 0;</div><div class='add'>+	if (up-&gt;su_type == SU_PORT_KBD || up-&gt;su_type == SU_PORT_MS) {</div><div class='add'>+		err = sunsu_kbd_ms_init(up);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(up);</div><div class='add'>+			goto out_unmap;</div><div class='add'>+		}</div><div class='add'>+		dev_set_drvdata(&amp;op-&gt;dev, up);</div><div class='ctx'> </div><div class='del'>-		uart_add_one_port(&amp;sunsu_reg, &amp;up-&gt;port);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	up-&gt;port.flags |= UPF_BOOT_AUTOCONF;</div><div class='ctx'> </div><div class='del'>-static int su_node_ok(int node, char *name, int namelen)</div><div class='del'>-{</div><div class='del'>-	if (strncmp(name, "su", namelen) == 0 ||</div><div class='del'>-	    strncmp(name, "su_pnp", namelen) == 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (strncmp(name, "serial", namelen) == 0) {</div><div class='del'>-		char compat[32];</div><div class='del'>-		int clen;</div><div class='del'>-</div><div class='del'>-		/* Is it _really_ a 'su' device? */</div><div class='del'>-		clen = prom_getproperty(node, "compatible", compat, sizeof(compat));</div><div class='del'>-		if (clen &gt; 0) {</div><div class='del'>-			if (strncmp(compat, "sab82532", 8) == 0) {</div><div class='del'>-				/* Nope, Siemens serial, not for us. */</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='add'>+	sunsu_autoconfig(up);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	err = -ENODEV;</div><div class='add'>+	if (up-&gt;port.type == PORT_UNKNOWN)</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> </div><div class='del'>-#define SU_PROPSIZE	128</div><div class='add'>+	up-&gt;port.ops = &amp;sunsu_pops;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Scan status structure.</div><div class='del'>- * "prop" is a local variable but it eats stack to keep it in each</div><div class='del'>- * stack frame of a recursive procedure.</div><div class='del'>- */</div><div class='del'>-struct su_probe_scan {</div><div class='del'>-	int msnode, kbnode;	/* PROM nodes for mouse and keyboard */</div><div class='del'>-	int msx, kbx;		/* minors for mouse and keyboard */</div><div class='del'>-	int devices;		/* scan index */</div><div class='del'>-	char prop[SU_PROPSIZE];</div><div class='del'>-};</div><div class='add'>+	err = uart_add_one_port(&amp;sunsu_reg, &amp;up-&gt;port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unmap;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We have several platforms which present 'su' in different parts</div><div class='del'>- * of the device tree. 'su' may be found under obio, ebus, isa and pci.</div><div class='del'>- * We walk over the tree and find them wherever PROM hides them.</div><div class='del'>- */</div><div class='del'>-static void __init su_probe_any(struct su_probe_scan *t, int sunode)</div><div class='del'>-{</div><div class='del'>-	struct uart_sunsu_port *up;</div><div class='del'>-	int len;</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, up);</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;devices &gt;= UART_NR)</div><div class='del'>-		return;</div><div class='add'>+	inst++;</div><div class='ctx'> </div><div class='del'>-	for (; sunode != 0; sunode = prom_getsibling(sunode)) {</div><div class='del'>-		len = prom_getproperty(sunode, "name", t-&gt;prop, SU_PROPSIZE);</div><div class='del'>-		if (len &lt;= 1)</div><div class='del'>-			continue;		/* Broken PROM node */</div><div class='del'>-</div><div class='del'>-		if (su_node_ok(sunode, t-&gt;prop, len)) {</div><div class='del'>-			up = &amp;sunsu_ports[t-&gt;devices];</div><div class='del'>-			if (t-&gt;kbnode != 0 &amp;&amp; sunode == t-&gt;kbnode) {</div><div class='del'>-				t-&gt;kbx = t-&gt;devices;</div><div class='del'>-				up-&gt;su_type = SU_PORT_KBD;</div><div class='del'>-			} else if (t-&gt;msnode != 0 &amp;&amp; sunode == t-&gt;msnode) {</div><div class='del'>-				t-&gt;msx = t-&gt;devices;</div><div class='del'>-				up-&gt;su_type = SU_PORT_MS;</div><div class='del'>-			} else {</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-				/*</div><div class='del'>-				 * Do not attempt to use the truncated</div><div class='del'>-				 * keyboard/mouse ports as serial ports</div><div class='del'>-				 * on Ultras with PC keyboard attached.</div><div class='del'>-				 */</div><div class='del'>-				if (prom_getbool(sunode, "mouse"))</div><div class='del'>-					continue;</div><div class='del'>-				if (prom_getbool(sunode, "keyboard"))</div><div class='del'>-					continue;</div><div class='del'>-#endif</div><div class='del'>-				up-&gt;su_type = SU_PORT_PORT;</div><div class='del'>-			}</div><div class='del'>-			up-&gt;port_node = sunode;</div><div class='del'>-			++t-&gt;devices;</div><div class='del'>-		} else {</div><div class='del'>-			su_probe_any(t, prom_getchild(sunode));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unmap:</div><div class='add'>+	of_iounmap(up-&gt;port.membase, up-&gt;reg_size);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init sunsu_probe(void)</div><div class='add'>+static int __devexit su_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int node;</div><div class='del'>-	int len;</div><div class='del'>-	struct su_probe_scan scan;</div><div class='add'>+	struct uart_sunsu_port *up = dev_get_drvdata(&amp;dev-&gt;dev);;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * First, we scan the tree.</div><div class='del'>-	 */</div><div class='del'>-	scan.devices = 0;</div><div class='del'>-	scan.msx = -1;</div><div class='del'>-	scan.kbx = -1;</div><div class='del'>-	scan.kbnode = 0;</div><div class='del'>-	scan.msnode = 0;</div><div class='add'>+	if (up-&gt;su_type == SU_PORT_MS ||</div><div class='add'>+	    up-&gt;su_type == SU_PORT_KBD) {</div><div class='add'>+#ifdef CONFIG_SERIO</div><div class='add'>+		serio_unregister_port(&amp;up-&gt;serio);</div><div class='add'>+#endif</div><div class='add'>+		kfree(up);</div><div class='add'>+	} else if (up-&gt;port.type != PORT_UNKNOWN) {</div><div class='add'>+		uart_remove_one_port(&amp;sunsu_reg, &amp;up-&gt;port);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Get the nodes for keyboard and mouse from 'aliases'...</div><div class='del'>-	 */</div><div class='del'>-        node = prom_getchild(prom_root_node);</div><div class='del'>-	node = prom_searchsiblings(node, "aliases");</div><div class='del'>-	if (node != 0) {</div><div class='del'>-		len = prom_getproperty(node, "keyboard", scan.prop, SU_PROPSIZE);</div><div class='del'>-		if (len &gt; 0) {</div><div class='del'>-			scan.prop[len] = 0;</div><div class='del'>-			scan.kbnode = prom_finddevice(scan.prop);</div><div class='del'>-		}</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='del'>-		len = prom_getproperty(node, "mouse", scan.prop, SU_PROPSIZE);</div><div class='del'>-		if (len &gt; 0) {</div><div class='del'>-			scan.prop[len] = 0;</div><div class='del'>-			scan.msnode = prom_finddevice(scan.prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	su_probe_any(&amp;scan, prom_getchild(prom_root_node));</div><div class='add'>+static struct of_device_id su_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "su",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "su_pnp",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "serial",</div><div class='add'>+		.compatible = "su",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, su_match);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Second, we process the special case of keyboard and mouse.</div><div class='del'>-	 *</div><div class='del'>-	 * Currently if we got keyboard and mouse hooked to "su" ports</div><div class='del'>-	 * we do not use any possible remaining "su" as a serial port.</div><div class='del'>-	 * Thus, we ignore values of .msx and .kbx, then compact ports.</div><div class='del'>-	 */</div><div class='del'>-	if (scan.msx != -1 &amp;&amp; scan.kbx != -1) {</div><div class='del'>-		sunsu_ports[0].su_type = SU_PORT_MS;</div><div class='del'>-		sunsu_ports[0].port_node = scan.msnode;</div><div class='del'>-		sunsu_kbd_ms_init(&amp;sunsu_ports[0], 0);</div><div class='add'>+static struct of_platform_driver su_driver = {</div><div class='add'>+	.name		= "su",</div><div class='add'>+	.match_table	= su_match,</div><div class='add'>+	.probe		= su_probe,</div><div class='add'>+	.remove		= __devexit_p(su_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		sunsu_ports[1].su_type = SU_PORT_KBD;</div><div class='del'>-		sunsu_ports[1].port_node = scan.kbnode;</div><div class='del'>-		sunsu_kbd_ms_init(&amp;sunsu_ports[1], 1);</div><div class='add'>+static int num_uart;</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+static int __init sunsu_init(void)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (scan.msx != -1 || scan.kbx != -1) {</div><div class='del'>-		printk("sunsu_probe: cannot match keyboard and mouse, confused\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	num_uart = 0;</div><div class='add'>+	for_each_node_by_name(dp, "su") {</div><div class='add'>+		if (su_get_type(dp) == SU_PORT_PORT)</div><div class='add'>+			num_uart++;</div><div class='add'>+	}</div><div class='add'>+	for_each_node_by_name(dp, "su_pnp") {</div><div class='add'>+		if (su_get_type(dp) == SU_PORT_PORT)</div><div class='add'>+			num_uart++;</div><div class='add'>+	}</div><div class='add'>+	for_each_node_by_name(dp, "serial") {</div><div class='add'>+		if (of_device_is_compatible(dp, "su")) {</div><div class='add'>+			if (su_get_type(dp) == SU_PORT_PORT)</div><div class='add'>+				num_uart++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (scan.devices == 0)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (num_uart) {</div><div class='add'>+		sunsu_reg.minor = sunserial_current_minor;</div><div class='add'>+		sunsu_reg.nr = num_uart;</div><div class='add'>+		err = uart_register_driver(&amp;sunsu_reg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		sunsu_reg.tty_driver-&gt;name_base = sunsu_reg.minor - 64;</div><div class='add'>+		sunserial_current_minor += num_uart;</div><div class='add'>+		sunsu_reg.cons = SUNSU_CONSOLE(num_uart);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Console must be initiated after the generic initialization.</div><div class='del'>-	 */</div><div class='del'>-       	sunsu_serial_init();</div><div class='add'>+	err = of_register_driver(&amp;su_driver, &amp;of_bus_type);</div><div class='add'>+	if (err &amp;&amp; num_uart)</div><div class='add'>+		uart_unregister_driver(&amp;sunsu_reg);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sunsu_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int i, saw_uart;</div><div class='del'>-</div><div class='del'>-	saw_uart = 0;</div><div class='del'>-	for (i = 0; i &lt; UART_NR; i++) {</div><div class='del'>-		struct uart_sunsu_port *up = &amp;sunsu_ports[i];</div><div class='del'>-</div><div class='del'>-		if (up-&gt;su_type == SU_PORT_MS ||</div><div class='del'>-		    up-&gt;su_type == SU_PORT_KBD) {</div><div class='del'>-#ifdef CONFIG_SERIO</div><div class='del'>-			if (up-&gt;serio) {</div><div class='del'>-				serio_unregister_port(up-&gt;serio);</div><div class='del'>-				up-&gt;serio = NULL;</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		} else if (up-&gt;port.type != PORT_UNKNOWN) {</div><div class='del'>-			uart_remove_one_port(&amp;sunsu_reg, &amp;up-&gt;port);</div><div class='del'>-			saw_uart++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (saw_uart)</div><div class='add'>+	if (num_uart)</div><div class='ctx'> 		uart_unregister_driver(&amp;sunsu_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(sunsu_probe);</div><div class='add'>+module_init(sunsu_init);</div><div class='ctx'> module_exit(sunsu_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Eddie C. Dost, Peter Zaitcev, and David S. Miller");</div><div class='add'>+MODULE_DESCRIPTION("Sun SU serial port driver");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c<br/>index cd49ebbf4a45..a1456d9352cb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/sunzilog.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/sunzilog.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/sunzilog.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/sunzilog.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * sunzilog.c</div><div class='add'>+/* sunzilog.c: Zilog serial driver for Sparc systems.</div><div class='ctx'>  *</div><div class='ctx'>  * Driver for Zilog serial chips found on Sun workstations and</div><div class='ctx'>  * servers.  This driver could actually be made more generic.</div><div class='hunk'>@@ -10,10 +9,9 @@</div><div class='ctx'>  * C. Dost, Pete Zaitcev, Ted Ts'o and Alex Buell for their</div><div class='ctx'>  * work there.</div><div class='ctx'>  *</div><div class='del'>- *  Copyright (C) 2002 David S. Miller (davem@redhat.com)</div><div class='add'>+ *  Copyright (C) 2002, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -38,10 +36,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-#include &lt;asm/fhc.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -65,7 +61,7 @@</div><div class='ctx'> #define ZSDELAY()</div><div class='ctx'> #define ZSDELAY_LONG()</div><div class='ctx'> #define ZS_WSYNC(__channel) \</div><div class='del'>-	sbus_readb(&amp;((__channel)-&gt;control))</div><div class='add'>+	readb(&amp;((__channel)-&gt;control))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int num_sunzilog;</div><div class='hunk'>@@ -107,7 +103,7 @@ struct uart_sunzilog_port {</div><div class='ctx'> 	unsigned char			prev_status;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='del'>-	struct serio			*serio;</div><div class='add'>+	struct serio			serio;</div><div class='ctx'> 	int				serio_open;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -138,9 +134,9 @@ static unsigned char read_zsreg(struct zilog_channel __iomem *channel,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char retval;</div><div class='ctx'> </div><div class='del'>-	sbus_writeb(reg, &amp;channel-&gt;control);</div><div class='add'>+	writeb(reg, &amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='del'>-	retval = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+	retval = readb(&amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -149,9 +145,9 @@ static unsigned char read_zsreg(struct zilog_channel __iomem *channel,</div><div class='ctx'> static void write_zsreg(struct zilog_channel __iomem *channel,</div><div class='ctx'> 			unsigned char reg, unsigned char value)</div><div class='ctx'> {</div><div class='del'>-	sbus_writeb(reg, &amp;channel-&gt;control);</div><div class='add'>+	writeb(reg, &amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='del'>-	sbus_writeb(value, &amp;channel-&gt;control);</div><div class='add'>+	writeb(value, &amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -162,17 +158,17 @@ static void sunzilog_clear_fifo(struct zilog_channel __iomem *channel)</div><div class='ctx'> 	for (i = 0; i &lt; 32; i++) {</div><div class='ctx'> 		unsigned char regval;</div><div class='ctx'> </div><div class='del'>-		regval = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+		regval = readb(&amp;channel-&gt;control);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> 		if (regval &amp; Rx_CH_AV)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		regval = read_zsreg(channel, R1);</div><div class='del'>-		sbus_readb(&amp;channel-&gt;data);</div><div class='add'>+		readb(&amp;channel-&gt;data);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 		if (regval &amp; (PAR_ERR | Rx_OVR | CRC_ERR)) {</div><div class='del'>-			sbus_writeb(ERR_RES, &amp;channel-&gt;control);</div><div class='add'>+			writeb(ERR_RES, &amp;channel-&gt;control);</div><div class='ctx'> 			ZSDELAY();</div><div class='ctx'> 			ZS_WSYNC(channel);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -194,7 +190,7 @@ static void __load_zsregs(struct zilog_channel __iomem *channel, unsigned char *</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	sbus_writeb(ERR_RES, &amp;channel-&gt;control);</div><div class='add'>+	writeb(ERR_RES, &amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> 	ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +287,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> 		/* Stop-A is handled by drivers/char/keyboard.c now. */</div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='ctx'> 		if (up-&gt;serio_open)</div><div class='del'>-			serio_interrupt(up-&gt;serio, ch, 0, regs);</div><div class='add'>+			serio_interrupt(&amp;up-&gt;serio, ch, 0, regs);</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (ZS_IS_MOUSE(up)) {</div><div class='ctx'> 		int ret = suncore_mouse_baud_detection(ch, is_break);</div><div class='hunk'>@@ -306,7 +302,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> 		case 0:</div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='ctx'> 			if (up-&gt;serio_open)</div><div class='del'>-				serio_interrupt(up-&gt;serio, ch, 0, regs);</div><div class='add'>+				serio_interrupt(&amp;up-&gt;serio, ch, 0, regs);</div><div class='ctx'> #endif</div><div class='ctx'> 			break;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -330,12 +326,12 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> </div><div class='ctx'> 		r1 = read_zsreg(channel, R1);</div><div class='ctx'> 		if (r1 &amp; (PAR_ERR | Rx_OVR | CRC_ERR)) {</div><div class='del'>-			sbus_writeb(ERR_RES, &amp;channel-&gt;control);</div><div class='add'>+			writeb(ERR_RES, &amp;channel-&gt;control);</div><div class='ctx'> 			ZSDELAY();</div><div class='ctx'> 			ZS_WSYNC(channel);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ch = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+		ch = readb(&amp;channel-&gt;control);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 		/* This funny hack depends upon BRK_ABRT not interfering</div><div class='hunk'>@@ -347,7 +343,7 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> 		if (!(ch &amp; Rx_CH_AV))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ch = sbus_readb(&amp;channel-&gt;data);</div><div class='add'>+		ch = readb(&amp;channel-&gt;data);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 		ch &amp;= up-&gt;parity_mask;</div><div class='hunk'>@@ -406,10 +402,10 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> </div><div class='del'>-	status = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+	status = readb(&amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> </div><div class='del'>-	sbus_writeb(RES_EXT_INT, &amp;channel-&gt;control);</div><div class='add'>+	writeb(RES_EXT_INT, &amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> 	ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +417,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,</div><div class='ctx'> 			 * confusing the PROM.</div><div class='ctx'> 			 */</div><div class='ctx'> 			while (1) {</div><div class='del'>-				status = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+				status = readb(&amp;channel-&gt;control);</div><div class='ctx'> 				ZSDELAY();</div><div class='ctx'> 				if (!(status &amp; BRK_ABRT))</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -458,7 +454,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> 	struct circ_buf *xmit;</div><div class='ctx'> </div><div class='ctx'> 	if (ZS_IS_CONS(up)) {</div><div class='del'>-		unsigned char status = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+		unsigned char status = readb(&amp;channel-&gt;control);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 		/* TX still busy?  Just wait for the next TX done interrupt.</div><div class='hunk'>@@ -487,7 +483,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> </div><div class='ctx'> 	if (up-&gt;port.x_char) {</div><div class='ctx'> 		up-&gt;flags |= SUNZILOG_FLAG_TX_ACTIVE;</div><div class='del'>-		sbus_writeb(up-&gt;port.x_char, &amp;channel-&gt;data);</div><div class='add'>+		writeb(up-&gt;port.x_char, &amp;channel-&gt;data);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> 		ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -506,7 +502,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> 		goto ack_tx_int;</div><div class='ctx'> </div><div class='ctx'> 	up-&gt;flags |= SUNZILOG_FLAG_TX_ACTIVE;</div><div class='del'>-	sbus_writeb(xmit-&gt;buf[xmit-&gt;tail], &amp;channel-&gt;data);</div><div class='add'>+	writeb(xmit-&gt;buf[xmit-&gt;tail], &amp;channel-&gt;data);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> 	ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +515,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='ctx'> ack_tx_int:</div><div class='del'>-	sbus_writeb(RES_Tx_P, &amp;channel-&gt;control);</div><div class='add'>+	writeb(RES_Tx_P, &amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> 	ZS_WSYNC(channel);</div><div class='ctx'> }</div><div class='hunk'>@@ -540,7 +536,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg</div><div class='ctx'> 		/* Channel A */</div><div class='ctx'> 		tty = NULL;</div><div class='ctx'> 		if (r3 &amp; (CHAEXT | CHATxIP | CHARxIP)) {</div><div class='del'>-			sbus_writeb(RES_H_IUS, &amp;channel-&gt;control);</div><div class='add'>+			writeb(RES_H_IUS, &amp;channel-&gt;control);</div><div class='ctx'> 			ZSDELAY();</div><div class='ctx'> 			ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -563,7 +559,7 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg</div><div class='ctx'> 		spin_lock(&amp;up-&gt;port.lock);</div><div class='ctx'> 		tty = NULL;</div><div class='ctx'> 		if (r3 &amp; (CHBEXT | CHBTxIP | CHBRxIP)) {</div><div class='del'>-			sbus_writeb(RES_H_IUS, &amp;channel-&gt;control);</div><div class='add'>+			writeb(RES_H_IUS, &amp;channel-&gt;control);</div><div class='ctx'> 			ZSDELAY();</div><div class='ctx'> 			ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -594,7 +590,7 @@ static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *p</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> </div><div class='ctx'> 	channel = ZILOG_CHANNEL_FROM_PORT(port);</div><div class='del'>-	status = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+	status = readb(&amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -682,7 +678,7 @@ static void sunzilog_start_tx(struct uart_port *port)</div><div class='ctx'> 	up-&gt;flags |= SUNZILOG_FLAG_TX_ACTIVE;</div><div class='ctx'> 	up-&gt;flags &amp;= ~SUNZILOG_FLAG_TX_STOPPED;</div><div class='ctx'> </div><div class='del'>-	status = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+	status = readb(&amp;channel-&gt;control);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> </div><div class='ctx'> 	/* TX busy?  Just wait for the TX done interrupt.  */</div><div class='hunk'>@@ -693,7 +689,7 @@ static void sunzilog_start_tx(struct uart_port *port)</div><div class='ctx'> 	 * IRQ sending engine.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (port-&gt;x_char) {</div><div class='del'>-		sbus_writeb(port-&gt;x_char, &amp;channel-&gt;data);</div><div class='add'>+		writeb(port-&gt;x_char, &amp;channel-&gt;data);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> 		ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -702,7 +698,7 @@ static void sunzilog_start_tx(struct uart_port *port)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct circ_buf *xmit = &amp;port-&gt;info-&gt;xmit;</div><div class='ctx'> </div><div class='del'>-		sbus_writeb(xmit-&gt;buf[xmit-&gt;tail], &amp;channel-&gt;data);</div><div class='add'>+		writeb(xmit-&gt;buf[xmit-&gt;tail], &amp;channel-&gt;data);</div><div class='ctx'> 		ZSDELAY();</div><div class='ctx'> 		ZS_WSYNC(channel);</div><div class='ctx'> </div><div class='hunk'>@@ -779,7 +775,7 @@ static void __sunzilog_startup(struct uart_sunzilog_port *up)</div><div class='ctx'> 	struct zilog_channel __iomem *channel;</div><div class='ctx'> </div><div class='ctx'> 	channel = ZILOG_CHANNEL_FROM_PORT(&amp;up-&gt;port);</div><div class='del'>-	up-&gt;prev_status = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+	up-&gt;prev_status = readb(&amp;channel-&gt;control);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable receiver and transmitter.  */</div><div class='ctx'> 	up-&gt;curregs[R3] |= RxENAB;</div><div class='hunk'>@@ -963,7 +959,7 @@ sunzilog_set_termios(struct uart_port *port, struct termios *termios,</div><div class='ctx'> </div><div class='ctx'> static const char *sunzilog_type(struct uart_port *port)</div><div class='ctx'> {</div><div class='del'>-	return "SunZilog";</div><div class='add'>+	return "zs";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* We do not request/release mappings of the registers here, this</div><div class='hunk'>@@ -1012,242 +1008,55 @@ static struct uart_sunzilog_port *sunzilog_port_table;</div><div class='ctx'> static struct zilog_layout __iomem **sunzilog_chip_regs;</div><div class='ctx'> </div><div class='ctx'> static struct uart_sunzilog_port *sunzilog_irq_chain;</div><div class='del'>-static int zilog_irq = -1;</div><div class='ctx'> </div><div class='ctx'> static struct uart_driver sunzilog_reg = {</div><div class='ctx'> 	.owner		=	THIS_MODULE,</div><div class='ctx'> 	.driver_name	=	"ttyS",</div><div class='del'>-	.devfs_name	=	"tts/",</div><div class='ctx'> 	.dev_name	=	"ttyS",</div><div class='ctx'> 	.major		=	TTY_MAJOR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void * __init alloc_one_table(unsigned long size)</div><div class='del'>-{</div><div class='del'>-	void *ret;</div><div class='del'>-</div><div class='del'>-	ret = kmalloc(size, GFP_KERNEL);</div><div class='del'>-	if (ret != NULL)</div><div class='del'>-		memset(ret, 0, size);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sunzilog_alloc_tables(void)</div><div class='del'>-{</div><div class='del'>-	sunzilog_port_table = </div><div class='del'>-		alloc_one_table(NUM_CHANNELS * sizeof(struct uart_sunzilog_port));</div><div class='del'>-	sunzilog_chip_regs = </div><div class='del'>-		alloc_one_table(NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *));</div><div class='del'>-</div><div class='del'>-	if (sunzilog_port_table == NULL || sunzilog_chip_regs == NULL) {</div><div class='del'>-		prom_printf("SunZilog: Cannot allocate tables.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-</div><div class='del'>-/* We used to attempt to use the address property of the Zilog device node</div><div class='del'>- * but that totally is not necessary on sparc64.</div><div class='del'>- */</div><div class='del'>-static struct zilog_layout __iomem * __init get_zs_sun4u(int chip, int zsnode)</div><div class='add'>+static int __init sunzilog_alloc_tables(void)</div><div class='ctx'> {</div><div class='del'>-	void __iomem *mapped_addr;</div><div class='del'>-	unsigned int sun4u_ino;</div><div class='del'>-	struct sbus_bus *sbus = NULL;</div><div class='del'>-	struct sbus_dev *sdev = NULL;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (central_bus == NULL) {</div><div class='del'>-		for_each_sbus(sbus) {</div><div class='del'>-			for_each_sbusdev(sdev, sbus) {</div><div class='del'>-				if (sdev-&gt;prom_node == zsnode)</div><div class='del'>-					goto found;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>- found:</div><div class='del'>-	if (sdev == NULL &amp;&amp; central_bus == NULL) {</div><div class='del'>-		prom_printf("SunZilog: sdev&amp;&amp;central == NULL for "</div><div class='del'>-			    "Zilog %d in get_zs_sun4u.\n", chip);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	if (central_bus == NULL) {</div><div class='del'>-		mapped_addr =</div><div class='del'>-			sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				     PAGE_SIZE,</div><div class='del'>-				     "Zilog Registers");</div><div class='del'>-	} else {</div><div class='del'>-		struct linux_prom_registers zsregs[1];</div><div class='del'>-</div><div class='del'>-		err = prom_getproperty(zsnode, "reg",</div><div class='del'>-				       (char *) &amp;zsregs[0],</div><div class='del'>-				       sizeof(zsregs));</div><div class='del'>-		if (err == -1) {</div><div class='del'>-			prom_printf("SunZilog: Cannot map "</div><div class='del'>-				    "Zilog %d regs on "</div><div class='del'>-				    "central bus.\n", chip);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		apply_fhc_ranges(central_bus-&gt;child,</div><div class='del'>-				 &amp;zsregs[0], 1);</div><div class='del'>-		apply_central_ranges(central_bus, &amp;zsregs[0], 1);</div><div class='del'>-		mapped_addr = (void __iomem *)</div><div class='del'>-			((((u64)zsregs[0].which_io)&lt;&lt;32UL) |</div><div class='del'>-			((u64)zsregs[0].phys_addr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (zilog_irq == -1) {</div><div class='del'>-		if (central_bus) {</div><div class='del'>-			unsigned long iclr, imap;</div><div class='del'>-</div><div class='del'>-			iclr = central_bus-&gt;child-&gt;fhc_regs.uregs</div><div class='del'>-				+ FHC_UREGS_ICLR;</div><div class='del'>-			imap = central_bus-&gt;child-&gt;fhc_regs.uregs</div><div class='del'>-				+ FHC_UREGS_IMAP;</div><div class='del'>-			zilog_irq = build_irq(12, 0, iclr, imap);</div><div class='del'>-		} else {</div><div class='del'>-			err = prom_getproperty(zsnode, "interrupts",</div><div class='del'>-					       (char *) &amp;sun4u_ino,</div><div class='del'>-					       sizeof(sun4u_ino));</div><div class='del'>-			zilog_irq = sbus_build_irq(sbus_root, sun4u_ino);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (struct zilog_layout __iomem *) mapped_addr;</div><div class='del'>-}</div><div class='del'>-#else /* CONFIG_SPARC64 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX The sun4d case is utterly screwed: it tries to re-walk the tree</div><div class='del'>- * (for the 3rd time) in order to find bootbus and cpu. Streamline it.</div><div class='del'>- */</div><div class='del'>-static struct zilog_layout __iomem * __init get_zs_sun4cmd(int chip, int node)</div><div class='del'>-{</div><div class='del'>-	struct linux_prom_irqs irq_info[2];</div><div class='del'>-	void __iomem *mapped_addr = NULL;</div><div class='del'>-	int zsnode, cpunode, bbnode;</div><div class='del'>-	struct linux_prom_registers zsreg[4];</div><div class='del'>-	struct resource res;</div><div class='del'>-</div><div class='del'>-	if (sparc_cpu_model == sun4d) {</div><div class='del'>-		int walk;</div><div class='del'>-</div><div class='del'>-		zsnode = 0;</div><div class='del'>-		bbnode = 0;</div><div class='del'>-		cpunode = 0;</div><div class='del'>-		for (walk = prom_getchild(prom_root_node);</div><div class='del'>-		     (walk = prom_searchsiblings(walk, "cpu-unit")) != 0;</div><div class='del'>-		     walk = prom_getsibling(walk)) {</div><div class='del'>-			bbnode = prom_getchild(walk);</div><div class='del'>-			if (bbnode &amp;&amp;</div><div class='del'>-			    (bbnode = prom_searchsiblings(bbnode, "bootbus"))) {</div><div class='del'>-				if ((zsnode = prom_getchild(bbnode)) == node) {</div><div class='del'>-					cpunode = walk;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!walk) {</div><div class='del'>-			prom_printf("SunZilog: Cannot find the %d'th bootbus on sun4d.\n",</div><div class='del'>-				    (chip / 2));</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='add'>+	struct uart_sunzilog_port *up;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		if (prom_getproperty(zsnode, "reg",</div><div class='del'>-				     (char *) zsreg, sizeof(zsreg)) == -1) {</div><div class='del'>-			prom_printf("SunZilog: Cannot map Zilog %d\n", chip);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		/* XXX Looks like an off by one? */</div><div class='del'>-		prom_apply_generic_ranges(bbnode, cpunode, zsreg, 1);</div><div class='del'>-		res.start = zsreg[0].phys_addr;</div><div class='del'>-		res.end = res.start + (8 - 1);</div><div class='del'>-		res.flags = zsreg[0].which_io | IORESOURCE_IO;</div><div class='del'>-		mapped_addr = sbus_ioremap(&amp;res, 0, 8, "Zilog Serial");</div><div class='add'>+	size = NUM_CHANNELS * sizeof(struct uart_sunzilog_port);</div><div class='add'>+	sunzilog_port_table = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!sunzilog_port_table)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	} else {</div><div class='del'>-		zsnode = node;</div><div class='add'>+	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='add'>+		up = &amp;sunzilog_port_table[i];</div><div class='ctx'> </div><div class='del'>-#if 0 /* XXX When was this used? */</div><div class='del'>-		if (prom_getintdefault(zsnode, "slave", -1) != chipid) {</div><div class='del'>-			zsnode = prom_getsibling(zsnode);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='add'>+		spin_lock_init(&amp;up-&gt;port.lock);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * "address" is only present on ports that OBP opened</div><div class='del'>-		 * (from Mitch Bradley's "Hitchhiker's Guide to OBP").</div><div class='del'>-		 * We do not use it.</div><div class='del'>-		 */</div><div class='add'>+		if (i == 0)</div><div class='add'>+			sunzilog_irq_chain = up;</div><div class='ctx'> </div><div class='del'>-		if (prom_getproperty(zsnode, "reg",</div><div class='del'>-				     (char *) zsreg, sizeof(zsreg)) == -1) {</div><div class='del'>-			prom_printf("SunZilog: Cannot map Zilog %d\n", chip);</div><div class='del'>-			prom_halt();</div><div class='del'>-		}</div><div class='del'>-		if (sparc_cpu_model == sun4m)	/* Crude. Pass parent. XXX */</div><div class='del'>-			prom_apply_obio_ranges(zsreg, 1);</div><div class='del'>-		res.start = zsreg[0].phys_addr;</div><div class='del'>-		res.end = res.start + (8 - 1);</div><div class='del'>-		res.flags = zsreg[0].which_io | IORESOURCE_IO;</div><div class='del'>-		mapped_addr = sbus_ioremap(&amp;res, 0, 8, "Zilog Serial");</div><div class='add'>+		if (i &lt; NUM_CHANNELS - 1)</div><div class='add'>+			up-&gt;next = up + 1;</div><div class='add'>+		else</div><div class='add'>+			up-&gt;next = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (prom_getproperty(zsnode, "intr",</div><div class='del'>-			     (char *) irq_info, sizeof(irq_info))</div><div class='del'>-		    % sizeof(struct linux_prom_irqs)) {</div><div class='del'>-		prom_printf("SunZilog: Cannot get IRQ property for Zilog %d.\n",</div><div class='del'>-			    chip);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-	if (zilog_irq == -1) {</div><div class='del'>-		zilog_irq = irq_info[0].pri;</div><div class='del'>-	} else if (zilog_irq != irq_info[0].pri) {</div><div class='del'>-		/* XXX. Dumb. Should handle per-chip IRQ, for add-ons. */</div><div class='del'>-		prom_printf("SunZilog: Inconsistent IRQ layout for Zilog %d.\n",</div><div class='del'>-			    chip);</div><div class='del'>-		prom_halt();</div><div class='add'>+	size = NUM_SUNZILOG * sizeof(struct zilog_layout __iomem *);</div><div class='add'>+	sunzilog_chip_regs = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (!sunzilog_chip_regs) {</div><div class='add'>+		kfree(sunzilog_port_table);</div><div class='add'>+		sunzilog_irq_chain = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return (struct zilog_layout __iomem *) mapped_addr;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* !(CONFIG_SPARC64) */</div><div class='ctx'> </div><div class='del'>-/* Get the address of the registers for SunZilog instance CHIP.  */</div><div class='del'>-static struct zilog_layout __iomem * __init get_zs(int chip, int node)</div><div class='add'>+static void sunzilog_free_tables(void)</div><div class='ctx'> {</div><div class='del'>-	if (chip &lt; 0 || chip &gt;= NUM_SUNZILOG) {</div><div class='del'>-		prom_printf("SunZilog: Illegal chip number %d in get_zs.\n", chip);</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SPARC64</div><div class='del'>-	return get_zs_sun4u(chip, node);</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-	if (sparc_cpu_model == sun4) {</div><div class='del'>-		struct resource res;</div><div class='del'>-</div><div class='del'>-		/* Not probe-able, hard code it. */</div><div class='del'>-		switch (chip) {</div><div class='del'>-		case 0:</div><div class='del'>-			res.start = 0xf1000000;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			res.start = 0xf0000000;</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-		zilog_irq = 12;</div><div class='del'>-		res.end = (res.start + (8 - 1));</div><div class='del'>-		res.flags = IORESOURCE_IO;</div><div class='del'>-		return sbus_ioremap(&amp;res, 0, 8, "SunZilog");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return get_zs_sun4cmd(chip, node);</div><div class='del'>-#endif</div><div class='add'>+	kfree(sunzilog_port_table);</div><div class='add'>+	sunzilog_irq_chain = NULL;</div><div class='add'>+	kfree(sunzilog_chip_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ZS_PUT_CHAR_MAX_DELAY	2000	/* 10 ms */</div><div class='hunk'>@@ -1261,7 +1070,7 @@ static void sunzilog_putchar(struct uart_port *port, int ch)</div><div class='ctx'> 	 * udelay with ZSDELAY as that is a NOP on some platforms.  -DaveM</div><div class='ctx'> 	 */</div><div class='ctx'> 	do {</div><div class='del'>-		unsigned char val = sbus_readb(&amp;channel-&gt;control);</div><div class='add'>+		unsigned char val = readb(&amp;channel-&gt;control);</div><div class='ctx'> 		if (val &amp; Tx_BUF_EMP) {</div><div class='ctx'> 			ZSDELAY();</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1269,7 +1078,7 @@ static void sunzilog_putchar(struct uart_port *port, int ch)</div><div class='ctx'> 		udelay(5);</div><div class='ctx'> 	} while (--loops);</div><div class='ctx'> </div><div class='del'>-	sbus_writeb(ch, &amp;channel-&gt;data);</div><div class='add'>+	writeb(ch, &amp;channel-&gt;data);</div><div class='ctx'> 	ZSDELAY();</div><div class='ctx'> 	ZS_WSYNC(channel);</div><div class='ctx'> }</div><div class='hunk'>@@ -1386,28 +1195,6 @@ static struct console sunzilog_console = {</div><div class='ctx'> 	.data   =	&amp;sunzilog_reg,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sunzilog_console_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (con_is_present())</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='del'>-		int this_minor = sunzilog_reg.minor + i;</div><div class='del'>-</div><div class='del'>-		if ((this_minor - 64) == (serial_console - 1))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == NUM_CHANNELS)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	sunzilog_console.index = i;</div><div class='del'>-	sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS;</div><div class='del'>-	register_console(&amp;sunzilog_console);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct console *SUNZILOG_CONSOLE(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1432,101 +1219,8 @@ static inline struct console *SUNZILOG_CONSOLE(void)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> #define SUNZILOG_CONSOLE()	(NULL)</div><div class='del'>-#define sunzilog_console_init() do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * We scan the PROM tree recursively. This is the most reliable way</div><div class='del'>- * to find Zilog nodes on various platforms. However, we face an extreme</div><div class='del'>- * shortage of kernel stack, so we must be very careful. To that end,</div><div class='del'>- * we scan only to a certain depth, and we use a common property buffer</div><div class='del'>- * in the scan structure.</div><div class='del'>- */</div><div class='del'>-#define ZS_PROPSIZE  128</div><div class='del'>-#define ZS_SCAN_DEPTH	5</div><div class='del'>-</div><div class='del'>-struct zs_probe_scan {</div><div class='del'>-	int depth;</div><div class='del'>-	void (*scanner)(struct zs_probe_scan *t, int node);</div><div class='del'>-</div><div class='del'>-	int devices;</div><div class='del'>-	char prop[ZS_PROPSIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __inline__ sunzilog_node_ok(int node, const char *name, int len)</div><div class='del'>-{</div><div class='del'>-	if (strncmp(name, "zs", len) == 0)</div><div class='del'>-		return 1;</div><div class='del'>-	/* Don't fold this procedure just yet. Compare to su_node_ok(). */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sunzilog_scan(struct zs_probe_scan *t, int node)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	for (; node != 0; node = prom_getsibling(node)) {</div><div class='del'>-		len = prom_getproperty(node, "name", t-&gt;prop, ZS_PROPSIZE);</div><div class='del'>-		if (len &lt;= 1)</div><div class='del'>-			continue;		/* Broken PROM node */</div><div class='del'>-		if (sunzilog_node_ok(node, t-&gt;prop, len)) {</div><div class='del'>-			(*t-&gt;scanner)(t, node);</div><div class='del'>-		} else {</div><div class='del'>-			if (t-&gt;depth &lt; ZS_SCAN_DEPTH) {</div><div class='del'>-				t-&gt;depth++;</div><div class='del'>-				sunzilog_scan(t, prom_getchild(node));</div><div class='del'>-				--t-&gt;depth;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init sunzilog_prepare(void)</div><div class='del'>-{</div><div class='del'>-	struct uart_sunzilog_port *up;</div><div class='del'>-	struct zilog_layout __iomem *rp;</div><div class='del'>-	int channel, chip;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Temporary fix.</div><div class='del'>-	 */</div><div class='del'>-	for (channel = 0; channel &lt; NUM_CHANNELS; channel++)</div><div class='del'>-		spin_lock_init(&amp;sunzilog_port_table[channel].port.lock);</div><div class='del'>-</div><div class='del'>-	sunzilog_irq_chain = up = &amp;sunzilog_port_table[0];</div><div class='del'>-	for (channel = 0; channel &lt; NUM_CHANNELS - 1; channel++)</div><div class='del'>-		up[channel].next = &amp;up[channel + 1];</div><div class='del'>-	up[channel].next = NULL;</div><div class='del'>-</div><div class='del'>-	for (chip = 0; chip &lt; NUM_SUNZILOG; chip++) {</div><div class='del'>-		rp = sunzilog_chip_regs[chip];</div><div class='del'>-		up[(chip * 2) + 0].port.membase = (void __iomem *)&amp;rp-&gt;channelA;</div><div class='del'>-		up[(chip * 2) + 1].port.membase = (void __iomem *)&amp;rp-&gt;channelB;</div><div class='del'>-</div><div class='del'>-		/* Channel A */</div><div class='del'>-		up[(chip * 2) + 0].port.iotype = UPIO_MEM;</div><div class='del'>-		up[(chip * 2) + 0].port.irq = zilog_irq;</div><div class='del'>-		up[(chip * 2) + 0].port.uartclk = ZS_CLOCK;</div><div class='del'>-		up[(chip * 2) + 0].port.fifosize = 1;</div><div class='del'>-		up[(chip * 2) + 0].port.ops = &amp;sunzilog_pops;</div><div class='del'>-		up[(chip * 2) + 0].port.type = PORT_SUNZILOG;</div><div class='del'>-		up[(chip * 2) + 0].port.flags = 0;</div><div class='del'>-		up[(chip * 2) + 0].port.line = (chip * 2) + 0;</div><div class='del'>-		up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A;</div><div class='del'>-</div><div class='del'>-		/* Channel B */</div><div class='del'>-		up[(chip * 2) + 1].port.iotype = UPIO_MEM;</div><div class='del'>-		up[(chip * 2) + 1].port.irq = zilog_irq;</div><div class='del'>-		up[(chip * 2) + 1].port.uartclk = ZS_CLOCK;</div><div class='del'>-		up[(chip * 2) + 1].port.fifosize = 1;</div><div class='del'>-		up[(chip * 2) + 1].port.ops = &amp;sunzilog_pops;</div><div class='del'>-		up[(chip * 2) + 1].port.type = PORT_SUNZILOG;</div><div class='del'>-		up[(chip * 2) + 1].port.flags = 0;</div><div class='del'>-		up[(chip * 2) + 1].port.line = (chip * 2) + 1;</div><div class='del'>-		up[(chip * 2) + 1].flags |= 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel)</div><div class='ctx'> {</div><div class='ctx'> 	int baud, brg;</div><div class='hunk'>@@ -1540,8 +1234,6 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe</div><div class='ctx'> 		up-&gt;cflag = B4800 | CS8 | CLOCAL | CREAD;</div><div class='ctx'> 		baud = 4800;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_INFO "zs%d at 0x%p (irq = %s) is a SunZilog\n",</div><div class='del'>-	       channel, up-&gt;port.membase, __irq_itoa(zilog_irq));</div><div class='ctx'> </div><div class='ctx'> 	up-&gt;curregs[R15] = BRKIE;</div><div class='ctx'> 	brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);</div><div class='hunk'>@@ -1553,216 +1245,268 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe</div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='ctx'> static void __init sunzilog_register_serio(struct uart_sunzilog_port *up, int channel)</div><div class='ctx'> {</div><div class='del'>-	struct serio *serio;</div><div class='del'>-</div><div class='del'>-	up-&gt;serio = serio = kmalloc(sizeof(struct serio), GFP_KERNEL);</div><div class='del'>-	if (serio) {</div><div class='del'>-		memset(serio, 0, sizeof(*serio));</div><div class='del'>-</div><div class='del'>-		serio-&gt;port_data = up;</div><div class='del'>-</div><div class='del'>-		serio-&gt;id.type = SERIO_RS232;</div><div class='del'>-		if (channel == KEYBOARD_LINE) {</div><div class='del'>-			serio-&gt;id.proto = SERIO_SUNKBD;</div><div class='del'>-			strlcpy(serio-&gt;name, "zskbd", sizeof(serio-&gt;name));</div><div class='del'>-		} else {</div><div class='del'>-			serio-&gt;id.proto = SERIO_SUN;</div><div class='del'>-			serio-&gt;id.extra = 1;</div><div class='del'>-			strlcpy(serio-&gt;name, "zsms", sizeof(serio-&gt;name));</div><div class='del'>-		}</div><div class='del'>-		strlcpy(serio-&gt;phys,</div><div class='del'>-			(channel == KEYBOARD_LINE ? "zs/serio0" : "zs/serio1"),</div><div class='del'>-			sizeof(serio-&gt;phys));</div><div class='add'>+	struct serio *serio = &amp;up-&gt;serio;</div><div class='ctx'> </div><div class='del'>-		serio-&gt;write = sunzilog_serio_write;</div><div class='del'>-		serio-&gt;open = sunzilog_serio_open;</div><div class='del'>-		serio-&gt;close = sunzilog_serio_close;</div><div class='add'>+	serio-&gt;port_data = up;</div><div class='ctx'> </div><div class='del'>-		serio_register_port(serio);</div><div class='add'>+	serio-&gt;id.type = SERIO_RS232;</div><div class='add'>+	if (channel == KEYBOARD_LINE) {</div><div class='add'>+		serio-&gt;id.proto = SERIO_SUNKBD;</div><div class='add'>+		strlcpy(serio-&gt;name, "zskbd", sizeof(serio-&gt;name));</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_WARNING "zs%d: not enough memory for serio port\n",</div><div class='del'>-			channel);</div><div class='add'>+		serio-&gt;id.proto = SERIO_SUN;</div><div class='add'>+		serio-&gt;id.extra = 1;</div><div class='add'>+		strlcpy(serio-&gt;name, "zsms", sizeof(serio-&gt;name));</div><div class='ctx'> 	}</div><div class='add'>+	strlcpy(serio-&gt;phys,</div><div class='add'>+		(channel == KEYBOARD_LINE ? "zs/serio0" : "zs/serio1"),</div><div class='add'>+		sizeof(serio-&gt;phys));</div><div class='add'>+</div><div class='add'>+	serio-&gt;write = sunzilog_serio_write;</div><div class='add'>+	serio-&gt;open = sunzilog_serio_open;</div><div class='add'>+	serio-&gt;close = sunzilog_serio_close;</div><div class='add'>+	serio-&gt;dev.parent = up-&gt;port.dev;</div><div class='add'>+</div><div class='add'>+	serio_register_port(serio);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void __init sunzilog_init_hw(void)</div><div class='add'>+static void __init sunzilog_init_hw(struct uart_sunzilog_port *up)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='del'>-		struct uart_sunzilog_port *up = &amp;sunzilog_port_table[i];</div><div class='del'>-		struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(&amp;up-&gt;port);</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		int baud, brg;</div><div class='add'>+	struct zilog_channel __iomem *channel;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int baud, brg;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;up-&gt;port.lock, flags);</div><div class='add'>+	channel = ZILOG_CHANNEL_FROM_PORT(&amp;up-&gt;port);</div><div class='ctx'> </div><div class='del'>-		if (ZS_IS_CHANNEL_A(up)) {</div><div class='del'>-			write_zsreg(channel, R9, FHWRES);</div><div class='del'>-			ZSDELAY_LONG();</div><div class='del'>-			(void) read_zsreg(channel, R0);</div><div class='del'>-		}</div><div class='add'>+	spin_lock_irqsave(&amp;up-&gt;port.lock, flags);</div><div class='add'>+	if (ZS_IS_CHANNEL_A(up)) {</div><div class='add'>+		write_zsreg(channel, R9, FHWRES);</div><div class='add'>+		ZSDELAY_LONG();</div><div class='add'>+		(void) read_zsreg(channel, R0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (i == KEYBOARD_LINE || i == MOUSE_LINE) {</div><div class='del'>-			sunzilog_init_kbdms(up, i);</div><div class='del'>-			up-&gt;curregs[R9] |= (NV | MIE);</div><div class='del'>-			write_zsreg(channel, R9, up-&gt;curregs[R9]);</div><div class='del'>-		} else {</div><div class='del'>-			/* Normal serial TTY. */</div><div class='del'>-			up-&gt;parity_mask = 0xff;</div><div class='del'>-			up-&gt;curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;</div><div class='del'>-			up-&gt;curregs[R4] = PAR_EVEN | X16CLK | SB1;</div><div class='del'>-			up-&gt;curregs[R3] = RxENAB | Rx8;</div><div class='del'>-			up-&gt;curregs[R5] = TxENAB | Tx8;</div><div class='del'>-			up-&gt;curregs[R9] = NV | MIE;</div><div class='del'>-			up-&gt;curregs[R10] = NRZ;</div><div class='del'>-			up-&gt;curregs[R11] = TCBR | RCBR;</div><div class='del'>-			baud = 9600;</div><div class='del'>-			brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);</div><div class='del'>-			up-&gt;curregs[R12] = (brg &amp; 0xff);</div><div class='del'>-			up-&gt;curregs[R13] = (brg &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-			up-&gt;curregs[R14] = BRSRC | BRENAB;</div><div class='del'>-			__load_zsregs(channel, up-&gt;curregs);</div><div class='del'>-			write_zsreg(channel, R9, up-&gt;curregs[R9]);</div><div class='del'>-		}</div><div class='add'>+	if (up-&gt;port.line == KEYBOARD_LINE ||</div><div class='add'>+	    up-&gt;port.line == MOUSE_LINE) {</div><div class='add'>+		sunzilog_init_kbdms(up, up-&gt;port.line);</div><div class='add'>+		up-&gt;curregs[R9] |= (NV | MIE);</div><div class='add'>+		write_zsreg(channel, R9, up-&gt;curregs[R9]);</div><div class='add'>+	} else {</div><div class='add'>+		/* Normal serial TTY. */</div><div class='add'>+		up-&gt;parity_mask = 0xff;</div><div class='add'>+		up-&gt;curregs[R1] = EXT_INT_ENAB | INT_ALL_Rx | TxINT_ENAB;</div><div class='add'>+		up-&gt;curregs[R4] = PAR_EVEN | X16CLK | SB1;</div><div class='add'>+		up-&gt;curregs[R3] = RxENAB | Rx8;</div><div class='add'>+		up-&gt;curregs[R5] = TxENAB | Tx8;</div><div class='add'>+		up-&gt;curregs[R9] = NV | MIE;</div><div class='add'>+		up-&gt;curregs[R10] = NRZ;</div><div class='add'>+		up-&gt;curregs[R11] = TCBR | RCBR;</div><div class='add'>+		baud = 9600;</div><div class='add'>+		brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);</div><div class='add'>+		up-&gt;curregs[R12] = (brg &amp; 0xff);</div><div class='add'>+		up-&gt;curregs[R13] = (brg &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		up-&gt;curregs[R14] = BRSRC | BRENAB;</div><div class='add'>+		__load_zsregs(channel, up-&gt;curregs);</div><div class='add'>+		write_zsreg(channel, R9, up-&gt;curregs[R9]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		spin_unlock_irqrestore(&amp;up-&gt;port.lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;up-&gt;port.lock, flags);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SERIO</div><div class='del'>-		if (i == KEYBOARD_LINE || i == MOUSE_LINE)</div><div class='del'>-			sunzilog_register_serio(up, i);</div><div class='add'>+	if (up-&gt;port.line == KEYBOARD_LINE || up-&gt;port.line == MOUSE_LINE)</div><div class='add'>+		sunzilog_register_serio(up, up-&gt;port.line);</div><div class='ctx'> #endif</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct zilog_layout __iomem * __init get_zs(int chip, int node);</div><div class='del'>-</div><div class='del'>-static void __init sunzilog_scan_probe(struct zs_probe_scan *t, int node)</div><div class='del'>-{</div><div class='del'>-	sunzilog_chip_regs[t-&gt;devices] = get_zs(t-&gt;devices, node);</div><div class='del'>-	t-&gt;devices++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init sunzilog_ports_init(void)</div><div class='add'>+static int __devinit zs_get_instance(struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	struct zs_probe_scan scan;</div><div class='ctx'> 	int ret;</div><div class='del'>-	int uart_count;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "SunZilog: %d chips.\n", NUM_SUNZILOG);</div><div class='del'>-</div><div class='del'>-	scan.scanner = sunzilog_scan_probe;</div><div class='del'>-	scan.depth = 0;</div><div class='del'>-	scan.devices = 0;</div><div class='del'>-	sunzilog_scan(&amp;scan, prom_getchild(prom_root_node));</div><div class='del'>-</div><div class='del'>-	sunzilog_prepare();</div><div class='ctx'> </div><div class='del'>-	if (request_irq(zilog_irq, sunzilog_interrupt, SA_SHIRQ,</div><div class='del'>-			"SunZilog", sunzilog_irq_chain)) {</div><div class='del'>-		prom_printf("SunZilog: Unable to register zs interrupt handler.\n");</div><div class='del'>-		prom_halt();</div><div class='del'>-	}</div><div class='add'>+	ret = of_getintprop_default(dp, "slave", -1);</div><div class='add'>+	if (ret != -1)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	sunzilog_init_hw();</div><div class='add'>+	if (of_find_property(dp, "keyboard", NULL))</div><div class='add'>+		ret = 1;</div><div class='add'>+	else</div><div class='add'>+		ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* We can only init this once we have probed the Zilogs</div><div class='del'>-	 * in the system. Do not count channels assigned to keyboards</div><div class='del'>-	 * or mice when we are deciding how many ports to register.</div><div class='del'>-	 */</div><div class='del'>-	uart_count = 0;</div><div class='del'>-	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='del'>-		struct uart_sunzilog_port *up = &amp;sunzilog_port_table[i];</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up))</div><div class='del'>-			continue;</div><div class='add'>+static int zilog_irq = -1;</div><div class='ctx'> </div><div class='del'>-		uart_count++;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	sunzilog_reg.nr = uart_count;</div><div class='del'>-	sunzilog_reg.minor = sunserial_current_minor;</div><div class='add'>+static int __devinit zs_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='add'>+{</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='add'>+	struct uart_sunzilog_port *up;</div><div class='add'>+	struct zilog_layout __iomem *rp;</div><div class='add'>+	int inst = zs_get_instance(dev-&gt;node);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	ret = uart_register_driver(&amp;sunzilog_reg);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		sunzilog_reg.tty_driver-&gt;name_base = sunzilog_reg.minor - 64;</div><div class='del'>-		sunzilog_reg.cons = SUNZILOG_CONSOLE();</div><div class='add'>+	sunzilog_chip_regs[inst] = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+					      sizeof(struct zilog_layout),</div><div class='add'>+					      "zs");</div><div class='add'>+	if (!sunzilog_chip_regs[inst])</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		sunserial_current_minor += uart_count;</div><div class='add'>+	rp = sunzilog_chip_regs[inst];</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='del'>-			struct uart_sunzilog_port *up = &amp;sunzilog_port_table[i];</div><div class='add'>+	if (zilog_irq == -1) {</div><div class='add'>+		zilog_irq = op-&gt;irqs[0];</div><div class='add'>+		err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,</div><div class='add'>+				  "zs", sunzilog_irq_chain);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_iounmap(rp, sizeof(struct zilog_layout));</div><div class='ctx'> </div><div class='del'>-			if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up))</div><div class='del'>-				continue;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (uart_add_one_port(&amp;sunzilog_reg, &amp;up-&gt;port)) {</div><div class='del'>-				printk(KERN_ERR</div><div class='del'>-				    "SunZilog: failed to add port zs%d\n", i);</div><div class='del'>-			}</div><div class='add'>+	up = &amp;sunzilog_port_table[inst * 2];</div><div class='add'>+</div><div class='add'>+	/* Channel A */</div><div class='add'>+	up[0].port.mapbase = op-&gt;resource[0].start + 0x00;</div><div class='add'>+	up[0].port.membase = (void __iomem *) &amp;rp-&gt;channelA;</div><div class='add'>+	up[0].port.iotype = UPIO_MEM;</div><div class='add'>+	up[0].port.irq = op-&gt;irqs[0];</div><div class='add'>+	up[0].port.uartclk = ZS_CLOCK;</div><div class='add'>+	up[0].port.fifosize = 1;</div><div class='add'>+	up[0].port.ops = &amp;sunzilog_pops;</div><div class='add'>+	up[0].port.type = PORT_SUNZILOG;</div><div class='add'>+	up[0].port.flags = 0;</div><div class='add'>+	up[0].port.line = (inst * 2) + 0;</div><div class='add'>+	up[0].port.dev = &amp;op-&gt;dev;</div><div class='add'>+	up[0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A;</div><div class='add'>+	if (inst == 1)</div><div class='add'>+		up[0].flags |= SUNZILOG_FLAG_CONS_KEYB;</div><div class='add'>+	sunzilog_init_hw(&amp;up[0]);</div><div class='add'>+</div><div class='add'>+	/* Channel B */</div><div class='add'>+	up[1].port.mapbase = op-&gt;resource[0].start + 0x04;</div><div class='add'>+	up[1].port.membase = (void __iomem *) &amp;rp-&gt;channelB;</div><div class='add'>+	up[1].port.iotype = UPIO_MEM;</div><div class='add'>+	up[1].port.irq = op-&gt;irqs[0];</div><div class='add'>+	up[1].port.uartclk = ZS_CLOCK;</div><div class='add'>+	up[1].port.fifosize = 1;</div><div class='add'>+	up[1].port.ops = &amp;sunzilog_pops;</div><div class='add'>+	up[1].port.type = PORT_SUNZILOG;</div><div class='add'>+	up[1].port.flags = 0;</div><div class='add'>+	up[1].port.line = (inst * 2) + 1;</div><div class='add'>+	up[1].port.dev = &amp;op-&gt;dev;</div><div class='add'>+	up[1].flags |= 0;</div><div class='add'>+	if (inst == 1)</div><div class='add'>+		up[1].flags |= SUNZILOG_FLAG_CONS_MOUSE;</div><div class='add'>+	sunzilog_init_hw(&amp;up[1]);</div><div class='add'>+</div><div class='add'>+	if (inst != 1) {</div><div class='add'>+		err = uart_add_one_port(&amp;sunzilog_reg, &amp;up[0].port);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_iounmap(rp, sizeof(struct zilog_layout));</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		err = uart_add_one_port(&amp;sunzilog_reg, &amp;up[1].port);</div><div class='add'>+		if (err) {</div><div class='add'>+			uart_remove_one_port(&amp;sunzilog_reg, &amp;up[0].port);</div><div class='add'>+			of_iounmap(rp, sizeof(struct zilog_layout));</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, &amp;up[0]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init sunzilog_scan_count(struct zs_probe_scan *t, int node)</div><div class='add'>+static void __devexit zs_remove_one(struct uart_sunzilog_port *up)</div><div class='ctx'> {</div><div class='del'>-	t-&gt;devices++;</div><div class='add'>+	if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) {</div><div class='add'>+#ifdef CONFIG_SERIO</div><div class='add'>+		serio_unregister_port(&amp;up-&gt;serio);</div><div class='add'>+#endif</div><div class='add'>+	} else</div><div class='add'>+		uart_remove_one_port(&amp;sunzilog_reg, &amp;up-&gt;port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init sunzilog_ports_count(void)</div><div class='add'>+static int __devexit zs_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct zs_probe_scan scan;</div><div class='add'>+	struct uart_sunzilog_port *up = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+	struct zilog_layout __iomem *regs;</div><div class='ctx'> </div><div class='del'>-	/* Sun4 Zilog setup is hard coded, no probing to do.  */</div><div class='del'>-	if (sparc_cpu_model == sun4)</div><div class='del'>-		return 2;</div><div class='add'>+	zs_remove_one(&amp;up[0]);</div><div class='add'>+	zs_remove_one(&amp;up[1]);</div><div class='ctx'> </div><div class='del'>-	scan.scanner = sunzilog_scan_count;</div><div class='del'>-	scan.depth = 0;</div><div class='del'>-	scan.devices = 0;</div><div class='add'>+	regs = sunzilog_chip_regs[up[0].port.line / 2];</div><div class='add'>+	of_iounmap(regs, sizeof(struct zilog_layout));</div><div class='ctx'> </div><div class='del'>-	sunzilog_scan(&amp;scan, prom_getchild(prom_root_node));</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='del'>-	return scan.devices;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct of_device_id zs_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "zs",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, zs_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver zs_driver = {</div><div class='add'>+	.name		= "zs",</div><div class='add'>+	.match_table	= zs_match,</div><div class='add'>+	.probe		= zs_probe,</div><div class='add'>+	.remove		= __devexit_p(zs_remove),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init sunzilog_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	NUM_SUNZILOG = sunzilog_ports_count();</div><div class='del'>-	if (NUM_SUNZILOG == 0)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	NUM_SUNZILOG = 0;</div><div class='add'>+	for_each_node_by_name(dp, "zs")</div><div class='add'>+		NUM_SUNZILOG++;</div><div class='ctx'> </div><div class='del'>-	sunzilog_alloc_tables();</div><div class='add'>+	if (NUM_SUNZILOG) {</div><div class='add'>+		int uart_count;</div><div class='ctx'> </div><div class='del'>-	sunzilog_ports_init();</div><div class='add'>+		err = sunzilog_alloc_tables();</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+		/* Subtract 1 for keyboard, 1 for mouse.  */</div><div class='add'>+		uart_count = (NUM_SUNZILOG * 2) - 2;</div><div class='add'>+</div><div class='add'>+		sunzilog_reg.nr = uart_count;</div><div class='add'>+		sunzilog_reg.minor = sunserial_current_minor;</div><div class='add'>+		err = uart_register_driver(&amp;sunzilog_reg);</div><div class='add'>+		if (err) {</div><div class='add'>+			sunzilog_free_tables();</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		sunzilog_reg.tty_driver-&gt;name_base = sunzilog_reg.minor - 64;</div><div class='add'>+		sunzilog_reg.cons = SUNZILOG_CONSOLE();</div><div class='add'>+</div><div class='add'>+		sunserial_current_minor += uart_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;zs_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit sunzilog_exit(void)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	of_unregister_driver(&amp;zs_driver);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; NUM_CHANNELS; i++) {</div><div class='del'>-		struct uart_sunzilog_port *up = &amp;sunzilog_port_table[i];</div><div class='del'>-</div><div class='del'>-		if (ZS_IS_KEYB(up) || ZS_IS_MOUSE(up)) {</div><div class='del'>-#ifdef CONFIG_SERIO</div><div class='del'>-			if (up-&gt;serio) {</div><div class='del'>-				serio_unregister_port(up-&gt;serio);</div><div class='del'>-				up-&gt;serio = NULL;</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		} else</div><div class='del'>-			uart_remove_one_port(&amp;sunzilog_reg, &amp;up-&gt;port);</div><div class='add'>+	if (zilog_irq != -1) {</div><div class='add'>+		free_irq(zilog_irq, sunzilog_irq_chain);</div><div class='add'>+		zilog_irq = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uart_unregister_driver(&amp;sunzilog_reg);</div><div class='add'>+	if (NUM_SUNZILOG) {</div><div class='add'>+		uart_unregister_driver(&amp;sunzilog_reg);</div><div class='add'>+		sunzilog_free_tables();</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(sunzilog_init);</div><div class='hunk'>@@ -1770,4 +1514,5 @@ module_exit(sunzilog_exit);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David S. Miller");</div><div class='ctx'> MODULE_DESCRIPTION("Sun Zilog serial port driver");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c<br/>index df705fda4243..f802867c95c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/v850e_uart.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/v850e_uart.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/v850e_uart.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/v850e_uart.c</a></div><div class='hunk'>@@ -372,13 +372,13 @@ static int v850e_uart_startup (struct uart_port *port)</div><div class='ctx'> </div><div class='ctx'> 	/* Alloc RX irq.  */</div><div class='ctx'> 	err = request_irq (V850E_UART_RX_IRQ (port-&gt;line), v850e_uart_rx_irq,</div><div class='del'>-			   SA_INTERRUPT, "v850e_uart", port);</div><div class='add'>+			   IRQF_DISABLED, "v850e_uart", port);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Alloc TX irq.  */</div><div class='ctx'> 	err = request_irq (V850E_UART_TX_IRQ (port-&gt;line), v850e_uart_tx_irq,</div><div class='del'>-			   SA_INTERRUPT, "v850e_uart", port);</div><div class='add'>+			   IRQF_DISABLED, "v850e_uart", port);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		free_irq (V850E_UART_RX_IRQ (port-&gt;line), port);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -468,7 +468,6 @@ static struct uart_ops v850e_uart_ops = {</div><div class='ctx'> static struct uart_driver v850e_uart_driver = {</div><div class='ctx'> 	.owner			= THIS_MODULE,</div><div class='ctx'> 	.driver_name		= "v850e_uart",</div><div class='del'>-	.devfs_name		= "tts/",</div><div class='ctx'> 	.dev_name		= "ttyS",</div><div class='ctx'> 	.major			= TTY_MAJOR,</div><div class='ctx'> 	.minor			= V850E_UART_MINOR_BASE,</div><div class='head'>diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c<br/>index df5e8713fa31..6c8b0ea83c3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/serial/vr41xx_siu.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/serial/vr41xx_siu.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/serial/vr41xx_siu.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/serial/vr41xx_siu.c</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'>  *  along with this program; if not, write to the Free Software</div><div class='ctx'>  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SERIAL_VR41XX_CONSOLE) &amp;&amp; defined(CONFIG_MAGIC_SYSRQ)</div><div class='ctx'> #define SUPPORT_SYSRQ</div><div class='hunk'>@@ -39,6 +38,7 @@</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;asm/vr41xx/irq.h&gt;</div><div class='ctx'> #include &lt;asm/vr41xx/siu.h&gt;</div><div class='ctx'> #include &lt;asm/vr41xx/vr41xx.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -911,7 +911,6 @@ static struct uart_driver siu_uart_driver = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.driver_name	= "SIU",</div><div class='ctx'> 	.dev_name	= "ttyVR",</div><div class='del'>-	.devfs_name	= "ttvr/",</div><div class='ctx'> 	.major		= SIU_MAJOR,</div><div class='ctx'> 	.minor		= SIU_MINOR_BASE,</div><div class='ctx'> 	.cons		= SERIAL_VR41XX_CONSOLE,</div><div class='head'>diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c<br/>index 501316b198e5..6c7e0352d561 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sn/ioc3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sn/ioc3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sn/ioc3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sn/ioc3.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *   Pat Gefre &lt;pfg@sgi.com&gt; - IOC3 serial port IRQ demuxer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -26,7 +25,7 @@ static DECLARE_RWSEM(ioc3_devices_rwsem);</div><div class='ctx'> </div><div class='ctx'> static struct ioc3_submodule *ioc3_submodules[IOC3_MAX_SUBMODULES];</div><div class='ctx'> static struct ioc3_submodule *ioc3_ethernet;</div><div class='del'>-static rwlock_t ioc3_submodules_lock = RW_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_RWLOCK(ioc3_submodules_lock);</div><div class='ctx'> </div><div class='ctx'> /* NIC probing code */</div><div class='ctx'> </div><div class='hunk'>@@ -707,7 +706,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)</div><div class='ctx'> 		writel(~0, &amp;idd-&gt;vma-&gt;eisr);</div><div class='ctx'> </div><div class='ctx'> 		idd-&gt;dual_irq = 1;</div><div class='del'>-		if (!request_irq(pdev-&gt;irq, ioc3_intr_eth, SA_SHIRQ,</div><div class='add'>+		if (!request_irq(pdev-&gt;irq, ioc3_intr_eth, IRQF_SHARED,</div><div class='ctx'> 				 "ioc3-eth", (void *)idd)) {</div><div class='ctx'> 			idd-&gt;irq_eth = pdev-&gt;irq;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -715,7 +714,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)</div><div class='ctx'> 			       "%s : request_irq fails for IRQ 0x%x\n ",</div><div class='ctx'> 			       __FUNCTION__, pdev-&gt;irq);</div><div class='ctx'> 		}</div><div class='del'>-		if (!request_irq(pdev-&gt;irq+2, ioc3_intr_io, SA_SHIRQ,</div><div class='add'>+		if (!request_irq(pdev-&gt;irq+2, ioc3_intr_io, IRQF_SHARED,</div><div class='ctx'> 				 "ioc3-io", (void *)idd)) {</div><div class='ctx'> 			idd-&gt;irq_io = pdev-&gt;irq+2;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -724,7 +723,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)</div><div class='ctx'> 			       __FUNCTION__, pdev-&gt;irq+2);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!request_irq(pdev-&gt;irq, ioc3_intr_io, SA_SHIRQ,</div><div class='add'>+		if (!request_irq(pdev-&gt;irq, ioc3_intr_io, IRQF_SHARED,</div><div class='ctx'> 				 "ioc3", (void *)idd)) {</div><div class='ctx'> 			idd-&gt;irq_io = pdev-&gt;irq;</div><div class='ctx'> 		} else {</div><div class='head'>diff --git a/drivers/sn/ioc4.c b/drivers/sn/ioc4.c<br/>index cdeff909403e..8562821e6498 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/sn/ioc4.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/sn/ioc4.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/sn/ioc4.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/sn/ioc4.c</a></div><div class='hunk'>@@ -160,9 +160,6 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)</div><div class='ctx'> 	writel(0, &amp;idd-&gt;idd_misc_regs-&gt;int_out.raw);</div><div class='ctx'> 	mmiowb();</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-	       "%s: Calibrating PCI bus speed "</div><div class='del'>-	       "for pci_dev %s ... ", __FUNCTION__, pci_name(idd-&gt;idd_pdev));</div><div class='ctx'> 	/* Set up square wave */</div><div class='ctx'> 	int_out.raw = 0;</div><div class='ctx'> 	int_out.fields.count = IOC4_CALIBRATE_COUNT;</div><div class='hunk'>@@ -206,11 +203,16 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)</div><div class='ctx'> 	/* Bounds check the result. */</div><div class='ctx'> 	if (period &gt; IOC4_CALIBRATE_LOW_LIMIT ||</div><div class='ctx'> 	    period &lt; IOC4_CALIBRATE_HIGH_LIMIT) {</div><div class='del'>-		printk("failed. Assuming PCI clock ticks are %d ns.\n",</div><div class='add'>+		printk(KERN_INFO</div><div class='add'>+		       "IOC4 %s: Clock calibration failed.  Assuming"</div><div class='add'>+		       "PCI clock is %d ns.\n",</div><div class='add'>+		       pci_name(idd-&gt;idd_pdev),</div><div class='ctx'> 		       IOC4_CALIBRATE_DEFAULT / IOC4_EXTINT_COUNT_DIVISOR);</div><div class='ctx'> 		period = IOC4_CALIBRATE_DEFAULT;</div><div class='ctx'> 	} else {</div><div class='del'>-		printk("succeeded. PCI clock ticks are %ld ns.\n",</div><div class='add'>+		printk(KERN_DEBUG</div><div class='add'>+		       "IOC4 %s: PCI clock is %ld ns.\n",</div><div class='add'>+		       pci_name(idd-&gt;idd_pdev),</div><div class='ctx'> 		       period / IOC4_EXTINT_COUNT_DIVISOR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -222,6 +224,51 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)</div><div class='ctx'> 	idd-&gt;count_period = period;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* There are three variants of IOC4 cards: IO9, IO10, and PCI-RT.</div><div class='add'>+ * Each brings out different combinations of IOC4 signals, thus.</div><div class='add'>+ * the IOC4 subdrivers need to know to which we're attached.</div><div class='add'>+ *</div><div class='add'>+ * We look for the presence of a SCSI (IO9) or SATA (IO10) controller</div><div class='add'>+ * on the same PCI bus at slot number 3 to differentiate IO9 from IO10.</div><div class='add'>+ * If neither is present, it's a PCI-RT.</div><div class='add'>+ */</div><div class='add'>+static unsigned int</div><div class='add'>+ioc4_variant(struct ioc4_driver_data *idd)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	/* IO9: Look for a QLogic ISP 12160 at the same bus and slot 3. */</div><div class='add'>+	do {</div><div class='add'>+		pdev = pci_get_device(PCI_VENDOR_ID_QLOGIC,</div><div class='add'>+				      PCI_DEVICE_ID_QLOGIC_ISP12160, pdev);</div><div class='add'>+		if (pdev &amp;&amp;</div><div class='add'>+		    idd-&gt;idd_pdev-&gt;bus-&gt;number == pdev-&gt;bus-&gt;number &amp;&amp;</div><div class='add'>+		    3 == PCI_SLOT(pdev-&gt;devfn))</div><div class='add'>+			found = 1;</div><div class='add'>+		pci_dev_put(pdev);</div><div class='add'>+	} while (pdev &amp;&amp; !found);</div><div class='add'>+	if (NULL != pdev)</div><div class='add'>+		return IOC4_VARIANT_IO9;</div><div class='add'>+</div><div class='add'>+	/* IO10: Look for a Vitesse VSC 7174 at the same bus and slot 3. */</div><div class='add'>+	pdev = NULL;</div><div class='add'>+	do {</div><div class='add'>+		pdev = pci_get_device(PCI_VENDOR_ID_VITESSE,</div><div class='add'>+				      PCI_DEVICE_ID_VITESSE_VSC7174, pdev);</div><div class='add'>+		if (pdev &amp;&amp;</div><div class='add'>+		    idd-&gt;idd_pdev-&gt;bus-&gt;number == pdev-&gt;bus-&gt;number &amp;&amp;</div><div class='add'>+		    3 == PCI_SLOT(pdev-&gt;devfn))</div><div class='add'>+			found = 1;</div><div class='add'>+		pci_dev_put(pdev);</div><div class='add'>+	} while (pdev &amp;&amp; !found);</div><div class='add'>+	if (NULL != pdev)</div><div class='add'>+		return IOC4_VARIANT_IO10;</div><div class='add'>+</div><div class='add'>+	/* PCI-RT: No SCSI/SATA controller will be present */</div><div class='add'>+	return IOC4_VARIANT_PCI_RT;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Adds a new instance of an IOC4 card */</div><div class='ctx'> static int</div><div class='ctx'> ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)</div><div class='hunk'>@@ -286,6 +333,13 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)</div><div class='ctx'> </div><div class='ctx'> 	/* Failsafe portion of per-IOC4 initialization */</div><div class='ctx'> </div><div class='add'>+	/* Detect card variant */</div><div class='add'>+	idd-&gt;idd_variant = ioc4_variant(idd);</div><div class='add'>+	printk(KERN_INFO "IOC4 %s: %s card detected.\n", pci_name(pdev),</div><div class='add'>+	       idd-&gt;idd_variant == IOC4_VARIANT_IO9 ? "IO9" :</div><div class='add'>+	       idd-&gt;idd_variant == IOC4_VARIANT_PCI_RT ? "PCI-RT" :</div><div class='add'>+	       idd-&gt;idd_variant == IOC4_VARIANT_IO10 ? "IO10" : "unknown");</div><div class='add'>+</div><div class='ctx'> 	/* Initialize IOC4 */</div><div class='ctx'> 	pci_read_config_dword(idd-&gt;idd_pdev, PCI_COMMAND, &amp;pcmd);</div><div class='ctx'> 	pci_write_config_dword(idd-&gt;idd_pdev, PCI_COMMAND,</div><div class='hunk'>@@ -384,7 +438,7 @@ static struct pci_device_id ioc4_id_table[] = {</div><div class='ctx'> 	{0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pci_driver __devinitdata ioc4_driver = {</div><div class='add'>+static struct pci_driver ioc4_driver = {</div><div class='ctx'> 	.name = "IOC4",</div><div class='ctx'> 	.id_table = ioc4_id_table,</div><div class='ctx'> 	.probe = ioc4_probe,</div><div class='head'>diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c<br/>index 1cea4a6799fe..146298ad7371 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/spi/spi.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/spi/spi.c</a></div><div class='hunk'>@@ -210,6 +210,7 @@ spi_new_device(struct spi_master *master, struct spi_board_info *chip)</div><div class='ctx'> 	proxy-&gt;master = master;</div><div class='ctx'> 	proxy-&gt;chip_select = chip-&gt;chip_select;</div><div class='ctx'> 	proxy-&gt;max_speed_hz = chip-&gt;max_speed_hz;</div><div class='add'>+	proxy-&gt;mode = chip-&gt;mode;</div><div class='ctx'> 	proxy-&gt;irq = chip-&gt;irq;</div><div class='ctx'> 	proxy-&gt;modalias = chip-&gt;modalias;</div><div class='ctx'> </div><div class='hunk'>@@ -509,7 +510,7 @@ static void spi_complete(void *arg)</div><div class='ctx'>  */</div><div class='ctx'> int spi_sync(struct spi_device *spi, struct spi_message *message)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_COMPLETION(done);</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(done);</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	message-&gt;complete = spi_complete;</div><div class='head'>diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c<br/>index dd2f950b21a7..a23862ef72b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi_bitbang.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/spi/spi_bitbang.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi_bitbang.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/spi/spi_bitbang.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='head'>diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c<br/>index a006a1ee27ac..39d9b20f2038 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/spi/spi_butterfly.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/spi/spi_butterfly.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/spi/spi_butterfly.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/spi/spi_butterfly.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * along with this program; if not, write to the Free Software</div><div class='ctx'>  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/tc/lk201.c b/drivers/tc/lk201.c<br/>index cf10d5cdfb93..757dec9c7ee9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/tc/lk201.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/tc/lk201.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/tc/lk201.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/tc/lk201.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Copyright (C) 2001, 2002, 2003, 2004  Maciej W. Rozycki</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c<br/>index 2dffa8e303b2..5e8a27620f6f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/tc/zs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/tc/zs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/tc/zs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/tc/zs.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'>  *     is shared with DSRS(DTE) at pin 23.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -1745,7 +1744,6 @@ int __init zs_init(void)</div><div class='ctx'> 	/* Not all of this is exactly right for us. */</div><div class='ctx'> </div><div class='ctx'> 	serial_driver-&gt;owner = THIS_MODULE;</div><div class='del'>-	serial_driver-&gt;devfs_name = "tts/";</div><div class='ctx'> 	serial_driver-&gt;name = "ttyS";</div><div class='ctx'> 	serial_driver-&gt;major = TTY_MAJOR;</div><div class='ctx'> 	serial_driver-&gt;minor_start = 64;</div><div class='hunk'>@@ -1754,7 +1752,7 @@ int __init zs_init(void)</div><div class='ctx'> 	serial_driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	serial_driver-&gt;init_termios.c_cflag =</div><div class='ctx'> 		B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='del'>-	serial_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	serial_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	tty_set_operations(serial_driver, &amp;serial_ops);</div><div class='ctx'> </div><div class='ctx'> 	if (tty_register_driver(serial_driver))</div><div class='hunk'>@@ -1793,7 +1791,7 @@ int __init zs_init(void)</div><div class='ctx'> 		zs_soft[channel].clk_divisor = 16;</div><div class='ctx'> 		zs_soft[channel].zs_baud = get_zsbaud(&amp;zs_soft[channel]);</div><div class='ctx'> </div><div class='del'>-		if (request_irq(zs_soft[channel].irq, rs_interrupt, SA_SHIRQ,</div><div class='add'>+		if (request_irq(zs_soft[channel].irq, rs_interrupt, IRQF_SHARED,</div><div class='ctx'> 				"scc", &amp;zs_soft[channel]))</div><div class='ctx'> 			printk(KERN_ERR "decserial: can't get irq %d\n",</div><div class='ctx'> 			       zs_soft[channel].irq);</div><div class='head'>diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c<br/>index 5578a9dd04e8..f6b2948ab288 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/telephony/ixj.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/telephony/ixj.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/telephony/ixj.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/telephony/ixj.c</a></div><div class='hunk'>@@ -5712,7 +5712,7 @@ static int ixj_daa_write(IXJ *j)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ixj_set_tone_off(unsigned short arg, IXJ *j)</div><div class='add'>+static int ixj_set_tone_off(unsigned short arg, IXJ *j)</div><div class='ctx'> {</div><div class='ctx'> 	j-&gt;tone_off_time = arg;</div><div class='ctx'> 	if (ixj_WriteDSPCommand(0x6E05, j))		/* Set Tone Off Period */</div><div class='head'>diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c<br/>index e166fffea86b..e41f49afd0f4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/telephony/phonedev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/telephony/phonedev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/telephony/phonedev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/telephony/phonedev.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/sem.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define PHONE_NUM_DEVICES	256</div><div class='hunk'>@@ -106,8 +105,6 @@ int phone_register_device(struct phone_device *p, int unit)</div><div class='ctx'> 		if (phone_device[i] == NULL) {</div><div class='ctx'> 			phone_device[i] = p;</div><div class='ctx'> 			p-&gt;minor = i;</div><div class='del'>-			devfs_mk_cdev(MKDEV(PHONE_MAJOR,i),</div><div class='del'>-				S_IFCHR|S_IRUSR|S_IWUSR, "phone/%d", i);</div><div class='ctx'> 			mutex_unlock(&amp;phone_lock);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -125,7 +122,6 @@ void phone_unregister_device(struct phone_device *pfd)</div><div class='ctx'> 	mutex_lock(&amp;phone_lock);</div><div class='ctx'> 	if (phone_device[pfd-&gt;minor] != pfd)</div><div class='ctx'> 		panic("phone: bad unregister");</div><div class='del'>-	devfs_remove("phone/%d", pfd-&gt;minor);</div><div class='ctx'> 	phone_device[pfd-&gt;minor] = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;phone_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig<br/>index 7fdbc5dad5fd..2ee742d40c43 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/Kconfig</a></div><div class='hunk'>@@ -23,6 +23,7 @@ config USB_ARCH_HAS_OHCI</div><div class='ctx'> 	default y if ARCH_LH7A404</div><div class='ctx'> 	default y if ARCH_S3C2410</div><div class='ctx'> 	default y if PXA27x</div><div class='add'>+	default y if ARCH_EP93XX</div><div class='ctx'> 	default y if ARCH_AT91RM9200</div><div class='ctx'> 	# PPC:</div><div class='ctx'> 	default y if STB03xxx</div><div class='head'>diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile<br/>index 9b7d9769fdcc..4710eb02ed64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/Makefile</a></div><div class='hunk'>@@ -48,6 +48,7 @@ obj-$(CONFIG_USB_MICROTEK)	+= image/</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL)	+= serial/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_AUERSWALD)	+= misc/</div><div class='add'>+obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/</div><div class='ctx'> obj-$(CONFIG_USB_CYTHERM)	+= misc/</div><div class='ctx'> obj-$(CONFIG_USB_EMI26)		+= misc/</div><div class='ctx'> obj-$(CONFIG_USB_EMI62)		+= misc/</div><div class='hunk'>@@ -61,6 +62,7 @@ obj-$(CONFIG_USB_TEST)		+= misc/</div><div class='ctx'> obj-$(CONFIG_USB_USS720)	+= misc/</div><div class='ctx'> obj-$(CONFIG_USB_PHIDGETSERVO)	+= misc/</div><div class='ctx'> obj-$(CONFIG_USB_SISUSBVGA)	+= misc/</div><div class='add'>+obj-$(CONFIG_USB_APPLEDISPLAY)	+= misc/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_ATM)		+= atm/</div><div class='ctx'> obj-$(CONFIG_USB_SPEEDTOUCH)	+= atm/</div><div class='head'>diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c<br/>index 546249843b8e..a38701c742c3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/atm/usbatm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/atm/usbatm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/atm/usbatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/atm/usbatm.c</a></div><div class='hunk'>@@ -1039,7 +1039,7 @@ static void usbatm_tasklet_schedule(unsigned long data)</div><div class='ctx'> 	tasklet_schedule((struct tasklet_struct *) data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void usbatm_init_channel(struct usbatm_channel *channel)</div><div class='add'>+static void usbatm_init_channel(struct usbatm_channel *channel)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_init(&amp;channel-&gt;lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;channel-&gt;list);</div><div class='head'>diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c<br/>index 42d6823b82b3..70125c6d3be4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/atm/xusbatm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/atm/xusbatm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/atm/xusbatm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/atm/xusbatm.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;		/* FIXME: required by linux/etherdevice.h */</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;		/* for random_ether_addr() */</div><div class='ctx'> </div><div class='ctx'> #include "usbatm.h"</div><div class='head'>diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c<br/>index 6dd339f4c0fc..ca90326f2f5c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/class/cdc-acm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/class/cdc-acm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/class/cdc-acm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/class/cdc-acm.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_cdc.h&gt;</div><div class='add'>+#include &lt;linux/usb/cdc.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='hunk'>@@ -127,8 +127,8 @@ static int acm_wb_alloc(struct acm *acm)</div><div class='ctx'> 			wb-&gt;use = 1;</div><div class='ctx'> 			return wbn;</div><div class='ctx'> 		}</div><div class='del'>-		wbn = (wbn + 1) % ACM_NWB;</div><div class='del'>-		if (++i &gt;= ACM_NWB)</div><div class='add'>+		wbn = (wbn + 1) % ACM_NW;</div><div class='add'>+		if (++i &gt;= ACM_NW)</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -142,10 +142,9 @@ static int acm_wb_is_avail(struct acm *acm)</div><div class='ctx'> {</div><div class='ctx'> 	int i, n;</div><div class='ctx'> </div><div class='del'>-	n = 0;</div><div class='del'>-	for (i = 0; i &lt; ACM_NWB; i++) {</div><div class='del'>-		if (!acm-&gt;wb[i].use)</div><div class='del'>-			n++;</div><div class='add'>+	n = ACM_NW;</div><div class='add'>+	for (i = 0; i &lt; ACM_NW; i++) {</div><div class='add'>+		n -= acm-&gt;wb[i].use;</div><div class='ctx'> 	}</div><div class='ctx'> 	return n;</div><div class='ctx'> }</div><div class='hunk'>@@ -167,7 +166,7 @@ static void acm_write_done(struct acm *acm)</div><div class='ctx'> 	acm-&gt;write_ready = 1;</div><div class='ctx'> 	wbn = acm-&gt;write_current;</div><div class='ctx'> 	acm_wb_free(acm, wbn);</div><div class='del'>-	acm-&gt;write_current = (wbn + 1) % ACM_NWB;</div><div class='add'>+	acm-&gt;write_current = (wbn + 1) % ACM_NW;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;acm-&gt;write_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -291,22 +290,32 @@ static void acm_read_bulk(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	struct acm_rb *buf;</div><div class='ctx'> 	struct acm_ru *rcv = urb-&gt;context;</div><div class='ctx'> 	struct acm *acm = rcv-&gt;instance;</div><div class='del'>-	dbg("Entering acm_read_bulk with status %d\n", urb-&gt;status);</div><div class='add'>+	int status = urb-&gt;status;</div><div class='add'>+	dbg("Entering acm_read_bulk with status %d", urb-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	if (!ACM_READY(acm))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;status)</div><div class='del'>-		dev_dbg(&amp;acm-&gt;data-&gt;dev, "bulk rx status %d\n", urb-&gt;status);</div><div class='add'>+	if (status)</div><div class='add'>+		dev_dbg(&amp;acm-&gt;data-&gt;dev, "bulk rx status %d", status);</div><div class='ctx'> </div><div class='ctx'> 	buf = rcv-&gt;buffer;</div><div class='ctx'> 	buf-&gt;size = urb-&gt;actual_length;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;acm-&gt;read_lock);</div><div class='del'>-	list_add_tail(&amp;rcv-&gt;list, &amp;acm-&gt;spare_read_urbs);</div><div class='del'>-	list_add_tail(&amp;buf-&gt;list, &amp;acm-&gt;filled_read_bufs);</div><div class='del'>-	spin_unlock(&amp;acm-&gt;read_lock);</div><div class='del'>-</div><div class='add'>+	if (likely(status == 0)) {</div><div class='add'>+		spin_lock(&amp;acm-&gt;read_lock);</div><div class='add'>+		list_add_tail(&amp;rcv-&gt;list, &amp;acm-&gt;spare_read_urbs);</div><div class='add'>+		list_add_tail(&amp;buf-&gt;list, &amp;acm-&gt;filled_read_bufs);</div><div class='add'>+		spin_unlock(&amp;acm-&gt;read_lock);</div><div class='add'>+	} else {</div><div class='add'>+		/* we drop the buffer due to an error */</div><div class='add'>+		spin_lock(&amp;acm-&gt;read_lock);</div><div class='add'>+		list_add_tail(&amp;rcv-&gt;list, &amp;acm-&gt;spare_read_urbs);</div><div class='add'>+		list_add(&amp;buf-&gt;list, &amp;acm-&gt;spare_read_bufs);</div><div class='add'>+		spin_unlock(&amp;acm-&gt;read_lock);</div><div class='add'>+		/* nevertheless the tasklet must be kicked unconditionally</div><div class='add'>+		so the queue cannot dry up */</div><div class='add'>+	}</div><div class='ctx'> 	tasklet_schedule(&amp;acm-&gt;urb_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -334,7 +343,7 @@ next_buffer:</div><div class='ctx'> 	list_del(&amp;buf-&gt;list);</div><div class='ctx'> 	spin_unlock(&amp;acm-&gt;read_lock);</div><div class='ctx'> </div><div class='del'>-	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d\n", buf, buf-&gt;size);</div><div class='add'>+	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d", buf, buf-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	tty_buffer_request_room(tty, buf-&gt;size);</div><div class='ctx'> 	if (!acm-&gt;throttle)</div><div class='hunk'>@@ -385,7 +394,7 @@ urbs:</div><div class='ctx'> 		rcv-&gt;urb-&gt;transfer_dma = buf-&gt;dma;</div><div class='ctx'> 		rcv-&gt;urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> </div><div class='del'>-		dbg("acm_rx_tasklet: sending urb 0x%p, rcv 0x%p, buf 0x%p\n", rcv-&gt;urb, rcv, buf);</div><div class='add'>+		dbg("acm_rx_tasklet: sending urb 0x%p, rcv 0x%p, buf 0x%p", rcv-&gt;urb, rcv, buf);</div><div class='ctx'> </div><div class='ctx'> 		/* This shouldn't kill the driver as unsuccessful URBs are returned to the</div><div class='ctx'> 		   free-urbs-pool and resubmited ASAP */</div><div class='hunk'>@@ -404,7 +413,7 @@ static void acm_write_bulk(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct acm *acm = (struct acm *)urb-&gt;context;</div><div class='ctx'> </div><div class='del'>-	dbg("Entering acm_write_bulk with status %d\n", urb-&gt;status);</div><div class='add'>+	dbg("Entering acm_write_bulk with status %d", urb-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	acm_write_done(acm);</div><div class='ctx'> 	acm_write_start(acm);</div><div class='hunk'>@@ -415,7 +424,7 @@ static void acm_write_bulk(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> static void acm_softint(void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct acm *acm = private;</div><div class='del'>-	dbg("Entering acm_softint.\n");</div><div class='add'>+	dbg("Entering acm_softint.");</div><div class='ctx'> 	</div><div class='ctx'> 	if (!ACM_READY(acm))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -431,7 +440,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	struct acm *acm;</div><div class='ctx'> 	int rv = -EINVAL;</div><div class='ctx'> 	int i;</div><div class='del'>-	dbg("Entering acm_tty_open.\n");</div><div class='add'>+	dbg("Entering acm_tty_open.");</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;open_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -464,10 +473,10 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;acm-&gt;spare_read_urbs);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;acm-&gt;spare_read_bufs);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;acm-&gt;filled_read_bufs);</div><div class='del'>-	for (i = 0; i &lt; ACM_NRU; i++) {</div><div class='add'>+	for (i = 0; i &lt; acm-&gt;rx_buflimit; i++) {</div><div class='ctx'> 		list_add(&amp;(acm-&gt;ru[i].list), &amp;acm-&gt;spare_read_urbs);</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; ACM_NRB; i++) {</div><div class='add'>+	for (i = 0; i &lt; acm-&gt;rx_buflimit; i++) {</div><div class='ctx'> 		list_add(&amp;(acm-&gt;rb[i].list), &amp;acm-&gt;spare_read_bufs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -488,14 +497,15 @@ bail_out:</div><div class='ctx'> </div><div class='ctx'> static void acm_tty_unregister(struct acm *acm)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i,nr;</div><div class='ctx'> </div><div class='add'>+	nr = acm-&gt;rx_buflimit;</div><div class='ctx'> 	tty_unregister_device(acm_tty_driver, acm-&gt;minor);</div><div class='ctx'> 	usb_put_intf(acm-&gt;control);</div><div class='ctx'> 	acm_table[acm-&gt;minor] = NULL;</div><div class='ctx'> 	usb_free_urb(acm-&gt;ctrlurb);</div><div class='ctx'> 	usb_free_urb(acm-&gt;writeurb);</div><div class='del'>-	for (i = 0; i &lt; ACM_NRU; i++)</div><div class='add'>+	for (i = 0; i &lt; nr; i++)</div><div class='ctx'> 		usb_free_urb(acm-&gt;ru[i].urb);</div><div class='ctx'> 	kfree(acm);</div><div class='ctx'> }</div><div class='hunk'>@@ -503,18 +513,19 @@ static void acm_tty_unregister(struct acm *acm)</div><div class='ctx'> static void acm_tty_close(struct tty_struct *tty, struct file *filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct acm *acm = tty-&gt;driver_data;</div><div class='del'>-	int i;</div><div class='add'>+	int i,nr;</div><div class='ctx'> </div><div class='ctx'> 	if (!acm || !acm-&gt;used)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	nr = acm-&gt;rx_buflimit;</div><div class='ctx'> 	mutex_lock(&amp;open_mutex);</div><div class='ctx'> 	if (!--acm-&gt;used) {</div><div class='ctx'> 		if (acm-&gt;dev) {</div><div class='ctx'> 			acm_set_control(acm, acm-&gt;ctrlout = 0);</div><div class='ctx'> 			usb_kill_urb(acm-&gt;ctrlurb);</div><div class='ctx'> 			usb_kill_urb(acm-&gt;writeurb);</div><div class='del'>-			for (i = 0; i &lt; ACM_NRU; i++)</div><div class='add'>+			for (i = 0; i &lt; nr; i++)</div><div class='ctx'> 				usb_kill_urb(acm-&gt;ru[i].urb);</div><div class='ctx'> 		} else</div><div class='ctx'> 			acm_tty_unregister(acm);</div><div class='hunk'>@@ -530,7 +541,7 @@ static int acm_tty_write(struct tty_struct *tty, const unsigned char *buf, int c</div><div class='ctx'> 	int wbn;</div><div class='ctx'> 	struct acm_wb *wb;</div><div class='ctx'> </div><div class='del'>-	dbg("Entering acm_tty_write to write %d bytes,\n", count);</div><div class='add'>+	dbg("Entering acm_tty_write to write %d bytes,", count);</div><div class='ctx'> </div><div class='ctx'> 	if (!ACM_READY(acm))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -576,7 +587,7 @@ static int acm_tty_chars_in_buffer(struct tty_struct *tty)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This is inaccurate (overcounts), but it works.</div><div class='ctx'> 	 */</div><div class='del'>-	return (ACM_NWB - acm_wb_is_avail(acm)) * acm-&gt;writesize;</div><div class='add'>+	return (ACM_NW - acm_wb_is_avail(acm)) * acm-&gt;writesize;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void acm_tty_throttle(struct tty_struct *tty)</div><div class='hunk'>@@ -712,7 +723,7 @@ static void acm_write_buffers_free(struct acm *acm)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct acm_wb *wb;</div><div class='ctx'> </div><div class='del'>-	for (wb = &amp;acm-&gt;wb[0], i = 0; i &lt; ACM_NWB; i++, wb++) {</div><div class='add'>+	for (wb = &amp;acm-&gt;wb[0], i = 0; i &lt; ACM_NW; i++, wb++) {</div><div class='ctx'> 		usb_buffer_free(acm-&gt;dev, acm-&gt;writesize, wb-&gt;buf, wb-&gt;dmah);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -723,7 +734,7 @@ static int acm_write_buffers_alloc(struct acm *acm)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct acm_wb *wb;</div><div class='ctx'> </div><div class='del'>-	for (wb = &amp;acm-&gt;wb[0], i = 0; i &lt; ACM_NWB; i++, wb++) {</div><div class='add'>+	for (wb = &amp;acm-&gt;wb[0], i = 0; i &lt; ACM_NW; i++, wb++) {</div><div class='ctx'> 		wb-&gt;buf = usb_buffer_alloc(acm-&gt;dev, acm-&gt;writesize, GFP_KERNEL,</div><div class='ctx'> 		    &amp;wb-&gt;dmah);</div><div class='ctx'> 		if (!wb-&gt;buf) {</div><div class='hunk'>@@ -760,10 +771,14 @@ static int acm_probe (struct usb_interface *intf,</div><div class='ctx'> 	int call_interface_num = -1;</div><div class='ctx'> 	int data_interface_num;</div><div class='ctx'> 	unsigned long quirks;</div><div class='add'>+	int num_rx_buf;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* handle quirks deadly to normal probing*/</div><div class='add'>+	/* normal quirks */</div><div class='ctx'> 	quirks = (unsigned long)id-&gt;driver_info;</div><div class='add'>+	num_rx_buf = (quirks == SINGLE_RX_URB) ? 1 : ACM_NR;</div><div class='add'>+</div><div class='add'>+	/* handle quirks deadly to normal probing*/</div><div class='ctx'> 	if (quirks == NO_UNION_NORMAL) {</div><div class='ctx'> 		data_interface = usb_ifnum_to_if(usb_dev, 1);</div><div class='ctx'> 		control_interface = usb_ifnum_to_if(usb_dev, 0);</div><div class='hunk'>@@ -778,7 +793,7 @@ static int acm_probe (struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	if (!buflen) {</div><div class='ctx'> 		if (intf-&gt;cur_altsetting-&gt;endpoint-&gt;extralen &amp;&amp; intf-&gt;cur_altsetting-&gt;endpoint-&gt;extra) {</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev,"Seeking extra descriptors on endpoint\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev,"Seeking extra descriptors on endpoint");</div><div class='ctx'> 			buflen = intf-&gt;cur_altsetting-&gt;endpoint-&gt;extralen;</div><div class='ctx'> 			buffer = intf-&gt;cur_altsetting-&gt;endpoint-&gt;extra;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -827,24 +842,24 @@ next_desc:</div><div class='ctx'> </div><div class='ctx'> 	if (!union_header) {</div><div class='ctx'> 		if (call_interface_num &gt; 0) {</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev,"No union descriptor, using call management descriptor\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev,"No union descriptor, using call management descriptor");</div><div class='ctx'> 			data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));</div><div class='ctx'> 			control_interface = intf;</div><div class='ctx'> 		} else {</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev,"No union descriptor, giving up\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev,"No union descriptor, giving up");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		control_interface = usb_ifnum_to_if(usb_dev, union_header-&gt;bMasterInterface0);</div><div class='ctx'> 		data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header-&gt;bSlaveInterface0));</div><div class='ctx'> 		if (!control_interface || !data_interface) {</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev,"no interfaces\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev,"no interfaces");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (data_interface_num != call_interface_num)</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev,"Seperate call control interface. That is not fully supported.\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev,"Seperate call control interface. That is not fully supported.");</div><div class='ctx'> </div><div class='ctx'> skip_normal_probe:</div><div class='ctx'> </div><div class='hunk'>@@ -852,7 +867,7 @@ skip_normal_probe:</div><div class='ctx'> 	if (data_interface-&gt;cur_altsetting-&gt;desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {</div><div class='ctx'> 		if (control_interface-&gt;cur_altsetting-&gt;desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {</div><div class='ctx'> 			struct usb_interface *t;</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev,"Your device has switched interfaces.\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev,"Your device has switched interfaces.");</div><div class='ctx'> </div><div class='ctx'> 			t = control_interface;</div><div class='ctx'> 			control_interface = data_interface;</div><div class='hunk'>@@ -863,7 +878,7 @@ skip_normal_probe:</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (usb_interface_claimed(data_interface)) { /* valid in this context */</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev,"The data interface isn't available\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev,"The data interface isn't available");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -880,7 +895,7 @@ skip_normal_probe:</div><div class='ctx'> 	if ((epread-&gt;bEndpointAddress &amp; USB_DIR_IN) != USB_DIR_IN) {</div><div class='ctx'> 		/* descriptors are swapped */</div><div class='ctx'> 		struct usb_endpoint_descriptor *t;</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev,"The data interface has switched endpoints\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev,"The data interface has switched endpoints");</div><div class='ctx'> 		</div><div class='ctx'> 		t = epread;</div><div class='ctx'> 		epread = epwrite;</div><div class='hunk'>@@ -895,12 +910,12 @@ skip_normal_probe:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev, "out of memory (acm kzalloc)\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev, "out of memory (acm kzalloc)");</div><div class='ctx'> 		goto alloc_fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ctrlsize = le16_to_cpu(epctrl-&gt;wMaxPacketSize);</div><div class='del'>-	readsize = le16_to_cpu(epread-&gt;wMaxPacketSize)*2;</div><div class='add'>+	readsize = le16_to_cpu(epread-&gt;wMaxPacketSize)* ( quirks == SINGLE_RX_URB ? 1 : 2);</div><div class='ctx'> 	acm-&gt;writesize = le16_to_cpu(epwrite-&gt;wMaxPacketSize);</div><div class='ctx'> 	acm-&gt;control = control_interface;</div><div class='ctx'> 	acm-&gt;data = data_interface;</div><div class='hunk'>@@ -909,6 +924,7 @@ skip_normal_probe:</div><div class='ctx'> 	acm-&gt;ctrl_caps = ac_management_function;</div><div class='ctx'> 	acm-&gt;ctrlsize = ctrlsize;</div><div class='ctx'> 	acm-&gt;readsize = readsize;</div><div class='add'>+	acm-&gt;rx_buflimit = num_rx_buf;</div><div class='ctx'> 	acm-&gt;urb_task.func = acm_rx_tasklet;</div><div class='ctx'> 	acm-&gt;urb_task.data = (unsigned long) acm;</div><div class='ctx'> 	INIT_WORK(&amp;acm-&gt;work, acm_softint, acm);</div><div class='hunk'>@@ -920,44 +936,43 @@ skip_normal_probe:</div><div class='ctx'> </div><div class='ctx'> 	buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &amp;acm-&gt;ctrl_dma);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev, "out of memory (ctrl buffer alloc)\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev, "out of memory (ctrl buffer alloc)");</div><div class='ctx'> 		goto alloc_fail2;</div><div class='ctx'> 	}</div><div class='ctx'> 	acm-&gt;ctrl_buffer = buf;</div><div class='ctx'> </div><div class='ctx'> 	if (acm_write_buffers_alloc(acm) &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev, "out of memory (write buffer alloc)\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev, "out of memory (write buffer alloc)");</div><div class='ctx'> 		goto alloc_fail4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	acm-&gt;ctrlurb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 	if (!acm-&gt;ctrlurb) {</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev, "out of memory (ctrlurb kmalloc)\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev, "out of memory (ctrlurb kmalloc)");</div><div class='ctx'> 		goto alloc_fail5;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; ACM_NRU; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_rx_buf; i++) {</div><div class='ctx'> 		struct acm_ru *rcv = &amp;(acm-&gt;ru[i]);</div><div class='ctx'> </div><div class='ctx'> 		if (!(rcv-&gt;urb = usb_alloc_urb(0, GFP_KERNEL))) {</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev, "out of memory (read urbs usb_alloc_urb)\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev, "out of memory (read urbs usb_alloc_urb)");</div><div class='ctx'> 			goto alloc_fail7;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rcv-&gt;urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> 		rcv-&gt;instance = acm;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; ACM_NRB; i++) {</div><div class='add'>+	for (i = 0; i &lt; num_rx_buf; i++) {</div><div class='ctx'> 		struct acm_rb *buf = &amp;(acm-&gt;rb[i]);</div><div class='ctx'> </div><div class='del'>-		// Using usb_buffer_alloc instead of kmalloc as Oliver suggested</div><div class='ctx'> 		if (!(buf-&gt;base = usb_buffer_alloc(acm-&gt;dev, readsize, GFP_KERNEL, &amp;buf-&gt;dma))) {</div><div class='del'>-			dev_dbg(&amp;intf-&gt;dev, "out of memory (read bufs usb_buffer_alloc)\n");</div><div class='add'>+			dev_dbg(&amp;intf-&gt;dev, "out of memory (read bufs usb_buffer_alloc)");</div><div class='ctx'> 			goto alloc_fail7;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	acm-&gt;writeurb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 	if (!acm-&gt;writeurb) {</div><div class='del'>-		dev_dbg(&amp;intf-&gt;dev, "out of memory (writeurb kmalloc)\n");</div><div class='add'>+		dev_dbg(&amp;intf-&gt;dev, "out of memory (writeurb kmalloc)");</div><div class='ctx'> 		goto alloc_fail7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -988,9 +1003,9 @@ skip_normal_probe:</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> alloc_fail7:</div><div class='del'>-	for (i = 0; i &lt; ACM_NRB; i++)</div><div class='add'>+	for (i = 0; i &lt; num_rx_buf; i++)</div><div class='ctx'> 		usb_buffer_free(usb_dev, acm-&gt;readsize, acm-&gt;rb[i].base, acm-&gt;rb[i].dma);</div><div class='del'>-	for (i = 0; i &lt; ACM_NRU; i++)</div><div class='add'>+	for (i = 0; i &lt; num_rx_buf; i++)</div><div class='ctx'> 		usb_free_urb(acm-&gt;ru[i].urb);</div><div class='ctx'> 	usb_free_urb(acm-&gt;ctrlurb);</div><div class='ctx'> alloc_fail5:</div><div class='hunk'>@@ -1027,7 +1042,7 @@ static void acm_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	usb_kill_urb(acm-&gt;ctrlurb);</div><div class='ctx'> 	usb_kill_urb(acm-&gt;writeurb);</div><div class='del'>-	for (i = 0; i &lt; ACM_NRU; i++)</div><div class='add'>+	for (i = 0; i &lt; acm-&gt;rx_buflimit; i++)</div><div class='ctx'> 		usb_kill_urb(acm-&gt;ru[i].urb);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;acm-&gt;filled_read_bufs);</div><div class='hunk'>@@ -1039,7 +1054,7 @@ static void acm_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	acm_write_buffers_free(acm);</div><div class='ctx'> 	usb_buffer_free(usb_dev, acm-&gt;ctrlsize, acm-&gt;ctrl_buffer, acm-&gt;ctrl_dma);</div><div class='del'>-	for (i = 0; i &lt; ACM_NRB; i++)</div><div class='add'>+	for (i = 0; i &lt; acm-&gt;rx_buflimit; i++)</div><div class='ctx'> 		usb_buffer_free(usb_dev, acm-&gt;readsize, acm-&gt;rb[i].base, acm-&gt;rb[i].dma);</div><div class='ctx'> </div><div class='ctx'> 	usb_driver_release_interface(&amp;acm_driver, intf == acm-&gt;control ? acm-&gt;data : intf);</div><div class='hunk'>@@ -1068,6 +1083,12 @@ static struct usb_device_id acm_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE(0x0482, 0x0203), /* KYOCERA AH-K3001V */</div><div class='ctx'> 	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */</div><div class='ctx'> 	},</div><div class='add'>+	{ USB_DEVICE(0x0ace, 0x1608), /* ZyDAS 56K USB MODEM */</div><div class='add'>+	.driver_info = SINGLE_RX_URB, /* firmware bug */</div><div class='add'>+	},</div><div class='add'>+	{ USB_DEVICE(0x0ace, 0x1611), /* ZyDAS 56K USB MODEM - new version */</div><div class='add'>+	.driver_info = SINGLE_RX_URB, /* firmware bug */</div><div class='add'>+	},</div><div class='ctx'> 	/* control interfaces with various AT-command sets */</div><div class='ctx'> 	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,</div><div class='ctx'> 		USB_CDC_ACM_PROTO_AT_V25TER) },</div><div class='hunk'>@@ -1127,12 +1148,11 @@ static int __init acm_init(void)</div><div class='ctx'> 	acm_tty_driver-&gt;owner = THIS_MODULE,</div><div class='ctx'> 	acm_tty_driver-&gt;driver_name = "acm",</div><div class='ctx'> 	acm_tty_driver-&gt;name = "ttyACM",</div><div class='del'>-	acm_tty_driver-&gt;devfs_name = "usb/acm/",</div><div class='ctx'> 	acm_tty_driver-&gt;major = ACM_TTY_MAJOR,</div><div class='ctx'> 	acm_tty_driver-&gt;minor_start = 0,</div><div class='ctx'> 	acm_tty_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL,</div><div class='ctx'> 	acm_tty_driver-&gt;subtype = SERIAL_TYPE_NORMAL,</div><div class='del'>-	acm_tty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS,</div><div class='add'>+	acm_tty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	acm_tty_driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	acm_tty_driver-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='ctx'> 	tty_set_operations(acm_tty_driver, &amp;acm_ops);</div><div class='head'>diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h<br/>index fd2aaccdcbac..1bcaea32cfc1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/class/cdc-acm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/class/cdc-acm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/class/cdc-acm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/class/cdc-acm.h</a></div><div class='hunk'>@@ -56,11 +56,11 @@</div><div class='ctx'>  * in line disciplines. They ask for empty space amount, receive our URB size,</div><div class='ctx'>  * and proceed to issue several 1-character writes, assuming they will fit.</div><div class='ctx'>  * The very first write takes a complete URB. Fortunately, this only happens</div><div class='del'>- * when processing onlcr, so we only need 2 buffers.</div><div class='add'>+ * when processing onlcr, so we only need 2 buffers. These values must be</div><div class='add'>+ * powers of 2.</div><div class='ctx'>  */</div><div class='del'>-#define ACM_NWB  2</div><div class='del'>-#define ACM_NRU  16</div><div class='del'>-#define ACM_NRB  16</div><div class='add'>+#define ACM_NW  2</div><div class='add'>+#define ACM_NR  16</div><div class='ctx'> </div><div class='ctx'> struct acm_wb {</div><div class='ctx'> 	unsigned char *buf;</div><div class='hunk'>@@ -91,9 +91,10 @@ struct acm {</div><div class='ctx'> 	struct urb *ctrlurb, *writeurb;			/* urbs */</div><div class='ctx'> 	u8 *ctrl_buffer;				/* buffers of urbs */</div><div class='ctx'> 	dma_addr_t ctrl_dma;				/* dma handles of buffers */</div><div class='del'>-	struct acm_wb wb[ACM_NWB];</div><div class='del'>-	struct acm_ru ru[ACM_NRU];</div><div class='del'>-	struct acm_rb rb[ACM_NRB];</div><div class='add'>+	struct acm_wb wb[ACM_NW];</div><div class='add'>+	struct acm_ru ru[ACM_NR];</div><div class='add'>+	struct acm_rb rb[ACM_NR];</div><div class='add'>+	int rx_buflimit;</div><div class='ctx'> 	int rx_endpoint;</div><div class='ctx'> 	spinlock_t read_lock;</div><div class='ctx'> 	struct list_head spare_read_urbs;</div><div class='hunk'>@@ -122,3 +123,4 @@ struct acm {</div><div class='ctx'> </div><div class='ctx'> /* constants describing various quirks and errors */</div><div class='ctx'> #define NO_UNION_NORMAL			1</div><div class='add'>+#define SINGLE_RX_URB			2</div><div class='head'>diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig<br/>index a08787e253aa..6e3b5358a760 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/Kconfig</a></div><div class='hunk'>@@ -31,9 +31,6 @@ config USB_DEVICEFS</div><div class='ctx'> 	  For the format of the various /proc/bus/usb/ files, please read</div><div class='ctx'> 	  &lt;file:Documentation/usb/proc_usb_info.txt&gt;.</div><div class='ctx'> </div><div class='del'>-	  Please note that this code is completely unrelated to devfs, the</div><div class='del'>-	  "/dev file system support".</div><div class='del'>-</div><div class='ctx'> 	  Most users want to say Y here.</div><div class='ctx'> </div><div class='ctx'> config USB_BANDWIDTH</div><div class='head'>diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile<br/>index 28329ddf187c..ec510922af63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/Makefile</a></div><div class='hunk'>@@ -3,7 +3,8 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> usbcore-objs	:= usb.o hub.o hcd.o urb.o message.o driver.o \</div><div class='del'>-			config.o file.o buffer.o sysfs.o devio.o notify.o</div><div class='add'>+			config.o file.o buffer.o sysfs.o endpoint.o \</div><div class='add'>+			devio.o notify.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_PCI),y)</div><div class='ctx'> 	usbcore-objs	+= hcd-pci.o</div><div class='head'>diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c<br/>index ad742cec94fa..f4f4ef0f377a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/buffer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/buffer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/buffer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/buffer.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  * and should work with all USB controllers, regardles of bus type.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c<br/>index a9d89c78cc20..4c9e63e665b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/config.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/config.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/config.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/config.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c<br/>index 545da37afca7..f7bdd94b3aa8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/devio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/devio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/devio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/devio.c</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> #include &lt;linux/usbdevice_fs.h&gt;</div><div class='ctx'> #include &lt;linux/cdev.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -68,6 +69,7 @@ struct async {</div><div class='ctx'> 	void __user *userbuffer;</div><div class='ctx'> 	void __user *userurb;</div><div class='ctx'> 	struct urb *urb;</div><div class='add'>+	u32 secid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int usbfs_snoop = 0;</div><div class='hunk'>@@ -312,7 +314,7 @@ static void async_completed(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		sinfo.si_code = SI_ASYNCIO;</div><div class='ctx'> 		sinfo.si_addr = as-&gt;userurb;</div><div class='ctx'> 		kill_proc_info_as_uid(as-&gt;signr, &amp;sinfo, as-&gt;pid, as-&gt;uid, </div><div class='del'>-				      as-&gt;euid);</div><div class='add'>+				      as-&gt;euid, as-&gt;secid);</div><div class='ctx'> 	}</div><div class='ctx'> 	snoop(&amp;urb-&gt;dev-&gt;dev, "urb complete\n");</div><div class='ctx'> 	snoop_urb(urb, as-&gt;userurb);</div><div class='hunk'>@@ -515,19 +517,19 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, unsig</div><div class='ctx'> </div><div class='ctx'> static struct usb_device *usbdev_lookup_minor(int minor)</div><div class='ctx'> {</div><div class='del'>-	struct class_device *class_dev;</div><div class='del'>-	struct usb_device *dev = NULL;</div><div class='add'>+	struct device *device;</div><div class='add'>+	struct usb_device *udev = NULL;</div><div class='ctx'> </div><div class='ctx'> 	down(&amp;usb_device_class-&gt;sem);</div><div class='del'>-	list_for_each_entry(class_dev, &amp;usb_device_class-&gt;children, node) {</div><div class='del'>-		if (class_dev-&gt;devt == MKDEV(USB_DEVICE_MAJOR, minor)) {</div><div class='del'>-			dev = class_dev-&gt;class_data;</div><div class='add'>+	list_for_each_entry(device, &amp;usb_device_class-&gt;devices, node) {</div><div class='add'>+		if (device-&gt;devt == MKDEV(USB_DEVICE_MAJOR, minor)) {</div><div class='add'>+			udev = device-&gt;platform_data;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	up(&amp;usb_device_class-&gt;sem);</div><div class='ctx'> </div><div class='del'>-	return dev;</div><div class='add'>+	return udev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -572,6 +574,7 @@ static int usbdev_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	ps-&gt;disc_euid = current-&gt;euid;</div><div class='ctx'> 	ps-&gt;disccontext = NULL;</div><div class='ctx'> 	ps-&gt;ifclaimed = 0;</div><div class='add'>+	security_task_getsecid(current, &amp;ps-&gt;secid);</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	list_add_tail(&amp;ps-&gt;list, &amp;dev-&gt;filelist);</div><div class='ctx'> 	file-&gt;private_data = ps;</div><div class='hunk'>@@ -823,8 +826,7 @@ static int proc_connectinfo(struct dev_state *ps, void __user *arg)</div><div class='ctx'> </div><div class='ctx'> static int proc_resetdevice(struct dev_state *ps)</div><div class='ctx'> {</div><div class='del'>-	return usb_reset_device(ps-&gt;dev);</div><div class='del'>-</div><div class='add'>+	return usb_reset_composite_device(ps-&gt;dev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int proc_setintf(struct dev_state *ps, void __user *arg)</div><div class='hunk'>@@ -923,8 +925,8 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,</div><div class='ctx'> 		if ((ep-&gt;desc.bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK)</div><div class='ctx'> 				!= USB_ENDPOINT_XFER_CONTROL)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		/* min 8 byte setup packet, max arbitrary */</div><div class='del'>-		if (uurb-&gt;buffer_length &lt; 8 || uurb-&gt;buffer_length &gt; PAGE_SIZE)</div><div class='add'>+		/* min 8 byte setup packet, max 8 byte setup plus an arbitrary data stage */</div><div class='add'>+		if (uurb-&gt;buffer_length &lt; 8 || uurb-&gt;buffer_length &gt; (8 + MAX_USBFS_BUFFER_SIZE))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (!(dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL)))</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -982,7 +984,8 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (totlen = u = 0; u &lt; uurb-&gt;number_of_packets; u++) {</div><div class='del'>-			if (isopkt[u].length &gt; 1023) {</div><div class='add'>+			/* arbitrary limit, sufficient for USB 2.0 high-bandwidth iso */</div><div class='add'>+			if (isopkt[u].length &gt; 8192) {</div><div class='ctx'> 				kfree(isopkt);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1053,6 +1056,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,</div><div class='ctx'> 	as-&gt;pid = current-&gt;pid;</div><div class='ctx'> 	as-&gt;uid = current-&gt;uid;</div><div class='ctx'> 	as-&gt;euid = current-&gt;euid;</div><div class='add'>+	security_task_getsecid(current, &amp;as-&gt;secid);</div><div class='ctx'> 	if (!(uurb-&gt;endpoint &amp; USB_DIR_IN)) {</div><div class='ctx'> 		if (copy_from_user(as-&gt;urb-&gt;transfer_buffer, uurb-&gt;buffer, as-&gt;urb-&gt;transfer_buffer_length)) {</div><div class='ctx'> 			free_async(as);</div><div class='hunk'>@@ -1576,16 +1580,16 @@ static void usbdev_add(struct usb_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int minor = ((dev-&gt;bus-&gt;busnum-1) * 128) + (dev-&gt;devnum-1);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;class_dev = class_device_create(usb_device_class, NULL,</div><div class='del'>-				MKDEV(USB_DEVICE_MAJOR, minor), &amp;dev-&gt;dev,</div><div class='add'>+	dev-&gt;usbfs_dev = device_create(usb_device_class, &amp;dev-&gt;dev,</div><div class='add'>+				MKDEV(USB_DEVICE_MAJOR, minor),</div><div class='ctx'> 				"usbdev%d.%d", dev-&gt;bus-&gt;busnum, dev-&gt;devnum);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;class_dev-&gt;class_data = dev;</div><div class='add'>+	dev-&gt;usbfs_dev-&gt;platform_data = dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void usbdev_remove(struct usb_device *dev)</div><div class='ctx'> {</div><div class='del'>-	class_device_unregister(dev-&gt;class_dev);</div><div class='add'>+	device_unregister(dev-&gt;usbfs_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int usbdev_notify(struct notifier_block *self, unsigned long action,</div><div class='head'>diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c<br/>index c196f3845305..ec8906501415 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/driver.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include "hcd.h"</div><div class='head'>diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c<br/>new file mode 100644<br/>index 000000000000..247b5a4913a8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/endpoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/endpoint.c</a></div><div class='hunk'>@@ -0,0 +1,275 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/usb/core/endpoint.c</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 2002,2004,2006 Greg Kroah-Hartman</div><div class='add'>+ * (C) Copyright 2002,2004 IBM Corp.</div><div class='add'>+ * (C) Copyright 2006 Novell Inc.</div><div class='add'>+ *</div><div class='add'>+ * Endpoint sysfs stuff</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include "usb.h"</div><div class='add'>+</div><div class='add'>+/* endpoint stuff */</div><div class='add'>+</div><div class='add'>+struct ep_device {</div><div class='add'>+	struct usb_endpoint_descriptor *desc;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct device dev;</div><div class='add'>+};</div><div class='add'>+#define to_ep_device(_dev) \</div><div class='add'>+	container_of(_dev, struct ep_device, dev)</div><div class='add'>+</div><div class='add'>+struct ep_attribute {</div><div class='add'>+	struct attribute attr;</div><div class='add'>+	ssize_t (*show)(struct usb_device *,</div><div class='add'>+			struct usb_endpoint_descriptor *, char *);</div><div class='add'>+};</div><div class='add'>+#define to_ep_attribute(_attr) \</div><div class='add'>+	container_of(_attr, struct ep_attribute, attr)</div><div class='add'>+</div><div class='add'>+#define usb_ep_attr(field, format_string)			\</div><div class='add'>+static ssize_t show_ep_##field(struct device *dev,		\</div><div class='add'>+			       struct device_attribute *attr,	\</div><div class='add'>+			       char *buf)			\</div><div class='add'>+{								\</div><div class='add'>+	struct ep_device *ep = to_ep_device(dev);		\</div><div class='add'>+	return sprintf(buf, format_string, ep-&gt;desc-&gt;field);	\</div><div class='add'>+}								\</div><div class='add'>+static DEVICE_ATTR(field, S_IRUGO, show_ep_##field, NULL);</div><div class='add'>+</div><div class='add'>+usb_ep_attr(bLength, "%02x\n")</div><div class='add'>+usb_ep_attr(bEndpointAddress, "%02x\n")</div><div class='add'>+usb_ep_attr(bmAttributes, "%02x\n")</div><div class='add'>+usb_ep_attr(bInterval, "%02x\n")</div><div class='add'>+</div><div class='add'>+static ssize_t show_ep_wMaxPacketSize(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ep_device *ep = to_ep_device(dev);</div><div class='add'>+	return sprintf(buf, "%04x\n",</div><div class='add'>+			le16_to_cpu(ep-&gt;desc-&gt;wMaxPacketSize) &amp; 0x07ff);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(wMaxPacketSize, S_IRUGO, show_ep_wMaxPacketSize, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t show_ep_type(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			    char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ep_device *ep = to_ep_device(dev);</div><div class='add'>+	char *type = "unknown";</div><div class='add'>+</div><div class='add'>+	switch (ep-&gt;desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) {</div><div class='add'>+	case USB_ENDPOINT_XFER_CONTROL:</div><div class='add'>+		type = "Control";</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_ISOC:</div><div class='add'>+		type = "Isoc";</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_BULK:</div><div class='add'>+		type = "Bulk";</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_INT:</div><div class='add'>+		type = "Interrupt";</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return sprintf(buf, "%s\n", type);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(type, S_IRUGO, show_ep_type, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t show_ep_interval(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ep_device *ep = to_ep_device(dev);</div><div class='add'>+	char unit;</div><div class='add'>+	unsigned interval = 0;</div><div class='add'>+	unsigned in;</div><div class='add'>+</div><div class='add'>+	in = (ep-&gt;desc-&gt;bEndpointAddress &amp; USB_DIR_IN);</div><div class='add'>+</div><div class='add'>+	switch (ep-&gt;desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) {</div><div class='add'>+	case USB_ENDPOINT_XFER_CONTROL:</div><div class='add'>+		if (ep-&gt;udev-&gt;speed == USB_SPEED_HIGH) 	/* uframes per NAK */</div><div class='add'>+			interval = ep-&gt;desc-&gt;bInterval;</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_ISOC:</div><div class='add'>+		interval = 1 &lt;&lt; (ep-&gt;desc-&gt;bInterval - 1);</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_BULK:</div><div class='add'>+		if (ep-&gt;udev-&gt;speed == USB_SPEED_HIGH &amp;&amp; !in) /* uframes per NAK */</div><div class='add'>+			interval = ep-&gt;desc-&gt;bInterval;</div><div class='add'>+		break;</div><div class='add'>+	case USB_ENDPOINT_XFER_INT:</div><div class='add'>+		if (ep-&gt;udev-&gt;speed == USB_SPEED_HIGH)</div><div class='add'>+			interval = 1 &lt;&lt; (ep-&gt;desc-&gt;bInterval - 1);</div><div class='add'>+		else</div><div class='add'>+			interval = ep-&gt;desc-&gt;bInterval;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	interval *= (ep-&gt;udev-&gt;speed == USB_SPEED_HIGH) ? 125 : 1000;</div><div class='add'>+	if (interval % 1000)</div><div class='add'>+		unit = 'u';</div><div class='add'>+	else {</div><div class='add'>+		unit = 'm';</div><div class='add'>+		interval /= 1000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d%cs\n", interval, unit);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(interval, S_IRUGO, show_ep_interval, NULL);</div><div class='add'>+</div><div class='add'>+static ssize_t show_ep_direction(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ep_device *ep = to_ep_device(dev);</div><div class='add'>+	char *direction;</div><div class='add'>+</div><div class='add'>+	if ((ep-&gt;desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) ==</div><div class='add'>+			USB_ENDPOINT_XFER_CONTROL)</div><div class='add'>+		direction = "both";</div><div class='add'>+	else if (ep-&gt;desc-&gt;bEndpointAddress &amp; USB_DIR_IN)</div><div class='add'>+		direction = "in";</div><div class='add'>+	else</div><div class='add'>+		direction = "out";</div><div class='add'>+	return sprintf(buf, "%s\n", direction);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(direction, S_IRUGO, show_ep_direction, NULL);</div><div class='add'>+</div><div class='add'>+static struct attribute *ep_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_bLength.attr,</div><div class='add'>+	&amp;dev_attr_bEndpointAddress.attr,</div><div class='add'>+	&amp;dev_attr_bmAttributes.attr,</div><div class='add'>+	&amp;dev_attr_bInterval.attr,</div><div class='add'>+	&amp;dev_attr_wMaxPacketSize.attr,</div><div class='add'>+	&amp;dev_attr_interval.attr,</div><div class='add'>+	&amp;dev_attr_type.attr,</div><div class='add'>+	&amp;dev_attr_direction.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+static struct attribute_group ep_dev_attr_grp = {</div><div class='add'>+	.attrs = ep_dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct endpoint_class {</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct class *class;</div><div class='add'>+} *ep_class;</div><div class='add'>+</div><div class='add'>+static int init_endpoint_class(void)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	if (ep_class != NULL) {</div><div class='add'>+		kref_get(&amp;ep_class-&gt;kref);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep_class = kmalloc(sizeof(*ep_class), GFP_KERNEL);</div><div class='add'>+	if (!ep_class) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;ep_class-&gt;kref);</div><div class='add'>+	ep_class-&gt;class = class_create(THIS_MODULE, "usb_endpoint");</div><div class='add'>+	if (IS_ERR(ep_class-&gt;class)) {</div><div class='add'>+		result = IS_ERR(ep_class-&gt;class);</div><div class='add'>+		kfree(ep_class);</div><div class='add'>+		ep_class = NULL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_endpoint_class(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	/* Ok, we cheat as we know we only have one ep_class */</div><div class='add'>+	class_destroy(ep_class-&gt;class);</div><div class='add'>+	kfree(ep_class);</div><div class='add'>+	ep_class = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_endpoint_class(void)</div><div class='add'>+{</div><div class='add'>+	if (ep_class)</div><div class='add'>+		kref_put(&amp;ep_class-&gt;kref, release_endpoint_class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep_device_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ep_device *ep_dev = to_ep_device(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "%s called for %s\n", __FUNCTION__, dev-&gt;bus_id);</div><div class='add'>+	kfree(ep_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void usb_create_ep_files(struct device *parent,</div><div class='add'>+			 struct usb_host_endpoint *endpoint,</div><div class='add'>+			 struct usb_device *udev)</div><div class='add'>+{</div><div class='add'>+	char name[8];</div><div class='add'>+	struct ep_device *ep_dev;</div><div class='add'>+	int minor;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = init_endpoint_class();</div><div class='add'>+	if (retval)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ep_dev = kzalloc(sizeof(*ep_dev), GFP_KERNEL);</div><div class='add'>+	if (!ep_dev) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fun calculation to determine the minor of this endpoint */</div><div class='add'>+	minor = (((udev-&gt;bus-&gt;busnum - 1) * 128) * 16) + (udev-&gt;devnum - 1);</div><div class='add'>+</div><div class='add'>+	ep_dev-&gt;desc = &amp;endpoint-&gt;desc;</div><div class='add'>+	ep_dev-&gt;udev = udev;</div><div class='add'>+	ep_dev-&gt;dev.devt = MKDEV(442, minor);	// FIXME fake number...</div><div class='add'>+	ep_dev-&gt;dev.class = ep_class-&gt;class;</div><div class='add'>+	ep_dev-&gt;dev.parent = parent;</div><div class='add'>+	ep_dev-&gt;dev.release = ep_device_release;</div><div class='add'>+	snprintf(ep_dev-&gt;dev.bus_id, BUS_ID_SIZE, "usbdev%d.%d_ep%02x",</div><div class='add'>+		 udev-&gt;bus-&gt;busnum, udev-&gt;devnum,</div><div class='add'>+		 endpoint-&gt;desc.bEndpointAddress);</div><div class='add'>+</div><div class='add'>+	retval = device_register(&amp;ep_dev-&gt;dev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto error;</div><div class='add'>+	sysfs_create_group(&amp;ep_dev-&gt;dev.kobj, &amp;ep_dev_attr_grp);</div><div class='add'>+</div><div class='add'>+	endpoint-&gt;ep_dev = ep_dev;</div><div class='add'>+</div><div class='add'>+	/* create the symlink to the old-style "ep_XX" directory */</div><div class='add'>+	sprintf(name, "ep_%02x", endpoint-&gt;desc.bEndpointAddress);</div><div class='add'>+	sysfs_create_link(&amp;parent-&gt;kobj, &amp;endpoint-&gt;ep_dev-&gt;dev.kobj, name);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return;</div><div class='add'>+error:</div><div class='add'>+	kfree(ep_dev);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void usb_remove_ep_files(struct usb_host_endpoint *endpoint)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (endpoint-&gt;ep_dev) {</div><div class='add'>+		char name[8];</div><div class='add'>+</div><div class='add'>+		sprintf(name, "ep_%02x", endpoint-&gt;desc.bEndpointAddress);</div><div class='add'>+		sysfs_remove_link(&amp;endpoint-&gt;ep_dev-&gt;dev.parent-&gt;kobj, name);</div><div class='add'>+		sysfs_remove_group(&amp;endpoint-&gt;ep_dev-&gt;dev.kobj, &amp;ep_dev_attr_grp);</div><div class='add'>+		device_unregister(&amp;endpoint-&gt;ep_dev-&gt;dev);</div><div class='add'>+		endpoint-&gt;ep_dev = NULL;</div><div class='add'>+	}</div><div class='add'>+	destroy_endpoint_class();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c<br/>index b263a54a13c0..abee0f5b6a66 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/file.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -61,33 +60,66 @@ static struct file_operations usb_fops = {</div><div class='ctx'> 	.open =		usb_open,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct class *usb_class;</div><div class='add'>+static struct usb_class {</div><div class='add'>+	struct kref kref;</div><div class='add'>+	struct class *class;</div><div class='add'>+} *usb_class;</div><div class='ctx'> </div><div class='del'>-int usb_major_init(void)</div><div class='add'>+static int init_usb_class(void)</div><div class='ctx'> {</div><div class='del'>-	int error;</div><div class='add'>+	int result = 0;</div><div class='ctx'> </div><div class='del'>-	error = register_chrdev(USB_MAJOR, "usb", &amp;usb_fops);</div><div class='del'>-	if (error) {</div><div class='del'>-		err("unable to get major %d for usb devices", USB_MAJOR);</div><div class='del'>-		goto out;</div><div class='add'>+	if (usb_class != NULL) {</div><div class='add'>+		kref_get(&amp;usb_class-&gt;kref);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_class = kmalloc(sizeof(*usb_class), GFP_KERNEL);</div><div class='add'>+	if (!usb_class) {</div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usb_class = class_create(THIS_MODULE, "usb");</div><div class='del'>-	if (IS_ERR(usb_class)) {</div><div class='del'>-		error = PTR_ERR(usb_class);</div><div class='add'>+	kref_init(&amp;usb_class-&gt;kref);</div><div class='add'>+	usb_class-&gt;class = class_create(THIS_MODULE, "usb");</div><div class='add'>+	if (IS_ERR(usb_class-&gt;class)) {</div><div class='add'>+		result = IS_ERR(usb_class-&gt;class);</div><div class='ctx'> 		err("class_create failed for usb devices");</div><div class='del'>-		unregister_chrdev(USB_MAJOR, "usb");</div><div class='del'>-		goto out;</div><div class='add'>+		kfree(usb_class);</div><div class='add'>+		usb_class = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-out:</div><div class='add'>+exit:</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_usb_class(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	/* Ok, we cheat as we know we only have one usb_class */</div><div class='add'>+	class_destroy(usb_class-&gt;class);</div><div class='add'>+	kfree(usb_class);</div><div class='add'>+	usb_class = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_usb_class(void)</div><div class='add'>+{</div><div class='add'>+	if (usb_class)</div><div class='add'>+		kref_put(&amp;usb_class-&gt;kref, release_usb_class);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int usb_major_init(void)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = register_chrdev(USB_MAJOR, "usb", &amp;usb_fops);</div><div class='add'>+	if (error)</div><div class='add'>+		err("unable to get major %d for usb devices", USB_MAJOR);</div><div class='add'>+</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void usb_major_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	class_destroy(usb_class);</div><div class='ctx'> 	unregister_chrdev(USB_MAJOR, "usb");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,6 +181,10 @@ int usb_register_dev(struct usb_interface *intf,</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='add'>+	retval = init_usb_class();</div><div class='add'>+	if (retval)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='ctx'> 	intf-&gt;minor = minor;</div><div class='ctx'> </div><div class='ctx'> 	/* create a usb class device for this usb interface */</div><div class='hunk'>@@ -158,14 +194,13 @@ int usb_register_dev(struct usb_interface *intf,</div><div class='ctx'> 		++temp;</div><div class='ctx'> 	else</div><div class='ctx'> 		temp = name;</div><div class='del'>-	intf-&gt;class_dev = class_device_create(usb_class, NULL,</div><div class='del'>-					      MKDEV(USB_MAJOR, minor),</div><div class='del'>-					      &amp;intf-&gt;dev, "%s", temp);</div><div class='del'>-	if (IS_ERR(intf-&gt;class_dev)) {</div><div class='add'>+	intf-&gt;usb_dev = device_create(usb_class-&gt;class, &amp;intf-&gt;dev,</div><div class='add'>+				      MKDEV(USB_MAJOR, minor), "%s", temp);</div><div class='add'>+	if (IS_ERR(intf-&gt;usb_dev)) {</div><div class='ctx'> 		spin_lock (&amp;minor_lock);</div><div class='ctx'> 		usb_minors[intf-&gt;minor] = NULL;</div><div class='ctx'> 		spin_unlock (&amp;minor_lock);</div><div class='del'>-		retval = PTR_ERR(intf-&gt;class_dev);</div><div class='add'>+		retval = PTR_ERR(intf-&gt;usb_dev);</div><div class='ctx'> 	}</div><div class='ctx'> exit:</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -206,9 +241,10 @@ void usb_deregister_dev(struct usb_interface *intf,</div><div class='ctx'> 	spin_unlock (&amp;minor_lock);</div><div class='ctx'> </div><div class='ctx'> 	snprintf(name, BUS_ID_SIZE, class_driver-&gt;name, intf-&gt;minor - minor_base);</div><div class='del'>-	class_device_destroy(usb_class, MKDEV(USB_MAJOR, intf-&gt;minor));</div><div class='del'>-	intf-&gt;class_dev = NULL;</div><div class='add'>+	device_destroy(usb_class-&gt;class, MKDEV(USB_MAJOR, intf-&gt;minor));</div><div class='add'>+	intf-&gt;usb_dev = NULL;</div><div class='ctx'> 	intf-&gt;minor = -1;</div><div class='add'>+	destroy_usb_class();</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(usb_deregister_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c<br/>index 66b78404ab34..5078fb3375e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/hcd-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/hcd-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/hcd-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/hcd-pci.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -126,7 +125,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master (dev);</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd (hcd, dev-&gt;irq, SA_SHIRQ);</div><div class='add'>+	retval = usb_add_hcd (hcd, dev-&gt;irq, IRQF_SHARED);</div><div class='ctx'> 	if (retval != 0)</div><div class='ctx'> 		goto err4;</div><div class='ctx'> 	return retval;</div><div class='head'>diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c<br/>index e2e00ba4e1e6..fb4d058bbde0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/hcd.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1826,24 +1825,16 @@ int usb_add_hcd(struct usb_hcd *hcd,</div><div class='ctx'> </div><div class='ctx'> 	/* enable irqs just before we start the controller */</div><div class='ctx'> 	if (hcd-&gt;driver-&gt;irq) {</div><div class='del'>-		char	buf[8], *bufp = buf;</div><div class='del'>-</div><div class='del'>-#ifdef __sparc__</div><div class='del'>-		bufp = __irq_itoa(irqnum);</div><div class='del'>-#else</div><div class='del'>-		sprintf(buf, "%d", irqnum);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 		snprintf(hcd-&gt;irq_descr, sizeof(hcd-&gt;irq_descr), "%s:usb%d",</div><div class='ctx'> 				hcd-&gt;driver-&gt;description, hcd-&gt;self.busnum);</div><div class='ctx'> 		if ((retval = request_irq(irqnum, &amp;usb_hcd_irq, irqflags,</div><div class='ctx'> 				hcd-&gt;irq_descr, hcd)) != 0) {</div><div class='ctx'> 			dev_err(hcd-&gt;self.controller,</div><div class='del'>-					"request interrupt %s failed\n", bufp);</div><div class='add'>+					"request interrupt %d failed\n", irqnum);</div><div class='ctx'> 			goto err_request_irq;</div><div class='ctx'> 		}</div><div class='ctx'> 		hcd-&gt;irq = irqnum;</div><div class='del'>-		dev_info(hcd-&gt;self.controller, "irq %s, %s 0x%08llx\n", bufp,</div><div class='add'>+		dev_info(hcd-&gt;self.controller, "irq %d, %s 0x%08llx\n", irqnum,</div><div class='ctx'> 				(hcd-&gt;driver-&gt;flags &amp; HCD_MEMORY) ?</div><div class='ctx'> 					"io mem" : "io base",</div><div class='ctx'> 					(unsigned long long)hcd-&gt;rsrc_start);</div><div class='head'>diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c<br/>index 90b8d43c6b33..26c8cb5f3e67 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/hub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/hub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/hub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/hub.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -432,15 +431,22 @@ static void hub_power_on(struct usb_hub *hub)</div><div class='ctx'> {</div><div class='ctx'> 	int port1;</div><div class='ctx'> 	unsigned pgood_delay = hub-&gt;descriptor-&gt;bPwrOn2PwrGood * 2;</div><div class='del'>-	u16 wHubCharacteristics = le16_to_cpu(hub-&gt;descriptor-&gt;wHubCharacteristics);</div><div class='del'>-</div><div class='del'>-	/* if hub supports power switching, enable power on each port */</div><div class='del'>-	if ((wHubCharacteristics &amp; HUB_CHAR_LPSM) &lt; 2) {</div><div class='add'>+	u16 wHubCharacteristics =</div><div class='add'>+			le16_to_cpu(hub-&gt;descriptor-&gt;wHubCharacteristics);</div><div class='add'>+</div><div class='add'>+	/* Enable power on each port.  Some hubs have reserved values</div><div class='add'>+	 * of LPSM (&gt; 2) in their descriptors, even though they are</div><div class='add'>+	 * USB 2.0 hubs.  Some hubs do not implement port-power switching</div><div class='add'>+	 * but only emulate it.  In all cases, the ports won't work</div><div class='add'>+	 * unless we send these messages to the hub.</div><div class='add'>+	 */</div><div class='add'>+	if ((wHubCharacteristics &amp; HUB_CHAR_LPSM) &lt; 2)</div><div class='ctx'> 		dev_dbg(hub-&gt;intfdev, "enabling power on all ports\n");</div><div class='del'>-		for (port1 = 1; port1 &lt;= hub-&gt;descriptor-&gt;bNbrPorts; port1++)</div><div class='del'>-			set_port_feature(hub-&gt;hdev, port1,</div><div class='del'>-					USB_PORT_FEAT_POWER);</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(hub-&gt;intfdev, "trying to enable port power on "</div><div class='add'>+				"non-switchable hub\n");</div><div class='add'>+	for (port1 = 1; port1 &lt;= hub-&gt;descriptor-&gt;bNbrPorts; port1++)</div><div class='add'>+		set_port_feature(hub-&gt;hdev, port1, USB_PORT_FEAT_POWER);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait at least 100 msec for power to become stable */</div><div class='ctx'> 	msleep(max(pgood_delay, (unsigned) 100));</div><div class='hunk'>@@ -518,15 +524,16 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* caller has locked the hub device */</div><div class='del'>-static void hub_pre_reset(struct usb_hub *hub, int disable_ports)</div><div class='add'>+static void hub_pre_reset(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='add'>+	struct usb_hub *hub = usb_get_intfdata(intf);</div><div class='ctx'> 	struct usb_device *hdev = hub-&gt;hdev;</div><div class='ctx'> 	int port1;</div><div class='ctx'> </div><div class='ctx'> 	for (port1 = 1; port1 &lt;= hdev-&gt;maxchild; ++port1) {</div><div class='ctx'> 		if (hdev-&gt;children[port1 - 1]) {</div><div class='ctx'> 			usb_disconnect(&amp;hdev-&gt;children[port1 - 1]);</div><div class='del'>-			if (disable_ports)</div><div class='add'>+			if (hub-&gt;error == 0)</div><div class='ctx'> 				hub_port_disable(hub, port1, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -534,8 +541,10 @@ static void hub_pre_reset(struct usb_hub *hub, int disable_ports)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* caller has locked the hub device */</div><div class='del'>-static void hub_post_reset(struct usb_hub *hub)</div><div class='add'>+static void hub_post_reset(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='add'>+	struct usb_hub *hub = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='ctx'> 	hub_activate(hub);</div><div class='ctx'> 	hub_power_on(hub);</div><div class='ctx'> }</div><div class='hunk'>@@ -795,15 +804,16 @@ static void hub_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	struct usb_hub *hub = usb_get_intfdata (intf);</div><div class='ctx'> 	struct usb_device *hdev;</div><div class='ctx'> </div><div class='add'>+	/* Disconnect all children and quiesce the hub */</div><div class='add'>+	hub-&gt;error = 0;</div><div class='add'>+	hub_pre_reset(intf);</div><div class='add'>+</div><div class='ctx'> 	usb_set_intfdata (intf, NULL);</div><div class='ctx'> 	hdev = hub-&gt;hdev;</div><div class='ctx'> </div><div class='ctx'> 	if (hdev-&gt;speed == USB_SPEED_HIGH)</div><div class='ctx'> 		highspeed_hubs--;</div><div class='ctx'> </div><div class='del'>-	/* Disconnect all children and quiesce the hub */</div><div class='del'>-	hub_pre_reset(hub, 1);</div><div class='del'>-</div><div class='ctx'> 	usb_free_urb(hub-&gt;urb);</div><div class='ctx'> 	hub-&gt;urb = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1169,6 +1179,7 @@ static int choose_configuration(struct usb_device *udev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int num_configs;</div><div class='add'>+	int insufficient_power = 0;</div><div class='ctx'> 	struct usb_host_config *c, *best;</div><div class='ctx'> </div><div class='ctx'> 	best = NULL;</div><div class='hunk'>@@ -1221,8 +1232,10 @@ static int choose_configuration(struct usb_device *udev)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		/* Rule out configs that draw too much bus current */</div><div class='del'>-		if (c-&gt;desc.bMaxPower * 2 &gt; udev-&gt;bus_mA)</div><div class='add'>+		if (c-&gt;desc.bMaxPower * 2 &gt; udev-&gt;bus_mA) {</div><div class='add'>+			insufficient_power++;</div><div class='ctx'> 			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* If the first config's first interface is COMM/2/0xff</div><div class='ctx'> 		 * (MSFT RNDIS), rule it out unless Linux has host-side</div><div class='hunk'>@@ -1231,7 +1244,7 @@ static int choose_configuration(struct usb_device *udev)</div><div class='ctx'> 				&amp;&amp; desc-&gt;bInterfaceClass == USB_CLASS_COMM</div><div class='ctx'> 				&amp;&amp; desc-&gt;bInterfaceSubClass == 2</div><div class='ctx'> 				&amp;&amp; desc-&gt;bInterfaceProtocol == 0xff) {</div><div class='del'>-#ifndef CONFIG_USB_NET_RNDIS</div><div class='add'>+#ifndef CONFIG_USB_NET_RNDIS_HOST</div><div class='ctx'> 			continue;</div><div class='ctx'> #else</div><div class='ctx'> 			best = c;</div><div class='hunk'>@@ -1256,6 +1269,11 @@ static int choose_configuration(struct usb_device *udev)</div><div class='ctx'> 			best = c;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (insufficient_power &gt; 0)</div><div class='add'>+		dev_info(&amp;udev-&gt;dev, "rejected %d configuration%s "</div><div class='add'>+			"due to insufficient available bus power\n",</div><div class='add'>+			insufficient_power, plural(insufficient_power));</div><div class='add'>+</div><div class='ctx'> 	if (best) {</div><div class='ctx'> 		i = best-&gt;desc.bConfigurationValue;</div><div class='ctx'> 		dev_info(&amp;udev-&gt;dev,</div><div class='hunk'>@@ -1772,7 +1790,10 @@ static int finish_device_resume(struct usb_device *udev)</div><div class='ctx'> 	 * and device drivers will know about any resume quirks.</div><div class='ctx'> 	 */</div><div class='ctx'> 	status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &amp;devstatus);</div><div class='del'>-	if (status &lt; 2)</div><div class='add'>+	if (status &gt;= 0)</div><div class='add'>+		status = (status == 2 ? 0 : -ENODEV);</div><div class='add'>+</div><div class='add'>+	if (status)</div><div class='ctx'> 		dev_dbg(&amp;udev-&gt;dev,</div><div class='ctx'> 			"gone after usb resume? status %d\n",</div><div class='ctx'> 			status);</div><div class='hunk'>@@ -1861,7 +1882,12 @@ hub_port_resume(struct usb_hub *hub, int port1, struct usb_device *udev)</div><div class='ctx'> 			dev_dbg(hub-&gt;intfdev,</div><div class='ctx'> 				"port %d status %04x.%04x after resume, %d\n",</div><div class='ctx'> 				port1, portchange, devstatus, status);</div><div class='add'>+			if (status &gt;= 0)</div><div class='add'>+				status = -ENODEV;</div><div class='ctx'> 		} else {</div><div class='add'>+			if (portchange &amp; USB_PORT_STAT_C_SUSPEND)</div><div class='add'>+				clear_port_feature(hub-&gt;hdev, port1,</div><div class='add'>+						USB_PORT_FEAT_C_SUSPEND);</div><div class='ctx'> 			/* TRSMRCY = 10 msec */</div><div class='ctx'> 			msleep(10);</div><div class='ctx'> 			if (udev)</div><div class='hunk'>@@ -2732,7 +2758,8 @@ static void hub_events(void)</div><div class='ctx'> </div><div class='ctx'> 		/* If the hub has died, clean up after it */</div><div class='ctx'> 		if (hdev-&gt;state == USB_STATE_NOTATTACHED) {</div><div class='del'>-			hub_pre_reset(hub, 0);</div><div class='add'>+			hub-&gt;error = -ENODEV;</div><div class='add'>+			hub_pre_reset(intf);</div><div class='ctx'> 			goto loop;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2744,7 +2771,7 @@ static void hub_events(void)</div><div class='ctx'> 			dev_dbg (hub_dev, "resetting for error %d\n",</div><div class='ctx'> 				hub-&gt;error);</div><div class='ctx'> </div><div class='del'>-			ret = usb_reset_device(hdev);</div><div class='add'>+			ret = usb_reset_composite_device(hdev, intf);</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				dev_dbg (hub_dev,</div><div class='ctx'> 					"error resetting hub: %d\n", ret);</div><div class='hunk'>@@ -2913,6 +2940,8 @@ static struct usb_driver hub_driver = {</div><div class='ctx'> 	.disconnect =	hub_disconnect,</div><div class='ctx'> 	.suspend =	hub_suspend,</div><div class='ctx'> 	.resume =	hub_resume,</div><div class='add'>+	.pre_reset =	hub_pre_reset,</div><div class='add'>+	.post_reset =	hub_post_reset,</div><div class='ctx'> 	.ioctl =	hub_ioctl,</div><div class='ctx'> 	.id_table =	hub_id_table,</div><div class='ctx'> };</div><div class='hunk'>@@ -2992,9 +3021,9 @@ static int config_descriptors_changed(struct usb_device *udev)</div><div class='ctx'>  * usb_reset_device - perform a USB port reset to reinitialize a device</div><div class='ctx'>  * @udev: device to reset (not in SUSPENDED or NOTATTACHED state)</div><div class='ctx'>  *</div><div class='del'>- * WARNING - don't reset any device unless drivers for all of its</div><div class='del'>- * interfaces are expecting that reset!  Maybe some driver-&gt;reset()</div><div class='del'>- * method should eventually help ensure sufficient cooperation.</div><div class='add'>+ * WARNING - don't use this routine to reset a composite device</div><div class='add'>+ * (one with multiple interfaces owned by separate drivers)!</div><div class='add'>+ * Use usb_reset_composite_device() instead.</div><div class='ctx'>  *</div><div class='ctx'>  * Do a port reset, reassign the device's address, and establish its</div><div class='ctx'>  * former operating configuration.  If the reset fails, or the device's</div><div class='hunk'>@@ -3018,7 +3047,6 @@ int usb_reset_device(struct usb_device *udev)</div><div class='ctx'> 	struct usb_device		*parent_hdev = udev-&gt;parent;</div><div class='ctx'> 	struct usb_hub			*parent_hub;</div><div class='ctx'> 	struct usb_device_descriptor	descriptor = udev-&gt;descriptor;</div><div class='del'>-	struct usb_hub			*hub = NULL;</div><div class='ctx'> 	int 				i, ret = 0;</div><div class='ctx'> 	int				port1 = udev-&gt;portnum;</div><div class='ctx'> </div><div class='hunk'>@@ -3036,14 +3064,6 @@ int usb_reset_device(struct usb_device *udev)</div><div class='ctx'> 	}</div><div class='ctx'> 	parent_hub = hdev_to_hub(parent_hdev);</div><div class='ctx'> </div><div class='del'>-	/* If we're resetting an active hub, take some special actions */</div><div class='del'>-	if (udev-&gt;actconfig &amp;&amp; udev-&gt;actconfig-&gt;desc.bNumInterfaces &gt; 0 &amp;&amp;</div><div class='del'>-			udev-&gt;actconfig-&gt;interface[0]-&gt;dev.driver ==</div><div class='del'>-				&amp;hub_driver.driver &amp;&amp;</div><div class='del'>-			(hub = hdev_to_hub(udev)) != NULL) {</div><div class='del'>-		hub_pre_reset(hub, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	set_bit(port1, parent_hub-&gt;busy_bits);</div><div class='ctx'> 	for (i = 0; i &lt; SET_CONFIG_TRIES; ++i) {</div><div class='ctx'> </div><div class='hunk'>@@ -3102,11 +3122,87 @@ int usb_reset_device(struct usb_device *udev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='del'>-	if (hub)</div><div class='del'>-		hub_post_reset(hub);</div><div class='ctx'> 	return 0;</div><div class='ctx'>  </div><div class='ctx'> re_enumerate:</div><div class='ctx'> 	hub_port_logical_disconnect(parent_hub, port1);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * usb_reset_composite_device - warn interface drivers and perform a USB port reset</div><div class='add'>+ * @udev: device to reset (not in SUSPENDED or NOTATTACHED state)</div><div class='add'>+ * @iface: interface bound to the driver making the request (optional)</div><div class='add'>+ *</div><div class='add'>+ * Warns all drivers bound to registered interfaces (using their pre_reset</div><div class='add'>+ * method), performs the port reset, and then lets the drivers know that</div><div class='add'>+ * the reset is over (using their post_reset method).</div><div class='add'>+ *</div><div class='add'>+ * Return value is the same as for usb_reset_device().</div><div class='add'>+ *</div><div class='add'>+ * The caller must own the device lock.  For example, it's safe to use</div><div class='add'>+ * this from a driver probe() routine after downloading new firmware.</div><div class='add'>+ * For calls that might not occur during probe(), drivers should lock</div><div class='add'>+ * the device using usb_lock_device_for_reset().</div><div class='add'>+ *</div><div class='add'>+ * The interface locks are acquired during the pre_reset stage and released</div><div class='add'>+ * during the post_reset stage.  However if iface is not NULL and is</div><div class='add'>+ * currently being probed, we assume that the caller already owns its</div><div class='add'>+ * lock.</div><div class='add'>+ */</div><div class='add'>+int usb_reset_composite_device(struct usb_device *udev,</div><div class='add'>+		struct usb_interface *iface)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct usb_host_config *config = udev-&gt;actconfig;</div><div class='add'>+</div><div class='add'>+	if (udev-&gt;state == USB_STATE_NOTATTACHED ||</div><div class='add'>+			udev-&gt;state == USB_STATE_SUSPENDED) {</div><div class='add'>+		dev_dbg(&amp;udev-&gt;dev, "device reset not allowed in state %d\n",</div><div class='add'>+				udev-&gt;state);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iface &amp;&amp; iface-&gt;condition != USB_INTERFACE_BINDING)</div><div class='add'>+		iface = NULL;</div><div class='add'>+</div><div class='add'>+	if (config) {</div><div class='add'>+		int i;</div><div class='add'>+		struct usb_interface *cintf;</div><div class='add'>+		struct usb_driver *drv;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; config-&gt;desc.bNumInterfaces; ++i) {</div><div class='add'>+			cintf = config-&gt;interface[i];</div><div class='add'>+			if (cintf != iface)</div><div class='add'>+				down(&amp;cintf-&gt;dev.sem);</div><div class='add'>+			if (device_is_registered(&amp;cintf-&gt;dev) &amp;&amp;</div><div class='add'>+					cintf-&gt;dev.driver) {</div><div class='add'>+				drv = to_usb_driver(cintf-&gt;dev.driver);</div><div class='add'>+				if (drv-&gt;pre_reset)</div><div class='add'>+					(drv-&gt;pre_reset)(cintf);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = usb_reset_device(udev);</div><div class='add'>+</div><div class='add'>+	if (config) {</div><div class='add'>+		int i;</div><div class='add'>+		struct usb_interface *cintf;</div><div class='add'>+		struct usb_driver *drv;</div><div class='add'>+</div><div class='add'>+		for (i = config-&gt;desc.bNumInterfaces - 1; i &gt;= 0; --i) {</div><div class='add'>+			cintf = config-&gt;interface[i];</div><div class='add'>+			if (device_is_registered(&amp;cintf-&gt;dev) &amp;&amp;</div><div class='add'>+					cintf-&gt;dev.driver) {</div><div class='add'>+				drv = to_usb_driver(cintf-&gt;dev.driver);</div><div class='add'>+				if (drv-&gt;post_reset)</div><div class='add'>+					(drv-&gt;post_reset)(cintf);</div><div class='add'>+			}</div><div class='add'>+			if (cintf != iface)</div><div class='add'>+				up(&amp;cintf-&gt;dev.sem);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c<br/>index 3cf945cc5b9a..3182c2224ba2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/inode.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -201,7 +200,7 @@ static void update_sb(struct super_block *sb)</div><div class='ctx'> 	if (!root)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;root-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;root-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(bus, &amp;root-&gt;d_subdirs, d_u.d_child) {</div><div class='ctx'> 		if (bus-&gt;d_inode) {</div><div class='hunk'>@@ -528,7 +527,7 @@ static void fs_remove_file (struct dentry *dentry)</div><div class='ctx'> 	if (!parent || !parent-&gt;d_inode)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;parent-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;parent-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='ctx'> 	if (usbfs_positive(dentry)) {</div><div class='ctx'> 		if (dentry-&gt;d_inode) {</div><div class='ctx'> 			if (S_ISDIR(dentry-&gt;d_inode-&gt;i_mode))</div><div class='hunk'>@@ -543,10 +542,10 @@ static void fs_remove_file (struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct super_block *usb_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int usb_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, usbfs_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, usbfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type usb_fs_type = {</div><div class='hunk'>@@ -569,7 +568,7 @@ static int create_special_files (void)</div><div class='ctx'> 	ignore_mount = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* create the devices special file */</div><div class='del'>-	retval = simple_pin_fs("usbfs", &amp;usbfs_mount, &amp;usbfs_mount_count);</div><div class='add'>+	retval = simple_pin_fs(&amp;usb_fs_type, &amp;usbfs_mount, &amp;usbfs_mount_count);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		err ("Unable to get usbfs mount");</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -696,11 +695,11 @@ static void usbfs_remove_device(struct usb_device *dev)</div><div class='ctx'> 		wake_up_all(&amp;ds-&gt;wait);</div><div class='ctx'> 		list_del_init(&amp;ds-&gt;list);</div><div class='ctx'> 		if (ds-&gt;discsignr) {</div><div class='del'>-			sinfo.si_signo = SIGPIPE;</div><div class='add'>+			sinfo.si_signo = ds-&gt;discsignr;</div><div class='ctx'> 			sinfo.si_errno = EPIPE;</div><div class='ctx'> 			sinfo.si_code = SI_ASYNCIO;</div><div class='ctx'> 			sinfo.si_addr = ds-&gt;disccontext;</div><div class='del'>-			kill_proc_info_as_uid(ds-&gt;discsignr, &amp;sinfo, ds-&gt;disc_pid, ds-&gt;disc_uid, ds-&gt;disc_euid);</div><div class='add'>+			kill_proc_info_as_uid(ds-&gt;discsignr, &amp;sinfo, ds-&gt;disc_pid, ds-&gt;disc_uid, ds-&gt;disc_euid, ds-&gt;secid);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c<br/>index 08fb20f06f3e..4cc8d3e67db7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/message.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/message.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/message.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/message.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  * message.c - synchronous message handling</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;	/* for scatterlist macros */</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -158,6 +157,37 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * usb_interrupt_msg - Builds an interrupt urb, sends it off and waits for completion</div><div class='add'>+ * @usb_dev: pointer to the usb device to send the message to</div><div class='add'>+ * @pipe: endpoint "pipe" to send the message to</div><div class='add'>+ * @data: pointer to the data to send</div><div class='add'>+ * @len: length in bytes of the data to send</div><div class='add'>+ * @actual_length: pointer to a location to put the actual length transferred in bytes</div><div class='add'>+ * @timeout: time in msecs to wait for the message to complete before</div><div class='add'>+ *	timing out (if 0 the wait is forever)</div><div class='add'>+ * Context: !in_interrupt ()</div><div class='add'>+ *</div><div class='add'>+ * This function sends a simple interrupt message to a specified endpoint and</div><div class='add'>+ * waits for the message to complete, or timeout.</div><div class='add'>+ *</div><div class='add'>+ * If successful, it returns 0, otherwise a negative error number.  The number</div><div class='add'>+ * of actual bytes transferred will be stored in the actual_length paramater.</div><div class='add'>+ *</div><div class='add'>+ * Don't use this function from within an interrupt context, like a bottom half</div><div class='add'>+ * handler.  If you need an asynchronous message, or need to send a message</div><div class='add'>+ * from within interrupt context, use usb_submit_urb() If a thread in your</div><div class='add'>+ * driver uses this call, make sure your disconnect() method can wait for it to</div><div class='add'>+ * complete.  Since you don't have a handle on the URB used, you can't cancel</div><div class='add'>+ * the request.</div><div class='add'>+ */</div><div class='add'>+int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,</div><div class='add'>+		      void *data, int len, int *actual_length, int timeout)</div><div class='add'>+{</div><div class='add'>+	return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_interrupt_msg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	usb_bulk_msg - Builds a bulk urb, sends it off and waits for completion</div><div class='ctx'>  *	@usb_dev: pointer to the usb device to send the message to</div><div class='ctx'>  *	@pipe: endpoint "pipe" to send the message to</div><div class='hunk'>@@ -1380,15 +1410,7 @@ free_interfaces:</div><div class='ctx'> 				return ret;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if it's already configured, clear out old state first.</div><div class='del'>-	 * getting rid of old interfaces means unbinding their drivers.</div><div class='del'>-	 */</div><div class='del'>-	if (dev-&gt;state != USB_STATE_ADDRESS)</div><div class='del'>-		usb_disable_device (dev, 1);	// Skip ep0</div><div class='ctx'> </div><div class='del'>-	if (cp) {</div><div class='ctx'> 		i = dev-&gt;bus_mA - cp-&gt;desc.bMaxPower * 2;</div><div class='ctx'> 		if (i &lt; 0)</div><div class='ctx'> 			dev_warn(&amp;dev-&gt;dev, "new config #%d exceeds power "</div><div class='hunk'>@@ -1396,84 +1418,91 @@ free_interfaces:</div><div class='ctx'> 					configuration, -i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* if it's already configured, clear out old state first.</div><div class='add'>+	 * getting rid of old interfaces means unbinding their drivers.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;state != USB_STATE_ADDRESS)</div><div class='add'>+		usb_disable_device (dev, 1);	// Skip ep0</div><div class='add'>+</div><div class='ctx'> 	if ((ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),</div><div class='ctx'> 			USB_REQ_SET_CONFIGURATION, 0, configuration, 0,</div><div class='del'>-			NULL, 0, USB_CTRL_SET_TIMEOUT)) &lt; 0)</div><div class='del'>-		goto free_interfaces;</div><div class='add'>+			NULL, 0, USB_CTRL_SET_TIMEOUT)) &lt; 0) {</div><div class='add'>+</div><div class='add'>+		/* All the old state is gone, so what else can we do?</div><div class='add'>+		 * The device is probably useless now anyway.</div><div class='add'>+		 */</div><div class='add'>+		cp = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;actconfig = cp;</div><div class='del'>-	if (!cp)</div><div class='add'>+	if (!cp) {</div><div class='ctx'> 		usb_set_device_state(dev, USB_STATE_ADDRESS);</div><div class='del'>-	else {</div><div class='del'>-		usb_set_device_state(dev, USB_STATE_CONFIGURED);</div><div class='add'>+		goto free_interfaces;</div><div class='add'>+	}</div><div class='add'>+	usb_set_device_state(dev, USB_STATE_CONFIGURED);</div><div class='ctx'> </div><div class='del'>-		/* Initialize the new interface structures and the</div><div class='del'>-		 * hc/hcd/usbcore interface/endpoint state.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; nintf; ++i) {</div><div class='del'>-			struct usb_interface_cache *intfc;</div><div class='del'>-			struct usb_interface *intf;</div><div class='del'>-			struct usb_host_interface *alt;</div><div class='del'>-</div><div class='del'>-			cp-&gt;interface[i] = intf = new_interfaces[i];</div><div class='del'>-			intfc = cp-&gt;intf_cache[i];</div><div class='del'>-			intf-&gt;altsetting = intfc-&gt;altsetting;</div><div class='del'>-			intf-&gt;num_altsetting = intfc-&gt;num_altsetting;</div><div class='del'>-			kref_get(&amp;intfc-&gt;ref);</div><div class='del'>-</div><div class='del'>-			alt = usb_altnum_to_altsetting(intf, 0);</div><div class='del'>-</div><div class='del'>-			/* No altsetting 0?  We'll assume the first altsetting.</div><div class='del'>-			 * We could use a GetInterface call, but if a device is</div><div class='del'>-			 * so non-compliant that it doesn't have altsetting 0</div><div class='del'>-			 * then I wouldn't trust its reply anyway.</div><div class='del'>-			 */</div><div class='del'>-			if (!alt)</div><div class='del'>-				alt = &amp;intf-&gt;altsetting[0];</div><div class='del'>-</div><div class='del'>-			intf-&gt;cur_altsetting = alt;</div><div class='del'>-			usb_enable_interface(dev, intf);</div><div class='del'>-			intf-&gt;dev.parent = &amp;dev-&gt;dev;</div><div class='del'>-			intf-&gt;dev.driver = NULL;</div><div class='del'>-			intf-&gt;dev.bus = &amp;usb_bus_type;</div><div class='del'>-			intf-&gt;dev.dma_mask = dev-&gt;dev.dma_mask;</div><div class='del'>-			intf-&gt;dev.release = release_interface;</div><div class='del'>-			device_initialize (&amp;intf-&gt;dev);</div><div class='del'>-			mark_quiesced(intf);</div><div class='del'>-			sprintf (&amp;intf-&gt;dev.bus_id[0], "%d-%s:%d.%d",</div><div class='del'>-				 dev-&gt;bus-&gt;busnum, dev-&gt;devpath,</div><div class='del'>-				 configuration,</div><div class='del'>-				 alt-&gt;desc.bInterfaceNumber);</div><div class='del'>-		}</div><div class='del'>-		kfree(new_interfaces);</div><div class='add'>+	/* Initialize the new interface structures and the</div><div class='add'>+	 * hc/hcd/usbcore interface/endpoint state.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; nintf; ++i) {</div><div class='add'>+		struct usb_interface_cache *intfc;</div><div class='add'>+		struct usb_interface *intf;</div><div class='add'>+		struct usb_host_interface *alt;</div><div class='add'>+</div><div class='add'>+		cp-&gt;interface[i] = intf = new_interfaces[i];</div><div class='add'>+		intfc = cp-&gt;intf_cache[i];</div><div class='add'>+		intf-&gt;altsetting = intfc-&gt;altsetting;</div><div class='add'>+		intf-&gt;num_altsetting = intfc-&gt;num_altsetting;</div><div class='add'>+		kref_get(&amp;intfc-&gt;ref);</div><div class='ctx'> </div><div class='del'>-		if (cp-&gt;string == NULL)</div><div class='del'>-			cp-&gt;string = usb_cache_string(dev,</div><div class='del'>-					cp-&gt;desc.iConfiguration);</div><div class='add'>+		alt = usb_altnum_to_altsetting(intf, 0);</div><div class='ctx'> </div><div class='del'>-		/* Now that all the interfaces are set up, register them</div><div class='del'>-		 * to trigger binding of drivers to interfaces.  probe()</div><div class='del'>-		 * routines may install different altsettings and may</div><div class='del'>-		 * claim() any interfaces not yet bound.  Many class drivers</div><div class='del'>-		 * need that: CDC, audio, video, etc.</div><div class='add'>+		/* No altsetting 0?  We'll assume the first altsetting.</div><div class='add'>+		 * We could use a GetInterface call, but if a device is</div><div class='add'>+		 * so non-compliant that it doesn't have altsetting 0</div><div class='add'>+		 * then I wouldn't trust its reply anyway.</div><div class='ctx'> 		 */</div><div class='del'>-		for (i = 0; i &lt; nintf; ++i) {</div><div class='del'>-			struct usb_interface *intf = cp-&gt;interface[i];</div><div class='del'>-</div><div class='del'>-			dev_dbg (&amp;dev-&gt;dev,</div><div class='del'>-				"adding %s (config #%d, interface %d)\n",</div><div class='del'>-				intf-&gt;dev.bus_id, configuration,</div><div class='del'>-				intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='del'>-			ret = device_add (&amp;intf-&gt;dev);</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				dev_err(&amp;dev-&gt;dev,</div><div class='del'>-					"device_add(%s) --&gt; %d\n",</div><div class='del'>-					intf-&gt;dev.bus_id,</div><div class='del'>-					ret);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			usb_create_sysfs_intf_files (intf);</div><div class='add'>+		if (!alt)</div><div class='add'>+			alt = &amp;intf-&gt;altsetting[0];</div><div class='add'>+</div><div class='add'>+		intf-&gt;cur_altsetting = alt;</div><div class='add'>+		usb_enable_interface(dev, intf);</div><div class='add'>+		intf-&gt;dev.parent = &amp;dev-&gt;dev;</div><div class='add'>+		intf-&gt;dev.driver = NULL;</div><div class='add'>+		intf-&gt;dev.bus = &amp;usb_bus_type;</div><div class='add'>+		intf-&gt;dev.dma_mask = dev-&gt;dev.dma_mask;</div><div class='add'>+		intf-&gt;dev.release = release_interface;</div><div class='add'>+		device_initialize (&amp;intf-&gt;dev);</div><div class='add'>+		mark_quiesced(intf);</div><div class='add'>+		sprintf (&amp;intf-&gt;dev.bus_id[0], "%d-%s:%d.%d",</div><div class='add'>+			 dev-&gt;bus-&gt;busnum, dev-&gt;devpath,</div><div class='add'>+			 configuration, alt-&gt;desc.bInterfaceNumber);</div><div class='add'>+	}</div><div class='add'>+	kfree(new_interfaces);</div><div class='add'>+</div><div class='add'>+	if (cp-&gt;string == NULL)</div><div class='add'>+		cp-&gt;string = usb_cache_string(dev, cp-&gt;desc.iConfiguration);</div><div class='add'>+</div><div class='add'>+	/* Now that all the interfaces are set up, register them</div><div class='add'>+	 * to trigger binding of drivers to interfaces.  probe()</div><div class='add'>+	 * routines may install different altsettings and may</div><div class='add'>+	 * claim() any interfaces not yet bound.  Many class drivers</div><div class='add'>+	 * need that: CDC, audio, video, etc.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; nintf; ++i) {</div><div class='add'>+		struct usb_interface *intf = cp-&gt;interface[i];</div><div class='add'>+</div><div class='add'>+		dev_dbg (&amp;dev-&gt;dev,</div><div class='add'>+			"adding %s (config #%d, interface %d)\n",</div><div class='add'>+			intf-&gt;dev.bus_id, configuration,</div><div class='add'>+			intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber);</div><div class='add'>+		ret = device_add (&amp;intf-&gt;dev);</div><div class='add'>+		if (ret != 0) {</div><div class='add'>+			dev_err(&amp;dev-&gt;dev, "device_add(%s) --&gt; %d\n",</div><div class='add'>+				intf-&gt;dev.bus_id, ret);</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='add'>+		usb_create_sysfs_intf_files (intf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c<br/>index fe0ed54fa0ae..b042676af0a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/notify.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/notify.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/notify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/notify.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/notifier.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='head'>diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c<br/>index 71d881327e88..dec973affb0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/sysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/sysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/sysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/sysfs.c</a></div><div class='hunk'>@@ -10,208 +10,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include "usb.h"</div><div class='ctx'> </div><div class='del'>-/* endpoint stuff */</div><div class='del'>-struct ep_object {</div><div class='del'>-	struct usb_endpoint_descriptor *desc;</div><div class='del'>-	struct usb_device *udev;</div><div class='del'>-	struct kobject kobj;</div><div class='del'>-};</div><div class='del'>-#define to_ep_object(_kobj) \</div><div class='del'>-	container_of(_kobj, struct ep_object, kobj)</div><div class='del'>-</div><div class='del'>-struct ep_attribute {</div><div class='del'>-	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(struct usb_device *,</div><div class='del'>-			struct usb_endpoint_descriptor *, char *);</div><div class='del'>-};</div><div class='del'>-#define to_ep_attribute(_attr) \</div><div class='del'>-	container_of(_attr, struct ep_attribute, attr)</div><div class='del'>-</div><div class='del'>-#define EP_ATTR(_name)						\</div><div class='del'>-struct ep_attribute ep_##_name = {				\</div><div class='del'>-	.attr = {.name = #_name, .owner = THIS_MODULE,		\</div><div class='del'>-			.mode = S_IRUGO},			\</div><div class='del'>-	.show = show_ep_##_name}</div><div class='del'>-</div><div class='del'>-#define usb_ep_attr(field, format_string)			\</div><div class='del'>-static ssize_t show_ep_##field(struct usb_device *udev,		\</div><div class='del'>-		struct usb_endpoint_descriptor *desc, 		\</div><div class='del'>-		char *buf)					\</div><div class='del'>-{								\</div><div class='del'>-	return sprintf(buf, format_string, desc-&gt;field);	\</div><div class='del'>-}								\</div><div class='del'>-static EP_ATTR(field);</div><div class='del'>-</div><div class='del'>-usb_ep_attr(bLength, "%02x\n")</div><div class='del'>-usb_ep_attr(bEndpointAddress, "%02x\n")</div><div class='del'>-usb_ep_attr(bmAttributes, "%02x\n")</div><div class='del'>-usb_ep_attr(bInterval, "%02x\n")</div><div class='del'>-</div><div class='del'>-static ssize_t show_ep_wMaxPacketSize(struct usb_device *udev,</div><div class='del'>-		struct usb_endpoint_descriptor *desc, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%04x\n",</div><div class='del'>-			le16_to_cpu(desc-&gt;wMaxPacketSize) &amp; 0x07ff);</div><div class='del'>-}</div><div class='del'>-static EP_ATTR(wMaxPacketSize);</div><div class='del'>-</div><div class='del'>-static ssize_t show_ep_type(struct usb_device *udev,</div><div class='del'>-		struct usb_endpoint_descriptor *desc, char *buf)</div><div class='del'>-{</div><div class='del'>-	char *type = "unknown";</div><div class='del'>-</div><div class='del'>-	switch (desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) {</div><div class='del'>-	case USB_ENDPOINT_XFER_CONTROL:</div><div class='del'>-		type = "Control";</div><div class='del'>-		break;</div><div class='del'>-	case USB_ENDPOINT_XFER_ISOC:</div><div class='del'>-		type = "Isoc";</div><div class='del'>-		break;</div><div class='del'>-	case USB_ENDPOINT_XFER_BULK:</div><div class='del'>-		type = "Bulk";</div><div class='del'>-		break;</div><div class='del'>-	case USB_ENDPOINT_XFER_INT:</div><div class='del'>-		type = "Interrupt";</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return sprintf(buf, "%s\n", type);</div><div class='del'>-}</div><div class='del'>-static EP_ATTR(type);</div><div class='del'>-</div><div class='del'>-static ssize_t show_ep_interval(struct usb_device *udev,</div><div class='del'>-		struct usb_endpoint_descriptor *desc, char *buf)</div><div class='del'>-{</div><div class='del'>-	char unit;</div><div class='del'>-	unsigned interval = 0;</div><div class='del'>-	unsigned in;</div><div class='del'>-</div><div class='del'>-	in = (desc-&gt;bEndpointAddress &amp; USB_DIR_IN);</div><div class='del'>-</div><div class='del'>-	switch (desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) {</div><div class='del'>-	case USB_ENDPOINT_XFER_CONTROL:</div><div class='del'>-		if (udev-&gt;speed == USB_SPEED_HIGH) 	/* uframes per NAK */</div><div class='del'>-			interval = desc-&gt;bInterval;</div><div class='del'>-		break;</div><div class='del'>-	case USB_ENDPOINT_XFER_ISOC:</div><div class='del'>-		interval = 1 &lt;&lt; (desc-&gt;bInterval - 1);</div><div class='del'>-		break;</div><div class='del'>-	case USB_ENDPOINT_XFER_BULK:</div><div class='del'>-		if (udev-&gt;speed == USB_SPEED_HIGH &amp;&amp; !in) /* uframes per NAK */</div><div class='del'>-			interval = desc-&gt;bInterval;</div><div class='del'>-		break;</div><div class='del'>-	case USB_ENDPOINT_XFER_INT:</div><div class='del'>-		if (udev-&gt;speed == USB_SPEED_HIGH)</div><div class='del'>-			interval = 1 &lt;&lt; (desc-&gt;bInterval - 1);</div><div class='del'>-		else</div><div class='del'>-			interval = desc-&gt;bInterval;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	interval *= (udev-&gt;speed == USB_SPEED_HIGH) ? 125 : 1000;</div><div class='del'>-	if (interval % 1000)</div><div class='del'>-		unit = 'u';</div><div class='del'>-	else {</div><div class='del'>-		unit = 'm';</div><div class='del'>-		interval /= 1000;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d%cs\n", interval, unit);</div><div class='del'>-}</div><div class='del'>-static EP_ATTR(interval);</div><div class='del'>-</div><div class='del'>-static ssize_t show_ep_direction(struct usb_device *udev,</div><div class='del'>-		struct usb_endpoint_descriptor *desc, char *buf)</div><div class='del'>-{</div><div class='del'>-	char *direction;</div><div class='del'>-</div><div class='del'>-	if ((desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) ==</div><div class='del'>-			USB_ENDPOINT_XFER_CONTROL)</div><div class='del'>-		direction = "both";</div><div class='del'>-	else if (desc-&gt;bEndpointAddress &amp; USB_DIR_IN)</div><div class='del'>-		direction = "in";</div><div class='del'>-	else</div><div class='del'>-		direction = "out";</div><div class='del'>-	return sprintf(buf, "%s\n", direction);</div><div class='del'>-}</div><div class='del'>-static EP_ATTR(direction);</div><div class='del'>-</div><div class='del'>-static struct attribute *ep_attrs[] = {</div><div class='del'>-	&amp;ep_bLength.attr,</div><div class='del'>-	&amp;ep_bEndpointAddress.attr,</div><div class='del'>-	&amp;ep_bmAttributes.attr,</div><div class='del'>-	&amp;ep_bInterval.attr,</div><div class='del'>-	&amp;ep_wMaxPacketSize.attr,</div><div class='del'>-	&amp;ep_type.attr,</div><div class='del'>-	&amp;ep_interval.attr,</div><div class='del'>-	&amp;ep_direction.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ep_object_release(struct kobject *kobj)</div><div class='del'>-{</div><div class='del'>-	kfree(to_ep_object(kobj));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t ep_object_show(struct kobject *kobj, struct attribute *attr,</div><div class='del'>-		char *buf)</div><div class='del'>-{</div><div class='del'>-	struct ep_object *ep_obj = to_ep_object(kobj);</div><div class='del'>-	struct ep_attribute *ep_attr = to_ep_attribute(attr);</div><div class='del'>-</div><div class='del'>-	return (ep_attr-&gt;show)(ep_obj-&gt;udev, ep_obj-&gt;desc, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sysfs_ops ep_object_sysfs_ops = {</div><div class='del'>-	.show =			ep_object_show,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct kobj_type ep_object_ktype = {</div><div class='del'>-	.release =		ep_object_release,</div><div class='del'>-	.sysfs_ops =		&amp;ep_object_sysfs_ops,</div><div class='del'>-	.default_attrs =	ep_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void usb_create_ep_files(struct kobject *parent,</div><div class='del'>-		struct usb_host_endpoint *endpoint,</div><div class='del'>-		struct usb_device *udev)</div><div class='del'>-{</div><div class='del'>-	struct ep_object *ep_obj;</div><div class='del'>-	struct kobject *kobj;</div><div class='del'>-</div><div class='del'>-	ep_obj = kzalloc(sizeof(struct ep_object), GFP_KERNEL);</div><div class='del'>-	if (!ep_obj)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ep_obj-&gt;desc = &amp;endpoint-&gt;desc;</div><div class='del'>-	ep_obj-&gt;udev = udev;</div><div class='del'>-</div><div class='del'>-	kobj = &amp;ep_obj-&gt;kobj;</div><div class='del'>-	kobject_set_name(kobj, "ep_%02x", endpoint-&gt;desc.bEndpointAddress);</div><div class='del'>-	kobj-&gt;parent = parent;</div><div class='del'>-	kobj-&gt;ktype = &amp;ep_object_ktype;</div><div class='del'>-</div><div class='del'>-	/* Don't use kobject_register, because it generates a hotplug event */</div><div class='del'>-	kobject_init(kobj);</div><div class='del'>-	if (kobject_add(kobj) == 0)</div><div class='del'>-		endpoint-&gt;kobj = kobj;</div><div class='del'>-	else</div><div class='del'>-		kobject_put(kobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void usb_remove_ep_files(struct usb_host_endpoint *endpoint)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (endpoint-&gt;kobj) {</div><div class='del'>-		kobject_del(endpoint-&gt;kobj);</div><div class='del'>-		kobject_put(endpoint-&gt;kobj);</div><div class='del'>-		endpoint-&gt;kobj = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Active configuration fields */</div><div class='ctx'> #define usb_actconfig_show(field, multiplier, format_string)		\</div><div class='ctx'> static ssize_t  show_##field (struct device *dev,			\</div><div class='hunk'>@@ -420,7 +222,7 @@ void usb_create_sysfs_dev_files (struct usb_device *udev)</div><div class='ctx'> 	if (udev-&gt;serial)</div><div class='ctx'> 		device_create_file (dev, &amp;dev_attr_serial);</div><div class='ctx'> 	device_create_file (dev, &amp;dev_attr_configuration);</div><div class='del'>-	usb_create_ep_files(&amp;dev-&gt;kobj, &amp;udev-&gt;ep0, udev);</div><div class='add'>+	usb_create_ep_files(dev, &amp;udev-&gt;ep0, udev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void usb_remove_sysfs_dev_files (struct usb_device *udev)</div><div class='hunk'>@@ -524,7 +326,7 @@ static inline void usb_create_intf_ep_files(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	iface_desc = intf-&gt;cur_altsetting;</div><div class='ctx'> 	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; ++i)</div><div class='del'>-		usb_create_ep_files(&amp;intf-&gt;dev.kobj, &amp;iface_desc-&gt;endpoint[i],</div><div class='add'>+		usb_create_ep_files(&amp;intf-&gt;dev, &amp;iface_desc-&gt;endpoint[i],</div><div class='ctx'> 				udev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c<br/>index dad4d8fd8180..9864988377c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/urb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/urb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/urb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/urb.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='head'>diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c<br/>index b7fdc1cd134a..184c24660a4c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/usb.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  * are evil.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='hunk'>@@ -991,6 +990,8 @@ void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe,</div><div class='ctx'> </div><div class='ctx'> static int verify_suspended(struct device *dev, void *unused)</div><div class='ctx'> {</div><div class='add'>+	if (dev-&gt;driver == NULL)</div><div class='add'>+		return 0;</div><div class='ctx'> 	return (dev-&gt;power.power_state.event == PM_EVENT_ON) ? -EBUSY : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1207,6 +1208,7 @@ EXPORT_SYMBOL(usb_ifnum_to_if);</div><div class='ctx'> EXPORT_SYMBOL(usb_altnum_to_altsetting);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(usb_reset_device);</div><div class='add'>+EXPORT_SYMBOL(usb_reset_composite_device);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(__usb_get_extra_descriptor);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h<br/>index 4647e1ebc68d..49f69236b420 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/core/usb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/core/usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/core/usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/core/usb.h</a></div><div class='hunk'>@@ -4,6 +4,9 @@ extern void usb_create_sysfs_dev_files (struct usb_device *dev);</div><div class='ctx'> extern void usb_remove_sysfs_dev_files (struct usb_device *dev);</div><div class='ctx'> extern void usb_create_sysfs_intf_files (struct usb_interface *intf);</div><div class='ctx'> extern void usb_remove_sysfs_intf_files (struct usb_interface *intf);</div><div class='add'>+extern void usb_create_ep_files(struct device *parent, struct usb_host_endpoint *endpoint,</div><div class='add'>+				struct usb_device *udev);</div><div class='add'>+extern void usb_remove_ep_files(struct usb_host_endpoint *endpoint);</div><div class='ctx'> </div><div class='ctx'> extern void usb_disable_endpoint (struct usb_device *dev, unsigned int epaddr);</div><div class='ctx'> extern void usb_disable_interface (struct usb_device *dev,</div><div class='hunk'>@@ -77,6 +80,7 @@ struct dev_state {</div><div class='ctx'> 	uid_t disc_uid, disc_euid;</div><div class='ctx'> 	void __user *disccontext;</div><div class='ctx'> 	unsigned long ifclaimed;</div><div class='add'>+	u32 secid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* internal notify stuff */</div><div class='head'>diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c<br/>index b8d0b7825bf3..1c459ff037ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/at91_udc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/at91_udc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/at91_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/at91_udc.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #undef	VERBOSE</div><div class='ctx'> #undef	PACKET_TRACE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='hunk'>@@ -1654,13 +1653,13 @@ static int __devinit at91udc_probe(struct platform_device *pdev)</div><div class='ctx'> 	pullup(udc, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* request UDC and maybe VBUS irqs */</div><div class='del'>-	if (request_irq(AT91_ID_UDP, at91_udc_irq, SA_INTERRUPT, driver_name, udc)) {</div><div class='add'>+	if (request_irq(AT91_ID_UDP, at91_udc_irq, IRQF_DISABLED, driver_name, udc)) {</div><div class='ctx'> 		DBG("request irq %d failed\n", AT91_ID_UDP);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (udc-&gt;board.vbus_pin &gt; 0) {</div><div class='del'>-		if (request_irq(udc-&gt;board.vbus_pin, at91_vbus_irq, SA_INTERRUPT, driver_name, udc)) {</div><div class='add'>+		if (request_irq(udc-&gt;board.vbus_pin, at91_vbus_irq, IRQF_DISABLED, driver_name, udc)) {</div><div class='ctx'> 			DBG("request vbus irq %d failed\n", udc-&gt;board.vbus_pin);</div><div class='ctx'> 			free_irq(AT91_ID_UDP, udc);</div><div class='ctx'> 			retval = -EBUSY;</div><div class='head'>diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c<br/>index 42ce41d71b7f..4be47195bd38 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/dummy_hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/dummy_hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/dummy_hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/dummy_hcd.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c<br/>index f7c6d758e1b0..53d584589c26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/epautoconf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/epautoconf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/epautoconf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/epautoconf.c</a></div><div class='hunk'>@@ -34,12 +34,12 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* we must assign addresses for configurable endpoints (like net2280) */</div><div class='del'>-static __initdata unsigned epnum;</div><div class='add'>+static __devinitdata unsigned epnum;</div><div class='ctx'> </div><div class='ctx'> // #define MANY_ENDPOINTS</div><div class='ctx'> #ifdef MANY_ENDPOINTS</div><div class='ctx'> /* more than 15 configurable endpoints */</div><div class='del'>-static __initdata unsigned in_epnum;</div><div class='add'>+static __devinitdata unsigned in_epnum;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +59,7 @@ static __initdata unsigned in_epnum;</div><div class='ctx'>  * NOTE:  each endpoint is unidirectional, as specified by its USB</div><div class='ctx'>  * descriptor; and isn't specific to a configuration or altsetting.</div><div class='ctx'>  */</div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> ep_matches (</div><div class='ctx'> 	struct usb_gadget		*gadget,</div><div class='ctx'> 	struct usb_ep			*ep,</div><div class='hunk'>@@ -73,7 +73,7 @@ ep_matches (</div><div class='ctx'> 	/* endpoint already claimed? */</div><div class='ctx'> 	if (0 != ep-&gt;driver_data)</div><div class='ctx'> 		return 0;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* only support ep0 for portable CONTROL traffic */</div><div class='ctx'> 	type = desc-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK;</div><div class='ctx'> 	if (USB_ENDPOINT_XFER_CONTROL == type)</div><div class='hunk'>@@ -186,7 +186,7 @@ ep_matches (</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct usb_ep * __init</div><div class='add'>+static struct usb_ep * __devinit</div><div class='ctx'> find_ep (struct usb_gadget *gadget, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_ep	*ep;</div><div class='hunk'>@@ -228,7 +228,7 @@ find_ep (struct usb_gadget *gadget, const char *name)</div><div class='ctx'>  *</div><div class='ctx'>  * On failure, this returns a null endpoint descriptor.</div><div class='ctx'>  */</div><div class='del'>-struct usb_ep * __init usb_ep_autoconfig (</div><div class='add'>+struct usb_ep * __devinit usb_ep_autoconfig (</div><div class='ctx'> 	struct usb_gadget		*gadget,</div><div class='ctx'> 	struct usb_endpoint_descriptor	*desc</div><div class='ctx'> )</div><div class='hunk'>@@ -276,7 +276,7 @@ struct usb_ep * __init usb_ep_autoconfig (</div><div class='ctx'> 			return ep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Second, look at endpoints until an unclaimed one looks usable */ </div><div class='add'>+	/* Second, look at endpoints until an unclaimed one looks usable */</div><div class='ctx'> 	list_for_each_entry (ep, &amp;gadget-&gt;ep_list, ep_list) {</div><div class='ctx'> 		if (ep_matches (gadget, ep, desc))</div><div class='ctx'> 			return ep;</div><div class='hunk'>@@ -295,7 +295,7 @@ struct usb_ep * __init usb_ep_autoconfig (</div><div class='ctx'>  * state such as ep-&gt;driver_data and the record of assigned endpoints</div><div class='ctx'>  * used by usb_ep_autoconfig().</div><div class='ctx'>  */</div><div class='del'>-void __init usb_ep_autoconfig_reset (struct usb_gadget *gadget)</div><div class='add'>+void __devinit usb_ep_autoconfig_reset (struct usb_gadget *gadget)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_ep	*ep;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c<br/>index 9c4422ac9de4..4fe1bec1c255 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/ether.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/ether.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> // #define DEBUG 1</div><div class='ctx'> // #define VERBOSE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -49,7 +48,7 @@</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb_ch9.h&gt;</div><div class='del'>-#include &lt;linux/usb_cdc.h&gt;</div><div class='add'>+#include &lt;linux/usb/cdc.h&gt;</div><div class='ctx'> #include &lt;linux/usb_gadget.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='hunk'>@@ -101,9 +100,9 @@ static const char driver_desc [] = DRIVER_DESC;</div><div class='ctx'> </div><div class='ctx'> /* CDC and RNDIS support the same host-chosen outgoing packet filters. */</div><div class='ctx'> #define	DEFAULT_FILTER	(USB_CDC_PACKET_TYPE_BROADCAST \</div><div class='del'>- 			|USB_CDC_PACKET_TYPE_ALL_MULTICAST \</div><div class='del'>- 			|USB_CDC_PACKET_TYPE_PROMISCUOUS \</div><div class='del'>- 			|USB_CDC_PACKET_TYPE_DIRECTED)</div><div class='add'>+			|USB_CDC_PACKET_TYPE_ALL_MULTICAST \</div><div class='add'>+			|USB_CDC_PACKET_TYPE_PROMISCUOUS \</div><div class='add'>+			|USB_CDC_PACKET_TYPE_DIRECTED)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -318,7 +317,7 @@ static inline int rndis_active(struct eth_dev *dev)</div><div class='ctx'> #define DEFAULT_QLEN	2	/* double buffering by default */</div><div class='ctx'> </div><div class='ctx'> /* peak bulk transfer bits-per-second */</div><div class='del'>-#define	HS_BPS 		(13 * 512 * 8 * 1000 * 8)</div><div class='add'>+#define	HS_BPS		(13 * 512 * 8 * 1000 * 8)</div><div class='ctx'> #define	FS_BPS		(19 *  64 * 1 * 1000 * 8)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_USB_GADGET_DUALSPEED</div><div class='hunk'>@@ -466,7 +465,7 @@ eth_config = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_USB_ETH_RNDIS</div><div class='del'>-static struct usb_config_descriptor </div><div class='add'>+static struct usb_config_descriptor</div><div class='ctx'> rndis_config = {</div><div class='ctx'> 	.bLength =              sizeof rndis_config,</div><div class='ctx'> 	.bDescriptorType =      USB_DT_CONFIG,</div><div class='hunk'>@@ -511,7 +510,7 @@ static const struct usb_interface_descriptor</div><div class='ctx'> rndis_control_intf = {</div><div class='ctx'> 	.bLength =              sizeof rndis_control_intf,</div><div class='ctx'> 	.bDescriptorType =      USB_DT_INTERFACE,</div><div class='del'>-	  </div><div class='add'>+</div><div class='ctx'> 	.bInterfaceNumber =     0,</div><div class='ctx'> 	.bNumEndpoints =        1,</div><div class='ctx'> 	.bInterfaceClass =      USB_CLASS_COMM,</div><div class='hunk'>@@ -545,20 +544,20 @@ static const struct usb_cdc_union_desc union_desc = {</div><div class='ctx'> #ifdef	CONFIG_USB_ETH_RNDIS</div><div class='ctx'> </div><div class='ctx'> static const struct usb_cdc_call_mgmt_descriptor call_mgmt_descriptor = {</div><div class='del'>-	.bLength =  		sizeof call_mgmt_descriptor,</div><div class='del'>-	.bDescriptorType = 	USB_DT_CS_INTERFACE,</div><div class='del'>-	.bDescriptorSubType = 	USB_CDC_CALL_MANAGEMENT_TYPE,</div><div class='add'>+	.bLength =		sizeof call_mgmt_descriptor,</div><div class='add'>+	.bDescriptorType =	USB_DT_CS_INTERFACE,</div><div class='add'>+	.bDescriptorSubType =	USB_CDC_CALL_MANAGEMENT_TYPE,</div><div class='ctx'> </div><div class='del'>-	.bmCapabilities = 	0x00,</div><div class='del'>-	.bDataInterface = 	0x01,</div><div class='add'>+	.bmCapabilities =	0x00,</div><div class='add'>+	.bDataInterface =	0x01,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct usb_cdc_acm_descriptor acm_descriptor = {</div><div class='del'>-	.bLength =  		sizeof acm_descriptor,</div><div class='del'>-	.bDescriptorType = 	USB_DT_CS_INTERFACE,</div><div class='del'>-	.bDescriptorSubType = 	USB_CDC_ACM_TYPE,</div><div class='add'>+	.bLength =		sizeof acm_descriptor,</div><div class='add'>+	.bDescriptorType =	USB_DT_CS_INTERFACE,</div><div class='add'>+	.bDescriptorSubType =	USB_CDC_ACM_TYPE,</div><div class='ctx'> </div><div class='del'>-	.bmCapabilities = 	0x00,</div><div class='add'>+	.bmCapabilities =	0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -595,7 +594,7 @@ static const struct usb_cdc_ether_desc ether_desc = {</div><div class='ctx'>  * RNDIS requires the status endpoint, since it uses that encapsulation</div><div class='ctx'>  * mechanism for its funky RPC scheme.</div><div class='ctx'>  */</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> #define LOG2_STATUS_INTERVAL_MSEC	5	/* 1 &lt;&lt; 5 == 32 msec */</div><div class='ctx'> #define STATUS_BYTECOUNT		16	/* 8 byte header + data */</div><div class='ctx'> </div><div class='hunk'>@@ -978,7 +977,7 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)</div><div class='ctx'> </div><div class='ctx'> 		result = usb_ep_enable (dev-&gt;status_ep, dev-&gt;status);</div><div class='ctx'> 		if (result != 0) {</div><div class='del'>-			DEBUG (dev, "enable %s --&gt; %d\n", </div><div class='add'>+			DEBUG (dev, "enable %s --&gt; %d\n",</div><div class='ctx'> 				dev-&gt;status_ep-&gt;name, result);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1002,15 +1001,15 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)</div><div class='ctx'> 	if (!cdc_active(dev)) {</div><div class='ctx'> 		result = usb_ep_enable (dev-&gt;in_ep, dev-&gt;in);</div><div class='ctx'> 		if (result != 0) {</div><div class='del'>-			DEBUG(dev, "enable %s --&gt; %d\n", </div><div class='add'>+			DEBUG(dev, "enable %s --&gt; %d\n",</div><div class='ctx'> 				dev-&gt;in_ep-&gt;name, result);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		result = usb_ep_enable (dev-&gt;out_ep, dev-&gt;out);</div><div class='ctx'> 		if (result != 0) {</div><div class='del'>-			DEBUG (dev, "enable %s --&gt; %d\n", </div><div class='del'>-				dev-&gt;in_ep-&gt;name, result);</div><div class='add'>+			DEBUG (dev, "enable %s --&gt; %d\n",</div><div class='add'>+				dev-&gt;out_ep-&gt;name, result);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1144,7 +1143,7 @@ eth_set_config (struct eth_dev *dev, unsigned number, gfp_t gfp_flags)</div><div class='ctx'> #ifdef CONFIG_USB_GADGET_DUALSPEED</div><div class='ctx'> 		case USB_SPEED_HIGH:	speed = "high"; break;</div><div class='ctx'> #endif</div><div class='del'>-		default: 		speed = "?"; break;</div><div class='add'>+		default:		speed = "?"; break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;config = number;</div><div class='hunk'>@@ -1206,7 +1205,7 @@ static void issue_start_status (struct eth_dev *dev)</div><div class='ctx'> 	struct usb_request		*req = dev-&gt;stat_req;</div><div class='ctx'> 	struct usb_cdc_notification	*event;</div><div class='ctx'> 	int				value;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> 	DEBUG (dev, "%s, flush old status first\n", __FUNCTION__);</div><div class='ctx'> </div><div class='ctx'> 	/* flush old status</div><div class='hunk'>@@ -1268,7 +1267,7 @@ static void rndis_command_complete (struct usb_ep *ep, struct usb_request *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct eth_dev          *dev = ep-&gt;driver_data;</div><div class='ctx'> 	int			status;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* received RNDIS command from USB_CDC_SEND_ENCAPSULATED_COMMAND */</div><div class='ctx'> 	spin_lock(&amp;dev-&gt;lock);</div><div class='ctx'> 	status = rndis_msg_parser (dev-&gt;rndis_config, (u8 *) req-&gt;buf);</div><div class='hunk'>@@ -1472,7 +1471,7 @@ done_set_intf:</div><div class='ctx'> </div><div class='ctx'> #endif /* DEV_CONFIG_CDC */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USB_ETH_RNDIS		</div><div class='add'>+#ifdef CONFIG_USB_ETH_RNDIS</div><div class='ctx'> 	/* RNDIS uses the CDC command encapsulation mechanism to implement</div><div class='ctx'> 	 * an RPC scheme, with much getting/setting of attributes by OID.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1489,7 +1488,7 @@ done_set_intf:</div><div class='ctx'> 		req-&gt;complete = rndis_command_complete;</div><div class='ctx'> 		/* later, rndis_control_ack () sends a notification */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case USB_CDC_GET_ENCAPSULATED_RESPONSE:</div><div class='ctx'> 		if ((USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE)</div><div class='ctx'> 					== ctrl-&gt;bRequestType</div><div class='hunk'>@@ -1641,7 +1640,7 @@ rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)</div><div class='ctx'> 		DEBUG (dev, "no rx skb\n");</div><div class='ctx'> 		goto enomem;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* Some platforms perform better when IP packets are aligned,</div><div class='ctx'> 	 * but on at least one, checksumming fails otherwise.  Note:</div><div class='ctx'> 	 * RNDIS headers involve variable numbers of LE32 values.</div><div class='hunk'>@@ -1720,7 +1719,7 @@ quiesce:</div><div class='ctx'> 	case -EOVERFLOW:</div><div class='ctx'> 		dev-&gt;stats.rx_over_errors++;</div><div class='ctx'> 		// FALLTHROUGH</div><div class='del'>-	    </div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev-&gt;stats.rx_errors++;</div><div class='ctx'> 		DEBUG (dev, "rx status %d\n", status);</div><div class='hunk'>@@ -1915,7 +1914,7 @@ static int eth_start_xmit (struct sk_buff *skb, struct net_device *net)</div><div class='ctx'> 				sizeof (struct rndis_packet_msg_type));</div><div class='ctx'> 		if (!skb_rndis)</div><div class='ctx'> 			goto drop;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 		dev_kfree_skb_any (skb);</div><div class='ctx'> 		skb = skb_rndis;</div><div class='ctx'> 		rndis_add_hdr (skb);</div><div class='hunk'>@@ -2001,7 +2000,7 @@ static int rndis_control_ack (struct net_device *net)</div><div class='ctx'> 	struct eth_dev          *dev = netdev_priv(net);</div><div class='ctx'> 	u32                     length;</div><div class='ctx'> 	struct usb_request      *resp = dev-&gt;stat_req;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* in case RNDIS calls this after disconnect */</div><div class='ctx'> 	if (!dev-&gt;status) {</div><div class='ctx'> 		DEBUG (dev, "status ENODEV\n");</div><div class='hunk'>@@ -2021,16 +2020,16 @@ static int rndis_control_ack (struct net_device *net)</div><div class='ctx'> 	resp-&gt;length = 8;</div><div class='ctx'> 	resp-&gt;complete = rndis_control_ack_complete;</div><div class='ctx'> 	resp-&gt;context = dev;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	*((__le32 *) resp-&gt;buf) = __constant_cpu_to_le32 (1);</div><div class='ctx'> 	*((__le32 *) resp-&gt;buf + 1) = __constant_cpu_to_le32 (0);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	length = usb_ep_queue (dev-&gt;status_ep, resp, GFP_ATOMIC);</div><div class='ctx'> 	if (length &lt; 0) {</div><div class='ctx'> 		resp-&gt;status = 0;</div><div class='ctx'> 		rndis_control_ack_complete (dev-&gt;status_ep, resp);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2047,7 +2046,7 @@ static void eth_start (struct eth_dev *dev, gfp_t gfp_flags)</div><div class='ctx'> 	/* fill the rx queue */</div><div class='ctx'> 	rx_fill (dev, gfp_flags);</div><div class='ctx'> </div><div class='del'>-	/* and open the tx floodgates */ </div><div class='add'>+	/* and open the tx floodgates */</div><div class='ctx'> 	atomic_set (&amp;dev-&gt;tx_qlen, 0);</div><div class='ctx'> 	netif_wake_queue (dev-&gt;net);</div><div class='ctx'> 	if (rndis_active(dev)) {</div><div class='hunk'>@@ -2076,7 +2075,7 @@ static int eth_stop (struct net_device *net)</div><div class='ctx'> 	netif_stop_queue (net);</div><div class='ctx'> </div><div class='ctx'> 	DEBUG (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld\n",</div><div class='del'>-		dev-&gt;stats.rx_packets, dev-&gt;stats.tx_packets, </div><div class='add'>+		dev-&gt;stats.rx_packets, dev-&gt;stats.tx_packets,</div><div class='ctx'> 		dev-&gt;stats.rx_errors, dev-&gt;stats.tx_errors</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='hunk'>@@ -2095,7 +2094,7 @@ static int eth_stop (struct net_device *net)</div><div class='ctx'> 			usb_ep_enable (dev-&gt;status_ep, dev-&gt;status);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (rndis_active(dev)) {</div><div class='ctx'> 		rndis_set_param_medium (dev-&gt;rndis_config,</div><div class='ctx'> 					NDIS_MEDIUM_802_3, 0);</div><div class='hunk'>@@ -2132,7 +2131,7 @@ eth_req_free (struct usb_ep *ep, struct usb_request *req)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void __exit</div><div class='add'>+static void /* __init_or_exit */</div><div class='ctx'> eth_unbind (struct usb_gadget *gadget)</div><div class='ctx'> {</div><div class='ctx'> 	struct eth_dev		*dev = get_gadget_data (gadget);</div><div class='hunk'>@@ -2159,7 +2158,7 @@ eth_unbind (struct usb_gadget *gadget)</div><div class='ctx'> 	set_gadget_data (gadget, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 __init nibble (unsigned char c)</div><div class='add'>+static u8 __devinit nibble (unsigned char c)</div><div class='ctx'> {</div><div class='ctx'> 	if (likely (isdigit (c)))</div><div class='ctx'> 		return c - '0';</div><div class='hunk'>@@ -2169,7 +2168,7 @@ static u8 __init nibble (unsigned char c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init get_ether_addr(const char *str, u8 *dev_addr)</div><div class='add'>+static int __devinit get_ether_addr(const char *str, u8 *dev_addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (str) {</div><div class='ctx'> 		unsigned	i;</div><div class='hunk'>@@ -2190,7 +2189,7 @@ static int __init get_ether_addr(const char *str, u8 *dev_addr)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='add'>+static int __devinit</div><div class='ctx'> eth_bind (struct usb_gadget *gadget)</div><div class='ctx'> {</div><div class='ctx'> 	struct eth_dev		*dev;</div><div class='hunk'>@@ -2301,7 +2300,7 @@ autoconf_fail:</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	in_ep-&gt;driver_data = in_ep;	/* claim */</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	out_ep = usb_ep_autoconfig (gadget, &amp;fs_sink_desc);</div><div class='ctx'> 	if (!out_ep)</div><div class='ctx'> 		goto autoconf_fail;</div><div class='hunk'>@@ -2374,8 +2373,8 @@ autoconf_fail:</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- 	net = alloc_etherdev (sizeof *dev);</div><div class='del'>- 	if (!net)</div><div class='add'>+	net = alloc_etherdev (sizeof *dev);</div><div class='add'>+	if (!net)</div><div class='ctx'> 		return status;</div><div class='ctx'> 	dev = netdev_priv(net);</div><div class='ctx'> 	spin_lock_init (&amp;dev-&gt;lock);</div><div class='hunk'>@@ -2454,7 +2453,7 @@ autoconf_fail:</div><div class='ctx'> 	dev-&gt;gadget = gadget;</div><div class='ctx'> 	set_gadget_data (gadget, dev);</div><div class='ctx'> 	gadget-&gt;ep0-&gt;driver_data = dev;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* two kinds of host-initiated state changes:</div><div class='ctx'> 	 *  - iff DATA transfer is active, carrier is "on"</div><div class='ctx'> 	 *  - tx queueing enabled if open *and* carrier is "on"</div><div class='hunk'>@@ -2462,8 +2461,8 @@ autoconf_fail:</div><div class='ctx'> 	netif_stop_queue (dev-&gt;net);</div><div class='ctx'> 	netif_carrier_off (dev-&gt;net);</div><div class='ctx'> </div><div class='del'>- 	SET_NETDEV_DEV (dev-&gt;net, &amp;gadget-&gt;dev);</div><div class='del'>- 	status = register_netdev (dev-&gt;net);</div><div class='add'>+	SET_NETDEV_DEV (dev-&gt;net, &amp;gadget-&gt;dev);</div><div class='add'>+	status = register_netdev (dev-&gt;net);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto fail1;</div><div class='ctx'> </div><div class='hunk'>@@ -2488,7 +2487,7 @@ autoconf_fail:</div><div class='ctx'> 		u32	vendorID = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* FIXME RNDIS vendor id == "vendor NIC code" == ? */</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		dev-&gt;rndis_config = rndis_register (rndis_control_ack);</div><div class='ctx'> 		if (dev-&gt;rndis_config &lt; 0) {</div><div class='ctx'> fail0:</div><div class='hunk'>@@ -2496,7 +2495,7 @@ fail0:</div><div class='ctx'> 			status = -ENODEV;</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		/* these set up a lot of the OIDs that RNDIS needs */</div><div class='ctx'> 		rndis_set_host_mac (dev-&gt;rndis_config, dev-&gt;host_mac);</div><div class='ctx'> 		if (rndis_set_param_dev (dev-&gt;rndis_config, dev-&gt;net,</div><div class='hunk'>@@ -2556,7 +2555,7 @@ static struct usb_gadget_driver eth_driver = {</div><div class='ctx'> 	.suspend	= eth_suspend,</div><div class='ctx'> 	.resume		= eth_resume,</div><div class='ctx'> </div><div class='del'>-	.driver 	= {</div><div class='add'>+	.driver	= {</div><div class='ctx'> 		.name		= (char *) shortname,</div><div class='ctx'> 		.owner		= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c<br/>index 6f887478b148..8d7f1e84cd7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/file_storage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/file_storage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/file_storage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/file_storage.c</a></div><div class='hunk'>@@ -221,7 +221,6 @@</div><div class='ctx'> #undef VERBOSE</div><div class='ctx'> #undef DUMP_MSGS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -1906,7 +1905,6 @@ static int fsync_sub(struct lun *curlun)</div><div class='ctx'> </div><div class='ctx'> 	inode = filp-&gt;f_dentry-&gt;d_inode;</div><div class='ctx'> 	mutex_lock(&amp;inode-&gt;i_mutex);</div><div class='del'>-	current-&gt;flags |= PF_SYNCWRITE;</div><div class='ctx'> 	rc = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='ctx'> 	err = filp-&gt;f_op-&gt;fsync(filp, filp-&gt;f_dentry, 1);</div><div class='ctx'> 	if (!rc)</div><div class='hunk'>@@ -1914,7 +1912,6 @@ static int fsync_sub(struct lun *curlun)</div><div class='ctx'> 	err = filemap_fdatawait(inode-&gt;i_mapping);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		rc = err;</div><div class='del'>-	current-&gt;flags &amp;= ~PF_SYNCWRITE;</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;i_mutex);</div><div class='ctx'> 	VLDBG(curlun, "fdatasync -&gt; %d\n", rc);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -3694,7 +3691,7 @@ static void lun_release(struct device *dev)</div><div class='ctx'> 	kref_put(&amp;fsg-&gt;ref, fsg_release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit fsg_unbind(struct usb_gadget *gadget)</div><div class='add'>+static void /* __init_or_exit */ fsg_unbind(struct usb_gadget *gadget)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsg_dev		*fsg = get_gadget_data(gadget);</div><div class='ctx'> 	int			i;</div><div class='head'>diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c<br/>index 66b81bbf6bee..7cf2999e8616 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/goku_udc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/goku_udc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/goku_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/goku_udc.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> // #define	VERBOSE		/* extra debug messages (success too) */</div><div class='ctx'> // #define	USB_TRACE	/* packet-level success messages */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -1850,7 +1849,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	unsigned long		resource, len;</div><div class='ctx'> 	void __iomem		*base = NULL;</div><div class='ctx'> 	int			retval;</div><div class='del'>-	char			buf [8], *bufp;</div><div class='ctx'> </div><div class='ctx'> 	/* if you want to support more than one controller in a system,</div><div class='ctx'> 	 * usb_gadget_driver_{register,unregister}() must change.</div><div class='hunk'>@@ -1913,20 +1911,14 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> 	INFO(dev, "%s\n", driver_desc);</div><div class='ctx'> 	INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr());</div><div class='del'>-#ifndef __sparc__</div><div class='del'>-	scnprintf(buf, sizeof buf, "%d", pdev-&gt;irq);</div><div class='del'>-	bufp = buf;</div><div class='del'>-#else</div><div class='del'>-	bufp = __irq_itoa(pdev-&gt;irq);</div><div class='del'>-#endif</div><div class='del'>-	INFO(dev, "irq %s, pci mem %p\n", bufp, base);</div><div class='add'>+	INFO(dev, "irq %d, pci mem %p\n", pdev-&gt;irq, base);</div><div class='ctx'> </div><div class='ctx'> 	/* init to known state, then setup irqs */</div><div class='ctx'> 	udc_reset(dev);</div><div class='ctx'> 	udc_reinit (dev);</div><div class='del'>-	if (request_irq(pdev-&gt;irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/,</div><div class='add'>+	if (request_irq(pdev-&gt;irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/,</div><div class='ctx'> 			driver_name, dev) != 0) {</div><div class='del'>-		DBG(dev, "request interrupt %s failed\n", bufp);</div><div class='add'>+		DBG(dev, "request interrupt %d failed\n", pdev-&gt;irq);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c<br/>index 0eb010a3f5bc..3bdc5e3ba234 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/inode.c</a></div><div class='hunk'>@@ -528,7 +528,7 @@ struct kiocb_priv {</div><div class='ctx'> 	struct usb_request	*req;</div><div class='ctx'> 	struct ep_data		*epdata;</div><div class='ctx'> 	void			*buf;</div><div class='del'>-	char __user		*ubuf;</div><div class='add'>+	char __user		*ubuf;		/* NULL for writes */</div><div class='ctx'> 	unsigned		actual;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +566,6 @@ static ssize_t ep_aio_read_retry(struct kiocb *iocb)</div><div class='ctx'> 		status = priv-&gt;actual;</div><div class='ctx'> 	kfree(priv-&gt;buf);</div><div class='ctx'> 	kfree(priv);</div><div class='del'>-	aio_put_req(iocb);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -580,8 +579,8 @@ static void ep_aio_complete(struct usb_ep *ep, struct usb_request *req)</div><div class='ctx'> 	spin_lock(&amp;epdata-&gt;dev-&gt;lock);</div><div class='ctx'> 	priv-&gt;req = NULL;</div><div class='ctx'> 	priv-&gt;epdata = NULL;</div><div class='del'>-	if (NULL == iocb-&gt;ki_retry</div><div class='del'>-			|| unlikely(0 == req-&gt;actual)</div><div class='add'>+	if (priv-&gt;ubuf == NULL</div><div class='add'>+			|| unlikely(req-&gt;actual == 0)</div><div class='ctx'> 			|| unlikely(kiocbIsCancelled(iocb))) {</div><div class='ctx'> 		kfree(req-&gt;buf);</div><div class='ctx'> 		kfree(priv);</div><div class='hunk'>@@ -618,7 +617,7 @@ ep_aio_rwtail(</div><div class='ctx'> 	char __user	*ubuf</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	struct kiocb_priv	*priv = (void *) &amp;iocb-&gt;private;</div><div class='add'>+	struct kiocb_priv	*priv;</div><div class='ctx'> 	struct usb_request	*req;</div><div class='ctx'> 	ssize_t			value;</div><div class='ctx'> </div><div class='hunk'>@@ -670,7 +669,7 @@ fail:</div><div class='ctx'> 		kfree(priv);</div><div class='ctx'> 		put_ep(epdata);</div><div class='ctx'> 	} else</div><div class='del'>-		value = -EIOCBQUEUED;</div><div class='add'>+		value = (ubuf ? -EIOCBRETRY : -EIOCBQUEUED);</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1039,7 +1038,7 @@ scan:</div><div class='ctx'> 		/* ep0 can't deliver events when STATE_SETUP */</div><div class='ctx'> 		for (i = 0; i &lt; n; i++) {</div><div class='ctx'> 			if (dev-&gt;event [i].type == GADGETFS_SETUP) {</div><div class='del'>-				len = n = i + 1;</div><div class='add'>+				len = i + 1;</div><div class='ctx'> 				len *= sizeof (struct usb_gadgetfs_event);</div><div class='ctx'> 				n = 0;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1587,13 +1586,13 @@ gadgetfs_create_file (struct super_block *sb, char const *name,</div><div class='ctx'> static int activate_ep_files (struct dev_data *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_ep	*ep;</div><div class='add'>+	struct ep_data	*data;</div><div class='ctx'> </div><div class='ctx'> 	gadget_for_each_ep (ep, dev-&gt;gadget) {</div><div class='del'>-		struct ep_data	*data;</div><div class='ctx'> </div><div class='ctx'> 		data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 		if (!data)</div><div class='del'>-			goto enomem;</div><div class='add'>+			goto enomem0;</div><div class='ctx'> 		data-&gt;state = STATE_EP_DISABLED;</div><div class='ctx'> 		init_MUTEX (&amp;data-&gt;lock);</div><div class='ctx'> 		init_waitqueue_head (&amp;data-&gt;wait);</div><div class='hunk'>@@ -1608,21 +1607,23 @@ static int activate_ep_files (struct dev_data *dev)</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;req = usb_ep_alloc_request (ep, GFP_KERNEL);</div><div class='ctx'> 		if (!data-&gt;req)</div><div class='del'>-			goto enomem;</div><div class='add'>+			goto enomem1;</div><div class='ctx'> </div><div class='ctx'> 		data-&gt;inode = gadgetfs_create_file (dev-&gt;sb, data-&gt;name,</div><div class='ctx'> 				data, &amp;ep_config_operations,</div><div class='ctx'> 				&amp;data-&gt;dentry);</div><div class='del'>-		if (!data-&gt;inode) {</div><div class='del'>-			usb_ep_free_request(ep, data-&gt;req);</div><div class='del'>-			kfree (data);</div><div class='del'>-			goto enomem;</div><div class='del'>-		}</div><div class='add'>+		if (!data-&gt;inode)</div><div class='add'>+			goto enomem2;</div><div class='ctx'> 		list_add_tail (&amp;data-&gt;epfiles, &amp;dev-&gt;epfiles);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-enomem:</div><div class='add'>+enomem2:</div><div class='add'>+	usb_ep_free_request (ep, data-&gt;req);</div><div class='add'>+enomem1:</div><div class='add'>+	put_dev (dev);</div><div class='add'>+	kfree (data);</div><div class='add'>+enomem0:</div><div class='ctx'> 	DBG (dev, "%s enomem\n", __FUNCTION__);</div><div class='ctx'> 	destroy_ep_files (dev);</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -1793,7 +1794,7 @@ static struct usb_gadget_driver probe_driver = {</div><div class='ctx'>  *</div><div class='ctx'>  * After initialization, the device stays active for as long as that</div><div class='ctx'>  * $CHIP file is open.  Events may then be read from that descriptor,</div><div class='del'>- * such configuration notifications.  More complex drivers will handle</div><div class='add'>+ * such as configuration notifications.  More complex drivers will handle</div><div class='ctx'>  * some control requests in user space.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -2033,12 +2034,10 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)</div><div class='ctx'> 			NULL, &amp;simple_dir_operations,</div><div class='ctx'> 			S_IFDIR | S_IRUGO | S_IXUGO);</div><div class='ctx'> 	if (!inode)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		goto enomem0;</div><div class='ctx'> 	inode-&gt;i_op = &amp;simple_dir_inode_operations;</div><div class='del'>-	if (!(d = d_alloc_root (inode))) {</div><div class='del'>-		iput (inode);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!(d = d_alloc_root (inode)))</div><div class='add'>+		goto enomem1;</div><div class='ctx'> 	sb-&gt;s_root = d;</div><div class='ctx'> </div><div class='ctx'> 	/* the ep0 file is named after the controller we expect;</div><div class='hunk'>@@ -2046,29 +2045,36 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev = dev_new ();</div><div class='ctx'> 	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		goto enomem2;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;sb = sb;</div><div class='del'>-	if (!(inode = gadgetfs_create_file (sb, CHIP,</div><div class='add'>+	if (!gadgetfs_create_file (sb, CHIP,</div><div class='ctx'> 				dev, &amp;dev_init_operations,</div><div class='del'>-				&amp;dev-&gt;dentry))) {</div><div class='del'>-		put_dev(dev);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+				&amp;dev-&gt;dentry))</div><div class='add'>+		goto enomem3;</div><div class='ctx'> </div><div class='ctx'> 	/* other endpoint files are available after hardware setup,</div><div class='ctx'> 	 * from binding to a controller.</div><div class='ctx'> 	 */</div><div class='ctx'> 	the_device = dev;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+enomem3:</div><div class='add'>+	put_dev (dev);</div><div class='add'>+enomem2:</div><div class='add'>+	dput (d);</div><div class='add'>+enomem1:</div><div class='add'>+	iput (inode);</div><div class='add'>+enomem0:</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* "mount -t gadgetfs path /dev/gadget" ends up here */</div><div class='del'>-static struct super_block *</div><div class='add'>+static int</div><div class='ctx'> gadgetfs_get_sb (struct file_system_type *t, int flags,</div><div class='del'>-		const char *path, void *opts)</div><div class='add'>+		const char *path, void *opts, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single (t, flags, opts, gadgetfs_fill_super);</div><div class='add'>+	return get_sb_single (t, flags, opts, gadgetfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='head'>diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c<br/>index 0d3424eda038..36db72579377 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/lh7a40x_udc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/lh7a40x_udc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/lh7a40x_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/lh7a40x_udc.c</a></div><div class='hunk'>@@ -2107,7 +2107,7 @@ static int lh7a40x_udc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* irq setup after old hardware state is cleaned up */</div><div class='ctx'> 	retval =</div><div class='del'>-	    request_irq(IRQ_USBINTR, lh7a40x_udc_irq, SA_INTERRUPT, driver_name,</div><div class='add'>+	    request_irq(IRQ_USBINTR, lh7a40x_udc_irq, IRQF_DISABLED, driver_name,</div><div class='ctx'> 			dev);</div><div class='ctx'> 	if (retval != 0) {</div><div class='ctx'> 		DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name,</div><div class='hunk'>@@ -2143,7 +2143,7 @@ static int lh7a40x_udc_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver udc_driver = {</div><div class='ctx'> 	.probe = lh7a40x_udc_probe,</div><div class='del'>-	.remove = lh7a40x_udc_remove</div><div class='add'>+	.remove = lh7a40x_udc_remove,</div><div class='ctx'> 	    /* FIXME power management support */</div><div class='ctx'> 	    /* .suspend = ... disable UDC */</div><div class='ctx'> 	    /* .resume = ... re-enable UDC */</div><div class='head'>diff --git a/drivers/usb/gadget/lh7a40x_udc.h b/drivers/usb/gadget/lh7a40x_udc.h<br/>index 9b2e6f7cbb8b..e3bb78524c88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/lh7a40x_udc.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/lh7a40x_udc.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/lh7a40x_udc.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/lh7a40x_udc.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #ifndef __LH7A40X_H_</div><div class='ctx'> #define __LH7A40X_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='head'>diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c<br/>index 0b9293493957..09243239d948 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/net2280.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/net2280.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/net2280.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/net2280.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'> #undef	DEBUG		/* messages on error and most fault paths */</div><div class='ctx'> #undef	VERBOSE		/* extra debug messages (success too) */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -2822,7 +2821,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	unsigned long		resource, len;</div><div class='ctx'> 	void			__iomem *base = NULL;</div><div class='ctx'> 	int			retval, i;</div><div class='del'>-	char			buf [8], *bufp;</div><div class='ctx'> </div><div class='ctx'> 	/* if you want to support more than one controller in a system,</div><div class='ctx'> 	 * usb_gadget_driver_{register,unregister}() must change.</div><div class='hunk'>@@ -2896,15 +2894,10 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 		retval = -ENODEV;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='del'>-#ifndef __sparc__</div><div class='del'>-	scnprintf (buf, sizeof buf, "%d", pdev-&gt;irq);</div><div class='del'>-	bufp = buf;</div><div class='del'>-#else</div><div class='del'>-	bufp = __irq_itoa(pdev-&gt;irq);</div><div class='del'>-#endif</div><div class='del'>-	if (request_irq (pdev-&gt;irq, net2280_irq, SA_SHIRQ, driver_name, dev)</div><div class='add'>+</div><div class='add'>+	if (request_irq (pdev-&gt;irq, net2280_irq, IRQF_SHARED, driver_name, dev)</div><div class='ctx'> 			!= 0) {</div><div class='del'>-		ERROR (dev, "request interrupt %s failed\n", bufp);</div><div class='add'>+		ERROR (dev, "request interrupt %d failed\n", pdev-&gt;irq);</div><div class='ctx'> 		retval = -EBUSY;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2953,8 +2946,8 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	/* done */</div><div class='ctx'> 	INFO (dev, "%s\n", driver_desc);</div><div class='del'>-	INFO (dev, "irq %s, pci mem %p, chip rev %04x\n",</div><div class='del'>-			bufp, base, dev-&gt;chiprev);</div><div class='add'>+	INFO (dev, "irq %d, pci mem %p, chip rev %04x\n",</div><div class='add'>+			pdev-&gt;irq, base, dev-&gt;chiprev);</div><div class='ctx'> 	INFO (dev, "version: " DRIVER_VERSION "; dma %s\n",</div><div class='ctx'> 			use_dma</div><div class='ctx'> 				? (use_dma_chaining ? "chaining" : "enabled")</div><div class='hunk'>@@ -2972,6 +2965,22 @@ done:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* make sure the board is quiescent; otherwise it will continue</div><div class='add'>+ * generating IRQs across the upcoming reboot.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void net2280_shutdown (struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net2280		*dev = pci_get_drvdata (pdev);</div><div class='add'>+</div><div class='add'>+	/* disable IRQs */</div><div class='add'>+	writel (0, &amp;dev-&gt;regs-&gt;pciirqenb0);</div><div class='add'>+	writel (0, &amp;dev-&gt;regs-&gt;pciirqenb1);</div><div class='add'>+</div><div class='add'>+	/* disable the pullup so the host will think we're gone */</div><div class='add'>+	writel (0, &amp;dev-&gt;usb-&gt;usbctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='hunk'>@@ -3001,6 +3010,7 @@ static struct pci_driver net2280_pci_driver = {</div><div class='ctx'> </div><div class='ctx'> 	.probe =	net2280_probe,</div><div class='ctx'> 	.remove =	net2280_remove,</div><div class='add'>+	.shutdown =	net2280_shutdown,</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME add power management support */</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c<br/>index fbea51448909..2de9748ee673 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/omap_udc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/omap_udc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/omap_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/omap_udc.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #undef	DEBUG</div><div class='ctx'> #undef	VERBOSE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -773,7 +772,7 @@ static void dma_error(int lch, u16 ch_status, void *data)</div><div class='ctx'> 	struct omap_ep	*ep = data;</div><div class='ctx'> </div><div class='ctx'> 	/* if ch_status &amp; OMAP_DMA_DROP_IRQ ... */</div><div class='del'>-	/* if ch_status &amp; OMAP_DMA_TOUT_IRQ ... */</div><div class='add'>+	/* if ch_status &amp; OMAP1_DMA_TOUT_IRQ ... */</div><div class='ctx'> 	ERR("%s dma error, lch %d status %02x\n", ep-&gt;ep.name, lch, ch_status);</div><div class='ctx'> </div><div class='ctx'> 	/* complete current transfer ... */</div><div class='hunk'>@@ -2819,7 +2818,7 @@ bad_on_1710:</div><div class='ctx'> </div><div class='ctx'> 	/* USB general purpose IRQ:  ep0, state changes, dma, etc */</div><div class='ctx'> 	status = request_irq(pdev-&gt;resource[1].start, omap_udc_irq,</div><div class='del'>-			SA_SAMPLE_RANDOM, driver_name, udc);</div><div class='add'>+			IRQF_SAMPLE_RANDOM, driver_name, udc);</div><div class='ctx'> 	if (status != 0) {</div><div class='ctx'> 		ERR( "can't get irq %ld, err %d\n",</div><div class='ctx'> 			pdev-&gt;resource[1].start, status);</div><div class='hunk'>@@ -2828,7 +2827,7 @@ bad_on_1710:</div><div class='ctx'> </div><div class='ctx'> 	/* USB "non-iso" IRQ (PIO for all but ep0) */</div><div class='ctx'> 	status = request_irq(pdev-&gt;resource[2].start, omap_udc_pio_irq,</div><div class='del'>-			SA_SAMPLE_RANDOM, "omap_udc pio", udc);</div><div class='add'>+			IRQF_SAMPLE_RANDOM, "omap_udc pio", udc);</div><div class='ctx'> 	if (status != 0) {</div><div class='ctx'> 		ERR( "can't get irq %ld, err %d\n",</div><div class='ctx'> 			pdev-&gt;resource[2].start, status);</div><div class='hunk'>@@ -2836,7 +2835,7 @@ bad_on_1710:</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef	USE_ISO</div><div class='ctx'> 	status = request_irq(pdev-&gt;resource[3].start, omap_udc_iso_irq,</div><div class='del'>-			SA_INTERRUPT, "omap_udc iso", udc);</div><div class='add'>+			IRQF_DISABLED, "omap_udc iso", udc);</div><div class='ctx'> 	if (status != 0) {</div><div class='ctx'> 		ERR("can't get irq %ld, err %d\n",</div><div class='ctx'> 			pdev-&gt;resource[3].start, status);</div><div class='head'>diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c<br/>index 680f7fc5b171..fff027d30a09 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/pxa2xx_udc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/pxa2xx_udc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/pxa2xx_udc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/pxa2xx_udc.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'> #undef	DEBUG</div><div class='ctx'> // #define	VERBOSE	DBG_VERBOSE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -53,7 +52,9 @@</div><div class='ctx'> #include &lt;asm/mach-types.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='add'>+#ifdef CONFIG_ARCH_PXA</div><div class='ctx'> #include &lt;asm/arch/pxa-regs.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb_ch9.h&gt;</div><div class='ctx'> #include &lt;linux/usb_gadget.h&gt;</div><div class='hunk'>@@ -545,6 +546,7 @@ write_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)</div><div class='ctx'> 		count = req-&gt;req.length;</div><div class='ctx'> 		done (ep, req, 0);</div><div class='ctx'> 		ep0_idle(ep-&gt;dev);</div><div class='add'>+#ifndef CONFIG_ARCH_IXP4XX</div><div class='ctx'> #if 1</div><div class='ctx'> 		/* This seems to get rid of lost status irqs in some cases:</div><div class='ctx'> 		 * host responds quickly, or next request involves config</div><div class='hunk'>@@ -565,6 +567,7 @@ write_ep0_fifo (struct pxa2xx_ep *ep, struct pxa2xx_request *req)</div><div class='ctx'> 			} while (count);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> 	} else if (ep-&gt;dev-&gt;req_pending)</div><div class='ctx'> 		ep0start(ep-&gt;dev, 0, "IN");</div><div class='ctx'> 	return is_short;</div><div class='hunk'>@@ -1585,7 +1588,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)</div><div class='ctx'> 	int			retval;</div><div class='ctx'> </div><div class='ctx'> 	if (!driver</div><div class='del'>-			|| driver-&gt;speed != USB_SPEED_FULL</div><div class='add'>+			|| driver-&gt;speed &lt; USB_SPEED_FULL</div><div class='ctx'> 			|| !driver-&gt;bind</div><div class='ctx'> 			|| !driver-&gt;unbind</div><div class='ctx'> 			|| !driver-&gt;disconnect</div><div class='hunk'>@@ -2427,6 +2430,7 @@ static struct pxa2xx_udc memory = {</div><div class='ctx'> #define PXA210_B1		0x00000123</div><div class='ctx'> #define PXA210_B0		0x00000122</div><div class='ctx'> #define IXP425_A0		0x000001c1</div><div class='add'>+#define IXP465_AD		0x00000200</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * 	probe - binds to the platform device</div><div class='hunk'>@@ -2463,6 +2467,8 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 		break;</div><div class='ctx'> #elif	defined(CONFIG_ARCH_IXP4XX)</div><div class='ctx'> 	case IXP425_A0:</div><div class='add'>+	case IXP465_AD:</div><div class='add'>+		dev-&gt;has_cfr = 1;</div><div class='ctx'> 		out_dma = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2515,7 +2521,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* irq setup after old hardware state is cleaned up */</div><div class='ctx'> 	retval = request_irq(IRQ_USB, pxa2xx_udc_irq,</div><div class='del'>-			SA_INTERRUPT, driver_name, dev);</div><div class='add'>+			IRQF_DISABLED, driver_name, dev);</div><div class='ctx'> 	if (retval != 0) {</div><div class='ctx'> 		printk(KERN_ERR "%s: can't get irq %i, err %d\n",</div><div class='ctx'> 			driver_name, IRQ_USB, retval);</div><div class='hunk'>@@ -2527,7 +2533,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (machine_is_lubbock()) {</div><div class='ctx'> 		retval = request_irq(LUBBOCK_USB_DISC_IRQ,</div><div class='ctx'> 				lubbock_vbus_irq,</div><div class='del'>-				SA_INTERRUPT | SA_SAMPLE_RANDOM,</div><div class='add'>+				IRQF_DISABLED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 				driver_name, dev);</div><div class='ctx'> 		if (retval != 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: can't get irq %i, err %d\n",</div><div class='hunk'>@@ -2538,7 +2544,7 @@ lubbock_fail0:</div><div class='ctx'> 		}</div><div class='ctx'> 		retval = request_irq(LUBBOCK_USB_IRQ,</div><div class='ctx'> 				lubbock_vbus_irq,</div><div class='del'>-				SA_INTERRUPT | SA_SAMPLE_RANDOM,</div><div class='add'>+				IRQF_DISABLED | IRQF_SAMPLE_RANDOM,</div><div class='ctx'> 				driver_name, dev);</div><div class='ctx'> 		if (retval != 0) {</div><div class='ctx'> 			printk(KERN_ERR "%s: can't get irq %i, err %d\n",</div><div class='hunk'>@@ -2575,10 +2581,12 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)</div><div class='ctx'> 		free_irq(IRQ_USB, dev);</div><div class='ctx'> 		dev-&gt;got_irq = 0;</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_ARCH_LUBBOCK</div><div class='ctx'> 	if (machine_is_lubbock()) {</div><div class='ctx'> 		free_irq(LUBBOCK_USB_DISC_IRQ, dev);</div><div class='ctx'> 		free_irq(LUBBOCK_USB_IRQ, dev);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	the_controller = NULL;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c<br/>index 6d6eaad73968..408c3380d602 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/rndis.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/rndis.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/rndis.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/rndis.c</a></div><div class='hunk'>@@ -1,29 +1,28 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * RNDIS MSG parser</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Version:     $Id: rndis.c,v 1.19 2004/03/25 21:33:46 robert Exp $</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Authors:	Benedikt Spranger, Pengutronix</div><div class='del'>- * 		Robert Schwebel, Pengutronix</div><div class='del'>- * </div><div class='add'>+ *		Robert Schwebel, Pengutronix</div><div class='add'>+ *</div><div class='ctx'>  *              This program is free software; you can redistribute it and/or</div><div class='ctx'>  *              modify it under the terms of the GNU General Public License</div><div class='del'>- *              version 2, as published by the Free Software Foundation. </div><div class='del'>- * </div><div class='add'>+ *              version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='ctx'>  *		This software was originally developed in conformance with</div><div class='ctx'>  *		Microsoft's Remote NDIS Specification License Agreement.</div><div class='del'>- *              </div><div class='add'>+ *</div><div class='ctx'>  * 03/12/2004 Kai-Uwe Bloem &lt;linux-development@auerswald.de&gt;</div><div class='ctx'>  *		Fixed message length bug in init_response</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * 03/25/2004 Kai-Uwe Bloem &lt;linux-development@auerswald.de&gt;</div><div class='del'>- * 		Fixed rndis_rm_hdr length bug.</div><div class='add'>+ *		Fixed rndis_rm_hdr length bug.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004 by David Brownell</div><div class='ctx'>  *		updates to merge with Linux 2.6, better match RNDIS spec</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -82,7 +81,7 @@ static rndis_resp_t *rndis_add_response (int configNr, u32 length);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* supported OIDs */</div><div class='del'>-static const u32 oid_supported_list [] = </div><div class='add'>+static const u32 oid_supported_list [] =</div><div class='ctx'> {</div><div class='ctx'> 	/* the general stuff */</div><div class='ctx'> 	OID_GEN_SUPPORTED_LIST,</div><div class='hunk'>@@ -103,7 +102,7 @@ static const u32 oid_supported_list [] =</div><div class='ctx'> #if 0</div><div class='ctx'> 	OID_GEN_RNDIS_CONFIG_PARAMETER,</div><div class='ctx'> #endif</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* the statistical stuff */</div><div class='ctx'> 	OID_GEN_XMIT_OK,</div><div class='ctx'> 	OID_GEN_RCV_OK,</div><div class='hunk'>@@ -127,14 +126,14 @@ static const u32 oid_supported_list [] =</div><div class='ctx'> 	OID_GEN_TRANSMIT_QUEUE_LENGTH,</div><div class='ctx'> #endif	/* RNDIS_OPTIONAL_STATS */</div><div class='ctx'> </div><div class='del'>-    	/* mandatory 802.3 */</div><div class='add'>+	/* mandatory 802.3 */</div><div class='ctx'> 	/* the general stuff */</div><div class='ctx'> 	OID_802_3_PERMANENT_ADDRESS,</div><div class='ctx'> 	OID_802_3_CURRENT_ADDRESS,</div><div class='ctx'> 	OID_802_3_MULTICAST_LIST,</div><div class='ctx'> 	OID_802_3_MAC_OPTIONS,</div><div class='ctx'> 	OID_802_3_MAXIMUM_LIST_SIZE,</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* the statistical stuff */</div><div class='ctx'> 	OID_802_3_RCV_ERROR_ALIGNMENT,</div><div class='ctx'> 	OID_802_3_XMIT_ONE_COLLISION,</div><div class='hunk'>@@ -172,8 +171,8 @@ static int</div><div class='ctx'> gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 		rndis_resp_t *r)</div><div class='ctx'> {</div><div class='del'>-	int 			retval = -ENOTSUPP;</div><div class='del'>-	u32 			length = 4;	/* usually */</div><div class='add'>+	int			retval = -ENOTSUPP;</div><div class='add'>+	u32			length = 4;	/* usually */</div><div class='ctx'> 	__le32			*outbuf;</div><div class='ctx'> 	int			i, count;</div><div class='ctx'> 	rndis_query_cmplt_type	*resp;</div><div class='hunk'>@@ -211,27 +210,27 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			outbuf[i] = cpu_to_le32 (oid_supported_list[i]);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_HARDWARE_STATUS:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_HARDWARE_STATUS\n", __FUNCTION__);</div><div class='del'>-		/* Bogus question! </div><div class='add'>+		/* Bogus question!</div><div class='ctx'> 		 * Hardware must be ready to receive high level protocols.</div><div class='del'>-		 * BTW: </div><div class='add'>+		 * BTW:</div><div class='ctx'> 		 * reddite ergo quae sunt Caesaris Caesari</div><div class='ctx'> 		 * et quae sunt Dei Deo!</div><div class='ctx'> 		 */</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MEDIA_SUPPORTED:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MEDIA_SUPPORTED\n", __FUNCTION__);</div><div class='ctx'> 		*outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MEDIA_IN_USE:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MEDIA_IN_USE\n", __FUNCTION__);</div><div class='hunk'>@@ -239,7 +238,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 		*outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_MAXIMUM_FRAME_SIZE:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __FUNCTION__);</div><div class='hunk'>@@ -249,7 +248,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_LINK_SPEED:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='hunk'>@@ -272,7 +271,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RECEIVE_BLOCK_SIZE:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __FUNCTION__);</div><div class='hunk'>@@ -282,7 +281,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_VENDOR_ID:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_VENDOR_ID\n", __FUNCTION__);</div><div class='hunk'>@@ -290,7 +289,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			rndis_per_dev_params [configNr].vendorID);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_VENDOR_DESCRIPTION:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_VENDOR_DESCRIPTION\n", __FUNCTION__);</div><div class='hunk'>@@ -356,7 +355,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			DEBUG("%s: OID_GEN_XMIT_OK\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='del'>-			    rndis_per_dev_params [configNr].stats-&gt;tx_packets - </div><div class='add'>+			    rndis_per_dev_params [configNr].stats-&gt;tx_packets -</div><div class='ctx'> 			    rndis_per_dev_params [configNr].stats-&gt;tx_errors -</div><div class='ctx'> 			    rndis_per_dev_params [configNr].stats-&gt;tx_dropped);</div><div class='ctx'> 			retval = 0;</div><div class='hunk'>@@ -369,13 +368,13 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			DEBUG("%s: OID_GEN_RCV_OK\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='del'>-			    rndis_per_dev_params [configNr].stats-&gt;rx_packets - </div><div class='add'>+			    rndis_per_dev_params [configNr].stats-&gt;rx_packets -</div><div class='ctx'> 			    rndis_per_dev_params [configNr].stats-&gt;rx_errors -</div><div class='ctx'> 			    rndis_per_dev_params [configNr].stats-&gt;rx_dropped);</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_XMIT_ERROR:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='hunk'>@@ -386,7 +385,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RCV_ERROR:</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='hunk'>@@ -397,7 +396,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_GEN_RCV_NO_BUFFER:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_RCV_NO_BUFFER\n", __FUNCTION__);</div><div class='hunk'>@@ -411,7 +410,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> #ifdef	RNDIS_OPTIONAL_STATS</div><div class='ctx'> 	case OID_GEN_DIRECTED_BYTES_XMIT:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_DIRECTED_BYTES_XMIT\n", __FUNCTION__);</div><div class='del'>-		/* </div><div class='add'>+		/*</div><div class='ctx'> 		 * Aunt Tilly's size of shoes</div><div class='ctx'> 		 * minus antarctica count of penguins</div><div class='ctx'> 		 * divided by weight of Alpha Centauri</div><div class='hunk'>@@ -419,7 +418,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='ctx'> 				(rndis_per_dev_params [configNr]</div><div class='del'>-					.stats-&gt;tx_packets - </div><div class='add'>+					.stats-&gt;tx_packets -</div><div class='ctx'> 				 rndis_per_dev_params [configNr]</div><div class='ctx'> 					 .stats-&gt;tx_errors -</div><div class='ctx'> 				 rndis_per_dev_params [configNr]</div><div class='hunk'>@@ -428,14 +427,14 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_DIRECTED_FRAMES_XMIT:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_DIRECTED_FRAMES_XMIT\n", __FUNCTION__);</div><div class='ctx'> 		/* dito */</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='ctx'> 			*outbuf = cpu_to_le32 (</div><div class='ctx'> 				(rndis_per_dev_params [configNr]</div><div class='del'>-					.stats-&gt;tx_packets - </div><div class='add'>+					.stats-&gt;tx_packets -</div><div class='ctx'> 				 rndis_per_dev_params [configNr]</div><div class='ctx'> 					 .stats-&gt;tx_errors -</div><div class='ctx'> 				 rndis_per_dev_params [configNr]</div><div class='hunk'>@@ -444,7 +443,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_MULTICAST_BYTES_XMIT:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MULTICAST_BYTES_XMIT\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -453,7 +452,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_MULTICAST_FRAMES_XMIT:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MULTICAST_FRAMES_XMIT\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -462,7 +461,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_BROADCAST_BYTES_XMIT:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_BROADCAST_BYTES_XMIT\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -471,7 +470,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_BROADCAST_FRAMES_XMIT:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_BROADCAST_FRAMES_XMIT\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -480,19 +479,19 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_DIRECTED_BYTES_RCV:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_DIRECTED_BYTES_RCV\n", __FUNCTION__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_DIRECTED_FRAMES_RCV:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_DIRECTED_FRAMES_RCV\n", __FUNCTION__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_MULTICAST_BYTES_RCV:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MULTICAST_BYTES_RCV\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -501,7 +500,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_MULTICAST_FRAMES_RCV:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_MULTICAST_FRAMES_RCV\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -510,7 +509,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_BROADCAST_BYTES_RCV:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_BROADCAST_BYTES_RCV\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -519,7 +518,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_BROADCAST_FRAMES_RCV:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_BROADCAST_FRAMES_RCV\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -528,7 +527,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_RCV_CRC_ERROR:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_RCV_CRC_ERROR\n", __FUNCTION__);</div><div class='ctx'> 		if (rndis_per_dev_params [configNr].stats) {</div><div class='hunk'>@@ -537,7 +536,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_GEN_TRANSMIT_QUEUE_LENGTH:</div><div class='ctx'> 		DEBUG("%s: OID_GEN_TRANSMIT_QUEUE_LENGTH\n", __FUNCTION__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='hunk'>@@ -558,7 +557,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_CURRENT_ADDRESS:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_CURRENT_ADDRESS\n", __FUNCTION__);</div><div class='hunk'>@@ -570,7 +569,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_MULTICAST_LIST:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_MULTICAST_LIST\n", __FUNCTION__);</div><div class='hunk'>@@ -578,7 +577,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0xE0000000);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_MAXIMUM_LIST_SIZE:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __FUNCTION__);</div><div class='hunk'>@@ -586,7 +585,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (1);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_MAC_OPTIONS:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_MAC_OPTIONS\n", __FUNCTION__);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -602,56 +601,56 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> 			retval = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_XMIT_ONE_COLLISION:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_ONE_COLLISION\n", __FUNCTION__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	/* mandatory */</div><div class='ctx'> 	case OID_802_3_XMIT_MORE_COLLISIONS:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __FUNCTION__);</div><div class='ctx'> 		*outbuf = __constant_cpu_to_le32 (0);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> #ifdef	RNDIS_OPTIONAL_STATS</div><div class='ctx'> 	case OID_802_3_XMIT_DEFERRED:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_DEFERRED\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_XMIT_MAX_COLLISIONS:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_MAX_COLLISIONS\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_RCV_OVERRUN:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_RCV_OVERRUN\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_XMIT_UNDERRUN:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_UNDERRUN\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_XMIT_HEARTBEAT_FAILURE:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_HEARTBEAT_FAILURE\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_XMIT_TIMES_CRS_LOST:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_TIMES_CRS_LOST\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_XMIT_LATE_COLLISIONS:</div><div class='ctx'> 		DEBUG("%s: OID_802_3_XMIT_LATE_COLLISIONS\n", __FUNCTION__);</div><div class='ctx'> 		/* TODO */</div><div class='del'>-		break;		</div><div class='add'>+		break;</div><div class='ctx'> #endif	/* RNDIS_OPTIONAL_STATS */</div><div class='ctx'> </div><div class='ctx'> #ifdef	RNDIS_PM</div><div class='hunk'>@@ -676,23 +675,23 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk (KERN_WARNING "%s: query unknown OID 0x%08X\n", </div><div class='add'>+		printk (KERN_WARNING "%s: query unknown OID 0x%08X\n",</div><div class='ctx'> 			 __FUNCTION__, OID);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		length = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;InformationBufferLength = cpu_to_le32 (length);</div><div class='ctx'> 	r-&gt;length = length + sizeof *resp;</div><div class='ctx'> 	resp-&gt;MessageLength = cpu_to_le32 (r-&gt;length);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len, </div><div class='del'>-			      rndis_resp_t *r)</div><div class='add'>+static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,</div><div class='add'>+			rndis_resp_t *r)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_set_cmplt_type		*resp;</div><div class='del'>-	int 				i, retval = -ENOTSUPP;</div><div class='add'>+	int				i, retval = -ENOTSUPP;</div><div class='ctx'> 	struct rndis_params		*params;</div><div class='ctx'> </div><div class='ctx'> 	if (!r)</div><div class='hunk'>@@ -745,9 +744,9 @@ update_linkstate:</div><div class='ctx'> 			netif_stop_queue (params-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case OID_802_3_MULTICAST_LIST:</div><div class='del'>-		/* I think we can ignore this */		</div><div class='add'>+		/* I think we can ignore this */</div><div class='ctx'> 		DEBUG("%s: OID_802_3_MULTICAST_LIST\n", __FUNCTION__);</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -796,29 +795,29 @@ update_linkstate:</div><div class='ctx'> #endif	/* RNDIS_PM */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk (KERN_WARNING "%s: set unknown OID 0x%08X, size %d\n", </div><div class='add'>+		printk (KERN_WARNING "%s: set unknown OID 0x%08X, size %d\n",</div><div class='ctx'> 			 __FUNCTION__, OID, buf_len);</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Response Functions </div><div class='add'>+/*</div><div class='add'>+ * Response Functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int rndis_init_response (int configNr, rndis_init_msg_type *buf)</div><div class='ctx'> {</div><div class='del'>-	rndis_init_cmplt_type	*resp; </div><div class='add'>+	rndis_init_cmplt_type	*resp;</div><div class='ctx'> 	rndis_resp_t            *r;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	r = rndis_add_response (configNr, sizeof (rndis_init_cmplt_type));</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	resp = (rndis_init_cmplt_type *) r-&gt;buf;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (</div><div class='ctx'> 			REMOTE_NDIS_INITIALIZE_CMPLT);</div><div class='ctx'> 	resp-&gt;MessageLength = __constant_cpu_to_le32 (52);</div><div class='hunk'>@@ -837,11 +836,11 @@ static int rndis_init_response (int configNr, rndis_init_msg_type *buf)</div><div class='ctx'> 	resp-&gt;PacketAlignmentFactor = __constant_cpu_to_le32 (0);</div><div class='ctx'> 	resp-&gt;AFListOffset = __constant_cpu_to_le32 (0);</div><div class='ctx'> 	resp-&gt;AFListSize = __constant_cpu_to_le32 (0);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (rndis_per_dev_params [configNr].ack)</div><div class='del'>-	    rndis_per_dev_params [configNr].ack (</div><div class='del'>-	    		rndis_per_dev_params [configNr].dev);</div><div class='del'>-	</div><div class='add'>+		rndis_per_dev_params [configNr].ack (</div><div class='add'>+			rndis_per_dev_params [configNr].dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -849,10 +848,10 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_query_cmplt_type *resp;</div><div class='ctx'> 	rndis_resp_t            *r;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	// DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf-&gt;OID));</div><div class='ctx'> 	if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * we need more memory:</div><div class='ctx'> 	 * gen_ndis_query_resp expects enough space for</div><div class='hunk'>@@ -864,10 +863,10 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	resp = (rndis_query_cmplt_type *) r-&gt;buf;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_QUERY_CMPLT);</div><div class='ctx'> 	resp-&gt;RequestID = buf-&gt;RequestID; /* Still LE in msg buffer */</div><div class='del'>-  	</div><div class='add'>+</div><div class='ctx'> 	if (gen_ndis_query_resp (configNr, le32_to_cpu (buf-&gt;OID),</div><div class='ctx'> 			le32_to_cpu(buf-&gt;InformationBufferOffset)</div><div class='ctx'> 					+ 8 + (u8 *) buf,</div><div class='hunk'>@@ -881,10 +880,10 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)</div><div class='ctx'> 		resp-&gt;InformationBufferOffset = __constant_cpu_to_le32 (0);</div><div class='ctx'> 	} else</div><div class='ctx'> 		resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (rndis_per_dev_params [configNr].ack)</div><div class='del'>-	    rndis_per_dev_params [configNr].ack (</div><div class='del'>-	    		rndis_per_dev_params [configNr].dev);</div><div class='add'>+		rndis_per_dev_params [configNr].ack (</div><div class='add'>+			rndis_per_dev_params [configNr].dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -893,7 +892,7 @@ static int rndis_set_response (int configNr, rndis_set_msg_type *buf)</div><div class='ctx'> 	u32			BufLength, BufOffset;</div><div class='ctx'> 	rndis_set_cmplt_type	*resp;</div><div class='ctx'> 	rndis_resp_t		*r;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	r = rndis_add_response (configNr, sizeof (rndis_set_cmplt_type));</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -906,26 +905,27 @@ static int rndis_set_response (int configNr, rndis_set_msg_type *buf)</div><div class='ctx'> 	DEBUG("%s: Length: %d\n", __FUNCTION__, BufLength);</div><div class='ctx'> 	DEBUG("%s: Offset: %d\n", __FUNCTION__, BufOffset);</div><div class='ctx'> 	DEBUG("%s: InfoBuffer: ", __FUNCTION__);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; BufLength; i++) {</div><div class='ctx'> 		DEBUG ("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	DEBUG ("\n");</div><div class='ctx'> #endif</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_SET_CMPLT);</div><div class='ctx'> 	resp-&gt;MessageLength = __constant_cpu_to_le32 (16);</div><div class='ctx'> 	resp-&gt;RequestID = buf-&gt;RequestID; /* Still LE in msg buffer */</div><div class='del'>-	if (gen_ndis_set_resp (configNr, le32_to_cpu (buf-&gt;OID), </div><div class='del'>-			       ((u8 *) buf) + 8 + BufOffset, BufLength, r))</div><div class='del'>-	    resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_NOT_SUPPORTED);</div><div class='del'>-	else resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);</div><div class='del'>-	</div><div class='add'>+	if (gen_ndis_set_resp (configNr, le32_to_cpu (buf-&gt;OID),</div><div class='add'>+			((u8 *) buf) + 8 + BufOffset, BufLength, r))</div><div class='add'>+		resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_NOT_SUPPORTED);</div><div class='add'>+	else</div><div class='add'>+		resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);</div><div class='add'>+</div><div class='ctx'> 	if (rndis_per_dev_params [configNr].ack)</div><div class='del'>-	    rndis_per_dev_params [configNr].ack (</div><div class='del'>-	    		rndis_per_dev_params [configNr].dev);</div><div class='del'>-	</div><div class='add'>+		rndis_per_dev_params [configNr].ack (</div><div class='add'>+			rndis_per_dev_params [configNr].dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -933,27 +933,27 @@ static int rndis_reset_response (int configNr, rndis_reset_msg_type *buf)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_reset_cmplt_type	*resp;</div><div class='ctx'> 	rndis_resp_t		*r;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	r = rndis_add_response (configNr, sizeof (rndis_reset_cmplt_type));</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	resp = (rndis_reset_cmplt_type *) r-&gt;buf;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_RESET_CMPLT);</div><div class='ctx'> 	resp-&gt;MessageLength = __constant_cpu_to_le32 (16);</div><div class='ctx'> 	resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);</div><div class='ctx'> 	/* resent information */</div><div class='ctx'> 	resp-&gt;AddressingReset = __constant_cpu_to_le32 (1);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (rndis_per_dev_params [configNr].ack)</div><div class='del'>-	    rndis_per_dev_params [configNr].ack (</div><div class='del'>-	    		rndis_per_dev_params [configNr].dev);</div><div class='add'>+		rndis_per_dev_params [configNr].ack (</div><div class='add'>+			rndis_per_dev_params [configNr].dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rndis_keepalive_response (int configNr,</div><div class='del'>-				     rndis_keepalive_msg_type *buf)</div><div class='add'>+				rndis_keepalive_msg_type *buf)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_keepalive_cmplt_type	*resp;</div><div class='ctx'> 	rndis_resp_t			*r;</div><div class='hunk'>@@ -964,48 +964,48 @@ static int rndis_keepalive_response (int configNr,</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	resp = (rndis_keepalive_cmplt_type *) r-&gt;buf;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (</div><div class='ctx'> 			REMOTE_NDIS_KEEPALIVE_CMPLT);</div><div class='ctx'> 	resp-&gt;MessageLength = __constant_cpu_to_le32 (16);</div><div class='ctx'> 	resp-&gt;RequestID = buf-&gt;RequestID; /* Still LE in msg buffer */</div><div class='ctx'> 	resp-&gt;Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (rndis_per_dev_params [configNr].ack)</div><div class='del'>-	    rndis_per_dev_params [configNr].ack (</div><div class='del'>-	    		rndis_per_dev_params [configNr].dev);</div><div class='del'>-	</div><div class='add'>+		rndis_per_dev_params [configNr].ack (</div><div class='add'>+			rndis_per_dev_params [configNr].dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Device to Host Comunication </div><div class='add'>+/*</div><div class='add'>+ * Device to Host Comunication</div><div class='ctx'>  */</div><div class='ctx'> static int rndis_indicate_status_msg (int configNr, u32 status)</div><div class='ctx'> {</div><div class='del'>-	rndis_indicate_status_msg_type	*resp;	</div><div class='add'>+	rndis_indicate_status_msg_type	*resp;</div><div class='ctx'> 	rndis_resp_t			*r;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (rndis_per_dev_params [configNr].state == RNDIS_UNINITIALIZED)</div><div class='del'>-	    return -ENOTSUPP;</div><div class='del'>-	</div><div class='del'>-	r = rndis_add_response (configNr, </div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	r = rndis_add_response (configNr,</div><div class='ctx'> 				sizeof (rndis_indicate_status_msg_type));</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	resp = (rndis_indicate_status_msg_type *) r-&gt;buf;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	resp-&gt;MessageType = __constant_cpu_to_le32 (</div><div class='ctx'> 			REMOTE_NDIS_INDICATE_STATUS_MSG);</div><div class='ctx'> 	resp-&gt;MessageLength = __constant_cpu_to_le32 (20);</div><div class='ctx'> 	resp-&gt;Status = cpu_to_le32 (status);</div><div class='ctx'> 	resp-&gt;StatusBufferLength = __constant_cpu_to_le32 (0);</div><div class='ctx'> 	resp-&gt;StatusBufferOffset = __constant_cpu_to_le32 (0);</div><div class='del'>-	</div><div class='del'>-	if (rndis_per_dev_params [configNr].ack) </div><div class='del'>-	    rndis_per_dev_params [configNr].ack (</div><div class='del'>-	    		rndis_per_dev_params [configNr].dev);</div><div class='add'>+</div><div class='add'>+	if (rndis_per_dev_params [configNr].ack)</div><div class='add'>+		rndis_per_dev_params [configNr].ack (</div><div class='add'>+			rndis_per_dev_params [configNr].dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1013,7 +1013,7 @@ int rndis_signal_connect (int configNr)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_per_dev_params [configNr].media_state</div><div class='ctx'> 			= NDIS_MEDIA_STATE_CONNECTED;</div><div class='del'>-	return rndis_indicate_status_msg (configNr, </div><div class='add'>+	return rndis_indicate_status_msg (configNr,</div><div class='ctx'> 					  RNDIS_STATUS_MEDIA_CONNECT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1045,26 +1045,26 @@ void rndis_set_host_mac (int configNr, const u8 *addr)</div><div class='ctx'> 	rndis_per_dev_params [configNr].host_mac = addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* </div><div class='del'>- * Message Parser </div><div class='add'>+/*</div><div class='add'>+ * Message Parser</div><div class='ctx'>  */</div><div class='ctx'> int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	u32 MsgType, MsgLength;</div><div class='ctx'> 	__le32 *tmp;</div><div class='ctx'> 	struct rndis_params		*params;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	</div><div class='del'>-	tmp = (__le32 *) buf; </div><div class='add'>+</div><div class='add'>+	tmp = (__le32 *) buf;</div><div class='ctx'> 	MsgType   = le32_to_cpup(tmp++);</div><div class='ctx'> 	MsgLength = le32_to_cpup(tmp++);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS)</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	params = &amp;rndis_per_dev_params [configNr];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* NOTE: RNDIS is *EXTREMELY* chatty ... Windows constantly polls for</div><div class='ctx'> 	 * rx/tx statistics and link status, in addition to KEEPALIVE traffic</div><div class='ctx'> 	 * and normal HC level polling to see if there's any IN traffic.</div><div class='hunk'>@@ -1073,12 +1073,12 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 	/* For USB: responses may take up to 10 seconds */</div><div class='ctx'> 	switch (MsgType) {</div><div class='ctx'> 	case REMOTE_NDIS_INITIALIZE_MSG:</div><div class='del'>-		DEBUG("%s: REMOTE_NDIS_INITIALIZE_MSG\n", </div><div class='add'>+		DEBUG("%s: REMOTE_NDIS_INITIALIZE_MSG\n",</div><div class='ctx'> 			__FUNCTION__ );</div><div class='ctx'> 		params-&gt;state = RNDIS_INITIALIZED;</div><div class='ctx'> 		return  rndis_init_response (configNr,</div><div class='del'>-					     (rndis_init_msg_type *) buf);</div><div class='del'>-		</div><div class='add'>+					(rndis_init_msg_type *) buf);</div><div class='add'>+</div><div class='ctx'> 	case REMOTE_NDIS_HALT_MSG:</div><div class='ctx'> 		DEBUG("%s: REMOTE_NDIS_HALT_MSG\n",</div><div class='ctx'> 			__FUNCTION__ );</div><div class='hunk'>@@ -1088,37 +1088,37 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 			netif_stop_queue (params-&gt;dev);</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 	case REMOTE_NDIS_QUERY_MSG:</div><div class='del'>-		return rndis_query_response (configNr, </div><div class='del'>-					     (rndis_query_msg_type *) buf);</div><div class='del'>-		</div><div class='add'>+		return rndis_query_response (configNr,</div><div class='add'>+					(rndis_query_msg_type *) buf);</div><div class='add'>+</div><div class='ctx'> 	case REMOTE_NDIS_SET_MSG:</div><div class='del'>-		return rndis_set_response (configNr, </div><div class='del'>-					   (rndis_set_msg_type *) buf);</div><div class='del'>-		</div><div class='add'>+		return rndis_set_response (configNr,</div><div class='add'>+					(rndis_set_msg_type *) buf);</div><div class='add'>+</div><div class='ctx'> 	case REMOTE_NDIS_RESET_MSG:</div><div class='del'>-		DEBUG("%s: REMOTE_NDIS_RESET_MSG\n", </div><div class='add'>+		DEBUG("%s: REMOTE_NDIS_RESET_MSG\n",</div><div class='ctx'> 			__FUNCTION__ );</div><div class='ctx'> 		return rndis_reset_response (configNr,</div><div class='del'>-					     (rndis_reset_msg_type *) buf);</div><div class='add'>+					(rndis_reset_msg_type *) buf);</div><div class='ctx'> </div><div class='ctx'> 	case REMOTE_NDIS_KEEPALIVE_MSG:</div><div class='ctx'> 		/* For USB: host does this every 5 seconds */</div><div class='ctx'> 		if (rndis_debug &gt; 1)</div><div class='del'>-			DEBUG("%s: REMOTE_NDIS_KEEPALIVE_MSG\n", </div><div class='add'>+			DEBUG("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",</div><div class='ctx'> 				__FUNCTION__ );</div><div class='ctx'> 		return rndis_keepalive_response (configNr,</div><div class='del'>-						 (rndis_keepalive_msg_type *) </div><div class='add'>+						 (rndis_keepalive_msg_type *)</div><div class='ctx'> 						 buf);</div><div class='del'>-		</div><div class='del'>-	default: </div><div class='add'>+</div><div class='add'>+	default:</div><div class='ctx'> 		/* At least Windows XP emits some undefined RNDIS messages.</div><div class='ctx'> 		 * In one case those messages seemed to relate to the host</div><div class='ctx'> 		 * suspending itself.</div><div class='ctx'> 		 */</div><div class='ctx'> 		printk (KERN_WARNING</div><div class='del'>-			"%s: unknown RNDIS message 0x%08X len %d\n", </div><div class='add'>+			"%s: unknown RNDIS message 0x%08X len %d\n",</div><div class='ctx'> 			__FUNCTION__ , MsgType, MsgLength);</div><div class='ctx'> 		{</div><div class='ctx'> 			unsigned i;</div><div class='hunk'>@@ -1142,14 +1142,14 @@ int rndis_msg_parser (u8 configNr, u8 *buf)</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return -ENOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rndis_register (int (* rndis_control_ack) (struct net_device *))</div><div class='ctx'> {</div><div class='ctx'> 	u8 i;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; RNDIS_MAX_CONFIGS; i++) {</div><div class='ctx'> 		if (!rndis_per_dev_params [i].used) {</div><div class='ctx'> 			rndis_per_dev_params [i].used = 1;</div><div class='hunk'>@@ -1159,32 +1159,32 @@ int rndis_register (int (* rndis_control_ack) (struct net_device *))</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	DEBUG("failed\n");</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void rndis_deregister (int configNr)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG("%s: \n", __FUNCTION__ );</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return;</div><div class='ctx'> 	rndis_per_dev_params [configNr].used = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int rndis_set_param_dev (u8 configNr, struct net_device *dev, </div><div class='add'>+int rndis_set_param_dev (u8 configNr, struct net_device *dev,</div><div class='ctx'> 			 struct net_device_stats *stats,</div><div class='ctx'> 			 u16 *cdc_filter)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG("%s:\n", __FUNCTION__ );</div><div class='ctx'> 	if (!dev || !stats) return -1;</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return -1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	rndis_per_dev_params [configNr].dev = dev;</div><div class='ctx'> 	rndis_per_dev_params [configNr].stats = stats;</div><div class='ctx'> 	rndis_per_dev_params [configNr].filter = cdc_filter;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1193,10 +1193,10 @@ int rndis_set_param_vendor (u8 configNr, u32 vendorID, const char *vendorDescr)</div><div class='ctx'> 	DEBUG("%s:\n", __FUNCTION__ );</div><div class='ctx'> 	if (!vendorDescr) return -1;</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return -1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	rndis_per_dev_params [configNr].vendorID = vendorID;</div><div class='ctx'> 	rndis_per_dev_params [configNr].vendorDescr = vendorDescr;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1204,10 +1204,10 @@ int rndis_set_param_medium (u8 configNr, u32 medium, u32 speed)</div><div class='ctx'> {</div><div class='ctx'> 	DEBUG("%s: %u %u\n", __FUNCTION__, medium, speed);</div><div class='ctx'> 	if (configNr &gt;= RNDIS_MAX_CONFIGS) return -1;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	rndis_per_dev_params [configNr].medium = medium;</div><div class='ctx'> 	rndis_per_dev_params [configNr].speed = speed;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1229,9 +1229,9 @@ void rndis_free_response (int configNr, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_resp_t		*r;</div><div class='ctx'> 	struct list_head	*act, *tmp;</div><div class='del'>-	</div><div class='del'>-	list_for_each_safe (act, tmp, </div><div class='del'>-			    &amp;(rndis_per_dev_params [configNr].resp_queue))</div><div class='add'>+</div><div class='add'>+	list_for_each_safe (act, tmp,</div><div class='add'>+			&amp;(rndis_per_dev_params [configNr].resp_queue))</div><div class='ctx'> 	{</div><div class='ctx'> 		r = list_entry (act, rndis_resp_t, list);</div><div class='ctx'> 		if (r &amp;&amp; r-&gt;buf == buf) {</div><div class='hunk'>@@ -1244,12 +1244,12 @@ void rndis_free_response (int configNr, u8 *buf)</div><div class='ctx'> u8 *rndis_get_next_response (int configNr, u32 *length)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_resp_t		*r;</div><div class='del'>-	struct list_head 	*act, *tmp;</div><div class='del'>-	</div><div class='add'>+	struct list_head	*act, *tmp;</div><div class='add'>+</div><div class='ctx'> 	if (!length) return NULL;</div><div class='del'>-	</div><div class='del'>-	list_for_each_safe (act, tmp, </div><div class='del'>-			    &amp;(rndis_per_dev_params [configNr].resp_queue))</div><div class='add'>+</div><div class='add'>+	list_for_each_safe (act, tmp,</div><div class='add'>+			&amp;(rndis_per_dev_params [configNr].resp_queue))</div><div class='ctx'> 	{</div><div class='ctx'> 		r = list_entry (act, rndis_resp_t, list);</div><div class='ctx'> 		if (!r-&gt;send) {</div><div class='hunk'>@@ -1258,24 +1258,24 @@ u8 *rndis_get_next_response (int configNr, u32 *length)</div><div class='ctx'> 			return r-&gt;buf;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static rndis_resp_t *rndis_add_response (int configNr, u32 length)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_resp_t	*r;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* NOTE:  this gets copied into ether.c USB_BUFSIZ bytes ... */</div><div class='ctx'> 	r = kmalloc (sizeof (rndis_resp_t) + length, GFP_ATOMIC);</div><div class='ctx'> 	if (!r) return NULL;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	r-&gt;buf = (u8 *) (r + 1);</div><div class='ctx'> 	r-&gt;length = length;</div><div class='ctx'> 	r-&gt;send = 0;</div><div class='del'>-	</div><div class='del'>-	list_add_tail (&amp;r-&gt;list, </div><div class='del'>-		       &amp;(rndis_per_dev_params [configNr].resp_queue));</div><div class='add'>+</div><div class='add'>+	list_add_tail (&amp;r-&gt;list,</div><div class='add'>+		&amp;(rndis_per_dev_params [configNr].resp_queue));</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1301,14 +1301,14 @@ int rndis_rm_hdr(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> #ifdef	CONFIG_USB_GADGET_DEBUG_FILES</div><div class='ctx'> </div><div class='del'>-static int rndis_proc_read (char *page, char **start, off_t off, int count, int *eof, </div><div class='del'>-		     void *data)</div><div class='add'>+static int rndis_proc_read (char *page, char **start, off_t off, int count, int *eof,</div><div class='add'>+		void *data)</div><div class='ctx'> {</div><div class='ctx'> 	char *out = page;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	rndis_params *param = (rndis_params *) data;</div><div class='del'>-	</div><div class='del'>-	out += snprintf (out, count, </div><div class='add'>+</div><div class='add'>+	out += snprintf (out, count,</div><div class='ctx'> 			 "Config Nr. %d\n"</div><div class='ctx'> 			 "used      : %s\n"</div><div class='ctx'> 			 "state     : %s\n"</div><div class='hunk'>@@ -1316,8 +1316,8 @@ static int rndis_proc_read (char *page, char **start, off_t off, int count, int</div><div class='ctx'> 			 "speed     : %d\n"</div><div class='ctx'> 			 "cable     : %s\n"</div><div class='ctx'> 			 "vendor ID : 0x%08X\n"</div><div class='del'>-			 "vendor    : %s\n", </div><div class='del'>-			 param-&gt;confignr, (param-&gt;used) ? "y" : "n", </div><div class='add'>+			 "vendor    : %s\n",</div><div class='add'>+			 param-&gt;confignr, (param-&gt;used) ? "y" : "n",</div><div class='ctx'> 			 ({ char *s = "?";</div><div class='ctx'> 			 switch (param-&gt;state) {</div><div class='ctx'> 			 case RNDIS_UNINITIALIZED:</div><div class='hunk'>@@ -1327,32 +1327,32 @@ static int rndis_proc_read (char *page, char **start, off_t off, int count, int</div><div class='ctx'> 			 case RNDIS_DATA_INITIALIZED:</div><div class='ctx'> 				s = "RNDIS_DATA_INITIALIZED"; break;</div><div class='ctx'> 			}; s; }),</div><div class='del'>-			 param-&gt;medium, </div><div class='del'>-			 (param-&gt;media_state) ? 0 : param-&gt;speed*100, </div><div class='add'>+			 param-&gt;medium,</div><div class='add'>+			 (param-&gt;media_state) ? 0 : param-&gt;speed*100,</div><div class='ctx'> 			 (param-&gt;media_state) ? "disconnected" : "connected",</div><div class='del'>-			 param-&gt;vendorID, param-&gt;vendorDescr);      </div><div class='del'>-	</div><div class='add'>+			 param-&gt;vendorID, param-&gt;vendorDescr);</div><div class='add'>+</div><div class='ctx'> 	len = out - page;</div><div class='ctx'> 	len -= off;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (len &lt; count) {</div><div class='ctx'> 		*eof = 1;</div><div class='ctx'> 		if (len &lt;= 0)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	} else</div><div class='ctx'> 		len = count;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	*start = page + off;</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rndis_proc_write (struct file *file, const char __user *buffer, </div><div class='del'>-		      unsigned long count, void *data)</div><div class='add'>+static int rndis_proc_write (struct file *file, const char __user *buffer,</div><div class='add'>+		unsigned long count, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	rndis_params *p = data;</div><div class='ctx'> 	u32 speed = 0;</div><div class='ctx'> 	int i, fl_speed = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		char c;</div><div class='ctx'> 		if (get_user(c, buffer))</div><div class='hunk'>@@ -1379,15 +1379,15 @@ static int rndis_proc_write (struct file *file, const char __user *buffer,</div><div class='ctx'> 		case 'd':</div><div class='ctx'> 			rndis_signal_disconnect(p-&gt;confignr);</div><div class='ctx'> 			break;</div><div class='del'>-		default: </div><div class='add'>+		default:</div><div class='ctx'> 			if (fl_speed) p-&gt;speed = speed;</div><div class='ctx'> 			else DEBUG ("%c is not valid\n", c);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		buffer++;</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1398,7 +1398,7 @@ static struct proc_dir_entry *rndis_connect_state [RNDIS_MAX_CONFIGS];</div><div class='ctx'> #endif	/* CONFIG_USB_GADGET_DEBUG_FILES */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __init rndis_init (void)</div><div class='add'>+int __devinit rndis_init (void)</div><div class='ctx'> {</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='hunk'>@@ -1408,7 +1408,7 @@ int __init rndis_init (void)</div><div class='ctx'> </div><div class='ctx'> 		sprintf (name, NAME_TEMPLATE, i);</div><div class='ctx'> 		if (!(rndis_connect_state [i]</div><div class='del'>-				= create_proc_entry (name, 0660, NULL))) </div><div class='add'>+				= create_proc_entry (name, 0660, NULL)))</div><div class='ctx'> 		{</div><div class='ctx'> 			DEBUG ("%s :remove entries", __FUNCTION__);</div><div class='ctx'> 			while (i) {</div><div class='hunk'>@@ -1432,7 +1432,7 @@ int __init rndis_init (void)</div><div class='ctx'> 				= NDIS_MEDIA_STATE_DISCONNECTED;</div><div class='ctx'> 		INIT_LIST_HEAD (&amp;(rndis_per_dev_params [i].resp_queue));</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1441,7 +1441,7 @@ void rndis_exit (void)</div><div class='ctx'> #ifdef	CONFIG_USB_GADGET_DEBUG_FILES</div><div class='ctx'> 	u8 i;</div><div class='ctx'> 	char name [20];</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; RNDIS_MAX_CONFIGS; i++) {</div><div class='ctx'> 		sprintf (name, NAME_TEMPLATE, i);</div><div class='ctx'> 		remove_proc_entry (name, NULL);</div><div class='head'>diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h<br/>index 95b4c6326100..4c3c7259f019 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/rndis.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/rndis.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/rndis.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/rndis.h</a></div><div class='hunk'>@@ -1,15 +1,15 @@</div><div class='del'>-/* </div><div class='add'>+/*</div><div class='ctx'>  * RNDIS	Definitions for Remote NDIS</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Version:	$Id: rndis.h,v 1.15 2004/03/25 21:33:46 robert Exp $</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Authors:	Benedikt Spranger, Pengutronix</div><div class='del'>- * 		Robert Schwebel, Pengutronix</div><div class='del'>- * </div><div class='del'>- * 		This program is free software; you can redistribute it and/or</div><div class='add'>+ *		Robert Schwebel, Pengutronix</div><div class='add'>+ *</div><div class='add'>+ *		This program is free software; you can redistribute it and/or</div><div class='ctx'>  *		modify it under the terms of the GNU General Public License</div><div class='del'>- *		version 2, as published by the Free Software Foundation. </div><div class='del'>- * </div><div class='add'>+ *		version 2, as published by the Free Software Foundation.</div><div class='add'>+ *</div><div class='ctx'>  *		This software was originally developed in conformance with</div><div class='ctx'>  *		Microsoft's Remote NDIS Specification License Agreement.</div><div class='ctx'>  */</div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #define RNDIS_STATUS_MEDIA_CONNECT	0x4001000BU	/* Device connected  */</div><div class='ctx'> #define RNDIS_STATUS_MEDIA_DISCONNECT	0x4001000CU	/* Device disconnected */</div><div class='ctx'> /* For all not specified status messages:</div><div class='del'>- * RNDIS_STATUS_Xxx -&gt; NDIS_STATUS_Xxx </div><div class='add'>+ * RNDIS_STATUS_Xxx -&gt; NDIS_STATUS_Xxx</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Message Set for Connectionless (802.3) Devices */</div><div class='hunk'>@@ -69,7 +69,7 @@</div><div class='ctx'> #define OID_PNP_ENABLE_WAKE_UP			0xFD010106</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-typedef struct rndis_init_msg_type </div><div class='add'>+typedef struct rndis_init_msg_type</div><div class='ctx'> {</div><div class='ctx'> 	__le32	MessageType;</div><div class='ctx'> 	__le32	MessageLength;</div><div class='hunk'>@@ -234,12 +234,12 @@ typedef struct rndis_params</div><div class='ctx'> </div><div class='ctx'> 	const u8		*host_mac;</div><div class='ctx'> 	u16			*filter;</div><div class='del'>-	struct net_device 	*dev;</div><div class='add'>+	struct net_device	*dev;</div><div class='ctx'> 	struct net_device_stats *stats;</div><div class='ctx'> </div><div class='ctx'> 	u32			vendorID;</div><div class='ctx'> 	const char		*vendorDescr;</div><div class='del'>-	int 			(*ack) (struct net_device *);</div><div class='add'>+	int			(*ack) (struct net_device *);</div><div class='ctx'> 	struct list_head	resp_queue;</div><div class='ctx'> } rndis_params;</div><div class='ctx'> </div><div class='hunk'>@@ -250,7 +250,7 @@ void rndis_deregister (int configNr);</div><div class='ctx'> int  rndis_set_param_dev (u8 configNr, struct net_device *dev,</div><div class='ctx'> 			 struct net_device_stats *stats,</div><div class='ctx'> 			 u16 *cdc_filter);</div><div class='del'>-int  rndis_set_param_vendor (u8 configNr, u32 vendorID, </div><div class='add'>+int  rndis_set_param_vendor (u8 configNr, u32 vendorID,</div><div class='ctx'> 			    const char *vendorDescr);</div><div class='ctx'> int  rndis_set_param_medium (u8 configNr, u32 medium, u32 speed);</div><div class='ctx'> void rndis_add_hdr (struct sk_buff *skb);</div><div class='hunk'>@@ -264,7 +264,7 @@ int  rndis_signal_disconnect (int configNr);</div><div class='ctx'> int  rndis_state (int configNr);</div><div class='ctx'> extern void rndis_set_host_mac (int configNr, const u8 *addr);</div><div class='ctx'> </div><div class='del'>-int __init rndis_init (void);</div><div class='add'>+int __devinit rndis_init (void);</div><div class='ctx'> void rndis_exit (void);</div><div class='ctx'> </div><div class='ctx'> #endif  /* _LINUX_RNDIS_H */</div><div class='head'>diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c<br/>index b992546c394d..e762aa19ab0a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/serial.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -45,88 +44,16 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/usb_ch9.h&gt;</div><div class='del'>-#include &lt;linux/usb_cdc.h&gt;</div><div class='add'>+#include &lt;linux/usb/cdc.h&gt;</div><div class='ctx'> #include &lt;linux/usb_gadget.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gadget_chips.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Wait Cond */</div><div class='del'>-</div><div class='del'>-#define __wait_cond_interruptible(wq, condition, lock, flags, ret)	\</div><div class='del'>-do {									\</div><div class='del'>-	wait_queue_t __wait;						\</div><div class='del'>-	init_waitqueue_entry(&amp;__wait, current);				\</div><div class='del'>-									\</div><div class='del'>-	add_wait_queue(&amp;wq, &amp;__wait);					\</div><div class='del'>-	for (;;) {							\</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);			\</div><div class='del'>-		if (condition)						\</div><div class='del'>-			break;						\</div><div class='del'>-		if (!signal_pending(current)) {				\</div><div class='del'>-			spin_unlock_irqrestore(lock, flags);		\</div><div class='del'>-			schedule();					\</div><div class='del'>-			spin_lock_irqsave(lock, flags);			\</div><div class='del'>-			continue;					\</div><div class='del'>-		}							\</div><div class='del'>-		ret = -ERESTARTSYS;					\</div><div class='del'>-		break;							\</div><div class='del'>-	}								\</div><div class='del'>-	current-&gt;state = TASK_RUNNING;					\</div><div class='del'>-	remove_wait_queue(&amp;wq, &amp;__wait);				\</div><div class='del'>-} while (0)</div><div class='del'>-	</div><div class='del'>-#define wait_cond_interruptible(wq, condition, lock, flags)		\</div><div class='del'>-({									\</div><div class='del'>-	int __ret = 0;							\</div><div class='del'>-	if (!(condition))						\</div><div class='del'>-		__wait_cond_interruptible(wq, condition, lock, flags,	\</div><div class='del'>-						__ret);			\</div><div class='del'>-	__ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-#define __wait_cond_interruptible_timeout(wq, condition, lock, flags, 	\</div><div class='del'>-						timeout, ret)		\</div><div class='del'>-do {									\</div><div class='del'>-	signed long __timeout = timeout;				\</div><div class='del'>-	wait_queue_t __wait;						\</div><div class='del'>-	init_waitqueue_entry(&amp;__wait, current);				\</div><div class='del'>-									\</div><div class='del'>-	add_wait_queue(&amp;wq, &amp;__wait);					\</div><div class='del'>-	for (;;) {							\</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);			\</div><div class='del'>-		if (__timeout == 0)					\</div><div class='del'>-			break;						\</div><div class='del'>-		if (condition)						\</div><div class='del'>-			break;						\</div><div class='del'>-		if (!signal_pending(current)) {				\</div><div class='del'>-			spin_unlock_irqrestore(lock, flags);		\</div><div class='del'>-			__timeout = schedule_timeout(__timeout);	\</div><div class='del'>-			spin_lock_irqsave(lock, flags);			\</div><div class='del'>-			continue;					\</div><div class='del'>-		}							\</div><div class='del'>-		ret = -ERESTARTSYS;					\</div><div class='del'>-		break;							\</div><div class='del'>-	}								\</div><div class='del'>-	current-&gt;state = TASK_RUNNING;					\</div><div class='del'>-	remove_wait_queue(&amp;wq, &amp;__wait);				\</div><div class='del'>-} while (0)</div><div class='del'>-	</div><div class='del'>-#define wait_cond_interruptible_timeout(wq, condition, lock, flags,	\</div><div class='del'>-						timeout)		\</div><div class='del'>-({									\</div><div class='del'>-	int __ret = 0;							\</div><div class='del'>-	if (!(condition))						\</div><div class='del'>-		__wait_cond_interruptible_timeout(wq, condition, lock,	\</div><div class='del'>-						flags, timeout, __ret);	\</div><div class='del'>-	__ret;								\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Defines */</div><div class='ctx'> </div><div class='del'>-#define GS_VERSION_STR			"v2.0"</div><div class='del'>-#define GS_VERSION_NUM			0x0200</div><div class='add'>+#define GS_VERSION_STR			"v2.2"</div><div class='add'>+#define GS_VERSION_NUM			0x0202</div><div class='ctx'> </div><div class='ctx'> #define GS_LONG_NAME			"Gadget Serial"</div><div class='ctx'> #define GS_SHORT_NAME			"g_serial"</div><div class='hunk'>@@ -660,12 +587,11 @@ static int __init gs_module_init(void)</div><div class='ctx'> 	gs_tty_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	gs_tty_driver-&gt;driver_name = GS_SHORT_NAME;</div><div class='ctx'> 	gs_tty_driver-&gt;name = "ttygs";</div><div class='del'>-	gs_tty_driver-&gt;devfs_name = "usb/ttygs/";</div><div class='ctx'> 	gs_tty_driver-&gt;major = GS_MAJOR;</div><div class='ctx'> 	gs_tty_driver-&gt;minor_start = GS_MINOR_START;</div><div class='ctx'> 	gs_tty_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='ctx'> 	gs_tty_driver-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='del'>-	gs_tty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	gs_tty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	gs_tty_driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	gs_tty_driver-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='ctx'> 	tty_set_operations(gs_tty_driver, &amp;gs_tty_ops);</div><div class='hunk'>@@ -843,9 +769,19 @@ exit_unlock_dev:</div><div class='ctx'> /*</div><div class='ctx'>  * gs_close</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#define GS_WRITE_FINISHED_EVENT_SAFELY(p)			\</div><div class='add'>+({								\</div><div class='add'>+	int cond;						\</div><div class='add'>+								\</div><div class='add'>+	spin_lock_irq(&amp;(p)-&gt;port_lock);				\</div><div class='add'>+	cond = !(p)-&gt;port_dev || !gs_buf_data_avail((p)-&gt;port_write_buf); \</div><div class='add'>+	spin_unlock_irq(&amp;(p)-&gt;port_lock);			\</div><div class='add'>+	cond;							\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> static void gs_close(struct tty_struct *tty, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct gs_port *port = tty-&gt;driver_data;</div><div class='ctx'> 	struct semaphore *sem;</div><div class='ctx'> </div><div class='hunk'>@@ -859,7 +795,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	sem = &amp;gs_open_close_sem[port-&gt;port_num];</div><div class='ctx'> 	down(sem);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;port-&gt;port_lock, flags);</div><div class='add'>+	spin_lock_irq(&amp;port-&gt;port_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;port_open_count == 0) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='hunk'>@@ -887,12 +823,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	/* wait for write buffer to drain, or */</div><div class='ctx'> 	/* at most GS_CLOSE_TIMEOUT seconds */</div><div class='ctx'> 	if (gs_buf_data_avail(port-&gt;port_write_buf) &gt; 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;port-&gt;port_lock, flags);</div><div class='del'>-		wait_cond_interruptible_timeout(port-&gt;port_write_wait,</div><div class='del'>-		port-&gt;port_dev == NULL</div><div class='del'>-		|| gs_buf_data_avail(port-&gt;port_write_buf) == 0,</div><div class='del'>-		&amp;port-&gt;port_lock, flags, GS_CLOSE_TIMEOUT * HZ);</div><div class='del'>-		spin_lock_irqsave(&amp;port-&gt;port_lock, flags);</div><div class='add'>+		spin_unlock_irq(&amp;port-&gt;port_lock);</div><div class='add'>+		wait_event_interruptible_timeout(port-&gt;port_write_wait,</div><div class='add'>+					GS_WRITE_FINISHED_EVENT_SAFELY(port),</div><div class='add'>+					GS_CLOSE_TIMEOUT * HZ);</div><div class='add'>+		spin_lock_irq(&amp;port-&gt;port_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* free disconnected port on final close */</div><div class='hunk'>@@ -912,7 +847,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)</div><div class='ctx'> 		port-&gt;port_num, tty, file);</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='del'>-	spin_unlock_irqrestore(&amp;port-&gt;port_lock, flags);</div><div class='add'>+	spin_unlock_irq(&amp;port-&gt;port_lock);</div><div class='ctx'> 	up(sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1538,7 +1473,7 @@ autoconf_fail:</div><div class='ctx'>  * Called on module unload.  Frees the control request and device</div><div class='ctx'>  * structure.</div><div class='ctx'>  */</div><div class='del'>-static void __exit gs_unbind(struct usb_gadget *gadget)</div><div class='add'>+static void /* __init_or_exit */ gs_unbind(struct usb_gadget *gadget)</div><div class='ctx'> {</div><div class='ctx'> 	struct gs_dev *dev = get_gadget_data(gadget);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c<br/>index 68e3d8f5da89..b7018ee487ea 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/gadget/zero.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/gadget/zero.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/gadget/zero.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/gadget/zero.c</a></div><div class='hunk'>@@ -62,7 +62,6 @@</div><div class='ctx'> #define DEBUG 1</div><div class='ctx'> // #define VERBOSE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -1122,7 +1121,7 @@ zero_autoresume (unsigned long _dev)</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static void __exit</div><div class='add'>+static void /* __init_or_exit */</div><div class='ctx'> zero_unbind (struct usb_gadget *gadget)</div><div class='ctx'> {</div><div class='ctx'> 	struct zero_dev		*dev = get_gadget_data (gadget);</div><div class='head'>diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig<br/>index e27b79a3c05f..b93d71d28db7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/Kconfig</a></div><div class='hunk'>@@ -47,12 +47,29 @@ config USB_EHCI_ROOT_HUB_TT</div><div class='ctx'> 	  controller is needed.  It's safe to say "y" even if your</div><div class='ctx'> 	  controller doesn't support this feature.</div><div class='ctx'> </div><div class='del'>-	  This supports the EHCI implementation from TransDimension Inc.</div><div class='add'>+	  This supports the EHCI implementation that's originally</div><div class='add'>+	  from ARC, and has since changed hands a few times.</div><div class='add'>+</div><div class='add'>+config USB_EHCI_TT_NEWSCHED</div><div class='add'>+	bool "Improved Transaction Translator scheduling (EXPERIMENTAL)"</div><div class='add'>+	depends on USB_EHCI_HCD &amp;&amp; EXPERIMENTAL</div><div class='add'>+	---help---</div><div class='add'>+	  This changes the periodic scheduling code to fill more of the low</div><div class='add'>+	  and full speed bandwidth available from the Transaction Translator</div><div class='add'>+	  (TT) in USB 2.0 hubs.  Without this, only one transfer will be</div><div class='add'>+	  issued in each microframe, significantly reducing the number of</div><div class='add'>+	  periodic low/fullspeed transfers possible.</div><div class='add'>+</div><div class='add'>+	  If you have multiple periodic low/fullspeed devices connected to a</div><div class='add'>+	  highspeed USB hub which is connected to a highspeed USB Host</div><div class='add'>+	  Controller, and some of those devices will not work correctly</div><div class='add'>+	  (possibly due to "ENOSPC" or "-28" errors), say Y.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config USB_ISP116X_HCD</div><div class='ctx'> 	tristate "ISP116X HCD support"</div><div class='ctx'> 	depends on USB</div><div class='del'>-	default N</div><div class='ctx'> 	---help---</div><div class='ctx'> 	  The ISP1160 and ISP1161 chips are USB host controllers. Enable this</div><div class='ctx'> 	  option if your board has this chip. If unsure, say N.</div><div class='hunk'>@@ -127,7 +144,6 @@ config USB_UHCI_HCD</div><div class='ctx'> config USB_SL811_HCD</div><div class='ctx'> 	tristate "SL811HS HCD support"</div><div class='ctx'> 	depends on USB</div><div class='del'>-	default N</div><div class='ctx'> 	help</div><div class='ctx'> 	  The SL811HS is a single-port USB controller that supports either</div><div class='ctx'> 	  host side or peripheral side roles.  Enable this option if your</div><div class='hunk'>@@ -140,7 +156,6 @@ config USB_SL811_HCD</div><div class='ctx'> config USB_SL811_CS</div><div class='ctx'> 	tristate "CF/PCMCIA support for SL811HS HCD"</div><div class='ctx'> 	depends on USB_SL811_HCD &amp;&amp; PCMCIA</div><div class='del'>-	default N</div><div class='ctx'> 	help</div><div class='ctx'> 	  Wraps a PCMCIA driver around the SL811HS HCD, supporting the RATOC</div><div class='ctx'> 	  REX-CFU1U CF card (often used with PDAs).  If unsure, say N.</div><div class='head'>diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c<br/>index 63eadeec1324..26ed757d22a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-au1xxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-au1xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-au1xxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ehci-au1xxx.c</a></div><div class='hunk'>@@ -16,10 +16,6 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SOC_AU1200</div><div class='del'>-#error "this Alchemy chip doesn't have EHCI"</div><div class='del'>-#else				/* Au1200 */</div><div class='del'>-</div><div class='ctx'> #define USB_HOST_CONFIG   (USB_MSR_BASE + USB_MSR_MCFG)</div><div class='ctx'> #define USB_MCFG_PFEN     (1&lt;&lt;31)</div><div class='ctx'> #define USB_MCFG_RDCOMB   (1&lt;&lt;30)</div><div class='hunk'>@@ -45,8 +41,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> #define USBH_DISABLE      (USB_MCFG_EBMEN | USB_MCFG_EMEMEN)</div><div class='ctx'> </div><div class='del'>-#endif				/* Au1200 */</div><div class='del'>-</div><div class='ctx'> extern int usb_disabled(void);</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='hunk'>@@ -111,9 +105,9 @@ int usb_ehci_au1xxx_probe(const struct hc_driver *driver,</div><div class='ctx'> </div><div class='ctx'> 	/* Au1200 AB USB does not support coherent memory */</div><div class='ctx'> 	if (!(read_c0_prid() &amp; 0xff)) {</div><div class='del'>-		pr_info("%s: this is chip revision AB!\n", dev-&gt;dev.name);</div><div class='add'>+		pr_info("%s: this is chip revision AB!\n", dev-&gt;name);</div><div class='ctx'> 		pr_info("%s: update your board or re-configure the kernel\n",</div><div class='del'>-			dev-&gt;dev.name);</div><div class='add'>+			dev-&gt;name);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -152,7 +146,7 @@ int usb_ehci_au1xxx_probe(const struct hc_driver *driver,</div><div class='ctx'> 	/* ehci_hcd_init(hcd_to_ehci(hcd)); */</div><div class='ctx'> </div><div class='ctx'> 	retval =</div><div class='del'>-	    usb_add_hcd(hcd, dev-&gt;resource[1].start, SA_INTERRUPT | SA_SHIRQ);</div><div class='add'>+	    usb_add_hcd(hcd, dev-&gt;resource[1].start, IRQF_DISABLED | IRQF_SHARED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -232,9 +226,8 @@ static const struct hc_driver ehci_au1xxx_hc_driver = {</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int ehci_hcd_au1xxx_drv_probe(struct device *dev)</div><div class='add'>+static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='ctx'> 	struct usb_hcd *hcd = NULL;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -247,10 +240,9 @@ static int ehci_hcd_au1xxx_drv_probe(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ehci_hcd_au1xxx_drv_remove(struct device *dev)</div><div class='add'>+static int ehci_hcd_au1xxx_drv_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *pdev = to_platform_device(dev);</div><div class='del'>-	struct usb_hcd *hcd = dev_get_drvdata(dev);</div><div class='add'>+	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	usb_ehci_au1xxx_remove(hcd, pdev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -272,26 +264,14 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> */</div><div class='del'>-static struct device_driver ehci_hcd_au1xxx_driver = {</div><div class='del'>-	.name = "au1xxx-ehci",</div><div class='del'>-	.bus = &amp;platform_bus_type,</div><div class='add'>+MODULE_ALIAS("au1xxx-ehci");</div><div class='add'>+static struct platform_driver ehci_hcd_au1xxx_driver = {</div><div class='ctx'> 	.probe = ehci_hcd_au1xxx_drv_probe,</div><div class='ctx'> 	.remove = ehci_hcd_au1xxx_drv_remove,</div><div class='ctx'> 	/*.suspend      = ehci_hcd_au1xxx_drv_suspend, */</div><div class='ctx'> 	/*.resume       = ehci_hcd_au1xxx_drv_resume, */</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "au1xxx-ehci",</div><div class='add'>+		.bus = &amp;platform_bus_type</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ehci_hcd_au1xxx_init(void)</div><div class='del'>-{</div><div class='del'>-	pr_debug(DRIVER_INFO " (Au1xxx)\n");</div><div class='del'>-</div><div class='del'>-	return driver_register(&amp;ehci_hcd_au1xxx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ehci_hcd_au1xxx_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	driver_unregister(&amp;ehci_hcd_au1xxx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ehci_hcd_au1xxx_init);</div><div class='del'>-module_exit(ehci_hcd_au1xxx_cleanup);</div><div class='head'>diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c<br/>index f985f121a245..d030516edfb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-fsl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-fsl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-fsl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ehci-fsl.c</a></div><div class='hunk'>@@ -121,7 +121,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver,</div><div class='ctx'> 	temp = in_le32(hcd-&gt;regs + 0x1a8);</div><div class='ctx'> 	out_le32(hcd-&gt;regs + 0x1a8, temp | 0x3);</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, irq, SA_SHIRQ);</div><div class='add'>+	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);</div><div class='ctx'> 	if (retval != 0)</div><div class='ctx'> 		goto err4;</div><div class='ctx'> 	return retval;</div><div class='hunk'>@@ -324,43 +324,12 @@ static int ehci_fsl_drv_remove(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct platform_driver ehci_fsl_dr_driver = {</div><div class='del'>-	.probe = ehci_fsl_drv_probe,</div><div class='del'>-	.remove = ehci_fsl_drv_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		   .name = "fsl-usb2-dr",</div><div class='del'>-		   },</div><div class='del'>-};</div><div class='add'>+MODULE_ALIAS("fsl-ehci");</div><div class='ctx'> </div><div class='del'>-static struct platform_driver ehci_fsl_mph_driver = {</div><div class='add'>+static struct platform_driver ehci_fsl_driver = {</div><div class='ctx'> 	.probe = ehci_fsl_drv_probe,</div><div class='ctx'> 	.remove = ehci_fsl_drv_remove,</div><div class='ctx'> 	.driver = {</div><div class='del'>-		   .name = "fsl-usb2-mph",</div><div class='add'>+		   .name = "fsl-ehci",</div><div class='ctx'> 		   },</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ehci_fsl_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",</div><div class='del'>-		 hcd_name,</div><div class='del'>-		 sizeof(struct ehci_qh), sizeof(struct ehci_qtd),</div><div class='del'>-		 sizeof(struct ehci_itd), sizeof(struct ehci_sitd));</div><div class='del'>-</div><div class='del'>-	retval = platform_driver_register(&amp;ehci_fsl_dr_driver);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	return platform_driver_register(&amp;ehci_fsl_mph_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ehci_fsl_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ehci_fsl_mph_driver);</div><div class='del'>-	platform_driver_unregister(&amp;ehci_fsl_dr_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ehci_fsl_init);</div><div class='del'>-module_exit(ehci_fsl_cleanup);</div><div class='head'>diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c<br/>index 79f2d8b9bfb6..85b0b4ad4c16 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ehci-hcd.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dmapool.h&gt;</div><div class='hunk'>@@ -626,10 +625,11 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd, struct pt_regs *regs)</div><div class='ctx'> 			writel (status | CMD_RUN, &amp;ehci-&gt;regs-&gt;command);</div><div class='ctx'> </div><div class='ctx'> 		while (i--) {</div><div class='del'>-			status = readl (&amp;ehci-&gt;regs-&gt;port_status [i]);</div><div class='del'>-			if (status &amp; PORT_OWNER)</div><div class='add'>+			int pstatus = readl (&amp;ehci-&gt;regs-&gt;port_status [i]);</div><div class='add'>+</div><div class='add'>+			if (pstatus &amp; PORT_OWNER)</div><div class='ctx'> 				continue;</div><div class='del'>-			if (!(status &amp; PORT_RESUME)</div><div class='add'>+			if (!(pstatus &amp; PORT_RESUME)</div><div class='ctx'> 					|| ehci-&gt;reset_done [i] != 0)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='hunk'>@@ -889,19 +889,59 @@ MODULE_LICENSE ("GPL");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> #include "ehci-pci.c"</div><div class='del'>-#define	EHCI_BUS_GLUED</div><div class='add'>+#define	PCI_DRIVER		ehci_pci_driver</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_83xx</div><div class='ctx'> #include "ehci-fsl.c"</div><div class='del'>-#define	EHCI_BUS_GLUED</div><div class='add'>+#define	PLATFORM_DRIVER		ehci_fsl_driver</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SOC_AU1X00</div><div class='add'>+#ifdef CONFIG_SOC_AU1200</div><div class='ctx'> #include "ehci-au1xxx.c"</div><div class='del'>-#define	EHCI_BUS_GLUED</div><div class='add'>+#define	PLATFORM_DRIVER		ehci_hcd_au1xxx_driver</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef	EHCI_BUS_GLUED</div><div class='add'>+#if !defined(PCI_DRIVER) &amp;&amp; !defined(PLATFORM_DRIVER)</div><div class='ctx'> #error "missing bus glue for ehci-hcd"</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+static int __init ehci_hcd_init(void)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",</div><div class='add'>+		 hcd_name,</div><div class='add'>+		 sizeof(struct ehci_qh), sizeof(struct ehci_qtd),</div><div class='add'>+		 sizeof(struct ehci_itd), sizeof(struct ehci_sitd));</div><div class='add'>+</div><div class='add'>+#ifdef PLATFORM_DRIVER</div><div class='add'>+	retval = platform_driver_register(&amp;PLATFORM_DRIVER);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PCI_DRIVER</div><div class='add'>+	retval = pci_register_driver(&amp;PCI_DRIVER);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+#ifdef PLATFORM_DRIVER</div><div class='add'>+		platform_driver_unregister(&amp;PLATFORM_DRIVER);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+module_init(ehci_hcd_init);</div><div class='add'>+</div><div class='add'>+static void __exit ehci_hcd_cleanup(void)</div><div class='add'>+{</div><div class='add'>+#ifdef PLATFORM_DRIVER</div><div class='add'>+	platform_driver_unregister(&amp;PLATFORM_DRIVER);</div><div class='add'>+#endif</div><div class='add'>+#ifdef PCI_DRIVER</div><div class='add'>+	pci_unregister_driver(&amp;PCI_DRIVER);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+module_exit(ehci_hcd_cleanup);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c<br/>index a1bd2bea6deb..cadffacd945b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-pci.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-pci.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-pci.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ehci-pci.c</a></div><div class='hunk'>@@ -76,6 +76,30 @@ static int ehci_pci_setup(struct usb_hcd *hcd)</div><div class='ctx'> 	dbg_hcs_params(ehci, "reset");</div><div class='ctx'> 	dbg_hcc_params(ehci, "reset");</div><div class='ctx'> </div><div class='add'>+        /* ehci_init() causes memory for DMA transfers to be</div><div class='add'>+         * allocated.  Thus, any vendor-specific workarounds based on</div><div class='add'>+         * limiting the type of memory used for DMA transfers must</div><div class='add'>+         * happen before ehci_init() is called. */</div><div class='add'>+	switch (pdev-&gt;vendor) {</div><div class='add'>+	case PCI_VENDOR_ID_NVIDIA:</div><div class='add'>+		/* NVidia reports that certain chips don't handle</div><div class='add'>+		 * QH, ITD, or SITD addresses above 2GB.  (But TD,</div><div class='add'>+		 * data buffer, and periodic schedule are normal.)</div><div class='add'>+		 */</div><div class='add'>+		switch (pdev-&gt;device) {</div><div class='add'>+		case 0x003c:	/* MCP04 */</div><div class='add'>+		case 0x005b:	/* CK804 */</div><div class='add'>+		case 0x00d8:	/* CK8 */</div><div class='add'>+		case 0x00e8:	/* CK8S */</div><div class='add'>+			if (pci_set_consistent_dma_mask(pdev,</div><div class='add'>+						DMA_31BIT_MASK) &lt; 0)</div><div class='add'>+				ehci_warn(ehci, "can't enable NVidia "</div><div class='add'>+					"workaround for &gt;2GB RAM\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* cache this readonly data; minimize chip reads */</div><div class='ctx'> 	ehci-&gt;hcs_params = readl(&amp;ehci-&gt;caps-&gt;hcs_params);</div><div class='ctx'> </div><div class='hunk'>@@ -88,8 +112,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	/* NOTE:  only the parts below this line are PCI-specific */</div><div class='del'>-</div><div class='ctx'> 	switch (pdev-&gt;vendor) {</div><div class='ctx'> 	case PCI_VENDOR_ID_TDI:</div><div class='ctx'> 		if (pdev-&gt;device == PCI_DEVICE_ID_TDI_EHCI) {</div><div class='hunk'>@@ -107,19 +129,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_VENDOR_ID_NVIDIA:</div><div class='ctx'> 		switch (pdev-&gt;device) {</div><div class='del'>-		/* NVidia reports that certain chips don't handle</div><div class='del'>-		 * QH, ITD, or SITD addresses above 2GB.  (But TD,</div><div class='del'>-		 * data buffer, and periodic schedule are normal.)</div><div class='del'>-		 */</div><div class='del'>-		case 0x003c:	/* MCP04 */</div><div class='del'>-		case 0x005b:	/* CK804 */</div><div class='del'>-		case 0x00d8:	/* CK8 */</div><div class='del'>-		case 0x00e8:	/* CK8S */</div><div class='del'>-			if (pci_set_consistent_dma_mask(pdev,</div><div class='del'>-						DMA_31BIT_MASK) &lt; 0)</div><div class='del'>-				ehci_warn(ehci, "can't enable NVidia "</div><div class='del'>-					"workaround for &gt;2GB RAM\n");</div><div class='del'>-			break;</div><div class='ctx'> 		/* Some NForce2 chips have problems with selective suspend;</div><div class='ctx'> 		 * fixed in newer silicon.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -370,23 +379,3 @@ static struct pci_driver ehci_pci_driver = {</div><div class='ctx'> 	.resume =	usb_hcd_pci_resume,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init ehci_hcd_pci_init(void)</div><div class='del'>-{</div><div class='del'>-	if (usb_disabled())</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",</div><div class='del'>-		hcd_name,</div><div class='del'>-		sizeof(struct ehci_qh), sizeof(struct ehci_qtd),</div><div class='del'>-		sizeof(struct ehci_itd), sizeof(struct ehci_sitd));</div><div class='del'>-</div><div class='del'>-	return pci_register_driver(&amp;ehci_pci_driver);</div><div class='del'>-}</div><div class='del'>-module_init(ehci_hcd_pci_init);</div><div class='del'>-</div><div class='del'>-static void __exit ehci_hcd_pci_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;ehci_pci_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(ehci_hcd_pci_cleanup);</div><div class='head'>diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c<br/>index 5871944e6145..4859900bd135 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-sched.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ehci-sched.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ehci-sched.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ehci-sched.c</a></div><div class='hunk'>@@ -163,6 +163,190 @@ static int same_tt (struct usb_device *dev1, struct usb_device *dev2)</div><div class='ctx'> 		return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_EHCI_TT_NEWSCHED</div><div class='add'>+</div><div class='add'>+/* Which uframe does the low/fullspeed transfer start in?</div><div class='add'>+ *</div><div class='add'>+ * The parameter is the mask of ssplits in "H-frame" terms</div><div class='add'>+ * and this returns the transfer start uframe in "B-frame" terms,</div><div class='add'>+ * which allows both to match, e.g. a ssplit in "H-frame" uframe 0</div><div class='add'>+ * will cause a transfer in "B-frame" uframe 0.  "B-frames" lag</div><div class='add'>+ * "H-frames" by 1 uframe.  See the EHCI spec sec 4.5 and figure 4.7.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned char tt_start_uframe(struct ehci_hcd *ehci, __le32 mask)</div><div class='add'>+{</div><div class='add'>+	unsigned char smask = QH_SMASK &amp; le32_to_cpu(mask);</div><div class='add'>+	if (!smask) {</div><div class='add'>+		ehci_err(ehci, "invalid empty smask!\n");</div><div class='add'>+		/* uframe 7 can't have bw so this will indicate failure */</div><div class='add'>+		return 7;</div><div class='add'>+	}</div><div class='add'>+	return ffs(smask) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const unsigned char</div><div class='add'>+max_tt_usecs[] = { 125, 125, 125, 125, 125, 125, 30, 0 };</div><div class='add'>+</div><div class='add'>+/* carryover low/fullspeed bandwidth that crosses uframe boundries */</div><div class='add'>+static inline void carryover_tt_bandwidth(unsigned short tt_usecs[8])</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i=0; i&lt;7; i++) {</div><div class='add'>+		if (max_tt_usecs[i] &lt; tt_usecs[i]) {</div><div class='add'>+			tt_usecs[i+1] += tt_usecs[i] - max_tt_usecs[i];</div><div class='add'>+			tt_usecs[i] = max_tt_usecs[i];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* How many of the tt's periodic downstream 1000 usecs are allocated?</div><div class='add'>+ *</div><div class='add'>+ * While this measures the bandwidth in terms of usecs/uframe,</div><div class='add'>+ * the low/fullspeed bus has no notion of uframes, so any particular</div><div class='add'>+ * low/fullspeed transfer can "carry over" from one uframe to the next,</div><div class='add'>+ * since the TT just performs downstream transfers in sequence.</div><div class='add'>+ *</div><div class='add'>+ * For example two seperate 100 usec transfers can start in the same uframe,</div><div class='add'>+ * and the second one would "carry over" 75 usecs into the next uframe.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+periodic_tt_usecs (</div><div class='add'>+	struct ehci_hcd *ehci,</div><div class='add'>+	struct usb_device *dev,</div><div class='add'>+	unsigned frame,</div><div class='add'>+	unsigned short tt_usecs[8]</div><div class='add'>+)</div><div class='add'>+{</div><div class='add'>+	__le32			*hw_p = &amp;ehci-&gt;periodic [frame];</div><div class='add'>+	union ehci_shadow	*q = &amp;ehci-&gt;pshadow [frame];</div><div class='add'>+	unsigned char		uf;</div><div class='add'>+</div><div class='add'>+	memset(tt_usecs, 0, 16);</div><div class='add'>+</div><div class='add'>+	while (q-&gt;ptr) {</div><div class='add'>+		switch (Q_NEXT_TYPE(*hw_p)) {</div><div class='add'>+		case Q_TYPE_ITD:</div><div class='add'>+			hw_p = &amp;q-&gt;itd-&gt;hw_next;</div><div class='add'>+			q = &amp;q-&gt;itd-&gt;itd_next;</div><div class='add'>+			continue;</div><div class='add'>+		case Q_TYPE_QH:</div><div class='add'>+			if (same_tt(dev, q-&gt;qh-&gt;dev)) {</div><div class='add'>+				uf = tt_start_uframe(ehci, q-&gt;qh-&gt;hw_info2);</div><div class='add'>+				tt_usecs[uf] += q-&gt;qh-&gt;tt_usecs;</div><div class='add'>+			}</div><div class='add'>+			hw_p = &amp;q-&gt;qh-&gt;hw_next;</div><div class='add'>+			q = &amp;q-&gt;qh-&gt;qh_next;</div><div class='add'>+			continue;</div><div class='add'>+		case Q_TYPE_SITD:</div><div class='add'>+			if (same_tt(dev, q-&gt;sitd-&gt;urb-&gt;dev)) {</div><div class='add'>+				uf = tt_start_uframe(ehci, q-&gt;sitd-&gt;hw_uframe);</div><div class='add'>+				tt_usecs[uf] += q-&gt;sitd-&gt;stream-&gt;tt_usecs;</div><div class='add'>+			}</div><div class='add'>+			hw_p = &amp;q-&gt;sitd-&gt;hw_next;</div><div class='add'>+			q = &amp;q-&gt;sitd-&gt;sitd_next;</div><div class='add'>+			continue;</div><div class='add'>+		// case Q_TYPE_FSTN:</div><div class='add'>+		default:</div><div class='add'>+			ehci_dbg(ehci,</div><div class='add'>+				  "ignoring periodic frame %d FSTN\n", frame);</div><div class='add'>+			hw_p = &amp;q-&gt;fstn-&gt;hw_next;</div><div class='add'>+			q = &amp;q-&gt;fstn-&gt;fstn_next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	carryover_tt_bandwidth(tt_usecs);</div><div class='add'>+</div><div class='add'>+	if (max_tt_usecs[7] &lt; tt_usecs[7])</div><div class='add'>+		ehci_err(ehci, "frame %d tt sched overrun: %d usecs\n",</div><div class='add'>+			frame, tt_usecs[7] - max_tt_usecs[7]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Return true if the device's tt's downstream bus is available for a</div><div class='add'>+ * periodic transfer of the specified length (usecs), starting at the</div><div class='add'>+ * specified frame/uframe.  Note that (as summarized in section 11.19</div><div class='add'>+ * of the usb 2.0 spec) TTs can buffer multiple transactions for each</div><div class='add'>+ * uframe.</div><div class='add'>+ *</div><div class='add'>+ * The uframe parameter is when the fullspeed/lowspeed transfer</div><div class='add'>+ * should be executed in "B-frame" terms, which is the same as the</div><div class='add'>+ * highspeed ssplit's uframe (which is in "H-frame" terms).  For example</div><div class='add'>+ * a ssplit in "H-frame" 0 causes a transfer in "B-frame" 0.</div><div class='add'>+ * See the EHCI spec sec 4.5 and fig 4.7.</div><div class='add'>+ *</div><div class='add'>+ * This checks if the full/lowspeed bus, at the specified starting uframe,</div><div class='add'>+ * has the specified bandwidth available, according to rules listed</div><div class='add'>+ * in USB 2.0 spec section 11.18.1 fig 11-60.</div><div class='add'>+ *</div><div class='add'>+ * This does not check if the transfer would exceed the max ssplit</div><div class='add'>+ * limit of 16, specified in USB 2.0 spec section 11.18.4 requirement #4,</div><div class='add'>+ * since proper scheduling limits ssplits to less than 16 per uframe.</div><div class='add'>+ */</div><div class='add'>+static int tt_available (</div><div class='add'>+	struct ehci_hcd		*ehci,</div><div class='add'>+	unsigned		period,</div><div class='add'>+	struct usb_device	*dev,</div><div class='add'>+	unsigned		frame,</div><div class='add'>+	unsigned		uframe,</div><div class='add'>+	u16			usecs</div><div class='add'>+)</div><div class='add'>+{</div><div class='add'>+	if ((period == 0) || (uframe &gt;= 7))	/* error */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (; frame &lt; ehci-&gt;periodic_size; frame += period) {</div><div class='add'>+		unsigned short tt_usecs[8];</div><div class='add'>+</div><div class='add'>+		periodic_tt_usecs (ehci, dev, frame, tt_usecs);</div><div class='add'>+</div><div class='add'>+		ehci_vdbg(ehci, "tt frame %d check %d usecs start uframe %d in"</div><div class='add'>+			" schedule %d/%d/%d/%d/%d/%d/%d/%d\n",</div><div class='add'>+			frame, usecs, uframe,</div><div class='add'>+			tt_usecs[0], tt_usecs[1], tt_usecs[2], tt_usecs[3],</div><div class='add'>+			tt_usecs[4], tt_usecs[5], tt_usecs[6], tt_usecs[7]);</div><div class='add'>+</div><div class='add'>+		if (max_tt_usecs[uframe] &lt;= tt_usecs[uframe]) {</div><div class='add'>+			ehci_vdbg(ehci, "frame %d uframe %d fully scheduled\n",</div><div class='add'>+				frame, uframe);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* special case for isoc transfers larger than 125us:</div><div class='add'>+		 * the first and each subsequent fully used uframe</div><div class='add'>+		 * must be empty, so as to not illegally delay</div><div class='add'>+		 * already scheduled transactions</div><div class='add'>+		 */</div><div class='add'>+		if (125 &lt; usecs) {</div><div class='add'>+			int ufs = (usecs / 125) - 1;</div><div class='add'>+			int i;</div><div class='add'>+			for (i = uframe; i &lt; (uframe + ufs) &amp;&amp; i &lt; 8; i++)</div><div class='add'>+				if (0 &lt; tt_usecs[i]) {</div><div class='add'>+					ehci_vdbg(ehci,</div><div class='add'>+						"multi-uframe xfer can't fit "</div><div class='add'>+						"in frame %d uframe %d\n",</div><div class='add'>+						frame, i);</div><div class='add'>+					return 0;</div><div class='add'>+				}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tt_usecs[uframe] += usecs;</div><div class='add'>+</div><div class='add'>+		carryover_tt_bandwidth(tt_usecs);</div><div class='add'>+</div><div class='add'>+		/* fail if the carryover pushed bw past the last uframe's limit */</div><div class='add'>+		if (max_tt_usecs[7] &lt; tt_usecs[7]) {</div><div class='add'>+			ehci_vdbg(ehci,</div><div class='add'>+				"tt unavailable usecs %d frame %d uframe %d\n",</div><div class='add'>+				usecs, frame, uframe);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='ctx'> /* return true iff the device's transaction translator is available</div><div class='ctx'>  * for a periodic transfer starting at the specified frame, using</div><div class='ctx'>  * all the uframes in the mask.</div><div class='hunk'>@@ -237,6 +421,8 @@ static int tt_no_collision (</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* CONFIG_USB_EHCI_TT_NEWSCHED */</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static int enable_periodic (struct ehci_hcd *ehci)</div><div class='hunk'>@@ -481,7 +667,7 @@ static int check_intr_schedule (</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='ctx'>     	int		retval = -ENOSPC;</div><div class='del'>-	u8		mask;</div><div class='add'>+	u8		mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (qh-&gt;c_usecs &amp;&amp; uframe &gt;= 6)		/* FSTN territory? */</div><div class='ctx'> 		goto done;</div><div class='hunk'>@@ -494,6 +680,24 @@ static int check_intr_schedule (</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_EHCI_TT_NEWSCHED</div><div class='add'>+	if (tt_available (ehci, qh-&gt;period, qh-&gt;dev, frame, uframe,</div><div class='add'>+				qh-&gt;tt_usecs)) {</div><div class='add'>+		unsigned i;</div><div class='add'>+</div><div class='add'>+		/* TODO : this may need FSTN for SSPLIT in uframe 5. */</div><div class='add'>+		for (i=uframe+1; i&lt;8 &amp;&amp; i&lt;uframe+4; i++)</div><div class='add'>+			if (!check_period (ehci, frame, i,</div><div class='add'>+						qh-&gt;period, qh-&gt;c_usecs))</div><div class='add'>+				goto done;</div><div class='add'>+			else</div><div class='add'>+				mask |= 1 &lt;&lt; i;</div><div class='add'>+</div><div class='add'>+		retval = 0;</div><div class='add'>+</div><div class='add'>+		*c_maskp = cpu_to_le32 (mask &lt;&lt; 8);</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='ctx'> 	/* Make sure this tt's buffer is also available for CSPLITs.</div><div class='ctx'> 	 * We pessimize a bit; probably the typical full speed case</div><div class='ctx'> 	 * doesn't need the second CSPLIT.</div><div class='hunk'>@@ -514,6 +718,7 @@ static int check_intr_schedule (</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> done:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -1047,12 +1252,21 @@ sitd_slot_ok (</div><div class='ctx'> 		frame = uframe &gt;&gt; 3;</div><div class='ctx'> 		uf = uframe &amp; 7;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_EHCI_TT_NEWSCHED</div><div class='add'>+		/* The tt's fullspeed bus bandwidth must be available.</div><div class='add'>+		 * tt_available scheduling guarantees 10+% for control/bulk.</div><div class='add'>+		 */</div><div class='add'>+		if (!tt_available (ehci, period_uframes &lt;&lt; 3,</div><div class='add'>+				stream-&gt;udev, frame, uf, stream-&gt;tt_usecs))</div><div class='add'>+			return 0;</div><div class='add'>+#else</div><div class='ctx'> 		/* tt must be idle for start(s), any gap, and csplit.</div><div class='ctx'> 		 * assume scheduling slop leaves 10+% for control/bulk.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!tt_no_collision (ehci, period_uframes &lt;&lt; 3,</div><div class='ctx'> 				stream-&gt;udev, frame, mask))</div><div class='ctx'> 			return 0;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 		/* check starts (OUT uses more than one) */</div><div class='ctx'> 		max_used = 100 - stream-&gt;usecs;</div><div class='head'>diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c<br/>index 2fe7fd19437b..61e571782cf7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/hc_crisv10.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/hc_crisv10.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/hc_crisv10.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/hc_crisv10.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * Copyright (c) 2002, 2003 Axis Communications AB.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='hunk'>@@ -411,8 +410,7 @@ static inline void urb_list_move_last(struct urb *urb, int epid)</div><div class='ctx'> 	urb_entry_t *urb_entry = __urb_list_entry(urb, epid);</div><div class='ctx'> 	assert(urb_entry);</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;urb_entry-&gt;list);</div><div class='del'>-	list_add_tail(&amp;urb_entry-&gt;list, &amp;urb_list[epid]);</div><div class='add'>+	list_move_tail(&amp;urb_entry-&gt;list, &amp;urb_list[epid]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Get the next urb in the list. */</div><div class='head'>diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c<br/>index e99210b7909b..5147ed4a6662 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/isp116x-hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/isp116x-hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/isp116x-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/isp116x-hcd.c</a></div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_isp116x.h&gt;</div><div class='add'>+#include &lt;linux/usb/isp116x.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -781,7 +781,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,</div><div class='ctx'> 		if (ep-&gt;branch &lt; PERIODIC_SIZE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		ret = ep-&gt;branch = balance(isp116x, ep-&gt;period, ep-&gt;load);</div><div class='add'>+		ep-&gt;branch = ret = balance(isp116x, ep-&gt;period, ep-&gt;load);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -1653,7 +1653,7 @@ static int __init isp116x_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err6;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = usb_add_hcd(hcd, irq, SA_INTERRUPT);</div><div class='add'>+	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err6;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c<br/>index 6b7350b52419..cdbafb710000 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-at91.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-at91.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-at91.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-at91.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ int usb_hcd_at91_probe (const struct hc_driver *driver, struct platform_device *</div><div class='ctx'> 	at91_start_hc(pdev);</div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, pdev-&gt;resource[1].start, SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, pdev-&gt;resource[1].start, IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c<br/>index a1c8b3b2fcc7..822914e2f43b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-au1xxx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-au1xxx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-au1xxx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-au1xxx.c</a></div><div class='hunk'>@@ -101,13 +101,16 @@ static void au1xxx_start_ohc(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> #endif  /* Au1200 */</div><div class='ctx'> </div><div class='add'>+#ifndef CONFIG_SOC_AU1200</div><div class='ctx'> 	/* wait for reset complete (read register twice; see au1500 errata) */</div><div class='ctx'> 	while (au_readl(USB_HOST_CONFIG),</div><div class='ctx'> 		!(au_readl(USB_HOST_CONFIG) &amp; USBH_ENABLE_RD))</div><div class='add'>+#endif</div><div class='ctx'> 		udelay(1000);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG __FILE__</div><div class='ctx'> 	": Clock to USB host has been enabled \n");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void au1xxx_stop_ohc(struct platform_device *dev)</div><div class='hunk'>@@ -157,9 +160,9 @@ static int usb_ohci_au1xxx_probe(const struct hc_driver *driver,</div><div class='ctx'> 	/* Au1200 AB USB does not support coherent memory */</div><div class='ctx'> 	if (!(read_c0_prid() &amp; 0xff)) {</div><div class='ctx'> 		pr_info("%s: this is chip revision AB !!\n",</div><div class='del'>-			dev-&gt;dev.name);</div><div class='add'>+			dev-&gt;name);</div><div class='ctx'> 		pr_info("%s: update your board or re-configure the kernel\n",</div><div class='del'>-			dev-&gt;dev.name);</div><div class='add'>+			dev-&gt;name);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -191,7 +194,7 @@ static int usb_ohci_au1xxx_probe(const struct hc_driver *driver,</div><div class='ctx'> 	au1xxx_start_ohc(dev);</div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, SA_INTERRUPT | SA_SHIRQ);</div><div class='add'>+	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, IRQF_DISABLED | IRQF_SHARED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c<br/>new file mode 100644<br/>index 000000000000..6531c4d26527<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-ep93xx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-ep93xx.c</a></div><div class='hunk'>@@ -0,0 +1,225 @@</div><div class='add'>+/*</div><div class='add'>+ * OHCI HCD (Host Controller Driver) for USB.</div><div class='add'>+ *</div><div class='add'>+ * (C) Copyright 1999 Roman Weissgaerber &lt;weissg@vienna.at&gt;</div><div class='add'>+ * (C) Copyright 2000-2002 David Brownell &lt;dbrownell@users.sourceforge.net&gt;</div><div class='add'>+ * (C) Copyright 2002 Hewlett-Packard Company</div><div class='add'>+ *</div><div class='add'>+ * Bus Glue for ep93xx.</div><div class='add'>+ *</div><div class='add'>+ * Written by Christopher Hoover &lt;ch@hpl.hp.com&gt;</div><div class='add'>+ * Based on fragments of previous driver by Russell King et al.</div><div class='add'>+ *</div><div class='add'>+ * Modified for LH7A404 from ohci-sa1111.c</div><div class='add'>+ *  by Durgesh Pattamatta &lt;pattamattad@sharpsec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Modified for pxa27x from ohci-lh7a404.c</div><div class='add'>+ *  by Nick Bane &lt;nick@cecomputing.co.uk&gt; 26-8-2004</div><div class='add'>+ *</div><div class='add'>+ * Modified for ep93xx from ohci-pxa27x.c</div><div class='add'>+ *  by Lennert Buytenhek &lt;buytenh@wantstofly.org&gt; 28-2-2006</div><div class='add'>+ *  Based on an earlier driver by Ray Lehtiniemi</div><div class='add'>+ *</div><div class='add'>+ * This file is licenced under the GPL.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/mach-types.h&gt;</div><div class='add'>+#include &lt;asm/hardware.h&gt;</div><div class='add'>+</div><div class='add'>+static struct clk *usb_host_clock;</div><div class='add'>+</div><div class='add'>+static void ep93xx_start_hc(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	clk_enable(usb_host_clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ep93xx_stop_hc(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	clk_disable(usb_host_clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,</div><div class='add'>+			 struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	struct usb_hcd *hcd;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;resource[1].flags != IORESOURCE_IRQ) {</div><div class='add'>+		pr_debug("resource[1] is not IORESOURCE_IRQ");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hcd = usb_create_hcd(driver, &amp;pdev-&gt;dev, "ep93xx");</div><div class='add'>+	if (hcd == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hcd-&gt;rsrc_start = pdev-&gt;resource[0].start;</div><div class='add'>+	hcd-&gt;rsrc_len = pdev-&gt;resource[0].end - pdev-&gt;resource[0].start + 1;</div><div class='add'>+	if (!request_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len, hcd_name)) {</div><div class='add'>+		usb_put_hcd(hcd);</div><div class='add'>+		retval = -EBUSY;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hcd-&gt;regs = ioremap(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='add'>+	if (hcd-&gt;regs == NULL) {</div><div class='add'>+		pr_debug("ioremap failed");</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto err2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_host_clock = clk_get(&amp;pdev-&gt;dev, "usb_host");</div><div class='add'>+	ep93xx_start_hc(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='add'>+</div><div class='add'>+	retval = usb_add_hcd(hcd, pdev-&gt;resource[1].start, SA_INTERRUPT);</div><div class='add'>+	if (retval == 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	ep93xx_stop_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	iounmap(hcd-&gt;regs);</div><div class='add'>+err2:</div><div class='add'>+	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='add'>+err1:</div><div class='add'>+	usb_put_hcd(hcd);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb_hcd_ep93xx_remove(struct usb_hcd *hcd,</div><div class='add'>+			struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	usb_remove_hcd(hcd);</div><div class='add'>+	ep93xx_stop_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	clk_put(usb_host_clock);</div><div class='add'>+	iounmap(hcd-&gt;regs);</div><div class='add'>+	release_mem_region(hcd-&gt;rsrc_start, hcd-&gt;rsrc_len);</div><div class='add'>+	usb_put_hcd(hcd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit ohci_ep93xx_start(struct usb_hcd *hcd)</div><div class='add'>+{</div><div class='add'>+	struct ohci_hcd *ohci = hcd_to_ohci(hcd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = ohci_init(ohci)) &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = ohci_run(ohci)) &lt; 0) {</div><div class='add'>+		err("can't start %s", hcd-&gt;self.bus_name);</div><div class='add'>+		ohci_stop(hcd);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hc_driver ohci_ep93xx_hc_driver = {</div><div class='add'>+	.description		= hcd_name,</div><div class='add'>+	.product_desc		= "EP93xx OHCI",</div><div class='add'>+	.hcd_priv_size		= sizeof(struct ohci_hcd),</div><div class='add'>+	.irq			= ohci_irq,</div><div class='add'>+	.flags			= HCD_USB11 | HCD_MEMORY,</div><div class='add'>+	.start			= ohci_ep93xx_start,</div><div class='add'>+	.stop			= ohci_stop,</div><div class='add'>+	.urb_enqueue		= ohci_urb_enqueue,</div><div class='add'>+	.urb_dequeue		= ohci_urb_dequeue,</div><div class='add'>+	.endpoint_disable	= ohci_endpoint_disable,</div><div class='add'>+	.get_frame_number	= ohci_get_frame,</div><div class='add'>+	.hub_status_data	= ohci_hub_status_data,</div><div class='add'>+	.hub_control		= ohci_hub_control,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.bus_suspend		= ohci_bus_suspend,</div><div class='add'>+	.bus_resume		= ohci_bus_resume,</div><div class='add'>+#endif</div><div class='add'>+	.start_port_reset	= ohci_start_port_reset,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern int usb_disabled(void);</div><div class='add'>+</div><div class='add'>+static int ohci_hcd_ep93xx_drv_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = -ENODEV;</div><div class='add'>+	if (!usb_disabled())</div><div class='add'>+		ret = usb_hcd_ep93xx_probe(&amp;ohci_ep93xx_hc_driver, pdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ohci_hcd_ep93xx_drv_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	usb_hcd_ep93xx_remove(hcd, pdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='add'>+	struct ochi_hcd *ohci = hcd_to_ohci(hcd);</div><div class='add'>+</div><div class='add'>+	if (time_before(jiffies, ohci-&gt;next_statechange))</div><div class='add'>+		msleep(5);</div><div class='add'>+	ohci-&gt;next_statechange = jiffies;</div><div class='add'>+</div><div class='add'>+	ep93xx_stop_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	hcd-&gt;state = HC_STATE_SUSPENDED;</div><div class='add'>+	pdev-&gt;dev.power.power_state = PMSG_SUSPEND;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct usb_hcd *hcd = platform_get_drvdata(pdev);</div><div class='add'>+	struct ohci_hcd *ohci = hcd_to_ohci(hcd);</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (time_before(jiffies, ohci-&gt;next_statechange))</div><div class='add'>+		msleep(5);</div><div class='add'>+	ohci-&gt;next_statechange = jiffies;</div><div class='add'>+</div><div class='add'>+	ep93xx_start_hc(&amp;pdev-&gt;dev);</div><div class='add'>+	pdev-&gt;dev.power.power_state = PMSG_ON;</div><div class='add'>+	usb_hcd_resume_root_hub(hcd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static struct platform_driver ohci_hcd_ep93xx_driver = {</div><div class='add'>+	.probe		= ohci_hcd_ep93xx_drv_probe,</div><div class='add'>+	.remove		= ohci_hcd_ep93xx_drv_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= ohci_hcd_ep93xx_drv_suspend,</div><div class='add'>+	.resume		= ohci_hcd_ep93xx_drv_resume,</div><div class='add'>+#endif</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "ep93xx-ohci",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ohci_hcd_ep93xx_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;ohci_hcd_ep93xx_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ohci_hcd_ep93xx_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;ohci_hcd_ep93xx_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ohci_hcd_ep93xx_init);</div><div class='add'>+module_exit(ohci_hcd_ep93xx_cleanup);</div><div class='head'>diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c<br/>index 73f5a379d9b3..afef5ac35b4a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-hcd.c</a></div><div class='hunk'>@@ -74,7 +74,6 @@</div><div class='ctx'>  * This file is licenced under the GPL.</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -902,6 +901,10 @@ MODULE_LICENSE ("GPL");</div><div class='ctx'> #include "ohci-pxa27x.c"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_ARCH_EP93XX</div><div class='add'>+#include "ohci-ep93xx.c"</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SOC_AU1X00</div><div class='ctx'> #include "ohci-au1xxx.c"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -920,6 +923,7 @@ MODULE_LICENSE ("GPL");</div><div class='ctx'>       || defined(CONFIG_ARCH_OMAP) \</div><div class='ctx'>       || defined (CONFIG_ARCH_LH7A404) \</div><div class='ctx'>       || defined (CONFIG_PXA27x) \</div><div class='add'>+      || defined (CONFIG_ARCH_EP93XX) \</div><div class='ctx'>       || defined (CONFIG_SOC_AU1X00) \</div><div class='ctx'>       || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \</div><div class='ctx'>       || defined (CONFIG_ARCH_AT91RM9200) \</div><div class='head'>diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c<br/>index 0bb972b58336..5b0a23fd798b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-hub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-hub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-hub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-hub.c</a></div><div class='hunk'>@@ -581,14 +581,14 @@ static int ohci_hub_control (</div><div class='ctx'> 		break;</div><div class='ctx'> 	case GetHubStatus:</div><div class='ctx'> 		temp = roothub_status (ohci) &amp; ~(RH_HS_CRWE | RH_HS_DRWE);</div><div class='del'>-		*(__le32 *) buf = cpu_to_le32 (temp);</div><div class='add'>+		put_unaligned(cpu_to_le32 (temp), (__le32 *) buf);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case GetPortStatus:</div><div class='ctx'> 		if (!wIndex || wIndex &gt; ports)</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		wIndex--;</div><div class='ctx'> 		temp = roothub_portstatus (ohci, wIndex);</div><div class='del'>-		*(__le32 *) buf = cpu_to_le32 (temp);</div><div class='add'>+		put_unaligned(cpu_to_le32 (temp), (__le32 *) buf);</div><div class='ctx'> </div><div class='ctx'> #ifndef	OHCI_VERBOSE_DEBUG</div><div class='ctx'> 	if (*(u16*)(buf+2))	/* only if wPortChange is interesting */</div><div class='head'>diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c<br/>index 0020ed7a39d0..5602da9bd52c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-lh7a404.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-lh7a404.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-lh7a404.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-lh7a404.c</a></div><div class='hunk'>@@ -100,7 +100,7 @@ int usb_hcd_lh7a404_probe (const struct hc_driver *driver,</div><div class='ctx'> 	lh7a404_start_hc(dev);</div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c<br/>index ca19abe01c53..c4c4babd4767 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-omap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-omap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-omap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-omap.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'>  * This file is licenced under the GPL.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/signal.h&gt;	/* SA_INTERRUPT */</div><div class='add'>+#include &lt;linux/signal.h&gt;	/* IRQF_DISABLED */</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -334,7 +334,7 @@ int usb_hcd_omap_probe (const struct hc_driver *driver,</div><div class='ctx'> 		retval = -ENXIO;</div><div class='ctx'> 		goto err2;</div><div class='ctx'> 	}</div><div class='del'>-	retval = usb_add_hcd(hcd, irq, SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c<br/>index b2a8dfa48870..9fe56ff1615d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-ppc-soc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-ppc-soc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-ppc-soc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-ppc-soc.c</a></div><div class='hunk'>@@ -75,7 +75,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,</div><div class='ctx'> 	ohci-&gt;flags |= OHCI_BIG_ENDIAN;</div><div class='ctx'> 	ohci_hcd_init(ohci);</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, irq, SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c<br/>index acde8868da21..6f559e102789 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-pxa27x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-pxa27x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-pxa27x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-pxa27x.c</a></div><div class='hunk'>@@ -185,9 +185,12 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device</div><div class='ctx'> 	/* Select Power Management Mode */</div><div class='ctx'> 	pxa27x_ohci_select_pmm(inf-&gt;port_mode);</div><div class='ctx'> </div><div class='add'>+	if (inf-&gt;power_budget)</div><div class='add'>+		hcd-&gt;power_budget = inf-&gt;power_budget;</div><div class='add'>+</div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, pdev-&gt;resource[1].start, SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, pdev-&gt;resource[1].start, IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c<br/>index 1da5de573a6f..d2fc6969a9f7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-s3c2410.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-s3c2410.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-s3c2410.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-s3c2410.c</a></div><div class='hunk'>@@ -388,7 +388,7 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver,</div><div class='ctx'> </div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, dev-&gt;resource[1].start, IRQF_DISABLED);</div><div class='ctx'> 	if (retval != 0)</div><div class='ctx'> 		goto err_ioremap;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c<br/>index fb3221ebbb29..ce3de106cadc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-sa1111.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/ohci-sa1111.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/ohci-sa1111.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/ohci-sa1111.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver,</div><div class='ctx'> 	sa1111_start_hc(dev);</div><div class='ctx'> 	ohci_hcd_init(hcd_to_ohci(hcd));</div><div class='ctx'> </div><div class='del'>-	retval = usb_add_hcd(hcd, dev-&gt;irq[1], SA_INTERRUPT);</div><div class='add'>+	retval = usb_add_hcd(hcd, dev-&gt;irq[1], IRQF_DISABLED);</div><div class='ctx'> 	if (retval == 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c<br/>index 1045f846fbe2..20861650905e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/pci-quirks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/pci-quirks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/pci-quirks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/pci-quirks.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  (and others)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -168,8 +167,6 @@ static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx)</div><div class='ctx'> static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *base;</div><div class='del'>-	int wait_time;</div><div class='del'>-	u32 control;</div><div class='ctx'> </div><div class='ctx'> 	if (!mmio_resource_enabled(pdev, 0))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -180,9 +177,10 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> /* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */</div><div class='ctx'> #ifndef __hppa__</div><div class='del'>-	control = readl(base + OHCI_CONTROL);</div><div class='add'>+{</div><div class='add'>+	u32 control = readl(base + OHCI_CONTROL);</div><div class='ctx'> 	if (control &amp; OHCI_CTRL_IR) {</div><div class='del'>-		wait_time = 500; /* arbitrary; 5 seconds */</div><div class='add'>+		int wait_time = 500; /* arbitrary; 5 seconds */</div><div class='ctx'> 		writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);</div><div class='ctx'> 		writel(OHCI_OCR, base + OHCI_CMDSTATUS);</div><div class='ctx'> 		while (wait_time &gt; 0 &amp;&amp;</div><div class='hunk'>@@ -199,6 +197,7 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)</div><div class='ctx'> 		/* reset controller, preserving RWC */</div><div class='ctx'> 		writel(control &amp; OHCI_CTRL_RWC, base + OHCI_CONTROL);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c<br/>index a92343052751..fa34092bbcde 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/sl811-hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/sl811-hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/sl811-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/sl811-hcd.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #undef	VERBOSE</div><div class='ctx'> #undef	PACKET_TRACE</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -46,7 +45,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_sl811.h&gt;</div><div class='add'>+#include &lt;linux/usb/sl811.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -1684,9 +1683,13 @@ sl811h_probe(struct platform_device *dev)</div><div class='ctx'> 		if (!addr || !data)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		ioaddr = 1;</div><div class='del'>-</div><div class='del'>-		addr_reg = (void __iomem *) addr-&gt;start;</div><div class='del'>-		data_reg = (void __iomem *) data-&gt;start;</div><div class='add'>+		/*</div><div class='add'>+		 * NOTE: 64-bit resource-&gt;start is getting truncated</div><div class='add'>+		 * to avoid compiler warning, assuming that -&gt;start</div><div class='add'>+		 * is always 32-bit for this case</div><div class='add'>+		 */</div><div class='add'>+		addr_reg = (void __iomem *) (unsigned long) addr-&gt;start;</div><div class='add'>+		data_reg = (void __iomem *) (unsigned long) data-&gt;start;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		addr_reg = ioremap(addr-&gt;start, 1);</div><div class='ctx'> 		if (addr_reg == NULL) {</div><div class='hunk'>@@ -1746,7 +1749,7 @@ sl811h_probe(struct platform_device *dev)</div><div class='ctx'> 	 * was on a system with single edge triggering, so most sorts of</div><div class='ctx'> 	 * triggering arrangement should work.</div><div class='ctx'> 	 */</div><div class='del'>-	retval = usb_add_hcd(hcd, irq, SA_INTERRUPT | SA_SHIRQ);</div><div class='add'>+	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);</div><div class='ctx'> 	if (retval != 0)</div><div class='ctx'> 		goto err6;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c<br/>index 302aa1ec312f..54f554e0f0ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/sl811_cs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/sl811_cs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/sl811_cs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/sl811_cs.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> #include &lt;pcmcia/cisreg.h&gt;</div><div class='ctx'> #include &lt;pcmcia/ds.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/usb_sl811.h&gt;</div><div class='add'>+#include &lt;linux/usb/sl811.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Botond Botyanszki");</div><div class='ctx'> MODULE_DESCRIPTION("REX-CFU1U PCMCIA driver for 2.6");</div><div class='head'>diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c<br/>index e1239319655c..dc286a48cafd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/uhci-debug.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * (C) Copyright 1999-2001 Johannes Erdfelt</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='hunk'>@@ -98,6 +97,7 @@ static int uhci_show_urbp(struct urb_priv *urbp, char *buf, int len, int space)</div><div class='ctx'> 	char *out = buf;</div><div class='ctx'> 	struct uhci_td *td;</div><div class='ctx'> 	int i, nactive, ninactive;</div><div class='add'>+	char *ptype;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; 200)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -110,13 +110,15 @@ static int uhci_show_urbp(struct urb_priv *urbp, char *buf, int len, int space)</div><div class='ctx'> 			(usb_pipein(urbp-&gt;urb-&gt;pipe) ? "IN" : "OUT"));</div><div class='ctx'> </div><div class='ctx'> 	switch (usb_pipetype(urbp-&gt;urb-&gt;pipe)) {</div><div class='del'>-	case PIPE_ISOCHRONOUS: out += sprintf(out, "ISO"); break;</div><div class='del'>-	case PIPE_INTERRUPT: out += sprintf(out, "INT"); break;</div><div class='del'>-	case PIPE_BULK: out += sprintf(out, "BLK"); break;</div><div class='del'>-	case PIPE_CONTROL: out += sprintf(out, "CTL"); break;</div><div class='add'>+	case PIPE_ISOCHRONOUS: ptype = "ISO"; break;</div><div class='add'>+	case PIPE_INTERRUPT: ptype = "INT"; break;</div><div class='add'>+	case PIPE_BULK: ptype = "BLK"; break;</div><div class='add'>+	default:</div><div class='add'>+	case PIPE_CONTROL: ptype = "CTL"; break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	out += sprintf(out, "%s", (urbp-&gt;fsbr ? " FSBR" : ""));</div><div class='add'>+	out += sprintf(out, "%s%s", ptype, (urbp-&gt;fsbr ? " FSBR" : ""));</div><div class='add'>+	out += sprintf(out, " Actlen=%d", urbp-&gt;urb-&gt;actual_length);</div><div class='ctx'> </div><div class='ctx'> 	if (urbp-&gt;urb-&gt;status != -EINPROGRESS)</div><div class='ctx'> 		out += sprintf(out, " Status=%d", urbp-&gt;urb-&gt;status);</div><div class='hunk'>@@ -124,7 +126,8 @@ static int uhci_show_urbp(struct urb_priv *urbp, char *buf, int len, int space)</div><div class='ctx'> </div><div class='ctx'> 	i = nactive = ninactive = 0;</div><div class='ctx'> 	list_for_each_entry(td, &amp;urbp-&gt;td_list, list) {</div><div class='del'>-		if (++i &lt;= 10 || debug &gt; 2) {</div><div class='add'>+		if (urbp-&gt;qh-&gt;type != USB_ENDPOINT_XFER_ISOC &amp;&amp;</div><div class='add'>+				(++i &lt;= 10 || debug &gt; 2)) {</div><div class='ctx'> 			out += sprintf(out, "%*s%d: ", space + 2, "", i);</div><div class='ctx'> 			out += uhci_show_td(td, out, len - (out - buf), 0);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -147,13 +150,27 @@ static int uhci_show_qh(struct uhci_qh *qh, char *buf, int len, int space)</div><div class='ctx'> 	char *out = buf;</div><div class='ctx'> 	int i, nurbs;</div><div class='ctx'> 	__le32 element = qh_element(qh);</div><div class='add'>+	char *qtype;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to make sure there's enough memory */</div><div class='del'>-	if (len &lt; 80 * 6)</div><div class='add'>+	if (len &lt; 80 * 7)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	out += sprintf(out, "%*s[%p] link (%08x) element (%08x)\n", space, "",</div><div class='del'>-			qh, le32_to_cpu(qh-&gt;link), le32_to_cpu(element));</div><div class='add'>+	switch (qh-&gt;type) {</div><div class='add'>+	case USB_ENDPOINT_XFER_ISOC: qtype = "ISO"; break;</div><div class='add'>+	case USB_ENDPOINT_XFER_INT: qtype = "INT"; break;</div><div class='add'>+	case USB_ENDPOINT_XFER_BULK: qtype = "BLK"; break;</div><div class='add'>+	case USB_ENDPOINT_XFER_CONTROL: qtype = "CTL"; break;</div><div class='add'>+	default: qtype = "Skel" ; break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	out += sprintf(out, "%*s[%p] %s QH link (%08x) element (%08x)\n",</div><div class='add'>+			space, "", qh, qtype,</div><div class='add'>+			le32_to_cpu(qh-&gt;link), le32_to_cpu(element));</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_ISOC)</div><div class='add'>+		out += sprintf(out, "%*s    period %d frame %x desc [%p]\n",</div><div class='add'>+				space, "", qh-&gt;period, qh-&gt;iso_frame,</div><div class='add'>+				qh-&gt;iso_packet_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (element &amp; UHCI_PTR_QH)</div><div class='ctx'> 		out += sprintf(out, "%*s  Element points to QH (bug?)\n", space, "");</div><div class='hunk'>@@ -261,7 +278,8 @@ static int uhci_show_root_hub_state(struct uhci_hcd *uhci, char *buf, int len)</div><div class='ctx'> 	    default:</div><div class='ctx'> 		rh_state = "?";			break;</div><div class='ctx'> 	}</div><div class='del'>-	out += sprintf(out, "Root-hub state: %s\n", rh_state);</div><div class='add'>+	out += sprintf(out, "Root-hub state: %s   FSBR: %d\n",</div><div class='add'>+			rh_state, uhci-&gt;fsbr_is_on);</div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -275,7 +293,7 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)</div><div class='ctx'> 	unsigned short portsc1, portsc2;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to make sure there's enough memory */</div><div class='del'>-	if (len &lt; 80 * 6)</div><div class='add'>+	if (len &lt; 80 * 9)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	usbcmd    = inw(io_addr + 0);</div><div class='hunk'>@@ -314,6 +332,10 @@ static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)</div><div class='ctx'> 	out += sprintf(out, "  sof       =       %02x\n", sof);</div><div class='ctx'> 	out += uhci_show_sc(1, portsc1, out, len - (out - buf));</div><div class='ctx'> 	out += uhci_show_sc(2, portsc2, out, len - (out - buf));</div><div class='add'>+	out += sprintf(out, "Most recent frame: %x (%d)   "</div><div class='add'>+			"Last ISO frame: %x (%d)\n",</div><div class='add'>+			uhci-&gt;frame_number, uhci-&gt;frame_number &amp; 1023,</div><div class='add'>+			uhci-&gt;last_iso_frame, uhci-&gt;last_iso_frame &amp; 1023);</div><div class='ctx'> </div><div class='ctx'> 	return out - buf;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c<br/>index d225e11f4055..4151f618602d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-hcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-hcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-hcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/uhci-hcd.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'>  * (C) Copyright 2000 Yggdrasil Computing, Inc. (port of new PCI interface</div><div class='ctx'>  *               support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).</div><div class='ctx'>  * (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)</div><div class='del'>- * (C) Copyright 2004-2005 Alan Stern, stern@rowland.harvard.edu</div><div class='add'>+ * (C) Copyright 2004-2006 Alan Stern, stern@rowland.harvard.edu</div><div class='ctx'>  *</div><div class='ctx'>  * Intel documents this fairly well, and as far as I know there</div><div class='ctx'>  * are no royalties or anything like that, but even so there are</div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -31,7 +30,6 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/unistd.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -88,15 +86,6 @@ static void suspend_rh(struct uhci_hcd *uhci, enum uhci_rh_state new_state);</div><div class='ctx'> static void wakeup_rh(struct uhci_hcd *uhci);</div><div class='ctx'> static void uhci_get_current_frame_number(struct uhci_hcd *uhci);</div><div class='ctx'> </div><div class='del'>-/* If a transfer is still active after this much time, turn off FSBR */</div><div class='del'>-#define IDLE_TIMEOUT	msecs_to_jiffies(50)</div><div class='del'>-#define FSBR_DELAY	msecs_to_jiffies(50)</div><div class='del'>-</div><div class='del'>-/* When we timeout an idle transfer for FSBR, we'll switch it over to */</div><div class='del'>-/* depth first traversal. We'll do it in groups of this number of TDs */</div><div class='del'>-/* to make sure it doesn't hog all of the bandwidth */</div><div class='del'>-#define DEPTH_INTERVAL 5</div><div class='del'>-</div><div class='ctx'> #include "uhci-debug.c"</div><div class='ctx'> #include "uhci-q.c"</div><div class='ctx'> #include "uhci-hub.c"</div><div class='hunk'>@@ -120,22 +109,29 @@ static void finish_reset(struct uhci_hcd *uhci)</div><div class='ctx'> 	uhci-&gt;is_stopped = UHCI_IS_STOPPED;</div><div class='ctx'> 	uhci_to_hcd(uhci)-&gt;state = HC_STATE_HALT;</div><div class='ctx'> 	uhci_to_hcd(uhci)-&gt;poll_rh = 0;</div><div class='add'>+</div><div class='add'>+	uhci-&gt;dead = 0;		/* Full reset resurrects the controller */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Last rites for a defunct/nonfunctional controller</div><div class='ctx'>  * or one we don't want to use any more.</div><div class='ctx'>  */</div><div class='del'>-static void hc_died(struct uhci_hcd *uhci)</div><div class='add'>+static void uhci_hc_died(struct uhci_hcd *uhci)</div><div class='ctx'> {</div><div class='add'>+	uhci_get_current_frame_number(uhci);</div><div class='ctx'> 	uhci_reset_hc(to_pci_dev(uhci_dev(uhci)), uhci-&gt;io_addr);</div><div class='ctx'> 	finish_reset(uhci);</div><div class='del'>-	uhci-&gt;hc_inaccessible = 1;</div><div class='add'>+	uhci-&gt;dead = 1;</div><div class='add'>+</div><div class='add'>+	/* The current frame may already be partway finished */</div><div class='add'>+	++uhci-&gt;frame_number;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Initialize a controller that was newly discovered or has just been</div><div class='del'>- * resumed.  In either case we can't be sure of its previous state.</div><div class='add'>+ * Initialize a controller that was newly discovered or has lost power</div><div class='add'>+ * or otherwise been reset while it was suspended.  In none of these cases</div><div class='add'>+ * can we be sure of its previous state.</div><div class='ctx'>  */</div><div class='ctx'> static void check_and_reset_hc(struct uhci_hcd *uhci)</div><div class='ctx'> {</div><div class='hunk'>@@ -155,7 +151,8 @@ static void configure_hc(struct uhci_hcd *uhci)</div><div class='ctx'> 	outl(uhci-&gt;frame_dma_handle, uhci-&gt;io_addr + USBFLBASEADD);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the current frame number */</div><div class='del'>-	outw(uhci-&gt;frame_number, uhci-&gt;io_addr + USBFRNUM);</div><div class='add'>+	outw(uhci-&gt;frame_number &amp; UHCI_MAX_SOF_NUMBER,</div><div class='add'>+			uhci-&gt;io_addr + USBFRNUM);</div><div class='ctx'> </div><div class='ctx'> 	/* Mark controller as not halted before we enable interrupts */</div><div class='ctx'> 	uhci_to_hcd(uhci)-&gt;state = HC_STATE_SUSPENDED;</div><div class='hunk'>@@ -207,7 +204,8 @@ __acquires(uhci-&gt;lock)</div><div class='ctx'> 	int int_enable;</div><div class='ctx'> </div><div class='ctx'> 	auto_stop = (new_state == UHCI_RH_AUTO_STOPPED);</div><div class='del'>-	dev_dbg(uhci_dev(uhci), "%s%s\n", __FUNCTION__,</div><div class='add'>+	dev_dbg(&amp;uhci_to_hcd(uhci)-&gt;self.root_hub-&gt;dev,</div><div class='add'>+			"%s%s\n", __FUNCTION__,</div><div class='ctx'> 			(auto_stop ? " (auto-stop)" : ""));</div><div class='ctx'> </div><div class='ctx'> 	/* If we get a suspend request when we're already auto-stopped</div><div class='hunk'>@@ -241,27 +239,27 @@ __acquires(uhci-&gt;lock)</div><div class='ctx'> 		spin_unlock_irq(&amp;uhci-&gt;lock);</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 		spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-		if (uhci-&gt;hc_inaccessible)	/* Died */</div><div class='add'>+		if (uhci-&gt;dead)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(inw(uhci-&gt;io_addr + USBSTS) &amp; USBSTS_HCH))</div><div class='del'>-		dev_warn(uhci_dev(uhci), "Controller not stopped yet!\n");</div><div class='add'>+		dev_warn(&amp;uhci_to_hcd(uhci)-&gt;self.root_hub-&gt;dev,</div><div class='add'>+			"Controller not stopped yet!\n");</div><div class='ctx'> </div><div class='ctx'> 	uhci_get_current_frame_number(uhci);</div><div class='del'>-	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	uhci-&gt;rh_state = new_state;</div><div class='ctx'> 	uhci-&gt;is_stopped = UHCI_IS_STOPPED;</div><div class='ctx'> 	uhci_to_hcd(uhci)-&gt;poll_rh = !int_enable;</div><div class='ctx'> </div><div class='ctx'> 	uhci_scan_schedule(uhci, NULL);</div><div class='add'>+	uhci_fsbr_off(uhci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void start_rh(struct uhci_hcd *uhci)</div><div class='ctx'> {</div><div class='ctx'> 	uhci_to_hcd(uhci)-&gt;state = HC_STATE_RUNNING;</div><div class='ctx'> 	uhci-&gt;is_stopped = 0;</div><div class='del'>-	smp_wmb();</div><div class='ctx'> </div><div class='ctx'> 	/* Mark it configured and running with a 64-byte max packet.</div><div class='ctx'> 	 * All interrupts are enabled, even though RESUME won't do anything.</div><div class='hunk'>@@ -278,7 +276,8 @@ static void wakeup_rh(struct uhci_hcd *uhci)</div><div class='ctx'> __releases(uhci-&gt;lock)</div><div class='ctx'> __acquires(uhci-&gt;lock)</div><div class='ctx'> {</div><div class='del'>-	dev_dbg(uhci_dev(uhci), "%s%s\n", __FUNCTION__,</div><div class='add'>+	dev_dbg(&amp;uhci_to_hcd(uhci)-&gt;self.root_hub-&gt;dev,</div><div class='add'>+			"%s%s\n", __FUNCTION__,</div><div class='ctx'> 			uhci-&gt;rh_state == UHCI_RH_AUTO_STOPPED ?</div><div class='ctx'> 				" (auto-start)" : "");</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +292,7 @@ __acquires(uhci-&gt;lock)</div><div class='ctx'> 		spin_unlock_irq(&amp;uhci-&gt;lock);</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> 		spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-		if (uhci-&gt;hc_inaccessible)	/* Died */</div><div class='add'>+		if (uhci-&gt;dead)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		/* End Global Resume and wait for EOP to be sent */</div><div class='hunk'>@@ -345,7 +344,7 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs)</div><div class='ctx'> 							errbuf, ERRBUF_LEN);</div><div class='ctx'> 					lprintk(errbuf);</div><div class='ctx'> 				}</div><div class='del'>-				hc_died(uhci);</div><div class='add'>+				uhci_hc_died(uhci);</div><div class='ctx'> </div><div class='ctx'> 				/* Force a callback in case there are</div><div class='ctx'> 				 * pending unlinks */</div><div class='hunk'>@@ -368,12 +367,21 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Store the current frame number in uhci-&gt;frame_number if the controller</div><div class='del'>- * is runnning</div><div class='add'>+ * is runnning.  Expand from 11 bits (of which we use only 10) to a</div><div class='add'>+ * full-sized integer.</div><div class='add'>+ *</div><div class='add'>+ * Like many other parts of the driver, this code relies on being polled</div><div class='add'>+ * more than once per second as long as the controller is running.</div><div class='ctx'>  */</div><div class='ctx'> static void uhci_get_current_frame_number(struct uhci_hcd *uhci)</div><div class='ctx'> {</div><div class='del'>-	if (!uhci-&gt;is_stopped)</div><div class='del'>-		uhci-&gt;frame_number = inw(uhci-&gt;io_addr + USBFRNUM);</div><div class='add'>+	if (!uhci-&gt;is_stopped) {</div><div class='add'>+		unsigned delta;</div><div class='add'>+</div><div class='add'>+		delta = (inw(uhci-&gt;io_addr + USBFRNUM) - uhci-&gt;frame_number) &amp;</div><div class='add'>+				(UHCI_NUMFRAMES - 1);</div><div class='add'>+		uhci-&gt;frame_number += delta;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -407,7 +415,7 @@ static void release_uhci(struct uhci_hcd *uhci)</div><div class='ctx'> 			uhci-&gt;frame, uhci-&gt;frame_dma_handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int uhci_reset(struct usb_hcd *hcd)</div><div class='add'>+static int uhci_init(struct usb_hcd *hcd)</div><div class='ctx'> {</div><div class='ctx'> 	struct uhci_hcd *uhci = hcd_to_uhci(hcd);</div><div class='ctx'> 	unsigned io_size = (unsigned) hcd-&gt;rsrc_len;</div><div class='hunk'>@@ -459,7 +467,7 @@ static void uhci_shutdown(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_hcd *hcd = (struct usb_hcd *) pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	hc_died(hcd_to_uhci(hcd));</div><div class='add'>+	uhci_hc_died(hcd_to_uhci(hcd));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -487,14 +495,10 @@ static int uhci_start(struct usb_hcd *hcd)</div><div class='ctx'> </div><div class='ctx'> 	hcd-&gt;uses_new_polling = 1;</div><div class='ctx'> </div><div class='del'>-	uhci-&gt;fsbr = 0;</div><div class='del'>-	uhci-&gt;fsbrtimeout = 0;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;uhci-&gt;lock);</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;uhci-&gt;td_remove_list);</div><div class='add'>+	setup_timer(&amp;uhci-&gt;fsbr_timer, uhci_fsbr_timeout,</div><div class='add'>+			(unsigned long) uhci);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;uhci-&gt;idle_qh_list);</div><div class='del'>-</div><div class='ctx'> 	init_waitqueue_head(&amp;uhci-&gt;waitqh);</div><div class='ctx'> </div><div class='ctx'> 	if (DEBUG_CONFIGURED) {</div><div class='hunk'>@@ -665,11 +669,12 @@ static void uhci_stop(struct usb_hcd *hcd)</div><div class='ctx'> 	struct uhci_hcd *uhci = hcd_to_uhci(hcd);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-	if (!uhci-&gt;hc_inaccessible)</div><div class='del'>-		hc_died(uhci);</div><div class='add'>+	if (test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags) &amp;&amp; !uhci-&gt;dead)</div><div class='add'>+		uhci_hc_died(uhci);</div><div class='ctx'> 	uhci_scan_schedule(uhci, NULL);</div><div class='ctx'> 	spin_unlock_irq(&amp;uhci-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	del_timer_sync(&amp;uhci-&gt;fsbr_timer);</div><div class='ctx'> 	release_uhci(uhci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -677,12 +682,15 @@ static void uhci_stop(struct usb_hcd *hcd)</div><div class='ctx'> static int uhci_rh_suspend(struct usb_hcd *hcd)</div><div class='ctx'> {</div><div class='ctx'> 	struct uhci_hcd *uhci = hcd_to_uhci(hcd);</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-	if (!uhci-&gt;hc_inaccessible)		/* Not dead */</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags))</div><div class='add'>+		rc = -ESHUTDOWN;</div><div class='add'>+	else if (!uhci-&gt;dead)</div><div class='ctx'> 		suspend_rh(uhci, UHCI_RH_SUSPENDED);</div><div class='ctx'> 	spin_unlock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int uhci_rh_resume(struct usb_hcd *hcd)</div><div class='hunk'>@@ -691,13 +699,10 @@ static int uhci_rh_resume(struct usb_hcd *hcd)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-	if (uhci-&gt;hc_inaccessible) {</div><div class='del'>-		if (uhci-&gt;rh_state == UHCI_RH_SUSPENDED) {</div><div class='del'>-			dev_warn(uhci_dev(uhci), "HC isn't running!\n");</div><div class='del'>-			rc = -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		/* Otherwise the HC is dead */</div><div class='del'>-	} else</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags)) {</div><div class='add'>+		dev_warn(&amp;hcd-&gt;self.root_hub-&gt;dev, "HC isn't running!\n");</div><div class='add'>+		rc = -ESHUTDOWN;</div><div class='add'>+	} else if (!uhci-&gt;dead)</div><div class='ctx'> 		wakeup_rh(uhci);</div><div class='ctx'> 	spin_unlock_irq(&amp;uhci-&gt;lock);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -711,8 +716,8 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message)</div><div class='ctx'> 	dev_dbg(uhci_dev(uhci), "%s\n", __FUNCTION__);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='del'>-	if (uhci-&gt;hc_inaccessible)	/* Dead or already suspended */</div><div class='del'>-		goto done;</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags) || uhci-&gt;dead)</div><div class='add'>+		goto done_okay;		/* Already suspended or dead */</div><div class='ctx'> </div><div class='ctx'> 	if (uhci-&gt;rh_state &gt; UHCI_RH_SUSPENDED) {</div><div class='ctx'> 		dev_warn(uhci_dev(uhci), "Root hub isn't suspended!\n");</div><div class='hunk'>@@ -725,12 +730,12 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0);</div><div class='ctx'> 	mb();</div><div class='del'>-	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags);</div><div class='del'>-	uhci-&gt;hc_inaccessible = 1;</div><div class='ctx'> 	hcd-&gt;poll_rh = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Enable non-PME# remote wakeup? */</div><div class='ctx'> </div><div class='add'>+done_okay:</div><div class='add'>+	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags);</div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_irq(&amp;uhci-&gt;lock);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -743,24 +748,22 @@ static int uhci_resume(struct usb_hcd *hcd)</div><div class='ctx'> 	dev_dbg(uhci_dev(uhci), "%s\n", __FUNCTION__);</div><div class='ctx'> </div><div class='ctx'> 	/* Since we aren't in D3 any more, it's safe to set this flag</div><div class='del'>-	 * even if the controller was dead.  It might not even be dead</div><div class='del'>-	 * any more, if the firmware or quirks code has reset it.</div><div class='add'>+	 * even if the controller was dead.</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags);</div><div class='ctx'> 	mb();</div><div class='ctx'> </div><div class='del'>-	if (uhci-&gt;rh_state == UHCI_RH_RESET)	/* Dead */</div><div class='del'>-		return 0;</div><div class='ctx'> 	spin_lock_irq(&amp;uhci-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Disable non-PME# remote wakeup? */</div><div class='ctx'> </div><div class='del'>-	uhci-&gt;hc_inaccessible = 0;</div><div class='del'>-</div><div class='del'>-	/* The BIOS may have changed the controller settings during a</div><div class='del'>-	 * system wakeup.  Check it and reconfigure to avoid problems.</div><div class='add'>+	/* The firmware or a boot kernel may have changed the controller</div><div class='add'>+	 * settings during a system wakeup.  Check it and reconfigure</div><div class='add'>+	 * to avoid problems.</div><div class='ctx'> 	 */</div><div class='ctx'> 	check_and_reset_hc(uhci);</div><div class='add'>+</div><div class='add'>+	/* If the controller was dead before, it's back alive now */</div><div class='ctx'> 	configure_hc(uhci);</div><div class='ctx'> </div><div class='ctx'> 	if (uhci-&gt;rh_state == UHCI_RH_RESET) {</div><div class='hunk'>@@ -810,18 +813,15 @@ done:</div><div class='ctx'> static int uhci_hcd_get_frame_number(struct usb_hcd *hcd)</div><div class='ctx'> {</div><div class='ctx'> 	struct uhci_hcd *uhci = hcd_to_uhci(hcd);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int is_stopped;</div><div class='del'>-	int frame_number;</div><div class='add'>+	unsigned frame_number;</div><div class='add'>+	unsigned delta;</div><div class='ctx'> </div><div class='ctx'> 	/* Minimize latency by avoiding the spinlock */</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	is_stopped = uhci-&gt;is_stopped;</div><div class='del'>-	smp_rmb();</div><div class='del'>-	frame_number = (is_stopped ? uhci-&gt;frame_number :</div><div class='del'>-			inw(uhci-&gt;io_addr + USBFRNUM));</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-	return frame_number;</div><div class='add'>+	frame_number = uhci-&gt;frame_number;</div><div class='add'>+	barrier();</div><div class='add'>+	delta = (inw(uhci-&gt;io_addr + USBFRNUM) - frame_number) &amp;</div><div class='add'>+			(UHCI_NUMFRAMES - 1);</div><div class='add'>+	return frame_number + delta;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char hcd_name[] = "uhci_hcd";</div><div class='hunk'>@@ -836,7 +836,7 @@ static const struct hc_driver uhci_driver = {</div><div class='ctx'> 	.flags =		HCD_USB11,</div><div class='ctx'> </div><div class='ctx'> 	/* Basic lifecycle operations */</div><div class='del'>-	.reset =		uhci_reset,</div><div class='add'>+	.reset =		uhci_init,</div><div class='ctx'> 	.start =		uhci_start,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend =		uhci_suspend,</div><div class='head'>diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h<br/>index d5c8f4d92823..108e3de2dc26 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-hcd.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-hcd.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-hcd.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/uhci-hcd.h</a></div><div class='hunk'>@@ -84,6 +84,13 @@</div><div class='ctx'> #define CAN_SCHEDULE_FRAMES	1000	/* how far in the future frames</div><div class='ctx'> 					 * can be scheduled */</div><div class='ctx'> </div><div class='add'>+/* When no queues need Full-Speed Bandwidth Reclamation,</div><div class='add'>+ * delay this long before turning FSBR off */</div><div class='add'>+#define FSBR_OFF_DELAY		msecs_to_jiffies(10)</div><div class='add'>+</div><div class='add'>+/* If a queue hasn't advanced after this much time, assume it is stuck */</div><div class='add'>+#define QH_WAIT_TIMEOUT		msecs_to_jiffies(200)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Queue Headers</div><div class='hunk'>@@ -121,21 +128,31 @@ struct uhci_qh {</div><div class='ctx'> 	__le32 element;			/* Queue element (TD) pointer */</div><div class='ctx'> </div><div class='ctx'> 	/* Software fields */</div><div class='del'>-	dma_addr_t dma_handle;</div><div class='del'>-</div><div class='ctx'> 	struct list_head node;		/* Node in the list of QHs */</div><div class='ctx'> 	struct usb_host_endpoint *hep;	/* Endpoint information */</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct list_head queue;		/* Queue of urbps for this QH */</div><div class='ctx'> 	struct uhci_qh *skel;		/* Skeleton for this QH */</div><div class='ctx'> 	struct uhci_td *dummy_td;	/* Dummy TD to end the queue */</div><div class='add'>+	struct uhci_td *post_td;	/* Last TD completed */</div><div class='ctx'> </div><div class='add'>+	struct usb_iso_packet_descriptor *iso_packet_desc;</div><div class='add'>+					/* Next urb-&gt;iso_frame_desc entry */</div><div class='add'>+	unsigned long advance_jiffies;	/* Time of last queue advance */</div><div class='ctx'> 	unsigned int unlink_frame;	/* When the QH was unlinked */</div><div class='add'>+	unsigned int period;		/* For Interrupt and Isochronous QHs */</div><div class='add'>+	unsigned int iso_frame;		/* Frame # for iso_packet_desc */</div><div class='add'>+	int iso_status;			/* Status for Isochronous URBs */</div><div class='add'>+</div><div class='ctx'> 	int state;			/* QH_STATE_xxx; see above */</div><div class='add'>+	int type;			/* Queue type (control, bulk, etc) */</div><div class='add'>+</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int initial_toggle:1;	/* Endpoint's current toggle value */</div><div class='ctx'> 	unsigned int needs_fixup:1;	/* Must fix the TD toggle values */</div><div class='del'>-	unsigned int is_stopped:1;	/* Queue was stopped by an error */</div><div class='add'>+	unsigned int is_stopped:1;	/* Queue was stopped by error/unlink */</div><div class='add'>+	unsigned int wait_expired:1;	/* QH_WAIT_TIMEOUT has expired */</div><div class='ctx'> } __attribute__((aligned(16)));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -226,7 +243,6 @@ struct uhci_td {</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='ctx'> </div><div class='ctx'> 	struct list_head list;</div><div class='del'>-	struct list_head remove_list;</div><div class='ctx'> </div><div class='ctx'> 	int frame;			/* for iso: what frame? */</div><div class='ctx'> 	struct list_head fl_list;</div><div class='hunk'>@@ -305,38 +321,8 @@ static inline u32 td_status(struct uhci_td *td) {</div><div class='ctx'> #define skel_bulk_qh		skelqh[12]</div><div class='ctx'> #define skel_term_qh		skelqh[13]</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Search tree for determining where &lt;interval&gt; fits in the skelqh[]</div><div class='del'>- * skeleton.</div><div class='del'>- *</div><div class='del'>- * An interrupt request should be placed into the slowest skelqh[]</div><div class='del'>- * which meets the interval/period/frequency requirement.</div><div class='del'>- * An interrupt request is allowed to be faster than &lt;interval&gt; but not slower.</div><div class='del'>- *</div><div class='del'>- * For a given &lt;interval&gt;, this function returns the appropriate/matching</div><div class='del'>- * skelqh[] index value.</div><div class='del'>- */</div><div class='del'>-static inline int __interval_to_skel(int interval)</div><div class='del'>-{</div><div class='del'>-	if (interval &lt; 16) {</div><div class='del'>-		if (interval &lt; 4) {</div><div class='del'>-			if (interval &lt; 2)</div><div class='del'>-				return 9;	/* int1 for 0-1 ms */</div><div class='del'>-			return 8;		/* int2 for 2-3 ms */</div><div class='del'>-		}</div><div class='del'>-		if (interval &lt; 8)</div><div class='del'>-			return 7;		/* int4 for 4-7 ms */</div><div class='del'>-		return 6;			/* int8 for 8-15 ms */</div><div class='del'>-	}</div><div class='del'>-	if (interval &lt; 64) {</div><div class='del'>-		if (interval &lt; 32)</div><div class='del'>-			return 5;		/* int16 for 16-31 ms */</div><div class='del'>-		return 4;			/* int32 for 32-63 ms */</div><div class='del'>-	}</div><div class='del'>-	if (interval &lt; 128)</div><div class='del'>-		return 3;			/* int64 for 64-127 ms */</div><div class='del'>-	return 2;				/* int128 for 128-255 ms (Max.) */</div><div class='del'>-}</div><div class='add'>+/* Find the skelqh entry corresponding to an interval exponent */</div><div class='add'>+#define UHCI_SKEL_INDEX(exponent)	(9 - exponent)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -396,32 +382,32 @@ struct uhci_hcd {</div><div class='ctx'> 	__le32 *frame;</div><div class='ctx'> 	void **frame_cpu;		/* CPU's frame list */</div><div class='ctx'> </div><div class='del'>-	int fsbr;			/* Full-speed bandwidth reclamation */</div><div class='del'>-	unsigned long fsbrtimeout;	/* FSBR delay */</div><div class='del'>-</div><div class='ctx'> 	enum uhci_rh_state rh_state;</div><div class='ctx'> 	unsigned long auto_stop_time;		/* When to AUTO_STOP */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int frame_number;		/* As of last check */</div><div class='ctx'> 	unsigned int is_stopped;</div><div class='ctx'> #define UHCI_IS_STOPPED		9999		/* Larger than a frame # */</div><div class='add'>+	unsigned int last_iso_frame;		/* Frame of last scan */</div><div class='add'>+	unsigned int cur_iso_frame;		/* Frame for current scan */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int scan_in_progress:1;	/* Schedule scan is running */</div><div class='ctx'> 	unsigned int need_rescan:1;		/* Redo the schedule scan */</div><div class='del'>-	unsigned int hc_inaccessible:1;		/* HC is suspended or dead */</div><div class='add'>+	unsigned int dead:1;			/* Controller has died */</div><div class='ctx'> 	unsigned int working_RD:1;		/* Suspended root hub doesn't</div><div class='ctx'> 						   need to be polled */</div><div class='ctx'> 	unsigned int is_initialized:1;		/* Data structure is usable */</div><div class='add'>+	unsigned int fsbr_is_on:1;		/* FSBR is turned on */</div><div class='add'>+	unsigned int fsbr_is_wanted:1;		/* Does any URB want FSBR? */</div><div class='add'>+	unsigned int fsbr_expiring:1;		/* FSBR is timing out */</div><div class='add'>+</div><div class='add'>+	struct timer_list fsbr_timer;		/* For turning off FBSR */</div><div class='ctx'> </div><div class='ctx'> 	/* Support for port suspend/resume/reset */</div><div class='ctx'> 	unsigned long port_c_suspend;		/* Bit-arrays of ports */</div><div class='ctx'> 	unsigned long resuming_ports;</div><div class='ctx'> 	unsigned long ports_timeout;		/* Time to stop signalling */</div><div class='ctx'> </div><div class='del'>-	/* List of TDs that are done, but waiting to be freed (race) */</div><div class='del'>-	struct list_head td_remove_list;</div><div class='del'>-	unsigned int td_remove_age;		/* Age in frames */</div><div class='del'>-</div><div class='ctx'> 	struct list_head idle_qh_list;		/* Where the idle QHs live */</div><div class='ctx'> </div><div class='ctx'> 	int rh_numports;			/* Number of root-hub ports */</div><div class='hunk'>@@ -442,6 +428,9 @@ static inline struct usb_hcd *uhci_to_hcd(struct uhci_hcd *uhci)</div><div class='ctx'> </div><div class='ctx'> #define uhci_dev(u)	(uhci_to_hcd(u)-&gt;self.controller)</div><div class='ctx'> </div><div class='add'>+/* Utility macro for comparing frame numbers */</div><div class='add'>+#define uhci_frame_before_eq(f1, f2)	(0 &lt;= (int) ((f2) - (f1)))</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Private per-URB data</div><div class='hunk'>@@ -454,9 +443,7 @@ struct urb_priv {</div><div class='ctx'> 	struct uhci_qh *qh;		/* QH for this URB */</div><div class='ctx'> 	struct list_head td_list;</div><div class='ctx'> </div><div class='del'>-	unsigned fsbr : 1;		/* URB turned on FSBR */</div><div class='del'>-	unsigned short_transfer : 1;	/* URB got a short transfer, no</div><div class='del'>-					 * need to rescan */</div><div class='add'>+	unsigned fsbr:1;		/* URB wants FSBR */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c<br/>index c8451d9578f1..c545ef92fe29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-hub.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-hub.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-hub.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/uhci-hub.c</a></div><div class='hunk'>@@ -171,9 +171,8 @@ static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf)</div><div class='ctx'> 	spin_lock_irqsave(&amp;uhci-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	uhci_scan_schedule(uhci, NULL);</div><div class='del'>-	if (uhci-&gt;hc_inaccessible)</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags) || uhci-&gt;dead)</div><div class='ctx'> 		goto done;</div><div class='del'>-	check_fsbr(uhci);</div><div class='ctx'> 	uhci_check_ports(uhci);</div><div class='ctx'> </div><div class='ctx'> 	status = get_hub_status_data(uhci, buf);</div><div class='hunk'>@@ -228,7 +227,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,</div><div class='ctx'> 	u16 wPortChange, wPortStatus;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (uhci-&gt;hc_inaccessible)</div><div class='add'>+	if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &amp;hcd-&gt;flags) || uhci-&gt;dead)</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;uhci-&gt;lock, flags);</div><div class='head'>diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c<br/>index a06d84c19e13..c9d72ac0a1d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-q.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/host/uhci-q.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/host/uhci-q.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/host/uhci-q.c</a></div><div class='hunk'>@@ -13,10 +13,9 @@</div><div class='ctx'>  * (C) Copyright 2000 Yggdrasil Computing, Inc. (port of new PCI interface</div><div class='ctx'>  *               support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).</div><div class='ctx'>  * (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)</div><div class='del'>- * (C) Copyright 2004-2005 Alan Stern, stern@rowland.harvard.edu</div><div class='add'>+ * (C) Copyright 2004-2006 Alan Stern, stern@rowland.harvard.edu</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void uhci_free_pending_tds(struct uhci_hcd *uhci);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Technically, updating td-&gt;status here is a race, but it's not really a</div><div class='hunk'>@@ -38,6 +37,60 @@ static inline void uhci_clear_next_interrupt(struct uhci_hcd *uhci)</div><div class='ctx'> 	uhci-&gt;term_td-&gt;status &amp;= ~cpu_to_le32(TD_CTRL_IOC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Full-Speed Bandwidth Reclamation (FSBR).</div><div class='add'>+ * We turn on FSBR whenever a queue that wants it is advancing,</div><div class='add'>+ * and leave it on for a short time thereafter.</div><div class='add'>+ */</div><div class='add'>+static void uhci_fsbr_on(struct uhci_hcd *uhci)</div><div class='add'>+{</div><div class='add'>+	uhci-&gt;fsbr_is_on = 1;</div><div class='add'>+	uhci-&gt;skel_term_qh-&gt;link = cpu_to_le32(</div><div class='add'>+			uhci-&gt;skel_fs_control_qh-&gt;dma_handle) | UHCI_PTR_QH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uhci_fsbr_off(struct uhci_hcd *uhci)</div><div class='add'>+{</div><div class='add'>+	uhci-&gt;fsbr_is_on = 0;</div><div class='add'>+	uhci-&gt;skel_term_qh-&gt;link = UHCI_PTR_TERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uhci_add_fsbr(struct uhci_hcd *uhci, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='add'>+</div><div class='add'>+	if (!(urb-&gt;transfer_flags &amp; URB_NO_FSBR))</div><div class='add'>+		urbp-&gt;fsbr = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uhci_urbp_wants_fsbr(struct uhci_hcd *uhci, struct urb_priv *urbp)</div><div class='add'>+{</div><div class='add'>+	if (urbp-&gt;fsbr) {</div><div class='add'>+		uhci-&gt;fsbr_is_wanted = 1;</div><div class='add'>+		if (!uhci-&gt;fsbr_is_on)</div><div class='add'>+			uhci_fsbr_on(uhci);</div><div class='add'>+		else if (uhci-&gt;fsbr_expiring) {</div><div class='add'>+			uhci-&gt;fsbr_expiring = 0;</div><div class='add'>+			del_timer(&amp;uhci-&gt;fsbr_timer);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uhci_fsbr_timeout(unsigned long _uhci)</div><div class='add'>+{</div><div class='add'>+	struct uhci_hcd *uhci = (struct uhci_hcd *) _uhci;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;uhci-&gt;lock, flags);</div><div class='add'>+	if (uhci-&gt;fsbr_expiring) {</div><div class='add'>+		uhci-&gt;fsbr_expiring = 0;</div><div class='add'>+		uhci_fsbr_off(uhci);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;uhci-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='hunk'>@@ -51,7 +104,6 @@ static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci)</div><div class='ctx'> 	td-&gt;frame = -1;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;td-&gt;list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;td-&gt;remove_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;td-&gt;fl_list);</div><div class='ctx'> </div><div class='ctx'> 	return td;</div><div class='hunk'>@@ -61,8 +113,6 @@ static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td)</div><div class='ctx'> {</div><div class='ctx'> 	if (!list_empty(&amp;td-&gt;list))</div><div class='ctx'> 		dev_warn(uhci_dev(uhci), "td %p still in list!\n", td);</div><div class='del'>-	if (!list_empty(&amp;td-&gt;remove_list))</div><div class='del'>-		dev_warn(uhci_dev(uhci), "td %p still in remove_list!\n", td);</div><div class='ctx'> 	if (!list_empty(&amp;td-&gt;fl_list))</div><div class='ctx'> 		dev_warn(uhci_dev(uhci), "td %p still in fl_list!\n", td);</div><div class='ctx'> </div><div class='hunk'>@@ -77,6 +127,16 @@ static inline void uhci_fill_td(struct uhci_td *td, u32 status,</div><div class='ctx'> 	td-&gt;buffer = cpu_to_le32(buffer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void uhci_add_td_to_urbp(struct uhci_td *td, struct urb_priv *urbp)</div><div class='add'>+{</div><div class='add'>+	list_add_tail(&amp;td-&gt;list, &amp;urbp-&gt;td_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void uhci_remove_td_from_urbp(struct uhci_td *td)</div><div class='add'>+{</div><div class='add'>+	list_del_init(&amp;td-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We insert Isochronous URBs directly into the frame list at the beginning</div><div class='ctx'>  */</div><div class='hunk'>@@ -138,6 +198,24 @@ static inline void uhci_remove_td_from_frame_list(struct uhci_hcd *uhci,</div><div class='ctx'> 	td-&gt;frame = -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void uhci_remove_tds_from_frame(struct uhci_hcd *uhci,</div><div class='add'>+		unsigned int framenum)</div><div class='add'>+{</div><div class='add'>+	struct uhci_td *ftd, *ltd;</div><div class='add'>+</div><div class='add'>+	framenum &amp;= (UHCI_NUMFRAMES - 1);</div><div class='add'>+</div><div class='add'>+	ftd = uhci-&gt;frame_cpu[framenum];</div><div class='add'>+	if (ftd) {</div><div class='add'>+		ltd = list_entry(ftd-&gt;fl_list.prev, struct uhci_td, fl_list);</div><div class='add'>+		uhci-&gt;frame[framenum] = ltd-&gt;link;</div><div class='add'>+		uhci-&gt;frame_cpu[framenum] = NULL;</div><div class='add'>+</div><div class='add'>+		while (!list_empty(&amp;ftd-&gt;fl_list))</div><div class='add'>+			list_del_init(ftd-&gt;fl_list.prev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Remove all the TDs for an Isochronous URB from the frame list</div><div class='ctx'>  */</div><div class='hunk'>@@ -148,7 +226,6 @@ static void uhci_unlink_isochronous_tds(struct uhci_hcd *uhci, struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(td, &amp;urbp-&gt;td_list, list)</div><div class='ctx'> 		uhci_remove_td_from_frame_list(uhci, td);</div><div class='del'>-	wmb();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,</div><div class='hunk'>@@ -161,6 +238,7 @@ static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,</div><div class='ctx'> 	if (!qh)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	memset(qh, 0, sizeof(*qh));</div><div class='ctx'> 	qh-&gt;dma_handle = dma_handle;</div><div class='ctx'> </div><div class='ctx'> 	qh-&gt;element = UHCI_PTR_TERM;</div><div class='hunk'>@@ -179,10 +257,11 @@ static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,</div><div class='ctx'> 		qh-&gt;hep = hep;</div><div class='ctx'> 		qh-&gt;udev = udev;</div><div class='ctx'> 		hep-&gt;hcpriv = qh;</div><div class='add'>+		qh-&gt;type = hep-&gt;desc.bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	} else {		/* Skeleton QH */</div><div class='ctx'> 		qh-&gt;state = QH_STATE_ACTIVE;</div><div class='del'>-		qh-&gt;udev = NULL;</div><div class='add'>+		qh-&gt;type = -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return qh;</div><div class='ctx'> }</div><div class='hunk'>@@ -202,35 +281,64 @@ static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * When the currently executing URB is dequeued, save its current toggle value</div><div class='add'>+ * When a queue is stopped and a dequeued URB is given back, adjust</div><div class='add'>+ * the previous TD link (if the URB isn't first on the queue) or</div><div class='add'>+ * save its toggle value (if it is first and is currently executing).</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if the URB should not yet be given back, 1 otherwise.</div><div class='ctx'>  */</div><div class='del'>-static void uhci_save_toggle(struct uhci_qh *qh, struct urb *urb)</div><div class='add'>+static int uhci_cleanup_queue(struct uhci_hcd *uhci, struct uhci_qh *qh,</div><div class='add'>+		struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct urb_priv *urbp = (struct urb_priv *) urb-&gt;hcpriv;</div><div class='add'>+	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='ctx'> 	struct uhci_td *td;</div><div class='add'>+	int ret = 1;</div><div class='add'>+</div><div class='add'>+	/* Isochronous pipes don't use toggles and their TD link pointers</div><div class='add'>+	 * get adjusted during uhci_urb_dequeue().  But since their queues</div><div class='add'>+	 * cannot truly be stopped, we have to watch out for dequeues</div><div class='add'>+	 * occurring after the nominal unlink frame. */</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_ISOC) {</div><div class='add'>+		ret = (uhci-&gt;frame_number + uhci-&gt;is_stopped !=</div><div class='add'>+				qh-&gt;unlink_frame);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the URB isn't first on its queue, adjust the link pointer</div><div class='add'>+	 * of the last TD in the previous URB.  The toggle doesn't need</div><div class='add'>+	 * to be saved since this URB can't be executing yet. */</div><div class='add'>+	if (qh-&gt;queue.next != &amp;urbp-&gt;node) {</div><div class='add'>+		struct urb_priv *purbp;</div><div class='add'>+		struct uhci_td *ptd;</div><div class='add'>+</div><div class='add'>+		purbp = list_entry(urbp-&gt;node.prev, struct urb_priv, node);</div><div class='add'>+		WARN_ON(list_empty(&amp;purbp-&gt;td_list));</div><div class='add'>+		ptd = list_entry(purbp-&gt;td_list.prev, struct uhci_td,</div><div class='add'>+				list);</div><div class='add'>+		td = list_entry(urbp-&gt;td_list.prev, struct uhci_td,</div><div class='add'>+				list);</div><div class='add'>+		ptd-&gt;link = td-&gt;link;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* If the QH element pointer is UHCI_PTR_TERM then then currently</div><div class='ctx'> 	 * executing URB has already been unlinked, so this one isn't it. */</div><div class='del'>-	if (qh_element(qh) == UHCI_PTR_TERM ||</div><div class='del'>-				qh-&gt;queue.next != &amp;urbp-&gt;node)</div><div class='del'>-		return;</div><div class='add'>+	if (qh_element(qh) == UHCI_PTR_TERM)</div><div class='add'>+		goto done;</div><div class='ctx'> 	qh-&gt;element = UHCI_PTR_TERM;</div><div class='ctx'> </div><div class='del'>-	/* Only bulk and interrupt pipes have to worry about toggles */</div><div class='del'>-	if (!(usb_pipetype(urb-&gt;pipe) == PIPE_BULK ||</div><div class='del'>-			usb_pipetype(urb-&gt;pipe) == PIPE_INTERRUPT))</div><div class='del'>-		return;</div><div class='add'>+	/* Control pipes have to worry about toggles */</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_CONTROL)</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-	/* Find the first active TD; that's the device's toggle state */</div><div class='del'>-	list_for_each_entry(td, &amp;urbp-&gt;td_list, list) {</div><div class='del'>-		if (td_status(td) &amp; TD_CTRL_ACTIVE) {</div><div class='del'>-			qh-&gt;needs_fixup = 1;</div><div class='del'>-			qh-&gt;initial_toggle = uhci_toggle(td_token(td));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Save the next toggle value */</div><div class='add'>+	WARN_ON(list_empty(&amp;urbp-&gt;td_list));</div><div class='add'>+	td = list_entry(urbp-&gt;td_list.next, struct uhci_td, list);</div><div class='add'>+	qh-&gt;needs_fixup = 1;</div><div class='add'>+	qh-&gt;initial_toggle = uhci_toggle(td_token(td));</div><div class='ctx'> </div><div class='del'>-	WARN_ON(1);</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -305,6 +413,10 @@ static void uhci_activate_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)</div><div class='ctx'> 		qh-&gt;element = cpu_to_le32(td-&gt;dma_handle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Treat the queue as if it has just advanced */</div><div class='add'>+	qh-&gt;wait_expired = 0;</div><div class='add'>+	qh-&gt;advance_jiffies = jiffies;</div><div class='add'>+</div><div class='ctx'> 	if (qh-&gt;state == QH_STATE_ACTIVE)</div><div class='ctx'> 		return;</div><div class='ctx'> 	qh-&gt;state = QH_STATE_ACTIVE;</div><div class='hunk'>@@ -370,6 +482,12 @@ static void uhci_make_qh_idle(struct uhci_hcd *uhci, struct uhci_qh *qh)</div><div class='ctx'> 	list_move(&amp;qh-&gt;node, &amp;uhci-&gt;idle_qh_list);</div><div class='ctx'> 	qh-&gt;state = QH_STATE_IDLE;</div><div class='ctx'> </div><div class='add'>+	/* Now that the QH is idle, its post_td isn't being used */</div><div class='add'>+	if (qh-&gt;post_td) {</div><div class='add'>+		uhci_free_td(uhci, qh-&gt;post_td);</div><div class='add'>+		qh-&gt;post_td = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If anyone is waiting for a QH to become idle, wake them up */</div><div class='ctx'> 	if (uhci-&gt;num_waiting)</div><div class='ctx'> 		wake_up_all(&amp;uhci-&gt;waitqh);</div><div class='hunk'>@@ -395,21 +513,6 @@ static inline struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci,</div><div class='ctx'> 	return urbp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uhci_add_td_to_urb(struct urb *urb, struct uhci_td *td)</div><div class='del'>-{</div><div class='del'>-	struct urb_priv *urbp = (struct urb_priv *)urb-&gt;hcpriv;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;td-&gt;list, &amp;urbp-&gt;td_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uhci_remove_td_from_urb(struct uhci_td *td)</div><div class='del'>-{</div><div class='del'>-	if (list_empty(&amp;td-&gt;list))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	list_del_init(&amp;td-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void uhci_free_urb_priv(struct uhci_hcd *uhci,</div><div class='ctx'> 		struct urb_priv *urbp)</div><div class='ctx'> {</div><div class='hunk'>@@ -419,48 +522,15 @@ static void uhci_free_urb_priv(struct uhci_hcd *uhci,</div><div class='ctx'> 		dev_warn(uhci_dev(uhci), "urb %p still on QH's list!\n",</div><div class='ctx'> 				urbp-&gt;urb);</div><div class='ctx'> </div><div class='del'>-	uhci_get_current_frame_number(uhci);</div><div class='del'>-	if (uhci-&gt;frame_number + uhci-&gt;is_stopped != uhci-&gt;td_remove_age) {</div><div class='del'>-		uhci_free_pending_tds(uhci);</div><div class='del'>-		uhci-&gt;td_remove_age = uhci-&gt;frame_number;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check to see if the remove list is empty. Set the IOC bit */</div><div class='del'>-	/* to force an interrupt so we can remove the TDs. */</div><div class='del'>-	if (list_empty(&amp;uhci-&gt;td_remove_list))</div><div class='del'>-		uhci_set_next_interrupt(uhci);</div><div class='del'>-</div><div class='ctx'> 	list_for_each_entry_safe(td, tmp, &amp;urbp-&gt;td_list, list) {</div><div class='del'>-		uhci_remove_td_from_urb(td);</div><div class='del'>-		list_add(&amp;td-&gt;remove_list, &amp;uhci-&gt;td_remove_list);</div><div class='add'>+		uhci_remove_td_from_urbp(td);</div><div class='add'>+		uhci_free_td(uhci, td);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	urbp-&gt;urb-&gt;hcpriv = NULL;</div><div class='ctx'> 	kmem_cache_free(uhci_up_cachep, urbp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uhci_inc_fsbr(struct uhci_hcd *uhci, struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct urb_priv *urbp = (struct urb_priv *)urb-&gt;hcpriv;</div><div class='del'>-</div><div class='del'>-	if ((!(urb-&gt;transfer_flags &amp; URB_NO_FSBR)) &amp;&amp; !urbp-&gt;fsbr) {</div><div class='del'>-		urbp-&gt;fsbr = 1;</div><div class='del'>-		if (!uhci-&gt;fsbr++ &amp;&amp; !uhci-&gt;fsbrtimeout)</div><div class='del'>-			uhci-&gt;skel_term_qh-&gt;link = cpu_to_le32(uhci-&gt;skel_fs_control_qh-&gt;dma_handle) | UHCI_PTR_QH;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uhci_dec_fsbr(struct uhci_hcd *uhci, struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct urb_priv *urbp = (struct urb_priv *)urb-&gt;hcpriv;</div><div class='del'>-</div><div class='del'>-	if ((!(urb-&gt;transfer_flags &amp; URB_NO_FSBR)) &amp;&amp; urbp-&gt;fsbr) {</div><div class='del'>-		urbp-&gt;fsbr = 0;</div><div class='del'>-		if (!--uhci-&gt;fsbr)</div><div class='del'>-			uhci-&gt;fsbrtimeout = jiffies + FSBR_DELAY;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Map status to standard result codes</div><div class='ctx'>  *</div><div class='hunk'>@@ -487,7 +557,6 @@ static int uhci_map_status(int status, int dir_out)</div><div class='ctx'> 		return -ENOSR;</div><div class='ctx'> 	if (status &amp; TD_CTRL_STALLED)			/* Stalled */</div><div class='ctx'> 		return -EPIPE;</div><div class='del'>-	WARN_ON(status &amp; TD_CTRL_ACTIVE);		/* Active */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -503,6 +572,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	int len = urb-&gt;transfer_buffer_length;</div><div class='ctx'> 	dma_addr_t data = urb-&gt;transfer_dma;</div><div class='ctx'> 	__le32 *plink;</div><div class='add'>+	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='ctx'> </div><div class='ctx'> 	/* The "pipe" thing contains the destination in bits 8--18 */</div><div class='ctx'> 	destination = (urb-&gt;pipe &amp; PIPE_DEVEP_MASK) | USB_PID_SETUP;</div><div class='hunk'>@@ -516,7 +586,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	 * Build the TD for the control request setup packet</div><div class='ctx'> 	 */</div><div class='ctx'> 	td = qh-&gt;dummy_td;</div><div class='del'>-	uhci_add_td_to_urb(urb, td);</div><div class='add'>+	uhci_add_td_to_urbp(td, urbp);</div><div class='ctx'> 	uhci_fill_td(td, status, destination | uhci_explen(8),</div><div class='ctx'> 			urb-&gt;setup_dma);</div><div class='ctx'> 	plink = &amp;td-&gt;link;</div><div class='hunk'>@@ -548,7 +618,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 		/* Alternate Data0/1 (start with Data1) */</div><div class='ctx'> 		destination ^= TD_TOKEN_TOGGLE;</div><div class='ctx'> 	</div><div class='del'>-		uhci_add_td_to_urb(urb, td);</div><div class='add'>+		uhci_add_td_to_urbp(td, urbp);</div><div class='ctx'> 		uhci_fill_td(td, status, destination | uhci_explen(pktsze),</div><div class='ctx'> 				data);</div><div class='ctx'> 		plink = &amp;td-&gt;link;</div><div class='hunk'>@@ -579,7 +649,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> </div><div class='ctx'> 	status &amp;= ~TD_CTRL_SPD;</div><div class='ctx'> </div><div class='del'>-	uhci_add_td_to_urb(urb, td);</div><div class='add'>+	uhci_add_td_to_urbp(td, urbp);</div><div class='ctx'> 	uhci_fill_td(td, status | TD_CTRL_IOC,</div><div class='ctx'> 			destination | uhci_explen(0), 0);</div><div class='ctx'> 	plink = &amp;td-&gt;link;</div><div class='hunk'>@@ -606,145 +676,19 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 		qh-&gt;skel = uhci-&gt;skel_ls_control_qh;</div><div class='ctx'> 	else {</div><div class='ctx'> 		qh-&gt;skel = uhci-&gt;skel_fs_control_qh;</div><div class='del'>-		uhci_inc_fsbr(uhci, urb);</div><div class='add'>+		uhci_add_fsbr(uhci, urb);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	urb-&gt;actual_length = -8;	/* Account for the SETUP packet */</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> nomem:</div><div class='ctx'> 	/* Remove the dummy TD from the td_list so it doesn't get freed */</div><div class='del'>-	uhci_remove_td_from_urb(qh-&gt;dummy_td);</div><div class='add'>+	uhci_remove_td_from_urbp(qh-&gt;dummy_td);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * If control-IN transfer was short, the status packet wasn't sent.</div><div class='del'>- * This routine changes the element pointer in the QH to point at the</div><div class='del'>- * status TD.  It's safe to do this even while the QH is live, because</div><div class='del'>- * the hardware only updates the element pointer following a successful</div><div class='del'>- * transfer.  The inactive TD for the short packet won't cause an update,</div><div class='del'>- * so the pointer won't get overwritten.  The next time the controller</div><div class='del'>- * sees this QH, it will send the status packet.</div><div class='del'>- */</div><div class='del'>-static int usb_control_retrigger_status(struct uhci_hcd *uhci, struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct urb_priv *urbp = (struct urb_priv *)urb-&gt;hcpriv;</div><div class='del'>-	struct uhci_td *td;</div><div class='del'>-</div><div class='del'>-	urbp-&gt;short_transfer = 1;</div><div class='del'>-</div><div class='del'>-	td = list_entry(urbp-&gt;td_list.prev, struct uhci_td, list);</div><div class='del'>-	urbp-&gt;qh-&gt;element = cpu_to_le32(td-&gt;dma_handle);</div><div class='del'>-</div><div class='del'>-	return -EINPROGRESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int uhci_result_control(struct uhci_hcd *uhci, struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct list_head *tmp, *head;</div><div class='del'>-	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='del'>-	struct uhci_td *td;</div><div class='del'>-	unsigned int status;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	head = &amp;urbp-&gt;td_list;</div><div class='del'>-	if (urbp-&gt;short_transfer) {</div><div class='del'>-		tmp = head-&gt;prev;</div><div class='del'>-		goto status_stage;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	urb-&gt;actual_length = 0;</div><div class='del'>-</div><div class='del'>-	tmp = head-&gt;next;</div><div class='del'>-	td = list_entry(tmp, struct uhci_td, list);</div><div class='del'>-</div><div class='del'>-	/* The first TD is the SETUP stage, check the status, but skip */</div><div class='del'>-	/*  the count */</div><div class='del'>-	status = uhci_status_bits(td_status(td));</div><div class='del'>-	if (status &amp; TD_CTRL_ACTIVE)</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		goto td_error;</div><div class='del'>-</div><div class='del'>-	/* The rest of the TDs (but the last) are data */</div><div class='del'>-	tmp = tmp-&gt;next;</div><div class='del'>-	while (tmp != head &amp;&amp; tmp-&gt;next != head) {</div><div class='del'>-		unsigned int ctrlstat;</div><div class='del'>-</div><div class='del'>-		td = list_entry(tmp, struct uhci_td, list);</div><div class='del'>-		tmp = tmp-&gt;next;</div><div class='del'>-</div><div class='del'>-		ctrlstat = td_status(td);</div><div class='del'>-		status = uhci_status_bits(ctrlstat);</div><div class='del'>-		if (status &amp; TD_CTRL_ACTIVE)</div><div class='del'>-			return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-		urb-&gt;actual_length += uhci_actual_length(ctrlstat);</div><div class='del'>-</div><div class='del'>-		if (status)</div><div class='del'>-			goto td_error;</div><div class='del'>-</div><div class='del'>-		/* Check to see if we received a short packet */</div><div class='del'>-		if (uhci_actual_length(ctrlstat) &lt;</div><div class='del'>-				uhci_expected_length(td_token(td))) {</div><div class='del'>-			if (urb-&gt;transfer_flags &amp; URB_SHORT_NOT_OK) {</div><div class='del'>-				ret = -EREMOTEIO;</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			return usb_control_retrigger_status(uhci, urb);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-status_stage:</div><div class='del'>-	td = list_entry(tmp, struct uhci_td, list);</div><div class='del'>-</div><div class='del'>-	/* Control status stage */</div><div class='del'>-	status = td_status(td);</div><div class='del'>-</div><div class='del'>-#ifdef I_HAVE_BUGGY_APC_BACKUPS</div><div class='del'>-	/* APC BackUPS Pro kludge */</div><div class='del'>-	/* It tries to send all of the descriptor instead of the amount */</div><div class='del'>-	/*  we requested */</div><div class='del'>-	if (status &amp; TD_CTRL_IOC &amp;&amp;	/* IOC is masked out by uhci_status_bits */</div><div class='del'>-	    status &amp; TD_CTRL_ACTIVE &amp;&amp;</div><div class='del'>-	    status &amp; TD_CTRL_NAK)</div><div class='del'>-		return 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	status = uhci_status_bits(status);</div><div class='del'>-	if (status &amp; TD_CTRL_ACTIVE)</div><div class='del'>-		return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		goto td_error;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-td_error:</div><div class='del'>-	ret = uhci_map_status(status, uhci_packetout(td_token(td)));</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	if ((debug == 1 &amp;&amp; ret != -EPIPE) || debug &gt; 1) {</div><div class='del'>-		/* Some debugging code */</div><div class='del'>-		dev_dbg(uhci_dev(uhci), "%s: failed with status %x\n",</div><div class='del'>-				__FUNCTION__, status);</div><div class='del'>-</div><div class='del'>-		if (errbuf) {</div><div class='del'>-			/* Print the chain for debugging purposes */</div><div class='del'>-			uhci_show_qh(urbp-&gt;qh, errbuf, ERRBUF_LEN, 0);</div><div class='del'>-			lprintk(errbuf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Note that the queue has stopped */</div><div class='del'>-	urbp-&gt;qh-&gt;element = UHCI_PTR_TERM;</div><div class='del'>-	urbp-&gt;qh-&gt;is_stopped = 1;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Common submit for bulk and interrupt</div><div class='ctx'>  */</div><div class='ctx'> static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,</div><div class='hunk'>@@ -756,6 +700,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	int len = urb-&gt;transfer_buffer_length;</div><div class='ctx'> 	dma_addr_t data = urb-&gt;transfer_dma;</div><div class='ctx'> 	__le32 *plink;</div><div class='add'>+	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='ctx'> 	unsigned int toggle;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt; 0)</div><div class='hunk'>@@ -793,7 +738,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 				goto nomem;</div><div class='ctx'> 			*plink = cpu_to_le32(td-&gt;dma_handle);</div><div class='ctx'> 		}</div><div class='del'>-		uhci_add_td_to_urb(urb, td);</div><div class='add'>+		uhci_add_td_to_urbp(td, urbp);</div><div class='ctx'> 		uhci_fill_td(td, status,</div><div class='ctx'> 				destination | uhci_explen(pktsze) |</div><div class='ctx'> 					(toggle &lt;&lt; TD_TOKEN_TOGGLE_SHIFT),</div><div class='hunk'>@@ -821,7 +766,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 			goto nomem;</div><div class='ctx'> 		*plink = cpu_to_le32(td-&gt;dma_handle);</div><div class='ctx'> </div><div class='del'>-		uhci_add_td_to_urb(urb, td);</div><div class='add'>+		uhci_add_td_to_urbp(td, urbp);</div><div class='ctx'> 		uhci_fill_td(td, status,</div><div class='ctx'> 				destination | uhci_explen(0) |</div><div class='ctx'> 					(toggle &lt;&lt; TD_TOKEN_TOGGLE_SHIFT),</div><div class='hunk'>@@ -851,6 +796,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	qh-&gt;dummy_td-&gt;status |= __constant_cpu_to_le32(TD_CTRL_ACTIVE);</div><div class='ctx'> 	qh-&gt;dummy_td = td;</div><div class='add'>+	qh-&gt;period = urb-&gt;interval;</div><div class='ctx'> </div><div class='ctx'> 	usb_settoggle(urb-&gt;dev, usb_pipeendpoint(urb-&gt;pipe),</div><div class='ctx'> 			usb_pipeout(urb-&gt;pipe), toggle);</div><div class='hunk'>@@ -858,90 +804,10 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> </div><div class='ctx'> nomem:</div><div class='ctx'> 	/* Remove the dummy TD from the td_list so it doesn't get freed */</div><div class='del'>-	uhci_remove_td_from_urb(qh-&gt;dummy_td);</div><div class='add'>+	uhci_remove_td_from_urbp(qh-&gt;dummy_td);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Common result for bulk and interrupt</div><div class='del'>- */</div><div class='del'>-static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='del'>-	struct uhci_td *td;</div><div class='del'>-	unsigned int status = 0;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	urb-&gt;actual_length = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(td, &amp;urbp-&gt;td_list, list) {</div><div class='del'>-		unsigned int ctrlstat = td_status(td);</div><div class='del'>-</div><div class='del'>-		status = uhci_status_bits(ctrlstat);</div><div class='del'>-		if (status &amp; TD_CTRL_ACTIVE)</div><div class='del'>-			return -EINPROGRESS;</div><div class='del'>-</div><div class='del'>-		urb-&gt;actual_length += uhci_actual_length(ctrlstat);</div><div class='del'>-</div><div class='del'>-		if (status)</div><div class='del'>-			goto td_error;</div><div class='del'>-</div><div class='del'>-		if (uhci_actual_length(ctrlstat) &lt;</div><div class='del'>-				uhci_expected_length(td_token(td))) {</div><div class='del'>-			if (urb-&gt;transfer_flags &amp; URB_SHORT_NOT_OK) {</div><div class='del'>-				ret = -EREMOTEIO;</div><div class='del'>-				goto err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * This URB stopped short of its end.  We have to</div><div class='del'>-			 * fix up the toggles of the following URBs on the</div><div class='del'>-			 * queue and restart the queue.</div><div class='del'>-			 *</div><div class='del'>-			 * Do this only the first time we encounter the</div><div class='del'>-			 * short URB.</div><div class='del'>-			 */</div><div class='del'>-			if (!urbp-&gt;short_transfer) {</div><div class='del'>-				urbp-&gt;short_transfer = 1;</div><div class='del'>-				urbp-&gt;qh-&gt;initial_toggle =</div><div class='del'>-						uhci_toggle(td_token(td)) ^ 1;</div><div class='del'>-				uhci_fixup_toggles(urbp-&gt;qh, 1);</div><div class='del'>-</div><div class='del'>-				td = list_entry(urbp-&gt;td_list.prev,</div><div class='del'>-						struct uhci_td, list);</div><div class='del'>-				urbp-&gt;qh-&gt;element = td-&gt;link;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-td_error:</div><div class='del'>-	ret = uhci_map_status(status, uhci_packetout(td_token(td)));</div><div class='del'>-</div><div class='del'>-	if ((debug == 1 &amp;&amp; ret != -EPIPE) || debug &gt; 1) {</div><div class='del'>-		/* Some debugging code */</div><div class='del'>-		dev_dbg(uhci_dev(uhci), "%s: failed with status %x\n",</div><div class='del'>-				__FUNCTION__, status);</div><div class='del'>-</div><div class='del'>-		if (debug &gt; 1 &amp;&amp; errbuf) {</div><div class='del'>-			/* Print the chain for debugging purposes */</div><div class='del'>-			uhci_show_qh(urbp-&gt;qh, errbuf, ERRBUF_LEN, 0);</div><div class='del'>-			lprintk(errbuf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-err:</div><div class='del'>-</div><div class='del'>-	/* Note that the queue has stopped and save the next toggle value */</div><div class='del'>-	urbp-&gt;qh-&gt;element = UHCI_PTR_TERM;</div><div class='del'>-	urbp-&gt;qh-&gt;is_stopped = 1;</div><div class='del'>-	urbp-&gt;qh-&gt;needs_fixup = 1;</div><div class='del'>-	urbp-&gt;qh-&gt;initial_toggle = uhci_toggle(td_token(td)) ^</div><div class='del'>-			(ret == -EREMOTEIO);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int uhci_submit_bulk(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 		struct uhci_qh *qh)</div><div class='ctx'> {</div><div class='hunk'>@@ -954,22 +820,163 @@ static inline int uhci_submit_bulk(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	qh-&gt;skel = uhci-&gt;skel_bulk_qh;</div><div class='ctx'> 	ret = uhci_submit_common(uhci, urb, qh);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		uhci_inc_fsbr(uhci, urb);</div><div class='add'>+		uhci_add_fsbr(uhci, urb);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb,</div><div class='add'>+static int uhci_submit_interrupt(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 		struct uhci_qh *qh)</div><div class='ctx'> {</div><div class='add'>+	int exponent;</div><div class='add'>+</div><div class='ctx'> 	/* USB 1.1 interrupt transfers only involve one packet per interval.</div><div class='ctx'> 	 * Drivers can submit URBs of any length, but longer ones will need</div><div class='ctx'> 	 * multiple intervals to complete.</div><div class='ctx'> 	 */</div><div class='del'>-	qh-&gt;skel = uhci-&gt;skelqh[__interval_to_skel(urb-&gt;interval)];</div><div class='add'>+</div><div class='add'>+	/* Figure out which power-of-two queue to use */</div><div class='add'>+	for (exponent = 7; exponent &gt;= 0; --exponent) {</div><div class='add'>+		if ((1 &lt;&lt; exponent) &lt;= urb-&gt;interval)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (exponent &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	urb-&gt;interval = 1 &lt;&lt; exponent;</div><div class='add'>+</div><div class='add'>+	if (qh-&gt;period == 0)</div><div class='add'>+		qh-&gt;skel = uhci-&gt;skelqh[UHCI_SKEL_INDEX(exponent)];</div><div class='add'>+	else if (qh-&gt;period != urb-&gt;interval)</div><div class='add'>+		return -EINVAL;		/* Can't change the period */</div><div class='add'>+</div><div class='ctx'> 	return uhci_submit_common(uhci, urb, qh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Fix up the data structures following a short transfer</div><div class='add'>+ */</div><div class='add'>+static int uhci_fixup_short_transfer(struct uhci_hcd *uhci,</div><div class='add'>+		struct uhci_qh *qh, struct urb_priv *urbp)</div><div class='add'>+{</div><div class='add'>+	struct uhci_td *td;</div><div class='add'>+	struct list_head *tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	td = list_entry(urbp-&gt;td_list.prev, struct uhci_td, list);</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_CONTROL) {</div><div class='add'>+</div><div class='add'>+		/* When a control transfer is short, we have to restart</div><div class='add'>+		 * the queue at the status stage transaction, which is</div><div class='add'>+		 * the last TD. */</div><div class='add'>+		WARN_ON(list_empty(&amp;urbp-&gt;td_list));</div><div class='add'>+		qh-&gt;element = cpu_to_le32(td-&gt;dma_handle);</div><div class='add'>+		tmp = td-&gt;list.prev;</div><div class='add'>+		ret = -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+</div><div class='add'>+		/* When a bulk/interrupt transfer is short, we have to</div><div class='add'>+		 * fix up the toggles of the following URBs on the queue</div><div class='add'>+		 * before restarting the queue at the next URB. */</div><div class='add'>+		qh-&gt;initial_toggle = uhci_toggle(td_token(qh-&gt;post_td)) ^ 1;</div><div class='add'>+		uhci_fixup_toggles(qh, 1);</div><div class='add'>+</div><div class='add'>+		if (list_empty(&amp;urbp-&gt;td_list))</div><div class='add'>+			td = qh-&gt;post_td;</div><div class='add'>+		qh-&gt;element = td-&gt;link;</div><div class='add'>+		tmp = urbp-&gt;td_list.prev;</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Remove all the TDs we skipped over, from tmp back to the start */</div><div class='add'>+	while (tmp != &amp;urbp-&gt;td_list) {</div><div class='add'>+		td = list_entry(tmp, struct uhci_td, list);</div><div class='add'>+		tmp = tmp-&gt;prev;</div><div class='add'>+</div><div class='add'>+		uhci_remove_td_from_urbp(td);</div><div class='add'>+		uhci_free_td(uhci, td);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common result for control, bulk, and interrupt</div><div class='add'>+ */</div><div class='add'>+static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='add'>+	struct uhci_qh *qh = urbp-&gt;qh;</div><div class='add'>+	struct uhci_td *td, *tmp;</div><div class='add'>+	unsigned status;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(td, tmp, &amp;urbp-&gt;td_list, list) {</div><div class='add'>+		unsigned int ctrlstat;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		ctrlstat = td_status(td);</div><div class='add'>+		status = uhci_status_bits(ctrlstat);</div><div class='add'>+		if (status &amp; TD_CTRL_ACTIVE)</div><div class='add'>+			return -EINPROGRESS;</div><div class='add'>+</div><div class='add'>+		len = uhci_actual_length(ctrlstat);</div><div class='add'>+		urb-&gt;actual_length += len;</div><div class='add'>+</div><div class='add'>+		if (status) {</div><div class='add'>+			ret = uhci_map_status(status,</div><div class='add'>+					uhci_packetout(td_token(td)));</div><div class='add'>+			if ((debug == 1 &amp;&amp; ret != -EPIPE) || debug &gt; 1) {</div><div class='add'>+				/* Some debugging code */</div><div class='add'>+				dev_dbg(&amp;urb-&gt;dev-&gt;dev,</div><div class='add'>+						"%s: failed with status %x\n",</div><div class='add'>+						__FUNCTION__, status);</div><div class='add'>+</div><div class='add'>+				if (debug &gt; 1 &amp;&amp; errbuf) {</div><div class='add'>+					/* Print the chain for debugging */</div><div class='add'>+					uhci_show_qh(urbp-&gt;qh, errbuf,</div><div class='add'>+							ERRBUF_LEN, 0);</div><div class='add'>+					lprintk(errbuf);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else if (len &lt; uhci_expected_length(td_token(td))) {</div><div class='add'>+</div><div class='add'>+			/* We received a short packet */</div><div class='add'>+			if (urb-&gt;transfer_flags &amp; URB_SHORT_NOT_OK)</div><div class='add'>+				ret = -EREMOTEIO;</div><div class='add'>+			else if (ctrlstat &amp; TD_CTRL_SPD)</div><div class='add'>+				ret = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		uhci_remove_td_from_urbp(td);</div><div class='add'>+		if (qh-&gt;post_td)</div><div class='add'>+			uhci_free_td(uhci, qh-&gt;post_td);</div><div class='add'>+		qh-&gt;post_td = td;</div><div class='add'>+</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* In case a control transfer gets an error</div><div class='add'>+		 * during the setup stage */</div><div class='add'>+		urb-&gt;actual_length = max(urb-&gt;actual_length, 0);</div><div class='add'>+</div><div class='add'>+		/* Note that the queue has stopped and save</div><div class='add'>+		 * the next toggle value */</div><div class='add'>+		qh-&gt;element = UHCI_PTR_TERM;</div><div class='add'>+		qh-&gt;is_stopped = 1;</div><div class='add'>+		qh-&gt;needs_fixup = (qh-&gt;type != USB_ENDPOINT_XFER_CONTROL);</div><div class='add'>+		qh-&gt;initial_toggle = uhci_toggle(td_token(td)) ^</div><div class='add'>+				(ret == -EREMOTEIO);</div><div class='add'>+</div><div class='add'>+	} else		/* Short packet received */</div><div class='add'>+		ret = uhci_fixup_short_transfer(uhci, qh, urbp);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Isochronous transfers</div><div class='ctx'>  */</div><div class='ctx'> static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb,</div><div class='hunk'>@@ -980,38 +987,57 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	unsigned long destination, status;</div><div class='ctx'> 	struct urb_priv *urbp = (struct urb_priv *) urb-&gt;hcpriv;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;number_of_packets &gt; 900)	/* 900? Why? */</div><div class='add'>+	/* Values must not be too big (could overflow below) */</div><div class='add'>+	if (urb-&gt;interval &gt;= UHCI_NUMFRAMES ||</div><div class='add'>+			urb-&gt;number_of_packets &gt;= UHCI_NUMFRAMES)</div><div class='ctx'> 		return -EFBIG;</div><div class='ctx'> </div><div class='del'>-	status = TD_CTRL_ACTIVE | TD_CTRL_IOS;</div><div class='del'>-	destination = (urb-&gt;pipe &amp; PIPE_DEVEP_MASK) | usb_packetid(urb-&gt;pipe);</div><div class='del'>-</div><div class='del'>-	/* Figure out the starting frame number */</div><div class='del'>-	if (urb-&gt;transfer_flags &amp; URB_ISO_ASAP) {</div><div class='del'>-		if (list_empty(&amp;qh-&gt;queue)) {</div><div class='add'>+	/* Check the period and figure out the starting frame number */</div><div class='add'>+	if (qh-&gt;period == 0) {</div><div class='add'>+		if (urb-&gt;transfer_flags &amp; URB_ISO_ASAP) {</div><div class='ctx'> 			uhci_get_current_frame_number(uhci);</div><div class='del'>-			urb-&gt;start_frame = (uhci-&gt;frame_number + 10);</div><div class='add'>+			urb-&gt;start_frame = uhci-&gt;frame_number + 10;</div><div class='add'>+		} else {</div><div class='add'>+			i = urb-&gt;start_frame - uhci-&gt;last_iso_frame;</div><div class='add'>+			if (i &lt;= 0 || i &gt;= UHCI_NUMFRAMES)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (qh-&gt;period != urb-&gt;interval) {</div><div class='add'>+		return -EINVAL;		/* Can't change the period */</div><div class='ctx'> </div><div class='del'>-		} else {		/* Go right after the last one */</div><div class='del'>-			struct urb *last_urb;</div><div class='add'>+	} else {	/* Pick up where the last URB leaves off */</div><div class='add'>+		if (list_empty(&amp;qh-&gt;queue)) {</div><div class='add'>+			frame = qh-&gt;iso_frame;</div><div class='add'>+		} else {</div><div class='add'>+			struct urb *lurb;</div><div class='ctx'> </div><div class='del'>-			last_urb = list_entry(qh-&gt;queue.prev,</div><div class='add'>+			lurb = list_entry(qh-&gt;queue.prev,</div><div class='ctx'> 					struct urb_priv, node)-&gt;urb;</div><div class='del'>-			urb-&gt;start_frame = (last_urb-&gt;start_frame +</div><div class='del'>-					last_urb-&gt;number_of_packets *</div><div class='del'>-					last_urb-&gt;interval);</div><div class='add'>+			frame = lurb-&gt;start_frame +</div><div class='add'>+					lurb-&gt;number_of_packets *</div><div class='add'>+					lurb-&gt;interval;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Sanity check */</div><div class='add'>+		if (urb-&gt;transfer_flags &amp; URB_ISO_ASAP)</div><div class='add'>+			urb-&gt;start_frame = frame;</div><div class='add'>+		else if (urb-&gt;start_frame != frame)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	urb-&gt;start_frame &amp;= (UHCI_NUMFRAMES - 1);</div><div class='add'>+</div><div class='add'>+	/* Make sure we won't have to go too far into the future */</div><div class='add'>+	if (uhci_frame_before_eq(uhci-&gt;last_iso_frame + UHCI_NUMFRAMES,</div><div class='add'>+			urb-&gt;start_frame + urb-&gt;number_of_packets *</div><div class='add'>+				urb-&gt;interval))</div><div class='add'>+		return -EFBIG;</div><div class='add'>+</div><div class='add'>+	status = TD_CTRL_ACTIVE | TD_CTRL_IOS;</div><div class='add'>+	destination = (urb-&gt;pipe &amp; PIPE_DEVEP_MASK) | usb_packetid(urb-&gt;pipe);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; urb-&gt;number_of_packets; i++) {</div><div class='ctx'> 		td = uhci_alloc_td(uhci);</div><div class='ctx'> 		if (!td)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		uhci_add_td_to_urb(urb, td);</div><div class='add'>+		uhci_add_td_to_urbp(td, urbp);</div><div class='ctx'> 		uhci_fill_td(td, status, destination |</div><div class='ctx'> 				uhci_explen(urb-&gt;iso_frame_desc[i].length),</div><div class='ctx'> 				urb-&gt;transfer_dma +</div><div class='hunk'>@@ -1022,12 +1048,19 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> 	td-&gt;status |= __constant_cpu_to_le32(TD_CTRL_IOC);</div><div class='ctx'> </div><div class='ctx'> 	qh-&gt;skel = uhci-&gt;skel_iso_qh;</div><div class='add'>+	qh-&gt;period = urb-&gt;interval;</div><div class='ctx'> </div><div class='ctx'> 	/* Add the TDs to the frame list */</div><div class='ctx'> 	frame = urb-&gt;start_frame;</div><div class='ctx'> 	list_for_each_entry(td, &amp;urbp-&gt;td_list, list) {</div><div class='ctx'> 		uhci_insert_td_in_frame_list(uhci, td, frame);</div><div class='del'>-		frame += urb-&gt;interval;</div><div class='add'>+		frame += qh-&gt;period;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;qh-&gt;queue)) {</div><div class='add'>+		qh-&gt;iso_packet_desc = &amp;urb-&gt;iso_frame_desc[0];</div><div class='add'>+		qh-&gt;iso_frame = urb-&gt;start_frame;</div><div class='add'>+		qh-&gt;iso_status = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1035,37 +1068,44 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb,</div><div class='ctx'> </div><div class='ctx'> static int uhci_result_isochronous(struct uhci_hcd *uhci, struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct uhci_td *td;</div><div class='del'>-	struct urb_priv *urbp = (struct urb_priv *)urb-&gt;hcpriv;</div><div class='del'>-	int status;</div><div class='del'>-	int i, ret = 0;</div><div class='del'>-</div><div class='del'>-	urb-&gt;actual_length = urb-&gt;error_count = 0;</div><div class='add'>+	struct uhci_td *td, *tmp;</div><div class='add'>+	struct urb_priv *urbp = urb-&gt;hcpriv;</div><div class='add'>+	struct uhci_qh *qh = urbp-&gt;qh;</div><div class='ctx'> </div><div class='del'>-	i = 0;</div><div class='del'>-	list_for_each_entry(td, &amp;urbp-&gt;td_list, list) {</div><div class='add'>+	list_for_each_entry_safe(td, tmp, &amp;urbp-&gt;td_list, list) {</div><div class='add'>+		unsigned int ctrlstat;</div><div class='add'>+		int status;</div><div class='ctx'> 		int actlength;</div><div class='del'>-		unsigned int ctrlstat = td_status(td);</div><div class='ctx'> </div><div class='del'>-		if (ctrlstat &amp; TD_CTRL_ACTIVE)</div><div class='add'>+		if (uhci_frame_before_eq(uhci-&gt;cur_iso_frame, qh-&gt;iso_frame))</div><div class='ctx'> 			return -EINPROGRESS;</div><div class='ctx'> </div><div class='del'>-		actlength = uhci_actual_length(ctrlstat);</div><div class='del'>-		urb-&gt;iso_frame_desc[i].actual_length = actlength;</div><div class='del'>-		urb-&gt;actual_length += actlength;</div><div class='add'>+		uhci_remove_tds_from_frame(uhci, qh-&gt;iso_frame);</div><div class='add'>+</div><div class='add'>+		ctrlstat = td_status(td);</div><div class='add'>+		if (ctrlstat &amp; TD_CTRL_ACTIVE) {</div><div class='add'>+			status = -EXDEV;	/* TD was added too late? */</div><div class='add'>+		} else {</div><div class='add'>+			status = uhci_map_status(uhci_status_bits(ctrlstat),</div><div class='add'>+					usb_pipeout(urb-&gt;pipe));</div><div class='add'>+			actlength = uhci_actual_length(ctrlstat);</div><div class='add'>+</div><div class='add'>+			urb-&gt;actual_length += actlength;</div><div class='add'>+			qh-&gt;iso_packet_desc-&gt;actual_length = actlength;</div><div class='add'>+			qh-&gt;iso_packet_desc-&gt;status = status;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		status = uhci_map_status(uhci_status_bits(ctrlstat),</div><div class='del'>-				usb_pipeout(urb-&gt;pipe));</div><div class='del'>-		urb-&gt;iso_frame_desc[i].status = status;</div><div class='ctx'> 		if (status) {</div><div class='ctx'> 			urb-&gt;error_count++;</div><div class='del'>-			ret = status;</div><div class='add'>+			qh-&gt;iso_status = status;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		i++;</div><div class='add'>+		uhci_remove_td_from_urbp(td);</div><div class='add'>+		uhci_free_td(uhci, td);</div><div class='add'>+		qh-&gt;iso_frame += qh-&gt;period;</div><div class='add'>+		++qh-&gt;iso_packet_desc;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return qh-&gt;iso_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int uhci_urb_enqueue(struct usb_hcd *hcd,</div><div class='hunk'>@@ -1099,14 +1139,14 @@ static int uhci_urb_enqueue(struct usb_hcd *hcd,</div><div class='ctx'> 	}</div><div class='ctx'> 	urbp-&gt;qh = qh;</div><div class='ctx'> </div><div class='del'>-	switch (usb_pipetype(urb-&gt;pipe)) {</div><div class='del'>-	case PIPE_CONTROL:</div><div class='add'>+	switch (qh-&gt;type) {</div><div class='add'>+	case USB_ENDPOINT_XFER_CONTROL:</div><div class='ctx'> 		ret = uhci_submit_control(uhci, urb, qh);</div><div class='ctx'> 		break;</div><div class='del'>-	case PIPE_BULK:</div><div class='add'>+	case USB_ENDPOINT_XFER_BULK:</div><div class='ctx'> 		ret = uhci_submit_bulk(uhci, urb, qh);</div><div class='ctx'> 		break;</div><div class='del'>-	case PIPE_INTERRUPT:</div><div class='add'>+	case USB_ENDPOINT_XFER_INT:</div><div class='ctx'> 		if (list_empty(&amp;qh-&gt;queue)) {</div><div class='ctx'> 			bustime = usb_check_bandwidth(urb-&gt;dev, urb);</div><div class='ctx'> 			if (bustime &lt; 0)</div><div class='hunk'>@@ -1125,7 +1165,8 @@ static int uhci_urb_enqueue(struct usb_hcd *hcd,</div><div class='ctx'> 			ret = uhci_submit_interrupt(uhci, urb, qh);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='del'>-	case PIPE_ISOCHRONOUS:</div><div class='add'>+	case USB_ENDPOINT_XFER_ISOC:</div><div class='add'>+		urb-&gt;error_count = 0;</div><div class='ctx'> 		bustime = usb_check_bandwidth(urb-&gt;dev, urb);</div><div class='ctx'> 		if (bustime &lt; 0) {</div><div class='ctx'> 			ret = bustime;</div><div class='hunk'>@@ -1146,9 +1187,12 @@ static int uhci_urb_enqueue(struct usb_hcd *hcd,</div><div class='ctx'> </div><div class='ctx'> 	/* If the new URB is the first and only one on this QH then either</div><div class='ctx'> 	 * the QH is new and idle or else it's unlinked and waiting to</div><div class='del'>-	 * become idle, so we can activate it right away. */</div><div class='del'>-	if (qh-&gt;queue.next == &amp;urbp-&gt;node)</div><div class='add'>+	 * become idle, so we can activate it right away.  But only if the</div><div class='add'>+	 * queue isn't stopped. */</div><div class='add'>+	if (qh-&gt;queue.next == &amp;urbp-&gt;node &amp;&amp; !qh-&gt;is_stopped) {</div><div class='ctx'> 		uhci_activate_qh(uhci, qh);</div><div class='add'>+		uhci_urbp_wants_fsbr(uhci, urbp);</div><div class='add'>+	}</div><div class='ctx'> 	goto done;</div><div class='ctx'> </div><div class='ctx'> err_submit_failed:</div><div class='hunk'>@@ -1168,16 +1212,26 @@ static int uhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)</div><div class='ctx'> 	struct uhci_hcd *uhci = hcd_to_uhci(hcd);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct urb_priv *urbp;</div><div class='add'>+	struct uhci_qh *qh;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;uhci-&gt;lock, flags);</div><div class='ctx'> 	urbp = urb-&gt;hcpriv;</div><div class='ctx'> 	if (!urbp)			/* URB was never linked! */</div><div class='ctx'> 		goto done;</div><div class='add'>+	qh = urbp-&gt;qh;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove Isochronous TDs from the frame list ASAP */</div><div class='del'>-	if (usb_pipetype(urb-&gt;pipe) == PIPE_ISOCHRONOUS)</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_ISOC) {</div><div class='ctx'> 		uhci_unlink_isochronous_tds(uhci, urb);</div><div class='del'>-	uhci_unlink_qh(uhci, urbp-&gt;qh);</div><div class='add'>+		mb();</div><div class='add'>+</div><div class='add'>+		/* If the URB has already started, update the QH unlink time */</div><div class='add'>+		uhci_get_current_frame_number(uhci);</div><div class='add'>+		if (uhci_frame_before_eq(urb-&gt;start_frame, uhci-&gt;frame_number))</div><div class='add'>+			qh-&gt;unlink_frame = uhci-&gt;frame_number;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uhci_unlink_qh(uhci, qh);</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;uhci-&gt;lock, flags);</div><div class='hunk'>@@ -1194,22 +1248,17 @@ __acquires(uhci-&gt;lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct urb_priv *urbp = (struct urb_priv *) urb-&gt;hcpriv;</div><div class='ctx'> </div><div class='del'>-	/* Isochronous TDs get unlinked directly from the frame list */</div><div class='del'>-	if (usb_pipetype(urb-&gt;pipe) == PIPE_ISOCHRONOUS)</div><div class='del'>-		uhci_unlink_isochronous_tds(uhci, urb);</div><div class='del'>-</div><div class='del'>-	/* If the URB isn't first on its queue, adjust the link pointer</div><div class='del'>-	 * of the last TD in the previous URB. */</div><div class='del'>-	else if (qh-&gt;queue.next != &amp;urbp-&gt;node) {</div><div class='del'>-		struct urb_priv *purbp;</div><div class='del'>-		struct uhci_td *ptd, *ltd;</div><div class='del'>-</div><div class='del'>-		purbp = list_entry(urbp-&gt;node.prev, struct urb_priv, node);</div><div class='del'>-		ptd = list_entry(purbp-&gt;td_list.prev, struct uhci_td,</div><div class='del'>-				list);</div><div class='del'>-		ltd = list_entry(urbp-&gt;td_list.prev, struct uhci_td,</div><div class='del'>-				list);</div><div class='del'>-		ptd-&gt;link = ltd-&gt;link;</div><div class='add'>+	/* When giving back the first URB in an Isochronous queue,</div><div class='add'>+	 * reinitialize the QH's iso-related members for the next URB. */</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_ISOC &amp;&amp;</div><div class='add'>+			urbp-&gt;node.prev == &amp;qh-&gt;queue &amp;&amp;</div><div class='add'>+			urbp-&gt;node.next != &amp;qh-&gt;queue) {</div><div class='add'>+		struct urb *nurb = list_entry(urbp-&gt;node.next,</div><div class='add'>+				struct urb_priv, node)-&gt;urb;</div><div class='add'>+</div><div class='add'>+		qh-&gt;iso_packet_desc = &amp;nurb-&gt;iso_frame_desc[0];</div><div class='add'>+		qh-&gt;iso_frame = nurb-&gt;start_frame;</div><div class='add'>+		qh-&gt;iso_status = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Take the URB off the QH's queue.  If the queue is now empty,</div><div class='hunk'>@@ -1221,16 +1270,15 @@ __acquires(uhci-&gt;lock)</div><div class='ctx'> 		qh-&gt;needs_fixup = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uhci_dec_fsbr(uhci, urb);	/* Safe since it checks */</div><div class='ctx'> 	uhci_free_urb_priv(uhci, urbp);</div><div class='ctx'> </div><div class='del'>-	switch (usb_pipetype(urb-&gt;pipe)) {</div><div class='del'>-	case PIPE_ISOCHRONOUS:</div><div class='add'>+	switch (qh-&gt;type) {</div><div class='add'>+	case USB_ENDPOINT_XFER_ISOC:</div><div class='ctx'> 		/* Release bandwidth for Interrupt or Isoc. transfers */</div><div class='ctx'> 		if (urb-&gt;bandwidth)</div><div class='ctx'> 			usb_release_bandwidth(urb-&gt;dev, urb, 1);</div><div class='ctx'> 		break;</div><div class='del'>-	case PIPE_INTERRUPT:</div><div class='add'>+	case USB_ENDPOINT_XFER_INT:</div><div class='ctx'> 		/* Release bandwidth for Interrupt or Isoc. transfers */</div><div class='ctx'> 		/* Make sure we don't release if we have a queued URB */</div><div class='ctx'> 		if (list_empty(&amp;qh-&gt;queue) &amp;&amp; urb-&gt;bandwidth)</div><div class='hunk'>@@ -1252,6 +1300,7 @@ __acquires(uhci-&gt;lock)</div><div class='ctx'> 		uhci_unlink_qh(uhci, qh);</div><div class='ctx'> </div><div class='ctx'> 		/* Bandwidth stuff not yet implemented */</div><div class='add'>+		qh-&gt;period = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1273,17 +1322,10 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh,</div><div class='ctx'> 		urbp = list_entry(qh-&gt;queue.next, struct urb_priv, node);</div><div class='ctx'> 		urb = urbp-&gt;urb;</div><div class='ctx'> </div><div class='del'>-		switch (usb_pipetype(urb-&gt;pipe)) {</div><div class='del'>-		case PIPE_CONTROL:</div><div class='del'>-			status = uhci_result_control(uhci, urb);</div><div class='del'>-			break;</div><div class='del'>-		case PIPE_ISOCHRONOUS:</div><div class='add'>+		if (qh-&gt;type == USB_ENDPOINT_XFER_ISOC)</div><div class='ctx'> 			status = uhci_result_isochronous(uhci, urb);</div><div class='del'>-			break;</div><div class='del'>-		default:	/* PIPE_BULK or PIPE_INTERRUPT */</div><div class='add'>+		else</div><div class='ctx'> 			status = uhci_result_common(uhci, urb);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		if (status == -EINPROGRESS)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -1291,31 +1333,43 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh,</div><div class='ctx'> 		if (urb-&gt;status == -EINPROGRESS)	/* Not dequeued */</div><div class='ctx'> 			urb-&gt;status = status;</div><div class='ctx'> 		else</div><div class='del'>-			status = -ECONNRESET;</div><div class='add'>+			status = ECONNRESET;		/* Not -ECONNRESET */</div><div class='ctx'> 		spin_unlock(&amp;urb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		/* Dequeued but completed URBs can't be given back unless</div><div class='ctx'> 		 * the QH is stopped or has finished unlinking. */</div><div class='del'>-		if (status == -ECONNRESET &amp;&amp;</div><div class='del'>-				!(qh-&gt;is_stopped || QH_FINISHED_UNLINKING(qh)))</div><div class='del'>-			return;</div><div class='add'>+		if (status == ECONNRESET) {</div><div class='add'>+			if (QH_FINISHED_UNLINKING(qh))</div><div class='add'>+				qh-&gt;is_stopped = 1;</div><div class='add'>+			else if (!qh-&gt;is_stopped)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		uhci_giveback_urb(uhci, qh, urb, regs);</div><div class='del'>-		if (qh-&gt;is_stopped)</div><div class='add'>+		if (status &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If the QH is neither stopped nor finished unlinking (normal case),</div><div class='ctx'> 	 * our work here is done. */</div><div class='del'>- restart:</div><div class='del'>-	if (!(qh-&gt;is_stopped || QH_FINISHED_UNLINKING(qh)))</div><div class='add'>+	if (QH_FINISHED_UNLINKING(qh))</div><div class='add'>+		qh-&gt;is_stopped = 1;</div><div class='add'>+	else if (!qh-&gt;is_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* Otherwise give back each of the dequeued URBs */</div><div class='add'>+restart:</div><div class='ctx'> 	list_for_each_entry(urbp, &amp;qh-&gt;queue, node) {</div><div class='ctx'> 		urb = urbp-&gt;urb;</div><div class='ctx'> 		if (urb-&gt;status != -EINPROGRESS) {</div><div class='del'>-			uhci_save_toggle(qh, urb);</div><div class='add'>+</div><div class='add'>+			/* Fix up the TD links and save the toggles for</div><div class='add'>+			 * non-Isochronous queues.  For Isochronous queues,</div><div class='add'>+			 * test for too-recent dequeues. */</div><div class='add'>+			if (!uhci_cleanup_queue(uhci, qh, urb)) {</div><div class='add'>+				qh-&gt;is_stopped = 0;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='ctx'> 			uhci_giveback_urb(uhci, qh, urb, regs);</div><div class='ctx'> 			goto restart;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1327,6 +1381,18 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh,</div><div class='ctx'> 	if (!list_empty(&amp;qh-&gt;queue)) {</div><div class='ctx'> 		if (qh-&gt;needs_fixup)</div><div class='ctx'> 			uhci_fixup_toggles(qh, 0);</div><div class='add'>+</div><div class='add'>+		/* If the first URB on the queue wants FSBR but its time</div><div class='add'>+		 * limit has expired, set the next TD to interrupt on</div><div class='add'>+		 * completion before reactivating the QH. */</div><div class='add'>+		urbp = list_entry(qh-&gt;queue.next, struct urb_priv, node);</div><div class='add'>+		if (urbp-&gt;fsbr &amp;&amp; qh-&gt;wait_expired) {</div><div class='add'>+			struct uhci_td *td = list_entry(urbp-&gt;td_list.next,</div><div class='add'>+					struct uhci_td, list);</div><div class='add'>+</div><div class='add'>+			td-&gt;status |= __cpu_to_le32(TD_CTRL_IOC);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		uhci_activate_qh(uhci, qh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1336,15 +1402,84 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh,</div><div class='ctx'> 		uhci_make_qh_idle(uhci, qh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uhci_free_pending_tds(struct uhci_hcd *uhci)</div><div class='add'>+/*</div><div class='add'>+ * Check for queues that have made some forward progress.</div><div class='add'>+ * Returns 0 if the queue is not Isochronous, is ACTIVE, and</div><div class='add'>+ * has not advanced since last examined; 1 otherwise.</div><div class='add'>+ *</div><div class='add'>+ * Early Intel controllers have a bug which causes qh-&gt;element sometimes</div><div class='add'>+ * not to advance when a TD completes successfully.  The queue remains</div><div class='add'>+ * stuck on the inactive completed TD.  We detect such cases and advance</div><div class='add'>+ * the element pointer by hand.</div><div class='add'>+ */</div><div class='add'>+static int uhci_advance_check(struct uhci_hcd *uhci, struct uhci_qh *qh)</div><div class='ctx'> {</div><div class='del'>-	struct uhci_td *td, *tmp;</div><div class='add'>+	struct urb_priv *urbp = NULL;</div><div class='add'>+	struct uhci_td *td;</div><div class='add'>+	int ret = 1;</div><div class='add'>+	unsigned status;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry_safe(td, tmp, &amp;uhci-&gt;td_remove_list, remove_list) {</div><div class='del'>-		list_del_init(&amp;td-&gt;remove_list);</div><div class='add'>+	if (qh-&gt;type == USB_ENDPOINT_XFER_ISOC)</div><div class='add'>+		goto done;</div><div class='ctx'> </div><div class='del'>-		uhci_free_td(uhci, td);</div><div class='add'>+	/* Treat an UNLINKING queue as though it hasn't advanced.</div><div class='add'>+	 * This is okay because reactivation will treat it as though</div><div class='add'>+	 * it has advanced, and if it is going to become IDLE then</div><div class='add'>+	 * this doesn't matter anyway.  Furthermore it's possible</div><div class='add'>+	 * for an UNLINKING queue not to have any URBs at all, or</div><div class='add'>+	 * for its first URB not to have any TDs (if it was dequeued</div><div class='add'>+	 * just as it completed).  So it's not easy in any case to</div><div class='add'>+	 * test whether such queues have advanced. */</div><div class='add'>+	if (qh-&gt;state != QH_STATE_ACTIVE) {</div><div class='add'>+		urbp = NULL;</div><div class='add'>+		status = 0;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		urbp = list_entry(qh-&gt;queue.next, struct urb_priv, node);</div><div class='add'>+		td = list_entry(urbp-&gt;td_list.next, struct uhci_td, list);</div><div class='add'>+		status = td_status(td);</div><div class='add'>+		if (!(status &amp; TD_CTRL_ACTIVE)) {</div><div class='add'>+</div><div class='add'>+			/* We're okay, the queue has advanced */</div><div class='add'>+			qh-&gt;wait_expired = 0;</div><div class='add'>+			qh-&gt;advance_jiffies = jiffies;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The queue hasn't advanced; check for timeout */</div><div class='add'>+	if (qh-&gt;wait_expired)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	if (time_after(jiffies, qh-&gt;advance_jiffies + QH_WAIT_TIMEOUT)) {</div><div class='add'>+</div><div class='add'>+		/* Detect the Intel bug and work around it */</div><div class='add'>+		if (qh-&gt;post_td &amp;&amp; qh_element(qh) ==</div><div class='add'>+				cpu_to_le32(qh-&gt;post_td-&gt;dma_handle)) {</div><div class='add'>+			qh-&gt;element = qh-&gt;post_td-&gt;link;</div><div class='add'>+			qh-&gt;advance_jiffies = jiffies;</div><div class='add'>+			ret = 1;</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		qh-&gt;wait_expired = 1;</div><div class='add'>+</div><div class='add'>+		/* If the current URB wants FSBR, unlink it temporarily</div><div class='add'>+		 * so that we can safely set the next TD to interrupt on</div><div class='add'>+		 * completion.  That way we'll know as soon as the queue</div><div class='add'>+		 * starts moving again. */</div><div class='add'>+		if (urbp &amp;&amp; urbp-&gt;fsbr &amp;&amp; !(status &amp; TD_CTRL_IOC))</div><div class='add'>+			uhci_unlink_qh(uhci, qh);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* Unmoving but not-yet-expired queues keep FSBR alive */</div><div class='add'>+		if (urbp)</div><div class='add'>+			uhci_urbp_wants_fsbr(uhci, urbp);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1361,14 +1496,13 @@ static void uhci_scan_schedule(struct uhci_hcd *uhci, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	uhci-&gt;scan_in_progress = 1;</div><div class='del'>- rescan:</div><div class='add'>+rescan:</div><div class='ctx'> 	uhci-&gt;need_rescan = 0;</div><div class='add'>+	uhci-&gt;fsbr_is_wanted = 0;</div><div class='ctx'> </div><div class='ctx'> 	uhci_clear_next_interrupt(uhci);</div><div class='ctx'> 	uhci_get_current_frame_number(uhci);</div><div class='del'>-</div><div class='del'>-	if (uhci-&gt;frame_number + uhci-&gt;is_stopped != uhci-&gt;td_remove_age)</div><div class='del'>-		uhci_free_pending_tds(uhci);</div><div class='add'>+	uhci-&gt;cur_iso_frame = uhci-&gt;frame_number;</div><div class='ctx'> </div><div class='ctx'> 	/* Go through all the QH queues and process the URBs in each one */</div><div class='ctx'> 	for (i = 0; i &lt; UHCI_NUM_SKELQH - 1; ++i) {</div><div class='hunk'>@@ -1377,33 +1511,30 @@ static void uhci_scan_schedule(struct uhci_hcd *uhci, struct pt_regs *regs)</div><div class='ctx'> 		while ((qh = uhci-&gt;next_qh) != uhci-&gt;skelqh[i]) {</div><div class='ctx'> 			uhci-&gt;next_qh = list_entry(qh-&gt;node.next,</div><div class='ctx'> 					struct uhci_qh, node);</div><div class='del'>-			uhci_scan_qh(uhci, qh, regs);</div><div class='add'>+</div><div class='add'>+			if (uhci_advance_check(uhci, qh)) {</div><div class='add'>+				uhci_scan_qh(uhci, qh, regs);</div><div class='add'>+				if (qh-&gt;state == QH_STATE_ACTIVE) {</div><div class='add'>+					uhci_urbp_wants_fsbr(uhci,</div><div class='add'>+	list_entry(qh-&gt;queue.next, struct urb_priv, node));</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	uhci-&gt;last_iso_frame = uhci-&gt;cur_iso_frame;</div><div class='ctx'> 	if (uhci-&gt;need_rescan)</div><div class='ctx'> 		goto rescan;</div><div class='ctx'> 	uhci-&gt;scan_in_progress = 0;</div><div class='ctx'> </div><div class='del'>-	/* If the controller is stopped, we can finish these off right now */</div><div class='del'>-	if (uhci-&gt;is_stopped)</div><div class='del'>-		uhci_free_pending_tds(uhci);</div><div class='add'>+	if (uhci-&gt;fsbr_is_on &amp;&amp; !uhci-&gt;fsbr_is_wanted &amp;&amp;</div><div class='add'>+			!uhci-&gt;fsbr_expiring) {</div><div class='add'>+		uhci-&gt;fsbr_expiring = 1;</div><div class='add'>+		mod_timer(&amp;uhci-&gt;fsbr_timer, jiffies + FSBR_OFF_DELAY);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (list_empty(&amp;uhci-&gt;td_remove_list) &amp;&amp;</div><div class='del'>-			list_empty(&amp;uhci-&gt;skel_unlink_qh-&gt;node))</div><div class='add'>+	if (list_empty(&amp;uhci-&gt;skel_unlink_qh-&gt;node))</div><div class='ctx'> 		uhci_clear_next_interrupt(uhci);</div><div class='ctx'> 	else</div><div class='ctx'> 		uhci_set_next_interrupt(uhci);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static void check_fsbr(struct uhci_hcd *uhci)</div><div class='del'>-{</div><div class='del'>-	/* For now, don't scan URBs for FSBR timeouts.</div><div class='del'>-	 * Add it back in later... */</div><div class='del'>-</div><div class='del'>-	/* Really disable FSBR */</div><div class='del'>-	if (!uhci-&gt;fsbr &amp;&amp; uhci-&gt;fsbrtimeout &amp;&amp; time_after_eq(jiffies, uhci-&gt;fsbrtimeout)) {</div><div class='del'>-		uhci-&gt;fsbrtimeout = 0;</div><div class='del'>-		uhci-&gt;skel_term_qh-&gt;link = UHCI_PTR_TERM;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c<br/>index 2a0e18a48748..b2bafc37c414 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/image/microtek.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/image/microtek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/image/microtek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/image/microtek.c</a></div><div class='hunk'>@@ -513,7 +513,7 @@ static void mts_do_sg (struct urb* transfer, struct pt_regs *regs)</div><div class='ctx'> 		mts_transfer_cleanup(transfer);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-	sg = context-&gt;srb-&gt;buffer;</div><div class='add'>+	sg = context-&gt;srb-&gt;request_buffer;</div><div class='ctx'> 	context-&gt;fragment++;</div><div class='ctx'> 	mts_int_submit_urb(transfer,</div><div class='ctx'> 			   context-&gt;data_pipe,</div><div class='hunk'>@@ -549,19 +549,19 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc )</div><div class='ctx'> 	desc-&gt;context.fragment = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!srb-&gt;use_sg) {</div><div class='del'>-		if ( !srb-&gt;bufflen ){</div><div class='add'>+		if ( !srb-&gt;request_bufflen ){</div><div class='ctx'> 			desc-&gt;context.data = NULL;</div><div class='ctx'> 			desc-&gt;context.data_length = 0;</div><div class='ctx'> 			return;</div><div class='ctx'> 		} else {</div><div class='del'>-			desc-&gt;context.data = srb-&gt;buffer;</div><div class='del'>-			desc-&gt;context.data_length = srb-&gt;bufflen;</div><div class='add'>+			desc-&gt;context.data = srb-&gt;request_buffer;</div><div class='add'>+			desc-&gt;context.data_length = srb-&gt;request_bufflen;</div><div class='ctx'> 			MTS_DEBUG("length = %d or %d\n",</div><div class='ctx'> 				  srb-&gt;request_bufflen, srb-&gt;bufflen);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		MTS_DEBUG("Using scatter/gather\n");</div><div class='del'>-		sg = srb-&gt;buffer;</div><div class='add'>+		sg = srb-&gt;request_buffer;</div><div class='ctx'> 		desc-&gt;context.data = page_address(sg[0].page) + sg[0].offset;</div><div class='ctx'> 		desc-&gt;context.data_length = sg[0].length;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c<br/>index df29b8078b54..18c10e150ef3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/acecad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/acecad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/acecad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/acecad.c</a></div><div class='hunk'>@@ -27,11 +27,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='head'>diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c<br/>index a6693b0d1c4c..b138dae2b055 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/aiptek.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/aiptek.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/aiptek.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/aiptek.c</a></div><div class='hunk'>@@ -73,11 +73,9 @@</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='head'>diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c<br/>index c222ed13deab..9e3f13903371 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/appletouch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/appletouch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/appletouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/appletouch.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Apple USB Touchpad (for post-February 2005 PowerBooks) driver</div><div class='add'>+ * Apple USB Touchpad (for post-February 2005 PowerBooks and MacBooks) driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)</div><div class='ctx'>  * Copyright (C) 2005      Johannes Berg (johannes@sipsolutions.net)</div><div class='hunk'>@@ -7,6 +7,7 @@</div><div class='ctx'>  * Copyright (C) 2005      Frank Arnold (frank@scirocco-5v-turbo.de)</div><div class='ctx'>  * Copyright (C) 2005      Peter Osterlund (petero2@telia.com)</div><div class='ctx'>  * Copyright (C) 2005      Michael Hanselmann (linux-kernel@hansmi.ch)</div><div class='add'>+ * Copyright (C) 2006      Nicolas Boichat (nicolas@boichat.ch)</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks to Alex Harper &lt;basilisk@foobox.net&gt; for his inputs.</div><div class='ctx'>  *</div><div class='hunk'>@@ -26,15 +27,12 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Apple has powerbooks which have the keyboard with different Product IDs */</div><div class='ctx'> #define APPLE_VENDOR_ID		0x05AC</div><div class='hunk'>@@ -44,6 +42,11 @@</div><div class='ctx'> #define GEYSER_ISO_PRODUCT_ID	0x0215</div><div class='ctx'> #define GEYSER_JIS_PRODUCT_ID	0x0216</div><div class='ctx'> </div><div class='add'>+/* MacBook devices */</div><div class='add'>+#define GEYSER3_ANSI_PRODUCT_ID	0x0217</div><div class='add'>+#define GEYSER3_ISO_PRODUCT_ID	0x0218</div><div class='add'>+#define GEYSER3_JIS_PRODUCT_ID	0x0219</div><div class='add'>+</div><div class='ctx'> #define ATP_DEVICE(prod)					\</div><div class='ctx'> 	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |		\</div><div class='ctx'> 		       USB_DEVICE_ID_MATCH_INT_CLASS |		\</div><div class='hunk'>@@ -65,6 +68,10 @@ static struct usb_device_id atp_table [] = {</div><div class='ctx'> 	{ ATP_DEVICE(GEYSER_ISO_PRODUCT_ID) },</div><div class='ctx'> 	{ ATP_DEVICE(GEYSER_JIS_PRODUCT_ID) },</div><div class='ctx'> </div><div class='add'>+	{ ATP_DEVICE(GEYSER3_ANSI_PRODUCT_ID) },</div><div class='add'>+	{ ATP_DEVICE(GEYSER3_ISO_PRODUCT_ID) },</div><div class='add'>+	{ ATP_DEVICE(GEYSER3_JIS_PRODUCT_ID) },</div><div class='add'>+</div><div class='ctx'> 	/* Terminating entry */</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='hunk'>@@ -101,6 +108,13 @@ MODULE_DEVICE_TABLE (usb, atp_table);</div><div class='ctx'>  */</div><div class='ctx'> #define ATP_THRESHOLD	 5</div><div class='ctx'> </div><div class='add'>+/* MacBook Pro (Geyser 3) initialization constants */</div><div class='add'>+#define ATP_GEYSER3_MODE_READ_REQUEST_ID 1</div><div class='add'>+#define ATP_GEYSER3_MODE_WRITE_REQUEST_ID 9</div><div class='add'>+#define ATP_GEYSER3_MODE_REQUEST_VALUE 0x300</div><div class='add'>+#define ATP_GEYSER3_MODE_REQUEST_INDEX 0</div><div class='add'>+#define ATP_GEYSER3_MODE_VENDOR_VALUE 0x04</div><div class='add'>+</div><div class='ctx'> /* Structure to hold all of our device specific stuff */</div><div class='ctx'> struct atp {</div><div class='ctx'> 	char			phys[64];</div><div class='hunk'>@@ -147,13 +161,22 @@ MODULE_PARM_DESC(debug, "Activate debugging output");</div><div class='ctx'> /* Checks if the device a Geyser 2 (ANSI, ISO, JIS) */</div><div class='ctx'> static inline int atp_is_geyser_2(struct atp *dev)</div><div class='ctx'> {</div><div class='del'>-	int16_t productId = le16_to_cpu(dev-&gt;udev-&gt;descriptor.idProduct);</div><div class='add'>+	u16 productId = le16_to_cpu(dev-&gt;udev-&gt;descriptor.idProduct);</div><div class='ctx'> </div><div class='ctx'> 	return (productId == GEYSER_ANSI_PRODUCT_ID) ||</div><div class='ctx'> 		(productId == GEYSER_ISO_PRODUCT_ID) ||</div><div class='ctx'> 		(productId == GEYSER_JIS_PRODUCT_ID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int atp_is_geyser_3(struct atp *dev)</div><div class='add'>+{</div><div class='add'>+	u16 productId = le16_to_cpu(dev-&gt;udev-&gt;descriptor.idProduct);</div><div class='add'>+</div><div class='add'>+	return (productId == GEYSER3_ANSI_PRODUCT_ID) ||</div><div class='add'>+		(productId == GEYSER3_ISO_PRODUCT_ID) ||</div><div class='add'>+		(productId == GEYSER3_JIS_PRODUCT_ID);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int atp_calculate_abs(int *xy_sensors, int nb_sensors, int fact,</div><div class='ctx'> 			     int *z, int *fingers)</div><div class='ctx'> {</div><div class='hunk'>@@ -219,12 +242,33 @@ static void atp_complete(struct urb* urb, struct pt_regs* regs)</div><div class='ctx'> </div><div class='ctx'> 	/* drop incomplete datasets */</div><div class='ctx'> 	if (dev-&gt;urb-&gt;actual_length != dev-&gt;datalen) {</div><div class='del'>-		dprintk("appletouch: incomplete data package.\n");</div><div class='add'>+		dprintk("appletouch: incomplete data package"</div><div class='add'>+			" (first byte: %d, length: %d).\n",</div><div class='add'>+			dev-&gt;data[0], dev-&gt;urb-&gt;actual_length);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* reorder the sensors values */</div><div class='del'>-	if (atp_is_geyser_2(dev)) {</div><div class='add'>+	if (atp_is_geyser_3(dev)) {</div><div class='add'>+		memset(dev-&gt;xy_cur, 0, sizeof(dev-&gt;xy_cur));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The values are laid out like this:</div><div class='add'>+		 * -, Y1, Y2, -, Y3, Y4, -, ..., -, X1, X2, -, X3, X4, ...</div><div class='add'>+		 * '-' is an unused value.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* read X values */</div><div class='add'>+		for (i = 0, j = 19; i &lt; 20; i += 2, j += 3) {</div><div class='add'>+			dev-&gt;xy_cur[i] = dev-&gt;data[j + 1];</div><div class='add'>+			dev-&gt;xy_cur[i + 1] = dev-&gt;data[j + 2];</div><div class='add'>+		}</div><div class='add'>+		/* read Y values */</div><div class='add'>+		for (i = 0, j = 1; i &lt; 9; i += 2, j += 3) {</div><div class='add'>+			dev-&gt;xy_cur[ATP_XSENSORS + i] = dev-&gt;data[j + 1];</div><div class='add'>+			dev-&gt;xy_cur[ATP_XSENSORS + i + 1] = dev-&gt;data[j + 2];</div><div class='add'>+		}</div><div class='add'>+	} else if (atp_is_geyser_2(dev)) {</div><div class='ctx'> 		memset(dev-&gt;xy_cur, 0, sizeof(dev-&gt;xy_cur));</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -267,6 +311,9 @@ static void atp_complete(struct urb* urb, struct pt_regs* regs)</div><div class='ctx'> 		dev-&gt;x_old = dev-&gt;y_old = -1;</div><div class='ctx'> 		memcpy(dev-&gt;xy_old, dev-&gt;xy_cur, sizeof(dev-&gt;xy_old));</div><div class='ctx'> </div><div class='add'>+		if (atp_is_geyser_3(dev)) /* No 17" Macbooks (yet) */</div><div class='add'>+			goto exit;</div><div class='add'>+</div><div class='ctx'> 		/* 17" Powerbooks have extra X sensors */</div><div class='ctx'> 		for (i = (atp_is_geyser_2(dev)?15:16); i &lt; ATP_XSENSORS; i++) {</div><div class='ctx'> 			if (!dev-&gt;xy_cur[i]) continue;</div><div class='hunk'>@@ -414,7 +461,50 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id</div><div class='ctx'> 	dev-&gt;udev = udev;</div><div class='ctx'> 	dev-&gt;input = input_dev;</div><div class='ctx'> 	dev-&gt;overflowwarn = 0;</div><div class='del'>-	dev-&gt;datalen = (atp_is_geyser_2(dev)?64:81);</div><div class='add'>+	if (atp_is_geyser_3(dev))</div><div class='add'>+		dev-&gt;datalen = 64;</div><div class='add'>+	else if (atp_is_geyser_2(dev))</div><div class='add'>+		dev-&gt;datalen = 64;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;datalen = 81;</div><div class='add'>+</div><div class='add'>+	if (atp_is_geyser_3(dev)) {</div><div class='add'>+		/*</div><div class='add'>+		 * By default Geyser 3 device sends standard USB HID mouse</div><div class='add'>+		 * packets (Report ID 2). This code changes device mode, so it</div><div class='add'>+		 * sends raw sensor reports (Report ID 5).</div><div class='add'>+		 */</div><div class='add'>+		char data[8];</div><div class='add'>+		int size;</div><div class='add'>+</div><div class='add'>+		size = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),</div><div class='add'>+			ATP_GEYSER3_MODE_READ_REQUEST_ID,</div><div class='add'>+			USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			ATP_GEYSER3_MODE_REQUEST_VALUE,</div><div class='add'>+			ATP_GEYSER3_MODE_REQUEST_INDEX, &amp;data, 8, 5000);</div><div class='add'>+</div><div class='add'>+		if (size != 8) {</div><div class='add'>+			err("Could not do mode read request from device"</div><div class='add'>+							" (Geyser 3 mode)");</div><div class='add'>+			goto err_free_devs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Apply the mode switch */</div><div class='add'>+		data[0] = ATP_GEYSER3_MODE_VENDOR_VALUE;</div><div class='add'>+</div><div class='add'>+		size = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),</div><div class='add'>+			ATP_GEYSER3_MODE_WRITE_REQUEST_ID,</div><div class='add'>+			USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+			ATP_GEYSER3_MODE_REQUEST_VALUE,</div><div class='add'>+			ATP_GEYSER3_MODE_REQUEST_INDEX, &amp;data, 8, 5000);</div><div class='add'>+</div><div class='add'>+		if (size != 8) {</div><div class='add'>+			err("Could not do mode write request to device"</div><div class='add'>+							" (Geyser 3 mode)");</div><div class='add'>+			goto err_free_devs;</div><div class='add'>+		}</div><div class='add'>+		printk("appletouch Geyser 3 inited.\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='ctx'> 	if (!dev-&gt;urb) {</div><div class='hunk'>@@ -447,7 +537,15 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id</div><div class='ctx'> </div><div class='ctx'> 	set_bit(EV_ABS, input_dev-&gt;evbit);</div><div class='ctx'> </div><div class='del'>-	if (atp_is_geyser_2(dev)) {</div><div class='add'>+	if (atp_is_geyser_3(dev)) {</div><div class='add'>+		/*</div><div class='add'>+		 * MacBook have 20 X sensors, 10 Y sensors</div><div class='add'>+		 */</div><div class='add'>+		input_set_abs_params(input_dev, ABS_X, 0,</div><div class='add'>+				     ((20 - 1) * ATP_XFACT) - 1, ATP_FUZZ, 0);</div><div class='add'>+		input_set_abs_params(input_dev, ABS_Y, 0,</div><div class='add'>+				     ((10 - 1) * ATP_YFACT) - 1, ATP_FUZZ, 0);</div><div class='add'>+	} else if (atp_is_geyser_2(dev)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Oct 2005 15" PowerBooks have 15 X sensors, 17" are detected</div><div class='ctx'> 		 * later.</div><div class='head'>diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c<br/>index 99f986cb6e95..05d2d6012eb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/ati_remote.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/ati_remote.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/ati_remote.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/ati_remote.c</a></div><div class='hunk'>@@ -85,16 +85,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c<br/>index ab1a1ae24be9..ea71de81ca6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/ati_remote2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/ati_remote2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/ati_remote2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/ati_remote2.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_DESC    "ATI/Philips USB RF remote driver"</div><div class='ctx'> #define DRIVER_VERSION "0.1"</div><div class='head'>diff --git a/drivers/usb/input/fixp-arith.h b/drivers/usb/input/fixp-arith.h<br/>index b44d398de071..ed3d2da0c485 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/fixp-arith.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/fixp-arith.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/fixp-arith.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/fixp-arith.h</a></div><div class='hunk'>@@ -2,8 +2,6 @@</div><div class='ctx'> #define _FIXP_ARITH_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * $$</div><div class='del'>- *</div><div class='ctx'>  * Simplistic fixed-point arithmetics.</div><div class='ctx'>  * Hmm, I'm probably duplicating some code :(</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,20 +29,20 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='del'>-// The type representing fixed-point values</div><div class='add'>+/* The type representing fixed-point values */</div><div class='ctx'> typedef s16 fixp_t;</div><div class='ctx'> </div><div class='ctx'> #define FRAC_N 8</div><div class='ctx'> #define FRAC_MASK ((1&lt;&lt;FRAC_N)-1)</div><div class='ctx'> </div><div class='del'>-// Not to be used directly. Use fixp_{cos,sin}</div><div class='del'>-static const fixp_t cos_table[45] = {</div><div class='add'>+/* Not to be used directly. Use fixp_{cos,sin} */</div><div class='add'>+static const fixp_t cos_table[46] = {</div><div class='ctx'> 	0x0100,	0x00FF,	0x00FF,	0x00FE,	0x00FD,	0x00FC,	0x00FA,	0x00F8,</div><div class='ctx'> 	0x00F6,	0x00F3,	0x00F0,	0x00ED,	0x00E9,	0x00E6,	0x00E2,	0x00DD,</div><div class='ctx'> 	0x00D9,	0x00D4,	0x00CF,	0x00C9,	0x00C4,	0x00BE,	0x00B8,	0x00B1,</div><div class='ctx'> 	0x00AB,	0x00A4,	0x009D,	0x0096,	0x008F,	0x0087,	0x0080,	0x0078,</div><div class='ctx'> 	0x0070,	0x0068,	0x005F,	0x0057,	0x004F,	0x0046,	0x003D,	0x0035,</div><div class='del'>-	0x002C,	0x0023,	0x001A,	0x0011,	0x0008</div><div class='add'>+	0x002C,	0x0023,	0x001A,	0x0011,	0x0008, 0x0000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -68,9 +66,8 @@ static inline fixp_t fixp_cos(unsigned int degrees)</div><div class='ctx'> 	int quadrant = (degrees / 90) &amp; 3;</div><div class='ctx'> 	unsigned int i = degrees % 90;</div><div class='ctx'> </div><div class='del'>-	if (quadrant == 1 || quadrant == 3) {</div><div class='del'>-		i = 89 - i;</div><div class='del'>-	}</div><div class='add'>+	if (quadrant == 1 || quadrant == 3)</div><div class='add'>+		i = 90 - i;</div><div class='ctx'> </div><div class='ctx'> 	i &gt;&gt;= 1;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c<br/>index 435273e7c85c..8ea9c915fbf9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/hid-core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid-core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/hid-core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/hid-core.c</a></div><div class='hunk'>@@ -944,21 +944,28 @@ static void hid_reset(void *_hid)</div><div class='ctx'> 	dev_dbg(&amp;hid-&gt;intf-&gt;dev, "resetting device\n");</div><div class='ctx'> 	rc = rc_lock = usb_lock_device_for_reset(hid-&gt;dev, hid-&gt;intf);</div><div class='ctx'> 	if (rc_lock &gt;= 0) {</div><div class='del'>-		rc = usb_reset_device(hid-&gt;dev);</div><div class='add'>+		rc = usb_reset_composite_device(hid-&gt;dev, hid-&gt;intf);</div><div class='ctx'> 		if (rc_lock)</div><div class='ctx'> 			usb_unlock_device(hid-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_bit(HID_RESET_PENDING, &amp;hid-&gt;iofl);</div><div class='ctx'> </div><div class='del'>-	if (rc == 0) {</div><div class='del'>-		hid-&gt;retry_delay = 0;</div><div class='del'>-		if (hid_start_in(hid))</div><div class='add'>+	switch (rc) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (!test_bit(HID_IN_RUNNING, &amp;hid-&gt;iofl))</div><div class='ctx'> 			hid_io_error(hid);</div><div class='del'>-	} else if (!(rc == -ENODEV || rc == -EHOSTUNREACH || rc == -EINTR))</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		err("can't reset device, %s-%s/input%d, status %d",</div><div class='ctx'> 				hid-&gt;dev-&gt;bus-&gt;bus_name,</div><div class='ctx'> 				hid-&gt;dev-&gt;devpath,</div><div class='ctx'> 				hid-&gt;ifnum, rc);</div><div class='add'>+		/* FALLTHROUGH */</div><div class='add'>+	case -EHOSTUNREACH:</div><div class='add'>+	case -ENODEV:</div><div class='add'>+	case -EINTR:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Main I/O error handler */</div><div class='hunk'>@@ -1374,9 +1381,6 @@ void hid_close(struct hid_device *hid)</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_PANJIT		0x134c</div><div class='ctx'> </div><div class='del'>-#define USB_VENDOR_ID_SILVERCREST	0x062a</div><div class='del'>-#define USB_DEVICE_ID_SILVERCREST_KB	0x0201</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize all reports</div><div class='ctx'>  */</div><div class='hunk'>@@ -1461,9 +1465,6 @@ void hid_init_reports(struct hid_device *hid)</div><div class='ctx'> #define USB_VENDOR_ID_ONTRAK		0x0a07</div><div class='ctx'> #define USB_DEVICE_ID_ONTRAK_ADU100	0x0064</div><div class='ctx'> </div><div class='del'>-#define USB_VENDOR_ID_TANGTOP		0x0d3d</div><div class='del'>-#define USB_DEVICE_ID_TANGTOP_USBPS2	0x0001</div><div class='del'>-</div><div class='ctx'> #define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f</div><div class='ctx'> #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100</div><div class='ctx'> </div><div class='hunk'>@@ -1506,6 +1507,9 @@ void hid_init_reports(struct hid_device *hid)</div><div class='ctx'> #define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104</div><div class='ctx'> #define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866</div><div class='ctx'> </div><div class='add'>+#define USB_VENDOR_ID_WISEGROUP_LTD	0x6677</div><div class='add'>+#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802</div><div class='add'>+</div><div class='ctx'> #define USB_VENDOR_ID_CODEMERCS		0x07c0</div><div class='ctx'> #define USB_DEVICE_ID_CODEMERCS_IOW40	0x1500</div><div class='ctx'> #define USB_DEVICE_ID_CODEMERCS_IOW24	0x1501</div><div class='hunk'>@@ -1520,12 +1524,6 @@ void hid_init_reports(struct hid_device *hid)</div><div class='ctx'> #define USB_DEVICE_ID_MCC_PMD1024LS	0x0076</div><div class='ctx'> #define USB_DEVICE_ID_MCC_PMD1208LS	0x007a</div><div class='ctx'> </div><div class='del'>-#define USB_VENDOR_ID_CHICONY		0x04f2</div><div class='del'>-#define USB_DEVICE_ID_CHICONY_USBHUB_KB	0x0100</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_BTC		0x046e</div><div class='del'>-#define USB_DEVICE_ID_BTC_KEYBOARD	0x5303</div><div class='del'>-</div><div class='ctx'> #define USB_VENDOR_ID_VERNIER		0x08f7</div><div class='ctx'> #define USB_DEVICE_ID_VERNIER_LABPRO	0x0001</div><div class='ctx'> #define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002</div><div class='hunk'>@@ -1549,20 +1547,13 @@ void hid_init_reports(struct hid_device *hid)</div><div class='ctx'> #define USB_DEVICE_ID_LD_MACHINETEST	0x2040</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_APPLE		0x05ac</div><div class='del'>-#define USB_DEVICE_ID_APPLE_POWERMOUSE	0x0304</div><div class='add'>+#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_CHERRY		0x046a</div><div class='ctx'> #define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023</div><div class='ctx'> </div><div class='del'>-#define USB_VENDOR_ID_HP		0x03f0</div><div class='del'>-#define USB_DEVICE_ID_HP_USBHUB_KB	0x020c</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_IBM		0x04b3</div><div class='del'>-#define USB_DEVICE_ID_IBM_USBHUB_KB	0x3005</div><div class='del'>-</div><div class='del'>-#define USB_VENDOR_ID_CREATIVELABS	0x062a</div><div class='del'>-#define USB_DEVICE_ID_CREATIVELABS_SILVERCREST	0x0201</div><div class='del'>-</div><div class='add'>+#define USB_VENDOR_ID_YEALINK		0x6993</div><div class='add'>+#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001</div><div class='ctx'> /*</div><div class='ctx'>  * Alphabetically sorted blacklist by quirk type.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1671,6 +1662,7 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_DTF + 3, HID_QUIRK_IGNORE },</div><div class='ctx'> 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },</div><div class='ctx'> 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },</div><div class='add'>+	{ USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K, HID_QUIRK_IGNORE },</div><div class='ctx'> </div><div class='ctx'> 	{ USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE },</div><div class='ctx'> 	{ USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },</div><div class='hunk'>@@ -1680,16 +1672,10 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_KEYBOARD, HID_QUIRK_NOGET},</div><div class='del'>-	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},</div><div class='del'>-	{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_USBHUB_KB, HID_QUIRK_NOGET },</div><div class='del'>-	{ USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },</div><div class='ctx'> 	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },</div><div class='del'>-	{ USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET },</div><div class='add'>+	{ USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },</div><div class='ctx'> </div><div class='del'>-	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },</div><div class='ctx'> 	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },</div><div class='ctx'> 	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE, HID_QUIRK_2WHEEL_MOUSE_HACK_5 },</div><div class='ctx'> </div><div class='hunk'>@@ -1711,6 +1697,9 @@ static const struct hid_blacklist {</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='add'>+	{ USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='ctx'> 	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },</div><div class='ctx'> </div><div class='hunk'>@@ -1794,6 +1783,14 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)</div><div class='ctx'> 			(hid_blacklist[n].idProduct == le16_to_cpu(dev-&gt;descriptor.idProduct)))</div><div class='ctx'> 				quirks = hid_blacklist[n].quirks;</div><div class='ctx'> </div><div class='add'>+	/* Many keyboards and mice don't like to be polled for reports,</div><div class='add'>+	 * so we will always set the HID_QUIRK_NOGET flag for them. */</div><div class='add'>+	if (interface-&gt;desc.bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT) {</div><div class='add'>+		if (interface-&gt;desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_KEYBOARD ||</div><div class='add'>+			interface-&gt;desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)</div><div class='add'>+				quirks |= HID_QUIRK_NOGET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (quirks &amp; HID_QUIRK_IGNORE)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -2080,11 +2077,29 @@ static int hid_resume(struct usb_interface *intf)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(HID_SUSPENDED, &amp;hid-&gt;iofl);</div><div class='add'>+	hid-&gt;retry_delay = 0;</div><div class='ctx'> 	status = hid_start_in(hid);</div><div class='ctx'> 	dev_dbg(&amp;intf-&gt;dev, "resume status %d\n", status);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Treat USB reset pretty much the same as suspend/resume */</div><div class='add'>+static void hid_pre_reset(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: What if the interface is already suspended? */</div><div class='add'>+	hid_suspend(intf, PMSG_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hid_post_reset(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev (intf);</div><div class='add'>+</div><div class='add'>+	hid_set_idle(dev, intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber, 0, 0);</div><div class='add'>+	/* FIXME: Any more reinitialization needed? */</div><div class='add'>+</div><div class='add'>+	hid_resume(intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct usb_device_id hid_usb_ids [] = {</div><div class='ctx'> 	{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,</div><div class='ctx'> 		.bInterfaceClass = USB_INTERFACE_CLASS_HID },</div><div class='hunk'>@@ -2099,6 +2114,8 @@ static struct usb_driver hid_driver = {</div><div class='ctx'> 	.disconnect =	hid_disconnect,</div><div class='ctx'> 	.suspend =	hid_suspend,</div><div class='ctx'> 	.resume =	hid_resume,</div><div class='add'>+	.pre_reset =	hid_pre_reset,</div><div class='add'>+	.post_reset =	hid_post_reset,</div><div class='ctx'> 	.id_table =	hid_usb_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/input/hid-debug.h b/drivers/usb/input/hid-debug.h<br/>index 702c48c2f81b..f04d6d75c098 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/hid-debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid-debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/hid-debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/hid-debug.h</a></div><div class='hunk'>@@ -563,7 +563,7 @@ static char *keys[KEY_MAX + 1] = {</div><div class='ctx'> 	[KEY_VOLUMEUP] = "VolumeUp",		[KEY_POWER] = "Power",</div><div class='ctx'> 	[KEY_KPEQUAL] = "KPEqual",		[KEY_KPPLUSMINUS] = "KPPlusMinus",</div><div class='ctx'> 	[KEY_PAUSE] = "Pause",			[KEY_KPCOMMA] = "KPComma",</div><div class='del'>-	[KEY_HANGUEL] = "Hanguel",		[KEY_HANJA] = "Hanja",</div><div class='add'>+	[KEY_HANGUEL] = "Hangeul",		[KEY_HANJA] = "Hanja",</div><div class='ctx'> 	[KEY_YEN] = "Yen",			[KEY_LEFTMETA] = "LeftMeta",</div><div class='ctx'> 	[KEY_RIGHTMETA] = "RightMeta",		[KEY_COMPOSE] = "Compose",</div><div class='ctx'> 	[KEY_STOP] = "Stop",			[KEY_AGAIN] = "Again",</div><div class='head'>diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c<br/>index 25bc85f8ce39..028e1ad89f5d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/hid-input.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid-input.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/hid-input.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/hid-input.c</a></div><div class='hunk'>@@ -29,9 +29,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> </div><div class='hunk'>@@ -567,16 +565,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_bit(usage-&gt;type, input-&gt;evbit);</div><div class='del'>-</div><div class='del'>-	while (usage-&gt;code &lt;= max &amp;&amp; test_and_set_bit(usage-&gt;code, bit))</div><div class='del'>-		usage-&gt;code = find_next_zero_bit(bit, max + 1, usage-&gt;code);</div><div class='del'>-</div><div class='del'>-	if (usage-&gt;code &gt; max)</div><div class='del'>-		goto ignore;</div><div class='del'>-</div><div class='del'>-	if (((device-&gt;quirks &amp; (HID_QUIRK_2WHEEL_POWERMOUSE)) &amp;&amp; (usage-&gt;hid == 0x00010032)))</div><div class='del'>-		map_rel(REL_HWHEEL);</div><div class='add'>+	if (device-&gt;quirks &amp; HID_QUIRK_MIGHTYMOUSE) {</div><div class='add'>+		if (usage-&gt;hid == HID_GD_Z)</div><div class='add'>+			map_rel(REL_HWHEEL);</div><div class='add'>+		else if (usage-&gt;code == BTN_1)</div><div class='add'>+			map_key(BTN_2);</div><div class='add'>+		else if (usage-&gt;code == BTN_2)</div><div class='add'>+			map_key(BTN_1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((device-&gt;quirks &amp; (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5)) &amp;&amp;</div><div class='ctx'> 		 (usage-&gt;type == EV_REL) &amp;&amp; (usage-&gt;code == REL_WHEEL))</div><div class='hunk'>@@ -586,6 +582,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel</div><div class='ctx'> 		|| ((device-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_7) &amp;&amp; (usage-&gt;hid == 0x00090007)))</div><div class='ctx'> 		goto ignore;</div><div class='ctx'> </div><div class='add'>+	set_bit(usage-&gt;type, input-&gt;evbit);</div><div class='add'>+</div><div class='add'>+	while (usage-&gt;code &lt;= max &amp;&amp; test_and_set_bit(usage-&gt;code, bit))</div><div class='add'>+		usage-&gt;code = find_next_zero_bit(bit, max + 1, usage-&gt;code);</div><div class='add'>+</div><div class='add'>+	if (usage-&gt;code &gt; max)</div><div class='add'>+		goto ignore;</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	if (usage-&gt;type == EV_ABS) {</div><div class='ctx'> </div><div class='ctx'> 		int a = field-&gt;logical_minimum;</div><div class='hunk'>@@ -647,6 +652,11 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((hid-&gt;quirks &amp; HID_QUIRK_INVERT_HWHEEL) &amp;&amp; (usage-&gt;code == REL_HWHEEL)) {</div><div class='add'>+		input_event(input, usage-&gt;type, usage-&gt;code, -value);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((hid-&gt;quirks &amp; HID_QUIRK_2WHEEL_MOUSE_HACK_ON) &amp;&amp; (usage-&gt;code == REL_WHEEL)) {</div><div class='ctx'> 		input_event(input, usage-&gt;type, REL_HWHEEL, value);</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h<br/>index 9c62837b5b89..778e575de352 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/hid.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hid.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/hid.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/hid.h</a></div><div class='hunk'>@@ -41,6 +41,14 @@</div><div class='ctx'> #define USB_INTERFACE_CLASS_HID		3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * USB HID interface subclass and protocol codes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define USB_INTERFACE_SUBCLASS_BOOT	1</div><div class='add'>+#define USB_INTERFACE_PROTOCOL_KEYBOARD	1</div><div class='add'>+#define USB_INTERFACE_PROTOCOL_MOUSE	2</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * HID class requests</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -247,10 +255,11 @@ struct hid_item {</div><div class='ctx'> #define HID_QUIRK_2WHEEL_MOUSE_HACK_7		0x00000080</div><div class='ctx'> #define HID_QUIRK_2WHEEL_MOUSE_HACK_5		0x00000100</div><div class='ctx'> #define HID_QUIRK_2WHEEL_MOUSE_HACK_ON		0x00000200</div><div class='del'>-#define HID_QUIRK_2WHEEL_POWERMOUSE		0x00000400</div><div class='add'>+#define HID_QUIRK_MIGHTYMOUSE			0x00000400</div><div class='ctx'> #define HID_QUIRK_CYMOTION			0x00000800</div><div class='ctx'> #define HID_QUIRK_POWERBOOK_HAS_FN		0x00001000</div><div class='ctx'> #define HID_QUIRK_POWERBOOK_FN_ON		0x00002000</div><div class='add'>+#define HID_QUIRK_INVERT_HWHEEL			0x00004000</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This is the global environment of the parser. This information is</div><div class='head'>diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c<br/>index c4670e1d4654..70477f02cc29 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/hiddev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/hiddev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/hiddev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/hiddev.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  * e-mail - mail your message to Paul Stewart &lt;stewart@wetlogic.net&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c<br/>index 7618ae5c104f..86acb5f1907a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/itmtouch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/itmtouch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/itmtouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/itmtouch.c</a></div><div class='hunk'>@@ -39,14 +39,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* only an 8 byte buffer necessary for a single packet */</div><div class='ctx'> #define ITM_BUFSIZE			8</div><div class='head'>diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c<br/>index f6d5cead542b..604ade356ead 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/kbtab.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/kbtab.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/kbtab.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/kbtab.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='head'>diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c<br/>index 3d911976f378..4723b310f277 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/keyspan_remote.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/keyspan_remote.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/keyspan_remote.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/keyspan_remote.c</a></div><div class='hunk'>@@ -11,16 +11,13 @@</div><div class='ctx'>  * and Keyspan, Inc the manufacturers of the Keyspan USB DMR product.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION	"v0.1"</div><div class='ctx'> #define DRIVER_AUTHOR	"Michael Downey &lt;downey@zymeta.com&gt;"</div><div class='head'>diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c<br/>index f018953a5485..a9ccda8810e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/mtouchusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/mtouchusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/mtouchusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/mtouchusb.c</a></div><div class='hunk'>@@ -39,14 +39,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MTOUCHUSB_MIN_XC                0x0</div><div class='ctx'> #define MTOUCHUSB_MAX_RAW_XC            0x4000</div><div class='head'>diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c<br/>index fdf0f788062c..b3c0d0c3eae9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/powermate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/powermate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/powermate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/powermate.c</a></div><div class='hunk'>@@ -30,12 +30,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define POWERMATE_VENDOR	0x077d	/* Griffin Technology, Inc. */</div><div class='ctx'> #define POWERMATE_PRODUCT_NEW	0x0410	/* Griffin PowerMate */</div><div class='head'>diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c<br/>index 697c5e573a11..0149043ffb97 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/touchkitusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/touchkitusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/touchkitusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/touchkitusb.c</a></div><div class='hunk'>@@ -24,14 +24,11 @@</div><div class='ctx'> </div><div class='ctx'> //#define DEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TOUCHKIT_MIN_XC			0x0</div><div class='ctx'> #define TOUCHKIT_MAX_XC			0x07ff</div><div class='head'>diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c<br/>index 2f3edc26cb50..5067a6ae650f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/usbkbd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/usbkbd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/usbkbd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/usbkbd.c</a></div><div class='hunk'>@@ -29,10 +29,8 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='head'>diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c<br/>index af526135d210..446935b671d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/usbmouse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/usbmouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/usbmouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/usbmouse.c</a></div><div class='hunk'>@@ -28,11 +28,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='head'>diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c<br/>index e9a07c1e905b..3b175aa482cd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/usbtouchscreen.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/usbtouchscreen.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/usbtouchscreen.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/usbtouchscreen.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION		"v0.3"</div><div class='head'>diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c<br/>index cf84c6096f29..369461a70b72 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/wacom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/wacom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/wacom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/wacom.c</a></div><div class='hunk'>@@ -69,13 +69,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> #include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='head'>diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c<br/>index e278489a80c6..9889b1cda05b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/xpad.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/xpad.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/xpad.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/xpad.c</a></div><div class='hunk'>@@ -54,15 +54,12 @@</div><div class='ctx'>  * 2002-07-17 - 0.0.5 : simplified d-pad handling</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_VERSION "v0.0.5"</div><div class='ctx'> #define DRIVER_AUTHOR "Marko Friedemann &lt;mfr@bmx-chemnitz.de&gt;"</div><div class='head'>diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c<br/>index 37d2f0ba0319..575a4e672e96 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/input/yealink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/input/yealink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/input/yealink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/input/yealink.c</a></div><div class='hunk'>@@ -46,15 +46,12 @@</div><div class='ctx'>  *   20050816 henk	Merge 2.6.13-rc6</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "map_to_7segment.h"</div><div class='ctx'> #include "yealink.h"</div><div class='head'>diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig<br/>index 8ba6a701e9c1..88928a4be805 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/Kconfig</a></div><div class='hunk'>@@ -88,6 +88,20 @@ config USB_LED</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called usbled.</div><div class='ctx'> </div><div class='add'>+config USB_CYPRESS_CY7C63</div><div class='add'>+	tristate "Cypress CY7C63xxx USB driver support"</div><div class='add'>+	depends on USB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to connect a Cypress CY7C63xxx</div><div class='add'>+	  micro controller to your computer's USB port. Currently this</div><div class='add'>+	  driver supports the pre-programmed devices (incl. firmware)</div><div class='add'>+	  by AK Modul-Bus Computer GmbH.</div><div class='add'>+</div><div class='add'>+	  Please see: http://www.ak-modul-bus.de/stat/mikrocontroller.html</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called cypress_cy7c63.</div><div class='add'>+</div><div class='ctx'> config USB_CYTHERM</div><div class='ctx'> 	tristate "Cypress USB thermometer driver support"</div><div class='ctx'> 	depends on USB</div><div class='hunk'>@@ -137,6 +151,15 @@ config USB_IDMOUSE</div><div class='ctx'> </div><div class='ctx'> 	  See also &lt;http://www.fs.tum.de/~echtler/idmouse/&gt;.</div><div class='ctx'> </div><div class='add'>+config USB_APPLEDISPLAY</div><div class='add'>+	tristate "Apple Cinema Display support"</div><div class='add'>+	depends on USB</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to control the backlight of Apple Cinema</div><div class='add'>+	  Displays over USB. This driver provides a sysfs interface.</div><div class='add'>+</div><div class='ctx'> source "drivers/usb/misc/sisusbvga/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config USB_LD</div><div class='head'>diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile<br/>index 6c693bc68e2e..2927260c5812 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/Makefile</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.o</div><div class='add'>+obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o</div><div class='ctx'> obj-$(CONFIG_USB_CYTHERM)	+= cytherm.o</div><div class='ctx'> obj-$(CONFIG_USB_EMI26)		+= emi26.o</div><div class='ctx'> obj-$(CONFIG_USB_EMI62)		+= emi62.o</div><div class='hunk'>@@ -17,6 +18,7 @@ obj-$(CONFIG_USB_PHIDGETSERVO)	+= phidgetservo.o</div><div class='ctx'> obj-$(CONFIG_USB_RIO500)	+= rio500.o</div><div class='ctx'> obj-$(CONFIG_USB_TEST)		+= usbtest.o</div><div class='ctx'> obj-$(CONFIG_USB_USS720)	+= uss720.o</div><div class='add'>+obj-$(CONFIG_USB_APPLEDISPLAY)	+= appledisplay.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c<br/>new file mode 100644<br/>index 000000000000..bfde82f5d180<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/appledisplay.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/appledisplay.c</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+/*</div><div class='add'>+ * Apple Cinema Display driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  Michael Hanselmann (linux-kernel@hansmi.ch)</div><div class='add'>+ *</div><div class='add'>+ * Thanks to Caskey L. Dickson for his work with acdctl.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2 of the License, or</div><div class='add'>+ * (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; if not, write to the Free Software</div><div class='add'>+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;asm/semaphore.h&gt;</div><div class='add'>+</div><div class='add'>+#define APPLE_VENDOR_ID		0x05AC</div><div class='add'>+</div><div class='add'>+#define USB_REQ_GET_REPORT	0x01</div><div class='add'>+#define USB_REQ_SET_REPORT	0x09</div><div class='add'>+</div><div class='add'>+#define ACD_USB_TIMEOUT		250</div><div class='add'>+</div><div class='add'>+#define ACD_USB_EDID		0x0302</div><div class='add'>+#define ACD_USB_BRIGHTNESS	0x0310</div><div class='add'>+</div><div class='add'>+#define ACD_BTN_NONE		0</div><div class='add'>+#define ACD_BTN_BRIGHT_UP	3</div><div class='add'>+#define ACD_BTN_BRIGHT_DOWN	4</div><div class='add'>+</div><div class='add'>+#define ACD_URB_BUFFER_LEN	2</div><div class='add'>+#define ACD_MSG_BUFFER_LEN	2</div><div class='add'>+</div><div class='add'>+#define APPLEDISPLAY_DEVICE(prod)				\</div><div class='add'>+	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |		\</div><div class='add'>+		       USB_DEVICE_ID_MATCH_INT_CLASS |		\</div><div class='add'>+		       USB_DEVICE_ID_MATCH_INT_PROTOCOL,	\</div><div class='add'>+	.idVendor = APPLE_VENDOR_ID,				\</div><div class='add'>+	.idProduct = (prod),					\</div><div class='add'>+	.bInterfaceClass = USB_CLASS_HID,			\</div><div class='add'>+	.bInterfaceProtocol = 0x00</div><div class='add'>+</div><div class='add'>+/* table of devices that work with this driver */</div><div class='add'>+static struct usb_device_id appledisplay_table [] = {</div><div class='add'>+	{ APPLEDISPLAY_DEVICE(0x9218) },</div><div class='add'>+	{ APPLEDISPLAY_DEVICE(0x9219) },</div><div class='add'>+	{ APPLEDISPLAY_DEVICE(0x921d) },</div><div class='add'>+</div><div class='add'>+	/* Terminating entry */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, appledisplay_table);</div><div class='add'>+</div><div class='add'>+/* Structure to hold all of our device specific stuff */</div><div class='add'>+struct appledisplay {</div><div class='add'>+	struct usb_device *udev;	/* usb device */</div><div class='add'>+	struct urb *urb;		/* usb request block */</div><div class='add'>+	struct backlight_device *bd;	/* backlight device */</div><div class='add'>+	char *urbdata;			/* interrupt URB data buffer */</div><div class='add'>+	char *msgdata;			/* control message data buffer */</div><div class='add'>+</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	int button_pressed;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static atomic_t count_displays = ATOMIC_INIT(0);</div><div class='add'>+static struct workqueue_struct *wq;</div><div class='add'>+</div><div class='add'>+static void appledisplay_complete(struct urb *urb, struct pt_regs *regs)</div><div class='add'>+{</div><div class='add'>+	struct appledisplay *pdata = urb-&gt;context;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* success */</div><div class='add'>+		break;</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+		printk(KERN_ERR "appletouch: OVERFLOW with data "</div><div class='add'>+			"length %d, actual length is %d\n",</div><div class='add'>+			ACD_URB_BUFFER_LEN, pdata-&gt;urb-&gt;actual_length);</div><div class='add'>+	case -ECONNRESET:</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		/* This urb is terminated, clean up */</div><div class='add'>+		dbg("%s - urb shutting down with status: %d",</div><div class='add'>+			__FUNCTION__, urb-&gt;status);</div><div class='add'>+		return;</div><div class='add'>+	default:</div><div class='add'>+		dbg("%s - nonzero urb status received: %d",</div><div class='add'>+			__FUNCTION__, urb-&gt;status);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	switch(pdata-&gt;urbdata[1]) {</div><div class='add'>+	case ACD_BTN_BRIGHT_UP:</div><div class='add'>+	case ACD_BTN_BRIGHT_DOWN:</div><div class='add'>+		pdata-&gt;button_pressed = 1;</div><div class='add'>+		queue_work(wq, &amp;pdata-&gt;work);</div><div class='add'>+		break;</div><div class='add'>+	case ACD_BTN_NONE:</div><div class='add'>+	default:</div><div class='add'>+		pdata-&gt;button_pressed = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	retval = usb_submit_urb(pdata-&gt;urb, GFP_ATOMIC);</div><div class='add'>+	if (retval) {</div><div class='add'>+		err("%s - usb_submit_urb failed with result %d",</div><div class='add'>+			__FUNCTION__, retval);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int appledisplay_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct appledisplay *pdata = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	pdata-&gt;msgdata[0] = 0x10;</div><div class='add'>+	pdata-&gt;msgdata[1] = bd-&gt;props-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	retval = usb_control_msg(</div><div class='add'>+		pdata-&gt;udev,</div><div class='add'>+		usb_sndctrlpipe(pdata-&gt;udev, 0),</div><div class='add'>+		USB_REQ_SET_REPORT,</div><div class='add'>+		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+		ACD_USB_BRIGHTNESS,</div><div class='add'>+		0,</div><div class='add'>+		pdata-&gt;msgdata, 2,</div><div class='add'>+		ACD_USB_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int appledisplay_bl_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct appledisplay *pdata = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = usb_control_msg(</div><div class='add'>+		pdata-&gt;udev,</div><div class='add'>+		usb_rcvctrlpipe(pdata-&gt;udev, 0),</div><div class='add'>+		USB_REQ_GET_REPORT,</div><div class='add'>+		USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,</div><div class='add'>+		ACD_USB_BRIGHTNESS,</div><div class='add'>+		0,</div><div class='add'>+		pdata-&gt;msgdata, 2,</div><div class='add'>+		ACD_USB_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+	else</div><div class='add'>+		return pdata-&gt;msgdata[1];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties appledisplay_bl_data = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.get_brightness	= appledisplay_bl_get_brightness,</div><div class='add'>+	.update_status	= appledisplay_bl_update_status,</div><div class='add'>+	.max_brightness	= 0xFF</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void appledisplay_work(void *private)</div><div class='add'>+{</div><div class='add'>+	struct appledisplay *pdata = private;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	up(&amp;pdata-&gt;bd-&gt;sem);</div><div class='add'>+	retval = appledisplay_bl_get_brightness(pdata-&gt;bd);</div><div class='add'>+	if (retval &gt;= 0)</div><div class='add'>+		pdata-&gt;bd-&gt;props-&gt;brightness = retval;</div><div class='add'>+	down(&amp;pdata-&gt;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+	/* Poll again in about 125ms if there's still a button pressed */</div><div class='add'>+	if (pdata-&gt;button_pressed)</div><div class='add'>+		schedule_delayed_work(&amp;pdata-&gt;work, HZ / 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int appledisplay_probe(struct usb_interface *iface,</div><div class='add'>+	const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct appledisplay *pdata;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(iface);</div><div class='add'>+	struct usb_host_interface *iface_desc;</div><div class='add'>+	struct usb_endpoint_descriptor *endpoint;</div><div class='add'>+	int int_in_endpointAddr = 0;</div><div class='add'>+	int i, retval = -ENOMEM, brightness;</div><div class='add'>+	char bl_name[20];</div><div class='add'>+</div><div class='add'>+	/* set up the endpoint information */</div><div class='add'>+	/* use only the first interrupt-in endpoint */</div><div class='add'>+	iface_desc = iface-&gt;cur_altsetting;</div><div class='add'>+	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; i++) {</div><div class='add'>+		endpoint = &amp;iface_desc-&gt;endpoint[i].desc;</div><div class='add'>+		if (!int_in_endpointAddr &amp;&amp;</div><div class='add'>+		    (endpoint-&gt;bEndpointAddress &amp; USB_DIR_IN) &amp;&amp;</div><div class='add'>+		    ((endpoint-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK) ==</div><div class='add'>+		     USB_ENDPOINT_XFER_INT)) {</div><div class='add'>+			/* we found an interrupt in endpoint */</div><div class='add'>+			int_in_endpointAddr = endpoint-&gt;bEndpointAddress;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!int_in_endpointAddr) {</div><div class='add'>+		err("Could not find int-in endpoint");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allocate memory for our device state and initialize it */</div><div class='add'>+	pdata = kzalloc(sizeof(struct appledisplay), GFP_KERNEL);</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		err("Out of memory");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdata-&gt;udev = udev;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;pdata-&gt;lock);</div><div class='add'>+	INIT_WORK(&amp;pdata-&gt;work, appledisplay_work, pdata);</div><div class='add'>+</div><div class='add'>+	/* Allocate buffer for control messages */</div><div class='add'>+	pdata-&gt;msgdata = kmalloc(ACD_MSG_BUFFER_LEN, GFP_KERNEL);</div><div class='add'>+	if (!pdata-&gt;msgdata) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		err("appledisplay: Allocating buffer for control messages "</div><div class='add'>+			"failed");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate interrupt URB */</div><div class='add'>+	pdata-&gt;urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!pdata-&gt;urb) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		err("appledisplay: Allocating URB failed");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allocate buffer for interrupt data */</div><div class='add'>+	pdata-&gt;urbdata = usb_buffer_alloc(pdata-&gt;udev, ACD_URB_BUFFER_LEN,</div><div class='add'>+		GFP_KERNEL, &amp;pdata-&gt;urb-&gt;transfer_dma);</div><div class='add'>+	if (!pdata-&gt;urbdata) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		err("appledisplay: Allocating URB buffer failed");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure interrupt URB */</div><div class='add'>+	usb_fill_int_urb(pdata-&gt;urb, udev,</div><div class='add'>+		usb_rcvintpipe(udev, int_in_endpointAddr),</div><div class='add'>+		pdata-&gt;urbdata, ACD_URB_BUFFER_LEN, appledisplay_complete,</div><div class='add'>+		pdata, 1);</div><div class='add'>+	if (usb_submit_urb(pdata-&gt;urb, GFP_KERNEL)) {</div><div class='add'>+		retval = -EIO;</div><div class='add'>+		err("appledisplay: Submitting URB failed");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register backlight device */</div><div class='add'>+	snprintf(bl_name, sizeof(bl_name), "appledisplay%d",</div><div class='add'>+		atomic_inc_return(&amp;count_displays) - 1);</div><div class='add'>+	pdata-&gt;bd = backlight_device_register(bl_name, pdata,</div><div class='add'>+						&amp;appledisplay_bl_data);</div><div class='add'>+	if (IS_ERR(pdata-&gt;bd)) {</div><div class='add'>+		err("appledisplay: Backlight registration failed");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try to get brightness */</div><div class='add'>+	up(&amp;pdata-&gt;bd-&gt;sem);</div><div class='add'>+	brightness = appledisplay_bl_get_brightness(pdata-&gt;bd);</div><div class='add'>+	down(&amp;pdata-&gt;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+	if (brightness &lt; 0) {</div><div class='add'>+		retval = brightness;</div><div class='add'>+		err("appledisplay: Error while getting initial brightness: %d", retval);</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set brightness in backlight device */</div><div class='add'>+	up(&amp;pdata-&gt;bd-&gt;sem);</div><div class='add'>+	pdata-&gt;bd-&gt;props-&gt;brightness = brightness;</div><div class='add'>+	down(&amp;pdata-&gt;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+	/* save our data pointer in the interface device */</div><div class='add'>+	usb_set_intfdata(iface, pdata);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "appledisplay: Apple Cinema Display connected\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	if (pdata) {</div><div class='add'>+		if (pdata-&gt;urb) {</div><div class='add'>+			usb_kill_urb(pdata-&gt;urb);</div><div class='add'>+			if (pdata-&gt;urbdata)</div><div class='add'>+				usb_buffer_free(pdata-&gt;udev, ACD_URB_BUFFER_LEN,</div><div class='add'>+					pdata-&gt;urbdata, pdata-&gt;urb-&gt;transfer_dma);</div><div class='add'>+			usb_free_urb(pdata-&gt;urb);</div><div class='add'>+		}</div><div class='add'>+		if (pdata-&gt;bd)</div><div class='add'>+			backlight_device_unregister(pdata-&gt;bd);</div><div class='add'>+		kfree(pdata-&gt;msgdata);</div><div class='add'>+	}</div><div class='add'>+	usb_set_intfdata(iface, NULL);</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void appledisplay_disconnect(struct usb_interface *iface)</div><div class='add'>+{</div><div class='add'>+	struct appledisplay *pdata = usb_get_intfdata(iface);</div><div class='add'>+</div><div class='add'>+	if (pdata) {</div><div class='add'>+		usb_kill_urb(pdata-&gt;urb);</div><div class='add'>+		cancel_delayed_work(&amp;pdata-&gt;work);</div><div class='add'>+		backlight_device_unregister(pdata-&gt;bd);</div><div class='add'>+		usb_buffer_free(pdata-&gt;udev, ACD_URB_BUFFER_LEN,</div><div class='add'>+			pdata-&gt;urbdata, pdata-&gt;urb-&gt;transfer_dma);</div><div class='add'>+		usb_free_urb(pdata-&gt;urb);</div><div class='add'>+		kfree(pdata-&gt;msgdata);</div><div class='add'>+		kfree(pdata);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "appledisplay: Apple Cinema Display disconnected\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver appledisplay_driver = {</div><div class='add'>+	.name		= "appledisplay",</div><div class='add'>+	.probe		= appledisplay_probe,</div><div class='add'>+	.disconnect	= appledisplay_disconnect,</div><div class='add'>+	.id_table	= appledisplay_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init appledisplay_init(void)</div><div class='add'>+{</div><div class='add'>+	wq = create_singlethread_workqueue("appledisplay");</div><div class='add'>+	if (!wq) {</div><div class='add'>+		err("Could not create work queue\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return usb_register(&amp;appledisplay_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit appledisplay_exit(void)</div><div class='add'>+{</div><div class='add'>+	flush_workqueue(wq);</div><div class='add'>+	destroy_workqueue(wq);</div><div class='add'>+	usb_deregister(&amp;appledisplay_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Michael Hanselmann");</div><div class='add'>+MODULE_DESCRIPTION("Apple Cinema Display driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+module_init(appledisplay_init);</div><div class='add'>+module_exit(appledisplay_exit);</div><div class='head'>diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c<br/>new file mode 100644<br/>index 000000000000..e091d327bd9e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/cypress_cy7c63.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/cypress_cy7c63.c</a></div><div class='hunk'>@@ -0,0 +1,279 @@</div><div class='add'>+/*</div><div class='add'>+* cypress_cy7c63.c</div><div class='add'>+*</div><div class='add'>+* Copyright (c) 2006 Oliver Bock (o.bock@fh-wolfenbuettel.de)</div><div class='add'>+*</div><div class='add'>+*	This driver is based on the Cypress USB Driver by Marcus Maul</div><div class='add'>+*	(cyport) and the 2.0 version of Greg Kroah-Hartman's</div><div class='add'>+*	USB Skeleton driver.</div><div class='add'>+*</div><div class='add'>+*	This is a generic driver for the Cypress CY7C63xxx family.</div><div class='add'>+*	For the time being it enables you to read from and write to</div><div class='add'>+*	the single I/O ports of the device.</div><div class='add'>+*</div><div class='add'>+*	Supported vendors:	AK Modul-Bus Computer GmbH</div><div class='add'>+*	Supported devices:	CY7C63001A-PC (to be continued...)</div><div class='add'>+*	Supported functions:	Read/Write Ports (to be continued...)</div><div class='add'>+*</div><div class='add'>+*</div><div class='add'>+*	This program is free software; you can redistribute it and/or</div><div class='add'>+*	modify it under the terms of the GNU General Public License as</div><div class='add'>+*	published by the Free Software Foundation, version 2.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRIVER_AUTHOR		"Oliver Bock (o.bock@fh-wolfenbuettel.de)"</div><div class='add'>+#define DRIVER_DESC		"Cypress CY7C63xxx USB driver"</div><div class='add'>+</div><div class='add'>+#define CYPRESS_VENDOR_ID	0xa2c</div><div class='add'>+#define CYPRESS_PRODUCT_ID	0x8</div><div class='add'>+</div><div class='add'>+#define CYPRESS_READ_PORT	0x4</div><div class='add'>+#define CYPRESS_WRITE_PORT	0x5</div><div class='add'>+</div><div class='add'>+#define CYPRESS_READ_RAM	0x2</div><div class='add'>+#define CYPRESS_WRITE_RAM	0x3</div><div class='add'>+#define CYPRESS_READ_ROM	0x1</div><div class='add'>+</div><div class='add'>+#define CYPRESS_READ_PORT_ID0	0</div><div class='add'>+#define CYPRESS_WRITE_PORT_ID0	0</div><div class='add'>+#define CYPRESS_READ_PORT_ID1	0x2</div><div class='add'>+#define CYPRESS_WRITE_PORT_ID1	1</div><div class='add'>+</div><div class='add'>+#define CYPRESS_MAX_REQSIZE	8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* table of devices that work with this driver */</div><div class='add'>+static struct usb_device_id cypress_table [] = {</div><div class='add'>+	{ USB_DEVICE(CYPRESS_VENDOR_ID, CYPRESS_PRODUCT_ID) },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, cypress_table);</div><div class='add'>+</div><div class='add'>+/* structure to hold all of our device specific stuff */</div><div class='add'>+struct cypress {</div><div class='add'>+	struct usb_device *	udev;</div><div class='add'>+	unsigned char		port[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* used to send usb control messages to device */</div><div class='add'>+static int vendor_command(struct cypress *dev, unsigned char request,</div><div class='add'>+			  unsigned char address, unsigned char data)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+	unsigned int pipe;</div><div class='add'>+	unsigned char *iobuf;</div><div class='add'>+</div><div class='add'>+	/* allocate some memory for the i/o buffer*/</div><div class='add'>+	iobuf = kzalloc(CYPRESS_MAX_REQSIZE, GFP_KERNEL);</div><div class='add'>+	if (!iobuf) {</div><div class='add'>+		dev_err(&amp;dev-&gt;udev-&gt;dev, "Out of memory!\n");</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;dev-&gt;udev-&gt;dev, "Sending usb_control_msg (data: %d)\n", data);</div><div class='add'>+</div><div class='add'>+	/* prepare usb control message and send it upstream */</div><div class='add'>+	pipe = usb_rcvctrlpipe(dev-&gt;udev, 0);</div><div class='add'>+	retval = usb_control_msg(dev-&gt;udev, pipe, request,</div><div class='add'>+				 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,</div><div class='add'>+				 address, data, iobuf, CYPRESS_MAX_REQSIZE,</div><div class='add'>+				 USB_CTRL_GET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	/* store returned data (more READs to be added) */</div><div class='add'>+	switch (request) {</div><div class='add'>+		case CYPRESS_READ_PORT:</div><div class='add'>+			if (address == CYPRESS_READ_PORT_ID0) {</div><div class='add'>+				dev-&gt;port[0] = iobuf[1];</div><div class='add'>+				dev_dbg(&amp;dev-&gt;udev-&gt;dev,</div><div class='add'>+					"READ_PORT0 returned: %d\n",</div><div class='add'>+					dev-&gt;port[0]);</div><div class='add'>+			}</div><div class='add'>+			else if (address == CYPRESS_READ_PORT_ID1) {</div><div class='add'>+				dev-&gt;port[1] = iobuf[1];</div><div class='add'>+				dev_dbg(&amp;dev-&gt;udev-&gt;dev,</div><div class='add'>+					"READ_PORT1 returned: %d\n",</div><div class='add'>+					dev-&gt;port[1]);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(iobuf);</div><div class='add'>+error:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* write port value */</div><div class='add'>+static ssize_t write_port(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			  const char *buf, size_t count,</div><div class='add'>+			  int port_num, int write_id)</div><div class='add'>+{</div><div class='add'>+	int value = -1;</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct cypress *cyp = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cyp-&gt;udev-&gt;dev, "WRITE_PORT%d called\n", port_num);</div><div class='add'>+</div><div class='add'>+	/* validate input data */</div><div class='add'>+	if (sscanf(buf, "%d", &amp;value) &lt; 1) {</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (value &lt; 0 || value &gt; 255) {</div><div class='add'>+		result = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	result = vendor_command(cyp, CYPRESS_WRITE_PORT, write_id,</div><div class='add'>+				(unsigned char)value);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cyp-&gt;udev-&gt;dev, "Result of vendor_command: %d\n\n", result);</div><div class='add'>+error:</div><div class='add'>+	return result &lt; 0 ? result : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* attribute callback handler (write) */</div><div class='add'>+static ssize_t set_port0_handler(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	return write_port(dev, attr, buf, count, 0, CYPRESS_WRITE_PORT_ID0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* attribute callback handler (write) */</div><div class='add'>+static ssize_t set_port1_handler(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	return write_port(dev, attr, buf, count, 1, CYPRESS_WRITE_PORT_ID1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read port value */</div><div class='add'>+static ssize_t read_port(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			 char *buf, int port_num, int read_id)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(dev);</div><div class='add'>+	struct cypress *cyp = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cyp-&gt;udev-&gt;dev, "READ_PORT%d called\n", port_num);</div><div class='add'>+</div><div class='add'>+	result = vendor_command(cyp, CYPRESS_READ_PORT, read_id, 0);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;cyp-&gt;udev-&gt;dev, "Result of vendor_command: %d\n\n", result);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d", cyp-&gt;port[port_num]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* attribute callback handler (read) */</div><div class='add'>+static ssize_t get_port0_handler(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return read_port(dev, attr, buf, 0, CYPRESS_READ_PORT_ID0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* attribute callback handler (read) */</div><div class='add'>+static ssize_t get_port1_handler(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return read_port(dev, attr, buf, 1, CYPRESS_READ_PORT_ID1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(port0, S_IWUGO | S_IRUGO,</div><div class='add'>+		   get_port0_handler, set_port0_handler);</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR(port1, S_IWUGO | S_IRUGO,</div><div class='add'>+		   get_port1_handler, set_port1_handler);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int cypress_probe(struct usb_interface *interface,</div><div class='add'>+			 const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cypress *dev = NULL;</div><div class='add'>+	int retval = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* allocate memory for our device state and initialize it */</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (dev == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;udev-&gt;dev, "Out of memory!\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;udev = usb_get_dev(interface_to_usbdev(interface));</div><div class='add'>+</div><div class='add'>+	/* save our data pointer in this interface device */</div><div class='add'>+	usb_set_intfdata(interface, dev);</div><div class='add'>+</div><div class='add'>+	/* create device attribute files */</div><div class='add'>+	device_create_file(&amp;interface-&gt;dev, &amp;dev_attr_port0);</div><div class='add'>+	device_create_file(&amp;interface-&gt;dev, &amp;dev_attr_port1);</div><div class='add'>+</div><div class='add'>+	/* let the user know that the device is now attached */</div><div class='add'>+	dev_info(&amp;interface-&gt;dev,</div><div class='add'>+		 "Cypress CY7C63xxx device now attached\n");</div><div class='add'>+</div><div class='add'>+	retval = 0;</div><div class='add'>+error:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cypress_disconnect(struct usb_interface *interface)</div><div class='add'>+{</div><div class='add'>+	struct cypress *dev;</div><div class='add'>+</div><div class='add'>+	dev = usb_get_intfdata(interface);</div><div class='add'>+	usb_set_intfdata(interface, NULL);</div><div class='add'>+</div><div class='add'>+	/* remove device attribute files */</div><div class='add'>+	device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_port0);</div><div class='add'>+	device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_port1);</div><div class='add'>+</div><div class='add'>+	usb_put_dev(dev-&gt;udev);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;interface-&gt;dev,</div><div class='add'>+		 "Cypress CY7C63xxx device now disconnected\n");</div><div class='add'>+</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver cypress_driver = {</div><div class='add'>+	.name = "cypress_cy7c63",</div><div class='add'>+	.probe = cypress_probe,</div><div class='add'>+	.disconnect = cypress_disconnect,</div><div class='add'>+	.id_table = cypress_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init cypress_init(void)</div><div class='add'>+{</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	/* register this driver with the USB subsystem */</div><div class='add'>+	result = usb_register(&amp;cypress_driver);</div><div class='add'>+	if (result) {</div><div class='add'>+		err("Function usb_register failed! Error number: %d\n", result);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit cypress_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* deregister this driver with the USB subsystem */</div><div class='add'>+	usb_deregister(&amp;cypress_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(cypress_init);</div><div class='add'>+module_exit(cypress_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR(DRIVER_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRIVER_DESC);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c<br/>index a04204292aa3..b20bec445552 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/cytherm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/cytherm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/cytherm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/cytherm.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c<br/>index d0b167256699..fcd69c52aea9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/idmouse.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/idmouse.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/idmouse.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/idmouse.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c<br/>index 966acb474f67..f30ab1fbb3c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/ldusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/ldusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/ldusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/ldusb.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  * V0.13 (mh) Added support for LD X-Ray and Machine Test System</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c<br/>index 779bcf0373ad..7699d970e680 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/legousbtower.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/legousbtower.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/legousbtower.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/legousbtower.c</a></div><div class='hunk'>@@ -75,7 +75,6 @@</div><div class='ctx'>  *   - move reset into open to clean out spurious data</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c<br/>index 997db5d8e35b..bfbbbfbb92bc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/phidgetkit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/phidgetkit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/phidgetkit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/phidgetkit.c</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='ctx'> /*</div><div class='ctx'>  * USB PhidgetInterfaceKit driver 1.0</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2004 Sean Young &lt;sean@mess.org&gt;</div><div class='add'>+ * Copyright (C) 2004, 2006 Sean Young &lt;sean@mess.org&gt;</div><div class='add'>+ * Copyright (C) 2005 Daniel Saakes &lt;daniel@saakes.net&gt;</div><div class='ctx'>  * Copyright (C) 2004 Greg Kroah-Hartman &lt;greg@kroah.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify</div><div class='hunk'>@@ -12,7 +13,6 @@</div><div class='ctx'>  * This is a driver for the USB PhidgetInterfaceKit.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #define USB_VENDOR_ID_GLAB		0x06c2</div><div class='ctx'> #define USB_DEVICE_ID_INTERFACEKIT004	0x0040</div><div class='add'>+#define USB_DEVICE_ID_INTERFACEKIT01616	0x0044</div><div class='ctx'> #define USB_DEVICE_ID_INTERFACEKIT888	0x0045</div><div class='ctx'> #define USB_DEVICE_ID_INTERFACEKIT047	0x0051</div><div class='ctx'> #define USB_DEVICE_ID_INTERFACEKIT088	0x0053</div><div class='hunk'>@@ -32,7 +33,9 @@</div><div class='ctx'> #define USB_VENDOR_ID_WISEGROUP		0x0925</div><div class='ctx'> #define USB_DEVICE_ID_INTERFACEKIT884	0x8201</div><div class='ctx'> </div><div class='del'>-#define MAX_INTERFACES			8</div><div class='add'>+#define MAX_INTERFACES			16</div><div class='add'>+</div><div class='add'>+#define URB_INT_SIZE			8</div><div class='ctx'> </div><div class='ctx'> struct driver_interfacekit {</div><div class='ctx'> 	int sensors;</div><div class='hunk'>@@ -52,19 +55,24 @@ ifkit(8, 8, 8, 0);</div><div class='ctx'> ifkit(0, 4, 7, 1);</div><div class='ctx'> ifkit(8, 8, 4, 0);</div><div class='ctx'> ifkit(0, 8, 8, 1);</div><div class='add'>+ifkit(0, 16, 16, 0);</div><div class='ctx'> </div><div class='del'>-struct phidget_interfacekit {</div><div class='add'>+struct interfacekit {</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct usb_interface *intf;</div><div class='ctx'> 	struct driver_interfacekit *ifkit;</div><div class='del'>-	int outputs[MAX_INTERFACES];</div><div class='del'>-	int inputs[MAX_INTERFACES];</div><div class='del'>-	int sensors[MAX_INTERFACES];</div><div class='add'>+	unsigned long outputs;</div><div class='add'>+	u8 inputs[MAX_INTERFACES];</div><div class='add'>+	u16 sensors[MAX_INTERFACES];</div><div class='ctx'> 	u8 lcd_files_on;</div><div class='ctx'> </div><div class='ctx'> 	struct urb *irq;</div><div class='ctx'> 	unsigned char *data;</div><div class='ctx'> 	dma_addr_t data_dma;</div><div class='add'>+</div><div class='add'>+	struct work_struct do_notify;</div><div class='add'>+	unsigned long input_events;</div><div class='add'>+	unsigned long sensor_events;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id id_table[] = {</div><div class='hunk'>@@ -76,33 +84,33 @@ static struct usb_device_id id_table[] = {</div><div class='ctx'> 		.driver_info = (kernel_ulong_t)&amp;ph_047},</div><div class='ctx'> 	{USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_INTERFACEKIT088),</div><div class='ctx'> 		.driver_info = (kernel_ulong_t)&amp;ph_088},</div><div class='add'>+	{USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_INTERFACEKIT01616),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;ph_01616},</div><div class='ctx'> 	{USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_INTERFACEKIT884),</div><div class='ctx'> 		.driver_info = (kernel_ulong_t)&amp;ph_884},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, id_table);</div><div class='ctx'> </div><div class='del'>-static int change_outputs(struct phidget_interfacekit *kit, int output_num, int enable)</div><div class='add'>+static int change_outputs(struct interfacekit *kit, int output_num, int enable)</div><div class='ctx'> {</div><div class='del'>-	unsigned char *buffer;</div><div class='add'>+	u8 *buffer;</div><div class='ctx'> 	int retval;</div><div class='del'>-	int n;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		set_bit(output_num, &amp;kit-&gt;outputs);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(output_num, &amp;kit-&gt;outputs);</div><div class='ctx'> </div><div class='ctx'> 	buffer = kzalloc(4, GFP_KERNEL);</div><div class='ctx'> 	if (!buffer) {</div><div class='del'>-		dev_err(&amp;kit-&gt;udev-&gt;dev, "%s - out of memory\n",</div><div class='del'>-			__FUNCTION__);</div><div class='add'>+		dev_err(&amp;kit-&gt;udev-&gt;dev, "%s - out of memory\n", __FUNCTION__);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	buffer[0] = (u8)kit-&gt;outputs;</div><div class='add'>+	buffer[1] = (u8)(kit-&gt;outputs &gt;&gt; 8);</div><div class='ctx'> </div><div class='del'>-	kit-&gt;outputs[output_num] = enable;</div><div class='del'>-	for (n=0; n&lt;8; n++) {</div><div class='del'>-		if (kit-&gt;outputs[n]) {</div><div class='del'>-			buffer[0] |= 1 &lt;&lt; n;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;kit-&gt;udev-&gt;dev, "sending data: %02x\n", buffer[0]);</div><div class='add'>+	dev_dbg(&amp;kit-&gt;udev-&gt;dev, "sending data: 0x%04x\n", (u16)kit-&gt;outputs);</div><div class='ctx'> </div><div class='ctx'> 	retval = usb_control_msg(kit-&gt;udev,</div><div class='ctx'> 			 usb_sndctrlpipe(kit-&gt;udev, 0),</div><div class='hunk'>@@ -116,10 +124,10 @@ static int change_outputs(struct phidget_interfacekit *kit, int output_num, int</div><div class='ctx'> 	return retval &lt; 0 ? retval : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int change_string(struct phidget_interfacekit *kit, const char *display, unsigned char row)</div><div class='add'>+static int change_string(struct interfacekit *kit, const char *display, unsigned char row)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *buffer;</div><div class='del'>-        unsigned char *form_buffer;</div><div class='add'>+	unsigned char *form_buffer;</div><div class='ctx'> 	int retval = -ENOMEM;</div><div class='ctx'> 	int i,j, len, buf_ptr;</div><div class='ctx'> 	</div><div class='hunk'>@@ -175,7 +183,7 @@ exit:</div><div class='ctx'> static ssize_t lcd_line_##number(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)	\</div><div class='ctx'> {											\</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);				\</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);			\</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);				\</div><div class='ctx'> 	change_string(kit, buf, number - 1);						\</div><div class='ctx'> 	return count;									\</div><div class='ctx'> }											\</div><div class='hunk'>@@ -186,7 +194,7 @@ set_lcd_line(2);</div><div class='ctx'> static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);</div><div class='ctx'> 	int enabled;</div><div class='ctx'> 	unsigned char *buffer;</div><div class='ctx'> 	int retval = -ENOMEM;</div><div class='hunk'>@@ -220,7 +228,7 @@ exit:</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(backlight, S_IWUGO, NULL, set_backlight);</div><div class='ctx'> </div><div class='del'>-static void remove_lcd_files(struct phidget_interfacekit *kit)</div><div class='add'>+static void remove_lcd_files(struct interfacekit *kit)</div><div class='ctx'> {</div><div class='ctx'> 	if (kit-&gt;lcd_files_on) {</div><div class='ctx'> 		dev_dbg(&amp;kit-&gt;udev-&gt;dev, "Removing lcd files\n");</div><div class='hunk'>@@ -233,7 +241,7 @@ static void remove_lcd_files(struct phidget_interfacekit *kit)</div><div class='ctx'> static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);</div><div class='ctx'> 	int enable;</div><div class='ctx'> 	</div><div class='ctx'> 	if (kit-&gt;ifkit-&gt;has_lcd == 0)</div><div class='hunk'>@@ -263,10 +271,10 @@ static DEVICE_ATTR(lcd, S_IWUGO, NULL, enable_lcd_files);</div><div class='ctx'> </div><div class='ctx'> static void interfacekit_irq(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='del'>-	struct phidget_interfacekit *kit = urb-&gt;context;</div><div class='add'>+	struct interfacekit *kit = urb-&gt;context;</div><div class='ctx'> 	unsigned char *buffer = kit-&gt;data;</div><div class='add'>+	int i, level, sensor;</div><div class='ctx'> 	int status;</div><div class='del'>-	int n;</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:			/* success */</div><div class='hunk'>@@ -280,22 +288,63 @@ static void interfacekit_irq(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		goto resubmit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (n=0; n&lt;8; n++) {</div><div class='del'>-		kit-&gt;inputs[n] = buffer[1] &amp; (1 &lt;&lt; n) ? 1 : 0;</div><div class='add'>+	/* digital inputs */</div><div class='add'>+	if (kit-&gt;ifkit-&gt;inputs == 16) {</div><div class='add'>+		for (i=0; i &lt; 8; i++) {</div><div class='add'>+			level = (buffer[0] &gt;&gt; i) &amp; 1;</div><div class='add'>+			if (kit-&gt;inputs[i] != level) {</div><div class='add'>+				kit-&gt;inputs[i] = level;</div><div class='add'>+				set_bit(i, &amp;kit-&gt;input_events);</div><div class='add'>+			}</div><div class='add'>+			level = (buffer[1] &gt;&gt; i) &amp; 1;</div><div class='add'>+			if (kit-&gt;inputs[8 + i] != level) {</div><div class='add'>+				kit-&gt;inputs[8 + i] = level;</div><div class='add'>+				set_bit(8 + i, &amp;kit-&gt;input_events);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	else if (kit-&gt;ifkit-&gt;inputs == 8) {</div><div class='add'>+		for (i=0; i &lt; 8; i++) {</div><div class='add'>+			level = (buffer[1] &gt;&gt; i) &amp; 1;</div><div class='add'>+			if (kit-&gt;inputs[i] != level) {</div><div class='add'>+				kit-&gt;inputs[i] = level;</div><div class='add'>+				set_bit(i, &amp;kit-&gt;input_events);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (buffer[0] &amp; 1) {</div><div class='del'>-		kit-&gt;sensors[4] = buffer[2] + (buffer[3] &amp; 0x0f) * 256;</div><div class='del'>-		kit-&gt;sensors[5] = buffer[4] + (buffer[3] &amp; 0xf0) * 16;</div><div class='del'>-		kit-&gt;sensors[6] = buffer[5] + (buffer[6] &amp; 0x0f) * 256;</div><div class='del'>-		kit-&gt;sensors[7] = buffer[7] + (buffer[6] &amp; 0xf0) * 16;</div><div class='del'>-	} else {</div><div class='del'>-		kit-&gt;sensors[0] = buffer[2] + (buffer[3] &amp; 0x0f) * 256;</div><div class='del'>-		kit-&gt;sensors[1] = buffer[4] + (buffer[3] &amp; 0xf0) * 16;</div><div class='del'>-		kit-&gt;sensors[2] = buffer[5] + (buffer[6] &amp; 0x0f) * 256;</div><div class='del'>-		kit-&gt;sensors[3] = buffer[7] + (buffer[6] &amp; 0xf0) * 16;</div><div class='add'>+	/* analog inputs */</div><div class='add'>+	if (kit-&gt;ifkit-&gt;sensors) {</div><div class='add'>+		sensor = (buffer[0] &amp; 1) ? 4 : 0;</div><div class='add'>+</div><div class='add'>+		level = buffer[2] + (buffer[3] &amp; 0x0f) * 256;</div><div class='add'>+		if (level != kit-&gt;sensors[sensor]) {</div><div class='add'>+			kit-&gt;sensors[sensor] = level;</div><div class='add'>+			set_bit(sensor, &amp;kit-&gt;sensor_events);</div><div class='add'>+		}</div><div class='add'>+		sensor++;</div><div class='add'>+		level = buffer[4] + (buffer[3] &amp; 0xf0) * 16;</div><div class='add'>+		if (level != kit-&gt;sensors[sensor]) {</div><div class='add'>+			kit-&gt;sensors[sensor] = level;</div><div class='add'>+			set_bit(sensor, &amp;kit-&gt;sensor_events);</div><div class='add'>+		}</div><div class='add'>+		sensor++;</div><div class='add'>+		level = buffer[5] + (buffer[6] &amp; 0x0f) * 256;</div><div class='add'>+		if (level != kit-&gt;sensors[sensor]) {</div><div class='add'>+			kit-&gt;sensors[sensor] = level;</div><div class='add'>+			set_bit(sensor, &amp;kit-&gt;sensor_events);</div><div class='add'>+		}</div><div class='add'>+		sensor++;</div><div class='add'>+		level = buffer[7] + (buffer[6] &amp; 0xf0) * 16;</div><div class='add'>+		if (level != kit-&gt;sensors[sensor]) {</div><div class='add'>+			kit-&gt;sensors[sensor] = level;</div><div class='add'>+			set_bit(sensor, &amp;kit-&gt;sensor_events);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (kit-&gt;input_events || kit-&gt;sensor_events)</div><div class='add'>+		schedule_work(&amp;kit-&gt;do_notify);</div><div class='add'>+</div><div class='ctx'> resubmit:</div><div class='ctx'> 	status = usb_submit_urb(urb, SLAB_ATOMIC);</div><div class='ctx'> 	if (status)</div><div class='hunk'>@@ -304,20 +353,40 @@ resubmit:</div><div class='ctx'> 			kit-&gt;udev-&gt;devpath, status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void do_notify(void *data)</div><div class='add'>+{</div><div class='add'>+	struct interfacekit *kit = data;</div><div class='add'>+	int i;</div><div class='add'>+	char sysfs_file[8];</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;kit-&gt;ifkit-&gt;inputs; i++) {</div><div class='add'>+		if (test_and_clear_bit(i, &amp;kit-&gt;input_events)) {</div><div class='add'>+			sprintf(sysfs_file, "input%d", i + 1);</div><div class='add'>+			sysfs_notify(&amp;kit-&gt;intf-&gt;dev.kobj, NULL, sysfs_file);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i=0; i&lt;kit-&gt;ifkit-&gt;sensors; i++) {</div><div class='add'>+		if (test_and_clear_bit(i, &amp;kit-&gt;sensor_events)) {</div><div class='add'>+			sprintf(sysfs_file, "sensor%d", i + 1);</div><div class='add'>+			sysfs_notify(&amp;kit-&gt;intf-&gt;dev.kobj, NULL, sysfs_file);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define show_set_output(value)		\</div><div class='del'>-static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf, 	\</div><div class='add'>+static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf,	\</div><div class='ctx'> 							size_t count)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);	\</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);		\</div><div class='ctx'> 	int enabled;							\</div><div class='ctx'> 	int retval;							\</div><div class='ctx'> 									\</div><div class='del'>-	if (sscanf(buf, "%d", &amp;enabled) &lt; 1) {				\</div><div class='add'>+	if (sscanf(buf, "%d", &amp;enabled) &lt; 1)				\</div><div class='ctx'> 		return -EINVAL;						\</div><div class='del'>-	}								\</div><div class='ctx'> 									\</div><div class='del'>-	retval = change_outputs(kit, value - 1, enabled ? 1 : 0);	\</div><div class='add'>+	retval = change_outputs(kit, value - 1, enabled);		\</div><div class='ctx'> 									\</div><div class='ctx'> 	return retval ? retval : count;					\</div><div class='ctx'> }									\</div><div class='hunk'>@@ -325,9 +394,9 @@ static ssize_t set_output##value(struct device *dev, struct device_attribute *at</div><div class='ctx'> static ssize_t show_output##value(struct device *dev, struct device_attribute *attr, char *buf)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);	\</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);		\</div><div class='ctx'> 									\</div><div class='del'>-	return sprintf(buf, "%d\n", kit-&gt;outputs[value - 1]);		\</div><div class='add'>+	return sprintf(buf, "%d\n", !!test_bit(value - 1, &amp;kit-&gt;outputs));\</div><div class='ctx'> }									\</div><div class='ctx'> static DEVICE_ATTR(output##value, S_IWUGO | S_IRUGO,			\</div><div class='ctx'> 		show_output##value, set_output##value);</div><div class='hunk'>@@ -338,15 +407,23 @@ show_set_output(4);</div><div class='ctx'> show_set_output(5);</div><div class='ctx'> show_set_output(6);</div><div class='ctx'> show_set_output(7);</div><div class='del'>-show_set_output(8);	/* should be MAX_INTERFACES - 1 */</div><div class='add'>+show_set_output(8);</div><div class='add'>+show_set_output(9);</div><div class='add'>+show_set_output(10);</div><div class='add'>+show_set_output(11);</div><div class='add'>+show_set_output(12);</div><div class='add'>+show_set_output(13);</div><div class='add'>+show_set_output(14);</div><div class='add'>+show_set_output(15);</div><div class='add'>+show_set_output(16);</div><div class='ctx'> </div><div class='ctx'> #define show_input(value)	\</div><div class='ctx'> static ssize_t show_input##value(struct device *dev, struct device_attribute *attr, char *buf)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);	\</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);		\</div><div class='ctx'> 									\</div><div class='del'>-	return sprintf(buf, "%d\n", kit-&gt;inputs[value - 1]);		\</div><div class='add'>+	return sprintf(buf, "%d\n", (int)kit-&gt;inputs[value - 1]);	\</div><div class='ctx'> }									\</div><div class='ctx'> static DEVICE_ATTR(input##value, S_IRUGO, show_input##value, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -357,15 +434,23 @@ show_input(4);</div><div class='ctx'> show_input(5);</div><div class='ctx'> show_input(6);</div><div class='ctx'> show_input(7);</div><div class='del'>-show_input(8);		/* should be MAX_INTERFACES - 1 */</div><div class='add'>+show_input(8);</div><div class='add'>+show_input(9);</div><div class='add'>+show_input(10);</div><div class='add'>+show_input(11);</div><div class='add'>+show_input(12);</div><div class='add'>+show_input(13);</div><div class='add'>+show_input(14);</div><div class='add'>+show_input(15);</div><div class='add'>+show_input(16);</div><div class='ctx'> </div><div class='ctx'> #define show_sensor(value)	\</div><div class='ctx'> static ssize_t show_sensor##value(struct device *dev, struct device_attribute *attr, char *buf)	\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct usb_interface *intf = to_usb_interface(dev);		\</div><div class='del'>-	struct phidget_interfacekit *kit = usb_get_intfdata(intf);	\</div><div class='add'>+	struct interfacekit *kit = usb_get_intfdata(intf);		\</div><div class='ctx'> 									\</div><div class='del'>-	return sprintf(buf, "%d\n", kit-&gt;sensors[value - 1]);		\</div><div class='add'>+	return sprintf(buf, "%d\n", (int)kit-&gt;sensors[value - 1]);	\</div><div class='ctx'> }									\</div><div class='ctx'> static DEVICE_ATTR(sensor##value, S_IRUGO, show_sensor##value, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -376,16 +461,16 @@ show_sensor(4);</div><div class='ctx'> show_sensor(5);</div><div class='ctx'> show_sensor(6);</div><div class='ctx'> show_sensor(7);</div><div class='del'>-show_sensor(8);		/* should be MAX_INTERFACES - 1 */</div><div class='add'>+show_sensor(8);</div><div class='ctx'> </div><div class='ctx'> static int interfacekit_probe(struct usb_interface *intf, const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='ctx'> 	struct usb_host_interface *interface;</div><div class='ctx'> 	struct usb_endpoint_descriptor *endpoint;</div><div class='del'>-	struct phidget_interfacekit *kit;</div><div class='add'>+	struct interfacekit *kit;</div><div class='ctx'> 	struct driver_interfacekit *ifkit;</div><div class='del'>-	int pipe, maxp;</div><div class='add'>+	int pipe, maxp, rc = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ifkit = (struct driver_interfacekit *)id-&gt;driver_info;</div><div class='ctx'> 	if (!ifkit)</div><div class='hunk'>@@ -405,29 +490,23 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));</div><div class='ctx'> 	</div><div class='ctx'> 	kit = kzalloc(sizeof(*kit), GFP_KERNEL);</div><div class='del'>-	if (kit  == NULL) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "%s - out of memory\n", __FUNCTION__);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	kit-&gt;ifkit = ifkit;</div><div class='add'>+	if (!kit)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	kit-&gt;data = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &amp;kit-&gt;data_dma);</div><div class='del'>-	if (!kit-&gt;data) {</div><div class='del'>-		kfree(kit);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	kit-&gt;ifkit = ifkit;</div><div class='add'>+	kit-&gt;data = usb_buffer_alloc(dev, URB_INT_SIZE, SLAB_ATOMIC, &amp;kit-&gt;data_dma);</div><div class='add'>+	if (!kit-&gt;data)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	kit-&gt;irq = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-	if (!kit-&gt;irq) {</div><div class='del'>-		usb_buffer_free(dev, 8, kit-&gt;data, kit-&gt;data_dma);</div><div class='del'>-		kfree(kit);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!kit-&gt;irq)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	kit-&gt;udev = usb_get_dev(dev);</div><div class='ctx'> 	kit-&gt;intf = intf;</div><div class='add'>+	INIT_WORK(&amp;kit-&gt;do_notify, do_notify, kit);</div><div class='ctx'> 	usb_fill_int_urb(kit-&gt;irq, kit-&gt;udev, pipe, kit-&gt;data,</div><div class='del'>-			(maxp &gt; 8 ? 8 : maxp),</div><div class='add'>+			maxp &gt; URB_INT_SIZE ? URB_INT_SIZE : maxp,</div><div class='ctx'> 			interfacekit_irq, kit, endpoint-&gt;bInterval);</div><div class='ctx'> 	kit-&gt;irq-&gt;transfer_dma = kit-&gt;data_dma;</div><div class='ctx'> 	kit-&gt;irq-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='hunk'>@@ -435,7 +514,8 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 	usb_set_intfdata(intf, kit);</div><div class='ctx'> </div><div class='ctx'> 	if (usb_submit_urb(kit-&gt;irq, GFP_KERNEL)) {</div><div class='del'>-		return -EIO;</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifkit-&gt;outputs &gt;= 4) {</div><div class='hunk'>@@ -444,12 +524,22 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output3);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output4);</div><div class='ctx'> 	}</div><div class='del'>-	if (ifkit-&gt;outputs == 8) {</div><div class='add'>+	if (ifkit-&gt;outputs &gt;= 8) {</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output5);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output6);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output7);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output8);</div><div class='ctx'> 	} </div><div class='add'>+	if (ifkit-&gt;outputs == 16) {</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output9);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output10);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output11);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output12);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output13);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output14);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output15);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_output16);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifkit-&gt;inputs &gt;= 4) {</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input1);</div><div class='hunk'>@@ -457,12 +547,22 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input3);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input4);</div><div class='ctx'> 	}</div><div class='del'>-	if (ifkit-&gt;inputs == 8) {</div><div class='add'>+	if (ifkit-&gt;inputs &gt;= 8) {</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input5);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input6);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input7);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input8);</div><div class='ctx'> 	}</div><div class='add'>+	if (ifkit-&gt;inputs == 16) {</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input9);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input10);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input11);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input12);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input13);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input14);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input15);</div><div class='add'>+		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_input16);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifkit-&gt;sensors &gt;= 4) {</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_sensor1);</div><div class='hunk'>@@ -475,9 +575,8 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_sensor6);</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_sensor7);</div><div class='ctx'> 	}</div><div class='del'>-	if (ifkit-&gt;sensors == 8) {</div><div class='add'>+	if (ifkit-&gt;sensors == 8)</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_sensor8);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifkit-&gt;has_lcd)</div><div class='ctx'> 		device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_lcd);</div><div class='hunk'>@@ -486,29 +585,56 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic</div><div class='ctx'> 			ifkit-&gt;sensors, ifkit-&gt;inputs, ifkit-&gt;outputs);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (kit) {</div><div class='add'>+		if (kit-&gt;irq)</div><div class='add'>+			usb_free_urb(kit-&gt;irq);</div><div class='add'>+		if (kit-&gt;data)</div><div class='add'>+			usb_buffer_free(dev, URB_INT_SIZE, kit-&gt;data, kit-&gt;data_dma);</div><div class='add'>+		kfree(kit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void interfacekit_disconnect(struct usb_interface *interface)</div><div class='ctx'> {</div><div class='del'>-	struct phidget_interfacekit *kit;</div><div class='add'>+	struct interfacekit *kit;</div><div class='ctx'> </div><div class='ctx'> 	kit = usb_get_intfdata(interface);</div><div class='ctx'> 	usb_set_intfdata(interface, NULL);</div><div class='ctx'> 	if (!kit)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	usb_kill_urb(kit-&gt;irq);</div><div class='add'>+	usb_free_urb(kit-&gt;irq);</div><div class='add'>+	usb_buffer_free(kit-&gt;udev, URB_INT_SIZE, kit-&gt;data, kit-&gt;data_dma);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;kit-&gt;do_notify);</div><div class='add'>+</div><div class='ctx'> 	if (kit-&gt;ifkit-&gt;outputs &gt;= 4) {</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output1);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output2);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output3);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output4);</div><div class='ctx'> 	}</div><div class='del'>-	if (kit-&gt;ifkit-&gt;outputs == 8) {</div><div class='add'>+	if (kit-&gt;ifkit-&gt;outputs &gt;= 8) {</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output5);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output6);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output7);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output8);</div><div class='ctx'> 	}</div><div class='add'>+	if (kit-&gt;ifkit-&gt;outputs == 16) {</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output9);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output10);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output11);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output12);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output13);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output14);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output15);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_output16);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (kit-&gt;ifkit-&gt;inputs &gt;= 4) {</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input1);</div><div class='hunk'>@@ -516,12 +642,22 @@ static void interfacekit_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input3);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input4);</div><div class='ctx'> 	}</div><div class='del'>-	if (kit-&gt;ifkit-&gt;inputs == 8) {</div><div class='add'>+	if (kit-&gt;ifkit-&gt;inputs &gt;= 8) {</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input5);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input6);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input7);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input8);</div><div class='ctx'> 	}</div><div class='add'>+	if (kit-&gt;ifkit-&gt;inputs == 16) {</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input9);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input10);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input11);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input12);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input13);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input14);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input15);</div><div class='add'>+		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_input16);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (kit-&gt;ifkit-&gt;sensors &gt;= 4) {</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_sensor1);</div><div class='hunk'>@@ -534,19 +670,15 @@ static void interfacekit_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_sensor6);</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_sensor7);</div><div class='ctx'> 	}</div><div class='del'>-	if (kit-&gt;ifkit-&gt;sensors == 8) {</div><div class='add'>+	if (kit-&gt;ifkit-&gt;sensors == 8)</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_sensor8);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (kit-&gt;ifkit-&gt;has_lcd)</div><div class='ctx'> 		device_remove_file(&amp;interface-&gt;dev, &amp;dev_attr_lcd);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;interface-&gt;dev, "USB PhidgetInterfaceKit %d/%d/%d detached\n",</div><div class='ctx'> 		kit-&gt;ifkit-&gt;sensors, kit-&gt;ifkit-&gt;inputs, kit-&gt;ifkit-&gt;outputs);</div><div class='ctx'> </div><div class='del'>-	usb_kill_urb(kit-&gt;irq);</div><div class='del'>-	usb_free_urb(kit-&gt;irq);</div><div class='del'>-	usb_buffer_free(kit-&gt;udev, 8, kit-&gt;data, kit-&gt;data_dma);</div><div class='del'>-</div><div class='ctx'> 	usb_put_dev(kit-&gt;udev);</div><div class='ctx'> 	kfree(kit);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c<br/>index 5a040c205eed..c0df79c96538 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/phidgetservo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/phidgetservo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/phidgetservo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/phidgetservo.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c<br/>index 196c8794a73c..738bd7c7451f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/sisusbvga/sisusb.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -52,6 +53,7 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sisusb.h"</div><div class='add'>+#include "sisusb_init.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef INCL_SISUSB_CON</div><div class='ctx'> #include &lt;linux/font.h&gt;</div><div class='hunk'>@@ -62,36 +64,6 @@</div><div class='ctx'> /* Forward declarations / clean-up routines */</div><div class='ctx'> </div><div class='ctx'> #ifdef INCL_SISUSB_CON</div><div class='del'>-int	sisusb_setreg(struct sisusb_usb_data *sisusb, int port, u8 data);</div><div class='del'>-int	sisusb_getreg(struct sisusb_usb_data *sisusb, int port, u8 *data);</div><div class='del'>-int	sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data);</div><div class='del'>-int	sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data);</div><div class='del'>-int	sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,	u8 myand, u8 myor);</div><div class='del'>-int	sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor);</div><div class='del'>-int	sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand);</div><div class='del'>-</div><div class='del'>-int	sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);</div><div class='del'>-int	sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);</div><div class='del'>-int	sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data);</div><div class='del'>-int	sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data);</div><div class='del'>-int	sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,</div><div class='del'>-			u32 dest, int length, size_t *bytes_written);</div><div class='del'>-</div><div class='del'>-int	sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);</div><div class='del'>-</div><div class='del'>-extern int  SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);</div><div class='del'>-extern int  SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo);</div><div class='del'>-</div><div class='del'>-extern void sisusb_init_concode(void);</div><div class='del'>-extern int  sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last);</div><div class='del'>-extern void sisusb_console_exit(struct sisusb_usb_data *sisusb);</div><div class='del'>-</div><div class='del'>-extern void sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location);</div><div class='del'>-</div><div class='del'>-extern int  sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,</div><div class='del'>-		u8 *arg, int cmapsz, int ch512, int dorecalc,</div><div class='del'>-		struct vc_data *c, int fh, int uplock);</div><div class='del'>-</div><div class='ctx'> static int sisusb_first_vc = 0;</div><div class='ctx'> static int sisusb_last_vc = 0;</div><div class='ctx'> module_param_named(first, sisusb_first_vc, int, 0);</div><div class='hunk'>@@ -102,7 +74,7 @@ MODULE_PARM_DESC(last, "Number of last console to take over (1 - MAX_NR_CONSOLES</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver sisusb_driver;</div><div class='ctx'> </div><div class='del'>-DECLARE_MUTEX(disconnect_sem);</div><div class='add'>+DEFINE_MUTEX(disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> sisusb_free_buffers(struct sisusb_usb_data *sisusb)</div><div class='hunk'>@@ -1359,9 +1331,6 @@ sisusb_getreg(struct sisusb_usb_data *sisusb, int port, u8 *data)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef INCL_SISUSB_CON</div><div class='del'>-static</div><div class='del'>-#endif</div><div class='ctx'> int</div><div class='ctx'> sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1371,9 +1340,6 @@ sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef INCL_SISUSB_CON</div><div class='del'>-static</div><div class='del'>-#endif</div><div class='ctx'> int</div><div class='ctx'> sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1383,9 +1349,6 @@ sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef INCL_SISUSB_CON</div><div class='del'>-static</div><div class='del'>-#endif</div><div class='ctx'> int</div><div class='ctx'> sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,</div><div class='ctx'> 							u8 myand, u8 myor)</div><div class='hunk'>@@ -1415,18 +1378,12 @@ sisusb_setidxregmask(struct sisusb_usb_data *sisusb, int port, u8 idx,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef INCL_SISUSB_CON</div><div class='del'>-static</div><div class='del'>-#endif</div><div class='ctx'> int</div><div class='ctx'> sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor)</div><div class='ctx'> {</div><div class='ctx'> 	return(sisusb_setidxregandor(sisusb, port, index, 0xff, myor));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef INCL_SISUSB_CON</div><div class='del'>-static</div><div class='del'>-#endif</div><div class='ctx'> int</div><div class='ctx'> sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand)</div><div class='ctx'> {</div><div class='hunk'>@@ -1448,6 +1405,8 @@ sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data)</div><div class='ctx'> 	return(sisusb_read_memio_byte(sisusb, SISUSB_TYPE_MEM, adr, data));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data)</div><div class='ctx'> {</div><div class='hunk'>@@ -1460,6 +1419,8 @@ sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data)</div><div class='ctx'> 	return(sisusb_read_memio_word(sisusb, SISUSB_TYPE_MEM, adr, data));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif  /*  0  */</div><div class='add'>+</div><div class='ctx'> int</div><div class='ctx'> sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,</div><div class='ctx'> 			u32 dest, int length, size_t *bytes_written)</div><div class='hunk'>@@ -2552,39 +2513,39 @@ sisusb_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct usb_interface *interface;</div><div class='ctx'> 	int subminor = iminor(inode);</div><div class='ctx'> </div><div class='del'>-	down(&amp;disconnect_sem);</div><div class='add'>+	mutex_lock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!(interface = usb_find_interface(&amp;sisusb_driver, subminor))) {</div><div class='ctx'> 		printk(KERN_ERR "sisusb[%d]: Failed to find interface\n",</div><div class='ctx'> 				subminor);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(sisusb = usb_get_intfdata(interface))) {</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!sisusb-&gt;present || !sisusb-&gt;ready) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb-&gt;isopen) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sisusb-&gt;devinit) {</div><div class='ctx'> 		if (sisusb-&gt;sisusb_dev-&gt;speed == USB_SPEED_HIGH) {</div><div class='ctx'> 			if (sisusb_init_gfxdevice(sisusb, 0)) {</div><div class='del'>-				up(&amp;sisusb-&gt;lock);</div><div class='del'>-				up(&amp;disconnect_sem);</div><div class='add'>+				mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+				mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 				printk(KERN_ERR</div><div class='ctx'> 					"sisusbvga[%d]: Failed to initialize "</div><div class='ctx'> 					"device\n",</div><div class='hunk'>@@ -2592,8 +2553,8 @@ sisusb_open(struct inode *inode, struct file *file)</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			up(&amp;sisusb-&gt;lock);</div><div class='del'>-			up(&amp;disconnect_sem);</div><div class='add'>+			mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+			mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 			printk(KERN_ERR</div><div class='ctx'> 				"sisusbvga[%d]: Device not attached to "</div><div class='ctx'> 				"USB 2.0 hub\n",</div><div class='hunk'>@@ -2609,9 +2570,9 @@ sisusb_open(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = sisusb;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	up(&amp;disconnect_sem);</div><div class='add'>+	mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2642,14 +2603,14 @@ sisusb_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct sisusb_usb_data *sisusb;</div><div class='ctx'> 	int myminor;</div><div class='ctx'> </div><div class='del'>-	down(&amp;disconnect_sem);</div><div class='add'>+	mutex_lock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!(sisusb = (struct sisusb_usb_data *)file-&gt;private_data)) {</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb-&gt;present) {</div><div class='ctx'> 		/* Wait for all URBs to finish if device still present */</div><div class='hunk'>@@ -2662,12 +2623,12 @@ sisusb_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	sisusb-&gt;isopen = 0;</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* decrement the usage count on our device */</div><div class='ctx'> 	kref_put(&amp;sisusb-&gt;kref, sisusb_delete);</div><div class='ctx'> </div><div class='del'>-	up(&amp;disconnect_sem);</div><div class='add'>+	mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2685,11 +2646,11 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)</div><div class='ctx'> 	if (!(sisusb = (struct sisusb_usb_data *)file-&gt;private_data))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (!sisusb-&gt;present || !sisusb-&gt;ready || !sisusb-&gt;sisusb_dev) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2784,7 +2745,7 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)</div><div class='ctx'> 		    (*ppos) &lt;= SISUSB_PCI_PSEUDO_PCIBASE + 0x5c) {</div><div class='ctx'> </div><div class='ctx'> 		if (count != 4) {</div><div class='del'>-			up(&amp;sisusb-&gt;lock);</div><div class='add'>+			mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2808,7 +2769,7 @@ sisusb_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)</div><div class='ctx'> </div><div class='ctx'> 	(*ppos) += bytes_read;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return errno ? errno : bytes_read;</div><div class='ctx'> }</div><div class='hunk'>@@ -2827,11 +2788,11 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count,</div><div class='ctx'> 	if (!(sisusb = (struct sisusb_usb_data *)file-&gt;private_data))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (!sisusb-&gt;present || !sisusb-&gt;ready || !sisusb-&gt;sisusb_dev) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2930,7 +2891,7 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count,</div><div class='ctx'> 		    (*ppos) &lt;= SISUSB_PCI_PSEUDO_PCIBASE + SISUSB_PCI_PCONFSIZE) {</div><div class='ctx'> </div><div class='ctx'> 		if (count != 4) {</div><div class='del'>-			up(&amp;sisusb-&gt;lock);</div><div class='add'>+			mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2956,7 +2917,7 @@ sisusb_write(struct file *file, const char __user *buffer, size_t count,</div><div class='ctx'> </div><div class='ctx'> 	(*ppos) += bytes_written;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return errno ? errno : bytes_written;</div><div class='ctx'> }</div><div class='hunk'>@@ -2970,11 +2931,11 @@ sisusb_lseek(struct file *file, loff_t offset, int orig)</div><div class='ctx'> 	if (!(sisusb = (struct sisusb_usb_data *)file-&gt;private_data))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (!sisusb-&gt;present || !sisusb-&gt;ready || !sisusb-&gt;sisusb_dev) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2994,7 +2955,7 @@ sisusb_lseek(struct file *file, loff_t offset, int orig)</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3136,7 +3097,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 	if (!(sisusb = (struct sisusb_usb_data *)file-&gt;private_data))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (!sisusb-&gt;present || !sisusb-&gt;ready || !sisusb-&gt;sisusb_dev) {</div><div class='hunk'>@@ -3193,7 +3154,7 @@ sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3258,7 +3219,7 @@ static int sisusb_probe(struct usb_interface *intf,</div><div class='ctx'> 	}</div><div class='ctx'> 	kref_init(&amp;sisusb-&gt;kref);</div><div class='ctx'> </div><div class='del'>-	init_MUTEX(&amp;(sisusb-&gt;lock));</div><div class='add'>+	mutex_init(&amp;(sisusb-&gt;lock));</div><div class='ctx'> </div><div class='ctx'> 	/* Register device */</div><div class='ctx'> 	if ((retval = usb_register_dev(intf, &amp;usb_sisusb_class))) {</div><div class='hunk'>@@ -3429,9 +3390,9 @@ static void sisusb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	 * protect all other routines from the disconnect</div><div class='ctx'> 	 * case, not the other way round.</div><div class='ctx'> 	 */</div><div class='del'>-	down(&amp;disconnect_sem);</div><div class='add'>+	mutex_lock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for all URBs to complete and kill them in case (MUST do) */</div><div class='ctx'> 	if (!sisusb_wait_all_out_complete(sisusb))</div><div class='hunk'>@@ -3462,12 +3423,12 @@ static void sisusb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	sisusb-&gt;present = 0;</div><div class='ctx'> 	sisusb-&gt;ready = 0;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* decrement our usage count */</div><div class='ctx'> 	kref_put(&amp;sisusb-&gt;kref, sisusb_delete);</div><div class='ctx'> </div><div class='del'>-	up(&amp;disconnect_sem);</div><div class='add'>+	mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "sisusbvga[%d]: Disconnected\n", minor);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/misc/sisusbvga/sisusb.h b/drivers/usb/misc/sisusbvga/sisusb.h<br/>index a716825d1f9b..8e1120a64806 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/sisusbvga/sisusb.h</a></div><div class='hunk'>@@ -41,6 +41,8 @@</div><div class='ctx'> #define SISUSB_NEW_CONFIG_COMPAT</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='ctx'> /* For older kernels, support for text consoles is by default</div><div class='ctx'>  * off. To ensable text console support, change the following:</div><div class='ctx'>  */</div><div class='hunk'>@@ -60,11 +62,9 @@</div><div class='ctx'> #define INCL_SISUSB_CON		1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef INCL_SISUSB_CON</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include "sisusb_struct.h"</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* USB related */</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +116,7 @@ struct sisusb_usb_data {</div><div class='ctx'> 	struct usb_interface *interface;</div><div class='ctx'> 	struct kref kref;</div><div class='ctx'> 	wait_queue_head_t wait_q;	/* for syncind and timeouts */</div><div class='del'>-	struct semaphore lock;		/* general race avoidance */</div><div class='add'>+	struct mutex lock;		/* general race avoidance */</div><div class='ctx'> 	unsigned int ifnum;		/* interface number of the USB device */</div><div class='ctx'> 	int minor;			/* minor (for logging clarity) */</div><div class='ctx'> 	int isopen;			/* !=0 if open */</div><div class='head'>diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c<br/>index be5c1a25ae21..fb48feca8353 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_con.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_con.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_con.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/sisusbvga/sisusb_con.c</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -69,27 +70,9 @@</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sisusb.h"</div><div class='add'>+#include "sisusb_init.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef INCL_SISUSB_CON</div><div class='del'>-extern int sisusb_setreg(struct sisusb_usb_data *, int, u8);</div><div class='del'>-extern int sisusb_getreg(struct sisusb_usb_data *, int, u8 *);</div><div class='del'>-extern int sisusb_setidxreg(struct sisusb_usb_data *, int, u8, u8);</div><div class='del'>-extern int sisusb_getidxreg(struct sisusb_usb_data *, int, u8, u8 *);</div><div class='del'>-extern int sisusb_setidxregor(struct sisusb_usb_data *, int, u8, u8);</div><div class='del'>-extern int sisusb_setidxregand(struct sisusb_usb_data *, int, u8, u8);</div><div class='del'>-extern int sisusb_setidxregandor(struct sisusb_usb_data *, int, u8, u8, u8);</div><div class='del'>-</div><div class='del'>-extern int sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);</div><div class='del'>-extern int sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);</div><div class='del'>-extern int sisusb_writew(struct sisusb_usb_data *sisusb, u32 adr, u16 data);</div><div class='del'>-extern int sisusb_readw(struct sisusb_usb_data *sisusb, u32 adr, u16 *data);</div><div class='del'>-extern int sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,</div><div class='del'>-			u32 dest, int length, size_t *bytes_written);</div><div class='del'>-</div><div class='del'>-extern void sisusb_delete(struct kref *kref);</div><div class='del'>-extern int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);</div><div class='del'>-</div><div class='del'>-extern int SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);</div><div class='ctx'> </div><div class='ctx'> #define sisusbcon_writew(val, addr)	(*(addr) = (val))</div><div class='ctx'> #define sisusbcon_readw(addr)		(*(addr))</div><div class='hunk'>@@ -102,8 +85,6 @@ static struct sisusb_usb_data *mysisusbs[MAX_NR_CONSOLES];</div><div class='ctx'> /* Forward declaration */</div><div class='ctx'> static const struct consw sisusb_con;</div><div class='ctx'> </div><div class='del'>-extern struct semaphore disconnect_sem;</div><div class='del'>-</div><div class='ctx'> static inline void</div><div class='ctx'> sisusbcon_memsetw(u16 *s, u16 c, unsigned int count)</div><div class='ctx'> {</div><div class='hunk'>@@ -194,11 +175,11 @@ sisusb_get_sisusb_lock_and_check(unsigned short console)</div><div class='ctx'> 	if (!(sisusb = sisusb_get_sisusb(console)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!sisusb_sisusb_valid(sisusb) ||</div><div class='ctx'> 	    !sisusb-&gt;havethisconsole[console]) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -236,18 +217,18 @@ sisusbcon_init(struct vc_data *c, int init)</div><div class='ctx'> 	 * are set up/restored.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	down(&amp;disconnect_sem);</div><div class='add'>+	mutex_lock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!(sisusb = sisusb_get_sisusb(c-&gt;vc_num))) {</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!sisusb_sisusb_valid(sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -284,9 +265,9 @@ sisusbcon_init(struct vc_data *c, int init)</div><div class='ctx'> 	if (!*c-&gt;vc_uni_pagedir_loc)</div><div class='ctx'> 		con_set_default_unimap(c);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	up(&amp;disconnect_sem);</div><div class='add'>+	mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (init) {</div><div class='ctx'> 		c-&gt;vc_cols = cols;</div><div class='hunk'>@@ -306,14 +287,14 @@ sisusbcon_deinit(struct vc_data *c)</div><div class='ctx'> 	 * and others, ie not under our control.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	down(&amp;disconnect_sem);</div><div class='add'>+	mutex_lock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (!(sisusb = sisusb_get_sisusb(c-&gt;vc_num))) {</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear ourselves in mysisusbs */</div><div class='ctx'> 	mysisusbs[c-&gt;vc_num] = NULL;</div><div class='hunk'>@@ -332,12 +313,12 @@ sisusbcon_deinit(struct vc_data *c)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* decrement the usage count on our sisusb */</div><div class='ctx'> 	kref_put(&amp;sisusb-&gt;kref, sisusb_delete);</div><div class='ctx'> </div><div class='del'>-	up(&amp;disconnect_sem);</div><div class='add'>+	mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* interface routine */</div><div class='hunk'>@@ -417,7 +398,7 @@ sisusbcon_putc(struct vc_data *c, int ch, int y, int x)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -425,7 +406,7 @@ sisusbcon_putc(struct vc_data *c, int ch, int y, int x)</div><div class='ctx'> 	sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(x, y),</div><div class='ctx'> 				(u32)SISUSB_HADDR(x, y), 2, &amp;written);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Interface routine */</div><div class='hunk'>@@ -453,14 +434,14 @@ sisusbcon_putcs(struct vc_data *c, const unsigned short *s,</div><div class='ctx'> 		sisusbcon_writew(sisusbcon_readw(s++), dest++);</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(x, y),</div><div class='ctx'> 				(u32)SISUSB_HADDR(x, y), count * 2, &amp;written);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Interface routine */</div><div class='hunk'>@@ -504,7 +485,7 @@ sisusbcon_clear(struct vc_data *c, int y, int x, int height, int width)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -514,7 +495,7 @@ sisusbcon_clear(struct vc_data *c, int y, int x, int height, int width)</div><div class='ctx'> 	sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(x, y),</div><div class='ctx'> 				(u32)SISUSB_HADDR(x, y), length, &amp;written);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Interface routine */</div><div class='hunk'>@@ -576,7 +557,7 @@ sisusbcon_bmove(struct vc_data *c, int sy, int sx,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -586,7 +567,7 @@ sisusbcon_bmove(struct vc_data *c, int sy, int sx,</div><div class='ctx'> 	sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(dx, dy),</div><div class='ctx'> 				(u32)SISUSB_HADDR(dx, dy), length, &amp;written);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* interface routine */</div><div class='hunk'>@@ -609,7 +590,7 @@ sisusbcon_switch(struct vc_data *c)</div><div class='ctx'> </div><div class='ctx'> 	/* Don't write to screen if in gfx mode */</div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -618,7 +599,7 @@ sisusbcon_switch(struct vc_data *c)</div><div class='ctx'> 	 * as origin.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (c-&gt;vc_origin == (unsigned long)c-&gt;vc_screenbuf) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		printk(KERN_DEBUG "sisusb: ASSERT ORIGIN != SCREENBUF!\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -635,7 +616,7 @@ sisusbcon_switch(struct vc_data *c)</div><div class='ctx'> 				(u32)SISUSB_HADDR(0, 0),</div><div class='ctx'> 				length, &amp;written);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -657,7 +638,7 @@ sisusbcon_save_screen(struct vc_data *c)</div><div class='ctx'> 	/* sisusb-&gt;lock is down */</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -669,7 +650,7 @@ sisusbcon_save_screen(struct vc_data *c)</div><div class='ctx'> 	sisusbcon_memcpyw((u16 *)c-&gt;vc_screenbuf, (u16 *)c-&gt;vc_origin,</div><div class='ctx'> 								length);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* interface routine */</div><div class='hunk'>@@ -690,7 +671,7 @@ sisusbcon_set_palette(struct vc_data *c, unsigned char *table)</div><div class='ctx'> 	/* sisusb-&gt;lock is down */</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -705,7 +686,7 @@ sisusbcon_set_palette(struct vc_data *c, unsigned char *table)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -728,7 +709,7 @@ sisusbcon_blank(struct vc_data *c, int blank, int mode_switch)</div><div class='ctx'> 		sisusb-&gt;is_gfx = blank ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -777,7 +758,7 @@ sisusbcon_blank(struct vc_data *c, int blank, int mode_switch)</div><div class='ctx'> 			cr63  = 0x40;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			up(&amp;sisusb-&gt;lock);</div><div class='add'>+			mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -788,7 +769,7 @@ sisusbcon_blank(struct vc_data *c, int blank, int mode_switch)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -809,7 +790,7 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines)</div><div class='ctx'> 	/* sisusb-&gt;lock is down */</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -849,7 +830,7 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines)</div><div class='ctx'> </div><div class='ctx'> 	sisusbcon_set_start_address(sisusb, c);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -867,7 +848,7 @@ sisusbcon_cursor(struct vc_data *c, int mode)</div><div class='ctx'> 	/* sisusb-&gt;lock is down */</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -879,7 +860,7 @@ sisusbcon_cursor(struct vc_data *c, int mode)</div><div class='ctx'> 	if (mode == CM_ERASE) {</div><div class='ctx'> 		sisusb_setidxregor(sisusb, SISCR, 0x0a, 0x20);</div><div class='ctx'> 		sisusb-&gt;sisusb_cursor_size_to = -1;</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -919,7 +900,7 @@ sisusbcon_cursor(struct vc_data *c, int mode)</div><div class='ctx'> 		sisusb-&gt;sisusb_cursor_size_to   = to;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -961,7 +942,7 @@ sisusbcon_scroll_area(struct vc_data *c, struct sisusb_usb_data *sisusb,</div><div class='ctx'> 	sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(0, t),</div><div class='ctx'> 				(u32)SISUSB_HADDR(0, t), length, &amp;written);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -994,7 +975,7 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int dir, int lines)</div><div class='ctx'> 	/* sisusb-&gt;lock is down */</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1084,7 +1065,7 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int dir, int lines)</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;vc_pos = c-&gt;vc_pos - oldorigin + c-&gt;vc_origin;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1106,7 +1087,7 @@ sisusbcon_set_origin(struct vc_data *c)</div><div class='ctx'> 	/* sisusb-&gt;lock is down */</div><div class='ctx'> </div><div class='ctx'> 	if (sisusb_is_inactive(c, sisusb) || sisusb-&gt;con_blanked) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1116,7 +1097,7 @@ sisusbcon_set_origin(struct vc_data *c)</div><div class='ctx'> </div><div class='ctx'> 	sisusb-&gt;con_rolled_over = 0;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1133,7 +1114,7 @@ sisusbcon_resize(struct vc_data *c, unsigned int newcols, unsigned int newrows)</div><div class='ctx'> </div><div class='ctx'> 	fh = sisusb-&gt;current_font_height;</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* We are quite unflexible as regards resizing. The vt code</div><div class='ctx'> 	 * handles sizes where the line length isn't equal the pitch</div><div class='hunk'>@@ -1167,7 +1148,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,</div><div class='ctx'> </div><div class='ctx'> 	if ((slot != 0 &amp;&amp; slot != 2) || !fh) {</div><div class='ctx'> 		if (uplock)</div><div class='del'>-			up(&amp;sisusb-&gt;lock);</div><div class='add'>+			mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1327,7 +1308,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (uplock)</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (dorecalc &amp;&amp; c) {</div><div class='ctx'> 		int i, rows = c-&gt;vc_scan_lines / fh;</div><div class='hunk'>@@ -1351,7 +1332,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,</div><div class='ctx'> </div><div class='ctx'> font_op_error:</div><div class='ctx'> 	if (uplock)</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -1417,19 +1398,19 @@ sisusbcon_font_get(struct vc_data *c, struct console_font *font)</div><div class='ctx'> 	font-&gt;charcount = 256;</div><div class='ctx'> </div><div class='ctx'> 	if (!font-&gt;data) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sisusb-&gt;font_backup) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Copy 256 chars only, like vgacon */</div><div class='ctx'> 	memcpy(font-&gt;data, sisusb-&gt;font_backup, 256 * 32);</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1486,7 +1467,7 @@ static int sisusbdummycon_dummy(void)</div><div class='ctx'> </div><div class='ctx'> #define SISUSBCONDUMMY	(void *)sisusbdummycon_dummy</div><div class='ctx'> </div><div class='del'>-const struct consw sisusb_dummy_con = {</div><div class='add'>+static const struct consw sisusb_dummy_con = {</div><div class='ctx'> 	.owner =		THIS_MODULE,</div><div class='ctx'> 	.con_startup =		sisusbdummycon_startup,</div><div class='ctx'> 	.con_init =		sisusbdummycon_init,</div><div class='hunk'>@@ -1512,14 +1493,14 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret, minor = sisusb-&gt;minor;</div><div class='ctx'> </div><div class='del'>-	down(&amp;disconnect_sem);</div><div class='add'>+	mutex_lock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='del'>-	down(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_lock(&amp;sisusb-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Erm.. that should not happen */</div><div class='ctx'> 	if (sisusb-&gt;haveconsole || !sisusb-&gt;SiS_Pr) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1529,15 +1510,15 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last)</div><div class='ctx'> 	if (first &gt; last ||</div><div class='ctx'> 	    first &gt; MAX_NR_CONSOLES ||</div><div class='ctx'> 	    last &gt; MAX_NR_CONSOLES) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If gfxcore not initialized or no consoles given, quit graciously */</div><div class='ctx'> 	if (!sisusb-&gt;gfxinit || first &lt; 1 || last &lt; 1) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1547,8 +1528,8 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last)</div><div class='ctx'> </div><div class='ctx'> 	/* Set up text mode (and upload  default font) */</div><div class='ctx'> 	if (sisusb_reset_text_mode(sisusb, 1)) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 			"sisusbvga[%d]: Failed to set up text mode\n",</div><div class='ctx'> 			minor);</div><div class='hunk'>@@ -1571,16 +1552,16 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate screen buffer */</div><div class='ctx'> 	if (!(sisusb-&gt;scrbuf = (unsigned long)vmalloc(sisusb-&gt;scrbuf_size))) {</div><div class='del'>-		up(&amp;sisusb-&gt;lock);</div><div class='del'>-		up(&amp;disconnect_sem);</div><div class='add'>+		mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+		mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 			"sisusbvga[%d]: Failed to allocate screen buffer\n",</div><div class='ctx'> 			minor);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;sisusb-&gt;lock);</div><div class='del'>-	up(&amp;disconnect_sem);</div><div class='add'>+	mutex_unlock(&amp;sisusb-&gt;lock);</div><div class='add'>+	mutex_unlock(&amp;disconnect_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Now grab the desired console(s) */</div><div class='ctx'> 	ret = take_over_console(&amp;sisusb_con, first - 1, last - 1, 0);</div><div class='head'>diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.c b/drivers/usb/misc/sisusbvga/sisusb_init.c<br/>index 044fa4482f9f..9b30f8962814 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/sisusbvga/sisusb_init.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -74,6 +73,7 @@ SiSUSB_InitPtr(struct SiS_Private *SiS_Pr)</div><div class='ctx'> /*            HELPER: Get ModeID             */</div><div class='ctx'> /*********************************************/</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> unsigned short</div><div class='ctx'> SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)</div><div class='ctx'> {</div><div class='hunk'>@@ -157,6 +157,7 @@ SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth)</div><div class='ctx'> </div><div class='ctx'> 	return ModeIndex;</div><div class='ctx'> }</div><div class='add'>+#endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> /*********************************************/</div><div class='ctx'> /*          HELPER: SetReg, GetReg           */</div><div class='hunk'>@@ -233,7 +234,7 @@ SiS_DisplayOn(struct SiS_Private *SiS_Pr)</div><div class='ctx'> /*        HELPER: Init Port Addresses        */</div><div class='ctx'> /*********************************************/</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+static void</div><div class='ctx'> SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr)</div><div class='ctx'> {</div><div class='ctx'> 	SiS_Pr-&gt;SiS_P3c4 = BaseAddr + 0x14;</div><div class='head'>diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.h b/drivers/usb/misc/sisusbvga/sisusb_init.h<br/>index 5b11577835c8..f05f83268af4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_init.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/sisusbvga/sisusb_init.h</a></div><div class='hunk'>@@ -690,7 +690,7 @@ static const struct SiS_CRT1Table SiSUSB_CRT1Table[] =</div><div class='ctx'>    0x41}}   /* 0x54 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct SiS_VCLKData SiSUSB_VCLKData[] =</div><div class='add'>+static const struct SiS_VCLKData SiSUSB_VCLKData[] =</div><div class='ctx'> {</div><div class='ctx'> 	{ 0x1b,0xe1, 25}, /* 0x00 */</div><div class='ctx'> 	{ 0x4e,0xe4, 28}, /* 0x01 */</div><div class='hunk'>@@ -808,8 +808,8 @@ static struct SiS_VCLKData SiSUSB_VCLKData[] =</div><div class='ctx'> 	{ 0x2b,0xc2, 35}  /* 0x71 768@576@60 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void		SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr);</div><div class='del'>-unsigned short	SiSUSB_GetModeID(int HDisplay, int VDisplay, int Depth);</div><div class='add'>+extern struct mutex disconnect_mutex;</div><div class='add'>+</div><div class='ctx'> int		SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo);</div><div class='ctx'> int		SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo);</div><div class='ctx'> </div><div class='hunk'>@@ -826,5 +826,19 @@ extern int	sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port,</div><div class='ctx'> extern int	sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port,</div><div class='ctx'> 					u8 idx, u8 myand);</div><div class='ctx'> </div><div class='add'>+void sisusb_delete(struct kref *kref);</div><div class='add'>+int sisusb_writeb(struct sisusb_usb_data *sisusb, u32 adr, u8 data);</div><div class='add'>+int sisusb_readb(struct sisusb_usb_data *sisusb, u32 adr, u8 *data);</div><div class='add'>+int sisusb_copy_memory(struct sisusb_usb_data *sisusb, char *src,</div><div class='add'>+		       u32 dest, int length, size_t *bytes_written);</div><div class='add'>+int sisusb_reset_text_mode(struct sisusb_usb_data *sisusb, int init);</div><div class='add'>+int sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,</div><div class='add'>+			 u8 *arg, int cmapsz, int ch512, int dorecalc,</div><div class='add'>+			 struct vc_data *c, int fh, int uplock);</div><div class='add'>+void sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location);</div><div class='add'>+int sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last);</div><div class='add'>+void sisusb_console_exit(struct sisusb_usb_data *sisusb);</div><div class='add'>+void sisusb_init_concode(void);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/sisusbvga/sisusb_struct.h b/drivers/usb/misc/sisusbvga/sisusb_struct.h<br/>index 94edd4726c42..f325ecb29a61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_struct.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/sisusbvga/sisusb_struct.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/sisusbvga/sisusb_struct.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/sisusbvga/sisusb_struct.h</a></div><div class='hunk'>@@ -161,7 +161,7 @@ struct SiS_Private</div><div class='ctx'> 	const struct SiS_Ext		*SiS_EModeIDTable;</div><div class='ctx'> 	const struct SiS_Ext2		*SiS_RefIndex;</div><div class='ctx'> 	const struct SiS_CRT1Table	*SiS_CRT1Table;</div><div class='del'>-	struct SiS_VCLKData		*SiS_VCLKData;</div><div class='add'>+	const struct SiS_VCLKData	*SiS_VCLKData;</div><div class='ctx'> 	const struct SiS_ModeResInfo	*SiS_ModeResInfo;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c<br/>index c82c402285a0..e095772dd8e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/usblcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/usblcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/usblcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/usblcd.c</a></div><div class='hunk'>@@ -200,10 +200,8 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, siz</div><div class='ctx'> </div><div class='ctx'> 	/* create a urb, and a buffer for it, and copy the data to the urb */</div><div class='ctx'> 	urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-	if (!urb) {</div><div class='del'>-		retval = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	if (!urb)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	</div><div class='ctx'> 	buf = usb_buffer_alloc(dev-&gt;udev, count, GFP_KERNEL, &amp;urb-&gt;transfer_dma);</div><div class='ctx'> 	if (!buf) {</div><div class='head'>diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c<br/>index f441964132c0..0c5ee0ad6bb9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/usbled.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/usbled.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/usbled.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/usbled.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c<br/>index ccc5e8238bd8..786e1dbe88ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/misc/usbtest.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/misc/usbtest.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/misc/usbtest.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/misc/usbtest.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -802,7 +801,9 @@ error:</div><div class='ctx'> </div><div class='ctx'> 				if (u == urb || !u-&gt;dev)</div><div class='ctx'> 					continue;</div><div class='add'>+				spin_unlock(&amp;ctx-&gt;lock);</div><div class='ctx'> 				status = usb_unlink_urb (u);</div><div class='add'>+				spin_lock(&amp;ctx-&gt;lock);</div><div class='ctx'> 				switch (status) {</div><div class='ctx'> 				case -EINPROGRESS:</div><div class='ctx'> 				case -EBUSY:</div><div class='hunk'>@@ -1335,7 +1336,9 @@ struct iso_context {</div><div class='ctx'> 	unsigned		pending;</div><div class='ctx'> 	spinlock_t		lock;</div><div class='ctx'> 	struct completion	done;</div><div class='add'>+	int			submit_error;</div><div class='ctx'> 	unsigned long		errors;</div><div class='add'>+	unsigned long		packet_count;</div><div class='ctx'> 	struct usbtest_dev	*dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1346,10 +1349,14 @@ static void iso_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	spin_lock(&amp;ctx-&gt;lock);</div><div class='ctx'> 	ctx-&gt;count--;</div><div class='ctx'> </div><div class='add'>+	ctx-&gt;packet_count += urb-&gt;number_of_packets;</div><div class='ctx'> 	if (urb-&gt;error_count &gt; 0)</div><div class='ctx'> 		ctx-&gt;errors += urb-&gt;error_count;</div><div class='add'>+	else if (urb-&gt;status != 0)</div><div class='add'>+		ctx-&gt;errors += urb-&gt;number_of_packets;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;status == 0 &amp;&amp; ctx-&gt;count &gt; (ctx-&gt;pending - 1)) {</div><div class='add'>+	if (urb-&gt;status == 0 &amp;&amp; ctx-&gt;count &gt; (ctx-&gt;pending - 1)</div><div class='add'>+			&amp;&amp; !ctx-&gt;submit_error) {</div><div class='ctx'> 		int status = usb_submit_urb (urb, GFP_ATOMIC);</div><div class='ctx'> 		switch (status) {</div><div class='ctx'> 		case 0:</div><div class='hunk'>@@ -1360,6 +1367,8 @@ static void iso_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 					status);</div><div class='ctx'> 			/* FALLTHROUGH */</div><div class='ctx'> 		case -ENODEV:			/* disconnected */</div><div class='add'>+		case -ESHUTDOWN:		/* endpoint disabled */</div><div class='add'>+			ctx-&gt;submit_error = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1369,8 +1378,8 @@ static void iso_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	if (ctx-&gt;pending == 0) {</div><div class='ctx'> 		if (ctx-&gt;errors)</div><div class='ctx'> 			dev_dbg (&amp;ctx-&gt;dev-&gt;intf-&gt;dev,</div><div class='del'>-				"iso test, %lu errors\n",</div><div class='del'>-				ctx-&gt;errors);</div><div class='add'>+				"iso test, %lu errors out of %lu\n",</div><div class='add'>+				ctx-&gt;errors, ctx-&gt;packet_count);</div><div class='ctx'> 		complete (&amp;ctx-&gt;done);</div><div class='ctx'> 	}</div><div class='ctx'> done:</div><div class='hunk'>@@ -1431,15 +1440,14 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,</div><div class='ctx'> 	struct usb_device	*udev;</div><div class='ctx'> 	unsigned		i;</div><div class='ctx'> 	unsigned long		packets = 0;</div><div class='del'>-	int			status;</div><div class='add'>+	int			status = 0;</div><div class='ctx'> 	struct urb		*urbs[10];	/* FIXME no limit */</div><div class='ctx'> </div><div class='ctx'> 	if (param-&gt;sglen &gt; 10)</div><div class='ctx'> 		return -EDOM;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;context, 0, sizeof context);</div><div class='ctx'> 	context.count = param-&gt;iterations * param-&gt;sglen;</div><div class='del'>-	context.pending = param-&gt;sglen;</div><div class='del'>-	context.errors = 0;</div><div class='ctx'> 	context.dev = dev;</div><div class='ctx'> 	init_completion (&amp;context.done);</div><div class='ctx'> 	spin_lock_init (&amp;context.lock);</div><div class='hunk'>@@ -1471,6 +1479,7 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq (&amp;context.lock);</div><div class='ctx'> 	for (i = 0; i &lt; param-&gt;sglen; i++) {</div><div class='add'>+		++context.pending;</div><div class='ctx'> 		status = usb_submit_urb (urbs [i], SLAB_ATOMIC);</div><div class='ctx'> 		if (status &lt; 0) {</div><div class='ctx'> 			ERROR (dev, "submit iso[%d], error %d\n", i, status);</div><div class='hunk'>@@ -1481,12 +1490,26 @@ test_iso_queue (struct usbtest_dev *dev, struct usbtest_param *param,</div><div class='ctx'> </div><div class='ctx'> 			simple_free_urb (urbs [i]);</div><div class='ctx'> 			context.pending--;</div><div class='add'>+			context.submit_error = 1;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq (&amp;context.lock);</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion (&amp;context.done);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Isochronous transfers are expected to fail sometimes.  As an</div><div class='add'>+	 * arbitrary limit, we will report an error if any submissions</div><div class='add'>+	 * fail or if the transfer failure rate is &gt; 10%.</div><div class='add'>+	 */</div><div class='add'>+	if (status != 0)</div><div class='add'>+		;</div><div class='add'>+	else if (context.submit_error)</div><div class='add'>+		status = -EACCES;</div><div class='add'>+	else if (context.errors &gt; context.packet_count / 10)</div><div class='add'>+		status = -EIO;</div><div class='add'>+	return status;</div><div class='ctx'> </div><div class='ctx'> fail:</div><div class='ctx'> 	for (i = 0; i &lt; param-&gt;sglen; i++) {</div><div class='head'>diff --git a/drivers/usb/mon/mon_dma.c b/drivers/usb/mon/mon_dma.c<br/>index 0a1367b760a0..ddcfc01e77a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_dma.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_dma.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_dma.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/mon/mon_dma.c</a></div><div class='hunk'>@@ -13,7 +13,10 @@</div><div class='ctx'> #include &lt;linux/usb.h&gt;	/* Only needed for declarations in usb_mon.h */</div><div class='ctx'> #include "usb_mon.h"</div><div class='ctx'> </div><div class='del'>-#ifdef __i386__		/* CONFIG_ARCH_I386 does not exit */</div><div class='add'>+/*</div><div class='add'>+ * PC-compatibles, are, fortunately, sufficiently cache-coherent for this.</div><div class='add'>+ */</div><div class='add'>+#if defined(__i386__) || defined(__x86_64__) /* CONFIG_ARCH_I386 doesn't exit */</div><div class='ctx'> #define MON_HAS_UNMAP 1</div><div class='ctx'> </div><div class='ctx'> #define phys_to_page(phys)	pfn_to_page((phys) &gt;&gt; PAGE_SHIFT)</div><div class='head'>diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c<br/>index 6ecc27302211..275a66f83058 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/mon/mon_main.c</a></div><div class='hunk'>@@ -97,6 +97,7 @@ static void mon_submit(struct usb_bus *ubus, struct urb *urb)</div><div class='ctx'> 	if (mbus-&gt;nreaders == 0)</div><div class='ctx'> 		goto out_locked;</div><div class='ctx'> </div><div class='add'>+	mbus-&gt;cnt_events++;</div><div class='ctx'> 	list_for_each (pos, &amp;mbus-&gt;r_list) {</div><div class='ctx'> 		r = list_entry(pos, struct mon_reader, r_link);</div><div class='ctx'> 		r-&gt;rnf_submit(r-&gt;r_data, urb);</div><div class='hunk'>@@ -113,20 +114,32 @@ out_unlocked:</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int err)</div><div class='add'>+static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error)</div><div class='ctx'> {</div><div class='ctx'> 	struct mon_bus *mbus;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct list_head *pos;</div><div class='add'>+	struct mon_reader *r;</div><div class='ctx'> </div><div class='ctx'> 	mbus = ubus-&gt;mon_bus;</div><div class='ctx'> 	if (mbus == NULL)</div><div class='ctx'> 		goto out_unlocked;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * XXX Capture the error code and the 'E' event.</div><div class='del'>-	 */</div><div class='add'>+	spin_lock_irqsave(&amp;mbus-&gt;lock, flags);</div><div class='add'>+	if (mbus-&gt;nreaders == 0)</div><div class='add'>+		goto out_locked;</div><div class='ctx'> </div><div class='add'>+	mbus-&gt;cnt_events++;</div><div class='add'>+	list_for_each (pos, &amp;mbus-&gt;r_list) {</div><div class='add'>+		r = list_entry(pos, struct mon_reader, r_link);</div><div class='add'>+		r-&gt;rnf_error(r-&gt;r_data, urb, error);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;mbus-&gt;lock, flags);</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='add'>+out_locked:</div><div class='add'>+	spin_unlock_irqrestore(&amp;mbus-&gt;lock, flags);</div><div class='ctx'> out_unlocked:</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -152,6 +165,7 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mbus-&gt;lock, flags);</div><div class='add'>+	mbus-&gt;cnt_events++;</div><div class='ctx'> 	list_for_each (pos, &amp;mbus-&gt;r_list) {</div><div class='ctx'> 		r = list_entry(pos, struct mon_reader, r_link);</div><div class='ctx'> 		r-&gt;rnf_complete(r-&gt;r_data, urb);</div><div class='hunk'>@@ -163,7 +177,6 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Stop monitoring.</div><div class='del'>- * Obviously this must be well locked, so no need to play with mb's.</div><div class='ctx'>  */</div><div class='ctx'> static void mon_stop(struct mon_bus *mbus)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c<br/>index 6e4b165d070a..1fe01d994a79 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_stat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_stat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_stat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/mon/mon_stat.c</a></div><div class='hunk'>@@ -31,8 +31,8 @@ static int mon_stat_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	mbus = inode-&gt;u.generic_ip;</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;slen = snprintf(sp-&gt;str, STAT_BUF_SIZE,</div><div class='del'>-	    "nreaders %d text_lost %u\n",</div><div class='del'>-	    mbus-&gt;nreaders, mbus-&gt;cnt_text_lost);</div><div class='add'>+	    "nreaders %d events %u text_lost %u\n",</div><div class='add'>+	    mbus-&gt;nreaders, mbus-&gt;cnt_events, mbus-&gt;cnt_text_lost);</div><div class='ctx'> </div><div class='ctx'> 	file-&gt;private_data = sp;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c<br/>index ac043ec2b8dc..f961a770cee2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_text.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/mon_text.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/mon/mon_text.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/mon/mon_text.c</a></div><div class='hunk'>@@ -26,10 +26,13 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This limit exists to prevent OOMs when the user process stops reading.</div><div class='add'>+ * If usbmon were available to unprivileged processes, it might be open</div><div class='add'>+ * to a local DoS. But we have to keep to root in order to prevent</div><div class='add'>+ * password sniffing from HID devices.</div><div class='ctx'>  */</div><div class='del'>-#define EVENT_MAX  25</div><div class='add'>+#define EVENT_MAX  (2*PAGE_SIZE / sizeof(struct mon_event_text))</div><div class='ctx'> </div><div class='del'>-#define PRINTF_DFL  130</div><div class='add'>+#define PRINTF_DFL  160</div><div class='ctx'> </div><div class='ctx'> struct mon_event_text {</div><div class='ctx'> 	struct list_head e_link;</div><div class='hunk'>@@ -61,7 +64,6 @@ struct mon_reader_text {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void mon_text_ctor(void *, kmem_cache_t *, unsigned long);</div><div class='del'>-static void mon_text_dtor(void *, kmem_cache_t *, unsigned long);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * mon_text_submit</div><div class='hunk'>@@ -111,7 +113,7 @@ static inline char mon_text_get_data(struct mon_event_text *ep, struct urb *urb,</div><div class='ctx'> 	 * number of corner cases, but it seems that the following is</div><div class='ctx'> 	 * more or less safe.</div><div class='ctx'> 	 *</div><div class='del'>-	 * We do not even try to look transfer_buffer, because it can</div><div class='add'>+	 * We do not even try to look at transfer_buffer, because it can</div><div class='ctx'> 	 * contain non-NULL garbage in case the upper level promised to</div><div class='ctx'> 	 * set DMA for the HCD.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -179,6 +181,32 @@ static void mon_text_complete(void *data, struct urb *urb)</div><div class='ctx'> 	mon_text_event(rp, urb, 'C');</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mon_text_error(void *data, struct urb *urb, int error)</div><div class='add'>+{</div><div class='add'>+	struct mon_reader_text *rp = data;</div><div class='add'>+	struct mon_event_text *ep;</div><div class='add'>+</div><div class='add'>+	if (rp-&gt;nevents &gt;= EVENT_MAX ||</div><div class='add'>+	    (ep = kmem_cache_alloc(rp-&gt;e_slab, SLAB_ATOMIC)) == NULL) {</div><div class='add'>+		rp-&gt;r.m_bus-&gt;cnt_text_lost++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ep-&gt;type = 'E';</div><div class='add'>+	ep-&gt;pipe = urb-&gt;pipe;</div><div class='add'>+	ep-&gt;id = (unsigned long) urb;</div><div class='add'>+	ep-&gt;tstamp = 0;</div><div class='add'>+	ep-&gt;length = 0;</div><div class='add'>+	ep-&gt;status = error;</div><div class='add'>+</div><div class='add'>+	ep-&gt;setup_flag = '-';</div><div class='add'>+	ep-&gt;data_flag = 'E';</div><div class='add'>+</div><div class='add'>+	rp-&gt;nevents++;</div><div class='add'>+	list_add_tail(&amp;ep-&gt;e_link, &amp;rp-&gt;e_list);</div><div class='add'>+	wake_up(&amp;rp-&gt;wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Fetch next event from the circular buffer.</div><div class='ctx'>  */</div><div class='hunk'>@@ -232,13 +260,14 @@ static int mon_text_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	rp-&gt;r.m_bus = mbus;</div><div class='ctx'> 	rp-&gt;r.r_data = rp;</div><div class='ctx'> 	rp-&gt;r.rnf_submit = mon_text_submit;</div><div class='add'>+	rp-&gt;r.rnf_error = mon_text_error;</div><div class='ctx'> 	rp-&gt;r.rnf_complete = mon_text_complete;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(rp-&gt;slab_name, SLAB_NAME_SZ, "mon%dt_%lx", ubus-&gt;busnum,</div><div class='ctx'> 	    (long)rp);</div><div class='ctx'> 	rp-&gt;e_slab = kmem_cache_create(rp-&gt;slab_name,</div><div class='ctx'> 	    sizeof(struct mon_event_text), sizeof(long), 0,</div><div class='del'>-	    mon_text_ctor, mon_text_dtor);</div><div class='add'>+	    mon_text_ctor, NULL);</div><div class='ctx'> 	if (rp-&gt;e_slab == NULL) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto err_slab;</div><div class='hunk'>@@ -429,7 +458,3 @@ static void mon_text_ctor(void *mem, kmem_cache_t *slab, unsigned long sflags)</div><div class='ctx'> 	memset(mem, 0xe5, sizeof(struct mon_event_text));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mon_text_dtor(void *mem, kmem_cache_t *slab, unsigned long sflags)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/usb/mon/usb_mon.h b/drivers/usb/mon/usb_mon.h<br/>index 8e0613c350cc..33678c24ebee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/mon/usb_mon.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/mon/usb_mon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/mon/usb_mon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/mon/usb_mon.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@ struct mon_bus {</div><div class='ctx'> 	struct kref ref;		/* Under mon_lock */</div><div class='ctx'> </div><div class='ctx'> 	/* Stats */</div><div class='add'>+	unsigned int cnt_events;</div><div class='ctx'> 	unsigned int cnt_text_lost;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -39,6 +40,7 @@ struct mon_reader {</div><div class='ctx'> 	void *r_data;		/* Use container_of instead? */</div><div class='ctx'> </div><div class='ctx'> 	void (*rnf_submit)(void *data, struct urb *urb);</div><div class='add'>+	void (*rnf_error)(void *data, struct urb *urb, int error);</div><div class='ctx'> 	void (*rnf_complete)(void *data, struct urb *urb);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig<br/>index efd6ca7e4ac5..054059632a21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/Kconfig</a></div><div class='hunk'>@@ -301,21 +301,4 @@ config USB_NET_ZAURUS</div><div class='ctx'> 	  some cases CDC MDLM) protocol, not "g_ether".</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-config USB_ZD1201</div><div class='del'>-	tristate "USB ZD1201 based Wireless device support"</div><div class='del'>-	depends on NET_RADIO</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y if you want to use wireless LAN adapters based on the ZyDAS</div><div class='del'>-	  ZD1201 chip.</div><div class='del'>-</div><div class='del'>-	  This driver makes the adapter appear as a normal Ethernet interface,</div><div class='del'>-	  typically on wlan0.</div><div class='del'>-	  </div><div class='del'>-	  The zd1201 device requires external firmware to be loaded.</div><div class='del'>-	  This can be found at http://linux-lc100020.sourceforge.net/</div><div class='del'>-	  </div><div class='del'>-	  To compile this driver as a module, choose M here: the</div><div class='del'>-	  module will be called zd1201.</div><div class='del'>-</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile<br/>index a21e6eaabaf6..160f19dbdf12 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/Makefile</a></div><div class='hunk'>@@ -15,7 +15,6 @@ obj-$(CONFIG_USB_NET_RNDIS_HOST)	+= rndis_host.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o</div><div class='ctx'> obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o</div><div class='ctx'> obj-$(CONFIG_USB_USBNET)	+= usbnet.o</div><div class='del'>-obj-$(CONFIG_USB_ZD1201)	+= zd1201.o</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_USB_DEBUG),y)</div><div class='ctx'> EXTRA_CFLAGS += -DDEBUG</div><div class='head'>diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c<br/>index 12b599a0b539..2e2bbc003e93 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/asix.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/asix.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/asix.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/asix.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -912,6 +911,10 @@ static const struct usb_device_id	products [] = {</div><div class='ctx'>         USB_DEVICE (0x0b95, 0x7720),</div><div class='ctx'>         .driver_info = (unsigned long) &amp;ax88772_info,</div><div class='ctx'> }, {</div><div class='add'>+	// ASIX AX88178 10/100/1000</div><div class='add'>+	USB_DEVICE (0x0b95, 0x1780),</div><div class='add'>+	.driver_info = (unsigned long) &amp;ax88772_info,</div><div class='add'>+}, {</div><div class='ctx'> 	// Linksys USB200M Rev 2</div><div class='ctx'> 	USB_DEVICE (0x13b1, 0x0018),</div><div class='ctx'> 	.driver_info = (unsigned long) &amp;ax88772_info,</div><div class='head'>diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c<br/>index 63f1f3ba8e0b..82ce0358d9a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/cdc_ether.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/cdc_ether.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/cdc_ether.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/cdc_ether.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -31,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_cdc.h&gt;</div><div class='add'>+#include &lt;linux/usb/cdc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "usbnet.h"</div><div class='ctx'> </div><div class='hunk'>@@ -455,6 +454,18 @@ static const struct usb_device_id	products [] = {</div><div class='ctx'> 	.driver_info		= 0,</div><div class='ctx'> },</div><div class='ctx'> </div><div class='add'>+/* Olympus has some models with a Zaurus-compatible option.</div><div class='add'>+ * R-1000 uses a FreeScale i.MXL cpu (ARMv4T)</div><div class='add'>+ */</div><div class='add'>+{</div><div class='add'>+	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO</div><div class='add'>+		 | USB_DEVICE_ID_MATCH_DEVICE,</div><div class='add'>+	.idVendor               = 0x07B4,</div><div class='add'>+	.idProduct              = 0x0F02,	/* R-1000 */</div><div class='add'>+	ZAURUS_MASTER_INTERFACE,</div><div class='add'>+	.driver_info		= 0,</div><div class='add'>+},</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * WHITELIST!!!</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/usb/net/cdc_subset.c b/drivers/usb/net/cdc_subset.c<br/>index ec801e8bb1bb..e2fae85851a3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/cdc_subset.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/cdc_subset.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/cdc_subset.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/cdc_subset.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c<br/>index faf1e86be687..3155f25f1d48 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/gl620a.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/gl620a.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/gl620a.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/gl620a.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c<br/>index 78e6a43b1087..a9b6eeac3e3f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/net1080.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/net1080.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/net1080.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/net1080.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c<br/>index 7683926a1b6f..ab21f960d255 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/pegasus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/pegasus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/pegasus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/pegasus.c</a></div><div class='hunk'>@@ -163,6 +163,8 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,</div><div class='ctx'> </div><div class='ctx'> 	/* using ATOMIC, we'd never wake up if we slept */</div><div class='ctx'> 	if ((ret = usb_submit_urb(pegasus-&gt;ctrl_urb, GFP_ATOMIC))) {</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 					__FUNCTION__, ret);</div><div class='hunk'>@@ -217,6 +219,8 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,</div><div class='ctx'> 	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = usb_submit_urb(pegasus-&gt;ctrl_urb, GFP_ATOMIC))) {</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 					__FUNCTION__, ret);</div><div class='hunk'>@@ -268,6 +272,8 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)</div><div class='ctx'> 	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = usb_submit_urb(pegasus-&gt;ctrl_urb, GFP_ATOMIC))) {</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 					__FUNCTION__, ret);</div><div class='hunk'>@@ -298,10 +304,13 @@ static int update_eth_regs_async(pegasus_t * pegasus)</div><div class='ctx'> 			     (char *) &amp;pegasus-&gt;dr,</div><div class='ctx'> 			     pegasus-&gt;eth_regs, 3, ctrl_callback, pegasus);</div><div class='ctx'> </div><div class='del'>-	if ((ret = usb_submit_urb(pegasus-&gt;ctrl_urb, GFP_ATOMIC)))</div><div class='add'>+	if ((ret = usb_submit_urb(pegasus-&gt;ctrl_urb, GFP_ATOMIC))) {</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_drv(pegasus))</div><div class='ctx'> 			dev_err(&amp;pegasus-&gt;intf-&gt;dev, "%s, status %d\n",</div><div class='ctx'> 					__FUNCTION__, ret);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -692,7 +701,10 @@ goon:</div><div class='ctx'> 			  usb_rcvbulkpipe(pegasus-&gt;usb, 1),</div><div class='ctx'> 			  pegasus-&gt;rx_skb-&gt;data, PEGASUS_MTU + 8,</div><div class='ctx'> 			  read_bulk_callback, pegasus);</div><div class='del'>-	if (usb_submit_urb(pegasus-&gt;rx_urb, GFP_ATOMIC)) {</div><div class='add'>+	rx_status = usb_submit_urb(pegasus-&gt;rx_urb, GFP_ATOMIC);</div><div class='add'>+	if (rx_status == -ENODEV)</div><div class='add'>+		netif_device_detach(pegasus-&gt;net);</div><div class='add'>+	else if (rx_status) {</div><div class='ctx'> 		pegasus-&gt;flags |= PEGASUS_RX_URB_FAIL;</div><div class='ctx'> 		goto tl_sched;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -709,6 +721,7 @@ static void rx_fixup(unsigned long data)</div><div class='ctx'> {</div><div class='ctx'> 	pegasus_t *pegasus;</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+	int status;</div><div class='ctx'> </div><div class='ctx'> 	pegasus = (pegasus_t *) data;</div><div class='ctx'> 	if (pegasus-&gt;flags &amp; PEGASUS_UNPLUG)</div><div class='hunk'>@@ -734,7 +747,10 @@ static void rx_fixup(unsigned long data)</div><div class='ctx'> 			  pegasus-&gt;rx_skb-&gt;data, PEGASUS_MTU + 8,</div><div class='ctx'> 			  read_bulk_callback, pegasus);</div><div class='ctx'> try_again:</div><div class='del'>-	if (usb_submit_urb(pegasus-&gt;rx_urb, GFP_ATOMIC)) {</div><div class='add'>+	status = usb_submit_urb(pegasus-&gt;rx_urb, GFP_ATOMIC);</div><div class='add'>+	if (status == -ENODEV)</div><div class='add'>+		netif_device_detach(pegasus-&gt;net);</div><div class='add'>+	else if (status) {</div><div class='ctx'> 		pegasus-&gt;flags |= PEGASUS_RX_URB_FAIL;</div><div class='ctx'> 		tasklet_schedule(&amp;pegasus-&gt;rx_tl);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -836,6 +852,8 @@ static void intr_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	status = usb_submit_urb(urb, SLAB_ATOMIC);</div><div class='add'>+	if (status == -ENODEV)</div><div class='add'>+		netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 	if (status &amp;&amp; netif_msg_timer(pegasus))</div><div class='ctx'> 		printk(KERN_ERR "%s: can't resubmit interrupt urb, %d\n",</div><div class='ctx'> 				net-&gt;name, status);</div><div class='hunk'>@@ -874,6 +892,7 @@ static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net)</div><div class='ctx'> 			/* cleanup should already have been scheduled */</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -ENODEV:		/* disconnect() upcoming */</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			pegasus-&gt;stats.tx_errors++;</div><div class='hunk'>@@ -999,6 +1018,8 @@ static int pegasus_open(struct net_device *net)</div><div class='ctx'> 			  pegasus-&gt;rx_skb-&gt;data, PEGASUS_MTU + 8,</div><div class='ctx'> 			  read_bulk_callback, pegasus);</div><div class='ctx'> 	if ((res = usb_submit_urb(pegasus-&gt;rx_urb, GFP_KERNEL))) {</div><div class='add'>+		if (res == -ENODEV)</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_ifup(pegasus))</div><div class='ctx'> 			pr_debug("%s: failed rx_urb, %d", net-&gt;name, res);</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -1009,6 +1030,8 @@ static int pegasus_open(struct net_device *net)</div><div class='ctx'> 			 pegasus-&gt;intr_buff, sizeof (pegasus-&gt;intr_buff),</div><div class='ctx'> 			 intr_callback, pegasus, pegasus-&gt;intr_interval);</div><div class='ctx'> 	if ((res = usb_submit_urb(pegasus-&gt;intr_urb, GFP_KERNEL))) {</div><div class='add'>+		if (res == -ENODEV)</div><div class='add'>+			netif_device_detach(pegasus-&gt;net);</div><div class='ctx'> 		if (netif_msg_ifup(pegasus))</div><div class='ctx'> 			pr_debug("%s: failed intr_urb, %d\n", net-&gt;name, res);</div><div class='ctx'> 		usb_kill_urb(pegasus-&gt;rx_urb);</div><div class='head'>diff --git a/drivers/usb/net/plusb.c b/drivers/usb/net/plusb.c<br/>index 4fe863389cb7..5d17cdfc7bab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/plusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/plusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/plusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/plusb.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c<br/>index 94ddfe16fdda..c2a28d88ef3c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/rndis_host.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/rndis_host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/rndis_host.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/rndis_host.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -30,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_cdc.h&gt;</div><div class='add'>+#include &lt;linux/usb/cdc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "usbnet.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c<br/>index 1bbbae283c0b..e5e6e4f3ef87 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/rtl8150.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/rtl8150.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/rtl8150.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/rtl8150.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * version 2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -129,11 +128,13 @@</div><div class='ctx'> #define	VENDOR_ID_MELCO			0x0411</div><div class='ctx'> #define VENDOR_ID_MICRONET		0x3980</div><div class='ctx'> #define	VENDOR_ID_LONGSHINE		0x07b8</div><div class='add'>+#define	VENDOR_ID_ZYXEL			0x0586</div><div class='ctx'> </div><div class='ctx'> #define PRODUCT_ID_RTL8150		0x8150</div><div class='ctx'> #define	PRODUCT_ID_LUAKTX		0x0012</div><div class='ctx'> #define	PRODUCT_ID_LCS8138TX		0x401a</div><div class='ctx'> #define PRODUCT_ID_SP128AR		0x0003</div><div class='add'>+#define	PRODUCT_ID_PRESTIGE		0x401a</div><div class='ctx'> </div><div class='ctx'> #undef	EEPROM_WRITE</div><div class='ctx'> </div><div class='hunk'>@@ -143,6 +144,7 @@ static struct usb_device_id rtl8150_table[] = {</div><div class='ctx'> 	{USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},</div><div class='ctx'> 	{USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},</div><div class='ctx'> 	{USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},</div><div class='add'>+	{USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c<br/>index 362d6907c9bb..54183e173a6d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/usbnet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/usbnet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/usbnet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/usbnet.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c<br/>index f7ac9d6b9856..144566bda583 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/net/zaurus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/net/zaurus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/net/zaurus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/net/zaurus.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> // #define	DEBUG			// error path messages, extra info</div><div class='ctx'> // #define	VERBOSE			// more; success messages</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -30,7 +29,7 @@</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/usb_cdc.h&gt;</div><div class='add'>+#include &lt;linux/usb/cdc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "usbnet.h"</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +108,7 @@ static const struct driver_info	zaurus_sl5x00_info = {</div><div class='ctx'> 	.check_connect = always_connected,</div><div class='ctx'> 	.bind =		zaurus_bind,</div><div class='ctx'> 	.unbind =	usbnet_cdc_unbind,</div><div class='del'>-	.tx_fixup = 	zaurus_tx_fixup,</div><div class='add'>+	.tx_fixup =	zaurus_tx_fixup,</div><div class='ctx'> };</div><div class='ctx'> #define	ZAURUS_STRONGARM_INFO	((unsigned long)&amp;zaurus_sl5x00_info)</div><div class='ctx'> </div><div class='hunk'>@@ -119,7 +118,7 @@ static const struct driver_info	zaurus_pxa_info = {</div><div class='ctx'> 	.check_connect = always_connected,</div><div class='ctx'> 	.bind =		zaurus_bind,</div><div class='ctx'> 	.unbind =	usbnet_cdc_unbind,</div><div class='del'>-	.tx_fixup = 	zaurus_tx_fixup,</div><div class='add'>+	.tx_fixup =	zaurus_tx_fixup,</div><div class='ctx'> };</div><div class='ctx'> #define	ZAURUS_PXA_INFO		((unsigned long)&amp;zaurus_pxa_info)</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +128,7 @@ static const struct driver_info	olympus_mxl_info = {</div><div class='ctx'> 	.check_connect = always_connected,</div><div class='ctx'> 	.bind =		zaurus_bind,</div><div class='ctx'> 	.unbind =	usbnet_cdc_unbind,</div><div class='del'>-	.tx_fixup = 	zaurus_tx_fixup,</div><div class='add'>+	.tx_fixup =	zaurus_tx_fixup,</div><div class='ctx'> };</div><div class='ctx'> #define	OLYMPUS_MXL_INFO	((unsigned long)&amp;olympus_mxl_info)</div><div class='ctx'> </div><div class='hunk'>@@ -228,6 +227,11 @@ bad_detail:</div><div class='ctx'> 						detail-&gt;bDetailData[2]);</div><div class='ctx'> 				goto bad_desc;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* same extra framing as for non-BLAN mode */</div><div class='add'>+			dev-&gt;net-&gt;hard_header_len += 6;</div><div class='add'>+			dev-&gt;rx_urb_size = dev-&gt;net-&gt;hard_header_len</div><div class='add'>+					+ dev-&gt;net-&gt;mtu;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> next_desc:</div><div class='hunk'>@@ -258,7 +262,7 @@ static const struct driver_info	bogus_mdlm_info = {</div><div class='ctx'> 	.description =	"pseudo-MDLM (BLAN) device",</div><div class='ctx'> 	.flags =	FLAG_FRAMING_Z,</div><div class='ctx'> 	.check_connect = always_connected,</div><div class='del'>-	.tx_fixup = 	zaurus_tx_fixup,</div><div class='add'>+	.tx_fixup =	zaurus_tx_fixup,</div><div class='ctx'> 	.bind =		blan_mdlm_bind,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -367,13 +371,13 @@ static struct usb_driver zaurus_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init zaurus_init(void)</div><div class='ctx'> {</div><div class='del'>- 	return usb_register(&amp;zaurus_driver);</div><div class='add'>+	return usb_register(&amp;zaurus_driver);</div><div class='ctx'> }</div><div class='ctx'> module_init(zaurus_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit zaurus_exit(void)</div><div class='ctx'> {</div><div class='del'>- 	usb_deregister(&amp;zaurus_driver);</div><div class='add'>+	usb_deregister(&amp;zaurus_driver);</div><div class='ctx'> }</div><div class='ctx'> module_exit(zaurus_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig<br/>index 5c60be521561..ac33bd47cfce 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/Kconfig</a></div><div class='hunk'>@@ -417,7 +417,7 @@ config USB_SERIAL_MCT_U232</div><div class='ctx'> 	  Magic Control Technology Corp. (U232 is one of the model numbers).</div><div class='ctx'> </div><div class='ctx'> 	  This driver also works with Sitecom U232-P25 and D-Link DU-H3SP USB</div><div class='del'>-	  BAY devices.</div><div class='add'>+	  BAY, Belkin F5U109, and Belkin F5U409 devices.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called mct_u232.</div><div class='hunk'>@@ -456,6 +456,17 @@ config USB_SERIAL_SAFE_PADDED</div><div class='ctx'> 	bool "USB Secure Encapsulated Driver - Padded"</div><div class='ctx'> 	depends on USB_SERIAL_SAFE</div><div class='ctx'> </div><div class='add'>+config USB_SERIAL_SIERRAWIRELESS</div><div class='add'>+	tristate "USB Sierra Wireless Driver"</div><div class='add'>+	depends on USB_SERIAL</div><div class='add'>+	help</div><div class='add'>+	  Say M here if you want to use a Sierra Wireless device (if</div><div class='add'>+	  using an PC 5220 or AC580 please use the Airprime driver</div><div class='add'>+	  instead).</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the</div><div class='add'>+	  module will be called sierra.</div><div class='add'>+</div><div class='ctx'> config USB_SERIAL_TI</div><div class='ctx'> 	tristate "USB TI 3410/5052 Serial Driver"</div><div class='ctx'> 	depends on USB_SERIAL</div><div class='hunk'>@@ -491,16 +502,22 @@ config USB_SERIAL_XIRCOM</div><div class='ctx'> 	  module will be called keyspan_pda.</div><div class='ctx'> </div><div class='ctx'> config USB_SERIAL_OPTION</div><div class='del'>-	tristate "USB Option PCMCIA serial driver"</div><div class='del'>-	depends on USB_SERIAL &amp;&amp; USB_OHCI_HCD &amp;&amp; PCCARD</div><div class='add'>+	tristate "USB driver for GSM modems"</div><div class='add'>+	depends on USB_SERIAL</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here if you want to use an Option card. This is a</div><div class='del'>-	  GSM card, controlled by three serial ports which are connected</div><div class='del'>-	  via an OHCI adapter located on a PC card.</div><div class='add'>+	  Say Y here if you have an "Option" GSM PCMCIA card</div><div class='add'>+	  (or an OEM version: branded Huawei, Audiovox, or Novatel).</div><div class='add'>+</div><div class='add'>+	  These cards feature a built-in OHCI-USB adapter and an</div><div class='add'>+	  internally-connected GSM modem. The USB bus is not</div><div class='add'>+	  accessible externally.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called option.</div><div class='ctx'> </div><div class='add'>+	  If this driver doesn't recognize your device,</div><div class='add'>+	  it might be accessible via the FTDI_SIO driver.</div><div class='add'>+</div><div class='ctx'> config USB_SERIAL_OMNINET</div><div class='ctx'> 	tristate "USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)"</div><div class='ctx'> 	depends on USB_SERIAL &amp;&amp; EXPERIMENTAL</div><div class='head'>diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile<br/>index 5a0960fc9d3e..35d4acc7f1d3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/Makefile</a></div><div class='hunk'>@@ -39,6 +39,7 @@ obj-$(CONFIG_USB_SERIAL_OMNINET)		+= omninet.o</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL_OPTION)			+= option.o</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL_PL2303)			+= pl2303.o</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL_SAFE)			+= safe_serial.o</div><div class='add'>+obj-$(CONFIG_USB_SERIAL_SIERRAWIRELESS)		+= sierra.o</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL_TI)			+= ti_usb_3410_5052.o</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL_VISOR)			+= visor.o</div><div class='ctx'> obj-$(CONFIG_USB_SERIAL_WHITEHEAT)		+= whiteheat.o</div><div class='head'>diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c<br/>index 694b205f9b73..62082532a8b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/airprime.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/airprime.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/airprime.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/airprime.c</a></div><div class='hunk'>@@ -13,12 +13,14 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id id_table [] = {</div><div class='add'>+	{ USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */</div><div class='ctx'> 	{ USB_DEVICE(0xf3d, 0x0112) },  /* AirPrime CDMA Wireless PC Card */</div><div class='ctx'> 	{ USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */</div><div class='ctx'> 	{ USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless Aircard 580 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, id_table);</div><div class='head'>diff --git a/drivers/usb/serial/anydata.c b/drivers/usb/serial/anydata.c<br/>index 343f6f228220..01843ef8c11e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/anydata.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/anydata.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/anydata.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/anydata.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x16d5, 0x6501) },	/* AirData CDMA device */</div><div class='hunk'>@@ -71,7 +71,7 @@ static int anydata_open(struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 				  	  port-&gt;bulk_in_endpointAddress),</div><div class='ctx'> 			  port-&gt;read_urb-&gt;transfer_buffer,</div><div class='ctx'> 			  port-&gt;read_urb-&gt;transfer_buffer_length,</div><div class='del'>-			  usb_serial_generic_write_bulk_callback, port);</div><div class='add'>+			  usb_serial_generic_read_bulk_callback, port);</div><div class='ctx'> 	result = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		dev_err(&amp;port-&gt;dev,</div><div class='head'>diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c<br/>index 8dec796222a0..970d9ef0a7a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ark3116.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ark3116.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ark3116.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ark3116.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='head'>diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c<br/>index 4144777ea18b..70ece9e01ce4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/belkin_sa.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/belkin_sa.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/belkin_sa.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/belkin_sa.c</a></div><div class='hunk'>@@ -63,7 +63,6 @@</div><div class='ctx'>  *    UsbSnoop on Windows2000 and from examining the other USB drivers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -75,7 +74,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "belkin_sa.h"</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='head'>diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c<br/>index e9f9f4bafa17..6542f220468f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/bus.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/bus.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/bus.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/bus.c</a></div><div class='hunk'>@@ -8,13 +8,12 @@</div><div class='ctx'>  *	2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int usb_serial_device_match (struct device *dev, struct device_driver *drv)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c<br/>index 8023bb7279b1..3a9073dbfe6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/console.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/console.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/console.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/console.c</a></div><div class='hunk'>@@ -11,18 +11,16 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='del'>-#include "usb-serial.h"</div><div class='del'>-</div><div class='ctx'> struct usbcons_info {</div><div class='ctx'> 	int			magic;</div><div class='ctx'> 	int			break_flag;</div><div class='hunk'>@@ -202,7 +200,7 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun</div><div class='ctx'> 	struct usb_serial *serial;</div><div class='ctx'> 	int retval = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!port)</div><div class='add'>+	if (!port || port-&gt;serial-&gt;dev-&gt;state == USB_STATE_NOTATTACHED)</div><div class='ctx'> 		return;</div><div class='ctx'> 	serial = port-&gt;serial;</div><div class='ctx'> </div><div class='hunk'>@@ -213,17 +211,38 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun</div><div class='ctx'> </div><div class='ctx'> 	if (!port-&gt;open_count) {</div><div class='ctx'> 		dbg ("%s - port not opened", __FUNCTION__);</div><div class='del'>-		goto exit;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* pass on to the driver specific version of this function if it is available */</div><div class='del'>-	if (serial-&gt;type-&gt;write)</div><div class='del'>-		retval = serial-&gt;type-&gt;write(port, buf, count);</div><div class='del'>-	else</div><div class='del'>-		retval = usb_serial_generic_write(port, buf, count);</div><div class='del'>-</div><div class='del'>-exit:</div><div class='del'>-	dbg("%s - return value (if we had one): %d", __FUNCTION__, retval);</div><div class='add'>+	while (count) {</div><div class='add'>+		unsigned int i;</div><div class='add'>+		unsigned int lf;</div><div class='add'>+		/* search for LF so we can insert CR if necessary */</div><div class='add'>+		for (i=0, lf=0 ; i &lt; count ; i++) {</div><div class='add'>+			if (*(buf + i) == 10) {</div><div class='add'>+				lf = 1;</div><div class='add'>+				i++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* pass on to the driver specific version of this function if it is available */</div><div class='add'>+		if (serial-&gt;type-&gt;write)</div><div class='add'>+			retval = serial-&gt;type-&gt;write(port, buf, i);</div><div class='add'>+		else</div><div class='add'>+			retval = usb_serial_generic_write(port, buf, i);</div><div class='add'>+		dbg("%s - return value : %d", __FUNCTION__, retval);</div><div class='add'>+		if (lf) {</div><div class='add'>+			/* append CR after LF */</div><div class='add'>+			unsigned char cr = 13;</div><div class='add'>+			if (serial-&gt;type-&gt;write)</div><div class='add'>+				retval = serial-&gt;type-&gt;write(port, &amp;cr, 1);</div><div class='add'>+			else</div><div class='add'>+				retval = usb_serial_generic_write(port, &amp;cr, 1);</div><div class='add'>+			dbg("%s - return value : %d", __FUNCTION__, retval);</div><div class='add'>+		}</div><div class='add'>+		buf += i;</div><div class='add'>+		count -= i;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct console usbcons = {</div><div class='hunk'>@@ -234,6 +253,14 @@ static struct console usbcons = {</div><div class='ctx'> 	.index =	-1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void usb_serial_console_disconnect(struct usb_serial *serial)</div><div class='add'>+{</div><div class='add'>+	if (serial &amp;&amp; serial-&gt;port &amp;&amp; serial-&gt;port[0] &amp;&amp; serial-&gt;port[0] == usbcons_info.port) {</div><div class='add'>+		usb_serial_console_exit();</div><div class='add'>+		usb_serial_put(serial);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void usb_serial_console_init (int serial_debug, int minor)</div><div class='ctx'> {</div><div class='ctx'> 	debug = serial_debug;</div><div class='hunk'>@@ -259,6 +286,11 @@ void usb_serial_console_init (int serial_debug, int minor)</div><div class='ctx'> </div><div class='ctx'> void usb_serial_console_exit (void)</div><div class='ctx'> {</div><div class='del'>-	unregister_console(&amp;usbcons);</div><div class='add'>+	if (usbcons_info.port) {</div><div class='add'>+		unregister_console(&amp;usbcons);</div><div class='add'>+		if (usbcons_info.port-&gt;open_count)</div><div class='add'>+			usbcons_info.port-&gt;open_count--;</div><div class='add'>+		usbcons_info.port = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c<br/>index e0c2acdb3f06..486c7411b9a7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/cp2101.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/cp2101.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/cp2101.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/cp2101.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -27,7 +26,7 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='hunk'>@@ -59,6 +58,7 @@ static struct usb_device_id id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */</div><div class='ctx'> 	{ USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */</div><div class='ctx'> 	{ USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */</div><div class='add'>+	{ USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */</div><div class='ctx'> 	{ USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */</div><div class='ctx'> 	{ USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */</div><div class='ctx'> 	{ USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */</div><div class='head'>diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c<br/>index 2357b1d102d7..6286aba86fae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/cyberjack.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/cyberjack.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/cyberjack.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/cyberjack.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -40,7 +39,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define CYBERJACK_LOCAL_BUF_SIZE 32</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +468,7 @@ static void cyberjack_write_bulk_callback (struct urb *urb, struct pt_regs *regs</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;lock);</div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init cyberjack_init (void)</div><div class='head'>diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c<br/>index 7212fbe3b6f2..ee70fddcab60 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/cypress_m8.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/cypress_m8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/cypress_m8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/cypress_m8.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> /* Code originates and was built up from ftdi_sio, belkin, pl2303 and others. */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -60,11 +59,11 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "usb-serial.h"</div><div class='ctx'> #include "cypress_m8.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -824,7 +823,7 @@ send:</div><div class='ctx'> 	priv-&gt;bytes_out += count; /* do not count the line control and size bytes */</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> } /* cypress_send */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c<br/>index b3f776a90c93..9b225183fc7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/digi_acceleport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/digi_acceleport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/digi_acceleport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/digi_acceleport.c</a></div><div class='hunk'>@@ -233,7 +233,6 @@</div><div class='ctx'> *  $Id: digi_acceleport.c,v 1.80.1.2 2000/11/02 05:45:08 root Exp $</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -247,7 +246,7 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Defines */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c<br/>index 63f7c78a1152..daafe405d86d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/empeg.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/empeg.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/empeg.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/empeg.c</a></div><div class='hunk'>@@ -51,7 +51,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -63,7 +62,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='hunk'>@@ -335,7 +334,7 @@ static void empeg_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c<br/>index 1e419c8d7392..5169c2d154ab 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ezusb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ezusb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ezusb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ezusb.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *	2 as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -16,7 +15,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* EZ-USB Control and Status Register.  Bit 0 controls 8051 reset */</div><div class='ctx'> #define CPUCS_REG    0x7F92</div><div class='head'>diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c<br/>index 986d7622273d..b458aedc5fb6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ftdi_sio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ftdi_sio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ftdi_sio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ftdi_sio.c</a></div><div class='hunk'>@@ -245,7 +245,6 @@</div><div class='ctx'> /*   to talk to the device */</div><div class='ctx'> /* Thanx to gkh and the rest of the usb dev group for all code I have assimilated :-) */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -258,7 +257,7 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "ftdi_sio.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -314,6 +313,7 @@ static struct usb_device_id id_table_combined [] = {</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID) },</div><div class='add'>+	{ USB_DEVICE(FTDI_VID, FTDI_MICRO_CHAMELEON_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },</div><div class='ctx'> 	{ USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },</div><div class='ctx'> 	{ USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },</div><div class='hunk'>@@ -500,6 +500,9 @@ static struct usb_device_id id_table_combined [] = {</div><div class='ctx'> 	{ USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },</div><div class='ctx'> 	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },</div><div class='ctx'> 	{ USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },</div><div class='add'>+	{ USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },</div><div class='add'>+	{ USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) },</div><div class='add'>+	{ USB_DEVICE(TESTO_VID, TESTO_USB_INTERFACE_PID) },</div><div class='ctx'> 	{ },					/* Optional parameter entry */</div><div class='ctx'> 	{ }					/* Terminating entry */</div><div class='ctx'> };</div><div class='hunk'>@@ -548,11 +551,17 @@ struct ftdi_private {</div><div class='ctx'> 	spinlock_t rx_lock;	/* spinlock for receive state */</div><div class='ctx'> 	struct work_struct rx_work;</div><div class='ctx'> 	int rx_processed;</div><div class='add'>+	unsigned long rx_bytes;</div><div class='ctx'> </div><div class='ctx'> 	__u16 interface;	/* FT2232C port interface (0 for FT232/245) */</div><div class='ctx'> </div><div class='ctx'> 	int force_baud;		/* if non-zero, force the baud rate to this value */</div><div class='ctx'> 	int force_rtscts;	/* if non-zero, force RTS-CTS to always be enabled */</div><div class='add'>+</div><div class='add'>+	spinlock_t tx_lock;	/* spinlock for transmit state */</div><div class='add'>+	unsigned long tx_bytes;</div><div class='add'>+	unsigned long tx_outstanding_bytes;</div><div class='add'>+	unsigned long tx_outstanding_urbs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Used for TIOCMIWAIT */</div><div class='hunk'>@@ -626,6 +635,9 @@ static struct usb_serial_driver ftdi_sio_device = {</div><div class='ctx'> #define HIGH 1</div><div class='ctx'> #define LOW 0</div><div class='ctx'> </div><div class='add'>+/* number of outstanding urbs to prevent userspace DoS from happening */</div><div class='add'>+#define URB_UPPER_LIMIT	42</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ***************************************************************************</div><div class='ctx'>  * Utlity functions</div><div class='hunk'>@@ -1156,6 +1168,7 @@ static int ftdi_sio_attach (struct usb_serial *serial)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;rx_lock);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'>         init_waitqueue_head(&amp;priv-&gt;delta_msr_wait);</div><div class='ctx'> 	/* This will push the characters through immediately rather</div><div class='ctx'> 	   than queue a task to deliver them */</div><div class='hunk'>@@ -1261,7 +1274,6 @@ static void ftdi_shutdown (struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> static int  ftdi_open (struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> { /* ftdi_open */</div><div class='del'>-	struct termios tmp_termios;</div><div class='ctx'> 	struct usb_device *dev = port-&gt;serial-&gt;dev;</div><div class='ctx'> 	struct ftdi_private *priv = usb_get_serial_port_data(port);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1271,8 +1283,15 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s", __FUNCTION__);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	priv-&gt;tx_bytes = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;rx_lock, flags);</div><div class='add'>+	priv-&gt;rx_bytes = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;rx_lock, flags);</div><div class='ctx'> </div><div class='del'>-	port-&gt;tty-&gt;low_latency = (priv-&gt;flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='add'>+	if (port-&gt;tty)</div><div class='add'>+		port-&gt;tty-&gt;low_latency = (priv-&gt;flags &amp; ASYNC_LOW_LATENCY) ? 1 : 0;</div><div class='ctx'> </div><div class='ctx'> 	/* No error checking for this (will get errors later anyway) */</div><div class='ctx'> 	/* See ftdi_sio.h for description of what is reset */</div><div class='hunk'>@@ -1286,7 +1305,8 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 	   This is same behaviour as serial.c/rs_open() - Kuba */</div><div class='ctx'> </div><div class='ctx'> 	/* ftdi_set_termios  will send usb control messages */</div><div class='del'>-	ftdi_set_termios(port, &amp;tmp_termios);</div><div class='add'>+	if (port-&gt;tty)</div><div class='add'>+		ftdi_set_termios(port, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Flow control might be enabled, so it should be checked -</div><div class='ctx'> 	   we have no control of defaults! */</div><div class='hunk'>@@ -1372,6 +1392,7 @@ static int ftdi_write (struct usb_serial_port *port,</div><div class='ctx'> 	int data_offset ;       /* will be 1 for the SIO and 0 otherwise */</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int transfer_size;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s port %d, %d bytes", __FUNCTION__, port-&gt;number, count);</div><div class='ctx'> </div><div class='hunk'>@@ -1379,6 +1400,13 @@ static int ftdi_write (struct usb_serial_port *port,</div><div class='ctx'> 		dbg("write request of 0 bytes");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	if (priv-&gt;tx_outstanding_urbs &gt; URB_UPPER_LIMIT) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+		dbg("%s - write limit hit\n", __FUNCTION__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 	</div><div class='ctx'> 	data_offset = priv-&gt;write_offset;</div><div class='ctx'>         dbg("data_offset set to %d",data_offset);</div><div class='hunk'>@@ -1445,6 +1473,12 @@ static int ftdi_write (struct usb_serial_port *port,</div><div class='ctx'> 		err("%s - failed submitting write urb, error %d", __FUNCTION__, status);</div><div class='ctx'> 		count = status;</div><div class='ctx'> 		kfree (buffer);</div><div class='add'>+	} else {</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+		++priv-&gt;tx_outstanding_urbs;</div><div class='add'>+		priv-&gt;tx_outstanding_bytes += count;</div><div class='add'>+		priv-&gt;tx_bytes += count;</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* we are done with this urb, so let the host driver</div><div class='hunk'>@@ -1460,7 +1494,11 @@ static int ftdi_write (struct usb_serial_port *port,</div><div class='ctx'> </div><div class='ctx'> static void ftdi_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	struct usb_serial_port *port = (struct usb_serial_port *)urb-&gt;context;</div><div class='add'>+	struct ftdi_private *priv;</div><div class='add'>+	int data_offset;       /* will be 1 for the SIO and 0 otherwise */</div><div class='add'>+	unsigned long countback;</div><div class='ctx'> </div><div class='ctx'> 	/* free up the transfer buffer, as usb_free_urb() does not do this */</div><div class='ctx'> 	kfree (urb-&gt;transfer_buffer);</div><div class='hunk'>@@ -1472,34 +1510,67 @@ static void ftdi_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	priv = usb_get_serial_port_data(port);</div><div class='add'>+	if (!priv) {</div><div class='add'>+		dbg("%s - bad port private data pointer - exiting", __FUNCTION__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* account for transferred data */</div><div class='add'>+	countback = urb-&gt;actual_length;</div><div class='add'>+	data_offset = priv-&gt;write_offset;</div><div class='add'>+	if (data_offset &gt; 0) {</div><div class='add'>+		/* Subtract the control bytes */</div><div class='add'>+		countback -= (data_offset * ((countback + (PKTSZ - 1)) / PKTSZ));</div><div class='add'>+	}</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	--priv-&gt;tx_outstanding_urbs;</div><div class='add'>+	priv-&gt;tx_outstanding_bytes -= countback;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> } /* ftdi_write_bulk_callback */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int ftdi_write_room( struct usb_serial_port *port )</div><div class='ctx'> {</div><div class='add'>+	struct ftdi_private *priv = usb_get_serial_port_data(port);</div><div class='add'>+	int room;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * We really can take anything the user throws at us</div><div class='del'>-	 * but let's pick a nice big number to tell the tty</div><div class='del'>-	 * layer that we have lots of free space</div><div class='del'>-	 */</div><div class='del'>-	return 2048;</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	if (priv-&gt;tx_outstanding_urbs &lt; URB_UPPER_LIMIT) {</div><div class='add'>+		/*</div><div class='add'>+		 * We really can take anything the user throws at us</div><div class='add'>+		 * but let's pick a nice big number to tell the tty</div><div class='add'>+		 * layer that we have lots of free space</div><div class='add'>+		 */</div><div class='add'>+		room = 2048;</div><div class='add'>+	} else {</div><div class='add'>+		room = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	return room;</div><div class='ctx'> } /* ftdi_write_room */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int ftdi_chars_in_buffer (struct usb_serial_port *port)</div><div class='ctx'> { /* ftdi_chars_in_buffer */</div><div class='add'>+	struct ftdi_private *priv = usb_get_serial_port_data(port);</div><div class='add'>+	int buffered;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='del'>-	/* </div><div class='del'>-	 * We can't really account for how much data we</div><div class='del'>-	 * have sent out, but hasn't made it through to the</div><div class='del'>-	 * device, so just tell the tty layer that everything</div><div class='del'>-	 * is flushed.</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	buffered = (int)priv-&gt;tx_outstanding_bytes;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	if (buffered &lt; 0) {</div><div class='add'>+		err("%s outstanding tx bytes is negative!", __FUNCTION__);</div><div class='add'>+		buffered = 0;</div><div class='add'>+	}</div><div class='add'>+	return buffered;</div><div class='ctx'> } /* ftdi_chars_in_buffer */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1509,6 +1580,8 @@ static void ftdi_read_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	struct usb_serial_port *port = (struct usb_serial_port *)urb-&gt;context;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='ctx'> 	struct ftdi_private *priv;</div><div class='add'>+	unsigned long countread;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;number_of_packets &gt; 0) {</div><div class='ctx'> 		err("%s transfer_buffer_length %d actual_length %d number of packets %d",__FUNCTION__,</div><div class='hunk'>@@ -1543,6 +1616,13 @@ static void ftdi_read_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* count data bytes, but not status bytes */</div><div class='add'>+	countread = urb-&gt;actual_length;</div><div class='add'>+	countread -= 2 * ((countread + (PKTSZ - 1)) / PKTSZ);</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;rx_lock, flags);</div><div class='add'>+	priv-&gt;rx_bytes += countread;</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;rx_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	ftdi_process_read(port);</div><div class='ctx'> </div><div class='ctx'> } /* ftdi_read_bulk_callback */</div><div class='hunk'>@@ -1867,7 +1947,7 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_</div><div class='ctx'> 			err("%s urb failed to set baudrate", __FUNCTION__);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Ensure RTS and DTR are raised when baudrate changed from 0 */</div><div class='del'>-		if ((old_termios-&gt;c_cflag &amp; CBAUD) == B0) {</div><div class='add'>+		if (!old_termios || (old_termios-&gt;c_cflag &amp; CBAUD) == B0) {</div><div class='ctx'> 			set_mctrl(port, TIOCM_DTR | TIOCM_RTS);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h<br/>index d69a917e768f..04ef90fcb876 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ftdi_sio.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ftdi_sio.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ftdi_sio.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ftdi_sio.h</a></div><div class='hunk'>@@ -36,6 +36,9 @@</div><div class='ctx'> #define FTDI_ACTZWAVE_PID	0xF2D0</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* www.starting-point-systems.com µChameleon device */</div><div class='add'>+#define FTDI_MICRO_CHAMELEON_PID	0xCAA0	/* Product Id */</div><div class='add'>+</div><div class='ctx'> /* www.irtrans.de device */</div><div class='ctx'> #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */</div><div class='ctx'> </div><div class='hunk'>@@ -436,6 +439,24 @@</div><div class='ctx'>  */</div><div class='ctx'> #define FTDI_ACG_HFDUAL_PID		0xDD20	/* HF Dual ISO Reader (RFID) */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Yost Engineering, Inc. products (www.yostengineering.com).</div><div class='add'>+ * PID 0xE050 submitted by Aaron Prose.</div><div class='add'>+ */</div><div class='add'>+#define FTDI_YEI_SERVOCENTER31_PID	0xE050	/* YEI ServoCenter3.1 USB */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ThorLabs USB motor drivers</div><div class='add'>+ */</div><div class='add'>+#define FTDI_THORLABS_PID		0xfaf0 /* ThorLabs USB motor drivers */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Testo products (http://www.testo.com/)</div><div class='add'>+ * Submitted by Colin Leroy</div><div class='add'>+ */</div><div class='add'>+#define TESTO_VID			0x128D</div><div class='add'>+#define TESTO_USB_INTERFACE_PID		0x0001</div><div class='add'>+</div><div class='ctx'> /* Commands */</div><div class='ctx'> #define FTDI_SIO_RESET 		0 /* Reset the port */</div><div class='ctx'> #define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */</div><div class='head'>diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c<br/>index 803721b97e2e..77b977206a8c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/funsoft.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/funsoft.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/funsoft.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/funsoft.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x1404, 0xcddc) },</div><div class='head'>diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c<br/>index 5ec9bf5bac8d..727852634be9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/garmin_gps.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/garmin_gps.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/garmin_gps.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/garmin_gps.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -36,6 +35,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* the mode to be set when the port ist opened */</div><div class='ctx'> static int initial_mode = 1;</div><div class='hunk'>@@ -43,8 +43,6 @@ static int initial_mode = 1;</div><div class='ctx'> /* debug flag */</div><div class='ctx'> static int debug = 0;</div><div class='ctx'> </div><div class='del'>-#include "usb-serial.h"</div><div class='del'>-</div><div class='ctx'> #define GARMIN_VENDOR_ID             0x091E</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1012,7 +1010,7 @@ static void garmin_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		garmin_data_p-&gt;flags |= CLEAR_HALT_REQUIRED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c<br/>index c62cc2876519..172713556393 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/generic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/generic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/generic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/generic.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -18,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='hunk'>@@ -286,6 +285,7 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb, struct pt_regs *reg</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		dev_err(&amp;port-&gt;dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback);</div><div class='ctx'> </div><div class='ctx'> void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='hunk'>@@ -299,9 +299,7 @@ void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *re</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usb_serial_port_softint((void *)port);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c<br/>index e9719da2aca1..ebcac701b069 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/hp4x.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/hp4x.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/hp4x.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/hp4x.c</a></div><div class='hunk'>@@ -12,13 +12,12 @@</div><div class='ctx'>  * See Documentation/usb/usb-serial.txt for more information on using this driver</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='head'>diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c<br/>index b606c5968102..c49976c3ad52 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/io_edgeport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/io_edgeport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/io_edgeport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/io_edgeport.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -45,7 +44,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "io_edgeport.h"</div><div class='ctx'> #include "io_ionsp.h"		/* info for the iosp messages */</div><div class='ctx'> #include "io_16654.h"		/* 16654 UART defines */</div><div class='hunk'>@@ -142,7 +141,7 @@ struct edgeport_port {</div><div class='ctx'> </div><div class='ctx'> /* This structure holds all of the individual device information */</div><div class='ctx'> struct edgeport_serial {</div><div class='del'>-	char			name[MAX_NAME_LEN+1];		/* string name of this device */</div><div class='add'>+	char			name[MAX_NAME_LEN+2];		/* string name of this device */</div><div class='ctx'> </div><div class='ctx'> 	struct edge_manuf_descriptor	manuf_descriptor;	/* the manufacturer descriptor */</div><div class='ctx'> 	struct edge_boot_descriptor	boot_descriptor;	/* the boot firmware descriptor */</div><div class='hunk'>@@ -270,7 +269,7 @@ static void get_manufacturing_desc	(struct edgeport_serial *edge_serial);</div><div class='ctx'> static void get_boot_desc		(struct edgeport_serial *edge_serial);</div><div class='ctx'> static void load_application_firmware	(struct edgeport_serial *edge_serial);</div><div class='ctx'> </div><div class='del'>-static void unicode_to_ascii		(char *string, __le16 *unicode, int unicode_size);</div><div class='add'>+static void unicode_to_ascii(char *string, int buflen, __le16 *unicode, int unicode_size);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> // ************************************************************************</div><div class='hunk'>@@ -373,7 +372,7 @@ static void update_edgeport_E2PROM (struct edgeport_serial *edge_serial)</div><div class='ctx'>  *  Get string descriptor from device					*</div><div class='ctx'>  *									*</div><div class='ctx'>  ************************************************************************/</div><div class='del'>-static int get_string (struct usb_device *dev, int Id, char *string)</div><div class='add'>+static int get_string (struct usb_device *dev, int Id, char *string, int buflen)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_string_descriptor StringDesc;</div><div class='ctx'> 	struct usb_string_descriptor *pStringDesc;</div><div class='hunk'>@@ -395,7 +394,7 @@ static int get_string (struct usb_device *dev, int Id, char *string)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	unicode_to_ascii(string,  pStringDesc-&gt;wData,     pStringDesc-&gt;bLength/2-1);</div><div class='add'>+	unicode_to_ascii(string, buflen, pStringDesc-&gt;wData, pStringDesc-&gt;bLength/2);</div><div class='ctx'> </div><div class='ctx'> 	kfree(pStringDesc);</div><div class='ctx'> 	return strlen(string);</div><div class='hunk'>@@ -2564,16 +2563,20 @@ static void change_port_settings (struct edgeport_port *edge_port, struct termio</div><div class='ctx'>  *	ASCII range, but it's only for debugging...</div><div class='ctx'>  *	NOTE: expects the unicode in LE format</div><div class='ctx'>  ****************************************************************************/</div><div class='del'>-static void unicode_to_ascii (char *string, __le16 *unicode, int unicode_size)</div><div class='add'>+static void unicode_to_ascii(char *string, int buflen, __le16 *unicode, int unicode_size)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (unicode_size &lt;= 0)</div><div class='add'>+	if (buflen &lt;= 0)	/* never happens, but... */</div><div class='ctx'> 		return;</div><div class='add'>+	--buflen;		/* space for nul */</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; unicode_size; ++i)</div><div class='add'>+	for (i = 0; i &lt; unicode_size; i++) {</div><div class='add'>+		if (i &gt;= buflen)</div><div class='add'>+			break;</div><div class='ctx'> 		string[i] = (char)(le16_to_cpu(unicode[i]));</div><div class='del'>-	string[unicode_size] = 0x00;</div><div class='add'>+	}</div><div class='add'>+	string[i] = 0x00;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2603,11 +2606,17 @@ static void get_manufacturing_desc (struct edgeport_serial *edge_serial)</div><div class='ctx'> 		dbg("  BoardRev:       %d", edge_serial-&gt;manuf_descriptor.BoardRev);</div><div class='ctx'> 		dbg("  NumPorts:       %d", edge_serial-&gt;manuf_descriptor.NumPorts);</div><div class='ctx'> 		dbg("  DescDate:       %d/%d/%d", edge_serial-&gt;manuf_descriptor.DescDate[0], edge_serial-&gt;manuf_descriptor.DescDate[1], edge_serial-&gt;manuf_descriptor.DescDate[2]+1900);</div><div class='del'>-		unicode_to_ascii (string, edge_serial-&gt;manuf_descriptor.SerialNumber, edge_serial-&gt;manuf_descriptor.SerNumLength/2-1);</div><div class='add'>+		unicode_to_ascii(string, sizeof(string),</div><div class='add'>+		    edge_serial-&gt;manuf_descriptor.SerialNumber,</div><div class='add'>+		    edge_serial-&gt;manuf_descriptor.SerNumLength/2);</div><div class='ctx'> 		dbg("  SerialNumber: %s", string);</div><div class='del'>-		unicode_to_ascii (string, edge_serial-&gt;manuf_descriptor.AssemblyNumber, edge_serial-&gt;manuf_descriptor.AssemblyNumLength/2-1);</div><div class='add'>+		unicode_to_ascii(string, sizeof(string),</div><div class='add'>+		    edge_serial-&gt;manuf_descriptor.AssemblyNumber,</div><div class='add'>+		    edge_serial-&gt;manuf_descriptor.AssemblyNumLength/2);</div><div class='ctx'> 		dbg("  AssemblyNumber: %s", string);</div><div class='del'>-		unicode_to_ascii (string, edge_serial-&gt;manuf_descriptor.OemAssyNumber, edge_serial-&gt;manuf_descriptor.OemAssyNumLength/2-1);</div><div class='add'>+		unicode_to_ascii(string, sizeof(string),</div><div class='add'>+		    edge_serial-&gt;manuf_descriptor.OemAssyNumber,</div><div class='add'>+		    edge_serial-&gt;manuf_descriptor.OemAssyNumLength/2);</div><div class='ctx'> 		dbg("  OemAssyNumber:  %s", string);</div><div class='ctx'> 		dbg("  UartType:       %d", edge_serial-&gt;manuf_descriptor.UartType);</div><div class='ctx'> 		dbg("  IonPid:         %d", edge_serial-&gt;manuf_descriptor.IonPid);</div><div class='hunk'>@@ -2720,7 +2729,7 @@ static int edge_startup (struct usb_serial *serial)</div><div class='ctx'> 	struct edgeport_serial *edge_serial;</div><div class='ctx'> 	struct edgeport_port *edge_port;</div><div class='ctx'> 	struct usb_device *dev;</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	dev = serial-&gt;dev;</div><div class='ctx'> </div><div class='hunk'>@@ -2735,11 +2744,11 @@ static int edge_startup (struct usb_serial *serial)</div><div class='ctx'> 	usb_set_serial_data(serial, edge_serial);</div><div class='ctx'> </div><div class='ctx'> 	/* get the name for the device from the device */</div><div class='del'>-	if ( (i = get_string(dev, dev-&gt;descriptor.iManufacturer, &amp;edge_serial-&gt;name[0])) != 0) {</div><div class='del'>-		edge_serial-&gt;name[i-1] = ' ';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	get_string(dev, dev-&gt;descriptor.iProduct, &amp;edge_serial-&gt;name[i]);</div><div class='add'>+	i = get_string(dev, dev-&gt;descriptor.iManufacturer,</div><div class='add'>+	    &amp;edge_serial-&gt;name[0], MAX_NAME_LEN+1);</div><div class='add'>+	edge_serial-&gt;name[i++] = ' ';</div><div class='add'>+	get_string(dev, dev-&gt;descriptor.iProduct,</div><div class='add'>+	    &amp;edge_serial-&gt;name[i], MAX_NAME_LEN+2 - i);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;serial-&gt;dev-&gt;dev, "%s detected\n", edge_serial-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -2784,6 +2793,10 @@ static int edge_startup (struct usb_serial *serial)</div><div class='ctx'> 		edge_port = kmalloc (sizeof(struct edgeport_port), GFP_KERNEL);</div><div class='ctx'> 		if (edge_port == NULL) {</div><div class='ctx'> 			dev_err(&amp;serial-&gt;dev-&gt;dev, "%s - Out of memory\n", __FUNCTION__);</div><div class='add'>+			for (j = 0; j &lt; i; ++j) {</div><div class='add'>+				kfree (usb_get_serial_port_data(serial-&gt;port[j]));</div><div class='add'>+				usb_set_serial_port_data(serial-&gt;port[j],  NULL);</div><div class='add'>+			}</div><div class='ctx'> 			usb_set_serial_data(serial, NULL);</div><div class='ctx'> 			kfree(edge_serial);</div><div class='ctx'> 			return -ENOMEM;</div><div class='head'>diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c<br/>index 8e1e2253748b..17c5b1d2311a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/io_ti.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/io_ti.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/io_ti.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/io_ti.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -40,8 +39,8 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "usb-serial.h"</div><div class='ctx'> #include "io_16654.h"</div><div class='ctx'> #include "io_usbvend.h"</div><div class='ctx'> #include "io_ti.h"</div><div class='head'>diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c<br/>index 9a5c97989562..59c5d999009a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ipaq.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ipaq.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ipaq.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ipaq.c</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'>  * 	Thanks to info from Heath Robinson and Arieh Davidoff.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -56,7 +55,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "ipaq.h"</div><div class='ctx'> </div><div class='ctx'> #define KP_RETRIES	100</div><div class='hunk'>@@ -71,6 +70,8 @@</div><div class='ctx'> </div><div class='ctx'> static __u16 product, vendor;</div><div class='ctx'> static int debug;</div><div class='add'>+static int connect_retries = KP_RETRIES;</div><div class='add'>+static int initial_wait;</div><div class='ctx'> </div><div class='ctx'> /* Function prototypes for an ipaq */</div><div class='ctx'> static int  ipaq_open (struct usb_serial_port *port, struct file *filp);</div><div class='hunk'>@@ -583,7 +584,7 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 	struct ipaq_private	*priv;</div><div class='ctx'> 	struct ipaq_packet	*pkt;</div><div class='ctx'> 	int			i, result = 0;</div><div class='del'>-	int			retries = KP_RETRIES;</div><div class='add'>+	int			retries = connect_retries;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='hunk'>@@ -647,16 +648,12 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 	port-&gt;read_urb-&gt;transfer_buffer_length = URBDATA_SIZE;</div><div class='ctx'> 	port-&gt;bulk_out_size = port-&gt;write_urb-&gt;transfer_buffer_length = URBDATA_SIZE;</div><div class='ctx'> 	</div><div class='add'>+	msleep(1000*initial_wait);</div><div class='ctx'> 	/* Start reading from the device */</div><div class='ctx'> 	usb_fill_bulk_urb(port-&gt;read_urb, serial-&gt;dev, </div><div class='ctx'> 		      usb_rcvbulkpipe(serial-&gt;dev, port-&gt;bulk_in_endpointAddress),</div><div class='ctx'> 		      port-&gt;read_urb-&gt;transfer_buffer, port-&gt;read_urb-&gt;transfer_buffer_length,</div><div class='ctx'> 		      ipaq_read_bulk_callback, port);</div><div class='del'>-	result = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='del'>-	if (result) {</div><div class='del'>-		err("%s - failed submitting read urb, error %d", __FUNCTION__, result);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Send out control message observed in win98 sniffs. Not sure what</div><div class='hunk'>@@ -671,8 +668,14 @@ static int ipaq_open(struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 				usb_sndctrlpipe(serial-&gt;dev, 0), 0x22, 0x21,</div><div class='ctx'> 				0x1, 0, NULL, 0, 100);</div><div class='ctx'> 		if (result == 0) {</div><div class='add'>+			result = usb_submit_urb(port-&gt;read_urb, GFP_KERNEL);</div><div class='add'>+			if (result) {</div><div class='add'>+				err("%s - failed submitting read urb, error %d", __FUNCTION__, result);</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='add'>+		msleep(1000);</div><div class='ctx'> 	}</div><div class='ctx'> 	err("%s - failed doing control urb, error %d", __FUNCTION__, result);</div><div class='ctx'> 	goto error;</div><div class='hunk'>@@ -855,6 +858,7 @@ static void ipaq_write_bulk_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	</div><div class='ctx'> 	if (urb-&gt;status) {</div><div class='ctx'> 		dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb-&gt;status);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;write_list_lock, flags);</div><div class='hunk'>@@ -870,7 +874,7 @@ static void ipaq_write_bulk_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;write_list_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipaq_write_room(struct usb_serial_port *port)</div><div class='hunk'>@@ -967,3 +971,9 @@ MODULE_PARM_DESC(vendor, "User specified USB idVendor");</div><div class='ctx'> </div><div class='ctx'> module_param(product, ushort, 0);</div><div class='ctx'> MODULE_PARM_DESC(product, "User specified USB idProduct");</div><div class='add'>+</div><div class='add'>+module_param(connect_retries, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(connect_retries, "Maximum number of connect retries (one second each)");</div><div class='add'>+</div><div class='add'>+module_param(initial_wait, int, S_IRUGO|S_IWUSR);</div><div class='add'>+MODULE_PARM_DESC(initial_wait, "Time to wait before attempting a connection (in seconds)");</div><div class='head'>diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c<br/>index e760a70242c1..87306cb6f9f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ipw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ipw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ipw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ipw.c</a></div><div class='hunk'>@@ -46,8 +46,8 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='hunk'>@@ -373,10 +373,12 @@ static void ipw_write_bulk_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s", __FUNCTION__);</div><div class='ctx'> </div><div class='add'>+	port-&gt;write_urb_busy = 0;</div><div class='add'>+</div><div class='ctx'> 	if (urb-&gt;status)</div><div class='ctx'> 		dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb-&gt;status);</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ipw_write(struct usb_serial_port *port, const unsigned char *buf, int count)</div><div class='head'>diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c<br/>index 426182ddc42a..1738b0b6a376 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ir-usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ir-usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ir-usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ir-usb.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'>  *	initial version released.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -58,7 +57,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='hunk'>@@ -408,7 +407,7 @@ static void ir_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		urb-&gt;actual_length,</div><div class='ctx'> 		urb-&gt;transfer_buffer);</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ir_read_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='hunk'>@@ -453,8 +452,7 @@ static void ir_read_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 			tty = port-&gt;tty;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 *	FIXME: must not do this in IRQ context,</div><div class='del'>-			 *	must honour TTY_DONT_FLIP</div><div class='add'>+			 *	FIXME: must not do this in IRQ context</div><div class='ctx'> 			 */</div><div class='ctx'> 			tty-&gt;ldisc.receive_buf(</div><div class='ctx'> 				tty,</div><div class='head'>diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c<br/>index 052b735c4fbd..015ad6cc1bbb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/keyspan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/keyspan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/keyspan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/keyspan.c</a></div><div class='hunk'>@@ -95,7 +95,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -108,7 +107,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "keyspan.h"</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='hunk'>@@ -481,7 +480,7 @@ static void	usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	dbg ("%s - urb %d", __FUNCTION__, urb == p_priv-&gt;out_urbs[1]); </div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;open_count)</div><div class='del'>-		schedule_work(&amp;port-&gt;work);</div><div class='add'>+		usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void	usa26_inack_callback(struct urb *urb, struct pt_regs *regs)</div><div class='head'>diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c<br/>index b0441c35f98f..49b8dc039d1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/keyspan_pda.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/keyspan_pda.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/keyspan_pda.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/keyspan_pda.c</a></div><div class='hunk'>@@ -66,7 +66,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -79,6 +78,7 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='hunk'>@@ -108,8 +108,6 @@ struct ezusb_hex_record {</div><div class='ctx'> #include "xircom_pgs_fw.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include "usb-serial.h"</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Version Information</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c<br/>index 78335a5f7743..2a2f3e2da055 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/kl5kusb105.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/kl5kusb105.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/kl5kusb105.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/kl5kusb105.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -56,7 +55,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "kl5kusb105.h"</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='hunk'>@@ -569,8 +568,7 @@ static void klsi_105_write_bulk_callback ( struct urb *urb, struct pt_regs *regs</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* from generic_write_bulk_callback */</div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> } /* klsi_105_write_bulk_completion_callback */</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c<br/>index 87dfcd89ffab..d50dce034958 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/kobil_sct.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/kobil_sct.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/kobil_sct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/kobil_sct.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -47,8 +46,8 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='ctx'> #include "kobil_sct.h"</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='head'>diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c<br/>index 35bd29b6c408..f4d4305c2c02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/mct_u232.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/mct_u232.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/mct_u232.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/mct_u232.c</a></div><div class='hunk'>@@ -64,7 +64,6 @@</div><div class='ctx'>  *   (via linux-usb-devel).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -76,7 +75,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "mct_u232.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c<br/>index 7f544081032e..ac3f8b5d2c49 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/navman.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/navman.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/navman.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/navman.c</a></div><div class='hunk'>@@ -14,7 +14,7 @@</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c<br/>index 238033a87092..e49f40913c27 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/omninet.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/omninet.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/omninet.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/omninet.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -47,7 +46,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int debug;</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +319,7 @@ static void omninet_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c<br/>index 5cf2b80add7a..f0530c1d7b7a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/option.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/option.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/option.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/option.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>-  Option Card (PCMCIA to) USB to Serial Driver</div><div class='add'>+  USB Driver for GSM modems</div><div class='ctx'> </div><div class='ctx'>   Copyright (C) 2005  Matthias Urlichs &lt;smurf@smurf.noris.de&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -28,17 +28,36 @@</div><div class='ctx'>   2005-09-10  v0.4.3 added HUAWEI E600 card and Audiovox AirCard</div><div class='ctx'>   2005-09-20  v0.4.4 increased recv buffer size: the card sometimes</div><div class='ctx'>                      wants to send &gt;2000 bytes.</div><div class='del'>-  2006-04-10  v0.4.2 fixed two array overrun errors :-/</div><div class='add'>+  2006-04-10  v0.5   fixed two array overrun errors :-/</div><div class='add'>+  2006-04-21  v0.5.1 added support for Sierra Wireless MC8755</div><div class='add'>+  2006-05-15  v0.6   re-enable multi-port support</div><div class='add'>+  2006-06-01  v0.6.1 add COBRA</div><div class='add'>+  2006-06-01  v0.6.2 add backwards-compatibility stuff</div><div class='add'>+  2006-06-01  v0.6.3 add Novatel Wireless</div><div class='add'>+  2006-06-01  v0.7   Option =&gt; GSM</div><div class='add'>+  2006-06-01  v0.7.1 add COBRA2</div><div class='ctx'> </div><div class='ctx'>   Work sponsored by: Sigos GmbH, Germany &lt;info@sigos.de&gt;</div><div class='ctx'> </div><div class='add'>+  This driver exists because the "normal" serial driver doesn't work too well</div><div class='add'>+  with GSM modems. Issues:</div><div class='add'>+  - data loss -- one single Receive URB is not nearly enough</div><div class='add'>+  - nonstandard flow (Option devices) and multiplex (Sierra) control</div><div class='add'>+  - controlling the baud rate doesn't make sense</div><div class='add'>+</div><div class='add'>+  This driver is named "option" because the most common device it's</div><div class='add'>+  used for is a PC-Card (with an internal OHCI-USB interface, behind</div><div class='add'>+  which the GSM interface sits), made by Option Inc.</div><div class='add'>+</div><div class='add'>+  Some of the "one port" devices actually exhibit multiple USB instances</div><div class='add'>+  on the USB bus. This is not a bug, these ports are used for different</div><div class='add'>+  device features.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#define DRIVER_VERSION "v0.4"</div><div class='add'>+#define DRIVER_VERSION "v0.7.1"</div><div class='ctx'> #define DRIVER_AUTHOR "Matthias Urlichs &lt;smurf@smurf.noris.de&gt;"</div><div class='del'>-#define DRIVER_DESC "Option Card (PC-Card to) USB to Serial Driver"</div><div class='add'>+#define DRIVER_DESC "USB Driver for GSM modems"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -46,7 +65,7 @@</div><div class='ctx'> #include &lt;linux/tty_flip.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Function prototypes */</div><div class='ctx'> static int  option_open(struct usb_serial_port *port, struct file *filp);</div><div class='hunk'>@@ -74,22 +93,48 @@ static int  option_tiocmset(struct usb_serial_port *port, struct file *file,</div><div class='ctx'> static int  option_send_setup(struct usb_serial_port *port);</div><div class='ctx'> </div><div class='ctx'> /* Vendor and product IDs */</div><div class='del'>-#define OPTION_VENDOR_ID			0x0AF0</div><div class='del'>-#define HUAWEI_VENDOR_ID			0x12D1</div><div class='del'>-#define AUDIOVOX_VENDOR_ID			0x0F3D</div><div class='del'>-</div><div class='del'>-#define OPTION_PRODUCT_OLD		0x5000</div><div class='del'>-#define OPTION_PRODUCT_FUSION	0x6000</div><div class='del'>-#define OPTION_PRODUCT_FUSION2	0x6300</div><div class='del'>-#define HUAWEI_PRODUCT_E600     0x1001</div><div class='del'>-#define AUDIOVOX_PRODUCT_AIRCARD 0x0112</div><div class='add'>+#define OPTION_VENDOR_ID                0x0AF0</div><div class='add'>+#define HUAWEI_VENDOR_ID                0x12D1</div><div class='add'>+#define AUDIOVOX_VENDOR_ID              0x0F3D</div><div class='add'>+#define SIERRAWIRELESS_VENDOR_ID        0x1199</div><div class='add'>+#define NOVATELWIRELESS_VENDOR_ID       0x1410</div><div class='add'>+</div><div class='add'>+#define OPTION_PRODUCT_OLD              0x5000</div><div class='add'>+#define OPTION_PRODUCT_FUSION           0x6000</div><div class='add'>+#define OPTION_PRODUCT_FUSION2          0x6300</div><div class='add'>+#define OPTION_PRODUCT_COBRA            0x6500</div><div class='add'>+#define OPTION_PRODUCT_COBRA2           0x6600</div><div class='add'>+#define HUAWEI_PRODUCT_E600             0x1001</div><div class='add'>+#define AUDIOVOX_PRODUCT_AIRCARD        0x0112</div><div class='add'>+#define SIERRAWIRELESS_PRODUCT_MC8755   0x6802</div><div class='add'>+#define NOVATELWIRELESS_PRODUCT_U740    0x1400</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id option_ids[] = {</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },</div><div class='ctx'> 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },</div><div class='ctx'> 	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },</div><div class='ctx'> 	{ USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },</div><div class='add'>+	{ USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) },</div><div class='add'>+	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },</div><div class='add'>+	{ } /* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_device_id option_ids1[] = {</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },</div><div class='add'>+	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },</div><div class='add'>+	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },</div><div class='add'>+	{ USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },</div><div class='add'>+	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },</div><div class='add'>+	{ } /* Terminating entry */</div><div class='add'>+};</div><div class='add'>+static struct usb_device_id option_ids3[] = {</div><div class='add'>+	{ USB_DEVICE(SIERRAWIRELESS_VENDOR_ID, SIERRAWIRELESS_PRODUCT_MC8755) },</div><div class='ctx'> 	{ } /* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -111,12 +156,39 @@ static struct usb_serial_driver option_3port_device = {</div><div class='ctx'> 		.owner =	THIS_MODULE,</div><div class='ctx'> 		.name =		"option",</div><div class='ctx'> 	},</div><div class='del'>-	.description       = "Option 3G data card",</div><div class='del'>-	.id_table          = option_ids,</div><div class='add'>+	.description       = "GSM modem (3-port)",</div><div class='add'>+	.id_table          = option_ids3,</div><div class='ctx'> 	.num_interrupt_in  = NUM_DONT_CARE,</div><div class='ctx'> 	.num_bulk_in       = NUM_DONT_CARE,</div><div class='ctx'> 	.num_bulk_out      = NUM_DONT_CARE,</div><div class='del'>-	.num_ports         = 1, /* 3, but the card reports its ports separately */</div><div class='add'>+	.num_ports         = 3,</div><div class='add'>+	.open              = option_open,</div><div class='add'>+	.close             = option_close,</div><div class='add'>+	.write             = option_write,</div><div class='add'>+	.write_room        = option_write_room,</div><div class='add'>+	.chars_in_buffer   = option_chars_in_buffer,</div><div class='add'>+	.throttle          = option_rx_throttle,</div><div class='add'>+	.unthrottle        = option_rx_unthrottle,</div><div class='add'>+	.set_termios       = option_set_termios,</div><div class='add'>+	.break_ctl         = option_break_ctl,</div><div class='add'>+	.tiocmget          = option_tiocmget,</div><div class='add'>+	.tiocmset          = option_tiocmset,</div><div class='add'>+	.attach            = option_startup,</div><div class='add'>+	.shutdown          = option_shutdown,</div><div class='add'>+	.read_int_callback = option_instat_callback,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_serial_driver option_1port_device = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner =	THIS_MODULE,</div><div class='add'>+		.name =		"option",</div><div class='add'>+	},</div><div class='add'>+	.description       = "GSM modem (1-port)",</div><div class='add'>+	.id_table          = option_ids1,</div><div class='add'>+	.num_interrupt_in  = NUM_DONT_CARE,</div><div class='add'>+	.num_bulk_in       = NUM_DONT_CARE,</div><div class='add'>+	.num_bulk_out      = NUM_DONT_CARE,</div><div class='add'>+	.num_ports         = 1,</div><div class='ctx'> 	.open              = option_open,</div><div class='ctx'> 	.close             = option_close,</div><div class='ctx'> 	.write             = option_write,</div><div class='hunk'>@@ -170,6 +242,9 @@ struct option_port_private {</div><div class='ctx'> static int __init option_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='add'>+	retval = usb_serial_register(&amp;option_1port_device);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto failed_1port_device_register;</div><div class='ctx'> 	retval = usb_serial_register(&amp;option_3port_device);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto failed_3port_device_register;</div><div class='hunk'>@@ -184,6 +259,8 @@ static int __init option_init(void)</div><div class='ctx'> failed_driver_register:</div><div class='ctx'> 	usb_serial_deregister (&amp;option_3port_device);</div><div class='ctx'> failed_3port_device_register:</div><div class='add'>+	usb_serial_deregister (&amp;option_1port_device);</div><div class='add'>+failed_1port_device_register:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -191,6 +268,7 @@ static void __exit option_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	usb_deregister (&amp;option_driver);</div><div class='ctx'> 	usb_serial_deregister (&amp;option_3port_device);</div><div class='add'>+	usb_serial_deregister (&amp;option_1port_device);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(option_init);</div><div class='hunk'>@@ -365,8 +443,7 @@ static void option_outdat_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	port = (struct usb_serial_port *) urb-&gt;context;</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;open_count)</div><div class='del'>-		schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void option_instat_callback(struct urb *urb, struct pt_regs *regs)</div><div class='hunk'>@@ -573,27 +650,30 @@ static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,</div><div class='ctx'> /* Setup urbs */</div><div class='ctx'> static void option_setup_urbs(struct usb_serial *serial)</div><div class='ctx'> {</div><div class='del'>-	int j;</div><div class='add'>+	int i,j;</div><div class='ctx'> 	struct usb_serial_port *port;</div><div class='ctx'> 	struct option_port_private *portdata;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s", __FUNCTION__);</div><div class='ctx'> </div><div class='del'>-	port = serial-&gt;port[0];</div><div class='del'>-	portdata = usb_get_serial_port_data(port);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; serial-&gt;num_ports; i++) {</div><div class='add'>+		port = serial-&gt;port[i];</div><div class='add'>+		portdata = usb_get_serial_port_data(port);</div><div class='ctx'> </div><div class='ctx'> 	/* Do indat endpoints first */</div><div class='del'>-	for (j = 0; j &lt; N_IN_URB; ++j) {</div><div class='del'>-		portdata-&gt;in_urbs[j] = option_setup_urb (serial,</div><div class='del'>-                  port-&gt;bulk_in_endpointAddress, USB_DIR_IN, port,</div><div class='del'>-                  portdata-&gt;in_buffer[j], IN_BUFLEN, option_indat_callback);</div><div class='del'>-	}</div><div class='add'>+		for (j = 0; j &lt; N_IN_URB; ++j) {</div><div class='add'>+			portdata-&gt;in_urbs[j] = option_setup_urb (serial,</div><div class='add'>+                  	port-&gt;bulk_in_endpointAddress, USB_DIR_IN, port,</div><div class='add'>+                  	portdata-&gt;in_buffer[j], IN_BUFLEN, option_indat_callback);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* outdat endpoints */</div><div class='del'>-	for (j = 0; j &lt; N_OUT_URB; ++j) {</div><div class='del'>-		portdata-&gt;out_urbs[j] = option_setup_urb (serial,</div><div class='del'>-                  port-&gt;bulk_out_endpointAddress, USB_DIR_OUT, port,</div><div class='del'>-                  portdata-&gt;out_buffer[j], OUT_BUFLEN, option_outdat_callback);</div><div class='add'>+		/* outdat endpoints */</div><div class='add'>+		for (j = 0; j &lt; N_OUT_URB; ++j) {</div><div class='add'>+			portdata-&gt;out_urbs[j] = option_setup_urb (serial,</div><div class='add'>+                  	port-&gt;bulk_out_endpointAddress, USB_DIR_OUT, port,</div><div class='add'>+                  	portdata-&gt;out_buffer[j], OUT_BUFLEN, option_outdat_callback);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c<br/>index c96714bb1cb8..259db31b65c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/pl2303.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/pl2303.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/pl2303.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/pl2303.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -28,7 +27,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "pl2303.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -53,6 +52,7 @@ struct pl2303_buf {</div><div class='ctx'> static struct usb_device_id id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) },</div><div class='ctx'> 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) },</div><div class='add'>+	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) },</div><div class='ctx'> 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },</div><div class='ctx'> 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },</div><div class='ctx'> 	{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },</div><div class='hunk'>@@ -80,6 +80,7 @@ static struct usb_device_id id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(LEADTEK_VENDOR_ID, LEADTEK_9531_PRODUCT_ID) },</div><div class='ctx'> 	{ USB_DEVICE(SPEEDDRAGON_VENDOR_ID, SPEEDDRAGON_PRODUCT_ID) },</div><div class='ctx'> 	{ USB_DEVICE(OTI_VENDOR_ID, OTI_PRODUCT_ID) },</div><div class='add'>+	{ USB_DEVICE(DATAPILOT_U2_VENDOR_ID, DATAPILOT_U2_PRODUCT_ID) },</div><div class='ctx'> 	{ }					/* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -314,7 +315,7 @@ static void pl2303_send(struct usb_serial_port *port)</div><div class='ctx'> 		// TODO: reschedule pl2303_send</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pl2303_write_room(struct usb_serial_port *port)</div><div class='hunk'>@@ -600,7 +601,7 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 	unsigned int c_cflag;</div><div class='ctx'> 	int bps;</div><div class='ctx'> 	long timeout;</div><div class='del'>-	wait_queue_t wait;						\</div><div class='add'>+	wait_queue_t wait;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h<br/>index 7f29e81d3e35..d9c1e6e0b4b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/pl2303.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/pl2303.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/pl2303.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/pl2303.h</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #define PL2303_VENDOR_ID	0x067b</div><div class='ctx'> #define PL2303_PRODUCT_ID	0x2303</div><div class='ctx'> #define PL2303_PRODUCT_ID_RSAQ2		0x04bb</div><div class='add'>+#define PL2303_PRODUCT_ID_DCU11		0x1234</div><div class='ctx'> #define PL2303_PRODUCT_ID_PHAROS	0xaaa0</div><div class='ctx'> #define PL2303_PRODUCT_ID_RSAQ3		0xaaa2</div><div class='ctx'> </div><div class='hunk'>@@ -84,3 +85,7 @@</div><div class='ctx'> /* Ours Technology Inc DKU-5 clone, chipset: Prolific Technology Inc */</div><div class='ctx'> #define OTI_VENDOR_ID	0x0ea0</div><div class='ctx'> #define OTI_PRODUCT_ID	0x6858</div><div class='add'>+</div><div class='add'>+/* DATAPILOT Universal-2 Phone Cable */</div><div class='add'>+#define DATAPILOT_U2_VENDOR_ID	0x0731</div><div class='add'>+#define DATAPILOT_U2_PRODUCT_ID	0x2003</div><div class='head'>diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c<br/>index f0215f850d2d..789771ecdb11 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/safe_serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/safe_serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/safe_serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/safe_serial.c</a></div><div class='hunk'>@@ -60,7 +60,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -72,7 +71,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_USB_SAFE_PADDED</div><div class='head'>diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c<br/>new file mode 100644<br/>index 000000000000..d29638daa987<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/sierra.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/sierra.c</a></div><div class='hunk'>@@ -0,0 +1,75 @@</div><div class='add'>+/*</div><div class='add'>+ * Sierra Wireless CDMA Wireless Serial USB driver</div><div class='add'>+ *</div><div class='add'>+ * Current Copy modified by: Kevin Lloyd &lt;linux@sierrawireless.com&gt;</div><div class='add'>+ * Original Copyright (C) 2005-2006 Greg Kroah-Hartman &lt;gregkh@suse.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *	This program is free software; you can redistribute it and/or</div><div class='add'>+ *	modify it under the terms of the GNU General Public License version</div><div class='add'>+ *	2 as published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='add'>+</div><div class='add'>+static struct usb_device_id id_table [] = {</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x0018) },	/* Sierra Wireless MC5720 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x0020) },	/* Sierra Wireless MC5725 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x0017) },	/* Sierra Wireless EM5625 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x0019) },	/* Sierra Wireless AirCard 595 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x6802) },	/* Sierra Wireless MC8755 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x6803) },	/* Sierra Wireless MC8765 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x6812) },	/* Sierra Wireless MC8775 */</div><div class='add'>+	{ USB_DEVICE(0x1199, 0x6820) },	/* Sierra Wireless AirCard 875 */</div><div class='add'>+	/* Following devices are supported in the airprime.c driver */</div><div class='add'>+	/* { USB_DEVICE(0x1199, 0x0112) }, */	/* Sierra Wireless AirCard 580 */</div><div class='add'>+	/* { USB_DEVICE(0x0F3D, 0x0112) }, */	/* AirPrime/Sierra PC 5220 */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, id_table);</div><div class='add'>+</div><div class='add'>+static struct usb_driver sierra_driver = {</div><div class='add'>+	.name =		"sierra_wireless",</div><div class='add'>+	.probe =	usb_serial_probe,</div><div class='add'>+	.disconnect =	usb_serial_disconnect,</div><div class='add'>+	.id_table =	id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_serial_driver sierra_device = {</div><div class='add'>+	.driver = {</div><div class='add'>+	.owner =		THIS_MODULE,</div><div class='add'>+	.name =			"Sierra_Wireless",</div><div class='add'>+	},</div><div class='add'>+	.id_table =		id_table,</div><div class='add'>+	.num_interrupt_in =	NUM_DONT_CARE,</div><div class='add'>+	.num_bulk_in =		NUM_DONT_CARE,</div><div class='add'>+	.num_bulk_out =		NUM_DONT_CARE,</div><div class='add'>+	.num_ports =		3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init sierra_init(void)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = usb_serial_register(&amp;sierra_device);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+	retval = usb_register(&amp;sierra_driver);</div><div class='add'>+	if (retval)</div><div class='add'>+		usb_serial_deregister(&amp;sierra_device);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sierra_exit(void)</div><div class='add'>+{</div><div class='add'>+	usb_deregister(&amp;sierra_driver);</div><div class='add'>+	usb_serial_deregister(&amp;sierra_device);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(sierra_init);</div><div class='add'>+module_exit(sierra_exit);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c<br/>index c3a2071b802d..ac9b8ee52d44 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/ti_usb_3410_5052.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/ti_usb_3410_5052.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/ti_usb_3410_5052.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/ti_usb_3410_5052.c</a></div><div class='hunk'>@@ -68,7 +68,6 @@</div><div class='ctx'>  * fi</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -84,8 +83,8 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "usb-serial.h"</div><div class='ctx'> #include "ti_usb_3410_5052.h"</div><div class='ctx'> #include "ti_fw_3410.h"		/* firmware image for 3410 */</div><div class='ctx'> #include "ti_fw_5052.h"		/* firmware image for 5052 */</div><div class='head'>diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c<br/>index 9c36f0ece20f..12c1694d322e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/usb-serial.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/usb-serial.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/usb-serial.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/usb-serial.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -32,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "pl2303.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -41,6 +40,8 @@</div><div class='ctx'> #define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux/"</div><div class='ctx'> #define DRIVER_DESC "USB Serial Driver core"</div><div class='ctx'> </div><div class='add'>+static void port_free(struct usb_serial_port *port);</div><div class='add'>+</div><div class='ctx'> /* Driver structure we register with the USB core */</div><div class='ctx'> static struct usb_driver usb_serial_driver = {</div><div class='ctx'> 	.name =		"usbserial",</div><div class='hunk'>@@ -147,18 +148,7 @@ static void destroy_serial(struct kref *kref)</div><div class='ctx'> 			port = serial-&gt;port[i];</div><div class='ctx'> 			if (!port)</div><div class='ctx'> 				continue;</div><div class='del'>-			usb_kill_urb(port-&gt;read_urb);</div><div class='del'>-			usb_free_urb(port-&gt;read_urb);</div><div class='del'>-			usb_kill_urb(port-&gt;write_urb);</div><div class='del'>-			usb_free_urb(port-&gt;write_urb);</div><div class='del'>-			usb_kill_urb(port-&gt;interrupt_in_urb);</div><div class='del'>-			usb_free_urb(port-&gt;interrupt_in_urb);</div><div class='del'>-			usb_kill_urb(port-&gt;interrupt_out_urb);</div><div class='del'>-			usb_free_urb(port-&gt;interrupt_out_urb);</div><div class='del'>-			kfree(port-&gt;bulk_in_buffer);</div><div class='del'>-			kfree(port-&gt;bulk_out_buffer);</div><div class='del'>-			kfree(port-&gt;interrupt_in_buffer);</div><div class='del'>-			kfree(port-&gt;interrupt_out_buffer);</div><div class='add'>+			port_free(port);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -168,6 +158,11 @@ static void destroy_serial(struct kref *kref)</div><div class='ctx'> 	kfree (serial);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void usb_serial_put(struct usb_serial *serial)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;serial-&gt;kref, destroy_serial);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  * Driver tty interface functions</div><div class='ctx'>  *****************************************************************************/</div><div class='hunk'>@@ -201,12 +196,12 @@ static int serial_open (struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 	 </div><div class='ctx'> 	++port-&gt;open_count;</div><div class='ctx'> </div><div class='del'>-	if (port-&gt;open_count == 1) {</div><div class='add'>+	/* set up our port structure making the tty driver</div><div class='add'>+	 * remember our port object, and us it */</div><div class='add'>+	tty-&gt;driver_data = port;</div><div class='add'>+	port-&gt;tty = tty;</div><div class='ctx'> </div><div class='del'>-		/* set up our port structure making the tty driver</div><div class='del'>-		 * remember our port object, and us it */</div><div class='del'>-		tty-&gt;driver_data = port;</div><div class='del'>-		port-&gt;tty = tty;</div><div class='add'>+	if (port-&gt;open_count == 1) {</div><div class='ctx'> </div><div class='ctx'> 		/* lock this module before we call it</div><div class='ctx'> 		 * this may fail, which means we must bail out,</div><div class='hunk'>@@ -230,9 +225,11 @@ bailout_module_put:</div><div class='ctx'> 	module_put(serial-&gt;type-&gt;driver.owner);</div><div class='ctx'> bailout_mutex_unlock:</div><div class='ctx'> 	port-&gt;open_count = 0;</div><div class='add'>+	tty-&gt;driver_data = NULL;</div><div class='add'>+	port-&gt;tty = NULL;</div><div class='ctx'> 	mutex_unlock(&amp;port-&gt;mutex);</div><div class='ctx'> bailout_kref_put:</div><div class='del'>-	kref_put(&amp;serial-&gt;kref, destroy_serial);</div><div class='add'>+	usb_serial_put(serial);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +265,7 @@ static void serial_close(struct tty_struct *tty, struct file * filp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;port-&gt;mutex);</div><div class='del'>-	kref_put(&amp;port-&gt;serial-&gt;kref, destroy_serial);</div><div class='add'>+	usb_serial_put(port-&gt;serial);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int serial_write (struct tty_struct * tty, const unsigned char *buf, int count)</div><div class='hunk'>@@ -276,7 +273,7 @@ static int serial_write (struct tty_struct * tty, const unsigned char *buf, int</div><div class='ctx'> 	struct usb_serial_port *port = tty-&gt;driver_data;</div><div class='ctx'> 	int retval = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!port)</div><div class='add'>+	if (!port || port-&gt;serial-&gt;dev-&gt;state == USB_STATE_NOTATTACHED)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d, %d byte(s)", __FUNCTION__, port-&gt;number, count);</div><div class='hunk'>@@ -296,7 +293,7 @@ exit:</div><div class='ctx'> static int serial_write_room (struct tty_struct *tty) </div><div class='ctx'> {</div><div class='ctx'> 	struct usb_serial_port *port = tty-&gt;driver_data;</div><div class='del'>-	int retval = -EINVAL;</div><div class='add'>+	int retval = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -318,7 +315,7 @@ exit:</div><div class='ctx'> static int serial_chars_in_buffer (struct tty_struct *tty) </div><div class='ctx'> {</div><div class='ctx'> 	struct usb_serial_port *port = tty-&gt;driver_data;</div><div class='del'>-	int retval = -EINVAL;</div><div class='add'>+	int retval = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!port)</div><div class='ctx'> 		goto exit;</div><div class='hunk'>@@ -473,7 +470,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int</div><div class='ctx'> 			begin += length;</div><div class='ctx'> 			length = 0;</div><div class='ctx'> 		}</div><div class='del'>-		kref_put(&amp;serial-&gt;kref, destroy_serial);</div><div class='add'>+		usb_serial_put(serial);</div><div class='ctx'> 	}</div><div class='ctx'> 	*eof = 1;</div><div class='ctx'> done:</div><div class='hunk'>@@ -488,19 +485,18 @@ static int serial_tiocmget (struct tty_struct *tty, struct file *file)</div><div class='ctx'> 	struct usb_serial_port *port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port)</div><div class='del'>-		goto exit;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	if (!port-&gt;open_count) {</div><div class='ctx'> 		dbg("%s - port not open", __FUNCTION__);</div><div class='del'>-		goto exit;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;serial-&gt;type-&gt;tiocmget)</div><div class='ctx'> 		return port-&gt;serial-&gt;type-&gt;tiocmget(port, file);</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -510,23 +506,32 @@ static int serial_tiocmset (struct tty_struct *tty, struct file *file,</div><div class='ctx'> 	struct usb_serial_port *port = tty-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!port)</div><div class='del'>-		goto exit;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	if (!port-&gt;open_count) {</div><div class='ctx'> 		dbg("%s - port not open", __FUNCTION__);</div><div class='del'>-		goto exit;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;serial-&gt;type-&gt;tiocmset)</div><div class='ctx'> 		return port-&gt;serial-&gt;type-&gt;tiocmset(port, file, set, clear);</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void usb_serial_port_softint(void *private)</div><div class='add'>+/*</div><div class='add'>+ * We would be calling tty_wakeup here, but unfortunately some line</div><div class='add'>+ * disciplines have an annoying habit of calling tty-&gt;write from</div><div class='add'>+ * the write wakeup callback (e.g. n_hdlc.c).</div><div class='add'>+ */</div><div class='add'>+void usb_serial_port_softint(struct usb_serial_port *port)</div><div class='add'>+{</div><div class='add'>+	schedule_work(&amp;port-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void usb_serial_port_work(void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_serial_port *port = private;</div><div class='ctx'> 	struct tty_struct *tty;</div><div class='hunk'>@@ -548,6 +553,11 @@ static void port_release(struct device *dev)</div><div class='ctx'> 	struct usb_serial_port *port = to_usb_serial_port(dev);</div><div class='ctx'> </div><div class='ctx'> 	dbg ("%s - %s", __FUNCTION__, dev-&gt;bus_id);</div><div class='add'>+	port_free(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void port_free(struct usb_serial_port *port)</div><div class='add'>+{</div><div class='ctx'> 	usb_kill_urb(port-&gt;read_urb);</div><div class='ctx'> 	usb_free_urb(port-&gt;read_urb);</div><div class='ctx'> 	usb_kill_urb(port-&gt;write_urb);</div><div class='hunk'>@@ -560,6 +570,7 @@ static void port_release(struct device *dev)</div><div class='ctx'> 	kfree(port-&gt;bulk_out_buffer);</div><div class='ctx'> 	kfree(port-&gt;interrupt_in_buffer);</div><div class='ctx'> 	kfree(port-&gt;interrupt_out_buffer);</div><div class='add'>+	flush_scheduled_work();		/* port-&gt;work */</div><div class='ctx'> 	kfree(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -789,7 +800,7 @@ int usb_serial_probe(struct usb_interface *interface,</div><div class='ctx'> 		port-&gt;serial = serial;</div><div class='ctx'> 		spin_lock_init(&amp;port-&gt;lock);</div><div class='ctx'> 		mutex_init(&amp;port-&gt;mutex);</div><div class='del'>-		INIT_WORK(&amp;port-&gt;work, usb_serial_port_softint, port);</div><div class='add'>+		INIT_WORK(&amp;port-&gt;work, usb_serial_port_work, port);</div><div class='ctx'> 		serial-&gt;port[i] = port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -985,6 +996,7 @@ void usb_serial_disconnect(struct usb_interface *interface)</div><div class='ctx'> 	struct device *dev = &amp;interface-&gt;dev;</div><div class='ctx'> 	struct usb_serial_port *port;</div><div class='ctx'> </div><div class='add'>+	usb_serial_console_disconnect(serial);</div><div class='ctx'> 	dbg ("%s", __FUNCTION__);</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata (interface, NULL);</div><div class='hunk'>@@ -996,7 +1008,7 @@ void usb_serial_disconnect(struct usb_interface *interface)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* let the last holder of this object </div><div class='ctx'> 		 * cause it to be cleaned up */</div><div class='del'>-		kref_put(&amp;serial-&gt;kref, destroy_serial);</div><div class='add'>+		usb_serial_put(serial);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_info(dev, "device disconnected\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -1041,13 +1053,12 @@ static int __init usb_serial_init(void)</div><div class='ctx'> </div><div class='ctx'> 	usb_serial_tty_driver-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	usb_serial_tty_driver-&gt;driver_name = "usbserial";</div><div class='del'>-	usb_serial_tty_driver-&gt;devfs_name = "usb/tts/";</div><div class='ctx'> 	usb_serial_tty_driver-&gt;name = 	"ttyUSB";</div><div class='ctx'> 	usb_serial_tty_driver-&gt;major = SERIAL_TTY_MAJOR;</div><div class='ctx'> 	usb_serial_tty_driver-&gt;minor_start = 0;</div><div class='ctx'> 	usb_serial_tty_driver-&gt;type = TTY_DRIVER_TYPE_SERIAL;</div><div class='ctx'> 	usb_serial_tty_driver-&gt;subtype = SERIAL_TYPE_NORMAL;</div><div class='del'>-	usb_serial_tty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;</div><div class='add'>+	usb_serial_tty_driver-&gt;flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;</div><div class='ctx'> 	usb_serial_tty_driver-&gt;init_termios = tty_std_termios;</div><div class='ctx'> 	usb_serial_tty_driver-&gt;init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;</div><div class='ctx'> 	tty_set_operations(usb_serial_tty_driver, &amp;serial_ops);</div><div class='head'>diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c<br/>index f5c3841d4843..88949f7884ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/visor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/visor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/visor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/visor.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -26,7 +25,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "visor.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -303,7 +302,6 @@ static int visor_open (struct usb_serial_port *port, struct file *filp)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	priv-&gt;bytes_in = 0;</div><div class='ctx'> 	priv-&gt;bytes_out = 0;</div><div class='del'>-	priv-&gt;outstanding_urbs = 0;</div><div class='ctx'> 	priv-&gt;throttled = 0;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -436,13 +434,25 @@ static int visor_write (struct usb_serial_port *port, const unsigned char *buf,</div><div class='ctx'> </div><div class='ctx'> static int visor_write_room (struct usb_serial_port *port)</div><div class='ctx'> {</div><div class='add'>+	struct visor_private *priv = usb_get_serial_port_data(port);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	dbg("%s - port %d", __FUNCTION__, port-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We really can take anything the user throws at us</div><div class='ctx'> 	 * but let's pick a nice big number to tell the tty</div><div class='del'>-	 * layer that we have lots of free space</div><div class='add'>+	 * layer that we have lots of free space, unless we don't.</div><div class='ctx'> 	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+	if (priv-&gt;outstanding_urbs &gt; URB_UPPER_LIMIT * 2 / 3) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		dbg("%s - write limit hit\n", __FUNCTION__);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return 2048;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -480,7 +490,7 @@ static void visor_write_bulk_callback (struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 	--priv-&gt;outstanding_urbs;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -759,15 +769,22 @@ static int visor_calc_num_ports (struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> static int generic_startup(struct usb_serial *serial)</div><div class='ctx'> {</div><div class='add'>+	struct usb_serial_port **ports = serial-&gt;port;</div><div class='ctx'> 	struct visor_private *priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; serial-&gt;num_ports; ++i) {</div><div class='ctx'> 		priv = kzalloc (sizeof(*priv), GFP_KERNEL);</div><div class='del'>-		if (!priv)</div><div class='add'>+		if (!priv) {</div><div class='add'>+			while (i-- != 0) {</div><div class='add'>+				priv = usb_get_serial_port_data(ports[i]);</div><div class='add'>+				usb_set_serial_port_data(ports[i], NULL);</div><div class='add'>+				kfree(priv);</div><div class='add'>+			}</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		spin_lock_init(&amp;priv-&gt;lock);</div><div class='del'>-		usb_set_serial_port_data(serial-&gt;port[i], priv);</div><div class='add'>+		usb_set_serial_port_data(ports[i], priv);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -877,7 +894,18 @@ static int clie_5_attach (struct usb_serial *serial)</div><div class='ctx'> </div><div class='ctx'> static void visor_shutdown (struct usb_serial *serial)</div><div class='ctx'> {</div><div class='add'>+	struct visor_private *priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	dbg("%s", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; serial-&gt;num_ports; i++) {</div><div class='add'>+		priv = usb_get_serial_port_data(serial-&gt;port[i]);</div><div class='add'>+		if (priv) {</div><div class='add'>+			usb_set_serial_port_data(serial-&gt;port[i], NULL);</div><div class='add'>+			kfree(priv);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)</div><div class='head'>diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c<br/>index f806553cd9a4..6e6c7934be32 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/serial/whiteheat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/serial/whiteheat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/serial/whiteheat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/serial/whiteheat.c</a></div><div class='hunk'>@@ -65,7 +65,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -80,7 +79,7 @@</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/serial.h&gt;</div><div class='del'>-#include "usb-serial.h"</div><div class='add'>+#include &lt;linux/usb/serial.h&gt;</div><div class='ctx'> #include "whiteheat_fw.h"		/* firmware for the ConnectTech WhiteHEAT device */</div><div class='ctx'> #include "whiteheat.h"			/* WhiteHEAT specific commands */</div><div class='ctx'> </div><div class='hunk'>@@ -388,7 +387,7 @@ static int whiteheat_attach (struct usb_serial *serial)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		err("%s: Couldn't send command [%d]", serial-&gt;type-&gt;description, ret);</div><div class='ctx'> 		goto no_firmware;</div><div class='del'>-	} else if (alen != sizeof(command)) {</div><div class='add'>+	} else if (alen != 2) {</div><div class='ctx'> 		err("%s: Send command incomplete [%d]", serial-&gt;type-&gt;description, alen);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -400,7 +399,7 @@ static int whiteheat_attach (struct usb_serial *serial)</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		err("%s: Couldn't get results [%d]", serial-&gt;type-&gt;description, ret);</div><div class='ctx'> 		goto no_firmware;</div><div class='del'>-	} else if (alen != sizeof(result)) {</div><div class='add'>+	} else if (alen != sizeof(*hw_info) + 1) {</div><div class='ctx'> 		err("%s: Get results incomplete [%d]", serial-&gt;type-&gt;description, alen);</div><div class='ctx'> 		goto no_firmware;</div><div class='ctx'> 	} else if (result[0] != command[0]) {</div><div class='hunk'>@@ -686,19 +685,16 @@ static void whiteheat_close(struct usb_serial_port *port, struct file * filp)</div><div class='ctx'> 		wrap = list_entry(tmp, struct whiteheat_urb_wrap, list);</div><div class='ctx'> 		urb = wrap-&gt;urb;</div><div class='ctx'> 		usb_kill_urb(urb);</div><div class='del'>-		list_del(tmp);</div><div class='del'>-		list_add(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='del'>-	}</div><div class='del'>-	list_for_each_safe(tmp, tmp2, &amp;info-&gt;rx_urb_q) {</div><div class='del'>-		list_del(tmp);</div><div class='del'>-		list_add(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='add'>+		list_move(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='ctx'> 	}</div><div class='add'>+	list_for_each_safe(tmp, tmp2, &amp;info-&gt;rx_urb_q)</div><div class='add'>+		list_move(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='add'>+</div><div class='ctx'> 	list_for_each_safe(tmp, tmp2, &amp;info-&gt;tx_urbs_submitted) {</div><div class='ctx'> 		wrap = list_entry(tmp, struct whiteheat_urb_wrap, list);</div><div class='ctx'> 		urb = wrap-&gt;urb;</div><div class='ctx'> 		usb_kill_urb(urb);</div><div class='del'>-		list_del(tmp);</div><div class='del'>-		list_add(tmp, &amp;info-&gt;tx_urbs_free);</div><div class='add'>+		list_move(tmp, &amp;info-&gt;tx_urbs_free);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;info-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1080,8 +1076,7 @@ static void whiteheat_write_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		err("%s - Not my urb!", __FUNCTION__);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	list_del(&amp;wrap-&gt;list);</div><div class='del'>-	list_add(&amp;wrap-&gt;list, &amp;info-&gt;tx_urbs_free);</div><div class='add'>+	list_move(&amp;wrap-&gt;list, &amp;info-&gt;tx_urbs_free);</div><div class='ctx'> 	spin_unlock(&amp;info-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status) {</div><div class='hunk'>@@ -1089,9 +1084,7 @@ static void whiteheat_write_callback(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usb_serial_port_softint((void *)port);</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;port-&gt;work);</div><div class='add'>+	usb_serial_port_softint(port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1373,8 +1366,7 @@ static int start_port_read(struct usb_serial_port *port)</div><div class='ctx'> 				wrap = list_entry(tmp, struct whiteheat_urb_wrap, list);</div><div class='ctx'> 				urb = wrap-&gt;urb;</div><div class='ctx'> 				usb_kill_urb(urb);</div><div class='del'>-				list_del(tmp);</div><div class='del'>-				list_add(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='add'>+				list_move(tmp, &amp;info-&gt;rx_urbs_free);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h<br/>index cd2096acc723..77e244a8c376 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/debug.h</a></div><div class='hunk'>@@ -44,7 +44,6 @@</div><div class='ctx'> #ifndef _DEBUG_H_</div><div class='ctx'> #define _DEBUG_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define USB_STORAGE "usb-storage: "</div><div class='head'>diff --git a/drivers/usb/storage/dpcm.c b/drivers/usb/storage/dpcm.c<br/>index 92b69e4c8047..1628cb258562 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/dpcm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/dpcm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/dpcm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/dpcm.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_device.h&gt;</div><div class='head'>diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c<br/>index 30e96050fe0c..88aa59ab7563 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/freecom.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/freecom.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/freecom.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/freecom.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * (http://www.freecom.de/)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/hdreg.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='head'>diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h<br/>index f9907a5cf129..927f7781080f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/initializers.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/initializers.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/initializers.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/initializers.h</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "usb.h"</div><div class='ctx'> #include "transport.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c<br/>index 55ee2d36d585..313920d980c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/onetouch.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/onetouch.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/onetouch.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/onetouch.c</a></div><div class='hunk'>@@ -28,15 +28,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='ctx'> #include &lt;linux/usb_ch9.h&gt;</div><div class='del'>-#include &lt;linux/usb_input.h&gt;</div><div class='add'>+#include &lt;linux/usb/input.h&gt;</div><div class='ctx'> #include "usb.h"</div><div class='ctx'> #include "onetouch.h"</div><div class='ctx'> #include "debug.h"</div><div class='head'>diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c<br/>index 5f11e19eaae3..a4b7df9ff8c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/scsiglue.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/scsiglue.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/scsiglue.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/scsiglue.c</a></div><div class='hunk'>@@ -112,13 +112,11 @@ static int slave_configure(struct scsi_device *sdev)</div><div class='ctx'> 	if (sdev-&gt;scsi_level &lt; SCSI_2)</div><div class='ctx'> 		sdev-&gt;scsi_level = sdev-&gt;sdev_target-&gt;scsi_level = SCSI_2;</div><div class='ctx'> </div><div class='del'>-	/* According to the technical support people at Genesys Logic,</div><div class='del'>-	 * devices using their chips have problems transferring more than</div><div class='del'>-	 * 32 KB at a time.  In practice people have found that 64 KB</div><div class='del'>-	 * works okay and that's what Windows does.  But we'll be</div><div class='del'>-	 * conservative; people can always use the sysfs interface to</div><div class='del'>-	 * increase max_sectors. */</div><div class='del'>-	if (le16_to_cpu(us-&gt;pusb_dev-&gt;descriptor.idVendor) == USB_VENDOR_ID_GENESYS &amp;&amp;</div><div class='add'>+	/* Many devices have trouble transfering more than 32KB at a time,</div><div class='add'>+	 * while others have trouble with more than 64K. At this time we</div><div class='add'>+	 * are limiting both to 32K (64 sectores).</div><div class='add'>+	 */</div><div class='add'>+	if ((us-&gt;flags &amp; US_FL_MAX_SECTORS_64) &amp;&amp;</div><div class='ctx'> 			sdev-&gt;request_queue-&gt;max_sectors &gt; 64)</div><div class='ctx'> 		blk_queue_max_sectors(sdev-&gt;request_queue, 64);</div><div class='ctx'> </div><div class='hunk'>@@ -286,11 +284,7 @@ static int bus_reset(struct scsi_cmnd *srb)</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	US_DEBUGP("%s called\n", __FUNCTION__);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;(us-&gt;dev_mutex));</div><div class='ctx'> 	result = usb_stor_port_reset(us);</div><div class='del'>-	mutex_unlock(&amp;us-&gt;dev_mutex);</div><div class='del'>-</div><div class='ctx'> 	return result &lt; 0 ? FAILED : SUCCESS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c<br/>index f2bc5c9e23d5..8fcec01dc622 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/shuttle_usbat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/shuttle_usbat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/shuttle_usbat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/shuttle_usbat.c</a></div><div class='hunk'>@@ -131,28 +131,30 @@ static int usbat_write(struct us_data *us,</div><div class='ctx'>  * Convenience function to perform a bulk read</div><div class='ctx'>  */</div><div class='ctx'> static int usbat_bulk_read(struct us_data *us,</div><div class='del'>-							 unsigned char *data,</div><div class='del'>-							 unsigned int len)</div><div class='add'>+			   unsigned char *data,</div><div class='add'>+			   unsigned int len,</div><div class='add'>+			   int use_sg)</div><div class='ctx'> {</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return USB_STOR_XFER_GOOD;</div><div class='ctx'> </div><div class='ctx'> 	US_DEBUGP("usbat_bulk_read: len = %d\n", len);</div><div class='del'>-	return usb_stor_bulk_transfer_buf(us, us-&gt;recv_bulk_pipe, data, len, NULL);</div><div class='add'>+	return usb_stor_bulk_transfer_sg(us, us-&gt;recv_bulk_pipe, data, len, use_sg, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Convenience function to perform a bulk write</div><div class='ctx'>  */</div><div class='ctx'> static int usbat_bulk_write(struct us_data *us,</div><div class='del'>-							unsigned char *data,</div><div class='del'>-							unsigned int len)</div><div class='add'>+			    unsigned char *data,</div><div class='add'>+			    unsigned int len,</div><div class='add'>+			    int use_sg)</div><div class='ctx'> {</div><div class='ctx'> 	if (len == 0)</div><div class='ctx'> 		return USB_STOR_XFER_GOOD;</div><div class='ctx'> </div><div class='ctx'> 	US_DEBUGP("usbat_bulk_write:  len = %d\n", len);</div><div class='del'>-	return usb_stor_bulk_transfer_buf(us, us-&gt;send_bulk_pipe, data, len, NULL);</div><div class='add'>+	return usb_stor_bulk_transfer_sg(us, us-&gt;send_bulk_pipe, data, len, use_sg, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -317,7 +319,8 @@ static int usbat_wait_not_busy(struct us_data *us, int minutes)</div><div class='ctx'>  */</div><div class='ctx'> static int usbat_read_block(struct us_data *us,</div><div class='ctx'> 			    unsigned char *content,</div><div class='del'>-			    unsigned short len)</div><div class='add'>+			    unsigned short len,</div><div class='add'>+			    int use_sg)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	unsigned char *command = us-&gt;iobuf;</div><div class='hunk'>@@ -338,7 +341,7 @@ static int usbat_read_block(struct us_data *us,</div><div class='ctx'> 	if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 		return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='del'>-	result = usbat_bulk_read(us, content, len);</div><div class='add'>+	result = usbat_bulk_read(us, content, len, use_sg);</div><div class='ctx'> 	return (result == USB_STOR_XFER_GOOD ?</div><div class='ctx'> 			USB_STOR_TRANSPORT_GOOD : USB_STOR_TRANSPORT_ERROR);</div><div class='ctx'> }</div><div class='hunk'>@@ -350,7 +353,8 @@ static int usbat_write_block(struct us_data *us,</div><div class='ctx'> 			     unsigned char access,</div><div class='ctx'> 			     unsigned char *content,</div><div class='ctx'> 			     unsigned short len,</div><div class='del'>-			     int minutes)</div><div class='add'>+			     int minutes,</div><div class='add'>+			     int use_sg)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	unsigned char *command = us-&gt;iobuf;</div><div class='hunk'>@@ -372,7 +376,7 @@ static int usbat_write_block(struct us_data *us,</div><div class='ctx'> 	if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 		return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='del'>-	result = usbat_bulk_write(us, content, len);</div><div class='add'>+	result = usbat_bulk_write(us, content, len, use_sg);</div><div class='ctx'> 	if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 		return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='hunk'>@@ -465,7 +469,7 @@ static int usbat_hp8200e_rw_block_test(struct us_data *us,</div><div class='ctx'> 				data[1+(j&lt;&lt;1)] = data_out[j];</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			result = usbat_bulk_write(us, data, num_registers*2);</div><div class='add'>+			result = usbat_bulk_write(us, data, num_registers*2, 0);</div><div class='ctx'> 			if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 				return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='hunk'>@@ -583,7 +587,7 @@ static int usbat_multiple_write(struct us_data *us,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Send the data */</div><div class='del'>-	result = usbat_bulk_write(us, data, num_registers*2);</div><div class='add'>+	result = usbat_bulk_write(us, data, num_registers*2, 0);</div><div class='ctx'> 	if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 		return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='hunk'>@@ -606,8 +610,9 @@ static int usbat_multiple_write(struct us_data *us,</div><div class='ctx'>  * other related details) are defined beforehand with _set_shuttle_features().</div><div class='ctx'>  */</div><div class='ctx'> static int usbat_read_blocks(struct us_data *us,</div><div class='del'>-							 unsigned char *buffer,</div><div class='del'>-							 int len)</div><div class='add'>+			     unsigned char *buffer,</div><div class='add'>+			     int len,</div><div class='add'>+			     int use_sg)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	unsigned char *command = us-&gt;iobuf;</div><div class='hunk'>@@ -627,7 +632,7 @@ static int usbat_read_blocks(struct us_data *us,</div><div class='ctx'> 		return USB_STOR_TRANSPORT_FAILED;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Read the blocks we just asked for */</div><div class='del'>-	result = usbat_bulk_read(us, buffer, len);</div><div class='add'>+	result = usbat_bulk_read(us, buffer, len, use_sg);</div><div class='ctx'> 	if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 		return USB_STOR_TRANSPORT_FAILED;</div><div class='ctx'> </div><div class='hunk'>@@ -648,7 +653,8 @@ static int usbat_read_blocks(struct us_data *us,</div><div class='ctx'>  */</div><div class='ctx'> static int usbat_write_blocks(struct us_data *us,</div><div class='ctx'> 							  unsigned char *buffer,</div><div class='del'>-							  int len)</div><div class='add'>+			      int len,</div><div class='add'>+			      int use_sg)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	unsigned char *command = us-&gt;iobuf;</div><div class='hunk'>@@ -668,7 +674,7 @@ static int usbat_write_blocks(struct us_data *us,</div><div class='ctx'> 		return USB_STOR_TRANSPORT_FAILED;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Write the data */</div><div class='del'>-	result = usbat_bulk_write(us, buffer, len);</div><div class='add'>+	result = usbat_bulk_write(us, buffer, len, use_sg);</div><div class='ctx'> 	if (result != USB_STOR_XFER_GOOD)</div><div class='ctx'> 		return USB_STOR_TRANSPORT_FAILED;</div><div class='ctx'> </div><div class='hunk'>@@ -887,22 +893,28 @@ static int usbat_identify_device(struct us_data *us,</div><div class='ctx'>  * Set the transport function based on the device type</div><div class='ctx'>  */</div><div class='ctx'> static int usbat_set_transport(struct us_data *us,</div><div class='del'>-			       struct usbat_info *info)</div><div class='add'>+			       struct usbat_info *info,</div><div class='add'>+			       int devicetype)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!info-&gt;devicetype) {</div><div class='del'>-		rc = usbat_identify_device(us, info);</div><div class='del'>-		if (rc != USB_STOR_TRANSPORT_GOOD) {</div><div class='del'>-			US_DEBUGP("usbat_set_transport: Could not identify device\n");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!info-&gt;devicetype)</div><div class='add'>+		info-&gt;devicetype = devicetype;</div><div class='ctx'> </div><div class='del'>-	if (usbat_get_device_type(us) == USBAT_DEV_HP8200)</div><div class='add'>+	if (!info-&gt;devicetype)</div><div class='add'>+		usbat_identify_device(us, info);</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;devicetype) {</div><div class='add'>+	default:</div><div class='add'>+		return USB_STOR_TRANSPORT_ERROR;</div><div class='add'>+</div><div class='add'>+	case  USBAT_DEV_HP8200:</div><div class='ctx'> 		us-&gt;transport = usbat_hp8200e_transport;</div><div class='del'>-	else if (usbat_get_device_type(us) == USBAT_DEV_FLASH)</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case USBAT_DEV_FLASH:</div><div class='ctx'> 		us-&gt;transport = usbat_flash_transport;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -947,7 +959,7 @@ static int usbat_flash_get_sector_count(struct us_data *us,</div><div class='ctx'> 	msleep(100);</div><div class='ctx'> </div><div class='ctx'> 	/* Read the device identification data */</div><div class='del'>-	rc = usbat_read_block(us, reply, 512);</div><div class='add'>+	rc = usbat_read_block(us, reply, 512, 0);</div><div class='ctx'> 	if (rc != USB_STOR_TRANSPORT_GOOD)</div><div class='ctx'> 		goto leave;</div><div class='ctx'> </div><div class='hunk'>@@ -1031,7 +1043,7 @@ static int usbat_flash_read_data(struct us_data *us,</div><div class='ctx'> 			goto leave;</div><div class='ctx'> </div><div class='ctx'> 		/* Read the data we just requested */</div><div class='del'>-		result = usbat_read_blocks(us, buffer, len);</div><div class='add'>+		result = usbat_read_blocks(us, buffer, len, 0);</div><div class='ctx'> 		if (result != USB_STOR_TRANSPORT_GOOD)</div><div class='ctx'> 			goto leave;</div><div class='ctx'>   	 </div><div class='hunk'>@@ -1125,7 +1137,7 @@ static int usbat_flash_write_data(struct us_data *us,</div><div class='ctx'> 			goto leave;</div><div class='ctx'> </div><div class='ctx'> 		/* Write the data */</div><div class='del'>-		result = usbat_write_blocks(us, buffer, len);</div><div class='add'>+		result = usbat_write_blocks(us, buffer, len, 0);</div><div class='ctx'> 		if (result != USB_STOR_TRANSPORT_GOOD)</div><div class='ctx'> 			goto leave;</div><div class='ctx'> </div><div class='hunk'>@@ -1310,7 +1322,7 @@ static int usbat_select_and_test_registers(struct us_data *us)</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the USBAT processor and the storage device</div><div class='ctx'>  */</div><div class='del'>-int init_usbat(struct us_data *us)</div><div class='add'>+static int init_usbat(struct us_data *us, int devicetype)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct usbat_info *info;</div><div class='hunk'>@@ -1392,7 +1404,7 @@ int init_usbat(struct us_data *us)</div><div class='ctx'> 	US_DEBUGP("INIT 9\n");</div><div class='ctx'> </div><div class='ctx'> 	/* At this point, we need to detect which device we are using */</div><div class='del'>-	if (usbat_set_transport(us, info))</div><div class='add'>+	if (usbat_set_transport(us, info, devicetype))</div><div class='ctx'> 		return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	US_DEBUGP("INIT 10\n");</div><div class='hunk'>@@ -1503,10 +1515,10 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)</div><div class='ctx'> 	 * AT SPEED 4 IS UNRELIABLE!!!</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if ( (result = usbat_write_block(us, </div><div class='add'>+	if ((result = usbat_write_block(us,</div><div class='ctx'> 			USBAT_ATA, srb-&gt;cmnd, 12,</div><div class='del'>-			srb-&gt;cmnd[0]==GPCMD_BLANK ? 75 : 10)) !=</div><div class='del'>-				USB_STOR_TRANSPORT_GOOD) {</div><div class='add'>+				(srb-&gt;cmnd[0]==GPCMD_BLANK ? 75 : 10), 0) !=</div><div class='add'>+			     USB_STOR_TRANSPORT_GOOD)) {</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1533,7 +1545,7 @@ static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)</div><div class='ctx'> 			len = *status;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-		result = usbat_read_block(us, srb-&gt;request_buffer, len);</div><div class='add'>+		result = usbat_read_block(us, srb-&gt;request_buffer, len, srb-&gt;use_sg);</div><div class='ctx'> </div><div class='ctx'> 		/* Debug-print the first 32 bytes of the transfer */</div><div class='ctx'> </div><div class='hunk'>@@ -1695,6 +1707,22 @@ static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)</div><div class='ctx'> 	return USB_STOR_TRANSPORT_FAILED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int init_usbat_cd(struct us_data *us)</div><div class='add'>+{</div><div class='add'>+	return init_usbat(us, USBAT_DEV_HP8200);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int init_usbat_flash(struct us_data *us)</div><div class='add'>+{</div><div class='add'>+	return init_usbat(us, USBAT_DEV_FLASH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int init_usbat_probe(struct us_data *us)</div><div class='add'>+{</div><div class='add'>+	return init_usbat(us, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Default transport function. Attempts to detect which transport function</div><div class='ctx'>  * should be called, makes it the new default, and calls it.</div><div class='hunk'>@@ -1708,9 +1736,8 @@ int usbat_transport(struct scsi_cmnd *srb, struct us_data *us)</div><div class='ctx'> {</div><div class='ctx'> 	struct usbat_info *info = (struct usbat_info*) (us-&gt;extra);</div><div class='ctx'> </div><div class='del'>-	if (usbat_set_transport(us, info))</div><div class='add'>+	if (usbat_set_transport(us, info, 0))</div><div class='ctx'> 		return USB_STOR_TRANSPORT_ERROR;</div><div class='ctx'> </div><div class='ctx'> 	return us-&gt;transport(srb, us);	</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/usb/storage/shuttle_usbat.h b/drivers/usb/storage/shuttle_usbat.h<br/>index 25e7d8b340b8..3ddf143a1dec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/shuttle_usbat.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/shuttle_usbat.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/shuttle_usbat.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/shuttle_usbat.h</a></div><div class='hunk'>@@ -106,7 +106,9 @@</div><div class='ctx'> #define USBAT_FEAT_ET2	0x01</div><div class='ctx'> </div><div class='ctx'> extern int usbat_transport(struct scsi_cmnd *srb, struct us_data *us);</div><div class='del'>-extern int init_usbat(struct us_data *us);</div><div class='add'>+extern int init_usbat_cd(struct us_data *us);</div><div class='add'>+extern int init_usbat_flash(struct us_data *us);</div><div class='add'>+extern int init_usbat_probe(struct us_data *us);</div><div class='ctx'> </div><div class='ctx'> struct usbat_info {</div><div class='ctx'> 	int devicetype;</div><div class='head'>diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c<br/>index 7ca896a342e3..d6acc92a4ae3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/transport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/transport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/transport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/transport.c</a></div><div class='hunk'>@@ -45,7 +45,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -115,19 +114,6 @@ static void usb_stor_blocking_completion(struct urb *urb, struct pt_regs *regs)</div><div class='ctx'> </div><div class='ctx'> 	complete(urb_done_ptr);</div><div class='ctx'> }</div><div class='del'>- </div><div class='del'>-/* This is the timeout handler which will cancel an URB when its timeout</div><div class='del'>- * expires.</div><div class='del'>- */</div><div class='del'>-static void timeout_handler(unsigned long us_)</div><div class='del'>-{</div><div class='del'>-	struct us_data *us = (struct us_data *) us_;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(US_FLIDX_URB_ACTIVE, &amp;us-&gt;flags)) {</div><div class='del'>-		US_DEBUGP("Timeout -- cancelling URB\n");</div><div class='del'>-		usb_unlink_urb(us-&gt;current_urb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /* This is the common part of the URB message submission code</div><div class='ctx'>  *</div><div class='hunk'>@@ -138,7 +124,7 @@ static void timeout_handler(unsigned long us_)</div><div class='ctx'> static int usb_stor_msg_common(struct us_data *us, int timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct completion urb_done;</div><div class='del'>-	struct timer_list to_timer;</div><div class='add'>+	long timeleft;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* don't submit URBs during abort/disconnect processing */</div><div class='hunk'>@@ -185,22 +171,17 @@ static int usb_stor_msg_common(struct us_data *us, int timeout)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'>  </div><div class='del'>-	/* submit the timeout timer, if a timeout was requested */</div><div class='del'>-	if (timeout &gt; 0) {</div><div class='del'>-		init_timer(&amp;to_timer);</div><div class='del'>-		to_timer.expires = jiffies + timeout;</div><div class='del'>-		to_timer.function = timeout_handler;</div><div class='del'>-		to_timer.data = (unsigned long) us;</div><div class='del'>-		add_timer(&amp;to_timer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* wait for the completion of the URB */</div><div class='del'>-	wait_for_completion(&amp;urb_done);</div><div class='del'>-	clear_bit(US_FLIDX_URB_ACTIVE, &amp;us-&gt;flags);</div><div class='add'>+	timeleft = wait_for_completion_interruptible_timeout(</div><div class='add'>+			&amp;urb_done, timeout ? : MAX_SCHEDULE_TIMEOUT);</div><div class='ctx'>  </div><div class='del'>-	/* clean up the timeout timer */</div><div class='del'>-	if (timeout &gt; 0)</div><div class='del'>-		del_timer_sync(&amp;to_timer);</div><div class='add'>+	clear_bit(US_FLIDX_URB_ACTIVE, &amp;us-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (timeleft &lt;= 0) {</div><div class='add'>+		US_DEBUGP("%s -- cancelling URB\n",</div><div class='add'>+			  timeleft == 0 ? "Timeout" : "Signal");</div><div class='add'>+		usb_kill_urb(us-&gt;current_urb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* return the URB status */</div><div class='ctx'> 	return us-&gt;current_urb-&gt;status;</div><div class='hunk'>@@ -721,16 +702,19 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)</div><div class='ctx'> 	 * device reset. */</div><div class='ctx'>   Handle_Errors:</div><div class='ctx'> </div><div class='del'>-	/* Let the SCSI layer know we are doing a reset, set the</div><div class='del'>-	 * RESETTING bit, and clear the ABORTING bit so that the reset</div><div class='del'>-	 * may proceed. */</div><div class='add'>+	/* Set the RESETTING bit, and clear the ABORTING bit so that</div><div class='add'>+	 * the reset may proceed. */</div><div class='ctx'> 	scsi_lock(us_to_host(us));</div><div class='del'>-	usb_stor_report_bus_reset(us);</div><div class='ctx'> 	set_bit(US_FLIDX_RESETTING, &amp;us-&gt;flags);</div><div class='ctx'> 	clear_bit(US_FLIDX_ABORTING, &amp;us-&gt;flags);</div><div class='ctx'> 	scsi_unlock(us_to_host(us));</div><div class='ctx'> </div><div class='add'>+	/* We must release the device lock because the pre_reset routine</div><div class='add'>+	 * will want to acquire it. */</div><div class='add'>+	mutex_unlock(&amp;us-&gt;dev_mutex);</div><div class='ctx'> 	result = usb_stor_port_reset(us);</div><div class='add'>+	mutex_lock(&amp;us-&gt;dev_mutex);</div><div class='add'>+</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		scsi_lock(us_to_host(us));</div><div class='ctx'> 		usb_stor_report_device_reset(us);</div><div class='hunk'>@@ -1214,31 +1198,30 @@ int usb_stor_Bulk_reset(struct us_data *us)</div><div class='ctx'> 				 0, us-&gt;ifnum, NULL, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Issue a USB port reset to the device.  But don't do anything if</div><div class='del'>- * there's more than one interface in the device, so that other users</div><div class='del'>- * are not affected. */</div><div class='add'>+/* Issue a USB port reset to the device.  The caller must not hold</div><div class='add'>+ * us-&gt;dev_mutex.</div><div class='add'>+ */</div><div class='ctx'> int usb_stor_port_reset(struct us_data *us)</div><div class='ctx'> {</div><div class='del'>-	int result, rc;</div><div class='add'>+	int result, rc_lock;</div><div class='ctx'> </div><div class='del'>-	if (test_bit(US_FLIDX_DISCONNECTING, &amp;us-&gt;flags)) {</div><div class='del'>-		result = -EIO;</div><div class='del'>-		US_DEBUGP("No reset during disconnect\n");</div><div class='del'>-	} else if (us-&gt;pusb_dev-&gt;actconfig-&gt;desc.bNumInterfaces != 1) {</div><div class='del'>-		result = -EBUSY;</div><div class='del'>-		US_DEBUGP("Refusing to reset a multi-interface device\n");</div><div class='del'>-	} else {</div><div class='del'>-		result = rc =</div><div class='del'>-			usb_lock_device_for_reset(us-&gt;pusb_dev, us-&gt;pusb_intf);</div><div class='del'>-		if (result &lt; 0) {</div><div class='del'>-			US_DEBUGP("unable to lock device for reset: %d\n",</div><div class='del'>-					result);</div><div class='add'>+	result = rc_lock =</div><div class='add'>+		usb_lock_device_for_reset(us-&gt;pusb_dev, us-&gt;pusb_intf);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		US_DEBUGP("unable to lock device for reset: %d\n", result);</div><div class='add'>+	else {</div><div class='add'>+		/* Were we disconnected while waiting for the lock? */</div><div class='add'>+		if (test_bit(US_FLIDX_DISCONNECTING, &amp;us-&gt;flags)) {</div><div class='add'>+			result = -EIO;</div><div class='add'>+			US_DEBUGP("No reset during disconnect\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			result = usb_reset_device(us-&gt;pusb_dev);</div><div class='del'>-			if (rc)</div><div class='del'>-				usb_unlock_device(us-&gt;pusb_dev);</div><div class='del'>-			US_DEBUGP("usb_reset_device returns %d\n", result);</div><div class='add'>+			result = usb_reset_composite_device(</div><div class='add'>+					us-&gt;pusb_dev, us-&gt;pusb_intf);</div><div class='add'>+			US_DEBUGP("usb_reset_composite_device returns %d\n",</div><div class='add'>+					result);</div><div class='ctx'> 		}</div><div class='add'>+		if (rc_lock)</div><div class='add'>+			usb_unlock_device(us-&gt;pusb_dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h<br/>index aec5ea8682d5..a5ca449f6e64 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/unusual_devs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/unusual_devs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/unusual_devs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/unusual_devs.h</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'>  * the following thing for it to work:</div><div class='ctx'>  * The macro UNUSUAL_DEV() must be defined before this file is included</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* If you edit this file, please try to keep it sorted first by VendorID,</div><div class='ctx'>  * then by ProductID.</div><div class='hunk'>@@ -78,12 +77,12 @@ UNUSUAL_DEV(  0x03f0, 0x0107, 0x0200, 0x0200,</div><div class='ctx'> UNUSUAL_DEV(  0x03f0, 0x0207, 0x0001, 0x0001, </div><div class='ctx'> 		"HP",</div><div class='ctx'> 		"CD-Writer+ 8200e",</div><div class='del'>-		US_SC_8070, US_PR_USBAT, init_usbat, 0),</div><div class='add'>+		US_SC_8070, US_PR_USBAT, init_usbat_cd, 0),</div><div class='ctx'> </div><div class='ctx'> UNUSUAL_DEV(  0x03f0, 0x0307, 0x0001, 0x0001, </div><div class='ctx'> 		"HP",</div><div class='ctx'> 		"CD-Writer+ CD-4e",</div><div class='del'>-		US_SC_8070, US_PR_USBAT, init_usbat, 0),</div><div class='add'>+		US_SC_8070, US_PR_USBAT, init_usbat_cd, 0),</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Reported by Sebastian Kapfer &lt;sebastian_kapfer@gmx.net&gt;</div><div class='hunk'>@@ -113,6 +112,19 @@ UNUSUAL_DEV(  0x0411, 0x001c, 0x0113, 0x0113,</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_FIX_INQUIRY ),</div><div class='ctx'> </div><div class='add'>+/* Submitted by Ernestas Vaiciukevicius &lt;ernisv@gmail.com&gt; */</div><div class='add'>+UNUSUAL_DEV(  0x0419, 0x0100, 0x0100, 0x0100,</div><div class='add'>+                "Samsung Info. Systems America, Inc.",</div><div class='add'>+                "MP3 Player",</div><div class='add'>+                US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+                US_FL_IGNORE_RESIDUE ),</div><div class='add'>+</div><div class='add'>+/* Reported by Orgad Shaneh &lt;orgads@gmail.com&gt; */</div><div class='add'>+UNUSUAL_DEV(  0x0419, 0xaace, 0x0100, 0x0100,</div><div class='add'>+		"Samsung", "MP3 Player",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_IGNORE_RESIDUE ),</div><div class='add'>+</div><div class='ctx'> /* Reported by Christian Leber &lt;christian@leber.de&gt; */</div><div class='ctx'> UNUSUAL_DEV(  0x0419, 0xaaf5, 0x0100, 0x0100,</div><div class='ctx'> 		"TrekStor",</div><div class='hunk'>@@ -133,6 +145,29 @@ UNUSUAL_DEV(  0x0420, 0x0001, 0x0100, 0x0100,</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_IGNORE_RESIDUE ),</div><div class='ctx'> </div><div class='add'>+/* Reported by Sumedha Swamy &lt;sumedhaswamy@gmail.com&gt; and</div><div class='add'>+ * Einar Th. Einarsson &lt;einarthered@gmail.com&gt; */</div><div class='add'>+UNUSUAL_DEV(  0x0421, 0x0444, 0x0100, 0x0100,</div><div class='add'>+		"Nokia",</div><div class='add'>+		"N91",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),</div><div class='add'>+</div><div class='add'>+/* Reported by Jiri Slaby &lt;jirislaby@gmail.com&gt; and</div><div class='add'>+ * Rene C. Castberg &lt;Rene@Castberg.org&gt; */</div><div class='add'>+UNUSUAL_DEV(  0x0421, 0x0446, 0x0100, 0x0100,</div><div class='add'>+		"Nokia",</div><div class='add'>+		"N80",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),</div><div class='add'>+</div><div class='add'>+/* Reported by Matthew Bloch &lt;matthew@bytemark.co.uk&gt; */</div><div class='add'>+UNUSUAL_DEV(  0x0421, 0x044e, 0x0100, 0x0100,</div><div class='add'>+		"Nokia",</div><div class='add'>+		"E61",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),</div><div class='add'>+</div><div class='ctx'> /* Reported by Olaf Hering &lt;olh@suse.de&gt; from novell bug #105878 */</div><div class='ctx'> UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,</div><div class='ctx'> 		"SMSC",</div><div class='hunk'>@@ -216,6 +251,14 @@ UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,</div><div class='ctx'> 		"DVD-CAM DZ-MV100A Camcorder",</div><div class='ctx'> 		US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN),</div><div class='ctx'> </div><div class='add'>+/* Patch for Nikon coolpix 2000</div><div class='add'>+ * Submitted by Fabien Cosse &lt;fabien.cosse@wanadoo.fr&gt;*/</div><div class='add'>+UNUSUAL_DEV(  0x04b0, 0x0301, 0x0010, 0x0010,</div><div class='add'>+		"NIKON",</div><div class='add'>+		"NIKON DSC E2000",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE,NULL,</div><div class='add'>+		US_FL_NOT_LOCKABLE ),</div><div class='add'>+</div><div class='ctx'> /* Reported by Andreas Bockhold &lt;andreas@bockionline.de&gt; */</div><div class='ctx'> UNUSUAL_DEV(  0x04b0, 0x0405, 0x0100, 0x0100,</div><div class='ctx'> 		"NIKON",</div><div class='hunk'>@@ -223,13 +266,12 @@ UNUSUAL_DEV(  0x04b0, 0x0405, 0x0100, 0x0100,</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_FIX_CAPACITY),</div><div class='ctx'> </div><div class='del'>-/* Patch for Nikon coolpix 2000</div><div class='del'>- * Submitted by Fabien Cosse &lt;fabien.cosse@wanadoo.fr&gt;*/</div><div class='del'>-UNUSUAL_DEV(  0x04b0, 0x0301, 0x0010, 0x0010,</div><div class='add'>+/* Reported by Jamie Kitson &lt;jamie@staberinde.fsnet.co.uk&gt; */</div><div class='add'>+UNUSUAL_DEV(  0x04b0, 0x040d, 0x0100, 0x0100,</div><div class='ctx'> 		"NIKON",</div><div class='del'>-		"NIKON DSC E2000",</div><div class='del'>-		US_SC_DEVICE, US_PR_DEVICE,NULL,</div><div class='del'>-		US_FL_NOT_LOCKABLE ),</div><div class='add'>+		"NIKON DSC D70s",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_FIX_CAPACITY),</div><div class='ctx'> </div><div class='ctx'> /* BENQ DC5330</div><div class='ctx'>  * Reported by Manuel Fombuena &lt;mfombuena@ya.com&gt; and</div><div class='hunk'>@@ -393,7 +435,7 @@ UNUSUAL_DEV(  0x04fc, 0x80c2, 0x0100, 0x0100,</div><div class='ctx'> UNUSUAL_DEV(  0x04e6, 0x1010, 0x0000, 0x9999,</div><div class='ctx'> 		"Shuttle/SCM",</div><div class='ctx'> 		"USBAT-02",</div><div class='del'>-		US_SC_SCSI, US_PR_USBAT, init_usbat,</div><div class='add'>+		US_SC_SCSI, US_PR_USBAT, init_usbat_flash,</div><div class='ctx'> 		US_FL_SINGLE_LUN),</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -459,10 +501,11 @@ UNUSUAL_DEV(  0x054c, 0x0010, 0x0106, 0x0450,</div><div class='ctx'> 		US_SC_SCSI, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_SINGLE_LUN | US_FL_NOT_LOCKABLE | US_FL_NO_WP_DETECT ),</div><div class='ctx'> </div><div class='del'>-/* This entry is needed because the device reports Sub=ff */</div><div class='del'>-UNUSUAL_DEV(  0x054c, 0x0010, 0x0500, 0x0600,</div><div class='add'>+/* Submitted by Lars Jacob &lt;jacob.lars@googlemail.com&gt;</div><div class='add'>+ * This entry is needed because the device reports Sub=ff */</div><div class='add'>+UNUSUAL_DEV(  0x054c, 0x0010, 0x0500, 0x0610,</div><div class='ctx'> 		"Sony",</div><div class='del'>-		"DSC-T1/T5",</div><div class='add'>+		"DSC-T1/T5/H5",</div><div class='ctx'> 		US_SC_8070, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_SINGLE_LUN ),</div><div class='ctx'> </div><div class='hunk'>@@ -694,18 +737,22 @@ UNUSUAL_DEV(  0x05dc, 0xb002, 0x0000, 0x0113,</div><div class='ctx'>  * They were originally reported by Alexander Oltu</div><div class='ctx'>  * &lt;alexander@all-2.com&gt; and Peter Marks &lt;peter.marks@turner.com&gt;</div><div class='ctx'>  * respectively.</div><div class='add'>+ *</div><div class='add'>+ * US_FL_GO_SLOW and US_FL_MAX_SECTORS_64 added by Phil Dibowitz</div><div class='add'>+ * &lt;phil@ipom.com&gt; as these flags were made and hard-coded</div><div class='add'>+ * special-cases were pulled from scsiglue.c.</div><div class='ctx'>  */</div><div class='ctx'> UNUSUAL_DEV(  0x05e3, 0x0701, 0x0000, 0xffff,</div><div class='ctx'> 		"Genesys Logic",</div><div class='ctx'> 		"USB to IDE Optical",</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='del'>-		US_FL_GO_SLOW ),</div><div class='add'>+		US_FL_GO_SLOW | US_FL_MAX_SECTORS_64 ),</div><div class='ctx'> </div><div class='ctx'> UNUSUAL_DEV(  0x05e3, 0x0702, 0x0000, 0xffff,</div><div class='ctx'> 		"Genesys Logic",</div><div class='ctx'> 		"USB to IDE Disk",</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='del'>-		US_FL_GO_SLOW ),</div><div class='add'>+		US_FL_GO_SLOW | US_FL_MAX_SECTORS_64 ),</div><div class='ctx'> </div><div class='ctx'> /* Reported by Hanno Boeck &lt;hanno@gmx.de&gt;</div><div class='ctx'>  * Taken from the Lycoris Kernel */</div><div class='hunk'>@@ -797,7 +844,7 @@ UNUSUAL_DEV(  0x0781, 0x0002, 0x0009, 0x0009,</div><div class='ctx'> UNUSUAL_DEV(  0x0781, 0x0005, 0x0005, 0x0005,</div><div class='ctx'> 		"Sandisk",</div><div class='ctx'> 		"ImageMate SDDR-05b",</div><div class='del'>-		US_SC_SCSI, US_PR_USBAT, init_usbat,</div><div class='add'>+		US_SC_SCSI, US_PR_USBAT, init_usbat_flash,</div><div class='ctx'> 		US_FL_SINGLE_LUN ),</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1182,6 +1229,14 @@ UNUSUAL_DEV(  0x0ea0, 0x6828, 0x0110, 0x0110,</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_IGNORE_RESIDUE ),</div><div class='ctx'> </div><div class='add'>+/* Reported by Benjamin Schiller &lt;sbenni@gmx.de&gt;</div><div class='add'>+ * It is also sold by Easylite as DJ 20 */</div><div class='add'>+UNUSUAL_DEV(  0x0ed1, 0x7636, 0x0103, 0x0103,</div><div class='add'>+		"Typhoon",</div><div class='add'>+		"My DJ 1820",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_IGNORE_RESIDUE | US_FL_GO_SLOW | US_FL_MAX_SECTORS_64),</div><div class='add'>+</div><div class='ctx'> /* Reported by Michael Stattmann &lt;michael@stattmann.com&gt; */</div><div class='ctx'> UNUSUAL_DEV(  0x0fce, 0xd008, 0x0000, 0x0000,</div><div class='ctx'> 		"Sony Ericsson",</div><div class='hunk'>@@ -1213,6 +1268,15 @@ UNUSUAL_DEV(  0x1370, 0x6828, 0x0110, 0x0110,</div><div class='ctx'> 		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='ctx'> 		US_FL_IGNORE_RESIDUE ),</div><div class='ctx'> </div><div class='add'>+/* patch submitted by Davide Perini &lt;perini.davide@dpsoftware.org&gt;</div><div class='add'>+ * and Renato Perini &lt;rperini@email.it&gt;</div><div class='add'>+ */</div><div class='add'>+UNUSUAL_DEV(  0x22b8, 0x3010, 0x0001, 0x0001,</div><div class='add'>+		"Motorola",</div><div class='add'>+		"RAZR V3x",</div><div class='add'>+		US_SC_DEVICE, US_PR_DEVICE, NULL,</div><div class='add'>+		US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),</div><div class='add'>+</div><div class='ctx'> /* Reported by Radovan Garabik &lt;garabik@kassiopeia.juls.savba.sk&gt; */</div><div class='ctx'> UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,</div><div class='ctx'> 		"MPIO",</div><div class='head'>diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c<br/>index dd108634348e..5ee19be52f65 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/usb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/usb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/usb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/usb.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'>  * 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='hunk'>@@ -56,6 +55,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/utsrelease.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_cmnd.h&gt;</div><div class='hunk'>@@ -221,6 +221,37 @@ static int storage_resume(struct usb_interface *iface)</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * The next two routines get called just before and just after</div><div class='add'>+ * a USB port reset, whether from this driver or a different one.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void storage_pre_reset(struct usb_interface *iface)</div><div class='add'>+{</div><div class='add'>+	struct us_data *us = usb_get_intfdata(iface);</div><div class='add'>+</div><div class='add'>+	US_DEBUGP("%s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* Make sure no command runs during the reset */</div><div class='add'>+	mutex_lock(&amp;us-&gt;dev_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void storage_post_reset(struct usb_interface *iface)</div><div class='add'>+{</div><div class='add'>+	struct us_data *us = usb_get_intfdata(iface);</div><div class='add'>+</div><div class='add'>+	US_DEBUGP("%s\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	/* Report the reset to the SCSI core */</div><div class='add'>+	scsi_lock(us_to_host(us));</div><div class='add'>+	usb_stor_report_bus_reset(us);</div><div class='add'>+	scsi_unlock(us_to_host(us));</div><div class='add'>+</div><div class='add'>+	/* FIXME: Notify the subdrivers that they need to reinitialize</div><div class='add'>+	 * the device */</div><div class='add'>+	mutex_unlock(&amp;us-&gt;dev_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * fill_inquiry_response takes an unsigned char array (which must</div><div class='ctx'>  * be at least 36 characters) and populates the vendor name,</div><div class='ctx'>  * product name, and revision fields. Then the array is copied</div><div class='hunk'>@@ -343,8 +374,12 @@ static int usb_stor_control_thread(void * __us)</div><div class='ctx'> 		/* lock access to the state */</div><div class='ctx'> 		scsi_lock(host);</div><div class='ctx'> </div><div class='add'>+		/* did the command already complete because of a disconnect? */</div><div class='add'>+		if (!us-&gt;srb)</div><div class='add'>+			;		/* nothing to do */</div><div class='add'>+</div><div class='ctx'> 		/* indicate that the command is done */</div><div class='del'>-		if (us-&gt;srb-&gt;result != DID_ABORT &lt;&lt; 16) {</div><div class='add'>+		else if (us-&gt;srb-&gt;result != DID_ABORT &lt;&lt; 16) {</div><div class='ctx'> 			US_DEBUGP("scsi cmd done, result=0x%x\n", </div><div class='ctx'> 				   us-&gt;srb-&gt;result);</div><div class='ctx'> 			us-&gt;srb-&gt;scsi_done(us-&gt;srb);</div><div class='hunk'>@@ -494,7 +529,8 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)</div><div class='ctx'> 		if (msg &gt;= 0 &amp;&amp; !(us-&gt;flags &amp; US_FL_NEED_OVERRIDE))</div><div class='ctx'> 			printk(KERN_NOTICE USB_STORAGE "This device "</div><div class='ctx'> 				"(%04x,%04x,%04x S %02x P %02x)"</div><div class='del'>-				" has %s in unusual_devs.h\n"</div><div class='add'>+				" has %s in unusual_devs.h (kernel"</div><div class='add'>+				" %s)\n"</div><div class='ctx'> 				"   Please send a copy of this message to "</div><div class='ctx'> 				"&lt;linux-usb-devel@lists.sourceforge.net&gt;\n",</div><div class='ctx'> 				le16_to_cpu(ddesc-&gt;idVendor),</div><div class='hunk'>@@ -502,7 +538,8 @@ static void get_device_info(struct us_data *us, const struct usb_device_id *id)</div><div class='ctx'> 				le16_to_cpu(ddesc-&gt;bcdDevice),</div><div class='ctx'> 				idesc-&gt;bInterfaceSubClass,</div><div class='ctx'> 				idesc-&gt;bInterfaceProtocol,</div><div class='del'>-				msgs[msg]);</div><div class='add'>+				msgs[msg],</div><div class='add'>+				UTS_RELEASE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -593,6 +630,15 @@ static int get_transport(struct us_data *us)</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_USB_STORAGE_ALAUDA</div><div class='add'>+	case US_PR_ALAUDA:</div><div class='add'>+		us-&gt;transport_name  = "Alauda Control/Bulk";</div><div class='add'>+		us-&gt;transport = alauda_transport;</div><div class='add'>+		us-&gt;transport_reset = usb_stor_Bulk_reset;</div><div class='add'>+		us-&gt;max_lun = 1;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -648,15 +694,6 @@ static int get_protocol(struct us_data *us)</div><div class='ctx'> 		break;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_USB_STORAGE_ALAUDA</div><div class='del'>-	case US_PR_ALAUDA:</div><div class='del'>-		us-&gt;transport_name  = "Alauda Control/Bulk";</div><div class='del'>-		us-&gt;transport = alauda_transport;</div><div class='del'>-		us-&gt;transport_reset = usb_stor_Bulk_reset;</div><div class='del'>-		us-&gt;max_lun = 1;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -806,32 +843,34 @@ static void dissociate_dev(struct us_data *us)</div><div class='ctx'>  * the host */</div><div class='ctx'> static void quiesce_and_remove_host(struct us_data *us)</div><div class='ctx'> {</div><div class='add'>+	struct Scsi_Host *host = us_to_host(us);</div><div class='add'>+</div><div class='ctx'> 	/* Prevent new USB transfers, stop the current command, and</div><div class='ctx'> 	 * interrupt a SCSI-scan or device-reset delay */</div><div class='add'>+	scsi_lock(host);</div><div class='ctx'> 	set_bit(US_FLIDX_DISCONNECTING, &amp;us-&gt;flags);</div><div class='add'>+	scsi_unlock(host);</div><div class='ctx'> 	usb_stor_stop_transport(us);</div><div class='ctx'> 	wake_up(&amp;us-&gt;delay_wait);</div><div class='ctx'> </div><div class='ctx'> 	/* It doesn't matter if the SCSI-scanning thread is still running.</div><div class='ctx'> 	 * The thread will exit when it sees the DISCONNECTING flag. */</div><div class='ctx'> </div><div class='del'>-	/* Wait for the current command to finish, then remove the host */</div><div class='del'>-	mutex_lock(&amp;us-&gt;dev_mutex);</div><div class='del'>-	mutex_unlock(&amp;us-&gt;dev_mutex);</div><div class='del'>-</div><div class='ctx'> 	/* queuecommand won't accept any new commands and the control</div><div class='ctx'> 	 * thread won't execute a previously-queued command.  If there</div><div class='ctx'> 	 * is such a command pending, complete it with an error. */</div><div class='add'>+	mutex_lock(&amp;us-&gt;dev_mutex);</div><div class='ctx'> 	if (us-&gt;srb) {</div><div class='ctx'> 		us-&gt;srb-&gt;result = DID_NO_CONNECT &lt;&lt; 16;</div><div class='del'>-		scsi_lock(us_to_host(us));</div><div class='add'>+		scsi_lock(host);</div><div class='ctx'> 		us-&gt;srb-&gt;scsi_done(us-&gt;srb);</div><div class='ctx'> 		us-&gt;srb = NULL;</div><div class='del'>-		scsi_unlock(us_to_host(us));</div><div class='add'>+		scsi_unlock(host);</div><div class='ctx'> 	}</div><div class='add'>+	mutex_unlock(&amp;us-&gt;dev_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Now we own no commands so it's safe to remove the SCSI host */</div><div class='del'>-	scsi_remove_host(us_to_host(us));</div><div class='add'>+	scsi_remove_host(host);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Second stage of disconnect processing: deallocate all resources */</div><div class='hunk'>@@ -1002,6 +1041,8 @@ static struct usb_driver usb_storage_driver = {</div><div class='ctx'> 	.suspend =	storage_suspend,</div><div class='ctx'> 	.resume =	storage_resume,</div><div class='ctx'> #endif</div><div class='add'>+	.pre_reset =	storage_pre_reset,</div><div class='add'>+	.post_reset =	storage_post_reset,</div><div class='ctx'> 	.id_table =	storage_usb_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h<br/>index 009fb0953a56..21f3ddbc9080 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/storage/usb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/storage/usb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/storage/usb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/storage/usb.h</a></div><div class='hunk'>@@ -160,10 +160,10 @@ struct us_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Convert between us_data and the corresponding Scsi_Host */</div><div class='del'>-static struct Scsi_Host inline *us_to_host(struct us_data *us) {</div><div class='add'>+static inline struct Scsi_Host *us_to_host(struct us_data *us) {</div><div class='ctx'> 	return container_of((void *) us, struct Scsi_Host, hostdata);</div><div class='ctx'> }</div><div class='del'>-static struct us_data inline *host_to_us(struct Scsi_Host *host) {</div><div class='add'>+static inline struct us_data *host_to_us(struct Scsi_Host *host) {</div><div class='ctx'> 	return (struct us_data *) host-&gt;hostdata;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -176,8 +176,4 @@ extern void fill_inquiry_response(struct us_data *us,</div><div class='ctx'> #define scsi_unlock(host)	spin_unlock_irq(host-&gt;host_lock)</div><div class='ctx'> #define scsi_lock(host)		spin_lock_irq(host-&gt;host_lock)</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Vendor ID list for devices that require special handling */</div><div class='del'>-#define USB_VENDOR_ID_GENESYS		0x05e3	/* Genesys Logic */</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c<br/>index 4de9fb56ebfc..b362039792b3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/usb/usb-skeleton.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/usb/usb-skeleton.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/usb/usb-skeleton.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/usb/usb-skeleton.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c<br/>index 78488bb41aeb..0dda73da8628 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/68328fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/68328fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/68328fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/68328fb.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig<br/>index 4587087d777a..6533b0f39231 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/Kconfig</a></div><div class='hunk'>@@ -4,6 +4,21 @@</div><div class='ctx'> </div><div class='ctx'> menu "Graphics support"</div><div class='ctx'> </div><div class='add'>+config FIRMWARE_EDID</div><div class='add'>+       bool "Enable firmware EDID"</div><div class='add'>+       default y</div><div class='add'>+       ---help---</div><div class='add'>+         This enables access to the EDID transferred from the firmware.</div><div class='add'>+	 On the i386, this is from the Video BIOS. Enable this if DDC/I2C</div><div class='add'>+	 transfers do not work for your driver and if you are using</div><div class='add'>+	 nvidiafb, i810fb or savagefb.</div><div class='add'>+</div><div class='add'>+	 In general, choosing Y for this option is safe.  If you</div><div class='add'>+	 experience extremely long delays while booting before you get</div><div class='add'>+	 something on your display, try setting this to N.  Matrox cards in</div><div class='add'>+	 combination with certain motherboards and monitors are known to</div><div class='add'>+	 suffer from this problem.</div><div class='add'>+</div><div class='ctx'> config FB</div><div class='ctx'> 	tristate "Support for frame buffer devices"</div><div class='ctx'> 	---help---</div><div class='hunk'>@@ -70,21 +85,10 @@ config FB_MACMODES</div><div class='ctx'>        depends on FB</div><div class='ctx'>        default n</div><div class='ctx'> </div><div class='del'>-config FB_FIRMWARE_EDID</div><div class='del'>-       bool "Enable firmware EDID"</div><div class='add'>+config FB_BACKLIGHT</div><div class='add'>+       bool</div><div class='ctx'>        depends on FB</div><div class='del'>-       default y</div><div class='del'>-       ---help---</div><div class='del'>-         This enables access to the EDID transferred from the firmware.</div><div class='del'>-	 On the i386, this is from the Video BIOS. Enable this if DDC/I2C</div><div class='del'>-	 transfers do not work for your driver and if you are using</div><div class='del'>-	 nvidiafb, i810fb or savagefb.</div><div class='del'>-</div><div class='del'>-	 In general, choosing Y for this option is safe.  If you</div><div class='del'>-	 experience extremely long delays while booting before you get</div><div class='del'>-	 something on your display, try setting this to N.  Matrox cards in</div><div class='del'>-	 combination with certain motherboards and monitors are known to</div><div class='del'>-	 suffer from this problem.</div><div class='add'>+       default n</div><div class='ctx'> </div><div class='ctx'> config FB_MODE_HELPERS</div><div class='ctx'>         bool "Enable Video Mode Handling Helpers"</div><div class='hunk'>@@ -167,6 +171,69 @@ config FB_ARMCLCD</div><div class='ctx'> 	  here and read &lt;file:Documentation/modules.txt&gt;.  The module</div><div class='ctx'> 	  will be called amba-clcd.</div><div class='ctx'> </div><div class='add'>+choice</div><div class='add'>+</div><div class='add'>+	depends on FB_ARMCLCD &amp;&amp; (ARCH_LH7A40X || ARCH_LH7952X)</div><div class='add'>+	prompt "LCD Panel"</div><div class='add'>+	default FB_ARMCLCD_SHARP_LQ035Q7DB02</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT</div><div class='add'>+	bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the Sharp LQ035Q7DB02, a 3.5"</div><div class='add'>+	  color QVGA, HRTFT panel.  The LogicPD device includes an</div><div class='add'>+	  an integrated HRTFT controller IC.</div><div class='add'>+	  The native resolution is 240x320.</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_SHARP_LQ057Q3DC02</div><div class='add'>+	bool "LogicPD LCD 5.7\" QVGA"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the Sharp LQ057Q3DC02, a 5.7"</div><div class='add'>+	  color QVGA, TFT panel.  The LogicPD device includes an</div><div class='add'>+	  The native resolution is 320x240.</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_SHARP_LQ64D343</div><div class='add'>+	bool "LogicPD LCD 6.4\" VGA"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the Sharp LQ64D343, a 6.4"</div><div class='add'>+	  color VGA, TFT panel.  The LogicPD device includes an</div><div class='add'>+	  The native resolution is 640x480.</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_SHARP_LQ10D368</div><div class='add'>+	bool "LogicPD LCD 10.4\" VGA"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the Sharp LQ10D368, a 10.4"</div><div class='add'>+	  color VGA, TFT panel.  The LogicPD device includes an</div><div class='add'>+	  The native resolution is 640x480.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_SHARP_LQ121S1DG41</div><div class='add'>+	bool "LogicPD LCD 12.1\" SVGA"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the Sharp LQ121S1DG41, a 12.1"</div><div class='add'>+	  color SVGA, TFT panel.  The LogicPD device includes an</div><div class='add'>+	  The native resolution is 800x600.</div><div class='add'>+</div><div class='add'>+	  This panel requires a clock rate may be an integer fraction</div><div class='add'>+	  of the base LCDCLK frequency.  The driver will select the</div><div class='add'>+	  highest frequency available that is lower than the maximum</div><div class='add'>+	  allowed.  The panel may flicker if the clock rate is</div><div class='add'>+	  slower than the recommended minimum.</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_AUO_A070VW01_WIDE</div><div class='add'>+	bool "AU Optronics A070VW01 LCD 7.0\" WIDE"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the AU Optronics, a 7.0"</div><div class='add'>+	  WIDE Color.  The native resolution is 234x480.</div><div class='add'>+</div><div class='add'>+config FB_ARMCLCD_HITACHI</div><div class='add'>+	bool "Hitachi Wide Screen 800x480"</div><div class='add'>+	help</div><div class='add'>+	  This is an implementation of the Hitachi 800x480.</div><div class='add'>+</div><div class='add'>+endchoice</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> config FB_ACORN</div><div class='ctx'> 	bool "Acorn VIDC support"</div><div class='ctx'> 	depends on (FB = y) &amp;&amp; ARM &amp;&amp; (ARCH_ACORN || ARCH_CLPS7500)</div><div class='hunk'>@@ -483,10 +550,14 @@ config FB_VESA</div><div class='ctx'> 	  You will get a boot time penguin logo at no additional cost. Please</div><div class='ctx'> 	  read &lt;file:Documentation/fb/vesafb.txt&gt;. If unsure, say Y.</div><div class='ctx'> </div><div class='del'>-config VIDEO_SELECT</div><div class='del'>-	bool</div><div class='del'>-	depends on FB_VESA</div><div class='del'>-	default y</div><div class='add'>+config FB_IMAC</div><div class='add'>+	bool "Intel-based Macintosh Framebuffer Support"</div><div class='add'>+	depends on (FB = y) &amp;&amp; X86</div><div class='add'>+	select FB_CFB_FILLRECT</div><div class='add'>+	select FB_CFB_COPYAREA</div><div class='add'>+	select FB_CFB_IMAGEBLIT</div><div class='add'>+	help</div><div class='add'>+	  This is the frame buffer device driver for the Intel-based Macintosh</div><div class='ctx'> </div><div class='ctx'> config FB_HGA</div><div class='ctx'> 	tristate "Hercules mono graphics support"</div><div class='hunk'>@@ -510,12 +581,6 @@ config FB_HGA_ACCEL</div><div class='ctx'> 	This will compile the Hercules mono graphics with</div><div class='ctx'> 	acceleration functions.</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-config VIDEO_SELECT</div><div class='del'>-	bool</div><div class='del'>-	depends on (FB = y) &amp;&amp; X86</div><div class='del'>-	default y</div><div class='del'>-</div><div class='ctx'> config FB_SGIVW</div><div class='ctx'> 	tristate "SGI Visual Workstation framebuffer support"</div><div class='ctx'> 	depends on FB &amp;&amp; X86_VISWS</div><div class='hunk'>@@ -654,6 +719,16 @@ config FB_NVIDIA_I2C</div><div class='ctx'> 	  independently validate video mode parameters, you should say Y</div><div class='ctx'> 	  here.</div><div class='ctx'> </div><div class='add'>+config FB_NVIDIA_BACKLIGHT</div><div class='add'>+	bool "Support for backlight control"</div><div class='add'>+	depends on FB_NVIDIA &amp;&amp; PPC_PMAC</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to control the backlight of your display.</div><div class='add'>+</div><div class='ctx'> config FB_RIVA</div><div class='ctx'> 	tristate "nVidia Riva support"</div><div class='ctx'> 	depends on FB &amp;&amp; PCI</div><div class='hunk'>@@ -692,6 +767,16 @@ config FB_RIVA_DEBUG</div><div class='ctx'> 	  of debugging informations to provide to the maintainer when</div><div class='ctx'> 	  something goes wrong.</div><div class='ctx'> </div><div class='add'>+config FB_RIVA_BACKLIGHT</div><div class='add'>+	bool "Support for backlight control"</div><div class='add'>+	depends on FB_RIVA &amp;&amp; PPC_PMAC</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to control the backlight of your display.</div><div class='add'>+</div><div class='ctx'> config FB_I810</div><div class='ctx'> 	tristate "Intel 810/815 support (EXPERIMENTAL)"</div><div class='ctx'> 	depends on FB &amp;&amp; EXPERIMENTAL &amp;&amp; PCI &amp;&amp; X86_32</div><div class='hunk'>@@ -743,7 +828,7 @@ config FB_I810_I2C</div><div class='ctx'> </div><div class='ctx'> config FB_INTEL</div><div class='ctx'> 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"</div><div class='del'>-	depends on FB &amp;&amp; EXPERIMENTAL &amp;&amp; PCI &amp;&amp; X86_32</div><div class='add'>+	depends on FB &amp;&amp; EXPERIMENTAL &amp;&amp; PCI &amp;&amp; X86</div><div class='ctx'> 	select AGP</div><div class='ctx'> 	select AGP_INTEL</div><div class='ctx'> 	select FB_MODE_HELPERS</div><div class='hunk'>@@ -930,6 +1015,7 @@ config FB_RADEON</div><div class='ctx'> </div><div class='ctx'> 	  There is a product page at</div><div class='ctx'> 	  http://apps.ati.com/ATIcompare/</div><div class='add'>+</div><div class='ctx'> config FB_RADEON_I2C</div><div class='ctx'> 	bool "DDC/I2C for ATI Radeon support"</div><div class='ctx'> 	depends on FB_RADEON</div><div class='hunk'>@@ -937,6 +1023,16 @@ config FB_RADEON_I2C</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want DDC/I2C support for your Radeon board. </div><div class='ctx'> </div><div class='add'>+config FB_RADEON_BACKLIGHT</div><div class='add'>+	bool "Support for backlight control"</div><div class='add'>+	depends on FB_RADEON &amp;&amp; PPC_PMAC</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to control the backlight of your display.</div><div class='add'>+</div><div class='ctx'> config FB_RADEON_DEBUG</div><div class='ctx'> 	bool "Lots of debug output from Radeon driver"</div><div class='ctx'> 	depends on FB_RADEON</div><div class='hunk'>@@ -961,6 +1057,16 @@ config FB_ATY128</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='ctx'> 	  module will be called aty128fb.</div><div class='ctx'> </div><div class='add'>+config FB_ATY128_BACKLIGHT</div><div class='add'>+	bool "Support for backlight control"</div><div class='add'>+	depends on FB_ATY128 &amp;&amp; PPC_PMAC</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to control the backlight of your display.</div><div class='add'>+</div><div class='ctx'> config FB_ATY</div><div class='ctx'> 	tristate "ATI Mach64 display support" if PCI || ATARI</div><div class='ctx'> 	depends on FB &amp;&amp; !SPARC32</div><div class='hunk'>@@ -1003,6 +1109,16 @@ config FB_ATY_GX</div><div class='ctx'> 	  is at</div><div class='ctx'> 	  &lt;http://support.ati.com/products/pc/mach64/graphics_xpression.html&gt;.</div><div class='ctx'> </div><div class='add'>+config FB_ATY_BACKLIGHT</div><div class='add'>+	bool "Support for backlight control"</div><div class='add'>+	depends on FB_ATY &amp;&amp; PPC_PMAC</div><div class='add'>+	select FB_BACKLIGHT</div><div class='add'>+	select BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	select BACKLIGHT_CLASS_DEVICE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to control the backlight of your display.</div><div class='add'>+</div><div class='ctx'> config FB_S3TRIO</div><div class='ctx'> 	bool "S3 Trio display support"</div><div class='ctx'> 	depends on (FB = y) &amp;&amp; PPC &amp;&amp; BROKEN</div><div class='hunk'>@@ -1402,6 +1518,26 @@ config FB_PXA_PARAMETERS</div><div class='ctx'> </div><div class='ctx'> 	  &lt;file:Documentation/fb/pxafb.txt&gt; describes the available parameters.</div><div class='ctx'> </div><div class='add'>+config FB_MBX</div><div class='add'>+	tristate "2700G LCD framebuffer support"</div><div class='add'>+	depends on FB &amp;&amp; ARCH_PXA</div><div class='add'>+	select FB_CFB_FILLRECT</div><div class='add'>+	select FB_CFB_COPYAREA</div><div class='add'>+	select FB_CFB_IMAGEBLIT</div><div class='add'>+	---help---</div><div class='add'>+	  Framebuffer driver for the Intel 2700G (Marathon) Graphics</div><div class='add'>+	  Accelerator</div><div class='add'>+</div><div class='add'>+config FB_MBX_DEBUG</div><div class='add'>+       bool "Enable debugging info via debugfs"</div><div class='add'>+       depends on FB_MBX &amp;&amp; DEBUG_FS</div><div class='add'>+       default n</div><div class='add'>+       ---help---</div><div class='add'>+         Enable this if you want debugging information using the debug</div><div class='add'>+         filesystem (debugfs)</div><div class='add'>+</div><div class='add'>+         If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config FB_W100</div><div class='ctx'> 	tristate "W100 frame buffer support"</div><div class='ctx'> 	depends on FB &amp;&amp; PXA_SHARPSL</div><div class='hunk'>@@ -1441,6 +1577,21 @@ config FB_S3C2410_DEBUG</div><div class='ctx'> 	  Turn on debugging messages. Note that you can set/unset at run time</div><div class='ctx'> 	  through sysfs</div><div class='ctx'> </div><div class='add'>+config FB_PNX4008_DUM</div><div class='add'>+	tristate "Display Update Module support on Philips PNX4008 board"</div><div class='add'>+	depends on FB &amp;&amp; ARCH_PNX4008</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable support for PNX4008 Display Update Module (DUM)</div><div class='add'>+</div><div class='add'>+config FB_PNX4008_DUM_RGB</div><div class='add'>+	tristate "RGB Framebuffer support on Philips PNX4008 board"</div><div class='add'>+	depends on FB_PNX4008_DUM</div><div class='add'>+	select FB_CFB_FILLRECT</div><div class='add'>+	select FB_CFB_COPYAREA</div><div class='add'>+	select FB_CFB_IMAGEBLIT</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable support for PNX4008 RGB Framebuffer</div><div class='add'>+</div><div class='ctx'> config FB_VIRTUAL</div><div class='ctx'> 	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"</div><div class='ctx'> 	depends on FB</div><div class='head'>diff --git a/drivers/video/Makefile b/drivers/video/Makefile<br/>index 23de3b2c7856..95563c9c6b9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/Makefile</a></div><div class='hunk'>@@ -4,15 +4,15 @@</div><div class='ctx'> </div><div class='ctx'> # Each configuration option enables a list of files.</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_VT)		  += console/</div><div class='del'>-obj-$(CONFIG_LOGO)		  += logo/</div><div class='del'>-obj-$(CONFIG_SYSFS)		  += backlight/</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_FB)                  += fb.o</div><div class='ctx'> fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \</div><div class='ctx'>                                      modedb.o fbcvt.o</div><div class='ctx'> fb-objs                           := $(fb-y)</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_VT)		  += console/</div><div class='add'>+obj-$(CONFIG_LOGO)		  += logo/</div><div class='add'>+obj-$(CONFIG_SYSFS)		  += backlight/</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o</div><div class='ctx'> obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o</div><div class='ctx'> obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o</div><div class='hunk'>@@ -38,6 +38,7 @@ obj-$(CONFIG_FB_SIS)		  += sis/</div><div class='ctx'> obj-$(CONFIG_FB_KYRO)             += kyro/</div><div class='ctx'> obj-$(CONFIG_FB_SAVAGE)		  += savage/</div><div class='ctx'> obj-$(CONFIG_FB_GEODE)		  += geode/</div><div class='add'>+obj-$(CONFIG_FB_MBX)		  += mbx/</div><div class='ctx'> obj-$(CONFIG_FB_I810)             += vgastate.o</div><div class='ctx'> obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o</div><div class='ctx'> obj-$(CONFIG_FB_VIRGE)            += virgefb.o</div><div class='hunk'>@@ -94,9 +95,12 @@ obj-$(CONFIG_FB_TX3912)		  += tx3912fb.o</div><div class='ctx'> obj-$(CONFIG_FB_S1D13XXX)	  += s1d13xxxfb.o</div><div class='ctx'> obj-$(CONFIG_FB_IMX)              += imxfb.o</div><div class='ctx'> obj-$(CONFIG_FB_S3C2410)	  += s3c2410fb.o</div><div class='add'>+obj-$(CONFIG_FB_PNX4008_DUM)	  += pnx4008/</div><div class='add'>+obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/</div><div class='ctx'> </div><div class='ctx'> # Platform or fallback drivers go here</div><div class='ctx'> obj-$(CONFIG_FB_VESA)             += vesafb.o</div><div class='add'>+obj-$(CONFIG_FB_IMAC)             += imacfb.o</div><div class='ctx'> obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o</div><div class='ctx'> obj-$(CONFIG_FB_OF)               += offb.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c<br/>index 455fda990ff7..afd146f5f683 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/S3triofb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/S3triofb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/S3triofb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/S3triofb.c</a></div><div class='hunk'>@@ -23,13 +23,11 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c<br/>index 98baecccb3fd..61a8bf159cb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/acornfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/acornfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/acornfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/acornfb.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *  - Blanking 8bpp displays with VIDC</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c<br/>index 3033c72dea20..f1ba54f4fc39 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/amifb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/amifb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/amifb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/amifb.c</a></div><div class='hunk'>@@ -45,10 +45,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c<br/>index 466042808daf..70dd8115a4d8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/arcfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/arcfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/arcfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/arcfb.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -561,7 +560,7 @@ static int __init arcfb_probe(struct platform_device *dev)</div><div class='ctx'> 	platform_set_drvdata(dev, info);</div><div class='ctx'> 	if (irq) {</div><div class='ctx'> 		par-&gt;irq = irq;</div><div class='del'>-		if (request_irq(par-&gt;irq, &amp;arcfb_interrupt, SA_SHIRQ,</div><div class='add'>+		if (request_irq(par-&gt;irq, &amp;arcfb_interrupt, IRQF_SHARED,</div><div class='ctx'> 				"arcfb", info)) {</div><div class='ctx'> 			printk(KERN_INFO</div><div class='ctx'> 				"arcfb: Failed req IRQ %d\n", par-&gt;irq);</div><div class='head'>diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c<br/>index 29f9f0dfe3b4..1fd22f460b0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/asiliantfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/asiliantfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/asiliantfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/asiliantfb.c</a></div><div class='hunk'>@@ -29,13 +29,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c<br/>index e69ab65f7843..5831893bf7a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/atafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/atafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/atafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/atafb.c</a></div><div class='hunk'>@@ -53,7 +53,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/aty/Makefile b/drivers/video/aty/Makefile<br/>index 18521397a6e3..a6cc0e9ec790 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/Makefile</a></div><div class='hunk'>@@ -10,5 +10,6 @@ atyfb-objs			:= $(atyfb-y)</div><div class='ctx'> </div><div class='ctx'> radeonfb-y			:= radeon_base.o radeon_pm.o radeon_monitor.o radeon_accel.o</div><div class='ctx'> radeonfb-$(CONFIG_FB_RADEON_I2C)	+= radeon_i2c.o</div><div class='add'>+radeonfb-$(CONFIG_FB_RADEON_BACKLIGHT)	+= radeon_backlight.o</div><div class='ctx'> radeonfb-objs			:= $(radeonfb-y)</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c<br/>index f7bbff4ddc6a..c64a717e2d4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/aty128fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/aty128fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/aty128fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/aty128fb.c</a></div><div class='hunk'>@@ -46,14 +46,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -64,6 +62,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PMAC</div><div class='hunk'>@@ -99,7 +98,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_PPC_PMAC</div><div class='ctx'> /* default mode */</div><div class='del'>-static struct fb_var_screeninfo default_var __initdata = {</div><div class='add'>+static struct fb_var_screeninfo default_var __devinitdata = {</div><div class='ctx'> 	/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */</div><div class='ctx'> 	640, 480, 640, 480, 0, 0, 8, 0,</div><div class='ctx'> 	{0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},</div><div class='hunk'>@@ -122,7 +121,7 @@ static struct fb_var_screeninfo default_var = {</div><div class='ctx'> </div><div class='ctx'> /* default modedb mode */</div><div class='ctx'> /* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */</div><div class='del'>-static struct fb_videomode defaultmode __initdata = {</div><div class='add'>+static struct fb_videomode defaultmode __devinitdata = {</div><div class='ctx'> 	.refresh =	60,</div><div class='ctx'> 	.xres =		640,</div><div class='ctx'> 	.yres =		480,</div><div class='hunk'>@@ -334,7 +333,7 @@ static const struct aty128_meminfo sdr_sgram =</div><div class='ctx'> static const struct aty128_meminfo ddr_sgram =</div><div class='ctx'> 	{ 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" };</div><div class='ctx'> </div><div class='del'>-static struct fb_fix_screeninfo aty128fb_fix __initdata = {</div><div class='add'>+static struct fb_fix_screeninfo aty128fb_fix __devinitdata = {</div><div class='ctx'> 	.id		= "ATY Rage128",</div><div class='ctx'> 	.type		= FB_TYPE_PACKED_PIXELS,</div><div class='ctx'> 	.visual		= FB_VISUAL_PSEUDOCOLOR,</div><div class='hunk'>@@ -344,15 +343,15 @@ static struct fb_fix_screeninfo aty128fb_fix __initdata = {</div><div class='ctx'> 	.accel		= FB_ACCEL_ATI_RAGE128,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *mode_option __initdata = NULL;</div><div class='add'>+static char *mode_option __devinitdata = NULL;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC_PMAC</div><div class='del'>-static int default_vmode __initdata = VMODE_1024_768_60;</div><div class='del'>-static int default_cmode __initdata = CMODE_8;</div><div class='add'>+static int default_vmode __devinitdata = VMODE_1024_768_60;</div><div class='add'>+static int default_cmode __devinitdata = CMODE_8;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int default_crt_on __initdata = 0;</div><div class='del'>-static int default_lcd_on __initdata = 1;</div><div class='add'>+static int default_crt_on __devinitdata = 0;</div><div class='add'>+static int default_lcd_on __devinitdata = 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='ctx'> static int mtrr = 1;</div><div class='hunk'>@@ -444,9 +443,9 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,</div><div class='ctx'> static int aty128_decode_var(struct fb_var_screeninfo *var,</div><div class='ctx'>                              struct aty128fb_par *par);</div><div class='ctx'> #if 0</div><div class='del'>-static void __init aty128_get_pllinfo(struct aty128fb_par *par,</div><div class='add'>+static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,</div><div class='ctx'> 				      void __iomem *bios);</div><div class='del'>-static void __init __iomem *aty128_map_ROM(struct pci_dev *pdev, const struct aty128fb_par *par);</div><div class='add'>+static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev, const struct aty128fb_par *par);</div><div class='ctx'> #endif</div><div class='ctx'> static void aty128_timings(struct aty128fb_par *par);</div><div class='ctx'> static void aty128_init_engine(struct aty128fb_par *par);</div><div class='hunk'>@@ -456,6 +455,7 @@ static void do_wait_for_fifo(u16 entries, struct aty128fb_par *par);</div><div class='ctx'> static void wait_for_fifo(u16 entries, struct aty128fb_par *par);</div><div class='ctx'> static void wait_for_idle(struct aty128fb_par *par);</div><div class='ctx'> static u32 depth_to_dst(u32 depth);</div><div class='add'>+static void aty128_bl_set_power(struct fb_info *info, int power);</div><div class='ctx'> </div><div class='ctx'> #define BIOS_IN8(v)  	(readb(bios + (v)))</div><div class='ctx'> #define BIOS_IN16(v) 	(readb(bios + (v)) | \</div><div class='hunk'>@@ -480,16 +480,6 @@ static struct fb_ops aty128fb_ops = {</div><div class='ctx'> 	.fb_imageblit	= cfb_imageblit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static int aty128_set_backlight_enable(int on, int level, void* data);</div><div class='del'>-static int aty128_set_backlight_level(int level, void* data);</div><div class='del'>-</div><div class='del'>-static struct backlight_controller aty128_backlight_controller = {</div><div class='del'>-	aty128_set_backlight_enable,</div><div class='del'>-	aty128_set_backlight_level</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='ctx'>     /*</div><div class='ctx'>      * Functions to read from/write to the mmio registers</div><div class='ctx'>      *	- endian conversions may possibly be avoided by</div><div class='hunk'>@@ -582,7 +572,7 @@ static void aty_pll_writeupdate(const struct aty128fb_par *par)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* write to the scratch register to test r/w functionality */</div><div class='del'>-static int __init register_test(const struct aty128fb_par *par)</div><div class='add'>+static int __devinit register_test(const struct aty128fb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int flag = 0;</div><div class='hunk'>@@ -781,7 +771,7 @@ static u32 depth_to_dst(u32 depth)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifndef __sparc__</div><div class='del'>-static void __iomem * __init aty128_map_ROM(const struct aty128fb_par *par, struct pci_dev *dev)</div><div class='add'>+static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u16 dptr;</div><div class='ctx'> 	u8 rom_type;</div><div class='hunk'>@@ -865,7 +855,7 @@ static void __iomem * __init aty128_map_ROM(const struct aty128fb_par *par, stru</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init aty128_get_pllinfo(struct aty128fb_par *par, unsigned char __iomem *bios)</div><div class='add'>+static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, unsigned char __iomem *bios)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int bios_hdr;</div><div class='ctx'> 	unsigned int bios_pll;</div><div class='hunk'>@@ -912,7 +902,7 @@ static void __iomem *  __devinit aty128_find_mem_vbios(struct aty128fb_par *par)</div><div class='ctx'> #endif /* ndef(__sparc__) */</div><div class='ctx'> </div><div class='ctx'> /* fill in known card constants if pll_block is not available */</div><div class='del'>-static void __init aty128_timings(struct aty128fb_par *par)</div><div class='add'>+static void __devinit aty128_timings(struct aty128fb_par *par)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PPC_OF</div><div class='ctx'> 	/* instead of a table lookup, assume OF has properly</div><div class='hunk'>@@ -1258,19 +1248,21 @@ static void aty128_set_crt_enable(struct aty128fb_par *par, int on)</div><div class='ctx'> static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		reg = aty_ld_le32(LVDS_GEN_CNTL);</div><div class='ctx'> 		reg |= LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION;</div><div class='ctx'> 		reg &amp;= ~LVDS_DISPLAY_DIS;</div><div class='ctx'> 		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-		aty128_set_backlight_enable(get_backlight_enable(),</div><div class='del'>-					    get_backlight_level(), par);</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='add'>+		aty128_bl_set_power(info, FB_BLANK_UNBLANK);</div><div class='ctx'> #endif	</div><div class='ctx'> 	} else {</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-		aty128_set_backlight_enable(0, 0, par);</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='add'>+		aty128_bl_set_power(info, FB_BLANK_POWERDOWN);</div><div class='ctx'> #endif	</div><div class='ctx'> 		reg = aty_ld_le32(LVDS_GEN_CNTL);</div><div class='ctx'> 		reg |= LVDS_DISPLAY_DIS;</div><div class='hunk'>@@ -1638,7 +1630,7 @@ static int aty128fb_sync(struct fb_info *info)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='del'>-static int __init aty128fb_setup(char *options)</div><div class='add'>+static int __devinit aty128fb_setup(char *options)</div><div class='ctx'> {</div><div class='ctx'> 	char *this_opt;</div><div class='ctx'> </div><div class='hunk'>@@ -1691,6 +1683,207 @@ static int __init aty128fb_setup(char *options)</div><div class='ctx'> }</div><div class='ctx'> #endif  /*  MODULE  */</div><div class='ctx'> </div><div class='add'>+/* Backlight */</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='add'>+#define MAX_LEVEL 0xFF</div><div class='add'>+</div><div class='add'>+static struct backlight_properties aty128_bl_data;</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int aty128_bl_get_level_brightness(struct aty128fb_par *par,</div><div class='add'>+		int level)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	int atylevel;</div><div class='add'>+</div><div class='add'>+	/* Get and convert the value */</div><div class='add'>+	atylevel = MAX_LEVEL -</div><div class='add'>+		(info-&gt;bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL);</div><div class='add'>+</div><div class='add'>+	if (atylevel &lt; 0)</div><div class='add'>+		atylevel = 0;</div><div class='add'>+	else if (atylevel &gt; MAX_LEVEL)</div><div class='add'>+		atylevel = MAX_LEVEL;</div><div class='add'>+</div><div class='add'>+	return atylevel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We turn off the LCD completely instead of just dimming the backlight.</div><div class='add'>+ * This provides greater power saving and the display is useless without</div><div class='add'>+ * backlight anyway</div><div class='add'>+ */</div><div class='add'>+#define BACKLIGHT_LVDS_OFF</div><div class='add'>+/* That one prevents proper CRT output with LCD off */</div><div class='add'>+#undef BACKLIGHT_DAC_OFF</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int __aty128_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct aty128fb_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK ||</div><div class='add'>+	    !par-&gt;lcd_on)</div><div class='add'>+		level = 0;</div><div class='add'>+	else</div><div class='add'>+		level = bd-&gt;props-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	reg |= LVDS_BL_MOD_EN | LVDS_BLON;</div><div class='add'>+	if (level &gt; 0) {</div><div class='add'>+		reg |= LVDS_DIGION;</div><div class='add'>+		if (!(reg &amp; LVDS_ON)) {</div><div class='add'>+			reg &amp;= ~LVDS_BLON;</div><div class='add'>+			aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='add'>+			aty_ld_le32(LVDS_GEN_CNTL);</div><div class='add'>+			mdelay(10);</div><div class='add'>+			reg |= LVDS_BLON;</div><div class='add'>+			aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='add'>+		}</div><div class='add'>+		reg &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='add'>+		reg |= (aty128_bl_get_level_brightness(par, level) &lt;&lt; LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='add'>+#ifdef BACKLIGHT_LVDS_OFF</div><div class='add'>+		reg |= LVDS_ON | LVDS_EN;</div><div class='add'>+		reg &amp;= ~LVDS_DISPLAY_DIS;</div><div class='add'>+#endif</div><div class='add'>+		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='add'>+#ifdef BACKLIGHT_DAC_OFF</div><div class='add'>+		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) &amp; (~DAC_PDWN));</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		reg &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='add'>+		reg |= (aty128_bl_get_level_brightness(par, 0) &lt;&lt; LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='add'>+#ifdef BACKLIGHT_LVDS_OFF</div><div class='add'>+		reg |= LVDS_DISPLAY_DIS;</div><div class='add'>+		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='add'>+		aty_ld_le32(LVDS_GEN_CNTL);</div><div class='add'>+		udelay(10);</div><div class='add'>+		reg &amp;= ~(LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION);</div><div class='add'>+#endif</div><div class='add'>+		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='add'>+#ifdef BACKLIGHT_DAC_OFF</div><div class='add'>+		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PDWN);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aty128_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct aty128fb_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	ret = __aty128_bl_update_status(bd);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aty128_bl_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;props-&gt;brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties aty128_bl_data = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.get_brightness	= aty128_bl_get_brightness,</div><div class='add'>+	.update_status	= aty128_bl_update_status,</div><div class='add'>+	.max_brightness	= (FB_BACKLIGHT_LEVELS - 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void aty128_bl_set_power(struct fb_info *info, int power)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	up(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	info-&gt;bl_dev-&gt;props-&gt;power = power;</div><div class='add'>+	__aty128_bl_update_status(info-&gt;bl_dev);</div><div class='add'>+	down(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aty128_bl_init(struct aty128fb_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	struct backlight_device *bd;</div><div class='add'>+	char name[12];</div><div class='add'>+</div><div class='add'>+	/* Could be extended to Rage128Pro LVDS output too */</div><div class='add'>+	if (par-&gt;chip_gen != rage_M3)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	if (!pmac_has_backlight_type("ati"))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "aty128bl%d", info-&gt;node);</div><div class='add'>+</div><div class='add'>+	bd = backlight_device_register(name, par, &amp;aty128_bl_data);</div><div class='add'>+	if (IS_ERR(bd)) {</div><div class='add'>+		info-&gt;bl_dev = NULL;</div><div class='add'>+		printk("aty128: Backlight registration failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	info-&gt;bl_dev = bd;</div><div class='add'>+	fb_bl_default_curve(info, 0,</div><div class='add'>+		 63 * FB_BACKLIGHT_MAX / MAX_LEVEL,</div><div class='add'>+		219 * FB_BACKLIGHT_MAX / MAX_LEVEL);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	up(&amp;bd-&gt;sem);</div><div class='add'>+	bd-&gt;props-&gt;brightness = aty128_bl_data.max_brightness;</div><div class='add'>+	bd-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props-&gt;update_status(bd);</div><div class='add'>+	down(&amp;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (!pmac_backlight)</div><div class='add'>+		pmac_backlight = bd;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("aty128: Backlight initialized (%s)\n", name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aty128_bl_exit(struct aty128fb_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	if (info-&gt;bl_dev) {</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+		if (pmac_backlight == info-&gt;bl_dev)</div><div class='add'>+			pmac_backlight = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		backlight_device_unregister(info-&gt;bl_dev);</div><div class='add'>+		info-&gt;bl_dev = NULL;</div><div class='add'>+</div><div class='add'>+		printk("aty128: Backlight unloaded\n");</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_FB_ATY128_BACKLIGHT */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Initialisation</div><div class='hunk'>@@ -1708,7 +1901,7 @@ static void aty128_early_resume(void *data)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PPC_PMAC */</div><div class='ctx'> </div><div class='del'>-static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct aty128fb_par *par = info-&gt;par;</div><div class='hunk'>@@ -1835,17 +2028,15 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *</div><div class='ctx'> 	if (register_framebuffer(info) &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	/* Could be extended to Rage128Pro LVDS output too */</div><div class='del'>-	if (par-&gt;chip_gen == rage_M3)</div><div class='del'>-		register_backlight_controller(&amp;aty128_backlight_controller, par, "ati");</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='ctx'> 	par-&gt;pm_reg = pci_find_capability(pdev, PCI_CAP_ID_PM);</div><div class='ctx'> 	par-&gt;pdev = pdev;</div><div class='ctx'> 	par-&gt;asleep = 0;</div><div class='ctx'> 	par-&gt;lock_blank = 0;</div><div class='del'>-	</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='add'>+	aty128_bl_init(par);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "fb%d: %s frame buffer device on %s\n",</div><div class='ctx'> 	       info-&gt;node, info-&gt;fix.id, video_card);</div><div class='ctx'> </div><div class='hunk'>@@ -1854,7 +2045,7 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> /* register a card    ++ajoshi */</div><div class='del'>-static int __init aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long fb_addr, reg_addr;</div><div class='ctx'> 	struct aty128fb_par *par;</div><div class='hunk'>@@ -1981,6 +2172,10 @@ static void __devexit aty128_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	par = info-&gt;par;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='add'>+	aty128_bl_exit(par);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	unregister_framebuffer(info);</div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='ctx'> 	if (par-&gt;mtrr.vram_valid)</div><div class='hunk'>@@ -2011,10 +2206,10 @@ static int aty128fb_blank(int blank, struct fb_info *fb)</div><div class='ctx'> 	if (par-&gt;lock_blank || par-&gt;asleep)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='ctx'> 	if (machine_is(powermac) &amp;&amp; blank)</div><div class='del'>-		set_backlight_enable(0);</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+		aty128_bl_set_power(fb, FB_BLANK_POWERDOWN);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (blank &amp; FB_BLANK_VSYNC_SUSPEND)</div><div class='ctx'> 		state |= 2;</div><div class='hunk'>@@ -2029,10 +2224,12 @@ static int aty128fb_blank(int blank, struct fb_info *fb)</div><div class='ctx'> 		aty128_set_crt_enable(par, par-&gt;crt_on &amp;&amp; !blank);</div><div class='ctx'> 		aty128_set_lcd_enable(par, par-&gt;lcd_on &amp;&amp; !blank);</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_FB_ATY128_BACKLIGHT</div><div class='ctx'> 	if (machine_is(powermac) &amp;&amp; !blank)</div><div class='del'>-		set_backlight_enable(1);</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+		aty128_bl_set_power(fb, FB_BLANK_UNBLANK);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2138,73 +2335,6 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static int backlight_conv[] = {</div><div class='del'>-	0xff, 0xc0, 0xb5, 0xaa, 0x9f, 0x94, 0x89, 0x7e,</div><div class='del'>-	0x73, 0x68, 0x5d, 0x52, 0x47, 0x3c, 0x31, 0x24</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* We turn off the LCD completely instead of just dimming the backlight.</div><div class='del'>- * This provides greater power saving and the display is useless without</div><div class='del'>- * backlight anyway</div><div class='del'>- */</div><div class='del'>-#define BACKLIGHT_LVDS_OFF</div><div class='del'>-/* That one prevents proper CRT output with LCD off */</div><div class='del'>-#undef BACKLIGHT_DAC_OFF</div><div class='del'>-</div><div class='del'>-static int aty128_set_backlight_enable(int on, int level, void *data)</div><div class='del'>-{</div><div class='del'>-	struct aty128fb_par *par = data;</div><div class='del'>-	unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);</div><div class='del'>-</div><div class='del'>-	if (!par-&gt;lcd_on)</div><div class='del'>-		on = 0;</div><div class='del'>-	reg |= LVDS_BL_MOD_EN | LVDS_BLON;</div><div class='del'>-	if (on &amp;&amp; level &gt; BACKLIGHT_OFF) {</div><div class='del'>-		reg |= LVDS_DIGION;</div><div class='del'>-		if (!(reg &amp; LVDS_ON)) {</div><div class='del'>-			reg &amp;= ~LVDS_BLON;</div><div class='del'>-			aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='del'>-			(void)aty_ld_le32(LVDS_GEN_CNTL);</div><div class='del'>-			mdelay(10);</div><div class='del'>-			reg |= LVDS_BLON;</div><div class='del'>-			aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='del'>-		}</div><div class='del'>-		reg &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='del'>-		reg |= (backlight_conv[level] &lt;&lt; LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='del'>-#ifdef BACKLIGHT_LVDS_OFF</div><div class='del'>-		reg |= LVDS_ON | LVDS_EN;</div><div class='del'>-		reg &amp;= ~LVDS_DISPLAY_DIS;</div><div class='del'>-#endif</div><div class='del'>-		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='del'>-#ifdef BACKLIGHT_DAC_OFF</div><div class='del'>-		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) &amp; (~DAC_PDWN));</div><div class='del'>-#endif		</div><div class='del'>-	} else {</div><div class='del'>-		reg &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='del'>-		reg |= (backlight_conv[0] &lt;&lt; LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='del'>-#ifdef BACKLIGHT_LVDS_OFF</div><div class='del'>-		reg |= LVDS_DISPLAY_DIS;</div><div class='del'>-		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='del'>-		(void)aty_ld_le32(LVDS_GEN_CNTL);</div><div class='del'>-		udelay(10);</div><div class='del'>-		reg &amp;= ~(LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION);</div><div class='del'>-#endif		</div><div class='del'>-		aty_st_le32(LVDS_GEN_CNTL, reg);</div><div class='del'>-#ifdef BACKLIGHT_DAC_OFF</div><div class='del'>-		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PDWN);</div><div class='del'>-#endif		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aty128_set_backlight_level(int level, void* data)</div><div class='del'>-{</div><div class='del'>-	return aty128_set_backlight_enable(1, level, data);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='ctx'> #if 0</div><div class='ctx'>     /*</div><div class='ctx'>      *  Accelerated functions</div><div class='hunk'>@@ -2428,7 +2558,7 @@ static int aty128_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __init aty128fb_init(void)</div><div class='add'>+static int __devinit aty128fb_init(void)</div><div class='ctx'> {</div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> 	char *option = NULL;</div><div class='head'>diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h<br/>index e9b7a64c1ac4..55fb8b04489b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/atyfb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/atyfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/atyfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/atyfb.h</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'>  *  ATI Frame Buffer Device Driver Core Definitions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'>     /*</div><div class='hunk'>@@ -151,6 +150,7 @@ struct atyfb_par {</div><div class='ctx'> 	int lock_blank;</div><div class='ctx'> 	unsigned long res_start;</div><div class='ctx'> 	unsigned long res_size;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='ctx'> #ifdef __sparc__</div><div class='ctx'> 	struct pci_mmap_map *mmap_map;</div><div class='ctx'> 	u8 mmaped;</div><div class='head'>diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c<br/>index d9d7d3c4cae2..1507d19f481f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/atyfb_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/atyfb_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/atyfb_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/atyfb_base.c</a></div><div class='hunk'>@@ -49,7 +49,6 @@</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -66,6 +65,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -315,12 +315,12 @@ static int vram;</div><div class='ctx'> static int pll;</div><div class='ctx'> static int mclk;</div><div class='ctx'> static int xclk;</div><div class='del'>-static int comp_sync __initdata = -1;</div><div class='add'>+static int comp_sync __devinitdata = -1;</div><div class='ctx'> static char *mode;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC</div><div class='del'>-static int default_vmode __initdata = VMODE_CHOOSE;</div><div class='del'>-static int default_cmode __initdata = CMODE_CHOOSE;</div><div class='add'>+static int default_vmode __devinitdata = VMODE_CHOOSE;</div><div class='add'>+static int default_cmode __devinitdata = CMODE_CHOOSE;</div><div class='ctx'> </div><div class='ctx'> module_param_named(vmode, default_vmode, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(vmode, "int: video mode for mac");</div><div class='hunk'>@@ -329,10 +329,10 @@ MODULE_PARM_DESC(cmode, "int: color mode for mac");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATARI</div><div class='del'>-static unsigned int mach64_count __initdata = 0;</div><div class='del'>-static unsigned long phys_vmembase[FB_MAX] __initdata = { 0, };</div><div class='del'>-static unsigned long phys_size[FB_MAX] __initdata = { 0, };</div><div class='del'>-static unsigned long phys_guiregbase[FB_MAX] __initdata = { 0, };</div><div class='add'>+static unsigned int mach64_count __devinitdata = 0;</div><div class='add'>+static unsigned long phys_vmembase[FB_MAX] __devinitdata = { 0, };</div><div class='add'>+static unsigned long phys_size[FB_MAX] __devinitdata = { 0, };</div><div class='add'>+static unsigned long phys_guiregbase[FB_MAX] __devinitdata = { 0, };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* top -&gt; down is an evolution of mach64 chipset, any corrections? */</div><div class='hunk'>@@ -582,7 +582,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var, struct atyfb_par *p</div><div class='ctx'>  *  Apple monitor sense</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __init read_aty_sense(const struct atyfb_par *par)</div><div class='add'>+static int __devinit read_aty_sense(const struct atyfb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	int sense, i;</div><div class='ctx'> </div><div class='hunk'>@@ -1280,6 +1280,14 @@ static int atyfb_set_par(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 	par-&gt;accel_flags = var-&gt;accel_flags; /* hack */</div><div class='ctx'> </div><div class='add'>+	if (var-&gt;accel_flags) {</div><div class='add'>+		info-&gt;fbops-&gt;fb_sync = atyfb_sync;</div><div class='add'>+		info-&gt;flags &amp;= ~FBINFO_HWACCEL_DISABLED;</div><div class='add'>+	} else {</div><div class='add'>+		info-&gt;fbops-&gt;fb_sync = NULL;</div><div class='add'>+		info-&gt;flags |= FBINFO_HWACCEL_DISABLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (par-&gt;blitter_may_be_busy)</div><div class='ctx'> 		wait_for_idle(par);</div><div class='ctx'> </div><div class='hunk'>@@ -1559,7 +1567,7 @@ static int aty_enable_irq(struct atyfb_par *par, int reenable)</div><div class='ctx'> 	u32 int_cntl;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_set_bit(0, &amp;par-&gt;irq_flags)) {</div><div class='del'>-		if (request_irq(par-&gt;irq, aty_irq, SA_SHIRQ, "atyfb", par)) {</div><div class='add'>+		if (request_irq(par-&gt;irq, aty_irq, IRQF_SHARED, "atyfb", par)) {</div><div class='ctx'> 			clear_bit(0, &amp;par-&gt;irq_flags);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2115,47 +2123,167 @@ static int atyfb_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> #endif /*  defined(CONFIG_PM) &amp;&amp; defined(CONFIG_PCI) */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+/* Backlight */</div><div class='add'>+#ifdef CONFIG_FB_ATY_BACKLIGHT</div><div class='add'>+#define MAX_LEVEL 0xFF</div><div class='ctx'> </div><div class='del'>-    /*</div><div class='del'>-     *   LCD backlight control</div><div class='del'>-     */</div><div class='add'>+static struct backlight_properties aty_bl_data;</div><div class='ctx'> </div><div class='del'>-static int backlight_conv[] = {</div><div class='del'>-	0x00, 0x3f, 0x4c, 0x59, 0x66, 0x73, 0x80, 0x8d,</div><div class='del'>-	0x9a, 0xa7, 0xb4, 0xc1, 0xcf, 0xdc, 0xe9, 0xff</div><div class='del'>-};</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	int atylevel;</div><div class='add'>+</div><div class='add'>+	/* Get and convert the value */</div><div class='add'>+	atylevel = info-&gt;bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL;</div><div class='ctx'> </div><div class='del'>-static int aty_set_backlight_enable(int on, int level, void *data)</div><div class='add'>+	if (atylevel &lt; 0)</div><div class='add'>+		atylevel = 0;</div><div class='add'>+	else if (atylevel &gt; MAX_LEVEL)</div><div class='add'>+		atylevel = MAX_LEVEL;</div><div class='add'>+</div><div class='add'>+	return atylevel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int __aty_bl_update_status(struct backlight_device *bd)</div><div class='ctx'> {</div><div class='del'>-	struct fb_info *info = (struct fb_info *) data;</div><div class='del'>-	struct atyfb_par *par = (struct atyfb_par *) info-&gt;par;</div><div class='add'>+	struct atyfb_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='ctx'> 	unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		level = 0;</div><div class='add'>+	else</div><div class='add'>+		level = bd-&gt;props-&gt;brightness;</div><div class='ctx'> </div><div class='ctx'> 	reg |= (BLMOD_EN | BIASMOD_EN);</div><div class='del'>-	if (on &amp;&amp; level &gt; BACKLIGHT_OFF) {</div><div class='add'>+	if (level &gt; 0) {</div><div class='ctx'> 		reg &amp;= ~BIAS_MOD_LEVEL_MASK;</div><div class='del'>-		reg |= (backlight_conv[level] &lt;&lt; BIAS_MOD_LEVEL_SHIFT);</div><div class='add'>+		reg |= (aty_bl_get_level_brightness(par, level) &lt;&lt; BIAS_MOD_LEVEL_SHIFT);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		reg &amp;= ~BIAS_MOD_LEVEL_MASK;</div><div class='del'>-		reg |= (backlight_conv[0] &lt;&lt; BIAS_MOD_LEVEL_SHIFT);</div><div class='add'>+		reg |= (aty_bl_get_level_brightness(par, 0) &lt;&lt; BIAS_MOD_LEVEL_SHIFT);</div><div class='ctx'> 	}</div><div class='ctx'> 	aty_st_lcd(LCD_MISC_CNTL, reg, par);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aty_set_backlight_level(int level, void *data)</div><div class='add'>+static int aty_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct atyfb_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	ret = __aty_bl_update_status(bd);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aty_bl_get_brightness(struct backlight_device *bd)</div><div class='ctx'> {</div><div class='del'>-	return aty_set_backlight_enable(1, level, data);</div><div class='add'>+	return bd-&gt;props-&gt;brightness;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct backlight_controller aty_backlight_controller = {</div><div class='del'>-	aty_set_backlight_enable,</div><div class='del'>-	aty_set_backlight_level</div><div class='add'>+static struct backlight_properties aty_bl_data = {</div><div class='add'>+	.owner	  = THIS_MODULE,</div><div class='add'>+	.get_brightness = aty_bl_get_brightness,</div><div class='add'>+	.update_status	= aty_bl_update_status,</div><div class='add'>+	.max_brightness = (FB_BACKLIGHT_LEVELS - 1),</div><div class='ctx'> };</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='ctx'> </div><div class='del'>-static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk)</div><div class='add'>+static void aty_bl_set_power(struct fb_info *info, int power)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	up(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	info-&gt;bl_dev-&gt;props-&gt;power = power;</div><div class='add'>+	__aty_bl_update_status(info-&gt;bl_dev);</div><div class='add'>+	down(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aty_bl_init(struct atyfb_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	struct backlight_device *bd;</div><div class='add'>+	char name[12];</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	if (!pmac_has_backlight_type("ati"))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "atybl%d", info-&gt;node);</div><div class='add'>+</div><div class='add'>+	bd = backlight_device_register(name, par, &amp;aty_bl_data);</div><div class='add'>+	if (IS_ERR(bd)) {</div><div class='add'>+		info-&gt;bl_dev = NULL;</div><div class='add'>+		printk("aty: Backlight registration failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	info-&gt;bl_dev = bd;</div><div class='add'>+	fb_bl_default_curve(info, 0,</div><div class='add'>+		0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,</div><div class='add'>+		0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	up(&amp;bd-&gt;sem);</div><div class='add'>+	bd-&gt;props-&gt;brightness = aty_bl_data.max_brightness;</div><div class='add'>+	bd-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props-&gt;update_status(bd);</div><div class='add'>+	down(&amp;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (!pmac_backlight)</div><div class='add'>+		pmac_backlight = bd;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("aty: Backlight initialized (%s)\n", name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aty_bl_exit(struct atyfb_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	if (info-&gt;bl_dev) {</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+		if (pmac_backlight == info-&gt;bl_dev)</div><div class='add'>+			pmac_backlight = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		backlight_device_unregister(info-&gt;bl_dev);</div><div class='add'>+</div><div class='add'>+		printk("aty: Backlight unloaded\n");</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_FB_ATY_BACKLIGHT */</div><div class='add'>+</div><div class='add'>+static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk)</div><div class='ctx'> {</div><div class='ctx'> 	const int ragepro_tbl[] = {</div><div class='ctx'> 		44, 50, 55, 66, 75, 80, 100</div><div class='hunk'>@@ -2215,7 +2343,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,</div><div class='ctx'> }</div><div class='ctx'> #endif /* defined(__i386__) &amp;&amp; defined(CONFIG_FB_ATY_GENERIC_LCD) */</div><div class='ctx'> </div><div class='del'>-static int __init aty_init(struct fb_info *info, const char *name)</div><div class='add'>+static int __devinit aty_init(struct fb_info *info, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct atyfb_par *par = (struct atyfb_par *) info-&gt;par;</div><div class='ctx'> 	const char *ramname = NULL, *xtal;</div><div class='hunk'>@@ -2296,12 +2424,15 @@ static int __init aty_init(struct fb_info *info, const char *name)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		switch (clk_type) {</div><div class='add'>+#ifdef CONFIG_ATARI</div><div class='ctx'> 		case CLK_ATI18818_1:</div><div class='ctx'> 			par-&gt;pll_ops = &amp;aty_pll_ati18818_1;</div><div class='ctx'> 			break;</div><div class='add'>+#else</div><div class='ctx'> 		case CLK_IBMRGB514:</div><div class='ctx'> 			par-&gt;pll_ops = &amp;aty_pll_ibm514;</div><div class='ctx'> 			break;</div><div class='add'>+#endif</div><div class='ctx'> #if 0 /* dead code */</div><div class='ctx'> 		case CLK_STG1703:</div><div class='ctx'> 			par-&gt;pll_ops = &amp;aty_pll_stg1703;</div><div class='hunk'>@@ -2506,16 +2637,24 @@ static int __init aty_init(struct fb_info *info, const char *name)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fbops = &amp;atyfb_ops;</div><div class='ctx'> 	info-&gt;pseudo_palette = pseudo_palette;</div><div class='del'>-	info-&gt;flags = FBINFO_FLAG_DEFAULT;</div><div class='add'>+	info-&gt;flags = FBINFO_DEFAULT           |</div><div class='add'>+	              FBINFO_HWACCEL_IMAGEBLIT |</div><div class='add'>+	              FBINFO_HWACCEL_FILLRECT  |</div><div class='add'>+	              FBINFO_HWACCEL_COPYAREA  |</div><div class='add'>+	              FBINFO_HWACCEL_YPAN;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='ctx'> 	if (M64_HAS(G3_PB_1_1) &amp;&amp; machine_is_compatible("PowerBook1,1")) {</div><div class='ctx'> 		/* these bits let the 101 powerbook wake up from sleep -- paulus */</div><div class='ctx'> 		aty_st_lcd(POWER_MANAGEMENT, aty_ld_lcd(POWER_MANAGEMENT, par)</div><div class='ctx'> 			   | (USE_F32KHZ | TRISTATE_MEM_EN), par);</div><div class='del'>-	} else if (M64_HAS(MOBIL_BUS))</div><div class='del'>-		register_backlight_controller(&amp;aty_backlight_controller, info, "ati");</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+	} else</div><div class='add'>+#endif</div><div class='add'>+	if (M64_HAS(MOBIL_BUS)) {</div><div class='add'>+#ifdef CONFIG_FB_ATY_BACKLIGHT</div><div class='add'>+		aty_bl_init (par);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;var, 0, sizeof(var));</div><div class='ctx'> #ifdef CONFIG_PPC</div><div class='hunk'>@@ -2631,7 +2770,7 @@ aty_init_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ATARI</div><div class='del'>-static int __init store_video_par(char *video_str, unsigned char m64_num)</div><div class='add'>+static int __devinit store_video_par(char *video_str, unsigned char m64_num)</div><div class='ctx'> {</div><div class='ctx'> 	char *p;</div><div class='ctx'> 	unsigned long vmembase, size, guiregbase;</div><div class='hunk'>@@ -2675,7 +2814,7 @@ static int atyfb_blank(int blank, struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='ctx'> 	if (machine_is(powermac) &amp;&amp; blank &gt; FB_BLANK_NORMAL)</div><div class='del'>-		set_backlight_enable(0);</div><div class='add'>+		aty_bl_set_power(info, FB_BLANK_POWERDOWN);</div><div class='ctx'> #elif defined(CONFIG_FB_ATY_GENERIC_LCD)</div><div class='ctx'> 	if (par-&gt;lcd_table &amp;&amp; blank &gt; FB_BLANK_NORMAL &amp;&amp;</div><div class='ctx'> 	    (aty_ld_lcd(LCD_GEN_CNTL, par) &amp; LCD_ON)) {</div><div class='hunk'>@@ -2707,7 +2846,7 @@ static int atyfb_blank(int blank, struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='ctx'> 	if (machine_is(powermac) &amp;&amp; blank &lt;= FB_BLANK_NORMAL)</div><div class='del'>-		set_backlight_enable(1);</div><div class='add'>+		aty_bl_set_power(info, FB_BLANK_UNBLANK);</div><div class='ctx'> #elif defined(CONFIG_FB_ATY_GENERIC_LCD)</div><div class='ctx'> 	if (par-&gt;lcd_table &amp;&amp; blank &lt;= FB_BLANK_NORMAL &amp;&amp;</div><div class='ctx'> 	    (aty_ld_lcd(LCD_GEN_CNTL, par) &amp; LCD_ON)) {</div><div class='hunk'>@@ -2966,7 +3105,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pcp = pdev-&gt;sysdata;</div><div class='del'>-	if (node == pcp-&gt;prom_node) {</div><div class='add'>+	if (node == pcp-&gt;prom_node-&gt;node) {</div><div class='ctx'> 		struct fb_var_screeninfo *var = &amp;default_var;</div><div class='ctx'> 		unsigned int N, P, Q, M, T, R;</div><div class='ctx'> 		u32 v_total, h_total;</div><div class='hunk'>@@ -3440,6 +3579,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi</div><div class='ctx'> 	par-&gt;res_start = res_start;</div><div class='ctx'> 	par-&gt;res_size = res_size;</div><div class='ctx'> 	par-&gt;irq = pdev-&gt;irq;</div><div class='add'>+	par-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='ctx'> 	/* Setup "info" structure */</div><div class='ctx'> #ifdef __sparc__</div><div class='hunk'>@@ -3571,6 +3711,11 @@ static void __devexit atyfb_remove(struct fb_info *info)</div><div class='ctx'> 	aty_set_crtc(par, &amp;saved_crtc);</div><div class='ctx'> 	par-&gt;pll_ops-&gt;set_pll(info, &amp;saved_pll);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_ATY_BACKLIGHT</div><div class='add'>+	if (M64_HAS(MOBIL_BUS))</div><div class='add'>+		aty_bl_exit(par);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	unregister_framebuffer(info);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='hunk'>@@ -3640,7 +3785,7 @@ static struct pci_driver atyfb_driver = {</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='del'>-static int __init atyfb_setup(char *options)</div><div class='add'>+static int __devinit atyfb_setup(char *options)</div><div class='ctx'> {</div><div class='ctx'> 	char *this_opt;</div><div class='ctx'> </div><div class='hunk'>@@ -3712,7 +3857,7 @@ static int __init atyfb_setup(char *options)</div><div class='ctx'> }</div><div class='ctx'> #endif  /*  MODULE  */</div><div class='ctx'> </div><div class='del'>-static int __init atyfb_init(void)</div><div class='add'>+static int __devinit atyfb_init(void)</div><div class='ctx'> {</div><div class='ctx'> #ifndef MODULE</div><div class='ctx'>     char *option = NULL;</div><div class='hunk'>@@ -3722,7 +3867,9 @@ static int __init atyfb_init(void)</div><div class='ctx'>     atyfb_setup(option);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PCI</div><div class='ctx'>     pci_register_driver(&amp;atyfb_driver);</div><div class='add'>+#endif</div><div class='ctx'> #ifdef CONFIG_ATARI</div><div class='ctx'>     atyfb_atari_probe();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3731,7 +3878,9 @@ static int __init atyfb_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit atyfb_exit(void)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='ctx'> 	pci_unregister_driver(&amp;atyfb_driver);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(atyfb_init);</div><div class='head'>diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c<br/>index c98f4a442134..1490e5e1c232 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/mach64_accel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/mach64_accel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/mach64_accel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/mach64_accel.c</a></div><div class='hunk'>@@ -200,8 +200,6 @@ void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)</div><div class='ctx'> 	if (!area-&gt;width || !area-&gt;height)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!par-&gt;accel_flags) {</div><div class='del'>-		if (par-&gt;blitter_may_be_busy)</div><div class='del'>-			wait_for_idle(par);</div><div class='ctx'> 		cfb_copyarea(info, area);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -248,8 +246,6 @@ void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)</div><div class='ctx'> 	if (!rect-&gt;width || !rect-&gt;height)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!par-&gt;accel_flags) {</div><div class='del'>-		if (par-&gt;blitter_may_be_busy)</div><div class='del'>-			wait_for_idle(par);</div><div class='ctx'> 		cfb_fillrect(info, rect);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -288,14 +284,10 @@ void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (!par-&gt;accel_flags ||</div><div class='ctx'> 	    (image-&gt;depth != 1 &amp;&amp; info-&gt;var.bits_per_pixel != image-&gt;depth)) {</div><div class='del'>-		if (par-&gt;blitter_may_be_busy)</div><div class='del'>-			wait_for_idle(par);</div><div class='del'>-</div><div class='ctx'> 		cfb_imageblit(info, image);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wait_for_idle(par);</div><div class='ctx'> 	pix_width = pix_width_save = aty_ld_le32(DP_PIX_WIDTH, par);</div><div class='ctx'> 	host_cntl = aty_ld_le32(HOST_CNTL, par) | HOST_BYTE_ALIGN;</div><div class='ctx'> </div><div class='hunk'>@@ -425,8 +417,6 @@ void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wait_for_idle(par);</div><div class='del'>-</div><div class='ctx'> 	/* restore pix_width */</div><div class='ctx'> 	wait_for_fifo(1, par);</div><div class='ctx'> 	aty_st_le32(DP_PIX_WIDTH, pix_width_save, par);</div><div class='head'>diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c<br/>index ad8b7496f853..2a7f381c330f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/mach64_cursor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/mach64_cursor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/mach64_cursor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/mach64_cursor.c</a></div><div class='hunk'>@@ -66,11 +66,6 @@ static const u8 cursor_bits_lookup[16] = {</div><div class='ctx'> 	0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u8 cursor_mask_lookup[16] = {</div><div class='del'>-	0xaa, 0x2a, 0x8a, 0x0a, 0xa2, 0x22, 0x82, 0x02,</div><div class='del'>-	0xa8, 0x28, 0x88, 0x08, 0xa0, 0x20, 0x80, 0x00</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='ctx'> {</div><div class='ctx'> 	struct atyfb_par *par = (struct atyfb_par *) info-&gt;par;</div><div class='hunk'>@@ -130,13 +125,13 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='ctx'> 		fg_idx = cursor-&gt;image.fg_color;</div><div class='ctx'> 		bg_idx = cursor-&gt;image.bg_color;</div><div class='ctx'> </div><div class='del'>-		fg = (info-&gt;cmap.red[fg_idx] &lt;&lt; 24) |</div><div class='del'>-		     (info-&gt;cmap.green[fg_idx] &lt;&lt; 16) |</div><div class='del'>-		     (info-&gt;cmap.blue[fg_idx] &lt;&lt; 8) | 15;</div><div class='add'>+		fg = ((info-&gt;cmap.red[fg_idx] &amp; 0xff) &lt;&lt; 24) |</div><div class='add'>+		     ((info-&gt;cmap.green[fg_idx] &amp; 0xff) &lt;&lt; 16) |</div><div class='add'>+		     ((info-&gt;cmap.blue[fg_idx] &amp; 0xff) &lt;&lt; 8) | 0xff;</div><div class='ctx'> </div><div class='del'>-		bg = (info-&gt;cmap.red[bg_idx] &lt;&lt; 24) |</div><div class='del'>-		     (info-&gt;cmap.green[bg_idx] &lt;&lt; 16) |</div><div class='del'>-		     (info-&gt;cmap.blue[bg_idx] &lt;&lt; 8);</div><div class='add'>+		bg = ((info-&gt;cmap.red[bg_idx] &amp; 0xff) &lt;&lt; 24) |</div><div class='add'>+		     ((info-&gt;cmap.green[bg_idx] &amp; 0xff) &lt;&lt; 16) |</div><div class='add'>+		     ((info-&gt;cmap.blue[bg_idx] &amp; 0xff) &lt;&lt; 8);</div><div class='ctx'> </div><div class='ctx'> 		wait_for_fifo(2, par);</div><div class='ctx'> 		aty_st_le32(CUR_CLR0, bg, par);</div><div class='hunk'>@@ -166,19 +161,17 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='ctx'> 			switch (cursor-&gt;rop) {</div><div class='ctx'> 			case ROP_XOR:</div><div class='ctx'> 			    // Upper 4 bits of mask data</div><div class='del'>-			    fb_writeb(cursor_mask_lookup[m &gt;&gt; 4 ] |</div><div class='del'>-				cursor_bits_lookup[(b ^ m) &gt;&gt; 4], dst++);</div><div class='add'>+			    fb_writeb(cursor_bits_lookup[(b ^ m) &gt;&gt; 4], dst++);</div><div class='ctx'> 			    // Lower 4 bits of mask</div><div class='del'>-			    fb_writeb(cursor_mask_lookup[m &amp; 0x0f ] |</div><div class='del'>-				cursor_bits_lookup[(b ^ m) &amp; 0x0f], dst++);</div><div class='add'>+			    fb_writeb(cursor_bits_lookup[(b ^ m) &amp; 0x0f],</div><div class='add'>+				      dst++);</div><div class='ctx'> 			    break;</div><div class='ctx'> 			case ROP_COPY:</div><div class='ctx'> 			    // Upper 4 bits of mask data</div><div class='del'>-			    fb_writeb(cursor_mask_lookup[m &gt;&gt; 4 ] |</div><div class='del'>-				cursor_bits_lookup[(b &amp; m) &gt;&gt; 4], dst++);</div><div class='add'>+			    fb_writeb(cursor_bits_lookup[(b &amp; m) &gt;&gt; 4], dst++);</div><div class='ctx'> 			    // Lower 4 bits of mask</div><div class='del'>-			    fb_writeb(cursor_mask_lookup[m &amp; 0x0f ] |</div><div class='del'>-				cursor_bits_lookup[(b &amp; m) &amp; 0x0f], dst++);</div><div class='add'>+			    fb_writeb(cursor_bits_lookup[(b &amp; m) &amp; 0x0f],</div><div class='add'>+				      dst++);</div><div class='ctx'> 			    break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -194,7 +187,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init aty_init_cursor(struct fb_info *info)</div><div class='add'>+int __devinit aty_init_cursor(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long addr;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c<br/>new file mode 100644<br/>index 000000000000..1755dddf1899<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/radeon_backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/radeon_backlight.c</a></div><div class='hunk'>@@ -0,0 +1,247 @@</div><div class='add'>+/*</div><div class='add'>+ * Backlight code for ATI Radeon based graphic cards</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2000 Ani Joshi &lt;ajoshi@kernel.crashing.org&gt;</div><div class='add'>+ * Copyright (c) 2003 Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;</div><div class='add'>+ * Copyright (c) 2006 Michael Hanselmann &lt;linux-kernel@hansmi.ch&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "radeonfb.h"</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+#include &lt;asm/backlight.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define MAX_RADEON_LEVEL 0xFF</div><div class='add'>+</div><div class='add'>+static struct backlight_properties radeon_bl_data;</div><div class='add'>+</div><div class='add'>+struct radeon_bl_privdata {</div><div class='add'>+	struct radeonfb_info *rinfo;</div><div class='add'>+	uint8_t negative;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int radeon_bl_get_level_brightness(struct radeon_bl_privdata *pdata,</div><div class='add'>+		int level)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pdata-&gt;rinfo-&gt;info;</div><div class='add'>+	int rlevel;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	/* Get and convert the value */</div><div class='add'>+	rlevel = pdata-&gt;rinfo-&gt;info-&gt;bl_curve[level] *</div><div class='add'>+		 FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	if (rlevel &lt; 0)</div><div class='add'>+		rlevel = 0;</div><div class='add'>+	else if (rlevel &gt; MAX_RADEON_LEVEL)</div><div class='add'>+		rlevel = MAX_RADEON_LEVEL;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;negative)</div><div class='add'>+		rlevel = MAX_RADEON_LEVEL - rlevel;</div><div class='add'>+</div><div class='add'>+	return rlevel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int radeon_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct radeon_bl_privdata *pdata = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	struct radeonfb_info *rinfo = pdata-&gt;rinfo;</div><div class='add'>+	u32 lvds_gen_cntl, tmpPixclksCntl;</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (rinfo-&gt;mon1_type != MT_LCD)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* We turn off the LCD completely instead of just dimming the</div><div class='add'>+	 * backlight. This provides some greater power saving and the display</div><div class='add'>+	 * is useless without backlight anyway.</div><div class='add'>+	 */</div><div class='add'>+        if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		level = 0;</div><div class='add'>+	else</div><div class='add'>+		level = bd-&gt;props-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	del_timer_sync(&amp;rinfo-&gt;lvds_timer);</div><div class='add'>+	radeon_engine_idle();</div><div class='add'>+</div><div class='add'>+	lvds_gen_cntl = INREG(LVDS_GEN_CNTL);</div><div class='add'>+	if (level &gt; 0) {</div><div class='add'>+		lvds_gen_cntl &amp;= ~LVDS_DISPLAY_DIS;</div><div class='add'>+		if (!(lvds_gen_cntl &amp; LVDS_BLON) || !(lvds_gen_cntl &amp; LVDS_ON)) {</div><div class='add'>+			lvds_gen_cntl |= (rinfo-&gt;init_state.lvds_gen_cntl &amp; LVDS_DIGON);</div><div class='add'>+			lvds_gen_cntl |= LVDS_BLON | LVDS_EN;</div><div class='add'>+			OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='add'>+			lvds_gen_cntl &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='add'>+			lvds_gen_cntl |=</div><div class='add'>+				(radeon_bl_get_level_brightness(pdata, level) &lt;&lt;</div><div class='add'>+				 LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='add'>+			lvds_gen_cntl |= LVDS_ON;</div><div class='add'>+			lvds_gen_cntl |= (rinfo-&gt;init_state.lvds_gen_cntl &amp; LVDS_BL_MOD_EN);</div><div class='add'>+			rinfo-&gt;pending_lvds_gen_cntl = lvds_gen_cntl;</div><div class='add'>+			mod_timer(&amp;rinfo-&gt;lvds_timer,</div><div class='add'>+				  jiffies + msecs_to_jiffies(rinfo-&gt;panel_info.pwr_delay));</div><div class='add'>+		} else {</div><div class='add'>+			lvds_gen_cntl &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='add'>+			lvds_gen_cntl |=</div><div class='add'>+				(radeon_bl_get_level_brightness(pdata, level) &lt;&lt;</div><div class='add'>+				 LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='add'>+			OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='add'>+		}</div><div class='add'>+		rinfo-&gt;init_state.lvds_gen_cntl &amp;= ~LVDS_STATE_MASK;</div><div class='add'>+		rinfo-&gt;init_state.lvds_gen_cntl |= rinfo-&gt;pending_lvds_gen_cntl</div><div class='add'>+			&amp; LVDS_STATE_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		/* Asic bug, when turning off LVDS_ON, we have to make sure</div><div class='add'>+		   RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off</div><div class='add'>+		*/</div><div class='add'>+		tmpPixclksCntl = INPLL(PIXCLKS_CNTL);</div><div class='add'>+		if (rinfo-&gt;is_mobility || rinfo-&gt;is_IGP)</div><div class='add'>+			OUTPLLP(PIXCLKS_CNTL, 0, ~PIXCLK_LVDS_ALWAYS_ONb);</div><div class='add'>+		lvds_gen_cntl &amp;= ~(LVDS_BL_MOD_LEVEL_MASK | LVDS_BL_MOD_EN);</div><div class='add'>+		lvds_gen_cntl |= (radeon_bl_get_level_brightness(pdata, 0) &lt;&lt;</div><div class='add'>+				  LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='add'>+		lvds_gen_cntl |= LVDS_DISPLAY_DIS;</div><div class='add'>+		OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='add'>+		udelay(100);</div><div class='add'>+		lvds_gen_cntl &amp;= ~(LVDS_ON | LVDS_EN);</div><div class='add'>+		OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='add'>+		lvds_gen_cntl &amp;= ~(LVDS_DIGON);</div><div class='add'>+		rinfo-&gt;pending_lvds_gen_cntl = lvds_gen_cntl;</div><div class='add'>+		mod_timer(&amp;rinfo-&gt;lvds_timer,</div><div class='add'>+			  jiffies + msecs_to_jiffies(rinfo-&gt;panel_info.pwr_delay));</div><div class='add'>+		if (rinfo-&gt;is_mobility || rinfo-&gt;is_IGP)</div><div class='add'>+			OUTPLL(PIXCLKS_CNTL, tmpPixclksCntl);</div><div class='add'>+	}</div><div class='add'>+	rinfo-&gt;init_state.lvds_gen_cntl &amp;= ~LVDS_STATE_MASK;</div><div class='add'>+	rinfo-&gt;init_state.lvds_gen_cntl |= (lvds_gen_cntl &amp; LVDS_STATE_MASK);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int radeon_bl_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;props-&gt;brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties radeon_bl_data = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.get_brightness = radeon_bl_get_brightness,</div><div class='add'>+	.update_status	= radeon_bl_update_status,</div><div class='add'>+	.max_brightness = (FB_BACKLIGHT_LEVELS - 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void radeonfb_bl_init(struct radeonfb_info *rinfo)</div><div class='add'>+{</div><div class='add'>+	struct backlight_device *bd;</div><div class='add'>+	struct radeon_bl_privdata *pdata;</div><div class='add'>+	char name[12];</div><div class='add'>+</div><div class='add'>+	if (rinfo-&gt;mon1_type != MT_LCD)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	if (!pmac_has_backlight_type("ati") &amp;&amp;</div><div class='add'>+	    !pmac_has_backlight_type("mnca"))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	pdata = kmalloc(sizeof(struct radeon_bl_privdata), GFP_KERNEL);</div><div class='add'>+	if (!pdata) {</div><div class='add'>+		printk("radeonfb: Memory allocation failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "radeonbl%d", rinfo-&gt;info-&gt;node);</div><div class='add'>+</div><div class='add'>+	bd = backlight_device_register(name, pdata, &amp;radeon_bl_data);</div><div class='add'>+	if (IS_ERR(bd)) {</div><div class='add'>+		rinfo-&gt;info-&gt;bl_dev = NULL;</div><div class='add'>+		printk("radeonfb: Backlight registration failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdata-&gt;rinfo = rinfo;</div><div class='add'>+</div><div class='add'>+	/* Pardon me for that hack... maybe some day we can figure out in what</div><div class='add'>+	 * direction backlight should work on a given panel?</div><div class='add'>+	 */</div><div class='add'>+	pdata-&gt;negative =</div><div class='add'>+		(rinfo-&gt;family != CHIP_FAMILY_RV200 &amp;&amp;</div><div class='add'>+		 rinfo-&gt;family != CHIP_FAMILY_RV250 &amp;&amp;</div><div class='add'>+		 rinfo-&gt;family != CHIP_FAMILY_RV280 &amp;&amp;</div><div class='add'>+		 rinfo-&gt;family != CHIP_FAMILY_RV350);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	pdata-&gt;negative = pdata-&gt;negative ||</div><div class='add'>+		machine_is_compatible("PowerBook4,3") ||</div><div class='add'>+		machine_is_compatible("PowerBook6,3") ||</div><div class='add'>+		machine_is_compatible("PowerBook6,5");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rinfo-&gt;info-&gt;bl_mutex);</div><div class='add'>+	rinfo-&gt;info-&gt;bl_dev = bd;</div><div class='add'>+	fb_bl_default_curve(rinfo-&gt;info, 0,</div><div class='add'>+		 63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL,</div><div class='add'>+		217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);</div><div class='add'>+	mutex_unlock(&amp;rinfo-&gt;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	up(&amp;bd-&gt;sem);</div><div class='add'>+	bd-&gt;props-&gt;brightness = radeon_bl_data.max_brightness;</div><div class='add'>+	bd-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props-&gt;update_status(bd);</div><div class='add'>+	down(&amp;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (!pmac_backlight)</div><div class='add'>+		pmac_backlight = bd;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("radeonfb: Backlight initialized (%s)\n", name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(pdata);</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void radeonfb_bl_exit(struct radeonfb_info *rinfo)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;rinfo-&gt;info-&gt;bl_mutex);</div><div class='add'>+	if (rinfo-&gt;info-&gt;bl_dev) {</div><div class='add'>+		struct radeon_bl_privdata *pdata;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+		if (pmac_backlight == rinfo-&gt;info-&gt;bl_dev)</div><div class='add'>+			pmac_backlight = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		pdata = class_get_devdata(&amp;rinfo-&gt;info-&gt;bl_dev-&gt;class_dev);</div><div class='add'>+		backlight_device_unregister(rinfo-&gt;info-&gt;bl_dev);</div><div class='add'>+		kfree(pdata);</div><div class='add'>+		rinfo-&gt;info-&gt;bl_dev = NULL;</div><div class='add'>+</div><div class='add'>+		printk("radeonfb: Backlight unloaded\n");</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;rinfo-&gt;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c<br/>index 387a18a47ac2..8d85fc58142e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/radeon_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeon_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/radeon_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/radeon_base.c</a></div><div class='hunk'>@@ -52,14 +52,12 @@</div><div class='ctx'> </div><div class='ctx'> #define RADEON_VERSION	"0.2.0"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -78,10 +76,6 @@</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #include "../macmodes.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-#include &lt;asm/backlight.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_BOOTX_TEXT</div><div class='ctx'> #include &lt;asm/btext.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -277,20 +271,6 @@ static int nomtrr = 0;</div><div class='ctx'>  * prototypes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC_OF</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static int radeon_set_backlight_enable(int on, int level, void *data);</div><div class='del'>-static int radeon_set_backlight_level(int level, void *data);</div><div class='del'>-static struct backlight_controller radeon_backlight_controller = {</div><div class='del'>-	radeon_set_backlight_enable,</div><div class='del'>-	radeon_set_backlight_level</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PPC_OF */</div><div class='del'>-</div><div class='ctx'> static void radeon_unmap_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!rinfo-&gt;bios_seg)</div><div class='hunk'>@@ -1913,116 +1893,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-</div><div class='del'>-/* TODO: Dbl check these tables, we don't go up to full ON backlight</div><div class='del'>- * in these, possibly because we noticed MacOS doesn't, but I'd prefer</div><div class='del'>- * having some more official numbers from ATI</div><div class='del'>- */</div><div class='del'>-static int backlight_conv_m6[] = {</div><div class='del'>-	0xff, 0xc0, 0xb5, 0xaa, 0x9f, 0x94, 0x89, 0x7e,</div><div class='del'>-	0x73, 0x68, 0x5d, 0x52, 0x47, 0x3c, 0x31, 0x24</div><div class='del'>-};</div><div class='del'>-static int backlight_conv_m7[] = {</div><div class='del'>-	0x00, 0x3f, 0x4a, 0x55, 0x60, 0x6b, 0x76, 0x81,</div><div class='del'>-	0x8c, 0x97, 0xa2, 0xad, 0xb8, 0xc3, 0xce, 0xd9</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BACKLIGHT_LVDS_OFF</div><div class='del'>-#undef BACKLIGHT_DAC_OFF</div><div class='del'>-</div><div class='del'>-/* We turn off the LCD completely instead of just dimming the backlight.</div><div class='del'>- * This provides some greater power saving and the display is useless</div><div class='del'>- * without backlight anyway.</div><div class='del'>- */</div><div class='del'>-static int radeon_set_backlight_enable(int on, int level, void *data)</div><div class='del'>-{</div><div class='del'>-	struct radeonfb_info *rinfo = (struct radeonfb_info *)data;</div><div class='del'>-	u32 lvds_gen_cntl, tmpPixclksCntl;</div><div class='del'>-	int* conv_table;</div><div class='del'>-</div><div class='del'>-	if (rinfo-&gt;mon1_type != MT_LCD)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Pardon me for that hack... maybe some day we can figure</div><div class='del'>-	 * out in what direction backlight should work on a given</div><div class='del'>-	 * panel ?</div><div class='del'>-	 */</div><div class='del'>-	if ((rinfo-&gt;family == CHIP_FAMILY_RV200 ||</div><div class='del'>-	     rinfo-&gt;family == CHIP_FAMILY_RV250 ||</div><div class='del'>-	     rinfo-&gt;family == CHIP_FAMILY_RV280 ||</div><div class='del'>-	     rinfo-&gt;family == CHIP_FAMILY_RV350) &amp;&amp;</div><div class='del'>-	    !machine_is_compatible("PowerBook4,3") &amp;&amp;</div><div class='del'>-	    !machine_is_compatible("PowerBook6,3") &amp;&amp;</div><div class='del'>-	    !machine_is_compatible("PowerBook6,5"))</div><div class='del'>-		conv_table = backlight_conv_m7;</div><div class='del'>-	else</div><div class='del'>-		conv_table = backlight_conv_m6;</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;rinfo-&gt;lvds_timer);</div><div class='del'>-	radeon_engine_idle();</div><div class='del'>-</div><div class='del'>-	lvds_gen_cntl = INREG(LVDS_GEN_CNTL);</div><div class='del'>-	if (on &amp;&amp; (level &gt; BACKLIGHT_OFF)) {</div><div class='del'>-		lvds_gen_cntl &amp;= ~LVDS_DISPLAY_DIS;</div><div class='del'>-		if (!(lvds_gen_cntl &amp; LVDS_BLON) || !(lvds_gen_cntl &amp; LVDS_ON)) {</div><div class='del'>-			lvds_gen_cntl |= (rinfo-&gt;init_state.lvds_gen_cntl &amp; LVDS_DIGON);</div><div class='del'>-			lvds_gen_cntl |= LVDS_BLON | LVDS_EN;</div><div class='del'>-			OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='del'>-			lvds_gen_cntl &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='del'>-			lvds_gen_cntl |= (conv_table[level] &lt;&lt;</div><div class='del'>-					  LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='del'>-			lvds_gen_cntl |= LVDS_ON;</div><div class='del'>-			lvds_gen_cntl |= (rinfo-&gt;init_state.lvds_gen_cntl &amp; LVDS_BL_MOD_EN);</div><div class='del'>-			rinfo-&gt;pending_lvds_gen_cntl = lvds_gen_cntl;</div><div class='del'>-			mod_timer(&amp;rinfo-&gt;lvds_timer,</div><div class='del'>-				  jiffies + msecs_to_jiffies(rinfo-&gt;panel_info.pwr_delay));</div><div class='del'>-		} else {</div><div class='del'>-			lvds_gen_cntl &amp;= ~LVDS_BL_MOD_LEVEL_MASK;</div><div class='del'>-			lvds_gen_cntl |= (conv_table[level] &lt;&lt;</div><div class='del'>-					  LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='del'>-			OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='del'>-		}</div><div class='del'>-		rinfo-&gt;init_state.lvds_gen_cntl &amp;= ~LVDS_STATE_MASK;</div><div class='del'>-		rinfo-&gt;init_state.lvds_gen_cntl |= rinfo-&gt;pending_lvds_gen_cntl</div><div class='del'>-			&amp; LVDS_STATE_MASK;</div><div class='del'>-	} else {</div><div class='del'>-		/* Asic bug, when turning off LVDS_ON, we have to make sure</div><div class='del'>-		   RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off</div><div class='del'>-		*/</div><div class='del'>-		tmpPixclksCntl = INPLL(PIXCLKS_CNTL);</div><div class='del'>-		if (rinfo-&gt;is_mobility || rinfo-&gt;is_IGP)</div><div class='del'>-			OUTPLLP(PIXCLKS_CNTL, 0, ~PIXCLK_LVDS_ALWAYS_ONb);</div><div class='del'>-		lvds_gen_cntl &amp;= ~(LVDS_BL_MOD_LEVEL_MASK | LVDS_BL_MOD_EN);</div><div class='del'>-		lvds_gen_cntl |= (conv_table[0] &lt;&lt;</div><div class='del'>-				  LVDS_BL_MOD_LEVEL_SHIFT);</div><div class='del'>-		lvds_gen_cntl |= LVDS_DISPLAY_DIS;</div><div class='del'>-		OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='del'>-		udelay(100);</div><div class='del'>-		lvds_gen_cntl &amp;= ~(LVDS_ON | LVDS_EN);</div><div class='del'>-		OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);</div><div class='del'>-		lvds_gen_cntl &amp;= ~(LVDS_DIGON);</div><div class='del'>-		rinfo-&gt;pending_lvds_gen_cntl = lvds_gen_cntl;</div><div class='del'>-		mod_timer(&amp;rinfo-&gt;lvds_timer,</div><div class='del'>-			  jiffies + msecs_to_jiffies(rinfo-&gt;panel_info.pwr_delay));</div><div class='del'>-		if (rinfo-&gt;is_mobility || rinfo-&gt;is_IGP)</div><div class='del'>-			OUTPLL(PIXCLKS_CNTL, tmpPixclksCntl);</div><div class='del'>-	}</div><div class='del'>-	rinfo-&gt;init_state.lvds_gen_cntl &amp;= ~LVDS_STATE_MASK;</div><div class='del'>-	rinfo-&gt;init_state.lvds_gen_cntl |= (lvds_gen_cntl &amp; LVDS_STATE_MASK);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int radeon_set_backlight_level(int level, void *data)</div><div class='del'>-{</div><div class='del'>-	return radeon_set_backlight_enable(1, level, data);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * This reconfigure the card's internal memory map. In theory, we'd like</div><div class='ctx'>  * to setup the card's memory at the same address as it's PCI bus address,</div><div class='hunk'>@@ -2477,14 +2347,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,</div><div class='ctx'> 						 MTRR_TYPE_WRCOMB, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	if (rinfo-&gt;mon1_type == MT_LCD) {</div><div class='del'>-		register_backlight_controller(&amp;radeon_backlight_controller,</div><div class='del'>-					      rinfo, "ati");</div><div class='del'>-		register_backlight_controller(&amp;radeon_backlight_controller,</div><div class='del'>-					      rinfo, "mnca");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	radeonfb_bl_init(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	printk ("radeonfb (%s): %s\n", pci_name(rinfo-&gt;pdev), rinfo-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -2514,7 +2377,6 @@ err_release_pci0:</div><div class='ctx'> err_release_fb:</div><div class='ctx'>         framebuffer_release(info);</div><div class='ctx'> err_disable:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> err_out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2528,7 +2390,8 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)</div><div class='ctx'>  </div><div class='ctx'>         if (!rinfo)</div><div class='ctx'>                 return;</div><div class='del'>- </div><div class='add'>+</div><div class='add'>+	radeonfb_bl_exit(rinfo);</div><div class='ctx'> 	radeonfb_pm_exit(rinfo);</div><div class='ctx'> </div><div class='ctx'> 	if (rinfo-&gt;mon1_EDID)</div><div class='hunk'>@@ -2570,7 +2433,6 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)</div><div class='ctx'> #endif        </div><div class='ctx'> 	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='ctx'>         framebuffer_release(info);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c<br/>index a9d0414e4655..9aaca58c074a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/radeon_i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeon_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/radeon_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/radeon_i2c.c</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h<br/>index 217e00ab4a2d..38657b2d10eb 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/aty/radeonfb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/aty/radeonfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/aty/radeonfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/aty/radeonfb.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef __RADEONFB_H__</div><div class='ctx'> #define __RADEONFB_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -382,7 +381,7 @@ struct radeonfb_info {</div><div class='ctx'> /* Note about this function: we have some rare cases where we must not schedule,</div><div class='ctx'>  * this typically happen with our special "wake up early" hook which allows us to</div><div class='ctx'>  * wake up the graphic chip (and thus get the console back) before everything else</div><div class='del'>- * on some machines that support that mecanism. At this point, interrupts are off</div><div class='add'>+ * on some machines that support that mechanism. At this point, interrupts are off</div><div class='ctx'>  * and scheduling is not permitted</div><div class='ctx'>  */</div><div class='ctx'> static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)</div><div class='hunk'>@@ -625,4 +624,13 @@ extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_</div><div class='ctx'> extern void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,</div><div class='ctx'> 			       int reg_only);</div><div class='ctx'> </div><div class='add'>+/* Backlight functions */</div><div class='add'>+#ifdef CONFIG_FB_RADEON_BACKLIGHT</div><div class='add'>+extern void radeonfb_bl_init(struct radeonfb_info *rinfo);</div><div class='add'>+extern void radeonfb_bl_exit(struct radeonfb_info *rinfo);</div><div class='add'>+#else</div><div class='add'>+static inline void radeonfb_bl_init(struct radeonfb_info *rinfo) {}</div><div class='add'>+static inline void radeonfb_bl_exit(struct radeonfb_info *rinfo) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif /* __RADEONFB_H__ */</div><div class='head'>diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c<br/>index 789450bb0bc9..a92a91fef16f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/au1100fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/au1100fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/au1100fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/au1100fb.c</a></div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'>  *  	Karl Lessard &lt;klessard@sunrisetelecom.com&gt;</div><div class='ctx'>  *  	&lt;c.pellegrin@exadron.com&gt;</div><div class='ctx'>  *</div><div class='add'>+ * PM support added by Rodolfo Giometti &lt;giometti@linux.it&gt;</div><div class='add'>+ *</div><div class='ctx'>  * Copyright 2002 MontaVista Software</div><div class='ctx'>  * Author: MontaVista Software, Inc.</div><div class='ctx'>  *		ppopov@mvista.com or source@mvista.com</div><div class='hunk'>@@ -38,7 +40,6 @@</div><div class='ctx'>  *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='ctx'>  *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -602,17 +603,52 @@ int au1100fb_drv_remove(struct device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static u32 sys_clksrc;</div><div class='add'>+static struct au1100fb_regs fbregs;</div><div class='add'>+</div><div class='ctx'> int au1100fb_drv_suspend(struct device *dev, pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	/* TODO */</div><div class='add'>+	struct au1100fb_device *fbdev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (!fbdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Save the clock source state */</div><div class='add'>+	sys_clksrc = au_readl(SYS_CLKSRC);</div><div class='add'>+</div><div class='add'>+	/* Blank the LCD */</div><div class='add'>+	au1100fb_fb_blank(VESA_POWERDOWN, &amp;fbdev-&gt;info);</div><div class='add'>+</div><div class='add'>+	/* Stop LCD clocking */</div><div class='add'>+	au_writel(sys_clksrc &amp; ~SYS_CS_ML_MASK, SYS_CLKSRC);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;fbregs, fbdev-&gt;regs, sizeof(struct au1100fb_regs));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int au1100fb_drv_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	/* TODO */</div><div class='add'>+	struct au1100fb_device *fbdev = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (!fbdev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(fbdev-&gt;regs, &amp;fbregs, sizeof(struct au1100fb_regs));</div><div class='add'>+</div><div class='add'>+	/* Restart LCD clocking */</div><div class='add'>+	au_writel(sys_clksrc, SYS_CLKSRC);</div><div class='add'>+</div><div class='add'>+	/* Unblank the LCD */</div><div class='add'>+	au1100fb_fb_blank(VESA_NO_BLANKING, &amp;fbdev-&gt;info);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+#define au1100fb_drv_suspend NULL</div><div class='add'>+#define au1100fb_drv_resume NULL</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct device_driver au1100fb_driver = {</div><div class='ctx'> 	.name		= "au1100-lcd",</div><div class='hunk'>@@ -706,8 +742,7 @@ void __exit au1100fb_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	driver_unregister(&amp;au1100fb_driver);</div><div class='ctx'> </div><div class='del'>-	if (drv_info.opt_mode)</div><div class='del'>-		kfree(drv_info.opt_mode);</div><div class='add'>+	kfree(drv_info.opt_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(au1100fb_init);</div><div class='head'>diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c<br/>index 600d3e0e08b7..c6a5f0ccc107 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/au1200fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/au1200fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/au1200fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/au1200fb.c</a></div><div class='hunk'>@@ -1694,7 +1694,7 @@ static int au1200fb_drv_probe(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Now hook interrupt too */</div><div class='ctx'> 	if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,</div><div class='del'>-		 	  SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) &lt; 0) {</div><div class='add'>+		 	  IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) &lt; 0) {</div><div class='ctx'> 		print_err("fail to request interrupt line %d (err: %d)",</div><div class='ctx'> 			  AU1200_LCD_INT, ret);</div><div class='ctx'> 		goto failed;</div><div class='head'>diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig<br/>index b895eaaa73fd..022f9d3473f5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/backlight/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/backlight/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/backlight/Kconfig</a></div><div class='hunk'>@@ -10,7 +10,7 @@ menuconfig BACKLIGHT_LCD_SUPPORT</div><div class='ctx'> </div><div class='ctx'> config BACKLIGHT_CLASS_DEVICE</div><div class='ctx'>         tristate "Lowlevel Backlight controls"</div><div class='del'>-	depends on BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	depends on BACKLIGHT_LCD_SUPPORT &amp;&amp; FB</div><div class='ctx'> 	default m</div><div class='ctx'> 	help</div><div class='ctx'> 	  This framework adds support for low-level control of the LCD</div><div class='hunk'>@@ -26,7 +26,7 @@ config BACKLIGHT_DEVICE</div><div class='ctx'> </div><div class='ctx'> config LCD_CLASS_DEVICE</div><div class='ctx'>         tristate "Lowlevel LCD controls"</div><div class='del'>-	depends on BACKLIGHT_LCD_SUPPORT</div><div class='add'>+	depends on BACKLIGHT_LCD_SUPPORT &amp;&amp; FB</div><div class='ctx'> 	default m</div><div class='ctx'> 	help</div><div class='ctx'> 	  This framework adds support for low-level control of LCD.</div><div class='hunk'>@@ -50,6 +50,14 @@ config BACKLIGHT_CORGI</div><div class='ctx'> 	  If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the</div><div class='ctx'> 	  backlight driver.</div><div class='ctx'> </div><div class='add'>+config BACKLIGHT_LOCOMO</div><div class='add'>+	tristate "Sharp LOCOMO LCD/Backlight Driver"</div><div class='add'>+	depends on BACKLIGHT_DEVICE &amp;&amp; SHARP_LOCOMO</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to</div><div class='add'>+	  enable the LCD/backlight driver.</div><div class='add'>+</div><div class='ctx'> config BACKLIGHT_HP680</div><div class='ctx'> 	tristate "HP Jornada 680 Backlight Driver"</div><div class='ctx'> 	depends on BACKLIGHT_DEVICE &amp;&amp; SH_HP6XX</div><div class='head'>diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile<br/>index 744210c38e74..65e5553fc849 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/backlight/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/backlight/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/backlight/Makefile</a></div><div class='hunk'>@@ -4,4 +4,4 @@ obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o</div><div class='ctx'> obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o</div><div class='ctx'> obj-$(CONFIG_BACKLIGHT_CORGI)	+= corgi_bl.o</div><div class='ctx'> obj-$(CONFIG_BACKLIGHT_HP680)	+= hp680_bl.o</div><div class='del'>-obj-$(CONFIG_SHARP_LOCOMO)	+= locomolcd.o</div><div class='add'>+obj-$(CONFIG_BACKLIGHT_LOCOMO)	+= locomolcd.o</div><div class='head'>diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c<br/>index a71e984c93d4..ffc72ae3ada8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/backlight/hp680_bl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/hp680_bl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/backlight/hp680_bl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/backlight/hp680_bl.c</a></div><div class='hunk'>@@ -27,7 +27,7 @@</div><div class='ctx'> </div><div class='ctx'> static int hp680bl_suspended;</div><div class='ctx'> static int current_intensity = 0;</div><div class='del'>-static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;</div><div class='add'>+static DEFINE_SPINLOCK(bl_lock);</div><div class='ctx'> static struct backlight_device *hp680_backlight_device;</div><div class='ctx'> </div><div class='ctx'> static void hp680bl_send_intensity(struct backlight_device *bd)</div><div class='head'>diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c<br/>index 60831bb23685..caf1eca199b0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/backlight/locomolcd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/backlight/locomolcd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/backlight/locomolcd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/backlight/locomolcd.c</a></div><div class='hunk'>@@ -11,12 +11,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* LCD power functions */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/hardware/locomo.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -25,7 +26,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "../../../arch/arm/mach-sa1100/generic.h"</div><div class='ctx'> </div><div class='add'>+static struct backlight_device *locomolcd_bl_device;</div><div class='ctx'> static struct locomo_dev *locomolcd_dev;</div><div class='add'>+static unsigned long locomolcd_flags;</div><div class='add'>+#define LOCOMOLCD_SUSPENDED     0x01</div><div class='ctx'> </div><div class='ctx'> static void locomolcd_on(int comadj)</div><div class='ctx'> {</div><div class='hunk'>@@ -89,12 +93,10 @@ void locomolcd_power(int on)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* read comadj */</div><div class='del'>-	if (comadj == -1) {</div><div class='del'>-		if (machine_is_poodle())</div><div class='del'>-			comadj = 118;</div><div class='del'>-		if (machine_is_collie())</div><div class='del'>-			comadj = 128;</div><div class='del'>-	}</div><div class='add'>+	if (comadj == -1 &amp;&amp; machine_is_collie())</div><div class='add'>+		comadj = 128;</div><div class='add'>+	if (comadj == -1 &amp;&amp; machine_is_poodle())</div><div class='add'>+		comadj = 118;</div><div class='ctx'> </div><div class='ctx'> 	if (on)</div><div class='ctx'> 		locomolcd_on(comadj);</div><div class='hunk'>@@ -105,26 +107,100 @@ void locomolcd_power(int on)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(locomolcd_power);</div><div class='ctx'> </div><div class='del'>-static int poodle_lcd_probe(struct locomo_dev *dev)</div><div class='add'>+</div><div class='add'>+static int current_intensity;</div><div class='add'>+</div><div class='add'>+static int locomolcd_set_intensity(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	int intensity = bd-&gt;props-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK)</div><div class='add'>+		intensity = 0;</div><div class='add'>+	if (bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		intensity = 0;</div><div class='add'>+	if (locomolcd_flags &amp; LOCOMOLCD_SUSPENDED)</div><div class='add'>+		intensity = 0;</div><div class='add'>+</div><div class='add'>+	switch (intensity) {</div><div class='add'>+	/* AC and non-AC are handled differently, but produce same results in sharp code? */</div><div class='add'>+	case 0: locomo_frontlight_set(locomolcd_dev, 0, 0, 161); break;</div><div class='add'>+	case 1: locomo_frontlight_set(locomolcd_dev, 117, 0, 161); break;</div><div class='add'>+	case 2: locomo_frontlight_set(locomolcd_dev, 163, 0, 148); break;</div><div class='add'>+	case 3: locomo_frontlight_set(locomolcd_dev, 194, 0, 161); break;</div><div class='add'>+	case 4: locomo_frontlight_set(locomolcd_dev, 194, 1, 161); break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	current_intensity = intensity;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int locomolcd_get_intensity(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	return current_intensity;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties locomobl_data = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.get_brightness = locomolcd_get_intensity,</div><div class='add'>+	.update_status  = locomolcd_set_intensity,</div><div class='add'>+	.max_brightness = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int locomolcd_suspend(struct locomo_dev *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	locomolcd_flags |= LOCOMOLCD_SUSPENDED;</div><div class='add'>+	locomolcd_set_intensity(locomolcd_bl_device);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int locomolcd_resume(struct locomo_dev *dev)</div><div class='add'>+{</div><div class='add'>+	locomolcd_flags &amp;= ~LOCOMOLCD_SUSPENDED;</div><div class='add'>+	locomolcd_set_intensity(locomolcd_bl_device);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define locomolcd_suspend	NULL</div><div class='add'>+#define locomolcd_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int locomolcd_probe(struct locomo_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	locomolcd_dev = dev;</div><div class='ctx'> </div><div class='add'>+	locomo_gpio_set_dir(dev, LOCOMO_GPIO_FL_VR, 0);</div><div class='add'>+</div><div class='ctx'> 	/* the poodle_lcd_power function is called for the first time</div><div class='ctx'> 	 * from fs_initcall, which is before locomo is activated.</div><div class='ctx'> 	 * We need to recall poodle_lcd_power here*/</div><div class='del'>-#ifdef CONFIG_MACH_POODLE</div><div class='del'>-	locomolcd_power(1);</div><div class='del'>-#endif</div><div class='add'>+	if (machine_is_poodle())</div><div class='add'>+		locomolcd_power(1);</div><div class='add'>+</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='add'>+</div><div class='add'>+	locomolcd_bl_device = backlight_device_register("locomo-bl", NULL, &amp;locomobl_data);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR (locomolcd_bl_device))</div><div class='add'>+		return PTR_ERR (locomolcd_bl_device);</div><div class='add'>+</div><div class='add'>+	/* Set up frontlight so that screen is readable */</div><div class='add'>+	locomobl_data.brightness = 2;</div><div class='add'>+	locomolcd_set_intensity(locomolcd_bl_device);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int poodle_lcd_remove(struct locomo_dev *dev)</div><div class='add'>+static int locomolcd_remove(struct locomo_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	backlight_device_unregister(locomolcd_bl_device);</div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> 	locomolcd_dev = NULL;</div><div class='ctx'> 	local_irq_restore(flags);</div><div class='hunk'>@@ -136,19 +212,33 @@ static struct locomo_driver poodle_lcd_driver = {</div><div class='ctx'> 		.name = "locomo-backlight",</div><div class='ctx'> 	},</div><div class='ctx'> 	.devid	= LOCOMO_DEVID_BACKLIGHT,</div><div class='del'>-	.probe	= poodle_lcd_probe,</div><div class='del'>-	.remove	= poodle_lcd_remove,</div><div class='add'>+	.probe	= locomolcd_probe,</div><div class='add'>+	.remove	= locomolcd_remove,</div><div class='add'>+	.suspend = locomolcd_suspend,</div><div class='add'>+	.resume = locomolcd_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init poodle_lcd_init(void)</div><div class='add'>+</div><div class='add'>+static int __init locomolcd_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = locomo_driver_register(&amp;poodle_lcd_driver);</div><div class='del'>-	if (ret) return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SA1100_COLLIE</div><div class='ctx'> 	sa1100fb_lcd_power = locomolcd_power;</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-device_initcall(poodle_lcd_init);</div><div class='ctx'> </div><div class='add'>+static void __exit locomolcd_exit(void)</div><div class='add'>+{</div><div class='add'>+	locomo_driver_unregister(&amp;poodle_lcd_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(locomolcd_init);</div><div class='add'>+module_exit(locomolcd_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("John Lenz &lt;lenz@cs.wisc.edu&gt;, Pavel Machek &lt;pavel@suse.cz&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Collie LCD driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c<br/>index 6577fdfdfc16..c66e3d52cbf3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/bw2.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/bw2.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/bw2.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/bw2.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* bw2.c: BWTWO frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)</div><div class='hunk'>@@ -19,14 +19,11 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-#include &lt;asm/sun4paddr.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include "sbuslib.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -59,30 +56,30 @@ static struct fb_ops bw2_ops = {</div><div class='ctx'> #define BWTWO_REGISTER_OFFSET 0x400000</div><div class='ctx'> </div><div class='ctx'> struct bt_regs {</div><div class='del'>-	volatile u32 addr;</div><div class='del'>-	volatile u32 color_map;</div><div class='del'>-	volatile u32 control;</div><div class='del'>-	volatile u32 cursor;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 color_map;</div><div class='add'>+	u32 control;</div><div class='add'>+	u32 cursor;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bw2_regs {</div><div class='ctx'> 	struct bt_regs	cmap;</div><div class='del'>-	volatile u8	control;</div><div class='del'>-	volatile u8	status;</div><div class='del'>-	volatile u8	cursor_start;</div><div class='del'>-	volatile u8	cursor_end;</div><div class='del'>-	volatile u8	h_blank_start;</div><div class='del'>-	volatile u8	h_blank_end;</div><div class='del'>-	volatile u8	h_sync_start;</div><div class='del'>-	volatile u8	h_sync_end;</div><div class='del'>-	volatile u8	comp_sync_end;</div><div class='del'>-	volatile u8	v_blank_start_high;</div><div class='del'>-	volatile u8	v_blank_start_low;</div><div class='del'>-	volatile u8	v_blank_end;</div><div class='del'>-	volatile u8	v_sync_start;</div><div class='del'>-	volatile u8	v_sync_end;</div><div class='del'>-	volatile u8	xfer_holdoff_start;</div><div class='del'>-	volatile u8	xfer_holdoff_end;</div><div class='add'>+	u8	control;</div><div class='add'>+	u8	status;</div><div class='add'>+	u8	cursor_start;</div><div class='add'>+	u8	cursor_end;</div><div class='add'>+	u8	h_blank_start;</div><div class='add'>+	u8	h_blank_end;</div><div class='add'>+	u8	h_sync_start;</div><div class='add'>+	u8	h_sync_end;</div><div class='add'>+	u8	comp_sync_end;</div><div class='add'>+	u8	v_blank_start_high;</div><div class='add'>+	u8	v_blank_start_low;</div><div class='add'>+	u8	v_blank_end;</div><div class='add'>+	u8	v_sync_start;</div><div class='add'>+	u8	v_sync_end;</div><div class='add'>+	u8	xfer_holdoff_start;</div><div class='add'>+	u8	xfer_holdoff_end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Status Register Constants */</div><div class='hunk'>@@ -117,9 +114,8 @@ struct bw2_par {</div><div class='ctx'> #define BW2_FLAG_BLANKED	0x00000001</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		physbase;</div><div class='add'>+	unsigned long		which_io;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='del'>-</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -174,9 +170,7 @@ static int bw2_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return sbusfb_mmap_helper(bw2_mmap_map,</div><div class='ctx'> 				  par-&gt;physbase, par-&gt;fbsize,</div><div class='del'>-				  (par-&gt;sdev ?</div><div class='del'>-				   par-&gt;sdev-&gt;reg_addrs[0].which_io :</div><div class='del'>-				   0),</div><div class='add'>+				  par-&gt;which_io,</div><div class='ctx'> 				  vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -288,139 +282,124 @@ static void bw2_do_default_mode(struct bw2_par *par, struct fb_info *info,</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct bw2_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(bw2_list);</div><div class='ctx'> </div><div class='del'>-static void bw2_init_one(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit bw2_init_one(struct of_device *op)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct all_info *all;</div><div class='del'>-	struct resource *resp;</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	struct resource res;</div><div class='del'>-#endif</div><div class='del'>-	int linebytes;</div><div class='add'>+	int linebytes, err;</div><div class='ctx'> </div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "bw2: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	if (!sdev) {</div><div class='del'>-		all-&gt;par.physbase = sun4_bwtwo_physaddr;</div><div class='del'>-		res.start = sun4_bwtwo_physaddr;</div><div class='del'>-		res.end = res.start + BWTWO_REGISTER_OFFSET + sizeof(struct bw2_regs) - 1;</div><div class='del'>-		res.flags = IORESOURCE_IO;</div><div class='del'>-		resp = &amp;res;</div><div class='del'>-		all-&gt;info.var.xres = all-&gt;info.var.xres_virtual = 1152;</div><div class='del'>-		all-&gt;info.var.yres = all-&gt;info.var.yres_virtual = 900;</div><div class='del'>-		all-&gt;info.var.bits_per_pixel = 1;</div><div class='del'>-		linebytes = 1152 / 8;</div><div class='del'>-	} else</div><div class='del'>-#else</div><div class='del'>-	{</div><div class='del'>-		BUG_ON(!sdev);</div><div class='del'>-		all-&gt;par.physbase = sdev-&gt;reg_addrs[0].phys_addr;</div><div class='del'>-		resp = &amp;sdev-&gt;resource[0];</div><div class='del'>-		sbusfb_fill_var(&amp;all-&gt;info.var, (sdev ? sdev-&gt;prom_node : 0), 1);</div><div class='del'>-		linebytes = prom_getintdefault(sdev-&gt;prom_node, "linebytes",</div><div class='del'>-					       all-&gt;info.var.xres);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	all-&gt;par.physbase = op-&gt;resource[0].start;</div><div class='add'>+	all-&gt;par.which_io = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='add'>+</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 1);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='add'>+</div><div class='ctx'> 	all-&gt;info.var.red.length = all-&gt;info.var.green.length =</div><div class='ctx'> 		all-&gt;info.var.blue.length = all-&gt;info.var.bits_per_pixel;</div><div class='ctx'> 	all-&gt;info.var.red.offset = all-&gt;info.var.green.offset =</div><div class='ctx'> 		all-&gt;info.var.blue.offset = 0;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.regs = sbus_ioremap(resp, BWTWO_REGISTER_OFFSET,</div><div class='del'>-			     sizeof(struct bw2_regs), "bw2 regs");</div><div class='add'>+	all-&gt;par.regs = of_ioremap(&amp;op-&gt;resource[0], BWTWO_REGISTER_OFFSET,</div><div class='add'>+				   sizeof(struct bw2_regs), "bw2 regs");</div><div class='ctx'> </div><div class='del'>-	if (sdev &amp;&amp; !prom_getbool(sdev-&gt;prom_node, "width"))</div><div class='add'>+	if (!of_find_property(dp, "width", NULL))</div><div class='ctx'> 		bw2_do_default_mode(&amp;all-&gt;par, &amp;all-&gt;info, &amp;linebytes);</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.flags = FBINFO_DEFAULT;</div><div class='ctx'> 	all-&gt;info.fbops = &amp;bw2_ops;</div><div class='del'>-#if defined(CONFIG_SPARC32)</div><div class='del'>-	if (sdev)</div><div class='del'>-		all-&gt;info.screen_base = (char __iomem *)</div><div class='del'>-			prom_getintdefault(sdev-&gt;prom_node, "address", 0);</div><div class='del'>-#endif</div><div class='del'>-	if (!all-&gt;info.screen_base)</div><div class='del'>-		all-&gt;info.screen_base =</div><div class='del'>-			sbus_ioremap(resp, 0, all-&gt;par.fbsize, "bw2 ram");</div><div class='add'>+</div><div class='add'>+	all-&gt;info.screen_base =</div><div class='add'>+		sbus_ioremap(&amp;op-&gt;resource[0], 0, all-&gt;par.fbsize, "bw2 ram");</div><div class='ctx'> 	all-&gt;info.par = &amp;all-&gt;par;</div><div class='ctx'> </div><div class='ctx'> 	bw2_blank(0, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='ctx'> 	bw2_init_fix(&amp;all-&gt;info, linebytes);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "bw2: Could not register framebuffer.\n");</div><div class='add'>+	err= register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct bw2_regs));</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;bw2_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='add'>+</div><div class='add'>+	printk("%s: bwtwo at %lx:%lx\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='add'>+	       all-&gt;par.which_io, all-&gt;par.physbase);</div><div class='ctx'> </div><div class='del'>-	printk("bw2: bwtwo at %lx:%lx\n",</div><div class='del'>-	       (long) (sdev ? sdev-&gt;reg_addrs[0].which_io : 0),</div><div class='del'>-	       (long) all-&gt;par.physbase);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init bw2_init(void)</div><div class='add'>+static int __devinit bw2_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("bw2fb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return bw2_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUN4</div><div class='del'>-	bw2_init_one(NULL);</div><div class='del'>-#endif</div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "bwtwo"))</div><div class='del'>-			bw2_init_one(sdev);</div><div class='del'>-	}</div><div class='add'>+static int __devexit bw2_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+</div><div class='add'>+	of_iounmap(all-&gt;par.regs, sizeof(struct bw2_regs));</div><div class='add'>+	of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit bw2_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id bw2_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "bwtwo",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, bw2_match);</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;bw2_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static struct of_platform_driver bw2_driver = {</div><div class='add'>+	.name		= "bw2",</div><div class='add'>+	.match_table	= bw2_match,</div><div class='add'>+	.probe		= bw2_probe,</div><div class='add'>+	.remove		= __devexit_p(bw2_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+static int __init bw2_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("bw2fb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;bw2_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-bw2_setup(char *arg)</div><div class='add'>+static void __exit bw2_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	return of_unregister_driver(&amp;bw2_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(bw2_init);</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='add'>+module_init(bw2_init);</div><div class='ctx'> module_exit(bw2_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for BWTWO chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c<br/>index 74415325b016..6faea4034e3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cfbcopyarea.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cfbcopyarea.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cfbcopyarea.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cfbcopyarea.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c<br/>index e5ff62e9cfb8..f00b50aab606 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cfbfillrect.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cfbfillrect.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cfbfillrect.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cfbfillrect.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  *  the native cpu endians. I also need to deal with MSB position in the word.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c<br/>index 8ba6152db2fd..51d35386a945 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cfbimgblt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cfbimgblt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cfbimgblt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cfbimgblt.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'>  *  Also need to add code to deal with cards endians that are different than</div><div class='ctx'>  *  the native cpu endians. I also need to deal with MSB position in the word.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -230,6 +229,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *</div><div class='ctx'> 		tab = cfb_tab16;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 32:</div><div class='add'>+	default:</div><div class='ctx'> 		tab = cfb_tab32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c<br/>index 63b6c79c8a0a..7f926c619b61 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cg14.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cg14.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cg14.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cg14.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* cg14.c: CGFOURTEEN frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  * Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -99,73 +99,73 @@ static struct fb_ops cg14_ops = {</div><div class='ctx'> #define CG14_MCR_PIXMODE_32		3</div><div class='ctx'> </div><div class='ctx'> struct cg14_regs{</div><div class='del'>-	volatile u8 mcr;	/* Master Control Reg */</div><div class='del'>-	volatile u8 ppr;	/* Packed Pixel Reg */</div><div class='del'>-	volatile u8 tms[2];	/* Test Mode Status Regs */</div><div class='del'>-	volatile u8 msr;	/* Master Status Reg */</div><div class='del'>-	volatile u8 fsr;	/* Fault Status Reg */</div><div class='del'>-	volatile u8 rev;	/* Revision &amp; Impl */</div><div class='del'>-	volatile u8 ccr;	/* Clock Control Reg */</div><div class='del'>-	volatile u32 tmr;	/* Test Mode Read Back */</div><div class='del'>-	volatile u8 mod;	/* Monitor Operation Data Reg */</div><div class='del'>-	volatile u8 acr;	/* Aux Control */</div><div class='add'>+	u8 mcr;	/* Master Control Reg */</div><div class='add'>+	u8 ppr;	/* Packed Pixel Reg */</div><div class='add'>+	u8 tms[2];	/* Test Mode Status Regs */</div><div class='add'>+	u8 msr;	/* Master Status Reg */</div><div class='add'>+	u8 fsr;	/* Fault Status Reg */</div><div class='add'>+	u8 rev;	/* Revision &amp; Impl */</div><div class='add'>+	u8 ccr;	/* Clock Control Reg */</div><div class='add'>+	u32 tmr;	/* Test Mode Read Back */</div><div class='add'>+	u8 mod;	/* Monitor Operation Data Reg */</div><div class='add'>+	u8 acr;	/* Aux Control */</div><div class='ctx'> 	u8 xxx0[6];</div><div class='del'>-	volatile u16 hct;	/* Hor Counter */</div><div class='del'>-	volatile u16 vct;	/* Vert Counter */</div><div class='del'>-	volatile u16 hbs;	/* Hor Blank Start */</div><div class='del'>-	volatile u16 hbc;	/* Hor Blank Clear */</div><div class='del'>-	volatile u16 hss;	/* Hor Sync Start */</div><div class='del'>-	volatile u16 hsc;	/* Hor Sync Clear */</div><div class='del'>-	volatile u16 csc;	/* Composite Sync Clear */</div><div class='del'>-	volatile u16 vbs;	/* Vert Blank Start */</div><div class='del'>-	volatile u16 vbc;	/* Vert Blank Clear */</div><div class='del'>-	volatile u16 vss;	/* Vert Sync Start */</div><div class='del'>-	volatile u16 vsc;	/* Vert Sync Clear */</div><div class='del'>-	volatile u16 xcs;</div><div class='del'>-	volatile u16 xcc;</div><div class='del'>-	volatile u16 fsa;	/* Fault Status Address */</div><div class='del'>-	volatile u16 adr;	/* Address Registers */</div><div class='add'>+	u16 hct;	/* Hor Counter */</div><div class='add'>+	u16 vct;	/* Vert Counter */</div><div class='add'>+	u16 hbs;	/* Hor Blank Start */</div><div class='add'>+	u16 hbc;	/* Hor Blank Clear */</div><div class='add'>+	u16 hss;	/* Hor Sync Start */</div><div class='add'>+	u16 hsc;	/* Hor Sync Clear */</div><div class='add'>+	u16 csc;	/* Composite Sync Clear */</div><div class='add'>+	u16 vbs;	/* Vert Blank Start */</div><div class='add'>+	u16 vbc;	/* Vert Blank Clear */</div><div class='add'>+	u16 vss;	/* Vert Sync Start */</div><div class='add'>+	u16 vsc;	/* Vert Sync Clear */</div><div class='add'>+	u16 xcs;</div><div class='add'>+	u16 xcc;</div><div class='add'>+	u16 fsa;	/* Fault Status Address */</div><div class='add'>+	u16 adr;	/* Address Registers */</div><div class='ctx'> 	u8 xxx1[0xce];</div><div class='del'>-	volatile u8 pcg[0x100]; /* Pixel Clock Generator */</div><div class='del'>-	volatile u32 vbr;	/* Frame Base Row */</div><div class='del'>-	volatile u32 vmcr;	/* VBC Master Control */</div><div class='del'>-	volatile u32 vcr;	/* VBC refresh */</div><div class='del'>-	volatile u32 vca;	/* VBC Config */</div><div class='add'>+	u8 pcg[0x100]; /* Pixel Clock Generator */</div><div class='add'>+	u32 vbr;	/* Frame Base Row */</div><div class='add'>+	u32 vmcr;	/* VBC Master Control */</div><div class='add'>+	u32 vcr;	/* VBC refresh */</div><div class='add'>+	u32 vca;	/* VBC Config */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CG14_CCR_ENABLE	0x04</div><div class='ctx'> #define CG14_CCR_SELECT 0x02	/* HW/Full screen */</div><div class='ctx'> </div><div class='ctx'> struct cg14_cursor {</div><div class='del'>-	volatile u32 cpl0[32];	/* Enable plane 0 */</div><div class='del'>-	volatile u32 cpl1[32];  /* Color selection plane */</div><div class='del'>-	volatile u8 ccr;	/* Cursor Control Reg */</div><div class='add'>+	u32 cpl0[32];	/* Enable plane 0 */</div><div class='add'>+	u32 cpl1[32];  /* Color selection plane */</div><div class='add'>+	u8 ccr;	/* Cursor Control Reg */</div><div class='ctx'> 	u8 xxx0[3];</div><div class='del'>-	volatile u16 cursx;	/* Cursor x,y position */</div><div class='del'>-	volatile u16 cursy;	/* Cursor x,y position */</div><div class='del'>-	volatile u32 color0;</div><div class='del'>-	volatile u32 color1;</div><div class='add'>+	u16 cursx;	/* Cursor x,y position */</div><div class='add'>+	u16 cursy;	/* Cursor x,y position */</div><div class='add'>+	u32 color0;</div><div class='add'>+	u32 color1;</div><div class='ctx'> 	u32 xxx1[0x1bc];</div><div class='del'>-	volatile u32 cpl0i[32];	/* Enable plane 0 autoinc */</div><div class='del'>-	volatile u32 cpl1i[32]; /* Color selection autoinc */</div><div class='add'>+	u32 cpl0i[32];	/* Enable plane 0 autoinc */</div><div class='add'>+	u32 cpl1i[32]; /* Color selection autoinc */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cg14_dac {</div><div class='del'>-	volatile u8 addr;	/* Address Register */</div><div class='add'>+	u8 addr;	/* Address Register */</div><div class='ctx'> 	u8 xxx0[255];</div><div class='del'>-	volatile u8 glut;	/* Gamma table */</div><div class='add'>+	u8 glut;	/* Gamma table */</div><div class='ctx'> 	u8 xxx1[255];</div><div class='del'>-	volatile u8 select;	/* Register Select */</div><div class='add'>+	u8 select;	/* Register Select */</div><div class='ctx'> 	u8 xxx2[255];</div><div class='del'>-	volatile u8 mode;	/* Mode Register */</div><div class='add'>+	u8 mode;	/* Mode Register */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cg14_xlut{</div><div class='del'>-	volatile u8 x_xlut [256];</div><div class='del'>-	volatile u8 x_xlutd [256];</div><div class='add'>+	u8 x_xlut [256];</div><div class='add'>+	u8 x_xlutd [256];</div><div class='ctx'> 	u8 xxx0[0x600];</div><div class='del'>-	volatile u8 x_xlut_inc [256];</div><div class='del'>-	volatile u8 x_xlutd_inc [256];</div><div class='add'>+	u8 x_xlut_inc [256];</div><div class='add'>+	u8 x_xlutd_inc [256];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Color look up table (clut) */</div><div class='hunk'>@@ -204,7 +204,6 @@ struct cg14_par {</div><div class='ctx'> </div><div class='ctx'> 	int			mode;</div><div class='ctx'> 	int			ramsize;</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void __cg14_reset(struct cg14_par *par)</div><div class='hunk'>@@ -355,14 +354,9 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)</div><div class='ctx'>  *  Initialisation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void cg14_init_fix(struct fb_info *info, int linebytes)</div><div class='add'>+static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	struct cg14_par *par = (struct cg14_par *)info-&gt;par;</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	name = "cgfourteen";</div><div class='del'>-	if (par-&gt;sdev)</div><div class='del'>-		name = par-&gt;sdev-&gt;prom_name;</div><div class='add'>+	const char *name = dp-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	strlcpy(info-&gt;fix.id, name, sizeof(info-&gt;fix.id));</div><div class='ctx'> </div><div class='hunk'>@@ -456,98 +450,81 @@ static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __initdata = {</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct cg14_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(cg14_list);</div><div class='ctx'> </div><div class='del'>-static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node)</div><div class='add'>+static void cg14_unmap_regs(struct all_info *all)</div><div class='ctx'> {</div><div class='del'>-	struct all_info *all;</div><div class='del'>-	unsigned long phys, rphys;</div><div class='del'>-	u32 bases[6];</div><div class='del'>-	int is_8mb, linebytes, i;</div><div class='del'>-</div><div class='del'>-	if (!sdev) {</div><div class='del'>-		if (prom_getproperty(node, "address",</div><div class='del'>-				     (char *) &amp;bases[0], sizeof(bases)) &lt;= 0</div><div class='del'>-		    || !bases[0]) {</div><div class='del'>-			printk(KERN_ERR "cg14: Device is not mapped.\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (__get_iospace(bases[0]) != __get_iospace(bases[1])) {</div><div class='del'>-			printk(KERN_ERR "cg14: I/O spaces don't match.\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (all-&gt;par.regs)</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct cg14_regs));</div><div class='add'>+	if (all-&gt;par.clut)</div><div class='add'>+		of_iounmap(all-&gt;par.clut, sizeof(struct cg14_clut));</div><div class='add'>+	if (all-&gt;par.cursor)</div><div class='add'>+		of_iounmap(all-&gt;par.cursor, sizeof(struct cg14_cursor));</div><div class='add'>+	if (all-&gt;info.screen_base)</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "cg14: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='add'>+static int __devinit cg14_init_one(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct all_info *all;</div><div class='add'>+	int is_8mb, linebytes, i, err;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, node, 8);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 8);</div><div class='ctx'> 	all-&gt;info.var.red.length = 8;</div><div class='ctx'> 	all-&gt;info.var.green.length = 8;</div><div class='ctx'> 	all-&gt;info.var.blue.length = 8;</div><div class='ctx'> </div><div class='del'>-	linebytes = prom_getintdefault(node, "linebytes",</div><div class='del'>-				       all-&gt;info.var.xres);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='del'>-	if (sdev) {</div><div class='del'>-		rphys = sdev-&gt;reg_addrs[0].phys_addr;</div><div class='del'>-		all-&gt;par.physbase = phys = sdev-&gt;reg_addrs[1].phys_addr;</div><div class='del'>-		all-&gt;par.iospace = sdev-&gt;reg_addrs[0].which_io;</div><div class='del'>-</div><div class='del'>-		all-&gt;par.regs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				     sizeof(struct cg14_regs),</div><div class='del'>-				     "cg14 regs");</div><div class='del'>-		all-&gt;par.clut = sbus_ioremap(&amp;sdev-&gt;resource[0], CG14_CLUT1,</div><div class='del'>-				     sizeof(struct cg14_clut),</div><div class='del'>-				     "cg14 clut");</div><div class='del'>-		all-&gt;par.cursor = sbus_ioremap(&amp;sdev-&gt;resource[0], CG14_CURSORREGS,</div><div class='del'>-				     sizeof(struct cg14_cursor),</div><div class='del'>-				     "cg14 cursor");</div><div class='del'>-		all-&gt;info.screen_base = sbus_ioremap(&amp;sdev-&gt;resource[1], 0,</div><div class='del'>-				     all-&gt;par.fbsize, "cg14 ram");</div><div class='add'>+	if (!strcmp(dp-&gt;parent-&gt;name, "sbus") ||</div><div class='add'>+	    !strcmp(dp-&gt;parent-&gt;name, "sbi")) {</div><div class='add'>+		all-&gt;par.physbase = op-&gt;resource[0].start;</div><div class='add'>+		all-&gt;par.iospace = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='ctx'> 	} else {</div><div class='del'>-		rphys = __get_phys(bases[0]);</div><div class='del'>-		all-&gt;par.physbase = phys = __get_phys(bases[1]);</div><div class='del'>-		all-&gt;par.iospace = __get_iospace(bases[0]);</div><div class='del'>-		all-&gt;par.regs = (struct cg14_regs __iomem *)(unsigned long)bases[0];</div><div class='del'>-		all-&gt;par.clut = (struct cg14_clut __iomem *)((unsigned long)bases[0] +</div><div class='del'>-						     CG14_CLUT1);</div><div class='del'>-		all-&gt;par.cursor =</div><div class='del'>-			(struct cg14_cursor __iomem *)((unsigned long)bases[0] +</div><div class='del'>-					       CG14_CURSORREGS);</div><div class='del'>-</div><div class='del'>-		all-&gt;info.screen_base = (char __iomem *)(unsigned long)bases[1];</div><div class='add'>+		all-&gt;par.physbase = op-&gt;resource[1].start;</div><div class='add'>+		all-&gt;par.iospace = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	prom_getproperty(node, "reg", (char *) &amp;bases[0], sizeof(bases));</div><div class='del'>-	is_8mb = (bases[5] == 0x800000);</div><div class='add'>+	all-&gt;par.regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+				   sizeof(struct cg14_regs), "cg14 regs");</div><div class='add'>+	all-&gt;par.clut = of_ioremap(&amp;op-&gt;resource[0], CG14_CLUT1,</div><div class='add'>+				   sizeof(struct cg14_clut), "cg14 clut");</div><div class='add'>+	all-&gt;par.cursor = of_ioremap(&amp;op-&gt;resource[0], CG14_CURSORREGS,</div><div class='add'>+				   sizeof(struct cg14_cursor), "cg14 cursor");</div><div class='ctx'> </div><div class='del'>-	if (sizeof(all-&gt;par.mmap_map) != sizeof(__cg14_mmap_map)) {</div><div class='del'>-		extern void __cg14_mmap_sized_wrongly(void);</div><div class='add'>+	all-&gt;info.screen_base = of_ioremap(&amp;op-&gt;resource[1], 0,</div><div class='add'>+					   all-&gt;par.fbsize, "cg14 ram");</div><div class='ctx'> </div><div class='del'>-		__cg14_mmap_sized_wrongly();</div><div class='del'>-	}</div><div class='add'>+	if (!all-&gt;par.regs || !all-&gt;par.clut || !all-&gt;par.cursor ||</div><div class='add'>+	    !all-&gt;info.screen_base)</div><div class='add'>+		cg14_unmap_regs(all);</div><div class='add'>+</div><div class='add'>+	is_8mb = (((op-&gt;resource[1].end - op-&gt;resource[1].start) + 1) ==</div><div class='add'>+		  (8 * 1024 * 1024));</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(all-&gt;par.mmap_map) != sizeof(__cg14_mmap_map));</div><div class='ctx'> 		</div><div class='del'>-	memcpy(&amp;all-&gt;par.mmap_map, &amp;__cg14_mmap_map, sizeof(all-&gt;par.mmap_map));</div><div class='add'>+	memcpy(&amp;all-&gt;par.mmap_map, &amp;__cg14_mmap_map,</div><div class='add'>+	       sizeof(all-&gt;par.mmap_map));</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; CG14_MMAP_ENTRIES; i++) {</div><div class='ctx'> 		struct sbus_mmap_map *map = &amp;all-&gt;par.mmap_map[i];</div><div class='ctx'> </div><div class='ctx'> 		if (!map-&gt;size)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (map-&gt;poff &amp; 0x80000000)</div><div class='del'>-			map-&gt;poff = (map-&gt;poff &amp; 0x7fffffff) + rphys - phys;</div><div class='add'>+			map-&gt;poff = (map-&gt;poff &amp; 0x7fffffff) +</div><div class='add'>+				(op-&gt;resource[0].start -</div><div class='add'>+				 op-&gt;resource[1].start);</div><div class='ctx'> 		if (is_8mb &amp;&amp;</div><div class='ctx'> 		    map-&gt;size &gt;= 0x100000 &amp;&amp;</div><div class='ctx'> 		    map-&gt;size &lt;= 0x400000)</div><div class='hunk'>@@ -564,84 +541,87 @@ static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node)</div><div class='ctx'> 	__cg14_reset(&amp;all-&gt;par);</div><div class='ctx'> </div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='del'>-		printk(KERN_ERR "cg14: Could not allocate color map.\n");</div><div class='add'>+		cg14_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	fb_set_cmap(&amp;all-&gt;info.cmap, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='del'>-	cg14_init_fix(&amp;all-&gt;info, linebytes);</div><div class='add'>+	cg14_init_fix(&amp;all-&gt;info, linebytes, dp);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cg14: Could not register framebuffer.\n");</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+		cg14_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;cg14_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='ctx'> </div><div class='del'>-	printk("cg14: cgfourteen at %lx:%lx, %dMB\n",</div><div class='del'>-	       all-&gt;par.iospace, all-&gt;par.physbase, all-&gt;par.ramsize &gt;&gt; 20);</div><div class='add'>+	printk("%s: cgfourteen at %lx:%lx, %dMB\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='add'>+	       all-&gt;par.iospace, all-&gt;par.physbase,</div><div class='add'>+	       all-&gt;par.ramsize &gt;&gt; 20);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init cg14_init(void)</div><div class='add'>+static int __devinit cg14_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("cg14fb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return cg14_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	{</div><div class='del'>-		int root, node;</div><div class='del'>-</div><div class='del'>-		root = prom_getchild(prom_root_node);</div><div class='del'>-		root = prom_searchsiblings(root, "obio");</div><div class='del'>-		if (root) {</div><div class='del'>-			node = prom_searchsiblings(prom_getchild(root),</div><div class='del'>-						   "cgfourteen");</div><div class='del'>-			if (node)</div><div class='del'>-				cg14_init_one(NULL, node, root);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "cgfourteen"))</div><div class='del'>-			cg14_init_one(sdev, sdev-&gt;prom_node, sbus-&gt;prom_node);</div><div class='del'>-	}</div><div class='add'>+static int __devexit cg14_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+</div><div class='add'>+	cg14_unmap_regs(all);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit cg14_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id cg14_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "cgfourteen",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, cg14_match);</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;cg14_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static struct of_platform_driver cg14_driver = {</div><div class='add'>+	.name		= "cg14",</div><div class='add'>+	.match_table	= cg14_match,</div><div class='add'>+	.probe		= cg14_probe,</div><div class='add'>+	.remove		= __devexit_p(cg14_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+int __init cg14_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("cg14fb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;cg14_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-cg14_setup(char *arg)</div><div class='add'>+void __exit cg14_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;cg14_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cg14_init);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(cg14_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for CGfourteen chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c<br/>index 3de6e1b5ab2f..9c8c753ef454 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cg3.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cg3.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cg3.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cg3.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* cg3.c: CGTHREE frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)</div><div class='hunk'>@@ -19,8 +19,9 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='ctx'> #include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -80,30 +81,30 @@ enum cg3_type {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bt_regs {</div><div class='del'>-	volatile u32 addr;</div><div class='del'>-	volatile u32 color_map;</div><div class='del'>-	volatile u32 control;</div><div class='del'>-	volatile u32 cursor;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 color_map;</div><div class='add'>+	u32 control;</div><div class='add'>+	u32 cursor;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cg3_regs {</div><div class='ctx'> 	struct bt_regs	cmap;</div><div class='del'>-	volatile u8	control;</div><div class='del'>-	volatile u8	status;</div><div class='del'>-	volatile u8	cursor_start;</div><div class='del'>-	volatile u8	cursor_end;</div><div class='del'>-	volatile u8	h_blank_start;</div><div class='del'>-	volatile u8	h_blank_end;</div><div class='del'>-	volatile u8	h_sync_start;</div><div class='del'>-	volatile u8	h_sync_end;</div><div class='del'>-	volatile u8	comp_sync_end;</div><div class='del'>-	volatile u8	v_blank_start_high;</div><div class='del'>-	volatile u8	v_blank_start_low;</div><div class='del'>-	volatile u8	v_blank_end;</div><div class='del'>-	volatile u8	v_sync_start;</div><div class='del'>-	volatile u8	v_sync_end;</div><div class='del'>-	volatile u8	xfer_holdoff_start;</div><div class='del'>-	volatile u8	xfer_holdoff_end;</div><div class='add'>+	u8	control;</div><div class='add'>+	u8	status;</div><div class='add'>+	u8	cursor_start;</div><div class='add'>+	u8	cursor_end;</div><div class='add'>+	u8	h_blank_start;</div><div class='add'>+	u8	h_blank_end;</div><div class='add'>+	u8	h_sync_start;</div><div class='add'>+	u8	h_sync_end;</div><div class='add'>+	u8	comp_sync_end;</div><div class='add'>+	u8	v_blank_start_high;</div><div class='add'>+	u8	v_blank_start_low;</div><div class='add'>+	u8	v_blank_end;</div><div class='add'>+	u8	v_sync_start;</div><div class='add'>+	u8	v_sync_end;</div><div class='add'>+	u8	xfer_holdoff_start;</div><div class='add'>+	u8	xfer_holdoff_end;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Offset of interesting structures in the OBIO space */</div><div class='hunk'>@@ -120,9 +121,8 @@ struct cg3_par {</div><div class='ctx'> #define CG3_FLAG_RDI		0x00000002</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		physbase;</div><div class='add'>+	unsigned long		which_io;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='del'>-</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -235,7 +235,7 @@ static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return sbusfb_mmap_helper(cg3_mmap_map,</div><div class='ctx'> 				  par-&gt;physbase, par-&gt;fbsize,</div><div class='del'>-				  par-&gt;sdev-&gt;reg_addrs[0].which_io,</div><div class='add'>+				  par-&gt;which_io,</div><div class='ctx'> 				  vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,11 +252,9 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-cg3_init_fix(struct fb_info *info, int linebytes)</div><div class='add'>+cg3_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	struct cg3_par *par = (struct cg3_par *)info-&gt;par;</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;fix.id, par-&gt;sdev-&gt;prom_name, sizeof(info-&gt;fix.id));</div><div class='add'>+	strlcpy(info-&gt;fix.id, dp-&gt;name, sizeof(info-&gt;fix.id));</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.type = FB_TYPE_PACKED_PIXELS;</div><div class='ctx'> 	info-&gt;fix.visual = FB_VISUAL_PSEUDOCOLOR;</div><div class='hunk'>@@ -267,16 +265,15 @@ cg3_init_fix(struct fb_info *info, int linebytes)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,</div><div class='del'>-				    struct sbus_dev *sdev)</div><div class='add'>+				    struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	char buffer[40];</div><div class='add'>+	char *params;</div><div class='ctx'> 	char *p;</div><div class='ctx'> 	int ww, hh;</div><div class='ctx'> </div><div class='del'>-	*buffer = 0;</div><div class='del'>-	prom_getstring(sdev-&gt;prom_node, "params", buffer, sizeof(buffer));</div><div class='del'>-	if (*buffer) {</div><div class='del'>-		ww = simple_strtoul(buffer, &amp;p, 10);</div><div class='add'>+	params = of_get_property(dp, "params", NULL);</div><div class='add'>+	if (params) {</div><div class='add'>+		ww = simple_strtoul(params, &amp;p, 10);</div><div class='ctx'> 		if (ww &amp;&amp; *p == 'x') {</div><div class='ctx'> 			hh = simple_strtoul(p + 1, &amp;p, 10);</div><div class='ctx'> 			if (hh &amp;&amp; *p == '-') {</div><div class='hunk'>@@ -348,11 +345,11 @@ static void cg3_do_default_mode(struct cg3_par *par)</div><div class='ctx'> 		sbus_writeb(p[1], regp);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (p = cg3_dacvals; *p; p += 2) {</div><div class='del'>-		volatile u8 __iomem *regp;</div><div class='add'>+		u8 __iomem *regp;</div><div class='ctx'> </div><div class='del'>-		regp = (volatile u8 __iomem *)&amp;par-&gt;regs-&gt;cmap.addr;</div><div class='add'>+		regp = (u8 __iomem *)&amp;par-&gt;regs-&gt;cmap.addr;</div><div class='ctx'> 		sbus_writeb(p[0], regp);</div><div class='del'>-		regp = (volatile u8 __iomem *)&amp;par-&gt;regs-&gt;cmap.control;</div><div class='add'>+		regp = (u8 __iomem *)&amp;par-&gt;regs-&gt;cmap.control;</div><div class='ctx'> 		sbus_writeb(p[1], regp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -360,129 +357,137 @@ static void cg3_do_default_mode(struct cg3_par *par)</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct cg3_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(cg3_list);</div><div class='ctx'> </div><div class='del'>-static void cg3_init_one(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit cg3_init_one(struct of_device *op)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct all_info *all;</div><div class='del'>-	int linebytes;</div><div class='del'>-</div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "cg3: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='add'>+	int linebytes, err;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.physbase = sdev-&gt;reg_addrs[0].phys_addr;</div><div class='add'>+	all-&gt;par.physbase = op-&gt;resource[0].start;</div><div class='add'>+	all-&gt;par.which_io = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, sdev-&gt;prom_node, 8);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 8);</div><div class='ctx'> 	all-&gt;info.var.red.length = 8;</div><div class='ctx'> 	all-&gt;info.var.green.length = 8;</div><div class='ctx'> 	all-&gt;info.var.blue.length = 8;</div><div class='del'>-	if (!strcmp(sdev-&gt;prom_name, "cgRDI"))</div><div class='add'>+	if (!strcmp(dp-&gt;name, "cgRDI"))</div><div class='ctx'> 		all-&gt;par.flags |= CG3_FLAG_RDI;</div><div class='ctx'> 	if (all-&gt;par.flags &amp; CG3_FLAG_RDI)</div><div class='del'>-		cg3_rdi_maybe_fixup_var(&amp;all-&gt;info.var, sdev);</div><div class='add'>+		cg3_rdi_maybe_fixup_var(&amp;all-&gt;info.var, dp);</div><div class='ctx'> </div><div class='del'>-	linebytes = prom_getintdefault(sdev-&gt;prom_node, "linebytes",</div><div class='del'>-				       all-&gt;info.var.xres);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.regs = sbus_ioremap(&amp;sdev-&gt;resource[0], CG3_REGS_OFFSET,</div><div class='del'>-			     sizeof(struct cg3_regs), "cg3 regs");</div><div class='add'>+	all-&gt;par.regs = of_ioremap(&amp;op-&gt;resource[0], CG3_REGS_OFFSET,</div><div class='add'>+				   sizeof(struct cg3_regs), "cg3 regs");</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.flags = FBINFO_DEFAULT;</div><div class='ctx'> 	all-&gt;info.fbops = &amp;cg3_ops;</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	all-&gt;info.screen_base = (char __iomem *)</div><div class='del'>-		prom_getintdefault(sdev-&gt;prom_node, "address", 0);</div><div class='del'>-#endif</div><div class='del'>-	if (!all-&gt;info.screen_base)</div><div class='del'>-		all-&gt;info.screen_base =</div><div class='del'>-			sbus_ioremap(&amp;sdev-&gt;resource[0], CG3_RAM_OFFSET,</div><div class='del'>-				     all-&gt;par.fbsize, "cg3 ram");</div><div class='add'>+	all-&gt;info.screen_base =</div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], CG3_RAM_OFFSET,</div><div class='add'>+			   all-&gt;par.fbsize, "cg3 ram");</div><div class='ctx'> 	all-&gt;info.par = &amp;all-&gt;par;</div><div class='ctx'> </div><div class='ctx'> 	cg3_blank(0, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='del'>-	if (!prom_getbool(sdev-&gt;prom_node, "width"))</div><div class='add'>+	if (!of_find_property(dp, "width", NULL))</div><div class='ctx'> 		cg3_do_default_mode(&amp;all-&gt;par);</div><div class='ctx'> </div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='del'>-		printk(KERN_ERR "cg3: Could not allocate color map.\n");</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct cg3_regs));</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	fb_set_cmap(&amp;all-&gt;info.cmap, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='del'>-	cg3_init_fix(&amp;all-&gt;info, linebytes);</div><div class='add'>+	cg3_init_fix(&amp;all-&gt;info, linebytes, dp);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cg3: Could not register framebuffer.\n");</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct cg3_regs));</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;cg3_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='add'>+</div><div class='add'>+	printk("%s: cg3 at %lx:%lx\n",</div><div class='add'>+	       dp-&gt;full_name, all-&gt;par.which_io, all-&gt;par.physbase);</div><div class='ctx'> </div><div class='del'>-	printk("cg3: %s at %lx:%lx\n",</div><div class='del'>-	       sdev-&gt;prom_name,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].phys_addr);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init cg3_init(void)</div><div class='add'>+static int __devinit cg3_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("cg3fb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return cg3_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "cgthree") ||</div><div class='del'>-		    !strcmp(sdev-&gt;prom_name, "cgRDI"))</div><div class='del'>-			cg3_init_one(sdev);</div><div class='del'>-	}</div><div class='add'>+static int __devexit cg3_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+</div><div class='add'>+	of_iounmap(all-&gt;par.regs, sizeof(struct cg3_regs));</div><div class='add'>+	of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit cg3_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id cg3_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "cgthree",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "cgRDI",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, cg3_match);</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;cg3_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static struct of_platform_driver cg3_driver = {</div><div class='add'>+	.name		= "cg3",</div><div class='add'>+	.match_table	= cg3_match,</div><div class='add'>+	.probe		= cg3_probe,</div><div class='add'>+	.remove		= __devexit_p(cg3_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+static int __init cg3_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("cg3fb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;cg3_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-cg3_setup(char *arg)</div><div class='add'>+static void __exit cg3_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;cg3_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cg3_init);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(cg3_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for CGthree chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c<br/>index 7aab91ead681..64146be2eeb0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cg6.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cg6.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cg6.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cg6.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* cg6.c: CGSIX (GX, GXplus, TGX) frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)</div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -164,89 +164,89 @@ static struct fb_ops cg6_ops = {</div><div class='ctx'> </div><div class='ctx'> /* The contents are unknown */</div><div class='ctx'> struct cg6_tec {</div><div class='del'>-	volatile int tec_matrix;</div><div class='del'>-	volatile int tec_clip;</div><div class='del'>-	volatile int tec_vdc;</div><div class='add'>+	int tec_matrix;</div><div class='add'>+	int tec_clip;</div><div class='add'>+	int tec_vdc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cg6_thc {</div><div class='del'>-        uint thc_pad0[512];</div><div class='del'>-	volatile uint thc_hs;		/* hsync timing */</div><div class='del'>-	volatile uint thc_hsdvs;</div><div class='del'>-	volatile uint thc_hd;</div><div class='del'>-	volatile uint thc_vs;		/* vsync timing */</div><div class='del'>-	volatile uint thc_vd;</div><div class='del'>-	volatile uint thc_refresh;</div><div class='del'>-	volatile uint thc_misc;</div><div class='del'>-	uint thc_pad1[56];</div><div class='del'>-	volatile uint thc_cursxy;	/* cursor x,y position (16 bits each) */</div><div class='del'>-	volatile uint thc_cursmask[32];	/* cursor mask bits */</div><div class='del'>-	volatile uint thc_cursbits[32];	/* what to show where mask enabled */</div><div class='add'>+        u32 thc_pad0[512];</div><div class='add'>+	u32 thc_hs;		/* hsync timing */</div><div class='add'>+	u32 thc_hsdvs;</div><div class='add'>+	u32 thc_hd;</div><div class='add'>+	u32 thc_vs;		/* vsync timing */</div><div class='add'>+	u32 thc_vd;</div><div class='add'>+	u32 thc_refresh;</div><div class='add'>+	u32 thc_misc;</div><div class='add'>+	u32 thc_pad1[56];</div><div class='add'>+	u32 thc_cursxy;	/* cursor x,y position (16 bits each) */</div><div class='add'>+	u32 thc_cursmask[32];	/* cursor mask bits */</div><div class='add'>+	u32 thc_cursbits[32];	/* what to show where mask enabled */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cg6_fbc {</div><div class='del'>-	u32		xxx0[1];</div><div class='del'>-	volatile u32	mode;</div><div class='del'>-	volatile u32	clip;</div><div class='del'>-	u32		xxx1[1];	    </div><div class='del'>-	volatile u32	s;</div><div class='del'>-	volatile u32	draw;</div><div class='del'>-	volatile u32	blit;</div><div class='del'>-	volatile u32	font;</div><div class='del'>-	u32		xxx2[24];</div><div class='del'>-	volatile u32	x0, y0, z0, color0;</div><div class='del'>-	volatile u32	x1, y1, z1, color1;</div><div class='del'>-	volatile u32	x2, y2, z2, color2;</div><div class='del'>-	volatile u32	x3, y3, z3, color3;</div><div class='del'>-	volatile u32	offx, offy;</div><div class='del'>-	u32		xxx3[2];</div><div class='del'>-	volatile u32	incx, incy;</div><div class='del'>-	u32		xxx4[2];</div><div class='del'>-	volatile u32	clipminx, clipminy;</div><div class='del'>-	u32		xxx5[2];</div><div class='del'>-	volatile u32	clipmaxx, clipmaxy;</div><div class='del'>-	u32		xxx6[2];</div><div class='del'>-	volatile u32	fg;</div><div class='del'>-	volatile u32	bg;</div><div class='del'>-	volatile u32	alu;</div><div class='del'>-	volatile u32	pm;</div><div class='del'>-	volatile u32	pixelm;</div><div class='del'>-	u32		xxx7[2];</div><div class='del'>-	volatile u32	patalign;</div><div class='del'>-	volatile u32	pattern[8];</div><div class='del'>-	u32		xxx8[432];</div><div class='del'>-	volatile u32	apointx, apointy, apointz;</div><div class='del'>-	u32		xxx9[1];</div><div class='del'>-	volatile u32	rpointx, rpointy, rpointz;</div><div class='del'>-	u32		xxx10[5];</div><div class='del'>-	volatile u32	pointr, pointg, pointb, pointa;</div><div class='del'>-	volatile u32	alinex, aliney, alinez;</div><div class='del'>-	u32		xxx11[1];</div><div class='del'>-	volatile u32	rlinex, rliney, rlinez;</div><div class='del'>-	u32		xxx12[5];</div><div class='del'>-	volatile u32	liner, lineg, lineb, linea;</div><div class='del'>-	volatile u32	atrix, atriy, atriz;</div><div class='del'>-	u32		xxx13[1];</div><div class='del'>-	volatile u32	rtrix, rtriy, rtriz;</div><div class='del'>-	u32		xxx14[5];</div><div class='del'>-	volatile u32	trir, trig, trib, tria;</div><div class='del'>-	volatile u32	aquadx, aquady, aquadz;</div><div class='del'>-	u32		xxx15[1];</div><div class='del'>-	volatile u32	rquadx, rquady, rquadz;</div><div class='del'>-	u32		xxx16[5];</div><div class='del'>-	volatile u32	quadr, quadg, quadb, quada;</div><div class='del'>-	volatile u32	arectx, arecty, arectz;</div><div class='del'>-	u32		xxx17[1];</div><div class='del'>-	volatile u32	rrectx, rrecty, rrectz;</div><div class='del'>-	u32		xxx18[5];</div><div class='del'>-	volatile u32	rectr, rectg, rectb, recta;</div><div class='add'>+	u32	xxx0[1];</div><div class='add'>+	u32	mode;</div><div class='add'>+	u32	clip;</div><div class='add'>+	u32	xxx1[1];	    </div><div class='add'>+	u32	s;</div><div class='add'>+	u32	draw;</div><div class='add'>+	u32	blit;</div><div class='add'>+	u32	font;</div><div class='add'>+	u32	xxx2[24];</div><div class='add'>+	u32	x0, y0, z0, color0;</div><div class='add'>+	u32	x1, y1, z1, color1;</div><div class='add'>+	u32	x2, y2, z2, color2;</div><div class='add'>+	u32	x3, y3, z3, color3;</div><div class='add'>+	u32	offx, offy;</div><div class='add'>+	u32	xxx3[2];</div><div class='add'>+	u32	incx, incy;</div><div class='add'>+	u32	xxx4[2];</div><div class='add'>+	u32	clipminx, clipminy;</div><div class='add'>+	u32	xxx5[2];</div><div class='add'>+	u32	clipmaxx, clipmaxy;</div><div class='add'>+	u32	xxx6[2];</div><div class='add'>+	u32	fg;</div><div class='add'>+	u32	bg;</div><div class='add'>+	u32	alu;</div><div class='add'>+	u32	pm;</div><div class='add'>+	u32	pixelm;</div><div class='add'>+	u32	xxx7[2];</div><div class='add'>+	u32	patalign;</div><div class='add'>+	u32	pattern[8];</div><div class='add'>+	u32	xxx8[432];</div><div class='add'>+	u32	apointx, apointy, apointz;</div><div class='add'>+	u32	xxx9[1];</div><div class='add'>+	u32	rpointx, rpointy, rpointz;</div><div class='add'>+	u32	xxx10[5];</div><div class='add'>+	u32	pointr, pointg, pointb, pointa;</div><div class='add'>+	u32	alinex, aliney, alinez;</div><div class='add'>+	u32	xxx11[1];</div><div class='add'>+	u32	rlinex, rliney, rlinez;</div><div class='add'>+	u32	xxx12[5];</div><div class='add'>+	u32	liner, lineg, lineb, linea;</div><div class='add'>+	u32	atrix, atriy, atriz;</div><div class='add'>+	u32	xxx13[1];</div><div class='add'>+	u32	rtrix, rtriy, rtriz;</div><div class='add'>+	u32	xxx14[5];</div><div class='add'>+	u32	trir, trig, trib, tria;</div><div class='add'>+	u32	aquadx, aquady, aquadz;</div><div class='add'>+	u32	xxx15[1];</div><div class='add'>+	u32	rquadx, rquady, rquadz;</div><div class='add'>+	u32	xxx16[5];</div><div class='add'>+	u32	quadr, quadg, quadb, quada;</div><div class='add'>+	u32	arectx, arecty, arectz;</div><div class='add'>+	u32	xxx17[1];</div><div class='add'>+	u32	rrectx, rrecty, rrectz;</div><div class='add'>+	u32	xxx18[5];</div><div class='add'>+	u32	rectr, rectg, rectb, recta;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bt_regs {</div><div class='del'>-	volatile u32 addr;</div><div class='del'>-	volatile u32 color_map;</div><div class='del'>-	volatile u32 control;</div><div class='del'>-	volatile u32 cursor;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 color_map;</div><div class='add'>+	u32 control;</div><div class='add'>+	u32 cursor;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cg6_par {</div><div class='hunk'>@@ -255,15 +255,14 @@ struct cg6_par {</div><div class='ctx'> 	struct cg6_fbc		__iomem *fbc;</div><div class='ctx'> 	struct cg6_thc		__iomem *thc;</div><div class='ctx'> 	struct cg6_tec		__iomem *tec;</div><div class='del'>-	volatile u32		__iomem *fhc;</div><div class='add'>+	u32			__iomem *fhc;</div><div class='ctx'> </div><div class='ctx'> 	u32			flags;</div><div class='ctx'> #define CG6_FLAG_BLANKED	0x00000001</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		physbase;</div><div class='add'>+	unsigned long		which_io;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='del'>-</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int cg6_sync(struct fb_info *info)</div><div class='hunk'>@@ -529,8 +528,7 @@ static int cg6_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return sbusfb_mmap_helper(cg6_mmap_map,</div><div class='ctx'> 				  par-&gt;physbase, par-&gt;fbsize,</div><div class='del'>-				  par-&gt;sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-				  vma);</div><div class='add'>+				  par-&gt;which_io, vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -658,62 +656,75 @@ static void cg6_chip_init(struct fb_info *info)</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct cg6_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(cg6_list);</div><div class='ctx'> </div><div class='del'>-static void cg6_init_one(struct sbus_dev *sdev)</div><div class='add'>+static void cg6_unmap_regs(struct all_info *all)</div><div class='ctx'> {</div><div class='del'>-	struct all_info *all;</div><div class='del'>-	int linebytes;</div><div class='add'>+	if (all-&gt;par.fbc)</div><div class='add'>+		of_iounmap(all-&gt;par.fbc, 4096);</div><div class='add'>+	if (all-&gt;par.tec)</div><div class='add'>+		of_iounmap(all-&gt;par.tec, sizeof(struct cg6_tec));</div><div class='add'>+	if (all-&gt;par.thc)</div><div class='add'>+		of_iounmap(all-&gt;par.thc, sizeof(struct cg6_thc));</div><div class='add'>+	if (all-&gt;par.bt)</div><div class='add'>+		of_iounmap(all-&gt;par.bt, sizeof(struct bt_regs));</div><div class='add'>+	if (all-&gt;par.fhc)</div><div class='add'>+		of_iounmap(all-&gt;par.fhc, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	if (all-&gt;info.screen_base)</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "cg6: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='add'>+static int __devinit cg6_init_one(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct all_info *all;</div><div class='add'>+	int linebytes, err;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.physbase = sdev-&gt;reg_addrs[0].phys_addr;</div><div class='add'>+	all-&gt;par.physbase = op-&gt;resource[0].start;</div><div class='add'>+	all-&gt;par.which_io = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, sdev-&gt;prom_node, 8);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 8);</div><div class='ctx'> 	all-&gt;info.var.red.length = 8;</div><div class='ctx'> 	all-&gt;info.var.green.length = 8;</div><div class='ctx'> 	all-&gt;info.var.blue.length = 8;</div><div class='ctx'> </div><div class='del'>-	linebytes = prom_getintdefault(sdev-&gt;prom_node, "linebytes",</div><div class='del'>-				       all-&gt;info.var.xres);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='del'>-	if (prom_getbool(sdev-&gt;prom_node, "dblbuf"))</div><div class='add'>+	if (of_find_property(dp, "dblbuf", NULL))</div><div class='ctx'> 		all-&gt;par.fbsize *= 4;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.fbc = sbus_ioremap(&amp;sdev-&gt;resource[0], CG6_FBC_OFFSET,</div><div class='del'>-			     4096, "cgsix fbc");</div><div class='del'>-	all-&gt;par.tec = sbus_ioremap(&amp;sdev-&gt;resource[0], CG6_TEC_OFFSET,</div><div class='del'>-			     sizeof(struct cg6_tec), "cgsix tec");</div><div class='del'>-	all-&gt;par.thc = sbus_ioremap(&amp;sdev-&gt;resource[0], CG6_THC_OFFSET,</div><div class='del'>-			     sizeof(struct cg6_thc), "cgsix thc");</div><div class='del'>-	all-&gt;par.bt = sbus_ioremap(&amp;sdev-&gt;resource[0], CG6_BROOKTREE_OFFSET,</div><div class='del'>-			     sizeof(struct bt_regs), "cgsix dac");</div><div class='del'>-	all-&gt;par.fhc = sbus_ioremap(&amp;sdev-&gt;resource[0], CG6_FHC_OFFSET,</div><div class='del'>-			     sizeof(u32), "cgsix fhc");</div><div class='add'>+	all-&gt;par.fbc = of_ioremap(&amp;op-&gt;resource[0], CG6_FBC_OFFSET,</div><div class='add'>+				  4096, "cgsix fbc");</div><div class='add'>+	all-&gt;par.tec = of_ioremap(&amp;op-&gt;resource[0], CG6_TEC_OFFSET,</div><div class='add'>+				  sizeof(struct cg6_tec), "cgsix tec");</div><div class='add'>+	all-&gt;par.thc = of_ioremap(&amp;op-&gt;resource[0], CG6_THC_OFFSET,</div><div class='add'>+				  sizeof(struct cg6_thc), "cgsix thc");</div><div class='add'>+	all-&gt;par.bt = of_ioremap(&amp;op-&gt;resource[0], CG6_BROOKTREE_OFFSET,</div><div class='add'>+				 sizeof(struct bt_regs), "cgsix dac");</div><div class='add'>+	all-&gt;par.fhc = of_ioremap(&amp;op-&gt;resource[0], CG6_FHC_OFFSET,</div><div class='add'>+				  sizeof(u32), "cgsix fhc");</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT |</div><div class='ctx'>                           FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT;</div><div class='ctx'> 	all-&gt;info.fbops = &amp;cg6_ops;</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	all-&gt;info.screen_base = (char __iomem *)</div><div class='del'>-		prom_getintdefault(sdev-&gt;prom_node, "address", 0);</div><div class='del'>-#endif</div><div class='del'>-	if (!all-&gt;info.screen_base)</div><div class='del'>-		all-&gt;info.screen_base = </div><div class='del'>-			sbus_ioremap(&amp;sdev-&gt;resource[0], CG6_RAM_OFFSET,</div><div class='del'>-				     all-&gt;par.fbsize, "cgsix ram");</div><div class='add'>+</div><div class='add'>+	all-&gt;info.screen_base =  of_ioremap(&amp;op-&gt;resource[0], CG6_RAM_OFFSET,</div><div class='add'>+					    all-&gt;par.fbsize, "cgsix ram");</div><div class='add'>+	if (!all-&gt;par.fbc || !all-&gt;par.tec || !all-&gt;par.thc ||</div><div class='add'>+	    !all-&gt;par.bt || !all-&gt;par.fhc || !all-&gt;info.screen_base) {</div><div class='add'>+		cg6_unmap_regs(all);</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	all-&gt;info.par = &amp;all-&gt;par;</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.var.accel_flags = FB_ACCELF_TEXT;</div><div class='hunk'>@@ -723,72 +734,90 @@ static void cg6_init_one(struct sbus_dev *sdev)</div><div class='ctx'> 	cg6_blank(0, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='del'>-		printk(KERN_ERR "cg6: Could not allocate color map.\n");</div><div class='add'>+		cg6_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fb_set_cmap(&amp;all-&gt;info.cmap, &amp;all-&gt;info);</div><div class='ctx'> 	cg6_init_fix(&amp;all-&gt;info, linebytes);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cg6: Could not register framebuffer.\n");</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		cg6_unmap_regs(all);</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;cg6_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='ctx'> </div><div class='del'>-	printk("cg6: CGsix [%s] at %lx:%lx\n",</div><div class='add'>+	printk("%s: CGsix [%s] at %lx:%lx\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='ctx'> 	       all-&gt;info.fix.id,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].phys_addr);</div><div class='add'>+	       all-&gt;par.which_io, all-&gt;par.physbase);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init cg6_init(void)</div><div class='add'>+static int __devinit cg6_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("cg6fb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return cg6_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "cgsix") ||</div><div class='del'>-		    !strcmp(sdev-&gt;prom_name, "cgthree+"))</div><div class='del'>-			cg6_init_one(sdev);</div><div class='del'>-	}</div><div class='add'>+static int __devexit cg6_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+</div><div class='add'>+	cg6_unmap_regs(all);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit cg6_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id cg6_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "cgsix",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "cgthree+",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, cg6_match);</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;cg6_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static struct of_platform_driver cg6_driver = {</div><div class='add'>+	.name		= "cg6",</div><div class='add'>+	.match_table	= cg6_match,</div><div class='add'>+	.probe		= cg6_probe,</div><div class='add'>+	.remove		= __devexit_p(cg6_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+static int __init cg6_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("cg6fb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;cg6_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-cg6_setup(char *arg)</div><div class='add'>+static void __exit cg6_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;cg6_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(cg6_init);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(cg6_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for CGsix chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c<br/>index 72ff6bf75e5e..73cb426bf2d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/chipsfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/chipsfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/chipsfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/chipsfb.c</a></div><div class='hunk'>@@ -14,13 +14,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -148,9 +146,23 @@ static int chipsfb_set_par(struct fb_info *info)</div><div class='ctx'> static int chipsfb_blank(int blank, struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	// used to disable backlight only for blank &gt; 1, but it seems</div><div class='del'>-	// useful at blank = 1 too (saves battery, extends backlight life)</div><div class='del'>-	set_backlight_enable(!blank);</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+</div><div class='add'>+	if (pmac_backlight) {</div><div class='add'>+		/* used to disable backlight only for blank &gt; 1, but it seems</div><div class='add'>+		 * useful at blank = 1 too (saves battery, extends backlight</div><div class='add'>+		 * life)</div><div class='add'>+	 	 */</div><div class='add'>+		down(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+		if (blank)</div><div class='add'>+			pmac_backlight-&gt;props-&gt;power = FB_BLANK_POWERDOWN;</div><div class='add'>+		else</div><div class='add'>+			pmac_backlight-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+		pmac_backlight-&gt;props-&gt;update_status(pmac_backlight);</div><div class='add'>+		up(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='ctx'> #endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='ctx'> </div><div class='ctx'> 	return 1;	/* get fb_blank to set the colormap to all black */</div><div class='hunk'>@@ -401,7 +413,14 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PMAC_BACKLIGHT</div><div class='ctx'> 	/* turn on the backlight */</div><div class='del'>-	set_backlight_enable(1);</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (pmac_backlight) {</div><div class='add'>+		down(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+		pmac_backlight-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+		pmac_backlight-&gt;props-&gt;update_status(pmac_backlight);</div><div class='add'>+		up(&amp;pmac_backlight-&gt;sem);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='ctx'> #endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PPC</div><div class='head'>diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c<br/>index 1103010af54a..daf43f535a0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cirrusfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cirrusfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cirrusfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cirrusfb.c</a></div><div class='hunk'>@@ -36,13 +36,11 @@</div><div class='ctx'> </div><div class='ctx'> #define CIRRUSFB_VERSION "2.0-pre2"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -2227,7 +2225,6 @@ static void cirrusfb_pci_unmap (struct cirrusfb_info *cinfo)</div><div class='ctx'> 		release_region(0x3C0, 32);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	framebuffer_release(cinfo-&gt;info);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='hunk'>@@ -2458,7 +2455,6 @@ err_release_regions:</div><div class='ctx'> err_release_fb:</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> err_disable:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> err_out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c<br/>index eea422eb1ab5..308850df16fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/bitblit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/bitblit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/bitblit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/bitblit.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c<br/>index 1ecda91e5a9c..d9315d99445f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/dummycon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/dummycon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/dummycon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/dummycon.c</a></div><div class='hunk'>@@ -7,9 +7,9 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kdev_t.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #define DUMMY_ROWS	ORIG_VIDEO_LINES</div><div class='ctx'> #elif defined(__hppa__)</div><div class='ctx'> /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #define DUMMY_COLUMNS	CONFIG_DUMMY_CONSOLE_COLUMNS</div><div class='ctx'> #define DUMMY_ROWS	CONFIG_DUMMY_CONSOLE_ROWS</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c<br/>index 953eb8c171d6..390439b3d899 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fbcon.c</a></div><div class='hunk'>@@ -58,14 +58,12 @@</div><div class='ctx'> </div><div class='ctx'> #undef FBCONDEBUG</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;	/* MSch: for IRQ probe */</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='hunk'>@@ -125,6 +123,8 @@ static int softback_lines;</div><div class='ctx'> static int first_fb_vc;</div><div class='ctx'> static int last_fb_vc = MAX_NR_CONSOLES - 1;</div><div class='ctx'> static int fbcon_is_default = 1; </div><div class='add'>+static int fbcon_has_exited;</div><div class='add'>+</div><div class='ctx'> /* font data */</div><div class='ctx'> static char fontname[40];</div><div class='ctx'> </div><div class='hunk'>@@ -140,7 +140,6 @@ static const struct consw fb_con;</div><div class='ctx'> </div><div class='ctx'> #define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc-&gt;vc_size_row)</div><div class='ctx'> </div><div class='del'>-static void fbcon_free_font(struct display *);</div><div class='ctx'> static int fbcon_set_origin(struct vc_data *);</div><div class='ctx'> </div><div class='ctx'> #define CURSOR_DRAW_DELAY		(1)</div><div class='hunk'>@@ -194,6 +193,9 @@ static void fbcon_redraw_move(struct vc_data *vc, struct display *p,</div><div class='ctx'> 			      int line, int count, int dy);</div><div class='ctx'> static void fbcon_modechanged(struct fb_info *info);</div><div class='ctx'> static void fbcon_set_all_vcs(struct fb_info *info);</div><div class='add'>+static void fbcon_start(void);</div><div class='add'>+static void fbcon_exit(void);</div><div class='add'>+static struct class_device *fbcon_class_device;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MAC</div><div class='ctx'> /*</div><div class='hunk'>@@ -252,7 +254,7 @@ static void fbcon_rotate_all(struct fb_info *info, u32 rotate)</div><div class='ctx'> 	if (!ops || ops-&gt;currcon &lt; 0 || rotate &gt; 3)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 		vc = vc_cons[i].d;</div><div class='ctx'> 		if (!vc || vc-&gt;vc_mode != KD_TEXT ||</div><div class='ctx'> 		    registered_fb[con2fb_map[i]] != info)</div><div class='hunk'>@@ -389,15 +391,18 @@ static void fb_flashcursor(void *private)</div><div class='ctx'> 	int c;</div><div class='ctx'> 	int mode;</div><div class='ctx'> </div><div class='del'>-	if (ops-&gt;currcon != -1)</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;currcon != -1)</div><div class='ctx'> 		vc = vc_cons[ops-&gt;currcon].d;</div><div class='ctx'> </div><div class='ctx'> 	if (!vc || !CON_IS_VISIBLE(vc) ||</div><div class='ctx'> 	    fbcon_is_inactive(vc, info) ||</div><div class='ctx'>  	    registered_fb[con2fb_map[vc-&gt;vc_num]] != info ||</div><div class='del'>-	    vc_cons[ops-&gt;currcon].d-&gt;vc_deccm != 1)</div><div class='add'>+	    vc_cons[ops-&gt;currcon].d-&gt;vc_deccm != 1) {</div><div class='add'>+		release_console_sem();</div><div class='ctx'> 		return;</div><div class='del'>-	acquire_console_sem();</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	p = &amp;fb_display[vc-&gt;vc_num];</div><div class='ctx'> 	c = scr_readw((u16 *) vc-&gt;vc_pos);</div><div class='ctx'> 	mode = (!ops-&gt;cursor_flash || ops-&gt;cursor_state.enable) ?</div><div class='hunk'>@@ -528,7 +533,7 @@ static int search_fb_in_map(int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int i, retval = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 		if (con2fb_map[i] == idx)</div><div class='ctx'> 			retval = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -539,7 +544,7 @@ static int search_for_mapped_con(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, retval = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 		if (con2fb_map[i] != -1)</div><div class='ctx'> 			retval = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -561,6 +566,7 @@ static int fbcon_takeover(int show_logo)</div><div class='ctx'> </div><div class='ctx'> 	err = take_over_console(&amp;fb_con, first_fb_vc, last_fb_vc,</div><div class='ctx'> 				fbcon_is_default);</div><div class='add'>+</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 			con2fb_map[i] = -1;</div><div class='hunk'>@@ -795,8 +801,8 @@ static int set_con2fb_map(int unit, int newidx, int user)</div><div class='ctx'> 	if (oldidx == newidx)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!info)</div><div class='del'>- 		err =  -EINVAL;</div><div class='add'>+	if (!info || fbcon_has_exited)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'>  	if (!err &amp;&amp; !search_for_mapped_con()) {</div><div class='ctx'> 		info_idx = newidx;</div><div class='hunk'>@@ -832,6 +838,9 @@ static int set_con2fb_map(int unit, int newidx, int user)</div><div class='ctx'>  		con2fb_init_display(vc, info, unit, show_logo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!search_fb_in_map(info_idx))</div><div class='add'>+		info_idx = newidx;</div><div class='add'>+</div><div class='ctx'> 	release_console_sem();</div><div class='ctx'>  	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1034,6 +1043,7 @@ static const char *fbcon_startup(void)</div><div class='ctx'> #endif				/* CONFIG_MAC */</div><div class='ctx'> </div><div class='ctx'> 	fbcon_add_cursor_timer(info);</div><div class='add'>+	fbcon_has_exited = 0;</div><div class='ctx'> 	return display_desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1061,17 +1071,36 @@ static void fbcon_init(struct vc_data *vc, int init)</div><div class='ctx'> </div><div class='ctx'> 	/* If we are not the first console on this</div><div class='ctx'> 	   fb, copy the font from that console */</div><div class='del'>-	t = &amp;fb_display[svc-&gt;vc_num];</div><div class='del'>-	if (!vc-&gt;vc_font.data) {</div><div class='del'>-		vc-&gt;vc_font.data = (void *)(p-&gt;fontdata = t-&gt;fontdata);</div><div class='del'>-		vc-&gt;vc_font.width = (*default_mode)-&gt;vc_font.width;</div><div class='del'>-		vc-&gt;vc_font.height = (*default_mode)-&gt;vc_font.height;</div><div class='del'>-		p-&gt;userfont = t-&gt;userfont;</div><div class='del'>-		if (p-&gt;userfont)</div><div class='del'>-			REFCOUNT(p-&gt;fontdata)++;</div><div class='add'>+	t = &amp;fb_display[fg_console];</div><div class='add'>+	if (!p-&gt;fontdata) {</div><div class='add'>+		if (t-&gt;fontdata) {</div><div class='add'>+			struct vc_data *fvc = vc_cons[fg_console].d;</div><div class='add'>+</div><div class='add'>+			vc-&gt;vc_font.data = (void *)(p-&gt;fontdata =</div><div class='add'>+						    fvc-&gt;vc_font.data);</div><div class='add'>+			vc-&gt;vc_font.width = fvc-&gt;vc_font.width;</div><div class='add'>+			vc-&gt;vc_font.height = fvc-&gt;vc_font.height;</div><div class='add'>+			p-&gt;userfont = t-&gt;userfont;</div><div class='add'>+</div><div class='add'>+			if (p-&gt;userfont)</div><div class='add'>+				REFCOUNT(p-&gt;fontdata)++;</div><div class='add'>+		} else {</div><div class='add'>+			const struct font_desc *font = NULL;</div><div class='add'>+</div><div class='add'>+			if (!fontname[0] || !(font = find_font(fontname)))</div><div class='add'>+				font = get_default_font(info-&gt;var.xres,</div><div class='add'>+							info-&gt;var.yres);</div><div class='add'>+			vc-&gt;vc_font.width = font-&gt;width;</div><div class='add'>+			vc-&gt;vc_font.height = font-&gt;height;</div><div class='add'>+			vc-&gt;vc_font.data = (void *)(p-&gt;fontdata = font-&gt;data);</div><div class='add'>+			vc-&gt;vc_font.charcount = 256; /* FIXME  Need to</div><div class='add'>+							support more fonts */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (p-&gt;userfont)</div><div class='ctx'> 		charcnt = FNTCHARCNT(p-&gt;fontdata);</div><div class='add'>+</div><div class='ctx'> 	vc-&gt;vc_can_do_color = (fb_get_color_depth(&amp;info-&gt;var, &amp;info-&gt;fix)!=1);</div><div class='ctx'> 	vc-&gt;vc_complement_mask = vc-&gt;vc_can_do_color ? 0x7700 : 0x0800;</div><div class='ctx'> 	if (charcnt == 256) {</div><div class='hunk'>@@ -1145,13 +1174,47 @@ static void fbcon_init(struct vc_data *vc, int init)</div><div class='ctx'> 	ops-&gt;p = &amp;fb_display[fg_console];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fbcon_free_font(struct display *p)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;userfont &amp;&amp; p-&gt;fontdata &amp;&amp; (--REFCOUNT(p-&gt;fontdata) == 0))</div><div class='add'>+		kfree(p-&gt;fontdata - FONT_EXTRA_WORDS * sizeof(int));</div><div class='add'>+	p-&gt;fontdata = NULL;</div><div class='add'>+	p-&gt;userfont = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void fbcon_deinit(struct vc_data *vc)</div><div class='ctx'> {</div><div class='ctx'> 	struct display *p = &amp;fb_display[vc-&gt;vc_num];</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	struct fbcon_ops *ops;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='del'>-	if (info_idx != -1)</div><div class='del'>-	    return;</div><div class='ctx'> 	fbcon_free_font(p);</div><div class='add'>+	idx = con2fb_map[vc-&gt;vc_num];</div><div class='add'>+</div><div class='add'>+	if (idx == -1)</div><div class='add'>+		goto finished;</div><div class='add'>+</div><div class='add'>+	info = registered_fb[idx];</div><div class='add'>+</div><div class='add'>+	if (!info)</div><div class='add'>+		goto finished;</div><div class='add'>+</div><div class='add'>+	ops = info-&gt;fbcon_par;</div><div class='add'>+</div><div class='add'>+	if (!ops)</div><div class='add'>+		goto finished;</div><div class='add'>+</div><div class='add'>+	if (CON_IS_VISIBLE(vc))</div><div class='add'>+		fbcon_del_cursor_timer(info);</div><div class='add'>+</div><div class='add'>+	ops-&gt;flags &amp;= ~FBCON_FLAGS_INIT;</div><div class='add'>+finished:</div><div class='add'>+</div><div class='add'>+	if (!con_is_bound(&amp;fb_con))</div><div class='add'>+		fbcon_exit();</div><div class='add'>+</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ====================================================================== */</div><div class='hunk'>@@ -1745,7 +1808,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,</div><div class='ctx'> 					fbcon_redraw_move(vc, p, 0, t, count);</div><div class='ctx'> 				ypan_up_redraw(vc, t, count);</div><div class='ctx'> 				if (vc-&gt;vc_rows - b &gt; 0)</div><div class='del'>-					fbcon_redraw_move(vc, p, b - count,</div><div class='add'>+					fbcon_redraw_move(vc, p, b,</div><div class='ctx'> 							  vc-&gt;vc_rows - b, b);</div><div class='ctx'> 			} else</div><div class='ctx'> 				fbcon_redraw_move(vc, p, t + count, b - t - count, t);</div><div class='hunk'>@@ -2099,12 +2162,11 @@ static int fbcon_switch(struct vc_data *vc)</div><div class='ctx'> 		if (info-&gt;fbops-&gt;fb_set_par)</div><div class='ctx'> 			info-&gt;fbops-&gt;fb_set_par(info);</div><div class='ctx'> </div><div class='del'>-		if (old_info != info) {</div><div class='add'>+		if (old_info != info)</div><div class='ctx'> 			fbcon_del_cursor_timer(old_info);</div><div class='del'>-			fbcon_add_cursor_timer(info);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	fbcon_add_cursor_timer(info);</div><div class='ctx'> 	set_blitting_type(vc, info);</div><div class='ctx'> 	ops-&gt;cursor_reset = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -2222,14 +2284,6 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fbcon_free_font(struct display *p)</div><div class='del'>-{</div><div class='del'>-	if (p-&gt;userfont &amp;&amp; p-&gt;fontdata &amp;&amp; (--REFCOUNT(p-&gt;fontdata) == 0))</div><div class='del'>-		kfree(p-&gt;fontdata - FONT_EXTRA_WORDS * sizeof(int));</div><div class='del'>-	p-&gt;fontdata = NULL;</div><div class='del'>-	p-&gt;userfont = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int fbcon_get_font(struct vc_data *vc, struct console_font *font)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *fontdata = vc-&gt;vc_font.data;</div><div class='hunk'>@@ -2443,7 +2497,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne</div><div class='ctx'> </div><div class='ctx'> 	FNTSUM(new_data) = csum;</div><div class='ctx'> 	/* Check if the same font is on some other console already */</div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 		struct vc_data *tmp = vc_cons[i].d;</div><div class='ctx'> 		</div><div class='ctx'> 		if (fb_display[i].userfont &amp;&amp;</div><div class='hunk'>@@ -2768,7 +2822,7 @@ static void fbcon_set_all_vcs(struct fb_info *info)</div><div class='ctx'> 	if (!ops || ops-&gt;currcon &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 		vc = vc_cons[i].d;</div><div class='ctx'> 		if (!vc || vc-&gt;vc_mode != KD_TEXT ||</div><div class='ctx'> 		    registered_fb[con2fb_map[i]] != info)</div><div class='hunk'>@@ -2830,22 +2884,57 @@ static int fbcon_mode_deleted(struct fb_info *info,</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fbcon_fb_unregistered(int idx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='add'>+		if (con2fb_map[i] == idx)</div><div class='add'>+			con2fb_map[i] = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (idx == info_idx) {</div><div class='add'>+		info_idx = -1;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; FB_MAX; i++) {</div><div class='add'>+			if (registered_fb[i] != NULL) {</div><div class='add'>+				info_idx = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info_idx != -1) {</div><div class='add'>+		for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='add'>+			if (con2fb_map[i] == -1)</div><div class='add'>+				con2fb_map[i] = info_idx;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!num_registered_fb)</div><div class='add'>+		unregister_con_driver(&amp;fb_con);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int fbcon_fb_registered(int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> </div><div class='ctx'> 	if (info_idx == -1) {</div><div class='del'>-		for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+		for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 			if (con2fb_map_boot[i] == idx) {</div><div class='ctx'> 				info_idx = idx;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (info_idx != -1)</div><div class='ctx'> 			ret = fbcon_takeover(1);</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='del'>-			if (con2fb_map_boot[i] == idx)</div><div class='add'>+		for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='add'>+			if (con2fb_map_boot[i] == idx &amp;&amp;</div><div class='add'>+			    con2fb_map[i] == -1)</div><div class='ctx'> 				set_con2fb_map(i, idx, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2882,7 +2971,7 @@ static void fbcon_new_modelist(struct fb_info *info)</div><div class='ctx'> 	struct fb_var_screeninfo var;</div><div class='ctx'> 	struct fb_videomode *mode;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++) {</div><div class='add'>+	for (i = first_fb_vc; i &lt;= last_fb_vc; i++) {</div><div class='ctx'> 		if (registered_fb[con2fb_map[i]] != info)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!fb_display[i].mode)</div><div class='hunk'>@@ -2910,6 +2999,14 @@ static int fbcon_event_notify(struct notifier_block *self,</div><div class='ctx'> 	struct fb_con2fbmap *con2fb;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * ignore all events except driver registration and deregistration</div><div class='add'>+	 * if fbcon is not active</div><div class='add'>+	 */</div><div class='add'>+	if (fbcon_has_exited &amp;&amp; !(action == FB_EVENT_FB_REGISTERED ||</div><div class='add'>+				  action == FB_EVENT_FB_UNREGISTERED))</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='ctx'> 	switch(action) {</div><div class='ctx'> 	case FB_EVENT_SUSPEND:</div><div class='ctx'> 		fbcon_suspended(info);</div><div class='hunk'>@@ -2930,6 +3027,9 @@ static int fbcon_event_notify(struct notifier_block *self,</div><div class='ctx'> 	case FB_EVENT_FB_REGISTERED:</div><div class='ctx'> 		ret = fbcon_fb_registered(info-&gt;node);</div><div class='ctx'> 		break;</div><div class='add'>+	case FB_EVENT_FB_UNREGISTERED:</div><div class='add'>+		ret = fbcon_fb_unregistered(info-&gt;node);</div><div class='add'>+		break;</div><div class='ctx'> 	case FB_EVENT_SET_CONSOLE_MAP:</div><div class='ctx'> 		con2fb = event-&gt;data;</div><div class='ctx'> 		ret = set_con2fb_map(con2fb-&gt;console - 1,</div><div class='hunk'>@@ -2945,16 +3045,9 @@ static int fbcon_event_notify(struct notifier_block *self,</div><div class='ctx'> 	case FB_EVENT_NEW_MODELIST:</div><div class='ctx'> 		fbcon_new_modelist(info);</div><div class='ctx'> 		break;</div><div class='del'>-	case FB_EVENT_SET_CON_ROTATE:</div><div class='del'>-		fbcon_rotate(info, *(int *)event-&gt;data);</div><div class='del'>-		break;</div><div class='del'>-	case FB_EVENT_GET_CON_ROTATE:</div><div class='del'>-		ret = fbcon_get_rotate(info);</div><div class='del'>-		break;</div><div class='del'>-	case FB_EVENT_SET_CON_ROTATE_ALL:</div><div class='del'>-		fbcon_rotate_all(info, *(int *)event-&gt;data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+done:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2992,27 +3085,181 @@ static struct notifier_block fbcon_event_notifier = {</div><div class='ctx'> 	.notifier_call	= fbcon_event_notify,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init fb_console_init(void)</div><div class='add'>+static ssize_t store_rotate(struct class_device *class_device,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	int rotate, idx;</div><div class='add'>+	char **last = NULL;</div><div class='add'>+</div><div class='add'>+	if (fbcon_has_exited)</div><div class='add'>+		return count;</div><div class='ctx'> </div><div class='ctx'> 	acquire_console_sem();</div><div class='del'>-	fb_register_client(&amp;fbcon_event_notifier);</div><div class='add'>+	idx = con2fb_map[fg_console];</div><div class='add'>+</div><div class='add'>+	if (idx == -1 || registered_fb[idx] == NULL)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	info = registered_fb[idx];</div><div class='add'>+	rotate = simple_strtoul(buf, last, 0);</div><div class='add'>+	fbcon_rotate(info, rotate);</div><div class='add'>+err:</div><div class='ctx'> 	release_console_sem();</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++)</div><div class='del'>-		con2fb_map[i] = -1;</div><div class='add'>+static ssize_t store_rotate_all(struct class_device *class_device,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	int rotate, idx;</div><div class='add'>+	char **last = NULL;</div><div class='add'>+</div><div class='add'>+	if (fbcon_has_exited)</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+	idx = con2fb_map[fg_console];</div><div class='add'>+</div><div class='add'>+	if (idx == -1 || registered_fb[idx] == NULL)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='add'>+	info = registered_fb[idx];</div><div class='add'>+	rotate = simple_strtoul(buf, last, 0);</div><div class='add'>+	fbcon_rotate_all(info, rotate);</div><div class='add'>+err:</div><div class='add'>+	release_console_sem();</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_rotate(struct class_device *class_device, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	int rotate = 0, idx;</div><div class='add'>+</div><div class='add'>+	if (fbcon_has_exited)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+	idx = con2fb_map[fg_console];</div><div class='add'>+</div><div class='add'>+	if (idx == -1 || registered_fb[idx] == NULL)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	info = registered_fb[idx];</div><div class='add'>+	rotate = fbcon_get_rotate(info);</div><div class='add'>+err:</div><div class='add'>+	release_console_sem();</div><div class='add'>+	return snprintf(buf, PAGE_SIZE, "%d\n", rotate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct class_device_attribute class_device_attrs[] = {</div><div class='add'>+	__ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate),</div><div class='add'>+	__ATTR(rotate_all, S_IWUSR, NULL, store_rotate_all),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fbcon_init_class_device(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(class_device_attrs); i++)</div><div class='add'>+		class_device_create_file(fbcon_class_device,</div><div class='add'>+					 &amp;class_device_attrs[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fbcon_start(void)</div><div class='add'>+{</div><div class='ctx'> 	if (num_registered_fb) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		acquire_console_sem();</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; FB_MAX; i++) {</div><div class='ctx'> 			if (registered_fb[i] != NULL) {</div><div class='ctx'> 				info_idx = i;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		release_console_sem();</div><div class='ctx'> 		fbcon_takeover(0);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fbcon_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	int i, j, mapped;</div><div class='add'>+</div><div class='add'>+	if (fbcon_has_exited)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ATARI</div><div class='add'>+	free_irq(IRQ_AUTO_4, fbcon_vbl_handler);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_MAC</div><div class='add'>+	if (MACH_IS_MAC &amp;&amp; vbl_detected)</div><div class='add'>+		free_irq(IRQ_MAC_VBL, fbcon_vbl_handler);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	kfree((void *)softback_buf);</div><div class='add'>+	softback_buf = 0UL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; FB_MAX; i++) {</div><div class='add'>+		mapped = 0;</div><div class='add'>+		info = registered_fb[i];</div><div class='add'>+</div><div class='add'>+		if (info == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = first_fb_vc; j &lt;= last_fb_vc; j++) {</div><div class='add'>+			if (con2fb_map[j] == i)</div><div class='add'>+				mapped = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (mapped) {</div><div class='add'>+			if (info-&gt;fbops-&gt;fb_release)</div><div class='add'>+				info-&gt;fbops-&gt;fb_release(info, 0);</div><div class='add'>+			module_put(info-&gt;fbops-&gt;owner);</div><div class='add'>+</div><div class='add'>+			if (info-&gt;fbcon_par) {</div><div class='add'>+				fbcon_del_cursor_timer(info);</div><div class='add'>+				kfree(info-&gt;fbcon_par);</div><div class='add'>+				info-&gt;fbcon_par = NULL;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='add'>+			if (info-&gt;queue.func == fb_flashcursor)</div><div class='add'>+				info-&gt;queue.func = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fbcon_has_exited = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init fb_console_init(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	acquire_console_sem();</div><div class='add'>+	fb_register_client(&amp;fbcon_event_notifier);</div><div class='add'>+	fbcon_class_device =</div><div class='add'>+	    class_device_create(fb_class, NULL, MKDEV(0, 0), NULL, "fbcon");</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(fbcon_class_device)) {</div><div class='add'>+		printk(KERN_WARNING "Unable to create class_device "</div><div class='add'>+		       "for fbcon; errno = %ld\n",</div><div class='add'>+		       PTR_ERR(fbcon_class_device));</div><div class='add'>+		fbcon_class_device = NULL;</div><div class='add'>+	} else</div><div class='add'>+		fbcon_init_class_device();</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CONSOLES; i++)</div><div class='add'>+		con2fb_map[i] = -1;</div><div class='add'>+</div><div class='add'>+	release_console_sem();</div><div class='add'>+	fbcon_start();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3020,12 +3267,24 @@ module_init(fb_console_init);</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> </div><div class='add'>+static void __exit fbcon_deinit_class_device(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(class_device_attrs); i++)</div><div class='add'>+		class_device_remove_file(fbcon_class_device,</div><div class='add'>+					 &amp;class_device_attrs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void __exit fb_console_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	acquire_console_sem();</div><div class='ctx'> 	fb_unregister_client(&amp;fbcon_event_notifier);</div><div class='add'>+	fbcon_deinit_class_device();</div><div class='add'>+	class_device_destroy(fb_class, MKDEV(0, 0));</div><div class='add'>+	fbcon_exit();</div><div class='ctx'> 	release_console_sem();</div><div class='del'>-	give_up_console(&amp;fb_con);</div><div class='add'>+	unregister_con_driver(&amp;fb_con);</div><div class='ctx'> }	</div><div class='ctx'> </div><div class='ctx'> module_exit(fb_console_exit);</div><div class='head'>diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h<br/>index c38c3d8e7a74..f244ad066d68 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fbcon.h</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #ifndef _VIDEO_FBCON_H</div><div class='ctx'> #define _VIDEO_FBCON_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/vt_buffer.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='hunk'>@@ -175,6 +174,7 @@ extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info);</div><div class='ctx'> #endif</div><div class='ctx'> extern void fbcon_set_bitops(struct fbcon_ops *ops);</div><div class='ctx'> extern int  soft_cursor(struct fb_info *info, struct fb_cursor *cursor);</div><div class='add'>+extern struct class *fb_class;</div><div class='ctx'> </div><div class='ctx'> #define FBCON_ATTRIBUTE_UNDERLINE 1</div><div class='ctx'> #define FBCON_ATTRIBUTE_REVERSE   2</div><div class='head'>diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c<br/>index 990289a69b78..4481c80b8b2a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_ccw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_ccw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_ccw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fbcon_ccw.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c<br/>index d44c5fa515fb..7f92c06afea7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_cw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_cw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_cw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fbcon_cw.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c<br/>index 2dc091fbd5c9..00884e013f0f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_rotate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_rotate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_rotate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fbcon_rotate.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c<br/>index f56ed068a5bc..ab91005e64dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_ud.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fbcon_ud.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fbcon_ud.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fbcon_ud.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/console/font_acorn_8x8.c b/drivers/video/console/font_acorn_8x8.c<br/>index 2d2e39632e2d..40f3d4eeb198 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/font_acorn_8x8.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/font_acorn_8x8.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/font_acorn_8x8.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/font_acorn_8x8.c</a></div><div class='hunk'>@@ -1,6 +1,5 @@</div><div class='ctx'> /* Acorn-like font definition, with PC graphics characters */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/font.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const unsigned char acorndata_8x8[] = {</div><div class='head'>diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c<br/>index 0cc1bfda76a6..c960728b7e82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/fonts.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/fonts.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/fonts.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/fonts.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='head'>diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c<br/>index 989e4d49e5bb..52ed12b12acc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/mdacon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/mdacon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/mdacon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/mdacon.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='hunk'>@@ -308,13 +307,13 @@ static void __init mda_initialize(void)</div><div class='ctx'> 	outb_p(0x00, mda_gfx_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char __init *mdacon_startup(void)</div><div class='add'>+static const char *mdacon_startup(void)</div><div class='ctx'> {</div><div class='ctx'> 	mda_num_columns = 80;</div><div class='ctx'> 	mda_num_lines   = 25;</div><div class='ctx'> </div><div class='del'>-	mda_vram_base = VGA_MAP_MEM(0xb0000);</div><div class='ctx'> 	mda_vram_len  = 0x01000;</div><div class='add'>+	mda_vram_base = VGA_MAP_MEM(0xb0000, mda_vram_len);</div><div class='ctx'> </div><div class='ctx'> 	mda_index_port  = 0x3b4;</div><div class='ctx'> 	mda_value_port  = 0x3b5;</div><div class='head'>diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c<br/>index e99fe30e568c..7fa1afeae8dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/newport_con.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/newport_con.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/newport_con.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/newport_con.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='ctx'> #include &lt;linux/selection.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='hunk'>@@ -51,6 +50,7 @@ static int topscan;</div><div class='ctx'> static int xcurs_correction = 29;</div><div class='ctx'> static int newport_xsize;</div><div class='ctx'> static int newport_ysize;</div><div class='add'>+static int newport_has_init;</div><div class='ctx'> </div><div class='ctx'> static int newport_set_def_font(int unit, struct console_font *op);</div><div class='ctx'> </div><div class='hunk'>@@ -283,6 +283,15 @@ static void newport_get_revisions(void)</div><div class='ctx'> 		xcurs_correction = 21;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void newport_exit(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* free memory used by user font */</div><div class='add'>+	for (i = 0; i &lt; MAX_NR_CONSOLES; i++)</div><div class='add'>+		newport_set_def_font(i, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Can't be __init, take_over_console may call it later */</div><div class='ctx'> static const char *newport_startup(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -290,8 +299,10 @@ static const char *newport_startup(void)</div><div class='ctx'> </div><div class='ctx'> 	if (!sgi_gfxaddr)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	npregs = (struct newport_regs *)	/* ioremap cannot fail */</div><div class='del'>-		 ioremap(sgi_gfxaddr, sizeof(struct newport_regs));</div><div class='add'>+</div><div class='add'>+	if (!npregs)</div><div class='add'>+		npregs = (struct newport_regs *)/* ioremap cannot fail */</div><div class='add'>+			ioremap(sgi_gfxaddr, sizeof(struct newport_regs));</div><div class='ctx'> 	npregs-&gt;cset.config = NPORT_CFG_GD0;</div><div class='ctx'> </div><div class='ctx'> 	if (newport_wait(npregs))</div><div class='hunk'>@@ -307,11 +318,11 @@ static const char *newport_startup(void)</div><div class='ctx'> 	newport_reset();</div><div class='ctx'> 	newport_get_revisions();</div><div class='ctx'> 	newport_get_screensize();</div><div class='add'>+	newport_has_init = 1;</div><div class='ctx'> </div><div class='ctx'> 	return "SGI Newport";</div><div class='ctx'> </div><div class='ctx'> out_unmap:</div><div class='del'>-	iounmap((void *)npregs);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -324,11 +335,10 @@ static void newport_init(struct vc_data *vc, int init)</div><div class='ctx'> </div><div class='ctx'> static void newport_deinit(struct vc_data *c)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* free memory used by user font */</div><div class='del'>-	for (i = 0; i &lt; MAX_NR_CONSOLES; i++)</div><div class='del'>-		newport_set_def_font(i, NULL);</div><div class='add'>+	if (!con_is_bound(&amp;newport_con) &amp;&amp; newport_has_init) {</div><div class='add'>+		newport_exit();</div><div class='add'>+		newport_has_init = 0;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void newport_clear(struct vc_data *vc, int sy, int sx, int height,</div><div class='hunk'>@@ -728,16 +738,23 @@ const struct consw newport_con = {</div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> static int __init newport_console_init(void)</div><div class='ctx'> {</div><div class='add'>+</div><div class='add'>+	if (!sgi_gfxaddr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!npregs)</div><div class='add'>+		npregs = (struct newport_regs *)/* ioremap cannot fail */</div><div class='add'>+			ioremap(sgi_gfxaddr, sizeof(struct newport_regs));</div><div class='add'>+</div><div class='ctx'> 	return take_over_console(&amp;newport_con, 0, MAX_NR_CONSOLES - 1, 1);</div><div class='ctx'> }</div><div class='add'>+module_init(newport_console_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit newport_console_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	give_up_console(&amp;newport_con);</div><div class='ctx'> 	iounmap((void *)npregs);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-module_init(newport_console_init);</div><div class='ctx'> module_exit(newport_console_exit);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c<br/>index 04f42fcaac59..b78eac63459f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/promcon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/promcon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/promcon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/promcon.c</a></div><div class='hunk'>@@ -5,13 +5,11 @@</div><div class='ctx'>  * Copyright (C) 1998  Jakub Jelinek  (jj@ultra.linux.cz)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='hunk'>@@ -109,7 +107,7 @@ promcon_end(struct vc_data *conp, char *b)</div><div class='ctx'> 	return b - p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-const char __init *promcon_startup(void)</div><div class='add'>+const char *promcon_startup(void)</div><div class='ctx'> {</div><div class='ctx'> 	const char *display_desc = "PROM";</div><div class='ctx'> 	int node;</div><div class='hunk'>@@ -133,7 +131,7 @@ const char __init *promcon_startup(void)</div><div class='ctx'> 	return display_desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init </div><div class='add'>+static void</div><div class='ctx'> promcon_init_unimap(struct vc_data *conp)</div><div class='ctx'> {</div><div class='ctx'> 	mm_segment_t old_fs = get_fs();</div><div class='head'>diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c<br/>index 3957fc7523e2..557c563e4aed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/softcursor.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/softcursor.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/softcursor.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/softcursor.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c<br/>index fd5940f41271..45586aaabd1e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/sticon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/sticon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/sticon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/sticon.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='hunk'>@@ -75,7 +74,7 @@ static inline void cursor_undrawn(void)</div><div class='ctx'>     cursor_drawn = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *__init sticon_startup(void)</div><div class='add'>+static const char *sticon_startup(void)</div><div class='ctx'> {</div><div class='ctx'>     return "STI console";</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c<br/>index 74ac2acaf72c..88e7038eab88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/sticore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/sticore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/sticore.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/sticore.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c<br/>index 153352ca9461..d981fe4d86c6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/tileblit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/tileblit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/tileblit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/tileblit.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c<br/>index d5a04b68c4d4..0a2c10a1abf8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/console/vgacon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/console/vgacon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/console/vgacon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/console/vgacon.c</a></div><div class='hunk'>@@ -33,13 +33,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kd.h&gt;</div><div class='hunk'>@@ -49,6 +47,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -114,6 +113,7 @@ static int 		vga_512_chars;</div><div class='ctx'> static int 		vga_video_font_height;</div><div class='ctx'> static int 		vga_scan_lines;</div><div class='ctx'> static unsigned int 	vga_rolled_over = 0;</div><div class='add'>+static int              vga_init_done;</div><div class='ctx'> </div><div class='ctx'> static int __init no_scroll(char *str)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,7 +190,7 @@ static void vgacon_scrollback_init(int pitch)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __init vgacon_scrollback_startup(void)</div><div class='add'>+static void vgacon_scrollback_startup(void)</div><div class='ctx'> {</div><div class='ctx'> 	vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE</div><div class='ctx'> 					  * 1024);</div><div class='hunk'>@@ -355,7 +355,7 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_VGACON_SOFT_SCROLLBACK */</div><div class='ctx'> </div><div class='del'>-static const char __init *vgacon_startup(void)</div><div class='add'>+static const char *vgacon_startup(void)</div><div class='ctx'> {</div><div class='ctx'> 	const char *display_desc = NULL;</div><div class='ctx'> 	u16 saved1, saved2;</div><div class='hunk'>@@ -389,19 +389,19 @@ static const char __init *vgacon_startup(void)</div><div class='ctx'> 		vga_video_port_val = VGA_CRT_DM;</div><div class='ctx'> 		if ((ORIG_VIDEO_EGA_BX &amp; 0xff) != 0x10) {</div><div class='ctx'> 			static struct resource ega_console_resource =</div><div class='del'>-			    { "ega", 0x3B0, 0x3BF };</div><div class='add'>+			    { .name = "ega", .start = 0x3B0, .end = 0x3BF };</div><div class='ctx'> 			vga_video_type = VIDEO_TYPE_EGAM;</div><div class='del'>-			vga_vram_end = 0xb8000;</div><div class='add'>+			vga_vram_size = 0x8000;</div><div class='ctx'> 			display_desc = "EGA+";</div><div class='ctx'> 			request_resource(&amp;ioport_resource,</div><div class='ctx'> 					 &amp;ega_console_resource);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			static struct resource mda1_console_resource =</div><div class='del'>-			    { "mda", 0x3B0, 0x3BB };</div><div class='add'>+			    { .name = "mda", .start = 0x3B0, .end = 0x3BB };</div><div class='ctx'> 			static struct resource mda2_console_resource =</div><div class='del'>-			    { "mda", 0x3BF, 0x3BF };</div><div class='add'>+			    { .name = "mda", .start = 0x3BF, .end = 0x3BF };</div><div class='ctx'> 			vga_video_type = VIDEO_TYPE_MDA;</div><div class='del'>-			vga_vram_end = 0xb2000;</div><div class='add'>+			vga_vram_size = 0x2000;</div><div class='ctx'> 			display_desc = "*MDA";</div><div class='ctx'> 			request_resource(&amp;ioport_resource,</div><div class='ctx'> 					 &amp;mda1_console_resource);</div><div class='hunk'>@@ -418,18 +418,18 @@ static const char __init *vgacon_startup(void)</div><div class='ctx'> 		if ((ORIG_VIDEO_EGA_BX &amp; 0xff) != 0x10) {</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='del'>-			vga_vram_end = 0xc0000;</div><div class='add'>+			vga_vram_size = 0x8000;</div><div class='ctx'> </div><div class='ctx'> 			if (!ORIG_VIDEO_ISVGA) {</div><div class='ctx'> 				static struct resource ega_console_resource</div><div class='del'>-				    = { "ega", 0x3C0, 0x3DF };</div><div class='add'>+				    = { .name = "ega", .start = 0x3C0, .end = 0x3DF };</div><div class='ctx'> 				vga_video_type = VIDEO_TYPE_EGAC;</div><div class='ctx'> 				display_desc = "EGA";</div><div class='ctx'> 				request_resource(&amp;ioport_resource,</div><div class='ctx'> 						 &amp;ega_console_resource);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				static struct resource vga_console_resource</div><div class='del'>-				    = { "vga+", 0x3C0, 0x3DF };</div><div class='add'>+				    = { .name = "vga+", .start = 0x3C0, .end = 0x3DF };</div><div class='ctx'> 				vga_video_type = VIDEO_TYPE_VGAC;</div><div class='ctx'> 				display_desc = "VGA+";</div><div class='ctx'> 				request_resource(&amp;ioport_resource,</div><div class='hunk'>@@ -443,7 +443,7 @@ static const char __init *vgacon_startup(void)</div><div class='ctx'> 				 * and COE=1 isn't necessarily a good idea)</div><div class='ctx'> 				 */</div><div class='ctx'> 				vga_vram_base = 0xa0000;</div><div class='del'>-				vga_vram_end = 0xb0000;</div><div class='add'>+				vga_vram_size = 0x10000;</div><div class='ctx'> 				outb_p(6, VGA_GFX_I);</div><div class='ctx'> 				outb_p(6, VGA_GFX_D);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -473,9 +473,9 @@ static const char __init *vgacon_startup(void)</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			static struct resource cga_console_resource =</div><div class='del'>-			    { "cga", 0x3D4, 0x3D5 };</div><div class='add'>+			    { .name = "cga", .start = 0x3D4, .end = 0x3D5 };</div><div class='ctx'> 			vga_video_type = VIDEO_TYPE_CGA;</div><div class='del'>-			vga_vram_end = 0xba000;</div><div class='add'>+			vga_vram_size = 0x2000;</div><div class='ctx'> 			display_desc = "*CGA";</div><div class='ctx'> 			request_resource(&amp;ioport_resource,</div><div class='ctx'> 					 &amp;cga_console_resource);</div><div class='hunk'>@@ -483,9 +483,8 @@ static const char __init *vgacon_startup(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vga_vram_base = VGA_MAP_MEM(vga_vram_base);</div><div class='del'>-	vga_vram_end = VGA_MAP_MEM(vga_vram_end);</div><div class='del'>-	vga_vram_size = vga_vram_end - vga_vram_base;</div><div class='add'>+	vga_vram_base = VGA_MAP_MEM(vga_vram_base, vga_vram_size);</div><div class='add'>+	vga_vram_end = vga_vram_base + vga_vram_size;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *      Find out if there is a graphics card present.</div><div class='hunk'>@@ -524,7 +523,12 @@ static const char __init *vgacon_startup(void)</div><div class='ctx'> </div><div class='ctx'> 	vgacon_xres = ORIG_VIDEO_COLS * VGA_FONTWIDTH;</div><div class='ctx'> 	vgacon_yres = vga_scan_lines;</div><div class='del'>-	vgacon_scrollback_startup();</div><div class='add'>+</div><div class='add'>+	if (!vga_init_done) {</div><div class='add'>+		vgacon_scrollback_startup();</div><div class='add'>+		vga_init_done = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return display_desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -532,10 +536,20 @@ static void vgacon_init(struct vc_data *c, int init)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long p;</div><div class='ctx'> </div><div class='del'>-	/* We cannot be loaded as a module, therefore init is always 1 */</div><div class='add'>+	/*</div><div class='add'>+	 * We cannot be loaded as a module, therefore init is always 1,</div><div class='add'>+	 * but vgacon_init can be called more than once, and init will</div><div class='add'>+	 * not be 1.</div><div class='add'>+	 */</div><div class='ctx'> 	c-&gt;vc_can_do_color = vga_can_do_color;</div><div class='del'>-	c-&gt;vc_cols = vga_video_num_columns;</div><div class='del'>-	c-&gt;vc_rows = vga_video_num_lines;</div><div class='add'>+</div><div class='add'>+	/* set dimensions manually if init != 0 since vc_resize() will fail */</div><div class='add'>+	if (init) {</div><div class='add'>+		c-&gt;vc_cols = vga_video_num_columns;</div><div class='add'>+		c-&gt;vc_rows = vga_video_num_lines;</div><div class='add'>+	} else</div><div class='add'>+		vc_resize(c, vga_video_num_columns, vga_video_num_lines);</div><div class='add'>+</div><div class='ctx'> 	c-&gt;vc_scan_lines = vga_scan_lines;</div><div class='ctx'> 	c-&gt;vc_font.height = vga_video_font_height;</div><div class='ctx'> 	c-&gt;vc_complement_mask = 0x7700;</div><div class='hunk'>@@ -1020,14 +1034,14 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)</div><div class='ctx'> 	char *charmap;</div><div class='ctx'> 	</div><div class='ctx'> 	if (vga_video_type != VIDEO_TYPE_EGAM) {</div><div class='del'>-		charmap = (char *) VGA_MAP_MEM(colourmap);</div><div class='add'>+		charmap = (char *) VGA_MAP_MEM(colourmap, 0);</div><div class='ctx'> 		beg = 0x0e;</div><div class='ctx'> #ifdef VGA_CAN_DO_64KB</div><div class='ctx'> 		if (vga_video_type == VIDEO_TYPE_VGAC)</div><div class='ctx'> 			beg = 0x06;</div><div class='ctx'> #endif</div><div class='ctx'> 	} else {</div><div class='del'>-		charmap = (char *) VGA_MAP_MEM(blackwmap);</div><div class='add'>+		charmap = (char *) VGA_MAP_MEM(blackwmap, 0);</div><div class='ctx'> 		beg = 0x0a;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c<br/>index 655301a8671c..8cc6c0e2d27a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/controlfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/controlfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/controlfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/controlfb.c</a></div><div class='hunk'>@@ -31,13 +31,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c<br/>index 55a3514157ed..aae6d9c26e88 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cyber2000fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyber2000fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cyber2000fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cyber2000fb.c</a></div><div class='hunk'>@@ -36,13 +36,11 @@</div><div class='ctx'>  * (which, incidentally, is about the same saving as a 2.5in hard disk</div><div class='ctx'>  * entering standby mode.)</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/cyber2000fb.h b/drivers/video/cyber2000fb.h<br/>index bd7e1c040781..de4fc43e51c1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cyber2000fb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyber2000fb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cyber2000fb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cyber2000fb.h</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Integraphics Cyber2000 frame buffer device</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Internal CyberPro sizes and offsets.</div><div class='head'>diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c<br/>index a3e189f90a7d..c40e72dafb0e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cyberfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyberfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cyberfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cyberfb.c</a></div><div class='hunk'>@@ -81,7 +81,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='head'>diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c<br/>index 0ae0a97b0fed..94a66c2d2cf5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/cyblafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/cyblafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/cyblafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/cyblafb.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> </div><div class='ctx'> #define CYBLAFB_PIXMAPSIZE 8192</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c<br/>index 5abd3cb00671..b083ea7e9c69 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/dnfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/dnfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/dnfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/dnfb.c</a></div><div class='hunk'>@@ -2,7 +2,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c<br/>index 082759447bf6..737257d278f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/epson1355fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/epson1355fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/epson1355fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/epson1355fb.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -605,11 +604,6 @@ static void clearfb16(struct fb_info *info)</div><div class='ctx'> 		fb_writeb(0, dst);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void epson1355fb_platform_release(struct device *device)</div><div class='del'>-{</div><div class='del'>-	dev_err(device, "This driver is broken, please bug the authors so they will fix it.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int epson1355fb_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info = platform_get_drvdata(dev);</div><div class='hunk'>@@ -733,13 +727,7 @@ static struct platform_driver epson1355fb_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device epson1355fb_device = {</div><div class='del'>-	.name	= "epson1355fb",</div><div class='del'>-	.id	= 0,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.release = epson1355fb_platform_release,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='add'>+static struct platform_device *epson1355fb_device;</div><div class='ctx'> </div><div class='ctx'> int __init epson1355fb_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -749,11 +737,21 @@ int __init epson1355fb_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_driver_register(&amp;epson1355fb_driver);</div><div class='add'>+</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		ret = platform_device_register(&amp;epson1355fb_device);</div><div class='del'>-		if (ret)</div><div class='add'>+		epson1355fb_device = platform_device_alloc("epson1355fb", 0);</div><div class='add'>+</div><div class='add'>+		if (epson1355fb_device)</div><div class='add'>+			ret = platform_device_add(epson1355fb_device);</div><div class='add'>+		else</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			platform_device_put(epson1355fb_device);</div><div class='ctx'> 			platform_driver_unregister(&amp;epson1355fb_driver);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -762,7 +760,7 @@ module_init(epson1355fb_init);</div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> static void __exit epson1355fb_exit(void)</div><div class='ctx'> {</div><div class='del'>-	platform_device_unregister(&amp;epson1355fb_device);</div><div class='add'>+	platform_device_unregister(epson1355fb_device);</div><div class='ctx'> 	platform_driver_unregister(&amp;epson1355fb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c<br/>index 1f98392a43b3..e8b135f3d80d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/fbcmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbcmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/fbcmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/fbcmap.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c<br/>index ac90883dc3aa..b5498999c4ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/fbcvt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbcvt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/fbcvt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/fbcvt.c</a></div><div class='hunk'>@@ -376,4 +376,3 @@ int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(fb_find_mode_cvt);</div><div class='head'>diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c<br/>index 372aa1776827..4fc9df426c1a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/fbmem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbmem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/fbmem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/fbmem.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='hunk'>@@ -24,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/vt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/linux_logo.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='hunk'>@@ -32,9 +31,7 @@</div><div class='ctx'> #ifdef CONFIG_KMOD</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -162,7 +159,6 @@ char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_LOGO</div><div class='del'>-#include &lt;linux/linux_logo.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline unsigned safe_shift(unsigned d, int n)</div><div class='ctx'> {</div><div class='hunk'>@@ -336,11 +332,11 @@ static void fb_rotate_logo_ud(const u8 *in, u8 *out, u32 width, u32 height)</div><div class='ctx'> </div><div class='ctx'> static void fb_rotate_logo_cw(const u8 *in, u8 *out, u32 width, u32 height)</div><div class='ctx'> {</div><div class='del'>-	int i, j, w = width - 1;</div><div class='add'>+	int i, j, h = height - 1;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; height; i++)</div><div class='ctx'> 		for (j = 0; j &lt; width; j++)</div><div class='del'>-			out[height * j + w - i] = *in++;</div><div class='add'>+				out[height * j + h - i] = *in++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fb_rotate_logo_ccw(const u8 *in, u8 *out, u32 width, u32 height)</div><div class='hunk'>@@ -358,24 +354,24 @@ static void fb_rotate_logo(struct fb_info *info, u8 *dst,</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (rotate == FB_ROTATE_UD) {</div><div class='del'>-		image-&gt;dx = info-&gt;var.xres - image-&gt;width;</div><div class='del'>-		image-&gt;dy = info-&gt;var.yres - image-&gt;height;</div><div class='ctx'> 		fb_rotate_logo_ud(image-&gt;data, dst, image-&gt;width,</div><div class='ctx'> 				  image-&gt;height);</div><div class='add'>+		image-&gt;dx = info-&gt;var.xres - image-&gt;width;</div><div class='add'>+		image-&gt;dy = info-&gt;var.yres - image-&gt;height;</div><div class='ctx'> 	} else if (rotate == FB_ROTATE_CW) {</div><div class='del'>-		tmp = image-&gt;width;</div><div class='del'>-		image-&gt;width = image-&gt;height;</div><div class='del'>-		image-&gt;height = tmp;</div><div class='del'>-		image-&gt;dx = info-&gt;var.xres - image-&gt;height;</div><div class='ctx'> 		fb_rotate_logo_cw(image-&gt;data, dst, image-&gt;width,</div><div class='ctx'> 				  image-&gt;height);</div><div class='del'>-	} else if (rotate == FB_ROTATE_CCW) {</div><div class='ctx'> 		tmp = image-&gt;width;</div><div class='ctx'> 		image-&gt;width = image-&gt;height;</div><div class='ctx'> 		image-&gt;height = tmp;</div><div class='del'>-		image-&gt;dy = info-&gt;var.yres - image-&gt;width;</div><div class='add'>+		image-&gt;dx = info-&gt;var.xres - image-&gt;width;</div><div class='add'>+	} else if (rotate == FB_ROTATE_CCW) {</div><div class='ctx'> 		fb_rotate_logo_ccw(image-&gt;data, dst, image-&gt;width,</div><div class='ctx'> 				   image-&gt;height);</div><div class='add'>+		tmp = image-&gt;width;</div><div class='add'>+		image-&gt;width = image-&gt;height;</div><div class='add'>+		image-&gt;height = tmp;</div><div class='add'>+		image-&gt;dy = info-&gt;var.yres - image-&gt;height;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	image-&gt;data = dst;</div><div class='hunk'>@@ -435,7 +431,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate)</div><div class='ctx'> 			depth = info-&gt;var.green.length;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info-&gt;fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) {</div><div class='add'>+	if (info-&gt;fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR &amp;&amp; depth &gt; 4) {</div><div class='ctx'> 		/* assume console colormap */</div><div class='ctx'> 		depth = 4;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1278,8 +1274,8 @@ static struct file_operations fb_fops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct class *fb_class;</div><div class='del'>-</div><div class='add'>+struct class *fb_class;</div><div class='add'>+EXPORT_SYMBOL(fb_class);</div><div class='ctx'> /**</div><div class='ctx'>  *	register_framebuffer - registers a frame buffer device</div><div class='ctx'>  *	@fb_info: frame buffer info structure</div><div class='hunk'>@@ -1333,8 +1329,6 @@ register_framebuffer(struct fb_info *fb_info)</div><div class='ctx'> 	fb_add_videomode(&amp;mode, &amp;fb_info-&gt;modelist);</div><div class='ctx'> 	registered_fb[i] = fb_info;</div><div class='ctx'> </div><div class='del'>-	devfs_mk_cdev(MKDEV(FB_MAJOR, i),</div><div class='del'>-			S_IFCHR | S_IRUGO | S_IWUGO, "fb/%d", i);</div><div class='ctx'> 	event.info = fb_info;</div><div class='ctx'> 	blocking_notifier_call_chain(&amp;fb_notifier_list,</div><div class='ctx'> 			    FB_EVENT_FB_REGISTERED, &amp;event);</div><div class='hunk'>@@ -1355,20 +1349,24 @@ register_framebuffer(struct fb_info *fb_info)</div><div class='ctx'> int</div><div class='ctx'> unregister_framebuffer(struct fb_info *fb_info)</div><div class='ctx'> {</div><div class='add'>+	struct fb_event event;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	i = fb_info-&gt;node;</div><div class='ctx'> 	if (!registered_fb[i])</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	devfs_remove("fb/%d", i);</div><div class='ctx'> </div><div class='del'>-	if (fb_info-&gt;pixmap.addr &amp;&amp; (fb_info-&gt;pixmap.flags &amp; FB_PIXMAP_DEFAULT))</div><div class='add'>+	if (fb_info-&gt;pixmap.addr &amp;&amp;</div><div class='add'>+	    (fb_info-&gt;pixmap.flags &amp; FB_PIXMAP_DEFAULT))</div><div class='ctx'> 		kfree(fb_info-&gt;pixmap.addr);</div><div class='ctx'> 	fb_destroy_modelist(&amp;fb_info-&gt;modelist);</div><div class='ctx'> 	registered_fb[i]=NULL;</div><div class='ctx'> 	num_registered_fb--;</div><div class='ctx'> 	fb_cleanup_class_device(fb_info);</div><div class='ctx'> 	class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));</div><div class='add'>+	event.info = fb_info;</div><div class='add'>+	blocking_notifier_call_chain(&amp;fb_notifier_list,</div><div class='add'>+				     FB_EVENT_FB_UNREGISTERED, &amp;event);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1429,7 +1427,6 @@ fbmem_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);</div><div class='ctx'> </div><div class='del'>-	devfs_mk_dir("fb");</div><div class='ctx'> 	if (register_chrdev(FB_MAJOR,"fb",&amp;fb_fops))</div><div class='ctx'> 		printk("unable to get major %d for fb devs\n", FB_MAJOR);</div><div class='ctx'> </div><div class='hunk'>@@ -1491,28 +1488,6 @@ int fb_new_modelist(struct fb_info *info)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * fb_con_duit - user&lt;-&gt;fbcon passthrough</div><div class='del'>- * @info: struct fb_info</div><div class='del'>- * @event: notification event to be passed to fbcon</div><div class='del'>- * @data: private data</div><div class='del'>- *</div><div class='del'>- * DESCRIPTION</div><div class='del'>- * This function is an fbcon-user event passing channel</div><div class='del'>- * which bypasses fbdev.  This is hopefully temporary</div><div class='del'>- * until a user interface for fbcon is created</div><div class='del'>- */</div><div class='del'>-int fb_con_duit(struct fb_info *info, int event, void *data)</div><div class='del'>-{</div><div class='del'>-	struct fb_event evnt;</div><div class='del'>-</div><div class='del'>-	evnt.info = info;</div><div class='del'>-	evnt.data = data;</div><div class='del'>-</div><div class='del'>-	return blocking_notifier_call_chain(&amp;fb_notifier_list, event, &amp;evnt);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(fb_con_duit);</div><div class='del'>-</div><div class='ctx'> static char *video_options[FB_MAX];</div><div class='ctx'> static int ofonly;</div><div class='ctx'> </div><div class='hunk'>@@ -1622,6 +1597,5 @@ EXPORT_SYMBOL(fb_set_suspend);</div><div class='ctx'> EXPORT_SYMBOL(fb_register_client);</div><div class='ctx'> EXPORT_SYMBOL(fb_unregister_client);</div><div class='ctx'> EXPORT_SYMBOL(fb_get_options);</div><div class='del'>-EXPORT_SYMBOL(fb_new_modelist);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c<br/>index 53beeb4a9998..de93139ccbb5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/fbmon.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbmon.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/fbmon.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/fbmon.c</a></div><div class='hunk'>@@ -26,12 +26,11 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;video/edid.h&gt;</div><div class='ctx'> #ifdef CONFIG_PPC_OF</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -605,6 +604,7 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)</div><div class='ctx'> 	block = edid + DETAILED_TIMING_DESCRIPTIONS_START;</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK("      Monitor Operating Limits: ");</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) {</div><div class='ctx'> 		if (edid_is_limits_block(block)) {</div><div class='ctx'> 			specs-&gt;hfmin = H_MIN_RATE * 1000;</div><div class='hunk'>@@ -618,11 +618,12 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	/* estimate monitor limits based on modes supported */</div><div class='ctx'> 	if (retval) {</div><div class='del'>-		struct fb_videomode *modes;</div><div class='add'>+		struct fb_videomode *modes, *mode;</div><div class='ctx'> 		int num_modes, i, hz, hscan, pixclock;</div><div class='add'>+		int vtotal, htotal;</div><div class='ctx'> </div><div class='ctx'> 		modes = fb_create_modedb(edid, &amp;num_modes);</div><div class='ctx'> 		if (!modes) {</div><div class='hunk'>@@ -632,20 +633,38 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)</div><div class='ctx'> </div><div class='ctx'> 		retval = 0;</div><div class='ctx'> 		for (i = 0; i &lt; num_modes; i++) {</div><div class='del'>-			hz = modes[i].refresh;</div><div class='add'>+			mode = &amp;modes[i];</div><div class='ctx'> 			pixclock = PICOS2KHZ(modes[i].pixclock) * 1000;</div><div class='del'>-			hscan = (modes[i].yres * 105 * hz + 5000)/100;</div><div class='add'>+			htotal = mode-&gt;xres + mode-&gt;right_margin + mode-&gt;hsync_len</div><div class='add'>+				+ mode-&gt;left_margin;</div><div class='add'>+			vtotal = mode-&gt;yres + mode-&gt;lower_margin + mode-&gt;vsync_len</div><div class='add'>+				+ mode-&gt;upper_margin;</div><div class='add'>+</div><div class='add'>+			if (mode-&gt;vmode &amp; FB_VMODE_INTERLACED)</div><div class='add'>+				vtotal /= 2;</div><div class='add'>+</div><div class='add'>+			if (mode-&gt;vmode &amp; FB_VMODE_DOUBLE)</div><div class='add'>+				vtotal *= 2;</div><div class='add'>+</div><div class='add'>+			hscan = (pixclock + htotal / 2) / htotal;</div><div class='add'>+			hscan = (hscan + 500) / 1000 * 1000;</div><div class='add'>+			hz = (hscan + vtotal / 2) / vtotal;</div><div class='ctx'> 			</div><div class='ctx'> 			if (specs-&gt;dclkmax == 0 || specs-&gt;dclkmax &lt; pixclock)</div><div class='ctx'> 				specs-&gt;dclkmax = pixclock;</div><div class='add'>+</div><div class='ctx'> 			if (specs-&gt;dclkmin == 0 || specs-&gt;dclkmin &gt; pixclock)</div><div class='ctx'> 				specs-&gt;dclkmin = pixclock;</div><div class='add'>+</div><div class='ctx'> 			if (specs-&gt;hfmax == 0 || specs-&gt;hfmax &lt; hscan)</div><div class='ctx'> 				specs-&gt;hfmax = hscan;</div><div class='add'>+</div><div class='ctx'> 			if (specs-&gt;hfmin == 0 || specs-&gt;hfmin &gt; hscan)</div><div class='ctx'> 				specs-&gt;hfmin = hscan;</div><div class='add'>+</div><div class='ctx'> 			if (specs-&gt;vfmax == 0 || specs-&gt;vfmax &lt; hz)</div><div class='ctx'> 				specs-&gt;vfmax = hz;</div><div class='add'>+</div><div class='ctx'> 			if (specs-&gt;vfmin == 0 || specs-&gt;vfmin &gt; hz)</div><div class='ctx'> 				specs-&gt;vfmin = hz;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1281,8 +1300,7 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 		-EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_FB_FIRMWARE_EDID) &amp;&amp; defined(__i386__)</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='add'>+#if defined(CONFIG_FIRMWARE_EDID) &amp;&amp; defined(CONFIG_X86)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * We need to ensure that the EDID block is only returned for</div><div class='head'>diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c<br/>index 34e07399756b..4f78f234473d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/fbsysfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/fbsysfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/fbsysfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/fbsysfs.c</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * framebuffer_alloc - creates a new frame buffer info structure</div><div class='hunk'>@@ -55,6 +56,10 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;device = dev;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_BACKLIGHT</div><div class='add'>+	mutex_init(&amp;info-&gt;bl_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return info;</div><div class='ctx'> #undef PADDING</div><div class='ctx'> #undef BYTES_PER_LONG</div><div class='hunk'>@@ -95,13 +100,22 @@ static int mode_string(char *buf, unsigned int offset,</div><div class='ctx'> 		       const struct fb_videomode *mode)</div><div class='ctx'> {</div><div class='ctx'> 	char m = 'U';</div><div class='add'>+	char v = 'p';</div><div class='add'>+</div><div class='ctx'> 	if (mode-&gt;flag &amp; FB_MODE_IS_DETAILED)</div><div class='ctx'> 		m = 'D';</div><div class='ctx'> 	if (mode-&gt;flag &amp; FB_MODE_IS_VESA)</div><div class='ctx'> 		m = 'V';</div><div class='ctx'> 	if (mode-&gt;flag &amp; FB_MODE_IS_STANDARD)</div><div class='ctx'> 		m = 'S';</div><div class='del'>-	return snprintf(&amp;buf[offset], PAGE_SIZE - offset, "%c:%dx%d-%d\n", m, mode-&gt;xres, mode-&gt;yres, mode-&gt;refresh);</div><div class='add'>+</div><div class='add'>+	if (mode-&gt;vmode &amp; FB_VMODE_INTERLACED)</div><div class='add'>+		v = 'i';</div><div class='add'>+	if (mode-&gt;vmode &amp; FB_VMODE_DOUBLE)</div><div class='add'>+		v = 'd';</div><div class='add'>+</div><div class='add'>+	return snprintf(&amp;buf[offset], PAGE_SIZE - offset, "%c:%dx%d%c-%d\n",</div><div class='add'>+	                m, mode-&gt;xres, mode-&gt;yres, v, mode-&gt;refresh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t store_mode(struct class_device *class_device, const char * buf,</div><div class='hunk'>@@ -233,45 +247,6 @@ static ssize_t show_rotate(struct class_device *class_device, char *buf)</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", fb_info-&gt;var.rotate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t store_con_rotate(struct class_device *class_device,</div><div class='del'>-				const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct fb_info *fb_info = class_get_devdata(class_device);</div><div class='del'>-	int rotate;</div><div class='del'>-	char **last = NULL;</div><div class='del'>-</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	rotate = simple_strtoul(buf, last, 0);</div><div class='del'>-	fb_con_duit(fb_info, FB_EVENT_SET_CON_ROTATE, &amp;rotate);</div><div class='del'>-	release_console_sem();</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t store_con_rotate_all(struct class_device *class_device,</div><div class='del'>-				const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct fb_info *fb_info = class_get_devdata(class_device);</div><div class='del'>-	int rotate;</div><div class='del'>-	char **last = NULL;</div><div class='del'>-</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	rotate = simple_strtoul(buf, last, 0);</div><div class='del'>-	fb_con_duit(fb_info, FB_EVENT_SET_CON_ROTATE_ALL, &amp;rotate);</div><div class='del'>-	release_console_sem();</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t show_con_rotate(struct class_device *class_device, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct fb_info *fb_info = class_get_devdata(class_device);</div><div class='del'>-	int rotate;</div><div class='del'>-</div><div class='del'>-	acquire_console_sem();</div><div class='del'>-	rotate = fb_con_duit(fb_info, FB_EVENT_GET_CON_ROTATE, NULL);</div><div class='del'>-	release_console_sem();</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%d\n", rotate);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t store_virtual(struct class_device *class_device,</div><div class='ctx'> 			     const char * buf, size_t count)</div><div class='ctx'> {</div><div class='hunk'>@@ -414,6 +389,65 @@ static ssize_t show_fbstate(struct class_device *class_device, char *buf)</div><div class='ctx'> 	return snprintf(buf, PAGE_SIZE, "%d\n", fb_info-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_BACKLIGHT</div><div class='add'>+static ssize_t store_bl_curve(struct class_device *class_device,</div><div class='add'>+		const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *fb_info = class_get_devdata(class_device);</div><div class='add'>+	u8 tmp_curve[FB_BACKLIGHT_LEVELS];</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (count != (FB_BACKLIGHT_LEVELS / 8 * 24))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (FB_BACKLIGHT_LEVELS / 8); ++i)</div><div class='add'>+		if (sscanf(&amp;buf[i * 24],</div><div class='add'>+			"%2hhx %2hhx %2hhx %2hhx %2hhx %2hhx %2hhx %2hhx\n",</div><div class='add'>+			&amp;tmp_curve[i * 8 + 0],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 1],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 2],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 3],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 4],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 5],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 6],</div><div class='add'>+			&amp;tmp_curve[i * 8 + 7]) != 8)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If there has been an error in the input data, we won't</div><div class='add'>+	 * reach this loop.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;fb_info-&gt;bl_mutex);</div><div class='add'>+	for (i = 0; i &lt; FB_BACKLIGHT_LEVELS; ++i)</div><div class='add'>+		fb_info-&gt;bl_curve[i] = tmp_curve[i];</div><div class='add'>+	mutex_unlock(&amp;fb_info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t show_bl_curve(struct class_device *class_device, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *fb_info = class_get_devdata(class_device);</div><div class='add'>+	ssize_t len = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fb_info-&gt;bl_mutex);</div><div class='add'>+	for (i = 0; i &lt; FB_BACKLIGHT_LEVELS; i += 8)</div><div class='add'>+		len += snprintf(&amp;buf[len], PAGE_SIZE,</div><div class='add'>+				"%02x %02x %02x %02x %02x %02x %02x %02x\n",</div><div class='add'>+				fb_info-&gt;bl_curve[i + 0],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 1],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 2],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 3],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 4],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 5],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 6],</div><div class='add'>+				fb_info-&gt;bl_curve[i + 7]);</div><div class='add'>+	mutex_unlock(&amp;fb_info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* When cmap is added back in it should be a binary attribute</div><div class='ctx'>  * not a text one. Consideration should also be given to converting</div><div class='ctx'>  * fbdev to use configfs instead of sysfs */</div><div class='hunk'>@@ -429,9 +463,10 @@ static struct class_device_attribute class_device_attrs[] = {</div><div class='ctx'> 	__ATTR(name, S_IRUGO, show_name, NULL),</div><div class='ctx'> 	__ATTR(stride, S_IRUGO, show_stride, NULL),</div><div class='ctx'> 	__ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate),</div><div class='del'>-	__ATTR(con_rotate, S_IRUGO|S_IWUSR, show_con_rotate, store_con_rotate),</div><div class='del'>-	__ATTR(con_rotate_all, S_IWUSR, NULL, store_con_rotate_all),</div><div class='ctx'> 	__ATTR(state, S_IRUGO|S_IWUSR, show_fbstate, store_fbstate),</div><div class='add'>+#ifdef CONFIG_FB_BACKLIGHT</div><div class='add'>+	__ATTR(bl_curve, S_IRUGO|S_IWUSR, show_bl_curve, store_bl_curve),</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int fb_init_class_device(struct fb_info *fb_info)</div><div class='hunk'>@@ -454,4 +489,25 @@ void fb_cleanup_class_device(struct fb_info *fb_info)</div><div class='ctx'> 					 &amp;class_device_attrs[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_FB_BACKLIGHT</div><div class='add'>+/* This function generates a linear backlight curve</div><div class='add'>+ *</div><div class='add'>+ *     0: off</div><div class='add'>+ *   1-7: min</div><div class='add'>+ * 8-127: linear from min to max</div><div class='add'>+ */</div><div class='add'>+void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, flat, count, range = (max - min);</div><div class='ctx'> </div><div class='add'>+	fb_info-&gt;bl_curve[0] = off;</div><div class='add'>+</div><div class='add'>+	for (flat = 1; flat &lt; (FB_BACKLIGHT_LEVELS / 16); ++flat)</div><div class='add'>+		fb_info-&gt;bl_curve[flat] = min;</div><div class='add'>+</div><div class='add'>+	count = FB_BACKLIGHT_LEVELS * 15 / 16;</div><div class='add'>+	for (i = 0; i &lt; count; ++i)</div><div class='add'>+		fb_info-&gt;bl_curve[flat + i] = min + (range * (i + 1) / count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(fb_bl_default_curve);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c<br/>index 7633e41adda1..2a0e8210d398 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/ffb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/ffb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/ffb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/ffb.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* ffb.c: Creator/Elite3D frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1997,1998,1999 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  *</div><div class='ctx'>  * Driver layout based loosely on tgafb.c, see that file for credits.</div><div class='hunk'>@@ -19,7 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/upa.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -184,161 +185,161 @@ static struct fb_ops ffb_ops = {</div><div class='ctx'> </div><div class='ctx'> struct ffb_fbc {</div><div class='ctx'> 	/* Next vertex registers */</div><div class='del'>-	u32		xxx1[3];</div><div class='del'>-	volatile u32	alpha;</div><div class='del'>-	volatile u32	red;</div><div class='del'>-	volatile u32	green;</div><div class='del'>-	volatile u32	blue;</div><div class='del'>-	volatile u32	depth;</div><div class='del'>-	volatile u32	y;</div><div class='del'>-	volatile u32	x;</div><div class='del'>-	u32		xxx2[2];</div><div class='del'>-	volatile u32	ryf;</div><div class='del'>-	volatile u32	rxf;</div><div class='del'>-	u32		xxx3[2];</div><div class='add'>+	u32	xxx1[3];</div><div class='add'>+	u32	alpha;</div><div class='add'>+	u32	red;</div><div class='add'>+	u32	green;</div><div class='add'>+	u32	blue;</div><div class='add'>+	u32	depth;</div><div class='add'>+	u32	y;</div><div class='add'>+	u32	x;</div><div class='add'>+	u32	xxx2[2];</div><div class='add'>+	u32	ryf;</div><div class='add'>+	u32	rxf;</div><div class='add'>+	u32	xxx3[2];</div><div class='ctx'> 	</div><div class='del'>-	volatile u32	dmyf;</div><div class='del'>-	volatile u32	dmxf;</div><div class='del'>-	u32		xxx4[2];</div><div class='del'>-	volatile u32	ebyi;</div><div class='del'>-	volatile u32	ebxi;</div><div class='del'>-	u32		xxx5[2];</div><div class='del'>-	volatile u32	by;</div><div class='del'>-	volatile u32	bx;</div><div class='del'>-	u32		dy;</div><div class='del'>-	u32		dx;</div><div class='del'>-	volatile u32	bh;</div><div class='del'>-	volatile u32	bw;</div><div class='del'>-	u32		xxx6[2];</div><div class='add'>+	u32	dmyf;</div><div class='add'>+	u32	dmxf;</div><div class='add'>+	u32	xxx4[2];</div><div class='add'>+	u32	ebyi;</div><div class='add'>+	u32	ebxi;</div><div class='add'>+	u32	xxx5[2];</div><div class='add'>+	u32	by;</div><div class='add'>+	u32	bx;</div><div class='add'>+	u32	dy;</div><div class='add'>+	u32	dx;</div><div class='add'>+	u32	bh;</div><div class='add'>+	u32	bw;</div><div class='add'>+	u32	xxx6[2];</div><div class='ctx'> 	</div><div class='del'>-	u32		xxx7[32];</div><div class='add'>+	u32	xxx7[32];</div><div class='ctx'> 	</div><div class='ctx'> 	/* Setup unit vertex state register */</div><div class='del'>-	volatile u32	suvtx;</div><div class='del'>-	u32		xxx8[63];</div><div class='add'>+	u32	suvtx;</div><div class='add'>+	u32	xxx8[63];</div><div class='ctx'> 	</div><div class='ctx'> 	/* Control registers */</div><div class='del'>-	volatile u32	ppc;</div><div class='del'>-	volatile u32	wid;</div><div class='del'>-	volatile u32	fg;</div><div class='del'>-	volatile u32	bg;</div><div class='del'>-	volatile u32	consty;</div><div class='del'>-	volatile u32	constz;</div><div class='del'>-	volatile u32	xclip;</div><div class='del'>-	volatile u32	dcss;</div><div class='del'>-	volatile u32	vclipmin;</div><div class='del'>-	volatile u32	vclipmax;</div><div class='del'>-	volatile u32	vclipzmin;</div><div class='del'>-	volatile u32	vclipzmax;</div><div class='del'>-	volatile u32	dcsf;</div><div class='del'>-	volatile u32	dcsb;</div><div class='del'>-	volatile u32	dczf;</div><div class='del'>-	volatile u32	dczb;</div><div class='add'>+	u32	ppc;</div><div class='add'>+	u32	wid;</div><div class='add'>+	u32	fg;</div><div class='add'>+	u32	bg;</div><div class='add'>+	u32	consty;</div><div class='add'>+	u32	constz;</div><div class='add'>+	u32	xclip;</div><div class='add'>+	u32	dcss;</div><div class='add'>+	u32	vclipmin;</div><div class='add'>+	u32	vclipmax;</div><div class='add'>+	u32	vclipzmin;</div><div class='add'>+	u32	vclipzmax;</div><div class='add'>+	u32	dcsf;</div><div class='add'>+	u32	dcsb;</div><div class='add'>+	u32	dczf;</div><div class='add'>+	u32	dczb;</div><div class='ctx'> 	</div><div class='del'>-	u32		xxx9;</div><div class='del'>-	volatile u32	blendc;</div><div class='del'>-	volatile u32	blendc1;</div><div class='del'>-	volatile u32	blendc2;</div><div class='del'>-	volatile u32	fbramitc;</div><div class='del'>-	volatile u32	fbc;</div><div class='del'>-	volatile u32	rop;</div><div class='del'>-	volatile u32	cmp;</div><div class='del'>-	volatile u32	matchab;</div><div class='del'>-	volatile u32	matchc;</div><div class='del'>-	volatile u32	magnab;</div><div class='del'>-	volatile u32	magnc;</div><div class='del'>-	volatile u32	fbcfg0;</div><div class='del'>-	volatile u32	fbcfg1;</div><div class='del'>-	volatile u32	fbcfg2;</div><div class='del'>-	volatile u32	fbcfg3;</div><div class='add'>+	u32	xxx9;</div><div class='add'>+	u32	blendc;</div><div class='add'>+	u32	blendc1;</div><div class='add'>+	u32	blendc2;</div><div class='add'>+	u32	fbramitc;</div><div class='add'>+	u32	fbc;</div><div class='add'>+	u32	rop;</div><div class='add'>+	u32	cmp;</div><div class='add'>+	u32	matchab;</div><div class='add'>+	u32	matchc;</div><div class='add'>+	u32	magnab;</div><div class='add'>+	u32	magnc;</div><div class='add'>+	u32	fbcfg0;</div><div class='add'>+	u32	fbcfg1;</div><div class='add'>+	u32	fbcfg2;</div><div class='add'>+	u32	fbcfg3;</div><div class='ctx'> 	</div><div class='del'>-	u32		ppcfg;</div><div class='del'>-	volatile u32	pick;</div><div class='del'>-	volatile u32	fillmode;</div><div class='del'>-	volatile u32	fbramwac;</div><div class='del'>-	volatile u32	pmask;</div><div class='del'>-	volatile u32	xpmask;</div><div class='del'>-	volatile u32	ypmask;</div><div class='del'>-	volatile u32	zpmask;</div><div class='del'>-	volatile u32	clip0min;</div><div class='del'>-	volatile u32	clip0max;</div><div class='del'>-	volatile u32	clip1min;</div><div class='del'>-	volatile u32	clip1max;</div><div class='del'>-	volatile u32	clip2min;</div><div class='del'>-	volatile u32	clip2max;</div><div class='del'>-	volatile u32	clip3min;</div><div class='del'>-	volatile u32	clip3max;</div><div class='add'>+	u32	ppcfg;</div><div class='add'>+	u32	pick;</div><div class='add'>+	u32	fillmode;</div><div class='add'>+	u32	fbramwac;</div><div class='add'>+	u32	pmask;</div><div class='add'>+	u32	xpmask;</div><div class='add'>+	u32	ypmask;</div><div class='add'>+	u32	zpmask;</div><div class='add'>+	u32	clip0min;</div><div class='add'>+	u32	clip0max;</div><div class='add'>+	u32	clip1min;</div><div class='add'>+	u32	clip1max;</div><div class='add'>+	u32	clip2min;</div><div class='add'>+	u32	clip2max;</div><div class='add'>+	u32	clip3min;</div><div class='add'>+	u32	clip3max;</div><div class='ctx'> 	</div><div class='ctx'> 	/* New 3dRAM III support regs */</div><div class='del'>-	volatile u32	rawblend2;</div><div class='del'>-	volatile u32	rawpreblend;</div><div class='del'>-	volatile u32	rawstencil;</div><div class='del'>-	volatile u32	rawstencilctl;</div><div class='del'>-	volatile u32	threedram1;</div><div class='del'>-	volatile u32	threedram2;</div><div class='del'>-	volatile u32	passin;</div><div class='del'>-	volatile u32	rawclrdepth;</div><div class='del'>-	volatile u32	rawpmask;</div><div class='del'>-	volatile u32	rawcsrc;</div><div class='del'>-	volatile u32	rawmatch;</div><div class='del'>-	volatile u32	rawmagn;</div><div class='del'>-	volatile u32	rawropblend;</div><div class='del'>-	volatile u32	rawcmp;</div><div class='del'>-	volatile u32	rawwac;</div><div class='del'>-	volatile u32	fbramid;</div><div class='add'>+	u32	rawblend2;</div><div class='add'>+	u32	rawpreblend;</div><div class='add'>+	u32	rawstencil;</div><div class='add'>+	u32	rawstencilctl;</div><div class='add'>+	u32	threedram1;</div><div class='add'>+	u32	threedram2;</div><div class='add'>+	u32	passin;</div><div class='add'>+	u32	rawclrdepth;</div><div class='add'>+	u32	rawpmask;</div><div class='add'>+	u32	rawcsrc;</div><div class='add'>+	u32	rawmatch;</div><div class='add'>+	u32	rawmagn;</div><div class='add'>+	u32	rawropblend;</div><div class='add'>+	u32	rawcmp;</div><div class='add'>+	u32	rawwac;</div><div class='add'>+	u32	fbramid;</div><div class='ctx'> 	</div><div class='del'>-	volatile u32	drawop;</div><div class='del'>-	u32		xxx10[2];</div><div class='del'>-	volatile u32	fontlpat;</div><div class='del'>-	u32		xxx11;</div><div class='del'>-	volatile u32	fontxy;</div><div class='del'>-	volatile u32	fontw;</div><div class='del'>-	volatile u32	fontinc;</div><div class='del'>-	volatile u32	font;</div><div class='del'>-	u32		xxx12[3];</div><div class='del'>-	volatile u32	blend2;</div><div class='del'>-	volatile u32	preblend;</div><div class='del'>-	volatile u32	stencil;</div><div class='del'>-	volatile u32	stencilctl;</div><div class='del'>-</div><div class='del'>-	u32		xxx13[4];	</div><div class='del'>-	volatile u32	dcss1;</div><div class='del'>-	volatile u32	dcss2;</div><div class='del'>-	volatile u32	dcss3;</div><div class='del'>-	volatile u32	widpmask;</div><div class='del'>-	volatile u32	dcs2;</div><div class='del'>-	volatile u32	dcs3;</div><div class='del'>-	volatile u32	dcs4;</div><div class='del'>-	u32		xxx14;</div><div class='del'>-	volatile u32	dcd2;</div><div class='del'>-	volatile u32	dcd3;</div><div class='del'>-	volatile u32	dcd4;</div><div class='del'>-	u32		xxx15;</div><div class='add'>+	u32	drawop;</div><div class='add'>+	u32	xxx10[2];</div><div class='add'>+	u32	fontlpat;</div><div class='add'>+	u32	xxx11;</div><div class='add'>+	u32	fontxy;</div><div class='add'>+	u32	fontw;</div><div class='add'>+	u32	fontinc;</div><div class='add'>+	u32	font;</div><div class='add'>+	u32	xxx12[3];</div><div class='add'>+	u32	blend2;</div><div class='add'>+	u32	preblend;</div><div class='add'>+	u32	stencil;</div><div class='add'>+	u32	stencilctl;</div><div class='add'>+</div><div class='add'>+	u32	xxx13[4];	</div><div class='add'>+	u32	dcss1;</div><div class='add'>+	u32	dcss2;</div><div class='add'>+	u32	dcss3;</div><div class='add'>+	u32	widpmask;</div><div class='add'>+	u32	dcs2;</div><div class='add'>+	u32	dcs3;</div><div class='add'>+	u32	dcs4;</div><div class='add'>+	u32	xxx14;</div><div class='add'>+	u32	dcd2;</div><div class='add'>+	u32	dcd3;</div><div class='add'>+	u32	dcd4;</div><div class='add'>+	u32	xxx15;</div><div class='ctx'> 	</div><div class='del'>-	volatile u32	pattern[32];</div><div class='add'>+	u32	pattern[32];</div><div class='ctx'> 	</div><div class='del'>-	u32		xxx16[256];</div><div class='add'>+	u32	xxx16[256];</div><div class='ctx'> 	</div><div class='del'>-	volatile u32	devid;</div><div class='del'>-	u32		xxx17[63];</div><div class='add'>+	u32	devid;</div><div class='add'>+	u32	xxx17[63];</div><div class='ctx'> 	</div><div class='del'>-	volatile u32	ucsr;</div><div class='del'>-	u32		xxx18[31];</div><div class='add'>+	u32	ucsr;</div><div class='add'>+	u32	xxx18[31];</div><div class='ctx'> 	</div><div class='del'>-	volatile u32	mer;</div><div class='add'>+	u32	mer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ffb_dac {</div><div class='del'>-	volatile u32	type;</div><div class='del'>-	volatile u32	value;</div><div class='del'>-	volatile u32	type2;</div><div class='del'>-	volatile u32	value2;</div><div class='add'>+	u32	type;</div><div class='add'>+	u32	value;</div><div class='add'>+	u32	type2;</div><div class='add'>+	u32	value2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ffb_par {</div><div class='ctx'> 	spinlock_t		lock;</div><div class='del'>-	struct ffb_fbc		*fbc;</div><div class='del'>-	struct ffb_dac		*dac;</div><div class='add'>+	struct ffb_fbc __iomem	*fbc;</div><div class='add'>+	struct ffb_dac __iomem	*dac;</div><div class='ctx'> </div><div class='ctx'> 	u32			flags;</div><div class='ctx'> #define FFB_FLAG_AFB		0x00000001</div><div class='hunk'>@@ -353,16 +354,13 @@ struct ffb_par {</div><div class='ctx'> 	unsigned long		physbase;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='ctx'> </div><div class='del'>-	char			name[64];</div><div class='del'>-	int			prom_node;</div><div class='del'>-	int			prom_parent_node;</div><div class='ctx'> 	int			dac_rev;</div><div class='ctx'> 	int			board_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void FFBFifo(struct ffb_par *par, int n)</div><div class='ctx'> {</div><div class='del'>-	struct ffb_fbc *fbc;</div><div class='add'>+	struct ffb_fbc __iomem *fbc;</div><div class='ctx'> 	int cache = par-&gt;fifo_cache;</div><div class='ctx'> </div><div class='ctx'> 	if (cache - n &lt; 0) {</div><div class='hunk'>@@ -375,7 +373,7 @@ static void FFBFifo(struct ffb_par *par, int n)</div><div class='ctx'> </div><div class='ctx'> static void FFBWait(struct ffb_par *par)</div><div class='ctx'> {</div><div class='del'>-	struct ffb_fbc *fbc;</div><div class='add'>+	struct ffb_fbc __iomem *fbc;</div><div class='ctx'> 	int limit = 10000;</div><div class='ctx'> </div><div class='ctx'> 	fbc = par-&gt;fbc;</div><div class='hunk'>@@ -408,8 +406,8 @@ static __inline__ void ffb_rop(struct ffb_par *par, u32 rop)</div><div class='ctx'> </div><div class='ctx'> static void ffb_switch_from_graph(struct ffb_par *par)</div><div class='ctx'> {</div><div class='del'>-	struct ffb_fbc *fbc = par-&gt;fbc;</div><div class='del'>-	struct ffb_dac *dac = par-&gt;dac;</div><div class='add'>+	struct ffb_fbc __iomem *fbc = par-&gt;fbc;</div><div class='add'>+	struct ffb_dac __iomem *dac = par-&gt;dac;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;par-&gt;lock, flags);</div><div class='hunk'>@@ -462,7 +460,7 @@ static int ffb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)</div><div class='ctx'> {</div><div class='ctx'> 	struct ffb_par *par = (struct ffb_par *) info-&gt;par;</div><div class='del'>-	struct ffb_fbc *fbc = par-&gt;fbc;</div><div class='add'>+	struct ffb_fbc __iomem *fbc = par-&gt;fbc;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 fg;</div><div class='ctx'> </div><div class='hunk'>@@ -505,7 +503,7 @@ static void</div><div class='ctx'> ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area) </div><div class='ctx'> {</div><div class='ctx'> 	struct ffb_par *par = (struct ffb_par *) info-&gt;par;</div><div class='del'>-	struct ffb_fbc *fbc = par-&gt;fbc;</div><div class='add'>+	struct ffb_fbc __iomem *fbc = par-&gt;fbc;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (area-&gt;dx != area-&gt;sx ||</div><div class='hunk'>@@ -541,7 +539,7 @@ ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area)</div><div class='ctx'> static void ffb_imageblit(struct fb_info *info, const struct fb_image *image)</div><div class='ctx'> {</div><div class='ctx'> 	struct ffb_par *par = (struct ffb_par *) info-&gt;par;</div><div class='del'>-	struct ffb_fbc *fbc = par-&gt;fbc;</div><div class='add'>+	struct ffb_fbc __iomem *fbc = par-&gt;fbc;</div><div class='ctx'> 	const u8 *data = image-&gt;data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 fg, bg, xy;</div><div class='hunk'>@@ -664,7 +662,7 @@ static int</div><div class='ctx'> ffb_blank(int blank, struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ffb_par *par = (struct ffb_par *) info-&gt;par;</div><div class='del'>-	struct ffb_dac *dac = par-&gt;dac;</div><div class='add'>+	struct ffb_dac __iomem *dac = par-&gt;dac;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -883,78 +881,42 @@ ffb_init_fix(struct fb_info *info)</div><div class='ctx'> 	info-&gt;fix.accel = FB_ACCEL_SUN_CREATOR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ffb_apply_upa_parent_ranges(int parent,</div><div class='del'>-				       struct linux_prom64_registers *regs)</div><div class='del'>-{</div><div class='del'>-	struct linux_prom64_ranges ranges[PROMREG_MAX];</div><div class='del'>-	char name[128];</div><div class='del'>-	int len, i;</div><div class='del'>-</div><div class='del'>-	prom_getproperty(parent, "name", name, sizeof(name));</div><div class='del'>-	if (strcmp(name, "upa") != 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	len = prom_getproperty(parent, "ranges", (void *) ranges, sizeof(ranges));</div><div class='del'>-	if (len &lt;= 0)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	len /= sizeof(struct linux_prom64_ranges);</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		struct linux_prom64_ranges *rng = &amp;ranges[i];</div><div class='del'>-		u64 phys_addr = regs-&gt;phys_addr;</div><div class='del'>-</div><div class='del'>-		if (phys_addr &gt;= rng-&gt;ot_child_base &amp;&amp;</div><div class='del'>-		    phys_addr &lt; (rng-&gt;ot_child_base + rng-&gt;or_size)) {</div><div class='del'>-			regs-&gt;phys_addr -= rng-&gt;ot_child_base;</div><div class='del'>-			regs-&gt;phys_addr += rng-&gt;ot_parent_base;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct ffb_par par;</div><div class='ctx'> 	u32 pseudo_palette[256];</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(ffb_list);</div><div class='ctx'> </div><div class='del'>-static void ffb_init_one(int node, int parent)</div><div class='add'>+static int ffb_init_one(struct of_device *op)</div><div class='ctx'> {</div><div class='del'>-	struct linux_prom64_registers regs[2*PROMREG_MAX];</div><div class='del'>-	struct ffb_fbc *fbc;</div><div class='del'>-	struct ffb_dac *dac;</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct ffb_fbc __iomem *fbc;</div><div class='add'>+	struct ffb_dac __iomem *dac;</div><div class='ctx'> 	struct all_info *all;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (prom_getproperty(node, "reg", (void *) regs, sizeof(regs)) &lt;= 0) {</div><div class='del'>-		printk("ffb: Cannot get reg device node property.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (ffb_apply_upa_parent_ranges(parent, &amp;regs[0])) {</div><div class='del'>-		printk("ffb: Cannot apply parent ranges to regs.\n");</div><div class='del'>-		return;</div><div class='add'>+	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='add'>+	all-&gt;par.fbc = of_ioremap(&amp;op-&gt;resource[2], 0,</div><div class='add'>+				  sizeof(struct ffb_fbc), "ffb fbc");</div><div class='add'>+	if (!all-&gt;par.fbc) {</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "ffb: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='add'>+	all-&gt;par.dac = of_ioremap(&amp;op-&gt;resource[1], 0,</div><div class='add'>+				  sizeof(struct ffb_dac), "ffb dac");</div><div class='add'>+	if (!all-&gt;par.dac) {</div><div class='add'>+		of_iounmap(all-&gt;par.fbc, sizeof(struct ffb_fbc));</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);	</div><div class='ctx'> </div><div class='del'>-	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.fbc = (struct ffb_fbc *)(regs[0].phys_addr + FFB_FBC_REGS_POFF);</div><div class='del'>-	all-&gt;par.dac = (struct ffb_dac *)(regs[0].phys_addr + FFB_DAC_POFF);</div><div class='ctx'> 	all-&gt;par.rop_cache = FFB_ROP_NEW;</div><div class='del'>-	all-&gt;par.physbase = regs[0].phys_addr;</div><div class='del'>-	all-&gt;par.prom_node = node;</div><div class='del'>-	all-&gt;par.prom_parent_node = parent;</div><div class='add'>+	all-&gt;par.physbase = op-&gt;resource[0].start;</div><div class='ctx'> </div><div class='ctx'> 	/* Don't mention copyarea, so SCROLL_REDRAW is always</div><div class='ctx'> 	 * used.  It is the fastest on this chip.</div><div class='hunk'>@@ -968,7 +930,7 @@ static void ffb_init_one(int node, int parent)</div><div class='ctx'> 	all-&gt;info.par = &amp;all-&gt;par;</div><div class='ctx'> 	all-&gt;info.pseudo_palette = all-&gt;pseudo_palette;</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, all-&gt;par.prom_node, 32);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 32);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(all-&gt;info.var.xres *</div><div class='ctx'> 				     all-&gt;info.var.yres *</div><div class='ctx'> 				     4);</div><div class='hunk'>@@ -976,14 +938,13 @@ static void ffb_init_one(int node, int parent)</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.var.accel_flags = FB_ACCELF_TEXT;</div><div class='ctx'> </div><div class='del'>-	prom_getstring(node, "name", all-&gt;par.name, sizeof(all-&gt;par.name));</div><div class='del'>-	if (!strcmp(all-&gt;par.name, "SUNW,afb"))</div><div class='add'>+	if (!strcmp(dp-&gt;name, "SUNW,afb"))</div><div class='ctx'> 		all-&gt;par.flags |= FFB_FLAG_AFB;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.board_type = prom_getintdefault(node, "board_type", 0);</div><div class='add'>+	all-&gt;par.board_type = of_getintprop_default(dp, "board_type", 0);</div><div class='ctx'> </div><div class='ctx'> 	fbc = all-&gt;par.fbc;</div><div class='del'>-	if((upa_readl(&amp;fbc-&gt;ucsr) &amp; FFB_UCSR_ALL_ERRORS) != 0)</div><div class='add'>+	if ((upa_readl(&amp;fbc-&gt;ucsr) &amp; FFB_UCSR_ALL_ERRORS) != 0)</div><div class='ctx'> 		upa_writel(FFB_UCSR_ALL_ERRORS, &amp;fbc-&gt;ucsr);</div><div class='ctx'> </div><div class='ctx'> 	ffb_switch_from_graph(&amp;all-&gt;par);</div><div class='hunk'>@@ -1008,81 +969,88 @@ static void ffb_init_one(int node, int parent)</div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='ctx'> 		printk(KERN_ERR "ffb: Could not allocate color map.\n");</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ffb_init_fix(&amp;all-&gt;info);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "ffb: Could not register framebuffer.\n");</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;ffb_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='ctx'> </div><div class='del'>-	printk("ffb: %s at %016lx type %d DAC %d\n",</div><div class='add'>+	printk("%s: %s at %016lx, type %d, DAC revision %d\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='ctx'> 	       ((all-&gt;par.flags &amp; FFB_FLAG_AFB) ? "AFB" : "FFB"),</div><div class='del'>-	       regs[0].phys_addr, all-&gt;par.board_type, all-&gt;par.dac_rev);</div><div class='add'>+	       all-&gt;par.physbase, all-&gt;par.board_type, all-&gt;par.dac_rev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ffb_scan_siblings(int root)</div><div class='add'>+static int __devinit ffb_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	int node, child;</div><div class='del'>-</div><div class='del'>-	child = prom_getchild(root);</div><div class='del'>-	for (node = prom_searchsiblings(child, "SUNW,ffb"); node;</div><div class='del'>-	     node = prom_searchsiblings(prom_getsibling(node), "SUNW,ffb"))</div><div class='del'>-		ffb_init_one(node, root);</div><div class='del'>-	for (node = prom_searchsiblings(child, "SUNW,afb"); node;</div><div class='del'>-	     node = prom_searchsiblings(prom_getsibling(node), "SUNW,afb"))</div><div class='del'>-		ffb_init_one(node, root);</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ffb_init_one(op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init ffb_init(void)</div><div class='add'>+static int __devexit ffb_remove(struct of_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int root;</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("ffb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='ctx'> </div><div class='del'>-	ffb_scan_siblings(prom_root_node);</div><div class='add'>+	of_iounmap(all-&gt;par.fbc, sizeof(struct ffb_fbc));</div><div class='add'>+	of_iounmap(all-&gt;par.dac, sizeof(struct ffb_dac));</div><div class='ctx'> </div><div class='del'>-	root = prom_getchild(prom_root_node);</div><div class='del'>-	for (root = prom_searchsiblings(root, "upa"); root;</div><div class='del'>-	     root = prom_searchsiblings(prom_getsibling(root), "upa"))</div><div class='del'>-		ffb_scan_siblings(root);</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit ffb_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id ffb_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,ffb",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,afb",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ffb_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver ffb_driver = {</div><div class='add'>+	.name		= "ffb",</div><div class='add'>+	.match_table	= ffb_match,</div><div class='add'>+	.probe		= ffb_probe,</div><div class='add'>+	.remove		= __devexit_p(ffb_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;ffb_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+int __init ffb_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("ffb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+	return of_register_driver(&amp;ffb_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-ffb_setup(char *arg)</div><div class='add'>+void __exit ffb_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;ffb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(ffb_init);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(ffb_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for Creator/Elite3D chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c<br/>index 605d1a132020..1b981b635675 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/g364fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/g364fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/g364fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/g364fb.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c<br/>index 5e25b9860196..bf0e60b5a3b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/gbefb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/gbefb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/gbefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/gbefb.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='head'>diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c<br/>index 20e69156d728..bcf9cea54d8b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/geode/gx1fb_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/geode/gx1fb_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/geode/gx1fb_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/geode/gx1fb_core.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -376,8 +375,6 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *</div><div class='ctx'> 		release_mem_region(gx1_gx_base() + 0x8300, 0x100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='ctx'> 	if (info)</div><div class='ctx'> 		framebuffer_release(info);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -399,7 +396,6 @@ static void gx1fb_remove(struct pci_dev *pdev)</div><div class='ctx'> 	iounmap(par-&gt;dc_regs);</div><div class='ctx'> 	release_mem_region(gx1_gx_base() + 0x8300, 0x100);</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	framebuffer_release(info);</div><div class='head'>diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c<br/>index 89c34b15f5d4..0d3643fc6293 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/geode/gxfb_core.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/geode/gxfb_core.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/geode/gxfb_core.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/geode/gxfb_core.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -354,8 +353,6 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i</div><div class='ctx'> 		pci_release_region(pdev, 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='ctx'> 	if (info)</div><div class='ctx'> 		framebuffer_release(info);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -377,7 +374,6 @@ static void gxfb_remove(struct pci_dev *pdev)</div><div class='ctx'> 	iounmap(par-&gt;dc_regs);</div><div class='ctx'> 	pci_release_region(pdev, 2);</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	framebuffer_release(info);</div><div class='head'>diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c<br/>index 4e39035cf335..fb9e67228543 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/hgafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/hgafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/hgafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/hgafb.c</a></div><div class='hunk'>@@ -36,7 +36,6 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c<br/>index f04ca721f94c..4cc6b454265e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/hitfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/hitfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/hitfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/hitfb.c</a></div><div class='hunk'>@@ -11,14 +11,12 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c<br/>index abd920a663a0..91cf3b577d15 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/hpfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/hpfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/hpfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/hpfb.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c<br/>index 3fe3ae1aff12..c1f7b49975dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/i810/i810-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/i810/i810-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/i810/i810-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/i810/i810-i2c.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *  License. See the file COPYING in the main directory of this archive for</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c<br/>index 44aa2ffff973..a6ca02f2156a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/i810/i810_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/i810/i810_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/i810/i810_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/i810/i810_main.c</a></div><div class='hunk'>@@ -29,12 +29,10 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -2110,9 +2108,6 @@ static void i810fb_release_resource(struct fb_info *info,</div><div class='ctx'> 	if (par-&gt;res_flags &amp; MMIO_REQ)</div><div class='ctx'> 		release_mem_region(par-&gt;mmio_start_phys, MMIO_SIZE);</div><div class='ctx'> </div><div class='del'>-	if (par-&gt;res_flags &amp; PCI_DEVICE_ENABLED)</div><div class='del'>-		pci_disable_device(par-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c<br/>index 6b88050d21bf..67f384f86758 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/igafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/igafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/igafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/igafb.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -232,9 +231,6 @@ static int igafb_mmap(struct fb_info *info,</div><div class='ctx'> </div><div class='ctx'> 	size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='ctx'> </div><div class='del'>-	/* To stop the swapper from even considering these pages. */</div><div class='del'>-	vma-&gt;vm_flags |= (VM_SHM | VM_LOCKED);</div><div class='del'>-</div><div class='ctx'> 	/* Each page, see which map applies */</div><div class='ctx'> 	for (page = 0; page &lt; size; ) {</div><div class='ctx'> 		map_size = 0;</div><div class='head'>diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c<br/>new file mode 100644<br/>index 000000000000..ff233b84dec4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/imacfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/imacfb.c</a></div><div class='hunk'>@@ -0,0 +1,341 @@</div><div class='add'>+/*</div><div class='add'>+ * framebuffer driver for Intel Based Mac's</div><div class='add'>+ *</div><div class='add'>+ * (c) 2006 Edgar Hucek &lt;gimli@dark-green.com&gt;</div><div class='add'>+ * Original imac driver written by Gerd Knorr &lt;kraxel@goldbach.in-berlin.de&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;video/vga.h&gt;</div><div class='add'>+</div><div class='add'>+typedef enum _MAC_TYPE {</div><div class='add'>+	M_I17,</div><div class='add'>+	M_I20,</div><div class='add'>+	M_MINI,</div><div class='add'>+	M_MACBOOK,</div><div class='add'>+	M_NEW</div><div class='add'>+} MAC_TYPE;</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static struct fb_var_screeninfo imacfb_defined __initdata = {</div><div class='add'>+	.activate		= FB_ACTIVATE_NOW,</div><div class='add'>+	.height			= -1,</div><div class='add'>+	.width			= -1,</div><div class='add'>+	.right_margin		= 32,</div><div class='add'>+	.upper_margin		= 16,</div><div class='add'>+	.lower_margin		= 4,</div><div class='add'>+	.vsync_len		= 4,</div><div class='add'>+	.vmode			= FB_VMODE_NONINTERLACED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_fix_screeninfo imacfb_fix __initdata = {</div><div class='add'>+	.id			= "IMAC VGA",</div><div class='add'>+	.type			= FB_TYPE_PACKED_PIXELS,</div><div class='add'>+	.accel			= FB_ACCEL_NONE,</div><div class='add'>+	.visual			= FB_VISUAL_TRUECOLOR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int inverse;</div><div class='add'>+static int model		= M_NEW;</div><div class='add'>+static int manual_height;</div><div class='add'>+static int manual_width;</div><div class='add'>+</div><div class='add'>+#define	DEFAULT_FB_MEM	1024*1024*16</div><div class='add'>+</div><div class='add'>+/* --------------------------------------------------------------------- */</div><div class='add'>+</div><div class='add'>+static int imacfb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='add'>+			    unsigned blue, unsigned transp,</div><div class='add'>+			    struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 *  Set a single color register. The values supplied are</div><div class='add'>+	 *  already rounded down to the hardware's capabilities</div><div class='add'>+	 *  (according to the entries in the `var' structure). Return</div><div class='add'>+	 *  != 0 for invalid regno.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (regno &gt;= info-&gt;cmap.len)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (regno &lt; 16) {</div><div class='add'>+		red   &gt;&gt;= 8;</div><div class='add'>+		green &gt;&gt;= 8;</div><div class='add'>+		blue  &gt;&gt;= 8;</div><div class='add'>+		((u32 *)(info-&gt;pseudo_palette))[regno] =</div><div class='add'>+			(red   &lt;&lt; info-&gt;var.red.offset)   |</div><div class='add'>+			(green &lt;&lt; info-&gt;var.green.offset) |</div><div class='add'>+			(blue  &lt;&lt; info-&gt;var.blue.offset);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops imacfb_ops = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.fb_setcolreg	= imacfb_setcolreg,</div><div class='add'>+	.fb_fillrect	= cfb_fillrect,</div><div class='add'>+	.fb_copyarea	= cfb_copyarea,</div><div class='add'>+	.fb_imageblit	= cfb_imageblit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init imacfb_setup(char *options)</div><div class='add'>+{</div><div class='add'>+	char *this_opt;</div><div class='add'>+</div><div class='add'>+	if (!options || !*options)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while ((this_opt = strsep(&amp;options, ",")) != NULL) {</div><div class='add'>+		if (!*this_opt) continue;</div><div class='add'>+</div><div class='add'>+		if (!strcmp(this_opt, "inverse"))</div><div class='add'>+			inverse = 1;</div><div class='add'>+		else if (!strcmp(this_opt, "i17"))</div><div class='add'>+			model = M_I17;</div><div class='add'>+		else if (!strcmp(this_opt, "i20"))</div><div class='add'>+			model = M_I20;</div><div class='add'>+		else if (!strcmp(this_opt, "mini"))</div><div class='add'>+			model = M_MINI;</div><div class='add'>+		else if (!strcmp(this_opt, "macbook"))</div><div class='add'>+			model = M_MACBOOK;</div><div class='add'>+		else if (!strncmp(this_opt, "height:", 7))</div><div class='add'>+			manual_height = simple_strtoul(this_opt+7, NULL, 0);</div><div class='add'>+		else if (!strncmp(this_opt, "width:", 6))</div><div class='add'>+			manual_width = simple_strtoul(this_opt+6, NULL, 0);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init imacfb_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int size_vmode;</div><div class='add'>+	unsigned int size_remap;</div><div class='add'>+	unsigned int size_total;</div><div class='add'>+</div><div class='add'>+	screen_info.lfb_depth = 32;</div><div class='add'>+	screen_info.lfb_size = DEFAULT_FB_MEM / 0x10000;</div><div class='add'>+	screen_info.pages=1;</div><div class='add'>+	screen_info.blue_size = 8;</div><div class='add'>+	screen_info.blue_pos = 0;</div><div class='add'>+	screen_info.green_size = 8;</div><div class='add'>+	screen_info.green_pos = 8;</div><div class='add'>+	screen_info.red_size = 8;</div><div class='add'>+	screen_info.red_pos = 16;</div><div class='add'>+	screen_info.rsvd_size = 8;</div><div class='add'>+	screen_info.rsvd_pos = 24;</div><div class='add'>+</div><div class='add'>+	switch (model) {</div><div class='add'>+	case M_I17:</div><div class='add'>+		screen_info.lfb_width = 1440;</div><div class='add'>+		screen_info.lfb_height = 900;</div><div class='add'>+		screen_info.lfb_linelength = 1472 * 4;</div><div class='add'>+		screen_info.lfb_base = 0x80010000;</div><div class='add'>+		break;</div><div class='add'>+	case M_NEW:</div><div class='add'>+	case M_I20:</div><div class='add'>+		screen_info.lfb_width = 1680;</div><div class='add'>+		screen_info.lfb_height = 1050;</div><div class='add'>+		screen_info.lfb_linelength = 1728 * 4;</div><div class='add'>+		screen_info.lfb_base = 0x80010000;</div><div class='add'>+		break;</div><div class='add'>+	case M_MINI:</div><div class='add'>+		screen_info.lfb_width = 1024;</div><div class='add'>+		screen_info.lfb_height = 768;</div><div class='add'>+		screen_info.lfb_linelength = 2048 * 4;</div><div class='add'>+		screen_info.lfb_base = 0x80000000;</div><div class='add'>+		break;</div><div class='add'>+	case M_MACBOOK:</div><div class='add'>+		screen_info.lfb_width = 1280;</div><div class='add'>+		screen_info.lfb_height = 800;</div><div class='add'>+		screen_info.lfb_linelength = 2048 * 4;</div><div class='add'>+		screen_info.lfb_base = 0x80000000;</div><div class='add'>+		break;</div><div class='add'>+ 	}</div><div class='add'>+</div><div class='add'>+	/* if the user wants to manually specify height/width,</div><div class='add'>+	   we will override the defaults */</div><div class='add'>+	/* TODO: eventually get auto-detection working */</div><div class='add'>+	if (manual_height &gt; 0)</div><div class='add'>+		screen_info.lfb_height = manual_height;</div><div class='add'>+	if (manual_width &gt; 0)</div><div class='add'>+		screen_info.lfb_width = manual_width;</div><div class='add'>+</div><div class='add'>+	imacfb_fix.smem_start = screen_info.lfb_base;</div><div class='add'>+	imacfb_defined.bits_per_pixel = screen_info.lfb_depth;</div><div class='add'>+	imacfb_defined.xres = screen_info.lfb_width;</div><div class='add'>+	imacfb_defined.yres = screen_info.lfb_height;</div><div class='add'>+	imacfb_fix.line_length = screen_info.lfb_linelength;</div><div class='add'>+</div><div class='add'>+	/*   size_vmode -- that is the amount of memory needed for the</div><div class='add'>+	 *                 used video mode, i.e. the minimum amount of</div><div class='add'>+	 *                 memory we need. */</div><div class='add'>+	size_vmode = imacfb_defined.yres * imacfb_fix.line_length;</div><div class='add'>+</div><div class='add'>+	/*   size_total -- all video memory we have. Used for</div><div class='add'>+	 *                 entries, ressource allocation and bounds</div><div class='add'>+	 *                 checking. */</div><div class='add'>+	size_total = screen_info.lfb_size * 65536;</div><div class='add'>+	if (size_total &lt; size_vmode)</div><div class='add'>+		size_total = size_vmode;</div><div class='add'>+</div><div class='add'>+	/*   size_remap -- the amount of video memory we are going to</div><div class='add'>+	 *                 use for imacfb.  With modern cards it is no</div><div class='add'>+	 *                 option to simply use size_total as that</div><div class='add'>+	 *                 wastes plenty of kernel address space. */</div><div class='add'>+	size_remap  = size_vmode * 2;</div><div class='add'>+	if (size_remap &lt; size_vmode)</div><div class='add'>+		size_remap = size_vmode;</div><div class='add'>+	if (size_remap &gt; size_total)</div><div class='add'>+		size_remap = size_total;</div><div class='add'>+	imacfb_fix.smem_len = size_remap;</div><div class='add'>+</div><div class='add'>+	if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "imacfb: cannot reserve video memory at 0x%lx\n",</div><div class='add'>+			imacfb_fix.smem_start);</div><div class='add'>+		/* We cannot make this fatal. Sometimes this comes from magic</div><div class='add'>+		   spaces our resource handlers simply don't know about */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info = framebuffer_alloc(sizeof(u32) * 16, &amp;dev-&gt;dev);</div><div class='add'>+	if (!info) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_release_mem;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;pseudo_palette = info-&gt;par;</div><div class='add'>+	info-&gt;par = NULL;</div><div class='add'>+</div><div class='add'>+	info-&gt;screen_base = ioremap(imacfb_fix.smem_start, imacfb_fix.smem_len);</div><div class='add'>+	if (!info-&gt;screen_base) {</div><div class='add'>+		printk(KERN_ERR "imacfb: abort, cannot ioremap video memory "</div><div class='add'>+				"0x%x @ 0x%lx\n",</div><div class='add'>+			imacfb_fix.smem_len, imacfb_fix.smem_start);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "imacfb: framebuffer at 0x%lx, mapped to 0x%p, "</div><div class='add'>+	       "using %dk, total %dk\n",</div><div class='add'>+	       imacfb_fix.smem_start, info-&gt;screen_base,</div><div class='add'>+	       size_remap/1024, size_total/1024);</div><div class='add'>+	printk(KERN_INFO "imacfb: mode is %dx%dx%d, linelength=%d, pages=%d\n",</div><div class='add'>+	       imacfb_defined.xres, imacfb_defined.yres,</div><div class='add'>+	       imacfb_defined.bits_per_pixel, imacfb_fix.line_length,</div><div class='add'>+	       screen_info.pages);</div><div class='add'>+</div><div class='add'>+	imacfb_defined.xres_virtual = imacfb_defined.xres;</div><div class='add'>+	imacfb_defined.yres_virtual = imacfb_fix.smem_len /</div><div class='add'>+					imacfb_fix.line_length;</div><div class='add'>+	printk(KERN_INFO "imacfb: scrolling: redraw\n");</div><div class='add'>+	imacfb_defined.yres_virtual = imacfb_defined.yres;</div><div class='add'>+</div><div class='add'>+	/* some dummy values for timing to make fbset happy */</div><div class='add'>+	imacfb_defined.pixclock     = 10000000 / imacfb_defined.xres *</div><div class='add'>+					1000 / imacfb_defined.yres;</div><div class='add'>+	imacfb_defined.left_margin  = (imacfb_defined.xres / 8) &amp; 0xf8;</div><div class='add'>+	imacfb_defined.hsync_len    = (imacfb_defined.xres / 8) &amp; 0xf8;</div><div class='add'>+</div><div class='add'>+	imacfb_defined.red.offset    = screen_info.red_pos;</div><div class='add'>+	imacfb_defined.red.length    = screen_info.red_size;</div><div class='add'>+	imacfb_defined.green.offset  = screen_info.green_pos;</div><div class='add'>+	imacfb_defined.green.length  = screen_info.green_size;</div><div class='add'>+	imacfb_defined.blue.offset   = screen_info.blue_pos;</div><div class='add'>+	imacfb_defined.blue.length   = screen_info.blue_size;</div><div class='add'>+	imacfb_defined.transp.offset = screen_info.rsvd_pos;</div><div class='add'>+	imacfb_defined.transp.length = screen_info.rsvd_size;</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "imacfb: %s: "</div><div class='add'>+	       "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",</div><div class='add'>+	       "Truecolor",</div><div class='add'>+	       screen_info.rsvd_size,</div><div class='add'>+	       screen_info.red_size,</div><div class='add'>+	       screen_info.green_size,</div><div class='add'>+	       screen_info.blue_size,</div><div class='add'>+	       screen_info.rsvd_pos,</div><div class='add'>+	       screen_info.red_pos,</div><div class='add'>+	       screen_info.green_pos,</div><div class='add'>+	       screen_info.blue_pos);</div><div class='add'>+</div><div class='add'>+	imacfb_fix.ypanstep  = 0;</div><div class='add'>+	imacfb_fix.ywrapstep = 0;</div><div class='add'>+</div><div class='add'>+	/* request failure does not faze us, as vgacon probably has this</div><div class='add'>+	 * region already (FIXME) */</div><div class='add'>+	request_region(0x3c0, 32, "imacfb");</div><div class='add'>+</div><div class='add'>+	info-&gt;fbops = &amp;imacfb_ops;</div><div class='add'>+	info-&gt;var = imacfb_defined;</div><div class='add'>+	info-&gt;fix = imacfb_fix;</div><div class='add'>+	info-&gt;flags = FBINFO_FLAG_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (fb_alloc_cmap(&amp;info-&gt;cmap, 256, 0) &lt; 0) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_unmap;</div><div class='add'>+	}</div><div class='add'>+	if (register_framebuffer(info)&lt;0) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_fb_dealoc;</div><div class='add'>+	}</div><div class='add'>+	printk(KERN_INFO "fb%d: %s frame buffer device\n",</div><div class='add'>+	       info-&gt;node, info-&gt;fix.id);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_fb_dealoc:</div><div class='add'>+	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='add'>+err_unmap:</div><div class='add'>+	iounmap(info-&gt;screen_base);</div><div class='add'>+	framebuffer_release(info);</div><div class='add'>+err_release_mem:</div><div class='add'>+	release_mem_region(imacfb_fix.smem_start, size_total);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver imacfb_driver = {</div><div class='add'>+	.probe	= imacfb_probe,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name	= "imacfb",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_device imacfb_device = {</div><div class='add'>+	.name	= "imacfb",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init imacfb_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	char *option = NULL;</div><div class='add'>+</div><div class='add'>+	/* ignore error return of fb_get_options */</div><div class='add'>+	fb_get_options("imacfb", &amp;option);</div><div class='add'>+	imacfb_setup(option);</div><div class='add'>+	ret = platform_driver_register(&amp;imacfb_driver);</div><div class='add'>+</div><div class='add'>+	if (!ret) {</div><div class='add'>+		ret = platform_device_register(&amp;imacfb_device);</div><div class='add'>+		if (ret)</div><div class='add'>+			platform_driver_unregister(&amp;imacfb_driver);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+module_init(imacfb_init);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c<br/>index f73c642b50c2..5715b8ad0ddc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/imsttfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/imsttfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/imsttfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/imsttfb.c</a></div><div class='hunk'>@@ -16,13 +16,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c<br/>index 1718baaeed2a..0f9b2fdc28b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/imxfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/imxfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/imxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/imxfb.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> //#define DEBUG 1</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h<br/>index da29d007f215..e290d7460e1b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/intelfb/intelfb.h</a></div><div class='hunk'>@@ -8,9 +8,9 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*** Version/name ***/</div><div class='del'>-#define INTELFB_VERSION			"0.9.2"</div><div class='add'>+#define INTELFB_VERSION			"0.9.4"</div><div class='ctx'> #define INTELFB_MODULE_NAME		"intelfb"</div><div class='del'>-#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM"</div><div class='add'>+#define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM"</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*** Debug/feature defines ***/</div><div class='hunk'>@@ -52,11 +52,14 @@</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_865G	0x2572</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_915G	0x2582</div><div class='ctx'> #define PCI_DEVICE_ID_INTEL_915GM	0x2592</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_945G	0x2772</div><div class='add'>+#define PCI_DEVICE_ID_INTEL_945GM	0x27A2</div><div class='ctx'> </div><div class='ctx'> /* Size of MMIO region */</div><div class='ctx'> #define INTEL_REG_SIZE			0x80000</div><div class='ctx'> </div><div class='ctx'> #define STRIDE_ALIGNMENT		16</div><div class='add'>+#define STRIDE_ALIGNMENT_I9XX		64</div><div class='ctx'> </div><div class='ctx'> #define PALETTE_8_ENTRIES		256</div><div class='ctx'> </div><div class='hunk'>@@ -125,7 +128,9 @@ enum intel_chips {</div><div class='ctx'> 	INTEL_855GME,</div><div class='ctx'> 	INTEL_865G,</div><div class='ctx'> 	INTEL_915G,</div><div class='del'>-	INTEL_915GM</div><div class='add'>+	INTEL_915GM,</div><div class='add'>+	INTEL_945G,</div><div class='add'>+	INTEL_945GM,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct intelfb_hwstate {</div><div class='hunk'>@@ -232,7 +237,7 @@ struct intelfb_info {</div><div class='ctx'> 	u32 fb_start;</div><div class='ctx'> </div><div class='ctx'> 	/* ring buffer */</div><div class='del'>-	u8 __iomem *ring_head;</div><div class='add'>+	u32 ring_head;</div><div class='ctx'> 	u32 ring_tail;</div><div class='ctx'> 	u32 ring_tail_mask;</div><div class='ctx'> 	u32 ring_space;</div><div class='hunk'>@@ -277,8 +282,13 @@ struct intelfb_info {</div><div class='ctx'> </div><div class='ctx'> 	/* driver registered */</div><div class='ctx'> 	int registered;</div><div class='add'>+	</div><div class='add'>+	/* index into plls */</div><div class='add'>+	int pll_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define IS_I9XX(dinfo) (((dinfo)-&gt;chipset == INTEL_915G)||(dinfo-&gt;chipset == INTEL_915GM)||((dinfo)-&gt;chipset == INTEL_945G)||(dinfo-&gt;chipset==INTEL_945GM))</div><div class='add'>+</div><div class='ctx'> /*** function prototypes ***/</div><div class='ctx'> </div><div class='ctx'> extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var);</div><div class='head'>diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c<br/>index 995b47c165a7..06af89d44a0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfbdrv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfbdrv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfbdrv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/intelfb/intelfbdrv.c</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='ctx'> /*</div><div class='ctx'>  * intelfb</div><div class='ctx'>  *</div><div class='del'>- * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM</div><div class='del'>- * integrated graphics chips.</div><div class='add'>+ * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/</div><div class='add'>+ * 945G/945GM integrated graphics chips.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright © 2002, 2003 David Dawes &lt;dawes@xfree86.org&gt;</div><div class='ctx'>  *                   2004 Sylvain Meyer</div><div class='add'>+ *                   2006 David Airlie</div><div class='ctx'>  *</div><div class='ctx'>  * This driver consists of two parts.  The first part (intelfbdrv.c) provides</div><div class='ctx'>  * the basic fbdev interfaces, is derived in part from the radeonfb and</div><div class='hunk'>@@ -107,13 +108,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -122,6 +121,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -131,6 +131,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "intelfb.h"</div><div class='ctx'> #include "intelfbhw.h"</div><div class='add'>+#include "../edid.h"</div><div class='ctx'> </div><div class='ctx'> static void __devinit get_initial_mode(struct intelfb_info *dinfo);</div><div class='ctx'> static void update_dinfo(struct intelfb_info *dinfo,</div><div class='hunk'>@@ -182,6 +183,8 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_865G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_865G },</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_915G },</div><div class='ctx'> 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_915GM },</div><div class='add'>+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_945G },</div><div class='add'>+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA &lt;&lt; 8, INTELFB_CLASS_MASK, INTEL_945GM },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -261,7 +264,7 @@ MODULE_PARM_DESC(mode,</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> #define OPT_EQUAL(opt, name) (!strncmp(opt, name, strlen(name)))</div><div class='del'>-#define OPT_INTVAL(opt, name) simple_strtoul(opt + strlen(name), NULL, 0)</div><div class='add'>+#define OPT_INTVAL(opt, name) simple_strtoul(opt + strlen(name) + 1, NULL, 0)</div><div class='ctx'> #define OPT_STRVAL(opt, name) (opt + strlen(name))</div><div class='ctx'> </div><div class='ctx'> static __inline__ char *</div><div class='hunk'>@@ -546,11 +549,11 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	/* Set base addresses. */</div><div class='ctx'> 	if ((ent-&gt;device == PCI_DEVICE_ID_INTEL_915G) ||</div><div class='del'>-			(ent-&gt;device == PCI_DEVICE_ID_INTEL_915GM)) {</div><div class='add'>+	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_915GM) ||</div><div class='add'>+	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_945G)  ||</div><div class='add'>+	    (ent-&gt;device == PCI_DEVICE_ID_INTEL_945GM)) {</div><div class='ctx'> 		aperture_bar = 2;</div><div class='ctx'> 		mmio_bar = 0;</div><div class='del'>-		/* Disable HW cursor on 915G/M (not implemented yet) */</div><div class='del'>-		hwcursor = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	dinfo-&gt;aperture.physical = pci_resource_start(pdev, aperture_bar);</div><div class='ctx'> 	dinfo-&gt;aperture.size     = pci_resource_len(pdev, aperture_bar);</div><div class='hunk'>@@ -584,8 +587,7 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* Get the chipset info. */</div><div class='ctx'> 	dinfo-&gt;pci_chipset = pdev-&gt;device;</div><div class='ctx'> </div><div class='del'>-	if (intelfbhw_get_chipset(pdev, &amp;dinfo-&gt;name, &amp;dinfo-&gt;chipset,</div><div class='del'>-				  &amp;dinfo-&gt;mobile)) {</div><div class='add'>+	if (intelfbhw_get_chipset(pdev, dinfo)) {</div><div class='ctx'> 		cleanup(dinfo);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -704,7 +706,7 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			+ (dinfo-&gt;ring.offset &lt;&lt; 12);</div><div class='ctx'> 		dinfo-&gt;ring.virtual  = dinfo-&gt;aperture.virtual</div><div class='ctx'> 			+ (dinfo-&gt;ring.offset &lt;&lt; 12);</div><div class='del'>-		dinfo-&gt;ring_head = dinfo-&gt;ring.virtual;</div><div class='add'>+		dinfo-&gt;ring_head = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dinfo-&gt;hwcursor) {</div><div class='ctx'> 		agp_memtype = dinfo-&gt;mobile ? AGP_PHYSICAL_MEMORY</div><div class='hunk'>@@ -763,18 +765,18 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (mtrr)</div><div class='ctx'> 		set_mtrr(dinfo);</div><div class='ctx'> </div><div class='del'>-	DBG_MSG("fb: 0x%x(+ 0x%x)/0x%x (0x%x)\n",</div><div class='add'>+	DBG_MSG("fb: 0x%x(+ 0x%x)/0x%x (0x%p)\n",</div><div class='ctx'> 		dinfo-&gt;fb.physical, dinfo-&gt;fb.offset, dinfo-&gt;fb.size,</div><div class='del'>-		(u32 __iomem ) dinfo-&gt;fb.virtual);</div><div class='del'>-	DBG_MSG("MMIO: 0x%x/0x%x (0x%x)\n",</div><div class='add'>+		dinfo-&gt;fb.virtual);</div><div class='add'>+	DBG_MSG("MMIO: 0x%x/0x%x (0x%p)\n",</div><div class='ctx'> 		dinfo-&gt;mmio_base_phys, INTEL_REG_SIZE,</div><div class='del'>-		(u32 __iomem) dinfo-&gt;mmio_base);</div><div class='del'>-	DBG_MSG("ring buffer: 0x%x/0x%x (0x%x)\n",</div><div class='add'>+		dinfo-&gt;mmio_base);</div><div class='add'>+	DBG_MSG("ring buffer: 0x%x/0x%x (0x%p)\n",</div><div class='ctx'> 		dinfo-&gt;ring.physical, dinfo-&gt;ring.size,</div><div class='del'>-		(u32 __iomem ) dinfo-&gt;ring.virtual);</div><div class='del'>-	DBG_MSG("HW cursor: 0x%x/0x%x (0x%x) (offset 0x%x) (phys 0x%x)\n",</div><div class='add'>+		dinfo-&gt;ring.virtual);</div><div class='add'>+	DBG_MSG("HW cursor: 0x%x/0x%x (0x%p) (offset 0x%x) (phys 0x%x)\n",</div><div class='ctx'> 		dinfo-&gt;cursor.physical, dinfo-&gt;cursor.size,</div><div class='del'>-		(u32 __iomem ) dinfo-&gt;cursor.virtual, dinfo-&gt;cursor.offset,</div><div class='add'>+		dinfo-&gt;cursor.virtual, dinfo-&gt;cursor.offset,</div><div class='ctx'> 		dinfo-&gt;cursor.physical);</div><div class='ctx'> </div><div class='ctx'> 	DBG_MSG("options: vram = %d, accel = %d, hwcursor = %d, fixed = %d, "</div><div class='hunk'>@@ -1029,17 +1031,44 @@ intelfb_init_var(struct intelfb_info *dinfo)</div><div class='ctx'> 		       sizeof(struct fb_var_screeninfo));</div><div class='ctx'> 		msrc = 5;</div><div class='ctx'> 	} else {</div><div class='add'>+		const u8 *edid_s = fb_firmware_edid(&amp;dinfo-&gt;pdev-&gt;dev);</div><div class='add'>+		u8 *edid_d = NULL;</div><div class='add'>+</div><div class='add'>+		if (edid_s) {</div><div class='add'>+			edid_d = kmalloc(EDID_LENGTH, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+			if (edid_d) {</div><div class='add'>+				memcpy(edid_d, edid_s, EDID_LENGTH);</div><div class='add'>+				fb_edid_to_monspecs(edid_d,</div><div class='add'>+						    &amp;dinfo-&gt;info-&gt;monspecs);</div><div class='add'>+				kfree(edid_d);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (mode) {</div><div class='add'>+			printk("intelfb: Looking for mode in private "</div><div class='add'>+			       "database\n");</div><div class='ctx'> 			msrc = fb_find_mode(var, dinfo-&gt;info, mode,</div><div class='del'>-					    vesa_modes, VESA_MODEDB_SIZE,</div><div class='add'>+					    dinfo-&gt;info-&gt;monspecs.modedb,</div><div class='add'>+					    dinfo-&gt;info-&gt;monspecs.modedb_len,</div><div class='ctx'> 					    NULL, 0);</div><div class='del'>-			if (msrc)</div><div class='del'>-				msrc |= 8;</div><div class='add'>+</div><div class='add'>+			if (msrc &amp;&amp; msrc &gt; 1) {</div><div class='add'>+				printk("intelfb: No mode in private database, "</div><div class='add'>+				       "intelfb: looking for mode in global "</div><div class='add'>+				       "database ");</div><div class='add'>+				msrc = fb_find_mode(var, dinfo-&gt;info, mode,</div><div class='add'>+						    NULL, 0, NULL, 0);</div><div class='add'>+</div><div class='add'>+				if (msrc)</div><div class='add'>+					msrc |= 8;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		if (!msrc) {</div><div class='ctx'> 			msrc = fb_find_mode(var, dinfo-&gt;info, PREFERRED_MODE,</div><div class='del'>-					    vesa_modes, VESA_MODEDB_SIZE,</div><div class='del'>-					    NULL, 0);</div><div class='add'>+					    NULL, 0, NULL, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1139,7 +1168,10 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the line length is a aligned correctly. */</div><div class='del'>-	dinfo-&gt;pitch = ROUND_UP_TO(dinfo-&gt;pitch, STRIDE_ALIGNMENT);</div><div class='add'>+	if (IS_I9XX(dinfo))</div><div class='add'>+		dinfo-&gt;pitch = ROUND_UP_TO(dinfo-&gt;pitch, STRIDE_ALIGNMENT_I9XX);</div><div class='add'>+	else</div><div class='add'>+		dinfo-&gt;pitch = ROUND_UP_TO(dinfo-&gt;pitch, STRIDE_ALIGNMENT);</div><div class='ctx'> </div><div class='ctx'> 	if (FIXED_MODE(dinfo))</div><div class='ctx'> 		dinfo-&gt;pitch = dinfo-&gt;initial_pitch;</div><div class='hunk'>@@ -1162,16 +1194,33 @@ intelfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='ctx'> 	struct fb_var_screeninfo v;</div><div class='ctx'> 	struct intelfb_info *dinfo;</div><div class='ctx'> 	static int first = 1;</div><div class='add'>+	int i;</div><div class='add'>+	/* Good pitches to allow tiling.  Don't care about pitches &lt; 1024. */</div><div class='add'>+	static const int pitches[] = {</div><div class='add'>+		128 * 8,</div><div class='add'>+		128 * 16,</div><div class='add'>+		128 * 32,</div><div class='add'>+		128 * 64,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	DBG_MSG("intelfb_check_var: accel_flags is %d\n", var-&gt;accel_flags);</div><div class='ctx'> </div><div class='ctx'> 	dinfo = GET_DINFO(info);</div><div class='ctx'> </div><div class='add'>+	/* update the pitch */</div><div class='ctx'> 	if (intelfbhw_validate_mode(dinfo, var) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	v = *var;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; pitches[i] != 0; i++) {</div><div class='add'>+		if (pitches[i] &gt;= v.xres_virtual) {</div><div class='add'>+			v.xres_virtual = pitches[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Check for a supported bpp. */</div><div class='ctx'> 	if (v.bits_per_pixel &lt;= 8) {</div><div class='ctx'> 		v.bits_per_pixel = 8;</div><div class='hunk'>@@ -1467,7 +1516,7 @@ static int</div><div class='ctx'> intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='ctx'> {</div><div class='ctx'>         struct intelfb_info *dinfo = GET_DINFO(info);</div><div class='del'>-</div><div class='add'>+	u32 physical;</div><div class='ctx'> #if VERBOSE &gt; 0</div><div class='ctx'> 	DBG_MSG("intelfb_cursor\n");</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1478,7 +1527,10 @@ intelfb_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='ctx'> 	intelfbhw_cursor_hide(dinfo);</div><div class='ctx'> </div><div class='ctx'> 	/* If XFree killed the cursor - restore it */</div><div class='del'>-	if (INREG(CURSOR_A_BASEADDR) != dinfo-&gt;cursor.offset &lt;&lt; 12) {</div><div class='add'>+	physical = (dinfo-&gt;mobile || IS_I9XX(dinfo)) ? dinfo-&gt;cursor.physical :</div><div class='add'>+		   (dinfo-&gt;cursor.offset &lt;&lt; 12);</div><div class='add'>+</div><div class='add'>+	if (INREG(CURSOR_A_BASEADDR) != physical) {</div><div class='ctx'> 		u32 fg, bg;</div><div class='ctx'> </div><div class='ctx'> 		DBG_MSG("the cursor was killed - restore it !!\n");</div><div class='head'>diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c<br/>index 624c4bc96f0d..2a9322f9cfdc 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfbhw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfbhw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfbhw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/intelfb/intelfbhw.c</a></div><div class='hunk'>@@ -19,13 +19,11 @@</div><div class='ctx'> </div><div class='ctx'> /* $DHD: intelfb/intelfbhw.c,v 1.9 2003/06/27 15:06:25 dawes Exp $ */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -40,68 +38,110 @@</div><div class='ctx'> #include "intelfb.h"</div><div class='ctx'> #include "intelfbhw.h"</div><div class='ctx'> </div><div class='add'>+struct pll_min_max {</div><div class='add'>+	int min_m, max_m, min_m1, max_m1;</div><div class='add'>+	int min_m2, max_m2, min_n, max_n;</div><div class='add'>+	int min_p, max_p, min_p1, max_p1;</div><div class='add'>+	int min_vco, max_vco, p_transition_clk, ref_clk;</div><div class='add'>+	int p_inc_lo, p_inc_hi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PLLS_I8xx 0</div><div class='add'>+#define PLLS_I9xx 1</div><div class='add'>+#define PLLS_MAX 2</div><div class='add'>+</div><div class='add'>+static struct pll_min_max plls[PLLS_MAX] = {</div><div class='add'>+	{ 108, 140, 18, 26,</div><div class='add'>+	  6, 16, 3, 16,</div><div class='add'>+	  4, 128, 0, 31,</div><div class='add'>+	  930000, 1400000, 165000, 48000,</div><div class='add'>+	  4, 2 }, //I8xx</div><div class='add'>+</div><div class='add'>+	{ 75, 120, 10, 20,</div><div class='add'>+	  5, 9, 4, 7,</div><div class='add'>+	  5, 80, 1, 8,</div><div class='add'>+	  1400000, 2800000, 200000, 96000,</div><div class='add'>+	  10, 5 }  //I9xx</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int</div><div class='del'>-intelfbhw_get_chipset(struct pci_dev *pdev, const char **name, int *chipset,</div><div class='del'>-		      int *mobile)</div><div class='add'>+intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp;</div><div class='del'>-</div><div class='del'>-	if (!pdev || !name || !chipset || !mobile)</div><div class='add'>+	if (!pdev || !dinfo)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	switch (pdev-&gt;device) {</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_830M:</div><div class='del'>-		*name = "Intel(R) 830M";</div><div class='del'>-		*chipset = INTEL_830M;</div><div class='del'>-		*mobile = 1;</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 830M";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_830M;</div><div class='add'>+		dinfo-&gt;mobile = 1;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I8xx;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_845G:</div><div class='del'>-		*name = "Intel(R) 845G";</div><div class='del'>-		*chipset = INTEL_845G;</div><div class='del'>-		*mobile = 0;</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 845G";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_845G;</div><div class='add'>+		dinfo-&gt;mobile = 0;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I8xx;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_85XGM:</div><div class='ctx'> 		tmp = 0;</div><div class='del'>-		*mobile = 1;</div><div class='add'>+		dinfo-&gt;mobile = 1;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I8xx;</div><div class='ctx'> 		pci_read_config_dword(pdev, INTEL_85X_CAPID, &amp;tmp);</div><div class='ctx'> 		switch ((tmp &gt;&gt; INTEL_85X_VARIANT_SHIFT) &amp;</div><div class='ctx'> 			INTEL_85X_VARIANT_MASK) {</div><div class='ctx'> 		case INTEL_VAR_855GME:</div><div class='del'>-			*name = "Intel(R) 855GME";</div><div class='del'>-			*chipset = INTEL_855GME;</div><div class='add'>+			dinfo-&gt;name = "Intel(R) 855GME";</div><div class='add'>+			dinfo-&gt;chipset = INTEL_855GME;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_VAR_855GM:</div><div class='del'>-			*name = "Intel(R) 855GM";</div><div class='del'>-			*chipset = INTEL_855GM;</div><div class='add'>+			dinfo-&gt;name = "Intel(R) 855GM";</div><div class='add'>+			dinfo-&gt;chipset = INTEL_855GM;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_VAR_852GME:</div><div class='del'>-			*name = "Intel(R) 852GME";</div><div class='del'>-			*chipset = INTEL_852GME;</div><div class='add'>+			dinfo-&gt;name = "Intel(R) 852GME";</div><div class='add'>+			dinfo-&gt;chipset = INTEL_852GME;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_VAR_852GM:</div><div class='del'>-			*name = "Intel(R) 852GM";</div><div class='del'>-			*chipset = INTEL_852GM;</div><div class='add'>+			dinfo-&gt;name = "Intel(R) 852GM";</div><div class='add'>+			dinfo-&gt;chipset = INTEL_852GM;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		default:</div><div class='del'>-			*name = "Intel(R) 852GM/855GM";</div><div class='del'>-			*chipset = INTEL_85XGM;</div><div class='add'>+			dinfo-&gt;name = "Intel(R) 852GM/855GM";</div><div class='add'>+			dinfo-&gt;chipset = INTEL_85XGM;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_865G:</div><div class='del'>-		*name = "Intel(R) 865G";</div><div class='del'>-		*chipset = INTEL_865G;</div><div class='del'>-		*mobile = 0;</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 865G";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_865G;</div><div class='add'>+		dinfo-&gt;mobile = 0;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I8xx;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_915G:</div><div class='del'>-		*name = "Intel(R) 915G";</div><div class='del'>-		*chipset = INTEL_915G;</div><div class='del'>-		*mobile = 0;</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 915G";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_915G;</div><div class='add'>+		dinfo-&gt;mobile = 0;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I9xx;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case PCI_DEVICE_ID_INTEL_915GM:</div><div class='del'>-		*name = "Intel(R) 915GM";</div><div class='del'>-		*chipset = INTEL_915GM;</div><div class='del'>-		*mobile = 1;</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 915GM";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_915GM;</div><div class='add'>+		dinfo-&gt;mobile = 1;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I9xx;</div><div class='add'>+		return 0;</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_945G:</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 945G";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_945G;</div><div class='add'>+		dinfo-&gt;mobile = 0;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I9xx;</div><div class='add'>+		return 0;</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_945GM:</div><div class='add'>+		dinfo-&gt;name = "Intel(R) 945GM";</div><div class='add'>+		dinfo-&gt;chipset = INTEL_945GM;</div><div class='add'>+		dinfo-&gt;mobile = 1;</div><div class='add'>+		dinfo-&gt;pll_index = PLLS_I9xx;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -114,6 +154,7 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *bridge_dev;</div><div class='ctx'> 	u16 tmp;</div><div class='add'>+	int stolen_overhead;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev || !aperture_size || !stolen_size)</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -128,21 +169,41 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,</div><div class='ctx'> 	tmp = 0;</div><div class='ctx'> 	pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &amp;tmp);</div><div class='ctx'> 	switch (pdev-&gt;device) {</div><div class='del'>-	case PCI_DEVICE_ID_INTEL_830M:</div><div class='del'>-	case PCI_DEVICE_ID_INTEL_845G:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_915G:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_915GM:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_945G:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_945GM:</div><div class='add'>+		/* 915 and 945 chipsets support a 256MB aperture.</div><div class='add'>+		   Aperture size is determined by inspected the</div><div class='add'>+		   base address of the aperture. */</div><div class='add'>+		if (pci_resource_start(pdev, 2) &amp; 0x08000000)</div><div class='add'>+			*aperture_size = MB(128);</div><div class='add'>+		else</div><div class='add'>+			*aperture_size = MB(256);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		if ((tmp &amp; INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)</div><div class='ctx'> 			*aperture_size = MB(64);</div><div class='ctx'> 		else</div><div class='ctx'> 			*aperture_size = MB(128);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Stolen memory size is reduced by the GTT and the popup.</div><div class='add'>+	   GTT is 1K per MB of aperture size, and popup is 4K. */</div><div class='add'>+	stolen_overhead = (*aperture_size / MB(1)) + 4;</div><div class='add'>+	switch(pdev-&gt;device) {</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_830M:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_845G:</div><div class='ctx'> 		switch (tmp &amp; INTEL_830_GMCH_GMS_MASK) {</div><div class='ctx'> 		case INTEL_830_GMCH_GMS_STOLEN_512:</div><div class='del'>-			*stolen_size = KB(512) - KB(132);</div><div class='add'>+			*stolen_size = KB(512) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_830_GMCH_GMS_STOLEN_1024:</div><div class='del'>-			*stolen_size = MB(1) - KB(132);</div><div class='add'>+			*stolen_size = MB(1) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_830_GMCH_GMS_STOLEN_8192:</div><div class='del'>-			*stolen_size = MB(8) - KB(132);</div><div class='add'>+			*stolen_size = MB(8) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_830_GMCH_GMS_LOCAL:</div><div class='ctx'> 			ERR_MSG("only local memory found\n");</div><div class='hunk'>@@ -157,28 +218,27 @@ intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		*aperture_size = MB(128);</div><div class='ctx'> 		switch (tmp &amp; INTEL_855_GMCH_GMS_MASK) {</div><div class='ctx'> 		case INTEL_855_GMCH_GMS_STOLEN_1M:</div><div class='del'>-			*stolen_size = MB(1) - KB(132);</div><div class='add'>+			*stolen_size = MB(1) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_855_GMCH_GMS_STOLEN_4M:</div><div class='del'>-			*stolen_size = MB(4) - KB(132);</div><div class='add'>+			*stolen_size = MB(4) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_855_GMCH_GMS_STOLEN_8M:</div><div class='del'>-			*stolen_size = MB(8) - KB(132);</div><div class='add'>+			*stolen_size = MB(8) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_855_GMCH_GMS_STOLEN_16M:</div><div class='del'>-			*stolen_size = MB(16) - KB(132);</div><div class='add'>+			*stolen_size = MB(16) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_855_GMCH_GMS_STOLEN_32M:</div><div class='del'>-			*stolen_size = MB(32) - KB(132);</div><div class='add'>+			*stolen_size = MB(32) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_915G_GMCH_GMS_STOLEN_48M:</div><div class='del'>-			*stolen_size = MB(48) - KB(132);</div><div class='add'>+			*stolen_size = MB(48) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_915G_GMCH_GMS_STOLEN_64M:</div><div class='del'>-			*stolen_size = MB(64) - KB(132);</div><div class='add'>+			*stolen_size = MB(64) - KB(stolen_overhead);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		case INTEL_855_GMCH_GMS_DISABLED:</div><div class='ctx'> 			ERR_MSG("video memory is disabled\n");</div><div class='hunk'>@@ -529,12 +589,63 @@ intelfbhw_read_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+static int calc_vclock3(int index, int m, int n, int p)</div><div class='add'>+{</div><div class='add'>+	if (p == 0 || n == 0)</div><div class='add'>+		return 0;</div><div class='add'>+	return plls[index].ref_clk * m / n / p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int calc_vclock(int index, int m1, int m2, int n, int p1, int p2, int lvds)</div><div class='add'>+{</div><div class='add'>+	struct pll_min_max *pll = &amp;plls[index];</div><div class='add'>+	u32 m, vco, p;</div><div class='add'>+</div><div class='add'>+	m = (5 * (m1 + 2)) + (m2 + 2);</div><div class='add'>+	n += 2;</div><div class='add'>+	vco = pll-&gt;ref_clk * m / n;</div><div class='add'>+</div><div class='add'>+	if (index == PLLS_I8xx) {</div><div class='add'>+		p = ((p1 + 2) * (1 &lt;&lt; (p2 + 1)));</div><div class='add'>+	} else {</div><div class='add'>+		p = ((p1) * (p2 ? 5 : 10));</div><div class='add'>+	}</div><div class='add'>+	return vco / p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+intelfbhw_get_p1p2(struct intelfb_info *dinfo, int dpll, int *o_p1, int *o_p2)</div><div class='add'>+{</div><div class='add'>+	int p1, p2;</div><div class='add'>+</div><div class='add'>+	if (IS_I9XX(dinfo)) {</div><div class='add'>+		if (dpll &amp; DPLL_P1_FORCE_DIV2)</div><div class='add'>+			p1 = 1;</div><div class='add'>+		else</div><div class='add'>+			p1 = (dpll &gt;&gt; DPLL_P1_SHIFT) &amp; 0xff;</div><div class='add'>+		</div><div class='add'>+		p1 = ffs(p1);</div><div class='add'>+</div><div class='add'>+		p2 = (dpll &gt;&gt; DPLL_I9XX_P2_SHIFT) &amp; DPLL_P2_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		if (dpll &amp; DPLL_P1_FORCE_DIV2)</div><div class='add'>+			p1 = 0;</div><div class='add'>+		else</div><div class='add'>+			p1 = (dpll &gt;&gt; DPLL_P1_SHIFT) &amp; DPLL_P1_MASK;</div><div class='add'>+		p2 = (dpll &gt;&gt; DPLL_P2_SHIFT) &amp; DPLL_P2_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*o_p1 = p1;</div><div class='add'>+	*o_p2 = p2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw)</div><div class='ctx'> {</div><div class='ctx'> #if REGDUMP</div><div class='ctx'> 	int i, m1, m2, n, p1, p2;</div><div class='del'>-</div><div class='add'>+	int index = dinfo-&gt;pll_index;</div><div class='ctx'> 	DBG_MSG("intelfbhw_print_hw_state\n");</div><div class='ctx'> </div><div class='ctx'> 	if (!hw || !dinfo)</div><div class='hunk'>@@ -547,26 +658,22 @@ intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw)</div><div class='ctx'> 	n = (hw-&gt;vga0_divisor &gt;&gt; FP_N_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m1 = (hw-&gt;vga0_divisor &gt;&gt; FP_M1_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m2 = (hw-&gt;vga0_divisor &gt;&gt; FP_M2_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='del'>-	if (hw-&gt;vga_pd &amp; VGAPD_0_P1_FORCE_DIV2)</div><div class='del'>-		p1 = 0;</div><div class='del'>-	else</div><div class='del'>-		p1 = (hw-&gt;vga_pd &gt;&gt; VGAPD_0_P1_SHIFT) &amp; DPLL_P1_MASK;</div><div class='del'>-	p2 = (hw-&gt;vga_pd &gt;&gt; VGAPD_0_P2_SHIFT) &amp; DPLL_P2_MASK;</div><div class='add'>+</div><div class='add'>+	intelfbhw_get_p1p2(dinfo, hw-&gt;vga_pd, &amp;p1, &amp;p2);</div><div class='add'>+</div><div class='ctx'> 	printk("	VGA0: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",</div><div class='del'>-		m1, m2, n, p1, p2);</div><div class='del'>-	printk("	VGA0: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));</div><div class='add'>+	       m1, m2, n, p1, p2);</div><div class='add'>+	printk("	VGA0: clock is %d\n",</div><div class='add'>+	       calc_vclock(index, m1, m2, n, p1, p2, 0));</div><div class='ctx'> </div><div class='ctx'> 	n = (hw-&gt;vga1_divisor &gt;&gt; FP_N_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m1 = (hw-&gt;vga1_divisor &gt;&gt; FP_M1_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m2 = (hw-&gt;vga1_divisor &gt;&gt; FP_M2_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='del'>-	if (hw-&gt;vga_pd &amp; VGAPD_1_P1_FORCE_DIV2)</div><div class='del'>-		p1 = 0;</div><div class='del'>-	else</div><div class='del'>-		p1 = (hw-&gt;vga_pd &gt;&gt; VGAPD_1_P1_SHIFT) &amp; DPLL_P1_MASK;</div><div class='del'>-	p2 = (hw-&gt;vga_pd &gt;&gt; VGAPD_1_P2_SHIFT) &amp; DPLL_P2_MASK;</div><div class='add'>+</div><div class='add'>+	intelfbhw_get_p1p2(dinfo, hw-&gt;vga_pd, &amp;p1, &amp;p2);</div><div class='ctx'> 	printk("	VGA1: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",</div><div class='del'>-		m1, m2, n, p1, p2);</div><div class='del'>-	printk("	VGA1: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));</div><div class='add'>+	       m1, m2, n, p1, p2);</div><div class='add'>+	printk("	VGA1: clock is %d\n", calc_vclock(index, m1, m2, n, p1, p2, 0));</div><div class='ctx'> </div><div class='ctx'> 	printk("	DPLL_A:			0x%08x\n", hw-&gt;dpll_a);</div><div class='ctx'> 	printk("	DPLL_B:			0x%08x\n", hw-&gt;dpll_b);</div><div class='hunk'>@@ -578,34 +685,30 @@ intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw)</div><div class='ctx'> 	n = (hw-&gt;fpa0 &gt;&gt; FP_N_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m1 = (hw-&gt;fpa0 &gt;&gt; FP_M1_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m2 = (hw-&gt;fpa0 &gt;&gt; FP_M2_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='del'>-	if (hw-&gt;dpll_a &amp; DPLL_P1_FORCE_DIV2)</div><div class='del'>-		p1 = 0;</div><div class='del'>-	else</div><div class='del'>-		p1 = (hw-&gt;dpll_a &gt;&gt; DPLL_P1_SHIFT) &amp; DPLL_P1_MASK;</div><div class='del'>-	p2 = (hw-&gt;dpll_a &gt;&gt; DPLL_P2_SHIFT) &amp; DPLL_P2_MASK;</div><div class='add'>+</div><div class='add'>+	intelfbhw_get_p1p2(dinfo, hw-&gt;dpll_a, &amp;p1, &amp;p2);</div><div class='add'>+</div><div class='ctx'> 	printk("	PLLA0: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",</div><div class='del'>-		m1, m2, n, p1, p2);</div><div class='del'>-	printk("	PLLA0: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));</div><div class='add'>+	       m1, m2, n, p1, p2);</div><div class='add'>+	printk("	PLLA0: clock is %d\n", calc_vclock(index, m1, m2, n, p1, p2, 0));</div><div class='ctx'> </div><div class='ctx'> 	n = (hw-&gt;fpa1 &gt;&gt; FP_N_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m1 = (hw-&gt;fpa1 &gt;&gt; FP_M1_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='ctx'> 	m2 = (hw-&gt;fpa1 &gt;&gt; FP_M2_DIVISOR_SHIFT) &amp; FP_DIVISOR_MASK;</div><div class='del'>-	if (hw-&gt;dpll_a &amp; DPLL_P1_FORCE_DIV2)</div><div class='del'>-		p1 = 0;</div><div class='del'>-	else</div><div class='del'>-		p1 = (hw-&gt;dpll_a &gt;&gt; DPLL_P1_SHIFT) &amp; DPLL_P1_MASK;</div><div class='del'>-	p2 = (hw-&gt;dpll_a &gt;&gt; DPLL_P2_SHIFT) &amp; DPLL_P2_MASK;</div><div class='add'>+</div><div class='add'>+	intelfbhw_get_p1p2(dinfo, hw-&gt;dpll_a, &amp;p1, &amp;p2);</div><div class='add'>+</div><div class='ctx'> 	printk("	PLLA1: (m1, m2, n, p1, p2) = (%d, %d, %d, %d, %d)\n",</div><div class='del'>-		m1, m2, n, p1, p2);</div><div class='del'>-	printk("	PLLA1: clock is %d\n", CALC_VCLOCK(m1, m2, n, p1, p2));</div><div class='add'>+	       m1, m2, n, p1, p2);</div><div class='add'>+	printk("	PLLA1: clock is %d\n", calc_vclock(index, m1, m2, n, p1, p2, 0));</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	printk("	PALETTE_A:\n");</div><div class='ctx'> 	for (i = 0; i &lt; PALETTE_8_ENTRIES)</div><div class='del'>-		printk("	%3d:	0x%08x\n", i, hw-&gt;palette_a[i];</div><div class='add'>+		printk("	%3d:	0x%08x\n", i, hw-&gt;palette_a[i]);</div><div class='ctx'> 	printk("	PALETTE_B:\n");</div><div class='ctx'> 	for (i = 0; i &lt; PALETTE_8_ENTRIES)</div><div class='del'>-		printk("	%3d:	0x%08x\n", i, hw-&gt;palette_b[i];</div><div class='add'>+		printk("	%3d:	0x%08x\n", i, hw-&gt;palette_b[i]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	printk("	HTOTAL_A:		0x%08x\n", hw-&gt;htotal_a);</div><div class='hunk'>@@ -680,11 +783,11 @@ intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw)</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='ctx'> 		printk("	SWF3%d			0x%08x\n", i,</div><div class='del'>-			hw-&gt;swf3x[i]);</div><div class='add'>+		       hw-&gt;swf3x[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 		printk("	FENCE%d			0x%08x\n", i,</div><div class='del'>-			hw-&gt;fence[i]);</div><div class='add'>+		       hw-&gt;fence[i]);</div><div class='ctx'> </div><div class='ctx'> 	printk("	INSTPM			0x%08x\n", hw-&gt;instpm);</div><div class='ctx'> 	printk("	MEM_MODE		0x%08x\n", hw-&gt;mem_mode);</div><div class='hunk'>@@ -695,43 +798,58 @@ intelfbhw_print_hw_state(struct intelfb_info *dinfo, struct intelfb_hwstate *hw)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* Split the M parameter into M1 and M2. */</div><div class='ctx'> static int</div><div class='del'>-splitm(unsigned int m, unsigned int *retm1, unsigned int *retm2)</div><div class='add'>+splitm(int index, unsigned int m, unsigned int *retm1, unsigned int *retm2)</div><div class='ctx'> {</div><div class='ctx'> 	int m1, m2;</div><div class='del'>-</div><div class='del'>-	m1 = (m - 2 - (MIN_M2 + MAX_M2) / 2) / 5 - 2;</div><div class='del'>-	if (m1 &lt; MIN_M1)</div><div class='del'>-		m1 = MIN_M1;</div><div class='del'>-	if (m1 &gt; MAX_M1)</div><div class='del'>-		m1 = MAX_M1;</div><div class='del'>-	m2 = m - 5 * (m1 + 2) - 2;</div><div class='del'>-	if (m2 &lt; MIN_M2 || m2 &gt; MAX_M2 || m2 &gt;= m1) {</div><div class='del'>-		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		*retm1 = (unsigned int)m1;</div><div class='del'>-		*retm2 = (unsigned int)m2;</div><div class='del'>-		return 0;</div><div class='add'>+	int testm;</div><div class='add'>+	struct pll_min_max *pll = &amp;plls[index];</div><div class='add'>+</div><div class='add'>+	/* no point optimising too much - brute force m */</div><div class='add'>+	for (m1 = pll-&gt;min_m1; m1 &lt; pll-&gt;max_m1 + 1; m1++) {</div><div class='add'>+		for (m2 = pll-&gt;min_m2; m2 &lt; pll-&gt;max_m2 + 1; m2++) {</div><div class='add'>+			testm = (5 * (m1 + 2)) + (m2 + 2);</div><div class='add'>+			if (testm == m) {</div><div class='add'>+				*retm1 = (unsigned int)m1;</div><div class='add'>+				*retm2 = (unsigned int)m2;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Split the P parameter into P1 and P2. */</div><div class='ctx'> static int</div><div class='del'>-splitp(unsigned int p, unsigned int *retp1, unsigned int *retp2)</div><div class='add'>+splitp(int index, unsigned int p, unsigned int *retp1, unsigned int *retp2)</div><div class='ctx'> {</div><div class='ctx'> 	int p1, p2;</div><div class='add'>+	struct pll_min_max *pll = &amp;plls[index];</div><div class='add'>+</div><div class='add'>+	if (index == PLLS_I9xx) {</div><div class='add'>+		p2 = (p % 10) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		p1 = p / (p2 ? 5 : 10);</div><div class='add'>+</div><div class='add'>+		*retp1 = (unsigned int)p1;</div><div class='add'>+		*retp2 = (unsigned int)p2;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (p % 4 == 0)</div><div class='ctx'> 		p2 = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		p2 = 0;</div><div class='ctx'> 	p1 = (p / (1 &lt;&lt; (p2 + 1))) - 2;</div><div class='del'>-	if (p % 4 == 0 &amp;&amp; p1 &lt; MIN_P1) {</div><div class='add'>+	if (p % 4 == 0 &amp;&amp; p1 &lt; pll-&gt;min_p1) {</div><div class='ctx'> 		p2 = 0;</div><div class='ctx'> 		p1 = (p / (1 &lt;&lt; (p2 + 1))) - 2;</div><div class='ctx'> 	}</div><div class='del'>-	if (p1  &lt; MIN_P1 || p1 &gt; MAX_P1 || (p1 + 2) * (1 &lt;&lt; (p2 + 1)) != p) {</div><div class='add'>+	if (p1 &lt; pll-&gt;min_p1 || p1 &gt; pll-&gt;max_p1 ||</div><div class='add'>+	    (p1 + 2) * (1 &lt;&lt; (p2 + 1)) != p) {</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*retp1 = (unsigned int)p1;</div><div class='hunk'>@@ -741,14 +859,15 @@ splitp(unsigned int p, unsigned int *retp1, unsigned int *retp2)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-calc_pll_params(int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *retp1,</div><div class='add'>+calc_pll_params(int index, int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *retp1,</div><div class='ctx'> 		u32 *retp2, u32 *retclock)</div><div class='ctx'> {</div><div class='del'>-	u32 m1, m2, n, p1, p2, n1;</div><div class='del'>-	u32 f_vco, p, p_best = 0, m, f_out;</div><div class='add'>+	u32 m1, m2, n, p1, p2, n1, testm;</div><div class='add'>+	u32 f_vco, p, p_best = 0, m, f_out = 0;</div><div class='ctx'> 	u32 err_max, err_target, err_best = 10000000;</div><div class='ctx'> 	u32 n_best = 0, m_best = 0, f_best, f_err;</div><div class='del'>-	u32 p_min, p_max, p_inc, div_min, div_max;</div><div class='add'>+	u32 p_min, p_max, p_inc, div_max;</div><div class='add'>+	struct pll_min_max *pll = &amp;plls[index];</div><div class='ctx'> </div><div class='ctx'> 	/* Accept 0.5% difference, but aim for 0.1% */</div><div class='ctx'> 	err_max = 5 * clock / 1000;</div><div class='hunk'>@@ -756,58 +875,56 @@ calc_pll_params(int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *retp1,</div><div class='ctx'> </div><div class='ctx'> 	DBG_MSG("Clock is %d\n", clock);</div><div class='ctx'> </div><div class='del'>-	div_max = MAX_VCO_FREQ / clock;</div><div class='del'>-	div_min = ROUND_UP_TO(MIN_VCO_FREQ, clock) / clock;</div><div class='add'>+	div_max = pll-&gt;max_vco / clock;</div><div class='ctx'> </div><div class='del'>-	if (clock &lt;= P_TRANSITION_CLOCK)</div><div class='del'>-		p_inc = 4;</div><div class='del'>-	else</div><div class='del'>-		p_inc = 2;</div><div class='del'>-	p_min = ROUND_UP_TO(div_min, p_inc);</div><div class='add'>+	p_inc = (clock &lt;= pll-&gt;p_transition_clk) ? pll-&gt;p_inc_lo : pll-&gt;p_inc_hi;</div><div class='add'>+	p_min = p_inc;</div><div class='ctx'> 	p_max = ROUND_DOWN_TO(div_max, p_inc);</div><div class='del'>-	if (p_min &lt; MIN_P)</div><div class='del'>-		p_min = 4;</div><div class='del'>-	if (p_max &gt; MAX_P)</div><div class='del'>-		p_max = 128;</div><div class='add'>+	if (p_min &lt; pll-&gt;min_p)</div><div class='add'>+		p_min = pll-&gt;min_p;</div><div class='add'>+	if (p_max &gt; pll-&gt;max_p)</div><div class='add'>+		p_max = pll-&gt;max_p;</div><div class='ctx'> </div><div class='ctx'> 	DBG_MSG("p range is %d-%d (%d)\n", p_min, p_max, p_inc);</div><div class='ctx'> </div><div class='ctx'> 	p = p_min;</div><div class='ctx'> 	do {</div><div class='del'>-		if (splitp(p, &amp;p1, &amp;p2)) {</div><div class='add'>+		if (splitp(index, p, &amp;p1, &amp;p2)) {</div><div class='ctx'> 			WRN_MSG("cannot split p = %d\n", p);</div><div class='ctx'> 			p += p_inc;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		n = MIN_N;</div><div class='add'>+		n = pll-&gt;min_n;</div><div class='ctx'> 		f_vco = clock * p;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			m = ROUND_UP_TO(f_vco * n, PLL_REFCLK) / PLL_REFCLK;</div><div class='del'>-			if (m &lt; MIN_M)</div><div class='del'>-				m = MIN_M;</div><div class='del'>-			if (m &gt; MAX_M)</div><div class='del'>-				m = MAX_M;</div><div class='del'>-			f_out = CALC_VCLOCK3(m, n, p);</div><div class='del'>-			if (splitm(m, &amp;m1, &amp;m2)) {</div><div class='del'>-				WRN_MSG("cannot split m = %d\n", m);</div><div class='del'>-				n++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (clock &gt; f_out)</div><div class='del'>-				f_err = clock - f_out;</div><div class='del'>-			else</div><div class='del'>-				f_err = f_out - clock;</div><div class='del'>-</div><div class='del'>-			if (f_err &lt; err_best) {</div><div class='del'>-				m_best = m;</div><div class='del'>-				n_best = n;</div><div class='del'>-				p_best = p;</div><div class='del'>-				f_best = f_out;</div><div class='del'>-				err_best = f_err;</div><div class='add'>+			m = ROUND_UP_TO(f_vco * n, pll-&gt;ref_clk) / pll-&gt;ref_clk;</div><div class='add'>+			if (m &lt; pll-&gt;min_m)</div><div class='add'>+				m = pll-&gt;min_m + 1;</div><div class='add'>+			if (m &gt; pll-&gt;max_m)</div><div class='add'>+				m = pll-&gt;max_m - 1;</div><div class='add'>+			for (testm = m - 1; testm &lt;= m; testm++) {</div><div class='add'>+				f_out = calc_vclock3(index, m, n, p);</div><div class='add'>+				if (splitm(index, testm, &amp;m1, &amp;m2)) {</div><div class='add'>+					WRN_MSG("cannot split m = %d\n", m);</div><div class='add'>+					n++;</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+				if (clock &gt; f_out)</div><div class='add'>+					f_err = clock - f_out;</div><div class='add'>+				else/* slightly bias the error for bigger clocks */</div><div class='add'>+					f_err = f_out - clock + 1;</div><div class='add'>+</div><div class='add'>+				if (f_err &lt; err_best) {</div><div class='add'>+					m_best = testm;</div><div class='add'>+					n_best = n;</div><div class='add'>+					p_best = p;</div><div class='add'>+					f_best = f_out;</div><div class='add'>+					err_best = f_err;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 			n++;</div><div class='del'>-		} while ((n &lt;= MAX_N) &amp;&amp; (f_out &gt;= clock));</div><div class='add'>+		} while ((n &lt;= pll-&gt;max_n) &amp;&amp; (f_out &gt;= clock));</div><div class='ctx'> 		p += p_inc;</div><div class='ctx'> 	} while ((p &lt;= p_max));</div><div class='ctx'> </div><div class='hunk'>@@ -818,21 +935,22 @@ calc_pll_params(int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *retp1,</div><div class='ctx'> 	m = m_best;</div><div class='ctx'> 	n = n_best;</div><div class='ctx'> 	p = p_best;</div><div class='del'>-	splitm(m, &amp;m1, &amp;m2);</div><div class='del'>-	splitp(p, &amp;p1, &amp;p2);</div><div class='add'>+	splitm(index, m, &amp;m1, &amp;m2);</div><div class='add'>+	splitp(index, p, &amp;p1, &amp;p2);</div><div class='ctx'> 	n1 = n - 2;</div><div class='ctx'> </div><div class='ctx'> 	DBG_MSG("m, n, p: %d (%d,%d), %d (%d), %d (%d,%d), "</div><div class='ctx'> 		"f: %d (%d), VCO: %d\n",</div><div class='ctx'> 		m, m1, m2, n, n1, p, p1, p2,</div><div class='del'>-		CALC_VCLOCK3(m, n, p), CALC_VCLOCK(m1, m2, n1, p1, p2),</div><div class='del'>-		CALC_VCLOCK3(m, n, p) * p);</div><div class='add'>+		calc_vclock3(index, m, n, p),</div><div class='add'>+		calc_vclock(index, m1, m2, n1, p1, p2, 0),</div><div class='add'>+		calc_vclock3(index, m, n, p) * p);</div><div class='ctx'> 	*retm1 = m1;</div><div class='ctx'> 	*retm2 = m2;</div><div class='ctx'> 	*retn = n1;</div><div class='ctx'> 	*retp1 = p1;</div><div class='ctx'> 	*retp2 = p2;</div><div class='del'>-	*retclock = CALC_VCLOCK(m1, m2, n1, p1, p2);</div><div class='add'>+	*retclock = calc_vclock(index, m1, m2, n1, p1, p2, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -860,6 +978,7 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,</div><div class='ctx'> 	u32 vsync_start, vsync_end, vblank_start, vblank_end, vtotal, vactive;</div><div class='ctx'> 	u32 vsync_pol, hsync_pol;</div><div class='ctx'> 	u32 *vs, *vb, *vt, *hs, *hb, *ht, *ss, *pipe_conf;</div><div class='add'>+	u32 stride_alignment;</div><div class='ctx'> </div><div class='ctx'> 	DBG_MSG("intelfbhw_mode_to_hw\n");</div><div class='ctx'> </div><div class='hunk'>@@ -929,7 +1048,8 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,</div><div class='ctx'> 	/* Desired clock in kHz */</div><div class='ctx'> 	clock_target = 1000000000 / var-&gt;pixclock;</div><div class='ctx'> </div><div class='del'>-	if (calc_pll_params(clock_target, &amp;m1, &amp;m2, &amp;n, &amp;p1, &amp;p2, &amp;clock)) {</div><div class='add'>+	if (calc_pll_params(dinfo-&gt;pll_index, clock_target, &amp;m1, &amp;m2,</div><div class='add'>+			    &amp;n, &amp;p1, &amp;p2, &amp;clock)) {</div><div class='ctx'> 		WRN_MSG("calc_pll_params failed\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -949,7 +1069,14 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,</div><div class='ctx'> 	*dpll &amp;= ~DPLL_P1_FORCE_DIV2;</div><div class='ctx'> 	*dpll &amp;= ~((DPLL_P2_MASK &lt;&lt; DPLL_P2_SHIFT) |</div><div class='ctx'> 		   (DPLL_P1_MASK &lt;&lt; DPLL_P1_SHIFT));</div><div class='del'>-	*dpll |= (p2 &lt;&lt; DPLL_P2_SHIFT) | (p1 &lt;&lt; DPLL_P1_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (IS_I9XX(dinfo)) {</div><div class='add'>+		*dpll |= (p2 &lt;&lt; DPLL_I9XX_P2_SHIFT);</div><div class='add'>+		*dpll |= (1 &lt;&lt; (p1 - 1)) &lt;&lt; DPLL_P1_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		*dpll |= (p2 &lt;&lt; DPLL_P2_SHIFT) | (p1 &lt;&lt; DPLL_P1_SHIFT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	*fp0 = (n &lt;&lt; FP_N_DIVISOR_SHIFT) |</div><div class='ctx'> 	       (m1 &lt;&lt; FP_M1_DIVISOR_SHIFT) |</div><div class='ctx'> 	       (m2 &lt;&lt; FP_M2_DIVISOR_SHIFT);</div><div class='hunk'>@@ -1054,7 +1181,7 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,</div><div class='ctx'> 	*ss = (hactive &lt;&lt; SRC_SIZE_HORIZ_SHIFT) |</div><div class='ctx'> 	      (vactive &lt;&lt; SRC_SIZE_VERT_SHIFT);</div><div class='ctx'> </div><div class='del'>-	hw-&gt;disp_a_stride = var-&gt;xres_virtual * var-&gt;bits_per_pixel / 8;</div><div class='add'>+	hw-&gt;disp_a_stride = dinfo-&gt;pitch;</div><div class='ctx'> 	DBG_MSG("pitch is %d\n", hw-&gt;disp_a_stride);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;disp_a_base = hw-&gt;disp_a_stride * var-&gt;yoffset +</div><div class='hunk'>@@ -1063,9 +1190,11 @@ intelfbhw_mode_to_hw(struct intelfb_info *dinfo, struct intelfb_hwstate *hw,</div><div class='ctx'> 	hw-&gt;disp_a_base += dinfo-&gt;fb.offset &lt;&lt; 12;</div><div class='ctx'> </div><div class='ctx'> 	/* Check stride alignment. */</div><div class='del'>-	if (hw-&gt;disp_a_stride % STRIDE_ALIGNMENT != 0) {</div><div class='add'>+	stride_alignment = IS_I9XX(dinfo) ? STRIDE_ALIGNMENT_I9XX :</div><div class='add'>+					    STRIDE_ALIGNMENT;</div><div class='add'>+	if (hw-&gt;disp_a_stride % stride_alignment != 0) {</div><div class='ctx'> 		WRN_MSG("display stride %d has bad alignment %d\n",</div><div class='del'>-			hw-&gt;disp_a_stride, STRIDE_ALIGNMENT);</div><div class='add'>+			hw-&gt;disp_a_stride, stride_alignment);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1087,6 +1216,7 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,</div><div class='ctx'> 	u32 hsync_reg, htotal_reg, hblank_reg;</div><div class='ctx'> 	u32 vsync_reg, vtotal_reg, vblank_reg;</div><div class='ctx'> 	u32 src_size_reg;</div><div class='add'>+	u32 count, tmp_val[3];</div><div class='ctx'> </div><div class='ctx'> 	/* Assume single pipe, display plane A, analog CRT. */</div><div class='ctx'> </div><div class='hunk'>@@ -1155,6 +1285,27 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,</div><div class='ctx'> 		src_size_reg = SRC_SIZE_A;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* turn off pipe */</div><div class='add'>+	tmp = INREG(pipe_conf_reg);</div><div class='add'>+	tmp &amp;= ~PIPECONF_ENABLE;</div><div class='add'>+	OUTREG(pipe_conf_reg, tmp);</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	do {</div><div class='add'>+		tmp_val[count%3] = INREG(0x70000);</div><div class='add'>+		if ((tmp_val[0] == tmp_val[1]) &amp;&amp; (tmp_val[1]==tmp_val[2]))</div><div class='add'>+			break;</div><div class='add'>+		count++;</div><div class='add'>+		udelay(1);</div><div class='add'>+		if (count % 200 == 0) {</div><div class='add'>+			tmp = INREG(pipe_conf_reg);</div><div class='add'>+			tmp &amp;= ~PIPECONF_ENABLE;</div><div class='add'>+			OUTREG(pipe_conf_reg, tmp);</div><div class='add'>+		}</div><div class='add'>+	} while(count &lt; 2000);</div><div class='add'>+</div><div class='add'>+	OUTREG(ADPA, INREG(ADPA) &amp; ~ADPA_DAC_ENABLE);</div><div class='add'>+</div><div class='ctx'> 	/* Disable planes A and B. */</div><div class='ctx'> 	tmp = INREG(DSPACNTR);</div><div class='ctx'> 	tmp &amp;= ~DISPPLANE_PLANE_ENABLE;</div><div class='hunk'>@@ -1163,19 +1314,21 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,</div><div class='ctx'> 	tmp &amp;= ~DISPPLANE_PLANE_ENABLE;</div><div class='ctx'> 	OUTREG(DSPBCNTR, tmp);</div><div class='ctx'> </div><div class='del'>-	/* Wait for vblank.  For now, just wait for a 50Hz cycle (20ms)) */</div><div class='add'>+	/* Wait for vblank. For now, just wait for a 50Hz cycle (20ms)) */</div><div class='ctx'> 	mdelay(20);</div><div class='ctx'> </div><div class='add'>+	OUTREG(DVOB, INREG(DVOB) &amp; ~PORT_ENABLE);</div><div class='add'>+	OUTREG(DVOC, INREG(DVOC) &amp; ~PORT_ENABLE);</div><div class='add'>+	OUTREG(ADPA, INREG(ADPA) &amp; ~ADPA_DAC_ENABLE);</div><div class='add'>+</div><div class='ctx'> 	/* Disable Sync */</div><div class='ctx'> 	tmp = INREG(ADPA);</div><div class='ctx'> 	tmp &amp;= ~ADPA_DPMS_CONTROL_MASK;</div><div class='ctx'> 	tmp |= ADPA_DPMS_D3;</div><div class='ctx'> 	OUTREG(ADPA, tmp);</div><div class='ctx'> </div><div class='del'>-	/* turn off pipe */</div><div class='del'>-	tmp = INREG(pipe_conf_reg);</div><div class='del'>-	tmp &amp;= ~PIPECONF_ENABLE;</div><div class='del'>-	OUTREG(pipe_conf_reg, tmp);</div><div class='add'>+	/* do some funky magic - xyzzy */</div><div class='add'>+	OUTREG(0x61204, 0xabcd0000);</div><div class='ctx'> </div><div class='ctx'> 	/* turn off PLL */</div><div class='ctx'> 	tmp = INREG(dpll_reg);</div><div class='hunk'>@@ -1183,30 +1336,31 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,</div><div class='ctx'> 	OUTREG(dpll_reg, tmp);</div><div class='ctx'> </div><div class='ctx'> 	/* Set PLL parameters */</div><div class='del'>-	OUTREG(dpll_reg, *dpll &amp; ~DPLL_VCO_ENABLE);</div><div class='ctx'> 	OUTREG(fp0_reg, *fp0);</div><div class='ctx'> 	OUTREG(fp1_reg, *fp1);</div><div class='ctx'> </div><div class='del'>-	/* Set pipe parameters */</div><div class='del'>-	OUTREG(hsync_reg, *hs);</div><div class='del'>-	OUTREG(hblank_reg, *hb);</div><div class='del'>-	OUTREG(htotal_reg, *ht);</div><div class='del'>-	OUTREG(vsync_reg, *vs);</div><div class='del'>-	OUTREG(vblank_reg, *vb);</div><div class='del'>-	OUTREG(vtotal_reg, *vt);</div><div class='del'>-	OUTREG(src_size_reg, *ss);</div><div class='add'>+	/* Enable PLL */</div><div class='add'>+	OUTREG(dpll_reg, *dpll);</div><div class='ctx'> </div><div class='ctx'> 	/* Set DVOs B/C */</div><div class='ctx'> 	OUTREG(DVOB, hw-&gt;dvob);</div><div class='ctx'> 	OUTREG(DVOC, hw-&gt;dvoc);</div><div class='ctx'> </div><div class='add'>+	/* undo funky magic */</div><div class='add'>+	OUTREG(0x61204, 0x00000000);</div><div class='add'>+</div><div class='ctx'> 	/* Set ADPA */</div><div class='add'>+	OUTREG(ADPA, INREG(ADPA) | ADPA_DAC_ENABLE);</div><div class='ctx'> 	OUTREG(ADPA, (hw-&gt;adpa &amp; ~(ADPA_DPMS_CONTROL_MASK)) | ADPA_DPMS_D3);</div><div class='ctx'> </div><div class='del'>-	/* Enable PLL */</div><div class='del'>-	tmp = INREG(dpll_reg);</div><div class='del'>-	tmp |= DPLL_VCO_ENABLE;</div><div class='del'>-	OUTREG(dpll_reg, tmp);</div><div class='add'>+	/* Set pipe parameters */</div><div class='add'>+	OUTREG(hsync_reg, *hs);</div><div class='add'>+	OUTREG(hblank_reg, *hb);</div><div class='add'>+	OUTREG(htotal_reg, *ht);</div><div class='add'>+	OUTREG(vsync_reg, *vs);</div><div class='add'>+	OUTREG(vblank_reg, *vb);</div><div class='add'>+	OUTREG(vtotal_reg, *vt);</div><div class='add'>+	OUTREG(src_size_reg, *ss);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable pipe */</div><div class='ctx'> 	OUTREG(pipe_conf_reg, *pipe_conf | PIPECONF_ENABLE);</div><div class='hunk'>@@ -1231,7 +1385,7 @@ intelfbhw_program_mode(struct intelfb_info *dinfo,</div><div class='ctx'> 			OUTREG(DSPACNTR,</div><div class='ctx'> 			       hw-&gt;disp_a_ctrl|DISPPLANE_PLANE_ENABLE);</div><div class='ctx'> 			mdelay(1);</div><div class='del'>-              }</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	OUTREG(DSPACNTR, hw-&gt;disp_a_ctrl &amp; ~DISPPLANE_PLANE_ENABLE);</div><div class='hunk'>@@ -1267,19 +1421,17 @@ wait_ring(struct intelfb_info *dinfo, int n)</div><div class='ctx'> </div><div class='ctx'> 	end = jiffies + (HZ * 3);</div><div class='ctx'> 	while (dinfo-&gt;ring_space &lt; n) {</div><div class='del'>-		dinfo-&gt;ring_head = (u8 __iomem *)(INREG(PRI_RING_HEAD) &amp;</div><div class='del'>-						   RING_HEAD_MASK);</div><div class='del'>-		if (dinfo-&gt;ring_tail + RING_MIN_FREE &lt;</div><div class='del'>-		    (u32 __iomem) dinfo-&gt;ring_head)</div><div class='del'>-			dinfo-&gt;ring_space = (u32 __iomem) dinfo-&gt;ring_head</div><div class='add'>+		dinfo-&gt;ring_head = INREG(PRI_RING_HEAD) &amp; RING_HEAD_MASK;</div><div class='add'>+		if (dinfo-&gt;ring_tail + RING_MIN_FREE &lt; dinfo-&gt;ring_head)</div><div class='add'>+			dinfo-&gt;ring_space = dinfo-&gt;ring_head</div><div class='ctx'> 				- (dinfo-&gt;ring_tail + RING_MIN_FREE);</div><div class='ctx'> 		else</div><div class='ctx'> 			dinfo-&gt;ring_space = (dinfo-&gt;ring.size +</div><div class='del'>-					     (u32 __iomem) dinfo-&gt;ring_head)</div><div class='add'>+					     dinfo-&gt;ring_head)</div><div class='ctx'> 				- (dinfo-&gt;ring_tail + RING_MIN_FREE);</div><div class='del'>-		if ((u32 __iomem) dinfo-&gt;ring_head != last_head) {</div><div class='add'>+		if (dinfo-&gt;ring_head != last_head) {</div><div class='ctx'> 			end = jiffies + (HZ * 3);</div><div class='del'>-			last_head = (u32 __iomem) dinfo-&gt;ring_head;</div><div class='add'>+			last_head = dinfo-&gt;ring_head;</div><div class='ctx'> 		}</div><div class='ctx'> 		i++;</div><div class='ctx'> 		if (time_before(end, jiffies)) {</div><div class='hunk'>@@ -1339,15 +1491,13 @@ refresh_ring(struct intelfb_info *dinfo)</div><div class='ctx'> 	DBG_MSG("refresh_ring\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	dinfo-&gt;ring_head = (u8 __iomem *) (INREG(PRI_RING_HEAD) &amp;</div><div class='del'>-					   RING_HEAD_MASK);</div><div class='add'>+	dinfo-&gt;ring_head = INREG(PRI_RING_HEAD) &amp; RING_HEAD_MASK;</div><div class='ctx'> 	dinfo-&gt;ring_tail = INREG(PRI_RING_TAIL) &amp; RING_TAIL_MASK;</div><div class='del'>-	if (dinfo-&gt;ring_tail + RING_MIN_FREE &lt; (u32 __iomem)dinfo-&gt;ring_head)</div><div class='del'>-		dinfo-&gt;ring_space = (u32 __iomem) dinfo-&gt;ring_head</div><div class='add'>+	if (dinfo-&gt;ring_tail + RING_MIN_FREE &lt; dinfo-&gt;ring_head)</div><div class='add'>+		dinfo-&gt;ring_space = dinfo-&gt;ring_head</div><div class='ctx'> 			- (dinfo-&gt;ring_tail + RING_MIN_FREE);</div><div class='ctx'> 	else</div><div class='del'>-		dinfo-&gt;ring_space = (dinfo-&gt;ring.size +</div><div class='del'>-				     (u32 __iomem) dinfo-&gt;ring_head)</div><div class='add'>+		dinfo-&gt;ring_space = (dinfo-&gt;ring.size + dinfo-&gt;ring_head)</div><div class='ctx'> 			- (dinfo-&gt;ring_tail + RING_MIN_FREE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1616,7 +1766,7 @@ intelfbhw_cursor_init(struct intelfb_info *dinfo)</div><div class='ctx'> 	DBG_MSG("intelfbhw_cursor_init\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (dinfo-&gt;mobile) {</div><div class='add'>+	if (dinfo-&gt;mobile || IS_I9XX(dinfo)) {</div><div class='ctx'> 		if (!dinfo-&gt;cursor.physical)</div><div class='ctx'> 			return;</div><div class='ctx'> 		tmp = INREG(CURSOR_A_CONTROL);</div><div class='hunk'>@@ -1649,7 +1799,7 @@ intelfbhw_cursor_hide(struct intelfb_info *dinfo)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	dinfo-&gt;cursor_on = 0;</div><div class='del'>-	if (dinfo-&gt;mobile) {</div><div class='add'>+	if (dinfo-&gt;mobile || IS_I9XX(dinfo)) {</div><div class='ctx'> 		if (!dinfo-&gt;cursor.physical)</div><div class='ctx'> 			return;</div><div class='ctx'> 		tmp = INREG(CURSOR_A_CONTROL);</div><div class='hunk'>@@ -1679,7 +1829,7 @@ intelfbhw_cursor_show(struct intelfb_info *dinfo)</div><div class='ctx'> 	if (dinfo-&gt;cursor_blanked)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (dinfo-&gt;mobile) {</div><div class='add'>+	if (dinfo-&gt;mobile || IS_I9XX(dinfo)) {</div><div class='ctx'> 		if (!dinfo-&gt;cursor.physical)</div><div class='ctx'> 			return;</div><div class='ctx'> 		tmp = INREG(CURSOR_A_CONTROL);</div><div class='hunk'>@@ -1705,14 +1855,18 @@ intelfbhw_cursor_setpos(struct intelfb_info *dinfo, int x, int y)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Sets the position.  The coordinates are assumed to already</div><div class='del'>-	 * have any offset adjusted.  Assume that the cursor is never</div><div class='add'>+	 * Sets the position. The coordinates are assumed to already</div><div class='add'>+	 * have any offset adjusted. Assume that the cursor is never</div><div class='ctx'> 	 * completely off-screen, and that x, y are always &gt;= 0.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	tmp = ((x &amp; CURSOR_POS_MASK) &lt;&lt; CURSOR_X_SHIFT) |</div><div class='ctx'> 	      ((y &amp; CURSOR_POS_MASK) &lt;&lt; CURSOR_Y_SHIFT);</div><div class='ctx'> 	OUTREG(CURSOR_A_POSITION, tmp);</div><div class='add'>+</div><div class='add'>+	if (IS_I9XX(dinfo)) {</div><div class='add'>+		OUTREG(CURSOR_A_BASEADDR, dinfo-&gt;cursor.physical);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='head'>diff --git a/drivers/video/intelfb/intelfbhw.h b/drivers/video/intelfb/intelfbhw.h<br/>index ba1920159f52..10acda098b71 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfbhw.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/intelfb/intelfbhw.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/intelfb/intelfbhw.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/intelfb/intelfbhw.h</a></div><div class='hunk'>@@ -133,6 +133,7 @@</div><div class='ctx'> #define DPLL_VGA_MODE_DISABLE		(1 &lt;&lt; 28)</div><div class='ctx'> #define DPLL_P2_MASK			1</div><div class='ctx'> #define DPLL_P2_SHIFT			23</div><div class='add'>+#define DPLL_I9XX_P2_SHIFT              24</div><div class='ctx'> #define DPLL_P1_FORCE_DIV2		(1 &lt;&lt; 21)</div><div class='ctx'> #define DPLL_P1_MASK			0x1f</div><div class='ctx'> #define DPLL_P1_SHIFT			16</div><div class='hunk'>@@ -155,29 +156,8 @@</div><div class='ctx'> /* PLL parameters (these are for 852GM/855GM/865G, check earlier chips). */</div><div class='ctx'> /* Clock values are in units of kHz */</div><div class='ctx'> #define PLL_REFCLK		48000</div><div class='del'>-#define MIN_VCO_FREQ		930000</div><div class='del'>-#define MAX_VCO_FREQ		1400000</div><div class='ctx'> #define MIN_CLOCK		25000</div><div class='ctx'> #define MAX_CLOCK		350000</div><div class='del'>-#define P_TRANSITION_CLOCK	165000</div><div class='del'>-#define MIN_M			108</div><div class='del'>-#define MAX_M			140</div><div class='del'>-#define MIN_M1			18</div><div class='del'>-#define MAX_M1			26</div><div class='del'>-#define MIN_M2			6</div><div class='del'>-#define MAX_M2			16</div><div class='del'>-#define MIN_P			4</div><div class='del'>-#define MAX_P			128</div><div class='del'>-#define MIN_P1			0</div><div class='del'>-#define MAX_P1			31</div><div class='del'>-#define MIN_N			3</div><div class='del'>-#define MAX_N			16</div><div class='del'>-</div><div class='del'>-#define CALC_VCLOCK(m1, m2, n, p1, p2) \</div><div class='del'>-        ((PLL_REFCLK * (5 * ((m1) + 2) + ((m2) + 2)) / ((n) + 2)) / \</div><div class='del'>-        (((p1) + 2) * (1 &lt;&lt; (p2 + 1))))</div><div class='del'>-</div><div class='del'>-#define CALC_VCLOCK3(m, n, p)	((PLL_REFCLK * (m) / (n)) / (p))</div><div class='ctx'> </div><div class='ctx'> /* Two pipes */</div><div class='ctx'> #define PIPE_A			0</div><div class='hunk'>@@ -522,8 +502,7 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* function protoypes */</div><div class='del'>-extern int intelfbhw_get_chipset(struct pci_dev *pdev, const char **name,</div><div class='del'>-				 int *chipset, int *mobile);</div><div class='add'>+extern int intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo);</div><div class='ctx'> extern int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,</div><div class='ctx'> 				int *stolen_size);</div><div class='ctx'> extern int intelfbhw_check_non_crt(struct intelfb_info *dinfo);</div><div class='head'>diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c<br/>index 477ad297de4e..f0d614a80f1f 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/kyro/fbdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/kyro/fbdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/kyro/fbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/kyro/fbdev.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -17,7 +16,6 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='head'>diff --git a/drivers/video/leo.c b/drivers/video/leo.c<br/>index a23cfdb9d826..f3a24338d9ac 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/leo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/leo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/leo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/leo.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* leo.c: LEO frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1996-1999 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  * Copyright (C) 1997 Michal Rehacek (Michal.Rehacek@st.mff.cuni.cz)</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,8 +18,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -80,10 +80,10 @@ static struct fb_ops leo_ops = {</div><div class='ctx'> </div><div class='ctx'> struct leo_cursor {</div><div class='ctx'> 	u8		xxx0[16];</div><div class='del'>-	volatile u32	cur_type;</div><div class='del'>-	volatile u32	cur_misc;</div><div class='del'>-	volatile u32	cur_cursxy;</div><div class='del'>-	volatile u32	cur_data;</div><div class='add'>+	u32	cur_type;</div><div class='add'>+	u32	cur_misc;</div><div class='add'>+	u32	cur_cursxy;</div><div class='add'>+	u32	cur_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LEO_KRN_TYPE_CLUT0	0x00001000</div><div class='hunk'>@@ -99,27 +99,27 @@ struct leo_cursor {</div><div class='ctx'> #define LEO_KRN_CSR_UNK2	0x00000001</div><div class='ctx'> </div><div class='ctx'> struct leo_lx_krn {</div><div class='del'>-	volatile u32	krn_type;</div><div class='del'>-	volatile u32	krn_csr;</div><div class='del'>-	volatile u32	krn_value;</div><div class='add'>+	u32	krn_type;</div><div class='add'>+	u32	krn_csr;</div><div class='add'>+	u32	krn_value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct leo_lc_ss0_krn {</div><div class='del'>-	volatile u32 	misc;</div><div class='add'>+	u32 	misc;</div><div class='ctx'> 	u8		xxx0[0x800-4];</div><div class='del'>-	volatile u32	rev;</div><div class='add'>+	u32	rev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct leo_lc_ss0_usr {</div><div class='del'>-	volatile u32	csr;</div><div class='del'>-	volatile u32	addrspace;</div><div class='del'>-	volatile u32 	fontmsk;</div><div class='del'>-	volatile u32	fontt;</div><div class='del'>-	volatile u32	extent;</div><div class='del'>-	volatile u32	src;</div><div class='add'>+	u32	csr;</div><div class='add'>+	u32	addrspace;</div><div class='add'>+	u32 	fontmsk;</div><div class='add'>+	u32	fontt;</div><div class='add'>+	u32	extent;</div><div class='add'>+	u32	src;</div><div class='ctx'> 	u32		dst;</div><div class='del'>-	volatile u32	copy;</div><div class='del'>-	volatile u32	fill;</div><div class='add'>+	u32	copy;</div><div class='add'>+	u32	fill;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct leo_lc_ss1_krn {</div><div class='hunk'>@@ -132,47 +132,47 @@ struct leo_lc_ss1_usr {</div><div class='ctx'> </div><div class='ctx'> struct leo_ld {</div><div class='ctx'> 	u8		xxx0[0xe00];</div><div class='del'>-	volatile u32	csr;</div><div class='del'>-	volatile u32	wid;</div><div class='del'>-	volatile u32	wmask;</div><div class='del'>-	volatile u32	widclip;</div><div class='del'>-	volatile u32	vclipmin;</div><div class='del'>-	volatile u32	vclipmax;</div><div class='del'>-	volatile u32	pickmin;	/* SS1 only */</div><div class='del'>-	volatile u32	pickmax;	/* SS1 only */</div><div class='del'>-	volatile u32	fg;</div><div class='del'>-	volatile u32	bg;</div><div class='del'>-	volatile u32	src;		/* Copy/Scroll (SS0 only) */</div><div class='del'>-	volatile u32	dst;		/* Copy/Scroll/Fill (SS0 only) */</div><div class='del'>-	volatile u32	extent;		/* Copy/Scroll/Fill size (SS0 only) */</div><div class='add'>+	u32	csr;</div><div class='add'>+	u32	wid;</div><div class='add'>+	u32	wmask;</div><div class='add'>+	u32	widclip;</div><div class='add'>+	u32	vclipmin;</div><div class='add'>+	u32	vclipmax;</div><div class='add'>+	u32	pickmin;	/* SS1 only */</div><div class='add'>+	u32	pickmax;	/* SS1 only */</div><div class='add'>+	u32	fg;</div><div class='add'>+	u32	bg;</div><div class='add'>+	u32	src;		/* Copy/Scroll (SS0 only) */</div><div class='add'>+	u32	dst;		/* Copy/Scroll/Fill (SS0 only) */</div><div class='add'>+	u32	extent;		/* Copy/Scroll/Fill size (SS0 only) */</div><div class='ctx'> 	u32		xxx1[3];</div><div class='del'>-	volatile u32	setsem;		/* SS1 only */</div><div class='del'>-	volatile u32	clrsem;		/* SS1 only */</div><div class='del'>-	volatile u32	clrpick;	/* SS1 only */</div><div class='del'>-	volatile u32	clrdat;		/* SS1 only */</div><div class='del'>-	volatile u32	alpha;		/* SS1 only */</div><div class='add'>+	u32	setsem;		/* SS1 only */</div><div class='add'>+	u32	clrsem;		/* SS1 only */</div><div class='add'>+	u32	clrpick;	/* SS1 only */</div><div class='add'>+	u32	clrdat;		/* SS1 only */</div><div class='add'>+	u32	alpha;		/* SS1 only */</div><div class='ctx'> 	u8		xxx2[0x2c];</div><div class='del'>-	volatile u32	winbg;</div><div class='del'>-	volatile u32	planemask;</div><div class='del'>-	volatile u32	rop;</div><div class='del'>-	volatile u32	z;</div><div class='del'>-	volatile u32	dczf;		/* SS1 only */</div><div class='del'>-	volatile u32	dczb;		/* SS1 only */</div><div class='del'>-	volatile u32	dcs;		/* SS1 only */</div><div class='del'>-	volatile u32	dczs;		/* SS1 only */</div><div class='del'>-	volatile u32	pickfb;		/* SS1 only */</div><div class='del'>-	volatile u32	pickbb;		/* SS1 only */</div><div class='del'>-	volatile u32	dcfc;		/* SS1 only */</div><div class='del'>-	volatile u32	forcecol;	/* SS1 only */</div><div class='del'>-	volatile u32	door[8];	/* SS1 only */</div><div class='del'>-	volatile u32	pick[5];	/* SS1 only */</div><div class='add'>+	u32	winbg;</div><div class='add'>+	u32	planemask;</div><div class='add'>+	u32	rop;</div><div class='add'>+	u32	z;</div><div class='add'>+	u32	dczf;		/* SS1 only */</div><div class='add'>+	u32	dczb;		/* SS1 only */</div><div class='add'>+	u32	dcs;		/* SS1 only */</div><div class='add'>+	u32	dczs;		/* SS1 only */</div><div class='add'>+	u32	pickfb;		/* SS1 only */</div><div class='add'>+	u32	pickbb;		/* SS1 only */</div><div class='add'>+	u32	dcfc;		/* SS1 only */</div><div class='add'>+	u32	forcecol;	/* SS1 only */</div><div class='add'>+	u32	door[8];	/* SS1 only */</div><div class='add'>+	u32	pick[5];	/* SS1 only */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define LEO_SS1_MISC_ENABLE	0x00000001</div><div class='ctx'> #define LEO_SS1_MISC_STEREO	0x00000002</div><div class='ctx'> struct leo_ld_ss1 {</div><div class='del'>-	u8		xxx0[0xef4];</div><div class='del'>-	volatile u32	ss1_misc;</div><div class='add'>+	u8	xxx0[0xef4];</div><div class='add'>+	u32	ss1_misc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct leo_ld_gbl {</div><div class='hunk'>@@ -193,9 +193,8 @@ struct leo_par {</div><div class='ctx'> #define LEO_FLAG_BLANKED	0x00000001</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		physbase;</div><div class='add'>+	unsigned long		which_io;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='del'>-</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void leo_wait(struct leo_lx_krn __iomem *lx_krn)</div><div class='hunk'>@@ -368,8 +367,7 @@ static int leo_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return sbusfb_mmap_helper(leo_mmap_map,</div><div class='ctx'> 				  par-&gt;physbase, par-&gt;fbsize,</div><div class='del'>-				  par-&gt;sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-				  vma);</div><div class='add'>+				  par-&gt;which_io, vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -385,11 +383,9 @@ static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-leo_init_fix(struct fb_info *info)</div><div class='add'>+leo_init_fix(struct fb_info *info, struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	struct leo_par *par = (struct leo_par *)info-&gt;par;</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;fix.id, par-&gt;sdev-&gt;prom_name, sizeof(info-&gt;fix.id));</div><div class='add'>+	strlcpy(info-&gt;fix.id, dp-&gt;name, sizeof(info-&gt;fix.id));</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.type = FB_TYPE_PACKED_PIXELS;</div><div class='ctx'> 	info-&gt;fix.visual = FB_VISUAL_TRUECOLOR;</div><div class='hunk'>@@ -532,60 +528,74 @@ static void leo_fixup_var_rgb(struct fb_var_screeninfo *var)</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct leo_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(leo_list);</div><div class='ctx'> </div><div class='del'>-static void leo_init_one(struct sbus_dev *sdev)</div><div class='add'>+static void leo_unmap_regs(struct all_info *all)</div><div class='ctx'> {</div><div class='del'>-	struct all_info *all;</div><div class='del'>-	int linebytes;</div><div class='add'>+	if (all-&gt;par.lc_ss0_usr)</div><div class='add'>+		of_iounmap(all-&gt;par.lc_ss0_usr, 0x1000);</div><div class='add'>+	if (all-&gt;par.ld_ss0)</div><div class='add'>+		of_iounmap(all-&gt;par.ld_ss0, 0x1000);</div><div class='add'>+	if (all-&gt;par.ld_ss1)</div><div class='add'>+		of_iounmap(all-&gt;par.ld_ss1, 0x1000);</div><div class='add'>+	if (all-&gt;par.lx_krn)</div><div class='add'>+		of_iounmap(all-&gt;par.lx_krn, 0x1000);</div><div class='add'>+	if (all-&gt;par.cursor)</div><div class='add'>+		of_iounmap(all-&gt;par.cursor, sizeof(struct leo_cursor));</div><div class='add'>+	if (all-&gt;info.screen_base)</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, 0x800000);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "leo: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='add'>+static int __devinit leo_init_one(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct all_info *all;</div><div class='add'>+	int linebytes, err;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.physbase = sdev-&gt;reg_addrs[0].phys_addr;</div><div class='add'>+	all-&gt;par.physbase = op-&gt;resource[0].start;</div><div class='add'>+	all-&gt;par.which_io = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, sdev-&gt;prom_node, 32);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 32);</div><div class='ctx'> 	leo_fixup_var_rgb(&amp;all-&gt;info.var);</div><div class='ctx'> </div><div class='del'>-	linebytes = prom_getintdefault(sdev-&gt;prom_node, "linebytes",</div><div class='del'>-				       all-&gt;info.var.xres);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	all-&gt;info.screen_base = (char __iomem *)</div><div class='del'>-		prom_getintdefault(sdev-&gt;prom_node, "address", 0);</div><div class='del'>-#endif</div><div class='del'>-	if (!all-&gt;info.screen_base)</div><div class='del'>-		all-&gt;info.screen_base = </div><div class='del'>-			sbus_ioremap(&amp;sdev-&gt;resource[0], LEO_OFF_SS0,</div><div class='del'>-				     0x800000, "leo ram");</div><div class='del'>-</div><div class='ctx'> 	all-&gt;par.lc_ss0_usr =</div><div class='del'>-		sbus_ioremap(&amp;sdev-&gt;resource[0], LEO_OFF_LC_SS0_USR,</div><div class='del'>-			     0x1000, "leolc ss0usr");</div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], LEO_OFF_LC_SS0_USR,</div><div class='add'>+			   0x1000, "leolc ss0usr");</div><div class='ctx'> 	all-&gt;par.ld_ss0 =</div><div class='del'>-		sbus_ioremap(&amp;sdev-&gt;resource[0], LEO_OFF_LD_SS0,</div><div class='del'>-			     0x1000, "leold ss0");</div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], LEO_OFF_LD_SS0,</div><div class='add'>+			   0x1000, "leold ss0");</div><div class='ctx'> 	all-&gt;par.ld_ss1 =</div><div class='del'>-		sbus_ioremap(&amp;sdev-&gt;resource[0], LEO_OFF_LD_SS1,</div><div class='del'>-			     0x1000, "leold ss1");</div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], LEO_OFF_LD_SS1,</div><div class='add'>+			   0x1000, "leold ss1");</div><div class='ctx'> 	all-&gt;par.lx_krn =</div><div class='del'>-		sbus_ioremap(&amp;sdev-&gt;resource[0], LEO_OFF_LX_KRN,</div><div class='del'>-			     0x1000, "leolx krn");</div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], LEO_OFF_LX_KRN,</div><div class='add'>+			   0x1000, "leolx krn");</div><div class='ctx'> 	all-&gt;par.cursor =</div><div class='del'>-		sbus_ioremap(&amp;sdev-&gt;resource[0], LEO_OFF_LX_CURSOR,</div><div class='del'>-			     sizeof(struct leo_cursor), "leolx cursor");</div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], LEO_OFF_LX_CURSOR,</div><div class='add'>+			   sizeof(struct leo_cursor), "leolx cursor");</div><div class='add'>+	all-&gt;info.screen_base = </div><div class='add'>+		of_ioremap(&amp;op-&gt;resource[0], LEO_OFF_SS0,</div><div class='add'>+			   0x800000, "leo ram");</div><div class='add'>+	if (!all-&gt;par.lc_ss0_usr ||</div><div class='add'>+	    !all-&gt;par.ld_ss0 ||</div><div class='add'>+	    !all-&gt;par.ld_ss1 ||</div><div class='add'>+	    !all-&gt;par.lx_krn ||</div><div class='add'>+	    !all-&gt;par.cursor ||</div><div class='add'>+	    !all-&gt;info.screen_base) {</div><div class='add'>+		leo_unmap_regs(all);</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;</div><div class='ctx'> 	all-&gt;info.fbops = &amp;leo_ops;</div><div class='hunk'>@@ -597,69 +607,85 @@ static void leo_init_one(struct sbus_dev *sdev)</div><div class='ctx'> 	leo_blank(0, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='del'>-		printk(KERN_ERR "leo: Could not allocate color map.\n");</div><div class='add'>+		leo_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	leo_init_fix(&amp;all-&gt;info);</div><div class='add'>+	leo_init_fix(&amp;all-&gt;info, dp);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "leo: Could not register framebuffer.\n");</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+		leo_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;leo_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='add'>+</div><div class='add'>+	printk("%s: leo at %lx:%lx\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='add'>+	       all-&gt;par.which_io, all-&gt;par.physbase);</div><div class='ctx'> </div><div class='del'>-	printk("leo: %s at %lx:%lx\n",</div><div class='del'>-	       sdev-&gt;prom_name,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].phys_addr);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init leo_init(void)</div><div class='add'>+static int __devinit leo_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("leofb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return leo_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "leo"))</div><div class='del'>-			leo_init_one(sdev);</div><div class='del'>-	}</div><div class='add'>+static int __devexit leo_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+</div><div class='add'>+	leo_unmap_regs(all);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit leo_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id leo_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "leo",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, leo_match);</div><div class='add'>+</div><div class='add'>+static struct of_platform_driver leo_driver = {</div><div class='add'>+	.name		= "leo",</div><div class='add'>+	.match_table	= leo_match,</div><div class='add'>+	.probe		= leo_probe,</div><div class='add'>+	.remove		= __devexit_p(leo_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;leo_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static int __init leo_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("leofb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+	return of_register_driver(&amp;leo_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-leo_setup(char *arg)</div><div class='add'>+static void __exit leo_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;leo_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(leo_init);</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(leo_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for LEO chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c<br/>index 788fa812c871..80c03618eb53 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/logo/logo.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/logo/logo.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/logo/logo.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/logo/logo.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  Copyright (C) 2003 Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/linux_logo.h&gt;</div><div class='ctx'> #include &lt;linux/stddef.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c<br/>index e6cbd9de944a..80a043807161 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/macfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/macfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/macfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/macfb.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/nubus.h&gt;</div><div class='head'>diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c<br/>index c0385c6f7db5..ab2149531a04 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/macmodes.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/macmodes.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/macmodes.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/macmodes.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -327,7 +326,6 @@ int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,</div><div class='ctx'>     }</div><div class='ctx'>     return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(mac_var_to_vmode);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	mac_map_monitor_sense - Convert monitor sense to vmode</div><div class='hunk'>@@ -371,8 +369,9 @@ EXPORT_SYMBOL(mac_map_monitor_sense);</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,</div><div class='del'>-			 const char *mode_option, unsigned int default_bpp)</div><div class='add'>+int __devinit mac_find_mode(struct fb_var_screeninfo *var,</div><div class='add'>+			    struct fb_info *info, const char *mode_option,</div><div class='add'>+			    unsigned int default_bpp)</div><div class='ctx'> {</div><div class='ctx'>     const struct fb_videomode *db = NULL;</div><div class='ctx'>     unsigned int dbsize = 0;</div><div class='head'>diff --git a/drivers/video/macmodes.h b/drivers/video/macmodes.h<br/>index 232f5a09a499..babeb81f467d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/macmodes.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/macmodes.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/macmodes.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/macmodes.h</a></div><div class='hunk'>@@ -55,9 +55,10 @@ extern int mac_vmode_to_var(int vmode, int cmode,</div><div class='ctx'> extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,</div><div class='ctx'> 			    int *cmode);</div><div class='ctx'> extern int mac_map_monitor_sense(int sense);</div><div class='del'>-extern int __init mac_find_mode(struct fb_var_screeninfo *var,</div><div class='del'>-				struct fb_info *info, const char *mode_option,</div><div class='del'>-				unsigned int default_bpp);</div><div class='add'>+extern int __devinit mac_find_mode(struct fb_var_screeninfo *var,</div><div class='add'>+				   struct fb_info *info,</div><div class='add'>+				   const char *mode_option,</div><div class='add'>+				   unsigned int default_bpp);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c<br/>index a456e67a5b00..c4b570b4a4df 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_DAC1064.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_DAC1064.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_DAC1064.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_DAC1064.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "matroxfb_DAC1064.h"</div><div class='ctx'> #include "matroxfb_misc.h"</div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h<br/>index 56513a5d220b..df39c3193735 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_DAC1064.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_DAC1064.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_DAC1064.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_DAC1064.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef __MATROXFB_DAC1064_H__</div><div class='ctx'> #define __MATROXFB_DAC1064_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "matroxfb_base.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c<br/>index 23ebad0a12d8..a5690a5f29d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_Ti3026.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_Ti3026.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_Ti3026.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_Ti3026.c</a></div><div class='hunk'>@@ -78,7 +78,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "matroxfb_Ti3026.h"</div><div class='ctx'> #include "matroxfb_misc.h"</div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h<br/>index 536e5f69de9f..27872aaa0a17 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_Ti3026.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_Ti3026.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_Ti3026.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_Ti3026.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef __MATROXFB_TI3026_H__</div><div class='ctx'> #define __MATROXFB_TI3026_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "matroxfb_base.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c<br/>index 23c1827b2d0b..4a57dabb77d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_base.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_base.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_base.c</a></div><div class='hunk'>@@ -99,9 +99,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='add'>+#define __OLD_VIDIOC_</div><div class='add'>+</div><div class='ctx'> #include "matroxfb_base.h"</div><div class='ctx'> #include "matroxfb_misc.h"</div><div class='ctx'> #include "matroxfb_accel.h"</div><div class='hunk'>@@ -158,9 +159,9 @@ static void update_crtc2(WPMINFO unsigned int pos) {</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that displays are compatible */</div><div class='ctx'> 	if (info &amp;&amp; (info-&gt;fbcon.var.bits_per_pixel == ACCESS_FBINFO(fbcon).var.bits_per_pixel)</div><div class='del'>-	         &amp;&amp; (info-&gt;fbcon.var.xres_virtual == ACCESS_FBINFO(fbcon).var.xres_virtual)</div><div class='del'>-	         &amp;&amp; (info-&gt;fbcon.var.green.length == ACCESS_FBINFO(fbcon).var.green.length)</div><div class='del'>-	         ) {</div><div class='add'>+		 &amp;&amp; (info-&gt;fbcon.var.xres_virtual == ACCESS_FBINFO(fbcon).var.xres_virtual)</div><div class='add'>+		 &amp;&amp; (info-&gt;fbcon.var.green.length == ACCESS_FBINFO(fbcon).var.green.length)</div><div class='add'>+		 ) {</div><div class='ctx'> 		switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {</div><div class='ctx'> 			case 16:</div><div class='ctx'> 			case 32:</div><div class='hunk'>@@ -224,7 +225,7 @@ static irqreturn_t matrox_irq(int irq, void *dev_id, struct pt_regs *fp)</div><div class='ctx'> </div><div class='ctx'> int matroxfb_enable_irq(WPMINFO int reenable) {</div><div class='ctx'> 	u_int32_t bm;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400)</div><div class='ctx'> 		bm = 0x220;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -232,7 +233,7 @@ int matroxfb_enable_irq(WPMINFO int reenable) {</div><div class='ctx'> </div><div class='ctx'> 	if (!test_and_set_bit(0, &amp;ACCESS_FBINFO(irq_flags))) {</div><div class='ctx'> 		if (request_irq(ACCESS_FBINFO(pcidev)-&gt;irq, matrox_irq,</div><div class='del'>-				SA_SHIRQ, "matroxfb", MINFO)) {</div><div class='add'>+				IRQF_SHARED, "matroxfb", MINFO)) {</div><div class='ctx'> 			clear_bit(0, &amp;ACCESS_FBINFO(irq_flags));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -241,7 +242,7 @@ int matroxfb_enable_irq(WPMINFO int reenable) {</div><div class='ctx'> 		mga_outl(M_IEN, mga_inl(M_IEN) | bm);</div><div class='ctx'> 	} else if (reenable) {</div><div class='ctx'> 		u_int32_t ien;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		ien = mga_inl(M_IEN);</div><div class='ctx'> 		if ((ien &amp; bm) != bm) {</div><div class='ctx'> 			printk(KERN_DEBUG "matroxfb: someone disabled IRQ [%08X]\n", ien);</div><div class='hunk'>@@ -347,7 +348,7 @@ static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) {</div><div class='ctx'> 		mga_setr(M_EXTVGA_INDEX, 0x00, p2);</div><div class='ctx'> 	}</div><div class='ctx'> 	matroxfb_DAC_unlock_irqrestore(flags);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	update_crtc2(PMINFO pos);</div><div class='ctx'> </div><div class='ctx'> 	CRITEND</div><div class='hunk'>@@ -390,7 +391,7 @@ static void matroxfb_remove(WPMINFO int dummy) {</div><div class='ctx'> static int matroxfb_open(struct fb_info *info, int user)</div><div class='ctx'> {</div><div class='ctx'> 	MINFO_FROM_INFO(info);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	DBG_LOOP(__FUNCTION__)</div><div class='ctx'> </div><div class='ctx'> 	if (ACCESS_FBINFO(dead)) {</div><div class='hunk'>@@ -406,7 +407,7 @@ static int matroxfb_open(struct fb_info *info, int user)</div><div class='ctx'> static int matroxfb_release(struct fb_info *info, int user)</div><div class='ctx'> {</div><div class='ctx'> 	MINFO_FROM_INFO(info);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	DBG_LOOP(__FUNCTION__)</div><div class='ctx'> </div><div class='ctx'> 	if (user) {</div><div class='hunk'>@@ -854,7 +855,7 @@ static int matroxfb_get_vblank(WPMINFO struct fb_vblank *vblank)</div><div class='ctx'> 		vblank-&gt;flags |= FB_VBLANK_VBLANKING;</div><div class='ctx'> 	if (test_bit(0, &amp;ACCESS_FBINFO(irq_flags))) {</div><div class='ctx'> 		vblank-&gt;flags |= FB_VBLANK_HAVE_COUNT;</div><div class='del'>-		/* Only one writer, aligned int value... </div><div class='add'>+		/* Only one writer, aligned int value...</div><div class='ctx'> 		   it should work without lock and without atomic_t */</div><div class='ctx'> 		vblank-&gt;count = ACCESS_FBINFO(crtc1).vsync.cnt;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -870,7 +871,7 @@ static int matroxfb_ioctl(struct fb_info *info,</div><div class='ctx'> {</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> 	MINFO_FROM_INFO(info);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	DBG(__FUNCTION__)</div><div class='ctx'> </div><div class='ctx'> 	if (ACCESS_FBINFO(dead)) {</div><div class='hunk'>@@ -1081,7 +1082,7 @@ static int matroxfb_ioctl(struct fb_info *info,</div><div class='ctx'> 		case VIDIOC_QUERYCAP:</div><div class='ctx'> 			{</div><div class='ctx'> 				struct v4l2_capability r;</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 				memset(&amp;r, 0, sizeof(r));</div><div class='ctx'> 				strcpy(r.driver, "matroxfb");</div><div class='ctx'> 				strcpy(r.card, "Matrox");</div><div class='hunk'>@@ -1091,7 +1092,7 @@ static int matroxfb_ioctl(struct fb_info *info,</div><div class='ctx'> 				if (copy_to_user(argp, &amp;r, sizeof(r)))</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> 				return 0;</div><div class='del'>-				</div><div class='add'>+</div><div class='ctx'> 			}</div><div class='ctx'> 		case VIDIOC_QUERYCTRL:</div><div class='ctx'> 			{</div><div class='hunk'>@@ -1690,8 +1691,8 @@ static int initMatrox2(WPMINFO struct board* b){</div><div class='ctx'> 		pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_COMMAND, &amp;cmd);</div><div class='ctx'> 		mga_option &amp;= 0x7FFFFFFF; /* clear BIG_ENDIAN */</div><div class='ctx'> 		mga_option |= MX_OPTION_BSWAP;</div><div class='del'>-                /* disable palette snooping */</div><div class='del'>-                cmd &amp;= ~PCI_COMMAND_VGA_PALETTE;</div><div class='add'>+		/* disable palette snooping */</div><div class='add'>+		cmd &amp;= ~PCI_COMMAND_VGA_PALETTE;</div><div class='ctx'> 		if (pci_dev_present(intel_82437)) {</div><div class='ctx'> 			if (!(mga_option &amp; 0x20000000) &amp;&amp; !ACCESS_FBINFO(devflags.nopciretry)) {</div><div class='ctx'> 				printk(KERN_WARNING "matroxfb: Disabling PCI retries due to i82437 present\n");</div><div class='hunk'>@@ -1809,12 +1810,12 @@ static int initMatrox2(WPMINFO struct board* b){</div><div class='ctx'> </div><div class='ctx'> 		if (fv) {</div><div class='ctx'> 			tmp = fv * (vesafb_defined.upper_margin + vesafb_defined.yres</div><div class='del'>-			          + vesafb_defined.lower_margin + vesafb_defined.vsync_len);</div><div class='add'>+				  + vesafb_defined.lower_margin + vesafb_defined.vsync_len);</div><div class='ctx'> 			if ((tmp &lt; fh) || (fh == 0)) fh = tmp;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (fh) {</div><div class='ctx'> 			tmp = fh * (vesafb_defined.left_margin + vesafb_defined.xres</div><div class='del'>-			          + vesafb_defined.right_margin + vesafb_defined.hsync_len);</div><div class='add'>+				  + vesafb_defined.right_margin + vesafb_defined.hsync_len);</div><div class='ctx'> 			if ((tmp &lt; maxclk) || (maxclk == 0)) maxclk = tmp;</div><div class='ctx'> 		}</div><div class='ctx'> 		tmp = (maxclk + 499) / 500;</div><div class='hunk'>@@ -1890,14 +1891,14 @@ static int initMatrox2(WPMINFO struct board* b){</div><div class='ctx'> </div><div class='ctx'> 	/* there is no console on this fb... but we have to initialize hardware</div><div class='ctx'> 	 * until someone tells me what is proper thing to do */</div><div class='del'>- 	if (!ACCESS_FBINFO(initialized)) {</div><div class='del'>- 		printk(KERN_INFO "fb%d: initializing hardware\n",</div><div class='del'>- 		       ACCESS_FBINFO(fbcon.node));</div><div class='del'>- 		/* We have to use FB_ACTIVATE_FORCE, as we had to put vesafb_defined to the fbcon.var</div><div class='del'>- 		 * already before, so register_framebuffer works correctly. */</div><div class='del'>- 		vesafb_defined.activate |= FB_ACTIVATE_FORCE;</div><div class='del'>- 		fb_set_var(&amp;ACCESS_FBINFO(fbcon), &amp;vesafb_defined);</div><div class='del'>- 	}</div><div class='add'>+	if (!ACCESS_FBINFO(initialized)) {</div><div class='add'>+		printk(KERN_INFO "fb%d: initializing hardware\n",</div><div class='add'>+		       ACCESS_FBINFO(fbcon.node));</div><div class='add'>+		/* We have to use FB_ACTIVATE_FORCE, as we had to put vesafb_defined to the fbcon.var</div><div class='add'>+		 * already before, so register_framebuffer works correctly. */</div><div class='add'>+		vesafb_defined.activate |= FB_ACTIVATE_FORCE;</div><div class='add'>+		fb_set_var(&amp;ACCESS_FBINFO(fbcon), &amp;vesafb_defined);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> failVideoIO:;</div><div class='hunk'>@@ -2356,7 +2357,7 @@ static int __init matroxfb_setup(char *options) {</div><div class='ctx'> 		else if (!strncmp(this_opt, "dfp:", 4)) {</div><div class='ctx'> 			dfp_type = simple_strtoul(this_opt+4, NULL, 0);</div><div class='ctx'> 			dfp = 1;</div><div class='del'>-		}	</div><div class='add'>+		}</div><div class='ctx'> #ifdef CONFIG_PPC_PMAC</div><div class='ctx'> 		else if (!strncmp(this_opt, "vmode:", 6)) {</div><div class='ctx'> 			unsigned int vmode = simple_strtoul(this_opt+6, NULL, 0);</div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h<br/>index b71737178d0d..9c25c2f7966b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_base.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_base.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_base.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_base.h</a></div><div class='hunk'>@@ -25,13 +25,11 @@</div><div class='ctx'> /* Guard accelerator accesses with spin_lock_irqsave... */</div><div class='ctx'> #undef MATROXFB_USE_SPINLOCKS</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c<br/>index 263d801ef78f..18886b629cb1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/matrox/matroxfb_misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/matrox/matroxfb_misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/matrox/matroxfb_misc.c</a></div><div class='hunk'>@@ -84,7 +84,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "matroxfb_misc.h"</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c<br/>index f85421bf7cb5..38c8d38de4fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/maxinefb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/maxinefb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/maxinefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/maxinefb.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/mbx/Makefile b/drivers/video/mbx/Makefile<br/>new file mode 100644<br/>index 000000000000..16c1165cf9c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/mbx/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/mbx/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# Makefile for the 2700G controller driver.</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_FB_MBX)	   += mbxfb.o</div><div class='add'>+obj-$(CONFIG_FB_MBX_DEBUG) += mbxfbdebugfs.o</div><div class='head'>diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c<br/>new file mode 100644<br/>index 000000000000..84aab3ad024e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/mbx/mbxdebugfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/mbx/mbxdebugfs.c</a></div><div class='hunk'>@@ -0,0 +1,188 @@</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+</div><div class='add'>+#define BIG_BUFFER_SIZE	(1024)</div><div class='add'>+</div><div class='add'>+static char big_buffer[BIG_BUFFER_SIZE];</div><div class='add'>+</div><div class='add'>+struct mbxfb_debugfs_data {</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+	struct dentry *sysconf;</div><div class='add'>+	struct dentry *clock;</div><div class='add'>+	struct dentry *display;</div><div class='add'>+	struct dentry *gsctl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int open_file_generic(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	file-&gt;private_data = inode-&gt;u.generic_ip;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t write_file_dummy(struct file *file, const char __user *buf,</div><div class='add'>+				size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sysconf_read_file(struct file *file, char __user *userbuf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char * s = big_buffer;</div><div class='add'>+</div><div class='add'>+	s += sprintf(s, "SYSCFG = %08lx\n", SYSCFG);</div><div class='add'>+	s += sprintf(s, "PFBASE = %08lx\n", PFBASE);</div><div class='add'>+	s += sprintf(s, "PFCEIL = %08lx\n", PFCEIL);</div><div class='add'>+	s += sprintf(s, "POLLFLAG = %08lx\n", POLLFLAG);</div><div class='add'>+	s += sprintf(s, "SYSRST = %08lx\n", SYSRST);</div><div class='add'>+</div><div class='add'>+	return  simple_read_from_buffer(userbuf, count, ppos,</div><div class='add'>+					big_buffer, s-big_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t gsctl_read_file(struct file *file, char __user *userbuf,</div><div class='add'>+			       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char * s = big_buffer;</div><div class='add'>+</div><div class='add'>+	s += sprintf(s, "GSCTRL = %08lx\n", GSCTRL);</div><div class='add'>+	s += sprintf(s, "VSCTRL = %08lx\n", VSCTRL);</div><div class='add'>+	s += sprintf(s, "GBBASE = %08lx\n", GBBASE);</div><div class='add'>+	s += sprintf(s, "VBBASE = %08lx\n", VBBASE);</div><div class='add'>+	s += sprintf(s, "GDRCTRL = %08lx\n", GDRCTRL);</div><div class='add'>+	s += sprintf(s, "VCMSK = %08lx\n", VCMSK);</div><div class='add'>+	s += sprintf(s, "GSCADR = %08lx\n", GSCADR);</div><div class='add'>+	s += sprintf(s, "VSCADR = %08lx\n", VSCADR);</div><div class='add'>+	s += sprintf(s, "VUBASE = %08lx\n", VUBASE);</div><div class='add'>+	s += sprintf(s, "VVBASE = %08lx\n", VVBASE);</div><div class='add'>+	s += sprintf(s, "GSADR = %08lx\n", GSADR);</div><div class='add'>+	s += sprintf(s, "VSADR = %08lx\n", VSADR);</div><div class='add'>+	s += sprintf(s, "HCCTRL = %08lx\n", HCCTRL);</div><div class='add'>+	s += sprintf(s, "HCSIZE = %08lx\n", HCSIZE);</div><div class='add'>+	s += sprintf(s, "HCPOS = %08lx\n", HCPOS);</div><div class='add'>+	s += sprintf(s, "HCBADR = %08lx\n", HCBADR);</div><div class='add'>+	s += sprintf(s, "HCCKMSK = %08lx\n", HCCKMSK);</div><div class='add'>+	s += sprintf(s, "GPLUT = %08lx\n", GPLUT);</div><div class='add'>+</div><div class='add'>+	return  simple_read_from_buffer(userbuf, count, ppos,</div><div class='add'>+					big_buffer, s-big_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t display_read_file(struct file *file, char __user *userbuf,</div><div class='add'>+				 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char * s = big_buffer;</div><div class='add'>+</div><div class='add'>+	s += sprintf(s, "DSCTRL = %08lx\n", DSCTRL);</div><div class='add'>+	s += sprintf(s, "DHT01 = %08lx\n", DHT01);</div><div class='add'>+	s += sprintf(s, "DHT02 = %08lx\n", DHT02);</div><div class='add'>+	s += sprintf(s, "DHT03 = %08lx\n", DHT03);</div><div class='add'>+	s += sprintf(s, "DVT01 = %08lx\n", DVT01);</div><div class='add'>+	s += sprintf(s, "DVT02 = %08lx\n", DVT02);</div><div class='add'>+	s += sprintf(s, "DVT03 = %08lx\n", DVT03);</div><div class='add'>+	s += sprintf(s, "DBCOL = %08lx\n", DBCOL);</div><div class='add'>+	s += sprintf(s, "BGCOLOR = %08lx\n", BGCOLOR);</div><div class='add'>+	s += sprintf(s, "DINTRS = %08lx\n", DINTRS);</div><div class='add'>+	s += sprintf(s, "DINTRE = %08lx\n", DINTRE);</div><div class='add'>+	s += sprintf(s, "DINTRCNT = %08lx\n", DINTRCNT);</div><div class='add'>+	s += sprintf(s, "DSIG = %08lx\n", DSIG);</div><div class='add'>+	s += sprintf(s, "DMCTRL = %08lx\n", DMCTRL);</div><div class='add'>+	s += sprintf(s, "CLIPCTRL = %08lx\n", CLIPCTRL);</div><div class='add'>+	s += sprintf(s, "SPOCTRL = %08lx\n", SPOCTRL);</div><div class='add'>+	s += sprintf(s, "SVCTRL = %08lx\n", SVCTRL);</div><div class='add'>+	s += sprintf(s, "DLSTS = %08lx\n", DLSTS);</div><div class='add'>+	s += sprintf(s, "DLLCTRL = %08lx\n", DLLCTRL);</div><div class='add'>+	s += sprintf(s, "DVLNUM = %08lx\n", DVLNUM);</div><div class='add'>+	s += sprintf(s, "DUCTRL = %08lx\n", DUCTRL);</div><div class='add'>+	s += sprintf(s, "DVECTRL = %08lx\n", DVECTRL);</div><div class='add'>+	s += sprintf(s, "DHDET = %08lx\n", DHDET);</div><div class='add'>+	s += sprintf(s, "DVDET = %08lx\n", DVDET);</div><div class='add'>+	s += sprintf(s, "DODMSK = %08lx\n", DODMSK);</div><div class='add'>+	s += sprintf(s, "CSC01 = %08lx\n", CSC01);</div><div class='add'>+	s += sprintf(s, "CSC02 = %08lx\n", CSC02);</div><div class='add'>+	s += sprintf(s, "CSC03 = %08lx\n", CSC03);</div><div class='add'>+	s += sprintf(s, "CSC04 = %08lx\n", CSC04);</div><div class='add'>+	s += sprintf(s, "CSC05 = %08lx\n", CSC05);</div><div class='add'>+</div><div class='add'>+	return  simple_read_from_buffer(userbuf, count, ppos,</div><div class='add'>+					big_buffer, s-big_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t clock_read_file(struct file *file, char __user *userbuf,</div><div class='add'>+			       size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char * s = big_buffer;</div><div class='add'>+</div><div class='add'>+	s += sprintf(s, "SYSCLKSRC = %08lx\n", SYSCLKSRC);</div><div class='add'>+	s += sprintf(s, "PIXCLKSRC = %08lx\n", PIXCLKSRC);</div><div class='add'>+	s += sprintf(s, "CLKSLEEP = %08lx\n", CLKSLEEP);</div><div class='add'>+	s += sprintf(s, "COREPLL = %08lx\n", COREPLL);</div><div class='add'>+	s += sprintf(s, "DISPPLL = %08lx\n", DISPPLL);</div><div class='add'>+	s += sprintf(s, "PLLSTAT = %08lx\n", PLLSTAT);</div><div class='add'>+	s += sprintf(s, "VOVRCLK = %08lx\n", VOVRCLK);</div><div class='add'>+	s += sprintf(s, "PIXCLK = %08lx\n", PIXCLK);</div><div class='add'>+	s += sprintf(s, "MEMCLK = %08lx\n", MEMCLK);</div><div class='add'>+	s += sprintf(s, "M24CLK = %08lx\n", M24CLK);</div><div class='add'>+	s += sprintf(s, "MBXCLK = %08lx\n", MBXCLK);</div><div class='add'>+	s += sprintf(s, "SDCLK = %08lx\n", SDCLK);</div><div class='add'>+	s += sprintf(s, "PIXCLKDIV = %08lx\n", PIXCLKDIV);</div><div class='add'>+</div><div class='add'>+	return  simple_read_from_buffer(userbuf, count, ppos,</div><div class='add'>+					big_buffer, s-big_buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_operations sysconf_fops = {</div><div class='add'>+	.read = sysconf_read_file,</div><div class='add'>+	.write = write_file_dummy,</div><div class='add'>+	.open = open_file_generic,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations clock_fops = {</div><div class='add'>+	.read = clock_read_file,</div><div class='add'>+	.write = write_file_dummy,</div><div class='add'>+	.open = open_file_generic,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations display_fops = {</div><div class='add'>+	.read = display_read_file,</div><div class='add'>+	.write = write_file_dummy,</div><div class='add'>+	.open = open_file_generic,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct file_operations gsctl_fops = {</div><div class='add'>+	.read = gsctl_read_file,</div><div class='add'>+	.write = write_file_dummy,</div><div class='add'>+	.open = open_file_generic,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	struct mbxfb_info *mfbi = fbi-&gt;par;</div><div class='add'>+	struct mbxfb_debugfs_data *dbg;</div><div class='add'>+</div><div class='add'>+	dbg = kzalloc(sizeof(struct mbxfb_debugfs_data), GFP_KERNEL);</div><div class='add'>+	mfbi-&gt;debugfs_data = dbg;</div><div class='add'>+</div><div class='add'>+	dbg-&gt;dir = debugfs_create_dir("mbxfb", NULL);</div><div class='add'>+	dbg-&gt;sysconf = debugfs_create_file("sysconf", 0444, dbg-&gt;dir,</div><div class='add'>+				      fbi, &amp;sysconf_fops);</div><div class='add'>+	dbg-&gt;clock = debugfs_create_file("clock", 0444, dbg-&gt;dir,</div><div class='add'>+				    fbi, &amp;clock_fops);</div><div class='add'>+	dbg-&gt;display = debugfs_create_file("display", 0444, dbg-&gt;dir,</div><div class='add'>+				      fbi, &amp;display_fops);</div><div class='add'>+	dbg-&gt;gsctl = debugfs_create_file("gsctl", 0444, dbg-&gt;dir,</div><div class='add'>+				    fbi, &amp;gsctl_fops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	struct mbxfb_info *mfbi = fbi-&gt;par;</div><div class='add'>+	struct mbxfb_debugfs_data *dbg = mfbi-&gt;debugfs_data;</div><div class='add'>+</div><div class='add'>+	debugfs_remove(dbg-&gt;gsctl);</div><div class='add'>+	debugfs_remove(dbg-&gt;display);</div><div class='add'>+	debugfs_remove(dbg-&gt;clock);</div><div class='add'>+	debugfs_remove(dbg-&gt;sysconf);</div><div class='add'>+	debugfs_remove(dbg-&gt;dir);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c<br/>new file mode 100644<br/>index 000000000000..6849ab75d403<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/mbx/mbxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/mbx/mbxfb.c</a></div><div class='hunk'>@@ -0,0 +1,683 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/drivers/video/mbx/mbxfb.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2006 Compulab, Ltd.</div><div class='add'>+ *  Mike Rapoport &lt;mike@compulab.co.il&gt;</div><div class='add'>+ *</div><div class='add'>+ *   Based on pxafb.c</div><div class='add'>+ *</div><div class='add'>+ * This file is subject to the terms and conditions of the GNU General Public</div><div class='add'>+ * License.  See the file COPYING in the main directory of this archive for</div><div class='add'>+ * more details.</div><div class='add'>+ *</div><div class='add'>+ *   Intel 2700G (Marathon) Graphics Accelerator Frame Buffer Driver</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;video/mbxfb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "regs.h"</div><div class='add'>+#include "reg_bits.h"</div><div class='add'>+</div><div class='add'>+static unsigned long virt_base_2700;</div><div class='add'>+</div><div class='add'>+#define MIN_XRES	16</div><div class='add'>+#define MIN_YRES	16</div><div class='add'>+#define MAX_XRES	2048</div><div class='add'>+#define MAX_YRES	2048</div><div class='add'>+</div><div class='add'>+#define MAX_PALETTES	16</div><div class='add'>+</div><div class='add'>+/* FIXME: take care of different chip revisions with different sizes</div><div class='add'>+   of ODFB */</div><div class='add'>+#define MEMORY_OFFSET	0x60000</div><div class='add'>+</div><div class='add'>+struct mbxfb_info {</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	struct resource *fb_res;</div><div class='add'>+	struct resource *fb_req;</div><div class='add'>+</div><div class='add'>+	struct resource *reg_res;</div><div class='add'>+	struct resource *reg_req;</div><div class='add'>+</div><div class='add'>+	void __iomem *fb_virt_addr;</div><div class='add'>+	unsigned long fb_phys_addr;</div><div class='add'>+</div><div class='add'>+	void __iomem *reg_virt_addr;</div><div class='add'>+	unsigned long reg_phys_addr;</div><div class='add'>+</div><div class='add'>+	int (*platform_probe) (struct fb_info * fb);</div><div class='add'>+	int (*platform_remove) (struct fb_info * fb);</div><div class='add'>+</div><div class='add'>+	u32 pseudo_palette[MAX_PALETTES];</div><div class='add'>+#ifdef CONFIG_FB_MBX_DEBUG</div><div class='add'>+	void *debugfs_data;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_var_screeninfo mbxfb_default __devinitdata = {</div><div class='add'>+	.xres = 640,</div><div class='add'>+	.yres = 480,</div><div class='add'>+	.xres_virtual = 640,</div><div class='add'>+	.yres_virtual = 480,</div><div class='add'>+	.bits_per_pixel = 16,</div><div class='add'>+	.red = {11, 5, 0},</div><div class='add'>+	.green = {5, 6, 0},</div><div class='add'>+	.blue = {0, 5, 0},</div><div class='add'>+	.activate = FB_ACTIVATE_TEST,</div><div class='add'>+	.height = -1,</div><div class='add'>+	.width = -1,</div><div class='add'>+	.pixclock = 40000,</div><div class='add'>+	.left_margin = 48,</div><div class='add'>+	.right_margin = 16,</div><div class='add'>+	.upper_margin = 33,</div><div class='add'>+	.lower_margin = 10,</div><div class='add'>+	.hsync_len = 96,</div><div class='add'>+	.vsync_len = 2,</div><div class='add'>+	.vmode = FB_VMODE_NONINTERLACED,</div><div class='add'>+	.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct fb_fix_screeninfo mbxfb_fix  __devinitdata = {</div><div class='add'>+	.id = "MBX",</div><div class='add'>+	.type = FB_TYPE_PACKED_PIXELS,</div><div class='add'>+	.visual = FB_VISUAL_TRUECOLOR,</div><div class='add'>+	.xpanstep = 0,</div><div class='add'>+	.ypanstep = 0,</div><div class='add'>+	.ywrapstep = 0,</div><div class='add'>+	.accel = FB_ACCEL_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pixclock_div {</div><div class='add'>+	u8 m;</div><div class='add'>+	u8 n;</div><div class='add'>+	u8 p;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int mbxfb_get_pixclock(unsigned int pixclock_ps,</div><div class='add'>+				       struct pixclock_div *div)</div><div class='add'>+{</div><div class='add'>+	u8 m, n, p;</div><div class='add'>+	unsigned int err = 0;</div><div class='add'>+	unsigned int min_err = ~0x0;</div><div class='add'>+	unsigned int clk;</div><div class='add'>+	unsigned int best_clk = 0;</div><div class='add'>+	unsigned int ref_clk = 13000;	/* FIXME: take from platform data */</div><div class='add'>+	unsigned int pixclock;</div><div class='add'>+</div><div class='add'>+	/* convert pixclock to KHz */</div><div class='add'>+	pixclock = PICOS2KHZ(pixclock_ps);</div><div class='add'>+</div><div class='add'>+	for (m = 1; m &lt; 64; m++) {</div><div class='add'>+		for (n = 1; n &lt; 8; n++) {</div><div class='add'>+			for (p = 0; p &lt; 8; p++) {</div><div class='add'>+				clk = (ref_clk * m) / (n * (1 &lt;&lt; p));</div><div class='add'>+				err = (clk &gt; pixclock) ? (clk - pixclock) :</div><div class='add'>+					(pixclock - clk);</div><div class='add'>+				if (err &lt; min_err) {</div><div class='add'>+					min_err = err;</div><div class='add'>+					best_clk = clk;</div><div class='add'>+					div-&gt;m = m;</div><div class='add'>+					div-&gt;n = n;</div><div class='add'>+					div-&gt;p = p;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return KHZ2PICOS(best_clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,</div><div class='add'>+			   u_int trans, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	u32 val, ret = 1;</div><div class='add'>+</div><div class='add'>+	if (regno &lt; MAX_PALETTES) {</div><div class='add'>+		u32 *pal = info-&gt;pseudo_palette;</div><div class='add'>+</div><div class='add'>+		val = (red &amp; 0xf800) | ((green &amp; 0xfc00) &gt;&gt; 5) |</div><div class='add'>+			((blue &amp; 0xf800) &gt;&gt; 11);</div><div class='add'>+		pal[regno] = val;</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct pixclock_div div;</div><div class='add'>+</div><div class='add'>+	var-&gt;pixclock = mbxfb_get_pixclock(var-&gt;pixclock, &amp;div);</div><div class='add'>+</div><div class='add'>+	if (var-&gt;xres &lt; MIN_XRES)</div><div class='add'>+		var-&gt;xres = MIN_XRES;</div><div class='add'>+	if (var-&gt;yres &lt; MIN_YRES)</div><div class='add'>+		var-&gt;yres = MIN_YRES;</div><div class='add'>+	if (var-&gt;xres &gt; MAX_XRES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (var-&gt;yres &gt; MAX_YRES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	var-&gt;xres_virtual = max(var-&gt;xres_virtual, var-&gt;xres);</div><div class='add'>+	var-&gt;yres_virtual = max(var-&gt;yres_virtual, var-&gt;yres);</div><div class='add'>+</div><div class='add'>+	switch (var-&gt;bits_per_pixel) {</div><div class='add'>+		/* 8 bits-per-pixel is not supported yet */</div><div class='add'>+	case 8:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case 16:</div><div class='add'>+		var-&gt;green.length = (var-&gt;green.length == 5) ? 5 : 6;</div><div class='add'>+		var-&gt;red.length = 5;</div><div class='add'>+		var-&gt;blue.length = 5;</div><div class='add'>+		var-&gt;transp.length = 6 - var-&gt;green.length;</div><div class='add'>+		var-&gt;blue.offset = 0;</div><div class='add'>+		var-&gt;green.offset = 5;</div><div class='add'>+		var-&gt;red.offset = 5 + var-&gt;green.length;</div><div class='add'>+		var-&gt;transp.offset = (5 + var-&gt;red.offset) &amp; 15;</div><div class='add'>+		break;</div><div class='add'>+	case 24:		/* RGB 888   */</div><div class='add'>+	case 32:		/* RGBA 8888 */</div><div class='add'>+		var-&gt;red.offset = 16;</div><div class='add'>+		var-&gt;red.length = 8;</div><div class='add'>+		var-&gt;green.offset = 8;</div><div class='add'>+		var-&gt;green.length = 8;</div><div class='add'>+		var-&gt;blue.offset = 0;</div><div class='add'>+		var-&gt;blue.length = 8;</div><div class='add'>+		var-&gt;transp.length = var-&gt;bits_per_pixel - 24;</div><div class='add'>+		var-&gt;transp.offset = (var-&gt;transp.length) ? 24 : 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	var-&gt;red.msb_right = 0;</div><div class='add'>+	var-&gt;green.msb_right = 0;</div><div class='add'>+	var-&gt;blue.msb_right = 0;</div><div class='add'>+	var-&gt;transp.msb_right = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbxfb_set_par(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct fb_var_screeninfo *var = &amp;info-&gt;var;</div><div class='add'>+	struct pixclock_div div;</div><div class='add'>+	ushort hbps, ht, hfps, has;</div><div class='add'>+	ushort vbps, vt, vfps, vas;</div><div class='add'>+	u32 gsctrl = readl(GSCTRL);</div><div class='add'>+	u32 gsadr = readl(GSADR);</div><div class='add'>+</div><div class='add'>+	info-&gt;fix.line_length = var-&gt;xres_virtual * var-&gt;bits_per_pixel / 8;</div><div class='add'>+</div><div class='add'>+	/* setup color mode */</div><div class='add'>+	gsctrl &amp;= ~(FMsk(GSCTRL_GPIXFMT));</div><div class='add'>+	/* FIXME: add *WORKING* support for 8-bits per color */</div><div class='add'>+	if (info-&gt;var.bits_per_pixel == 8) {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='add'>+		gsctrl &amp;= ~GSCTRL_LUT_EN;</div><div class='add'>+</div><div class='add'>+		info-&gt;fix.visual = FB_VISUAL_TRUECOLOR;</div><div class='add'>+		switch (info-&gt;var.bits_per_pixel) {</div><div class='add'>+		case 16:</div><div class='add'>+			if (info-&gt;var.green.length == 5)</div><div class='add'>+				gsctrl |= GSCTRL_GPIXFMT_ARGB1555;</div><div class='add'>+			else</div><div class='add'>+				gsctrl |= GSCTRL_GPIXFMT_RGB565;</div><div class='add'>+			break;</div><div class='add'>+		case 24:</div><div class='add'>+			gsctrl |= GSCTRL_GPIXFMT_RGB888;</div><div class='add'>+			break;</div><div class='add'>+		case 32:</div><div class='add'>+			gsctrl |= GSCTRL_GPIXFMT_ARGB8888;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup resolution */</div><div class='add'>+	gsctrl &amp;= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));</div><div class='add'>+	gsctrl |= Gsctrl_Width(info-&gt;var.xres - 1) |</div><div class='add'>+		Gsctrl_Height(info-&gt;var.yres - 1);</div><div class='add'>+	writel(gsctrl, GSCTRL);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	gsadr &amp;= ~(FMsk(GSADR_SRCSTRIDE));</div><div class='add'>+	gsadr |= Gsadr_Srcstride(info-&gt;var.xres * info-&gt;var.bits_per_pixel /</div><div class='add'>+				 (8 * 16) - 1);</div><div class='add'>+	writel(gsadr, GSADR);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	/* setup timings */</div><div class='add'>+	var-&gt;pixclock = mbxfb_get_pixclock(info-&gt;var.pixclock, &amp;div);</div><div class='add'>+</div><div class='add'>+	writel((Disp_Pll_M(div.m) | Disp_Pll_N(div.n) |</div><div class='add'>+		Disp_Pll_P(div.p) | DISP_PLL_EN), DISPPLL);</div><div class='add'>+</div><div class='add'>+	hbps = var-&gt;hsync_len;</div><div class='add'>+	has = hbps + var-&gt;left_margin;</div><div class='add'>+	hfps = has + var-&gt;xres;</div><div class='add'>+	ht = hfps + var-&gt;right_margin;</div><div class='add'>+</div><div class='add'>+	vbps = var-&gt;vsync_len;</div><div class='add'>+	vas = vbps + var-&gt;upper_margin;</div><div class='add'>+	vfps = vas + var-&gt;yres;</div><div class='add'>+	vt = vfps + var-&gt;lower_margin;</div><div class='add'>+</div><div class='add'>+	writel((Dht01_Hbps(hbps) | Dht01_Ht(ht)), DHT01);</div><div class='add'>+	writel((Dht02_Hlbs(has) | Dht02_Has(has)), DHT02);</div><div class='add'>+	writel((Dht03_Hfps(hfps) | Dht03_Hrbs(hfps)), DHT03);</div><div class='add'>+	writel((Dhdet_Hdes(has) | Dhdet_Hdef(hfps)), DHDET);</div><div class='add'>+</div><div class='add'>+	writel((Dvt01_Vbps(vbps) | Dvt01_Vt(vt)), DVT01);</div><div class='add'>+	writel((Dvt02_Vtbs(vas) | Dvt02_Vas(vas)), DVT02);</div><div class='add'>+	writel((Dvt03_Vfps(vfps) | Dvt03_Vbbs(vfps)), DVT03);</div><div class='add'>+	writel((Dvdet_Vdes(vas) | Dvdet_Vdef(vfps)), DVDET);</div><div class='add'>+	writel((Dvectrl_Vevent(vfps) | Dvectrl_Vfetch(vbps)), DVECTRL);</div><div class='add'>+</div><div class='add'>+	writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbxfb_blank(int blank, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	switch (blank) {</div><div class='add'>+	case FB_BLANK_POWERDOWN:</div><div class='add'>+	case FB_BLANK_VSYNC_SUSPEND:</div><div class='add'>+	case FB_BLANK_HSYNC_SUSPEND:</div><div class='add'>+	case FB_BLANK_NORMAL:</div><div class='add'>+		writel((readl(DSCTRL) &amp; ~DSCTRL_SYNCGEN_EN), DSCTRL);</div><div class='add'>+		udelay(1000);</div><div class='add'>+		writel((readl(PIXCLK) &amp; ~PIXCLK_EN), PIXCLK);</div><div class='add'>+		udelay(1000);</div><div class='add'>+		writel((readl(VOVRCLK) &amp; ~VOVRCLK_EN), VOVRCLK);</div><div class='add'>+		udelay(1000);</div><div class='add'>+		break;</div><div class='add'>+	case FB_BLANK_UNBLANK:</div><div class='add'>+		writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);</div><div class='add'>+		udelay(1000);</div><div class='add'>+		writel((readl(PIXCLK) | PIXCLK_EN), PIXCLK);</div><div class='add'>+		udelay(1000);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops mbxfb_ops = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.fb_check_var = mbxfb_check_var,</div><div class='add'>+	.fb_set_par = mbxfb_set_par,</div><div class='add'>+	.fb_setcolreg = mbxfb_setcolreg,</div><div class='add'>+	.fb_fillrect = cfb_fillrect,</div><div class='add'>+	.fb_copyarea = cfb_copyarea,</div><div class='add'>+	.fb_imageblit = cfb_imageblit,</div><div class='add'>+	.fb_blank = mbxfb_blank,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  Enable external SDRAM controller. Assume that all clocks are active</div><div class='add'>+  by now.</div><div class='add'>+*/</div><div class='add'>+static void __devinit setup_memc(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	struct mbxfb_info *mfbi = fbi-&gt;par;</div><div class='add'>+	unsigned long tmp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* FIXME: use platfrom specific parameters */</div><div class='add'>+	/* setup SDRAM controller */</div><div class='add'>+	writel((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |</div><div class='add'>+		LMCFG_LMA_TS),</div><div class='add'>+	       LMCFG);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	writel(LMPWR_MC_PWR_ACT, LMPWR);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	/* setup SDRAM timings */</div><div class='add'>+	writel((Lmtim_Tras(7) | Lmtim_Trp(3) | Lmtim_Trcd(3) |</div><div class='add'>+		Lmtim_Trc(9) | Lmtim_Tdpl(2)),</div><div class='add'>+	       LMTIM);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	/* setup SDRAM refresh rate */</div><div class='add'>+	writel(0xc2b, LMREFRESH);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	/* setup SDRAM type parameters */</div><div class='add'>+	writel((LMTYPE_CASLAT_3 | LMTYPE_BKSZ_2 | LMTYPE_ROWSZ_11 |</div><div class='add'>+		LMTYPE_COLSZ_8),</div><div class='add'>+	       LMTYPE);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	/* enable memory controller */</div><div class='add'>+	writel(LMPWR_MC_PWR_ACT, LMPWR);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	/* perform dummy reads */</div><div class='add'>+	for ( i = 0; i &lt; 16; i++ ) {</div><div class='add'>+		tmp = readl(fbi-&gt;screen_base);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enable_clocks(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	/* enable clocks */</div><div class='add'>+	writel(SYSCLKSRC_PLL_2, SYSCLKSRC);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(PIXCLKSRC_PLL_1, PIXCLKSRC);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00000000, CLKSLEEP);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel((Core_Pll_M(0x17) | Core_Pll_N(0x3) | Core_Pll_P(0x0) |</div><div class='add'>+		CORE_PLL_EN),</div><div class='add'>+	       COREPLL);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel((Disp_Pll_M(0x1b) | Disp_Pll_N(0x7) | Disp_Pll_P(0x1) |</div><div class='add'>+		DISP_PLL_EN),</div><div class='add'>+	       DISPPLL);</div><div class='add'>+</div><div class='add'>+	writel(0x00000000, VOVRCLK);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(PIXCLK_EN, PIXCLK);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(MEMCLK_EN, MEMCLK);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00000006, M24CLK);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00000006, MBXCLK);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(SDCLK_EN, SDCLK);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00000001, PIXCLKDIV);</div><div class='add'>+	udelay(1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit setup_graphics(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	unsigned long gsctrl;</div><div class='add'>+</div><div class='add'>+	gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi-&gt;var.xres - 1) |</div><div class='add'>+		Gsctrl_Height(fbi-&gt;var.yres - 1);</div><div class='add'>+	switch (fbi-&gt;var.bits_per_pixel) {</div><div class='add'>+	case 16:</div><div class='add'>+		if (fbi-&gt;var.green.length == 5)</div><div class='add'>+			gsctrl |= GSCTRL_GPIXFMT_ARGB1555;</div><div class='add'>+		else</div><div class='add'>+			gsctrl |= GSCTRL_GPIXFMT_RGB565;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+		gsctrl |= GSCTRL_GPIXFMT_RGB888;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		gsctrl |= GSCTRL_GPIXFMT_ARGB8888;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(gsctrl, GSCTRL);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00000000, GBBASE);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00ffffff, GDRCTRL);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel((GSCADR_STR_EN | Gscadr_Gbase_Adr(0x6000)), GSCADR);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0x00000000, GPLUT);</div><div class='add'>+	udelay(1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit setup_display(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	unsigned long dsctrl = 0;</div><div class='add'>+</div><div class='add'>+	dsctrl = DSCTRL_BLNK_POL;</div><div class='add'>+	if (fbi-&gt;var.sync &amp; FB_SYNC_HOR_HIGH_ACT)</div><div class='add'>+		dsctrl |= DSCTRL_HS_POL;</div><div class='add'>+	if (fbi-&gt;var.sync &amp; FB_SYNC_VERT_HIGH_ACT)</div><div class='add'>+		dsctrl |= DSCTRL_VS_POL;</div><div class='add'>+	writel(dsctrl, DSCTRL);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel(0xd0303010, DMCTRL);</div><div class='add'>+	udelay(1000);</div><div class='add'>+	writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devinit enable_controller(struct fb_info *fbi)</div><div class='add'>+{</div><div class='add'>+	writel(SYSRST_RST, SYSRST);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	enable_clocks(fbi);</div><div class='add'>+	setup_memc(fbi);</div><div class='add'>+	setup_graphics(fbi);</div><div class='add'>+	setup_display(fbi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+/*</div><div class='add'>+ * Power management hooks.  Note that we won't be called from IRQ context,</div><div class='add'>+ * unlike the blank functions above, so we may sleep.</div><div class='add'>+ */</div><div class='add'>+static int mbxfb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	/* make frame buffer memory enter self-refresh mode */</div><div class='add'>+	writel(LMPWR_MC_PWR_SRM, LMPWR);</div><div class='add'>+	while (LMPWRSTAT != LMPWRSTAT_MC_PWR_SRM)</div><div class='add'>+		; /* empty statement */</div><div class='add'>+</div><div class='add'>+	/* reset the device, since it's initial state is 'mostly sleeping' */</div><div class='add'>+	writel(SYSRST_RST, SYSRST);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mbxfb_resume(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *fbi = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	enable_clocks(fbi);</div><div class='add'>+/* 	setup_graphics(fbi); */</div><div class='add'>+/* 	setup_display(fbi); */</div><div class='add'>+</div><div class='add'>+	writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define mbxfb_suspend	NULL</div><div class='add'>+#define mbxfb_resume	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* debugfs entries */</div><div class='add'>+#ifndef CONFIG_FB_MBX_DEBUG</div><div class='add'>+#define mbxfb_debugfs_init(x)	do {} while(0)</div><div class='add'>+#define mbxfb_debugfs_remove(x)	do {} while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define res_size(_r) (((_r)-&gt;end - (_r)-&gt;start) + 1)</div><div class='add'>+</div><div class='add'>+static int __devinit mbxfb_probe(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct fb_info *fbi;</div><div class='add'>+	struct mbxfb_info *mfbi;</div><div class='add'>+	struct mbxfb_platform_data *pdata;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "mbxfb_probe\n");</div><div class='add'>+</div><div class='add'>+	fbi = framebuffer_alloc(sizeof(struct mbxfb_info), &amp;dev-&gt;dev);</div><div class='add'>+	if (fbi == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "framebuffer_alloc failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mfbi = fbi-&gt;par;</div><div class='add'>+	fbi-&gt;pseudo_palette = mfbi-&gt;pseudo_palette;</div><div class='add'>+	pdata = dev-&gt;dev.platform_data;</div><div class='add'>+	if (pdata-&gt;probe)</div><div class='add'>+		mfbi-&gt;platform_probe = pdata-&gt;probe;</div><div class='add'>+	if (pdata-&gt;remove)</div><div class='add'>+		mfbi-&gt;platform_remove = pdata-&gt;remove;</div><div class='add'>+</div><div class='add'>+	mfbi-&gt;fb_res = platform_get_resource(dev, IORESOURCE_MEM, 0);</div><div class='add'>+	mfbi-&gt;reg_res = platform_get_resource(dev, IORESOURCE_MEM, 1);</div><div class='add'>+</div><div class='add'>+	if (!mfbi-&gt;fb_res || !mfbi-&gt;reg_res) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "no resources found\n");</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mfbi-&gt;fb_req = request_mem_region(mfbi-&gt;fb_res-&gt;start,</div><div class='add'>+					  res_size(mfbi-&gt;fb_res), dev-&gt;name);</div><div class='add'>+	if (mfbi-&gt;fb_req == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to claim framebuffer memory\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err1;</div><div class='add'>+	}</div><div class='add'>+	mfbi-&gt;fb_phys_addr = mfbi-&gt;fb_res-&gt;start;</div><div class='add'>+</div><div class='add'>+	mfbi-&gt;reg_req = request_mem_region(mfbi-&gt;reg_res-&gt;start,</div><div class='add'>+					   res_size(mfbi-&gt;reg_res), dev-&gt;name);</div><div class='add'>+	if (mfbi-&gt;reg_req == NULL) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to claim Marathon registers\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err2;</div><div class='add'>+	}</div><div class='add'>+	mfbi-&gt;reg_phys_addr = mfbi-&gt;reg_res-&gt;start;</div><div class='add'>+</div><div class='add'>+	mfbi-&gt;reg_virt_addr = ioremap_nocache(mfbi-&gt;reg_phys_addr,</div><div class='add'>+					      res_size(mfbi-&gt;reg_req));</div><div class='add'>+	if (!mfbi-&gt;reg_virt_addr) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to ioremap Marathon registers\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err3;</div><div class='add'>+	}</div><div class='add'>+	virt_base_2700 = (unsigned long)mfbi-&gt;reg_virt_addr;</div><div class='add'>+</div><div class='add'>+	mfbi-&gt;fb_virt_addr = ioremap_nocache(mfbi-&gt;fb_phys_addr,</div><div class='add'>+					     res_size(mfbi-&gt;fb_req));</div><div class='add'>+	if (!mfbi-&gt;reg_virt_addr) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "failed to ioremap frame buffer\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: get from platform */</div><div class='add'>+	fbi-&gt;screen_base = (char __iomem *)(mfbi-&gt;fb_virt_addr + 0x60000);</div><div class='add'>+	fbi-&gt;screen_size = 8 * 1024 * 1024;	/* 8 Megs */</div><div class='add'>+	fbi-&gt;fbops = &amp;mbxfb_ops;</div><div class='add'>+</div><div class='add'>+	fbi-&gt;var = mbxfb_default;</div><div class='add'>+	fbi-&gt;fix = mbxfb_fix;</div><div class='add'>+	fbi-&gt;fix.smem_start = mfbi-&gt;fb_phys_addr + 0x60000;</div><div class='add'>+	fbi-&gt;fix.smem_len = 8 * 1024 * 1024;</div><div class='add'>+	fbi-&gt;fix.line_length = 640 * 2;</div><div class='add'>+</div><div class='add'>+	ret = fb_alloc_cmap(&amp;fbi-&gt;cmap, 256, 0);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "fb_alloc_cmap failed\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(dev, fbi);</div><div class='add'>+</div><div class='add'>+	printk(KERN_INFO "fb%d: mbx frame buffer device\n", fbi-&gt;node);</div><div class='add'>+</div><div class='add'>+	if (mfbi-&gt;platform_probe)</div><div class='add'>+		mfbi-&gt;platform_probe(fbi);</div><div class='add'>+</div><div class='add'>+	enable_controller(fbi);</div><div class='add'>+</div><div class='add'>+	mbxfb_debugfs_init(fbi);</div><div class='add'>+</div><div class='add'>+	ret = register_framebuffer(fbi);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "register_framebuffer failed\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err6;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err6:</div><div class='add'>+	fb_dealloc_cmap(&amp;fbi-&gt;cmap);</div><div class='add'>+err5:</div><div class='add'>+	iounmap(mfbi-&gt;fb_virt_addr);</div><div class='add'>+err4:</div><div class='add'>+	iounmap(mfbi-&gt;reg_virt_addr);</div><div class='add'>+err3:</div><div class='add'>+	release_mem_region(mfbi-&gt;reg_res-&gt;start, res_size(mfbi-&gt;reg_res));</div><div class='add'>+err2:</div><div class='add'>+	release_mem_region(mfbi-&gt;fb_res-&gt;start, res_size(mfbi-&gt;fb_res));</div><div class='add'>+err1:</div><div class='add'>+	framebuffer_release(fbi);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devexit mbxfb_remove(struct platform_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *fbi = platform_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	writel(SYSRST_RST, SYSRST);</div><div class='add'>+	udelay(1000);</div><div class='add'>+</div><div class='add'>+	mbxfb_debugfs_remove(fbi);</div><div class='add'>+</div><div class='add'>+	if (fbi) {</div><div class='add'>+		struct mbxfb_info *mfbi = fbi-&gt;par;</div><div class='add'>+</div><div class='add'>+		unregister_framebuffer(fbi);</div><div class='add'>+		if (mfbi) {</div><div class='add'>+			if (mfbi-&gt;platform_remove)</div><div class='add'>+				mfbi-&gt;platform_remove(fbi);</div><div class='add'>+</div><div class='add'>+			if (mfbi-&gt;fb_virt_addr)</div><div class='add'>+				iounmap(mfbi-&gt;fb_virt_addr);</div><div class='add'>+			if (mfbi-&gt;reg_virt_addr)</div><div class='add'>+				iounmap(mfbi-&gt;reg_virt_addr);</div><div class='add'>+			if (mfbi-&gt;reg_req)</div><div class='add'>+				release_mem_region(mfbi-&gt;reg_req-&gt;start,</div><div class='add'>+						   res_size(mfbi-&gt;reg_req));</div><div class='add'>+			if (mfbi-&gt;fb_req)</div><div class='add'>+				release_mem_region(mfbi-&gt;fb_req-&gt;start,</div><div class='add'>+						   res_size(mfbi-&gt;fb_req));</div><div class='add'>+		}</div><div class='add'>+		framebuffer_release(fbi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver mbxfb_driver = {</div><div class='add'>+	.probe = mbxfb_probe,</div><div class='add'>+	.remove = mbxfb_remove,</div><div class='add'>+	.suspend = mbxfb_suspend,</div><div class='add'>+	.resume = mbxfb_resume,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "mbx-fb",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __devinit mbxfb_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;mbxfb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __devexit mbxfb_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;mbxfb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(mbxfb_init);</div><div class='add'>+module_exit(mbxfb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("loadable framebuffer driver for Marathon device");</div><div class='add'>+MODULE_AUTHOR("Mike Rapoport, Compulab");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/mbx/reg_bits.h b/drivers/video/mbx/reg_bits.h<br/>new file mode 100644<br/>index 000000000000..c226a8e45312<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/mbx/reg_bits.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/mbx/reg_bits.h</a></div><div class='hunk'>@@ -0,0 +1,418 @@</div><div class='add'>+#ifndef __REG_BITS_2700G_</div><div class='add'>+#define __REG_BITS_2700G_</div><div class='add'>+</div><div class='add'>+/* use defines from asm-arm/arch-pxa/bitfields.h for bit fields access */</div><div class='add'>+#define UData(Data)	((unsigned long) (Data))</div><div class='add'>+#define Fld(Size, Shft)	(((Size) &lt;&lt; 16) + (Shft))</div><div class='add'>+#define FSize(Field)	((Field) &gt;&gt; 16)</div><div class='add'>+#define FShft(Field)	((Field) &amp; 0x0000FFFF)</div><div class='add'>+#define FMsk(Field)	(((UData (1) &lt;&lt; FSize (Field)) - 1) &lt;&lt; FShft (Field))</div><div class='add'>+#define FAlnMsk(Field)	((UData (1) &lt;&lt; FSize (Field)) - 1)</div><div class='add'>+#define F1stBit(Field)	(UData (1) &lt;&lt; FShft (Field))</div><div class='add'>+</div><div class='add'>+#define SYSRST_RST	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* SYSCLKSRC - SYSCLK Source Control Register */</div><div class='add'>+#define SYSCLKSRC_SEL	Fld(2,0)</div><div class='add'>+#define SYSCLKSRC_REF	((0x0) &lt;&lt; FShft(SYSCLKSRC_SEL))</div><div class='add'>+#define SYSCLKSRC_PLL_1	((0x1) &lt;&lt; FShft(SYSCLKSRC_SEL))</div><div class='add'>+#define SYSCLKSRC_PLL_2	((0x2) &lt;&lt; FShft(SYSCLKSRC_SEL))</div><div class='add'>+</div><div class='add'>+/* PIXCLKSRC - PIXCLK Source Control Register */</div><div class='add'>+#define PIXCLKSRC_SEL	Fld(2,0)</div><div class='add'>+#define PIXCLKSRC_REF	((0x0) &lt;&lt; FShft(PIXCLKSRC_SEL))</div><div class='add'>+#define PIXCLKSRC_PLL_1	((0x1) &lt;&lt; FShft(PIXCLKSRC_SEL))</div><div class='add'>+#define PIXCLKSRC_PLL_2	((0x2) &lt;&lt; FShft(PIXCLKSRC_SEL))</div><div class='add'>+</div><div class='add'>+/* Clock Disable Register */</div><div class='add'>+#define CLKSLEEP_SLP	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Core PLL Control Register */</div><div class='add'>+#define CORE_PLL_M	Fld(6,7)</div><div class='add'>+#define Core_Pll_M(x)	((x) &lt;&lt; FShft(CORE_PLL_M))</div><div class='add'>+#define CORE_PLL_N	Fld(3,4)</div><div class='add'>+#define Core_Pll_N(x)	((x) &lt;&lt; FShft(CORE_PLL_N))</div><div class='add'>+#define CORE_PLL_P	Fld(3,1)</div><div class='add'>+#define Core_Pll_P(x)	((x) &lt;&lt; FShft(CORE_PLL_P))</div><div class='add'>+#define CORE_PLL_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Display PLL Control Register */</div><div class='add'>+#define DISP_PLL_M	Fld(6,7)</div><div class='add'>+#define Disp_Pll_M(x)	((x) &lt;&lt; FShft(DISP_PLL_M))</div><div class='add'>+#define DISP_PLL_N	Fld(3,4)</div><div class='add'>+#define Disp_Pll_N(x)	((x) &lt;&lt; FShft(DISP_PLL_N))</div><div class='add'>+#define DISP_PLL_P	Fld(3,1)</div><div class='add'>+#define Disp_Pll_P(x)	((x) &lt;&lt; FShft(DISP_PLL_P))</div><div class='add'>+#define DISP_PLL_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* PLL status register */</div><div class='add'>+#define PLLSTAT_CORE_PLL_LOST_L	(1 &lt;&lt; 3)</div><div class='add'>+#define PLLSTAT_CORE_PLL_LSTS	(1 &lt;&lt; 2)</div><div class='add'>+#define PLLSTAT_DISP_PLL_LOST_L	(1 &lt;&lt; 1)</div><div class='add'>+#define PLLSTAT_DISP_PLL_LSTS	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Video and scale clock control register */</div><div class='add'>+#define VOVRCLK_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Pixel clock control register */</div><div class='add'>+#define PIXCLK_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* Memory clock control register */</div><div class='add'>+#define MEMCLK_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* MBX clock control register */</div><div class='add'>+#define MBXCLK_DIV	Fld(2,2)</div><div class='add'>+#define MBXCLK_DIV_1	((0x0) &lt;&lt; FShft(MBXCLK_DIV))</div><div class='add'>+#define MBXCLK_DIV_2	((0x1) &lt;&lt; FShft(MBXCLK_DIV))</div><div class='add'>+#define MBXCLK_DIV_3	((0x2) &lt;&lt; FShft(MBXCLK_DIV))</div><div class='add'>+#define MBXCLK_DIV_4	((0x3) &lt;&lt; FShft(MBXCLK_DIV))</div><div class='add'>+#define MBXCLK_EN	Fld(2,0)</div><div class='add'>+#define MBXCLK_EN_NONE	((0x0) &lt;&lt; FShft(MBXCLK_EN))</div><div class='add'>+#define MBXCLK_EN_2D	((0x1) &lt;&lt; FShft(MBXCLK_EN))</div><div class='add'>+#define MBXCLK_EN_BOTH	((0x2) &lt;&lt; FShft(MBXCLK_EN))</div><div class='add'>+</div><div class='add'>+/* M24 clock control register */</div><div class='add'>+#define M24CLK_DIV	Fld(2,1)</div><div class='add'>+#define M24CLK_DIV_1	((0x0) &lt;&lt; FShft(M24CLK_DIV))</div><div class='add'>+#define M24CLK_DIV_2	((0x1) &lt;&lt; FShft(M24CLK_DIV))</div><div class='add'>+#define M24CLK_DIV_3	((0x2) &lt;&lt; FShft(M24CLK_DIV))</div><div class='add'>+#define M24CLK_DIV_4	((0x3) &lt;&lt; FShft(M24CLK_DIV))</div><div class='add'>+#define M24CLK_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* SDRAM clock control register */</div><div class='add'>+#define SDCLK_EN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* PixClk Divisor Register */</div><div class='add'>+#define PIXCLKDIV_PD	Fld(9,0)</div><div class='add'>+#define Pixclkdiv_Pd(x)	((x) &lt;&lt; FShft(PIXCLKDIV_PD))</div><div class='add'>+</div><div class='add'>+/* LCD Config control register */</div><div class='add'>+#define LCDCFG_IN_FMT	Fld(3,28)</div><div class='add'>+#define Lcdcfg_In_Fmt(x)	((x) &lt;&lt; FShft(LCDCFG_IN_FMT))</div><div class='add'>+#define LCDCFG_LCD1DEN_POL	(1 &lt;&lt; 27)</div><div class='add'>+#define LCDCFG_LCD1FCLK_POL	(1 &lt;&lt; 26)</div><div class='add'>+#define LCDCFG_LCD1LCLK_POL	(1 &lt;&lt; 25)</div><div class='add'>+#define LCDCFG_LCD1D_POL	(1 &lt;&lt; 24)</div><div class='add'>+#define LCDCFG_LCD2DEN_POL	(1 &lt;&lt; 23)</div><div class='add'>+#define LCDCFG_LCD2FCLK_POL	(1 &lt;&lt; 22)</div><div class='add'>+#define LCDCFG_LCD2LCLK_POL	(1 &lt;&lt; 21)</div><div class='add'>+#define LCDCFG_LCD2D_POL	(1 &lt;&lt; 20)</div><div class='add'>+#define LCDCFG_LCD1_TS		(1 &lt;&lt; 19)</div><div class='add'>+#define LCDCFG_LCD1D_DS		(1 &lt;&lt; 18)</div><div class='add'>+#define LCDCFG_LCD1C_DS		(1 &lt;&lt; 17)</div><div class='add'>+#define LCDCFG_LCD1_IS_IN	(1 &lt;&lt; 16)</div><div class='add'>+#define LCDCFG_LCD2_TS		(1 &lt;&lt; 3)</div><div class='add'>+#define LCDCFG_LCD2D_DS		(1 &lt;&lt; 2)</div><div class='add'>+#define LCDCFG_LCD2C_DS		(1 &lt;&lt; 1)</div><div class='add'>+#define LCDCFG_LCD2_IS_IN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* On-Die Frame Buffer Power Control Register */</div><div class='add'>+#define ODFBPWR_SLOW	(1 &lt;&lt; 2)</div><div class='add'>+#define ODFBPWR_MODE	Fld(2,0)</div><div class='add'>+#define ODFBPWR_MODE_ACT	((0x0) &lt;&lt; FShft(ODFBPWR_MODE))</div><div class='add'>+#define ODFBPWR_MODE_ACT_LP	((0x1) &lt;&lt; FShft(ODFBPWR_MODE))</div><div class='add'>+#define ODFBPWR_MODE_SLEEP	((0x2) &lt;&lt; FShft(ODFBPWR_MODE))</div><div class='add'>+#define ODFBPWR_MODE_SHUTD	((0x3) &lt;&lt; FShft(ODFBPWR_MODE))</div><div class='add'>+</div><div class='add'>+/* On-Die Frame Buffer Power State Status Register */</div><div class='add'>+#define ODFBSTAT_ACT	(1 &lt;&lt; 2)</div><div class='add'>+#define ODFBSTAT_SLP	(1 &lt;&lt; 1)</div><div class='add'>+#define ODFBSTAT_SDN	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* LMRST - Local Memory (SDRAM) Reset */</div><div class='add'>+#define LMRST_MC_RST	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* LMCFG - Local Memory (SDRAM) Configuration Register */</div><div class='add'>+#define LMCFG_LMC_DS	(1 &lt;&lt; 5)</div><div class='add'>+#define LMCFG_LMD_DS	(1 &lt;&lt; 4)</div><div class='add'>+#define LMCFG_LMA_DS	(1 &lt;&lt; 3)</div><div class='add'>+#define LMCFG_LMC_TS	(1 &lt;&lt; 2)</div><div class='add'>+#define LMCFG_LMD_TS	(1 &lt;&lt; 1)</div><div class='add'>+#define LMCFG_LMA_TS	(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* LMPWR - Local Memory (SDRAM) Power Control Register */</div><div class='add'>+#define LMPWR_MC_PWR_CNT	Fld(2,0)</div><div class='add'>+#define LMPWR_MC_PWR_ACT	((0x0) &lt;&lt; FShft(LMPWR_MC_PWR_CNT)) /* Active */</div><div class='add'>+#define LMPWR_MC_PWR_SRM	((0x1) &lt;&lt; FShft(LMPWR_MC_PWR_CNT)) /* Self-refresh */</div><div class='add'>+#define LMPWR_MC_PWR_DPD	((0x3) &lt;&lt; FShft(LMPWR_MC_PWR_CNT)) /* deep power down */</div><div class='add'>+</div><div class='add'>+/* LMPWRSTAT - Local Memory (SDRAM) Power Status Register */</div><div class='add'>+#define LMPWRSTAT_MC_PWR_CNT	Fld(2,0)</div><div class='add'>+#define LMPWRSTAT_MC_PWR_ACT	((0x0) &lt;&lt; FShft(LMPWRSTAT_MC_PWR_CNT)) /* Active */</div><div class='add'>+#define LMPWRSTAT_MC_PWR_SRM	((0x1) &lt;&lt; FShft(LMPWRSTAT_MC_PWR_CNT)) /* Self-refresh */</div><div class='add'>+#define LMPWRSTAT_MC_PWR_DPD	((0x3) &lt;&lt; FShft(LMPWRSTAT_MC_PWR_CNT)) /* deep power down */</div><div class='add'>+</div><div class='add'>+/* LMTYPE - Local Memory (SDRAM) Type Register */</div><div class='add'>+#define LMTYPE_CASLAT	Fld(3,10)</div><div class='add'>+#define LMTYPE_CASLAT_1	((0x1) &lt;&lt; FShft(LMTYPE_CASLAT))</div><div class='add'>+#define LMTYPE_CASLAT_2	((0x2) &lt;&lt; FShft(LMTYPE_CASLAT))</div><div class='add'>+#define LMTYPE_CASLAT_3	((0x3) &lt;&lt; FShft(LMTYPE_CASLAT))</div><div class='add'>+#define LMTYPE_BKSZ	Fld(2,8)</div><div class='add'>+#define LMTYPE_BKSZ_1	((0x1) &lt;&lt; FShft(LMTYPE_BKSZ))</div><div class='add'>+#define LMTYPE_BKSZ_2	((0x2) &lt;&lt; FShft(LMTYPE_BKSZ))</div><div class='add'>+#define LMTYPE_ROWSZ	Fld(4,4)</div><div class='add'>+#define LMTYPE_ROWSZ_11	((0xb) &lt;&lt; FShft(LMTYPE_ROWSZ))</div><div class='add'>+#define LMTYPE_ROWSZ_12	((0xc) &lt;&lt; FShft(LMTYPE_ROWSZ))</div><div class='add'>+#define LMTYPE_ROWSZ_13	((0xd) &lt;&lt; FShft(LMTYPE_ROWSZ))</div><div class='add'>+#define LMTYPE_COLSZ	Fld(4,0)</div><div class='add'>+#define LMTYPE_COLSZ_7	((0x7) &lt;&lt; FShft(LMTYPE_COLSZ))</div><div class='add'>+#define LMTYPE_COLSZ_8	((0x8) &lt;&lt; FShft(LMTYPE_COLSZ))</div><div class='add'>+#define LMTYPE_COLSZ_9	((0x9) &lt;&lt; FShft(LMTYPE_COLSZ))</div><div class='add'>+#define LMTYPE_COLSZ_10	((0xa) &lt;&lt; FShft(LMTYPE_COLSZ))</div><div class='add'>+#define LMTYPE_COLSZ_11	((0xb) &lt;&lt; FShft(LMTYPE_COLSZ))</div><div class='add'>+#define LMTYPE_COLSZ_12	((0xc) &lt;&lt; FShft(LMTYPE_COLSZ))</div><div class='add'>+</div><div class='add'>+/* LMTIM - Local Memory (SDRAM) Timing Register */</div><div class='add'>+#define LMTIM_TRAS	Fld(4,16)</div><div class='add'>+#define Lmtim_Tras(x)	((x) &lt;&lt; FShft(LMTIM_TRAS))</div><div class='add'>+#define LMTIM_TRP	Fld(4,12)</div><div class='add'>+#define Lmtim_Trp(x)	((x) &lt;&lt; FShft(LMTIM_TRP))</div><div class='add'>+#define LMTIM_TRCD	Fld(4,8)</div><div class='add'>+#define Lmtim_Trcd(x)	((x) &lt;&lt; FShft(LMTIM_TRCD))</div><div class='add'>+#define LMTIM_TRC	Fld(4,4)</div><div class='add'>+#define Lmtim_Trc(x)	((x) &lt;&lt; FShft(LMTIM_TRC))</div><div class='add'>+#define LMTIM_TDPL	Fld(4,0)</div><div class='add'>+#define Lmtim_Tdpl(x)	((x) &lt;&lt; FShft(LMTIM_TDPL))</div><div class='add'>+</div><div class='add'>+/* LMREFRESH - Local Memory (SDRAM) tREF Control Register */</div><div class='add'>+#define LMREFRESH_TREF	Fld(2,0)</div><div class='add'>+#define Lmrefresh_Tref(x)	((x) &lt;&lt; FShft(LMREFRESH_TREF))</div><div class='add'>+</div><div class='add'>+/* GSCTRL - Graphics surface control register */</div><div class='add'>+#define GSCTRL_LUT_EN	(1 &lt;&lt; 31)</div><div class='add'>+#define GSCTRL_GPIXFMT	Fld(4,27)</div><div class='add'>+#define GSCTRL_GPIXFMT_INDEXED	((0x0) &lt;&lt; FShft(GSCTRL_GPIXFMT))</div><div class='add'>+#define GSCTRL_GPIXFMT_ARGB4444	((0x4) &lt;&lt; FShft(GSCTRL_GPIXFMT))</div><div class='add'>+#define GSCTRL_GPIXFMT_ARGB1555	((0x5) &lt;&lt; FShft(GSCTRL_GPIXFMT))</div><div class='add'>+#define GSCTRL_GPIXFMT_RGB888	((0x6) &lt;&lt; FShft(GSCTRL_GPIXFMT))</div><div class='add'>+#define GSCTRL_GPIXFMT_RGB565	((0x7) &lt;&lt; FShft(GSCTRL_GPIXFMT))</div><div class='add'>+#define GSCTRL_GPIXFMT_ARGB8888	((0x8) &lt;&lt; FShft(GSCTRL_GPIXFMT))</div><div class='add'>+#define GSCTRL_GAMMA_EN	(1 &lt;&lt; 26)</div><div class='add'>+</div><div class='add'>+#define GSCTRL_GSWIDTH Fld(11,11)</div><div class='add'>+#define Gsctrl_Width(Pixel)	/* Display Width [1..2048 pix.]  */ \</div><div class='add'>+                        (((Pixel) - 1) &lt;&lt; FShft(GSCTRL_GSWIDTH))</div><div class='add'>+</div><div class='add'>+#define GSCTRL_GSHEIGHT Fld(11,0)</div><div class='add'>+#define Gsctrl_Height(Pixel)	/* Display Height [1..2048 pix.]  */ \</div><div class='add'>+                        (((Pixel) - 1) &lt;&lt; FShft(GSCTRL_GSHEIGHT))</div><div class='add'>+</div><div class='add'>+/* GBBASE fileds */</div><div class='add'>+#define GBBASE_GLALPHA Fld(8,24)</div><div class='add'>+#define Gbbase_Glalpha(x)	((x) &lt;&lt; FShft(GBBASE_GLALPHA))</div><div class='add'>+</div><div class='add'>+#define GBBASE_COLKEY Fld(24,0)</div><div class='add'>+#define Gbbase_Colkey(x)	((x) &lt;&lt; FShft(GBBASE_COLKEY))</div><div class='add'>+</div><div class='add'>+/* GDRCTRL fields */</div><div class='add'>+#define GDRCTRL_PIXDBL	(1 &lt;&lt; 31)</div><div class='add'>+#define GDRCTRL_PIXHLV	(1 &lt;&lt; 30)</div><div class='add'>+#define GDRCTRL_LNDBL	(1 &lt;&lt; 29)</div><div class='add'>+#define GDRCTRL_LNHLV	(1 &lt;&lt; 28)</div><div class='add'>+#define GDRCTRL_COLKEYM	Fld(24,0)</div><div class='add'>+#define Gdrctrl_Colkeym(x)	((x) &lt;&lt; FShft(GDRCTRL_COLKEYM))</div><div class='add'>+</div><div class='add'>+/* GSCADR graphics stream control address register fields */</div><div class='add'>+#define GSCADR_STR_EN	(1 &lt;&lt; 31)</div><div class='add'>+#define GSCADR_COLKEY_EN	(1 &lt;&lt; 30)</div><div class='add'>+#define GSCADR_COLKEYSCR	(1 &lt;&lt; 29)</div><div class='add'>+#define GSCADR_BLEND_M	Fld(2,27)</div><div class='add'>+#define GSCADR_BLEND_NONE	((0x0) &lt;&lt; FShft(GSCADR_BLEND_M))</div><div class='add'>+#define GSCADR_BLEND_INV	((0x1) &lt;&lt; FShft(GSCADR_BLEND_M))</div><div class='add'>+#define GSCADR_BLEND_GLOB	((0x2) &lt;&lt; FShft(GSCADR_BLEND_M))</div><div class='add'>+#define GSCADR_BLEND_PIX	((0x3) &lt;&lt; FShft(GSCADR_BLEND_M))</div><div class='add'>+#define GSCADR_BLEND_POS	Fld(2,24)</div><div class='add'>+#define GSCADR_BLEND_GFX	((0x0) &lt;&lt; FShft(GSCADR_BLEND_POS))</div><div class='add'>+#define GSCADR_BLEND_VID	((0x1) &lt;&lt; FShft(GSCADR_BLEND_POS))</div><div class='add'>+#define GSCADR_BLEND_CUR	((0x2) &lt;&lt; FShft(GSCADR_BLEND_POS))</div><div class='add'>+#define GSCADR_GBASE_ADR	Fld(23,0)</div><div class='add'>+#define Gscadr_Gbase_Adr(x)	((x) &lt;&lt; FShft(GSCADR_GBASE_ADR))</div><div class='add'>+</div><div class='add'>+/* GSADR graphics stride address register fields */</div><div class='add'>+#define GSADR_SRCSTRIDE	Fld(10,22)</div><div class='add'>+#define Gsadr_Srcstride(x)	((x) &lt;&lt; FShft(GSADR_SRCSTRIDE))</div><div class='add'>+#define GSADR_XSTART	Fld(11,11)</div><div class='add'>+#define Gsadr_Xstart(x)		((x) &lt;&lt; FShft(GSADR_XSTART))</div><div class='add'>+#define GSADR_YSTART	Fld(11,0)</div><div class='add'>+#define Gsadr_Ystart(y)		((y) &lt;&lt; FShft(GSADR_YSTART))</div><div class='add'>+</div><div class='add'>+/* GPLUT graphics palette register fields */</div><div class='add'>+#define GPLUT_LUTADR	Fld(8,24)</div><div class='add'>+#define Gplut_Lutadr(x)	((x) &lt;&lt; FShft(GPLUT_LUTADR))</div><div class='add'>+#define GPLUT_LUTDATA	Fld(24,0)</div><div class='add'>+#define Gplut_Lutdata(x)	((x) &lt;&lt; FShft(GPLUT_LUTDATA))</div><div class='add'>+</div><div class='add'>+/* HCCTRL - Hardware Cursor Register fields */</div><div class='add'>+#define HCCTRL_CUR_EN	(1 &lt;&lt; 31)</div><div class='add'>+#define HCCTRL_COLKEY_EN	(1 &lt;&lt; 29)</div><div class='add'>+#define HCCTRL_COLKEYSRC	(1 &lt;&lt; 28)</div><div class='add'>+#define HCCTRL_BLEND_M	Fld(2,26)</div><div class='add'>+#define HCCTRL_BLEND_NONE	((0x0) &lt;&lt; FShft(HCCTRL_BLEND_M))</div><div class='add'>+#define HCCTRL_BLEND_INV	((0x1) &lt;&lt; FShft(HCCTRL_BLEND_M))</div><div class='add'>+#define HCCTRL_BLEND_GLOB	((0x2) &lt;&lt; FShft(HCCTRL_BLEND_M))</div><div class='add'>+#define HCCTRL_BLEND_PIX	((0x3) &lt;&lt; FShft(HCCTRL_BLEND_M))</div><div class='add'>+#define HCCTRL_CPIXFMT	Fld(3,23)</div><div class='add'>+#define HCCTRL_CPIXFMT_RGB332	((0x3) &lt;&lt; FShft(HCCTRL_CPIXFMT))</div><div class='add'>+#define HCCTRL_CPIXFMT_ARGB4444	((0x4) &lt;&lt; FShft(HCCTRL_CPIXFMT))</div><div class='add'>+#define HCCTRL_CPIXFMT_ARGB1555	((0x5) &lt;&lt; FShft(HCCTRL_CPIXFMT))</div><div class='add'>+#define HCCTRL_CBASE_ADR	Fld(23,0)</div><div class='add'>+#define Hcctrl_Cbase_Adr(x)	((x) &lt;&lt; FShft(HCCTRL_CBASE_ADR))</div><div class='add'>+</div><div class='add'>+/* HCSIZE Hardware Cursor Size Register fields */</div><div class='add'>+#define HCSIZE_BLEND_POS	Fld(2,29)</div><div class='add'>+#define HCSIZE_BLEND_GFX	((0x0) &lt;&lt; FShft(HCSIZE_BLEND_POS))</div><div class='add'>+#define HCSIZE_BLEND_VID	((0x1) &lt;&lt; FShft(HCSIZE_BLEND_POS))</div><div class='add'>+#define HCSIZE_BLEND_CUR	((0x2) &lt;&lt; FShft(HCSIZE_BLEND_POS))</div><div class='add'>+#define HCSIZE_CWIDTH	Fld(3,16)</div><div class='add'>+#define Hcsize_Cwidth(x)	((x) &lt;&lt; FShft(HCSIZE_CWIDTH))</div><div class='add'>+#define HCSIZE_CHEIGHT	Fld(3,0)</div><div class='add'>+#define Hcsize_Cheight(x)	((x) &lt;&lt; FShft(HCSIZE_CHEIGHT))</div><div class='add'>+</div><div class='add'>+/* HCPOS Hardware Cursor Position Register fields */</div><div class='add'>+#define HCPOS_SWITCHSRC	(1 &lt;&lt; 30)</div><div class='add'>+#define HCPOS_CURBLINK	Fld(6,24)</div><div class='add'>+#define Hcpos_Curblink(x)	((x) &lt;&lt; FShft(HCPOS_CURBLINK))</div><div class='add'>+#define HCPOS_XSTART	Fld(12,12)</div><div class='add'>+#define Hcpos_Xstart(x)	((x) &lt;&lt; FShft(HCPOS_XSTART))</div><div class='add'>+#define HCPOS_YSTART	Fld(12,0)</div><div class='add'>+#define Hcpos_Ystart(y)	((y) &lt;&lt; FShft(HCPOS_YSTART))</div><div class='add'>+</div><div class='add'>+/* HCBADR Hardware Cursor Blend Address Register */</div><div class='add'>+#define HCBADR_GLALPHA	Fld(8,24)</div><div class='add'>+#define Hcbadr_Glalpha(x)	((x) &lt;&lt; FShft(HCBADR_GLALPHA))</div><div class='add'>+#define HCBADR_COLKEY	Fld(24,0)</div><div class='add'>+#define Hcbadr_Colkey(x)	((x) &lt;&lt; FShft(HCBADR_COLKEY))</div><div class='add'>+</div><div class='add'>+/* HCCKMSK - Hardware Cursor Color Key Mask Register */</div><div class='add'>+#define HCCKMSK_COLKEY_M	Fld(24,0)</div><div class='add'>+#define Hcckmsk_Colkey_M(x)	((x) &lt;&lt; FShft(HCCKMSK_COLKEY_M))</div><div class='add'>+</div><div class='add'>+/* DSCTRL - Display sync control register */</div><div class='add'>+#define DSCTRL_SYNCGEN_EN	(1 &lt;&lt; 31)</div><div class='add'>+#define DSCTRL_DPL_RST		(1 &lt;&lt; 29)</div><div class='add'>+#define DSCTRL_PWRDN_M		(1 &lt;&lt; 28)</div><div class='add'>+#define DSCTRL_UPDSYNCCNT	(1 &lt;&lt; 26)</div><div class='add'>+#define DSCTRL_UPDINTCNT	(1 &lt;&lt; 25)</div><div class='add'>+#define DSCTRL_UPDCNT		(1 &lt;&lt; 24)</div><div class='add'>+#define DSCTRL_UPDWAIT	Fld(4,16)</div><div class='add'>+#define Dsctrl_Updwait(x)	((x) &lt;&lt; FShft(DSCTRL_UPDWAIT))</div><div class='add'>+#define DSCTRL_CLKPOL		(1 &lt;&lt; 11)</div><div class='add'>+#define DSCTRL_CSYNC_EN		(1 &lt;&lt; 10)</div><div class='add'>+#define DSCTRL_VS_SLAVE		(1 &lt;&lt; 7)</div><div class='add'>+#define DSCTRL_HS_SLAVE		(1 &lt;&lt; 6)</div><div class='add'>+#define DSCTRL_BLNK_POL		(1 &lt;&lt; 5)</div><div class='add'>+#define DSCTRL_BLNK_DIS		(1 &lt;&lt; 4)</div><div class='add'>+#define DSCTRL_VS_POL		(1 &lt;&lt; 3)</div><div class='add'>+#define DSCTRL_VS_DIS		(1 &lt;&lt; 2)</div><div class='add'>+#define DSCTRL_HS_POL		(1 &lt;&lt; 1)</div><div class='add'>+#define DSCTRL_HS_DIS		(1 &lt;&lt; 0)</div><div class='add'>+</div><div class='add'>+/* DHT01 - Display horizontal timing register 01 */</div><div class='add'>+#define DHT01_HBPS	Fld(12,16)</div><div class='add'>+#define Dht01_Hbps(x)	((x) &lt;&lt; FShft(DHT01_HBPS))</div><div class='add'>+#define DHT01_HT	Fld(12,0)</div><div class='add'>+#define Dht01_Ht(x)	((x) &lt;&lt; FShft(DHT01_HT))</div><div class='add'>+</div><div class='add'>+/* DHT02 - Display horizontal timing register 02 */</div><div class='add'>+#define DHT02_HAS	Fld(12,16)</div><div class='add'>+#define Dht02_Has(x)	((x) &lt;&lt; FShft(DHT02_HAS))</div><div class='add'>+#define DHT02_HLBS	Fld(12,0)</div><div class='add'>+#define Dht02_Hlbs(x)	((x) &lt;&lt; FShft(DHT02_HLBS))</div><div class='add'>+</div><div class='add'>+/* DHT03 - Display horizontal timing register 03 */</div><div class='add'>+#define DHT03_HFPS	Fld(12,16)</div><div class='add'>+#define Dht03_Hfps(x)	((x) &lt;&lt; FShft(DHT03_HFPS))</div><div class='add'>+#define DHT03_HRBS	Fld(12,0)</div><div class='add'>+#define Dht03_Hrbs(x)	((x) &lt;&lt; FShft(DHT03_HRBS))</div><div class='add'>+</div><div class='add'>+/* DVT01 - Display vertical timing register 01 */</div><div class='add'>+#define DVT01_VBPS	Fld(12,16)</div><div class='add'>+#define Dvt01_Vbps(x)	((x) &lt;&lt; FShft(DVT01_VBPS))</div><div class='add'>+#define DVT01_VT	Fld(12,0)</div><div class='add'>+#define Dvt01_Vt(x)	((x) &lt;&lt; FShft(DVT01_VT))</div><div class='add'>+</div><div class='add'>+/* DVT02 - Display vertical timing register 02 */</div><div class='add'>+#define DVT02_VAS	Fld(12,16)</div><div class='add'>+#define Dvt02_Vas(x)	((x) &lt;&lt; FShft(DVT02_VAS))</div><div class='add'>+#define DVT02_VTBS	Fld(12,0)</div><div class='add'>+#define Dvt02_Vtbs(x)	((x) &lt;&lt; FShft(DVT02_VTBS))</div><div class='add'>+</div><div class='add'>+/* DVT03 - Display vertical timing register 03 */</div><div class='add'>+#define DVT03_VFPS	Fld(12,16)</div><div class='add'>+#define Dvt03_Vfps(x)	((x) &lt;&lt; FShft(DVT03_VFPS))</div><div class='add'>+#define DVT03_VBBS	Fld(12,0)</div><div class='add'>+#define Dvt03_Vbbs(x)	((x) &lt;&lt; FShft(DVT03_VBBS))</div><div class='add'>+</div><div class='add'>+/* DVECTRL - display vertical event control register */</div><div class='add'>+#define DVECTRL_VEVENT	Fld(12,16)</div><div class='add'>+#define Dvectrl_Vevent(x)	((x) &lt;&lt; FShft(DVECTRL_VEVENT))</div><div class='add'>+#define DVECTRL_VFETCH	Fld(12,0)</div><div class='add'>+#define Dvectrl_Vfetch(x)	((x) &lt;&lt; FShft(DVECTRL_VFETCH))</div><div class='add'>+</div><div class='add'>+/* DHDET - display horizontal DE timing register */</div><div class='add'>+#define DHDET_HDES	Fld(12,16)</div><div class='add'>+#define Dhdet_Hdes(x)	((x) &lt;&lt; FShft(DHDET_HDES))</div><div class='add'>+#define DHDET_HDEF	Fld(12,0)</div><div class='add'>+#define Dhdet_Hdef(x)	((x) &lt;&lt; FShft(DHDET_HDEF))</div><div class='add'>+</div><div class='add'>+/* DVDET - display vertical DE timing register */</div><div class='add'>+#define DVDET_VDES	Fld(12,16)</div><div class='add'>+#define Dvdet_Vdes(x)	((x) &lt;&lt; FShft(DVDET_VDES))</div><div class='add'>+#define DVDET_VDEF	Fld(12,0)</div><div class='add'>+#define Dvdet_Vdef(x)	((x) &lt;&lt; FShft(DVDET_VDEF))</div><div class='add'>+</div><div class='add'>+/* DODMSK - display output data mask register */</div><div class='add'>+#define DODMSK_MASK_LVL	(1 &lt;&lt; 31)</div><div class='add'>+#define DODMSK_BLNK_LVL	(1 &lt;&lt; 30)</div><div class='add'>+#define DODMSK_MASK_B	Fld(8,16)</div><div class='add'>+#define Dodmsk_Mask_B(x)	((x) &lt;&lt; FShft(DODMSK_MASK_B))</div><div class='add'>+#define DODMSK_MASK_G	Fld(8,8)</div><div class='add'>+#define Dodmsk_Mask_G(x)	((x) &lt;&lt; FShft(DODMSK_MASK_G))</div><div class='add'>+#define DODMSK_MASK_R	Fld(8,0)</div><div class='add'>+#define Dodmsk_Mask_R(x)	((x) &lt;&lt; FShft(DODMSK_MASK_R))</div><div class='add'>+</div><div class='add'>+/* DBCOL - display border color control register */</div><div class='add'>+#define DBCOL_BORDCOL	Fld(24,0)</div><div class='add'>+#define Dbcol_Bordcol(x)	((x) &lt;&lt; FShft(DBCOL_BORDCOL))</div><div class='add'>+</div><div class='add'>+/* DVLNUM - display vertical line number register */</div><div class='add'>+#define DVLNUM_VLINE	Fld(12,0)</div><div class='add'>+#define Dvlnum_Vline(x)	((x) &lt;&lt; FShft(DVLNUM_VLINE))</div><div class='add'>+</div><div class='add'>+/* DMCTRL - Display Memory Control Register */</div><div class='add'>+#define DMCTRL_MEM_REF	Fld(2,30)</div><div class='add'>+#define DMCTRL_MEM_REF_ACT	((0x0) &lt;&lt; FShft(DMCTRL_MEM_REF))</div><div class='add'>+#define DMCTRL_MEM_REF_HB	((0x1) &lt;&lt; FShft(DMCTRL_MEM_REF))</div><div class='add'>+#define DMCTRL_MEM_REF_VB	((0x2) &lt;&lt; FShft(DMCTRL_MEM_REF))</div><div class='add'>+#define DMCTRL_MEM_REF_BOTH	((0x3) &lt;&lt; FShft(DMCTRL_MEM_REF))</div><div class='add'>+#define DMCTRL_UV_THRHLD	Fld(6,24)</div><div class='add'>+#define Dmctrl_Uv_Thrhld(x)	((x) &lt;&lt; FShft(DMCTRL_UV_THRHLD))</div><div class='add'>+#define DMCTRL_V_THRHLD		Fld(7,16)</div><div class='add'>+#define Dmctrl_V_Thrhld(x)	((x) &lt;&lt; FShft(DMCTRL_V_THRHLD))</div><div class='add'>+#define DMCTRL_D_THRHLD		Fld(7,8)</div><div class='add'>+#define Dmctrl_D_Thrhld(x)	((x) &lt;&lt; FShft(DMCTRL_D_THRHLD))</div><div class='add'>+#define DMCTRL_BURSTLEN	Fld(6,0)</div><div class='add'>+#define Dmctrl_Burstlen(x)	((x) &lt;&lt; FShft(DMCTRL_BURSTLEN))</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* DLSTS - display load status register */</div><div class='add'>+#define DLSTS_RLD_ADONE	(1 &lt;&lt; 23)</div><div class='add'>+/* #define DLSTS_RLD_ADOUT	Fld(23,0) */</div><div class='add'>+</div><div class='add'>+/* DLLCTRL - display list load control register */</div><div class='add'>+#define DLLCTRL_RLD_ADRLN	Fld(8,24)</div><div class='add'>+#define Dllctrl_Rld_Adrln(x)	((x) &lt;&lt; FShft(DLLCTRL_RLD_ADRLN))</div><div class='add'>+</div><div class='add'>+/* SPOCTRL - Scale Pitch/Order Control Register */</div><div class='add'>+#define SPOCTRL_H_SC_BP		(1 &lt;&lt; 31)</div><div class='add'>+#define SPOCTRL_V_SC_BP		(1 &lt;&lt; 30)</div><div class='add'>+#define SPOCTRL_HV_SC_OR	(1 &lt;&lt; 29)</div><div class='add'>+#define SPOCTRL_VS_UR_C		(1 &lt;&lt; 27)</div><div class='add'>+#define SPOCTRL_VORDER	Fld(2,16)</div><div class='add'>+#define SPOCTRL_VORDER_1TAP	((0x0) &lt;&lt; FShft(SPOCTRL_VORDER))</div><div class='add'>+#define SPOCTRL_VORDER_2TAP	((0x1) &lt;&lt; FShft(SPOCTRL_VORDER))</div><div class='add'>+#define SPOCTRL_VORDER_4TAP	((0x3) &lt;&lt; FShft(SPOCTRL_VORDER))</div><div class='add'>+#define SPOCTRL_VPITCH	Fld(16,0)</div><div class='add'>+#define Spoctrl_Vpitch(x)	((x) &lt;&lt; FShft(SPOCTRL_VPITCH))</div><div class='add'>+</div><div class='add'>+#endif /* __REG_BITS_2700G_ */</div><div class='head'>diff --git a/drivers/video/mbx/regs.h b/drivers/video/mbx/regs.h<br/>new file mode 100644<br/>index 000000000000..ad20be07666b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/mbx/regs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/mbx/regs.h</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+#ifndef __REGS_2700G_</div><div class='add'>+#define __REGS_2700G_</div><div class='add'>+</div><div class='add'>+/* extern unsigned long virt_base_2700; */</div><div class='add'>+/* #define __REG_2700G(x)	(*(volatile unsigned long*)((x)+virt_base_2700)) */</div><div class='add'>+#define __REG_2700G(x)	((x)+virt_base_2700)</div><div class='add'>+</div><div class='add'>+/* System Configuration Registers (0x0000_0000  0x0000_0010) */</div><div class='add'>+#define SYSCFG		__REG_2700G(0x00000000)</div><div class='add'>+#define PFBASE		__REG_2700G(0x00000004)</div><div class='add'>+#define PFCEIL		__REG_2700G(0x00000008)</div><div class='add'>+#define POLLFLAG	__REG_2700G(0x0000000c)</div><div class='add'>+#define SYSRST		__REG_2700G(0x00000010)</div><div class='add'>+</div><div class='add'>+/* Interrupt Control Registers (0x0000_0014  0x0000_002F) */</div><div class='add'>+#define NINTPW		__REG_2700G(0x00000014)</div><div class='add'>+#define MINTENABLE	__REG_2700G(0x00000018)</div><div class='add'>+#define MINTSTAT	__REG_2700G(0x0000001c)</div><div class='add'>+#define SINTENABLE	__REG_2700G(0x00000020)</div><div class='add'>+#define SINTSTAT	__REG_2700G(0x00000024)</div><div class='add'>+#define SINTCLR		__REG_2700G(0x00000028)</div><div class='add'>+</div><div class='add'>+/* Clock Control Registers (0x0000_002C  0x0000_005F) */</div><div class='add'>+#define SYSCLKSRC	__REG_2700G(0x0000002c)</div><div class='add'>+#define PIXCLKSRC	__REG_2700G(0x00000030)</div><div class='add'>+#define CLKSLEEP	__REG_2700G(0x00000034)</div><div class='add'>+#define COREPLL		__REG_2700G(0x00000038)</div><div class='add'>+#define DISPPLL		__REG_2700G(0x0000003c)</div><div class='add'>+#define PLLSTAT		__REG_2700G(0x00000040)</div><div class='add'>+#define VOVRCLK		__REG_2700G(0x00000044)</div><div class='add'>+#define PIXCLK		__REG_2700G(0x00000048)</div><div class='add'>+#define MEMCLK		__REG_2700G(0x0000004c)</div><div class='add'>+#define M24CLK		__REG_2700G(0x00000054)</div><div class='add'>+#define MBXCLK		__REG_2700G(0x00000054)</div><div class='add'>+#define SDCLK		__REG_2700G(0x00000058)</div><div class='add'>+#define PIXCLKDIV	__REG_2700G(0x0000005c)</div><div class='add'>+</div><div class='add'>+/* LCD Port Control Register (0x0000_0060  0x0000_006F) */</div><div class='add'>+#define LCD_CONFIG	__REG_2700G(0x00000060)</div><div class='add'>+</div><div class='add'>+/* On-Die Frame Buffer Registers (0x0000_0064  0x0000_006B) */</div><div class='add'>+#define ODFBPWR		__REG_2700G(0x00000064)</div><div class='add'>+#define ODFBSTAT	__REG_2700G(0x00000068)</div><div class='add'>+</div><div class='add'>+/* GPIO Registers (0x0000_006C  0x0000_007F) */</div><div class='add'>+#define GPIOCGF		__REG_2700G(0x0000006c)</div><div class='add'>+#define GPIOHI		__REG_2700G(0x00000070)</div><div class='add'>+#define GPIOLO		__REG_2700G(0x00000074)</div><div class='add'>+#define GPIOSTAT	__REG_2700G(0x00000078)</div><div class='add'>+</div><div class='add'>+/* Pulse Width Modulator (PWM) Registers (0x0000_0200  0x0000_02FF) */</div><div class='add'>+#define PWMRST		__REG_2700G(0x00000200)</div><div class='add'>+#define PWMCFG		__REG_2700G(0x00000204)</div><div class='add'>+#define PWM0DIV		__REG_2700G(0x00000210)</div><div class='add'>+#define PWM0DUTY	__REG_2700G(0x00000214)</div><div class='add'>+#define PWM0PER		__REG_2700G(0x00000218)</div><div class='add'>+#define PWM1DIV		__REG_2700G(0x00000220)</div><div class='add'>+#define PWM1DUTY	__REG_2700G(0x00000224)</div><div class='add'>+#define PWM1PER		__REG_2700G(0x00000228)</div><div class='add'>+</div><div class='add'>+/* Identification (ID) Registers (0x0000_0300  0x0000_0FFF) */</div><div class='add'>+#define ID		__REG_2700G(0x00000FF0)</div><div class='add'>+</div><div class='add'>+/* Local Memory (SDRAM) Interface Registers (0x0000_1000  0x0000_1FFF) */</div><div class='add'>+#define LMRST		__REG_2700G(0x00001000)</div><div class='add'>+#define LMCFG		__REG_2700G(0x00001004)</div><div class='add'>+#define LMPWR		__REG_2700G(0x00001008)</div><div class='add'>+#define LMPWRSTAT	__REG_2700G(0x0000100c)</div><div class='add'>+#define LMCEMR		__REG_2700G(0x00001010)</div><div class='add'>+#define LMTYPE		__REG_2700G(0x00001014)</div><div class='add'>+#define LMTIM		__REG_2700G(0x00001018)</div><div class='add'>+#define LMREFRESH	__REG_2700G(0x0000101c)</div><div class='add'>+#define LMPROTMIN	__REG_2700G(0x00001020)</div><div class='add'>+#define LMPROTMAX	__REG_2700G(0x00001024)</div><div class='add'>+#define LMPROTCFG	__REG_2700G(0x00001028)</div><div class='add'>+#define LMPROTERR	__REG_2700G(0x0000102c)</div><div class='add'>+</div><div class='add'>+/* Plane Controller Registers (0x0000_2000  0x0000_2FFF) */</div><div class='add'>+#define GSCTRL		__REG_2700G(0x00002000)</div><div class='add'>+#define VSCTRL		__REG_2700G(0x00002004)</div><div class='add'>+#define GBBASE		__REG_2700G(0x00002020)</div><div class='add'>+#define VBBASE		__REG_2700G(0x00002024)</div><div class='add'>+#define GDRCTRL		__REG_2700G(0x00002040)</div><div class='add'>+#define VCMSK		__REG_2700G(0x00002044)</div><div class='add'>+#define GSCADR		__REG_2700G(0x00002060)</div><div class='add'>+#define VSCADR		__REG_2700G(0x00002064)</div><div class='add'>+#define VUBASE		__REG_2700G(0x00002084)</div><div class='add'>+#define VVBASE		__REG_2700G(0x000020a4)</div><div class='add'>+#define GSADR		__REG_2700G(0x000020c0)</div><div class='add'>+#define VSADR		__REG_2700G(0x000020c4)</div><div class='add'>+#define HCCTRL		__REG_2700G(0x00002100)</div><div class='add'>+#define HCSIZE		__REG_2700G(0x00002110)</div><div class='add'>+#define HCPOS		__REG_2700G(0x00002120)</div><div class='add'>+#define HCBADR		__REG_2700G(0x00002130)</div><div class='add'>+#define HCCKMSK		__REG_2700G(0x00002140)</div><div class='add'>+#define GPLUT		__REG_2700G(0x00002150)</div><div class='add'>+#define DSCTRL		__REG_2700G(0x00002154)</div><div class='add'>+#define DHT01		__REG_2700G(0x00002158)</div><div class='add'>+#define DHT02		__REG_2700G(0x0000215c)</div><div class='add'>+#define DHT03		__REG_2700G(0x00002160)</div><div class='add'>+#define DVT01		__REG_2700G(0x00002164)</div><div class='add'>+#define DVT02		__REG_2700G(0x00002168)</div><div class='add'>+#define DVT03		__REG_2700G(0x0000216c)</div><div class='add'>+#define DBCOL		__REG_2700G(0x00002170)</div><div class='add'>+#define BGCOLOR		__REG_2700G(0x00002174)</div><div class='add'>+#define DINTRS		__REG_2700G(0x00002178)</div><div class='add'>+#define DINTRE		__REG_2700G(0x0000217c)</div><div class='add'>+#define DINTRCNT	__REG_2700G(0x00002180)</div><div class='add'>+#define DSIG		__REG_2700G(0x00002184)</div><div class='add'>+#define DMCTRL		__REG_2700G(0x00002188)</div><div class='add'>+#define CLIPCTRL	__REG_2700G(0x0000218c)</div><div class='add'>+#define SPOCTRL		__REG_2700G(0x00002190)</div><div class='add'>+#define SVCTRL		__REG_2700G(0x00002194)</div><div class='add'>+</div><div class='add'>+/* 0x0000_2198 */</div><div class='add'>+/* 0x0000_21A8 VSCOEFF[0:4] Video Scalar Vertical Coefficient [0:4] 4.14.5 */</div><div class='add'>+#define VSCOEFF0	__REG_2700G(0x00002198)</div><div class='add'>+#define VSCOEFF1	__REG_2700G(0x0000219c)</div><div class='add'>+#define VSCOEFF2	__REG_2700G(0x000021a0)</div><div class='add'>+#define VSCOEFF3	__REG_2700G(0x000021a4)</div><div class='add'>+#define VSCOEFF4	__REG_2700G(0x000021a8)</div><div class='add'>+</div><div class='add'>+#define SHCTRL		__REG_2700G(0x000021b0)</div><div class='add'>+</div><div class='add'>+/* 0x0000_21B4 */</div><div class='add'>+/* 0x0000_21D4 HSCOEFF[0:8] Video Scalar Horizontal Coefficient [0:8] 4.14.7 */</div><div class='add'>+#define HSCOEFF0	__REG_2700G(0x000021b4)</div><div class='add'>+#define HSCOEFF1	__REG_2700G(0x000021b8)</div><div class='add'>+#define HSCOEFF2	__REG_2700G(0x000021bc)</div><div class='add'>+#define HSCOEFF3	__REG_2700G(0x000021b0)</div><div class='add'>+#define HSCOEFF4	__REG_2700G(0x000021c4)</div><div class='add'>+#define HSCOEFF5	__REG_2700G(0x000021c8)</div><div class='add'>+#define HSCOEFF6	__REG_2700G(0x000021cc)</div><div class='add'>+#define HSCOEFF7	__REG_2700G(0x000021d0)</div><div class='add'>+#define HSCOEFF8	__REG_2700G(0x000021d4)</div><div class='add'>+</div><div class='add'>+#define SSSIZE		__REG_2700G(0x000021D8)</div><div class='add'>+</div><div class='add'>+/* 0x0000_2200 */</div><div class='add'>+/* 0x0000_2240 VIDGAM[0:16] Video Gamma LUT Index [0:16] 4.15.2 */</div><div class='add'>+#define VIDGAM0		__REG_2700G(0x00002200)</div><div class='add'>+#define VIDGAM1		__REG_2700G(0x00002204)</div><div class='add'>+#define VIDGAM2		__REG_2700G(0x00002208)</div><div class='add'>+#define VIDGAM3		__REG_2700G(0x0000220c)</div><div class='add'>+#define VIDGAM4		__REG_2700G(0x00002210)</div><div class='add'>+#define VIDGAM5		__REG_2700G(0x00002214)</div><div class='add'>+#define VIDGAM6		__REG_2700G(0x00002218)</div><div class='add'>+#define VIDGAM7		__REG_2700G(0x0000221c)</div><div class='add'>+#define VIDGAM8		__REG_2700G(0x00002220)</div><div class='add'>+#define VIDGAM9		__REG_2700G(0x00002224)</div><div class='add'>+#define VIDGAM10	__REG_2700G(0x00002228)</div><div class='add'>+#define VIDGAM11	__REG_2700G(0x0000222c)</div><div class='add'>+#define VIDGAM12	__REG_2700G(0x00002230)</div><div class='add'>+#define VIDGAM13	__REG_2700G(0x00002234)</div><div class='add'>+#define VIDGAM14	__REG_2700G(0x00002238)</div><div class='add'>+#define VIDGAM15	__REG_2700G(0x0000223c)</div><div class='add'>+#define VIDGAM16	__REG_2700G(0x00002240)</div><div class='add'>+</div><div class='add'>+/* 0x0000_2250 */</div><div class='add'>+/* 0x0000_2290 GFXGAM[0:16] Graphics Gamma LUT Index [0:16] 4.15.3 */</div><div class='add'>+#define GFXGAM0		__REG_2700G(0x00002250)</div><div class='add'>+#define GFXGAM1		__REG_2700G(0x00002254)</div><div class='add'>+#define GFXGAM2		__REG_2700G(0x00002258)</div><div class='add'>+#define GFXGAM3		__REG_2700G(0x0000225c)</div><div class='add'>+#define GFXGAM4		__REG_2700G(0x00002260)</div><div class='add'>+#define GFXGAM5		__REG_2700G(0x00002264)</div><div class='add'>+#define GFXGAM6		__REG_2700G(0x00002268)</div><div class='add'>+#define GFXGAM7		__REG_2700G(0x0000226c)</div><div class='add'>+#define GFXGAM8		__REG_2700G(0x00002270)</div><div class='add'>+#define GFXGAM9		__REG_2700G(0x00002274)</div><div class='add'>+#define GFXGAM10	__REG_2700G(0x00002278)</div><div class='add'>+#define GFXGAM11	__REG_2700G(0x0000227c)</div><div class='add'>+#define GFXGAM12	__REG_2700G(0x00002280)</div><div class='add'>+#define GFXGAM13	__REG_2700G(0x00002284)</div><div class='add'>+#define GFXGAM14	__REG_2700G(0x00002288)</div><div class='add'>+#define GFXGAM15	__REG_2700G(0x0000228c)</div><div class='add'>+#define GFXGAM16	__REG_2700G(0x00002290)</div><div class='add'>+</div><div class='add'>+#define DLSTS		__REG_2700G(0x00002300)</div><div class='add'>+#define DLLCTRL		__REG_2700G(0x00002304)</div><div class='add'>+#define DVLNUM		__REG_2700G(0x00002308)</div><div class='add'>+#define DUCTRL		__REG_2700G(0x0000230c)</div><div class='add'>+#define DVECTRL		__REG_2700G(0x00002310)</div><div class='add'>+#define DHDET		__REG_2700G(0x00002314)</div><div class='add'>+#define DVDET		__REG_2700G(0x00002318)</div><div class='add'>+#define DODMSK		__REG_2700G(0x0000231c)</div><div class='add'>+#define CSC01		__REG_2700G(0x00002330)</div><div class='add'>+#define CSC02		__REG_2700G(0x00002334)</div><div class='add'>+#define CSC03		__REG_2700G(0x00002338)</div><div class='add'>+#define CSC04		__REG_2700G(0x0000233c)</div><div class='add'>+#define CSC05		__REG_2700G(0x00002340)</div><div class='add'>+</div><div class='add'>+#define FB_MEMORY_START	__REG_2700G(0x00060000)</div><div class='add'>+</div><div class='add'>+#endif /* __REGS_2700G_ */</div><div class='head'>diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c<br/>index 26a1c618a205..d1267904c280 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/modedb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/modedb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/modedb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/modedb.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -259,6 +258,10 @@ static const struct fb_videomode modedb[] = {</div><div class='ctx'> 	/* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */</div><div class='ctx'> 	NULL, 60, 1152, 768, 15386, 158, 26, 29, 3, 136, 6,</div><div class='ctx'> 	FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED</div><div class='add'>+    }, {</div><div class='add'>+	/* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */</div><div class='add'>+	NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5,</div><div class='add'>+	0, FB_VMODE_NONINTERLACED</div><div class='ctx'>     },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -787,8 +790,9 @@ struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var,</div><div class='ctx'> 			if (diff &gt; d) {</div><div class='ctx'> 				diff = d;</div><div class='ctx'> 				best = mode;</div><div class='del'>-			} else if (diff == d &amp;&amp; mode-&gt;refresh &gt; best-&gt;refresh)</div><div class='del'>-			    best = mode;</div><div class='add'>+			} else if (diff == d &amp;&amp; best &amp;&amp;</div><div class='add'>+				   mode-&gt;refresh &gt; best-&gt;refresh)</div><div class='add'>+				best = mode;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return best;</div><div class='hunk'>@@ -1016,8 +1020,6 @@ EXPORT_SYMBOL(fb_videomode_to_var);</div><div class='ctx'> EXPORT_SYMBOL(fb_var_to_videomode);</div><div class='ctx'> EXPORT_SYMBOL(fb_mode_is_equal);</div><div class='ctx'> EXPORT_SYMBOL(fb_add_videomode);</div><div class='del'>-EXPORT_SYMBOL(fb_delete_videomode);</div><div class='del'>-EXPORT_SYMBOL(fb_destroy_modelist);</div><div class='ctx'> EXPORT_SYMBOL(fb_match_mode);</div><div class='ctx'> EXPORT_SYMBOL(fb_find_best_mode);</div><div class='ctx'> EXPORT_SYMBOL(fb_find_nearest_mode);</div><div class='head'>diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c<br/>index 24b12f71d5a8..59a6f5fa5ae6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/neofb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/neofb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/neofb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/neofb.c</a></div><div class='hunk'>@@ -54,13 +54,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -1333,17 +1331,22 @@ static int neofb_blank(int blank_mode, struct fb_info *info)</div><div class='ctx'> 	 *  run "setterm -powersave powerdown" to take advantage</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct neofb_par *par = info-&gt;par;</div><div class='del'>-	int seqflags, lcdflags, dpmsflags, reg;</div><div class='del'>-</div><div class='add'>+	int seqflags, lcdflags, dpmsflags, reg, tmpdisp;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Reload the value stored in the register, if sensible. It might have</div><div class='del'>-	 * been changed via FN keystroke.</div><div class='add'>+	 * Read back the register bits related to display configuration. They might</div><div class='add'>+	 * have been changed underneath the driver via Fn key stroke.</div><div class='add'>+	 */</div><div class='add'>+	neoUnlock();</div><div class='add'>+	tmpdisp = vga_rgfx(NULL, 0x20) &amp; 0x03;</div><div class='add'>+	neoLock(&amp;par-&gt;state);</div><div class='add'>+</div><div class='add'>+	/* In case we blank the screen, we want to store the possibly new</div><div class='add'>+	 * configuration in the driver. During un-blank, we re-apply this setting,</div><div class='add'>+	 * since the LCD bit will be cleared in order to switch off the backlight.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (par-&gt;PanelDispCntlRegRead) {</div><div class='del'>-		neoUnlock();</div><div class='del'>-		par-&gt;PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) &amp; 0x03;</div><div class='del'>-		neoLock(&amp;par-&gt;state);</div><div class='add'>+		par-&gt;PanelDispCntlReg1 = tmpdisp;</div><div class='ctx'> 	}</div><div class='ctx'> 	par-&gt;PanelDispCntlRegRead = !blank_mode;</div><div class='ctx'> </div><div class='hunk'>@@ -1378,12 +1381,21 @@ static int neofb_blank(int blank_mode, struct fb_info *info)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_BLANK_NORMAL:		/* just blank screen (backlight stays on) */</div><div class='ctx'> 		seqflags = VGA_SR01_SCREEN_OFF;	/* Disable sequencer */</div><div class='del'>-		lcdflags = par-&gt;PanelDispCntlReg1 &amp; 0x02; /* LCD normal */</div><div class='add'>+		/*</div><div class='add'>+		 * During a blank operation with the LID shut, we might store "LCD off"</div><div class='add'>+		 * by mistake. Due to timing issues, the BIOS may switch the lights</div><div class='add'>+		 * back on, and we turn it back off once we "unblank".</div><div class='add'>+		 *</div><div class='add'>+		 * So here is an attempt to implement "&gt;=" - if we are in the process</div><div class='add'>+		 * of unblanking, and the LCD bit is unset in the driver but set in the</div><div class='add'>+		 * register, we must keep it.</div><div class='add'>+		 */</div><div class='add'>+		lcdflags = ((par-&gt;PanelDispCntlReg1 | tmpdisp) &amp; 0x02); /* LCD normal */</div><div class='ctx'> 		dpmsflags = 0x00;	/* no hsync/vsync suppression */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_BLANK_UNBLANK:		/* unblank */</div><div class='ctx'> 		seqflags = 0;			/* Enable sequencer */</div><div class='del'>-		lcdflags = par-&gt;PanelDispCntlReg1 &amp; 0x02; /* LCD normal */</div><div class='add'>+		lcdflags = ((par-&gt;PanelDispCntlReg1 | tmpdisp) &amp; 0x02); /* LCD normal */</div><div class='ctx'> 		dpmsflags = 0x00;	/* no hsync/vsync suppression */</div><div class='ctx'> #ifdef CONFIG_TOSHIBA</div><div class='ctx'> 		/* Do we still need this ? */</div><div class='head'>diff --git a/drivers/video/nvidia/Makefile b/drivers/video/nvidia/Makefile<br/>index 690d37e8de5b..ca47432113e0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/nvidia/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/Makefile</a></div><div class='hunk'>@@ -7,6 +7,7 @@ obj-$(CONFIG_FB_NVIDIA)          += nvidiafb.o</div><div class='ctx'> nvidiafb-y                       := nvidia.o nv_hw.o nv_setup.o \</div><div class='ctx'> 			            nv_accel.o</div><div class='ctx'> nvidiafb-$(CONFIG_FB_NVIDIA_I2C) += nv_i2c.o</div><div class='add'>+nvidiafb-$(CONFIG_FB_NVIDIA_BACKLIGHT)  += nv_backlight.o</div><div class='ctx'> nvidiafb-$(CONFIG_PPC_OF)	 += nv_of.o</div><div class='ctx'> </div><div class='del'>-nvidiafb-objs                    := $(nvidiafb-y)
\ No newline at end of file</div><div class='add'>+nvidiafb-objs                    := $(nvidiafb-y)</div><div class='head'>diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c<br/>new file mode 100644<br/>index 000000000000..b45f577094ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_backlight.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/nv_backlight.c</a></div><div class='hunk'>@@ -0,0 +1,199 @@</div><div class='add'>+/*</div><div class='add'>+ * Backlight code for nVidia based graphic cards</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2004 Antonino Daplas &lt;adaplas@pol.net&gt;</div><div class='add'>+ * Copyright (c) 2006 Michael Hanselmann &lt;linux-kernel@hansmi.ch&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License version 2 as</div><div class='add'>+ * published by the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "nv_local.h"</div><div class='add'>+#include "nv_type.h"</div><div class='add'>+#include "nv_proto.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+#include &lt;asm/backlight.h&gt;</div><div class='add'>+#include &lt;asm/machdep.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* We do not have any information about which values are allowed, thus</div><div class='add'>+ * we used safe values.</div><div class='add'>+ */</div><div class='add'>+#define MIN_LEVEL 0x158</div><div class='add'>+#define MAX_LEVEL 0x534</div><div class='add'>+#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)</div><div class='add'>+</div><div class='add'>+static struct backlight_properties nvidia_bl_data;</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int nvidia_bl_get_level_brightness(struct nvidia_par *par,</div><div class='add'>+		int level)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pci_dev);</div><div class='add'>+	int nlevel;</div><div class='add'>+</div><div class='add'>+	/* Get and convert the value */</div><div class='add'>+	nlevel = MIN_LEVEL + info-&gt;bl_curve[level] * LEVEL_STEP;</div><div class='add'>+</div><div class='add'>+	if (nlevel &lt; 0)</div><div class='add'>+		nlevel = 0;</div><div class='add'>+	else if (nlevel &lt; MIN_LEVEL)</div><div class='add'>+		nlevel = MIN_LEVEL;</div><div class='add'>+	else if (nlevel &gt; MAX_LEVEL)</div><div class='add'>+		nlevel = MAX_LEVEL;</div><div class='add'>+</div><div class='add'>+	return nlevel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int __nvidia_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct nvidia_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	u32 tmp_pcrt, tmp_pmc, fpcontrol;</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (!par-&gt;FlatPanel)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		level = 0;</div><div class='add'>+	else</div><div class='add'>+		level = bd-&gt;props-&gt;brightness;</div><div class='add'>+</div><div class='add'>+	tmp_pmc = NV_RD32(par-&gt;PMC, 0x10F0) &amp; 0x0000FFFF;</div><div class='add'>+	tmp_pcrt = NV_RD32(par-&gt;PCRTC0, 0x081C) &amp; 0xFFFFFFFC;</div><div class='add'>+	fpcontrol = NV_RD32(par-&gt;PRAMDAC, 0x0848) &amp; 0xCFFFFFCC;</div><div class='add'>+</div><div class='add'>+	if (level &gt; 0) {</div><div class='add'>+		tmp_pcrt |= 0x1;</div><div class='add'>+		tmp_pmc |= (1 &lt;&lt; 31); /* backlight bit */</div><div class='add'>+		tmp_pmc |= nvidia_bl_get_level_brightness(par, level) &lt;&lt; 16;</div><div class='add'>+		fpcontrol |= par-&gt;fpSyncs;</div><div class='add'>+	} else</div><div class='add'>+		fpcontrol |= 0x20000022;</div><div class='add'>+</div><div class='add'>+	NV_WR32(par-&gt;PCRTC0, 0x081C, tmp_pcrt);</div><div class='add'>+	NV_WR32(par-&gt;PMC, 0x10F0, tmp_pmc);</div><div class='add'>+	NV_WR32(par-&gt;PRAMDAC, 0x848, fpcontrol);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvidia_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct nvidia_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pci_dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	ret = __nvidia_bl_update_status(bd);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvidia_bl_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;props-&gt;brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties nvidia_bl_data = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.get_brightness = nvidia_bl_get_brightness,</div><div class='add'>+	.update_status	= nvidia_bl_update_status,</div><div class='add'>+	.max_brightness = (FB_BACKLIGHT_LEVELS - 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void nvidia_bl_set_power(struct fb_info *info, int power)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	up(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	info-&gt;bl_dev-&gt;props-&gt;power = power;</div><div class='add'>+	__nvidia_bl_update_status(info-&gt;bl_dev);</div><div class='add'>+	down(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nvidia_bl_init(struct nvidia_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pci_dev);</div><div class='add'>+	struct backlight_device *bd;</div><div class='add'>+	char name[12];</div><div class='add'>+</div><div class='add'>+	if (!par-&gt;FlatPanel)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	if (!machine_is(powermac) ||</div><div class='add'>+	    !pmac_has_backlight_type("mnca"))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "nvidiabl%d", info-&gt;node);</div><div class='add'>+</div><div class='add'>+	bd = backlight_device_register(name, par, &amp;nvidia_bl_data);</div><div class='add'>+	if (IS_ERR(bd)) {</div><div class='add'>+		info-&gt;bl_dev = NULL;</div><div class='add'>+		printk("nvidia: Backlight registration failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	info-&gt;bl_dev = bd;</div><div class='add'>+	fb_bl_default_curve(info, 0,</div><div class='add'>+		0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,</div><div class='add'>+		0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	up(&amp;bd-&gt;sem);</div><div class='add'>+	bd-&gt;props-&gt;brightness = nvidia_bl_data.max_brightness;</div><div class='add'>+	bd-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props-&gt;update_status(bd);</div><div class='add'>+	down(&amp;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (!pmac_backlight)</div><div class='add'>+		pmac_backlight = bd;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("nvidia: Backlight initialized (%s)\n", name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nvidia_bl_exit(struct nvidia_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pci_dev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	if (info-&gt;bl_dev) {</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+		if (pmac_backlight == info-&gt;bl_dev)</div><div class='add'>+			pmac_backlight = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		backlight_device_unregister(info-&gt;bl_dev);</div><div class='add'>+</div><div class='add'>+		printk("nvidia: Backlight unloaded\n");</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c<br/>index 99c3a8e6a237..9ed640d35728 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_hw.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_hw.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_hw.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/nv_hw.c</a></div><div class='hunk'>@@ -886,7 +886,10 @@ void NVCalcStateExt(struct nvidia_par *par,</div><div class='ctx'> 	case NV_ARCH_20:</div><div class='ctx'> 	case NV_ARCH_30:</div><div class='ctx'> 	default:</div><div class='del'>-		if (((par-&gt;Chipset &amp; 0xffff) == 0x01A0) ||</div><div class='add'>+		if ((par-&gt;Chipset &amp; 0xfff0) == 0x0240) {</div><div class='add'>+			state-&gt;arbitration0 = 256;</div><div class='add'>+			state-&gt;arbitration1 = 0x0480;</div><div class='add'>+		} else if (((par-&gt;Chipset &amp; 0xffff) == 0x01A0) ||</div><div class='ctx'> 		    ((par-&gt;Chipset &amp; 0xffff) == 0x01f0)) {</div><div class='ctx'> 			nForceUpdateArbitrationSettings(VClk,</div><div class='ctx'> 							pixelDepth * 8,</div><div class='hunk'>@@ -1235,6 +1238,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)</div><div class='ctx'> 					break;</div><div class='ctx'> 				case 0x0160:</div><div class='ctx'> 				case 0x01D0:</div><div class='add'>+				case 0x0240:</div><div class='ctx'> 					NV_WR32(par-&gt;PMC, 0x1700,</div><div class='ctx'> 						NV_RD32(par-&gt;PFB, 0x020C));</div><div class='ctx'> 					NV_WR32(par-&gt;PMC, 0x1704, 0);</div><div class='hunk'>@@ -1359,7 +1363,9 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)</div><div class='ctx'> 						if(((par-&gt;Chipset &amp; 0xfff0)</div><div class='ctx'> 						    != 0x0160) &amp;&amp;</div><div class='ctx'> 						   ((par-&gt;Chipset &amp; 0xfff0)</div><div class='del'>-						    != 0x0220))</div><div class='add'>+						    != 0x0220) &amp;&amp;</div><div class='add'>+						   ((par-&gt;Chipset &amp; 0xfff0)</div><div class='add'>+						    != 0x240))</div><div class='ctx'> 							NV_WR32(par-&gt;PGRAPH,</div><div class='ctx'> 								0x6900 + i*4,</div><div class='ctx'> 								NV_RD32(par-&gt;PFB,</div><div class='head'>diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c<br/>index 1edb1c432b75..19eef3a09023 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/nv_i2c.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c<br/>index 7a03d040b1a3..8209106e26ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_of.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_of.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_of.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/nv_of.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h<br/>index b149a690ee0f..861271017655 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_proto.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nv_proto.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nv_proto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/nv_proto.h</a></div><div class='hunk'>@@ -63,4 +63,16 @@ extern void nvidiafb_imageblit(struct fb_info *info,</div><div class='ctx'> 			       const struct fb_image *image);</div><div class='ctx'> extern int nvidiafb_sync(struct fb_info *info);</div><div class='ctx'> extern u8 byte_rev[256];</div><div class='add'>+</div><div class='add'>+/* in nv_backlight.h */</div><div class='add'>+#ifdef CONFIG_FB_NVIDIA_BACKLIGHT</div><div class='add'>+extern void nvidia_bl_init(struct nvidia_par *par);</div><div class='add'>+extern void nvidia_bl_exit(struct nvidia_par *par);</div><div class='add'>+extern void nvidia_bl_set_power(struct fb_info *info, int power);</div><div class='add'>+#else</div><div class='add'>+static inline void nvidia_bl_init(struct nvidia_par *par) {}</div><div class='add'>+static inline void nvidia_bl_exit(struct nvidia_par *par) {}</div><div class='add'>+static inline void nvidia_bl_set_power(struct fb_info *info, int power) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif				/* __NV_PROTO_H__ */</div><div class='head'>diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c<br/>index 093ab9977c7c..9f2066f0745a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nvidia.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/nvidia/nvidia.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/nvidia/nvidia.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/nvidia/nvidia.c</a></div><div class='hunk'>@@ -9,19 +9,18 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/console.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -29,10 +28,6 @@</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/pci-bridge.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#include &lt;asm/backlight.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include "nv_local.h"</div><div class='ctx'> #include "nv_type.h"</div><div class='hunk'>@@ -70,359 +65,10 @@</div><div class='ctx'> #define MAX_CURS		32</div><div class='ctx'> </div><div class='ctx'> static struct pci_device_id nvidiafb_pci_tbl[] = {</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_UTNT2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_VTNT2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_UVTNT2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_ITNT2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_SE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_460_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_410_GO_M16,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_MAC,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_280_NVS,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_380_XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_IGEFORCE2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_DDC,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_980_XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_780_XGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700_GOGL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_2000,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1000,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600SE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5600,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5650,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO700,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200SE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250_32,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_NVS_280_PCI,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_500,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5300,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5100,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900XT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5950_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_3000,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700LE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700VE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5500,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5100,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_700,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900ZT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_LE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_GT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_4000,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6600_GT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6600,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6610_XL,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_540,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_ALT1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT2,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6200_ALT1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_QUADRO_NVS280,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0252,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0313,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0316,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0317,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x031D,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x031E,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x031F,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0329,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x032F,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0345,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0349,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x034B,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x034F,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x00c0,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_6800A,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_6800A_LE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_GO_6800,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_GO_6800_ULTRA,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_QUADRO_FX_GO1400,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x00cd,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_QUADRO_FX_1400,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0142,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0143,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0144,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0145,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0146,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0147,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0148,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0149,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x014b,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x14c,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x014d,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0160,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6200_TURBOCACHE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0162,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0163,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0165,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200_1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250_1,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0169,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x016b,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x016c,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x016d,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x016e,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0210,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_LE,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_GT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_7800_GT,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_7800_GTX,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_7800,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_7800_GTX,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x021d,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x021e,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0220,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0221,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0222,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{PCI_VENDOR_ID_NVIDIA, 0x0228,</div><div class='del'>-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},</div><div class='del'>-	{0,}			/* terminate list */</div><div class='add'>+	{PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+	 PCI_BASE_CLASS_DISPLAY &lt;&lt; 16, 0xff0000, 0},</div><div class='add'>+	{ 0, }</div><div class='ctx'> };</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> /* command line data, set in nvidiafb_setup() */</div><div class='hunk'>@@ -470,75 +116,6 @@ static struct fb_var_screeninfo __devinitdata nvidiafb_default_var = {</div><div class='ctx'> 	.vmode = FB_VMODE_NONINTERLACED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Backlight control</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-</div><div class='del'>-static int nvidia_backlight_levels[] = {</div><div class='del'>-	0x158,</div><div class='del'>-	0x192,</div><div class='del'>-	0x1c6,</div><div class='del'>-	0x200,</div><div class='del'>-	0x234,</div><div class='del'>-	0x268,</div><div class='del'>-	0x2a2,</div><div class='del'>-	0x2d6,</div><div class='del'>-	0x310,</div><div class='del'>-	0x344,</div><div class='del'>-	0x378,</div><div class='del'>-	0x3b2,</div><div class='del'>-	0x3e6,</div><div class='del'>-	0x41a,</div><div class='del'>-	0x454,</div><div class='del'>-	0x534,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- *</div><div class='del'>- *</div><div class='del'>- * Backlight operations</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-static int nvidia_set_backlight_enable(int on, int level, void *data)</div><div class='del'>-{</div><div class='del'>-	struct nvidia_par *par = data;</div><div class='del'>-	u32 tmp_pcrt, tmp_pmc, fpcontrol;</div><div class='del'>-</div><div class='del'>-	tmp_pmc = NV_RD32(par-&gt;PMC, 0x10F0) &amp; 0x0000FFFF;</div><div class='del'>-	tmp_pcrt = NV_RD32(par-&gt;PCRTC0, 0x081C) &amp; 0xFFFFFFFC;</div><div class='del'>-	fpcontrol = NV_RD32(par-&gt;PRAMDAC, 0x0848) &amp; 0xCFFFFFCC;</div><div class='del'>-</div><div class='del'>-	if (on &amp;&amp; (level &gt; BACKLIGHT_OFF)) {</div><div class='del'>-		tmp_pcrt |= 0x1;</div><div class='del'>-		tmp_pmc |= (1 &lt;&lt; 31);	// backlight bit</div><div class='del'>-		tmp_pmc |= nvidia_backlight_levels[level - 1] &lt;&lt; 16;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		fpcontrol |= par-&gt;fpSyncs;</div><div class='del'>-	else</div><div class='del'>-		fpcontrol |= 0x20000022;</div><div class='del'>-</div><div class='del'>-	NV_WR32(par-&gt;PCRTC0, 0x081C, tmp_pcrt);</div><div class='del'>-	NV_WR32(par-&gt;PMC, 0x10F0, tmp_pmc);</div><div class='del'>-	NV_WR32(par-&gt;PRAMDAC, 0x848, fpcontrol);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nvidia_set_backlight_level(int level, void *data)</div><div class='del'>-{</div><div class='del'>-	return nvidia_set_backlight_enable(1, level, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct backlight_controller nvidia_backlight_controller = {</div><div class='del'>-	nvidia_set_backlight_enable,</div><div class='del'>-	nvidia_set_backlight_level</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif				/* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='ctx'> static void nvidiafb_load_cursor_image(struct nvidia_par *par, u8 * data8,</div><div class='ctx'> 				       u16 bg, u16 fg, u32 w, u32 h)</div><div class='ctx'> {</div><div class='hunk'>@@ -1355,11 +932,7 @@ static int nvidiafb_blank(int blank, struct fb_info *info)</div><div class='ctx'> 	NVWriteSeq(par, 0x01, tmp);</div><div class='ctx'> 	NVWriteCrtc(par, 0x1a, vesa);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	if (par-&gt;FlatPanel &amp;&amp; machine_is(powermac)) {</div><div class='del'>-		set_backlight_enable(!blank);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	nvidia_bl_set_power(info, blank);</div><div class='ctx'> </div><div class='ctx'> 	NVTRACE_LEAVE();</div><div class='ctx'> </div><div class='hunk'>@@ -1532,10 +1105,10 @@ static u32 __devinit nvidia_get_chipset(struct fb_info *info)</div><div class='ctx'> 	struct nvidia_par *par = info-&gt;par;</div><div class='ctx'> 	u32 id = (par-&gt;pci_dev-&gt;vendor &lt;&lt; 16) | par-&gt;pci_dev-&gt;device;</div><div class='ctx'> </div><div class='del'>-	printk("nvidiafb: PCI id - %x\n", id);</div><div class='add'>+	printk(KERN_INFO PFX "Device ID: %x \n", id);</div><div class='add'>+</div><div class='ctx'> 	if ((id &amp; 0xfff0) == 0x00f0) {</div><div class='ctx'> 		/* pci-e */</div><div class='del'>-		printk("nvidiafb: PCI-E card\n");</div><div class='ctx'> 		id = NV_RD32(par-&gt;REGS, 0x1800);</div><div class='ctx'> </div><div class='ctx'> 		if ((id &amp; 0x0000ffff) == 0x000010DE)</div><div class='hunk'>@@ -1543,9 +1116,9 @@ static u32 __devinit nvidia_get_chipset(struct fb_info *info)</div><div class='ctx'> 		else if ((id &amp; 0xffff0000) == 0xDE100000) /* wrong endian */</div><div class='ctx'> 			id = 0x10DE0000 | ((id &lt;&lt; 8) &amp; 0x0000ff00) |</div><div class='ctx'>                             ((id &gt;&gt; 8) &amp; 0x000000ff);</div><div class='add'>+		printk(KERN_INFO PFX "Subsystem ID: %x \n", id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk("nvidiafb: Actual id - %x\n", id);</div><div class='ctx'> 	return id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1587,6 +1160,7 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)</div><div class='ctx'> 	case 0x0210:</div><div class='ctx'> 	case 0x0220:</div><div class='ctx'> 	case 0x0230:</div><div class='add'>+	case 0x0240:</div><div class='ctx'> 	case 0x0290:</div><div class='ctx'> 	case 0x0390:</div><div class='ctx'> 		arch = NV_ARCH_40;</div><div class='hunk'>@@ -1634,7 +1208,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,</div><div class='ctx'> </div><div class='ctx'> 	if (pci_request_regions(pd, "nvidiafb")) {</div><div class='ctx'> 		printk(KERN_ERR PFX "cannot request PCI regions\n");</div><div class='del'>-		goto err_out_request;</div><div class='add'>+		goto err_out_enable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	par-&gt;FlatPanel = flatpanel;</div><div class='hunk'>@@ -1663,7 +1237,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	par-&gt;Chipset = nvidia_get_chipset(info);</div><div class='del'>-	printk(KERN_INFO PFX "nVidia device/chipset %X\n", par-&gt;Chipset);</div><div class='ctx'> 	par-&gt;Architecture = nvidia_get_arch(info);</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;Architecture == 0) {</div><div class='hunk'>@@ -1741,11 +1314,9 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,</div><div class='ctx'> 	       "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",</div><div class='ctx'> 	       info-&gt;fix.id,</div><div class='ctx'> 	       par-&gt;FbMapSize / (1024 * 1024), info-&gt;fix.smem_start);</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	if (par-&gt;FlatPanel &amp;&amp; machine_is(powermac))</div><div class='del'>-		register_backlight_controller(&amp;nvidia_backlight_controller,</div><div class='del'>-					      par, "mnca");</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	nvidia_bl_init(par);</div><div class='add'>+</div><div class='ctx'> 	NVTRACE_LEAVE();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1756,10 +1327,8 @@ err_out_free_base1:</div><div class='ctx'> 	nvidia_delete_i2c_busses(par);</div><div class='ctx'> err_out_arch:</div><div class='ctx'> 	iounmap(par-&gt;REGS);</div><div class='del'>-err_out_free_base0:</div><div class='add'>+ err_out_free_base0:</div><div class='ctx'> 	pci_release_regions(pd);</div><div class='del'>-err_out_request:</div><div class='del'>-	pci_disable_device(pd);</div><div class='ctx'> err_out_enable:</div><div class='ctx'> 	kfree(info-&gt;pixmap.addr);</div><div class='ctx'> err_out_kfree:</div><div class='hunk'>@@ -1775,6 +1344,8 @@ static void __exit nvidiafb_remove(struct pci_dev *pd)</div><div class='ctx'> </div><div class='ctx'> 	NVTRACE_ENTER();</div><div class='ctx'> </div><div class='add'>+	nvidia_bl_exit(par);</div><div class='add'>+</div><div class='ctx'> 	unregister_framebuffer(info);</div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='ctx'> 	if (par-&gt;mtrr.vram_valid)</div><div class='hunk'>@@ -1787,7 +1358,6 @@ static void __exit nvidiafb_remove(struct pci_dev *pd)</div><div class='ctx'> 	nvidia_delete_i2c_busses(par);</div><div class='ctx'> 	iounmap(par-&gt;REGS);</div><div class='ctx'> 	pci_release_regions(pd);</div><div class='del'>-	pci_disable_device(pd);</div><div class='ctx'> 	kfree(info-&gt;pixmap.addr);</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> 	pci_set_drvdata(pd, NULL);</div><div class='head'>diff --git a/drivers/video/offb.c b/drivers/video/offb.c<br/>index ad1434e3f227..ce5f3031b99b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/offb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/offb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/offb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/offb.c</a></div><div class='hunk'>@@ -12,13 +12,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -98,14 +96,43 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,</div><div class='ctx'> 			  u_int transp, struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct offb_par *par = (struct offb_par *) info-&gt;par;</div><div class='add'>+	int i, depth;</div><div class='add'>+	u32 *pal = info-&gt;pseudo_palette;</div><div class='ctx'> </div><div class='del'>-	if (!par-&gt;cmap_adr || regno &gt; 255)</div><div class='add'>+	depth = info-&gt;var.bits_per_pixel;</div><div class='add'>+	if (depth == 16)</div><div class='add'>+		depth = (info-&gt;var.green.length == 5) ? 15 : 16;</div><div class='add'>+</div><div class='add'>+	if (regno &gt; 255 ||</div><div class='add'>+	    (depth == 16 &amp;&amp; regno &gt; 63) ||</div><div class='add'>+	    (depth == 15 &amp;&amp; regno &gt; 31))</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	if (regno &lt; 16) {</div><div class='add'>+		switch (depth) {</div><div class='add'>+		case 15:</div><div class='add'>+			pal[regno] = (regno &lt;&lt; 10) | (regno &lt;&lt; 5) | regno;</div><div class='add'>+			break;</div><div class='add'>+		case 16:</div><div class='add'>+			pal[regno] = (regno &lt;&lt; 11) | (regno &lt;&lt; 5) | regno;</div><div class='add'>+			break;</div><div class='add'>+		case 24:</div><div class='add'>+			pal[regno] = (regno &lt;&lt; 16) | (regno &lt;&lt; 8) | regno;</div><div class='add'>+			break;</div><div class='add'>+		case 32:</div><div class='add'>+			i = (regno &lt;&lt; 8) | regno;</div><div class='add'>+			pal[regno] = (i &lt;&lt; 16) | i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	red &gt;&gt;= 8;</div><div class='ctx'> 	green &gt;&gt;= 8;</div><div class='ctx'> 	blue &gt;&gt;= 8;</div><div class='ctx'> </div><div class='add'>+	if (!par-&gt;cmap_adr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	switch (par-&gt;cmap_type) {</div><div class='ctx'> 	case cmap_m64:</div><div class='ctx'> 		writeb(regno, par-&gt;cmap_adr);</div><div class='hunk'>@@ -142,20 +169,6 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (regno &lt; 16)</div><div class='del'>-		switch (info-&gt;var.bits_per_pixel) {</div><div class='del'>-		case 16:</div><div class='del'>-			((u16 *) (info-&gt;pseudo_palette))[regno] =</div><div class='del'>-			    (regno &lt;&lt; 10) | (regno &lt;&lt; 5) | regno;</div><div class='del'>-			break;</div><div class='del'>-		case 32:</div><div class='del'>-			{</div><div class='del'>-				int i = (regno &lt;&lt; 8) | regno;</div><div class='del'>-				((u32 *) (info-&gt;pseudo_palette))[regno] =</div><div class='del'>-				    (i &lt;&lt; 16) | i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -224,81 +237,9 @@ int __init offb_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dp = NULL, *boot_disp = NULL;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BOOTX_TEXT) &amp;&amp; defined(CONFIG_PPC32)</div><div class='del'>-	struct device_node *macos_display = NULL;</div><div class='del'>-#endif</div><div class='ctx'> 	if (fb_get_options("offb", NULL))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_BOOTX_TEXT) &amp;&amp; defined(CONFIG_PPC32)</div><div class='del'>-	/* If we're booted from BootX... */</div><div class='del'>-	if (boot_infos != 0) {</div><div class='del'>-		unsigned long addr =</div><div class='del'>-		    (unsigned long) boot_infos-&gt;dispDeviceBase;</div><div class='del'>-		u32 *addrp;</div><div class='del'>-		u64 daddr, dsize;</div><div class='del'>-		unsigned int flags;</div><div class='del'>-</div><div class='del'>-		/* find the device node corresponding to the macos display */</div><div class='del'>-		while ((dp = of_find_node_by_type(dp, "display"))) {</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Look for an AAPL,address property first.</div><div class='del'>-			 */</div><div class='del'>-			unsigned int na;</div><div class='del'>-			unsigned int *ap =</div><div class='del'>-				(unsigned int *)get_property(dp, "AAPL,address",</div><div class='del'>-							     &amp;na);</div><div class='del'>-			if (ap != 0) {</div><div class='del'>-				for (na /= sizeof(unsigned int); na &gt; 0;</div><div class='del'>-				     --na, ++ap)</div><div class='del'>-					if (*ap &lt;= addr &amp;&amp;</div><div class='del'>-					    addr &lt; *ap + 0x1000000) {</div><div class='del'>-						macos_display = dp;</div><div class='del'>-						goto foundit;</div><div class='del'>-					}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * See if the display address is in one of the address</div><div class='del'>-			 * ranges for this display.</div><div class='del'>-			 */</div><div class='del'>-			i = 0;</div><div class='del'>-			for (;;) {</div><div class='del'>-				addrp = of_get_address(dp, i++, &amp;dsize, &amp;flags);</div><div class='del'>-				if (addrp == NULL)</div><div class='del'>-					break;</div><div class='del'>-				if (!(flags &amp; IORESOURCE_MEM))</div><div class='del'>-					continue;</div><div class='del'>-				daddr = of_translate_address(dp, addrp);</div><div class='del'>-				if (daddr == OF_BAD_ADDR)</div><div class='del'>-					continue;</div><div class='del'>-				if (daddr &lt;= addr &amp;&amp; addr &lt; (daddr + dsize)) {</div><div class='del'>-					macos_display = dp;</div><div class='del'>-					goto foundit;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		foundit:</div><div class='del'>-			if (macos_display) {</div><div class='del'>-				printk(KERN_INFO "MacOS display is %s\n",</div><div class='del'>-				       dp-&gt;full_name);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* initialize it */</div><div class='del'>-		offb_init_fb(macos_display ? macos_display-&gt;</div><div class='del'>-			     name : "MacOS display",</div><div class='del'>-			     macos_display ? macos_display-&gt;</div><div class='del'>-			     full_name : "MacOS display",</div><div class='del'>-			     boot_infos-&gt;dispDeviceRect[2],</div><div class='del'>-			     boot_infos-&gt;dispDeviceRect[3],</div><div class='del'>-			     boot_infos-&gt;dispDeviceDepth,</div><div class='del'>-			     boot_infos-&gt;dispDeviceRowBytes, addr, NULL);</div><div class='del'>-	}</div><div class='del'>-#endif /* defined(CONFIG_BOOTX_TEXT) &amp;&amp; defined(CONFIG_PPC32) */</div><div class='del'>-</div><div class='ctx'> 	for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {</div><div class='ctx'> 		if (get_property(dp, "linux,opened", NULL) &amp;&amp;</div><div class='ctx'> 		    get_property(dp, "linux,boot-display", NULL)) {</div><div class='hunk'>@@ -318,94 +259,93 @@ int __init offb_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __init offb_init_nodriver(struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	int *pp, i;</div><div class='ctx'> 	unsigned int len;</div><div class='del'>-	int width = 640, height = 480, depth = 8, pitch;</div><div class='del'>-	unsigned int flags, rsize, *up;</div><div class='del'>-	u64 address = OF_BAD_ADDR;</div><div class='del'>-	u32 *addrp;</div><div class='add'>+	int i, width = 640, height = 480, depth = 8, pitch = 640;</div><div class='add'>+	unsigned int flags, rsize, addr_prop = 0;</div><div class='add'>+	unsigned long max_size = 0;</div><div class='add'>+	u64 rstart, address = OF_BAD_ADDR;</div><div class='add'>+	u32 *pp, *addrp, *up;</div><div class='ctx'> 	u64 asize;</div><div class='ctx'> </div><div class='del'>-	if ((pp = (int *) get_property(dp, "depth", &amp;len)) != NULL</div><div class='del'>-	    &amp;&amp; len == sizeof(int))</div><div class='add'>+	pp = (u32 *)get_property(dp, "linux,bootx-depth", &amp;len);</div><div class='add'>+	if (pp == NULL)</div><div class='add'>+		pp = (u32 *)get_property(dp, "depth", &amp;len);</div><div class='add'>+	if (pp &amp;&amp; len == sizeof(u32))</div><div class='ctx'> 		depth = *pp;</div><div class='del'>-	if ((pp = (int *) get_property(dp, "width", &amp;len)) != NULL</div><div class='del'>-	    &amp;&amp; len == sizeof(int))</div><div class='add'>+</div><div class='add'>+	pp = (u32 *)get_property(dp, "linux,bootx-width", &amp;len);</div><div class='add'>+	if (pp == NULL)</div><div class='add'>+		pp = (u32 *)get_property(dp, "width", &amp;len);</div><div class='add'>+	if (pp &amp;&amp; len == sizeof(u32))</div><div class='ctx'> 		width = *pp;</div><div class='del'>-	if ((pp = (int *) get_property(dp, "height", &amp;len)) != NULL</div><div class='del'>-	    &amp;&amp; len == sizeof(int))</div><div class='add'>+</div><div class='add'>+	pp = (u32 *)get_property(dp, "linux,bootx-height", &amp;len);</div><div class='add'>+	if (pp == NULL)</div><div class='add'>+		pp = (u32 *)get_property(dp, "height", &amp;len);</div><div class='add'>+	if (pp &amp;&amp; len == sizeof(u32))</div><div class='ctx'> 		height = *pp;</div><div class='del'>-	if ((pp = (int *) get_property(dp, "linebytes", &amp;len)) != NULL</div><div class='del'>-	    &amp;&amp; len == sizeof(int)) {</div><div class='add'>+</div><div class='add'>+	pp = (u32 *)get_property(dp, "linux,bootx-linebytes", &amp;len);</div><div class='add'>+	if (pp == NULL)</div><div class='add'>+		pp = (u32 *)get_property(dp, "linebytes", &amp;len);</div><div class='add'>+	if (pp &amp;&amp; len == sizeof(u32))</div><div class='ctx'> 		pitch = *pp;</div><div class='del'>-		if (pitch == 1)</div><div class='del'>-			pitch = 0x1000;</div><div class='del'>-	} else</div><div class='del'>-		pitch = width;</div><div class='del'>-</div><div class='del'>-       rsize = (unsigned long)pitch * (unsigned long)height *</div><div class='del'>-               (unsigned long)(depth / 8);</div><div class='del'>-</div><div class='del'>-       /* Try to match device to a PCI device in order to get a properly</div><div class='del'>-	* translated address rather then trying to decode the open firmware</div><div class='del'>-	* stuff in various incorrect ways</div><div class='del'>-	*/</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-       /* First try to locate the PCI device if any */</div><div class='del'>-       {</div><div class='del'>-               struct pci_dev *pdev = NULL;</div><div class='del'>-</div><div class='del'>-	       for_each_pci_dev(pdev) {</div><div class='del'>-                       if (dp == pci_device_to_OF_node(pdev))</div><div class='del'>-                               break;</div><div class='del'>-	       }</div><div class='del'>-               if (pdev) {</div><div class='del'>-                       for (i = 0; i &lt; 6 &amp;&amp; address == OF_BAD_ADDR; i++) {</div><div class='del'>-                               if ((pci_resource_flags(pdev, i) &amp;</div><div class='del'>-				    IORESOURCE_MEM) &amp;&amp;</div><div class='del'>-				   (pci_resource_len(pdev, i) &gt;= rsize))</div><div class='del'>-                                       address = pci_resource_start(pdev, i);</div><div class='del'>-                       }</div><div class='del'>-		       pci_dev_put(pdev);</div><div class='del'>-               }</div><div class='del'>-        }</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='del'>-</div><div class='del'>-       /* This one is dodgy, we may drop it ... */</div><div class='del'>-       if (address == OF_BAD_ADDR &amp;&amp;</div><div class='del'>-	   (up = (unsigned *) get_property(dp, "address", &amp;len)) != NULL &amp;&amp;</div><div class='del'>-	   len == sizeof(unsigned int))</div><div class='del'>-	       address = (u64) * up;</div><div class='del'>-</div><div class='del'>-       if (address == OF_BAD_ADDR) {</div><div class='del'>-	       for (i = 0; (addrp = of_get_address(dp, i, &amp;asize, &amp;flags))</div><div class='del'>-			    != NULL; i++) {</div><div class='del'>-		       if (!(flags &amp; IORESOURCE_MEM))</div><div class='del'>-			       continue;</div><div class='del'>-		       if (asize &gt;= pitch * height * depth / 8)</div><div class='del'>-			       break;</div><div class='del'>-	       }</div><div class='del'>-		if (addrp == NULL) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "no framebuffer address found for %s\n",</div><div class='del'>-			       dp-&gt;full_name);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		address = of_translate_address(dp, addrp);</div><div class='del'>-		if (address == OF_BAD_ADDR) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "can't translate framebuffer address for %s\n",</div><div class='del'>-			       dp-&gt;full_name);</div><div class='del'>-			return;</div><div class='add'>+	else</div><div class='add'>+		pitch = width * ((depth + 7) / 8);</div><div class='add'>+</div><div class='add'>+	rsize = (unsigned long)pitch * (unsigned long)height;</div><div class='add'>+</div><div class='add'>+	/* Ok, now we try to figure out the address of the framebuffer.</div><div class='add'>+	 *</div><div class='add'>+	 * Unfortunately, Open Firmware doesn't provide a standard way to do</div><div class='add'>+	 * so. All we can do is a dodgy heuristic that happens to work in</div><div class='add'>+	 * practice. On most machines, the "address" property contains what</div><div class='add'>+	 * we need, though not on Matrox cards found in IBM machines. What I've</div><div class='add'>+	 * found that appears to give good results is to go through the PCI</div><div class='add'>+	 * ranges and pick one that is both big enough and if possible encloses</div><div class='add'>+	 * the "address" property. If none match, we pick the biggest</div><div class='add'>+	 */</div><div class='add'>+	up = (u32 *)get_property(dp, "linux,bootx-addr", &amp;len);</div><div class='add'>+	if (up == NULL)</div><div class='add'>+		up = (u32 *)get_property(dp, "address", &amp;len);</div><div class='add'>+	if (up &amp;&amp; len == sizeof(u32))</div><div class='add'>+		addr_prop = *up;</div><div class='add'>+</div><div class='add'>+	for (i = 0; (addrp = of_get_address(dp, i, &amp;asize, &amp;flags))</div><div class='add'>+		     != NULL; i++) {</div><div class='add'>+		int match_addrp = 0;</div><div class='add'>+</div><div class='add'>+		if (!(flags &amp; IORESOURCE_MEM))</div><div class='add'>+			continue;</div><div class='add'>+		if (asize &lt; rsize)</div><div class='add'>+			continue;</div><div class='add'>+		rstart = of_translate_address(dp, addrp);</div><div class='add'>+		if (rstart == OF_BAD_ADDR)</div><div class='add'>+			continue;</div><div class='add'>+		if (addr_prop &amp;&amp; (rstart &lt;= addr_prop) &amp;&amp;</div><div class='add'>+		    ((rstart + asize) &gt;= (addr_prop + rsize)))</div><div class='add'>+			match_addrp = 1;</div><div class='add'>+		if (match_addrp) {</div><div class='add'>+			address = addr_prop;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='add'>+		if (rsize &gt; max_size) {</div><div class='add'>+			max_size = rsize;</div><div class='add'>+			address = OF_BAD_ADDR;</div><div class='add'>+ 		}</div><div class='ctx'> </div><div class='add'>+		if (address == OF_BAD_ADDR)</div><div class='add'>+			address = rstart;</div><div class='add'>+	}</div><div class='add'>+	if (address == OF_BAD_ADDR &amp;&amp; addr_prop)</div><div class='add'>+		address = (u64)addr_prop;</div><div class='add'>+	if (address != OF_BAD_ADDR) {</div><div class='ctx'> 		/* kludge for valkyrie */</div><div class='ctx'> 		if (strcmp(dp-&gt;name, "valkyrie") == 0)</div><div class='ctx'> 			address += 0x1000;</div><div class='add'>+		offb_init_fb(dp-&gt;name, dp-&gt;full_name, width, height, depth,</div><div class='add'>+			     pitch, address, dp);</div><div class='ctx'> 	}</div><div class='del'>-	offb_init_fb(dp-&gt;name, dp-&gt;full_name, width, height, depth,</div><div class='del'>-		     pitch, address, dp);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __init offb_init_fb(const char *name, const char *full_name,</div><div class='hunk'>@@ -413,7 +353,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,</div><div class='ctx'> 				int pitch, unsigned long address,</div><div class='ctx'> 				struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long res_size = pitch * height * depth / 8;</div><div class='add'>+	unsigned long res_size = pitch * height * (depth + 7) / 8;</div><div class='ctx'> 	struct offb_par *par = &amp;default_par;</div><div class='ctx'> 	unsigned long res_start = address;</div><div class='ctx'> 	struct fb_fix_screeninfo *fix;</div><div class='hunk'>@@ -427,7 +367,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,</div><div class='ctx'> 	printk(KERN_INFO</div><div class='ctx'> 	       "Using unsupported %dx%d %s at %lx, depth=%d, pitch=%d\n",</div><div class='ctx'> 	       width, height, name, address, depth, pitch);</div><div class='del'>-	if (depth != 8 &amp;&amp; depth != 16 &amp;&amp; depth != 32) {</div><div class='add'>+	if (depth != 8 &amp;&amp; depth != 15 &amp;&amp; depth != 16 &amp;&amp; depth != 32) {</div><div class='ctx'> 		printk(KERN_ERR "%s: can't use depth = %d\n", full_name,</div><div class='ctx'> 		       depth);</div><div class='ctx'> 		release_mem_region(res_start, res_size);</div><div class='hunk'>@@ -503,7 +443,6 @@ static void __init offb_init_fb(const char *name, const char *full_name,</div><div class='ctx'> 				   : */ FB_VISUAL_TRUECOLOR;</div><div class='ctx'> </div><div class='ctx'> 	var-&gt;xoffset = var-&gt;yoffset = 0;</div><div class='del'>-	var-&gt;bits_per_pixel = depth;</div><div class='ctx'> 	switch (depth) {</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		var-&gt;bits_per_pixel = 8;</div><div class='hunk'>@@ -516,7 +455,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,</div><div class='ctx'> 		var-&gt;transp.offset = 0;</div><div class='ctx'> 		var-&gt;transp.length = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case 16:		/* RGB 555 */</div><div class='add'>+	case 15:		/* RGB 555 */</div><div class='ctx'> 		var-&gt;bits_per_pixel = 16;</div><div class='ctx'> 		var-&gt;red.offset = 10;</div><div class='ctx'> 		var-&gt;red.length = 5;</div><div class='hunk'>@@ -527,6 +466,17 @@ static void __init offb_init_fb(const char *name, const char *full_name,</div><div class='ctx'> 		var-&gt;transp.offset = 0;</div><div class='ctx'> 		var-&gt;transp.length = 0;</div><div class='ctx'> 		break;</div><div class='add'>+	case 16:		/* RGB 565 */</div><div class='add'>+		var-&gt;bits_per_pixel = 16;</div><div class='add'>+		var-&gt;red.offset = 11;</div><div class='add'>+		var-&gt;red.length = 5;</div><div class='add'>+		var-&gt;green.offset = 5;</div><div class='add'>+		var-&gt;green.length = 6;</div><div class='add'>+		var-&gt;blue.offset = 0;</div><div class='add'>+		var-&gt;blue.length = 5;</div><div class='add'>+		var-&gt;transp.offset = 0;</div><div class='add'>+		var-&gt;transp.length = 0;</div><div class='add'>+		break;</div><div class='ctx'> 	case 32:		/* RGB 888 */</div><div class='ctx'> 		var-&gt;bits_per_pixel = 32;</div><div class='ctx'> 		var-&gt;red.offset = 16;</div><div class='head'>diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c<br/>index 0d1957505359..56ac51d6a7f3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/p9100.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/p9100.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/p9100.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/p9100.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* p9100.c: P9100 frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright 1999 Derrick J Brashear (shadow@dementia.org)</div><div class='ctx'>  *</div><div class='ctx'>  * Driver layout based loosely on tgafb.c, see that file for credits.</div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -72,60 +72,60 @@ static struct fb_ops p9100_ops = {</div><div class='ctx'> </div><div class='ctx'> struct p9100_regs {</div><div class='ctx'> 	/* Registers for the system control */</div><div class='del'>-	volatile u32 sys_base;</div><div class='del'>-	volatile u32 sys_config;</div><div class='del'>-	volatile u32 sys_intr;</div><div class='del'>-	volatile u32 sys_int_ena;</div><div class='del'>-	volatile u32 sys_alt_rd;</div><div class='del'>-	volatile u32 sys_alt_wr;</div><div class='del'>-	volatile u32 sys_xxx[58];</div><div class='add'>+	u32 sys_base;</div><div class='add'>+	u32 sys_config;</div><div class='add'>+	u32 sys_intr;</div><div class='add'>+	u32 sys_int_ena;</div><div class='add'>+	u32 sys_alt_rd;</div><div class='add'>+	u32 sys_alt_wr;</div><div class='add'>+	u32 sys_xxx[58];</div><div class='ctx'> </div><div class='ctx'> 	/* Registers for the video control */</div><div class='del'>-	volatile u32 vid_base;</div><div class='del'>-	volatile u32 vid_hcnt;</div><div class='del'>-	volatile u32 vid_htotal;</div><div class='del'>-	volatile u32 vid_hsync_rise;</div><div class='del'>-	volatile u32 vid_hblank_rise;</div><div class='del'>-	volatile u32 vid_hblank_fall;</div><div class='del'>-	volatile u32 vid_hcnt_preload;</div><div class='del'>-	volatile u32 vid_vcnt;</div><div class='del'>-	volatile u32 vid_vlen;</div><div class='del'>-	volatile u32 vid_vsync_rise;</div><div class='del'>-	volatile u32 vid_vblank_rise;</div><div class='del'>-	volatile u32 vid_vblank_fall;</div><div class='del'>-	volatile u32 vid_vcnt_preload;</div><div class='del'>-	volatile u32 vid_screenpaint_addr;</div><div class='del'>-	volatile u32 vid_screenpaint_timectl1;</div><div class='del'>-	volatile u32 vid_screenpaint_qsfcnt;</div><div class='del'>-	volatile u32 vid_screenpaint_timectl2;</div><div class='del'>-	volatile u32 vid_xxx[15];</div><div class='add'>+	u32 vid_base;</div><div class='add'>+	u32 vid_hcnt;</div><div class='add'>+	u32 vid_htotal;</div><div class='add'>+	u32 vid_hsync_rise;</div><div class='add'>+	u32 vid_hblank_rise;</div><div class='add'>+	u32 vid_hblank_fall;</div><div class='add'>+	u32 vid_hcnt_preload;</div><div class='add'>+	u32 vid_vcnt;</div><div class='add'>+	u32 vid_vlen;</div><div class='add'>+	u32 vid_vsync_rise;</div><div class='add'>+	u32 vid_vblank_rise;</div><div class='add'>+	u32 vid_vblank_fall;</div><div class='add'>+	u32 vid_vcnt_preload;</div><div class='add'>+	u32 vid_screenpaint_addr;</div><div class='add'>+	u32 vid_screenpaint_timectl1;</div><div class='add'>+	u32 vid_screenpaint_qsfcnt;</div><div class='add'>+	u32 vid_screenpaint_timectl2;</div><div class='add'>+	u32 vid_xxx[15];</div><div class='ctx'> </div><div class='ctx'> 	/* Registers for the video control */</div><div class='del'>-	volatile u32 vram_base;</div><div class='del'>-	volatile u32 vram_memcfg;</div><div class='del'>-	volatile u32 vram_refresh_pd;</div><div class='del'>-	volatile u32 vram_refresh_cnt;</div><div class='del'>-	volatile u32 vram_raslo_max;</div><div class='del'>-	volatile u32 vram_raslo_cur;</div><div class='del'>-	volatile u32 pwrup_cfg;</div><div class='del'>-	volatile u32 vram_xxx[25];</div><div class='add'>+	u32 vram_base;</div><div class='add'>+	u32 vram_memcfg;</div><div class='add'>+	u32 vram_refresh_pd;</div><div class='add'>+	u32 vram_refresh_cnt;</div><div class='add'>+	u32 vram_raslo_max;</div><div class='add'>+	u32 vram_raslo_cur;</div><div class='add'>+	u32 pwrup_cfg;</div><div class='add'>+	u32 vram_xxx[25];</div><div class='ctx'> </div><div class='ctx'> 	/* Registers for IBM RGB528 Palette */</div><div class='del'>-	volatile u32 ramdac_cmap_wridx; </div><div class='del'>-	volatile u32 ramdac_palette_data;</div><div class='del'>-	volatile u32 ramdac_pixel_mask;</div><div class='del'>-	volatile u32 ramdac_palette_rdaddr;</div><div class='del'>-	volatile u32 ramdac_idx_lo;</div><div class='del'>-	volatile u32 ramdac_idx_hi;</div><div class='del'>-	volatile u32 ramdac_idx_data;</div><div class='del'>-	volatile u32 ramdac_idx_ctl;</div><div class='del'>-	volatile u32 ramdac_xxx[1784];</div><div class='add'>+	u32 ramdac_cmap_wridx; </div><div class='add'>+	u32 ramdac_palette_data;</div><div class='add'>+	u32 ramdac_pixel_mask;</div><div class='add'>+	u32 ramdac_palette_rdaddr;</div><div class='add'>+	u32 ramdac_idx_lo;</div><div class='add'>+	u32 ramdac_idx_hi;</div><div class='add'>+	u32 ramdac_idx_data;</div><div class='add'>+	u32 ramdac_idx_ctl;</div><div class='add'>+	u32 ramdac_xxx[1784];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct p9100_cmd_parameng {</div><div class='del'>-	volatile u32 parameng_status;</div><div class='del'>-	volatile u32 parameng_bltcmd;</div><div class='del'>-	volatile u32 parameng_quadcmd;</div><div class='add'>+	u32 parameng_status;</div><div class='add'>+	u32 parameng_bltcmd;</div><div class='add'>+	u32 parameng_quadcmd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct p9100_par {</div><div class='hunk'>@@ -136,9 +136,8 @@ struct p9100_par {</div><div class='ctx'> #define P9100_FLAG_BLANKED	0x00000001</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		physbase;</div><div class='add'>+	unsigned long		which_io;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='del'>-</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -227,8 +226,7 @@ static int p9100_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return sbusfb_mmap_helper(p9100_mmap_map,</div><div class='ctx'> 				  par-&gt;physbase, par-&gt;fbsize,</div><div class='del'>-				  par-&gt;sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-				  vma);</div><div class='add'>+				  par-&gt;which_io, vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int p9100_ioctl(struct fb_info *info, unsigned int cmd,</div><div class='hunk'>@@ -245,12 +243,9 @@ static int p9100_ioctl(struct fb_info *info, unsigned int cmd,</div><div class='ctx'>  *  Initialisation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-p9100_init_fix(struct fb_info *info, int linebytes)</div><div class='add'>+static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)</div><div class='ctx'> {</div><div class='del'>-	struct p9100_par *par = (struct p9100_par *)info-&gt;par;</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;fix.id, par-&gt;sdev-&gt;prom_name, sizeof(info-&gt;fix.id));</div><div class='add'>+	strlcpy(info-&gt;fix.id, dp-&gt;name, sizeof(info-&gt;fix.id));</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.type = FB_TYPE_PACKED_PIXELS;</div><div class='ctx'> 	info-&gt;fix.visual = FB_VISUAL_PSEUDOCOLOR;</div><div class='hunk'>@@ -263,121 +258,137 @@ p9100_init_fix(struct fb_info *info, int linebytes)</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct p9100_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(p9100_list);</div><div class='ctx'> </div><div class='del'>-static void p9100_init_one(struct sbus_dev *sdev)</div><div class='add'>+static int __devinit p9100_init_one(struct of_device *op)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='ctx'> 	struct all_info *all;</div><div class='del'>-	int linebytes;</div><div class='del'>-</div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "p9100: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='add'>+	int linebytes, err;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='ctx'> </div><div class='ctx'> 	/* This is the framebuffer and the only resource apps can mmap.  */</div><div class='del'>-	all-&gt;par.physbase = sdev-&gt;reg_addrs[2].phys_addr;</div><div class='add'>+	all-&gt;par.physbase = op-&gt;resource[2].start;</div><div class='add'>+	all-&gt;par.which_io = op-&gt;resource[2].flags &amp; IORESOURCE_BITS;</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, sdev-&gt;prom_node, 8);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 8);</div><div class='ctx'> 	all-&gt;info.var.red.length = 8;</div><div class='ctx'> 	all-&gt;info.var.green.length = 8;</div><div class='ctx'> 	all-&gt;info.var.blue.length = 8;</div><div class='ctx'> </div><div class='del'>-	linebytes = prom_getintdefault(sdev-&gt;prom_node, "linebytes",</div><div class='del'>-				       all-&gt;info.var.xres);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.regs = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-			     sizeof(struct p9100_regs), "p9100 regs");</div><div class='add'>+	all-&gt;par.regs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+				   sizeof(struct p9100_regs), "p9100 regs");</div><div class='add'>+	if (!all-&gt;par.regs) {</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.flags = FBINFO_DEFAULT;</div><div class='ctx'> 	all-&gt;info.fbops = &amp;p9100_ops;</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	all-&gt;info.screen_base = (char __iomem *)</div><div class='del'>-		prom_getintdefault(sdev-&gt;prom_node, "address", 0);</div><div class='del'>-#endif</div><div class='del'>-	if (!all-&gt;info.screen_base)</div><div class='del'>-		all-&gt;info.screen_base = sbus_ioremap(&amp;sdev-&gt;resource[2], 0,</div><div class='del'>-				     all-&gt;par.fbsize, "p9100 ram");</div><div class='add'>+	all-&gt;info.screen_base = of_ioremap(&amp;op-&gt;resource[2], 0,</div><div class='add'>+					   all-&gt;par.fbsize, "p9100 ram");</div><div class='add'>+	if (!all-&gt;info.screen_base) {</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct p9100_regs));</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	all-&gt;info.par = &amp;all-&gt;par;</div><div class='ctx'> </div><div class='ctx'> 	p9100_blank(0, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='del'>-		printk(KERN_ERR "p9100: Could not allocate color map.\n");</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct p9100_regs));</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	p9100_init_fix(&amp;all-&gt;info, linebytes);</div><div class='add'>+	p9100_init_fix(&amp;all-&gt;info, linebytes, dp);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "p9100: Could not register framebuffer.\n");</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+		of_iounmap(all-&gt;par.regs, sizeof(struct p9100_regs));</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	fb_set_cmap(&amp;all-&gt;info.cmap, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;p9100_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='add'>+</div><div class='add'>+	printk("%s: p9100 at %lx:%lx\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='add'>+	       all-&gt;par.which_io, all-&gt;par.physbase);</div><div class='ctx'> </div><div class='del'>-	printk("p9100: %s at %lx:%lx\n",</div><div class='del'>-	       sdev-&gt;prom_name,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].phys_addr);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init p9100_init(void)</div><div class='add'>+static int __devinit p9100_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("p9100fb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return p9100_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "p9100"))</div><div class='del'>-			p9100_init_one(sdev);</div><div class='del'>-	}</div><div class='add'>+static int __devexit p9100_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+</div><div class='add'>+	of_iounmap(all-&gt;par.regs, sizeof(struct p9100_regs));</div><div class='add'>+	of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit p9100_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id p9100_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "p9100",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, p9100_match);</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;p9100_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static struct of_platform_driver p9100_driver = {</div><div class='add'>+	.name		= "p9100",</div><div class='add'>+	.match_table	= p9100_match,</div><div class='add'>+	.probe		= p9100_probe,</div><div class='add'>+	.remove		= __devexit_p(p9100_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+static int __init p9100_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("p9100fb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;p9100_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-p9100_setup(char *arg)</div><div class='add'>+static void __exit p9100_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;p9100_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(p9100_init);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(p9100_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for P9100 chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c<br/>index 335e37465559..983be3ec2345 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/platinumfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/platinumfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/platinumfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/platinumfb.c</a></div><div class='hunk'>@@ -17,13 +17,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c<br/>index 4e963930b50a..a560a2223825 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/pm2fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pm2fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pm2fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pm2fb.c</a></div><div class='hunk'>@@ -27,14 +27,12 @@</div><div class='ctx'>  * </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c<br/>index 52c18a35fb41..1d81ef47efd3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/pm3fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pm3fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pm3fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pm3fb.c</a></div><div class='hunk'>@@ -52,13 +52,11 @@</div><div class='ctx'>  *  Wed Feb 21 14:47:06 CET 2001, v 1.0.0: First working version</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c<br/>index d92f352211ef..68ca3cc40770 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/pmag-aa-fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pmag-aa-fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pmag-aa-fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pmag-aa-fb.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/pnx4008/Makefile b/drivers/video/pnx4008/Makefile<br/>new file mode 100644<br/>index 000000000000..636aaccf01fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pnx4008/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pnx4008/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the new PNX4008 framebuffer device driver</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_FB_PNX4008_DUM) += sdum.o</div><div class='add'>+obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnxrgbfb.o</div><div class='add'>+</div><div class='head'>diff --git a/drivers/video/pnx4008/dum.h b/drivers/video/pnx4008/dum.h<br/>new file mode 100644<br/>index 000000000000..d80a614d89ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pnx4008/dum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pnx4008/dum.h</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/drivers/video/pnx4008/dum.h</div><div class='add'>+ *</div><div class='add'>+ * Internal header for SDUM</div><div class='add'>+ *</div><div class='add'>+ * 2005 (c) Koninklijke Philips N.V. This file is licensed under</div><div class='add'>+ * the terms of the GNU General Public License version 2. This program</div><div class='add'>+ * is licensed "as is" without any warranty of any kind, whether express</div><div class='add'>+ * or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __PNX008_DUM_H__</div><div class='add'>+#define __PNX008_DUM_H__</div><div class='add'>+</div><div class='add'>+#include &lt;asm/arch/platform.h&gt;</div><div class='add'>+</div><div class='add'>+#define PNX4008_DUMCONF_VA_BASE		IO_ADDRESS(PNX4008_DUMCONF_BASE)</div><div class='add'>+#define PNX4008_DUM_MAIN_VA_BASE	IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE)</div><div class='add'>+</div><div class='add'>+/* DUM CFG ADDRESSES */</div><div class='add'>+#define DUM_CH_BASE_ADR		(PNX4008_DUMCONF_VA_BASE + 0x00)</div><div class='add'>+#define DUM_CH_MIN_ADR		(PNX4008_DUMCONF_VA_BASE + 0x00)</div><div class='add'>+#define DUM_CH_MAX_ADR		(PNX4008_DUMCONF_VA_BASE + 0x04)</div><div class='add'>+#define DUM_CH_CONF_ADR		(PNX4008_DUMCONF_VA_BASE + 0x08)</div><div class='add'>+#define DUM_CH_STAT_ADR		(PNX4008_DUMCONF_VA_BASE + 0x0C)</div><div class='add'>+#define DUM_CH_CTRL_ADR		(PNX4008_DUMCONF_VA_BASE + 0x10)</div><div class='add'>+</div><div class='add'>+#define CH_MARG		(0x100 / sizeof(u32))</div><div class='add'>+#define DUM_CH_MIN(i)	(*((volatile u32 *)DUM_CH_MIN_ADR + (i) * CH_MARG))</div><div class='add'>+#define DUM_CH_MAX(i)	(*((volatile u32 *)DUM_CH_MAX_ADR + (i) * CH_MARG))</div><div class='add'>+#define DUM_CH_CONF(i)	(*((volatile u32 *)DUM_CH_CONF_ADR + (i) * CH_MARG))</div><div class='add'>+#define DUM_CH_STAT(i)	(*((volatile u32 *)DUM_CH_STAT_ADR + (i) * CH_MARG))</div><div class='add'>+#define DUM_CH_CTRL(i)	(*((volatile u32 *)DUM_CH_CTRL_ADR + (i) * CH_MARG))</div><div class='add'>+</div><div class='add'>+#define DUM_CONF_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x00)</div><div class='add'>+#define DUM_CTRL_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x04)</div><div class='add'>+#define DUM_STAT_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x08)</div><div class='add'>+#define DUM_DECODE_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x0C)</div><div class='add'>+#define DUM_COM_BASE_ADR      (PNX4008_DUM_MAIN_VA_BASE + 0x10)</div><div class='add'>+#define DUM_SYNC_C_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x14)</div><div class='add'>+#define DUM_CLK_DIV_ADR       (PNX4008_DUM_MAIN_VA_BASE + 0x18)</div><div class='add'>+#define DUM_DIRTY_LOW_ADR     (PNX4008_DUM_MAIN_VA_BASE + 0x20)</div><div class='add'>+#define DUM_DIRTY_HIGH_ADR    (PNX4008_DUM_MAIN_VA_BASE + 0x24)</div><div class='add'>+#define DUM_FORMAT_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x28)</div><div class='add'>+#define DUM_WTCFG1_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x30)</div><div class='add'>+#define DUM_RTCFG1_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x34)</div><div class='add'>+#define DUM_WTCFG2_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x38)</div><div class='add'>+#define DUM_RTCFG2_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x3C)</div><div class='add'>+#define DUM_TCFG_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x40)</div><div class='add'>+#define DUM_OUTP_FORMAT1_ADR  (PNX4008_DUM_MAIN_VA_BASE + 0x44)</div><div class='add'>+#define DUM_OUTP_FORMAT2_ADR  (PNX4008_DUM_MAIN_VA_BASE + 0x48)</div><div class='add'>+#define DUM_SYNC_MODE_ADR     (PNX4008_DUM_MAIN_VA_BASE + 0x4C)</div><div class='add'>+#define DUM_SYNC_OUT_C_ADR    (PNX4008_DUM_MAIN_VA_BASE + 0x50)</div><div class='add'>+</div><div class='add'>+#define DUM_CONF              (*(volatile u32 *)(DUM_CONF_ADR))</div><div class='add'>+#define DUM_CTRL              (*(volatile u32 *)(DUM_CTRL_ADR))</div><div class='add'>+#define DUM_STAT              (*(volatile u32 *)(DUM_STAT_ADR))</div><div class='add'>+#define DUM_DECODE            (*(volatile u32 *)(DUM_DECODE_ADR))</div><div class='add'>+#define DUM_COM_BASE          (*(volatile u32 *)(DUM_COM_BASE_ADR))</div><div class='add'>+#define DUM_SYNC_C            (*(volatile u32 *)(DUM_SYNC_C_ADR))</div><div class='add'>+#define DUM_CLK_DIV           (*(volatile u32 *)(DUM_CLK_DIV_ADR))</div><div class='add'>+#define DUM_DIRTY_LOW         (*(volatile u32 *)(DUM_DIRTY_LOW_ADR))</div><div class='add'>+#define DUM_DIRTY_HIGH        (*(volatile u32 *)(DUM_DIRTY_HIGH_ADR))</div><div class='add'>+#define DUM_FORMAT            (*(volatile u32 *)(DUM_FORMAT_ADR))</div><div class='add'>+#define DUM_WTCFG1            (*(volatile u32 *)(DUM_WTCFG1_ADR))</div><div class='add'>+#define DUM_RTCFG1            (*(volatile u32 *)(DUM_RTCFG1_ADR))</div><div class='add'>+#define DUM_WTCFG2            (*(volatile u32 *)(DUM_WTCFG2_ADR))</div><div class='add'>+#define DUM_RTCFG2            (*(volatile u32 *)(DUM_RTCFG2_ADR))</div><div class='add'>+#define DUM_TCFG              (*(volatile u32 *)(DUM_TCFG_ADR))</div><div class='add'>+#define DUM_OUTP_FORMAT1      (*(volatile u32 *)(DUM_OUTP_FORMAT1_ADR))</div><div class='add'>+#define DUM_OUTP_FORMAT2      (*(volatile u32 *)(DUM_OUTP_FORMAT2_ADR))</div><div class='add'>+#define DUM_SYNC_MODE         (*(volatile u32 *)(DUM_SYNC_MODE_ADR))</div><div class='add'>+#define DUM_SYNC_OUT_C        (*(volatile u32 *)(DUM_SYNC_OUT_C_ADR))</div><div class='add'>+</div><div class='add'>+/* DUM SLAVE ADDRESSES */</div><div class='add'>+#define DUM_SLAVE_WRITE_ADR      (PNX4008_DUM_MAINCFG_BASE + 0x0000000)</div><div class='add'>+#define DUM_SLAVE_READ1_I_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x1000000)</div><div class='add'>+#define DUM_SLAVE_READ1_R_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x1000004)</div><div class='add'>+#define DUM_SLAVE_READ2_I_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x1000008)</div><div class='add'>+#define DUM_SLAVE_READ2_R_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x100000C)</div><div class='add'>+</div><div class='add'>+#define DUM_SLAVE_WRITE_W  ((volatile u32 *)(DUM_SLAVE_WRITE_ADR))</div><div class='add'>+#define DUM_SLAVE_WRITE_HW ((volatile u16 *)(DUM_SLAVE_WRITE_ADR))</div><div class='add'>+#define DUM_SLAVE_READ1_I  ((volatile u8 *)(DUM_SLAVE_READ1_I_ADR))</div><div class='add'>+#define DUM_SLAVE_READ1_R  ((volatile u16 *)(DUM_SLAVE_READ1_R_ADR))</div><div class='add'>+#define DUM_SLAVE_READ2_I  ((volatile u8 *)(DUM_SLAVE_READ2_I_ADR))</div><div class='add'>+#define DUM_SLAVE_READ2_R  ((volatile u16 *)(DUM_SLAVE_READ2_R_ADR))</div><div class='add'>+</div><div class='add'>+/* Sony display register addresses */</div><div class='add'>+#define DISP_0_REG            (0x00)</div><div class='add'>+#define DISP_1_REG            (0x01)</div><div class='add'>+#define DISP_CAL_REG          (0x20)</div><div class='add'>+#define DISP_ID_REG           (0x2A)</div><div class='add'>+#define DISP_XMIN_L_REG       (0x30)</div><div class='add'>+#define DISP_XMIN_H_REG       (0x31)</div><div class='add'>+#define DISP_YMIN_REG         (0x32)</div><div class='add'>+#define DISP_XMAX_L_REG       (0x34)</div><div class='add'>+#define DISP_XMAX_H_REG       (0x35)</div><div class='add'>+#define DISP_YMAX_REG         (0x36)</div><div class='add'>+#define DISP_SYNC_EN_REG      (0x38)</div><div class='add'>+#define DISP_SYNC_RISE_L_REG  (0x3C)</div><div class='add'>+#define DISP_SYNC_RISE_H_REG  (0x3D)</div><div class='add'>+#define DISP_SYNC_FALL_L_REG  (0x3E)</div><div class='add'>+#define DISP_SYNC_FALL_H_REG  (0x3F)</div><div class='add'>+#define DISP_PIXEL_REG        (0x0B)</div><div class='add'>+#define DISP_DUMMY1_REG       (0x28)</div><div class='add'>+#define DISP_DUMMY2_REG       (0x29)</div><div class='add'>+#define DISP_TIMING_REG       (0x98)</div><div class='add'>+#define DISP_DUMP_REG         (0x99)</div><div class='add'>+</div><div class='add'>+/* Sony display constants */</div><div class='add'>+#define SONY_ID1              (0x22)</div><div class='add'>+#define SONY_ID2              (0x23)</div><div class='add'>+</div><div class='add'>+/* Philips display register addresses */</div><div class='add'>+#define PH_DISP_ORIENT_REG    (0x003)</div><div class='add'>+#define PH_DISP_YPOINT_REG    (0x200)</div><div class='add'>+#define PH_DISP_XPOINT_REG    (0x201)</div><div class='add'>+#define PH_DISP_PIXEL_REG     (0x202)</div><div class='add'>+#define PH_DISP_YMIN_REG      (0x406)</div><div class='add'>+#define PH_DISP_YMAX_REG      (0x407)</div><div class='add'>+#define PH_DISP_XMIN_REG      (0x408)</div><div class='add'>+#define PH_DISP_XMAX_REG      (0x409)</div><div class='add'>+</div><div class='add'>+/* Misc constants */</div><div class='add'>+#define NO_VALID_DISPLAY_FOUND      (0)</div><div class='add'>+#define DISPLAY2_IS_NOT_CONNECTED   (0)</div><div class='add'>+</div><div class='add'>+/* register values */</div><div class='add'>+#define V_BAC_ENABLE		(BIT(0))</div><div class='add'>+#define V_BAC_DISABLE_IDLE	(BIT(1))</div><div class='add'>+#define V_BAC_DISABLE_TRIG	(BIT(2))</div><div class='add'>+#define V_DUM_RESET		(BIT(3))</div><div class='add'>+#define V_MUX_RESET		(BIT(4))</div><div class='add'>+#define BAC_ENABLED		(BIT(0))</div><div class='add'>+#define BAC_DISABLED		0</div><div class='add'>+</div><div class='add'>+/* Sony LCD commands */</div><div class='add'>+#define V_LCD_STANDBY_OFF	((BIT(25)) | (0 &lt;&lt; 16) | DISP_0_REG)</div><div class='add'>+#define V_LCD_USE_9BIT_BUS	((BIT(25)) | (2 &lt;&lt; 16) | DISP_1_REG)</div><div class='add'>+#define V_LCD_SYNC_RISE_L	((BIT(25)) | (0 &lt;&lt; 16) | DISP_SYNC_RISE_L_REG)</div><div class='add'>+#define V_LCD_SYNC_RISE_H	((BIT(25)) | (0 &lt;&lt; 16) | DISP_SYNC_RISE_H_REG)</div><div class='add'>+#define V_LCD_SYNC_FALL_L	((BIT(25)) | (160 &lt;&lt; 16) | DISP_SYNC_FALL_L_REG)</div><div class='add'>+#define V_LCD_SYNC_FALL_H	((BIT(25)) | (0 &lt;&lt; 16) | DISP_SYNC_FALL_H_REG)</div><div class='add'>+#define V_LCD_SYNC_ENABLE	((BIT(25)) | (128 &lt;&lt; 16) | DISP_SYNC_EN_REG)</div><div class='add'>+#define V_LCD_DISPLAY_ON	((BIT(25)) | (64 &lt;&lt; 16) | DISP_0_REG)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PAD_NONE,</div><div class='add'>+	PAD_512,</div><div class='add'>+	PAD_1024</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	RGB888,</div><div class='add'>+	RGB666,</div><div class='add'>+	RGB565,</div><div class='add'>+	BGR565,</div><div class='add'>+	ARGB1555,</div><div class='add'>+	ABGR1555,</div><div class='add'>+	ARGB4444,</div><div class='add'>+	ABGR4444</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dum_setup {</div><div class='add'>+	int sync_neg_edge;</div><div class='add'>+	int round_robin;</div><div class='add'>+	int mux_int;</div><div class='add'>+	int synced_dirty_flag_int;</div><div class='add'>+	int dirty_flag_int;</div><div class='add'>+	int error_int;</div><div class='add'>+	int pf_empty_int;</div><div class='add'>+	int sf_empty_int;</div><div class='add'>+	int bac_dis_int;</div><div class='add'>+	u32 dirty_base_adr;</div><div class='add'>+	u32 command_base_adr;</div><div class='add'>+	u32 sync_clk_div;</div><div class='add'>+	int sync_output;</div><div class='add'>+	u32 sync_restart_val;</div><div class='add'>+	u32 set_sync_high;</div><div class='add'>+	u32 set_sync_low;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dum_ch_setup {</div><div class='add'>+	int disp_no;</div><div class='add'>+	u32 xmin;</div><div class='add'>+	u32 ymin;</div><div class='add'>+	u32 xmax;</div><div class='add'>+	u32 ymax;</div><div class='add'>+	int xmirror;</div><div class='add'>+	int ymirror;</div><div class='add'>+	int rotate;</div><div class='add'>+	u32 minadr;</div><div class='add'>+	u32 maxadr;</div><div class='add'>+	u32 dirtybuffer;</div><div class='add'>+	int pad;</div><div class='add'>+	int format;</div><div class='add'>+	int hwdirty;</div><div class='add'>+	int slave_trans;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct disp_window {</div><div class='add'>+	u32 xmin_l;</div><div class='add'>+	u32 xmin_h;</div><div class='add'>+	u32 ymin;</div><div class='add'>+	u32 xmax_l;</div><div class='add'>+	u32 xmax_h;</div><div class='add'>+	u32 ymax;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif				/* #ifndef __PNX008_DUM_H__ */</div><div class='head'>diff --git a/drivers/video/pnx4008/fbcommon.h b/drivers/video/pnx4008/fbcommon.h<br/>new file mode 100644<br/>index 000000000000..4ebc87dafafb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pnx4008/fbcommon.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pnx4008/fbcommon.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005 Philips Semiconductors</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; see the file COPYING.  If not, write to</div><div class='add'>+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='add'>+ * Boston, MA 02111-1307, USA, or http://www.gnu.org/licenses/gpl.html</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#define QCIF_W  (176)</div><div class='add'>+#define QCIF_H  (144)</div><div class='add'>+</div><div class='add'>+#define CIF_W   (352)</div><div class='add'>+#define CIF_H   (288)</div><div class='add'>+</div><div class='add'>+#define LCD_X_RES	208</div><div class='add'>+#define LCD_Y_RES	320</div><div class='add'>+#define LCD_X_PAD	256</div><div class='add'>+#define LCD_BBP		4	/* Bytes Per Pixel */</div><div class='add'>+</div><div class='add'>+#define DISP_MAX_X_SIZE     (320)</div><div class='add'>+#define DISP_MAX_Y_SIZE     (208)</div><div class='add'>+</div><div class='add'>+#define RETURNVAL_BASE (0x400)</div><div class='add'>+</div><div class='add'>+enum fb_ioctl_returntype {</div><div class='add'>+	ENORESOURCESLEFT = RETURNVAL_BASE,</div><div class='add'>+	ERESOURCESNOTFREED,</div><div class='add'>+	EPROCNOTOWNER,</div><div class='add'>+	EFBNOTOWNER,</div><div class='add'>+	ECOPYFAILED,</div><div class='add'>+	EIOREMAPFAILED,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c<br/>new file mode 100644<br/>index 000000000000..7d9453c91a42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pnx4008/pnxrgbfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pnx4008/pnxrgbfb.c</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/video/pnx4008/pnxrgbfb.c</div><div class='add'>+ *</div><div class='add'>+ * PNX4008's framebuffer support</div><div class='add'>+ *</div><div class='add'>+ * Author: Grigory Tolstolytkin &lt;gtolstolytkin@ru.mvista.com&gt;</div><div class='add'>+ * Based on Philips Semiconductors's code</div><div class='add'>+ *</div><div class='add'>+ * Copyrght (c) 2005 MontaVista Software, Inc.</div><div class='add'>+ * Copyright (c) 2005 Philips Semiconductors</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include "sdum.h"</div><div class='add'>+#include "fbcommon.h"</div><div class='add'>+</div><div class='add'>+static u32 colreg[16];</div><div class='add'>+</div><div class='add'>+static struct fb_var_screeninfo rgbfb_var __initdata = {</div><div class='add'>+	.xres = LCD_X_RES,</div><div class='add'>+	.yres = LCD_Y_RES,</div><div class='add'>+	.xres_virtual = LCD_X_RES,</div><div class='add'>+	.yres_virtual = LCD_Y_RES,</div><div class='add'>+	.bits_per_pixel = 32,</div><div class='add'>+	.red.offset = 16,</div><div class='add'>+	.red.length = 8,</div><div class='add'>+	.green.offset = 8,</div><div class='add'>+	.green.length = 8,</div><div class='add'>+	.blue.offset = 0,</div><div class='add'>+	.blue.length = 8,</div><div class='add'>+	.left_margin = 0,</div><div class='add'>+	.right_margin = 0,</div><div class='add'>+	.upper_margin = 0,</div><div class='add'>+	.lower_margin = 0,</div><div class='add'>+	.vmode = FB_VMODE_NONINTERLACED,</div><div class='add'>+};</div><div class='add'>+static struct fb_fix_screeninfo rgbfb_fix __initdata = {</div><div class='add'>+	.id = "RGBFB",</div><div class='add'>+	.line_length = LCD_X_RES * LCD_BBP,</div><div class='add'>+	.type = FB_TYPE_PACKED_PIXELS,</div><div class='add'>+	.visual = FB_VISUAL_TRUECOLOR,</div><div class='add'>+	.xpanstep = 0,</div><div class='add'>+	.ypanstep = 0,</div><div class='add'>+	.ywrapstep = 0,</div><div class='add'>+	.accel = FB_ACCEL_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int channel_owned;</div><div class='add'>+</div><div class='add'>+static int no_cursor(struct fb_info *info, struct fb_cursor *cursor)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rgbfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,</div><div class='add'>+			   u_int transp, struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	if (regno &gt; 15)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	colreg[regno] = ((red &amp; 0xff00) &lt;&lt; 8) | (green &amp; 0xff00) |</div><div class='add'>+	    ((blue &amp; 0xff00) &gt;&gt; 8);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rgbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return pnx4008_sdum_mmap(info, vma, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fb_ops rgbfb_ops = {</div><div class='add'>+	.fb_mmap = rgbfb_mmap,</div><div class='add'>+	.fb_setcolreg = rgbfb_setcolreg,</div><div class='add'>+	.fb_fillrect = cfb_fillrect,</div><div class='add'>+	.fb_copyarea = cfb_copyarea,</div><div class='add'>+	.fb_imageblit = cfb_imageblit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rgbfb_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (info) {</div><div class='add'>+		unregister_framebuffer(info);</div><div class='add'>+		fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='add'>+		framebuffer_release(info);</div><div class='add'>+		platform_set_drvdata(pdev, NULL);</div><div class='add'>+		kfree(info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pnx4008_free_dum_channel(channel_owned, pdev-&gt;id);</div><div class='add'>+	pnx4008_set_dum_exit_notification(pdev-&gt;id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit rgbfb_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info;</div><div class='add'>+	struct dumchannel_uf chan_uf;</div><div class='add'>+	int ret;</div><div class='add'>+	char *option;</div><div class='add'>+</div><div class='add'>+	info = framebuffer_alloc(sizeof(u32) * 16, &amp;pdev-&gt;dev);</div><div class='add'>+	if (!info) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pnx4008_get_fb_addresses(FB_TYPE_RGB, (void **)&amp;info-&gt;screen_base,</div><div class='add'>+				 (dma_addr_t *) &amp;rgbfb_fix.smem_start,</div><div class='add'>+				 &amp;rgbfb_fix.smem_len);</div><div class='add'>+</div><div class='add'>+	if ((ret = pnx4008_alloc_dum_channel(pdev-&gt;id)) &lt; 0)</div><div class='add'>+		goto err0;</div><div class='add'>+	else {</div><div class='add'>+		channel_owned = ret;</div><div class='add'>+		chan_uf.channelnr = channel_owned;</div><div class='add'>+		chan_uf.dirty = (u32 *) NULL;</div><div class='add'>+		chan_uf.source = (u32 *) rgbfb_fix.smem_start;</div><div class='add'>+		chan_uf.x_offset = 0;</div><div class='add'>+		chan_uf.y_offset = 0;</div><div class='add'>+		chan_uf.width = LCD_X_RES;</div><div class='add'>+		chan_uf.height = LCD_Y_RES;</div><div class='add'>+</div><div class='add'>+		if ((ret = pnx4008_put_dum_channel_uf(chan_uf, pdev-&gt;id))&lt; 0)</div><div class='add'>+			goto err1;</div><div class='add'>+</div><div class='add'>+		if ((ret =</div><div class='add'>+		     pnx4008_set_dum_channel_sync(channel_owned, CONF_SYNC_ON,</div><div class='add'>+						  pdev-&gt;id)) &lt; 0)</div><div class='add'>+			goto err1;</div><div class='add'>+</div><div class='add'>+		if ((ret =</div><div class='add'>+		     pnx4008_set_dum_channel_dirty_detect(channel_owned,</div><div class='add'>+							 CONF_DIRTYDETECTION_ON,</div><div class='add'>+							 pdev-&gt;id)) &lt; 0)</div><div class='add'>+			goto err1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!fb_get_options("pnxrgbfb", &amp;option) &amp;&amp; !strcmp(option, "nocursor"))</div><div class='add'>+		rgbfb_ops.fb_cursor = no_cursor;</div><div class='add'>+</div><div class='add'>+	info-&gt;node = -1;</div><div class='add'>+	info-&gt;flags = FBINFO_FLAG_DEFAULT;</div><div class='add'>+	info-&gt;fbops = &amp;rgbfb_ops;</div><div class='add'>+	info-&gt;fix = rgbfb_fix;</div><div class='add'>+	info-&gt;var = rgbfb_var;</div><div class='add'>+	info-&gt;screen_size = rgbfb_fix.smem_len;</div><div class='add'>+	info-&gt;pseudo_palette = info-&gt;par;</div><div class='add'>+	info-&gt;par = NULL;</div><div class='add'>+</div><div class='add'>+	ret = fb_alloc_cmap(&amp;info-&gt;cmap, 256, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err2;</div><div class='add'>+</div><div class='add'>+	ret = register_framebuffer(info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err3;</div><div class='add'>+	platform_set_drvdata(pdev, info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err3:</div><div class='add'>+	fb_dealloc_cmap(&amp;info-&gt;cmap);</div><div class='add'>+err2:</div><div class='add'>+	framebuffer_release(info);</div><div class='add'>+err1:</div><div class='add'>+	pnx4008_free_dum_channel(channel_owned, pdev-&gt;id);</div><div class='add'>+err0:</div><div class='add'>+	kfree(info);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver rgbfb_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "rgbfb",</div><div class='add'>+	},</div><div class='add'>+	.probe = rgbfb_probe,</div><div class='add'>+	.remove = rgbfb_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init rgbfb_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;rgbfb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit rgbfb_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;rgbfb_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(rgbfb_init);</div><div class='add'>+module_exit(rgbfb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c<br/>new file mode 100644<br/>index 000000000000..51f0ecc2a511<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pnx4008/sdum.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pnx4008/sdum.c</a></div><div class='hunk'>@@ -0,0 +1,872 @@</div><div class='add'>+/*</div><div class='add'>+ * drivers/video/pnx4008/sdum.c</div><div class='add'>+ *</div><div class='add'>+ * Display Update Master support</div><div class='add'>+ *</div><div class='add'>+ * Authors: Grigory Tolstolytkin &lt;gtolstolytkin@ru.mvista.com&gt;</div><div class='add'>+ *          Vitaly Wool &lt;vitalywool@gmail.com&gt;</div><div class='add'>+ * Based on Philips Semiconductors's code</div><div class='add'>+ *</div><div class='add'>+ * Copyrght (c) 2005-2006 MontaVista Software, Inc.</div><div class='add'>+ * Copyright (c) 2005 Philips Semiconductors</div><div class='add'>+ * This file is licensed under the terms of the GNU General Public License</div><div class='add'>+ * version 2. This program is licensed "as is" without any warranty of any</div><div class='add'>+ * kind, whether express or implied.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/fb.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;asm/arch/gpio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "sdum.h"</div><div class='add'>+#include "fbcommon.h"</div><div class='add'>+#include "dum.h"</div><div class='add'>+</div><div class='add'>+/* Framebuffers we have */</div><div class='add'>+</div><div class='add'>+static struct pnx4008_fb_addr {</div><div class='add'>+	int fb_type;</div><div class='add'>+	long addr_offset;</div><div class='add'>+	long fb_length;</div><div class='add'>+} fb_addr[] = {</div><div class='add'>+	[0] = {</div><div class='add'>+		FB_TYPE_YUV, 0, 0xB0000</div><div class='add'>+	},</div><div class='add'>+	[1] = {</div><div class='add'>+		FB_TYPE_RGB, 0xB0000, 0x50000</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dum_data {</div><div class='add'>+	u32 lcd_phys_start;</div><div class='add'>+	u32 lcd_virt_start;</div><div class='add'>+	u32 slave_phys_base;</div><div class='add'>+	u32 *slave_virt_base;</div><div class='add'>+	int fb_owning_channel[MAX_DUM_CHANNELS];</div><div class='add'>+	struct dumchannel_uf chan_uf_store[MAX_DUM_CHANNELS];</div><div class='add'>+} dum_data;</div><div class='add'>+</div><div class='add'>+/* Different local helper functions */</div><div class='add'>+</div><div class='add'>+static u32 nof_pixels_dx(struct dum_ch_setup *ch_setup)</div><div class='add'>+{</div><div class='add'>+	return (ch_setup-&gt;xmax - ch_setup-&gt;xmin + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 nof_pixels_dy(struct dum_ch_setup *ch_setup)</div><div class='add'>+{</div><div class='add'>+	return (ch_setup-&gt;ymax - ch_setup-&gt;ymin + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 nof_pixels_dxy(struct dum_ch_setup *ch_setup)</div><div class='add'>+{</div><div class='add'>+	return (nof_pixels_dx(ch_setup) * nof_pixels_dy(ch_setup));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 nof_bytes(struct dum_ch_setup *ch_setup)</div><div class='add'>+{</div><div class='add'>+	u32 r = nof_pixels_dxy(ch_setup);</div><div class='add'>+	switch (ch_setup-&gt;format) {</div><div class='add'>+	case RGB888:</div><div class='add'>+	case RGB666:</div><div class='add'>+		r *= 4;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		r *= 2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 build_command(int disp_no, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	return ((disp_no &lt;&lt; 26) | BIT(25) | (val &lt;&lt; 16) | (disp_no &lt;&lt; 10) |</div><div class='add'>+		(reg &lt;&lt; 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 build_double_index(int disp_no, u32 val)</div><div class='add'>+{</div><div class='add'>+	return ((disp_no &lt;&lt; 26) | (val &lt;&lt; 16) | (disp_no &lt;&lt; 10) | (val &lt;&lt; 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void build_disp_window(struct dum_ch_setup * ch_setup, struct disp_window * dw)</div><div class='add'>+{</div><div class='add'>+	dw-&gt;ymin = ch_setup-&gt;ymin;</div><div class='add'>+	dw-&gt;ymax = ch_setup-&gt;ymax;</div><div class='add'>+	dw-&gt;xmin_l = ch_setup-&gt;xmin &amp; 0xFF;</div><div class='add'>+	dw-&gt;xmin_h = (ch_setup-&gt;xmin &amp; BIT(8)) &gt;&gt; 8;</div><div class='add'>+	dw-&gt;xmax_l = ch_setup-&gt;xmax &amp; 0xFF;</div><div class='add'>+	dw-&gt;xmax_h = (ch_setup-&gt;xmax &amp; BIT(8)) &gt;&gt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int put_channel(struct dumchannel chan)</div><div class='add'>+{</div><div class='add'>+	int i = chan.channelnr;</div><div class='add'>+</div><div class='add'>+	if (i &lt; 0 || i &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		DUM_CH_MIN(i) = chan.dum_ch_min;</div><div class='add'>+		DUM_CH_MAX(i) = chan.dum_ch_max;</div><div class='add'>+		DUM_CH_CONF(i) = chan.dum_ch_conf;</div><div class='add'>+		DUM_CH_CTRL(i) = chan.dum_ch_ctrl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_channel(int channr)</div><div class='add'>+{</div><div class='add'>+	struct dumchannel chan;</div><div class='add'>+</div><div class='add'>+	chan.channelnr = channr;</div><div class='add'>+	chan.dum_ch_min = 0;</div><div class='add'>+	chan.dum_ch_max = 0;</div><div class='add'>+	chan.dum_ch_conf = 0;</div><div class='add'>+	chan.dum_ch_ctrl = 0;</div><div class='add'>+</div><div class='add'>+	put_channel(chan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int put_cmd_string(struct cmdstring cmds)</div><div class='add'>+{</div><div class='add'>+	u16 *cmd_str_virtaddr;</div><div class='add'>+	u32 *cmd_ptr0_virtaddr;</div><div class='add'>+	u32 cmd_str_physaddr;</div><div class='add'>+</div><div class='add'>+	int i = cmds.channelnr;</div><div class='add'>+</div><div class='add'>+	if (i &lt; 0 || i &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if ((cmd_ptr0_virtaddr =</div><div class='add'>+		  (int *)ioremap_nocache(DUM_COM_BASE,</div><div class='add'>+					 sizeof(int) * MAX_DUM_CHANNELS)) ==</div><div class='add'>+		 NULL)</div><div class='add'>+		return -EIOREMAPFAILED;</div><div class='add'>+	else {</div><div class='add'>+		cmd_str_physaddr = ioread32(&amp;cmd_ptr0_virtaddr[cmds.channelnr]);</div><div class='add'>+		if ((cmd_str_virtaddr =</div><div class='add'>+		     (u16 *) ioremap_nocache(cmd_str_physaddr,</div><div class='add'>+					     sizeof(cmds))) == NULL) {</div><div class='add'>+			iounmap(cmd_ptr0_virtaddr);</div><div class='add'>+			return -EIOREMAPFAILED;</div><div class='add'>+		} else {</div><div class='add'>+			int t;</div><div class='add'>+			for (t = 0; t &lt; 8; t++)</div><div class='add'>+				iowrite16(*((u16 *)&amp;cmds.prestringlen + t),</div><div class='add'>+					  cmd_str_virtaddr + t);</div><div class='add'>+</div><div class='add'>+			for (t = 0; t &lt; cmds.prestringlen / 2; t++)</div><div class='add'>+				 iowrite16(*((u16 *)&amp;cmds.precmd + t),</div><div class='add'>+					   cmd_str_virtaddr + t + 8);</div><div class='add'>+</div><div class='add'>+			for (t = 0; t &lt; cmds.poststringlen / 2; t++)</div><div class='add'>+				iowrite16(*((u16 *)&amp;cmds.postcmd + t),</div><div class='add'>+					  cmd_str_virtaddr + t + 8 +</div><div class='add'>+					  	cmds.prestringlen / 2);</div><div class='add'>+</div><div class='add'>+			iounmap(cmd_ptr0_virtaddr);</div><div class='add'>+			iounmap(cmd_str_virtaddr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dum_ch_setup(int ch_no, struct dum_ch_setup * ch_setup)</div><div class='add'>+{</div><div class='add'>+	struct cmdstring cmds_c;</div><div class='add'>+	struct cmdstring *cmds = &amp;cmds_c;</div><div class='add'>+	struct disp_window dw;</div><div class='add'>+	int standard;</div><div class='add'>+	u32 orientation = 0;</div><div class='add'>+	struct dumchannel chan = { 0 };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ch_setup-&gt;xmirror) || (ch_setup-&gt;ymirror) || (ch_setup-&gt;rotate)) {</div><div class='add'>+		standard = 0;</div><div class='add'>+</div><div class='add'>+		orientation = BIT(1);	/* always set 9-bit-bus */</div><div class='add'>+		if (ch_setup-&gt;xmirror)</div><div class='add'>+			orientation |= BIT(4);</div><div class='add'>+		if (ch_setup-&gt;ymirror)</div><div class='add'>+			orientation |= BIT(3);</div><div class='add'>+		if (ch_setup-&gt;rotate)</div><div class='add'>+			orientation |= BIT(0);</div><div class='add'>+	} else</div><div class='add'>+		standard = 1;</div><div class='add'>+</div><div class='add'>+	cmds-&gt;channelnr = ch_no;</div><div class='add'>+</div><div class='add'>+	/* build command string header */</div><div class='add'>+	if (standard) {</div><div class='add'>+		cmds-&gt;prestringlen = 32;</div><div class='add'>+		cmds-&gt;poststringlen = 0;</div><div class='add'>+	} else {</div><div class='add'>+		cmds-&gt;prestringlen = 48;</div><div class='add'>+		cmds-&gt;poststringlen = 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmds-&gt;format =</div><div class='add'>+	    (u16) ((ch_setup-&gt;disp_no &lt;&lt; 4) | (BIT(3)) | (ch_setup-&gt;format));</div><div class='add'>+	cmds-&gt;reserved = 0x0;</div><div class='add'>+	cmds-&gt;startaddr_low = (ch_setup-&gt;minadr &amp; 0xFFFF);</div><div class='add'>+	cmds-&gt;startaddr_high = (ch_setup-&gt;minadr &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	if ((ch_setup-&gt;minadr == 0) &amp;&amp; (ch_setup-&gt;maxadr == 0)</div><div class='add'>+	    &amp;&amp; (ch_setup-&gt;xmin == 0)</div><div class='add'>+	    &amp;&amp; (ch_setup-&gt;ymin == 0) &amp;&amp; (ch_setup-&gt;xmax == 0)</div><div class='add'>+	    &amp;&amp; (ch_setup-&gt;ymax == 0)) {</div><div class='add'>+		cmds-&gt;pixdatlen_low = 0;</div><div class='add'>+		cmds-&gt;pixdatlen_high = 0;</div><div class='add'>+	} else {</div><div class='add'>+		u32 nbytes = nof_bytes(ch_setup);</div><div class='add'>+		cmds-&gt;pixdatlen_low = (nbytes &amp; 0xFFFF);</div><div class='add'>+		cmds-&gt;pixdatlen_high = (nbytes &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ch_setup-&gt;slave_trans)</div><div class='add'>+		cmds-&gt;pixdatlen_high |= BIT(15);</div><div class='add'>+</div><div class='add'>+	/* build pre-string */</div><div class='add'>+	build_disp_window(ch_setup, &amp;dw);</div><div class='add'>+</div><div class='add'>+	if (standard) {</div><div class='add'>+		cmds-&gt;precmd[0] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMIN_L_REG, 0x99);</div><div class='add'>+		cmds-&gt;precmd[1] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMIN_L_REG,</div><div class='add'>+				  dw.xmin_l);</div><div class='add'>+		cmds-&gt;precmd[2] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMIN_H_REG,</div><div class='add'>+				  dw.xmin_h);</div><div class='add'>+		cmds-&gt;precmd[3] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_YMIN_REG, dw.ymin);</div><div class='add'>+		cmds-&gt;precmd[4] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMAX_L_REG,</div><div class='add'>+				  dw.xmax_l);</div><div class='add'>+		cmds-&gt;precmd[5] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMAX_H_REG,</div><div class='add'>+				  dw.xmax_h);</div><div class='add'>+		cmds-&gt;precmd[6] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_YMAX_REG, dw.ymax);</div><div class='add'>+		cmds-&gt;precmd[7] =</div><div class='add'>+		    build_double_index(ch_setup-&gt;disp_no, DISP_PIXEL_REG);</div><div class='add'>+	} else {</div><div class='add'>+		if (dw.xmin_l == ch_no)</div><div class='add'>+			cmds-&gt;precmd[0] =</div><div class='add'>+			    build_command(ch_setup-&gt;disp_no, DISP_XMIN_L_REG,</div><div class='add'>+					  0x99);</div><div class='add'>+		else</div><div class='add'>+			cmds-&gt;precmd[0] =</div><div class='add'>+			    build_command(ch_setup-&gt;disp_no, DISP_XMIN_L_REG,</div><div class='add'>+					  ch_no);</div><div class='add'>+</div><div class='add'>+		cmds-&gt;precmd[1] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMIN_L_REG,</div><div class='add'>+				  dw.xmin_l);</div><div class='add'>+		cmds-&gt;precmd[2] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMIN_H_REG,</div><div class='add'>+				  dw.xmin_h);</div><div class='add'>+		cmds-&gt;precmd[3] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_YMIN_REG, dw.ymin);</div><div class='add'>+		cmds-&gt;precmd[4] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMAX_L_REG,</div><div class='add'>+				  dw.xmax_l);</div><div class='add'>+		cmds-&gt;precmd[5] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_XMAX_H_REG,</div><div class='add'>+				  dw.xmax_h);</div><div class='add'>+		cmds-&gt;precmd[6] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_YMAX_REG, dw.ymax);</div><div class='add'>+		cmds-&gt;precmd[7] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_1_REG, orientation);</div><div class='add'>+		cmds-&gt;precmd[8] =</div><div class='add'>+		    build_double_index(ch_setup-&gt;disp_no, DISP_PIXEL_REG);</div><div class='add'>+		cmds-&gt;precmd[9] =</div><div class='add'>+		    build_double_index(ch_setup-&gt;disp_no, DISP_PIXEL_REG);</div><div class='add'>+		cmds-&gt;precmd[0xA] =</div><div class='add'>+		    build_double_index(ch_setup-&gt;disp_no, DISP_PIXEL_REG);</div><div class='add'>+		cmds-&gt;precmd[0xB] =</div><div class='add'>+		    build_double_index(ch_setup-&gt;disp_no, DISP_PIXEL_REG);</div><div class='add'>+		cmds-&gt;postcmd[0] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_1_REG, BIT(1));</div><div class='add'>+		cmds-&gt;postcmd[1] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_DUMMY1_REG, 1);</div><div class='add'>+		cmds-&gt;postcmd[2] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_DUMMY1_REG, 2);</div><div class='add'>+		cmds-&gt;postcmd[3] =</div><div class='add'>+		    build_command(ch_setup-&gt;disp_no, DISP_DUMMY1_REG, 3);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((ret = put_cmd_string(cmds_c)) != 0) {</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chan.channelnr = cmds-&gt;channelnr;</div><div class='add'>+	chan.dum_ch_min = ch_setup-&gt;dirtybuffer + ch_setup-&gt;minadr;</div><div class='add'>+	chan.dum_ch_max = ch_setup-&gt;dirtybuffer + ch_setup-&gt;maxadr;</div><div class='add'>+	chan.dum_ch_conf = 0x002;</div><div class='add'>+	chan.dum_ch_ctrl = 0x04;</div><div class='add'>+</div><div class='add'>+	put_channel(chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 display_open(int ch_no, int auto_update, u32 * dirty_buffer,</div><div class='add'>+			u32 * frame_buffer, u32 xpos, u32 ypos, u32 w, u32 h)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct dum_ch_setup k;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* keep width &amp; height within display area */</div><div class='add'>+	if ((xpos + w) &gt; DISP_MAX_X_SIZE)</div><div class='add'>+		w = DISP_MAX_X_SIZE - xpos;</div><div class='add'>+</div><div class='add'>+	if ((ypos + h) &gt; DISP_MAX_Y_SIZE)</div><div class='add'>+		h = DISP_MAX_Y_SIZE - ypos;</div><div class='add'>+</div><div class='add'>+	/* assume 1 display only */</div><div class='add'>+	k.disp_no = 0;</div><div class='add'>+	k.xmin = xpos;</div><div class='add'>+	k.ymin = ypos;</div><div class='add'>+	k.xmax = xpos + (w - 1);</div><div class='add'>+	k.ymax = ypos + (h - 1);</div><div class='add'>+</div><div class='add'>+	/* adjust min and max values if necessary */</div><div class='add'>+	if (k.xmin &gt; DISP_MAX_X_SIZE - 1)</div><div class='add'>+		k.xmin = DISP_MAX_X_SIZE - 1;</div><div class='add'>+	if (k.ymin &gt; DISP_MAX_Y_SIZE - 1)</div><div class='add'>+		k.ymin = DISP_MAX_Y_SIZE - 1;</div><div class='add'>+</div><div class='add'>+	if (k.xmax &gt; DISP_MAX_X_SIZE - 1)</div><div class='add'>+		k.xmax = DISP_MAX_X_SIZE - 1;</div><div class='add'>+	if (k.ymax &gt; DISP_MAX_Y_SIZE - 1)</div><div class='add'>+		k.ymax = DISP_MAX_Y_SIZE - 1;</div><div class='add'>+</div><div class='add'>+	k.xmirror = 0;</div><div class='add'>+	k.ymirror = 0;</div><div class='add'>+	k.rotate = 0;</div><div class='add'>+	k.minadr = (u32) frame_buffer;</div><div class='add'>+	k.maxadr = (u32) frame_buffer + (((w - 1) &lt;&lt; 10) | ((h &lt;&lt; 2) - 2));</div><div class='add'>+	k.pad = PAD_1024;</div><div class='add'>+	k.dirtybuffer = (u32) dirty_buffer;</div><div class='add'>+	k.format = RGB888;</div><div class='add'>+	k.hwdirty = 0;</div><div class='add'>+	k.slave_trans = 0;</div><div class='add'>+</div><div class='add'>+	ret = dum_ch_setup(ch_no, &amp;k);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcd_reset(void)</div><div class='add'>+{</div><div class='add'>+	u32 *dum_pio_base = (u32 *)IO_ADDRESS(PNX4008_PIO_BASE);</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(BIT(19), &amp;dum_pio_base[2]);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(BIT(19), &amp;dum_pio_base[1]);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dum_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	/* enable DUM clock */</div><div class='add'>+	clk = clk_get(&amp;pdev-&gt;dev, "dum_ck");</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		printk(KERN_ERR "pnx4008_dum: Unable to access DUM clock\n");</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_set_rate(clk, 1);</div><div class='add'>+	clk_put(clk);</div><div class='add'>+</div><div class='add'>+	DUM_CTRL = V_DUM_RESET;</div><div class='add'>+</div><div class='add'>+	/* set priority to "round-robin". All other params to "false" */</div><div class='add'>+	DUM_CONF = BIT(9);</div><div class='add'>+</div><div class='add'>+	/* Display 1 */</div><div class='add'>+	DUM_WTCFG1 = PNX4008_DUM_WT_CFG;</div><div class='add'>+	DUM_RTCFG1 = PNX4008_DUM_RT_CFG;</div><div class='add'>+	DUM_TCFG = PNX4008_DUM_T_CFG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dum_chan_init(void)</div><div class='add'>+{</div><div class='add'>+	int i = 0, ch = 0;</div><div class='add'>+	u32 *cmdptrs;</div><div class='add'>+	u32 *cmdstrings;</div><div class='add'>+</div><div class='add'>+	DUM_COM_BASE =</div><div class='add'>+		CMDSTRING_BASEADDR + BYTES_PER_CMDSTRING * NR_OF_CMDSTRINGS;</div><div class='add'>+</div><div class='add'>+	if ((cmdptrs =</div><div class='add'>+	     (u32 *) ioremap_nocache(DUM_COM_BASE,</div><div class='add'>+				     sizeof(u32) * NR_OF_CMDSTRINGS)) == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; NR_OF_CMDSTRINGS; ch++)</div><div class='add'>+		iowrite32(CMDSTRING_BASEADDR + BYTES_PER_CMDSTRING * ch,</div><div class='add'>+			  cmdptrs + ch);</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; MAX_DUM_CHANNELS; ch++)</div><div class='add'>+		clear_channel(ch);</div><div class='add'>+</div><div class='add'>+	/* Clear the cmdstrings */</div><div class='add'>+	cmdstrings =</div><div class='add'>+	    (u32 *)ioremap_nocache(*cmdptrs,</div><div class='add'>+				   BYTES_PER_CMDSTRING * NR_OF_CMDSTRINGS);</div><div class='add'>+</div><div class='add'>+	if (!cmdstrings)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NR_OF_CMDSTRINGS * BYTES_PER_CMDSTRING / sizeof(u32);</div><div class='add'>+	     i++)</div><div class='add'>+		iowrite32(0, cmdstrings + i);</div><div class='add'>+</div><div class='add'>+	iounmap((u32 *)cmdstrings);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	iounmap((u32 *)cmdptrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lcd_init(void)</div><div class='add'>+{</div><div class='add'>+	lcd_reset();</div><div class='add'>+</div><div class='add'>+	DUM_OUTP_FORMAT1 = 0; /* RGB666 */</div><div class='add'>+</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_STANDBY_OFF, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_USE_9BIT_BUS, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_SYNC_RISE_L, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_SYNC_RISE_H, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_SYNC_FALL_L, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_SYNC_FALL_H, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_SYNC_ENABLE, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+	iowrite32(V_LCD_DISPLAY_ON, dum_data.slave_virt_base);</div><div class='add'>+	udelay(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Interface exported to framebuffer drivers */</div><div class='add'>+</div><div class='add'>+int pnx4008_get_fb_addresses(int fb_type, void **virt_addr,</div><div class='add'>+			     dma_addr_t *phys_addr, int *fb_length)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret = -1;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fb_addr); i++)</div><div class='add'>+		if (fb_addr[i].fb_type == fb_type) {</div><div class='add'>+			*virt_addr = (void *)(dum_data.lcd_virt_start +</div><div class='add'>+					fb_addr[i].addr_offset);</div><div class='add'>+			*phys_addr =</div><div class='add'>+			    dum_data.lcd_phys_start + fb_addr[i].addr_offset;</div><div class='add'>+			*fb_length = fb_addr[i].fb_length;</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_get_fb_addresses);</div><div class='add'>+</div><div class='add'>+int pnx4008_alloc_dum_channel(int dev_id)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	while ((i &lt; MAX_DUM_CHANNELS) &amp;&amp; (dum_data.fb_owning_channel[i] != -1))</div><div class='add'>+		i++;</div><div class='add'>+</div><div class='add'>+	if (i == MAX_DUM_CHANNELS)</div><div class='add'>+		return -ENORESOURCESLEFT;</div><div class='add'>+	else {</div><div class='add'>+		dum_data.fb_owning_channel[i] = dev_id;</div><div class='add'>+		return i;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_alloc_dum_channel);</div><div class='add'>+</div><div class='add'>+int pnx4008_free_dum_channel(int channr, int dev_id)</div><div class='add'>+{</div><div class='add'>+	if (channr &lt; 0 || channr &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (dum_data.fb_owning_channel[channr] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else {</div><div class='add'>+		clear_channel(channr);</div><div class='add'>+		dum_data.fb_owning_channel[channr] = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_free_dum_channel);</div><div class='add'>+</div><div class='add'>+int pnx4008_put_dum_channel_uf(struct dumchannel_uf chan_uf, int dev_id)</div><div class='add'>+{</div><div class='add'>+	int i = chan_uf.channelnr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (i &lt; 0 || i &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (dum_data.fb_owning_channel[i] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else if ((ret =</div><div class='add'>+		  display_open(chan_uf.channelnr, 0, chan_uf.dirty,</div><div class='add'>+			       chan_uf.source, chan_uf.y_offset,</div><div class='add'>+			       chan_uf.x_offset, chan_uf.height,</div><div class='add'>+			       chan_uf.width)) != 0)</div><div class='add'>+		return ret;</div><div class='add'>+	else {</div><div class='add'>+		dum_data.chan_uf_store[i].dirty = chan_uf.dirty;</div><div class='add'>+		dum_data.chan_uf_store[i].source = chan_uf.source;</div><div class='add'>+		dum_data.chan_uf_store[i].x_offset = chan_uf.x_offset;</div><div class='add'>+		dum_data.chan_uf_store[i].y_offset = chan_uf.y_offset;</div><div class='add'>+		dum_data.chan_uf_store[i].width = chan_uf.width;</div><div class='add'>+		dum_data.chan_uf_store[i].height = chan_uf.height;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_put_dum_channel_uf);</div><div class='add'>+</div><div class='add'>+int pnx4008_set_dum_channel_sync(int channr, int val, int dev_id)</div><div class='add'>+{</div><div class='add'>+	if (channr &lt; 0 || channr &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (dum_data.fb_owning_channel[channr] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else {</div><div class='add'>+		if (val == CONF_SYNC_ON) {</div><div class='add'>+			DUM_CH_CONF(channr) |= CONF_SYNCENABLE;</div><div class='add'>+			DUM_CH_CONF(channr) |= DUM_CHANNEL_CFG_SYNC_MASK |</div><div class='add'>+				DUM_CHANNEL_CFG_SYNC_MASK_SET;</div><div class='add'>+		} else if (val == CONF_SYNC_OFF)</div><div class='add'>+			DUM_CH_CONF(channr) &amp;= ~CONF_SYNCENABLE;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_set_dum_channel_sync);</div><div class='add'>+</div><div class='add'>+int pnx4008_set_dum_channel_dirty_detect(int channr, int val, int dev_id)</div><div class='add'>+{</div><div class='add'>+	if (channr &lt; 0 || channr &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (dum_data.fb_owning_channel[channr] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else {</div><div class='add'>+		if (val == CONF_DIRTYDETECTION_ON)</div><div class='add'>+			DUM_CH_CONF(channr) |= CONF_DIRTYENABLE;</div><div class='add'>+		else if (val == CONF_DIRTYDETECTION_OFF)</div><div class='add'>+			DUM_CH_CONF(channr) &amp;= ~CONF_DIRTYENABLE;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_set_dum_channel_dirty_detect);</div><div class='add'>+</div><div class='add'>+#if 0 /* Functions not used currently, but likely to be used in future */</div><div class='add'>+</div><div class='add'>+static int get_channel(struct dumchannel *p_chan)</div><div class='add'>+{</div><div class='add'>+	int i = p_chan-&gt;channelnr;</div><div class='add'>+</div><div class='add'>+	if (i &lt; 0 || i &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		p_chan-&gt;dum_ch_min = DUM_CH_MIN(i);</div><div class='add'>+		p_chan-&gt;dum_ch_max = DUM_CH_MAX(i);</div><div class='add'>+		p_chan-&gt;dum_ch_conf = DUM_CH_CONF(i);</div><div class='add'>+		p_chan-&gt;dum_ch_stat = DUM_CH_STAT(i);</div><div class='add'>+		p_chan-&gt;dum_ch_ctrl = 0;	/* WriteOnly control register */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pnx4008_get_dum_channel_uf(struct dumchannel_uf *p_chan_uf, int dev_id)</div><div class='add'>+{</div><div class='add'>+	int i = p_chan_uf-&gt;channelnr;</div><div class='add'>+</div><div class='add'>+	if (i &lt; 0 || i &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (dum_data.fb_owning_channel[i] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else {</div><div class='add'>+		p_chan_uf-&gt;dirty = dum_data.chan_uf_store[i].dirty;</div><div class='add'>+		p_chan_uf-&gt;source = dum_data.chan_uf_store[i].source;</div><div class='add'>+		p_chan_uf-&gt;x_offset = dum_data.chan_uf_store[i].x_offset;</div><div class='add'>+		p_chan_uf-&gt;y_offset = dum_data.chan_uf_store[i].y_offset;</div><div class='add'>+		p_chan_uf-&gt;width = dum_data.chan_uf_store[i].width;</div><div class='add'>+		p_chan_uf-&gt;height = dum_data.chan_uf_store[i].height;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_get_dum_channel_uf);</div><div class='add'>+</div><div class='add'>+int pnx4008_get_dum_channel_config(int channr, int dev_id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct dumchannel chan;</div><div class='add'>+</div><div class='add'>+	if (channr &lt; 0 || channr &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (dum_data.fb_owning_channel[channr] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else {</div><div class='add'>+		chan.channelnr = channr;</div><div class='add'>+		if ((ret = get_channel(&amp;chan)) != 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (chan.dum_ch_conf &amp; DUM_CHANNEL_CFG_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_get_dum_channel_config);</div><div class='add'>+</div><div class='add'>+int pnx4008_force_update_dum_channel(int channr, int dev_id)</div><div class='add'>+{</div><div class='add'>+	if (channr &lt; 0 || channr &gt; MAX_DUM_CHANNELS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	else if (dum_data.fb_owning_channel[channr] != dev_id)</div><div class='add'>+		return -EFBNOTOWNER;</div><div class='add'>+	else</div><div class='add'>+		DUM_CH_CTRL(channr) = CTRL_SETDIRTY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_force_update_dum_channel);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int pnx4008_sdum_mmap(struct fb_info *info, struct vm_area_struct *vma,</div><div class='add'>+		      struct device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned long off = vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (off &lt; info-&gt;fix.smem_len) {</div><div class='add'>+		vma-&gt;vm_pgoff += 1;</div><div class='add'>+		return dma_mmap_writecombine(dev, vma,</div><div class='add'>+				(void *)dum_data.lcd_virt_start,</div><div class='add'>+				dum_data.lcd_phys_start,</div><div class='add'>+				FB_DMA_SIZE);</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_sdum_mmap);</div><div class='add'>+</div><div class='add'>+int pnx4008_set_dum_exit_notification(int dev_id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_DUM_CHANNELS; i++)</div><div class='add'>+		if (dum_data.fb_owning_channel[i] == dev_id)</div><div class='add'>+			return -ERESOURCESNOTFREED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(pnx4008_set_dum_exit_notification);</div><div class='add'>+</div><div class='add'>+/* Platform device driver for DUM */</div><div class='add'>+</div><div class='add'>+static int sdum_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	clk = clk_get(0, "dum_ck");</div><div class='add'>+	if (!IS_ERR(clk)) {</div><div class='add'>+		clk_set_rate(clk, 0);</div><div class='add'>+		clk_put(clk);</div><div class='add'>+	} else</div><div class='add'>+		retval = PTR_ERR(clk);</div><div class='add'>+</div><div class='add'>+	/* disable BAC */</div><div class='add'>+	DUM_CTRL = V_BAC_DISABLE_IDLE;</div><div class='add'>+</div><div class='add'>+	/* LCD standby &amp; turn off display */</div><div class='add'>+	lcd_reset();</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sdum_resume(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	clk = clk_get(0, "dum_ck");</div><div class='add'>+	if (!IS_ERR(clk)) {</div><div class='add'>+		clk_set_rate(clk, 1);</div><div class='add'>+		clk_put(clk);</div><div class='add'>+	} else</div><div class='add'>+		retval = PTR_ERR(clk);</div><div class='add'>+</div><div class='add'>+	/* wait for BAC disable */</div><div class='add'>+	DUM_CTRL = V_BAC_DISABLE_TRIG;</div><div class='add'>+</div><div class='add'>+	while (DUM_CTRL &amp; BAC_ENABLED)</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+	/* re-init LCD */</div><div class='add'>+	lcd_init();</div><div class='add'>+</div><div class='add'>+	/* enable BAC and reset MUX */</div><div class='add'>+	DUM_CTRL = V_BAC_ENABLE;</div><div class='add'>+	udelay(1);</div><div class='add'>+	DUM_CTRL = V_MUX_RESET;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __devinit sdum_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0, i = 0;</div><div class='add'>+</div><div class='add'>+	/* map frame buffer */</div><div class='add'>+	dum_data.lcd_virt_start = (u32) dma_alloc_writecombine(&amp;pdev-&gt;dev,</div><div class='add'>+						       FB_DMA_SIZE,</div><div class='add'>+						       &amp;dum_data.lcd_phys_start,</div><div class='add'>+						       GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!dum_data.lcd_virt_start) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* map slave registers */</div><div class='add'>+	dum_data.slave_phys_base = PNX4008_DUM_SLAVE_BASE;</div><div class='add'>+	dum_data.slave_virt_base =</div><div class='add'>+	    (u32 *) ioremap_nocache(dum_data.slave_phys_base, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	if (dum_data.slave_virt_base == NULL) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize DUM and LCD display */</div><div class='add'>+	ret = dum_init(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_1;</div><div class='add'>+</div><div class='add'>+	dum_chan_init();</div><div class='add'>+	lcd_init();</div><div class='add'>+</div><div class='add'>+	DUM_CTRL = V_BAC_ENABLE;</div><div class='add'>+	udelay(1);</div><div class='add'>+	DUM_CTRL = V_MUX_RESET;</div><div class='add'>+</div><div class='add'>+	/* set decode address and sync clock divider */</div><div class='add'>+	DUM_DECODE = dum_data.lcd_phys_start &amp; DUM_DECODE_MASK;</div><div class='add'>+	DUM_CLK_DIV = PNX4008_DUM_CLK_DIV;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_DUM_CHANNELS; i++)</div><div class='add'>+		dum_data.fb_owning_channel[i] = -1;</div><div class='add'>+</div><div class='add'>+	/*setup wakeup interrupt */</div><div class='add'>+	start_int_set_rising_edge(SE_DISP_SYNC_INT);</div><div class='add'>+	start_int_ack(SE_DISP_SYNC_INT);</div><div class='add'>+	start_int_umask(SE_DISP_SYNC_INT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_1:</div><div class='add'>+	iounmap((void *)dum_data.slave_virt_base);</div><div class='add'>+out_2:</div><div class='add'>+	dma_free_writecombine(&amp;pdev-&gt;dev, FB_DMA_SIZE,</div><div class='add'>+			(void *)dum_data.lcd_virt_start,</div><div class='add'>+			dum_data.lcd_phys_start);</div><div class='add'>+out_3:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sdum_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct clk *clk;</div><div class='add'>+</div><div class='add'>+	start_int_mask(SE_DISP_SYNC_INT);</div><div class='add'>+</div><div class='add'>+	clk = clk_get(0, "dum_ck");</div><div class='add'>+	if (!IS_ERR(clk)) {</div><div class='add'>+		clk_set_rate(clk, 0);</div><div class='add'>+		clk_put(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iounmap((void *)dum_data.slave_virt_base);</div><div class='add'>+</div><div class='add'>+	dma_free_writecombine(&amp;pdev-&gt;dev, FB_DMA_SIZE,</div><div class='add'>+			(void *)dum_data.lcd_virt_start,</div><div class='add'>+			dum_data.lcd_phys_start);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver sdum_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "sdum",</div><div class='add'>+	},</div><div class='add'>+	.probe = sdum_probe,</div><div class='add'>+	.remove = sdum_remove,</div><div class='add'>+	.suspend = sdum_suspend,</div><div class='add'>+	.resume = sdum_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init sdum_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(&amp;sdum_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit sdum_exit(void)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(&amp;sdum_driver);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_init(sdum_init);</div><div class='add'>+module_exit(sdum_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/pnx4008/sdum.h b/drivers/video/pnx4008/sdum.h<br/>new file mode 100644<br/>index 000000000000..e8c5dcdd8813<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pnx4008/sdum.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pnx4008/sdum.h</a></div><div class='hunk'>@@ -0,0 +1,139 @@</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2005 Philips Semiconductors</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation; either version 2, or (at your option)</div><div class='add'>+ * any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful,</div><div class='add'>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='add'>+ * GNU General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License</div><div class='add'>+ * along with this program; see the file COPYING.  If not, write to</div><div class='add'>+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='add'>+ * Boston, MA 02111-1307, USA, or http://www.gnu.org/licenses/gpl.html</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#define MAX_DUM_CHANNELS	64</div><div class='add'>+</div><div class='add'>+#define RGB_MEM_WINDOW(x) (0x10000000 + (x)*0x00100000)</div><div class='add'>+</div><div class='add'>+#define QCIF_OFFSET(x) (((x) == 0) ? 0x00000: ((x) == 1) ? 0x30000: -1)</div><div class='add'>+#define CIF_OFFSET(x)  (((x) == 0) ? 0x00000: ((x) == 1) ? 0x60000: -1)</div><div class='add'>+</div><div class='add'>+#define CTRL_SETDIRTY	 	(0x00000001)</div><div class='add'>+#define CONF_DIRTYENABLE	(0x00000020)</div><div class='add'>+#define CONF_SYNCENABLE		(0x00000004)</div><div class='add'>+</div><div class='add'>+#define DIRTY_ENABLED(conf)	((conf) &amp; 0x0020)</div><div class='add'>+#define SYNC_ENABLED(conf) 	((conf) &amp; 0x0004)</div><div class='add'>+</div><div class='add'>+/* Display 1 &amp; 2 Write Timing Configuration */</div><div class='add'>+#define PNX4008_DUM_WT_CFG		0x00372000</div><div class='add'>+</div><div class='add'>+/* Display 1 &amp; 2 Read Timing Configuration */</div><div class='add'>+#define PNX4008_DUM_RT_CFG		0x00003A47</div><div class='add'>+</div><div class='add'>+/* DUM Transit State Timing Configuration */</div><div class='add'>+#define PNX4008_DUM_T_CFG		0x1D	/* 29 HCLK cycles */</div><div class='add'>+</div><div class='add'>+/* DUM Sync count clock divider */</div><div class='add'>+#define PNX4008_DUM_CLK_DIV		0x02DD</div><div class='add'>+</div><div class='add'>+/* Memory size for framebuffer, allocated through dma_alloc_writecombine().</div><div class='add'>+ * Must be PAGE aligned</div><div class='add'>+ */</div><div class='add'>+#define FB_DMA_SIZE (PAGE_ALIGN(SZ_1M + PAGE_SIZE))</div><div class='add'>+</div><div class='add'>+#define OFFSET_RGBBUFFER (0xB0000)</div><div class='add'>+#define OFFSET_YUVBUFFER (0x00000)</div><div class='add'>+</div><div class='add'>+#define YUVBUFFER (lcd_video_start + OFFSET_YUVBUFFER)</div><div class='add'>+#define RGBBUFFER (lcd_video_start + OFFSET_RGBBUFFER)</div><div class='add'>+</div><div class='add'>+#define CMDSTRING_BASEADDR	(0x00C000)	/* iram */</div><div class='add'>+#define BYTES_PER_CMDSTRING	(0x80)</div><div class='add'>+#define NR_OF_CMDSTRINGS	(64)</div><div class='add'>+</div><div class='add'>+#define MAX_NR_PRESTRINGS (0x40)</div><div class='add'>+#define MAX_NR_POSTSTRINGS (0x40)</div><div class='add'>+</div><div class='add'>+/* various mask definitions */</div><div class='add'>+#define DUM_CLK_ENABLE 0x01</div><div class='add'>+#define DUM_CLK_DISABLE 0</div><div class='add'>+#define DUM_DECODE_MASK 0x1FFFFFFF</div><div class='add'>+#define DUM_CHANNEL_CFG_MASK 0x01FF</div><div class='add'>+#define DUM_CHANNEL_CFG_SYNC_MASK 0xFFFE00FF</div><div class='add'>+#define DUM_CHANNEL_CFG_SYNC_MASK_SET 0x0CA00</div><div class='add'>+</div><div class='add'>+#define SDUM_RETURNVAL_BASE (0x500)</div><div class='add'>+</div><div class='add'>+#define CONF_SYNC_OFF		(0x602)</div><div class='add'>+#define CONF_SYNC_ON		(0x603)</div><div class='add'>+</div><div class='add'>+#define CONF_DIRTYDETECTION_OFF	(0x600)</div><div class='add'>+#define CONF_DIRTYDETECTION_ON	(0x601)</div><div class='add'>+</div><div class='add'>+/* Set the corresponding bit. */</div><div class='add'>+#define BIT(n) (0x1U &lt;&lt; (n))</div><div class='add'>+</div><div class='add'>+struct dumchannel_uf {</div><div class='add'>+	int channelnr;</div><div class='add'>+	u32 *dirty;</div><div class='add'>+	u32 *source;</div><div class='add'>+	u32 x_offset;</div><div class='add'>+	u32 y_offset;</div><div class='add'>+	u32 width;</div><div class='add'>+	u32 height;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FB_TYPE_YUV,</div><div class='add'>+	FB_TYPE_RGB</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cmdstring {</div><div class='add'>+	int channelnr;</div><div class='add'>+	uint16_t prestringlen;</div><div class='add'>+	uint16_t poststringlen;</div><div class='add'>+	uint16_t format;</div><div class='add'>+	uint16_t reserved;</div><div class='add'>+	uint16_t startaddr_low;</div><div class='add'>+	uint16_t startaddr_high;</div><div class='add'>+	uint16_t pixdatlen_low;</div><div class='add'>+	uint16_t pixdatlen_high;</div><div class='add'>+	u32 precmd[MAX_NR_PRESTRINGS];</div><div class='add'>+	u32 postcmd[MAX_NR_POSTSTRINGS];</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dumchannel {</div><div class='add'>+	int channelnr;</div><div class='add'>+	int dum_ch_min;</div><div class='add'>+	int dum_ch_max;</div><div class='add'>+	int dum_ch_conf;</div><div class='add'>+	int dum_ch_stat;</div><div class='add'>+	int dum_ch_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int pnx4008_alloc_dum_channel(int dev_id);</div><div class='add'>+int pnx4008_free_dum_channel(int channr, int dev_id);</div><div class='add'>+</div><div class='add'>+int pnx4008_get_dum_channel_uf(struct dumchannel_uf *pChan_uf, int dev_id);</div><div class='add'>+int pnx4008_put_dum_channel_uf(struct dumchannel_uf chan_uf, int dev_id);</div><div class='add'>+</div><div class='add'>+int pnx4008_set_dum_channel_sync(int channr, int val, int dev_id);</div><div class='add'>+int pnx4008_set_dum_channel_dirty_detect(int channr, int val, int dev_id);</div><div class='add'>+</div><div class='add'>+int pnx4008_force_dum_update_channel(int channr, int dev_id);</div><div class='add'>+</div><div class='add'>+int pnx4008_get_dum_channel_config(int channr, int dev_id);</div><div class='add'>+</div><div class='add'>+int pnx4008_sdum_mmap(struct fb_info *info, struct vm_area_struct *vma, struct device *dev);</div><div class='add'>+int pnx4008_set_dum_exit_notification(int dev_id);</div><div class='add'>+</div><div class='add'>+int pnx4008_get_fb_addresses(int fb_type, void **virt_addr,</div><div class='add'>+			     dma_addr_t * phys_addr, int *fb_length);</div><div class='head'>diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c<br/>index ec4bacf9dd2e..940ba2be55e9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/pvr2fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pvr2fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pvr2fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pvr2fb.c</a></div><div class='hunk'>@@ -53,10 +53,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c<br/>index 809fc5eefc15..bbb07106cd54 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/pxafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/pxafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/pxafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/pxafb.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -1335,7 +1334,7 @@ int __init pxafb_probe(struct platform_device *dev)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi);</div><div class='add'>+	ret = request_irq(IRQ_LCD, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev, "request_irq failed: %d\n", ret);</div><div class='ctx'> 		ret = -EBUSY;</div><div class='head'>diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c<br/>index fc91dbf896d2..48536c3e58a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/q40fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/q40fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/q40fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/q40fb.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c<br/>index 5e2c64f622cb..cf41ff177644 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/retz3fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/retz3fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/retz3fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/retz3fb.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c<br/>index 3e9308f0f165..33dddbae5420 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/riva/fbdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/riva/fbdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/riva/fbdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/riva/fbdev.c</a></div><div class='hunk'>@@ -29,18 +29,17 @@</div><div class='ctx'>  *	doublescan modes are broken</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/backlight.h&gt;</div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -272,34 +271,179 @@ static const struct riva_regs reg_template = {</div><div class='ctx'> /*</div><div class='ctx'>  * Backlight control</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+#ifdef CONFIG_FB_RIVA_BACKLIGHT</div><div class='add'>+/* We do not have any information about which values are allowed, thus</div><div class='add'>+ * we used safe values.</div><div class='add'>+ */</div><div class='add'>+#define MIN_LEVEL 0x158</div><div class='add'>+#define MAX_LEVEL 0x534</div><div class='add'>+#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)</div><div class='ctx'> </div><div class='del'>-static int riva_backlight_levels[] = {</div><div class='del'>-    0x158,</div><div class='del'>-    0x192,</div><div class='del'>-    0x1c6,</div><div class='del'>-    0x200,</div><div class='del'>-    0x234,</div><div class='del'>-    0x268,</div><div class='del'>-    0x2a2,</div><div class='del'>-    0x2d6,</div><div class='del'>-    0x310,</div><div class='del'>-    0x344,</div><div class='del'>-    0x378,</div><div class='del'>-    0x3b2,</div><div class='del'>-    0x3e6,</div><div class='del'>-    0x41a,</div><div class='del'>-    0x454,</div><div class='del'>-    0x534,</div><div class='del'>-};</div><div class='add'>+static struct backlight_properties riva_bl_data;</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int riva_bl_get_level_brightness(struct riva_par *par,</div><div class='add'>+		int level)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	int nlevel;</div><div class='add'>+</div><div class='add'>+	/* Get and convert the value */</div><div class='add'>+	nlevel = MIN_LEVEL + info-&gt;bl_curve[level] * LEVEL_STEP;</div><div class='add'>+</div><div class='add'>+	if (nlevel &lt; 0)</div><div class='add'>+		nlevel = 0;</div><div class='add'>+	else if (nlevel &lt; MIN_LEVEL)</div><div class='add'>+		nlevel = MIN_LEVEL;</div><div class='add'>+	else if (nlevel &gt; MAX_LEVEL)</div><div class='add'>+		nlevel = MAX_LEVEL;</div><div class='add'>+</div><div class='add'>+	return nlevel;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call with fb_info-&gt;bl_mutex held */</div><div class='add'>+static int __riva_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct riva_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	U032 tmp_pcrt, tmp_pmc;</div><div class='add'>+	int level;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;props-&gt;power != FB_BLANK_UNBLANK ||</div><div class='add'>+	    bd-&gt;props-&gt;fb_blank != FB_BLANK_UNBLANK)</div><div class='add'>+		level = 0;</div><div class='add'>+	else</div><div class='add'>+		level = bd-&gt;props-&gt;brightness;</div><div class='ctx'> </div><div class='del'>-static int riva_set_backlight_enable(int on, int level, void *data);</div><div class='del'>-static int riva_set_backlight_level(int level, void *data);</div><div class='del'>-static struct backlight_controller riva_backlight_controller = {</div><div class='del'>-	riva_set_backlight_enable,</div><div class='del'>-	riva_set_backlight_level</div><div class='add'>+	tmp_pmc = par-&gt;riva.PMC[0x10F0/4] &amp; 0x0000FFFF;</div><div class='add'>+	tmp_pcrt = par-&gt;riva.PCRTC0[0x081C/4] &amp; 0xFFFFFFFC;</div><div class='add'>+	if(level &gt; 0) {</div><div class='add'>+		tmp_pcrt |= 0x1;</div><div class='add'>+		tmp_pmc |= (1 &lt;&lt; 31); /* backlight bit */</div><div class='add'>+		tmp_pmc |= riva_bl_get_level_brightness(par, level) &lt;&lt; 16; /* level */</div><div class='add'>+	}</div><div class='add'>+	par-&gt;riva.PCRTC0[0x081C/4] = tmp_pcrt;</div><div class='add'>+	par-&gt;riva.PMC[0x10F0/4] = tmp_pmc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int riva_bl_update_status(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	struct riva_par *par = class_get_devdata(&amp;bd-&gt;class_dev);</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	ret = __riva_bl_update_status(bd);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int riva_bl_get_brightness(struct backlight_device *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;props-&gt;brightness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct backlight_properties riva_bl_data = {</div><div class='add'>+	.owner    = THIS_MODULE,</div><div class='add'>+	.get_brightness = riva_bl_get_brightness,</div><div class='add'>+	.update_status	= riva_bl_update_status,</div><div class='add'>+	.max_brightness = (FB_BACKLIGHT_LEVELS - 1),</div><div class='ctx'> };</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='add'>+</div><div class='add'>+static void riva_bl_set_power(struct fb_info *info, int power)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	up(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	info-&gt;bl_dev-&gt;props-&gt;power = power;</div><div class='add'>+	__riva_bl_update_status(info-&gt;bl_dev);</div><div class='add'>+	down(&amp;info-&gt;bl_dev-&gt;sem);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void riva_bl_init(struct riva_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+	struct backlight_device *bd;</div><div class='add'>+	char name[12];</div><div class='add'>+</div><div class='add'>+	if (!par-&gt;FlatPanel)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	if (!machine_is(powermac) ||</div><div class='add'>+	    !pmac_has_backlight_type("mnca"))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "rivabl%d", info-&gt;node);</div><div class='add'>+</div><div class='add'>+	bd = backlight_device_register(name, par, &amp;riva_bl_data);</div><div class='add'>+	if (IS_ERR(bd)) {</div><div class='add'>+		info-&gt;bl_dev = NULL;</div><div class='add'>+		printk("riva: Backlight registration failed\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	info-&gt;bl_dev = bd;</div><div class='add'>+	fb_bl_default_curve(info, 0,</div><div class='add'>+		0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,</div><div class='add'>+		0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+	up(&amp;bd-&gt;sem);</div><div class='add'>+	bd-&gt;props-&gt;brightness = riva_bl_data.max_brightness;</div><div class='add'>+	bd-&gt;props-&gt;power = FB_BLANK_UNBLANK;</div><div class='add'>+	bd-&gt;props-&gt;update_status(bd);</div><div class='add'>+	down(&amp;bd-&gt;sem);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+	if (!pmac_backlight)</div><div class='add'>+		pmac_backlight = bd;</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	printk("riva: Backlight initialized (%s)\n", name);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void riva_bl_exit(struct riva_par *par)</div><div class='add'>+{</div><div class='add'>+	struct fb_info *info = pci_get_drvdata(par-&gt;pdev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_lock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;info-&gt;bl_mutex);</div><div class='add'>+	if (info-&gt;bl_dev) {</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+		if (pmac_backlight == info-&gt;bl_dev)</div><div class='add'>+			pmac_backlight = NULL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		backlight_device_unregister(info-&gt;bl_dev);</div><div class='add'>+</div><div class='add'>+		printk("riva: Backlight unloaded\n");</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;info-&gt;bl_mutex);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='add'>+	mutex_unlock(&amp;pmac_backlight_mutex);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void riva_bl_init(struct riva_par *par) {}</div><div class='add'>+static inline void riva_bl_exit(struct riva_par *par) {}</div><div class='add'>+static inline void riva_bl_set_power(struct fb_info *info, int power) {}</div><div class='add'>+#endif /* CONFIG_FB_RIVA_BACKLIGHT */</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- *</div><div class='ctx'>  *</div><div class='hunk'>@@ -973,36 +1117,6 @@ static int riva_get_cmap_len(const struct fb_var_screeninfo *var)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------------------------------------------------- *</div><div class='ctx'>  *</div><div class='del'>- * Backlight operations</div><div class='del'>- *</div><div class='del'>- * ------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-static int riva_set_backlight_enable(int on, int level, void *data)</div><div class='del'>-{</div><div class='del'>-	struct riva_par *par = data;</div><div class='del'>-	U032 tmp_pcrt, tmp_pmc;</div><div class='del'>-</div><div class='del'>-	tmp_pmc = par-&gt;riva.PMC[0x10F0/4] &amp; 0x0000FFFF;</div><div class='del'>-	tmp_pcrt = par-&gt;riva.PCRTC0[0x081C/4] &amp; 0xFFFFFFFC;</div><div class='del'>-	if(on &amp;&amp; (level &gt; BACKLIGHT_OFF)) {</div><div class='del'>-		tmp_pcrt |= 0x1;</div><div class='del'>-		tmp_pmc |= (1 &lt;&lt; 31); // backlight bit</div><div class='del'>-		tmp_pmc |= riva_backlight_levels[level-1] &lt;&lt; 16; // level</div><div class='del'>-	}</div><div class='del'>-	par-&gt;riva.PCRTC0[0x081C/4] = tmp_pcrt;</div><div class='del'>-	par-&gt;riva.PMC[0x10F0/4] = tmp_pmc;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int riva_set_backlight_level(int level, void *data)</div><div class='del'>-{</div><div class='del'>-	return riva_set_backlight_enable(1, level, data);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PMAC_BACKLIGHT */</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------------------- *</div><div class='del'>- *</div><div class='ctx'>  * framebuffer operations</div><div class='ctx'>  *</div><div class='ctx'>  * ------------------------------------------------------------------------- */</div><div class='hunk'>@@ -1247,11 +1361,7 @@ static int rivafb_blank(int blank, struct fb_info *info)</div><div class='ctx'> 	SEQout(par, 0x01, tmp);</div><div class='ctx'> 	CRTCout(par, 0x1a, vesa);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	if ( par-&gt;FlatPanel &amp;&amp; machine_is(powermac)) {</div><div class='del'>-		set_backlight_enable(!blank);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	riva_bl_set_power(info, blank);</div><div class='ctx'> </div><div class='ctx'> 	NVTRACE_LEAVE();</div><div class='ctx'> </div><div class='hunk'>@@ -2037,11 +2147,9 @@ static int __devinit rivafb_probe(struct pci_dev *pd,</div><div class='ctx'> 		RIVAFB_VERSION,</div><div class='ctx'> 		info-&gt;fix.smem_len / (1024 * 1024),</div><div class='ctx'> 		info-&gt;fix.smem_start);</div><div class='del'>-#ifdef CONFIG_PMAC_BACKLIGHT</div><div class='del'>-	if (default_par-&gt;FlatPanel &amp;&amp; machine_is(powermac))</div><div class='del'>-		register_backlight_controller(&amp;riva_backlight_controller,</div><div class='del'>-					      default_par, "mnca");</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	riva_bl_init(info-&gt;par);</div><div class='add'>+</div><div class='ctx'> 	NVTRACE_LEAVE();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2058,7 +2166,6 @@ err_iounmap_ctrl_base:</div><div class='ctx'> err_release_region:</div><div class='ctx'> 	pci_release_regions(pd);</div><div class='ctx'> err_disable_device:</div><div class='del'>-	pci_disable_device(pd);</div><div class='ctx'> err_free_pixmap:</div><div class='ctx'> 	kfree(info-&gt;pixmap.addr);</div><div class='ctx'> err_framebuffer_release:</div><div class='hunk'>@@ -2074,6 +2181,8 @@ static void __exit rivafb_remove(struct pci_dev *pd)</div><div class='ctx'> 	</div><div class='ctx'> 	NVTRACE_ENTER();</div><div class='ctx'> </div><div class='add'>+	riva_bl_exit(par);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_FB_RIVA_I2C</div><div class='ctx'> 	riva_delete_i2c_busses(par);</div><div class='ctx'> 	kfree(par-&gt;EDID);</div><div class='hunk'>@@ -2091,7 +2200,6 @@ static void __exit rivafb_remove(struct pci_dev *pd)</div><div class='ctx'> 	if (par-&gt;riva.Architecture == NV_ARCH_03)</div><div class='ctx'> 		iounmap(par-&gt;riva.PRAMIN);</div><div class='ctx'> 	pci_release_regions(pd);</div><div class='del'>-	pci_disable_device(pd);</div><div class='ctx'> 	kfree(info-&gt;pixmap.addr);</div><div class='ctx'> 	framebuffer_release(info);</div><div class='ctx'> 	pci_set_drvdata(pd, NULL);</div><div class='head'>diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c<br/>index 8b1967fc116a..9751c37c0bfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/riva/rivafb-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/riva/rivafb-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/riva/rivafb-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/riva/rivafb-i2c.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h<br/>index 440ff445689b..7fa13fc9c413 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/riva/rivafb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/riva/rivafb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/riva/rivafb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/riva/rivafb.h</a></div><div class='hunk'>@@ -1,7 +1,6 @@</div><div class='ctx'> #ifndef __RIVAFB_H</div><div class='ctx'> #define __RIVAFB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='head'>diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c<br/>index feec47bdd479..a5333c190789 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/s1d13xxxfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/s1d13xxxfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/s1d13xxxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/s1d13xxxfb.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  * more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c<br/>index 9451932fbaf2..ad3bdd6f1ac1 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/s3c2410fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/s3c2410fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/s3c2410fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/s3c2410fb.c</a></div><div class='hunk'>@@ -76,7 +76,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -641,6 +640,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int i;</div><div class='add'>+	u32 lcdcon1;</div><div class='ctx'> </div><div class='ctx'> 	mach_info = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	if (mach_info == NULL) {</div><div class='hunk'>@@ -672,6 +672,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;info-&gt;regs, &amp;mach_info-&gt;regs, sizeof(info-&gt;regs));</div><div class='ctx'> </div><div class='add'>+	/* Stop the video and unset ENVID if set */</div><div class='add'>+	info-&gt;regs.lcdcon1 &amp;= ~S3C2410_LCDCON1_ENVID;</div><div class='add'>+	lcdcon1 = readl(S3C2410_LCDCON1);</div><div class='add'>+	writel(lcdcon1 &amp; ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);</div><div class='add'>+</div><div class='ctx'> 	info-&gt;mach_info		    = pdev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='ctx'> 	fbinfo-&gt;fix.type	    = FB_TYPE_PACKED_PIXELS;</div><div class='hunk'>@@ -729,7 +734,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dprintk("got LCD region\n");</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev-&gt;name, info);</div><div class='add'>+	ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev-&gt;name, info);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "cannot get irq %d - err %d\n", irq, ret);</div><div class='ctx'> 		ret = -EBUSY;</div><div class='hunk'>@@ -794,15 +799,14 @@ dealloc_fb:</div><div class='ctx'>  * shutdown the lcd controller</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static void s3c2410fb_stop_lcd(void)</div><div class='add'>+static void s3c2410fb_stop_lcd(struct s3c2410fb_info *fbi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	unsigned long tmp;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_save(flags);</div><div class='ctx'> </div><div class='del'>-	tmp = readl(S3C2410_LCDCON1);</div><div class='del'>-	writel(tmp &amp; ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);</div><div class='add'>+	fbi-&gt;regs.lcdcon1 &amp;= ~S3C2410_LCDCON1_ENVID;</div><div class='add'>+	writel(fbi-&gt;regs.lcdcon1, S3C2410_LCDCON1);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_restore(flags);</div><div class='ctx'> }</div><div class='hunk'>@@ -816,7 +820,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)</div><div class='ctx'> 	struct s3c2410fb_info *info = fbinfo-&gt;par;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='del'>-	s3c2410fb_stop_lcd();</div><div class='add'>+	s3c2410fb_stop_lcd(info);</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='ctx'> 	s3c2410fb_unmap_video_memory(info);</div><div class='hunk'>@@ -844,7 +848,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)</div><div class='ctx'> 	struct fb_info	   *fbinfo = platform_get_drvdata(dev);</div><div class='ctx'> 	struct s3c2410fb_info *info = fbinfo-&gt;par;</div><div class='ctx'> </div><div class='del'>-	s3c2410fb_stop_lcd();</div><div class='add'>+	s3c2410fb_stop_lcd(info);</div><div class='ctx'> </div><div class='ctx'> 	/* sleep before disabling the clock, we need to ensure</div><div class='ctx'> 	 * the LCD DMA engine is not going to get back on the bus</div><div class='head'>diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c<br/>index d9831fd42341..a2e6e7205d7e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sa1100fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sa1100fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sa1100fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sa1100fb.c</a></div><div class='hunk'>@@ -160,7 +160,6 @@</div><div class='ctx'>  *	- Add patch 681/1 and clean up stork definitions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -1473,7 +1472,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT,</div><div class='add'>+	ret = request_irq(irq, sa1100fb_handle_irq, IRQF_DISABLED,</div><div class='ctx'> 			  "LCD", fbi);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret);</div><div class='head'>diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c<br/>index 21debed863ac..e83befd16d63 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/savage/savagefb-i2c.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/savage/savagefb-i2c.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/savage/savagefb-i2c.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/savage/savagefb-i2c.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='head'>diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h<br/>index 58cfdfb41833..e648a6c0f6d9 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/savage/savagefb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/savage/savagefb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/savage/savagefb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/savage/savagefb.h</a></div><div class='hunk'>@@ -147,7 +147,27 @@ struct xtimings {</div><div class='ctx'> 	int	       interlaced;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct savage_reg {</div><div class='add'>+	unsigned char MiscOutReg;     /* Misc */</div><div class='add'>+	unsigned char CRTC[25];       /* Crtc Controller */</div><div class='add'>+	unsigned char Sequencer[5];   /* Video Sequencer */</div><div class='add'>+	unsigned char Graphics[9];    /* Video Graphics */</div><div class='add'>+	unsigned char Attribute[21];  /* Video Atribute */</div><div class='ctx'> </div><div class='add'>+	unsigned int mode, refresh;</div><div class='add'>+	unsigned char SR08, SR0E, SR0F;</div><div class='add'>+	unsigned char SR10, SR11, SR12, SR13, SR15, SR18, SR29, SR30;</div><div class='add'>+	unsigned char SR54[8];</div><div class='add'>+	unsigned char Clock;</div><div class='add'>+	unsigned char CR31, CR32, CR33, CR34, CR36, CR3A, CR3B, CR3C;</div><div class='add'>+	unsigned char CR40, CR41, CR42, CR43, CR45;</div><div class='add'>+	unsigned char CR50, CR51, CR53, CR55, CR58, CR5B, CR5D, CR5E;</div><div class='add'>+	unsigned char CR60, CR63, CR65, CR66, CR67, CR68, CR69, CR6D, CR6F;</div><div class='add'>+	unsigned char CR86, CR88;</div><div class='add'>+	unsigned char CR90, CR91, CRB0;</div><div class='add'>+	unsigned int  STREAMS[22];	/* yuck, streams regs */</div><div class='add'>+	unsigned int  MMPR0, MMPR1, MMPR2, MMPR3;</div><div class='add'>+};</div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='ctx'> #define NR_PALETTE	256</div><div class='hunk'>@@ -167,6 +187,8 @@ struct savagefb_par {</div><div class='ctx'> 	struct pci_dev *pcidev;</div><div class='ctx'> 	savage_chipset  chip;</div><div class='ctx'> 	struct savagefb_i2c_chan chan;</div><div class='add'>+	struct savage_reg state;</div><div class='add'>+	struct savage_reg save;</div><div class='ctx'> 	unsigned char   *edid;</div><div class='ctx'> 	u32 pseudo_palette[16];</div><div class='ctx'> 	int paletteEnabled;</div><div class='hunk'>@@ -179,6 +201,7 @@ struct savagefb_par {</div><div class='ctx'> 	int minClock;</div><div class='ctx'> 	int numClocks;</div><div class='ctx'> 	int clock[4];</div><div class='add'>+	int MCLK, REFCLK, LCDclk;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u8   __iomem *vbase;</div><div class='ctx'> 		u32    pbase;</div><div class='hunk'>@@ -196,7 +219,6 @@ struct savagefb_par {</div><div class='ctx'> </div><div class='ctx'> 	volatile u32  __iomem *bci_base;</div><div class='ctx'> 	unsigned int  bci_ptr;</div><div class='del'>-</div><div class='ctx'> 	u32           cob_offset;</div><div class='ctx'> 	u32           cob_size;</div><div class='ctx'> 	int           cob_index;</div><div class='hunk'>@@ -204,7 +226,6 @@ struct savagefb_par {</div><div class='ctx'> 	void (*SavageWaitIdle) (struct savagefb_par *par);</div><div class='ctx'> 	void (*SavageWaitFifo) (struct savagefb_par *par, int space);</div><div class='ctx'> </div><div class='del'>-	int MCLK, REFCLK, LCDclk;</div><div class='ctx'> 	int HorizScaleFactor;</div><div class='ctx'> </div><div class='ctx'> 	/* Panels size */</div><div class='hunk'>@@ -217,26 +238,6 @@ struct savagefb_par {</div><div class='ctx'> </div><div class='ctx'> 	int depth;</div><div class='ctx'> 	int vwidth;</div><div class='del'>-</div><div class='del'>-	unsigned char MiscOutReg;     /* Misc */</div><div class='del'>-	unsigned char CRTC[25];       /* Crtc Controller */</div><div class='del'>-	unsigned char Sequencer[5];   /* Video Sequencer */</div><div class='del'>-	unsigned char Graphics[9];    /* Video Graphics */</div><div class='del'>-	unsigned char Attribute[21];  /* Video Atribute */</div><div class='del'>-</div><div class='del'>-	unsigned int mode, refresh;</div><div class='del'>-	unsigned char SR08, SR0E, SR0F;</div><div class='del'>-	unsigned char SR10, SR11, SR12, SR13, SR15, SR18, SR29, SR30;</div><div class='del'>-	unsigned char SR54[8];</div><div class='del'>-	unsigned char Clock;</div><div class='del'>-	unsigned char CR31, CR32, CR33, CR34, CR36, CR3A, CR3B, CR3C;</div><div class='del'>-	unsigned char CR40, CR41, CR42, CR43, CR45;</div><div class='del'>-	unsigned char CR50, CR51, CR53, CR55, CR58, CR5B, CR5D, CR5E;</div><div class='del'>-	unsigned char CR60, CR63, CR65, CR66, CR67, CR68, CR69, CR6D, CR6F;</div><div class='del'>-	unsigned char CR86, CR88;</div><div class='del'>-	unsigned char CR90, CR91, CRB0;</div><div class='del'>-	unsigned int  STREAMS[22];	/* yuck, streams regs */</div><div class='del'>-	unsigned int  MMPR0, MMPR1, MMPR2, MMPR3;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BCI_BD_BW_DISABLE            0x10000000</div><div class='head'>diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c<br/>index 0da624e6524f..461e094e7b45 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/savage/savagefb_driver.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/savage/savagefb_driver.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/savage/savagefb_driver.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/savage/savagefb_driver.c</a></div><div class='hunk'>@@ -41,13 +41,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -86,15 +84,15 @@ MODULE_DESCRIPTION("FBDev driver for S3 Savage PCI/AGP Chips");</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static void vgaHWSeqReset (struct savagefb_par *par, int start)</div><div class='add'>+static void vgaHWSeqReset(struct savagefb_par *par, int start)</div><div class='ctx'> {</div><div class='ctx'> 	if (start)</div><div class='del'>-		VGAwSEQ (0x00, 0x01, par);	/* Synchronous Reset */</div><div class='add'>+		VGAwSEQ(0x00, 0x01, par);	/* Synchronous Reset */</div><div class='ctx'> 	else</div><div class='del'>-		VGAwSEQ (0x00, 0x03, par);	/* End Reset */</div><div class='add'>+		VGAwSEQ(0x00, 0x03, par);	/* End Reset */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vgaHWProtect (struct savagefb_par *par, int on)</div><div class='add'>+static void vgaHWProtect(struct savagefb_par *par, int on)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -102,10 +100,10 @@ static void vgaHWProtect (struct savagefb_par *par, int on)</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Turn off screen and disable sequencer.</div><div class='ctx'> 		 */</div><div class='del'>-		tmp = VGArSEQ (0x01, par);</div><div class='add'>+		tmp = VGArSEQ(0x01, par);</div><div class='ctx'> </div><div class='del'>-		vgaHWSeqReset (par, 1);	        /* start synchronous reset */</div><div class='del'>-		VGAwSEQ (0x01, tmp | 0x20, par);/* disable the display */</div><div class='add'>+		vgaHWSeqReset(par, 1);	        /* start synchronous reset */</div><div class='add'>+		VGAwSEQ(0x01, tmp | 0x20, par);/* disable the display */</div><div class='ctx'> </div><div class='ctx'> 		VGAenablePalette(par);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -113,75 +111,76 @@ static void vgaHWProtect (struct savagefb_par *par, int on)</div><div class='ctx'> 		 * Reenable sequencer, then turn on screen.</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='del'>-		tmp = VGArSEQ (0x01, par);</div><div class='add'>+		tmp = VGArSEQ(0x01, par);</div><div class='ctx'> </div><div class='del'>-		VGAwSEQ (0x01, tmp &amp; ~0x20, par);/* reenable display */</div><div class='del'>-		vgaHWSeqReset (par, 0);	        /* clear synchronous reset */</div><div class='add'>+		VGAwSEQ(0x01, tmp &amp; ~0x20, par);/* reenable display */</div><div class='add'>+		vgaHWSeqReset(par, 0);	        /* clear synchronous reset */</div><div class='ctx'> </div><div class='ctx'> 		VGAdisablePalette(par);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vgaHWRestore (struct savagefb_par  *par)</div><div class='add'>+static void vgaHWRestore(struct savagefb_par  *par, struct savage_reg *reg)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	VGAwMISC (par-&gt;MiscOutReg, par);</div><div class='add'>+	VGAwMISC(reg-&gt;MiscOutReg, par);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt; 5; i++)</div><div class='del'>-		VGAwSEQ (i, par-&gt;Sequencer[i], par);</div><div class='add'>+		VGAwSEQ(i, reg-&gt;Sequencer[i], par);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 or</div><div class='ctx'> 	   CRTC[17] */</div><div class='del'>-	VGAwCR (17, par-&gt;CRTC[17] &amp; ~0x80, par);</div><div class='add'>+	VGAwCR(17, reg-&gt;CRTC[17] &amp; ~0x80, par);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 25; i++)</div><div class='del'>-		VGAwCR (i, par-&gt;CRTC[i], par);</div><div class='add'>+		VGAwCR(i, reg-&gt;CRTC[i], par);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 9; i++)</div><div class='del'>-		VGAwGR (i, par-&gt;Graphics[i], par);</div><div class='add'>+		VGAwGR(i, reg-&gt;Graphics[i], par);</div><div class='ctx'> </div><div class='ctx'> 	VGAenablePalette(par);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 21; i++)</div><div class='del'>-		VGAwATTR (i, par-&gt;Attribute[i], par);</div><div class='add'>+		VGAwATTR(i, reg-&gt;Attribute[i], par);</div><div class='ctx'> </div><div class='ctx'> 	VGAdisablePalette(par);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vgaHWInit (struct fb_var_screeninfo *var,</div><div class='del'>-		       struct savagefb_par            *par,</div><div class='del'>-		       struct xtimings                *timings)</div><div class='add'>+static void vgaHWInit(struct fb_var_screeninfo *var,</div><div class='add'>+		      struct savagefb_par            *par,</div><div class='add'>+		      struct xtimings                *timings,</div><div class='add'>+		      struct savage_reg              *reg)</div><div class='ctx'> {</div><div class='del'>-	par-&gt;MiscOutReg = 0x23;</div><div class='add'>+	reg-&gt;MiscOutReg = 0x23;</div><div class='ctx'> </div><div class='ctx'> 	if (!(timings-&gt;sync &amp; FB_SYNC_HOR_HIGH_ACT))</div><div class='del'>-		par-&gt;MiscOutReg |= 0x40;</div><div class='add'>+		reg-&gt;MiscOutReg |= 0x40;</div><div class='ctx'> </div><div class='ctx'> 	if (!(timings-&gt;sync &amp; FB_SYNC_VERT_HIGH_ACT))</div><div class='del'>-		par-&gt;MiscOutReg |= 0x80;</div><div class='add'>+		reg-&gt;MiscOutReg |= 0x80;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Time Sequencer</div><div class='ctx'> 	 */</div><div class='del'>-	par-&gt;Sequencer[0x00] = 0x00;</div><div class='del'>-	par-&gt;Sequencer[0x01] = 0x01;</div><div class='del'>-	par-&gt;Sequencer[0x02] = 0x0F;</div><div class='del'>-	par-&gt;Sequencer[0x03] = 0x00;          /* Font select */</div><div class='del'>-	par-&gt;Sequencer[0x04] = 0x0E;          /* Misc */</div><div class='add'>+	reg-&gt;Sequencer[0x00] = 0x00;</div><div class='add'>+	reg-&gt;Sequencer[0x01] = 0x01;</div><div class='add'>+	reg-&gt;Sequencer[0x02] = 0x0F;</div><div class='add'>+	reg-&gt;Sequencer[0x03] = 0x00;          /* Font select */</div><div class='add'>+	reg-&gt;Sequencer[0x04] = 0x0E;          /* Misc */</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * CRTC Controller</div><div class='ctx'> 	 */</div><div class='del'>-	par-&gt;CRTC[0x00] = (timings-&gt;HTotal &gt;&gt; 3) - 5;</div><div class='del'>-	par-&gt;CRTC[0x01] = (timings-&gt;HDisplay &gt;&gt; 3) - 1;</div><div class='del'>-	par-&gt;CRTC[0x02] = (timings-&gt;HSyncStart &gt;&gt; 3) - 1;</div><div class='del'>-	par-&gt;CRTC[0x03] = (((timings-&gt;HSyncEnd &gt;&gt; 3)  - 1) &amp; 0x1f) | 0x80;</div><div class='del'>-	par-&gt;CRTC[0x04] = (timings-&gt;HSyncStart &gt;&gt; 3);</div><div class='del'>-	par-&gt;CRTC[0x05] = ((((timings-&gt;HSyncEnd &gt;&gt; 3) - 1) &amp; 0x20) &lt;&lt; 2) |</div><div class='add'>+	reg-&gt;CRTC[0x00] = (timings-&gt;HTotal &gt;&gt; 3) - 5;</div><div class='add'>+	reg-&gt;CRTC[0x01] = (timings-&gt;HDisplay &gt;&gt; 3) - 1;</div><div class='add'>+	reg-&gt;CRTC[0x02] = (timings-&gt;HSyncStart &gt;&gt; 3) - 1;</div><div class='add'>+	reg-&gt;CRTC[0x03] = (((timings-&gt;HSyncEnd &gt;&gt; 3)  - 1) &amp; 0x1f) | 0x80;</div><div class='add'>+	reg-&gt;CRTC[0x04] = (timings-&gt;HSyncStart &gt;&gt; 3);</div><div class='add'>+	reg-&gt;CRTC[0x05] = ((((timings-&gt;HSyncEnd &gt;&gt; 3) - 1) &amp; 0x20) &lt;&lt; 2) |</div><div class='ctx'> 		(((timings-&gt;HSyncEnd &gt;&gt; 3)) &amp; 0x1f);</div><div class='del'>-	par-&gt;CRTC[0x06] = (timings-&gt;VTotal - 2) &amp; 0xFF;</div><div class='del'>-	par-&gt;CRTC[0x07] = (((timings-&gt;VTotal - 2) &amp; 0x100) &gt;&gt; 8) |</div><div class='add'>+	reg-&gt;CRTC[0x06] = (timings-&gt;VTotal - 2) &amp; 0xFF;</div><div class='add'>+	reg-&gt;CRTC[0x07] = (((timings-&gt;VTotal - 2) &amp; 0x100) &gt;&gt; 8) |</div><div class='ctx'> 		(((timings-&gt;VDisplay - 1) &amp; 0x100) &gt;&gt; 7) |</div><div class='ctx'> 		((timings-&gt;VSyncStart &amp; 0x100) &gt;&gt; 6) |</div><div class='ctx'> 		(((timings-&gt;VSyncStart - 1) &amp; 0x100) &gt;&gt; 5) |</div><div class='hunk'>@@ -189,27 +188,27 @@ static void vgaHWInit (struct fb_var_screeninfo *var,</div><div class='ctx'> 		(((timings-&gt;VTotal - 2) &amp; 0x200) &gt;&gt; 4) |</div><div class='ctx'> 		(((timings-&gt;VDisplay - 1) &amp; 0x200) &gt;&gt; 3) |</div><div class='ctx'> 		((timings-&gt;VSyncStart &amp; 0x200) &gt;&gt; 2);</div><div class='del'>-	par-&gt;CRTC[0x08] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x09] = (((timings-&gt;VSyncStart - 1) &amp; 0x200) &gt;&gt; 4) | 0x40;</div><div class='add'>+	reg-&gt;CRTC[0x08] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x09] = (((timings-&gt;VSyncStart - 1) &amp; 0x200) &gt;&gt; 4) | 0x40;</div><div class='ctx'> </div><div class='ctx'> 	if (timings-&gt;dblscan)</div><div class='del'>-		par-&gt;CRTC[0x09] |= 0x80;</div><div class='del'>-</div><div class='del'>-	par-&gt;CRTC[0x0a] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x0b] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x0c] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x0d] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x0e] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x0f] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x10] = timings-&gt;VSyncStart &amp; 0xff;</div><div class='del'>-	par-&gt;CRTC[0x11] = (timings-&gt;VSyncEnd &amp; 0x0f) | 0x20;</div><div class='del'>-	par-&gt;CRTC[0x12] = (timings-&gt;VDisplay - 1) &amp; 0xff;</div><div class='del'>-	par-&gt;CRTC[0x13] = var-&gt;xres_virtual &gt;&gt; 4;</div><div class='del'>-	par-&gt;CRTC[0x14] = 0x00;</div><div class='del'>-	par-&gt;CRTC[0x15] = (timings-&gt;VSyncStart - 1) &amp; 0xff;</div><div class='del'>-	par-&gt;CRTC[0x16] = (timings-&gt;VSyncEnd - 1) &amp; 0xff;</div><div class='del'>-	par-&gt;CRTC[0x17] = 0xc3;</div><div class='del'>-	par-&gt;CRTC[0x18] = 0xff;</div><div class='add'>+		reg-&gt;CRTC[0x09] |= 0x80;</div><div class='add'>+</div><div class='add'>+	reg-&gt;CRTC[0x0a] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x0b] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x0c] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x0d] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x0e] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x0f] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x10] = timings-&gt;VSyncStart &amp; 0xff;</div><div class='add'>+	reg-&gt;CRTC[0x11] = (timings-&gt;VSyncEnd &amp; 0x0f) | 0x20;</div><div class='add'>+	reg-&gt;CRTC[0x12] = (timings-&gt;VDisplay - 1) &amp; 0xff;</div><div class='add'>+	reg-&gt;CRTC[0x13] = var-&gt;xres_virtual &gt;&gt; 4;</div><div class='add'>+	reg-&gt;CRTC[0x14] = 0x00;</div><div class='add'>+	reg-&gt;CRTC[0x15] = (timings-&gt;VSyncStart - 1) &amp; 0xff;</div><div class='add'>+	reg-&gt;CRTC[0x16] = (timings-&gt;VSyncEnd - 1) &amp; 0xff;</div><div class='add'>+	reg-&gt;CRTC[0x17] = 0xc3;</div><div class='add'>+	reg-&gt;CRTC[0x18] = 0xff;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * are these unnecessary?</div><div class='hunk'>@@ -220,38 +219,38 @@ static void vgaHWInit (struct fb_var_screeninfo *var,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Graphics Display Controller</div><div class='ctx'> 	 */</div><div class='del'>-	par-&gt;Graphics[0x00] = 0x00;</div><div class='del'>-	par-&gt;Graphics[0x01] = 0x00;</div><div class='del'>-	par-&gt;Graphics[0x02] = 0x00;</div><div class='del'>-	par-&gt;Graphics[0x03] = 0x00;</div><div class='del'>-	par-&gt;Graphics[0x04] = 0x00;</div><div class='del'>-	par-&gt;Graphics[0x05] = 0x40;</div><div class='del'>-	par-&gt;Graphics[0x06] = 0x05;   /* only map 64k VGA memory !!!! */</div><div class='del'>-	par-&gt;Graphics[0x07] = 0x0F;</div><div class='del'>-	par-&gt;Graphics[0x08] = 0xFF;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	par-&gt;Attribute[0x00]  = 0x00; /* standard colormap translation */</div><div class='del'>-	par-&gt;Attribute[0x01]  = 0x01;</div><div class='del'>-	par-&gt;Attribute[0x02]  = 0x02;</div><div class='del'>-	par-&gt;Attribute[0x03]  = 0x03;</div><div class='del'>-	par-&gt;Attribute[0x04]  = 0x04;</div><div class='del'>-	par-&gt;Attribute[0x05]  = 0x05;</div><div class='del'>-	par-&gt;Attribute[0x06]  = 0x06;</div><div class='del'>-	par-&gt;Attribute[0x07]  = 0x07;</div><div class='del'>-	par-&gt;Attribute[0x08]  = 0x08;</div><div class='del'>-	par-&gt;Attribute[0x09]  = 0x09;</div><div class='del'>-	par-&gt;Attribute[0x0a] = 0x0A;</div><div class='del'>-	par-&gt;Attribute[0x0b] = 0x0B;</div><div class='del'>-	par-&gt;Attribute[0x0c] = 0x0C;</div><div class='del'>-	par-&gt;Attribute[0x0d] = 0x0D;</div><div class='del'>-	par-&gt;Attribute[0x0e] = 0x0E;</div><div class='del'>-	par-&gt;Attribute[0x0f] = 0x0F;</div><div class='del'>-	par-&gt;Attribute[0x10] = 0x41;</div><div class='del'>-	par-&gt;Attribute[0x11] = 0xFF;</div><div class='del'>-	par-&gt;Attribute[0x12] = 0x0F;</div><div class='del'>-	par-&gt;Attribute[0x13] = 0x00;</div><div class='del'>-	par-&gt;Attribute[0x14] = 0x00;</div><div class='add'>+	reg-&gt;Graphics[0x00] = 0x00;</div><div class='add'>+	reg-&gt;Graphics[0x01] = 0x00;</div><div class='add'>+	reg-&gt;Graphics[0x02] = 0x00;</div><div class='add'>+	reg-&gt;Graphics[0x03] = 0x00;</div><div class='add'>+	reg-&gt;Graphics[0x04] = 0x00;</div><div class='add'>+	reg-&gt;Graphics[0x05] = 0x40;</div><div class='add'>+	reg-&gt;Graphics[0x06] = 0x05;   /* only map 64k VGA memory !!!! */</div><div class='add'>+	reg-&gt;Graphics[0x07] = 0x0F;</div><div class='add'>+	reg-&gt;Graphics[0x08] = 0xFF;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	reg-&gt;Attribute[0x00]  = 0x00; /* standard colormap translation */</div><div class='add'>+	reg-&gt;Attribute[0x01]  = 0x01;</div><div class='add'>+	reg-&gt;Attribute[0x02]  = 0x02;</div><div class='add'>+	reg-&gt;Attribute[0x03]  = 0x03;</div><div class='add'>+	reg-&gt;Attribute[0x04]  = 0x04;</div><div class='add'>+	reg-&gt;Attribute[0x05]  = 0x05;</div><div class='add'>+	reg-&gt;Attribute[0x06]  = 0x06;</div><div class='add'>+	reg-&gt;Attribute[0x07]  = 0x07;</div><div class='add'>+	reg-&gt;Attribute[0x08]  = 0x08;</div><div class='add'>+	reg-&gt;Attribute[0x09]  = 0x09;</div><div class='add'>+	reg-&gt;Attribute[0x0a] = 0x0A;</div><div class='add'>+	reg-&gt;Attribute[0x0b] = 0x0B;</div><div class='add'>+	reg-&gt;Attribute[0x0c] = 0x0C;</div><div class='add'>+	reg-&gt;Attribute[0x0d] = 0x0D;</div><div class='add'>+	reg-&gt;Attribute[0x0e] = 0x0E;</div><div class='add'>+	reg-&gt;Attribute[0x0f] = 0x0F;</div><div class='add'>+	reg-&gt;Attribute[0x10] = 0x41;</div><div class='add'>+	reg-&gt;Attribute[0x11] = 0xFF;</div><div class='add'>+	reg-&gt;Attribute[0x12] = 0x0F;</div><div class='add'>+	reg-&gt;Attribute[0x13] = 0x00;</div><div class='add'>+	reg-&gt;Attribute[0x14] = 0x00;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -------------------- Hardware specific routines ------------------------- */</div><div class='hunk'>@@ -304,15 +303,15 @@ savage2000_waitidle(struct savagefb_par *par)</div><div class='ctx'> 	while ((savage_in32(0x48C60, par) &amp; 0x009fffff));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_FB_SAVAGE_ACCEL</div><div class='ctx'> static void</div><div class='del'>-SavageSetup2DEngine (struct savagefb_par  *par)</div><div class='add'>+SavageSetup2DEngine(struct savagefb_par  *par)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long GlobalBitmapDescriptor;</div><div class='ctx'> </div><div class='ctx'> 	GlobalBitmapDescriptor = 1 | 8 | BCI_BD_BW_DISABLE;</div><div class='del'>-	BCI_BD_SET_BPP (GlobalBitmapDescriptor, par-&gt;depth);</div><div class='del'>-	BCI_BD_SET_STRIDE (GlobalBitmapDescriptor, par-&gt;vwidth);</div><div class='add'>+	BCI_BD_SET_BPP(GlobalBitmapDescriptor, par-&gt;depth);</div><div class='add'>+	BCI_BD_SET_STRIDE(GlobalBitmapDescriptor, par-&gt;vwidth);</div><div class='ctx'> </div><div class='ctx'> 	switch(par-&gt;chip) {</div><div class='ctx'> 	case S3_SAVAGE3D:</div><div class='hunk'>@@ -361,32 +360,48 @@ SavageSetup2DEngine (struct savagefb_par  *par)</div><div class='ctx'> 	vga_out8(0x3d5, 0x0c, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Set stride to use GBD. */</div><div class='del'>-	vga_out8 (0x3d4, 0x50, par);</div><div class='del'>-	vga_out8 (0x3d5, vga_in8(0x3d5, par) | 0xC1, par);</div><div class='add'>+	vga_out8(0x3d4, 0x50, par);</div><div class='add'>+	vga_out8(0x3d5, vga_in8(0x3d5, par) | 0xC1, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable 2D engine. */</div><div class='del'>-	vga_out8 (0x3d4, 0x40, par);</div><div class='del'>-	vga_out8 (0x3d5, 0x01, par);</div><div class='add'>+	vga_out8(0x3d4, 0x40, par);</div><div class='add'>+	vga_out8(0x3d5, 0x01, par);</div><div class='ctx'> </div><div class='del'>-	savage_out32 (MONO_PAT_0, ~0, par);</div><div class='del'>-	savage_out32 (MONO_PAT_1, ~0, par);</div><div class='add'>+	savage_out32(MONO_PAT_0, ~0, par);</div><div class='add'>+	savage_out32(MONO_PAT_1, ~0, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup plane masks */</div><div class='del'>-	savage_out32 (0x8128, ~0, par); /* enable all write planes */</div><div class='del'>-	savage_out32 (0x812C, ~0, par); /* enable all read planes */</div><div class='del'>-	savage_out16 (0x8134, 0x27, par);</div><div class='del'>-	savage_out16 (0x8136, 0x07, par);</div><div class='add'>+	savage_out32(0x8128, ~0, par); /* enable all write planes */</div><div class='add'>+	savage_out32(0x812C, ~0, par); /* enable all read planes */</div><div class='add'>+	savage_out16(0x8134, 0x27, par);</div><div class='add'>+	savage_out16(0x8136, 0x07, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Now set the GBD */</div><div class='ctx'> 	par-&gt;bci_ptr = 0;</div><div class='del'>-	par-&gt;SavageWaitFifo (par, 4);</div><div class='add'>+	par-&gt;SavageWaitFifo(par, 4);</div><div class='ctx'> </div><div class='del'>-	BCI_SEND( BCI_CMD_SETREG | (1 &lt;&lt; 16) | BCI_GBD1 );</div><div class='del'>-	BCI_SEND( 0 );</div><div class='del'>-	BCI_SEND( BCI_CMD_SETREG | (1 &lt;&lt; 16) | BCI_GBD2 );</div><div class='del'>-	BCI_SEND( GlobalBitmapDescriptor );</div><div class='add'>+	BCI_SEND(BCI_CMD_SETREG | (1 &lt;&lt; 16) | BCI_GBD1);</div><div class='add'>+	BCI_SEND(0);</div><div class='add'>+	BCI_SEND(BCI_CMD_SETREG | (1 &lt;&lt; 16) | BCI_GBD2);</div><div class='add'>+	BCI_SEND(GlobalBitmapDescriptor);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void savagefb_set_clip(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct savagefb_par *par = info-&gt;par;</div><div class='add'>+	int cmd;</div><div class='add'>+</div><div class='add'>+	cmd = BCI_CMD_NOP | BCI_CMD_CLIP_NEW;</div><div class='add'>+	par-&gt;bci_ptr = 0;</div><div class='add'>+	par-&gt;SavageWaitFifo(par,3);</div><div class='add'>+	BCI_SEND(cmd);</div><div class='add'>+	BCI_SEND(BCI_CLIP_TL(0, 0));</div><div class='add'>+	BCI_SEND(BCI_CLIP_BR(0xfff, 0xfff));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void SavageSetup2DEngine(struct savagefb_par  *par) {}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void SavageCalcClock(long freq, int min_m, int min_n1, int max_n1,</div><div class='ctx'> 			    int min_n2, int max_n2, long freq_min,</div><div class='hunk'>@@ -398,11 +413,11 @@ static void SavageCalcClock(long freq, int min_m, int min_n1, int max_n1,</div><div class='ctx'> 	unsigned char n1, n2, best_n1=16+2, best_n2=2, best_m=125+2;</div><div class='ctx'> </div><div class='ctx'> 	if (freq &lt; freq_min / (1 &lt;&lt; max_n2)) {</div><div class='del'>-		printk (KERN_ERR "invalid frequency %ld Khz\n", freq);</div><div class='add'>+		printk(KERN_ERR "invalid frequency %ld Khz\n", freq);</div><div class='ctx'> 		freq = freq_min / (1 &lt;&lt; max_n2);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (freq &gt; freq_max / (1 &lt;&lt; min_n2)) {</div><div class='del'>-		printk (KERN_ERR "invalid frequency %ld Khz\n", freq);</div><div class='add'>+		printk(KERN_ERR "invalid frequency %ld Khz\n", freq);</div><div class='ctx'> 		freq = freq_max / (1 &lt;&lt; min_n2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -453,12 +468,12 @@ static int common_calc_clock(long freq, int min_m, int min_n1, int max_n1,</div><div class='ctx'> 				BASE_FREQ;</div><div class='ctx'> 			if (m &lt; min_m + 2 || m &gt; 127+2)</div><div class='ctx'> 				continue;</div><div class='del'>-			if((m * BASE_FREQ &gt;= freq_min * n1) &amp;&amp;</div><div class='del'>-			   (m * BASE_FREQ &lt;= freq_max * n1)) {</div><div class='add'>+			if ((m * BASE_FREQ &gt;= freq_min * n1) &amp;&amp;</div><div class='add'>+			    (m * BASE_FREQ &lt;= freq_max * n1)) {</div><div class='ctx'> 				diff = freq * (1 &lt;&lt; n2) * n1 - BASE_FREQ * m;</div><div class='del'>-				if(diff &lt; 0)</div><div class='add'>+				if (diff &lt; 0)</div><div class='ctx'> 					diff = -diff;</div><div class='del'>-				if(diff &lt; best_diff) {</div><div class='add'>+				if (diff &lt; best_diff) {</div><div class='ctx'> 					best_diff = diff;</div><div class='ctx'> 					best_m = m;</div><div class='ctx'> 					best_n1 = n1;</div><div class='hunk'>@@ -468,7 +483,7 @@ static int common_calc_clock(long freq, int min_m, int min_n1, int max_n1,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(max_n1 == 63)</div><div class='add'>+	if (max_n1 == 63)</div><div class='ctx'> 		*ndiv = (best_n1 - 2) | (best_n2 &lt;&lt; 6);</div><div class='ctx'> 	else</div><div class='ctx'> 		*ndiv = (best_n1 - 2) | (best_n2 &lt;&lt; 5);</div><div class='hunk'>@@ -488,23 +503,23 @@ static void SavagePrintRegs(void)</div><div class='ctx'> 	int vgaCRReg = 0x3d5;</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "SR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE "</div><div class='del'>-	       "xF" );</div><div class='add'>+	       "xF");</div><div class='ctx'> </div><div class='del'>-	for( i = 0; i &lt; 0x70; i++ ) {</div><div class='del'>-		if( !(i % 16) )</div><div class='del'>-			printk(KERN_DEBUG "\nSR%xx ", i &gt;&gt; 4 );</div><div class='del'>-		vga_out8( 0x3c4, i, par);</div><div class='del'>-		printk(KERN_DEBUG " %02x", vga_in8(0x3c5, par) );</div><div class='add'>+	for (i = 0; i &lt; 0x70; i++) {</div><div class='add'>+		if (!(i % 16))</div><div class='add'>+			printk(KERN_DEBUG "\nSR%xx ", i &gt;&gt; 4);</div><div class='add'>+		vga_out8(0x3c4, i, par);</div><div class='add'>+		printk(KERN_DEBUG " %02x", vga_in8(0x3c5, par));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "\n\nCR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC "</div><div class='del'>-	       "xD xE xF" );</div><div class='add'>+	       "xD xE xF");</div><div class='ctx'> </div><div class='del'>-	for( i = 0; i &lt; 0xB7; i++ ) {</div><div class='del'>-		if( !(i % 16) )</div><div class='del'>-			printk(KERN_DEBUG "\nCR%xx ", i &gt;&gt; 4 );</div><div class='del'>-		vga_out8( vgaCRIndex, i, par);</div><div class='del'>-		printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg, par) );</div><div class='add'>+	for (i = 0; i &lt; 0xB7; i++) {</div><div class='add'>+		if (!(i % 16))</div><div class='add'>+			printk(KERN_DEBUG "\nCR%xx ", i &gt;&gt; 4);</div><div class='add'>+		vga_out8(vgaCRIndex, i, par);</div><div class='add'>+		printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg, par));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_DEBUG "\n\n");</div><div class='hunk'>@@ -513,156 +528,309 @@ static void SavagePrintRegs(void)</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static void savage_get_default_par(struct savagefb_par *par)</div><div class='add'>+static void savage_get_default_par(struct savagefb_par *par, struct savage_reg *reg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char cr3a, cr53, cr66;</div><div class='ctx'> </div><div class='del'>-	vga_out16 (0x3d4, 0x4838, par);</div><div class='del'>-	vga_out16 (0x3d4, 0xa039, par);</div><div class='del'>-	vga_out16 (0x3c4, 0x0608, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	cr66 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66 | 0x80, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	cr3a = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a | 0x80, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x53, par);</div><div class='del'>-	cr53 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr53 &amp; 0x7f, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a, par);</div><div class='add'>+	vga_out16(0x3d4, 0x4838, par);</div><div class='add'>+	vga_out16(0x3d4, 0xa039, par);</div><div class='add'>+	vga_out16(0x3c4, 0x0608, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	cr66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	cr3a = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x53, par);</div><div class='add'>+	cr53 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr53 &amp; 0x7f, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='ctx'> </div><div class='ctx'> 	/* unlock extended seq regs */</div><div class='del'>-	vga_out8 (0x3c4, 0x08, par);</div><div class='del'>-	par-&gt;SR08 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c5, 0x06, par);</div><div class='add'>+	vga_out8(0x3c4, 0x08, par);</div><div class='add'>+	reg-&gt;SR08 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c5, 0x06, par);</div><div class='ctx'> </div><div class='ctx'> 	/* now save all the extended regs we need */</div><div class='del'>-	vga_out8 (0x3d4, 0x31, par);</div><div class='del'>-	par-&gt;CR31 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x32, par);</div><div class='del'>-	par-&gt;CR32 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x34, par);</div><div class='del'>-	par-&gt;CR34 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x36, par);</div><div class='del'>-	par-&gt;CR36 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	par-&gt;CR3A = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x40, par);</div><div class='del'>-	par-&gt;CR40 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x42, par);</div><div class='del'>-	par-&gt;CR42 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x45, par);</div><div class='del'>-	par-&gt;CR45 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x50, par);</div><div class='del'>-	par-&gt;CR50 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x51, par);</div><div class='del'>-	par-&gt;CR51 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x53, par);</div><div class='del'>-	par-&gt;CR53 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x58, par);</div><div class='del'>-	par-&gt;CR58 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x60, par);</div><div class='del'>-	par-&gt;CR60 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	par-&gt;CR66 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x67, par);</div><div class='del'>-	par-&gt;CR67 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x68, par);</div><div class='del'>-	par-&gt;CR68 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x69, par);</div><div class='del'>-	par-&gt;CR69 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x6f, par);</div><div class='del'>-	par-&gt;CR6F = vga_in8 (0x3d5, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3d4, 0x33, par);</div><div class='del'>-	par-&gt;CR33 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x86, par);</div><div class='del'>-	par-&gt;CR86 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x88, par);</div><div class='del'>-	par-&gt;CR88 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x90, par);</div><div class='del'>-	par-&gt;CR90 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x91, par);</div><div class='del'>-	par-&gt;CR91 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0xb0, par);</div><div class='del'>-	par-&gt;CRB0 = vga_in8 (0x3d5, par) | 0x80;</div><div class='add'>+	vga_out8(0x3d4, 0x31, par);</div><div class='add'>+	reg-&gt;CR31 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x32, par);</div><div class='add'>+	reg-&gt;CR32 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x34, par);</div><div class='add'>+	reg-&gt;CR34 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x36, par);</div><div class='add'>+	reg-&gt;CR36 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	reg-&gt;CR3A = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x40, par);</div><div class='add'>+	reg-&gt;CR40 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x42, par);</div><div class='add'>+	reg-&gt;CR42 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x45, par);</div><div class='add'>+	reg-&gt;CR45 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x50, par);</div><div class='add'>+	reg-&gt;CR50 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x51, par);</div><div class='add'>+	reg-&gt;CR51 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x53, par);</div><div class='add'>+	reg-&gt;CR53 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x58, par);</div><div class='add'>+	reg-&gt;CR58 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x60, par);</div><div class='add'>+	reg-&gt;CR60 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	reg-&gt;CR66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x67, par);</div><div class='add'>+	reg-&gt;CR67 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x68, par);</div><div class='add'>+	reg-&gt;CR68 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x69, par);</div><div class='add'>+	reg-&gt;CR69 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x6f, par);</div><div class='add'>+	reg-&gt;CR6F = vga_in8(0x3d5, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x33, par);</div><div class='add'>+	reg-&gt;CR33 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x86, par);</div><div class='add'>+	reg-&gt;CR86 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x88, par);</div><div class='add'>+	reg-&gt;CR88 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x90, par);</div><div class='add'>+	reg-&gt;CR90 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x91, par);</div><div class='add'>+	reg-&gt;CR91 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0xb0, par);</div><div class='add'>+	reg-&gt;CRB0 = vga_in8(0x3d5, par) | 0x80;</div><div class='add'>+</div><div class='add'>+	/* extended mode timing regs */</div><div class='add'>+	vga_out8(0x3d4, 0x3b, par);</div><div class='add'>+	reg-&gt;CR3B = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3c, par);</div><div class='add'>+	reg-&gt;CR3C = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x43, par);</div><div class='add'>+	reg-&gt;CR43 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x5d, par);</div><div class='add'>+	reg-&gt;CR5D = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x5e, par);</div><div class='add'>+	reg-&gt;CR5E = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x65, par);</div><div class='add'>+	reg-&gt;CR65 = vga_in8(0x3d5, par);</div><div class='add'>+</div><div class='add'>+	/* save seq extended regs for DCLK PLL programming */</div><div class='add'>+	vga_out8(0x3c4, 0x0e, par);</div><div class='add'>+	reg-&gt;SR0E = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0f, par);</div><div class='add'>+	reg-&gt;SR0F = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x10, par);</div><div class='add'>+	reg-&gt;SR10 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x11, par);</div><div class='add'>+	reg-&gt;SR11 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x12, par);</div><div class='add'>+	reg-&gt;SR12 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x13, par);</div><div class='add'>+	reg-&gt;SR13 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x29, par);</div><div class='add'>+	reg-&gt;SR29 = vga_in8(0x3c5, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3c4, 0x15, par);</div><div class='add'>+	reg-&gt;SR15 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x30, par);</div><div class='add'>+	reg-&gt;SR30 = vga_in8(0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x18, par);</div><div class='add'>+	reg-&gt;SR18 = vga_in8(0x3c5, par);</div><div class='add'>+</div><div class='add'>+	/* Save flat panel expansion regsters. */</div><div class='add'>+	if (par-&gt;chip == S3_SAVAGE_MX) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			vga_out8(0x3c4, 0x54+i, par);</div><div class='add'>+			reg-&gt;SR54[i] = vga_in8(0x3c5, par);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	cr66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	cr3a = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a | 0x80, par);</div><div class='add'>+</div><div class='add'>+	/* now save MIU regs */</div><div class='add'>+	if (par-&gt;chip != S3_SAVAGE_MX) {</div><div class='add'>+		reg-&gt;MMPR0 = savage_in32(FIFO_CONTROL_REG, par);</div><div class='add'>+		reg-&gt;MMPR1 = savage_in32(MIU_CONTROL_REG, par);</div><div class='add'>+		reg-&gt;MMPR2 = savage_in32(STREAMS_TIMEOUT_REG, par);</div><div class='add'>+		reg-&gt;MMPR3 = savage_in32(MISC_TIMEOUT_REG, par);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void savage_set_default_par(struct savagefb_par *par,</div><div class='add'>+				struct savage_reg *reg)</div><div class='add'>+{</div><div class='add'>+	unsigned char cr3a, cr53, cr66;</div><div class='add'>+</div><div class='add'>+	vga_out16(0x3d4, 0x4838, par);</div><div class='add'>+	vga_out16(0x3d4, 0xa039, par);</div><div class='add'>+	vga_out16(0x3c4, 0x0608, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	cr66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	cr3a = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x53, par);</div><div class='add'>+	cr53 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr53 &amp; 0x7f, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='add'>+</div><div class='add'>+	/* unlock extended seq regs */</div><div class='add'>+	vga_out8(0x3c4, 0x08, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR08, par);</div><div class='add'>+	vga_out8(0x3c5, 0x06, par);</div><div class='add'>+</div><div class='add'>+	/* now restore all the extended regs we need */</div><div class='add'>+	vga_out8(0x3d4, 0x31, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR31, par);</div><div class='add'>+	vga_out8(0x3d4, 0x32, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR32, par);</div><div class='add'>+	vga_out8(0x3d4, 0x34, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR34, par);</div><div class='add'>+	vga_out8(0x3d4, 0x36, par);</div><div class='add'>+	vga_out8(0x3d5,reg-&gt;CR36, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR3A, par);</div><div class='add'>+	vga_out8(0x3d4, 0x40, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR40, par);</div><div class='add'>+	vga_out8(0x3d4, 0x42, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR42, par);</div><div class='add'>+	vga_out8(0x3d4, 0x45, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR45, par);</div><div class='add'>+	vga_out8(0x3d4, 0x50, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR50, par);</div><div class='add'>+	vga_out8(0x3d4, 0x51, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR51, par);</div><div class='add'>+	vga_out8(0x3d4, 0x53, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR53, par);</div><div class='add'>+	vga_out8(0x3d4, 0x58, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR58, par);</div><div class='add'>+	vga_out8(0x3d4, 0x60, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR60, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x67, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR67, par);</div><div class='add'>+	vga_out8(0x3d4, 0x68, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR68, par);</div><div class='add'>+	vga_out8(0x3d4, 0x69, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR69, par);</div><div class='add'>+	vga_out8(0x3d4, 0x6f, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR6F, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x33, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR33, par);</div><div class='add'>+	vga_out8(0x3d4, 0x86, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR86, par);</div><div class='add'>+	vga_out8(0x3d4, 0x88, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR88, par);</div><div class='add'>+	vga_out8(0x3d4, 0x90, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR90, par);</div><div class='add'>+	vga_out8(0x3d4, 0x91, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR91, par);</div><div class='add'>+	vga_out8(0x3d4, 0xb0, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CRB0, par);</div><div class='ctx'> </div><div class='ctx'> 	/* extended mode timing regs */</div><div class='del'>-	vga_out8 (0x3d4, 0x3b, par);</div><div class='del'>-	par-&gt;CR3B = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3c, par);</div><div class='del'>-	par-&gt;CR3C = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x43, par);</div><div class='del'>-	par-&gt;CR43 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x5d, par);</div><div class='del'>-	par-&gt;CR5D = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x5e, par);</div><div class='del'>-	par-&gt;CR5E = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x65, par);</div><div class='del'>-	par-&gt;CR65 = vga_in8 (0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3b, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR3B, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3c, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR3C, par);</div><div class='add'>+	vga_out8(0x3d4, 0x43, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR43, par);</div><div class='add'>+	vga_out8(0x3d4, 0x5d, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR5D, par);</div><div class='add'>+	vga_out8(0x3d4, 0x5e, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR5E, par);</div><div class='add'>+	vga_out8(0x3d4, 0x65, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR65, par);</div><div class='ctx'> </div><div class='ctx'> 	/* save seq extended regs for DCLK PLL programming */</div><div class='del'>-	vga_out8 (0x3c4, 0x0e, par);</div><div class='del'>-	par-&gt;SR0E = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x0f, par);</div><div class='del'>-	par-&gt;SR0F = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x10, par);</div><div class='del'>-	par-&gt;SR10 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x11, par);</div><div class='del'>-	par-&gt;SR11 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x12, par);</div><div class='del'>-	par-&gt;SR12 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x13, par);</div><div class='del'>-	par-&gt;SR13 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x29, par);</div><div class='del'>-	par-&gt;SR29 = vga_in8 (0x3c5, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3c4, 0x15, par);</div><div class='del'>-	par-&gt;SR15 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x30, par);</div><div class='del'>-	par-&gt;SR30 = vga_in8 (0x3c5, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x18, par);</div><div class='del'>-	par-&gt;SR18 = vga_in8 (0x3c5, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0e, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR0E, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0f, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR0F, par);</div><div class='add'>+	vga_out8(0x3c4, 0x10, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR10, par);</div><div class='add'>+	vga_out8(0x3c4, 0x11, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR11, par);</div><div class='add'>+	vga_out8(0x3c4, 0x12, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR12, par);</div><div class='add'>+	vga_out8(0x3c4, 0x13, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR13, par);</div><div class='add'>+	vga_out8(0x3c4, 0x29, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR29, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3c4, 0x15, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR15, par);</div><div class='add'>+	vga_out8(0x3c4, 0x30, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR30, par);</div><div class='add'>+	vga_out8(0x3c4, 0x18, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR18, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Save flat panel expansion regsters. */</div><div class='ctx'> 	if (par-&gt;chip == S3_SAVAGE_MX) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 8; i++) {</div><div class='del'>-			vga_out8 (0x3c4, 0x54+i, par);</div><div class='del'>-			par-&gt;SR54[i] = vga_in8 (0x3c5, par);</div><div class='add'>+			vga_out8(0x3c4, 0x54+i, par);</div><div class='add'>+			vga_out8(0x3c5, reg-&gt;SR54[i], par);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	cr66 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66 | 0x80, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	cr3a = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	cr66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	cr3a = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a | 0x80, par);</div><div class='ctx'> </div><div class='ctx'> 	/* now save MIU regs */</div><div class='ctx'> 	if (par-&gt;chip != S3_SAVAGE_MX) {</div><div class='del'>-		par-&gt;MMPR0 = savage_in32(FIFO_CONTROL_REG, par);</div><div class='del'>-		par-&gt;MMPR1 = savage_in32(MIU_CONTROL_REG, par);</div><div class='del'>-		par-&gt;MMPR2 = savage_in32(STREAMS_TIMEOUT_REG, par);</div><div class='del'>-		par-&gt;MMPR3 = savage_in32(MISC_TIMEOUT_REG, par);</div><div class='add'>+		savage_out32(FIFO_CONTROL_REG, reg-&gt;MMPR0, par);</div><div class='add'>+		savage_out32(MIU_CONTROL_REG, reg-&gt;MMPR1, par);</div><div class='add'>+		savage_out32(STREAMS_TIMEOUT_REG, reg-&gt;MMPR2, par);</div><div class='add'>+		savage_out32(MISC_TIMEOUT_REG, reg-&gt;MMPR3, par);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode *modedb)</div><div class='hunk'>@@ -683,8 +851,8 @@ static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode</div><div class='ctx'>         var-&gt;vmode = modedb-&gt;vmode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int savagefb_check_var (struct fb_var_screeninfo   *var,</div><div class='del'>-			       struct fb_info *info)</div><div class='add'>+static int savagefb_check_var(struct fb_var_screeninfo   *var,</div><div class='add'>+			      struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='ctx'> 	int memlen, vramlen, mode_valid = 0;</div><div class='hunk'>@@ -750,10 +918,10 @@ static int savagefb_check_var (struct fb_var_screeninfo   *var,</div><div class='ctx'> 	if (par-&gt;SavagePanelWidth &amp;&amp;</div><div class='ctx'> 	    (var-&gt;xres &gt; par-&gt;SavagePanelWidth ||</div><div class='ctx'> 	     var-&gt;yres &gt; par-&gt;SavagePanelHeight)) {</div><div class='del'>-		printk (KERN_INFO "Mode (%dx%d) larger than the LCD panel "</div><div class='del'>-			"(%dx%d)\n", var-&gt;xres,  var-&gt;yres,</div><div class='del'>-			par-&gt;SavagePanelWidth,</div><div class='del'>-			par-&gt;SavagePanelHeight);</div><div class='add'>+		printk(KERN_INFO "Mode (%dx%d) larger than the LCD panel "</div><div class='add'>+		       "(%dx%d)\n", var-&gt;xres,  var-&gt;yres,</div><div class='add'>+		       par-&gt;SavagePanelWidth,</div><div class='add'>+		       par-&gt;SavagePanelHeight);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -788,8 +956,9 @@ static int savagefb_check_var (struct fb_var_screeninfo   *var,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int savagefb_decode_var (struct fb_var_screeninfo   *var,</div><div class='del'>-				struct savagefb_par        *par)</div><div class='add'>+static int savagefb_decode_var(struct fb_var_screeninfo   *var,</div><div class='add'>+			       struct savagefb_par        *par,</div><div class='add'>+			       struct savage_reg          *reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct xtimings timings;</div><div class='ctx'> 	int width, dclk, i, j; /*, refresh; */</div><div class='hunk'>@@ -799,7 +968,7 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,</div><div class='ctx'> </div><div class='ctx'> 	DBG("savagefb_decode_var");</div><div class='ctx'> </div><div class='del'>-	memset (&amp;timings, 0, sizeof(timings));</div><div class='add'>+	memset(&amp;timings, 0, sizeof(timings));</div><div class='ctx'> </div><div class='ctx'> 	if (!pixclock) pixclock = 10000;	/* 10ns = 100MHz */</div><div class='ctx'> 	timings.Clock = 1000000000 / pixclock;</div><div class='hunk'>@@ -831,39 +1000,39 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,</div><div class='ctx'> 	 * This will allocate the datastructure and initialize all of the</div><div class='ctx'> 	 * generic VGA registers.</div><div class='ctx'> 	 */</div><div class='del'>-	vgaHWInit (var, par, &amp;timings);</div><div class='add'>+	vgaHWInit(var, par, &amp;timings, reg);</div><div class='ctx'> </div><div class='ctx'> 	/* We need to set CR67 whether or not we use the BIOS. */</div><div class='ctx'> </div><div class='ctx'> 	dclk = timings.Clock;</div><div class='del'>-	par-&gt;CR67 = 0x00;</div><div class='add'>+	reg-&gt;CR67 = 0x00;</div><div class='ctx'> </div><div class='del'>-	switch( var-&gt;bits_per_pixel ) {</div><div class='add'>+	switch(var-&gt;bits_per_pixel) {</div><div class='ctx'> 	case 8:</div><div class='del'>-		if( (par-&gt;chip == S3_SAVAGE2000) &amp;&amp; (dclk &gt;= 230000) )</div><div class='del'>-			par-&gt;CR67 = 0x10;	/* 8bpp, 2 pixels/clock */</div><div class='add'>+		if ((par-&gt;chip == S3_SAVAGE2000) &amp;&amp; (dclk &gt;= 230000))</div><div class='add'>+			reg-&gt;CR67 = 0x10;	/* 8bpp, 2 pixels/clock */</div><div class='ctx'> 		else</div><div class='del'>-			par-&gt;CR67 = 0x00;	/* 8bpp, 1 pixel/clock */</div><div class='add'>+			reg-&gt;CR67 = 0x00;	/* 8bpp, 1 pixel/clock */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 15:</div><div class='del'>-		if ( S3_SAVAGE_MOBILE_SERIES(par-&gt;chip) ||</div><div class='del'>-		     ((par-&gt;chip == S3_SAVAGE2000) &amp;&amp; (dclk &gt;= 230000)) )</div><div class='del'>-			par-&gt;CR67 = 0x30;	/* 15bpp, 2 pixel/clock */</div><div class='add'>+		if (S3_SAVAGE_MOBILE_SERIES(par-&gt;chip) ||</div><div class='add'>+		    ((par-&gt;chip == S3_SAVAGE2000) &amp;&amp; (dclk &gt;= 230000)))</div><div class='add'>+			reg-&gt;CR67 = 0x30;	/* 15bpp, 2 pixel/clock */</div><div class='ctx'> 		else</div><div class='del'>-			par-&gt;CR67 = 0x20;	/* 15bpp, 1 pixels/clock */</div><div class='add'>+			reg-&gt;CR67 = 0x20;	/* 15bpp, 1 pixels/clock */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 16:</div><div class='del'>-		if( S3_SAVAGE_MOBILE_SERIES(par-&gt;chip) ||</div><div class='del'>-		    ((par-&gt;chip == S3_SAVAGE2000) &amp;&amp; (dclk &gt;= 230000)) )</div><div class='del'>-			par-&gt;CR67 = 0x50;	/* 16bpp, 2 pixel/clock */</div><div class='add'>+		if (S3_SAVAGE_MOBILE_SERIES(par-&gt;chip) ||</div><div class='add'>+		   ((par-&gt;chip == S3_SAVAGE2000) &amp;&amp; (dclk &gt;= 230000)))</div><div class='add'>+			reg-&gt;CR67 = 0x50;	/* 16bpp, 2 pixel/clock */</div><div class='ctx'> 		else</div><div class='del'>-			par-&gt;CR67 = 0x40;	/* 16bpp, 1 pixels/clock */</div><div class='add'>+			reg-&gt;CR67 = 0x40;	/* 16bpp, 1 pixels/clock */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 24:</div><div class='del'>-		par-&gt;CR67 = 0x70;</div><div class='add'>+		reg-&gt;CR67 = 0x70;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 32:</div><div class='del'>-		par-&gt;CR67 = 0xd0;</div><div class='add'>+		reg-&gt;CR67 = 0xd0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -872,61 +1041,61 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,</div><div class='ctx'> 	 * match.  Fall back to traditional register-crunching.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	tmp = vga_in8 (0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	tmp = vga_in8(0x3d5, par);</div><div class='ctx'> 	if (1 /*FIXME:psav-&gt;pci_burst*/)</div><div class='del'>-		par-&gt;CR3A = (tmp &amp; 0x7f) | 0x15;</div><div class='add'>+		reg-&gt;CR3A = (tmp &amp; 0x7f) | 0x15;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;CR3A = tmp | 0x95;</div><div class='add'>+		reg-&gt;CR3A = tmp | 0x95;</div><div class='ctx'> </div><div class='del'>-	par-&gt;CR53 = 0x00;</div><div class='del'>-	par-&gt;CR31 = 0x8c;</div><div class='del'>-	par-&gt;CR66 = 0x89;</div><div class='add'>+	reg-&gt;CR53 = 0x00;</div><div class='add'>+	reg-&gt;CR31 = 0x8c;</div><div class='add'>+	reg-&gt;CR66 = 0x89;</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x58, par);</div><div class='del'>-	par-&gt;CR58 = vga_in8 (0x3d5, par) &amp; 0x80;</div><div class='del'>-	par-&gt;CR58 |= 0x13;</div><div class='add'>+	vga_out8(0x3d4, 0x58, par);</div><div class='add'>+	reg-&gt;CR58 = vga_in8(0x3d5, par) &amp; 0x80;</div><div class='add'>+	reg-&gt;CR58 |= 0x13;</div><div class='ctx'> </div><div class='del'>-	par-&gt;SR15 = 0x03 | 0x80;</div><div class='del'>-	par-&gt;SR18 = 0x00;</div><div class='del'>-	par-&gt;CR43 = par-&gt;CR45 = par-&gt;CR65 = 0x00;</div><div class='add'>+	reg-&gt;SR15 = 0x03 | 0x80;</div><div class='add'>+	reg-&gt;SR18 = 0x00;</div><div class='add'>+	reg-&gt;CR43 = reg-&gt;CR45 = reg-&gt;CR65 = 0x00;</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x40, par);</div><div class='del'>-	par-&gt;CR40 = vga_in8 (0x3d5, par) &amp; ~0x01;</div><div class='add'>+	vga_out8(0x3d4, 0x40, par);</div><div class='add'>+	reg-&gt;CR40 = vga_in8(0x3d5, par) &amp; ~0x01;</div><div class='ctx'> </div><div class='del'>-	par-&gt;MMPR0 = 0x010400;</div><div class='del'>-	par-&gt;MMPR1 = 0x00;</div><div class='del'>-	par-&gt;MMPR2 = 0x0808;</div><div class='del'>-	par-&gt;MMPR3 = 0x08080810;</div><div class='add'>+	reg-&gt;MMPR0 = 0x010400;</div><div class='add'>+	reg-&gt;MMPR1 = 0x00;</div><div class='add'>+	reg-&gt;MMPR2 = 0x0808;</div><div class='add'>+	reg-&gt;MMPR3 = 0x08080810;</div><div class='ctx'> </div><div class='del'>-	SavageCalcClock (dclk, 1, 1, 127, 0, 4, 180000, 360000, &amp;m, &amp;n, &amp;r);</div><div class='add'>+	SavageCalcClock(dclk, 1, 1, 127, 0, 4, 180000, 360000, &amp;m, &amp;n, &amp;r);</div><div class='ctx'> 	/* m = 107; n = 4; r = 2; */</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;MCLK &lt;= 0) {</div><div class='del'>-		par-&gt;SR10 = 255;</div><div class='del'>-		par-&gt;SR11 = 255;</div><div class='add'>+		reg-&gt;SR10 = 255;</div><div class='add'>+		reg-&gt;SR11 = 255;</div><div class='ctx'> 	} else {</div><div class='del'>-		common_calc_clock (par-&gt;MCLK, 1, 1, 31, 0, 3, 135000, 270000,</div><div class='del'>-				   &amp;par-&gt;SR11, &amp;par-&gt;SR10);</div><div class='del'>-		/*      par-&gt;SR10 = 80; // MCLK == 286000 */</div><div class='del'>-		/*      par-&gt;SR11 = 125; */</div><div class='add'>+		common_calc_clock(par-&gt;MCLK, 1, 1, 31, 0, 3, 135000, 270000,</div><div class='add'>+				   &amp;reg-&gt;SR11, &amp;reg-&gt;SR10);</div><div class='add'>+		/*      reg-&gt;SR10 = 80; // MCLK == 286000 */</div><div class='add'>+		/*      reg-&gt;SR11 = 125; */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	par-&gt;SR12 = (r &lt;&lt; 6) | (n &amp; 0x3f);</div><div class='del'>-	par-&gt;SR13 = m &amp; 0xff;</div><div class='del'>-	par-&gt;SR29 = (r &amp; 4) | (m &amp; 0x100) &gt;&gt; 5 | (n &amp; 0x40) &gt;&gt; 2;</div><div class='add'>+	reg-&gt;SR12 = (r &lt;&lt; 6) | (n &amp; 0x3f);</div><div class='add'>+	reg-&gt;SR13 = m &amp; 0xff;</div><div class='add'>+	reg-&gt;SR29 = (r &amp; 4) | (m &amp; 0x100) &gt;&gt; 5 | (n &amp; 0x40) &gt;&gt; 2;</div><div class='ctx'> </div><div class='ctx'> 	if (var-&gt;bits_per_pixel &lt; 24)</div><div class='del'>-		par-&gt;MMPR0 -= 0x8000;</div><div class='add'>+		reg-&gt;MMPR0 -= 0x8000;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;MMPR0 -= 0x4000;</div><div class='add'>+		reg-&gt;MMPR0 -= 0x4000;</div><div class='ctx'> </div><div class='ctx'> 	if (timings.interlaced)</div><div class='del'>-		par-&gt;CR42 = 0x20;</div><div class='add'>+		reg-&gt;CR42 = 0x20;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;CR42 = 0x00;</div><div class='add'>+		reg-&gt;CR42 = 0x00;</div><div class='ctx'> </div><div class='del'>-	par-&gt;CR34 = 0x10; /* display fifo */</div><div class='add'>+	reg-&gt;CR34 = 0x10; /* display fifo */</div><div class='ctx'> </div><div class='ctx'> 	i = ((((timings.HTotal &gt;&gt; 3) - 5) &amp; 0x100) &gt;&gt; 8) |</div><div class='ctx'> 		((((timings.HDisplay &gt;&gt; 3) - 1) &amp; 0x100) &gt;&gt; 7) |</div><div class='hunk'>@@ -938,77 +1107,77 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,</div><div class='ctx'> 	if ((timings.HSyncEnd &gt;&gt; 3) - (timings.HSyncStart &gt;&gt; 3) &gt; 32)</div><div class='ctx'> 		i |= 0x20;</div><div class='ctx'> </div><div class='del'>-	j = (par-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8) +</div><div class='del'>-	     par-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4) + 1) / 2;</div><div class='add'>+	j = (reg-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8) +</div><div class='add'>+	     reg-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4) + 1) / 2;</div><div class='ctx'> </div><div class='del'>-	if (j - (par-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4)) &lt; 4) {</div><div class='del'>-		if (par-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4) + 4 &lt;=</div><div class='del'>-		    par-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8))</div><div class='del'>-			j = par-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4) + 4;</div><div class='add'>+	if (j - (reg-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4)) &lt; 4) {</div><div class='add'>+		if (reg-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4) + 4 &lt;=</div><div class='add'>+		    reg-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8))</div><div class='add'>+			j = reg-&gt;CRTC[4] + ((i &amp; 0x10) &lt;&lt; 4) + 4;</div><div class='ctx'> 		else</div><div class='del'>-			j = par-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8) + 1;</div><div class='add'>+			j = reg-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8) + 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	par-&gt;CR3B = j &amp; 0xff;</div><div class='add'>+	reg-&gt;CR3B = j &amp; 0xff;</div><div class='ctx'> 	i |= (j &amp; 0x100) &gt;&gt; 2;</div><div class='del'>-	par-&gt;CR3C = (par-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8)) / 2;</div><div class='del'>-	par-&gt;CR5D = i;</div><div class='del'>-	par-&gt;CR5E = (((timings.VTotal - 2) &amp; 0x400) &gt;&gt; 10) |</div><div class='add'>+	reg-&gt;CR3C = (reg-&gt;CRTC[0] + ((i &amp; 0x01) &lt;&lt; 8)) / 2;</div><div class='add'>+	reg-&gt;CR5D = i;</div><div class='add'>+	reg-&gt;CR5E = (((timings.VTotal - 2) &amp; 0x400) &gt;&gt; 10) |</div><div class='ctx'> 		(((timings.VDisplay - 1) &amp; 0x400) &gt;&gt; 9) |</div><div class='ctx'> 		(((timings.VSyncStart) &amp; 0x400) &gt;&gt; 8) |</div><div class='ctx'> 		(((timings.VSyncStart) &amp; 0x400) &gt;&gt; 6) | 0x40;</div><div class='ctx'> 	width = (var-&gt;xres_virtual * ((var-&gt;bits_per_pixel+7) / 8)) &gt;&gt; 3;</div><div class='del'>-	par-&gt;CR91 = par-&gt;CRTC[19] = 0xff &amp; width;</div><div class='del'>-	par-&gt;CR51 = (0x300 &amp; width) &gt;&gt; 4;</div><div class='del'>-	par-&gt;CR90 = 0x80 | (width &gt;&gt; 8);</div><div class='del'>-	par-&gt;MiscOutReg |= 0x0c;</div><div class='add'>+	reg-&gt;CR91 = reg-&gt;CRTC[19] = 0xff &amp; width;</div><div class='add'>+	reg-&gt;CR51 = (0x300 &amp; width) &gt;&gt; 4;</div><div class='add'>+	reg-&gt;CR90 = 0x80 | (width &gt;&gt; 8);</div><div class='add'>+	reg-&gt;MiscOutReg |= 0x0c;</div><div class='ctx'> </div><div class='ctx'> 	/* Set frame buffer description. */</div><div class='ctx'> </div><div class='ctx'> 	if (var-&gt;bits_per_pixel &lt;= 8)</div><div class='del'>-		par-&gt;CR50 = 0;</div><div class='add'>+		reg-&gt;CR50 = 0;</div><div class='ctx'> 	else if (var-&gt;bits_per_pixel &lt;= 16)</div><div class='del'>-		par-&gt;CR50 = 0x10;</div><div class='add'>+		reg-&gt;CR50 = 0x10;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;CR50 = 0x30;</div><div class='add'>+		reg-&gt;CR50 = 0x30;</div><div class='ctx'> </div><div class='ctx'> 	if (var-&gt;xres_virtual &lt;= 640)</div><div class='del'>-		par-&gt;CR50 |= 0x40;</div><div class='add'>+		reg-&gt;CR50 |= 0x40;</div><div class='ctx'> 	else if (var-&gt;xres_virtual == 800)</div><div class='del'>-		par-&gt;CR50 |= 0x80;</div><div class='add'>+		reg-&gt;CR50 |= 0x80;</div><div class='ctx'> 	else if (var-&gt;xres_virtual == 1024)</div><div class='del'>-		par-&gt;CR50 |= 0x00;</div><div class='add'>+		reg-&gt;CR50 |= 0x00;</div><div class='ctx'> 	else if (var-&gt;xres_virtual == 1152)</div><div class='del'>-		par-&gt;CR50 |= 0x01;</div><div class='add'>+		reg-&gt;CR50 |= 0x01;</div><div class='ctx'> 	else if (var-&gt;xres_virtual == 1280)</div><div class='del'>-		par-&gt;CR50 |= 0xc0;</div><div class='add'>+		reg-&gt;CR50 |= 0xc0;</div><div class='ctx'> 	else if (var-&gt;xres_virtual == 1600)</div><div class='del'>-		par-&gt;CR50 |= 0x81;</div><div class='add'>+		reg-&gt;CR50 |= 0x81;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;CR50 |= 0xc1;	/* Use GBD */</div><div class='add'>+		reg-&gt;CR50 |= 0xc1;	/* Use GBD */</div><div class='ctx'> </div><div class='del'>-	if( par-&gt;chip == S3_SAVAGE2000 )</div><div class='del'>-		par-&gt;CR33 = 0x08;</div><div class='add'>+	if (par-&gt;chip == S3_SAVAGE2000)</div><div class='add'>+		reg-&gt;CR33 = 0x08;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;CR33 = 0x20;</div><div class='add'>+		reg-&gt;CR33 = 0x20;</div><div class='ctx'> </div><div class='del'>-	par-&gt;CRTC[0x17] = 0xeb;</div><div class='add'>+	reg-&gt;CRTC[0x17] = 0xeb;</div><div class='ctx'> </div><div class='del'>-	par-&gt;CR67 |= 1;</div><div class='add'>+	reg-&gt;CR67 |= 1;</div><div class='ctx'> </div><div class='ctx'> 	vga_out8(0x3d4, 0x36, par);</div><div class='del'>-	par-&gt;CR36 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x68, par);</div><div class='del'>-	par-&gt;CR68 = vga_in8 (0x3d5, par);</div><div class='del'>-	par-&gt;CR69 = 0;</div><div class='del'>-	vga_out8 (0x3d4, 0x6f, par);</div><div class='del'>-	par-&gt;CR6F = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x86, par);</div><div class='del'>-	par-&gt;CR86 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x88, par);</div><div class='del'>-	par-&gt;CR88 = vga_in8 (0x3d5, par) | 0x08;</div><div class='del'>-	vga_out8 (0x3d4, 0xb0, par);</div><div class='del'>-	par-&gt;CRB0 = vga_in8 (0x3d5, par) | 0x80;</div><div class='add'>+	reg-&gt;CR36 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x68, par);</div><div class='add'>+	reg-&gt;CR68 = vga_in8(0x3d5, par);</div><div class='add'>+	reg-&gt;CR69 = 0;</div><div class='add'>+	vga_out8(0x3d4, 0x6f, par);</div><div class='add'>+	reg-&gt;CR6F = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x86, par);</div><div class='add'>+	reg-&gt;CR86 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d4, 0x88, par);</div><div class='add'>+	reg-&gt;CR88 = vga_in8(0x3d5, par) | 0x08;</div><div class='add'>+	vga_out8(0x3d4, 0xb0, par);</div><div class='add'>+	reg-&gt;CRB0 = vga_in8(0x3d5, par) | 0x80;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1037,11 +1206,11 @@ static int savagefb_setcolreg(unsigned        regno,</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;var.bits_per_pixel) {</div><div class='ctx'> 	case 8:</div><div class='del'>-		vga_out8 (0x3c8, regno, par);</div><div class='add'>+		vga_out8(0x3c8, regno, par);</div><div class='ctx'> </div><div class='del'>-		vga_out8 (0x3c9, red   &gt;&gt; 10, par);</div><div class='del'>-		vga_out8 (0x3c9, green &gt;&gt; 10, par);</div><div class='del'>-		vga_out8 (0x3c9, blue  &gt;&gt; 10, par);</div><div class='add'>+		vga_out8(0x3c9, red   &gt;&gt; 10, par);</div><div class='add'>+		vga_out8(0x3c9, green &gt;&gt; 10, par);</div><div class='add'>+		vga_out8(0x3c9, blue  &gt;&gt; 10, par);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case 16:</div><div class='hunk'>@@ -1075,21 +1244,21 @@ static int savagefb_setcolreg(unsigned        regno,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void savagefb_set_par_int (struct savagefb_par  *par)</div><div class='add'>+static void savagefb_set_par_int(struct savagefb_par  *par, struct savage_reg *reg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char tmp, cr3a, cr66, cr67;</div><div class='ctx'> </div><div class='del'>-	DBG ("savagefb_set_par_int");</div><div class='add'>+	DBG("savagefb_set_par_int");</div><div class='ctx'> </div><div class='del'>-	par-&gt;SavageWaitIdle (par);</div><div class='add'>+	par-&gt;SavageWaitIdle(par);</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3c2, 0x23, par);</div><div class='add'>+	vga_out8(0x3c2, 0x23, par);</div><div class='ctx'> </div><div class='del'>-	vga_out16 (0x3d4, 0x4838, par);</div><div class='del'>-	vga_out16 (0x3d4, 0xa539, par);</div><div class='del'>-	vga_out16 (0x3c4, 0x0608, par);</div><div class='add'>+	vga_out16(0x3d4, 0x4838, par);</div><div class='add'>+	vga_out16(0x3d4, 0xa539, par);</div><div class='add'>+	vga_out16(0x3c4, 0x0608, par);</div><div class='ctx'> </div><div class='del'>-	vgaHWProtect (par, 1);</div><div class='add'>+	vgaHWProtect(par, 1);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Some Savage/MX and /IX systems go nuts when trying to exit the</div><div class='hunk'>@@ -1099,203 +1268,202 @@ static void savagefb_set_par_int (struct savagefb_par  *par)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	VerticalRetraceWait(par);</div><div class='del'>-	vga_out8 (0x3d4, 0x67, par);</div><div class='del'>-	cr67 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr67/*par-&gt;CR67*/ &amp; ~0x0c, par); /* no STREAMS yet */</div><div class='add'>+	vga_out8(0x3d4, 0x67, par);</div><div class='add'>+	cr67 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr67/*par-&gt;CR67*/ &amp; ~0x0c, par); /* no STREAMS yet */</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x23, par);</div><div class='del'>-	vga_out8 (0x3d5, 0x00, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x26, par);</div><div class='del'>-	vga_out8 (0x3d5, 0x00, par);</div><div class='add'>+	vga_out8(0x3d4, 0x23, par);</div><div class='add'>+	vga_out8(0x3d5, 0x00, par);</div><div class='add'>+	vga_out8(0x3d4, 0x26, par);</div><div class='add'>+	vga_out8(0x3d5, 0x00, par);</div><div class='ctx'> </div><div class='ctx'> 	/* restore extended regs */</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR66, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR3A, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x31, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR31, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x32, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR32, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x58, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR58, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x53, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR53 &amp; 0x7f, par);</div><div class='del'>-</div><div class='del'>-	vga_out16 (0x3c4, 0x0608, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR3A, par);</div><div class='add'>+	vga_out8(0x3d4, 0x31, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR31, par);</div><div class='add'>+	vga_out8(0x3d4, 0x32, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR32, par);</div><div class='add'>+	vga_out8(0x3d4, 0x58, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR58, par);</div><div class='add'>+	vga_out8(0x3d4, 0x53, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR53 &amp; 0x7f, par);</div><div class='add'>+</div><div class='add'>+	vga_out16(0x3c4, 0x0608, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore DCLK registers. */</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3c4, 0x0e, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR0E, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x0f, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR0F, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x29, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR29, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x15, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR15, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0e, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR0E, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0f, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR0F, par);</div><div class='add'>+	vga_out8(0x3c4, 0x29, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR29, par);</div><div class='add'>+	vga_out8(0x3c4, 0x15, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR15, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore flat panel expansion regsters. */</div><div class='del'>-	if( par-&gt;chip == S3_SAVAGE_MX ) {</div><div class='add'>+	if (par-&gt;chip == S3_SAVAGE_MX) {</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='del'>-		for( i = 0; i &lt; 8; i++ ) {</div><div class='del'>-			vga_out8 (0x3c4, 0x54+i, par);</div><div class='del'>-			vga_out8 (0x3c5, par-&gt;SR54[i], par);</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			vga_out8(0x3c4, 0x54+i, par);</div><div class='add'>+			vga_out8(0x3c5, reg-&gt;SR54[i], par);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vgaHWRestore (par);</div><div class='add'>+	vgaHWRestore (par, reg);</div><div class='ctx'> </div><div class='ctx'> 	/* extended mode timing registers */</div><div class='del'>-	vga_out8 (0x3d4, 0x53, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR53, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x5d, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR5D, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x5e, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR5E, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3b, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR3B, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3c, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR3C, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x43, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR43, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x65, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR65, par);</div><div class='add'>+	vga_out8(0x3d4, 0x53, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR53, par);</div><div class='add'>+	vga_out8(0x3d4, 0x5d, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR5D, par);</div><div class='add'>+	vga_out8(0x3d4, 0x5e, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR5E, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3b, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR3B, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3c, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR3C, par);</div><div class='add'>+	vga_out8(0x3d4, 0x43, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR43, par);</div><div class='add'>+	vga_out8(0x3d4, 0x65, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR65, par);</div><div class='ctx'> </div><div class='ctx'> 	/* restore the desired video mode with cr67 */</div><div class='del'>-	vga_out8 (0x3d4, 0x67, par);</div><div class='add'>+	vga_out8(0x3d4, 0x67, par);</div><div class='ctx'> 	/* following part not present in X11 driver */</div><div class='del'>-	cr67 = vga_in8 (0x3d5, par) &amp; 0xf;</div><div class='del'>-	vga_out8 (0x3d5, 0x50 | cr67, par);</div><div class='del'>-	udelay (10000);</div><div class='del'>-	vga_out8 (0x3d4, 0x67, par);</div><div class='add'>+	cr67 = vga_in8(0x3d5, par) &amp; 0xf;</div><div class='add'>+	vga_out8(0x3d5, 0x50 | cr67, par);</div><div class='add'>+	udelay(10000);</div><div class='add'>+	vga_out8(0x3d4, 0x67, par);</div><div class='ctx'> 	/* end of part */</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR67 &amp; ~0x0c, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR67 &amp; ~0x0c, par);</div><div class='ctx'> </div><div class='ctx'> 	/* other mode timing and extended regs */</div><div class='del'>-	vga_out8 (0x3d4, 0x34, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR34, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x40, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR40, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x42, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR42, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x45, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR45, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x50, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR50, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x51, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR51, par);</div><div class='add'>+	vga_out8(0x3d4, 0x34, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR34, par);</div><div class='add'>+	vga_out8(0x3d4, 0x40, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR40, par);</div><div class='add'>+	vga_out8(0x3d4, 0x42, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR42, par);</div><div class='add'>+	vga_out8(0x3d4, 0x45, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR45, par);</div><div class='add'>+	vga_out8(0x3d4, 0x50, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR50, par);</div><div class='add'>+	vga_out8(0x3d4, 0x51, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR51, par);</div><div class='ctx'> </div><div class='ctx'> 	/* memory timings */</div><div class='del'>-	vga_out8 (0x3d4, 0x36, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR36, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x60, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR60, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x68, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR68, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x69, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR69, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x6f, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR6F, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3d4, 0x33, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR33, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x86, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR86, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x88, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR88, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x90, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR90, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x91, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR91, par);</div><div class='add'>+	vga_out8(0x3d4, 0x36, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR36, par);</div><div class='add'>+	vga_out8(0x3d4, 0x60, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR60, par);</div><div class='add'>+	vga_out8(0x3d4, 0x68, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR68, par);</div><div class='add'>+	vga_out8(0x3d4, 0x69, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR69, par);</div><div class='add'>+	vga_out8(0x3d4, 0x6f, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR6F, par);</div><div class='add'>+</div><div class='add'>+	vga_out8(0x3d4, 0x33, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR33, par);</div><div class='add'>+	vga_out8(0x3d4, 0x86, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR86, par);</div><div class='add'>+	vga_out8(0x3d4, 0x88, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR88, par);</div><div class='add'>+	vga_out8(0x3d4, 0x90, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR90, par);</div><div class='add'>+	vga_out8(0x3d4, 0x91, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR91, par);</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;chip == S3_SAVAGE4) {</div><div class='del'>-		vga_out8 (0x3d4, 0xb0, par);</div><div class='del'>-		vga_out8 (0x3d5, par-&gt;CRB0, par);</div><div class='add'>+		vga_out8(0x3d4, 0xb0, par);</div><div class='add'>+		vga_out8(0x3d5, reg-&gt;CRB0, par);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x32, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR32, par);</div><div class='add'>+	vga_out8(0x3d4, 0x32, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR32, par);</div><div class='ctx'> </div><div class='ctx'> 	/* unlock extended seq regs */</div><div class='del'>-	vga_out8 (0x3c4, 0x08, par);</div><div class='del'>-	vga_out8 (0x3c5, 0x06, par);</div><div class='add'>+	vga_out8(0x3c4, 0x08, par);</div><div class='add'>+	vga_out8(0x3c5, 0x06, par);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore extended sequencer regs for MCLK. SR10 == 255 indicates</div><div class='ctx'> 	 * that we should leave the default SR10 and SR11 values there.</div><div class='ctx'> 	 */</div><div class='del'>-	if (par-&gt;SR10 != 255) {</div><div class='del'>-		vga_out8 (0x3c4, 0x10, par);</div><div class='del'>-		vga_out8 (0x3c5, par-&gt;SR10, par);</div><div class='del'>-		vga_out8 (0x3c4, 0x11, par);</div><div class='del'>-		vga_out8 (0x3c5, par-&gt;SR11, par);</div><div class='add'>+	if (reg-&gt;SR10 != 255) {</div><div class='add'>+		vga_out8(0x3c4, 0x10, par);</div><div class='add'>+		vga_out8(0x3c5, reg-&gt;SR10, par);</div><div class='add'>+		vga_out8(0x3c4, 0x11, par);</div><div class='add'>+		vga_out8(0x3c5, reg-&gt;SR11, par);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* restore extended seq regs for dclk */</div><div class='del'>-	vga_out8 (0x3c4, 0x0e, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR0E, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x0f, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR0F, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x12, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR12, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x13, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR13, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x29, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR29, par);</div><div class='del'>-</div><div class='del'>-	vga_out8 (0x3c4, 0x18, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR18, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0e, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR0E, par);</div><div class='add'>+	vga_out8(0x3c4, 0x0f, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR0F, par);</div><div class='add'>+	vga_out8(0x3c4, 0x12, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR12, par);</div><div class='add'>+	vga_out8(0x3c4, 0x13, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR13, par);</div><div class='add'>+	vga_out8(0x3c4, 0x29, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR29, par);</div><div class='add'>+	vga_out8(0x3c4, 0x18, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR18, par);</div><div class='ctx'> </div><div class='ctx'> 	/* load new m, n pll values for dclk &amp; mclk */</div><div class='del'>-	vga_out8 (0x3c4, 0x15, par);</div><div class='del'>-	tmp = vga_in8 (0x3c5, par) &amp; ~0x21;</div><div class='add'>+	vga_out8(0x3c4, 0x15, par);</div><div class='add'>+	tmp = vga_in8(0x3c5, par) &amp; ~0x21;</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3c5, tmp | 0x03, par);</div><div class='del'>-	vga_out8 (0x3c5, tmp | 0x23, par);</div><div class='del'>-	vga_out8 (0x3c5, tmp | 0x03, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR15, par);</div><div class='del'>-	udelay (100);</div><div class='add'>+	vga_out8(0x3c5, tmp | 0x03, par);</div><div class='add'>+	vga_out8(0x3c5, tmp | 0x23, par);</div><div class='add'>+	vga_out8(0x3c5, tmp | 0x03, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR15, par);</div><div class='add'>+	udelay(100);</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3c4, 0x30, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR30, par);</div><div class='del'>-	vga_out8 (0x3c4, 0x08, par);</div><div class='del'>-	vga_out8 (0x3c5, par-&gt;SR08, par);</div><div class='add'>+	vga_out8(0x3c4, 0x30, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR30, par);</div><div class='add'>+	vga_out8(0x3c4, 0x08, par);</div><div class='add'>+	vga_out8(0x3c5, reg-&gt;SR08, par);</div><div class='ctx'> </div><div class='ctx'> 	/* now write out cr67 in full, possibly starting STREAMS */</div><div class='ctx'> 	VerticalRetraceWait(par);</div><div class='del'>-	vga_out8 (0x3d4, 0x67, par);</div><div class='del'>-	vga_out8 (0x3d5, par-&gt;CR67, par);</div><div class='add'>+	vga_out8(0x3d4, 0x67, par);</div><div class='add'>+	vga_out8(0x3d5, reg-&gt;CR67, par);</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	cr66 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66 | 0x80, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	cr3a = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	cr66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 | 0x80, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	cr3a = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a | 0x80, par);</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;chip != S3_SAVAGE_MX) {</div><div class='ctx'> 		VerticalRetraceWait(par);</div><div class='del'>-		savage_out32 (FIFO_CONTROL_REG, par-&gt;MMPR0, par);</div><div class='del'>-		par-&gt;SavageWaitIdle (par);</div><div class='del'>-		savage_out32 (MIU_CONTROL_REG, par-&gt;MMPR1, par);</div><div class='del'>-		par-&gt;SavageWaitIdle (par);</div><div class='del'>-		savage_out32 (STREAMS_TIMEOUT_REG, par-&gt;MMPR2, par);</div><div class='del'>-		par-&gt;SavageWaitIdle (par);</div><div class='del'>-		savage_out32 (MISC_TIMEOUT_REG, par-&gt;MMPR3, par);</div><div class='add'>+		savage_out32(FIFO_CONTROL_REG, reg-&gt;MMPR0, par);</div><div class='add'>+		par-&gt;SavageWaitIdle(par);</div><div class='add'>+		savage_out32(MIU_CONTROL_REG, reg-&gt;MMPR1, par);</div><div class='add'>+		par-&gt;SavageWaitIdle(par);</div><div class='add'>+		savage_out32(STREAMS_TIMEOUT_REG, reg-&gt;MMPR2, par);</div><div class='add'>+		par-&gt;SavageWaitIdle(par);</div><div class='add'>+		savage_out32(MISC_TIMEOUT_REG, reg-&gt;MMPR3, par);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x3a, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3a, par);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66, par);</div><div class='add'>+	vga_out8(0x3d4, 0x3a, par);</div><div class='add'>+	vga_out8(0x3d5, cr3a, par);</div><div class='ctx'> </div><div class='del'>-	SavageSetup2DEngine (par);</div><div class='del'>-	vgaHWProtect (par, 0);</div><div class='add'>+	SavageSetup2DEngine(par);</div><div class='add'>+	vgaHWProtect(par, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void savagefb_update_start (struct savagefb_par      *par,</div><div class='del'>-				   struct fb_var_screeninfo *var)</div><div class='add'>+static void savagefb_update_start(struct savagefb_par      *par,</div><div class='add'>+				  struct fb_var_screeninfo *var)</div><div class='ctx'> {</div><div class='ctx'> 	int base;</div><div class='ctx'> </div><div class='hunk'>@@ -1305,8 +1473,8 @@ static void savagefb_update_start (struct savagefb_par      *par,</div><div class='ctx'> 	/* now program the start address registers */</div><div class='ctx'> 	vga_out16(0x3d4, (base &amp; 0x00ff00) | 0x0c, par);</div><div class='ctx'> 	vga_out16(0x3d4, ((base &amp; 0x00ff) &lt;&lt; 8) | 0x0d, par);</div><div class='del'>-	vga_out8 (0x3d4, 0x69, par);</div><div class='del'>-	vga_out8 (0x3d5, (base &amp; 0x7f0000) &gt;&gt; 16, par);</div><div class='add'>+	vga_out8(0x3d4, 0x69, par);</div><div class='add'>+	vga_out8(0x3d5, (base &amp; 0x7f0000) &gt;&gt; 16, par);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1325,29 +1493,14 @@ static void savagefb_set_fix(struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_FB_SAVAGE_ACCEL)</div><div class='del'>-static void savagefb_set_clip(struct fb_info *info)</div><div class='del'>-{</div><div class='del'>-    struct savagefb_par *par = info-&gt;par;</div><div class='del'>-    int cmd;</div><div class='del'>-</div><div class='del'>-    cmd = BCI_CMD_NOP | BCI_CMD_CLIP_NEW;</div><div class='del'>-    par-&gt;bci_ptr = 0;</div><div class='del'>-    par-&gt;SavageWaitFifo(par,3);</div><div class='del'>-    BCI_SEND(cmd);</div><div class='del'>-    BCI_SEND(BCI_CLIP_TL(0, 0));</div><div class='del'>-    BCI_SEND(BCI_CLIP_BR(0xfff, 0xfff));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int savagefb_set_par (struct fb_info *info)</div><div class='add'>+static int savagefb_set_par(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='ctx'> 	struct fb_var_screeninfo *var = &amp;info-&gt;var;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	DBG("savagefb_set_par");</div><div class='del'>-	err = savagefb_decode_var (var, par);</div><div class='add'>+	err = savagefb_decode_var(var, par, &amp;par-&gt;state);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,8 +1519,8 @@ static int savagefb_set_par (struct fb_info *info)</div><div class='ctx'> 	par-&gt;maxClock = par-&gt;dacSpeedBpp;</div><div class='ctx'> 	par-&gt;minClock = 10000;</div><div class='ctx'> </div><div class='del'>-	savagefb_set_par_int (par);</div><div class='del'>-	fb_set_cmap (&amp;info-&gt;cmap, info);</div><div class='add'>+	savagefb_set_par_int(par, &amp;par-&gt;state);</div><div class='add'>+	fb_set_cmap(&amp;info-&gt;cmap, info);</div><div class='ctx'> 	savagefb_set_fix(info);</div><div class='ctx'> 	savagefb_set_clip(info);</div><div class='ctx'> </div><div class='hunk'>@@ -1378,12 +1531,12 @@ static int savagefb_set_par (struct fb_info *info)</div><div class='ctx'> /*</div><div class='ctx'>  *    Pan or Wrap the Display</div><div class='ctx'>  */</div><div class='del'>-static int savagefb_pan_display (struct fb_var_screeninfo *var,</div><div class='del'>-				 struct fb_info           *info)</div><div class='add'>+static int savagefb_pan_display(struct fb_var_screeninfo *var,</div><div class='add'>+				struct fb_info           *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='del'>-	savagefb_update_start (par, var);</div><div class='add'>+	savagefb_update_start(par, var);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1440,6 +1593,22 @@ static int savagefb_blank(int blank, struct fb_info *info)</div><div class='ctx'> 	return (blank == FB_BLANK_NORMAL) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void savagefb_save_state(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct savagefb_par *par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	savage_get_default_par(par, &amp;par-&gt;save);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void savagefb_restore_state(struct fb_info *info)</div><div class='add'>+{</div><div class='add'>+	struct savagefb_par *par = info-&gt;par;</div><div class='add'>+</div><div class='add'>+	savagefb_blank(FB_BLANK_POWERDOWN, info);</div><div class='add'>+	savage_set_default_par(par, &amp;par-&gt;save);</div><div class='add'>+	savagefb_blank(FB_BLANK_UNBLANK, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct fb_ops savagefb_ops = {</div><div class='ctx'> 	.owner          = THIS_MODULE,</div><div class='ctx'> 	.fb_check_var   = savagefb_check_var,</div><div class='hunk'>@@ -1447,6 +1616,8 @@ static struct fb_ops savagefb_ops = {</div><div class='ctx'> 	.fb_setcolreg   = savagefb_setcolreg,</div><div class='ctx'> 	.fb_pan_display = savagefb_pan_display,</div><div class='ctx'> 	.fb_blank       = savagefb_blank,</div><div class='add'>+	.fb_save_state  = savagefb_save_state,</div><div class='add'>+	.fb_restore_state = savagefb_restore_state,</div><div class='ctx'> #if defined(CONFIG_FB_SAVAGE_ACCEL)</div><div class='ctx'> 	.fb_fillrect    = savagefb_fillrect,</div><div class='ctx'> 	.fb_copyarea    = savagefb_copyarea,</div><div class='hunk'>@@ -1479,59 +1650,59 @@ static struct fb_var_screeninfo __devinitdata savagefb_var800x600x8 = {</div><div class='ctx'> 	.vmode =	FB_VMODE_NONINTERLACED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void savage_enable_mmio (struct savagefb_par *par)</div><div class='add'>+static void savage_enable_mmio(struct savagefb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	DBG ("savage_enable_mmio\n");</div><div class='add'>+	DBG("savage_enable_mmio\n");</div><div class='ctx'> </div><div class='del'>-	val = vga_in8 (0x3c3, par);</div><div class='del'>-	vga_out8 (0x3c3, val | 0x01, par);</div><div class='del'>-	val = vga_in8 (0x3cc, par);</div><div class='del'>-	vga_out8 (0x3c2, val | 0x01, par);</div><div class='add'>+	val = vga_in8(0x3c3, par);</div><div class='add'>+	vga_out8(0x3c3, val | 0x01, par);</div><div class='add'>+	val = vga_in8(0x3cc, par);</div><div class='add'>+	vga_out8(0x3c2, val | 0x01, par);</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;chip &gt;= S3_SAVAGE4) {</div><div class='del'>-		vga_out8 (0x3d4, 0x40, par);</div><div class='del'>-		val = vga_in8 (0x3d5, par);</div><div class='del'>-		vga_out8 (0x3d5, val | 1, par);</div><div class='add'>+		vga_out8(0x3d4, 0x40, par);</div><div class='add'>+		val = vga_in8(0x3d5, par);</div><div class='add'>+		vga_out8(0x3d5, val | 1, par);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void savage_disable_mmio (struct savagefb_par *par)</div><div class='add'>+static void savage_disable_mmio(struct savagefb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	DBG ("savage_disable_mmio\n");</div><div class='add'>+	DBG("savage_disable_mmio\n");</div><div class='ctx'> </div><div class='del'>-	if(par-&gt;chip &gt;= S3_SAVAGE4 ) {</div><div class='del'>-		vga_out8 (0x3d4, 0x40, par);</div><div class='del'>-		val = vga_in8 (0x3d5, par);</div><div class='del'>-		vga_out8 (0x3d5, val | 1, par);</div><div class='add'>+	if (par-&gt;chip &gt;= S3_SAVAGE4) {</div><div class='add'>+		vga_out8(0x3d4, 0x40, par);</div><div class='add'>+		val = vga_in8(0x3d5, par);</div><div class='add'>+		vga_out8(0x3d5, val | 1, par);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit savage_map_mmio (struct fb_info *info)</div><div class='add'>+static int __devinit savage_map_mmio(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='del'>-	DBG ("savage_map_mmio");</div><div class='add'>+	DBG("savage_map_mmio");</div><div class='ctx'> </div><div class='del'>-	if (S3_SAVAGE3D_SERIES (par-&gt;chip))</div><div class='del'>-		par-&gt;mmio.pbase = pci_resource_start (par-&gt;pcidev, 0) +</div><div class='add'>+	if (S3_SAVAGE3D_SERIES(par-&gt;chip))</div><div class='add'>+		par-&gt;mmio.pbase = pci_resource_start(par-&gt;pcidev, 0) +</div><div class='ctx'> 			SAVAGE_NEWMMIO_REGBASE_S3;</div><div class='ctx'> 	else</div><div class='del'>-		par-&gt;mmio.pbase = pci_resource_start (par-&gt;pcidev, 0) +</div><div class='add'>+		par-&gt;mmio.pbase = pci_resource_start(par-&gt;pcidev, 0) +</div><div class='ctx'> 			SAVAGE_NEWMMIO_REGBASE_S4;</div><div class='ctx'> </div><div class='ctx'> 	par-&gt;mmio.len = SAVAGE_NEWMMIO_REGSIZE;</div><div class='ctx'> </div><div class='del'>-	par-&gt;mmio.vbase = ioremap (par-&gt;mmio.pbase, par-&gt;mmio.len);</div><div class='add'>+	par-&gt;mmio.vbase = ioremap(par-&gt;mmio.pbase, par-&gt;mmio.len);</div><div class='ctx'> 	if (!par-&gt;mmio.vbase) {</div><div class='del'>-		printk ("savagefb: unable to map memory mapped IO\n");</div><div class='add'>+		printk("savagefb: unable to map memory mapped IO\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	} else</div><div class='del'>-		printk (KERN_INFO "savagefb: mapped io at %p\n",</div><div class='add'>+		printk(KERN_INFO "savagefb: mapped io at %p\n",</div><div class='ctx'> 			par-&gt;mmio.vbase);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.mmio_start = par-&gt;mmio.pbase;</div><div class='hunk'>@@ -1540,15 +1711,15 @@ static int __devinit savage_map_mmio (struct fb_info *info)</div><div class='ctx'> 	par-&gt;bci_base = (u32 __iomem *)(par-&gt;mmio.vbase + BCI_BUFFER_OFFSET);</div><div class='ctx'> 	par-&gt;bci_ptr  = 0;</div><div class='ctx'> </div><div class='del'>-	savage_enable_mmio (par);</div><div class='add'>+	savage_enable_mmio(par);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void savage_unmap_mmio (struct fb_info *info)</div><div class='add'>+static void savage_unmap_mmio(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='del'>-	DBG ("savage_unmap_mmio");</div><div class='add'>+	DBG("savage_unmap_mmio");</div><div class='ctx'> </div><div class='ctx'> 	savage_disable_mmio(par);</div><div class='ctx'> </div><div class='hunk'>@@ -1558,46 +1729,46 @@ static void savage_unmap_mmio (struct fb_info *info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit savage_map_video (struct fb_info *info,</div><div class='del'>-				       int video_len)</div><div class='add'>+static int __devinit savage_map_video(struct fb_info *info,</div><div class='add'>+				      int video_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='ctx'> 	int resource;</div><div class='ctx'> </div><div class='ctx'> 	DBG("savage_map_video");</div><div class='ctx'> </div><div class='del'>-	if (S3_SAVAGE3D_SERIES (par-&gt;chip))</div><div class='add'>+	if (S3_SAVAGE3D_SERIES(par-&gt;chip))</div><div class='ctx'> 		resource = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		resource = 1;</div><div class='ctx'> </div><div class='del'>-	par-&gt;video.pbase = pci_resource_start (par-&gt;pcidev, resource);</div><div class='add'>+	par-&gt;video.pbase = pci_resource_start(par-&gt;pcidev, resource);</div><div class='ctx'> 	par-&gt;video.len   = video_len;</div><div class='del'>-	par-&gt;video.vbase = ioremap (par-&gt;video.pbase, par-&gt;video.len);</div><div class='add'>+	par-&gt;video.vbase = ioremap(par-&gt;video.pbase, par-&gt;video.len);</div><div class='ctx'> </div><div class='ctx'> 	if (!par-&gt;video.vbase) {</div><div class='del'>-		printk ("savagefb: unable to map screen memory\n");</div><div class='add'>+		printk("savagefb: unable to map screen memory\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	} else</div><div class='del'>-		printk (KERN_INFO "savagefb: mapped framebuffer at %p, "</div><div class='del'>-			"pbase == %x\n", par-&gt;video.vbase, par-&gt;video.pbase);</div><div class='add'>+		printk(KERN_INFO "savagefb: mapped framebuffer at %p, "</div><div class='add'>+		       "pbase == %x\n", par-&gt;video.vbase, par-&gt;video.pbase);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;fix.smem_start = par-&gt;video.pbase;</div><div class='ctx'> 	info-&gt;fix.smem_len   = par-&gt;video.len - par-&gt;cob_size;</div><div class='ctx'> 	info-&gt;screen_base    = par-&gt;video.vbase;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='del'>-	par-&gt;video.mtrr = mtrr_add (par-&gt;video.pbase, video_len,</div><div class='del'>-				     MTRR_TYPE_WRCOMB, 1);</div><div class='add'>+	par-&gt;video.mtrr = mtrr_add(par-&gt;video.pbase, video_len,</div><div class='add'>+				   MTRR_TYPE_WRCOMB, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Clear framebuffer, it's all white in memory after boot */</div><div class='del'>-	memset_io (par-&gt;video.vbase, 0, par-&gt;video.len);</div><div class='add'>+	memset_io(par-&gt;video.vbase, 0, par-&gt;video.len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void savage_unmap_video (struct fb_info *info)</div><div class='add'>+static void savage_unmap_video(struct fb_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='ctx'> </div><div class='hunk'>@@ -1605,16 +1776,16 @@ static void savage_unmap_video (struct fb_info *info)</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;video.vbase) {</div><div class='ctx'> #ifdef CONFIG_MTRR</div><div class='del'>-		mtrr_del (par-&gt;video.mtrr, par-&gt;video.pbase, par-&gt;video.len);</div><div class='add'>+		mtrr_del(par-&gt;video.mtrr, par-&gt;video.pbase, par-&gt;video.len);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		iounmap (par-&gt;video.vbase);</div><div class='add'>+		iounmap(par-&gt;video.vbase);</div><div class='ctx'> 		par-&gt;video.vbase = NULL;</div><div class='ctx'> 		info-&gt;screen_base = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int savage_init_hw (struct savagefb_par *par)</div><div class='add'>+static int savage_init_hw(struct savagefb_par *par)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char config1, m, n, n1, n2, sr8, cr3f, cr66 = 0, tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -1656,7 +1827,7 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> </div><div class='ctx'> 	switch  (par-&gt;chip) {</div><div class='ctx'> 	case S3_SAVAGE3D:</div><div class='del'>-		videoRam = RamSavage3D[ (config1 &amp; 0xC0) &gt;&gt; 6 ] * 1024;</div><div class='add'>+		videoRam = RamSavage3D[(config1 &amp; 0xC0) &gt;&gt; 6 ] * 1024;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case S3_SAVAGE4:</div><div class='hunk'>@@ -1667,22 +1838,22 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> 		 * can do it different...</div><div class='ctx'> 		 */</div><div class='ctx'> 		vga_out8(0x3d4, 0x68, par);	/* memory control 1 */</div><div class='del'>-		if( (vga_in8(0x3d5, par) &amp; 0xC0) == (0x01 &lt;&lt; 6) )</div><div class='add'>+		if ((vga_in8(0x3d5, par) &amp; 0xC0) == (0x01 &lt;&lt; 6))</div><div class='ctx'> 			RamSavage4[1] = 8;</div><div class='ctx'> </div><div class='ctx'> 		/*FALLTHROUGH*/</div><div class='ctx'> </div><div class='ctx'> 	case S3_SAVAGE2000:</div><div class='del'>-		videoRam = RamSavage4[ (config1 &amp; 0xE0) &gt;&gt; 5 ] * 1024;</div><div class='add'>+		videoRam = RamSavage4[(config1 &amp; 0xE0) &gt;&gt; 5] * 1024;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case S3_SAVAGE_MX:</div><div class='ctx'> 	case S3_SUPERSAVAGE:</div><div class='del'>-		videoRam = RamSavageMX[ (config1 &amp; 0x0E) &gt;&gt; 1 ] * 1024;</div><div class='add'>+		videoRam = RamSavageMX[(config1 &amp; 0x0E) &gt;&gt; 1] * 1024;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case S3_PROSAVAGE:</div><div class='del'>-		videoRam = RamSavageNB[ (config1 &amp; 0xE0) &gt;&gt; 5 ] * 1024;</div><div class='add'>+		videoRam = RamSavageNB[(config1 &amp; 0xE0) &gt;&gt; 5] * 1024;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1693,31 +1864,31 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> </div><div class='ctx'> 	videoRambytes = videoRam * 1024;</div><div class='ctx'> </div><div class='del'>-	printk (KERN_INFO "savagefb: probed videoram:  %dk\n", videoRam);</div><div class='add'>+	printk(KERN_INFO "savagefb: probed videoram:  %dk\n", videoRam);</div><div class='ctx'> </div><div class='ctx'> 	/* reset graphics engine to avoid memory corruption */</div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	cr66 = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66 | 0x02, par);</div><div class='del'>-	udelay (10000);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	cr66 = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 | 0x02, par);</div><div class='add'>+	udelay(10000);</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x66, par);</div><div class='del'>-	vga_out8 (0x3d5, cr66 &amp; ~0x02, par);	/* clear reset flag */</div><div class='del'>-	udelay (10000);</div><div class='add'>+	vga_out8(0x3d4, 0x66, par);</div><div class='add'>+	vga_out8(0x3d5, cr66 &amp; ~0x02, par);	/* clear reset flag */</div><div class='add'>+	udelay(10000);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * reset memory interface, 3D engine, AGP master, PCI master,</div><div class='ctx'> 	 * master engine unit, motion compensation/LPB</div><div class='ctx'> 	 */</div><div class='del'>-	vga_out8 (0x3d4, 0x3f, par);</div><div class='del'>-	cr3f = vga_in8 (0x3d5, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3f | 0x08, par);</div><div class='del'>-	udelay (10000);</div><div class='add'>+	vga_out8(0x3d4, 0x3f, par);</div><div class='add'>+	cr3f = vga_in8(0x3d5, par);</div><div class='add'>+	vga_out8(0x3d5, cr3f | 0x08, par);</div><div class='add'>+	udelay(10000);</div><div class='ctx'> </div><div class='del'>-	vga_out8 (0x3d4, 0x3f, par);</div><div class='del'>-	vga_out8 (0x3d5, cr3f &amp; ~0x08, par);	/* clear reset flags */</div><div class='del'>-	udelay (10000);</div><div class='add'>+	vga_out8(0x3d4, 0x3f, par);</div><div class='add'>+	vga_out8(0x3d5, cr3f &amp; ~0x08, par);	/* clear reset flags */</div><div class='add'>+	udelay(10000);</div><div class='ctx'> </div><div class='ctx'> 	/* Savage ramdac speeds */</div><div class='ctx'> 	par-&gt;numClocks = 4;</div><div class='hunk'>@@ -1740,7 +1911,7 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> 	n1 = n &amp; 0x1f;</div><div class='ctx'> 	n2 = (n &gt;&gt; 5) &amp; 0x03;</div><div class='ctx'> 	par-&gt;MCLK = ((1431818 * (m+2)) / (n1+2) / (1 &lt;&lt; n2) + 50) / 100;</div><div class='del'>-	printk (KERN_INFO "savagefb: Detected current MCLK value of %d kHz\n",</div><div class='add'>+	printk(KERN_INFO "savagefb: Detected current MCLK value of %d kHz\n",</div><div class='ctx'> 		par-&gt;MCLK);</div><div class='ctx'> </div><div class='ctx'> 	/* check for DVI/flat panel */</div><div class='hunk'>@@ -1769,12 +1940,12 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> 	/* Check LCD panel parrmation */</div><div class='ctx'> </div><div class='ctx'> 	if (par-&gt;display_type == DISP_LCD) {</div><div class='del'>-		unsigned char cr6b = VGArCR( 0x6b, par);</div><div class='add'>+		unsigned char cr6b = VGArCR(0x6b, par);</div><div class='ctx'> </div><div class='del'>-		int panelX = (VGArSEQ (0x61, par) +</div><div class='del'>-			      ((VGArSEQ (0x66, par) &amp; 0x02) &lt;&lt; 7) + 1) * 8;</div><div class='del'>-		int panelY = (VGArSEQ (0x69, par) +</div><div class='del'>-			      ((VGArSEQ (0x6e, par) &amp; 0x70) &lt;&lt; 4) + 1);</div><div class='add'>+		int panelX = (VGArSEQ(0x61, par) +</div><div class='add'>+			      ((VGArSEQ(0x66, par) &amp; 0x02) &lt;&lt; 7) + 1) * 8;</div><div class='add'>+		int panelY = (VGArSEQ(0x69, par) +</div><div class='add'>+			      ((VGArSEQ(0x6e, par) &amp; 0x70) &lt;&lt; 4) + 1);</div><div class='ctx'> </div><div class='ctx'> 		char * sTechnology = "Unknown";</div><div class='ctx'> </div><div class='hunk'>@@ -1796,26 +1967,26 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> 			ActiveDUO = 0x80</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if ((VGArSEQ (0x39, par) &amp; 0x03) == 0) {</div><div class='add'>+		if ((VGArSEQ(0x39, par) &amp; 0x03) == 0) {</div><div class='ctx'> 			sTechnology = "TFT";</div><div class='del'>-		} else if ((VGArSEQ (0x30, par) &amp; 0x01) == 0) {</div><div class='add'>+		} else if ((VGArSEQ(0x30, par) &amp; 0x01) == 0) {</div><div class='ctx'> 			sTechnology = "DSTN";</div><div class='ctx'> 		} else 	{</div><div class='ctx'> 			sTechnology = "STN";</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		printk (KERN_INFO "savagefb: %dx%d %s LCD panel detected %s\n",</div><div class='del'>-			panelX, panelY, sTechnology,</div><div class='del'>-			cr6b &amp; ActiveLCD ? "and active" : "but not active");</div><div class='add'>+		printk(KERN_INFO "savagefb: %dx%d %s LCD panel detected %s\n",</div><div class='add'>+		       panelX, panelY, sTechnology,</div><div class='add'>+		       cr6b &amp; ActiveLCD ? "and active" : "but not active");</div><div class='ctx'> </div><div class='del'>-		if( cr6b &amp; ActiveLCD ) 	{</div><div class='add'>+		if (cr6b &amp; ActiveLCD) 	{</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * If the LCD is active and panel expansion is enabled,</div><div class='ctx'> 			 * we probably want to kill the HW cursor.</div><div class='ctx'> 			 */</div><div class='ctx'> </div><div class='del'>-			printk (KERN_INFO "savagefb: Limiting video mode to "</div><div class='del'>-				"%dx%d\n", panelX, panelY );</div><div class='add'>+			printk(KERN_INFO "savagefb: Limiting video mode to "</div><div class='add'>+				"%dx%d\n", panelX, panelY);</div><div class='ctx'> </div><div class='ctx'> 			par-&gt;SavagePanelWidth = panelX;</div><div class='ctx'> 			par-&gt;SavagePanelHeight = panelY;</div><div class='hunk'>@@ -1824,9 +1995,10 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> 			par-&gt;display_type = DISP_CRT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	savage_get_default_par (par);</div><div class='add'>+	savage_get_default_par(par, &amp;par-&gt;state);</div><div class='add'>+	par-&gt;save = par-&gt;state;</div><div class='ctx'> </div><div class='del'>-	if( S3_SAVAGE4_SERIES(par-&gt;chip) ) {</div><div class='add'>+	if (S3_SAVAGE4_SERIES(par-&gt;chip)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The Savage4 and ProSavage have COB coherency bugs which</div><div class='ctx'> 		 * render the buffer useless.  We disable it.</div><div class='hunk'>@@ -1845,9 +2017,9 @@ static int savage_init_hw (struct savagefb_par *par)</div><div class='ctx'> 	return videoRambytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit savage_init_fb_info (struct fb_info *info,</div><div class='del'>-					  struct pci_dev *dev,</div><div class='del'>-					  const struct pci_device_id *id)</div><div class='add'>+static int __devinit savage_init_fb_info(struct fb_info *info,</div><div class='add'>+					 struct pci_dev *dev,</div><div class='add'>+					 const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -1863,63 +2035,63 @@ static int __devinit savage_init_fb_info (struct fb_info *info,</div><div class='ctx'> 	switch (info-&gt;fix.accel) {</div><div class='ctx'> 	case FB_ACCEL_SUPERSAVAGE:</div><div class='ctx'> 		par-&gt;chip = S3_SUPERSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "SuperSavage");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "SuperSavage");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE4:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE4;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage4");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage4");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE3D:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE3D;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage3D");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage3D");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE3D_MV:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE3D;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage3D-MV");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage3D-MV");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE2000:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE2000;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage2000");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage2000");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE_MX_MV:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE_MX;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage/MX-MV");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage/MX-MV");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE_MX:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE_MX;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage/MX");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage/MX");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE_IX_MV:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE_MX;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage/IX-MV");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage/IX-MV");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_SAVAGE_IX:</div><div class='ctx'> 		par-&gt;chip = S3_SAVAGE_MX;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "Savage/IX");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "Savage/IX");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_PROSAVAGE_PM:</div><div class='ctx'> 		par-&gt;chip = S3_PROSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "ProSavagePM");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "ProSavagePM");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_PROSAVAGE_KM:</div><div class='ctx'> 		par-&gt;chip = S3_PROSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "ProSavageKM");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "ProSavageKM");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_S3TWISTER_P:</div><div class='ctx'> 		par-&gt;chip = S3_PROSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "TwisterP");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "TwisterP");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_S3TWISTER_K:</div><div class='ctx'> 		par-&gt;chip = S3_PROSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "TwisterK");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "TwisterK");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_PROSAVAGE_DDR:</div><div class='ctx'> 		par-&gt;chip = S3_PROSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "ProSavageDDR");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "ProSavageDDR");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FB_ACCEL_PROSAVAGE_DDRK:</div><div class='ctx'> 		par-&gt;chip = S3_PROSAVAGE;</div><div class='del'>-		snprintf (info-&gt;fix.id, 16, "ProSavage8");</div><div class='add'>+		snprintf(info-&gt;fix.id, 16, "ProSavage8");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1960,7 +2132,7 @@ static int __devinit savage_init_fb_info (struct fb_info *info,</div><div class='ctx'> 		info-&gt;pixmap.buf_align = 4;</div><div class='ctx'> 		info-&gt;pixmap.access_align = 32;</div><div class='ctx'> </div><div class='del'>-		err = fb_alloc_cmap (&amp;info-&gt;cmap, NR_PALETTE, 0);</div><div class='add'>+		err = fb_alloc_cmap(&amp;info-&gt;cmap, NR_PALETTE, 0);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 		info-&gt;flags |= FBINFO_HWACCEL_COPYAREA |</div><div class='ctx'> 	                       FBINFO_HWACCEL_FILLRECT |</div><div class='hunk'>@@ -1972,8 +2144,8 @@ static int __devinit savage_init_fb_info (struct fb_info *info,</div><div class='ctx'> </div><div class='ctx'> /* --------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static int __devinit savagefb_probe (struct pci_dev* dev,</div><div class='del'>-				     const struct pci_device_id* id)</div><div class='add'>+static int __devinit savagefb_probe(struct pci_dev* dev,</div><div class='add'>+				    const struct pci_device_id* id)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info;</div><div class='ctx'> 	struct savagefb_par *par;</div><div class='hunk'>@@ -2085,12 +2257,12 @@ static int __devinit savagefb_probe (struct pci_dev* dev,</div><div class='ctx'> 	fb_destroy_modedb(info-&gt;monspecs.modedb);</div><div class='ctx'> 	info-&gt;monspecs.modedb = NULL;</div><div class='ctx'> </div><div class='del'>-	err = register_framebuffer (info);</div><div class='add'>+	err = register_framebuffer(info);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='del'>-	printk (KERN_INFO "fb: S3 %s frame buffer device\n",</div><div class='del'>-		info-&gt;fix.id);</div><div class='add'>+	printk(KERN_INFO "fb: S3 %s frame buffer device\n",</div><div class='add'>+	       info-&gt;fix.id);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Our driver data</div><div class='hunk'>@@ -2103,10 +2275,10 @@ static int __devinit savagefb_probe (struct pci_dev* dev,</div><div class='ctx'> #ifdef CONFIG_FB_SAVAGE_I2C</div><div class='ctx'> 	savagefb_delete_i2c_busses(info);</div><div class='ctx'> #endif</div><div class='del'>-	fb_alloc_cmap (&amp;info-&gt;cmap, 0, 0);</div><div class='add'>+	fb_alloc_cmap(&amp;info-&gt;cmap, 0, 0);</div><div class='ctx'> 	savage_unmap_video(info);</div><div class='ctx'>  failed_video:</div><div class='del'>-	savage_unmap_mmio (info);</div><div class='add'>+	savage_unmap_mmio(info);</div><div class='ctx'>  failed_mmio:</div><div class='ctx'> 	kfree(info-&gt;pixmap.addr);</div><div class='ctx'>  failed_init:</div><div class='hunk'>@@ -2117,7 +2289,7 @@ static int __devinit savagefb_probe (struct pci_dev* dev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit savagefb_remove (struct pci_dev *dev)</div><div class='add'>+static void __devexit savagefb_remove(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info = pci_get_drvdata(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2129,16 +2301,16 @@ static void __devexit savagefb_remove (struct pci_dev *dev)</div><div class='ctx'> 		 * we will be leaving hooks that could cause</div><div class='ctx'> 		 * oopsen laying around.</div><div class='ctx'> 		 */</div><div class='del'>-		if (unregister_framebuffer (info))</div><div class='del'>-			printk (KERN_WARNING "savagefb: danger danger! "</div><div class='del'>-				"Oopsen imminent!\n");</div><div class='add'>+		if (unregister_framebuffer(info))</div><div class='add'>+			printk(KERN_WARNING "savagefb: danger danger! "</div><div class='add'>+			       "Oopsen imminent!\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FB_SAVAGE_I2C</div><div class='ctx'> 		savagefb_delete_i2c_busses(info);</div><div class='ctx'> #endif</div><div class='del'>-		fb_alloc_cmap (&amp;info-&gt;cmap, 0, 0);</div><div class='del'>-		savage_unmap_video (info);</div><div class='del'>-		savage_unmap_mmio (info);</div><div class='add'>+		fb_alloc_cmap(&amp;info-&gt;cmap, 0, 0);</div><div class='add'>+		savage_unmap_video(info);</div><div class='add'>+		savage_unmap_mmio(info);</div><div class='ctx'> 		kfree(info-&gt;pixmap.addr);</div><div class='ctx'> 		pci_release_regions(dev);</div><div class='ctx'> 		framebuffer_release(info);</div><div class='hunk'>@@ -2151,7 +2323,7 @@ static void __devexit savagefb_remove (struct pci_dev *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)</div><div class='add'>+static int savagefb_suspend(struct pci_dev* dev, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info = pci_get_drvdata(dev);</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='hunk'>@@ -2177,6 +2349,7 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)</div><div class='ctx'> 		info-&gt;fbops-&gt;fb_sync(info);</div><div class='ctx'> </div><div class='ctx'> 	savagefb_blank(FB_BLANK_POWERDOWN, info);</div><div class='add'>+	savage_set_default_par(par, &amp;par-&gt;save);</div><div class='ctx'> 	savage_disable_mmio(par);</div><div class='ctx'> 	pci_save_state(dev);</div><div class='ctx'> 	pci_disable_device(dev);</div><div class='hunk'>@@ -2186,7 +2359,7 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int savagefb_resume (struct pci_dev* dev)</div><div class='add'>+static int savagefb_resume(struct pci_dev* dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info = pci_get_drvdata(dev);</div><div class='ctx'> 	struct savagefb_par *par = info-&gt;par;</div><div class='hunk'>@@ -2210,15 +2383,15 @@ static int savagefb_resume (struct pci_dev* dev)</div><div class='ctx'> 	pci_set_power_state(dev, PCI_D0);</div><div class='ctx'> 	pci_restore_state(dev);</div><div class='ctx'> </div><div class='del'>-	if(pci_enable_device(dev))</div><div class='add'>+	if (pci_enable_device(dev))</div><div class='ctx'> 		DBG("err");</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(dev);</div><div class='ctx'> 	savage_enable_mmio(par);</div><div class='ctx'> 	savage_init_hw(par);</div><div class='del'>-	savagefb_set_par (info);</div><div class='add'>+	savagefb_set_par(info);</div><div class='add'>+	fb_set_suspend(info, 0);</div><div class='ctx'> 	savagefb_blank(FB_BLANK_UNBLANK, info);</div><div class='del'>-	fb_set_suspend (info, 0);</div><div class='ctx'> 	release_console_sem();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2311,10 +2484,10 @@ static struct pci_driver savagefb_driver = {</div><div class='ctx'> </div><div class='ctx'> /* **************************** exit-time only **************************** */</div><div class='ctx'> </div><div class='del'>-static void __exit savage_done (void)</div><div class='add'>+static void __exit savage_done(void)</div><div class='ctx'> {</div><div class='ctx'> 	DBG("savage_done");</div><div class='del'>-	pci_unregister_driver (&amp;savagefb_driver);</div><div class='add'>+	pci_unregister_driver(&amp;savagefb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2345,7 +2518,7 @@ static int __init savagefb_init(void)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	savagefb_setup(option);</div><div class='del'>-	return pci_register_driver (&amp;savagefb_driver);</div><div class='add'>+	return pci_register_driver(&amp;savagefb_driver);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c<br/>index 2e6df1fcb2b9..ebb6756aea08 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sgivwfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sgivwfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sgivwfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sgivwfb.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -23,6 +22,8 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/mtrr.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;setup_arch.h&gt;</div><div class='add'>+</div><div class='ctx'> #define INCLUDE_TIMING_TABLE_DATA</div><div class='ctx'> #define DBE_REG_BASE par-&gt;regs</div><div class='ctx'> #include &lt;video/sgivw.h&gt;</div><div class='hunk'>@@ -42,10 +43,6 @@ struct sgivw_par {</div><div class='ctx'>  *  The default can be overridden if the driver is compiled as a module</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* set by arch/i386/kernel/setup.c */</div><div class='del'>-extern unsigned long sgivwfb_mem_phys;</div><div class='del'>-extern unsigned long sgivwfb_mem_size;</div><div class='del'>-</div><div class='ctx'> static int ypan = 0;</div><div class='ctx'> static int ywrap = 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h<br/>index 634c0a9d219b..7ecab87cef02 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/init.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/init.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/init.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/init.h</a></div><div class='hunk'>@@ -73,7 +73,6 @@</div><div class='ctx'> #ifdef SIS_CP</div><div class='ctx'> #undef SIS_CP</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c<br/>index c3e070a6effd..f13faddc6181 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/init301.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/init301.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/init301.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/init301.c</a></div><div class='hunk'>@@ -8043,8 +8043,8 @@ SiS_SetCHTVReg(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short</div><div class='ctx'>       SiS_SetCH700x(SiS_Pr,0x01,0x28);</div><div class='ctx'> </div><div class='ctx'>       /* Set video bandwidth</div><div class='del'>-            High bandwith Luma composite video filter(S0=1)</div><div class='del'>-            low bandwith Luma S-video filter (S2-1=00)</div><div class='add'>+            High bandwidth Luma composite video filter(S0=1)</div><div class='add'>+            low bandwidth Luma S-video filter (S2-1=00)</div><div class='ctx'> 	    disable peak filter in S-video channel (S3=0)</div><div class='ctx'> 	    high bandwidth Chroma Filter (S5-4=11)</div><div class='ctx'> 	    =00110001=0x31</div><div class='head'>diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h<br/>index f475b21a85cf..bc321dc57e92 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/init301.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/init301.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/init301.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/init301.h</a></div><div class='hunk'>@@ -67,7 +67,6 @@</div><div class='ctx'> #ifdef SIS_CP</div><div class='ctx'> #undef SIS_CP</div><div class='ctx'> #endif</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='head'>diff --git a/drivers/video/sis/initextlfb.c b/drivers/video/sis/initextlfb.c<br/>index cc856d90903c..09f5d758b6c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/initextlfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/initextlfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/initextlfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/initextlfb.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #include "vgatypes.h"</div><div class='ctx'> #include "vstruct.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h<br/>index 841ca3190cd4..f59568020eb2 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/osdef.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/osdef.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/osdef.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/osdef.h</a></div><div class='hunk'>@@ -90,7 +90,6 @@</div><div class='ctx'> /**********************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifdef SIS_LINUX_KERNEL</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_FB_SIS_300</div><div class='head'>diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h<br/>index 0b6e625d7331..a259446ca7fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/sis.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/sis.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/sis.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/sis.h</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'> #ifndef _SIS_H_</div><div class='ctx'> #define _SIS_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "osdef.h"</div><div class='head'>diff --git a/drivers/video/sis/sis_accel.c b/drivers/video/sis/sis_accel.c<br/>index bab933e6c6a6..3b7ce032e2ed 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/sis_accel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/sis_accel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/sis_accel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/sis_accel.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'>  *			for more information and updates)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c<br/>index 8adf5bf91eee..895ebda7d9e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sis/sis_main.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sis/sis_main.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sis/sis_main.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sis/sis_main.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,5,0)</div><div class='hunk'>@@ -45,7 +44,13 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+</div><div class='add'>+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,17)</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/selection.h&gt;</div><div class='hunk'>@@ -275,7 +280,7 @@ sisfb_search_mode(char *name, BOOLEAN quiet)</div><div class='ctx'> static void __devinit</div><div class='ctx'> sisfb_get_vga_mode_from_kernel(void)</div><div class='ctx'> {</div><div class='del'>-#if (defined(__i386__) || defined(__x86_64__)) &amp;&amp; defined(CONFIG_VIDEO_SELECT)</div><div class='add'>+#ifdef CONFIG_X86</div><div class='ctx'> 	char mymode[32];</div><div class='ctx'> 	int  mydepth = screen_info.lfb_depth;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c<br/>index 9b707771d757..bb96cb65fdaa 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/skeletonfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/skeletonfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/skeletonfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/skeletonfb.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -906,11 +905,6 @@ static void __exit xxxfb_exit(void)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-module_init(xxxfb_init);</div><div class='del'>-module_exit(xxxfb_exit);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'>     /*</div><div class='ctx'>      *  Setup</div><div class='ctx'>      */</div><div class='head'>diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c<br/>index c44de90ca12e..dad54e73147b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sstfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sstfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sstfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sstfb.c</a></div><div class='hunk'>@@ -82,7 +82,6 @@</div><div class='ctx'>  * Includes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c<br/>index 4a292aae6eb2..3e16e2d9d55d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/stifb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/stifb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/stifb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/stifb.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> #undef DEBUG_STIFB_REGS		/* debug sti register accesses */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c<br/>index 9b36b9df535f..f80356dfa8e8 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/sun3fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/sun3fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/sun3fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/sun3fb.c</a></div><div class='hunk'>@@ -25,13 +25,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c<br/>index 95b918229d9b..6990ab11cd06 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/tcx.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tcx.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/tcx.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/tcx.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* tcx.c: TCX frame buffer driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003 David S. Miller (davem@redhat.com)</div><div class='add'>+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)</div><div class='ctx'>  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)</div><div class='ctx'>  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)</div><div class='ctx'>  * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)</div><div class='hunk'>@@ -19,8 +19,8 @@</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/sbus.h&gt;</div><div class='del'>-#include &lt;asm/oplib.h&gt;</div><div class='add'>+#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;asm/of_device.h&gt;</div><div class='ctx'> #include &lt;asm/fbio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sbuslib.h"</div><div class='hunk'>@@ -77,32 +77,32 @@ static struct fb_ops tcx_ops = {</div><div class='ctx'> </div><div class='ctx'> /* The contents are unknown */</div><div class='ctx'> struct tcx_tec {</div><div class='del'>-	volatile u32 tec_matrix;</div><div class='del'>-	volatile u32 tec_clip;</div><div class='del'>-	volatile u32 tec_vdc;</div><div class='add'>+	u32 tec_matrix;</div><div class='add'>+	u32 tec_clip;</div><div class='add'>+	u32 tec_vdc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tcx_thc {</div><div class='del'>-	volatile u32 thc_rev;</div><div class='add'>+	u32 thc_rev;</div><div class='ctx'>         u32 thc_pad0[511];</div><div class='del'>-	volatile u32 thc_hs;		/* hsync timing */</div><div class='del'>-	volatile u32 thc_hsdvs;</div><div class='del'>-	volatile u32 thc_hd;</div><div class='del'>-	volatile u32 thc_vs;		/* vsync timing */</div><div class='del'>-	volatile u32 thc_vd;</div><div class='del'>-	volatile u32 thc_refresh;</div><div class='del'>-	volatile u32 thc_misc;</div><div class='add'>+	u32 thc_hs;		/* hsync timing */</div><div class='add'>+	u32 thc_hsdvs;</div><div class='add'>+	u32 thc_hd;</div><div class='add'>+	u32 thc_vs;		/* vsync timing */</div><div class='add'>+	u32 thc_vd;</div><div class='add'>+	u32 thc_refresh;</div><div class='add'>+	u32 thc_misc;</div><div class='ctx'> 	u32 thc_pad1[56];</div><div class='del'>-	volatile u32 thc_cursxy;	/* cursor x,y position (16 bits each) */</div><div class='del'>-	volatile u32 thc_cursmask[32];	/* cursor mask bits */</div><div class='del'>-	volatile u32 thc_cursbits[32];	/* what to show where mask enabled */</div><div class='add'>+	u32 thc_cursxy;	/* cursor x,y position (16 bits each) */</div><div class='add'>+	u32 thc_cursmask[32];	/* cursor mask bits */</div><div class='add'>+	u32 thc_cursbits[32];	/* what to show where mask enabled */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bt_regs {</div><div class='del'>-	volatile u32 addr;</div><div class='del'>-	volatile u32 color_map;</div><div class='del'>-	volatile u32 control;</div><div class='del'>-	volatile u32 cursor;</div><div class='add'>+	u32 addr;</div><div class='add'>+	u32 color_map;</div><div class='add'>+	u32 control;</div><div class='add'>+	u32 cursor;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define TCX_MMAP_ENTRIES 14</div><div class='hunk'>@@ -112,24 +112,23 @@ struct tcx_par {</div><div class='ctx'> 	struct bt_regs		__iomem *bt;</div><div class='ctx'> 	struct tcx_thc		__iomem *thc;</div><div class='ctx'> 	struct tcx_tec		__iomem *tec;</div><div class='del'>-	volatile u32		__iomem *cplane;</div><div class='add'>+	u32			__iomem *cplane;</div><div class='ctx'> </div><div class='ctx'> 	u32			flags;</div><div class='ctx'> #define TCX_FLAG_BLANKED	0x00000001</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		physbase;</div><div class='add'>+	unsigned long		which_io;</div><div class='ctx'> 	unsigned long		fbsize;</div><div class='ctx'> </div><div class='ctx'> 	struct sbus_mmap_map	mmap_map[TCX_MMAP_ENTRIES];</div><div class='ctx'> 	int			lowdepth;</div><div class='del'>-</div><div class='del'>-	struct sbus_dev		*sdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Reset control plane so that WID is 8-bit plane. */</div><div class='ctx'> static void __tcx_set_control_plane (struct tcx_par *par)</div><div class='ctx'> {</div><div class='del'>-	volatile u32 __iomem *p, *pend;</div><div class='add'>+	u32 __iomem *p, *pend;</div><div class='ctx'>         </div><div class='ctx'> 	if (par-&gt;lowdepth)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -307,8 +306,7 @@ static int tcx_mmap(struct fb_info *info, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	return sbusfb_mmap_helper(par-&gt;mmap_map,</div><div class='ctx'> 				  par-&gt;physbase, par-&gt;fbsize,</div><div class='del'>-				  par-&gt;sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-				  vma);</div><div class='add'>+				  par-&gt;which_io, vma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tcx_ioctl(struct fb_info *info, unsigned int cmd,</div><div class='hunk'>@@ -350,48 +348,71 @@ tcx_init_fix(struct fb_info *info, int linebytes)</div><div class='ctx'> struct all_info {</div><div class='ctx'> 	struct fb_info info;</div><div class='ctx'> 	struct tcx_par par;</div><div class='del'>-	struct list_head list;</div><div class='ctx'> };</div><div class='del'>-static LIST_HEAD(tcx_list);</div><div class='ctx'> </div><div class='del'>-static void tcx_init_one(struct sbus_dev *sdev)</div><div class='add'>+static void tcx_unmap_regs(struct all_info *all)</div><div class='ctx'> {</div><div class='del'>-	struct all_info *all;</div><div class='del'>-	int linebytes, i;</div><div class='add'>+	if (all-&gt;par.tec)</div><div class='add'>+		of_iounmap(all-&gt;par.tec, sizeof(struct tcx_tec));</div><div class='add'>+	if (all-&gt;par.thc)</div><div class='add'>+		of_iounmap(all-&gt;par.thc, sizeof(struct tcx_thc));</div><div class='add'>+	if (all-&gt;par.bt)</div><div class='add'>+		of_iounmap(all-&gt;par.bt, sizeof(struct bt_regs));</div><div class='add'>+	if (all-&gt;par.cplane)</div><div class='add'>+		of_iounmap(all-&gt;par.cplane, all-&gt;par.fbsize * sizeof(u32));</div><div class='add'>+	if (all-&gt;info.screen_base)</div><div class='add'>+		of_iounmap(all-&gt;info.screen_base, all-&gt;par.fbsize);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	all = kmalloc(sizeof(*all), GFP_KERNEL);</div><div class='del'>-	if (!all) {</div><div class='del'>-		printk(KERN_ERR "tcx: Cannot allocate memory.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memset(all, 0, sizeof(*all));</div><div class='add'>+static int __devinit tcx_init_one(struct of_device *op)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dp = op-&gt;node;</div><div class='add'>+	struct all_info *all;</div><div class='add'>+	int linebytes, i, err;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;all-&gt;list);</div><div class='add'>+	all = kzalloc(sizeof(*all), GFP_KERNEL);</div><div class='add'>+	if (!all)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;all-&gt;par.lock);</div><div class='del'>-	all-&gt;par.sdev = sdev;</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.lowdepth = prom_getbool(sdev-&gt;prom_node, "tcx-8-bit");</div><div class='add'>+	all-&gt;par.lowdepth =</div><div class='add'>+		(of_find_property(dp, "tcx-8-bit", NULL) != NULL);</div><div class='ctx'> </div><div class='del'>-	sbusfb_fill_var(&amp;all-&gt;info.var, sdev-&gt;prom_node, 8);</div><div class='add'>+	sbusfb_fill_var(&amp;all-&gt;info.var, dp-&gt;node, 8);</div><div class='ctx'> 	all-&gt;info.var.red.length = 8;</div><div class='ctx'> 	all-&gt;info.var.green.length = 8;</div><div class='ctx'> 	all-&gt;info.var.blue.length = 8;</div><div class='ctx'> </div><div class='del'>-	linebytes = prom_getintdefault(sdev-&gt;prom_node, "linebytes",</div><div class='del'>-				       all-&gt;info.var.xres);</div><div class='add'>+	linebytes = of_getintprop_default(dp, "linebytes",</div><div class='add'>+					  all-&gt;info.var.xres);</div><div class='ctx'> 	all-&gt;par.fbsize = PAGE_ALIGN(linebytes * all-&gt;info.var.yres);</div><div class='ctx'> </div><div class='del'>-	all-&gt;par.tec = sbus_ioremap(&amp;sdev-&gt;resource[7], 0,</div><div class='del'>-			     sizeof(struct tcx_tec), "tcx tec");</div><div class='del'>-	all-&gt;par.thc = sbus_ioremap(&amp;sdev-&gt;resource[9], 0,</div><div class='del'>-			     sizeof(struct tcx_thc), "tcx thc");</div><div class='del'>-	all-&gt;par.bt = sbus_ioremap(&amp;sdev-&gt;resource[8], 0,</div><div class='del'>-			     sizeof(struct bt_regs), "tcx dac");</div><div class='add'>+	all-&gt;par.tec = of_ioremap(&amp;op-&gt;resource[7], 0,</div><div class='add'>+				  sizeof(struct tcx_tec), "tcx tec");</div><div class='add'>+	all-&gt;par.thc = of_ioremap(&amp;op-&gt;resource[9], 0,</div><div class='add'>+				  sizeof(struct tcx_thc), "tcx thc");</div><div class='add'>+	all-&gt;par.bt = of_ioremap(&amp;op-&gt;resource[8], 0,</div><div class='add'>+				 sizeof(struct bt_regs), "tcx dac");</div><div class='add'>+	all-&gt;info.screen_base = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='add'>+					   all-&gt;par.fbsize, "tcx ram");</div><div class='add'>+	if (!all-&gt;par.tec || !all-&gt;par.thc ||</div><div class='add'>+	    !all-&gt;par.bt || !all-&gt;info.screen_base) {</div><div class='add'>+		tcx_unmap_regs(all);</div><div class='add'>+		kfree(all);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memcpy(&amp;all-&gt;par.mmap_map, &amp;__tcx_mmap_map, sizeof(all-&gt;par.mmap_map));</div><div class='ctx'> 	if (!all-&gt;par.lowdepth) {</div><div class='del'>-		all-&gt;par.cplane = sbus_ioremap(&amp;sdev-&gt;resource[4], 0,</div><div class='del'>-				     all-&gt;par.fbsize * sizeof(u32), "tcx cplane");</div><div class='add'>+		all-&gt;par.cplane = of_ioremap(&amp;op-&gt;resource[4], 0,</div><div class='add'>+					     all-&gt;par.fbsize * sizeof(u32),</div><div class='add'>+					     "tcx cplane");</div><div class='add'>+		if (!all-&gt;par.cplane) {</div><div class='add'>+			tcx_unmap_regs(all);</div><div class='add'>+			kfree(all);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		all-&gt;par.mmap_map[1].size = SBUS_MMAP_EMPTY;</div><div class='ctx'> 		all-&gt;par.mmap_map[4].size = SBUS_MMAP_EMPTY;</div><div class='hunk'>@@ -400,6 +421,8 @@ static void tcx_init_one(struct sbus_dev *sdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;par.physbase = 0;</div><div class='add'>+	all-&gt;par.which_io = op-&gt;resource[0].flags &amp; IORESOURCE_BITS;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; TCX_MMAP_ENTRIES; i++) {</div><div class='ctx'> 		int j;</div><div class='ctx'> </div><div class='hunk'>@@ -416,18 +439,11 @@ static void tcx_init_one(struct sbus_dev *sdev)</div><div class='ctx'> 			j = i;</div><div class='ctx'> 			break;</div><div class='ctx'> 		};</div><div class='del'>-		all-&gt;par.mmap_map[i].poff = sdev-&gt;reg_addrs[j].phys_addr;</div><div class='add'>+		all-&gt;par.mmap_map[i].poff = op-&gt;resource[j].start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	all-&gt;info.flags = FBINFO_DEFAULT;</div><div class='ctx'> 	all-&gt;info.fbops = &amp;tcx_ops;</div><div class='del'>-#ifdef CONFIG_SPARC32</div><div class='del'>-	all-&gt;info.screen_base = (char __iomem *)</div><div class='del'>-		prom_getintdefault(sdev-&gt;prom_node, "address", 0);</div><div class='del'>-#endif</div><div class='del'>-	if (!all-&gt;info.screen_base)</div><div class='del'>-		all-&gt;info.screen_base = sbus_ioremap(&amp;sdev-&gt;resource[0], 0,</div><div class='del'>-				     all-&gt;par.fbsize, "tcx ram");</div><div class='ctx'> 	all-&gt;info.par = &amp;all-&gt;par;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize brooktree DAC. */</div><div class='hunk'>@@ -445,72 +461,88 @@ static void tcx_init_one(struct sbus_dev *sdev)</div><div class='ctx'> 	tcx_blank(FB_BLANK_UNBLANK, &amp;all-&gt;info);</div><div class='ctx'> </div><div class='ctx'> 	if (fb_alloc_cmap(&amp;all-&gt;info.cmap, 256, 0)) {</div><div class='del'>-		printk(KERN_ERR "tcx: Could not allocate color map.\n");</div><div class='add'>+		tcx_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fb_set_cmap(&amp;all-&gt;info.cmap, &amp;all-&gt;info);</div><div class='ctx'> 	tcx_init_fix(&amp;all-&gt;info, linebytes);</div><div class='ctx'> </div><div class='del'>-	if (register_framebuffer(&amp;all-&gt;info) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "tcx: Could not register framebuffer.\n");</div><div class='add'>+	err = register_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+		tcx_unmap_regs(all);</div><div class='ctx'> 		kfree(all);</div><div class='del'>-		return;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_add(&amp;all-&gt;list, &amp;tcx_list);</div><div class='add'>+	dev_set_drvdata(&amp;op-&gt;dev, all);</div><div class='ctx'> </div><div class='del'>-	printk("tcx: %s at %lx:%lx, %s\n",</div><div class='del'>-	       sdev-&gt;prom_name,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].which_io,</div><div class='del'>-	       (long) sdev-&gt;reg_addrs[0].phys_addr,</div><div class='add'>+	printk("%s: TCX at %lx:%lx, %s\n",</div><div class='add'>+	       dp-&gt;full_name,</div><div class='add'>+	       all-&gt;par.which_io,</div><div class='add'>+	       op-&gt;resource[0].start,</div><div class='ctx'> 	       all-&gt;par.lowdepth ? "8-bit only" : "24-bit depth");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init tcx_init(void)</div><div class='add'>+static int __devinit tcx_probe(struct of_device *dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct sbus_bus *sbus;</div><div class='del'>-	struct sbus_dev *sdev;</div><div class='add'>+	struct of_device *op = to_of_device(&amp;dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (fb_get_options("tcxfb", NULL))</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return tcx_init_one(op);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for_all_sbusdev(sdev, sbus) {</div><div class='del'>-		if (!strcmp(sdev-&gt;prom_name, "SUNW,tcx"))</div><div class='del'>-			tcx_init_one(sdev);</div><div class='del'>-	}</div><div class='add'>+static int __devexit tcx_remove(struct of_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct all_info *all = dev_get_drvdata(&amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	unregister_framebuffer(&amp;all-&gt;info);</div><div class='add'>+	fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='add'>+</div><div class='add'>+	tcx_unmap_regs(all);</div><div class='add'>+</div><div class='add'>+	kfree(all);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;dev-&gt;dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit tcx_exit(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos, *tmp;</div><div class='add'>+static struct of_device_id tcx_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "SUNW,tcx",</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, tcx_match);</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, &amp;tcx_list) {</div><div class='del'>-		struct all_info *all = list_entry(pos, typeof(*all), list);</div><div class='add'>+static struct of_platform_driver tcx_driver = {</div><div class='add'>+	.name		= "tcx",</div><div class='add'>+	.match_table	= tcx_match,</div><div class='add'>+	.probe		= tcx_probe,</div><div class='add'>+	.remove		= __devexit_p(tcx_remove),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		unregister_framebuffer(&amp;all-&gt;info);</div><div class='del'>-		fb_dealloc_cmap(&amp;all-&gt;info.cmap);</div><div class='del'>-		kfree(all);</div><div class='del'>-	}</div><div class='add'>+int __init tcx_init(void)</div><div class='add'>+{</div><div class='add'>+	if (fb_get_options("tcxfb", NULL))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return of_register_driver(&amp;tcx_driver, &amp;of_bus_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __init</div><div class='del'>-tcx_setup(char *arg)</div><div class='add'>+void __exit tcx_exit(void)</div><div class='ctx'> {</div><div class='del'>-	/* No cmdline options yet... */</div><div class='del'>-	return 0;</div><div class='add'>+	of_unregister_driver(&amp;tcx_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(tcx_init);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> module_exit(tcx_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("framebuffer driver for TCX chipsets");</div><div class='del'>-MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt;");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@davemloft.net&gt;");</div><div class='add'>+MODULE_VERSION("2.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c<br/>index 5e5328d682db..689ce0270b81 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/tdfxfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tdfxfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/tdfxfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/tdfxfb.c</a></div><div class='hunk'>@@ -58,13 +58,11 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='head'>diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c<br/>index 7398bd48ba6c..94fde625a6c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/tgafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tgafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/tgafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/tgafb.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -26,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/selection.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;video/tgafb.h&gt;</div><div class='del'>-#include &lt;linux/selection.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Local functions.</div><div class='head'>diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c<br/>index 9ac2d3171187..14175cdb9c9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/tridentfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tridentfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/tridentfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/tridentfb.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  *	TGUI acceleration	</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -551,7 +550,7 @@ static inline void enable_mmio(void)</div><div class='ctx'> #define crtc_unlock()	write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) &amp; 0x7F)</div><div class='ctx'> </div><div class='ctx'> /*  Return flat panel's maximum x resolution */</div><div class='del'>-static int __init get_nativex(void)</div><div class='add'>+static int __devinit get_nativex(void)</div><div class='ctx'> {</div><div class='ctx'> 	int x,y,tmp;</div><div class='ctx'> </div><div class='hunk'>@@ -658,7 +657,7 @@ static void set_number_of_lines(int lines)</div><div class='ctx'>  * If we see that FP is active we assume we have one.</div><div class='ctx'>  * Otherwise we have a CRT display.User can override.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int __init get_displaytype(void)</div><div class='add'>+static unsigned int __devinit get_displaytype(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (fp)</div><div class='ctx'> 		return DISPLAY_FP;</div><div class='hunk'>@@ -668,7 +667,7 @@ static unsigned int __init get_displaytype(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Try detecting the video memory size */</div><div class='del'>-static unsigned int __init get_memsize(void)</div><div class='add'>+static unsigned int __devinit get_memsize(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char tmp, tmp2;</div><div class='ctx'> 	unsigned int k;</div><div class='head'>diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c<br/>index d904da44e1aa..07389ba01eff 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/tx3912fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/tx3912fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/tx3912fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/tx3912fb.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c<br/>index 2bdeb4baa952..47f27924a7d7 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/valkyriefb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/valkyriefb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/valkyriefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/valkyriefb.c</a></div><div class='hunk'>@@ -39,13 +39,11 @@</div><div class='ctx'>  *  more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='head'>diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c<br/>index b0b9acfdd430..2196448396ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/vesafb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vesafb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/vesafb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/vesafb.c</a></div><div class='hunk'>@@ -13,13 +13,13 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -51,7 +51,7 @@ static int             inverse   = 0;</div><div class='ctx'> static int             mtrr      = 0; /* disable mtrr */</div><div class='ctx'> static int	       vram_remap __initdata = 0; /* Set amount of memory to be used */</div><div class='ctx'> static int	       vram_total __initdata = 0; /* Set total amount of memory */</div><div class='del'>-static int             pmi_setpal = 0;	/* pmi for palette changes ??? */</div><div class='add'>+static int             pmi_setpal = 1;	/* pmi for palette changes ??? */</div><div class='ctx'> static int             ypan       = 0;  /* 0..nothing, 1..ypan, 2..ywrap */</div><div class='ctx'> static unsigned short  *pmi_base  = NULL;</div><div class='ctx'> static void            (*pmi_start)(void);</div><div class='hunk'>@@ -80,15 +80,30 @@ static int vesafb_pan_display(struct fb_var_screeninfo *var,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vesa_setpalette(int regno, unsigned red, unsigned green,</div><div class='add'>+static int vesa_setpalette(int regno, unsigned red, unsigned green,</div><div class='ctx'> 			    unsigned blue)</div><div class='ctx'> {</div><div class='ctx'> 	int shift = 16 - depth;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Try VGA registers first...</div><div class='add'>+ */</div><div class='add'>+	if (vga_compat) {</div><div class='add'>+		outb_p(regno,       dac_reg);</div><div class='add'>+		outb_p(red   &gt;&gt; shift, dac_val);</div><div class='add'>+		outb_p(green &gt;&gt; shift, dac_val);</div><div class='add'>+		outb_p(blue  &gt;&gt; shift, dac_val);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef __i386__</div><div class='del'>-	struct { u_char blue, green, red, pad; } entry;</div><div class='add'>+/*</div><div class='add'>+ * Fallback to the PMI....</div><div class='add'>+ */</div><div class='add'>+	if (err &amp;&amp; pmi_setpal) {</div><div class='add'>+		struct { u_char blue, green, red, pad; } entry;</div><div class='ctx'> </div><div class='del'>-	if (pmi_setpal) {</div><div class='ctx'> 		entry.red   = red   &gt;&gt; shift;</div><div class='ctx'> 		entry.green = green &gt;&gt; shift;</div><div class='ctx'> 		entry.blue  = blue  &gt;&gt; shift;</div><div class='hunk'>@@ -102,26 +117,19 @@ static void vesa_setpalette(int regno, unsigned red, unsigned green,</div><div class='ctx'>                   "d" (regno),          /* EDX */</div><div class='ctx'>                   "D" (&amp;entry),         /* EDI */</div><div class='ctx'>                   "S" (&amp;pmi_pal));      /* ESI */</div><div class='del'>-		return;</div><div class='add'>+		err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * without protected mode interface and if VGA compatible,</div><div class='del'>- * try VGA registers...</div><div class='del'>- */</div><div class='del'>-	if (vga_compat) {</div><div class='del'>-		outb_p(regno,       dac_reg);</div><div class='del'>-		outb_p(red   &gt;&gt; shift, dac_val);</div><div class='del'>-		outb_p(green &gt;&gt; shift, dac_val);</div><div class='del'>-		outb_p(blue  &gt;&gt; shift, dac_val);</div><div class='del'>-	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='ctx'> 			    unsigned blue, unsigned transp,</div><div class='ctx'> 			    struct fb_info *info)</div><div class='ctx'> {</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Set a single color register. The values supplied are</div><div class='ctx'> 	 *  already rounded down to the hardware's capabilities</div><div class='hunk'>@@ -133,7 +141,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;var.bits_per_pixel == 8)</div><div class='del'>-		vesa_setpalette(regno,red,green,blue);</div><div class='add'>+		err = vesa_setpalette(regno,red,green,blue);</div><div class='ctx'> 	else if (regno &lt; 16) {</div><div class='ctx'> 		switch (info-&gt;var.bits_per_pixel) {</div><div class='ctx'> 		case 16:</div><div class='hunk'>@@ -164,7 +172,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct fb_ops vesafb_ops = {</div><div class='hunk'>@@ -460,9 +468,7 @@ static struct platform_driver vesafb_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device vesafb_device = {</div><div class='del'>-	.name	= "vesafb",</div><div class='del'>-};</div><div class='add'>+static struct platform_device *vesafb_device;</div><div class='ctx'> </div><div class='ctx'> static int __init vesafb_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -475,10 +481,19 @@ static int __init vesafb_init(void)</div><div class='ctx'> 	ret = platform_driver_register(&amp;vesafb_driver);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		ret = platform_device_register(&amp;vesafb_device);</div><div class='del'>-		if (ret)</div><div class='add'>+		vesafb_device = platform_device_alloc("vesafb", 0);</div><div class='add'>+</div><div class='add'>+		if (vesafb_device)</div><div class='add'>+			ret = platform_device_add(vesafb_device);</div><div class='add'>+		else</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			platform_device_put(vesafb_device);</div><div class='ctx'> 			platform_driver_unregister(&amp;vesafb_driver);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> module_init(vesafb_init);</div><div class='head'>diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c<br/>index 77eed1fd9943..a9b99b01bd8e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/vfb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vfb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/vfb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/vfb.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -398,12 +397,6 @@ static int __init vfb_setup(char *options)</div><div class='ctx'>      *  Initialisation</div><div class='ctx'>      */</div><div class='ctx'> </div><div class='del'>-static void vfb_platform_release(struct device *device)</div><div class='del'>-{</div><div class='del'>-	// This is called when the reference count goes to zero.</div><div class='del'>-	dev_err(device, "This driver is broken, please bug the authors so they will fix it.\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __init vfb_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct fb_info *info;</div><div class='hunk'>@@ -482,13 +475,7 @@ static struct platform_driver vfb_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device vfb_device = {</div><div class='del'>-	.name	= "vfb",</div><div class='del'>-	.id	= 0,</div><div class='del'>-	.dev	= {</div><div class='del'>-		.release = vfb_platform_release,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='add'>+static struct platform_device *vfb_device;</div><div class='ctx'> </div><div class='ctx'> static int __init vfb_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -508,10 +495,19 @@ static int __init vfb_init(void)</div><div class='ctx'> 	ret = platform_driver_register(&amp;vfb_driver);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		ret = platform_device_register(&amp;vfb_device);</div><div class='del'>-		if (ret)</div><div class='add'>+		vfb_device = platform_device_alloc("vfb", 0);</div><div class='add'>+</div><div class='add'>+		if (vfb_device)</div><div class='add'>+			ret = platform_device_add(vfb_device);</div><div class='add'>+		else</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			platform_device_put(vfb_device);</div><div class='ctx'> 			platform_driver_unregister(&amp;vfb_driver);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +516,7 @@ module_init(vfb_init);</div><div class='ctx'> #ifdef MODULE</div><div class='ctx'> static void __exit vfb_exit(void)</div><div class='ctx'> {</div><div class='del'>-	platform_device_unregister(&amp;vfb_device);</div><div class='add'>+	platform_device_unregister(vfb_device);</div><div class='ctx'> 	platform_driver_unregister(&amp;vfb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c<br/>index f3f16fd9f231..43d5a6d9c4a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/vga16fb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vga16fb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/vga16fb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/vga16fb.c</a></div><div class='hunk'>@@ -15,13 +15,13 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/screen_info.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;video/vga.h&gt;</div><div class='hunk'>@@ -1334,9 +1334,8 @@ static int vga16fb_setup(char *options)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __init vga16fb_probe(struct device *device)</div><div class='add'>+static int __init vga16fb_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct platform_device *dev = to_platform_device(device);</div><div class='ctx'> 	struct fb_info *info;</div><div class='ctx'> 	struct vga16fb_par *par;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1351,7 +1350,7 @@ static int __init vga16fb_probe(struct device *device)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* XXX share VGA_FB_PHYS and I/O region with vgacon and others */</div><div class='del'>-	info-&gt;screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS);</div><div class='add'>+	info-&gt;screen_base = (void __iomem *)VGA_MAP_MEM(VGA_FB_PHYS, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!info-&gt;screen_base) {</div><div class='ctx'> 		printk(KERN_ERR "vga16fb: unable to map device\n");</div><div class='hunk'>@@ -1403,7 +1402,7 @@ static int __init vga16fb_probe(struct device *device)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "fb%d: %s frame buffer device\n",</div><div class='ctx'> 	       info-&gt;node, info-&gt;fix.id);</div><div class='del'>-	dev_set_drvdata(device, info);</div><div class='add'>+	platform_set_drvdata(dev, info);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1417,9 +1416,9 @@ static int __init vga16fb_probe(struct device *device)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int vga16fb_remove(struct device *device)</div><div class='add'>+static int vga16fb_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct fb_info *info = dev_get_drvdata(device);</div><div class='add'>+	struct fb_info *info = platform_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (info) {</div><div class='ctx'> 		unregister_framebuffer(info);</div><div class='hunk'>@@ -1432,16 +1431,15 @@ static int vga16fb_remove(struct device *device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_driver vga16fb_driver = {</div><div class='del'>-	.name = "vga16fb",</div><div class='del'>-	.bus  = &amp;platform_bus_type,</div><div class='add'>+static struct platform_driver vga16fb_driver = {</div><div class='ctx'> 	.probe = vga16fb_probe,</div><div class='ctx'> 	.remove = vga16fb_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "vga16fb",</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct platform_device vga16fb_device = {</div><div class='del'>-	.name = "vga16fb",</div><div class='del'>-};</div><div class='add'>+static struct platform_device *vga16fb_device;</div><div class='ctx'> </div><div class='ctx'> static int __init vga16fb_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -1454,12 +1452,20 @@ static int __init vga16fb_init(void)</div><div class='ctx'> </div><div class='ctx'> 	vga16fb_setup(option);</div><div class='ctx'> #endif</div><div class='del'>-	ret = driver_register(&amp;vga16fb_driver);</div><div class='add'>+	ret = platform_driver_register(&amp;vga16fb_driver);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		ret = platform_device_register(&amp;vga16fb_device);</div><div class='del'>-		if (ret)</div><div class='del'>-			driver_unregister(&amp;vga16fb_driver);</div><div class='add'>+		vga16fb_device = platform_device_alloc("vga16fb", 0);</div><div class='add'>+</div><div class='add'>+		if (vga16fb_device)</div><div class='add'>+			ret = platform_device_add(vga16fb_device);</div><div class='add'>+		else</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			platform_device_put(vga16fb_device);</div><div class='add'>+			platform_driver_unregister(&amp;vga16fb_driver);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1467,8 +1473,8 @@ static int __init vga16fb_init(void)</div><div class='ctx'> </div><div class='ctx'> static void __exit vga16fb_exit(void)</div><div class='ctx'> {</div><div class='del'>-	platform_device_unregister(&amp;vga16fb_device);</div><div class='del'>-	driver_unregister(&amp;vga16fb_driver);</div><div class='add'>+	platform_device_unregister(vga16fb_device);</div><div class='add'>+	platform_driver_unregister(&amp;vga16fb_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c<br/>index 15179ec62339..d94efafc77b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/vgastate.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/vgastate.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/vgastate.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/vgastate.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  * archive for more details.  </div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='head'>diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c<br/>index 5ea2345dab99..64378959dd7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/video/virgefb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/video/virgefb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/video/virgefb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/video/virgefb.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/zorro.h&gt;</div><div class='head'>diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig<br/>index 5e61ed59a41e..8b3d0f0c7bd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/Kconfig</a></div><div class='hunk'>@@ -2,8 +2,9 @@ menu "Dallas's 1-wire bus"</div><div class='ctx'> </div><div class='ctx'> config W1</div><div class='ctx'> 	tristate "Dallas's 1-wire support"</div><div class='add'>+	depends on CONNECTOR</div><div class='ctx'> 	---help---</div><div class='del'>-	  Dallas's 1-wire bus is useful to connect slow 1-pin devices</div><div class='add'>+	  Dallas' 1-wire bus is useful to connect slow 1-pin devices</div><div class='ctx'> 	  such as iButtons and thermal sensors.</div><div class='ctx'> </div><div class='ctx'> 	  If you want W1 support, you should say Y here.</div><div class='hunk'>@@ -11,6 +12,18 @@ config W1</div><div class='ctx'> 	  This W1 support can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called wire.ko.</div><div class='ctx'> </div><div class='add'>+config W1_CON</div><div class='add'>+	depends on CONNECTOR &amp;&amp; W1</div><div class='add'>+	bool "Userspace communication over connector"</div><div class='add'>+	default y</div><div class='add'>+	--- help ---</div><div class='add'>+	  This allows to communicate with userspace using connector [Documentation/connector].</div><div class='add'>+	  There are three types of messages between w1 core and userspace:</div><div class='add'>+	  1. Events. They are generated each time new master or slave device found</div><div class='add'>+		either due to automatic or requested search.</div><div class='add'>+	  2. Userspace commands. Includes read/write and search/alarm search comamnds.</div><div class='add'>+	  3. Replies to userspace commands.</div><div class='add'>+</div><div class='ctx'> source drivers/w1/masters/Kconfig</div><div class='ctx'> source drivers/w1/slaves/Kconfig</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile<br/>index 0c2aa22d8c04..93845a2c7c21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/Makefile</a></div><div class='hunk'>@@ -2,10 +2,6 @@</div><div class='ctx'> # Makefile for the Dallas's 1-wire bus.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-ifneq ($(CONFIG_NET), y)</div><div class='del'>-EXTRA_CFLAGS	+= -DNETLINK_DISABLED</div><div class='del'>-endif</div><div class='del'>-</div><div class='ctx'> ifeq ($(CONFIG_W1_DS2433_CRC), y)</div><div class='ctx'> EXTRA_CFLAGS	+= -DCONFIG_W1_F23_CRC</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig<br/>index c6bad4dbdc64..2fb425536eae 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/masters/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/masters/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/masters/Kconfig</a></div><div class='hunk'>@@ -15,24 +15,15 @@ config W1_MASTER_MATROX</div><div class='ctx'> 	  This support is also available as a module.  If so, the module</div><div class='ctx'> 	  will be called matrox_w1.ko.</div><div class='ctx'> </div><div class='del'>-config W1_MASTER_DS9490</div><div class='del'>-	tristate "DS9490R transport layer driver"</div><div class='del'>-	depends on W1 &amp;&amp; USB</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you want to have a driver for DS9490R UWB &lt;-&gt; W1 bridge.</div><div class='del'>-</div><div class='del'>-	  This support is also available as a module.  If so, the module</div><div class='del'>-	  will be called ds9490r.ko.</div><div class='del'>-</div><div class='del'>-config W1_MASTER_DS9490_BRIDGE</div><div class='del'>-	tristate "DS9490R USB &lt;-&gt; W1 transport layer for 1-wire"</div><div class='del'>-	depends on W1_MASTER_DS9490</div><div class='del'>-	help</div><div class='del'>-	  Say Y here if you want to communicate with your 1-wire devices</div><div class='del'>-	  using DS9490R USB bridge.</div><div class='del'>-</div><div class='del'>-	  This support is also available as a module.  If so, the module</div><div class='del'>-	  will be called ds_w1_bridge.ko.</div><div class='add'>+config W1_MASTER_DS2490</div><div class='add'>+	tristate "DS2490 USB &lt;-&gt; W1 transport layer for 1-wire"</div><div class='add'>+  	depends on W1 &amp;&amp; USB</div><div class='add'>+  	help</div><div class='add'>+	  Say Y here if you want to have a driver for DS2490 based USB &lt;-&gt; W1 bridges,</div><div class='add'>+	  for example DS9490*.</div><div class='add'>+</div><div class='add'>+  	  This support is also available as a module.  If so, the module</div><div class='add'>+	  will be called ds2490.ko.</div><div class='ctx'> </div><div class='ctx'> config W1_MASTER_DS2482</div><div class='ctx'> 	tristate "Maxim DS2482 I2C to 1-Wire bridge"</div><div class='head'>diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile<br/>index 1f3c8b983dc1..4cee256a8134 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/masters/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/masters/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/masters/Makefile</a></div><div class='hunk'>@@ -3,11 +3,6 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_W1_MASTER_MATROX)		+= matrox_w1.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_W1_MASTER_DS9490)		+= ds9490r.o</div><div class='del'>-ds9490r-objs    := dscore.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_W1_MASTER_DS9490_BRIDGE)	+= ds_w1_bridge.o</div><div class='del'>-</div><div class='add'>+obj-$(CONFIG_W1_MASTER_DS2490)		+= ds2490.o</div><div class='ctx'> obj-$(CONFIG_W1_MASTER_DS2482)		+= ds2482.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c<br/>index d1cacd23576b..d93eb626b2f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/masters/ds2482.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/ds2482.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/masters/ds2482.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/masters/ds2482.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ struct ds2482_w1_chan {</div><div class='ctx'> </div><div class='ctx'> struct ds2482_data {</div><div class='ctx'> 	struct i2c_client	client;</div><div class='del'>-	struct semaphore	access_lock;</div><div class='add'>+	struct mutex		access_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* 1-wire interface(s) */</div><div class='ctx'> 	int			w1_count;	/* 1 or 8 */</div><div class='hunk'>@@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct ds2482_data *pdev)</div><div class='ctx'> 		do {</div><div class='ctx'> 			temp = i2c_smbus_read_byte(&amp;pdev-&gt;client);</div><div class='ctx'> 		} while ((temp &gt;= 0) &amp;&amp; (temp &amp; DS2482_REG_STS_1WB) &amp;&amp;</div><div class='del'>-			 (++retries &gt; DS2482_WAIT_IDLE_TIMEOUT));</div><div class='add'>+			 (++retries &lt; DS2482_WAIT_IDLE_TIMEOUT));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (retries &gt; DS2482_WAIT_IDLE_TIMEOUT)</div><div class='hunk'>@@ -265,7 +265,7 @@ static u8 ds2482_w1_touch_bit(void *data, u8 bit)</div><div class='ctx'> 	struct ds2482_data    *pdev = pchan-&gt;pdev;</div><div class='ctx'> 	int status = -1;</div><div class='ctx'> </div><div class='del'>-	down(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Select the channel */</div><div class='ctx'> 	ds2482_wait_1wire_idle(pdev);</div><div class='hunk'>@@ -277,7 +277,7 @@ static u8 ds2482_w1_touch_bit(void *data, u8 bit)</div><div class='ctx'> 				  bit ? 0xFF : 0))</div><div class='ctx'> 		status = ds2482_wait_1wire_idle(pdev);</div><div class='ctx'> </div><div class='del'>-	up(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	return (status &amp; DS2482_REG_STS_SBR) ? 1 : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -297,7 +297,7 @@ static u8 ds2482_w1_triplet(void *data, u8 dbit)</div><div class='ctx'> 	struct ds2482_data    *pdev = pchan-&gt;pdev;</div><div class='ctx'> 	int status = (3 &lt;&lt; 5);</div><div class='ctx'> </div><div class='del'>-	down(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Select the channel */</div><div class='ctx'> 	ds2482_wait_1wire_idle(pdev);</div><div class='hunk'>@@ -309,7 +309,7 @@ static u8 ds2482_w1_triplet(void *data, u8 dbit)</div><div class='ctx'> 				  dbit ? 0xFF : 0))</div><div class='ctx'> 		status = ds2482_wait_1wire_idle(pdev);</div><div class='ctx'> </div><div class='del'>-	up(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Decode the status */</div><div class='ctx'> 	return (status &gt;&gt; 5);</div><div class='hunk'>@@ -326,7 +326,7 @@ static void ds2482_w1_write_byte(void *data, u8 byte)</div><div class='ctx'> 	struct ds2482_w1_chan *pchan = data;</div><div class='ctx'> 	struct ds2482_data    *pdev = pchan-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	down(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Select the channel */</div><div class='ctx'> 	ds2482_wait_1wire_idle(pdev);</div><div class='hunk'>@@ -336,7 +336,7 @@ static void ds2482_w1_write_byte(void *data, u8 byte)</div><div class='ctx'> 	/* Send the write byte command */</div><div class='ctx'> 	ds2482_send_cmd_data(pdev, DS2482_CMD_1WIRE_WRITE_BYTE, byte);</div><div class='ctx'> </div><div class='del'>-	up(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -351,7 +351,7 @@ static u8 ds2482_w1_read_byte(void *data)</div><div class='ctx'> 	struct ds2482_data    *pdev = pchan-&gt;pdev;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='del'>-	down(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Select the channel */</div><div class='ctx'> 	ds2482_wait_1wire_idle(pdev);</div><div class='hunk'>@@ -370,7 +370,7 @@ static u8 ds2482_w1_read_byte(void *data)</div><div class='ctx'> 	/* Read the data byte */</div><div class='ctx'> 	result = i2c_smbus_read_byte(&amp;pdev-&gt;client);</div><div class='ctx'> </div><div class='del'>-	up(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -389,7 +389,7 @@ static u8 ds2482_w1_reset_bus(void *data)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 retval = 1;</div><div class='ctx'> </div><div class='del'>-	down(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_lock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Select the channel */</div><div class='ctx'> 	ds2482_wait_1wire_idle(pdev);</div><div class='hunk'>@@ -409,7 +409,7 @@ static u8 ds2482_w1_reset_bus(void *data)</div><div class='ctx'> 					     0xF0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;pdev-&gt;access_lock);</div><div class='add'>+	mutex_unlock(&amp;pdev-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -482,7 +482,7 @@ static int ds2482_detect(struct i2c_adapter *adapter, int address, int kind)</div><div class='ctx'> 	snprintf(new_client-&gt;name, sizeof(new_client-&gt;name), "ds2482-%d00",</div><div class='ctx'> 		 data-&gt;w1_count);</div><div class='ctx'> </div><div class='del'>-	init_MUTEX(&amp;data-&gt;access_lock);</div><div class='add'>+	mutex_init(&amp;data-&gt;access_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the I2C layer a new client has arrived */</div><div class='ctx'> 	if ((err = i2c_attach_client(new_client)))</div><div class='head'>diff --git a/drivers/w1/masters/dscore.c b/drivers/w1/masters/ds2490.c<br/>index 2cf7776a7080..299e274d241a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/masters/dscore.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/dscore.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/masters/ds2490.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/masters/ds2490.c</a></div><div class='hunk'>@@ -24,7 +24,136 @@</div><div class='ctx'> #include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dscore.h"</div><div class='add'>+#include "../w1_int.h"</div><div class='add'>+#include "../w1.h"</div><div class='add'>+</div><div class='add'>+/* COMMAND TYPE CODES */</div><div class='add'>+#define CONTROL_CMD			0x00</div><div class='add'>+#define COMM_CMD			0x01</div><div class='add'>+#define MODE_CMD			0x02</div><div class='add'>+</div><div class='add'>+/* CONTROL COMMAND CODES */</div><div class='add'>+#define CTL_RESET_DEVICE		0x0000</div><div class='add'>+#define CTL_START_EXE			0x0001</div><div class='add'>+#define CTL_RESUME_EXE			0x0002</div><div class='add'>+#define CTL_HALT_EXE_IDLE		0x0003</div><div class='add'>+#define CTL_HALT_EXE_DONE		0x0004</div><div class='add'>+#define CTL_FLUSH_COMM_CMDS		0x0007</div><div class='add'>+#define CTL_FLUSH_RCV_BUFFER		0x0008</div><div class='add'>+#define CTL_FLUSH_XMT_BUFFER		0x0009</div><div class='add'>+#define CTL_GET_COMM_CMDS		0x000A</div><div class='add'>+</div><div class='add'>+/* MODE COMMAND CODES */</div><div class='add'>+#define MOD_PULSE_EN			0x0000</div><div class='add'>+#define MOD_SPEED_CHANGE_EN		0x0001</div><div class='add'>+#define MOD_1WIRE_SPEED			0x0002</div><div class='add'>+#define MOD_STRONG_PU_DURATION		0x0003</div><div class='add'>+#define MOD_PULLDOWN_SLEWRATE		0x0004</div><div class='add'>+#define MOD_PROG_PULSE_DURATION		0x0005</div><div class='add'>+#define MOD_WRITE1_LOWTIME		0x0006</div><div class='add'>+#define MOD_DSOW0_TREC			0x0007</div><div class='add'>+</div><div class='add'>+/* COMMUNICATION COMMAND CODES */</div><div class='add'>+#define COMM_ERROR_ESCAPE		0x0601</div><div class='add'>+#define COMM_SET_DURATION		0x0012</div><div class='add'>+#define COMM_BIT_IO			0x0020</div><div class='add'>+#define COMM_PULSE			0x0030</div><div class='add'>+#define COMM_1_WIRE_RESET		0x0042</div><div class='add'>+#define COMM_BYTE_IO			0x0052</div><div class='add'>+#define COMM_MATCH_ACCESS		0x0064</div><div class='add'>+#define COMM_BLOCK_IO			0x0074</div><div class='add'>+#define COMM_READ_STRAIGHT		0x0080</div><div class='add'>+#define COMM_DO_RELEASE			0x6092</div><div class='add'>+#define COMM_SET_PATH			0x00A2</div><div class='add'>+#define COMM_WRITE_SRAM_PAGE		0x00B2</div><div class='add'>+#define COMM_WRITE_EPROM		0x00C4</div><div class='add'>+#define COMM_READ_CRC_PROT_PAGE		0x00D4</div><div class='add'>+#define COMM_READ_REDIRECT_PAGE_CRC	0x21E4</div><div class='add'>+#define COMM_SEARCH_ACCESS		0x00F4</div><div class='add'>+</div><div class='add'>+/* Communication command bits */</div><div class='add'>+#define COMM_TYPE			0x0008</div><div class='add'>+#define COMM_SE				0x0008</div><div class='add'>+#define COMM_D				0x0008</div><div class='add'>+#define COMM_Z				0x0008</div><div class='add'>+#define COMM_CH				0x0008</div><div class='add'>+#define COMM_SM				0x0008</div><div class='add'>+#define COMM_R				0x0008</div><div class='add'>+#define COMM_IM				0x0001</div><div class='add'>+</div><div class='add'>+#define COMM_PS				0x4000</div><div class='add'>+#define COMM_PST			0x4000</div><div class='add'>+#define COMM_CIB			0x4000</div><div class='add'>+#define COMM_RTS			0x4000</div><div class='add'>+#define COMM_DT				0x2000</div><div class='add'>+#define COMM_SPU			0x1000</div><div class='add'>+#define COMM_F				0x0800</div><div class='add'>+#define COMM_NTP			0x0400</div><div class='add'>+#define COMM_ICP			0x0200</div><div class='add'>+#define COMM_RST			0x0100</div><div class='add'>+</div><div class='add'>+#define PULSE_PROG			0x01</div><div class='add'>+#define PULSE_SPUE			0x02</div><div class='add'>+</div><div class='add'>+#define BRANCH_MAIN			0xCC</div><div class='add'>+#define BRANCH_AUX			0x33</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Duration of the strong pull-up pulse in milliseconds.</div><div class='add'>+ */</div><div class='add'>+#define PULLUP_PULSE_DURATION		750</div><div class='add'>+</div><div class='add'>+/* Status flags */</div><div class='add'>+#define ST_SPUA				0x01  /* Strong Pull-up is active */</div><div class='add'>+#define ST_PRGA				0x02  /* 12V programming pulse is being generated */</div><div class='add'>+#define ST_12VP				0x04  /* external 12V programming voltage is present */</div><div class='add'>+#define ST_PMOD				0x08  /* DS2490 powered from USB and external sources */</div><div class='add'>+#define ST_HALT				0x10  /* DS2490 is currently halted */</div><div class='add'>+#define ST_IDLE				0x20  /* DS2490 is currently idle */</div><div class='add'>+#define ST_EPOF				0x80</div><div class='add'>+</div><div class='add'>+#define SPEED_NORMAL			0x00</div><div class='add'>+#define SPEED_FLEXIBLE			0x01</div><div class='add'>+#define SPEED_OVERDRIVE			0x02</div><div class='add'>+</div><div class='add'>+#define NUM_EP				4</div><div class='add'>+#define EP_CONTROL			0</div><div class='add'>+#define EP_STATUS			1</div><div class='add'>+#define EP_DATA_OUT			2</div><div class='add'>+#define EP_DATA_IN			3</div><div class='add'>+</div><div class='add'>+struct ds_device</div><div class='add'>+{</div><div class='add'>+	struct list_head	ds_entry;</div><div class='add'>+</div><div class='add'>+	struct usb_device	*udev;</div><div class='add'>+	struct usb_interface	*intf;</div><div class='add'>+</div><div class='add'>+	int			ep[NUM_EP];</div><div class='add'>+</div><div class='add'>+	struct w1_bus_master	master;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ds_status</div><div class='add'>+{</div><div class='add'>+	u8			enable;</div><div class='add'>+	u8			speed;</div><div class='add'>+	u8			pullup_dur;</div><div class='add'>+	u8			ppuls_dur;</div><div class='add'>+	u8			pulldown_slew;</div><div class='add'>+	u8			write1_time;</div><div class='add'>+	u8			write0_time;</div><div class='add'>+	u8			reserved0;</div><div class='add'>+	u8			status;</div><div class='add'>+	u8			command0;</div><div class='add'>+	u8			command1;</div><div class='add'>+	u8			command_buffer_status;</div><div class='add'>+	u8			data_out_buffer_status;</div><div class='add'>+	u8			data_in_buffer_status;</div><div class='add'>+	u8			reserved1;</div><div class='add'>+	u8			reserved2;</div><div class='add'>+</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static struct usb_device_id ds_id_table [] = {</div><div class='ctx'> 	{ USB_DEVICE(0x04fa, 0x2490) },</div><div class='hunk'>@@ -35,21 +164,12 @@ MODULE_DEVICE_TABLE(usb, ds_id_table);</div><div class='ctx'> static int ds_probe(struct usb_interface *, const struct usb_device_id *);</div><div class='ctx'> static void ds_disconnect(struct usb_interface *);</div><div class='ctx'> </div><div class='del'>-int ds_touch_bit(struct ds_device *, u8, u8 *);</div><div class='del'>-int ds_read_byte(struct ds_device *, u8 *);</div><div class='del'>-int ds_read_bit(struct ds_device *, u8 *);</div><div class='del'>-int ds_write_byte(struct ds_device *, u8);</div><div class='del'>-int ds_write_bit(struct ds_device *, u8);</div><div class='del'>-static int ds_start_pulse(struct ds_device *, int);</div><div class='del'>-int ds_reset(struct ds_device *, struct ds_status *);</div><div class='del'>-struct ds_device * ds_get_device(void);</div><div class='del'>-void ds_put_device(struct ds_device *);</div><div class='del'>-</div><div class='ctx'> static inline void ds_dump_status(unsigned char *, unsigned char *, int);</div><div class='ctx'> static int ds_send_control(struct ds_device *, u16, u16);</div><div class='del'>-static int ds_send_control_mode(struct ds_device *, u16, u16);</div><div class='ctx'> static int ds_send_control_cmd(struct ds_device *, u16, u16);</div><div class='ctx'> </div><div class='add'>+static LIST_HEAD(ds_devices);</div><div class='add'>+static DEFINE_MUTEX(ds_mutex);</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver ds_driver = {</div><div class='ctx'> 	.name =		"DS9490R",</div><div class='hunk'>@@ -58,20 +178,6 @@ static struct usb_driver ds_driver = {</div><div class='ctx'> 	.id_table =	ds_id_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ds_device *ds_dev;</div><div class='del'>-</div><div class='del'>-struct ds_device * ds_get_device(void)</div><div class='del'>-{</div><div class='del'>-	if (ds_dev)</div><div class='del'>-		atomic_inc(&amp;ds_dev-&gt;refcnt);</div><div class='del'>-	return ds_dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ds_put_device(struct ds_device *dev)</div><div class='del'>-{</div><div class='del'>-	atomic_dec(&amp;dev-&gt;refcnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ds_send_control_cmd(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -86,7 +192,7 @@ static int ds_send_control_cmd(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#if 0</div><div class='ctx'> static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -101,7 +207,7 @@ static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> static int ds_send_control(struct ds_device *dev, u16 value, u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -324,7 +430,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st)</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_reset(struct ds_device *dev, struct ds_status *st)</div><div class='add'>+static int ds_reset(struct ds_device *dev, struct ds_status *st)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -345,7 +451,7 @@ int ds_reset(struct ds_device *dev, struct ds_status *st)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-int ds_set_speed(struct ds_device *dev, int speed)</div><div class='add'>+static int ds_set_speed(struct ds_device *dev, int speed)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +501,7 @@ static int ds_start_pulse(struct ds_device *dev, int delay)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)</div><div class='add'>+static int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)</div><div class='ctx'> {</div><div class='ctx'> 	int err, count;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -427,7 +533,7 @@ int ds_touch_bit(struct ds_device *dev, u8 bit, u8 *tbit)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_write_bit(struct ds_device *dev, u8 bit)</div><div class='add'>+static int ds_write_bit(struct ds_device *dev, u8 bit)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -441,7 +547,7 @@ int ds_write_bit(struct ds_device *dev, u8 bit)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_write_byte(struct ds_device *dev, u8 byte)</div><div class='add'>+static int ds_write_byte(struct ds_device *dev, u8 byte)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -464,26 +570,7 @@ int ds_write_byte(struct ds_device *dev, u8 byte)</div><div class='ctx'> 	return !(byte == rbyte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_read_bit(struct ds_device *dev, u8 *bit)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = ds_send_control(dev, COMM_BIT_IO | COMM_IM | COMM_SPU | COMM_D, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = ds_recv_data(dev, bit, sizeof(*bit));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ds_read_byte(struct ds_device *dev, u8 *byte)</div><div class='add'>+static int ds_read_byte(struct ds_device *dev, u8 *byte)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -501,7 +588,7 @@ int ds_read_byte(struct ds_device *dev, u8 *byte)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_read_block(struct ds_device *dev, u8 *buf, int len)</div><div class='add'>+static int ds_read_block(struct ds_device *dev, u8 *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct ds_status st;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -527,7 +614,7 @@ int ds_read_block(struct ds_device *dev, u8 *buf, int len)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_write_block(struct ds_device *dev, u8 *buf, int len)</div><div class='add'>+static int ds_write_block(struct ds_device *dev, u8 *buf, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -555,7 +642,7 @@ int ds_write_block(struct ds_device *dev, u8 *buf, int len)</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> </div><div class='del'>-int ds_search(struct ds_device *dev, u64 init, u64 *buf, u8 id_number, int conditional_search)</div><div class='add'>+static int ds_search(struct ds_device *dev, u64 init, u64 *buf, u8 id_number, int conditional_search)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 value, index;</div><div class='hunk'>@@ -584,7 +671,7 @@ int ds_search(struct ds_device *dev, u64 init, u64 *buf, u8 id_number, int condi</div><div class='ctx'> 	return err/8;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_match_access(struct ds_device *dev, u64 init)</div><div class='add'>+static int ds_match_access(struct ds_device *dev, u64 init)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -604,7 +691,7 @@ int ds_match_access(struct ds_device *dev, u64 init)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ds_set_path(struct ds_device *dev, u64 init)</div><div class='add'>+static int ds_set_path(struct ds_device *dev, u64 init)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct ds_status st;</div><div class='hunk'>@@ -630,45 +717,156 @@ int ds_set_path(struct ds_device *dev, u64 init)</div><div class='ctx'> </div><div class='ctx'> #endif  /*  0  */</div><div class='ctx'> </div><div class='add'>+static u8 ds9490r_touch_bit(void *data, u8 bit)</div><div class='add'>+{</div><div class='add'>+	u8 ret;</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+</div><div class='add'>+	if (ds_touch_bit(dev, bit, &amp;ret))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ds9490r_write_bit(void *data, u8 bit)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+</div><div class='add'>+	ds_write_bit(dev, bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ds9490r_write_byte(void *data, u8 byte)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+</div><div class='add'>+	ds_write_byte(dev, byte);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ds9490r_read_bit(void *data)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+	int err;</div><div class='add'>+	u8 bit = 0;</div><div class='add'>+</div><div class='add'>+	err = ds_touch_bit(dev, 1, &amp;bit);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return bit &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ds9490r_read_byte(void *data)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+	int err;</div><div class='add'>+	u8 byte = 0;</div><div class='add'>+</div><div class='add'>+	err = ds_read_byte(dev, &amp;byte);</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return byte;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ds9490r_write_block(void *data, const u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+</div><div class='add'>+	ds_write_block(dev, (u8 *)buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ds9490r_read_block(void *data, u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ds_read_block(dev, buf, len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ds9490r_reset(void *data)</div><div class='add'>+{</div><div class='add'>+	struct ds_device *dev = data;</div><div class='add'>+	struct ds_status st;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;st, 0, sizeof(st));</div><div class='add'>+</div><div class='add'>+	err = ds_reset(dev, &amp;st);</div><div class='add'>+	if (err)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ds_w1_init(struct ds_device *dev)</div><div class='add'>+{</div><div class='add'>+	memset(&amp;dev-&gt;master, 0, sizeof(struct w1_bus_master));</div><div class='add'>+</div><div class='add'>+	dev-&gt;master.data	= dev;</div><div class='add'>+	dev-&gt;master.touch_bit	= &amp;ds9490r_touch_bit;</div><div class='add'>+	dev-&gt;master.read_bit	= &amp;ds9490r_read_bit;</div><div class='add'>+	dev-&gt;master.write_bit	= &amp;ds9490r_write_bit;</div><div class='add'>+	dev-&gt;master.read_byte	= &amp;ds9490r_read_byte;</div><div class='add'>+	dev-&gt;master.write_byte	= &amp;ds9490r_write_byte;</div><div class='add'>+	dev-&gt;master.read_block	= &amp;ds9490r_read_block;</div><div class='add'>+	dev-&gt;master.write_block	= &amp;ds9490r_write_block;</div><div class='add'>+	dev-&gt;master.reset_bus	= &amp;ds9490r_reset;</div><div class='add'>+</div><div class='add'>+	return w1_add_master_device(&amp;dev-&gt;master);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ds_w1_fini(struct ds_device *dev)</div><div class='add'>+{</div><div class='add'>+	w1_remove_master_device(&amp;dev-&gt;master);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ds_probe(struct usb_interface *intf,</div><div class='ctx'> 		    const struct usb_device_id *udev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='ctx'> 	struct usb_endpoint_descriptor *endpoint;</div><div class='ctx'> 	struct usb_host_interface *iface_desc;</div><div class='add'>+	struct ds_device *dev;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	ds_dev = kmalloc(sizeof(struct ds_device), GFP_KERNEL);</div><div class='del'>-	if (!ds_dev) {</div><div class='add'>+	dev = kmalloc(sizeof(struct ds_device), GFP_KERNEL);</div><div class='add'>+	if (!dev) {</div><div class='ctx'> 		printk(KERN_INFO "Failed to allocate new DS9490R structure.\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	dev-&gt;udev = usb_get_dev(udev);</div><div class='add'>+	if (!dev-&gt;udev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_free;</div><div class='add'>+	}</div><div class='add'>+	memset(dev-&gt;ep, 0, sizeof(dev-&gt;ep));</div><div class='ctx'> </div><div class='del'>-	ds_dev-&gt;udev = usb_get_dev(udev);</div><div class='del'>-	usb_set_intfdata(intf, ds_dev);</div><div class='add'>+	usb_set_intfdata(intf, dev);</div><div class='ctx'> </div><div class='del'>-	err = usb_set_interface(ds_dev-&gt;udev, intf-&gt;altsetting[0].desc.bInterfaceNumber, 3);</div><div class='add'>+	err = usb_set_interface(dev-&gt;udev, intf-&gt;altsetting[0].desc.bInterfaceNumber, 3);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to set alternative setting 3 for %d interface: err=%d.\n",</div><div class='ctx'> 				intf-&gt;altsetting[0].desc.bInterfaceNumber, err);</div><div class='del'>-		return err;</div><div class='add'>+		goto err_out_clear;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = usb_reset_configuration(ds_dev-&gt;udev);</div><div class='add'>+	err = usb_reset_configuration(dev-&gt;udev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to reset configuration: err=%d.\n", err);</div><div class='del'>-		return err;</div><div class='add'>+		goto err_out_clear;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	iface_desc = &amp;intf-&gt;altsetting[0];</div><div class='ctx'> 	if (iface_desc-&gt;desc.bNumEndpoints != NUM_EP-1) {</div><div class='ctx'> 		printk(KERN_INFO "Num endpoints=%d. It is not DS9490R.\n", iface_desc-&gt;desc.bNumEndpoints);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_out_clear;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;ds_dev-&gt;refcnt, 0);</div><div class='del'>-	memset(ds_dev-&gt;ep, 0, sizeof(ds_dev-&gt;ep));</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * This loop doesn'd show control 0 endpoint,</div><div class='ctx'> 	 * so we will fill only 1-3 endpoints entry.</div><div class='hunk'>@@ -676,54 +874,31 @@ static int ds_probe(struct usb_interface *intf,</div><div class='ctx'> 	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; ++i) {</div><div class='ctx'> 		endpoint = &amp;iface_desc-&gt;endpoint[i].desc;</div><div class='ctx'> </div><div class='del'>-		ds_dev-&gt;ep[i+1] = endpoint-&gt;bEndpointAddress;</div><div class='del'>-</div><div class='add'>+		dev-&gt;ep[i+1] = endpoint-&gt;bEndpointAddress;</div><div class='add'>+#if 0</div><div class='ctx'> 		printk("%d: addr=%x, size=%d, dir=%s, type=%x\n",</div><div class='ctx'> 			i, endpoint-&gt;bEndpointAddress, le16_to_cpu(endpoint-&gt;wMaxPacketSize),</div><div class='ctx'> 			(endpoint-&gt;bEndpointAddress &amp; USB_DIR_IN)?"IN":"OUT",</div><div class='ctx'> 			endpoint-&gt;bmAttributes &amp; USB_ENDPOINT_XFERTYPE_MASK);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	{</div><div class='del'>-		int err, i;</div><div class='del'>-		u64 buf[3];</div><div class='del'>-		u64 init=0xb30000002078ee81ull;</div><div class='del'>-		struct ds_status st;</div><div class='del'>-</div><div class='del'>-		ds_reset(ds_dev, &amp;st);</div><div class='del'>-		err = ds_search(ds_dev, init, buf, 3, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		for (i=0; i&lt;err; ++i)</div><div class='del'>-			printk("%d: %llx\n", i, buf[i]);</div><div class='del'>-</div><div class='del'>-		printk("Resetting...\n");</div><div class='del'>-		ds_reset(ds_dev, &amp;st);</div><div class='del'>-		printk("Setting path for %llx.\n", init);</div><div class='del'>-		err = ds_set_path(ds_dev, init);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		printk("Calling MATCH_ACCESS.\n");</div><div class='del'>-		err = ds_match_access(ds_dev, init);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		printk("Searching the bus...\n");</div><div class='del'>-		err = ds_search(ds_dev, init, buf, 3, 0);</div><div class='del'>-</div><div class='del'>-		printk("ds_search() returned %d\n", err);</div><div class='del'>-</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		for (i=0; i&lt;err; ++i)</div><div class='del'>-			printk("%d: %llx\n", i, buf[i]);</div><div class='add'>+	err = ds_w1_init(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_clear;</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	mutex_lock(&amp;ds_mutex);</div><div class='add'>+	list_add_tail(&amp;dev-&gt;ds_entry, &amp;ds_devices);</div><div class='add'>+	mutex_unlock(&amp;ds_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_out_clear:</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+	usb_put_dev(dev-&gt;udev);</div><div class='add'>+err_out_free:</div><div class='add'>+	kfree(dev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ds_disconnect(struct usb_interface *intf)</div><div class='hunk'>@@ -731,19 +906,19 @@ static void ds_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	struct ds_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	dev = usb_get_intfdata(intf);</div><div class='del'>-	usb_set_intfdata(intf, NULL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	while (atomic_read(&amp;dev-&gt;refcnt)) {</div><div class='del'>-		printk(KERN_INFO "Waiting for DS to become free: refcnt=%d.\n",</div><div class='del'>-				atomic_read(&amp;dev-&gt;refcnt));</div><div class='add'>+	mutex_lock(&amp;ds_mutex);</div><div class='add'>+	list_del(&amp;dev-&gt;ds_entry);</div><div class='add'>+	mutex_unlock(&amp;ds_mutex);</div><div class='ctx'> </div><div class='del'>-		if (msleep_interruptible(1000))</div><div class='del'>-			flush_signals(current);</div><div class='del'>-	}</div><div class='add'>+	ds_w1_fini(dev);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='ctx'> </div><div class='ctx'> 	usb_put_dev(dev-&gt;udev);</div><div class='ctx'> 	kfree(dev);</div><div class='del'>-	ds_dev = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ds_init(void)</div><div class='hunk'>@@ -769,27 +944,4 @@ module_exit(ds_fini);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;");</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ds_touch_bit);</div><div class='del'>-EXPORT_SYMBOL(ds_read_byte);</div><div class='del'>-EXPORT_SYMBOL(ds_read_bit);</div><div class='del'>-EXPORT_SYMBOL(ds_read_block);</div><div class='del'>-EXPORT_SYMBOL(ds_write_byte);</div><div class='del'>-EXPORT_SYMBOL(ds_write_bit);</div><div class='del'>-EXPORT_SYMBOL(ds_write_block);</div><div class='del'>-EXPORT_SYMBOL(ds_reset);</div><div class='del'>-EXPORT_SYMBOL(ds_get_device);</div><div class='del'>-EXPORT_SYMBOL(ds_put_device);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This functions can be used for EEPROM programming,</div><div class='del'>- * when driver will be included into mainline this will</div><div class='del'>- * require uncommenting.</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-EXPORT_SYMBOL(ds_start_pulse);</div><div class='del'>-EXPORT_SYMBOL(ds_set_speed);</div><div class='del'>-EXPORT_SYMBOL(ds_detect);</div><div class='del'>-EXPORT_SYMBOL(ds_stop_pulse);</div><div class='del'>-EXPORT_SYMBOL(ds_search);</div><div class='del'>-#endif</div><div class='add'>+MODULE_DESCRIPTION("DS2490 USB &lt;-&gt; W1 bus master driver (DS9490*)");</div><div class='head'>diff --git a/drivers/w1/masters/ds_w1_bridge.c b/drivers/w1/masters/ds_w1_bridge.c<br/>deleted file mode 100644<br/>index 5d30783a3eb6..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/masters/ds_w1_bridge.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/ds_w1_bridge.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,174 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	ds_w1_bridge.c</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include "../w1.h"</div><div class='del'>-#include "../w1_int.h"</div><div class='del'>-#include "dscore.h"</div><div class='del'>-</div><div class='del'>-static struct ds_device *ds_dev;</div><div class='del'>-static struct w1_bus_master *ds_bus_master;</div><div class='del'>-</div><div class='del'>-static u8 ds9490r_touch_bit(void *data, u8 bit)</div><div class='del'>-{</div><div class='del'>-	u8 ret;</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-</div><div class='del'>-	if (ds_touch_bit(dev, bit, &amp;ret))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ds9490r_write_bit(void *data, u8 bit)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-</div><div class='del'>-	ds_write_bit(dev, bit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ds9490r_write_byte(void *data, u8 byte)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-</div><div class='del'>-	ds_write_byte(dev, byte);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 ds9490r_read_bit(void *data)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-	int err;</div><div class='del'>-	u8 bit = 0;</div><div class='del'>-</div><div class='del'>-	err = ds_touch_bit(dev, 1, &amp;bit);</div><div class='del'>-	if (err)</div><div class='del'>-		return 0;</div><div class='del'>-	//err = ds_read_bit(dev, &amp;bit);</div><div class='del'>-	//if (err)</div><div class='del'>-	//	return 0;</div><div class='del'>-</div><div class='del'>-	return bit &amp; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 ds9490r_read_byte(void *data)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-	int err;</div><div class='del'>-	u8 byte = 0;</div><div class='del'>-</div><div class='del'>-	err = ds_read_byte(dev, &amp;byte);</div><div class='del'>-	if (err)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return byte;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ds9490r_write_block(void *data, const u8 *buf, int len)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-</div><div class='del'>-	ds_write_block(dev, (u8 *)buf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 ds9490r_read_block(void *data, u8 *buf, int len)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = ds_read_block(dev, buf, len);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 ds9490r_reset(void *data)</div><div class='del'>-{</div><div class='del'>-	struct ds_device *dev = data;</div><div class='del'>-	struct ds_status st;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;st, 0, sizeof(st));</div><div class='del'>-</div><div class='del'>-	err = ds_reset(dev, &amp;st);</div><div class='del'>-	if (err)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit ds_w1_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ds_bus_master = kmalloc(sizeof(*ds_bus_master), GFP_KERNEL);</div><div class='del'>-	if (!ds_bus_master) {</div><div class='del'>-		printk(KERN_ERR "Failed to allocate DS9490R USB&lt;-&gt;W1 bus_master structure.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ds_dev = ds_get_device();</div><div class='del'>-	if (!ds_dev) {</div><div class='del'>-		printk(KERN_ERR "DS9490R is not registered.\n");</div><div class='del'>-		err =  -ENODEV;</div><div class='del'>-		goto err_out_free_bus_master;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(ds_bus_master, 0, sizeof(*ds_bus_master));</div><div class='del'>-</div><div class='del'>-	ds_bus_master-&gt;data		= ds_dev;</div><div class='del'>-	ds_bus_master-&gt;touch_bit	= &amp;ds9490r_touch_bit;</div><div class='del'>-	ds_bus_master-&gt;read_bit		= &amp;ds9490r_read_bit;</div><div class='del'>-	ds_bus_master-&gt;write_bit	= &amp;ds9490r_write_bit;</div><div class='del'>-	ds_bus_master-&gt;read_byte	= &amp;ds9490r_read_byte;</div><div class='del'>-	ds_bus_master-&gt;write_byte	= &amp;ds9490r_write_byte;</div><div class='del'>-	ds_bus_master-&gt;read_block	= &amp;ds9490r_read_block;</div><div class='del'>-	ds_bus_master-&gt;write_block	= &amp;ds9490r_write_block;</div><div class='del'>-	ds_bus_master-&gt;reset_bus	= &amp;ds9490r_reset;</div><div class='del'>-</div><div class='del'>-	err = w1_add_master_device(ds_bus_master);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_out_put_device;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out_put_device:</div><div class='del'>-	ds_put_device(ds_dev);</div><div class='del'>-err_out_free_bus_master:</div><div class='del'>-	kfree(ds_bus_master);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit ds_w1_fini(void)</div><div class='del'>-{</div><div class='del'>-	w1_remove_master_device(ds_bus_master);</div><div class='del'>-	ds_put_device(ds_dev);</div><div class='del'>-	kfree(ds_bus_master);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ds_w1_init);</div><div class='del'>-module_exit(ds_w1_fini);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;");</div><div class='head'>diff --git a/drivers/w1/masters/dscore.h b/drivers/w1/masters/dscore.h<br/>deleted file mode 100644<br/>index 6cf5671d6ebe..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/masters/dscore.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/masters/dscore.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	dscore.h</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Evgeniy Polyakov &lt;johnpol@2ka.mipt.ru&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __DSCORE_H</div><div class='del'>-#define __DSCORE_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='del'>-</div><div class='del'>-/* COMMAND TYPE CODES */</div><div class='del'>-#define CONTROL_CMD			0x00</div><div class='del'>-#define COMM_CMD			0x01</div><div class='del'>-#define MODE_CMD			0x02</div><div class='del'>-</div><div class='del'>-/* CONTROL COMMAND CODES */</div><div class='del'>-#define CTL_RESET_DEVICE		0x0000</div><div class='del'>-#define CTL_START_EXE			0x0001</div><div class='del'>-#define CTL_RESUME_EXE			0x0002</div><div class='del'>-#define CTL_HALT_EXE_IDLE		0x0003</div><div class='del'>-#define CTL_HALT_EXE_DONE		0x0004</div><div class='del'>-#define CTL_FLUSH_COMM_CMDS		0x0007</div><div class='del'>-#define CTL_FLUSH_RCV_BUFFER		0x0008</div><div class='del'>-#define CTL_FLUSH_XMT_BUFFER		0x0009</div><div class='del'>-#define CTL_GET_COMM_CMDS		0x000A</div><div class='del'>-</div><div class='del'>-/* MODE COMMAND CODES */</div><div class='del'>-#define MOD_PULSE_EN			0x0000</div><div class='del'>-#define MOD_SPEED_CHANGE_EN		0x0001</div><div class='del'>-#define MOD_1WIRE_SPEED			0x0002</div><div class='del'>-#define MOD_STRONG_PU_DURATION		0x0003</div><div class='del'>-#define MOD_PULLDOWN_SLEWRATE		0x0004</div><div class='del'>-#define MOD_PROG_PULSE_DURATION		0x0005</div><div class='del'>-#define MOD_WRITE1_LOWTIME		0x0006</div><div class='del'>-#define MOD_DSOW0_TREC			0x0007</div><div class='del'>-</div><div class='del'>-/* COMMUNICATION COMMAND CODES */</div><div class='del'>-#define COMM_ERROR_ESCAPE		0x0601</div><div class='del'>-#define COMM_SET_DURATION		0x0012</div><div class='del'>-#define COMM_BIT_IO			0x0020</div><div class='del'>-#define COMM_PULSE			0x0030</div><div class='del'>-#define COMM_1_WIRE_RESET		0x0042</div><div class='del'>-#define COMM_BYTE_IO			0x0052</div><div class='del'>-#define COMM_MATCH_ACCESS		0x0064</div><div class='del'>-#define COMM_BLOCK_IO			0x0074</div><div class='del'>-#define COMM_READ_STRAIGHT		0x0080</div><div class='del'>-#define COMM_DO_RELEASE			0x6092</div><div class='del'>-#define COMM_SET_PATH			0x00A2</div><div class='del'>-#define COMM_WRITE_SRAM_PAGE		0x00B2</div><div class='del'>-#define COMM_WRITE_EPROM		0x00C4</div><div class='del'>-#define COMM_READ_CRC_PROT_PAGE		0x00D4</div><div class='del'>-#define COMM_READ_REDIRECT_PAGE_CRC	0x21E4</div><div class='del'>-#define COMM_SEARCH_ACCESS		0x00F4</div><div class='del'>-</div><div class='del'>-/* Communication command bits */</div><div class='del'>-#define COMM_TYPE			0x0008</div><div class='del'>-#define COMM_SE				0x0008</div><div class='del'>-#define COMM_D				0x0008</div><div class='del'>-#define COMM_Z				0x0008</div><div class='del'>-#define COMM_CH				0x0008</div><div class='del'>-#define COMM_SM				0x0008</div><div class='del'>-#define COMM_R				0x0008</div><div class='del'>-#define COMM_IM				0x0001</div><div class='del'>-</div><div class='del'>-#define COMM_PS				0x4000</div><div class='del'>-#define COMM_PST			0x4000</div><div class='del'>-#define COMM_CIB			0x4000</div><div class='del'>-#define COMM_RTS			0x4000</div><div class='del'>-#define COMM_DT				0x2000</div><div class='del'>-#define COMM_SPU			0x1000</div><div class='del'>-#define COMM_F				0x0800</div><div class='del'>-#define COMM_NTP			0x0400</div><div class='del'>-#define COMM_ICP			0x0200</div><div class='del'>-#define COMM_RST			0x0100</div><div class='del'>-</div><div class='del'>-#define PULSE_PROG			0x01</div><div class='del'>-#define PULSE_SPUE			0x02</div><div class='del'>-</div><div class='del'>-#define BRANCH_MAIN			0xCC</div><div class='del'>-#define BRANCH_AUX			0x33</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Duration of the strong pull-up pulse in milliseconds.</div><div class='del'>- */</div><div class='del'>-#define PULLUP_PULSE_DURATION		750</div><div class='del'>-</div><div class='del'>-/* Status flags */</div><div class='del'>-#define ST_SPUA				0x01  /* Strong Pull-up is active */</div><div class='del'>-#define ST_PRGA				0x02  /* 12V programming pulse is being generated */</div><div class='del'>-#define ST_12VP				0x04  /* external 12V programming voltage is present */</div><div class='del'>-#define ST_PMOD				0x08  /* DS2490 powered from USB and external sources */</div><div class='del'>-#define ST_HALT				0x10  /* DS2490 is currently halted */</div><div class='del'>-#define ST_IDLE				0x20  /* DS2490 is currently idle */</div><div class='del'>-#define ST_EPOF				0x80</div><div class='del'>-</div><div class='del'>-#define SPEED_NORMAL			0x00</div><div class='del'>-#define SPEED_FLEXIBLE			0x01</div><div class='del'>-#define SPEED_OVERDRIVE			0x02</div><div class='del'>-</div><div class='del'>-#define NUM_EP				4</div><div class='del'>-#define EP_CONTROL			0</div><div class='del'>-#define EP_STATUS			1</div><div class='del'>-#define EP_DATA_OUT			2</div><div class='del'>-#define EP_DATA_IN			3</div><div class='del'>-</div><div class='del'>-struct ds_device</div><div class='del'>-{</div><div class='del'>-	struct usb_device	*udev;</div><div class='del'>-	struct usb_interface	*intf;</div><div class='del'>-</div><div class='del'>-	int			ep[NUM_EP];</div><div class='del'>-</div><div class='del'>-	atomic_t		refcnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ds_status</div><div class='del'>-{</div><div class='del'>-	u8			enable;</div><div class='del'>-	u8			speed;</div><div class='del'>-	u8			pullup_dur;</div><div class='del'>-	u8			ppuls_dur;</div><div class='del'>-	u8			pulldown_slew;</div><div class='del'>-	u8			write1_time;</div><div class='del'>-	u8			write0_time;</div><div class='del'>-	u8			reserved0;</div><div class='del'>-	u8			status;</div><div class='del'>-	u8			command0;</div><div class='del'>-	u8			command1;</div><div class='del'>-	u8			command_buffer_status;</div><div class='del'>-	u8			data_out_buffer_status;</div><div class='del'>-	u8			data_in_buffer_status;</div><div class='del'>-	u8			reserved1;</div><div class='del'>-	u8			reserved2;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int ds_touch_bit(struct ds_device *, u8, u8 *);</div><div class='del'>-int ds_read_byte(struct ds_device *, u8 *);</div><div class='del'>-int ds_read_bit(struct ds_device *, u8 *);</div><div class='del'>-int ds_write_byte(struct ds_device *, u8);</div><div class='del'>-int ds_write_bit(struct ds_device *, u8);</div><div class='del'>-int ds_reset(struct ds_device *, struct ds_status *);</div><div class='del'>-struct ds_device * ds_get_device(void);</div><div class='del'>-void ds_put_device(struct ds_device *);</div><div class='del'>-int ds_write_block(struct ds_device *, u8 *, int);</div><div class='del'>-int ds_read_block(struct ds_device *, u8 *, int);</div><div class='del'>-</div><div class='del'>-#endif /* __DSCORE_H */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig<br/>index f9d4c91fc533..d18d6424cd21 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/slaves/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/slaves/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/slaves/Kconfig</a></div><div class='hunk'>@@ -28,7 +28,7 @@ config W1_SLAVE_DS2433</div><div class='ctx'> </div><div class='ctx'> config W1_SLAVE_DS2433_CRC</div><div class='ctx'> 	bool "Protect DS2433 data with a CRC16"</div><div class='del'>-	depends on W1_DS2433</div><div class='add'>+	depends on W1_SLAVE_DS2433</div><div class='ctx'> 	select CRC16</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to protect DS2433 data with a CRC16.</div><div class='head'>diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c<br/>index fb118be789ea..2ac238f1480e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/slaves/w1_ds2433.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/w1_ds2433.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/slaves/w1_ds2433.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/slaves/w1_ds2433.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include "../w1.h"</div><div class='del'>-#include "../w1_io.h"</div><div class='ctx'> #include "../w1_int.h"</div><div class='ctx'> #include "../w1_family.h"</div><div class='ctx'> </div><div class='hunk'>@@ -106,11 +105,7 @@ static ssize_t w1_f23_read_bin(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	if ((count = w1_f23_fix_count(off, count, W1_EEPROM_SIZE)) == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;sl-&gt;refcnt);</div><div class='del'>-	if (down_interruptible(&amp;sl-&gt;master-&gt;mutex)) {</div><div class='del'>-		count = 0;</div><div class='del'>-		goto out_dec;</div><div class='del'>-	}</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_W1_F23_CRC</div><div class='ctx'> </div><div class='hunk'>@@ -141,9 +136,7 @@ static ssize_t w1_f23_read_bin(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> #endif	/* CONFIG_W1_F23_CRC */</div><div class='ctx'> </div><div class='ctx'> out_up:</div><div class='del'>-	up(&amp;sl-&gt;master-&gt;mutex);</div><div class='del'>-out_dec:</div><div class='del'>-	atomic_dec(&amp;sl-&gt;refcnt);</div><div class='add'>+	mutex_unlock(&amp;sl-&gt;master-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -232,11 +225,7 @@ static ssize_t w1_f23_write_bin(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	}</div><div class='ctx'> #endif	/* CONFIG_W1_F23_CRC */</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;sl-&gt;refcnt);</div><div class='del'>-	if (down_interruptible(&amp;sl-&gt;master-&gt;mutex)) {</div><div class='del'>-		count = 0;</div><div class='del'>-		goto out_dec;</div><div class='del'>-	}</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Can only write data to one page at a time */</div><div class='ctx'> 	idx = 0;</div><div class='hunk'>@@ -254,9 +243,7 @@ static ssize_t w1_f23_write_bin(struct kobject *kobj, char *buf, loff_t off,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_up:</div><div class='del'>-	up(&amp;sl-&gt;master-&gt;mutex);</div><div class='del'>-out_dec:</div><div class='del'>-	atomic_dec(&amp;sl-&gt;refcnt);</div><div class='add'>+	mutex_unlock(&amp;sl-&gt;master-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/w1/slaves/w1_smem.c b/drivers/w1/slaves/w1_smem.c<br/>index c6d3be54f94c..cc8c02e92593 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/slaves/w1_smem.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/w1_smem.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/slaves/w1_smem.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/slaves/w1_smem.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../w1.h"</div><div class='del'>-#include "../w1_io.h"</div><div class='ctx'> #include "../w1_int.h"</div><div class='ctx'> #include "../w1_family.h"</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c<br/>index 536d16d78de7..5372cfcbd054 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/slaves/w1_therm.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/slaves/w1_therm.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/slaves/w1_therm.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/slaves/w1_therm.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "../w1.h"</div><div class='del'>-#include "../w1_io.h"</div><div class='ctx'> #include "../w1_int.h"</div><div class='ctx'> #include "../w1_family.h"</div><div class='ctx'> </div><div class='hunk'>@@ -166,12 +165,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si</div><div class='ctx'> 	u8 rom[9], crc, verdict;</div><div class='ctx'> 	int i, max_trying = 10;</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;sl-&gt;refcnt);</div><div class='del'>-	smp_mb__after_atomic_inc();</div><div class='del'>-	if (down_interruptible(&amp;sl-&gt;master-&gt;mutex)) {</div><div class='del'>-		count = 0;</div><div class='del'>-		goto out_dec;</div><div class='del'>-	}</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (off &gt; W1_SLAVE_DATA_SIZE) {</div><div class='ctx'> 		count = 0;</div><div class='hunk'>@@ -234,10 +228,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si</div><div class='ctx'> </div><div class='ctx'> 	count += sprintf(buf + count, "t=%d\n", w1_convert_temp(rom, sl-&gt;family-&gt;fid));</div><div class='ctx'> out:</div><div class='del'>-	up(&amp;dev-&gt;mutex);</div><div class='del'>-out_dec:</div><div class='del'>-	smp_mb__before_atomic_inc();</div><div class='del'>-	atomic_dec(&amp;sl-&gt;refcnt);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c<br/>index a698b517e863..de3e9791f80d 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'> #include &lt;asm/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "w1.h"</div><div class='del'>-#include "w1_io.h"</div><div class='ctx'> #include "w1_log.h"</div><div class='ctx'> #include "w1_int.h"</div><div class='ctx'> #include "w1_family.h"</div><div class='hunk'>@@ -55,7 +54,7 @@ module_param_named(control_timeout, w1_control_timeout, int, 0);</div><div class='ctx'> module_param_named(max_slave_count, w1_max_slave_count, int, 0);</div><div class='ctx'> module_param_named(slave_ttl, w1_max_slave_ttl, int, 0);</div><div class='ctx'> </div><div class='del'>-DEFINE_SPINLOCK(w1_mlock);</div><div class='add'>+DEFINE_MUTEX(w1_mlock);</div><div class='ctx'> LIST_HEAD(w1_masters);</div><div class='ctx'> </div><div class='ctx'> static struct task_struct *w1_control_thread;</div><div class='hunk'>@@ -75,8 +74,6 @@ static void w1_master_release(struct device *dev)</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(dev, "%s: Releasing %s.\n", __func__, md-&gt;name);</div><div class='del'>-</div><div class='del'>-	dev_fini_netlink(md);</div><div class='ctx'> 	memset(md, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master));</div><div class='ctx'> 	kfree(md);</div><div class='ctx'> }</div><div class='hunk'>@@ -85,10 +82,10 @@ static void w1_slave_release(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_slave *sl = dev_to_w1_slave(dev);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "%s: Releasing %s.\n", __func__, sl-&gt;name);</div><div class='add'>+	printk("%s: Releasing %s.\n", __func__, sl-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	while (atomic_read(&amp;sl-&gt;refcnt)) {</div><div class='del'>-		dev_dbg(dev, "Waiting for %s to become free: refcnt=%d.\n",</div><div class='add'>+		printk("Waiting for %s to become free: refcnt=%d.\n",</div><div class='ctx'> 				sl-&gt;name, atomic_read(&amp;sl-&gt;refcnt));</div><div class='ctx'> 		if (msleep_interruptible(1000))</div><div class='ctx'> 			flush_signals(current);</div><div class='hunk'>@@ -111,7 +108,6 @@ static ssize_t w1_slave_read_id(struct kobject *kobj, char *buf, loff_t off, siz</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='ctx'> </div><div class='del'>-	atomic_inc(&amp;sl-&gt;refcnt);</div><div class='ctx'> 	if (off &gt; 8) {</div><div class='ctx'> 		count = 0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -120,7 +116,6 @@ static ssize_t w1_slave_read_id(struct kobject *kobj, char *buf, loff_t off, siz</div><div class='ctx'> </div><div class='ctx'> 		memcpy(buf, (u8 *)&amp;sl-&gt;reg_num, count);</div><div class='ctx'> 	}</div><div class='del'>-	atomic_dec(&amp;sl-&gt;refcnt);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -139,7 +134,63 @@ static struct bin_attribute w1_slave_attr_bin_id = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Default family */</div><div class='del'>-static struct w1_family w1_default_family;</div><div class='add'>+</div><div class='add'>+static ssize_t w1_default_write(struct kobject *kobj, char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+	if (w1_reset_select_slave(sl)) {</div><div class='add'>+		count = 0;</div><div class='add'>+		goto out_up;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	w1_write_block(sl-&gt;master, buf, count);</div><div class='add'>+</div><div class='add'>+out_up:</div><div class='add'>+	mutex_unlock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t w1_default_read(struct kobject *kobj, char *buf, loff_t off, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct w1_slave *sl = kobj_to_w1_slave(kobj);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+	w1_read_block(sl-&gt;master, buf, count);</div><div class='add'>+	mutex_unlock(&amp;sl-&gt;master-&gt;mutex);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bin_attribute w1_default_attr = {</div><div class='add'>+      .attr = {</div><div class='add'>+              .name = "rw",</div><div class='add'>+              .mode = S_IRUGO | S_IWUSR,</div><div class='add'>+              .owner = THIS_MODULE,</div><div class='add'>+      },</div><div class='add'>+      .size = PAGE_SIZE,</div><div class='add'>+      .read = w1_default_read,</div><div class='add'>+      .write = w1_default_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int w1_default_add_slave(struct w1_slave *sl)</div><div class='add'>+{</div><div class='add'>+	return sysfs_create_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_default_attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void w1_default_remove_slave(struct w1_slave *sl)</div><div class='add'>+{</div><div class='add'>+	sysfs_remove_bin_file(&amp;sl-&gt;dev.kobj, &amp;w1_default_attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct w1_family_ops w1_default_fops = {</div><div class='add'>+	.add_slave	= w1_default_add_slave,</div><div class='add'>+	.remove_slave	= w1_default_remove_slave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct w1_family w1_default_family = {</div><div class='add'>+	.fops = &amp;w1_default_fops,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size);</div><div class='ctx'> </div><div class='hunk'>@@ -183,12 +234,9 @@ static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_a</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible (&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	count = sprintf(buf, "%s\n", md-&gt;name);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -199,12 +247,9 @@ static ssize_t w1_master_attribute_store_search(struct device * dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible (&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	md-&gt;search_count = simple_strtol(buf, NULL, 0);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -216,12 +261,9 @@ static ssize_t w1_master_attribute_show_search(struct device *dev,</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible (&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	count = sprintf(buf, "%d\n", md-&gt;search_count);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -231,12 +273,9 @@ static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct devic</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible(&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	count = sprintf(buf, "0x%p\n", md-&gt;bus_master);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,12 +291,9 @@ static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, stru</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible(&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	count = sprintf(buf, "%d\n", md-&gt;max_slave_count);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -266,12 +302,9 @@ static ssize_t w1_master_attribute_show_attempts(struct device *dev, struct devi</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible(&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	count = sprintf(buf, "%lu\n", md-&gt;attempts);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -280,12 +313,9 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct d</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	ssize_t count;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible(&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> 	count = sprintf(buf, "%d\n", md-&gt;slave_count);</div><div class='del'>-</div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -294,8 +324,7 @@ static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device</div><div class='ctx'> 	struct w1_master *md = dev_to_w1_master(dev);</div><div class='ctx'> 	int c = PAGE_SIZE;</div><div class='ctx'> </div><div class='del'>-	if (down_interruptible(&amp;md-&gt;mutex))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	mutex_lock(&amp;md-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (md-&gt;slave_count == 0)</div><div class='ctx'> 		c -= snprintf(buf + PAGE_SIZE - c, c, "not found.\n");</div><div class='hunk'>@@ -310,7 +339,7 @@ static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;md-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;md-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return PAGE_SIZE - c;</div><div class='ctx'> }</div><div class='hunk'>@@ -362,7 +391,8 @@ static void w1_destroy_master_attributes(struct w1_master *master)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_HOTPLUG</div><div class='del'>-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)</div><div class='add'>+static int w1_uevent(struct device *dev, char **envp, int num_envp,</div><div class='add'>+			char *buffer, int buffer_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *md = NULL;</div><div class='ctx'> 	struct w1_slave *sl = NULL;</div><div class='hunk'>@@ -382,7 +412,8 @@ static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n", event_owner, name, dev-&gt;bus_id);</div><div class='add'>+	dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n",</div><div class='add'>+			event_owner, name, dev-&gt;bus_id);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;driver != &amp;w1_slave_driver || !sl)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -401,7 +432,8 @@ static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='del'>-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)</div><div class='add'>+static int w1_uevent(struct device *dev, char **envp, int num_envp,</div><div class='add'>+			char *buffer, int buffer_size)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -425,7 +457,8 @@ static int __w1_attach_slave_device(struct w1_slave *sl)</div><div class='ctx'> 		 (unsigned int) sl-&gt;reg_num.family,</div><div class='ctx'> 		 (unsigned long long) sl-&gt;reg_num.id);</div><div class='ctx'> </div><div class='del'>-	dev_dbg(&amp;sl-&gt;dev, "%s: registering %s as %p.\n", __func__, &amp;sl-&gt;dev.bus_id[0]);</div><div class='add'>+	dev_dbg(&amp;sl-&gt;dev, "%s: registering %s as %p.\n", __func__,</div><div class='add'>+		&amp;sl-&gt;dev.bus_id[0]);</div><div class='ctx'> </div><div class='ctx'> 	err = device_register(&amp;sl-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -496,6 +529,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)</div><div class='ctx'> 	sl-&gt;master = dev;</div><div class='ctx'> 	set_bit(W1_SLAVE_ACTIVE, (long *)&amp;sl-&gt;flags);</div><div class='ctx'> </div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='ctx'> 	memcpy(&amp;sl-&gt;reg_num, rn, sizeof(sl-&gt;reg_num));</div><div class='ctx'> 	atomic_set(&amp;sl-&gt;refcnt, 0);</div><div class='ctx'> 	init_completion(&amp;sl-&gt;released);</div><div class='hunk'>@@ -526,7 +560,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)</div><div class='ctx'> 	sl-&gt;ttl = dev-&gt;slave_ttl;</div><div class='ctx'> 	dev-&gt;slave_count++;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;msg.id.id, rn, sizeof(msg.id.id));</div><div class='add'>+	memcpy(msg.id.id, rn, sizeof(msg.id));</div><div class='ctx'> 	msg.type = W1_SLAVE_ADD;</div><div class='ctx'> 	w1_netlink_send(dev, &amp;msg);</div><div class='ctx'> </div><div class='hunk'>@@ -544,7 +578,8 @@ static void w1_slave_detach(struct w1_slave *sl)</div><div class='ctx'> 	if (sl-&gt;family-&gt;fops &amp;&amp; sl-&gt;family-&gt;fops-&gt;remove_slave)</div><div class='ctx'> 		sl-&gt;family-&gt;fops-&gt;remove_slave(sl);</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;msg.id.id, &amp;sl-&gt;reg_num, sizeof(msg.id.id));</div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='add'>+	memcpy(msg.id.id, &amp;sl-&gt;reg_num, sizeof(msg.id));</div><div class='ctx'> 	msg.type = W1_SLAVE_REMOVE;</div><div class='ctx'> 	w1_netlink_send(sl-&gt;master, &amp;msg);</div><div class='ctx'> </div><div class='hunk'>@@ -561,7 +596,7 @@ static struct w1_master *w1_search_master(void *data)</div><div class='ctx'> 	struct w1_master *dev;</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;w1_mlock);</div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry) {</div><div class='ctx'> 		if (dev-&gt;bus_master-&gt;data == data) {</div><div class='ctx'> 			found = 1;</div><div class='hunk'>@@ -569,22 +604,69 @@ static struct w1_master *w1_search_master(void *data)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;w1_mlock);</div><div class='add'>+	mutex_unlock(&amp;w1_mlock);</div><div class='add'>+</div><div class='add'>+	return (found)?dev:NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct w1_master *w1_search_master_id(u32 id)</div><div class='add'>+{</div><div class='add'>+	struct w1_master *dev;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='add'>+	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry) {</div><div class='add'>+		if (dev-&gt;id == id) {</div><div class='add'>+			found = 1;</div><div class='add'>+			atomic_inc(&amp;dev-&gt;refcnt);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> </div><div class='ctx'> 	return (found)?dev:NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct w1_slave *w1_search_slave(struct w1_reg_num *id)</div><div class='add'>+{</div><div class='add'>+	struct w1_master *dev;</div><div class='add'>+	struct w1_slave *sl = NULL;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='add'>+	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry) {</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+		list_for_each_entry(sl, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='add'>+			if (sl-&gt;reg_num.family == id-&gt;family &amp;&amp;</div><div class='add'>+					sl-&gt;reg_num.id == id-&gt;id &amp;&amp;</div><div class='add'>+					sl-&gt;reg_num.crc == id-&gt;crc) {</div><div class='add'>+				found = 1;</div><div class='add'>+				atomic_inc(&amp;dev-&gt;refcnt);</div><div class='add'>+				atomic_inc(&amp;sl-&gt;refcnt);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+		if (found)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;w1_mlock);</div><div class='add'>+</div><div class='add'>+	return (found)?sl:NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void w1_reconnect_slaves(struct w1_family *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *dev;</div><div class='ctx'> </div><div class='del'>-	spin_lock_bh(&amp;w1_mlock);</div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='ctx'> 	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry) {</div><div class='ctx'> 		dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in %s into new family %02x.\n",</div><div class='ctx'> 				dev-&gt;name, f-&gt;fid);</div><div class='ctx'> 		set_bit(W1_MASTER_NEED_RECONNECT, &amp;dev-&gt;flags);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;w1_mlock);</div><div class='add'>+	mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void w1_slave_found(void *data, u64 rn)</div><div class='hunk'>@@ -646,7 +728,7 @@ static void w1_slave_found(void *data, u64 rn)</div><div class='ctx'>  * @dev        The master device to search</div><div class='ctx'>  * @cb         Function to call when a device is found</div><div class='ctx'>  */</div><div class='del'>-void w1_search(struct w1_master *dev, w1_slave_found_callback cb)</div><div class='add'>+void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb)</div><div class='ctx'> {</div><div class='ctx'> 	u64 last_rn, rn, tmp64;</div><div class='ctx'> 	int i, slave_count = 0;</div><div class='hunk'>@@ -677,7 +759,7 @@ void w1_search(struct w1_master *dev, w1_slave_found_callback cb)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Start the search */</div><div class='del'>-		w1_write_8(dev, W1_SEARCH);</div><div class='add'>+		w1_write_8(dev, search_type);</div><div class='ctx'> 		for (i = 0; i &lt; 64; ++i) {</div><div class='ctx'> 			/* Determine the direction/search bit */</div><div class='ctx'> 			if (i == desc_bit)</div><div class='hunk'>@@ -739,23 +821,23 @@ static int w1_control(void *data)</div><div class='ctx'> 			if (kthread_should_stop() || test_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags)) {</div><div class='ctx'> 				set_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags);</div><div class='ctx'> </div><div class='del'>-				spin_lock(&amp;w1_mlock);</div><div class='add'>+				mutex_lock(&amp;w1_mlock);</div><div class='ctx'> 				list_del(&amp;dev-&gt;w1_master_entry);</div><div class='del'>-				spin_unlock(&amp;w1_mlock);</div><div class='add'>+				mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> </div><div class='del'>-				down(&amp;dev-&gt;mutex);</div><div class='add'>+				mutex_lock(&amp;dev-&gt;mutex);</div><div class='ctx'> 				list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='ctx'> 					w1_slave_detach(sl);</div><div class='ctx'> 				}</div><div class='ctx'> 				w1_destroy_master_attributes(dev);</div><div class='del'>-				up(&amp;dev-&gt;mutex);</div><div class='add'>+				mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 				atomic_dec(&amp;dev-&gt;refcnt);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (test_bit(W1_MASTER_NEED_RECONNECT, &amp;dev-&gt;flags)) {</div><div class='ctx'> 				dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in device %s.\n", dev-&gt;name);</div><div class='del'>-				down(&amp;dev-&gt;mutex);</div><div class='add'>+				mutex_lock(&amp;dev-&gt;mutex);</div><div class='ctx'> 				list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='ctx'> 					if (sl-&gt;family-&gt;fid == W1_FAMILY_DEFAULT) {</div><div class='ctx'> 						struct w1_reg_num rn;</div><div class='hunk'>@@ -768,7 +850,7 @@ static int w1_control(void *data)</div><div class='ctx'> 				}</div><div class='ctx'> 				dev_dbg(&amp;dev-&gt;dev, "Reconnecting slaves in device %s has been finished.\n", dev-&gt;name);</div><div class='ctx'> 				clear_bit(W1_MASTER_NEED_RECONNECT, &amp;dev-&gt;flags);</div><div class='del'>-				up(&amp;dev-&gt;mutex);</div><div class='add'>+				mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -776,10 +858,31 @@ static int w1_control(void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void w1_search_process(struct w1_master *dev, u8 search_type)</div><div class='add'>+{</div><div class='add'>+	struct w1_slave *sl, *sln;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sl, &amp;dev-&gt;slist, w1_slave_entry)</div><div class='add'>+		clear_bit(W1_SLAVE_ACTIVE, (long *)&amp;sl-&gt;flags);</div><div class='add'>+</div><div class='add'>+	w1_search_devices(dev, search_type, w1_slave_found);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='add'>+		if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&amp;sl-&gt;flags) &amp;&amp; !--sl-&gt;ttl) {</div><div class='add'>+			w1_slave_detach(sl);</div><div class='add'>+</div><div class='add'>+			dev-&gt;slave_count--;</div><div class='add'>+		} else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&amp;sl-&gt;flags))</div><div class='add'>+			sl-&gt;ttl = dev-&gt;slave_ttl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;search_count &gt; 0)</div><div class='add'>+		dev-&gt;search_count--;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int w1_process(void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_master *dev = (struct w1_master *) data;</div><div class='del'>-	struct w1_slave *sl, *sln;</div><div class='ctx'> </div><div class='ctx'> 	while (!kthread_should_stop() &amp;&amp; !test_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags)) {</div><div class='ctx'> 		try_to_freeze();</div><div class='hunk'>@@ -794,27 +897,9 @@ int w1_process(void *data)</div><div class='ctx'> 		if (dev-&gt;search_count == 0)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (down_interruptible(&amp;dev-&gt;mutex))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		list_for_each_entry(sl, &amp;dev-&gt;slist, w1_slave_entry)</div><div class='del'>-			clear_bit(W1_SLAVE_ACTIVE, (long *)&amp;sl-&gt;flags);</div><div class='del'>-</div><div class='del'>-		w1_search_devices(dev, w1_slave_found);</div><div class='del'>-</div><div class='del'>-		list_for_each_entry_safe(sl, sln, &amp;dev-&gt;slist, w1_slave_entry) {</div><div class='del'>-			if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&amp;sl-&gt;flags) &amp;&amp; !--sl-&gt;ttl) {</div><div class='del'>-				w1_slave_detach(sl);</div><div class='del'>-</div><div class='del'>-				dev-&gt;slave_count--;</div><div class='del'>-			} else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&amp;sl-&gt;flags))</div><div class='del'>-				sl-&gt;ttl = dev-&gt;slave_ttl;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev-&gt;search_count &gt; 0)</div><div class='del'>-			dev-&gt;search_count--;</div><div class='del'>-</div><div class='del'>-		up(&amp;dev-&gt;mutex);</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+		w1_search_process(dev, W1_SEARCH);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	atomic_dec(&amp;dev-&gt;refcnt);</div><div class='hunk'>@@ -828,6 +913,8 @@ static int w1_init(void)</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "Driver for 1-wire Dallas network protocol.\n");</div><div class='ctx'> </div><div class='add'>+	w1_init_netlink();</div><div class='add'>+</div><div class='ctx'> 	retval = bus_register(&amp;w1_bus_type);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to register bus. err=%d.\n", retval);</div><div class='hunk'>@@ -880,6 +967,8 @@ static void w1_fini(void)</div><div class='ctx'> 	list_for_each_entry(dev, &amp;w1_masters, w1_master_entry)</div><div class='ctx'> 		__w1_remove_master_device(dev);</div><div class='ctx'> </div><div class='add'>+	w1_fini_netlink();</div><div class='add'>+</div><div class='ctx'> 	kthread_stop(w1_control_thread);</div><div class='ctx'> </div><div class='ctx'> 	driver_unregister(&amp;w1_slave_driver);</div><div class='head'>diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h<br/>index 56980505e6c4..f1df5343f4ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1.h</a></div><div class='hunk'>@@ -41,10 +41,7 @@ struct w1_reg_num</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;net/sock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "w1_family.h"</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +49,7 @@ struct w1_reg_num</div><div class='ctx'> #define W1_SLAVE_DATA_SIZE	128</div><div class='ctx'> </div><div class='ctx'> #define W1_SEARCH		0xF0</div><div class='del'>-#define W1_CONDITIONAL_SEARCH	0xEC</div><div class='add'>+#define W1_ALARM_SEARCH		0xEC</div><div class='ctx'> #define W1_CONVERT_TEMP		0x44</div><div class='ctx'> #define W1_SKIP_ROM		0xCC</div><div class='ctx'> #define W1_READ_SCRATCHPAD	0xBE</div><div class='hunk'>@@ -60,7 +57,7 @@ struct w1_reg_num</div><div class='ctx'> #define W1_READ_PSUPPLY		0xB4</div><div class='ctx'> #define W1_MATCH_ROM		0x55</div><div class='ctx'> </div><div class='del'>-#define W1_SLAVE_ACTIVE		(1&lt;&lt;0)</div><div class='add'>+#define W1_SLAVE_ACTIVE		0</div><div class='ctx'> </div><div class='ctx'> struct w1_slave</div><div class='ctx'> {</div><div class='hunk'>@@ -145,8 +142,8 @@ struct w1_bus_master</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8		(*reset_bus)(void *);</div><div class='ctx'> </div><div class='del'>-	/** Really nice hardware can handles the ROM searches */</div><div class='del'>-	void		(*search)(void *, w1_slave_found_callback);</div><div class='add'>+	/** Really nice hardware can handles the different types of ROM search */</div><div class='add'>+	void		(*search)(void *, u8, w1_slave_found_callback);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define W1_MASTER_NEED_EXIT		0</div><div class='hunk'>@@ -173,19 +170,30 @@ struct w1_master</div><div class='ctx'> 	long			flags;</div><div class='ctx'> </div><div class='ctx'> 	struct task_struct	*thread;</div><div class='del'>-	struct semaphore	mutex;</div><div class='add'>+	struct mutex		mutex;</div><div class='ctx'> </div><div class='ctx'> 	struct device_driver	*driver;</div><div class='ctx'> 	struct device		dev;</div><div class='ctx'> </div><div class='ctx'> 	struct w1_bus_master	*bus_master;</div><div class='ctx'> </div><div class='del'>-	u32			seq, groups;</div><div class='del'>-	struct sock		*nls;</div><div class='add'>+	u32			seq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int w1_create_master_attributes(struct w1_master *);</div><div class='del'>-void w1_search(struct w1_master *dev, w1_slave_found_callback cb);</div><div class='add'>+void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);</div><div class='add'>+void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb);</div><div class='add'>+struct w1_slave *w1_search_slave(struct w1_reg_num *id);</div><div class='add'>+void w1_search_process(struct w1_master *dev, u8 search_type);</div><div class='add'>+struct w1_master *w1_search_master_id(u32 id);</div><div class='add'>+</div><div class='add'>+u8 w1_triplet(struct w1_master *dev, int bdir);</div><div class='add'>+void w1_write_8(struct w1_master *, u8);</div><div class='add'>+int w1_reset_bus(struct w1_master *);</div><div class='add'>+u8 w1_calc_crc8(u8 *, int);</div><div class='add'>+void w1_write_block(struct w1_master *, const u8 *, int);</div><div class='add'>+u8 w1_read_block(struct w1_master *, u8 *, int);</div><div class='add'>+int w1_reset_select_slave(struct w1_slave *sl);</div><div class='ctx'> </div><div class='ctx'> static inline struct w1_slave* dev_to_w1_slave(struct device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -202,15 +210,14 @@ static inline struct w1_master* dev_to_w1_master(struct device *dev)</div><div class='ctx'> 	return container_of(dev, struct w1_master, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern struct device_driver w1_master_driver;</div><div class='add'>+extern struct device w1_master_device;</div><div class='ctx'> extern int w1_max_slave_count;</div><div class='ctx'> extern int w1_max_slave_ttl;</div><div class='del'>-extern spinlock_t w1_mlock;</div><div class='ctx'> extern struct list_head w1_masters;</div><div class='del'>-extern struct device_driver w1_master_driver;</div><div class='del'>-extern struct device w1_master_device;</div><div class='add'>+extern struct mutex w1_mlock;</div><div class='ctx'> </div><div class='del'>-int w1_process(void *data);</div><div class='del'>-void w1_reconnect_slaves(struct w1_family *f);</div><div class='add'>+extern int w1_process(void *);</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c<br/>index 0e32c114f906..a3c95bd6890a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_family.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_family.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1_family.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1_family.c</a></div><div class='hunk'>@@ -107,6 +107,12 @@ struct w1_family * w1_family_registered(u8 fid)</div><div class='ctx'> 	return (ret) ? f : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void __w1_family_put(struct w1_family *f)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;f-&gt;refcnt))</div><div class='add'>+		f-&gt;need_exit = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void w1_family_put(struct w1_family *f)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;w1_flock);</div><div class='hunk'>@@ -114,19 +120,14 @@ void w1_family_put(struct w1_family *f)</div><div class='ctx'> 	spin_unlock(&amp;w1_flock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __w1_family_put(struct w1_family *f)</div><div class='del'>-{</div><div class='del'>-	if (atomic_dec_and_test(&amp;f-&gt;refcnt))</div><div class='del'>-		f-&gt;need_exit = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+#if 0</div><div class='ctx'> void w1_family_get(struct w1_family *f)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;w1_flock);</div><div class='ctx'> 	__w1_family_get(f);</div><div class='ctx'> 	spin_unlock(&amp;w1_flock);</div><div class='del'>-</div><div class='ctx'> }</div><div class='add'>+#endif  /*  0  */</div><div class='ctx'> </div><div class='ctx'> void __w1_family_get(struct w1_family *f)</div><div class='ctx'> {</div><div class='hunk'>@@ -135,8 +136,5 @@ void __w1_family_get(struct w1_family *f)</div><div class='ctx'> 	smp_mb__after_atomic_inc();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(w1_family_get);</div><div class='del'>-EXPORT_SYMBOL(w1_family_put);</div><div class='del'>-EXPORT_SYMBOL(w1_family_registered);</div><div class='ctx'> EXPORT_SYMBOL(w1_unregister_family);</div><div class='ctx'> EXPORT_SYMBOL(w1_register_family);</div><div class='head'>diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h<br/>index 2ca0489c716a..1e2ac40c2c14 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_family.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_family.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1_family.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1_family.h</a></div><div class='hunk'>@@ -57,12 +57,11 @@ struct w1_family</div><div class='ctx'> </div><div class='ctx'> extern spinlock_t w1_flock;</div><div class='ctx'> </div><div class='del'>-void w1_family_get(struct w1_family *);</div><div class='ctx'> void w1_family_put(struct w1_family *);</div><div class='ctx'> void __w1_family_get(struct w1_family *);</div><div class='del'>-void __w1_family_put(struct w1_family *);</div><div class='ctx'> struct w1_family * w1_family_registered(u8);</div><div class='ctx'> void w1_unregister_family(struct w1_family *);</div><div class='ctx'> int w1_register_family(struct w1_family *);</div><div class='add'>+void w1_reconnect_slaves(struct w1_family *f);</div><div class='ctx'> </div><div class='ctx'> #endif /* __W1_FAMILY_H */</div><div class='head'>diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c<br/>index 68565aacec7b..357a2e0f637a 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_int.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_int.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1_int.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1_int.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,</div><div class='ctx'> 	atomic_set(&amp;dev-&gt;refcnt, 2);</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;slist);</div><div class='del'>-	init_MUTEX(&amp;dev-&gt;mutex);</div><div class='add'>+	mutex_init(&amp;dev-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;dev-&gt;dev, device, sizeof(struct device));</div><div class='ctx'> 	snprintf(dev-&gt;dev.bus_id, sizeof(dev-&gt;dev.bus_id),</div><div class='hunk'>@@ -74,16 +74,11 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;driver = driver;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;groups = 1;</div><div class='ctx'> 	dev-&gt;seq = 1;</div><div class='del'>-	dev_init_netlink(dev);</div><div class='ctx'> </div><div class='ctx'> 	err = device_register(&amp;dev-&gt;dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "Failed to register master device. err=%d\n", err);</div><div class='del'>-</div><div class='del'>-		dev_fini_netlink(dev);</div><div class='del'>-</div><div class='ctx'> 		memset(dev, 0, sizeof(struct w1_master));</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 		dev = NULL;</div><div class='hunk'>@@ -131,12 +126,12 @@ int w1_add_master_device(struct w1_bus_master *master)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;initialized = 1;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;w1_mlock);</div><div class='add'>+	mutex_lock(&amp;w1_mlock);</div><div class='ctx'> 	list_add(&amp;dev-&gt;w1_master_entry, &amp;w1_masters);</div><div class='del'>-	spin_unlock(&amp;w1_mlock);</div><div class='add'>+	mutex_unlock(&amp;w1_mlock);</div><div class='ctx'> </div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='ctx'> 	msg.id.mst.id = dev-&gt;id;</div><div class='del'>-	msg.id.mst.pid = dev-&gt;thread-&gt;pid;</div><div class='ctx'> 	msg.type = W1_MASTER_ADD;</div><div class='ctx'> 	w1_netlink_send(dev, &amp;msg);</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +148,6 @@ err_out_free_dev:</div><div class='ctx'> void __w1_remove_master_device(struct w1_master *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct w1_netlink_msg msg;</div><div class='del'>-	pid_t pid = dev-&gt;thread-&gt;pid;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(W1_MASTER_NEED_EXIT, &amp;dev-&gt;flags);</div><div class='ctx'> 	kthread_stop(dev-&gt;thread);</div><div class='hunk'>@@ -166,8 +160,8 @@ void __w1_remove_master_device(struct w1_master *dev)</div><div class='ctx'> 			flush_signals(current);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	memset(&amp;msg, 0, sizeof(msg));</div><div class='ctx'> 	msg.id.mst.id = dev-&gt;id;</div><div class='del'>-	msg.id.mst.pid = pid;</div><div class='ctx'> 	msg.type = W1_MASTER_REMOVE;</div><div class='ctx'> 	w1_netlink_send(dev, &amp;msg);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c<br/>index f7f7e8bec30e..30b6fbf83bd4 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1_io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1_io.c</a></div><div class='hunk'>@@ -23,10 +23,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "w1.h"</div><div class='ctx'> #include "w1_log.h"</div><div class='del'>-#include "w1_io.h"</div><div class='ctx'> </div><div class='ctx'> static int w1_delay_parm = 1;</div><div class='ctx'> module_param_named(delay_coef, w1_delay_parm, int, 0);</div><div class='hunk'>@@ -50,7 +50,7 @@ static u8 w1_crc8_table[] = {</div><div class='ctx'> 	116, 42, 200, 150, 21, 75, 169, 247, 182, 232, 10, 84, 215, 137, 107, 53</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void w1_delay(unsigned long tm)</div><div class='add'>+static void w1_delay(unsigned long tm)</div><div class='ctx'> {</div><div class='ctx'> 	udelay(tm * w1_delay_parm);</div><div class='ctx'> }</div><div class='hunk'>@@ -61,7 +61,7 @@ static u8 w1_read_bit(struct w1_master *dev);</div><div class='ctx'> /**</div><div class='ctx'>  * Generates a write-0 or write-1 cycle and samples the level.</div><div class='ctx'>  */</div><div class='del'>-u8 w1_touch_bit(struct w1_master *dev, int bit)</div><div class='add'>+static u8 w1_touch_bit(struct w1_master *dev, int bit)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev-&gt;bus_master-&gt;touch_bit)</div><div class='ctx'> 		return dev-&gt;bus_master-&gt;touch_bit(dev-&gt;bus_master-&gt;data, bit);</div><div class='hunk'>@@ -108,6 +108,7 @@ void w1_write_8(struct w1_master *dev, u8 byte)</div><div class='ctx'> 		for (i = 0; i &lt; 8; ++i)</div><div class='ctx'> 			w1_touch_bit(dev, (byte &gt;&gt; i) &amp; 0x1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_write_8);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -176,7 +177,7 @@ u8 w1_triplet(struct w1_master *dev, int bdir)</div><div class='ctx'>  * @param dev     the master device</div><div class='ctx'>  * @return        the byte read</div><div class='ctx'>  */</div><div class='del'>-u8 w1_read_8(struct w1_master * dev)</div><div class='add'>+static u8 w1_read_8(struct w1_master * dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u8 res = 0;</div><div class='hunk'>@@ -208,6 +209,7 @@ void w1_write_block(struct w1_master *dev, const u8 *buf, int len)</div><div class='ctx'> 		for (i = 0; i &lt; len; ++i)</div><div class='ctx'> 			w1_write_8(dev, buf[i]);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_write_block);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Reads a series of bytes.</div><div class='hunk'>@@ -232,6 +234,7 @@ u8 w1_read_block(struct w1_master *dev, u8 *buf, int len)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_read_block);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Issues a reset bus sequence.</div><div class='hunk'>@@ -257,6 +260,7 @@ int w1_reset_bus(struct w1_master *dev)</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_reset_bus);</div><div class='ctx'> </div><div class='ctx'> u8 w1_calc_crc8(u8 * data, int len)</div><div class='ctx'> {</div><div class='hunk'>@@ -267,14 +271,15 @@ u8 w1_calc_crc8(u8 * data, int len)</div><div class='ctx'> </div><div class='ctx'> 	return crc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_calc_crc8);</div><div class='ctx'> </div><div class='del'>-void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb)</div><div class='add'>+void w1_search_devices(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;attempts++;</div><div class='ctx'> 	if (dev-&gt;bus_master-&gt;search)</div><div class='del'>-		dev-&gt;bus_master-&gt;search(dev-&gt;bus_master-&gt;data, cb);</div><div class='add'>+		dev-&gt;bus_master-&gt;search(dev-&gt;bus_master-&gt;data, search_type, cb);</div><div class='ctx'> 	else</div><div class='del'>-		w1_search(dev, cb);</div><div class='add'>+		w1_search(dev, search_type, cb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -299,14 +304,4 @@ int w1_reset_select_slave(struct w1_slave *sl)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(w1_touch_bit);</div><div class='del'>-EXPORT_SYMBOL(w1_write_8);</div><div class='del'>-EXPORT_SYMBOL(w1_read_8);</div><div class='del'>-EXPORT_SYMBOL(w1_reset_bus);</div><div class='del'>-EXPORT_SYMBOL(w1_calc_crc8);</div><div class='del'>-EXPORT_SYMBOL(w1_delay);</div><div class='del'>-EXPORT_SYMBOL(w1_read_block);</div><div class='del'>-EXPORT_SYMBOL(w1_write_block);</div><div class='del'>-EXPORT_SYMBOL(w1_search_devices);</div><div class='del'>-EXPORT_SYMBOL(w1_reset_select_slave);</div><div class='add'>+EXPORT_SYMBOL_GPL(w1_reset_select_slave);</div><div class='head'>diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c<br/>index 328645da7972..65c5ebd0787e 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_netlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_netlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1_netlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1_netlink.c</a></div><div class='hunk'>@@ -21,72 +21,225 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='add'>+#include &lt;linux/connector.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "w1.h"</div><div class='ctx'> #include "w1_log.h"</div><div class='ctx'> #include "w1_netlink.h"</div><div class='ctx'> </div><div class='del'>-#ifndef NETLINK_DISABLED</div><div class='add'>+#if defined(CONFIG_W1_CON) &amp;&amp; (defined(CONFIG_CONNECTOR) || (defined(CONFIG_CONNECTOR_MODULE) &amp;&amp; defined(CONFIG_W1_MODULE)))</div><div class='ctx'> void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)</div><div class='ctx'> {</div><div class='del'>-	unsigned int size;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct w1_netlink_msg *data;</div><div class='del'>-	struct nlmsghdr *nlh;</div><div class='add'>+	char buf[sizeof(struct cn_msg) + sizeof(struct w1_netlink_msg)];</div><div class='add'>+	struct cn_msg *m = (struct cn_msg *)buf;</div><div class='add'>+	struct w1_netlink_msg *w = (struct w1_netlink_msg *)(m+1);</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;nls)</div><div class='del'>-		return;</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='ctx'> </div><div class='del'>-	size = NLMSG_SPACE(sizeof(struct w1_netlink_msg));</div><div class='add'>+	m-&gt;id.idx = CN_W1_IDX;</div><div class='add'>+	m-&gt;id.val = CN_W1_VAL;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_skb(size, GFP_ATOMIC);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "skb_alloc() failed.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	m-&gt;seq = dev-&gt;seq++;</div><div class='add'>+	m-&gt;len = sizeof(struct w1_netlink_msg);</div><div class='add'>+</div><div class='add'>+	memcpy(w, msg, sizeof(struct w1_netlink_msg));</div><div class='add'>+</div><div class='add'>+	cn_netlink_send(m, 0, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int w1_process_command_master(struct w1_master *dev, struct cn_msg *msg,</div><div class='add'>+		struct w1_netlink_msg *hdr, struct w1_netlink_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(&amp;dev-&gt;dev, "%s: %s: cmd=%02x, len=%u.\n",</div><div class='add'>+		__func__, dev-&gt;name, cmd-&gt;cmd, cmd-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;cmd != W1_CMD_SEARCH &amp;&amp; cmd-&gt;cmd != W1_CMD_ALARM_SEARCH)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	w1_search_process(dev, (cmd-&gt;cmd == W1_CMD_ALARM_SEARCH)?W1_ALARM_SEARCH:W1_SEARCH);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int w1_send_read_reply(struct w1_slave *sl, struct cn_msg *msg,</div><div class='add'>+		struct w1_netlink_msg *hdr, struct w1_netlink_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	void *data;</div><div class='add'>+	struct w1_netlink_msg *h;</div><div class='add'>+	struct w1_netlink_cmd *c;</div><div class='add'>+	struct cn_msg *cm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(struct cn_msg) +</div><div class='add'>+			sizeof(struct w1_netlink_msg) +</div><div class='add'>+			sizeof(struct w1_netlink_cmd) +</div><div class='add'>+			cmd-&gt;len, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cm = (struct cn_msg *)(data);</div><div class='add'>+	h = (struct w1_netlink_msg *)(cm + 1);</div><div class='add'>+	c = (struct w1_netlink_cmd *)(h + 1);</div><div class='add'>+</div><div class='add'>+	memcpy(cm, msg, sizeof(struct cn_msg));</div><div class='add'>+	memcpy(h, hdr, sizeof(struct w1_netlink_msg));</div><div class='add'>+	memcpy(c, cmd, sizeof(struct w1_netlink_cmd));</div><div class='ctx'> </div><div class='del'>-	nlh = NLMSG_PUT(skb, 0, dev-&gt;seq++, NLMSG_DONE, size - sizeof(*nlh));</div><div class='add'>+	cm-&gt;ack = msg-&gt;seq+1;</div><div class='add'>+	cm-&gt;len = sizeof(struct w1_netlink_msg) + sizeof(struct w1_netlink_cmd) + cmd-&gt;len;</div><div class='ctx'> </div><div class='del'>-	data = (struct w1_netlink_msg *)NLMSG_DATA(nlh);</div><div class='add'>+	h-&gt;len = sizeof(struct w1_netlink_cmd) + cmd-&gt;len;</div><div class='ctx'> </div><div class='del'>-	memcpy(data, msg, sizeof(struct w1_netlink_msg));</div><div class='add'>+	memcpy(c-&gt;data, cmd-&gt;data, c-&gt;len);</div><div class='ctx'> </div><div class='del'>-	NETLINK_CB(skb).dst_group = dev-&gt;groups;</div><div class='del'>-	netlink_broadcast(dev-&gt;nls, skb, 0, dev-&gt;groups, GFP_ATOMIC);</div><div class='add'>+	err = cn_netlink_send(cm, 0, GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-nlmsg_failure:</div><div class='del'>-	return;</div><div class='add'>+	kfree(data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dev_init_netlink(struct w1_master *dev)</div><div class='add'>+static int w1_process_command_slave(struct w1_slave *sl, struct cn_msg *msg,</div><div class='add'>+		struct w1_netlink_msg *hdr, struct w1_netlink_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;nls = netlink_kernel_create(NETLINK_W1, 1, NULL, THIS_MODULE);</div><div class='del'>-	if (!dev-&gt;nls) {</div><div class='del'>-		printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n",</div><div class='del'>-			NETLINK_W1, dev-&gt;dev.bus_id);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;sl-&gt;master-&gt;dev, "%s: %02x.%012llx.%02x: cmd=%02x, len=%u.\n",</div><div class='add'>+		__func__, sl-&gt;reg_num.family, (unsigned long long)sl-&gt;reg_num.id, sl-&gt;reg_num.crc,</div><div class='add'>+		cmd-&gt;cmd, cmd-&gt;len);</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+		case W1_CMD_READ:</div><div class='add'>+			w1_read_block(sl-&gt;master, cmd-&gt;data, cmd-&gt;len);</div><div class='add'>+			w1_send_read_reply(sl, msg, hdr, cmd);</div><div class='add'>+			break;</div><div class='add'>+		case W1_CMD_WRITE:</div><div class='add'>+			w1_write_block(sl-&gt;master, cmd-&gt;data, cmd-&gt;len);</div><div class='add'>+			break;</div><div class='add'>+		case W1_CMD_SEARCH:</div><div class='add'>+		case W1_CMD_ALARM_SEARCH:</div><div class='add'>+			w1_search_process(sl-&gt;master,</div><div class='add'>+					(cmd-&gt;cmd == W1_CMD_ALARM_SEARCH)?W1_ALARM_SEARCH:W1_SEARCH);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -1;</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dev_fini_netlink(struct w1_master *dev)</div><div class='add'>+static void w1_cn_callback(void *data)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;nls &amp;&amp; dev-&gt;nls-&gt;sk_socket)</div><div class='del'>-		sock_release(dev-&gt;nls-&gt;sk_socket);</div><div class='add'>+	struct cn_msg *msg = data;</div><div class='add'>+	struct w1_netlink_msg *m = (struct w1_netlink_msg *)(msg + 1);</div><div class='add'>+	struct w1_netlink_cmd *cmd;</div><div class='add'>+	struct w1_slave *sl;</div><div class='add'>+	struct w1_master *dev;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	while (msg-&gt;len &amp;&amp; !err) {</div><div class='add'>+		struct w1_reg_num id;</div><div class='add'>+		u16 mlen = m-&gt;len;</div><div class='add'>+		u8 *cmd_data = m-&gt;data;</div><div class='add'>+</div><div class='add'>+		dev = NULL;</div><div class='add'>+		sl = NULL;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;id, m-&gt;id.id, sizeof(id));</div><div class='add'>+#if 0</div><div class='add'>+		printk("%s: %02x.%012llx.%02x: type=%02x, len=%u.\n",</div><div class='add'>+				__func__, id.family, (unsigned long long)id.id, id.crc, m-&gt;type, m-&gt;len);</div><div class='add'>+#endif</div><div class='add'>+		if (m-&gt;len + sizeof(struct w1_netlink_msg) &gt; msg-&gt;len) {</div><div class='add'>+			err = -E2BIG;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!mlen)</div><div class='add'>+			goto out_cont;</div><div class='add'>+</div><div class='add'>+		if (m-&gt;type == W1_MASTER_CMD) {</div><div class='add'>+			dev = w1_search_master_id(m-&gt;id.mst.id);</div><div class='add'>+		} else if (m-&gt;type == W1_SLAVE_CMD) {</div><div class='add'>+			sl = w1_search_slave(&amp;id);</div><div class='add'>+			if (sl)</div><div class='add'>+				dev = sl-&gt;master;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dev) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out_cont;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+</div><div class='add'>+		if (sl &amp;&amp; w1_reset_select_slave(sl)) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto out_up;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		while (mlen) {</div><div class='add'>+			cmd = (struct w1_netlink_cmd *)cmd_data;</div><div class='add'>+</div><div class='add'>+			if (cmd-&gt;len + sizeof(struct w1_netlink_cmd) &gt; mlen) {</div><div class='add'>+				err = -E2BIG;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (sl)</div><div class='add'>+				w1_process_command_slave(sl, msg, m, cmd);</div><div class='add'>+			else</div><div class='add'>+				w1_process_command_master(dev, msg, m, cmd);</div><div class='add'>+</div><div class='add'>+			cmd_data += cmd-&gt;len + sizeof(struct w1_netlink_cmd);</div><div class='add'>+			mlen -= cmd-&gt;len + sizeof(struct w1_netlink_cmd);</div><div class='add'>+		}</div><div class='add'>+out_up:</div><div class='add'>+		atomic_dec(&amp;dev-&gt;refcnt);</div><div class='add'>+		if (sl)</div><div class='add'>+			atomic_dec(&amp;sl-&gt;refcnt);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+out_cont:</div><div class='add'>+		msg-&gt;len -= sizeof(struct w1_netlink_msg) + m-&gt;len;</div><div class='add'>+		m = (struct w1_netlink_msg *)(((u8 *)m) + sizeof(struct w1_netlink_msg) + m-&gt;len);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Let's allow requests for nonexisting devices.</div><div class='add'>+		 */</div><div class='add'>+		if (err == -ENODEV)</div><div class='add'>+			err = 0;</div><div class='add'>+	}</div><div class='add'>+#if 0</div><div class='add'>+	if (err) {</div><div class='add'>+		printk("%s: malformed message. Dropping.\n", __func__);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#warning Netlink support is disabled. Please compile with NET support enabled.</div><div class='ctx'> </div><div class='add'>+int w1_init_netlink(void)</div><div class='add'>+{</div><div class='add'>+	struct cb_id w1_id = {.idx = CN_W1_IDX, .val = CN_W1_VAL};</div><div class='add'>+</div><div class='add'>+	return cn_add_callback(&amp;w1_id, "w1", &amp;w1_cn_callback);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void w1_fini_netlink(void)</div><div class='add'>+{</div><div class='add'>+	struct cb_id w1_id = {.idx = CN_W1_IDX, .val = CN_W1_VAL};</div><div class='add'>+</div><div class='add'>+	cn_del_callback(&amp;w1_id);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='ctx'> void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int dev_init_netlink(struct w1_master *dev)</div><div class='add'>+int w1_init_netlink(void)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void dev_fini_netlink(struct w1_master *dev)</div><div class='add'>+void w1_fini_netlink(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h<br/>index eb0c8b3152c8..56122b9e9294 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/w1/w1_netlink.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/w1/w1_netlink.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/w1/w1_netlink.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/w1/w1_netlink.h</a></div><div class='hunk'>@@ -23,6 +23,7 @@</div><div class='ctx'> #define __W1_NETLINK_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='add'>+#include &lt;linux/connector.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "w1.h"</div><div class='ctx'> </div><div class='hunk'>@@ -31,29 +32,43 @@ enum w1_netlink_message_types {</div><div class='ctx'> 	W1_SLAVE_REMOVE,</div><div class='ctx'> 	W1_MASTER_ADD,</div><div class='ctx'> 	W1_MASTER_REMOVE,</div><div class='add'>+	W1_MASTER_CMD,</div><div class='add'>+	W1_SLAVE_CMD,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct w1_netlink_msg</div><div class='ctx'> {</div><div class='ctx'> 	__u8				type;</div><div class='del'>-	__u8				reserved[3];</div><div class='del'>-	union</div><div class='del'>-	{</div><div class='del'>-		struct w1_reg_num	id;</div><div class='del'>-		__u64			w1_id;</div><div class='del'>-		struct</div><div class='del'>-		{</div><div class='add'>+	__u8				reserved;</div><div class='add'>+	__u16				len;</div><div class='add'>+	union {</div><div class='add'>+		__u8			id[8];</div><div class='add'>+		struct w1_mst {</div><div class='ctx'> 			__u32		id;</div><div class='del'>-			__u32		pid;</div><div class='add'>+			__u32		res;</div><div class='ctx'> 		} mst;</div><div class='ctx'> 	} id;</div><div class='add'>+	__u8				data[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define W1_CMD_READ		0x0</div><div class='add'>+#define W1_CMD_WRITE		0x1</div><div class='add'>+#define W1_CMD_SEARCH		0x2</div><div class='add'>+#define W1_CMD_ALARM_SEARCH	0x3</div><div class='add'>+</div><div class='add'>+struct w1_netlink_cmd</div><div class='add'>+{</div><div class='add'>+	__u8				cmd;</div><div class='add'>+	__u8				res;</div><div class='add'>+	__u16				len;</div><div class='add'>+	__u8				data[0];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> </div><div class='ctx'> void w1_netlink_send(struct w1_master *, struct w1_netlink_msg *);</div><div class='del'>-int dev_init_netlink(struct w1_master *dev);</div><div class='del'>-void dev_fini_netlink(struct w1_master *dev);</div><div class='add'>+int w1_init_netlink(void);</div><div class='add'>+void w1_fini_netlink(void);</div><div class='ctx'> </div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> #endif /* __W1_NETLINK_H */</div><div class='head'>diff --git a/drivers/zorro/names.c b/drivers/zorro/names.c<br/>index 0dd532d3a5d6..e8517c3d8e82 100644<br/>--- a/<a href='/cgit/linux.git/tree/drivers/zorro/names.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>drivers/zorro/names.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/drivers/zorro/names.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>drivers/zorro/names.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *	David Mosberger-Tang, Martin Mares</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/fs/9p/conv.c b/fs/9p/conv.c<br/>index a767e05b60bf..1e898144eb7c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/conv.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/conv.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/conv.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/conv.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/fs/9p/error.c b/fs/9p/error.c<br/>index 981fe8ecd780..ae91555c1558 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/error.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/error.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/error.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/error.c</a></div><div class='hunk'>@@ -27,7 +27,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='head'>diff --git a/fs/9p/fcall.c b/fs/9p/fcall.c<br/>index 6f2617820a4e..8556097fcda8 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/fcall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/fcall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/fcall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/fcall.c</a></div><div class='hunk'>@@ -24,7 +24,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/fs/9p/fcprint.c b/fs/9p/fcprint.c<br/>index 583e827baebd..34b96114a28d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/fcprint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/fcprint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/fcprint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/fcprint.c</a></div><div class='hunk'>@@ -21,7 +21,6 @@</div><div class='ctx'>  *  Boston, MA  02111-1301  USA</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/fs/9p/fid.c b/fs/9p/fid.c<br/>index b7608af07ce8..70492ccb4385 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/fid.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/fid.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/fid.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/fid.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/fs/9p/mux.c b/fs/9p/mux.c<br/>index f4407eb276c7..90a79c784549 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/mux.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/mux.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/mux.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/mux.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -712,7 +711,7 @@ static void v9fs_read_work(void *a)</div><div class='ctx'>  * v9fs_send_request - send 9P request</div><div class='ctx'>  * The function can sleep until the request is scheduled for sending.</div><div class='ctx'>  * The function can be interrupted. Return from the function is not</div><div class='del'>- * a guarantee that the request is sent succesfully. Can return errors</div><div class='add'>+ * a guarantee that the request is sent successfully. Can return errors</div><div class='ctx'>  * that can be retrieved by PTR_ERR macros.</div><div class='ctx'>  *</div><div class='ctx'>  * @m: mux data</div><div class='hunk'>@@ -932,6 +931,8 @@ v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc,</div><div class='ctx'> 					r.rcall || r.err);</div><div class='ctx'> 			} while (!r.rcall &amp;&amp; !r.err &amp;&amp; err==-ERESTARTSYS &amp;&amp;</div><div class='ctx'> 				m-&gt;trans-&gt;status==Connected &amp;&amp; !m-&gt;err);</div><div class='add'>+</div><div class='add'>+			err = -ERESTARTSYS;</div><div class='ctx'> 		}</div><div class='ctx'> 		sigpending = 1;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/9p/trans_fd.c b/fs/9p/trans_fd.c<br/>index 94e0a7fd9fc2..34d43355beb7 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/trans_fd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/trans_fd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/trans_fd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/trans_fd.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='head'>diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c<br/>index d37416eb5791..22f7ccd58d38 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/v9fs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/v9fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/v9fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/v9fs.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h<br/>index f867b8d3e973..450b0c1b385e 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/v9fs_vfs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/v9fs_vfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/v9fs_vfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/v9fs_vfs.h</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> extern struct file_system_type v9fs_fs_type;</div><div class='del'>-extern struct address_space_operations v9fs_addr_operations;</div><div class='add'>+extern const struct address_space_operations v9fs_addr_operations;</div><div class='ctx'> extern const struct file_operations v9fs_file_operations;</div><div class='ctx'> extern const struct file_operations v9fs_dir_operations;</div><div class='ctx'> extern struct dentry_operations v9fs_dentry_operations;</div><div class='head'>diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c<br/>index efda46fb64d9..9dfd259a70b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/vfs_addr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_addr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/vfs_addr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/vfs_addr.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -103,6 +102,6 @@ UnmapAndUnlock:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations v9fs_addr_operations = {</div><div class='add'>+const struct address_space_operations v9fs_addr_operations = {</div><div class='ctx'>       .readpage = v9fs_vfs_readpage,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c<br/>index 1a8e46084f0e..c3c47eda7574 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/vfs_file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/vfs_file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/vfs_file.c</a></div><div class='hunk'>@@ -31,7 +31,6 @@</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='head'>diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c<br/>index 2cb87ba4b1c1..2f580a197b8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/vfs_inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/vfs_inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/vfs_inode.c</a></div><div class='hunk'>@@ -300,7 +300,7 @@ clunk_fid:</div><div class='ctx'> 	fid = V9FS_NOFID;</div><div class='ctx'> </div><div class='ctx'> put_fid:</div><div class='del'>-	if (fid &gt;= 0)</div><div class='add'>+	if (fid != V9FS_NOFID)</div><div class='ctx'> 		v9fs_put_idpool(fid, &amp;v9ses-&gt;fidpool);</div><div class='ctx'> </div><div class='ctx'> 	kfree(fcall);</div><div class='hunk'>@@ -530,9 +530,6 @@ error:</div><div class='ctx'> 	if (vfid)</div><div class='ctx'> 		v9fs_fid_destroy(vfid);</div><div class='ctx'> </div><div class='del'>-	if (inode)</div><div class='del'>-		iput(inode);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1054,6 +1051,9 @@ static int v9fs_vfs_readlink(struct dentry *dentry, char __user * buffer,</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	char *link = __getname();</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!link))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	if (buflen &gt; PATH_MAX)</div><div class='ctx'> 		buflen = PATH_MAX;</div><div class='ctx'> </div><div class='hunk'>@@ -1171,9 +1171,6 @@ error:</div><div class='ctx'> 	if (vfid)</div><div class='ctx'> 		v9fs_fid_destroy(vfid);</div><div class='ctx'> </div><div class='del'>-	if (inode)</div><div class='del'>-		iput(inode);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -1227,6 +1224,9 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	name = __getname();</div><div class='add'>+	if (unlikely(!name))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	sprintf(name, "%d\n", oldfid-&gt;fid);</div><div class='ctx'> 	retval = v9fs_vfs_mkspecial(dir, dentry, V9FS_DMLINK, name);</div><div class='ctx'> 	__putname(name);</div><div class='head'>diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c<br/>index 61c599b4a1e3..63320d4e15d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/9p/vfs_super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/9p/vfs_super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/9p/vfs_super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/9p/vfs_super.c</a></div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -99,12 +98,13 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses,</div><div class='ctx'>  * @flags: mount flags</div><div class='ctx'>  * @dev_name: device name that was mounted</div><div class='ctx'>  * @data: mount options</div><div class='add'>+ * @mnt: mountpoint record to be instantiated</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct super_block *v9fs_get_sb(struct file_system_type</div><div class='del'>-				       *fs_type, int flags,</div><div class='del'>-				       const char *dev_name, void *data)</div><div class='add'>+static int v9fs_get_sb(struct file_system_type *fs_type, int flags,</div><div class='add'>+		       const char *dev_name, void *data,</div><div class='add'>+		       struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb = NULL;</div><div class='ctx'> 	struct v9fs_fcall *fcall = NULL;</div><div class='hunk'>@@ -123,17 +123,19 @@ static struct super_block *v9fs_get_sb(struct file_system_type</div><div class='ctx'> </div><div class='ctx'> 	v9ses = kzalloc(sizeof(struct v9fs_session_info), GFP_KERNEL);</div><div class='ctx'> 	if (!v9ses)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if ((newfid = v9fs_session_init(v9ses, dev_name, data)) &lt; 0) {</div><div class='ctx'> 		dprintk(DEBUG_ERROR, "problem initiating session\n");</div><div class='del'>-		sb = ERR_PTR(newfid);</div><div class='add'>+		retval = newfid;</div><div class='ctx'> 		goto out_free_session;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sb = sget(fs_type, NULL, v9fs_set_super, v9ses);</div><div class='del'>-	if (IS_ERR(sb))</div><div class='add'>+	if (IS_ERR(sb)) {</div><div class='add'>+		retval = PTR_ERR(sb);</div><div class='ctx'> 		goto out_close_session;</div><div class='add'>+	}</div><div class='ctx'> 	v9fs_fill_super(sb, v9ses, flags);</div><div class='ctx'> </div><div class='ctx'> 	inode = v9fs_get_inode(sb, S_IFDIR | mode);</div><div class='hunk'>@@ -184,19 +186,19 @@ static struct super_block *v9fs_get_sb(struct file_system_type</div><div class='ctx'> 		goto put_back_sb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sb;</div><div class='add'>+	return simple_set_mnt(mnt, sb);</div><div class='ctx'> </div><div class='ctx'> out_close_session:</div><div class='ctx'> 	v9fs_session_close(v9ses);</div><div class='ctx'> out_free_session:</div><div class='ctx'> 	kfree(v9ses);</div><div class='del'>-	return sb;</div><div class='add'>+	return retval;</div><div class='ctx'> </div><div class='ctx'> put_back_sb:</div><div class='ctx'> 	/* deactivate_super calls v9fs_kill_super which will frees the rest */</div><div class='ctx'> 	up_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> 	deactivate_super(sb);</div><div class='del'>-	return ERR_PTR(retval);</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -253,11 +255,12 @@ static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-v9fs_umount_begin(struct super_block *sb)</div><div class='add'>+v9fs_umount_begin(struct vfsmount *vfsmnt, int flags)</div><div class='ctx'> {</div><div class='del'>-	struct v9fs_session_info *v9ses = sb-&gt;s_fs_info;</div><div class='add'>+	struct v9fs_session_info *v9ses = vfsmnt-&gt;mnt_sb-&gt;s_fs_info;</div><div class='ctx'> </div><div class='del'>-	v9fs_session_cancel(v9ses);</div><div class='add'>+	if (flags &amp; MNT_FORCE)</div><div class='add'>+		v9fs_session_cancel(v9ses);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct super_operations v9fs_super_ops = {</div><div class='head'>diff --git a/fs/Kconfig b/fs/Kconfig<br/>index f9b5842c8d2d..3f00a9faabcb 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/Kconfig?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/Kconfig</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/Kconfig?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/Kconfig</a></div><div class='hunk'>@@ -53,7 +53,7 @@ config EXT2_FS_SECURITY</div><div class='ctx'> </div><div class='ctx'> config EXT2_FS_XIP</div><div class='ctx'> 	bool "Ext2 execute in place support"</div><div class='del'>-	depends on EXT2_FS</div><div class='add'>+	depends on EXT2_FS &amp;&amp; MMU</div><div class='ctx'> 	help</div><div class='ctx'> 	  Execute in place can be used on memory-backed block devices. If you</div><div class='ctx'> 	  enable this option, you can select to mount block devices which are</div><div class='hunk'>@@ -326,7 +326,7 @@ source "fs/xfs/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config OCFS2_FS</div><div class='ctx'> 	tristate "OCFS2 file system support (EXPERIMENTAL)"</div><div class='del'>-	depends on NET &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on NET &amp;&amp; SYSFS &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	select CONFIGFS_FS</div><div class='ctx'> 	select JBD</div><div class='ctx'> 	select CRC32</div><div class='hunk'>@@ -356,6 +356,16 @@ config OCFS2_FS</div><div class='ctx'> 	          - POSIX ACLs</div><div class='ctx'> 	          - readpages / writepages (not user visible)</div><div class='ctx'> </div><div class='add'>+config OCFS2_DEBUG_MASKLOG</div><div class='add'>+	bool "OCFS2 logging support"</div><div class='add'>+	depends on OCFS2_FS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  The ocfs2 filesystem has an extensive logging system.  The system</div><div class='add'>+	  allows selection of events to log via files in /sys/o2cb/logmask/.</div><div class='add'>+	  This option will enlarge your kernel, but it allows debugging of</div><div class='add'>+	  ocfs2 filesystem issues.</div><div class='add'>+</div><div class='ctx'> config MINIX_FS</div><div class='ctx'> 	tristate "Minix fs support"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -393,18 +403,30 @@ config INOTIFY</div><div class='ctx'> 	bool "Inotify file change notification support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	---help---</div><div class='del'>-	  Say Y here to enable inotify support and the associated system</div><div class='del'>-	  calls.  Inotify is a file change notification system and a</div><div class='del'>-	  replacement for dnotify.  Inotify fixes numerous shortcomings in</div><div class='del'>-	  dnotify and introduces several new features.  It allows monitoring</div><div class='del'>-	  of both files and directories via a single open fd.  Other features</div><div class='del'>-	  include multiple file events, one-shot support, and unmount</div><div class='add'>+	  Say Y here to enable inotify support.  Inotify is a file change</div><div class='add'>+	  notification system and a replacement for dnotify.  Inotify fixes</div><div class='add'>+	  numerous shortcomings in dnotify and introduces several new features</div><div class='add'>+	  including multiple file events, one-shot support, and unmount</div><div class='ctx'> 	  notification.</div><div class='ctx'> </div><div class='ctx'> 	  For more information, see Documentation/filesystems/inotify.txt</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='add'>+config INOTIFY_USER</div><div class='add'>+	bool "Inotify support for userspace"</div><div class='add'>+	depends on INOTIFY</div><div class='add'>+	default y</div><div class='add'>+	---help---</div><div class='add'>+	  Say Y here to enable inotify support for userspace, including the</div><div class='add'>+	  associated system calls.  Inotify allows monitoring of both files and</div><div class='add'>+	  directories via a single open fd.  Events are read from the file</div><div class='add'>+	  descriptor, which is also select()- and poll()-able.</div><div class='add'>+</div><div class='add'>+	  For more information, see Documentation/filesystems/inotify.txt</div><div class='add'>+</div><div class='add'>+	  If unsure, say Y.</div><div class='add'>+</div><div class='ctx'> config QUOTA</div><div class='ctx'> 	bool "Quota support"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -764,7 +786,8 @@ endmenu</div><div class='ctx'> menu "Pseudo filesystems"</div><div class='ctx'> </div><div class='ctx'> config PROC_FS</div><div class='del'>-	bool "/proc file system support"</div><div class='add'>+	bool "/proc file system support" if EMBEDDED</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is a virtual file system providing information about the status</div><div class='ctx'> 	  of the system. "Virtual" means that it doesn't take up any space on</div><div class='hunk'>@@ -1101,6 +1124,44 @@ config JFFS2_SUMMARY</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say 'N'.</div><div class='ctx'> </div><div class='add'>+config JFFS2_FS_XATTR</div><div class='add'>+	bool "JFFS2 XATTR support (EXPERIMENTAL)"</div><div class='add'>+	depends on JFFS2_FS &amp;&amp; EXPERIMENTAL</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Extended attributes are name:value pairs associated with inodes by</div><div class='add'>+	  the kernel or by users (see the attr(5) manual page, or visit</div><div class='add'>+	  &lt;http://acl.bestbits.at/&gt; for details).</div><div class='add'>+	  </div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+config JFFS2_FS_POSIX_ACL</div><div class='add'>+	bool "JFFS2 POSIX Access Control Lists"</div><div class='add'>+	depends on JFFS2_FS_XATTR</div><div class='add'>+	default y</div><div class='add'>+	select FS_POSIX_ACL</div><div class='add'>+	help</div><div class='add'>+	  Posix Access Control Lists (ACLs) support permissions for users and</div><div class='add'>+	  groups beyond the owner/group/world scheme.</div><div class='add'>+	  </div><div class='add'>+	  To learn more about Access Control Lists, visit the Posix ACLs for</div><div class='add'>+	  Linux website &lt;http://acl.bestbits.at/&gt;.</div><div class='add'>+	  </div><div class='add'>+	  If you don't know what Access Control Lists are, say N</div><div class='add'>+</div><div class='add'>+config JFFS2_FS_SECURITY</div><div class='add'>+	bool "JFFS2 Security Labels"</div><div class='add'>+	depends on JFFS2_FS_XATTR</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Security labels support alternative access control models</div><div class='add'>+	  implemented by security modules like SELinux.  This option</div><div class='add'>+	  enables an extended attribute handler for file security</div><div class='add'>+	  labels in the jffs2 filesystem.</div><div class='add'>+	  </div><div class='add'>+	  If you are not using a security module that requires using</div><div class='add'>+	  extended attributes for file security labels, say N.</div><div class='add'>+</div><div class='ctx'> config JFFS2_COMPRESSION_OPTIONS</div><div class='ctx'> 	bool "Advanced compression options for JFFS2"</div><div class='ctx'> 	depends on JFFS2_FS</div><div class='hunk'>@@ -1320,11 +1381,19 @@ config UFS_FS</div><div class='ctx'> </div><div class='ctx'> config UFS_FS_WRITE</div><div class='ctx'> 	bool "UFS file system write support (DANGEROUS)"</div><div class='del'>-	depends on UFS_FS &amp;&amp; EXPERIMENTAL &amp;&amp; BROKEN</div><div class='add'>+	depends on UFS_FS &amp;&amp; EXPERIMENTAL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you want to try writing to UFS partitions. This is</div><div class='ctx'> 	  experimental, so you should back up your UFS partitions beforehand.</div><div class='ctx'> </div><div class='add'>+config UFS_DEBUG</div><div class='add'>+	bool "UFS debugging"</div><div class='add'>+	depends on UFS_FS</div><div class='add'>+	help</div><div class='add'>+	  If you are experiencing any problems with the UFS filesystem, say</div><div class='add'>+	  Y here.  This will result in _many_ additional debugging messages to be</div><div class='add'>+	  written to the system log.</div><div class='add'>+</div><div class='ctx'> endmenu</div><div class='ctx'> </div><div class='ctx'> menu "Network File Systems"</div><div class='hunk'>@@ -1431,7 +1500,12 @@ config NFSD</div><div class='ctx'> 	select LOCKD</div><div class='ctx'> 	select SUNRPC</div><div class='ctx'> 	select EXPORTFS</div><div class='del'>-	select NFS_ACL_SUPPORT if NFSD_V3_ACL || NFSD_V2_ACL</div><div class='add'>+	select NFSD_V2_ACL if NFSD_V3_ACL</div><div class='add'>+	select NFS_ACL_SUPPORT if NFSD_V2_ACL</div><div class='add'>+	select NFSD_TCP if NFSD_V4</div><div class='add'>+	select CRYPTO_MD5 if NFSD_V4</div><div class='add'>+	select CRYPTO if NFSD_V4</div><div class='add'>+	select FS_POSIX_ACL if NFSD_V4</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you want your Linux box to act as an NFS *server*, so that other</div><div class='ctx'> 	  computers on your local network which support NFS can access certain</div><div class='hunk'>@@ -1469,7 +1543,6 @@ config NFSD_V3</div><div class='ctx'> config NFSD_V3_ACL</div><div class='ctx'> 	bool "Provide server support for the NFSv3 ACL protocol extension"</div><div class='ctx'> 	depends on NFSD_V3</div><div class='del'>-	select NFSD_V2_ACL</div><div class='ctx'> 	help</div><div class='ctx'> 	  Implement the NFSv3 ACL protocol extension for manipulating POSIX</div><div class='ctx'> 	  Access Control Lists on exported file systems. NFS clients should</div><div class='hunk'>@@ -1479,10 +1552,6 @@ config NFSD_V3_ACL</div><div class='ctx'> config NFSD_V4</div><div class='ctx'> 	bool "Provide NFSv4 server support (EXPERIMENTAL)"</div><div class='ctx'> 	depends on NFSD_V3 &amp;&amp; EXPERIMENTAL</div><div class='del'>-	select NFSD_TCP</div><div class='del'>-	select CRYPTO_MD5</div><div class='del'>-	select CRYPTO</div><div class='del'>-	select FS_POSIX_ACL</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you would like to include the NFSv4 server as well as the NFSv2</div><div class='ctx'> 	  and NFSv3 servers, say Y here.  This feature is experimental, and</div><div class='hunk'>@@ -1663,7 +1732,7 @@ config CIFS_STATS</div><div class='ctx'> 	  mounted by the cifs client to be displayed in /proc/fs/cifs/Stats</div><div class='ctx'> </div><div class='ctx'> config CIFS_STATS2</div><div class='del'>-	bool "CIFS extended statistics"</div><div class='add'>+	bool "Extended statistics"</div><div class='ctx'> 	depends on CIFS_STATS</div><div class='ctx'> 	help</div><div class='ctx'> 	  Enabling this option will allow more detailed statistics on SMB</div><div class='hunk'>@@ -1676,6 +1745,32 @@ config CIFS_STATS2</div><div class='ctx'> 	  Unless you are a developer or are doing network performance analysis</div><div class='ctx'> 	  or tuning, say N.</div><div class='ctx'> </div><div class='add'>+config CIFS_WEAK_PW_HASH</div><div class='add'>+	bool "Support legacy servers which use weaker LANMAN security"</div><div class='add'>+	depends on CIFS</div><div class='add'>+	help</div><div class='add'>+	  Modern CIFS servers including Samba and most Windows versions</div><div class='add'>+	  (since 1997) support stronger NTLM (and even NTLMv2 and Kerberos)</div><div class='add'>+	  security mechanisms. These hash the password more securely</div><div class='add'>+	  than the mechanisms used in the older LANMAN version of the</div><div class='add'>+          SMB protocol needed to establish sessions with old SMB servers.</div><div class='add'>+</div><div class='add'>+	  Enabling this option allows the cifs module to mount to older</div><div class='add'>+	  LANMAN based servers such as OS/2 and Windows 95, but such</div><div class='add'>+	  mounts may be less secure than mounts using NTLM or more recent</div><div class='add'>+	  security mechanisms if you are on a public network.  Unless you</div><div class='add'>+	  have a need to access old SMB servers (and are on a private </div><div class='add'>+	  network) you probably want to say N.  Even if this support</div><div class='add'>+	  is enabled in the kernel build, they will not be used</div><div class='add'>+	  automatically. At runtime LANMAN mounts are disabled but</div><div class='add'>+	  can be set to required (or optional) either in</div><div class='add'>+	  /proc/fs/cifs (see fs/cifs/README for more detail) or via an</div><div class='add'>+	  option on the mount command. This support is disabled by </div><div class='add'>+	  default in order to reduce the possibility of a downgrade</div><div class='add'>+	  attack.</div><div class='add'>+ </div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config CIFS_XATTR</div><div class='ctx'>         bool "CIFS extended attributes"</div><div class='ctx'>         depends on CIFS</div><div class='hunk'>@@ -1704,6 +1799,17 @@ config CIFS_POSIX</div><div class='ctx'> 	  (such as Samba 3.10 and later) which can negotiate</div><div class='ctx'> 	  CIFS POSIX ACL support.  If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config CIFS_DEBUG2</div><div class='add'>+	bool "Enable additional CIFS debugging routines"</div><div class='add'>+	depends on CIFS</div><div class='add'>+	help</div><div class='add'>+	   Enabling this option adds a few more debugging routines</div><div class='add'>+	   to the cifs code which slightly increases the size of</div><div class='add'>+	   the cifs module and can cause additional logging of debug</div><div class='add'>+	   messages in some error paths, slowing performance. This</div><div class='add'>+	   option can be turned off unless you are debugging</div><div class='add'>+	   cifs problems.  If unsure, say N.</div><div class='add'>+	   </div><div class='ctx'> config CIFS_EXPERIMENTAL</div><div class='ctx'> 	  bool "CIFS Experimental Features (EXPERIMENTAL)"</div><div class='ctx'> 	  depends on CIFS &amp;&amp; EXPERIMENTAL</div><div class='hunk'>@@ -1719,7 +1825,7 @@ config CIFS_EXPERIMENTAL</div><div class='ctx'> 	    If unsure, say N.</div><div class='ctx'> </div><div class='ctx'> config CIFS_UPCALL</div><div class='del'>-	  bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"</div><div class='add'>+	  bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"</div><div class='ctx'> 	  depends on CIFS_EXPERIMENTAL</div><div class='ctx'> 	  select CONNECTOR</div><div class='ctx'> 	  help</div><div class='head'>diff --git a/fs/Makefile b/fs/Makefile<br/>index 078d3d1191a5..89135428a539 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/Makefile</a></div><div class='hunk'>@@ -13,6 +13,7 @@ obj-y :=	open.o read_write.o file_table.o buffer.o  bio.o super.o \</div><div class='ctx'> 		ioprio.o pnode.o drop_caches.o splice.o sync.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_INOTIFY)		+= inotify.o</div><div class='add'>+obj-$(CONFIG_INOTIFY_USER)	+= inotify_user.o</div><div class='ctx'> obj-$(CONFIG_EPOLL)		+= eventpoll.o</div><div class='ctx'> obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +66,6 @@ obj-$(CONFIG_MSDOS_FS)		+= msdos/</div><div class='ctx'> obj-$(CONFIG_VFAT_FS)		+= vfat/</div><div class='ctx'> obj-$(CONFIG_BFS_FS)		+= bfs/</div><div class='ctx'> obj-$(CONFIG_ISO9660_FS)	+= isofs/</div><div class='del'>-obj-$(CONFIG_DEVFS_FS)		+= devfs/</div><div class='ctx'> obj-$(CONFIG_HFSPLUS_FS)	+= hfsplus/ # Before hfs to find wrapped HFS+</div><div class='ctx'> obj-$(CONFIG_HFS_FS)		+= hfs/</div><div class='ctx'> obj-$(CONFIG_VXFS_FS)		+= freevxfs/</div><div class='head'>diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c<br/>index 7b075fc397da..d3c7905b2ddc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/adfs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/adfs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/adfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/adfs/dir.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Common directory handling for ADFS</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/adfs_fs.h&gt;</div><div class='head'>diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c<br/>index a02802a30798..534f3eecc985 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/adfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/adfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/adfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/adfs/inode.c</a></div><div class='hunk'>@@ -72,7 +72,7 @@ static sector_t _adfs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> 	return generic_block_bmap(mapping, block, adfs_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations adfs_aops = {</div><div class='add'>+static const struct address_space_operations adfs_aops = {</div><div class='ctx'> 	.readpage	= adfs_readpage,</div><div class='ctx'> 	.writepage	= adfs_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='head'>diff --git a/fs/adfs/super.c b/fs/adfs/super.c<br/>index 252abda0d200..ba1c88af49fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/adfs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/adfs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/adfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/adfs/super.c</a></div><div class='hunk'>@@ -196,17 +196,17 @@ static int adfs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	return parse_options(sb, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int adfs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int adfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct adfs_sb_info *asb = ADFS_SB(sb);</div><div class='add'>+	struct adfs_sb_info *asb = ADFS_SB(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type    = ADFS_SUPER_MAGIC;</div><div class='ctx'> 	buf-&gt;f_namelen = asb-&gt;s_namelen;</div><div class='del'>-	buf-&gt;f_bsize   = sb-&gt;s_blocksize;</div><div class='add'>+	buf-&gt;f_bsize   = dentry-&gt;d_sb-&gt;s_blocksize;</div><div class='ctx'> 	buf-&gt;f_blocks  = asb-&gt;s_size;</div><div class='ctx'> 	buf-&gt;f_files   = asb-&gt;s_ids_per_zone * asb-&gt;s_map_size;</div><div class='ctx'> 	buf-&gt;f_bavail  =</div><div class='del'>-	buf-&gt;f_bfree   = adfs_map_free(sb);</div><div class='add'>+	buf-&gt;f_bfree   = adfs_map_free(dentry-&gt;d_sb);</div><div class='ctx'> 	buf-&gt;f_ffree   = (long)(buf-&gt;f_bfree * buf-&gt;f_files) / (long)buf-&gt;f_blocks;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -470,10 +470,11 @@ error:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *adfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int adfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, adfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, adfs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type adfs_fs_type = {</div><div class='head'>diff --git a/fs/affs/affs.h b/fs/affs/affs.h<br/>index a43a876742b8..0ddd4cc0d1a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/affs/affs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/affs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/affs/affs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/affs/affs.h</a></div><div class='hunk'>@@ -195,9 +195,9 @@ extern struct inode_operations   affs_symlink_inode_operations;</div><div class='ctx'> extern const struct file_operations	 affs_file_operations;</div><div class='ctx'> extern const struct file_operations	 affs_file_operations_ofs;</div><div class='ctx'> extern const struct file_operations	 affs_dir_operations;</div><div class='del'>-extern struct address_space_operations	 affs_symlink_aops;</div><div class='del'>-extern struct address_space_operations	 affs_aops;</div><div class='del'>-extern struct address_space_operations	 affs_aops_ofs;</div><div class='add'>+extern const struct address_space_operations	 affs_symlink_aops;</div><div class='add'>+extern const struct address_space_operations	 affs_aops;</div><div class='add'>+extern const struct address_space_operations	 affs_aops_ofs;</div><div class='ctx'> </div><div class='ctx'> extern struct dentry_operations	 affs_dentry_operations;</div><div class='ctx'> extern struct dentry_operations	 affs_dentry_operations_intl;</div><div class='head'>diff --git a/fs/affs/file.c b/fs/affs/file.c<br/>index 7076262af39b..3de8590e4f6a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/affs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/affs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/affs/file.c</a></div><div class='hunk'>@@ -406,7 +406,7 @@ static sector_t _affs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> {</div><div class='ctx'> 	return generic_block_bmap(mapping,block,affs_get_block);</div><div class='ctx'> }</div><div class='del'>-struct address_space_operations affs_aops = {</div><div class='add'>+const struct address_space_operations affs_aops = {</div><div class='ctx'> 	.readpage = affs_readpage,</div><div class='ctx'> 	.writepage = affs_writepage,</div><div class='ctx'> 	.sync_page = block_sync_page,</div><div class='hunk'>@@ -759,7 +759,7 @@ out:</div><div class='ctx'> 	goto done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations affs_aops_ofs = {</div><div class='add'>+const struct address_space_operations affs_aops_ofs = {</div><div class='ctx'> 	.readpage = affs_readpage_ofs,</div><div class='ctx'> 	//.writepage = affs_writepage_ofs,</div><div class='ctx'> 	//.sync_page = affs_sync_page_ofs,</div><div class='head'>diff --git a/fs/affs/super.c b/fs/affs/super.c<br/>index 4d7e5b19e5cd..5200f4938df0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/affs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/affs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/affs/super.c</a></div><div class='hunk'>@@ -18,7 +18,7 @@</div><div class='ctx'> </div><div class='ctx'> extern struct timezone sys_tz;</div><div class='ctx'> </div><div class='del'>-static int affs_statfs(struct super_block *sb, struct kstatfs *buf);</div><div class='add'>+static int affs_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='ctx'> static int affs_remount (struct super_block *sb, int *flags, char *data);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -271,6 +271,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	int			 reserved;</div><div class='ctx'> 	unsigned long		 mount_flags;</div><div class='ctx'> 	int			 tmp_flags;	/* fix remount prototype... */</div><div class='add'>+	u8			 sig[4];</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options");</div><div class='ctx'> </div><div class='hunk'>@@ -370,8 +371,9 @@ got_root:</div><div class='ctx'> 		printk(KERN_ERR "AFFS: Cannot read boot block\n");</div><div class='ctx'> 		goto out_error;</div><div class='ctx'> 	}</div><div class='del'>-	chksum = be32_to_cpu(*(__be32 *)boot_bh-&gt;b_data);</div><div class='add'>+	memcpy(sig, boot_bh-&gt;b_data, 4);</div><div class='ctx'> 	brelse(boot_bh);</div><div class='add'>+	chksum = be32_to_cpu(*(__be32 *)sig);</div><div class='ctx'> </div><div class='ctx'> 	/* Dircache filesystems are compatible with non-dircache ones</div><div class='ctx'> 	 * when reading. As long as they aren't supported, writing is</div><div class='hunk'>@@ -420,11 +422,11 @@ got_root:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mount_flags &amp; SF_VERBOSE) {</div><div class='del'>-		chksum = cpu_to_be32(chksum);</div><div class='del'>-		printk(KERN_NOTICE "AFFS: Mounting volume \"%*s\": Type=%.3s\\%c, Blocksize=%d\n",</div><div class='del'>-			AFFS_ROOT_TAIL(sb, root_bh)-&gt;disk_name[0],</div><div class='add'>+		u8 len = AFFS_ROOT_TAIL(sb, root_bh)-&gt;disk_name[0];</div><div class='add'>+		printk(KERN_NOTICE "AFFS: Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",</div><div class='add'>+			len &gt; 31 ? 31 : len,</div><div class='ctx'> 			AFFS_ROOT_TAIL(sb, root_bh)-&gt;disk_name + 1,</div><div class='del'>-			(char *)&amp;chksum,((char *)&amp;chksum)[3] + '0',blocksize);</div><div class='add'>+			sig, sig[3] + '0', blocksize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_flags |= MS_NODEV | MS_NOSUID;</div><div class='hunk'>@@ -508,8 +510,9 @@ affs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-affs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+affs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	int		 free;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("AFFS: statfs() partsize=%d, reserved=%d\n",AFFS_SB(sb)-&gt;s_partition_size,</div><div class='hunk'>@@ -524,10 +527,11 @@ affs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *affs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int affs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, affs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, affs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type affs_fs_type = {</div><div class='head'>diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c<br/>index 426f0f094f23..f802256a5933 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/affs/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/affs/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/affs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/affs/symlink.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations affs_symlink_aops = {</div><div class='add'>+const struct address_space_operations affs_symlink_aops = {</div><div class='ctx'> 	.readpage	= affs_symlink_readpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/cell.c b/fs/afs/cell.c<br/>index 009a9ae88d61..bfc1fd22d5b1 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/cell.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/cell.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/cell.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/cell.c</a></div><div class='hunk'>@@ -413,8 +413,7 @@ int afs_server_find_by_peer(const struct rxrpc_peer *peer,</div><div class='ctx'> </div><div class='ctx'> 	/* we found it in the graveyard - resurrect it */</div><div class='ctx'>  found_dead_server:</div><div class='del'>-	list_del(&amp;server-&gt;link);</div><div class='del'>-	list_add_tail(&amp;server-&gt;link, &amp;cell-&gt;sv_list);</div><div class='add'>+	list_move_tail(&amp;server-&gt;link, &amp;cell-&gt;sv_list);</div><div class='ctx'> 	afs_get_server(server);</div><div class='ctx'> 	afs_kafstimod_del_timer(&amp;server-&gt;timeout);</div><div class='ctx'> 	spin_unlock(&amp;cell-&gt;sv_gylock);</div><div class='head'>diff --git a/fs/afs/dir.c b/fs/afs/dir.c<br/>index a6dff6a4f204..2fc99877cb0d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/dir.c</a></div><div class='hunk'>@@ -185,9 +185,7 @@ static struct page *afs_dir_get_page(struct inode *dir, unsigned long index)</div><div class='ctx'> </div><div class='ctx'> 	_enter("{%lu},%lu", dir-&gt;i_ino, index);</div><div class='ctx'> </div><div class='del'>-	page = read_cache_page(dir-&gt;i_mapping,index,</div><div class='del'>-			       (filler_t *) dir-&gt;i_mapping-&gt;a_ops-&gt;readpage,</div><div class='del'>-			       NULL);</div><div class='add'>+	page = read_mapping_page(dir-&gt;i_mapping, index, NULL);</div><div class='ctx'> 	if (!IS_ERR(page)) {</div><div class='ctx'> 		wait_on_page_locked(page);</div><div class='ctx'> 		kmap(page);</div><div class='head'>diff --git a/fs/afs/file.c b/fs/afs/file.c<br/>index 7bb716887e29..67d6634101fd 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/file.c</a></div><div class='hunk'>@@ -35,7 +35,7 @@ struct inode_operations afs_file_inode_operations = {</div><div class='ctx'> 	.getattr	= afs_inode_getattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct address_space_operations afs_fs_aops = {</div><div class='add'>+const struct address_space_operations afs_fs_aops = {</div><div class='ctx'> 	.readpage	= afs_file_readpage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='ctx'> 	.set_page_dirty	= __set_page_dirty_nobuffers,</div><div class='head'>diff --git a/fs/afs/internal.h b/fs/afs/internal.h<br/>index 72febdf9a35a..e88b3b65ae49 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/internal.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/internal.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/internal.h</a></div><div class='hunk'>@@ -69,7 +69,7 @@ extern const struct file_operations afs_dir_file_operations;</div><div class='ctx'> /*</div><div class='ctx'>  * file.c</div><div class='ctx'>  */</div><div class='del'>-extern struct address_space_operations afs_fs_aops;</div><div class='add'>+extern const struct address_space_operations afs_fs_aops;</div><div class='ctx'> extern struct inode_operations afs_file_inode_operations;</div><div class='ctx'> </div><div class='ctx'> #ifdef AFS_CACHING_SUPPORT</div><div class='head'>diff --git a/fs/afs/kafsasyncd.c b/fs/afs/kafsasyncd.c<br/>index 7ac07d0d47b9..f09a794f248e 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/kafsasyncd.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/kafsasyncd.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/kafsasyncd.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/kafsasyncd.c</a></div><div class='hunk'>@@ -136,8 +136,7 @@ static int kafsasyncd(void *arg)</div><div class='ctx'> 			if (!list_empty(&amp;kafsasyncd_async_attnq)) {</div><div class='ctx'> 				op = list_entry(kafsasyncd_async_attnq.next,</div><div class='ctx'> 						struct afs_async_op, link);</div><div class='del'>-				list_del(&amp;op-&gt;link);</div><div class='del'>-				list_add_tail(&amp;op-&gt;link,</div><div class='add'>+				list_move_tail(&amp;op-&gt;link,</div><div class='ctx'> 					      &amp;kafsasyncd_async_busyq);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -204,8 +203,7 @@ void afs_kafsasyncd_begin_op(struct afs_async_op *op)</div><div class='ctx'> 	init_waitqueue_entry(&amp;op-&gt;waiter, kafsasyncd_task);</div><div class='ctx'> 	add_wait_queue(&amp;op-&gt;call-&gt;waitq, &amp;op-&gt;waiter);</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;op-&gt;link);</div><div class='del'>-	list_add_tail(&amp;op-&gt;link, &amp;kafsasyncd_async_busyq);</div><div class='add'>+	list_move_tail(&amp;op-&gt;link, &amp;kafsasyncd_async_busyq);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;kafsasyncd_async_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -223,8 +221,7 @@ void afs_kafsasyncd_attend_op(struct afs_async_op *op)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;kafsasyncd_async_lock);</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;op-&gt;link);</div><div class='del'>-	list_add_tail(&amp;op-&gt;link, &amp;kafsasyncd_async_attnq);</div><div class='add'>+	list_move_tail(&amp;op-&gt;link, &amp;kafsasyncd_async_attnq);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;kafsasyncd_async_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c<br/>index 4e6eeb59b83c..99785a79d043 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/mntpt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/mntpt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/mntpt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/mntpt.c</a></div><div class='hunk'>@@ -63,7 +63,6 @@ unsigned long afs_mntpt_expiry_timeout = 20;</div><div class='ctx'> int afs_mntpt_check_symlink(struct afs_vnode *vnode)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	filler_t *filler;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -71,10 +70,7 @@ int afs_mntpt_check_symlink(struct afs_vnode *vnode)</div><div class='ctx'> 	_enter("{%u,%u}", vnode-&gt;fid.vnode, vnode-&gt;fid.unique);</div><div class='ctx'> </div><div class='ctx'> 	/* read the contents of the symlink into the pagecache */</div><div class='del'>-	filler = (filler_t *) AFS_VNODE_TO_I(vnode)-&gt;i_mapping-&gt;a_ops-&gt;readpage;</div><div class='del'>-</div><div class='del'>-	page = read_cache_page(AFS_VNODE_TO_I(vnode)-&gt;i_mapping, 0,</div><div class='del'>-			       filler, NULL);</div><div class='add'>+	page = read_mapping_page(AFS_VNODE_TO_I(vnode)-&gt;i_mapping, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(page)) {</div><div class='ctx'> 		ret = PTR_ERR(page);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -160,7 +156,6 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)</div><div class='ctx'> 	struct page *page = NULL;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> 	char *buf, *devname = NULL, *options = NULL;</div><div class='del'>-	filler_t *filler;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	kenter("{%s}", mntpt-&gt;d_name.name);</div><div class='hunk'>@@ -182,9 +177,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* read the contents of the AFS special symlink */</div><div class='del'>-	filler = (filler_t *)mntpt-&gt;d_inode-&gt;i_mapping-&gt;a_ops-&gt;readpage;</div><div class='del'>-</div><div class='del'>-	page = read_cache_page(mntpt-&gt;d_inode-&gt;i_mapping, 0, filler, NULL);</div><div class='add'>+	page = read_mapping_page(mntpt-&gt;d_inode-&gt;i_mapping, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(page)) {</div><div class='ctx'> 		ret = PTR_ERR(page);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -210,7 +203,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)</div><div class='ctx'> </div><div class='ctx'> 	/* try and do the mount */</div><div class='ctx'> 	kdebug("--- attempting mount %s -o %s ---", devname, options);</div><div class='del'>-	mnt = do_kern_mount("afs", 0, devname, options);</div><div class='add'>+	mnt = vfs_kern_mount(&amp;afs_fs_type, 0, devname, options);</div><div class='ctx'> 	kdebug("--- mount result %p ---", mnt);</div><div class='ctx'> </div><div class='ctx'> 	free_page((unsigned long) devname);</div><div class='head'>diff --git a/fs/afs/server.c b/fs/afs/server.c<br/>index 62b093aa41c6..22afaae1a4ce 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/server.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/server.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/server.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/server.c</a></div><div class='hunk'>@@ -123,8 +123,7 @@ int afs_server_lookup(struct afs_cell *cell, const struct in_addr *addr,</div><div class='ctx'>  resurrect_server:</div><div class='ctx'> 	_debug("resurrecting server");</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;zombie-&gt;link);</div><div class='del'>-	list_add_tail(&amp;zombie-&gt;link, &amp;cell-&gt;sv_list);</div><div class='add'>+	list_move_tail(&amp;zombie-&gt;link, &amp;cell-&gt;sv_list);</div><div class='ctx'> 	afs_get_server(zombie);</div><div class='ctx'> 	afs_kafstimod_del_timer(&amp;zombie-&gt;timeout);</div><div class='ctx'> 	spin_unlock(&amp;cell-&gt;sv_gylock);</div><div class='hunk'>@@ -168,8 +167,7 @@ void afs_put_server(struct afs_server *server)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;cell-&gt;sv_gylock);</div><div class='del'>-	list_del(&amp;server-&gt;link);</div><div class='del'>-	list_add_tail(&amp;server-&gt;link, &amp;cell-&gt;sv_graveyard);</div><div class='add'>+	list_move_tail(&amp;server-&gt;link, &amp;cell-&gt;sv_graveyard);</div><div class='ctx'> </div><div class='ctx'> 	/* time out in 10 secs */</div><div class='ctx'> 	afs_kafstimod_add_timer(&amp;server-&gt;timeout, 10 * HZ);</div><div class='head'>diff --git a/fs/afs/super.c b/fs/afs/super.c<br/>index 53c56e7231ab..67d1f5c819ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/super.c</a></div><div class='hunk'>@@ -38,9 +38,9 @@ struct afs_mount_params {</div><div class='ctx'> static void afs_i_init_once(void *foo, kmem_cache_t *cachep,</div><div class='ctx'> 			    unsigned long flags);</div><div class='ctx'> </div><div class='del'>-static struct super_block *afs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-				      int flags, const char *dev_name,</div><div class='del'>-				      void *data);</div><div class='add'>+static int afs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+		      int flags, const char *dev_name,</div><div class='add'>+		      void *data, struct vfsmount *mnt);</div><div class='ctx'> </div><div class='ctx'> static struct inode *afs_alloc_inode(struct super_block *sb);</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +48,7 @@ static void afs_put_super(struct super_block *sb);</div><div class='ctx'> </div><div class='ctx'> static void afs_destroy_inode(struct inode *inode);</div><div class='ctx'> </div><div class='del'>-static struct file_system_type afs_fs_type = {</div><div class='add'>+struct file_system_type afs_fs_type = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "afs",</div><div class='ctx'> 	.get_sb		= afs_get_sb,</div><div class='hunk'>@@ -294,10 +294,11 @@ static int afs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'>  * get an AFS superblock</div><div class='ctx'>  * - TODO: don't use get_sb_nodev(), but rather call sget() directly</div><div class='ctx'>  */</div><div class='del'>-static struct super_block *afs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-				      int flags,</div><div class='del'>-				      const char *dev_name,</div><div class='del'>-				      void *options)</div><div class='add'>+static int afs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+		      int flags,</div><div class='add'>+		      const char *dev_name,</div><div class='add'>+		      void *options,</div><div class='add'>+		      struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct afs_mount_params params;</div><div class='ctx'> 	struct super_block *sb;</div><div class='hunk'>@@ -311,7 +312,7 @@ static struct super_block *afs_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 	ret = afscm_start();</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		_leave(" = %d", ret);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* parse the options */</div><div class='hunk'>@@ -348,18 +349,19 @@ static struct super_block *afs_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> 	sb-&gt;s_flags |= MS_ACTIVE;</div><div class='add'>+	simple_set_mnt(mnt, sb);</div><div class='ctx'> </div><div class='ctx'> 	afs_put_volume(params.volume);</div><div class='ctx'> 	afs_put_cell(params.default_cell);</div><div class='del'>-	_leave(" = %p", sb);</div><div class='del'>-	return sb;</div><div class='add'>+	_leave(" = 0 [%p]", 0, sb);</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'>  error:</div><div class='ctx'> 	afs_put_volume(params.volume);</div><div class='ctx'> 	afs_put_cell(params.default_cell);</div><div class='ctx'> 	afscm_stop();</div><div class='ctx'> 	_leave(" = %d", ret);</div><div class='del'>-	return ERR_PTR(ret);</div><div class='add'>+	return ret;</div><div class='ctx'> } /* end afs_get_sb() */</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='head'>diff --git a/fs/afs/super.h b/fs/afs/super.h<br/>index ac11362f4e95..32de8cc6fae8 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/super.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/super.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/super.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/super.h</a></div><div class='hunk'>@@ -38,6 +38,8 @@ static inline struct afs_super_info *AFS_FS_S(struct super_block *sb)</div><div class='ctx'> 	return sb-&gt;s_fs_info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern struct file_system_type afs_fs_type;</div><div class='add'>+</div><div class='ctx'> #endif /* __KERNEL__ */</div><div class='ctx'> </div><div class='ctx'> #endif /* _LINUX_AFS_SUPER_H */</div><div class='head'>diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c<br/>index eced20618ecc..331f730a1fb3 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/vlocation.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/vlocation.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/vlocation.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/vlocation.c</a></div><div class='hunk'>@@ -326,8 +326,7 @@ int afs_vlocation_lookup(struct afs_cell *cell,</div><div class='ctx'> 	/* found in the graveyard - resurrect */</div><div class='ctx'> 	_debug("found in graveyard");</div><div class='ctx'> 	atomic_inc(&amp;vlocation-&gt;usage);</div><div class='del'>-	list_del(&amp;vlocation-&gt;link);</div><div class='del'>-	list_add_tail(&amp;vlocation-&gt;link, &amp;cell-&gt;vl_list);</div><div class='add'>+	list_move_tail(&amp;vlocation-&gt;link, &amp;cell-&gt;vl_list);</div><div class='ctx'> 	spin_unlock(&amp;cell-&gt;vl_gylock);</div><div class='ctx'> </div><div class='ctx'> 	afs_kafstimod_del_timer(&amp;vlocation-&gt;timeout);</div><div class='hunk'>@@ -478,8 +477,7 @@ static void __afs_put_vlocation(struct afs_vlocation *vlocation)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* move to graveyard queue */</div><div class='del'>-	list_del(&amp;vlocation-&gt;link);</div><div class='del'>-	list_add_tail(&amp;vlocation-&gt;link,&amp;cell-&gt;vl_graveyard);</div><div class='add'>+	list_move_tail(&amp;vlocation-&gt;link,&amp;cell-&gt;vl_graveyard);</div><div class='ctx'> </div><div class='ctx'> 	/* remove from pending timeout queue (refcounted if actually being</div><div class='ctx'> 	 * updated) */</div><div class='head'>diff --git a/fs/afs/vnode.c b/fs/afs/vnode.c<br/>index 9867fef3261d..cf62da5d7825 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/afs/vnode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/afs/vnode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/afs/vnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/afs/vnode.c</a></div><div class='hunk'>@@ -104,8 +104,7 @@ static void afs_vnode_finalise_status_update(struct afs_vnode *vnode,</div><div class='ctx'> 					vnode-&gt;cb_expiry * HZ);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;afs_cb_hash_lock);</div><div class='del'>-		list_del(&amp;vnode-&gt;cb_hash_link);</div><div class='del'>-		list_add_tail(&amp;vnode-&gt;cb_hash_link,</div><div class='add'>+		list_move_tail(&amp;vnode-&gt;cb_hash_link,</div><div class='ctx'> 			      &amp;afs_cb_hash(server, &amp;vnode-&gt;fid));</div><div class='ctx'> 		spin_unlock(&amp;afs_cb_hash_lock);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/aio.c b/fs/aio.c<br/>index e41e932ba489..950630187acc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/aio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/aio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/aio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/aio.c</a></div><div class='hunk'>@@ -641,7 +641,7 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb)</div><div class='ctx'>  *	invoked both for initial i/o submission and</div><div class='ctx'>  *	subsequent retries via the aio_kick_handler.</div><div class='ctx'>  *	Expects to be invoked with iocb-&gt;ki_ctx-&gt;lock</div><div class='del'>- *	already held. The lock is released and reaquired</div><div class='add'>+ *	already held. The lock is released and reacquired</div><div class='ctx'>  *	as needed during processing.</div><div class='ctx'>  *</div><div class='ctx'>  * Calls the iocb retry method (already setup for the</div><div class='hunk'>@@ -777,11 +777,11 @@ out:</div><div class='ctx'> static int __aio_run_iocbs(struct kioctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct kiocb *iocb;</div><div class='del'>-	LIST_HEAD(run_list);</div><div class='add'>+	struct list_head run_list;</div><div class='ctx'> </div><div class='ctx'> 	assert_spin_locked(&amp;ctx-&gt;ctx_lock);</div><div class='ctx'> </div><div class='del'>-	list_splice_init(&amp;ctx-&gt;run_list, &amp;run_list);</div><div class='add'>+	list_replace_init(&amp;ctx-&gt;run_list, &amp;run_list);</div><div class='ctx'> 	while (!list_empty(&amp;run_list)) {</div><div class='ctx'> 		iocb = list_entry(run_list.next, struct kiocb,</div><div class='ctx'> 			ki_run_list);</div><div class='head'>diff --git a/fs/autofs/init.c b/fs/autofs/init.c<br/>index b977ece69f0c..aca123752406 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/autofs/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/autofs/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/autofs/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/autofs/init.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "autofs_i.h"</div><div class='ctx'> </div><div class='del'>-static struct super_block *autofs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int autofs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_nodev(fs_type, flags, data, autofs_fill_super);</div><div class='add'>+	return get_sb_nodev(fs_type, flags, data, autofs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type autofs_fs_type = {</div><div class='head'>diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c<br/>index b8ce02607d66..8dbd44f10e9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/autofs4/expire.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/autofs4/expire.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/autofs4/expire.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/autofs4/expire.c</a></div><div class='hunk'>@@ -174,6 +174,12 @@ static int autofs4_tree_busy(struct vfsmount *mnt,</div><div class='ctx'> 			struct autofs_info *ino = autofs4_dentry_ino(p);</div><div class='ctx'> 			unsigned int ino_count = atomic_read(&amp;ino-&gt;count);</div><div class='ctx'> </div><div class='add'>+			/*</div><div class='add'>+			 * Clean stale dentries below that have not been</div><div class='add'>+			 * invalidated after a mount fail during lookup</div><div class='add'>+			 */</div><div class='add'>+			d_invalidate(p);</div><div class='add'>+</div><div class='ctx'> 			/* allow for dget above and top is already dgot */</div><div class='ctx'> 			if (p == top)</div><div class='ctx'> 				ino_count += 2;</div><div class='hunk'>@@ -370,8 +376,7 @@ next:</div><div class='ctx'> 		DPRINTK("returning %p %.*s",</div><div class='ctx'> 			expired, (int)expired-&gt;d_name.len, expired-&gt;d_name.name);</div><div class='ctx'> 		spin_lock(&amp;dcache_lock);</div><div class='del'>-		list_del(&amp;expired-&gt;d_parent-&gt;d_subdirs);</div><div class='del'>-		list_add(&amp;expired-&gt;d_parent-&gt;d_subdirs, &amp;expired-&gt;d_u.d_child);</div><div class='add'>+		list_move(&amp;expired-&gt;d_parent-&gt;d_subdirs, &amp;expired-&gt;d_u.d_child);</div><div class='ctx'> 		spin_unlock(&amp;dcache_lock);</div><div class='ctx'> 		return expired;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c<br/>index acecec8578ce..5d9193332bef 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/autofs4/init.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/autofs4/init.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/autofs4/init.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/autofs4/init.c</a></div><div class='hunk'>@@ -14,10 +14,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include "autofs_i.h"</div><div class='ctx'> </div><div class='del'>-static struct super_block *autofs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int autofs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_nodev(fs_type, flags, data, autofs4_fill_super);</div><div class='add'>+	return get_sb_nodev(fs_type, flags, data, autofs4_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type autofs_fs_type = {</div><div class='head'>diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c<br/>index 68ebd10f345d..fcaeead9696b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/befs/linuxvfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/befs/linuxvfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/befs/linuxvfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/befs/linuxvfs.c</a></div><div class='hunk'>@@ -49,7 +49,7 @@ static int befs_nls2utf(struct super_block *sb, const char *in, int in_len,</div><div class='ctx'> 			char **out, int *out_len);</div><div class='ctx'> static void befs_put_super(struct super_block *);</div><div class='ctx'> static int befs_remount(struct super_block *, int *, char *);</div><div class='del'>-static int befs_statfs(struct super_block *, struct kstatfs *);</div><div class='add'>+static int befs_statfs(struct dentry *, struct kstatfs *);</div><div class='ctx'> static int parse_options(char *, befs_mount_options *);</div><div class='ctx'> </div><div class='ctx'> static const struct super_operations befs_sops = {</div><div class='hunk'>@@ -73,7 +73,7 @@ static struct inode_operations befs_dir_inode_operations = {</div><div class='ctx'> 	.lookup		= befs_lookup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations befs_aops = {</div><div class='add'>+static const struct address_space_operations befs_aops = {</div><div class='ctx'> 	.readpage	= befs_readpage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='ctx'> 	.bmap		= befs_bmap,</div><div class='hunk'>@@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode)</div><div class='ctx'> 	if (!bh) {</div><div class='ctx'> 		befs_error(sb, "unable to read inode block - "</div><div class='ctx'> 			   "inode = %lu", inode-&gt;i_ino);</div><div class='del'>-		goto unaquire_none;</div><div class='add'>+		goto unacquire_none;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	raw_inode = (befs_inode *) bh-&gt;b_data;</div><div class='hunk'>@@ -334,7 +334,7 @@ befs_read_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	if (befs_check_inode(sb, raw_inode, inode-&gt;i_ino) != BEFS_OK) {</div><div class='ctx'> 		befs_error(sb, "Bad inode: %lu", inode-&gt;i_ino);</div><div class='del'>-		goto unaquire_bh;</div><div class='add'>+		goto unacquire_bh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	inode-&gt;i_mode = (umode_t) fs32_to_cpu(sb, raw_inode-&gt;mode);</div><div class='hunk'>@@ -402,17 +402,17 @@ befs_read_inode(struct inode *inode)</div><div class='ctx'> 		befs_error(sb, "Inode %lu is not a regular file, "</div><div class='ctx'> 			   "directory or symlink. THAT IS WRONG! BeFS has no "</div><div class='ctx'> 			   "on disk special files", inode-&gt;i_ino);</div><div class='del'>-		goto unaquire_bh;</div><div class='add'>+		goto unacquire_bh;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> 	befs_debug(sb, "&lt;--- befs_read_inode()");</div><div class='ctx'> 	return;</div><div class='ctx'> </div><div class='del'>-      unaquire_bh:</div><div class='add'>+      unacquire_bh:</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='del'>-      unaquire_none:</div><div class='add'>+      unacquire_none:</div><div class='ctx'> 	make_bad_inode(inode);</div><div class='ctx'> 	befs_debug(sb, "&lt;--- befs_read_inode() - Bad inode");</div><div class='ctx'> 	return;</div><div class='hunk'>@@ -761,14 +761,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 		       "BeFS(%s): Unable to allocate memory for private "</div><div class='ctx'> 		       "portion of superblock. Bailing.\n", sb-&gt;s_id);</div><div class='del'>-		goto unaquire_none;</div><div class='add'>+		goto unacquire_none;</div><div class='ctx'> 	}</div><div class='ctx'> 	befs_sb = BEFS_SB(sb);</div><div class='ctx'> 	memset(befs_sb, 0, sizeof(befs_sb_info));</div><div class='ctx'> </div><div class='ctx'> 	if (!parse_options((char *) data, &amp;befs_sb-&gt;mount_opts)) {</div><div class='ctx'> 		befs_error(sb, "cannot parse mount options");</div><div class='del'>-		goto unaquire_priv_sbp;</div><div class='add'>+		goto unacquire_priv_sbp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	befs_debug(sb, "---&gt; befs_fill_super()");</div><div class='hunk'>@@ -794,7 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	if (!(bh = sb_bread(sb, sb_block))) {</div><div class='ctx'> 		befs_error(sb, "unable to read superblock");</div><div class='del'>-		goto unaquire_priv_sbp;</div><div class='add'>+		goto unacquire_priv_sbp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* account for offset of super block on x86 */</div><div class='hunk'>@@ -809,20 +809,20 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (befs_load_sb(sb, disk_sb) != BEFS_OK)</div><div class='del'>-		goto unaquire_bh;</div><div class='add'>+		goto unacquire_bh;</div><div class='ctx'> </div><div class='ctx'> 	befs_dump_super_block(sb, disk_sb);</div><div class='ctx'> </div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='ctx'> 	if (befs_check_sb(sb) != BEFS_OK)</div><div class='del'>-		goto unaquire_priv_sbp;</div><div class='add'>+		goto unacquire_priv_sbp;</div><div class='ctx'> </div><div class='ctx'> 	if( befs_sb-&gt;num_blocks &gt; ~((sector_t)0) ) {</div><div class='ctx'> 		befs_error(sb, "blocks count: %Lu "</div><div class='ctx'> 			"is larger than the host can use",</div><div class='ctx'> 			befs_sb-&gt;num_blocks);</div><div class='del'>-		goto unaquire_priv_sbp;</div><div class='add'>+		goto unacquire_priv_sbp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='ctx'> 		iput(root);</div><div class='ctx'> 		befs_error(sb, "get root inode failed");</div><div class='del'>-		goto unaquire_priv_sbp;</div><div class='add'>+		goto unacquire_priv_sbp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* load nls library */</div><div class='hunk'>@@ -860,13 +860,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> /*****************/</div><div class='del'>-      unaquire_bh:</div><div class='add'>+      unacquire_bh:</div><div class='ctx'> 	brelse(bh);</div><div class='ctx'> </div><div class='del'>-      unaquire_priv_sbp:</div><div class='add'>+      unacquire_priv_sbp:</div><div class='ctx'> 	kfree(sb-&gt;s_fs_info);</div><div class='ctx'> </div><div class='del'>-      unaquire_none:</div><div class='add'>+      unacquire_none:</div><div class='ctx'> 	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -880,8 +880,9 @@ befs_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-befs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+befs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> </div><div class='ctx'> 	befs_debug(sb, "---&gt; befs_statfs()");</div><div class='ctx'> </div><div class='hunk'>@@ -899,11 +900,12 @@ befs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *</div><div class='add'>+static int</div><div class='ctx'> befs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name,</div><div class='del'>-	    void *data)</div><div class='add'>+	    void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, befs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, befs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type befs_fs_type = {</div><div class='hunk'>@@ -923,18 +925,18 @@ init_befs_fs(void)</div><div class='ctx'> </div><div class='ctx'> 	err = befs_init_inodecache();</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto unaquire_none;</div><div class='add'>+		goto unacquire_none;</div><div class='ctx'> </div><div class='ctx'> 	err = register_filesystem(&amp;befs_fs_type);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto unaquire_inodecache;</div><div class='add'>+		goto unacquire_inodecache;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-unaquire_inodecache:</div><div class='add'>+unacquire_inodecache:</div><div class='ctx'> 	befs_destroy_inodecache();</div><div class='ctx'> </div><div class='del'>-unaquire_none:</div><div class='add'>+unacquire_none:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h<br/>index 9d791004b21c..31973bbbf057 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/bfs/bfs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bfs/bfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/bfs/bfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/bfs/bfs.h</a></div><div class='hunk'>@@ -50,7 +50,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode)</div><div class='ctx'> /* file.c */</div><div class='ctx'> extern struct inode_operations bfs_file_inops;</div><div class='ctx'> extern const struct file_operations bfs_file_operations;</div><div class='del'>-extern struct address_space_operations bfs_aops;</div><div class='add'>+extern const struct address_space_operations bfs_aops;</div><div class='ctx'> </div><div class='ctx'> /* dir.c */</div><div class='ctx'> extern struct inode_operations bfs_dir_inops;</div><div class='head'>diff --git a/fs/bfs/file.c b/fs/bfs/file.c<br/>index d83cd74a2e4e..3d5aca28a0a0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/bfs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bfs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/bfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/bfs/file.c</a></div><div class='hunk'>@@ -153,7 +153,7 @@ static sector_t bfs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> 	return generic_block_bmap(mapping, block, bfs_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations bfs_aops = {</div><div class='add'>+const struct address_space_operations bfs_aops = {</div><div class='ctx'> 	.readpage	= bfs_readpage,</div><div class='ctx'> 	.writepage	= bfs_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='head'>diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c<br/>index 55a7a78332f8..cf74f3d4d966 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/bfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/bfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/bfs/inode.c</a></div><div class='hunk'>@@ -203,8 +203,9 @@ static void bfs_put_super(struct super_block *s)</div><div class='ctx'> 	s-&gt;s_fs_info = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bfs_statfs(struct super_block *s, struct kstatfs *buf)</div><div class='add'>+static int bfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *s = dentry-&gt;d_sb;</div><div class='ctx'> 	struct bfs_sb_info *info = BFS_SB(s);</div><div class='ctx'> 	u64 id = huge_encode_dev(s-&gt;s_bdev-&gt;bd_dev);</div><div class='ctx'> 	buf-&gt;f_type = BFS_MAGIC;</div><div class='hunk'>@@ -410,10 +411,10 @@ out:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *bfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int bfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, bfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, bfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type bfs_fs_type = {</div><div class='head'>diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c<br/>index 537893a16014..672a3b90bc55 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/binfmt_elf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_elf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/binfmt_elf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/binfmt_elf.c</a></div><div class='hunk'>@@ -38,15 +38,13 @@</div><div class='ctx'> #include &lt;linux/security.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/elf.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/param.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/elf.h&gt;</div><div class='del'>-</div><div class='del'>-static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs);</div><div class='del'>-static int load_elf_library(struct file*);</div><div class='add'>+static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);</div><div class='add'>+static int load_elf_library(struct file *);</div><div class='ctx'> static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);</div><div class='ctx'> extern int dump_fpu (struct pt_regs *, elf_fpregset_t *);</div><div class='ctx'> </div><div class='hunk'>@@ -59,15 +57,15 @@ extern int dump_fpu (struct pt_regs *, elf_fpregset_t *);</div><div class='ctx'>  * don't even try.</div><div class='ctx'>  */</div><div class='ctx'> #if defined(USE_ELF_CORE_DUMP) &amp;&amp; defined(CONFIG_ELF_CORE)</div><div class='del'>-static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file);</div><div class='add'>+static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file);</div><div class='ctx'> #else</div><div class='ctx'> #define elf_core_dump	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if ELF_EXEC_PAGESIZE &gt; PAGE_SIZE</div><div class='del'>-# define ELF_MIN_ALIGN	ELF_EXEC_PAGESIZE</div><div class='add'>+#define ELF_MIN_ALIGN	ELF_EXEC_PAGESIZE</div><div class='ctx'> #else</div><div class='del'>-# define ELF_MIN_ALIGN	PAGE_SIZE</div><div class='add'>+#define ELF_MIN_ALIGN	PAGE_SIZE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef ELF_CORE_EFLAGS</div><div class='hunk'>@@ -86,7 +84,7 @@ static struct linux_binfmt elf_format = {</div><div class='ctx'> 		.min_coredump	= ELF_EXEC_PAGESIZE</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BAD_ADDR(x)	((unsigned long)(x) &gt; TASK_SIZE)</div><div class='add'>+#define BAD_ADDR(x) ((unsigned long)(x) &gt;= TASK_SIZE)</div><div class='ctx'> </div><div class='ctx'> static int set_brk(unsigned long start, unsigned long end)</div><div class='ctx'> {</div><div class='hunk'>@@ -104,13 +102,11 @@ static int set_brk(unsigned long start, unsigned long end)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* We need to explicitly zero any fractional pages</div><div class='ctx'>    after the data section (i.e. bss).  This would</div><div class='ctx'>    contain the junk from the file that should not</div><div class='del'>-   be in memory */</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+   be in memory</div><div class='add'>+ */</div><div class='ctx'> static int padzero(unsigned long elf_bss)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long nbyte;</div><div class='hunk'>@@ -129,7 +125,9 @@ static int padzero(unsigned long elf_bss)</div><div class='ctx'> #define STACK_ADD(sp, items) ((elf_addr_t __user *)(sp) + (items))</div><div class='ctx'> #define STACK_ROUND(sp, items) \</div><div class='ctx'> 	((15 + (unsigned long) ((sp) + (items))) &amp;~ 15UL)</div><div class='del'>-#define STACK_ALLOC(sp, len) ({ elf_addr_t __user *old_sp = (elf_addr_t __user *)sp; sp += len; old_sp; })</div><div class='add'>+#define STACK_ALLOC(sp, len) ({ \</div><div class='add'>+	elf_addr_t __user *old_sp = (elf_addr_t __user *)sp; sp += len; \</div><div class='add'>+	old_sp; })</div><div class='ctx'> #else</div><div class='ctx'> #define STACK_ADD(sp, items) ((elf_addr_t __user *)(sp) - (items))</div><div class='ctx'> #define STACK_ROUND(sp, items) \</div><div class='hunk'>@@ -138,7 +136,7 @@ static int padzero(unsigned long elf_bss)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='add'>+create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,</div><div class='ctx'> 		int interp_aout, unsigned long load_addr,</div><div class='ctx'> 		unsigned long interp_load_addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -161,7 +159,6 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='ctx'> 	 * for userspace to get any other way, in others (i386) it is</div><div class='ctx'> 	 * merely difficult.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	u_platform = NULL;</div><div class='ctx'> 	if (k_platform) {</div><div class='ctx'> 		size_t len = strlen(k_platform) + 1;</div><div class='hunk'>@@ -171,7 +168,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='ctx'> 		 * evictions by the processes running on the same package. One</div><div class='ctx'> 		 * thing we can do is to shuffle the initial stack for them.</div><div class='ctx'> 		 */</div><div class='del'>-	 </div><div class='add'>+</div><div class='ctx'> 		p = arch_align_stack(p);</div><div class='ctx'> </div><div class='ctx'> 		u_platform = (elf_addr_t __user *)STACK_ALLOC(p, len);</div><div class='hunk'>@@ -180,9 +177,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create the ELF interpreter info */</div><div class='del'>-	elf_info = (elf_addr_t *) current-&gt;mm-&gt;saved_auxv;</div><div class='add'>+	elf_info = (elf_addr_t *)current-&gt;mm-&gt;saved_auxv;</div><div class='ctx'> #define NEW_AUX_ENT(id, val) \</div><div class='del'>-	do { elf_info[ei_index++] = id; elf_info[ei_index++] = val; } while (0)</div><div class='add'>+	do { \</div><div class='add'>+		elf_info[ei_index++] = id; \</div><div class='add'>+		elf_info[ei_index++] = val; \</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> #ifdef ARCH_DLINFO</div><div class='ctx'> 	/* </div><div class='hunk'>@@ -195,21 +195,22 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='ctx'> 	NEW_AUX_ENT(AT_PAGESZ, ELF_EXEC_PAGESIZE);</div><div class='ctx'> 	NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC);</div><div class='ctx'> 	NEW_AUX_ENT(AT_PHDR, load_addr + exec-&gt;e_phoff);</div><div class='del'>-	NEW_AUX_ENT(AT_PHENT, sizeof (struct elf_phdr));</div><div class='add'>+	NEW_AUX_ENT(AT_PHENT, sizeof(struct elf_phdr));</div><div class='ctx'> 	NEW_AUX_ENT(AT_PHNUM, exec-&gt;e_phnum);</div><div class='ctx'> 	NEW_AUX_ENT(AT_BASE, interp_load_addr);</div><div class='ctx'> 	NEW_AUX_ENT(AT_FLAGS, 0);</div><div class='ctx'> 	NEW_AUX_ENT(AT_ENTRY, exec-&gt;e_entry);</div><div class='del'>-	NEW_AUX_ENT(AT_UID, (elf_addr_t) tsk-&gt;uid);</div><div class='del'>-	NEW_AUX_ENT(AT_EUID, (elf_addr_t) tsk-&gt;euid);</div><div class='del'>-	NEW_AUX_ENT(AT_GID, (elf_addr_t) tsk-&gt;gid);</div><div class='del'>-	NEW_AUX_ENT(AT_EGID, (elf_addr_t) tsk-&gt;egid);</div><div class='del'>- 	NEW_AUX_ENT(AT_SECURE, (elf_addr_t) security_bprm_secureexec(bprm));</div><div class='add'>+	NEW_AUX_ENT(AT_UID, tsk-&gt;uid);</div><div class='add'>+	NEW_AUX_ENT(AT_EUID, tsk-&gt;euid);</div><div class='add'>+	NEW_AUX_ENT(AT_GID, tsk-&gt;gid);</div><div class='add'>+	NEW_AUX_ENT(AT_EGID, tsk-&gt;egid);</div><div class='add'>+ 	NEW_AUX_ENT(AT_SECURE, security_bprm_secureexec(bprm));</div><div class='ctx'> 	if (k_platform) {</div><div class='del'>-		NEW_AUX_ENT(AT_PLATFORM, (elf_addr_t)(unsigned long)u_platform);</div><div class='add'>+		NEW_AUX_ENT(AT_PLATFORM,</div><div class='add'>+			    (elf_addr_t)(unsigned long)u_platform);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bprm-&gt;interp_flags &amp; BINPRM_FLAGS_EXECFD) {</div><div class='del'>-		NEW_AUX_ENT(AT_EXECFD, (elf_addr_t) bprm-&gt;interp_data);</div><div class='add'>+		NEW_AUX_ENT(AT_EXECFD, bprm-&gt;interp_data);</div><div class='ctx'> 	}</div><div class='ctx'> #undef NEW_AUX_ENT</div><div class='ctx'> 	/* AT_NULL is zero; clear the rest too */</div><div class='hunk'>@@ -232,7 +233,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='ctx'> 	/* Point sp at the lowest address on the stack */</div><div class='ctx'> #ifdef CONFIG_STACK_GROWSUP</div><div class='ctx'> 	sp = (elf_addr_t __user *)bprm-&gt;p - items - ei_index;</div><div class='del'>-	bprm-&gt;exec = (unsigned long) sp; /* XXX: PARISC HACK */</div><div class='add'>+	bprm-&gt;exec = (unsigned long)sp; /* XXX: PARISC HACK */</div><div class='ctx'> #else</div><div class='ctx'> 	sp = (elf_addr_t __user *)bprm-&gt;p;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -285,7 +286,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr * exec,</div><div class='ctx'> #ifndef elf_map</div><div class='ctx'> </div><div class='ctx'> static unsigned long elf_map(struct file *filep, unsigned long addr,</div><div class='del'>-			struct elf_phdr *eppnt, int prot, int type)</div><div class='add'>+		struct elf_phdr *eppnt, int prot, int type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long map_addr;</div><div class='ctx'> 	unsigned long pageoffset = ELF_PAGEOFFSET(eppnt-&gt;p_vaddr);</div><div class='hunk'>@@ -310,9 +311,8 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,</div><div class='ctx'>    is only provided so that we can read a.out libraries that have</div><div class='ctx'>    an ELF header */</div><div class='ctx'> </div><div class='del'>-static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,</div><div class='del'>-				     struct file * interpreter,</div><div class='del'>-				     unsigned long *interp_load_addr)</div><div class='add'>+static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,</div><div class='add'>+		struct file *interpreter, unsigned long *interp_load_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct elf_phdr *elf_phdata;</div><div class='ctx'> 	struct elf_phdr *eppnt;</div><div class='hunk'>@@ -342,15 +342,15 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Now read in all of the header information */</div><div class='del'>-</div><div class='ctx'> 	size = sizeof(struct elf_phdr) * interp_elf_ex-&gt;e_phnum;</div><div class='ctx'> 	if (size &gt; ELF_MIN_ALIGN)</div><div class='ctx'> 		goto out;</div><div class='del'>-	elf_phdata = (struct elf_phdr *) kmalloc(size, GFP_KERNEL);</div><div class='add'>+	elf_phdata = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!elf_phdata)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	retval = kernel_read(interpreter,interp_elf_ex-&gt;e_phoff,(char *)elf_phdata,size);</div><div class='add'>+	retval = kernel_read(interpreter, interp_elf_ex-&gt;e_phoff,</div><div class='add'>+			     (char *)elf_phdata,size);</div><div class='ctx'> 	error = -EIO;</div><div class='ctx'> 	if (retval != size) {</div><div class='ctx'> 		if (retval &lt; 0)</div><div class='hunk'>@@ -359,58 +359,65 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	eppnt = elf_phdata;</div><div class='del'>-	for (i=0; i&lt;interp_elf_ex-&gt;e_phnum; i++, eppnt++) {</div><div class='del'>-	  if (eppnt-&gt;p_type == PT_LOAD) {</div><div class='del'>-	    int elf_type = MAP_PRIVATE | MAP_DENYWRITE;</div><div class='del'>-	    int elf_prot = 0;</div><div class='del'>-	    unsigned long vaddr = 0;</div><div class='del'>-	    unsigned long k, map_addr;</div><div class='del'>-</div><div class='del'>-	    if (eppnt-&gt;p_flags &amp; PF_R) elf_prot =  PROT_READ;</div><div class='del'>-	    if (eppnt-&gt;p_flags &amp; PF_W) elf_prot |= PROT_WRITE;</div><div class='del'>-	    if (eppnt-&gt;p_flags &amp; PF_X) elf_prot |= PROT_EXEC;</div><div class='del'>-	    vaddr = eppnt-&gt;p_vaddr;</div><div class='del'>-	    if (interp_elf_ex-&gt;e_type == ET_EXEC || load_addr_set)</div><div class='del'>-	    	elf_type |= MAP_FIXED;</div><div class='del'>-</div><div class='del'>-	    map_addr = elf_map(interpreter, load_addr + vaddr, eppnt, elf_prot, elf_type);</div><div class='del'>-	    error = map_addr;</div><div class='del'>-	    if (BAD_ADDR(map_addr))</div><div class='del'>-	    	goto out_close;</div><div class='del'>-</div><div class='del'>-	    if (!load_addr_set &amp;&amp; interp_elf_ex-&gt;e_type == ET_DYN) {</div><div class='del'>-		load_addr = map_addr - ELF_PAGESTART(vaddr);</div><div class='del'>-		load_addr_set = 1;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    /*</div><div class='del'>-	     * Check to see if the section's size will overflow the</div><div class='del'>-	     * allowed task size. Note that p_filesz must always be</div><div class='del'>-	     * &lt;= p_memsize so it is only necessary to check p_memsz.</div><div class='del'>-	     */</div><div class='del'>-	    k = load_addr + eppnt-&gt;p_vaddr;</div><div class='del'>-	    if (k &gt; TASK_SIZE || eppnt-&gt;p_filesz &gt; eppnt-&gt;p_memsz ||</div><div class='del'>-		eppnt-&gt;p_memsz &gt; TASK_SIZE || TASK_SIZE - eppnt-&gt;p_memsz &lt; k) {</div><div class='del'>-	        error = -ENOMEM;</div><div class='del'>-		goto out_close;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    /*</div><div class='del'>-	     * Find the end of the file mapping for this phdr, and keep</div><div class='del'>-	     * track of the largest address we see for this.</div><div class='del'>-	     */</div><div class='del'>-	    k = load_addr + eppnt-&gt;p_vaddr + eppnt-&gt;p_filesz;</div><div class='del'>-	    if (k &gt; elf_bss)</div><div class='del'>-		elf_bss = k;</div><div class='del'>-</div><div class='del'>-	    /*</div><div class='del'>-	     * Do the same thing for the memory mapping - between</div><div class='del'>-	     * elf_bss and last_bss is the bss section.</div><div class='del'>-	     */</div><div class='del'>-	    k = load_addr + eppnt-&gt;p_memsz + eppnt-&gt;p_vaddr;</div><div class='del'>-	    if (k &gt; last_bss)</div><div class='del'>-		last_bss = k;</div><div class='del'>-	  }</div><div class='add'>+	for (i = 0; i &lt; interp_elf_ex-&gt;e_phnum; i++, eppnt++) {</div><div class='add'>+		if (eppnt-&gt;p_type == PT_LOAD) {</div><div class='add'>+			int elf_type = MAP_PRIVATE | MAP_DENYWRITE;</div><div class='add'>+			int elf_prot = 0;</div><div class='add'>+			unsigned long vaddr = 0;</div><div class='add'>+			unsigned long k, map_addr;</div><div class='add'>+</div><div class='add'>+			if (eppnt-&gt;p_flags &amp; PF_R)</div><div class='add'>+		    		elf_prot = PROT_READ;</div><div class='add'>+			if (eppnt-&gt;p_flags &amp; PF_W)</div><div class='add'>+				elf_prot |= PROT_WRITE;</div><div class='add'>+			if (eppnt-&gt;p_flags &amp; PF_X)</div><div class='add'>+				elf_prot |= PROT_EXEC;</div><div class='add'>+			vaddr = eppnt-&gt;p_vaddr;</div><div class='add'>+			if (interp_elf_ex-&gt;e_type == ET_EXEC || load_addr_set)</div><div class='add'>+				elf_type |= MAP_FIXED;</div><div class='add'>+</div><div class='add'>+			map_addr = elf_map(interpreter, load_addr + vaddr,</div><div class='add'>+					   eppnt, elf_prot, elf_type);</div><div class='add'>+			error = map_addr;</div><div class='add'>+			if (BAD_ADDR(map_addr))</div><div class='add'>+				goto out_close;</div><div class='add'>+</div><div class='add'>+			if (!load_addr_set &amp;&amp;</div><div class='add'>+			    interp_elf_ex-&gt;e_type == ET_DYN) {</div><div class='add'>+				load_addr = map_addr - ELF_PAGESTART(vaddr);</div><div class='add'>+				load_addr_set = 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Check to see if the section's size will overflow the</div><div class='add'>+			 * allowed task size. Note that p_filesz must always be</div><div class='add'>+			 * &lt;= p_memsize so it's only necessary to check p_memsz.</div><div class='add'>+			 */</div><div class='add'>+			k = load_addr + eppnt-&gt;p_vaddr;</div><div class='add'>+			if (BAD_ADDR(k) ||</div><div class='add'>+			    eppnt-&gt;p_filesz &gt; eppnt-&gt;p_memsz ||</div><div class='add'>+			    eppnt-&gt;p_memsz &gt; TASK_SIZE ||</div><div class='add'>+			    TASK_SIZE - eppnt-&gt;p_memsz &lt; k) {</div><div class='add'>+				error = -ENOMEM;</div><div class='add'>+				goto out_close;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Find the end of the file mapping for this phdr, and</div><div class='add'>+			 * keep track of the largest address we see for this.</div><div class='add'>+			 */</div><div class='add'>+			k = load_addr + eppnt-&gt;p_vaddr + eppnt-&gt;p_filesz;</div><div class='add'>+			if (k &gt; elf_bss)</div><div class='add'>+				elf_bss = k;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Do the same thing for the memory mapping - between</div><div class='add'>+			 * elf_bss and last_bss is the bss section.</div><div class='add'>+			 */</div><div class='add'>+			k = load_addr + eppnt-&gt;p_memsz + eppnt-&gt;p_vaddr;</div><div class='add'>+			if (k &gt; last_bss)</div><div class='add'>+				last_bss = k;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -424,7 +431,8 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);	/* What we have mapped so far */</div><div class='add'>+	/* What we have mapped so far */</div><div class='add'>+	elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Map the last of the bss segment */</div><div class='ctx'> 	if (last_bss &gt; elf_bss) {</div><div class='hunk'>@@ -436,7 +444,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*interp_load_addr = load_addr;</div><div class='del'>-	error = ((unsigned long) interp_elf_ex-&gt;e_entry) + load_addr;</div><div class='add'>+	error = ((unsigned long)interp_elf_ex-&gt;e_entry) + load_addr;</div><div class='ctx'> </div><div class='ctx'> out_close:</div><div class='ctx'> 	kfree(elf_phdata);</div><div class='hunk'>@@ -444,8 +452,8 @@ out:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long load_aout_interp(struct exec * interp_ex,</div><div class='del'>-			     struct file * interpreter)</div><div class='add'>+static unsigned long load_aout_interp(struct exec *interp_ex,</div><div class='add'>+		struct file *interpreter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long text_data, elf_entry = ~0UL;</div><div class='ctx'> 	char __user * addr;</div><div class='hunk'>@@ -464,7 +472,7 @@ static unsigned long load_aout_interp(struct exec * interp_ex,</div><div class='ctx'> 	case ZMAGIC:</div><div class='ctx'> 	case QMAGIC:</div><div class='ctx'> 		offset = N_TXTOFF(*interp_ex);</div><div class='del'>-		addr = (char __user *) N_TXTADDR(*interp_ex);</div><div class='add'>+		addr = (char __user *)N_TXTADDR(*interp_ex);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -480,7 +488,6 @@ static unsigned long load_aout_interp(struct exec * interp_ex,</div><div class='ctx'> 	flush_icache_range((unsigned long)addr,</div><div class='ctx'> 	                   (unsigned long)addr + text_data);</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	down_write(&amp;current-&gt;mm-&gt;mmap_sem);	</div><div class='ctx'> 	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),</div><div class='ctx'> 		interp_ex-&gt;a_bss);</div><div class='hunk'>@@ -519,7 +526,7 @@ static unsigned long randomize_stack_top(unsigned long stack_top)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='add'>+static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct file *interpreter = NULL; /* to shut gcc up */</div><div class='ctx'>  	unsigned long load_addr = 0, load_bias = 0;</div><div class='hunk'>@@ -528,7 +535,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 	unsigned int interpreter_type = INTERPRETER_NONE;</div><div class='ctx'> 	unsigned char ibcs2_interpreter = 0;</div><div class='ctx'> 	unsigned long error;</div><div class='del'>-	struct elf_phdr * elf_ppnt, *elf_phdata;</div><div class='add'>+	struct elf_phdr *elf_ppnt, *elf_phdata;</div><div class='ctx'> 	unsigned long elf_bss, elf_brk;</div><div class='ctx'> 	int elf_exec_fileno;</div><div class='ctx'> 	int retval, i;</div><div class='hunk'>@@ -553,7 +560,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* Get the exec-header */</div><div class='del'>-	loc-&gt;elf_ex = *((struct elfhdr *) bprm-&gt;buf);</div><div class='add'>+	loc-&gt;elf_ex = *((struct elfhdr *)bprm-&gt;buf);</div><div class='ctx'> </div><div class='ctx'> 	retval = -ENOEXEC;</div><div class='ctx'> 	/* First of all, some simple consistency checks */</div><div class='hunk'>@@ -568,7 +575,6 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Now read in all of the header information */</div><div class='del'>-</div><div class='ctx'> 	if (loc-&gt;elf_ex.e_phentsize != sizeof(struct elf_phdr))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (loc-&gt;elf_ex.e_phnum &lt; 1 ||</div><div class='hunk'>@@ -576,18 +582,19 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	size = loc-&gt;elf_ex.e_phnum * sizeof(struct elf_phdr);</div><div class='ctx'> 	retval = -ENOMEM;</div><div class='del'>-	elf_phdata = (struct elf_phdr *) kmalloc(size, GFP_KERNEL);</div><div class='add'>+	elf_phdata = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!elf_phdata)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	retval = kernel_read(bprm-&gt;file, loc-&gt;elf_ex.e_phoff, (char *) elf_phdata, size);</div><div class='add'>+	retval = kernel_read(bprm-&gt;file, loc-&gt;elf_ex.e_phoff,</div><div class='add'>+			     (char *)elf_phdata, size);</div><div class='ctx'> 	if (retval != size) {</div><div class='ctx'> 		if (retval &gt;= 0)</div><div class='ctx'> 			retval = -EIO;</div><div class='ctx'> 		goto out_free_ph;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	files = current-&gt;files;		/* Refcounted so ok */</div><div class='add'>+	files = current-&gt;files;	/* Refcounted so ok */</div><div class='ctx'> 	retval = unshare_files();</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto out_free_ph;</div><div class='hunk'>@@ -598,7 +605,6 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	/* exec will make our files private anyway, but for the a.out</div><div class='ctx'> 	   loader stuff we need to do it earlier */</div><div class='del'>-</div><div class='ctx'> 	retval = get_unused_fd();</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto out_free_fh;</div><div class='hunk'>@@ -620,7 +626,6 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 			 * shared libraries - for now assume that this</div><div class='ctx'> 			 * is an a.out format binary</div><div class='ctx'> 			 */</div><div class='del'>-</div><div class='ctx'> 			retval = -ENOEXEC;</div><div class='ctx'> 			if (elf_ppnt-&gt;p_filesz &gt; PATH_MAX || </div><div class='ctx'> 			    elf_ppnt-&gt;p_filesz &lt; 2)</div><div class='hunk'>@@ -628,13 +633,13 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 			retval = -ENOMEM;</div><div class='ctx'> 			elf_interpreter = kmalloc(elf_ppnt-&gt;p_filesz,</div><div class='del'>-							   GFP_KERNEL);</div><div class='add'>+						  GFP_KERNEL);</div><div class='ctx'> 			if (!elf_interpreter)</div><div class='ctx'> 				goto out_free_file;</div><div class='ctx'> </div><div class='ctx'> 			retval = kernel_read(bprm-&gt;file, elf_ppnt-&gt;p_offset,</div><div class='del'>-					   elf_interpreter,</div><div class='del'>-					   elf_ppnt-&gt;p_filesz);</div><div class='add'>+					     elf_interpreter,</div><div class='add'>+					     elf_ppnt-&gt;p_filesz);</div><div class='ctx'> 			if (retval != elf_ppnt-&gt;p_filesz) {</div><div class='ctx'> 				if (retval &gt;= 0)</div><div class='ctx'> 					retval = -EIO;</div><div class='hunk'>@@ -678,7 +683,8 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 			retval = PTR_ERR(interpreter);</div><div class='ctx'> 			if (IS_ERR(interpreter))</div><div class='ctx'> 				goto out_free_interp;</div><div class='del'>-			retval = kernel_read(interpreter, 0, bprm-&gt;buf, BINPRM_BUF_SIZE);</div><div class='add'>+			retval = kernel_read(interpreter, 0, bprm-&gt;buf,</div><div class='add'>+					     BINPRM_BUF_SIZE);</div><div class='ctx'> 			if (retval != BINPRM_BUF_SIZE) {</div><div class='ctx'> 				if (retval &gt;= 0)</div><div class='ctx'> 					retval = -EIO;</div><div class='hunk'>@@ -686,8 +692,8 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Get the exec headers */</div><div class='del'>-			loc-&gt;interp_ex = *((struct exec *) bprm-&gt;buf);</div><div class='del'>-			loc-&gt;interp_elf_ex = *((struct elfhdr *) bprm-&gt;buf);</div><div class='add'>+			loc-&gt;interp_ex = *((struct exec *)bprm-&gt;buf);</div><div class='add'>+			loc-&gt;interp_elf_ex = *((struct elfhdr *)bprm-&gt;buf);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		elf_ppnt++;</div><div class='hunk'>@@ -739,7 +745,6 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	/* OK, we are done with that, now set up the arg stuff,</div><div class='ctx'> 	   and then start this sucker up */</div><div class='del'>-</div><div class='ctx'> 	if ((!bprm-&gt;sh_bang) &amp;&amp; (interpreter_type == INTERPRETER_AOUT)) {</div><div class='ctx'> 		char *passed_p = passed_fileno;</div><div class='ctx'> 		sprintf(passed_fileno, "%d", elf_exec_fileno);</div><div class='hunk'>@@ -759,7 +764,6 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	/* Discard our unneeded old files struct */</div><div class='ctx'> 	if (files) {</div><div class='del'>-		steal_locks(files);</div><div class='ctx'> 		put_files_struct(files);</div><div class='ctx'> 		files = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -778,7 +782,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 	if (elf_read_implies_exec(loc-&gt;elf_ex, executable_stack))</div><div class='ctx'> 		current-&gt;personality |= READ_IMPLIES_EXEC;</div><div class='ctx'> </div><div class='del'>-	if ( !(current-&gt;personality &amp; ADDR_NO_RANDOMIZE) &amp;&amp; randomize_va_space)</div><div class='add'>+	if (!(current-&gt;personality &amp; ADDR_NO_RANDOMIZE) &amp;&amp; randomize_va_space)</div><div class='ctx'> 		current-&gt;flags |= PF_RANDOMIZE;</div><div class='ctx'> 	arch_pick_mmap_layout(current-&gt;mm);</div><div class='ctx'> </div><div class='hunk'>@@ -799,8 +803,8 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 	   the correct location in memory.  At this point, we assume that</div><div class='ctx'> 	   the image should be loaded at fixed address, not at a variable</div><div class='ctx'> 	   address. */</div><div class='del'>-</div><div class='del'>-	for(i = 0, elf_ppnt = elf_phdata; i &lt; loc-&gt;elf_ex.e_phnum; i++, elf_ppnt++) {</div><div class='add'>+	for(i = 0, elf_ppnt = elf_phdata;</div><div class='add'>+	    i &lt; loc-&gt;elf_ex.e_phnum; i++, elf_ppnt++) {</div><div class='ctx'> 		int elf_prot = 0, elf_flags;</div><div class='ctx'> 		unsigned long k, vaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -828,30 +832,35 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 							load_bias, nbyte)) {</div><div class='ctx'> 					/*</div><div class='ctx'> 					 * This bss-zeroing can fail if the ELF</div><div class='del'>-					 * file specifies odd protections.  So</div><div class='add'>+					 * file specifies odd protections. So</div><div class='ctx'> 					 * we don't check the return value</div><div class='ctx'> 					 */</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (elf_ppnt-&gt;p_flags &amp; PF_R) elf_prot |= PROT_READ;</div><div class='del'>-		if (elf_ppnt-&gt;p_flags &amp; PF_W) elf_prot |= PROT_WRITE;</div><div class='del'>-		if (elf_ppnt-&gt;p_flags &amp; PF_X) elf_prot |= PROT_EXEC;</div><div class='add'>+		if (elf_ppnt-&gt;p_flags &amp; PF_R)</div><div class='add'>+			elf_prot |= PROT_READ;</div><div class='add'>+		if (elf_ppnt-&gt;p_flags &amp; PF_W)</div><div class='add'>+			elf_prot |= PROT_WRITE;</div><div class='add'>+		if (elf_ppnt-&gt;p_flags &amp; PF_X)</div><div class='add'>+			elf_prot |= PROT_EXEC;</div><div class='ctx'> </div><div class='del'>-		elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE;</div><div class='add'>+		elf_flags = MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE;</div><div class='ctx'> </div><div class='ctx'> 		vaddr = elf_ppnt-&gt;p_vaddr;</div><div class='ctx'> 		if (loc-&gt;elf_ex.e_type == ET_EXEC || load_addr_set) {</div><div class='ctx'> 			elf_flags |= MAP_FIXED;</div><div class='ctx'> 		} else if (loc-&gt;elf_ex.e_type == ET_DYN) {</div><div class='del'>-			/* Try and get dynamic programs out of the way of the default mmap</div><div class='del'>-			   base, as well as whatever program they might try to exec.  This</div><div class='del'>-			   is because the brk will follow the loader, and is not movable.  */</div><div class='add'>+			/* Try and get dynamic programs out of the way of the</div><div class='add'>+			 * default mmap base, as well as whatever program they</div><div class='add'>+			 * might try to exec.  This is because the brk will</div><div class='add'>+			 * follow the loader, and is not movable.  */</div><div class='ctx'> 			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		error = elf_map(bprm-&gt;file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);</div><div class='add'>+		error = elf_map(bprm-&gt;file, load_bias + vaddr, elf_ppnt,</div><div class='add'>+				elf_prot, elf_flags);</div><div class='ctx'> 		if (BAD_ADDR(error)) {</div><div class='ctx'> 			send_sig(SIGKILL, current, 0);</div><div class='ctx'> 			goto out_free_dentry;</div><div class='hunk'>@@ -868,18 +877,20 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		k = elf_ppnt-&gt;p_vaddr;</div><div class='del'>-		if (k &lt; start_code) start_code = k;</div><div class='del'>-		if (start_data &lt; k) start_data = k;</div><div class='add'>+		if (k &lt; start_code)</div><div class='add'>+			start_code = k;</div><div class='add'>+		if (start_data &lt; k)</div><div class='add'>+			start_data = k;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Check to see if the section's size will overflow the</div><div class='ctx'> 		 * allowed task size. Note that p_filesz must always be</div><div class='ctx'> 		 * &lt;= p_memsz so it is only necessary to check p_memsz.</div><div class='ctx'> 		 */</div><div class='del'>-		if (k &gt; TASK_SIZE || elf_ppnt-&gt;p_filesz &gt; elf_ppnt-&gt;p_memsz ||</div><div class='add'>+		if (BAD_ADDR(k) || elf_ppnt-&gt;p_filesz &gt; elf_ppnt-&gt;p_memsz ||</div><div class='ctx'> 		    elf_ppnt-&gt;p_memsz &gt; TASK_SIZE ||</div><div class='ctx'> 		    TASK_SIZE - elf_ppnt-&gt;p_memsz &lt; k) {</div><div class='del'>-			/* set_brk can never work.  Avoid overflows.  */</div><div class='add'>+			/* set_brk can never work. Avoid overflows. */</div><div class='ctx'> 			send_sig(SIGKILL, current, 0);</div><div class='ctx'> 			goto out_free_dentry;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -930,10 +941,9 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 						    interpreter,</div><div class='ctx'> 						    &amp;interp_load_addr);</div><div class='ctx'> 		if (BAD_ADDR(elf_entry)) {</div><div class='del'>-			printk(KERN_ERR "Unable to load interpreter %.128s\n",</div><div class='del'>-				elf_interpreter);</div><div class='ctx'> 			force_sig(SIGSEGV, current);</div><div class='del'>-			retval = -ENOEXEC; /* Nobody gets to see this, but.. */</div><div class='add'>+			retval = IS_ERR((void *)elf_entry) ?</div><div class='add'>+					(int)elf_entry : -EINVAL;</div><div class='ctx'> 			goto out_free_dentry;</div><div class='ctx'> 		}</div><div class='ctx'> 		reloc_func_desc = interp_load_addr;</div><div class='hunk'>@@ -944,8 +954,8 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		elf_entry = loc-&gt;elf_ex.e_entry;</div><div class='ctx'> 		if (BAD_ADDR(elf_entry)) {</div><div class='del'>-			send_sig(SIGSEGV, current, 0);</div><div class='del'>-			retval = -ENOEXEC; /* Nobody gets to see this, but.. */</div><div class='add'>+			force_sig(SIGSEGV, current);</div><div class='add'>+			retval = -EINVAL;</div><div class='ctx'> 			goto out_free_dentry;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -967,8 +977,9 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> </div><div class='ctx'> 	compute_creds(bprm);</div><div class='ctx'> 	current-&gt;flags &amp;= ~PF_FORKNOEXEC;</div><div class='del'>-	create_elf_tables(bprm, &amp;loc-&gt;elf_ex, (interpreter_type == INTERPRETER_AOUT),</div><div class='del'>-			load_addr, interp_load_addr);</div><div class='add'>+	create_elf_tables(bprm, &amp;loc-&gt;elf_ex,</div><div class='add'>+			  (interpreter_type == INTERPRETER_AOUT),</div><div class='add'>+			  load_addr, interp_load_addr);</div><div class='ctx'> 	/* N.B. passed_fileno might not be initialized? */</div><div class='ctx'> 	if (interpreter_type == INTERPRETER_AOUT)</div><div class='ctx'> 		current-&gt;mm-&gt;arg_start += strlen(passed_fileno) + 1;</div><div class='hunk'>@@ -982,7 +993,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs)</div><div class='ctx'> 		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,</div><div class='ctx'> 		   and some applications "depend" upon this behavior.</div><div class='ctx'> 		   Since we do not have the power to recompile these, we</div><div class='del'>-		   emulate the SVr4 behavior.  Sigh.  */</div><div class='add'>+		   emulate the SVr4 behavior. Sigh. */</div><div class='ctx'> 		down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 		error = do_mmap(NULL, 0, PAGE_SIZE, PROT_READ | PROT_EXEC,</div><div class='ctx'> 				MAP_FIXED | MAP_PRIVATE, 0);</div><div class='hunk'>@@ -1037,7 +1048,6 @@ out_free_ph:</div><div class='ctx'> </div><div class='ctx'> /* This is really simpleminded and specialized - we are loading an</div><div class='ctx'>    a.out library that is given an ELF header. */</div><div class='del'>-</div><div class='ctx'> static int load_elf_library(struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct elf_phdr *elf_phdata;</div><div class='hunk'>@@ -1047,7 +1057,7 @@ static int load_elf_library(struct file *file)</div><div class='ctx'> 	struct elfhdr elf_ex;</div><div class='ctx'> </div><div class='ctx'> 	error = -ENOEXEC;</div><div class='del'>-	retval = kernel_read(file, 0, (char *) &amp;elf_ex, sizeof(elf_ex));</div><div class='add'>+	retval = kernel_read(file, 0, (char *)&amp;elf_ex, sizeof(elf_ex));</div><div class='ctx'> 	if (retval != sizeof(elf_ex))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +1066,7 @@ static int load_elf_library(struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	/* First of all, some simple consistency checks */</div><div class='ctx'> 	if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum &gt; 2 ||</div><div class='del'>-	   !elf_check_arch(&amp;elf_ex) || !file-&gt;f_op || !file-&gt;f_op-&gt;mmap)</div><div class='add'>+	    !elf_check_arch(&amp;elf_ex) || !file-&gt;f_op || !file-&gt;f_op-&gt;mmap)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Now read in all of the header information */</div><div class='hunk'>@@ -1104,7 +1114,8 @@ static int load_elf_library(struct file *file)</div><div class='ctx'> 		goto out_free_ph;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len = ELF_PAGESTART(eppnt-&gt;p_filesz + eppnt-&gt;p_vaddr + ELF_MIN_ALIGN - 1);</div><div class='add'>+	len = ELF_PAGESTART(eppnt-&gt;p_filesz + eppnt-&gt;p_vaddr +</div><div class='add'>+			    ELF_MIN_ALIGN - 1);</div><div class='ctx'> 	bss = eppnt-&gt;p_memsz + eppnt-&gt;p_vaddr;</div><div class='ctx'> 	if (bss &gt; len) {</div><div class='ctx'> 		down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='hunk'>@@ -1163,7 +1174,7 @@ static int maydump(struct vm_area_struct *vma)</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; (VM_IO | VM_RESERVED))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* Dump shared memory only if mapped from an anonymous file.  */</div><div class='add'>+	/* Dump shared memory only if mapped from an anonymous file. */</div><div class='ctx'> 	if (vma-&gt;vm_flags &amp; VM_SHARED)</div><div class='ctx'> 		return vma-&gt;vm_file-&gt;f_dentry-&gt;d_inode-&gt;i_nlink == 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1174,8 +1185,6 @@ static int maydump(struct vm_area_struct *vma)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define roundup(x, y)  ((((x)+((y)-1))/(y))*(y))</div><div class='del'>-</div><div class='ctx'> /* An ELF note in memory */</div><div class='ctx'> struct memelfnote</div><div class='ctx'> {</div><div class='hunk'>@@ -1277,11 +1286,11 @@ static void fill_note(struct memelfnote *note, const char *name, int type,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * fill up all the fields in prstatus from the given task struct, except registers</div><div class='del'>- * which need to be filled up separately.</div><div class='add'>+ * fill up all the fields in prstatus from the given task struct, except</div><div class='add'>+ * registers which need to be filled up separately.</div><div class='ctx'>  */</div><div class='ctx'> static void fill_prstatus(struct elf_prstatus *prstatus,</div><div class='del'>-			struct task_struct *p, long signr) </div><div class='add'>+		struct task_struct *p, long signr)</div><div class='ctx'> {</div><div class='ctx'> 	prstatus-&gt;pr_info.si_signo = prstatus-&gt;pr_cursig = signr;</div><div class='ctx'> 	prstatus-&gt;pr_sigpend = p-&gt;pending.signal.sig[0];</div><div class='hunk'>@@ -1366,8 +1375,8 @@ struct elf_thread_status</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * In order to add the specific thread information for the elf file format,</div><div class='del'>- * we need to keep a linked list of every threads pr_status and then</div><div class='del'>- * create a single section for them in the final core file.</div><div class='add'>+ * we need to keep a linked list of every threads pr_status and then create</div><div class='add'>+ * a single section for them in the final core file.</div><div class='ctx'>  */</div><div class='ctx'> static int elf_dump_thread_status(long signr, struct elf_thread_status *t)</div><div class='ctx'> {</div><div class='hunk'>@@ -1378,19 +1387,23 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t)</div><div class='ctx'> 	fill_prstatus(&amp;t-&gt;prstatus, p, signr);</div><div class='ctx'> 	elf_core_copy_task_regs(p, &amp;t-&gt;prstatus.pr_reg);	</div><div class='ctx'> 	</div><div class='del'>-	fill_note(&amp;t-&gt;notes[0], "CORE", NT_PRSTATUS, sizeof(t-&gt;prstatus), &amp;(t-&gt;prstatus));</div><div class='add'>+	fill_note(&amp;t-&gt;notes[0], "CORE", NT_PRSTATUS, sizeof(t-&gt;prstatus),</div><div class='add'>+		  &amp;(t-&gt;prstatus));</div><div class='ctx'> 	t-&gt;num_notes++;</div><div class='ctx'> 	sz += notesize(&amp;t-&gt;notes[0]);</div><div class='ctx'> </div><div class='del'>-	if ((t-&gt;prstatus.pr_fpvalid = elf_core_copy_task_fpregs(p, NULL, &amp;t-&gt;fpu))) {</div><div class='del'>-		fill_note(&amp;t-&gt;notes[1], "CORE", NT_PRFPREG, sizeof(t-&gt;fpu), &amp;(t-&gt;fpu));</div><div class='add'>+	if ((t-&gt;prstatus.pr_fpvalid = elf_core_copy_task_fpregs(p, NULL,</div><div class='add'>+								&amp;t-&gt;fpu))) {</div><div class='add'>+		fill_note(&amp;t-&gt;notes[1], "CORE", NT_PRFPREG, sizeof(t-&gt;fpu),</div><div class='add'>+			  &amp;(t-&gt;fpu));</div><div class='ctx'> 		t-&gt;num_notes++;</div><div class='ctx'> 		sz += notesize(&amp;t-&gt;notes[1]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef ELF_CORE_COPY_XFPREGS</div><div class='ctx'> 	if (elf_core_copy_task_xfpregs(p, &amp;t-&gt;xfpu)) {</div><div class='del'>-		fill_note(&amp;t-&gt;notes[2], "LINUX", NT_PRXFPREG, sizeof(t-&gt;xfpu), &amp;t-&gt;xfpu);</div><div class='add'>+		fill_note(&amp;t-&gt;notes[2], "LINUX", NT_PRXFPREG, sizeof(t-&gt;xfpu),</div><div class='add'>+			  &amp;t-&gt;xfpu);</div><div class='ctx'> 		t-&gt;num_notes++;</div><div class='ctx'> 		sz += notesize(&amp;t-&gt;notes[2]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1405,7 +1418,7 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t)</div><div class='ctx'>  * and then they are actually written out.  If we run out of core limit</div><div class='ctx'>  * we just truncate.</div><div class='ctx'>  */</div><div class='del'>-static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='add'>+static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> #define	NUM_NOTES	6</div><div class='ctx'> 	int has_dumped = 0;</div><div class='hunk'>@@ -1434,12 +1447,12 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We no longer stop all VM operations.</div><div class='ctx'> 	 * </div><div class='del'>-	 * This is because those proceses that could possibly change map_count or</div><div class='del'>-	 * the mmap / vma pages are now blocked in do_exit on current finishing</div><div class='del'>-	 * this core dump.</div><div class='add'>+	 * This is because those proceses that could possibly change map_count</div><div class='add'>+	 * or the mmap / vma pages are now blocked in do_exit on current</div><div class='add'>+	 * finishing this core dump.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Only ptrace can touch these memory addresses, but it doesn't change</div><div class='del'>-	 * the map_count or the pages allocated.  So no possibility of crashing</div><div class='add'>+	 * the map_count or the pages allocated. So no possibility of crashing</div><div class='ctx'> 	 * exists while dumping the mm-&gt;vm_next areas to the core file.</div><div class='ctx'> 	 */</div><div class='ctx'>   </div><div class='hunk'>@@ -1501,7 +1514,7 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Set up header */</div><div class='del'>-	fill_elf_header(elf, segs+1);	/* including notes section */</div><div class='add'>+	fill_elf_header(elf, segs + 1);	/* including notes section */</div><div class='ctx'> </div><div class='ctx'> 	has_dumped = 1;</div><div class='ctx'> 	current-&gt;flags |= PF_DUMPCORE;</div><div class='hunk'>@@ -1511,24 +1524,24 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> 	 * with info from their /proc.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	fill_note(notes +0, "CORE", NT_PRSTATUS, sizeof(*prstatus), prstatus);</div><div class='del'>-	</div><div class='add'>+	fill_note(notes + 0, "CORE", NT_PRSTATUS, sizeof(*prstatus), prstatus);</div><div class='ctx'> 	fill_psinfo(psinfo, current-&gt;group_leader, current-&gt;mm);</div><div class='del'>-	fill_note(notes +1, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='add'>+	fill_note(notes + 1, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='ctx'> 	</div><div class='ctx'> 	numnote = 2;</div><div class='ctx'> </div><div class='del'>-	auxv = (elf_addr_t *) current-&gt;mm-&gt;saved_auxv;</div><div class='add'>+	auxv = (elf_addr_t *)current-&gt;mm-&gt;saved_auxv;</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='ctx'> 	do</div><div class='ctx'> 		i += 2;</div><div class='ctx'> 	while (auxv[i - 2] != AT_NULL);</div><div class='ctx'> 	fill_note(&amp;notes[numnote++], "CORE", NT_AUXV,</div><div class='del'>-		  i * sizeof (elf_addr_t), auxv);</div><div class='add'>+		  i * sizeof(elf_addr_t), auxv);</div><div class='ctx'> </div><div class='ctx'>   	/* Try to dump the FPU. */</div><div class='del'>-	if ((prstatus-&gt;pr_fpvalid = elf_core_copy_task_fpregs(current, regs, fpu)))</div><div class='add'>+	if ((prstatus-&gt;pr_fpvalid =</div><div class='add'>+	     elf_core_copy_task_fpregs(current, regs, fpu)))</div><div class='ctx'> 		fill_note(notes + numnote++,</div><div class='ctx'> 			  "CORE", NT_PRFPREG, sizeof(*fpu), fpu);</div><div class='ctx'> #ifdef ELF_CORE_COPY_XFPREGS</div><div class='hunk'>@@ -1577,8 +1590,10 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> 		phdr.p_memsz = sz;</div><div class='ctx'> 		offset += phdr.p_filesz;</div><div class='ctx'> 		phdr.p_flags = vma-&gt;vm_flags &amp; VM_READ ? PF_R : 0;</div><div class='del'>-		if (vma-&gt;vm_flags &amp; VM_WRITE) phdr.p_flags |= PF_W;</div><div class='del'>-		if (vma-&gt;vm_flags &amp; VM_EXEC) phdr.p_flags |= PF_X;</div><div class='add'>+		if (vma-&gt;vm_flags &amp; VM_WRITE)</div><div class='add'>+			phdr.p_flags |= PF_W;</div><div class='add'>+		if (vma-&gt;vm_flags &amp; VM_EXEC)</div><div class='add'>+			phdr.p_flags |= PF_X;</div><div class='ctx'> 		phdr.p_align = ELF_EXEC_PAGESIZE;</div><div class='ctx'> </div><div class='ctx'> 		DUMP_WRITE(&amp;phdr, sizeof(phdr));</div><div class='hunk'>@@ -1595,7 +1610,9 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> </div><div class='ctx'> 	/* write out the thread status notes section */</div><div class='ctx'> 	list_for_each(t, &amp;thread_list) {</div><div class='del'>-		struct elf_thread_status *tmp = list_entry(t, struct elf_thread_status, list);</div><div class='add'>+		struct elf_thread_status *tmp =</div><div class='add'>+				list_entry(t, struct elf_thread_status, list);</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; tmp-&gt;num_notes; i++)</div><div class='ctx'> 			if (!writenote(&amp;tmp-&gt;notes[i], file))</div><div class='ctx'> 				goto end_coredump;</div><div class='hunk'>@@ -1612,18 +1629,19 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> 		for (addr = vma-&gt;vm_start;</div><div class='ctx'> 		     addr &lt; vma-&gt;vm_end;</div><div class='ctx'> 		     addr += PAGE_SIZE) {</div><div class='del'>-			struct page* page;</div><div class='add'>+			struct page *page;</div><div class='ctx'> 			struct vm_area_struct *vma;</div><div class='ctx'> </div><div class='ctx'> 			if (get_user_pages(current, current-&gt;mm, addr, 1, 0, 1,</div><div class='ctx'> 						&amp;page, &amp;vma) &lt;= 0) {</div><div class='del'>-				DUMP_SEEK (file-&gt;f_pos + PAGE_SIZE);</div><div class='add'>+				DUMP_SEEK(file-&gt;f_pos + PAGE_SIZE);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (page == ZERO_PAGE(addr)) {</div><div class='del'>-					DUMP_SEEK (file-&gt;f_pos + PAGE_SIZE);</div><div class='add'>+					DUMP_SEEK(file-&gt;f_pos + PAGE_SIZE);</div><div class='ctx'> 				} else {</div><div class='ctx'> 					void *kaddr;</div><div class='del'>-					flush_cache_page(vma, addr, page_to_pfn(page));</div><div class='add'>+					flush_cache_page(vma, addr,</div><div class='add'>+							 page_to_pfn(page));</div><div class='ctx'> 					kaddr = kmap(page);</div><div class='ctx'> 					if ((size += PAGE_SIZE) &gt; limit ||</div><div class='ctx'> 					    !dump_write(file, kaddr,</div><div class='hunk'>@@ -1645,7 +1663,8 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)</div><div class='ctx'> </div><div class='ctx'> 	if ((off_t)file-&gt;f_pos != offset) {</div><div class='ctx'> 		/* Sanity check */</div><div class='del'>-		printk(KERN_WARNING "elf_core_dump: file-&gt;f_pos (%ld) != offset (%ld)\n",</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "elf_core_dump: file-&gt;f_pos (%ld) != offset (%ld)\n",</div><div class='ctx'> 		       (off_t)file-&gt;f_pos, offset);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c<br/>index a2e48c999c24..2f3365829229 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/binfmt_elf_fdpic.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_elf_fdpic.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/binfmt_elf_fdpic.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/binfmt_elf_fdpic.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* binfmt_elf_fdpic.c: FDPIC ELF binary format</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003, 2004 Red Hat, Inc. All Rights Reserved.</div><div class='add'>+ * Copyright (C) 2003, 2004, 2006 Red Hat, Inc. All Rights Reserved.</div><div class='ctx'>  * Written by David Howells (dhowells@redhat.com)</div><div class='ctx'>  * Derived from binfmt_elf.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -24,7 +24,9 @@</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/highuid.h&gt;</div><div class='ctx'> #include &lt;linux/personality.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -48,45 +50,59 @@ typedef char *elf_caddr_t;</div><div class='ctx'> #define kdebug(fmt, ...) do {} while(0)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='add'>+#define kdcore(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ )</div><div class='add'>+#else</div><div class='add'>+#define kdcore(fmt, ...) do {} while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs);</div><div class='del'>-//static int load_elf_fdpic_library(struct file *);</div><div class='del'>-static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *file);</div><div class='del'>-static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='del'>-			      struct file *file,</div><div class='del'>-			      struct mm_struct *mm,</div><div class='del'>-			      const char *what);</div><div class='add'>+static int load_elf_fdpic_binary(struct linux_binprm *, struct pt_regs *);</div><div class='add'>+static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *, struct file *);</div><div class='add'>+static int elf_fdpic_map_file(struct elf_fdpic_params *, struct file *,</div><div class='add'>+			      struct mm_struct *, const char *);</div><div class='ctx'> </div><div class='del'>-static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='del'>-				   struct mm_struct *mm,</div><div class='del'>-				   struct elf_fdpic_params *exec_params,</div><div class='del'>-				   struct elf_fdpic_params *interp_params);</div><div class='add'>+static int create_elf_fdpic_tables(struct linux_binprm *, struct mm_struct *,</div><div class='add'>+				   struct elf_fdpic_params *,</div><div class='add'>+				   struct elf_fdpic_params *);</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='del'>-static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm, unsigned long *_sp);</div><div class='del'>-static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *params,</div><div class='del'>-						   struct file *file,</div><div class='del'>-						   struct mm_struct *mm);</div><div class='add'>+static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *,</div><div class='add'>+					    unsigned long *);</div><div class='add'>+static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *,</div><div class='add'>+						   struct file *,</div><div class='add'>+						   struct mm_struct *);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='del'>-					     struct file *file,</div><div class='del'>-					     struct mm_struct *mm);</div><div class='add'>+static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *,</div><div class='add'>+					     struct file *, struct mm_struct *);</div><div class='add'>+</div><div class='add'>+#if defined(USE_ELF_CORE_DUMP) &amp;&amp; defined(CONFIG_ELF_CORE)</div><div class='add'>+static int elf_fdpic_core_dump(long, struct pt_regs *, struct file *);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct linux_binfmt elf_fdpic_format = {</div><div class='ctx'> 	.module		= THIS_MODULE,</div><div class='ctx'> 	.load_binary	= load_elf_fdpic_binary,</div><div class='del'>-//	.load_shlib	= load_elf_fdpic_library,</div><div class='del'>-//	.core_dump	= elf_fdpic_core_dump,</div><div class='add'>+#if defined(USE_ELF_CORE_DUMP) &amp;&amp; defined(CONFIG_ELF_CORE)</div><div class='add'>+	.core_dump	= elf_fdpic_core_dump,</div><div class='add'>+#endif</div><div class='ctx'> 	.min_coredump	= ELF_EXEC_PAGESIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init init_elf_fdpic_binfmt(void)  { return register_binfmt(&amp;elf_fdpic_format); }</div><div class='del'>-static void __exit exit_elf_fdpic_binfmt(void) { unregister_binfmt(&amp;elf_fdpic_format); }</div><div class='add'>+static int __init init_elf_fdpic_binfmt(void)</div><div class='add'>+{</div><div class='add'>+	return register_binfmt(&amp;elf_fdpic_format);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit exit_elf_fdpic_binfmt(void)</div><div class='add'>+{</div><div class='add'>+	unregister_binfmt(&amp;elf_fdpic_format);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-module_init(init_elf_fdpic_binfmt)</div><div class='del'>-module_exit(exit_elf_fdpic_binfmt)</div><div class='add'>+core_initcall(init_elf_fdpic_binfmt);</div><div class='add'>+module_exit(exit_elf_fdpic_binfmt);</div><div class='ctx'> </div><div class='ctx'> static int is_elf_fdpic(struct elfhdr *hdr, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -105,7 +121,8 @@ static int is_elf_fdpic(struct elfhdr *hdr, struct file *file)</div><div class='ctx'> /*</div><div class='ctx'>  * read the program headers table into memory</div><div class='ctx'>  */</div><div class='del'>-static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *file)</div><div class='add'>+static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params,</div><div class='add'>+				 struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct elf32_phdr *phdr;</div><div class='ctx'> 	unsigned long size;</div><div class='hunk'>@@ -121,7 +138,8 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *f</div><div class='ctx'> 	if (!params-&gt;phdrs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	retval = kernel_read(file, params-&gt;hdr.e_phoff, (char *) params-&gt;phdrs, size);</div><div class='add'>+	retval = kernel_read(file, params-&gt;hdr.e_phoff,</div><div class='add'>+			     (char *) params-&gt;phdrs, size);</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -141,17 +159,24 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *f</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-} /* end elf_fdpic_fetch_phdrs() */</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * load an fdpic binary into various bits of memory</div><div class='ctx'>  */</div><div class='del'>-static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='add'>+static int load_elf_fdpic_binary(struct linux_binprm *bprm,</div><div class='add'>+				 struct pt_regs *regs)</div><div class='ctx'> {</div><div class='ctx'> 	struct elf_fdpic_params exec_params, interp_params;</div><div class='ctx'> 	struct elf_phdr *phdr;</div><div class='del'>-	unsigned long stack_size;</div><div class='add'>+	unsigned long stack_size, entryaddr;</div><div class='add'>+#ifndef CONFIG_MMU</div><div class='add'>+	unsigned long fullsize;</div><div class='add'>+#endif</div><div class='add'>+#ifdef ELF_FDPIC_PLAT_INIT</div><div class='add'>+	unsigned long dynaddr;</div><div class='add'>+#endif</div><div class='ctx'> 	struct file *interpreter = NULL; /* to shut gcc up */</div><div class='ctx'> 	char *interpreter_name = NULL;</div><div class='ctx'> 	int executable_stack;</div><div class='hunk'>@@ -212,7 +237,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs</div><div class='ctx'> 				goto error;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			retval = kernel_read(interpreter, 0, bprm-&gt;buf, BINPRM_BUF_SIZE);</div><div class='add'>+			retval = kernel_read(interpreter, 0, bprm-&gt;buf,</div><div class='add'>+					     BINPRM_BUF_SIZE);</div><div class='ctx'> 			if (retval &lt; 0)</div><div class='ctx'> 				goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +321,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs</div><div class='ctx'> 				  &amp;current-&gt;mm-&gt;start_stack,</div><div class='ctx'> 				  &amp;current-&gt;mm-&gt;start_brk);</div><div class='ctx'> </div><div class='del'>-	retval = setup_arg_pages(bprm, current-&gt;mm-&gt;start_stack, executable_stack);</div><div class='add'>+	retval = setup_arg_pages(bprm, current-&gt;mm-&gt;start_stack,</div><div class='add'>+				 executable_stack);</div><div class='ctx'> 	if (retval &lt; 0) {</div><div class='ctx'> 		send_sig(SIGKILL, current, 0);</div><div class='ctx'> 		goto error_kill;</div><div class='hunk'>@@ -303,7 +330,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* load the executable and interpreter into memory */</div><div class='del'>-	retval = elf_fdpic_map_file(&amp;exec_params, bprm-&gt;file, current-&gt;mm, "executable");</div><div class='add'>+	retval = elf_fdpic_map_file(&amp;exec_params, bprm-&gt;file, current-&gt;mm,</div><div class='add'>+				    "executable");</div><div class='ctx'> 	if (retval &lt; 0)</div><div class='ctx'> 		goto error_kill;</div><div class='ctx'> </div><div class='hunk'>@@ -324,7 +352,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs</div><div class='ctx'> 	if (!current-&gt;mm-&gt;start_brk)</div><div class='ctx'> 		current-&gt;mm-&gt;start_brk = current-&gt;mm-&gt;end_data;</div><div class='ctx'> </div><div class='del'>-	current-&gt;mm-&gt;brk = current-&gt;mm-&gt;start_brk = PAGE_ALIGN(current-&gt;mm-&gt;start_brk);</div><div class='add'>+	current-&gt;mm-&gt;brk = current-&gt;mm-&gt;start_brk =</div><div class='add'>+		PAGE_ALIGN(current-&gt;mm-&gt;start_brk);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> 	/* create a stack and brk area big enough for everyone</div><div class='hunk'>@@ -336,47 +365,45 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs</div><div class='ctx'> 		stack_size = PAGE_SIZE * 2;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-	current-&gt;mm-&gt;start_brk = do_mmap(NULL,</div><div class='del'>-					 0,</div><div class='del'>-					 stack_size,</div><div class='add'>+	current-&gt;mm-&gt;start_brk = do_mmap(NULL, 0, stack_size,</div><div class='ctx'> 					 PROT_READ | PROT_WRITE | PROT_EXEC,</div><div class='ctx'> 					 MAP_PRIVATE | MAP_ANON | MAP_GROWSDOWN,</div><div class='ctx'> 					 0);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR((void *) current-&gt;mm-&gt;start_brk)) {</div><div class='add'>+	if (IS_ERR_VALUE(current-&gt;mm-&gt;start_brk)) {</div><div class='ctx'> 		up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> 		retval = current-&gt;mm-&gt;start_brk;</div><div class='ctx'> 		current-&gt;mm-&gt;start_brk = 0;</div><div class='ctx'> 		goto error_kill;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (do_mremap(current-&gt;mm-&gt;start_brk,</div><div class='del'>-		      stack_size,</div><div class='del'>-		      ksize((char *) current-&gt;mm-&gt;start_brk),</div><div class='del'>-		      0, 0</div><div class='del'>-		      ) == current-&gt;mm-&gt;start_brk</div><div class='del'>-	    )</div><div class='del'>-		stack_size = ksize((char *) current-&gt;mm-&gt;start_brk);</div><div class='add'>+	/* expand the stack mapping to use up the entire allocation granule */</div><div class='add'>+	fullsize = ksize((char *) current-&gt;mm-&gt;start_brk);</div><div class='add'>+	if (!IS_ERR_VALUE(do_mremap(current-&gt;mm-&gt;start_brk, stack_size,</div><div class='add'>+				    fullsize, 0, 0)))</div><div class='add'>+		stack_size = fullsize;</div><div class='ctx'> 	up_write(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;mm-&gt;brk = current-&gt;mm-&gt;start_brk;</div><div class='ctx'> 	current-&gt;mm-&gt;context.end_brk = current-&gt;mm-&gt;start_brk;</div><div class='del'>-	current-&gt;mm-&gt;context.end_brk += (stack_size &gt; PAGE_SIZE) ? (stack_size - PAGE_SIZE) : 0;</div><div class='add'>+	current-&gt;mm-&gt;context.end_brk +=</div><div class='add'>+		(stack_size &gt; PAGE_SIZE) ? (stack_size - PAGE_SIZE) : 0;</div><div class='ctx'> 	current-&gt;mm-&gt;start_stack = current-&gt;mm-&gt;start_brk + stack_size;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	compute_creds(bprm);</div><div class='ctx'> 	current-&gt;flags &amp;= ~PF_FORKNOEXEC;</div><div class='del'>-	if (create_elf_fdpic_tables(bprm, current-&gt;mm, &amp;exec_params, &amp;interp_params) &lt; 0)</div><div class='add'>+	if (create_elf_fdpic_tables(bprm, current-&gt;mm,</div><div class='add'>+				    &amp;exec_params, &amp;interp_params) &lt; 0)</div><div class='ctx'> 		goto error_kill;</div><div class='ctx'> </div><div class='del'>-	kdebug("- start_code  %lx",	(long) current-&gt;mm-&gt;start_code);</div><div class='del'>-	kdebug("- end_code    %lx",	(long) current-&gt;mm-&gt;end_code);</div><div class='del'>-	kdebug("- start_data  %lx",	(long) current-&gt;mm-&gt;start_data);</div><div class='del'>-	kdebug("- end_data    %lx",	(long) current-&gt;mm-&gt;end_data);</div><div class='del'>-	kdebug("- start_brk   %lx",	(long) current-&gt;mm-&gt;start_brk);</div><div class='del'>-	kdebug("- brk         %lx",	(long) current-&gt;mm-&gt;brk);</div><div class='del'>-	kdebug("- start_stack %lx",	(long) current-&gt;mm-&gt;start_stack);</div><div class='add'>+	kdebug("- start_code  %lx", current-&gt;mm-&gt;start_code);</div><div class='add'>+	kdebug("- end_code    %lx", current-&gt;mm-&gt;end_code);</div><div class='add'>+	kdebug("- start_data  %lx", current-&gt;mm-&gt;start_data);</div><div class='add'>+	kdebug("- end_data    %lx", current-&gt;mm-&gt;end_data);</div><div class='add'>+	kdebug("- start_brk   %lx", current-&gt;mm-&gt;start_brk);</div><div class='add'>+	kdebug("- brk         %lx", current-&gt;mm-&gt;brk);</div><div class='add'>+	kdebug("- start_stack %lx", current-&gt;mm-&gt;start_stack);</div><div class='ctx'> </div><div class='ctx'> #ifdef ELF_FDPIC_PLAT_INIT</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -385,21 +412,18 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs</div><div class='ctx'> 	 * example.  This macro performs whatever initialization to</div><div class='ctx'> 	 * the regs structure is required.</div><div class='ctx'> 	 */</div><div class='del'>-	ELF_FDPIC_PLAT_INIT(regs,</div><div class='del'>-			    exec_params.map_addr,</div><div class='del'>-			    interp_params.map_addr,</div><div class='del'>-			    interp_params.dynamic_addr ?: exec_params.dynamic_addr</div><div class='del'>-			    );</div><div class='add'>+	dynaddr = interp_params.dynamic_addr ?: exec_params.dynamic_addr;</div><div class='add'>+	ELF_FDPIC_PLAT_INIT(regs, exec_params.map_addr, interp_params.map_addr,</div><div class='add'>+			    dynaddr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* everything is now ready... get the userspace context ready to roll */</div><div class='del'>-	start_thread(regs,</div><div class='del'>-		     interp_params.entry_addr ?: exec_params.entry_addr,</div><div class='del'>-		     current-&gt;mm-&gt;start_stack);</div><div class='add'>+	entryaddr = interp_params.entry_addr ?: exec_params.entry_addr;</div><div class='add'>+	start_thread(regs, entryaddr, current-&gt;mm-&gt;start_stack);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(current-&gt;ptrace &amp; PT_PTRACED)) {</div><div class='ctx'> 		if (current-&gt;ptrace &amp; PT_TRACE_EXEC)</div><div class='del'>-			ptrace_notify ((PTRACE_EVENT_EXEC &lt;&lt; 8) | SIGTRAP);</div><div class='add'>+			ptrace_notify((PTRACE_EVENT_EXEC &lt;&lt; 8) | SIGTRAP);</div><div class='ctx'> 		else</div><div class='ctx'> 			send_sig(SIGTRAP, current, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -419,11 +443,11 @@ error:</div><div class='ctx'> 	return retval;</div><div class='ctx'> </div><div class='ctx'> 	/* unrecoverable error - kill the process */</div><div class='del'>- error_kill:</div><div class='add'>+error_kill:</div><div class='ctx'> 	send_sig(SIGSEGV, current, 0);</div><div class='ctx'> 	goto error;</div><div class='ctx'> </div><div class='del'>-} /* end load_elf_fdpic_binary() */</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='hunk'>@@ -435,9 +459,10 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 				   struct elf_fdpic_params *interp_params)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long sp, csp, nitems;</div><div class='del'>-	elf_caddr_t *argv, *envp;</div><div class='add'>+	elf_caddr_t __user *argv, *envp;</div><div class='ctx'> 	size_t platform_len = 0, len;</div><div class='del'>-	char *k_platform, *u_platform, *p;</div><div class='add'>+	char *k_platform;</div><div class='add'>+	char __user *u_platform, *p;</div><div class='ctx'> 	long hwcap;</div><div class='ctx'> 	int loop;</div><div class='ctx'> </div><div class='hunk'>@@ -458,23 +483,23 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	 */</div><div class='ctx'> 	hwcap = ELF_HWCAP;</div><div class='ctx'> 	k_platform = ELF_PLATFORM;</div><div class='add'>+	u_platform = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (k_platform) {</div><div class='ctx'> 		platform_len = strlen(k_platform) + 1;</div><div class='ctx'> 		sp -= platform_len;</div><div class='add'>+		u_platform = (char __user *) sp;</div><div class='ctx'> 		if (__copy_to_user(u_platform, k_platform, platform_len) != 0)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	u_platform = (char *) sp;</div><div class='del'>-</div><div class='ctx'> #if defined(__i386__) &amp;&amp; defined(CONFIG_SMP)</div><div class='ctx'> 	/* in some cases (e.g. Hyper-Threading), we want to avoid L1 evictions</div><div class='del'>-	 * by the processes running on the same package. One thing we can do</div><div class='del'>-	 * is to shuffle the initial stack for them.</div><div class='add'>+	 * by the processes running on the same package. One thing we can do is</div><div class='add'>+	 * to shuffle the initial stack for them.</div><div class='ctx'> 	 *</div><div class='del'>-	 * the conditionals here are unneeded, but kept in to make the</div><div class='del'>-	 * code behaviour the same as pre change unless we have hyperthreaded</div><div class='add'>+	 * the conditionals here are unneeded, but kept in to make the code</div><div class='add'>+	 * behaviour the same as pre change unless we have hyperthreaded</div><div class='ctx'> 	 * processors. This keeps Mr Marcelo Person happier but should be</div><div class='ctx'> 	 * removed for 2.5</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -490,18 +515,20 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	sp = (sp - len) &amp; ~7UL;</div><div class='ctx'> 	exec_params-&gt;map_addr = sp;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user((void *) sp, exec_params-&gt;loadmap, len) != 0)</div><div class='add'>+	if (copy_to_user((void __user *) sp, exec_params-&gt;loadmap, len) != 0)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;mm-&gt;context.exec_fdpic_loadmap = (unsigned long) sp;</div><div class='ctx'> </div><div class='ctx'> 	if (interp_params-&gt;loadmap) {</div><div class='ctx'> 		len = sizeof(struct elf32_fdpic_loadmap);</div><div class='del'>-		len += sizeof(struct elf32_fdpic_loadseg) * interp_params-&gt;loadmap-&gt;nsegs;</div><div class='add'>+		len += sizeof(struct elf32_fdpic_loadseg) *</div><div class='add'>+			interp_params-&gt;loadmap-&gt;nsegs;</div><div class='ctx'> 		sp = (sp - len) &amp; ~7UL;</div><div class='ctx'> 		interp_params-&gt;map_addr = sp;</div><div class='ctx'> </div><div class='del'>-		if (copy_to_user((void *) sp, interp_params-&gt;loadmap, len) != 0)</div><div class='add'>+		if (copy_to_user((void __user *) sp, interp_params-&gt;loadmap,</div><div class='add'>+				 len) != 0)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		current-&gt;mm-&gt;context.interp_fdpic_loadmap = (unsigned long) sp;</div><div class='hunk'>@@ -525,34 +552,37 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> 	sp -= sp &amp; 15UL;</div><div class='ctx'> </div><div class='ctx'> 	/* put the ELF interpreter info on the stack */</div><div class='del'>-#define NEW_AUX_ENT(nr, id, val)						\</div><div class='del'>-	do {									\</div><div class='del'>-		struct { unsigned long _id, _val; } *ent = (void *) csp;	\</div><div class='del'>-		__put_user((id), &amp;ent[nr]._id);					\</div><div class='del'>-		__put_user((val), &amp;ent[nr]._val);				\</div><div class='add'>+#define NEW_AUX_ENT(nr, id, val)					\</div><div class='add'>+	do {								\</div><div class='add'>+		struct { unsigned long _id, _val; } __user *ent;	\</div><div class='add'>+									\</div><div class='add'>+		ent = (void __user *) csp;				\</div><div class='add'>+		__put_user((id), &amp;ent[nr]._id);				\</div><div class='add'>+		__put_user((val), &amp;ent[nr]._val);			\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> 	csp -= 2 * sizeof(unsigned long);</div><div class='ctx'> 	NEW_AUX_ENT(0, AT_NULL, 0);</div><div class='ctx'> 	if (k_platform) {</div><div class='ctx'> 		csp -= 2 * sizeof(unsigned long);</div><div class='del'>-		NEW_AUX_ENT(0, AT_PLATFORM, (elf_addr_t)(unsigned long) u_platform);</div><div class='add'>+		NEW_AUX_ENT(0, AT_PLATFORM,</div><div class='add'>+			    (elf_addr_t) (unsigned long) u_platform);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);</div><div class='del'>-	NEW_AUX_ENT( 0, AT_HWCAP,		hwcap);</div><div class='del'>-	NEW_AUX_ENT( 1, AT_PAGESZ,		PAGE_SIZE);</div><div class='del'>-	NEW_AUX_ENT( 2, AT_CLKTCK,		CLOCKS_PER_SEC);</div><div class='del'>-	NEW_AUX_ENT( 3, AT_PHDR,		exec_params-&gt;ph_addr);</div><div class='del'>-	NEW_AUX_ENT( 4, AT_PHENT,		sizeof(struct elf_phdr));</div><div class='del'>-	NEW_AUX_ENT( 5, AT_PHNUM,		exec_params-&gt;hdr.e_phnum);</div><div class='del'>-	NEW_AUX_ENT( 6,	AT_BASE,		interp_params-&gt;elfhdr_addr);</div><div class='del'>-	NEW_AUX_ENT( 7, AT_FLAGS,		0);</div><div class='del'>-	NEW_AUX_ENT( 8, AT_ENTRY,		exec_params-&gt;entry_addr);</div><div class='del'>-	NEW_AUX_ENT( 9, AT_UID,			(elf_addr_t) current-&gt;uid);</div><div class='del'>-	NEW_AUX_ENT(10, AT_EUID,		(elf_addr_t) current-&gt;euid);</div><div class='del'>-	NEW_AUX_ENT(11, AT_GID,			(elf_addr_t) current-&gt;gid);</div><div class='del'>-	NEW_AUX_ENT(12, AT_EGID,		(elf_addr_t) current-&gt;egid);</div><div class='add'>+	NEW_AUX_ENT( 0, AT_HWCAP,	hwcap);</div><div class='add'>+	NEW_AUX_ENT( 1, AT_PAGESZ,	PAGE_SIZE);</div><div class='add'>+	NEW_AUX_ENT( 2, AT_CLKTCK,	CLOCKS_PER_SEC);</div><div class='add'>+	NEW_AUX_ENT( 3, AT_PHDR,	exec_params-&gt;ph_addr);</div><div class='add'>+	NEW_AUX_ENT( 4, AT_PHENT,	sizeof(struct elf_phdr));</div><div class='add'>+	NEW_AUX_ENT( 5, AT_PHNUM,	exec_params-&gt;hdr.e_phnum);</div><div class='add'>+	NEW_AUX_ENT( 6,	AT_BASE,	interp_params-&gt;elfhdr_addr);</div><div class='add'>+	NEW_AUX_ENT( 7, AT_FLAGS,	0);</div><div class='add'>+	NEW_AUX_ENT( 8, AT_ENTRY,	exec_params-&gt;entry_addr);</div><div class='add'>+	NEW_AUX_ENT( 9, AT_UID,		(elf_addr_t) current-&gt;uid);</div><div class='add'>+	NEW_AUX_ENT(10, AT_EUID,	(elf_addr_t) current-&gt;euid);</div><div class='add'>+	NEW_AUX_ENT(11, AT_GID,		(elf_addr_t) current-&gt;gid);</div><div class='add'>+	NEW_AUX_ENT(12, AT_EGID,	(elf_addr_t) current-&gt;egid);</div><div class='ctx'> </div><div class='ctx'> #ifdef ARCH_DLINFO</div><div class='ctx'> 	/* ARCH_DLINFO must come last so platform specific code can enforce</div><div class='hunk'>@@ -564,13 +594,13 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> </div><div class='ctx'> 	/* allocate room for argv[] and envv[] */</div><div class='ctx'> 	csp -= (bprm-&gt;envc + 1) * sizeof(elf_caddr_t);</div><div class='del'>-	envp = (elf_caddr_t *) csp;</div><div class='add'>+	envp = (elf_caddr_t __user *) csp;</div><div class='ctx'> 	csp -= (bprm-&gt;argc + 1) * sizeof(elf_caddr_t);</div><div class='del'>-	argv = (elf_caddr_t *) csp;</div><div class='add'>+	argv = (elf_caddr_t __user *) csp;</div><div class='ctx'> </div><div class='ctx'> 	/* stack argc */</div><div class='ctx'> 	csp -= sizeof(unsigned long);</div><div class='del'>-	__put_user(bprm-&gt;argc, (unsigned long *) csp);</div><div class='add'>+	__put_user(bprm-&gt;argc, (unsigned long __user *) csp);</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(csp != sp);</div><div class='ctx'> </div><div class='hunk'>@@ -578,10 +608,11 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	current-&gt;mm-&gt;arg_start = bprm-&gt;p;</div><div class='ctx'> #else</div><div class='del'>-	current-&gt;mm-&gt;arg_start = current-&gt;mm-&gt;start_stack - (MAX_ARG_PAGES * PAGE_SIZE - bprm-&gt;p);</div><div class='add'>+	current-&gt;mm-&gt;arg_start = current-&gt;mm-&gt;start_stack -</div><div class='add'>+		(MAX_ARG_PAGES * PAGE_SIZE - bprm-&gt;p);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	p = (char *) current-&gt;mm-&gt;arg_start;</div><div class='add'>+	p = (char __user *) current-&gt;mm-&gt;arg_start;</div><div class='ctx'> 	for (loop = bprm-&gt;argc; loop &gt; 0; loop--) {</div><div class='ctx'> 		__put_user((elf_caddr_t) p, argv++);</div><div class='ctx'> 		len = strnlen_user(p, PAGE_SIZE * MAX_ARG_PAGES);</div><div class='hunk'>@@ -606,7 +637,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'> </div><div class='ctx'> 	mm-&gt;start_stack = (unsigned long) sp;</div><div class='ctx'> 	return 0;</div><div class='del'>-} /* end create_elf_fdpic_tables() */</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='hunk'>@@ -614,7 +645,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,</div><div class='ctx'>  * the stack</div><div class='ctx'>  */</div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='del'>-static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm, unsigned long *_sp)</div><div class='add'>+static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm,</div><div class='add'>+					    unsigned long *_sp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long index, stop, sp;</div><div class='ctx'> 	char *src;</div><div class='hunk'>@@ -635,9 +667,9 @@ static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm, unsigned</div><div class='ctx'> </div><div class='ctx'> 	*_sp = (*_sp - (MAX_ARG_PAGES * PAGE_SIZE - bprm-&gt;p)) &amp; ~15;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='add'>+out:</div><div class='ctx'> 	return ret;</div><div class='del'>-} /* end elf_fdpic_transfer_args_to_stack() */</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -712,17 +744,18 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='ctx'> 		seg = loadmap-&gt;segs;</div><div class='ctx'> 		for (loop = loadmap-&gt;nsegs; loop &gt; 0; loop--, seg++) {</div><div class='ctx'> 			if (params-&gt;hdr.e_entry &gt;= seg-&gt;p_vaddr &amp;&amp;</div><div class='del'>-			    params-&gt;hdr.e_entry &lt; seg-&gt;p_vaddr + seg-&gt;p_memsz</div><div class='del'>-			    ) {</div><div class='add'>+			    params-&gt;hdr.e_entry &lt; seg-&gt;p_vaddr + seg-&gt;p_memsz) {</div><div class='ctx'> 				params-&gt;entry_addr =</div><div class='del'>-					(params-&gt;hdr.e_entry - seg-&gt;p_vaddr) + seg-&gt;addr;</div><div class='add'>+					(params-&gt;hdr.e_entry - seg-&gt;p_vaddr) +</div><div class='add'>+					seg-&gt;addr;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* determine where the program header table has wound up if mapped */</div><div class='del'>-	stop = params-&gt;hdr.e_phoff + params-&gt;hdr.e_phnum * sizeof (struct elf_phdr);</div><div class='add'>+	stop = params-&gt;hdr.e_phoff;</div><div class='add'>+	stop += params-&gt;hdr.e_phnum * sizeof (struct elf_phdr);</div><div class='ctx'> 	phdr = params-&gt;phdrs;</div><div class='ctx'> </div><div class='ctx'> 	for (loop = 0; loop &lt; params-&gt;hdr.e_phnum; loop++, phdr++) {</div><div class='hunk'>@@ -736,9 +769,11 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='ctx'> 		seg = loadmap-&gt;segs;</div><div class='ctx'> 		for (loop = loadmap-&gt;nsegs; loop &gt; 0; loop--, seg++) {</div><div class='ctx'> 			if (phdr-&gt;p_vaddr &gt;= seg-&gt;p_vaddr &amp;&amp;</div><div class='del'>-			    phdr-&gt;p_vaddr + phdr-&gt;p_filesz &lt;= seg-&gt;p_vaddr + seg-&gt;p_memsz</div><div class='del'>-			    ) {</div><div class='del'>-				params-&gt;ph_addr = (phdr-&gt;p_vaddr - seg-&gt;p_vaddr) + seg-&gt;addr +</div><div class='add'>+			    phdr-&gt;p_vaddr + phdr-&gt;p_filesz &lt;=</div><div class='add'>+			    seg-&gt;p_vaddr + seg-&gt;p_memsz) {</div><div class='add'>+				params-&gt;ph_addr =</div><div class='add'>+					(phdr-&gt;p_vaddr - seg-&gt;p_vaddr) +</div><div class='add'>+					seg-&gt;addr +</div><div class='ctx'> 					params-&gt;hdr.e_phoff - phdr-&gt;p_offset;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -755,18 +790,22 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='ctx'> 		seg = loadmap-&gt;segs;</div><div class='ctx'> 		for (loop = loadmap-&gt;nsegs; loop &gt; 0; loop--, seg++) {</div><div class='ctx'> 			if (phdr-&gt;p_vaddr &gt;= seg-&gt;p_vaddr &amp;&amp;</div><div class='del'>-			    phdr-&gt;p_vaddr + phdr-&gt;p_memsz &lt;= seg-&gt;p_vaddr + seg-&gt;p_memsz</div><div class='del'>-			    ) {</div><div class='del'>-				params-&gt;dynamic_addr = (phdr-&gt;p_vaddr - seg-&gt;p_vaddr) + seg-&gt;addr;</div><div class='del'>-</div><div class='del'>-				/* check the dynamic section contains at least one item, and that</div><div class='del'>-				 * the last item is a NULL entry */</div><div class='add'>+			    phdr-&gt;p_vaddr + phdr-&gt;p_memsz &lt;=</div><div class='add'>+			    seg-&gt;p_vaddr + seg-&gt;p_memsz) {</div><div class='add'>+				params-&gt;dynamic_addr =</div><div class='add'>+					(phdr-&gt;p_vaddr - seg-&gt;p_vaddr) +</div><div class='add'>+					seg-&gt;addr;</div><div class='add'>+</div><div class='add'>+				/* check the dynamic section contains at least</div><div class='add'>+				 * one item, and that the last item is a NULL</div><div class='add'>+				 * entry */</div><div class='ctx'> 				if (phdr-&gt;p_memsz == 0 ||</div><div class='ctx'> 				    phdr-&gt;p_memsz % sizeof(Elf32_Dyn) != 0)</div><div class='ctx'> 					goto dynamic_error;</div><div class='ctx'> </div><div class='ctx'> 				tmp = phdr-&gt;p_memsz / sizeof(Elf32_Dyn);</div><div class='del'>-				if (((Elf32_Dyn *) params-&gt;dynamic_addr)[tmp - 1].d_tag != 0)</div><div class='add'>+				if (((Elf32_Dyn *)</div><div class='add'>+				     params-&gt;dynamic_addr)[tmp - 1].d_tag != 0)</div><div class='ctx'> 					goto dynamic_error;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -775,8 +814,8 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* now elide adjacent segments in the load map on MMU linux</div><div class='del'>-	 * - on uClinux the holes between may actually be filled with system stuff or stuff from</div><div class='del'>-	 *   other processes</div><div class='add'>+	 * - on uClinux the holes between may actually be filled with system</div><div class='add'>+	 *   stuff or stuff from other processes</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='ctx'> 	nloads = loadmap-&gt;nsegs;</div><div class='hunk'>@@ -787,7 +826,9 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='ctx'> 		if (seg-&gt;p_vaddr - mseg-&gt;p_vaddr == seg-&gt;addr - mseg-&gt;addr) {</div><div class='ctx'> 			load_addr = PAGE_ALIGN(mseg-&gt;addr + mseg-&gt;p_memsz);</div><div class='ctx'> 			if (load_addr == (seg-&gt;addr &amp; PAGE_MASK)) {</div><div class='del'>-				mseg-&gt;p_memsz += load_addr - (mseg-&gt;addr + mseg-&gt;p_memsz);</div><div class='add'>+				mseg-&gt;p_memsz +=</div><div class='add'>+					load_addr -</div><div class='add'>+					(mseg-&gt;addr + mseg-&gt;p_memsz);</div><div class='ctx'> 				mseg-&gt;p_memsz += seg-&gt;addr &amp; ~PAGE_MASK;</div><div class='ctx'> 				mseg-&gt;p_memsz += seg-&gt;p_memsz;</div><div class='ctx'> 				loadmap-&gt;nsegs--;</div><div class='hunk'>@@ -815,20 +856,21 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- dynamic_error:</div><div class='add'>+dynamic_error:</div><div class='ctx'> 	printk("ELF FDPIC %s with invalid DYNAMIC section (inode=%lu)\n",</div><div class='ctx'> 	       what, file-&gt;f_dentry-&gt;d_inode-&gt;i_ino);</div><div class='ctx'> 	return -ELIBBAD;</div><div class='del'>-} /* end elf_fdpic_map_file() */</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*</div><div class='ctx'>  * map a file with constant displacement under uClinux</div><div class='ctx'>  */</div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='del'>-static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *params,</div><div class='del'>-						   struct file *file,</div><div class='del'>-						   struct mm_struct *mm)</div><div class='add'>+static int elf_fdpic_map_file_constdisp_on_uclinux(</div><div class='add'>+	struct elf_fdpic_params *params,</div><div class='add'>+	struct file *file,</div><div class='add'>+	struct mm_struct *mm)</div><div class='ctx'> {</div><div class='ctx'> 	struct elf32_fdpic_loadseg *seg;</div><div class='ctx'> 	struct elf32_phdr *phdr;</div><div class='hunk'>@@ -839,7 +881,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para</div><div class='ctx'> 	load_addr = params-&gt;load_addr;</div><div class='ctx'> 	seg = params-&gt;loadmap-&gt;segs;</div><div class='ctx'> </div><div class='del'>-	/* determine the bounds of the contiguous overall allocation we must make */</div><div class='add'>+	/* determine the bounds of the contiguous overall allocation we must</div><div class='add'>+	 * make */</div><div class='ctx'> 	phdr = params-&gt;phdrs;</div><div class='ctx'> 	for (loop = 0; loop &lt; params-&gt;hdr.e_phnum; loop++, phdr++) {</div><div class='ctx'> 		if (params-&gt;phdrs[loop].p_type != PT_LOAD)</div><div class='hunk'>@@ -860,7 +903,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para</div><div class='ctx'> 	maddr = do_mmap(NULL, load_addr, top - base,</div><div class='ctx'> 			PROT_READ | PROT_WRITE | PROT_EXEC, mflags, 0);</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-	if (IS_ERR((void *) maddr))</div><div class='add'>+	if (IS_ERR_VALUE(maddr))</div><div class='ctx'> 		return (int) maddr;</div><div class='ctx'> </div><div class='ctx'> 	if (load_addr != 0)</div><div class='hunk'>@@ -878,7 +921,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para</div><div class='ctx'> 		seg-&gt;p_vaddr = phdr-&gt;p_vaddr;</div><div class='ctx'> 		seg-&gt;p_memsz = phdr-&gt;p_memsz;</div><div class='ctx'> </div><div class='del'>-		ret = file-&gt;f_op-&gt;read(file, (void *) seg-&gt;addr, phdr-&gt;p_filesz, &amp;fpos);</div><div class='add'>+		ret = file-&gt;f_op-&gt;read(file, (void *) seg-&gt;addr,</div><div class='add'>+				       phdr-&gt;p_filesz, &amp;fpos);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -895,8 +939,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para</div><div class='ctx'> 			if (phdr-&gt;p_flags &amp; PF_X) {</div><div class='ctx'> 				mm-&gt;start_code = seg-&gt;addr;</div><div class='ctx'> 				mm-&gt;end_code = seg-&gt;addr + phdr-&gt;p_memsz;</div><div class='del'>-			}</div><div class='del'>-			else if (!mm-&gt;start_data) {</div><div class='add'>+			} else if (!mm-&gt;start_data) {</div><div class='ctx'> 				mm-&gt;start_data = seg-&gt;addr;</div><div class='ctx'> #ifndef CONFIG_MMU</div><div class='ctx'> 				mm-&gt;end_data = seg-&gt;addr + phdr-&gt;p_memsz;</div><div class='hunk'>@@ -913,7 +956,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-} /* end elf_fdpic_map_file_constdisp_on_uclinux() */</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -974,14 +1017,14 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> </div><div class='ctx'> 		case ELF_FDPIC_FLAG_CONSTDISP:</div><div class='ctx'> 			/* constant displacement</div><div class='del'>-			 * - can be mapped anywhere, but must be mapped as a unit</div><div class='add'>+			 * - can be mapped anywhere, but must be mapped as a</div><div class='add'>+			 *   unit</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!dvset) {</div><div class='ctx'> 				maddr = load_addr;</div><div class='ctx'> 				delta_vaddr = phdr-&gt;p_vaddr;</div><div class='ctx'> 				dvset = 1;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='add'>+			} else {</div><div class='ctx'> 				maddr = load_addr + phdr-&gt;p_vaddr - delta_vaddr;</div><div class='ctx'> 				flags |= MAP_FIXED;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1005,13 +1048,14 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 		up_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 		kdebug("mmap[%d] &lt;file&gt; sz=%lx pr=%x fl=%x of=%lx --&gt; %08lx",</div><div class='del'>-		       loop, phdr-&gt;p_memsz + disp, prot, flags, phdr-&gt;p_offset - disp,</div><div class='del'>-		       maddr);</div><div class='add'>+		       loop, phdr-&gt;p_memsz + disp, prot, flags,</div><div class='add'>+		       phdr-&gt;p_offset - disp, maddr);</div><div class='ctx'> </div><div class='del'>-		if (IS_ERR((void *) maddr))</div><div class='add'>+		if (IS_ERR_VALUE(maddr))</div><div class='ctx'> 			return (int) maddr;</div><div class='ctx'> </div><div class='del'>-		if ((params-&gt;flags &amp; ELF_FDPIC_FLAG_ARRANGEMENT) == ELF_FDPIC_FLAG_CONTIGUOUS)</div><div class='add'>+		if ((params-&gt;flags &amp; ELF_FDPIC_FLAG_ARRANGEMENT) ==</div><div class='add'>+		    ELF_FDPIC_FLAG_CONTIGUOUS)</div><div class='ctx'> 			load_addr += PAGE_ALIGN(phdr-&gt;p_memsz + disp);</div><div class='ctx'> </div><div class='ctx'> 		seg-&gt;addr = maddr + disp;</div><div class='hunk'>@@ -1022,10 +1066,11 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 		if (phdr-&gt;p_offset == 0)</div><div class='ctx'> 			params-&gt;elfhdr_addr = seg-&gt;addr;</div><div class='ctx'> </div><div class='del'>-		/* clear the bit between beginning of mapping and beginning of PT_LOAD */</div><div class='add'>+		/* clear the bit between beginning of mapping and beginning of</div><div class='add'>+		 * PT_LOAD */</div><div class='ctx'> 		if (prot &amp; PROT_WRITE &amp;&amp; disp &gt; 0) {</div><div class='ctx'> 			kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp);</div><div class='del'>-			clear_user((void *) maddr, disp);</div><div class='add'>+			clear_user((void __user *) maddr, disp);</div><div class='ctx'> 			maddr += disp;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1038,19 +1083,20 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 		excess1 = PAGE_SIZE - ((maddr + phdr-&gt;p_filesz) &amp; ~PAGE_MASK);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MMU</div><div class='del'>-</div><div class='ctx'> 		if (excess &gt; excess1) {</div><div class='ctx'> 			unsigned long xaddr = maddr + phdr-&gt;p_filesz + excess1;</div><div class='ctx'> 			unsigned long xmaddr;</div><div class='ctx'> </div><div class='ctx'> 			flags |= MAP_FIXED | MAP_ANONYMOUS;</div><div class='ctx'> 			down_write(&amp;mm-&gt;mmap_sem);</div><div class='del'>-			xmaddr = do_mmap(NULL, xaddr, excess - excess1, prot, flags, 0);</div><div class='add'>+			xmaddr = do_mmap(NULL, xaddr, excess - excess1,</div><div class='add'>+					 prot, flags, 0);</div><div class='ctx'> 			up_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='ctx'> 			kdebug("mmap[%d] &lt;anon&gt;"</div><div class='ctx'> 			       " ad=%lx sz=%lx pr=%x fl=%x of=0 --&gt; %08lx",</div><div class='del'>-			       loop, xaddr, excess - excess1, prot, flags, xmaddr);</div><div class='add'>+			       loop, xaddr, excess - excess1, prot, flags,</div><div class='add'>+			       xmaddr);</div><div class='ctx'> </div><div class='ctx'> 			if (xmaddr != xaddr)</div><div class='ctx'> 				return -ENOMEM;</div><div class='hunk'>@@ -1059,7 +1105,8 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 		if (prot &amp; PROT_WRITE &amp;&amp; excess1 &gt; 0) {</div><div class='ctx'> 			kdebug("clear[%d] ad=%lx sz=%lx",</div><div class='ctx'> 			       loop, maddr + phdr-&gt;p_filesz, excess1);</div><div class='del'>-			clear_user((void *) maddr + phdr-&gt;p_filesz, excess1);</div><div class='add'>+			clear_user((void __user *) maddr + phdr-&gt;p_filesz,</div><div class='add'>+				   excess1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -1074,8 +1121,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 			if (phdr-&gt;p_flags &amp; PF_X) {</div><div class='ctx'> 				mm-&gt;start_code = maddr;</div><div class='ctx'> 				mm-&gt;end_code = maddr + phdr-&gt;p_memsz;</div><div class='del'>-			}</div><div class='del'>-			else if (!mm-&gt;start_data) {</div><div class='add'>+			} else if (!mm-&gt;start_data) {</div><div class='ctx'> 				mm-&gt;start_data = maddr;</div><div class='ctx'> 				mm-&gt;end_data = maddr + phdr-&gt;p_memsz;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1085,4 +1131,662 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-} /* end elf_fdpic_map_file_by_direct_mmap() */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ * ELF-FDPIC core dumper</div><div class='add'>+ *</div><div class='add'>+ * Modelled on fs/exec.c:aout_core_dump()</div><div class='add'>+ * Jeremy Fitzhardinge &lt;jeremy@sw.oz.au&gt;</div><div class='add'>+ *</div><div class='add'>+ * Modelled on fs/binfmt_elf.c core dumper</div><div class='add'>+ */</div><div class='add'>+#if defined(USE_ELF_CORE_DUMP) &amp;&amp; defined(CONFIG_ELF_CORE)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are the only things you should do on a core-file: use only these</div><div class='add'>+ * functions to write out all the necessary info.</div><div class='add'>+ */</div><div class='add'>+static int dump_write(struct file *file, const void *addr, int nr)</div><div class='add'>+{</div><div class='add'>+	return file-&gt;f_op-&gt;write(file, addr, nr, &amp;file-&gt;f_pos) == nr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dump_seek(struct file *file, loff_t off)</div><div class='add'>+{</div><div class='add'>+	if (file-&gt;f_op-&gt;llseek) {</div><div class='add'>+		if (file-&gt;f_op-&gt;llseek(file, off, SEEK_SET) != off)</div><div class='add'>+			return 0;</div><div class='add'>+	} else {</div><div class='add'>+		file-&gt;f_pos = off;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Decide whether a segment is worth dumping; default is yes to be</div><div class='add'>+ * sure (missing info is worse than too much; etc).</div><div class='add'>+ * Personally I'd include everything, and use the coredump limit...</div><div class='add'>+ *</div><div class='add'>+ * I think we should skip something. But I am not sure how. H.J.</div><div class='add'>+ */</div><div class='add'>+static int maydump(struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	/* Do not dump I/O mapped devices or special mappings */</div><div class='add'>+	if (vma-&gt;vm_flags &amp; (VM_IO | VM_RESERVED)) {</div><div class='add'>+		kdcore("%08lx: %08lx: no (IO)", vma-&gt;vm_start, vma-&gt;vm_flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we may not read the contents, don't allow us to dump</div><div class='add'>+	 * them either. "dump_write()" can't handle it anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (!(vma-&gt;vm_flags &amp; VM_READ)) {</div><div class='add'>+		kdcore("%08lx: %08lx: no (!read)", vma-&gt;vm_start, vma-&gt;vm_flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Dump shared memory only if mapped from an anonymous file. */</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_SHARED) {</div><div class='add'>+		if (vma-&gt;vm_file-&gt;f_dentry-&gt;d_inode-&gt;i_nlink == 0) {</div><div class='add'>+			kdcore("%08lx: %08lx: no (share)", vma-&gt;vm_start, vma-&gt;vm_flags);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kdcore("%08lx: %08lx: no (share)", vma-&gt;vm_start, vma-&gt;vm_flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	/* If it hasn't been written to, don't write it out */</div><div class='add'>+	if (!vma-&gt;anon_vma) {</div><div class='add'>+		kdcore("%08lx: %08lx: no (!anon)", vma-&gt;vm_start, vma-&gt;vm_flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	kdcore("%08lx: %08lx: yes", vma-&gt;vm_start, vma-&gt;vm_flags);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* An ELF note in memory */</div><div class='add'>+struct memelfnote</div><div class='add'>+{</div><div class='add'>+	const char *name;</div><div class='add'>+	int type;</div><div class='add'>+	unsigned int datasz;</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int notesize(struct memelfnote *en)</div><div class='add'>+{</div><div class='add'>+	int sz;</div><div class='add'>+</div><div class='add'>+	sz = sizeof(struct elf_note);</div><div class='add'>+	sz += roundup(strlen(en-&gt;name) + 1, 4);</div><div class='add'>+	sz += roundup(en-&gt;datasz, 4);</div><div class='add'>+</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* #define DEBUG */</div><div class='add'>+</div><div class='add'>+#define DUMP_WRITE(addr, nr)	\</div><div class='add'>+	do { if (!dump_write(file, (addr), (nr))) return 0; } while(0)</div><div class='add'>+#define DUMP_SEEK(off)	\</div><div class='add'>+	do { if (!dump_seek(file, (off))) return 0; } while(0)</div><div class='add'>+</div><div class='add'>+static int writenote(struct memelfnote *men, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct elf_note en;</div><div class='add'>+</div><div class='add'>+	en.n_namesz = strlen(men-&gt;name) + 1;</div><div class='add'>+	en.n_descsz = men-&gt;datasz;</div><div class='add'>+	en.n_type = men-&gt;type;</div><div class='add'>+</div><div class='add'>+	DUMP_WRITE(&amp;en, sizeof(en));</div><div class='add'>+	DUMP_WRITE(men-&gt;name, en.n_namesz);</div><div class='add'>+	/* XXX - cast from long long to long to avoid need for libgcc.a */</div><div class='add'>+	DUMP_SEEK(roundup((unsigned long)file-&gt;f_pos, 4));	/* XXX */</div><div class='add'>+	DUMP_WRITE(men-&gt;data, men-&gt;datasz);</div><div class='add'>+	DUMP_SEEK(roundup((unsigned long)file-&gt;f_pos, 4));	/* XXX */</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+#undef DUMP_WRITE</div><div class='add'>+#undef DUMP_SEEK</div><div class='add'>+</div><div class='add'>+#define DUMP_WRITE(addr, nr)	\</div><div class='add'>+	if ((size += (nr)) &gt; limit || !dump_write(file, (addr), (nr))) \</div><div class='add'>+		goto end_coredump;</div><div class='add'>+#define DUMP_SEEK(off)	\</div><div class='add'>+	if (!dump_seek(file, (off))) \</div><div class='add'>+		goto end_coredump;</div><div class='add'>+</div><div class='add'>+static inline void fill_elf_fdpic_header(struct elfhdr *elf, int segs)</div><div class='add'>+{</div><div class='add'>+	memcpy(elf-&gt;e_ident, ELFMAG, SELFMAG);</div><div class='add'>+	elf-&gt;e_ident[EI_CLASS] = ELF_CLASS;</div><div class='add'>+	elf-&gt;e_ident[EI_DATA] = ELF_DATA;</div><div class='add'>+	elf-&gt;e_ident[EI_VERSION] = EV_CURRENT;</div><div class='add'>+	elf-&gt;e_ident[EI_OSABI] = ELF_OSABI;</div><div class='add'>+	memset(elf-&gt;e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD);</div><div class='add'>+</div><div class='add'>+	elf-&gt;e_type = ET_CORE;</div><div class='add'>+	elf-&gt;e_machine = ELF_ARCH;</div><div class='add'>+	elf-&gt;e_version = EV_CURRENT;</div><div class='add'>+	elf-&gt;e_entry = 0;</div><div class='add'>+	elf-&gt;e_phoff = sizeof(struct elfhdr);</div><div class='add'>+	elf-&gt;e_shoff = 0;</div><div class='add'>+	elf-&gt;e_flags = ELF_FDPIC_CORE_EFLAGS;</div><div class='add'>+	elf-&gt;e_ehsize = sizeof(struct elfhdr);</div><div class='add'>+	elf-&gt;e_phentsize = sizeof(struct elf_phdr);</div><div class='add'>+	elf-&gt;e_phnum = segs;</div><div class='add'>+	elf-&gt;e_shentsize = 0;</div><div class='add'>+	elf-&gt;e_shnum = 0;</div><div class='add'>+	elf-&gt;e_shstrndx = 0;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)</div><div class='add'>+{</div><div class='add'>+	phdr-&gt;p_type = PT_NOTE;</div><div class='add'>+	phdr-&gt;p_offset = offset;</div><div class='add'>+	phdr-&gt;p_vaddr = 0;</div><div class='add'>+	phdr-&gt;p_paddr = 0;</div><div class='add'>+	phdr-&gt;p_filesz = sz;</div><div class='add'>+	phdr-&gt;p_memsz = 0;</div><div class='add'>+	phdr-&gt;p_flags = 0;</div><div class='add'>+	phdr-&gt;p_align = 0;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void fill_note(struct memelfnote *note, const char *name, int type,</div><div class='add'>+		unsigned int sz, void *data)</div><div class='add'>+{</div><div class='add'>+	note-&gt;name = name;</div><div class='add'>+	note-&gt;type = type;</div><div class='add'>+	note-&gt;datasz = sz;</div><div class='add'>+	note-&gt;data = data;</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fill up all the fields in prstatus from the given task struct, except</div><div class='add'>+ * registers which need to be filled up seperately.</div><div class='add'>+ */</div><div class='add'>+static void fill_prstatus(struct elf_prstatus *prstatus,</div><div class='add'>+			  struct task_struct *p, long signr)</div><div class='add'>+{</div><div class='add'>+	prstatus-&gt;pr_info.si_signo = prstatus-&gt;pr_cursig = signr;</div><div class='add'>+	prstatus-&gt;pr_sigpend = p-&gt;pending.signal.sig[0];</div><div class='add'>+	prstatus-&gt;pr_sighold = p-&gt;blocked.sig[0];</div><div class='add'>+	prstatus-&gt;pr_pid = p-&gt;pid;</div><div class='add'>+	prstatus-&gt;pr_ppid = p-&gt;parent-&gt;pid;</div><div class='add'>+	prstatus-&gt;pr_pgrp = process_group(p);</div><div class='add'>+	prstatus-&gt;pr_sid = p-&gt;signal-&gt;session;</div><div class='add'>+	if (thread_group_leader(p)) {</div><div class='add'>+		/*</div><div class='add'>+		 * This is the record for the group leader.  Add in the</div><div class='add'>+		 * cumulative times of previous dead threads.  This total</div><div class='add'>+		 * won't include the time of each live thread whose state</div><div class='add'>+		 * is included in the core dump.  The final total reported</div><div class='add'>+		 * to our parent process when it calls wait4 will include</div><div class='add'>+		 * those sums as well as the little bit more time it takes</div><div class='add'>+		 * this and each other thread to finish dying after the</div><div class='add'>+		 * core dump synchronization phase.</div><div class='add'>+		 */</div><div class='add'>+		cputime_to_timeval(cputime_add(p-&gt;utime, p-&gt;signal-&gt;utime),</div><div class='add'>+				   &amp;prstatus-&gt;pr_utime);</div><div class='add'>+		cputime_to_timeval(cputime_add(p-&gt;stime, p-&gt;signal-&gt;stime),</div><div class='add'>+				   &amp;prstatus-&gt;pr_stime);</div><div class='add'>+	} else {</div><div class='add'>+		cputime_to_timeval(p-&gt;utime, &amp;prstatus-&gt;pr_utime);</div><div class='add'>+		cputime_to_timeval(p-&gt;stime, &amp;prstatus-&gt;pr_stime);</div><div class='add'>+	}</div><div class='add'>+	cputime_to_timeval(p-&gt;signal-&gt;cutime, &amp;prstatus-&gt;pr_cutime);</div><div class='add'>+	cputime_to_timeval(p-&gt;signal-&gt;cstime, &amp;prstatus-&gt;pr_cstime);</div><div class='add'>+</div><div class='add'>+	prstatus-&gt;pr_exec_fdpic_loadmap = p-&gt;mm-&gt;context.exec_fdpic_loadmap;</div><div class='add'>+	prstatus-&gt;pr_interp_fdpic_loadmap = p-&gt;mm-&gt;context.interp_fdpic_loadmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,</div><div class='add'>+		       struct mm_struct *mm)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, len;</div><div class='add'>+</div><div class='add'>+	/* first copy the parameters from user space */</div><div class='add'>+	memset(psinfo, 0, sizeof(struct elf_prpsinfo));</div><div class='add'>+</div><div class='add'>+	len = mm-&gt;arg_end - mm-&gt;arg_start;</div><div class='add'>+	if (len &gt;= ELF_PRARGSZ)</div><div class='add'>+		len = ELF_PRARGSZ - 1;</div><div class='add'>+	if (copy_from_user(&amp;psinfo-&gt;pr_psargs,</div><div class='add'>+		           (const char __user *) mm-&gt;arg_start, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	for (i = 0; i &lt; len; i++)</div><div class='add'>+		if (psinfo-&gt;pr_psargs[i] == 0)</div><div class='add'>+			psinfo-&gt;pr_psargs[i] = ' ';</div><div class='add'>+	psinfo-&gt;pr_psargs[len] = 0;</div><div class='add'>+</div><div class='add'>+	psinfo-&gt;pr_pid = p-&gt;pid;</div><div class='add'>+	psinfo-&gt;pr_ppid = p-&gt;parent-&gt;pid;</div><div class='add'>+	psinfo-&gt;pr_pgrp = process_group(p);</div><div class='add'>+	psinfo-&gt;pr_sid = p-&gt;signal-&gt;session;</div><div class='add'>+</div><div class='add'>+	i = p-&gt;state ? ffz(~p-&gt;state) + 1 : 0;</div><div class='add'>+	psinfo-&gt;pr_state = i;</div><div class='add'>+	psinfo-&gt;pr_sname = (i &gt; 5) ? '.' : "RSDTZW"[i];</div><div class='add'>+	psinfo-&gt;pr_zomb = psinfo-&gt;pr_sname == 'Z';</div><div class='add'>+	psinfo-&gt;pr_nice = task_nice(p);</div><div class='add'>+	psinfo-&gt;pr_flag = p-&gt;flags;</div><div class='add'>+	SET_UID(psinfo-&gt;pr_uid, p-&gt;uid);</div><div class='add'>+	SET_GID(psinfo-&gt;pr_gid, p-&gt;gid);</div><div class='add'>+	strncpy(psinfo-&gt;pr_fname, p-&gt;comm, sizeof(psinfo-&gt;pr_fname));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Here is the structure in which status of each thread is captured. */</div><div class='add'>+struct elf_thread_status</div><div class='add'>+{</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct elf_prstatus prstatus;	/* NT_PRSTATUS */</div><div class='add'>+	elf_fpregset_t fpu;		/* NT_PRFPREG */</div><div class='add'>+	struct task_struct *thread;</div><div class='add'>+#ifdef ELF_CORE_COPY_XFPREGS</div><div class='add'>+	elf_fpxregset_t xfpu;		/* NT_PRXFPREG */</div><div class='add'>+#endif</div><div class='add'>+	struct memelfnote notes[3];</div><div class='add'>+	int num_notes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In order to add the specific thread information for the elf file format,</div><div class='add'>+ * we need to keep a linked list of every thread's pr_status and then create</div><div class='add'>+ * a single section for them in the final core file.</div><div class='add'>+ */</div><div class='add'>+static int elf_dump_thread_status(long signr, struct elf_thread_status *t)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *p = t-&gt;thread;</div><div class='add'>+	int sz = 0;</div><div class='add'>+</div><div class='add'>+	t-&gt;num_notes = 0;</div><div class='add'>+</div><div class='add'>+	fill_prstatus(&amp;t-&gt;prstatus, p, signr);</div><div class='add'>+	elf_core_copy_task_regs(p, &amp;t-&gt;prstatus.pr_reg);</div><div class='add'>+</div><div class='add'>+	fill_note(&amp;t-&gt;notes[0], "CORE", NT_PRSTATUS, sizeof(t-&gt;prstatus),</div><div class='add'>+		  &amp;t-&gt;prstatus);</div><div class='add'>+	t-&gt;num_notes++;</div><div class='add'>+	sz += notesize(&amp;t-&gt;notes[0]);</div><div class='add'>+</div><div class='add'>+	t-&gt;prstatus.pr_fpvalid = elf_core_copy_task_fpregs(p, NULL, &amp;t-&gt;fpu);</div><div class='add'>+	if (t-&gt;prstatus.pr_fpvalid) {</div><div class='add'>+		fill_note(&amp;t-&gt;notes[1], "CORE", NT_PRFPREG, sizeof(t-&gt;fpu),</div><div class='add'>+			  &amp;t-&gt;fpu);</div><div class='add'>+		t-&gt;num_notes++;</div><div class='add'>+		sz += notesize(&amp;t-&gt;notes[1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef ELF_CORE_COPY_XFPREGS</div><div class='add'>+	if (elf_core_copy_task_xfpregs(p, &amp;t-&gt;xfpu)) {</div><div class='add'>+		fill_note(&amp;t-&gt;notes[2], "LINUX", NT_PRXFPREG, sizeof(t-&gt;xfpu),</div><div class='add'>+			  &amp;t-&gt;xfpu);</div><div class='add'>+		t-&gt;num_notes++;</div><div class='add'>+		sz += notesize(&amp;t-&gt;notes[2]);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return sz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dump the segments for an MMU process</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm,</div><div class='add'>+				   size_t *size, unsigned long *limit)</div><div class='add'>+{</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+</div><div class='add'>+	for (vma = current-&gt;mm-&gt;mmap; vma; vma = vma-&gt;vm_next) {</div><div class='add'>+		unsigned long addr;</div><div class='add'>+</div><div class='add'>+		if (!maydump(vma))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (addr = vma-&gt;vm_start;</div><div class='add'>+		     addr &lt; vma-&gt;vm_end;</div><div class='add'>+		     addr += PAGE_SIZE</div><div class='add'>+		     ) {</div><div class='add'>+			struct vm_area_struct *vma;</div><div class='add'>+			struct page *page;</div><div class='add'>+</div><div class='add'>+			if (get_user_pages(current, current-&gt;mm, addr, 1, 0, 1,</div><div class='add'>+					   &amp;page, &amp;vma) &lt;= 0) {</div><div class='add'>+				DUMP_SEEK(file-&gt;f_pos + PAGE_SIZE);</div><div class='add'>+			}</div><div class='add'>+			else if (page == ZERO_PAGE(addr)) {</div><div class='add'>+				DUMP_SEEK(file-&gt;f_pos + PAGE_SIZE);</div><div class='add'>+				page_cache_release(page);</div><div class='add'>+			}</div><div class='add'>+			else {</div><div class='add'>+				void *kaddr;</div><div class='add'>+</div><div class='add'>+				flush_cache_page(vma, addr, page_to_pfn(page));</div><div class='add'>+				kaddr = kmap(page);</div><div class='add'>+				if ((*size += PAGE_SIZE) &gt; *limit ||</div><div class='add'>+				    !dump_write(file, kaddr, PAGE_SIZE)</div><div class='add'>+				    ) {</div><div class='add'>+					kunmap(page);</div><div class='add'>+					page_cache_release(page);</div><div class='add'>+					return -EIO;</div><div class='add'>+				}</div><div class='add'>+				kunmap(page);</div><div class='add'>+				page_cache_release(page);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+end_coredump:</div><div class='add'>+	return -EFBIG;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dump the segments for a NOMMU process</div><div class='add'>+ */</div><div class='add'>+#ifndef CONFIG_MMU</div><div class='add'>+static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm,</div><div class='add'>+				   size_t *size, unsigned long *limit)</div><div class='add'>+{</div><div class='add'>+	struct vm_list_struct *vml;</div><div class='add'>+</div><div class='add'>+	for (vml = current-&gt;mm-&gt;context.vmlist; vml; vml = vml-&gt;next) {</div><div class='add'>+	struct vm_area_struct *vma = vml-&gt;vma;</div><div class='add'>+</div><div class='add'>+		if (!maydump(vma))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((*size += PAGE_SIZE) &gt; *limit)</div><div class='add'>+			return -EFBIG;</div><div class='add'>+</div><div class='add'>+		if (!dump_write(file, (void *) vma-&gt;vm_start,</div><div class='add'>+				vma-&gt;vm_end - vma-&gt;vm_start))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Actual dumper</div><div class='add'>+ *</div><div class='add'>+ * This is a two-pass process; first we find the offsets of the bits,</div><div class='add'>+ * and then they are actually written out.  If we run out of core limit</div><div class='add'>+ * we just truncate.</div><div class='add'>+ */</div><div class='add'>+static int elf_fdpic_core_dump(long signr, struct pt_regs *regs,</div><div class='add'>+			       struct file *file)</div><div class='add'>+{</div><div class='add'>+#define	NUM_NOTES	6</div><div class='add'>+	int has_dumped = 0;</div><div class='add'>+	mm_segment_t fs;</div><div class='add'>+	int segs;</div><div class='add'>+	size_t size = 0;</div><div class='add'>+	int i;</div><div class='add'>+	struct vm_area_struct *vma;</div><div class='add'>+	struct elfhdr *elf = NULL;</div><div class='add'>+	loff_t offset = 0, dataoff;</div><div class='add'>+	unsigned long limit = current-&gt;signal-&gt;rlim[RLIMIT_CORE].rlim_cur;</div><div class='add'>+	int numnote;</div><div class='add'>+	struct memelfnote *notes = NULL;</div><div class='add'>+	struct elf_prstatus *prstatus = NULL;	/* NT_PRSTATUS */</div><div class='add'>+	struct elf_prpsinfo *psinfo = NULL;	/* NT_PRPSINFO */</div><div class='add'>+ 	struct task_struct *g, *p;</div><div class='add'>+ 	LIST_HEAD(thread_list);</div><div class='add'>+ 	struct list_head *t;</div><div class='add'>+	elf_fpregset_t *fpu = NULL;</div><div class='add'>+#ifdef ELF_CORE_COPY_XFPREGS</div><div class='add'>+	elf_fpxregset_t *xfpu = NULL;</div><div class='add'>+#endif</div><div class='add'>+	int thread_status_size = 0;</div><div class='add'>+#ifndef CONFIG_MMU</div><div class='add'>+	struct vm_list_struct *vml;</div><div class='add'>+#endif</div><div class='add'>+	elf_addr_t *auxv;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We no longer stop all VM operations.</div><div class='add'>+	 *</div><div class='add'>+	 * This is because those proceses that could possibly change map_count</div><div class='add'>+	 * or the mmap / vma pages are now blocked in do_exit on current</div><div class='add'>+	 * finishing this core dump.</div><div class='add'>+	 *</div><div class='add'>+	 * Only ptrace can touch these memory addresses, but it doesn't change</div><div class='add'>+	 * the map_count or the pages allocated. So no possibility of crashing</div><div class='add'>+	 * exists while dumping the mm-&gt;vm_next areas to the core file.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* alloc memory for large data structures: too large to be on stack */</div><div class='add'>+	elf = kmalloc(sizeof(*elf), GFP_KERNEL);</div><div class='add'>+	if (!elf)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	prstatus = kzalloc(sizeof(*prstatus), GFP_KERNEL);</div><div class='add'>+	if (!prstatus)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	psinfo = kmalloc(sizeof(*psinfo), GFP_KERNEL);</div><div class='add'>+	if (!psinfo)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	notes = kmalloc(NUM_NOTES * sizeof(struct memelfnote), GFP_KERNEL);</div><div class='add'>+	if (!notes)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	fpu = kmalloc(sizeof(*fpu), GFP_KERNEL);</div><div class='add'>+	if (!fpu)</div><div class='add'>+		goto cleanup;</div><div class='add'>+#ifdef ELF_CORE_COPY_XFPREGS</div><div class='add'>+	xfpu = kmalloc(sizeof(*xfpu), GFP_KERNEL);</div><div class='add'>+	if (!xfpu)</div><div class='add'>+		goto cleanup;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (signr) {</div><div class='add'>+		struct elf_thread_status *tmp;</div><div class='add'>+		read_lock(&amp;tasklist_lock);</div><div class='add'>+		do_each_thread(g,p)</div><div class='add'>+			if (current-&gt;mm == p-&gt;mm &amp;&amp; current != p) {</div><div class='add'>+				tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC);</div><div class='add'>+				if (!tmp) {</div><div class='add'>+					read_unlock(&amp;tasklist_lock);</div><div class='add'>+					goto cleanup;</div><div class='add'>+				}</div><div class='add'>+				INIT_LIST_HEAD(&amp;tmp-&gt;list);</div><div class='add'>+				tmp-&gt;thread = p;</div><div class='add'>+				list_add(&amp;tmp-&gt;list, &amp;thread_list);</div><div class='add'>+			}</div><div class='add'>+		while_each_thread(g,p);</div><div class='add'>+		read_unlock(&amp;tasklist_lock);</div><div class='add'>+		list_for_each(t, &amp;thread_list) {</div><div class='add'>+			struct elf_thread_status *tmp;</div><div class='add'>+			int sz;</div><div class='add'>+</div><div class='add'>+			tmp = list_entry(t, struct elf_thread_status, list);</div><div class='add'>+			sz = elf_dump_thread_status(signr, tmp);</div><div class='add'>+			thread_status_size += sz;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* now collect the dump for the current */</div><div class='add'>+	fill_prstatus(prstatus, current, signr);</div><div class='add'>+	elf_core_copy_regs(&amp;prstatus-&gt;pr_reg, regs);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+	segs = current-&gt;mm-&gt;map_count;</div><div class='add'>+#else</div><div class='add'>+	segs = 0;</div><div class='add'>+	for (vml = current-&gt;mm-&gt;context.vmlist; vml; vml = vml-&gt;next)</div><div class='add'>+	    segs++;</div><div class='add'>+#endif</div><div class='add'>+#ifdef ELF_CORE_EXTRA_PHDRS</div><div class='add'>+	segs += ELF_CORE_EXTRA_PHDRS;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Set up header */</div><div class='add'>+	fill_elf_fdpic_header(elf, segs + 1);	/* including notes section */</div><div class='add'>+</div><div class='add'>+	has_dumped = 1;</div><div class='add'>+	current-&gt;flags |= PF_DUMPCORE;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set up the notes in similar form to SVR4 core dumps made</div><div class='add'>+	 * with info from their /proc.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	fill_note(notes + 0, "CORE", NT_PRSTATUS, sizeof(*prstatus), prstatus);</div><div class='add'>+	fill_psinfo(psinfo, current-&gt;group_leader, current-&gt;mm);</div><div class='add'>+	fill_note(notes + 1, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);</div><div class='add'>+</div><div class='add'>+	numnote = 2;</div><div class='add'>+</div><div class='add'>+	auxv = (elf_addr_t *) current-&gt;mm-&gt;saved_auxv;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	do</div><div class='add'>+		i += 2;</div><div class='add'>+	while (auxv[i - 2] != AT_NULL);</div><div class='add'>+	fill_note(&amp;notes[numnote++], "CORE", NT_AUXV,</div><div class='add'>+		  i * sizeof(elf_addr_t), auxv);</div><div class='add'>+</div><div class='add'>+  	/* Try to dump the FPU. */</div><div class='add'>+	if ((prstatus-&gt;pr_fpvalid =</div><div class='add'>+	     elf_core_copy_task_fpregs(current, regs, fpu)))</div><div class='add'>+		fill_note(notes + numnote++,</div><div class='add'>+			  "CORE", NT_PRFPREG, sizeof(*fpu), fpu);</div><div class='add'>+#ifdef ELF_CORE_COPY_XFPREGS</div><div class='add'>+	if (elf_core_copy_task_xfpregs(current, xfpu))</div><div class='add'>+		fill_note(notes + numnote++,</div><div class='add'>+			  "LINUX", NT_PRXFPREG, sizeof(*xfpu), xfpu);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	fs = get_fs();</div><div class='add'>+	set_fs(KERNEL_DS);</div><div class='add'>+</div><div class='add'>+	DUMP_WRITE(elf, sizeof(*elf));</div><div class='add'>+	offset += sizeof(*elf);				/* Elf header */</div><div class='add'>+	offset += (segs+1) * sizeof(struct elf_phdr);	/* Program headers */</div><div class='add'>+</div><div class='add'>+	/* Write notes phdr entry */</div><div class='add'>+	{</div><div class='add'>+		struct elf_phdr phdr;</div><div class='add'>+		int sz = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; numnote; i++)</div><div class='add'>+			sz += notesize(notes + i);</div><div class='add'>+</div><div class='add'>+		sz += thread_status_size;</div><div class='add'>+</div><div class='add'>+		fill_elf_note_phdr(&amp;phdr, sz, offset);</div><div class='add'>+		offset += sz;</div><div class='add'>+		DUMP_WRITE(&amp;phdr, sizeof(phdr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Page-align dumped data */</div><div class='add'>+	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);</div><div class='add'>+</div><div class='add'>+	/* write program headers for segments dump */</div><div class='add'>+	for (</div><div class='add'>+#ifdef CONFIG_MMU</div><div class='add'>+		vma = current-&gt;mm-&gt;mmap; vma; vma = vma-&gt;vm_next</div><div class='add'>+#else</div><div class='add'>+			vml = current-&gt;mm-&gt;context.vmlist; vml; vml = vml-&gt;next</div><div class='add'>+#endif</div><div class='add'>+	     ) {</div><div class='add'>+		struct elf_phdr phdr;</div><div class='add'>+		size_t sz;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_MMU</div><div class='add'>+		vma = vml-&gt;vma;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		sz = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='add'>+</div><div class='add'>+		phdr.p_type = PT_LOAD;</div><div class='add'>+		phdr.p_offset = offset;</div><div class='add'>+		phdr.p_vaddr = vma-&gt;vm_start;</div><div class='add'>+		phdr.p_paddr = 0;</div><div class='add'>+		phdr.p_filesz = maydump(vma) ? sz : 0;</div><div class='add'>+		phdr.p_memsz = sz;</div><div class='add'>+		offset += phdr.p_filesz;</div><div class='add'>+		phdr.p_flags = vma-&gt;vm_flags &amp; VM_READ ? PF_R : 0;</div><div class='add'>+		if (vma-&gt;vm_flags &amp; VM_WRITE)</div><div class='add'>+			phdr.p_flags |= PF_W;</div><div class='add'>+		if (vma-&gt;vm_flags &amp; VM_EXEC)</div><div class='add'>+			phdr.p_flags |= PF_X;</div><div class='add'>+		phdr.p_align = ELF_EXEC_PAGESIZE;</div><div class='add'>+</div><div class='add'>+		DUMP_WRITE(&amp;phdr, sizeof(phdr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef ELF_CORE_WRITE_EXTRA_PHDRS</div><div class='add'>+	ELF_CORE_WRITE_EXTRA_PHDRS;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ 	/* write out the notes section */</div><div class='add'>+	for (i = 0; i &lt; numnote; i++)</div><div class='add'>+		if (!writenote(notes + i, file))</div><div class='add'>+			goto end_coredump;</div><div class='add'>+</div><div class='add'>+	/* write out the thread status notes section */</div><div class='add'>+	list_for_each(t, &amp;thread_list) {</div><div class='add'>+		struct elf_thread_status *tmp =</div><div class='add'>+				list_entry(t, struct elf_thread_status, list);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tmp-&gt;num_notes; i++)</div><div class='add'>+			if (!writenote(&amp;tmp-&gt;notes[i], file))</div><div class='add'>+				goto end_coredump;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	DUMP_SEEK(dataoff);</div><div class='add'>+</div><div class='add'>+	if (elf_fdpic_dump_segments(file, current-&gt;mm, &amp;size, &amp;limit) &lt; 0)</div><div class='add'>+		goto end_coredump;</div><div class='add'>+</div><div class='add'>+#ifdef ELF_CORE_WRITE_EXTRA_DATA</div><div class='add'>+	ELF_CORE_WRITE_EXTRA_DATA;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (file-&gt;f_pos != offset) {</div><div class='add'>+		/* Sanity check */</div><div class='add'>+		printk(KERN_WARNING</div><div class='add'>+		       "elf_core_dump: file-&gt;f_pos (%lld) != offset (%lld)\n",</div><div class='add'>+		       file-&gt;f_pos, offset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end_coredump:</div><div class='add'>+	set_fs(fs);</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	while (!list_empty(&amp;thread_list)) {</div><div class='add'>+		struct list_head *tmp = thread_list.next;</div><div class='add'>+		list_del(tmp);</div><div class='add'>+		kfree(list_entry(tmp, struct elf_thread_status, list));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(elf);</div><div class='add'>+	kfree(prstatus);</div><div class='add'>+	kfree(psinfo);</div><div class='add'>+	kfree(notes);</div><div class='add'>+	kfree(fpu);</div><div class='add'>+#ifdef ELF_CORE_COPY_XFPREGS</div><div class='add'>+	kfree(xfpu);</div><div class='add'>+#endif</div><div class='add'>+	return has_dumped;</div><div class='add'>+#undef NUM_NOTES</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif		/* USE_ELF_CORE_DUMP */</div><div class='head'>diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c<br/>index b1c902e319c1..a62fd4018a20 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/binfmt_flat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_flat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/binfmt_flat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/binfmt_flat.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -510,7 +509,7 @@ static int load_flat_file(struct linux_binprm * bprm,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* OK, This is the point of no return */</div><div class='del'>-		set_personality(PER_LINUX);</div><div class='add'>+		set_personality(PER_LINUX_32BIT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='head'>diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c<br/>index d73d75591a39..34ebbc191e46 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/binfmt_misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/binfmt_misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/binfmt_misc.c</a></div><div class='hunk'>@@ -55,6 +55,7 @@ typedef struct {</div><div class='ctx'> } Node;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_RWLOCK(entries_lock);</div><div class='add'>+static struct file_system_type bm_fs_type;</div><div class='ctx'> static struct vfsmount *bm_mnt;</div><div class='ctx'> static int entry_count;</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +204,6 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)</div><div class='ctx'> 		goto _error;</div><div class='ctx'> </div><div class='ctx'> 	if (files) {</div><div class='del'>-		steal_locks(files);</div><div class='ctx'> 		put_files_struct(files);</div><div class='ctx'> 		files = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -638,7 +638,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 	if (!inode)</div><div class='ctx'> 		goto out2;</div><div class='ctx'> </div><div class='del'>-	err = simple_pin_fs("binfmt_misc", &amp;bm_mnt, &amp;entry_count);</div><div class='add'>+	err = simple_pin_fs(&amp;bm_fs_type, &amp;bm_mnt, &amp;entry_count);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		iput(inode);</div><div class='ctx'> 		inode = NULL;</div><div class='hunk'>@@ -740,10 +740,10 @@ static int bm_fill_super(struct super_block * sb, void * data, int silent)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *bm_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int bm_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, bm_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, bm_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct linux_binfmt misc_format = {</div><div class='head'>diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c<br/>index 00a91dc25d16..32b5d625ce9c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/binfmt_som.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/binfmt_som.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/binfmt_som.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/binfmt_som.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/elf.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/bio.c b/fs/bio.c<br/>index 098c12b2d60a..6a0b9ad8f8c9 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/bio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/bio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/bio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/bio.c</a></div><div class='hunk'>@@ -654,9 +654,10 @@ static struct bio *__bio_map_user_iov(request_queue_t *q,</div><div class='ctx'> 				     write_to_vm, 0, &amp;pages[cur_page], NULL);</div><div class='ctx'> 		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='del'>-		if (ret &lt; local_nr_pages)</div><div class='add'>+		if (ret &lt; local_nr_pages) {</div><div class='add'>+			ret = -EFAULT;</div><div class='ctx'> 			goto out_unmap;</div><div class='del'>-</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		offset = uaddr &amp; ~PAGE_MASK;</div><div class='ctx'> 		for (j = cur_page; j &lt; page_limit; j++) {</div><div class='head'>diff --git a/fs/block_dev.c b/fs/block_dev.c<br/>index f5958f413bd1..37534573960b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/block_dev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/block_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/block_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/block_dev.c</a></div><div class='hunk'>@@ -5,14 +5,12 @@</div><div class='ctx'>  *  Copyright (C) 2001  Andrea Arcangeli &lt;andrea@suse.de&gt; SuSE</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/highmem.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='hunk'>@@ -300,10 +298,10 @@ static struct super_operations bdev_sops = {</div><div class='ctx'> 	.clear_inode = bdev_clear_inode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct super_block *bd_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int bd_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_pseudo(fs_type, "bdev:", &amp;bdev_sops, 0x62646576);</div><div class='add'>+	return get_sb_pseudo(fs_type, "bdev:", &amp;bdev_sops, 0x62646576, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type bd_type = {</div><div class='hunk'>@@ -414,21 +412,31 @@ EXPORT_SYMBOL(bdput);</div><div class='ctx'> static struct block_device *bd_acquire(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;bdev_lock);</div><div class='ctx'> 	bdev = inode-&gt;i_bdev;</div><div class='del'>-	if (bdev &amp;&amp; igrab(bdev-&gt;bd_inode)) {</div><div class='add'>+	if (bdev) {</div><div class='add'>+		atomic_inc(&amp;bdev-&gt;bd_inode-&gt;i_count);</div><div class='ctx'> 		spin_unlock(&amp;bdev_lock);</div><div class='ctx'> 		return bdev;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;bdev_lock);</div><div class='add'>+</div><div class='ctx'> 	bdev = bdget(inode-&gt;i_rdev);</div><div class='ctx'> 	if (bdev) {</div><div class='ctx'> 		spin_lock(&amp;bdev_lock);</div><div class='del'>-		if (inode-&gt;i_bdev)</div><div class='del'>-			__bd_forget(inode);</div><div class='del'>-		inode-&gt;i_bdev = bdev;</div><div class='del'>-		inode-&gt;i_mapping = bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='del'>-		list_add(&amp;inode-&gt;i_devices, &amp;bdev-&gt;bd_inodes);</div><div class='add'>+		if (!inode-&gt;i_bdev) {</div><div class='add'>+			/*</div><div class='add'>+			 * We take an additional bd_inode-&gt;i_count for inode,</div><div class='add'>+			 * and it's released in clear_inode() of inode.</div><div class='add'>+			 * So, we can access it via -&gt;i_mapping always</div><div class='add'>+			 * without igrab().</div><div class='add'>+			 */</div><div class='add'>+			atomic_inc(&amp;bdev-&gt;bd_inode-&gt;i_count);</div><div class='add'>+			inode-&gt;i_bdev = bdev;</div><div class='add'>+			inode-&gt;i_mapping = bdev-&gt;bd_inode-&gt;i_mapping;</div><div class='add'>+			list_add(&amp;inode-&gt;i_devices, &amp;bdev-&gt;bd_inodes);</div><div class='add'>+		}</div><div class='ctx'> 		spin_unlock(&amp;bdev_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return bdev;</div><div class='hunk'>@@ -438,10 +446,18 @@ static struct block_device *bd_acquire(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> void bd_forget(struct inode *inode)</div><div class='ctx'> {</div><div class='add'>+	struct block_device *bdev = NULL;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;bdev_lock);</div><div class='del'>-	if (inode-&gt;i_bdev)</div><div class='add'>+	if (inode-&gt;i_bdev) {</div><div class='add'>+		if (inode-&gt;i_sb != blockdev_superblock)</div><div class='add'>+			bdev = inode-&gt;i_bdev;</div><div class='ctx'> 		__bd_forget(inode);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock(&amp;bdev_lock);</div><div class='add'>+</div><div class='add'>+	if (bdev)</div><div class='add'>+		iput(bdev-&gt;bd_inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bd_claim(struct block_device *bdev, void *holder)</div><div class='hunk'>@@ -723,7 +739,7 @@ static int bd_claim_by_kobject(struct block_device *bdev, void *holder,</div><div class='ctx'> 	if (!bo)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;bdev-&gt;bd_mutex, BD_MUTEX_PARTITION);</div><div class='ctx'> 	res = bd_claim(bdev, holder);</div><div class='ctx'> 	if (res || !add_bd_holder(bdev, bo))</div><div class='ctx'> 		free_bd_holder(bo);</div><div class='hunk'>@@ -748,7 +764,7 @@ static void bd_release_from_kobject(struct block_device *bdev,</div><div class='ctx'> 	if (!kobj)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;bdev-&gt;bd_mutex, BD_MUTEX_PARTITION);</div><div class='ctx'> 	bd_release(bdev);</div><div class='ctx'> 	if ((bo = del_bd_holder(bdev, kobj)))</div><div class='ctx'> 		free_bd_holder(bo);</div><div class='hunk'>@@ -806,6 +822,22 @@ struct block_device *open_by_devnum(dev_t dev, unsigned mode)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(open_by_devnum);</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+blkdev_get_partition(struct block_device *bdev, mode_t mode, unsigned flags);</div><div class='add'>+</div><div class='add'>+struct block_device *open_partition_by_devnum(dev_t dev, unsigned mode)</div><div class='add'>+{</div><div class='add'>+	struct block_device *bdev = bdget(dev);</div><div class='add'>+	int err = -ENOMEM;</div><div class='add'>+	int flags = mode &amp; FMODE_WRITE ? O_RDWR : O_RDONLY;</div><div class='add'>+	if (bdev)</div><div class='add'>+		err = blkdev_get_partition(bdev, mode, flags);</div><div class='add'>+	return err ? ERR_PTR(err) : bdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(open_partition_by_devnum);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This routine checks whether a removable media has been changed,</div><div class='ctx'>  * and invalidates all buffer-cache-entries in that case. This</div><div class='hunk'>@@ -852,7 +884,11 @@ void bd_set_size(struct block_device *bdev, loff_t size)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(bd_set_size);</div><div class='ctx'> </div><div class='del'>-static int do_open(struct block_device *bdev, struct file *file)</div><div class='add'>+static int</div><div class='add'>+blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+do_open(struct block_device *bdev, struct file *file, unsigned int subclass)</div><div class='ctx'> {</div><div class='ctx'> 	struct module *owner = NULL;</div><div class='ctx'> 	struct gendisk *disk;</div><div class='hunk'>@@ -869,7 +905,8 @@ static int do_open(struct block_device *bdev, struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> 	owner = disk-&gt;fops-&gt;owner;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;bdev-&gt;bd_mutex, subclass);</div><div class='add'>+</div><div class='ctx'> 	if (!bdev-&gt;bd_openers) {</div><div class='ctx'> 		bdev-&gt;bd_disk = disk;</div><div class='ctx'> 		bdev-&gt;bd_contains = bdev;</div><div class='hunk'>@@ -896,11 +933,11 @@ static int do_open(struct block_device *bdev, struct file *file)</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='ctx'> 			if (!whole)</div><div class='ctx'> 				goto out_first;</div><div class='del'>-			ret = blkdev_get(whole, file-&gt;f_mode, file-&gt;f_flags);</div><div class='add'>+			ret = blkdev_get_whole(whole, file-&gt;f_mode, file-&gt;f_flags);</div><div class='ctx'> 			if (ret)</div><div class='ctx'> 				goto out_first;</div><div class='ctx'> 			bdev-&gt;bd_contains = whole;</div><div class='del'>-			mutex_lock(&amp;whole-&gt;bd_mutex);</div><div class='add'>+			mutex_lock_nested(&amp;whole-&gt;bd_mutex, BD_MUTEX_WHOLE);</div><div class='ctx'> 			whole-&gt;bd_part_count++;</div><div class='ctx'> 			p = disk-&gt;part[part - 1];</div><div class='ctx'> 			bdev-&gt;bd_inode-&gt;i_data.backing_dev_info =</div><div class='hunk'>@@ -928,7 +965,8 @@ static int do_open(struct block_device *bdev, struct file *file)</div><div class='ctx'> 			if (bdev-&gt;bd_invalidated)</div><div class='ctx'> 				rescan_partitions(bdev-&gt;bd_disk, bdev);</div><div class='ctx'> 		} else {</div><div class='del'>-			mutex_lock(&amp;bdev-&gt;bd_contains-&gt;bd_mutex);</div><div class='add'>+			mutex_lock_nested(&amp;bdev-&gt;bd_contains-&gt;bd_mutex,</div><div class='add'>+					  BD_MUTEX_PARTITION);</div><div class='ctx'> 			bdev-&gt;bd_contains-&gt;bd_part_count++;</div><div class='ctx'> 			mutex_unlock(&amp;bdev-&gt;bd_contains-&gt;bd_mutex);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -969,11 +1007,49 @@ int blkdev_get(struct block_device *bdev, mode_t mode, unsigned flags)</div><div class='ctx'> 	fake_file.f_dentry = &amp;fake_dentry;</div><div class='ctx'> 	fake_dentry.d_inode = bdev-&gt;bd_inode;</div><div class='ctx'> </div><div class='del'>-	return do_open(bdev, &amp;fake_file);</div><div class='add'>+	return do_open(bdev, &amp;fake_file, BD_MUTEX_NORMAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(blkdev_get);</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * This crockload is due to bad choice of -&gt;open() type.</div><div class='add'>+	 * It will go away.</div><div class='add'>+	 * For now, block device -&gt;open() routine must _not_</div><div class='add'>+	 * examine anything in 'inode' argument except -&gt;i_rdev.</div><div class='add'>+	 */</div><div class='add'>+	struct file fake_file = {};</div><div class='add'>+	struct dentry fake_dentry = {};</div><div class='add'>+	fake_file.f_mode = mode;</div><div class='add'>+	fake_file.f_flags = flags;</div><div class='add'>+	fake_file.f_dentry = &amp;fake_dentry;</div><div class='add'>+	fake_dentry.d_inode = bdev-&gt;bd_inode;</div><div class='add'>+</div><div class='add'>+	return do_open(bdev, &amp;fake_file, BD_MUTEX_WHOLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+blkdev_get_partition(struct block_device *bdev, mode_t mode, unsigned flags)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * This crockload is due to bad choice of -&gt;open() type.</div><div class='add'>+	 * It will go away.</div><div class='add'>+	 * For now, block device -&gt;open() routine must _not_</div><div class='add'>+	 * examine anything in 'inode' argument except -&gt;i_rdev.</div><div class='add'>+	 */</div><div class='add'>+	struct file fake_file = {};</div><div class='add'>+	struct dentry fake_dentry = {};</div><div class='add'>+	fake_file.f_mode = mode;</div><div class='add'>+	fake_file.f_flags = flags;</div><div class='add'>+	fake_file.f_dentry = &amp;fake_dentry;</div><div class='add'>+	fake_dentry.d_inode = bdev-&gt;bd_inode;</div><div class='add'>+</div><div class='add'>+	return do_open(bdev, &amp;fake_file, BD_MUTEX_PARTITION);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int blkdev_open(struct inode * inode, struct file * filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev;</div><div class='hunk'>@@ -989,7 +1065,7 @@ static int blkdev_open(struct inode * inode, struct file * filp)</div><div class='ctx'> </div><div class='ctx'> 	bdev = bd_acquire(inode);</div><div class='ctx'> </div><div class='del'>-	res = do_open(bdev, filp);</div><div class='add'>+	res = do_open(bdev, filp, BD_MUTEX_NORMAL);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='hunk'>@@ -1003,13 +1079,13 @@ static int blkdev_open(struct inode * inode, struct file * filp)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int blkdev_put(struct block_device *bdev)</div><div class='add'>+static int __blkdev_put(struct block_device *bdev, unsigned int subclass)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	struct inode *bd_inode = bdev-&gt;bd_inode;</div><div class='ctx'> 	struct gendisk *disk = bdev-&gt;bd_disk;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bdev-&gt;bd_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;bdev-&gt;bd_mutex, subclass);</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	if (!--bdev-&gt;bd_openers) {</div><div class='ctx'> 		sync_blockdev(bdev);</div><div class='hunk'>@@ -1019,7 +1095,8 @@ int blkdev_put(struct block_device *bdev)</div><div class='ctx'> 		if (disk-&gt;fops-&gt;release)</div><div class='ctx'> 			ret = disk-&gt;fops-&gt;release(bd_inode, NULL);</div><div class='ctx'> 	} else {</div><div class='del'>-		mutex_lock(&amp;bdev-&gt;bd_contains-&gt;bd_mutex);</div><div class='add'>+		mutex_lock_nested(&amp;bdev-&gt;bd_contains-&gt;bd_mutex,</div><div class='add'>+				  subclass + 1);</div><div class='ctx'> 		bdev-&gt;bd_contains-&gt;bd_part_count--;</div><div class='ctx'> 		mutex_unlock(&amp;bdev-&gt;bd_contains-&gt;bd_mutex);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1035,9 +1112,8 @@ int blkdev_put(struct block_device *bdev)</div><div class='ctx'> 		}</div><div class='ctx'> 		bdev-&gt;bd_disk = NULL;</div><div class='ctx'> 		bdev-&gt;bd_inode-&gt;i_data.backing_dev_info = &amp;default_backing_dev_info;</div><div class='del'>-		if (bdev != bdev-&gt;bd_contains) {</div><div class='del'>-			blkdev_put(bdev-&gt;bd_contains);</div><div class='del'>-		}</div><div class='add'>+		if (bdev != bdev-&gt;bd_contains)</div><div class='add'>+			__blkdev_put(bdev-&gt;bd_contains, subclass + 1);</div><div class='ctx'> 		bdev-&gt;bd_contains = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	unlock_kernel();</div><div class='hunk'>@@ -1046,8 +1122,20 @@ int blkdev_put(struct block_device *bdev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int blkdev_put(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return __blkdev_put(bdev, BD_MUTEX_NORMAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> EXPORT_SYMBOL(blkdev_put);</div><div class='ctx'> </div><div class='add'>+int blkdev_put_partition(struct block_device *bdev)</div><div class='add'>+{</div><div class='add'>+	return __blkdev_put(bdev, BD_MUTEX_PARTITION);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(blkdev_put_partition);</div><div class='add'>+</div><div class='ctx'> static int blkdev_close(struct inode * inode, struct file * filp)</div><div class='ctx'> {</div><div class='ctx'> 	struct block_device *bdev = I_BDEV(filp-&gt;f_mapping-&gt;host);</div><div class='hunk'>@@ -1077,7 +1165,7 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)</div><div class='ctx'> 	return blkdev_ioctl(file-&gt;f_mapping-&gt;host, file, cmd, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations def_blk_aops = {</div><div class='add'>+const struct address_space_operations def_blk_aops = {</div><div class='ctx'> 	.readpage	= blkdev_readpage,</div><div class='ctx'> 	.writepage	= blkdev_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='head'>diff --git a/fs/buffer.c b/fs/buffer.c<br/>index 23f1f3a68077..3660dcb97591 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/buffer.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/buffer.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/buffer.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/buffer.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  * async buffer flushing, 1999 Andrea Arcangeli &lt;andrea@suse.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -331,7 +330,6 @@ long do_fsync(struct file *file, int datasync)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	current-&gt;flags |= PF_SYNCWRITE;</div><div class='ctx'> 	ret = filemap_fdatawrite(mapping);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -346,7 +344,6 @@ long do_fsync(struct file *file, int datasync)</div><div class='ctx'> 	err = filemap_fdatawait(mapping);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ret = err;</div><div class='del'>-	current-&gt;flags &amp;= ~PF_SYNCWRITE;</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -566,7 +563,7 @@ still_busy:</div><div class='ctx'>  * Completion handler for block_write_full_page() - pages which are unlocked</div><div class='ctx'>  * during I/O, and which have PageWriteback cleared upon I/O completion.</div><div class='ctx'>  */</div><div class='del'>-void end_buffer_async_write(struct buffer_head *bh, int uptodate)</div><div class='add'>+static void end_buffer_async_write(struct buffer_head *bh, int uptodate)</div><div class='ctx'> {</div><div class='ctx'> 	char b[BDEVNAME_SIZE];</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -854,7 +851,7 @@ int __set_page_dirty_buffers(struct page *page)</div><div class='ctx'> 		write_lock_irq(&amp;mapping-&gt;tree_lock);</div><div class='ctx'> 		if (page-&gt;mapping) {	/* Race with truncate? */</div><div class='ctx'> 			if (mapping_cap_account_dirty(mapping))</div><div class='del'>-				inc_page_state(nr_dirty);</div><div class='add'>+				__inc_zone_page_state(page, NR_FILE_DIRTY);</div><div class='ctx'> 			radix_tree_tag_set(&amp;mapping-&gt;page_tree,</div><div class='ctx'> 						page_index(page),</div><div class='ctx'> 						PAGECACHE_TAG_DIRTY);</div><div class='hunk'>@@ -2600,7 +2597,7 @@ int nobh_truncate_page(struct address_space *mapping, loff_t from)</div><div class='ctx'> 	unsigned offset = from &amp; (PAGE_CACHE_SIZE-1);</div><div class='ctx'> 	unsigned to;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	struct address_space_operations *a_ops = mapping-&gt;a_ops;</div><div class='add'>+	const struct address_space_operations *a_ops = mapping-&gt;a_ops;</div><div class='ctx'> 	char *kaddr;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3168,7 +3165,6 @@ EXPORT_SYMBOL(block_sync_page);</div><div class='ctx'> EXPORT_SYMBOL(block_truncate_page);</div><div class='ctx'> EXPORT_SYMBOL(block_write_full_page);</div><div class='ctx'> EXPORT_SYMBOL(cont_prepare_write);</div><div class='del'>-EXPORT_SYMBOL(end_buffer_async_write);</div><div class='ctx'> EXPORT_SYMBOL(end_buffer_read_sync);</div><div class='ctx'> EXPORT_SYMBOL(end_buffer_write_sync);</div><div class='ctx'> EXPORT_SYMBOL(file_fsync);</div><div class='head'>diff --git a/fs/char_dev.c b/fs/char_dev.c<br/>index f3418f7a6e9d..3483d3cf8087 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/char_dev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/char_dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/char_dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/char_dev.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -14,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kobject.h&gt;</div><div class='hunk'>@@ -184,6 +182,28 @@ int alloc_chrdev_region(dev_t *dev, unsigned baseminor, unsigned count,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * register_chrdev() - Register a major number for character devices.</div><div class='add'>+ * @major: major device number or 0 for dynamic allocation</div><div class='add'>+ * @name: name of this range of devices</div><div class='add'>+ * @fops: file operations associated with this devices</div><div class='add'>+ *</div><div class='add'>+ * If @major == 0 this functions will dynamically allocate a major and return</div><div class='add'>+ * its number.</div><div class='add'>+ *</div><div class='add'>+ * If @major &gt; 0 this function will attempt to reserve a device with the given</div><div class='add'>+ * major number and will return zero on success.</div><div class='add'>+ *</div><div class='add'>+ * Returns a -ve errno on failure.</div><div class='add'>+ *</div><div class='add'>+ * The name of this device has nothing to do with the name of the device in</div><div class='add'>+ * /dev. It only helps to keep track of the different owners of devices. If</div><div class='add'>+ * your module name has only one type of devices it's ok to use e.g. the name</div><div class='add'>+ * of the module here.</div><div class='add'>+ *</div><div class='add'>+ * This function registers a range of 256 minor numbers. The first minor number</div><div class='add'>+ * is 0.</div><div class='add'>+ */</div><div class='ctx'> int register_chrdev(unsigned int major, const char *name,</div><div class='ctx'> 		    const struct file_operations *fops)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES<br/>index 7271bb0257f6..a61d17ed1827 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/CHANGES?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/CHANGES</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/CHANGES?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/CHANGES</a></div><div class='hunk'>@@ -1,9 +1,24 @@</div><div class='add'>+Version 1.44</div><div class='add'>+------------</div><div class='add'>+Rewritten sessionsetup support, including support for legacy SMB</div><div class='add'>+session setup needed for OS/2 and older servers such as Windows 95 and 98.</div><div class='add'>+Fix oops on ls to OS/2 servers.  Add support for level 1 FindFirst</div><div class='add'>+so we can do search (ls etc.) to OS/2.  Do not send NTCreateX</div><div class='add'>+or recent levels of FindFirst unless server says it supports NT SMBs</div><div class='add'>+(instead use legacy equivalents from LANMAN dialect). Fix to allow</div><div class='add'>+NTLMv2 authentication support (now can use stronger password hashing</div><div class='add'>+on mount if corresponding /proc/fs/cifs/SecurityFlags is set (0x4004).</div><div class='add'>+Allow override of global cifs security flags on mount via "sec=" option(s).</div><div class='add'>+</div><div class='ctx'> Version 1.43</div><div class='ctx'> ------------</div><div class='ctx'> POSIX locking to servers which support CIFS POSIX Extensions</div><div class='ctx'> (disabled by default controlled by proc/fs/cifs/Experimental).</div><div class='ctx'> Handle conversion of long share names (especially Asian languages)</div><div class='del'>-to Unicode during mount. </div><div class='add'>+to Unicode during mount. Fix memory leak in sess struct on reconnect.</div><div class='add'>+Fix rare oops after acpi suspend.  Fix O_TRUNC opens to overwrite on</div><div class='add'>+cifs open which helps rare case when setpathinfo fails or server does</div><div class='add'>+not support it. </div><div class='ctx'> </div><div class='ctx'> Version 1.42</div><div class='ctx'> ------------</div><div class='head'>diff --git a/fs/cifs/Makefile b/fs/cifs/Makefile<br/>index 58c77254a23b..a26f26ed5a17 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/Makefile</a></div><div class='hunk'>@@ -3,4 +3,4 @@</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_CIFS) += cifs.o</div><div class='ctx'> </div><div class='del'>-cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o readdir.o ioctl.o ntlmssp.o</div><div class='add'>+cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o readdir.o ioctl.o sess.o</div><div class='head'>diff --git a/fs/cifs/README b/fs/cifs/README<br/>index 0355003f4f0a..7986d0d97ace 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/README?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/README</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/README?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/README</a></div><div class='hunk'>@@ -443,7 +443,10 @@ A partial list of the supported mount options follows:</div><div class='ctx'> 		SFU does).  In the future the bottom 9 bits of the mode</div><div class='ctx'> 		mode also will be emulated using queries of the security</div><div class='ctx'> 		descriptor (ACL).</div><div class='del'>-sec		Security mode.  Allowed values are:</div><div class='add'>+ sign           Must use packet signing (helps avoid unwanted data modification</div><div class='add'>+		by intermediate systems in the route).  Note that signing</div><div class='add'>+		does not work with lanman or plaintext authentication.</div><div class='add'>+ sec            Security mode.  Allowed values are:</div><div class='ctx'> 			none	attempt to connection as a null user (no name)</div><div class='ctx'> 			krb5    Use Kerberos version 5 authentication</div><div class='ctx'> 			krb5i   Use Kerberos authentication and packet signing</div><div class='hunk'>@@ -453,6 +456,8 @@ sec		Security mode.  Allowed values are:</div><div class='ctx'> 				server requires signing also can be the default) </div><div class='ctx'> 			ntlmv2  Use NTLMv2 password hashing      </div><div class='ctx'> 			ntlmv2i Use NTLMv2 password hashing with packet signing</div><div class='add'>+			lanman  (if configured in kernel config) use older</div><div class='add'>+				lanman hash</div><div class='ctx'> </div><div class='ctx'> The mount.cifs mount helper also accepts a few mount options before -o</div><div class='ctx'> including:</div><div class='hunk'>@@ -485,14 +490,34 @@ PacketSigningEnabled	If set to one, cifs packet signing is enabled</div><div class='ctx'> 			it.  If set to two, cifs packet signing is</div><div class='ctx'> 			required even if the server considers packet</div><div class='ctx'> 			signing optional. (default 1)</div><div class='add'>+SecurityFlags		Flags which control security negotiation and</div><div class='add'>+			also packet signing. Authentication (may/must)</div><div class='add'>+			flags (e.g. for NTLM and/or NTLMv2) may be combined with</div><div class='add'>+			the signing flags.  Specifying two different password</div><div class='add'>+			hashing mechanisms (as "must use") on the other hand </div><div class='add'>+			does not make much sense. Default flags are </div><div class='add'>+				0x07007 </div><div class='add'>+			(NTLM, NTLMv2 and packet signing allowed).  Maximum </div><div class='add'>+			allowable flags if you want to allow mounts to servers</div><div class='add'>+			using weaker password hashes is 0x37037 (lanman,</div><div class='add'>+			plaintext, ntlm, ntlmv2, signing allowed):</div><div class='add'>+ </div><div class='add'>+			may use packet signing 				0x00001</div><div class='add'>+			must use packet signing				0x01001</div><div class='add'>+			may use NTLM (most common password hash)	0x00002</div><div class='add'>+			must use NTLM					0x02002</div><div class='add'>+			may use NTLMv2					0x00004</div><div class='add'>+			must use NTLMv2					0x04004</div><div class='add'>+			may use Kerberos security (not implemented yet) 0x00008</div><div class='add'>+			must use Kerberos (not implemented yet)         0x08008</div><div class='add'>+			may use lanman (weak) password hash  		0x00010</div><div class='add'>+			must use lanman password hash			0x10010</div><div class='add'>+			may use plaintext passwords    			0x00020</div><div class='add'>+			must use plaintext passwords			0x20020</div><div class='add'>+			(reserved for future packet encryption)		0x00040</div><div class='add'>+</div><div class='ctx'> cifsFYI			If set to one, additional debug information is</div><div class='ctx'> 			logged to the system error log. (default 0)</div><div class='del'>-ExtendedSecurity	If set to one, SPNEGO session establishment</div><div class='del'>-			is allowed which enables more advanced </div><div class='del'>-			secure CIFS session establishment (default 0)</div><div class='del'>-NTLMV2Enabled		If set to one, more secure password hashes</div><div class='del'>-			are used when the server supports them and</div><div class='del'>-			when kerberos is not negotiated (default 0)</div><div class='ctx'> traceSMB		If set to one, debug information is logged to the</div><div class='ctx'> 			system error log with the start of smb requests</div><div class='ctx'> 			and responses (default 0)</div><div class='head'>diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c<br/>index 086ae8f4a207..2e75883b7f54 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/asn1.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/asn1.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/asn1.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/asn1.c</a></div><div class='hunk'>@@ -17,7 +17,6 @@</div><div class='ctx'>  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -467,7 +466,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,</div><div class='ctx'> 	asn1_open(&amp;ctx, security_blob, length);</div><div class='ctx'> </div><div class='ctx'> 	if (asn1_header_decode(&amp;ctx, &amp;end, &amp;cls, &amp;con, &amp;tag) == 0) {</div><div class='del'>-		cFYI(1, ("Error decoding negTokenInit header "));</div><div class='add'>+		cFYI(1, ("Error decoding negTokenInit header"));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else if ((cls != ASN1_APL) || (con != ASN1_CON)</div><div class='ctx'> 		   || (tag != ASN1_EOC)) {</div><div class='hunk'>@@ -495,7 +494,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (asn1_header_decode(&amp;ctx, &amp;end, &amp;cls, &amp;con, &amp;tag) == 0) {</div><div class='del'>-			cFYI(1, ("Error decoding negTokenInit "));</div><div class='add'>+			cFYI(1, ("Error decoding negTokenInit"));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else if ((cls != ASN1_CTX) || (con != ASN1_CON)</div><div class='ctx'> 			   || (tag != ASN1_EOC)) {</div><div class='hunk'>@@ -505,7 +504,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (asn1_header_decode(&amp;ctx, &amp;end, &amp;cls, &amp;con, &amp;tag) == 0) {</div><div class='del'>-			cFYI(1, ("Error decoding negTokenInit "));</div><div class='add'>+			cFYI(1, ("Error decoding negTokenInit"));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else if ((cls != ASN1_UNI) || (con != ASN1_CON)</div><div class='ctx'> 			   || (tag != ASN1_SEQ)) {</div><div class='hunk'>@@ -515,7 +514,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (asn1_header_decode(&amp;ctx, &amp;end, &amp;cls, &amp;con, &amp;tag) == 0) {</div><div class='del'>-			cFYI(1, ("Error decoding 2nd part of negTokenInit "));</div><div class='add'>+			cFYI(1, ("Error decoding 2nd part of negTokenInit"));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else if ((cls != ASN1_CTX) || (con != ASN1_CON)</div><div class='ctx'> 			   || (tag != ASN1_EOC)) {</div><div class='hunk'>@@ -527,7 +526,7 @@ decode_negTokenInit(unsigned char *security_blob, int length,</div><div class='ctx'> </div><div class='ctx'> 		if (asn1_header_decode</div><div class='ctx'> 		    (&amp;ctx, &amp;sequence_end, &amp;cls, &amp;con, &amp;tag) == 0) {</div><div class='del'>-			cFYI(1, ("Error decoding 2nd part of negTokenInit "));</div><div class='add'>+			cFYI(1, ("Error decoding 2nd part of negTokenInit"));</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else if ((cls != ASN1_UNI) || (con != ASN1_CON)</div><div class='ctx'> 			   || (tag != ASN1_SEQ)) {</div><div class='head'>diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c<br/>index f4124a32bef8..96abeb738978 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifs_debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifs_debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifs_debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifs_debug.c</a></div><div class='hunk'>@@ -39,7 +39,7 @@ cifs_dump_mem(char *label, void *data, int length)</div><div class='ctx'> 	char *charptr = data;</div><div class='ctx'> 	char buf[10], line[80];</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n\n", </div><div class='add'>+	printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n", </div><div class='ctx'> 		label, length, data);</div><div class='ctx'> 	for (i = 0; i &lt; length; i += 16) {</div><div class='ctx'> 		line[0] = 0;</div><div class='hunk'>@@ -57,6 +57,57 @@ cifs_dump_mem(char *label, void *data, int length)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CIFS_DEBUG2</div><div class='add'>+void cifs_dump_detail(struct smb_hdr * smb)</div><div class='add'>+{</div><div class='add'>+	cERROR(1,("Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d",</div><div class='add'>+		  smb-&gt;Command, smb-&gt;Status.CifsError,</div><div class='add'>+		  smb-&gt;Flags, smb-&gt;Flags2, smb-&gt;Mid, smb-&gt;Pid));</div><div class='add'>+	cERROR(1,("smb buf %p len %d", smb, smbCalcSize_LE(smb)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void cifs_dump_mids(struct TCP_Server_Info * server)</div><div class='add'>+{</div><div class='add'>+	struct list_head *tmp;</div><div class='add'>+	struct mid_q_entry * mid_entry;</div><div class='add'>+</div><div class='add'>+	if(server == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cERROR(1,("Dump pending requests:"));</div><div class='add'>+	spin_lock(&amp;GlobalMid_Lock);</div><div class='add'>+	list_for_each(tmp, &amp;server-&gt;pending_mid_q) {</div><div class='add'>+		mid_entry = list_entry(tmp, struct mid_q_entry, qhead);</div><div class='add'>+		if(mid_entry) {</div><div class='add'>+			cERROR(1,("State: %d Cmd: %d Pid: %d Tsk: %p Mid %d",</div><div class='add'>+				mid_entry-&gt;midState,</div><div class='add'>+				(int)mid_entry-&gt;command,</div><div class='add'>+				mid_entry-&gt;pid,</div><div class='add'>+				mid_entry-&gt;tsk,</div><div class='add'>+				mid_entry-&gt;mid));</div><div class='add'>+#ifdef CONFIG_CIFS_STATS2</div><div class='add'>+			cERROR(1,("IsLarge: %d buf: %p time rcv: %ld now: %ld",</div><div class='add'>+				mid_entry-&gt;largeBuf,</div><div class='add'>+				mid_entry-&gt;resp_buf,</div><div class='add'>+				mid_entry-&gt;when_received,</div><div class='add'>+				jiffies));</div><div class='add'>+#endif /* STATS2 */</div><div class='add'>+			cERROR(1,("IsMult: %d IsEnd: %d", mid_entry-&gt;multiRsp,</div><div class='add'>+				  mid_entry-&gt;multiEnd));</div><div class='add'>+			if(mid_entry-&gt;resp_buf) {</div><div class='add'>+				cifs_dump_detail(mid_entry-&gt;resp_buf);</div><div class='add'>+				cifs_dump_mem("existing buf: ",</div><div class='add'>+					mid_entry-&gt;resp_buf,</div><div class='add'>+					62 /* fixme */);</div><div class='add'>+			}</div><div class='add'>+			</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;GlobalMid_Lock);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_CIFS_DEBUG2 */</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> static int</div><div class='ctx'> cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,</div><div class='hunk'>@@ -73,7 +124,6 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,</div><div class='ctx'> </div><div class='ctx'> 	*beginBuffer = buf + offset;</div><div class='ctx'> </div><div class='del'>-	</div><div class='ctx'> 	length =</div><div class='ctx'> 	    sprintf(buf,</div><div class='ctx'> 		    "Display Internal CIFS Data Structures for Debugging\n"</div><div class='hunk'>@@ -395,12 +445,12 @@ static read_proc_t traceSMB_read;</div><div class='ctx'> static write_proc_t traceSMB_write;</div><div class='ctx'> static read_proc_t multiuser_mount_read;</div><div class='ctx'> static write_proc_t multiuser_mount_write;</div><div class='del'>-static read_proc_t extended_security_read;</div><div class='del'>-static write_proc_t extended_security_write;</div><div class='del'>-static read_proc_t ntlmv2_enabled_read;</div><div class='add'>+static read_proc_t security_flags_read;</div><div class='add'>+static write_proc_t security_flags_write;</div><div class='add'>+/* static read_proc_t ntlmv2_enabled_read;</div><div class='ctx'> static write_proc_t ntlmv2_enabled_write;</div><div class='ctx'> static read_proc_t packet_signing_enabled_read;</div><div class='del'>-static write_proc_t packet_signing_enabled_write;</div><div class='add'>+static write_proc_t packet_signing_enabled_write;*/</div><div class='ctx'> static read_proc_t experimEnabled_read;</div><div class='ctx'> static write_proc_t experimEnabled_write;</div><div class='ctx'> static read_proc_t linuxExtensionsEnabled_read;</div><div class='hunk'>@@ -458,10 +508,10 @@ cifs_proc_init(void)</div><div class='ctx'> 		pde-&gt;write_proc = multiuser_mount_write;</div><div class='ctx'> </div><div class='ctx'> 	pde =</div><div class='del'>-	    create_proc_read_entry("ExtendedSecurity", 0, proc_fs_cifs,</div><div class='del'>-				extended_security_read, NULL);</div><div class='add'>+	    create_proc_read_entry("SecurityFlags", 0, proc_fs_cifs,</div><div class='add'>+				security_flags_read, NULL);</div><div class='ctx'> 	if (pde)</div><div class='del'>-		pde-&gt;write_proc = extended_security_write;</div><div class='add'>+		pde-&gt;write_proc = security_flags_write;</div><div class='ctx'> </div><div class='ctx'> 	pde =</div><div class='ctx'> 	create_proc_read_entry("LookupCacheEnabled", 0, proc_fs_cifs,</div><div class='hunk'>@@ -469,7 +519,7 @@ cifs_proc_init(void)</div><div class='ctx'> 	if (pde)</div><div class='ctx'> 		pde-&gt;write_proc = lookupFlag_write;</div><div class='ctx'> </div><div class='del'>-	pde =</div><div class='add'>+/*	pde =</div><div class='ctx'> 	    create_proc_read_entry("NTLMV2Enabled", 0, proc_fs_cifs,</div><div class='ctx'> 				ntlmv2_enabled_read, NULL);</div><div class='ctx'> 	if (pde)</div><div class='hunk'>@@ -479,7 +529,7 @@ cifs_proc_init(void)</div><div class='ctx'> 	    create_proc_read_entry("PacketSigningEnabled", 0, proc_fs_cifs,</div><div class='ctx'> 				packet_signing_enabled_read, NULL);</div><div class='ctx'> 	if (pde)</div><div class='del'>-		pde-&gt;write_proc = packet_signing_enabled_write;</div><div class='add'>+		pde-&gt;write_proc = packet_signing_enabled_write;*/</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -496,9 +546,9 @@ cifs_proc_clean(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	remove_proc_entry("MultiuserMount", proc_fs_cifs);</div><div class='ctx'> 	remove_proc_entry("OplockEnabled", proc_fs_cifs);</div><div class='del'>-	remove_proc_entry("NTLMV2Enabled",proc_fs_cifs);</div><div class='del'>-	remove_proc_entry("ExtendedSecurity",proc_fs_cifs);</div><div class='del'>-	remove_proc_entry("PacketSigningEnabled",proc_fs_cifs);</div><div class='add'>+/*	remove_proc_entry("NTLMV2Enabled",proc_fs_cifs); */</div><div class='add'>+	remove_proc_entry("SecurityFlags",proc_fs_cifs);</div><div class='add'>+/*	remove_proc_entry("PacketSigningEnabled",proc_fs_cifs); */</div><div class='ctx'> 	remove_proc_entry("LinuxExtensionsEnabled",proc_fs_cifs);</div><div class='ctx'> 	remove_proc_entry("Experimental",proc_fs_cifs);</div><div class='ctx'> 	remove_proc_entry("LookupCacheEnabled",proc_fs_cifs);</div><div class='hunk'>@@ -782,12 +832,12 @@ multiuser_mount_write(struct file *file, const char __user *buffer,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-extended_security_read(char *page, char **start, off_t off,</div><div class='add'>+security_flags_read(char *page, char **start, off_t off,</div><div class='ctx'> 		       int count, int *eof, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	len = sprintf(page, "%d\n", extended_security);</div><div class='add'>+	len = sprintf(page, "0x%x\n", extended_security);</div><div class='ctx'> </div><div class='ctx'> 	len -= off;</div><div class='ctx'> 	*start = page + off;</div><div class='hunk'>@@ -803,24 +853,52 @@ extended_security_read(char *page, char **start, off_t off,</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> static int</div><div class='del'>-extended_security_write(struct file *file, const char __user *buffer,</div><div class='add'>+security_flags_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 			unsigned long count, void *data)</div><div class='ctx'> {</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	char flags_string[12];</div><div class='ctx'> 	char c;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = get_user(c, buffer);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='del'>-	if (c == '0' || c == 'n' || c == 'N')</div><div class='del'>-		extended_security = 0;</div><div class='del'>-	else if (c == '1' || c == 'y' || c == 'Y')</div><div class='del'>-		extended_security = 1;</div><div class='add'>+	if((count &lt; 1) || (count &gt; 11))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(flags_string, 0, 12);</div><div class='add'>+</div><div class='add'>+	if(copy_from_user(flags_string, buffer, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	if(count &lt; 3) {</div><div class='add'>+		/* single char or single char followed by null */</div><div class='add'>+		c = flags_string[0];</div><div class='add'>+		if (c == '0' || c == 'n' || c == 'N')</div><div class='add'>+			extended_security = CIFSSEC_DEF; /* default */</div><div class='add'>+		else if (c == '1' || c == 'y' || c == 'Y')</div><div class='add'>+			extended_security = CIFSSEC_MAX;</div><div class='add'>+		return count;</div><div class='add'>+	}</div><div class='add'>+	/* else we have a number */</div><div class='add'>+</div><div class='add'>+	flags = simple_strtoul(flags_string, NULL, 0);</div><div class='add'>+</div><div class='add'>+	cFYI(1,("sec flags 0x%x", flags));</div><div class='add'>+</div><div class='add'>+	if(flags &lt;= 0)  {</div><div class='add'>+		cERROR(1,("invalid security flags %s",flags_string));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if(flags &amp; ~CIFSSEC_MASK) {</div><div class='add'>+		cERROR(1,("attempt to set unsupported security flags 0x%x",</div><div class='add'>+			flags &amp; ~CIFSSEC_MASK));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* flags look ok - update the global security flags for cifs module */</div><div class='add'>+	extended_security = flags;</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+/* static int</div><div class='ctx'> ntlmv2_enabled_read(char *page, char **start, off_t off,</div><div class='ctx'> 		       int count, int *eof, void *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -855,6 +933,8 @@ ntlmv2_enabled_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 		ntlmv2_support = 0;</div><div class='ctx'> 	else if (c == '1' || c == 'y' || c == 'Y')</div><div class='ctx'> 		ntlmv2_support = 1;</div><div class='add'>+	else if (c == '2')</div><div class='add'>+		ntlmv2_support = 2;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='hunk'>@@ -898,7 +978,7 @@ packet_signing_enabled_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 		sign_CIFS_PDUs = 2;</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='del'>-}</div><div class='add'>+} */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h<br/>index 4304d9dcfb6c..c26cd0d2c6d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifs_debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifs_debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifs_debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifs_debug.h</a></div><div class='hunk'>@@ -24,6 +24,10 @@</div><div class='ctx'> #define _H_CIFS_DEBUG</div><div class='ctx'> </div><div class='ctx'> void cifs_dump_mem(char *label, void *data, int length);</div><div class='add'>+#ifdef CONFIG_CIFS_DEBUG2</div><div class='add'>+void cifs_dump_detail(struct smb_hdr *);</div><div class='add'>+void cifs_dump_mids(struct TCP_Server_Info *);</div><div class='add'>+#endif</div><div class='ctx'> extern int traceSMB;		/* flag which enables the function below */</div><div class='ctx'> void dump_smb(struct smb_hdr *, int);</div><div class='ctx'> #define CIFS_INFO	0x01</div><div class='head'>diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c<br/>index d2b128255944..d2a8b2941fc2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifs_unicode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifs_unicode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifs_unicode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifs_unicode.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include "cifs_unicode.h"</div><div class='ctx'> #include "cifs_uniupr.h"</div><div class='ctx'> #include "cifspdu.h"</div><div class='add'>+#include "cifsglob.h"</div><div class='ctx'> #include "cifs_debug.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c<br/>index e7d63737e651..a89efaf78a26 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifsencrypt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsencrypt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifsencrypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifsencrypt.c</a></div><div class='hunk'>@@ -26,6 +26,8 @@</div><div class='ctx'> #include "md5.h"</div><div class='ctx'> #include "cifs_unicode.h"</div><div class='ctx'> #include "cifsproto.h"</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Calculate and return the CIFS signature based on the mac key and the smb pdu */</div><div class='ctx'> /* the 16 byte signature must be allocated by the caller  */</div><div class='hunk'>@@ -35,6 +37,8 @@</div><div class='ctx'> </div><div class='ctx'> extern void mdfour(unsigned char *out, unsigned char *in, int n);</div><div class='ctx'> extern void E_md4hash(const unsigned char *passwd, unsigned char *p16);</div><div class='add'>+extern void SMBencrypt(unsigned char *passwd, unsigned char *c8,</div><div class='add'>+                       unsigned char *p24);</div><div class='ctx'> 	</div><div class='ctx'> static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu, </div><div class='ctx'> 				    const char * key, char * signature)</div><div class='hunk'>@@ -45,7 +49,7 @@ static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	MD5Init(&amp;context);</div><div class='del'>-	MD5Update(&amp;context,key,CIFS_SESSION_KEY_SIZE+16);</div><div class='add'>+	MD5Update(&amp;context,key,CIFS_SESS_KEY_SIZE+16);</div><div class='ctx'> 	MD5Update(&amp;context,cifs_pdu-&gt;Protocol,cifs_pdu-&gt;smb_buf_length);</div><div class='ctx'> 	MD5Final(signature,&amp;context);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -90,7 +94,7 @@ static int cifs_calc_signature2(const struct kvec * iov, int n_vec,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	MD5Init(&amp;context);</div><div class='del'>-	MD5Update(&amp;context,key,CIFS_SESSION_KEY_SIZE+16);</div><div class='add'>+	MD5Update(&amp;context,key,CIFS_SESS_KEY_SIZE+16);</div><div class='ctx'> 	for(i=0;i&lt;n_vec;i++) {</div><div class='ctx'> 		if(iov[i].iov_base == NULL) {</div><div class='ctx'> 			cERROR(1,("null iovec entry"));</div><div class='hunk'>@@ -204,11 +208,12 @@ int cifs_calculate_mac_key(char * key, const char * rn, const char * password)</div><div class='ctx'> </div><div class='ctx'> 	E_md4hash(password, temp_key);</div><div class='ctx'> 	mdfour(key,temp_key,16);</div><div class='del'>-	memcpy(key+16,rn, CIFS_SESSION_KEY_SIZE);</div><div class='add'>+	memcpy(key+16,rn, CIFS_SESS_KEY_SIZE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses, struct nls_table * nls_info)</div><div class='add'>+int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses, </div><div class='add'>+				const struct nls_table * nls_info)</div><div class='ctx'> {</div><div class='ctx'> 	char temp_hash[16];</div><div class='ctx'> 	struct HMACMD5Context ctx;</div><div class='hunk'>@@ -225,6 +230,8 @@ int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses, struct nls_table * nls_</div><div class='ctx'> 	user_name_len = strlen(ses-&gt;userName);</div><div class='ctx'> 	if(user_name_len &gt; MAX_USERNAME_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if(ses-&gt;domainName == NULL)</div><div class='add'>+		return -EINVAL; /* BB should we use CIFS_LINUX_DOM */</div><div class='ctx'> 	dom_name_len = strlen(ses-&gt;domainName);</div><div class='ctx'> 	if(dom_name_len &gt; MAX_USERNAME_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -259,16 +266,131 @@ int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses, struct nls_table * nls_</div><div class='ctx'> 	kfree(unicode_buf);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-void CalcNTLMv2_response(const struct cifsSesInfo * ses,char * v2_session_response)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+void calc_lanman_hash(struct cifsSesInfo * ses, char * lnm_session_key)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	char password_with_pad[CIFS_ENCPWD_SIZE];</div><div class='add'>+</div><div class='add'>+	if(ses-&gt;server == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(password_with_pad, 0, CIFS_ENCPWD_SIZE);</div><div class='add'>+	strncpy(password_with_pad, ses-&gt;password, CIFS_ENCPWD_SIZE);</div><div class='add'>+</div><div class='add'>+	if((ses-&gt;server-&gt;secMode &amp; SECMODE_PW_ENCRYPT) == 0)</div><div class='add'>+		if(extended_security &amp; CIFSSEC_MAY_PLNTXT) {</div><div class='add'>+			memcpy(lnm_session_key, password_with_pad, CIFS_ENCPWD_SIZE); </div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* calculate old style session key */</div><div class='add'>+	/* calling toupper is less broken than repeatedly</div><div class='add'>+	calling nls_toupper would be since that will never</div><div class='add'>+	work for UTF8, but neither handles multibyte code pages</div><div class='add'>+	but the only alternative would be converting to UCS-16 (Unicode)</div><div class='add'>+	(using a routine something like UniStrupr) then</div><div class='add'>+	uppercasing and then converting back from Unicode - which</div><div class='add'>+	would only worth doing it if we knew it were utf8. Basically</div><div class='add'>+	utf8 and other multibyte codepages each need their own strupper</div><div class='add'>+	function since a byte at a time will ont work. */</div><div class='add'>+</div><div class='add'>+	for(i = 0; i &lt; CIFS_ENCPWD_SIZE; i++) {</div><div class='add'>+		password_with_pad[i] = toupper(password_with_pad[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SMBencrypt(password_with_pad, ses-&gt;server-&gt;cryptKey, lnm_session_key);</div><div class='add'>+	/* clear password before we return/free memory */</div><div class='add'>+	memset(password_with_pad, 0, CIFS_ENCPWD_SIZE);</div><div class='add'>+}</div><div class='add'>+#endif /* CIFS_WEAK_PW_HASH */</div><div class='add'>+</div><div class='add'>+static int calc_ntlmv2_hash(struct cifsSesInfo *ses, </div><div class='add'>+			    const struct nls_table * nls_cp)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	int len;</div><div class='add'>+	char nt_hash[16];</div><div class='add'>+	struct HMACMD5Context * pctxt;</div><div class='add'>+	wchar_t * user;</div><div class='add'>+	wchar_t * domain;</div><div class='add'>+</div><div class='add'>+	pctxt = kmalloc(sizeof(struct HMACMD5Context), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if(pctxt == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* calculate md4 hash of password */</div><div class='add'>+	E_md4hash(ses-&gt;password, nt_hash);</div><div class='add'>+</div><div class='add'>+	/* convert Domainname to unicode and uppercase */</div><div class='add'>+	hmac_md5_init_limK_to_64(nt_hash, 16, pctxt);</div><div class='add'>+</div><div class='add'>+	/* convert ses-&gt;userName to unicode and uppercase */</div><div class='add'>+	len = strlen(ses-&gt;userName);</div><div class='add'>+	user = kmalloc(2 + (len * 2), GFP_KERNEL);</div><div class='add'>+	if(user == NULL)</div><div class='add'>+		goto calc_exit_2;</div><div class='add'>+	len = cifs_strtoUCS(user, ses-&gt;userName, len, nls_cp);</div><div class='add'>+	UniStrupr(user);</div><div class='add'>+	hmac_md5_update((char *)user, 2*len, pctxt);</div><div class='add'>+</div><div class='add'>+	/* convert ses-&gt;domainName to unicode and uppercase */</div><div class='add'>+	if(ses-&gt;domainName) {</div><div class='add'>+		len = strlen(ses-&gt;domainName);</div><div class='add'>+</div><div class='add'>+        	domain = kmalloc(2 + (len * 2), GFP_KERNEL);</div><div class='add'>+		if(domain == NULL)</div><div class='add'>+			goto calc_exit_1;</div><div class='add'>+		len = cifs_strtoUCS(domain, ses-&gt;domainName, len, nls_cp);</div><div class='add'>+		UniStrupr(domain);</div><div class='add'>+</div><div class='add'>+		hmac_md5_update((char *)domain, 2*len, pctxt);</div><div class='add'>+	</div><div class='add'>+		kfree(domain);</div><div class='add'>+	}</div><div class='add'>+calc_exit_1:</div><div class='add'>+	kfree(user);</div><div class='add'>+calc_exit_2:</div><div class='add'>+	/* BB FIXME what about bytes 24 through 40 of the signing key? </div><div class='add'>+	   compare with the NTLM example */</div><div class='add'>+	hmac_md5_final(ses-&gt;server-&gt;mac_signing_key, pctxt);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void setup_ntlmv2_rsp(struct cifsSesInfo * ses, char * resp_buf, </div><div class='add'>+		      const struct nls_table * nls_cp)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	struct ntlmv2_resp * buf = (struct ntlmv2_resp *)resp_buf;</div><div class='add'>+</div><div class='add'>+	buf-&gt;blob_signature = cpu_to_le32(0x00000101);</div><div class='add'>+	buf-&gt;reserved = 0;</div><div class='add'>+	buf-&gt;time = cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME));</div><div class='add'>+	get_random_bytes(&amp;buf-&gt;client_chal, sizeof(buf-&gt;client_chal));</div><div class='add'>+	buf-&gt;reserved2 = 0;</div><div class='add'>+	buf-&gt;names[0].type = 0;</div><div class='add'>+	buf-&gt;names[0].length = 0;</div><div class='add'>+</div><div class='add'>+	/* calculate buf-&gt;ntlmv2_hash */</div><div class='add'>+	rc = calc_ntlmv2_hash(ses, nls_cp);</div><div class='add'>+	if(rc)</div><div class='add'>+		cERROR(1,("could not get v2 hash rc %d",rc));</div><div class='add'>+	CalcNTLMv2_response(ses, resp_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void CalcNTLMv2_response(const struct cifsSesInfo * ses, char * v2_session_response)</div><div class='ctx'> {</div><div class='ctx'> 	struct HMACMD5Context context;</div><div class='add'>+	/* rest of v2 struct already generated */</div><div class='ctx'> 	memcpy(v2_session_response + 8, ses-&gt;server-&gt;cryptKey,8);</div><div class='del'>-	/* gen_blob(v2_session_response + 16); */</div><div class='ctx'> 	hmac_md5_init_limK_to_64(ses-&gt;server-&gt;mac_signing_key, 16, &amp;context);</div><div class='ctx'> </div><div class='del'>-	hmac_md5_update(ses-&gt;server-&gt;cryptKey,8,&amp;context);</div><div class='del'>-/*	hmac_md5_update(v2_session_response+16)client thing,8,&amp;context); */ /* BB fix */</div><div class='add'>+	hmac_md5_update(v2_session_response+8, </div><div class='add'>+			sizeof(struct ntlmv2_resp) - 8, &amp;context);</div><div class='ctx'> </div><div class='ctx'> 	hmac_md5_final(v2_session_response,&amp;context);</div><div class='del'>-	cifs_dump_mem("v2_sess_rsp: ", v2_session_response, 32); /* BB removeme BB */</div><div class='add'>+/*	cifs_dump_mem("v2_sess_rsp: ", v2_session_response, 32); */</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c<br/>index c262d8874ce9..c28ede599946 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifsfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifsfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifsfs.c</a></div><div class='hunk'>@@ -56,8 +56,8 @@ unsigned int experimEnabled = 0;</div><div class='ctx'> unsigned int linuxExtEnabled = 1;</div><div class='ctx'> unsigned int lookupCacheEnabled = 1;</div><div class='ctx'> unsigned int multiuser_mount = 0;</div><div class='del'>-unsigned int extended_security = 0;</div><div class='del'>-unsigned int ntlmv2_support = 0;</div><div class='add'>+unsigned int extended_security = CIFSSEC_DEF;</div><div class='add'>+/* unsigned int ntlmv2_support = 0; */</div><div class='ctx'> unsigned int sign_CIFS_PDUs = 1;</div><div class='ctx'> extern struct task_struct * oplockThread; /* remove sparse warning */</div><div class='ctx'> struct task_struct * oplockThread = NULL;</div><div class='hunk'>@@ -166,8 +166,9 @@ cifs_put_super(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-cifs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+cifs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	int xid; </div><div class='ctx'> 	int rc = -EOPNOTSUPP;</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb;</div><div class='hunk'>@@ -402,12 +403,14 @@ static struct quotactl_ops cifs_quotactl_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CIFS_EXPERIMENTAL</div><div class='del'>-static void cifs_umount_begin(struct super_block * sblock)</div><div class='add'>+static void cifs_umount_begin(struct vfsmount * vfsmnt, int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb;</div><div class='ctx'> 	struct cifsTconInfo * tcon;</div><div class='ctx'> </div><div class='del'>-	cifs_sb = CIFS_SB(sblock);</div><div class='add'>+	if (!(flags &amp; MNT_FORCE))</div><div class='add'>+		return;</div><div class='add'>+	cifs_sb = CIFS_SB(vfsmnt-&gt;mnt_sb);</div><div class='ctx'> 	if(cifs_sb == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -460,9 +463,9 @@ struct super_operations cifs_super_ops = {</div><div class='ctx'> 	.remount_fs = cifs_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct super_block *</div><div class='add'>+static int</div><div class='ctx'> cifs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	    int flags, const char *dev_name, void *data)</div><div class='add'>+	    int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL);</div><div class='hunk'>@@ -470,7 +473,7 @@ cifs_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 	cFYI(1, ("Devname: %s flags: %d ", dev_name, flags));</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(sb))</div><div class='del'>-		return sb;</div><div class='add'>+		return PTR_ERR(sb);</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_flags = flags;</div><div class='ctx'> </div><div class='hunk'>@@ -478,10 +481,10 @@ cifs_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		up_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> 		deactivate_super(sb);</div><div class='del'>-		return ERR_PTR(rc);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	sb-&gt;s_flags |= MS_ACTIVE;</div><div class='del'>-	return sb;</div><div class='add'>+	return simple_set_mnt(mnt, sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t cifs_file_writev(struct file *file, const struct iovec *iov,</div><div class='hunk'>@@ -905,7 +908,7 @@ static int cifs_dnotify_thread(void * dummyarg)</div><div class='ctx'> 	struct cifsSesInfo *ses;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		if(try_to_freeze())</div><div class='add'>+		if (try_to_freeze())</div><div class='ctx'> 			continue;</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		schedule_timeout(15*HZ);</div><div class='head'>diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h<br/>index c98755dca868..8f75c6f24701 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifsfs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifsfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifsfs.h</a></div><div class='hunk'>@@ -32,7 +32,8 @@</div><div class='ctx'> #define TRUE 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern struct address_space_operations cifs_addr_ops;</div><div class='add'>+extern const struct address_space_operations cifs_addr_ops;</div><div class='add'>+extern const struct address_space_operations cifs_addr_ops_smallbuf;</div><div class='ctx'> </div><div class='ctx'> /* Functions related to super block operations */</div><div class='ctx'> extern struct super_operations cifs_super_ops;</div><div class='hunk'>@@ -74,7 +75,7 @@ extern ssize_t cifs_user_write(struct file *file, const char __user *write_data,</div><div class='ctx'> 			 size_t write_size, loff_t * poffset);</div><div class='ctx'> extern int cifs_lock(struct file *, int, struct file_lock *);</div><div class='ctx'> extern int cifs_fsync(struct file *, struct dentry *, int);</div><div class='del'>-extern int cifs_flush(struct file *);</div><div class='add'>+extern int cifs_flush(struct file *, fl_owner_t id);</div><div class='ctx'> extern int cifs_file_mmap(struct file * , struct vm_area_struct *);</div><div class='ctx'> extern const struct file_operations cifs_dir_ops;</div><div class='ctx'> extern int cifs_dir_open(struct inode *inode, struct file *file);</div><div class='hunk'>@@ -99,5 +100,5 @@ extern ssize_t	cifs_getxattr(struct dentry *, const char *, void *, size_t);</div><div class='ctx'> extern ssize_t	cifs_listxattr(struct dentry *, char *, size_t);</div><div class='ctx'> extern int cifs_ioctl (struct inode * inode, struct file * filep,</div><div class='ctx'> 		       unsigned int command, unsigned long arg);</div><div class='del'>-#define CIFS_VERSION   "1.43"</div><div class='add'>+#define CIFS_VERSION   "1.44"</div><div class='ctx'> #endif				/* _CIFSFS_H */</div><div class='head'>diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h<br/>index 006eb33bff5f..6d7cf5f3bc0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifsglob.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsglob.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifsglob.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifsglob.h</a></div><div class='hunk'>@@ -88,7 +88,8 @@ enum statusEnum {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum securityEnum {</div><div class='del'>-	NTLM = 0,		/* Legacy NTLM012 auth with NTLM hash */</div><div class='add'>+	LANMAN = 0,             /* Legacy LANMAN auth */</div><div class='add'>+	NTLM,			/* Legacy NTLM012 auth with NTLM hash */</div><div class='ctx'> 	NTLMv2,			/* Legacy NTLM auth with NTLMv2 hash */</div><div class='ctx'> 	RawNTLMSSP,		/* NTLMSSP without SPNEGO */</div><div class='ctx'> 	NTLMSSP,		/* NTLMSSP via SPNEGO */</div><div class='hunk'>@@ -157,7 +158,7 @@ struct TCP_Server_Info {</div><div class='ctx'> 	/* 16th byte of RFC1001 workstation name is always null */</div><div class='ctx'> 	char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];</div><div class='ctx'> 	__u32 sequence_number; /* needed for CIFS PDU signature */</div><div class='del'>-	char mac_signing_key[CIFS_SESSION_KEY_SIZE + 16]; </div><div class='add'>+	char mac_signing_key[CIFS_SESS_KEY_SIZE + 16]; </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -179,10 +180,13 @@ struct cifsUidInfo {</div><div class='ctx'> struct cifsSesInfo {</div><div class='ctx'> 	struct list_head cifsSessionList;</div><div class='ctx'> 	struct semaphore sesSem;</div><div class='add'>+#if 0</div><div class='ctx'> 	struct cifsUidInfo *uidInfo;	/* pointer to user info */</div><div class='add'>+#endif</div><div class='ctx'> 	struct TCP_Server_Info *server;	/* pointer to server info */</div><div class='ctx'> 	atomic_t inUse; /* # of mounts (tree connections) on this ses */</div><div class='ctx'> 	enum statusEnum status;</div><div class='add'>+	unsigned overrideSecFlg;  /* if non-zero override global sec flags */</div><div class='ctx'> 	__u16 ipc_tid;		/* special tid for connection to IPC share */</div><div class='ctx'> 	__u16 flags;</div><div class='ctx'> 	char *serverOS;		/* name of operating system underlying server */</div><div class='hunk'>@@ -194,7 +198,7 @@ struct cifsSesInfo {</div><div class='ctx'> 	char serverName[SERVER_NAME_LEN_WITH_NULL * 2];	/* BB make bigger for </div><div class='ctx'> 				TCP names - will ipv6 and sctp addresses fit? */</div><div class='ctx'> 	char userName[MAX_USERNAME_SIZE + 1];</div><div class='del'>-	char domainName[MAX_USERNAME_SIZE + 1];</div><div class='add'>+	char * domainName;</div><div class='ctx'> 	char * password;</div><div class='ctx'> };</div><div class='ctx'> /* session flags */</div><div class='hunk'>@@ -209,12 +213,12 @@ struct cifsTconInfo {</div><div class='ctx'> 	struct list_head openFileList;</div><div class='ctx'> 	struct semaphore tconSem;</div><div class='ctx'> 	struct cifsSesInfo *ses;	/* pointer to session associated with */</div><div class='del'>-	char treeName[MAX_TREE_SIZE + 1]; /* UNC name of resource (in ASCII not UTF) */</div><div class='add'>+	char treeName[MAX_TREE_SIZE + 1]; /* UNC name of resource in ASCII */</div><div class='ctx'> 	char *nativeFileSystem;</div><div class='ctx'> 	__u16 tid;		/* The 2 byte tree id */</div><div class='ctx'> 	__u16 Flags;		/* optional support bits */</div><div class='ctx'> 	enum statusEnum tidStatus;</div><div class='del'>-	atomic_t useCount;	/* how many mounts (explicit or implicit) to this share */</div><div class='add'>+	atomic_t useCount;	/* how many explicit/implicit mounts to share */</div><div class='ctx'> #ifdef CONFIG_CIFS_STATS</div><div class='ctx'> 	atomic_t num_smbs_sent;</div><div class='ctx'> 	atomic_t num_writes;</div><div class='hunk'>@@ -254,7 +258,7 @@ struct cifsTconInfo {</div><div class='ctx'> 	spinlock_t stat_lock;</div><div class='ctx'> #endif /* CONFIG_CIFS_STATS */</div><div class='ctx'> 	FILE_SYSTEM_DEVICE_INFO fsDevInfo;</div><div class='del'>-	FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo;	/* ok if file system name truncated */</div><div class='add'>+	FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo; /* ok if fs name truncated */</div><div class='ctx'> 	FILE_SYSTEM_UNIX_INFO fsUnixInfo;</div><div class='ctx'> 	unsigned retry:1;</div><div class='ctx'> 	unsigned nocase:1;</div><div class='hunk'>@@ -305,7 +309,6 @@ struct cifsFileInfo {</div><div class='ctx'> 	atomic_t wrtPending;   /* handle in use - defer close */</div><div class='ctx'> 	struct semaphore fh_sem; /* prevents reopen race after dead ses*/</div><div class='ctx'> 	char * search_resume_name; /* BB removeme BB */</div><div class='del'>-	unsigned int resume_name_length; /* BB removeme - field renamed and moved BB */</div><div class='ctx'> 	struct cifs_search_info srch_inf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -391,9 +394,9 @@ struct mid_q_entry {</div><div class='ctx'> 	struct smb_hdr *resp_buf;	/* response buffer */</div><div class='ctx'> 	int midState;	/* wish this were enum but can not pass to wait_event */</div><div class='ctx'> 	__u8 command;	/* smb command code */</div><div class='del'>-	unsigned multiPart:1;	/* multiple responses to one SMB request */</div><div class='ctx'> 	unsigned largeBuf:1;    /* if valid response, is pointer to large buf */</div><div class='del'>-	unsigned multiResp:1;   /* multiple trans2 responses for one request  */</div><div class='add'>+	unsigned multiRsp:1;   /* multiple trans2 responses for one request  */</div><div class='add'>+	unsigned multiEnd:1; /* both received */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct oplock_q_entry {</div><div class='hunk'>@@ -430,15 +433,35 @@ struct dir_notify_req {</div><div class='ctx'> #define   CIFS_LARGE_BUFFER     2</div><div class='ctx'> #define   CIFS_IOVEC            4    /* array of response buffers */</div><div class='ctx'> </div><div class='del'>-/* Type of session setup needed */</div><div class='del'>-#define   CIFS_PLAINTEXT	0</div><div class='del'>-#define   CIFS_LANMAN		1</div><div class='del'>-#define   CIFS_NTLM		2</div><div class='del'>-#define   CIFS_NTLMSSP_NEG	3</div><div class='del'>-#define   CIFS_NTLMSSP_AUTH	4</div><div class='del'>-#define   CIFS_SPNEGO_INIT	5</div><div class='del'>-#define   CIFS_SPNEGO_TARG	6</div><div class='del'>-</div><div class='add'>+/* Security Flags: indicate type of session setup needed */</div><div class='add'>+#define   CIFSSEC_MAY_SIGN	0x00001</div><div class='add'>+#define   CIFSSEC_MAY_NTLM	0x00002</div><div class='add'>+#define   CIFSSEC_MAY_NTLMV2	0x00004</div><div class='add'>+#define   CIFSSEC_MAY_KRB5	0x00008</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+#define   CIFSSEC_MAY_LANMAN	0x00010</div><div class='add'>+#define   CIFSSEC_MAY_PLNTXT	0x00020</div><div class='add'>+#endif /* weak passwords */</div><div class='add'>+#define   CIFSSEC_MAY_SEAL	0x00040 /* not supported yet */</div><div class='add'>+</div><div class='add'>+#define   CIFSSEC_MUST_SIGN	0x01001</div><div class='add'>+/* note that only one of the following can be set so the</div><div class='add'>+result of setting MUST flags more than once will be to</div><div class='add'>+require use of the stronger protocol */</div><div class='add'>+#define   CIFSSEC_MUST_NTLM	0x02002</div><div class='add'>+#define   CIFSSEC_MUST_NTLMV2	0x04004</div><div class='add'>+#define   CIFSSEC_MUST_KRB5	0x08008</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+#define   CIFSSEC_MUST_LANMAN	0x10010</div><div class='add'>+#define   CIFSSEC_MUST_PLNTXT	0x20020</div><div class='add'>+#define   CIFSSEC_MASK          0x37037 /* current flags supported if weak */</div><div class='add'>+#else	  </div><div class='add'>+#define	  CIFSSEC_MASK          0x07007 /* flags supported if no weak config */</div><div class='add'>+#endif /* WEAK_PW_HASH */</div><div class='add'>+#define   CIFSSEC_MUST_SEAL	0x40040 /* not supported yet */</div><div class='add'>+</div><div class='add'>+#define   CIFSSEC_DEF  CIFSSEC_MAY_SIGN | CIFSSEC_MAY_NTLM | CIFSSEC_MAY_NTLMV2</div><div class='add'>+#define   CIFSSEC_MAX  CIFSSEC_MUST_SIGN | CIFSSEC_MUST_NTLMV2</div><div class='ctx'> /*</div><div class='ctx'>  *****************************************************************</div><div class='ctx'>  * All constants go here</div><div class='hunk'>@@ -500,16 +523,16 @@ GLOBAL_EXTERN rwlock_t GlobalSMBSeslock;  /* protects list inserts on 3 above */</div><div class='ctx'> GLOBAL_EXTERN struct list_head GlobalOplock_Q;</div><div class='ctx'> </div><div class='ctx'> GLOBAL_EXTERN struct list_head GlobalDnotifyReqList; /* Outstanding dir notify requests */</div><div class='del'>-GLOBAL_EXTERN struct list_head GlobalDnotifyRsp_Q; /* Dir notify response queue */</div><div class='add'>+GLOBAL_EXTERN struct list_head GlobalDnotifyRsp_Q;/* DirNotify response queue */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Global transaction id (XID) information</div><div class='ctx'>  */</div><div class='ctx'> GLOBAL_EXTERN unsigned int GlobalCurrentXid;	/* protected by GlobalMid_Sem */</div><div class='del'>-GLOBAL_EXTERN unsigned int GlobalTotalActiveXid;	/* prot by GlobalMid_Sem */</div><div class='add'>+GLOBAL_EXTERN unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */</div><div class='ctx'> GLOBAL_EXTERN unsigned int GlobalMaxActiveXid;	/* prot by GlobalMid_Sem */</div><div class='del'>-GLOBAL_EXTERN spinlock_t GlobalMid_Lock;  /* protects above and list operations */</div><div class='del'>-					/* on midQ entries */</div><div class='add'>+GLOBAL_EXTERN spinlock_t GlobalMid_Lock;  /* protects above &amp; list operations */</div><div class='add'>+					  /* on midQ entries */</div><div class='ctx'> GLOBAL_EXTERN char Local_System_Name[15];</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -531,7 +554,7 @@ GLOBAL_EXTERN atomic_t smBufAllocCount;</div><div class='ctx'> GLOBAL_EXTERN atomic_t midCount;</div><div class='ctx'> </div><div class='ctx'> /* Misc globals */</div><div class='del'>-GLOBAL_EXTERN unsigned int multiuser_mount;	/* if enabled allows new sessions</div><div class='add'>+GLOBAL_EXTERN unsigned int multiuser_mount; /* if enabled allows new sessions</div><div class='ctx'> 				to be established on existing mount if we</div><div class='ctx'> 				have the uid/password or Kerberos credential </div><div class='ctx'> 				or equivalent for current user */</div><div class='hunk'>@@ -540,8 +563,8 @@ GLOBAL_EXTERN unsigned int experimEnabled;</div><div class='ctx'> GLOBAL_EXTERN unsigned int lookupCacheEnabled;</div><div class='ctx'> GLOBAL_EXTERN unsigned int extended_security;	/* if on, session setup sent </div><div class='ctx'> 				with more secure ntlmssp2 challenge/resp */</div><div class='del'>-GLOBAL_EXTERN unsigned int ntlmv2_support;  /* better optional password hash */</div><div class='ctx'> GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */</div><div class='add'>+GLOBAL_EXTERN unsigned int secFlags;</div><div class='ctx'> GLOBAL_EXTERN unsigned int linuxExtEnabled;/*enable Linux/Unix CIFS extensions*/</div><div class='ctx'> GLOBAL_EXTERN unsigned int CIFSMaxBufSize;  /* max size not including hdr */</div><div class='ctx'> GLOBAL_EXTERN unsigned int cifs_min_rcv;    /* min size of big ntwrk buf pool */</div><div class='head'>diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h<br/>index b2233ac05bd2..86239023545b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifspdu.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifspdu.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifspdu.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifspdu.h</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  *   You should have received a copy of the GNU Lesser General Public License</div><div class='ctx'>  *   along with this library; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA </div><div class='add'>+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CIFSPDU_H</div><div class='hunk'>@@ -24,8 +24,14 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+#define LANMAN_PROT 0</div><div class='add'>+#define CIFS_PROT   1</div><div class='add'>+#else</div><div class='ctx'> #define CIFS_PROT   0</div><div class='del'>-#define BAD_PROT    CIFS_PROT+1</div><div class='add'>+#endif</div><div class='add'>+#define POSIX_PROT  CIFS_PROT+1</div><div class='add'>+#define BAD_PROT 0xFFFF</div><div class='ctx'> </div><div class='ctx'> /* SMB command codes */</div><div class='ctx'> /* Some commands have minimal (wct=0,bcc=0), or uninteresting, responses</div><div class='hunk'>@@ -110,7 +116,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Size of the session key (crypto key encrypted with the password</div><div class='ctx'>  */</div><div class='del'>-#define CIFS_SESSION_KEY_SIZE (24)</div><div class='add'>+#define CIFS_SESS_KEY_SIZE (24)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Maximum user name length</div><div class='hunk'>@@ -400,6 +406,29 @@ typedef struct negotiate_req {</div><div class='ctx'> 	unsigned char DialectsArray[1];</div><div class='ctx'> } __attribute__((packed)) NEGOTIATE_REQ;</div><div class='ctx'> </div><div class='add'>+/* Dialect index is 13 for LANMAN */</div><div class='add'>+</div><div class='add'>+typedef struct lanman_neg_rsp {</div><div class='add'>+	struct smb_hdr hdr;	/* wct = 13 */</div><div class='add'>+	__le16 DialectIndex;</div><div class='add'>+	__le16 SecurityMode;</div><div class='add'>+	__le16 MaxBufSize;</div><div class='add'>+	__le16 MaxMpxCount;</div><div class='add'>+	__le16 MaxNumberVcs;</div><div class='add'>+	__le16 RawMode;</div><div class='add'>+	__le32 SessionKey;</div><div class='add'>+	__le32 ServerTime;</div><div class='add'>+	__le16 ServerTimeZone;</div><div class='add'>+	__le16 EncryptionKeyLength;</div><div class='add'>+	__le16 Reserved;</div><div class='add'>+	__u16  ByteCount;</div><div class='add'>+	unsigned char EncryptionKey[1];</div><div class='add'>+} __attribute__((packed)) LANMAN_NEG_RSP;</div><div class='add'>+</div><div class='add'>+#define READ_RAW_ENABLE 1</div><div class='add'>+#define WRITE_RAW_ENABLE 2</div><div class='add'>+#define RAW_ENABLE (READ_RAW_ENABLE | WRITE_RAW_ENABLE)</div><div class='add'>+</div><div class='ctx'> typedef struct negotiate_rsp {</div><div class='ctx'> 	struct smb_hdr hdr;	/* wct = 17 */</div><div class='ctx'> 	__le16 DialectIndex;</div><div class='hunk'>@@ -509,7 +538,7 @@ typedef union smb_com_session_setup_andx {</div><div class='ctx'> /*      unsigned char  * NativeOS;      */</div><div class='ctx'> /*	unsigned char  * NativeLanMan;  */</div><div class='ctx'> /*      unsigned char  * PrimaryDomain; */</div><div class='del'>-	} __attribute__((packed)) resp;			/* NTLM response format (with or without extended security */</div><div class='add'>+	} __attribute__((packed)) resp;	/* NTLM response with or without extended sec*/</div><div class='ctx'> </div><div class='ctx'> 	struct {		/* request format */</div><div class='ctx'> 		struct smb_hdr hdr;	/* wct = 10 */</div><div class='hunk'>@@ -520,8 +549,8 @@ typedef union smb_com_session_setup_andx {</div><div class='ctx'> 		__le16 MaxMpxCount;</div><div class='ctx'> 		__le16 VcNumber;</div><div class='ctx'> 		__u32 SessionKey;</div><div class='del'>-		__le16 PassswordLength;</div><div class='del'>-		__u32 Reserved;</div><div class='add'>+		__le16 PasswordLength;</div><div class='add'>+		__u32 Reserved; /* encrypt key len and offset */</div><div class='ctx'> 		__le16 ByteCount;</div><div class='ctx'> 		unsigned char AccountPassword[1];	/* followed by */</div><div class='ctx'> 		/* STRING AccountName */</div><div class='hunk'>@@ -543,6 +572,26 @@ typedef union smb_com_session_setup_andx {</div><div class='ctx'> 	} __attribute__((packed)) old_resp; /* pre-NTLM (LANMAN2.1) response */</div><div class='ctx'> } __attribute__((packed)) SESSION_SETUP_ANDX;</div><div class='ctx'> </div><div class='add'>+/* format of NLTMv2 Response ie "case sensitive password" hash when NTLMv2 */</div><div class='add'>+</div><div class='add'>+struct ntlmssp2_name {</div><div class='add'>+	__le16 type;</div><div class='add'>+	__le16 length;</div><div class='add'>+/*	char   name[length]; */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct ntlmv2_resp {</div><div class='add'>+	char ntlmv2_hash[CIFS_ENCPWD_SIZE];</div><div class='add'>+	__le32 blob_signature;</div><div class='add'>+	__u32  reserved;</div><div class='add'>+	__le64  time;</div><div class='add'>+	__u64  client_chal; /* random */</div><div class='add'>+	__u32  reserved2;</div><div class='add'>+	struct ntlmssp2_name names[1];</div><div class='add'>+	/* array of name entries could follow ending in minimum 4 byte struct */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define CIFS_NETWORK_OPSYS "CIFS VFS Client for Linux"</div><div class='ctx'> </div><div class='ctx'> /* Capabilities bits (for NTLM SessSetup request) */</div><div class='hunk'>@@ -573,7 +622,9 @@ typedef struct smb_com_tconx_req {</div><div class='ctx'> } __attribute__((packed)) TCONX_REQ;</div><div class='ctx'> </div><div class='ctx'> typedef struct smb_com_tconx_rsp {</div><div class='del'>-	struct smb_hdr hdr;	/* wct = 3 *//* note that Win2000 has sent wct=7 in some cases on responses. Four unspecified words followed OptionalSupport */</div><div class='add'>+	struct smb_hdr hdr;	/* wct = 3 note that Win2000 has sent wct = 7</div><div class='add'>+				 in some cases on responses. Four unspecified</div><div class='add'>+				 words followed OptionalSupport */</div><div class='ctx'> 	__u8 AndXCommand;</div><div class='ctx'> 	__u8 AndXReserved;</div><div class='ctx'> 	__le16 AndXOffset;</div><div class='hunk'>@@ -1323,6 +1374,9 @@ struct smb_t2_rsp {</div><div class='ctx'> #define SMB_FILE_MAXIMUM_INFO           0x40d</div><div class='ctx'> </div><div class='ctx'> /* Find File infolevels */</div><div class='add'>+#define SMB_FIND_FILE_INFO_STANDARD       0x001</div><div class='add'>+#define SMB_FIND_FILE_QUERY_EA_SIZE       0x002</div><div class='add'>+#define SMB_FIND_FILE_QUERY_EAS_FROM_LIST 0x003</div><div class='ctx'> #define SMB_FIND_FILE_DIRECTORY_INFO      0x101</div><div class='ctx'> #define SMB_FIND_FILE_FULL_DIRECTORY_INFO 0x102</div><div class='ctx'> #define SMB_FIND_FILE_NAMES_INFO          0x103</div><div class='hunk'>@@ -1844,13 +1898,13 @@ typedef struct {</div><div class='ctx'> typedef struct {</div><div class='ctx'> 	__le32 DeviceType;</div><div class='ctx'> 	__le32 DeviceCharacteristics;</div><div class='del'>-} __attribute__((packed)) FILE_SYSTEM_DEVICE_INFO;	/* device info, level 0x104 */</div><div class='add'>+} __attribute__((packed)) FILE_SYSTEM_DEVICE_INFO; /* device info level 0x104 */</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> 	__le32 Attributes;</div><div class='ctx'> 	__le32 MaxPathNameComponentLength;</div><div class='ctx'> 	__le32 FileSystemNameLen;</div><div class='del'>-	char FileSystemName[52]; /* do not really need to save this - so potentially get only subset of name */</div><div class='add'>+	char FileSystemName[52]; /* do not have to save this - get subset? */</div><div class='ctx'> } __attribute__((packed)) FILE_SYSTEM_ATTRIBUTE_INFO;</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************/</div><div class='hunk'>@@ -1947,7 +2001,8 @@ typedef struct {</div><div class='ctx'> </div><div class='ctx'> struct file_allocation_info {</div><div class='ctx'> 	__le64 AllocationSize; /* Note old Samba srvr rounds this up too much */</div><div class='del'>-} __attribute__((packed));	/* size used on disk, level 0x103 for set, 0x105 for query */</div><div class='add'>+} __attribute__((packed));	/* size used on disk, for level 0x103 for set,</div><div class='add'>+				   0x105 for query */</div><div class='ctx'> </div><div class='ctx'> struct file_end_of_file_info {</div><div class='ctx'> 	__le64 FileSize;		/* offset to end of file */</div><div class='hunk'>@@ -2054,7 +2109,7 @@ typedef struct {</div><div class='ctx'> 	__le32 ExtFileAttributes;</div><div class='ctx'> 	__le32 FileNameLength;</div><div class='ctx'> 	char FileName[1];</div><div class='del'>-} __attribute__((packed)) FILE_DIRECTORY_INFO;   /* level 0x101 FF response data area */</div><div class='add'>+} __attribute__((packed)) FILE_DIRECTORY_INFO;   /* level 0x101 FF resp data */</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> 	__le32 NextEntryOffset;</div><div class='hunk'>@@ -2069,7 +2124,7 @@ typedef struct {</div><div class='ctx'> 	__le32 FileNameLength;</div><div class='ctx'> 	__le32 EaSize; /* length of the xattrs */</div><div class='ctx'> 	char FileName[1];</div><div class='del'>-} __attribute__((packed)) FILE_FULL_DIRECTORY_INFO;   /* level 0x102 FF response data area */</div><div class='add'>+} __attribute__((packed)) FILE_FULL_DIRECTORY_INFO; /* level 0x102 rsp data */</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> 	__le32 NextEntryOffset;</div><div class='hunk'>@@ -2086,7 +2141,7 @@ typedef struct {</div><div class='ctx'> 	__le32 Reserved;</div><div class='ctx'> 	__u64 UniqueId; /* inode num - le since Samba puts ino in low 32 bit*/</div><div class='ctx'> 	char FileName[1];</div><div class='del'>-} __attribute__((packed)) SEARCH_ID_FULL_DIR_INFO;   /* level 0x105 FF response data area */</div><div class='add'>+} __attribute__((packed)) SEARCH_ID_FULL_DIR_INFO; /* level 0x105 FF rsp data */</div><div class='ctx'> </div><div class='ctx'> typedef struct {</div><div class='ctx'> 	__le32 NextEntryOffset;</div><div class='hunk'>@@ -2104,7 +2159,22 @@ typedef struct {</div><div class='ctx'> 	__u8   Reserved;</div><div class='ctx'> 	__u8   ShortName[12];</div><div class='ctx'> 	char FileName[1];</div><div class='del'>-} __attribute__((packed)) FILE_BOTH_DIRECTORY_INFO;   /* level 0x104 FF response data area */</div><div class='add'>+} __attribute__((packed)) FILE_BOTH_DIRECTORY_INFO; /* level 0x104 FFrsp data */</div><div class='add'>+</div><div class='add'>+typedef struct {</div><div class='add'>+	__u32  ResumeKey;</div><div class='add'>+	__le16 CreationDate; /* SMB Date */</div><div class='add'>+	__le16 CreationTime; /* SMB Time */</div><div class='add'>+	__le16 LastAccessDate;</div><div class='add'>+	__le16 LastAccessTime;</div><div class='add'>+	__le16 LastWriteDate;</div><div class='add'>+	__le16 LastWriteTime;</div><div class='add'>+	__le32 DataSize; /* File Size (EOF) */</div><div class='add'>+	__le32 AllocationSize;</div><div class='add'>+	__le16 Attributes; /* verify not u32 */</div><div class='add'>+	__u8   FileNameLength;</div><div class='add'>+	char FileName[1];</div><div class='add'>+} __attribute__((packed)) FIND_FILE_STANDARD_INFO; /* level 0x1 FF resp data */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct win_dev {</div><div class='head'>diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h<br/>index 310ea2f0e0bf..a5ddc62d6fe6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifsproto.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifsproto.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifsproto.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifsproto.h</a></div><div class='hunk'>@@ -64,14 +64,12 @@ extern int map_smb_to_linux_error(struct smb_hdr *smb);</div><div class='ctx'> extern void header_assemble(struct smb_hdr *, char /* command */ ,</div><div class='ctx'> 			    const struct cifsTconInfo *, int /* length of</div><div class='ctx'> 			    fixed section (word count) in two byte units */);</div><div class='del'>-#ifdef CONFIG_CIFS_EXPERIMENTAL</div><div class='ctx'> extern int small_smb_init_no_tc(const int smb_cmd, const int wct,</div><div class='ctx'> 				struct cifsSesInfo *ses,</div><div class='ctx'> 				void ** request_buf);</div><div class='ctx'> extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='del'>-			     const int stage, int * pNTLMv2_flg,</div><div class='add'>+			     const int stage, </div><div class='ctx'> 			     const struct nls_table *nls_cp);</div><div class='del'>-#endif</div><div class='ctx'> extern __u16 GetNextMid(struct TCP_Server_Info *server);</div><div class='ctx'> extern struct oplock_q_entry * AllocOplockQEntry(struct inode *, u16, </div><div class='ctx'> 						 struct cifsTconInfo *);</div><div class='hunk'>@@ -285,8 +283,14 @@ extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *,</div><div class='ctx'> extern int cifs_verify_signature(struct smb_hdr *, const char * mac_key,</div><div class='ctx'> 	__u32 expected_sequence_number);</div><div class='ctx'> extern int cifs_calculate_mac_key(char * key,const char * rn,const char * pass);</div><div class='del'>-extern int CalcNTLMv2_partial_mac_key(struct cifsSesInfo *, struct nls_table *);</div><div class='del'>-extern void CalcNTLMv2_response(const struct cifsSesInfo *,char * );</div><div class='add'>+extern int CalcNTLMv2_partial_mac_key(struct cifsSesInfo *, </div><div class='add'>+			const struct nls_table *);</div><div class='add'>+extern void CalcNTLMv2_response(const struct cifsSesInfo *, char * );</div><div class='add'>+extern void setup_ntlmv2_rsp(struct cifsSesInfo *, char *, </div><div class='add'>+			     const struct nls_table *);</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+extern void calc_lanman_hash(struct cifsSesInfo * ses, char * lnm_session_key);</div><div class='add'>+#endif /* CIFS_WEAK_PW_HASH */</div><div class='ctx'> extern int CIFSSMBCopy(int xid,</div><div class='ctx'> 			struct cifsTconInfo *source_tcon,</div><div class='ctx'> 			const char *fromName,</div><div class='head'>diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c<br/>index 925881e00ff2..19678c575dfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/cifssmb.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/cifssmb.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/cifssmb.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/cifssmb.c</a></div><div class='hunk'>@@ -44,8 +44,11 @@ static struct {</div><div class='ctx'> 	int index;</div><div class='ctx'> 	char *name;</div><div class='ctx'> } protocols[] = {</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+	{LANMAN_PROT, "\2LM1.2X002"},</div><div class='add'>+#endif /* weak password hashing for legacy clients */</div><div class='ctx'> 	{CIFS_PROT, "\2NT LM 0.12"}, </div><div class='del'>-	{CIFS_PROT, "\2POSIX 2"},</div><div class='add'>+	{POSIX_PROT, "\2POSIX 2"},</div><div class='ctx'> 	{BAD_PROT, "\2"}</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='hunk'>@@ -53,11 +56,29 @@ static struct {</div><div class='ctx'> 	int index;</div><div class='ctx'> 	char *name;</div><div class='ctx'> } protocols[] = {</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+	{LANMAN_PROT, "\2LM1.2X002"},</div><div class='add'>+#endif /* weak password hashing for legacy clients */</div><div class='ctx'> 	{CIFS_PROT, "\2NT LM 0.12"}, </div><div class='ctx'> 	{BAD_PROT, "\2"}</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* define the number of elements in the cifs dialect array */</div><div class='add'>+#ifdef CONFIG_CIFS_POSIX</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+#define CIFS_NUM_PROT 3</div><div class='add'>+#else</div><div class='add'>+#define CIFS_NUM_PROT 2</div><div class='add'>+#endif /* CIFS_WEAK_PW_HASH */</div><div class='add'>+#else /* not posix */</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+#define CIFS_NUM_PROT 2</div><div class='add'>+#else</div><div class='add'>+#define CIFS_NUM_PROT 1</div><div class='add'>+#endif /* CONFIG_CIFS_WEAK_PW_HASH */</div><div class='add'>+#endif /* CIFS_POSIX */</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* Mark as invalid, all open files on tree connections since they</div><div class='ctx'>    were closed when session to server was lost */</div><div class='hunk'>@@ -188,7 +209,6 @@ small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CIFS_EXPERIMENTAL  </div><div class='ctx'> int</div><div class='ctx'> small_smb_init_no_tc(const int smb_command, const int wct, </div><div class='ctx'> 		     struct cifsSesInfo *ses, void **request_buf)</div><div class='hunk'>@@ -214,7 +234,6 @@ small_smb_init_no_tc(const int smb_command, const int wct,</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-#endif  /* CONFIG_CIFS_EXPERIMENTAL */</div><div class='ctx'> </div><div class='ctx'> /* If the return code is zero, this function must fill in request_buf pointer */</div><div class='ctx'> static int</div><div class='hunk'>@@ -322,7 +341,8 @@ smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,</div><div class='ctx'>     /* potential retries of smb operations it turns out we can determine */</div><div class='ctx'>     /* from the mid flags when the request buffer can be resent without  */</div><div class='ctx'>     /* having to use a second distinct buffer for the response */</div><div class='del'>-	*response_buf = *request_buf; </div><div class='add'>+	if(response_buf)</div><div class='add'>+		*response_buf = *request_buf; </div><div class='ctx'> </div><div class='ctx'> 	header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon,</div><div class='ctx'> 			wct /*wct */ );</div><div class='hunk'>@@ -373,8 +393,10 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)</div><div class='ctx'> 	NEGOTIATE_RSP *pSMBr;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int bytes_returned;</div><div class='add'>+	int i;</div><div class='ctx'> 	struct TCP_Server_Info * server;</div><div class='ctx'> 	u16 count;</div><div class='add'>+	unsigned int secFlags;</div><div class='ctx'> </div><div class='ctx'> 	if(ses-&gt;server)</div><div class='ctx'> 		server = ses-&gt;server;</div><div class='hunk'>@@ -386,101 +408,200 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses)</div><div class='ctx'> 		      (void **) &amp;pSMB, (void **) &amp;pSMBr);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='add'>+</div><div class='add'>+	/* if any of auth flags (ie not sign or seal) are overriden use them */</div><div class='add'>+	if(ses-&gt;overrideSecFlg &amp; (~(CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL)))</div><div class='add'>+		secFlags = ses-&gt;overrideSecFlg;</div><div class='add'>+	else /* if override flags set only sign/seal OR them with global auth */</div><div class='add'>+		secFlags = extended_security | ses-&gt;overrideSecFlg;</div><div class='add'>+</div><div class='add'>+	cFYI(1,("secFlags 0x%x",secFlags));</div><div class='add'>+</div><div class='ctx'> 	pSMB-&gt;hdr.Mid = GetNextMid(server);</div><div class='ctx'> 	pSMB-&gt;hdr.Flags2 |= SMBFLG2_UNICODE;</div><div class='del'>-	if (extended_security)</div><div class='add'>+	if((secFlags &amp; CIFSSEC_MUST_KRB5) == CIFSSEC_MUST_KRB5)</div><div class='ctx'> 		pSMB-&gt;hdr.Flags2 |= SMBFLG2_EXT_SEC;</div><div class='del'>-</div><div class='del'>-	count = strlen(protocols[0].name) + 1;</div><div class='del'>-	strncpy(pSMB-&gt;DialectsArray, protocols[0].name, 30);	</div><div class='del'>-    /* null guaranteed to be at end of source and target buffers anyway */</div><div class='del'>-</div><div class='add'>+	</div><div class='add'>+	count = 0;</div><div class='add'>+	for(i=0;i&lt;CIFS_NUM_PROT;i++) {</div><div class='add'>+		strncpy(pSMB-&gt;DialectsArray+count, protocols[i].name, 16);</div><div class='add'>+		count += strlen(protocols[i].name) + 1;</div><div class='add'>+		/* null at end of source and target buffers anyway */</div><div class='add'>+	}</div><div class='ctx'> 	pSMB-&gt;hdr.smb_buf_length += count;</div><div class='ctx'> 	pSMB-&gt;ByteCount = cpu_to_le16(count);</div><div class='ctx'> </div><div class='ctx'> 	rc = SendReceive(xid, ses, (struct smb_hdr *) pSMB,</div><div class='ctx'> 			 (struct smb_hdr *) pSMBr, &amp;bytes_returned, 0);</div><div class='del'>-	if (rc == 0) {</div><div class='del'>-		server-&gt;secMode = pSMBr-&gt;SecurityMode;</div><div class='del'>-		if((server-&gt;secMode &amp; SECMODE_USER) == 0)</div><div class='del'>-			cFYI(1,("share mode security"));</div><div class='del'>-		server-&gt;secType = NTLM; /* BB override default for</div><div class='del'>-					   NTLMv2 or kerberos v5 */</div><div class='del'>-		/* one byte - no need to convert this or EncryptionKeyLen</div><div class='del'>-		   from little endian */</div><div class='del'>-		server-&gt;maxReq = le16_to_cpu(pSMBr-&gt;MaxMpxCount);</div><div class='del'>-		/* probably no need to store and check maxvcs */</div><div class='del'>-		server-&gt;maxBuf =</div><div class='del'>-			min(le32_to_cpu(pSMBr-&gt;MaxBufferSize),</div><div class='add'>+	if (rc != 0) </div><div class='add'>+		goto neg_err_exit;</div><div class='add'>+</div><div class='add'>+	cFYI(1,("Dialect: %d", pSMBr-&gt;DialectIndex));</div><div class='add'>+	/* Check wct = 1 error case */</div><div class='add'>+	if((pSMBr-&gt;hdr.WordCount &lt; 13) || (pSMBr-&gt;DialectIndex == BAD_PROT)) {</div><div class='add'>+		/* core returns wct = 1, but we do not ask for core - otherwise</div><div class='add'>+		small wct just comes when dialect index is -1 indicating we </div><div class='add'>+		could not negotiate a common dialect */</div><div class='add'>+		rc = -EOPNOTSUPP;</div><div class='add'>+		goto neg_err_exit;</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH </div><div class='add'>+	} else if((pSMBr-&gt;hdr.WordCount == 13)</div><div class='add'>+			&amp;&amp; (pSMBr-&gt;DialectIndex == LANMAN_PROT)) {</div><div class='add'>+		struct lanman_neg_rsp * rsp = (struct lanman_neg_rsp *)pSMBr;</div><div class='add'>+</div><div class='add'>+		if((secFlags &amp; CIFSSEC_MAY_LANMAN) || </div><div class='add'>+			(secFlags &amp; CIFSSEC_MAY_PLNTXT))</div><div class='add'>+			server-&gt;secType = LANMAN;</div><div class='add'>+		else {</div><div class='add'>+			cERROR(1, ("mount failed weak security disabled"</div><div class='add'>+				   " in /proc/fs/cifs/SecurityFlags"));</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='add'>+			goto neg_err_exit;</div><div class='add'>+		}	</div><div class='add'>+		server-&gt;secMode = (__u8)le16_to_cpu(rsp-&gt;SecurityMode);</div><div class='add'>+		server-&gt;maxReq = le16_to_cpu(rsp-&gt;MaxMpxCount);</div><div class='add'>+		server-&gt;maxBuf = min((__u32)le16_to_cpu(rsp-&gt;MaxBufSize),</div><div class='add'>+				(__u32)CIFSMaxBufSize + MAX_CIFS_HDR_SIZE);</div><div class='add'>+		GETU32(server-&gt;sessid) = le32_to_cpu(rsp-&gt;SessionKey);</div><div class='add'>+		/* even though we do not use raw we might as well set this</div><div class='add'>+		accurately, in case we ever find a need for it */</div><div class='add'>+		if((le16_to_cpu(rsp-&gt;RawMode) &amp; RAW_ENABLE) == RAW_ENABLE) {</div><div class='add'>+			server-&gt;maxRw = 0xFF00;</div><div class='add'>+			server-&gt;capabilities = CAP_MPX_MODE | CAP_RAW_MODE;</div><div class='add'>+		} else {</div><div class='add'>+			server-&gt;maxRw = 0;/* we do not need to use raw anyway */</div><div class='add'>+			server-&gt;capabilities = CAP_MPX_MODE;</div><div class='add'>+		}</div><div class='add'>+		server-&gt;timeZone = le16_to_cpu(rsp-&gt;ServerTimeZone);</div><div class='add'>+</div><div class='add'>+		/* BB get server time for time conversions and add</div><div class='add'>+		code to use it and timezone since this is not UTC */	</div><div class='add'>+</div><div class='add'>+		if (rsp-&gt;EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) {</div><div class='add'>+			memcpy(server-&gt;cryptKey, rsp-&gt;EncryptionKey,</div><div class='add'>+				CIFS_CRYPTO_KEY_SIZE);</div><div class='add'>+		} else if (server-&gt;secMode &amp; SECMODE_PW_ENCRYPT) {</div><div class='add'>+			rc = -EIO; /* need cryptkey unless plain text */</div><div class='add'>+			goto neg_err_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cFYI(1,("LANMAN negotiated"));</div><div class='add'>+		/* we will not end up setting signing flags - as no signing</div><div class='add'>+		was in LANMAN and server did not return the flags on */</div><div class='add'>+		goto signing_check;</div><div class='add'>+#else /* weak security disabled */</div><div class='add'>+	} else if(pSMBr-&gt;hdr.WordCount == 13) {</div><div class='add'>+		cERROR(1,("mount failed, cifs module not built "</div><div class='add'>+			  "with CIFS_WEAK_PW_HASH support"));</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='add'>+#endif /* WEAK_PW_HASH */</div><div class='add'>+		goto neg_err_exit;</div><div class='add'>+	} else if(pSMBr-&gt;hdr.WordCount != 17) {</div><div class='add'>+		/* unknown wct */</div><div class='add'>+		rc = -EOPNOTSUPP;</div><div class='add'>+		goto neg_err_exit;</div><div class='add'>+	}</div><div class='add'>+	/* else wct == 17 NTLM */</div><div class='add'>+	server-&gt;secMode = pSMBr-&gt;SecurityMode;</div><div class='add'>+	if((server-&gt;secMode &amp; SECMODE_USER) == 0)</div><div class='add'>+		cFYI(1,("share mode security"));</div><div class='add'>+</div><div class='add'>+	if((server-&gt;secMode &amp; SECMODE_PW_ENCRYPT) == 0)</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+		if ((secFlags &amp; CIFSSEC_MAY_PLNTXT) == 0)</div><div class='add'>+#endif /* CIFS_WEAK_PW_HASH */</div><div class='add'>+			cERROR(1,("Server requests plain text password"</div><div class='add'>+				  " but client support disabled"));</div><div class='add'>+</div><div class='add'>+	if((secFlags &amp; CIFSSEC_MUST_NTLMV2) == CIFSSEC_MUST_NTLMV2)</div><div class='add'>+		server-&gt;secType = NTLMv2;</div><div class='add'>+	else if(secFlags &amp; CIFSSEC_MAY_NTLM)</div><div class='add'>+		server-&gt;secType = NTLM;</div><div class='add'>+	else if(secFlags &amp; CIFSSEC_MAY_NTLMV2)</div><div class='add'>+		server-&gt;secType = NTLMv2;</div><div class='add'>+	/* else krb5 ... any others ... */</div><div class='add'>+</div><div class='add'>+	/* one byte, so no need to convert this or EncryptionKeyLen from</div><div class='add'>+	   little endian */</div><div class='add'>+	server-&gt;maxReq = le16_to_cpu(pSMBr-&gt;MaxMpxCount);</div><div class='add'>+	/* probably no need to store and check maxvcs */</div><div class='add'>+	server-&gt;maxBuf = min(le32_to_cpu(pSMBr-&gt;MaxBufferSize),</div><div class='ctx'> 			(__u32) CIFSMaxBufSize + MAX_CIFS_HDR_SIZE);</div><div class='del'>-		server-&gt;maxRw = le32_to_cpu(pSMBr-&gt;MaxRawSize);</div><div class='del'>-		cFYI(0, ("Max buf = %d", ses-&gt;server-&gt;maxBuf));</div><div class='del'>-		GETU32(ses-&gt;server-&gt;sessid) = le32_to_cpu(pSMBr-&gt;SessionKey);</div><div class='del'>-		server-&gt;capabilities = le32_to_cpu(pSMBr-&gt;Capabilities);</div><div class='del'>-		server-&gt;timeZone = le16_to_cpu(pSMBr-&gt;ServerTimeZone);	</div><div class='del'>-        /* BB with UTC do we ever need to be using srvr timezone? */</div><div class='del'>-		if (pSMBr-&gt;EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) {</div><div class='del'>-			memcpy(server-&gt;cryptKey, pSMBr-&gt;u.EncryptionKey,</div><div class='del'>-			       CIFS_CRYPTO_KEY_SIZE);</div><div class='del'>-		} else if ((pSMBr-&gt;hdr.Flags2 &amp; SMBFLG2_EXT_SEC)</div><div class='del'>-			   &amp;&amp; (pSMBr-&gt;EncryptionKeyLength == 0)) {</div><div class='del'>-			/* decode security blob */</div><div class='del'>-		} else</div><div class='del'>-			rc = -EIO;</div><div class='add'>+	server-&gt;maxRw = le32_to_cpu(pSMBr-&gt;MaxRawSize);</div><div class='add'>+	cFYI(0, ("Max buf = %d", ses-&gt;server-&gt;maxBuf));</div><div class='add'>+	GETU32(ses-&gt;server-&gt;sessid) = le32_to_cpu(pSMBr-&gt;SessionKey);</div><div class='add'>+	server-&gt;capabilities = le32_to_cpu(pSMBr-&gt;Capabilities);</div><div class='add'>+	server-&gt;timeZone = le16_to_cpu(pSMBr-&gt;ServerTimeZone);	</div><div class='add'>+	if (pSMBr-&gt;EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) {</div><div class='add'>+		memcpy(server-&gt;cryptKey, pSMBr-&gt;u.EncryptionKey,</div><div class='add'>+		       CIFS_CRYPTO_KEY_SIZE);</div><div class='add'>+	} else if ((pSMBr-&gt;hdr.Flags2 &amp; SMBFLG2_EXT_SEC)</div><div class='add'>+			&amp;&amp; (pSMBr-&gt;EncryptionKeyLength == 0)) {</div><div class='add'>+		/* decode security blob */</div><div class='add'>+	} else if (server-&gt;secMode &amp; SECMODE_PW_ENCRYPT) {</div><div class='add'>+		rc = -EIO; /* no crypt key only if plain text pwd */</div><div class='add'>+		goto neg_err_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* BB might be helpful to save off the domain of server here */</div><div class='add'>+	/* BB might be helpful to save off the domain of server here */</div><div class='ctx'> </div><div class='del'>-		if ((pSMBr-&gt;hdr.Flags2 &amp; SMBFLG2_EXT_SEC) &amp;&amp; </div><div class='del'>-			(server-&gt;capabilities &amp; CAP_EXTENDED_SECURITY)) {</div><div class='del'>-			count = pSMBr-&gt;ByteCount;</div><div class='del'>-			if (count &lt; 16)</div><div class='del'>-				rc = -EIO;</div><div class='del'>-			else if (count == 16) {</div><div class='del'>-				server-&gt;secType = RawNTLMSSP;</div><div class='del'>-				if (server-&gt;socketUseCount.counter &gt; 1) {</div><div class='del'>-					if (memcmp</div><div class='del'>-						(server-&gt;server_GUID,</div><div class='del'>-						pSMBr-&gt;u.extended_response.</div><div class='del'>-						GUID, 16) != 0) {</div><div class='del'>-						cFYI(1, ("server UID changed"));</div><div class='del'>-						memcpy(server-&gt;</div><div class='del'>-							server_GUID,</div><div class='del'>-							pSMBr-&gt;u.</div><div class='del'>-							extended_response.</div><div class='del'>-							GUID, 16);</div><div class='del'>-					}</div><div class='del'>-				} else</div><div class='add'>+	if ((pSMBr-&gt;hdr.Flags2 &amp; SMBFLG2_EXT_SEC) &amp;&amp; </div><div class='add'>+		(server-&gt;capabilities &amp; CAP_EXTENDED_SECURITY)) {</div><div class='add'>+		count = pSMBr-&gt;ByteCount;</div><div class='add'>+		if (count &lt; 16)</div><div class='add'>+			rc = -EIO;</div><div class='add'>+		else if (count == 16) {</div><div class='add'>+			server-&gt;secType = RawNTLMSSP;</div><div class='add'>+			if (server-&gt;socketUseCount.counter &gt; 1) {</div><div class='add'>+				if (memcmp(server-&gt;server_GUID,</div><div class='add'>+					   pSMBr-&gt;u.extended_response.</div><div class='add'>+					   GUID, 16) != 0) {</div><div class='add'>+					cFYI(1, ("server UID changed"));</div><div class='ctx'> 					memcpy(server-&gt;server_GUID,</div><div class='del'>-					       pSMBr-&gt;u.extended_response.</div><div class='del'>-					       GUID, 16);</div><div class='del'>-			} else {</div><div class='del'>-				rc = decode_negTokenInit(pSMBr-&gt;u.</div><div class='del'>-							 extended_response.</div><div class='del'>-							 SecurityBlob,</div><div class='del'>-							 count - 16,</div><div class='del'>-							 &amp;server-&gt;secType);</div><div class='del'>-				if(rc == 1) {</div><div class='del'>-				/* BB Need to fill struct for sessetup here */</div><div class='del'>-					rc = -EOPNOTSUPP;</div><div class='del'>-				} else {</div><div class='del'>-					rc = -EINVAL;</div><div class='add'>+						pSMBr-&gt;u.extended_response.GUID,</div><div class='add'>+						16);</div><div class='ctx'> 				}</div><div class='add'>+			} else</div><div class='add'>+				memcpy(server-&gt;server_GUID,</div><div class='add'>+				       pSMBr-&gt;u.extended_response.GUID, 16);</div><div class='add'>+		} else {</div><div class='add'>+			rc = decode_negTokenInit(pSMBr-&gt;u.extended_response.</div><div class='add'>+						 SecurityBlob,</div><div class='add'>+						 count - 16,</div><div class='add'>+						 &amp;server-&gt;secType);</div><div class='add'>+			if(rc == 1) {</div><div class='add'>+			/* BB Need to fill struct for sessetup here */</div><div class='add'>+				rc = -EOPNOTSUPP;</div><div class='add'>+			} else {</div><div class='add'>+				rc = -EINVAL;</div><div class='ctx'> 			}</div><div class='del'>-		} else</div><div class='del'>-			server-&gt;capabilities &amp;= ~CAP_EXTENDED_SECURITY;</div><div class='del'>-		if(sign_CIFS_PDUs == FALSE) {        </div><div class='del'>-			if(server-&gt;secMode &amp; SECMODE_SIGN_REQUIRED)</div><div class='del'>-				cERROR(1,</div><div class='del'>-				 ("Server requires /proc/fs/cifs/PacketSigningEnabled"));</div><div class='del'>-			server-&gt;secMode &amp;= ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);</div><div class='del'>-		} else if(sign_CIFS_PDUs == 1) {</div><div class='del'>-			if((server-&gt;secMode &amp; SECMODE_SIGN_REQUIRED) == 0)</div><div class='del'>-				server-&gt;secMode &amp;= ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);</div><div class='ctx'> 		}</div><div class='del'>-				</div><div class='add'>+	} else</div><div class='add'>+		server-&gt;capabilities &amp;= ~CAP_EXTENDED_SECURITY;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+signing_check:</div><div class='add'>+#endif</div><div class='add'>+	if(sign_CIFS_PDUs == FALSE) {        </div><div class='add'>+		if(server-&gt;secMode &amp; SECMODE_SIGN_REQUIRED)</div><div class='add'>+			cERROR(1,("Server requires "</div><div class='add'>+				 "/proc/fs/cifs/PacketSigningEnabled to be on"));</div><div class='add'>+		server-&gt;secMode &amp;= </div><div class='add'>+			~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);</div><div class='add'>+	} else if(sign_CIFS_PDUs == 1) {</div><div class='add'>+		if((server-&gt;secMode &amp; SECMODE_SIGN_REQUIRED) == 0)</div><div class='add'>+			server-&gt;secMode &amp;= </div><div class='add'>+				~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED);</div><div class='add'>+	} else if(sign_CIFS_PDUs == 2) {</div><div class='add'>+		if((server-&gt;secMode &amp; </div><div class='add'>+			(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) {</div><div class='add'>+			cERROR(1,("signing required but server lacks support"));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='add'>+neg_err_exit:	</div><div class='ctx'> 	cifs_buf_release(pSMB);</div><div class='add'>+</div><div class='add'>+	cFYI(1,("negprot rc %d",rc));</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2239,7 +2360,7 @@ CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon,</div><div class='ctx'> 			}</div><div class='ctx'> 			symlinkinfo[buflen] = 0; /* just in case so the caller</div><div class='ctx'> 					does not go off the end of the buffer */</div><div class='del'>-			cFYI(1,("readlink result - %s ",symlinkinfo));</div><div class='add'>+			cFYI(1,("readlink result - %s",symlinkinfo));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> qreparse_out:</div><div class='head'>diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c<br/>index bae1479318d1..876eb9ef85fe 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/connect.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/connect.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/connect.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/connect.c</a></div><div class='hunk'>@@ -49,8 +49,6 @@</div><div class='ctx'> </div><div class='ctx'> static DECLARE_COMPLETION(cifsd_complete);</div><div class='ctx'> </div><div class='del'>-extern void SMBencrypt(unsigned char *passwd, unsigned char *c8,</div><div class='del'>-		       unsigned char *p24);</div><div class='ctx'> extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,</div><div class='ctx'> 			 unsigned char *p24);</div><div class='ctx'> </div><div class='hunk'>@@ -70,6 +68,7 @@ struct smb_vol {</div><div class='ctx'> 	gid_t linux_gid;</div><div class='ctx'> 	mode_t file_mode;</div><div class='ctx'> 	mode_t dir_mode;</div><div class='add'>+	unsigned secFlg;</div><div class='ctx'> 	unsigned rw:1;</div><div class='ctx'> 	unsigned retry:1;</div><div class='ctx'> 	unsigned intr:1;</div><div class='hunk'>@@ -83,12 +82,7 @@ struct smb_vol {</div><div class='ctx'> 	unsigned remap:1;   /* set to remap seven reserved chars in filenames */</div><div class='ctx'> 	unsigned posix_paths:1;   /* unset to not ask for posix pathnames. */</div><div class='ctx'> 	unsigned sfu_emul:1;</div><div class='del'>-	unsigned krb5:1;</div><div class='del'>-	unsigned ntlm:1;</div><div class='del'>-	unsigned ntlmv2:1;</div><div class='ctx'> 	unsigned nullauth:1; /* attempt to authenticate with null user */</div><div class='del'>-	unsigned sign:1;</div><div class='del'>-	unsigned seal:1;     /* encrypt */</div><div class='ctx'> 	unsigned nocase;     /* request case insensitive filenames */</div><div class='ctx'> 	unsigned nobrl;      /* disable sending byte range locks to srv */</div><div class='ctx'> 	unsigned int rsize;</div><div class='hunk'>@@ -369,21 +363,21 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (bigbuf == NULL) {</div><div class='ctx'> 			bigbuf = cifs_buf_get();</div><div class='del'>-			if(bigbuf == NULL) {</div><div class='del'>-				cERROR(1,("No memory for large SMB response"));</div><div class='add'>+			if (!bigbuf) {</div><div class='add'>+				cERROR(1, ("No memory for large SMB response"));</div><div class='ctx'> 				msleep(3000);</div><div class='ctx'> 				/* retry will check if exiting */</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-		} else if(isLargeBuf) {</div><div class='del'>-			/* we are reusing a dirtry large buf, clear its start */</div><div class='add'>+		} else if (isLargeBuf) {</div><div class='add'>+			/* we are reusing a dirty large buf, clear its start */</div><div class='ctx'> 			memset(bigbuf, 0, sizeof (struct smb_hdr));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (smallbuf == NULL) {</div><div class='ctx'> 			smallbuf = cifs_small_buf_get();</div><div class='del'>-			if(smallbuf == NULL) {</div><div class='del'>-				cERROR(1,("No memory for SMB response"));</div><div class='add'>+			if (!smallbuf) {</div><div class='add'>+				cERROR(1, ("No memory for SMB response"));</div><div class='ctx'> 				msleep(1000);</div><div class='ctx'> 				/* retry will check if exiting */</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -403,12 +397,12 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)</div><div class='ctx'> 		    kernel_recvmsg(csocket, &amp;smb_msg,</div><div class='ctx'> 				 &amp;iov, 1, 4, 0 /* BB see socket.h flags */);</div><div class='ctx'> </div><div class='del'>-		if(server-&gt;tcpStatus == CifsExiting) {</div><div class='add'>+		if (server-&gt;tcpStatus == CifsExiting) {</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (server-&gt;tcpStatus == CifsNeedReconnect) {</div><div class='del'>-			cFYI(1,("Reconnect after server stopped responding"));</div><div class='add'>+			cFYI(1, ("Reconnect after server stopped responding"));</div><div class='ctx'> 			cifs_reconnect(server);</div><div class='del'>-			cFYI(1,("call to reconnect done"));</div><div class='add'>+			cFYI(1, ("call to reconnect done"));</div><div class='ctx'> 			csocket = server-&gt;ssocket;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		} else if ((length == -ERESTARTSYS) || (length == -EAGAIN)) {</div><div class='hunk'>@@ -417,15 +411,15 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)</div><div class='ctx'> 				tcpStatus CifsNeedReconnect if server hung */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		} else if (length &lt;= 0) {</div><div class='del'>-			if(server-&gt;tcpStatus == CifsNew) {</div><div class='del'>-				cFYI(1,("tcp session abend after SMBnegprot"));</div><div class='add'>+			if (server-&gt;tcpStatus == CifsNew) {</div><div class='add'>+				cFYI(1, ("tcp session abend after SMBnegprot"));</div><div class='ctx'> 				/* some servers kill the TCP session rather than</div><div class='ctx'> 				   returning an SMB negprot error, in which</div><div class='ctx'> 				   case reconnecting here is not going to help,</div><div class='ctx'> 				   and so simply return error to mount */</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			if(length == -EINTR) { </div><div class='add'>+			if (!try_to_freeze() &amp;&amp; (length == -EINTR)) {</div><div class='ctx'> 				cFYI(1,("cifsd thread killed"));</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -585,9 +579,11 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)</div><div class='ctx'> 						/* merge response - fix up 1st*/</div><div class='ctx'> 						if(coalesce_t2(smb_buffer, </div><div class='ctx'> 							mid_entry-&gt;resp_buf)) {</div><div class='add'>+							mid_entry-&gt;multiRsp = 1;</div><div class='ctx'> 							break;</div><div class='ctx'> 						} else {</div><div class='ctx'> 							/* all parts received */</div><div class='add'>+							mid_entry-&gt;multiEnd = 1;</div><div class='ctx'> 							goto multi_t2_fnd; </div><div class='ctx'> 						}</div><div class='ctx'> 					} else {</div><div class='hunk'>@@ -632,9 +628,14 @@ multi_t2_fnd:</div><div class='ctx'> 			wake_up_process(task_to_wake);</div><div class='ctx'> 		} else if ((is_valid_oplock_break(smb_buffer, server) == FALSE)</div><div class='ctx'> 		    &amp;&amp; (isMultiRsp == FALSE)) {                          </div><div class='del'>-			cERROR(1, ("No task to wake, unknown frame rcvd!"));</div><div class='add'>+			cERROR(1, ("No task to wake, unknown frame rcvd! NumMids %d", midCount.counter));</div><div class='ctx'> 			cifs_dump_mem("Received Data is: ",(char *)smb_buffer,</div><div class='ctx'> 				      sizeof(struct smb_hdr));</div><div class='add'>+#ifdef CONFIG_CIFS_DEBUG2</div><div class='add'>+			cifs_dump_detail(smb_buffer);</div><div class='add'>+			cifs_dump_mids(server);</div><div class='add'>+#endif /* CIFS_DEBUG2 */</div><div class='add'>+			</div><div class='ctx'> 		}</div><div class='ctx'> 	} /* end while !EXITING */</div><div class='ctx'> </div><div class='hunk'>@@ -784,7 +785,6 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)</div><div class='ctx'> </div><div class='ctx'> 	/* vol-&gt;retry default is 0 (i.e. "soft" limited retry not hard retry) */</div><div class='ctx'> 	vol-&gt;rw = TRUE;</div><div class='del'>-	vol-&gt;ntlm = TRUE;</div><div class='ctx'> 	/* default is always to request posix paths. */</div><div class='ctx'> 	vol-&gt;posix_paths = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -915,30 +915,35 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)</div><div class='ctx'> 				cERROR(1,("no security value specified"));</div><div class='ctx'>                                 continue;</div><div class='ctx'>                         } else if (strnicmp(value, "krb5i", 5) == 0) {</div><div class='del'>-				vol-&gt;sign = 1;</div><div class='del'>-				vol-&gt;krb5 = 1;</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_KRB5 | </div><div class='add'>+					CIFSSEC_MUST_SIGN;</div><div class='ctx'> 			} else if (strnicmp(value, "krb5p", 5) == 0) {</div><div class='del'>-				/* vol-&gt;seal = 1; </div><div class='del'>-				   vol-&gt;krb5 = 1; */</div><div class='add'>+				/* vol-&gt;secFlg |= CIFSSEC_MUST_SEAL | </div><div class='add'>+					CIFSSEC_MAY_KRB5; */ </div><div class='ctx'> 				cERROR(1,("Krb5 cifs privacy not supported"));</div><div class='ctx'> 				return 1;</div><div class='ctx'> 			} else if (strnicmp(value, "krb5", 4) == 0) {</div><div class='del'>-				vol-&gt;krb5 = 1;</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_KRB5;</div><div class='ctx'> 			} else if (strnicmp(value, "ntlmv2i", 7) == 0) {</div><div class='del'>-				vol-&gt;ntlmv2 = 1;</div><div class='del'>-				vol-&gt;sign = 1;</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_NTLMV2 |</div><div class='add'>+					CIFSSEC_MUST_SIGN;</div><div class='ctx'> 			} else if (strnicmp(value, "ntlmv2", 6) == 0) {</div><div class='del'>-				vol-&gt;ntlmv2 = 1;</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_NTLMV2;</div><div class='ctx'> 			} else if (strnicmp(value, "ntlmi", 5) == 0) {</div><div class='del'>-				vol-&gt;ntlm = 1;</div><div class='del'>-				vol-&gt;sign = 1;</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_NTLM |</div><div class='add'>+					CIFSSEC_MUST_SIGN;</div><div class='ctx'> 			} else if (strnicmp(value, "ntlm", 4) == 0) {</div><div class='ctx'> 				/* ntlm is default so can be turned off too */</div><div class='del'>-				vol-&gt;ntlm = 1;</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_NTLM;</div><div class='ctx'> 			} else if (strnicmp(value, "nontlm", 6) == 0) {</div><div class='del'>-				vol-&gt;ntlm = 0;</div><div class='add'>+				/* BB is there a better way to do this? */</div><div class='add'>+				vol-&gt;secFlg |= CIFSSEC_MAY_NTLMV2;</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+			} else if (strnicmp(value, "lanman", 6) == 0) {</div><div class='add'>+                                vol-&gt;secFlg |= CIFSSEC_MAY_LANMAN;</div><div class='add'>+#endif</div><div class='ctx'> 			} else if (strnicmp(value, "none", 4) == 0) {</div><div class='del'>-				vol-&gt;nullauth = 1; </div><div class='add'>+				vol-&gt;nullauth = 1;</div><div class='ctx'>                         } else {</div><div class='ctx'>                                 cERROR(1,("bad security option: %s", value));</div><div class='ctx'>                                 return 1;</div><div class='hunk'>@@ -976,7 +981,7 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)</div><div class='ctx'> 			}</div><div class='ctx'> 			/* BB are there cases in which a comma can be valid in</div><div class='ctx'> 			a domain name and need special handling? */</div><div class='del'>-			if (strnlen(value, 65) &lt; 65) {</div><div class='add'>+			if (strnlen(value, 256) &lt; 256) {</div><div class='ctx'> 				vol-&gt;domainname = value;</div><div class='ctx'> 				cFYI(1, ("Domain name set"));</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -1168,6 +1173,10 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)</div><div class='ctx'> 			vol-&gt;no_psx_acl = 0;</div><div class='ctx'> 		} else if (strnicmp(data, "noacl",5) == 0) {</div><div class='ctx'> 			vol-&gt;no_psx_acl = 1;</div><div class='add'>+		} else if (strnicmp(data, "sign",4) == 0) {</div><div class='add'>+			vol-&gt;secFlg |= CIFSSEC_MUST_SIGN;</div><div class='add'>+/*		} else if (strnicmp(data, "seal",4) == 0) {</div><div class='add'>+			vol-&gt;secFlg |= CIFSSEC_MUST_SEAL; */</div><div class='ctx'> 		} else if (strnicmp(data, "direct",6) == 0) {</div><div class='ctx'> 			vol-&gt;direct_io = 1;</div><div class='ctx'> 		} else if (strnicmp(data, "forcedirectio",13) == 0) {</div><div class='hunk'>@@ -1762,11 +1771,18 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,</div><div class='ctx'> 			if (volume_info.username)</div><div class='ctx'> 				strncpy(pSesInfo-&gt;userName,</div><div class='ctx'> 					volume_info.username,MAX_USERNAME_SIZE);</div><div class='del'>-			if (volume_info.domainname)</div><div class='del'>-				strncpy(pSesInfo-&gt;domainName,</div><div class='del'>-					volume_info.domainname,MAX_USERNAME_SIZE);</div><div class='add'>+			if (volume_info.domainname) {</div><div class='add'>+				int len = strlen(volume_info.domainname);</div><div class='add'>+				pSesInfo-&gt;domainName = </div><div class='add'>+					kmalloc(len + 1, GFP_KERNEL);</div><div class='add'>+				if(pSesInfo-&gt;domainName)</div><div class='add'>+					strcpy(pSesInfo-&gt;domainName,</div><div class='add'>+						volume_info.domainname);</div><div class='add'>+			}</div><div class='ctx'> 			pSesInfo-&gt;linux_uid = volume_info.linux_uid;</div><div class='add'>+			pSesInfo-&gt;overrideSecFlg = volume_info.secFlg;</div><div class='ctx'> 			down(&amp;pSesInfo-&gt;sesSem);</div><div class='add'>+			/* BB FIXME need to pass vol-&gt;secFlgs BB */</div><div class='ctx'> 			rc = cifs_setup_session(xid,pSesInfo, cifs_sb-&gt;local_nls);</div><div class='ctx'> 			up(&amp;pSesInfo-&gt;sesSem);</div><div class='ctx'> 			if(!rc)</div><div class='hunk'>@@ -1980,7 +1996,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='del'>-	      char session_key[CIFS_SESSION_KEY_SIZE],</div><div class='add'>+	      char session_key[CIFS_SESS_KEY_SIZE],</div><div class='ctx'> 	      const struct nls_table *nls_codepage)</div><div class='ctx'> {</div><div class='ctx'> 	struct smb_hdr *smb_buffer;</div><div class='hunk'>@@ -2038,15 +2054,15 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 	pSMB-&gt;req_no_secext.Capabilities = cpu_to_le32(capabilities);</div><div class='ctx'> </div><div class='ctx'> 	pSMB-&gt;req_no_secext.CaseInsensitivePasswordLength = </div><div class='del'>-		cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='add'>+		cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	pSMB-&gt;req_no_secext.CaseSensitivePasswordLength =</div><div class='del'>-	    cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='add'>+	    cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='ctx'> 	bcc_ptr = pByteArea(smb_buffer);</div><div class='del'>-	memcpy(bcc_ptr, (char *) session_key, CIFS_SESSION_KEY_SIZE);</div><div class='del'>-	bcc_ptr += CIFS_SESSION_KEY_SIZE;</div><div class='del'>-	memcpy(bcc_ptr, (char *) session_key, CIFS_SESSION_KEY_SIZE);</div><div class='del'>-	bcc_ptr += CIFS_SESSION_KEY_SIZE;</div><div class='add'>+	memcpy(bcc_ptr, (char *) session_key, CIFS_SESS_KEY_SIZE);</div><div class='add'>+	bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='add'>+	memcpy(bcc_ptr, (char *) session_key, CIFS_SESS_KEY_SIZE);</div><div class='add'>+	bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='ctx'> 		if ((long) bcc_ptr % 2) { /* must be word aligned for Unicode */</div><div class='hunk'>@@ -2054,7 +2070,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 			bcc_ptr++;</div><div class='ctx'> 		}</div><div class='ctx'> 		if(user == NULL)</div><div class='del'>-			bytes_returned = 0; /* skill null user */</div><div class='add'>+			bytes_returned = 0; /* skip null user */</div><div class='ctx'> 	        else</div><div class='ctx'> 			bytes_returned =</div><div class='ctx'> 			        cifs_strtoUCS((__le16 *) bcc_ptr, user, 100,</div><div class='hunk'>@@ -2162,8 +2178,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 				if (remaining_words &gt; 0) {</div><div class='ctx'> 					len = UniStrnlen((wchar_t *)bcc_ptr,</div><div class='ctx'> 							 remaining_words-1);</div><div class='del'>-					if(ses-&gt;serverNOS)</div><div class='del'>-						kfree(ses-&gt;serverNOS);</div><div class='add'>+					kfree(ses-&gt;serverNOS);</div><div class='ctx'> 					ses-&gt;serverNOS = kzalloc(2 * (len + 1),GFP_KERNEL);</div><div class='ctx'> 					if(ses-&gt;serverNOS == NULL)</div><div class='ctx'> 						goto sesssetup_nomem;</div><div class='hunk'>@@ -2203,12 +2218,10 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 					/* if these kcallocs fail not much we</div><div class='ctx'> 					   can do, but better to not fail the</div><div class='ctx'> 					   sesssetup itself */</div><div class='del'>-					if(ses-&gt;serverDomain)</div><div class='del'>-						kfree(ses-&gt;serverDomain);</div><div class='add'>+					kfree(ses-&gt;serverDomain);</div><div class='ctx'> 					ses-&gt;serverDomain =</div><div class='ctx'> 					    kzalloc(2, GFP_KERNEL);</div><div class='del'>-					if(ses-&gt;serverNOS)</div><div class='del'>-						kfree(ses-&gt;serverNOS);</div><div class='add'>+					kfree(ses-&gt;serverNOS);</div><div class='ctx'> 					ses-&gt;serverNOS =</div><div class='ctx'> 					    kzalloc(2, GFP_KERNEL);</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2217,8 +2230,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 				if (((long) bcc_ptr + len) - (long)</div><div class='ctx'> 				    pByteArea(smb_buffer_response)</div><div class='ctx'> 					    &lt;= BCC(smb_buffer_response)) {</div><div class='del'>-					if(ses-&gt;serverOS)</div><div class='del'>-						kfree(ses-&gt;serverOS);</div><div class='add'>+					kfree(ses-&gt;serverOS);</div><div class='ctx'> 					ses-&gt;serverOS = kzalloc(len + 1,GFP_KERNEL);</div><div class='ctx'> 					if(ses-&gt;serverOS == NULL)</div><div class='ctx'> 						goto sesssetup_nomem;</div><div class='hunk'>@@ -2229,8 +2241,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 					bcc_ptr++;</div><div class='ctx'> </div><div class='ctx'> 					len = strnlen(bcc_ptr, 1024);</div><div class='del'>-					if(ses-&gt;serverNOS)</div><div class='del'>-						kfree(ses-&gt;serverNOS);</div><div class='add'>+					kfree(ses-&gt;serverNOS);</div><div class='ctx'> 					ses-&gt;serverNOS = kzalloc(len + 1,GFP_KERNEL);</div><div class='ctx'> 					if(ses-&gt;serverNOS == NULL)</div><div class='ctx'> 						goto sesssetup_nomem;</div><div class='hunk'>@@ -2274,292 +2285,6 @@ sesssetup_nomem:	/* do not return an error on nomem for the info strings,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='del'>-		char *SecurityBlob,int SecurityBlobLength,</div><div class='del'>-		const struct nls_table *nls_codepage)</div><div class='del'>-{</div><div class='del'>-	struct smb_hdr *smb_buffer;</div><div class='del'>-	struct smb_hdr *smb_buffer_response;</div><div class='del'>-	SESSION_SETUP_ANDX *pSMB;</div><div class='del'>-	SESSION_SETUP_ANDX *pSMBr;</div><div class='del'>-	char *bcc_ptr;</div><div class='del'>-	char *user;</div><div class='del'>-	char *domain;</div><div class='del'>-	int rc = 0;</div><div class='del'>-	int remaining_words = 0;</div><div class='del'>-	int bytes_returned = 0;</div><div class='del'>-	int len;</div><div class='del'>-	__u32 capabilities;</div><div class='del'>-	__u16 count;</div><div class='del'>-</div><div class='del'>-	cFYI(1, ("In spnego sesssetup "));</div><div class='del'>-	if(ses == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	user = ses-&gt;userName;</div><div class='del'>-	domain = ses-&gt;domainName;</div><div class='del'>-</div><div class='del'>-	smb_buffer = cifs_buf_get();</div><div class='del'>-	if (smb_buffer == NULL) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	smb_buffer_response = smb_buffer;</div><div class='del'>-	pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer;</div><div class='del'>-</div><div class='del'>-	/* send SMBsessionSetup here */</div><div class='del'>-	header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX,</div><div class='del'>-			NULL /* no tCon exists yet */ , 12 /* wct */ );</div><div class='del'>-</div><div class='del'>-	smb_buffer-&gt;Mid = GetNextMid(ses-&gt;server);</div><div class='del'>-	pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_EXT_SEC;</div><div class='del'>-	pSMB-&gt;req.AndXCommand = 0xFF;</div><div class='del'>-	if(ses-&gt;server-&gt;maxBuf &gt; 64*1024)</div><div class='del'>-		ses-&gt;server-&gt;maxBuf = (64*1023);</div><div class='del'>-	pSMB-&gt;req.MaxBufferSize = cpu_to_le16(ses-&gt;server-&gt;maxBuf);</div><div class='del'>-	pSMB-&gt;req.MaxMpxCount = cpu_to_le16(ses-&gt;server-&gt;maxReq);</div><div class='del'>-</div><div class='del'>-	if(ses-&gt;server-&gt;secMode &amp; (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))</div><div class='del'>-		smb_buffer-&gt;Flags2 |= SMBFLG2_SECURITY_SIGNATURE;</div><div class='del'>-</div><div class='del'>-	capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |</div><div class='del'>-	    CAP_EXTENDED_SECURITY;</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='del'>-		smb_buffer-&gt;Flags2 |= SMBFLG2_UNICODE;</div><div class='del'>-		capabilities |= CAP_UNICODE;</div><div class='del'>-	}</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_STATUS32) {</div><div class='del'>-		smb_buffer-&gt;Flags2 |= SMBFLG2_ERR_STATUS;</div><div class='del'>-		capabilities |= CAP_STATUS32;</div><div class='del'>-	}</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_DFS) {</div><div class='del'>-		smb_buffer-&gt;Flags2 |= SMBFLG2_DFS;</div><div class='del'>-		capabilities |= CAP_DFS;</div><div class='del'>-	}</div><div class='del'>-	pSMB-&gt;req.Capabilities = cpu_to_le32(capabilities);</div><div class='del'>-</div><div class='del'>-	pSMB-&gt;req.SecurityBlobLength = cpu_to_le16(SecurityBlobLength);</div><div class='del'>-	bcc_ptr = pByteArea(smb_buffer);</div><div class='del'>-	memcpy(bcc_ptr, SecurityBlob, SecurityBlobLength);</div><div class='del'>-	bcc_ptr += SecurityBlobLength;</div><div class='del'>-</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='del'>-		if ((long) bcc_ptr % 2) {	/* must be word aligned for Unicode strings */</div><div class='del'>-			*bcc_ptr = 0;</div><div class='del'>-			bcc_ptr++;</div><div class='del'>-		}</div><div class='del'>-		bytes_returned =</div><div class='del'>-		    cifs_strtoUCS((__le16 *) bcc_ptr, user, 100, nls_codepage);</div><div class='del'>-		bcc_ptr += 2 * bytes_returned;	/* convert num of 16 bit words to bytes */</div><div class='del'>-		bcc_ptr += 2;	/* trailing null */</div><div class='del'>-		if (domain == NULL)</div><div class='del'>-			bytes_returned =</div><div class='del'>-			    cifs_strtoUCS((__le16 *) bcc_ptr,</div><div class='del'>-					  "CIFS_LINUX_DOM", 32, nls_codepage);</div><div class='del'>-		else</div><div class='del'>-			bytes_returned =</div><div class='del'>-			    cifs_strtoUCS((__le16 *) bcc_ptr, domain, 64,</div><div class='del'>-					  nls_codepage);</div><div class='del'>-		bcc_ptr += 2 * bytes_returned;</div><div class='del'>-		bcc_ptr += 2;</div><div class='del'>-		bytes_returned =</div><div class='del'>-		    cifs_strtoUCS((__le16 *) bcc_ptr, "Linux version ",</div><div class='del'>-				  32, nls_codepage);</div><div class='del'>-		bcc_ptr += 2 * bytes_returned;</div><div class='del'>-		bytes_returned =</div><div class='del'>-		    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release, 32,</div><div class='del'>-				  nls_codepage);</div><div class='del'>-		bcc_ptr += 2 * bytes_returned;</div><div class='del'>-		bcc_ptr += 2;</div><div class='del'>-		bytes_returned =</div><div class='del'>-		    cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS,</div><div class='del'>-				  64, nls_codepage);</div><div class='del'>-		bcc_ptr += 2 * bytes_returned;</div><div class='del'>-		bcc_ptr += 2;</div><div class='del'>-	} else {</div><div class='del'>-		strncpy(bcc_ptr, user, 200);</div><div class='del'>-		bcc_ptr += strnlen(user, 200);</div><div class='del'>-		*bcc_ptr = 0;</div><div class='del'>-		bcc_ptr++;</div><div class='del'>-		if (domain == NULL) {</div><div class='del'>-			strcpy(bcc_ptr, "CIFS_LINUX_DOM");</div><div class='del'>-			bcc_ptr += strlen("CIFS_LINUX_DOM") + 1;</div><div class='del'>-		} else {</div><div class='del'>-			strncpy(bcc_ptr, domain, 64);</div><div class='del'>-			bcc_ptr += strnlen(domain, 64);</div><div class='del'>-			*bcc_ptr = 0;</div><div class='del'>-			bcc_ptr++;</div><div class='del'>-		}</div><div class='del'>-		strcpy(bcc_ptr, "Linux version ");</div><div class='del'>-		bcc_ptr += strlen("Linux version ");</div><div class='del'>-		strcpy(bcc_ptr, system_utsname.release);</div><div class='del'>-		bcc_ptr += strlen(system_utsname.release) + 1;</div><div class='del'>-		strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);</div><div class='del'>-		bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;</div><div class='del'>-	}</div><div class='del'>-	count = (long) bcc_ptr - (long) pByteArea(smb_buffer);</div><div class='del'>-	smb_buffer-&gt;smb_buf_length += count;</div><div class='del'>-	pSMB-&gt;req.ByteCount = cpu_to_le16(count);</div><div class='del'>-</div><div class='del'>-	rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response,</div><div class='del'>-			 &amp;bytes_returned, 1);</div><div class='del'>-	if (rc) {</div><div class='del'>-/*    rc = map_smb_to_linux_error(smb_buffer_response);  *//* done in SendReceive now */</div><div class='del'>-	} else if ((smb_buffer_response-&gt;WordCount == 3)</div><div class='del'>-		   || (smb_buffer_response-&gt;WordCount == 4)) {</div><div class='del'>-		__u16 action = le16_to_cpu(pSMBr-&gt;resp.Action);</div><div class='del'>-		__u16 blob_len =</div><div class='del'>-		    le16_to_cpu(pSMBr-&gt;resp.SecurityBlobLength);</div><div class='del'>-		if (action &amp; GUEST_LOGIN)</div><div class='del'>-			cFYI(1, (" Guest login"));	/* BB do we want to set anything in SesInfo struct ? */</div><div class='del'>-		if (ses) {</div><div class='del'>-			ses-&gt;Suid = smb_buffer_response-&gt;Uid;	/* UID left in wire format (le) */</div><div class='del'>-			cFYI(1, ("UID = %d ", ses-&gt;Suid));</div><div class='del'>-			bcc_ptr = pByteArea(smb_buffer_response);	/* response can have either 3 or 4 word count - Samba sends 3 */</div><div class='del'>-</div><div class='del'>-			/* BB Fix below to make endian neutral !! */</div><div class='del'>-</div><div class='del'>-			if ((pSMBr-&gt;resp.hdr.WordCount == 3)</div><div class='del'>-			    || ((pSMBr-&gt;resp.hdr.WordCount == 4)</div><div class='del'>-				&amp;&amp; (blob_len &lt;</div><div class='del'>-				    pSMBr-&gt;resp.ByteCount))) {</div><div class='del'>-				if (pSMBr-&gt;resp.hdr.WordCount == 4) {</div><div class='del'>-					bcc_ptr +=</div><div class='del'>-					    blob_len;</div><div class='del'>-					cFYI(1,</div><div class='del'>-					     ("Security Blob Length %d ",</div><div class='del'>-					      blob_len));</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (smb_buffer-&gt;Flags2 &amp; SMBFLG2_UNICODE) {</div><div class='del'>-					if ((long) (bcc_ptr) % 2) {</div><div class='del'>-						remaining_words =</div><div class='del'>-						    (BCC(smb_buffer_response)</div><div class='del'>-						     - 1) / 2;</div><div class='del'>-						bcc_ptr++;	/* Unicode strings must be word aligned */</div><div class='del'>-					} else {</div><div class='del'>-						remaining_words =</div><div class='del'>-						    BCC</div><div class='del'>-						    (smb_buffer_response) / 2;</div><div class='del'>-					}</div><div class='del'>-					len =</div><div class='del'>-					    UniStrnlen((wchar_t *) bcc_ptr,</div><div class='del'>-						       remaining_words - 1);</div><div class='del'>-/* We look for obvious messed up bcc or strings in response so we do not go off</div><div class='del'>-   the end since (at least) WIN2K and Windows XP have a major bug in not null</div><div class='del'>-   terminating last Unicode string in response  */</div><div class='del'>-					if(ses-&gt;serverOS)</div><div class='del'>-						kfree(ses-&gt;serverOS);</div><div class='del'>-					ses-&gt;serverOS =</div><div class='del'>-					    kzalloc(2 * (len + 1), GFP_KERNEL);</div><div class='del'>-					cifs_strfromUCS_le(ses-&gt;serverOS,</div><div class='del'>-							   (__le16 *)</div><div class='del'>-							   bcc_ptr, len,</div><div class='del'>-							   nls_codepage);</div><div class='del'>-					bcc_ptr += 2 * (len + 1);</div><div class='del'>-					remaining_words -= len + 1;</div><div class='del'>-					ses-&gt;serverOS[2 * len] = 0;</div><div class='del'>-					ses-&gt;serverOS[1 + (2 * len)] = 0;</div><div class='del'>-					if (remaining_words &gt; 0) {</div><div class='del'>-						len = UniStrnlen((wchar_t *)bcc_ptr,</div><div class='del'>-								 remaining_words</div><div class='del'>-								 - 1);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='del'>-						ses-&gt;serverNOS =</div><div class='del'>-						    kzalloc(2 * (len + 1),</div><div class='del'>-							    GFP_KERNEL);</div><div class='del'>-						cifs_strfromUCS_le(ses-&gt;serverNOS,</div><div class='del'>-								   (__le16 *)bcc_ptr,</div><div class='del'>-								   len,</div><div class='del'>-								   nls_codepage);</div><div class='del'>-						bcc_ptr += 2 * (len + 1);</div><div class='del'>-						ses-&gt;serverNOS[2 * len] = 0;</div><div class='del'>-						ses-&gt;serverNOS[1 + (2 * len)] = 0;</div><div class='del'>-						remaining_words -= len + 1;</div><div class='del'>-						if (remaining_words &gt; 0) {</div><div class='del'>-							len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words);	</div><div class='del'>-                     /* last string not null terminated (e.g.Windows XP/2000) */</div><div class='del'>-							if(ses-&gt;serverDomain)</div><div class='del'>-								kfree(ses-&gt;serverDomain);</div><div class='del'>-							ses-&gt;serverDomain = kzalloc(2*(len+1),GFP_KERNEL);</div><div class='del'>-							cifs_strfromUCS_le(ses-&gt;serverDomain,</div><div class='del'>-							     (__le16 *)bcc_ptr, </div><div class='del'>-							     len, nls_codepage);</div><div class='del'>-							bcc_ptr += 2*(len+1);</div><div class='del'>-							ses-&gt;serverDomain[2*len] = 0;</div><div class='del'>-							ses-&gt;serverDomain[1+(2*len)] = 0;</div><div class='del'>-						} /* else no more room so create dummy domain string */</div><div class='del'>-						else {</div><div class='del'>-							if(ses-&gt;serverDomain)</div><div class='del'>-								kfree(ses-&gt;serverDomain);</div><div class='del'>-							ses-&gt;serverDomain =</div><div class='del'>-							    kzalloc(2,GFP_KERNEL);</div><div class='del'>-						}</div><div class='del'>-					} else {/* no room use dummy domain&amp;NOS */</div><div class='del'>-						if(ses-&gt;serverDomain)</div><div class='del'>-							kfree(ses-&gt;serverDomain);</div><div class='del'>-						ses-&gt;serverDomain = kzalloc(2, GFP_KERNEL);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='del'>-						ses-&gt;serverNOS = kzalloc(2, GFP_KERNEL);</div><div class='del'>-					}</div><div class='del'>-				} else {	/* ASCII */</div><div class='del'>-</div><div class='del'>-					len = strnlen(bcc_ptr, 1024);</div><div class='del'>-					if (((long) bcc_ptr + len) - (long)</div><div class='del'>-					    pByteArea(smb_buffer_response)</div><div class='del'>-					    &lt;= BCC(smb_buffer_response)) {</div><div class='del'>-						if(ses-&gt;serverOS)</div><div class='del'>-							kfree(ses-&gt;serverOS);</div><div class='del'>-						ses-&gt;serverOS = kzalloc(len + 1, GFP_KERNEL);</div><div class='del'>-						strncpy(ses-&gt;serverOS, bcc_ptr, len);</div><div class='del'>-</div><div class='del'>-						bcc_ptr += len;</div><div class='del'>-						bcc_ptr[0] = 0;	/* null terminate the string */</div><div class='del'>-						bcc_ptr++;</div><div class='del'>-</div><div class='del'>-						len = strnlen(bcc_ptr, 1024);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='del'>-						ses-&gt;serverNOS = kzalloc(len + 1,GFP_KERNEL);</div><div class='del'>-						strncpy(ses-&gt;serverNOS, bcc_ptr, len);</div><div class='del'>-						bcc_ptr += len;</div><div class='del'>-						bcc_ptr[0] = 0;</div><div class='del'>-						bcc_ptr++;</div><div class='del'>-</div><div class='del'>-						len = strnlen(bcc_ptr, 1024);</div><div class='del'>-						if(ses-&gt;serverDomain)</div><div class='del'>-							kfree(ses-&gt;serverDomain);</div><div class='del'>-						ses-&gt;serverDomain = kzalloc(len + 1, GFP_KERNEL);</div><div class='del'>-						strncpy(ses-&gt;serverDomain, bcc_ptr, len);</div><div class='del'>-						bcc_ptr += len;</div><div class='del'>-						bcc_ptr[0] = 0;</div><div class='del'>-						bcc_ptr++;</div><div class='del'>-					} else</div><div class='del'>-						cFYI(1,</div><div class='del'>-						     ("Variable field of length %d extends beyond end of smb ",</div><div class='del'>-						      len));</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				cERROR(1,</div><div class='del'>-				       (" Security Blob Length extends beyond end of SMB"));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			cERROR(1, ("No session structure passed in."));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		cERROR(1,</div><div class='del'>-		       (" Invalid Word count %d: ",</div><div class='del'>-			smb_buffer_response-&gt;WordCount));</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (smb_buffer)</div><div class='del'>-		cifs_buf_release(smb_buffer);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='ctx'> CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 			      struct cifsSesInfo *ses, int * pNTLMv2_flag,</div><div class='ctx'> 			      const struct nls_table *nls_codepage)</div><div class='hunk'>@@ -2635,8 +2360,8 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 	    /* NTLMSSP_NEGOTIATE_ALWAYS_SIGN | */ NTLMSSP_NEGOTIATE_128;</div><div class='ctx'> 	if(sign_CIFS_PDUs)</div><div class='ctx'> 		negotiate_flags |= NTLMSSP_NEGOTIATE_SIGN;</div><div class='del'>-	if(ntlmv2_support)</div><div class='del'>-		negotiate_flags |= NTLMSSP_NEGOTIATE_NTLMV2;</div><div class='add'>+/*	if(ntlmv2_support)</div><div class='add'>+		negotiate_flags |= NTLMSSP_NEGOTIATE_NTLMV2;*/</div><div class='ctx'> 	/* setup pointers to domain name and workstation name */</div><div class='ctx'> 	bcc_ptr += SecurityBlobLength;</div><div class='ctx'> </div><div class='hunk'>@@ -2783,8 +2508,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 								 bcc_ptr,</div><div class='ctx'> 								 remaining_words</div><div class='ctx'> 								 - 1);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='add'>+						kfree(ses-&gt;serverNOS);</div><div class='ctx'> 						ses-&gt;serverNOS =</div><div class='ctx'> 						    kzalloc(2 * (len + 1),</div><div class='ctx'> 							    GFP_KERNEL);</div><div class='hunk'>@@ -2802,8 +2526,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 						if (remaining_words &gt; 0) {</div><div class='ctx'> 							len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words);	</div><div class='ctx'>            /* last string is not always null terminated (for e.g. for Windows XP &amp; 2000) */</div><div class='del'>-							if(ses-&gt;serverDomain)</div><div class='del'>-								kfree(ses-&gt;serverDomain);</div><div class='add'>+							kfree(ses-&gt;serverDomain);</div><div class='ctx'> 							ses-&gt;serverDomain =</div><div class='ctx'> 							    kzalloc(2 *</div><div class='ctx'> 								    (len +</div><div class='hunk'>@@ -2822,19 +2545,16 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 							    = 0;</div><div class='ctx'> 						} /* else no more room so create dummy domain string */</div><div class='ctx'> 						else {</div><div class='del'>-							if(ses-&gt;serverDomain)</div><div class='del'>-								kfree(ses-&gt;serverDomain);</div><div class='add'>+							kfree(ses-&gt;serverDomain);</div><div class='ctx'> 							ses-&gt;serverDomain =</div><div class='ctx'> 							    kzalloc(2,</div><div class='ctx'> 								    GFP_KERNEL);</div><div class='ctx'> 						}</div><div class='ctx'> 					} else {	/* no room so create dummy domain and NOS string */</div><div class='del'>-						if(ses-&gt;serverDomain);</div><div class='del'>-							kfree(ses-&gt;serverDomain);</div><div class='add'>+						kfree(ses-&gt;serverDomain);</div><div class='ctx'> 						ses-&gt;serverDomain =</div><div class='ctx'> 						    kzalloc(2, GFP_KERNEL);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='add'>+						kfree(ses-&gt;serverNOS);</div><div class='ctx'> 						ses-&gt;serverNOS =</div><div class='ctx'> 						    kzalloc(2, GFP_KERNEL);</div><div class='ctx'> 					}</div><div class='hunk'>@@ -2856,8 +2576,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 						bcc_ptr++;</div><div class='ctx'> </div><div class='ctx'> 						len = strnlen(bcc_ptr, 1024);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='add'>+						kfree(ses-&gt;serverNOS);</div><div class='ctx'> 						ses-&gt;serverNOS =</div><div class='ctx'> 						    kzalloc(len + 1,</div><div class='ctx'> 							    GFP_KERNEL);</div><div class='hunk'>@@ -2867,8 +2586,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,</div><div class='ctx'> 						bcc_ptr++;</div><div class='ctx'> </div><div class='ctx'> 						len = strnlen(bcc_ptr, 1024);</div><div class='del'>-						if(ses-&gt;serverDomain)</div><div class='del'>-							kfree(ses-&gt;serverDomain);</div><div class='add'>+						kfree(ses-&gt;serverDomain);</div><div class='ctx'> 						ses-&gt;serverDomain =</div><div class='ctx'> 						    kzalloc(len + 1,</div><div class='ctx'> 							    GFP_KERNEL);</div><div class='hunk'>@@ -2994,14 +2712,14 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 	SecurityBlob-&gt;LmChallengeResponse.Buffer = 0;</div><div class='ctx'> </div><div class='ctx'> 	SecurityBlob-&gt;NtChallengeResponse.Length =</div><div class='del'>-	    cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='add'>+	    cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='ctx'> 	SecurityBlob-&gt;NtChallengeResponse.MaximumLength =</div><div class='del'>-	    cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='del'>-	memcpy(bcc_ptr, ntlm_session_key, CIFS_SESSION_KEY_SIZE);</div><div class='add'>+	    cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='add'>+	memcpy(bcc_ptr, ntlm_session_key, CIFS_SESS_KEY_SIZE);</div><div class='ctx'> 	SecurityBlob-&gt;NtChallengeResponse.Buffer =</div><div class='ctx'> 	    cpu_to_le32(SecurityBlobLength);</div><div class='del'>-	SecurityBlobLength += CIFS_SESSION_KEY_SIZE;</div><div class='del'>-	bcc_ptr += CIFS_SESSION_KEY_SIZE;</div><div class='add'>+	SecurityBlobLength += CIFS_SESS_KEY_SIZE;</div><div class='add'>+	bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	if (ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='ctx'> 		if (domain == NULL) {</div><div class='hunk'>@@ -3190,8 +2908,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 								 bcc_ptr,</div><div class='ctx'> 								 remaining_words</div><div class='ctx'> 								 - 1);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='add'>+						kfree(ses-&gt;serverNOS);</div><div class='ctx'> 						ses-&gt;serverNOS =</div><div class='ctx'> 						    kzalloc(2 * (len + 1),</div><div class='ctx'> 							    GFP_KERNEL);</div><div class='hunk'>@@ -3244,8 +2961,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 						if(ses-&gt;serverDomain)</div><div class='ctx'> 							kfree(ses-&gt;serverDomain);</div><div class='ctx'> 						ses-&gt;serverDomain = kzalloc(2, GFP_KERNEL);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='add'>+						kfree(ses-&gt;serverNOS);</div><div class='ctx'> 						ses-&gt;serverNOS = kzalloc(2, GFP_KERNEL);</div><div class='ctx'> 					}</div><div class='ctx'> 				} else {	/* ASCII */</div><div class='hunk'>@@ -3263,8 +2979,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 						bcc_ptr++;</div><div class='ctx'> </div><div class='ctx'> 						len = strnlen(bcc_ptr, 1024);</div><div class='del'>-						if(ses-&gt;serverNOS)</div><div class='del'>-							kfree(ses-&gt;serverNOS);</div><div class='add'>+						kfree(ses-&gt;serverNOS);</div><div class='ctx'> 						ses-&gt;serverNOS = kzalloc(len+1,GFP_KERNEL);</div><div class='ctx'> 						strncpy(ses-&gt;serverNOS, bcc_ptr, len);	</div><div class='ctx'> 						bcc_ptr += len;</div><div class='hunk'>@@ -3340,22 +3055,33 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 	bcc_ptr = &amp;pSMB-&gt;Password[0];</div><div class='ctx'> 	if((ses-&gt;server-&gt;secMode) &amp; SECMODE_USER) {</div><div class='ctx'> 		pSMB-&gt;PasswordLength = cpu_to_le16(1);	/* minimum */</div><div class='add'>+		*bcc_ptr = 0; /* password is null byte */</div><div class='ctx'> 		bcc_ptr++;              /* skip password */</div><div class='add'>+		/* already aligned so no need to do it below */</div><div class='ctx'> 	} else {</div><div class='del'>-		pSMB-&gt;PasswordLength = cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='add'>+		pSMB-&gt;PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='ctx'> 		/* BB FIXME add code to fail this if NTLMv2 or Kerberos</div><div class='ctx'> 		   specified as required (when that support is added to</div><div class='ctx'> 		   the vfs in the future) as only NTLM or the much</div><div class='del'>-		   weaker LANMAN (which we do not send) is accepted</div><div class='add'>+		   weaker LANMAN (which we do not send by default) is accepted</div><div class='ctx'> 		   by Samba (not sure whether other servers allow</div><div class='ctx'> 		   NTLMv2 password here) */</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+		if((extended_security &amp; CIFSSEC_MAY_LANMAN) &amp;&amp; </div><div class='add'>+			(ses-&gt;server-&gt;secType == LANMAN))</div><div class='add'>+			calc_lanman_hash(ses, bcc_ptr);</div><div class='add'>+		else</div><div class='add'>+#endif /* CIFS_WEAK_PW_HASH */</div><div class='ctx'> 		SMBNTencrypt(ses-&gt;password,</div><div class='ctx'> 			     ses-&gt;server-&gt;cryptKey,</div><div class='ctx'> 			     bcc_ptr);</div><div class='ctx'> </div><div class='del'>-		bcc_ptr += CIFS_SESSION_KEY_SIZE;</div><div class='del'>-		*bcc_ptr = 0;</div><div class='del'>-		bcc_ptr++; /* align */</div><div class='add'>+		bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='add'>+		if(ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='add'>+			/* must align unicode strings */</div><div class='add'>+			*bcc_ptr = 0; /* null byte password */</div><div class='add'>+			bcc_ptr++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if(ses-&gt;server-&gt;secMode &amp; </div><div class='hunk'>@@ -3429,7 +3155,10 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> 			}</div><div class='ctx'> 			/* else do not bother copying these informational fields */</div><div class='ctx'> 		}</div><div class='del'>-		tcon-&gt;Flags = le16_to_cpu(pSMBr-&gt;OptionalSupport);</div><div class='add'>+		if(smb_buffer_response-&gt;WordCount == 3)</div><div class='add'>+			tcon-&gt;Flags = le16_to_cpu(pSMBr-&gt;OptionalSupport);</div><div class='add'>+		else</div><div class='add'>+			tcon-&gt;Flags = 0;</div><div class='ctx'> 		cFYI(1, ("Tcon flags: 0x%x ", tcon-&gt;Flags));</div><div class='ctx'> 	} else if ((rc == 0) &amp;&amp; tcon == NULL) {</div><div class='ctx'>         /* all we need to save for IPC$ connection */</div><div class='hunk'>@@ -3494,7 +3223,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,</div><div class='ctx'> 					   struct nls_table * nls_info)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='del'>-	char ntlm_session_key[CIFS_SESSION_KEY_SIZE];</div><div class='add'>+	char ntlm_session_key[CIFS_SESS_KEY_SIZE];</div><div class='ctx'> 	int ntlmv2_flag = FALSE;</div><div class='ctx'> 	int first_time = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3526,20 +3255,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,</div><div class='ctx'> 			pSesInfo-&gt;server-&gt;secMode,</div><div class='ctx'> 			pSesInfo-&gt;server-&gt;capabilities,</div><div class='ctx'> 			pSesInfo-&gt;server-&gt;timeZone));</div><div class='del'>-#ifdef CONFIG_CIFS_EXPERIMENTAL</div><div class='del'>-		if(experimEnabled &gt; 1)</div><div class='del'>-			rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,</div><div class='del'>-					    &amp;ntlmv2_flag, nls_info);	</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-		if (extended_security</div><div class='add'>+		if(experimEnabled &lt; 2)</div><div class='add'>+			rc = CIFS_SessSetup(xid, pSesInfo,</div><div class='add'>+					    first_time, nls_info);</div><div class='add'>+		else if (extended_security</div><div class='ctx'> 				&amp;&amp; (pSesInfo-&gt;capabilities &amp; CAP_EXTENDED_SECURITY)</div><div class='ctx'> 				&amp;&amp; (pSesInfo-&gt;server-&gt;secType == NTLMSSP)) {</div><div class='del'>-			cFYI(1, ("New style sesssetup"));</div><div class='del'>-			rc = CIFSSpnegoSessSetup(xid, pSesInfo,</div><div class='del'>-				NULL /* security blob */, </div><div class='del'>-				0 /* blob length */,</div><div class='del'>-				nls_info);</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='ctx'> 		} else if (extended_security</div><div class='ctx'> 			   &amp;&amp; (pSesInfo-&gt;capabilities &amp; CAP_EXTENDED_SECURITY)</div><div class='ctx'> 			   &amp;&amp; (pSesInfo-&gt;server-&gt;secType == RawNTLMSSP)) {</div><div class='head'>diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c<br/>index 82315edc77d7..ba4cbe9b0684 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/dir.c</a></div><div class='hunk'>@@ -113,7 +113,7 @@ cifs_bp_rename_retry:</div><div class='ctx'> 	full_path[namelen+2] = 0;</div><div class='ctx'> BB remove above eight lines BB */</div><div class='ctx'> </div><div class='del'>-/* Inode operations in similar order to how they appear in the Linux file fs.h */</div><div class='add'>+/* Inode operations in similar order to how they appear in Linux file fs.h */</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> cifs_create(struct inode *inode, struct dentry *direntry, int mode,</div><div class='hunk'>@@ -178,11 +178,14 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,</div><div class='ctx'> 		FreeXid(xid);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	rc = CIFSSMBOpen(xid, pTcon, full_path, disposition,</div><div class='add'>+	if (cifs_sb-&gt;tcon-&gt;ses-&gt;capabilities &amp; CAP_NT_SMBS) </div><div class='add'>+		rc = CIFSSMBOpen(xid, pTcon, full_path, disposition,</div><div class='ctx'> 			 desiredAccess, CREATE_NOT_DIR,</div><div class='ctx'> 			 &amp;fileHandle, &amp;oplock, buf, cifs_sb-&gt;local_nls,</div><div class='ctx'> 			 cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+	else</div><div class='add'>+		rc = -EIO; /* no NT SMB support fall into legacy open below */</div><div class='add'>+</div><div class='ctx'> 	if(rc == -EIO) {</div><div class='ctx'> 		/* old server, retry the open legacy style */</div><div class='ctx'> 		rc = SMBLegacyOpen(xid, pTcon, full_path, disposition,</div><div class='hunk'>@@ -191,7 +194,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,</div><div class='ctx'> 			cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> 	} </div><div class='ctx'> 	if (rc) {</div><div class='del'>-		cFYI(1, ("cifs_create returned 0x%x ", rc));</div><div class='add'>+		cFYI(1, ("cifs_create returned 0x%x", rc));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* If Open reported that we actually created a file</div><div class='ctx'> 		then we now have to set the mode if possible */</div><div class='hunk'>@@ -369,6 +372,10 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode,</div><div class='ctx'> 					 cifs_sb-&gt;mnt_cifs_flags &amp; </div><div class='ctx'> 					    CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> </div><div class='add'>+			/* BB FIXME - add handling for backlevel servers</div><div class='add'>+			   which need legacy open and check for all</div><div class='add'>+			   calls to SMBOpen for fallback to </div><div class='add'>+			   SMBLeagcyOpen */</div><div class='ctx'> 			if(!rc) {</div><div class='ctx'> 				/* BB Do not bother to decode buf since no</div><div class='ctx'> 				   local inode yet to put timestamps in,</div><div class='head'>diff --git a/fs/cifs/fcntl.c b/fs/cifs/fcntl.c<br/>index 633a93811328..d91a3d44e9e3 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/fcntl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/fcntl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/fcntl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/fcntl.c</a></div><div class='hunk'>@@ -91,14 +91,14 @@ int cifs_dir_notify(struct file * file, unsigned long arg)</div><div class='ctx'> 	if(full_path == NULL) {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 	} else {</div><div class='del'>-		cERROR(1,("cifs dir notify on file %s with arg 0x%lx",full_path,arg)); /* BB removeme BB */</div><div class='add'>+		cFYI(1,("dir notify on file %s Arg 0x%lx",full_path,arg));</div><div class='ctx'> 		rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, </div><div class='ctx'> 			GENERIC_READ | SYNCHRONIZE, 0 /* create options */,</div><div class='ctx'> 			&amp;netfid, &amp;oplock,NULL, cifs_sb-&gt;local_nls,</div><div class='ctx'> 			cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> 		/* BB fixme - add this handle to a notify handle list */</div><div class='ctx'> 		if(rc) {</div><div class='del'>-			cERROR(1,("Could not open directory for notify"));  /* BB remove BB */</div><div class='add'>+			cFYI(1,("Could not open directory for notify"));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			filter = convert_to_cifs_notify_flags(arg);</div><div class='ctx'> 			if(filter != 0) {</div><div class='head'>diff --git a/fs/cifs/file.c b/fs/cifs/file.c<br/>index e2b4ce1dad66..944d2b9e092d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/file.c</a></div><div class='hunk'>@@ -110,7 +110,6 @@ static inline int cifs_open_inode_helper(struct inode *inode, struct file *file,</div><div class='ctx'> 			 &amp;pCifsInode-&gt;openFileList);</div><div class='ctx'> 	}</div><div class='ctx'> 	write_unlock(&amp;GlobalSMBSeslock);</div><div class='del'>-	write_unlock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 	if (pCifsInode-&gt;clientCanCacheRead) {</div><div class='ctx'> 		/* we have the inode open somewhere else</div><div class='ctx'> 		   no need to discard cache data */</div><div class='hunk'>@@ -201,7 +200,7 @@ int cifs_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (file-&gt;f_flags &amp; O_EXCL)</div><div class='ctx'> 				cERROR(1, ("could not find file instance for "</div><div class='del'>-					   "new file %p ", file));</div><div class='add'>+					   "new file %p", file));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -260,10 +259,15 @@ int cifs_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess,</div><div class='del'>-			 CREATE_NOT_DIR, &amp;netfid, &amp;oplock, buf,</div><div class='add'>+</div><div class='add'>+	if (cifs_sb-&gt;tcon-&gt;ses-&gt;capabilities &amp; CAP_NT_SMBS)</div><div class='add'>+		rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, </div><div class='add'>+			 desiredAccess, CREATE_NOT_DIR, &amp;netfid, &amp;oplock, buf,</div><div class='ctx'> 			 cifs_sb-&gt;local_nls, cifs_sb-&gt;mnt_cifs_flags</div><div class='ctx'> 				 &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='add'>+	else</div><div class='add'>+		rc = -EIO; /* no NT SMB support fall into legacy open below */</div><div class='add'>+</div><div class='ctx'> 	if (rc == -EIO) {</div><div class='ctx'> 		/* Old server, try legacy style OpenX */</div><div class='ctx'> 		rc = SMBLegacyOpen(xid, pTcon, full_path, disposition,</div><div class='hunk'>@@ -272,7 +276,7 @@ int cifs_open(struct inode *inode, struct file *file)</div><div class='ctx'> 				&amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		cFYI(1, ("cifs_open returned 0x%x ", rc));</div><div class='add'>+		cFYI(1, ("cifs_open returned 0x%x", rc));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	file-&gt;private_data =</div><div class='hunk'>@@ -282,7 +286,6 @@ int cifs_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	pCifsFile = cifs_init_private(file-&gt;private_data, inode, file, netfid);</div><div class='del'>-	write_lock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 	write_lock(&amp;GlobalSMBSeslock);</div><div class='ctx'> 	list_add(&amp;pCifsFile-&gt;tlist, &amp;pTcon-&gt;openFileList);</div><div class='ctx'> </div><div class='hunk'>@@ -293,7 +296,6 @@ int cifs_open(struct inode *inode, struct file *file)</div><div class='ctx'> 					    &amp;oplock, buf, full_path, xid);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		write_unlock(&amp;GlobalSMBSeslock);</div><div class='del'>-		write_unlock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (oplock &amp; CIFS_CREATE_ACTION) {           </div><div class='hunk'>@@ -322,7 +324,7 @@ out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Try to reaquire byte range locks that were released when session */</div><div class='add'>+/* Try to reacquire byte range locks that were released when session */</div><div class='ctx'> /* to server was lost */</div><div class='ctx'> static int cifs_relock_file(struct cifsFileInfo *cifsFile)</div><div class='ctx'> {</div><div class='hunk'>@@ -409,8 +411,8 @@ static int cifs_reopen_file(struct inode *inode, struct file *file,</div><div class='ctx'> 				CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		up(&amp;pCifsFile-&gt;fh_sem);</div><div class='del'>-		cFYI(1, ("cifs_open returned 0x%x ", rc));</div><div class='del'>-		cFYI(1, ("oplock: %d ", oplock));</div><div class='add'>+		cFYI(1, ("cifs_open returned 0x%x", rc));</div><div class='add'>+		cFYI(1, ("oplock: %d", oplock));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pCifsFile-&gt;netfid = netfid;</div><div class='ctx'> 		pCifsFile-&gt;invalidHandle = FALSE;</div><div class='hunk'>@@ -472,7 +474,6 @@ int cifs_close(struct inode *inode, struct file *file)</div><div class='ctx'> 	pTcon = cifs_sb-&gt;tcon;</div><div class='ctx'> 	if (pSMBFile) {</div><div class='ctx'> 		pSMBFile-&gt;closePend = TRUE;</div><div class='del'>-		write_lock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 		if (pTcon) {</div><div class='ctx'> 			/* no sense reconnecting to close a file that is</div><div class='ctx'> 			   already closed */</div><div class='hunk'>@@ -487,23 +488,18 @@ int cifs_close(struct inode *inode, struct file *file)</div><div class='ctx'> 					the struct would be in each open file,</div><div class='ctx'> 					but this should give enough time to </div><div class='ctx'> 					clear the socket */</div><div class='del'>-					write_unlock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 					cERROR(1,("close with pending writes"));</div><div class='ctx'> 					msleep(timeout);</div><div class='del'>-					write_lock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 					timeout *= 4;</div><div class='ctx'> 				} </div><div class='del'>-				write_unlock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 				rc = CIFSSMBClose(xid, pTcon,</div><div class='ctx'> 						  pSMBFile-&gt;netfid);</div><div class='del'>-				write_lock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		write_lock(&amp;GlobalSMBSeslock);</div><div class='ctx'> 		list_del(&amp;pSMBFile-&gt;flist);</div><div class='ctx'> 		list_del(&amp;pSMBFile-&gt;tlist);</div><div class='ctx'> 		write_unlock(&amp;GlobalSMBSeslock);</div><div class='del'>-		write_unlock(&amp;file-&gt;f_owner.lock);</div><div class='ctx'> 		kfree(pSMBFile-&gt;search_resume_name);</div><div class='ctx'> 		kfree(file-&gt;private_data);</div><div class='ctx'> 		file-&gt;private_data = NULL;</div><div class='hunk'>@@ -531,7 +527,7 @@ int cifs_closedir(struct inode *inode, struct file *file)</div><div class='ctx'> 	    (struct cifsFileInfo *)file-&gt;private_data;</div><div class='ctx'> 	char *ptmp;</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("Closedir inode = 0x%p with ", inode));</div><div class='add'>+	cFYI(1, ("Closedir inode = 0x%p", inode));</div><div class='ctx'> </div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='hunk'>@@ -605,7 +601,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pfLock-&gt;fl_flags &amp; FL_ACCESS)</div><div class='ctx'> 		cFYI(1, ("Process suspended by mandatory locking - "</div><div class='del'>-			 "not implemented yet "));</div><div class='add'>+			 "not implemented yet"));</div><div class='ctx'> 	if (pfLock-&gt;fl_flags &amp; FL_LEASE)</div><div class='ctx'> 		cFYI(1, ("Lease on file - not implemented yet"));</div><div class='ctx'> 	if (pfLock-&gt;fl_flags &amp; </div><div class='hunk'>@@ -1079,9 +1075,9 @@ static int cifs_writepages(struct address_space *mapping,</div><div class='ctx'> 	unsigned int bytes_written;</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb;</div><div class='ctx'> 	int done = 0;</div><div class='del'>-	pgoff_t end = -1;</div><div class='add'>+	pgoff_t end;</div><div class='ctx'> 	pgoff_t index;</div><div class='del'>-	int is_range = 0;</div><div class='add'>+ 	int range_whole = 0;</div><div class='ctx'> 	struct kvec iov[32];</div><div class='ctx'> 	int len;</div><div class='ctx'> 	int n_iov = 0;</div><div class='hunk'>@@ -1122,16 +1118,14 @@ static int cifs_writepages(struct address_space *mapping,</div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='ctx'> 	pagevec_init(&amp;pvec, 0);</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE)</div><div class='add'>+	if (wbc-&gt;range_cyclic) {</div><div class='ctx'> 		index = mapping-&gt;writeback_index; /* Start from prev offset */</div><div class='del'>-	else {</div><div class='del'>-		index = 0;</div><div class='del'>-		scanned = 1;</div><div class='del'>-	}</div><div class='del'>-	if (wbc-&gt;start || wbc-&gt;end) {</div><div class='del'>-		index = wbc-&gt;start &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-		end = wbc-&gt;end &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-		is_range = 1;</div><div class='add'>+		end = -1;</div><div class='add'>+	} else {</div><div class='add'>+		index = wbc-&gt;range_start &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+		end = wbc-&gt;range_end &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+		if (wbc-&gt;range_start == 0 &amp;&amp; wbc-&gt;range_end == LLONG_MAX)</div><div class='add'>+			range_whole = 1;</div><div class='ctx'> 		scanned = 1;</div><div class='ctx'> 	}</div><div class='ctx'> retry:</div><div class='hunk'>@@ -1167,7 +1161,7 @@ retry:</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (unlikely(is_range) &amp;&amp; (page-&gt;index &gt; end)) {</div><div class='add'>+			if (!wbc-&gt;range_cyclic &amp;&amp; page-&gt;index &gt; end) {</div><div class='ctx'> 				done = 1;</div><div class='ctx'> 				unlock_page(page);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1271,7 +1265,7 @@ retry:</div><div class='ctx'> 		index = 0;</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='del'>-	if (!is_range)</div><div class='add'>+	if (wbc-&gt;range_cyclic || (range_whole &amp;&amp; wbc-&gt;nr_to_write &gt; 0))</div><div class='ctx'> 		mapping-&gt;writeback_index = index;</div><div class='ctx'> </div><div class='ctx'> 	FreeXid(xid);</div><div class='hunk'>@@ -1377,7 +1371,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)</div><div class='ctx'> </div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("Sync file - name: %s datasync: 0x%x ", </div><div class='add'>+	cFYI(1, ("Sync file - name: %s datasync: 0x%x", </div><div class='ctx'> 		dentry-&gt;d_name.name, datasync));</div><div class='ctx'> 	</div><div class='ctx'> 	rc = filemap_fdatawrite(inode-&gt;i_mapping);</div><div class='hunk'>@@ -1406,7 +1400,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)</div><div class='ctx'> /*	fill in rpages then </div><div class='ctx'> 	result = cifs_pagein_inode(inode, index, rpages); */ /* BB finish */</div><div class='ctx'> </div><div class='del'>-/*	cFYI(1, ("rpages is %d for sync page of Index %ld ", rpages, index));</div><div class='add'>+/*	cFYI(1, ("rpages is %d for sync page of Index %ld", rpages, index));</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='hunk'>@@ -1419,7 +1413,7 @@ int cifs_fsync(struct file *file, struct dentry *dentry, int datasync)</div><div class='ctx'>  * As file closes, flush all cached write data for this inode checking</div><div class='ctx'>  * for write behind errors.</div><div class='ctx'>  */</div><div class='del'>-int cifs_flush(struct file *file)</div><div class='add'>+int cifs_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode * inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -1838,7 +1832,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page,</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto io_error;</div><div class='ctx'> 	else</div><div class='del'>-		cFYI(1, ("Bytes read %d ",rc));</div><div class='add'>+		cFYI(1, ("Bytes read %d",rc));</div><div class='ctx'>                                                                                                                            </div><div class='ctx'> 	file-&gt;f_dentry-&gt;d_inode-&gt;i_atime =</div><div class='ctx'> 		current_fs_time(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb);</div><div class='hunk'>@@ -1948,7 +1942,7 @@ static int cifs_prepare_write(struct file *file, struct page *page,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations cifs_addr_ops = {</div><div class='add'>+const struct address_space_operations cifs_addr_ops = {</div><div class='ctx'> 	.readpage = cifs_readpage,</div><div class='ctx'> 	.readpages = cifs_readpages,</div><div class='ctx'> 	.writepage = cifs_writepage,</div><div class='hunk'>@@ -1959,3 +1953,19 @@ struct address_space_operations cifs_addr_ops = {</div><div class='ctx'> 	/* .sync_page = cifs_sync_page, */</div><div class='ctx'> 	/* .direct_IO = */</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cifs_readpages requires the server to support a buffer large enough to</div><div class='add'>+ * contain the header plus one complete page of data.  Otherwise, we need</div><div class='add'>+ * to leave cifs_readpages out of the address space operations.</div><div class='add'>+ */</div><div class='add'>+const struct address_space_operations cifs_addr_ops_smallbuf = {</div><div class='add'>+	.readpage = cifs_readpage,</div><div class='add'>+	.writepage = cifs_writepage,</div><div class='add'>+	.writepages = cifs_writepages,</div><div class='add'>+	.prepare_write = cifs_prepare_write,</div><div class='add'>+	.commit_write = cifs_commit_write,</div><div class='add'>+	.set_page_dirty = __set_page_dirty_nobuffers,</div><div class='add'>+	/* .sync_page = cifs_sync_page, */</div><div class='add'>+	/* .direct_IO = */</div><div class='add'>+};</div><div class='head'>diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c<br/>index 4093764ef461..b88147c1dc27 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/inode.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,</div><div class='ctx'> 	char *tmp_path;</div><div class='ctx'> </div><div class='ctx'> 	pTcon = cifs_sb-&gt;tcon;</div><div class='del'>-	cFYI(1, ("Getting info on %s ", search_path));</div><div class='add'>+	cFYI(1, ("Getting info on %s", search_path));</div><div class='ctx'> 	/* could have done a find first instead but this returns more info */</div><div class='ctx'> 	rc = CIFSSMBUnixQPathInfo(xid, pTcon, search_path, &amp;findData,</div><div class='ctx'> 				  cifs_sb-&gt;local_nls, cifs_sb-&gt;mnt_cifs_flags &amp;</div><div class='hunk'>@@ -97,9 +97,9 @@ int cifs_get_inode_info_unix(struct inode **pinode,</div><div class='ctx'> 		inode = *pinode;</div><div class='ctx'> 		cifsInfo = CIFS_I(inode);</div><div class='ctx'> </div><div class='del'>-		cFYI(1, ("Old time %ld ", cifsInfo-&gt;time));</div><div class='add'>+		cFYI(1, ("Old time %ld", cifsInfo-&gt;time));</div><div class='ctx'> 		cifsInfo-&gt;time = jiffies;</div><div class='del'>-		cFYI(1, ("New time %ld ", cifsInfo-&gt;time));</div><div class='add'>+		cFYI(1, ("New time %ld", cifsInfo-&gt;time));</div><div class='ctx'> 		/* this is ok to set on every inode revalidate */</div><div class='ctx'> 		atomic_set(&amp;cifsInfo-&gt;inUse,1);</div><div class='ctx'> </div><div class='hunk'>@@ -180,11 +180,12 @@ int cifs_get_inode_info_unix(struct inode **pinode,</div><div class='ctx'> 			else /* not direct, send byte range locks */ </div><div class='ctx'> 				inode-&gt;i_fop = &amp;cifs_file_ops;</div><div class='ctx'> </div><div class='del'>-			inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> 			/* check if server can support readpages */</div><div class='ctx'> 			if(pTcon-&gt;ses-&gt;server-&gt;maxBuf &lt; </div><div class='del'>-			    4096 + MAX_CIFS_HDR_SIZE)</div><div class='del'>-				inode-&gt;i_data.a_ops-&gt;readpages = NULL;</div><div class='add'>+			    PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE)</div><div class='add'>+				inode-&gt;i_data.a_ops = &amp;cifs_addr_ops_smallbuf;</div><div class='add'>+			else</div><div class='add'>+				inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> 		} else if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 			cFYI(1, ("Directory inode"));</div><div class='ctx'> 			inode-&gt;i_op = &amp;cifs_dir_inode_ops;</div><div class='hunk'>@@ -421,23 +422,23 @@ int cifs_get_inode_info(struct inode **pinode,</div><div class='ctx'> 		inode = *pinode;</div><div class='ctx'> 		cifsInfo = CIFS_I(inode);</div><div class='ctx'> 		cifsInfo-&gt;cifsAttrs = attr;</div><div class='del'>-		cFYI(1, ("Old time %ld ", cifsInfo-&gt;time));</div><div class='add'>+		cFYI(1, ("Old time %ld", cifsInfo-&gt;time));</div><div class='ctx'> 		cifsInfo-&gt;time = jiffies;</div><div class='del'>-		cFYI(1, ("New time %ld ", cifsInfo-&gt;time));</div><div class='add'>+		cFYI(1, ("New time %ld", cifsInfo-&gt;time));</div><div class='ctx'> </div><div class='ctx'> 		/* blksize needs to be multiple of two. So safer to default to</div><div class='ctx'> 		blksize and blkbits set in superblock so 2**blkbits and blksize</div><div class='ctx'> 		will match rather than setting to:</div><div class='ctx'> 		(pTcon-&gt;ses-&gt;server-&gt;maxBuf - MAX_CIFS_HDR_SIZE) &amp; 0xFFFFFE00;*/</div><div class='ctx'> </div><div class='del'>-		/* Linux can not store file creation time unfortunately so we ignore it */</div><div class='add'>+		/* Linux can not store file creation time so ignore it */</div><div class='ctx'> 		inode-&gt;i_atime =</div><div class='ctx'> 		    cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;LastAccessTime));</div><div class='ctx'> 		inode-&gt;i_mtime =</div><div class='ctx'> 		    cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;LastWriteTime));</div><div class='ctx'> 		inode-&gt;i_ctime =</div><div class='ctx'> 		    cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;ChangeTime));</div><div class='del'>-		cFYI(0, ("Attributes came in as 0x%x ", attr));</div><div class='add'>+		cFYI(0, ("Attributes came in as 0x%x", attr));</div><div class='ctx'> </div><div class='ctx'> 		/* set default mode. will override for dirs below */</div><div class='ctx'> 		if (atomic_read(&amp;cifsInfo-&gt;inUse) == 0)</div><div class='hunk'>@@ -519,10 +520,11 @@ int cifs_get_inode_info(struct inode **pinode,</div><div class='ctx'> 			else /* not direct, send byte range locks */</div><div class='ctx'> 				inode-&gt;i_fop = &amp;cifs_file_ops;</div><div class='ctx'> </div><div class='del'>-			inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> 			if(pTcon-&gt;ses-&gt;server-&gt;maxBuf &lt; </div><div class='del'>-			     4096 + MAX_CIFS_HDR_SIZE)</div><div class='del'>-				inode-&gt;i_data.a_ops-&gt;readpages = NULL;</div><div class='add'>+			     PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE)</div><div class='add'>+				inode-&gt;i_data.a_ops = &amp;cifs_addr_ops_smallbuf;</div><div class='add'>+			else</div><div class='add'>+				inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> 		} else if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='ctx'> 			cFYI(1, ("Directory inode"));</div><div class='ctx'> 			inode-&gt;i_op = &amp;cifs_dir_inode_ops;</div><div class='hunk'>@@ -731,7 +733,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)</div><div class='ctx'> 	rc = CIFSSMBMkDir(xid, pTcon, full_path, cifs_sb-&gt;local_nls,</div><div class='ctx'> 			  cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_MAP_SPECIAL_CHR);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		cFYI(1, ("cifs_mkdir returned 0x%x ", rc));</div><div class='add'>+		cFYI(1, ("cifs_mkdir returned 0x%x", rc));</div><div class='ctx'> 		d_drop(direntry);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		inode-&gt;i_nlink++;</div><div class='hunk'>@@ -798,7 +800,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)</div><div class='ctx'> 	char *full_path = NULL;</div><div class='ctx'> 	struct cifsInodeInfo *cifsInode;</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("cifs_rmdir, inode = 0x%p with ", inode));</div><div class='add'>+	cFYI(1, ("cifs_rmdir, inode = 0x%p", inode));</div><div class='ctx'> </div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='hunk'>@@ -1121,7 +1123,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)</div><div class='ctx'> </div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("In cifs_setattr, name = %s attrs-&gt;iavalid 0x%x ",</div><div class='add'>+	cFYI(1, ("setattr on file %s attrs-&gt;iavalid 0x%x",</div><div class='ctx'> 		 direntry-&gt;d_name.name, attrs-&gt;ia_valid));</div><div class='ctx'> </div><div class='ctx'> 	cifs_sb = CIFS_SB(direntry-&gt;d_inode-&gt;i_sb);</div><div class='hunk'>@@ -1157,6 +1159,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)</div><div class='ctx'> 		   when the local oplock break takes longer to flush</div><div class='ctx'> 		   writebehind data than the SMB timeout for the SetPathInfo</div><div class='ctx'> 		   request would allow */</div><div class='add'>+</div><div class='ctx'> 		open_file = find_writable_file(cifsInode);</div><div class='ctx'> 		if (open_file) {</div><div class='ctx'> 			__u16 nfid = open_file-&gt;netfid;</div><div class='hunk'>@@ -1289,7 +1292,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)</div><div class='ctx'> 		it may be useful to Windows - but we do</div><div class='ctx'> 		not want to set ctime unless some other</div><div class='ctx'> 		timestamp is changing */</div><div class='del'>-		cFYI(1, ("CIFS - CTIME changed "));</div><div class='add'>+		cFYI(1, ("CIFS - CTIME changed"));</div><div class='ctx'> 		time_buf.ChangeTime =</div><div class='ctx'> 		    cpu_to_le64(cifs_UnixTimeToNT(attrs-&gt;ia_ctime));</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1356,7 +1359,7 @@ cifs_setattr_exit:</div><div class='ctx'> </div><div class='ctx'> void cifs_delete_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	cFYI(1, ("In cifs_delete_inode, inode = 0x%p ", inode));</div><div class='add'>+	cFYI(1, ("In cifs_delete_inode, inode = 0x%p", inode));</div><div class='ctx'> 	/* may have to add back in if and when safe distributed caching of</div><div class='ctx'> 	   directories added e.g. via FindNotify */</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/cifs/link.c b/fs/cifs/link.c<br/>index 2ec99f833142..a57f5d6e6213 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/link.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/link.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/link.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/link.c</a></div><div class='hunk'>@@ -167,7 +167,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cFYI(1, ("Full path: %s ", full_path));</div><div class='add'>+	cFYI(1, ("Full path: %s", full_path));</div><div class='ctx'> 	cFYI(1, ("symname is %s", symname));</div><div class='ctx'> </div><div class='ctx'> 	/* BB what if DFS and this volume is on different share? BB */</div><div class='hunk'>@@ -186,8 +186,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)</div><div class='ctx'> 						 inode-&gt;i_sb,xid);</div><div class='ctx'> </div><div class='ctx'> 		if (rc != 0) {</div><div class='del'>-			cFYI(1,</div><div class='del'>-			     ("Create symlink worked but get_inode_info failed with rc = %d ",</div><div class='add'>+			cFYI(1, ("Create symlink ok, getinodeinfo fail rc = %d",</div><div class='ctx'> 			      rc));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (pTcon-&gt;nocase)</div><div class='hunk'>@@ -289,7 +288,7 @@ cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen)</div><div class='ctx'> 					else {</div><div class='ctx'> 						cFYI(1,("num referral: %d",num_referrals));</div><div class='ctx'> 						if(referrals) {</div><div class='del'>-							cFYI(1,("referral string: %s ",referrals));</div><div class='add'>+							cFYI(1,("referral string: %s",referrals));</div><div class='ctx'> 							strncpy(tmpbuffer, referrals, len-1);                            </div><div class='ctx'> 						}</div><div class='ctx'> 					}</div><div class='head'>diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c<br/>index fafd056426e4..22c937e5884f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/misc.c</a></div><div class='hunk'>@@ -101,6 +101,7 @@ sesInfoFree(struct cifsSesInfo *buf_to_free)</div><div class='ctx'> 	kfree(buf_to_free-&gt;serverDomain);</div><div class='ctx'> 	kfree(buf_to_free-&gt;serverNOS);</div><div class='ctx'> 	kfree(buf_to_free-&gt;password);</div><div class='add'>+	kfree(buf_to_free-&gt;domainName);</div><div class='ctx'> 	kfree(buf_to_free);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -499,11 +500,12 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)</div><div class='ctx'> 		if(pSMBr-&gt;ByteCount &gt; sizeof(struct file_notify_information)) {</div><div class='ctx'> 			data_offset = le32_to_cpu(pSMBr-&gt;DataOffset);</div><div class='ctx'> </div><div class='del'>-			pnotify = (struct file_notify_information *)((char *)&amp;pSMBr-&gt;hdr.Protocol</div><div class='del'>-				+ data_offset);</div><div class='del'>-			cFYI(1,("dnotify on %s with action: 0x%x",pnotify-&gt;FileName,</div><div class='add'>+			pnotify = (struct file_notify_information *)</div><div class='add'>+				((char *)&amp;pSMBr-&gt;hdr.Protocol + data_offset);</div><div class='add'>+			cFYI(1,("dnotify on %s Action: 0x%x",pnotify-&gt;FileName,</div><div class='ctx'> 				pnotify-&gt;Action));  /* BB removeme BB */</div><div class='del'>-	             /*   cifs_dump_mem("Received notify Data is: ",buf,sizeof(struct smb_hdr)+60); */</div><div class='add'>+	             /*   cifs_dump_mem("Rcvd notify Data: ",buf,</div><div class='add'>+				sizeof(struct smb_hdr)+60); */</div><div class='ctx'> 			return TRUE;</div><div class='ctx'> 		}</div><div class='ctx'> 		if(pSMBr-&gt;hdr.Status.CifsError) {</div><div class='head'>diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c<br/>index 5de74d216fdd..b66eff5dc624 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/netmisc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/netmisc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/netmisc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/netmisc.c</a></div><div class='hunk'>@@ -84,11 +84,11 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct smb_to_posix_error mapping_table_ERRSRV[] = {</div><div class='ctx'> 	{ERRerror, -EIO},</div><div class='del'>-	{ERRbadpw, -EPERM},</div><div class='add'>+	{ERRbadpw, -EACCES},  /* was EPERM */</div><div class='ctx'> 	{ERRbadtype, -EREMOTE},</div><div class='ctx'> 	{ERRaccess, -EACCES},</div><div class='ctx'> 	{ERRinvtid, -ENXIO},</div><div class='del'>-	{ERRinvnetname, -ENODEV},</div><div class='add'>+	{ERRinvnetname, -ENXIO},</div><div class='ctx'> 	{ERRinvdevice, -ENXIO},</div><div class='ctx'> 	{ERRqfull, -ENOSPC},</div><div class='ctx'> 	{ERRqtoobig, -ENOSPC},</div><div class='head'>diff --git a/fs/cifs/ntlmssp.c b/fs/cifs/ntlmssp.c<br/>deleted file mode 100644<br/>index 115359cc7a32..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/ntlmssp.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/ntlmssp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,143 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *   fs/cifs/ntlmssp.h</div><div class='del'>- *</div><div class='del'>- *   Copyright (c) International Business Machines  Corp., 2006</div><div class='del'>- *   Author(s): Steve French (sfrench@us.ibm.com)</div><div class='del'>- *</div><div class='del'>- *   This library is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU Lesser General Public License as published</div><div class='del'>- *   by the Free Software Foundation; either version 2.1 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This library is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See</div><div class='del'>- *   the GNU Lesser General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU Lesser General Public License</div><div class='del'>- *   along with this library; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "cifspdu.h"</div><div class='del'>-#include "cifsglob.h"</div><div class='del'>-#include "cifsproto.h"</div><div class='del'>-#include "cifs_unicode.h"</div><div class='del'>-#include "cifs_debug.h"</div><div class='del'>-#include "ntlmssp.h"</div><div class='del'>-#include "nterr.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CIFS_EXPERIMENTAL</div><div class='del'>-static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)</div><div class='del'>-{</div><div class='del'>-	__u32 capabilities = 0;</div><div class='del'>-</div><div class='del'>-	/* init fields common to all four types of SessSetup */</div><div class='del'>-	/* note that header is initialized to zero in header_assemble */</div><div class='del'>-	pSMB-&gt;req.AndXCommand = 0xFF;</div><div class='del'>-	pSMB-&gt;req.MaxBufferSize = cpu_to_le16(ses-&gt;server-&gt;maxBuf);</div><div class='del'>-	pSMB-&gt;req.MaxMpxCount = cpu_to_le16(ses-&gt;server-&gt;maxReq);</div><div class='del'>-</div><div class='del'>-	/* Now no need to set SMBFLG_CASELESS or obsolete CANONICAL PATH */</div><div class='del'>-</div><div class='del'>-	/* BB verify whether signing required on neg or just on auth frame </div><div class='del'>-	   (and NTLM case) */</div><div class='del'>-</div><div class='del'>-	capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |</div><div class='del'>-			CAP_LARGE_WRITE_X | CAP_LARGE_READ_X;</div><div class='del'>-</div><div class='del'>-	if(ses-&gt;server-&gt;secMode &amp; (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))</div><div class='del'>-		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_SECURITY_SIGNATURE;</div><div class='del'>-</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='del'>-		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_UNICODE;</div><div class='del'>-		capabilities |= CAP_UNICODE;</div><div class='del'>-	}</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_STATUS32) {</div><div class='del'>-		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_ERR_STATUS;</div><div class='del'>-		capabilities |= CAP_STATUS32;</div><div class='del'>-	}</div><div class='del'>-	if (ses-&gt;capabilities &amp; CAP_DFS) {</div><div class='del'>-		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_DFS;</div><div class='del'>-		capabilities |= CAP_DFS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* BB check whether to init vcnum BB */</div><div class='del'>-	return capabilities;</div><div class='del'>-}</div><div class='del'>-int </div><div class='del'>-CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, const int type,</div><div class='del'>-		  int * pNTLMv2_flg, const struct nls_table *nls_cp)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-	int wct;</div><div class='del'>-	struct smb_hdr *smb_buffer;</div><div class='del'>-	char *bcc_ptr;</div><div class='del'>-	SESSION_SETUP_ANDX *pSMB;</div><div class='del'>-	__u32 capabilities;</div><div class='del'>-</div><div class='del'>-	if(ses == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cFYI(1,("SStp type: %d",type));</div><div class='del'>-	if(type &lt; CIFS_NTLM) {</div><div class='del'>-#ifndef CONFIG_CIFS_WEAK_PW_HASH</div><div class='del'>-		/* LANMAN and plaintext are less secure and off by default.</div><div class='del'>-		So we make this explicitly be turned on in kconfig (in the</div><div class='del'>-		build) and turned on at runtime (changed from the default)</div><div class='del'>-		in proc/fs/cifs or via mount parm.  Unfortunately this is</div><div class='del'>-		needed for old Win (e.g. Win95), some obscure NAS and OS/2 */</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-#endif</div><div class='del'>-		wct = 10; /* lanman 2 style sessionsetup */</div><div class='del'>-	} else if(type &lt; CIFS_NTLMSSP_NEG)</div><div class='del'>-		wct = 13; /* old style NTLM sessionsetup */</div><div class='del'>-	else /* same size for negotiate or auth, NTLMSSP or extended security */</div><div class='del'>-		wct = 12;</div><div class='del'>-</div><div class='del'>-	rc = small_smb_init_no_tc(SMB_COM_SESSION_SETUP_ANDX, wct, ses,</div><div class='del'>-			    (void **)&amp;smb_buffer);</div><div class='del'>-	if(rc)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	pSMB = (SESSION_SETUP_ANDX *)smb_buffer;</div><div class='del'>-</div><div class='del'>-	capabilities = cifs_ssetup_hdr(ses, pSMB);</div><div class='del'>-	bcc_ptr = pByteArea(smb_buffer);</div><div class='del'>-	if(type &gt; CIFS_NTLM) {</div><div class='del'>-		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_EXT_SEC;</div><div class='del'>-		capabilities |= CAP_EXTENDED_SECURITY;</div><div class='del'>-		pSMB-&gt;req.Capabilities = cpu_to_le32(capabilities);</div><div class='del'>-		/* BB set password lengths */</div><div class='del'>-	} else if(type &lt; CIFS_NTLM) /* lanman */ {</div><div class='del'>-		/* no capabilities flags in old lanman negotiation */</div><div class='del'>-		/* pSMB-&gt;old_req.PasswordLength = */ /* BB fixme BB */</div><div class='del'>-	} else /* type CIFS_NTLM */ {</div><div class='del'>-		pSMB-&gt;req_no_secext.Capabilities = cpu_to_le32(capabilities);</div><div class='del'>-		pSMB-&gt;req_no_secext.CaseInsensitivePasswordLength =</div><div class='del'>-			cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='del'>-		pSMB-&gt;req_no_secext.CaseSensitivePasswordLength =</div><div class='del'>-			cpu_to_le16(CIFS_SESSION_KEY_SIZE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* copy session key */</div><div class='del'>-</div><div class='del'>-	/* if Unicode, align strings to two byte boundary */</div><div class='del'>-</div><div class='del'>-	/* copy user name */ /* BB Do we need to special case null user name? */</div><div class='del'>-</div><div class='del'>-	/* copy domain name */</div><div class='del'>-</div><div class='del'>-	/* copy Linux version */</div><div class='del'>-</div><div class='del'>-	/* copy network operating system name */</div><div class='del'>-</div><div class='del'>-	/* update bcc and smb buffer length */</div><div class='del'>-</div><div class='del'>-/*	rc = SendReceive2(xid, ses, iov, num_iovecs, &amp;resp_buf_type, 0); */</div><div class='del'>-	/* SMB request buf freed in SendReceive2 */</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_CIFS_EXPERIMENTAL */</div><div class='head'>diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c<br/>index b689c5035124..03bbcb377913 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/readdir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/readdir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/readdir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/readdir.c</a></div><div class='hunk'>@@ -21,6 +21,7 @@</div><div class='ctx'>  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include "cifspdu.h"</div><div class='hunk'>@@ -31,8 +32,8 @@</div><div class='ctx'> #include "cifs_fs_sb.h"</div><div class='ctx'> #include "cifsfs.h"</div><div class='ctx'> </div><div class='del'>-/* BB fixme - add debug wrappers around this function to disable it fixme BB */</div><div class='del'>-/* static void dump_cifs_file_struct(struct file *file, char *label)</div><div class='add'>+#ifdef CONFIG_CIFS_DEBUG2</div><div class='add'>+static void dump_cifs_file_struct(struct file *file, char *label)</div><div class='ctx'> {</div><div class='ctx'> 	struct cifsFileInfo * cf;</div><div class='ctx'> </div><div class='hunk'>@@ -53,7 +54,8 @@</div><div class='ctx'> 		}</div><div class='ctx'> 		</div><div class='ctx'> 	}</div><div class='del'>-} */</div><div class='add'>+}</div><div class='add'>+#endif /* DEBUG2 */</div><div class='ctx'> </div><div class='ctx'> /* Returns one if new inode created (which therefore needs to be hashed) */</div><div class='ctx'> /* Might check in the future if inode number changed so we can rehash inode */</div><div class='hunk'>@@ -107,32 +109,52 @@ static int construct_dentry(struct qstr *qstring, struct file *file,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fill_in_inode(struct inode *tmp_inode,</div><div class='del'>-	FILE_DIRECTORY_INFO *pfindData, int *pobject_type, int isNewInode)</div><div class='add'>+static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,</div><div class='add'>+		char * buf, int *pobject_type, int isNewInode)</div><div class='ctx'> {</div><div class='ctx'> 	loff_t local_size;</div><div class='ctx'> 	struct timespec local_mtime;</div><div class='ctx'> </div><div class='ctx'> 	struct cifsInodeInfo *cifsInfo = CIFS_I(tmp_inode);</div><div class='ctx'> 	struct cifs_sb_info *cifs_sb = CIFS_SB(tmp_inode-&gt;i_sb);</div><div class='del'>-	__u32 attr = le32_to_cpu(pfindData-&gt;ExtFileAttributes);</div><div class='del'>-	__u64 allocation_size = le64_to_cpu(pfindData-&gt;AllocationSize);</div><div class='del'>-	__u64 end_of_file = le64_to_cpu(pfindData-&gt;EndOfFile);</div><div class='del'>-</div><div class='del'>-	cifsInfo-&gt;cifsAttrs = attr;</div><div class='del'>-	cifsInfo-&gt;time = jiffies;</div><div class='add'>+	__u32 attr;</div><div class='add'>+	__u64 allocation_size;</div><div class='add'>+	__u64 end_of_file;</div><div class='ctx'> </div><div class='ctx'> 	/* save mtime and size */</div><div class='ctx'> 	local_mtime = tmp_inode-&gt;i_mtime;</div><div class='ctx'> 	local_size  = tmp_inode-&gt;i_size;</div><div class='ctx'> </div><div class='add'>+	if(new_buf_type) {</div><div class='add'>+		FILE_DIRECTORY_INFO *pfindData = (FILE_DIRECTORY_INFO *)buf;</div><div class='add'>+</div><div class='add'>+		attr = le32_to_cpu(pfindData-&gt;ExtFileAttributes);</div><div class='add'>+		allocation_size = le64_to_cpu(pfindData-&gt;AllocationSize);</div><div class='add'>+		end_of_file = le64_to_cpu(pfindData-&gt;EndOfFile);</div><div class='add'>+		tmp_inode-&gt;i_atime =</div><div class='add'>+		      cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;LastAccessTime));</div><div class='add'>+		tmp_inode-&gt;i_mtime =</div><div class='add'>+		      cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;LastWriteTime));</div><div class='add'>+		tmp_inode-&gt;i_ctime =</div><div class='add'>+		      cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;ChangeTime));</div><div class='add'>+	} else { /* legacy, OS2 and DOS style */</div><div class='add'>+		FIND_FILE_STANDARD_INFO * pfindData = </div><div class='add'>+			(FIND_FILE_STANDARD_INFO *)buf;</div><div class='add'>+</div><div class='add'>+		attr = le16_to_cpu(pfindData-&gt;Attributes);</div><div class='add'>+		allocation_size = le32_to_cpu(pfindData-&gt;AllocationSize);</div><div class='add'>+		end_of_file = le32_to_cpu(pfindData-&gt;DataSize);</div><div class='add'>+		tmp_inode-&gt;i_atime = CURRENT_TIME;</div><div class='add'>+		/* tmp_inode-&gt;i_mtime =  BB FIXME - add dos time handling</div><div class='add'>+		tmp_inode-&gt;i_ctime = 0;   BB FIXME */</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Linux can not store file creation time unfortunately so ignore it */</div><div class='del'>-	tmp_inode-&gt;i_atime =</div><div class='del'>-	    cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;LastAccessTime));</div><div class='del'>-	tmp_inode-&gt;i_mtime =</div><div class='del'>-	    cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;LastWriteTime));</div><div class='del'>-	tmp_inode-&gt;i_ctime =</div><div class='del'>-	    cifs_NTtimeToUnix(le64_to_cpu(pfindData-&gt;ChangeTime));</div><div class='add'>+</div><div class='add'>+	cifsInfo-&gt;cifsAttrs = attr;</div><div class='add'>+	cifsInfo-&gt;time = jiffies;</div><div class='add'>+</div><div class='ctx'> 	/* treat dos attribute of read-only as read-only mode bit e.g. 555? */</div><div class='ctx'> 	/* 2767 perms - indicate mandatory locking */</div><div class='ctx'> 		/* BB fill in uid and gid here? with help from winbind? </div><div class='hunk'>@@ -215,11 +237,13 @@ static void fill_in_inode(struct inode *tmp_inode,</div><div class='ctx'> 		else</div><div class='ctx'> 			tmp_inode-&gt;i_fop = &amp;cifs_file_ops;</div><div class='ctx'> </div><div class='del'>-		tmp_inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> 		if((cifs_sb-&gt;tcon) &amp;&amp; (cifs_sb-&gt;tcon-&gt;ses) &amp;&amp;</div><div class='ctx'> 		   (cifs_sb-&gt;tcon-&gt;ses-&gt;server-&gt;maxBuf &lt;</div><div class='del'>-			4096 + MAX_CIFS_HDR_SIZE))</div><div class='del'>-			tmp_inode-&gt;i_data.a_ops-&gt;readpages = NULL;</div><div class='add'>+			PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE))</div><div class='add'>+			tmp_inode-&gt;i_data.a_ops = &amp;cifs_addr_ops_smallbuf;</div><div class='add'>+		else</div><div class='add'>+			tmp_inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='add'>+</div><div class='ctx'> 		if(isNewInode)</div><div class='ctx'> 			return; /* No sense invalidating pages for new inode</div><div class='ctx'> 				   since have not started caching readahead file</div><div class='hunk'>@@ -338,11 +362,12 @@ static void unix_fill_in_inode(struct inode *tmp_inode,</div><div class='ctx'> 		else</div><div class='ctx'> 			tmp_inode-&gt;i_fop = &amp;cifs_file_ops;</div><div class='ctx'> </div><div class='del'>-		tmp_inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> 		if((cifs_sb-&gt;tcon) &amp;&amp; (cifs_sb-&gt;tcon-&gt;ses) &amp;&amp;</div><div class='ctx'> 		   (cifs_sb-&gt;tcon-&gt;ses-&gt;server-&gt;maxBuf &lt; </div><div class='del'>-			4096 + MAX_CIFS_HDR_SIZE))</div><div class='del'>-			tmp_inode-&gt;i_data.a_ops-&gt;readpages = NULL;</div><div class='add'>+			PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE))</div><div class='add'>+			tmp_inode-&gt;i_data.a_ops = &amp;cifs_addr_ops_smallbuf;</div><div class='add'>+		else</div><div class='add'>+			tmp_inode-&gt;i_data.a_ops = &amp;cifs_addr_ops;</div><div class='ctx'> </div><div class='ctx'> 		if(isNewInode)</div><div class='ctx'> 			return; /* No sense invalidating pages for new inode since we</div><div class='hunk'>@@ -415,7 +440,10 @@ static int initiate_cifs_search(const int xid, struct file *file)</div><div class='ctx'> ffirst_retry:</div><div class='ctx'> 	/* test for Unix extensions */</div><div class='ctx'> 	if (pTcon-&gt;ses-&gt;capabilities &amp; CAP_UNIX) {</div><div class='del'>-		cifsFile-&gt;srch_inf.info_level = SMB_FIND_FILE_UNIX; </div><div class='add'>+		cifsFile-&gt;srch_inf.info_level = SMB_FIND_FILE_UNIX;</div><div class='add'>+	} else if ((pTcon-&gt;ses-&gt;capabilities &amp; </div><div class='add'>+			(CAP_NT_SMBS | CAP_NT_FIND)) == 0) {</div><div class='add'>+		cifsFile-&gt;srch_inf.info_level = SMB_FIND_FILE_INFO_STANDARD;</div><div class='ctx'> 	} else if (cifs_sb-&gt;mnt_cifs_flags &amp; CIFS_MOUNT_SERVER_INUM) {</div><div class='ctx'> 		cifsFile-&gt;srch_inf.info_level = SMB_FIND_FILE_ID_FULL_DIR_INFO;</div><div class='ctx'> 	} else /* not srvinos - BB fixme add check for backlevel? */ {</div><div class='hunk'>@@ -451,12 +479,19 @@ static int cifs_unicode_bytelen(char *str)</div><div class='ctx'> 	return len &lt;&lt; 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char *nxt_dir_entry(char *old_entry, char *end_of_smb)</div><div class='add'>+static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level)</div><div class='ctx'> {</div><div class='ctx'> 	char * new_entry;</div><div class='ctx'> 	FILE_DIRECTORY_INFO * pDirInfo = (FILE_DIRECTORY_INFO *)old_entry;</div><div class='ctx'> </div><div class='del'>-	new_entry = old_entry + le32_to_cpu(pDirInfo-&gt;NextEntryOffset);</div><div class='add'>+	if(level == SMB_FIND_FILE_INFO_STANDARD) {</div><div class='add'>+		FIND_FILE_STANDARD_INFO * pfData;</div><div class='add'>+		pfData = (FIND_FILE_STANDARD_INFO *)pDirInfo;</div><div class='add'>+</div><div class='add'>+		new_entry = old_entry + sizeof(FIND_FILE_STANDARD_INFO) +</div><div class='add'>+				pfData-&gt;FileNameLength;</div><div class='add'>+	} else</div><div class='add'>+		new_entry = old_entry + le32_to_cpu(pDirInfo-&gt;NextEntryOffset);</div><div class='ctx'> 	cFYI(1,("new entry %p old entry %p",new_entry,old_entry));</div><div class='ctx'> 	/* validate that new_entry is not past end of SMB */</div><div class='ctx'> 	if(new_entry &gt;= end_of_smb) {</div><div class='hunk'>@@ -464,7 +499,10 @@ static char *nxt_dir_entry(char *old_entry, char *end_of_smb)</div><div class='ctx'> 		      ("search entry %p began after end of SMB %p old entry %p",</div><div class='ctx'> 			new_entry, end_of_smb, old_entry)); </div><div class='ctx'> 		return NULL;</div><div class='del'>-	} else if (new_entry + sizeof(FILE_DIRECTORY_INFO) &gt; end_of_smb) {</div><div class='add'>+	} else if(((level == SMB_FIND_FILE_INFO_STANDARD) &amp;&amp;</div><div class='add'>+		   (new_entry + sizeof(FIND_FILE_STANDARD_INFO) &gt; end_of_smb)) ||</div><div class='add'>+		  ((level != SMB_FIND_FILE_INFO_STANDARD) &amp;&amp;</div><div class='add'>+		   (new_entry + sizeof(FILE_DIRECTORY_INFO) &gt; end_of_smb)))  {</div><div class='ctx'> 		cERROR(1,("search entry %p extends after end of SMB %p",</div><div class='ctx'> 			new_entry, end_of_smb));</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -482,7 +520,7 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)</div><div class='ctx'> 	char * filename = NULL;</div><div class='ctx'> 	int len = 0; </div><div class='ctx'> </div><div class='del'>-	if(cfile-&gt;srch_inf.info_level == 0x202) {</div><div class='add'>+	if(cfile-&gt;srch_inf.info_level == SMB_FIND_FILE_UNIX) {</div><div class='ctx'> 		FILE_UNIX_INFO * pFindData = (FILE_UNIX_INFO *)current_entry;</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		if(cfile-&gt;srch_inf.unicode) {</div><div class='hunk'>@@ -491,26 +529,34 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)</div><div class='ctx'> 			/* BB should we make this strnlen of PATH_MAX? */</div><div class='ctx'> 			len = strnlen(filename, 5);</div><div class='ctx'> 		}</div><div class='del'>-	} else if(cfile-&gt;srch_inf.info_level == 0x101) {</div><div class='add'>+	} else if(cfile-&gt;srch_inf.info_level == SMB_FIND_FILE_DIRECTORY_INFO) {</div><div class='ctx'> 		FILE_DIRECTORY_INFO * pFindData = </div><div class='ctx'> 			(FILE_DIRECTORY_INFO *)current_entry;</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-	} else if(cfile-&gt;srch_inf.info_level == 0x102) {</div><div class='add'>+	} else if(cfile-&gt;srch_inf.info_level == </div><div class='add'>+			SMB_FIND_FILE_FULL_DIRECTORY_INFO) {</div><div class='ctx'> 		FILE_FULL_DIRECTORY_INFO * pFindData = </div><div class='ctx'> 			(FILE_FULL_DIRECTORY_INFO *)current_entry;</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-	} else if(cfile-&gt;srch_inf.info_level == 0x105) {</div><div class='add'>+	} else if(cfile-&gt;srch_inf.info_level ==</div><div class='add'>+			SMB_FIND_FILE_ID_FULL_DIR_INFO) {</div><div class='ctx'> 		SEARCH_ID_FULL_DIR_INFO * pFindData = </div><div class='ctx'> 			(SEARCH_ID_FULL_DIR_INFO *)current_entry;</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='del'>-	} else if(cfile-&gt;srch_inf.info_level == 0x104) {</div><div class='add'>+	} else if(cfile-&gt;srch_inf.info_level == </div><div class='add'>+			SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {</div><div class='ctx'> 		FILE_BOTH_DIRECTORY_INFO * pFindData = </div><div class='ctx'> 			(FILE_BOTH_DIRECTORY_INFO *)current_entry;</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='add'>+	} else if(cfile-&gt;srch_inf.info_level == SMB_FIND_FILE_INFO_STANDARD) {</div><div class='add'>+		FIND_FILE_STANDARD_INFO * pFindData =</div><div class='add'>+			(FIND_FILE_STANDARD_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cFYI(1,("Unknown findfirst level %d",cfile-&gt;srch_inf.info_level));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -597,7 +643,9 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,</div><div class='ctx'> 	. and .. for the root of a drive and for those we need</div><div class='ctx'> 	to start two entries earlier */</div><div class='ctx'> </div><div class='del'>-/*	dump_cifs_file_struct(file, "In fce ");*/</div><div class='add'>+#ifdef CONFIG_CIFS_DEBUG2</div><div class='add'>+	dump_cifs_file_struct(file, "In fce ");</div><div class='add'>+#endif</div><div class='ctx'> 	if(((index_to_find &lt; cifsFile-&gt;srch_inf.index_of_last_entry) &amp;&amp; </div><div class='ctx'> 	     is_dir_changed(file)) || </div><div class='ctx'> 	   (index_to_find &lt; first_entry_in_buffer)) {</div><div class='hunk'>@@ -644,10 +692,12 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,</div><div class='ctx'> 		first_entry_in_buffer = cifsFile-&gt;srch_inf.index_of_last_entry</div><div class='ctx'> 					- cifsFile-&gt;srch_inf.entries_in_buffer;</div><div class='ctx'> 		pos_in_buf = index_to_find - first_entry_in_buffer;</div><div class='del'>-		cFYI(1,("found entry - pos_in_buf %d",pos_in_buf)); </div><div class='add'>+		cFYI(1,("found entry - pos_in_buf %d",pos_in_buf));</div><div class='add'>+</div><div class='ctx'> 		for(i=0;(i&lt;(pos_in_buf)) &amp;&amp; (current_entry != NULL);i++) {</div><div class='ctx'> 			/* go entry by entry figuring out which is first */</div><div class='del'>-			current_entry = nxt_dir_entry(current_entry,end_of_smb);</div><div class='add'>+			current_entry = nxt_dir_entry(current_entry,end_of_smb,</div><div class='add'>+						cifsFile-&gt;srch_inf.info_level);</div><div class='ctx'> 		}</div><div class='ctx'> 		if((current_entry == NULL) &amp;&amp; (i &lt; pos_in_buf)) {</div><div class='ctx'> 			/* BB fixme - check if we should flag this error */</div><div class='hunk'>@@ -674,7 +724,7 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,</div><div class='ctx'> /* inode num, inode type and filename returned */</div><div class='ctx'> static int cifs_get_name_from_search_buf(struct qstr *pqst,</div><div class='ctx'> 	char *current_entry, __u16 level, unsigned int unicode,</div><div class='del'>-	struct cifs_sb_info * cifs_sb, ino_t *pinum)</div><div class='add'>+	struct cifs_sb_info * cifs_sb, int max_len, ino_t *pinum)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	unsigned int len = 0;</div><div class='hunk'>@@ -718,10 +768,22 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst,</div><div class='ctx'> 			(FILE_BOTH_DIRECTORY_INFO *)current_entry;</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='add'>+	} else if(level == SMB_FIND_FILE_INFO_STANDARD) {</div><div class='add'>+		FIND_FILE_STANDARD_INFO * pFindData =</div><div class='add'>+			(FIND_FILE_STANDARD_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		/* one byte length, no name conversion */</div><div class='add'>+		len = (unsigned int)pFindData-&gt;FileNameLength;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cFYI(1,("Unknown findfirst level %d",level));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if(len &gt; max_len) {</div><div class='add'>+		cERROR(1,("bad search response length %d past smb end", len));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if(unicode) {</div><div class='ctx'> 		/* BB fixme - test with long names */</div><div class='ctx'> 		/* Note converted filename can be longer than in unicode */</div><div class='hunk'>@@ -741,7 +803,7 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cifs_filldir(char *pfindEntry, struct file *file,</div><div class='del'>-	filldir_t filldir, void *direntry, char *scratch_buf)</div><div class='add'>+	filldir_t filldir, void *direntry, char *scratch_buf, int max_len)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	struct qstr qstring;</div><div class='hunk'>@@ -777,6 +839,7 @@ static int cifs_filldir(char *pfindEntry, struct file *file,</div><div class='ctx'> 	rc = cifs_get_name_from_search_buf(&amp;qstring,pfindEntry,</div><div class='ctx'> 			pCifsF-&gt;srch_inf.info_level,</div><div class='ctx'> 			pCifsF-&gt;srch_inf.unicode,cifs_sb,</div><div class='add'>+			max_len,</div><div class='ctx'> 			&amp;inum /* returned */);</div><div class='ctx'> </div><div class='ctx'> 	if(rc)</div><div class='hunk'>@@ -798,13 +861,16 @@ static int cifs_filldir(char *pfindEntry, struct file *file,</div><div class='ctx'> 	/* we pass in rc below, indicating whether it is a new inode,</div><div class='ctx'> 	   so we can figure out whether to invalidate the inode cached</div><div class='ctx'> 	   data if the file has changed */</div><div class='del'>-	if(pCifsF-&gt;srch_inf.info_level == SMB_FIND_FILE_UNIX) {</div><div class='add'>+	if(pCifsF-&gt;srch_inf.info_level == SMB_FIND_FILE_UNIX)</div><div class='ctx'> 		unix_fill_in_inode(tmp_inode,</div><div class='del'>-				   (FILE_UNIX_INFO *)pfindEntry,&amp;obj_type, rc);</div><div class='del'>-	} else {</div><div class='del'>-		fill_in_inode(tmp_inode,</div><div class='del'>-			      (FILE_DIRECTORY_INFO *)pfindEntry,&amp;obj_type, rc);</div><div class='del'>-	}</div><div class='add'>+				   (FILE_UNIX_INFO *)pfindEntry,</div><div class='add'>+				   &amp;obj_type, rc);</div><div class='add'>+	else if(pCifsF-&gt;srch_inf.info_level == SMB_FIND_FILE_INFO_STANDARD)</div><div class='add'>+		fill_in_inode(tmp_inode, 0 /* old level 1 buffer type */,</div><div class='add'>+				pfindEntry, &amp;obj_type, rc);</div><div class='add'>+	else</div><div class='add'>+		fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &amp;obj_type, rc);</div><div class='add'>+	</div><div class='ctx'> 	</div><div class='ctx'> 	rc = filldir(direntry,qstring.name,qstring.len,file-&gt;f_pos,</div><div class='ctx'> 		     tmp_inode-&gt;i_ino,obj_type);</div><div class='hunk'>@@ -864,6 +930,12 @@ static int cifs_save_resume_key(const char *current_entry,</div><div class='ctx'> 		filename = &amp;pFindData-&gt;FileName[0];</div><div class='ctx'> 		len = le32_to_cpu(pFindData-&gt;FileNameLength);</div><div class='ctx'> 		cifsFile-&gt;srch_inf.resume_key = pFindData-&gt;FileIndex;</div><div class='add'>+	} else if(level == SMB_FIND_FILE_INFO_STANDARD) {</div><div class='add'>+		FIND_FILE_STANDARD_INFO * pFindData =</div><div class='add'>+			(FIND_FILE_STANDARD_INFO *)current_entry;</div><div class='add'>+		filename = &amp;pFindData-&gt;FileName[0];</div><div class='add'>+		/* one byte length, no name conversion */</div><div class='add'>+		len = (unsigned int)pFindData-&gt;FileNameLength;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cFYI(1,("Unknown findfirst level %d",level));</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -884,6 +956,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)</div><div class='ctx'> 	int num_to_fill = 0;</div><div class='ctx'> 	char * tmp_buf = NULL;</div><div class='ctx'> 	char * end_of_smb;</div><div class='add'>+	int max_len;</div><div class='ctx'> </div><div class='ctx'> 	xid = GetXid();</div><div class='ctx'> </div><div class='hunk'>@@ -909,7 +982,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		if (filldir(direntry, "..", 2, file-&gt;f_pos,</div><div class='ctx'> 		     file-&gt;f_dentry-&gt;d_parent-&gt;d_inode-&gt;i_ino, DT_DIR) &lt; 0) {</div><div class='del'>-			cERROR(1, ("Filldir for parent dir failed "));</div><div class='add'>+			cERROR(1, ("Filldir for parent dir failed"));</div><div class='ctx'> 			rc = -ENOMEM;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -959,10 +1032,11 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)</div><div class='ctx'> 			goto rddir2_exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		cFYI(1,("loop through %d times filling dir for net buf %p",</div><div class='del'>-			num_to_fill,cifsFile-&gt;srch_inf.ntwrk_buf_start)); </div><div class='del'>-		end_of_smb = cifsFile-&gt;srch_inf.ntwrk_buf_start +</div><div class='del'>-			smbCalcSize((struct smb_hdr *)</div><div class='del'>-				    cifsFile-&gt;srch_inf.ntwrk_buf_start);</div><div class='add'>+			num_to_fill,cifsFile-&gt;srch_inf.ntwrk_buf_start));</div><div class='add'>+		max_len = smbCalcSize((struct smb_hdr *)</div><div class='add'>+				cifsFile-&gt;srch_inf.ntwrk_buf_start);</div><div class='add'>+		end_of_smb = cifsFile-&gt;srch_inf.ntwrk_buf_start + max_len;</div><div class='add'>+</div><div class='ctx'> 		/* To be safe - for UCS to UTF-8 with strings loaded</div><div class='ctx'> 		with the rare long characters alloc more to account for</div><div class='ctx'> 		such multibyte target UTF-8 characters. cifs_unicode.c,</div><div class='hunk'>@@ -977,17 +1051,19 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)</div><div class='ctx'> 			}</div><div class='ctx'> 			/* if buggy server returns . and .. late do</div><div class='ctx'> 			we want to check for that here? */</div><div class='del'>-			rc = cifs_filldir(current_entry, file, </div><div class='del'>-					filldir, direntry,tmp_buf);</div><div class='add'>+			rc = cifs_filldir(current_entry, file,</div><div class='add'>+					filldir, direntry, tmp_buf, max_len);</div><div class='ctx'> 			file-&gt;f_pos++;</div><div class='del'>-			if(file-&gt;f_pos == cifsFile-&gt;srch_inf.index_of_last_entry) {</div><div class='add'>+			if(file-&gt;f_pos == </div><div class='add'>+				cifsFile-&gt;srch_inf.index_of_last_entry) {</div><div class='ctx'> 				cFYI(1,("last entry in buf at pos %lld %s",</div><div class='del'>-					file-&gt;f_pos,tmp_buf)); /* BB removeme BB */</div><div class='add'>+					file-&gt;f_pos,tmp_buf));</div><div class='ctx'> 				cifs_save_resume_key(current_entry,cifsFile);</div><div class='ctx'> 				break;</div><div class='ctx'> 			} else </div><div class='del'>-				current_entry = nxt_dir_entry(current_entry,</div><div class='del'>-							      end_of_smb);</div><div class='add'>+				current_entry = </div><div class='add'>+					nxt_dir_entry(current_entry, end_of_smb,</div><div class='add'>+						cifsFile-&gt;srch_inf.info_level);</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree(tmp_buf);</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c<br/>new file mode 100644<br/>index 000000000000..7202d534ef0b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/sess.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/sess.c</a></div><div class='hunk'>@@ -0,0 +1,538 @@</div><div class='add'>+/*</div><div class='add'>+ *   fs/cifs/sess.c</div><div class='add'>+ *</div><div class='add'>+ *   SMB/CIFS session setup handling routines</div><div class='add'>+ *</div><div class='add'>+ *   Copyright (c) International Business Machines  Corp., 2006</div><div class='add'>+ *   Author(s): Steve French (sfrench@us.ibm.com)</div><div class='add'>+ *</div><div class='add'>+ *   This library is free software; you can redistribute it and/or modify</div><div class='add'>+ *   it under the terms of the GNU Lesser General Public License as published</div><div class='add'>+ *   by the Free Software Foundation; either version 2.1 of the License, or</div><div class='add'>+ *   (at your option) any later version.</div><div class='add'>+ *</div><div class='add'>+ *   This library is distributed in the hope that it will be useful,</div><div class='add'>+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See</div><div class='add'>+ *   the GNU Lesser General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ *   You should have received a copy of the GNU Lesser General Public License</div><div class='add'>+ *   along with this library; if not, write to the Free Software</div><div class='add'>+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cifspdu.h"</div><div class='add'>+#include "cifsglob.h"</div><div class='add'>+#include "cifsproto.h"</div><div class='add'>+#include "cifs_unicode.h"</div><div class='add'>+#include "cifs_debug.h"</div><div class='add'>+#include "ntlmssp.h"</div><div class='add'>+#include "nterr.h"</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+</div><div class='add'>+extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,</div><div class='add'>+                         unsigned char *p24);</div><div class='add'>+</div><div class='add'>+static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)</div><div class='add'>+{</div><div class='add'>+	__u32 capabilities = 0;</div><div class='add'>+</div><div class='add'>+	/* init fields common to all four types of SessSetup */</div><div class='add'>+	/* note that header is initialized to zero in header_assemble */</div><div class='add'>+	pSMB-&gt;req.AndXCommand = 0xFF;</div><div class='add'>+	pSMB-&gt;req.MaxBufferSize = cpu_to_le16(ses-&gt;server-&gt;maxBuf);</div><div class='add'>+	pSMB-&gt;req.MaxMpxCount = cpu_to_le16(ses-&gt;server-&gt;maxReq);</div><div class='add'>+</div><div class='add'>+	/* Now no need to set SMBFLG_CASELESS or obsolete CANONICAL PATH */</div><div class='add'>+</div><div class='add'>+	/* BB verify whether signing required on neg or just on auth frame </div><div class='add'>+	   (and NTLM case) */</div><div class='add'>+</div><div class='add'>+	capabilities = CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS |</div><div class='add'>+			CAP_LARGE_WRITE_X | CAP_LARGE_READ_X;</div><div class='add'>+</div><div class='add'>+	if(ses-&gt;server-&gt;secMode &amp; (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))</div><div class='add'>+		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_SECURITY_SIGNATURE;</div><div class='add'>+</div><div class='add'>+	if (ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='add'>+		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_UNICODE;</div><div class='add'>+		capabilities |= CAP_UNICODE;</div><div class='add'>+	}</div><div class='add'>+	if (ses-&gt;capabilities &amp; CAP_STATUS32) {</div><div class='add'>+		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_ERR_STATUS;</div><div class='add'>+		capabilities |= CAP_STATUS32;</div><div class='add'>+	}</div><div class='add'>+	if (ses-&gt;capabilities &amp; CAP_DFS) {</div><div class='add'>+		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_DFS;</div><div class='add'>+		capabilities |= CAP_DFS;</div><div class='add'>+	}</div><div class='add'>+	if (ses-&gt;capabilities &amp; CAP_UNIX) {</div><div class='add'>+		capabilities |= CAP_UNIX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BB check whether to init vcnum BB */</div><div class='add'>+	return capabilities;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,</div><div class='add'>+			    const struct nls_table * nls_cp)</div><div class='add'>+{</div><div class='add'>+	char * bcc_ptr = *pbcc_area;</div><div class='add'>+	int bytes_ret = 0;</div><div class='add'>+</div><div class='add'>+	/* BB FIXME add check that strings total less</div><div class='add'>+	than 335 or will need to send them as arrays */</div><div class='add'>+</div><div class='add'>+	/* unicode strings, must be word aligned before the call */</div><div class='add'>+/*	if ((long) bcc_ptr % 2)	{</div><div class='add'>+		*bcc_ptr = 0;</div><div class='add'>+		bcc_ptr++;</div><div class='add'>+	} */</div><div class='add'>+	/* copy user */</div><div class='add'>+	if(ses-&gt;userName == NULL) {</div><div class='add'>+		/* BB what about null user mounts - check that we do this BB */</div><div class='add'>+	} else { /* 300 should be long enough for any conceivable user name */</div><div class='add'>+		bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, ses-&gt;userName,</div><div class='add'>+					  300, nls_cp);</div><div class='add'>+	}</div><div class='add'>+	bcc_ptr += 2 * bytes_ret;</div><div class='add'>+	bcc_ptr += 2; /* account for null termination */</div><div class='add'>+	/* copy domain */</div><div class='add'>+	if(ses-&gt;domainName == NULL)</div><div class='add'>+		bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr,</div><div class='add'>+					  "CIFS_LINUX_DOM", 32, nls_cp);</div><div class='add'>+	else</div><div class='add'>+		bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, ses-&gt;domainName, </div><div class='add'>+					  256, nls_cp);</div><div class='add'>+	bcc_ptr += 2 * bytes_ret;</div><div class='add'>+	bcc_ptr += 2;  /* account for null terminator */</div><div class='add'>+</div><div class='add'>+	/* Copy OS version */</div><div class='add'>+	bytes_ret = cifs_strtoUCS((__le16 *)bcc_ptr, "Linux version ", 32,</div><div class='add'>+				  nls_cp);</div><div class='add'>+	bcc_ptr += 2 * bytes_ret;</div><div class='add'>+	bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release,</div><div class='add'>+				  32, nls_cp);</div><div class='add'>+	bcc_ptr += 2 * bytes_ret;</div><div class='add'>+	bcc_ptr += 2; /* trailing null */</div><div class='add'>+</div><div class='add'>+	bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS,</div><div class='add'>+                                  32, nls_cp);</div><div class='add'>+	bcc_ptr += 2 * bytes_ret;</div><div class='add'>+	bcc_ptr += 2; /* trailing null */</div><div class='add'>+</div><div class='add'>+	*pbcc_area = bcc_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,</div><div class='add'>+			  const struct nls_table * nls_cp)</div><div class='add'>+{</div><div class='add'>+	char * bcc_ptr = *pbcc_area;</div><div class='add'>+</div><div class='add'>+	/* copy user */</div><div class='add'>+	/* BB what about null user mounts - check that we do this BB */</div><div class='add'>+        /* copy user */</div><div class='add'>+        if(ses-&gt;userName == NULL) {</div><div class='add'>+                /* BB what about null user mounts - check that we do this BB */</div><div class='add'>+        } else { /* 300 should be long enough for any conceivable user name */</div><div class='add'>+                strncpy(bcc_ptr, ses-&gt;userName, 300);</div><div class='add'>+        }</div><div class='add'>+	/* BB improve check for overflow */</div><div class='add'>+        bcc_ptr += strnlen(ses-&gt;userName, 300);</div><div class='add'>+	*bcc_ptr = 0;</div><div class='add'>+        bcc_ptr++; /* account for null termination */</div><div class='add'>+</div><div class='add'>+        /* copy domain */</div><div class='add'>+	</div><div class='add'>+        if(ses-&gt;domainName == NULL) {</div><div class='add'>+                strcpy(bcc_ptr, "CIFS_LINUX_DOM");</div><div class='add'>+		bcc_ptr += 14;  /* strlen(CIFS_LINUX_DOM) */</div><div class='add'>+ 	} else {</div><div class='add'>+                strncpy(bcc_ptr, ses-&gt;domainName, 256); </div><div class='add'>+		bcc_ptr += strnlen(ses-&gt;domainName, 256);</div><div class='add'>+	}</div><div class='add'>+	*bcc_ptr = 0;</div><div class='add'>+	bcc_ptr++;</div><div class='add'>+</div><div class='add'>+	/* BB check for overflow here */</div><div class='add'>+</div><div class='add'>+	strcpy(bcc_ptr, "Linux version ");</div><div class='add'>+	bcc_ptr += strlen("Linux version ");</div><div class='add'>+	strcpy(bcc_ptr, system_utsname.release);</div><div class='add'>+	bcc_ptr += strlen(system_utsname.release) + 1;</div><div class='add'>+</div><div class='add'>+	strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);</div><div class='add'>+	bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;</div><div class='add'>+</div><div class='add'>+        *pbcc_area = bcc_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo *ses,</div><div class='add'>+                            const struct nls_table * nls_cp)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	int words_left, len;</div><div class='add'>+	char * data = *pbcc_area;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	cFYI(1,("bleft %d",bleft));</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* word align, if bytes remaining is not even */</div><div class='add'>+	if(bleft % 2) {</div><div class='add'>+		bleft--;</div><div class='add'>+		data++;</div><div class='add'>+	}</div><div class='add'>+	words_left = bleft / 2;</div><div class='add'>+</div><div class='add'>+	/* save off server operating system */</div><div class='add'>+	len = UniStrnlen((wchar_t *) data, words_left);</div><div class='add'>+</div><div class='add'>+/* We look for obvious messed up bcc or strings in response so we do not go off</div><div class='add'>+   the end since (at least) WIN2K and Windows XP have a major bug in not null</div><div class='add'>+   terminating last Unicode string in response  */</div><div class='add'>+	if(len &gt;= words_left)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if(ses-&gt;serverOS)</div><div class='add'>+		kfree(ses-&gt;serverOS);</div><div class='add'>+	/* UTF-8 string will not grow more than four times as big as UCS-16 */</div><div class='add'>+	ses-&gt;serverOS = kzalloc(4 * len, GFP_KERNEL);</div><div class='add'>+	if(ses-&gt;serverOS != NULL) {</div><div class='add'>+		cifs_strfromUCS_le(ses-&gt;serverOS, (__le16 *)data, len,</div><div class='add'>+				   nls_cp);</div><div class='add'>+	}</div><div class='add'>+	data += 2 * (len + 1);</div><div class='add'>+	words_left -= len + 1;</div><div class='add'>+</div><div class='add'>+	/* save off server network operating system */</div><div class='add'>+	len = UniStrnlen((wchar_t *) data, words_left);</div><div class='add'>+</div><div class='add'>+	if(len &gt;= words_left)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if(ses-&gt;serverNOS)</div><div class='add'>+		kfree(ses-&gt;serverNOS);</div><div class='add'>+	ses-&gt;serverNOS = kzalloc(4 * len, GFP_KERNEL); /* BB this is wrong length FIXME BB */</div><div class='add'>+	if(ses-&gt;serverNOS != NULL) {</div><div class='add'>+		cifs_strfromUCS_le(ses-&gt;serverNOS, (__le16 *)data, len,</div><div class='add'>+				   nls_cp);</div><div class='add'>+		if(strncmp(ses-&gt;serverNOS, "NT LAN Manager 4",16) == 0) {</div><div class='add'>+			cFYI(1,("NT4 server"));</div><div class='add'>+			ses-&gt;flags |= CIFS_SES_NT4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	data += 2 * (len + 1);</div><div class='add'>+	words_left -= len + 1;</div><div class='add'>+</div><div class='add'>+        /* save off server domain */</div><div class='add'>+        len = UniStrnlen((wchar_t *) data, words_left);</div><div class='add'>+</div><div class='add'>+        if(len &gt; words_left)</div><div class='add'>+                return rc;</div><div class='add'>+</div><div class='add'>+        if(ses-&gt;serverDomain)</div><div class='add'>+                kfree(ses-&gt;serverDomain);</div><div class='add'>+        ses-&gt;serverDomain = kzalloc(2 * (len + 1), GFP_KERNEL); /* BB FIXME wrong length */</div><div class='add'>+        if(ses-&gt;serverDomain != NULL) {</div><div class='add'>+                cifs_strfromUCS_le(ses-&gt;serverDomain, (__le16 *)data, len,</div><div class='add'>+                                   nls_cp);</div><div class='add'>+                ses-&gt;serverDomain[2*len] = 0;</div><div class='add'>+                ses-&gt;serverDomain[(2*len) + 1] = 0;</div><div class='add'>+        }</div><div class='add'>+        data += 2 * (len + 1);</div><div class='add'>+        words_left -= len + 1;</div><div class='add'>+	</div><div class='add'>+	cFYI(1,("words left: %d",words_left));</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_ascii_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo *ses,</div><div class='add'>+                            const struct nls_table * nls_cp)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	int len;</div><div class='add'>+	char * bcc_ptr = *pbcc_area;</div><div class='add'>+</div><div class='add'>+	cFYI(1,("decode sessetup ascii. bleft %d", bleft));</div><div class='add'>+	</div><div class='add'>+	len = strnlen(bcc_ptr, bleft);</div><div class='add'>+	if(len &gt;= bleft)</div><div class='add'>+		return rc;</div><div class='add'>+	</div><div class='add'>+	if(ses-&gt;serverOS)</div><div class='add'>+		kfree(ses-&gt;serverOS);</div><div class='add'>+</div><div class='add'>+	ses-&gt;serverOS = kzalloc(len + 1, GFP_KERNEL);</div><div class='add'>+	if(ses-&gt;serverOS)</div><div class='add'>+		strncpy(ses-&gt;serverOS, bcc_ptr, len);</div><div class='add'>+</div><div class='add'>+	bcc_ptr += len + 1;</div><div class='add'>+	bleft -= len + 1;</div><div class='add'>+</div><div class='add'>+	len = strnlen(bcc_ptr, bleft);</div><div class='add'>+	if(len &gt;= bleft)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if(ses-&gt;serverNOS)</div><div class='add'>+		kfree(ses-&gt;serverNOS);</div><div class='add'>+</div><div class='add'>+	ses-&gt;serverNOS = kzalloc(len + 1, GFP_KERNEL);</div><div class='add'>+	if(ses-&gt;serverNOS)</div><div class='add'>+		strncpy(ses-&gt;serverNOS, bcc_ptr, len);</div><div class='add'>+</div><div class='add'>+	bcc_ptr += len + 1;</div><div class='add'>+	bleft -= len + 1;</div><div class='add'>+</div><div class='add'>+        len = strnlen(bcc_ptr, bleft);</div><div class='add'>+        if(len &gt; bleft)</div><div class='add'>+                return rc;</div><div class='add'>+</div><div class='add'>+        if(ses-&gt;serverDomain)</div><div class='add'>+                kfree(ses-&gt;serverDomain);</div><div class='add'>+</div><div class='add'>+        ses-&gt;serverDomain = kzalloc(len + 1, GFP_KERNEL);</div><div class='add'>+        if(ses-&gt;serverOS)</div><div class='add'>+                strncpy(ses-&gt;serverOS, bcc_ptr, len);</div><div class='add'>+</div><div class='add'>+        bcc_ptr += len + 1;</div><div class='add'>+	bleft -= len + 1;</div><div class='add'>+</div><div class='add'>+	cFYI(1,("ascii: bytes left %d",bleft));</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int </div><div class='add'>+CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,</div><div class='add'>+		const struct nls_table *nls_cp)</div><div class='add'>+{</div><div class='add'>+	int rc = 0;</div><div class='add'>+	int wct;</div><div class='add'>+	struct smb_hdr *smb_buf;</div><div class='add'>+	char *bcc_ptr;</div><div class='add'>+	char *str_area;</div><div class='add'>+	SESSION_SETUP_ANDX *pSMB;</div><div class='add'>+	__u32 capabilities;</div><div class='add'>+	int count;</div><div class='add'>+	int resp_buf_type = 0;</div><div class='add'>+	struct kvec iov[2];</div><div class='add'>+	enum securityEnum type;</div><div class='add'>+	__u16 action;</div><div class='add'>+	int bytes_remaining;</div><div class='add'>+</div><div class='add'>+	if(ses == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	type = ses-&gt;server-&gt;secType;</div><div class='add'>+</div><div class='add'>+	cFYI(1,("sess setup type %d",type));</div><div class='add'>+	if(type == LANMAN) {</div><div class='add'>+#ifndef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+		/* LANMAN and plaintext are less secure and off by default.</div><div class='add'>+		So we make this explicitly be turned on in kconfig (in the</div><div class='add'>+		build) and turned on at runtime (changed from the default)</div><div class='add'>+		in proc/fs/cifs or via mount parm.  Unfortunately this is</div><div class='add'>+		needed for old Win (e.g. Win95), some obscure NAS and OS/2 */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+#endif</div><div class='add'>+		wct = 10; /* lanman 2 style sessionsetup */</div><div class='add'>+	} else if((type == NTLM) || (type == NTLMv2)) { </div><div class='add'>+		/* For NTLMv2 failures eventually may need to retry NTLM */</div><div class='add'>+		wct = 13; /* old style NTLM sessionsetup */</div><div class='add'>+	} else /* same size for negotiate or auth, NTLMSSP or extended security */</div><div class='add'>+		wct = 12;</div><div class='add'>+</div><div class='add'>+	rc = small_smb_init_no_tc(SMB_COM_SESSION_SETUP_ANDX, wct, ses,</div><div class='add'>+			    (void **)&amp;smb_buf);</div><div class='add'>+	if(rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	pSMB = (SESSION_SETUP_ANDX *)smb_buf;</div><div class='add'>+</div><div class='add'>+	capabilities = cifs_ssetup_hdr(ses, pSMB);</div><div class='add'>+</div><div class='add'>+	/* we will send the SMB in two pieces,</div><div class='add'>+	a fixed length beginning part, and a</div><div class='add'>+	second part which will include the strings</div><div class='add'>+	and rest of bcc area, in order to avoid having</div><div class='add'>+	to do a large buffer 17K allocation */</div><div class='add'>+        iov[0].iov_base = (char *)pSMB;</div><div class='add'>+        iov[0].iov_len = smb_buf-&gt;smb_buf_length + 4;</div><div class='add'>+</div><div class='add'>+	/* 2000 big enough to fit max user, domain, NOS name etc. */</div><div class='add'>+	str_area = kmalloc(2000, GFP_KERNEL);</div><div class='add'>+	bcc_ptr = str_area;</div><div class='add'>+</div><div class='add'>+	if(type == LANMAN) {</div><div class='add'>+#ifdef CONFIG_CIFS_WEAK_PW_HASH</div><div class='add'>+		char lnm_session_key[CIFS_SESS_KEY_SIZE];</div><div class='add'>+</div><div class='add'>+		/* no capabilities flags in old lanman negotiation */</div><div class='add'>+</div><div class='add'>+		pSMB-&gt;old_req.PasswordLength = CIFS_SESS_KEY_SIZE; </div><div class='add'>+		/* BB calculate hash with password */</div><div class='add'>+		/* and copy into bcc */</div><div class='add'>+</div><div class='add'>+		calc_lanman_hash(ses, lnm_session_key);</div><div class='add'>+</div><div class='add'>+/* #ifdef CONFIG_CIFS_DEBUG2</div><div class='add'>+		cifs_dump_mem("cryptkey: ",ses-&gt;server-&gt;cryptKey,</div><div class='add'>+			CIFS_SESS_KEY_SIZE);</div><div class='add'>+#endif */</div><div class='add'>+		memcpy(bcc_ptr, (char *)lnm_session_key, CIFS_SESS_KEY_SIZE);</div><div class='add'>+		bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='add'>+</div><div class='add'>+		/* can not sign if LANMAN negotiated so no need</div><div class='add'>+		to calculate signing key? but what if server</div><div class='add'>+		changed to do higher than lanman dialect and</div><div class='add'>+		we reconnected would we ever calc signing_key? */</div><div class='add'>+</div><div class='add'>+		cFYI(1,("Negotiating LANMAN setting up strings"));</div><div class='add'>+		/* Unicode not allowed for LANMAN dialects */</div><div class='add'>+		ascii_ssetup_strings(&amp;bcc_ptr, ses, nls_cp);</div><div class='add'>+#endif    </div><div class='add'>+	} else if (type == NTLM) {</div><div class='add'>+		char ntlm_session_key[CIFS_SESS_KEY_SIZE];</div><div class='add'>+</div><div class='add'>+		pSMB-&gt;req_no_secext.Capabilities = cpu_to_le32(capabilities);</div><div class='add'>+		pSMB-&gt;req_no_secext.CaseInsensitivePasswordLength =</div><div class='add'>+			cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='add'>+		pSMB-&gt;req_no_secext.CaseSensitivePasswordLength =</div><div class='add'>+			cpu_to_le16(CIFS_SESS_KEY_SIZE);</div><div class='add'>+	</div><div class='add'>+		/* calculate session key */</div><div class='add'>+		SMBNTencrypt(ses-&gt;password, ses-&gt;server-&gt;cryptKey,</div><div class='add'>+			     ntlm_session_key);</div><div class='add'>+</div><div class='add'>+		if(first_time) /* should this be moved into common code </div><div class='add'>+				  with similar ntlmv2 path? */</div><div class='add'>+			cifs_calculate_mac_key(ses-&gt;server-&gt;mac_signing_key,</div><div class='add'>+				ntlm_session_key, ses-&gt;password);</div><div class='add'>+		/* copy session key */</div><div class='add'>+</div><div class='add'>+		memcpy(bcc_ptr, (char *)ntlm_session_key,CIFS_SESS_KEY_SIZE);</div><div class='add'>+		bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='add'>+		memcpy(bcc_ptr, (char *)ntlm_session_key,CIFS_SESS_KEY_SIZE);</div><div class='add'>+		bcc_ptr += CIFS_SESS_KEY_SIZE;</div><div class='add'>+		if(ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='add'>+			/* unicode strings must be word aligned */</div><div class='add'>+			if (iov[0].iov_len % 2) {</div><div class='add'>+				*bcc_ptr = 0;</div><div class='add'>+				bcc_ptr++;		</div><div class='add'>+			}	</div><div class='add'>+			unicode_ssetup_strings(&amp;bcc_ptr, ses, nls_cp);</div><div class='add'>+		} else</div><div class='add'>+			ascii_ssetup_strings(&amp;bcc_ptr, ses, nls_cp);</div><div class='add'>+	} else if (type == NTLMv2) {</div><div class='add'>+		char * v2_sess_key = </div><div class='add'>+			kmalloc(sizeof(struct ntlmv2_resp), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		/* BB FIXME change all users of v2_sess_key to</div><div class='add'>+		   struct ntlmv2_resp */</div><div class='add'>+</div><div class='add'>+		if(v2_sess_key == NULL) {</div><div class='add'>+			cifs_small_buf_release(smb_buf);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pSMB-&gt;req_no_secext.Capabilities = cpu_to_le32(capabilities);</div><div class='add'>+</div><div class='add'>+		/* LM2 password would be here if we supported it */</div><div class='add'>+		pSMB-&gt;req_no_secext.CaseInsensitivePasswordLength = 0;</div><div class='add'>+		/*	cpu_to_le16(LM2_SESS_KEY_SIZE); */</div><div class='add'>+</div><div class='add'>+		pSMB-&gt;req_no_secext.CaseSensitivePasswordLength =</div><div class='add'>+			cpu_to_le16(sizeof(struct ntlmv2_resp));</div><div class='add'>+</div><div class='add'>+		/* calculate session key */</div><div class='add'>+		setup_ntlmv2_rsp(ses, v2_sess_key, nls_cp);</div><div class='add'>+		if(first_time) /* should this be moved into common code</div><div class='add'>+			          with similar ntlmv2 path? */</div><div class='add'>+		/*   cifs_calculate_ntlmv2_mac_key(ses-&gt;server-&gt;mac_signing_key,</div><div class='add'>+				response BB FIXME, v2_sess_key); */</div><div class='add'>+</div><div class='add'>+		/* copy session key */</div><div class='add'>+</div><div class='add'>+	/*	memcpy(bcc_ptr, (char *)ntlm_session_key,LM2_SESS_KEY_SIZE);</div><div class='add'>+		bcc_ptr += LM2_SESS_KEY_SIZE; */</div><div class='add'>+		memcpy(bcc_ptr, (char *)v2_sess_key, sizeof(struct ntlmv2_resp));</div><div class='add'>+		bcc_ptr += sizeof(struct ntlmv2_resp);</div><div class='add'>+		kfree(v2_sess_key);</div><div class='add'>+		if(ses-&gt;capabilities &amp; CAP_UNICODE) {</div><div class='add'>+			if(iov[0].iov_len % 2) {</div><div class='add'>+				*bcc_ptr = 0;</div><div class='add'>+			}	bcc_ptr++;</div><div class='add'>+			unicode_ssetup_strings(&amp;bcc_ptr, ses, nls_cp);</div><div class='add'>+		} else</div><div class='add'>+			ascii_ssetup_strings(&amp;bcc_ptr, ses, nls_cp);</div><div class='add'>+	} else /* NTLMSSP or SPNEGO */ {</div><div class='add'>+		pSMB-&gt;req.hdr.Flags2 |= SMBFLG2_EXT_SEC;</div><div class='add'>+		capabilities |= CAP_EXTENDED_SECURITY;</div><div class='add'>+		pSMB-&gt;req.Capabilities = cpu_to_le32(capabilities);</div><div class='add'>+		/* BB set password lengths */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = (long) bcc_ptr - (long) str_area;</div><div class='add'>+	smb_buf-&gt;smb_buf_length += count;</div><div class='add'>+</div><div class='add'>+	BCC_LE(smb_buf) = cpu_to_le16(count);</div><div class='add'>+</div><div class='add'>+	iov[1].iov_base = str_area;</div><div class='add'>+	iov[1].iov_len = count; </div><div class='add'>+	rc = SendReceive2(xid, ses, iov, 2 /* num_iovecs */, &amp;resp_buf_type, 0);</div><div class='add'>+	/* SMB request buf freed in SendReceive2 */</div><div class='add'>+</div><div class='add'>+	cFYI(1,("ssetup rc from sendrecv2 is %d",rc));</div><div class='add'>+	if(rc)</div><div class='add'>+		goto ssetup_exit;</div><div class='add'>+</div><div class='add'>+	pSMB = (SESSION_SETUP_ANDX *)iov[0].iov_base;</div><div class='add'>+	smb_buf = (struct smb_hdr *)iov[0].iov_base;</div><div class='add'>+</div><div class='add'>+	if((smb_buf-&gt;WordCount != 3) &amp;&amp; (smb_buf-&gt;WordCount != 4)) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		cERROR(1,("bad word count %d", smb_buf-&gt;WordCount));</div><div class='add'>+		goto ssetup_exit;</div><div class='add'>+	}</div><div class='add'>+	action = le16_to_cpu(pSMB-&gt;resp.Action);</div><div class='add'>+	if (action &amp; GUEST_LOGIN)</div><div class='add'>+		cFYI(1, ("Guest login")); /* BB mark SesInfo struct? */</div><div class='add'>+	ses-&gt;Suid = smb_buf-&gt;Uid;   /* UID left in wire format (le) */</div><div class='add'>+	cFYI(1, ("UID = %d ", ses-&gt;Suid));</div><div class='add'>+	/* response can have either 3 or 4 word count - Samba sends 3 */</div><div class='add'>+	/* and lanman response is 3 */</div><div class='add'>+	bytes_remaining = BCC(smb_buf);</div><div class='add'>+	bcc_ptr = pByteArea(smb_buf);</div><div class='add'>+</div><div class='add'>+	if(smb_buf-&gt;WordCount == 4) {</div><div class='add'>+		__u16 blob_len;</div><div class='add'>+		blob_len = le16_to_cpu(pSMB-&gt;resp.SecurityBlobLength);</div><div class='add'>+		bcc_ptr += blob_len;</div><div class='add'>+		if(blob_len &gt; bytes_remaining) {</div><div class='add'>+			cERROR(1,("bad security blob length %d", blob_len));</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto ssetup_exit;</div><div class='add'>+		}</div><div class='add'>+		bytes_remaining -= blob_len;</div><div class='add'>+	}	</div><div class='add'>+</div><div class='add'>+	/* BB check if Unicode and decode strings */</div><div class='add'>+	if(smb_buf-&gt;Flags2 &amp; SMBFLG2_UNICODE)</div><div class='add'>+		rc = decode_unicode_ssetup(&amp;bcc_ptr, bytes_remaining,</div><div class='add'>+						   ses, nls_cp);</div><div class='add'>+	else</div><div class='add'>+		rc = decode_ascii_ssetup(&amp;bcc_ptr, bytes_remaining, ses,nls_cp);</div><div class='add'>+	</div><div class='add'>+ssetup_exit:</div><div class='add'>+	kfree(str_area);</div><div class='add'>+	if(resp_buf_type == CIFS_SMALL_BUFFER) {</div><div class='add'>+		cFYI(1,("ssetup freeing small buf %p", iov[0].iov_base));</div><div class='add'>+		cifs_small_buf_release(iov[0].iov_base);</div><div class='add'>+	} else if(resp_buf_type == CIFS_LARGE_BUFFER)</div><div class='add'>+		cifs_buf_release(iov[0].iov_base);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c<br/>index 6103bcdfb16d..f518c5e45035 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/smbencrypt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/smbencrypt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/smbencrypt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/smbencrypt.c</a></div><div class='hunk'>@@ -30,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='ctx'> #include "cifs_unicode.h"</div><div class='ctx'> #include "cifspdu.h"</div><div class='add'>+#include "cifsglob.h"</div><div class='ctx'> #include "md5.h"</div><div class='ctx'> #include "cifs_debug.h"</div><div class='ctx'> #include "cifsencrypt.h"</div><div class='head'>diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c<br/>index 3da80409466c..17ba329e2b3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cifs/transport.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cifs/transport.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cifs/transport.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cifs/transport.c</a></div><div class='hunk'>@@ -654,8 +654,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,</div><div class='ctx'> </div><div class='ctx'> 	if (in_buf-&gt;smb_buf_length &gt; CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) {</div><div class='ctx'> 		up(&amp;ses-&gt;server-&gt;tcpSem);</div><div class='del'>-		cERROR(1,</div><div class='del'>-		       ("Illegal length, greater than maximum frame, %d ",</div><div class='add'>+		cERROR(1, ("Illegal length, greater than maximum frame, %d",</div><div class='ctx'> 			in_buf-&gt;smb_buf_length));</div><div class='ctx'> 		DeleteMidQEntry(midQ);</div><div class='ctx'> 		/* If not lock req, update # of requests on wire to server */</div><div class='head'>diff --git a/fs/coda/file.c b/fs/coda/file.c<br/>index 7c2642431fa5..cc66c681bd11 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/coda/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/coda/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/coda/file.c</a></div><div class='hunk'>@@ -164,7 +164,7 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int coda_flush(struct file *coda_file)</div><div class='add'>+int coda_flush(struct file *coda_file, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short flags = coda_file-&gt;f_flags &amp; ~O_EXCL;</div><div class='ctx'> 	unsigned short coda_flags = coda_flags_to_cflags(flags);</div><div class='head'>diff --git a/fs/coda/inode.c b/fs/coda/inode.c<br/>index ada1a81df6bd..87f1dc8aa24b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/coda/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/coda/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/coda/inode.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> /* VFS super_block ops */</div><div class='ctx'> static void coda_clear_inode(struct inode *);</div><div class='ctx'> static void coda_put_super(struct super_block *);</div><div class='del'>-static int coda_statfs(struct super_block *sb, struct kstatfs *buf);</div><div class='add'>+static int coda_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='ctx'> </div><div class='ctx'> static kmem_cache_t * coda_inode_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -278,13 +278,13 @@ struct inode_operations coda_file_inode_operations = {</div><div class='ctx'> 	.setattr	= coda_setattr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int coda_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int coda_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> </div><div class='del'>-	error = venus_statfs(sb, buf);</div><div class='add'>+	error = venus_statfs(dentry, buf);</div><div class='ctx'> </div><div class='ctx'> 	unlock_kernel();</div><div class='ctx'> </div><div class='hunk'>@@ -307,10 +307,10 @@ static int coda_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='ctx'> </div><div class='ctx'> /* init_coda: used by filesystems.c to register coda */</div><div class='ctx'> </div><div class='del'>-static struct super_block *coda_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int coda_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_nodev(fs_type, flags, data, coda_fill_super);</div><div class='add'>+	return get_sb_nodev(fs_type, flags, data, coda_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct file_system_type coda_fs_type = {</div><div class='head'>diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c<br/>index 6c6771db36da..803aacf0d49c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/coda/psdev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/psdev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/coda/psdev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/coda/psdev.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='hunk'>@@ -259,7 +258,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,</div><div class='ctx'> 	/* If request was not a signal, enqueue and don't free */</div><div class='ctx'> 	if (!(req-&gt;uc_flags &amp; REQ_ASYNC)) {</div><div class='ctx'> 		req-&gt;uc_flags |= REQ_READ;</div><div class='del'>-		list_add(&amp;(req-&gt;uc_chain), vcp-&gt;vc_processing.prev);</div><div class='add'>+		list_add_tail(&amp;(req-&gt;uc_chain), &amp;vcp-&gt;vc_processing);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -365,22 +364,12 @@ static int init_coda_psdev(void)</div><div class='ctx'> 		err = PTR_ERR(coda_psdev_class);</div><div class='ctx'> 		goto out_chrdev;</div><div class='ctx'> 	}		</div><div class='del'>-	devfs_mk_dir ("coda");</div><div class='del'>-	for (i = 0; i &lt; MAX_CODADEVS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_CODADEVS; i++)</div><div class='ctx'> 		class_device_create(coda_psdev_class, NULL,</div><div class='ctx'> 				MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i);</div><div class='del'>-		err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i),</div><div class='del'>-				S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out_class;</div><div class='del'>-	}</div><div class='ctx'> 	coda_sysctl_init();</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='del'>-out_class:</div><div class='del'>-	for (i = 0; i &lt; MAX_CODADEVS; i++) </div><div class='del'>-		class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));</div><div class='del'>-	class_destroy(coda_psdev_class);</div><div class='ctx'> out_chrdev:</div><div class='ctx'> 	unregister_chrdev(CODA_PSDEV_MAJOR, "coda");</div><div class='ctx'> out:</div><div class='hunk'>@@ -419,12 +408,9 @@ static int __init init_coda(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='del'>-	for (i = 0; i &lt; MAX_CODADEVS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_CODADEVS; i++)</div><div class='ctx'> 		class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));</div><div class='del'>-		devfs_remove("coda/%d", i);</div><div class='del'>-	}</div><div class='ctx'> 	class_destroy(coda_psdev_class);</div><div class='del'>-	devfs_remove("coda");</div><div class='ctx'> 	unregister_chrdev(CODA_PSDEV_MAJOR, "coda");</div><div class='ctx'> 	coda_sysctl_clean();</div><div class='ctx'> out1:</div><div class='hunk'>@@ -441,12 +427,9 @@ static void __exit exit_coda(void)</div><div class='ctx'>         if ( err != 0 ) {</div><div class='ctx'>                 printk("coda: failed to unregister filesystem\n");</div><div class='ctx'>         }</div><div class='del'>-	for (i = 0; i &lt; MAX_CODADEVS; i++) {</div><div class='add'>+	for (i = 0; i &lt; MAX_CODADEVS; i++)</div><div class='ctx'> 		class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));</div><div class='del'>-		devfs_remove("coda/%d", i);</div><div class='del'>-	}</div><div class='ctx'> 	class_destroy(coda_psdev_class);</div><div class='del'>-	devfs_remove("coda");</div><div class='ctx'> 	unregister_chrdev(CODA_PSDEV_MAJOR, "coda");</div><div class='ctx'> 	coda_sysctl_clean();</div><div class='ctx'> 	coda_destroy_inodecache();</div><div class='head'>diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c<br/>index b35e5bbd9c99..76e00a65a75b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/coda/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/coda/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/coda/symlink.c</a></div><div class='hunk'>@@ -50,6 +50,6 @@ fail:</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations coda_symlink_aops = {</div><div class='add'>+const struct address_space_operations coda_symlink_aops = {</div><div class='ctx'> 	.readpage	= coda_symlink_filler,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c<br/>index f0b10757288f..1c82e9a7d7c8 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/coda/sysctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/sysctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/coda/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/coda/sysctl.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c<br/>index 1bae99650a91..a5b5e631ba61 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/coda/upcall.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/coda/upcall.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/coda/upcall.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/coda/upcall.c</a></div><div class='hunk'>@@ -611,7 +611,7 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int venus_statfs(struct super_block *sb, struct kstatfs *sfs) </div><div class='add'>+int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)</div><div class='ctx'> { </div><div class='ctx'>         union inputArgs *inp;</div><div class='ctx'>         union outputArgs *outp;</div><div class='hunk'>@@ -620,7 +620,7 @@ int venus_statfs(struct super_block *sb, struct kstatfs *sfs)</div><div class='ctx'> 	insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));</div><div class='ctx'> 	UPARG(CODA_STATFS);</div><div class='ctx'> </div><div class='del'>-        error = coda_upcall(coda_sbp(sb), insize, &amp;outsize, inp);</div><div class='add'>+        error = coda_upcall(coda_sbp(dentry-&gt;d_sb), insize, &amp;outsize, inp);</div><div class='ctx'> 	</div><div class='ctx'>         if (!error) {</div><div class='ctx'> 		sfs-&gt;f_blocks = outp-&gt;coda_statfs.stat.f_blocks;</div><div class='hunk'>@@ -725,7 +725,7 @@ static int coda_upcall(struct coda_sb_info *sbi,</div><div class='ctx'> 	((union inputArgs *)buffer)-&gt;ih.unique = req-&gt;uc_unique;</div><div class='ctx'> </div><div class='ctx'> 	/* Append msg to pending queue and poke Venus. */</div><div class='del'>-	list_add(&amp;(req-&gt;uc_chain), vcommp-&gt;vc_pending.prev);</div><div class='add'>+	list_add_tail(&amp;(req-&gt;uc_chain), &amp;vcommp-&gt;vc_pending);</div><div class='ctx'>         </div><div class='ctx'> 	wake_up_interruptible(&amp;vcommp-&gt;vc_waitq);</div><div class='ctx'> 	/* We can be interrupted while we wait for Venus to process</div><div class='head'>diff --git a/fs/compat.c b/fs/compat.c<br/>index b1f64786a613..e31e9cf96647 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/compat.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/compat.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/compat.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/compat.c</a></div><div class='hunk'>@@ -55,6 +55,20 @@</div><div class='ctx'> </div><div class='ctx'> extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);</div><div class='ctx'> </div><div class='add'>+int compat_log = 1;</div><div class='add'>+</div><div class='add'>+int compat_printk(const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list ap;</div><div class='add'>+	int ret;</div><div class='add'>+	if (!compat_log)</div><div class='add'>+		return 0;</div><div class='add'>+	va_start(ap, fmt);</div><div class='add'>+	ret = vprintk(fmt, ap);</div><div class='add'>+	va_end(ap);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Not all architectures have sys_utime, so implement this in terms</div><div class='ctx'>  * of sys_utimes.</div><div class='hunk'>@@ -197,7 +211,7 @@ asmlinkage long compat_sys_statfs(const char __user *path, struct compat_statfs</div><div class='ctx'> 	error = user_path_walk(path, &amp;nd);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		struct kstatfs tmp;</div><div class='del'>-		error = vfs_statfs(nd.dentry-&gt;d_inode-&gt;i_sb, &amp;tmp);</div><div class='add'>+		error = vfs_statfs(nd.dentry, &amp;tmp);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			error = put_compat_statfs(buf, &amp;tmp);</div><div class='ctx'> 		path_release(&amp;nd);</div><div class='hunk'>@@ -215,7 +229,7 @@ asmlinkage long compat_sys_fstatfs(unsigned int fd, struct compat_statfs __user</div><div class='ctx'> 	file = fget(fd);</div><div class='ctx'> 	if (!file)</div><div class='ctx'> 		goto out;</div><div class='del'>-	error = vfs_statfs(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb, &amp;tmp);</div><div class='add'>+	error = vfs_statfs(file-&gt;f_dentry, &amp;tmp);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = put_compat_statfs(buf, &amp;tmp);</div><div class='ctx'> 	fput(file);</div><div class='hunk'>@@ -265,7 +279,7 @@ asmlinkage long compat_sys_statfs64(const char __user *path, compat_size_t sz, s</div><div class='ctx'> 	error = user_path_walk(path, &amp;nd);</div><div class='ctx'> 	if (!error) {</div><div class='ctx'> 		struct kstatfs tmp;</div><div class='del'>-		error = vfs_statfs(nd.dentry-&gt;d_inode-&gt;i_sb, &amp;tmp);</div><div class='add'>+		error = vfs_statfs(nd.dentry, &amp;tmp);</div><div class='ctx'> 		if (!error)</div><div class='ctx'> 			error = put_compat_statfs64(buf, &amp;tmp);</div><div class='ctx'> 		path_release(&amp;nd);</div><div class='hunk'>@@ -286,7 +300,7 @@ asmlinkage long compat_sys_fstatfs64(unsigned int fd, compat_size_t sz, struct c</div><div class='ctx'> 	file = fget(fd);</div><div class='ctx'> 	if (!file)</div><div class='ctx'> 		goto out;</div><div class='del'>-	error = vfs_statfs(file-&gt;f_dentry-&gt;d_inode-&gt;i_sb, &amp;tmp);</div><div class='add'>+	error = vfs_statfs(file-&gt;f_dentry, &amp;tmp);</div><div class='ctx'> 	if (!error)</div><div class='ctx'> 		error = put_compat_statfs64(buf, &amp;tmp);</div><div class='ctx'> 	fput(file);</div><div class='hunk'>@@ -359,7 +373,7 @@ static void compat_ioctl_error(struct file *filp, unsigned int fd,</div><div class='ctx'> 	sprintf(buf,"'%c'", (cmd&gt;&gt;24) &amp; 0x3f);</div><div class='ctx'> 	if (!isprint(buf[1]))</div><div class='ctx'> 		sprintf(buf, "%02x", buf[1]);</div><div class='del'>-	printk("ioctl32(%s:%d): Unknown cmd fd(%d) "</div><div class='add'>+	compat_printk("ioctl32(%s:%d): Unknown cmd fd(%d) "</div><div class='ctx'> 			"cmd(%08x){%s} arg(%08x) on %s\n",</div><div class='ctx'> 			current-&gt;comm, current-&gt;pid,</div><div class='ctx'> 			(int)fd, (unsigned int)cmd, buf,</div><div class='head'>diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c<br/>index d2c38875ab29..4063a9396977 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/compat_ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/compat_ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/compat_ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/compat_ioctl.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * ioctls.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -44,7 +43,6 @@</div><div class='ctx'> #include &lt;linux/loop.h&gt;</div><div class='ctx'> #include &lt;linux/auto_fs.h&gt;</div><div class='ctx'> #include &lt;linux/auto_fs4.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/tty.h&gt;</div><div class='ctx'> #include &lt;linux/vt_kern.h&gt;</div><div class='ctx'> #include &lt;linux/fb.h&gt;</div><div class='hunk'>@@ -80,6 +78,7 @@</div><div class='ctx'> #include &lt;net/bluetooth/rfcomm.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capi.h&gt;</div><div class='add'>+#include &lt;linux/gigaset_dev.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;scsi/scsi.h&gt;</div><div class='ctx'> #include &lt;scsi/scsi_ioctl.h&gt;</div><div class='hunk'>@@ -205,38 +204,6 @@ static int do_ext3_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	return sys_ioctl(fd, cmd, (unsigned long)compat_ptr(arg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct compat_dmx_event {</div><div class='del'>-	dmx_event_t	event;</div><div class='del'>-	compat_time_t	timeStamp;</div><div class='del'>-	union</div><div class='del'>-	{</div><div class='del'>-		dmx_scrambling_status_t scrambling;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int do_dmx_get_event(unsigned int fd, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct dmx_event kevent;</div><div class='del'>-	mm_segment_t old_fs = get_fs();</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	set_fs(KERNEL_DS);</div><div class='del'>-	err = sys_ioctl(fd, cmd, (unsigned long) &amp;kevent);</div><div class='del'>-	set_fs(old_fs);</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		struct compat_dmx_event __user *up = compat_ptr(arg);</div><div class='del'>-</div><div class='del'>-		err  = put_user(kevent.event, &amp;up-&gt;event);</div><div class='del'>-		err |= put_user(kevent.timeStamp, &amp;up-&gt;timeStamp);</div><div class='del'>-		err |= put_user(kevent.u.scrambling, &amp;up-&gt;u.scrambling);</div><div class='del'>-		if (err)</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> struct compat_video_event {</div><div class='ctx'> 	int32_t		type;</div><div class='ctx'> 	compat_time_t	timestamp;</div><div class='hunk'>@@ -2964,7 +2931,6 @@ HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* dvb */</div><div class='del'>-HANDLE_IOCTL(DMX_GET_EVENT, do_dmx_get_event)</div><div class='ctx'> HANDLE_IOCTL(VIDEO_GET_EVENT, do_video_get_event)</div><div class='ctx'> HANDLE_IOCTL(VIDEO_STILLPICTURE, do_video_stillpicture)</div><div class='ctx'> HANDLE_IOCTL(VIDEO_SET_SPU_PALETTE, do_video_set_spu_palette)</div><div class='head'>diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c<br/>index 5f952187fc53..df025453dd97 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/configfs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/configfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/configfs/dir.c</a></div><div class='hunk'>@@ -211,7 +211,7 @@ static void remove_dir(struct dentry * d)</div><div class='ctx'> 	struct configfs_dirent * sd;</div><div class='ctx'> </div><div class='ctx'> 	sd = d-&gt;d_fsdata;</div><div class='del'>- 	list_del_init(&amp;sd-&gt;s_sibling);</div><div class='add'>+	list_del_init(&amp;sd-&gt;s_sibling);</div><div class='ctx'> 	configfs_put(sd);</div><div class='ctx'> 	if (d-&gt;d_inode)</div><div class='ctx'> 		simple_rmdir(parent-&gt;d_inode,d);</div><div class='hunk'>@@ -330,7 +330,7 @@ static int configfs_detach_prep(struct dentry *dentry)</div><div class='ctx'> </div><div class='ctx'> 			ret = configfs_detach_prep(sd-&gt;s_dentry);</div><div class='ctx'> 			if (!ret)</div><div class='del'>-			       	continue;</div><div class='add'>+				continue;</div><div class='ctx'> 		} else</div><div class='ctx'> 			ret = -ENOTEMPTY;</div><div class='ctx'> </div><div class='hunk'>@@ -931,7 +931,7 @@ int configfs_rename_dir(struct config_item * item, const char *new_name)</div><div class='ctx'> </div><div class='ctx'> 	new_dentry = lookup_one_len(new_name, parent, strlen(new_name));</div><div class='ctx'> 	if (!IS_ERR(new_dentry)) {</div><div class='del'>-  		if (!new_dentry-&gt;d_inode) {</div><div class='add'>+		if (!new_dentry-&gt;d_inode) {</div><div class='ctx'> 			error = config_item_set_name(item, "%s", new_name);</div><div class='ctx'> 			if (!error) {</div><div class='ctx'> 				d_add(new_dentry, NULL);</div><div class='hunk'>@@ -1009,8 +1009,7 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir</div><div class='ctx'> 			/* fallthrough */</div><div class='ctx'> 		default:</div><div class='ctx'> 			if (filp-&gt;f_pos == 2) {</div><div class='del'>-				list_del(q);</div><div class='del'>-				list_add(q, &amp;parent_sd-&gt;s_children);</div><div class='add'>+				list_move(q, &amp;parent_sd-&gt;s_children);</div><div class='ctx'> 			}</div><div class='ctx'> 			for (p=q-&gt;next; p!= &amp;parent_sd-&gt;s_children; p=p-&gt;next) {</div><div class='ctx'> 				struct configfs_dirent *next;</div><div class='hunk'>@@ -1033,8 +1032,7 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir</div><div class='ctx'> 						 dt_type(next)) &lt; 0)</div><div class='ctx'> 					return 0;</div><div class='ctx'> </div><div class='del'>-				list_del(q);</div><div class='del'>-				list_add(q, p);</div><div class='add'>+				list_move(q, p);</div><div class='ctx'> 				p = q;</div><div class='ctx'> 				filp-&gt;f_pos++;</div><div class='ctx'> 			}</div><div class='head'>diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c<br/>index c153bd9534cb..e14488ca6411 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/configfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/configfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/configfs/inode.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> extern struct super_block * configfs_sb;</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations configfs_aops = {</div><div class='add'>+static const struct address_space_operations configfs_aops = {</div><div class='ctx'> 	.readpage	= simple_readpage,</div><div class='ctx'> 	.prepare_write	= simple_prepare_write,</div><div class='ctx'> 	.commit_write	= simple_commit_write</div><div class='head'>diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c<br/>index f920d30478e5..3e5fe843e1df 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/configfs/mount.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/mount.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/configfs/mount.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/configfs/mount.c</a></div><div class='hunk'>@@ -103,10 +103,10 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *configfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int configfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, configfs_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, configfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type configfs_fs_type = {</div><div class='hunk'>@@ -118,7 +118,7 @@ static struct file_system_type configfs_fs_type = {</div><div class='ctx'> </div><div class='ctx'> int configfs_pin_fs(void)</div><div class='ctx'> {</div><div class='del'>-	return simple_pin_fs("configfs", &amp;configfs_mount,</div><div class='add'>+	return simple_pin_fs(&amp;configfs_fs_type, &amp;configfs_mount,</div><div class='ctx'> 			     &amp;configfs_mnt_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c<br/>index e5512e295cf2..fb65e0800a86 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/configfs/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/configfs/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/configfs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/configfs/symlink.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static void fill_item_path(struct config_item * item, char * buffer, int length)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int create_link(struct config_item *parent_item,</div><div class='del'>- 		       struct config_item *item,</div><div class='add'>+		       struct config_item *item,</div><div class='ctx'> 		       struct dentry *dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct configfs_dirent *target_sd = item-&gt;ci_dentry-&gt;d_fsdata;</div><div class='head'>diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c<br/>index 9efcc3a164e8..223c0431042d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/cramfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/cramfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/cramfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/cramfs/inode.c</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> static struct super_operations cramfs_ops;</div><div class='ctx'> static struct inode_operations cramfs_dir_inode_operations;</div><div class='ctx'> static const struct file_operations cramfs_directory_operations;</div><div class='del'>-static struct address_space_operations cramfs_aops;</div><div class='add'>+static const struct address_space_operations cramfs_aops;</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(read_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -181,9 +181,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i</div><div class='ctx'> 		struct page *page = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (blocknr + i &lt; devsize) {</div><div class='del'>-			page = read_cache_page(mapping, blocknr + i,</div><div class='del'>-				(filler_t *)mapping-&gt;a_ops-&gt;readpage,</div><div class='del'>-				NULL);</div><div class='add'>+			page = read_mapping_page(mapping, blocknr + i, NULL);</div><div class='ctx'> 			/* synchronous error? */</div><div class='ctx'> 			if (IS_ERR(page))</div><div class='ctx'> 				page = NULL;</div><div class='hunk'>@@ -322,8 +320,10 @@ out:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cramfs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int cramfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	buf-&gt;f_type = CRAMFS_MAGIC;</div><div class='ctx'> 	buf-&gt;f_bsize = PAGE_CACHE_SIZE;</div><div class='ctx'> 	buf-&gt;f_blocks = CRAMFS_SB(sb)-&gt;blocks;</div><div class='hunk'>@@ -501,7 +501,7 @@ static int cramfs_readpage(struct file *file, struct page * page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations cramfs_aops = {</div><div class='add'>+static const struct address_space_operations cramfs_aops = {</div><div class='ctx'> 	.readpage = cramfs_readpage</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -528,10 +528,11 @@ static struct super_operations cramfs_ops = {</div><div class='ctx'> 	.statfs		= cramfs_statfs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct super_block *cramfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int cramfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, cramfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, cramfs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type cramfs_fs_type = {</div><div class='head'>diff --git a/fs/dcache.c b/fs/dcache.c<br/>index 940d188e5d14..1b4a3a34ec57 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/dcache.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/dcache.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/dcache.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/dcache.c</a></div><div class='hunk'>@@ -14,7 +14,6 @@</div><div class='ctx'>  * the dcache entry is deleted or garbage collected.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -39,7 +38,7 @@ int sysctl_vfs_cache_pressure __read_mostly = 100;</div><div class='ctx'> EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);</div><div class='ctx'> </div><div class='ctx'>  __cacheline_aligned_in_smp DEFINE_SPINLOCK(dcache_lock);</div><div class='del'>-static seqlock_t rename_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED;</div><div class='add'>+static __cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dcache_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -359,12 +358,13 @@ restart:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Throw away a dentry - free the inode, dput the parent.</div><div class='del'>- * This requires that the LRU list has already been</div><div class='del'>- * removed.</div><div class='add'>+ * Throw away a dentry - free the inode, dput the parent.  This requires that</div><div class='add'>+ * the LRU list has already been removed.</div><div class='add'>+ *</div><div class='ctx'>  * Called with dcache_lock, drops it and then regains.</div><div class='add'>+ * Called with dentry-&gt;d_lock held, drops it.</div><div class='ctx'>  */</div><div class='del'>-static inline void prune_one_dentry(struct dentry * dentry)</div><div class='add'>+static void prune_one_dentry(struct dentry * dentry)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry * parent;</div><div class='ctx'> </div><div class='hunk'>@@ -382,6 +382,8 @@ static inline void prune_one_dentry(struct dentry * dentry)</div><div class='ctx'> /**</div><div class='ctx'>  * prune_dcache - shrink the dcache</div><div class='ctx'>  * @count: number of entries to try and free</div><div class='add'>+ * @sb: if given, ignore dentries for other superblocks</div><div class='add'>+ *         which are being unmounted.</div><div class='ctx'>  *</div><div class='ctx'>  * Shrink the dcache. This is done when we need</div><div class='ctx'>  * more memory, or simply when we need to unmount</div><div class='hunk'>@@ -392,16 +394,29 @@ static inline void prune_one_dentry(struct dentry * dentry)</div><div class='ctx'>  * all the dentries are in use.</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-static void prune_dcache(int count)</div><div class='add'>+static void prune_dcache(int count, struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;dcache_lock);</div><div class='ctx'> 	for (; count ; count--) {</div><div class='ctx'> 		struct dentry *dentry;</div><div class='ctx'> 		struct list_head *tmp;</div><div class='add'>+		struct rw_semaphore *s_umount;</div><div class='ctx'> </div><div class='ctx'> 		cond_resched_lock(&amp;dcache_lock);</div><div class='ctx'> </div><div class='ctx'> 		tmp = dentry_unused.prev;</div><div class='add'>+		if (sb) {</div><div class='add'>+			/* Try to find a dentry for this sb, but don't try</div><div class='add'>+			 * too hard, if they aren't near the tail they will</div><div class='add'>+			 * be moved down again soon</div><div class='add'>+			 */</div><div class='add'>+			int skip = count;</div><div class='add'>+			while (skip &amp;&amp; tmp != &amp;dentry_unused &amp;&amp;</div><div class='add'>+			    list_entry(tmp, struct dentry, d_lru)-&gt;d_sb != sb) {</div><div class='add'>+				skip--;</div><div class='add'>+				tmp = tmp-&gt;prev;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		if (tmp == &amp;dentry_unused)</div><div class='ctx'> 			break;</div><div class='ctx'> 		list_del_init(tmp);</div><div class='hunk'>@@ -427,7 +442,45 @@ static void prune_dcache(int count)</div><div class='ctx'>  			spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		prune_one_dentry(dentry);</div><div class='add'>+		/*</div><div class='add'>+		 * If the dentry is not DCACHED_REFERENCED, it is time</div><div class='add'>+		 * to remove it from the dcache, provided the super block is</div><div class='add'>+		 * NULL (which means we are trying to reclaim memory)</div><div class='add'>+		 * or this dentry belongs to the same super block that</div><div class='add'>+		 * we want to shrink.</div><div class='add'>+		 */</div><div class='add'>+		/*</div><div class='add'>+		 * If this dentry is for "my" filesystem, then I can prune it</div><div class='add'>+		 * without taking the s_umount lock (I already hold it).</div><div class='add'>+		 */</div><div class='add'>+		if (sb &amp;&amp; dentry-&gt;d_sb == sb) {</div><div class='add'>+			prune_one_dentry(dentry);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * ...otherwise we need to be sure this filesystem isn't being</div><div class='add'>+		 * unmounted, otherwise we could race with</div><div class='add'>+		 * generic_shutdown_super(), and end up holding a reference to</div><div class='add'>+		 * an inode while the filesystem is unmounted.</div><div class='add'>+		 * So we try to get s_umount, and make sure s_root isn't NULL.</div><div class='add'>+		 * (Take a local copy of s_umount to avoid a use-after-free of</div><div class='add'>+		 * `dentry').</div><div class='add'>+		 */</div><div class='add'>+		s_umount = &amp;dentry-&gt;d_sb-&gt;s_umount;</div><div class='add'>+		if (down_read_trylock(s_umount)) {</div><div class='add'>+			if (dentry-&gt;d_sb-&gt;s_root != NULL) {</div><div class='add'>+				prune_one_dentry(dentry);</div><div class='add'>+				up_read(s_umount);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			up_read(s_umount);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='add'>+		/* Cannot remove the first dentry, and it isn't appropriate</div><div class='add'>+		 * to move it to the head of the list, so give up, and try</div><div class='add'>+		 * later</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;dcache_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -468,8 +521,7 @@ void shrink_dcache_sb(struct super_block * sb)</div><div class='ctx'> 		dentry = list_entry(tmp, struct dentry, d_lru);</div><div class='ctx'> 		if (dentry-&gt;d_sb != sb)</div><div class='ctx'> 			continue;</div><div class='del'>-		list_del(tmp);</div><div class='del'>-		list_add(tmp, &amp;dentry_unused);</div><div class='add'>+		list_move(tmp, &amp;dentry_unused);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -584,7 +636,7 @@ resume:</div><div class='ctx'> 		 * of the unused list for prune_dcache</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!atomic_read(&amp;dentry-&gt;d_count)) {</div><div class='del'>-			list_add(&amp;dentry-&gt;d_lru, dentry_unused.prev);</div><div class='add'>+			list_add_tail(&amp;dentry-&gt;d_lru, &amp;dentry_unused);</div><div class='ctx'> 			dentry_stat.nr_unused++;</div><div class='ctx'> 			found++;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -630,46 +682,7 @@ void shrink_dcache_parent(struct dentry * parent)</div><div class='ctx'> 	int found;</div><div class='ctx'> </div><div class='ctx'> 	while ((found = select_parent(parent)) != 0)</div><div class='del'>-		prune_dcache(found);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * shrink_dcache_anon - further prune the cache</div><div class='del'>- * @head: head of d_hash list of dentries to prune</div><div class='del'>- *</div><div class='del'>- * Prune the dentries that are anonymous</div><div class='del'>- *</div><div class='del'>- * parsing d_hash list does not hlist_for_each_entry_rcu() as it</div><div class='del'>- * done under dcache_lock.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-void shrink_dcache_anon(struct hlist_head *head)</div><div class='del'>-{</div><div class='del'>-	struct hlist_node *lp;</div><div class='del'>-	int found;</div><div class='del'>-	do {</div><div class='del'>-		found = 0;</div><div class='del'>-		spin_lock(&amp;dcache_lock);</div><div class='del'>-		hlist_for_each(lp, head) {</div><div class='del'>-			struct dentry *this = hlist_entry(lp, struct dentry, d_hash);</div><div class='del'>-			if (!list_empty(&amp;this-&gt;d_lru)) {</div><div class='del'>-				dentry_stat.nr_unused--;</div><div class='del'>-				list_del_init(&amp;this-&gt;d_lru);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* </div><div class='del'>-			 * move only zero ref count dentries to the end </div><div class='del'>-			 * of the unused list for prune_dcache</div><div class='del'>-			 */</div><div class='del'>-			if (!atomic_read(&amp;this-&gt;d_count)) {</div><div class='del'>-				list_add_tail(&amp;this-&gt;d_lru, &amp;dentry_unused);</div><div class='del'>-				dentry_stat.nr_unused++;</div><div class='del'>-				found++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;dcache_lock);</div><div class='del'>-		prune_dcache(found);</div><div class='del'>-	} while(found);</div><div class='add'>+		prune_dcache(found, parent-&gt;d_sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -689,7 +702,7 @@ static int shrink_dcache_memory(int nr, gfp_t gfp_mask)</div><div class='ctx'> 	if (nr) {</div><div class='ctx'> 		if (!(gfp_mask &amp; __GFP_FS))</div><div class='ctx'> 			return -1;</div><div class='del'>-		prune_dcache(nr);</div><div class='add'>+		prune_dcache(nr, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	return (dentry_stat.nr_unused / 100) * sysctl_vfs_cache_pressure;</div><div class='ctx'> }</div><div class='hunk'>@@ -1326,10 +1339,10 @@ void d_move(struct dentry * dentry, struct dentry * target)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (target &lt; dentry) {</div><div class='ctx'> 		spin_lock(&amp;target-&gt;d_lock);</div><div class='del'>-		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='add'>+		spin_lock_nested(&amp;dentry-&gt;d_lock, DENTRY_D_LOCK_NESTED);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		spin_lock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		spin_lock(&amp;target-&gt;d_lock);</div><div class='add'>+		spin_lock_nested(&amp;target-&gt;d_lock, DENTRY_D_LOCK_NESTED);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Move the dentry to the target hash queue, if on different bucket */</div><div class='head'>diff --git a/fs/dcookies.c b/fs/dcookies.c<br/>index 8749339bf4f6..0c4b0674854b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/dcookies.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/dcookies.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/dcookies.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/dcookies.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * to the pair and can be looked up from userspace.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c<br/>index 66a505422e5c..39640fd03458 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/debugfs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/debugfs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/debugfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/debugfs/file.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='head'>diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c<br/>index 85d166cdcae4..e8ae3042b806 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/debugfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/debugfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/debugfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/debugfs/inode.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> /* uncomment to get debug messages from the debug filesystem, ah the irony. */</div><div class='ctx'> /* #define DEBUG */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -67,12 +66,13 @@ static struct inode *debugfs_get_inode(struct super_block *sb, int mode, dev_t d</div><div class='ctx'> static int debugfs_mknod(struct inode *dir, struct dentry *dentry,</div><div class='ctx'> 			 int mode, dev_t dev)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = debugfs_get_inode(dir-&gt;i_sb, mode, dev);</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> 	int error = -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	if (dentry-&gt;d_inode)</div><div class='ctx'> 		return -EEXIST;</div><div class='ctx'> </div><div class='add'>+	inode = debugfs_get_inode(dir-&gt;i_sb, mode, dev);</div><div class='ctx'> 	if (inode) {</div><div class='ctx'> 		d_instantiate(dentry, inode);</div><div class='ctx'> 		dget(dentry);</div><div class='hunk'>@@ -110,11 +110,11 @@ static int debug_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *debug_get_sb(struct file_system_type *fs_type,</div><div class='del'>-				        int flags, const char *dev_name,</div><div class='del'>-					void *data)</div><div class='add'>+static int debug_get_sb(struct file_system_type *fs_type,</div><div class='add'>+			int flags, const char *dev_name,</div><div class='add'>+			void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, debug_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, debug_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type debug_fs_type = {</div><div class='hunk'>@@ -198,7 +198,7 @@ struct dentry *debugfs_create_file(const char *name, mode_t mode,</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("debugfs: creating file '%s'\n",name);</div><div class='ctx'> </div><div class='del'>-	error = simple_pin_fs("debugfs", &amp;debugfs_mount, &amp;debugfs_mount_count);</div><div class='add'>+	error = simple_pin_fs(&amp;debug_fs_type, &amp;debugfs_mount, &amp;debugfs_mount_count);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/devfs/Makefile b/fs/devfs/Makefile<br/>deleted file mode 100644<br/>index 6dd8d1245e2c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/fs/devfs/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devfs/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Makefile for the linux devfs-filesystem routines.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_DEVFS_FS) += devfs.o</div><div class='del'>-</div><div class='del'>-devfs-objs := base.o util.o</div><div class='del'>-</div><div class='head'>diff --git a/fs/devfs/base.c b/fs/devfs/base.c<br/>deleted file mode 100644<br/>index 52f5059c4f31..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/fs/devfs/base.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devfs/base.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2836 +0,0 @@</div><div class='del'>-/*  devfs (Device FileSystem) driver.</div><div class='del'>-</div><div class='del'>-    Copyright (C) 1998-2002  Richard Gooch</div><div class='del'>-</div><div class='del'>-    This library is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of the GNU Library General Public</div><div class='del'>-    License as published by the Free Software Foundation; either</div><div class='del'>-    version 2 of the License, or (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This library is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>-    Library General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU Library General Public</div><div class='del'>-    License along with this library; if not, write to the Free</div><div class='del'>-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-</div><div class='del'>-    Richard Gooch may be reached by email at  rgooch@atnf.csiro.au</div><div class='del'>-    The postal address is:</div><div class='del'>-      Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.</div><div class='del'>-</div><div class='del'>-    ChangeLog</div><div class='del'>-</div><div class='del'>-    19980110   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Original version.</div><div class='del'>-  v0.1</div><div class='del'>-    19980111   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created per-fs inode table rather than using inode-&gt;u.generic_ip</div><div class='del'>-  v0.2</div><div class='del'>-    19980111   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created .epoch inode which has a ctime of 0.</div><div class='del'>-	       Fixed loss of named pipes when dentries lost.</div><div class='del'>-	       Fixed loss of inode data when devfs_register() follows mknod().</div><div class='del'>-  v0.3</div><div class='del'>-    19980111   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fix for when compiling with CONFIG_KERNELD.</div><div class='del'>-    19980112   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fix for readdir() which sometimes didn't show entries.</div><div class='del'>-	       Added &lt;&lt;tolerant&gt;&gt; option to &lt;devfs_register&gt;.</div><div class='del'>-  v0.4</div><div class='del'>-    19980113   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;devfs_fill_file&gt; function.</div><div class='del'>-  v0.5</div><div class='del'>-    19980115   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Added subdirectory support. Major restructuring.</div><div class='del'>-    19980116   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fixed &lt;find_by_dev&gt; to not search major=0,minor=0.</div><div class='del'>-	       Added symlink support.</div><div class='del'>-  v0.6</div><div class='del'>-    19980120   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;devfs_mk_dir&gt; function and support directory unregister</div><div class='del'>-    19980120   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Auto-ownership uses real uid/gid rather than effective uid/gid.</div><div class='del'>-  v0.7</div><div class='del'>-    19980121   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Supported creation of sockets.</div><div class='del'>-  v0.8</div><div class='del'>-    19980122   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Added DEVFS_FL_HIDE_UNREG flag.</div><div class='del'>-	       Interface change to &lt;devfs_mk_symlink&gt;.</div><div class='del'>-               Created &lt;devfs_symlink&gt; to support symlink(2).</div><div class='del'>-  v0.9</div><div class='del'>-    19980123   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Added check to &lt;devfs_fill_file&gt; to check inode is in devfs.</div><div class='del'>-	       Added optional traversal of symlinks.</div><div class='del'>-  v0.10</div><div class='del'>-    19980124   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;devfs_get_flags&gt; and &lt;devfs_set_flags&gt;.</div><div class='del'>-  v0.11</div><div class='del'>-    19980125   C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-               Created &lt;devfs_find_handle&gt;.</div><div class='del'>-    19980125   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Allow removal of symlinks.</div><div class='del'>-  v0.12</div><div class='del'>-    19980125   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;devfs_set_symlink_destination&gt;.</div><div class='del'>-    19980126   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Moved DEVFS_SUPER_MAGIC into header file.</div><div class='del'>-	       Added DEVFS_FL_HIDE flag.</div><div class='del'>-	       Created &lt;devfs_get_maj_min&gt;.</div><div class='del'>-	       Created &lt;devfs_get_handle_from_inode&gt;.</div><div class='del'>-	       Fixed minor bug in &lt;find_by_dev&gt;.</div><div class='del'>-    19980127   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Changed interface to &lt;find_by_dev&gt;, &lt;find_entry&gt;,</div><div class='del'>-	       &lt;devfs_unregister&gt;, &lt;devfs_fill_file&gt; and &lt;devfs_find_handle&gt;.</div><div class='del'>-	       Fixed inode times when symlink created with symlink(2).</div><div class='del'>-  v0.13</div><div class='del'>-    19980129   C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>-               Exported &lt;devfs_set_symlink_destination&gt;, &lt;devfs_get_maj_min&gt;</div><div class='del'>-	       and &lt;devfs_get_handle_from_inode&gt;.</div><div class='del'>-    19980129   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_unlink&gt; to support unlink(2).</div><div class='del'>-  v0.14</div><div class='del'>-    19980129   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed kerneld support for entries in devfs subdirectories.</div><div class='del'>-    19980130   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Bugfixes in &lt;call_kerneld&gt;.</div><div class='del'>-  v0.15</div><div class='del'>-    19980207   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Call kerneld when looking up unregistered entries.</div><div class='del'>-  v0.16</div><div class='del'>-    19980326   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Modified interface to &lt;devfs_find_handle&gt; for symlink traversal.</div><div class='del'>-  v0.17</div><div class='del'>-    19980331   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed persistence bug with device numbers for manually created</div><div class='del'>-	       device files.</div><div class='del'>-	       Fixed problem with recreating symlinks with different content.</div><div class='del'>-  v0.18</div><div class='del'>-    19980401   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Changed to CONFIG_KMOD.</div><div class='del'>-	       Hide entries which are manually unlinked.</div><div class='del'>-	       Always invalidate devfs dentry cache when registering entries.</div><div class='del'>-	       Created &lt;devfs_rmdir&gt; to support rmdir(2).</div><div class='del'>-	       Ensure directories created by &lt;devfs_mk_dir&gt; are visible.</div><div class='del'>-  v0.19</div><div class='del'>-    19980402   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Invalidate devfs dentry cache when making directories.</div><div class='del'>-	       Invalidate devfs dentry cache when removing entries.</div><div class='del'>-	       Fixed persistence bug with fifos.</div><div class='del'>-  v0.20</div><div class='del'>-    19980421   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Print process command when debugging kerneld/kmod.</div><div class='del'>-	       Added debugging for register/unregister/change operations.</div><div class='del'>-    19980422   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added "devfs=" boot options.</div><div class='del'>-  v0.21</div><div class='del'>-    19980426   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       No longer lock/unlock superblock in &lt;devfs_put_super&gt;.</div><div class='del'>-	       Drop negative dentries when they are released.</div><div class='del'>-	       Manage dcache more efficiently.</div><div class='del'>-  v0.22</div><div class='del'>-    19980427   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added DEVFS_FL_AUTO_DEVNUM flag.</div><div class='del'>-  v0.23</div><div class='del'>-    19980430   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       No longer set unnecessary methods.</div><div class='del'>-  v0.24</div><div class='del'>-    19980504   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added PID display to &lt;call_kerneld&gt; debugging message.</div><div class='del'>-	       Added "after" debugging message to &lt;call_kerneld&gt;.</div><div class='del'>-    19980519   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added "diread" and "diwrite" boot options.</div><div class='del'>-    19980520   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed persistence problem with permissions.</div><div class='del'>-  v0.25</div><div class='del'>-    19980602   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Support legacy device nodes.</div><div class='del'>-	       Fixed bug where recreated inodes were hidden.</div><div class='del'>-  v0.26</div><div class='del'>-    19980602   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Improved debugging in &lt;get_vfs_inode&gt;.</div><div class='del'>-    19980607   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       No longer free old dentries in &lt;devfs_mk_dir&gt;.</div><div class='del'>-	       Free all dentries for a given entry when deleting inodes.</div><div class='del'>-  v0.27</div><div class='del'>-    19980627   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Limit auto-device numbering to majors 128 to 239.</div><div class='del'>-  v0.28</div><div class='del'>-    19980629   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed inode times persistence problem.</div><div class='del'>-  v0.29</div><div class='del'>-    19980704   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed spelling in &lt;devfs_readlink&gt; debug.</div><div class='del'>-	       Fixed bug in &lt;devfs_setup&gt; parsing "dilookup".</div><div class='del'>-  v0.30</div><div class='del'>-    19980705   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed devfs inode leak when manually recreating inodes.</div><div class='del'>-	       Fixed permission persistence problem when recreating inodes.</div><div class='del'>-  v0.31</div><div class='del'>-    19980727   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed harmless "unused variable" compiler warning.</div><div class='del'>-	       Fixed modes for manually recreated device nodes.</div><div class='del'>-  v0.32</div><div class='del'>-    19980728   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added NULL devfs inode warning in &lt;devfs_read_inode&gt;.</div><div class='del'>-	       Force all inode nlink values to 1.</div><div class='del'>-  v0.33</div><div class='del'>-    19980730   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added "dimknod" boot option.</div><div class='del'>-	       Set inode nlink to 0 when freeing dentries.</div><div class='del'>-	       Fixed modes for manually recreated symlinks.</div><div class='del'>-  v0.34</div><div class='del'>-    19980802   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bugs in recreated directories and symlinks.</div><div class='del'>-  v0.35</div><div class='del'>-    19980806   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bugs in recreated device nodes.</div><div class='del'>-    19980807   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bug in currently unused &lt;devfs_get_handle_from_inode&gt;.</div><div class='del'>-	       Defined new &lt;devfs_handle_t&gt; type.</div><div class='del'>-	       Improved debugging when getting entries.</div><div class='del'>-	       Fixed bug where directories could be emptied.</div><div class='del'>-  v0.36</div><div class='del'>-    19980809   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Replaced dummy .epoch inode with .devfsd character device.</div><div class='del'>-    19980810   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Implemented devfsd protocol revision 0.</div><div class='del'>-  v0.37</div><div class='del'>-    19980819   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added soothing message to warning in &lt;devfs_d_iput&gt;.</div><div class='del'>-  v0.38</div><div class='del'>-    19980829   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Use GCC extensions for structure initialisations.</div><div class='del'>-	       Implemented async open notification.</div><div class='del'>-	       Incremented devfsd protocol revision to 1.</div><div class='del'>-  v0.39</div><div class='del'>-    19980908   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Moved async open notification to end of &lt;devfs_open&gt;.</div><div class='del'>-  v0.40</div><div class='del'>-    19980910   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Prepended "/dev/" to module load request.</div><div class='del'>-	       Renamed &lt;call_kerneld&gt; to &lt;call_kmod&gt;.</div><div class='del'>-  v0.41</div><div class='del'>-    19980910   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed typo "AYSNC" -&gt; "ASYNC".</div><div class='del'>-  v0.42</div><div class='del'>-    19980910   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added open flag for files.</div><div class='del'>-  v0.43</div><div class='del'>-    19980927   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Set i_blocks=0 and i_blksize=1024 in &lt;devfs_read_inode&gt;.</div><div class='del'>-  v0.44</div><div class='del'>-    19981005   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added test for empty &lt;&lt;name&gt;&gt; in &lt;devfs_find_handle&gt;.</div><div class='del'>-	       Renamed &lt;generate_path&gt; to &lt;devfs_generate_path&gt; and published.</div><div class='del'>-  v0.45</div><div class='del'>-    19981006   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_get_fops&gt;.</div><div class='del'>-  v0.46</div><div class='del'>-    19981007   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Limit auto-device numbering to majors 144 to 239.</div><div class='del'>-  v0.47</div><div class='del'>-    19981010   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Updated &lt;devfs_follow_link&gt; for VFS change in 2.1.125.</div><div class='del'>-  v0.48</div><div class='del'>-    19981022   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created DEVFS_ FL_COMPAT flag.</div><div class='del'>-  v0.49</div><div class='del'>-    19981023   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created "nocompat" boot option.</div><div class='del'>-  v0.50</div><div class='del'>-    19981025   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Replaced "mount" boot option with "nomount".</div><div class='del'>-  v0.51</div><div class='del'>-    19981110   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created "only" boot option.</div><div class='del'>-  v0.52</div><div class='del'>-    19981112   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added DEVFS_FL_REMOVABLE flag.</div><div class='del'>-  v0.53</div><div class='del'>-    19981114   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Only call &lt;scan_dir_for_removable&gt; on first call to</div><div class='del'>-	       &lt;devfs_readdir&gt;.</div><div class='del'>-  v0.54</div><div class='del'>-    19981205   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Updated &lt;devfs_rmdir&gt; for VFS change in 2.1.131.</div><div class='del'>-  v0.55</div><div class='del'>-    19981218   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_mk_compat&gt;.</div><div class='del'>-    19981220   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Check for partitions on removable media in &lt;devfs_lookup&gt;.</div><div class='del'>-  v0.56</div><div class='del'>-    19990118   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added support for registering regular files.</div><div class='del'>-	       Created &lt;devfs_set_file_size&gt;.</div><div class='del'>-	       Update devfs inodes from entries if not changed through FS.</div><div class='del'>-  v0.57</div><div class='del'>-    19990124   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed &lt;devfs_fill_file&gt; to only initialise temporary inodes.</div><div class='del'>-	       Trap for NULL fops in &lt;devfs_register&gt;.</div><div class='del'>-	       Return -ENODEV in &lt;devfs_fill_file&gt; for non-driver inodes.</div><div class='del'>-  v0.58</div><div class='del'>-    19990126   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Switched from PATH_MAX to DEVFS_PATHLEN.</div><div class='del'>-  v0.59</div><div class='del'>-    19990127   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created "nottycompat" boot option.</div><div class='del'>-  v0.60</div><div class='del'>-    19990318   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed &lt;devfsd_read&gt; to not overrun event buffer.</div><div class='del'>-  v0.61</div><div class='del'>-    19990329   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_auto_unregister&gt;.</div><div class='del'>-  v0.62</div><div class='del'>-    19990330   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Don't return unregistred entries in &lt;devfs_find_handle&gt;.</div><div class='del'>-	       Panic in &lt;devfs_unregister&gt; if entry unregistered.</div><div class='del'>-    19990401   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Don't panic in &lt;devfs_auto_unregister&gt; for duplicates.</div><div class='del'>-  v0.63</div><div class='del'>-    19990402   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Don't unregister already unregistered entries in &lt;unregister&gt;.</div><div class='del'>-  v0.64</div><div class='del'>-    19990510   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Disable warning messages when unable to read partition table for</div><div class='del'>-	       removable media.</div><div class='del'>-  v0.65</div><div class='del'>-    19990512   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Updated &lt;devfs_lookup&gt; for VFS change in 2.3.1-pre1.</div><div class='del'>-	       Created "oops-on-panic" boot option.</div><div class='del'>-	       Improved debugging in &lt;devfs_register&gt; and &lt;devfs_unregister&gt;.</div><div class='del'>-  v0.66</div><div class='del'>-    19990519   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added documentation for some functions.</div><div class='del'>-    19990525   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed "oops-on-panic" boot option: now always Oops.</div><div class='del'>-  v0.67</div><div class='del'>-    19990531   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Improved debugging in &lt;devfs_register&gt;.</div><div class='del'>-  v0.68</div><div class='del'>-    19990604   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added "diunlink" and "nokmod" boot options.</div><div class='del'>-	       Removed superfluous warning message in &lt;devfs_d_iput&gt;.</div><div class='del'>-  v0.69</div><div class='del'>-    19990611   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Took account of change to &lt;d_alloc_root&gt;.</div><div class='del'>-  v0.70</div><div class='del'>-    19990614   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created separate event queue for each mounted devfs.</div><div class='del'>-	       Removed &lt;devfs_invalidate_dcache&gt;.</div><div class='del'>-	       Created new ioctl()s.</div><div class='del'>-	       Incremented devfsd protocol revision to 3.</div><div class='del'>-	       Fixed bug when re-creating directories: contents were lost.</div><div class='del'>-	       Block access to inodes until devfsd updates permissions.</div><div class='del'>-    19990615   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Support 2.2.x kernels.</div><div class='del'>-  v0.71</div><div class='del'>-    19990623   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Switched to sending process uid/gid to devfsd.</div><div class='del'>-	       Renamed &lt;call_kmod&gt; to &lt;try_modload&gt;.</div><div class='del'>-	       Added DEVFSD_NOTIFY_LOOKUP event.</div><div class='del'>-    19990624   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added DEVFSD_NOTIFY_CHANGE event.</div><div class='del'>-	       Incremented devfsd protocol revision to 4.</div><div class='del'>-  v0.72</div><div class='del'>-    19990713   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Return EISDIR rather than EINVAL for read(2) on directories.</div><div class='del'>-  v0.73</div><div class='del'>-    19990809   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Changed &lt;devfs_setup&gt; to new __init scheme.</div><div class='del'>-  v0.74</div><div class='del'>-    19990901   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Changed remaining function declarations to new __init scheme.</div><div class='del'>-  v0.75</div><div class='del'>-    19991013   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_get_info&gt;, &lt;devfs_set_info&gt;,</div><div class='del'>-	       &lt;devfs_get_first_child&gt; and &lt;devfs_get_next_sibling&gt;.</div><div class='del'>-	       Added &lt;&lt;dir&gt;&gt; parameter to &lt;devfs_register&gt;, &lt;devfs_mk_compat&gt;,</div><div class='del'>-	       &lt;devfs_mk_dir&gt; and &lt;devfs_find_handle&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.76</div><div class='del'>-    19991017   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Allow multiple unregistrations.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.77</div><div class='del'>-    19991026   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added major and minor number to devfsd protocol.</div><div class='del'>-	       Incremented devfsd protocol revision to 5.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.78</div><div class='del'>-    19991030   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Support info pointer for all devfs entry types.</div><div class='del'>-	       Added &lt;&lt;info&gt;&gt; parameter to &lt;devfs_mk_dir&gt; and</div><div class='del'>-	       &lt;devfs_mk_symlink&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.79</div><div class='del'>-    19991031   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Support "../" when searching devfs namespace.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.80</div><div class='del'>-    19991101   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_get_unregister_slave&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.81</div><div class='del'>-    19991103   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Exported &lt;devfs_get_parent&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.82</div><div class='del'>-    19991104   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Removed unused &lt;devfs_set_symlink_destination&gt;.</div><div class='del'>-    19991105   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Do not hide entries from devfsd or children.</div><div class='del'>-	       Removed DEVFS_ FL_TTY_COMPAT flag.</div><div class='del'>-	       Removed "nottycompat" boot option.</div><div class='del'>-	       Removed &lt;devfs_mk_compat&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.83</div><div class='del'>-    19991107   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added DEVFS_FL_WAIT flag.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.84</div><div class='del'>-    19991107   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Support new "disc" naming scheme in &lt;get_removable_partition&gt;.</div><div class='del'>-	       Allow NULL fops in &lt;devfs_register&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.85</div><div class='del'>-    19991110   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fall back to major table if NULL fops given to &lt;devfs_register&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.86</div><div class='del'>-    19991204   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Support fifos when unregistering.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.87</div><div class='del'>-    19991209   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed obsolete DEVFS_ FL_COMPAT and DEVFS_ FL_TOLERANT flags.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.88</div><div class='del'>-    19991214   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed kmod support.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.89</div><div class='del'>-    19991216   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Improved debugging in &lt;get_vfs_inode&gt;.</div><div class='del'>-	       Ensure dentries created by devfsd will be cleaned up.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.90</div><div class='del'>-    19991223   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_get_name&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.91</div><div class='del'>-    20000203   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Ported to kernel 2.3.42.</div><div class='del'>-	       Removed &lt;devfs_fill_file&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.92</div><div class='del'>-    20000306   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added DEVFS_ FL_NO_PERSISTENCE flag.</div><div class='del'>-	       Removed unnecessary call to &lt;update_devfs_inode_from_entry&gt; in</div><div class='del'>-	       &lt;devfs_readdir&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.93</div><div class='del'>-    20000413   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Set inode-&gt;i_size to correct size for symlinks.</div><div class='del'>-    20000414   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Only give lookup() method to directories to comply with new VFS</div><div class='del'>-	       assumptions.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-    20000415   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Remove unnecessary tests in symlink methods.</div><div class='del'>-	       Don't kill existing block ops in &lt;devfs_read_inode&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.94</div><div class='del'>-    20000424   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Don't create missing directories in &lt;devfs_find_handle&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.95</div><div class='del'>-    20000430   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added CONFIG_DEVFS_MOUNT.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.96</div><div class='del'>-    20000608   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Disabled multi-mount capability (use VFS bindings instead).</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.97</div><div class='del'>-    20000610   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Switched to FS_SINGLE to disable multi-mounts.</div><div class='del'>-    20000612   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed module support.</div><div class='del'>-	       Removed multi-mount code.</div><div class='del'>-	       Removed compatibility macros: VFS has changed too much.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.98</div><div class='del'>-    20000614   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Merged devfs inode into devfs entry.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.99</div><div class='del'>-    20000619   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed dead code in &lt;devfs_register&gt; which used to call</div><div class='del'>-	       &lt;free_dentries&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.100</div><div class='del'>-    20000621   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Changed interface to &lt;devfs_register&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.101</div><div class='del'>-    20000622   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Simplified interface to &lt;devfs_mk_symlink&gt; and &lt;devfs_mk_dir&gt;.</div><div class='del'>-	       Simplified interface to &lt;devfs_find_handle&gt;.</div><div class='del'>-	       Work sponsored by SGI.</div><div class='del'>-  v0.102</div><div class='del'>-    20010519   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Ensure &lt;devfs_generate_path&gt; terminates string for root entry.</div><div class='del'>-	       Exported &lt;devfs_get_name&gt; to modules.</div><div class='del'>-    20010520   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Make &lt;devfs_mk_symlink&gt; send events to devfsd.</div><div class='del'>-	       Cleaned up option processing in &lt;devfs_setup&gt;.</div><div class='del'>-    20010521   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bugs in handling symlinks: could leak or cause Oops.</div><div class='del'>-    20010522   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Cleaned up directory handling by separating fops.</div><div class='del'>-  v0.103</div><div class='del'>-    20010601   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed handling of inverted options in &lt;devfs_setup&gt;.</div><div class='del'>-  v0.104</div><div class='del'>-    20010604   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Adjusted &lt;try_modload&gt; to account for &lt;devfs_generate_path&gt; fix.</div><div class='del'>-  v0.105</div><div class='del'>-    20010617   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Answered question posed by Al Viro and removed his comments.</div><div class='del'>-	       Moved setting of registered flag after other fields are changed.</div><div class='del'>-	       Fixed race between &lt;devfsd_close&gt; and &lt;devfsd_notify_one&gt;.</div><div class='del'>-	       Global VFS changes added bogus BKL to &lt;devfsd_close&gt;: removed.</div><div class='del'>-	       Widened locking in &lt;devfs_readlink&gt; and &lt;devfs_follow_link&gt;.</div><div class='del'>-	       Replaced &lt;devfsd_read&gt; stack usage with &lt;devfsd_ioctl&gt; kmalloc.</div><div class='del'>-	       Simplified locking in &lt;devfsd_ioctl&gt; and fixed memory leak.</div><div class='del'>-  v0.106</div><div class='del'>-    20010709   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed broken devnum allocation and use &lt;devfs_alloc_devnum&gt;.</div><div class='del'>-	       Fixed old devnum leak by calling new &lt;devfs_dealloc_devnum&gt;.</div><div class='del'>-  v0.107</div><div class='del'>-    20010712   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bug in &lt;devfs_setup&gt; which could hang boot process.</div><div class='del'>-  v0.108</div><div class='del'>-    20010730   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added DEVFSD_NOTIFY_DELETE event.</div><div class='del'>-    20010801   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed #include &lt;asm/segment.h&gt;.</div><div class='del'>-  v0.109</div><div class='del'>-    20010807   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed inode table races by removing it and using</div><div class='del'>-	       inode-&gt;u.generic_ip instead.</div><div class='del'>-	       Moved &lt;devfs_read_inode&gt; into &lt;get_vfs_inode&gt;.</div><div class='del'>-	       Moved &lt;devfs_write_inode&gt; into &lt;devfs_notify_change&gt;.</div><div class='del'>-  v0.110</div><div class='del'>-    20010808   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed race in &lt;devfs_do_symlink&gt; for uni-processor.</div><div class='del'>-  v0.111</div><div class='del'>-    20010818   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed remnant of multi-mount support in &lt;devfs_mknod&gt;.</div><div class='del'>-               Removed unused DEVFS_FL_SHOW_UNREG flag.</div><div class='del'>-  v0.112</div><div class='del'>-    20010820   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed nlink field from struct devfs_inode.</div><div class='del'>-  v0.113</div><div class='del'>-    20010823   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Replaced BKL with global rwsem to protect symlink data (quick</div><div class='del'>-	       and dirty hack).</div><div class='del'>-  v0.114</div><div class='del'>-    20010827   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Replaced global rwsem for symlink with per-link refcount.</div><div class='del'>-  v0.115</div><div class='del'>-    20010919   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Set inode-&gt;i_mapping-&gt;a_ops for block nodes in &lt;get_vfs_inode&gt;.</div><div class='del'>-  v0.116</div><div class='del'>-    20011008   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed overrun in &lt;devfs_link&gt; by removing function (not needed).</div><div class='del'>-    20011009   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed buffer underrun in &lt;try_modload&gt;.</div><div class='del'>-    20011029   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed race in &lt;devfsd_ioctl&gt; when setting event mask.</div><div class='del'>-    20011114   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       First release of new locking code.</div><div class='del'>-  v1.0</div><div class='del'>-    20011117   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Discard temporary buffer, now use "%s" for dentry names.</div><div class='del'>-    20011118   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Don't generate path in &lt;try_modload&gt;: use fake entry instead.</div><div class='del'>-	       Use "existing" directory in &lt;_devfs_make_parent_for_leaf&gt;.</div><div class='del'>-    20011122   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Use slab cache rather than fixed buffer for devfsd events.</div><div class='del'>-  v1.1</div><div class='del'>-    20011125   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Send DEVFSD_NOTIFY_REGISTERED events in &lt;devfs_mk_dir&gt;.</div><div class='del'>-    20011127   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed locking bug in &lt;devfs_d_revalidate_wait&gt; due to typo.</div><div class='del'>-	       Do not send CREATE, CHANGE, ASYNC_OPEN or DELETE events from</div><div class='del'>-	       devfsd or children.</div><div class='del'>-  v1.2</div><div class='del'>-    20011202   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bug in &lt;devfsd_read&gt;: was dereferencing freed pointer.</div><div class='del'>-  v1.3</div><div class='del'>-    20011203   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed bug in &lt;devfsd_close&gt;: was dereferencing freed pointer.</div><div class='del'>-	       Added process group check for devfsd privileges.</div><div class='del'>-  v1.4</div><div class='del'>-    20011204   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Use SLAB_ATOMIC in &lt;devfsd_notify_de&gt; from &lt;devfs_d_delete&gt;.</div><div class='del'>-  v1.5</div><div class='del'>-    20011211   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Return old entry in &lt;devfs_mk_dir&gt; for 2.4.x kernels.</div><div class='del'>-    20011212   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Increment refcount on module in &lt;check_disc_changed&gt;.</div><div class='del'>-    20011215   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_get_handle&gt; and exported &lt;devfs_put&gt;.</div><div class='del'>-	       Increment refcount on module in &lt;devfs_get_ops&gt;.</div><div class='del'>-	       Created &lt;devfs_put_ops&gt;.</div><div class='del'>-  v1.6</div><div class='del'>-    20011216   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added poisoning to &lt;devfs_put&gt;.</div><div class='del'>-	       Improved debugging messages.</div><div class='del'>-  v1.7</div><div class='del'>-    20011221   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Corrected (made useful) debugging message in &lt;unregister&gt;.</div><div class='del'>-	       Moved &lt;kmem_cache_create&gt; in &lt;mount_devfs_fs&gt; to &lt;init_devfs_fs&gt;</div><div class='del'>-    20011224   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added magic number to guard against scribbling drivers.</div><div class='del'>-    20011226   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Only return old entry in &lt;devfs_mk_dir&gt; if a directory.</div><div class='del'>-	       Defined macros for error and debug messages.</div><div class='del'>-  v1.8</div><div class='del'>-    20020113   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed (rare, old) race in &lt;devfs_lookup&gt;.</div><div class='del'>-  v1.9</div><div class='del'>-    20020120   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed deadlock bug in &lt;devfs_d_revalidate_wait&gt;.</div><div class='del'>-	       Tag VFS deletable in &lt;devfs_mk_symlink&gt; if handle ignored.</div><div class='del'>-  v1.10</div><div class='del'>-    20020129   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added KERN_* to remaining messages.</div><div class='del'>-	       Cleaned up declaration of &lt;stat_read&gt;.</div><div class='del'>-  v1.11</div><div class='del'>-    20020219   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Changed &lt;devfs_rmdir&gt; to allow later additions if not yet empty.</div><div class='del'>-  v1.12</div><div class='del'>-    20020406   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed silently introduced calls to lock_kernel() and</div><div class='del'>-	       unlock_kernel() due to recent VFS locking changes. BKL isn't</div><div class='del'>-	       required in devfs.</div><div class='del'>-  v1.13</div><div class='del'>-    20020428   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed 2.4.x compatibility code.</div><div class='del'>-  v1.14</div><div class='del'>-    20020510   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Added BKL to &lt;devfs_open&gt; because drivers still need it.</div><div class='del'>-  v1.15</div><div class='del'>-    20020512   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Protected &lt;scan_dir_for_removable&gt; and &lt;get_removable_partition&gt;</div><div class='del'>-	       from changing directory contents.</div><div class='del'>-  v1.16</div><div class='del'>-    20020514   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Minor cleanup of &lt;scan_dir_for_removable&gt;.</div><div class='del'>-  v1.17</div><div class='del'>-    20020721   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Switched to ISO C structure field initialisers.</div><div class='del'>-	       Switch to set_current_state() and move before add_wait_queue().</div><div class='del'>-    20020722   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed devfs entry leak in &lt;devfs_readdir&gt; when *readdir fails.</div><div class='del'>-  v1.18</div><div class='del'>-    20020725   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Created &lt;devfs_find_and_unregister&gt;.</div><div class='del'>-  v1.19</div><div class='del'>-    20020728   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed deprecated &lt;devfs_find_handle&gt;.</div><div class='del'>-  v1.20</div><div class='del'>-    20020820   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Fixed module unload race in &lt;devfs_open&gt;.</div><div class='del'>-  v1.21</div><div class='del'>-    20021013   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-	       Removed DEVFS_ FL_AUTO_OWNER.</div><div class='del'>-	       Switched lingering structure field initialiser to ISO C.</div><div class='del'>-	       Added locking when updating FCB flags.</div><div class='del'>-  v1.22</div><div class='del'>-*/</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/smp.h&gt;</div><div class='del'>-#include &lt;linux/rwsem.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/processor.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='del'>-</div><div class='del'>-#define DEVFS_VERSION            "2004-01-31"</div><div class='del'>-</div><div class='del'>-#define DEVFS_NAME "devfs"</div><div class='del'>-</div><div class='del'>-#define FIRST_INODE 1</div><div class='del'>-</div><div class='del'>-#define STRING_LENGTH 256</div><div class='del'>-#define FAKE_BLOCK_SIZE 1024</div><div class='del'>-#define POISON_PTR ( *(void **) poison_array )</div><div class='del'>-#define MAGIC_VALUE 0x327db823</div><div class='del'>-</div><div class='del'>-#ifndef TRUE</div><div class='del'>-#  define TRUE 1</div><div class='del'>-#  define FALSE 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define MODE_DIR (S_IFDIR | S_IWUSR | S_IRUGO | S_IXUGO)</div><div class='del'>-</div><div class='del'>-#define DEBUG_NONE         0x0000000</div><div class='del'>-#define DEBUG_MODULE_LOAD  0x0000001</div><div class='del'>-#define DEBUG_REGISTER     0x0000002</div><div class='del'>-#define DEBUG_UNREGISTER   0x0000004</div><div class='del'>-#define DEBUG_FREE         0x0000008</div><div class='del'>-#define DEBUG_SET_FLAGS    0x0000010</div><div class='del'>-#define DEBUG_S_READ       0x0000100	/*  Break  */</div><div class='del'>-#define DEBUG_I_LOOKUP     0x0001000	/*  Break  */</div><div class='del'>-#define DEBUG_I_CREATE     0x0002000</div><div class='del'>-#define DEBUG_I_GET        0x0004000</div><div class='del'>-#define DEBUG_I_CHANGE     0x0008000</div><div class='del'>-#define DEBUG_I_UNLINK     0x0010000</div><div class='del'>-#define DEBUG_I_RLINK      0x0020000</div><div class='del'>-#define DEBUG_I_FLINK      0x0040000</div><div class='del'>-#define DEBUG_I_MKNOD      0x0080000</div><div class='del'>-#define DEBUG_F_READDIR    0x0100000	/*  Break  */</div><div class='del'>-#define DEBUG_D_DELETE     0x1000000	/*  Break  */</div><div class='del'>-#define DEBUG_D_RELEASE    0x2000000</div><div class='del'>-#define DEBUG_D_IPUT       0x4000000</div><div class='del'>-#define DEBUG_ALL          0xfffffff</div><div class='del'>-#define DEBUG_DISABLED     DEBUG_NONE</div><div class='del'>-</div><div class='del'>-#define OPTION_NONE             0x00</div><div class='del'>-#define OPTION_MOUNT            0x01</div><div class='del'>-</div><div class='del'>-#define PRINTK(format, args...) \</div><div class='del'>-   {printk (KERN_ERR "%s" format, __FUNCTION__ , ## args);}</div><div class='del'>-</div><div class='del'>-#define OOPS(format, args...) \</div><div class='del'>-   {printk (KERN_CRIT "%s" format, __FUNCTION__ , ## args); \</div><div class='del'>-    printk ("Forcing Oops\n"); \</div><div class='del'>-    BUG();}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-#  define VERIFY_ENTRY(de) \</div><div class='del'>-   {if ((de) &amp;&amp; (de)-&gt;magic_number != MAGIC_VALUE) \</div><div class='del'>-        OOPS ("(%p): bad magic value: %x\n", (de), (de)-&gt;magic_number);}</div><div class='del'>-#  define WRITE_ENTRY_MAGIC(de,magic) (de)-&gt;magic_number = (magic)</div><div class='del'>-#  define DPRINTK(flag, format, args...) \</div><div class='del'>-   {if (devfs_debug &amp; flag) \</div><div class='del'>-	printk (KERN_INFO "%s" format, __FUNCTION__ , ## args);}</div><div class='del'>-#else</div><div class='del'>-#  define VERIFY_ENTRY(de)</div><div class='del'>-#  define WRITE_ENTRY_MAGIC(de,magic)</div><div class='del'>-#  define DPRINTK(flag, format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct devfs_entry *devfs_handle_t;</div><div class='del'>-</div><div class='del'>-struct directory_type {</div><div class='del'>-	rwlock_t lock;		/*  Lock for searching(R)/updating(W)   */</div><div class='del'>-	struct devfs_entry *first;</div><div class='del'>-	struct devfs_entry *last;</div><div class='del'>-	unsigned char no_more_additions:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct symlink_type {</div><div class='del'>-	unsigned int length;	/*  Not including the NULL-termimator       */</div><div class='del'>-	char *linkname;		/*  This is NULL-terminated                 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct devfs_inode {		/*  This structure is for "persistent" inode storage  */</div><div class='del'>-	struct dentry *dentry;</div><div class='del'>-	struct timespec atime;</div><div class='del'>-	struct timespec mtime;</div><div class='del'>-	struct timespec ctime;</div><div class='del'>-	unsigned int ino;	/*  Inode number as seen in the VFS         */</div><div class='del'>-	uid_t uid;</div><div class='del'>-	gid_t gid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct devfs_entry {</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	unsigned int magic_number;</div><div class='del'>-#endif</div><div class='del'>-	void *info;</div><div class='del'>-	atomic_t refcount;	/*  When this drops to zero, it's unused    */</div><div class='del'>-	union {</div><div class='del'>-		struct directory_type dir;</div><div class='del'>-		dev_t dev;</div><div class='del'>-		struct symlink_type symlink;</div><div class='del'>-		const char *name;	/*  Only used for (mode == 0)               */</div><div class='del'>-	} u;</div><div class='del'>-	struct devfs_entry *prev;	/*  Previous entry in the parent directory  */</div><div class='del'>-	struct devfs_entry *next;	/*  Next entry in the parent directory      */</div><div class='del'>-	struct devfs_entry *parent;	/*  The parent directory                    */</div><div class='del'>-	struct devfs_inode inode;</div><div class='del'>-	umode_t mode;</div><div class='del'>-	unsigned short namelen;	/*  I think 64k+ filenames are a way off... */</div><div class='del'>-	unsigned char vfs:1;	/*  Whether the VFS may delete the entry   */</div><div class='del'>-	char name[1];		/*  This is just a dummy: the allocated array</div><div class='del'>-				   is bigger. This is NULL-terminated      */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*  The root of the device tree  */</div><div class='del'>-static struct devfs_entry *root_entry;</div><div class='del'>-</div><div class='del'>-struct devfsd_buf_entry {</div><div class='del'>-	struct devfs_entry *de;	/*  The name is generated with this         */</div><div class='del'>-	unsigned short type;	/*  The type of event                       */</div><div class='del'>-	umode_t mode;</div><div class='del'>-	uid_t uid;</div><div class='del'>-	gid_t gid;</div><div class='del'>-	struct devfsd_buf_entry *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct fs_info {		/*  This structure is for the mounted devfs  */</div><div class='del'>-	struct super_block *sb;</div><div class='del'>-	spinlock_t devfsd_buffer_lock;	/*  Lock when inserting/deleting events  */</div><div class='del'>-	struct devfsd_buf_entry *devfsd_first_event;</div><div class='del'>-	struct devfsd_buf_entry *devfsd_last_event;</div><div class='del'>-	volatile int devfsd_sleeping;</div><div class='del'>-	volatile struct task_struct *devfsd_task;</div><div class='del'>-	volatile pid_t devfsd_pgrp;</div><div class='del'>-	volatile struct file *devfsd_file;</div><div class='del'>-	struct devfsd_notify_struct *devfsd_info;</div><div class='del'>-	volatile unsigned long devfsd_event_mask;</div><div class='del'>-	atomic_t devfsd_overrun_count;</div><div class='del'>-	wait_queue_head_t devfsd_wait_queue;	/*  Wake devfsd on input       */</div><div class='del'>-	wait_queue_head_t revalidate_wait_queue;	/*  Wake when devfsd sleeps    */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct fs_info fs_info = {.devfsd_buffer_lock = SPIN_LOCK_UNLOCKED };</div><div class='del'>-static kmem_cache_t *devfsd_buf_cache;</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-static unsigned int devfs_debug_init __initdata = DEBUG_NONE;</div><div class='del'>-static unsigned int devfs_debug = DEBUG_NONE;</div><div class='del'>-static DEFINE_SPINLOCK(stat_lock);</div><div class='del'>-static unsigned int stat_num_entries;</div><div class='del'>-static unsigned int stat_num_bytes;</div><div class='del'>-#endif</div><div class='del'>-static unsigned char poison_array[8] =</div><div class='del'>-    { 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a };</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEVFS_MOUNT</div><div class='del'>-static unsigned int boot_options = OPTION_MOUNT;</div><div class='del'>-#else</div><div class='del'>-static unsigned int boot_options = OPTION_NONE;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*  Forward function declarations  */</div><div class='del'>-static devfs_handle_t _devfs_walk_path(struct devfs_entry *dir,</div><div class='del'>-				       const char *name, int namelen,</div><div class='del'>-				       int traverse_symlink);</div><div class='del'>-static ssize_t devfsd_read(struct file *file, char __user *buf, size_t len,</div><div class='del'>-			   loff_t * ppos);</div><div class='del'>-static int devfsd_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			unsigned int cmd, unsigned long arg);</div><div class='del'>-static int devfsd_close(struct inode *inode, struct file *file);</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-static ssize_t stat_read(struct file *file, char __user *buf, size_t len,</div><div class='del'>-			 loff_t * ppos);</div><div class='del'>-static const struct file_operations stat_fops = {</div><div class='del'>-	.open = nonseekable_open,</div><div class='del'>-	.read = stat_read,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*  Devfs daemon file operations  */</div><div class='del'>-static const struct file_operations devfsd_fops = {</div><div class='del'>-	.open = nonseekable_open,</div><div class='del'>-	.read = devfsd_read,</div><div class='del'>-	.ioctl = devfsd_ioctl,</div><div class='del'>-	.release = devfsd_close,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*  Support functions follow  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_get - Get a reference to a devfs entry.</div><div class='del'>- *	@de:  The devfs entry.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *devfs_get(struct devfs_entry *de)</div><div class='del'>-{</div><div class='del'>-	VERIFY_ENTRY(de);</div><div class='del'>-	if (de)</div><div class='del'>-		atomic_inc(&amp;de-&gt;refcount);</div><div class='del'>-	return de;</div><div class='del'>-}				/*  End Function devfs_get  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_put - Put (release) a reference to a devfs entry.</div><div class='del'>- *	@de:  The handle to the devfs entry.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void devfs_put(devfs_handle_t de)</div><div class='del'>-{</div><div class='del'>-	if (!de)</div><div class='del'>-		return;</div><div class='del'>-	VERIFY_ENTRY(de);</div><div class='del'>-	if (de-&gt;info == POISON_PTR)</div><div class='del'>-		OOPS("(%p): poisoned pointer\n", de);</div><div class='del'>-	if (!atomic_dec_and_test(&amp;de-&gt;refcount))</div><div class='del'>-		return;</div><div class='del'>-	if (de == root_entry)</div><div class='del'>-		OOPS("(%p): root entry being freed\n", de);</div><div class='del'>-	DPRINTK(DEBUG_FREE, "(%s): de: %p, parent: %p \"%s\"\n",</div><div class='del'>-		de-&gt;name, de, de-&gt;parent,</div><div class='del'>-		de-&gt;parent ? de-&gt;parent-&gt;name : "no parent");</div><div class='del'>-	if (S_ISLNK(de-&gt;mode))</div><div class='del'>-		kfree(de-&gt;u.symlink.linkname);</div><div class='del'>-	WRITE_ENTRY_MAGIC(de, 0);</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	spin_lock(&amp;stat_lock);</div><div class='del'>-	--stat_num_entries;</div><div class='del'>-	stat_num_bytes -= sizeof *de + de-&gt;namelen;</div><div class='del'>-	if (S_ISLNK(de-&gt;mode))</div><div class='del'>-		stat_num_bytes -= de-&gt;u.symlink.length + 1;</div><div class='del'>-	spin_unlock(&amp;stat_lock);</div><div class='del'>-#endif</div><div class='del'>-	de-&gt;info = POISON_PTR;</div><div class='del'>-	kfree(de);</div><div class='del'>-}				/*  End Function devfs_put  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_search_dir - Search for a devfs entry in a directory.</div><div class='del'>- *	@dir:  The directory to search.</div><div class='del'>- *	@name:  The name of the entry to search for.</div><div class='del'>- *	@namelen:  The number of characters in @name.</div><div class='del'>- *</div><div class='del'>- *  Search for a devfs entry in a directory and returns a pointer to the entry</div><div class='del'>- *   on success, else %NULL. The directory must be locked already.</div><div class='del'>- *   An implicit devfs_get() is performed on the returned entry.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *_devfs_search_dir(struct devfs_entry *dir,</div><div class='del'>-					     const char *name,</div><div class='del'>-					     unsigned int namelen)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *curr;</div><div class='del'>-</div><div class='del'>-	if (!S_ISDIR(dir-&gt;mode)) {</div><div class='del'>-		PRINTK("(%s): not a directory\n", dir-&gt;name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	for (curr = dir-&gt;u.dir.first; curr != NULL; curr = curr-&gt;next) {</div><div class='del'>-		if (curr-&gt;namelen != namelen)</div><div class='del'>-			continue;</div><div class='del'>-		if (memcmp(curr-&gt;name, name, namelen) == 0)</div><div class='del'>-			break;</div><div class='del'>-		/*  Not found: try the next one  */</div><div class='del'>-	}</div><div class='del'>-	return devfs_get(curr);</div><div class='del'>-}				/*  End Function _devfs_search_dir  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_alloc_entry - Allocate a devfs entry.</div><div class='del'>- *	@name:     the name of the entry</div><div class='del'>- *	@namelen:  the number of characters in @name</div><div class='del'>- *      @mode:     the mode for the entry</div><div class='del'>- *</div><div class='del'>- *  Allocate a devfs entry and returns a pointer to the entry on success, else</div><div class='del'>- *   %NULL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *_devfs_alloc_entry(const char *name,</div><div class='del'>-					      unsigned int namelen,</div><div class='del'>-					      umode_t mode)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *new;</div><div class='del'>-	static unsigned long inode_counter = FIRST_INODE;</div><div class='del'>-	static DEFINE_SPINLOCK(counter_lock);</div><div class='del'>-</div><div class='del'>-	if (name &amp;&amp; (namelen &lt; 1))</div><div class='del'>-		namelen = strlen(name);</div><div class='del'>-	if ((new = kmalloc(sizeof *new + namelen, GFP_KERNEL)) == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	memset(new, 0, sizeof *new + namelen);	/*  Will set '\0' on name  */</div><div class='del'>-	new-&gt;mode = mode;</div><div class='del'>-	if (S_ISDIR(mode))</div><div class='del'>-		rwlock_init(&amp;new-&gt;u.dir.lock);</div><div class='del'>-	atomic_set(&amp;new-&gt;refcount, 1);</div><div class='del'>-	spin_lock(&amp;counter_lock);</div><div class='del'>-	new-&gt;inode.ino = inode_counter++;</div><div class='del'>-	spin_unlock(&amp;counter_lock);</div><div class='del'>-	if (name)</div><div class='del'>-		memcpy(new-&gt;name, name, namelen);</div><div class='del'>-	new-&gt;namelen = namelen;</div><div class='del'>-	WRITE_ENTRY_MAGIC(new, MAGIC_VALUE);</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	spin_lock(&amp;stat_lock);</div><div class='del'>-	++stat_num_entries;</div><div class='del'>-	stat_num_bytes += sizeof *new + namelen;</div><div class='del'>-	spin_unlock(&amp;stat_lock);</div><div class='del'>-#endif</div><div class='del'>-	return new;</div><div class='del'>-}				/*  End Function _devfs_alloc_entry  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_append_entry - Append a devfs entry to a directory's child list.</div><div class='del'>- *	@dir:  The directory to add to.</div><div class='del'>- *	@de:  The devfs entry to append.</div><div class='del'>- *	@old_de: If an existing entry exists, it will be written here. This may</div><div class='del'>- *		 be %NULL. An implicit devfs_get() is performed on this entry.</div><div class='del'>- *</div><div class='del'>- *  Append a devfs entry to a directory's list of children, checking first to</div><div class='del'>- *   see if an entry of the same name exists. The directory will be locked.</div><div class='del'>- *   The value 0 is returned on success, else a negative error code.</div><div class='del'>- *   On failure, an implicit devfs_put() is performed on %de.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int _devfs_append_entry(devfs_handle_t dir, devfs_handle_t de,</div><div class='del'>-			       devfs_handle_t * old_de)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (old_de)</div><div class='del'>-		*old_de = NULL;</div><div class='del'>-	if (!S_ISDIR(dir-&gt;mode)) {</div><div class='del'>-		PRINTK("(%s): dir: \"%s\" is not a directory\n", de-&gt;name,</div><div class='del'>-		       dir-&gt;name);</div><div class='del'>-		devfs_put(de);</div><div class='del'>-		return -ENOTDIR;</div><div class='del'>-	}</div><div class='del'>-	write_lock(&amp;dir-&gt;u.dir.lock);</div><div class='del'>-	if (dir-&gt;u.dir.no_more_additions)</div><div class='del'>-		retval = -ENOENT;</div><div class='del'>-	else {</div><div class='del'>-		struct devfs_entry *old;</div><div class='del'>-</div><div class='del'>-		old = _devfs_search_dir(dir, de-&gt;name, de-&gt;namelen);</div><div class='del'>-		if (old_de)</div><div class='del'>-			*old_de = old;</div><div class='del'>-		else</div><div class='del'>-			devfs_put(old);</div><div class='del'>-		if (old == NULL) {</div><div class='del'>-			de-&gt;parent = dir;</div><div class='del'>-			de-&gt;prev = dir-&gt;u.dir.last;</div><div class='del'>-			/*  Append to the directory's list of children  */</div><div class='del'>-			if (dir-&gt;u.dir.first == NULL)</div><div class='del'>-				dir-&gt;u.dir.first = de;</div><div class='del'>-			else</div><div class='del'>-				dir-&gt;u.dir.last-&gt;next = de;</div><div class='del'>-			dir-&gt;u.dir.last = de;</div><div class='del'>-			retval = 0;</div><div class='del'>-		} else</div><div class='del'>-			retval = -EEXIST;</div><div class='del'>-	}</div><div class='del'>-	write_unlock(&amp;dir-&gt;u.dir.lock);</div><div class='del'>-	if (retval)</div><div class='del'>-		devfs_put(de);</div><div class='del'>-	return retval;</div><div class='del'>-}				/*  End Function _devfs_append_entry  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_get_root_entry - Get the root devfs entry.</div><div class='del'>- *</div><div class='del'>- *	Returns the root devfs entry on success, else %NULL.</div><div class='del'>- *</div><div class='del'>- *	TODO it must be called asynchronously due to the fact</div><div class='del'>- *	that devfs is initialized relatively late. Proper way</div><div class='del'>- *	is to remove module_init from init_devfs_fs and manually</div><div class='del'>- *	call it early enough during system init</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *_devfs_get_root_entry(void)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *new;</div><div class='del'>-	static DEFINE_SPINLOCK(root_lock);</div><div class='del'>-</div><div class='del'>-	if (root_entry)</div><div class='del'>-		return root_entry;</div><div class='del'>-</div><div class='del'>-	new = _devfs_alloc_entry(NULL, 0, MODE_DIR);</div><div class='del'>-	if (new == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;root_lock);</div><div class='del'>-	if (root_entry) {</div><div class='del'>-		spin_unlock(&amp;root_lock);</div><div class='del'>-		devfs_put(new);</div><div class='del'>-		return root_entry;</div><div class='del'>-	}</div><div class='del'>-	root_entry = new;</div><div class='del'>-	spin_unlock(&amp;root_lock);</div><div class='del'>-</div><div class='del'>-	return root_entry;</div><div class='del'>-}				/*  End Function _devfs_get_root_entry  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_descend - Descend down a tree using the next component name.</div><div class='del'>- *	@dir:  The directory to search.</div><div class='del'>- *	@name:  The component name to search for.</div><div class='del'>- *	@namelen:  The length of %name.</div><div class='del'>- *	@next_pos:  The position of the next '/' or '\0' is written here.</div><div class='del'>- *</div><div class='del'>- *  Descend into a directory, searching for a component. This function forms</div><div class='del'>- *   the core of a tree-walking algorithm. The directory will be locked.</div><div class='del'>- *   The devfs entry corresponding to the component is returned. If there is</div><div class='del'>- *   no matching entry, %NULL is returned.</div><div class='del'>- *   An implicit devfs_get() is performed on the returned entry.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *_devfs_descend(struct devfs_entry *dir,</div><div class='del'>-					  const char *name, int namelen,</div><div class='del'>-					  int *next_pos)</div><div class='del'>-{</div><div class='del'>-	const char *stop, *ptr;</div><div class='del'>-	struct devfs_entry *entry;</div><div class='del'>-</div><div class='del'>-	if ((namelen &gt;= 3) &amp;&amp; (strncmp(name, "../", 3) == 0)) {	/*  Special-case going to parent directory  */</div><div class='del'>-		*next_pos = 3;</div><div class='del'>-		return devfs_get(dir-&gt;parent);</div><div class='del'>-	}</div><div class='del'>-	stop = name + namelen;</div><div class='del'>-	/*  Search for a possible '/'  */</div><div class='del'>-	for (ptr = name; (ptr &lt; stop) &amp;&amp; (*ptr != '/'); ++ptr) ;</div><div class='del'>-	*next_pos = ptr - name;</div><div class='del'>-	read_lock(&amp;dir-&gt;u.dir.lock);</div><div class='del'>-	entry = _devfs_search_dir(dir, name, *next_pos);</div><div class='del'>-	read_unlock(&amp;dir-&gt;u.dir.lock);</div><div class='del'>-	return entry;</div><div class='del'>-}				/*  End Function _devfs_descend  */</div><div class='del'>-</div><div class='del'>-static devfs_handle_t _devfs_make_parent_for_leaf(struct devfs_entry *dir,</div><div class='del'>-						  const char *name,</div><div class='del'>-						  int namelen, int *leaf_pos)</div><div class='del'>-{</div><div class='del'>-	int next_pos = 0;</div><div class='del'>-</div><div class='del'>-	if (dir == NULL)</div><div class='del'>-		dir = _devfs_get_root_entry();</div><div class='del'>-	if (dir == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	devfs_get(dir);</div><div class='del'>-	/*  Search for possible trailing component and ignore it  */</div><div class='del'>-	for (--namelen; (namelen &gt; 0) &amp;&amp; (name[namelen] != '/'); --namelen) ;</div><div class='del'>-	*leaf_pos = (name[namelen] == '/') ? (namelen + 1) : 0;</div><div class='del'>-	for (; namelen &gt; 0; name += next_pos, namelen -= next_pos) {</div><div class='del'>-		struct devfs_entry *de, *old = NULL;</div><div class='del'>-</div><div class='del'>-		if ((de =</div><div class='del'>-		     _devfs_descend(dir, name, namelen, &amp;next_pos)) == NULL) {</div><div class='del'>-			de = _devfs_alloc_entry(name, next_pos, MODE_DIR);</div><div class='del'>-			devfs_get(de);</div><div class='del'>-			if (!de || _devfs_append_entry(dir, de, &amp;old)) {</div><div class='del'>-				devfs_put(de);</div><div class='del'>-				if (!old || !S_ISDIR(old-&gt;mode)) {</div><div class='del'>-					devfs_put(old);</div><div class='del'>-					devfs_put(dir);</div><div class='del'>-					return NULL;</div><div class='del'>-				}</div><div class='del'>-				de = old;	/*  Use the existing directory  */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (de == dir-&gt;parent) {</div><div class='del'>-			devfs_put(dir);</div><div class='del'>-			devfs_put(de);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		devfs_put(dir);</div><div class='del'>-		dir = de;</div><div class='del'>-		if (name[next_pos] == '/')</div><div class='del'>-			++next_pos;</div><div class='del'>-	}</div><div class='del'>-	return dir;</div><div class='del'>-}				/*  End Function _devfs_make_parent_for_leaf  */</div><div class='del'>-</div><div class='del'>-static devfs_handle_t _devfs_prepare_leaf(devfs_handle_t * dir,</div><div class='del'>-					  const char *name, umode_t mode)</div><div class='del'>-{</div><div class='del'>-	int namelen, leaf_pos;</div><div class='del'>-	struct devfs_entry *de;</div><div class='del'>-</div><div class='del'>-	namelen = strlen(name);</div><div class='del'>-	if ((*dir = _devfs_make_parent_for_leaf(*dir, name, namelen,</div><div class='del'>-						&amp;leaf_pos)) == NULL) {</div><div class='del'>-		PRINTK("(%s): could not create parent path\n", name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	if ((de = _devfs_alloc_entry(name + leaf_pos, namelen - leaf_pos, mode))</div><div class='del'>-	    == NULL) {</div><div class='del'>-		PRINTK("(%s): could not allocate entry\n", name);</div><div class='del'>-		devfs_put(*dir);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return de;</div><div class='del'>-}				/*  End Function _devfs_prepare_leaf  */</div><div class='del'>-</div><div class='del'>-static devfs_handle_t _devfs_walk_path(struct devfs_entry *dir,</div><div class='del'>-				       const char *name, int namelen,</div><div class='del'>-				       int traverse_symlink)</div><div class='del'>-{</div><div class='del'>-	int next_pos = 0;</div><div class='del'>-</div><div class='del'>-	if (dir == NULL)</div><div class='del'>-		dir = _devfs_get_root_entry();</div><div class='del'>-	if (dir == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	devfs_get(dir);</div><div class='del'>-	for (; namelen &gt; 0; name += next_pos, namelen -= next_pos) {</div><div class='del'>-		struct devfs_entry *de, *link;</div><div class='del'>-</div><div class='del'>-		if (!S_ISDIR(dir-&gt;mode)) {</div><div class='del'>-			devfs_put(dir);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((de =</div><div class='del'>-		     _devfs_descend(dir, name, namelen, &amp;next_pos)) == NULL) {</div><div class='del'>-			devfs_put(dir);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if (S_ISLNK(de-&gt;mode) &amp;&amp; traverse_symlink) {	/*  Need to follow the link: this is a stack chomper  */</div><div class='del'>-			/* FIXME what if it puts outside of mounted tree? */</div><div class='del'>-			link = _devfs_walk_path(dir, de-&gt;u.symlink.linkname,</div><div class='del'>-						de-&gt;u.symlink.length, TRUE);</div><div class='del'>-			devfs_put(de);</div><div class='del'>-			if (!link) {</div><div class='del'>-				devfs_put(dir);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-			de = link;</div><div class='del'>-		}</div><div class='del'>-		devfs_put(dir);</div><div class='del'>-		dir = de;</div><div class='del'>-		if (name[next_pos] == '/')</div><div class='del'>-			++next_pos;</div><div class='del'>-	}</div><div class='del'>-	return dir;</div><div class='del'>-}				/*  End Function _devfs_walk_path  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_find_entry - Find a devfs entry.</div><div class='del'>- *	@dir: The handle to the parent devfs directory entry. If this is %NULL the</div><div class='del'>- *		name is relative to the root of the devfs.</div><div class='del'>- *	@name: The name of the entry. This may be %NULL.</div><div class='del'>- *	@traverse_symlink: If %TRUE then symbolic links are traversed.</div><div class='del'>- *</div><div class='del'>- *	Returns the devfs_entry pointer on success, else %NULL. An implicit</div><div class='del'>- *	devfs_get() is performed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *_devfs_find_entry(devfs_handle_t dir,</div><div class='del'>-					     const char *name,</div><div class='del'>-					     int traverse_symlink)</div><div class='del'>-{</div><div class='del'>-	unsigned int namelen = strlen(name);</div><div class='del'>-</div><div class='del'>-	if (name[0] == '/') {</div><div class='del'>-		/*  Skip leading pathname component  */</div><div class='del'>-		if (namelen &lt; 2) {</div><div class='del'>-			PRINTK("(%s): too short\n", name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		for (++name, --namelen; (*name != '/') &amp;&amp; (namelen &gt; 0);</div><div class='del'>-		     ++name, --namelen) ;</div><div class='del'>-		if (namelen &lt; 2) {</div><div class='del'>-			PRINTK("(%s): too short\n", name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		++name;</div><div class='del'>-		--namelen;</div><div class='del'>-	}</div><div class='del'>-	return _devfs_walk_path(dir, name, namelen, traverse_symlink);</div><div class='del'>-}				/*  End Function _devfs_find_entry  */</div><div class='del'>-</div><div class='del'>-static struct devfs_entry *get_devfs_entry_from_vfs_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	if (inode == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	VERIFY_ENTRY((struct devfs_entry *)inode-&gt;u.generic_ip);</div><div class='del'>-	return inode-&gt;u.generic_ip;</div><div class='del'>-}				/*  End Function get_devfs_entry_from_vfs_inode  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	free_dentry - Free the dentry for a device entry and invalidate inode.</div><div class='del'>- *	@de: The entry.</div><div class='del'>- *</div><div class='del'>- *	This must only be called after the entry has been unhooked from its</div><div class='del'>- *	 parent directory.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void free_dentry(struct devfs_entry *de)</div><div class='del'>-{</div><div class='del'>-	struct dentry *dentry = de-&gt;inode.dentry;</div><div class='del'>-</div><div class='del'>-	if (!dentry)</div><div class='del'>-		return;</div><div class='del'>-	spin_lock(&amp;dcache_lock);</div><div class='del'>-	dget_locked(dentry);</div><div class='del'>-	spin_unlock(&amp;dcache_lock);</div><div class='del'>-	/*  Forcefully remove the inode  */</div><div class='del'>-	if (dentry-&gt;d_inode != NULL)</div><div class='del'>-		dentry-&gt;d_inode-&gt;i_nlink = 0;</div><div class='del'>-	d_drop(dentry);</div><div class='del'>-	dput(dentry);</div><div class='del'>-}				/*  End Function free_dentry  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	is_devfsd_or_child - Test if the current process is devfsd or one of its children.</div><div class='del'>- *	@fs_info: The filesystem information.</div><div class='del'>- *</div><div class='del'>- *	Returns %TRUE if devfsd or child, else %FALSE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int is_devfsd_or_child(struct fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	struct task_struct *p = current;</div><div class='del'>-</div><div class='del'>-	if (p == fs_info-&gt;devfsd_task)</div><div class='del'>-		return (TRUE);</div><div class='del'>-	if (process_group(p) == fs_info-&gt;devfsd_pgrp)</div><div class='del'>-		return (TRUE);</div><div class='del'>-	read_lock(&amp;tasklist_lock);</div><div class='del'>-	for (; p != &amp;init_task; p = p-&gt;real_parent) {</div><div class='del'>-		if (p == fs_info-&gt;devfsd_task) {</div><div class='del'>-			read_unlock(&amp;tasklist_lock);</div><div class='del'>-			return (TRUE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;tasklist_lock);</div><div class='del'>-	return (FALSE);</div><div class='del'>-}				/*  End Function is_devfsd_or_child  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfsd_queue_empty - Test if devfsd has work pending in its event queue.</div><div class='del'>- *	@fs_info: The filesystem information.</div><div class='del'>- *</div><div class='del'>- *	Returns %TRUE if the queue is empty, else %FALSE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static inline int devfsd_queue_empty(struct fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	return (fs_info-&gt;devfsd_last_event) ? FALSE : TRUE;</div><div class='del'>-}				/*  End Function devfsd_queue_empty  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	wait_for_devfsd_finished - Wait for devfsd to finish processing its event queue.</div><div class='del'>- *	@fs_info: The filesystem information.</div><div class='del'>- *</div><div class='del'>- *	Returns %TRUE if no more waiting will be required, else %FALSE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int wait_for_devfsd_finished(struct fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-</div><div class='del'>-	if (fs_info-&gt;devfsd_task == NULL)</div><div class='del'>-		return (TRUE);</div><div class='del'>-	if (devfsd_queue_empty(fs_info) &amp;&amp; fs_info-&gt;devfsd_sleeping)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (is_devfsd_or_child(fs_info))</div><div class='del'>-		return (FALSE);</div><div class='del'>-	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-	add_wait_queue(&amp;fs_info-&gt;revalidate_wait_queue, &amp;wait);</div><div class='del'>-	if (!devfsd_queue_empty(fs_info) || !fs_info-&gt;devfsd_sleeping)</div><div class='del'>-		if (fs_info-&gt;devfsd_task)</div><div class='del'>-			schedule();</div><div class='del'>-	remove_wait_queue(&amp;fs_info-&gt;revalidate_wait_queue, &amp;wait);</div><div class='del'>-	__set_current_state(TASK_RUNNING);</div><div class='del'>-	return (TRUE);</div><div class='del'>-}				/*  End Function wait_for_devfsd_finished  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfsd_notify_de - Notify the devfsd daemon of a change.</div><div class='del'>- *	@de: The devfs entry that has changed. This and all parent entries will</div><div class='del'>- *            have their reference counts incremented if the event was queued.</div><div class='del'>- *	@type: The type of change.</div><div class='del'>- *	@mode: The mode of the entry.</div><div class='del'>- *	@uid: The user ID.</div><div class='del'>- *	@gid: The group ID.</div><div class='del'>- *	@fs_info: The filesystem info.</div><div class='del'>- *</div><div class='del'>- *	Returns %TRUE if an event was queued and devfsd woken up, else %FALSE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int devfsd_notify_de(struct devfs_entry *de,</div><div class='del'>-			    unsigned short type, umode_t mode,</div><div class='del'>-			    uid_t uid, gid_t gid, struct fs_info *fs_info)</div><div class='del'>-{</div><div class='del'>-	struct devfsd_buf_entry *entry;</div><div class='del'>-	struct devfs_entry *curr;</div><div class='del'>-</div><div class='del'>-	if (!(fs_info-&gt;devfsd_event_mask &amp; (1 &lt;&lt; type)))</div><div class='del'>-		return (FALSE);</div><div class='del'>-	if ((entry = kmem_cache_alloc(devfsd_buf_cache, SLAB_KERNEL)) == NULL) {</div><div class='del'>-		atomic_inc(&amp;fs_info-&gt;devfsd_overrun_count);</div><div class='del'>-		return (FALSE);</div><div class='del'>-	}</div><div class='del'>-	for (curr = de; curr != NULL; curr = curr-&gt;parent)</div><div class='del'>-		devfs_get(curr);</div><div class='del'>-	entry-&gt;de = de;</div><div class='del'>-	entry-&gt;type = type;</div><div class='del'>-	entry-&gt;mode = mode;</div><div class='del'>-	entry-&gt;uid = uid;</div><div class='del'>-	entry-&gt;gid = gid;</div><div class='del'>-	entry-&gt;next = NULL;</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;devfsd_buffer_lock);</div><div class='del'>-	if (!fs_info-&gt;devfsd_first_event)</div><div class='del'>-		fs_info-&gt;devfsd_first_event = entry;</div><div class='del'>-	if (fs_info-&gt;devfsd_last_event)</div><div class='del'>-		fs_info-&gt;devfsd_last_event-&gt;next = entry;</div><div class='del'>-	fs_info-&gt;devfsd_last_event = entry;</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;devfsd_buffer_lock);</div><div class='del'>-	wake_up_interruptible(&amp;fs_info-&gt;devfsd_wait_queue);</div><div class='del'>-	return (TRUE);</div><div class='del'>-}				/*  End Function devfsd_notify_de  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfsd_notify - Notify the devfsd daemon of a change.</div><div class='del'>- *	@de: The devfs entry that has changed.</div><div class='del'>- *	@type: The type of change event.</div><div class='del'>- *	@wait: If TRUE, the function waits for the daemon to finish processing</div><div class='del'>- *		the event.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void devfsd_notify(struct devfs_entry *de, unsigned short type)</div><div class='del'>-{</div><div class='del'>-	devfsd_notify_de(de, type, de-&gt;mode, current-&gt;euid,</div><div class='del'>-			 current-&gt;egid, &amp;fs_info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int devfs_mk_dev(dev_t dev, umode_t mode, const char *fmt, va_list args)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *dir = NULL, *de;</div><div class='del'>-	char buf[64];</div><div class='del'>-	int error, n;</div><div class='del'>-</div><div class='del'>-	n = vsnprintf(buf, sizeof(buf), fmt, args);</div><div class='del'>-	if (n &gt;= sizeof(buf) || !buf[0]) {</div><div class='del'>-		printk(KERN_WARNING "%s: invalid format string %s\n",</div><div class='del'>-		       __FUNCTION__, fmt);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	de = _devfs_prepare_leaf(&amp;dir, buf, mode);</div><div class='del'>-	if (!de) {</div><div class='del'>-		printk(KERN_WARNING "%s: could not prepare leaf for %s\n",</div><div class='del'>-		       __FUNCTION__, buf);</div><div class='del'>-		return -ENOMEM;	/* could be more accurate... */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	de-&gt;u.dev = dev;</div><div class='del'>-</div><div class='del'>-	error = _devfs_append_entry(dir, de, NULL);</div><div class='del'>-	if (error) {</div><div class='del'>-		printk(KERN_WARNING "%s: could not append to parent for %s\n",</div><div class='del'>-		       __FUNCTION__, buf);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED);</div><div class='del'>-      out:</div><div class='del'>-	devfs_put(dir);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int devfs_mk_bdev(dev_t dev, umode_t mode, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	if (!S_ISBLK(mode)) {</div><div class='del'>-		printk(KERN_WARNING "%s: invalide mode (%u) for %s\n",</div><div class='del'>-		       __FUNCTION__, mode, fmt);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	return devfs_mk_dev(dev, mode, fmt, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(devfs_mk_bdev);</div><div class='del'>-</div><div class='del'>-int devfs_mk_cdev(dev_t dev, umode_t mode, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	if (!S_ISCHR(mode)) {</div><div class='del'>-		printk(KERN_WARNING "%s: invalide mode (%u) for %s\n",</div><div class='del'>-		       __FUNCTION__, mode, fmt);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	return devfs_mk_dev(dev, mode, fmt, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(devfs_mk_cdev);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_unhook - Unhook a device entry from its parents list</div><div class='del'>- *	@de: The entry to unhook.</div><div class='del'>- *</div><div class='del'>- *	Returns %TRUE if the entry was unhooked, else %FALSE if it was</div><div class='del'>- *		previously unhooked.</div><div class='del'>- *	The caller must have a write lock on the parent directory.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int _devfs_unhook(struct devfs_entry *de)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *parent;</div><div class='del'>-</div><div class='del'>-	if (!de || (de-&gt;prev == de))</div><div class='del'>-		return FALSE;</div><div class='del'>-	parent = de-&gt;parent;</div><div class='del'>-	if (de-&gt;prev == NULL)</div><div class='del'>-		parent-&gt;u.dir.first = de-&gt;next;</div><div class='del'>-	else</div><div class='del'>-		de-&gt;prev-&gt;next = de-&gt;next;</div><div class='del'>-	if (de-&gt;next == NULL)</div><div class='del'>-		parent-&gt;u.dir.last = de-&gt;prev;</div><div class='del'>-	else</div><div class='del'>-		de-&gt;next-&gt;prev = de-&gt;prev;</div><div class='del'>-	de-&gt;prev = de;		/*  Indicate we're unhooked                      */</div><div class='del'>-	de-&gt;next = NULL;	/*  Force early termination for &lt;devfs_readdir&gt;  */</div><div class='del'>-	return TRUE;</div><div class='del'>-}				/*  End Function _devfs_unhook  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_unregister - Unregister a device entry from its parent.</div><div class='del'>- *	@dir: The parent directory.</div><div class='del'>- *	@de: The entry to unregister.</div><div class='del'>- *</div><div class='del'>- *	The caller must have a write lock on the parent directory, which is</div><div class='del'>- *	unlocked by this function.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void _devfs_unregister(struct devfs_entry *dir, struct devfs_entry *de)</div><div class='del'>-{</div><div class='del'>-	int unhooked = _devfs_unhook(de);</div><div class='del'>-</div><div class='del'>-	write_unlock(&amp;dir-&gt;u.dir.lock);</div><div class='del'>-	if (!unhooked)</div><div class='del'>-		return;</div><div class='del'>-	devfs_get(dir);</div><div class='del'>-	devfsd_notify(de, DEVFSD_NOTIFY_UNREGISTERED);</div><div class='del'>-	free_dentry(de);</div><div class='del'>-	devfs_put(dir);</div><div class='del'>-	if (!S_ISDIR(de-&gt;mode))</div><div class='del'>-		return;</div><div class='del'>-	while (TRUE) {		/*  Recursively unregister: this is a stack chomper  */</div><div class='del'>-		struct devfs_entry *child;</div><div class='del'>-</div><div class='del'>-		write_lock(&amp;de-&gt;u.dir.lock);</div><div class='del'>-		de-&gt;u.dir.no_more_additions = TRUE;</div><div class='del'>-		child = de-&gt;u.dir.first;</div><div class='del'>-		VERIFY_ENTRY(child);</div><div class='del'>-		_devfs_unregister(de, child);</div><div class='del'>-		if (!child)</div><div class='del'>-			break;</div><div class='del'>-		DPRINTK(DEBUG_UNREGISTER, "(%s): child: %p  refcount: %d\n",</div><div class='del'>-			child-&gt;name, child, atomic_read(&amp;child-&gt;refcount));</div><div class='del'>-		devfs_put(child);</div><div class='del'>-	}</div><div class='del'>-}				/*  End Function _devfs_unregister  */</div><div class='del'>-</div><div class='del'>-static int devfs_do_symlink(devfs_handle_t dir, const char *name,</div><div class='del'>-			    const char *link, devfs_handle_t * handle)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int linklength;</div><div class='del'>-	char *newlink;</div><div class='del'>-	struct devfs_entry *de;</div><div class='del'>-</div><div class='del'>-	if (handle != NULL)</div><div class='del'>-		*handle = NULL;</div><div class='del'>-	if (name == NULL) {</div><div class='del'>-		PRINTK("(): NULL name pointer\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (link == NULL) {</div><div class='del'>-		PRINTK("(%s): NULL link pointer\n", name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	linklength = strlen(link);</div><div class='del'>-	if ((newlink = kmalloc(linklength + 1, GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	memcpy(newlink, link, linklength);</div><div class='del'>-	newlink[linklength] = '\0';</div><div class='del'>-	if ((de = _devfs_prepare_leaf(&amp;dir, name, S_IFLNK | S_IRUGO | S_IXUGO))</div><div class='del'>-	    == NULL) {</div><div class='del'>-		PRINTK("(%s): could not prepare leaf\n", name);</div><div class='del'>-		kfree(newlink);</div><div class='del'>-		return -ENOTDIR;</div><div class='del'>-	}</div><div class='del'>-	de-&gt;info = NULL;</div><div class='del'>-	de-&gt;u.symlink.linkname = newlink;</div><div class='del'>-	de-&gt;u.symlink.length = linklength;</div><div class='del'>-	if ((err = _devfs_append_entry(dir, de, NULL)) != 0) {</div><div class='del'>-		PRINTK("(%s): could not append to parent, err: %d\n", name,</div><div class='del'>-		       err);</div><div class='del'>-		devfs_put(dir);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	devfs_put(dir);</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	spin_lock(&amp;stat_lock);</div><div class='del'>-	stat_num_bytes += linklength + 1;</div><div class='del'>-	spin_unlock(&amp;stat_lock);</div><div class='del'>-#endif</div><div class='del'>-	if (handle != NULL)</div><div class='del'>-		*handle = de;</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_do_symlink  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_mk_symlink Create a symbolic link in the devfs namespace.</div><div class='del'>- *	@from: The name of the entry.</div><div class='del'>- *	@to: Name of the destination</div><div class='del'>- *</div><div class='del'>- *	Returns 0 on success, else a negative error code is returned.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int devfs_mk_symlink(const char *from, const char *to)</div><div class='del'>-{</div><div class='del'>-	devfs_handle_t de;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = devfs_do_symlink(NULL, from, to, &amp;de);</div><div class='del'>-	if (!err) {</div><div class='del'>-		de-&gt;vfs = TRUE;</div><div class='del'>-		devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_mk_dir - Create a directory in the devfs namespace.</div><div class='del'>- *		new name is relative to the root of the devfs.</div><div class='del'>- *	@fmt: The name of the entry.</div><div class='del'>- *</div><div class='del'>- *	Use of this function is optional. The devfs_register() function</div><div class='del'>- *	will automatically create intermediate directories as needed. This function</div><div class='del'>- *	is provided for efficiency reasons, as it provides a handle to a directory.</div><div class='del'>- *	On failure %NULL is returned.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int devfs_mk_dir(const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *dir = NULL, *de = NULL, *old;</div><div class='del'>-	char buf[64];</div><div class='del'>-	va_list args;</div><div class='del'>-	int error, n;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	n = vsnprintf(buf, 64, fmt, args);</div><div class='del'>-	if (n &gt;= 64 || !buf[0]) {</div><div class='del'>-		printk(KERN_WARNING "%s: invalid argument.", __FUNCTION__);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	de = _devfs_prepare_leaf(&amp;dir, buf, MODE_DIR);</div><div class='del'>-	if (!de) {</div><div class='del'>-		PRINTK("(%s): could not prepare leaf\n", buf);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	error = _devfs_append_entry(dir, de, &amp;old);</div><div class='del'>-	if (error == -EEXIST &amp;&amp; S_ISDIR(old-&gt;mode)) {</div><div class='del'>-		/*</div><div class='del'>-		 * devfs_mk_dir() of an already-existing directory will</div><div class='del'>-		 * return success.</div><div class='del'>-		 */</div><div class='del'>-		error = 0;</div><div class='del'>-		goto out_put;</div><div class='del'>-	} else if (error) {</div><div class='del'>-		PRINTK("(%s): could not append to dir: %p \"%s\"\n",</div><div class='del'>-		       buf, dir, dir-&gt;name);</div><div class='del'>-		devfs_put(old);</div><div class='del'>-		goto out_put;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED);</div><div class='del'>-</div><div class='del'>-      out_put:</div><div class='del'>-	devfs_put(dir);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void devfs_remove(const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	char buf[64];</div><div class='del'>-	va_list args;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	n = vsnprintf(buf, sizeof(buf), fmt, args);</div><div class='del'>-	if (n &lt; sizeof(buf) &amp;&amp; buf[0]) {</div><div class='del'>-		devfs_handle_t de = _devfs_find_entry(NULL, buf, 0);</div><div class='del'>-</div><div class='del'>-		if (!de) {</div><div class='del'>-			printk(KERN_ERR "%s: %s not found, cannot remove\n",</div><div class='del'>-			       __FUNCTION__, buf);</div><div class='del'>-			dump_stack();</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		write_lock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-		_devfs_unregister(de-&gt;parent, de);</div><div class='del'>-		devfs_put(de);</div><div class='del'>-		devfs_put(de);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_generate_path - Generate a pathname for an entry, relative to the devfs root.</div><div class='del'>- *	@de: The devfs entry.</div><div class='del'>- *	@path: The buffer to write the pathname to. The pathname and '\0'</div><div class='del'>- *		terminator will be written at the end of the buffer.</div><div class='del'>- *	@buflen: The length of the buffer.</div><div class='del'>- *</div><div class='del'>- *	Returns the offset in the buffer where the pathname starts on success,</div><div class='del'>- *	else a negative error code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int devfs_generate_path(devfs_handle_t de, char *path, int buflen)</div><div class='del'>-{</div><div class='del'>-	int pos;</div><div class='del'>-#define NAMEOF(de) ( (de)-&gt;mode ? (de)-&gt;name : (de)-&gt;u.name )</div><div class='del'>-</div><div class='del'>-	if (de == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	VERIFY_ENTRY(de);</div><div class='del'>-	if (de-&gt;namelen &gt;= buflen)</div><div class='del'>-		return -ENAMETOOLONG;	/*  Must be first       */</div><div class='del'>-	path[buflen - 1] = '\0';</div><div class='del'>-	if (de-&gt;parent == NULL)</div><div class='del'>-		return buflen - 1;	/*  Don't prepend root  */</div><div class='del'>-	pos = buflen - de-&gt;namelen - 1;</div><div class='del'>-	memcpy(path + pos, NAMEOF(de), de-&gt;namelen);</div><div class='del'>-	for (de = de-&gt;parent; de-&gt;parent != NULL; de = de-&gt;parent) {</div><div class='del'>-		if (pos - de-&gt;namelen - 1 &lt; 0)</div><div class='del'>-			return -ENAMETOOLONG;</div><div class='del'>-		path[--pos] = '/';</div><div class='del'>-		pos -= de-&gt;namelen;</div><div class='del'>-		memcpy(path + pos, NAMEOF(de), de-&gt;namelen);</div><div class='del'>-	}</div><div class='del'>-	return pos;</div><div class='del'>-}				/*  End Function devfs_generate_path  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_setup - Process kernel boot options.</div><div class='del'>- *	@str: The boot options after the "devfs=".</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init devfs_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	static struct {</div><div class='del'>-		char *name;</div><div class='del'>-		unsigned int mask;</div><div class='del'>-		unsigned int *opt;</div><div class='del'>-	} devfs_options_tab[] __initdata = {</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-		{</div><div class='del'>-		"dall", DEBUG_ALL, &amp;devfs_debug_init}, {</div><div class='del'>-		"dmod", DEBUG_MODULE_LOAD, &amp;devfs_debug_init}, {</div><div class='del'>-		"dreg", DEBUG_REGISTER, &amp;devfs_debug_init}, {</div><div class='del'>-		"dunreg", DEBUG_UNREGISTER, &amp;devfs_debug_init}, {</div><div class='del'>-		"dfree", DEBUG_FREE, &amp;devfs_debug_init}, {</div><div class='del'>-		"diget", DEBUG_I_GET, &amp;devfs_debug_init}, {</div><div class='del'>-		"dchange", DEBUG_SET_FLAGS, &amp;devfs_debug_init}, {</div><div class='del'>-		"dsread", DEBUG_S_READ, &amp;devfs_debug_init}, {</div><div class='del'>-		"dichange", DEBUG_I_CHANGE, &amp;devfs_debug_init}, {</div><div class='del'>-		"dimknod", DEBUG_I_MKNOD, &amp;devfs_debug_init}, {</div><div class='del'>-		"dilookup", DEBUG_I_LOOKUP, &amp;devfs_debug_init}, {</div><div class='del'>-		"diunlink", DEBUG_I_UNLINK, &amp;devfs_debug_init},</div><div class='del'>-#endif				/*  CONFIG_DEVFS_DEBUG  */</div><div class='del'>-		{</div><div class='del'>-		"mount", OPTION_MOUNT, &amp;boot_options}, {</div><div class='del'>-		NULL, 0, NULL}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	while ((*str != '\0') &amp;&amp; !isspace(*str)) {</div><div class='del'>-		int i, found = 0, invert = 0;</div><div class='del'>-</div><div class='del'>-		if (strncmp(str, "no", 2) == 0) {</div><div class='del'>-			invert = 1;</div><div class='del'>-			str += 2;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; devfs_options_tab[i].name != NULL; i++) {</div><div class='del'>-			int len = strlen(devfs_options_tab[i].name);</div><div class='del'>-</div><div class='del'>-			if (strncmp(str, devfs_options_tab[i].name, len) == 0) {</div><div class='del'>-				if (invert)</div><div class='del'>-					*devfs_options_tab[i].opt &amp;=</div><div class='del'>-					    ~devfs_options_tab[i].mask;</div><div class='del'>-				else</div><div class='del'>-					*devfs_options_tab[i].opt |=</div><div class='del'>-					    devfs_options_tab[i].mask;</div><div class='del'>-				str += len;</div><div class='del'>-				found = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!found)</div><div class='del'>-			return 0;	/*  No match         */</div><div class='del'>-		if (*str != ',')</div><div class='del'>-			return 0;	/*  No more options  */</div><div class='del'>-		++str;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}				/*  End Function devfs_setup  */</div><div class='del'>-</div><div class='del'>-__setup("devfs=", devfs_setup);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(devfs_mk_dir);</div><div class='del'>-EXPORT_SYMBOL(devfs_remove);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	try_modload - Notify devfsd of an inode lookup by a non-devfsd process.</div><div class='del'>- *	@parent: The parent devfs entry.</div><div class='del'>- *	@fs_info: The filesystem info.</div><div class='del'>- *	@name: The device name.</div><div class='del'>- *	@namelen: The number of characters in @name.</div><div class='del'>- *	@buf: A working area that will be used. This must not go out of scope</div><div class='del'>- *            until devfsd is idle again.</div><div class='del'>- *</div><div class='del'>- *	Returns 0 on success (event was queued), else a negative error code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int try_modload(struct devfs_entry *parent, struct fs_info *fs_info,</div><div class='del'>-		       const char *name, unsigned namelen,</div><div class='del'>-		       struct devfs_entry *buf)</div><div class='del'>-{</div><div class='del'>-	if (!(fs_info-&gt;devfsd_event_mask &amp; (1 &lt;&lt; DEVFSD_NOTIFY_LOOKUP)))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	if (is_devfsd_or_child(fs_info))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	memset(buf, 0, sizeof *buf);</div><div class='del'>-	atomic_set(&amp;buf-&gt;refcount, 1);</div><div class='del'>-	buf-&gt;parent = parent;</div><div class='del'>-	buf-&gt;namelen = namelen;</div><div class='del'>-	buf-&gt;u.name = name;</div><div class='del'>-	WRITE_ENTRY_MAGIC(buf, MAGIC_VALUE);</div><div class='del'>-	if (!devfsd_notify_de(buf, DEVFSD_NOTIFY_LOOKUP, 0,</div><div class='del'>-			      current-&gt;euid, current-&gt;egid, fs_info))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	/*  Possible success: event has been queued  */</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function try_modload  */</div><div class='del'>-</div><div class='del'>-/*  Superblock operations follow  */</div><div class='del'>-</div><div class='del'>-static struct inode_operations devfs_iops;</div><div class='del'>-static struct inode_operations devfs_dir_iops;</div><div class='del'>-static const struct file_operations devfs_fops;</div><div class='del'>-static const struct file_operations devfs_dir_fops;</div><div class='del'>-static struct inode_operations devfs_symlink_iops;</div><div class='del'>-</div><div class='del'>-static int devfs_notify_change(struct dentry *dentry, struct iattr *iattr)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	struct devfs_entry *de;</div><div class='del'>-	struct inode *inode = dentry-&gt;d_inode;</div><div class='del'>-	struct fs_info *fs_info = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	de = get_devfs_entry_from_vfs_inode(inode);</div><div class='del'>-	if (de == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	retval = inode_change_ok(inode, iattr);</div><div class='del'>-	if (retval != 0)</div><div class='del'>-		return retval;</div><div class='del'>-	retval = inode_setattr(inode, iattr);</div><div class='del'>-	if (retval != 0)</div><div class='del'>-		return retval;</div><div class='del'>-	DPRINTK(DEBUG_I_CHANGE, "(%d): VFS inode: %p  devfs_entry: %p\n",</div><div class='del'>-		(int)inode-&gt;i_ino, inode, de);</div><div class='del'>-	DPRINTK(DEBUG_I_CHANGE, "():   mode: 0%o  uid: %d  gid: %d\n",</div><div class='del'>-		(int)inode-&gt;i_mode, (int)inode-&gt;i_uid, (int)inode-&gt;i_gid);</div><div class='del'>-	/*  Inode is not on hash chains, thus must save permissions here rather</div><div class='del'>-	   than in a write_inode() method  */</div><div class='del'>-	de-&gt;mode = inode-&gt;i_mode;</div><div class='del'>-	de-&gt;inode.uid = inode-&gt;i_uid;</div><div class='del'>-	de-&gt;inode.gid = inode-&gt;i_gid;</div><div class='del'>-	de-&gt;inode.atime = inode-&gt;i_atime;</div><div class='del'>-	de-&gt;inode.mtime = inode-&gt;i_mtime;</div><div class='del'>-	de-&gt;inode.ctime = inode-&gt;i_ctime;</div><div class='del'>-	if ((iattr-&gt;ia_valid &amp; (ATTR_MODE | ATTR_UID | ATTR_GID)) &amp;&amp;</div><div class='del'>-	    !is_devfsd_or_child(fs_info))</div><div class='del'>-		devfsd_notify_de(de, DEVFSD_NOTIFY_CHANGE, inode-&gt;i_mode,</div><div class='del'>-				 inode-&gt;i_uid, inode-&gt;i_gid, fs_info);</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_notify_change  */</div><div class='del'>-</div><div class='del'>-static struct super_operations devfs_sops = {</div><div class='del'>-	.drop_inode = generic_delete_inode,</div><div class='del'>-	.statfs = simple_statfs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	_devfs_get_vfs_inode - Get a VFS inode.</div><div class='del'>- *	@sb: The super block.</div><div class='del'>- *	@de: The devfs inode.</div><div class='del'>- *	@dentry: The dentry to register with the devfs inode.</div><div class='del'>- *</div><div class='del'>- *	Returns the inode on success, else %NULL. An implicit devfs_get() is</div><div class='del'>- *       performed if the inode is created.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct inode *_devfs_get_vfs_inode(struct super_block *sb,</div><div class='del'>-					  struct devfs_entry *de,</div><div class='del'>-					  struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	if (de-&gt;prev == de)</div><div class='del'>-		return NULL;	/*  Quick check to see if unhooked  */</div><div class='del'>-	if ((inode = new_inode(sb)) == NULL) {</div><div class='del'>-		PRINTK("(%s): new_inode() failed, de: %p\n", de-&gt;name, de);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	if (de-&gt;parent) {</div><div class='del'>-		read_lock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-		if (de-&gt;prev != de)</div><div class='del'>-			de-&gt;inode.dentry = dentry;	/*      Not unhooked  */</div><div class='del'>-		read_unlock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-	} else</div><div class='del'>-		de-&gt;inode.dentry = dentry;	/*  Root: no locking needed  */</div><div class='del'>-	if (de-&gt;inode.dentry != dentry) {	/*  Must have been unhooked  */</div><div class='del'>-		iput(inode);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	/* FIXME where is devfs_put? */</div><div class='del'>-	inode-&gt;u.generic_ip = devfs_get(de);</div><div class='del'>-	inode-&gt;i_ino = de-&gt;inode.ino;</div><div class='del'>-	DPRINTK(DEBUG_I_GET, "(%d): VFS inode: %p  devfs_entry: %p\n",</div><div class='del'>-		(int)inode-&gt;i_ino, inode, de);</div><div class='del'>-	inode-&gt;i_blocks = 0;</div><div class='del'>-	inode-&gt;i_blksize = FAKE_BLOCK_SIZE;</div><div class='del'>-	inode-&gt;i_op = &amp;devfs_iops;</div><div class='del'>-	inode-&gt;i_mode = de-&gt;mode;</div><div class='del'>-	if (S_ISDIR(de-&gt;mode)) {</div><div class='del'>-		inode-&gt;i_op = &amp;devfs_dir_iops;</div><div class='del'>-		inode-&gt;i_fop = &amp;devfs_dir_fops;</div><div class='del'>-	} else if (S_ISLNK(de-&gt;mode)) {</div><div class='del'>-		inode-&gt;i_op = &amp;devfs_symlink_iops;</div><div class='del'>-		inode-&gt;i_size = de-&gt;u.symlink.length;</div><div class='del'>-	} else if (S_ISCHR(de-&gt;mode) || S_ISBLK(de-&gt;mode)) {</div><div class='del'>-		init_special_inode(inode, de-&gt;mode, de-&gt;u.dev);</div><div class='del'>-	} else if (S_ISFIFO(de-&gt;mode) || S_ISSOCK(de-&gt;mode)) {</div><div class='del'>-		init_special_inode(inode, de-&gt;mode, 0);</div><div class='del'>-	} else {</div><div class='del'>-		PRINTK("(%s): unknown mode %o de: %p\n",</div><div class='del'>-		       de-&gt;name, de-&gt;mode, de);</div><div class='del'>-		iput(inode);</div><div class='del'>-		devfs_put(de);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inode-&gt;i_uid = de-&gt;inode.uid;</div><div class='del'>-	inode-&gt;i_gid = de-&gt;inode.gid;</div><div class='del'>-	inode-&gt;i_atime = de-&gt;inode.atime;</div><div class='del'>-	inode-&gt;i_mtime = de-&gt;inode.mtime;</div><div class='del'>-	inode-&gt;i_ctime = de-&gt;inode.ctime;</div><div class='del'>-	DPRINTK(DEBUG_I_GET, "():   mode: 0%o  uid: %d  gid: %d\n",</div><div class='del'>-		(int)inode-&gt;i_mode, (int)inode-&gt;i_uid, (int)inode-&gt;i_gid);</div><div class='del'>-	return inode;</div><div class='del'>-}				/*  End Function _devfs_get_vfs_inode  */</div><div class='del'>-</div><div class='del'>-/*  File operations for device entries follow  */</div><div class='del'>-</div><div class='del'>-static int devfs_readdir(struct file *file, void *dirent, filldir_t filldir)</div><div class='del'>-{</div><div class='del'>-	int err, count;</div><div class='del'>-	int stored = 0;</div><div class='del'>-	struct fs_info *fs_info;</div><div class='del'>-	struct devfs_entry *parent, *de, *next = NULL;</div><div class='del'>-	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='del'>-</div><div class='del'>-	fs_info = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	parent = get_devfs_entry_from_vfs_inode(file-&gt;f_dentry-&gt;d_inode);</div><div class='del'>-	if ((long)file-&gt;f_pos &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	DPRINTK(DEBUG_F_READDIR, "(%s): fs_info: %p  pos: %ld\n",</div><div class='del'>-		parent-&gt;name, fs_info, (long)file-&gt;f_pos);</div><div class='del'>-	switch ((long)file-&gt;f_pos) {</div><div class='del'>-	case 0:</div><div class='del'>-		err = (*filldir) (dirent, "..", 2, file-&gt;f_pos,</div><div class='del'>-				  parent_ino(file-&gt;f_dentry), DT_DIR);</div><div class='del'>-		if (err == -EINVAL)</div><div class='del'>-			break;</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		file-&gt;f_pos++;</div><div class='del'>-		++stored;</div><div class='del'>-		/*  Fall through  */</div><div class='del'>-	case 1:</div><div class='del'>-		err =</div><div class='del'>-		    (*filldir) (dirent, ".", 1, file-&gt;f_pos, inode-&gt;i_ino,</div><div class='del'>-				DT_DIR);</div><div class='del'>-		if (err == -EINVAL)</div><div class='del'>-			break;</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		file-&gt;f_pos++;</div><div class='del'>-		++stored;</div><div class='del'>-		/*  Fall through  */</div><div class='del'>-	default:</div><div class='del'>-		/*  Skip entries  */</div><div class='del'>-		count = file-&gt;f_pos - 2;</div><div class='del'>-		read_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-		for (de = parent-&gt;u.dir.first; de &amp;&amp; (count &gt; 0); de = de-&gt;next)</div><div class='del'>-			--count;</div><div class='del'>-		devfs_get(de);</div><div class='del'>-		read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-		/*  Now add all remaining entries  */</div><div class='del'>-		while (de) {</div><div class='del'>-			err = (*filldir) (dirent, de-&gt;name, de-&gt;namelen,</div><div class='del'>-					  file-&gt;f_pos, de-&gt;inode.ino,</div><div class='del'>-					  de-&gt;mode &gt;&gt; 12);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				devfs_put(de);</div><div class='del'>-			else {</div><div class='del'>-				file-&gt;f_pos++;</div><div class='del'>-				++stored;</div><div class='del'>-			}</div><div class='del'>-			if (err == -EINVAL)</div><div class='del'>-				break;</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			read_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-			next = devfs_get(de-&gt;next);</div><div class='del'>-			read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-			devfs_put(de);</div><div class='del'>-			de = next;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return stored;</div><div class='del'>-}				/*  End Function devfs_readdir  */</div><div class='del'>-</div><div class='del'>-/* Open devfs specific special files */</div><div class='del'>-static int devfs_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	int minor = MINOR(inode-&gt;i_rdev);</div><div class='del'>-	struct file_operations *old_fops, *new_fops;</div><div class='del'>-</div><div class='del'>-	switch (minor) {</div><div class='del'>-	case 0:		/* /dev/.devfsd */</div><div class='del'>-		new_fops = fops_get(&amp;devfsd_fops);</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	case 1:		/* /dev/.stat */</div><div class='del'>-		new_fops = fops_get(&amp;stat_fops);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_fops == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	old_fops = file-&gt;f_op;</div><div class='del'>-	file-&gt;f_op = new_fops;</div><div class='del'>-	err = new_fops-&gt;open ? new_fops-&gt;open(inode, file) : 0;</div><div class='del'>-	if (err) {</div><div class='del'>-		file-&gt;f_op = old_fops;</div><div class='del'>-		fops_put(new_fops);</div><div class='del'>-	} else</div><div class='del'>-		fops_put(old_fops);</div><div class='del'>-	return err;</div><div class='del'>-}				/*  End Function devfs_open  */</div><div class='del'>-</div><div class='del'>-static const struct file_operations devfs_fops = {</div><div class='del'>-	.open = devfs_open,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct file_operations devfs_dir_fops = {</div><div class='del'>-	.read = generic_read_dir,</div><div class='del'>-	.readdir = devfs_readdir,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*  Dentry operations for device entries follow  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_d_release - Callback for when a dentry is freed.</div><div class='del'>- *	@dentry: The dentry.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void devfs_d_release(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	DPRINTK(DEBUG_D_RELEASE, "(%p): inode: %p\n", dentry, dentry-&gt;d_inode);</div><div class='del'>-}				/*  End Function devfs_d_release  */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_d_iput - Callback for when a dentry loses its inode.</div><div class='del'>- *	@dentry: The dentry.</div><div class='del'>- *	@inode:	The inode.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void devfs_d_iput(struct dentry *dentry, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *de;</div><div class='del'>-</div><div class='del'>-	de = get_devfs_entry_from_vfs_inode(inode);</div><div class='del'>-	DPRINTK(DEBUG_D_IPUT,</div><div class='del'>-		"(%s): dentry: %p inode: %p de: %p de-&gt;dentry: %p\n", de-&gt;name,</div><div class='del'>-		dentry, inode, de, de-&gt;inode.dentry);</div><div class='del'>-	if (de-&gt;inode.dentry &amp;&amp; (de-&gt;inode.dentry != dentry))</div><div class='del'>-		OOPS("(%s): de: %p dentry: %p de-&gt;dentry: %p\n",</div><div class='del'>-		     de-&gt;name, de, dentry, de-&gt;inode.dentry);</div><div class='del'>-	de-&gt;inode.dentry = NULL;</div><div class='del'>-	iput(inode);</div><div class='del'>-	devfs_put(de);</div><div class='del'>-}				/*  End Function devfs_d_iput  */</div><div class='del'>-</div><div class='del'>-static int devfs_d_delete(struct dentry *dentry);</div><div class='del'>-</div><div class='del'>-static struct dentry_operations devfs_dops = {</div><div class='del'>-	.d_delete = devfs_d_delete,</div><div class='del'>-	.d_release = devfs_d_release,</div><div class='del'>-	.d_iput = devfs_d_iput,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int devfs_d_revalidate_wait(struct dentry *dentry, struct nameidata *);</div><div class='del'>-</div><div class='del'>-static struct dentry_operations devfs_wait_dops = {</div><div class='del'>-	.d_delete = devfs_d_delete,</div><div class='del'>-	.d_release = devfs_d_release,</div><div class='del'>-	.d_iput = devfs_d_iput,</div><div class='del'>-	.d_revalidate = devfs_d_revalidate_wait,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	devfs_d_delete - Callback for when all files for a dentry are closed.</div><div class='del'>- *	@dentry: The dentry.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int devfs_d_delete(struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = dentry-&gt;d_inode;</div><div class='del'>-</div><div class='del'>-	if (dentry-&gt;d_op == &amp;devfs_wait_dops)</div><div class='del'>-		dentry-&gt;d_op = &amp;devfs_dops;</div><div class='del'>-	/*  Unhash dentry if negative (has no inode)  */</div><div class='del'>-	if (inode == NULL) {</div><div class='del'>-		DPRINTK(DEBUG_D_DELETE, "(%p): dropping negative dentry\n",</div><div class='del'>-			dentry);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_d_delete  */</div><div class='del'>-</div><div class='del'>-struct devfs_lookup_struct {</div><div class='del'>-	devfs_handle_t de;</div><div class='del'>-	wait_queue_head_t wait_queue;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* XXX: this doesn't handle the case where we got a negative dentry</div><div class='del'>-        but a devfs entry has been registered in the meanwhile */</div><div class='del'>-static int devfs_d_revalidate_wait(struct dentry *dentry, struct nameidata *nd)</div><div class='del'>-{</div><div class='del'>-	struct inode *dir = dentry-&gt;d_parent-&gt;d_inode;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	devfs_handle_t parent = get_devfs_entry_from_vfs_inode(dir);</div><div class='del'>-	struct devfs_lookup_struct *lookup_info = dentry-&gt;d_fsdata;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	int need_lock;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME HACK</div><div class='del'>-	 *</div><div class='del'>-	 * make sure that</div><div class='del'>-	 *   d_instantiate always runs under lock</div><div class='del'>-	 *   we release i_mutex lock before going to sleep</div><div class='del'>-	 *</div><div class='del'>-	 * unfortunately sometimes d_revalidate is called with</div><div class='del'>-	 * and sometimes without i_mutex lock held. The following checks</div><div class='del'>-	 * attempt to deduce when we need to add (and drop resp.) lock</div><div class='del'>-	 * here. This relies on current (2.6.2) calling coventions:</div><div class='del'>-	 *</div><div class='del'>-	 *   lookup_hash is always run under i_mutex and is passing NULL</div><div class='del'>-	 *   as nd</div><div class='del'>-	 *</div><div class='del'>-	 *   open(...,O_CREATE,...) calls _lookup_hash under i_mutex</div><div class='del'>-	 *   and sets flags to LOOKUP_OPEN|LOOKUP_CREATE</div><div class='del'>-	 *</div><div class='del'>-	 *   all other invocations of -&gt;d_revalidate seem to happen</div><div class='del'>-	 *   outside of i_mutex</div><div class='del'>-	 */</div><div class='del'>-	need_lock = nd &amp;&amp;</div><div class='del'>-	    (!(nd-&gt;flags &amp; LOOKUP_CREATE) || (nd-&gt;flags &amp; LOOKUP_PARENT));</div><div class='del'>-</div><div class='del'>-	if (need_lock)</div><div class='del'>-		mutex_lock(&amp;dir-&gt;i_mutex);</div><div class='del'>-</div><div class='del'>-	if (is_devfsd_or_child(fs_info)) {</div><div class='del'>-		devfs_handle_t de = lookup_info-&gt;de;</div><div class='del'>-		struct inode *inode;</div><div class='del'>-</div><div class='del'>-		DPRINTK(DEBUG_I_LOOKUP,</div><div class='del'>-			"(%s): dentry: %p inode: %p de: %p by: \"%s\"\n",</div><div class='del'>-			dentry-&gt;d_name.name, dentry, dentry-&gt;d_inode, de,</div><div class='del'>-			current-&gt;comm);</div><div class='del'>-		if (dentry-&gt;d_inode)</div><div class='del'>-			goto out;</div><div class='del'>-		if (de == NULL) {</div><div class='del'>-			read_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-			de = _devfs_search_dir(parent, dentry-&gt;d_name.name,</div><div class='del'>-					       dentry-&gt;d_name.len);</div><div class='del'>-			read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-			if (de == NULL)</div><div class='del'>-				goto out;</div><div class='del'>-			lookup_info-&gt;de = de;</div><div class='del'>-		}</div><div class='del'>-		/*  Create an inode, now that the driver information is available  */</div><div class='del'>-		inode = _devfs_get_vfs_inode(dir-&gt;i_sb, de, dentry);</div><div class='del'>-		if (!inode)</div><div class='del'>-			goto out;</div><div class='del'>-		DPRINTK(DEBUG_I_LOOKUP,</div><div class='del'>-			"(%s): new VFS inode(%u): %p de: %p by: \"%s\"\n",</div><div class='del'>-			de-&gt;name, de-&gt;inode.ino, inode, de, current-&gt;comm);</div><div class='del'>-		d_instantiate(dentry, inode);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (lookup_info == NULL)</div><div class='del'>-		goto out;	/*  Early termination  */</div><div class='del'>-	read_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-	if (dentry-&gt;d_fsdata) {</div><div class='del'>-		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-		add_wait_queue(&amp;lookup_info-&gt;wait_queue, &amp;wait);</div><div class='del'>-		read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-		/* at this point it is always (hopefully) locked */</div><div class='del'>-		mutex_unlock(&amp;dir-&gt;i_mutex);</div><div class='del'>-		schedule();</div><div class='del'>-		mutex_lock(&amp;dir-&gt;i_mutex);</div><div class='del'>-		/*</div><div class='del'>-		 * This does not need nor should remove wait from wait_queue.</div><div class='del'>-		 * Wait queue head is never reused - nothing is ever added to it</div><div class='del'>-		 * after all waiters have been waked up and head itself disappears</div><div class='del'>-		 * very soon after it. Moreover it is local variable on stack that</div><div class='del'>-		 * is likely to have already disappeared so any reference to it</div><div class='del'>-		 * at this point is buggy.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-	} else</div><div class='del'>-		read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-</div><div class='del'>-      out:</div><div class='del'>-	if (need_lock)</div><div class='del'>-		mutex_unlock(&amp;dir-&gt;i_mutex);</div><div class='del'>-	return 1;</div><div class='del'>-}				/*  End Function devfs_d_revalidate_wait  */</div><div class='del'>-</div><div class='del'>-/*  Inode operations for device entries follow  */</div><div class='del'>-</div><div class='del'>-static struct dentry *devfs_lookup(struct inode *dir, struct dentry *dentry,</div><div class='del'>-				   struct nameidata *nd)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry tmp;	/*  Must stay in scope until devfsd idle again  */</div><div class='del'>-	struct devfs_lookup_struct lookup_info;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct devfs_entry *parent, *de;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct dentry *retval = NULL;</div><div class='del'>-</div><div class='del'>-	/*  Set up the dentry operations before anything else, to ensure cleaning</div><div class='del'>-	   up on any error  */</div><div class='del'>-	dentry-&gt;d_op = &amp;devfs_dops;</div><div class='del'>-	/*  First try to get the devfs entry for this directory  */</div><div class='del'>-	parent = get_devfs_entry_from_vfs_inode(dir);</div><div class='del'>-	DPRINTK(DEBUG_I_LOOKUP, "(%s): dentry: %p parent: %p by: \"%s\"\n",</div><div class='del'>-		dentry-&gt;d_name.name, dentry, parent, current-&gt;comm);</div><div class='del'>-	if (parent == NULL)</div><div class='del'>-		return ERR_PTR(-ENOENT);</div><div class='del'>-	read_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-	de = _devfs_search_dir(parent, dentry-&gt;d_name.name, dentry-&gt;d_name.len);</div><div class='del'>-	read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-	lookup_info.de = de;</div><div class='del'>-	init_waitqueue_head(&amp;lookup_info.wait_queue);</div><div class='del'>-	dentry-&gt;d_fsdata = &amp;lookup_info;</div><div class='del'>-	if (de == NULL) {	/*  Try with devfsd. For any kind of failure, leave a negative dentry</div><div class='del'>-				   so someone else can deal with it (in the case where the sysadmin</div><div class='del'>-				   does a mknod()). It's important to do this before hashing the</div><div class='del'>-				   dentry, so that the devfsd queue is filled before revalidates</div><div class='del'>-				   can start  */</div><div class='del'>-		if (try_modload(parent, fs_info, dentry-&gt;d_name.name, dentry-&gt;d_name.len, &amp;tmp) &lt; 0) {	/*  Lookup event was not queued to devfsd  */</div><div class='del'>-			d_add(dentry, NULL);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	dentry-&gt;d_op = &amp;devfs_wait_dops;</div><div class='del'>-	d_add(dentry, NULL);	/*  Open the floodgates  */</div><div class='del'>-	/*  Unlock directory semaphore, which will release any waiters. They</div><div class='del'>-	   will get the hashed dentry, and may be forced to wait for</div><div class='del'>-	   revalidation  */</div><div class='del'>-	mutex_unlock(&amp;dir-&gt;i_mutex);</div><div class='del'>-	wait_for_devfsd_finished(fs_info);	/*  If I'm not devfsd, must wait  */</div><div class='del'>-	mutex_lock(&amp;dir-&gt;i_mutex);	/*  Grab it again because them's the rules  */</div><div class='del'>-	de = lookup_info.de;</div><div class='del'>-	/*  If someone else has been so kind as to make the inode, we go home</div><div class='del'>-	   early  */</div><div class='del'>-	if (dentry-&gt;d_inode)</div><div class='del'>-		goto out;</div><div class='del'>-	if (de == NULL) {</div><div class='del'>-		read_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-		de = _devfs_search_dir(parent, dentry-&gt;d_name.name,</div><div class='del'>-				       dentry-&gt;d_name.len);</div><div class='del'>-		read_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-		if (de == NULL)</div><div class='del'>-			goto out;</div><div class='del'>-		/*  OK, there's an entry now, but no VFS inode yet  */</div><div class='del'>-	}</div><div class='del'>-	/*  Create an inode, now that the driver information is available  */</div><div class='del'>-	inode = _devfs_get_vfs_inode(dir-&gt;i_sb, de, dentry);</div><div class='del'>-	if (!inode) {</div><div class='del'>-		retval = ERR_PTR(-ENOMEM);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	DPRINTK(DEBUG_I_LOOKUP,</div><div class='del'>-		"(%s): new VFS inode(%u): %p de: %p by: \"%s\"\n", de-&gt;name,</div><div class='del'>-		de-&gt;inode.ino, inode, de, current-&gt;comm);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-      out:</div><div class='del'>-	write_lock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-	dentry-&gt;d_op = &amp;devfs_dops;</div><div class='del'>-	dentry-&gt;d_fsdata = NULL;</div><div class='del'>-	wake_up(&amp;lookup_info.wait_queue);</div><div class='del'>-	write_unlock(&amp;parent-&gt;u.dir.lock);</div><div class='del'>-	devfs_put(de);</div><div class='del'>-	return retval;</div><div class='del'>-}				/*  End Function devfs_lookup  */</div><div class='del'>-</div><div class='del'>-static int devfs_unlink(struct inode *dir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int unhooked;</div><div class='del'>-	struct devfs_entry *de;</div><div class='del'>-	struct inode *inode = dentry-&gt;d_inode;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	de = get_devfs_entry_from_vfs_inode(inode);</div><div class='del'>-	DPRINTK(DEBUG_I_UNLINK, "(%s): de: %p\n", dentry-&gt;d_name.name, de);</div><div class='del'>-	if (de == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	if (!de-&gt;vfs)</div><div class='del'>-		return -EPERM;</div><div class='del'>-	write_lock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-	unhooked = _devfs_unhook(de);</div><div class='del'>-	write_unlock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-	if (!unhooked)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	if (!is_devfsd_or_child(fs_info))</div><div class='del'>-		devfsd_notify_de(de, DEVFSD_NOTIFY_DELETE, inode-&gt;i_mode,</div><div class='del'>-				 inode-&gt;i_uid, inode-&gt;i_gid, fs_info);</div><div class='del'>-	free_dentry(de);</div><div class='del'>-	devfs_put(de);</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_unlink  */</div><div class='del'>-</div><div class='del'>-static int devfs_symlink(struct inode *dir, struct dentry *dentry,</div><div class='del'>-			 const char *symname)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct devfs_entry *parent, *de;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	/*  First try to get the devfs entry for this directory  */</div><div class='del'>-	parent = get_devfs_entry_from_vfs_inode(dir);</div><div class='del'>-	if (parent == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	err = devfs_do_symlink(parent, dentry-&gt;d_name.name, symname, &amp;de);</div><div class='del'>-	DPRINTK(DEBUG_DISABLED, "(%s): errcode from &lt;devfs_do_symlink&gt;: %d\n",</div><div class='del'>-		dentry-&gt;d_name.name, err);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	de-&gt;vfs = TRUE;</div><div class='del'>-	de-&gt;inode.uid = current-&gt;euid;</div><div class='del'>-	de-&gt;inode.gid = current-&gt;egid;</div><div class='del'>-	de-&gt;inode.atime = CURRENT_TIME;</div><div class='del'>-	de-&gt;inode.mtime = CURRENT_TIME;</div><div class='del'>-	de-&gt;inode.ctime = CURRENT_TIME;</div><div class='del'>-	if ((inode = _devfs_get_vfs_inode(dir-&gt;i_sb, de, dentry)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	DPRINTK(DEBUG_DISABLED, "(%s): new VFS inode(%u): %p  dentry: %p\n",</div><div class='del'>-		dentry-&gt;d_name.name, de-&gt;inode.ino, inode, dentry);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	if (!is_devfsd_or_child(fs_info))</div><div class='del'>-		devfsd_notify_de(de, DEVFSD_NOTIFY_CREATE, inode-&gt;i_mode,</div><div class='del'>-				 inode-&gt;i_uid, inode-&gt;i_gid, fs_info);</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_symlink  */</div><div class='del'>-</div><div class='del'>-static int devfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct devfs_entry *parent, *de;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	mode = (mode &amp; ~S_IFMT) | S_IFDIR;	/*  VFS doesn't pass S_IFMT part  */</div><div class='del'>-	parent = get_devfs_entry_from_vfs_inode(dir);</div><div class='del'>-	if (parent == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	de = _devfs_alloc_entry(dentry-&gt;d_name.name, dentry-&gt;d_name.len, mode);</div><div class='del'>-	if (!de)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	de-&gt;vfs = TRUE;</div><div class='del'>-	if ((err = _devfs_append_entry(parent, de, NULL)) != 0)</div><div class='del'>-		return err;</div><div class='del'>-	de-&gt;inode.uid = current-&gt;euid;</div><div class='del'>-	de-&gt;inode.gid = current-&gt;egid;</div><div class='del'>-	de-&gt;inode.atime = CURRENT_TIME;</div><div class='del'>-	de-&gt;inode.mtime = CURRENT_TIME;</div><div class='del'>-	de-&gt;inode.ctime = CURRENT_TIME;</div><div class='del'>-	if ((inode = _devfs_get_vfs_inode(dir-&gt;i_sb, de, dentry)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	DPRINTK(DEBUG_DISABLED, "(%s): new VFS inode(%u): %p  dentry: %p\n",</div><div class='del'>-		dentry-&gt;d_name.name, de-&gt;inode.ino, inode, dentry);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	if (!is_devfsd_or_child(fs_info))</div><div class='del'>-		devfsd_notify_de(de, DEVFSD_NOTIFY_CREATE, inode-&gt;i_mode,</div><div class='del'>-				 inode-&gt;i_uid, inode-&gt;i_gid, fs_info);</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_mkdir  */</div><div class='del'>-</div><div class='del'>-static int devfs_rmdir(struct inode *dir, struct dentry *dentry)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct devfs_entry *de;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct inode *inode = dentry-&gt;d_inode;</div><div class='del'>-</div><div class='del'>-	if (dir-&gt;i_sb-&gt;s_fs_info != inode-&gt;i_sb-&gt;s_fs_info)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	de = get_devfs_entry_from_vfs_inode(inode);</div><div class='del'>-	if (de == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	if (!S_ISDIR(de-&gt;mode))</div><div class='del'>-		return -ENOTDIR;</div><div class='del'>-	if (!de-&gt;vfs)</div><div class='del'>-		return -EPERM;</div><div class='del'>-	/*  First ensure the directory is empty and will stay that way  */</div><div class='del'>-	write_lock(&amp;de-&gt;u.dir.lock);</div><div class='del'>-	if (de-&gt;u.dir.first)</div><div class='del'>-		err = -ENOTEMPTY;</div><div class='del'>-	else</div><div class='del'>-		de-&gt;u.dir.no_more_additions = TRUE;</div><div class='del'>-	write_unlock(&amp;de-&gt;u.dir.lock);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	/*  Now unhook the directory from its parent  */</div><div class='del'>-	write_lock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-	if (!_devfs_unhook(de))</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-	write_unlock(&amp;de-&gt;parent-&gt;u.dir.lock);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	if (!is_devfsd_or_child(fs_info))</div><div class='del'>-		devfsd_notify_de(de, DEVFSD_NOTIFY_DELETE, inode-&gt;i_mode,</div><div class='del'>-				 inode-&gt;i_uid, inode-&gt;i_gid, fs_info);</div><div class='del'>-	free_dentry(de);</div><div class='del'>-	devfs_put(de);</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_rmdir  */</div><div class='del'>-</div><div class='del'>-static int devfs_mknod(struct inode *dir, struct dentry *dentry, int mode,</div><div class='del'>-		       dev_t rdev)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct fs_info *fs_info = dir-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct devfs_entry *parent, *de;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	DPRINTK(DEBUG_I_MKNOD, "(%s): mode: 0%o  dev: %u:%u\n",</div><div class='del'>-		dentry-&gt;d_name.name, mode, MAJOR(rdev), MINOR(rdev));</div><div class='del'>-	parent = get_devfs_entry_from_vfs_inode(dir);</div><div class='del'>-	if (parent == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	de = _devfs_alloc_entry(dentry-&gt;d_name.name, dentry-&gt;d_name.len, mode);</div><div class='del'>-	if (!de)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	de-&gt;vfs = TRUE;</div><div class='del'>-	if (S_ISCHR(mode) || S_ISBLK(mode))</div><div class='del'>-		de-&gt;u.dev = rdev;</div><div class='del'>-	if ((err = _devfs_append_entry(parent, de, NULL)) != 0)</div><div class='del'>-		return err;</div><div class='del'>-	de-&gt;inode.uid = current-&gt;euid;</div><div class='del'>-	de-&gt;inode.gid = current-&gt;egid;</div><div class='del'>-	de-&gt;inode.atime = CURRENT_TIME;</div><div class='del'>-	de-&gt;inode.mtime = CURRENT_TIME;</div><div class='del'>-	de-&gt;inode.ctime = CURRENT_TIME;</div><div class='del'>-	if ((inode = _devfs_get_vfs_inode(dir-&gt;i_sb, de, dentry)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	DPRINTK(DEBUG_I_MKNOD, ":   new VFS inode(%u): %p  dentry: %p\n",</div><div class='del'>-		de-&gt;inode.ino, inode, dentry);</div><div class='del'>-	d_instantiate(dentry, inode);</div><div class='del'>-	if (!is_devfsd_or_child(fs_info))</div><div class='del'>-		devfsd_notify_de(de, DEVFSD_NOTIFY_CREATE, inode-&gt;i_mode,</div><div class='del'>-				 inode-&gt;i_uid, inode-&gt;i_gid, fs_info);</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfs_mknod  */</div><div class='del'>-</div><div class='del'>-static void *devfs_follow_link(struct dentry *dentry, struct nameidata *nd)</div><div class='del'>-{</div><div class='del'>-	struct devfs_entry *p = get_devfs_entry_from_vfs_inode(dentry-&gt;d_inode);</div><div class='del'>-	nd_set_link(nd, p ? p-&gt;u.symlink.linkname : ERR_PTR(-ENODEV));</div><div class='del'>-	return NULL;</div><div class='del'>-}				/*  End Function devfs_follow_link  */</div><div class='del'>-</div><div class='del'>-static struct inode_operations devfs_iops = {</div><div class='del'>-	.setattr = devfs_notify_change,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct inode_operations devfs_dir_iops = {</div><div class='del'>-	.lookup = devfs_lookup,</div><div class='del'>-	.unlink = devfs_unlink,</div><div class='del'>-	.symlink = devfs_symlink,</div><div class='del'>-	.mkdir = devfs_mkdir,</div><div class='del'>-	.rmdir = devfs_rmdir,</div><div class='del'>-	.mknod = devfs_mknod,</div><div class='del'>-	.setattr = devfs_notify_change,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct inode_operations devfs_symlink_iops = {</div><div class='del'>-	.readlink = generic_readlink,</div><div class='del'>-	.follow_link = devfs_follow_link,</div><div class='del'>-	.setattr = devfs_notify_change,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int devfs_fill_super(struct super_block *sb, void *data, int silent)</div><div class='del'>-{</div><div class='del'>-	struct inode *root_inode = NULL;</div><div class='del'>-</div><div class='del'>-	if (_devfs_get_root_entry() == NULL)</div><div class='del'>-		goto out_no_root;</div><div class='del'>-	atomic_set(&amp;fs_info.devfsd_overrun_count, 0);</div><div class='del'>-	init_waitqueue_head(&amp;fs_info.devfsd_wait_queue);</div><div class='del'>-	init_waitqueue_head(&amp;fs_info.revalidate_wait_queue);</div><div class='del'>-	fs_info.sb = sb;</div><div class='del'>-	sb-&gt;s_fs_info = &amp;fs_info;</div><div class='del'>-	sb-&gt;s_blocksize = 1024;</div><div class='del'>-	sb-&gt;s_blocksize_bits = 10;</div><div class='del'>-	sb-&gt;s_magic = DEVFS_SUPER_MAGIC;</div><div class='del'>-	sb-&gt;s_op = &amp;devfs_sops;</div><div class='del'>-	sb-&gt;s_time_gran = 1;</div><div class='del'>-	if ((root_inode = _devfs_get_vfs_inode(sb, root_entry, NULL)) == NULL)</div><div class='del'>-		goto out_no_root;</div><div class='del'>-	sb-&gt;s_root = d_alloc_root(root_inode);</div><div class='del'>-	if (!sb-&gt;s_root)</div><div class='del'>-		goto out_no_root;</div><div class='del'>-	DPRINTK(DEBUG_S_READ, "(): made devfs ptr: %p\n", sb-&gt;s_fs_info);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-      out_no_root:</div><div class='del'>-	PRINTK("(): get root inode failed\n");</div><div class='del'>-	if (root_inode)</div><div class='del'>-		iput(root_inode);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}				/*  End Function devfs_fill_super  */</div><div class='del'>-</div><div class='del'>-static struct super_block *devfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-					int flags, const char *dev_name,</div><div class='del'>-					void *data)</div><div class='del'>-{</div><div class='del'>-	return get_sb_single(fs_type, flags, data, devfs_fill_super);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct file_system_type devfs_fs_type = {</div><div class='del'>-	.name = DEVFS_NAME,</div><div class='del'>-	.get_sb = devfs_get_sb,</div><div class='del'>-	.kill_sb = kill_anon_super,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*  File operations for devfsd follow  */</div><div class='del'>-</div><div class='del'>-static ssize_t devfsd_read(struct file *file, char __user *buf, size_t len,</div><div class='del'>-			   loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-	int done = FALSE;</div><div class='del'>-	int ival;</div><div class='del'>-	loff_t pos, devname_offset, tlen, rpos;</div><div class='del'>-	devfs_handle_t de;</div><div class='del'>-	struct devfsd_buf_entry *entry;</div><div class='del'>-	struct fs_info *fs_info = file-&gt;f_dentry-&gt;d_inode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-	struct devfsd_notify_struct *info = fs_info-&gt;devfsd_info;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-</div><div class='del'>-	/*  Verify the task has grabbed the queue  */</div><div class='del'>-	if (fs_info-&gt;devfsd_task != current)</div><div class='del'>-		return -EPERM;</div><div class='del'>-	info-&gt;major = 0;</div><div class='del'>-	info-&gt;minor = 0;</div><div class='del'>-	/*  Block for a new entry  */</div><div class='del'>-	set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-	add_wait_queue(&amp;fs_info-&gt;devfsd_wait_queue, &amp;wait);</div><div class='del'>-	while (devfsd_queue_empty(fs_info)) {</div><div class='del'>-		fs_info-&gt;devfsd_sleeping = TRUE;</div><div class='del'>-		wake_up(&amp;fs_info-&gt;revalidate_wait_queue);</div><div class='del'>-		schedule();</div><div class='del'>-		fs_info-&gt;devfsd_sleeping = FALSE;</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			remove_wait_queue(&amp;fs_info-&gt;devfsd_wait_queue, &amp;wait);</div><div class='del'>-			__set_current_state(TASK_RUNNING);</div><div class='del'>-			return -EINTR;</div><div class='del'>-		}</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-	}</div><div class='del'>-	remove_wait_queue(&amp;fs_info-&gt;devfsd_wait_queue, &amp;wait);</div><div class='del'>-	__set_current_state(TASK_RUNNING);</div><div class='del'>-	/*  Now play with the data  */</div><div class='del'>-	ival = atomic_read(&amp;fs_info-&gt;devfsd_overrun_count);</div><div class='del'>-	info-&gt;overrun_count = ival;</div><div class='del'>-	entry = fs_info-&gt;devfsd_first_event;</div><div class='del'>-	info-&gt;type = entry-&gt;type;</div><div class='del'>-	info-&gt;mode = entry-&gt;mode;</div><div class='del'>-	info-&gt;uid = entry-&gt;uid;</div><div class='del'>-	info-&gt;gid = entry-&gt;gid;</div><div class='del'>-	de = entry-&gt;de;</div><div class='del'>-	if (S_ISCHR(de-&gt;mode) || S_ISBLK(de-&gt;mode)) {</div><div class='del'>-		info-&gt;major = MAJOR(de-&gt;u.dev);</div><div class='del'>-		info-&gt;minor = MINOR(de-&gt;u.dev);</div><div class='del'>-	}</div><div class='del'>-	pos = devfs_generate_path(de, info-&gt;devname, DEVFS_PATHLEN);</div><div class='del'>-	if (pos &lt; 0)</div><div class='del'>-		return pos;</div><div class='del'>-	info-&gt;namelen = DEVFS_PATHLEN - pos - 1;</div><div class='del'>-	if (info-&gt;mode == 0)</div><div class='del'>-		info-&gt;mode = de-&gt;mode;</div><div class='del'>-	devname_offset = info-&gt;devname - (char *)info;</div><div class='del'>-	rpos = *ppos;</div><div class='del'>-	if (rpos &lt; devname_offset) {</div><div class='del'>-		/*  Copy parts of the header  */</div><div class='del'>-		tlen = devname_offset - rpos;</div><div class='del'>-		if (tlen &gt; len)</div><div class='del'>-			tlen = len;</div><div class='del'>-		if (copy_to_user(buf, (char *)info + rpos, tlen)) {</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		rpos += tlen;</div><div class='del'>-		buf += tlen;</div><div class='del'>-		len -= tlen;</div><div class='del'>-	}</div><div class='del'>-	if ((rpos &gt;= devname_offset) &amp;&amp; (len &gt; 0)) {</div><div class='del'>-		/*  Copy the name  */</div><div class='del'>-		tlen = info-&gt;namelen + 1;</div><div class='del'>-		if (tlen &gt; len)</div><div class='del'>-			tlen = len;</div><div class='del'>-		else</div><div class='del'>-			done = TRUE;</div><div class='del'>-		if (copy_to_user</div><div class='del'>-		    (buf, info-&gt;devname + pos + rpos - devname_offset, tlen)) {</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		rpos += tlen;</div><div class='del'>-	}</div><div class='del'>-	tlen = rpos - *ppos;</div><div class='del'>-	if (done) {</div><div class='del'>-		devfs_handle_t parent;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;fs_info-&gt;devfsd_buffer_lock);</div><div class='del'>-		fs_info-&gt;devfsd_first_event = entry-&gt;next;</div><div class='del'>-		if (entry-&gt;next == NULL)</div><div class='del'>-			fs_info-&gt;devfsd_last_event = NULL;</div><div class='del'>-		spin_unlock(&amp;fs_info-&gt;devfsd_buffer_lock);</div><div class='del'>-		for (; de != NULL; de = parent) {</div><div class='del'>-			parent = de-&gt;parent;</div><div class='del'>-			devfs_put(de);</div><div class='del'>-		}</div><div class='del'>-		kmem_cache_free(devfsd_buf_cache, entry);</div><div class='del'>-		if (ival &gt; 0)</div><div class='del'>-			atomic_sub(ival, &amp;fs_info-&gt;devfsd_overrun_count);</div><div class='del'>-		*ppos = 0;</div><div class='del'>-	} else</div><div class='del'>-		*ppos = rpos;</div><div class='del'>-	return tlen;</div><div class='del'>-}				/*  End Function devfsd_read  */</div><div class='del'>-</div><div class='del'>-static int devfsd_ioctl(struct inode *inode, struct file *file,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int ival;</div><div class='del'>-	struct fs_info *fs_info = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case DEVFSDIOC_GET_PROTO_REV:</div><div class='del'>-		ival = DEVFSD_PROTOCOL_REVISION_KERNEL;</div><div class='del'>-		if (copy_to_user((void __user *)arg, &amp;ival, sizeof ival))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		break;</div><div class='del'>-	case DEVFSDIOC_SET_EVENT_MASK:</div><div class='del'>-		/*  Ensure only one reader has access to the queue. This scheme will</div><div class='del'>-		   work even if the global kernel lock were to be removed, because it</div><div class='del'>-		   doesn't matter who gets in first, as long as only one gets it  */</div><div class='del'>-		if (fs_info-&gt;devfsd_task == NULL) {</div><div class='del'>-			static DEFINE_SPINLOCK(lock);</div><div class='del'>-</div><div class='del'>-			if (!spin_trylock(&amp;lock))</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			if (fs_info-&gt;devfsd_task != NULL) {	/*  We lost the race...  */</div><div class='del'>-				spin_unlock(&amp;lock);</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			}</div><div class='del'>-			fs_info-&gt;devfsd_task = current;</div><div class='del'>-			spin_unlock(&amp;lock);</div><div class='del'>-			fs_info-&gt;devfsd_pgrp =</div><div class='del'>-			    (process_group(current) ==</div><div class='del'>-			     current-&gt;pid) ? process_group(current) : 0;</div><div class='del'>-			fs_info-&gt;devfsd_file = file;</div><div class='del'>-			fs_info-&gt;devfsd_info =</div><div class='del'>-			    kmalloc(sizeof *fs_info-&gt;devfsd_info, GFP_KERNEL);</div><div class='del'>-			if (!fs_info-&gt;devfsd_info) {</div><div class='del'>-				devfsd_close(inode, file);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-		} else if (fs_info-&gt;devfsd_task != current)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		fs_info-&gt;devfsd_event_mask = arg;	/*  Let the masses come forth  */</div><div class='del'>-		break;</div><div class='del'>-	case DEVFSDIOC_RELEASE_EVENT_QUEUE:</div><div class='del'>-		if (fs_info-&gt;devfsd_file != file)</div><div class='del'>-			return -EPERM;</div><div class='del'>-		return devfsd_close(inode, file);</div><div class='del'>-		/*break; */</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	case DEVFSDIOC_SET_DEBUG_MASK:</div><div class='del'>-		if (copy_from_user(&amp;ival, (void __user *)arg, sizeof ival))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		devfs_debug = ival;</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfsd_ioctl  */</div><div class='del'>-</div><div class='del'>-static int devfsd_close(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct devfsd_buf_entry *entry, *next;</div><div class='del'>-	struct fs_info *fs_info = inode-&gt;i_sb-&gt;s_fs_info;</div><div class='del'>-</div><div class='del'>-	if (fs_info-&gt;devfsd_file != file)</div><div class='del'>-		return 0;</div><div class='del'>-	fs_info-&gt;devfsd_event_mask = 0;</div><div class='del'>-	fs_info-&gt;devfsd_file = NULL;</div><div class='del'>-	spin_lock(&amp;fs_info-&gt;devfsd_buffer_lock);</div><div class='del'>-	entry = fs_info-&gt;devfsd_first_event;</div><div class='del'>-	fs_info-&gt;devfsd_first_event = NULL;</div><div class='del'>-	fs_info-&gt;devfsd_last_event = NULL;</div><div class='del'>-	kfree(fs_info-&gt;devfsd_info);</div><div class='del'>-	fs_info-&gt;devfsd_info = NULL;</div><div class='del'>-	spin_unlock(&amp;fs_info-&gt;devfsd_buffer_lock);</div><div class='del'>-	fs_info-&gt;devfsd_pgrp = 0;</div><div class='del'>-	fs_info-&gt;devfsd_task = NULL;</div><div class='del'>-	wake_up(&amp;fs_info-&gt;revalidate_wait_queue);</div><div class='del'>-	for (; entry; entry = next) {</div><div class='del'>-		next = entry-&gt;next;</div><div class='del'>-		kmem_cache_free(devfsd_buf_cache, entry);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}				/*  End Function devfsd_close  */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-static ssize_t stat_read(struct file *file, char __user *buf, size_t len,</div><div class='del'>-			 loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-	ssize_t num;</div><div class='del'>-	char txt[80];</div><div class='del'>-</div><div class='del'>-	num = sprintf(txt, "Number of entries: %u  number of bytes: %u\n",</div><div class='del'>-		      stat_num_entries, stat_num_bytes) + 1;</div><div class='del'>-	if (*ppos &gt;= num)</div><div class='del'>-		return 0;</div><div class='del'>-	if (*ppos + len &gt; num)</div><div class='del'>-		len = num - *ppos;</div><div class='del'>-	if (copy_to_user(buf, txt + *ppos, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	*ppos += len;</div><div class='del'>-	return len;</div><div class='del'>-}				/*  End Function stat_read  */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init init_devfs_fs(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	int major;</div><div class='del'>-	struct devfs_entry *devfsd;</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	struct devfs_entry *stat;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (_devfs_get_root_entry() == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: %s Richard Gooch (rgooch@atnf.csiro.au)\n",</div><div class='del'>-	       DEVFS_NAME, DEVFS_VERSION);</div><div class='del'>-	devfsd_buf_cache = kmem_cache_create("devfsd_event",</div><div class='del'>-					     sizeof(struct devfsd_buf_entry),</div><div class='del'>-					     0, 0, NULL, NULL);</div><div class='del'>-	if (!devfsd_buf_cache)</div><div class='del'>-		OOPS("(): unable to allocate event slab\n");</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	devfs_debug = devfs_debug_init;</div><div class='del'>-	printk(KERN_INFO "%s: devfs_debug: 0x%0x\n", DEVFS_NAME, devfs_debug);</div><div class='del'>-#endif</div><div class='del'>-	printk(KERN_INFO "%s: boot_options: 0x%0x\n", DEVFS_NAME, boot_options);</div><div class='del'>-</div><div class='del'>-	/* register special device for devfsd communication */</div><div class='del'>-	major = register_chrdev(0, "devfs", &amp;devfs_fops);</div><div class='del'>-	if (major &lt; 0)</div><div class='del'>-		return major;</div><div class='del'>-</div><div class='del'>-	/*  And create the entry for ".devfsd"  */</div><div class='del'>-	devfsd = _devfs_alloc_entry(".devfsd", 0, S_IFCHR | S_IRUSR | S_IWUSR);</div><div class='del'>-	if (devfsd == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	devfsd-&gt;u.dev = MKDEV(major, 0);</div><div class='del'>-	_devfs_append_entry(root_entry, devfsd, NULL);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEVFS_DEBUG</div><div class='del'>-	stat = _devfs_alloc_entry(".stat", 0, S_IFCHR | S_IRUGO);</div><div class='del'>-	if (stat == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	stat-&gt;u.dev = MKDEV(major, 1);</div><div class='del'>-	_devfs_append_entry(root_entry, stat, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = register_filesystem(&amp;devfs_fs_type);</div><div class='del'>-	return err;</div><div class='del'>-}				/*  End Function init_devfs_fs  */</div><div class='del'>-</div><div class='del'>-void __init mount_devfs_fs(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!(boot_options &amp; OPTION_MOUNT))</div><div class='del'>-		return;</div><div class='del'>-	err = do_mount("none", "/dev", "devfs", 0, NULL);</div><div class='del'>-	if (err == 0)</div><div class='del'>-		printk(KERN_INFO "Mounted devfs on /dev\n");</div><div class='del'>-	else</div><div class='del'>-		PRINTK("(): unable to mount devfs, err: %d\n", err);</div><div class='del'>-}				/*  End Function mount_devfs_fs  */</div><div class='del'>-</div><div class='del'>-module_init(init_devfs_fs)</div><div class='head'>diff --git a/fs/devfs/util.c b/fs/devfs/util.c<br/>deleted file mode 100644<br/>index db06d388c9ac..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/fs/devfs/util.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devfs/util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,97 +0,0 @@</div><div class='del'>-/*  devfs (Device FileSystem) utilities.</div><div class='del'>-</div><div class='del'>-    Copyright (C) 1999-2002  Richard Gooch</div><div class='del'>-</div><div class='del'>-    This library is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of the GNU Library General Public</div><div class='del'>-    License as published by the Free Software Foundation; either</div><div class='del'>-    version 2 of the License, or (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This library is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>-    Library General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU Library General Public</div><div class='del'>-    License along with this library; if not, write to the Free</div><div class='del'>-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-</div><div class='del'>-    Richard Gooch may be reached by email at  rgooch@atnf.csiro.au</div><div class='del'>-    The postal address is:</div><div class='del'>-      Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.</div><div class='del'>-</div><div class='del'>-    ChangeLog</div><div class='del'>-</div><div class='del'>-    19991031   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created.</div><div class='del'>-    19991103   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;_devfs_convert_name&gt; and supported SCSI and IDE CD-ROMs</div><div class='del'>-    20000203   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Changed operations pointer type to void *.</div><div class='del'>-    20000621   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Changed interface to &lt;devfs_register_series&gt;.</div><div class='del'>-    20000622   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Took account of interface change to &lt;devfs_mk_symlink&gt;.</div><div class='del'>-               Took account of interface change to &lt;devfs_mk_dir&gt;.</div><div class='del'>-    20010519   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Documentation cleanup.</div><div class='del'>-    20010709   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;devfs_*alloc_major&gt; and &lt;devfs_*alloc_devnum&gt;.</div><div class='del'>-    20010710   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Created &lt;devfs_*alloc_unique_number&gt;.</div><div class='del'>-    20010730   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Documentation typo fix.</div><div class='del'>-    20010806   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Made &lt;block_semaphore&gt; and &lt;char_semaphore&gt; private.</div><div class='del'>-    20010813   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fixed bug in &lt;devfs_alloc_unique_number&gt;: limited to 128 numbers</div><div class='del'>-    20010818   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Updated major masks up to Linus' "no new majors" proclamation.</div><div class='del'>-	       Block: were 126 now 122 free, char: were 26 now 19 free.</div><div class='del'>-    20020324   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fixed bug in &lt;devfs_alloc_unique_number&gt;: was clearing beyond</div><div class='del'>-	       bitfield.</div><div class='del'>-    20020326   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fixed bitfield data type for &lt;devfs_*alloc_devnum&gt;.</div><div class='del'>-               Made major bitfield type and initialiser 64 bit safe.</div><div class='del'>-    20020413   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Fixed shift warning on 64 bit machines.</div><div class='del'>-    20020428   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Copied and used macro for error messages from fs/devfs/base.c </div><div class='del'>-    20021013   Richard Gooch &lt;rgooch@atnf.csiro.au&gt;</div><div class='del'>-               Documentation fix.</div><div class='del'>-    20030101   Adam J. Richter &lt;adam@yggdrasil.com&gt;</div><div class='del'>-               Eliminate DEVFS_SPECIAL_{CHR,BLK}.  Use mode_t instead.</div><div class='del'>-    20030106   Christoph Hellwig &lt;hch@infradead.org&gt;</div><div class='del'>-               Rewrite devfs_{,de}alloc_devnum to look like C code.</div><div class='del'>-*/</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/devfs_fs_kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/genhd.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-int devfs_register_tape(const char *name)</div><div class='del'>-{</div><div class='del'>-	char tname[32], dest[64];</div><div class='del'>-	static unsigned int tape_counter;</div><div class='del'>-	unsigned int n = tape_counter++;</div><div class='del'>-</div><div class='del'>-	sprintf(dest, "../%s", name);</div><div class='del'>-	sprintf(tname, "tapes/tape%u", n);</div><div class='del'>-	devfs_mk_symlink(tname, dest);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(devfs_register_tape);</div><div class='del'>-</div><div class='del'>-void devfs_unregister_tape(int num)</div><div class='del'>-{</div><div class='del'>-	if (num &gt;= 0)</div><div class='del'>-		devfs_remove("tapes/tape%u", num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(devfs_unregister_tape);</div><div class='head'>diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c<br/>index 14c5620b5cab..f7aef5bb584a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/devpts/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/devpts/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/devpts/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/devpts/inode.c</a></div><div class='hunk'>@@ -130,10 +130,10 @@ fail:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *devpts_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int devpts_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_single(fs_type, flags, data, devpts_fill_super);</div><div class='add'>+	return get_sb_single(fs_type, flags, data, devpts_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type devpts_fs_type = {</div><div class='head'>diff --git a/fs/direct-io.c b/fs/direct-io.c<br/>index b05d1b218776..5981e17f46f0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/direct-io.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/direct-io.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/direct-io.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/direct-io.c</a></div><div class='hunk'>@@ -162,7 +162,7 @@ static int dio_refill_pages(struct dio *dio)</div><div class='ctx'> 		NULL);				/* vmas */</div><div class='ctx'> 	up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='del'>-	if (ret &lt; 0 &amp;&amp; dio-&gt;blocks_available &amp;&amp; (dio-&gt;rw == WRITE)) {</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; dio-&gt;blocks_available &amp;&amp; (dio-&gt;rw &amp; WRITE)) {</div><div class='ctx'> 		struct page *page = ZERO_PAGE(dio-&gt;curr_user_address);</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * A memory fault, but the filesystem has some outstanding</div><div class='hunk'>@@ -220,7 +220,8 @@ static void dio_complete(struct dio *dio, loff_t offset, ssize_t bytes)</div><div class='ctx'> 	if (dio-&gt;end_io &amp;&amp; dio-&gt;result)</div><div class='ctx'> 		dio-&gt;end_io(dio-&gt;iocb, offset, bytes, dio-&gt;map_bh.b_private);</div><div class='ctx'> 	if (dio-&gt;lock_type == DIO_LOCKING)</div><div class='del'>-		up_read(&amp;dio-&gt;inode-&gt;i_alloc_sem);</div><div class='add'>+		/* lockdep: non-owner release */</div><div class='add'>+		up_read_non_owner(&amp;dio-&gt;inode-&gt;i_alloc_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -535,7 +536,7 @@ static int get_more_blocks(struct dio *dio)</div><div class='ctx'> 		map_bh-&gt;b_state = 0;</div><div class='ctx'> 		map_bh-&gt;b_size = fs_count &lt;&lt; dio-&gt;inode-&gt;i_blkbits;</div><div class='ctx'> </div><div class='del'>-		create = dio-&gt;rw == WRITE;</div><div class='add'>+		create = dio-&gt;rw &amp; WRITE;</div><div class='ctx'> 		if (dio-&gt;lock_type == DIO_LOCKING) {</div><div class='ctx'> 			if (dio-&gt;block_in_file &lt; (i_size_read(dio-&gt;inode) &gt;&gt;</div><div class='ctx'> 							dio-&gt;blkbits))</div><div class='hunk'>@@ -867,7 +868,7 @@ do_holes:</div><div class='ctx'> 				loff_t i_size_aligned;</div><div class='ctx'> </div><div class='ctx'> 				/* AKPM: eargh, -ENOTBLK is a hack */</div><div class='del'>-				if (dio-&gt;rw == WRITE) {</div><div class='add'>+				if (dio-&gt;rw &amp; WRITE) {</div><div class='ctx'> 					page_cache_release(page);</div><div class='ctx'> 					return -ENOTBLK;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1045,7 +1046,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> 	} /* end iovec loop */</div><div class='ctx'> </div><div class='del'>-	if (ret == -ENOTBLK &amp;&amp; rw == WRITE) {</div><div class='add'>+	if (ret == -ENOTBLK &amp;&amp; (rw &amp; WRITE)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The remaining part of the request will be</div><div class='ctx'> 		 * be handled by buffered I/O when we return</div><div class='hunk'>@@ -1089,7 +1090,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 	if (dio-&gt;is_async) {</div><div class='ctx'> 		int should_wait = 0;</div><div class='ctx'> </div><div class='del'>-		if (dio-&gt;result &lt; dio-&gt;size &amp;&amp; rw == WRITE) {</div><div class='add'>+		if (dio-&gt;result &lt; dio-&gt;size &amp;&amp; (rw &amp; WRITE)) {</div><div class='ctx'> 			dio-&gt;waiter = current;</div><div class='ctx'> 			should_wait = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1142,7 +1143,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 			ret = transferred;</div><div class='ctx'> </div><div class='ctx'> 		/* We could have also come here on an AIO file extend */</div><div class='del'>-		if (!is_sync_kiocb(iocb) &amp;&amp; rw == WRITE &amp;&amp;</div><div class='add'>+		if (!is_sync_kiocb(iocb) &amp;&amp; (rw &amp; WRITE) &amp;&amp;</div><div class='ctx'> 		    ret &gt;= 0 &amp;&amp; dio-&gt;result == dio-&gt;size)</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * For AIO writes where we have completed the</div><div class='hunk'>@@ -1194,7 +1195,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 	int acquire_i_mutex = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (rw &amp; WRITE)</div><div class='del'>-		current-&gt;flags |= PF_SYNCWRITE;</div><div class='add'>+		rw = WRITE_SYNC;</div><div class='ctx'> </div><div class='ctx'> 	if (bdev)</div><div class='ctx'> 		bdev_blkbits = blksize_bits(bdev_hardsect_size(bdev));</div><div class='hunk'>@@ -1261,7 +1262,8 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (dio_lock_type == DIO_LOCKING)</div><div class='del'>-			down_read(&amp;inode-&gt;i_alloc_sem);</div><div class='add'>+			/* lockdep: not the owner will release it */</div><div class='add'>+			down_read_non_owner(&amp;inode-&gt;i_alloc_sem);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1270,7 +1272,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,</div><div class='ctx'> 	 * even for AIO, we need to wait for i/o to complete before</div><div class='ctx'> 	 * returning in this case.</div><div class='ctx'> 	 */</div><div class='del'>-	dio-&gt;is_async = !is_sync_kiocb(iocb) &amp;&amp; !((rw == WRITE) &amp;&amp;</div><div class='add'>+	dio-&gt;is_async = !is_sync_kiocb(iocb) &amp;&amp; !((rw &amp; WRITE) &amp;&amp;</div><div class='ctx'> 		(end &gt; i_size_read(inode)));</div><div class='ctx'> </div><div class='ctx'> 	retval = direct_io_worker(rw, iocb, inode, iov, offset,</div><div class='hunk'>@@ -1284,8 +1286,6 @@ out:</div><div class='ctx'> 		mutex_unlock(&amp;inode-&gt;i_mutex);</div><div class='ctx'> 	else if (acquire_i_mutex)</div><div class='ctx'> 		mutex_lock(&amp;inode-&gt;i_mutex);</div><div class='del'>-	if (rw &amp; WRITE)</div><div class='del'>-		current-&gt;flags &amp;= ~PF_SYNCWRITE;</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(__blockdev_direct_IO);</div><div class='head'>diff --git a/fs/dquot.c b/fs/dquot.c<br/>index 81d87a413c68..0122a279106a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/dquot.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/dquot.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/dquot.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/dquot.c</a></div><div class='hunk'>@@ -250,7 +250,7 @@ static inline struct dquot *find_dquot(unsigned int hashent, struct super_block</div><div class='ctx'> /* Add a dquot to the tail of the free list */</div><div class='ctx'> static inline void put_dquot_last(struct dquot *dquot)</div><div class='ctx'> {</div><div class='del'>-	list_add(&amp;dquot-&gt;dq_free, free_dquots.prev);</div><div class='add'>+	list_add_tail(&amp;dquot-&gt;dq_free, &amp;free_dquots);</div><div class='ctx'> 	dqstats.free_dquots++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -266,7 +266,7 @@ static inline void put_inuse(struct dquot *dquot)</div><div class='ctx'> {</div><div class='ctx'> 	/* We add to the back of inuse list so we don't have to restart</div><div class='ctx'> 	 * when traversing this list and we block */</div><div class='del'>-	list_add(&amp;dquot-&gt;dq_inuse, inuse_list.prev);</div><div class='add'>+	list_add_tail(&amp;dquot-&gt;dq_inuse, &amp;inuse_list);</div><div class='ctx'> 	dqstats.allocated_dquots++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/efs/inode.c b/fs/efs/inode.c<br/>index 180607f9314d..174696f9bf14 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/efs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/efs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/efs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/efs/inode.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ static sector_t _efs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> {</div><div class='ctx'> 	return generic_block_bmap(mapping,block,efs_get_block);</div><div class='ctx'> }</div><div class='del'>-static struct address_space_operations efs_aops = {</div><div class='add'>+static const struct address_space_operations efs_aops = {</div><div class='ctx'> 	.readpage = efs_readpage,</div><div class='ctx'> 	.sync_page = block_sync_page,</div><div class='ctx'> 	.bmap = _efs_bmap</div><div class='head'>diff --git a/fs/efs/super.c b/fs/efs/super.c<br/>index dff623e3ddbf..8ac2462ae5dd 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/efs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/efs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/efs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/efs/super.c</a></div><div class='hunk'>@@ -15,13 +15,13 @@</div><div class='ctx'> #include &lt;linux/buffer_head.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='ctx'> </div><div class='del'>-static int efs_statfs(struct super_block *s, struct kstatfs *buf);</div><div class='add'>+static int efs_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='ctx'> static int efs_fill_super(struct super_block *s, void *d, int silent);</div><div class='ctx'> </div><div class='del'>-static struct super_block *efs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int efs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, efs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, efs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type efs_fs_type = {</div><div class='hunk'>@@ -322,8 +322,8 @@ out_no_fs:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int efs_statfs(struct super_block *s, struct kstatfs *buf) {</div><div class='del'>-	struct efs_sb_info *sb = SUPER_INFO(s);</div><div class='add'>+static int efs_statfs(struct dentry *dentry, struct kstatfs *buf) {</div><div class='add'>+	struct efs_sb_info *sb = SUPER_INFO(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type    = EFS_SUPER_MAGIC;	/* efs magic number */</div><div class='ctx'> 	buf-&gt;f_bsize   = EFS_BLOCKSIZE;		/* blocksize */</div><div class='head'>diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c<br/>index 3d9a350e3e7f..e249cf733a6b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/efs/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/efs/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/efs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/efs/symlink.c</a></div><div class='hunk'>@@ -53,6 +53,6 @@ fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations efs_symlink_aops = {</div><div class='add'>+const struct address_space_operations efs_symlink_aops = {</div><div class='ctx'> 	.readpage	= efs_symlink_readpage</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/eventpoll.c b/fs/eventpoll.c<br/>index 1b4491cdd115..19ffb043abbc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/eventpoll.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/eventpoll.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/eventpoll.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/eventpoll.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  *  fs/eventpoll.c ( Efficent event polling implementation )</div><div class='del'>- *  Copyright (C) 2001,...,2003	 Davide Libenzi</div><div class='add'>+ *  Copyright (C) 2001,...,2006	 Davide Libenzi</div><div class='ctx'>  *</div><div class='ctx'>  *  This program is free software; you can redistribute it and/or modify</div><div class='ctx'>  *  it under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -120,7 +120,7 @@ struct epoll_filefd {</div><div class='ctx'>  */</div><div class='ctx'> struct wake_task_node {</div><div class='ctx'> 	struct list_head llink;</div><div class='del'>-	task_t *task;</div><div class='add'>+	struct task_struct *task;</div><div class='ctx'> 	wait_queue_head_t *wq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -268,9 +268,9 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,</div><div class='ctx'> 		   int maxevents, long timeout);</div><div class='ctx'> static int eventpollfs_delete_dentry(struct dentry *dentry);</div><div class='ctx'> static struct inode *ep_eventpoll_inode(void);</div><div class='del'>-static struct super_block *eventpollfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-					      int flags, const char *dev_name,</div><div class='del'>-					      void *data);</div><div class='add'>+static int eventpollfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+			      int flags, const char *dev_name,</div><div class='add'>+			      void *data, struct vfsmount *mnt);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This semaphore is used to serialize ep_free() and eventpoll_release_file().</div><div class='hunk'>@@ -337,20 +337,20 @@ static inline int ep_cmp_ffd(struct epoll_filefd *p1,</div><div class='ctx'> /* Special initialization for the rb-tree node to detect linkage */</div><div class='ctx'> static inline void ep_rb_initnode(struct rb_node *n)</div><div class='ctx'> {</div><div class='del'>-	n-&gt;rb_parent = n;</div><div class='add'>+	rb_set_parent(n, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Removes a node from the rb-tree and marks it for a fast is-linked check */</div><div class='ctx'> static inline void ep_rb_erase(struct rb_node *n, struct rb_root *r)</div><div class='ctx'> {</div><div class='ctx'> 	rb_erase(n, r);</div><div class='del'>-	n-&gt;rb_parent = n;</div><div class='add'>+	rb_set_parent(n, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Fast check to verify that the item is linked to the main rb-tree */</div><div class='ctx'> static inline int ep_rb_linked(struct rb_node *n)</div><div class='ctx'> {</div><div class='del'>-	return n-&gt;rb_parent != n;</div><div class='add'>+	return rb_parent(n) != n;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -413,7 +413,7 @@ static void ep_poll_safewake(struct poll_safewake *psw, wait_queue_head_t *wq)</div><div class='ctx'> {</div><div class='ctx'> 	int wake_nests = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	task_t *this_task = current;</div><div class='add'>+	struct task_struct *this_task = current;</div><div class='ctx'> 	struct list_head *lsthead = &amp;psw-&gt;wake_task_list, *lnk;</div><div class='ctx'> 	struct wake_task_node *tncur;</div><div class='ctx'> 	struct wake_task_node tnode;</div><div class='hunk'>@@ -1004,7 +1004,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,</div><div class='ctx'> </div><div class='ctx'> 		/* Notify waiting tasks that events are available */</div><div class='ctx'> 		if (waitqueue_active(&amp;ep-&gt;wq))</div><div class='del'>-			wake_up(&amp;ep-&gt;wq);</div><div class='add'>+			__wake_up_locked(&amp;ep-&gt;wq, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE);</div><div class='ctx'> 		if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='ctx'> 			pwake++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1083,7 +1083,8 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even</div><div class='ctx'> </div><div class='ctx'> 				/* Notify waiting tasks that events are available */</div><div class='ctx'> 				if (waitqueue_active(&amp;ep-&gt;wq))</div><div class='del'>-					wake_up(&amp;ep-&gt;wq);</div><div class='add'>+					__wake_up_locked(&amp;ep-&gt;wq, TASK_UNINTERRUPTIBLE |</div><div class='add'>+							 TASK_INTERRUPTIBLE);</div><div class='ctx'> 				if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='ctx'> 					pwake++;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1260,7 +1261,8 @@ is_linked:</div><div class='ctx'> 	 * wait list.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (waitqueue_active(&amp;ep-&gt;wq))</div><div class='del'>-		wake_up(&amp;ep-&gt;wq);</div><div class='add'>+		__wake_up_locked(&amp;ep-&gt;wq, TASK_UNINTERRUPTIBLE |</div><div class='add'>+				 TASK_INTERRUPTIBLE);</div><div class='ctx'> 	if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='ctx'> 		pwake++;</div><div class='ctx'> </div><div class='hunk'>@@ -1444,7 +1446,8 @@ static void ep_reinject_items(struct eventpoll *ep, struct list_head *txlist)</div><div class='ctx'> 		 * wait list.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (waitqueue_active(&amp;ep-&gt;wq))</div><div class='del'>-			wake_up(&amp;ep-&gt;wq);</div><div class='add'>+			__wake_up_locked(&amp;ep-&gt;wq, TASK_UNINTERRUPTIBLE |</div><div class='add'>+					 TASK_INTERRUPTIBLE);</div><div class='ctx'> 		if (waitqueue_active(&amp;ep-&gt;poll_wait))</div><div class='ctx'> 			pwake++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1516,7 +1519,7 @@ retry:</div><div class='ctx'> 		 * ep_poll_callback() when events will become available.</div><div class='ctx'> 		 */</div><div class='ctx'> 		init_waitqueue_entry(&amp;wait, current);</div><div class='del'>-		add_wait_queue(&amp;ep-&gt;wq, &amp;wait);</div><div class='add'>+		__add_wait_queue(&amp;ep-&gt;wq, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 		for (;;) {</div><div class='ctx'> 			/*</div><div class='hunk'>@@ -1536,7 +1539,7 @@ retry:</div><div class='ctx'> 			jtimeout = schedule_timeout(jtimeout);</div><div class='ctx'> 			write_lock_irqsave(&amp;ep-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='del'>-		remove_wait_queue(&amp;ep-&gt;wq, &amp;wait);</div><div class='add'>+		__remove_wait_queue(&amp;ep-&gt;wq, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1595,11 +1598,12 @@ eexit_1:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct super_block *</div><div class='add'>+static int</div><div class='ctx'> eventpollfs_get_sb(struct file_system_type *fs_type, int flags,</div><div class='del'>-		   const char *dev_name, void *data)</div><div class='add'>+		   const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_pseudo(fs_type, "eventpoll:", NULL, EVENTPOLLFS_MAGIC);</div><div class='add'>+	return get_sb_pseudo(fs_type, "eventpoll:", NULL, EVENTPOLLFS_MAGIC,</div><div class='add'>+			     mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/fs/exec.c b/fs/exec.c<br/>index 3a79d97ac234..8344ba73a2a6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/exec.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/exec.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/exec.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/exec.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'>  * formats. </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/mman.h&gt;</div><div class='hunk'>@@ -49,6 +48,7 @@</div><div class='ctx'> #include &lt;linux/rmap.h&gt;</div><div class='ctx'> #include &lt;linux/acct.h&gt;</div><div class='ctx'> #include &lt;linux/cn_proc.h&gt;</div><div class='add'>+#include &lt;linux/audit.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/mmu_context.h&gt;</div><div class='hunk'>@@ -665,8 +665,6 @@ static int de_thread(struct task_struct *tsk)</div><div class='ctx'> 	 * and to assume its PID:</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!thread_group_leader(current)) {</div><div class='del'>-		struct dentry *proc_dentry1, *proc_dentry2;</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Wait for the thread group leader to be a zombie.</div><div class='ctx'> 		 * It should already be zombie at this point, most</div><div class='hunk'>@@ -688,10 +686,6 @@ static int de_thread(struct task_struct *tsk)</div><div class='ctx'> 		 */</div><div class='ctx'> 		current-&gt;start_time = leader-&gt;start_time;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;leader-&gt;proc_lock);</div><div class='del'>-		spin_lock(&amp;current-&gt;proc_lock);</div><div class='del'>-		proc_dentry1 = proc_pid_unhash(current);</div><div class='del'>-		proc_dentry2 = proc_pid_unhash(leader);</div><div class='ctx'> 		write_lock_irq(&amp;tasklist_lock);</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(leader-&gt;tgid != current-&gt;tgid);</div><div class='hunk'>@@ -712,7 +706,7 @@ static int de_thread(struct task_struct *tsk)</div><div class='ctx'> 		attach_pid(current, PIDTYPE_PID,  current-&gt;pid);</div><div class='ctx'> 		attach_pid(current, PIDTYPE_PGID, current-&gt;signal-&gt;pgrp);</div><div class='ctx'> 		attach_pid(current, PIDTYPE_SID,  current-&gt;signal-&gt;session);</div><div class='del'>-		list_add_tail_rcu(&amp;current-&gt;tasks, &amp;init_task.tasks);</div><div class='add'>+		list_replace_rcu(&amp;leader-&gt;tasks, &amp;current-&gt;tasks);</div><div class='ctx'> </div><div class='ctx'> 		current-&gt;group_leader = current;</div><div class='ctx'> 		leader-&gt;group_leader = current;</div><div class='hunk'>@@ -720,7 +714,6 @@ static int de_thread(struct task_struct *tsk)</div><div class='ctx'> 		/* Reduce leader to a thread */</div><div class='ctx'> 		detach_pid(leader, PIDTYPE_PGID);</div><div class='ctx'> 		detach_pid(leader, PIDTYPE_SID);</div><div class='del'>-		list_del_init(&amp;leader-&gt;tasks);</div><div class='ctx'> </div><div class='ctx'> 		current-&gt;exit_signal = SIGCHLD;</div><div class='ctx'> </div><div class='hunk'>@@ -728,10 +721,6 @@ static int de_thread(struct task_struct *tsk)</div><div class='ctx'> 		leader-&gt;exit_state = EXIT_DEAD;</div><div class='ctx'> </div><div class='ctx'> 		write_unlock_irq(&amp;tasklist_lock);</div><div class='del'>-		spin_unlock(&amp;leader-&gt;proc_lock);</div><div class='del'>-		spin_unlock(&amp;current-&gt;proc_lock);</div><div class='del'>-		proc_pid_flush(proc_dentry1);</div><div class='del'>-		proc_pid_flush(proc_dentry2);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -865,7 +854,6 @@ int flush_old_exec(struct linux_binprm * bprm)</div><div class='ctx'> 	bprm-&gt;mm = NULL;		/* We're using it now */</div><div class='ctx'> </div><div class='ctx'> 	/* This is the point of no return */</div><div class='del'>-	steal_locks(files);</div><div class='ctx'> 	put_files_struct(files);</div><div class='ctx'> </div><div class='ctx'> 	current-&gt;sas_ss_sp = current-&gt;sas_ss_size = 0;</div><div class='hunk'>@@ -1085,6 +1073,11 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)</div><div class='ctx'> 	/* kernel module loader fixup */</div><div class='ctx'> 	/* so we don't try to load run modprobe in kernel space. */</div><div class='ctx'> 	set_fs(USER_DS);</div><div class='add'>+</div><div class='add'>+	retval = audit_bprm(bprm);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='ctx'> 	retval = -ENOENT;</div><div class='ctx'> 	for (try=0; try&lt;2; try++) {</div><div class='ctx'> 		read_lock(&amp;binfmt_lock);</div><div class='hunk'>@@ -1374,67 +1367,102 @@ static void format_corename(char *corename, const char *pattern, long signr)</div><div class='ctx'> 	*out_ptr = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void zap_threads (struct mm_struct *mm)</div><div class='add'>+static void zap_process(struct task_struct *start)</div><div class='ctx'> {</div><div class='del'>-	struct task_struct *g, *p;</div><div class='del'>-	struct task_struct *tsk = current;</div><div class='del'>-	struct completion *vfork_done = tsk-&gt;vfork_done;</div><div class='del'>-	int traced = 0;</div><div class='add'>+	struct task_struct *t;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Make sure nobody is waiting for us to release the VM,</div><div class='del'>-	 * otherwise we can deadlock when we wait on each other</div><div class='del'>-	 */</div><div class='del'>-	if (vfork_done) {</div><div class='del'>-		tsk-&gt;vfork_done = NULL;</div><div class='del'>-		complete(vfork_done);</div><div class='del'>-	}</div><div class='add'>+	start-&gt;signal-&gt;flags = SIGNAL_GROUP_EXIT;</div><div class='add'>+	start-&gt;signal-&gt;group_stop_count = 0;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;tasklist_lock);</div><div class='del'>-	do_each_thread(g,p)</div><div class='del'>-		if (mm == p-&gt;mm &amp;&amp; p != tsk) {</div><div class='del'>-			force_sig_specific(SIGKILL, p);</div><div class='del'>-			mm-&gt;core_waiters++;</div><div class='del'>-			if (unlikely(p-&gt;ptrace) &amp;&amp;</div><div class='del'>-			    unlikely(p-&gt;parent-&gt;mm == mm))</div><div class='del'>-				traced = 1;</div><div class='add'>+	t = start;</div><div class='add'>+	do {</div><div class='add'>+		if (t != current &amp;&amp; t-&gt;mm) {</div><div class='add'>+			t-&gt;mm-&gt;core_waiters++;</div><div class='add'>+			sigaddset(&amp;t-&gt;pending.signal, SIGKILL);</div><div class='add'>+			signal_wake_up(t, 1);</div><div class='ctx'> 		}</div><div class='del'>-	while_each_thread(g,p);</div><div class='add'>+	} while ((t = next_thread(t)) != start);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	read_unlock(&amp;tasklist_lock);</div><div class='add'>+static inline int zap_threads(struct task_struct *tsk, struct mm_struct *mm,</div><div class='add'>+				int exit_code)</div><div class='add'>+{</div><div class='add'>+	struct task_struct *g, *p;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int err = -EAGAIN;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;tsk-&gt;sighand-&gt;siglock);</div><div class='add'>+	if (!(tsk-&gt;signal-&gt;flags &amp; SIGNAL_GROUP_EXIT)) {</div><div class='add'>+		tsk-&gt;signal-&gt;group_exit_code = exit_code;</div><div class='add'>+		zap_process(tsk);</div><div class='add'>+		err = 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;tsk-&gt;sighand-&gt;siglock);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(traced)) {</div><div class='del'>-		/*</div><div class='del'>-		 * We are zapping a thread and the thread it ptraces.</div><div class='del'>-		 * If the tracee went into a ptrace stop for exit tracing,</div><div class='del'>-		 * we could deadlock since the tracer is waiting for this</div><div class='del'>-		 * coredump to finish.  Detach them so they can both die.</div><div class='del'>-		 */</div><div class='del'>-		write_lock_irq(&amp;tasklist_lock);</div><div class='del'>-		do_each_thread(g,p) {</div><div class='del'>-			if (mm == p-&gt;mm &amp;&amp; p != tsk &amp;&amp;</div><div class='del'>-			    p-&gt;ptrace &amp;&amp; p-&gt;parent-&gt;mm == mm) {</div><div class='del'>-				__ptrace_detach(p, 0);</div><div class='add'>+	if (atomic_read(&amp;mm-&gt;mm_users) == mm-&gt;core_waiters + 1)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for_each_process(g) {</div><div class='add'>+		if (g == tsk-&gt;group_leader)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		p = g;</div><div class='add'>+		do {</div><div class='add'>+			if (p-&gt;mm) {</div><div class='add'>+				if (p-&gt;mm == mm) {</div><div class='add'>+					/*</div><div class='add'>+					 * p-&gt;sighand can't disappear, but</div><div class='add'>+					 * may be changed by de_thread()</div><div class='add'>+					 */</div><div class='add'>+					lock_task_sighand(p, &amp;flags);</div><div class='add'>+					zap_process(p);</div><div class='add'>+					unlock_task_sighand(p, &amp;flags);</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-		} while_each_thread(g,p);</div><div class='del'>-		write_unlock_irq(&amp;tasklist_lock);</div><div class='add'>+		} while ((p = next_thread(p)) != g);</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+done:</div><div class='add'>+	return mm-&gt;core_waiters;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void coredump_wait(struct mm_struct *mm)</div><div class='add'>+static int coredump_wait(int exit_code)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_COMPLETION(startup_done);</div><div class='add'>+	struct task_struct *tsk = current;</div><div class='add'>+	struct mm_struct *mm = tsk-&gt;mm;</div><div class='add'>+	struct completion startup_done;</div><div class='add'>+	struct completion *vfork_done;</div><div class='ctx'> 	int core_waiters;</div><div class='ctx'> </div><div class='add'>+	init_completion(&amp;mm-&gt;core_done);</div><div class='add'>+	init_completion(&amp;startup_done);</div><div class='ctx'> 	mm-&gt;core_startup_done = &amp;startup_done;</div><div class='ctx'> </div><div class='del'>-	zap_threads(mm);</div><div class='del'>-	core_waiters = mm-&gt;core_waiters;</div><div class='add'>+	core_waiters = zap_threads(tsk, mm, exit_code);</div><div class='ctx'> 	up_write(&amp;mm-&gt;mmap_sem);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(core_waiters &lt; 0))</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure nobody is waiting for us to release the VM,</div><div class='add'>+	 * otherwise we can deadlock when we wait on each other</div><div class='add'>+	 */</div><div class='add'>+	vfork_done = tsk-&gt;vfork_done;</div><div class='add'>+	if (vfork_done) {</div><div class='add'>+		tsk-&gt;vfork_done = NULL;</div><div class='add'>+		complete(vfork_done);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (core_waiters)</div><div class='ctx'> 		wait_for_completion(&amp;startup_done);</div><div class='add'>+fail:</div><div class='ctx'> 	BUG_ON(mm-&gt;core_waiters);</div><div class='add'>+	return core_waiters;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int do_coredump(long signr, int exit_code, struct pt_regs * regs)</div><div class='hunk'>@@ -1468,22 +1496,9 @@ int do_coredump(long signr, int exit_code, struct pt_regs * regs)</div><div class='ctx'> 	}</div><div class='ctx'> 	mm-&gt;dumpable = 0;</div><div class='ctx'> </div><div class='del'>-	retval = -EAGAIN;</div><div class='del'>-	spin_lock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	if (!(current-&gt;signal-&gt;flags &amp; SIGNAL_GROUP_EXIT)) {</div><div class='del'>-		current-&gt;signal-&gt;flags = SIGNAL_GROUP_EXIT;</div><div class='del'>-		current-&gt;signal-&gt;group_exit_code = exit_code;</div><div class='del'>-		current-&gt;signal-&gt;group_stop_count = 0;</div><div class='del'>-		retval = 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;current-&gt;sighand-&gt;siglock);</div><div class='del'>-	if (retval) {</div><div class='del'>-		up_write(&amp;mm-&gt;mmap_sem);</div><div class='add'>+	retval = coredump_wait(exit_code);</div><div class='add'>+	if (retval &lt; 0)</div><div class='ctx'> 		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_completion(&amp;mm-&gt;core_done);</div><div class='del'>-	coredump_wait(mm);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear any false indication of pending signals that might</div><div class='head'>diff --git a/fs/ext2/Makefile b/fs/ext2/Makefile<br/>index c5d02da73bc3..e0b2b43c1fdb 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/Makefile</a></div><div class='hunk'>@@ -4,7 +4,7 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_EXT2_FS) += ext2.o</div><div class='ctx'> </div><div class='del'>-ext2-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \</div><div class='add'>+ext2-y := balloc.o dir.o file.o fsync.o ialloc.o inode.o \</div><div class='ctx'> 	  ioctl.o namei.o super.o symlink.o</div><div class='ctx'> </div><div class='ctx'> ext2-$(CONFIG_EXT2_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o</div><div class='head'>diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c<br/>index 2c00953d4b0b..d4870432ecfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/balloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/balloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/balloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/balloc.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *        David S. Miller (davem@caip.rutgers.edu), 1995</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include "ext2.h"</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -521,6 +520,26 @@ io_error:</div><div class='ctx'> 	goto out_release;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef EXT2FS_DEBUG</div><div class='add'>+</div><div class='add'>+static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};</div><div class='add'>+</div><div class='add'>+unsigned long ext2_count_free (struct buffer_head * map, unsigned int numchars)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned long sum = 0;</div><div class='add'>+</div><div class='add'>+	if (!map)</div><div class='add'>+		return (0);</div><div class='add'>+	for (i = 0; i &lt; numchars; i++)</div><div class='add'>+		sum += nibblemap[map-&gt;b_data[i] &amp; 0xf] +</div><div class='add'>+			nibblemap[(map-&gt;b_data[i] &gt;&gt; 4) &amp; 0xf];</div><div class='add'>+	return (sum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif  /*  EXT2FS_DEBUG  */</div><div class='add'>+</div><div class='add'>+/* Superblock must be locked */</div><div class='ctx'> unsigned long ext2_count_free_blocks (struct super_block * sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext2_group_desc * desc;</div><div class='hunk'>@@ -530,7 +549,6 @@ unsigned long ext2_count_free_blocks (struct super_block * sb)</div><div class='ctx'> 	unsigned long bitmap_count, x;</div><div class='ctx'> 	struct ext2_super_block *es;</div><div class='ctx'> </div><div class='del'>-	lock_super (sb);</div><div class='ctx'> 	es = EXT2_SB(sb)-&gt;s_es;</div><div class='ctx'> 	desc_count = 0;</div><div class='ctx'> 	bitmap_count = 0;</div><div class='hunk'>@@ -554,7 +572,6 @@ unsigned long ext2_count_free_blocks (struct super_block * sb)</div><div class='ctx'> 	printk("ext2_count_free_blocks: stored = %lu, computed = %lu, %lu\n",</div><div class='ctx'> 		(long)le32_to_cpu(es-&gt;s_free_blocks_count),</div><div class='ctx'> 		desc_count, bitmap_count);</div><div class='del'>-	unlock_super (sb);</div><div class='ctx'> 	return bitmap_count;</div><div class='ctx'> #else</div><div class='ctx'>         for (i = 0; i &lt; EXT2_SB(sb)-&gt;s_groups_count; i++) {</div><div class='head'>diff --git a/fs/ext2/bitmap.c b/fs/ext2/bitmap.c<br/>deleted file mode 100644<br/>index e9983a0dd396..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/bitmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/bitmap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/fs/ext2/bitmap.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1992, 1993, 1994, 1995</div><div class='del'>- * Remy Card (card@masi.ibp.fr)</div><div class='del'>- * Laboratoire MASI - Institut Blaise Pascal</div><div class='del'>- * Universite Pierre et Marie Curie (Paris VI)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef EXT2FS_DEBUG</div><div class='del'>-</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ext2.h"</div><div class='del'>-</div><div class='del'>-static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};</div><div class='del'>-</div><div class='del'>-unsigned long ext2_count_free (struct buffer_head * map, unsigned int numchars)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	unsigned long sum = 0;</div><div class='del'>-	</div><div class='del'>-	if (!map) </div><div class='del'>-		return (0);</div><div class='del'>-	for (i = 0; i &lt; numchars; i++)</div><div class='del'>-		sum += nibblemap[map-&gt;b_data[i] &amp; 0xf] +</div><div class='del'>-			nibblemap[(map-&gt;b_data[i] &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-	return (sum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif  /*  EXT2FS_DEBUG  */</div><div class='del'>-</div><div class='head'>diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c<br/>index d672aa9f4061..92ea8265d7d5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/dir.c</a></div><div class='hunk'>@@ -159,8 +159,7 @@ fail:</div><div class='ctx'> static struct page * ext2_get_page(struct inode *dir, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = dir-&gt;i_mapping;</div><div class='del'>-	struct page *page = read_cache_page(mapping, n,</div><div class='del'>-				(filler_t*)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	struct page *page = read_mapping_page(mapping, n, NULL);</div><div class='ctx'> 	if (!IS_ERR(page)) {</div><div class='ctx'> 		wait_on_page_locked(page);</div><div class='ctx'> 		kmap(page);</div><div class='hunk'>@@ -400,8 +399,7 @@ ino_t ext2_inode_by_name(struct inode * dir, struct dentry *dentry)</div><div class='ctx'> 	de = ext2_find_entry (dir, dentry, &amp;page);</div><div class='ctx'> 	if (de) {</div><div class='ctx'> 		res = le32_to_cpu(de-&gt;inode);</div><div class='del'>-		kunmap(page);</div><div class='del'>-		page_cache_release(page);</div><div class='add'>+		ext2_put_page(page);</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h<br/>index 9f74a62be555..e65a019fc7a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/ext2.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/ext2.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/ext2.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/ext2.h</a></div><div class='hunk'>@@ -162,9 +162,9 @@ extern const struct file_operations ext2_file_operations;</div><div class='ctx'> extern const struct file_operations ext2_xip_file_operations;</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='del'>-extern struct address_space_operations ext2_aops;</div><div class='del'>-extern struct address_space_operations ext2_aops_xip;</div><div class='del'>-extern struct address_space_operations ext2_nobh_aops;</div><div class='add'>+extern const struct address_space_operations ext2_aops;</div><div class='add'>+extern const struct address_space_operations ext2_aops_xip;</div><div class='add'>+extern const struct address_space_operations ext2_nobh_aops;</div><div class='ctx'> </div><div class='ctx'> /* namei.c */</div><div class='ctx'> extern struct inode_operations ext2_dir_inode_operations;</div><div class='head'>diff --git a/fs/ext2/fsync.c b/fs/ext2/fsync.c<br/>index c9c2e5ffa48e..7806b9e8155b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/fsync.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/fsync.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/fsync.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/fsync.c</a></div><div class='hunk'>@@ -24,7 +24,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ext2.h"</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='del'>-#include &lt;linux/buffer_head.h&gt;		/* for fsync_inode_buffers() */</div><div class='add'>+#include &lt;linux/buffer_head.h&gt;		/* for sync_mapping_buffers() */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c<br/>index e52765219e16..de85c61c58c5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/ialloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/ialloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/ialloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/ialloc.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  *        David S. Miller (davem@caip.rutgers.edu), 1995</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/quotaops.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='hunk'>@@ -638,6 +637,7 @@ fail:</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Superblock must be locked */</div><div class='ctx'> unsigned long ext2_count_free_inodes (struct super_block * sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext2_group_desc *desc;</div><div class='hunk'>@@ -649,7 +649,6 @@ unsigned long ext2_count_free_inodes (struct super_block * sb)</div><div class='ctx'> 	unsigned long bitmap_count = 0;</div><div class='ctx'> 	struct buffer_head *bitmap_bh = NULL;</div><div class='ctx'> </div><div class='del'>-	lock_super (sb);</div><div class='ctx'> 	es = EXT2_SB(sb)-&gt;s_es;</div><div class='ctx'> 	for (i = 0; i &lt; EXT2_SB(sb)-&gt;s_groups_count; i++) {</div><div class='ctx'> 		unsigned x;</div><div class='hunk'>@@ -672,7 +671,6 @@ unsigned long ext2_count_free_inodes (struct super_block * sb)</div><div class='ctx'> 	printk("ext2_count_free_inodes: stored = %lu, computed = %lu, %lu\n",</div><div class='ctx'> 		percpu_counter_read(&amp;EXT2_SB(sb)-&gt;s_freeinodes_counter),</div><div class='ctx'> 		desc_count, bitmap_count);</div><div class='del'>-	unlock_super(sb);</div><div class='ctx'> 	return desc_count;</div><div class='ctx'> #else</div><div class='ctx'> 	for (i = 0; i &lt; EXT2_SB(sb)-&gt;s_groups_count; i++) {</div><div class='head'>diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c<br/>index 04af9c45dce2..fb4d3220eb8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/inode.c</a></div><div class='hunk'>@@ -684,7 +684,7 @@ ext2_writepages(struct address_space *mapping, struct writeback_control *wbc)</div><div class='ctx'> 	return mpage_writepages(mapping, wbc, ext2_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations ext2_aops = {</div><div class='add'>+const struct address_space_operations ext2_aops = {</div><div class='ctx'> 	.readpage		= ext2_readpage,</div><div class='ctx'> 	.readpages		= ext2_readpages,</div><div class='ctx'> 	.writepage		= ext2_writepage,</div><div class='hunk'>@@ -697,12 +697,12 @@ struct address_space_operations ext2_aops = {</div><div class='ctx'> 	.migratepage		= buffer_migrate_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct address_space_operations ext2_aops_xip = {</div><div class='add'>+const struct address_space_operations ext2_aops_xip = {</div><div class='ctx'> 	.bmap			= ext2_bmap,</div><div class='ctx'> 	.get_xip_page		= ext2_get_xip_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct address_space_operations ext2_nobh_aops = {</div><div class='add'>+const struct address_space_operations ext2_nobh_aops = {</div><div class='ctx'> 	.readpage		= ext2_readpage,</div><div class='ctx'> 	.readpages		= ext2_readpages,</div><div class='ctx'> 	.writepage		= ext2_nobh_writepage,</div><div class='head'>diff --git a/fs/ext2/super.c b/fs/ext2/super.c<br/>index 7e30bae174ed..f2702cda9779 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/super.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *        David S. Miller (davem@caip.rutgers.edu), 1995</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -39,7 +38,7 @@</div><div class='ctx'> static void ext2_sync_super(struct super_block *sb,</div><div class='ctx'> 			    struct ext2_super_block *es);</div><div class='ctx'> static int ext2_remount (struct super_block * sb, int * flags, char * data);</div><div class='del'>-static int ext2_statfs (struct super_block * sb, struct kstatfs * buf);</div><div class='add'>+static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf);</div><div class='ctx'> </div><div class='ctx'> void ext2_error (struct super_block * sb, const char * function,</div><div class='ctx'> 		 const char * fmt, ...)</div><div class='hunk'>@@ -834,9 +833,6 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		printk ("EXT2-fs: not enough memory\n");</div><div class='ctx'> 		goto failed_mount;</div><div class='ctx'> 	}</div><div class='del'>-	percpu_counter_init(&amp;sbi-&gt;s_freeblocks_counter);</div><div class='del'>-	percpu_counter_init(&amp;sbi-&gt;s_freeinodes_counter);</div><div class='del'>-	percpu_counter_init(&amp;sbi-&gt;s_dirs_counter);</div><div class='ctx'> 	bgl_lock_init(&amp;sbi-&gt;s_blockgroup_lock);</div><div class='ctx'> 	sbi-&gt;s_debts = kmalloc(sbi-&gt;s_groups_count * sizeof(*sbi-&gt;s_debts),</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='hunk'>@@ -857,12 +853,18 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!ext2_check_descriptors (sb)) {</div><div class='ctx'> 		printk ("EXT2-fs: group descriptors corrupted!\n");</div><div class='del'>-		db_count = i;</div><div class='ctx'> 		goto failed_mount2;</div><div class='ctx'> 	}</div><div class='ctx'> 	sbi-&gt;s_gdb_count = db_count;</div><div class='ctx'> 	get_random_bytes(&amp;sbi-&gt;s_next_generation, sizeof(u32));</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;s_next_gen_lock);</div><div class='add'>+</div><div class='add'>+	percpu_counter_init(&amp;sbi-&gt;s_freeblocks_counter,</div><div class='add'>+				ext2_count_free_blocks(sb));</div><div class='add'>+	percpu_counter_init(&amp;sbi-&gt;s_freeinodes_counter,</div><div class='add'>+				ext2_count_free_inodes(sb));</div><div class='add'>+	percpu_counter_init(&amp;sbi-&gt;s_dirs_counter,</div><div class='add'>+				ext2_count_dirs(sb));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * set up enough so that it can read an inode</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -874,24 +876,18 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='ctx'> 		iput(root);</div><div class='ctx'> 		printk(KERN_ERR "EXT2-fs: get root inode failed\n");</div><div class='del'>-		goto failed_mount2;</div><div class='add'>+		goto failed_mount3;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!S_ISDIR(root-&gt;i_mode) || !root-&gt;i_blocks || !root-&gt;i_size) {</div><div class='ctx'> 		dput(sb-&gt;s_root);</div><div class='ctx'> 		sb-&gt;s_root = NULL;</div><div class='ctx'> 		printk(KERN_ERR "EXT2-fs: corrupt root inode, run e2fsck\n");</div><div class='del'>-		goto failed_mount2;</div><div class='add'>+		goto failed_mount3;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))</div><div class='ctx'> 		ext2_warning(sb, __FUNCTION__,</div><div class='ctx'> 			"mounting ext3 filesystem as ext2");</div><div class='ctx'> 	ext2_setup_super (sb, es, sb-&gt;s_flags &amp; MS_RDONLY);</div><div class='del'>-	percpu_counter_mod(&amp;sbi-&gt;s_freeblocks_counter,</div><div class='del'>-				ext2_count_free_blocks(sb));</div><div class='del'>-	percpu_counter_mod(&amp;sbi-&gt;s_freeinodes_counter,</div><div class='del'>-				ext2_count_free_inodes(sb));</div><div class='del'>-	percpu_counter_mod(&amp;sbi-&gt;s_dirs_counter,</div><div class='del'>-				ext2_count_dirs(sb));</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> cantfind_ext2:</div><div class='hunk'>@@ -899,7 +895,10 @@ cantfind_ext2:</div><div class='ctx'> 		printk("VFS: Can't find an ext2 filesystem on dev %s.\n",</div><div class='ctx'> 		       sb-&gt;s_id);</div><div class='ctx'> 	goto failed_mount;</div><div class='del'>-</div><div class='add'>+failed_mount3:</div><div class='add'>+	percpu_counter_destroy(&amp;sbi-&gt;s_freeblocks_counter);</div><div class='add'>+	percpu_counter_destroy(&amp;sbi-&gt;s_freeinodes_counter);</div><div class='add'>+	percpu_counter_destroy(&amp;sbi-&gt;s_dirs_counter);</div><div class='ctx'> failed_mount2:</div><div class='ctx'> 	for (i = 0; i &lt; db_count; i++)</div><div class='ctx'> 		brelse(sbi-&gt;s_group_desc[i]);</div><div class='hunk'>@@ -1038,12 +1037,14 @@ restore_opts:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext2_statfs (struct super_block * sb, struct kstatfs * buf)</div><div class='add'>+static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	struct ext2_sb_info *sbi = EXT2_SB(sb);</div><div class='ctx'> 	unsigned long overhead;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	lock_super(sb);</div><div class='ctx'> 	if (test_opt (sb, MINIX_DF))</div><div class='ctx'> 		overhead = 0;</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -1084,13 +1085,14 @@ static int ext2_statfs (struct super_block * sb, struct kstatfs * buf)</div><div class='ctx'> 	buf-&gt;f_files = le32_to_cpu(sbi-&gt;s_es-&gt;s_inodes_count);</div><div class='ctx'> 	buf-&gt;f_ffree = ext2_count_free_inodes (sb);</div><div class='ctx'> 	buf-&gt;f_namelen = EXT2_NAME_LEN;</div><div class='add'>+	unlock_super(sb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *ext2_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int ext2_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, ext2_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, ext2_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_QUOTA</div><div class='hunk'>@@ -1155,7 +1157,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 	struct buffer_head tmp_bh;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;inode-&gt;i_mutex, I_MUTEX_QUOTA);</div><div class='ctx'> 	while (towrite &gt; 0) {</div><div class='ctx'> 		tocopy = sb-&gt;s_blocksize - offset &lt; towrite ?</div><div class='ctx'> 				sb-&gt;s_blocksize - offset : towrite;</div><div class='head'>diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h<br/>index 67cfeb66e897..bf8175b2ced9 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext2/xattr.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext2/xattr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext2/xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext2/xattr.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>   (C) 2001 Andreas Gruenbacher, &lt;a.gruenbacher@computer.org&gt;</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h<br/>index 92d50b53a933..0d1e6279cbfd 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/acl.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/acl.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/acl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/acl.h</a></div><div class='hunk'>@@ -62,9 +62,6 @@ extern int ext3_permission (struct inode *, int, struct nameidata *);</div><div class='ctx'> extern int ext3_acl_chmod (struct inode *);</div><div class='ctx'> extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);</div><div class='ctx'> </div><div class='del'>-extern int init_ext3_acl(void);</div><div class='del'>-extern void exit_ext3_acl(void);</div><div class='del'>-</div><div class='ctx'> #else  /* CONFIG_EXT3_FS_POSIX_ACL */</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #define ext3_permission NULL</div><div class='head'>diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c<br/>index 77927d6938f6..a504a40d6d29 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/balloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/balloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/balloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/balloc.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *        David S. Miller (davem@caip.rutgers.edu), 1995</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -163,20 +162,19 @@ restart:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-goal_in_my_reservation(struct ext3_reserve_window *rsv, int goal,</div><div class='add'>+goal_in_my_reservation(struct ext3_reserve_window *rsv, ext3_grpblk_t grp_goal,</div><div class='ctx'> 			unsigned int group, struct super_block * sb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long group_first_block, group_last_block;</div><div class='add'>+	ext3_fsblk_t group_first_block, group_last_block;</div><div class='ctx'> </div><div class='del'>-	group_first_block = le32_to_cpu(EXT3_SB(sb)-&gt;s_es-&gt;s_first_data_block) +</div><div class='del'>-				group * EXT3_BLOCKS_PER_GROUP(sb);</div><div class='add'>+	group_first_block = ext3_group_first_block_no(sb, group);</div><div class='ctx'> 	group_last_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1;</div><div class='ctx'> </div><div class='ctx'> 	if ((rsv-&gt;_rsv_start &gt; group_last_block) ||</div><div class='ctx'> 	    (rsv-&gt;_rsv_end &lt; group_first_block))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if ((goal &gt;= 0) &amp;&amp; ((goal + group_first_block &lt; rsv-&gt;_rsv_start)</div><div class='del'>-		|| (goal + group_first_block &gt; rsv-&gt;_rsv_end)))</div><div class='add'>+	if ((grp_goal &gt;= 0) &amp;&amp; ((grp_goal + group_first_block &lt; rsv-&gt;_rsv_start)</div><div class='add'>+		|| (grp_goal + group_first_block &gt; rsv-&gt;_rsv_end)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -187,7 +185,7 @@ goal_in_my_reservation(struct ext3_reserve_window *rsv, int goal,</div><div class='ctx'>  * Returns NULL if there are no windows or if all windows start after the goal.</div><div class='ctx'>  */</div><div class='ctx'> static struct ext3_reserve_window_node *</div><div class='del'>-search_reserve_window(struct rb_root *root, unsigned long goal)</div><div class='add'>+search_reserve_window(struct rb_root *root, ext3_fsblk_t goal)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *n = root-&gt;rb_node;</div><div class='ctx'> 	struct ext3_reserve_window_node *rsv;</div><div class='hunk'>@@ -223,7 +221,7 @@ void ext3_rsv_window_add(struct super_block *sb,</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_root *root = &amp;EXT3_SB(sb)-&gt;s_rsv_window_root;</div><div class='ctx'> 	struct rb_node *node = &amp;rsv-&gt;rsv_node;</div><div class='del'>-	unsigned int start = rsv-&gt;rsv_start;</div><div class='add'>+	ext3_fsblk_t start = rsv-&gt;rsv_start;</div><div class='ctx'> </div><div class='ctx'> 	struct rb_node ** p = &amp;root-&gt;rb_node;</div><div class='ctx'> 	struct rb_node * parent = NULL;</div><div class='hunk'>@@ -310,20 +308,20 @@ void ext3_discard_reservation(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> /* Free given blocks, update quota and i_blocks field */</div><div class='ctx'> void ext3_free_blocks_sb(handle_t *handle, struct super_block *sb,</div><div class='del'>-			 unsigned long block, unsigned long count,</div><div class='del'>-			 int *pdquot_freed_blocks)</div><div class='add'>+			 ext3_fsblk_t block, unsigned long count,</div><div class='add'>+			 unsigned long *pdquot_freed_blocks)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bitmap_bh = NULL;</div><div class='ctx'> 	struct buffer_head *gd_bh;</div><div class='ctx'> 	unsigned long block_group;</div><div class='del'>-	unsigned long bit;</div><div class='add'>+	ext3_grpblk_t bit;</div><div class='ctx'> 	unsigned long i;</div><div class='ctx'> 	unsigned long overflow;</div><div class='ctx'> 	struct ext3_group_desc * desc;</div><div class='ctx'> 	struct ext3_super_block * es;</div><div class='ctx'> 	struct ext3_sb_info *sbi;</div><div class='ctx'> 	int err = 0, ret;</div><div class='del'>-	unsigned group_freed;</div><div class='add'>+	ext3_grpblk_t group_freed;</div><div class='ctx'> </div><div class='ctx'> 	*pdquot_freed_blocks = 0;</div><div class='ctx'> 	sbi = EXT3_SB(sb);</div><div class='hunk'>@@ -333,7 +331,7 @@ void ext3_free_blocks_sb(handle_t *handle, struct super_block *sb,</div><div class='ctx'> 	    block + count &gt; le32_to_cpu(es-&gt;s_blocks_count)) {</div><div class='ctx'> 		ext3_error (sb, "ext3_free_blocks",</div><div class='ctx'> 			    "Freeing blocks not in datazone - "</div><div class='del'>-			    "block = %lu, count = %lu", block, count);</div><div class='add'>+			    "block = "E3FSBLK", count = %lu", block, count);</div><div class='ctx'> 		goto error_return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +367,7 @@ do_more:</div><div class='ctx'> 		      sbi-&gt;s_itb_per_group))</div><div class='ctx'> 		ext3_error (sb, "ext3_free_blocks",</div><div class='ctx'> 			    "Freeing blocks in system zones - "</div><div class='del'>-			    "Block = %lu, count = %lu",</div><div class='add'>+			    "Block = "E3FSBLK", count = %lu",</div><div class='ctx'> 			    block, count);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -453,7 +451,8 @@ do_more:</div><div class='ctx'> 						bit + i, bitmap_bh-&gt;b_data)) {</div><div class='ctx'> 			jbd_unlock_bh_state(bitmap_bh);</div><div class='ctx'> 			ext3_error(sb, __FUNCTION__,</div><div class='del'>-				"bit already cleared for block %lu", block + i);</div><div class='add'>+				"bit already cleared for block "E3FSBLK,</div><div class='add'>+				 block + i);</div><div class='ctx'> 			jbd_lock_bh_state(bitmap_bh);</div><div class='ctx'> 			BUFFER_TRACE(bitmap_bh, "bit already cleared");</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -493,10 +492,10 @@ error_return:</div><div class='ctx'> </div><div class='ctx'> /* Free given blocks, update quota and i_blocks field */</div><div class='ctx'> void ext3_free_blocks(handle_t *handle, struct inode *inode,</div><div class='del'>-			unsigned long block, unsigned long count)</div><div class='add'>+			ext3_fsblk_t block, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block * sb;</div><div class='del'>-	int dquot_freed_blocks;</div><div class='add'>+	unsigned long dquot_freed_blocks;</div><div class='ctx'> </div><div class='ctx'> 	sb = inode-&gt;i_sb;</div><div class='ctx'> 	if (!sb) {</div><div class='hunk'>@@ -525,7 +524,7 @@ void ext3_free_blocks(handle_t *handle, struct inode *inode,</div><div class='ctx'>  * data-writes at some point, and disable it for metadata allocations or</div><div class='ctx'>  * sync-data inodes.</div><div class='ctx'>  */</div><div class='del'>-static int ext3_test_allocatable(int nr, struct buffer_head *bh)</div><div class='add'>+static int ext3_test_allocatable(ext3_grpblk_t nr, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	struct journal_head *jh = bh2jh(bh);</div><div class='hunk'>@@ -542,11 +541,11 @@ static int ext3_test_allocatable(int nr, struct buffer_head *bh)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bitmap_search_next_usable_block(int start, struct buffer_head *bh,</div><div class='del'>-					int maxblocks)</div><div class='add'>+static ext3_grpblk_t</div><div class='add'>+bitmap_search_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh,</div><div class='add'>+					ext3_grpblk_t maxblocks)</div><div class='ctx'> {</div><div class='del'>-	int next;</div><div class='add'>+	ext3_grpblk_t next;</div><div class='ctx'> 	struct journal_head *jh = bh2jh(bh);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -576,10 +575,11 @@ bitmap_search_next_usable_block(int start, struct buffer_head *bh,</div><div class='ctx'>  * the initial goal; then for a free byte somewhere in the bitmap; then</div><div class='ctx'>  * for any free bit in the bitmap.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-find_next_usable_block(int start, struct buffer_head *bh, int maxblocks)</div><div class='add'>+static ext3_grpblk_t</div><div class='add'>+find_next_usable_block(ext3_grpblk_t start, struct buffer_head *bh,</div><div class='add'>+			ext3_grpblk_t maxblocks)</div><div class='ctx'> {</div><div class='del'>-	int here, next;</div><div class='add'>+	ext3_grpblk_t here, next;</div><div class='ctx'> 	char *p, *r;</div><div class='ctx'> </div><div class='ctx'> 	if (start &gt; 0) {</div><div class='hunk'>@@ -591,7 +591,7 @@ find_next_usable_block(int start, struct buffer_head *bh, int maxblocks)</div><div class='ctx'> 		 * less than EXT3_BLOCKS_PER_GROUP. Aligning up to the</div><div class='ctx'> 		 * next 64-bit boundary is simple..</div><div class='ctx'> 		 */</div><div class='del'>-		int end_goal = (start + 63) &amp; ~63;</div><div class='add'>+		ext3_grpblk_t end_goal = (start + 63) &amp; ~63;</div><div class='ctx'> 		if (end_goal &gt; maxblocks)</div><div class='ctx'> 			end_goal = maxblocks;</div><div class='ctx'> 		here = ext3_find_next_zero_bit(bh-&gt;b_data, end_goal, start);</div><div class='hunk'>@@ -628,7 +628,7 @@ find_next_usable_block(int start, struct buffer_head *bh, int maxblocks)</div><div class='ctx'>  * zero (failure).</div><div class='ctx'>  */</div><div class='ctx'> static inline int</div><div class='del'>-claim_block(spinlock_t *lock, int block, struct buffer_head *bh)</div><div class='add'>+claim_block(spinlock_t *lock, ext3_grpblk_t block, struct buffer_head *bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct journal_head *jh = bh2jh(bh);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -651,19 +651,18 @@ claim_block(spinlock_t *lock, int block, struct buffer_head *bh)</div><div class='ctx'>  * new bitmap.  In that case we must release write access to the old one via</div><div class='ctx'>  * ext3_journal_release_buffer(), else we'll run out of credits.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='add'>+static ext3_grpblk_t</div><div class='ctx'> ext3_try_to_allocate(struct super_block *sb, handle_t *handle, int group,</div><div class='del'>-			struct buffer_head *bitmap_bh, int goal,</div><div class='add'>+			struct buffer_head *bitmap_bh, ext3_grpblk_t grp_goal,</div><div class='ctx'> 			unsigned long *count, struct ext3_reserve_window *my_rsv)</div><div class='ctx'> {</div><div class='del'>-	int group_first_block, start, end;</div><div class='add'>+	ext3_fsblk_t group_first_block;</div><div class='add'>+	ext3_grpblk_t start, end;</div><div class='ctx'> 	unsigned long num = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* we do allocation within the reservation window if we have a window */</div><div class='ctx'> 	if (my_rsv) {</div><div class='del'>-		group_first_block =</div><div class='del'>-			le32_to_cpu(EXT3_SB(sb)-&gt;s_es-&gt;s_first_data_block) +</div><div class='del'>-			group * EXT3_BLOCKS_PER_GROUP(sb);</div><div class='add'>+		group_first_block = ext3_group_first_block_no(sb, group);</div><div class='ctx'> 		if (my_rsv-&gt;_rsv_start &gt;= group_first_block)</div><div class='ctx'> 			start = my_rsv-&gt;_rsv_start - group_first_block;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -673,13 +672,13 @@ ext3_try_to_allocate(struct super_block *sb, handle_t *handle, int group,</div><div class='ctx'> 		if (end &gt; EXT3_BLOCKS_PER_GROUP(sb))</div><div class='ctx'> 			/* reservation window crosses group boundary */</div><div class='ctx'> 			end = EXT3_BLOCKS_PER_GROUP(sb);</div><div class='del'>-		if ((start &lt;= goal) &amp;&amp; (goal &lt; end))</div><div class='del'>-			start = goal;</div><div class='add'>+		if ((start &lt;= grp_goal) &amp;&amp; (grp_goal &lt; end))</div><div class='add'>+			start = grp_goal;</div><div class='ctx'> 		else</div><div class='del'>-			goal = -1;</div><div class='add'>+			grp_goal = -1;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (goal &gt; 0)</div><div class='del'>-			start = goal;</div><div class='add'>+		if (grp_goal &gt; 0)</div><div class='add'>+			start = grp_goal;</div><div class='ctx'> 		else</div><div class='ctx'> 			start = 0;</div><div class='ctx'> 		end = EXT3_BLOCKS_PER_GROUP(sb);</div><div class='hunk'>@@ -688,43 +687,43 @@ ext3_try_to_allocate(struct super_block *sb, handle_t *handle, int group,</div><div class='ctx'> 	BUG_ON(start &gt; EXT3_BLOCKS_PER_GROUP(sb));</div><div class='ctx'> </div><div class='ctx'> repeat:</div><div class='del'>-	if (goal &lt; 0 || !ext3_test_allocatable(goal, bitmap_bh)) {</div><div class='del'>-		goal = find_next_usable_block(start, bitmap_bh, end);</div><div class='del'>-		if (goal &lt; 0)</div><div class='add'>+	if (grp_goal &lt; 0 || !ext3_test_allocatable(grp_goal, bitmap_bh)) {</div><div class='add'>+		grp_goal = find_next_usable_block(start, bitmap_bh, end);</div><div class='add'>+		if (grp_goal &lt; 0)</div><div class='ctx'> 			goto fail_access;</div><div class='ctx'> 		if (!my_rsv) {</div><div class='ctx'> 			int i;</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; 7 &amp;&amp; goal &gt; start &amp;&amp;</div><div class='del'>-					ext3_test_allocatable(goal - 1,</div><div class='add'>+			for (i = 0; i &lt; 7 &amp;&amp; grp_goal &gt; start &amp;&amp;</div><div class='add'>+					ext3_test_allocatable(grp_goal - 1,</div><div class='ctx'> 								bitmap_bh);</div><div class='del'>-					i++, goal--)</div><div class='add'>+					i++, grp_goal--)</div><div class='ctx'> 				;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	start = goal;</div><div class='add'>+	start = grp_goal;</div><div class='ctx'> </div><div class='del'>-	if (!claim_block(sb_bgl_lock(EXT3_SB(sb), group), goal, bitmap_bh)) {</div><div class='add'>+	if (!claim_block(sb_bgl_lock(EXT3_SB(sb), group), grp_goal, bitmap_bh)) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The block was allocated by another thread, or it was</div><div class='ctx'> 		 * allocated and then freed by another thread</div><div class='ctx'> 		 */</div><div class='ctx'> 		start++;</div><div class='del'>-		goal++;</div><div class='add'>+		grp_goal++;</div><div class='ctx'> 		if (start &gt;= end)</div><div class='ctx'> 			goto fail_access;</div><div class='ctx'> 		goto repeat;</div><div class='ctx'> 	}</div><div class='ctx'> 	num++;</div><div class='del'>-	goal++;</div><div class='del'>-	while (num &lt; *count &amp;&amp; goal &lt; end</div><div class='del'>-		&amp;&amp; ext3_test_allocatable(goal, bitmap_bh)</div><div class='del'>-		&amp;&amp; claim_block(sb_bgl_lock(EXT3_SB(sb), group), goal, bitmap_bh)) {</div><div class='add'>+	grp_goal++;</div><div class='add'>+	while (num &lt; *count &amp;&amp; grp_goal &lt; end</div><div class='add'>+		&amp;&amp; ext3_test_allocatable(grp_goal, bitmap_bh)</div><div class='add'>+		&amp;&amp; claim_block(sb_bgl_lock(EXT3_SB(sb), group), grp_goal, bitmap_bh)) {</div><div class='ctx'> 		num++;</div><div class='del'>-		goal++;</div><div class='add'>+		grp_goal++;</div><div class='ctx'> 	}</div><div class='ctx'> 	*count = num;</div><div class='del'>-	return goal - num;</div><div class='add'>+	return grp_goal - num;</div><div class='ctx'> fail_access:</div><div class='ctx'> 	*count = num;</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -766,12 +765,13 @@ fail_access:</div><div class='ctx'> static int find_next_reservable_window(</div><div class='ctx'> 				struct ext3_reserve_window_node *search_head,</div><div class='ctx'> 				struct ext3_reserve_window_node *my_rsv,</div><div class='del'>-				struct super_block * sb, int start_block,</div><div class='del'>-				int last_block)</div><div class='add'>+				struct super_block * sb,</div><div class='add'>+				ext3_fsblk_t start_block,</div><div class='add'>+				ext3_fsblk_t last_block)</div><div class='ctx'> {</div><div class='ctx'> 	struct rb_node *next;</div><div class='ctx'> 	struct ext3_reserve_window_node *rsv, *prev;</div><div class='del'>-	int cur;</div><div class='add'>+	ext3_fsblk_t cur;</div><div class='ctx'> 	int size = my_rsv-&gt;rsv_goal_size;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: make the start of the reservation window byte-aligned */</div><div class='hunk'>@@ -873,10 +873,10 @@ static int find_next_reservable_window(</div><div class='ctx'>  *</div><div class='ctx'>  *	@rsv: the reservation</div><div class='ctx'>  *</div><div class='del'>- *	@goal: The goal (group-relative).  It is where the search for a</div><div class='add'>+ *	@grp_goal: The goal (group-relative).  It is where the search for a</div><div class='ctx'>  *		free reservable space should start from.</div><div class='del'>- *		if we have a goal(goal &gt;0 ), then start from there,</div><div class='del'>- *		no goal(goal = -1), we start from the first block</div><div class='add'>+ *		if we have a grp_goal(grp_goal &gt;0 ), then start from there,</div><div class='add'>+ *		no grp_goal(grp_goal = -1), we start from the first block</div><div class='ctx'>  *		of the group.</div><div class='ctx'>  *</div><div class='ctx'>  *	@sb: the super block</div><div class='hunk'>@@ -885,25 +885,24 @@ static int find_next_reservable_window(</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static int alloc_new_reservation(struct ext3_reserve_window_node *my_rsv,</div><div class='del'>-		int goal, struct super_block *sb,</div><div class='add'>+		ext3_grpblk_t grp_goal, struct super_block *sb,</div><div class='ctx'> 		unsigned int group, struct buffer_head *bitmap_bh)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_reserve_window_node *search_head;</div><div class='del'>-	int group_first_block, group_end_block, start_block;</div><div class='del'>-	int first_free_block;</div><div class='add'>+	ext3_fsblk_t group_first_block, group_end_block, start_block;</div><div class='add'>+	ext3_grpblk_t first_free_block;</div><div class='ctx'> 	struct rb_root *fs_rsv_root = &amp;EXT3_SB(sb)-&gt;s_rsv_window_root;</div><div class='ctx'> 	unsigned long size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	spinlock_t *rsv_lock = &amp;EXT3_SB(sb)-&gt;s_rsv_window_lock;</div><div class='ctx'> </div><div class='del'>-	group_first_block = le32_to_cpu(EXT3_SB(sb)-&gt;s_es-&gt;s_first_data_block) +</div><div class='del'>-				group * EXT3_BLOCKS_PER_GROUP(sb);</div><div class='add'>+	group_first_block = ext3_group_first_block_no(sb, group);</div><div class='ctx'> 	group_end_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1;</div><div class='ctx'> </div><div class='del'>-	if (goal &lt; 0)</div><div class='add'>+	if (grp_goal &lt; 0)</div><div class='ctx'> 		start_block = group_first_block;</div><div class='ctx'> 	else</div><div class='del'>-		start_block = goal + group_first_block;</div><div class='add'>+		start_block = grp_goal + group_first_block;</div><div class='ctx'> </div><div class='ctx'> 	size = my_rsv-&gt;rsv_goal_size;</div><div class='ctx'> </div><div class='hunk'>@@ -1057,14 +1056,15 @@ static void try_to_extend_reservation(struct ext3_reserve_window_node *my_rsv,</div><div class='ctx'>  * sorted double linked list should be fast.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='add'>+static ext3_grpblk_t</div><div class='ctx'> ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,</div><div class='ctx'> 			unsigned int group, struct buffer_head *bitmap_bh,</div><div class='del'>-			int goal, struct ext3_reserve_window_node * my_rsv,</div><div class='add'>+			ext3_grpblk_t grp_goal,</div><div class='add'>+			struct ext3_reserve_window_node * my_rsv,</div><div class='ctx'> 			unsigned long *count, int *errp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long group_first_block;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	ext3_fsblk_t group_first_block;</div><div class='add'>+	ext3_grpblk_t ret = 0;</div><div class='ctx'> 	int fatal;</div><div class='ctx'> 	unsigned long num = *count;</div><div class='ctx'> </div><div class='hunk'>@@ -1090,17 +1090,16 @@ ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (my_rsv == NULL ) {</div><div class='ctx'> 		ret = ext3_try_to_allocate(sb, handle, group, bitmap_bh,</div><div class='del'>-						goal, count, NULL);</div><div class='add'>+						grp_goal, count, NULL);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	 * goal is a group relative block number (if there is a goal)</div><div class='del'>-	 * 0 &lt; goal &lt; EXT3_BLOCKS_PER_GROUP(sb)</div><div class='add'>+	 * grp_goal is a group relative block number (if there is a goal)</div><div class='add'>+	 * 0 &lt; grp_goal &lt; EXT3_BLOCKS_PER_GROUP(sb)</div><div class='ctx'> 	 * first block is a filesystem wide block number</div><div class='ctx'> 	 * first block is the block number of the first block in this group</div><div class='ctx'> 	 */</div><div class='del'>-	group_first_block = le32_to_cpu(EXT3_SB(sb)-&gt;s_es-&gt;s_first_data_block) +</div><div class='del'>-			group * EXT3_BLOCKS_PER_GROUP(sb);</div><div class='add'>+	group_first_block = ext3_group_first_block_no(sb, group);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Basically we will allocate a new block from inode's reservation</div><div class='hunk'>@@ -1119,24 +1118,24 @@ ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		if (rsv_is_empty(&amp;my_rsv-&gt;rsv_window) || (ret &lt; 0) ||</div><div class='del'>-			!goal_in_my_reservation(&amp;my_rsv-&gt;rsv_window, goal, group, sb)) {</div><div class='add'>+			!goal_in_my_reservation(&amp;my_rsv-&gt;rsv_window, grp_goal, group, sb)) {</div><div class='ctx'> 			if (my_rsv-&gt;rsv_goal_size &lt; *count)</div><div class='ctx'> 				my_rsv-&gt;rsv_goal_size = *count;</div><div class='del'>-			ret = alloc_new_reservation(my_rsv, goal, sb,</div><div class='add'>+			ret = alloc_new_reservation(my_rsv, grp_goal, sb,</div><div class='ctx'> 							group, bitmap_bh);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;			/* failed */</div><div class='ctx'> </div><div class='del'>-			if (!goal_in_my_reservation(&amp;my_rsv-&gt;rsv_window, goal, group, sb))</div><div class='del'>-				goal = -1;</div><div class='del'>-		} else if (goal &gt; 0 &amp;&amp; (my_rsv-&gt;rsv_end-goal+1) &lt; *count)</div><div class='add'>+			if (!goal_in_my_reservation(&amp;my_rsv-&gt;rsv_window, grp_goal, group, sb))</div><div class='add'>+				grp_goal = -1;</div><div class='add'>+		} else if (grp_goal &gt; 0 &amp;&amp; (my_rsv-&gt;rsv_end-grp_goal+1) &lt; *count)</div><div class='ctx'> 			try_to_extend_reservation(my_rsv, sb,</div><div class='del'>-					*count-my_rsv-&gt;rsv_end + goal - 1);</div><div class='add'>+					*count-my_rsv-&gt;rsv_end + grp_goal - 1);</div><div class='ctx'> </div><div class='ctx'> 		if ((my_rsv-&gt;rsv_start &gt;= group_first_block + EXT3_BLOCKS_PER_GROUP(sb))</div><div class='ctx'> 		    || (my_rsv-&gt;rsv_end &lt; group_first_block))</div><div class='ctx'> 			BUG();</div><div class='del'>-		ret = ext3_try_to_allocate(sb, handle, group, bitmap_bh, goal,</div><div class='add'>+		ret = ext3_try_to_allocate(sb, handle, group, bitmap_bh, grp_goal,</div><div class='ctx'> 					   &amp;num, &amp;my_rsv-&gt;rsv_window);</div><div class='ctx'> 		if (ret &gt;= 0) {</div><div class='ctx'> 			my_rsv-&gt;rsv_alloc_hit += num;</div><div class='hunk'>@@ -1164,7 +1163,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int ext3_has_free_blocks(struct ext3_sb_info *sbi)</div><div class='ctx'> {</div><div class='del'>-	int free_blocks, root_blocks;</div><div class='add'>+	ext3_fsblk_t free_blocks, root_blocks;</div><div class='ctx'> </div><div class='ctx'> 	free_blocks = percpu_counter_read_positive(&amp;sbi-&gt;s_freeblocks_counter);</div><div class='ctx'> 	root_blocks = le32_to_cpu(sbi-&gt;s_es-&gt;s_r_blocks_count);</div><div class='hunk'>@@ -1200,19 +1199,20 @@ int ext3_should_retry_alloc(struct super_block *sb, int *retries)</div><div class='ctx'>  * bitmap, and then for any free bit if that fails.</div><div class='ctx'>  * This function also updates quota and i_blocks field.</div><div class='ctx'>  */</div><div class='del'>-int ext3_new_blocks(handle_t *handle, struct inode *inode,</div><div class='del'>-			unsigned long goal, unsigned long *count, int *errp)</div><div class='add'>+ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,</div><div class='add'>+			ext3_fsblk_t goal, unsigned long *count, int *errp)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bitmap_bh = NULL;</div><div class='ctx'> 	struct buffer_head *gdp_bh;</div><div class='ctx'> 	int group_no;</div><div class='ctx'> 	int goal_group;</div><div class='del'>-	int ret_block;</div><div class='add'>+	ext3_grpblk_t grp_target_blk;	/* blockgroup relative goal block */</div><div class='add'>+	ext3_grpblk_t grp_alloc_blk;	/* blockgroup-relative allocated block*/</div><div class='add'>+	ext3_fsblk_t ret_block;		/* filesyetem-wide allocated block */</div><div class='ctx'> 	int bgi;			/* blockgroup iteration index */</div><div class='del'>-	int target_block;</div><div class='ctx'> 	int fatal = 0, err;</div><div class='ctx'> 	int performed_allocation = 0;</div><div class='del'>-	int free_blocks;</div><div class='add'>+	ext3_grpblk_t free_blocks;	/* number of free blocks in a group */</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	struct ext3_group_desc *gdp;</div><div class='ctx'> 	struct ext3_super_block *es;</div><div class='hunk'>@@ -1285,16 +1285,17 @@ retry:</div><div class='ctx'> 		my_rsv = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (free_blocks &gt; 0) {</div><div class='del'>-		ret_block = ((goal - le32_to_cpu(es-&gt;s_first_data_block)) %</div><div class='add'>+		grp_target_blk = ((goal - le32_to_cpu(es-&gt;s_first_data_block)) %</div><div class='ctx'> 				EXT3_BLOCKS_PER_GROUP(sb));</div><div class='ctx'> 		bitmap_bh = read_block_bitmap(sb, group_no);</div><div class='ctx'> 		if (!bitmap_bh)</div><div class='ctx'> 			goto io_error;</div><div class='del'>-		ret_block = ext3_try_to_allocate_with_rsv(sb, handle, group_no,</div><div class='del'>-					bitmap_bh, ret_block, my_rsv, &amp;num, &amp;fatal);</div><div class='add'>+		grp_alloc_blk = ext3_try_to_allocate_with_rsv(sb, handle,</div><div class='add'>+					group_no, bitmap_bh, grp_target_blk,</div><div class='add'>+					my_rsv,	&amp;num, &amp;fatal);</div><div class='ctx'> 		if (fatal)</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (ret_block &gt;= 0)</div><div class='add'>+		if (grp_alloc_blk &gt;= 0)</div><div class='ctx'> 			goto allocated;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1327,11 +1328,15 @@ retry:</div><div class='ctx'> 		bitmap_bh = read_block_bitmap(sb, group_no);</div><div class='ctx'> 		if (!bitmap_bh)</div><div class='ctx'> 			goto io_error;</div><div class='del'>-		ret_block = ext3_try_to_allocate_with_rsv(sb, handle, group_no,</div><div class='del'>-					bitmap_bh, -1, my_rsv, &amp;num, &amp;fatal);</div><div class='add'>+		/*</div><div class='add'>+		 * try to allocate block(s) from this group, without a goal(-1).</div><div class='add'>+		 */</div><div class='add'>+		grp_alloc_blk = ext3_try_to_allocate_with_rsv(sb, handle,</div><div class='add'>+					group_no, bitmap_bh, -1, my_rsv,</div><div class='add'>+					&amp;num, &amp;fatal);</div><div class='ctx'> 		if (fatal)</div><div class='ctx'> 			goto out;</div><div class='del'>-		if (ret_block &gt;= 0) </div><div class='add'>+		if (grp_alloc_blk &gt;= 0)</div><div class='ctx'> 			goto allocated;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1360,18 +1365,18 @@ allocated:</div><div class='ctx'> 	if (fatal)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	target_block = ret_block + group_no * EXT3_BLOCKS_PER_GROUP(sb)</div><div class='del'>-				+ le32_to_cpu(es-&gt;s_first_data_block);</div><div class='add'>+	ret_block = grp_alloc_blk + ext3_group_first_block_no(sb, group_no);</div><div class='ctx'> </div><div class='del'>-	if (in_range(le32_to_cpu(gdp-&gt;bg_block_bitmap), target_block, num) ||</div><div class='del'>-	    in_range(le32_to_cpu(gdp-&gt;bg_inode_bitmap), target_block, num) ||</div><div class='del'>-	    in_range(target_block, le32_to_cpu(gdp-&gt;bg_inode_table),</div><div class='add'>+	if (in_range(le32_to_cpu(gdp-&gt;bg_block_bitmap), ret_block, num) ||</div><div class='add'>+	    in_range(le32_to_cpu(gdp-&gt;bg_inode_bitmap), ret_block, num) ||</div><div class='add'>+	    in_range(ret_block, le32_to_cpu(gdp-&gt;bg_inode_table),</div><div class='ctx'> 		      EXT3_SB(sb)-&gt;s_itb_per_group) ||</div><div class='del'>-	    in_range(target_block + num - 1, le32_to_cpu(gdp-&gt;bg_inode_table),</div><div class='add'>+	    in_range(ret_block + num - 1, le32_to_cpu(gdp-&gt;bg_inode_table),</div><div class='ctx'> 		      EXT3_SB(sb)-&gt;s_itb_per_group))</div><div class='ctx'> 		ext3_error(sb, "ext3_new_block",</div><div class='ctx'> 			    "Allocating block in system zone - "</div><div class='del'>-			    "blocks from %u, length %lu", target_block, num);</div><div class='add'>+			    "blocks from "E3FSBLK", length %lu",</div><div class='add'>+			     ret_block, num);</div><div class='ctx'> </div><div class='ctx'> 	performed_allocation = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1380,7 +1385,7 @@ allocated:</div><div class='ctx'> 		struct buffer_head *debug_bh;</div><div class='ctx'> </div><div class='ctx'> 		/* Record bitmap buffer state in the newly allocated block */</div><div class='del'>-		debug_bh = sb_find_get_block(sb, target_block);</div><div class='add'>+		debug_bh = sb_find_get_block(sb, ret_block);</div><div class='ctx'> 		if (debug_bh) {</div><div class='ctx'> 			BUFFER_TRACE(debug_bh, "state when allocated");</div><div class='ctx'> 			BUFFER_TRACE2(debug_bh, bitmap_bh, "bitmap state");</div><div class='hunk'>@@ -1393,24 +1398,21 @@ allocated:</div><div class='ctx'> 		int i;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; num; i++) {</div><div class='del'>-			if (ext3_test_bit(ret_block,</div><div class='add'>+			if (ext3_test_bit(grp_alloc_blk+i,</div><div class='ctx'> 					bh2jh(bitmap_bh)-&gt;b_committed_data)) {</div><div class='ctx'> 				printk("%s: block was unexpectedly set in "</div><div class='ctx'> 					"b_committed_data\n", __FUNCTION__);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	ext3_debug("found bit %d\n", ret_block);</div><div class='add'>+	ext3_debug("found bit %d\n", grp_alloc_blk);</div><div class='ctx'> 	spin_unlock(sb_bgl_lock(sbi, group_no));</div><div class='ctx'> 	jbd_unlock_bh_state(bitmap_bh);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* ret_block was blockgroup-relative.  Now it becomes fs-relative */</div><div class='del'>-	ret_block = target_block;</div><div class='del'>-</div><div class='ctx'> 	if (ret_block + num - 1 &gt;= le32_to_cpu(es-&gt;s_blocks_count)) {</div><div class='ctx'> 		ext3_error(sb, "ext3_new_block",</div><div class='del'>-			    "block(%d) &gt;= blocks count(%d) - "</div><div class='add'>+			    "block("E3FSBLK") &gt;= blocks count(%d) - "</div><div class='ctx'> 			    "block_group = %d, es == %p ", ret_block,</div><div class='ctx'> 			le32_to_cpu(es-&gt;s_blocks_count), group_no, es);</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -1421,7 +1423,7 @@ allocated:</div><div class='ctx'> 	 * list of some description.  We don't know in advance whether</div><div class='ctx'> 	 * the caller wants to use it as metadata or data.</div><div class='ctx'> 	 */</div><div class='del'>-	ext3_debug("allocating block %d. Goal hits %d of %d.\n",</div><div class='add'>+	ext3_debug("allocating block %lu. Goal hits %d of %d.\n",</div><div class='ctx'> 			ret_block, goal_hits, goal_attempts);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(sb_bgl_lock(sbi, group_no));</div><div class='hunk'>@@ -1461,23 +1463,24 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ext3_new_block(handle_t *handle, struct inode *inode,</div><div class='del'>-			unsigned long goal, int *errp)</div><div class='add'>+ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode,</div><div class='add'>+			ext3_fsblk_t goal, int *errp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long count = 1;</div><div class='ctx'> </div><div class='ctx'> 	return ext3_new_blocks(handle, inode, goal, &amp;count, errp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-unsigned long ext3_count_free_blocks(struct super_block *sb)</div><div class='add'>+ext3_fsblk_t ext3_count_free_blocks(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long desc_count;</div><div class='add'>+	ext3_fsblk_t desc_count;</div><div class='ctx'> 	struct ext3_group_desc *gdp;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long ngroups = EXT3_SB(sb)-&gt;s_groups_count;</div><div class='ctx'> #ifdef EXT3FS_DEBUG</div><div class='ctx'> 	struct ext3_super_block *es;</div><div class='del'>-	unsigned long bitmap_count, x;</div><div class='add'>+	ext3_fsblk_t bitmap_count;</div><div class='add'>+	unsigned long x;</div><div class='ctx'> 	struct buffer_head *bitmap_bh = NULL;</div><div class='ctx'> </div><div class='ctx'> 	es = EXT3_SB(sb)-&gt;s_es;</div><div class='hunk'>@@ -1502,8 +1505,10 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)</div><div class='ctx'> 		bitmap_count += x;</div><div class='ctx'> 	}</div><div class='ctx'> 	brelse(bitmap_bh);</div><div class='del'>-	printk("ext3_count_free_blocks: stored = %u, computed = %lu, %lu\n",</div><div class='del'>-	       le32_to_cpu(es-&gt;s_free_blocks_count), desc_count, bitmap_count);</div><div class='add'>+	printk("ext3_count_free_blocks: stored = "E3FSBLK</div><div class='add'>+		", computed = "E3FSBLK", "E3FSBLK"\n",</div><div class='add'>+	       le32_to_cpu(es-&gt;s_free_blocks_count),</div><div class='add'>+		desc_count, bitmap_count);</div><div class='ctx'> 	return bitmap_count;</div><div class='ctx'> #else</div><div class='ctx'> 	desc_count = 0;</div><div class='hunk'>@@ -1520,7 +1525,7 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int</div><div class='del'>-block_in_use(unsigned long block, struct super_block *sb, unsigned char *map)</div><div class='add'>+block_in_use(ext3_fsblk_t block, struct super_block *sb, unsigned char *map)</div><div class='ctx'> {</div><div class='ctx'> 	return ext3_test_bit ((block -</div><div class='ctx'> 		le32_to_cpu(EXT3_SB(sb)-&gt;s_es-&gt;s_first_data_block)) %</div><div class='head'>diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c<br/>index f37528ed222e..fbb0d4ed07d4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/dir.c</a></div><div class='hunk'>@@ -284,7 +284,7 @@ static void free_rb_tree_fname(struct rb_root *root)</div><div class='ctx'> 		 * beginning of the loop and try to free the parent</div><div class='ctx'> 		 * node.</div><div class='ctx'> 		 */</div><div class='del'>-		parent = n-&gt;rb_parent;</div><div class='add'>+		parent = rb_parent(n);</div><div class='ctx'> 		fname = rb_entry(n, struct fname, rb_hash);</div><div class='ctx'> 		while (fname) {</div><div class='ctx'> 			struct fname * old = fname;</div><div class='head'>diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c<br/>index dc826464f313..36546ed36a14 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/ialloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/ialloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/ialloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/ialloc.c</a></div><div class='hunk'>@@ -262,9 +262,11 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent)</div><div class='ctx'> 	int ngroups = sbi-&gt;s_groups_count;</div><div class='ctx'> 	int inodes_per_group = EXT3_INODES_PER_GROUP(sb);</div><div class='ctx'> 	int freei, avefreei;</div><div class='del'>-	int freeb, avefreeb;</div><div class='del'>-	int blocks_per_dir, ndirs;</div><div class='del'>-	int max_debt, max_dirs, min_blocks, min_inodes;</div><div class='add'>+	ext3_fsblk_t freeb, avefreeb;</div><div class='add'>+	ext3_fsblk_t blocks_per_dir;</div><div class='add'>+	int ndirs;</div><div class='add'>+	int max_debt, max_dirs, min_inodes;</div><div class='add'>+	ext3_grpblk_t min_blocks;</div><div class='ctx'> 	int group = -1, i;</div><div class='ctx'> 	struct ext3_group_desc *desc;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='hunk'>@@ -307,7 +309,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent)</div><div class='ctx'> 	min_inodes = avefreei - inodes_per_group / 4;</div><div class='ctx'> 	min_blocks = avefreeb - EXT3_BLOCKS_PER_GROUP(sb) / 4;</div><div class='ctx'> </div><div class='del'>-	max_debt = EXT3_BLOCKS_PER_GROUP(sb) / max(blocks_per_dir, BLOCK_COST);</div><div class='add'>+	max_debt = EXT3_BLOCKS_PER_GROUP(sb) / max(blocks_per_dir, (ext3_fsblk_t)BLOCK_COST);</div><div class='ctx'> 	if (max_debt * INODE_COST &gt; inodes_per_group)</div><div class='ctx'> 		max_debt = inodes_per_group / INODE_COST;</div><div class='ctx'> 	if (max_debt &gt; 255)</div><div class='head'>diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c<br/>index 2edd7eec88fd..f804d5e9d60c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/inode.c</a></div><div class='hunk'>@@ -62,7 +62,7 @@ static int ext3_inode_is_fast_symlink(struct inode *inode)</div><div class='ctx'>  * still needs to be revoked.</div><div class='ctx'>  */</div><div class='ctx'> int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode,</div><div class='del'>-			struct buffer_head *bh, int blocknr)</div><div class='add'>+			struct buffer_head *bh, ext3_fsblk_t blocknr)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -407,13 +407,13 @@ no_block:</div><div class='ctx'>  *</div><div class='ctx'>  *	Caller must make sure that @ind is valid and will stay that way.</div><div class='ctx'>  */</div><div class='del'>-static unsigned long ext3_find_near(struct inode *inode, Indirect *ind)</div><div class='add'>+static ext3_fsblk_t ext3_find_near(struct inode *inode, Indirect *ind)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_inode_info *ei = EXT3_I(inode);</div><div class='ctx'> 	__le32 *start = ind-&gt;bh ? (__le32*) ind-&gt;bh-&gt;b_data : ei-&gt;i_data;</div><div class='ctx'> 	__le32 *p;</div><div class='del'>-	unsigned long bg_start;</div><div class='del'>-	unsigned long colour;</div><div class='add'>+	ext3_fsblk_t bg_start;</div><div class='add'>+	ext3_grpblk_t colour;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to find previous block */</div><div class='ctx'> 	for (p = ind-&gt;p - 1; p &gt;= start; p--) {</div><div class='hunk'>@@ -429,8 +429,7 @@ static unsigned long ext3_find_near(struct inode *inode, Indirect *ind)</div><div class='ctx'> 	 * It is going to be referred to from the inode itself? OK, just put it</div><div class='ctx'> 	 * into the same cylinder group then.</div><div class='ctx'> 	 */</div><div class='del'>-	bg_start = (ei-&gt;i_block_group * EXT3_BLOCKS_PER_GROUP(inode-&gt;i_sb)) +</div><div class='del'>-		le32_to_cpu(EXT3_SB(inode-&gt;i_sb)-&gt;s_es-&gt;s_first_data_block);</div><div class='add'>+	bg_start = ext3_group_first_block_no(inode-&gt;i_sb, ei-&gt;i_block_group);</div><div class='ctx'> 	colour = (current-&gt;pid % 16) *</div><div class='ctx'> 			(EXT3_BLOCKS_PER_GROUP(inode-&gt;i_sb) / 16);</div><div class='ctx'> 	return bg_start + colour;</div><div class='hunk'>@@ -448,7 +447,7 @@ static unsigned long ext3_find_near(struct inode *inode, Indirect *ind)</div><div class='ctx'>  *	stores it in *@goal and returns zero.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned long ext3_find_goal(struct inode *inode, long block,</div><div class='add'>+static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block,</div><div class='ctx'> 		Indirect chain[4], Indirect *partial)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_block_alloc_info *block_i;</div><div class='hunk'>@@ -516,13 +515,13 @@ static int ext3_blks_to_allocate(Indirect *branch, int k, unsigned long blks,</div><div class='ctx'>  *		direct blocks</div><div class='ctx'>  */</div><div class='ctx'> static int ext3_alloc_blocks(handle_t *handle, struct inode *inode,</div><div class='del'>-			unsigned long goal, int indirect_blks, int blks,</div><div class='del'>-			unsigned long long new_blocks[4], int *err)</div><div class='add'>+			ext3_fsblk_t goal, int indirect_blks, int blks,</div><div class='add'>+			ext3_fsblk_t new_blocks[4], int *err)</div><div class='ctx'> {</div><div class='ctx'> 	int target, i;</div><div class='ctx'> 	unsigned long count = 0;</div><div class='ctx'> 	int index = 0;</div><div class='del'>-	unsigned long current_block = 0;</div><div class='add'>+	ext3_fsblk_t current_block = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -592,7 +591,7 @@ failed_out:</div><div class='ctx'>  *	as described above and return 0.</div><div class='ctx'>  */</div><div class='ctx'> static int ext3_alloc_branch(handle_t *handle, struct inode *inode,</div><div class='del'>-			int indirect_blks, int *blks, unsigned long goal,</div><div class='add'>+			int indirect_blks, int *blks, ext3_fsblk_t goal,</div><div class='ctx'> 			int *offsets, Indirect *branch)</div><div class='ctx'> {</div><div class='ctx'> 	int blocksize = inode-&gt;i_sb-&gt;s_blocksize;</div><div class='hunk'>@@ -600,8 +599,8 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	int num;</div><div class='del'>-	unsigned long long new_blocks[4];</div><div class='del'>-	unsigned long long current_block;</div><div class='add'>+	ext3_fsblk_t new_blocks[4];</div><div class='add'>+	ext3_fsblk_t current_block;</div><div class='ctx'> </div><div class='ctx'> 	num = ext3_alloc_blocks(handle, inode, goal, indirect_blks,</div><div class='ctx'> 				*blks, new_blocks, &amp;err);</div><div class='hunk'>@@ -688,7 +687,7 @@ static int ext3_splice_branch(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct ext3_block_alloc_info *block_i;</div><div class='del'>-	unsigned long current_block;</div><div class='add'>+	ext3_fsblk_t current_block;</div><div class='ctx'> </div><div class='ctx'> 	block_i = EXT3_I(inode)-&gt;i_block_alloc_info;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -795,13 +794,13 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	int offsets[4];</div><div class='ctx'> 	Indirect chain[4];</div><div class='ctx'> 	Indirect *partial;</div><div class='del'>-	unsigned long goal;</div><div class='add'>+	ext3_fsblk_t goal;</div><div class='ctx'> 	int indirect_blks;</div><div class='ctx'> 	int blocks_to_boundary = 0;</div><div class='ctx'> 	int depth;</div><div class='ctx'> 	struct ext3_inode_info *ei = EXT3_I(inode);</div><div class='ctx'> 	int count = 0;</div><div class='del'>-	unsigned long first_block = 0;</div><div class='add'>+	ext3_fsblk_t first_block = 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	J_ASSERT(handle != NULL || create == 0);</div><div class='hunk'>@@ -819,7 +818,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,</div><div class='ctx'> 		count++;</div><div class='ctx'> 		/*map more blocks*/</div><div class='ctx'> 		while (count &lt; maxblocks &amp;&amp; count &lt;= blocks_to_boundary) {</div><div class='del'>-			unsigned long blk;</div><div class='add'>+			ext3_fsblk_t blk;</div><div class='ctx'> </div><div class='ctx'> 			if (!verify_chain(chain, partial)) {</div><div class='ctx'> 				/*</div><div class='hunk'>@@ -1699,7 +1698,7 @@ static int ext3_journalled_set_page_dirty(struct page *page)</div><div class='ctx'> 	return __set_page_dirty_nobuffers(page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations ext3_ordered_aops = {</div><div class='add'>+static const struct address_space_operations ext3_ordered_aops = {</div><div class='ctx'> 	.readpage	= ext3_readpage,</div><div class='ctx'> 	.readpages	= ext3_readpages,</div><div class='ctx'> 	.writepage	= ext3_ordered_writepage,</div><div class='hunk'>@@ -1713,7 +1712,7 @@ static struct address_space_operations ext3_ordered_aops = {</div><div class='ctx'> 	.migratepage	= buffer_migrate_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations ext3_writeback_aops = {</div><div class='add'>+static const struct address_space_operations ext3_writeback_aops = {</div><div class='ctx'> 	.readpage	= ext3_readpage,</div><div class='ctx'> 	.readpages	= ext3_readpages,</div><div class='ctx'> 	.writepage	= ext3_writeback_writepage,</div><div class='hunk'>@@ -1727,7 +1726,7 @@ static struct address_space_operations ext3_writeback_aops = {</div><div class='ctx'> 	.migratepage	= buffer_migrate_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations ext3_journalled_aops = {</div><div class='add'>+static const struct address_space_operations ext3_journalled_aops = {</div><div class='ctx'> 	.readpage	= ext3_readpage,</div><div class='ctx'> 	.readpages	= ext3_readpages,</div><div class='ctx'> 	.writepage	= ext3_journalled_writepage,</div><div class='hunk'>@@ -1759,7 +1758,7 @@ void ext3_set_aops(struct inode *inode)</div><div class='ctx'> static int ext3_block_truncate_page(handle_t *handle, struct page *page,</div><div class='ctx'> 		struct address_space *mapping, loff_t from)</div><div class='ctx'> {</div><div class='del'>-	unsigned long index = from &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+	ext3_fsblk_t index = from &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='ctx'> 	unsigned offset = from &amp; (PAGE_CACHE_SIZE-1);</div><div class='ctx'> 	unsigned blocksize, iblock, length, pos;</div><div class='ctx'> 	struct inode *inode = mapping-&gt;host;</div><div class='hunk'>@@ -1960,7 +1959,7 @@ no_top:</div><div class='ctx'>  * than `count' because there can be holes in there.</div><div class='ctx'>  */</div><div class='ctx'> static void ext3_clear_blocks(handle_t *handle, struct inode *inode,</div><div class='del'>-		struct buffer_head *bh, unsigned long block_to_free,</div><div class='add'>+		struct buffer_head *bh, ext3_fsblk_t block_to_free,</div><div class='ctx'> 		unsigned long count, __le32 *first, __le32 *last)</div><div class='ctx'> {</div><div class='ctx'> 	__le32 *p;</div><div class='hunk'>@@ -2022,12 +2021,12 @@ static void ext3_free_data(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			   struct buffer_head *this_bh,</div><div class='ctx'> 			   __le32 *first, __le32 *last)</div><div class='ctx'> {</div><div class='del'>-	unsigned long block_to_free = 0;    /* Starting block # of a run */</div><div class='add'>+	ext3_fsblk_t block_to_free = 0;    /* Starting block # of a run */</div><div class='ctx'> 	unsigned long count = 0;	    /* Number of blocks in the run */ </div><div class='ctx'> 	__le32 *block_to_free_p = NULL;	    /* Pointer into inode/ind</div><div class='ctx'> 					       corresponding to</div><div class='ctx'> 					       block_to_free */</div><div class='del'>-	unsigned long nr;		    /* Current block # */</div><div class='add'>+	ext3_fsblk_t nr;		    /* Current block # */</div><div class='ctx'> 	__le32 *p;			    /* Pointer into inode/ind</div><div class='ctx'> 					       for current block */</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2089,7 +2088,7 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			       struct buffer_head *parent_bh,</div><div class='ctx'> 			       __le32 *first, __le32 *last, int depth)</div><div class='ctx'> {</div><div class='del'>-	unsigned long nr;</div><div class='add'>+	ext3_fsblk_t nr;</div><div class='ctx'> 	__le32 *p;</div><div class='ctx'> </div><div class='ctx'> 	if (is_handle_aborted(handle))</div><div class='hunk'>@@ -2113,7 +2112,7 @@ static void ext3_free_branches(handle_t *handle, struct inode *inode,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!bh) {</div><div class='ctx'> 				ext3_error(inode-&gt;i_sb, "ext3_free_branches",</div><div class='del'>-					   "Read failure, inode=%ld, block=%ld",</div><div class='add'>+					   "Read failure, inode=%ld, block="E3FSBLK,</div><div class='ctx'> 					   inode-&gt;i_ino, nr);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2394,11 +2393,12 @@ out_stop:</div><div class='ctx'> 	ext3_journal_stop(handle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long ext3_get_inode_block(struct super_block *sb,</div><div class='add'>+static ext3_fsblk_t ext3_get_inode_block(struct super_block *sb,</div><div class='ctx'> 		unsigned long ino, struct ext3_iloc *iloc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long desc, group_desc, block_group;</div><div class='del'>-	unsigned long offset, block;</div><div class='add'>+	unsigned long offset;</div><div class='add'>+	ext3_fsblk_t block;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	struct ext3_group_desc * gdp;</div><div class='ctx'> </div><div class='hunk'>@@ -2448,7 +2448,7 @@ static unsigned long ext3_get_inode_block(struct super_block *sb,</div><div class='ctx'> static int __ext3_get_inode_loc(struct inode *inode,</div><div class='ctx'> 				struct ext3_iloc *iloc, int in_mem)</div><div class='ctx'> {</div><div class='del'>-	unsigned long block;</div><div class='add'>+	ext3_fsblk_t block;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> </div><div class='ctx'> 	block = ext3_get_inode_block(inode-&gt;i_sb, inode-&gt;i_ino, iloc);</div><div class='hunk'>@@ -2459,7 +2459,8 @@ static int __ext3_get_inode_loc(struct inode *inode,</div><div class='ctx'> 	if (!bh) {</div><div class='ctx'> 		ext3_error (inode-&gt;i_sb, "ext3_get_inode_loc",</div><div class='ctx'> 				"unable to read inode block - "</div><div class='del'>-				"inode=%lu, block=%lu", inode-&gt;i_ino, block);</div><div class='add'>+				"inode=%lu, block="E3FSBLK,</div><div class='add'>+				 inode-&gt;i_ino, block);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!buffer_uptodate(bh)) {</div><div class='hunk'>@@ -2540,7 +2541,7 @@ make_io:</div><div class='ctx'> 		if (!buffer_uptodate(bh)) {</div><div class='ctx'> 			ext3_error(inode-&gt;i_sb, "ext3_get_inode_loc",</div><div class='ctx'> 					"unable to read inode block - "</div><div class='del'>-					"inode=%lu, block=%lu",</div><div class='add'>+					"inode=%lu, block="E3FSBLK,</div><div class='ctx'> 					inode-&gt;i_ino, block);</div><div class='ctx'> 			brelse(bh);</div><div class='ctx'> 			return -EIO;</div><div class='head'>diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c<br/>index 8c22aa9a7fbb..3a6b012d120c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/ioctl.c</a></div><div class='hunk'>@@ -204,7 +204,7 @@ flags_err:</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case EXT3_IOC_GROUP_EXTEND: {</div><div class='del'>-		unsigned long n_blocks_count;</div><div class='add'>+		ext3_fsblk_t n_blocks_count;</div><div class='ctx'> 		struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 		int err;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c<br/>index b8f5cd1e540d..d9176dba3698 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/namei.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/namei.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/namei.c</a></div><div class='hunk'>@@ -1379,7 +1379,6 @@ static int ext3_add_entry (handle_t *handle, struct dentry *dentry,</div><div class='ctx'> 	int	dx_fallback=0;</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned blocksize;</div><div class='del'>-	unsigned nlen, rlen;</div><div class='ctx'> 	u32 block, blocks;</div><div class='ctx'> </div><div class='ctx'> 	sb = dir-&gt;i_sb;</div><div class='hunk'>@@ -1417,8 +1416,7 @@ static int ext3_add_entry (handle_t *handle, struct dentry *dentry,</div><div class='ctx'> 		return retval;</div><div class='ctx'> 	de = (struct ext3_dir_entry_2 *) bh-&gt;b_data;</div><div class='ctx'> 	de-&gt;inode = 0;</div><div class='del'>-	de-&gt;rec_len = cpu_to_le16(rlen = blocksize);</div><div class='del'>-	nlen = 0;</div><div class='add'>+	de-&gt;rec_len = cpu_to_le16(blocksize);</div><div class='ctx'> 	return add_dirent_to_buf(handle, dentry, inode, de, bh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c<br/>index 34b39e9a1e5a..5e1337fd878a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/resize.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/resize.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/resize.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/resize.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * This could probably be made into a module, because it is not often in use.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define EXT3FS_DEBUG</div><div class='ctx'> </div><div class='hunk'>@@ -28,16 +27,16 @@ static int verify_group_input(struct super_block *sb,</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='ctx'> 	struct ext3_super_block *es = sbi-&gt;s_es;</div><div class='del'>-	unsigned start = le32_to_cpu(es-&gt;s_blocks_count);</div><div class='del'>-	unsigned end = start + input-&gt;blocks_count;</div><div class='add'>+	ext3_fsblk_t start = le32_to_cpu(es-&gt;s_blocks_count);</div><div class='add'>+	ext3_fsblk_t end = start + input-&gt;blocks_count;</div><div class='ctx'> 	unsigned group = input-&gt;group;</div><div class='del'>-	unsigned itend = input-&gt;inode_table + sbi-&gt;s_itb_per_group;</div><div class='add'>+	ext3_fsblk_t itend = input-&gt;inode_table + sbi-&gt;s_itb_per_group;</div><div class='ctx'> 	unsigned overhead = ext3_bg_has_super(sb, group) ?</div><div class='ctx'> 		(1 + ext3_bg_num_gdb(sb, group) +</div><div class='ctx'> 		 le16_to_cpu(es-&gt;s_reserved_gdt_blocks)) : 0;</div><div class='del'>-	unsigned metaend = start + overhead;</div><div class='add'>+	ext3_fsblk_t metaend = start + overhead;</div><div class='ctx'> 	struct buffer_head *bh = NULL;</div><div class='del'>-	int free_blocks_count;</div><div class='add'>+	ext3_grpblk_t free_blocks_count;</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	input-&gt;free_blocks_count = free_blocks_count =</div><div class='hunk'>@@ -64,7 +63,8 @@ static int verify_group_input(struct super_block *sb,</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__, "Bad blocks count %u",</div><div class='ctx'> 			     input-&gt;blocks_count);</div><div class='ctx'> 	else if (!(bh = sb_bread(sb, end - 1)))</div><div class='del'>-		ext3_warning(sb, __FUNCTION__, "Cannot read last block (%u)",</div><div class='add'>+		ext3_warning(sb, __FUNCTION__,</div><div class='add'>+			     "Cannot read last block ("E3FSBLK")",</div><div class='ctx'> 			     end - 1);</div><div class='ctx'> 	else if (outside(input-&gt;block_bitmap, start, end))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='hunk'>@@ -77,7 +77,7 @@ static int verify_group_input(struct super_block *sb,</div><div class='ctx'> 	else if (outside(input-&gt;inode_table, start, end) ||</div><div class='ctx'> 	         outside(itend - 1, start, end))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "Inode table not in group (blocks %u-%u)",</div><div class='add'>+			     "Inode table not in group (blocks %u-"E3FSBLK")",</div><div class='ctx'> 			     input-&gt;inode_table, itend - 1);</div><div class='ctx'> 	else if (input-&gt;inode_bitmap == input-&gt;block_bitmap)</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='hunk'>@@ -85,24 +85,27 @@ static int verify_group_input(struct super_block *sb,</div><div class='ctx'> 			     input-&gt;block_bitmap);</div><div class='ctx'> 	else if (inside(input-&gt;block_bitmap, input-&gt;inode_table, itend))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "Block bitmap (%u) in inode table (%u-%u)",</div><div class='add'>+			     "Block bitmap (%u) in inode table (%u-"E3FSBLK")",</div><div class='ctx'> 			     input-&gt;block_bitmap, input-&gt;inode_table, itend-1);</div><div class='ctx'> 	else if (inside(input-&gt;inode_bitmap, input-&gt;inode_table, itend))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "Inode bitmap (%u) in inode table (%u-%u)",</div><div class='add'>+			     "Inode bitmap (%u) in inode table (%u-"E3FSBLK")",</div><div class='ctx'> 			     input-&gt;inode_bitmap, input-&gt;inode_table, itend-1);</div><div class='ctx'> 	else if (inside(input-&gt;block_bitmap, start, metaend))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "Block bitmap (%u) in GDT table (%u-%u)",</div><div class='add'>+			     "Block bitmap (%u) in GDT table"</div><div class='add'>+			     " ("E3FSBLK"-"E3FSBLK")",</div><div class='ctx'> 			     input-&gt;block_bitmap, start, metaend - 1);</div><div class='ctx'> 	else if (inside(input-&gt;inode_bitmap, start, metaend))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "Inode bitmap (%u) in GDT table (%u-%u)",</div><div class='add'>+			     "Inode bitmap (%u) in GDT table"</div><div class='add'>+			     " ("E3FSBLK"-"E3FSBLK")",</div><div class='ctx'> 			     input-&gt;inode_bitmap, start, metaend - 1);</div><div class='ctx'> 	else if (inside(input-&gt;inode_table, start, metaend) ||</div><div class='ctx'> 	         inside(itend - 1, start, metaend))</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "Inode table (%u-%u) overlaps GDT table (%u-%u)",</div><div class='add'>+			     "Inode table (%u-"E3FSBLK") overlaps"</div><div class='add'>+			     "GDT table ("E3FSBLK"-"E3FSBLK")",</div><div class='ctx'> 			     input-&gt;inode_table, itend - 1, start, metaend - 1);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = 0;</div><div class='hunk'>@@ -112,7 +115,7 @@ static int verify_group_input(struct super_block *sb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,</div><div class='del'>-				  unsigned long blk)</div><div class='add'>+				  ext3_fsblk_t blk)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -163,15 +166,14 @@ static int setup_new_group_blocks(struct super_block *sb,</div><div class='ctx'> 				  struct ext3_new_group_data *input)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='del'>-	unsigned long start = input-&gt;group * sbi-&gt;s_blocks_per_group +</div><div class='del'>-		le32_to_cpu(sbi-&gt;s_es-&gt;s_first_data_block);</div><div class='add'>+	ext3_fsblk_t start = ext3_group_first_block_no(sb, input-&gt;group);</div><div class='ctx'> 	int reserved_gdb = ext3_bg_has_super(sb, input-&gt;group) ?</div><div class='ctx'> 		le16_to_cpu(sbi-&gt;s_es-&gt;s_reserved_gdt_blocks) : 0;</div><div class='ctx'> 	unsigned long gdblocks = ext3_bg_num_gdb(sb, input-&gt;group);</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	handle_t *handle;</div><div class='del'>-	unsigned long block;</div><div class='del'>-	int bit;</div><div class='add'>+	ext3_fsblk_t block;</div><div class='add'>+	ext3_grpblk_t bit;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err = 0, err2;</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +330,7 @@ static unsigned ext3_list_backups(struct super_block *sb, unsigned *three,</div><div class='ctx'> static int verify_reserved_gdb(struct super_block *sb,</div><div class='ctx'> 			       struct buffer_head *primary)</div><div class='ctx'> {</div><div class='del'>-	const unsigned long blk = primary-&gt;b_blocknr;</div><div class='add'>+	const ext3_fsblk_t blk = primary-&gt;b_blocknr;</div><div class='ctx'> 	const unsigned long end = EXT3_SB(sb)-&gt;s_groups_count;</div><div class='ctx'> 	unsigned three = 1;</div><div class='ctx'> 	unsigned five = 5;</div><div class='hunk'>@@ -340,7 +342,8 @@ static int verify_reserved_gdb(struct super_block *sb,</div><div class='ctx'> 	while ((grp = ext3_list_backups(sb, &amp;three, &amp;five, &amp;seven)) &lt; end) {</div><div class='ctx'> 		if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){</div><div class='ctx'> 			ext3_warning(sb, __FUNCTION__,</div><div class='del'>-				     "reserved GDT %ld missing grp %d (%ld)",</div><div class='add'>+				     "reserved GDT "E3FSBLK</div><div class='add'>+				     " missing grp %d ("E3FSBLK")",</div><div class='ctx'> 				     blk, grp,</div><div class='ctx'> 				     grp * EXT3_BLOCKS_PER_GROUP(sb) + blk);</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -372,7 +375,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	struct super_block *sb = inode-&gt;i_sb;</div><div class='ctx'> 	struct ext3_super_block *es = EXT3_SB(sb)-&gt;s_es;</div><div class='ctx'> 	unsigned long gdb_num = input-&gt;group / EXT3_DESC_PER_BLOCK(sb);</div><div class='del'>-	unsigned long gdblock = EXT3_SB(sb)-&gt;s_sbh-&gt;b_blocknr + 1 + gdb_num;</div><div class='add'>+	ext3_fsblk_t gdblock = EXT3_SB(sb)-&gt;s_sbh-&gt;b_blocknr + 1 + gdb_num;</div><div class='ctx'> 	struct buffer_head **o_group_desc, **n_group_desc;</div><div class='ctx'> 	struct buffer_head *dind;</div><div class='ctx'> 	int gdbackups;</div><div class='hunk'>@@ -417,7 +420,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	data = (__u32 *)dind-&gt;b_data;</div><div class='ctx'> 	if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) {</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "new group %u GDT block %lu not reserved",</div><div class='add'>+			     "new group %u GDT block "E3FSBLK" not reserved",</div><div class='ctx'> 			     input-&gt;group, gdblock);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto exit_dind;</div><div class='hunk'>@@ -515,7 +518,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	struct buffer_head **primary;</div><div class='ctx'> 	struct buffer_head *dind;</div><div class='ctx'> 	struct ext3_iloc iloc;</div><div class='del'>-	unsigned long blk;</div><div class='add'>+	ext3_fsblk_t blk;</div><div class='ctx'> 	__u32 *data, *end;</div><div class='ctx'> 	int gdbackups = 0;</div><div class='ctx'> 	int res, i;</div><div class='hunk'>@@ -540,7 +543,8 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,</div><div class='ctx'> 	for (res = 0; res &lt; reserved_gdb; res++, blk++) {</div><div class='ctx'> 		if (le32_to_cpu(*data) != blk) {</div><div class='ctx'> 			ext3_warning(sb, __FUNCTION__,</div><div class='del'>-				     "reserved block %lu not at offset %ld",</div><div class='add'>+				     "reserved block "E3FSBLK</div><div class='add'>+				     " not at offset %ld",</div><div class='ctx'> 				     blk, (long)(data - (__u32 *)dind-&gt;b_data));</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto exit_bh;</div><div class='hunk'>@@ -902,15 +906,16 @@ exit_put:</div><div class='ctx'>  * GDT blocks are reserved to grow to the desired size.</div><div class='ctx'>  */</div><div class='ctx'> int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,</div><div class='del'>-		      unsigned long n_blocks_count)</div><div class='add'>+		      ext3_fsblk_t n_blocks_count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long o_blocks_count;</div><div class='add'>+	ext3_fsblk_t o_blocks_count;</div><div class='ctx'> 	unsigned long o_groups_count;</div><div class='del'>-	unsigned long last;</div><div class='del'>-	int add;</div><div class='add'>+	ext3_grpblk_t last;</div><div class='add'>+	ext3_grpblk_t add;</div><div class='ctx'> 	struct buffer_head * bh;</div><div class='ctx'> 	handle_t *handle;</div><div class='del'>-	int err, freed_blocks;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned long freed_blocks;</div><div class='ctx'> </div><div class='ctx'> 	/* We don't need to worry about locking wrt other resizers just</div><div class='ctx'> 	 * yet: we're going to revalidate es-&gt;s_blocks_count after</div><div class='hunk'>@@ -919,12 +924,22 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,</div><div class='ctx'> 	o_groups_count = EXT3_SB(sb)-&gt;s_groups_count;</div><div class='ctx'> </div><div class='ctx'> 	if (test_opt(sb, DEBUG))</div><div class='del'>-		printk(KERN_DEBUG "EXT3-fs: extending last group from %lu to %lu blocks\n",</div><div class='add'>+		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",</div><div class='ctx'> 		       o_blocks_count, n_blocks_count);</div><div class='ctx'> </div><div class='ctx'> 	if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (n_blocks_count &gt; (sector_t)(~0ULL) &gt;&gt; (sb-&gt;s_blocksize_bits - 9)) {</div><div class='add'>+		printk(KERN_ERR "EXT3-fs: filesystem on %s:"</div><div class='add'>+			" too large to resize to %lu blocks safely\n",</div><div class='add'>+			sb-&gt;s_id, n_blocks_count);</div><div class='add'>+		if (sizeof(sector_t) &lt; 8)</div><div class='add'>+			ext3_warning(sb, __FUNCTION__,</div><div class='add'>+			"CONFIG_LBD not enabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (n_blocks_count &lt; o_blocks_count) {</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='ctx'> 			     "can't shrink FS - resize aborted");</div><div class='hunk'>@@ -948,7 +963,8 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,</div><div class='ctx'> </div><div class='ctx'> 	if (o_blocks_count + add &lt; n_blocks_count)</div><div class='ctx'> 		ext3_warning(sb, __FUNCTION__,</div><div class='del'>-			     "will only finish group (%lu blocks, %u new)",</div><div class='add'>+			     "will only finish group ("E3FSBLK</div><div class='add'>+			     " blocks, %u new)",</div><div class='ctx'> 			     o_blocks_count + add, add);</div><div class='ctx'> </div><div class='ctx'> 	/* See if the device is actually as big as what was requested */</div><div class='hunk'>@@ -991,10 +1007,10 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,</div><div class='ctx'> 	ext3_journal_dirty_metadata(handle, EXT3_SB(sb)-&gt;s_sbh);</div><div class='ctx'> 	sb-&gt;s_dirt = 1;</div><div class='ctx'> 	unlock_super(sb);</div><div class='del'>-	ext3_debug("freeing blocks %ld through %ld\n", o_blocks_count,</div><div class='add'>+	ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,</div><div class='ctx'> 		   o_blocks_count + add);</div><div class='ctx'> 	ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &amp;freed_blocks);</div><div class='del'>-	ext3_debug("freed blocks %ld through %ld\n", o_blocks_count,</div><div class='add'>+	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,</div><div class='ctx'> 		   o_blocks_count + add);</div><div class='ctx'> 	if ((err = ext3_journal_stop(handle)))</div><div class='ctx'> 		goto exit_put;</div><div class='head'>diff --git a/fs/ext3/super.c b/fs/ext3/super.c<br/>index f8a5266ea1ff..813d589cc6c0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/super.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  *        David S. Miller (davem@caip.rutgers.edu), 1995</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -58,7 +57,7 @@ static int ext3_sync_fs(struct super_block *sb, int wait);</div><div class='ctx'> static const char *ext3_decode_error(struct super_block * sb, int errno,</div><div class='ctx'> 				     char nbuf[16]);</div><div class='ctx'> static int ext3_remount (struct super_block * sb, int * flags, char * data);</div><div class='del'>-static int ext3_statfs (struct super_block * sb, struct kstatfs * buf);</div><div class='add'>+static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf);</div><div class='ctx'> static void ext3_unlockfs(struct super_block *sb);</div><div class='ctx'> static void ext3_write_super (struct super_block * sb);</div><div class='ctx'> static void ext3_write_super_lockfs(struct super_block *sb);</div><div class='hunk'>@@ -499,20 +498,21 @@ static void ext3_clear_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_block_alloc_info *rsv = EXT3_I(inode)-&gt;i_block_alloc_info;</div><div class='ctx'> #ifdef CONFIG_EXT3_FS_POSIX_ACL</div><div class='del'>-       if (EXT3_I(inode)-&gt;i_acl &amp;&amp;</div><div class='del'>-           EXT3_I(inode)-&gt;i_acl != EXT3_ACL_NOT_CACHED) {</div><div class='del'>-               posix_acl_release(EXT3_I(inode)-&gt;i_acl);</div><div class='del'>-               EXT3_I(inode)-&gt;i_acl = EXT3_ACL_NOT_CACHED;</div><div class='del'>-       }</div><div class='del'>-       if (EXT3_I(inode)-&gt;i_default_acl &amp;&amp;</div><div class='del'>-           EXT3_I(inode)-&gt;i_default_acl != EXT3_ACL_NOT_CACHED) {</div><div class='del'>-               posix_acl_release(EXT3_I(inode)-&gt;i_default_acl);</div><div class='del'>-               EXT3_I(inode)-&gt;i_default_acl = EXT3_ACL_NOT_CACHED;</div><div class='del'>-       }</div><div class='add'>+	if (EXT3_I(inode)-&gt;i_acl &amp;&amp;</div><div class='add'>+			EXT3_I(inode)-&gt;i_acl != EXT3_ACL_NOT_CACHED) {</div><div class='add'>+		posix_acl_release(EXT3_I(inode)-&gt;i_acl);</div><div class='add'>+		EXT3_I(inode)-&gt;i_acl = EXT3_ACL_NOT_CACHED;</div><div class='add'>+	}</div><div class='add'>+	if (EXT3_I(inode)-&gt;i_default_acl &amp;&amp;</div><div class='add'>+			EXT3_I(inode)-&gt;i_default_acl != EXT3_ACL_NOT_CACHED) {</div><div class='add'>+		posix_acl_release(EXT3_I(inode)-&gt;i_default_acl);</div><div class='add'>+		EXT3_I(inode)-&gt;i_default_acl = EXT3_ACL_NOT_CACHED;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> 	ext3_discard_reservation(inode);</div><div class='ctx'> 	EXT3_I(inode)-&gt;i_block_alloc_info = NULL;</div><div class='del'>-	kfree(rsv);</div><div class='add'>+	if (unlikely(rsv))</div><div class='add'>+		kfree(rsv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void ext3_show_quota_options(struct seq_file *seq, struct super_block *sb)</div><div class='hunk'>@@ -629,7 +629,7 @@ enum {</div><div class='ctx'> 	Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,</div><div class='ctx'> 	Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov,</div><div class='ctx'> 	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,</div><div class='del'>-	Opt_reservation, Opt_noreservation, Opt_noload, Opt_nobh,</div><div class='add'>+	Opt_reservation, Opt_noreservation, Opt_noload, Opt_nobh, Opt_bh,</div><div class='ctx'> 	Opt_commit, Opt_journal_update, Opt_journal_inum, Opt_journal_dev,</div><div class='ctx'> 	Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,</div><div class='ctx'> 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,</div><div class='hunk'>@@ -665,6 +665,7 @@ static match_table_t tokens = {</div><div class='ctx'> 	{Opt_noreservation, "noreservation"},</div><div class='ctx'> 	{Opt_noload, "noload"},</div><div class='ctx'> 	{Opt_nobh, "nobh"},</div><div class='add'>+	{Opt_bh, "bh"},</div><div class='ctx'> 	{Opt_commit, "commit=%u"},</div><div class='ctx'> 	{Opt_journal_update, "journal=update"},</div><div class='ctx'> 	{Opt_journal_inum, "journal=%u"},</div><div class='hunk'>@@ -688,14 +689,15 @@ static match_table_t tokens = {</div><div class='ctx'> 	{Opt_resize, "resize"},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned long get_sb_block(void **data)</div><div class='add'>+static ext3_fsblk_t get_sb_block(void **data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long 	sb_block;</div><div class='add'>+	ext3_fsblk_t 	sb_block;</div><div class='ctx'> 	char 		*options = (char *) *data;</div><div class='ctx'> </div><div class='ctx'> 	if (!options || strncmp(options, "sb=", 3) != 0)</div><div class='ctx'> 		return 1;	/* Default location */</div><div class='ctx'> 	options += 3;</div><div class='add'>+	/*todo: use simple_strtoll with &gt;32bit ext3 */</div><div class='ctx'> 	sb_block = simple_strtoul(options, &amp;options, 0);</div><div class='ctx'> 	if (*options &amp;&amp; *options != ',') {</div><div class='ctx'> 		printk("EXT3-fs: Invalid sb specification: %s\n",</div><div class='hunk'>@@ -710,7 +712,7 @@ static unsigned long get_sb_block(void **data)</div><div class='ctx'> </div><div class='ctx'> static int parse_options (char *options, struct super_block *sb,</div><div class='ctx'> 			  unsigned long *inum, unsigned long *journal_devnum,</div><div class='del'>-			  unsigned long *n_blocks_count, int is_remount)</div><div class='add'>+			  ext3_fsblk_t *n_blocks_count, int is_remount)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='ctx'> 	char * p;</div><div class='hunk'>@@ -1012,6 +1014,9 @@ clear_qf_name:</div><div class='ctx'> 		case Opt_nobh:</div><div class='ctx'> 			set_opt(sbi-&gt;s_mount_opt, NOBH);</div><div class='ctx'> 			break;</div><div class='add'>+		case Opt_bh:</div><div class='add'>+			clear_opt(sbi-&gt;s_mount_opt, NOBH);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			printk (KERN_ERR</div><div class='ctx'> 				"EXT3-fs: Unrecognized mount option \"%s\" "</div><div class='hunk'>@@ -1127,7 +1132,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,</div><div class='ctx'> static int ext3_check_descriptors (struct super_block * sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='del'>-	unsigned long block = le32_to_cpu(sbi-&gt;s_es-&gt;s_first_data_block);</div><div class='add'>+	ext3_fsblk_t block = le32_to_cpu(sbi-&gt;s_es-&gt;s_first_data_block);</div><div class='ctx'> 	struct ext3_group_desc * gdp = NULL;</div><div class='ctx'> 	int desc_block = 0;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1314,15 +1319,14 @@ static loff_t ext3_max_size(int bits)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long descriptor_loc(struct super_block *sb,</div><div class='del'>-				    unsigned long logic_sb_block,</div><div class='add'>+static ext3_fsblk_t descriptor_loc(struct super_block *sb,</div><div class='add'>+				    ext3_fsblk_t logic_sb_block,</div><div class='ctx'> 				    int nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='del'>-	unsigned long bg, first_data_block, first_meta_bg;</div><div class='add'>+	unsigned long bg, first_meta_bg;</div><div class='ctx'> 	int has_super = 0;</div><div class='ctx'> </div><div class='del'>-	first_data_block = le32_to_cpu(sbi-&gt;s_es-&gt;s_first_data_block);</div><div class='ctx'> 	first_meta_bg = le32_to_cpu(sbi-&gt;s_es-&gt;s_first_meta_bg);</div><div class='ctx'> </div><div class='ctx'> 	if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_META_BG) ||</div><div class='hunk'>@@ -1331,7 +1335,7 @@ static unsigned long descriptor_loc(struct super_block *sb,</div><div class='ctx'> 	bg = sbi-&gt;s_desc_per_block * nr;</div><div class='ctx'> 	if (ext3_bg_has_super(sb, bg))</div><div class='ctx'> 		has_super = 1;</div><div class='del'>-	return (first_data_block + has_super + (bg * sbi-&gt;s_blocks_per_group));</div><div class='add'>+	return (has_super + ext3_group_first_block_no(sb, bg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1340,9 +1344,9 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	struct buffer_head * bh;</div><div class='ctx'> 	struct ext3_super_block *es = NULL;</div><div class='ctx'> 	struct ext3_sb_info *sbi;</div><div class='del'>-	unsigned long block;</div><div class='del'>-	unsigned long sb_block = get_sb_block(&amp;data);</div><div class='del'>-	unsigned long logic_sb_block;</div><div class='add'>+	ext3_fsblk_t block;</div><div class='add'>+	ext3_fsblk_t sb_block = get_sb_block(&amp;data);</div><div class='add'>+	ext3_fsblk_t logic_sb_block;</div><div class='ctx'> 	unsigned long offset = 0;</div><div class='ctx'> 	unsigned long journal_inum = 0;</div><div class='ctx'> 	unsigned long journal_devnum = 0;</div><div class='hunk'>@@ -1564,6 +1568,16 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		goto failed_mount;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (le32_to_cpu(es-&gt;s_blocks_count) &gt;</div><div class='add'>+		    (sector_t)(~0ULL) &gt;&gt; (sb-&gt;s_blocksize_bits - 9)) {</div><div class='add'>+		printk(KERN_ERR "EXT3-fs: filesystem on %s:"</div><div class='add'>+			" too large to mount safely\n", sb-&gt;s_id);</div><div class='add'>+		if (sizeof(sector_t) &lt; 8)</div><div class='add'>+			printk(KERN_WARNING "EXT3-fs: CONFIG_LBD not "</div><div class='add'>+					"enabled\n");</div><div class='add'>+		goto failed_mount;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (EXT3_BLOCKS_PER_GROUP(sb) == 0)</div><div class='ctx'> 		goto cantfind_ext3;</div><div class='ctx'> 	sbi-&gt;s_groups_count = (le32_to_cpu(es-&gt;s_blocks_count) -</div><div class='hunk'>@@ -1579,9 +1593,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		goto failed_mount;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	percpu_counter_init(&amp;sbi-&gt;s_freeblocks_counter);</div><div class='del'>-	percpu_counter_init(&amp;sbi-&gt;s_freeinodes_counter);</div><div class='del'>-	percpu_counter_init(&amp;sbi-&gt;s_dirs_counter);</div><div class='ctx'> 	bgl_lock_init(&amp;sbi-&gt;s_blockgroup_lock);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; db_count; i++) {</div><div class='hunk'>@@ -1595,12 +1606,20 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!ext3_check_descriptors (sb)) {</div><div class='del'>-		printk (KERN_ERR "EXT3-fs: group descriptors corrupted !\n");</div><div class='add'>+		printk(KERN_ERR "EXT3-fs: group descriptors corrupted!\n");</div><div class='ctx'> 		goto failed_mount2;</div><div class='ctx'> 	}</div><div class='ctx'> 	sbi-&gt;s_gdb_count = db_count;</div><div class='ctx'> 	get_random_bytes(&amp;sbi-&gt;s_next_generation, sizeof(u32));</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;s_next_gen_lock);</div><div class='add'>+</div><div class='add'>+	percpu_counter_init(&amp;sbi-&gt;s_freeblocks_counter,</div><div class='add'>+		ext3_count_free_blocks(sb));</div><div class='add'>+	percpu_counter_init(&amp;sbi-&gt;s_freeinodes_counter,</div><div class='add'>+		ext3_count_free_inodes(sb));</div><div class='add'>+	percpu_counter_init(&amp;sbi-&gt;s_dirs_counter,</div><div class='add'>+		ext3_count_dirs(sb));</div><div class='add'>+</div><div class='ctx'> 	/* per fileystem reservation list head &amp; lock */</div><div class='ctx'> 	spin_lock_init(&amp;sbi-&gt;s_rsv_window_lock);</div><div class='ctx'> 	sbi-&gt;s_rsv_window_root = RB_ROOT;</div><div class='hunk'>@@ -1639,16 +1658,16 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!test_opt(sb, NOLOAD) &amp;&amp;</div><div class='ctx'> 	    EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {</div><div class='ctx'> 		if (ext3_load_journal(sb, es, journal_devnum))</div><div class='del'>-			goto failed_mount2;</div><div class='add'>+			goto failed_mount3;</div><div class='ctx'> 	} else if (journal_inum) {</div><div class='ctx'> 		if (ext3_create_journal(sb, es, journal_inum))</div><div class='del'>-			goto failed_mount2;</div><div class='add'>+			goto failed_mount3;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!silent)</div><div class='ctx'> 			printk (KERN_ERR</div><div class='ctx'> 				"ext3: No journal on filesystem on %s\n",</div><div class='ctx'> 				sb-&gt;s_id);</div><div class='del'>-		goto failed_mount2;</div><div class='add'>+		goto failed_mount3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We have now updated the journal if required, so we can</div><div class='hunk'>@@ -1671,7 +1690,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		    (sbi-&gt;s_journal, 0, 0, JFS_FEATURE_INCOMPAT_REVOKE)) {</div><div class='ctx'> 			printk(KERN_ERR "EXT3-fs: Journal does not support "</div><div class='ctx'> 			       "requested data journaling mode\n");</div><div class='del'>-			goto failed_mount3;</div><div class='add'>+			goto failed_mount4;</div><div class='ctx'> 		}</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1694,13 +1713,13 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!sb-&gt;s_root) {</div><div class='ctx'> 		printk(KERN_ERR "EXT3-fs: get root inode failed\n");</div><div class='ctx'> 		iput(root);</div><div class='del'>-		goto failed_mount3;</div><div class='add'>+		goto failed_mount4;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!S_ISDIR(root-&gt;i_mode) || !root-&gt;i_blocks || !root-&gt;i_size) {</div><div class='ctx'> 		dput(sb-&gt;s_root);</div><div class='ctx'> 		sb-&gt;s_root = NULL;</div><div class='ctx'> 		printk(KERN_ERR "EXT3-fs: corrupt root inode, run e2fsck\n");</div><div class='del'>-		goto failed_mount3;</div><div class='add'>+		goto failed_mount4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ext3_setup_super (sb, es, sb-&gt;s_flags &amp; MS_RDONLY);</div><div class='hunk'>@@ -1723,13 +1742,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)</div><div class='ctx'> 		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":</div><div class='ctx'> 		"writeback");</div><div class='ctx'> </div><div class='del'>-	percpu_counter_mod(&amp;sbi-&gt;s_freeblocks_counter,</div><div class='del'>-		ext3_count_free_blocks(sb));</div><div class='del'>-	percpu_counter_mod(&amp;sbi-&gt;s_freeinodes_counter,</div><div class='del'>-		ext3_count_free_inodes(sb));</div><div class='del'>-	percpu_counter_mod(&amp;sbi-&gt;s_dirs_counter,</div><div class='del'>-		ext3_count_dirs(sb));</div><div class='del'>-</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1739,8 +1751,12 @@ cantfind_ext3:</div><div class='ctx'> 		       sb-&gt;s_id);</div><div class='ctx'> 	goto failed_mount;</div><div class='ctx'> </div><div class='del'>-failed_mount3:</div><div class='add'>+failed_mount4:</div><div class='ctx'> 	journal_destroy(sbi-&gt;s_journal);</div><div class='add'>+failed_mount3:</div><div class='add'>+	percpu_counter_destroy(&amp;sbi-&gt;s_freeblocks_counter);</div><div class='add'>+	percpu_counter_destroy(&amp;sbi-&gt;s_freeinodes_counter);</div><div class='add'>+	percpu_counter_destroy(&amp;sbi-&gt;s_dirs_counter);</div><div class='ctx'> failed_mount2:</div><div class='ctx'> 	for (i = 0; i &lt; db_count; i++)</div><div class='ctx'> 		brelse(sbi-&gt;s_group_desc[i]);</div><div class='hunk'>@@ -1827,10 +1843,10 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head * bh;</div><div class='ctx'> 	journal_t *journal;</div><div class='del'>-	int start;</div><div class='del'>-	int len;</div><div class='add'>+	ext3_fsblk_t start;</div><div class='add'>+	ext3_fsblk_t len;</div><div class='ctx'> 	int hblock, blocksize;</div><div class='del'>-	unsigned long sb_block;</div><div class='add'>+	ext3_fsblk_t sb_block;</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	struct ext3_super_block * es;</div><div class='ctx'> 	struct block_device *bdev;</div><div class='hunk'>@@ -2203,7 +2219,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ext3_super_block * es;</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='del'>-	unsigned long n_blocks_count = 0;</div><div class='add'>+	ext3_fsblk_t n_blocks_count = 0;</div><div class='ctx'> 	unsigned long old_sb_flags;</div><div class='ctx'> 	struct ext3_mount_options old_opts;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2318,11 +2334,12 @@ restore_opts:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ext3_statfs (struct super_block * sb, struct kstatfs * buf)</div><div class='add'>+static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	struct ext3_sb_info *sbi = EXT3_SB(sb);</div><div class='ctx'> 	struct ext3_super_block *es = sbi-&gt;s_es;</div><div class='del'>-	unsigned long overhead;</div><div class='add'>+	ext3_fsblk_t overhead;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (test_opt (sb, MINIX_DF))</div><div class='hunk'>@@ -2597,7 +2614,7 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='ctx'> 	handle_t *handle = journal_current_handle();</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;inode-&gt;i_mutex, I_MUTEX_QUOTA);</div><div class='ctx'> 	while (towrite &gt; 0) {</div><div class='ctx'> 		tocopy = sb-&gt;s_blocksize - offset &lt; towrite ?</div><div class='ctx'> 				sb-&gt;s_blocksize - offset : towrite;</div><div class='hunk'>@@ -2646,10 +2663,10 @@ out:</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct super_block *ext3_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int ext3_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, ext3_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, ext3_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type ext3_fs_type = {</div><div class='head'>diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c<br/>index e8d60bf6b7df..a44a0562203a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/xattr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/xattr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/xattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/xattr.c</a></div><div class='hunk'>@@ -225,7 +225,7 @@ ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,</div><div class='ctx'> 	error = -ENODATA;</div><div class='ctx'> 	if (!EXT3_I(inode)-&gt;i_file_acl)</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	ea_idebug(inode, "reading block %d", EXT3_I(inode)-&gt;i_file_acl);</div><div class='add'>+	ea_idebug(inode, "reading block %u", EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 	bh = sb_bread(inode-&gt;i_sb, EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 	if (!bh)</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -233,7 +233,7 @@ ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,</div><div class='ctx'> 		atomic_read(&amp;(bh-&gt;b_count)), le32_to_cpu(BHDR(bh)-&gt;h_refcount));</div><div class='ctx'> 	if (ext3_xattr_check_block(bh)) {</div><div class='ctx'> bad_block:	ext3_error(inode-&gt;i_sb, __FUNCTION__,</div><div class='del'>-			   "inode %ld: bad block %d", inode-&gt;i_ino,</div><div class='add'>+			   "inode %ld: bad block "E3FSBLK, inode-&gt;i_ino,</div><div class='ctx'> 			   EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 		error = -EIO;</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -366,7 +366,7 @@ ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)</div><div class='ctx'> 	error = 0;</div><div class='ctx'> 	if (!EXT3_I(inode)-&gt;i_file_acl)</div><div class='ctx'> 		goto cleanup;</div><div class='del'>-	ea_idebug(inode, "reading block %d", EXT3_I(inode)-&gt;i_file_acl);</div><div class='add'>+	ea_idebug(inode, "reading block %u", EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 	bh = sb_bread(inode-&gt;i_sb, EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 	error = -EIO;</div><div class='ctx'> 	if (!bh)</div><div class='hunk'>@@ -375,7 +375,7 @@ ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)</div><div class='ctx'> 		atomic_read(&amp;(bh-&gt;b_count)), le32_to_cpu(BHDR(bh)-&gt;h_refcount));</div><div class='ctx'> 	if (ext3_xattr_check_block(bh)) {</div><div class='ctx'> 		ext3_error(inode-&gt;i_sb, __FUNCTION__,</div><div class='del'>-			   "inode %ld: bad block %d", inode-&gt;i_ino,</div><div class='add'>+			   "inode %ld: bad block "E3FSBLK, inode-&gt;i_ino,</div><div class='ctx'> 			   EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 		error = -EIO;</div><div class='ctx'> 		goto cleanup;</div><div class='hunk'>@@ -647,7 +647,7 @@ ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i,</div><div class='ctx'> 			le32_to_cpu(BHDR(bs-&gt;bh)-&gt;h_refcount));</div><div class='ctx'> 		if (ext3_xattr_check_block(bs-&gt;bh)) {</div><div class='ctx'> 			ext3_error(sb, __FUNCTION__,</div><div class='del'>-				"inode %ld: bad block %d", inode-&gt;i_ino,</div><div class='add'>+				"inode %ld: bad block "E3FSBLK, inode-&gt;i_ino,</div><div class='ctx'> 				EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 			error = -EIO;</div><div class='ctx'> 			goto cleanup;</div><div class='hunk'>@@ -792,11 +792,12 @@ inserted:</div><div class='ctx'> 			get_bh(new_bh);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* We need to allocate a new block */</div><div class='del'>-			int goal = le32_to_cpu(</div><div class='add'>+			ext3_fsblk_t goal = le32_to_cpu(</div><div class='ctx'> 					EXT3_SB(sb)-&gt;s_es-&gt;s_first_data_block) +</div><div class='del'>-				EXT3_I(inode)-&gt;i_block_group *</div><div class='add'>+				(ext3_fsblk_t)EXT3_I(inode)-&gt;i_block_group *</div><div class='ctx'> 				EXT3_BLOCKS_PER_GROUP(sb);</div><div class='del'>-			int block = ext3_new_block(handle, inode, goal, &amp;error);</div><div class='add'>+			ext3_fsblk_t block = ext3_new_block(handle, inode,</div><div class='add'>+							goal, &amp;error);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			ea_idebug(inode, "creating block %d", block);</div><div class='hunk'>@@ -847,7 +848,7 @@ cleanup_dquot:</div><div class='ctx'> </div><div class='ctx'> bad_block:</div><div class='ctx'> 	ext3_error(inode-&gt;i_sb, __FUNCTION__,</div><div class='del'>-		   "inode %ld: bad block %d", inode-&gt;i_ino,</div><div class='add'>+		   "inode %ld: bad block "E3FSBLK, inode-&gt;i_ino,</div><div class='ctx'> 		   EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 	goto cleanup;</div><div class='ctx'> </div><div class='hunk'>@@ -1076,14 +1077,14 @@ ext3_xattr_delete_inode(handle_t *handle, struct inode *inode)</div><div class='ctx'> 	bh = sb_bread(inode-&gt;i_sb, EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 	if (!bh) {</div><div class='ctx'> 		ext3_error(inode-&gt;i_sb, __FUNCTION__,</div><div class='del'>-			"inode %ld: block %d read error", inode-&gt;i_ino,</div><div class='add'>+			"inode %ld: block "E3FSBLK" read error", inode-&gt;i_ino,</div><div class='ctx'> 			EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (BHDR(bh)-&gt;h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) ||</div><div class='ctx'> 	    BHDR(bh)-&gt;h_blocks != cpu_to_le32(1)) {</div><div class='ctx'> 		ext3_error(inode-&gt;i_sb, __FUNCTION__,</div><div class='del'>-			"inode %ld: bad block %d", inode-&gt;i_ino,</div><div class='add'>+			"inode %ld: bad block "E3FSBLK, inode-&gt;i_ino,</div><div class='ctx'> 			EXT3_I(inode)-&gt;i_file_acl);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1210,11 +1211,11 @@ again:</div><div class='ctx'> 		bh = sb_bread(inode-&gt;i_sb, ce-&gt;e_block);</div><div class='ctx'> 		if (!bh) {</div><div class='ctx'> 			ext3_error(inode-&gt;i_sb, __FUNCTION__,</div><div class='del'>-				"inode %ld: block %ld read error",</div><div class='add'>+				"inode %ld: block %lu read error",</div><div class='ctx'> 				inode-&gt;i_ino, (unsigned long) ce-&gt;e_block);</div><div class='ctx'> 		} else if (le32_to_cpu(BHDR(bh)-&gt;h_refcount) &gt;=</div><div class='ctx'> 				EXT3_XATTR_REFCOUNT_MAX) {</div><div class='del'>-			ea_idebug(inode, "block %ld refcount %d&gt;=%d",</div><div class='add'>+			ea_idebug(inode, "block %lu refcount %d&gt;=%d",</div><div class='ctx'> 				  (unsigned long) ce-&gt;e_block,</div><div class='ctx'> 				  le32_to_cpu(BHDR(bh)-&gt;h_refcount),</div><div class='ctx'> 					  EXT3_XATTR_REFCOUNT_MAX);</div><div class='head'>diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h<br/>index 2ceae38f3d49..6b1ae1c6182c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ext3/xattr.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ext3/xattr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ext3/xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ext3/xattr.h</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>   (C) 2001 Andreas Gruenbacher, &lt;a.gruenbacher@computer.org&gt;</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/xattr.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Magic value in attribute blocks */</div><div class='head'>diff --git a/fs/fat/inode.c b/fs/fat/inode.c<br/>index c1ce284f8a94..31b7174176ba 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fat/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fat/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fat/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fat/inode.c</a></div><div class='hunk'>@@ -196,7 +196,7 @@ static sector_t _fat_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> 	return generic_block_bmap(mapping, block, fat_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations fat_aops = {</div><div class='add'>+static const struct address_space_operations fat_aops = {</div><div class='ctx'> 	.readpage	= fat_readpage,</div><div class='ctx'> 	.readpages	= fat_readpages,</div><div class='ctx'> 	.writepage	= fat_writepage,</div><div class='hunk'>@@ -539,18 +539,18 @@ static int fat_remount(struct super_block *sb, int *flags, char *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fat_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct msdos_sb_info *sbi = MSDOS_SB(sb);</div><div class='add'>+	struct msdos_sb_info *sbi = MSDOS_SB(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	/* If the count of free cluster is still unknown, counts it here. */</div><div class='ctx'> 	if (sbi-&gt;free_clusters == -1) {</div><div class='del'>-		int err = fat_count_free_clusters(sb);</div><div class='add'>+		int err = fat_count_free_clusters(dentry-&gt;d_sb);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	buf-&gt;f_type = sb-&gt;s_magic;</div><div class='add'>+	buf-&gt;f_type = dentry-&gt;d_sb-&gt;s_magic;</div><div class='ctx'> 	buf-&gt;f_bsize = sbi-&gt;cluster_size;</div><div class='ctx'> 	buf-&gt;f_blocks = sbi-&gt;max_cluster - FAT_START_ENT;</div><div class='ctx'> 	buf-&gt;f_bfree = sbi-&gt;free_clusters;</div><div class='head'>diff --git a/fs/fat/misc.c b/fs/fat/misc.c<br/>index 944652e9dde1..308f2b6b5026 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fat/misc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fat/misc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fat/misc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fat/misc.c</a></div><div class='hunk'>@@ -210,4 +210,3 @@ int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(fat_sync_bhs);</div><div class='head'>diff --git a/fs/file.c b/fs/file.c<br/>index 55f4e7022563..b3c6b82e6a9d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/file.c</a></div><div class='hunk'>@@ -240,13 +240,9 @@ static struct fdtable *alloc_fdtable(int nr)</div><div class='ctx'> 	if (!fdt)</div><div class='ctx'>   		goto out;</div><div class='ctx'> </div><div class='del'>-	nfds = 8 * L1_CACHE_BYTES;</div><div class='del'>-  	/* Expand to the max in easy steps */</div><div class='del'>-  	while (nfds &lt;= nr) {</div><div class='del'>-		nfds = nfds * 2;</div><div class='del'>-		if (nfds &gt; NR_OPEN)</div><div class='del'>-			nfds = NR_OPEN;</div><div class='del'>-	}</div><div class='add'>+	nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nr + 1));</div><div class='add'>+	if (nfds &gt; NR_OPEN)</div><div class='add'>+		nfds = NR_OPEN;</div><div class='ctx'> </div><div class='ctx'>   	new_openset = alloc_fdset(nfds);</div><div class='ctx'>   	new_execset = alloc_fdset(nfds);</div><div class='hunk'>@@ -277,11 +273,13 @@ static struct fdtable *alloc_fdtable(int nr)</div><div class='ctx'> 	} while (nfds &lt;= nr);</div><div class='ctx'> 	new_fds = alloc_fd_array(nfds);</div><div class='ctx'> 	if (!new_fds)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out2;</div><div class='ctx'> 	fdt-&gt;fd = new_fds;</div><div class='ctx'> 	fdt-&gt;max_fds = nfds;</div><div class='ctx'> 	fdt-&gt;free_files = NULL;</div><div class='ctx'> 	return fdt;</div><div class='add'>+out2:</div><div class='add'>+	nfds = fdt-&gt;max_fdset;</div><div class='ctx'> out:</div><div class='ctx'>   	if (new_openset)</div><div class='ctx'>   		free_fdset(new_openset, nfds);</div><div class='head'>diff --git a/fs/file_table.c b/fs/file_table.c<br/>index bcea1998b4de..0131ba06e1ee 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/file_table.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/file_table.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/file_table.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/file_table.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *  Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='hunk'>@@ -300,5 +299,5 @@ void __init files_init(unsigned long mempages)</div><div class='ctx'> 	if (files_stat.max_files &lt; NR_FILE)</div><div class='ctx'> 		files_stat.max_files = NR_FILE;</div><div class='ctx'> 	files_defer_init();</div><div class='del'>-	percpu_counter_init(&amp;nr_files);</div><div class='add'>+	percpu_counter_init(&amp;nr_files, 0);</div><div class='ctx'> } </div><div class='head'>diff --git a/fs/freevxfs/vxfs.h b/fs/freevxfs/vxfs.h<br/>index 583bd78086d8..d35979a58743 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/freevxfs/vxfs.h</a></div><div class='hunk'>@@ -159,11 +159,11 @@ struct vxfs_sb {</div><div class='ctx'>  * In core superblock filesystem private data for VxFS.</div><div class='ctx'>  */</div><div class='ctx'> struct vxfs_sb_info {</div><div class='del'>-	struct vxfs_sb		*vsi_raw;	/* raw (on disk) supeblock */</div><div class='add'>+	struct vxfs_sb		*vsi_raw;	/* raw (on disk) superblock */</div><div class='ctx'> 	struct buffer_head	*vsi_bp;	/* buffer for raw superblock*/</div><div class='ctx'> 	struct inode		*vsi_fship;	/* fileset header inode */</div><div class='ctx'> 	struct inode		*vsi_ilist;	/* inode list inode */</div><div class='del'>-	struct inode		*vsi_stilist;	/* structual inode list inode */</div><div class='add'>+	struct inode		*vsi_stilist;	/* structural inode list inode */</div><div class='ctx'> 	u_long			vsi_iext;	/* initial inode list */</div><div class='ctx'> 	ino_t			vsi_fshino;	/* fileset header inode */</div><div class='ctx'> 	daddr_t			vsi_oltext;	/* OLT extent */</div><div class='head'>diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c<br/>index 6dee109aeea4..78948b4b1894 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_fshead.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_fshead.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_fshead.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/freevxfs/vxfs_fshead.c</a></div><div class='hunk'>@@ -112,7 +112,7 @@ vxfs_read_fshead(struct super_block *sbp)</div><div class='ctx'> </div><div class='ctx'> 	vip = vxfs_blkiget(sbp, infp-&gt;vsi_iext, infp-&gt;vsi_fshino);</div><div class='ctx'> 	if (!vip) {</div><div class='del'>-		printk(KERN_ERR "vxfs: unabled to read fsh inode\n");</div><div class='add'>+		printk(KERN_ERR "vxfs: unable to read fsh inode\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!VXFS_ISFSH(vip)) {</div><div class='hunk'>@@ -129,13 +129,13 @@ vxfs_read_fshead(struct super_block *sbp)</div><div class='ctx'> </div><div class='ctx'> 	infp-&gt;vsi_fship = vxfs_get_fake_inode(sbp, vip);</div><div class='ctx'> 	if (!infp-&gt;vsi_fship) {</div><div class='del'>-		printk(KERN_ERR "vxfs: unabled to get fsh inode\n");</div><div class='add'>+		printk(KERN_ERR "vxfs: unable to get fsh inode\n");</div><div class='ctx'> 		goto out_free_fship;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sfp = vxfs_getfsh(infp-&gt;vsi_fship, 0);</div><div class='ctx'> 	if (!sfp) {</div><div class='del'>-		printk(KERN_ERR "vxfs: unabled to get structural fsh\n");</div><div class='add'>+		printk(KERN_ERR "vxfs: unable to get structural fsh\n");</div><div class='ctx'> 		goto out_iput_fship;</div><div class='ctx'> 	} </div><div class='ctx'> </div><div class='hunk'>@@ -145,7 +145,7 @@ vxfs_read_fshead(struct super_block *sbp)</div><div class='ctx'> </div><div class='ctx'> 	pfp = vxfs_getfsh(infp-&gt;vsi_fship, 1);</div><div class='ctx'> 	if (!pfp) {</div><div class='del'>-		printk(KERN_ERR "vxfs: unabled to get primary fsh\n");</div><div class='add'>+		printk(KERN_ERR "vxfs: unable to get primary fsh\n");</div><div class='ctx'> 		goto out_free_sfp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +159,7 @@ vxfs_read_fshead(struct super_block *sbp)</div><div class='ctx'> </div><div class='ctx'> 	infp-&gt;vsi_stilist = vxfs_get_fake_inode(sbp, tip);</div><div class='ctx'> 	if (!infp-&gt;vsi_stilist) {</div><div class='del'>-		printk(KERN_ERR "vxfs: unabled to get structual list inode\n");</div><div class='add'>+		printk(KERN_ERR "vxfs: unable to get structural list inode\n");</div><div class='ctx'> 		kfree(tip);</div><div class='ctx'> 		goto out_free_pfp;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -174,7 +174,7 @@ vxfs_read_fshead(struct super_block *sbp)</div><div class='ctx'> 		goto out_iput_stilist;</div><div class='ctx'> 	infp-&gt;vsi_ilist = vxfs_get_fake_inode(sbp, tip);</div><div class='ctx'> 	if (!infp-&gt;vsi_ilist) {</div><div class='del'>-		printk(KERN_ERR "vxfs: unabled to get inode list inode\n");</div><div class='add'>+		printk(KERN_ERR "vxfs: unable to get inode list inode\n");</div><div class='ctx'> 		kfree(tip);</div><div class='ctx'> 		goto out_iput_stilist;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c<br/>index 6f5df1700e95..4e25f3fbed86 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_immed.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_immed.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_immed.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/freevxfs/vxfs_immed.c</a></div><div class='hunk'>@@ -56,7 +56,7 @@ struct inode_operations vxfs_immed_symlink_iops = {</div><div class='ctx'> /*</div><div class='ctx'>  * Adress space operations for immed files and directories.</div><div class='ctx'>  */</div><div class='del'>-struct address_space_operations vxfs_immed_aops = {</div><div class='add'>+const struct address_space_operations vxfs_immed_aops = {</div><div class='ctx'> 	.readpage =		vxfs_immed_readpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c<br/>index f544aae9169f..ca6a39714771 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/freevxfs/vxfs_inode.c</a></div><div class='hunk'>@@ -41,8 +41,8 @@</div><div class='ctx'> #include "vxfs_extern.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-extern struct address_space_operations vxfs_aops;</div><div class='del'>-extern struct address_space_operations vxfs_immed_aops;</div><div class='add'>+extern const struct address_space_operations vxfs_aops;</div><div class='add'>+extern const struct address_space_operations vxfs_immed_aops;</div><div class='ctx'> </div><div class='ctx'> extern struct inode_operations vxfs_immed_symlink_iops;</div><div class='ctx'> </div><div class='hunk'>@@ -295,7 +295,7 @@ vxfs_read_inode(struct inode *ip)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block		*sbp = ip-&gt;i_sb;</div><div class='ctx'> 	struct vxfs_inode_info		*vip;</div><div class='del'>-	struct address_space_operations	*aops;</div><div class='add'>+	const struct address_space_operations	*aops;</div><div class='ctx'> 	ino_t				ino = ip-&gt;i_ino;</div><div class='ctx'> </div><div class='ctx'> 	if (!(vip = __vxfs_iget(ino, VXFS_SBI(sbp)-&gt;vsi_ilist)))</div><div class='head'>diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c<br/>index 50aae77651b2..decac62efe57 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_subr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_subr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_subr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/freevxfs/vxfs_subr.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@</div><div class='ctx'> static int		vxfs_readpage(struct file *, struct page *);</div><div class='ctx'> static sector_t		vxfs_bmap(struct address_space *, sector_t);</div><div class='ctx'> </div><div class='del'>-struct address_space_operations vxfs_aops = {</div><div class='add'>+const struct address_space_operations vxfs_aops = {</div><div class='ctx'> 	.readpage =		vxfs_readpage,</div><div class='ctx'> 	.bmap =			vxfs_bmap,</div><div class='ctx'> 	.sync_page =		block_sync_page,</div><div class='hunk'>@@ -71,8 +71,7 @@ vxfs_get_page(struct address_space *mapping, u_long n)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *			pp;</div><div class='ctx'> </div><div class='del'>-	pp = read_cache_page(mapping, n,</div><div class='del'>-			(filler_t*)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	pp = read_mapping_page(mapping, n, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(pp)) {</div><div class='ctx'> 		wait_on_page_locked(pp);</div><div class='head'>diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c<br/>index b44c916d24a1..b74b791fc23b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/freevxfs/vxfs_super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/freevxfs/vxfs_super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/freevxfs/vxfs_super.c</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "vxfs.h"</div><div class='ctx'> #include "vxfs_extern.h"</div><div class='hunk'>@@ -55,7 +56,7 @@ MODULE_ALIAS("vxfs"); /* makes mount -t vxfs autoload the module */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void		vxfs_put_super(struct super_block *);</div><div class='del'>-static int		vxfs_statfs(struct super_block *, struct kstatfs *);</div><div class='add'>+static int		vxfs_statfs(struct dentry *, struct kstatfs *);</div><div class='ctx'> static int		vxfs_remount(struct super_block *, int *, char *);</div><div class='ctx'> </div><div class='ctx'> static struct super_operations vxfs_super_ops = {</div><div class='hunk'>@@ -90,12 +91,12 @@ vxfs_put_super(struct super_block *sbp)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * vxfs_statfs - get filesystem information</div><div class='del'>- * @sbp:	VFS superblock</div><div class='add'>+ * @dentry:	VFS dentry to locate superblock</div><div class='ctx'>  * @bufp:	output buffer</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='ctx'>  *   vxfs_statfs fills the statfs buffer @bufp with information</div><div class='del'>- *   about the filesystem described by @sbp.</div><div class='add'>+ *   about the filesystem described by @dentry.</div><div class='ctx'>  *</div><div class='ctx'>  * Returns:</div><div class='ctx'>  *   Zero.</div><div class='hunk'>@@ -107,12 +108,12 @@ vxfs_put_super(struct super_block *sbp)</div><div class='ctx'>  *   This is everything but complete...</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-vxfs_statfs(struct super_block *sbp, struct kstatfs *bufp)</div><div class='add'>+vxfs_statfs(struct dentry *dentry, struct kstatfs *bufp)</div><div class='ctx'> {</div><div class='del'>-	struct vxfs_sb_info		*infp = VXFS_SBI(sbp);</div><div class='add'>+	struct vxfs_sb_info		*infp = VXFS_SBI(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	bufp-&gt;f_type = VXFS_SUPER_MAGIC;</div><div class='del'>-	bufp-&gt;f_bsize = sbp-&gt;s_blocksize;</div><div class='add'>+	bufp-&gt;f_bsize = dentry-&gt;d_sb-&gt;s_blocksize;</div><div class='ctx'> 	bufp-&gt;f_blocks = infp-&gt;vsi_raw-&gt;vs_dsize;</div><div class='ctx'> 	bufp-&gt;f_bfree = infp-&gt;vsi_raw-&gt;vs_free;</div><div class='ctx'> 	bufp-&gt;f_bavail = 0;</div><div class='hunk'>@@ -241,10 +242,11 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * The usual module blurb.</div><div class='ctx'>  */</div><div class='del'>-static struct super_block *vxfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int vxfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, vxfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, vxfs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type vxfs_fs_type = {</div><div class='head'>diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c<br/>index f3fbe2d030f4..892643dc9af1 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fs-writeback.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fs-writeback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fs-writeback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fs-writeback.c</a></div><div class='hunk'>@@ -461,9 +461,11 @@ void sync_inodes_sb(struct super_block *sb, int wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct writeback_control wbc = {</div><div class='ctx'> 		.sync_mode	= wait ? WB_SYNC_ALL : WB_SYNC_HOLD,</div><div class='add'>+		.range_start	= 0,</div><div class='add'>+		.range_end	= LLONG_MAX,</div><div class='ctx'> 	};</div><div class='del'>-	unsigned long nr_dirty = read_page_state(nr_dirty);</div><div class='del'>-	unsigned long nr_unstable = read_page_state(nr_unstable);</div><div class='add'>+	unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY);</div><div class='add'>+	unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS);</div><div class='ctx'> </div><div class='ctx'> 	wbc.nr_to_write = nr_dirty + nr_unstable +</div><div class='ctx'> 			(inodes_stat.nr_inodes - inodes_stat.nr_unused) +</div><div class='hunk'>@@ -559,6 +561,8 @@ int write_inode_now(struct inode *inode, int sync)</div><div class='ctx'> 	struct writeback_control wbc = {</div><div class='ctx'> 		.nr_to_write = LONG_MAX,</div><div class='ctx'> 		.sync_mode = WB_SYNC_ALL,</div><div class='add'>+		.range_start = 0,</div><div class='add'>+		.range_end = LLONG_MAX,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (!mapping_cap_writeback_dirty(inode-&gt;i_mapping))</div><div class='hunk'>@@ -619,7 +623,6 @@ int generic_osync_inode(struct inode *inode, struct address_space *mapping, int</div><div class='ctx'> 	int need_write_inode_now = 0;</div><div class='ctx'> 	int err2;</div><div class='ctx'> </div><div class='del'>-	current-&gt;flags |= PF_SYNCWRITE;</div><div class='ctx'> 	if (what &amp; OSYNC_DATA)</div><div class='ctx'> 		err = filemap_fdatawrite(mapping);</div><div class='ctx'> 	if (what &amp; (OSYNC_METADATA|OSYNC_DATA)) {</div><div class='hunk'>@@ -632,7 +635,6 @@ int generic_osync_inode(struct inode *inode, struct address_space *mapping, int</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = err2;</div><div class='ctx'> 	}</div><div class='del'>-	current-&gt;flags &amp;= ~PF_SYNCWRITE;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode_lock);</div><div class='ctx'> 	if ((inode-&gt;i_state &amp; I_DIRTY) &amp;&amp;</div><div class='head'>diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile<br/>index c3e1f760cac9..72437065f6ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fuse/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/Makefile</a></div><div class='hunk'>@@ -4,4 +4,4 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FUSE_FS) += fuse.o</div><div class='ctx'> </div><div class='del'>-fuse-objs := dev.o dir.o file.o inode.o</div><div class='add'>+fuse-objs := dev.o dir.o file.o inode.o control.o</div><div class='head'>diff --git a/fs/fuse/control.c b/fs/fuse/control.c<br/>new file mode 100644<br/>index 000000000000..a3bce3a77253<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/control.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/control.c</a></div><div class='hunk'>@@ -0,0 +1,218 @@</div><div class='add'>+/*</div><div class='add'>+  FUSE: Filesystem in Userspace</div><div class='add'>+  Copyright (C) 2001-2006  Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='add'>+</div><div class='add'>+  This program can be distributed under the terms of the GNU GPL.</div><div class='add'>+  See the file COPYING.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include "fuse_i.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#define FUSE_CTL_SUPER_MAGIC 0x65735543</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is non-NULL when the single instance of the control filesystem</div><div class='add'>+ * exists.  Protected by fuse_mutex</div><div class='add'>+ */</div><div class='add'>+static struct super_block *fuse_control_sb;</div><div class='add'>+</div><div class='add'>+static struct fuse_conn *fuse_ctl_file_conn_get(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc;</div><div class='add'>+	mutex_lock(&amp;fuse_mutex);</div><div class='add'>+	fc = file-&gt;f_dentry-&gt;d_inode-&gt;u.generic_ip;</div><div class='add'>+	if (fc)</div><div class='add'>+		fc = fuse_conn_get(fc);</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+	return fc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t fuse_conn_abort_write(struct file *file, const char __user *buf,</div><div class='add'>+				     size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct fuse_conn *fc = fuse_ctl_file_conn_get(file);</div><div class='add'>+	if (fc) {</div><div class='add'>+		fuse_abort_conn(fc);</div><div class='add'>+		fuse_conn_put(fc);</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t fuse_conn_waiting_read(struct file *file, char __user *buf,</div><div class='add'>+				      size_t len, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	char tmp[32];</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (!*ppos) {</div><div class='add'>+		struct fuse_conn *fc = fuse_ctl_file_conn_get(file);</div><div class='add'>+		if (!fc)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		file-&gt;private_data=(void *)(long)atomic_read(&amp;fc-&gt;num_waiting);</div><div class='add'>+		fuse_conn_put(fc);</div><div class='add'>+	}</div><div class='add'>+	size = sprintf(tmp, "%ld\n", (long)file-&gt;private_data);</div><div class='add'>+	return simple_read_from_buffer(buf, len, ppos, tmp, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fuse_ctl_abort_ops = {</div><div class='add'>+	.open = nonseekable_open,</div><div class='add'>+	.write = fuse_conn_abort_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations fuse_ctl_waiting_ops = {</div><div class='add'>+	.open = nonseekable_open,</div><div class='add'>+	.read = fuse_conn_waiting_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,</div><div class='add'>+					  struct fuse_conn *fc,</div><div class='add'>+					  const char *name,</div><div class='add'>+					  int mode, int nlink,</div><div class='add'>+					  struct inode_operations *iop,</div><div class='add'>+					  const struct file_operations *fop)</div><div class='add'>+{</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct inode *inode;</div><div class='add'>+</div><div class='add'>+	BUG_ON(fc-&gt;ctl_ndents &gt;= FUSE_CTL_NUM_DENTRIES);</div><div class='add'>+	dentry = d_alloc_name(parent, name);</div><div class='add'>+	if (!dentry)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	fc-&gt;ctl_dentry[fc-&gt;ctl_ndents++] = dentry;</div><div class='add'>+	inode = new_inode(fuse_control_sb);</div><div class='add'>+	if (!inode)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	inode-&gt;i_mode = mode;</div><div class='add'>+	inode-&gt;i_uid = fc-&gt;user_id;</div><div class='add'>+	inode-&gt;i_gid = fc-&gt;group_id;</div><div class='add'>+	inode-&gt;i_atime = inode-&gt;i_mtime = inode-&gt;i_ctime = CURRENT_TIME;</div><div class='add'>+	/* setting -&gt;i_op to NULL is not allowed */</div><div class='add'>+	if (iop)</div><div class='add'>+		inode-&gt;i_op = iop;</div><div class='add'>+	inode-&gt;i_fop = fop;</div><div class='add'>+	inode-&gt;i_nlink = nlink;</div><div class='add'>+	inode-&gt;u.generic_ip = fc;</div><div class='add'>+	d_add(dentry, inode);</div><div class='add'>+	return dentry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add a connection to the control filesystem (if it exists).  Caller</div><div class='add'>+ * must host fuse_mutex</div><div class='add'>+ */</div><div class='add'>+int fuse_ctl_add_conn(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	struct dentry *parent;</div><div class='add'>+	char name[32];</div><div class='add'>+</div><div class='add'>+	if (!fuse_control_sb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parent = fuse_control_sb-&gt;s_root;</div><div class='add'>+	parent-&gt;d_inode-&gt;i_nlink++;</div><div class='add'>+	sprintf(name, "%llu", (unsigned long long) fc-&gt;id);</div><div class='add'>+	parent = fuse_ctl_add_dentry(parent, fc, name, S_IFDIR | 0500, 2,</div><div class='add'>+				     &amp;simple_dir_inode_operations,</div><div class='add'>+				     &amp;simple_dir_operations);</div><div class='add'>+	if (!parent)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (!fuse_ctl_add_dentry(parent, fc, "waiting", S_IFREG | 0400, 1,</div><div class='add'>+				NULL, &amp;fuse_ctl_waiting_ops) ||</div><div class='add'>+	    !fuse_ctl_add_dentry(parent, fc, "abort", S_IFREG | 0200, 1,</div><div class='add'>+				 NULL, &amp;fuse_ctl_abort_ops))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err:</div><div class='add'>+	fuse_ctl_remove_conn(fc);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Remove a connection from the control filesystem (if it exists).</div><div class='add'>+ * Caller must host fuse_mutex</div><div class='add'>+ */</div><div class='add'>+void fuse_ctl_remove_conn(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!fuse_control_sb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = fc-&gt;ctl_ndents - 1; i &gt;= 0; i--) {</div><div class='add'>+		struct dentry *dentry = fc-&gt;ctl_dentry[i];</div><div class='add'>+		dentry-&gt;d_inode-&gt;u.generic_ip = NULL;</div><div class='add'>+		d_drop(dentry);</div><div class='add'>+		dput(dentry);</div><div class='add'>+	}</div><div class='add'>+	fuse_control_sb-&gt;s_root-&gt;d_inode-&gt;i_nlink--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)</div><div class='add'>+{</div><div class='add'>+	struct tree_descr empty_descr = {""};</div><div class='add'>+	struct fuse_conn *fc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = simple_fill_super(sb, FUSE_CTL_SUPER_MAGIC, &amp;empty_descr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fuse_mutex);</div><div class='add'>+	BUG_ON(fuse_control_sb);</div><div class='add'>+	fuse_control_sb = sb;</div><div class='add'>+	list_for_each_entry(fc, &amp;fuse_conn_list, entry) {</div><div class='add'>+		err = fuse_ctl_add_conn(fc);</div><div class='add'>+		if (err) {</div><div class='add'>+			fuse_control_sb = NULL;</div><div class='add'>+			mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_ctl_get_sb(struct file_system_type *fs_type, int flags,</div><div class='add'>+			const char *dev_name, void *raw_data,</div><div class='add'>+			struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	return get_sb_single(fs_type, flags, raw_data,</div><div class='add'>+				fuse_ctl_fill_super, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_ctl_kill_sb(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;fuse_mutex);</div><div class='add'>+	fuse_control_sb = NULL;</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+</div><div class='add'>+	kill_litter_super(sb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type fuse_ctl_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "fusectl",</div><div class='add'>+	.get_sb		= fuse_ctl_get_sb,</div><div class='add'>+	.kill_sb	= fuse_ctl_kill_sb,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int __init fuse_ctl_init(void)</div><div class='add'>+{</div><div class='add'>+	return register_filesystem(&amp;fuse_ctl_fs_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_ctl_cleanup(void)</div><div class='add'>+{</div><div class='add'>+	unregister_filesystem(&amp;fuse_ctl_fs_type);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c<br/>index 104a62dadb94..1e2006caf158 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fuse/dev.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/dev.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/dev.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/dev.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@ static void fuse_request_init(struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	memset(req, 0, sizeof(*req));</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;req-&gt;list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;req-&gt;intr_entry);</div><div class='ctx'> 	init_waitqueue_head(&amp;req-&gt;waitq);</div><div class='ctx'> 	atomic_set(&amp;req-&gt;count, 1);</div><div class='ctx'> }</div><div class='hunk'>@@ -64,18 +65,6 @@ static void restore_sigs(sigset_t *oldset)</div><div class='ctx'> 	sigprocmask(SIG_SETMASK, oldset, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Reset request, so that it can be reused</div><div class='del'>- *</div><div class='del'>- * The caller must be _very_ careful to make sure, that it is holding</div><div class='del'>- * the only reference to req</div><div class='del'>- */</div><div class='del'>-void fuse_reset_request(struct fuse_req *req)</div><div class='del'>-{</div><div class='del'>-	BUG_ON(atomic_read(&amp;req-&gt;count) != 1);</div><div class='del'>-	fuse_request_init(req);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void __fuse_get_request(struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;req-&gt;count);</div><div class='hunk'>@@ -88,6 +77,13 @@ static void __fuse_put_request(struct fuse_req *req)</div><div class='ctx'> 	atomic_dec(&amp;req-&gt;count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void fuse_req_init_context(struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	req-&gt;in.h.uid = current-&gt;fsuid;</div><div class='add'>+	req-&gt;in.h.gid = current-&gt;fsgid;</div><div class='add'>+	req-&gt;in.h.pid = current-&gt;pid;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct fuse_req *fuse_get_req(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_req *req;</div><div class='hunk'>@@ -103,14 +99,16 @@ struct fuse_req *fuse_get_req(struct fuse_conn *fc)</div><div class='ctx'> 	if (intr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	err = -ENOTCONN;</div><div class='add'>+	if (!fc-&gt;connected)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	req = fuse_request_alloc();</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	req-&gt;in.h.uid = current-&gt;fsuid;</div><div class='del'>-	req-&gt;in.h.gid = current-&gt;fsgid;</div><div class='del'>-	req-&gt;in.h.pid = current-&gt;pid;</div><div class='add'>+	fuse_req_init_context(req);</div><div class='ctx'> 	req-&gt;waiting = 1;</div><div class='ctx'> 	return req;</div><div class='ctx'> </div><div class='hunk'>@@ -119,142 +117,183 @@ struct fuse_req *fuse_get_req(struct fuse_conn *fc)</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+/*</div><div class='add'>+ * Return request in fuse_file-&gt;reserved_req.  However that may</div><div class='add'>+ * currently be in use.  If that is the case, wait for it to become</div><div class='add'>+ * available.</div><div class='add'>+ */</div><div class='add'>+static struct fuse_req *get_reserved_req(struct fuse_conn *fc,</div><div class='add'>+					 struct file *file)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_dec_and_test(&amp;req-&gt;count)) {</div><div class='del'>-		if (req-&gt;waiting)</div><div class='del'>-			atomic_dec(&amp;fc-&gt;num_waiting);</div><div class='del'>-		fuse_request_free(req);</div><div class='del'>-	}</div><div class='add'>+	struct fuse_req *req = NULL;</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		wait_event(fc-&gt;blocked_waitq, ff-&gt;reserved_req);</div><div class='add'>+		spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+		if (ff-&gt;reserved_req) {</div><div class='add'>+			req = ff-&gt;reserved_req;</div><div class='add'>+			ff-&gt;reserved_req = NULL;</div><div class='add'>+			get_file(file);</div><div class='add'>+			req-&gt;stolen_file = file;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+	} while (!req);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Called with sbput_sem held for read (request_end) or write</div><div class='del'>- * (fuse_put_super).  By the time fuse_put_super() is finished, all</div><div class='del'>- * inodes belonging to background requests must be released, so the</div><div class='del'>- * iputs have to be done within the locked region.</div><div class='add'>+ * Put stolen request back into fuse_file-&gt;reserved_req</div><div class='ctx'>  */</div><div class='del'>-void fuse_release_background(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+static void put_reserved_req(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> {</div><div class='del'>-	iput(req-&gt;inode);</div><div class='del'>-	iput(req-&gt;inode2);</div><div class='add'>+	struct file *file = req-&gt;stolen_file;</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='del'>-	list_del(&amp;req-&gt;bg_entry);</div><div class='del'>-	if (fc-&gt;num_background == FUSE_MAX_BACKGROUND) {</div><div class='del'>-		fc-&gt;blocked = 0;</div><div class='del'>-		wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='del'>-	}</div><div class='del'>-	fc-&gt;num_background--;</div><div class='add'>+	fuse_request_init(req);</div><div class='add'>+	BUG_ON(ff-&gt;reserved_req);</div><div class='add'>+	ff-&gt;reserved_req = req;</div><div class='add'>+	wake_up(&amp;fc-&gt;blocked_waitq);</div><div class='ctx'> 	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+	fput(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This function is called when a request is finished.  Either a reply</div><div class='del'>- * has arrived or it was interrupted (and not yet sent) or some error</div><div class='del'>- * occurred during communication with userspace, or the device file</div><div class='del'>- * was closed.  In case of a background request the reference to the</div><div class='del'>- * stored objects are released.  The requester thread is woken up (if</div><div class='del'>- * still waiting), the 'end' callback is called if given, else the</div><div class='del'>- * reference to the request is released</div><div class='add'>+ * Gets a requests for a file operation, always succeeds</div><div class='ctx'>  *</div><div class='del'>- * Releasing extra reference for foreground requests must be done</div><div class='del'>- * within the same locked region as setting state to finished.  This</div><div class='del'>- * is because fuse_reset_request() may be called after request is</div><div class='del'>- * finished and it must be the sole possessor.  If request is</div><div class='del'>- * interrupted and put in the background, it will return with an error</div><div class='del'>- * and hence never be reset and reused.</div><div class='add'>+ * This is used for sending the FLUSH request, which must get to</div><div class='add'>+ * userspace, due to POSIX locks which may need to be unlocked.</div><div class='ctx'>  *</div><div class='del'>- * Called with fc-&gt;lock, unlocks it</div><div class='add'>+ * If allocation fails due to OOM, use the reserved request in</div><div class='add'>+ * fuse_file.</div><div class='add'>+ *</div><div class='add'>+ * This is very unlikely to deadlock accidentally, since the</div><div class='add'>+ * filesystem should not have it's own file open.  If deadlock is</div><div class='add'>+ * intentional, it can still be broken by "aborting" the filesystem.</div><div class='ctx'>  */</div><div class='del'>-static void request_end(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+struct fuse_req *fuse_get_req_nofail(struct fuse_conn *fc, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	list_del(&amp;req-&gt;list);</div><div class='del'>-	req-&gt;state = FUSE_REQ_FINISHED;</div><div class='del'>-	if (!req-&gt;background) {</div><div class='del'>-		spin_unlock(&amp;fc-&gt;lock);</div><div class='del'>-		wake_up(&amp;req-&gt;waitq);</div><div class='del'>-		fuse_put_request(fc, req);</div><div class='del'>-	} else {</div><div class='del'>-		void (*end) (struct fuse_conn *, struct fuse_req *) = req-&gt;end;</div><div class='del'>-		req-&gt;end = NULL;</div><div class='del'>-		spin_unlock(&amp;fc-&gt;lock);</div><div class='del'>-		down_read(&amp;fc-&gt;sbput_sem);</div><div class='del'>-		if (fc-&gt;mounted)</div><div class='del'>-			fuse_release_background(fc, req);</div><div class='del'>-		up_read(&amp;fc-&gt;sbput_sem);</div><div class='add'>+	struct fuse_req *req;</div><div class='ctx'> </div><div class='del'>-		/* fput must go outside sbput_sem, otherwise it can deadlock */</div><div class='del'>-		if (req-&gt;file)</div><div class='del'>-			fput(req-&gt;file);</div><div class='add'>+	atomic_inc(&amp;fc-&gt;num_waiting);</div><div class='add'>+	wait_event(fc-&gt;blocked_waitq, !fc-&gt;blocked);</div><div class='add'>+	req = fuse_request_alloc();</div><div class='add'>+	if (!req)</div><div class='add'>+		req = get_reserved_req(fc, file);</div><div class='ctx'> </div><div class='del'>-		if (end)</div><div class='del'>-			end(fc, req);</div><div class='add'>+	fuse_req_init_context(req);</div><div class='add'>+	req-&gt;waiting = 1;</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;req-&gt;count)) {</div><div class='add'>+		if (req-&gt;waiting)</div><div class='add'>+			atomic_dec(&amp;fc-&gt;num_waiting);</div><div class='add'>+</div><div class='add'>+		if (req-&gt;stolen_file)</div><div class='add'>+			put_reserved_req(fc, req);</div><div class='ctx'> 		else</div><div class='del'>-			fuse_put_request(fc, req);</div><div class='add'>+			fuse_request_free(req);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Unfortunately request interruption not just solves the deadlock</div><div class='del'>- * problem, it causes problems too.  These stem from the fact, that an</div><div class='del'>- * interrupted request is continued to be processed in userspace,</div><div class='del'>- * while all the locks and object references (inode and file) held</div><div class='del'>- * during the operation are released.</div><div class='del'>- *</div><div class='del'>- * To release the locks is exactly why there's a need to interrupt the</div><div class='del'>- * request, so there's not a lot that can be done about this, except</div><div class='del'>- * introduce additional locking in userspace.</div><div class='del'>- *</div><div class='del'>- * More important is to keep inode and file references until userspace</div><div class='del'>- * has replied, otherwise FORGET and RELEASE could be sent while the</div><div class='del'>- * inode/file is still used by the filesystem.</div><div class='del'>- *</div><div class='del'>- * For this reason the concept of "background" request is introduced.</div><div class='del'>- * An interrupted request is backgrounded if it has been already sent</div><div class='del'>- * to userspace.  Backgrounding involves getting an extra reference to</div><div class='del'>- * inode(s) or file used in the request, and adding the request to</div><div class='del'>- * fc-&gt;background list.  When a reply is received for a background</div><div class='del'>- * request, the object references are released, and the request is</div><div class='del'>- * removed from the list.  If the filesystem is unmounted while there</div><div class='del'>- * are still background requests, the list is walked and references</div><div class='del'>- * are released as if a reply was received.</div><div class='add'>+ * This function is called when a request is finished.  Either a reply</div><div class='add'>+ * has arrived or it was aborted (and not yet sent) or some error</div><div class='add'>+ * occurred during communication with userspace, or the device file</div><div class='add'>+ * was closed.  The requester thread is woken up (if still waiting),</div><div class='add'>+ * the 'end' callback is called if given, else the reference to the</div><div class='add'>+ * request is released</div><div class='ctx'>  *</div><div class='del'>- * There's one more use for a background request.  The RELEASE message is</div><div class='del'>- * always sent as background, since it doesn't return an error or</div><div class='del'>- * data.</div><div class='add'>+ * Called with fc-&gt;lock, unlocks it</div><div class='ctx'>  */</div><div class='del'>-static void background_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='del'>-{</div><div class='del'>-	req-&gt;background = 1;</div><div class='del'>-	list_add(&amp;req-&gt;bg_entry, &amp;fc-&gt;background);</div><div class='del'>-	fc-&gt;num_background++;</div><div class='del'>-	if (fc-&gt;num_background == FUSE_MAX_BACKGROUND)</div><div class='del'>-		fc-&gt;blocked = 1;</div><div class='del'>-	if (req-&gt;inode)</div><div class='del'>-		req-&gt;inode = igrab(req-&gt;inode);</div><div class='del'>-	if (req-&gt;inode2)</div><div class='del'>-		req-&gt;inode2 = igrab(req-&gt;inode2);</div><div class='add'>+static void request_end(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	void (*end) (struct fuse_conn *, struct fuse_req *) = req-&gt;end;</div><div class='add'>+	req-&gt;end = NULL;</div><div class='add'>+	list_del(&amp;req-&gt;list);</div><div class='add'>+	list_del(&amp;req-&gt;intr_entry);</div><div class='add'>+	req-&gt;state = FUSE_REQ_FINISHED;</div><div class='add'>+	if (req-&gt;background) {</div><div class='add'>+		if (fc-&gt;num_background == FUSE_MAX_BACKGROUND) {</div><div class='add'>+			fc-&gt;blocked = 0;</div><div class='add'>+			wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='add'>+		}</div><div class='add'>+		fc-&gt;num_background--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+	dput(req-&gt;dentry);</div><div class='add'>+	mntput(req-&gt;vfsmount);</div><div class='ctx'> 	if (req-&gt;file)</div><div class='del'>-		get_file(req-&gt;file);</div><div class='add'>+		fput(req-&gt;file);</div><div class='add'>+	wake_up(&amp;req-&gt;waitq);</div><div class='add'>+	if (end)</div><div class='add'>+		end(fc, req);</div><div class='add'>+	else</div><div class='add'>+		fuse_put_request(fc, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Called with fc-&gt;lock held.  Releases, and then reacquires it. */</div><div class='del'>-static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+static void wait_answer_interruptible(struct fuse_conn *fc,</div><div class='add'>+				      struct fuse_req *req)</div><div class='ctx'> {</div><div class='del'>-	sigset_t oldset;</div><div class='add'>+	if (signal_pending(current))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;fc-&gt;lock);</div><div class='del'>-	block_sigs(&amp;oldset);</div><div class='ctx'> 	wait_event_interruptible(req-&gt;waitq, req-&gt;state == FUSE_REQ_FINISHED);</div><div class='del'>-	restore_sigs(&amp;oldset);</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='del'>-	if (req-&gt;state == FUSE_REQ_FINISHED &amp;&amp; !req-&gt;interrupted)</div><div class='del'>-		return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void queue_interrupt(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	list_add_tail(&amp;req-&gt;intr_entry, &amp;fc-&gt;interrupts);</div><div class='add'>+	wake_up(&amp;fc-&gt;waitq);</div><div class='add'>+	kill_fasync(&amp;fc-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called with fc-&gt;lock held.  Releases, and then reacquires it. */</div><div class='add'>+static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+{</div><div class='add'>+	if (!fc-&gt;no_interrupt) {</div><div class='add'>+		/* Any signal may interrupt this */</div><div class='add'>+		wait_answer_interruptible(fc, req);</div><div class='add'>+</div><div class='add'>+		if (req-&gt;aborted)</div><div class='add'>+			goto aborted;</div><div class='add'>+		if (req-&gt;state == FUSE_REQ_FINISHED)</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	if (!req-&gt;interrupted) {</div><div class='del'>-		req-&gt;out.h.error = -EINTR;</div><div class='ctx'> 		req-&gt;interrupted = 1;</div><div class='add'>+		if (req-&gt;state == FUSE_REQ_SENT)</div><div class='add'>+			queue_interrupt(fc, req);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;force) {</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		wait_event(req-&gt;waitq, req-&gt;state == FUSE_REQ_FINISHED);</div><div class='add'>+		spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		sigset_t oldset;</div><div class='add'>+</div><div class='add'>+		/* Only fatal signals may interrupt this */</div><div class='add'>+		block_sigs(&amp;oldset);</div><div class='add'>+		wait_answer_interruptible(fc, req);</div><div class='add'>+		restore_sigs(&amp;oldset);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (req-&gt;aborted)</div><div class='add'>+		goto aborted;</div><div class='add'>+	if (req-&gt;state == FUSE_REQ_FINISHED)</div><div class='add'>+ 		return;</div><div class='add'>+</div><div class='add'>+	req-&gt;out.h.error = -EINTR;</div><div class='add'>+	req-&gt;aborted = 1;</div><div class='add'>+</div><div class='add'>+ aborted:</div><div class='ctx'> 	if (req-&gt;locked) {</div><div class='ctx'> 		/* This is uninterruptible sleep, because data is</div><div class='ctx'> 		   being copied to/from the buffers of req.  During</div><div class='hunk'>@@ -268,8 +307,11 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> 	if (req-&gt;state == FUSE_REQ_PENDING) {</div><div class='ctx'> 		list_del(&amp;req-&gt;list);</div><div class='ctx'> 		__fuse_put_request(req);</div><div class='del'>-	} else if (req-&gt;state == FUSE_REQ_SENT)</div><div class='del'>-		background_request(fc, req);</div><div class='add'>+	} else if (req-&gt;state == FUSE_REQ_SENT) {</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		wait_event(req-&gt;waitq, req-&gt;state == FUSE_REQ_FINISHED);</div><div class='add'>+		spin_lock(&amp;fc-&gt;lock);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned len_args(unsigned numargs, struct fuse_arg *args)</div><div class='hunk'>@@ -283,13 +325,19 @@ static unsigned len_args(unsigned numargs, struct fuse_arg *args)</div><div class='ctx'> 	return nbytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 fuse_get_unique(struct fuse_conn *fc)</div><div class='add'>+ {</div><div class='add'>+ 	fc-&gt;reqctr++;</div><div class='add'>+ 	/* zero is special */</div><div class='add'>+ 	if (fc-&gt;reqctr == 0)</div><div class='add'>+ 		fc-&gt;reqctr = 1;</div><div class='add'>+</div><div class='add'>+	return fc-&gt;reqctr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void queue_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> {</div><div class='del'>-	fc-&gt;reqctr++;</div><div class='del'>-	/* zero is special */</div><div class='del'>-	if (fc-&gt;reqctr == 0)</div><div class='del'>-		fc-&gt;reqctr = 1;</div><div class='del'>-	req-&gt;in.h.unique = fc-&gt;reqctr;</div><div class='add'>+	req-&gt;in.h.unique = fuse_get_unique(fc);</div><div class='ctx'> 	req-&gt;in.h.len = sizeof(struct fuse_in_header) +</div><div class='ctx'> 		len_args(req-&gt;in.numargs, (struct fuse_arg *) req-&gt;in.args);</div><div class='ctx'> 	list_add_tail(&amp;req-&gt;list, &amp;fc-&gt;pending);</div><div class='hunk'>@@ -302,9 +350,6 @@ static void queue_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> 	kill_fasync(&amp;fc-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This can only be interrupted by a SIGKILL</div><div class='del'>- */</div><div class='ctx'> void request_send(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	req-&gt;isreply = 1;</div><div class='hunk'>@@ -327,8 +372,12 @@ void request_send(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> static void request_send_nowait(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='del'>-	background_request(fc, req);</div><div class='ctx'> 	if (fc-&gt;connected) {</div><div class='add'>+		req-&gt;background = 1;</div><div class='add'>+		fc-&gt;num_background++;</div><div class='add'>+		if (fc-&gt;num_background == FUSE_MAX_BACKGROUND)</div><div class='add'>+			fc-&gt;blocked = 1;</div><div class='add'>+</div><div class='ctx'> 		queue_request(fc, req);</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -352,14 +401,14 @@ void request_send_background(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> /*</div><div class='ctx'>  * Lock the request.  Up to the next unlock_request() there mustn't be</div><div class='ctx'>  * anything that could cause a page-fault.  If the request was already</div><div class='del'>- * interrupted bail out.</div><div class='add'>+ * aborted bail out.</div><div class='ctx'>  */</div><div class='ctx'> static int lock_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		spin_lock(&amp;fc-&gt;lock);</div><div class='del'>-		if (req-&gt;interrupted)</div><div class='add'>+		if (req-&gt;aborted)</div><div class='ctx'> 			err = -ENOENT;</div><div class='ctx'> 		else</div><div class='ctx'> 			req-&gt;locked = 1;</div><div class='hunk'>@@ -369,7 +418,7 @@ static int lock_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Unlock request.  If it was interrupted during being locked, the</div><div class='add'>+ * Unlock request.  If it was aborted during being locked, the</div><div class='ctx'>  * requester thread is currently waiting for it to be unlocked, so</div><div class='ctx'>  * wake it up.</div><div class='ctx'>  */</div><div class='hunk'>@@ -378,7 +427,7 @@ static void unlock_request(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> 	if (req) {</div><div class='ctx'> 		spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 		req-&gt;locked = 0;</div><div class='del'>-		if (req-&gt;interrupted)</div><div class='add'>+		if (req-&gt;aborted)</div><div class='ctx'> 			wake_up(&amp;req-&gt;waitq);</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -557,13 +606,18 @@ static int fuse_copy_args(struct fuse_copy_state *cs, unsigned numargs,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int request_pending(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	return !list_empty(&amp;fc-&gt;pending) || !list_empty(&amp;fc-&gt;interrupts);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Wait until a request is available on the pending list */</div><div class='ctx'> static void request_wait(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='ctx'> 	DECLARE_WAITQUEUE(wait, current);</div><div class='ctx'> </div><div class='ctx'> 	add_wait_queue_exclusive(&amp;fc-&gt;waitq, &amp;wait);</div><div class='del'>-	while (fc-&gt;connected &amp;&amp; list_empty(&amp;fc-&gt;pending)) {</div><div class='add'>+	while (fc-&gt;connected &amp;&amp; !request_pending(fc)) {</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		if (signal_pending(current))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -577,11 +631,50 @@ static void request_wait(struct fuse_conn *fc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Transfer an interrupt request to userspace</div><div class='add'>+ *</div><div class='add'>+ * Unlike other requests this is assembled on demand, without a need</div><div class='add'>+ * to allocate a separate fuse_req structure.</div><div class='add'>+ *</div><div class='add'>+ * Called with fc-&gt;lock held, releases it</div><div class='add'>+ */</div><div class='add'>+static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req,</div><div class='add'>+			       const struct iovec *iov, unsigned long nr_segs)</div><div class='add'>+{</div><div class='add'>+	struct fuse_copy_state cs;</div><div class='add'>+	struct fuse_in_header ih;</div><div class='add'>+	struct fuse_interrupt_in arg;</div><div class='add'>+	unsigned reqsize = sizeof(ih) + sizeof(arg);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_del_init(&amp;req-&gt;intr_entry);</div><div class='add'>+	req-&gt;intr_unique = fuse_get_unique(fc);</div><div class='add'>+	memset(&amp;ih, 0, sizeof(ih));</div><div class='add'>+	memset(&amp;arg, 0, sizeof(arg));</div><div class='add'>+	ih.len = reqsize;</div><div class='add'>+	ih.opcode = FUSE_INTERRUPT;</div><div class='add'>+	ih.unique = req-&gt;intr_unique;</div><div class='add'>+	arg.unique = req-&gt;in.h.unique;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+	if (iov_length(iov, nr_segs) &lt; reqsize)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fuse_copy_init(&amp;cs, fc, 1, NULL, iov, nr_segs);</div><div class='add'>+	err = fuse_copy_one(&amp;cs, &amp;ih, sizeof(ih));</div><div class='add'>+	if (!err)</div><div class='add'>+		err = fuse_copy_one(&amp;cs, &amp;arg, sizeof(arg));</div><div class='add'>+	fuse_copy_finish(&amp;cs);</div><div class='add'>+</div><div class='add'>+	return err ? err : reqsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Read a single request into the userspace filesystem's buffer.  This</div><div class='ctx'>  * function waits until a request is available, then removes it from</div><div class='ctx'>  * the pending list and copies request data to userspace buffer.  If</div><div class='del'>- * no reply is needed (FORGET) or request has been interrupted or</div><div class='del'>- * there was an error during the copying then it's finished by calling</div><div class='add'>+ * no reply is needed (FORGET) or request has been aborted or there</div><div class='add'>+ * was an error during the copying then it's finished by calling</div><div class='ctx'>  * request_end().  Otherwise add it to the processing list, and set</div><div class='ctx'>  * the 'sent' flag.</div><div class='ctx'>  */</div><div class='hunk'>@@ -601,7 +694,7 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 	err = -EAGAIN;</div><div class='ctx'> 	if ((file-&gt;f_flags &amp; O_NONBLOCK) &amp;&amp; fc-&gt;connected &amp;&amp;</div><div class='del'>-	    list_empty(&amp;fc-&gt;pending))</div><div class='add'>+	    !request_pending(fc))</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='ctx'> 	request_wait(fc);</div><div class='hunk'>@@ -609,9 +702,15 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,</div><div class='ctx'> 	if (!fc-&gt;connected)</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> 	err = -ERESTARTSYS;</div><div class='del'>-	if (list_empty(&amp;fc-&gt;pending))</div><div class='add'>+	if (!request_pending(fc))</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='add'>+	if (!list_empty(&amp;fc-&gt;interrupts)) {</div><div class='add'>+		req = list_entry(fc-&gt;interrupts.next, struct fuse_req,</div><div class='add'>+				 intr_entry);</div><div class='add'>+		return fuse_read_interrupt(fc, req, iov, nr_segs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	req = list_entry(fc-&gt;pending.next, struct fuse_req, list);</div><div class='ctx'> 	req-&gt;state = FUSE_REQ_READING;</div><div class='ctx'> 	list_move(&amp;req-&gt;list, &amp;fc-&gt;io);</div><div class='hunk'>@@ -636,10 +735,10 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,</div><div class='ctx'> 	fuse_copy_finish(&amp;cs);</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 	req-&gt;locked = 0;</div><div class='del'>-	if (!err &amp;&amp; req-&gt;interrupted)</div><div class='add'>+	if (!err &amp;&amp; req-&gt;aborted)</div><div class='ctx'> 		err = -ENOENT;</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (!req-&gt;interrupted)</div><div class='add'>+		if (!req-&gt;aborted)</div><div class='ctx'> 			req-&gt;out.h.error = -EIO;</div><div class='ctx'> 		request_end(fc, req);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -649,6 +748,8 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,</div><div class='ctx'> 	else {</div><div class='ctx'> 		req-&gt;state = FUSE_REQ_SENT;</div><div class='ctx'> 		list_move_tail(&amp;req-&gt;list, &amp;fc-&gt;processing);</div><div class='add'>+		if (req-&gt;interrupted)</div><div class='add'>+			queue_interrupt(fc, req);</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return reqsize;</div><div class='hunk'>@@ -675,7 +776,7 @@ static struct fuse_req *request_find(struct fuse_conn *fc, u64 unique)</div><div class='ctx'> 	list_for_each(entry, &amp;fc-&gt;processing) {</div><div class='ctx'> 		struct fuse_req *req;</div><div class='ctx'> 		req = list_entry(entry, struct fuse_req, list);</div><div class='del'>-		if (req-&gt;in.h.unique == unique)</div><div class='add'>+		if (req-&gt;in.h.unique == unique || req-&gt;intr_unique == unique)</div><div class='ctx'> 			return req;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -741,17 +842,33 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='ctx'> 	req = request_find(fc, oh.unique);</div><div class='del'>-	err = -EINVAL;</div><div class='ctx'> 	if (!req)</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;interrupted) {</div><div class='add'>+	if (req-&gt;aborted) {</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> 		fuse_copy_finish(&amp;cs);</div><div class='ctx'> 		spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 		request_end(fc, req);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='add'>+	/* Is it an interrupt reply? */</div><div class='add'>+	if (req-&gt;intr_unique == oh.unique) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		if (nbytes != sizeof(struct fuse_out_header))</div><div class='add'>+			goto err_unlock;</div><div class='add'>+</div><div class='add'>+		if (oh.error == -ENOSYS)</div><div class='add'>+			fc-&gt;no_interrupt = 1;</div><div class='add'>+		else if (oh.error == -EAGAIN)</div><div class='add'>+			queue_interrupt(fc, req);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;fc-&gt;lock);</div><div class='add'>+		fuse_copy_finish(&amp;cs);</div><div class='add'>+		return nbytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;state = FUSE_REQ_WRITING;</div><div class='ctx'> 	list_move(&amp;req-&gt;list, &amp;fc-&gt;io);</div><div class='ctx'> 	req-&gt;out.h = oh;</div><div class='ctx'> 	req-&gt;locked = 1;</div><div class='hunk'>@@ -764,9 +881,9 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 	req-&gt;locked = 0;</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		if (req-&gt;interrupted)</div><div class='add'>+		if (req-&gt;aborted)</div><div class='ctx'> 			err = -ENOENT;</div><div class='del'>-	} else if (!req-&gt;interrupted)</div><div class='add'>+	} else if (!req-&gt;aborted)</div><div class='ctx'> 		req-&gt;out.h.error = -EIO;</div><div class='ctx'> 	request_end(fc, req);</div><div class='ctx'> </div><div class='hunk'>@@ -800,7 +917,7 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 	if (!fc-&gt;connected)</div><div class='ctx'> 		mask = POLLERR;</div><div class='del'>-	else if (!list_empty(&amp;fc-&gt;pending))</div><div class='add'>+	else if (request_pending(fc))</div><div class='ctx'> 		mask |= POLLIN | POLLRDNORM;</div><div class='ctx'> 	spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -826,7 +943,7 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head)</div><div class='ctx'> /*</div><div class='ctx'>  * Abort requests under I/O</div><div class='ctx'>  *</div><div class='del'>- * The requests are set to interrupted and finished, and the request</div><div class='add'>+ * The requests are set to aborted and finished, and the request</div><div class='ctx'>  * waiter is woken up.  This will make request_wait_answer() wait</div><div class='ctx'>  * until the request is unlocked and then return.</div><div class='ctx'>  *</div><div class='hunk'>@@ -841,7 +958,7 @@ static void end_io_requests(struct fuse_conn *fc)</div><div class='ctx'> 			list_entry(fc-&gt;io.next, struct fuse_req, list);</div><div class='ctx'> 		void (*end) (struct fuse_conn *, struct fuse_req *) = req-&gt;end;</div><div class='ctx'> </div><div class='del'>-		req-&gt;interrupted = 1;</div><div class='add'>+		req-&gt;aborted = 1;</div><div class='ctx'> 		req-&gt;out.h.error = -ECONNABORTED;</div><div class='ctx'> 		req-&gt;state = FUSE_REQ_FINISHED;</div><div class='ctx'> 		list_del_init(&amp;req-&gt;list);</div><div class='hunk'>@@ -874,19 +991,20 @@ static void end_io_requests(struct fuse_conn *fc)</div><div class='ctx'>  * onto the pending list is prevented by req-&gt;connected being false.</div><div class='ctx'>  *</div><div class='ctx'>  * Progression of requests under I/O to the processing list is</div><div class='del'>- * prevented by the req-&gt;interrupted flag being true for these</div><div class='del'>- * requests.  For this reason requests on the io list must be aborted</div><div class='del'>- * first.</div><div class='add'>+ * prevented by the req-&gt;aborted flag being true for these requests.</div><div class='add'>+ * For this reason requests on the io list must be aborted first.</div><div class='ctx'>  */</div><div class='ctx'> void fuse_abort_conn(struct fuse_conn *fc)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='ctx'> 	if (fc-&gt;connected) {</div><div class='ctx'> 		fc-&gt;connected = 0;</div><div class='add'>+		fc-&gt;blocked = 0;</div><div class='ctx'> 		end_io_requests(fc);</div><div class='ctx'> 		end_requests(fc, &amp;fc-&gt;pending);</div><div class='ctx'> 		end_requests(fc, &amp;fc-&gt;processing);</div><div class='ctx'> 		wake_up_all(&amp;fc-&gt;waitq);</div><div class='add'>+		wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='ctx'> 		kill_fasync(&amp;fc-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;fc-&gt;lock);</div><div class='hunk'>@@ -902,7 +1020,7 @@ static int fuse_dev_release(struct inode *inode, struct file *file)</div><div class='ctx'> 		end_requests(fc, &amp;fc-&gt;processing);</div><div class='ctx'> 		spin_unlock(&amp;fc-&gt;lock);</div><div class='ctx'> 		fasync_helper(-1, file, 0, &amp;fc-&gt;fasync);</div><div class='del'>-		kobject_put(&amp;fc-&gt;kobj);</div><div class='add'>+		fuse_conn_put(fc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c<br/>index 8d7546e832e8..72a74cde6de8 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fuse/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/dir.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /*</div><div class='ctx'>   FUSE: Filesystem in Userspace</div><div class='del'>-  Copyright (C) 2001-2005  Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='add'>+  Copyright (C) 2001-2006  Miklos Szeredi &lt;miklos@szeredi.hu&gt;</div><div class='ctx'> </div><div class='ctx'>   This program can be distributed under the terms of the GNU GPL.</div><div class='ctx'>   See the file COPYING.</div><div class='hunk'>@@ -79,7 +79,6 @@ static void fuse_lookup_init(struct fuse_req *req, struct inode *dir,</div><div class='ctx'> {</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_LOOKUP;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(dir);</div><div class='del'>-	req-&gt;inode = dir;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = entry-&gt;d_name.len + 1;</div><div class='ctx'> 	req-&gt;in.args[0].value = entry-&gt;d_name.name;</div><div class='hunk'>@@ -225,6 +224,20 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Synchronous release for the case when something goes wrong in CREATE_OPEN</div><div class='add'>+ */</div><div class='add'>+static void fuse_sync_release(struct fuse_conn *fc, struct fuse_file *ff,</div><div class='add'>+			      u64 nodeid, int flags)</div><div class='add'>+{</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+	req = fuse_release_fill(ff, nodeid, flags, FUSE_RELEASE);</div><div class='add'>+	req-&gt;force = 1;</div><div class='add'>+	request_send(fc, req);</div><div class='add'>+	fuse_put_request(fc, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * Atomic create+open operation</div><div class='ctx'>  *</div><div class='ctx'>  * If the filesystem doesn't support this, then fall back to separate</div><div class='hunk'>@@ -237,6 +250,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,</div><div class='ctx'> 	struct inode *inode;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(dir);</div><div class='ctx'> 	struct fuse_req *req;</div><div class='add'>+	struct fuse_req *forget_req;</div><div class='ctx'> 	struct fuse_open_in inarg;</div><div class='ctx'> 	struct fuse_open_out outopen;</div><div class='ctx'> 	struct fuse_entry_out outentry;</div><div class='hunk'>@@ -247,9 +261,14 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,</div><div class='ctx'> 	if (fc-&gt;no_create)</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> </div><div class='add'>+	forget_req = fuse_get_req(fc);</div><div class='add'>+	if (IS_ERR(forget_req))</div><div class='add'>+		return PTR_ERR(forget_req);</div><div class='add'>+</div><div class='ctx'> 	req = fuse_get_req(fc);</div><div class='add'>+	err = PTR_ERR(req);</div><div class='ctx'> 	if (IS_ERR(req))</div><div class='del'>-		return PTR_ERR(req);</div><div class='add'>+		goto out_put_forget_req;</div><div class='ctx'> </div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> 	ff = fuse_file_alloc();</div><div class='hunk'>@@ -262,7 +281,6 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,</div><div class='ctx'> 	inarg.mode = mode;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_CREATE;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(dir);</div><div class='del'>-	req-&gt;inode = dir;</div><div class='ctx'> 	req-&gt;in.numargs = 2;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -285,25 +303,23 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,</div><div class='ctx'> 	if (!S_ISREG(outentry.attr.mode) || invalid_nodeid(outentry.nodeid))</div><div class='ctx'> 		goto out_free_ff;</div><div class='ctx'> </div><div class='add'>+	fuse_put_request(fc, req);</div><div class='ctx'> 	inode = fuse_iget(dir-&gt;i_sb, outentry.nodeid, outentry.generation,</div><div class='ctx'> 			  &amp;outentry.attr);</div><div class='del'>-	err = -ENOMEM;</div><div class='ctx'> 	if (!inode) {</div><div class='ctx'> 		flags &amp;= ~(O_CREAT | O_EXCL | O_TRUNC);</div><div class='ctx'> 		ff-&gt;fh = outopen.fh;</div><div class='del'>-		/* Special release, with inode = NULL, this will</div><div class='del'>-		   trigger a 'forget' request when the release is</div><div class='del'>-		   complete */</div><div class='del'>-		fuse_send_release(fc, ff, outentry.nodeid, NULL, flags, 0);</div><div class='del'>-		goto out_put_request;</div><div class='add'>+		fuse_sync_release(fc, ff, outentry.nodeid, flags);</div><div class='add'>+		fuse_send_forget(fc, forget_req, outentry.nodeid, 1);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	fuse_put_request(fc, req);</div><div class='add'>+	fuse_put_request(fc, forget_req);</div><div class='ctx'> 	d_instantiate(entry, inode);</div><div class='ctx'> 	fuse_change_timeout(entry, &amp;outentry);</div><div class='ctx'> 	file = lookup_instantiate_filp(nd, entry, generic_file_open);</div><div class='ctx'> 	if (IS_ERR(file)) {</div><div class='ctx'> 		ff-&gt;fh = outopen.fh;</div><div class='del'>-		fuse_send_release(fc, ff, outentry.nodeid, inode, flags, 0);</div><div class='add'>+		fuse_sync_release(fc, ff, outentry.nodeid, flags);</div><div class='ctx'> 		return PTR_ERR(file);</div><div class='ctx'> 	}</div><div class='ctx'> 	fuse_finish_open(inode, file, ff, &amp;outopen);</div><div class='hunk'>@@ -313,6 +329,8 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,</div><div class='ctx'> 	fuse_file_free(ff);</div><div class='ctx'>  out_put_request:</div><div class='ctx'> 	fuse_put_request(fc, req);</div><div class='add'>+ out_put_forget_req:</div><div class='add'>+	fuse_put_request(fc, forget_req);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -328,7 +346,6 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_req *req,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(dir);</div><div class='del'>-	req-&gt;inode = dir;</div><div class='ctx'> 	req-&gt;out.numargs = 1;</div><div class='ctx'> 	req-&gt;out.args[0].size = sizeof(outarg);</div><div class='ctx'> 	req-&gt;out.args[0].value = &amp;outarg;</div><div class='hunk'>@@ -448,7 +465,6 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_UNLINK;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(dir);</div><div class='del'>-	req-&gt;inode = dir;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = entry-&gt;d_name.len + 1;</div><div class='ctx'> 	req-&gt;in.args[0].value = entry-&gt;d_name.name;</div><div class='hunk'>@@ -480,7 +496,6 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_RMDIR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(dir);</div><div class='del'>-	req-&gt;inode = dir;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = entry-&gt;d_name.len + 1;</div><div class='ctx'> 	req-&gt;in.args[0].value = entry-&gt;d_name.name;</div><div class='hunk'>@@ -510,8 +525,6 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,</div><div class='ctx'> 	inarg.newdir = get_node_id(newdir);</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_RENAME;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(olddir);</div><div class='del'>-	req-&gt;inode = olddir;</div><div class='del'>-	req-&gt;inode2 = newdir;</div><div class='ctx'> 	req-&gt;in.numargs = 3;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -558,7 +571,6 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,</div><div class='ctx'> 	memset(&amp;inarg, 0, sizeof(inarg));</div><div class='ctx'> 	inarg.oldnodeid = get_node_id(inode);</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_LINK;</div><div class='del'>-	req-&gt;inode2 = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 2;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -587,7 +599,6 @@ int fuse_do_getattr(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_GETATTR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;out.numargs = 1;</div><div class='ctx'> 	req-&gt;out.args[0].size = sizeof(arg);</div><div class='ctx'> 	req-&gt;out.args[0].value = &amp;arg;</div><div class='hunk'>@@ -679,7 +690,6 @@ static int fuse_access(struct inode *inode, int mask)</div><div class='ctx'> 	inarg.mask = mask;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_ACCESS;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -820,7 +830,6 @@ static char *read_link(struct dentry *dentry)</div><div class='ctx'> 	}</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_READLINK;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;out.argvar = 1;</div><div class='ctx'> 	req-&gt;out.numargs = 1;</div><div class='ctx'> 	req-&gt;out.args[0].size = PAGE_SIZE - 1;</div><div class='hunk'>@@ -939,7 +948,6 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)</div><div class='ctx'> 	iattr_to_fattr(attr, &amp;inarg);</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_SETATTR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -1002,7 +1010,6 @@ static int fuse_setxattr(struct dentry *entry, const char *name,</div><div class='ctx'> 	inarg.flags = flags;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_SETXATTR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 3;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -1041,7 +1048,6 @@ static ssize_t fuse_getxattr(struct dentry *entry, const char *name,</div><div class='ctx'> 	inarg.size = size;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_GETXATTR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 2;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -1091,7 +1097,6 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)</div><div class='ctx'> 	inarg.size = size;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_LISTXATTR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -1135,7 +1140,6 @@ static int fuse_removexattr(struct dentry *entry, const char *name)</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_REMOVEXATTR;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = strlen(name) + 1;</div><div class='ctx'> 	req-&gt;in.args[0].value = name;</div><div class='head'>diff --git a/fs/fuse/file.c b/fs/fuse/file.c<br/>index fc342cf7c2cc..63614ed16336 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fuse/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/file.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@ static int fuse_send_open(struct inode *inode, struct file *file, int isdir,</div><div class='ctx'> 	inarg.flags = file-&gt;f_flags &amp; ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);</div><div class='ctx'> 	req-&gt;in.h.opcode = isdir ? FUSE_OPENDIR : FUSE_OPEN;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -49,8 +48,8 @@ struct fuse_file *fuse_file_alloc(void)</div><div class='ctx'> 	struct fuse_file *ff;</div><div class='ctx'> 	ff = kmalloc(sizeof(struct fuse_file), GFP_KERNEL);</div><div class='ctx'> 	if (ff) {</div><div class='del'>-		ff-&gt;release_req = fuse_request_alloc();</div><div class='del'>-		if (!ff-&gt;release_req) {</div><div class='add'>+		ff-&gt;reserved_req = fuse_request_alloc();</div><div class='add'>+		if (!ff-&gt;reserved_req) {</div><div class='ctx'> 			kfree(ff);</div><div class='ctx'> 			ff = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -60,7 +59,7 @@ struct fuse_file *fuse_file_alloc(void)</div><div class='ctx'> </div><div class='ctx'> void fuse_file_free(struct fuse_file *ff)</div><div class='ctx'> {</div><div class='del'>-	fuse_request_free(ff-&gt;release_req);</div><div class='add'>+	fuse_request_free(ff-&gt;reserved_req);</div><div class='ctx'> 	kfree(ff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -113,37 +112,22 @@ int fuse_open_common(struct inode *inode, struct file *file, int isdir)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Special case for failed iget in CREATE */</div><div class='del'>-static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req)</div><div class='add'>+struct fuse_req *fuse_release_fill(struct fuse_file *ff, u64 nodeid, int flags,</div><div class='add'>+				   int opcode)</div><div class='ctx'> {</div><div class='del'>-	/* If called from end_io_requests(), req has more than one</div><div class='del'>-	   reference and fuse_reset_request() cannot work */</div><div class='del'>-	if (fc-&gt;connected) {</div><div class='del'>-		u64 nodeid = req-&gt;in.h.nodeid;</div><div class='del'>-		fuse_reset_request(req);</div><div class='del'>-		fuse_send_forget(fc, req, nodeid, 1);</div><div class='del'>-	} else</div><div class='del'>-		fuse_put_request(fc, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void fuse_send_release(struct fuse_conn *fc, struct fuse_file *ff,</div><div class='del'>-		       u64 nodeid, struct inode *inode, int flags, int isdir)</div><div class='del'>-{</div><div class='del'>-	struct fuse_req * req = ff-&gt;release_req;</div><div class='add'>+	struct fuse_req *req = ff-&gt;reserved_req;</div><div class='ctx'> 	struct fuse_release_in *inarg = &amp;req-&gt;misc.release_in;</div><div class='ctx'> </div><div class='ctx'> 	inarg-&gt;fh = ff-&gt;fh;</div><div class='ctx'> 	inarg-&gt;flags = flags;</div><div class='del'>-	req-&gt;in.h.opcode = isdir ? FUSE_RELEASEDIR : FUSE_RELEASE;</div><div class='add'>+	req-&gt;in.h.opcode = opcode;</div><div class='ctx'> 	req-&gt;in.h.nodeid = nodeid;</div><div class='del'>-	req-&gt;inode = inode;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(struct fuse_release_in);</div><div class='ctx'> 	req-&gt;in.args[0].value = inarg;</div><div class='del'>-	request_send_background(fc, req);</div><div class='del'>-	if (!inode)</div><div class='del'>-		req-&gt;end = fuse_release_end;</div><div class='ctx'> 	kfree(ff);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fuse_release_common(struct inode *inode, struct file *file, int isdir)</div><div class='hunk'>@@ -151,8 +135,15 @@ int fuse_release_common(struct inode *inode, struct file *file, int isdir)</div><div class='ctx'> 	struct fuse_file *ff = file-&gt;private_data;</div><div class='ctx'> 	if (ff) {</div><div class='ctx'> 		struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='del'>-		u64 nodeid = get_node_id(inode);</div><div class='del'>-		fuse_send_release(fc, ff, nodeid, inode, file-&gt;f_flags, isdir);</div><div class='add'>+		struct fuse_req *req;</div><div class='add'>+</div><div class='add'>+		req = fuse_release_fill(ff, get_node_id(inode), file-&gt;f_flags,</div><div class='add'>+					isdir ? FUSE_RELEASEDIR : FUSE_RELEASE);</div><div class='add'>+</div><div class='add'>+		/* Hold vfsmount and dentry until release is finished */</div><div class='add'>+		req-&gt;vfsmount = mntget(file-&gt;f_vfsmnt);</div><div class='add'>+		req-&gt;dentry = dget(file-&gt;f_dentry);</div><div class='add'>+		request_send_background(fc, req);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Return value is ignored by VFS */</div><div class='hunk'>@@ -169,7 +160,29 @@ static int fuse_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return fuse_release_common(inode, file, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_flush(struct file *file)</div><div class='add'>+/*</div><div class='add'>+ * Scramble the ID space with XTEA, so that the value of the files_struct</div><div class='add'>+ * pointer is not exposed to userspace.</div><div class='add'>+ */</div><div class='add'>+static u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id)</div><div class='add'>+{</div><div class='add'>+	u32 *k = fc-&gt;scramble_key;</div><div class='add'>+	u64 v = (unsigned long) id;</div><div class='add'>+	u32 v0 = v;</div><div class='add'>+	u32 v1 = v &gt;&gt; 32;</div><div class='add'>+	u32 sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		v0 += ((v1 &lt;&lt; 4 ^ v1 &gt;&gt; 5) + v1) ^ (sum + k[sum &amp; 3]);</div><div class='add'>+		sum += 0x9E3779B9;</div><div class='add'>+		v1 += ((v0 &lt;&lt; 4 ^ v0 &gt;&gt; 5) + v0) ^ (sum + k[sum&gt;&gt;11 &amp; 3]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (u64) v0 + ((u64) v1 &lt;&lt; 32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='hunk'>@@ -184,19 +197,16 @@ static int fuse_flush(struct file *file)</div><div class='ctx'> 	if (fc-&gt;no_flush)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	req = fuse_get_req(fc);</div><div class='del'>-	if (IS_ERR(req))</div><div class='del'>-		return PTR_ERR(req);</div><div class='del'>-</div><div class='add'>+	req = fuse_get_req_nofail(fc, file);</div><div class='ctx'> 	memset(&amp;inarg, 0, sizeof(inarg));</div><div class='ctx'> 	inarg.fh = ff-&gt;fh;</div><div class='add'>+	inarg.lock_owner = fuse_lock_owner_id(fc, id);</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_FLUSH;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='del'>-	req-&gt;file = file;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='add'>+	req-&gt;force = 1;</div><div class='ctx'> 	request_send(fc, req);</div><div class='ctx'> 	err = req-&gt;out.h.error;</div><div class='ctx'> 	fuse_put_request(fc, req);</div><div class='hunk'>@@ -232,8 +242,6 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,</div><div class='ctx'> 	inarg.fsync_flags = datasync ? 1 : 0;</div><div class='ctx'> 	req-&gt;in.h.opcode = isdir ? FUSE_FSYNCDIR : FUSE_FSYNC;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='del'>-	req-&gt;file = file;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(inarg);</div><div class='ctx'> 	req-&gt;in.args[0].value = &amp;inarg;</div><div class='hunk'>@@ -266,8 +274,6 @@ void fuse_read_fill(struct fuse_req *req, struct file *file,</div><div class='ctx'> 	inarg-&gt;size = count;</div><div class='ctx'> 	req-&gt;in.h.opcode = opcode;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='del'>-	req-&gt;file = file;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(struct fuse_read_in);</div><div class='ctx'> 	req-&gt;in.args[0].value = inarg;</div><div class='hunk'>@@ -342,6 +348,8 @@ static void fuse_send_readpages(struct fuse_req *req, struct file *file,</div><div class='ctx'> 	req-&gt;out.page_zeroing = 1;</div><div class='ctx'> 	fuse_read_fill(req, file, inode, pos, count, FUSE_READ);</div><div class='ctx'> 	if (fc-&gt;async_read) {</div><div class='add'>+		get_file(file);</div><div class='add'>+		req-&gt;file = file;</div><div class='ctx'> 		req-&gt;end = fuse_readpages_end;</div><div class='ctx'> 		request_send_background(fc, req);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -420,8 +428,6 @@ static size_t fuse_send_write(struct fuse_req *req, struct file *file,</div><div class='ctx'> 	inarg.size = count;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_WRITE;</div><div class='ctx'> 	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='del'>-	req-&gt;inode = inode;</div><div class='del'>-	req-&gt;file = file;</div><div class='ctx'> 	req-&gt;in.argpages = 1;</div><div class='ctx'> 	req-&gt;in.numargs = 2;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(struct fuse_write_in);</div><div class='hunk'>@@ -619,6 +625,126 @@ static int fuse_set_page_dirty(struct page *page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int convert_fuse_file_lock(const struct fuse_file_lock *ffl,</div><div class='add'>+				  struct file_lock *fl)</div><div class='add'>+{</div><div class='add'>+	switch (ffl-&gt;type) {</div><div class='add'>+	case F_UNLCK:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case F_RDLCK:</div><div class='add'>+	case F_WRLCK:</div><div class='add'>+		if (ffl-&gt;start &gt; OFFSET_MAX || ffl-&gt;end &gt; OFFSET_MAX ||</div><div class='add'>+		    ffl-&gt;end &lt; ffl-&gt;start)</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		fl-&gt;fl_start = ffl-&gt;start;</div><div class='add'>+		fl-&gt;fl_end = ffl-&gt;end;</div><div class='add'>+		fl-&gt;fl_pid = ffl-&gt;pid;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	fl-&gt;fl_type = ffl-&gt;type;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fuse_lk_fill(struct fuse_req *req, struct file *file,</div><div class='add'>+			 const struct file_lock *fl, int opcode, pid_t pid)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	struct fuse_file *ff = file-&gt;private_data;</div><div class='add'>+	struct fuse_lk_in *arg = &amp;req-&gt;misc.lk_in;</div><div class='add'>+</div><div class='add'>+	arg-&gt;fh = ff-&gt;fh;</div><div class='add'>+	arg-&gt;owner = fuse_lock_owner_id(fc, fl-&gt;fl_owner);</div><div class='add'>+	arg-&gt;lk.start = fl-&gt;fl_start;</div><div class='add'>+	arg-&gt;lk.end = fl-&gt;fl_end;</div><div class='add'>+	arg-&gt;lk.type = fl-&gt;fl_type;</div><div class='add'>+	arg-&gt;lk.pid = pid;</div><div class='add'>+	req-&gt;in.h.opcode = opcode;</div><div class='add'>+	req-&gt;in.h.nodeid = get_node_id(inode);</div><div class='add'>+	req-&gt;in.numargs = 1;</div><div class='add'>+	req-&gt;in.args[0].size = sizeof(*arg);</div><div class='add'>+	req-&gt;in.args[0].value = arg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_getlk(struct file *file, struct file_lock *fl)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+	struct fuse_lk_out outarg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	req = fuse_get_req(fc);</div><div class='add'>+	if (IS_ERR(req))</div><div class='add'>+		return PTR_ERR(req);</div><div class='add'>+</div><div class='add'>+	fuse_lk_fill(req, file, fl, FUSE_GETLK, 0);</div><div class='add'>+	req-&gt;out.numargs = 1;</div><div class='add'>+	req-&gt;out.args[0].size = sizeof(outarg);</div><div class='add'>+	req-&gt;out.args[0].value = &amp;outarg;</div><div class='add'>+	request_send(fc, req);</div><div class='add'>+	err = req-&gt;out.h.error;</div><div class='add'>+	fuse_put_request(fc, req);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = convert_fuse_file_lock(&amp;outarg.lk, fl);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_setlk(struct file *file, struct file_lock *fl)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	struct fuse_req *req;</div><div class='add'>+	int opcode = (fl-&gt;fl_flags &amp; FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK;</div><div class='add'>+	pid_t pid = fl-&gt;fl_type != F_UNLCK ? current-&gt;tgid : 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Unlock on close is handled by the flush method */</div><div class='add'>+	if (fl-&gt;fl_flags &amp; FL_CLOSE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	req = fuse_get_req(fc);</div><div class='add'>+	if (IS_ERR(req))</div><div class='add'>+		return PTR_ERR(req);</div><div class='add'>+</div><div class='add'>+	fuse_lk_fill(req, file, fl, opcode, pid);</div><div class='add'>+	request_send(fc, req);</div><div class='add'>+	err = req-&gt;out.h.error;</div><div class='add'>+	/* locking is restartable */</div><div class='add'>+	if (err == -EINTR)</div><div class='add'>+		err = -ERESTARTSYS;</div><div class='add'>+	fuse_put_request(fc, req);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='add'>+	struct fuse_conn *fc = get_fuse_conn(inode);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cmd == F_GETLK) {</div><div class='add'>+		if (fc-&gt;no_lock) {</div><div class='add'>+			if (!posix_test_lock(file, fl, fl))</div><div class='add'>+				fl-&gt;fl_type = F_UNLCK;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else</div><div class='add'>+			err = fuse_getlk(file, fl);</div><div class='add'>+	} else {</div><div class='add'>+		if (fc-&gt;no_lock)</div><div class='add'>+			err = posix_lock_file_wait(file, fl);</div><div class='add'>+		else</div><div class='add'>+			err = fuse_setlk(file, fl);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct file_operations fuse_file_operations = {</div><div class='ctx'> 	.llseek		= generic_file_llseek,</div><div class='ctx'> 	.read		= generic_file_read,</div><div class='hunk'>@@ -628,6 +754,7 @@ static const struct file_operations fuse_file_operations = {</div><div class='ctx'> 	.flush		= fuse_flush,</div><div class='ctx'> 	.release	= fuse_release,</div><div class='ctx'> 	.fsync		= fuse_fsync,</div><div class='add'>+	.lock		= fuse_file_lock,</div><div class='ctx'> 	.sendfile	= generic_file_sendfile,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -639,10 +766,11 @@ static const struct file_operations fuse_direct_io_file_operations = {</div><div class='ctx'> 	.flush		= fuse_flush,</div><div class='ctx'> 	.release	= fuse_release,</div><div class='ctx'> 	.fsync		= fuse_fsync,</div><div class='add'>+	.lock		= fuse_file_lock,</div><div class='ctx'> 	/* no mmap and sendfile */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations fuse_file_aops  = {</div><div class='add'>+static const struct address_space_operations fuse_file_aops  = {</div><div class='ctx'> 	.readpage	= fuse_readpage,</div><div class='ctx'> 	.prepare_write	= fuse_prepare_write,</div><div class='ctx'> 	.commit_write	= fuse_commit_write,</div><div class='head'>diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h<br/>index 0474202cb5dc..0dbf96621841 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fuse/fuse_i.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/fuse_i.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/fuse_i.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/fuse_i.h</a></div><div class='hunk'>@@ -8,12 +8,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fuse.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/backing-dev.h&gt;</div><div class='del'>-#include &lt;asm/semaphore.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> /** Max number of pages that can be used in a single read request */</div><div class='ctx'> #define FUSE_MAX_PAGES_PER_REQ 32</div><div class='hunk'>@@ -24,6 +25,9 @@</div><div class='ctx'> /** It could be as large as PATH_MAX, but would that have any uses? */</div><div class='ctx'> #define FUSE_NAME_MAX 1024</div><div class='ctx'> </div><div class='add'>+/** Number of dentries for each connection in the control filesystem */</div><div class='add'>+#define FUSE_CTL_NUM_DENTRIES 3</div><div class='add'>+</div><div class='ctx'> /** If the FUSE_DEFAULT_PERMISSIONS flag is given, the filesystem</div><div class='ctx'>     module will check permissions based on the file mode.  Otherwise no</div><div class='ctx'>     permission checking is done in the kernel */</div><div class='hunk'>@@ -33,6 +37,11 @@</div><div class='ctx'>     doing the mount will be allowed to access the filesystem */</div><div class='ctx'> #define FUSE_ALLOW_OTHER         (1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='add'>+/** List of active connections */</div><div class='add'>+extern struct list_head fuse_conn_list;</div><div class='add'>+</div><div class='add'>+/** Global mutex protecting fuse_conn_list and the control filesystem */</div><div class='add'>+extern struct mutex fuse_mutex;</div><div class='ctx'> </div><div class='ctx'> /** FUSE inode */</div><div class='ctx'> struct fuse_inode {</div><div class='hunk'>@@ -56,7 +65,7 @@ struct fuse_inode {</div><div class='ctx'> /** FUSE specific file data */</div><div class='ctx'> struct fuse_file {</div><div class='ctx'> 	/** Request reserved for flush and release */</div><div class='del'>-	struct fuse_req *release_req;</div><div class='add'>+	struct fuse_req *reserved_req;</div><div class='ctx'> </div><div class='ctx'> 	/** File handle used by userspace */</div><div class='ctx'> 	u64 fh;</div><div class='hunk'>@@ -122,6 +131,7 @@ enum fuse_req_state {</div><div class='ctx'> 	FUSE_REQ_PENDING,</div><div class='ctx'> 	FUSE_REQ_READING,</div><div class='ctx'> 	FUSE_REQ_SENT,</div><div class='add'>+	FUSE_REQ_WRITING,</div><div class='ctx'> 	FUSE_REQ_FINISHED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -135,12 +145,15 @@ struct fuse_req {</div><div class='ctx'> 	    fuse_conn */</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='del'>-	/** Entry on the background list */</div><div class='del'>-	struct list_head bg_entry;</div><div class='add'>+	/** Entry on the interrupts list  */</div><div class='add'>+	struct list_head intr_entry;</div><div class='ctx'> </div><div class='ctx'> 	/** refcount */</div><div class='ctx'> 	atomic_t count;</div><div class='ctx'> </div><div class='add'>+	/** Unique ID for the interrupt request */</div><div class='add'>+	u64 intr_unique;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The following bitfields are either set once before the</div><div class='ctx'> 	 * request is queued or setting/clearing them is protected by</div><div class='hunk'>@@ -150,12 +163,18 @@ struct fuse_req {</div><div class='ctx'> 	/** True if the request has reply */</div><div class='ctx'> 	unsigned isreply:1;</div><div class='ctx'> </div><div class='del'>-	/** The request was interrupted */</div><div class='del'>-	unsigned interrupted:1;</div><div class='add'>+	/** Force sending of the request even if interrupted */</div><div class='add'>+	unsigned force:1;</div><div class='add'>+</div><div class='add'>+	/** The request was aborted */</div><div class='add'>+	unsigned aborted:1;</div><div class='ctx'> </div><div class='ctx'> 	/** Request is sent in the background */</div><div class='ctx'> 	unsigned background:1;</div><div class='ctx'> </div><div class='add'>+	/** The request has been interrupted */</div><div class='add'>+	unsigned interrupted:1;</div><div class='add'>+</div><div class='ctx'> 	/** Data is being copied to/from the request */</div><div class='ctx'> 	unsigned locked:1;</div><div class='ctx'> </div><div class='hunk'>@@ -181,6 +200,7 @@ struct fuse_req {</div><div class='ctx'> 		struct fuse_init_in init_in;</div><div class='ctx'> 		struct fuse_init_out init_out;</div><div class='ctx'> 		struct fuse_read_in read_in;</div><div class='add'>+		struct fuse_lk_in lk_in;</div><div class='ctx'> 	} misc;</div><div class='ctx'> </div><div class='ctx'> 	/** page vector */</div><div class='hunk'>@@ -192,17 +212,20 @@ struct fuse_req {</div><div class='ctx'> 	/** offset of data on first page */</div><div class='ctx'> 	unsigned page_offset;</div><div class='ctx'> </div><div class='del'>-	/** Inode used in the request */</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	/** Second inode used in the request (or NULL) */</div><div class='del'>-	struct inode *inode2;</div><div class='del'>-</div><div class='ctx'> 	/** File used in the request (or NULL) */</div><div class='ctx'> 	struct file *file;</div><div class='ctx'> </div><div class='add'>+	/** vfsmount used in release */</div><div class='add'>+	struct vfsmount *vfsmount;</div><div class='add'>+</div><div class='add'>+	/** dentry used in release */</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+</div><div class='ctx'> 	/** Request completion callback */</div><div class='ctx'> 	void (*end)(struct fuse_conn *, struct fuse_req *);</div><div class='add'>+</div><div class='add'>+	/** Request is stolen from fuse_file-&gt;reserved_req */</div><div class='add'>+	struct file *stolen_file;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -216,6 +239,9 @@ struct fuse_conn {</div><div class='ctx'> 	/** Lock protecting accessess to  members of this structure */</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> </div><div class='add'>+	/** Refcount */</div><div class='add'>+	atomic_t count;</div><div class='add'>+</div><div class='ctx'> 	/** The user id for this mount */</div><div class='ctx'> 	uid_t user_id;</div><div class='ctx'> </div><div class='hunk'>@@ -243,13 +269,12 @@ struct fuse_conn {</div><div class='ctx'> 	/** The list of requests under I/O */</div><div class='ctx'> 	struct list_head io;</div><div class='ctx'> </div><div class='del'>-	/** Requests put in the background (RELEASE or any other</div><div class='del'>-	    interrupted request) */</div><div class='del'>-	struct list_head background;</div><div class='del'>-</div><div class='ctx'> 	/** Number of requests currently in the background */</div><div class='ctx'> 	unsigned num_background;</div><div class='ctx'> </div><div class='add'>+	/** Pending interrupts */</div><div class='add'>+	struct list_head interrupts;</div><div class='add'>+</div><div class='ctx'> 	/** Flag indicating if connection is blocked.  This will be</div><div class='ctx'> 	    the case before the INIT reply is received, and if there</div><div class='ctx'> 	    are too many outstading backgrounds requests */</div><div class='hunk'>@@ -258,15 +283,9 @@ struct fuse_conn {</div><div class='ctx'> 	/** waitq for blocked connection */</div><div class='ctx'> 	wait_queue_head_t blocked_waitq;</div><div class='ctx'> </div><div class='del'>-	/** RW semaphore for exclusion with fuse_put_super() */</div><div class='del'>-	struct rw_semaphore sbput_sem;</div><div class='del'>-</div><div class='ctx'> 	/** The next unique request id */</div><div class='ctx'> 	u64 reqctr;</div><div class='ctx'> </div><div class='del'>-	/** Mount is active */</div><div class='del'>-	unsigned mounted;</div><div class='del'>-</div><div class='ctx'> 	/** Connection established, cleared on umount, connection</div><div class='ctx'> 	    abort and device release */</div><div class='ctx'> 	unsigned connected;</div><div class='hunk'>@@ -305,12 +324,18 @@ struct fuse_conn {</div><div class='ctx'> 	/** Is removexattr not implemented by fs? */</div><div class='ctx'> 	unsigned no_removexattr : 1;</div><div class='ctx'> </div><div class='add'>+	/** Are file locking primitives not implemented by fs? */</div><div class='add'>+	unsigned no_lock : 1;</div><div class='add'>+</div><div class='ctx'> 	/** Is access not implemented by fs? */</div><div class='ctx'> 	unsigned no_access : 1;</div><div class='ctx'> </div><div class='ctx'> 	/** Is create not implemented by fs? */</div><div class='ctx'> 	unsigned no_create : 1;</div><div class='ctx'> </div><div class='add'>+	/** Is interrupt not implemented by fs? */</div><div class='add'>+	unsigned no_interrupt : 1;</div><div class='add'>+</div><div class='ctx'> 	/** The number of requests waiting for completion */</div><div class='ctx'> 	atomic_t num_waiting;</div><div class='ctx'> </div><div class='hunk'>@@ -320,11 +345,23 @@ struct fuse_conn {</div><div class='ctx'> 	/** Backing dev info */</div><div class='ctx'> 	struct backing_dev_info bdi;</div><div class='ctx'> </div><div class='del'>-	/** kobject */</div><div class='del'>-	struct kobject kobj;</div><div class='add'>+	/** Entry on the fuse_conn_list */</div><div class='add'>+	struct list_head entry;</div><div class='add'>+</div><div class='add'>+	/** Unique ID */</div><div class='add'>+	u64 id;</div><div class='add'>+</div><div class='add'>+	/** Dentries in the control filesystem */</div><div class='add'>+	struct dentry *ctl_dentry[FUSE_CTL_NUM_DENTRIES];</div><div class='add'>+</div><div class='add'>+	/** number of dentries used in the above array */</div><div class='add'>+	int ctl_ndents;</div><div class='ctx'> </div><div class='ctx'> 	/** O_ASYNC requests */</div><div class='ctx'> 	struct fasync_struct *fasync;</div><div class='add'>+</div><div class='add'>+	/** Key for lock owner ID scrambling */</div><div class='add'>+	u32 scramble_key[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)</div><div class='hunk'>@@ -337,11 +374,6 @@ static inline struct fuse_conn *get_fuse_conn(struct inode *inode)</div><div class='ctx'> 	return get_fuse_conn_super(inode-&gt;i_sb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct fuse_conn *get_fuse_conn_kobj(struct kobject *obj)</div><div class='del'>-{</div><div class='del'>-	return container_of(obj, struct fuse_conn, kobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct fuse_inode *get_fuse_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(inode, struct fuse_inode, inode);</div><div class='hunk'>@@ -383,12 +415,9 @@ void fuse_file_free(struct fuse_file *ff);</div><div class='ctx'> void fuse_finish_open(struct inode *inode, struct file *file,</div><div class='ctx'> 		      struct fuse_file *ff, struct fuse_open_out *outarg);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Send a RELEASE request</div><div class='del'>- */</div><div class='del'>-void fuse_send_release(struct fuse_conn *fc, struct fuse_file *ff,</div><div class='del'>-		       u64 nodeid, struct inode *inode, int flags, int isdir);</div><div class='del'>-</div><div class='add'>+/** */</div><div class='add'>+struct fuse_req *fuse_release_fill(struct fuse_file *ff, u64 nodeid, int flags,</div><div class='add'>+				   int opcode);</div><div class='ctx'> /**</div><div class='ctx'>  * Send RELEASE or RELEASEDIR request</div><div class='ctx'>  */</div><div class='hunk'>@@ -435,6 +464,9 @@ int fuse_dev_init(void);</div><div class='ctx'>  */</div><div class='ctx'> void fuse_dev_cleanup(void);</div><div class='ctx'> </div><div class='add'>+int fuse_ctl_init(void);</div><div class='add'>+void fuse_ctl_cleanup(void);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * Allocate a request</div><div class='ctx'>  */</div><div class='hunk'>@@ -446,14 +478,14 @@ struct fuse_req *fuse_request_alloc(void);</div><div class='ctx'> void fuse_request_free(struct fuse_req *req);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Reinitialize a request, the preallocated flag is left unmodified</div><div class='add'>+ * Get a request, may fail with -ENOMEM</div><div class='ctx'>  */</div><div class='del'>-void fuse_reset_request(struct fuse_req *req);</div><div class='add'>+struct fuse_req *fuse_get_req(struct fuse_conn *fc);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Reserve a preallocated request</div><div class='add'>+ * Gets a requests for a file operation, always succeeds</div><div class='ctx'>  */</div><div class='del'>-struct fuse_req *fuse_get_req(struct fuse_conn *fc);</div><div class='add'>+struct fuse_req *fuse_get_req_nofail(struct fuse_conn *fc, struct file *file);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * Decrement reference count of a request.  If count goes to zero free</div><div class='hunk'>@@ -476,11 +508,6 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req);</div><div class='ctx'>  */</div><div class='ctx'> void request_send_background(struct fuse_conn *fc, struct fuse_req *req);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Release inodes and file associated with background request</div><div class='del'>- */</div><div class='del'>-void fuse_release_background(struct fuse_conn *fc, struct fuse_req *req);</div><div class='del'>-</div><div class='ctx'> /* Abort all requests */</div><div class='ctx'> void fuse_abort_conn(struct fuse_conn *fc);</div><div class='ctx'> </div><div class='hunk'>@@ -493,3 +520,23 @@ int fuse_do_getattr(struct inode *inode);</div><div class='ctx'>  * Invalidate inode attributes</div><div class='ctx'>  */</div><div class='ctx'> void fuse_invalidate_attr(struct inode *inode);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Acquire reference to fuse_conn</div><div class='add'>+ */</div><div class='add'>+struct fuse_conn *fuse_conn_get(struct fuse_conn *fc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Release reference to fuse_conn</div><div class='add'>+ */</div><div class='add'>+void fuse_conn_put(struct fuse_conn *fc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Add connection to control filesystem</div><div class='add'>+ */</div><div class='add'>+int fuse_ctl_add_conn(struct fuse_conn *fc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * Remove connection from control filesystem</div><div class='add'>+ */</div><div class='add'>+void fuse_ctl_remove_conn(struct fuse_conn *fc);</div><div class='head'>diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c<br/>index 7627022446b2..dcaaabd3b9c4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/fuse/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/fuse/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/fuse/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/fuse/inode.c</a></div><div class='hunk'>@@ -11,25 +11,20 @@</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/statfs.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Miklos Szeredi &lt;miklos@szeredi.hu&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Filesystem in Userspace");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static kmem_cache_t *fuse_inode_cachep;</div><div class='del'>-static struct subsystem connections_subsys;</div><div class='del'>-</div><div class='del'>-struct fuse_conn_attr {</div><div class='del'>-	struct attribute attr;</div><div class='del'>-	ssize_t (*show)(struct fuse_conn *, char *);</div><div class='del'>-	ssize_t (*store)(struct fuse_conn *, const char *, size_t);</div><div class='del'>-};</div><div class='add'>+struct list_head fuse_conn_list;</div><div class='add'>+DEFINE_MUTEX(fuse_mutex);</div><div class='ctx'> </div><div class='ctx'> #define FUSE_SUPER_MAGIC 0x65735546</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +99,14 @@ static void fuse_clear_inode(struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fuse_remount_fs(struct super_block *sb, int *flags, char *data)</div><div class='add'>+{</div><div class='add'>+	if (*flags &amp; MS_MANDLOCK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)</div><div class='ctx'> {</div><div class='ctx'> 	if (S_ISREG(inode-&gt;i_mode) &amp;&amp; i_size_read(inode) != attr-&gt;size)</div><div class='hunk'>@@ -195,31 +198,29 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_umount_begin(struct super_block *sb)</div><div class='add'>+static void fuse_umount_begin(struct vfsmount *vfsmnt, int flags)</div><div class='ctx'> {</div><div class='del'>-	fuse_abort_conn(get_fuse_conn_super(sb));</div><div class='add'>+	if (flags &amp; MNT_FORCE)</div><div class='add'>+		fuse_abort_conn(get_fuse_conn_super(vfsmnt-&gt;mnt_sb));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void fuse_put_super(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn_super(sb);</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;fc-&gt;sbput_sem);</div><div class='del'>-	while (!list_empty(&amp;fc-&gt;background))</div><div class='del'>-		fuse_release_background(fc,</div><div class='del'>-					list_entry(fc-&gt;background.next,</div><div class='del'>-						   struct fuse_req, bg_entry));</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;fc-&gt;lock);</div><div class='del'>-	fc-&gt;mounted = 0;</div><div class='ctx'> 	fc-&gt;connected = 0;</div><div class='add'>+	fc-&gt;blocked = 0;</div><div class='ctx'> 	spin_unlock(&amp;fc-&gt;lock);</div><div class='del'>-	up_write(&amp;fc-&gt;sbput_sem);</div><div class='ctx'> 	/* Flush all readers on this fs */</div><div class='ctx'> 	kill_fasync(&amp;fc-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 	wake_up_all(&amp;fc-&gt;waitq);</div><div class='del'>-	kobject_del(&amp;fc-&gt;kobj);</div><div class='del'>-	kobject_put(&amp;fc-&gt;kobj);</div><div class='add'>+	wake_up_all(&amp;fc-&gt;blocked_waitq);</div><div class='add'>+	mutex_lock(&amp;fuse_mutex);</div><div class='add'>+	list_del(&amp;fc-&gt;entry);</div><div class='add'>+	fuse_ctl_remove_conn(fc);</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='add'>+	fuse_conn_put(fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr)</div><div class='hunk'>@@ -236,8 +237,9 @@ static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr</div><div class='ctx'> 	/* fsid is left zero */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int fuse_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	struct fuse_conn *fc = get_fuse_conn_super(sb);</div><div class='ctx'> 	struct fuse_req *req;</div><div class='ctx'> 	struct fuse_statfs_out outarg;</div><div class='hunk'>@@ -368,11 +370,6 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void fuse_conn_release(struct kobject *kobj)</div><div class='del'>-{</div><div class='del'>-	kfree(get_fuse_conn_kobj(kobj));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct fuse_conn *new_conn(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_conn *fc;</div><div class='hunk'>@@ -380,24 +377,35 @@ static struct fuse_conn *new_conn(void)</div><div class='ctx'> 	fc = kzalloc(sizeof(*fc), GFP_KERNEL);</div><div class='ctx'> 	if (fc) {</div><div class='ctx'> 		spin_lock_init(&amp;fc-&gt;lock);</div><div class='add'>+		atomic_set(&amp;fc-&gt;count, 1);</div><div class='ctx'> 		init_waitqueue_head(&amp;fc-&gt;waitq);</div><div class='ctx'> 		init_waitqueue_head(&amp;fc-&gt;blocked_waitq);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;fc-&gt;pending);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;fc-&gt;processing);</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;fc-&gt;io);</div><div class='del'>-		INIT_LIST_HEAD(&amp;fc-&gt;background);</div><div class='del'>-		init_rwsem(&amp;fc-&gt;sbput_sem);</div><div class='del'>-		kobj_set_kset_s(fc, connections_subsys);</div><div class='del'>-		kobject_init(&amp;fc-&gt;kobj);</div><div class='add'>+		INIT_LIST_HEAD(&amp;fc-&gt;interrupts);</div><div class='ctx'> 		atomic_set(&amp;fc-&gt;num_waiting, 0);</div><div class='ctx'> 		fc-&gt;bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;</div><div class='ctx'> 		fc-&gt;bdi.unplug_io_fn = default_unplug_io_fn;</div><div class='ctx'> 		fc-&gt;reqctr = 0;</div><div class='ctx'> 		fc-&gt;blocked = 1;</div><div class='add'>+		get_random_bytes(&amp;fc-&gt;scramble_key, sizeof(fc-&gt;scramble_key));</div><div class='ctx'> 	}</div><div class='ctx'> 	return fc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void fuse_conn_put(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;fc-&gt;count))</div><div class='add'>+		kfree(fc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct fuse_conn *fuse_conn_get(struct fuse_conn *fc)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;fc-&gt;count);</div><div class='add'>+	return fc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct inode *get_root_inode(struct super_block *sb, unsigned mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct fuse_attr attr;</div><div class='hunk'>@@ -413,6 +421,7 @@ static struct super_operations fuse_super_operations = {</div><div class='ctx'> 	.destroy_inode  = fuse_destroy_inode,</div><div class='ctx'> 	.read_inode	= fuse_read_inode,</div><div class='ctx'> 	.clear_inode	= fuse_clear_inode,</div><div class='add'>+	.remount_fs	= fuse_remount_fs,</div><div class='ctx'> 	.put_super	= fuse_put_super,</div><div class='ctx'> 	.umount_begin	= fuse_umount_begin,</div><div class='ctx'> 	.statfs		= fuse_statfs,</div><div class='hunk'>@@ -432,8 +441,12 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> 			ra_pages = arg-&gt;max_readahead / PAGE_CACHE_SIZE;</div><div class='ctx'> 			if (arg-&gt;flags &amp; FUSE_ASYNC_READ)</div><div class='ctx'> 				fc-&gt;async_read = 1;</div><div class='del'>-		} else</div><div class='add'>+			if (!(arg-&gt;flags &amp; FUSE_POSIX_LOCKS))</div><div class='add'>+				fc-&gt;no_lock = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			ra_pages = fc-&gt;max_read / PAGE_CACHE_SIZE;</div><div class='add'>+			fc-&gt;no_lock = 1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		fc-&gt;bdi.ra_pages = min(fc-&gt;bdi.ra_pages, ra_pages);</div><div class='ctx'> 		fc-&gt;minor = arg-&gt;minor;</div><div class='hunk'>@@ -451,7 +464,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> 	arg-&gt;major = FUSE_KERNEL_VERSION;</div><div class='ctx'> 	arg-&gt;minor = FUSE_KERNEL_MINOR_VERSION;</div><div class='ctx'> 	arg-&gt;max_readahead = fc-&gt;bdi.ra_pages * PAGE_CACHE_SIZE;</div><div class='del'>-	arg-&gt;flags |= FUSE_ASYNC_READ;</div><div class='add'>+	arg-&gt;flags |= FUSE_ASYNC_READ | FUSE_POSIX_LOCKS;</div><div class='ctx'> 	req-&gt;in.h.opcode = FUSE_INIT;</div><div class='ctx'> 	req-&gt;in.numargs = 1;</div><div class='ctx'> 	req-&gt;in.args[0].size = sizeof(*arg);</div><div class='hunk'>@@ -467,10 +480,9 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req)</div><div class='ctx'> 	request_send_background(fc, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned long long conn_id(void)</div><div class='add'>+static u64 conn_id(void)</div><div class='ctx'> {</div><div class='del'>-	/* BKL is held for -&gt;get_sb() */</div><div class='del'>-	static unsigned long long ctr = 1;</div><div class='add'>+	static u64 ctr = 1;</div><div class='ctx'> 	return ctr++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -484,6 +496,9 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	struct fuse_req *init_req;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (sb-&gt;s_flags &amp; MS_MANDLOCK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (!parse_fuse_opt((char *) data, &amp;d))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -527,25 +542,21 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	if (!init_req)</div><div class='ctx'> 		goto err_put_root;</div><div class='ctx'> </div><div class='del'>-	err = kobject_set_name(&amp;fc-&gt;kobj, "%llu", conn_id());</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_req;</div><div class='del'>-</div><div class='del'>-	err = kobject_add(&amp;fc-&gt;kobj);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_req;</div><div class='del'>-</div><div class='del'>-	/* Setting file-&gt;private_data can't race with other mount()</div><div class='del'>-	   instances, since BKL is held for -&gt;get_sb() */</div><div class='add'>+	mutex_lock(&amp;fuse_mutex);</div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> 	if (file-&gt;private_data)</div><div class='del'>-		goto err_kobject_del;</div><div class='add'>+		goto err_unlock;</div><div class='ctx'> </div><div class='add'>+	fc-&gt;id = conn_id();</div><div class='add'>+	err = fuse_ctl_add_conn(fc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unlock;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;fc-&gt;entry, &amp;fuse_conn_list);</div><div class='ctx'> 	sb-&gt;s_root = root_dentry;</div><div class='del'>-	fc-&gt;mounted = 1;</div><div class='ctx'> 	fc-&gt;connected = 1;</div><div class='del'>-	kobject_get(&amp;fc-&gt;kobj);</div><div class='del'>-	file-&gt;private_data = fc;</div><div class='add'>+	file-&gt;private_data = fuse_conn_get(fc);</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * atomic_dec_and_test() in fput() provides the necessary</div><div class='ctx'> 	 * memory barrier for file-&gt;private_data to be visible on all</div><div class='hunk'>@@ -557,23 +568,22 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- err_kobject_del:</div><div class='del'>-	kobject_del(&amp;fc-&gt;kobj);</div><div class='del'>- err_free_req:</div><div class='add'>+ err_unlock:</div><div class='add'>+	mutex_unlock(&amp;fuse_mutex);</div><div class='ctx'> 	fuse_request_free(init_req);</div><div class='ctx'>  err_put_root:</div><div class='ctx'> 	dput(root_dentry);</div><div class='ctx'>  err:</div><div class='ctx'> 	fput(file);</div><div class='del'>-	kobject_put(&amp;fc-&gt;kobj);</div><div class='add'>+	fuse_conn_put(fc);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *fuse_get_sb(struct file_system_type *fs_type,</div><div class='del'>-				       int flags, const char *dev_name,</div><div class='del'>-				       void *raw_data)</div><div class='add'>+static int fuse_get_sb(struct file_system_type *fs_type,</div><div class='add'>+		       int flags, const char *dev_name,</div><div class='add'>+		       void *raw_data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super);</div><div class='add'>+	return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type fuse_fs_type = {</div><div class='hunk'>@@ -583,68 +593,8 @@ static struct file_system_type fuse_fs_type = {</div><div class='ctx'> 	.kill_sb	= kill_anon_super,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t fuse_conn_waiting_show(struct fuse_conn *fc, char *page)</div><div class='del'>-{</div><div class='del'>-	return sprintf(page, "%i\n", atomic_read(&amp;fc-&gt;num_waiting));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t fuse_conn_abort_store(struct fuse_conn *fc, const char *page,</div><div class='del'>-				     size_t count)</div><div class='del'>-{</div><div class='del'>-	fuse_abort_conn(fc);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct fuse_conn_attr fuse_conn_waiting =</div><div class='del'>-	__ATTR(waiting, 0400, fuse_conn_waiting_show, NULL);</div><div class='del'>-static struct fuse_conn_attr fuse_conn_abort =</div><div class='del'>-	__ATTR(abort, 0600, NULL, fuse_conn_abort_store);</div><div class='del'>-</div><div class='del'>-static struct attribute *fuse_conn_attrs[] = {</div><div class='del'>-	&amp;fuse_conn_waiting.attr,</div><div class='del'>-	&amp;fuse_conn_abort.attr,</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ssize_t fuse_conn_attr_show(struct kobject *kobj,</div><div class='del'>-				   struct attribute *attr,</div><div class='del'>-				   char *page)</div><div class='del'>-{</div><div class='del'>-	struct fuse_conn_attr *fca =</div><div class='del'>-		container_of(attr, struct fuse_conn_attr, attr);</div><div class='del'>-</div><div class='del'>-	if (fca-&gt;show)</div><div class='del'>-		return fca-&gt;show(get_fuse_conn_kobj(kobj), page);</div><div class='del'>-	else</div><div class='del'>-		return -EACCES;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t fuse_conn_attr_store(struct kobject *kobj,</div><div class='del'>-				    struct attribute *attr,</div><div class='del'>-				    const char *page, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct fuse_conn_attr *fca =</div><div class='del'>-		container_of(attr, struct fuse_conn_attr, attr);</div><div class='del'>-</div><div class='del'>-	if (fca-&gt;store)</div><div class='del'>-		return fca-&gt;store(get_fuse_conn_kobj(kobj), page, count);</div><div class='del'>-	else</div><div class='del'>-		return -EACCES;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sysfs_ops fuse_conn_sysfs_ops = {</div><div class='del'>-	.show	= &amp;fuse_conn_attr_show,</div><div class='del'>-	.store	= &amp;fuse_conn_attr_store,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct kobj_type ktype_fuse_conn = {</div><div class='del'>-	.release	= fuse_conn_release,</div><div class='del'>-	.sysfs_ops	= &amp;fuse_conn_sysfs_ops,</div><div class='del'>-	.default_attrs	= fuse_conn_attrs,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static decl_subsys(fuse, NULL, NULL);</div><div class='del'>-static decl_subsys(connections, &amp;ktype_fuse_conn, NULL);</div><div class='add'>+static decl_subsys(connections, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> static void fuse_inode_init_once(void *foo, kmem_cache_t *cachep,</div><div class='ctx'> 				 unsigned long flags)</div><div class='hunk'>@@ -718,6 +668,7 @@ static int __init fuse_init(void)</div><div class='ctx'> 	printk("fuse init (API version %i.%i)\n",</div><div class='ctx'> 	       FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);</div><div class='ctx'> </div><div class='add'>+	INIT_LIST_HEAD(&amp;fuse_conn_list);</div><div class='ctx'> 	res = fuse_fs_init();</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -730,8 +681,14 @@ static int __init fuse_init(void)</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto err_dev_cleanup;</div><div class='ctx'> </div><div class='add'>+	res = fuse_ctl_init();</div><div class='add'>+	if (res)</div><div class='add'>+		goto err_sysfs_cleanup;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ err_sysfs_cleanup:</div><div class='add'>+	fuse_sysfs_cleanup();</div><div class='ctx'>  err_dev_cleanup:</div><div class='ctx'> 	fuse_dev_cleanup();</div><div class='ctx'>  err_fs_cleanup:</div><div class='hunk'>@@ -744,6 +701,7 @@ static void __exit fuse_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	printk(KERN_DEBUG "fuse exit\n");</div><div class='ctx'> </div><div class='add'>+	fuse_ctl_cleanup();</div><div class='ctx'> 	fuse_sysfs_cleanup();</div><div class='ctx'> 	fuse_fs_cleanup();</div><div class='ctx'> 	fuse_dev_cleanup();</div><div class='head'>diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c<br/>index 1e44dcfe49c4..13231dd5ce66 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfs/bnode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/bnode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfs/bnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfs/bnode.c</a></div><div class='hunk'>@@ -280,7 +280,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)</div><div class='ctx'> 	block = off &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='ctx'> 	node-&gt;page_offset = off &amp; ~PAGE_CACHE_MASK;</div><div class='ctx'> 	for (i = 0; i &lt; tree-&gt;pages_per_bnode; i++) {</div><div class='del'>-		page = read_cache_page(mapping, block++, (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+		page = read_mapping_page(mapping, block++, NULL);</div><div class='ctx'> 		if (IS_ERR(page))</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		if (PageError(page)) {</div><div class='head'>diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c<br/>index d20131ce4b95..400357994319 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfs/btree.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/btree.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfs/btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfs/btree.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke</div><div class='ctx'> 	unlock_new_inode(tree-&gt;inode);</div><div class='ctx'> </div><div class='ctx'> 	mapping = tree-&gt;inode-&gt;i_mapping;</div><div class='del'>-	page = read_cache_page(mapping, 0, (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	page = read_mapping_page(mapping, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(page))</div><div class='ctx'> 		goto free_tree;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h<br/>index 3ed8663a8db1..735332dfd1b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfs/hfs_fs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/hfs_fs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfs/hfs_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfs/hfs_fs.h</a></div><div class='hunk'>@@ -182,8 +182,8 @@ extern void hfs_file_truncate(struct inode *);</div><div class='ctx'> extern int hfs_get_block(struct inode *, sector_t, struct buffer_head *, int);</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='del'>-extern struct address_space_operations hfs_aops;</div><div class='del'>-extern struct address_space_operations hfs_btree_aops;</div><div class='add'>+extern const struct address_space_operations hfs_aops;</div><div class='add'>+extern const struct address_space_operations hfs_btree_aops;</div><div class='ctx'> </div><div class='ctx'> extern struct inode *hfs_new_inode(struct inode *, struct qstr *, int);</div><div class='ctx'> extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *);</div><div class='head'>diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c<br/>index 2d4ced22201b..315cf44a90b2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfs/inode.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static int hfs_writepages(struct address_space *mapping,</div><div class='ctx'> 	return mpage_writepages(mapping, wbc, hfs_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations hfs_btree_aops = {</div><div class='add'>+const struct address_space_operations hfs_btree_aops = {</div><div class='ctx'> 	.readpage	= hfs_readpage,</div><div class='ctx'> 	.writepage	= hfs_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='hunk'>@@ -124,7 +124,7 @@ struct address_space_operations hfs_btree_aops = {</div><div class='ctx'> 	.releasepage	= hfs_releasepage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct address_space_operations hfs_aops = {</div><div class='add'>+const struct address_space_operations hfs_aops = {</div><div class='ctx'> 	.readpage	= hfs_readpage,</div><div class='ctx'> 	.writepage	= hfs_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='head'>diff --git a/fs/hfs/super.c b/fs/hfs/super.c<br/>index 1181d116117d..34937ee83ab1 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfs/super.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Based on the minix file system code, (C) 1991, 1992 by Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='hunk'>@@ -80,8 +79,10 @@ static void hfs_put_super(struct super_block *sb)</div><div class='ctx'>  *</div><div class='ctx'>  * changed f_files/f_ffree to reflect the fs_ablock/free_ablocks.</div><div class='ctx'>  */</div><div class='del'>-static int hfs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int hfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	buf-&gt;f_type = HFS_SUPER_MAGIC;</div><div class='ctx'> 	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='ctx'> 	buf-&gt;f_blocks = (u32)HFS_SB(sb)-&gt;fs_ablocks * HFS_SB(sb)-&gt;fs_div;</div><div class='hunk'>@@ -413,10 +414,11 @@ bail:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *hfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-				      int flags, const char *dev_name, void *data)</div><div class='add'>+static int hfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+		      int flags, const char *dev_name, void *data,</div><div class='add'>+		      struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, hfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, hfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hfs_fs_type = {</div><div class='head'>diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c<br/>index 9fb51632303c..d128a25b74d2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfsplus/bitmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/bitmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfsplus/bitmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfsplus/bitmap.c</a></div><div class='hunk'>@@ -31,8 +31,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size, u32 offset, u32 *ma</div><div class='ctx'> 	dprint(DBG_BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);</div><div class='ctx'> 	mutex_lock(&amp;HFSPLUS_SB(sb).alloc_file-&gt;i_mutex);</div><div class='ctx'> 	mapping = HFSPLUS_SB(sb).alloc_file-&gt;i_mapping;</div><div class='del'>-	page = read_cache_page(mapping, offset / PAGE_CACHE_BITS,</div><div class='del'>-			       (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS, NULL);</div><div class='ctx'> 	pptr = kmap(page);</div><div class='ctx'> 	curr = pptr + (offset &amp; (PAGE_CACHE_BITS - 1)) / 32;</div><div class='ctx'> 	i = offset % 32;</div><div class='hunk'>@@ -72,8 +71,8 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size, u32 offset, u32 *ma</div><div class='ctx'> 		offset += PAGE_CACHE_BITS;</div><div class='ctx'> 		if (offset &gt;= size)</div><div class='ctx'> 			break;</div><div class='del'>-		page = read_cache_page(mapping, offset / PAGE_CACHE_BITS,</div><div class='del'>-				       (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+		page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS,</div><div class='add'>+					 NULL);</div><div class='ctx'> 		curr = pptr = kmap(page);</div><div class='ctx'> 		if ((size ^ offset) / PAGE_CACHE_BITS)</div><div class='ctx'> 			end = pptr + PAGE_CACHE_BITS / 32;</div><div class='hunk'>@@ -119,8 +118,8 @@ found:</div><div class='ctx'> 		set_page_dirty(page);</div><div class='ctx'> 		kunmap(page);</div><div class='ctx'> 		offset += PAGE_CACHE_BITS;</div><div class='del'>-		page = read_cache_page(mapping, offset / PAGE_CACHE_BITS,</div><div class='del'>-				       (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+		page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS,</div><div class='add'>+					 NULL);</div><div class='ctx'> 		pptr = kmap(page);</div><div class='ctx'> 		curr = pptr;</div><div class='ctx'> 		end = pptr + PAGE_CACHE_BITS / 32;</div><div class='hunk'>@@ -167,7 +166,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)</div><div class='ctx'> 	mutex_lock(&amp;HFSPLUS_SB(sb).alloc_file-&gt;i_mutex);</div><div class='ctx'> 	mapping = HFSPLUS_SB(sb).alloc_file-&gt;i_mapping;</div><div class='ctx'> 	pnr = offset / PAGE_CACHE_BITS;</div><div class='del'>-	page = read_cache_page(mapping, pnr, (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	page = read_mapping_page(mapping, pnr, NULL);</div><div class='ctx'> 	pptr = kmap(page);</div><div class='ctx'> 	curr = pptr + (offset &amp; (PAGE_CACHE_BITS - 1)) / 32;</div><div class='ctx'> 	end = pptr + PAGE_CACHE_BITS / 32;</div><div class='hunk'>@@ -199,7 +198,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)</div><div class='ctx'> 			break;</div><div class='ctx'> 		set_page_dirty(page);</div><div class='ctx'> 		kunmap(page);</div><div class='del'>-		page = read_cache_page(mapping, ++pnr, (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+		page = read_mapping_page(mapping, ++pnr, NULL);</div><div class='ctx'> 		pptr = kmap(page);</div><div class='ctx'> 		curr = pptr;</div><div class='ctx'> 		end = pptr + PAGE_CACHE_BITS / 32;</div><div class='head'>diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c<br/>index 746abc9ecf70..77bf434da679 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfsplus/bnode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/bnode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfsplus/bnode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfsplus/bnode.c</a></div><div class='hunk'>@@ -440,7 +440,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)</div><div class='ctx'> 	block = off &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='ctx'> 	node-&gt;page_offset = off &amp; ~PAGE_CACHE_MASK;</div><div class='ctx'> 	for (i = 0; i &lt; tree-&gt;pages_per_bnode; block++, i++) {</div><div class='del'>-		page = read_cache_page(mapping, block, (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+		page = read_mapping_page(mapping, block, NULL);</div><div class='ctx'> 		if (IS_ERR(page))</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 		if (PageError(page)) {</div><div class='head'>diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c<br/>index effa8991999c..cfc852fdd1b5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfsplus/btree.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/btree.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfsplus/btree.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfsplus/btree.c</a></div><div class='hunk'>@@ -38,7 +38,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)</div><div class='ctx'> 		goto free_tree;</div><div class='ctx'> </div><div class='ctx'> 	mapping = tree-&gt;inode-&gt;i_mapping;</div><div class='del'>-	page = read_cache_page(mapping, 0, (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	page = read_mapping_page(mapping, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(page))</div><div class='ctx'> 		goto free_tree;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h<br/>index 7ae393637a0c..8a1ca5ef7ada 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfsplus/hfsplus_fs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/hfsplus_fs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfsplus/hfsplus_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfsplus/hfsplus_fs.h</a></div><div class='hunk'>@@ -323,8 +323,8 @@ int hfsplus_file_extend(struct inode *);</div><div class='ctx'> void hfsplus_file_truncate(struct inode *);</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='del'>-extern struct address_space_operations hfsplus_aops;</div><div class='del'>-extern struct address_space_operations hfsplus_btree_aops;</div><div class='add'>+extern const struct address_space_operations hfsplus_aops;</div><div class='add'>+extern const struct address_space_operations hfsplus_btree_aops;</div><div class='ctx'> </div><div class='ctx'> void hfsplus_inode_read_fork(struct inode *, struct hfsplus_fork_raw *);</div><div class='ctx'> void hfsplus_inode_write_fork(struct inode *, struct hfsplus_fork_raw *);</div><div class='head'>diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c<br/>index acf66dba3e01..924ecdef8091 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfsplus/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfsplus/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfsplus/inode.c</a></div><div class='hunk'>@@ -109,7 +109,7 @@ static int hfsplus_writepages(struct address_space *mapping,</div><div class='ctx'> 	return mpage_writepages(mapping, wbc, hfsplus_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations hfsplus_btree_aops = {</div><div class='add'>+const struct address_space_operations hfsplus_btree_aops = {</div><div class='ctx'> 	.readpage	= hfsplus_readpage,</div><div class='ctx'> 	.writepage	= hfsplus_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='hunk'>@@ -119,7 +119,7 @@ struct address_space_operations hfsplus_btree_aops = {</div><div class='ctx'> 	.releasepage	= hfsplus_releasepage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct address_space_operations hfsplus_aops = {</div><div class='add'>+const struct address_space_operations hfsplus_aops = {</div><div class='ctx'> 	.readpage	= hfsplus_readpage,</div><div class='ctx'> 	.writepage	= hfsplus_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='head'>diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c<br/>index 7843f792a4b7..d279d5924f28 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hfsplus/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hfsplus/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hfsplus/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hfsplus/super.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='hunk'>@@ -212,8 +211,10 @@ static void hfsplus_put_super(struct super_block *sb)</div><div class='ctx'> 	sb-&gt;s_fs_info = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	buf-&gt;f_type = HFSPLUS_SUPER_MAGIC;</div><div class='ctx'> 	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='ctx'> 	buf-&gt;f_blocks = HFSPLUS_SB(sb).total_blocks &lt;&lt; HFSPLUS_SB(sb).fs_shift;</div><div class='hunk'>@@ -450,10 +451,12 @@ static void hfsplus_destroy_inode(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> #define HFSPLUS_INODE_SIZE	sizeof(struct hfsplus_inode_info)</div><div class='ctx'> </div><div class='del'>-static struct super_block *hfsplus_get_sb(struct file_system_type *fs_type,</div><div class='del'>-					  int flags, const char *dev_name, void *data)</div><div class='add'>+static int hfsplus_get_sb(struct file_system_type *fs_type,</div><div class='add'>+			  int flags, const char *dev_name, void *data,</div><div class='add'>+			  struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hfsplus_fs_type = {</div><div class='head'>diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c<br/>index bf0f8e16e433..b82e3d9c8790 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hostfs/hostfs_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hostfs/hostfs_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hostfs/hostfs_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hostfs/hostfs_kern.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ static int append = 0;</div><div class='ctx'> </div><div class='ctx'> static struct inode_operations hostfs_iops;</div><div class='ctx'> static struct inode_operations hostfs_dir_iops;</div><div class='del'>-static struct address_space_operations hostfs_link_aops;</div><div class='add'>+static const struct address_space_operations hostfs_link_aops;</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='ctx'> static int __init hostfs_args(char *options, int *add)</div><div class='hunk'>@@ -239,7 +239,7 @@ static int read_inode(struct inode *ino)</div><div class='ctx'> 	return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)</div><div class='add'>+int hostfs_statfs(struct dentry *dentry, struct kstatfs *sf)</div><div class='ctx'> {</div><div class='ctx'> 	/* do_statfs uses struct statfs64 internally, but the linux kernel</div><div class='ctx'> 	 * struct statfs still has 32-bit versions for most of these fields,</div><div class='hunk'>@@ -252,7 +252,7 @@ int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)</div><div class='ctx'> 	long long f_files;</div><div class='ctx'> 	long long f_ffree;</div><div class='ctx'> </div><div class='del'>-	err = do_statfs(HOSTFS_I(sb-&gt;s_root-&gt;d_inode)-&gt;host_filename,</div><div class='add'>+	err = do_statfs(HOSTFS_I(dentry-&gt;d_sb-&gt;s_root-&gt;d_inode)-&gt;host_filename,</div><div class='ctx'> 			&amp;sf-&gt;f_bsize, &amp;f_blocks, &amp;f_bfree, &amp;f_bavail, &amp;f_files,</div><div class='ctx'> 			&amp;f_ffree, &amp;sf-&gt;f_fsid, sizeof(sf-&gt;f_fsid),</div><div class='ctx'> 			&amp;sf-&gt;f_namelen, sf-&gt;f_spare);</div><div class='hunk'>@@ -518,7 +518,7 @@ int hostfs_commit_write(struct file *file, struct page *page, unsigned from,</div><div class='ctx'> 	return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations hostfs_aops = {</div><div class='add'>+static const struct address_space_operations hostfs_aops = {</div><div class='ctx'> 	.writepage 	= hostfs_writepage,</div><div class='ctx'> 	.readpage	= hostfs_readpage,</div><div class='ctx'> 	.set_page_dirty = __set_page_dirty_nobuffers,</div><div class='hunk'>@@ -935,7 +935,7 @@ int hostfs_link_readpage(struct file *file, struct page *page)</div><div class='ctx'> 	return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations hostfs_link_aops = {</div><div class='add'>+static const struct address_space_operations hostfs_link_aops = {</div><div class='ctx'> 	.readpage	= hostfs_link_readpage,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -993,11 +993,11 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)</div><div class='ctx'> 	return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *hostfs_read_sb(struct file_system_type *type,</div><div class='del'>-					     int flags, const char *dev_name,</div><div class='del'>-					     void *data)</div><div class='add'>+static int hostfs_read_sb(struct file_system_type *type,</div><div class='add'>+			  int flags, const char *dev_name,</div><div class='add'>+			  void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return(get_sb_nodev(type, flags, data, hostfs_fill_sb_common));</div><div class='add'>+	return get_sb_nodev(type, flags, data, hostfs_fill_sb_common, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hostfs_type = {</div><div class='head'>diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c<br/>index d3b9fffe45a1..d9eb19b7b8ae 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hpfs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hpfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hpfs/file.c</a></div><div class='hunk'>@@ -99,7 +99,7 @@ static sector_t _hpfs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> {</div><div class='ctx'> 	return generic_block_bmap(mapping,block,hpfs_get_block);</div><div class='ctx'> }</div><div class='del'>-struct address_space_operations hpfs_aops = {</div><div class='add'>+const struct address_space_operations hpfs_aops = {</div><div class='ctx'> 	.readpage = hpfs_readpage,</div><div class='ctx'> 	.writepage = hpfs_writepage,</div><div class='ctx'> 	.sync_page = block_sync_page,</div><div class='head'>diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h<br/>index 29b7a3e55173..f687d54ed442 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hpfs/hpfs_fn.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/hpfs_fn.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hpfs/hpfs_fn.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hpfs/hpfs_fn.h</a></div><div class='hunk'>@@ -268,7 +268,7 @@ void hpfs_set_ea(struct inode *, struct fnode *, char *, char *, int);</div><div class='ctx'> int hpfs_file_fsync(struct file *, struct dentry *, int);</div><div class='ctx'> extern const struct file_operations hpfs_file_ops;</div><div class='ctx'> extern struct inode_operations hpfs_file_iops;</div><div class='del'>-extern struct address_space_operations hpfs_aops;</div><div class='add'>+extern const struct address_space_operations hpfs_aops;</div><div class='ctx'> </div><div class='ctx'> /* inode.c */</div><div class='ctx'> </div><div class='hunk'>@@ -304,7 +304,7 @@ void hpfs_decide_conv(struct inode *, unsigned char *, unsigned);</div><div class='ctx'> /* namei.c */</div><div class='ctx'> </div><div class='ctx'> extern struct inode_operations hpfs_dir_iops;</div><div class='del'>-extern struct address_space_operations hpfs_symlink_aops;</div><div class='add'>+extern const struct address_space_operations hpfs_symlink_aops;</div><div class='ctx'> </div><div class='ctx'> static inline struct hpfs_inode_info *hpfs_i(struct inode *inode)</div><div class='ctx'> {</div><div class='head'>diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c<br/>index a03abb12c610..59e7dc182a0c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hpfs/namei.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/namei.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hpfs/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hpfs/namei.c</a></div><div class='hunk'>@@ -538,7 +538,7 @@ fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations hpfs_symlink_aops = {</div><div class='add'>+const struct address_space_operations hpfs_symlink_aops = {</div><div class='ctx'> 	.readpage	= hpfs_symlink_readpage</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='head'>diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c<br/>index d72d8c87c996..f798480a363f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hpfs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hpfs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hpfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hpfs/super.c</a></div><div class='hunk'>@@ -135,8 +135,9 @@ static unsigned count_bitmaps(struct super_block *s)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hpfs_statfs(struct super_block *s, struct kstatfs *buf)</div><div class='add'>+static int hpfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *s = dentry-&gt;d_sb;</div><div class='ctx'> 	struct hpfs_sb_info *sbi = hpfs_sb(s);</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> </div><div class='hunk'>@@ -662,10 +663,11 @@ bail0:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *hpfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int hpfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, hpfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, hpfs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hpfs_fs_type = {</div><div class='head'>diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c<br/>index 5e6363be246f..3a9bdf58166f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hppfs/hppfs_kern.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hppfs/hppfs_kern.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hppfs/hppfs_kern.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hppfs/hppfs_kern.c</a></div><div class='hunk'>@@ -616,7 +616,7 @@ static const struct file_operations hppfs_dir_fops = {</div><div class='ctx'> 	.fsync		= hppfs_fsync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hppfs_statfs(struct super_block *sb, struct kstatfs *sf)</div><div class='add'>+static int hppfs_statfs(struct dentry *dentry, struct kstatfs *sf)</div><div class='ctx'> {</div><div class='ctx'> 	sf-&gt;f_blocks = 0;</div><div class='ctx'> 	sf-&gt;f_bfree = 0;</div><div class='hunk'>@@ -769,11 +769,11 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent)</div><div class='ctx'> 	return(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *hppfs_read_super(struct file_system_type *type,</div><div class='del'>-					     int flags, const char *dev_name,</div><div class='del'>-					     void *data)</div><div class='add'>+static int hppfs_read_super(struct file_system_type *type,</div><div class='add'>+			    int flags, const char *dev_name,</div><div class='add'>+			    void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return(get_sb_nodev(type, flags, data, hppfs_fill_super));</div><div class='add'>+	return get_sb_nodev(type, flags, data, hppfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hppfs_type = {</div><div class='head'>diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c<br/>index 3a5b4e923455..c3920c96dadf 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/hugetlbfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/hugetlbfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/hugetlbfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/hugetlbfs/inode.c</a></div><div class='hunk'>@@ -34,7 +34,7 @@</div><div class='ctx'> #define HUGETLBFS_MAGIC	0x958458f6</div><div class='ctx'> </div><div class='ctx'> static struct super_operations hugetlbfs_ops;</div><div class='del'>-static struct address_space_operations hugetlbfs_aops;</div><div class='add'>+static const struct address_space_operations hugetlbfs_aops;</div><div class='ctx'> const struct file_operations hugetlbfs_file_operations;</div><div class='ctx'> static struct inode_operations hugetlbfs_dir_inode_operations;</div><div class='ctx'> static struct inode_operations hugetlbfs_inode_operations;</div><div class='hunk'>@@ -59,7 +59,6 @@ static void huge_pagevec_release(struct pagevec *pvec)</div><div class='ctx'> static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='del'>-	struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);</div><div class='ctx'> 	loff_t len, vma_len;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -84,16 +83,15 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> </div><div class='ctx'> 	ret = -ENOMEM;</div><div class='ctx'> 	len = vma_len + ((loff_t)vma-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT);</div><div class='del'>-	if (!(vma-&gt;vm_flags &amp; VM_WRITE) &amp;&amp; len &gt; inode-&gt;i_size)</div><div class='del'>-		goto out;</div><div class='ctx'> </div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_MAYSHARE)</div><div class='del'>-		if (hugetlb_extend_reservation(info, len &gt;&gt; HPAGE_SHIFT) != 0)</div><div class='del'>-			goto out;</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_MAYSHARE &amp;&amp;</div><div class='add'>+	    hugetlb_reserve_pages(inode, vma-&gt;vm_pgoff &gt;&gt; (HPAGE_SHIFT-PAGE_SHIFT),</div><div class='add'>+				  len &gt;&gt; HPAGE_SHIFT))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	hugetlb_prefault_arch_hook(vma-&gt;vm_mm);</div><div class='del'>-	if (inode-&gt;i_size &lt; len)</div><div class='add'>+	if (vma-&gt;vm_flags &amp; VM_WRITE &amp;&amp; inode-&gt;i_size &lt; len)</div><div class='ctx'> 		inode-&gt;i_size = len;</div><div class='ctx'> out:</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;i_mutex);</div><div class='hunk'>@@ -195,12 +193,8 @@ static void truncate_hugepages(struct inode *inode, loff_t lstart)</div><div class='ctx'> 	const pgoff_t start = lstart &gt;&gt; HPAGE_SHIFT;</div><div class='ctx'> 	struct pagevec pvec;</div><div class='ctx'> 	pgoff_t next;</div><div class='del'>-	int i;</div><div class='add'>+	int i, freed = 0;</div><div class='ctx'> </div><div class='del'>-	hugetlb_truncate_reservation(HUGETLBFS_I(inode),</div><div class='del'>-				     lstart &gt;&gt; HPAGE_SHIFT);</div><div class='del'>-	if (!mapping-&gt;nrpages)</div><div class='del'>-		return;</div><div class='ctx'> 	pagevec_init(&amp;pvec, 0);</div><div class='ctx'> 	next = start;</div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -221,10 +215,12 @@ static void truncate_hugepages(struct inode *inode, loff_t lstart)</div><div class='ctx'> 			truncate_huge_page(page);</div><div class='ctx'> 			unlock_page(page);</div><div class='ctx'> 			hugetlb_put_quota(mapping);</div><div class='add'>+			freed++;</div><div class='ctx'> 		}</div><div class='ctx'> 		huge_pagevec_release(&amp;pvec);</div><div class='ctx'> 	}</div><div class='ctx'> 	BUG_ON(!lstart &amp;&amp; mapping-&gt;nrpages);</div><div class='add'>+	hugetlb_unreserve_pages(inode, start, freed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hugetlbfs_delete_inode(struct inode *inode)</div><div class='hunk'>@@ -366,6 +362,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, uid_t uid,</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;a_ops = &amp;hugetlbfs_aops;</div><div class='ctx'> 		inode-&gt;i_mapping-&gt;backing_dev_info =&amp;hugetlbfs_backing_dev_info;</div><div class='ctx'> 		inode-&gt;i_atime = inode-&gt;i_mtime = inode-&gt;i_ctime = CURRENT_TIME;</div><div class='add'>+		INIT_LIST_HEAD(&amp;inode-&gt;i_mapping-&gt;private_list);</div><div class='ctx'> 		info = HUGETLBFS_I(inode);</div><div class='ctx'> 		mpol_shared_policy_init(&amp;info-&gt;policy, MPOL_DEFAULT, NULL);</div><div class='ctx'> 		switch (mode &amp; S_IFMT) {</div><div class='hunk'>@@ -467,9 +464,9 @@ static int hugetlbfs_set_page_dirty(struct page *page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hugetlbfs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(sb);</div><div class='add'>+	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(dentry-&gt;d_sb);</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type = HUGETLBFS_MAGIC;</div><div class='ctx'> 	buf-&gt;f_bsize = HPAGE_SIZE;</div><div class='hunk'>@@ -538,7 +535,6 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 		hugetlbfs_inc_free_inodes(sbinfo);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	p-&gt;prereserved_hpages = 0;</div><div class='ctx'> 	return &amp;p-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +545,7 @@ static void hugetlbfs_destroy_inode(struct inode *inode)</div><div class='ctx'> 	kmem_cache_free(hugetlbfs_inode_cachep, HUGETLBFS_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations hugetlbfs_aops = {</div><div class='add'>+static const struct address_space_operations hugetlbfs_aops = {</div><div class='ctx'> 	.readpage	= hugetlbfs_readpage,</div><div class='ctx'> 	.prepare_write	= hugetlbfs_prepare_write,</div><div class='ctx'> 	.commit_write	= hugetlbfs_commit_write,</div><div class='hunk'>@@ -723,10 +719,10 @@ void hugetlb_put_quota(struct address_space *mapping)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *hugetlbfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int hugetlbfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_nodev(fs_type, flags, data, hugetlbfs_fill_super);</div><div class='add'>+	return get_sb_nodev(fs_type, flags, data, hugetlbfs_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type hugetlbfs_fs_type = {</div><div class='hunk'>@@ -781,8 +777,7 @@ struct file *hugetlb_zero_setup(size_t size)</div><div class='ctx'> 		goto out_file;</div><div class='ctx'> </div><div class='ctx'> 	error = -ENOMEM;</div><div class='del'>-	if (hugetlb_extend_reservation(HUGETLBFS_I(inode),</div><div class='del'>-				       size &gt;&gt; HPAGE_SHIFT) != 0)</div><div class='add'>+	if (hugetlb_reserve_pages(inode, 0, size &gt;&gt; HPAGE_SHIFT))</div><div class='ctx'> 		goto out_inode;</div><div class='ctx'> </div><div class='ctx'> 	d_instantiate(dentry, inode);</div><div class='head'>diff --git a/fs/inode.c b/fs/inode.c<br/>index 3a2446a27d2c..0bf9f0444a96 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/inode.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  * (C) 1997 Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/dcache.h&gt;</div><div class='hunk'>@@ -102,7 +101,7 @@ static kmem_cache_t * inode_cachep __read_mostly;</div><div class='ctx'> </div><div class='ctx'> static struct inode *alloc_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='del'>-	static struct address_space_operations empty_aops;</div><div class='add'>+	static const struct address_space_operations empty_aops;</div><div class='ctx'> 	static struct inode_operations empty_iops;</div><div class='ctx'> 	static const struct file_operations empty_fops;</div><div class='ctx'> 	struct inode *inode;</div><div class='hunk'>@@ -452,15 +451,14 @@ static void prune_icache(int nr_to_scan)</div><div class='ctx'> 		nr_pruned++;</div><div class='ctx'> 	}</div><div class='ctx'> 	inodes_stat.nr_unused -= nr_pruned;</div><div class='add'>+	if (current_is_kswapd())</div><div class='add'>+		__count_vm_events(KSWAPD_INODESTEAL, reap);</div><div class='add'>+	else</div><div class='add'>+		__count_vm_events(PGINODESTEAL, reap);</div><div class='ctx'> 	spin_unlock(&amp;inode_lock);</div><div class='ctx'> </div><div class='ctx'> 	dispose_list(&amp;freeable);</div><div class='ctx'> 	mutex_unlock(&amp;iprune_mutex);</div><div class='del'>-</div><div class='del'>-	if (current_is_kswapd())</div><div class='del'>-		mod_page_state(kswapd_inodesteal, reap);</div><div class='del'>-	else</div><div class='del'>-		mod_page_state(pginodesteal, reap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/fs/inotify.c b/fs/inotify.c<br/>index 732ec4bd5774..723836a1f718 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/inotify.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/inotify.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/inotify.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/inotify.c</a></div><div class='hunk'>@@ -5,7 +5,10 @@</div><div class='ctx'>  *	John McCutchan	&lt;ttb@tentacle.dhs.org&gt;</div><div class='ctx'>  *	Robert Love	&lt;rml@novell.com&gt;</div><div class='ctx'>  *</div><div class='add'>+ * Kernel API added by: Amy Griffis &lt;amy.griffis@hp.com&gt;</div><div class='add'>+ *</div><div class='ctx'>  * Copyright (C) 2005 John McCutchan</div><div class='add'>+ * Copyright 2006 Hewlett-Packard Development Company, L.P.</div><div class='ctx'>  *</div><div class='ctx'>  * This program is free software; you can redistribute it and/or modify it</div><div class='ctx'>  * under the terms of the GNU General Public License as published by the</div><div class='hunk'>@@ -20,35 +23,17 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/file.h&gt;</div><div class='del'>-#include &lt;linux/mount.h&gt;</div><div class='del'>-#include &lt;linux/namei.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/writeback.h&gt;</div><div class='ctx'> #include &lt;linux/inotify.h&gt;</div><div class='del'>-#include &lt;linux/syscalls.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/ioctls.h&gt;</div><div class='ctx'> </div><div class='ctx'> static atomic_t inotify_cookie;</div><div class='ctx'> </div><div class='del'>-static kmem_cache_t *watch_cachep __read_mostly;</div><div class='del'>-static kmem_cache_t *event_cachep __read_mostly;</div><div class='del'>-</div><div class='del'>-static struct vfsmount *inotify_mnt __read_mostly;</div><div class='del'>-</div><div class='del'>-/* these are configurable via /proc/sys/fs/inotify/ */</div><div class='del'>-int inotify_max_user_instances __read_mostly;</div><div class='del'>-int inotify_max_user_watches __read_mostly;</div><div class='del'>-int inotify_max_queued_events __read_mostly;</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Lock ordering:</div><div class='ctx'>  *</div><div class='hunk'>@@ -56,327 +41,108 @@ int inotify_max_queued_events __read_mostly;</div><div class='ctx'>  * iprune_mutex (synchronize shrink_icache_memory())</div><div class='ctx'>  * 	inode_lock (protects the super_block-&gt;s_inodes list)</div><div class='ctx'>  * 	inode-&gt;inotify_mutex (protects inode-&gt;inotify_watches and watches-&gt;i_list)</div><div class='del'>- * 		inotify_dev-&gt;mutex (protects inotify_device and watches-&gt;d_list)</div><div class='add'>+ * 		inotify_handle-&gt;mutex (protects inotify_handle and watches-&gt;h_list)</div><div class='add'>+ *</div><div class='add'>+ * The inode-&gt;inotify_mutex and inotify_handle-&gt;mutex and held during execution</div><div class='add'>+ * of a caller's event handler.  Thus, the caller must not hold any locks</div><div class='add'>+ * taken in their event handler while calling any of the published inotify</div><div class='add'>+ * interfaces.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Lifetimes of the three main data structures--inotify_device, inode, and</div><div class='add'>+ * Lifetimes of the three main data structures--inotify_handle, inode, and</div><div class='ctx'>  * inotify_watch--are managed by reference count.</div><div class='ctx'>  *</div><div class='del'>- * inotify_device: Lifetime is from inotify_init() until release.  Additional</div><div class='del'>- * references can bump the count via get_inotify_dev() and drop the count via</div><div class='del'>- * put_inotify_dev().</div><div class='add'>+ * inotify_handle: Lifetime is from inotify_init() to inotify_destroy().</div><div class='add'>+ * Additional references can bump the count via get_inotify_handle() and drop</div><div class='add'>+ * the count via put_inotify_handle().</div><div class='ctx'>  *</div><div class='del'>- * inotify_watch: Lifetime is from create_watch() to destory_watch().</div><div class='del'>- * Additional references can bump the count via get_inotify_watch() and drop</div><div class='del'>- * the count via put_inotify_watch().</div><div class='add'>+ * inotify_watch: for inotify's purposes, lifetime is from inotify_add_watch()</div><div class='add'>+ * to remove_watch_no_event().  Additional references can bump the count via</div><div class='add'>+ * get_inotify_watch() and drop the count via put_inotify_watch().  The caller</div><div class='add'>+ * is reponsible for the final put after receiving IN_IGNORED, or when using</div><div class='add'>+ * IN_ONESHOT after receiving the first event.  Inotify does the final put if</div><div class='add'>+ * inotify_destroy() is called.</div><div class='ctx'>  *</div><div class='ctx'>  * inode: Pinned so long as the inode is associated with a watch, from</div><div class='del'>- * create_watch() to put_inotify_watch().</div><div class='add'>+ * inotify_add_watch() to the final put_inotify_watch().</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * struct inotify_device - represents an inotify instance</div><div class='add'>+ * struct inotify_handle - represents an inotify instance</div><div class='ctx'>  *</div><div class='ctx'>  * This structure is protected by the mutex 'mutex'.</div><div class='ctx'>  */</div><div class='del'>-struct inotify_device {</div><div class='del'>-	wait_queue_head_t 	wq;		/* wait queue for i/o */</div><div class='add'>+struct inotify_handle {</div><div class='ctx'> 	struct idr		idr;		/* idr mapping wd -&gt; watch */</div><div class='ctx'> 	struct mutex		mutex;		/* protects this bad boy */</div><div class='del'>-	struct list_head 	events;		/* list of queued events */</div><div class='ctx'> 	struct list_head	watches;	/* list of watches */</div><div class='ctx'> 	atomic_t		count;		/* reference count */</div><div class='del'>-	struct user_struct	*user;		/* user who opened this dev */</div><div class='del'>-	unsigned int		queue_size;	/* size of the queue (bytes) */</div><div class='del'>-	unsigned int		event_count;	/* number of pending events */</div><div class='del'>-	unsigned int		max_events;	/* maximum number of events */</div><div class='ctx'> 	u32			last_wd;	/* the last wd allocated */</div><div class='add'>+	const struct inotify_operations *in_ops; /* inotify caller operations */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * struct inotify_kernel_event - An inotify event, originating from a watch and</div><div class='del'>- * queued for user-space.  A list of these is attached to each instance of the</div><div class='del'>- * device.  In read(), this list is walked and all events that can fit in the</div><div class='del'>- * buffer are returned.</div><div class='del'>- *</div><div class='del'>- * Protected by dev-&gt;mutex of the device in which we are queued.</div><div class='del'>- */</div><div class='del'>-struct inotify_kernel_event {</div><div class='del'>-	struct inotify_event	event;	/* the user-space event */</div><div class='del'>-	struct list_head        list;	/* entry in inotify_device's list */</div><div class='del'>-	char			*name;	/* filename, if any */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * struct inotify_watch - represents a watch request on a specific inode</div><div class='del'>- *</div><div class='del'>- * d_list is protected by dev-&gt;mutex of the associated watch-&gt;dev.</div><div class='del'>- * i_list and mask are protected by inode-&gt;inotify_mutex of the associated inode.</div><div class='del'>- * dev, inode, and wd are never written to once the watch is created.</div><div class='del'>- */</div><div class='del'>-struct inotify_watch {</div><div class='del'>-	struct list_head	d_list;	/* entry in inotify_device's list */</div><div class='del'>-	struct list_head	i_list;	/* entry in inode's list */</div><div class='del'>-	atomic_t		count;	/* reference count */</div><div class='del'>-	struct inotify_device	*dev;	/* associated device */</div><div class='del'>-	struct inode		*inode;	/* associated inode */</div><div class='del'>-	s32 			wd;	/* watch descriptor */</div><div class='del'>-	u32			mask;	/* event mask for this watch */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SYSCTL</div><div class='del'>-</div><div class='del'>-#include &lt;linux/sysctl.h&gt;</div><div class='del'>-</div><div class='del'>-static int zero;</div><div class='del'>-</div><div class='del'>-ctl_table inotify_table[] = {</div><div class='del'>-	{</div><div class='del'>-		.ctl_name	= INOTIFY_MAX_USER_INSTANCES,</div><div class='del'>-		.procname	= "max_user_instances",</div><div class='del'>-		.data		= &amp;inotify_max_user_instances,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= &amp;proc_dointvec_minmax,</div><div class='del'>-		.strategy	= &amp;sysctl_intvec,</div><div class='del'>-		.extra1		= &amp;zero,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.ctl_name	= INOTIFY_MAX_USER_WATCHES,</div><div class='del'>-		.procname	= "max_user_watches",</div><div class='del'>-		.data		= &amp;inotify_max_user_watches,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644,</div><div class='del'>-		.proc_handler	= &amp;proc_dointvec_minmax,</div><div class='del'>-		.strategy	= &amp;sysctl_intvec,</div><div class='del'>-		.extra1		= &amp;zero, </div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.ctl_name	= INOTIFY_MAX_QUEUED_EVENTS,</div><div class='del'>-		.procname	= "max_queued_events",</div><div class='del'>-		.data		= &amp;inotify_max_queued_events,</div><div class='del'>-		.maxlen		= sizeof(int),</div><div class='del'>-		.mode		= 0644, </div><div class='del'>-		.proc_handler	= &amp;proc_dointvec_minmax,</div><div class='del'>-		.strategy	= &amp;sysctl_intvec, </div><div class='del'>-		.extra1		= &amp;zero</div><div class='del'>-	},</div><div class='del'>-	{ .ctl_name = 0 }</div><div class='del'>-};</div><div class='del'>-#endif /* CONFIG_SYSCTL */</div><div class='del'>-</div><div class='del'>-static inline void get_inotify_dev(struct inotify_device *dev)</div><div class='add'>+static inline void get_inotify_handle(struct inotify_handle *ih)</div><div class='ctx'> {</div><div class='del'>-	atomic_inc(&amp;dev-&gt;count);</div><div class='add'>+	atomic_inc(&amp;ih-&gt;count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void put_inotify_dev(struct inotify_device *dev)</div><div class='add'>+static inline void put_inotify_handle(struct inotify_handle *ih)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_dec_and_test(&amp;dev-&gt;count)) {</div><div class='del'>-		atomic_dec(&amp;dev-&gt;user-&gt;inotify_devs);</div><div class='del'>-		free_uid(dev-&gt;user);</div><div class='del'>-		idr_destroy(&amp;dev-&gt;idr);</div><div class='del'>-		kfree(dev);</div><div class='add'>+	if (atomic_dec_and_test(&amp;ih-&gt;count)) {</div><div class='add'>+		idr_destroy(&amp;ih-&gt;idr);</div><div class='add'>+		kfree(ih);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void get_inotify_watch(struct inotify_watch *watch)</div><div class='add'>+/**</div><div class='add'>+ * get_inotify_watch - grab a reference to an inotify_watch</div><div class='add'>+ * @watch: watch to grab</div><div class='add'>+ */</div><div class='add'>+void get_inotify_watch(struct inotify_watch *watch)</div><div class='ctx'> {</div><div class='ctx'> 	atomic_inc(&amp;watch-&gt;count);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(get_inotify_watch);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='add'>+/**</div><div class='ctx'>  * put_inotify_watch - decrements the ref count on a given watch.  cleans up</div><div class='del'>- * the watch and its references if the count reaches zero.</div><div class='add'>+ * watch references if the count reaches zero.  inotify_watch is freed by</div><div class='add'>+ * inotify callers via the destroy_watch() op.</div><div class='add'>+ * @watch: watch to release</div><div class='ctx'>  */</div><div class='del'>-static inline void put_inotify_watch(struct inotify_watch *watch)</div><div class='add'>+void put_inotify_watch(struct inotify_watch *watch)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;watch-&gt;count)) {</div><div class='del'>-		put_inotify_dev(watch-&gt;dev);</div><div class='del'>-		iput(watch-&gt;inode);</div><div class='del'>-		kmem_cache_free(watch_cachep, watch);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * kernel_event - create a new kernel event with the given parameters</div><div class='del'>- *</div><div class='del'>- * This function can sleep.</div><div class='del'>- */</div><div class='del'>-static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie,</div><div class='del'>-						  const char *name)</div><div class='del'>-{</div><div class='del'>-	struct inotify_kernel_event *kevent;</div><div class='del'>-</div><div class='del'>-	kevent = kmem_cache_alloc(event_cachep, GFP_KERNEL);</div><div class='del'>-	if (unlikely(!kevent))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* we hand this out to user-space, so zero it just in case */</div><div class='del'>-	memset(&amp;kevent-&gt;event, 0, sizeof(struct inotify_event));</div><div class='del'>-</div><div class='del'>-	kevent-&gt;event.wd = wd;</div><div class='del'>-	kevent-&gt;event.mask = mask;</div><div class='del'>-	kevent-&gt;event.cookie = cookie;</div><div class='del'>-</div><div class='del'>-	INIT_LIST_HEAD(&amp;kevent-&gt;list);</div><div class='del'>-</div><div class='del'>-	if (name) {</div><div class='del'>-		size_t len, rem, event_size = sizeof(struct inotify_event);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We need to pad the filename so as to properly align an</div><div class='del'>-		 * array of inotify_event structures.  Because the structure is</div><div class='del'>-		 * small and the common case is a small filename, we just round</div><div class='del'>-		 * up to the next multiple of the structure's sizeof.  This is</div><div class='del'>-		 * simple and safe for all architectures.</div><div class='del'>-		 */</div><div class='del'>-		len = strlen(name) + 1;</div><div class='del'>-		rem = event_size - len;</div><div class='del'>-		if (len &gt; event_size) {</div><div class='del'>-			rem = event_size - (len % event_size);</div><div class='del'>-			if (len % event_size == 0)</div><div class='del'>-				rem = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kevent-&gt;name = kmalloc(len + rem, GFP_KERNEL);</div><div class='del'>-		if (unlikely(!kevent-&gt;name)) {</div><div class='del'>-			kmem_cache_free(event_cachep, kevent);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		memcpy(kevent-&gt;name, name, len);</div><div class='del'>-		if (rem)</div><div class='del'>-			memset(kevent-&gt;name + len, 0, rem);		</div><div class='del'>-		kevent-&gt;event.len = len + rem;</div><div class='del'>-	} else {</div><div class='del'>-		kevent-&gt;event.len = 0;</div><div class='del'>-		kevent-&gt;name = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return kevent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inotify_dev_get_event - return the next event in the given dev's queue</div><div class='del'>- *</div><div class='del'>- * Caller must hold dev-&gt;mutex.</div><div class='del'>- */</div><div class='del'>-static inline struct inotify_kernel_event *</div><div class='del'>-inotify_dev_get_event(struct inotify_device *dev)</div><div class='del'>-{</div><div class='del'>-	return list_entry(dev-&gt;events.next, struct inotify_kernel_event, list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inotify_dev_queue_event - add a new event to the given device</div><div class='del'>- *</div><div class='del'>- * Caller must hold dev-&gt;mutex.  Can sleep (calls kernel_event()).</div><div class='del'>- */</div><div class='del'>-static void inotify_dev_queue_event(struct inotify_device *dev,</div><div class='del'>-				    struct inotify_watch *watch, u32 mask,</div><div class='del'>-				    u32 cookie, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct inotify_kernel_event *kevent, *last;</div><div class='del'>-</div><div class='del'>-	/* coalescing: drop this event if it is a dupe of the previous */</div><div class='del'>-	last = inotify_dev_get_event(dev);</div><div class='del'>-	if (last &amp;&amp; last-&gt;event.mask == mask &amp;&amp; last-&gt;event.wd == watch-&gt;wd &amp;&amp;</div><div class='del'>-			last-&gt;event.cookie == cookie) {</div><div class='del'>-		const char *lastname = last-&gt;name;</div><div class='del'>-</div><div class='del'>-		if (!name &amp;&amp; !lastname)</div><div class='del'>-			return;</div><div class='del'>-		if (name &amp;&amp; lastname &amp;&amp; !strcmp(lastname, name))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* the queue overflowed and we already sent the Q_OVERFLOW event */</div><div class='del'>-	if (unlikely(dev-&gt;event_count &gt; dev-&gt;max_events))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* if the queue overflows, we need to notify user space */</div><div class='del'>-	if (unlikely(dev-&gt;event_count == dev-&gt;max_events))</div><div class='del'>-		kevent = kernel_event(-1, IN_Q_OVERFLOW, cookie, NULL);</div><div class='del'>-	else</div><div class='del'>-		kevent = kernel_event(watch-&gt;wd, mask, cookie, name);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!kevent))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* queue the event and wake up anyone waiting */</div><div class='del'>-	dev-&gt;event_count++;</div><div class='del'>-	dev-&gt;queue_size += sizeof(struct inotify_event) + kevent-&gt;event.len;</div><div class='del'>-	list_add_tail(&amp;kevent-&gt;list, &amp;dev-&gt;events);</div><div class='del'>-	wake_up_interruptible(&amp;dev-&gt;wq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * remove_kevent - cleans up and ultimately frees the given kevent</div><div class='del'>- *</div><div class='del'>- * Caller must hold dev-&gt;mutex.</div><div class='del'>- */</div><div class='del'>-static void remove_kevent(struct inotify_device *dev,</div><div class='del'>-			  struct inotify_kernel_event *kevent)</div><div class='del'>-{</div><div class='del'>-	list_del(&amp;kevent-&gt;list);</div><div class='del'>-</div><div class='del'>-	dev-&gt;event_count--;</div><div class='del'>-	dev-&gt;queue_size -= sizeof(struct inotify_event) + kevent-&gt;event.len;</div><div class='del'>-</div><div class='del'>-	kfree(kevent-&gt;name);</div><div class='del'>-	kmem_cache_free(event_cachep, kevent);</div><div class='del'>-}</div><div class='add'>+		struct inotify_handle *ih = watch-&gt;ih;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * inotify_dev_event_dequeue - destroy an event on the given device</div><div class='del'>- *</div><div class='del'>- * Caller must hold dev-&gt;mutex.</div><div class='del'>- */</div><div class='del'>-static void inotify_dev_event_dequeue(struct inotify_device *dev)</div><div class='del'>-{</div><div class='del'>-	if (!list_empty(&amp;dev-&gt;events)) {</div><div class='del'>-		struct inotify_kernel_event *kevent;</div><div class='del'>-		kevent = inotify_dev_get_event(dev);</div><div class='del'>-		remove_kevent(dev, kevent);</div><div class='add'>+		iput(watch-&gt;inode);</div><div class='add'>+		ih-&gt;in_ops-&gt;destroy_watch(watch);</div><div class='add'>+		put_inotify_handle(ih);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(put_inotify_watch);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * inotify_dev_get_wd - returns the next WD for use by the given dev</div><div class='add'>+ * inotify_handle_get_wd - returns the next WD for use by the given handle</div><div class='ctx'>  *</div><div class='del'>- * Callers must hold dev-&gt;mutex.  This function can sleep.</div><div class='add'>+ * Callers must hold ih-&gt;mutex.  This function can sleep.</div><div class='ctx'>  */</div><div class='del'>-static int inotify_dev_get_wd(struct inotify_device *dev,</div><div class='del'>-			      struct inotify_watch *watch)</div><div class='add'>+static int inotify_handle_get_wd(struct inotify_handle *ih,</div><div class='add'>+				 struct inotify_watch *watch)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		if (unlikely(!idr_pre_get(&amp;dev-&gt;idr, GFP_KERNEL)))</div><div class='add'>+		if (unlikely(!idr_pre_get(&amp;ih-&gt;idr, GFP_KERNEL)))</div><div class='ctx'> 			return -ENOSPC;</div><div class='del'>-		ret = idr_get_new_above(&amp;dev-&gt;idr, watch, dev-&gt;last_wd+1, &amp;watch-&gt;wd);</div><div class='add'>+		ret = idr_get_new_above(&amp;ih-&gt;idr, watch, ih-&gt;last_wd+1, &amp;watch-&gt;wd);</div><div class='ctx'> 	} while (ret == -EAGAIN);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	if (likely(!ret))</div><div class='add'>+		ih-&gt;last_wd = watch-&gt;wd;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * find_inode - resolve a user-given path to a specific inode and return a nd</div><div class='del'>- */</div><div class='del'>-static int find_inode(const char __user *dirname, struct nameidata *nd,</div><div class='del'>-		      unsigned flags)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	error = __user_walk(dirname, flags, nd);</div><div class='del'>-	if (error)</div><div class='del'>-		return error;</div><div class='del'>-	/* you can only watch an inode if you have read permissions on it */</div><div class='del'>-	error = vfs_permission(nd, MAY_READ);</div><div class='del'>-	if (error) </div><div class='del'>-		path_release(nd);</div><div class='del'>-	return error;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -422,67 +188,18 @@ static void set_dentry_child_flags(struct inode *inode, int watched)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * create_watch - creates a watch on the given device.</div><div class='del'>- *</div><div class='del'>- * Callers must hold dev-&gt;mutex.  Calls inotify_dev_get_wd() so may sleep.</div><div class='del'>- * Both 'dev' and 'inode' (by way of nameidata) need to be pinned.</div><div class='del'>- */</div><div class='del'>-static struct inotify_watch *create_watch(struct inotify_device *dev,</div><div class='del'>-					  u32 mask, struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct inotify_watch *watch;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;dev-&gt;user-&gt;inotify_watches) &gt;=</div><div class='del'>-			inotify_max_user_watches)</div><div class='del'>-		return ERR_PTR(-ENOSPC);</div><div class='del'>-</div><div class='del'>-	watch = kmem_cache_alloc(watch_cachep, GFP_KERNEL);</div><div class='del'>-	if (unlikely(!watch))</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	ret = inotify_dev_get_wd(dev, watch);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		kmem_cache_free(watch_cachep, watch);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;last_wd = watch-&gt;wd;</div><div class='del'>-	watch-&gt;mask = mask;</div><div class='del'>-	atomic_set(&amp;watch-&gt;count, 0);</div><div class='del'>-	INIT_LIST_HEAD(&amp;watch-&gt;d_list);</div><div class='del'>-	INIT_LIST_HEAD(&amp;watch-&gt;i_list);</div><div class='del'>-</div><div class='del'>-	/* save a reference to device and bump the count to make it official */</div><div class='del'>-	get_inotify_dev(dev);</div><div class='del'>-	watch-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save a reference to the inode and bump the ref count to make it</div><div class='del'>-	 * official.  We hold a reference to nameidata, which makes this safe.</div><div class='del'>-	 */</div><div class='del'>-	watch-&gt;inode = igrab(inode);</div><div class='del'>-</div><div class='del'>-	/* bump our own count, corresponding to our entry in dev-&gt;watches */</div><div class='del'>-	get_inotify_watch(watch);</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;dev-&gt;user-&gt;inotify_watches);</div><div class='del'>-</div><div class='del'>-	return watch;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * inotify_find_dev - find the watch associated with the given inode and dev</div><div class='add'>+ * inotify_find_handle - find the watch associated with the given inode and</div><div class='add'>+ * handle</div><div class='ctx'>  *</div><div class='ctx'>  * Callers must hold inode-&gt;inotify_mutex.</div><div class='ctx'>  */</div><div class='del'>-static struct inotify_watch *inode_find_dev(struct inode *inode,</div><div class='del'>-					    struct inotify_device *dev)</div><div class='add'>+static struct inotify_watch *inode_find_handle(struct inode *inode,</div><div class='add'>+					       struct inotify_handle *ih)</div><div class='ctx'> {</div><div class='ctx'> 	struct inotify_watch *watch;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(watch, &amp;inode-&gt;inotify_watches, i_list) {</div><div class='del'>-		if (watch-&gt;dev == dev)</div><div class='add'>+		if (watch-&gt;ih == ih)</div><div class='ctx'> 			return watch;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -490,40 +207,40 @@ static struct inotify_watch *inode_find_dev(struct inode *inode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * remove_watch_no_event - remove_watch() without the IN_IGNORED event.</div><div class='add'>+ * remove_watch_no_event - remove watch without the IN_IGNORED event.</div><div class='add'>+ *</div><div class='add'>+ * Callers must hold both inode-&gt;inotify_mutex and ih-&gt;mutex.</div><div class='ctx'>  */</div><div class='ctx'> static void remove_watch_no_event(struct inotify_watch *watch,</div><div class='del'>-				  struct inotify_device *dev)</div><div class='add'>+				  struct inotify_handle *ih)</div><div class='ctx'> {</div><div class='ctx'> 	list_del(&amp;watch-&gt;i_list);</div><div class='del'>-	list_del(&amp;watch-&gt;d_list);</div><div class='add'>+	list_del(&amp;watch-&gt;h_list);</div><div class='ctx'> </div><div class='ctx'> 	if (!inotify_inode_watched(watch-&gt;inode))</div><div class='ctx'> 		set_dentry_child_flags(watch-&gt;inode, 0);</div><div class='ctx'> </div><div class='del'>-	atomic_dec(&amp;dev-&gt;user-&gt;inotify_watches);</div><div class='del'>-	idr_remove(&amp;dev-&gt;idr, watch-&gt;wd);</div><div class='del'>-	put_inotify_watch(watch);</div><div class='add'>+	idr_remove(&amp;ih-&gt;idr, watch-&gt;wd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * remove_watch - Remove a watch from both the device and the inode.  Sends</div><div class='del'>- * the IN_IGNORED event to the given device signifying that the inode is no</div><div class='del'>- * longer watched.</div><div class='del'>- *</div><div class='del'>- * Callers must hold both inode-&gt;inotify_mutex and dev-&gt;mutex.  We drop a</div><div class='del'>- * reference to the inode before returning.</div><div class='add'>+/**</div><div class='add'>+ * inotify_remove_watch_locked - Remove a watch from both the handle and the</div><div class='add'>+ * inode.  Sends the IN_IGNORED event signifying that the inode is no longer</div><div class='add'>+ * watched.  May be invoked from a caller's event handler.</div><div class='add'>+ * @ih: inotify handle associated with watch</div><div class='add'>+ * @watch: watch to remove</div><div class='ctx'>  *</div><div class='del'>- * The inode is not iput() so as to remain atomic.  If the inode needs to be</div><div class='del'>- * iput(), the call returns one.  Otherwise, it returns zero.</div><div class='add'>+ * Callers must hold both inode-&gt;inotify_mutex and ih-&gt;mutex.</div><div class='ctx'>  */</div><div class='del'>-static void remove_watch(struct inotify_watch *watch,struct inotify_device *dev)</div><div class='add'>+void inotify_remove_watch_locked(struct inotify_handle *ih,</div><div class='add'>+				 struct inotify_watch *watch)</div><div class='ctx'> {</div><div class='del'>-	inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);</div><div class='del'>-	remove_watch_no_event(watch, dev);</div><div class='add'>+	remove_watch_no_event(watch, ih);</div><div class='add'>+	ih-&gt;in_ops-&gt;handle_event(watch, watch-&gt;wd, IN_IGNORED, 0, NULL, NULL);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_remove_watch_locked);</div><div class='ctx'> </div><div class='del'>-/* Kernel API */</div><div class='add'>+/* Kernel API for producing events */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * inotify_d_instantiate - instantiate dcache entry for inode</div><div class='hunk'>@@ -563,9 +280,10 @@ void inotify_d_move(struct dentry *entry)</div><div class='ctx'>  * @mask: event mask describing this event</div><div class='ctx'>  * @cookie: cookie for synchronization, or zero</div><div class='ctx'>  * @name: filename, if any</div><div class='add'>+ * @n_inode: inode associated with name</div><div class='ctx'>  */</div><div class='ctx'> void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,</div><div class='del'>-			       const char *name)</div><div class='add'>+			       const char *name, struct inode *n_inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct inotify_watch *watch, *next;</div><div class='ctx'> </div><div class='hunk'>@@ -576,14 +294,13 @@ void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,</div><div class='ctx'> 	list_for_each_entry_safe(watch, next, &amp;inode-&gt;inotify_watches, i_list) {</div><div class='ctx'> 		u32 watch_mask = watch-&gt;mask;</div><div class='ctx'> 		if (watch_mask &amp; mask) {</div><div class='del'>-			struct inotify_device *dev = watch-&gt;dev;</div><div class='del'>-			get_inotify_watch(watch);</div><div class='del'>-			mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-			inotify_dev_queue_event(dev, watch, mask, cookie, name);</div><div class='add'>+			struct inotify_handle *ih= watch-&gt;ih;</div><div class='add'>+			mutex_lock(&amp;ih-&gt;mutex);</div><div class='ctx'> 			if (watch_mask &amp; IN_ONESHOT)</div><div class='del'>-				remove_watch_no_event(watch, dev);</div><div class='del'>-			mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-			put_inotify_watch(watch);</div><div class='add'>+				remove_watch_no_event(watch, ih);</div><div class='add'>+			ih-&gt;in_ops-&gt;handle_event(watch, watch-&gt;wd, mask, cookie,</div><div class='add'>+						 name, n_inode);</div><div class='add'>+			mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='hunk'>@@ -613,7 +330,8 @@ void inotify_dentry_parent_queue_event(struct dentry *dentry, u32 mask,</div><div class='ctx'> 	if (inotify_inode_watched(inode)) {</div><div class='ctx'> 		dget(parent);</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='del'>-		inotify_inode_queue_event(inode, mask, cookie, name);</div><div class='add'>+		inotify_inode_queue_event(inode, mask, cookie, name,</div><div class='add'>+					  dentry-&gt;d_inode);</div><div class='ctx'> 		dput(parent);</div><div class='ctx'> 	} else</div><div class='ctx'> 		spin_unlock(&amp;dentry-&gt;d_lock);</div><div class='hunk'>@@ -665,7 +383,7 @@ void inotify_unmount_inodes(struct list_head *list)</div><div class='ctx'> </div><div class='ctx'> 		need_iput_tmp = need_iput;</div><div class='ctx'> 		need_iput = NULL;</div><div class='del'>-		/* In case the remove_watch() drops a reference. */</div><div class='add'>+		/* In case inotify_remove_watch_locked() drops a reference. */</div><div class='ctx'> 		if (inode != need_iput_tmp)</div><div class='ctx'> 			__iget(inode);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -694,11 +412,12 @@ void inotify_unmount_inodes(struct list_head *list)</div><div class='ctx'> 		mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='ctx'> 		watches = &amp;inode-&gt;inotify_watches;</div><div class='ctx'> 		list_for_each_entry_safe(watch, next_w, watches, i_list) {</div><div class='del'>-			struct inotify_device *dev = watch-&gt;dev;</div><div class='del'>-			mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-			inotify_dev_queue_event(dev, watch, IN_UNMOUNT,0,NULL);</div><div class='del'>-			remove_watch(watch, dev);</div><div class='del'>-			mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+			struct inotify_handle *ih= watch-&gt;ih;</div><div class='add'>+			mutex_lock(&amp;ih-&gt;mutex);</div><div class='add'>+			ih-&gt;in_ops-&gt;handle_event(watch, watch-&gt;wd, IN_UNMOUNT, 0,</div><div class='add'>+						 NULL, NULL);</div><div class='add'>+			inotify_remove_watch_locked(ih, watch);</div><div class='add'>+			mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 		}</div><div class='ctx'> 		mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='ctx'> 		iput(inode);		</div><div class='hunk'>@@ -718,432 +437,292 @@ void inotify_inode_is_dead(struct inode *inode)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='ctx'> 	list_for_each_entry_safe(watch, next, &amp;inode-&gt;inotify_watches, i_list) {</div><div class='del'>-		struct inotify_device *dev = watch-&gt;dev;</div><div class='del'>-		mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-		remove_watch(watch, dev);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+		struct inotify_handle *ih = watch-&gt;ih;</div><div class='add'>+		mutex_lock(&amp;ih-&gt;mutex);</div><div class='add'>+		inotify_remove_watch_locked(ih, watch);</div><div class='add'>+		mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(inotify_inode_is_dead);</div><div class='ctx'> </div><div class='del'>-/* Device Interface */</div><div class='add'>+/* Kernel Consumer API */</div><div class='ctx'> </div><div class='del'>-static unsigned int inotify_poll(struct file *file, poll_table *wait)</div><div class='add'>+/**</div><div class='add'>+ * inotify_init - allocate and initialize an inotify instance</div><div class='add'>+ * @ops: caller's inotify operations</div><div class='add'>+ */</div><div class='add'>+struct inotify_handle *inotify_init(const struct inotify_operations *ops)</div><div class='ctx'> {</div><div class='del'>-	struct inotify_device *dev = file-&gt;private_data;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct inotify_handle *ih;</div><div class='ctx'> </div><div class='del'>-	poll_wait(file, &amp;dev-&gt;wq, wait);</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	if (!list_empty(&amp;dev-&gt;events))</div><div class='del'>-		ret = POLLIN | POLLRDNORM;</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+	ih = kmalloc(sizeof(struct inotify_handle), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!ih))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	idr_init(&amp;ih-&gt;idr);</div><div class='add'>+	INIT_LIST_HEAD(&amp;ih-&gt;watches);</div><div class='add'>+	mutex_init(&amp;ih-&gt;mutex);</div><div class='add'>+	ih-&gt;last_wd = 0;</div><div class='add'>+	ih-&gt;in_ops = ops;</div><div class='add'>+	atomic_set(&amp;ih-&gt;count, 0);</div><div class='add'>+	get_inotify_handle(ih);</div><div class='add'>+</div><div class='add'>+	return ih;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_init);</div><div class='ctx'> </div><div class='del'>-static ssize_t inotify_read(struct file *file, char __user *buf,</div><div class='del'>-			    size_t count, loff_t *pos)</div><div class='add'>+/**</div><div class='add'>+ * inotify_init_watch - initialize an inotify watch</div><div class='add'>+ * @watch: watch to initialize</div><div class='add'>+ */</div><div class='add'>+void inotify_init_watch(struct inotify_watch *watch)</div><div class='ctx'> {</div><div class='del'>-	size_t event_size = sizeof (struct inotify_event);</div><div class='del'>-	struct inotify_device *dev;</div><div class='del'>-	char __user *start;</div><div class='del'>-	int ret;</div><div class='del'>-	DEFINE_WAIT(wait);</div><div class='del'>-</div><div class='del'>-	start = buf;</div><div class='del'>-	dev = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		int events;</div><div class='del'>-</div><div class='del'>-		prepare_to_wait(&amp;dev-&gt;wq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-		events = !list_empty(&amp;dev-&gt;events);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-		if (events) {</div><div class='del'>-			ret = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-			ret = -EAGAIN;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			ret = -EINTR;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	finish_wait(&amp;dev-&gt;wq, &amp;wait);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	while (1) {</div><div class='del'>-		struct inotify_kernel_event *kevent;</div><div class='del'>-</div><div class='del'>-		ret = buf - start;</div><div class='del'>-		if (list_empty(&amp;dev-&gt;events))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		kevent = inotify_dev_get_event(dev);</div><div class='del'>-		if (event_size + kevent-&gt;event.len &gt; count)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (copy_to_user(buf, &amp;kevent-&gt;event, event_size)) {</div><div class='del'>-			ret = -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		buf += event_size;</div><div class='del'>-		count -= event_size;</div><div class='del'>-</div><div class='del'>-		if (kevent-&gt;name) {</div><div class='del'>-			if (copy_to_user(buf, kevent-&gt;name, kevent-&gt;event.len)){</div><div class='del'>-				ret = -EFAULT;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			buf += kevent-&gt;event.len;</div><div class='del'>-			count -= kevent-&gt;event.len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		remove_kevent(dev, kevent);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	INIT_LIST_HEAD(&amp;watch-&gt;h_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;watch-&gt;i_list);</div><div class='add'>+	atomic_set(&amp;watch-&gt;count, 0);</div><div class='add'>+	get_inotify_watch(watch); /* initial get */</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_init_watch);</div><div class='ctx'> </div><div class='del'>-static int inotify_release(struct inode *ignored, struct file *file)</div><div class='add'>+/**</div><div class='add'>+ * inotify_destroy - clean up and destroy an inotify instance</div><div class='add'>+ * @ih: inotify handle</div><div class='add'>+ */</div><div class='add'>+void inotify_destroy(struct inotify_handle *ih)</div><div class='ctx'> {</div><div class='del'>-	struct inotify_device *dev = file-&gt;private_data;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * Destroy all of the watches on this device.  Unfortunately, not very</div><div class='add'>+	 * Destroy all of the watches for this handle. Unfortunately, not very</div><div class='ctx'> 	 * pretty.  We cannot do a simple iteration over the list, because we</div><div class='ctx'> 	 * do not know the inode until we iterate to the watch.  But we need to</div><div class='del'>-	 * hold inode-&gt;inotify_mutex before dev-&gt;mutex.  The following works.</div><div class='add'>+	 * hold inode-&gt;inotify_mutex before ih-&gt;mutex.  The following works.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		struct inotify_watch *watch;</div><div class='ctx'> 		struct list_head *watches;</div><div class='ctx'> 		struct inode *inode;</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-		watches = &amp;dev-&gt;watches;</div><div class='add'>+		mutex_lock(&amp;ih-&gt;mutex);</div><div class='add'>+		watches = &amp;ih-&gt;watches;</div><div class='ctx'> 		if (list_empty(watches)) {</div><div class='del'>-			mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+			mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		watch = list_entry(watches-&gt;next, struct inotify_watch, d_list);</div><div class='add'>+		watch = list_entry(watches-&gt;next, struct inotify_watch, h_list);</div><div class='ctx'> 		get_inotify_watch(watch);</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+		mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 		inode = watch-&gt;inode;</div><div class='ctx'> 		mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='del'>-		mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+		mutex_lock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 		/* make sure we didn't race with another list removal */</div><div class='del'>-		if (likely(idr_find(&amp;dev-&gt;idr, watch-&gt;wd)))</div><div class='del'>-			remove_watch_no_event(watch, dev);</div><div class='add'>+		if (likely(idr_find(&amp;ih-&gt;idr, watch-&gt;wd))) {</div><div class='add'>+			remove_watch_no_event(watch, ih);</div><div class='add'>+			put_inotify_watch(watch);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+		mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 		mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='ctx'> 		put_inotify_watch(watch);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* destroy all of the events on this device */</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	while (!list_empty(&amp;dev-&gt;events))</div><div class='del'>-		inotify_dev_event_dequeue(dev);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* free this device: the put matching the get in inotify_init() */</div><div class='del'>-	put_inotify_dev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	/* free this handle: the put matching the get in inotify_init() */</div><div class='add'>+	put_inotify_handle(ih);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_destroy);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * inotify_ignore - remove a given wd from this inotify instance.</div><div class='add'>+/**</div><div class='add'>+ * inotify_find_watch - find an existing watch for an (ih,inode) pair</div><div class='add'>+ * @ih: inotify handle</div><div class='add'>+ * @inode: inode to watch</div><div class='add'>+ * @watchp: pointer to existing inotify_watch</div><div class='ctx'>  *</div><div class='del'>- * Can sleep.</div><div class='add'>+ * Caller must pin given inode (via nameidata).</div><div class='ctx'>  */</div><div class='del'>-static int inotify_ignore(struct inotify_device *dev, s32 wd)</div><div class='add'>+s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode,</div><div class='add'>+		       struct inotify_watch **watchp)</div><div class='ctx'> {</div><div class='del'>-	struct inotify_watch *watch;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-	watch = idr_find(&amp;dev-&gt;idr, wd);</div><div class='del'>-	if (unlikely(!watch)) {</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;mutex);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	get_inotify_watch(watch);</div><div class='del'>-	inode = watch-&gt;inode;</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+	struct inotify_watch *old;</div><div class='add'>+	int ret = -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='add'>+	mutex_lock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	/* make sure that we did not race */</div><div class='del'>-	if (likely(idr_find(&amp;dev-&gt;idr, wd) == watch))</div><div class='del'>-		remove_watch(watch, dev);</div><div class='add'>+	old = inode_find_handle(inode, ih);</div><div class='add'>+	if (unlikely(old)) {</div><div class='add'>+		get_inotify_watch(old); /* caller must put watch */</div><div class='add'>+		*watchp = old;</div><div class='add'>+		ret = old-&gt;wd;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='del'>-	put_inotify_watch(watch);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_find_watch);</div><div class='ctx'> </div><div class='del'>-static long inotify_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-			  unsigned long arg)</div><div class='add'>+/**</div><div class='add'>+ * inotify_find_update_watch - find and update the mask of an existing watch</div><div class='add'>+ * @ih: inotify handle</div><div class='add'>+ * @inode: inode's watch to update</div><div class='add'>+ * @mask: mask of events to watch</div><div class='add'>+ *</div><div class='add'>+ * Caller must pin given inode (via nameidata).</div><div class='add'>+ */</div><div class='add'>+s32 inotify_find_update_watch(struct inotify_handle *ih, struct inode *inode,</div><div class='add'>+			      u32 mask)</div><div class='ctx'> {</div><div class='del'>-	struct inotify_device *dev;</div><div class='del'>-	void __user *p;</div><div class='del'>-	int ret = -ENOTTY;</div><div class='del'>-</div><div class='del'>-	dev = file-&gt;private_data;</div><div class='del'>-	p = (void __user *) arg;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case FIONREAD:</div><div class='del'>-		ret = put_user(dev-&gt;queue_size, (int __user *) p);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+	struct inotify_watch *old;</div><div class='add'>+	int mask_add = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-static const struct file_operations inotify_fops = {</div><div class='del'>-	.poll           = inotify_poll,</div><div class='del'>-	.read           = inotify_read,</div><div class='del'>-	.release        = inotify_release,</div><div class='del'>-	.unlocked_ioctl = inotify_ioctl,</div><div class='del'>-	.compat_ioctl	= inotify_ioctl,</div><div class='del'>-};</div><div class='add'>+	if (mask &amp; IN_MASK_ADD)</div><div class='add'>+		mask_add = 1;</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_inotify_init(void)</div><div class='del'>-{</div><div class='del'>-	struct inotify_device *dev;</div><div class='del'>-	struct user_struct *user;</div><div class='del'>-	struct file *filp;	</div><div class='del'>-	int fd, ret;</div><div class='del'>-</div><div class='del'>-	fd = get_unused_fd();</div><div class='del'>-	if (fd &lt; 0)</div><div class='del'>-		return fd;</div><div class='del'>-</div><div class='del'>-	filp = get_empty_filp();</div><div class='del'>-	if (!filp) {</div><div class='del'>-		ret = -ENFILE;</div><div class='del'>-		goto out_put_fd;</div><div class='del'>-	}</div><div class='add'>+	/* don't allow invalid bits: we don't want flags set */</div><div class='add'>+	mask &amp;= IN_ALL_EVENTS | IN_ONESHOT;</div><div class='add'>+	if (unlikely(!mask))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	user = get_uid(current-&gt;user);</div><div class='del'>-	if (unlikely(atomic_read(&amp;user-&gt;inotify_devs) &gt;=</div><div class='del'>-			inotify_max_user_instances)) {</div><div class='del'>-		ret = -EMFILE;</div><div class='del'>-		goto out_free_uid;</div><div class='del'>-	}</div><div class='add'>+	mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='add'>+	mutex_lock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);</div><div class='del'>-	if (unlikely(!dev)) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_free_uid;</div><div class='add'>+	/*</div><div class='add'>+	 * Handle the case of re-adding a watch on an (inode,ih) pair that we</div><div class='add'>+	 * are already watching.  We just update the mask and return its wd.</div><div class='add'>+	 */</div><div class='add'>+	old = inode_find_handle(inode, ih);</div><div class='add'>+	if (unlikely(!old)) {</div><div class='add'>+		ret = -ENOENT;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	filp-&gt;f_op = &amp;inotify_fops;</div><div class='del'>-	filp-&gt;f_vfsmnt = mntget(inotify_mnt);</div><div class='del'>-	filp-&gt;f_dentry = dget(inotify_mnt-&gt;mnt_root);</div><div class='del'>-	filp-&gt;f_mapping = filp-&gt;f_dentry-&gt;d_inode-&gt;i_mapping;</div><div class='del'>-	filp-&gt;f_mode = FMODE_READ;</div><div class='del'>-	filp-&gt;f_flags = O_RDONLY;</div><div class='del'>-	filp-&gt;private_data = dev;</div><div class='del'>-</div><div class='del'>-	idr_init(&amp;dev-&gt;idr);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;events);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dev-&gt;watches);</div><div class='del'>-	init_waitqueue_head(&amp;dev-&gt;wq);</div><div class='del'>-	mutex_init(&amp;dev-&gt;mutex);</div><div class='del'>-	dev-&gt;event_count = 0;</div><div class='del'>-	dev-&gt;queue_size = 0;</div><div class='del'>-	dev-&gt;max_events = inotify_max_queued_events;</div><div class='del'>-	dev-&gt;user = user;</div><div class='del'>-	dev-&gt;last_wd = 0;</div><div class='del'>-	atomic_set(&amp;dev-&gt;count, 0);</div><div class='del'>-</div><div class='del'>-	get_inotify_dev(dev);</div><div class='del'>-	atomic_inc(&amp;user-&gt;inotify_devs);</div><div class='del'>-	fd_install(fd, filp);</div><div class='del'>-</div><div class='del'>-	return fd;</div><div class='del'>-out_free_uid:</div><div class='del'>-	free_uid(user);</div><div class='del'>-	put_filp(filp);</div><div class='del'>-out_put_fd:</div><div class='del'>-	put_unused_fd(fd);</div><div class='add'>+	if (mask_add)</div><div class='add'>+		old-&gt;mask |= mask;</div><div class='add'>+	else</div><div class='add'>+		old-&gt;mask = mask;</div><div class='add'>+	ret = old-&gt;wd;</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ih-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_find_update_watch);</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)</div><div class='add'>+/**</div><div class='add'>+ * inotify_add_watch - add a watch to an inotify instance</div><div class='add'>+ * @ih: inotify handle</div><div class='add'>+ * @watch: caller allocated watch structure</div><div class='add'>+ * @inode: inode to watch</div><div class='add'>+ * @mask: mask of events to watch</div><div class='add'>+ *</div><div class='add'>+ * Caller must pin given inode (via nameidata).</div><div class='add'>+ * Caller must ensure it only calls inotify_add_watch() once per watch.</div><div class='add'>+ * Calls inotify_handle_get_wd() so may sleep.</div><div class='add'>+ */</div><div class='add'>+s32 inotify_add_watch(struct inotify_handle *ih, struct inotify_watch *watch,</div><div class='add'>+		      struct inode *inode, u32 mask)</div><div class='ctx'> {</div><div class='del'>-	struct inotify_watch *watch, *old;</div><div class='del'>-	struct inode *inode;</div><div class='del'>-	struct inotify_device *dev;</div><div class='del'>-	struct nameidata nd;</div><div class='del'>-	struct file *filp;</div><div class='del'>-	int ret, fput_needed;</div><div class='del'>-	int mask_add = 0;</div><div class='del'>-	unsigned flags = 0;</div><div class='del'>-</div><div class='del'>-	filp = fget_light(fd, &amp;fput_needed);</div><div class='del'>-	if (unlikely(!filp))</div><div class='del'>-		return -EBADF;</div><div class='del'>-</div><div class='del'>-	/* verify that this is indeed an inotify instance */</div><div class='del'>-	if (unlikely(filp-&gt;f_op != &amp;inotify_fops)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto fput_and_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(mask &amp; IN_DONT_FOLLOW))</div><div class='del'>-		flags |= LOOKUP_FOLLOW;</div><div class='del'>-	if (mask &amp; IN_ONLYDIR)</div><div class='del'>-		flags |= LOOKUP_DIRECTORY;</div><div class='del'>-</div><div class='del'>-	ret = find_inode(path, &amp;nd, flags);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		goto fput_and_out;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	/* inode held in place by reference to nd; dev by fget on fd */</div><div class='del'>-	inode = nd.dentry-&gt;d_inode;</div><div class='del'>-	dev = filp-&gt;private_data;</div><div class='add'>+	/* don't allow invalid bits: we don't want flags set */</div><div class='add'>+	mask &amp;= IN_ALL_EVENTS | IN_ONESHOT;</div><div class='add'>+	if (unlikely(!mask))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	watch-&gt;mask = mask;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='del'>-	mutex_lock(&amp;dev-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (mask &amp; IN_MASK_ADD)</div><div class='del'>-		mask_add = 1;</div><div class='add'>+	mutex_lock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	/* don't let user-space set invalid bits: we don't want flags set */</div><div class='del'>-	mask &amp;= IN_ALL_EVENTS | IN_ONESHOT;</div><div class='del'>-	if (unlikely(!mask)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	/* Initialize a new watch */</div><div class='add'>+	ret = inotify_handle_get_wd(ih, watch);</div><div class='add'>+	if (unlikely(ret))</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='add'>+	ret = watch-&gt;wd;</div><div class='add'>+</div><div class='add'>+	/* save a reference to handle and bump the count to make it official */</div><div class='add'>+	get_inotify_handle(ih);</div><div class='add'>+	watch-&gt;ih = ih;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Handle the case of re-adding a watch on an (inode,dev) pair that we</div><div class='del'>-	 * are already watching.  We just update the mask and return its wd.</div><div class='add'>+	 * Save a reference to the inode and bump the ref count to make it</div><div class='add'>+	 * official.  We hold a reference to nameidata, which makes this safe.</div><div class='ctx'> 	 */</div><div class='del'>-	old = inode_find_dev(inode, dev);</div><div class='del'>-	if (unlikely(old)) {</div><div class='del'>-		if (mask_add)</div><div class='del'>-			old-&gt;mask |= mask;</div><div class='del'>-		else</div><div class='del'>-			old-&gt;mask = mask;</div><div class='del'>-		ret = old-&gt;wd;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	watch = create_watch(dev, mask, inode);</div><div class='del'>-	if (unlikely(IS_ERR(watch))) {</div><div class='del'>-		ret = PTR_ERR(watch);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	watch-&gt;inode = igrab(inode);</div><div class='ctx'> </div><div class='ctx'> 	if (!inotify_inode_watched(inode))</div><div class='ctx'> 		set_dentry_child_flags(inode, 1);</div><div class='ctx'> </div><div class='del'>-	/* Add the watch to the device's and the inode's list */</div><div class='del'>-	list_add(&amp;watch-&gt;d_list, &amp;dev-&gt;watches);</div><div class='add'>+	/* Add the watch to the handle's and the inode's list */</div><div class='add'>+	list_add(&amp;watch-&gt;h_list, &amp;ih-&gt;watches);</div><div class='ctx'> 	list_add(&amp;watch-&gt;i_list, &amp;inode-&gt;inotify_watches);</div><div class='del'>-	ret = watch-&gt;wd;</div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> 	mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='del'>-	path_release(&amp;nd);</div><div class='del'>-fput_and_out:</div><div class='del'>-	fput_light(filp, fput_needed);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_add_watch);</div><div class='ctx'> </div><div class='del'>-asmlinkage long sys_inotify_rm_watch(int fd, u32 wd)</div><div class='add'>+/**</div><div class='add'>+ * inotify_rm_wd - remove a watch from an inotify instance</div><div class='add'>+ * @ih: inotify handle</div><div class='add'>+ * @wd: watch descriptor to remove</div><div class='add'>+ *</div><div class='add'>+ * Can sleep.</div><div class='add'>+ */</div><div class='add'>+int inotify_rm_wd(struct inotify_handle *ih, u32 wd)</div><div class='ctx'> {</div><div class='del'>-	struct file *filp;</div><div class='del'>-	struct inotify_device *dev;</div><div class='del'>-	int ret, fput_needed;</div><div class='del'>-</div><div class='del'>-	filp = fget_light(fd, &amp;fput_needed);</div><div class='del'>-	if (unlikely(!filp))</div><div class='del'>-		return -EBADF;</div><div class='add'>+	struct inotify_watch *watch;</div><div class='add'>+	struct inode *inode;</div><div class='ctx'> </div><div class='del'>-	/* verify that this is indeed an inotify instance */</div><div class='del'>-	if (unlikely(filp-&gt;f_op != &amp;inotify_fops)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+	mutex_lock(&amp;ih-&gt;mutex);</div><div class='add'>+	watch = idr_find(&amp;ih-&gt;idr, wd);</div><div class='add'>+	if (unlikely(!watch)) {</div><div class='add'>+		mutex_unlock(&amp;ih-&gt;mutex);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+	get_inotify_watch(watch);</div><div class='add'>+	inode = watch-&gt;inode;</div><div class='add'>+	mutex_unlock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-	dev = filp-&gt;private_data;</div><div class='del'>-	ret = inotify_ignore(dev, wd);</div><div class='add'>+	mutex_lock(&amp;inode-&gt;inotify_mutex);</div><div class='add'>+	mutex_lock(&amp;ih-&gt;mutex);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	fput_light(filp, fput_needed);</div><div class='del'>-	return ret;</div><div class='add'>+	/* make sure that we did not race */</div><div class='add'>+	if (likely(idr_find(&amp;ih-&gt;idr, wd) == watch))</div><div class='add'>+		inotify_remove_watch_locked(ih, watch);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ih-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;inode-&gt;inotify_mutex);</div><div class='add'>+	put_inotify_watch(watch);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_rm_wd);</div><div class='ctx'> </div><div class='del'>-static struct super_block *</div><div class='del'>-inotify_get_sb(struct file_system_type *fs_type, int flags,</div><div class='del'>-	       const char *dev_name, void *data)</div><div class='add'>+/**</div><div class='add'>+ * inotify_rm_watch - remove a watch from an inotify instance</div><div class='add'>+ * @ih: inotify handle</div><div class='add'>+ * @watch: watch to remove</div><div class='add'>+ *</div><div class='add'>+ * Can sleep.</div><div class='add'>+ */</div><div class='add'>+int inotify_rm_watch(struct inotify_handle *ih,</div><div class='add'>+		     struct inotify_watch *watch)</div><div class='ctx'> {</div><div class='del'>-    return get_sb_pseudo(fs_type, "inotify", NULL, 0xBAD1DEA);</div><div class='add'>+	return inotify_rm_wd(ih, watch-&gt;wd);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static struct file_system_type inotify_fs_type = {</div><div class='del'>-    .name           = "inotifyfs",</div><div class='del'>-    .get_sb         = inotify_get_sb,</div><div class='del'>-    .kill_sb        = kill_anon_super,</div><div class='del'>-};</div><div class='add'>+EXPORT_SYMBOL_GPL(inotify_rm_watch);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * inotify_setup - Our initialization function.  Note that we cannnot return</div><div class='del'>- * error because we have compiled-in VFS hooks.  So an (unlikely) failure here</div><div class='del'>- * must result in panic().</div><div class='add'>+ * inotify_setup - core initialization function</div><div class='ctx'>  */</div><div class='ctx'> static int __init inotify_setup(void)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = register_filesystem(&amp;inotify_fs_type);</div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		panic("inotify: register_filesystem returned %d!\n", ret);</div><div class='del'>-</div><div class='del'>-	inotify_mnt = kern_mount(&amp;inotify_fs_type);</div><div class='del'>-	if (IS_ERR(inotify_mnt))</div><div class='del'>-		panic("inotify: kern_mount ret %ld!\n", PTR_ERR(inotify_mnt));</div><div class='del'>-</div><div class='del'>-	inotify_max_queued_events = 16384;</div><div class='del'>-	inotify_max_user_instances = 128;</div><div class='del'>-	inotify_max_user_watches = 8192;</div><div class='del'>-</div><div class='ctx'> 	atomic_set(&amp;inotify_cookie, 0);</div><div class='ctx'> </div><div class='del'>-	watch_cachep = kmem_cache_create("inotify_watch_cache",</div><div class='del'>-					 sizeof(struct inotify_watch),</div><div class='del'>-					 0, SLAB_PANIC, NULL, NULL);</div><div class='del'>-	event_cachep = kmem_cache_create("inotify_event_cache",</div><div class='del'>-					 sizeof(struct inotify_kernel_event),</div><div class='del'>-					 0, SLAB_PANIC, NULL, NULL);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/inotify_user.c b/fs/inotify_user.c<br/>new file mode 100644<br/>index 000000000000..f2386442adee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/inotify_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/inotify_user.c</a></div><div class='hunk'>@@ -0,0 +1,719 @@</div><div class='add'>+/*</div><div class='add'>+ * fs/inotify_user.c - inotify support for userspace</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ *	John McCutchan	&lt;ttb@tentacle.dhs.org&gt;</div><div class='add'>+ *	Robert Love	&lt;rml@novell.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 John McCutchan</div><div class='add'>+ * Copyright 2006 Hewlett-Packard Development Company, L.P.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2, or (at your option) any</div><div class='add'>+ * later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/inotify.h&gt;</div><div class='add'>+#include &lt;linux/syscalls.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/ioctls.h&gt;</div><div class='add'>+</div><div class='add'>+static kmem_cache_t *watch_cachep __read_mostly;</div><div class='add'>+static kmem_cache_t *event_cachep __read_mostly;</div><div class='add'>+</div><div class='add'>+static struct vfsmount *inotify_mnt __read_mostly;</div><div class='add'>+</div><div class='add'>+/* these are configurable via /proc/sys/fs/inotify/ */</div><div class='add'>+int inotify_max_user_instances __read_mostly;</div><div class='add'>+int inotify_max_user_watches __read_mostly;</div><div class='add'>+int inotify_max_queued_events __read_mostly;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lock ordering:</div><div class='add'>+ *</div><div class='add'>+ * inotify_dev-&gt;up_mutex (ensures we don't re-add the same watch)</div><div class='add'>+ * 	inode-&gt;inotify_mutex (protects inode's watch list)</div><div class='add'>+ * 		inotify_handle-&gt;mutex (protects inotify_handle's watch list)</div><div class='add'>+ * 			inotify_dev-&gt;ev_mutex (protects device's event queue)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lifetimes of the main data structures:</div><div class='add'>+ *</div><div class='add'>+ * inotify_device: Lifetime is managed by reference count, from</div><div class='add'>+ * sys_inotify_init() until release.  Additional references can bump the count</div><div class='add'>+ * via get_inotify_dev() and drop the count via put_inotify_dev().</div><div class='add'>+ *</div><div class='add'>+ * inotify_user_watch: Lifetime is from create_watch() to the receipt of an</div><div class='add'>+ * IN_IGNORED event from inotify, or when using IN_ONESHOT, to receipt of the</div><div class='add'>+ * first event, or to inotify_destroy().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct inotify_device - represents an inotify instance</div><div class='add'>+ *</div><div class='add'>+ * This structure is protected by the mutex 'mutex'.</div><div class='add'>+ */</div><div class='add'>+struct inotify_device {</div><div class='add'>+	wait_queue_head_t 	wq;		/* wait queue for i/o */</div><div class='add'>+	struct mutex		ev_mutex;	/* protects event queue */</div><div class='add'>+	struct mutex		up_mutex;	/* synchronizes watch updates */</div><div class='add'>+	struct list_head 	events;		/* list of queued events */</div><div class='add'>+	atomic_t		count;		/* reference count */</div><div class='add'>+	struct user_struct	*user;		/* user who opened this dev */</div><div class='add'>+	struct inotify_handle	*ih;		/* inotify handle */</div><div class='add'>+	unsigned int		queue_size;	/* size of the queue (bytes) */</div><div class='add'>+	unsigned int		event_count;	/* number of pending events */</div><div class='add'>+	unsigned int		max_events;	/* maximum number of events */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct inotify_kernel_event - An inotify event, originating from a watch and</div><div class='add'>+ * queued for user-space.  A list of these is attached to each instance of the</div><div class='add'>+ * device.  In read(), this list is walked and all events that can fit in the</div><div class='add'>+ * buffer are returned.</div><div class='add'>+ *</div><div class='add'>+ * Protected by dev-&gt;ev_mutex of the device in which we are queued.</div><div class='add'>+ */</div><div class='add'>+struct inotify_kernel_event {</div><div class='add'>+	struct inotify_event	event;	/* the user-space event */</div><div class='add'>+	struct list_head        list;	/* entry in inotify_device's list */</div><div class='add'>+	char			*name;	/* filename, if any */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct inotify_user_watch - our version of an inotify_watch, we add</div><div class='add'>+ * a reference to the associated inotify_device.</div><div class='add'>+ */</div><div class='add'>+struct inotify_user_watch {</div><div class='add'>+	struct inotify_device	*dev;	/* associated device */</div><div class='add'>+	struct inotify_watch	wdata;	/* inotify watch data */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SYSCTL</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sysctl.h&gt;</div><div class='add'>+</div><div class='add'>+static int zero;</div><div class='add'>+</div><div class='add'>+ctl_table inotify_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.ctl_name	= INOTIFY_MAX_USER_INSTANCES,</div><div class='add'>+		.procname	= "max_user_instances",</div><div class='add'>+		.data		= &amp;inotify_max_user_instances,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= &amp;proc_dointvec_minmax,</div><div class='add'>+		.strategy	= &amp;sysctl_intvec,</div><div class='add'>+		.extra1		= &amp;zero,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ctl_name	= INOTIFY_MAX_USER_WATCHES,</div><div class='add'>+		.procname	= "max_user_watches",</div><div class='add'>+		.data		= &amp;inotify_max_user_watches,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= &amp;proc_dointvec_minmax,</div><div class='add'>+		.strategy	= &amp;sysctl_intvec,</div><div class='add'>+		.extra1		= &amp;zero,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.ctl_name	= INOTIFY_MAX_QUEUED_EVENTS,</div><div class='add'>+		.procname	= "max_queued_events",</div><div class='add'>+		.data		= &amp;inotify_max_queued_events,</div><div class='add'>+		.maxlen		= sizeof(int),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= &amp;proc_dointvec_minmax,</div><div class='add'>+		.strategy	= &amp;sysctl_intvec,</div><div class='add'>+		.extra1		= &amp;zero</div><div class='add'>+	},</div><div class='add'>+	{ .ctl_name = 0 }</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_SYSCTL */</div><div class='add'>+</div><div class='add'>+static inline void get_inotify_dev(struct inotify_device *dev)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;dev-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void put_inotify_dev(struct inotify_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_and_test(&amp;dev-&gt;count)) {</div><div class='add'>+		atomic_dec(&amp;dev-&gt;user-&gt;inotify_devs);</div><div class='add'>+		free_uid(dev-&gt;user);</div><div class='add'>+		kfree(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * free_inotify_user_watch - cleans up the watch and its references</div><div class='add'>+ */</div><div class='add'>+static void free_inotify_user_watch(struct inotify_watch *w)</div><div class='add'>+{</div><div class='add'>+	struct inotify_user_watch *watch;</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+</div><div class='add'>+	watch = container_of(w, struct inotify_user_watch, wdata);</div><div class='add'>+	dev = watch-&gt;dev;</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;dev-&gt;user-&gt;inotify_watches);</div><div class='add'>+	put_inotify_dev(dev);</div><div class='add'>+	kmem_cache_free(watch_cachep, watch);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kernel_event - create a new kernel event with the given parameters</div><div class='add'>+ *</div><div class='add'>+ * This function can sleep.</div><div class='add'>+ */</div><div class='add'>+static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie,</div><div class='add'>+						  const char *name)</div><div class='add'>+{</div><div class='add'>+	struct inotify_kernel_event *kevent;</div><div class='add'>+</div><div class='add'>+	kevent = kmem_cache_alloc(event_cachep, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!kevent))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* we hand this out to user-space, so zero it just in case */</div><div class='add'>+	memset(&amp;kevent-&gt;event, 0, sizeof(struct inotify_event));</div><div class='add'>+</div><div class='add'>+	kevent-&gt;event.wd = wd;</div><div class='add'>+	kevent-&gt;event.mask = mask;</div><div class='add'>+	kevent-&gt;event.cookie = cookie;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;kevent-&gt;list);</div><div class='add'>+</div><div class='add'>+	if (name) {</div><div class='add'>+		size_t len, rem, event_size = sizeof(struct inotify_event);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to pad the filename so as to properly align an</div><div class='add'>+		 * array of inotify_event structures.  Because the structure is</div><div class='add'>+		 * small and the common case is a small filename, we just round</div><div class='add'>+		 * up to the next multiple of the structure's sizeof.  This is</div><div class='add'>+		 * simple and safe for all architectures.</div><div class='add'>+		 */</div><div class='add'>+		len = strlen(name) + 1;</div><div class='add'>+		rem = event_size - len;</div><div class='add'>+		if (len &gt; event_size) {</div><div class='add'>+			rem = event_size - (len % event_size);</div><div class='add'>+			if (len % event_size == 0)</div><div class='add'>+				rem = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kevent-&gt;name = kmalloc(len + rem, GFP_KERNEL);</div><div class='add'>+		if (unlikely(!kevent-&gt;name)) {</div><div class='add'>+			kmem_cache_free(event_cachep, kevent);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(kevent-&gt;name, name, len);</div><div class='add'>+		if (rem)</div><div class='add'>+			memset(kevent-&gt;name + len, 0, rem);</div><div class='add'>+		kevent-&gt;event.len = len + rem;</div><div class='add'>+	} else {</div><div class='add'>+		kevent-&gt;event.len = 0;</div><div class='add'>+		kevent-&gt;name = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return kevent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * inotify_dev_get_event - return the next event in the given dev's queue</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold dev-&gt;ev_mutex.</div><div class='add'>+ */</div><div class='add'>+static inline struct inotify_kernel_event *</div><div class='add'>+inotify_dev_get_event(struct inotify_device *dev)</div><div class='add'>+{</div><div class='add'>+	return list_entry(dev-&gt;events.next, struct inotify_kernel_event, list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * inotify_dev_queue_event - event handler registered with core inotify, adds</div><div class='add'>+ * a new event to the given device</div><div class='add'>+ *</div><div class='add'>+ * Can sleep (calls kernel_event()).</div><div class='add'>+ */</div><div class='add'>+static void inotify_dev_queue_event(struct inotify_watch *w, u32 wd, u32 mask,</div><div class='add'>+				    u32 cookie, const char *name,</div><div class='add'>+				    struct inode *ignored)</div><div class='add'>+{</div><div class='add'>+	struct inotify_user_watch *watch;</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+	struct inotify_kernel_event *kevent, *last;</div><div class='add'>+</div><div class='add'>+	watch = container_of(w, struct inotify_user_watch, wdata);</div><div class='add'>+	dev = watch-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+</div><div class='add'>+	/* we can safely put the watch as we don't reference it while</div><div class='add'>+	 * generating the event</div><div class='add'>+	 */</div><div class='add'>+	if (mask &amp; IN_IGNORED || mask &amp; IN_ONESHOT)</div><div class='add'>+		put_inotify_watch(w); /* final put */</div><div class='add'>+</div><div class='add'>+	/* coalescing: drop this event if it is a dupe of the previous */</div><div class='add'>+	last = inotify_dev_get_event(dev);</div><div class='add'>+	if (last &amp;&amp; last-&gt;event.mask == mask &amp;&amp; last-&gt;event.wd == wd &amp;&amp;</div><div class='add'>+			last-&gt;event.cookie == cookie) {</div><div class='add'>+		const char *lastname = last-&gt;name;</div><div class='add'>+</div><div class='add'>+		if (!name &amp;&amp; !lastname)</div><div class='add'>+			goto out;</div><div class='add'>+		if (name &amp;&amp; lastname &amp;&amp; !strcmp(lastname, name))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the queue overflowed and we already sent the Q_OVERFLOW event */</div><div class='add'>+	if (unlikely(dev-&gt;event_count &gt; dev-&gt;max_events))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* if the queue overflows, we need to notify user space */</div><div class='add'>+	if (unlikely(dev-&gt;event_count == dev-&gt;max_events))</div><div class='add'>+		kevent = kernel_event(-1, IN_Q_OVERFLOW, cookie, NULL);</div><div class='add'>+	else</div><div class='add'>+		kevent = kernel_event(wd, mask, cookie, name);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!kevent))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* queue the event and wake up anyone waiting */</div><div class='add'>+	dev-&gt;event_count++;</div><div class='add'>+	dev-&gt;queue_size += sizeof(struct inotify_event) + kevent-&gt;event.len;</div><div class='add'>+	list_add_tail(&amp;kevent-&gt;list, &amp;dev-&gt;events);</div><div class='add'>+	wake_up_interruptible(&amp;dev-&gt;wq);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * remove_kevent - cleans up and ultimately frees the given kevent</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold dev-&gt;ev_mutex.</div><div class='add'>+ */</div><div class='add'>+static void remove_kevent(struct inotify_device *dev,</div><div class='add'>+			  struct inotify_kernel_event *kevent)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;kevent-&gt;list);</div><div class='add'>+</div><div class='add'>+	dev-&gt;event_count--;</div><div class='add'>+	dev-&gt;queue_size -= sizeof(struct inotify_event) + kevent-&gt;event.len;</div><div class='add'>+</div><div class='add'>+	kfree(kevent-&gt;name);</div><div class='add'>+	kmem_cache_free(event_cachep, kevent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * inotify_dev_event_dequeue - destroy an event on the given device</div><div class='add'>+ *</div><div class='add'>+ * Caller must hold dev-&gt;ev_mutex.</div><div class='add'>+ */</div><div class='add'>+static void inotify_dev_event_dequeue(struct inotify_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (!list_empty(&amp;dev-&gt;events)) {</div><div class='add'>+		struct inotify_kernel_event *kevent;</div><div class='add'>+		kevent = inotify_dev_get_event(dev);</div><div class='add'>+		remove_kevent(dev, kevent);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * find_inode - resolve a user-given path to a specific inode and return a nd</div><div class='add'>+ */</div><div class='add'>+static int find_inode(const char __user *dirname, struct nameidata *nd,</div><div class='add'>+		      unsigned flags)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	error = __user_walk(dirname, flags, nd);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	/* you can only watch an inode if you have read permissions on it */</div><div class='add'>+	error = vfs_permission(nd, MAY_READ);</div><div class='add'>+	if (error)</div><div class='add'>+		path_release(nd);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * create_watch - creates a watch on the given device.</div><div class='add'>+ *</div><div class='add'>+ * Callers must hold dev-&gt;up_mutex.</div><div class='add'>+ */</div><div class='add'>+static int create_watch(struct inotify_device *dev, struct inode *inode,</div><div class='add'>+			u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct inotify_user_watch *watch;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (atomic_read(&amp;dev-&gt;user-&gt;inotify_watches) &gt;=</div><div class='add'>+			inotify_max_user_watches)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	watch = kmem_cache_alloc(watch_cachep, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!watch))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* save a reference to device and bump the count to make it official */</div><div class='add'>+	get_inotify_dev(dev);</div><div class='add'>+	watch-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;dev-&gt;user-&gt;inotify_watches);</div><div class='add'>+</div><div class='add'>+	inotify_init_watch(&amp;watch-&gt;wdata);</div><div class='add'>+	ret = inotify_add_watch(dev-&gt;ih, &amp;watch-&gt;wdata, inode, mask);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		free_inotify_user_watch(&amp;watch-&gt;wdata);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Device Interface */</div><div class='add'>+</div><div class='add'>+static unsigned int inotify_poll(struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct inotify_device *dev = file-&gt;private_data;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;dev-&gt;wq, wait);</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+	if (!list_empty(&amp;dev-&gt;events))</div><div class='add'>+		ret = POLLIN | POLLRDNORM;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t inotify_read(struct file *file, char __user *buf,</div><div class='add'>+			    size_t count, loff_t *pos)</div><div class='add'>+{</div><div class='add'>+	size_t event_size = sizeof (struct inotify_event);</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+	char __user *start;</div><div class='add'>+	int ret;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	start = buf;</div><div class='add'>+	dev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		int events;</div><div class='add'>+</div><div class='add'>+		prepare_to_wait(&amp;dev-&gt;wq, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+		events = !list_empty(&amp;dev-&gt;events);</div><div class='add'>+		mutex_unlock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+		if (events) {</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='add'>+			ret = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			ret = -EINTR;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		schedule();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	finish_wait(&amp;dev-&gt;wq, &amp;wait);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+	while (1) {</div><div class='add'>+		struct inotify_kernel_event *kevent;</div><div class='add'>+</div><div class='add'>+		ret = buf - start;</div><div class='add'>+		if (list_empty(&amp;dev-&gt;events))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		kevent = inotify_dev_get_event(dev);</div><div class='add'>+		if (event_size + kevent-&gt;event.len &gt; count)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(buf, &amp;kevent-&gt;event, event_size)) {</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		buf += event_size;</div><div class='add'>+		count -= event_size;</div><div class='add'>+</div><div class='add'>+		if (kevent-&gt;name) {</div><div class='add'>+			if (copy_to_user(buf, kevent-&gt;name, kevent-&gt;event.len)){</div><div class='add'>+				ret = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			buf += kevent-&gt;event.len;</div><div class='add'>+			count -= kevent-&gt;event.len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		remove_kevent(dev, kevent);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int inotify_release(struct inode *ignored, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct inotify_device *dev = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	inotify_destroy(dev-&gt;ih);</div><div class='add'>+</div><div class='add'>+	/* destroy all of the events on this device */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+	while (!list_empty(&amp;dev-&gt;events))</div><div class='add'>+		inotify_dev_event_dequeue(dev);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;ev_mutex);</div><div class='add'>+</div><div class='add'>+	/* free this device: the put matching the get in inotify_init() */</div><div class='add'>+	put_inotify_dev(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long inotify_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			  unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+	void __user *p;</div><div class='add'>+	int ret = -ENOTTY;</div><div class='add'>+</div><div class='add'>+	dev = file-&gt;private_data;</div><div class='add'>+	p = (void __user *) arg;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case FIONREAD:</div><div class='add'>+		ret = put_user(dev-&gt;queue_size, (int __user *) p);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations inotify_fops = {</div><div class='add'>+	.poll           = inotify_poll,</div><div class='add'>+	.read           = inotify_read,</div><div class='add'>+	.release        = inotify_release,</div><div class='add'>+	.unlocked_ioctl = inotify_ioctl,</div><div class='add'>+	.compat_ioctl	= inotify_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct inotify_operations inotify_user_ops = {</div><div class='add'>+	.handle_event	= inotify_dev_queue_event,</div><div class='add'>+	.destroy_watch	= free_inotify_user_watch,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+asmlinkage long sys_inotify_init(void)</div><div class='add'>+{</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+	struct inotify_handle *ih;</div><div class='add'>+	struct user_struct *user;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	int fd, ret;</div><div class='add'>+</div><div class='add'>+	fd = get_unused_fd();</div><div class='add'>+	if (fd &lt; 0)</div><div class='add'>+		return fd;</div><div class='add'>+</div><div class='add'>+	filp = get_empty_filp();</div><div class='add'>+	if (!filp) {</div><div class='add'>+		ret = -ENFILE;</div><div class='add'>+		goto out_put_fd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	user = get_uid(current-&gt;user);</div><div class='add'>+	if (unlikely(atomic_read(&amp;user-&gt;inotify_devs) &gt;=</div><div class='add'>+			inotify_max_user_instances)) {</div><div class='add'>+		ret = -EMFILE;</div><div class='add'>+		goto out_free_uid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!dev)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_uid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ih = inotify_init(&amp;inotify_user_ops);</div><div class='add'>+	if (unlikely(IS_ERR(ih))) {</div><div class='add'>+		ret = PTR_ERR(ih);</div><div class='add'>+		goto out_free_dev;</div><div class='add'>+	}</div><div class='add'>+	dev-&gt;ih = ih;</div><div class='add'>+</div><div class='add'>+	filp-&gt;f_op = &amp;inotify_fops;</div><div class='add'>+	filp-&gt;f_vfsmnt = mntget(inotify_mnt);</div><div class='add'>+	filp-&gt;f_dentry = dget(inotify_mnt-&gt;mnt_root);</div><div class='add'>+	filp-&gt;f_mapping = filp-&gt;f_dentry-&gt;d_inode-&gt;i_mapping;</div><div class='add'>+	filp-&gt;f_mode = FMODE_READ;</div><div class='add'>+	filp-&gt;f_flags = O_RDONLY;</div><div class='add'>+	filp-&gt;private_data = dev;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;events);</div><div class='add'>+	init_waitqueue_head(&amp;dev-&gt;wq);</div><div class='add'>+	mutex_init(&amp;dev-&gt;ev_mutex);</div><div class='add'>+	mutex_init(&amp;dev-&gt;up_mutex);</div><div class='add'>+	dev-&gt;event_count = 0;</div><div class='add'>+	dev-&gt;queue_size = 0;</div><div class='add'>+	dev-&gt;max_events = inotify_max_queued_events;</div><div class='add'>+	dev-&gt;user = user;</div><div class='add'>+	atomic_set(&amp;dev-&gt;count, 0);</div><div class='add'>+</div><div class='add'>+	get_inotify_dev(dev);</div><div class='add'>+	atomic_inc(&amp;user-&gt;inotify_devs);</div><div class='add'>+	fd_install(fd, filp);</div><div class='add'>+</div><div class='add'>+	return fd;</div><div class='add'>+out_free_dev:</div><div class='add'>+	kfree(dev);</div><div class='add'>+out_free_uid:</div><div class='add'>+	free_uid(user);</div><div class='add'>+	put_filp(filp);</div><div class='add'>+out_put_fd:</div><div class='add'>+	put_unused_fd(fd);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode;</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+	struct nameidata nd;</div><div class='add'>+	struct file *filp;</div><div class='add'>+	int ret, fput_needed;</div><div class='add'>+	unsigned flags = 0;</div><div class='add'>+</div><div class='add'>+	filp = fget_light(fd, &amp;fput_needed);</div><div class='add'>+	if (unlikely(!filp))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	/* verify that this is indeed an inotify instance */</div><div class='add'>+	if (unlikely(filp-&gt;f_op != &amp;inotify_fops)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto fput_and_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(mask &amp; IN_DONT_FOLLOW))</div><div class='add'>+		flags |= LOOKUP_FOLLOW;</div><div class='add'>+	if (mask &amp; IN_ONLYDIR)</div><div class='add'>+		flags |= LOOKUP_DIRECTORY;</div><div class='add'>+</div><div class='add'>+	ret = find_inode(path, &amp;nd, flags);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto fput_and_out;</div><div class='add'>+</div><div class='add'>+	/* inode held in place by reference to nd; dev by fget on fd */</div><div class='add'>+	inode = nd.dentry-&gt;d_inode;</div><div class='add'>+	dev = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;up_mutex);</div><div class='add'>+	ret = inotify_find_update_watch(dev-&gt;ih, inode, mask);</div><div class='add'>+	if (ret == -ENOENT)</div><div class='add'>+		ret = create_watch(dev, inode, mask);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;up_mutex);</div><div class='add'>+</div><div class='add'>+	path_release(&amp;nd);</div><div class='add'>+fput_and_out:</div><div class='add'>+	fput_light(filp, fput_needed);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+asmlinkage long sys_inotify_rm_watch(int fd, u32 wd)</div><div class='add'>+{</div><div class='add'>+	struct file *filp;</div><div class='add'>+	struct inotify_device *dev;</div><div class='add'>+	int ret, fput_needed;</div><div class='add'>+</div><div class='add'>+	filp = fget_light(fd, &amp;fput_needed);</div><div class='add'>+	if (unlikely(!filp))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	/* verify that this is indeed an inotify instance */</div><div class='add'>+	if (unlikely(filp-&gt;f_op != &amp;inotify_fops)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = filp-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* we free our watch data when we get IN_IGNORED */</div><div class='add'>+	ret = inotify_rm_wd(dev-&gt;ih, wd);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	fput_light(filp, fput_needed);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+inotify_get_sb(struct file_system_type *fs_type, int flags,</div><div class='add'>+	       const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	return get_sb_pseudo(fs_type, "inotify", NULL, 0xBAD1DEA, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct file_system_type inotify_fs_type = {</div><div class='add'>+    .name           = "inotifyfs",</div><div class='add'>+    .get_sb         = inotify_get_sb,</div><div class='add'>+    .kill_sb        = kill_anon_super,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * inotify_user_setup - Our initialization function.  Note that we cannnot return</div><div class='add'>+ * error because we have compiled-in VFS hooks.  So an (unlikely) failure here</div><div class='add'>+ * must result in panic().</div><div class='add'>+ */</div><div class='add'>+static int __init inotify_user_setup(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_filesystem(&amp;inotify_fs_type);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		panic("inotify: register_filesystem returned %d!\n", ret);</div><div class='add'>+</div><div class='add'>+	inotify_mnt = kern_mount(&amp;inotify_fs_type);</div><div class='add'>+	if (IS_ERR(inotify_mnt))</div><div class='add'>+		panic("inotify: kern_mount ret %ld!\n", PTR_ERR(inotify_mnt));</div><div class='add'>+</div><div class='add'>+	inotify_max_queued_events = 16384;</div><div class='add'>+	inotify_max_user_instances = 128;</div><div class='add'>+	inotify_max_user_watches = 8192;</div><div class='add'>+</div><div class='add'>+	watch_cachep = kmem_cache_create("inotify_watch_cache",</div><div class='add'>+					 sizeof(struct inotify_user_watch),</div><div class='add'>+					 0, SLAB_PANIC, NULL, NULL);</div><div class='add'>+	event_cachep = kmem_cache_create("inotify_event_cache",</div><div class='add'>+					 sizeof(struct inotify_kernel_event),</div><div class='add'>+					 0, SLAB_PANIC, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(inotify_user_setup);</div><div class='head'>diff --git a/fs/ioctl.c b/fs/ioctl.c<br/>index f8aeec3ca10c..4b7660b09ac0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ioctl.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *  Copyright (C) 1991, 1992  Linus Torvalds</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='head'>diff --git a/fs/ioprio.c b/fs/ioprio.c<br/>index ca77008146c0..93aa5715f224 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ioprio.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ioprio.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ioprio.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ioprio.c</a></div><div class='hunk'>@@ -24,15 +24,21 @@</div><div class='ctx'> #include &lt;linux/blkdev.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int set_task_ioprio(struct task_struct *task, int ioprio)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='ctx'> 	struct io_context *ioc;</div><div class='ctx'> </div><div class='ctx'> 	if (task-&gt;uid != current-&gt;euid &amp;&amp;</div><div class='ctx'> 	    task-&gt;uid != current-&gt;uid &amp;&amp; !capable(CAP_SYS_NICE))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='add'>+	err = security_task_setioprio(task, ioprio);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	task_lock(task);</div><div class='ctx'> </div><div class='ctx'> 	task-&gt;ioprio = ioprio;</div><div class='hunk'>@@ -119,11 +125,24 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int get_task_ioprio(struct task_struct *p)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = security_task_getioprio(p);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = p-&gt;ioprio;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> asmlinkage long sys_ioprio_get(int which, int who)</div><div class='ctx'> {</div><div class='ctx'> 	struct task_struct *g, *p;</div><div class='ctx'> 	struct user_struct *user;</div><div class='ctx'> 	int ret = -ESRCH;</div><div class='add'>+	int tmpio;</div><div class='ctx'> </div><div class='ctx'> 	read_lock_irq(&amp;tasklist_lock);</div><div class='ctx'> 	switch (which) {</div><div class='hunk'>@@ -133,16 +152,19 @@ asmlinkage long sys_ioprio_get(int which, int who)</div><div class='ctx'> 			else</div><div class='ctx'> 				p = find_task_by_pid(who);</div><div class='ctx'> 			if (p)</div><div class='del'>-				ret = p-&gt;ioprio;</div><div class='add'>+				ret = get_task_ioprio(p);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IOPRIO_WHO_PGRP:</div><div class='ctx'> 			if (!who)</div><div class='ctx'> 				who = process_group(current);</div><div class='ctx'> 			do_each_task_pid(who, PIDTYPE_PGID, p) {</div><div class='add'>+				tmpio = get_task_ioprio(p);</div><div class='add'>+				if (tmpio &lt; 0)</div><div class='add'>+					continue;</div><div class='ctx'> 				if (ret == -ESRCH)</div><div class='del'>-					ret = p-&gt;ioprio;</div><div class='add'>+					ret = tmpio;</div><div class='ctx'> 				else</div><div class='del'>-					ret = ioprio_best(ret, p-&gt;ioprio);</div><div class='add'>+					ret = ioprio_best(ret, tmpio);</div><div class='ctx'> 			} while_each_task_pid(who, PIDTYPE_PGID, p);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IOPRIO_WHO_USER:</div><div class='hunk'>@@ -157,10 +179,13 @@ asmlinkage long sys_ioprio_get(int which, int who)</div><div class='ctx'> 			do_each_thread(g, p) {</div><div class='ctx'> 				if (p-&gt;uid != user-&gt;uid)</div><div class='ctx'> 					continue;</div><div class='add'>+				tmpio = get_task_ioprio(p);</div><div class='add'>+				if (tmpio &lt; 0)</div><div class='add'>+					continue;</div><div class='ctx'> 				if (ret == -ESRCH)</div><div class='del'>-					ret = p-&gt;ioprio;</div><div class='add'>+					ret = tmpio;</div><div class='ctx'> 				else</div><div class='del'>-					ret = ioprio_best(ret, p-&gt;ioprio);</div><div class='add'>+					ret = ioprio_best(ret, tmpio);</div><div class='ctx'> 			} while_each_thread(g, p);</div><div class='ctx'> </div><div class='ctx'> 			if (who)</div><div class='head'>diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c<br/>index 4917315db732..731816332b12 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/isofs/compress.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/compress.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/isofs/compress.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/isofs/compress.c</a></div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'>  * Transparent decompression of files on an iso9660 filesystem</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -312,7 +311,7 @@ eio:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations zisofs_aops = {</div><div class='add'>+const struct address_space_operations zisofs_aops = {</div><div class='ctx'> 	.readpage = zisofs_readpage,</div><div class='ctx'> 	/* No sync_page operation supported? */</div><div class='ctx'> 	/* No bmap operation supported */</div><div class='head'>diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c<br/>index 5440ea292c69..27e276987fd2 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/isofs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/isofs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/isofs/dir.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  * </div><div class='ctx'>  *  isofs directory handling functions</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include "isofs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c<br/>index 70adbb98bad1..14391361c886 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/isofs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/isofs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/isofs/inode.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *	2004  Paul Serice - NFS Export Operations</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -56,7 +55,7 @@ static void isofs_put_super(struct super_block *sb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void isofs_read_inode(struct inode *);</div><div class='del'>-static int isofs_statfs (struct super_block *, struct kstatfs *);</div><div class='add'>+static int isofs_statfs (struct dentry *, struct kstatfs *);</div><div class='ctx'> </div><div class='ctx'> static kmem_cache_t *isofs_inode_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -901,8 +900,10 @@ out_freesbi:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int isofs_statfs (struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int isofs_statfs (struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='add'>+</div><div class='ctx'> 	buf-&gt;f_type = ISOFS_SUPER_MAGIC;</div><div class='ctx'> 	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='ctx'> 	buf-&gt;f_blocks = (ISOFS_SB(sb)-&gt;s_nzones</div><div class='hunk'>@@ -1052,7 +1053,7 @@ static sector_t _isofs_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> 	return generic_block_bmap(mapping,block,isofs_get_block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct address_space_operations isofs_aops = {</div><div class='add'>+static const struct address_space_operations isofs_aops = {</div><div class='ctx'> 	.readpage = isofs_readpage,</div><div class='ctx'> 	.sync_page = block_sync_page,</div><div class='ctx'> 	.bmap = _isofs_bmap</div><div class='hunk'>@@ -1399,10 +1400,11 @@ struct inode *isofs_iget(struct super_block *sb,</div><div class='ctx'> 	return inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *isofs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int isofs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, isofs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, isofs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type iso9660_fs_type = {</div><div class='head'>diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h<br/>index b87ba066f5e7..e6308c8b5735 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/isofs/isofs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/isofs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/isofs/isofs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/isofs/isofs.h</a></div><div class='hunk'>@@ -176,5 +176,5 @@ isofs_normalize_block_and_offset(struct iso_directory_record* de,</div><div class='ctx'> </div><div class='ctx'> extern struct inode_operations isofs_dir_inode_operations;</div><div class='ctx'> extern const struct file_operations isofs_dir_operations;</div><div class='del'>-extern struct address_space_operations isofs_symlink_aops;</div><div class='add'>+extern const struct address_space_operations isofs_symlink_aops;</div><div class='ctx'> extern struct export_operations isofs_export_ops;</div><div class='head'>diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c<br/>index 4326cb47f8fa..f3a1db3098de 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/isofs/rock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/rock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/isofs/rock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/isofs/rock.c</a></div><div class='hunk'>@@ -754,6 +754,6 @@ error:</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations isofs_symlink_aops = {</div><div class='add'>+const struct address_space_operations isofs_symlink_aops = {</div><div class='ctx'> 	.readpage = rock_ridge_symlink_readpage</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/isofs/zisofs.h b/fs/isofs/zisofs.h<br/>index d78485d101c2..273795709155 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/isofs/zisofs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/isofs/zisofs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/isofs/zisofs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/isofs/zisofs.h</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ZISOFS</div><div class='del'>-extern struct address_space_operations zisofs_aops;</div><div class='add'>+extern const struct address_space_operations zisofs_aops;</div><div class='ctx'> extern int __init zisofs_init(void);</div><div class='ctx'> extern void zisofs_cleanup(void);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c<br/>index 3f5102b069db..47678a26c13b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jbd/checkpoint.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/checkpoint.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jbd/checkpoint.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jbd/checkpoint.c</a></div><div class='hunk'>@@ -24,29 +24,67 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Unlink a buffer from a transaction.</div><div class='add'>+ * Unlink a buffer from a transaction checkpoint list.</div><div class='ctx'>  *</div><div class='ctx'>  * Called with j_list_lock held.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static inline void __buffer_unlink(struct journal_head *jh)</div><div class='add'>+static inline void __buffer_unlink_first(struct journal_head *jh)</div><div class='ctx'> {</div><div class='del'>-	transaction_t *transaction;</div><div class='del'>-</div><div class='del'>-	transaction = jh-&gt;b_cp_transaction;</div><div class='del'>-	jh-&gt;b_cp_transaction = NULL;</div><div class='add'>+	transaction_t *transaction = jh-&gt;b_cp_transaction;</div><div class='ctx'> </div><div class='ctx'> 	jh-&gt;b_cpnext-&gt;b_cpprev = jh-&gt;b_cpprev;</div><div class='ctx'> 	jh-&gt;b_cpprev-&gt;b_cpnext = jh-&gt;b_cpnext;</div><div class='del'>-	if (transaction-&gt;t_checkpoint_list == jh)</div><div class='add'>+	if (transaction-&gt;t_checkpoint_list == jh) {</div><div class='ctx'> 		transaction-&gt;t_checkpoint_list = jh-&gt;b_cpnext;</div><div class='del'>-	if (transaction-&gt;t_checkpoint_list == jh)</div><div class='del'>-		transaction-&gt;t_checkpoint_list = NULL;</div><div class='add'>+		if (transaction-&gt;t_checkpoint_list == jh)</div><div class='add'>+			transaction-&gt;t_checkpoint_list = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unlink a buffer from a transaction checkpoint(io) list.</div><div class='add'>+ *</div><div class='add'>+ * Called with j_list_lock held.</div><div class='add'>+ */</div><div class='add'>+static inline void __buffer_unlink(struct journal_head *jh)</div><div class='add'>+{</div><div class='add'>+	transaction_t *transaction = jh-&gt;b_cp_transaction;</div><div class='add'>+</div><div class='add'>+	__buffer_unlink_first(jh);</div><div class='add'>+	if (transaction-&gt;t_checkpoint_io_list == jh) {</div><div class='add'>+		transaction-&gt;t_checkpoint_io_list = jh-&gt;b_cpnext;</div><div class='add'>+		if (transaction-&gt;t_checkpoint_io_list == jh)</div><div class='add'>+			transaction-&gt;t_checkpoint_io_list = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Move a buffer from the checkpoint list to the checkpoint io list</div><div class='add'>+ *</div><div class='add'>+ * Called with j_list_lock held</div><div class='add'>+ */</div><div class='add'>+static inline void __buffer_relink_io(struct journal_head *jh)</div><div class='add'>+{</div><div class='add'>+	transaction_t *transaction = jh-&gt;b_cp_transaction;</div><div class='add'>+</div><div class='add'>+	__buffer_unlink_first(jh);</div><div class='add'>+</div><div class='add'>+	if (!transaction-&gt;t_checkpoint_io_list) {</div><div class='add'>+		jh-&gt;b_cpnext = jh-&gt;b_cpprev = jh;</div><div class='add'>+	} else {</div><div class='add'>+		jh-&gt;b_cpnext = transaction-&gt;t_checkpoint_io_list;</div><div class='add'>+		jh-&gt;b_cpprev = transaction-&gt;t_checkpoint_io_list-&gt;b_cpprev;</div><div class='add'>+		jh-&gt;b_cpprev-&gt;b_cpnext = jh;</div><div class='add'>+		jh-&gt;b_cpnext-&gt;b_cpprev = jh;</div><div class='add'>+	}</div><div class='add'>+	transaction-&gt;t_checkpoint_io_list = jh;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Try to release a checkpointed buffer from its transaction.</div><div class='del'>- * Returns 1 if we released it.</div><div class='add'>+ * Returns 1 if we released it and 2 if we also released the</div><div class='add'>+ * whole transaction.</div><div class='add'>+ *</div><div class='ctx'>  * Requires j_list_lock</div><div class='ctx'>  * Called under jbd_lock_bh_state(jh2bh(jh)), and drops it</div><div class='ctx'>  */</div><div class='hunk'>@@ -57,12 +95,11 @@ static int __try_to_free_cp_buf(struct journal_head *jh)</div><div class='ctx'> </div><div class='ctx'> 	if (jh-&gt;b_jlist == BJ_None &amp;&amp; !buffer_locked(bh) &amp;&amp; !buffer_dirty(bh)) {</div><div class='ctx'> 		JBUFFER_TRACE(jh, "remove from checkpoint list");</div><div class='del'>-		__journal_remove_checkpoint(jh);</div><div class='add'>+		ret = __journal_remove_checkpoint(jh) + 1;</div><div class='ctx'> 		jbd_unlock_bh_state(bh);</div><div class='ctx'> 		journal_remove_journal_head(bh);</div><div class='ctx'> 		BUFFER_TRACE(bh, "release");</div><div class='ctx'> 		__brelse(bh);</div><div class='del'>-		ret = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		jbd_unlock_bh_state(bh);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -117,83 +154,54 @@ static void jbd_sync_bh(journal_t *journal, struct buffer_head *bh)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Clean up a transaction's checkpoint list.</div><div class='del'>- *</div><div class='del'>- * We wait for any pending IO to complete and make sure any clean</div><div class='del'>- * buffers are removed from the transaction.</div><div class='del'>- *</div><div class='del'>- * Return 1 if we performed any actions which might have destroyed the</div><div class='del'>- * checkpoint.  (journal_remove_checkpoint() deletes the transaction when</div><div class='del'>- * the last checkpoint buffer is cleansed)</div><div class='add'>+ * Clean up transaction's list of buffers submitted for io.</div><div class='add'>+ * We wait for any pending IO to complete and remove any clean</div><div class='add'>+ * buffers. Note that we take the buffers in the opposite ordering</div><div class='add'>+ * from the one in which they were submitted for IO.</div><div class='ctx'>  *</div><div class='ctx'>  * Called with j_list_lock held.</div><div class='ctx'>  */</div><div class='del'>-static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)</div><div class='add'>+static void __wait_cp_io(journal_t *journal, transaction_t *transaction)</div><div class='ctx'> {</div><div class='del'>-	struct journal_head *jh, *next_jh, *last_jh;</div><div class='add'>+	struct journal_head *jh;</div><div class='ctx'> 	struct buffer_head *bh;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	assert_spin_locked(&amp;journal-&gt;j_list_lock);</div><div class='del'>-	jh = transaction-&gt;t_checkpoint_list;</div><div class='del'>-	if (!jh)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	last_jh = jh-&gt;b_cpprev;</div><div class='del'>-	next_jh = jh;</div><div class='del'>-	do {</div><div class='del'>-		jh = next_jh;</div><div class='add'>+	tid_t this_tid;</div><div class='add'>+	int released = 0;</div><div class='add'>+</div><div class='add'>+	this_tid = transaction-&gt;t_tid;</div><div class='add'>+restart:</div><div class='add'>+	/* Did somebody clean up the transaction in the meanwhile? */</div><div class='add'>+	if (journal-&gt;j_checkpoint_transactions != transaction ||</div><div class='add'>+			transaction-&gt;t_tid != this_tid)</div><div class='add'>+		return;</div><div class='add'>+	while (!released &amp;&amp; transaction-&gt;t_checkpoint_io_list) {</div><div class='add'>+		jh = transaction-&gt;t_checkpoint_io_list;</div><div class='ctx'> 		bh = jh2bh(jh);</div><div class='add'>+		if (!jbd_trylock_bh_state(bh)) {</div><div class='add'>+			jbd_sync_bh(journal, bh);</div><div class='add'>+			spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+			goto restart;</div><div class='add'>+		}</div><div class='ctx'> 		if (buffer_locked(bh)) {</div><div class='ctx'> 			atomic_inc(&amp;bh-&gt;b_count);</div><div class='ctx'> 			spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+			jbd_unlock_bh_state(bh);</div><div class='ctx'> 			wait_on_buffer(bh);</div><div class='ctx'> 			/* the journal_head may have gone by now */</div><div class='ctx'> 			BUFFER_TRACE(bh, "brelse");</div><div class='ctx'> 			__brelse(bh);</div><div class='del'>-			goto out_return_1;</div><div class='add'>+			spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+			goto restart;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		/*</div><div class='del'>-		 * This is foul</div><div class='add'>+		 * Now in whatever state the buffer currently is, we know that</div><div class='add'>+		 * it has been written out and so we can drop it from the list</div><div class='ctx'> 		 */</div><div class='del'>-		if (!jbd_trylock_bh_state(bh)) {</div><div class='del'>-			jbd_sync_bh(journal, bh);</div><div class='del'>-			goto out_return_1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (jh-&gt;b_transaction != NULL) {</div><div class='del'>-			transaction_t *t = jh-&gt;b_transaction;</div><div class='del'>-			tid_t tid = t-&gt;t_tid;</div><div class='del'>-</div><div class='del'>-			spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='del'>-			jbd_unlock_bh_state(bh);</div><div class='del'>-			log_start_commit(journal, tid);</div><div class='del'>-			log_wait_commit(journal, tid);</div><div class='del'>-			goto out_return_1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * AKPM: I think the buffer_jbddirty test is redundant - it</div><div class='del'>-		 * shouldn't have NULL b_transaction?</div><div class='del'>-		 */</div><div class='del'>-		next_jh = jh-&gt;b_cpnext;</div><div class='del'>-		if (!buffer_dirty(bh) &amp;&amp; !buffer_jbddirty(bh)) {</div><div class='del'>-			BUFFER_TRACE(bh, "remove from checkpoint");</div><div class='del'>-			__journal_remove_checkpoint(jh);</div><div class='del'>-			jbd_unlock_bh_state(bh);</div><div class='del'>-			journal_remove_journal_head(bh);</div><div class='del'>-			__brelse(bh);</div><div class='del'>-			ret = 1;</div><div class='del'>-		} else {</div><div class='del'>-			jbd_unlock_bh_state(bh);</div><div class='del'>-		}</div><div class='del'>-	} while (jh != last_jh);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-out_return_1:</div><div class='del'>-	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='del'>-	return 1;</div><div class='add'>+		released = __journal_remove_checkpoint(jh);</div><div class='add'>+		jbd_unlock_bh_state(bh);</div><div class='add'>+		journal_remove_journal_head(bh);</div><div class='add'>+		__brelse(bh);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define NR_BATCH	64</div><div class='hunk'>@@ -203,9 +211,7 @@ __flush_batch(journal_t *journal, struct buffer_head **bhs, int *batch_count)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 	ll_rw_block(SWRITE, *batch_count, bhs);</div><div class='del'>-	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 	for (i = 0; i &lt; *batch_count; i++) {</div><div class='ctx'> 		struct buffer_head *bh = bhs[i];</div><div class='ctx'> 		clear_buffer_jwrite(bh);</div><div class='hunk'>@@ -221,19 +227,43 @@ __flush_batch(journal_t *journal, struct buffer_head **bhs, int *batch_count)</div><div class='ctx'>  * Return 1 if something happened which requires us to abort the current</div><div class='ctx'>  * scan of the checkpoint list.  </div><div class='ctx'>  *</div><div class='del'>- * Called with j_list_lock held.</div><div class='add'>+ * Called with j_list_lock held and drops it if 1 is returned</div><div class='ctx'>  * Called under jbd_lock_bh_state(jh2bh(jh)), and drops it</div><div class='ctx'>  */</div><div class='del'>-static int __flush_buffer(journal_t *journal, struct journal_head *jh,</div><div class='del'>-			struct buffer_head **bhs, int *batch_count,</div><div class='del'>-			int *drop_count)</div><div class='add'>+static int __process_buffer(journal_t *journal, struct journal_head *jh,</div><div class='add'>+			struct buffer_head **bhs, int *batch_count)</div><div class='ctx'> {</div><div class='ctx'> 	struct buffer_head *bh = jh2bh(jh);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (buffer_dirty(bh) &amp;&amp; !buffer_locked(bh) &amp;&amp; jh-&gt;b_jlist == BJ_None) {</div><div class='del'>-		J_ASSERT_JH(jh, jh-&gt;b_transaction == NULL);</div><div class='add'>+	if (buffer_locked(bh)) {</div><div class='add'>+		atomic_inc(&amp;bh-&gt;b_count);</div><div class='add'>+		spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+		jbd_unlock_bh_state(bh);</div><div class='add'>+		wait_on_buffer(bh);</div><div class='add'>+		/* the journal_head may have gone by now */</div><div class='add'>+		BUFFER_TRACE(bh, "brelse");</div><div class='add'>+		__brelse(bh);</div><div class='add'>+		ret = 1;</div><div class='add'>+	} else if (jh-&gt;b_transaction != NULL) {</div><div class='add'>+		transaction_t *t = jh-&gt;b_transaction;</div><div class='add'>+		tid_t tid = t-&gt;t_tid;</div><div class='ctx'> </div><div class='add'>+		spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+		jbd_unlock_bh_state(bh);</div><div class='add'>+		log_start_commit(journal, tid);</div><div class='add'>+		log_wait_commit(journal, tid);</div><div class='add'>+		ret = 1;</div><div class='add'>+	} else if (!buffer_dirty(bh)) {</div><div class='add'>+		J_ASSERT_JH(jh, !buffer_jbddirty(bh));</div><div class='add'>+		BUFFER_TRACE(bh, "remove from checkpoint");</div><div class='add'>+		__journal_remove_checkpoint(jh);</div><div class='add'>+		spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+		jbd_unlock_bh_state(bh);</div><div class='add'>+		journal_remove_journal_head(bh);</div><div class='add'>+		__brelse(bh);</div><div class='add'>+		ret = 1;</div><div class='add'>+	} else {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Important: we are about to write the buffer, and</div><div class='ctx'> 		 * possibly block, while still holding the journal lock.</div><div class='hunk'>@@ -246,45 +276,30 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh,</div><div class='ctx'> 		J_ASSERT_BH(bh, !buffer_jwrite(bh));</div><div class='ctx'> 		set_buffer_jwrite(bh);</div><div class='ctx'> 		bhs[*batch_count] = bh;</div><div class='add'>+		__buffer_relink_io(jh);</div><div class='ctx'> 		jbd_unlock_bh_state(bh);</div><div class='ctx'> 		(*batch_count)++;</div><div class='ctx'> 		if (*batch_count == NR_BATCH) {</div><div class='add'>+			spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 			__flush_batch(journal, bhs, batch_count);</div><div class='ctx'> 			ret = 1;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		int last_buffer = 0;</div><div class='del'>-		if (jh-&gt;b_cpnext == jh) {</div><div class='del'>-			/* We may be about to drop the transaction.  Tell the</div><div class='del'>-			 * caller that the lists have changed.</div><div class='del'>-			 */</div><div class='del'>-			last_buffer = 1;</div><div class='del'>-		}</div><div class='del'>-		if (__try_to_free_cp_buf(jh)) {</div><div class='del'>-			(*drop_count)++;</div><div class='del'>-			ret = last_buffer;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Perform an actual checkpoint.  We don't write out only enough to</div><div class='del'>- * satisfy the current blocked requests: rather we submit a reasonably</div><div class='del'>- * sized chunk of the outstanding data to disk at once for</div><div class='del'>- * efficiency.  __log_wait_for_space() will retry if we didn't free enough.</div><div class='add'>+ * Perform an actual checkpoint. We take the first transaction on the</div><div class='add'>+ * list of transactions to be checkpointed and send all its buffers</div><div class='add'>+ * to disk. We submit larger chunks of data at once.</div><div class='ctx'>  * </div><div class='del'>- * However, we _do_ take into account the amount requested so that once</div><div class='del'>- * the IO has been queued, we can return as soon as enough of it has</div><div class='del'>- * completed to disk.</div><div class='del'>- *</div><div class='ctx'>  * The journal should be locked before calling this function.</div><div class='ctx'>  */</div><div class='ctx'> int log_do_checkpoint(journal_t *journal)</div><div class='ctx'> {</div><div class='add'>+	transaction_t *transaction;</div><div class='add'>+	tid_t this_tid;</div><div class='ctx'> 	int result;</div><div class='del'>-	int batch_count = 0;</div><div class='del'>-	struct buffer_head *bhs[NR_BATCH];</div><div class='ctx'> </div><div class='ctx'> 	jbd_debug(1, "Start checkpoint\n");</div><div class='ctx'> </div><div class='hunk'>@@ -299,79 +314,68 @@ int log_do_checkpoint(journal_t *journal)</div><div class='ctx'> 		return result;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * OK, we need to start writing disk blocks.  Try to free up a</div><div class='del'>-	 * quarter of the log in a single checkpoint if we can.</div><div class='add'>+	 * OK, we need to start writing disk blocks.  Take one transaction</div><div class='add'>+	 * and write it.</div><div class='ctx'> 	 */</div><div class='add'>+	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+	if (!journal-&gt;j_checkpoint_transactions)</div><div class='add'>+		goto out;</div><div class='add'>+	transaction = journal-&gt;j_checkpoint_transactions;</div><div class='add'>+	this_tid = transaction-&gt;t_tid;</div><div class='add'>+restart:</div><div class='ctx'> 	/*</div><div class='del'>-	 * AKPM: check this code.  I had a feeling a while back that it</div><div class='del'>-	 * degenerates into a busy loop at unmount time.</div><div class='add'>+	 * If someone cleaned up this transaction while we slept, we're</div><div class='add'>+	 * done (maybe it's a new transaction, but it fell at the same</div><div class='add'>+	 * address).</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='del'>-	while (journal-&gt;j_checkpoint_transactions) {</div><div class='del'>-		transaction_t *transaction;</div><div class='del'>-		struct journal_head *jh, *last_jh, *next_jh;</div><div class='del'>-		int drop_count = 0;</div><div class='del'>-		int cleanup_ret, retry = 0;</div><div class='del'>-		tid_t this_tid;</div><div class='del'>-</div><div class='del'>-		transaction = journal-&gt;j_checkpoint_transactions;</div><div class='del'>-		this_tid = transaction-&gt;t_tid;</div><div class='del'>-		jh = transaction-&gt;t_checkpoint_list;</div><div class='del'>-		last_jh = jh-&gt;b_cpprev;</div><div class='del'>-		next_jh = jh;</div><div class='del'>-		do {</div><div class='add'>+	if (journal-&gt;j_checkpoint_transactions == transaction &amp;&amp;</div><div class='add'>+			transaction-&gt;t_tid == this_tid) {</div><div class='add'>+		int batch_count = 0;</div><div class='add'>+		struct buffer_head *bhs[NR_BATCH];</div><div class='add'>+		struct journal_head *jh;</div><div class='add'>+		int retry = 0;</div><div class='add'>+</div><div class='add'>+		while (!retry &amp;&amp; transaction-&gt;t_checkpoint_list) {</div><div class='ctx'> 			struct buffer_head *bh;</div><div class='ctx'> </div><div class='del'>-			jh = next_jh;</div><div class='del'>-			next_jh = jh-&gt;b_cpnext;</div><div class='add'>+			jh = transaction-&gt;t_checkpoint_list;</div><div class='ctx'> 			bh = jh2bh(jh);</div><div class='ctx'> 			if (!jbd_trylock_bh_state(bh)) {</div><div class='ctx'> 				jbd_sync_bh(journal, bh);</div><div class='del'>-				spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 				retry = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			retry = __flush_buffer(journal, jh, bhs, &amp;batch_count, &amp;drop_count);</div><div class='del'>-			if (cond_resched_lock(&amp;journal-&gt;j_list_lock)) {</div><div class='add'>+			retry = __process_buffer(journal, jh, bhs,&amp;batch_count);</div><div class='add'>+			if (!retry &amp;&amp; lock_need_resched(&amp;journal-&gt;j_list_lock)){</div><div class='add'>+				spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 				retry = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-		} while (jh != last_jh &amp;&amp; !retry);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (batch_count) {</div><div class='add'>+			if (!retry) {</div><div class='add'>+				spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+				retry = 1;</div><div class='add'>+			}</div><div class='ctx'> 			__flush_batch(journal, bhs, &amp;batch_count);</div><div class='del'>-			retry = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (retry) {</div><div class='add'>+			spin_lock(&amp;journal-&gt;j_list_lock);</div><div class='add'>+			goto restart;</div><div class='add'>+		}</div><div class='ctx'> 		/*</div><div class='del'>-		 * If someone cleaned up this transaction while we slept, we're</div><div class='del'>-		 * done</div><div class='del'>-		 */</div><div class='del'>-		if (journal-&gt;j_checkpoint_transactions != transaction)</div><div class='del'>-			break;</div><div class='del'>-		if (retry)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * Maybe it's a new transaction, but it fell at the same</div><div class='del'>-		 * address</div><div class='del'>-		 */</div><div class='del'>-		if (transaction-&gt;t_tid != this_tid)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * We have walked the whole transaction list without</div><div class='del'>-		 * finding anything to write to disk.  We had better be</div><div class='del'>-		 * able to make some progress or we are in trouble.</div><div class='add'>+		 * Now we have cleaned up the first transaction's checkpoint</div><div class='add'>+		 * list. Let's clean up the second one</div><div class='ctx'> 		 */</div><div class='del'>-		cleanup_ret = __cleanup_transaction(journal, transaction);</div><div class='del'>-		J_ASSERT(drop_count != 0 || cleanup_ret != 0);</div><div class='del'>-		if (journal-&gt;j_checkpoint_transactions != transaction)</div><div class='del'>-			break;</div><div class='add'>+		__wait_cp_io(journal, transaction);</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	spin_unlock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 	result = cleanup_journal_tail(journal);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		return result;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -456,52 +460,98 @@ int cleanup_journal_tail(journal_t *journal)</div><div class='ctx'> /* Checkpoint list management */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * journal_clean_one_cp_list</div><div class='add'>+ *</div><div class='add'>+ * Find all the written-back checkpoint buffers in the given list and release them.</div><div class='add'>+ *</div><div class='add'>+ * Called with the journal locked.</div><div class='add'>+ * Called with j_list_lock held.</div><div class='add'>+ * Returns number of bufers reaped (for debug)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int journal_clean_one_cp_list(struct journal_head *jh, int *released)</div><div class='add'>+{</div><div class='add'>+	struct journal_head *last_jh;</div><div class='add'>+	struct journal_head *next_jh = jh;</div><div class='add'>+	int ret, freed = 0;</div><div class='add'>+</div><div class='add'>+	*released = 0;</div><div class='add'>+	if (!jh)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+ 	last_jh = jh-&gt;b_cpprev;</div><div class='add'>+	do {</div><div class='add'>+		jh = next_jh;</div><div class='add'>+		next_jh = jh-&gt;b_cpnext;</div><div class='add'>+		/* Use trylock because of the ranking */</div><div class='add'>+		if (jbd_trylock_bh_state(jh2bh(jh))) {</div><div class='add'>+			ret = __try_to_free_cp_buf(jh);</div><div class='add'>+			if (ret) {</div><div class='add'>+				freed++;</div><div class='add'>+				if (ret == 2) {</div><div class='add'>+					*released = 1;</div><div class='add'>+					return freed;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * This function only frees up some memory</div><div class='add'>+		 * if possible so we dont have an obligation</div><div class='add'>+		 * to finish processing. Bail out if preemption</div><div class='add'>+		 * requested:</div><div class='add'>+		 */</div><div class='add'>+		if (need_resched())</div><div class='add'>+			return freed;</div><div class='add'>+	} while (jh != last_jh);</div><div class='add'>+</div><div class='add'>+	return freed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * journal_clean_checkpoint_list</div><div class='ctx'>  *</div><div class='ctx'>  * Find all the written-back checkpoint buffers in the journal and release them.</div><div class='ctx'>  *</div><div class='ctx'>  * Called with the journal locked.</div><div class='ctx'>  * Called with j_list_lock held.</div><div class='del'>- * Returns number of bufers reaped (for debug)</div><div class='add'>+ * Returns number of buffers reaped (for debug)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> int __journal_clean_checkpoint_list(journal_t *journal)</div><div class='ctx'> {</div><div class='ctx'> 	transaction_t *transaction, *last_transaction, *next_transaction;</div><div class='ctx'> 	int ret = 0;</div><div class='add'>+	int released;</div><div class='ctx'> </div><div class='ctx'> 	transaction = journal-&gt;j_checkpoint_transactions;</div><div class='del'>-	if (transaction == 0)</div><div class='add'>+	if (!transaction)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	last_transaction = transaction-&gt;t_cpprev;</div><div class='ctx'> 	next_transaction = transaction;</div><div class='ctx'> 	do {</div><div class='del'>-		struct journal_head *jh;</div><div class='del'>-</div><div class='ctx'> 		transaction = next_transaction;</div><div class='ctx'> 		next_transaction = transaction-&gt;t_cpnext;</div><div class='del'>-		jh = transaction-&gt;t_checkpoint_list;</div><div class='del'>-		if (jh) {</div><div class='del'>-			struct journal_head *last_jh = jh-&gt;b_cpprev;</div><div class='del'>-			struct journal_head *next_jh = jh;</div><div class='del'>-</div><div class='del'>-			do {</div><div class='del'>-				jh = next_jh;</div><div class='del'>-				next_jh = jh-&gt;b_cpnext;</div><div class='del'>-				/* Use trylock because of the ranknig */</div><div class='del'>-				if (jbd_trylock_bh_state(jh2bh(jh)))</div><div class='del'>-					ret += __try_to_free_cp_buf(jh);</div><div class='del'>-				/*</div><div class='del'>-				 * This function only frees up some memory</div><div class='del'>-				 * if possible so we dont have an obligation</div><div class='del'>-				 * to finish processing. Bail out if preemption</div><div class='del'>-				 * requested:</div><div class='del'>-				 */</div><div class='del'>-				if (need_resched())</div><div class='del'>-					goto out;</div><div class='del'>-			} while (jh != last_jh);</div><div class='del'>-		}</div><div class='add'>+		ret += journal_clean_one_cp_list(transaction-&gt;</div><div class='add'>+				t_checkpoint_list, &amp;released);</div><div class='add'>+		/*</div><div class='add'>+		 * This function only frees up some memory if possible so we</div><div class='add'>+		 * dont have an obligation to finish processing. Bail out if</div><div class='add'>+		 * preemption requested:</div><div class='add'>+		 */</div><div class='add'>+		if (need_resched())</div><div class='add'>+			goto out;</div><div class='add'>+		if (released)</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * It is essential that we are as careful as in the case of</div><div class='add'>+		 * t_checkpoint_list with removing the buffer from the list as</div><div class='add'>+		 * we can possibly see not yet submitted buffers on io_list</div><div class='add'>+		 */</div><div class='add'>+		ret += journal_clean_one_cp_list(transaction-&gt;</div><div class='add'>+				t_checkpoint_io_list, &amp;released);</div><div class='add'>+		if (need_resched())</div><div class='add'>+			goto out;</div><div class='ctx'> 	} while (transaction != last_transaction);</div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -516,18 +566,22 @@ out:</div><div class='ctx'>  * buffer updates committed in that transaction have safely been stored</div><div class='ctx'>  * elsewhere on disk.  To achieve this, all of the buffers in a</div><div class='ctx'>  * transaction need to be maintained on the transaction's checkpoint</div><div class='del'>- * list until they have been rewritten, at which point this function is</div><div class='add'>+ * lists until they have been rewritten, at which point this function is</div><div class='ctx'>  * called to remove the buffer from the existing transaction's</div><div class='del'>- * checkpoint list.</div><div class='add'>+ * checkpoint lists.</div><div class='add'>+ *</div><div class='add'>+ * The function returns 1 if it frees the transaction, 0 otherwise.</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called with the journal locked.</div><div class='ctx'>  * This function is called with j_list_lock held.</div><div class='add'>+ * This function is called with jbd_lock_bh_state(jh2bh(jh))</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void __journal_remove_checkpoint(struct journal_head *jh)</div><div class='add'>+int __journal_remove_checkpoint(struct journal_head *jh)</div><div class='ctx'> {</div><div class='ctx'> 	transaction_t *transaction;</div><div class='ctx'> 	journal_t *journal;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	JBUFFER_TRACE(jh, "entry");</div><div class='ctx'> </div><div class='hunk'>@@ -538,8 +592,10 @@ void __journal_remove_checkpoint(struct journal_head *jh)</div><div class='ctx'> 	journal = transaction-&gt;t_journal;</div><div class='ctx'> </div><div class='ctx'> 	__buffer_unlink(jh);</div><div class='add'>+	jh-&gt;b_cp_transaction = NULL;</div><div class='ctx'> </div><div class='del'>-	if (transaction-&gt;t_checkpoint_list != NULL)</div><div class='add'>+	if (transaction-&gt;t_checkpoint_list != NULL ||</div><div class='add'>+	    transaction-&gt;t_checkpoint_io_list != NULL)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	JBUFFER_TRACE(jh, "transaction has no more buffers");</div><div class='ctx'> </div><div class='hunk'>@@ -565,8 +621,10 @@ void __journal_remove_checkpoint(struct journal_head *jh)</div><div class='ctx'> 	/* Just in case anybody was waiting for more transactions to be</div><div class='ctx'>            checkpointed... */</div><div class='ctx'> 	wake_up(&amp;journal-&gt;j_wait_logspace);</div><div class='add'>+	ret = 1;</div><div class='ctx'> out:</div><div class='ctx'> 	JBUFFER_TRACE(jh, "exit");</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -628,6 +686,7 @@ void __journal_drop_transaction(journal_t *journal, transaction_t *transaction)</div><div class='ctx'> 	J_ASSERT(transaction-&gt;t_shadow_list == NULL);</div><div class='ctx'> 	J_ASSERT(transaction-&gt;t_log_list == NULL);</div><div class='ctx'> 	J_ASSERT(transaction-&gt;t_checkpoint_list == NULL);</div><div class='add'>+	J_ASSERT(transaction-&gt;t_checkpoint_io_list == NULL);</div><div class='ctx'> 	J_ASSERT(transaction-&gt;t_updates == 0);</div><div class='ctx'> 	J_ASSERT(journal-&gt;j_committing_transaction != transaction);</div><div class='ctx'> 	J_ASSERT(journal-&gt;j_running_transaction != transaction);</div><div class='head'>diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c<br/>index 002ad2bbc769..0971814c38b8 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jbd/commit.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/commit.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jbd/commit.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jbd/commit.c</a></div><div class='hunk'>@@ -790,11 +790,22 @@ restart_loop:</div><div class='ctx'> 			jbd_unlock_bh_state(bh);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			J_ASSERT_BH(bh, !buffer_dirty(bh));</div><div class='del'>-			J_ASSERT_JH(jh, jh-&gt;b_next_transaction == NULL);</div><div class='del'>-			__journal_unfile_buffer(jh);</div><div class='del'>-			jbd_unlock_bh_state(bh);</div><div class='del'>-			journal_remove_journal_head(bh);  /* needs a brelse */</div><div class='del'>-			release_buffer_page(bh);</div><div class='add'>+			/* The buffer on BJ_Forget list and not jbddirty means</div><div class='add'>+			 * it has been freed by this transaction and hence it</div><div class='add'>+			 * could not have been reallocated until this</div><div class='add'>+			 * transaction has committed. *BUT* it could be</div><div class='add'>+			 * reallocated once we have written all the data to</div><div class='add'>+			 * disk and before we process the buffer on BJ_Forget</div><div class='add'>+			 * list. */</div><div class='add'>+			JBUFFER_TRACE(jh, "refile or unfile freed buffer");</div><div class='add'>+			__journal_refile_buffer(jh);</div><div class='add'>+			if (!jh-&gt;b_transaction) {</div><div class='add'>+				jbd_unlock_bh_state(bh);</div><div class='add'>+				 /* needs a brelse */</div><div class='add'>+				journal_remove_journal_head(bh);</div><div class='add'>+				release_buffer_page(bh);</div><div class='add'>+			} else</div><div class='add'>+				jbd_unlock_bh_state(bh);</div><div class='ctx'> 		}</div><div class='ctx'> 		cond_resched_lock(&amp;journal-&gt;j_list_lock);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c<br/>index 7f96b5cb6781..8c9b28dff119 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jbd/journal.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/journal.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jbd/journal.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jbd/journal.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include &lt;linux/suspend.h&gt;</div><div class='ctx'> #include &lt;linux/pagemap.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/poison.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -1675,7 +1676,7 @@ static void journal_free_journal_head(struct journal_head *jh)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_JBD_DEBUG</div><div class='ctx'> 	atomic_dec(&amp;nr_journal_heads);</div><div class='del'>-	memset(jh, 0x5b, sizeof(*jh));</div><div class='add'>+	memset(jh, JBD_POISON_FREE, sizeof(*jh));</div><div class='ctx'> #endif</div><div class='ctx'> 	kmem_cache_free(journal_head_cache, jh);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c<br/>index 80d7f53fd0a7..de5bafb4e853 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jbd/recovery.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/recovery.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jbd/recovery.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jbd/recovery.c</a></div><div class='hunk'>@@ -531,6 +531,7 @@ static int do_one_pass(journal_t *journal,</div><div class='ctx'> 		default:</div><div class='ctx'> 			jbd_debug(3, "Unrecognised magic %d, end of scan.\n",</div><div class='ctx'> 				  blocktype);</div><div class='add'>+			brelse(bh);</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c<br/>index c609f5034fcd..508b2ea91f43 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jbd/transaction.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jbd/transaction.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jbd/transaction.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jbd/transaction.c</a></div><div class='hunk'>@@ -227,7 +227,8 @@ repeat_locked:</div><div class='ctx'> 	spin_unlock(&amp;transaction-&gt;t_handle_lock);</div><div class='ctx'> 	spin_unlock(&amp;journal-&gt;j_state_lock);</div><div class='ctx'> out:</div><div class='del'>-	kfree(new_transaction);</div><div class='add'>+	if (unlikely(new_transaction))		/* It's usually NULL */</div><div class='add'>+		kfree(new_transaction);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -724,7 +725,8 @@ done:</div><div class='ctx'> 	journal_cancel_revoke(handle, jh);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	kfree(frozen_buffer);</div><div class='add'>+	if (unlikely(frozen_buffer))	/* It's usually NULL */</div><div class='add'>+		kfree(frozen_buffer);</div><div class='ctx'> </div><div class='ctx'> 	JBUFFER_TRACE(jh, "exit");</div><div class='ctx'> 	return error;</div><div class='hunk'>@@ -903,7 +905,8 @@ repeat:</div><div class='ctx'> 	jbd_unlock_bh_state(bh);</div><div class='ctx'> out:</div><div class='ctx'> 	journal_put_journal_head(jh);</div><div class='del'>-	kfree(committed_data);</div><div class='add'>+	if (unlikely(committed_data))</div><div class='add'>+		kfree(committed_data);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2038,7 +2041,8 @@ void __journal_refile_buffer(struct journal_head *jh)</div><div class='ctx'> 	__journal_temp_unlink_buffer(jh);</div><div class='ctx'> 	jh-&gt;b_transaction = jh-&gt;b_next_transaction;</div><div class='ctx'> 	jh-&gt;b_next_transaction = NULL;</div><div class='del'>-	__journal_file_buffer(jh, jh-&gt;b_transaction, BJ_Metadata);</div><div class='add'>+	__journal_file_buffer(jh, jh-&gt;b_transaction,</div><div class='add'>+				was_dirty ? BJ_Metadata : BJ_Reserved);</div><div class='ctx'> 	J_ASSERT_JH(jh, jh-&gt;b_transaction-&gt;t_state == T_RUNNING);</div><div class='ctx'> </div><div class='ctx'> 	if (was_dirty)</div><div class='head'>diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c<br/>index 020cc097c539..93068697a9bf 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs/inode-v23.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs/inode-v23.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs/inode-v23.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs/inode-v23.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ static const struct file_operations jffs_file_operations;</div><div class='ctx'> static struct inode_operations jffs_file_inode_operations;</div><div class='ctx'> static const struct file_operations jffs_dir_operations;</div><div class='ctx'> static struct inode_operations jffs_dir_inode_operations;</div><div class='del'>-static struct address_space_operations jffs_address_operations;</div><div class='add'>+static const struct address_space_operations jffs_address_operations;</div><div class='ctx'> </div><div class='ctx'> kmem_cache_t     *node_cache = NULL;</div><div class='ctx'> kmem_cache_t     *fm_cache = NULL;</div><div class='hunk'>@@ -377,9 +377,9 @@ jffs_new_inode(const struct inode * dir, struct jffs_raw_inode *raw_inode,</div><div class='ctx'> </div><div class='ctx'> /* Get statistics of the file system.  */</div><div class='ctx'> static int</div><div class='del'>-jffs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+jffs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct jffs_control *c = (struct jffs_control *) sb-&gt;s_fs_info;</div><div class='add'>+	struct jffs_control *c = (struct jffs_control *) dentry-&gt;d_sb-&gt;s_fs_info;</div><div class='ctx'> 	struct jffs_fmcontrol *fmc;</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='hunk'>@@ -1614,7 +1614,7 @@ jffs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,</div><div class='ctx'> } /* jffs_ioctl()  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct address_space_operations jffs_address_operations = {</div><div class='add'>+static const struct address_space_operations jffs_address_operations = {</div><div class='ctx'> 	.readpage	= jffs_readpage,</div><div class='ctx'> 	.prepare_write	= jffs_prepare_write,</div><div class='ctx'> 	.commit_write	= jffs_commit_write,</div><div class='hunk'>@@ -1785,10 +1785,11 @@ static struct super_operations jffs_ops =</div><div class='ctx'> 	.remount_fs	= jffs_remount,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct super_block *jffs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int jffs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, jffs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, jffs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type jffs_fs_type = {</div><div class='head'>diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c<br/>index 0ef207dfaf6f..9000f1effedf 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs/intrep.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs/intrep.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs/intrep.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs/intrep.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/jffs.h&gt;</div><div class='hunk'>@@ -247,7 +246,7 @@ flash_safe_read(struct mtd_info *mtd, loff_t from,</div><div class='ctx'> 	D3(printk(KERN_NOTICE "flash_safe_read(%p, %08x, %p, %08x)\n",</div><div class='ctx'> 		  mtd, (unsigned int) from, buf, count));</div><div class='ctx'> </div><div class='del'>-	res = MTD_READ(mtd, from, count, &amp;retlen, buf);</div><div class='add'>+	res = mtd-&gt;read(mtd, from, count, &amp;retlen, buf);</div><div class='ctx'> 	if (retlen != count) {</div><div class='ctx'> 		panic("Didn't read all bytes in flash_safe_read(). Returned %d\n", res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -262,7 +261,7 @@ flash_read_u32(struct mtd_info *mtd, loff_t from)</div><div class='ctx'> 	__u32 ret;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	res = MTD_READ(mtd, from, 4, &amp;retlen, (unsigned char *)&amp;ret);</div><div class='add'>+	res = mtd-&gt;read(mtd, from, 4, &amp;retlen, (unsigned char *)&amp;ret);</div><div class='ctx'> 	if (retlen != 4) {</div><div class='ctx'> 		printk("Didn't read all bytes in flash_read_u32(). Returned %d\n", res);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -282,7 +281,7 @@ flash_safe_write(struct mtd_info *mtd, loff_t to,</div><div class='ctx'> 	D3(printk(KERN_NOTICE "flash_safe_write(%p, %08x, %p, %08x)\n",</div><div class='ctx'> 		  mtd, (unsigned int) to, buf, count));</div><div class='ctx'> </div><div class='del'>-	res = MTD_WRITE(mtd, to, count, &amp;retlen, buf);</div><div class='add'>+	res = mtd-&gt;write(mtd, to, count, &amp;retlen, buf);</div><div class='ctx'> 	if (retlen != count) {</div><div class='ctx'> 		printk("Didn't write all bytes in flash_safe_write(). Returned %d\n", res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -300,9 +299,9 @@ flash_safe_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> </div><div class='ctx'> 	D3(printk(KERN_NOTICE "flash_safe_writev(%p, %08x, %p)\n",</div><div class='ctx'> 		  mtd, (unsigned int) to, vecs));</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (mtd-&gt;writev) {</div><div class='del'>-		res = MTD_WRITEV(mtd, vecs, iovec_cnt, to, &amp;retlen);</div><div class='add'>+		res = mtd-&gt;writev(mtd, vecs, iovec_cnt, to, &amp;retlen);</div><div class='ctx'> 		return res ? res : retlen;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Not implemented writev. Repeatedly use write - on the not so</div><div class='hunk'>@@ -312,7 +311,8 @@ flash_safe_writev(struct mtd_info *mtd, const struct kvec *vecs,</div><div class='ctx'> 	retlen=0;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; !res &amp;&amp; i&lt;iovec_cnt; i++) {</div><div class='del'>-		res = MTD_WRITE(mtd, to, vecs[i].iov_len, &amp;retlen_a, vecs[i].iov_base);</div><div class='add'>+		res = mtd-&gt;write(mtd, to, vecs[i].iov_len, &amp;retlen_a,</div><div class='add'>+				 vecs[i].iov_base);</div><div class='ctx'> 		if (retlen_a != vecs[i].iov_len) {</div><div class='ctx'> 			printk("Didn't write all bytes in flash_safe_writev(). Returned %d\n", res);</div><div class='ctx'> 			if (i != iovec_cnt-1)</div><div class='hunk'>@@ -393,7 +393,7 @@ flash_erase_region(struct mtd_info *mtd, loff_t start,</div><div class='ctx'> 	set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 	add_wait_queue(&amp;wait_q, &amp;wait);</div><div class='ctx'> </div><div class='del'>-	if (MTD_ERASE(mtd, erase) &lt; 0) {</div><div class='add'>+	if (mtd-&gt;erase(mtd, erase) &lt; 0) {</div><div class='ctx'> 		set_current_state(TASK_RUNNING);</div><div class='ctx'> 		remove_wait_queue(&amp;wait_q, &amp;wait);</div><div class='ctx'> 		kfree(erase);</div><div class='head'>diff --git a/fs/jffs/jffs_fm.h b/fs/jffs/jffs_fm.h<br/>index c794d923df2a..9ee6ad29eff5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs/jffs_fm.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs/jffs_fm.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs/jffs_fm.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs/jffs_fm.h</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'> #ifndef __LINUX_JFFS_FM_H__</div><div class='ctx'> #define __LINUX_JFFS_FM_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/jffs.h&gt;</div><div class='ctx'> #include &lt;linux/mtd/mtd.h&gt;</div><div class='head'>diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile<br/>index 77dc5561a04e..7f28ee0bd132 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/Makefile</a></div><div class='hunk'>@@ -12,6 +12,9 @@ jffs2-y	+= symlink.o build.o erase.o background.o fs.o writev.o</div><div class='ctx'> jffs2-y	+= super.o debug.o</div><div class='ctx'> </div><div class='ctx'> jffs2-$(CONFIG_JFFS2_FS_WRITEBUFFER)	+= wbuf.o</div><div class='add'>+jffs2-$(CONFIG_JFFS2_FS_XATTR)		+= xattr.o xattr_trusted.o xattr_user.o</div><div class='add'>+jffs2-$(CONFIG_JFFS2_FS_SECURITY)	+= security.o</div><div class='add'>+jffs2-$(CONFIG_JFFS2_FS_POSIX_ACL)	+= acl.o</div><div class='ctx'> jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rubin.o</div><div class='ctx'> jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o</div><div class='ctx'> jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o</div><div class='head'>diff --git a/fs/jffs2/README.Locking b/fs/jffs2/README.Locking<br/>index b7943439b6ec..c8f0bd64e53e 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/README.Locking?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/README.Locking</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/README.Locking?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/README.Locking</a></div><div class='hunk'>@@ -150,3 +150,24 @@ the buffer.</div><div class='ctx'> </div><div class='ctx'> Ordering constraints:</div><div class='ctx'> 	Lock wbuf_sem last, after the alloc_sem or and f-&gt;sem.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	c-&gt;xattr_sem</div><div class='add'>+	------------</div><div class='add'>+</div><div class='add'>+This read/write semaphore protects against concurrent access to the</div><div class='add'>+xattr related objects which include stuff in superblock and ic-&gt;xref.</div><div class='add'>+In read-only path, write-semaphore is too much exclusion. It's enough</div><div class='add'>+by read-semaphore. But you must hold write-semaphore when updating,</div><div class='add'>+creating or deleting any xattr related object.</div><div class='add'>+</div><div class='add'>+Once xattr_sem released, there would be no assurance for the existence</div><div class='add'>+of those objects. Thus, a series of processes is often required to retry,</div><div class='add'>+when updating such a object is necessary under holding read semaphore.</div><div class='add'>+For example, do_jffs2_getxattr() holds read-semaphore to scan xref and</div><div class='add'>+xdatum at first. But it retries this process with holding write-semaphore</div><div class='add'>+after release read-semaphore, if it's necessary to load name/value pair</div><div class='add'>+from medium.</div><div class='add'>+</div><div class='add'>+Ordering constraints:</div><div class='add'>+	Lock xattr_sem last, after the alloc_sem.</div><div class='head'>diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c<br/>new file mode 100644<br/>index 000000000000..0ae3cd10702c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/acl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/acl.c</a></div><div class='hunk'>@@ -0,0 +1,485 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/jffs2.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/posix_acl_xattr.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include "nodelist.h"</div><div class='add'>+</div><div class='add'>+static size_t jffs2_acl_size(int count)</div><div class='add'>+{</div><div class='add'>+	if (count &lt;= 4) {</div><div class='add'>+		return sizeof(struct jffs2_acl_header)</div><div class='add'>+		       + count * sizeof(struct jffs2_acl_entry_short);</div><div class='add'>+	} else {</div><div class='add'>+		return sizeof(struct jffs2_acl_header)</div><div class='add'>+		       + 4 * sizeof(struct jffs2_acl_entry_short)</div><div class='add'>+		       + (count - 4) * sizeof(struct jffs2_acl_entry);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_count(size_t size)</div><div class='add'>+{</div><div class='add'>+	size_t s;</div><div class='add'>+</div><div class='add'>+	size -= sizeof(struct jffs2_acl_header);</div><div class='add'>+	s = size - 4 * sizeof(struct jffs2_acl_entry_short);</div><div class='add'>+	if (s &lt; 0) {</div><div class='add'>+		if (size % sizeof(struct jffs2_acl_entry_short))</div><div class='add'>+			return -1;</div><div class='add'>+		return size / sizeof(struct jffs2_acl_entry_short);</div><div class='add'>+	} else {</div><div class='add'>+		if (s % sizeof(struct jffs2_acl_entry))</div><div class='add'>+			return -1;</div><div class='add'>+		return s / sizeof(struct jffs2_acl_entry) + 4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct posix_acl *jffs2_acl_from_medium(void *value, size_t size)</div><div class='add'>+{</div><div class='add'>+	void *end = value + size;</div><div class='add'>+	struct jffs2_acl_header *header = value;</div><div class='add'>+	struct jffs2_acl_entry *entry;</div><div class='add'>+	struct posix_acl *acl;</div><div class='add'>+	uint32_t ver;</div><div class='add'>+	int i, count;</div><div class='add'>+</div><div class='add'>+	if (!value)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (size &lt; sizeof(struct jffs2_acl_header))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	ver = je32_to_cpu(header-&gt;a_version);</div><div class='add'>+	if (ver != JFFS2_ACL_VERSION) {</div><div class='add'>+		JFFS2_WARNING("Invalid ACL version. (=%u)\n", ver);</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value += sizeof(struct jffs2_acl_header);</div><div class='add'>+	count = jffs2_acl_count(size);</div><div class='add'>+	if (count &lt; 0)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (count == 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	acl = posix_acl_alloc(count, GFP_KERNEL);</div><div class='add'>+	if (!acl)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; count; i++) {</div><div class='add'>+		entry = value;</div><div class='add'>+		if (value + sizeof(struct jffs2_acl_entry_short) &gt; end)</div><div class='add'>+			goto fail;</div><div class='add'>+		acl-&gt;a_entries[i].e_tag = je16_to_cpu(entry-&gt;e_tag);</div><div class='add'>+		acl-&gt;a_entries[i].e_perm = je16_to_cpu(entry-&gt;e_perm);</div><div class='add'>+		switch (acl-&gt;a_entries[i].e_tag) {</div><div class='add'>+			case ACL_USER_OBJ:</div><div class='add'>+			case ACL_GROUP_OBJ:</div><div class='add'>+			case ACL_MASK:</div><div class='add'>+			case ACL_OTHER:</div><div class='add'>+				value += sizeof(struct jffs2_acl_entry_short);</div><div class='add'>+				acl-&gt;a_entries[i].e_id = ACL_UNDEFINED_ID;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case ACL_USER:</div><div class='add'>+			case ACL_GROUP:</div><div class='add'>+				value += sizeof(struct jffs2_acl_entry);</div><div class='add'>+				if (value &gt; end)</div><div class='add'>+					goto fail;</div><div class='add'>+				acl-&gt;a_entries[i].e_id = je32_to_cpu(entry-&gt;e_id);</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			default:</div><div class='add'>+				goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (value != end)</div><div class='add'>+		goto fail;</div><div class='add'>+	return acl;</div><div class='add'>+ fail:</div><div class='add'>+	posix_acl_release(acl);</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *jffs2_acl_to_medium(const struct posix_acl *acl, size_t *size)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_acl_header *header;</div><div class='add'>+	struct jffs2_acl_entry *entry;</div><div class='add'>+	void *e;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	*size = jffs2_acl_size(acl-&gt;a_count);</div><div class='add'>+	header = kmalloc(sizeof(*header) + acl-&gt;a_count * sizeof(*entry), GFP_KERNEL);</div><div class='add'>+	if (!header)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	header-&gt;a_version = cpu_to_je32(JFFS2_ACL_VERSION);</div><div class='add'>+	e = header + 1;</div><div class='add'>+	for (i=0; i &lt; acl-&gt;a_count; i++) {</div><div class='add'>+		entry = e;</div><div class='add'>+		entry-&gt;e_tag = cpu_to_je16(acl-&gt;a_entries[i].e_tag);</div><div class='add'>+		entry-&gt;e_perm = cpu_to_je16(acl-&gt;a_entries[i].e_perm);</div><div class='add'>+		switch(acl-&gt;a_entries[i].e_tag) {</div><div class='add'>+			case ACL_USER:</div><div class='add'>+			case ACL_GROUP:</div><div class='add'>+				entry-&gt;e_id = cpu_to_je32(acl-&gt;a_entries[i].e_id);</div><div class='add'>+				e += sizeof(struct jffs2_acl_entry);</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case ACL_USER_OBJ:</div><div class='add'>+			case ACL_GROUP_OBJ:</div><div class='add'>+			case ACL_MASK:</div><div class='add'>+			case ACL_OTHER:</div><div class='add'>+				e += sizeof(struct jffs2_acl_entry_short);</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			default:</div><div class='add'>+				goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return header;</div><div class='add'>+ fail:</div><div class='add'>+	kfree(header);</div><div class='add'>+	return ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct posix_acl *jffs2_iget_acl(struct inode *inode, struct posix_acl **i_acl)</div><div class='add'>+{</div><div class='add'>+	struct posix_acl *acl = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (*i_acl != JFFS2_ACL_NOT_CACHED)</div><div class='add'>+		acl = posix_acl_dup(*i_acl);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	return acl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void jffs2_iset_acl(struct inode *inode, struct posix_acl **i_acl, struct posix_acl *acl)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;inode-&gt;i_lock);</div><div class='add'>+	if (*i_acl != JFFS2_ACL_NOT_CACHED)</div><div class='add'>+		posix_acl_release(*i_acl);</div><div class='add'>+	*i_acl = posix_acl_dup(acl);</div><div class='add'>+	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct posix_acl *jffs2_get_acl(struct inode *inode, int type)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='add'>+	struct posix_acl *acl;</div><div class='add'>+	char *value = NULL;</div><div class='add'>+	int rc, xprefix;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACL_TYPE_ACCESS:</div><div class='add'>+		acl = jffs2_iget_acl(inode, &amp;f-&gt;i_acl_access);</div><div class='add'>+		if (acl != JFFS2_ACL_NOT_CACHED)</div><div class='add'>+			return acl;</div><div class='add'>+		xprefix = JFFS2_XPREFIX_ACL_ACCESS;</div><div class='add'>+		break;</div><div class='add'>+	case ACL_TYPE_DEFAULT:</div><div class='add'>+		acl = jffs2_iget_acl(inode, &amp;f-&gt;i_acl_default);</div><div class='add'>+		if (acl != JFFS2_ACL_NOT_CACHED)</div><div class='add'>+			return acl;</div><div class='add'>+		xprefix = JFFS2_XPREFIX_ACL_DEFAULT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	}</div><div class='add'>+	rc = do_jffs2_getxattr(inode, xprefix, "", NULL, 0);</div><div class='add'>+	if (rc &gt; 0) {</div><div class='add'>+		value = kmalloc(rc, GFP_KERNEL);</div><div class='add'>+		if (!value)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		rc = do_jffs2_getxattr(inode, xprefix, "", value, rc);</div><div class='add'>+	}</div><div class='add'>+	if (rc &gt; 0) {</div><div class='add'>+		acl = jffs2_acl_from_medium(value, rc);</div><div class='add'>+	} else if (rc == -ENODATA || rc == -ENOSYS) {</div><div class='add'>+		acl = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		acl = ERR_PTR(rc);</div><div class='add'>+	}</div><div class='add'>+	if (value)</div><div class='add'>+		kfree(value);</div><div class='add'>+	if (!IS_ERR(acl)) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case ACL_TYPE_ACCESS:</div><div class='add'>+			jffs2_iset_acl(inode, &amp;f-&gt;i_acl_access, acl);</div><div class='add'>+			break;</div><div class='add'>+		case ACL_TYPE_DEFAULT:</div><div class='add'>+			jffs2_iset_acl(inode, &amp;f-&gt;i_acl_default, acl);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return acl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='add'>+	size_t size = 0;</div><div class='add'>+	char *value = NULL;</div><div class='add'>+	int rc, xprefix;</div><div class='add'>+</div><div class='add'>+	if (S_ISLNK(inode-&gt;i_mode))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ACL_TYPE_ACCESS:</div><div class='add'>+		xprefix = JFFS2_XPREFIX_ACL_ACCESS;</div><div class='add'>+		if (acl) {</div><div class='add'>+			mode_t mode = inode-&gt;i_mode;</div><div class='add'>+			rc = posix_acl_equiv_mode(acl, &amp;mode);</div><div class='add'>+			if (rc &lt; 0)</div><div class='add'>+				return rc;</div><div class='add'>+			if (inode-&gt;i_mode != mode) {</div><div class='add'>+				inode-&gt;i_mode = mode;</div><div class='add'>+				jffs2_dirty_inode(inode);</div><div class='add'>+			}</div><div class='add'>+			if (rc == 0)</div><div class='add'>+				acl = NULL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ACL_TYPE_DEFAULT:</div><div class='add'>+		xprefix = JFFS2_XPREFIX_ACL_DEFAULT;</div><div class='add'>+		if (!S_ISDIR(inode-&gt;i_mode))</div><div class='add'>+			return acl ? -EACCES : 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (acl) {</div><div class='add'>+		value = jffs2_acl_to_medium(acl, &amp;size);</div><div class='add'>+		if (IS_ERR(value))</div><div class='add'>+			return PTR_ERR(value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = do_jffs2_setxattr(inode, xprefix, "", value, size, 0);</div><div class='add'>+	if (!value &amp;&amp; rc == -ENODATA)</div><div class='add'>+		rc = 0;</div><div class='add'>+	if (value)</div><div class='add'>+		kfree(value);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		switch(type) {</div><div class='add'>+		case ACL_TYPE_ACCESS:</div><div class='add'>+			jffs2_iset_acl(inode, &amp;f-&gt;i_acl_access, acl);</div><div class='add'>+			break;</div><div class='add'>+		case ACL_TYPE_DEFAULT:</div><div class='add'>+			jffs2_iset_acl(inode, &amp;f-&gt;i_acl_default, acl);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_check_acl(struct inode *inode, int mask)</div><div class='add'>+{</div><div class='add'>+	struct posix_acl *acl;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	acl = jffs2_get_acl(inode, ACL_TYPE_ACCESS);</div><div class='add'>+	if (IS_ERR(acl))</div><div class='add'>+		return PTR_ERR(acl);</div><div class='add'>+	if (acl) {</div><div class='add'>+		rc = posix_acl_permission(inode, acl, mask);</div><div class='add'>+		posix_acl_release(acl);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	return -EAGAIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_permission(struct inode *inode, int mask, struct nameidata *nd)</div><div class='add'>+{</div><div class='add'>+	return generic_permission(inode, mask, jffs2_check_acl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_init_acl(struct inode *inode, struct inode *dir)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='add'>+	struct posix_acl *acl = NULL, *clone;</div><div class='add'>+	mode_t mode;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	f-&gt;i_acl_access = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+	f-&gt;i_acl_default = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+	if (!S_ISLNK(inode-&gt;i_mode)) {</div><div class='add'>+		acl = jffs2_get_acl(dir, ACL_TYPE_DEFAULT);</div><div class='add'>+		if (IS_ERR(acl))</div><div class='add'>+			return PTR_ERR(acl);</div><div class='add'>+		if (!acl)</div><div class='add'>+			inode-&gt;i_mode &amp;= ~current-&gt;fs-&gt;umask;</div><div class='add'>+	}</div><div class='add'>+	if (acl) {</div><div class='add'>+		if (S_ISDIR(inode-&gt;i_mode)) {</div><div class='add'>+			rc = jffs2_set_acl(inode, ACL_TYPE_DEFAULT, acl);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto cleanup;</div><div class='add'>+		}</div><div class='add'>+		clone = posix_acl_clone(acl, GFP_KERNEL);</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		if (!clone)</div><div class='add'>+			goto cleanup;</div><div class='add'>+		mode = inode-&gt;i_mode;</div><div class='add'>+		rc = posix_acl_create_masq(clone, &amp;mode);</div><div class='add'>+		if (rc &gt;= 0) {</div><div class='add'>+			inode-&gt;i_mode = mode;</div><div class='add'>+			if (rc &gt; 0)</div><div class='add'>+				rc = jffs2_set_acl(inode, ACL_TYPE_ACCESS, clone);</div><div class='add'>+		}</div><div class='add'>+		posix_acl_release(clone);</div><div class='add'>+	}</div><div class='add'>+ cleanup:</div><div class='add'>+	posix_acl_release(acl);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_clear_acl(struct jffs2_inode_info *f)</div><div class='add'>+{</div><div class='add'>+	if (f-&gt;i_acl_access &amp;&amp; f-&gt;i_acl_access != JFFS2_ACL_NOT_CACHED) {</div><div class='add'>+		posix_acl_release(f-&gt;i_acl_access);</div><div class='add'>+		f-&gt;i_acl_access = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+	}</div><div class='add'>+	if (f-&gt;i_acl_default &amp;&amp; f-&gt;i_acl_default != JFFS2_ACL_NOT_CACHED) {</div><div class='add'>+		posix_acl_release(f-&gt;i_acl_default);</div><div class='add'>+		f-&gt;i_acl_default = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_acl_chmod(struct inode *inode)</div><div class='add'>+{</div><div class='add'>+	struct posix_acl *acl, *clone;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (S_ISLNK(inode-&gt;i_mode))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	acl = jffs2_get_acl(inode, ACL_TYPE_ACCESS);</div><div class='add'>+	if (IS_ERR(acl) || !acl)</div><div class='add'>+		return PTR_ERR(acl);</div><div class='add'>+	clone = posix_acl_clone(acl, GFP_KERNEL);</div><div class='add'>+	posix_acl_release(acl);</div><div class='add'>+	if (!clone)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	rc = posix_acl_chmod_masq(clone, inode-&gt;i_mode);</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = jffs2_set_acl(inode, ACL_TYPE_ACCESS, clone);</div><div class='add'>+	posix_acl_release(clone);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t jffs2_acl_access_listxattr(struct inode *inode, char *list, size_t list_size,</div><div class='add'>+					 const char *name, size_t name_len)</div><div class='add'>+{</div><div class='add'>+	const int retlen = sizeof(POSIX_ACL_XATTR_ACCESS);</div><div class='add'>+</div><div class='add'>+	if (list &amp;&amp; retlen &lt;= list_size)</div><div class='add'>+		strcpy(list, POSIX_ACL_XATTR_ACCESS);</div><div class='add'>+	return retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t jffs2_acl_default_listxattr(struct inode *inode, char *list, size_t list_size,</div><div class='add'>+					  const char *name, size_t name_len)</div><div class='add'>+{</div><div class='add'>+	const int retlen = sizeof(POSIX_ACL_XATTR_DEFAULT);</div><div class='add'>+</div><div class='add'>+	if (list &amp;&amp; retlen &lt;= list_size)</div><div class='add'>+		strcpy(list, POSIX_ACL_XATTR_DEFAULT);</div><div class='add'>+	return retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_getxattr(struct inode *inode, int type, void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct posix_acl *acl;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	acl = jffs2_get_acl(inode, type);</div><div class='add'>+	if (IS_ERR(acl))</div><div class='add'>+		return PTR_ERR(acl);</div><div class='add'>+	if (!acl)</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	rc = posix_acl_to_xattr(acl, buffer, size);</div><div class='add'>+	posix_acl_release(acl);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_access_getxattr(struct inode *inode, const char *name, void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (name[0] != '\0')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return jffs2_acl_getxattr(inode, ACL_TYPE_ACCESS, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_default_getxattr(struct inode *inode, const char *name, void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (name[0] != '\0')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return jffs2_acl_getxattr(inode, ACL_TYPE_DEFAULT, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_setxattr(struct inode *inode, int type, const void *value, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct posix_acl *acl;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if ((current-&gt;fsuid != inode-&gt;i_uid) &amp;&amp; !capable(CAP_FOWNER))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (value) {</div><div class='add'>+		acl = posix_acl_from_xattr(value, size);</div><div class='add'>+		if (IS_ERR(acl))</div><div class='add'>+			return PTR_ERR(acl);</div><div class='add'>+		if (acl) {</div><div class='add'>+			rc = posix_acl_valid(acl);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		acl = NULL;</div><div class='add'>+	}</div><div class='add'>+	rc = jffs2_set_acl(inode, type, acl);</div><div class='add'>+ out:</div><div class='add'>+	posix_acl_release(acl);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_access_setxattr(struct inode *inode, const char *name,</div><div class='add'>+				     const void *buffer, size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	if (name[0] != '\0')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return jffs2_acl_setxattr(inode, ACL_TYPE_ACCESS, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_acl_default_setxattr(struct inode *inode, const char *name,</div><div class='add'>+				      const void *buffer, size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	if (name[0] != '\0')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return jffs2_acl_setxattr(inode, ACL_TYPE_DEFAULT, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xattr_handler jffs2_acl_access_xattr_handler = {</div><div class='add'>+	.prefix	= POSIX_ACL_XATTR_ACCESS,</div><div class='add'>+	.list	= jffs2_acl_access_listxattr,</div><div class='add'>+	.get	= jffs2_acl_access_getxattr,</div><div class='add'>+	.set	= jffs2_acl_access_setxattr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xattr_handler jffs2_acl_default_xattr_handler = {</div><div class='add'>+	.prefix	= POSIX_ACL_XATTR_DEFAULT,</div><div class='add'>+	.list	= jffs2_acl_default_listxattr,</div><div class='add'>+	.get	= jffs2_acl_default_getxattr,</div><div class='add'>+	.set	= jffs2_acl_default_setxattr,</div><div class='add'>+};</div><div class='head'>diff --git a/fs/jffs2/acl.h b/fs/jffs2/acl.h<br/>new file mode 100644<br/>index 000000000000..fa327dbd3171<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/acl.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/acl.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct jffs2_acl_entry {</div><div class='add'>+	jint16_t	e_tag;</div><div class='add'>+	jint16_t	e_perm;</div><div class='add'>+	jint32_t	e_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct jffs2_acl_entry_short {</div><div class='add'>+	jint16_t	e_tag;</div><div class='add'>+	jint16_t	e_perm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct jffs2_acl_header {</div><div class='add'>+	jint32_t	a_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_POSIX_ACL</div><div class='add'>+</div><div class='add'>+#define JFFS2_ACL_NOT_CACHED ((void *)-1)</div><div class='add'>+</div><div class='add'>+extern int jffs2_permission(struct inode *, int, struct nameidata *);</div><div class='add'>+extern int jffs2_acl_chmod(struct inode *);</div><div class='add'>+extern int jffs2_init_acl(struct inode *, struct inode *);</div><div class='add'>+extern void jffs2_clear_acl(struct jffs2_inode_info *);</div><div class='add'>+</div><div class='add'>+extern struct xattr_handler jffs2_acl_access_xattr_handler;</div><div class='add'>+extern struct xattr_handler jffs2_acl_default_xattr_handler;</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define jffs2_permission NULL</div><div class='add'>+#define jffs2_acl_chmod(inode)		(0)</div><div class='add'>+#define jffs2_init_acl(inode,dir)	(0)</div><div class='add'>+#define jffs2_clear_acl(f)</div><div class='add'>+</div><div class='add'>+#endif	/* CONFIG_JFFS2_FS_POSIX_ACL */</div><div class='head'>diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c<br/>index 70f7a896c04a..02826967ab58 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/build.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/build.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/build.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/build.c</a></div><div class='hunk'>@@ -160,6 +160,7 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c)</div><div class='ctx'> 		ic-&gt;scan_dents = NULL;</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='add'>+	jffs2_build_xattr_subsystem(c);</div><div class='ctx'> 	c-&gt;flags &amp;= ~JFFS2_SB_FLAG_BUILDING;</div><div class='ctx'> </div><div class='ctx'> 	dbg_fsbuild("FS build complete\n");</div><div class='hunk'>@@ -178,6 +179,7 @@ exit:</div><div class='ctx'> 				jffs2_free_full_dirent(fd);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		jffs2_clear_xattr_subsystem(c);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='head'>diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c<br/>index e7944e665b9f..7001ba26c067 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/compr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/compr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/compr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/compr.c</a></div><div class='hunk'>@@ -412,7 +412,7 @@ void jffs2_free_comprbuf(unsigned char *comprbuf, unsigned char *orig)</div><div class='ctx'>                 kfree(comprbuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jffs2_compressors_init(void)</div><div class='add'>+int __init jffs2_compressors_init(void)</div><div class='ctx'> {</div><div class='ctx'> /* Registering compressors */</div><div class='ctx'> #ifdef CONFIG_JFFS2_ZLIB</div><div class='head'>diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h<br/>index a77e830d85c5..509b8b1c0811 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/compr.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/compr.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/compr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/compr.h</a></div><div class='hunk'>@@ -23,8 +23,8 @@</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/jffs2.h&gt;</div><div class='del'>-#include &lt;linux/jffs2_fs_i.h&gt;</div><div class='del'>-#include &lt;linux/jffs2_fs_sb.h&gt;</div><div class='add'>+#include "jffs2_fs_i.h"</div><div class='add'>+#include "jffs2_fs_sb.h"</div><div class='ctx'> #include "nodelist.h"</div><div class='ctx'> </div><div class='ctx'> #define JFFS2_RUBINMIPS_PRIORITY 10</div><div class='head'>diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c<br/>index 5c63e0cdcf4c..3681d0728ac7 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/compr_zlib.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/compr_zlib.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/compr_zlib.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/compr_zlib.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'> #error "The userspace support got too messy and was removed. Update your mkfs.jffs2"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/fs/jffs2/debug.c b/fs/jffs2/debug.c<br/>index 1fe17de713e8..72b4fc13a106 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/debug.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/debug.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/debug.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/debug.c</a></div><div class='hunk'>@@ -192,13 +192,13 @@ __jffs2_dbg_acct_paranoia_check_nolock(struct jffs2_sb_info *c,</div><div class='ctx'> 		else</div><div class='ctx'> 			my_dirty_size += totlen;</div><div class='ctx'> </div><div class='del'>-		if ((!ref2-&gt;next_phys) != (ref2 == jeb-&gt;last_node)) {</div><div class='del'>-			JFFS2_ERROR("node_ref for node at %#08x (mem %p) has next_phys at %#08x (mem %p), last_node is at %#08x (mem %p).\n",</div><div class='del'>-				ref_offset(ref2), ref2, ref_offset(ref2-&gt;next_phys), ref2-&gt;next_phys,</div><div class='del'>-				ref_offset(jeb-&gt;last_node), jeb-&gt;last_node);</div><div class='add'>+		if ((!ref_next(ref2)) != (ref2 == jeb-&gt;last_node)) {</div><div class='add'>+			JFFS2_ERROR("node_ref for node at %#08x (mem %p) has next at %#08x (mem %p), last_node is at %#08x (mem %p).\n",</div><div class='add'>+				    ref_offset(ref2), ref2, ref_offset(ref_next(ref2)), ref_next(ref2),</div><div class='add'>+				    ref_offset(jeb-&gt;last_node), jeb-&gt;last_node);</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		ref2 = ref2-&gt;next_phys;</div><div class='add'>+		ref2 = ref_next(ref2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (my_used_size != jeb-&gt;used_size) {</div><div class='hunk'>@@ -268,9 +268,9 @@ __jffs2_dbg_dump_node_refs_nolock(struct jffs2_sb_info *c,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	printk(JFFS2_DBG);</div><div class='del'>-	for (ref = jeb-&gt;first_node; ; ref = ref-&gt;next_phys) {</div><div class='add'>+	for (ref = jeb-&gt;first_node; ; ref = ref_next(ref)) {</div><div class='ctx'> 		printk("%#08x(%#x)", ref_offset(ref), ref-&gt;__totlen);</div><div class='del'>-		if (ref-&gt;next_phys)</div><div class='add'>+		if (ref_next(ref))</div><div class='ctx'> 			printk("-&gt;");</div><div class='ctx'> 		else</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h<br/>index 162af6dfe292..3daf3bca0376 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/debug.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/debug.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/debug.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/debug.h</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'> #ifndef _JFFS2_DEBUG_H_</div><div class='ctx'> #define _JFFS2_DEBUG_H_</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_JFFS2_FS_DEBUG</div><div class='ctx'> #define CONFIG_JFFS2_FS_DEBUG 0</div><div class='hunk'>@@ -171,6 +170,12 @@</div><div class='ctx'> #define dbg_memalloc(fmt, ...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* Watch the XATTR subsystem */</div><div class='add'>+#ifdef JFFS2_DBG_XATTR_MESSAGES</div><div class='add'>+#define dbg_xattr(fmt, ...)  JFFS2_DEBUG(fmt, ##__VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define dbg_xattr(fmt, ...)</div><div class='add'>+#endif </div><div class='ctx'> </div><div class='ctx'> /* "Sanity" checks */</div><div class='ctx'> void</div><div class='head'>diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c<br/>index 8bc7a5018e40..edd8371fc6a5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/dir.c</a></div><div class='hunk'>@@ -17,8 +17,8 @@</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/jffs2.h&gt;</div><div class='del'>-#include &lt;linux/jffs2_fs_i.h&gt;</div><div class='del'>-#include &lt;linux/jffs2_fs_sb.h&gt;</div><div class='add'>+#include "jffs2_fs_i.h"</div><div class='add'>+#include "jffs2_fs_sb.h"</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include "nodelist.h"</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +57,12 @@ struct inode_operations jffs2_dir_inode_operations =</div><div class='ctx'> 	.rmdir =	jffs2_rmdir,</div><div class='ctx'> 	.mknod =	jffs2_mknod,</div><div class='ctx'> 	.rename =	jffs2_rename,</div><div class='add'>+	.permission =	jffs2_permission,</div><div class='ctx'> 	.setattr =	jffs2_setattr,</div><div class='add'>+	.setxattr =	jffs2_setxattr,</div><div class='add'>+	.getxattr =	jffs2_getxattr,</div><div class='add'>+	.listxattr =	jffs2_listxattr,</div><div class='add'>+	.removexattr =	jffs2_removexattr</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /***********************************************************************/</div><div class='hunk'>@@ -78,6 +83,9 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_lookup()\n"));</div><div class='ctx'> </div><div class='add'>+	if (target-&gt;d_name.len &gt; JFFS2_MAX_NAME_LEN)</div><div class='add'>+		return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+</div><div class='ctx'> 	dir_f = JFFS2_INODE_INFO(dir_i);</div><div class='ctx'> 	c = JFFS2_SB_INFO(dir_i-&gt;i_sb);</div><div class='ctx'> </div><div class='hunk'>@@ -206,12 +214,15 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, int mode,</div><div class='ctx'> 	ret = jffs2_do_create(c, dir_f, f, ri,</div><div class='ctx'> 			      dentry-&gt;d_name.name, dentry-&gt;d_name.len);</div><div class='ctx'> </div><div class='del'>-	if (ret) {</div><div class='del'>-		make_bad_inode(inode);</div><div class='del'>-		iput(inode);</div><div class='del'>-		jffs2_free_raw_inode(ri);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	ret = jffs2_init_security(inode, dir_i);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='add'>+	ret = jffs2_init_acl(inode, dir_i);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail;</div><div class='ctx'> </div><div class='ctx'> 	dir_i-&gt;i_mtime = dir_i-&gt;i_ctime = ITIME(je32_to_cpu(ri-&gt;ctime));</div><div class='ctx'> </div><div class='hunk'>@@ -221,6 +232,12 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, int mode,</div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_create: Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",</div><div class='ctx'> 		  inode-&gt;i_ino, inode-&gt;i_mode, inode-&gt;i_nlink, f-&gt;inocache-&gt;nlink, inode-&gt;i_mapping-&gt;nrpages));</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ fail:</div><div class='add'>+	make_bad_inode(inode);</div><div class='add'>+	iput(inode);</div><div class='add'>+	jffs2_free_raw_inode(ri);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /***********************************************************************/</div><div class='hunk'>@@ -291,7 +308,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char</div><div class='ctx'> 	struct jffs2_full_dnode *fn;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='ctx'> 	int namelen;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret, targetlen = strlen(target);</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: If you care. We'd need to use frags for the target</div><div class='hunk'>@@ -310,8 +327,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char</div><div class='ctx'> 	 * Just the node will do for now, though</div><div class='ctx'> 	 */</div><div class='ctx'> 	namelen = dentry-&gt;d_name.len;</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*ri) + targetlen, &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*ri) + targetlen, &amp;alloclen,</div><div class='add'>+				  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		jffs2_free_raw_inode(ri);</div><div class='hunk'>@@ -339,7 +356,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char</div><div class='ctx'> 	ri-&gt;data_crc = cpu_to_je32(crc32(0, target, targetlen));</div><div class='ctx'> 	ri-&gt;node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));</div><div class='ctx'> </div><div class='del'>-	fn = jffs2_write_dnode(c, f, ri, target, targetlen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fn = jffs2_write_dnode(c, f, ri, target, targetlen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_free_raw_inode(ri);</div><div class='ctx'> </div><div class='hunk'>@@ -371,8 +388,20 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char</div><div class='ctx'> 	up(&amp;f-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_complete_reservation(c);</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='add'>+</div><div class='add'>+	ret = jffs2_init_security(inode, dir_i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_clear_inode(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = jffs2_init_acl(inode, dir_i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_clear_inode(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;alloclen,</div><div class='add'>+				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* Eep. */</div><div class='ctx'> 		jffs2_clear_inode(inode);</div><div class='hunk'>@@ -404,7 +433,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char</div><div class='ctx'> 	rd-&gt;node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));</div><div class='ctx'> 	rd-&gt;name_crc = cpu_to_je32(crc32(0, dentry-&gt;d_name.name, namelen));</div><div class='ctx'> </div><div class='del'>-	fd = jffs2_write_dirent(c, dir_f, rd, dentry-&gt;d_name.name, namelen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fd = jffs2_write_dirent(c, dir_f, rd, dentry-&gt;d_name.name, namelen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(fd)) {</div><div class='ctx'> 		/* dirent failed to write. Delete the inode normally</div><div class='hunk'>@@ -442,7 +471,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)</div><div class='ctx'> 	struct jffs2_full_dnode *fn;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='ctx'> 	int namelen;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	mode |= S_IFDIR;</div><div class='hunk'>@@ -457,8 +486,8 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)</div><div class='ctx'> 	 * Just the node will do for now, though</div><div class='ctx'> 	 */</div><div class='ctx'> 	namelen = dentry-&gt;d_name.len;</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*ri), &amp;phys_ofs, &amp;alloclen, ALLOC_NORMAL,</div><div class='del'>-				JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*ri), &amp;alloclen, ALLOC_NORMAL,</div><div class='add'>+				  JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		jffs2_free_raw_inode(ri);</div><div class='hunk'>@@ -483,7 +512,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)</div><div class='ctx'> 	ri-&gt;data_crc = cpu_to_je32(0);</div><div class='ctx'> 	ri-&gt;node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));</div><div class='ctx'> </div><div class='del'>-	fn = jffs2_write_dnode(c, f, ri, NULL, 0, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fn = jffs2_write_dnode(c, f, ri, NULL, 0, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_free_raw_inode(ri);</div><div class='ctx'> </div><div class='hunk'>@@ -501,8 +530,20 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)</div><div class='ctx'> 	up(&amp;f-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_complete_reservation(c);</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='add'>+</div><div class='add'>+	ret = jffs2_init_security(inode, dir_i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_clear_inode(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = jffs2_init_acl(inode, dir_i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_clear_inode(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;alloclen,</div><div class='add'>+				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* Eep. */</div><div class='ctx'> 		jffs2_clear_inode(inode);</div><div class='hunk'>@@ -534,7 +575,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)</div><div class='ctx'> 	rd-&gt;node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));</div><div class='ctx'> 	rd-&gt;name_crc = cpu_to_je32(crc32(0, dentry-&gt;d_name.name, namelen));</div><div class='ctx'> </div><div class='del'>-	fd = jffs2_write_dirent(c, dir_f, rd, dentry-&gt;d_name.name, namelen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fd = jffs2_write_dirent(c, dir_f, rd, dentry-&gt;d_name.name, namelen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(fd)) {</div><div class='ctx'> 		/* dirent failed to write. Delete the inode normally</div><div class='hunk'>@@ -588,12 +629,12 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de</div><div class='ctx'> 	struct jffs2_full_dnode *fn;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='ctx'> 	int namelen;</div><div class='del'>-	jint16_t dev;</div><div class='add'>+	union jffs2_device_node dev;</div><div class='ctx'> 	int devlen = 0;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!old_valid_dev(rdev))</div><div class='add'>+	if (!new_valid_dev(rdev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ri = jffs2_alloc_raw_inode();</div><div class='hunk'>@@ -602,17 +643,15 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de</div><div class='ctx'> </div><div class='ctx'> 	c = JFFS2_SB_INFO(dir_i-&gt;i_sb);</div><div class='ctx'> </div><div class='del'>-	if (S_ISBLK(mode) || S_ISCHR(mode)) {</div><div class='del'>-		dev = cpu_to_je16(old_encode_dev(rdev));</div><div class='del'>-		devlen = sizeof(dev);</div><div class='del'>-	}</div><div class='add'>+	if (S_ISBLK(mode) || S_ISCHR(mode))</div><div class='add'>+		devlen = jffs2_encode_dev(&amp;dev, rdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Try to reserve enough space for both node and dirent.</div><div class='ctx'> 	 * Just the node will do for now, though</div><div class='ctx'> 	 */</div><div class='ctx'> 	namelen = dentry-&gt;d_name.len;</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*ri) + devlen, &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*ri) + devlen, &amp;alloclen,</div><div class='add'>+				  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		jffs2_free_raw_inode(ri);</div><div class='hunk'>@@ -639,7 +678,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de</div><div class='ctx'> 	ri-&gt;data_crc = cpu_to_je32(crc32(0, &amp;dev, devlen));</div><div class='ctx'> 	ri-&gt;node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));</div><div class='ctx'> </div><div class='del'>-	fn = jffs2_write_dnode(c, f, ri, (char *)&amp;dev, devlen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fn = jffs2_write_dnode(c, f, ri, (char *)&amp;dev, devlen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_free_raw_inode(ri);</div><div class='ctx'> </div><div class='hunk'>@@ -657,8 +696,20 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de</div><div class='ctx'> 	up(&amp;f-&gt;sem);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_complete_reservation(c);</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='add'>+</div><div class='add'>+	ret = jffs2_init_security(inode, dir_i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_clear_inode(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ret = jffs2_init_acl(inode, dir_i);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_clear_inode(inode);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;alloclen,</div><div class='add'>+				  ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* Eep. */</div><div class='ctx'> 		jffs2_clear_inode(inode);</div><div class='hunk'>@@ -693,7 +744,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de</div><div class='ctx'> 	rd-&gt;node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));</div><div class='ctx'> 	rd-&gt;name_crc = cpu_to_je32(crc32(0, dentry-&gt;d_name.name, namelen));</div><div class='ctx'> </div><div class='del'>-	fd = jffs2_write_dirent(c, dir_f, rd, dentry-&gt;d_name.name, namelen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fd = jffs2_write_dirent(c, dir_f, rd, dentry-&gt;d_name.name, namelen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(fd)) {</div><div class='ctx'> 		/* dirent failed to write. Delete the inode normally</div><div class='head'>diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c<br/>index dad68fdffe9e..ad0121088dde 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/erase.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/erase.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/erase.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/erase.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@ static void jffs2_erase_callback(struct erase_info *);</div><div class='ctx'> #endif</div><div class='ctx'> static void jffs2_erase_failed(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t bad_offset);</div><div class='ctx'> static void jffs2_erase_succeeded(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);</div><div class='del'>-static void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);</div><div class='ctx'> static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);</div><div class='ctx'> </div><div class='ctx'> static void jffs2_erase_block(struct jffs2_sb_info *c,</div><div class='hunk'>@@ -54,8 +53,7 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,</div><div class='ctx'> 	if (!instr) {</div><div class='ctx'> 		printk(KERN_WARNING "kmalloc for struct erase_info in jffs2_erase_block failed. Refiling block for later\n");</div><div class='ctx'> 		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-		list_del(&amp;jeb-&gt;list);</div><div class='del'>-		list_add(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='add'>+		list_move(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='ctx'> 		c-&gt;erasing_size -= c-&gt;sector_size;</div><div class='ctx'> 		c-&gt;dirty_size += c-&gt;sector_size;</div><div class='ctx'> 		jeb-&gt;dirty_size = c-&gt;sector_size;</div><div class='hunk'>@@ -87,8 +85,7 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,</div><div class='ctx'> 		/* Erase failed immediately. Refile it on the list */</div><div class='ctx'> 		D1(printk(KERN_DEBUG "Erase at 0x%08x failed: %d. Refiling on erase_pending_list\n", jeb-&gt;offset, ret));</div><div class='ctx'> 		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-		list_del(&amp;jeb-&gt;list);</div><div class='del'>-		list_add(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='add'>+		list_move(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='ctx'> 		c-&gt;erasing_size -= c-&gt;sector_size;</div><div class='ctx'> 		c-&gt;dirty_size += c-&gt;sector_size;</div><div class='ctx'> 		jeb-&gt;dirty_size = c-&gt;sector_size;</div><div class='hunk'>@@ -136,7 +133,7 @@ void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count)</div><div class='ctx'> 			c-&gt;used_size -= jeb-&gt;used_size;</div><div class='ctx'> 			c-&gt;dirty_size -= jeb-&gt;dirty_size;</div><div class='ctx'> 			jeb-&gt;wasted_size = jeb-&gt;used_size = jeb-&gt;dirty_size = jeb-&gt;free_size = 0;</div><div class='del'>-			jffs2_free_all_node_refs(c, jeb);</div><div class='add'>+			jffs2_free_jeb_node_refs(c, jeb);</div><div class='ctx'> 			list_add(&amp;jeb-&gt;list, &amp;c-&gt;erasing_list);</div><div class='ctx'> 			spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -162,8 +159,7 @@ static void jffs2_erase_succeeded(struct jffs2_sb_info *c, struct jffs2_eraseblo</div><div class='ctx'> {</div><div class='ctx'> 	D1(printk(KERN_DEBUG "Erase completed successfully at 0x%08x\n", jeb-&gt;offset));</div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	list_del(&amp;jeb-&gt;list);</div><div class='del'>-	list_add_tail(&amp;jeb-&gt;list, &amp;c-&gt;erase_complete_list);</div><div class='add'>+	list_move_tail(&amp;jeb-&gt;list, &amp;c-&gt;erase_complete_list);</div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	/* Ensure that kupdated calls us again to mark them clean */</div><div class='ctx'> 	jffs2_erase_pending_trigger(c);</div><div class='hunk'>@@ -179,8 +175,7 @@ static void jffs2_erase_failed(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 		if (!jffs2_write_nand_badblock(c, jeb, bad_offset)) {</div><div class='ctx'> 			/* We'd like to give this block another try. */</div><div class='ctx'> 			spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-			list_del(&amp;jeb-&gt;list);</div><div class='del'>-			list_add(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='add'>+			list_move(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='ctx'> 			c-&gt;erasing_size -= c-&gt;sector_size;</div><div class='ctx'> 			c-&gt;dirty_size += c-&gt;sector_size;</div><div class='ctx'> 			jeb-&gt;dirty_size = c-&gt;sector_size;</div><div class='hunk'>@@ -192,8 +187,7 @@ static void jffs2_erase_failed(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	c-&gt;erasing_size -= c-&gt;sector_size;</div><div class='ctx'> 	c-&gt;bad_size += c-&gt;sector_size;</div><div class='del'>-	list_del(&amp;jeb-&gt;list);</div><div class='del'>-	list_add(&amp;jeb-&gt;list, &amp;c-&gt;bad_list);</div><div class='add'>+	list_move(&amp;jeb-&gt;list, &amp;c-&gt;bad_list);</div><div class='ctx'> 	c-&gt;nr_erasing_blocks--;</div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	wake_up(&amp;c-&gt;erase_wait);</div><div class='hunk'>@@ -254,7 +248,8 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,</div><div class='ctx'> </div><div class='ctx'> 	/* PARANOIA */</div><div class='ctx'> 	if (!ic) {</div><div class='del'>-		printk(KERN_WARNING "inode_cache not found in remove_node_refs()!!\n");</div><div class='add'>+		JFFS2_WARNING("inode_cache/xattr_datum/xattr_ref"</div><div class='add'>+			      " not found in remove_node_refs()!!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -279,26 +274,42 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,</div><div class='ctx'> 		printk("\n");</div><div class='ctx'> 	});</div><div class='ctx'> </div><div class='del'>-	if (ic-&gt;nodes == (void *)ic &amp;&amp; ic-&gt;nlink == 0)</div><div class='del'>-		jffs2_del_ino_cache(c, ic);</div><div class='add'>+	switch (ic-&gt;class) {</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+		case RAWNODE_CLASS_XATTR_DATUM:</div><div class='add'>+			jffs2_release_xattr_datum(c, (struct jffs2_xattr_datum *)ic);</div><div class='add'>+			break;</div><div class='add'>+		case RAWNODE_CLASS_XATTR_REF:</div><div class='add'>+			jffs2_release_xattr_ref(c, (struct jffs2_xattr_ref *)ic);</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		default:</div><div class='add'>+			if (ic-&gt;nodes == (void *)ic &amp;&amp; ic-&gt;nlink == 0)</div><div class='add'>+				jffs2_del_ino_cache(c, ic);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='add'>+void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *ref;</div><div class='add'>+	struct jffs2_raw_node_ref *block, *ref;</div><div class='ctx'> 	D1(printk(KERN_DEBUG "Freeing all node refs for eraseblock offset 0x%08x\n", jeb-&gt;offset));</div><div class='del'>-	while(jeb-&gt;first_node) {</div><div class='del'>-		ref = jeb-&gt;first_node;</div><div class='del'>-		jeb-&gt;first_node = ref-&gt;next_phys;</div><div class='ctx'> </div><div class='del'>-		/* Remove from the inode-list */</div><div class='del'>-		if (ref-&gt;next_in_ino)</div><div class='add'>+	block = ref = jeb-&gt;first_node;</div><div class='add'>+</div><div class='add'>+	while (ref) {</div><div class='add'>+		if (ref-&gt;flash_offset == REF_LINK_NODE) {</div><div class='add'>+			ref = ref-&gt;next_in_ino;</div><div class='add'>+			jffs2_free_refblock(block);</div><div class='add'>+			block = ref;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (ref-&gt;flash_offset != REF_EMPTY_NODE &amp;&amp; ref-&gt;next_in_ino)</div><div class='ctx'> 			jffs2_remove_node_refs_from_ino_list(c, ref, jeb);</div><div class='ctx'> 		/* else it was a non-inode node or already removed, so don't bother */</div><div class='ctx'> </div><div class='del'>-		jffs2_free_raw_node_ref(ref);</div><div class='add'>+		ref++;</div><div class='ctx'> 	}</div><div class='del'>-	jeb-&gt;last_node = NULL;</div><div class='add'>+	jeb-&gt;first_node = jeb-&gt;last_node = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t *bad_offset)</div><div class='hunk'>@@ -351,7 +362,6 @@ fail:</div><div class='ctx'> </div><div class='ctx'> static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *marker_ref = NULL;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	uint32_t bad_offset;</div><div class='hunk'>@@ -373,12 +383,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb</div><div class='ctx'> 				goto filebad;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		jeb-&gt;first_node = jeb-&gt;last_node = NULL;</div><div class='add'>+		/* Everything else got zeroed before the erase */</div><div class='ctx'> 		jeb-&gt;free_size = c-&gt;sector_size;</div><div class='del'>-		jeb-&gt;used_size = 0;</div><div class='del'>-		jeb-&gt;dirty_size = 0;</div><div class='del'>-		jeb-&gt;wasted_size = 0;</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> </div><div class='ctx'> 		struct kvec vecs[1];</div><div class='hunk'>@@ -388,11 +394,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb</div><div class='ctx'> 			.totlen =	cpu_to_je32(c-&gt;cleanmarker_size)</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		marker_ref = jffs2_alloc_raw_node_ref();</div><div class='del'>-		if (!marker_ref) {</div><div class='del'>-			printk(KERN_WARNING "Failed to allocate raw node ref for clean marker. Refiling\n");</div><div class='del'>-			goto refile;</div><div class='del'>-		}</div><div class='add'>+		jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='ctx'> </div><div class='ctx'> 		marker.hdr_crc = cpu_to_je32(crc32(0, &amp;marker, sizeof(struct jffs2_unknown_node)-4));</div><div class='ctx'> </div><div class='hunk'>@@ -408,21 +410,13 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb</div><div class='ctx'> 				printk(KERN_WARNING "Short write to newly-erased block at 0x%08x: Wanted %zd, got %zd\n",</div><div class='ctx'> 				       jeb-&gt;offset, sizeof(marker), retlen);</div><div class='ctx'> </div><div class='del'>-			jffs2_free_raw_node_ref(marker_ref);</div><div class='ctx'> 			goto filebad;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		marker_ref-&gt;next_in_ino = NULL;</div><div class='del'>-		marker_ref-&gt;next_phys = NULL;</div><div class='del'>-		marker_ref-&gt;flash_offset = jeb-&gt;offset | REF_NORMAL;</div><div class='del'>-		marker_ref-&gt;__totlen = c-&gt;cleanmarker_size;</div><div class='del'>-</div><div class='del'>-		jeb-&gt;first_node = jeb-&gt;last_node = marker_ref;</div><div class='del'>-</div><div class='del'>-		jeb-&gt;free_size = c-&gt;sector_size - c-&gt;cleanmarker_size;</div><div class='del'>-		jeb-&gt;used_size = c-&gt;cleanmarker_size;</div><div class='del'>-		jeb-&gt;dirty_size = 0;</div><div class='del'>-		jeb-&gt;wasted_size = 0;</div><div class='add'>+		/* Everything else got zeroed before the erase */</div><div class='add'>+		jeb-&gt;free_size = c-&gt;sector_size;</div><div class='add'>+		/* FIXME Special case for cleanmarker in empty block */</div><div class='add'>+		jffs2_link_node_ref(c, jeb, jeb-&gt;offset | REF_NORMAL, c-&gt;cleanmarker_size, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='head'>diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c<br/>index 9f4171213e58..3ed6e3e120b6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/file.c</a></div><div class='hunk'>@@ -54,10 +54,15 @@ const struct file_operations jffs2_file_operations =</div><div class='ctx'> </div><div class='ctx'> struct inode_operations jffs2_file_inode_operations =</div><div class='ctx'> {</div><div class='del'>-	.setattr =	jffs2_setattr</div><div class='add'>+	.permission =	jffs2_permission,</div><div class='add'>+	.setattr =	jffs2_setattr,</div><div class='add'>+	.setxattr =	jffs2_setxattr,</div><div class='add'>+	.getxattr =	jffs2_getxattr,</div><div class='add'>+	.listxattr =	jffs2_listxattr,</div><div class='add'>+	.removexattr =	jffs2_removexattr</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct address_space_operations jffs2_file_address_operations =</div><div class='add'>+const struct address_space_operations jffs2_file_address_operations =</div><div class='ctx'> {</div><div class='ctx'> 	.readpage =	jffs2_readpage,</div><div class='ctx'> 	.prepare_write =jffs2_prepare_write,</div><div class='hunk'>@@ -129,13 +134,13 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg,</div><div class='ctx'> 		struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='ctx'> 		struct jffs2_raw_inode ri;</div><div class='ctx'> 		struct jffs2_full_dnode *fn;</div><div class='del'>-		uint32_t phys_ofs, alloc_len;</div><div class='add'>+		uint32_t alloc_len;</div><div class='ctx'> </div><div class='ctx'> 		D1(printk(KERN_DEBUG "Writing new hole frag 0x%x-0x%x between current EOF and new page\n",</div><div class='ctx'> 			  (unsigned int)inode-&gt;i_size, pageofs));</div><div class='ctx'> </div><div class='del'>-		ret = jffs2_reserve_space(c, sizeof(ri), &amp;phys_ofs, &amp;alloc_len,</div><div class='del'>-					ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+		ret = jffs2_reserve_space(c, sizeof(ri), &amp;alloc_len,</div><div class='add'>+					  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +166,7 @@ static int jffs2_prepare_write (struct file *filp, struct page *pg,</div><div class='ctx'> 		ri.node_crc = cpu_to_je32(crc32(0, &amp;ri, sizeof(ri)-8));</div><div class='ctx'> 		ri.data_crc = cpu_to_je32(0);</div><div class='ctx'> </div><div class='del'>-		fn = jffs2_write_dnode(c, f, &amp;ri, NULL, 0, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+		fn = jffs2_write_dnode(c, f, &amp;ri, NULL, 0, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 		if (IS_ERR(fn)) {</div><div class='ctx'> 			ret = PTR_ERR(fn);</div><div class='hunk'>@@ -215,12 +220,20 @@ static int jffs2_commit_write (struct file *filp, struct page *pg,</div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_commit_write(): ino #%lu, page at 0x%lx, range %d-%d, flags %lx\n",</div><div class='ctx'> 		  inode-&gt;i_ino, pg-&gt;index &lt;&lt; PAGE_CACHE_SHIFT, start, end, pg-&gt;flags));</div><div class='ctx'> </div><div class='del'>-	if (!start &amp;&amp; end == PAGE_CACHE_SIZE) {</div><div class='del'>-		/* We need to avoid deadlock with page_cache_read() in</div><div class='del'>-		   jffs2_garbage_collect_pass(). So we have to mark the</div><div class='del'>-		   page up to date, to prevent page_cache_read() from</div><div class='del'>-		   trying to re-lock it. */</div><div class='del'>-		SetPageUptodate(pg);</div><div class='add'>+	if (end == PAGE_CACHE_SIZE) {</div><div class='add'>+		if (!start) {</div><div class='add'>+			/* We need to avoid deadlock with page_cache_read() in</div><div class='add'>+			   jffs2_garbage_collect_pass(). So we have to mark the</div><div class='add'>+			   page up to date, to prevent page_cache_read() from</div><div class='add'>+			   trying to re-lock it. */</div><div class='add'>+			SetPageUptodate(pg);</div><div class='add'>+		} else {</div><div class='add'>+			/* When writing out the end of a page, write out the </div><div class='add'>+			   _whole_ page. This helps to reduce the number of</div><div class='add'>+			   nodes in files which have many short writes, like</div><div class='add'>+			   syslog files. */</div><div class='add'>+			start = aligned_start = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ri = jffs2_alloc_raw_inode();</div><div class='head'>diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c<br/>index 09e5d10b8840..4780f82825d6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/fs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/fs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/fs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/fs.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='hunk'>@@ -33,11 +32,11 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)</div><div class='ctx'> 	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='ctx'> 	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='ctx'> 	struct jffs2_raw_inode *ri;</div><div class='del'>-	unsigned short dev;</div><div class='add'>+	union jffs2_device_node dev;</div><div class='ctx'> 	unsigned char *mdata = NULL;</div><div class='ctx'> 	int mdatalen = 0;</div><div class='ctx'> 	unsigned int ivalid;</div><div class='del'>-	uint32_t phys_ofs, alloclen;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_setattr(): ino #%lu\n", inode-&gt;i_ino));</div><div class='ctx'> 	ret = inode_change_ok(inode, iattr);</div><div class='hunk'>@@ -51,20 +50,24 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)</div><div class='ctx'> 	   it out again with the appropriate data attached */</div><div class='ctx'> 	if (S_ISBLK(inode-&gt;i_mode) || S_ISCHR(inode-&gt;i_mode)) {</div><div class='ctx'> 		/* For these, we don't actually need to read the old node */</div><div class='del'>-		dev = old_encode_dev(inode-&gt;i_rdev);</div><div class='add'>+		mdatalen = jffs2_encode_dev(&amp;dev, inode-&gt;i_rdev);</div><div class='ctx'> 		mdata = (char *)&amp;dev;</div><div class='del'>-		mdatalen = sizeof(dev);</div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2_setattr(): Writing %d bytes of kdev_t\n", mdatalen));</div><div class='ctx'> 	} else if (S_ISLNK(inode-&gt;i_mode)) {</div><div class='add'>+		down(&amp;f-&gt;sem);</div><div class='ctx'> 		mdatalen = f-&gt;metadata-&gt;size;</div><div class='ctx'> 		mdata = kmalloc(f-&gt;metadata-&gt;size, GFP_USER);</div><div class='del'>-		if (!mdata)</div><div class='add'>+		if (!mdata) {</div><div class='add'>+			up(&amp;f-&gt;sem);</div><div class='ctx'> 			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		ret = jffs2_read_dnode(c, f, f-&gt;metadata, mdata, 0, mdatalen);</div><div class='ctx'> 		if (ret) {</div><div class='add'>+			up(&amp;f-&gt;sem);</div><div class='ctx'> 			kfree(mdata);</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='add'>+		up(&amp;f-&gt;sem);</div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2_setattr(): Writing %d bytes of symlink target\n", mdatalen));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -75,8 +78,8 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*ri) + mdatalen, &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*ri) + mdatalen, &amp;alloclen,</div><div class='add'>+				  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		jffs2_free_raw_inode(ri);</div><div class='ctx'> 		if (S_ISLNK(inode-&gt;i_mode &amp; S_IFMT))</div><div class='hunk'>@@ -127,7 +130,7 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)</div><div class='ctx'> 	else</div><div class='ctx'> 		ri-&gt;data_crc = cpu_to_je32(0);</div><div class='ctx'> </div><div class='del'>-	new_metadata = jffs2_write_dnode(c, f, ri, mdata, mdatalen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	new_metadata = jffs2_write_dnode(c, f, ri, mdata, mdatalen, ALLOC_NORMAL);</div><div class='ctx'> 	if (S_ISLNK(inode-&gt;i_mode))</div><div class='ctx'> 		kfree(mdata);</div><div class='ctx'> </div><div class='hunk'>@@ -180,12 +183,17 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)</div><div class='ctx'> </div><div class='ctx'> int jffs2_setattr(struct dentry *dentry, struct iattr *iattr)</div><div class='ctx'> {</div><div class='del'>-	return jffs2_do_setattr(dentry-&gt;d_inode, iattr);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = jffs2_do_setattr(dentry-&gt;d_inode, iattr);</div><div class='add'>+	if (!rc &amp;&amp; (iattr-&gt;ia_valid &amp; ATTR_MODE))</div><div class='add'>+		rc = jffs2_acl_chmod(dentry-&gt;d_inode);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jffs2_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+int jffs2_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);</div><div class='add'>+	struct jffs2_sb_info *c = JFFS2_SB_INFO(dentry-&gt;d_sb);</div><div class='ctx'> 	unsigned long avail;</div><div class='ctx'> </div><div class='ctx'> 	buf-&gt;f_type = JFFS2_SUPER_MAGIC;</div><div class='hunk'>@@ -218,7 +226,6 @@ void jffs2_clear_inode (struct inode *inode)</div><div class='ctx'> 	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_clear_inode(): ino #%lu mode %o\n", inode-&gt;i_ino, inode-&gt;i_mode));</div><div class='del'>-</div><div class='ctx'> 	jffs2_do_clear_inode(c, f);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +234,8 @@ void jffs2_read_inode (struct inode *inode)</div><div class='ctx'> 	struct jffs2_inode_info *f;</div><div class='ctx'> 	struct jffs2_sb_info *c;</div><div class='ctx'> 	struct jffs2_raw_inode latest_node;</div><div class='add'>+	union jffs2_device_node jdev;</div><div class='add'>+	dev_t rdev = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_read_inode(): inode-&gt;i_ino == %lu\n", inode-&gt;i_ino));</div><div class='hunk'>@@ -258,7 +267,6 @@ void jffs2_read_inode (struct inode *inode)</div><div class='ctx'> 	inode-&gt;i_blocks = (inode-&gt;i_size + 511) &gt;&gt; 9;</div><div class='ctx'> </div><div class='ctx'> 	switch (inode-&gt;i_mode &amp; S_IFMT) {</div><div class='del'>-		jint16_t rdev;</div><div class='ctx'> </div><div class='ctx'> 	case S_IFLNK:</div><div class='ctx'> 		inode-&gt;i_op = &amp;jffs2_symlink_inode_operations;</div><div class='hunk'>@@ -292,8 +300,16 @@ void jffs2_read_inode (struct inode *inode)</div><div class='ctx'> 	case S_IFBLK:</div><div class='ctx'> 	case S_IFCHR:</div><div class='ctx'> 		/* Read the device numbers from the media */</div><div class='add'>+		if (f-&gt;metadata-&gt;size != sizeof(jdev.old) &amp;&amp;</div><div class='add'>+		    f-&gt;metadata-&gt;size != sizeof(jdev.new)) {</div><div class='add'>+			printk(KERN_NOTICE "Device node has strange size %d\n", f-&gt;metadata-&gt;size);</div><div class='add'>+			up(&amp;f-&gt;sem);</div><div class='add'>+			jffs2_do_clear_inode(c, f);</div><div class='add'>+			make_bad_inode(inode);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		D1(printk(KERN_DEBUG "Reading device numbers from flash\n"));</div><div class='del'>-		if (jffs2_read_dnode(c, f, f-&gt;metadata, (char *)&amp;rdev, 0, sizeof(rdev)) &lt; 0) {</div><div class='add'>+		if (jffs2_read_dnode(c, f, f-&gt;metadata, (char *)&amp;jdev, 0, f-&gt;metadata-&gt;size) &lt; 0) {</div><div class='ctx'> 			/* Eep */</div><div class='ctx'> 			printk(KERN_NOTICE "Read device numbers for inode %lu failed\n", (unsigned long)inode-&gt;i_ino);</div><div class='ctx'> 			up(&amp;f-&gt;sem);</div><div class='hunk'>@@ -301,12 +317,15 @@ void jffs2_read_inode (struct inode *inode)</div><div class='ctx'> 			make_bad_inode(inode);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+		if (f-&gt;metadata-&gt;size == sizeof(jdev.old))</div><div class='add'>+			rdev = old_decode_dev(je16_to_cpu(jdev.old));</div><div class='add'>+		else</div><div class='add'>+			rdev = new_decode_dev(je32_to_cpu(jdev.new));</div><div class='ctx'> </div><div class='ctx'> 	case S_IFSOCK:</div><div class='ctx'> 	case S_IFIFO:</div><div class='ctx'> 		inode-&gt;i_op = &amp;jffs2_file_inode_operations;</div><div class='del'>-		init_special_inode(inode, inode-&gt;i_mode,</div><div class='del'>-				   old_decode_dev((je16_to_cpu(rdev))));</div><div class='add'>+		init_special_inode(inode, inode-&gt;i_mode, rdev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -492,6 +511,8 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(c-&gt;inocache_list, 0, INOCACHE_HASHSIZE * sizeof(struct jffs2_inode_cache *));</div><div class='ctx'> </div><div class='add'>+	jffs2_init_xattr_subsystem(c);</div><div class='add'>+</div><div class='ctx'> 	if ((ret = jffs2_do_mount_fs(c)))</div><div class='ctx'> 		goto out_inohash;</div><div class='ctx'> </div><div class='hunk'>@@ -526,6 +547,7 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	else</div><div class='ctx'> 		kfree(c-&gt;blocks);</div><div class='ctx'>  out_inohash:</div><div class='add'>+	jffs2_clear_xattr_subsystem(c);</div><div class='ctx'> 	kfree(c-&gt;inocache_list);</div><div class='ctx'>  out_wbuf:</div><div class='ctx'> 	jffs2_flash_cleanup(c);</div><div class='hunk'>@@ -639,13 +661,6 @@ static int jffs2_flash_setup(struct jffs2_sb_info *c) {</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* add setups for other bizarre flashes here... */</div><div class='del'>-	if (jffs2_nor_ecc(c)) {</div><div class='del'>-		ret = jffs2_nor_ecc_flash_setup(c);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* and Dataflash */</div><div class='ctx'> 	if (jffs2_dataflash(c)) {</div><div class='ctx'> 		ret = jffs2_dataflash_setup(c);</div><div class='hunk'>@@ -669,11 +684,6 @@ void jffs2_flash_cleanup(struct jffs2_sb_info *c) {</div><div class='ctx'> 		jffs2_nand_flash_cleanup(c);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* add cleanups for other bizarre flashes here... */</div><div class='del'>-	if (jffs2_nor_ecc(c)) {</div><div class='del'>-		jffs2_nor_ecc_flash_cleanup(c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* and DataFlash */</div><div class='ctx'> 	if (jffs2_dataflash(c)) {</div><div class='ctx'> 		jffs2_dataflash_cleanup(c);</div><div class='head'>diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c<br/>index f9ffece453a3..daff3341ff92 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/gc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/gc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/gc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/gc.c</a></div><div class='hunk'>@@ -125,6 +125,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> 	struct jffs2_eraseblock *jeb;</div><div class='ctx'> 	struct jffs2_raw_node_ref *raw;</div><div class='ctx'> 	int ret = 0, inum, nlink;</div><div class='add'>+	int xattr = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (down_interruptible(&amp;c-&gt;alloc_sem))</div><div class='ctx'> 		return -EINTR;</div><div class='hunk'>@@ -138,7 +139,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> 		   the node CRCs etc. Do it now. */</div><div class='ctx'> </div><div class='ctx'> 		/* checked_ino is protected by the alloc_sem */</div><div class='del'>-		if (c-&gt;checked_ino &gt; c-&gt;highest_ino) {</div><div class='add'>+		if (c-&gt;checked_ino &gt; c-&gt;highest_ino &amp;&amp; xattr) {</div><div class='ctx'> 			printk(KERN_CRIT "Checked all inodes but still 0x%x bytes of unchecked space?\n",</div><div class='ctx'> 			       c-&gt;unchecked_size);</div><div class='ctx'> 			jffs2_dbg_dump_block_lists_nolock(c);</div><div class='hunk'>@@ -148,6 +149,9 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='add'>+		if (!xattr)</div><div class='add'>+			xattr = jffs2_verify_xattr(c);</div><div class='add'>+</div><div class='ctx'> 		spin_lock(&amp;c-&gt;inocache_lock);</div><div class='ctx'> </div><div class='ctx'> 		ic = jffs2_get_ino_cache(c, c-&gt;checked_ino++);</div><div class='hunk'>@@ -161,6 +165,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Skipping check of ino #%d with nlink zero\n",</div><div class='ctx'> 				  ic-&gt;ino));</div><div class='ctx'> 			spin_unlock(&amp;c-&gt;inocache_lock);</div><div class='add'>+			jffs2_xattr_delete_inode(c, ic);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		switch(ic-&gt;state) {</div><div class='hunk'>@@ -181,6 +186,10 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> 			   and trigger the BUG() above while we haven't yet</div><div class='ctx'> 			   finished checking all its nodes */</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Waiting for ino #%u to finish reading\n", ic-&gt;ino));</div><div class='add'>+			/* We need to come back again for the _same_ inode. We've</div><div class='add'>+			 made no progress in this case, but that should be OK */</div><div class='add'>+			c-&gt;checked_ino--;</div><div class='add'>+</div><div class='ctx'> 			up(&amp;c-&gt;alloc_sem);</div><div class='ctx'> 			sleep_on_spinunlock(&amp;c-&gt;inocache_wq, &amp;c-&gt;inocache_lock);</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -231,7 +240,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	while(ref_obsolete(raw)) {</div><div class='ctx'> 		D1(printk(KERN_DEBUG "Node at 0x%08x is obsolete... skipping\n", ref_offset(raw)));</div><div class='del'>-		raw = raw-&gt;next_phys;</div><div class='add'>+		raw = ref_next(raw);</div><div class='ctx'> 		if (unlikely(!raw)) {</div><div class='ctx'> 			printk(KERN_WARNING "eep. End of raw list while still supposedly nodes to GC\n");</div><div class='ctx'> 			printk(KERN_WARNING "erase block at 0x%08x. free_size 0x%08x, dirty_size 0x%08x, used_size 0x%08x\n",</div><div class='hunk'>@@ -248,16 +257,36 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	if (!raw-&gt;next_in_ino) {</div><div class='ctx'> 		/* Inode-less node. Clean marker, snapshot or something like that */</div><div class='del'>-		/* FIXME: If it's something that needs to be copied, including something</div><div class='del'>-		   we don't grok that has JFFS2_NODETYPE_RWCOMPAT_COPY, we should do so */</div><div class='ctx'> 		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-		jffs2_mark_node_obsolete(c, raw);</div><div class='add'>+		if (ref_flags(raw) == REF_PRISTINE) {</div><div class='add'>+			/* It's an unknown node with JFFS2_FEATURE_RWCOMPAT_COPY */</div><div class='add'>+			jffs2_garbage_collect_pristine(c, NULL, raw);</div><div class='add'>+		} else {</div><div class='add'>+			/* Just mark it obsolete */</div><div class='add'>+			jffs2_mark_node_obsolete(c, raw);</div><div class='add'>+		}</div><div class='ctx'> 		up(&amp;c-&gt;alloc_sem);</div><div class='ctx'> 		goto eraseit_lock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ic = jffs2_raw_ref_to_ic(raw);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+	/* When 'ic' refers xattr_datum/xattr_ref, this node is GCed as xattr.</div><div class='add'>+	 * We can decide whether this node is inode or xattr by ic-&gt;class.     */</div><div class='add'>+	if (ic-&gt;class == RAWNODE_CLASS_XATTR_DATUM</div><div class='add'>+	    || ic-&gt;class == RAWNODE_CLASS_XATTR_REF) {</div><div class='add'>+		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+		if (ic-&gt;class == RAWNODE_CLASS_XATTR_DATUM) {</div><div class='add'>+			ret = jffs2_garbage_collect_xattr_datum(c, (struct jffs2_xattr_datum *)ic, raw);</div><div class='add'>+		} else {</div><div class='add'>+			ret = jffs2_garbage_collect_xattr_ref(c, (struct jffs2_xattr_ref *)ic, raw);</div><div class='add'>+		}</div><div class='add'>+		goto release_sem;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* We need to hold the inocache. Either the erase_completion_lock or</div><div class='ctx'> 	   the inocache_lock are sufficient; we trade down since the inocache_lock</div><div class='ctx'> 	   causes less contention. */</div><div class='hunk'>@@ -499,7 +528,6 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,</div><div class='ctx'> 					  struct jffs2_raw_node_ref *raw)</div><div class='ctx'> {</div><div class='ctx'> 	union jffs2_node_union *node;</div><div class='del'>-	struct jffs2_raw_node_ref *nraw;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	uint32_t phys_ofs, alloclen;</div><div class='hunk'>@@ -508,15 +536,16 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "Going to GC REF_PRISTINE node at 0x%08x\n", ref_offset(raw)));</div><div class='ctx'> </div><div class='del'>-	rawlen = ref_totlen(c, c-&gt;gcblock, raw);</div><div class='add'>+	alloclen = rawlen = ref_totlen(c, c-&gt;gcblock, raw);</div><div class='ctx'> </div><div class='ctx'> 	/* Ask for a small amount of space (or the totlen if smaller) because we</div><div class='ctx'> 	   don't want to force wastage of the end of a block if splitting would</div><div class='ctx'> 	   work. */</div><div class='del'>-	ret = jffs2_reserve_space_gc(c, min_t(uint32_t, sizeof(struct jffs2_raw_inode) +</div><div class='del'>-				JFFS2_MIN_DATA_LEN, rawlen), &amp;phys_ofs, &amp;alloclen, rawlen);</div><div class='del'>-				/* this is not the exact summary size of it,</div><div class='del'>-					it is only an upper estimation */</div><div class='add'>+	if (ic &amp;&amp; alloclen &gt; sizeof(struct jffs2_raw_inode) + JFFS2_MIN_DATA_LEN)</div><div class='add'>+		alloclen = sizeof(struct jffs2_raw_inode) + JFFS2_MIN_DATA_LEN;</div><div class='add'>+</div><div class='add'>+	ret = jffs2_reserve_space_gc(c, alloclen, &amp;alloclen, rawlen);</div><div class='add'>+	/* 'rawlen' is not the exact summary size; it is only an upper estimation */</div><div class='ctx'> </div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -580,22 +609,17 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_WARNING "Unknown node type for REF_PRISTINE node at 0x%08x: 0x%04x\n",</div><div class='del'>-		       ref_offset(raw), je16_to_cpu(node-&gt;u.nodetype));</div><div class='del'>-		goto bail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nraw = jffs2_alloc_raw_node_ref();</div><div class='del'>-	if (!nraw) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_node;</div><div class='add'>+		/* If it's inode-less, we don't _know_ what it is. Just copy it intact */</div><div class='add'>+		if (ic) {</div><div class='add'>+			printk(KERN_WARNING "Unknown node type for REF_PRISTINE node at 0x%08x: 0x%04x\n",</div><div class='add'>+			       ref_offset(raw), je16_to_cpu(node-&gt;u.nodetype));</div><div class='add'>+			goto bail;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* OK, all the CRCs are good; this node can just be copied as-is. */</div><div class='ctx'>  retry:</div><div class='del'>-	nraw-&gt;flash_offset = phys_ofs;</div><div class='del'>-	nraw-&gt;__totlen = rawlen;</div><div class='del'>-	nraw-&gt;next_phys = NULL;</div><div class='add'>+	phys_ofs = write_ofs(c);</div><div class='ctx'> </div><div class='ctx'> 	ret = jffs2_flash_write(c, phys_ofs, rawlen, &amp;retlen, (char *)node);</div><div class='ctx'> </div><div class='hunk'>@@ -603,17 +627,11 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,</div><div class='ctx'> 		printk(KERN_NOTICE "Write of %d bytes at 0x%08x failed. returned %d, retlen %zd\n",</div><div class='ctx'>                        rawlen, phys_ofs, ret, retlen);</div><div class='ctx'> 		if (retlen) {</div><div class='del'>-                        /* Doesn't belong to any inode */</div><div class='del'>-			nraw-&gt;next_in_ino = NULL;</div><div class='del'>-</div><div class='del'>-			nraw-&gt;flash_offset |= REF_OBSOLETE;</div><div class='del'>-			jffs2_add_physical_node_ref(c, nraw);</div><div class='del'>-			jffs2_mark_node_obsolete(c, nraw);</div><div class='add'>+			jffs2_add_physical_node_ref(c, phys_ofs | REF_OBSOLETE, rawlen, NULL);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", nraw-&gt;flash_offset);</div><div class='del'>-                        jffs2_free_raw_node_ref(nraw);</div><div class='add'>+			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", phys_ofs);</div><div class='ctx'> 		}</div><div class='del'>-		if (!retried &amp;&amp; (nraw = jffs2_alloc_raw_node_ref())) {</div><div class='add'>+		if (!retried) {</div><div class='ctx'> 			/* Try to reallocate space and retry */</div><div class='ctx'> 			uint32_t dummy;</div><div class='ctx'> 			struct jffs2_eraseblock *jeb = &amp;c-&gt;blocks[phys_ofs / c-&gt;sector_size];</div><div class='hunk'>@@ -625,7 +643,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,</div><div class='ctx'> 			jffs2_dbg_acct_sanity_check(c,jeb);</div><div class='ctx'> 			jffs2_dbg_acct_paranoia_check(c, jeb);</div><div class='ctx'> </div><div class='del'>-			ret = jffs2_reserve_space_gc(c, rawlen, &amp;phys_ofs, &amp;dummy, rawlen);</div><div class='add'>+			ret = jffs2_reserve_space_gc(c, rawlen, &amp;dummy, rawlen);</div><div class='ctx'> 						/* this is not the exact summary size of it,</div><div class='ctx'> 							it is only an upper estimation */</div><div class='ctx'> </div><div class='hunk'>@@ -638,25 +656,13 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));</div><div class='del'>-			jffs2_free_raw_node_ref(nraw);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		jffs2_free_raw_node_ref(nraw);</div><div class='ctx'> 		if (!ret)</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 		goto out_node;</div><div class='ctx'> 	}</div><div class='del'>-	nraw-&gt;flash_offset |= REF_PRISTINE;</div><div class='del'>-	jffs2_add_physical_node_ref(c, nraw);</div><div class='del'>-</div><div class='del'>-	/* Link into per-inode list. This is safe because of the ic</div><div class='del'>-	   state being INO_STATE_GC. Note that if we're doing this</div><div class='del'>-	   for an inode which is in-core, the 'nraw' pointer is then</div><div class='del'>-	   going to be fetched from ic-&gt;nodes by our caller. */</div><div class='del'>-	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-        nraw-&gt;next_in_ino = ic-&gt;nodes;</div><div class='del'>-        ic-&gt;nodes = nraw;</div><div class='del'>-	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	jffs2_add_physical_node_ref(c, phys_ofs | REF_PRISTINE, rawlen, ic);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_mark_node_obsolete(c, raw);</div><div class='ctx'> 	D1(printk(KERN_DEBUG "WHEEE! GC REF_PRISTINE node at 0x%08x succeeded\n", ref_offset(raw)));</div><div class='hunk'>@@ -675,19 +681,16 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_</div><div class='ctx'> 	struct jffs2_full_dnode *new_fn;</div><div class='ctx'> 	struct jffs2_raw_inode ri;</div><div class='ctx'> 	struct jffs2_node_frag *last_frag;</div><div class='del'>-	jint16_t dev;</div><div class='add'>+	union jffs2_device_node dev;</div><div class='ctx'> 	char *mdata = NULL, mdatalen = 0;</div><div class='del'>-	uint32_t alloclen, phys_ofs, ilen;</div><div class='add'>+	uint32_t alloclen, ilen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (S_ISBLK(JFFS2_F_I_MODE(f)) ||</div><div class='ctx'> 	    S_ISCHR(JFFS2_F_I_MODE(f)) ) {</div><div class='ctx'> 		/* For these, we don't actually need to read the old node */</div><div class='del'>-		/* FIXME: for minor or major &gt; 255. */</div><div class='del'>-		dev = cpu_to_je16(((JFFS2_F_I_RDEV_MAJ(f) &lt;&lt; 8) |</div><div class='del'>-			JFFS2_F_I_RDEV_MIN(f)));</div><div class='add'>+		mdatalen = jffs2_encode_dev(&amp;dev, JFFS2_F_I_RDEV(f));</div><div class='ctx'> 		mdata = (char *)&amp;dev;</div><div class='del'>-		mdatalen = sizeof(dev);</div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2_garbage_collect_metadata(): Writing %d bytes of kdev_t\n", mdatalen));</div><div class='ctx'> 	} else if (S_ISLNK(JFFS2_F_I_MODE(f))) {</div><div class='ctx'> 		mdatalen = fn-&gt;size;</div><div class='hunk'>@@ -706,7 +709,7 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = jffs2_reserve_space_gc(c, sizeof(ri) + mdatalen, &amp;phys_ofs, &amp;alloclen,</div><div class='add'>+	ret = jffs2_reserve_space_gc(c, sizeof(ri) + mdatalen, &amp;alloclen,</div><div class='ctx'> 				JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "jffs2_reserve_space_gc of %zd bytes for garbage_collect_metadata failed: %d\n",</div><div class='hunk'>@@ -744,7 +747,7 @@ static int jffs2_garbage_collect_metadata(struct jffs2_sb_info *c, struct jffs2_</div><div class='ctx'> 	ri.node_crc = cpu_to_je32(crc32(0, &amp;ri, sizeof(ri)-8));</div><div class='ctx'> 	ri.data_crc = cpu_to_je32(crc32(0, mdata, mdatalen));</div><div class='ctx'> </div><div class='del'>-	new_fn = jffs2_write_dnode(c, f, &amp;ri, mdata, mdatalen, phys_ofs, ALLOC_GC);</div><div class='add'>+	new_fn = jffs2_write_dnode(c, f, &amp;ri, mdata, mdatalen, ALLOC_GC);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(new_fn)) {</div><div class='ctx'> 		printk(KERN_WARNING "Error writing new dnode: %ld\n", PTR_ERR(new_fn));</div><div class='hunk'>@@ -765,7 +768,7 @@ static int jffs2_garbage_collect_dirent(struct jffs2_sb_info *c, struct jffs2_er</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_full_dirent *new_fd;</div><div class='ctx'> 	struct jffs2_raw_dirent rd;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	rd.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);</div><div class='hunk'>@@ -787,14 +790,14 @@ static int jffs2_garbage_collect_dirent(struct jffs2_sb_info *c, struct jffs2_er</div><div class='ctx'> 	rd.node_crc = cpu_to_je32(crc32(0, &amp;rd, sizeof(rd)-8));</div><div class='ctx'> 	rd.name_crc = cpu_to_je32(crc32(0, fd-&gt;name, rd.nsize));</div><div class='ctx'> </div><div class='del'>-	ret = jffs2_reserve_space_gc(c, sizeof(rd)+rd.nsize, &amp;phys_ofs, &amp;alloclen,</div><div class='add'>+	ret = jffs2_reserve_space_gc(c, sizeof(rd)+rd.nsize, &amp;alloclen,</div><div class='ctx'> 				JFFS2_SUMMARY_DIRENT_SIZE(rd.nsize));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "jffs2_reserve_space_gc of %zd bytes for garbage_collect_dirent failed: %d\n",</div><div class='ctx'> 		       sizeof(rd)+rd.nsize, ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	new_fd = jffs2_write_dirent(c, f, &amp;rd, fd-&gt;name, rd.nsize, phys_ofs, ALLOC_GC);</div><div class='add'>+	new_fd = jffs2_write_dirent(c, f, &amp;rd, fd-&gt;name, rd.nsize, ALLOC_GC);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(new_fd)) {</div><div class='ctx'> 		printk(KERN_WARNING "jffs2_write_dirent in garbage_collect_dirent failed: %ld\n", PTR_ERR(new_fd));</div><div class='hunk'>@@ -922,7 +925,7 @@ static int jffs2_garbage_collect_hole(struct jffs2_sb_info *c, struct jffs2_eras</div><div class='ctx'> 	struct jffs2_raw_inode ri;</div><div class='ctx'> 	struct jffs2_node_frag *frag;</div><div class='ctx'> 	struct jffs2_full_dnode *new_fn;</div><div class='del'>-	uint32_t alloclen, phys_ofs, ilen;</div><div class='add'>+	uint32_t alloclen, ilen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "Writing replacement hole node for ino #%u from offset 0x%x to 0x%x\n",</div><div class='hunk'>@@ -1001,14 +1004,14 @@ static int jffs2_garbage_collect_hole(struct jffs2_sb_info *c, struct jffs2_eras</div><div class='ctx'> 	ri.data_crc = cpu_to_je32(0);</div><div class='ctx'> 	ri.node_crc = cpu_to_je32(crc32(0, &amp;ri, sizeof(ri)-8));</div><div class='ctx'> </div><div class='del'>-	ret = jffs2_reserve_space_gc(c, sizeof(ri), &amp;phys_ofs, &amp;alloclen,</div><div class='del'>-				JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+	ret = jffs2_reserve_space_gc(c, sizeof(ri), &amp;alloclen,</div><div class='add'>+				     JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "jffs2_reserve_space_gc of %zd bytes for garbage_collect_hole failed: %d\n",</div><div class='ctx'> 		       sizeof(ri), ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	new_fn = jffs2_write_dnode(c, f, &amp;ri, NULL, 0, phys_ofs, ALLOC_GC);</div><div class='add'>+	new_fn = jffs2_write_dnode(c, f, &amp;ri, NULL, 0, ALLOC_GC);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(new_fn)) {</div><div class='ctx'> 		printk(KERN_WARNING "Error writing new hole node: %ld\n", PTR_ERR(new_fn));</div><div class='hunk'>@@ -1070,7 +1073,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_full_dnode *new_fn;</div><div class='ctx'> 	struct jffs2_raw_inode ri;</div><div class='del'>-	uint32_t alloclen, phys_ofs, offset, orig_end, orig_start;</div><div class='add'>+	uint32_t alloclen, offset, orig_end, orig_start;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	unsigned char *comprbuf = NULL, *writebuf;</div><div class='ctx'> 	unsigned long pg;</div><div class='hunk'>@@ -1227,7 +1230,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era</div><div class='ctx'> 		uint32_t cdatalen;</div><div class='ctx'> 		uint16_t comprtype = JFFS2_COMPR_NONE;</div><div class='ctx'> </div><div class='del'>-		ret = jffs2_reserve_space_gc(c, sizeof(ri) + JFFS2_MIN_DATA_LEN, &amp;phys_ofs,</div><div class='add'>+		ret = jffs2_reserve_space_gc(c, sizeof(ri) + JFFS2_MIN_DATA_LEN,</div><div class='ctx'> 					&amp;alloclen, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -1264,7 +1267,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era</div><div class='ctx'> 		ri.node_crc = cpu_to_je32(crc32(0, &amp;ri, sizeof(ri)-8));</div><div class='ctx'> 		ri.data_crc = cpu_to_je32(crc32(0, comprbuf, cdatalen));</div><div class='ctx'> </div><div class='del'>-		new_fn = jffs2_write_dnode(c, f, &amp;ri, comprbuf, cdatalen, phys_ofs, ALLOC_GC);</div><div class='add'>+		new_fn = jffs2_write_dnode(c, f, &amp;ri, comprbuf, cdatalen, ALLOC_GC);</div><div class='ctx'> </div><div class='ctx'> 		jffs2_free_comprbuf(comprbuf, writebuf);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/histo.h b/fs/jffs2/histo.h<br/>deleted file mode 100644<br/>index 22a93a08210c..000000000000<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/histo.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/histo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-/* This file provides the bit-probabilities for the input file */</div><div class='del'>-#define BIT_DIVIDER 629</div><div class='del'>-static int bits[9] = { 179,167,183,165,159,198,178,119,}; /* ia32 .so files */</div><div class='head'>diff --git a/include/linux/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h<br/>index ad565bf9dcc1..2e0cc8e00b85 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/linux/jffs2_fs_i.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/jffs2_fs_i.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/jffs2_fs_i.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/jffs2_fs_i.h</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/rbtree.h&gt;</div><div class='add'>+#include &lt;linux/posix_acl.h&gt;</div><div class='ctx'> #include &lt;asm/semaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct jffs2_inode_info {</div><div class='hunk'>@@ -45,6 +46,10 @@ struct jffs2_inode_info {</div><div class='ctx'> 	struct inode vfs_inode;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_POSIX_ACL</div><div class='add'>+	struct posix_acl *i_acl_access;</div><div class='add'>+	struct posix_acl *i_acl_default;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _JFFS2_FS_I */</div><div class='head'>diff --git a/include/linux/jffs2_fs_sb.h b/fs/jffs2/jffs2_fs_sb.h<br/>index 4bcfb5570221..b98594992eed 100644<br/>--- a/<a href='/cgit/linux.git/tree/include/linux/jffs2_fs_sb.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>include/linux/jffs2_fs_sb.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/jffs2_fs_sb.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/jffs2_fs_sb.h</a></div><div class='hunk'>@@ -100,6 +100,7 @@ struct jffs2_sb_info {</div><div class='ctx'> #ifdef CONFIG_JFFS2_FS_WRITEBUFFER</div><div class='ctx'> 	/* Write-behind buffer for NAND flash */</div><div class='ctx'> 	unsigned char *wbuf;</div><div class='add'>+	unsigned char *oobbuf;</div><div class='ctx'> 	uint32_t wbuf_ofs;</div><div class='ctx'> 	uint32_t wbuf_len;</div><div class='ctx'> 	struct jffs2_inodirty *wbuf_inodes;</div><div class='hunk'>@@ -107,7 +108,7 @@ struct jffs2_sb_info {</div><div class='ctx'> 	struct rw_semaphore wbuf_sem;	/* Protects the write buffer */</div><div class='ctx'> </div><div class='ctx'> 	/* Information about out-of-band area usage... */</div><div class='del'>-	struct nand_oobinfo *oobinfo;</div><div class='add'>+	struct nand_ecclayout *ecclayout;</div><div class='ctx'> 	uint32_t badblock_pos;</div><div class='ctx'> 	uint32_t fsdata_pos;</div><div class='ctx'> 	uint32_t fsdata_len;</div><div class='hunk'>@@ -115,6 +116,19 @@ struct jffs2_sb_info {</div><div class='ctx'> </div><div class='ctx'> 	struct jffs2_summary *summary;		/* Summary information */</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+#define XATTRINDEX_HASHSIZE	(57)</div><div class='add'>+	uint32_t highest_xid;</div><div class='add'>+	uint32_t highest_xseqno;</div><div class='add'>+	struct list_head xattrindex[XATTRINDEX_HASHSIZE];</div><div class='add'>+	struct list_head xattr_unchecked;</div><div class='add'>+	struct list_head xattr_dead_list;</div><div class='add'>+	struct jffs2_xattr_ref *xref_dead_list;</div><div class='add'>+	struct jffs2_xattr_ref *xref_temp;</div><div class='add'>+	struct rw_semaphore xattr_sem;</div><div class='add'>+	uint32_t xdatum_mem_usage;</div><div class='add'>+	uint32_t xdatum_mem_threshold;</div><div class='add'>+#endif</div><div class='ctx'> 	/* OS-private pointer for getting back to master superblock info */</div><div class='ctx'> 	void *os_priv;</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c<br/>index 036cbd11c004..33f291005012 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/malloc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/malloc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/malloc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/malloc.c</a></div><div class='hunk'>@@ -26,6 +26,10 @@ static kmem_cache_t *tmp_dnode_info_slab;</div><div class='ctx'> static kmem_cache_t *raw_node_ref_slab;</div><div class='ctx'> static kmem_cache_t *node_frag_slab;</div><div class='ctx'> static kmem_cache_t *inode_cache_slab;</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+static kmem_cache_t *xattr_datum_cache;</div><div class='add'>+static kmem_cache_t *xattr_ref_cache;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> int __init jffs2_create_slab_caches(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -53,8 +57,8 @@ int __init jffs2_create_slab_caches(void)</div><div class='ctx'> 	if (!tmp_dnode_info_slab)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	raw_node_ref_slab = kmem_cache_create("jffs2_raw_node_ref",</div><div class='del'>-					      sizeof(struct jffs2_raw_node_ref),</div><div class='add'>+	raw_node_ref_slab = kmem_cache_create("jffs2_refblock",</div><div class='add'>+					      sizeof(struct jffs2_raw_node_ref) * (REFS_PER_BLOCK + 1),</div><div class='ctx'> 					      0, 0, NULL, NULL);</div><div class='ctx'> 	if (!raw_node_ref_slab)</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -68,8 +72,24 @@ int __init jffs2_create_slab_caches(void)</div><div class='ctx'> 	inode_cache_slab = kmem_cache_create("jffs2_inode_cache",</div><div class='ctx'> 					     sizeof(struct jffs2_inode_cache),</div><div class='ctx'> 					     0, 0, NULL, NULL);</div><div class='del'>-	if (inode_cache_slab)</div><div class='del'>-		return 0;</div><div class='add'>+	if (!inode_cache_slab)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+	xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",</div><div class='add'>+					     sizeof(struct jffs2_xattr_datum),</div><div class='add'>+					     0, 0, NULL, NULL);</div><div class='add'>+	if (!xattr_datum_cache)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",</div><div class='add'>+					   sizeof(struct jffs2_xattr_ref),</div><div class='add'>+					   0, 0, NULL, NULL);</div><div class='add'>+	if (!xattr_ref_cache)</div><div class='add'>+		goto err;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'>  err:</div><div class='ctx'> 	jffs2_destroy_slab_caches();</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -91,6 +111,12 @@ void jffs2_destroy_slab_caches(void)</div><div class='ctx'> 		kmem_cache_destroy(node_frag_slab);</div><div class='ctx'> 	if(inode_cache_slab)</div><div class='ctx'> 		kmem_cache_destroy(inode_cache_slab);</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+	if (xattr_datum_cache)</div><div class='add'>+		kmem_cache_destroy(xattr_datum_cache);</div><div class='add'>+	if (xattr_ref_cache)</div><div class='add'>+		kmem_cache_destroy(xattr_ref_cache);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct jffs2_full_dirent *jffs2_alloc_full_dirent(int namesize)</div><div class='hunk'>@@ -164,15 +190,65 @@ void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x)</div><div class='ctx'> 	kmem_cache_free(tmp_dnode_info_slab, x);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void)</div><div class='add'>+static struct jffs2_raw_node_ref *jffs2_alloc_refblock(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_raw_node_ref *ret;</div><div class='add'>+</div><div class='ctx'> 	ret = kmem_cache_alloc(raw_node_ref_slab, GFP_KERNEL);</div><div class='del'>-	dbg_memalloc("%p\n", ret);</div><div class='add'>+	if (ret) {</div><div class='add'>+		int i = 0;</div><div class='add'>+		for (i=0; i &lt; REFS_PER_BLOCK; i++) {</div><div class='add'>+			ret[i].flash_offset = REF_EMPTY_NODE;</div><div class='add'>+			ret[i].next_in_ino = NULL;</div><div class='add'>+		}</div><div class='add'>+		ret[i].flash_offset = REF_LINK_NODE;</div><div class='add'>+		ret[i].next_in_ino = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *x)</div><div class='add'>+int jffs2_prealloc_raw_node_refs(struct jffs2_sb_info *c,</div><div class='add'>+				 struct jffs2_eraseblock *jeb, int nr)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_raw_node_ref **p, *ref;</div><div class='add'>+	int i = nr;</div><div class='add'>+</div><div class='add'>+	dbg_memalloc("%d\n", nr);</div><div class='add'>+</div><div class='add'>+	p = &amp;jeb-&gt;last_node;</div><div class='add'>+	ref = *p;</div><div class='add'>+</div><div class='add'>+	dbg_memalloc("Reserving %d refs for block @0x%08x\n", nr, jeb-&gt;offset);</div><div class='add'>+</div><div class='add'>+	/* If jeb-&gt;last_node is really a valid node then skip over it */</div><div class='add'>+	if (ref &amp;&amp; ref-&gt;flash_offset != REF_EMPTY_NODE)</div><div class='add'>+		ref++;</div><div class='add'>+</div><div class='add'>+	while (i) {</div><div class='add'>+		if (!ref) {</div><div class='add'>+			dbg_memalloc("Allocating new refblock linked from %p\n", p);</div><div class='add'>+			ref = *p = jffs2_alloc_refblock();</div><div class='add'>+			if (!ref)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		if (ref-&gt;flash_offset == REF_LINK_NODE) {</div><div class='add'>+			p = &amp;ref-&gt;next_in_ino;</div><div class='add'>+			ref = *p;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		i--;</div><div class='add'>+		ref++;</div><div class='add'>+	}</div><div class='add'>+	jeb-&gt;allocated_refs = nr;</div><div class='add'>+</div><div class='add'>+	dbg_memalloc("Reserved %d refs for block @0x%08x, last_node is %p (%08x,%p)\n",</div><div class='add'>+		  nr, jeb-&gt;offset, jeb-&gt;last_node, jeb-&gt;last_node-&gt;flash_offset,</div><div class='add'>+		  jeb-&gt;last_node-&gt;next_in_ino);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_free_refblock(struct jffs2_raw_node_ref *x)</div><div class='ctx'> {</div><div class='ctx'> 	dbg_memalloc("%p\n", x);</div><div class='ctx'> 	kmem_cache_free(raw_node_ref_slab, x);</div><div class='hunk'>@@ -205,3 +281,42 @@ void jffs2_free_inode_cache(struct jffs2_inode_cache *x)</div><div class='ctx'> 	dbg_memalloc("%p\n", x);</div><div class='ctx'> 	kmem_cache_free(inode_cache_slab, x);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	xd = kmem_cache_alloc(xattr_datum_cache, GFP_KERNEL);</div><div class='add'>+	dbg_memalloc("%p\n", xd);</div><div class='add'>+</div><div class='add'>+	memset(xd, 0, sizeof(struct jffs2_xattr_datum));</div><div class='add'>+	xd-&gt;class = RAWNODE_CLASS_XATTR_DATUM;</div><div class='add'>+	xd-&gt;node = (void *)xd;</div><div class='add'>+	INIT_LIST_HEAD(&amp;xd-&gt;xindex);</div><div class='add'>+	return xd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_free_xattr_datum(struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	dbg_memalloc("%p\n", xd);</div><div class='add'>+	kmem_cache_free(xattr_datum_cache, xd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_ref *ref;</div><div class='add'>+	ref = kmem_cache_alloc(xattr_ref_cache, GFP_KERNEL);</div><div class='add'>+	dbg_memalloc("%p\n", ref);</div><div class='add'>+</div><div class='add'>+	memset(ref, 0, sizeof(struct jffs2_xattr_ref));</div><div class='add'>+	ref-&gt;class = RAWNODE_CLASS_XATTR_REF;</div><div class='add'>+	ref-&gt;node = (void *)ref;</div><div class='add'>+	return ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_free_xattr_ref(struct jffs2_xattr_ref *ref)</div><div class='add'>+{</div><div class='add'>+	dbg_memalloc("%p\n", ref);</div><div class='add'>+	kmem_cache_free(xattr_ref_cache, ref);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c<br/>index 1d46677afd17..7675b33396c7 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/nodelist.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/nodelist.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/nodelist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/nodelist.c</a></div><div class='hunk'>@@ -438,8 +438,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info</div><div class='ctx'> 	if (c-&gt;mtd-&gt;point) {</div><div class='ctx'> 		err = c-&gt;mtd-&gt;point(c-&gt;mtd, ofs, len, &amp;retlen, &amp;buffer);</div><div class='ctx'> 		if (!err &amp;&amp; retlen &lt; tn-&gt;csize) {</div><div class='del'>-			JFFS2_WARNING("MTD point returned len too short: %zu "</div><div class='del'>-					"instead of %u.\n", retlen, tn-&gt;csize);</div><div class='add'>+			JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn-&gt;csize);</div><div class='ctx'> 			c-&gt;mtd-&gt;unpoint(c-&gt;mtd, buffer, ofs, len);</div><div class='ctx'> 		} else if (err)</div><div class='ctx'> 			JFFS2_WARNING("MTD point failed: error code %d.\n", err);</div><div class='hunk'>@@ -462,8 +461,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (retlen != len) {</div><div class='del'>-			JFFS2_ERROR("short read at %#08x: %zd instead of %d.\n",</div><div class='del'>-					ofs, retlen, len);</div><div class='add'>+			JFFS2_ERROR("short read at %#08x: %zd instead of %d.\n", ofs, retlen, len);</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto free_out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -908,6 +906,9 @@ void jffs2_del_ino_cache(struct jffs2_sb_info *c, struct jffs2_inode_cache *old)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_inode_cache **prev;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+	BUG_ON(old-&gt;xref);</div><div class='add'>+#endif</div><div class='ctx'> 	dbg_inocache("del %p (ino #%u)\n", old, old-&gt;ino);</div><div class='ctx'> 	spin_lock(&amp;c-&gt;inocache_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -940,6 +941,7 @@ void jffs2_free_ino_caches(struct jffs2_sb_info *c)</div><div class='ctx'> 		this = c-&gt;inocache_list[i];</div><div class='ctx'> 		while (this) {</div><div class='ctx'> 			next = this-&gt;next;</div><div class='add'>+			jffs2_xattr_free_inode(c, this);</div><div class='ctx'> 			jffs2_free_inode_cache(this);</div><div class='ctx'> 			this = next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -954,9 +956,13 @@ void jffs2_free_raw_node_refs(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt;c-&gt;nr_blocks; i++) {</div><div class='ctx'> 		this = c-&gt;blocks[i].first_node;</div><div class='del'>-		while(this) {</div><div class='del'>-			next = this-&gt;next_phys;</div><div class='del'>-			jffs2_free_raw_node_ref(this);</div><div class='add'>+		while (this) {</div><div class='add'>+			if (this[REFS_PER_BLOCK].flash_offset == REF_LINK_NODE)</div><div class='add'>+				next = this[REFS_PER_BLOCK].next_in_ino;</div><div class='add'>+			else</div><div class='add'>+				next = NULL;</div><div class='add'>+</div><div class='add'>+			jffs2_free_refblock(this);</div><div class='ctx'> 			this = next;</div><div class='ctx'> 		}</div><div class='ctx'> 		c-&gt;blocks[i].first_node = c-&gt;blocks[i].last_node = NULL;</div><div class='hunk'>@@ -1047,3 +1053,169 @@ void jffs2_kill_fragtree(struct rb_root *root, struct jffs2_sb_info *c)</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct jffs2_raw_node_ref *jffs2_link_node_ref(struct jffs2_sb_info *c,</div><div class='add'>+					       struct jffs2_eraseblock *jeb,</div><div class='add'>+					       uint32_t ofs, uint32_t len,</div><div class='add'>+					       struct jffs2_inode_cache *ic)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_raw_node_ref *ref;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!jeb-&gt;allocated_refs);</div><div class='add'>+	jeb-&gt;allocated_refs--;</div><div class='add'>+</div><div class='add'>+	ref = jeb-&gt;last_node;</div><div class='add'>+</div><div class='add'>+	dbg_noderef("Last node at %p is (%08x,%p)\n", ref, ref-&gt;flash_offset,</div><div class='add'>+		    ref-&gt;next_in_ino);</div><div class='add'>+</div><div class='add'>+	while (ref-&gt;flash_offset != REF_EMPTY_NODE) {</div><div class='add'>+		if (ref-&gt;flash_offset == REF_LINK_NODE)</div><div class='add'>+			ref = ref-&gt;next_in_ino;</div><div class='add'>+		else</div><div class='add'>+			ref++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_noderef("New ref is %p (%08x becomes %08x,%p) len 0x%x\n", ref, </div><div class='add'>+		    ref-&gt;flash_offset, ofs, ref-&gt;next_in_ino, len);</div><div class='add'>+</div><div class='add'>+	ref-&gt;flash_offset = ofs;</div><div class='add'>+</div><div class='add'>+	if (!jeb-&gt;first_node) {</div><div class='add'>+		jeb-&gt;first_node = ref;</div><div class='add'>+		BUG_ON(ref_offset(ref) != jeb-&gt;offset);</div><div class='add'>+	} else if (unlikely(ref_offset(ref) != jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size)) {</div><div class='add'>+		uint32_t last_len = ref_totlen(c, jeb, jeb-&gt;last_node);</div><div class='add'>+</div><div class='add'>+		JFFS2_ERROR("Adding new ref %p at (0x%08x-0x%08x) not immediately after previous (0x%08x-0x%08x)\n",</div><div class='add'>+			    ref, ref_offset(ref), ref_offset(ref)+len,</div><div class='add'>+			    ref_offset(jeb-&gt;last_node), </div><div class='add'>+			    ref_offset(jeb-&gt;last_node)+last_len);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	jeb-&gt;last_node = ref;</div><div class='add'>+</div><div class='add'>+	if (ic) {</div><div class='add'>+		ref-&gt;next_in_ino = ic-&gt;nodes;</div><div class='add'>+		ic-&gt;nodes = ref;</div><div class='add'>+	} else {</div><div class='add'>+		ref-&gt;next_in_ino = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch(ref_flags(ref)) {</div><div class='add'>+	case REF_UNCHECKED:</div><div class='add'>+		c-&gt;unchecked_size += len;</div><div class='add'>+		jeb-&gt;unchecked_size += len;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case REF_NORMAL:</div><div class='add'>+	case REF_PRISTINE:</div><div class='add'>+		c-&gt;used_size += len;</div><div class='add'>+		jeb-&gt;used_size += len;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case REF_OBSOLETE:</div><div class='add'>+		c-&gt;dirty_size += len;</div><div class='add'>+		jeb-&gt;dirty_size += len;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	c-&gt;free_size -= len;</div><div class='add'>+	jeb-&gt;free_size -= len;</div><div class='add'>+</div><div class='add'>+#ifdef TEST_TOTLEN</div><div class='add'>+	/* Set (and test) __totlen field... for now */</div><div class='add'>+	ref-&gt;__totlen = len;</div><div class='add'>+	ref_totlen(c, jeb, ref);</div><div class='add'>+#endif</div><div class='add'>+	return ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* No locking, no reservation of 'ref'. Do not use on a live file system */</div><div class='add'>+int jffs2_scan_dirty_space(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='add'>+			   uint32_t size)</div><div class='add'>+{</div><div class='add'>+	if (!size)</div><div class='add'>+		return 0;</div><div class='add'>+	if (unlikely(size &gt; jeb-&gt;free_size)) {</div><div class='add'>+		printk(KERN_CRIT "Dirty space 0x%x larger then free_size 0x%x (wasted 0x%x)\n",</div><div class='add'>+		       size, jeb-&gt;free_size, jeb-&gt;wasted_size);</div><div class='add'>+		BUG();</div><div class='add'>+	}</div><div class='add'>+	/* REF_EMPTY_NODE is !obsolete, so that works OK */</div><div class='add'>+	if (jeb-&gt;last_node &amp;&amp; ref_obsolete(jeb-&gt;last_node)) {</div><div class='add'>+#ifdef TEST_TOTLEN</div><div class='add'>+		jeb-&gt;last_node-&gt;__totlen += size;</div><div class='add'>+#endif</div><div class='add'>+		c-&gt;dirty_size += size;</div><div class='add'>+		c-&gt;free_size -= size;</div><div class='add'>+		jeb-&gt;dirty_size += size;</div><div class='add'>+		jeb-&gt;free_size -= size;</div><div class='add'>+	} else {</div><div class='add'>+		uint32_t ofs = jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size;</div><div class='add'>+		ofs |= REF_OBSOLETE;</div><div class='add'>+</div><div class='add'>+		jffs2_link_node_ref(c, jeb, ofs, size, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate totlen from surrounding nodes or eraseblock */</div><div class='add'>+static inline uint32_t __ref_totlen(struct jffs2_sb_info *c,</div><div class='add'>+				    struct jffs2_eraseblock *jeb,</div><div class='add'>+				    struct jffs2_raw_node_ref *ref)</div><div class='add'>+{</div><div class='add'>+	uint32_t ref_end;</div><div class='add'>+	struct jffs2_raw_node_ref *next_ref = ref_next(ref);</div><div class='add'>+</div><div class='add'>+	if (next_ref)</div><div class='add'>+		ref_end = ref_offset(next_ref);</div><div class='add'>+	else {</div><div class='add'>+		if (!jeb)</div><div class='add'>+			jeb = &amp;c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size];</div><div class='add'>+</div><div class='add'>+		/* Last node in block. Use free_space */</div><div class='add'>+		if (unlikely(ref != jeb-&gt;last_node)) {</div><div class='add'>+			printk(KERN_CRIT "ref %p @0x%08x is not jeb-&gt;last_node (%p @0x%08x)\n",</div><div class='add'>+			       ref, ref_offset(ref), jeb-&gt;last_node, jeb-&gt;last_node?ref_offset(jeb-&gt;last_node):0);</div><div class='add'>+			BUG();</div><div class='add'>+		}</div><div class='add'>+		ref_end = jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size;</div><div class='add'>+	}</div><div class='add'>+	return ref_end - ref_offset(ref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uint32_t __jffs2_ref_totlen(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='add'>+			    struct jffs2_raw_node_ref *ref)</div><div class='add'>+{</div><div class='add'>+	uint32_t ret;</div><div class='add'>+</div><div class='add'>+	ret = __ref_totlen(c, jeb, ref);</div><div class='add'>+</div><div class='add'>+#ifdef TEST_TOTLEN</div><div class='add'>+	if (unlikely(ret != ref-&gt;__totlen)) {</div><div class='add'>+		if (!jeb)</div><div class='add'>+			jeb = &amp;c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size];</div><div class='add'>+</div><div class='add'>+		printk(KERN_CRIT "Totlen for ref at %p (0x%08x-0x%08x) miscalculated as 0x%x instead of %x\n",</div><div class='add'>+		       ref, ref_offset(ref), ref_offset(ref)+ref-&gt;__totlen,</div><div class='add'>+		       ret, ref-&gt;__totlen);</div><div class='add'>+		if (ref_next(ref)) {</div><div class='add'>+			printk(KERN_CRIT "next %p (0x%08x-0x%08x)\n", ref_next(ref), ref_offset(ref_next(ref)),</div><div class='add'>+			       ref_offset(ref_next(ref))+ref-&gt;__totlen);</div><div class='add'>+		} else </div><div class='add'>+			printk(KERN_CRIT "No next ref. jeb-&gt;last_node is %p\n", jeb-&gt;last_node);</div><div class='add'>+</div><div class='add'>+		printk(KERN_CRIT "jeb-&gt;wasted_size %x, dirty_size %x, used_size %x, free_size %x\n", jeb-&gt;wasted_size, jeb-&gt;dirty_size, jeb-&gt;used_size, jeb-&gt;free_size);</div><div class='add'>+</div><div class='add'>+#if defined(JFFS2_DBG_DUMPS) || defined(JFFS2_DBG_PARANOIA_CHECKS)</div><div class='add'>+		__jffs2_dbg_dump_node_refs_nolock(c, jeb);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+</div><div class='add'>+		ret = ref-&gt;__totlen;</div><div class='add'>+	}</div><div class='add'>+#endif /* TEST_TOTLEN */</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h<br/>index 23a67bb3052f..cae92c14116d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/nodelist.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/nodelist.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/nodelist.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/nodelist.h</a></div><div class='hunk'>@@ -14,12 +14,13 @@</div><div class='ctx'> #ifndef __JFFS2_NODELIST_H__</div><div class='ctx'> #define __JFFS2_NODELIST_H__</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/jffs2.h&gt;</div><div class='del'>-#include &lt;linux/jffs2_fs_sb.h&gt;</div><div class='del'>-#include &lt;linux/jffs2_fs_i.h&gt;</div><div class='add'>+#include "jffs2_fs_sb.h"</div><div class='add'>+#include "jffs2_fs_i.h"</div><div class='add'>+#include "xattr.h"</div><div class='add'>+#include "acl.h"</div><div class='ctx'> #include "summary.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef __ECOS</div><div class='hunk'>@@ -75,14 +76,50 @@</div><div class='ctx'> struct jffs2_raw_node_ref</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_raw_node_ref *next_in_ino; /* Points to the next raw_node_ref</div><div class='del'>-		for this inode. If this is the last, it points to the inode_cache</div><div class='del'>-		for this inode instead. The inode_cache will have NULL in the first</div><div class='del'>-		word so you know when you've got there :) */</div><div class='del'>-	struct jffs2_raw_node_ref *next_phys;</div><div class='add'>+		for this object. If this _is_ the last, it points to the inode_cache,</div><div class='add'>+		xattr_ref or xattr_datum instead. The common part of those structures</div><div class='add'>+		has NULL in the first word. See jffs2_raw_ref_to_ic() below */</div><div class='ctx'> 	uint32_t flash_offset;</div><div class='add'>+#define TEST_TOTLEN</div><div class='add'>+#ifdef TEST_TOTLEN</div><div class='ctx'> 	uint32_t __totlen; /* This may die; use ref_totlen(c, jeb, ) below */</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define REF_LINK_NODE ((int32_t)-1)</div><div class='add'>+#define REF_EMPTY_NODE ((int32_t)-2)</div><div class='add'>+</div><div class='add'>+/* Use blocks of about 256 bytes */</div><div class='add'>+#define REFS_PER_BLOCK ((255/sizeof(struct jffs2_raw_node_ref))-1)</div><div class='add'>+</div><div class='add'>+static inline struct jffs2_raw_node_ref *ref_next(struct jffs2_raw_node_ref *ref)</div><div class='add'>+{</div><div class='add'>+	ref++;</div><div class='add'>+</div><div class='add'>+	/* Link to another block of refs */</div><div class='add'>+	if (ref-&gt;flash_offset == REF_LINK_NODE) {</div><div class='add'>+		ref = ref-&gt;next_in_ino;</div><div class='add'>+		if (!ref)</div><div class='add'>+			return ref;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* End of chain */</div><div class='add'>+	if (ref-&gt;flash_offset == REF_EMPTY_NODE)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return ref;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct jffs2_inode_cache *jffs2_raw_ref_to_ic(struct jffs2_raw_node_ref *raw)</div><div class='add'>+{</div><div class='add'>+	while(raw-&gt;next_in_ino)</div><div class='add'>+		raw = raw-&gt;next_in_ino;</div><div class='add'>+</div><div class='add'>+	/* NB. This can be a jffs2_xattr_datum or jffs2_xattr_ref and</div><div class='add'>+	   not actually a jffs2_inode_cache. Check -&gt;class */</div><div class='add'>+	return ((struct jffs2_inode_cache *)raw);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'>         /* flash_offset &amp; 3 always has to be zero, because nodes are</div><div class='ctx'> 	   always aligned at 4 bytes. So we have a couple of extra bits</div><div class='ctx'> 	   to play with, which indicate the node's status; see below: */</div><div class='hunk'>@@ -95,6 +132,11 @@ struct jffs2_raw_node_ref</div><div class='ctx'> #define ref_obsolete(ref)	(((ref)-&gt;flash_offset &amp; 3) == REF_OBSOLETE)</div><div class='ctx'> #define mark_ref_normal(ref)    do { (ref)-&gt;flash_offset = ref_offset(ref) | REF_NORMAL; } while(0)</div><div class='ctx'> </div><div class='add'>+/* NB: REF_PRISTINE for an inode-less node (ref-&gt;next_in_ino == NULL) indicates</div><div class='add'>+   it is an unknown node of type JFFS2_NODETYPE_RWCOMPAT_COPY, so it'll get</div><div class='add'>+   copied. If you need to do anything different to GC inode-less nodes, then</div><div class='add'>+   you need to modify gc.c accordingly. */</div><div class='add'>+</div><div class='ctx'> /* For each inode in the filesystem, we need to keep a record of</div><div class='ctx'>    nlink, because it would be a PITA to scan the whole directory tree</div><div class='ctx'>    at read_inode() time to calculate it, and to keep sufficient information</div><div class='hunk'>@@ -103,15 +145,27 @@ struct jffs2_raw_node_ref</div><div class='ctx'>    a pointer to the first physical node which is part of this inode, too.</div><div class='ctx'> */</div><div class='ctx'> struct jffs2_inode_cache {</div><div class='add'>+	/* First part of structure is shared with other objects which</div><div class='add'>+	   can terminate the raw node refs' next_in_ino list -- which</div><div class='add'>+	   currently struct jffs2_xattr_datum and struct jffs2_xattr_ref. */</div><div class='add'>+</div><div class='ctx'> 	struct jffs2_full_dirent *scan_dents; /* Used during scan to hold</div><div class='ctx'> 		temporary lists of dirents, and later must be set to</div><div class='ctx'> 		NULL to mark the end of the raw_node_ref-&gt;next_in_ino</div><div class='ctx'> 		chain. */</div><div class='del'>-	struct jffs2_inode_cache *next;</div><div class='ctx'> 	struct jffs2_raw_node_ref *nodes;</div><div class='add'>+	uint8_t class;	/* It's used for identification */</div><div class='add'>+</div><div class='add'>+	/* end of shared structure */</div><div class='add'>+</div><div class='add'>+	uint8_t flags;</div><div class='add'>+	uint16_t state;</div><div class='ctx'> 	uint32_t ino;</div><div class='add'>+	struct jffs2_inode_cache *next;</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+	struct jffs2_xattr_ref *xref;</div><div class='add'>+#endif</div><div class='ctx'> 	int nlink;</div><div class='del'>-	int state;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Inode states for 'state' above. We need the 'GC' state to prevent</div><div class='hunk'>@@ -125,8 +179,16 @@ struct jffs2_inode_cache {</div><div class='ctx'> #define INO_STATE_READING	5	/* In read_inode() */</div><div class='ctx'> #define INO_STATE_CLEARING	6	/* In clear_inode() */</div><div class='ctx'> </div><div class='add'>+#define INO_FLAGS_XATTR_CHECKED	0x01	/* has no duplicate xattr_ref */</div><div class='add'>+</div><div class='add'>+#define RAWNODE_CLASS_INODE_CACHE	0</div><div class='add'>+#define RAWNODE_CLASS_XATTR_DATUM	1</div><div class='add'>+#define RAWNODE_CLASS_XATTR_REF		2</div><div class='add'>+</div><div class='ctx'> #define INOCACHE_HASHSIZE 128</div><div class='ctx'> </div><div class='add'>+#define write_ofs(c) ((c)-&gt;nextblock-&gt;offset + (c)-&gt;sector_size - (c)-&gt;nextblock-&gt;free_size)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>   Larger representation of a raw node, kept in-core only when the</div><div class='ctx'>   struct inode for this particular ino is instantiated.</div><div class='hunk'>@@ -192,6 +254,7 @@ struct jffs2_eraseblock</div><div class='ctx'> 	uint32_t wasted_size;</div><div class='ctx'> 	uint32_t free_size;	/* Note that sector_size - free_size</div><div class='ctx'> 				   is the address of the first free space */</div><div class='add'>+	uint32_t allocated_refs;</div><div class='ctx'> 	struct jffs2_raw_node_ref *first_node;</div><div class='ctx'> 	struct jffs2_raw_node_ref *last_node;</div><div class='ctx'> </div><div class='hunk'>@@ -203,57 +266,7 @@ static inline int jffs2_blocks_use_vmalloc(struct jffs2_sb_info *c)</div><div class='ctx'> 	return ((c-&gt;flash_size / c-&gt;sector_size) * sizeof (struct jffs2_eraseblock)) &gt; (128 * 1024);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Calculate totlen from surrounding nodes or eraseblock */</div><div class='del'>-static inline uint32_t __ref_totlen(struct jffs2_sb_info *c,</div><div class='del'>-				    struct jffs2_eraseblock *jeb,</div><div class='del'>-				    struct jffs2_raw_node_ref *ref)</div><div class='del'>-{</div><div class='del'>-	uint32_t ref_end;</div><div class='del'>-</div><div class='del'>-	if (ref-&gt;next_phys)</div><div class='del'>-		ref_end = ref_offset(ref-&gt;next_phys);</div><div class='del'>-	else {</div><div class='del'>-		if (!jeb)</div><div class='del'>-			jeb = &amp;c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size];</div><div class='del'>-</div><div class='del'>-		/* Last node in block. Use free_space */</div><div class='del'>-		BUG_ON(ref != jeb-&gt;last_node);</div><div class='del'>-		ref_end = jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size;</div><div class='del'>-	}</div><div class='del'>-	return ref_end - ref_offset(ref);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline uint32_t ref_totlen(struct jffs2_sb_info *c,</div><div class='del'>-				  struct jffs2_eraseblock *jeb,</div><div class='del'>-				  struct jffs2_raw_node_ref *ref)</div><div class='del'>-{</div><div class='del'>-	uint32_t ret;</div><div class='del'>-</div><div class='del'>-#if CONFIG_JFFS2_FS_DEBUG &gt; 0</div><div class='del'>-	if (jeb &amp;&amp; jeb != &amp;c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size]) {</div><div class='del'>-		printk(KERN_CRIT "ref_totlen called with wrong block -- at 0x%08x instead of 0x%08x; ref 0x%08x\n",</div><div class='del'>-		       jeb-&gt;offset, c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size].offset, ref_offset(ref));</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-	ret = ref-&gt;__totlen;</div><div class='del'>-#else</div><div class='del'>-	/* This doesn't actually work yet */</div><div class='del'>-	ret = __ref_totlen(c, jeb, ref);</div><div class='del'>-	if (ret != ref-&gt;__totlen) {</div><div class='del'>-		printk(KERN_CRIT "Totlen for ref at %p (0x%08x-0x%08x) miscalculated as 0x%x instead of %x\n",</div><div class='del'>-		       ref, ref_offset(ref), ref_offset(ref)+ref-&gt;__totlen,</div><div class='del'>-		       ret, ref-&gt;__totlen);</div><div class='del'>-		if (!jeb)</div><div class='del'>-			jeb = &amp;c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size];</div><div class='del'>-		jffs2_dbg_dump_node_refs_nolock(c, jeb);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='add'>+#define ref_totlen(a, b, c) __jffs2_ref_totlen((a), (b), (c))</div><div class='ctx'> </div><div class='ctx'> #define ALLOC_NORMAL	0	/* Normal allocation */</div><div class='ctx'> #define ALLOC_DELETION	1	/* Deletion node. Best to allow it */</div><div class='hunk'>@@ -268,13 +281,15 @@ static inline uint32_t ref_totlen(struct jffs2_sb_info *c,</div><div class='ctx'> </div><div class='ctx'> #define PAD(x) (((x)+3)&amp;~3)</div><div class='ctx'> </div><div class='del'>-static inline struct jffs2_inode_cache *jffs2_raw_ref_to_ic(struct jffs2_raw_node_ref *raw)</div><div class='add'>+static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev)</div><div class='ctx'> {</div><div class='del'>-	while(raw-&gt;next_in_ino) {</div><div class='del'>-		raw = raw-&gt;next_in_ino;</div><div class='add'>+	if (old_valid_dev(rdev)) {</div><div class='add'>+		jdev-&gt;old = cpu_to_je16(old_encode_dev(rdev));</div><div class='add'>+		return sizeof(jdev-&gt;old);</div><div class='add'>+	} else {</div><div class='add'>+		jdev-&gt;new = cpu_to_je32(new_encode_dev(rdev));</div><div class='add'>+		return sizeof(jdev-&gt;new);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return ((struct jffs2_inode_cache *)raw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct jffs2_node_frag *frag_first(struct rb_root *root)</div><div class='hunk'>@@ -299,7 +314,6 @@ static inline struct jffs2_node_frag *frag_last(struct rb_root *root)</div><div class='ctx'> 	return rb_entry(node, struct jffs2_node_frag, rb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define rb_parent(rb) ((rb)-&gt;rb_parent)</div><div class='ctx'> #define frag_next(frag) rb_entry(rb_next(&amp;(frag)-&gt;rb), struct jffs2_node_frag, rb)</div><div class='ctx'> #define frag_prev(frag) rb_entry(rb_prev(&amp;(frag)-&gt;rb), struct jffs2_node_frag, rb)</div><div class='ctx'> #define frag_parent(frag) rb_entry(rb_parent(&amp;(frag)-&gt;rb), struct jffs2_node_frag, rb)</div><div class='hunk'>@@ -324,28 +338,44 @@ void jffs2_obsolete_node_frag(struct jffs2_sb_info *c, struct jffs2_node_frag *t</div><div class='ctx'> int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_full_dnode *fn);</div><div class='ctx'> void jffs2_truncate_fragtree (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size);</div><div class='ctx'> int jffs2_add_older_frag_to_fragtree(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_tmp_dnode_info *tn);</div><div class='add'>+struct jffs2_raw_node_ref *jffs2_link_node_ref(struct jffs2_sb_info *c,</div><div class='add'>+					       struct jffs2_eraseblock *jeb,</div><div class='add'>+					       uint32_t ofs, uint32_t len,</div><div class='add'>+					       struct jffs2_inode_cache *ic);</div><div class='add'>+extern uint32_t __jffs2_ref_totlen(struct jffs2_sb_info *c,</div><div class='add'>+				   struct jffs2_eraseblock *jeb,</div><div class='add'>+				   struct jffs2_raw_node_ref *ref);</div><div class='ctx'> </div><div class='ctx'> /* nodemgmt.c */</div><div class='ctx'> int jffs2_thread_should_wake(struct jffs2_sb_info *c);</div><div class='del'>-int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,</div><div class='add'>+int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='ctx'> 			uint32_t *len, int prio, uint32_t sumsize);</div><div class='del'>-int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,</div><div class='add'>+int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='ctx'> 			uint32_t *len, uint32_t sumsize);</div><div class='del'>-int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new);</div><div class='add'>+struct jffs2_raw_node_ref *jffs2_add_physical_node_ref(struct jffs2_sb_info *c, </div><div class='add'>+						       uint32_t ofs, uint32_t len,</div><div class='add'>+						       struct jffs2_inode_cache *ic);</div><div class='ctx'> void jffs2_complete_reservation(struct jffs2_sb_info *c);</div><div class='ctx'> void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *raw);</div><div class='ctx'> </div><div class='ctx'> /* write.c */</div><div class='ctx'> int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri);</div><div class='ctx'> </div><div class='del'>-struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const unsigned char *data, uint32_t datalen, uint32_t flash_ofs, int alloc_mode);</div><div class='del'>-struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_dirent *rd, const unsigned char *name, uint32_t namelen, uint32_t flash_ofs, int alloc_mode);</div><div class='add'>+struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='add'>+					   struct jffs2_raw_inode *ri, const unsigned char *data,</div><div class='add'>+					   uint32_t datalen, int alloc_mode);</div><div class='add'>+struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='add'>+					     struct jffs2_raw_dirent *rd, const unsigned char *name,</div><div class='add'>+					     uint32_t namelen, int alloc_mode);</div><div class='ctx'> int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='ctx'> 			    struct jffs2_raw_inode *ri, unsigned char *buf,</div><div class='ctx'> 			    uint32_t offset, uint32_t writelen, uint32_t *retlen);</div><div class='del'>-int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const char *name, int namelen);</div><div class='del'>-int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, const char *name, int namelen, struct jffs2_inode_info *dead_f, uint32_t time);</div><div class='del'>-int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint32_t ino, uint8_t type, const char *name, int namelen, uint32_t time);</div><div class='add'>+int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, struct jffs2_inode_info *f,</div><div class='add'>+		    struct jffs2_raw_inode *ri, const char *name, int namelen);</div><div class='add'>+int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, const char *name,</div><div class='add'>+		    int namelen, struct jffs2_inode_info *dead_f, uint32_t time);</div><div class='add'>+int jffs2_do_link(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint32_t ino,</div><div class='add'>+		   uint8_t type, const char *name, int namelen, uint32_t time);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* readinode.c */</div><div class='hunk'>@@ -368,12 +398,19 @@ struct jffs2_raw_inode *jffs2_alloc_raw_inode(void);</div><div class='ctx'> void jffs2_free_raw_inode(struct jffs2_raw_inode *);</div><div class='ctx'> struct jffs2_tmp_dnode_info *jffs2_alloc_tmp_dnode_info(void);</div><div class='ctx'> void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *);</div><div class='del'>-struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void);</div><div class='del'>-void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *);</div><div class='add'>+int jffs2_prealloc_raw_node_refs(struct jffs2_sb_info *c,</div><div class='add'>+				 struct jffs2_eraseblock *jeb, int nr);</div><div class='add'>+void jffs2_free_refblock(struct jffs2_raw_node_ref *);</div><div class='ctx'> struct jffs2_node_frag *jffs2_alloc_node_frag(void);</div><div class='ctx'> void jffs2_free_node_frag(struct jffs2_node_frag *);</div><div class='ctx'> struct jffs2_inode_cache *jffs2_alloc_inode_cache(void);</div><div class='ctx'> void jffs2_free_inode_cache(struct jffs2_inode_cache *);</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void);</div><div class='add'>+void jffs2_free_xattr_datum(struct jffs2_xattr_datum *);</div><div class='add'>+struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void);</div><div class='add'>+void jffs2_free_xattr_ref(struct jffs2_xattr_ref *);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* gc.c */</div><div class='ctx'> int jffs2_garbage_collect_pass(struct jffs2_sb_info *c);</div><div class='hunk'>@@ -389,16 +426,16 @@ char *jffs2_getlink(struct jffs2_sb_info *c, struct jffs2_inode_info *f);</div><div class='ctx'> /* scan.c */</div><div class='ctx'> int jffs2_scan_medium(struct jffs2_sb_info *c);</div><div class='ctx'> void jffs2_rotate_lists(struct jffs2_sb_info *c);</div><div class='del'>-int jffs2_fill_scan_buf(struct jffs2_sb_info *c, void *buf,</div><div class='del'>-				uint32_t ofs, uint32_t len);</div><div class='ctx'> struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uint32_t ino);</div><div class='ctx'> int jffs2_scan_classify_jeb(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);</div><div class='add'>+int jffs2_scan_dirty_space(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t size);</div><div class='ctx'> </div><div class='ctx'> /* build.c */</div><div class='ctx'> int jffs2_do_mount_fs(struct jffs2_sb_info *c);</div><div class='ctx'> </div><div class='ctx'> /* erase.c */</div><div class='ctx'> void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count);</div><div class='add'>+void jffs2_free_jeb_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_JFFS2_FS_WRITEBUFFER</div><div class='ctx'> /* wbuf.c */</div><div class='head'>diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c<br/>index 49127a1f0458..d88376992ed9 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/nodemgmt.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/nodemgmt.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/nodemgmt.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/nodemgmt.c</a></div><div class='hunk'>@@ -23,13 +23,12 @@</div><div class='ctx'>  *	jffs2_reserve_space - request physical space to write nodes to flash</div><div class='ctx'>  *	@c: superblock info</div><div class='ctx'>  *	@minsize: Minimum acceptable size of allocation</div><div class='del'>- *	@ofs: Returned value of node offset</div><div class='ctx'>  *	@len: Returned value of allocation length</div><div class='ctx'>  *	@prio: Allocation type - ALLOC_{NORMAL,DELETION}</div><div class='ctx'>  *</div><div class='ctx'>  *	Requests a block of physical space on the flash. Returns zero for success</div><div class='del'>- *	and puts 'ofs' and 'len' into the appriopriate place, or returns -ENOSPC</div><div class='del'>- *	or other error if appropriate.</div><div class='add'>+ *	and puts 'len' into the appropriate place, or returns -ENOSPC or other </div><div class='add'>+ *	error if appropriate. Doesn't return len since that's </div><div class='ctx'>  *</div><div class='ctx'>  *	If it returns zero, jffs2_reserve_space() also downs the per-filesystem</div><div class='ctx'>  *	allocation semaphore, to prevent more than one allocation from being</div><div class='hunk'>@@ -40,9 +39,9 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int jffs2_do_reserve_space(struct jffs2_sb_info *c,  uint32_t minsize,</div><div class='del'>-					uint32_t *ofs, uint32_t *len, uint32_t sumsize);</div><div class='add'>+				  uint32_t *len, uint32_t sumsize);</div><div class='ctx'> </div><div class='del'>-int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,</div><div class='add'>+int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='ctx'> 			uint32_t *len, int prio, uint32_t sumsize)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -EAGAIN;</div><div class='hunk'>@@ -132,19 +131,21 @@ int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs</div><div class='ctx'> 			spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ret = jffs2_do_reserve_space(c, minsize, ofs, len, sumsize);</div><div class='add'>+		ret = jffs2_do_reserve_space(c, minsize, len, sumsize);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			D1(printk(KERN_DEBUG "jffs2_reserve_space: ret is %d\n", ret));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = jffs2_prealloc_raw_node_refs(c, c-&gt;nextblock, 1);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		up(&amp;c-&gt;alloc_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs,</div><div class='del'>-			uint32_t *len, uint32_t sumsize)</div><div class='add'>+int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='add'>+			   uint32_t *len, uint32_t sumsize)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -EAGAIN;</div><div class='ctx'> 	minsize = PAD(minsize);</div><div class='hunk'>@@ -153,12 +154,15 @@ int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	while(ret == -EAGAIN) {</div><div class='del'>-		ret = jffs2_do_reserve_space(c, minsize, ofs, len, sumsize);</div><div class='add'>+		ret = jffs2_do_reserve_space(c, minsize, len, sumsize);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 		        D1(printk(KERN_DEBUG "jffs2_reserve_space_gc: looping, ret is %d\n", ret));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = jffs2_prealloc_raw_node_refs(c, c-&gt;nextblock, 1);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -207,8 +211,7 @@ static int jffs2_find_nextblock(struct jffs2_sb_info *c)</div><div class='ctx'> 			struct jffs2_eraseblock *ejeb;</div><div class='ctx'> </div><div class='ctx'> 			ejeb = list_entry(c-&gt;erasable_list.next, struct jffs2_eraseblock, list);</div><div class='del'>-			list_del(&amp;ejeb-&gt;list);</div><div class='del'>-			list_add_tail(&amp;ejeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='add'>+			list_move_tail(&amp;ejeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='ctx'> 			c-&gt;nr_erasing_blocks++;</div><div class='ctx'> 			jffs2_erase_pending_trigger(c);</div><div class='ctx'> 			D1(printk(KERN_DEBUG "jffs2_find_nextblock: Triggering erase of erasable block at 0x%08x\n",</div><div class='hunk'>@@ -259,10 +262,11 @@ static int jffs2_find_nextblock(struct jffs2_sb_info *c)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called with alloc sem _and_ erase_completion_lock */</div><div class='del'>-static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs, uint32_t *len, uint32_t sumsize)</div><div class='add'>+static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,</div><div class='add'>+				  uint32_t *len, uint32_t sumsize)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_eraseblock *jeb = c-&gt;nextblock;</div><div class='del'>-	uint32_t reserved_size; 			/* for summary information at the end of the jeb */</div><div class='add'>+	uint32_t reserved_size;				/* for summary information at the end of the jeb */</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'>  restart:</div><div class='hunk'>@@ -312,6 +316,8 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (jeb &amp;&amp; minsize &gt; jeb-&gt;free_size) {</div><div class='add'>+			uint32_t waste;</div><div class='add'>+</div><div class='ctx'> 			/* Skip the end of this block and file it as having some dirty space */</div><div class='ctx'> 			/* If there's a pending write to it, flush now */</div><div class='ctx'> </div><div class='hunk'>@@ -324,10 +330,26 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin</div><div class='ctx'> 				goto restart;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			c-&gt;wasted_size += jeb-&gt;free_size;</div><div class='del'>-			c-&gt;free_size -= jeb-&gt;free_size;</div><div class='del'>-			jeb-&gt;wasted_size += jeb-&gt;free_size;</div><div class='del'>-			jeb-&gt;free_size = 0;</div><div class='add'>+			spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+			ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			/* Just lock it again and continue. Nothing much can change because</div><div class='add'>+			   we hold c-&gt;alloc_sem anyway. In fact, it's not entirely clear why</div><div class='add'>+			   we hold c-&gt;erase_completion_lock in the majority of this function...</div><div class='add'>+			   but that's a question for another (more caffeine-rich) day. */</div><div class='add'>+			spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+			waste = jeb-&gt;free_size;</div><div class='add'>+			jffs2_link_node_ref(c, jeb,</div><div class='add'>+					    (jeb-&gt;offset + c-&gt;sector_size - waste) | REF_OBSOLETE,</div><div class='add'>+					    waste, NULL);</div><div class='add'>+			/* FIXME: that made it count as dirty. Convert to wasted */</div><div class='add'>+			jeb-&gt;dirty_size -= waste;</div><div class='add'>+			c-&gt;dirty_size -= waste;</div><div class='add'>+			jeb-&gt;wasted_size += waste;</div><div class='add'>+			c-&gt;wasted_size += waste;</div><div class='ctx'> </div><div class='ctx'> 			jffs2_close_nextblock(c, jeb);</div><div class='ctx'> 			jeb = NULL;</div><div class='hunk'>@@ -349,7 +371,6 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin</div><div class='ctx'> 	}</div><div class='ctx'> 	/* OK, jeb (==c-&gt;nextblock) is now pointing at a block which definitely has</div><div class='ctx'> 	   enough space */</div><div class='del'>-	*ofs = jeb-&gt;offset + (c-&gt;sector_size - jeb-&gt;free_size);</div><div class='ctx'> 	*len = jeb-&gt;free_size - reserved_size;</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;cleanmarker_size &amp;&amp; jeb-&gt;used_size == c-&gt;cleanmarker_size &amp;&amp;</div><div class='hunk'>@@ -365,7 +386,8 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin</div><div class='ctx'> 		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	D1(printk(KERN_DEBUG "jffs2_do_reserve_space(): Giving 0x%x bytes at 0x%x\n", *len, *ofs));</div><div class='add'>+	D1(printk(KERN_DEBUG "jffs2_do_reserve_space(): Giving 0x%x bytes at 0x%x\n",</div><div class='add'>+		  *len, jeb-&gt;offset + (c-&gt;sector_size - jeb-&gt;free_size)));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -374,7 +396,6 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin</div><div class='ctx'>  *	@c: superblock info</div><div class='ctx'>  *	@new: new node reference to add</div><div class='ctx'>  *	@len: length of this physical node</div><div class='del'>- *	@dirty: dirty flag for new node</div><div class='ctx'>  *</div><div class='ctx'>  *	Should only be used to report nodes for which space has been allocated</div><div class='ctx'>  *	by jffs2_reserve_space.</div><div class='hunk'>@@ -382,42 +403,30 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uin</div><div class='ctx'>  *	Must be called with the alloc_sem held.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new)</div><div class='add'>+struct jffs2_raw_node_ref *jffs2_add_physical_node_ref(struct jffs2_sb_info *c,</div><div class='add'>+						       uint32_t ofs, uint32_t len,</div><div class='add'>+						       struct jffs2_inode_cache *ic)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_eraseblock *jeb;</div><div class='del'>-	uint32_t len;</div><div class='add'>+	struct jffs2_raw_node_ref *new;</div><div class='ctx'> </div><div class='del'>-	jeb = &amp;c-&gt;blocks[new-&gt;flash_offset / c-&gt;sector_size];</div><div class='del'>-	len = ref_totlen(c, jeb, new);</div><div class='add'>+	jeb = &amp;c-&gt;blocks[ofs / c-&gt;sector_size];</div><div class='ctx'> </div><div class='del'>-	D1(printk(KERN_DEBUG "jffs2_add_physical_node_ref(): Node at 0x%x(%d), size 0x%x\n", ref_offset(new), ref_flags(new), len));</div><div class='add'>+	D1(printk(KERN_DEBUG "jffs2_add_physical_node_ref(): Node at 0x%x(%d), size 0x%x\n",</div><div class='add'>+		  ofs &amp; ~3, ofs &amp; 3, len));</div><div class='ctx'> #if 1</div><div class='del'>-	/* we could get some obsolete nodes after nextblock was refiled</div><div class='del'>-	   in wbuf.c */</div><div class='del'>-	if ((c-&gt;nextblock || !ref_obsolete(new))</div><div class='del'>-	    &amp;&amp;(jeb != c-&gt;nextblock || ref_offset(new) != jeb-&gt;offset + (c-&gt;sector_size - jeb-&gt;free_size))) {</div><div class='add'>+	/* Allow non-obsolete nodes only to be added at the end of c-&gt;nextblock, </div><div class='add'>+	   if c-&gt;nextblock is set. Note that wbuf.c will file obsolete nodes</div><div class='add'>+	   even after refiling c-&gt;nextblock */</div><div class='add'>+	if ((c-&gt;nextblock || ((ofs &amp; 3) != REF_OBSOLETE))</div><div class='add'>+	    &amp;&amp; (jeb != c-&gt;nextblock || (ofs &amp; ~3) != jeb-&gt;offset + (c-&gt;sector_size - jeb-&gt;free_size))) {</div><div class='ctx'> 		printk(KERN_WARNING "argh. node added in wrong place\n");</div><div class='del'>-		jffs2_free_raw_node_ref(new);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='del'>-	if (!jeb-&gt;first_node)</div><div class='del'>-		jeb-&gt;first_node = new;</div><div class='del'>-	if (jeb-&gt;last_node)</div><div class='del'>-		jeb-&gt;last_node-&gt;next_phys = new;</div><div class='del'>-	jeb-&gt;last_node = new;</div><div class='del'>-</div><div class='del'>-	jeb-&gt;free_size -= len;</div><div class='del'>-	c-&gt;free_size -= len;</div><div class='del'>-	if (ref_obsolete(new)) {</div><div class='del'>-		jeb-&gt;dirty_size += len;</div><div class='del'>-		c-&gt;dirty_size += len;</div><div class='del'>-	} else {</div><div class='del'>-		jeb-&gt;used_size += len;</div><div class='del'>-		c-&gt;used_size += len;</div><div class='del'>-	}</div><div class='add'>+	new = jffs2_link_node_ref(c, jeb, ofs, len, ic);</div><div class='ctx'> </div><div class='ctx'> 	if (!jeb-&gt;free_size &amp;&amp; !jeb-&gt;dirty_size &amp;&amp; !ISDIRTY(jeb-&gt;wasted_size)) {</div><div class='ctx'> 		/* If it lives on the dirty_list, jffs2_reserve_space will put it there */</div><div class='hunk'>@@ -438,7 +447,7 @@ int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_r</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -470,8 +479,9 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 	struct jffs2_unknown_node n;</div><div class='ctx'> 	int ret, addedsize;</div><div class='ctx'> 	size_t retlen;</div><div class='add'>+	uint32_t freed_len;</div><div class='ctx'> </div><div class='del'>-	if(!ref) {</div><div class='add'>+	if(unlikely(!ref)) {</div><div class='ctx'> 		printk(KERN_NOTICE "EEEEEK. jffs2_mark_node_obsolete called with NULL node\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -499,32 +509,34 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='add'>+	freed_len = ref_totlen(c, jeb, ref);</div><div class='add'>+</div><div class='ctx'> 	if (ref_flags(ref) == REF_UNCHECKED) {</div><div class='del'>-		D1(if (unlikely(jeb-&gt;unchecked_size &lt; ref_totlen(c, jeb, ref))) {</div><div class='add'>+		D1(if (unlikely(jeb-&gt;unchecked_size &lt; freed_len)) {</div><div class='ctx'> 			printk(KERN_NOTICE "raw unchecked node of size 0x%08x freed from erase block %d at 0x%08x, but unchecked_size was already 0x%08x\n",</div><div class='del'>-			       ref_totlen(c, jeb, ref), blocknr, ref-&gt;flash_offset, jeb-&gt;used_size);</div><div class='add'>+			       freed_len, blocknr, ref-&gt;flash_offset, jeb-&gt;used_size);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		})</div><div class='del'>-		D1(printk(KERN_DEBUG "Obsoleting previously unchecked node at 0x%08x of len %x: ", ref_offset(ref), ref_totlen(c, jeb, ref)));</div><div class='del'>-		jeb-&gt;unchecked_size -= ref_totlen(c, jeb, ref);</div><div class='del'>-		c-&gt;unchecked_size -= ref_totlen(c, jeb, ref);</div><div class='add'>+		D1(printk(KERN_DEBUG "Obsoleting previously unchecked node at 0x%08x of len %x: ", ref_offset(ref), freed_len));</div><div class='add'>+		jeb-&gt;unchecked_size -= freed_len;</div><div class='add'>+		c-&gt;unchecked_size -= freed_len;</div><div class='ctx'> 	} else {</div><div class='del'>-		D1(if (unlikely(jeb-&gt;used_size &lt; ref_totlen(c, jeb, ref))) {</div><div class='add'>+		D1(if (unlikely(jeb-&gt;used_size &lt; freed_len)) {</div><div class='ctx'> 			printk(KERN_NOTICE "raw node of size 0x%08x freed from erase block %d at 0x%08x, but used_size was already 0x%08x\n",</div><div class='del'>-			       ref_totlen(c, jeb, ref), blocknr, ref-&gt;flash_offset, jeb-&gt;used_size);</div><div class='add'>+			       freed_len, blocknr, ref-&gt;flash_offset, jeb-&gt;used_size);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		})</div><div class='del'>-		D1(printk(KERN_DEBUG "Obsoleting node at 0x%08x of len %#x: ", ref_offset(ref), ref_totlen(c, jeb, ref)));</div><div class='del'>-		jeb-&gt;used_size -= ref_totlen(c, jeb, ref);</div><div class='del'>-		c-&gt;used_size -= ref_totlen(c, jeb, ref);</div><div class='add'>+		D1(printk(KERN_DEBUG "Obsoleting node at 0x%08x of len %#x: ", ref_offset(ref), freed_len));</div><div class='add'>+		jeb-&gt;used_size -= freed_len;</div><div class='add'>+		c-&gt;used_size -= freed_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// Take care, that wasted size is taken into concern</div><div class='del'>-	if ((jeb-&gt;dirty_size || ISDIRTY(jeb-&gt;wasted_size + ref_totlen(c, jeb, ref))) &amp;&amp; jeb != c-&gt;nextblock) {</div><div class='del'>-		D1(printk(KERN_DEBUG "Dirtying\n"));</div><div class='del'>-		addedsize = ref_totlen(c, jeb, ref);</div><div class='del'>-		jeb-&gt;dirty_size += ref_totlen(c, jeb, ref);</div><div class='del'>-		c-&gt;dirty_size += ref_totlen(c, jeb, ref);</div><div class='add'>+	if ((jeb-&gt;dirty_size || ISDIRTY(jeb-&gt;wasted_size + freed_len)) &amp;&amp; jeb != c-&gt;nextblock) {</div><div class='add'>+		D1(printk("Dirtying\n"));</div><div class='add'>+		addedsize = freed_len;</div><div class='add'>+		jeb-&gt;dirty_size += freed_len;</div><div class='add'>+		c-&gt;dirty_size += freed_len;</div><div class='ctx'> </div><div class='ctx'> 		/* Convert wasted space to dirty, if not a bad block */</div><div class='ctx'> 		if (jeb-&gt;wasted_size) {</div><div class='hunk'>@@ -543,10 +555,10 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		D1(printk(KERN_DEBUG "Wasting\n"));</div><div class='add'>+		D1(printk("Wasting\n"));</div><div class='ctx'> 		addedsize = 0;</div><div class='del'>-		jeb-&gt;wasted_size += ref_totlen(c, jeb, ref);</div><div class='del'>-		c-&gt;wasted_size += ref_totlen(c, jeb, ref);</div><div class='add'>+		jeb-&gt;wasted_size += freed_len;</div><div class='add'>+		c-&gt;wasted_size += freed_len;</div><div class='ctx'> 	}</div><div class='ctx'> 	ref-&gt;flash_offset = ref_offset(ref) | REF_OBSOLETE;</div><div class='ctx'> </div><div class='hunk'>@@ -622,7 +634,7 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 	/* The erase_free_sem is locked, and has been since before we marked the node obsolete</div><div class='ctx'> 	   and potentially put its eraseblock onto the erase_pending_list. Thus, we know that</div><div class='ctx'> 	   the block hasn't _already_ been erased, and that 'ref' itself hasn't been freed yet</div><div class='del'>-	   by jffs2_free_all_node_refs() in erase.c. Which is nice. */</div><div class='add'>+	   by jffs2_free_jeb_node_refs() in erase.c. Which is nice. */</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "obliterating obsoleted node at 0x%08x\n", ref_offset(ref)));</div><div class='ctx'> 	ret = jffs2_flash_read(c, ref_offset(ref), sizeof(n), &amp;retlen, (char *)&amp;n);</div><div class='hunk'>@@ -634,8 +646,8 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 		printk(KERN_WARNING "Short read from obsoleted node at 0x%08x: %zd\n", ref_offset(ref), retlen);</div><div class='ctx'> 		goto out_erase_sem;</div><div class='ctx'> 	}</div><div class='del'>-	if (PAD(je32_to_cpu(n.totlen)) != PAD(ref_totlen(c, jeb, ref))) {</div><div class='del'>-		printk(KERN_WARNING "Node totlen on flash (0x%08x) != totlen from node ref (0x%08x)\n", je32_to_cpu(n.totlen), ref_totlen(c, jeb, ref));</div><div class='add'>+	if (PAD(je32_to_cpu(n.totlen)) != PAD(freed_len)) {</div><div class='add'>+		printk(KERN_WARNING "Node totlen on flash (0x%08x) != totlen from node ref (0x%08x)\n", je32_to_cpu(n.totlen), freed_len);</div><div class='ctx'> 		goto out_erase_sem;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(je16_to_cpu(n.nodetype) &amp; JFFS2_NODE_ACCURATE)) {</div><div class='hunk'>@@ -677,57 +689,23 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 		*p = ref-&gt;next_in_ino;</div><div class='ctx'> 		ref-&gt;next_in_ino = NULL;</div><div class='ctx'> </div><div class='del'>-		if (ic-&gt;nodes == (void *)ic &amp;&amp; ic-&gt;nlink == 0)</div><div class='del'>-			jffs2_del_ino_cache(c, ic);</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Merge with the next node in the physical list, if there is one</div><div class='del'>-	   and if it's also obsolete and if it doesn't belong to any inode */</div><div class='del'>-	if (ref-&gt;next_phys &amp;&amp; ref_obsolete(ref-&gt;next_phys) &amp;&amp;</div><div class='del'>-	    !ref-&gt;next_phys-&gt;next_in_ino) {</div><div class='del'>-		struct jffs2_raw_node_ref *n = ref-&gt;next_phys;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='del'>-		ref-&gt;__totlen += n-&gt;__totlen;</div><div class='del'>-		ref-&gt;next_phys = n-&gt;next_phys;</div><div class='del'>-                if (jeb-&gt;last_node == n) jeb-&gt;last_node = ref;</div><div class='del'>-		if (jeb-&gt;gc_node == n) {</div><div class='del'>-			/* gc will be happy continuing gc on this node */</div><div class='del'>-			jeb-&gt;gc_node=ref;</div><div class='add'>+		switch (ic-&gt;class) {</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+			case RAWNODE_CLASS_XATTR_DATUM:</div><div class='add'>+				jffs2_release_xattr_datum(c, (struct jffs2_xattr_datum *)ic);</div><div class='add'>+				break;</div><div class='add'>+			case RAWNODE_CLASS_XATTR_REF:</div><div class='add'>+				jffs2_release_xattr_ref(c, (struct jffs2_xattr_ref *)ic);</div><div class='add'>+				break;</div><div class='add'>+#endif</div><div class='add'>+			default:</div><div class='add'>+				if (ic-&gt;nodes == (void *)ic &amp;&amp; ic-&gt;nlink == 0)</div><div class='add'>+					jffs2_del_ino_cache(c, ic);</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='del'>-		jffs2_free_raw_node_ref(n);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Also merge with the previous node in the list, if there is one</div><div class='del'>-	   and that one is obsolete */</div><div class='del'>-	if (ref != jeb-&gt;first_node ) {</div><div class='del'>-		struct jffs2_raw_node_ref *p = jeb-&gt;first_node;</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='del'>-		while (p-&gt;next_phys != ref)</div><div class='del'>-			p = p-&gt;next_phys;</div><div class='del'>-</div><div class='del'>-		if (ref_obsolete(p) &amp;&amp; !ref-&gt;next_in_ino) {</div><div class='del'>-			p-&gt;__totlen += ref-&gt;__totlen;</div><div class='del'>-			if (jeb-&gt;last_node == ref) {</div><div class='del'>-				jeb-&gt;last_node = p;</div><div class='del'>-			}</div><div class='del'>-			if (jeb-&gt;gc_node == ref) {</div><div class='del'>-				/* gc will be happy continuing gc on this node */</div><div class='del'>-				jeb-&gt;gc_node=p;</div><div class='del'>-			}</div><div class='del'>-			p-&gt;next_phys = ref-&gt;next_phys;</div><div class='del'>-			jffs2_free_raw_node_ref(ref);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	}</div><div class='ctx'>  out_erase_sem:</div><div class='ctx'> 	up(&amp;c-&gt;erase_free_sem);</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h<br/>index d307cf548625..9f41fc01a371 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/os-linux.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/os-linux.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/os-linux.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/os-linux.h</a></div><div class='hunk'>@@ -31,9 +31,7 @@ struct kvec;</div><div class='ctx'> #define JFFS2_F_I_MODE(f) (OFNI_EDONI_2SFFJ(f)-&gt;i_mode)</div><div class='ctx'> #define JFFS2_F_I_UID(f) (OFNI_EDONI_2SFFJ(f)-&gt;i_uid)</div><div class='ctx'> #define JFFS2_F_I_GID(f) (OFNI_EDONI_2SFFJ(f)-&gt;i_gid)</div><div class='del'>-</div><div class='del'>-#define JFFS2_F_I_RDEV_MIN(f) (iminor(OFNI_EDONI_2SFFJ(f)))</div><div class='del'>-#define JFFS2_F_I_RDEV_MAJ(f) (imajor(OFNI_EDONI_2SFFJ(f)))</div><div class='add'>+#define JFFS2_F_I_RDEV(f) (OFNI_EDONI_2SFFJ(f)-&gt;i_rdev)</div><div class='ctx'> </div><div class='ctx'> #define ITIME(sec) ((struct timespec){sec, 0})</div><div class='ctx'> #define I_SEC(tv) ((tv).tv_sec)</div><div class='hunk'>@@ -60,6 +58,10 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)</div><div class='ctx'> 	f-&gt;target = NULL;</div><div class='ctx'> 	f-&gt;flags = 0;</div><div class='ctx'> 	f-&gt;usercompr = 0;</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_POSIX_ACL</div><div class='add'>+	f-&gt;i_acl_access = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+	f-&gt;i_acl_default = JFFS2_ACL_NOT_CACHED;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -90,13 +92,10 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)</div><div class='ctx'> #define jffs2_flash_writev(a,b,c,d,e,f) jffs2_flash_direct_writev(a,b,c,d,e)</div><div class='ctx'> #define jffs2_wbuf_timeout NULL</div><div class='ctx'> #define jffs2_wbuf_process NULL</div><div class='del'>-#define jffs2_nor_ecc(c) (0)</div><div class='ctx'> #define jffs2_dataflash(c) (0)</div><div class='del'>-#define jffs2_nor_wbuf_flash(c) (0)</div><div class='del'>-#define jffs2_nor_ecc_flash_setup(c) (0)</div><div class='del'>-#define jffs2_nor_ecc_flash_cleanup(c) do {} while (0)</div><div class='ctx'> #define jffs2_dataflash_setup(c) (0)</div><div class='ctx'> #define jffs2_dataflash_cleanup(c) do {} while (0)</div><div class='add'>+#define jffs2_nor_wbuf_flash(c) (0)</div><div class='ctx'> #define jffs2_nor_wbuf_flash_setup(c) (0)</div><div class='ctx'> #define jffs2_nor_wbuf_flash_cleanup(c) do {} while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -107,9 +106,7 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)</div><div class='ctx'> #ifdef CONFIG_JFFS2_SUMMARY</div><div class='ctx'> #define jffs2_can_mark_obsolete(c) (0)</div><div class='ctx'> #else</div><div class='del'>-#define jffs2_can_mark_obsolete(c) \</div><div class='del'>-  ((c-&gt;mtd-&gt;type == MTD_NORFLASH &amp;&amp; !(c-&gt;mtd-&gt;flags &amp; (MTD_ECC|MTD_PROGRAM_REGIONS))) || \</div><div class='del'>-   c-&gt;mtd-&gt;type == MTD_RAM)</div><div class='add'>+#define jffs2_can_mark_obsolete(c) (c-&gt;mtd-&gt;flags &amp; (MTD_BIT_WRITEABLE))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define jffs2_cleanmarker_oob(c) (c-&gt;mtd-&gt;type == MTD_NANDFLASH)</div><div class='hunk'>@@ -133,15 +130,11 @@ int jffs2_flush_wbuf_pad(struct jffs2_sb_info *c);</div><div class='ctx'> int jffs2_nand_flash_setup(struct jffs2_sb_info *c);</div><div class='ctx'> void jffs2_nand_flash_cleanup(struct jffs2_sb_info *c);</div><div class='ctx'> </div><div class='del'>-#define jffs2_nor_ecc(c) (c-&gt;mtd-&gt;type == MTD_NORFLASH &amp;&amp; (c-&gt;mtd-&gt;flags &amp; MTD_ECC))</div><div class='del'>-int jffs2_nor_ecc_flash_setup(struct jffs2_sb_info *c);</div><div class='del'>-void jffs2_nor_ecc_flash_cleanup(struct jffs2_sb_info *c);</div><div class='del'>-</div><div class='ctx'> #define jffs2_dataflash(c) (c-&gt;mtd-&gt;type == MTD_DATAFLASH)</div><div class='ctx'> int jffs2_dataflash_setup(struct jffs2_sb_info *c);</div><div class='ctx'> void jffs2_dataflash_cleanup(struct jffs2_sb_info *c);</div><div class='ctx'> </div><div class='del'>-#define jffs2_nor_wbuf_flash(c) (c-&gt;mtd-&gt;type == MTD_NORFLASH &amp;&amp; (c-&gt;mtd-&gt;flags &amp; MTD_PROGRAM_REGIONS))</div><div class='add'>+#define jffs2_nor_wbuf_flash(c) (c-&gt;mtd-&gt;type == MTD_NORFLASH &amp;&amp; ! (c-&gt;mtd-&gt;flags &amp; MTD_BIT_WRITEABLE))</div><div class='ctx'> int jffs2_nor_wbuf_flash_setup(struct jffs2_sb_info *c);</div><div class='ctx'> void jffs2_nor_wbuf_flash_cleanup(struct jffs2_sb_info *c);</div><div class='ctx'> </div><div class='hunk'>@@ -165,7 +158,7 @@ extern struct inode_operations jffs2_dir_inode_operations;</div><div class='ctx'> /* file.c */</div><div class='ctx'> extern const struct file_operations jffs2_file_operations;</div><div class='ctx'> extern struct inode_operations jffs2_file_inode_operations;</div><div class='del'>-extern struct address_space_operations jffs2_file_address_operations;</div><div class='add'>+extern const struct address_space_operations jffs2_file_address_operations;</div><div class='ctx'> int jffs2_fsync(struct file *, struct dentry *, int);</div><div class='ctx'> int jffs2_do_readpage_unlock (struct inode *inode, struct page *pg);</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +175,7 @@ void jffs2_clear_inode (struct inode *);</div><div class='ctx'> void jffs2_dirty_inode(struct inode *inode);</div><div class='ctx'> struct inode *jffs2_new_inode (struct inode *dir_i, int mode,</div><div class='ctx'> 			       struct jffs2_raw_inode *ri);</div><div class='del'>-int jffs2_statfs (struct super_block *, struct kstatfs *);</div><div class='add'>+int jffs2_statfs (struct dentry *, struct kstatfs *);</div><div class='ctx'> void jffs2_write_super (struct super_block *);</div><div class='ctx'> int jffs2_remount_fs (struct super_block *, int *, char *);</div><div class='ctx'> int jffs2_do_fill_super(struct super_block *sb, void *data, int silent);</div><div class='head'>diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c<br/>index f1695642d0f7..266423b2709d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/readinode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/readinode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/readinode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/readinode.c</a></div><div class='hunk'>@@ -66,7 +66,7 @@ static void jffs2_free_tmp_dnode_info_list(struct rb_root *list)</div><div class='ctx'> 			jffs2_free_full_dnode(tn-&gt;fn);</div><div class='ctx'> 			jffs2_free_tmp_dnode_info(tn);</div><div class='ctx'> </div><div class='del'>-			this = this-&gt;rb_parent;</div><div class='add'>+			this = rb_parent(this);</div><div class='ctx'> 			if (!this)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -116,19 +116,42 @@ static inline int read_direntry(struct jffs2_sb_info *c, struct jffs2_raw_node_r</div><div class='ctx'> 				uint32_t *latest_mctime, uint32_t *mctime_ver)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='add'>+	uint32_t crc;</div><div class='ctx'> </div><div class='del'>-	/* The direntry nodes are checked during the flash scanning */</div><div class='del'>-	BUG_ON(ref_flags(ref) == REF_UNCHECKED);</div><div class='ctx'> 	/* Obsoleted. This cannot happen, surely? dwmw2 20020308 */</div><div class='ctx'> 	BUG_ON(ref_obsolete(ref));</div><div class='ctx'> </div><div class='del'>-	/* Sanity check */</div><div class='del'>-	if (unlikely(PAD((rd-&gt;nsize + sizeof(*rd))) != PAD(je32_to_cpu(rd-&gt;totlen)))) {</div><div class='del'>-		JFFS2_ERROR("illegal nsize in node at %#08x: nsize %#02x, totlen %#04x\n",</div><div class='del'>-		       ref_offset(ref), rd-&gt;nsize, je32_to_cpu(rd-&gt;totlen));</div><div class='add'>+	crc = crc32(0, rd, sizeof(*rd) - 8);</div><div class='add'>+	if (unlikely(crc != je32_to_cpu(rd-&gt;node_crc))) {</div><div class='add'>+		JFFS2_NOTICE("header CRC failed on dirent node at %#08x: read %#08x, calculated %#08x\n",</div><div class='add'>+			     ref_offset(ref), je32_to_cpu(rd-&gt;node_crc), crc);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If we've never checked the CRCs on this node, check them now */</div><div class='add'>+	if (ref_flags(ref) == REF_UNCHECKED) {</div><div class='add'>+		struct jffs2_eraseblock *jeb;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		/* Sanity check */</div><div class='add'>+		if (unlikely(PAD((rd-&gt;nsize + sizeof(*rd))) != PAD(je32_to_cpu(rd-&gt;totlen)))) {</div><div class='add'>+			JFFS2_ERROR("illegal nsize in node at %#08x: nsize %#02x, totlen %#04x\n",</div><div class='add'>+				    ref_offset(ref), rd-&gt;nsize, je32_to_cpu(rd-&gt;totlen));</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jeb = &amp;c-&gt;blocks[ref-&gt;flash_offset / c-&gt;sector_size];</div><div class='add'>+		len = ref_totlen(c, jeb, ref);</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+		jeb-&gt;used_size += len;</div><div class='add'>+		jeb-&gt;unchecked_size -= len;</div><div class='add'>+		c-&gt;used_size += len;</div><div class='add'>+		c-&gt;unchecked_size -= len;</div><div class='add'>+		ref-&gt;flash_offset = ref_offset(ref) | REF_PRISTINE;</div><div class='add'>+		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	fd = jffs2_alloc_full_dirent(rd-&gt;nsize + 1);</div><div class='ctx'> 	if (unlikely(!fd))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -198,13 +221,21 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> 	struct jffs2_tmp_dnode_info *tn;</div><div class='ctx'> 	uint32_t len, csize;</div><div class='ctx'> 	int ret = 1;</div><div class='add'>+	uint32_t crc;</div><div class='ctx'> </div><div class='ctx'> 	/* Obsoleted. This cannot happen, surely? dwmw2 20020308 */</div><div class='ctx'> 	BUG_ON(ref_obsolete(ref));</div><div class='ctx'> </div><div class='add'>+	crc = crc32(0, rd, sizeof(*rd) - 8);</div><div class='add'>+	if (unlikely(crc != je32_to_cpu(rd-&gt;node_crc))) {</div><div class='add'>+		JFFS2_NOTICE("node CRC failed on dnode at %#08x: read %#08x, calculated %#08x\n",</div><div class='add'>+			     ref_offset(ref), je32_to_cpu(rd-&gt;node_crc), crc);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	tn = jffs2_alloc_tmp_dnode_info();</div><div class='ctx'> 	if (!tn) {</div><div class='del'>-		JFFS2_ERROR("failed to allocate tn (%d bytes).\n", sizeof(*tn));</div><div class='add'>+		JFFS2_ERROR("failed to allocate tn (%zu bytes).\n", sizeof(*tn));</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -213,14 +244,6 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref</div><div class='ctx'> </div><div class='ctx'> 	/* If we've never checked the CRCs on this node, check them now */</div><div class='ctx'> 	if (ref_flags(ref) == REF_UNCHECKED) {</div><div class='del'>-		uint32_t crc;</div><div class='del'>-</div><div class='del'>-		crc = crc32(0, rd, sizeof(*rd) - 8);</div><div class='del'>-		if (unlikely(crc != je32_to_cpu(rd-&gt;node_crc))) {</div><div class='del'>-			JFFS2_NOTICE("header CRC failed on node at %#08x: read %#08x, calculated %#08x\n",</div><div class='del'>-					ref_offset(ref), je32_to_cpu(rd-&gt;node_crc), crc);</div><div class='del'>-			goto free_out;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		/* Sanity checks */</div><div class='ctx'> 		if (unlikely(je32_to_cpu(rd-&gt;offset) &gt; je32_to_cpu(rd-&gt;isize)) ||</div><div class='hunk'>@@ -343,7 +366,7 @@ free_out:</div><div class='ctx'>  * Helper function for jffs2_get_inode_nodes().</div><div class='ctx'>  * It is called every time an unknown node is found.</div><div class='ctx'>  *</div><div class='del'>- * Returns: 0 on succes;</div><div class='add'>+ * Returns: 0 on success;</div><div class='ctx'>  * 	    1 if the node should be marked obsolete;</div><div class='ctx'>  * 	    negative error code on failure.</div><div class='ctx'>  */</div><div class='hunk'>@@ -354,37 +377,30 @@ static inline int read_unknown(struct jffs2_sb_info *c, struct jffs2_raw_node_re</div><div class='ctx'> </div><div class='ctx'> 	un-&gt;nodetype = cpu_to_je16(JFFS2_NODE_ACCURATE | je16_to_cpu(un-&gt;nodetype));</div><div class='ctx'> </div><div class='del'>-	if (crc32(0, un, sizeof(struct jffs2_unknown_node) - 4) != je32_to_cpu(un-&gt;hdr_crc)) {</div><div class='del'>-		/* Hmmm. This should have been caught at scan time. */</div><div class='del'>-		JFFS2_NOTICE("node header CRC failed at %#08x. But it must have been OK earlier.\n", ref_offset(ref));</div><div class='del'>-		jffs2_dbg_dump_node(c, ref_offset(ref));</div><div class='del'>-		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		switch(je16_to_cpu(un-&gt;nodetype) &amp; JFFS2_COMPAT_MASK) {</div><div class='add'>+	switch(je16_to_cpu(un-&gt;nodetype) &amp; JFFS2_COMPAT_MASK) {</div><div class='ctx'> </div><div class='del'>-		case JFFS2_FEATURE_INCOMPAT:</div><div class='del'>-			JFFS2_ERROR("unknown INCOMPAT nodetype %#04X at %#08x\n",</div><div class='del'>-				je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='del'>-			/* EEP */</div><div class='del'>-			BUG();</div><div class='del'>-			break;</div><div class='add'>+	case JFFS2_FEATURE_INCOMPAT:</div><div class='add'>+		JFFS2_ERROR("unknown INCOMPAT nodetype %#04X at %#08x\n",</div><div class='add'>+			    je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='add'>+		/* EEP */</div><div class='add'>+		BUG();</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case JFFS2_FEATURE_ROCOMPAT:</div><div class='del'>-			JFFS2_ERROR("unknown ROCOMPAT nodetype %#04X at %#08x\n",</div><div class='del'>-					je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='del'>-			BUG_ON(!(c-&gt;flags &amp; JFFS2_SB_FLAG_RO));</div><div class='del'>-			break;</div><div class='add'>+	case JFFS2_FEATURE_ROCOMPAT:</div><div class='add'>+		JFFS2_ERROR("unknown ROCOMPAT nodetype %#04X at %#08x\n",</div><div class='add'>+			    je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='add'>+		BUG_ON(!(c-&gt;flags &amp; JFFS2_SB_FLAG_RO));</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case JFFS2_FEATURE_RWCOMPAT_COPY:</div><div class='del'>-			JFFS2_NOTICE("unknown RWCOMPAT_COPY nodetype %#04X at %#08x\n",</div><div class='del'>-					je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='del'>-			break;</div><div class='add'>+	case JFFS2_FEATURE_RWCOMPAT_COPY:</div><div class='add'>+		JFFS2_NOTICE("unknown RWCOMPAT_COPY nodetype %#04X at %#08x\n",</div><div class='add'>+			     je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-		case JFFS2_FEATURE_RWCOMPAT_DELETE:</div><div class='del'>-			JFFS2_NOTICE("unknown RWCOMPAT_DELETE nodetype %#04X at %#08x\n",</div><div class='del'>-					je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='add'>+	case JFFS2_FEATURE_RWCOMPAT_DELETE:</div><div class='add'>+		JFFS2_NOTICE("unknown RWCOMPAT_DELETE nodetype %#04X at %#08x\n",</div><div class='add'>+			     je16_to_cpu(un-&gt;nodetype), ref_offset(ref));</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -434,7 +450,7 @@ static int read_more(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (retlen &lt; len) {</div><div class='del'>-		JFFS2_ERROR("short read at %#08x: %d instead of %d.\n",</div><div class='add'>+		JFFS2_ERROR("short read at %#08x: %zu instead of %d.\n",</div><div class='ctx'> 				offs, retlen, len);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -542,13 +558,25 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (retlen &lt; len) {</div><div class='del'>-			JFFS2_ERROR("short read at %#08x: %d instead of %d.\n", ref_offset(ref), retlen, len);</div><div class='add'>+			JFFS2_ERROR("short read at %#08x: %zu instead of %d.\n", ref_offset(ref), retlen, len);</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			goto free_out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		node = (union jffs2_node_union *)bufstart;</div><div class='ctx'> </div><div class='add'>+		/* No need to mask in the valid bit; it shouldn't be invalid */</div><div class='add'>+		if (je32_to_cpu(node-&gt;u.hdr_crc) != crc32(0, node, sizeof(node-&gt;u)-4)) {</div><div class='add'>+			JFFS2_NOTICE("Node header CRC failed at %#08x. {%04x,%04x,%08x,%08x}\n",</div><div class='add'>+				     ref_offset(ref), je16_to_cpu(node-&gt;u.magic),</div><div class='add'>+				     je16_to_cpu(node-&gt;u.nodetype),</div><div class='add'>+				     je32_to_cpu(node-&gt;u.totlen),</div><div class='add'>+				     je32_to_cpu(node-&gt;u.hdr_crc));</div><div class='add'>+			jffs2_dbg_dump_node(c, ref_offset(ref));</div><div class='add'>+			jffs2_mark_node_obsolete(c, ref);</div><div class='add'>+			goto cont;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		switch (je16_to_cpu(node-&gt;u.nodetype)) {</div><div class='ctx'> </div><div class='ctx'> 		case JFFS2_NODETYPE_DIRENT:</div><div class='hunk'>@@ -606,6 +634,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf</div><div class='ctx'> 				goto free_out;</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='add'>+	cont:</div><div class='ctx'> 		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -679,12 +708,12 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,</div><div class='ctx'> 			jffs2_mark_node_obsolete(c, fn-&gt;raw);</div><div class='ctx'> </div><div class='ctx'> 		BUG_ON(rb-&gt;rb_left);</div><div class='del'>-		if (rb-&gt;rb_parent &amp;&amp; rb-&gt;rb_parent-&gt;rb_left == rb) {</div><div class='add'>+		if (rb_parent(rb) &amp;&amp; rb_parent(rb)-&gt;rb_left == rb) {</div><div class='ctx'> 			/* We were then left-hand child of our parent. We need</div><div class='ctx'> 			 * to move our own right-hand child into our place. */</div><div class='ctx'> 			repl_rb = rb-&gt;rb_right;</div><div class='ctx'> 			if (repl_rb)</div><div class='del'>-				repl_rb-&gt;rb_parent = rb-&gt;rb_parent;</div><div class='add'>+				rb_set_parent(repl_rb, rb_parent(rb));</div><div class='ctx'> 		} else</div><div class='ctx'> 			repl_rb = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -692,14 +721,14 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,</div><div class='ctx'> </div><div class='ctx'> 		/* Remove the spent tn from the tree; don't bother rebalancing</div><div class='ctx'> 		 * but put our right-hand child in our own place. */</div><div class='del'>-		if (tn-&gt;rb.rb_parent) {</div><div class='del'>-			if (tn-&gt;rb.rb_parent-&gt;rb_left == &amp;tn-&gt;rb)</div><div class='del'>-				tn-&gt;rb.rb_parent-&gt;rb_left = repl_rb;</div><div class='del'>-			else if (tn-&gt;rb.rb_parent-&gt;rb_right == &amp;tn-&gt;rb)</div><div class='del'>-				tn-&gt;rb.rb_parent-&gt;rb_right = repl_rb;</div><div class='add'>+		if (rb_parent(&amp;tn-&gt;rb)) {</div><div class='add'>+			if (rb_parent(&amp;tn-&gt;rb)-&gt;rb_left == &amp;tn-&gt;rb)</div><div class='add'>+				rb_parent(&amp;tn-&gt;rb)-&gt;rb_left = repl_rb;</div><div class='add'>+			else if (rb_parent(&amp;tn-&gt;rb)-&gt;rb_right == &amp;tn-&gt;rb)</div><div class='add'>+				rb_parent(&amp;tn-&gt;rb)-&gt;rb_right = repl_rb;</div><div class='ctx'> 			else BUG();</div><div class='ctx'> 		} else if (tn-&gt;rb.rb_right)</div><div class='del'>-			tn-&gt;rb.rb_right-&gt;rb_parent = NULL;</div><div class='add'>+			rb_set_parent(tn-&gt;rb.rb_right, NULL);</div><div class='ctx'> </div><div class='ctx'> 		jffs2_free_tmp_dnode_info(tn);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -939,6 +968,8 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f)</div><div class='ctx'> 	struct jffs2_full_dirent *fd, *fds;</div><div class='ctx'> 	int deleted;</div><div class='ctx'> </div><div class='add'>+	jffs2_clear_acl(f);</div><div class='add'>+	jffs2_xattr_delete_inode(c, f-&gt;inocache);</div><div class='ctx'> 	down(&amp;f-&gt;sem);</div><div class='ctx'> 	deleted = f-&gt;inocache &amp;&amp; !f-&gt;inocache-&gt;nlink;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c<br/>index cf55b221fc2b..e2413466ddd5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/scan.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/scan.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/scan.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/scan.c</a></div><div class='hunk'>@@ -65,6 +65,28 @@ static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size) {</div><div class='ctx'> 		return DEFAULT_EMPTY_SCAN_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int file_dirty(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((ret = jffs2_prealloc_raw_node_refs(c, jeb, 1)))</div><div class='add'>+		return ret;</div><div class='add'>+	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb-&gt;free_size)))</div><div class='add'>+		return ret;</div><div class='add'>+	/* Turned wasted size into dirty, since we apparently </div><div class='add'>+	   think it's recoverable now. */</div><div class='add'>+	jeb-&gt;dirty_size += jeb-&gt;wasted_size;</div><div class='add'>+	c-&gt;dirty_size += jeb-&gt;wasted_size;</div><div class='add'>+	c-&gt;wasted_size -= jeb-&gt;wasted_size;</div><div class='add'>+	jeb-&gt;wasted_size = 0;</div><div class='add'>+	if (VERYDIRTY(c, jeb-&gt;dirty_size)) {</div><div class='add'>+		list_add(&amp;jeb-&gt;list, &amp;c-&gt;very_dirty_list);</div><div class='add'>+	} else {</div><div class='add'>+		list_add(&amp;jeb-&gt;list, &amp;c-&gt;dirty_list);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int jffs2_scan_medium(struct jffs2_sb_info *c)</div><div class='ctx'> {</div><div class='ctx'> 	int i, ret;</div><div class='hunk'>@@ -170,34 +192,20 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)</div><div class='ctx'> 					(!c-&gt;nextblock || c-&gt;nextblock-&gt;free_size &lt; jeb-&gt;free_size)) {</div><div class='ctx'> 				/* Better candidate for the next writes to go to */</div><div class='ctx'> 				if (c-&gt;nextblock) {</div><div class='del'>-					c-&gt;nextblock-&gt;dirty_size += c-&gt;nextblock-&gt;free_size + c-&gt;nextblock-&gt;wasted_size;</div><div class='del'>-					c-&gt;dirty_size += c-&gt;nextblock-&gt;free_size + c-&gt;nextblock-&gt;wasted_size;</div><div class='del'>-					c-&gt;free_size -= c-&gt;nextblock-&gt;free_size;</div><div class='del'>-					c-&gt;wasted_size -= c-&gt;nextblock-&gt;wasted_size;</div><div class='del'>-					c-&gt;nextblock-&gt;free_size = c-&gt;nextblock-&gt;wasted_size = 0;</div><div class='del'>-					if (VERYDIRTY(c, c-&gt;nextblock-&gt;dirty_size)) {</div><div class='del'>-						list_add(&amp;c-&gt;nextblock-&gt;list, &amp;c-&gt;very_dirty_list);</div><div class='del'>-					} else {</div><div class='del'>-						list_add(&amp;c-&gt;nextblock-&gt;list, &amp;c-&gt;dirty_list);</div><div class='del'>-					}</div><div class='add'>+					ret = file_dirty(c, c-&gt;nextblock);</div><div class='add'>+					if (ret)</div><div class='add'>+						return ret;</div><div class='ctx'> 					/* deleting summary information of the old nextblock */</div><div class='ctx'> 					jffs2_sum_reset_collected(c-&gt;summary);</div><div class='ctx'> 				}</div><div class='del'>-				/* update collected summary infromation for the current nextblock */</div><div class='add'>+				/* update collected summary information for the current nextblock */</div><div class='ctx'> 				jffs2_sum_move_collected(c, s);</div><div class='ctx'> 				D1(printk(KERN_DEBUG "jffs2_scan_medium(): new nextblock = 0x%08x\n", jeb-&gt;offset));</div><div class='ctx'> 				c-&gt;nextblock = jeb;</div><div class='ctx'> 			} else {</div><div class='del'>-				jeb-&gt;dirty_size += jeb-&gt;free_size + jeb-&gt;wasted_size;</div><div class='del'>-				c-&gt;dirty_size += jeb-&gt;free_size + jeb-&gt;wasted_size;</div><div class='del'>-				c-&gt;free_size -= jeb-&gt;free_size;</div><div class='del'>-				c-&gt;wasted_size -= jeb-&gt;wasted_size;</div><div class='del'>-				jeb-&gt;free_size = jeb-&gt;wasted_size = 0;</div><div class='del'>-				if (VERYDIRTY(c, jeb-&gt;dirty_size)) {</div><div class='del'>-					list_add(&amp;jeb-&gt;list, &amp;c-&gt;very_dirty_list);</div><div class='del'>-				} else {</div><div class='del'>-					list_add(&amp;jeb-&gt;list, &amp;c-&gt;dirty_list);</div><div class='del'>-				}</div><div class='add'>+				ret = file_dirty(c, jeb);</div><div class='add'>+				if (ret)</div><div class='add'>+					return ret;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -222,9 +230,6 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (jffs2_sum_active() &amp;&amp; s)</div><div class='del'>-		kfree(s);</div><div class='del'>-</div><div class='ctx'> 	/* Nextblock dirty is always seen as wasted, because we cannot recycle it now */</div><div class='ctx'> 	if (c-&gt;nextblock &amp;&amp; (c-&gt;nextblock-&gt;dirty_size)) {</div><div class='ctx'> 		c-&gt;nextblock-&gt;wasted_size += c-&gt;nextblock-&gt;dirty_size;</div><div class='hunk'>@@ -242,11 +247,8 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2_scan_medium(): Skipping %d bytes in nextblock to ensure page alignment\n",</div><div class='ctx'> 			  skip));</div><div class='del'>-		c-&gt;nextblock-&gt;wasted_size += skip;</div><div class='del'>-		c-&gt;wasted_size += skip;</div><div class='del'>-</div><div class='del'>-		c-&gt;nextblock-&gt;free_size -= skip;</div><div class='del'>-		c-&gt;free_size -= skip;</div><div class='add'>+		jffs2_prealloc_raw_node_refs(c, c-&gt;nextblock, 1);</div><div class='add'>+		jffs2_scan_dirty_space(c, c-&gt;nextblock, skip);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (c-&gt;nr_erasing_blocks) {</div><div class='hunk'>@@ -266,11 +268,14 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)</div><div class='ctx'> 	else</div><div class='ctx'> 		c-&gt;mtd-&gt;unpoint(c-&gt;mtd, flashbuf, 0, c-&gt;mtd-&gt;size);</div><div class='ctx'> #endif</div><div class='add'>+	if (s)</div><div class='add'>+		kfree(s);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jffs2_fill_scan_buf (struct jffs2_sb_info *c, void *buf,</div><div class='del'>-				uint32_t ofs, uint32_t len)</div><div class='add'>+static int jffs2_fill_scan_buf(struct jffs2_sb_info *c, void *buf,</div><div class='add'>+			       uint32_t ofs, uint32_t len)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t retlen;</div><div class='hunk'>@@ -290,7 +295,7 @@ int jffs2_fill_scan_buf (struct jffs2_sb_info *c, void *buf,</div><div class='ctx'> int jffs2_scan_classify_jeb(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='ctx'> {</div><div class='ctx'> 	if ((jeb-&gt;used_size + jeb-&gt;unchecked_size) == PAD(c-&gt;cleanmarker_size) &amp;&amp; !jeb-&gt;dirty_size</div><div class='del'>-		&amp;&amp; (!jeb-&gt;first_node || !jeb-&gt;first_node-&gt;next_phys) )</div><div class='add'>+	    &amp;&amp; (!jeb-&gt;first_node || !ref_next(jeb-&gt;first_node)) )</div><div class='ctx'> 		return BLK_STATE_CLEANMARKER;</div><div class='ctx'> </div><div class='ctx'> 	/* move blocks with max 4 byte dirty space to cleanlist */</div><div class='hunk'>@@ -306,11 +311,126 @@ int jffs2_scan_classify_jeb(struct jffs2_sb_info *c, struct jffs2_eraseblock *je</div><div class='ctx'> 		return BLK_STATE_ALLDIRTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+static int jffs2_scan_xattr_node(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='add'>+				 struct jffs2_raw_xattr *rx, uint32_t ofs,</div><div class='add'>+				 struct jffs2_summary *s)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	uint32_t xid, version, totlen, crc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crc = crc32(0, rx, sizeof(struct jffs2_raw_xattr) - 4);</div><div class='add'>+	if (crc != je32_to_cpu(rx-&gt;node_crc)) {</div><div class='add'>+		JFFS2_WARNING("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",</div><div class='add'>+			      ofs, je32_to_cpu(rx-&gt;node_crc), crc);</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, je32_to_cpu(rx-&gt;totlen))))</div><div class='add'>+			return err;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xid = je32_to_cpu(rx-&gt;xid);</div><div class='add'>+	version = je32_to_cpu(rx-&gt;version);</div><div class='add'>+</div><div class='add'>+	totlen = PAD(sizeof(struct jffs2_raw_xattr)</div><div class='add'>+			+ rx-&gt;name_len + 1 + je16_to_cpu(rx-&gt;value_len));</div><div class='add'>+	if (totlen != je32_to_cpu(rx-&gt;totlen)) {</div><div class='add'>+		JFFS2_WARNING("node length mismatch at %#08x, read=%u, calc=%u\n",</div><div class='add'>+			      ofs, je32_to_cpu(rx-&gt;totlen), totlen);</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, je32_to_cpu(rx-&gt;totlen))))</div><div class='add'>+			return err;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xd = jffs2_setup_xattr_datum(c, xid, version);</div><div class='add'>+	if (IS_ERR(xd))</div><div class='add'>+		return PTR_ERR(xd);</div><div class='add'>+</div><div class='add'>+	if (xd-&gt;version &gt; version) {</div><div class='add'>+		struct jffs2_raw_node_ref *raw</div><div class='add'>+			= jffs2_link_node_ref(c, jeb, ofs | REF_PRISTINE, totlen, NULL);</div><div class='add'>+		raw-&gt;next_in_ino = xd-&gt;node-&gt;next_in_ino;</div><div class='add'>+		xd-&gt;node-&gt;next_in_ino = raw;</div><div class='add'>+	} else {</div><div class='add'>+		xd-&gt;version = version;</div><div class='add'>+		xd-&gt;xprefix = rx-&gt;xprefix;</div><div class='add'>+		xd-&gt;name_len = rx-&gt;name_len;</div><div class='add'>+		xd-&gt;value_len = je16_to_cpu(rx-&gt;value_len);</div><div class='add'>+		xd-&gt;data_crc = je32_to_cpu(rx-&gt;data_crc);</div><div class='add'>+</div><div class='add'>+		jffs2_link_node_ref(c, jeb, ofs | REF_PRISTINE, totlen, (void *)xd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (jffs2_sum_active())</div><div class='add'>+		jffs2_sum_add_xattr_mem(s, rx, ofs - jeb-&gt;offset);</div><div class='add'>+	dbg_xattr("scaning xdatum at %#08x (xid=%u, version=%u)\n",</div><div class='add'>+		  ofs, xd-&gt;xid, xd-&gt;version);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_scan_xref_node(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='add'>+				struct jffs2_raw_xref *rr, uint32_t ofs,</div><div class='add'>+				struct jffs2_summary *s)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_ref *ref;</div><div class='add'>+	uint32_t crc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	crc = crc32(0, rr, sizeof(*rr) - 4);</div><div class='add'>+	if (crc != je32_to_cpu(rr-&gt;node_crc)) {</div><div class='add'>+		JFFS2_WARNING("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",</div><div class='add'>+			      ofs, je32_to_cpu(rr-&gt;node_crc), crc);</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(rr-&gt;totlen)))))</div><div class='add'>+			return err;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (PAD(sizeof(struct jffs2_raw_xref)) != je32_to_cpu(rr-&gt;totlen)) {</div><div class='add'>+		JFFS2_WARNING("node length mismatch at %#08x, read=%u, calc=%zd\n",</div><div class='add'>+			      ofs, je32_to_cpu(rr-&gt;totlen),</div><div class='add'>+			      PAD(sizeof(struct jffs2_raw_xref)));</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, je32_to_cpu(rr-&gt;totlen))))</div><div class='add'>+			return err;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ref = jffs2_alloc_xattr_ref();</div><div class='add'>+	if (!ref)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* BEFORE jffs2_build_xattr_subsystem() called, </div><div class='add'>+	 * and AFTER xattr_ref is marked as a dead xref,</div><div class='add'>+	 * ref-&gt;xid is used to store 32bit xid, xd is not used</div><div class='add'>+	 * ref-&gt;ino is used to store 32bit inode-number, ic is not used</div><div class='add'>+	 * Thoes variables are declared as union, thus using those</div><div class='add'>+	 * are exclusive. In a similar way, ref-&gt;next is temporarily</div><div class='add'>+	 * used to chain all xattr_ref object. It's re-chained to</div><div class='add'>+	 * jffs2_inode_cache in jffs2_build_xattr_subsystem() correctly.</div><div class='add'>+	 */</div><div class='add'>+	ref-&gt;ino = je32_to_cpu(rr-&gt;ino);</div><div class='add'>+	ref-&gt;xid = je32_to_cpu(rr-&gt;xid);</div><div class='add'>+	ref-&gt;xseqno = je32_to_cpu(rr-&gt;xseqno);</div><div class='add'>+	if (ref-&gt;xseqno &gt; c-&gt;highest_xseqno)</div><div class='add'>+		c-&gt;highest_xseqno = (ref-&gt;xseqno &amp; ~XREF_DELETE_MARKER);</div><div class='add'>+	ref-&gt;next = c-&gt;xref_temp;</div><div class='add'>+	c-&gt;xref_temp = ref;</div><div class='add'>+</div><div class='add'>+	jffs2_link_node_ref(c, jeb, ofs | REF_PRISTINE, PAD(je32_to_cpu(rr-&gt;totlen)), (void *)ref);</div><div class='add'>+</div><div class='add'>+	if (jffs2_sum_active())</div><div class='add'>+		jffs2_sum_add_xref_mem(s, rr, ofs - jeb-&gt;offset);</div><div class='add'>+	dbg_xattr("scan xref at %#08x (xid=%u, ino=%u)\n",</div><div class='add'>+		  ofs, ref-&gt;xid, ref-&gt;ino);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Called with 'buf_size == 0' if buf is in fact a pointer _directly_ into</div><div class='add'>+   the flash, XIP-style */</div><div class='ctx'> static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='del'>-				unsigned char *buf, uint32_t buf_size, struct jffs2_summary *s) {</div><div class='add'>+				  unsigned char *buf, uint32_t buf_size, struct jffs2_summary *s) {</div><div class='ctx'> 	struct jffs2_unknown_node *node;</div><div class='ctx'> 	struct jffs2_unknown_node crcnode;</div><div class='del'>-	struct jffs2_sum_marker *sm;</div><div class='ctx'> 	uint32_t ofs, prevofs;</div><div class='ctx'> 	uint32_t hdr_crc, buf_ofs, buf_len;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -344,44 +464,75 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (jffs2_sum_active()) {</div><div class='del'>-		sm = kmalloc(sizeof(struct jffs2_sum_marker), GFP_KERNEL);</div><div class='del'>-		if (!sm) {</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = jffs2_fill_scan_buf(c, (unsigned char *) sm, jeb-&gt;offset + c-&gt;sector_size -</div><div class='del'>-					sizeof(struct jffs2_sum_marker), sizeof(struct jffs2_sum_marker));</div><div class='del'>-		if (err) {</div><div class='del'>-			kfree(sm);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (je32_to_cpu(sm-&gt;magic) == JFFS2_SUM_MAGIC ) {</div><div class='del'>-			err = jffs2_sum_scan_sumnode(c, jeb, je32_to_cpu(sm-&gt;offset), &amp;pseudo_random);</div><div class='del'>-			if (err) {</div><div class='del'>-				kfree(sm);</div><div class='add'>+		struct jffs2_sum_marker *sm;</div><div class='add'>+		void *sumptr = NULL;</div><div class='add'>+		uint32_t sumlen;</div><div class='add'>+	      </div><div class='add'>+		if (!buf_size) {</div><div class='add'>+			/* XIP case. Just look, point at the summary if it's there */</div><div class='add'>+			sm = (void *)buf + c-&gt;sector_size - sizeof(*sm);</div><div class='add'>+			if (je32_to_cpu(sm-&gt;magic) == JFFS2_SUM_MAGIC) {</div><div class='add'>+				sumptr = buf + je32_to_cpu(sm-&gt;offset);</div><div class='add'>+				sumlen = c-&gt;sector_size - je32_to_cpu(sm-&gt;offset);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			/* If NAND flash, read a whole page of it. Else just the end */</div><div class='add'>+			if (c-&gt;wbuf_pagesize)</div><div class='add'>+				buf_len = c-&gt;wbuf_pagesize;</div><div class='add'>+			else</div><div class='add'>+				buf_len = sizeof(*sm);</div><div class='add'>+</div><div class='add'>+			/* Read as much as we want into the _end_ of the preallocated buffer */</div><div class='add'>+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, </div><div class='add'>+						  jeb-&gt;offset + c-&gt;sector_size - buf_len,</div><div class='add'>+						  buf_len);				</div><div class='add'>+			if (err)</div><div class='ctx'> 				return err;</div><div class='add'>+</div><div class='add'>+			sm = (void *)buf + buf_size - sizeof(*sm);</div><div class='add'>+			if (je32_to_cpu(sm-&gt;magic) == JFFS2_SUM_MAGIC) {</div><div class='add'>+				sumlen = c-&gt;sector_size - je32_to_cpu(sm-&gt;offset);</div><div class='add'>+				sumptr = buf + buf_size - sumlen;</div><div class='add'>+</div><div class='add'>+				/* Now, make sure the summary itself is available */</div><div class='add'>+				if (sumlen &gt; buf_size) {</div><div class='add'>+					/* Need to kmalloc for this. */</div><div class='add'>+					sumptr = kmalloc(sumlen, GFP_KERNEL);</div><div class='add'>+					if (!sumptr)</div><div class='add'>+						return -ENOMEM;</div><div class='add'>+					memcpy(sumptr + sumlen - buf_len, buf + buf_size - buf_len, buf_len);</div><div class='add'>+				}</div><div class='add'>+				if (buf_len &lt; sumlen) {</div><div class='add'>+					/* Need to read more so that the entire summary node is present */</div><div class='add'>+					err = jffs2_fill_scan_buf(c, sumptr, </div><div class='add'>+								  jeb-&gt;offset + c-&gt;sector_size - sumlen,</div><div class='add'>+								  sumlen - buf_len);				</div><div class='add'>+					if (err)</div><div class='add'>+						return err;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		kfree(sm);</div><div class='add'>+		if (sumptr) {</div><div class='add'>+			err = jffs2_sum_scan_sumnode(c, jeb, sumptr, sumlen, &amp;pseudo_random);</div><div class='ctx'> </div><div class='del'>-		ofs = jeb-&gt;offset;</div><div class='del'>-		prevofs = jeb-&gt;offset - 1;</div><div class='add'>+			if (buf_size &amp;&amp; sumlen &gt; buf_size)</div><div class='add'>+				kfree(sumptr);</div><div class='add'>+			/* If it returns with a real error, bail. </div><div class='add'>+			   If it returns positive, that's a block classification</div><div class='add'>+			   (i.e. BLK_STATE_xxx) so return that too.</div><div class='add'>+			   If it returns zero, fall through to full scan. */</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	buf_ofs = jeb-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 	if (!buf_size) {</div><div class='add'>+		/* This is the XIP case -- we're reading _directly_ from the flash chip */</div><div class='ctx'> 		buf_len = c-&gt;sector_size;</div><div class='del'>-</div><div class='del'>-		if (jffs2_sum_active()) {</div><div class='del'>-			/* must reread because of summary test */</div><div class='del'>-			err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buf_len = EMPTY_SCAN_SIZE(c-&gt;sector_size);</div><div class='ctx'> 		err = jffs2_fill_scan_buf(c, buf, buf_ofs, buf_len);</div><div class='hunk'>@@ -418,7 +569,10 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo</div><div class='ctx'> 	if (ofs) {</div><div class='ctx'> 		D1(printk(KERN_DEBUG "Free space at %08x ends at %08x\n", jeb-&gt;offset,</div><div class='ctx'> 			  jeb-&gt;offset + ofs));</div><div class='del'>-		DIRTY_SPACE(ofs);</div><div class='add'>+		if ((err = jffs2_prealloc_raw_node_refs(c, jeb, 1)))</div><div class='add'>+			return err;</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, ofs)))</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now ofs is a complete physical flash offset as it always was... */</div><div class='hunk'>@@ -433,6 +587,11 @@ scan_more:</div><div class='ctx'> </div><div class='ctx'> 		jffs2_dbg_acct_paranoia_check_nolock(c, jeb);</div><div class='ctx'> </div><div class='add'>+		/* Make sure there are node refs available for use */</div><div class='add'>+		err = jffs2_prealloc_raw_node_refs(c, jeb, 2);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> </div><div class='ctx'> 		if (ofs &amp; 3) {</div><div class='hunk'>@@ -442,7 +601,8 @@ scan_more:</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ofs == prevofs) {</div><div class='ctx'> 			printk(KERN_WARNING "ofs 0x%08x has already been seen. Skipping\n", ofs);</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -451,7 +611,8 @@ scan_more:</div><div class='ctx'> 		if (jeb-&gt;offset + c-&gt;sector_size &lt; ofs + sizeof(*node)) {</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Fewer than %zd bytes left to end of block. (%x+%x&lt;%x+%zx) Not reading\n", sizeof(struct jffs2_unknown_node),</div><div class='ctx'> 				  jeb-&gt;offset, c-&gt;sector_size, ofs, sizeof(*node)));</div><div class='del'>-			DIRTY_SPACE((jeb-&gt;offset + c-&gt;sector_size)-ofs);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, (jeb-&gt;offset + c-&gt;sector_size)-ofs)))</div><div class='add'>+				return err;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -481,7 +642,8 @@ scan_more:</div><div class='ctx'> 				if (*(uint32_t *)(&amp;buf[inbuf_ofs]) != 0xffffffff) {</div><div class='ctx'> 					printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",</div><div class='ctx'> 					       empty_start, ofs);</div><div class='del'>-					DIRTY_SPACE(ofs-empty_start);</div><div class='add'>+					if ((err = jffs2_scan_dirty_space(c, jeb, ofs-empty_start)))</div><div class='add'>+						return err;</div><div class='ctx'> 					goto scan_more;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -494,7 +656,7 @@ scan_more:</div><div class='ctx'> 			/* If we're only checking the beginning of a block with a cleanmarker,</div><div class='ctx'> 			   bail now */</div><div class='ctx'> 			if (buf_ofs == jeb-&gt;offset &amp;&amp; jeb-&gt;used_size == PAD(c-&gt;cleanmarker_size) &amp;&amp;</div><div class='del'>-			    c-&gt;cleanmarker_size &amp;&amp; !jeb-&gt;dirty_size &amp;&amp; !jeb-&gt;first_node-&gt;next_phys) {</div><div class='add'>+			    c-&gt;cleanmarker_size &amp;&amp; !jeb-&gt;dirty_size &amp;&amp; !ref_next(jeb-&gt;first_node)) {</div><div class='ctx'> 				D1(printk(KERN_DEBUG "%d bytes at start of block seems clean... assuming all clean\n", EMPTY_SCAN_SIZE(c-&gt;sector_size)));</div><div class='ctx'> 				return BLK_STATE_CLEANMARKER;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -518,20 +680,23 @@ scan_more:</div><div class='ctx'> </div><div class='ctx'> 		if (ofs == jeb-&gt;offset &amp;&amp; je16_to_cpu(node-&gt;magic) == KSAMTIB_CIGAM_2SFFJ) {</div><div class='ctx'> 			printk(KERN_WARNING "Magic bitmask is backwards at offset 0x%08x. Wrong endian filesystem?\n", ofs);</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (je16_to_cpu(node-&gt;magic) == JFFS2_DIRTY_BITMASK) {</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Dirty bitmask at 0x%08x\n", ofs));</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (je16_to_cpu(node-&gt;magic) == JFFS2_OLD_MAGIC_BITMASK) {</div><div class='ctx'> 			printk(KERN_WARNING "Old JFFS2 bitmask found at 0x%08x\n", ofs);</div><div class='ctx'> 			printk(KERN_WARNING "You cannot use older JFFS2 filesystems with newer kernels\n");</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -540,7 +705,8 @@ scan_more:</div><div class='ctx'> 			noisy_printk(&amp;noise, "jffs2_scan_eraseblock(): Magic bitmask 0x%04x not found at 0x%08x: 0x%04x instead\n",</div><div class='ctx'> 				     JFFS2_MAGIC_BITMASK, ofs,</div><div class='ctx'> 				     je16_to_cpu(node-&gt;magic));</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -557,7 +723,8 @@ scan_more:</div><div class='ctx'> 				     je32_to_cpu(node-&gt;totlen),</div><div class='ctx'> 				     je32_to_cpu(node-&gt;hdr_crc),</div><div class='ctx'> 				     hdr_crc);</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -568,7 +735,8 @@ scan_more:</div><div class='ctx'> 			printk(KERN_WARNING "Node at 0x%08x with length 0x%08x would run over the end of the erase block\n",</div><div class='ctx'> 			       ofs, je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 			printk(KERN_WARNING "Perhaps the file system was created with the wrong erase size?\n");</div><div class='del'>-			DIRTY_SPACE(4);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, 4)))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += 4;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -576,7 +744,8 @@ scan_more:</div><div class='ctx'> 		if (!(je16_to_cpu(node-&gt;nodetype) &amp; JFFS2_NODE_ACCURATE)) {</div><div class='ctx'> 			/* Wheee. This is an obsoleted node */</div><div class='ctx'> 			D2(printk(KERN_DEBUG "Node at 0x%08x is obsolete. Skipping\n", ofs));</div><div class='del'>-			DIRTY_SPACE(PAD(je32_to_cpu(node-&gt;totlen)));</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(node-&gt;totlen)))))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -614,30 +783,59 @@ scan_more:</div><div class='ctx'> 			ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+		case JFFS2_NODETYPE_XATTR:</div><div class='add'>+			if (buf_ofs + buf_len &lt; ofs + je32_to_cpu(node-&gt;totlen)) {</div><div class='add'>+				buf_len = min_t(uint32_t, buf_size, jeb-&gt;offset + c-&gt;sector_size - ofs);</div><div class='add'>+				D1(printk(KERN_DEBUG "Fewer than %d bytes (xattr node)"</div><div class='add'>+					  " left to end of buf. Reading 0x%x at 0x%08x\n",</div><div class='add'>+					  je32_to_cpu(node-&gt;totlen), buf_len, ofs));</div><div class='add'>+				err = jffs2_fill_scan_buf(c, buf, ofs, buf_len);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+				buf_ofs = ofs;</div><div class='add'>+				node = (void *)buf;</div><div class='add'>+			}</div><div class='add'>+			err = jffs2_scan_xattr_node(c, jeb, (void *)node, ofs, s);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='add'>+			break;</div><div class='add'>+		case JFFS2_NODETYPE_XREF:</div><div class='add'>+			if (buf_ofs + buf_len &lt; ofs + je32_to_cpu(node-&gt;totlen)) {</div><div class='add'>+				buf_len = min_t(uint32_t, buf_size, jeb-&gt;offset + c-&gt;sector_size - ofs);</div><div class='add'>+				D1(printk(KERN_DEBUG "Fewer than %d bytes (xref node)"</div><div class='add'>+					  " left to end of buf. Reading 0x%x at 0x%08x\n",</div><div class='add'>+					  je32_to_cpu(node-&gt;totlen), buf_len, ofs));</div><div class='add'>+				err = jffs2_fill_scan_buf(c, buf, ofs, buf_len);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+				buf_ofs = ofs;</div><div class='add'>+				node = (void *)buf;</div><div class='add'>+			}</div><div class='add'>+			err = jffs2_scan_xref_node(c, jeb, (void *)node, ofs, s);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+			ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='add'>+			break;</div><div class='add'>+#endif	/* CONFIG_JFFS2_FS_XATTR */</div><div class='add'>+</div><div class='ctx'> 		case JFFS2_NODETYPE_CLEANMARKER:</div><div class='ctx'> 			D1(printk(KERN_DEBUG "CLEANMARKER node found at 0x%08x\n", ofs));</div><div class='ctx'> 			if (je32_to_cpu(node-&gt;totlen) != c-&gt;cleanmarker_size) {</div><div class='ctx'> 				printk(KERN_NOTICE "CLEANMARKER node found at 0x%08x has totlen 0x%x != normal 0x%x\n",</div><div class='ctx'> 				       ofs, je32_to_cpu(node-&gt;totlen), c-&gt;cleanmarker_size);</div><div class='del'>-				DIRTY_SPACE(PAD(sizeof(struct jffs2_unknown_node)));</div><div class='add'>+				if ((err = jffs2_scan_dirty_space(c, jeb, PAD(sizeof(struct jffs2_unknown_node)))))</div><div class='add'>+					return err;</div><div class='ctx'> 				ofs += PAD(sizeof(struct jffs2_unknown_node));</div><div class='ctx'> 			} else if (jeb-&gt;first_node) {</div><div class='ctx'> 				printk(KERN_NOTICE "CLEANMARKER node found at 0x%08x, not first node in block (0x%08x)\n", ofs, jeb-&gt;offset);</div><div class='del'>-				DIRTY_SPACE(PAD(sizeof(struct jffs2_unknown_node)));</div><div class='add'>+				if ((err = jffs2_scan_dirty_space(c, jeb, PAD(sizeof(struct jffs2_unknown_node)))))</div><div class='add'>+					return err;</div><div class='ctx'> 				ofs += PAD(sizeof(struct jffs2_unknown_node));</div><div class='ctx'> 			} else {</div><div class='del'>-				struct jffs2_raw_node_ref *marker_ref = jffs2_alloc_raw_node_ref();</div><div class='del'>-				if (!marker_ref) {</div><div class='del'>-					printk(KERN_NOTICE "Failed to allocate node ref for clean marker\n");</div><div class='del'>-					return -ENOMEM;</div><div class='del'>-				}</div><div class='del'>-				marker_ref-&gt;next_in_ino = NULL;</div><div class='del'>-				marker_ref-&gt;next_phys = NULL;</div><div class='del'>-				marker_ref-&gt;flash_offset = ofs | REF_NORMAL;</div><div class='del'>-				marker_ref-&gt;__totlen = c-&gt;cleanmarker_size;</div><div class='del'>-				jeb-&gt;first_node = jeb-&gt;last_node = marker_ref;</div><div class='add'>+				jffs2_link_node_ref(c, jeb, ofs | REF_NORMAL, c-&gt;cleanmarker_size, NULL);</div><div class='ctx'> </div><div class='del'>-				USED_SPACE(PAD(c-&gt;cleanmarker_size));</div><div class='ctx'> 				ofs += PAD(c-&gt;cleanmarker_size);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -645,7 +843,8 @@ scan_more:</div><div class='ctx'> 		case JFFS2_NODETYPE_PADDING:</div><div class='ctx'> 			if (jffs2_sum_active())</div><div class='ctx'> 				jffs2_sum_add_padding_mem(s, je32_to_cpu(node-&gt;totlen));</div><div class='del'>-			DIRTY_SPACE(PAD(je32_to_cpu(node-&gt;totlen)));</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(node-&gt;totlen)))))</div><div class='add'>+				return err;</div><div class='ctx'> 			ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -656,7 +855,8 @@ scan_more:</div><div class='ctx'> 			        c-&gt;flags |= JFFS2_SB_FLAG_RO;</div><div class='ctx'> 				if (!(jffs2_is_readonly(c)))</div><div class='ctx'> 					return -EROFS;</div><div class='del'>-				DIRTY_SPACE(PAD(je32_to_cpu(node-&gt;totlen)));</div><div class='add'>+				if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(node-&gt;totlen)))))</div><div class='add'>+					return err;</div><div class='ctx'> 				ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -666,15 +866,21 @@ scan_more:</div><div class='ctx'> </div><div class='ctx'> 			case JFFS2_FEATURE_RWCOMPAT_DELETE:</div><div class='ctx'> 				D1(printk(KERN_NOTICE "Unknown but compatible feature node (0x%04x) found at offset 0x%08x\n", je16_to_cpu(node-&gt;nodetype), ofs));</div><div class='del'>-				DIRTY_SPACE(PAD(je32_to_cpu(node-&gt;totlen)));</div><div class='add'>+				if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(node-&gt;totlen)))))</div><div class='add'>+					return err;</div><div class='ctx'> 				ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			case JFFS2_FEATURE_RWCOMPAT_COPY:</div><div class='add'>+			case JFFS2_FEATURE_RWCOMPAT_COPY: {</div><div class='ctx'> 				D1(printk(KERN_NOTICE "Unknown but compatible feature node (0x%04x) found at offset 0x%08x\n", je16_to_cpu(node-&gt;nodetype), ofs));</div><div class='del'>-				USED_SPACE(PAD(je32_to_cpu(node-&gt;totlen)));</div><div class='add'>+</div><div class='add'>+				jffs2_link_node_ref(c, jeb, ofs | REF_PRISTINE, PAD(je32_to_cpu(node-&gt;totlen)), NULL);</div><div class='add'>+</div><div class='add'>+				/* We can't summarise nodes we don't grok */</div><div class='add'>+				jffs2_sum_disable_collecting(s);</div><div class='ctx'> 				ofs += PAD(je32_to_cpu(node-&gt;totlen));</div><div class='ctx'> 				break;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -687,9 +893,9 @@ scan_more:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x\n", jeb-&gt;offset,</div><div class='del'>-		  jeb-&gt;free_size, jeb-&gt;dirty_size, jeb-&gt;unchecked_size, jeb-&gt;used_size));</div><div class='del'>-</div><div class='add'>+	D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",</div><div class='add'>+		  jeb-&gt;offset,jeb-&gt;free_size, jeb-&gt;dirty_size, jeb-&gt;unchecked_size, jeb-&gt;used_size, jeb-&gt;wasted_size));</div><div class='add'>+	</div><div class='ctx'> 	/* mark_node_obsolete can add to wasted !! */</div><div class='ctx'> 	if (jeb-&gt;wasted_size) {</div><div class='ctx'> 		jeb-&gt;dirty_size += jeb-&gt;wasted_size;</div><div class='hunk'>@@ -730,9 +936,9 @@ struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uin</div><div class='ctx'> static int jffs2_scan_inode_node(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='ctx'> 				 struct jffs2_raw_inode *ri, uint32_t ofs, struct jffs2_summary *s)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *raw;</div><div class='ctx'> 	struct jffs2_inode_cache *ic;</div><div class='ctx'> 	uint32_t ino = je32_to_cpu(ri-&gt;ino);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_scan_inode_node(): Node at 0x%08x\n", ofs));</div><div class='ctx'> </div><div class='hunk'>@@ -745,12 +951,6 @@ static int jffs2_scan_inode_node(struct jffs2_sb_info *c, struct jffs2_erasebloc</div><div class='ctx'> 	   Which means that the _full_ amount of time to get to proper write mode with GC</div><div class='ctx'> 	   operational may actually be _longer_ than before. Sucks to be me. */</div><div class='ctx'> </div><div class='del'>-	raw = jffs2_alloc_raw_node_ref();</div><div class='del'>-	if (!raw) {</div><div class='del'>-		printk(KERN_NOTICE "jffs2_scan_inode_node(): allocation of node reference failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ic = jffs2_get_ino_cache(c, ino);</div><div class='ctx'> 	if (!ic) {</div><div class='ctx'> 		/* Inocache get failed. Either we read a bogus ino# or it's just genuinely the</div><div class='hunk'>@@ -762,30 +962,17 @@ static int jffs2_scan_inode_node(struct jffs2_sb_info *c, struct jffs2_erasebloc</div><div class='ctx'> 			printk(KERN_NOTICE "jffs2_scan_inode_node(): CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",</div><div class='ctx'> 			       ofs, je32_to_cpu(ri-&gt;node_crc), crc);</div><div class='ctx'> 			/* We believe totlen because the CRC on the node _header_ was OK, just the node itself failed. */</div><div class='del'>-			DIRTY_SPACE(PAD(je32_to_cpu(ri-&gt;totlen)));</div><div class='del'>-			jffs2_free_raw_node_ref(raw);</div><div class='add'>+			if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(ri-&gt;totlen)))))</div><div class='add'>+				return err;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		ic = jffs2_scan_make_ino_cache(c, ino);</div><div class='del'>-		if (!ic) {</div><div class='del'>-			jffs2_free_raw_node_ref(raw);</div><div class='add'>+		if (!ic)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wheee. It worked */</div><div class='del'>-</div><div class='del'>-	raw-&gt;flash_offset = ofs | REF_UNCHECKED;</div><div class='del'>-	raw-&gt;__totlen = PAD(je32_to_cpu(ri-&gt;totlen));</div><div class='del'>-	raw-&gt;next_phys = NULL;</div><div class='del'>-	raw-&gt;next_in_ino = ic-&gt;nodes;</div><div class='del'>-</div><div class='del'>-	ic-&gt;nodes = raw;</div><div class='del'>-	if (!jeb-&gt;first_node)</div><div class='del'>-		jeb-&gt;first_node = raw;</div><div class='del'>-	if (jeb-&gt;last_node)</div><div class='del'>-		jeb-&gt;last_node-&gt;next_phys = raw;</div><div class='del'>-	jeb-&gt;last_node = raw;</div><div class='add'>+	jffs2_link_node_ref(c, jeb, ofs | REF_UNCHECKED, PAD(je32_to_cpu(ri-&gt;totlen)), ic);</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "Node is ino #%u, version %d. Range 0x%x-0x%x\n",</div><div class='ctx'> 		  je32_to_cpu(ri-&gt;ino), je32_to_cpu(ri-&gt;version),</div><div class='hunk'>@@ -794,8 +981,6 @@ static int jffs2_scan_inode_node(struct jffs2_sb_info *c, struct jffs2_erasebloc</div><div class='ctx'> </div><div class='ctx'> 	pseudo_random += je32_to_cpu(ri-&gt;version);</div><div class='ctx'> </div><div class='del'>-	UNCHECKED_SPACE(PAD(je32_to_cpu(ri-&gt;totlen)));</div><div class='del'>-</div><div class='ctx'> 	if (jffs2_sum_active()) {</div><div class='ctx'> 		jffs2_sum_add_inode_mem(s, ri, ofs - jeb-&gt;offset);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -806,10 +991,10 @@ static int jffs2_scan_inode_node(struct jffs2_sb_info *c, struct jffs2_erasebloc</div><div class='ctx'> static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='ctx'> 				  struct jffs2_raw_dirent *rd, uint32_t ofs, struct jffs2_summary *s)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *raw;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='ctx'> 	struct jffs2_inode_cache *ic;</div><div class='ctx'> 	uint32_t crc;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_scan_dirent_node(): Node at 0x%08x\n", ofs));</div><div class='ctx'> </div><div class='hunk'>@@ -821,7 +1006,8 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo</div><div class='ctx'> 		printk(KERN_NOTICE "jffs2_scan_dirent_node(): Node CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",</div><div class='ctx'> 		       ofs, je32_to_cpu(rd-&gt;node_crc), crc);</div><div class='ctx'> 		/* We believe totlen because the CRC on the node _header_ was OK, just the node itself failed. */</div><div class='del'>-		DIRTY_SPACE(PAD(je32_to_cpu(rd-&gt;totlen)));</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(rd-&gt;totlen)))))</div><div class='add'>+			return err;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -842,40 +1028,23 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo</div><div class='ctx'> 		jffs2_free_full_dirent(fd);</div><div class='ctx'> 		/* FIXME: Why do we believe totlen? */</div><div class='ctx'> 		/* We believe totlen because the CRC on the node _header_ was OK, just the name failed. */</div><div class='del'>-		DIRTY_SPACE(PAD(je32_to_cpu(rd-&gt;totlen)));</div><div class='add'>+		if ((err = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(rd-&gt;totlen)))))</div><div class='add'>+			return err;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	raw = jffs2_alloc_raw_node_ref();</div><div class='del'>-	if (!raw) {</div><div class='del'>-		jffs2_free_full_dirent(fd);</div><div class='del'>-		printk(KERN_NOTICE "jffs2_scan_dirent_node(): allocation of node reference failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	ic = jffs2_scan_make_ino_cache(c, je32_to_cpu(rd-&gt;pino));</div><div class='ctx'> 	if (!ic) {</div><div class='ctx'> 		jffs2_free_full_dirent(fd);</div><div class='del'>-		jffs2_free_raw_node_ref(raw);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	raw-&gt;__totlen = PAD(je32_to_cpu(rd-&gt;totlen));</div><div class='del'>-	raw-&gt;flash_offset = ofs | REF_PRISTINE;</div><div class='del'>-	raw-&gt;next_phys = NULL;</div><div class='del'>-	raw-&gt;next_in_ino = ic-&gt;nodes;</div><div class='del'>-	ic-&gt;nodes = raw;</div><div class='del'>-	if (!jeb-&gt;first_node)</div><div class='del'>-		jeb-&gt;first_node = raw;</div><div class='del'>-	if (jeb-&gt;last_node)</div><div class='del'>-		jeb-&gt;last_node-&gt;next_phys = raw;</div><div class='del'>-	jeb-&gt;last_node = raw;</div><div class='add'>+	fd-&gt;raw = jffs2_link_node_ref(c, jeb, ofs | REF_PRISTINE, PAD(je32_to_cpu(rd-&gt;totlen)), ic);</div><div class='ctx'> </div><div class='del'>-	fd-&gt;raw = raw;</div><div class='ctx'> 	fd-&gt;next = NULL;</div><div class='ctx'> 	fd-&gt;version = je32_to_cpu(rd-&gt;version);</div><div class='ctx'> 	fd-&gt;ino = je32_to_cpu(rd-&gt;ino);</div><div class='ctx'> 	fd-&gt;nhash = full_name_hash(fd-&gt;name, rd-&gt;nsize);</div><div class='ctx'> 	fd-&gt;type = rd-&gt;type;</div><div class='del'>-	USED_SPACE(PAD(je32_to_cpu(rd-&gt;totlen)));</div><div class='ctx'> 	jffs2_add_fd_to_list(c, fd, &amp;ic-&gt;scan_dents);</div><div class='ctx'> </div><div class='ctx'> 	if (jffs2_sum_active()) {</div><div class='head'>diff --git a/fs/jffs2/security.c b/fs/jffs2/security.c<br/>new file mode 100644<br/>index 000000000000..52a9894a6364<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/security.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/security.c</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/jffs2.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='add'>+#include "nodelist.h"</div><div class='add'>+</div><div class='add'>+/* ---- Initial Security Label Attachment -------------- */</div><div class='add'>+int jffs2_init_security(struct inode *inode, struct inode *dir)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	size_t len;</div><div class='add'>+	void *value;</div><div class='add'>+	char *name;</div><div class='add'>+</div><div class='add'>+	rc = security_inode_init_security(inode, dir, &amp;name, &amp;value, &amp;len);</div><div class='add'>+	if (rc) {</div><div class='add'>+		if (rc == -EOPNOTSUPP)</div><div class='add'>+			return 0;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = do_jffs2_setxattr(inode, JFFS2_XPREFIX_SECURITY, name, value, len, 0);</div><div class='add'>+</div><div class='add'>+        kfree(name);</div><div class='add'>+        kfree(value);</div><div class='add'>+        return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ---- XATTR Handler for "security.*" ----------------- */</div><div class='add'>+static int jffs2_security_getxattr(struct inode *inode, const char *name,</div><div class='add'>+				   void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(name, ""))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_SECURITY, name, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_security_setxattr(struct inode *inode, const char *name, const void *buffer,</div><div class='add'>+				   size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(name, ""))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return do_jffs2_setxattr(inode, JFFS2_XPREFIX_SECURITY, name, buffer, size, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t jffs2_security_listxattr(struct inode *inode, char *list, size_t list_size,</div><div class='add'>+				       const char *name, size_t name_len)</div><div class='add'>+{</div><div class='add'>+	size_t retlen = XATTR_SECURITY_PREFIX_LEN + name_len + 1;</div><div class='add'>+</div><div class='add'>+	if (list &amp;&amp; retlen &lt;= list_size) {</div><div class='add'>+		strcpy(list, XATTR_SECURITY_PREFIX);</div><div class='add'>+		strcpy(list + XATTR_SECURITY_PREFIX_LEN, name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xattr_handler jffs2_security_xattr_handler = {</div><div class='add'>+	.prefix = XATTR_SECURITY_PREFIX,</div><div class='add'>+	.list = jffs2_security_listxattr,</div><div class='add'>+	.set = jffs2_security_setxattr,</div><div class='add'>+	.get = jffs2_security_getxattr</div><div class='add'>+};</div><div class='head'>diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c<br/>index fb9cec61fcf2..c19bd476e8ec 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/summary.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/summary.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/summary.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/summary.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'>  *                     Zoltan Sogor &lt;weth@inf.u-szeged.hu&gt;,</div><div class='ctx'>  *                     Patrik Kluba &lt;pajko@halom.u-szeged.hu&gt;,</div><div class='ctx'>  *                     University of Szeged, Hungary</div><div class='add'>+ *               2006  KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * For licensing information, see the file 'LICENCE' in this directory.</div><div class='ctx'>  *</div><div class='hunk'>@@ -42,7 +43,7 @@ int jffs2_sum_init(struct jffs2_sb_info *c)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dbg_summary("returned succesfully\n");</div><div class='add'>+	dbg_summary("returned successfully\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -81,6 +82,19 @@ static int jffs2_sum_add_mem(struct jffs2_summary *s, union jffs2_sum_mem *item)</div><div class='ctx'> 			dbg_summary("dirent (%u) added to summary\n",</div><div class='ctx'> 						je32_to_cpu(item-&gt;d.ino));</div><div class='ctx'> 			break;</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+		case JFFS2_NODETYPE_XATTR:</div><div class='add'>+			s-&gt;sum_size += JFFS2_SUMMARY_XATTR_SIZE;</div><div class='add'>+			s-&gt;sum_num++;</div><div class='add'>+			dbg_summary("xattr (xid=%u, version=%u) added to summary\n",</div><div class='add'>+				    je32_to_cpu(item-&gt;x.xid), je32_to_cpu(item-&gt;x.version));</div><div class='add'>+			break;</div><div class='add'>+		case JFFS2_NODETYPE_XREF:</div><div class='add'>+			s-&gt;sum_size += JFFS2_SUMMARY_XREF_SIZE;</div><div class='add'>+			s-&gt;sum_num++;</div><div class='add'>+			dbg_summary("xref added to summary\n");</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='ctx'> 		default:</div><div class='ctx'> 			JFFS2_WARNING("UNKNOWN node type %u\n",</div><div class='ctx'> 					    je16_to_cpu(item-&gt;u.nodetype));</div><div class='hunk'>@@ -141,6 +155,40 @@ int jffs2_sum_add_dirent_mem(struct jffs2_summary *s, struct jffs2_raw_dirent *r</div><div class='ctx'> 	return jffs2_sum_add_mem(s, (union jffs2_sum_mem *)temp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+int jffs2_sum_add_xattr_mem(struct jffs2_summary *s, struct jffs2_raw_xattr *rx, uint32_t ofs)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_sum_xattr_mem *temp;</div><div class='add'>+</div><div class='add'>+	temp = kmalloc(sizeof(struct jffs2_sum_xattr_mem), GFP_KERNEL);</div><div class='add'>+	if (!temp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	temp-&gt;nodetype = rx-&gt;nodetype;</div><div class='add'>+	temp-&gt;xid = rx-&gt;xid;</div><div class='add'>+	temp-&gt;version = rx-&gt;version;</div><div class='add'>+	temp-&gt;offset = cpu_to_je32(ofs);</div><div class='add'>+	temp-&gt;totlen = rx-&gt;totlen;</div><div class='add'>+	temp-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	return jffs2_sum_add_mem(s, (union jffs2_sum_mem *)temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_sum_add_xref_mem(struct jffs2_summary *s, struct jffs2_raw_xref *rr, uint32_t ofs)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_sum_xref_mem *temp;</div><div class='add'>+</div><div class='add'>+	temp = kmalloc(sizeof(struct jffs2_sum_xref_mem), GFP_KERNEL);</div><div class='add'>+	if (!temp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	temp-&gt;nodetype = rr-&gt;nodetype;</div><div class='add'>+	temp-&gt;offset = cpu_to_je32(ofs);</div><div class='add'>+	temp-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+	return jffs2_sum_add_mem(s, (union jffs2_sum_mem *)temp);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> /* Cleanup every collected summary information */</div><div class='ctx'> </div><div class='ctx'> static void jffs2_sum_clean_collected(struct jffs2_summary *s)</div><div class='hunk'>@@ -259,7 +307,34 @@ int jffs2_sum_add_kvec(struct jffs2_sb_info *c, const struct kvec *invecs,</div><div class='ctx'> </div><div class='ctx'> 			return jffs2_sum_add_mem(c-&gt;summary, (union jffs2_sum_mem *)temp);</div><div class='ctx'> 		}</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+		case JFFS2_NODETYPE_XATTR: {</div><div class='add'>+			struct jffs2_sum_xattr_mem *temp;</div><div class='add'>+			temp = kmalloc(sizeof(struct jffs2_sum_xattr_mem), GFP_KERNEL);</div><div class='add'>+			if (!temp)</div><div class='add'>+				goto no_mem;</div><div class='add'>+</div><div class='add'>+			temp-&gt;nodetype = node-&gt;x.nodetype;</div><div class='add'>+			temp-&gt;xid = node-&gt;x.xid;</div><div class='add'>+			temp-&gt;version = node-&gt;x.version;</div><div class='add'>+			temp-&gt;totlen = node-&gt;x.totlen;</div><div class='add'>+			temp-&gt;offset = cpu_to_je32(ofs);</div><div class='add'>+			temp-&gt;next = NULL;</div><div class='ctx'> </div><div class='add'>+			return jffs2_sum_add_mem(c-&gt;summary, (union jffs2_sum_mem *)temp);</div><div class='add'>+		}</div><div class='add'>+		case JFFS2_NODETYPE_XREF: {</div><div class='add'>+			struct jffs2_sum_xref_mem *temp;</div><div class='add'>+			temp = kmalloc(sizeof(struct jffs2_sum_xref_mem), GFP_KERNEL);</div><div class='add'>+			if (!temp)</div><div class='add'>+				goto no_mem;</div><div class='add'>+			temp-&gt;nodetype = node-&gt;r.nodetype;</div><div class='add'>+			temp-&gt;offset = cpu_to_je32(ofs);</div><div class='add'>+			temp-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+			return jffs2_sum_add_mem(c-&gt;summary, (union jffs2_sum_mem *)temp);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> 		case JFFS2_NODETYPE_PADDING:</div><div class='ctx'> 			dbg_summary("node PADDING\n");</div><div class='ctx'> 			c-&gt;summary-&gt;sum_padded += je32_to_cpu(node-&gt;u.totlen);</div><div class='hunk'>@@ -288,23 +363,41 @@ no_mem:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct jffs2_raw_node_ref *sum_link_node_ref(struct jffs2_sb_info *c,</div><div class='add'>+						    struct jffs2_eraseblock *jeb,</div><div class='add'>+						    uint32_t ofs, uint32_t len,</div><div class='add'>+						    struct jffs2_inode_cache *ic)</div><div class='add'>+{</div><div class='add'>+	/* If there was a gap, mark it dirty */</div><div class='add'>+	if ((ofs &amp; ~3) &gt; c-&gt;sector_size - jeb-&gt;free_size) {</div><div class='add'>+		/* Ew. Summary doesn't actually tell us explicitly about dirty space */</div><div class='add'>+		jffs2_scan_dirty_space(c, jeb, (ofs &amp; ~3) - (c-&gt;sector_size - jeb-&gt;free_size));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return jffs2_link_node_ref(c, jeb, jeb-&gt;offset + ofs, len, ic);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* Process the stored summary information - helper function for jffs2_sum_scan_sumnode() */</div><div class='ctx'> </div><div class='ctx'> static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='ctx'> 				struct jffs2_raw_summary *summary, uint32_t *pseudo_random)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *raw;</div><div class='ctx'> 	struct jffs2_inode_cache *ic;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='ctx'> 	void *sp;</div><div class='ctx'> 	int i, ino;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	sp = summary-&gt;sum;</div><div class='ctx'> </div><div class='ctx'> 	for (i=0; i&lt;je32_to_cpu(summary-&gt;sum_num); i++) {</div><div class='ctx'> 		dbg_summary("processing summary index %d\n", i);</div><div class='ctx'> </div><div class='add'>+		/* Make sure there's a spare ref for dirty space */</div><div class='add'>+		err = jffs2_prealloc_raw_node_refs(c, jeb, 2);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='ctx'> 		switch (je16_to_cpu(((struct jffs2_sum_unknown_flash *)sp)-&gt;nodetype)) {</div><div class='ctx'> 			case JFFS2_NODETYPE_INODE: {</div><div class='ctx'> 				struct jffs2_sum_inode_flash *spi;</div><div class='hunk'>@@ -312,38 +405,20 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras</div><div class='ctx'> </div><div class='ctx'> 				ino = je32_to_cpu(spi-&gt;inode);</div><div class='ctx'> </div><div class='del'>-				dbg_summary("Inode at 0x%08x\n",</div><div class='del'>-							jeb-&gt;offset + je32_to_cpu(spi-&gt;offset));</div><div class='del'>-</div><div class='del'>-				raw = jffs2_alloc_raw_node_ref();</div><div class='del'>-				if (!raw) {</div><div class='del'>-					JFFS2_NOTICE("allocation of node reference failed\n");</div><div class='del'>-					kfree(summary);</div><div class='del'>-					return -ENOMEM;</div><div class='del'>-				}</div><div class='add'>+				dbg_summary("Inode at 0x%08x-0x%08x\n",</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spi-&gt;offset),</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spi-&gt;offset) + je32_to_cpu(spi-&gt;totlen));</div><div class='ctx'> </div><div class='ctx'> 				ic = jffs2_scan_make_ino_cache(c, ino);</div><div class='ctx'> 				if (!ic) {</div><div class='ctx'> 					JFFS2_NOTICE("scan_make_ino_cache failed\n");</div><div class='del'>-					jffs2_free_raw_node_ref(raw);</div><div class='del'>-					kfree(summary);</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				raw-&gt;flash_offset = (jeb-&gt;offset + je32_to_cpu(spi-&gt;offset)) | REF_UNCHECKED;</div><div class='del'>-				raw-&gt;__totlen = PAD(je32_to_cpu(spi-&gt;totlen));</div><div class='del'>-				raw-&gt;next_phys = NULL;</div><div class='del'>-				raw-&gt;next_in_ino = ic-&gt;nodes;</div><div class='del'>-</div><div class='del'>-				ic-&gt;nodes = raw;</div><div class='del'>-				if (!jeb-&gt;first_node)</div><div class='del'>-					jeb-&gt;first_node = raw;</div><div class='del'>-				if (jeb-&gt;last_node)</div><div class='del'>-					jeb-&gt;last_node-&gt;next_phys = raw;</div><div class='del'>-				jeb-&gt;last_node = raw;</div><div class='del'>-				*pseudo_random += je32_to_cpu(spi-&gt;version);</div><div class='add'>+				sum_link_node_ref(c, jeb, je32_to_cpu(spi-&gt;offset) | REF_UNCHECKED,</div><div class='add'>+						  PAD(je32_to_cpu(spi-&gt;totlen)), ic);</div><div class='ctx'> </div><div class='del'>-				UNCHECKED_SPACE(PAD(je32_to_cpu(spi-&gt;totlen)));</div><div class='add'>+				*pseudo_random += je32_to_cpu(spi-&gt;version);</div><div class='ctx'> </div><div class='ctx'> 				sp += JFFS2_SUMMARY_INODE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -354,52 +429,33 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras</div><div class='ctx'> 				struct jffs2_sum_dirent_flash *spd;</div><div class='ctx'> 				spd = sp;</div><div class='ctx'> </div><div class='del'>-				dbg_summary("Dirent at 0x%08x\n",</div><div class='del'>-							jeb-&gt;offset + je32_to_cpu(spd-&gt;offset));</div><div class='add'>+				dbg_summary("Dirent at 0x%08x-0x%08x\n",</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spd-&gt;offset),</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spd-&gt;offset) + je32_to_cpu(spd-&gt;totlen));</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 				fd = jffs2_alloc_full_dirent(spd-&gt;nsize+1);</div><div class='del'>-				if (!fd) {</div><div class='del'>-					kfree(summary);</div><div class='add'>+				if (!fd)</div><div class='ctx'> 					return -ENOMEM;</div><div class='del'>-				}</div><div class='ctx'> </div><div class='ctx'> 				memcpy(&amp;fd-&gt;name, spd-&gt;name, spd-&gt;nsize);</div><div class='ctx'> 				fd-&gt;name[spd-&gt;nsize] = 0;</div><div class='ctx'> </div><div class='del'>-				raw = jffs2_alloc_raw_node_ref();</div><div class='del'>-				if (!raw) {</div><div class='del'>-					jffs2_free_full_dirent(fd);</div><div class='del'>-					JFFS2_NOTICE("allocation of node reference failed\n");</div><div class='del'>-					kfree(summary);</div><div class='del'>-					return -ENOMEM;</div><div class='del'>-				}</div><div class='del'>-</div><div class='ctx'> 				ic = jffs2_scan_make_ino_cache(c, je32_to_cpu(spd-&gt;pino));</div><div class='ctx'> 				if (!ic) {</div><div class='ctx'> 					jffs2_free_full_dirent(fd);</div><div class='del'>-					jffs2_free_raw_node_ref(raw);</div><div class='del'>-					kfree(summary);</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				raw-&gt;__totlen = PAD(je32_to_cpu(spd-&gt;totlen));</div><div class='del'>-				raw-&gt;flash_offset = (jeb-&gt;offset + je32_to_cpu(spd-&gt;offset)) | REF_PRISTINE;</div><div class='del'>-				raw-&gt;next_phys = NULL;</div><div class='del'>-				raw-&gt;next_in_ino = ic-&gt;nodes;</div><div class='del'>-				ic-&gt;nodes = raw;</div><div class='del'>-				if (!jeb-&gt;first_node)</div><div class='del'>-					jeb-&gt;first_node = raw;</div><div class='del'>-				if (jeb-&gt;last_node)</div><div class='del'>-					jeb-&gt;last_node-&gt;next_phys = raw;</div><div class='del'>-				jeb-&gt;last_node = raw;</div><div class='del'>-</div><div class='del'>-				fd-&gt;raw = raw;</div><div class='add'>+				fd-&gt;raw = sum_link_node_ref(c, jeb,  je32_to_cpu(spd-&gt;offset) | REF_UNCHECKED,</div><div class='add'>+							    PAD(je32_to_cpu(spd-&gt;totlen)), ic);</div><div class='add'>+</div><div class='ctx'> 				fd-&gt;next = NULL;</div><div class='ctx'> 				fd-&gt;version = je32_to_cpu(spd-&gt;version);</div><div class='ctx'> 				fd-&gt;ino = je32_to_cpu(spd-&gt;ino);</div><div class='ctx'> 				fd-&gt;nhash = full_name_hash(fd-&gt;name, spd-&gt;nsize);</div><div class='ctx'> 				fd-&gt;type = spd-&gt;type;</div><div class='del'>-				USED_SPACE(PAD(je32_to_cpu(spd-&gt;totlen)));</div><div class='add'>+</div><div class='ctx'> 				jffs2_add_fd_to_list(c, fd, &amp;ic-&gt;scan_dents);</div><div class='ctx'> </div><div class='ctx'> 				*pseudo_random += je32_to_cpu(spd-&gt;version);</div><div class='hunk'>@@ -408,48 +464,100 @@ static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eras</div><div class='ctx'> </div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+			case JFFS2_NODETYPE_XATTR: {</div><div class='add'>+				struct jffs2_xattr_datum *xd;</div><div class='add'>+				struct jffs2_sum_xattr_flash *spx;</div><div class='add'>+</div><div class='add'>+				spx = (struct jffs2_sum_xattr_flash *)sp;</div><div class='add'>+				dbg_summary("xattr at %#08x-%#08x (xid=%u, version=%u)\n", </div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spx-&gt;offset),</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spx-&gt;offset) + je32_to_cpu(spx-&gt;totlen),</div><div class='add'>+					    je32_to_cpu(spx-&gt;xid), je32_to_cpu(spx-&gt;version));</div><div class='add'>+</div><div class='add'>+				xd = jffs2_setup_xattr_datum(c, je32_to_cpu(spx-&gt;xid),</div><div class='add'>+								je32_to_cpu(spx-&gt;version));</div><div class='add'>+				if (IS_ERR(xd))</div><div class='add'>+					return PTR_ERR(xd);</div><div class='add'>+				if (xd-&gt;version &gt; je32_to_cpu(spx-&gt;version)) {</div><div class='add'>+					/* node is not the newest one */</div><div class='add'>+					struct jffs2_raw_node_ref *raw</div><div class='add'>+						= sum_link_node_ref(c, jeb, je32_to_cpu(spx-&gt;offset) | REF_UNCHECKED,</div><div class='add'>+								    PAD(je32_to_cpu(spx-&gt;totlen)), NULL);</div><div class='add'>+					raw-&gt;next_in_ino = xd-&gt;node-&gt;next_in_ino;</div><div class='add'>+					xd-&gt;node-&gt;next_in_ino = raw;</div><div class='add'>+				} else {</div><div class='add'>+					xd-&gt;version = je32_to_cpu(spx-&gt;version);</div><div class='add'>+					sum_link_node_ref(c, jeb, je32_to_cpu(spx-&gt;offset) | REF_UNCHECKED,</div><div class='add'>+							  PAD(je32_to_cpu(spx-&gt;totlen)), (void *)xd);</div><div class='add'>+				}</div><div class='add'>+				*pseudo_random += je32_to_cpu(spx-&gt;xid);</div><div class='add'>+				sp += JFFS2_SUMMARY_XATTR_SIZE;</div><div class='add'>+</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case JFFS2_NODETYPE_XREF: {</div><div class='add'>+				struct jffs2_xattr_ref *ref;</div><div class='add'>+				struct jffs2_sum_xref_flash *spr;</div><div class='add'>+</div><div class='add'>+				spr = (struct jffs2_sum_xref_flash *)sp;</div><div class='add'>+				dbg_summary("xref at %#08x-%#08x\n",</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spr-&gt;offset),</div><div class='add'>+					    jeb-&gt;offset + je32_to_cpu(spr-&gt;offset) + </div><div class='add'>+					    (uint32_t)PAD(sizeof(struct jffs2_raw_xref)));</div><div class='add'>+</div><div class='add'>+				ref = jffs2_alloc_xattr_ref();</div><div class='add'>+				if (!ref) {</div><div class='add'>+					JFFS2_NOTICE("allocation of xattr_datum failed\n");</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+				}</div><div class='add'>+				ref-&gt;next = c-&gt;xref_temp;</div><div class='add'>+				c-&gt;xref_temp = ref;</div><div class='add'>+</div><div class='add'>+				sum_link_node_ref(c, jeb, je32_to_cpu(spr-&gt;offset) | REF_UNCHECKED,</div><div class='add'>+						  PAD(sizeof(struct jffs2_raw_xref)), (void *)ref);</div><div class='add'>+</div><div class='add'>+				*pseudo_random += ref-&gt;node-&gt;flash_offset;</div><div class='add'>+				sp += JFFS2_SUMMARY_XREF_SIZE;</div><div class='ctx'> </div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='ctx'> 			default : {</div><div class='del'>-				JFFS2_WARNING("Unsupported node type found in summary! Exiting...");</div><div class='del'>-				kfree(summary);</div><div class='del'>-				return -EIO;</div><div class='add'>+				uint16_t nodetype = je16_to_cpu(((struct jffs2_sum_unknown_flash *)sp)-&gt;nodetype);</div><div class='add'>+				JFFS2_WARNING("Unsupported node type %x found in summary! Exiting...\n", nodetype);</div><div class='add'>+				if ((nodetype &amp; JFFS2_COMPAT_MASK) == JFFS2_FEATURE_INCOMPAT)</div><div class='add'>+					return -EIO;</div><div class='add'>+</div><div class='add'>+				/* For compatible node types, just fall back to the full scan */</div><div class='add'>+				c-&gt;wasted_size -= jeb-&gt;wasted_size;</div><div class='add'>+				c-&gt;free_size += c-&gt;sector_size - jeb-&gt;free_size;</div><div class='add'>+				c-&gt;used_size -= jeb-&gt;used_size;</div><div class='add'>+				c-&gt;dirty_size -= jeb-&gt;dirty_size;</div><div class='add'>+				jeb-&gt;wasted_size = jeb-&gt;used_size = jeb-&gt;dirty_size = 0;</div><div class='add'>+				jeb-&gt;free_size = c-&gt;sector_size;</div><div class='add'>+</div><div class='add'>+				jffs2_free_jeb_node_refs(c, jeb);</div><div class='add'>+				return -ENOTRECOVERABLE;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	kfree(summary);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Process the summary node - called from jffs2_scan_eraseblock() */</div><div class='del'>-</div><div class='ctx'> int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='del'>-				uint32_t ofs, uint32_t *pseudo_random)</div><div class='add'>+			   struct jffs2_raw_summary *summary, uint32_t sumsize,</div><div class='add'>+			   uint32_t *pseudo_random)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_unknown_node crcnode;</div><div class='del'>-	struct jffs2_raw_node_ref *cache_ref;</div><div class='del'>-	struct jffs2_raw_summary *summary;</div><div class='del'>-	int ret, sumsize;</div><div class='add'>+	int ret, ofs;</div><div class='ctx'> 	uint32_t crc;</div><div class='ctx'> </div><div class='del'>-	sumsize = c-&gt;sector_size - ofs;</div><div class='del'>-	ofs += jeb-&gt;offset;</div><div class='add'>+	ofs = c-&gt;sector_size - sumsize;</div><div class='ctx'> </div><div class='ctx'> 	dbg_summary("summary found for 0x%08x at 0x%08x (0x%x bytes)\n",</div><div class='del'>-				jeb-&gt;offset, ofs, sumsize);</div><div class='del'>-</div><div class='del'>-	summary = kmalloc(sumsize, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!summary) {</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = jffs2_fill_scan_buf(c, (unsigned char *)summary, ofs, sumsize);</div><div class='del'>-</div><div class='del'>-	if (ret) {</div><div class='del'>-		kfree(summary);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+		    jeb-&gt;offset, jeb-&gt;offset + ofs, sumsize);</div><div class='ctx'> </div><div class='ctx'> 	/* OK, now check for node validity and CRC */</div><div class='ctx'> 	crcnode.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);</div><div class='hunk'>@@ -486,66 +594,49 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb</div><div class='ctx'> </div><div class='ctx'> 		dbg_summary("Summary : CLEANMARKER node \n");</div><div class='ctx'> </div><div class='add'>+		ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='ctx'> 		if (je32_to_cpu(summary-&gt;cln_mkr) != c-&gt;cleanmarker_size) {</div><div class='ctx'> 			dbg_summary("CLEANMARKER node has totlen 0x%x != normal 0x%x\n",</div><div class='ctx'> 				je32_to_cpu(summary-&gt;cln_mkr), c-&gt;cleanmarker_size);</div><div class='del'>-			UNCHECKED_SPACE(PAD(je32_to_cpu(summary-&gt;cln_mkr)));</div><div class='add'>+			if ((ret = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(summary-&gt;cln_mkr)))))</div><div class='add'>+				return ret;</div><div class='ctx'> 		} else if (jeb-&gt;first_node) {</div><div class='ctx'> 			dbg_summary("CLEANMARKER node not first node in block "</div><div class='ctx'> 					"(0x%08x)\n", jeb-&gt;offset);</div><div class='del'>-			UNCHECKED_SPACE(PAD(je32_to_cpu(summary-&gt;cln_mkr)));</div><div class='add'>+			if ((ret = jffs2_scan_dirty_space(c, jeb, PAD(je32_to_cpu(summary-&gt;cln_mkr)))))</div><div class='add'>+				return ret;</div><div class='ctx'> 		} else {</div><div class='del'>-			struct jffs2_raw_node_ref *marker_ref = jffs2_alloc_raw_node_ref();</div><div class='del'>-</div><div class='del'>-			if (!marker_ref) {</div><div class='del'>-				JFFS2_NOTICE("Failed to allocate node ref for clean marker\n");</div><div class='del'>-				kfree(summary);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			marker_ref-&gt;next_in_ino = NULL;</div><div class='del'>-			marker_ref-&gt;next_phys = NULL;</div><div class='del'>-			marker_ref-&gt;flash_offset = jeb-&gt;offset | REF_NORMAL;</div><div class='del'>-			marker_ref-&gt;__totlen = je32_to_cpu(summary-&gt;cln_mkr);</div><div class='del'>-			jeb-&gt;first_node = jeb-&gt;last_node = marker_ref;</div><div class='del'>-</div><div class='del'>-			USED_SPACE( PAD(je32_to_cpu(summary-&gt;cln_mkr)) );</div><div class='add'>+			jffs2_link_node_ref(c, jeb, jeb-&gt;offset | REF_NORMAL,</div><div class='add'>+					    je32_to_cpu(summary-&gt;cln_mkr), NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (je32_to_cpu(summary-&gt;padded)) {</div><div class='del'>-		DIRTY_SPACE(je32_to_cpu(summary-&gt;padded));</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ret = jffs2_sum_process_sum_data(c, jeb, summary, pseudo_random);</div><div class='add'>+	/* -ENOTRECOVERABLE isn't a fatal error -- it means we should do a full</div><div class='add'>+	   scan of this eraseblock. So return zero */</div><div class='add'>+	if (ret == -ENOTRECOVERABLE)</div><div class='add'>+		return 0;</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		return ret;		/* real error */</div><div class='ctx'> </div><div class='ctx'> 	/* for PARANOIA_CHECK */</div><div class='del'>-	cache_ref = jffs2_alloc_raw_node_ref();</div><div class='del'>-</div><div class='del'>-	if (!cache_ref) {</div><div class='del'>-		JFFS2_NOTICE("Failed to allocate node ref for cache\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cache_ref-&gt;next_in_ino = NULL;</div><div class='del'>-	cache_ref-&gt;next_phys = NULL;</div><div class='del'>-	cache_ref-&gt;flash_offset = ofs | REF_NORMAL;</div><div class='del'>-	cache_ref-&gt;__totlen = sumsize;</div><div class='del'>-</div><div class='del'>-	if (!jeb-&gt;first_node)</div><div class='del'>-		jeb-&gt;first_node = cache_ref;</div><div class='del'>-	if (jeb-&gt;last_node)</div><div class='del'>-		jeb-&gt;last_node-&gt;next_phys = cache_ref;</div><div class='del'>-	jeb-&gt;last_node = cache_ref;</div><div class='add'>+	ret = jffs2_prealloc_raw_node_refs(c, jeb, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	USED_SPACE(sumsize);</div><div class='add'>+	sum_link_node_ref(c, jeb, ofs | REF_NORMAL, sumsize, NULL);</div><div class='ctx'> </div><div class='del'>-	jeb-&gt;wasted_size += jeb-&gt;free_size;</div><div class='del'>-	c-&gt;wasted_size += jeb-&gt;free_size;</div><div class='del'>-	c-&gt;free_size -= jeb-&gt;free_size;</div><div class='del'>-	jeb-&gt;free_size = 0;</div><div class='add'>+	if (unlikely(jeb-&gt;free_size)) {</div><div class='add'>+		JFFS2_WARNING("Free size 0x%x bytes in eraseblock @0x%08x with summary?\n",</div><div class='add'>+			      jeb-&gt;free_size, jeb-&gt;offset);</div><div class='add'>+		jeb-&gt;wasted_size += jeb-&gt;free_size;</div><div class='add'>+		c-&gt;wasted_size += jeb-&gt;free_size;</div><div class='add'>+		c-&gt;free_size -= jeb-&gt;free_size;</div><div class='add'>+		jeb-&gt;free_size = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return jffs2_scan_classify_jeb(c, jeb);</div><div class='ctx'> </div><div class='hunk'>@@ -564,6 +655,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 	union jffs2_sum_mem *temp;</div><div class='ctx'> 	struct jffs2_sum_marker *sm;</div><div class='ctx'> 	struct kvec vecs[2];</div><div class='add'>+	uint32_t sum_ofs;</div><div class='ctx'> 	void *wpage;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t retlen;</div><div class='hunk'>@@ -581,16 +673,17 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 	wpage = c-&gt;summary-&gt;sum_buf;</div><div class='ctx'> </div><div class='ctx'> 	while (c-&gt;summary-&gt;sum_num) {</div><div class='add'>+		temp = c-&gt;summary-&gt;sum_list_head;</div><div class='ctx'> </div><div class='del'>-		switch (je16_to_cpu(c-&gt;summary-&gt;sum_list_head-&gt;u.nodetype)) {</div><div class='add'>+		switch (je16_to_cpu(temp-&gt;u.nodetype)) {</div><div class='ctx'> 			case JFFS2_NODETYPE_INODE: {</div><div class='ctx'> 				struct jffs2_sum_inode_flash *sino_ptr = wpage;</div><div class='ctx'> </div><div class='del'>-				sino_ptr-&gt;nodetype = c-&gt;summary-&gt;sum_list_head-&gt;i.nodetype;</div><div class='del'>-				sino_ptr-&gt;inode = c-&gt;summary-&gt;sum_list_head-&gt;i.inode;</div><div class='del'>-				sino_ptr-&gt;version = c-&gt;summary-&gt;sum_list_head-&gt;i.version;</div><div class='del'>-				sino_ptr-&gt;offset = c-&gt;summary-&gt;sum_list_head-&gt;i.offset;</div><div class='del'>-				sino_ptr-&gt;totlen = c-&gt;summary-&gt;sum_list_head-&gt;i.totlen;</div><div class='add'>+				sino_ptr-&gt;nodetype = temp-&gt;i.nodetype;</div><div class='add'>+				sino_ptr-&gt;inode = temp-&gt;i.inode;</div><div class='add'>+				sino_ptr-&gt;version = temp-&gt;i.version;</div><div class='add'>+				sino_ptr-&gt;offset = temp-&gt;i.offset;</div><div class='add'>+				sino_ptr-&gt;totlen = temp-&gt;i.totlen;</div><div class='ctx'> </div><div class='ctx'> 				wpage += JFFS2_SUMMARY_INODE_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -600,30 +693,60 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 			case JFFS2_NODETYPE_DIRENT: {</div><div class='ctx'> 				struct jffs2_sum_dirent_flash *sdrnt_ptr = wpage;</div><div class='ctx'> </div><div class='del'>-				sdrnt_ptr-&gt;nodetype = c-&gt;summary-&gt;sum_list_head-&gt;d.nodetype;</div><div class='del'>-				sdrnt_ptr-&gt;totlen = c-&gt;summary-&gt;sum_list_head-&gt;d.totlen;</div><div class='del'>-				sdrnt_ptr-&gt;offset = c-&gt;summary-&gt;sum_list_head-&gt;d.offset;</div><div class='del'>-				sdrnt_ptr-&gt;pino = c-&gt;summary-&gt;sum_list_head-&gt;d.pino;</div><div class='del'>-				sdrnt_ptr-&gt;version = c-&gt;summary-&gt;sum_list_head-&gt;d.version;</div><div class='del'>-				sdrnt_ptr-&gt;ino = c-&gt;summary-&gt;sum_list_head-&gt;d.ino;</div><div class='del'>-				sdrnt_ptr-&gt;nsize = c-&gt;summary-&gt;sum_list_head-&gt;d.nsize;</div><div class='del'>-				sdrnt_ptr-&gt;type = c-&gt;summary-&gt;sum_list_head-&gt;d.type;</div><div class='add'>+				sdrnt_ptr-&gt;nodetype = temp-&gt;d.nodetype;</div><div class='add'>+				sdrnt_ptr-&gt;totlen = temp-&gt;d.totlen;</div><div class='add'>+				sdrnt_ptr-&gt;offset = temp-&gt;d.offset;</div><div class='add'>+				sdrnt_ptr-&gt;pino = temp-&gt;d.pino;</div><div class='add'>+				sdrnt_ptr-&gt;version = temp-&gt;d.version;</div><div class='add'>+				sdrnt_ptr-&gt;ino = temp-&gt;d.ino;</div><div class='add'>+				sdrnt_ptr-&gt;nsize = temp-&gt;d.nsize;</div><div class='add'>+				sdrnt_ptr-&gt;type = temp-&gt;d.type;</div><div class='ctx'> </div><div class='del'>-				memcpy(sdrnt_ptr-&gt;name, c-&gt;summary-&gt;sum_list_head-&gt;d.name,</div><div class='del'>-							c-&gt;summary-&gt;sum_list_head-&gt;d.nsize);</div><div class='add'>+				memcpy(sdrnt_ptr-&gt;name, temp-&gt;d.name,</div><div class='add'>+							temp-&gt;d.nsize);</div><div class='ctx'> </div><div class='del'>-				wpage += JFFS2_SUMMARY_DIRENT_SIZE(c-&gt;summary-&gt;sum_list_head-&gt;d.nsize);</div><div class='add'>+				wpage += JFFS2_SUMMARY_DIRENT_SIZE(temp-&gt;d.nsize);</div><div class='ctx'> </div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+			case JFFS2_NODETYPE_XATTR: {</div><div class='add'>+				struct jffs2_sum_xattr_flash *sxattr_ptr = wpage;</div><div class='add'>+</div><div class='add'>+				temp = c-&gt;summary-&gt;sum_list_head;</div><div class='add'>+				sxattr_ptr-&gt;nodetype = temp-&gt;x.nodetype;</div><div class='add'>+				sxattr_ptr-&gt;xid = temp-&gt;x.xid;</div><div class='add'>+				sxattr_ptr-&gt;version = temp-&gt;x.version;</div><div class='add'>+				sxattr_ptr-&gt;offset = temp-&gt;x.offset;</div><div class='add'>+				sxattr_ptr-&gt;totlen = temp-&gt;x.totlen;</div><div class='add'>+</div><div class='add'>+				wpage += JFFS2_SUMMARY_XATTR_SIZE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case JFFS2_NODETYPE_XREF: {</div><div class='add'>+				struct jffs2_sum_xref_flash *sxref_ptr = wpage;</div><div class='add'>+</div><div class='add'>+				temp = c-&gt;summary-&gt;sum_list_head;</div><div class='add'>+				sxref_ptr-&gt;nodetype = temp-&gt;r.nodetype;</div><div class='add'>+				sxref_ptr-&gt;offset = temp-&gt;r.offset;</div><div class='ctx'> </div><div class='add'>+				wpage += JFFS2_SUMMARY_XREF_SIZE;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+#endif</div><div class='ctx'> 			default : {</div><div class='del'>-				BUG();	/* unknown node in summary information */</div><div class='add'>+				if ((je16_to_cpu(temp-&gt;u.nodetype) &amp; JFFS2_COMPAT_MASK)</div><div class='add'>+				    == JFFS2_FEATURE_RWCOMPAT_COPY) {</div><div class='add'>+					dbg_summary("Writing unknown RWCOMPAT_COPY node type %x\n",</div><div class='add'>+						    je16_to_cpu(temp-&gt;u.nodetype));</div><div class='add'>+					jffs2_sum_disable_collecting(c-&gt;summary);</div><div class='add'>+				} else {</div><div class='add'>+					BUG();	/* unknown node in summary information */</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		temp = c-&gt;summary-&gt;sum_list_head;</div><div class='del'>-		c-&gt;summary-&gt;sum_list_head = c-&gt;summary-&gt;sum_list_head-&gt;u.next;</div><div class='add'>+		c-&gt;summary-&gt;sum_list_head = temp-&gt;u.next;</div><div class='ctx'> 		kfree(temp);</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;summary-&gt;sum_num--;</div><div class='hunk'>@@ -645,25 +768,34 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 	vecs[1].iov_base = c-&gt;summary-&gt;sum_buf;</div><div class='ctx'> 	vecs[1].iov_len = datasize;</div><div class='ctx'> </div><div class='del'>-	dbg_summary("JFFS2: writing out data to flash to pos : 0x%08x\n",</div><div class='del'>-			jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size);</div><div class='add'>+	sum_ofs = jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	ret = jffs2_flash_writev(c, vecs, 2, jeb-&gt;offset + c-&gt;sector_size -</div><div class='del'>-				jeb-&gt;free_size, &amp;retlen, 0);</div><div class='del'>-	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	dbg_summary("JFFS2: writing out data to flash to pos : 0x%08x\n",</div><div class='add'>+		    sum_ofs);</div><div class='ctx'> </div><div class='add'>+	ret = jffs2_flash_writev(c, vecs, 2, sum_ofs, &amp;retlen, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (ret || (retlen != infosize)) {</div><div class='del'>-		JFFS2_WARNING("Write of %zd bytes at 0x%08x failed. returned %d, retlen %zd\n",</div><div class='del'>-			infosize, jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size, ret, retlen);</div><div class='add'>+</div><div class='add'>+		JFFS2_WARNING("Write of %u bytes at 0x%08x failed. returned %d, retlen %zd\n",</div><div class='add'>+			      infosize, sum_ofs, ret, retlen);</div><div class='add'>+</div><div class='add'>+		if (retlen) {</div><div class='add'>+			/* Waste remaining space */</div><div class='add'>+			spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+			jffs2_link_node_ref(c, jeb, sum_ofs | REF_OBSOLETE, infosize, NULL);</div><div class='add'>+			spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		c-&gt;summary-&gt;sum_size = JFFS2_SUMMARY_NOSUM_SIZE;</div><div class='del'>-		WASTED_SPACE(infosize);</div><div class='ctx'> </div><div class='del'>-		return 1;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	jffs2_link_node_ref(c, jeb, sum_ofs | REF_NORMAL, infosize, NULL);</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -671,13 +803,16 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> </div><div class='ctx'> int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *summary_ref;</div><div class='del'>-	int datasize, infosize, padsize, ret;</div><div class='add'>+	int datasize, infosize, padsize;</div><div class='ctx'> 	struct jffs2_eraseblock *jeb;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dbg_summary("called\n");</div><div class='ctx'> </div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='ctx'> 	jeb = c-&gt;nextblock;</div><div class='add'>+	jffs2_prealloc_raw_node_refs(c, jeb, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (!c-&gt;summary-&gt;sum_num || !c-&gt;summary-&gt;sum_list_head) {</div><div class='ctx'> 		JFFS2_WARNING("Empty summary info!!!\n");</div><div class='hunk'>@@ -696,35 +831,11 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)</div><div class='ctx'> 		jffs2_sum_disable_collecting(c-&gt;summary);</div><div class='ctx'> </div><div class='ctx'> 		JFFS2_WARNING("Not enough space for summary, padsize = %d\n", padsize);</div><div class='add'>+		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = jffs2_sum_write_data(c, jeb, infosize, datasize, padsize);</div><div class='del'>-	if (ret)</div><div class='del'>-		return 0; /* can't write out summary, block is marked as NOSUM_SIZE */</div><div class='del'>-</div><div class='del'>-	/* for ACCT_PARANOIA_CHECK */</div><div class='del'>-	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	summary_ref = jffs2_alloc_raw_node_ref();</div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='del'>-	if (!summary_ref) {</div><div class='del'>-		JFFS2_NOTICE("Failed to allocate node ref for summary\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	summary_ref-&gt;next_in_ino = NULL;</div><div class='del'>-	summary_ref-&gt;next_phys = NULL;</div><div class='del'>-	summary_ref-&gt;flash_offset = (jeb-&gt;offset + c-&gt;sector_size - jeb-&gt;free_size) | REF_NORMAL;</div><div class='del'>-	summary_ref-&gt;__totlen = infosize;</div><div class='del'>-</div><div class='del'>-	if (!jeb-&gt;first_node)</div><div class='del'>-		jeb-&gt;first_node = summary_ref;</div><div class='del'>-	if (jeb-&gt;last_node)</div><div class='del'>-		jeb-&gt;last_node-&gt;next_phys = summary_ref;</div><div class='del'>-	jeb-&gt;last_node = summary_ref;</div><div class='del'>-</div><div class='del'>-	USED_SPACE(infosize);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/fs/jffs2/summary.h b/fs/jffs2/summary.h<br/>index b7a678be1709..6bf1f6aa4552 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/summary.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/summary.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/summary.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/summary.h</a></div><div class='hunk'>@@ -18,23 +18,6 @@</div><div class='ctx'> #include &lt;linux/uio.h&gt;</div><div class='ctx'> #include &lt;linux/jffs2.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DIRTY_SPACE(x) do { typeof(x) _x = (x); \</div><div class='del'>-		c-&gt;free_size -= _x; c-&gt;dirty_size += _x; \</div><div class='del'>-		jeb-&gt;free_size -= _x ; jeb-&gt;dirty_size += _x; \</div><div class='del'>-		}while(0)</div><div class='del'>-#define USED_SPACE(x) do { typeof(x) _x = (x); \</div><div class='del'>-		c-&gt;free_size -= _x; c-&gt;used_size += _x; \</div><div class='del'>-		jeb-&gt;free_size -= _x ; jeb-&gt;used_size += _x; \</div><div class='del'>-		}while(0)</div><div class='del'>-#define WASTED_SPACE(x) do { typeof(x) _x = (x); \</div><div class='del'>-		c-&gt;free_size -= _x; c-&gt;wasted_size += _x; \</div><div class='del'>-		jeb-&gt;free_size -= _x ; jeb-&gt;wasted_size += _x; \</div><div class='del'>-		}while(0)</div><div class='del'>-#define UNCHECKED_SPACE(x) do { typeof(x) _x = (x); \</div><div class='del'>-		c-&gt;free_size -= _x; c-&gt;unchecked_size += _x; \</div><div class='del'>-		jeb-&gt;free_size -= _x ; jeb-&gt;unchecked_size += _x; \</div><div class='del'>-		}while(0)</div><div class='del'>-</div><div class='ctx'> #define BLK_STATE_ALLFF		0</div><div class='ctx'> #define BLK_STATE_CLEAN		1</div><div class='ctx'> #define BLK_STATE_PARTDIRTY	2</div><div class='hunk'>@@ -45,6 +28,8 @@</div><div class='ctx'> #define JFFS2_SUMMARY_NOSUM_SIZE 0xffffffff</div><div class='ctx'> #define JFFS2_SUMMARY_INODE_SIZE (sizeof(struct jffs2_sum_inode_flash))</div><div class='ctx'> #define JFFS2_SUMMARY_DIRENT_SIZE(x) (sizeof(struct jffs2_sum_dirent_flash) + (x))</div><div class='add'>+#define JFFS2_SUMMARY_XATTR_SIZE (sizeof(struct jffs2_sum_xattr_flash))</div><div class='add'>+#define JFFS2_SUMMARY_XREF_SIZE (sizeof(struct jffs2_sum_xref_flash))</div><div class='ctx'> </div><div class='ctx'> /* Summary structures used on flash */</div><div class='ctx'> </div><div class='hunk'>@@ -75,11 +60,28 @@ struct jffs2_sum_dirent_flash</div><div class='ctx'> 	uint8_t name[0];	/* dirent name */</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='add'>+struct jffs2_sum_xattr_flash</div><div class='add'>+{</div><div class='add'>+	jint16_t nodetype;	/* == JFFS2_NODETYPE_XATR */</div><div class='add'>+	jint32_t xid;		/* xattr identifier */</div><div class='add'>+	jint32_t version;	/* version number */</div><div class='add'>+	jint32_t offset;	/* offset on jeb */</div><div class='add'>+	jint32_t totlen;	/* node length */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct jffs2_sum_xref_flash</div><div class='add'>+{</div><div class='add'>+	jint16_t nodetype;	/* == JFFS2_NODETYPE_XREF */</div><div class='add'>+	jint32_t offset;	/* offset on jeb */</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='ctx'> union jffs2_sum_flash</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_sum_unknown_flash u;</div><div class='ctx'> 	struct jffs2_sum_inode_flash i;</div><div class='ctx'> 	struct jffs2_sum_dirent_flash d;</div><div class='add'>+	struct jffs2_sum_xattr_flash x;</div><div class='add'>+	struct jffs2_sum_xref_flash r;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Summary structures used in the memory */</div><div class='hunk'>@@ -114,11 +116,30 @@ struct jffs2_sum_dirent_mem</div><div class='ctx'> 	uint8_t name[0];	/* dirent name */</div><div class='ctx'> } __attribute__((packed));</div><div class='ctx'> </div><div class='add'>+struct jffs2_sum_xattr_mem</div><div class='add'>+{</div><div class='add'>+	union jffs2_sum_mem *next;</div><div class='add'>+	jint16_t nodetype;</div><div class='add'>+	jint32_t xid;</div><div class='add'>+	jint32_t version;</div><div class='add'>+	jint32_t offset;</div><div class='add'>+	jint32_t totlen;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='add'>+struct jffs2_sum_xref_mem</div><div class='add'>+{</div><div class='add'>+	union jffs2_sum_mem *next;</div><div class='add'>+	jint16_t nodetype;</div><div class='add'>+	jint32_t offset;</div><div class='add'>+} __attribute__((packed));</div><div class='add'>+</div><div class='ctx'> union jffs2_sum_mem</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_sum_unknown_mem u;</div><div class='ctx'> 	struct jffs2_sum_inode_mem i;</div><div class='ctx'> 	struct jffs2_sum_dirent_mem d;</div><div class='add'>+	struct jffs2_sum_xattr_mem x;</div><div class='add'>+	struct jffs2_sum_xref_mem r;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Summary related information stored in superblock */</div><div class='hunk'>@@ -159,8 +180,11 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c);</div><div class='ctx'> int jffs2_sum_add_padding_mem(struct jffs2_summary *s, uint32_t size);</div><div class='ctx'> int jffs2_sum_add_inode_mem(struct jffs2_summary *s, struct jffs2_raw_inode *ri, uint32_t ofs);</div><div class='ctx'> int jffs2_sum_add_dirent_mem(struct jffs2_summary *s, struct jffs2_raw_dirent *rd, uint32_t ofs);</div><div class='add'>+int jffs2_sum_add_xattr_mem(struct jffs2_summary *s, struct jffs2_raw_xattr *rx, uint32_t ofs);</div><div class='add'>+int jffs2_sum_add_xref_mem(struct jffs2_summary *s, struct jffs2_raw_xref *rr, uint32_t ofs);</div><div class='ctx'> int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,</div><div class='del'>-			uint32_t ofs, uint32_t *pseudo_random);</div><div class='add'>+			   struct jffs2_raw_summary *summary, uint32_t sumlen,</div><div class='add'>+			   uint32_t *pseudo_random);</div><div class='ctx'> </div><div class='ctx'> #else				/* SUMMARY DISABLED */</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +200,9 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb</div><div class='ctx'> #define jffs2_sum_add_padding_mem(a,b)</div><div class='ctx'> #define jffs2_sum_add_inode_mem(a,b,c)</div><div class='ctx'> #define jffs2_sum_add_dirent_mem(a,b,c)</div><div class='del'>-#define jffs2_sum_scan_sumnode(a,b,c,d) (0)</div><div class='add'>+#define jffs2_sum_add_xattr_mem(a,b,c)</div><div class='add'>+#define jffs2_sum_add_xref_mem(a,b,c)</div><div class='add'>+#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_JFFS2_SUMMARY */</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c<br/>index ffd8e84b22cc..68e3953419b4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/super.c</a></div><div class='hunk'>@@ -11,7 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -111,9 +110,10 @@ static int jffs2_sb_set(struct super_block *sb, void *data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type,</div><div class='del'>-					      int flags, const char *dev_name,</div><div class='del'>-					      void *data, struct mtd_info *mtd)</div><div class='add'>+static int jffs2_get_sb_mtd(struct file_system_type *fs_type,</div><div class='add'>+			    int flags, const char *dev_name,</div><div class='add'>+			    void *data, struct mtd_info *mtd,</div><div class='add'>+			    struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *sb;</div><div class='ctx'> 	struct jffs2_sb_info *c;</div><div class='hunk'>@@ -121,19 +121,20 @@ static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type,</div><div class='ctx'> </div><div class='ctx'> 	c = kmalloc(sizeof(*c), GFP_KERNEL);</div><div class='ctx'> 	if (!c)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	memset(c, 0, sizeof(*c));</div><div class='ctx'> 	c-&gt;mtd = mtd;</div><div class='ctx'> </div><div class='ctx'> 	sb = sget(fs_type, jffs2_sb_compare, jffs2_sb_set, c);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(sb))</div><div class='del'>-		goto out_put;</div><div class='add'>+		goto out_error;</div><div class='ctx'> </div><div class='ctx'> 	if (sb-&gt;s_root) {</div><div class='ctx'> 		/* New mountpoint for JFFS2 which is already mounted */</div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2_get_sb_mtd(): Device %d (\"%s\") is already mounted\n",</div><div class='ctx'> 			  mtd-&gt;index, mtd-&gt;name));</div><div class='add'>+		ret = simple_set_mnt(mnt, sb);</div><div class='ctx'> 		goto out_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -151,51 +152,57 @@ static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type,</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_op = &amp;jffs2_super_operations;</div><div class='ctx'> 	sb-&gt;s_flags = flags | MS_NOATIME;</div><div class='del'>-</div><div class='add'>+	sb-&gt;s_xattr = jffs2_xattr_handlers;</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_POSIX_ACL</div><div class='add'>+	sb-&gt;s_flags |= MS_POSIXACL;</div><div class='add'>+#endif</div><div class='ctx'> 	ret = jffs2_do_fill_super(sb, data, flags &amp; MS_SILENT ? 1 : 0);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		/* Failure case... */</div><div class='ctx'> 		up_write(&amp;sb-&gt;s_umount);</div><div class='ctx'> 		deactivate_super(sb);</div><div class='del'>-		return ERR_PTR(ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sb-&gt;s_flags |= MS_ACTIVE;</div><div class='del'>-	return sb;</div><div class='add'>+	return simple_set_mnt(mnt, sb);</div><div class='ctx'> </div><div class='add'>+out_error:</div><div class='add'>+	ret = PTR_ERR(sb);</div><div class='ctx'>  out_put:</div><div class='ctx'> 	kfree(c);</div><div class='ctx'> 	put_mtd_device(mtd);</div><div class='ctx'> </div><div class='del'>-	return sb;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *jffs2_get_sb_mtdnr(struct file_system_type *fs_type,</div><div class='del'>-					      int flags, const char *dev_name,</div><div class='del'>-					      void *data, int mtdnr)</div><div class='add'>+static int jffs2_get_sb_mtdnr(struct file_system_type *fs_type,</div><div class='add'>+			      int flags, const char *dev_name,</div><div class='add'>+			      void *data, int mtdnr,</div><div class='add'>+			      struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtd_info *mtd;</div><div class='ctx'> </div><div class='ctx'> 	mtd = get_mtd_device(NULL, mtdnr);</div><div class='ctx'> 	if (!mtd) {</div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", mtdnr));</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd);</div><div class='add'>+	return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,</div><div class='del'>-					int flags, const char *dev_name,</div><div class='del'>-					void *data)</div><div class='add'>+static int jffs2_get_sb(struct file_system_type *fs_type,</div><div class='add'>+			int flags, const char *dev_name,</div><div class='add'>+			void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct nameidata nd;</div><div class='ctx'> 	int mtdnr;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev_name)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_get_sb(): dev_name \"%s\"\n", dev_name));</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +224,7 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 				mtd = get_mtd_device(NULL, mtdnr);</div><div class='ctx'> 				if (mtd) {</div><div class='ctx'> 					if (!strcmp(mtd-&gt;name, dev_name+4))</div><div class='del'>-						return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd);</div><div class='add'>+						return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);</div><div class='ctx'> 					put_mtd_device(mtd);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -230,7 +237,7 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 			if (!*endptr) {</div><div class='ctx'> 				/* It was a valid number */</div><div class='ctx'> 				D1(printk(KERN_DEBUG "jffs2_get_sb(): mtd%%d, mtdnr %d\n", mtdnr));</div><div class='del'>-				return jffs2_get_sb_mtdnr(fs_type, flags, dev_name, data, mtdnr);</div><div class='add'>+				return jffs2_get_sb_mtdnr(fs_type, flags, dev_name, data, mtdnr, mnt);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -244,7 +251,7 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 		  err, nd.dentry-&gt;d_inode));</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		return ERR_PTR(err);</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -266,11 +273,11 @@ static struct super_block *jffs2_get_sb(struct file_system_type *fs_type,</div><div class='ctx'> 	mtdnr = iminor(nd.dentry-&gt;d_inode);</div><div class='ctx'> 	path_release(&amp;nd);</div><div class='ctx'> </div><div class='del'>-	return jffs2_get_sb_mtdnr(fs_type, flags, dev_name, data, mtdnr);</div><div class='add'>+	return jffs2_get_sb_mtdnr(fs_type, flags, dev_name, data, mtdnr, mnt);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	path_release(&amp;nd);</div><div class='del'>-	return ERR_PTR(err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void jffs2_put_super (struct super_block *sb)</div><div class='hunk'>@@ -293,6 +300,7 @@ static void jffs2_put_super (struct super_block *sb)</div><div class='ctx'> 		kfree(c-&gt;blocks);</div><div class='ctx'> 	jffs2_flash_cleanup(c);</div><div class='ctx'> 	kfree(c-&gt;inocache_list);</div><div class='add'>+	jffs2_clear_xattr_subsystem(c);</div><div class='ctx'> 	if (c-&gt;mtd-&gt;sync)</div><div class='ctx'> 		c-&gt;mtd-&gt;sync(c-&gt;mtd);</div><div class='ctx'> </div><div class='hunk'>@@ -320,6 +328,18 @@ static int __init init_jffs2_fs(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* Paranoia checks for on-medium structures. If we ask GCC</div><div class='add'>+	   to pack them with __attribute__((packed)) then it _also_</div><div class='add'>+	   assumes that they're not aligned -- so it emits crappy</div><div class='add'>+	   code on some architectures. Ideally we want an attribute</div><div class='add'>+	   which means just 'no padding', without the alignment</div><div class='add'>+	   thing. But GCC doesn't have that -- we have to just</div><div class='add'>+	   hope the structs are the right sizes, instead. */</div><div class='add'>+	BUG_ON(sizeof(struct jffs2_unknown_node) != 12);</div><div class='add'>+	BUG_ON(sizeof(struct jffs2_raw_dirent) != 40);</div><div class='add'>+	BUG_ON(sizeof(struct jffs2_raw_inode) != 68);</div><div class='add'>+	BUG_ON(sizeof(struct jffs2_raw_summary) != 32);</div><div class='add'>+</div><div class='ctx'> 	printk(KERN_INFO "JFFS2 version 2.2."</div><div class='ctx'> #ifdef CONFIG_JFFS2_FS_WRITEBUFFER</div><div class='ctx'> 	       " (NAND)"</div><div class='hunk'>@@ -327,7 +347,7 @@ static int __init init_jffs2_fs(void)</div><div class='ctx'> #ifdef CONFIG_JFFS2_SUMMARY</div><div class='ctx'> 	       " (SUMMARY) "</div><div class='ctx'> #endif</div><div class='del'>-	       " (C) 2001-2003 Red Hat, Inc.\n");</div><div class='add'>+	       " (C) 2001-2006 Red Hat, Inc.\n");</div><div class='ctx'> </div><div class='ctx'> 	jffs2_inode_cachep = kmem_cache_create("jffs2_i",</div><div class='ctx'> 					     sizeof(struct jffs2_inode_info),</div><div class='head'>diff --git a/fs/jffs2/symlink.c b/fs/jffs2/symlink.c<br/>index d55754fe8925..fc211b6e9b03 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/symlink.c</a></div><div class='hunk'>@@ -24,7 +24,12 @@ struct inode_operations jffs2_symlink_inode_operations =</div><div class='ctx'> {</div><div class='ctx'> 	.readlink =	generic_readlink,</div><div class='ctx'> 	.follow_link =	jffs2_follow_link,</div><div class='del'>-	.setattr =	jffs2_setattr</div><div class='add'>+	.permission =	jffs2_permission,</div><div class='add'>+	.setattr =	jffs2_setattr,</div><div class='add'>+	.setxattr =	jffs2_setxattr,</div><div class='add'>+	.getxattr =	jffs2_getxattr,</div><div class='add'>+	.listxattr =	jffs2_listxattr,</div><div class='add'>+	.removexattr =	jffs2_removexattr</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void *jffs2_follow_link(struct dentry *dentry, struct nameidata *nd)</div><div class='head'>diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c<br/>index 4cebf0e57c46..b9b700730dfe 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/wbuf.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/wbuf.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/wbuf.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/wbuf.c</a></div><div class='hunk'>@@ -156,69 +156,130 @@ static void jffs2_block_refile(struct jffs2_sb_info *c, struct jffs2_eraseblock</div><div class='ctx'> 		jffs2_erase_pending_trigger(c);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Adjust its size counts accordingly */</div><div class='del'>-	c-&gt;wasted_size += jeb-&gt;free_size;</div><div class='del'>-	c-&gt;free_size -= jeb-&gt;free_size;</div><div class='del'>-	jeb-&gt;wasted_size += jeb-&gt;free_size;</div><div class='del'>-	jeb-&gt;free_size = 0;</div><div class='add'>+	if (!jffs2_prealloc_raw_node_refs(c, jeb, 1)) {</div><div class='add'>+		uint32_t oldfree = jeb-&gt;free_size;</div><div class='add'>+</div><div class='add'>+		jffs2_link_node_ref(c, jeb, </div><div class='add'>+				    (jeb-&gt;offset+c-&gt;sector_size-oldfree) | REF_OBSOLETE,</div><div class='add'>+				    oldfree, NULL);</div><div class='add'>+		/* convert to wasted */</div><div class='add'>+		c-&gt;wasted_size += oldfree;</div><div class='add'>+		jeb-&gt;wasted_size += oldfree;</div><div class='add'>+		c-&gt;dirty_size -= oldfree;</div><div class='add'>+		jeb-&gt;dirty_size -= oldfree;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg_dump_block_lists_nolock(c);</div><div class='ctx'> 	jffs2_dbg_acct_sanity_check_nolock(c,jeb);</div><div class='ctx'> 	jffs2_dbg_acct_paranoia_check_nolock(c, jeb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct jffs2_raw_node_ref **jffs2_incore_replace_raw(struct jffs2_sb_info *c,</div><div class='add'>+							    struct jffs2_inode_info *f,</div><div class='add'>+							    struct jffs2_raw_node_ref *raw,</div><div class='add'>+							    union jffs2_node_union *node)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_node_frag *frag;</div><div class='add'>+	struct jffs2_full_dirent *fd;</div><div class='add'>+</div><div class='add'>+	dbg_noderef("incore_replace_raw: node at %p is {%04x,%04x}\n",</div><div class='add'>+		    node, je16_to_cpu(node-&gt;u.magic), je16_to_cpu(node-&gt;u.nodetype));</div><div class='add'>+</div><div class='add'>+	BUG_ON(je16_to_cpu(node-&gt;u.magic) != 0x1985 &amp;&amp;</div><div class='add'>+	       je16_to_cpu(node-&gt;u.magic) != 0);</div><div class='add'>+</div><div class='add'>+	switch (je16_to_cpu(node-&gt;u.nodetype)) {</div><div class='add'>+	case JFFS2_NODETYPE_INODE:</div><div class='add'>+		if (f-&gt;metadata &amp;&amp; f-&gt;metadata-&gt;raw == raw) {</div><div class='add'>+			dbg_noderef("Will replace -&gt;raw in f-&gt;metadata at %p\n", f-&gt;metadata);</div><div class='add'>+			return &amp;f-&gt;metadata-&gt;raw;</div><div class='add'>+		}</div><div class='add'>+		frag = jffs2_lookup_node_frag(&amp;f-&gt;fragtree, je32_to_cpu(node-&gt;i.offset));</div><div class='add'>+		BUG_ON(!frag);</div><div class='add'>+		/* Find a frag which refers to the full_dnode we want to modify */</div><div class='add'>+		while (!frag-&gt;node || frag-&gt;node-&gt;raw != raw) {</div><div class='add'>+			frag = frag_next(frag);</div><div class='add'>+			BUG_ON(!frag);</div><div class='add'>+		}</div><div class='add'>+		dbg_noderef("Will replace -&gt;raw in full_dnode at %p\n", frag-&gt;node);</div><div class='add'>+		return &amp;frag-&gt;node-&gt;raw;</div><div class='add'>+</div><div class='add'>+	case JFFS2_NODETYPE_DIRENT:</div><div class='add'>+		for (fd = f-&gt;dents; fd; fd = fd-&gt;next) {</div><div class='add'>+			if (fd-&gt;raw == raw) {</div><div class='add'>+				dbg_noderef("Will replace -&gt;raw in full_dirent at %p\n", fd);</div><div class='add'>+				return &amp;fd-&gt;raw;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		BUG();</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dbg_noderef("Don't care about replacing raw for nodetype %x\n",</div><div class='add'>+			    je16_to_cpu(node-&gt;u.nodetype));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Recover from failure to write wbuf. Recover the nodes up to the</div><div class='ctx'>  * wbuf, not the one which we were starting to try to write. */</div><div class='ctx'> </div><div class='ctx'> static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_eraseblock *jeb, *new_jeb;</div><div class='del'>-	struct jffs2_raw_node_ref **first_raw, **raw;</div><div class='add'>+	struct jffs2_raw_node_ref *raw, *next, *first_raw = NULL;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	int ret;</div><div class='add'>+	int nr_refile = 0;</div><div class='ctx'> 	unsigned char *buf;</div><div class='ctx'> 	uint32_t start, end, ofs, len;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='ctx'> 	jeb = &amp;c-&gt;blocks[c-&gt;wbuf_ofs / c-&gt;sector_size];</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> 	jffs2_block_refile(c, jeb, REFILE_NOTEMPTY);</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!ref_obsolete(jeb-&gt;last_node));</div><div class='ctx'> </div><div class='ctx'> 	/* Find the first node to be recovered, by skipping over every</div><div class='ctx'> 	   node which ends before the wbuf starts, or which is obsolete. */</div><div class='del'>-	first_raw = &amp;jeb-&gt;first_node;</div><div class='del'>-	while (*first_raw &amp;&amp;</div><div class='del'>-	       (ref_obsolete(*first_raw) ||</div><div class='del'>-		(ref_offset(*first_raw)+ref_totlen(c, jeb, *first_raw)) &lt; c-&gt;wbuf_ofs)) {</div><div class='del'>-		D1(printk(KERN_DEBUG "Skipping node at 0x%08x(%d)-0x%08x which is either before 0x%08x or obsolete\n",</div><div class='del'>-			  ref_offset(*first_raw), ref_flags(*first_raw),</div><div class='del'>-			  (ref_offset(*first_raw) + ref_totlen(c, jeb, *first_raw)),</div><div class='del'>-			  c-&gt;wbuf_ofs));</div><div class='del'>-		first_raw = &amp;(*first_raw)-&gt;next_phys;</div><div class='add'>+	for (next = raw = jeb-&gt;first_node; next; raw = next) {</div><div class='add'>+		next = ref_next(raw);</div><div class='add'>+</div><div class='add'>+		if (ref_obsolete(raw) || </div><div class='add'>+		    (next &amp;&amp; ref_offset(next) &lt;= c-&gt;wbuf_ofs)) {</div><div class='add'>+			dbg_noderef("Skipping node at 0x%08x(%d)-0x%08x which is either before 0x%08x or obsolete\n",</div><div class='add'>+				    ref_offset(raw), ref_flags(raw),</div><div class='add'>+				    (ref_offset(raw) + ref_totlen(c, jeb, raw)),</div><div class='add'>+				    c-&gt;wbuf_ofs);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		dbg_noderef("First node to be recovered is at 0x%08x(%d)-0x%08x\n",</div><div class='add'>+			    ref_offset(raw), ref_flags(raw),</div><div class='add'>+			    (ref_offset(raw) + ref_totlen(c, jeb, raw)));</div><div class='add'>+</div><div class='add'>+		first_raw = raw;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!*first_raw) {</div><div class='add'>+	if (!first_raw) {</div><div class='ctx'> 		/* All nodes were obsolete. Nothing to recover. */</div><div class='ctx'> 		D1(printk(KERN_DEBUG "No non-obsolete nodes to be recovered. Just filing block bad\n"));</div><div class='del'>-		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+		c-&gt;wbuf_len = 0;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	start = ref_offset(*first_raw);</div><div class='del'>-	end = ref_offset(*first_raw) + ref_totlen(c, jeb, *first_raw);</div><div class='del'>-</div><div class='del'>-	/* Find the last node to be recovered */</div><div class='del'>-	raw = first_raw;</div><div class='del'>-	while ((*raw)) {</div><div class='del'>-		if (!ref_obsolete(*raw))</div><div class='del'>-			end = ref_offset(*raw) + ref_totlen(c, jeb, *raw);</div><div class='add'>+	start = ref_offset(first_raw);</div><div class='add'>+	end = ref_offset(jeb-&gt;last_node);</div><div class='add'>+	nr_refile = 1;</div><div class='ctx'> </div><div class='del'>-		raw = &amp;(*raw)-&gt;next_phys;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	/* Count the number of refs which need to be copied */</div><div class='add'>+	while ((raw = ref_next(raw)) != jeb-&gt;last_node)</div><div class='add'>+		nr_refile++;</div><div class='ctx'> </div><div class='del'>-	D1(printk(KERN_DEBUG "wbuf recover %08x-%08x\n", start, end));</div><div class='add'>+	dbg_noderef("wbuf recover %08x-%08x (%d bytes in %d nodes)\n",</div><div class='add'>+		    start, end, end - start, nr_refile);</div><div class='ctx'> </div><div class='ctx'> 	buf = NULL;</div><div class='ctx'> 	if (start &lt; c-&gt;wbuf_ofs) {</div><div class='hunk'>@@ -233,28 +294,37 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Do the read... */</div><div class='del'>-		if (jffs2_cleanmarker_oob(c))</div><div class='del'>-			ret = c-&gt;mtd-&gt;read_ecc(c-&gt;mtd, start, c-&gt;wbuf_ofs - start, &amp;retlen, buf, NULL, c-&gt;oobinfo);</div><div class='del'>-		else</div><div class='del'>-			ret = c-&gt;mtd-&gt;read(c-&gt;mtd, start, c-&gt;wbuf_ofs - start, &amp;retlen, buf);</div><div class='add'>+		ret = c-&gt;mtd-&gt;read(c-&gt;mtd, start, c-&gt;wbuf_ofs - start, &amp;retlen, buf);</div><div class='ctx'> </div><div class='del'>-		if (ret == -EBADMSG &amp;&amp; retlen == c-&gt;wbuf_ofs - start) {</div><div class='del'>-			/* ECC recovered */</div><div class='add'>+		/* ECC recovered ? */</div><div class='add'>+		if ((ret == -EUCLEAN || ret == -EBADMSG) &amp;&amp;</div><div class='add'>+		    (retlen == c-&gt;wbuf_ofs - start))</div><div class='ctx'> 			ret = 0;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		if (ret || retlen != c-&gt;wbuf_ofs - start) {</div><div class='ctx'> 			printk(KERN_CRIT "Old data are already lost in wbuf recovery. Data loss ensues.\n");</div><div class='ctx'> </div><div class='ctx'> 			kfree(buf);</div><div class='ctx'> 			buf = NULL;</div><div class='ctx'> 		read_failed:</div><div class='del'>-			first_raw = &amp;(*first_raw)-&gt;next_phys;</div><div class='add'>+			first_raw = ref_next(first_raw);</div><div class='add'>+			nr_refile--;</div><div class='add'>+			while (first_raw &amp;&amp; ref_obsolete(first_raw)) {</div><div class='add'>+				first_raw = ref_next(first_raw);</div><div class='add'>+				nr_refile--;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/* If this was the only node to be recovered, give up */</div><div class='del'>-			if (!(*first_raw))</div><div class='add'>+			if (!first_raw) {</div><div class='add'>+				c-&gt;wbuf_len = 0;</div><div class='ctx'> 				return;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* It wasn't. Go on and try to recover nodes complete in the wbuf */</div><div class='del'>-			start = ref_offset(*first_raw);</div><div class='add'>+			start = ref_offset(first_raw);</div><div class='add'>+			dbg_noderef("wbuf now recover %08x-%08x (%d bytes in %d nodes)\n",</div><div class='add'>+				    start, end, end - start, nr_refile);</div><div class='add'>+</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Read succeeded. Copy the remaining data from the wbuf */</div><div class='ctx'> 			memcpy(buf + (c-&gt;wbuf_ofs - start), c-&gt;wbuf, end - c-&gt;wbuf_ofs);</div><div class='hunk'>@@ -263,14 +333,23 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> 	/* OK... we're to rewrite (end-start) bytes of data from first_raw onwards.</div><div class='ctx'> 	   Either 'buf' contains the data, or we find it in the wbuf */</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* ... and get an allocation of space from a shiny new block instead */</div><div class='del'>-	ret = jffs2_reserve_space_gc(c, end-start, &amp;ofs, &amp;len, JFFS2_SUMMARY_NOSUM_SIZE);</div><div class='add'>+	ret = jffs2_reserve_space_gc(c, end-start, &amp;len, JFFS2_SUMMARY_NOSUM_SIZE);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_WARNING "Failed to allocate space for wbuf recovery. Data loss ensues.\n");</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ret = jffs2_prealloc_raw_node_refs(c, c-&gt;nextblock, nr_refile);</div><div class='add'>+	if (ret) {</div><div class='add'>+		printk(KERN_WARNING "Failed to allocate node refs for wbuf recovery. Data loss ensues.\n");</div><div class='add'>+		kfree(buf);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ofs = write_ofs(c);</div><div class='add'>+</div><div class='ctx'> 	if (end-start &gt;= c-&gt;wbuf_pagesize) {</div><div class='ctx'> 		/* Need to do another write immediately, but it's possible</div><div class='ctx'> 		   that this is just because the wbuf itself is completely</div><div class='hunk'>@@ -288,36 +367,22 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> 		if (breakme++ == 20) {</div><div class='ctx'> 			printk(KERN_NOTICE "Faking write error at 0x%08x\n", ofs);</div><div class='ctx'> 			breakme = 0;</div><div class='del'>-			c-&gt;mtd-&gt;write_ecc(c-&gt;mtd, ofs, towrite, &amp;retlen,</div><div class='del'>-					  brokenbuf, NULL, c-&gt;oobinfo);</div><div class='add'>+			c-&gt;mtd-&gt;write(c-&gt;mtd, ofs, towrite, &amp;retlen,</div><div class='add'>+				      brokenbuf);</div><div class='ctx'> 			ret = -EIO;</div><div class='ctx'> 		} else</div><div class='ctx'> #endif</div><div class='del'>-		if (jffs2_cleanmarker_oob(c))</div><div class='del'>-			ret = c-&gt;mtd-&gt;write_ecc(c-&gt;mtd, ofs, towrite, &amp;retlen,</div><div class='del'>-						rewrite_buf, NULL, c-&gt;oobinfo);</div><div class='del'>-		else</div><div class='del'>-			ret = c-&gt;mtd-&gt;write(c-&gt;mtd, ofs, towrite, &amp;retlen, rewrite_buf);</div><div class='add'>+			ret = c-&gt;mtd-&gt;write(c-&gt;mtd, ofs, towrite, &amp;retlen,</div><div class='add'>+					    rewrite_buf);</div><div class='ctx'> </div><div class='ctx'> 		if (ret || retlen != towrite) {</div><div class='ctx'> 			/* Argh. We tried. Really we did. */</div><div class='ctx'> 			printk(KERN_CRIT "Recovery of wbuf failed due to a second write error\n");</div><div class='ctx'> 			kfree(buf);</div><div class='ctx'> </div><div class='del'>-			if (retlen) {</div><div class='del'>-				struct jffs2_raw_node_ref *raw2;</div><div class='del'>-</div><div class='del'>-				raw2 = jffs2_alloc_raw_node_ref();</div><div class='del'>-				if (!raw2)</div><div class='del'>-					return;</div><div class='add'>+			if (retlen)</div><div class='add'>+				jffs2_add_physical_node_ref(c, ofs | REF_OBSOLETE, ref_totlen(c, jeb, first_raw), NULL);</div><div class='ctx'> </div><div class='del'>-				raw2-&gt;flash_offset = ofs | REF_OBSOLETE;</div><div class='del'>-				raw2-&gt;__totlen = ref_totlen(c, jeb, *first_raw);</div><div class='del'>-				raw2-&gt;next_phys = NULL;</div><div class='del'>-				raw2-&gt;next_in_ino = NULL;</div><div class='del'>-</div><div class='del'>-				jffs2_add_physical_node_ref(c, raw2);</div><div class='del'>-			}</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_NOTICE "Recovery of wbuf succeeded to %08x\n", ofs);</div><div class='hunk'>@@ -326,12 +391,10 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> 		c-&gt;wbuf_ofs = ofs + towrite;</div><div class='ctx'> 		memmove(c-&gt;wbuf, rewrite_buf + towrite, c-&gt;wbuf_len);</div><div class='ctx'> 		/* Don't muck about with c-&gt;wbuf_inodes. False positives are harmless. */</div><div class='del'>-		kfree(buf);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* OK, now we're left with the dregs in whichever buffer we're using */</div><div class='ctx'> 		if (buf) {</div><div class='ctx'> 			memcpy(c-&gt;wbuf, buf, end-start);</div><div class='del'>-			kfree(buf);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memmove(c-&gt;wbuf, c-&gt;wbuf + (start - c-&gt;wbuf_ofs), end - start);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -343,62 +406,110 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> 	new_jeb = &amp;c-&gt;blocks[ofs / c-&gt;sector_size];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	if (new_jeb-&gt;first_node) {</div><div class='del'>-		/* Odd, but possible with ST flash later maybe */</div><div class='del'>-		new_jeb-&gt;last_node-&gt;next_phys = *first_raw;</div><div class='del'>-	} else {</div><div class='del'>-		new_jeb-&gt;first_node = *first_raw;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	raw = first_raw;</div><div class='del'>-	while (*raw) {</div><div class='del'>-		uint32_t rawlen = ref_totlen(c, jeb, *raw);</div><div class='add'>+	for (raw = first_raw; raw != jeb-&gt;last_node; raw = ref_next(raw)) {</div><div class='add'>+		uint32_t rawlen = ref_totlen(c, jeb, raw);</div><div class='add'>+		struct jffs2_inode_cache *ic;</div><div class='add'>+		struct jffs2_raw_node_ref *new_ref;</div><div class='add'>+		struct jffs2_raw_node_ref **adjust_ref = NULL;</div><div class='add'>+		struct jffs2_inode_info *f = NULL;</div><div class='ctx'> </div><div class='ctx'> 		D1(printk(KERN_DEBUG "Refiling block of %08x at %08x(%d) to %08x\n",</div><div class='del'>-			  rawlen, ref_offset(*raw), ref_flags(*raw), ofs));</div><div class='add'>+			  rawlen, ref_offset(raw), ref_flags(raw), ofs));</div><div class='add'>+</div><div class='add'>+		ic = jffs2_raw_ref_to_ic(raw);</div><div class='add'>+</div><div class='add'>+		/* Ick. This XATTR mess should be fixed shortly... */</div><div class='add'>+		if (ic &amp;&amp; ic-&gt;class == RAWNODE_CLASS_XATTR_DATUM) {</div><div class='add'>+			struct jffs2_xattr_datum *xd = (void *)ic;</div><div class='add'>+			BUG_ON(xd-&gt;node != raw);</div><div class='add'>+			adjust_ref = &amp;xd-&gt;node;</div><div class='add'>+			raw-&gt;next_in_ino = NULL;</div><div class='add'>+			ic = NULL;</div><div class='add'>+		} else if (ic &amp;&amp; ic-&gt;class == RAWNODE_CLASS_XATTR_REF) {</div><div class='add'>+			struct jffs2_xattr_datum *xr = (void *)ic;</div><div class='add'>+			BUG_ON(xr-&gt;node != raw);</div><div class='add'>+			adjust_ref = &amp;xr-&gt;node;</div><div class='add'>+			raw-&gt;next_in_ino = NULL;</div><div class='add'>+			ic = NULL;</div><div class='add'>+		} else if (ic &amp;&amp; ic-&gt;class == RAWNODE_CLASS_INODE_CACHE) {</div><div class='add'>+			struct jffs2_raw_node_ref **p = &amp;ic-&gt;nodes;</div><div class='add'>+</div><div class='add'>+			/* Remove the old node from the per-inode list */</div><div class='add'>+			while (*p &amp;&amp; *p != (void *)ic) {</div><div class='add'>+				if (*p == raw) {</div><div class='add'>+					(*p) = (raw-&gt;next_in_ino);</div><div class='add'>+					raw-&gt;next_in_ino = NULL;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				p = &amp;((*p)-&gt;next_in_ino);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		if (ref_obsolete(*raw)) {</div><div class='del'>-			/* Shouldn't really happen much */</div><div class='del'>-			new_jeb-&gt;dirty_size += rawlen;</div><div class='del'>-			new_jeb-&gt;free_size -= rawlen;</div><div class='del'>-			c-&gt;dirty_size += rawlen;</div><div class='del'>-		} else {</div><div class='del'>-			new_jeb-&gt;used_size += rawlen;</div><div class='del'>-			new_jeb-&gt;free_size -= rawlen;</div><div class='add'>+			if (ic-&gt;state == INO_STATE_PRESENT &amp;&amp; !ref_obsolete(raw)) {</div><div class='add'>+				/* If it's an in-core inode, then we have to adjust any</div><div class='add'>+				   full_dirent or full_dnode structure to point to the</div><div class='add'>+				   new version instead of the old */</div><div class='add'>+				f = jffs2_gc_fetch_inode(c, ic-&gt;ino, ic-&gt;nlink);</div><div class='add'>+				if (IS_ERR(f)) {</div><div class='add'>+					/* Should never happen; it _must_ be present */</div><div class='add'>+					JFFS2_ERROR("Failed to iget() ino #%u, err %ld\n",</div><div class='add'>+						    ic-&gt;ino, PTR_ERR(f));</div><div class='add'>+					BUG();</div><div class='add'>+				}</div><div class='add'>+				/* We don't lock f-&gt;sem. There's a number of ways we could</div><div class='add'>+				   end up in here with it already being locked, and nobody's</div><div class='add'>+				   going to modify it on us anyway because we hold the</div><div class='add'>+				   alloc_sem. We're only changing one -&gt;raw pointer too,</div><div class='add'>+				   which we can get away with without upsetting readers. */</div><div class='add'>+				adjust_ref = jffs2_incore_replace_raw(c, f, raw,</div><div class='add'>+								      (void *)(buf?:c-&gt;wbuf) + (ref_offset(raw) - start));</div><div class='add'>+			} else if (unlikely(ic-&gt;state != INO_STATE_PRESENT &amp;&amp;</div><div class='add'>+					    ic-&gt;state != INO_STATE_CHECKEDABSENT &amp;&amp;</div><div class='add'>+					    ic-&gt;state != INO_STATE_GC)) {</div><div class='add'>+				JFFS2_ERROR("Inode #%u is in strange state %d!\n", ic-&gt;ino, ic-&gt;state);</div><div class='add'>+				BUG();</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		new_ref = jffs2_link_node_ref(c, new_jeb, ofs | ref_flags(raw), rawlen, ic);</div><div class='add'>+</div><div class='add'>+		if (adjust_ref) {</div><div class='add'>+			BUG_ON(*adjust_ref != raw);</div><div class='add'>+			*adjust_ref = new_ref;</div><div class='add'>+		}</div><div class='add'>+		if (f)</div><div class='add'>+			jffs2_gc_release_inode(c, f);</div><div class='add'>+</div><div class='add'>+		if (!ref_obsolete(raw)) {</div><div class='ctx'> 			jeb-&gt;dirty_size += rawlen;</div><div class='ctx'> 			jeb-&gt;used_size  -= rawlen;</div><div class='ctx'> 			c-&gt;dirty_size += rawlen;</div><div class='add'>+			c-&gt;used_size -= rawlen;</div><div class='add'>+			raw-&gt;flash_offset = ref_offset(raw) | REF_OBSOLETE;</div><div class='add'>+			BUG_ON(raw-&gt;next_in_ino);</div><div class='ctx'> 		}</div><div class='del'>-		c-&gt;free_size -= rawlen;</div><div class='del'>-		(*raw)-&gt;flash_offset = ofs | ref_flags(*raw);</div><div class='ctx'> 		ofs += rawlen;</div><div class='del'>-		new_jeb-&gt;last_node = *raw;</div><div class='del'>-</div><div class='del'>-		raw = &amp;(*raw)-&gt;next_phys;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='ctx'> 	/* Fix up the original jeb now it's on the bad_list */</div><div class='del'>-	*first_raw = NULL;</div><div class='del'>-	if (first_raw == &amp;jeb-&gt;first_node) {</div><div class='del'>-		jeb-&gt;last_node = NULL;</div><div class='add'>+	if (first_raw == jeb-&gt;first_node) {</div><div class='ctx'> 		D1(printk(KERN_DEBUG "Failing block at %08x is now empty. Moving to erase_pending_list\n", jeb-&gt;offset));</div><div class='del'>-		list_del(&amp;jeb-&gt;list);</div><div class='del'>-		list_add(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='add'>+		list_move(&amp;jeb-&gt;list, &amp;c-&gt;erase_pending_list);</div><div class='ctx'> 		c-&gt;nr_erasing_blocks++;</div><div class='ctx'> 		jffs2_erase_pending_trigger(c);</div><div class='ctx'> 	}</div><div class='del'>-	else</div><div class='del'>-		jeb-&gt;last_node = container_of(first_raw, struct jffs2_raw_node_ref, next_phys);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg_acct_sanity_check_nolock(c, jeb);</div><div class='del'>-        jffs2_dbg_acct_paranoia_check_nolock(c, jeb);</div><div class='add'>+	jffs2_dbg_acct_paranoia_check_nolock(c, jeb);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_dbg_acct_sanity_check_nolock(c, new_jeb);</div><div class='del'>-        jffs2_dbg_acct_paranoia_check_nolock(c, new_jeb);</div><div class='add'>+	jffs2_dbg_acct_paranoia_check_nolock(c, new_jeb);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='del'>-	D1(printk(KERN_DEBUG "wbuf recovery completed OK\n"));</div><div class='add'>+	D1(printk(KERN_DEBUG "wbuf recovery completed OK. wbuf_ofs 0x%08x, len 0x%x\n", c-&gt;wbuf_ofs, c-&gt;wbuf_len));</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Meaning of pad argument:</div><div class='hunk'>@@ -412,6 +523,7 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)</div><div class='ctx'> {</div><div class='add'>+	struct jffs2_eraseblock *wbuf_jeb;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> </div><div class='hunk'>@@ -429,6 +541,10 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)</div><div class='ctx'> 	if (!c-&gt;wbuf_len)	/* already checked c-&gt;wbuf above */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	wbuf_jeb = &amp;c-&gt;blocks[c-&gt;wbuf_ofs / c-&gt;sector_size];</div><div class='add'>+	if (jffs2_prealloc_raw_node_refs(c, wbuf_jeb, c-&gt;nextblock-&gt;allocated_refs + 1))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	/* claim remaining space on the page</div><div class='ctx'> 	   this happens, if we have a change to a new block,</div><div class='ctx'> 	   or if fsync forces us to flush the writebuffer.</div><div class='hunk'>@@ -458,15 +574,12 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)</div><div class='ctx'> 	if (breakme++ == 20) {</div><div class='ctx'> 		printk(KERN_NOTICE "Faking write error at 0x%08x\n", c-&gt;wbuf_ofs);</div><div class='ctx'> 		breakme = 0;</div><div class='del'>-		c-&gt;mtd-&gt;write_ecc(c-&gt;mtd, c-&gt;wbuf_ofs, c-&gt;wbuf_pagesize,</div><div class='del'>-					&amp;retlen, brokenbuf, NULL, c-&gt;oobinfo);</div><div class='add'>+		c-&gt;mtd-&gt;write(c-&gt;mtd, c-&gt;wbuf_ofs, c-&gt;wbuf_pagesize, &amp;retlen,</div><div class='add'>+			      brokenbuf);</div><div class='ctx'> 		ret = -EIO;</div><div class='ctx'> 	} else</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (jffs2_cleanmarker_oob(c))</div><div class='del'>-		ret = c-&gt;mtd-&gt;write_ecc(c-&gt;mtd, c-&gt;wbuf_ofs, c-&gt;wbuf_pagesize, &amp;retlen, c-&gt;wbuf, NULL, c-&gt;oobinfo);</div><div class='del'>-	else</div><div class='ctx'> 		ret = c-&gt;mtd-&gt;write(c-&gt;mtd, c-&gt;wbuf_ofs, c-&gt;wbuf_pagesize, &amp;retlen, c-&gt;wbuf);</div><div class='ctx'> </div><div class='ctx'> 	if (ret || retlen != c-&gt;wbuf_pagesize) {</div><div class='hunk'>@@ -483,32 +596,34 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='ctx'> 	/* Adjust free size of the block if we padded. */</div><div class='ctx'> 	if (pad) {</div><div class='del'>-		struct jffs2_eraseblock *jeb;</div><div class='del'>-</div><div class='del'>-		jeb = &amp;c-&gt;blocks[c-&gt;wbuf_ofs / c-&gt;sector_size];</div><div class='add'>+		uint32_t waste = c-&gt;wbuf_pagesize - c-&gt;wbuf_len;</div><div class='ctx'> </div><div class='ctx'> 		D1(printk(KERN_DEBUG "jffs2_flush_wbuf() adjusting free_size of %sblock at %08x\n",</div><div class='del'>-			  (jeb==c-&gt;nextblock)?"next":"", jeb-&gt;offset));</div><div class='add'>+			  (wbuf_jeb==c-&gt;nextblock)?"next":"", wbuf_jeb-&gt;offset));</div><div class='ctx'> </div><div class='ctx'> 		/* wbuf_pagesize - wbuf_len is the amount of space that's to be</div><div class='ctx'> 		   padded. If there is less free space in the block than that,</div><div class='ctx'> 		   something screwed up */</div><div class='del'>-		if (jeb-&gt;free_size &lt; (c-&gt;wbuf_pagesize - c-&gt;wbuf_len)) {</div><div class='add'>+		if (wbuf_jeb-&gt;free_size &lt; waste) {</div><div class='ctx'> 			printk(KERN_CRIT "jffs2_flush_wbuf(): Accounting error. wbuf at 0x%08x has 0x%03x bytes, 0x%03x left.\n",</div><div class='del'>-			       c-&gt;wbuf_ofs, c-&gt;wbuf_len, c-&gt;wbuf_pagesize-c-&gt;wbuf_len);</div><div class='add'>+			       c-&gt;wbuf_ofs, c-&gt;wbuf_len, waste);</div><div class='ctx'> 			printk(KERN_CRIT "jffs2_flush_wbuf(): But free_size for block at 0x%08x is only 0x%08x\n",</div><div class='del'>-			       jeb-&gt;offset, jeb-&gt;free_size);</div><div class='add'>+			       wbuf_jeb-&gt;offset, wbuf_jeb-&gt;free_size);</div><div class='ctx'> 			BUG();</div><div class='ctx'> 		}</div><div class='del'>-		jeb-&gt;free_size -= (c-&gt;wbuf_pagesize - c-&gt;wbuf_len);</div><div class='del'>-		c-&gt;free_size -= (c-&gt;wbuf_pagesize - c-&gt;wbuf_len);</div><div class='del'>-		jeb-&gt;wasted_size += (c-&gt;wbuf_pagesize - c-&gt;wbuf_len);</div><div class='del'>-		c-&gt;wasted_size += (c-&gt;wbuf_pagesize - c-&gt;wbuf_len);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+		jffs2_link_node_ref(c, wbuf_jeb, (c-&gt;wbuf_ofs + c-&gt;wbuf_len) | REF_OBSOLETE, waste, NULL);</div><div class='add'>+		/* FIXME: that made it count as dirty. Convert to wasted */</div><div class='add'>+		wbuf_jeb-&gt;dirty_size -= waste;</div><div class='add'>+		c-&gt;dirty_size -= waste;</div><div class='add'>+		wbuf_jeb-&gt;wasted_size += waste;</div><div class='add'>+		c-&gt;wasted_size += waste;</div><div class='add'>+	} else</div><div class='add'>+		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Stick any now-obsoleted blocks on the erase_pending_list */</div><div class='ctx'> 	jffs2_refile_wbuf_blocks(c);</div><div class='hunk'>@@ -603,20 +718,30 @@ int jffs2_flush_wbuf_pad(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-int jffs2_flash_writev(struct jffs2_sb_info *c, const struct kvec *invecs, unsigned long count, loff_t to, size_t *retlen, uint32_t ino)</div><div class='add'>+</div><div class='add'>+static size_t jffs2_fill_wbuf(struct jffs2_sb_info *c, const uint8_t *buf,</div><div class='add'>+			      size_t len)</div><div class='add'>+{</div><div class='add'>+	if (len &amp;&amp; !c-&gt;wbuf_len &amp;&amp; (len &gt;= c-&gt;wbuf_pagesize))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (len &gt; (c-&gt;wbuf_pagesize - c-&gt;wbuf_len))</div><div class='add'>+		len = c-&gt;wbuf_pagesize - c-&gt;wbuf_len;</div><div class='add'>+	memcpy(c-&gt;wbuf + c-&gt;wbuf_len, buf, len);</div><div class='add'>+	c-&gt;wbuf_len += (uint32_t) len;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_flash_writev(struct jffs2_sb_info *c, const struct kvec *invecs,</div><div class='add'>+		       unsigned long count, loff_t to, size_t *retlen,</div><div class='add'>+		       uint32_t ino)</div><div class='ctx'> {</div><div class='del'>-	struct kvec outvecs[3];</div><div class='del'>-	uint32_t totlen = 0;</div><div class='del'>-	uint32_t split_ofs = 0;</div><div class='del'>-	uint32_t old_totlen;</div><div class='del'>-	int ret, splitvec = -1;</div><div class='del'>-	int invec, outvec;</div><div class='del'>-	size_t wbuf_retlen;</div><div class='del'>-	unsigned char *wbuf_ptr;</div><div class='del'>-	size_t donelen = 0;</div><div class='add'>+	struct jffs2_eraseblock *jeb;</div><div class='add'>+	size_t wbuf_retlen, donelen = 0;</div><div class='ctx'> 	uint32_t outvec_to = to;</div><div class='add'>+	int ret, invec;</div><div class='ctx'> </div><div class='del'>-	/* If not NAND flash, don't bother */</div><div class='add'>+	/* If not writebuffered flash, don't bother */</div><div class='ctx'> 	if (!jffs2_is_writebuffered(c))</div><div class='ctx'> 		return jffs2_flash_direct_writev(c, invecs, count, to, retlen);</div><div class='ctx'> </div><div class='hunk'>@@ -629,34 +754,22 @@ int jffs2_flash_writev(struct jffs2_sb_info *c, const struct kvec *invecs, unsig</div><div class='ctx'> 		memset(c-&gt;wbuf,0xff,c-&gt;wbuf_pagesize);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Fixup the wbuf if we are moving to a new eraseblock.  The checks below</div><div class='del'>-	   fail for ECC'd NOR because cleanmarker == 16, so a block starts at</div><div class='del'>-	   xxx0010.  */</div><div class='del'>-	if (jffs2_nor_ecc(c)) {</div><div class='del'>-		if (((c-&gt;wbuf_ofs % c-&gt;sector_size) == 0) &amp;&amp; !c-&gt;wbuf_len) {</div><div class='del'>-			c-&gt;wbuf_ofs = PAGE_DIV(to);</div><div class='del'>-			c-&gt;wbuf_len = PAGE_MOD(to);</div><div class='del'>-			memset(c-&gt;wbuf,0xff,c-&gt;wbuf_pagesize);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sanity checks on target address.</div><div class='del'>-	   It's permitted to write at PAD(c-&gt;wbuf_len+c-&gt;wbuf_ofs),</div><div class='del'>-	   and it's permitted to write at the beginning of a new</div><div class='del'>-	   erase block. Anything else, and you die.</div><div class='del'>-	   New block starts at xxx000c (0-b = block header)</div><div class='del'>-	*/</div><div class='add'>+	/*</div><div class='add'>+	 * Sanity checks on target address.  It's permitted to write</div><div class='add'>+	 * at PAD(c-&gt;wbuf_len+c-&gt;wbuf_ofs), and it's permitted to</div><div class='add'>+	 * write at the beginning of a new erase block. Anything else,</div><div class='add'>+	 * and you die.  New block starts at xxx000c (0-b = block</div><div class='add'>+	 * header)</div><div class='add'>+	 */</div><div class='ctx'> 	if (SECTOR_ADDR(to) != SECTOR_ADDR(c-&gt;wbuf_ofs)) {</div><div class='ctx'> 		/* It's a write to a new block */</div><div class='ctx'> 		if (c-&gt;wbuf_len) {</div><div class='del'>-			D1(printk(KERN_DEBUG "jffs2_flash_writev() to 0x%lx causes flush of wbuf at 0x%08x\n", (unsigned long)to, c-&gt;wbuf_ofs));</div><div class='add'>+			D1(printk(KERN_DEBUG "jffs2_flash_writev() to 0x%lx "</div><div class='add'>+				  "causes flush of wbuf at 0x%08x\n",</div><div class='add'>+				  (unsigned long)to, c-&gt;wbuf_ofs));</div><div class='ctx'> 			ret = __jffs2_flush_wbuf(c, PAD_NOACCOUNT);</div><div class='del'>-			if (ret) {</div><div class='del'>-				/* the underlying layer has to check wbuf_len to do the cleanup */</div><div class='del'>-				D1(printk(KERN_WARNING "jffs2_flush_wbuf() called from jffs2_flash_writev() failed %d\n", ret));</div><div class='del'>-				*retlen = 0;</div><div class='del'>-				goto exit;</div><div class='del'>-			}</div><div class='add'>+			if (ret)</div><div class='add'>+				goto outerr;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* set pointer to new block */</div><div class='ctx'> 		c-&gt;wbuf_ofs = PAGE_DIV(to);</div><div class='hunk'>@@ -665,165 +778,70 @@ int jffs2_flash_writev(struct jffs2_sb_info *c, const struct kvec *invecs, unsig</div><div class='ctx'> </div><div class='ctx'> 	if (to != PAD(c-&gt;wbuf_ofs + c-&gt;wbuf_len)) {</div><div class='ctx'> 		/* We're not writing immediately after the writebuffer. Bad. */</div><div class='del'>-		printk(KERN_CRIT "jffs2_flash_writev(): Non-contiguous write to %08lx\n", (unsigned long)to);</div><div class='add'>+		printk(KERN_CRIT "jffs2_flash_writev(): Non-contiguous write "</div><div class='add'>+		       "to %08lx\n", (unsigned long)to);</div><div class='ctx'> 		if (c-&gt;wbuf_len)</div><div class='ctx'> 			printk(KERN_CRIT "wbuf was previously %08x-%08x\n",</div><div class='del'>-					  c-&gt;wbuf_ofs, c-&gt;wbuf_ofs+c-&gt;wbuf_len);</div><div class='add'>+			       c-&gt;wbuf_ofs, c-&gt;wbuf_ofs+c-&gt;wbuf_len);</div><div class='ctx'> 		BUG();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Note outvecs[3] above. We know count is never greater than 2 */</div><div class='del'>-	if (count &gt; 2) {</div><div class='del'>-		printk(KERN_CRIT "jffs2_flash_writev(): count is %ld\n", count);</div><div class='del'>-		BUG();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	invec = 0;</div><div class='del'>-	outvec = 0;</div><div class='del'>-</div><div class='del'>-	/* Fill writebuffer first, if already in use */</div><div class='del'>-	if (c-&gt;wbuf_len) {</div><div class='del'>-		uint32_t invec_ofs = 0;</div><div class='del'>-</div><div class='del'>-		/* adjust alignment offset */</div><div class='del'>-		if (c-&gt;wbuf_len != PAGE_MOD(to)) {</div><div class='del'>-			c-&gt;wbuf_len = PAGE_MOD(to);</div><div class='del'>-			/* take care of alignment to next page */</div><div class='del'>-			if (!c-&gt;wbuf_len)</div><div class='del'>-				c-&gt;wbuf_len = c-&gt;wbuf_pagesize;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while(c-&gt;wbuf_len &lt; c-&gt;wbuf_pagesize) {</div><div class='del'>-			uint32_t thislen;</div><div class='del'>-</div><div class='del'>-			if (invec == count)</div><div class='del'>-				goto alldone;</div><div class='del'>-</div><div class='del'>-			thislen = c-&gt;wbuf_pagesize - c-&gt;wbuf_len;</div><div class='del'>-</div><div class='del'>-			if (thislen &gt;= invecs[invec].iov_len)</div><div class='del'>-				thislen = invecs[invec].iov_len;</div><div class='del'>-</div><div class='del'>-			invec_ofs = thislen;</div><div class='del'>-</div><div class='del'>-			memcpy(c-&gt;wbuf + c-&gt;wbuf_len, invecs[invec].iov_base, thislen);</div><div class='del'>-			c-&gt;wbuf_len += thislen;</div><div class='del'>-			donelen += thislen;</div><div class='del'>-			/* Get next invec, if actual did not fill the buffer */</div><div class='del'>-			if (c-&gt;wbuf_len &lt; c-&gt;wbuf_pagesize)</div><div class='del'>-				invec++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* write buffer is full, flush buffer */</div><div class='del'>-		ret = __jffs2_flush_wbuf(c, NOPAD);</div><div class='del'>-		if (ret) {</div><div class='del'>-			/* the underlying layer has to check wbuf_len to do the cleanup */</div><div class='del'>-			D1(printk(KERN_WARNING "jffs2_flush_wbuf() called from jffs2_flash_writev() failed %d\n", ret));</div><div class='del'>-			/* Retlen zero to make sure our caller doesn't mark the space dirty.</div><div class='del'>-			   We've already done everything that's necessary */</div><div class='del'>-			*retlen = 0;</div><div class='del'>-			goto exit;</div><div class='del'>-		}</div><div class='del'>-		outvec_to += donelen;</div><div class='del'>-		c-&gt;wbuf_ofs = outvec_to;</div><div class='del'>-</div><div class='del'>-		/* All invecs done ? */</div><div class='del'>-		if (invec == count)</div><div class='del'>-			goto alldone;</div><div class='del'>-</div><div class='del'>-		/* Set up the first outvec, containing the remainder of the</div><div class='del'>-		   invec we partially used */</div><div class='del'>-		if (invecs[invec].iov_len &gt; invec_ofs) {</div><div class='del'>-			outvecs[0].iov_base = invecs[invec].iov_base+invec_ofs;</div><div class='del'>-			totlen = outvecs[0].iov_len = invecs[invec].iov_len-invec_ofs;</div><div class='del'>-			if (totlen &gt; c-&gt;wbuf_pagesize) {</div><div class='del'>-				splitvec = outvec;</div><div class='del'>-				split_ofs = outvecs[0].iov_len - PAGE_MOD(totlen);</div><div class='del'>-			}</div><div class='del'>-			outvec++;</div><div class='del'>-		}</div><div class='del'>-		invec++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK, now we've flushed the wbuf and the start of the bits</div><div class='del'>-	   we have been asked to write, now to write the rest.... */</div><div class='del'>-</div><div class='del'>-	/* totlen holds the amount of data still to be written */</div><div class='del'>-	old_totlen = totlen;</div><div class='del'>-	for ( ; invec &lt; count; invec++,outvec++ ) {</div><div class='del'>-		outvecs[outvec].iov_base = invecs[invec].iov_base;</div><div class='del'>-		totlen += outvecs[outvec].iov_len = invecs[invec].iov_len;</div><div class='del'>-		if (PAGE_DIV(totlen) != PAGE_DIV(old_totlen)) {</div><div class='del'>-			splitvec = outvec;</div><div class='del'>-			split_ofs = outvecs[outvec].iov_len - PAGE_MOD(totlen);</div><div class='del'>-			old_totlen = totlen;</div><div class='add'>+	/* adjust alignment offset */</div><div class='add'>+	if (c-&gt;wbuf_len != PAGE_MOD(to)) {</div><div class='add'>+		c-&gt;wbuf_len = PAGE_MOD(to);</div><div class='add'>+		/* take care of alignment to next page */</div><div class='add'>+		if (!c-&gt;wbuf_len) {</div><div class='add'>+			c-&gt;wbuf_len = c-&gt;wbuf_pagesize;</div><div class='add'>+			ret = __jffs2_flush_wbuf(c, NOPAD);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto outerr;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Now the outvecs array holds all the remaining data to write */</div><div class='del'>-	/* Up to splitvec,split_ofs is to be written immediately. The rest</div><div class='del'>-	   goes into the (now-empty) wbuf */</div><div class='del'>-</div><div class='del'>-	if (splitvec != -1) {</div><div class='del'>-		uint32_t remainder;</div><div class='del'>-</div><div class='del'>-		remainder = outvecs[splitvec].iov_len - split_ofs;</div><div class='del'>-		outvecs[splitvec].iov_len = split_ofs;</div><div class='del'>-</div><div class='del'>-		/* We did cross a page boundary, so we write some now */</div><div class='del'>-		if (jffs2_cleanmarker_oob(c))</div><div class='del'>-			ret = c-&gt;mtd-&gt;writev_ecc(c-&gt;mtd, outvecs, splitvec+1, outvec_to, &amp;wbuf_retlen, NULL, c-&gt;oobinfo);</div><div class='del'>-		else</div><div class='del'>-			ret = jffs2_flash_direct_writev(c, outvecs, splitvec+1, outvec_to, &amp;wbuf_retlen);</div><div class='add'>+	for (invec = 0; invec &lt; count; invec++) {</div><div class='add'>+		int vlen = invecs[invec].iov_len;</div><div class='add'>+		uint8_t *v = invecs[invec].iov_base;</div><div class='ctx'> </div><div class='del'>-		if (ret &lt; 0 || wbuf_retlen != PAGE_DIV(totlen)) {</div><div class='del'>-			/* At this point we have no problem,</div><div class='del'>-			   c-&gt;wbuf is empty. However refile nextblock to avoid</div><div class='del'>-			   writing again to same address.</div><div class='del'>-			*/</div><div class='del'>-			struct jffs2_eraseblock *jeb;</div><div class='add'>+		wbuf_retlen = jffs2_fill_wbuf(c, v, vlen);</div><div class='ctx'> </div><div class='del'>-			spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-</div><div class='del'>-			jeb = &amp;c-&gt;blocks[outvec_to / c-&gt;sector_size];</div><div class='del'>-			jffs2_block_refile(c, jeb, REFILE_ANYWAY);</div><div class='del'>-</div><div class='del'>-			*retlen = 0;</div><div class='del'>-			spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-			goto exit;</div><div class='add'>+		if (c-&gt;wbuf_len == c-&gt;wbuf_pagesize) {</div><div class='add'>+			ret = __jffs2_flush_wbuf(c, NOPAD);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto outerr;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='add'>+		vlen -= wbuf_retlen;</div><div class='add'>+		outvec_to += wbuf_retlen;</div><div class='ctx'> 		donelen += wbuf_retlen;</div><div class='del'>-		c-&gt;wbuf_ofs = PAGE_DIV(outvec_to) + PAGE_DIV(totlen);</div><div class='del'>-</div><div class='del'>-		if (remainder) {</div><div class='del'>-			outvecs[splitvec].iov_base += split_ofs;</div><div class='del'>-			outvecs[splitvec].iov_len = remainder;</div><div class='del'>-		} else {</div><div class='del'>-			splitvec++;</div><div class='add'>+		v += wbuf_retlen;</div><div class='add'>+</div><div class='add'>+		if (vlen &gt;= c-&gt;wbuf_pagesize) {</div><div class='add'>+			ret = c-&gt;mtd-&gt;write(c-&gt;mtd, outvec_to, PAGE_DIV(vlen),</div><div class='add'>+					    &amp;wbuf_retlen, v);</div><div class='add'>+			if (ret &lt; 0 || wbuf_retlen != PAGE_DIV(vlen))</div><div class='add'>+				goto outfile;</div><div class='add'>+</div><div class='add'>+			vlen -= wbuf_retlen;</div><div class='add'>+			outvec_to += wbuf_retlen;</div><div class='add'>+			c-&gt;wbuf_ofs = outvec_to;</div><div class='add'>+			donelen += wbuf_retlen;</div><div class='add'>+			v += wbuf_retlen;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	} else {</div><div class='del'>-		splitvec = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now splitvec points to the start of the bits we have to copy</div><div class='del'>-	   into the wbuf */</div><div class='del'>-	wbuf_ptr = c-&gt;wbuf;</div><div class='add'>+		wbuf_retlen = jffs2_fill_wbuf(c, v, vlen);</div><div class='add'>+		if (c-&gt;wbuf_len == c-&gt;wbuf_pagesize) {</div><div class='add'>+			ret = __jffs2_flush_wbuf(c, NOPAD);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto outerr;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	for ( ; splitvec &lt; outvec; splitvec++) {</div><div class='del'>-		/* Don't copy the wbuf into itself */</div><div class='del'>-		if (outvecs[splitvec].iov_base == c-&gt;wbuf)</div><div class='del'>-			continue;</div><div class='del'>-		memcpy(wbuf_ptr, outvecs[splitvec].iov_base, outvecs[splitvec].iov_len);</div><div class='del'>-		wbuf_ptr += outvecs[splitvec].iov_len;</div><div class='del'>-		donelen += outvecs[splitvec].iov_len;</div><div class='add'>+		outvec_to += wbuf_retlen;</div><div class='add'>+		donelen += wbuf_retlen;</div><div class='ctx'> 	}</div><div class='del'>-	c-&gt;wbuf_len = wbuf_ptr - c-&gt;wbuf;</div><div class='ctx'> </div><div class='del'>-	/* If there's a remainder in the wbuf and it's a non-GC write,</div><div class='del'>-	   remember that the wbuf affects this ino */</div><div class='del'>-alldone:</div><div class='add'>+	/*</div><div class='add'>+	 * If there's a remainder in the wbuf and it's a non-GC write,</div><div class='add'>+	 * remember that the wbuf affects this ino</div><div class='add'>+	 */</div><div class='ctx'> 	*retlen = donelen;</div><div class='ctx'> </div><div class='ctx'> 	if (jffs2_sum_active()) {</div><div class='hunk'>@@ -836,8 +854,24 @@ alldone:</div><div class='ctx'> 		jffs2_wbuf_dirties_inode(c, ino);</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='add'>+	up_write(&amp;c-&gt;wbuf_sem);</div><div class='add'>+	return ret;</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='add'>+outfile:</div><div class='add'>+	/*</div><div class='add'>+	 * At this point we have no problem, c-&gt;wbuf is empty. However</div><div class='add'>+	 * refile nextblock to avoid writing again to same address.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	jeb = &amp;c-&gt;blocks[outvec_to / c-&gt;sector_size];</div><div class='add'>+	jffs2_block_refile(c, jeb, REFILE_ANYWAY);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+outerr:</div><div class='add'>+	*retlen = 0;</div><div class='ctx'> 	up_write(&amp;c-&gt;wbuf_sem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -846,7 +880,8 @@ exit:</div><div class='ctx'>  *	This is the entry for flash write.</div><div class='ctx'>  *	Check, if we work on NAND FLASH, if so build an kvec and write it via vritev</div><div class='ctx'> */</div><div class='del'>-int jffs2_flash_write(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *retlen, const u_char *buf)</div><div class='add'>+int jffs2_flash_write(struct jffs2_sb_info *c, loff_t ofs, size_t len,</div><div class='add'>+		      size_t *retlen, const u_char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvec vecs[1];</div><div class='ctx'> </div><div class='hunk'>@@ -871,25 +906,23 @@ int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re</div><div class='ctx'> </div><div class='ctx'> 	/* Read flash */</div><div class='ctx'> 	down_read(&amp;c-&gt;wbuf_sem);</div><div class='del'>-	if (jffs2_cleanmarker_oob(c))</div><div class='del'>-		ret = c-&gt;mtd-&gt;read_ecc(c-&gt;mtd, ofs, len, retlen, buf, NULL, c-&gt;oobinfo);</div><div class='del'>-	else</div><div class='del'>-		ret = c-&gt;mtd-&gt;read(c-&gt;mtd, ofs, len, retlen, buf);</div><div class='del'>-</div><div class='del'>-	if ( (ret == -EBADMSG) &amp;&amp; (*retlen == len) ) {</div><div class='del'>-		printk(KERN_WARNING "mtd-&gt;read(0x%zx bytes from 0x%llx) returned ECC error\n",</div><div class='del'>-		       len, ofs);</div><div class='add'>+	ret = c-&gt;mtd-&gt;read(c-&gt;mtd, ofs, len, retlen, buf);</div><div class='add'>+</div><div class='add'>+	if ( (ret == -EBADMSG || ret == -EUCLEAN) &amp;&amp; (*retlen == len) ) {</div><div class='add'>+		if (ret == -EBADMSG)</div><div class='add'>+			printk(KERN_WARNING "mtd-&gt;read(0x%zx bytes from 0x%llx)"</div><div class='add'>+			       " returned ECC error\n", len, ofs);</div><div class='ctx'> 		/*</div><div class='del'>-		 * We have the raw data without ECC correction in the buffer, maybe</div><div class='del'>-		 * we are lucky and all data or parts are correct. We check the node.</div><div class='del'>-		 * If data are corrupted node check will sort it out.</div><div class='del'>-		 * We keep this block, it will fail on write or erase and the we</div><div class='del'>-		 * mark it bad. Or should we do that now? But we should give him a chance.</div><div class='del'>-		 * Maybe we had a system crash or power loss before the ecc write or</div><div class='del'>-		 * a erase was completed.</div><div class='add'>+		 * We have the raw data without ECC correction in the buffer,</div><div class='add'>+		 * maybe we are lucky and all data or parts are correct. We</div><div class='add'>+		 * check the node.  If data are corrupted node check will sort</div><div class='add'>+		 * it out.  We keep this block, it will fail on write or erase</div><div class='add'>+		 * and the we mark it bad. Or should we do that now? But we</div><div class='add'>+		 * should give him a chance.  Maybe we had a system crash or</div><div class='add'>+		 * power loss before the ecc write or a erase was completed.</div><div class='ctx'> 		 * So we return success. :)</div><div class='ctx'> 		 */</div><div class='del'>-	 	ret = 0;</div><div class='add'>+		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if no writebuffer available or write buffer empty, return */</div><div class='hunk'>@@ -911,7 +944,7 @@ int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re</div><div class='ctx'> 		orbf = (c-&gt;wbuf_ofs - ofs);	/* offset in read buffer */</div><div class='ctx'> 		if (orbf &gt; len)			/* is write beyond write buffer ? */</div><div class='ctx'> 			goto exit;</div><div class='del'>-		lwbf = len - orbf; 		/* number of bytes to copy */</div><div class='add'>+		lwbf = len - orbf;		/* number of bytes to copy */</div><div class='ctx'> 		if (lwbf &gt; c-&gt;wbuf_len)</div><div class='ctx'> 			lwbf = c-&gt;wbuf_len;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -923,158 +956,159 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define NR_OOB_SCAN_PAGES	4</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- *	Check, if the out of band area is empty</div><div class='add'>+ * Check, if the out of band area is empty</div><div class='ctx'>  */</div><div class='del'>-int jffs2_check_oob_empty( struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, int mode)</div><div class='add'>+int jffs2_check_oob_empty(struct jffs2_sb_info *c,</div><div class='add'>+			  struct jffs2_eraseblock *jeb, int mode)</div><div class='ctx'> {</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	int 	ret = 0;</div><div class='del'>-	int	i,len,page;</div><div class='del'>-	size_t  retlen;</div><div class='del'>-	int	oob_size;</div><div class='del'>-</div><div class='del'>-	/* allocate a buffer for all oob data in this sector */</div><div class='del'>-	oob_size = c-&gt;mtd-&gt;oobsize;</div><div class='del'>-	len = 4 * oob_size;</div><div class='del'>-	buf = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		printk(KERN_NOTICE "jffs2_check_oob_empty(): allocation of temporary data buffer for oob check failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * if mode = 0, we scan for a total empty oob area, else we have</div><div class='del'>-	 * to take care of the cleanmarker in the first page of the block</div><div class='del'>-	*/</div><div class='del'>-	ret = jffs2_flash_read_oob(c, jeb-&gt;offset, len , &amp;retlen, buf);</div><div class='add'>+	int i, page, ret;</div><div class='add'>+	int oobsize = c-&gt;mtd-&gt;oobsize;</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+</div><div class='add'>+	ops.len = NR_OOB_SCAN_PAGES * oobsize;</div><div class='add'>+	ops.ooblen = oobsize;</div><div class='add'>+	ops.oobbuf = c-&gt;oobbuf;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+</div><div class='add'>+	ret = c-&gt;mtd-&gt;read_oob(c-&gt;mtd, jeb-&gt;offset, &amp;ops);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		D1(printk(KERN_WARNING "jffs2_check_oob_empty(): Read OOB failed %d for block at %08x\n", ret, jeb-&gt;offset));</div><div class='del'>-		goto out;</div><div class='add'>+		D1(printk(KERN_WARNING "jffs2_check_oob_empty(): Read OOB "</div><div class='add'>+			  "failed %d for block at %08x\n", ret, jeb-&gt;offset));</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (retlen &lt; len) {</div><div class='del'>-		D1(printk(KERN_WARNING "jffs2_check_oob_empty(): Read OOB return short read "</div><div class='del'>-			  "(%zd bytes not %d) for block at %08x\n", retlen, len, jeb-&gt;offset));</div><div class='del'>-		ret = -EIO;</div><div class='del'>-		goto out;</div><div class='add'>+	if (ops.retlen &lt; ops.len) {</div><div class='add'>+		D1(printk(KERN_WARNING "jffs2_check_oob_empty(): Read OOB "</div><div class='add'>+			  "returned short read (%zd bytes not %d) for block "</div><div class='add'>+			  "at %08x\n", ops.retlen, ops.len, jeb-&gt;offset));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Special check for first page */</div><div class='del'>-	for(i = 0; i &lt; oob_size ; i++) {</div><div class='add'>+	for(i = 0; i &lt; oobsize ; i++) {</div><div class='ctx'> 		/* Yeah, we know about the cleanmarker. */</div><div class='ctx'> 		if (mode &amp;&amp; i &gt;= c-&gt;fsdata_pos &amp;&amp;</div><div class='ctx'> 		    i &lt; c-&gt;fsdata_pos + c-&gt;fsdata_len)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (buf[i] != 0xFF) {</div><div class='del'>-			D2(printk(KERN_DEBUG "Found %02x at %x in OOB for %08x\n",</div><div class='del'>-				  buf[i], i, jeb-&gt;offset));</div><div class='del'>-			ret = 1;</div><div class='del'>-			goto out;</div><div class='add'>+		if (ops.oobbuf[i] != 0xFF) {</div><div class='add'>+			D2(printk(KERN_DEBUG "Found %02x at %x in OOB for "</div><div class='add'>+				  "%08x\n", ops.oobbuf[i], i, jeb-&gt;offset));</div><div class='add'>+			return 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* we know, we are aligned :) */</div><div class='del'>-	for (page = oob_size; page &lt; len; page += sizeof(long)) {</div><div class='del'>-		unsigned long dat = *(unsigned long *)(&amp;buf[page]);</div><div class='del'>-		if(dat != -1) {</div><div class='del'>-			ret = 1;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	for (page = oobsize; page &lt; ops.len; page += sizeof(long)) {</div><div class='add'>+		long dat = *(long *)(&amp;ops.oobbuf[page]);</div><div class='add'>+		if(dat != -1)</div><div class='add'>+			return 1;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(buf);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-*	Scan for a valid cleanmarker and for bad blocks</div><div class='del'>-*	For virtual blocks (concatenated physical blocks) check the cleanmarker</div><div class='del'>-*	only in the first page of the first physical block, but scan for bad blocks in all</div><div class='del'>-*	physical blocks</div><div class='del'>-*/</div><div class='del'>-int jffs2_check_nand_cleanmarker (struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='add'>+ * Scan for a valid cleanmarker and for bad blocks</div><div class='add'>+ */</div><div class='add'>+int jffs2_check_nand_cleanmarker (struct jffs2_sb_info *c,</div><div class='add'>+				  struct jffs2_eraseblock *jeb)</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_unknown_node n;</div><div class='del'>-	unsigned char buf[2 * NAND_MAX_OOBSIZE];</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	int ret, i, cnt, retval = 0;</div><div class='del'>-	size_t retlen, offset;</div><div class='del'>-	int oob_size;</div><div class='del'>-</div><div class='del'>-	offset = jeb-&gt;offset;</div><div class='del'>-	oob_size = c-&gt;mtd-&gt;oobsize;</div><div class='del'>-</div><div class='del'>-	/* Loop through the physical blocks */</div><div class='del'>-	for (cnt = 0; cnt &lt; (c-&gt;sector_size / c-&gt;mtd-&gt;erasesize); cnt++) {</div><div class='del'>-		/* Check first if the block is bad. */</div><div class='del'>-		if (c-&gt;mtd-&gt;block_isbad (c-&gt;mtd, offset)) {</div><div class='del'>-			D1 (printk (KERN_WARNING "jffs2_check_nand_cleanmarker(): Bad block at %08x\n", jeb-&gt;offset));</div><div class='del'>-			return 2;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		   *    We read oob data from page 0 and 1 of the block.</div><div class='del'>-		   *    page 0 contains cleanmarker and badblock info</div><div class='del'>-		   *    page 1 contains failure count of this block</div><div class='del'>-		 */</div><div class='del'>-		ret = c-&gt;mtd-&gt;read_oob (c-&gt;mtd, offset, oob_size &lt;&lt; 1, &amp;retlen, buf);</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='add'>+	int oobsize = c-&gt;mtd-&gt;oobsize;</div><div class='add'>+	unsigned char *p,*b;</div><div class='add'>+	int i, ret;</div><div class='add'>+	size_t offset = jeb-&gt;offset;</div><div class='add'>+</div><div class='add'>+	/* Check first if the block is bad. */</div><div class='add'>+	if (c-&gt;mtd-&gt;block_isbad(c-&gt;mtd, offset)) {</div><div class='add'>+		D1 (printk(KERN_WARNING "jffs2_check_nand_cleanmarker()"</div><div class='add'>+			   ": Bad block at %08x\n", jeb-&gt;offset));</div><div class='add'>+		return 2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (ret) {</div><div class='del'>-			D1 (printk (KERN_WARNING "jffs2_check_nand_cleanmarker(): Read OOB failed %d for block at %08x\n", ret, jeb-&gt;offset));</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-		if (retlen &lt; (oob_size &lt;&lt; 1)) {</div><div class='del'>-			D1 (printk (KERN_WARNING "jffs2_check_nand_cleanmarker(): Read OOB return short read (%zd bytes not %d) for block at %08x\n", retlen, oob_size &lt;&lt; 1, jeb-&gt;offset));</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='add'>+	ops.len = oobsize;</div><div class='add'>+	ops.ooblen = oobsize;</div><div class='add'>+	ops.oobbuf = c-&gt;oobbuf;</div><div class='add'>+	ops.ooboffs = 0;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='ctx'> </div><div class='del'>-		/* Check cleanmarker only on the first physical block */</div><div class='del'>-		if (!cnt) {</div><div class='del'>-			n.magic = cpu_to_je16 (JFFS2_MAGIC_BITMASK);</div><div class='del'>-			n.nodetype = cpu_to_je16 (JFFS2_NODETYPE_CLEANMARKER);</div><div class='del'>-			n.totlen = cpu_to_je32 (8);</div><div class='del'>-			p = (unsigned char *) &amp;n;</div><div class='add'>+	ret = c-&gt;mtd-&gt;read_oob(c-&gt;mtd, offset, &amp;ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		D1 (printk(KERN_WARNING "jffs2_check_nand_cleanmarker(): "</div><div class='add'>+			   "Read OOB failed %d for block at %08x\n",</div><div class='add'>+			   ret, jeb-&gt;offset));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; c-&gt;fsdata_len; i++) {</div><div class='del'>-				if (buf[c-&gt;fsdata_pos + i] != p[i]) {</div><div class='del'>-					retval = 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			D1(if (retval == 1) {</div><div class='del'>-				printk(KERN_WARNING "jffs2_check_nand_cleanmarker(): Cleanmarker node not detected in block at %08x\n", jeb-&gt;offset);</div><div class='del'>-				printk(KERN_WARNING "OOB at %08x was ", offset);</div><div class='del'>-				for (i=0; i &lt; oob_size; i++) {</div><div class='del'>-					printk("%02x ", buf[i]);</div><div class='del'>-				}</div><div class='del'>-				printk("\n");</div><div class='del'>-			})</div><div class='del'>-		}</div><div class='del'>-		offset += c-&gt;mtd-&gt;erasesize;</div><div class='add'>+	if (ops.retlen &lt; ops.len) {</div><div class='add'>+		D1 (printk (KERN_WARNING "jffs2_check_nand_cleanmarker(): "</div><div class='add'>+			    "Read OOB return short read (%zd bytes not %d) "</div><div class='add'>+			    "for block at %08x\n", ops.retlen, ops.len,</div><div class='add'>+			    jeb-&gt;offset));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	return retval;</div><div class='add'>+</div><div class='add'>+	n.magic = cpu_to_je16 (JFFS2_MAGIC_BITMASK);</div><div class='add'>+	n.nodetype = cpu_to_je16 (JFFS2_NODETYPE_CLEANMARKER);</div><div class='add'>+	n.totlen = cpu_to_je32 (8);</div><div class='add'>+	p = (unsigned char *) &amp;n;</div><div class='add'>+	b = c-&gt;oobbuf + c-&gt;fsdata_pos;</div><div class='add'>+</div><div class='add'>+	for (i = c-&gt;fsdata_len; i; i--) {</div><div class='add'>+		if (*b++ != *p++)</div><div class='add'>+			ret = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	D1(if (ret == 1) {</div><div class='add'>+		printk(KERN_WARNING "jffs2_check_nand_cleanmarker(): "</div><div class='add'>+		       "Cleanmarker node not detected in block at %08x\n",</div><div class='add'>+		       offset);</div><div class='add'>+		printk(KERN_WARNING "OOB at %08zx was ", offset);</div><div class='add'>+		for (i=0; i &lt; oobsize; i++)</div><div class='add'>+			printk("%02x ", c-&gt;oobbuf[i]);</div><div class='add'>+		printk("\n");</div><div class='add'>+	});</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jffs2_write_nand_cleanmarker(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)</div><div class='add'>+int jffs2_write_nand_cleanmarker(struct jffs2_sb_info *c,</div><div class='add'>+				 struct jffs2_eraseblock *jeb)</div><div class='ctx'> {</div><div class='del'>-	struct 	jffs2_unknown_node n;</div><div class='del'>-	int 	ret;</div><div class='del'>-	size_t 	retlen;</div><div class='add'>+	struct jffs2_unknown_node n;</div><div class='add'>+	int	ret;</div><div class='add'>+	struct mtd_oob_ops ops;</div><div class='ctx'> </div><div class='ctx'> 	n.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);</div><div class='ctx'> 	n.nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER);</div><div class='ctx'> 	n.totlen = cpu_to_je32(8);</div><div class='ctx'> </div><div class='del'>-	ret = jffs2_flash_write_oob(c, jeb-&gt;offset + c-&gt;fsdata_pos, c-&gt;fsdata_len, &amp;retlen, (unsigned char *)&amp;n);</div><div class='add'>+	ops.len = c-&gt;fsdata_len;</div><div class='add'>+	ops.ooblen = c-&gt;fsdata_len;;</div><div class='add'>+	ops.oobbuf = (uint8_t *)&amp;n;</div><div class='add'>+	ops.ooboffs = c-&gt;fsdata_pos;</div><div class='add'>+	ops.datbuf = NULL;</div><div class='add'>+	ops.mode = MTD_OOB_PLACE;</div><div class='add'>+</div><div class='add'>+	ret = c-&gt;mtd-&gt;write_oob(c-&gt;mtd, jeb-&gt;offset, &amp;ops);</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='del'>-		D1(printk(KERN_WARNING "jffs2_write_nand_cleanmarker(): Write failed for block at %08x: error %d\n", jeb-&gt;offset, ret));</div><div class='add'>+		D1(printk(KERN_WARNING "jffs2_write_nand_cleanmarker(): "</div><div class='add'>+			  "Write failed for block at %08x: error %d\n",</div><div class='add'>+			  jeb-&gt;offset, ret));</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	if (retlen != c-&gt;fsdata_len) {</div><div class='del'>-		D1(printk(KERN_WARNING "jffs2_write_nand_cleanmarker(): Short write for block at %08x: %zd not %d\n", jeb-&gt;offset, retlen, c-&gt;fsdata_len));</div><div class='del'>-		return ret;</div><div class='add'>+	if (ops.retlen != ops.len) {</div><div class='add'>+		D1(printk(KERN_WARNING "jffs2_write_nand_cleanmarker(): "</div><div class='add'>+			  "Short write for block at %08x: %zd not %d\n",</div><div class='add'>+			  jeb-&gt;offset, ops.retlen, ops.len));</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1108,18 +1142,9 @@ int jffs2_write_nand_badblock(struct jffs2_sb_info *c, struct jffs2_eraseblock *</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define NAND_JFFS2_OOB16_FSDALEN	8</div><div class='del'>-</div><div class='del'>-static struct nand_oobinfo jffs2_oobinfo_docecc = {</div><div class='del'>-	.useecc = MTD_NANDECC_PLACE,</div><div class='del'>-	.eccbytes = 6,</div><div class='del'>-	.eccpos = {0,1,2,3,4,5}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static int jffs2_nand_set_oobinfo(struct jffs2_sb_info *c)</div><div class='ctx'> {</div><div class='del'>-	struct nand_oobinfo *oinfo = &amp;c-&gt;mtd-&gt;oobinfo;</div><div class='add'>+	struct nand_ecclayout *oinfo = c-&gt;mtd-&gt;ecclayout;</div><div class='ctx'> </div><div class='ctx'> 	/* Do this only, if we have an oob buffer */</div><div class='ctx'> 	if (!c-&gt;mtd-&gt;oobsize)</div><div class='hunk'>@@ -1129,33 +1154,23 @@ static int jffs2_nand_set_oobinfo(struct jffs2_sb_info *c)</div><div class='ctx'> 	c-&gt;cleanmarker_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Should we use autoplacement ? */</div><div class='del'>-	if (oinfo &amp;&amp; oinfo-&gt;useecc == MTD_NANDECC_AUTOPLACE) {</div><div class='del'>-		D1(printk(KERN_DEBUG "JFFS2 using autoplace on NAND\n"));</div><div class='del'>-		/* Get the position of the free bytes */</div><div class='del'>-		if (!oinfo-&gt;oobfree[0][1]) {</div><div class='del'>-			printk (KERN_WARNING "jffs2_nand_set_oobinfo(): Eeep. Autoplacement selected and no empty space in oob\n");</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-		}</div><div class='del'>-		c-&gt;fsdata_pos = oinfo-&gt;oobfree[0][0];</div><div class='del'>-		c-&gt;fsdata_len = oinfo-&gt;oobfree[0][1];</div><div class='del'>-		if (c-&gt;fsdata_len &gt; 8)</div><div class='del'>-			c-&gt;fsdata_len = 8;</div><div class='del'>-	} else {</div><div class='del'>-		/* This is just a legacy fallback and should go away soon */</div><div class='del'>-		switch(c-&gt;mtd-&gt;ecctype) {</div><div class='del'>-		case MTD_ECC_RS_DiskOnChip:</div><div class='del'>-			printk(KERN_WARNING "JFFS2 using DiskOnChip hardware ECC without autoplacement. Fix it!\n");</div><div class='del'>-			c-&gt;oobinfo = &amp;jffs2_oobinfo_docecc;</div><div class='del'>-			c-&gt;fsdata_pos = 6;</div><div class='del'>-			c-&gt;fsdata_len = NAND_JFFS2_OOB16_FSDALEN;</div><div class='del'>-			c-&gt;badblock_pos = 15;</div><div class='del'>-			break;</div><div class='add'>+	if (!oinfo) {</div><div class='add'>+		D1(printk(KERN_DEBUG "JFFS2 on NAND. No autoplacment info found\n"));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			D1(printk(KERN_DEBUG "JFFS2 on NAND. No autoplacment info found\n"));</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='add'>+	D1(printk(KERN_DEBUG "JFFS2 using autoplace on NAND\n"));</div><div class='add'>+	/* Get the position of the free bytes */</div><div class='add'>+	if (!oinfo-&gt;oobfree[0].length) {</div><div class='add'>+		printk (KERN_WARNING "jffs2_nand_set_oobinfo(): Eeep."</div><div class='add'>+			" Autoplacement selected and no empty space in oob\n");</div><div class='add'>+		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='add'>+	c-&gt;fsdata_pos = oinfo-&gt;oobfree[0].offset;</div><div class='add'>+	c-&gt;fsdata_len = oinfo-&gt;oobfree[0].length;</div><div class='add'>+	if (c-&gt;fsdata_len &gt; 8)</div><div class='add'>+		c-&gt;fsdata_len = 8;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1165,13 +1180,17 @@ int jffs2_nand_flash_setup(struct jffs2_sb_info *c)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialise write buffer */</div><div class='ctx'> 	init_rwsem(&amp;c-&gt;wbuf_sem);</div><div class='del'>-	c-&gt;wbuf_pagesize = c-&gt;mtd-&gt;oobblock;</div><div class='add'>+	c-&gt;wbuf_pagesize = c-&gt;mtd-&gt;writesize;</div><div class='ctx'> 	c-&gt;wbuf_ofs = 0xFFFFFFFF;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;wbuf = kmalloc(c-&gt;wbuf_pagesize, GFP_KERNEL);</div><div class='ctx'> 	if (!c-&gt;wbuf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	c-&gt;oobbuf = kmalloc(NR_OOB_SCAN_PAGES * c-&gt;mtd-&gt;oobsize, GFP_KERNEL);</div><div class='add'>+	if (!c-&gt;oobbuf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	res = jffs2_nand_set_oobinfo(c);</div><div class='ctx'> </div><div class='ctx'> #ifdef BREAKME</div><div class='hunk'>@@ -1189,6 +1208,7 @@ int jffs2_nand_flash_setup(struct jffs2_sb_info *c)</div><div class='ctx'> void jffs2_nand_flash_cleanup(struct jffs2_sb_info *c)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(c-&gt;wbuf);</div><div class='add'>+	kfree(c-&gt;oobbuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int jffs2_dataflash_setup(struct jffs2_sb_info *c) {</div><div class='hunk'>@@ -1236,33 +1256,14 @@ void jffs2_dataflash_cleanup(struct jffs2_sb_info *c) {</div><div class='ctx'> 	kfree(c-&gt;wbuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int jffs2_nor_ecc_flash_setup(struct jffs2_sb_info *c) {</div><div class='del'>-	/* Cleanmarker is actually larger on the flashes */</div><div class='del'>-	c-&gt;cleanmarker_size = 16;</div><div class='del'>-</div><div class='del'>-	/* Initialize write buffer */</div><div class='del'>-	init_rwsem(&amp;c-&gt;wbuf_sem);</div><div class='del'>-	c-&gt;wbuf_pagesize = c-&gt;mtd-&gt;eccsize;</div><div class='del'>-	c-&gt;wbuf_ofs = 0xFFFFFFFF;</div><div class='del'>-</div><div class='del'>-	c-&gt;wbuf = kmalloc(c-&gt;wbuf_pagesize, GFP_KERNEL);</div><div class='del'>-	if (!c-&gt;wbuf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void jffs2_nor_ecc_flash_cleanup(struct jffs2_sb_info *c) {</div><div class='del'>-	kfree(c-&gt;wbuf);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int jffs2_nor_wbuf_flash_setup(struct jffs2_sb_info *c) {</div><div class='del'>-	/* Cleanmarker currently occupies a whole programming region */</div><div class='del'>-	c-&gt;cleanmarker_size = MTD_PROGREGION_SIZE(c-&gt;mtd);</div><div class='add'>+	/* Cleanmarker currently occupies whole programming regions,</div><div class='add'>+	 * either one or 2 for 8Byte STMicro flashes. */</div><div class='add'>+	c-&gt;cleanmarker_size = max(16u, c-&gt;mtd-&gt;writesize);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize write buffer */</div><div class='ctx'> 	init_rwsem(&amp;c-&gt;wbuf_sem);</div><div class='del'>-	c-&gt;wbuf_pagesize = MTD_PROGREGION_SIZE(c-&gt;mtd);</div><div class='add'>+	c-&gt;wbuf_pagesize = c-&gt;mtd-&gt;writesize;</div><div class='ctx'> 	c-&gt;wbuf_ofs = 0xFFFFFFFF;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;wbuf = kmalloc(c-&gt;wbuf_pagesize, GFP_KERNEL);</div><div class='head'>diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c<br/>index 1342f0158e9b..67176792e138 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jffs2/write.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jffs2/write.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/write.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/write.c</a></div><div class='hunk'>@@ -37,7 +37,6 @@ int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint</div><div class='ctx'> 	f-&gt;inocache-&gt;nodes = (struct jffs2_raw_node_ref *)f-&gt;inocache;</div><div class='ctx'> 	f-&gt;inocache-&gt;state = INO_STATE_PRESENT;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	jffs2_add_ino_cache(c, f-&gt;inocache);</div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_do_new_inode(): Assigned ino# %d\n", f-&gt;inocache-&gt;ino));</div><div class='ctx'> 	ri-&gt;ino = cpu_to_je32(f-&gt;inocache-&gt;ino);</div><div class='hunk'>@@ -57,12 +56,14 @@ int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint</div><div class='ctx'> /* jffs2_write_dnode - given a raw_inode, allocate a full_dnode for it,</div><div class='ctx'>    write it to the flash, link it into the existing inode/fragment list */</div><div class='ctx'> </div><div class='del'>-struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_inode *ri, const unsigned char *data, uint32_t datalen, uint32_t flash_ofs, int alloc_mode)</div><div class='add'>+struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='add'>+					   struct jffs2_raw_inode *ri, const unsigned char *data,</div><div class='add'>+					   uint32_t datalen, int alloc_mode)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *raw;</div><div class='ctx'> 	struct jffs2_full_dnode *fn;</div><div class='ctx'> 	size_t retlen;</div><div class='add'>+	uint32_t flash_ofs;</div><div class='ctx'> 	struct kvec vecs[2];</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int retried = 0;</div><div class='hunk'>@@ -78,34 +79,21 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2</div><div class='ctx'> 	vecs[1].iov_base = (unsigned char *)data;</div><div class='ctx'> 	vecs[1].iov_len = datalen;</div><div class='ctx'> </div><div class='del'>-	jffs2_dbg_prewrite_paranoia_check(c, flash_ofs, vecs[0].iov_len + vecs[1].iov_len);</div><div class='del'>-</div><div class='ctx'> 	if (je32_to_cpu(ri-&gt;totlen) != sizeof(*ri) + datalen) {</div><div class='ctx'> 		printk(KERN_WARNING "jffs2_write_dnode: ri-&gt;totlen (0x%08x) != sizeof(*ri) (0x%08zx) + datalen (0x%08x)\n", je32_to_cpu(ri-&gt;totlen), sizeof(*ri), datalen);</div><div class='ctx'> 	}</div><div class='del'>-	raw = jffs2_alloc_raw_node_ref();</div><div class='del'>-	if (!raw)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='ctx'> 	fn = jffs2_alloc_full_dnode();</div><div class='del'>-	if (!fn) {</div><div class='del'>-		jffs2_free_raw_node_ref(raw);</div><div class='add'>+	if (!fn)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fn-&gt;ofs = je32_to_cpu(ri-&gt;offset);</div><div class='del'>-	fn-&gt;size = je32_to_cpu(ri-&gt;dsize);</div><div class='del'>-	fn-&gt;frags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check number of valid vecs */</div><div class='ctx'> 	if (!datalen || !data)</div><div class='ctx'> 		cnt = 1;</div><div class='ctx'>  retry:</div><div class='del'>-	fn-&gt;raw = raw;</div><div class='add'>+	flash_ofs = write_ofs(c);</div><div class='ctx'> </div><div class='del'>-	raw-&gt;flash_offset = flash_ofs;</div><div class='del'>-	raw-&gt;__totlen = PAD(sizeof(*ri)+datalen);</div><div class='del'>-	raw-&gt;next_phys = NULL;</div><div class='add'>+	jffs2_dbg_prewrite_paranoia_check(c, flash_ofs, vecs[0].iov_len + vecs[1].iov_len);</div><div class='ctx'> </div><div class='ctx'> 	if ((alloc_mode!=ALLOC_GC) &amp;&amp; (je32_to_cpu(ri-&gt;version) &lt; f-&gt;highest_version)) {</div><div class='ctx'> 		BUG_ON(!retried);</div><div class='hunk'>@@ -125,22 +113,16 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2</div><div class='ctx'> </div><div class='ctx'> 		/* Mark the space as dirtied */</div><div class='ctx'> 		if (retlen) {</div><div class='del'>-			/* Doesn't belong to any inode */</div><div class='del'>-			raw-&gt;next_in_ino = NULL;</div><div class='del'>-</div><div class='ctx'> 			/* Don't change raw-&gt;size to match retlen. We may have</div><div class='ctx'> 			   written the node header already, and only the data will</div><div class='ctx'> 			   seem corrupted, in which case the scan would skip over</div><div class='ctx'> 			   any node we write before the original intended end of</div><div class='ctx'> 			   this node */</div><div class='del'>-			raw-&gt;flash_offset |= REF_OBSOLETE;</div><div class='del'>-			jffs2_add_physical_node_ref(c, raw);</div><div class='del'>-			jffs2_mark_node_obsolete(c, raw);</div><div class='add'>+			jffs2_add_physical_node_ref(c, flash_ofs | REF_OBSOLETE, PAD(sizeof(*ri)+datalen), NULL);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", raw-&gt;flash_offset);</div><div class='del'>-			jffs2_free_raw_node_ref(raw);</div><div class='add'>+			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", flash_ofs);</div><div class='ctx'> 		}</div><div class='del'>-		if (!retried &amp;&amp; alloc_mode != ALLOC_NORETRY &amp;&amp; (raw = jffs2_alloc_raw_node_ref())) {</div><div class='add'>+		if (!retried &amp;&amp; alloc_mode != ALLOC_NORETRY) {</div><div class='ctx'> 			/* Try to reallocate space and retry */</div><div class='ctx'> 			uint32_t dummy;</div><div class='ctx'> 			struct jffs2_eraseblock *jeb = &amp;c-&gt;blocks[flash_ofs / c-&gt;sector_size];</div><div class='hunk'>@@ -153,19 +135,20 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2</div><div class='ctx'> 			jffs2_dbg_acct_paranoia_check(c, jeb);</div><div class='ctx'> </div><div class='ctx'> 			if (alloc_mode == ALLOC_GC) {</div><div class='del'>-				ret = jffs2_reserve_space_gc(c, sizeof(*ri) + datalen, &amp;flash_ofs,</div><div class='del'>-							&amp;dummy, JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+				ret = jffs2_reserve_space_gc(c, sizeof(*ri) + datalen, &amp;dummy,</div><div class='add'>+							     JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Locking pain */</div><div class='ctx'> 				up(&amp;f-&gt;sem);</div><div class='ctx'> 				jffs2_complete_reservation(c);</div><div class='ctx'> </div><div class='del'>-				ret = jffs2_reserve_space(c, sizeof(*ri) + datalen, &amp;flash_ofs,</div><div class='del'>-							&amp;dummy, alloc_mode, JFFS2_SUMMARY_INODE_SIZE);</div><div class='add'>+				ret = jffs2_reserve_space(c, sizeof(*ri) + datalen, &amp;dummy,</div><div class='add'>+							  alloc_mode, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 				down(&amp;f-&gt;sem);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (!ret) {</div><div class='add'>+				flash_ofs = write_ofs(c);</div><div class='ctx'> 				D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", flash_ofs));</div><div class='ctx'> </div><div class='ctx'> 				jffs2_dbg_acct_sanity_check(c,jeb);</div><div class='hunk'>@@ -174,7 +157,6 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));</div><div class='del'>-			jffs2_free_raw_node_ref(raw);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Release the full_dnode which is now useless, and return */</div><div class='ctx'> 		jffs2_free_full_dnode(fn);</div><div class='hunk'>@@ -188,20 +170,17 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2</div><div class='ctx'> 	if ((je32_to_cpu(ri-&gt;dsize) &gt;= PAGE_CACHE_SIZE) ||</div><div class='ctx'> 	    ( ((je32_to_cpu(ri-&gt;offset)&amp;(PAGE_CACHE_SIZE-1))==0) &amp;&amp;</div><div class='ctx'> 	      (je32_to_cpu(ri-&gt;dsize)+je32_to_cpu(ri-&gt;offset) ==  je32_to_cpu(ri-&gt;isize)))) {</div><div class='del'>-		raw-&gt;flash_offset |= REF_PRISTINE;</div><div class='add'>+		flash_ofs |= REF_PRISTINE;</div><div class='ctx'> 	} else {</div><div class='del'>-		raw-&gt;flash_offset |= REF_NORMAL;</div><div class='add'>+		flash_ofs |= REF_NORMAL;</div><div class='ctx'> 	}</div><div class='del'>-	jffs2_add_physical_node_ref(c, raw);</div><div class='del'>-</div><div class='del'>-	/* Link into per-inode list */</div><div class='del'>-	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	raw-&gt;next_in_ino = f-&gt;inocache-&gt;nodes;</div><div class='del'>-	f-&gt;inocache-&gt;nodes = raw;</div><div class='del'>-	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	fn-&gt;raw = jffs2_add_physical_node_ref(c, flash_ofs, PAD(sizeof(*ri)+datalen), f-&gt;inocache);</div><div class='add'>+	fn-&gt;ofs = je32_to_cpu(ri-&gt;offset);</div><div class='add'>+	fn-&gt;size = je32_to_cpu(ri-&gt;dsize);</div><div class='add'>+	fn-&gt;frags = 0;</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_write_dnode wrote node at 0x%08x(%d) with dsize 0x%x, csize 0x%x, node_crc 0x%08x, data_crc 0x%08x, totlen 0x%08x\n",</div><div class='del'>-		  flash_ofs, ref_flags(raw), je32_to_cpu(ri-&gt;dsize),</div><div class='add'>+		  flash_ofs &amp; ~3, flash_ofs &amp; 3, je32_to_cpu(ri-&gt;dsize),</div><div class='ctx'> 		  je32_to_cpu(ri-&gt;csize), je32_to_cpu(ri-&gt;node_crc),</div><div class='ctx'> 		  je32_to_cpu(ri-&gt;data_crc), je32_to_cpu(ri-&gt;totlen)));</div><div class='ctx'> </div><div class='hunk'>@@ -212,12 +191,14 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2</div><div class='ctx'> 	return fn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_raw_dirent *rd, const unsigned char *name, uint32_t namelen, uint32_t flash_ofs, int alloc_mode)</div><div class='add'>+struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='add'>+					     struct jffs2_raw_dirent *rd, const unsigned char *name,</div><div class='add'>+					     uint32_t namelen, int alloc_mode)</div><div class='ctx'> {</div><div class='del'>-	struct jffs2_raw_node_ref *raw;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='ctx'> 	size_t retlen;</div><div class='ctx'> 	struct kvec vecs[2];</div><div class='add'>+	uint32_t flash_ofs;</div><div class='ctx'> 	int retried = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -228,26 +209,16 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff</div><div class='ctx'> 	D1(if(je32_to_cpu(rd-&gt;hdr_crc) != crc32(0, rd, sizeof(struct jffs2_unknown_node)-4)) {</div><div class='ctx'> 		printk(KERN_CRIT "Eep. CRC not correct in jffs2_write_dirent()\n");</div><div class='ctx'> 		BUG();</div><div class='del'>-	}</div><div class='del'>-	   );</div><div class='add'>+	   });</div><div class='ctx'> </div><div class='ctx'> 	vecs[0].iov_base = rd;</div><div class='ctx'> 	vecs[0].iov_len = sizeof(*rd);</div><div class='ctx'> 	vecs[1].iov_base = (unsigned char *)name;</div><div class='ctx'> 	vecs[1].iov_len = namelen;</div><div class='ctx'> </div><div class='del'>-	jffs2_dbg_prewrite_paranoia_check(c, flash_ofs, vecs[0].iov_len + vecs[1].iov_len);</div><div class='del'>-</div><div class='del'>-	raw = jffs2_alloc_raw_node_ref();</div><div class='del'>-</div><div class='del'>-	if (!raw)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='ctx'> 	fd = jffs2_alloc_full_dirent(namelen+1);</div><div class='del'>-	if (!fd) {</div><div class='del'>-		jffs2_free_raw_node_ref(raw);</div><div class='add'>+	if (!fd)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	fd-&gt;version = je32_to_cpu(rd-&gt;version);</div><div class='ctx'> 	fd-&gt;ino = je32_to_cpu(rd-&gt;ino);</div><div class='hunk'>@@ -257,11 +228,9 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff</div><div class='ctx'> 	fd-&gt;name[namelen]=0;</div><div class='ctx'> </div><div class='ctx'>  retry:</div><div class='del'>-	fd-&gt;raw = raw;</div><div class='add'>+	flash_ofs = write_ofs(c);</div><div class='ctx'> </div><div class='del'>-	raw-&gt;flash_offset = flash_ofs;</div><div class='del'>-	raw-&gt;__totlen = PAD(sizeof(*rd)+namelen);</div><div class='del'>-	raw-&gt;next_phys = NULL;</div><div class='add'>+	jffs2_dbg_prewrite_paranoia_check(c, flash_ofs, vecs[0].iov_len + vecs[1].iov_len);</div><div class='ctx'> </div><div class='ctx'> 	if ((alloc_mode!=ALLOC_GC) &amp;&amp; (je32_to_cpu(rd-&gt;version) &lt; f-&gt;highest_version)) {</div><div class='ctx'> 		BUG_ON(!retried);</div><div class='hunk'>@@ -280,15 +249,11 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff</div><div class='ctx'> 			       sizeof(*rd)+namelen, flash_ofs, ret, retlen);</div><div class='ctx'> 		/* Mark the space as dirtied */</div><div class='ctx'> 		if (retlen) {</div><div class='del'>-			raw-&gt;next_in_ino = NULL;</div><div class='del'>-			raw-&gt;flash_offset |= REF_OBSOLETE;</div><div class='del'>-			jffs2_add_physical_node_ref(c, raw);</div><div class='del'>-			jffs2_mark_node_obsolete(c, raw);</div><div class='add'>+			jffs2_add_physical_node_ref(c, flash_ofs | REF_OBSOLETE, PAD(sizeof(*rd)+namelen), NULL);</div><div class='ctx'> 		} else {</div><div class='del'>-			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", raw-&gt;flash_offset);</div><div class='del'>-			jffs2_free_raw_node_ref(raw);</div><div class='add'>+			printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", flash_ofs);</div><div class='ctx'> 		}</div><div class='del'>-		if (!retried &amp;&amp; (raw = jffs2_alloc_raw_node_ref())) {</div><div class='add'>+		if (!retried) {</div><div class='ctx'> 			/* Try to reallocate space and retry */</div><div class='ctx'> 			uint32_t dummy;</div><div class='ctx'> 			struct jffs2_eraseblock *jeb = &amp;c-&gt;blocks[flash_ofs / c-&gt;sector_size];</div><div class='hunk'>@@ -301,39 +266,33 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff</div><div class='ctx'> 			jffs2_dbg_acct_paranoia_check(c, jeb);</div><div class='ctx'> </div><div class='ctx'> 			if (alloc_mode == ALLOC_GC) {</div><div class='del'>-				ret = jffs2_reserve_space_gc(c, sizeof(*rd) + namelen, &amp;flash_ofs,</div><div class='del'>-							&amp;dummy, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='add'>+				ret = jffs2_reserve_space_gc(c, sizeof(*rd) + namelen, &amp;dummy,</div><div class='add'>+							     JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Locking pain */</div><div class='ctx'> 				up(&amp;f-&gt;sem);</div><div class='ctx'> 				jffs2_complete_reservation(c);</div><div class='ctx'> </div><div class='del'>-				ret = jffs2_reserve_space(c, sizeof(*rd) + namelen, &amp;flash_ofs,</div><div class='del'>-							&amp;dummy, alloc_mode, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='add'>+				ret = jffs2_reserve_space(c, sizeof(*rd) + namelen, &amp;dummy,</div><div class='add'>+							  alloc_mode, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 				down(&amp;f-&gt;sem);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (!ret) {</div><div class='add'>+				flash_ofs = write_ofs(c);</div><div class='ctx'> 				D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", flash_ofs));</div><div class='ctx'> 				jffs2_dbg_acct_sanity_check(c,jeb);</div><div class='ctx'> 				jffs2_dbg_acct_paranoia_check(c, jeb);</div><div class='ctx'> 				goto retry;</div><div class='ctx'> 			}</div><div class='ctx'> 			D1(printk(KERN_DEBUG "Failed to allocate space to retry failed write: %d!\n", ret));</div><div class='del'>-			jffs2_free_raw_node_ref(raw);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Release the full_dnode which is now useless, and return */</div><div class='ctx'> 		jffs2_free_full_dirent(fd);</div><div class='ctx'> 		return ERR_PTR(ret?ret:-EIO);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Mark the space used */</div><div class='del'>-	raw-&gt;flash_offset |= REF_PRISTINE;</div><div class='del'>-	jffs2_add_physical_node_ref(c, raw);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='del'>-	raw-&gt;next_in_ino = f-&gt;inocache-&gt;nodes;</div><div class='del'>-	f-&gt;inocache-&gt;nodes = raw;</div><div class='del'>-	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	fd-&gt;raw = jffs2_add_physical_node_ref(c, flash_ofs | REF_PRISTINE, PAD(sizeof(*rd)+namelen), f-&gt;inocache);</div><div class='ctx'> </div><div class='ctx'> 	if (retried) {</div><div class='ctx'> 		jffs2_dbg_acct_sanity_check(c,NULL);</div><div class='hunk'>@@ -359,14 +318,14 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='ctx'> 		struct jffs2_full_dnode *fn;</div><div class='ctx'> 		unsigned char *comprbuf = NULL;</div><div class='ctx'> 		uint16_t comprtype = JFFS2_COMPR_NONE;</div><div class='del'>-		uint32_t phys_ofs, alloclen;</div><div class='add'>+		uint32_t alloclen;</div><div class='ctx'> 		uint32_t datalen, cdatalen;</div><div class='ctx'> 		int retried = 0;</div><div class='ctx'> </div><div class='ctx'> 	retry:</div><div class='ctx'> 		D2(printk(KERN_DEBUG "jffs2_commit_write() loop: 0x%x to write to 0x%x\n", writelen, offset));</div><div class='ctx'> </div><div class='del'>-		ret = jffs2_reserve_space(c, sizeof(*ri) + JFFS2_MIN_DATA_LEN, &amp;phys_ofs,</div><div class='add'>+		ret = jffs2_reserve_space(c, sizeof(*ri) + JFFS2_MIN_DATA_LEN,</div><div class='ctx'> 					&amp;alloclen, ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			D1(printk(KERN_DEBUG "jffs2_reserve_space returned %d\n", ret));</div><div class='hunk'>@@ -394,7 +353,7 @@ int jffs2_write_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,</div><div class='ctx'> 		ri-&gt;node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));</div><div class='ctx'> 		ri-&gt;data_crc = cpu_to_je32(crc32(0, comprbuf, cdatalen));</div><div class='ctx'> </div><div class='del'>-		fn = jffs2_write_dnode(c, f, ri, comprbuf, cdatalen, phys_ofs, ALLOC_NORETRY);</div><div class='add'>+		fn = jffs2_write_dnode(c, f, ri, comprbuf, cdatalen, ALLOC_NORETRY);</div><div class='ctx'> </div><div class='ctx'> 		jffs2_free_comprbuf(comprbuf, buf);</div><div class='ctx'> </div><div class='hunk'>@@ -448,13 +407,13 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str</div><div class='ctx'> 	struct jffs2_raw_dirent *rd;</div><div class='ctx'> 	struct jffs2_full_dnode *fn;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Try to reserve enough space for both node and dirent.</div><div class='ctx'> 	 * Just the node will do for now, though</div><div class='ctx'> 	 */</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*ri), &amp;phys_ofs, &amp;alloclen, ALLOC_NORMAL,</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*ri), &amp;alloclen, ALLOC_NORMAL,</div><div class='ctx'> 				JFFS2_SUMMARY_INODE_SIZE);</div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_do_create(): reserved 0x%x bytes\n", alloclen));</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -465,7 +424,7 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str</div><div class='ctx'> 	ri-&gt;data_crc = cpu_to_je32(0);</div><div class='ctx'> 	ri-&gt;node_crc = cpu_to_je32(crc32(0, ri, sizeof(*ri)-8));</div><div class='ctx'> </div><div class='del'>-	fn = jffs2_write_dnode(c, f, ri, NULL, 0, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fn = jffs2_write_dnode(c, f, ri, NULL, 0, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	D1(printk(KERN_DEBUG "jffs2_do_create created file with mode 0x%x\n",</div><div class='ctx'> 		  jemode_to_cpu(ri-&gt;mode)));</div><div class='hunk'>@@ -484,7 +443,7 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str</div><div class='ctx'> </div><div class='ctx'> 	up(&amp;f-&gt;sem);</div><div class='ctx'> 	jffs2_complete_reservation(c);</div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;phys_ofs, &amp;alloclen,</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;alloclen,</div><div class='ctx'> 				ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> </div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -516,7 +475,7 @@ int jffs2_do_create(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, str</div><div class='ctx'> 	rd-&gt;node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));</div><div class='ctx'> 	rd-&gt;name_crc = cpu_to_je32(crc32(0, name, namelen));</div><div class='ctx'> </div><div class='del'>-	fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_free_raw_dirent(rd);</div><div class='ctx'> </div><div class='hunk'>@@ -545,7 +504,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_raw_dirent *rd;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (1 /* alternative branch needs testing */ ||</div><div class='hunk'>@@ -556,7 +515,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,</div><div class='ctx'> 		if (!rd)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;phys_ofs, &amp;alloclen,</div><div class='add'>+		ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;alloclen,</div><div class='ctx'> 					ALLOC_DELETION, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			jffs2_free_raw_dirent(rd);</div><div class='hunk'>@@ -580,7 +539,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,</div><div class='ctx'> 		rd-&gt;node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));</div><div class='ctx'> 		rd-&gt;name_crc = cpu_to_je32(crc32(0, name, namelen));</div><div class='ctx'> </div><div class='del'>-		fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, phys_ofs, ALLOC_DELETION);</div><div class='add'>+		fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, ALLOC_DELETION);</div><div class='ctx'> </div><div class='ctx'> 		jffs2_free_raw_dirent(rd);</div><div class='ctx'> </div><div class='hunk'>@@ -659,14 +618,14 @@ int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint</div><div class='ctx'> {</div><div class='ctx'> 	struct jffs2_raw_dirent *rd;</div><div class='ctx'> 	struct jffs2_full_dirent *fd;</div><div class='del'>-	uint32_t alloclen, phys_ofs;</div><div class='add'>+	uint32_t alloclen;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	rd = jffs2_alloc_raw_dirent();</div><div class='ctx'> 	if (!rd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;phys_ofs, &amp;alloclen,</div><div class='add'>+	ret = jffs2_reserve_space(c, sizeof(*rd)+namelen, &amp;alloclen,</div><div class='ctx'> 				ALLOC_NORMAL, JFFS2_SUMMARY_DIRENT_SIZE(namelen));</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		jffs2_free_raw_dirent(rd);</div><div class='hunk'>@@ -692,7 +651,7 @@ int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint</div><div class='ctx'> 	rd-&gt;node_crc = cpu_to_je32(crc32(0, rd, sizeof(*rd)-8));</div><div class='ctx'> 	rd-&gt;name_crc = cpu_to_je32(crc32(0, name, namelen));</div><div class='ctx'> </div><div class='del'>-	fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, phys_ofs, ALLOC_NORMAL);</div><div class='add'>+	fd = jffs2_write_dirent(c, dir_f, rd, name, namelen, ALLOC_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 	jffs2_free_raw_dirent(rd);</div><div class='ctx'> </div><div class='head'>diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c<br/>new file mode 100644<br/>index 000000000000..25bc1ae08648<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/xattr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/xattr.c</a></div><div class='hunk'>@@ -0,0 +1,1325 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/pagemap.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/jffs2.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include "nodelist.h"</div><div class='add'>+/* -------- xdatum related functions ----------------</div><div class='add'>+ * xattr_datum_hashkey(xprefix, xname, xvalue, xsize)</div><div class='add'>+ *   is used to calcurate xdatum hashkey. The reminder of hashkey into XATTRINDEX_HASHSIZE is</div><div class='add'>+ *   the index of the xattr name/value pair cache (c-&gt;xattrindex).</div><div class='add'>+ * is_xattr_datum_unchecked(c, xd)</div><div class='add'>+ *   returns 1, if xdatum contains any unchecked raw nodes. if all raw nodes are not</div><div class='add'>+ *   unchecked, it returns 0.</div><div class='add'>+ * unload_xattr_datum(c, xd)</div><div class='add'>+ *   is used to release xattr name/value pair and detach from c-&gt;xattrindex.</div><div class='add'>+ * reclaim_xattr_datum(c)</div><div class='add'>+ *   is used to reclaim xattr name/value pairs on the xattr name/value pair cache when</div><div class='add'>+ *   memory usage by cache is over c-&gt;xdatum_mem_threshold. Currentry, this threshold </div><div class='add'>+ *   is hard coded as 32KiB.</div><div class='add'>+ * do_verify_xattr_datum(c, xd)</div><div class='add'>+ *   is used to load the xdatum informations without name/value pair from the medium.</div><div class='add'>+ *   It's necessary once, because those informations are not collected during mounting</div><div class='add'>+ *   process when EBS is enabled.</div><div class='add'>+ *   0 will be returned, if success. An negative return value means recoverable error, and</div><div class='add'>+ *   positive return value means unrecoverable error. Thus, caller must remove this xdatum</div><div class='add'>+ *   and xref when it returned positive value.</div><div class='add'>+ * do_load_xattr_datum(c, xd)</div><div class='add'>+ *   is used to load name/value pair from the medium.</div><div class='add'>+ *   The meanings of return value is same as do_verify_xattr_datum().</div><div class='add'>+ * load_xattr_datum(c, xd)</div><div class='add'>+ *   is used to be as a wrapper of do_verify_xattr_datum() and do_load_xattr_datum().</div><div class='add'>+ *   If xd need to call do_verify_xattr_datum() at first, it's called before calling</div><div class='add'>+ *   do_load_xattr_datum(). The meanings of return value is same as do_verify_xattr_datum().</div><div class='add'>+ * save_xattr_datum(c, xd)</div><div class='add'>+ *   is used to write xdatum to medium. xd-&gt;version will be incremented.</div><div class='add'>+ * create_xattr_datum(c, xprefix, xname, xvalue, xsize)</div><div class='add'>+ *   is used to create new xdatum and write to medium.</div><div class='add'>+ * unrefer_xattr_datum(c, xd)</div><div class='add'>+ *   is used to delete a xdatum. When nobody refers this xdatum, JFFS2_XFLAGS_DEAD</div><div class='add'>+ *   is set on xd-&gt;flags and chained xattr_dead_list or release it immediately.</div><div class='add'>+ *   In the first case, the garbage collector release it later.</div><div class='add'>+ * -------------------------------------------------- */</div><div class='add'>+static uint32_t xattr_datum_hashkey(int xprefix, const char *xname, const char *xvalue, int xsize)</div><div class='add'>+{</div><div class='add'>+	int name_len = strlen(xname);</div><div class='add'>+</div><div class='add'>+	return crc32(xprefix, xname, name_len) ^ crc32(xprefix, xvalue, xsize);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_xattr_datum_unchecked(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_raw_node_ref *raw;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	for (raw=xd-&gt;node; raw != (void *)xd; raw=raw-&gt;next_in_ino) {</div><div class='add'>+		if (ref_flags(raw) == REF_UNCHECKED) {</div><div class='add'>+			rc = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	D1(dbg_xattr("%s: xid=%u, version=%u\n", __FUNCTION__, xd-&gt;xid, xd-&gt;version));</div><div class='add'>+	if (xd-&gt;xname) {</div><div class='add'>+		c-&gt;xdatum_mem_usage -= (xd-&gt;name_len + 1 + xd-&gt;value_len);</div><div class='add'>+		kfree(xd-&gt;xname);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_del_init(&amp;xd-&gt;xindex);</div><div class='add'>+	xd-&gt;hashkey = 0;</div><div class='add'>+	xd-&gt;xname = NULL;</div><div class='add'>+	xd-&gt;xvalue = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reclaim_xattr_datum(struct jffs2_sb_info *c)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_xattr_datum *xd, *_xd;</div><div class='add'>+	uint32_t target, before;</div><div class='add'>+	static int index = 0;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	if (c-&gt;xdatum_mem_threshold &gt; c-&gt;xdatum_mem_usage)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	before = c-&gt;xdatum_mem_usage;</div><div class='add'>+	target = c-&gt;xdatum_mem_usage * 4 / 5; /* 20% reduction */</div><div class='add'>+	for (count = 0; count &lt; XATTRINDEX_HASHSIZE; count++) {</div><div class='add'>+		list_for_each_entry_safe(xd, _xd, &amp;c-&gt;xattrindex[index], xindex) {</div><div class='add'>+			if (xd-&gt;flags &amp; JFFS2_XFLAGS_HOT) {</div><div class='add'>+				xd-&gt;flags &amp;= ~JFFS2_XFLAGS_HOT;</div><div class='add'>+			} else if (!(xd-&gt;flags &amp; JFFS2_XFLAGS_BIND)) {</div><div class='add'>+				unload_xattr_datum(c, xd);</div><div class='add'>+			}</div><div class='add'>+			if (c-&gt;xdatum_mem_usage &lt;= target)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		index = (index+1) % XATTRINDEX_HASHSIZE;</div><div class='add'>+	}</div><div class='add'>+ out:</div><div class='add'>+	JFFS2_NOTICE("xdatum_mem_usage from %u byte to %u byte (%u byte reclaimed)\n",</div><div class='add'>+		     before, c-&gt;xdatum_mem_usage, before - c-&gt;xdatum_mem_usage);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_eraseblock *jeb;</div><div class='add'>+	struct jffs2_raw_node_ref *raw;</div><div class='add'>+	struct jffs2_raw_xattr rx;</div><div class='add'>+	size_t readlen;</div><div class='add'>+	uint32_t crc, offset, totlen;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	offset = ref_offset(xd-&gt;node);</div><div class='add'>+	if (ref_flags(xd-&gt;node) == REF_PRISTINE)</div><div class='add'>+		goto complete;</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	rc = jffs2_flash_read(c, offset, sizeof(rx), &amp;readlen, (char *)&amp;rx);</div><div class='add'>+	if (rc || readlen != sizeof(rx)) {</div><div class='add'>+		JFFS2_WARNING("jffs2_flash_read()=%d, req=%zu, read=%zu at %#08x\n",</div><div class='add'>+			      rc, sizeof(rx), readlen, offset);</div><div class='add'>+		return rc ? rc : -EIO;</div><div class='add'>+	}</div><div class='add'>+	crc = crc32(0, &amp;rx, sizeof(rx) - 4);</div><div class='add'>+	if (crc != je32_to_cpu(rx.node_crc)) {</div><div class='add'>+		JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",</div><div class='add'>+			    offset, je32_to_cpu(rx.hdr_crc), crc);</div><div class='add'>+		xd-&gt;flags |= JFFS2_XFLAGS_INVALID;</div><div class='add'>+		return EIO;</div><div class='add'>+	}</div><div class='add'>+	totlen = PAD(sizeof(rx) + rx.name_len + 1 + je16_to_cpu(rx.value_len));</div><div class='add'>+	if (je16_to_cpu(rx.magic) != JFFS2_MAGIC_BITMASK</div><div class='add'>+	    || je16_to_cpu(rx.nodetype) != JFFS2_NODETYPE_XATTR</div><div class='add'>+	    || je32_to_cpu(rx.totlen) != totlen</div><div class='add'>+	    || je32_to_cpu(rx.xid) != xd-&gt;xid</div><div class='add'>+	    || je32_to_cpu(rx.version) != xd-&gt;version) {</div><div class='add'>+		JFFS2_ERROR("inconsistent xdatum at %#08x, magic=%#04x/%#04x, "</div><div class='add'>+			    "nodetype=%#04x/%#04x, totlen=%u/%u, xid=%u/%u, version=%u/%u\n",</div><div class='add'>+			    offset, je16_to_cpu(rx.magic), JFFS2_MAGIC_BITMASK,</div><div class='add'>+			    je16_to_cpu(rx.nodetype), JFFS2_NODETYPE_XATTR,</div><div class='add'>+			    je32_to_cpu(rx.totlen), totlen,</div><div class='add'>+			    je32_to_cpu(rx.xid), xd-&gt;xid,</div><div class='add'>+			    je32_to_cpu(rx.version), xd-&gt;version);</div><div class='add'>+		xd-&gt;flags |= JFFS2_XFLAGS_INVALID;</div><div class='add'>+		return EIO;</div><div class='add'>+	}</div><div class='add'>+	xd-&gt;xprefix = rx.xprefix;</div><div class='add'>+	xd-&gt;name_len = rx.name_len;</div><div class='add'>+	xd-&gt;value_len = je16_to_cpu(rx.value_len);</div><div class='add'>+	xd-&gt;data_crc = je32_to_cpu(rx.data_crc);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+ complete:</div><div class='add'>+	for (raw=xd-&gt;node; raw != (void *)xd; raw=raw-&gt;next_in_ino) {</div><div class='add'>+		jeb = &amp;c-&gt;blocks[ref_offset(raw) / c-&gt;sector_size];</div><div class='add'>+		totlen = PAD(ref_totlen(c, jeb, raw));</div><div class='add'>+		if (ref_flags(raw) == REF_UNCHECKED) {</div><div class='add'>+			c-&gt;unchecked_size -= totlen; c-&gt;used_size += totlen;</div><div class='add'>+			jeb-&gt;unchecked_size -= totlen; jeb-&gt;used_size += totlen;</div><div class='add'>+		}</div><div class='add'>+		raw-&gt;flash_offset = ref_offset(raw) | ((xd-&gt;node==raw) ? REF_PRISTINE : REF_NORMAL);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	/* unchecked xdatum is chained with c-&gt;xattr_unchecked */</div><div class='add'>+	list_del_init(&amp;xd-&gt;xindex);</div><div class='add'>+</div><div class='add'>+	dbg_xattr("success on verfying xdatum (xid=%u, version=%u)\n",</div><div class='add'>+		  xd-&gt;xid, xd-&gt;version);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	char *data;</div><div class='add'>+	size_t readlen;</div><div class='add'>+	uint32_t crc, length;</div><div class='add'>+	int i, ret, retry = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(ref_flags(xd-&gt;node) != REF_PRISTINE);</div><div class='add'>+	BUG_ON(!list_empty(&amp;xd-&gt;xindex));</div><div class='add'>+ retry:</div><div class='add'>+	length = xd-&gt;name_len + 1 + xd-&gt;value_len;</div><div class='add'>+	data = kmalloc(length, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = jffs2_flash_read(c, ref_offset(xd-&gt;node)+sizeof(struct jffs2_raw_xattr),</div><div class='add'>+			       length, &amp;readlen, data);</div><div class='add'>+</div><div class='add'>+	if (ret || length!=readlen) {</div><div class='add'>+		JFFS2_WARNING("jffs2_flash_read() returned %d, request=%d, readlen=%zu, at %#08x\n",</div><div class='add'>+			      ret, length, readlen, ref_offset(xd-&gt;node));</div><div class='add'>+		kfree(data);</div><div class='add'>+		return ret ? ret : -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data[xd-&gt;name_len] = '\0';</div><div class='add'>+	crc = crc32(0, data, length);</div><div class='add'>+	if (crc != xd-&gt;data_crc) {</div><div class='add'>+		JFFS2_WARNING("node CRC failed (JFFS2_NODETYPE_XREF)"</div><div class='add'>+			      " at %#08x, read: 0x%08x calculated: 0x%08x\n",</div><div class='add'>+			      ref_offset(xd-&gt;node), xd-&gt;data_crc, crc);</div><div class='add'>+		kfree(data);</div><div class='add'>+		xd-&gt;flags |= JFFS2_XFLAGS_INVALID;</div><div class='add'>+		return EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xd-&gt;flags |= JFFS2_XFLAGS_HOT;</div><div class='add'>+	xd-&gt;xname = data;</div><div class='add'>+	xd-&gt;xvalue = data + xd-&gt;name_len+1;</div><div class='add'>+</div><div class='add'>+	c-&gt;xdatum_mem_usage += length;</div><div class='add'>+</div><div class='add'>+	xd-&gt;hashkey = xattr_datum_hashkey(xd-&gt;xprefix, xd-&gt;xname, xd-&gt;xvalue, xd-&gt;value_len);</div><div class='add'>+	i = xd-&gt;hashkey % XATTRINDEX_HASHSIZE;</div><div class='add'>+	list_add(&amp;xd-&gt;xindex, &amp;c-&gt;xattrindex[i]);</div><div class='add'>+	if (!retry) {</div><div class='add'>+		retry = 1;</div><div class='add'>+		reclaim_xattr_datum(c);</div><div class='add'>+		if (!xd-&gt;xname)</div><div class='add'>+			goto retry;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbg_xattr("success on loading xdatum (xid=%u, xprefix=%u, xname='%s')\n",</div><div class='add'>+		  xd-&gt;xid, xd-&gt;xprefix, xd-&gt;xname);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int load_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem);</div><div class='add'>+	 * rc &lt; 0 : recoverable error, try again</div><div class='add'>+	 * rc = 0 : success</div><div class='add'>+	 * rc &gt; 0 : Unrecoverable error, this node should be deleted.</div><div class='add'>+	 */</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(xd-&gt;flags &amp; JFFS2_XFLAGS_DEAD);</div><div class='add'>+	if (xd-&gt;xname)</div><div class='add'>+		return 0;</div><div class='add'>+	if (xd-&gt;flags &amp; JFFS2_XFLAGS_INVALID)</div><div class='add'>+		return EIO;</div><div class='add'>+	if (unlikely(is_xattr_datum_unchecked(c, xd)))</div><div class='add'>+		rc = do_verify_xattr_datum(c, xd);</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = do_load_xattr_datum(c, xd);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int save_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_raw_xattr rx;</div><div class='add'>+	struct kvec vecs[2];</div><div class='add'>+	size_t length;</div><div class='add'>+	int rc, totlen;</div><div class='add'>+	uint32_t phys_ofs = write_ofs(c);</div><div class='add'>+</div><div class='add'>+	BUG_ON(!xd-&gt;xname);</div><div class='add'>+	BUG_ON(xd-&gt;flags &amp; (JFFS2_XFLAGS_DEAD|JFFS2_XFLAGS_INVALID));</div><div class='add'>+</div><div class='add'>+	vecs[0].iov_base = &amp;rx;</div><div class='add'>+	vecs[0].iov_len = sizeof(rx);</div><div class='add'>+	vecs[1].iov_base = xd-&gt;xname;</div><div class='add'>+	vecs[1].iov_len = xd-&gt;name_len + 1 + xd-&gt;value_len;</div><div class='add'>+	totlen = vecs[0].iov_len + vecs[1].iov_len;</div><div class='add'>+</div><div class='add'>+	/* Setup raw-xattr */</div><div class='add'>+	memset(&amp;rx, 0, sizeof(rx));</div><div class='add'>+	rx.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);</div><div class='add'>+	rx.nodetype = cpu_to_je16(JFFS2_NODETYPE_XATTR);</div><div class='add'>+	rx.totlen = cpu_to_je32(PAD(totlen));</div><div class='add'>+	rx.hdr_crc = cpu_to_je32(crc32(0, &amp;rx, sizeof(struct jffs2_unknown_node) - 4));</div><div class='add'>+</div><div class='add'>+	rx.xid = cpu_to_je32(xd-&gt;xid);</div><div class='add'>+	rx.version = cpu_to_je32(++xd-&gt;version);</div><div class='add'>+	rx.xprefix = xd-&gt;xprefix;</div><div class='add'>+	rx.name_len = xd-&gt;name_len;</div><div class='add'>+	rx.value_len = cpu_to_je16(xd-&gt;value_len);</div><div class='add'>+	rx.data_crc = cpu_to_je32(crc32(0, vecs[1].iov_base, vecs[1].iov_len));</div><div class='add'>+	rx.node_crc = cpu_to_je32(crc32(0, &amp;rx, sizeof(struct jffs2_raw_xattr) - 4));</div><div class='add'>+</div><div class='add'>+	rc = jffs2_flash_writev(c, vecs, 2, phys_ofs, &amp;length, 0);</div><div class='add'>+	if (rc || totlen != length) {</div><div class='add'>+		JFFS2_WARNING("jffs2_flash_writev()=%d, req=%u, wrote=%zu, at %#08x\n",</div><div class='add'>+			      rc, totlen, length, phys_ofs);</div><div class='add'>+		rc = rc ? rc : -EIO;</div><div class='add'>+		if (length)</div><div class='add'>+			jffs2_add_physical_node_ref(c, phys_ofs | REF_OBSOLETE, PAD(totlen), NULL);</div><div class='add'>+</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	/* success */</div><div class='add'>+	jffs2_add_physical_node_ref(c, phys_ofs | REF_PRISTINE, PAD(totlen), (void *)xd);</div><div class='add'>+</div><div class='add'>+	dbg_xattr("success on saving xdatum (xid=%u, version=%u, xprefix=%u, xname='%s')\n",</div><div class='add'>+		  xd-&gt;xid, xd-&gt;version, xd-&gt;xprefix, xd-&gt;xname);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct jffs2_xattr_datum *create_xattr_datum(struct jffs2_sb_info *c,</div><div class='add'>+						    int xprefix, const char *xname,</div><div class='add'>+						    const char *xvalue, int xsize)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	uint32_t hashkey, name_len;</div><div class='add'>+	char *data;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	/* Search xattr_datum has same xname/xvalue by index */</div><div class='add'>+	hashkey = xattr_datum_hashkey(xprefix, xname, xvalue, xsize);</div><div class='add'>+	i = hashkey % XATTRINDEX_HASHSIZE;</div><div class='add'>+	list_for_each_entry(xd, &amp;c-&gt;xattrindex[i], xindex) {</div><div class='add'>+		if (xd-&gt;hashkey==hashkey</div><div class='add'>+		    &amp;&amp; xd-&gt;xprefix==xprefix</div><div class='add'>+		    &amp;&amp; xd-&gt;value_len==xsize</div><div class='add'>+		    &amp;&amp; !strcmp(xd-&gt;xname, xname)</div><div class='add'>+		    &amp;&amp; !memcmp(xd-&gt;xvalue, xvalue, xsize)) {</div><div class='add'>+			atomic_inc(&amp;xd-&gt;refcnt);</div><div class='add'>+			return xd;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Not found, Create NEW XATTR-Cache */</div><div class='add'>+	name_len = strlen(xname);</div><div class='add'>+</div><div class='add'>+	xd = jffs2_alloc_xattr_datum();</div><div class='add'>+	if (!xd)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	data = kmalloc(name_len + 1 + xsize, GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		jffs2_free_xattr_datum(xd);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	strcpy(data, xname);</div><div class='add'>+	memcpy(data + name_len + 1, xvalue, xsize);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;xd-&gt;refcnt, 1);</div><div class='add'>+	xd-&gt;xid = ++c-&gt;highest_xid;</div><div class='add'>+	xd-&gt;flags |= JFFS2_XFLAGS_HOT;</div><div class='add'>+	xd-&gt;xprefix = xprefix;</div><div class='add'>+</div><div class='add'>+	xd-&gt;hashkey = hashkey;</div><div class='add'>+	xd-&gt;xname = data;</div><div class='add'>+	xd-&gt;xvalue = data + name_len + 1;</div><div class='add'>+	xd-&gt;name_len = name_len;</div><div class='add'>+	xd-&gt;value_len = xsize;</div><div class='add'>+	xd-&gt;data_crc = crc32(0, data, xd-&gt;name_len + 1 + xd-&gt;value_len);</div><div class='add'>+</div><div class='add'>+	rc = save_xattr_datum(c, xd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		kfree(xd-&gt;xname);</div><div class='add'>+		jffs2_free_xattr_datum(xd);</div><div class='add'>+		return ERR_PTR(rc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Insert Hash Index */</div><div class='add'>+	i = hashkey % XATTRINDEX_HASHSIZE;</div><div class='add'>+	list_add(&amp;xd-&gt;xindex, &amp;c-&gt;xattrindex[i]);</div><div class='add'>+</div><div class='add'>+	c-&gt;xdatum_mem_usage += (xd-&gt;name_len + 1 + xd-&gt;value_len);</div><div class='add'>+	reclaim_xattr_datum(c);</div><div class='add'>+</div><div class='add'>+	return xd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unrefer_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	if (atomic_dec_and_lock(&amp;xd-&gt;refcnt, &amp;c-&gt;erase_completion_lock)) {</div><div class='add'>+		uint32_t xid = xd-&gt;xid, version = xd-&gt;version;</div><div class='add'>+</div><div class='add'>+		unload_xattr_datum(c, xd);</div><div class='add'>+		xd-&gt;flags |= JFFS2_XFLAGS_DEAD;</div><div class='add'>+		if (xd-&gt;node == (void *)xd) {</div><div class='add'>+			BUG_ON(!(xd-&gt;flags &amp; JFFS2_XFLAGS_INVALID));</div><div class='add'>+			jffs2_free_xattr_datum(xd);</div><div class='add'>+		} else {</div><div class='add'>+			list_add(&amp;xd-&gt;xindex, &amp;c-&gt;xattr_dead_list);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+		dbg_xattr("xdatum(xid=%u, version=%u) was removed.\n", xid, version);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------- xref related functions ------------------</div><div class='add'>+ * verify_xattr_ref(c, ref)</div><div class='add'>+ *   is used to load xref information from medium. Because summary data does not</div><div class='add'>+ *   contain xid/ino, it's necessary to verify once while mounting process.</div><div class='add'>+ * save_xattr_ref(c, ref)</div><div class='add'>+ *   is used to write xref to medium. If delete marker is marked, it write</div><div class='add'>+ *   a delete marker of xref into medium.</div><div class='add'>+ * create_xattr_ref(c, ic, xd)</div><div class='add'>+ *   is used to create a new xref and write to medium.</div><div class='add'>+ * delete_xattr_ref(c, ref)</div><div class='add'>+ *   is used to delete jffs2_xattr_ref. It marks xref XREF_DELETE_MARKER,</div><div class='add'>+ *   and allows GC to reclaim those physical nodes.</div><div class='add'>+ * jffs2_xattr_delete_inode(c, ic)</div><div class='add'>+ *   is called to remove xrefs related to obsolete inode when inode is unlinked.</div><div class='add'>+ * jffs2_xattr_free_inode(c, ic)</div><div class='add'>+ *   is called to release xattr related objects when unmounting. </div><div class='add'>+ * check_xattr_ref_inode(c, ic)</div><div class='add'>+ *   is used to confirm inode does not have duplicate xattr name/value pair.</div><div class='add'>+ * -------------------------------------------------- */</div><div class='add'>+static int verify_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_eraseblock *jeb;</div><div class='add'>+	struct jffs2_raw_node_ref *raw;</div><div class='add'>+	struct jffs2_raw_xref rr;</div><div class='add'>+	size_t readlen;</div><div class='add'>+	uint32_t crc, offset, totlen;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	if (ref_flags(ref-&gt;node) != REF_UNCHECKED)</div><div class='add'>+		goto complete;</div><div class='add'>+	offset = ref_offset(ref-&gt;node);</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	rc = jffs2_flash_read(c, offset, sizeof(rr), &amp;readlen, (char *)&amp;rr);</div><div class='add'>+	if (rc || sizeof(rr) != readlen) {</div><div class='add'>+		JFFS2_WARNING("jffs2_flash_read()=%d, req=%zu, read=%zu, at %#08x\n",</div><div class='add'>+			      rc, sizeof(rr), readlen, offset);</div><div class='add'>+		return rc ? rc : -EIO;</div><div class='add'>+	}</div><div class='add'>+	/* obsolete node */</div><div class='add'>+	crc = crc32(0, &amp;rr, sizeof(rr) - 4);</div><div class='add'>+	if (crc != je32_to_cpu(rr.node_crc)) {</div><div class='add'>+		JFFS2_ERROR("node CRC failed at %#08x, read=%#08x, calc=%#08x\n",</div><div class='add'>+			    offset, je32_to_cpu(rr.node_crc), crc);</div><div class='add'>+		return EIO;</div><div class='add'>+	}</div><div class='add'>+	if (je16_to_cpu(rr.magic) != JFFS2_MAGIC_BITMASK</div><div class='add'>+	    || je16_to_cpu(rr.nodetype) != JFFS2_NODETYPE_XREF</div><div class='add'>+	    || je32_to_cpu(rr.totlen) != PAD(sizeof(rr))) {</div><div class='add'>+		JFFS2_ERROR("inconsistent xref at %#08x, magic=%#04x/%#04x, "</div><div class='add'>+			    "nodetype=%#04x/%#04x, totlen=%u/%zu\n",</div><div class='add'>+			    offset, je16_to_cpu(rr.magic), JFFS2_MAGIC_BITMASK,</div><div class='add'>+			    je16_to_cpu(rr.nodetype), JFFS2_NODETYPE_XREF,</div><div class='add'>+			    je32_to_cpu(rr.totlen), PAD(sizeof(rr)));</div><div class='add'>+		return EIO;</div><div class='add'>+	}</div><div class='add'>+	ref-&gt;ino = je32_to_cpu(rr.ino);</div><div class='add'>+	ref-&gt;xid = je32_to_cpu(rr.xid);</div><div class='add'>+	ref-&gt;xseqno = je32_to_cpu(rr.xseqno);</div><div class='add'>+	if (ref-&gt;xseqno &gt; c-&gt;highest_xseqno)</div><div class='add'>+		c-&gt;highest_xseqno = (ref-&gt;xseqno &amp; ~XREF_DELETE_MARKER);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+ complete:</div><div class='add'>+	for (raw=ref-&gt;node; raw != (void *)ref; raw=raw-&gt;next_in_ino) {</div><div class='add'>+		jeb = &amp;c-&gt;blocks[ref_offset(raw) / c-&gt;sector_size];</div><div class='add'>+		totlen = PAD(ref_totlen(c, jeb, raw));</div><div class='add'>+		if (ref_flags(raw) == REF_UNCHECKED) {</div><div class='add'>+			c-&gt;unchecked_size -= totlen; c-&gt;used_size += totlen;</div><div class='add'>+			jeb-&gt;unchecked_size -= totlen; jeb-&gt;used_size += totlen;</div><div class='add'>+		}</div><div class='add'>+		raw-&gt;flash_offset = ref_offset(raw) | ((ref-&gt;node==raw) ? REF_PRISTINE : REF_NORMAL);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	dbg_xattr("success on verifying xref (ino=%u, xid=%u) at %#08x\n",</div><div class='add'>+		  ref-&gt;ino, ref-&gt;xid, ref_offset(ref-&gt;node));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int save_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_raw_xref rr;</div><div class='add'>+	size_t length;</div><div class='add'>+	uint32_t xseqno, phys_ofs = write_ofs(c);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rr.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK);</div><div class='add'>+	rr.nodetype = cpu_to_je16(JFFS2_NODETYPE_XREF);</div><div class='add'>+	rr.totlen = cpu_to_je32(PAD(sizeof(rr)));</div><div class='add'>+	rr.hdr_crc = cpu_to_je32(crc32(0, &amp;rr, sizeof(struct jffs2_unknown_node) - 4));</div><div class='add'>+</div><div class='add'>+	xseqno = (c-&gt;highest_xseqno += 2);</div><div class='add'>+	if (is_xattr_ref_dead(ref)) {</div><div class='add'>+		xseqno |= XREF_DELETE_MARKER;</div><div class='add'>+		rr.ino = cpu_to_je32(ref-&gt;ino);</div><div class='add'>+		rr.xid = cpu_to_je32(ref-&gt;xid);</div><div class='add'>+	} else {</div><div class='add'>+		rr.ino = cpu_to_je32(ref-&gt;ic-&gt;ino);</div><div class='add'>+		rr.xid = cpu_to_je32(ref-&gt;xd-&gt;xid);</div><div class='add'>+	}</div><div class='add'>+	rr.xseqno = cpu_to_je32(xseqno);</div><div class='add'>+	rr.node_crc = cpu_to_je32(crc32(0, &amp;rr, sizeof(rr) - 4));</div><div class='add'>+</div><div class='add'>+	ret = jffs2_flash_write(c, phys_ofs, sizeof(rr), &amp;length, (char *)&amp;rr);</div><div class='add'>+	if (ret || sizeof(rr) != length) {</div><div class='add'>+		JFFS2_WARNING("jffs2_flash_write() returned %d, request=%zu, retlen=%zu, at %#08x\n",</div><div class='add'>+			      ret, sizeof(rr), length, phys_ofs);</div><div class='add'>+		ret = ret ? ret : -EIO;</div><div class='add'>+		if (length)</div><div class='add'>+			jffs2_add_physical_node_ref(c, phys_ofs | REF_OBSOLETE, PAD(sizeof(rr)), NULL);</div><div class='add'>+</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	/* success */</div><div class='add'>+	ref-&gt;xseqno = xseqno;</div><div class='add'>+	jffs2_add_physical_node_ref(c, phys_ofs | REF_PRISTINE, PAD(sizeof(rr)), (void *)ref);</div><div class='add'>+</div><div class='add'>+	dbg_xattr("success on saving xref (ino=%u, xid=%u)\n", ref-&gt;ic-&gt;ino, ref-&gt;xd-&gt;xid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct jffs2_xattr_ref *create_xattr_ref(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic,</div><div class='add'>+						struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_xattr_ref *ref;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ref = jffs2_alloc_xattr_ref();</div><div class='add'>+	if (!ref)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	ref-&gt;ic = ic;</div><div class='add'>+	ref-&gt;xd = xd;</div><div class='add'>+</div><div class='add'>+	ret = save_xattr_ref(c, ref);</div><div class='add'>+	if (ret) {</div><div class='add'>+		jffs2_free_xattr_ref(ref);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Chain to inode */</div><div class='add'>+	ref-&gt;next = ic-&gt;xref;</div><div class='add'>+	ic-&gt;xref = ref;</div><div class='add'>+</div><div class='add'>+	return ref; /* success */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)</div><div class='add'>+{</div><div class='add'>+	/* must be called under down_write(xattr_sem) */</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+</div><div class='add'>+	xd = ref-&gt;xd;</div><div class='add'>+	ref-&gt;xseqno |= XREF_DELETE_MARKER;</div><div class='add'>+	ref-&gt;ino = ref-&gt;ic-&gt;ino;</div><div class='add'>+	ref-&gt;xid = ref-&gt;xd-&gt;xid;</div><div class='add'>+	spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	ref-&gt;next = c-&gt;xref_dead_list;</div><div class='add'>+	c-&gt;xref_dead_list = ref;</div><div class='add'>+	spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+</div><div class='add'>+	dbg_xattr("xref(ino=%u, xid=%u, xseqno=%u) was removed.\n",</div><div class='add'>+		  ref-&gt;ino, ref-&gt;xid, ref-&gt;xseqno);</div><div class='add'>+</div><div class='add'>+	unrefer_xattr_datum(c, xd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_xattr_delete_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)</div><div class='add'>+{</div><div class='add'>+	/* It's called from jffs2_clear_inode() on inode removing.</div><div class='add'>+	   When an inode with XATTR is removed, those XATTRs must be removed. */</div><div class='add'>+	struct jffs2_xattr_ref *ref, *_ref;</div><div class='add'>+</div><div class='add'>+	if (!ic || ic-&gt;nlink &gt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	for (ref = ic-&gt;xref; ref; ref = _ref) {</div><div class='add'>+		_ref = ref-&gt;next;</div><div class='add'>+		delete_xattr_ref(c, ref);</div><div class='add'>+	}</div><div class='add'>+	ic-&gt;xref = NULL;</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_xattr_free_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)</div><div class='add'>+{</div><div class='add'>+	/* It's called from jffs2_free_ino_caches() until unmounting FS. */</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	struct jffs2_xattr_ref *ref, *_ref;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	for (ref = ic-&gt;xref; ref; ref = _ref) {</div><div class='add'>+		_ref = ref-&gt;next;</div><div class='add'>+		xd = ref-&gt;xd;</div><div class='add'>+		if (atomic_dec_and_test(&amp;xd-&gt;refcnt)) {</div><div class='add'>+			unload_xattr_datum(c, xd);</div><div class='add'>+			jffs2_free_xattr_datum(xd);</div><div class='add'>+		}</div><div class='add'>+		jffs2_free_xattr_ref(ref);</div><div class='add'>+	}</div><div class='add'>+	ic-&gt;xref = NULL;</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_xattr_ref_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic)</div><div class='add'>+{</div><div class='add'>+	/* success of check_xattr_ref_inode() means taht inode (ic) dose not have</div><div class='add'>+	 * duplicate name/value pairs. If duplicate name/value pair would be found,</div><div class='add'>+	 * one will be removed.</div><div class='add'>+	 */</div><div class='add'>+	struct jffs2_xattr_ref *ref, *cmp, **pref, **pcmp;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (likely(ic-&gt;flags &amp; INO_FLAGS_XATTR_CHECKED))</div><div class='add'>+		return 0;</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+ retry:</div><div class='add'>+	rc = 0;</div><div class='add'>+	for (ref=ic-&gt;xref, pref=&amp;ic-&gt;xref; ref; pref=&amp;ref-&gt;next, ref=ref-&gt;next) {</div><div class='add'>+		if (!ref-&gt;xd-&gt;xname) {</div><div class='add'>+			rc = load_xattr_datum(c, ref-&gt;xd);</div><div class='add'>+			if (unlikely(rc &gt; 0)) {</div><div class='add'>+				*pref = ref-&gt;next;</div><div class='add'>+				delete_xattr_ref(c, ref);</div><div class='add'>+				goto retry;</div><div class='add'>+			} else if (unlikely(rc &lt; 0))</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		for (cmp=ref-&gt;next, pcmp=&amp;ref-&gt;next; cmp; pcmp=&amp;cmp-&gt;next, cmp=cmp-&gt;next) {</div><div class='add'>+			if (!cmp-&gt;xd-&gt;xname) {</div><div class='add'>+				ref-&gt;xd-&gt;flags |= JFFS2_XFLAGS_BIND;</div><div class='add'>+				rc = load_xattr_datum(c, cmp-&gt;xd);</div><div class='add'>+				ref-&gt;xd-&gt;flags &amp;= ~JFFS2_XFLAGS_BIND;</div><div class='add'>+				if (unlikely(rc &gt; 0)) {</div><div class='add'>+					*pcmp = cmp-&gt;next;</div><div class='add'>+					delete_xattr_ref(c, cmp);</div><div class='add'>+					goto retry;</div><div class='add'>+				} else if (unlikely(rc &lt; 0))</div><div class='add'>+					goto out;</div><div class='add'>+			}</div><div class='add'>+			if (ref-&gt;xd-&gt;xprefix == cmp-&gt;xd-&gt;xprefix</div><div class='add'>+			    &amp;&amp; !strcmp(ref-&gt;xd-&gt;xname, cmp-&gt;xd-&gt;xname)) {</div><div class='add'>+				if (ref-&gt;xseqno &gt; cmp-&gt;xseqno) {</div><div class='add'>+					*pcmp = cmp-&gt;next;</div><div class='add'>+					delete_xattr_ref(c, cmp);</div><div class='add'>+				} else {</div><div class='add'>+					*pref = ref-&gt;next;</div><div class='add'>+					delete_xattr_ref(c, ref);</div><div class='add'>+				}</div><div class='add'>+				goto retry;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	ic-&gt;flags |= INO_FLAGS_XATTR_CHECKED;</div><div class='add'>+ out:</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------- xattr subsystem functions ---------------</div><div class='add'>+ * jffs2_init_xattr_subsystem(c)</div><div class='add'>+ *   is used to initialize semaphore and list_head, and some variables.</div><div class='add'>+ * jffs2_find_xattr_datum(c, xid)</div><div class='add'>+ *   is used to lookup xdatum while scanning process.</div><div class='add'>+ * jffs2_clear_xattr_subsystem(c)</div><div class='add'>+ *   is used to release any xattr related objects.</div><div class='add'>+ * jffs2_build_xattr_subsystem(c)</div><div class='add'>+ *   is used to associate xdatum and xref while super block building process.</div><div class='add'>+ * jffs2_setup_xattr_datum(c, xid, version)</div><div class='add'>+ *   is used to insert xdatum while scanning process.</div><div class='add'>+ * -------------------------------------------------- */</div><div class='add'>+void jffs2_init_xattr_subsystem(struct jffs2_sb_info *c)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; XATTRINDEX_HASHSIZE; i++)</div><div class='add'>+		INIT_LIST_HEAD(&amp;c-&gt;xattrindex[i]);</div><div class='add'>+	INIT_LIST_HEAD(&amp;c-&gt;xattr_unchecked);</div><div class='add'>+	INIT_LIST_HEAD(&amp;c-&gt;xattr_dead_list);</div><div class='add'>+	c-&gt;xref_dead_list = NULL;</div><div class='add'>+	c-&gt;xref_temp = NULL;</div><div class='add'>+</div><div class='add'>+	init_rwsem(&amp;c-&gt;xattr_sem);</div><div class='add'>+	c-&gt;highest_xid = 0;</div><div class='add'>+	c-&gt;highest_xseqno = 0;</div><div class='add'>+	c-&gt;xdatum_mem_usage = 0;</div><div class='add'>+	c-&gt;xdatum_mem_threshold = 32 * 1024;	/* Default 32KB */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct jffs2_xattr_datum *jffs2_find_xattr_datum(struct jffs2_sb_info *c, uint32_t xid)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	int i = xid % XATTRINDEX_HASHSIZE;</div><div class='add'>+</div><div class='add'>+	/* It's only used in scanning/building process. */</div><div class='add'>+	BUG_ON(!(c-&gt;flags &amp; (JFFS2_SB_FLAG_SCANNING|JFFS2_SB_FLAG_BUILDING)));</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(xd, &amp;c-&gt;xattrindex[i], xindex) {</div><div class='add'>+		if (xd-&gt;xid==xid)</div><div class='add'>+			return xd;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_clear_xattr_subsystem(struct jffs2_sb_info *c)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_datum *xd, *_xd;</div><div class='add'>+	struct jffs2_xattr_ref *ref, *_ref;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (ref=c-&gt;xref_temp; ref; ref = _ref) {</div><div class='add'>+		_ref = ref-&gt;next;</div><div class='add'>+		jffs2_free_xattr_ref(ref);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ref=c-&gt;xref_dead_list; ref; ref = _ref) {</div><div class='add'>+		_ref = ref-&gt;next;</div><div class='add'>+		jffs2_free_xattr_ref(ref);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i=0; i &lt; XATTRINDEX_HASHSIZE; i++) {</div><div class='add'>+		list_for_each_entry_safe(xd, _xd, &amp;c-&gt;xattrindex[i], xindex) {</div><div class='add'>+			list_del(&amp;xd-&gt;xindex);</div><div class='add'>+			if (xd-&gt;xname)</div><div class='add'>+				kfree(xd-&gt;xname);</div><div class='add'>+			jffs2_free_xattr_datum(xd);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(xd, _xd, &amp;c-&gt;xattr_dead_list, xindex) {</div><div class='add'>+		list_del(&amp;xd-&gt;xindex);</div><div class='add'>+		jffs2_free_xattr_datum(xd);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define XREF_TMPHASH_SIZE	(128)</div><div class='add'>+void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_ref *ref, *_ref;</div><div class='add'>+	struct jffs2_xattr_ref *xref_tmphash[XREF_TMPHASH_SIZE];</div><div class='add'>+	struct jffs2_xattr_datum *xd, *_xd;</div><div class='add'>+	struct jffs2_inode_cache *ic;</div><div class='add'>+	struct jffs2_raw_node_ref *raw;</div><div class='add'>+	int i, xdatum_count = 0, xdatum_unchecked_count = 0, xref_count = 0;</div><div class='add'>+	int xdatum_orphan_count = 0, xref_orphan_count = 0, xref_dead_count = 0;</div><div class='add'>+</div><div class='add'>+	BUG_ON(!(c-&gt;flags &amp; JFFS2_SB_FLAG_BUILDING));</div><div class='add'>+</div><div class='add'>+	/* Phase.1 : Merge same xref */</div><div class='add'>+	for (i=0; i &lt; XREF_TMPHASH_SIZE; i++)</div><div class='add'>+		xref_tmphash[i] = NULL;</div><div class='add'>+	for (ref=c-&gt;xref_temp; ref; ref=_ref) {</div><div class='add'>+		struct jffs2_xattr_ref *tmp;</div><div class='add'>+</div><div class='add'>+		_ref = ref-&gt;next;</div><div class='add'>+		if (ref_flags(ref-&gt;node) != REF_PRISTINE) {</div><div class='add'>+			if (verify_xattr_ref(c, ref)) {</div><div class='add'>+				BUG_ON(ref-&gt;node-&gt;next_in_ino != (void *)ref);</div><div class='add'>+				ref-&gt;node-&gt;next_in_ino = NULL;</div><div class='add'>+				jffs2_mark_node_obsolete(c, ref-&gt;node);</div><div class='add'>+				jffs2_free_xattr_ref(ref);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i = (ref-&gt;ino ^ ref-&gt;xid) % XREF_TMPHASH_SIZE;</div><div class='add'>+		for (tmp=xref_tmphash[i]; tmp; tmp=tmp-&gt;next) {</div><div class='add'>+			if (tmp-&gt;ino == ref-&gt;ino &amp;&amp; tmp-&gt;xid == ref-&gt;xid)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (tmp) {</div><div class='add'>+			raw = ref-&gt;node;</div><div class='add'>+			if (ref-&gt;xseqno &gt; tmp-&gt;xseqno) {</div><div class='add'>+				tmp-&gt;xseqno = ref-&gt;xseqno;</div><div class='add'>+				raw-&gt;next_in_ino = tmp-&gt;node;</div><div class='add'>+				tmp-&gt;node = raw;</div><div class='add'>+			} else {</div><div class='add'>+				raw-&gt;next_in_ino = tmp-&gt;node-&gt;next_in_ino;</div><div class='add'>+				tmp-&gt;node-&gt;next_in_ino = raw;</div><div class='add'>+			}</div><div class='add'>+			jffs2_free_xattr_ref(ref);</div><div class='add'>+			continue;</div><div class='add'>+		} else {</div><div class='add'>+			ref-&gt;next = xref_tmphash[i];</div><div class='add'>+			xref_tmphash[i] = ref;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	c-&gt;xref_temp = NULL;</div><div class='add'>+</div><div class='add'>+	/* Phase.2 : Bind xref with inode_cache and xattr_datum */</div><div class='add'>+	for (i=0; i &lt; XREF_TMPHASH_SIZE; i++) {</div><div class='add'>+		for (ref=xref_tmphash[i]; ref; ref=_ref) {</div><div class='add'>+			xref_count++;</div><div class='add'>+			_ref = ref-&gt;next;</div><div class='add'>+			if (is_xattr_ref_dead(ref)) {</div><div class='add'>+				ref-&gt;next = c-&gt;xref_dead_list;</div><div class='add'>+				c-&gt;xref_dead_list = ref;</div><div class='add'>+				xref_dead_count++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/* At this point, ref-&gt;xid and ref-&gt;ino contain XID and inode number.</div><div class='add'>+			   ref-&gt;xd and ref-&gt;ic are not valid yet. */</div><div class='add'>+			xd = jffs2_find_xattr_datum(c, ref-&gt;xid);</div><div class='add'>+			ic = jffs2_get_ino_cache(c, ref-&gt;ino);</div><div class='add'>+			if (!xd || !ic) {</div><div class='add'>+				dbg_xattr("xref(ino=%u, xid=%u, xseqno=%u) is orphan.\n",</div><div class='add'>+					  ref-&gt;ino, ref-&gt;xid, ref-&gt;xseqno);</div><div class='add'>+				ref-&gt;xseqno |= XREF_DELETE_MARKER;</div><div class='add'>+				ref-&gt;next = c-&gt;xref_dead_list;</div><div class='add'>+				c-&gt;xref_dead_list = ref;</div><div class='add'>+				xref_orphan_count++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			ref-&gt;xd = xd;</div><div class='add'>+			ref-&gt;ic = ic;</div><div class='add'>+			atomic_inc(&amp;xd-&gt;refcnt);</div><div class='add'>+			ref-&gt;next = ic-&gt;xref;</div><div class='add'>+			ic-&gt;xref = ref;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Phase.3 : Link unchecked xdatum to xattr_unchecked list */</div><div class='add'>+	for (i=0; i &lt; XATTRINDEX_HASHSIZE; i++) {</div><div class='add'>+		list_for_each_entry_safe(xd, _xd, &amp;c-&gt;xattrindex[i], xindex) {</div><div class='add'>+			xdatum_count++;</div><div class='add'>+			list_del_init(&amp;xd-&gt;xindex);</div><div class='add'>+			if (!atomic_read(&amp;xd-&gt;refcnt)) {</div><div class='add'>+				dbg_xattr("xdatum(xid=%u, version=%u) is orphan.\n",</div><div class='add'>+					  xd-&gt;xid, xd-&gt;version);</div><div class='add'>+				xd-&gt;flags |= JFFS2_XFLAGS_DEAD;</div><div class='add'>+				list_add(&amp;xd-&gt;xindex, &amp;c-&gt;xattr_unchecked);</div><div class='add'>+				xdatum_orphan_count++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (is_xattr_datum_unchecked(c, xd)) {</div><div class='add'>+				dbg_xattr("unchecked xdatum(xid=%u, version=%u)\n",</div><div class='add'>+					  xd-&gt;xid, xd-&gt;version);</div><div class='add'>+				list_add(&amp;xd-&gt;xindex, &amp;c-&gt;xattr_unchecked);</div><div class='add'>+				xdatum_unchecked_count++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* build complete */</div><div class='add'>+	JFFS2_NOTICE("complete building xattr subsystem, %u of xdatum"</div><div class='add'>+		     " (%u unchecked, %u orphan) and "</div><div class='add'>+		     "%u of xref (%u dead, %u orphan) found.\n",</div><div class='add'>+		     xdatum_count, xdatum_unchecked_count, xdatum_orphan_count,</div><div class='add'>+		     xref_count, xref_dead_count, xref_orphan_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,</div><div class='add'>+						  uint32_t xid, uint32_t version)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+</div><div class='add'>+	xd = jffs2_find_xattr_datum(c, xid);</div><div class='add'>+	if (!xd) {</div><div class='add'>+		xd = jffs2_alloc_xattr_datum();</div><div class='add'>+		if (!xd)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		xd-&gt;xid = xid;</div><div class='add'>+		xd-&gt;version = version;</div><div class='add'>+		if (xd-&gt;xid &gt; c-&gt;highest_xid)</div><div class='add'>+			c-&gt;highest_xid = xd-&gt;xid;</div><div class='add'>+		list_add_tail(&amp;xd-&gt;xindex, &amp;c-&gt;xattrindex[xid % XATTRINDEX_HASHSIZE]);</div><div class='add'>+	}</div><div class='add'>+	return xd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------- xattr subsystem functions ---------------</div><div class='add'>+ * xprefix_to_handler(xprefix)</div><div class='add'>+ *   is used to translate xprefix into xattr_handler.</div><div class='add'>+ * jffs2_listxattr(dentry, buffer, size)</div><div class='add'>+ *   is an implementation of listxattr handler on jffs2.</div><div class='add'>+ * do_jffs2_getxattr(inode, xprefix, xname, buffer, size)</div><div class='add'>+ *   is an implementation of getxattr handler on jffs2.</div><div class='add'>+ * do_jffs2_setxattr(inode, xprefix, xname, buffer, size, flags)</div><div class='add'>+ *   is an implementation of setxattr handler on jffs2.</div><div class='add'>+ * -------------------------------------------------- */</div><div class='add'>+struct xattr_handler *jffs2_xattr_handlers[] = {</div><div class='add'>+	&amp;jffs2_user_xattr_handler,</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_SECURITY</div><div class='add'>+	&amp;jffs2_security_xattr_handler,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_POSIX_ACL</div><div class='add'>+	&amp;jffs2_acl_access_xattr_handler,</div><div class='add'>+	&amp;jffs2_acl_default_xattr_handler,</div><div class='add'>+#endif</div><div class='add'>+	&amp;jffs2_trusted_xattr_handler,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct xattr_handler *xprefix_to_handler(int xprefix) {</div><div class='add'>+	struct xattr_handler *ret;</div><div class='add'>+</div><div class='add'>+	switch (xprefix) {</div><div class='add'>+	case JFFS2_XPREFIX_USER:</div><div class='add'>+		ret = &amp;jffs2_user_xattr_handler;</div><div class='add'>+		break;</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_SECURITY</div><div class='add'>+	case JFFS2_XPREFIX_SECURITY:</div><div class='add'>+		ret = &amp;jffs2_security_xattr_handler;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_POSIX_ACL</div><div class='add'>+	case JFFS2_XPREFIX_ACL_ACCESS:</div><div class='add'>+		ret = &amp;jffs2_acl_access_xattr_handler;</div><div class='add'>+		break;</div><div class='add'>+	case JFFS2_XPREFIX_ACL_DEFAULT:</div><div class='add'>+		ret = &amp;jffs2_acl_default_xattr_handler;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	case JFFS2_XPREFIX_TRUSTED:</div><div class='add'>+		ret = &amp;jffs2_trusted_xattr_handler;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = NULL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct inode *inode = dentry-&gt;d_inode;</div><div class='add'>+	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='add'>+	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='add'>+	struct jffs2_inode_cache *ic = f-&gt;inocache;</div><div class='add'>+	struct jffs2_xattr_ref *ref, **pref;</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	struct xattr_handler *xhandle;</div><div class='add'>+	ssize_t len, rc;</div><div class='add'>+	int retry = 0;</div><div class='add'>+</div><div class='add'>+	rc = check_xattr_ref_inode(c, ic);</div><div class='add'>+	if (unlikely(rc))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;c-&gt;xattr_sem);</div><div class='add'>+ retry:</div><div class='add'>+	len = 0;</div><div class='add'>+	for (ref=ic-&gt;xref, pref=&amp;ic-&gt;xref; ref; pref=&amp;ref-&gt;next, ref=ref-&gt;next) {</div><div class='add'>+		BUG_ON(ref-&gt;ic != ic);</div><div class='add'>+		xd = ref-&gt;xd;</div><div class='add'>+		if (!xd-&gt;xname) {</div><div class='add'>+			/* xdatum is unchached */</div><div class='add'>+			if (!retry) {</div><div class='add'>+				retry = 1;</div><div class='add'>+				up_read(&amp;c-&gt;xattr_sem);</div><div class='add'>+				down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+				goto retry;</div><div class='add'>+			} else {</div><div class='add'>+				rc = load_xattr_datum(c, xd);</div><div class='add'>+				if (unlikely(rc &gt; 0)) {</div><div class='add'>+					*pref = ref-&gt;next;</div><div class='add'>+					delete_xattr_ref(c, ref);</div><div class='add'>+					goto retry;</div><div class='add'>+				} else if (unlikely(rc &lt; 0))</div><div class='add'>+					goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		xhandle = xprefix_to_handler(xd-&gt;xprefix);</div><div class='add'>+		if (!xhandle)</div><div class='add'>+			continue;</div><div class='add'>+		if (buffer) {</div><div class='add'>+			rc = xhandle-&gt;list(inode, buffer+len, size-len, xd-&gt;xname, xd-&gt;name_len);</div><div class='add'>+		} else {</div><div class='add'>+			rc = xhandle-&gt;list(inode, NULL, 0, xd-&gt;xname, xd-&gt;name_len);</div><div class='add'>+		}</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+		len += rc;</div><div class='add'>+	}</div><div class='add'>+	rc = len;</div><div class='add'>+ out:</div><div class='add'>+	if (!retry) {</div><div class='add'>+		up_read(&amp;c-&gt;xattr_sem);</div><div class='add'>+	} else {</div><div class='add'>+		up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int do_jffs2_getxattr(struct inode *inode, int xprefix, const char *xname,</div><div class='add'>+		      char *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='add'>+	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='add'>+	struct jffs2_inode_cache *ic = f-&gt;inocache;</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	struct jffs2_xattr_ref *ref, **pref;</div><div class='add'>+	int rc, retry = 0;</div><div class='add'>+</div><div class='add'>+	rc = check_xattr_ref_inode(c, ic);</div><div class='add'>+	if (unlikely(rc))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	down_read(&amp;c-&gt;xattr_sem);</div><div class='add'>+ retry:</div><div class='add'>+	for (ref=ic-&gt;xref, pref=&amp;ic-&gt;xref; ref; pref=&amp;ref-&gt;next, ref=ref-&gt;next) {</div><div class='add'>+		BUG_ON(ref-&gt;ic!=ic);</div><div class='add'>+</div><div class='add'>+		xd = ref-&gt;xd;</div><div class='add'>+		if (xd-&gt;xprefix != xprefix)</div><div class='add'>+			continue;</div><div class='add'>+		if (!xd-&gt;xname) {</div><div class='add'>+			/* xdatum is unchached */</div><div class='add'>+			if (!retry) {</div><div class='add'>+				retry = 1;</div><div class='add'>+				up_read(&amp;c-&gt;xattr_sem);</div><div class='add'>+				down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+				goto retry;</div><div class='add'>+			} else {</div><div class='add'>+				rc = load_xattr_datum(c, xd);</div><div class='add'>+				if (unlikely(rc &gt; 0)) {</div><div class='add'>+					*pref = ref-&gt;next;</div><div class='add'>+					delete_xattr_ref(c, ref);</div><div class='add'>+					goto retry;</div><div class='add'>+				} else if (unlikely(rc &lt; 0)) {</div><div class='add'>+					goto out;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(xname, xd-&gt;xname)) {</div><div class='add'>+			rc = xd-&gt;value_len;</div><div class='add'>+			if (buffer) {</div><div class='add'>+				if (size &lt; rc) {</div><div class='add'>+					rc = -ERANGE;</div><div class='add'>+				} else {</div><div class='add'>+					memcpy(buffer, xd-&gt;xvalue, rc);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rc = -ENODATA;</div><div class='add'>+ out:</div><div class='add'>+	if (!retry) {</div><div class='add'>+		up_read(&amp;c-&gt;xattr_sem);</div><div class='add'>+	} else {</div><div class='add'>+		up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int do_jffs2_setxattr(struct inode *inode, int xprefix, const char *xname,</div><div class='add'>+		      const char *buffer, size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);</div><div class='add'>+	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode-&gt;i_sb);</div><div class='add'>+	struct jffs2_inode_cache *ic = f-&gt;inocache;</div><div class='add'>+	struct jffs2_xattr_datum *xd;</div><div class='add'>+	struct jffs2_xattr_ref *ref, *newref, **pref;</div><div class='add'>+	uint32_t length, request;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = check_xattr_ref_inode(c, ic);</div><div class='add'>+	if (unlikely(rc))</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	request = PAD(sizeof(struct jffs2_raw_xattr) + strlen(xname) + 1 + size);</div><div class='add'>+	rc = jffs2_reserve_space(c, request, &amp;length,</div><div class='add'>+				 ALLOC_NORMAL, JFFS2_SUMMARY_XATTR_SIZE);</div><div class='add'>+	if (rc) {</div><div class='add'>+		JFFS2_WARNING("jffs2_reserve_space()=%d, request=%u\n", rc, request);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find existing xattr */</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+ retry:</div><div class='add'>+	for (ref=ic-&gt;xref, pref=&amp;ic-&gt;xref; ref; pref=&amp;ref-&gt;next, ref=ref-&gt;next) {</div><div class='add'>+		xd = ref-&gt;xd;</div><div class='add'>+		if (xd-&gt;xprefix != xprefix)</div><div class='add'>+			continue;</div><div class='add'>+		if (!xd-&gt;xname) {</div><div class='add'>+			rc = load_xattr_datum(c, xd);</div><div class='add'>+			if (unlikely(rc &gt; 0)) {</div><div class='add'>+				*pref = ref-&gt;next;</div><div class='add'>+				delete_xattr_ref(c, ref);</div><div class='add'>+				goto retry;</div><div class='add'>+			} else if (unlikely(rc &lt; 0))</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+		if (!strcmp(xd-&gt;xname, xname)) {</div><div class='add'>+			if (flags &amp; XATTR_CREATE) {</div><div class='add'>+				rc = -EEXIST;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			if (!buffer) {</div><div class='add'>+				ref-&gt;ino = ic-&gt;ino;</div><div class='add'>+				ref-&gt;xid = xd-&gt;xid;</div><div class='add'>+				ref-&gt;xseqno |= XREF_DELETE_MARKER;</div><div class='add'>+				rc = save_xattr_ref(c, ref);</div><div class='add'>+				if (!rc) {</div><div class='add'>+					*pref = ref-&gt;next;</div><div class='add'>+					spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+					ref-&gt;next = c-&gt;xref_dead_list;</div><div class='add'>+					c-&gt;xref_dead_list = ref;</div><div class='add'>+					spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+					unrefer_xattr_datum(c, xd);</div><div class='add'>+				} else {</div><div class='add'>+					ref-&gt;ic = ic;</div><div class='add'>+					ref-&gt;xd = xd;</div><div class='add'>+					ref-&gt;xseqno &amp;= ~XREF_DELETE_MARKER;</div><div class='add'>+				}</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			goto found;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* not found */</div><div class='add'>+	if (flags &amp; XATTR_REPLACE) {</div><div class='add'>+		rc = -ENODATA;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!buffer) {</div><div class='add'>+		rc = -ENODATA;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+ found:</div><div class='add'>+	xd = create_xattr_datum(c, xprefix, xname, buffer, size);</div><div class='add'>+	if (IS_ERR(xd)) {</div><div class='add'>+		rc = PTR_ERR(xd);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	jffs2_complete_reservation(c);</div><div class='add'>+</div><div class='add'>+	/* create xattr_ref */</div><div class='add'>+	request = PAD(sizeof(struct jffs2_raw_xref));</div><div class='add'>+	rc = jffs2_reserve_space(c, request, &amp;length,</div><div class='add'>+				 ALLOC_NORMAL, JFFS2_SUMMARY_XREF_SIZE);</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	if (rc) {</div><div class='add'>+		JFFS2_WARNING("jffs2_reserve_space()=%d, request=%u\n", rc, request);</div><div class='add'>+		unrefer_xattr_datum(c, xd);</div><div class='add'>+		up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	if (ref)</div><div class='add'>+		*pref = ref-&gt;next;</div><div class='add'>+	newref = create_xattr_ref(c, ic, xd);</div><div class='add'>+	if (IS_ERR(newref)) {</div><div class='add'>+		if (ref) {</div><div class='add'>+			ref-&gt;next = ic-&gt;xref;</div><div class='add'>+			ic-&gt;xref = ref;</div><div class='add'>+		}</div><div class='add'>+		rc = PTR_ERR(newref);</div><div class='add'>+		unrefer_xattr_datum(c, xd);</div><div class='add'>+	} else if (ref) {</div><div class='add'>+		delete_xattr_ref(c, ref);</div><div class='add'>+	}</div><div class='add'>+ out:</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	jffs2_complete_reservation(c);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -------- garbage collector functions -------------</div><div class='add'>+ * jffs2_garbage_collect_xattr_datum(c, xd, raw)</div><div class='add'>+ *   is used to move xdatum into new node.</div><div class='add'>+ * jffs2_garbage_collect_xattr_ref(c, ref, raw)</div><div class='add'>+ *   is used to move xref into new node.</div><div class='add'>+ * jffs2_verify_xattr(c)</div><div class='add'>+ *   is used to call do_verify_xattr_datum() before garbage collecting.</div><div class='add'>+ * jffs2_release_xattr_datum(c, xd)</div><div class='add'>+ *   is used to release an in-memory object of xdatum.</div><div class='add'>+ * jffs2_release_xattr_ref(c, ref)</div><div class='add'>+ *   is used to release an in-memory object of xref.</div><div class='add'>+ * -------------------------------------------------- */</div><div class='add'>+int jffs2_garbage_collect_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd,</div><div class='add'>+				      struct jffs2_raw_node_ref *raw)</div><div class='add'>+{</div><div class='add'>+	uint32_t totlen, length, old_ofs;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	if (xd-&gt;node != raw)</div><div class='add'>+		goto out;</div><div class='add'>+	if (xd-&gt;flags &amp; (JFFS2_XFLAGS_DEAD|JFFS2_XFLAGS_INVALID))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rc = load_xattr_datum(c, xd);</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		rc = (rc &gt; 0) ? 0 : rc;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	old_ofs = ref_offset(xd-&gt;node);</div><div class='add'>+	totlen = PAD(sizeof(struct jffs2_raw_xattr)</div><div class='add'>+			+ xd-&gt;name_len + 1 + xd-&gt;value_len);</div><div class='add'>+	rc = jffs2_reserve_space_gc(c, totlen, &amp;length, JFFS2_SUMMARY_XATTR_SIZE);</div><div class='add'>+	if (rc) {</div><div class='add'>+		JFFS2_WARNING("jffs2_reserve_space_gc()=%d, request=%u\n", rc, totlen);</div><div class='add'>+		rc = rc ? rc : -EBADFD;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	rc = save_xattr_datum(c, xd);</div><div class='add'>+	if (!rc)</div><div class='add'>+		dbg_xattr("xdatum (xid=%u, version=%u) GC'ed from %#08x to %08x\n",</div><div class='add'>+			  xd-&gt;xid, xd-&gt;version, old_ofs, ref_offset(xd-&gt;node));</div><div class='add'>+ out:</div><div class='add'>+	if (!rc)</div><div class='add'>+		jffs2_mark_node_obsolete(c, raw);</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref,</div><div class='add'>+				    struct jffs2_raw_node_ref *raw)</div><div class='add'>+{</div><div class='add'>+	uint32_t totlen, length, old_ofs;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	BUG_ON(!ref-&gt;node);</div><div class='add'>+</div><div class='add'>+	if (ref-&gt;node != raw)</div><div class='add'>+		goto out;</div><div class='add'>+	if (is_xattr_ref_dead(ref) &amp;&amp; (raw-&gt;next_in_ino == (void *)ref))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	old_ofs = ref_offset(ref-&gt;node);</div><div class='add'>+	totlen = ref_totlen(c, c-&gt;gcblock, ref-&gt;node);</div><div class='add'>+</div><div class='add'>+	rc = jffs2_reserve_space_gc(c, totlen, &amp;length, JFFS2_SUMMARY_XREF_SIZE);</div><div class='add'>+	if (rc) {</div><div class='add'>+		JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",</div><div class='add'>+			      __FUNCTION__, rc, totlen);</div><div class='add'>+		rc = rc ? rc : -EBADFD;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	rc = save_xattr_ref(c, ref);</div><div class='add'>+	if (!rc)</div><div class='add'>+		dbg_xattr("xref (ino=%u, xid=%u) GC'ed from %#08x to %08x\n",</div><div class='add'>+			  ref-&gt;ic-&gt;ino, ref-&gt;xd-&gt;xid, old_ofs, ref_offset(ref-&gt;node));</div><div class='add'>+ out:</div><div class='add'>+	if (!rc)</div><div class='add'>+		jffs2_mark_node_obsolete(c, raw);</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int jffs2_verify_xattr(struct jffs2_sb_info *c)</div><div class='add'>+{</div><div class='add'>+	struct jffs2_xattr_datum *xd, *_xd;</div><div class='add'>+	struct jffs2_eraseblock *jeb;</div><div class='add'>+	struct jffs2_raw_node_ref *raw;</div><div class='add'>+	uint32_t totlen;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	down_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	list_for_each_entry_safe(xd, _xd, &amp;c-&gt;xattr_unchecked, xindex) {</div><div class='add'>+		rc = do_verify_xattr_datum(c, xd);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		list_del_init(&amp;xd-&gt;xindex);</div><div class='add'>+		spin_lock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+		for (raw=xd-&gt;node; raw != (void *)xd; raw=raw-&gt;next_in_ino) {</div><div class='add'>+			if (ref_flags(raw) != REF_UNCHECKED)</div><div class='add'>+				continue;</div><div class='add'>+			jeb = &amp;c-&gt;blocks[ref_offset(raw) / c-&gt;sector_size];</div><div class='add'>+			totlen = PAD(ref_totlen(c, jeb, raw));</div><div class='add'>+			c-&gt;unchecked_size -= totlen; c-&gt;used_size += totlen;</div><div class='add'>+			jeb-&gt;unchecked_size -= totlen; jeb-&gt;used_size += totlen;</div><div class='add'>+			raw-&gt;flash_offset = ref_offset(raw)</div><div class='add'>+				| ((xd-&gt;node == (void *)raw) ? REF_PRISTINE : REF_NORMAL);</div><div class='add'>+		}</div><div class='add'>+		if (xd-&gt;flags &amp; JFFS2_XFLAGS_DEAD)</div><div class='add'>+			list_add(&amp;xd-&gt;xindex, &amp;c-&gt;xattr_dead_list);</div><div class='add'>+		spin_unlock(&amp;c-&gt;erase_completion_lock);</div><div class='add'>+	}</div><div class='add'>+	up_write(&amp;c-&gt;xattr_sem);</div><div class='add'>+	return list_empty(&amp;c-&gt;xattr_unchecked) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_release_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)</div><div class='add'>+{</div><div class='add'>+	/* must be called under spin_lock(&amp;c-&gt;erase_completion_lock) */</div><div class='add'>+	if (atomic_read(&amp;xd-&gt;refcnt) || xd-&gt;node != (void *)xd)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;xd-&gt;xindex);</div><div class='add'>+	jffs2_free_xattr_datum(xd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void jffs2_release_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref)</div><div class='add'>+{</div><div class='add'>+	/* must be called under spin_lock(&amp;c-&gt;erase_completion_lock) */</div><div class='add'>+	struct jffs2_xattr_ref *tmp, **ptmp;</div><div class='add'>+</div><div class='add'>+	if (ref-&gt;node != (void *)ref)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (tmp=c-&gt;xref_dead_list, ptmp=&amp;c-&gt;xref_dead_list; tmp; ptmp=&amp;tmp-&gt;next, tmp=tmp-&gt;next) {</div><div class='add'>+		if (ref == tmp) {</div><div class='add'>+			*ptmp = tmp-&gt;next;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	jffs2_free_xattr_ref(ref);</div><div class='add'>+}</div><div class='head'>diff --git a/fs/jffs2/xattr.h b/fs/jffs2/xattr.h<br/>new file mode 100644<br/>index 000000000000..06a5c69dcf8b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/xattr.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/xattr.h</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#ifndef _JFFS2_FS_XATTR_H_</div><div class='add'>+#define _JFFS2_FS_XATTR_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+#define JFFS2_XFLAGS_HOT	(0x01)	/* This datum is HOT */</div><div class='add'>+#define JFFS2_XFLAGS_BIND	(0x02)	/* This datum is not reclaimed */</div><div class='add'>+#define JFFS2_XFLAGS_DEAD	(0x40)	/* This datum is already dead */</div><div class='add'>+#define JFFS2_XFLAGS_INVALID	(0x80)	/* This datum contains crc error */</div><div class='add'>+</div><div class='add'>+struct jffs2_xattr_datum</div><div class='add'>+{</div><div class='add'>+	void *always_null;</div><div class='add'>+	struct jffs2_raw_node_ref *node;</div><div class='add'>+	uint8_t class;</div><div class='add'>+	uint8_t flags;</div><div class='add'>+	uint16_t xprefix;		/* see JFFS2_XATTR_PREFIX_* */</div><div class='add'>+</div><div class='add'>+	struct list_head xindex;	/* chained from c-&gt;xattrindex[n] */</div><div class='add'>+	atomic_t refcnt;		/* # of xattr_ref refers this */</div><div class='add'>+	uint32_t xid;</div><div class='add'>+	uint32_t version;</div><div class='add'>+</div><div class='add'>+	uint32_t data_crc;</div><div class='add'>+	uint32_t hashkey;</div><div class='add'>+	char *xname;		/* XATTR name without prefix */</div><div class='add'>+	uint32_t name_len;	/* length of xname */</div><div class='add'>+	char *xvalue;		/* XATTR value */</div><div class='add'>+	uint32_t value_len;	/* length of xvalue */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct jffs2_inode_cache;</div><div class='add'>+struct jffs2_xattr_ref</div><div class='add'>+{</div><div class='add'>+	void *always_null;</div><div class='add'>+	struct jffs2_raw_node_ref *node;</div><div class='add'>+	uint8_t class;</div><div class='add'>+	uint8_t flags;		/* Currently unused */</div><div class='add'>+	u16 unused;</div><div class='add'>+</div><div class='add'>+	uint32_t xseqno;</div><div class='add'>+	union {</div><div class='add'>+		struct jffs2_inode_cache *ic;	/* reference to jffs2_inode_cache */</div><div class='add'>+		uint32_t ino;			/* only used in scanning/building  */</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		struct jffs2_xattr_datum *xd;	/* reference to jffs2_xattr_datum */</div><div class='add'>+		uint32_t xid;			/* only used in sccanning/building */</div><div class='add'>+	};</div><div class='add'>+	struct jffs2_xattr_ref *next;		/* chained from ic-&gt;xref_list */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define XREF_DELETE_MARKER	(0x00000001)</div><div class='add'>+static inline int is_xattr_ref_dead(struct jffs2_xattr_ref *ref)</div><div class='add'>+{</div><div class='add'>+	return ((ref-&gt;xseqno &amp; XREF_DELETE_MARKER) != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_XATTR</div><div class='add'>+</div><div class='add'>+extern void jffs2_init_xattr_subsystem(struct jffs2_sb_info *c);</div><div class='add'>+extern void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c);</div><div class='add'>+extern void jffs2_clear_xattr_subsystem(struct jffs2_sb_info *c);</div><div class='add'>+</div><div class='add'>+extern struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,</div><div class='add'>+                                                  uint32_t xid, uint32_t version);</div><div class='add'>+</div><div class='add'>+extern void jffs2_xattr_delete_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic);</div><div class='add'>+extern void jffs2_xattr_free_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic);</div><div class='add'>+</div><div class='add'>+extern int jffs2_garbage_collect_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd,</div><div class='add'>+					     struct jffs2_raw_node_ref *raw);</div><div class='add'>+extern int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref,</div><div class='add'>+					   struct jffs2_raw_node_ref *raw);</div><div class='add'>+extern int jffs2_verify_xattr(struct jffs2_sb_info *c);</div><div class='add'>+extern void jffs2_release_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd);</div><div class='add'>+extern void jffs2_release_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ref *ref);</div><div class='add'>+</div><div class='add'>+extern int do_jffs2_getxattr(struct inode *inode, int xprefix, const char *xname,</div><div class='add'>+			     char *buffer, size_t size);</div><div class='add'>+extern int do_jffs2_setxattr(struct inode *inode, int xprefix, const char *xname,</div><div class='add'>+			     const char *buffer, size_t size, int flags);</div><div class='add'>+</div><div class='add'>+extern struct xattr_handler *jffs2_xattr_handlers[];</div><div class='add'>+extern struct xattr_handler jffs2_user_xattr_handler;</div><div class='add'>+extern struct xattr_handler jffs2_trusted_xattr_handler;</div><div class='add'>+</div><div class='add'>+extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t);</div><div class='add'>+#define jffs2_getxattr		generic_getxattr</div><div class='add'>+#define jffs2_setxattr		generic_setxattr</div><div class='add'>+#define jffs2_removexattr	generic_removexattr</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define jffs2_init_xattr_subsystem(c)</div><div class='add'>+#define jffs2_build_xattr_subsystem(c)</div><div class='add'>+#define jffs2_clear_xattr_subsystem(c)</div><div class='add'>+</div><div class='add'>+#define jffs2_xattr_delete_inode(c, ic)</div><div class='add'>+#define jffs2_xattr_free_inode(c, ic)</div><div class='add'>+#define jffs2_verify_xattr(c)			(1)</div><div class='add'>+</div><div class='add'>+#define jffs2_xattr_handlers	NULL</div><div class='add'>+#define jffs2_listxattr		NULL</div><div class='add'>+#define jffs2_getxattr		NULL</div><div class='add'>+#define jffs2_setxattr		NULL</div><div class='add'>+#define jffs2_removexattr	NULL</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_JFFS2_FS_XATTR */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_JFFS2_FS_SECURITY</div><div class='add'>+extern int jffs2_init_security(struct inode *inode, struct inode *dir);</div><div class='add'>+extern struct xattr_handler jffs2_security_xattr_handler;</div><div class='add'>+#else</div><div class='add'>+#define jffs2_init_security(inode,dir)	(0)</div><div class='add'>+#endif /* CONFIG_JFFS2_FS_SECURITY */</div><div class='add'>+</div><div class='add'>+#endif /* _JFFS2_FS_XATTR_H_ */</div><div class='head'>diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c<br/>new file mode 100644<br/>index 000000000000..ed046e19dbfa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/xattr_trusted.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/xattr_trusted.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/jffs2.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include "nodelist.h"</div><div class='add'>+</div><div class='add'>+static int jffs2_trusted_getxattr(struct inode *inode, const char *name,</div><div class='add'>+				  void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(name, ""))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED, name, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_trusted_setxattr(struct inode *inode, const char *name, const void *buffer,</div><div class='add'>+				  size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(name, ""))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return do_jffs2_setxattr(inode, JFFS2_XPREFIX_TRUSTED, name, buffer, size, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t jffs2_trusted_listxattr(struct inode *inode, char *list, size_t list_size,</div><div class='add'>+				      const char *name, size_t name_len)</div><div class='add'>+{</div><div class='add'>+	size_t retlen = XATTR_TRUSTED_PREFIX_LEN + name_len + 1;</div><div class='add'>+</div><div class='add'>+	if (list &amp;&amp; retlen&lt;=list_size) {</div><div class='add'>+		strcpy(list, XATTR_TRUSTED_PREFIX);</div><div class='add'>+		strcpy(list + XATTR_TRUSTED_PREFIX_LEN, name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xattr_handler jffs2_trusted_xattr_handler = {</div><div class='add'>+	.prefix = XATTR_TRUSTED_PREFIX,</div><div class='add'>+	.list = jffs2_trusted_listxattr,</div><div class='add'>+	.set = jffs2_trusted_setxattr,</div><div class='add'>+	.get = jffs2_trusted_getxattr</div><div class='add'>+};</div><div class='head'>diff --git a/fs/jffs2/xattr_user.c b/fs/jffs2/xattr_user.c<br/>new file mode 100644<br/>index 000000000000..2f8e9aa01ea0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/jffs2/xattr_user.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jffs2/xattr_user.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/*</div><div class='add'>+ * JFFS2 -- Journalling Flash File System, Version 2.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2006  NEC Corporation</div><div class='add'>+ *</div><div class='add'>+ * Created by KaiGai Kohei &lt;kaigai@ak.jp.nec.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * For licensing information, see the file 'LICENCE' in this directory.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/jffs2.h&gt;</div><div class='add'>+#include &lt;linux/xattr.h&gt;</div><div class='add'>+#include &lt;linux/mtd/mtd.h&gt;</div><div class='add'>+#include "nodelist.h"</div><div class='add'>+</div><div class='add'>+static int jffs2_user_getxattr(struct inode *inode, const char *name,</div><div class='add'>+                               void *buffer, size_t size)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(name, ""))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return do_jffs2_getxattr(inode, JFFS2_XPREFIX_USER, name, buffer, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int jffs2_user_setxattr(struct inode *inode, const char *name, const void *buffer,</div><div class='add'>+                               size_t size, int flags)</div><div class='add'>+{</div><div class='add'>+	if (!strcmp(name, ""))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return do_jffs2_setxattr(inode, JFFS2_XPREFIX_USER, name, buffer, size, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t jffs2_user_listxattr(struct inode *inode, char *list, size_t list_size,</div><div class='add'>+				   const char *name, size_t name_len)</div><div class='add'>+{</div><div class='add'>+	size_t retlen = XATTR_USER_PREFIX_LEN + name_len + 1;</div><div class='add'>+</div><div class='add'>+	if (list &amp;&amp; retlen &lt;= list_size) {</div><div class='add'>+		strcpy(list, XATTR_USER_PREFIX);</div><div class='add'>+		strcpy(list + XATTR_USER_PREFIX_LEN, name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retlen;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xattr_handler jffs2_user_xattr_handler = {</div><div class='add'>+	.prefix = XATTR_USER_PREFIX,</div><div class='add'>+	.list = jffs2_user_listxattr,</div><div class='add'>+	.set = jffs2_user_setxattr,</div><div class='add'>+	.get = jffs2_user_getxattr</div><div class='add'>+};</div><div class='head'>diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c<br/>index 04eb78f1252e..43e3f566aad6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/inode.c</a></div><div class='hunk'>@@ -305,7 +305,7 @@ static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,</div><div class='ctx'> 				offset, nr_segs, jfs_get_block, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations jfs_aops = {</div><div class='add'>+const struct address_space_operations jfs_aops = {</div><div class='ctx'> 	.readpage	= jfs_readpage,</div><div class='ctx'> 	.readpages	= jfs_readpages,</div><div class='ctx'> 	.writepage	= jfs_writepage,</div><div class='head'>diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c<br/>index 5549378358bf..4d52593a5fc6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/jfs_extent.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_extent.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/jfs_extent.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/jfs_extent.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate the disk blocks for the extent.  initially, extBalloc()</div><div class='ctx'> 	 * will try to allocate disk blocks for the requested size (xlen). </div><div class='del'>-	 * if this fails (xlen contigious free blocks not avaliable), it'll</div><div class='add'>+	 * if this fails (xlen contiguous free blocks not avaliable), it'll</div><div class='ctx'> 	 * try to allocate a smaller number of blocks (producing a smaller</div><div class='ctx'> 	 * extent), with this smaller number of blocks consisting of the</div><div class='ctx'> 	 * requested number of blocks rounded down to the next smaller</div><div class='hunk'>@@ -493,7 +493,7 @@ int extFill(struct inode *ip, xad_t * xp)</div><div class='ctx'>  *</div><div class='ctx'>  *		initially, we will try to allocate disk blocks for the</div><div class='ctx'>  *		requested size (nblocks).  if this fails (nblocks </div><div class='del'>- *		contigious free blocks not avaliable), we'll try to allocate</div><div class='add'>+ *		contiguous free blocks not avaliable), we'll try to allocate</div><div class='ctx'>  *		a smaller number of blocks (producing a smaller extent), with</div><div class='ctx'>  *		this smaller number of blocks consisting of the requested</div><div class='ctx'>  *		number of blocks rounded down to the next smaller power of 2</div><div class='hunk'>@@ -529,7 +529,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)</div><div class='ctx'> </div><div class='ctx'> 	/* get the number of blocks to initially attempt to allocate.</div><div class='ctx'> 	 * we'll first try the number of blocks requested unless this</div><div class='del'>-	 * number is greater than the maximum number of contigious free</div><div class='add'>+	 * number is greater than the maximum number of contiguous free</div><div class='ctx'> 	 * blocks in the map. in that case, we'll start off with the </div><div class='ctx'> 	 * maximum free.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -586,7 +586,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)</div><div class='ctx'>  *		in place.  if this fails, we'll try to move the extent</div><div class='ctx'>  *		to a new set of blocks. if moving the extent, we initially</div><div class='ctx'>  *		will try to allocate disk blocks for the requested size</div><div class='del'>- *		(nnew).  if this fails 	(nnew contigious free blocks not</div><div class='add'>+ *		(nnew).  if this fails 	(new contiguous free blocks not</div><div class='ctx'>  *		avaliable), we'll try  to allocate a smaller number of</div><div class='ctx'>  *		blocks (producing a smaller extent), with this smaller</div><div class='ctx'>  *		number of blocks consisting of the requested number of</div><div class='head'>diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h<br/>index c30072674464..b5c7da6190dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/jfs_inode.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_inode.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/jfs_inode.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/jfs_inode.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@ extern void jfs_free_zero_link(struct inode *);</div><div class='ctx'> extern struct dentry *jfs_get_parent(struct dentry *dentry);</div><div class='ctx'> extern void jfs_set_inode_flags(struct inode *);</div><div class='ctx'> </div><div class='del'>-extern struct address_space_operations jfs_aops;</div><div class='add'>+extern const struct address_space_operations jfs_aops;</div><div class='ctx'> extern struct inode_operations jfs_dir_inode_operations;</div><div class='ctx'> extern const struct file_operations jfs_dir_operations;</div><div class='ctx'> extern struct inode_operations jfs_file_inode_operations;</div><div class='head'>diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c<br/>index 2b220dd6b4e7..e1e0a6e6ebdf 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/jfs_metapage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_metapage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/jfs_metapage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/jfs_metapage.c</a></div><div class='hunk'>@@ -577,7 +577,7 @@ static void metapage_invalidatepage(struct page *page, unsigned long offset)</div><div class='ctx'> 	metapage_releasepage(page, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations jfs_metapage_aops = {</div><div class='add'>+const struct address_space_operations jfs_metapage_aops = {</div><div class='ctx'> 	.readpage	= metapage_readpage,</div><div class='ctx'> 	.writepage	= metapage_writepage,</div><div class='ctx'> 	.sync_page	= block_sync_page,</div><div class='hunk'>@@ -632,10 +632,9 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,</div><div class='ctx'> 		}</div><div class='ctx'> 		SetPageUptodate(page);</div><div class='ctx'> 	} else {</div><div class='del'>-		page = read_cache_page(mapping, page_index,</div><div class='del'>-			    (filler_t *)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+		page = read_mapping_page(mapping, page_index, NULL);</div><div class='ctx'> 		if (IS_ERR(page) || !PageUptodate(page)) {</div><div class='del'>-			jfs_err("read_cache_page failed!");</div><div class='add'>+			jfs_err("read_mapping_page failed!");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		lock_page(page);</div><div class='head'>diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h<br/>index f0b7d3282b07..d17a3290f5aa 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/jfs_metapage.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_metapage.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/jfs_metapage.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/jfs_metapage.h</a></div><div class='hunk'>@@ -139,7 +139,7 @@ static inline void metapage_homeok(struct metapage *mp)</div><div class='ctx'> 	put_metapage(mp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern struct address_space_operations jfs_metapage_aops;</div><div class='add'>+extern const struct address_space_operations jfs_metapage_aops;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * This routines invalidate all pages for an extent.</div><div class='head'>diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c<br/>index 49618dd94f9a..efbb586bed4b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/jfs_txnmgr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/jfs_txnmgr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/jfs_txnmgr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/jfs_txnmgr.c</a></div><div class='hunk'>@@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,</div><div class='ctx'> 	TXN_UNLOCK();</div><div class='ctx'> 	release_metapage(mp);</div><div class='ctx'> 	TXN_LOCK();</div><div class='del'>-	xtid = tlck-&gt;tid;	/* reaquire after dropping TXN_LOCK */</div><div class='add'>+	xtid = tlck-&gt;tid;	/* reacquire after dropping TXN_LOCK */</div><div class='ctx'> </div><div class='ctx'> 	jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d",</div><div class='ctx'> 		 tid, xtid, lid);</div><div class='head'>diff --git a/fs/jfs/super.c b/fs/jfs/super.c<br/>index db6f41d6dd60..4f6cfebc82db 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/jfs/super.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/jfs/super.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/jfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/jfs/super.c</a></div><div class='hunk'>@@ -18,7 +18,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/parser.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='hunk'>@@ -139,9 +138,9 @@ static void jfs_destroy_inode(struct inode *inode)</div><div class='ctx'> 	kmem_cache_free(jfs_inode_cachep, ji);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int jfs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct jfs_sb_info *sbi = JFS_SBI(sb);</div><div class='add'>+	struct jfs_sb_info *sbi = JFS_SBI(dentry-&gt;d_sb);</div><div class='ctx'> 	s64 maxinodes;</div><div class='ctx'> 	struct inomap *imap = JFS_IP(sbi-&gt;ipimap)-&gt;i_imap;</div><div class='ctx'> </div><div class='hunk'>@@ -565,10 +564,11 @@ static void jfs_unlockfs(struct super_block *sb)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *jfs_get_sb(struct file_system_type *fs_type, </div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int jfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int jfs_sync_fs(struct super_block *sb, int wait)</div><div class='head'>diff --git a/fs/libfs.c b/fs/libfs.c<br/>index 7145ba7a48d0..ac02ea602c3d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/libfs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/libfs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/libfs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/libfs.c</a></div><div class='hunk'>@@ -20,9 +20,9 @@ int simple_getattr(struct vfsmount *mnt, struct dentry *dentry,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int simple_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+int simple_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	buf-&gt;f_type = sb-&gt;s_magic;</div><div class='add'>+	buf-&gt;f_type = dentry-&gt;d_sb-&gt;s_magic;</div><div class='ctx'> 	buf-&gt;f_bsize = PAGE_CACHE_SIZE;</div><div class='ctx'> 	buf-&gt;f_namelen = NAME_MAX;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -149,10 +149,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)</div><div class='ctx'> 			/* fallthrough */</div><div class='ctx'> 		default:</div><div class='ctx'> 			spin_lock(&amp;dcache_lock);</div><div class='del'>-			if (filp-&gt;f_pos == 2) {</div><div class='del'>-				list_del(q);</div><div class='del'>-				list_add(q, &amp;dentry-&gt;d_subdirs);</div><div class='del'>-			}</div><div class='add'>+			if (filp-&gt;f_pos == 2)</div><div class='add'>+				list_move(q, &amp;dentry-&gt;d_subdirs);</div><div class='add'>+</div><div class='ctx'> 			for (p=q-&gt;next; p != &amp;dentry-&gt;d_subdirs; p=p-&gt;next) {</div><div class='ctx'> 				struct dentry *next;</div><div class='ctx'> 				next = list_entry(p, struct dentry, d_u.d_child);</div><div class='hunk'>@@ -164,8 +163,7 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				spin_lock(&amp;dcache_lock);</div><div class='ctx'> 				/* next is still alive */</div><div class='del'>-				list_del(q);</div><div class='del'>-				list_add(q, p);</div><div class='add'>+				list_move(q, p);</div><div class='ctx'> 				p = q;</div><div class='ctx'> 				filp-&gt;f_pos++;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -196,9 +194,9 @@ struct inode_operations simple_dir_inode_operations = {</div><div class='ctx'>  * Common helper for pseudo-filesystems (sockfs, pipefs, bdev - stuff that</div><div class='ctx'>  * will never be mountable)</div><div class='ctx'>  */</div><div class='del'>-struct super_block *</div><div class='del'>-get_sb_pseudo(struct file_system_type *fs_type, char *name,</div><div class='del'>-	struct super_operations *ops, unsigned long magic)</div><div class='add'>+int get_sb_pseudo(struct file_system_type *fs_type, char *name,</div><div class='add'>+	struct super_operations *ops, unsigned long magic,</div><div class='add'>+	struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);</div><div class='ctx'> 	static struct super_operations default_ops = {.statfs = simple_statfs};</div><div class='hunk'>@@ -207,7 +205,7 @@ get_sb_pseudo(struct file_system_type *fs_type, char *name,</div><div class='ctx'> 	struct qstr d_name = {.name = name, .len = strlen(name)};</div><div class='ctx'> </div><div class='ctx'> 	if (IS_ERR(s))</div><div class='del'>-		return s;</div><div class='add'>+		return PTR_ERR(s);</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;s_flags = MS_NOUSER;</div><div class='ctx'> 	s-&gt;s_maxbytes = ~0ULL;</div><div class='hunk'>@@ -232,12 +230,12 @@ get_sb_pseudo(struct file_system_type *fs_type, char *name,</div><div class='ctx'> 	d_instantiate(dentry, root);</div><div class='ctx'> 	s-&gt;s_root = dentry;</div><div class='ctx'> 	s-&gt;s_flags |= MS_ACTIVE;</div><div class='del'>-	return s;</div><div class='add'>+	return simple_set_mnt(mnt, s);</div><div class='ctx'> </div><div class='ctx'> Enomem:</div><div class='ctx'> 	up_write(&amp;s-&gt;s_umount);</div><div class='ctx'> 	deactivate_super(s);</div><div class='del'>-	return ERR_PTR(-ENOMEM);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)</div><div class='hunk'>@@ -424,13 +422,13 @@ out:</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(pin_fs_lock);</div><div class='ctx'> </div><div class='del'>-int simple_pin_fs(char *name, struct vfsmount **mount, int *count)</div><div class='add'>+int simple_pin_fs(struct file_system_type *type, struct vfsmount **mount, int *count)</div><div class='ctx'> {</div><div class='ctx'> 	struct vfsmount *mnt = NULL;</div><div class='ctx'> 	spin_lock(&amp;pin_fs_lock);</div><div class='ctx'> 	if (unlikely(!*mount)) {</div><div class='ctx'> 		spin_unlock(&amp;pin_fs_lock);</div><div class='del'>-		mnt = do_kern_mount(name, 0, name, NULL);</div><div class='add'>+		mnt = vfs_kern_mount(type, 0, type-&gt;name, NULL);</div><div class='ctx'> 		if (IS_ERR(mnt))</div><div class='ctx'> 			return PTR_ERR(mnt);</div><div class='ctx'> 		spin_lock(&amp;pin_fs_lock);</div><div class='head'>diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c<br/>index bce744468708..52774feab93f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/clntlock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/clntlock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/clntlock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/clntlock.c</a></div><div class='hunk'>@@ -147,11 +147,10 @@ u32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock)</div><div class='ctx'>  * Someone has sent us an SM_NOTIFY. Ensure we bind to the new port number,</div><div class='ctx'>  * that we mark locks for reclaiming, and that we bump the pseudo NSM state.</div><div class='ctx'>  */</div><div class='del'>-static inline</div><div class='del'>-void nlmclnt_prepare_reclaim(struct nlm_host *host, u32 newstate)</div><div class='add'>+static void nlmclnt_prepare_reclaim(struct nlm_host *host)</div><div class='ctx'> {</div><div class='add'>+	down_write(&amp;host-&gt;h_rwsem);</div><div class='ctx'> 	host-&gt;h_monitored = 0;</div><div class='del'>-	host-&gt;h_nsmstate = newstate;</div><div class='ctx'> 	host-&gt;h_state++;</div><div class='ctx'> 	host-&gt;h_nextrebind = 0;</div><div class='ctx'> 	nlm_rebind_host(host);</div><div class='hunk'>@@ -164,6 +163,13 @@ void nlmclnt_prepare_reclaim(struct nlm_host *host, u32 newstate)</div><div class='ctx'> 	dprintk("NLM: reclaiming locks for host %s", host-&gt;h_name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nlmclnt_finish_reclaim(struct nlm_host *host)</div><div class='add'>+{</div><div class='add'>+	host-&gt;h_reclaiming = 0;</div><div class='add'>+	up_write(&amp;host-&gt;h_rwsem);</div><div class='add'>+	dprintk("NLM: done reclaiming locks for host %s", host-&gt;h_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Reclaim all locks on server host. We do this by spawning a separate</div><div class='ctx'>  * reclaimer thread.</div><div class='hunk'>@@ -171,12 +177,10 @@ void nlmclnt_prepare_reclaim(struct nlm_host *host, u32 newstate)</div><div class='ctx'> void</div><div class='ctx'> nlmclnt_recovery(struct nlm_host *host, u32 newstate)</div><div class='ctx'> {</div><div class='del'>-	if (host-&gt;h_reclaiming++) {</div><div class='del'>-		if (host-&gt;h_nsmstate == newstate)</div><div class='del'>-			return;</div><div class='del'>-		nlmclnt_prepare_reclaim(host, newstate);</div><div class='del'>-	} else {</div><div class='del'>-		nlmclnt_prepare_reclaim(host, newstate);</div><div class='add'>+	if (host-&gt;h_nsmstate == newstate)</div><div class='add'>+		return;</div><div class='add'>+	host-&gt;h_nsmstate = newstate;</div><div class='add'>+	if (!host-&gt;h_reclaiming++) {</div><div class='ctx'> 		nlm_get_host(host);</div><div class='ctx'> 		__module_get(THIS_MODULE);</div><div class='ctx'> 		if (kernel_thread(reclaimer, host, CLONE_KERNEL) &lt; 0)</div><div class='hunk'>@@ -190,6 +194,7 @@ reclaimer(void *ptr)</div><div class='ctx'> 	struct nlm_host	  *host = (struct nlm_host *) ptr;</div><div class='ctx'> 	struct nlm_wait	  *block;</div><div class='ctx'> 	struct file_lock *fl, *next;</div><div class='add'>+	u32 nsmstate;</div><div class='ctx'> </div><div class='ctx'> 	daemonize("%s-reclaim", host-&gt;h_name);</div><div class='ctx'> 	allow_signal(SIGKILL);</div><div class='hunk'>@@ -199,19 +204,25 @@ reclaimer(void *ptr)</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	lockd_up();</div><div class='ctx'> </div><div class='add'>+	nlmclnt_prepare_reclaim(host);</div><div class='ctx'> 	/* First, reclaim all locks that have been marked. */</div><div class='ctx'> restart:</div><div class='add'>+	nsmstate = host-&gt;h_nsmstate;</div><div class='ctx'> 	list_for_each_entry_safe(fl, next, &amp;host-&gt;h_reclaim, fl_u.nfs_fl.list) {</div><div class='ctx'> 		list_del_init(&amp;fl-&gt;fl_u.nfs_fl.list);</div><div class='ctx'> </div><div class='ctx'> 		if (signalled())</div><div class='ctx'> 			continue;</div><div class='del'>-		if (nlmclnt_reclaim(host, fl) == 0)</div><div class='del'>-			list_add_tail(&amp;fl-&gt;fl_u.nfs_fl.list, &amp;host-&gt;h_granted);</div><div class='del'>-		goto restart;</div><div class='add'>+		if (nlmclnt_reclaim(host, fl) != 0)</div><div class='add'>+			continue;</div><div class='add'>+		list_add_tail(&amp;fl-&gt;fl_u.nfs_fl.list, &amp;host-&gt;h_granted);</div><div class='add'>+		if (host-&gt;h_nsmstate != nsmstate) {</div><div class='add'>+			/* Argh! The server rebooted again! */</div><div class='add'>+			list_splice_init(&amp;host-&gt;h_granted, &amp;host-&gt;h_reclaim);</div><div class='add'>+			goto restart;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	host-&gt;h_reclaiming = 0;</div><div class='add'>+	nlmclnt_finish_reclaim(host);</div><div class='ctx'> </div><div class='ctx'> 	/* Now, wake up all processes that sleep on a blocked lock */</div><div class='ctx'> 	list_for_each_entry(block, &amp;nlm_blocked, b_list) {</div><div class='head'>diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c<br/>index f96e38155b5c..89ba0df14c22 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/clntproc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/clntproc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/clntproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/clntproc.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1996, Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -455,7 +454,7 @@ static void nlmclnt_locks_init_private(struct file_lock *fl, struct nlm_host *ho</div><div class='ctx'> 	fl-&gt;fl_ops = &amp;nlmclnt_lock_ops;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void do_vfs_lock(struct file_lock *fl)</div><div class='add'>+static int do_vfs_lock(struct file_lock *fl)</div><div class='ctx'> {</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> 	switch (fl-&gt;fl_flags &amp; (FL_POSIX|FL_FLOCK)) {</div><div class='hunk'>@@ -468,9 +467,7 @@ static void do_vfs_lock(struct file_lock *fl)</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='ctx'> 	}</div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n",</div><div class='del'>-				__FUNCTION__);</div><div class='add'>+	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -499,6 +496,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 	struct nlm_host	*host = req-&gt;a_host;</div><div class='ctx'> 	struct nlm_res	*resp = &amp;req-&gt;a_res;</div><div class='ctx'> 	struct nlm_wait *block = NULL;</div><div class='add'>+	unsigned char fl_flags = fl-&gt;fl_flags;</div><div class='ctx'> 	int status = -ENOLCK;</div><div class='ctx'> </div><div class='ctx'> 	if (!host-&gt;h_monitored &amp;&amp; nsm_monitor(host) &lt; 0) {</div><div class='hunk'>@@ -506,9 +504,16 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 					host-&gt;h_name);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	fl-&gt;fl_flags |= FL_ACCESS;</div><div class='add'>+	status = do_vfs_lock(fl);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	block = nlmclnt_prepare_block(host, fl);</div><div class='add'>+again:</div><div class='ctx'> 	for(;;) {</div><div class='add'>+		/* Reboot protection */</div><div class='add'>+		fl-&gt;fl_u.nfs_fl.state = host-&gt;h_state;</div><div class='ctx'> 		status = nlmclnt_call(req, NLMPROC_LOCK);</div><div class='ctx'> 		if (status &lt; 0)</div><div class='ctx'> 			goto out_unblock;</div><div class='hunk'>@@ -531,10 +536,17 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (resp-&gt;status == NLM_LCK_GRANTED) {</div><div class='del'>-		fl-&gt;fl_u.nfs_fl.state = host-&gt;h_state;</div><div class='del'>-		fl-&gt;fl_flags |= FL_SLEEP;</div><div class='add'>+		down_read(&amp;host-&gt;h_rwsem);</div><div class='add'>+		/* Check whether or not the server has rebooted */</div><div class='add'>+		if (fl-&gt;fl_u.nfs_fl.state != host-&gt;h_state) {</div><div class='add'>+			up_read(&amp;host-&gt;h_rwsem);</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='ctx'> 		/* Ensure the resulting lock will get added to granted list */</div><div class='del'>-		do_vfs_lock(fl);</div><div class='add'>+		fl-&gt;fl_flags = fl_flags | FL_SLEEP;</div><div class='add'>+		if (do_vfs_lock(fl) &lt; 0)</div><div class='add'>+			printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __FUNCTION__);</div><div class='add'>+		up_read(&amp;host-&gt;h_rwsem);</div><div class='ctx'> 	}</div><div class='ctx'> 	status = nlm_stat_to_errno(resp-&gt;status);</div><div class='ctx'> out_unblock:</div><div class='hunk'>@@ -544,6 +556,7 @@ out_unblock:</div><div class='ctx'> 		nlmclnt_cancel(host, req-&gt;a_args.block, fl);</div><div class='ctx'> out:</div><div class='ctx'> 	nlm_release_call(req);</div><div class='add'>+	fl-&gt;fl_flags = fl_flags;</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -596,15 +609,22 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl)</div><div class='ctx'> static int</div><div class='ctx'> nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> {</div><div class='add'>+	struct nlm_host	*host = req-&gt;a_host;</div><div class='ctx'> 	struct nlm_res	*resp = &amp;req-&gt;a_res;</div><div class='del'>-	int		status;</div><div class='add'>+	int status = 0;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note: the server is supposed to either grant us the unlock</div><div class='ctx'> 	 * request, or to deny it with NLM_LCK_DENIED_GRACE_PERIOD. In either</div><div class='ctx'> 	 * case, we want to unlock.</div><div class='ctx'> 	 */</div><div class='del'>-	do_vfs_lock(fl);</div><div class='add'>+	fl-&gt;fl_flags |= FL_EXISTS;</div><div class='add'>+	down_read(&amp;host-&gt;h_rwsem);</div><div class='add'>+	if (do_vfs_lock(fl) == -ENOENT) {</div><div class='add'>+		up_read(&amp;host-&gt;h_rwsem);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	up_read(&amp;host-&gt;h_rwsem);</div><div class='ctx'> </div><div class='ctx'> 	if (req-&gt;a_flags &amp; RPC_TASK_ASYNC)</div><div class='ctx'> 		return nlm_async_call(req, NLMPROC_UNLOCK, &amp;nlmclnt_unlock_ops);</div><div class='hunk'>@@ -613,7 +633,6 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	status = 0;</div><div class='ctx'> 	if (resp-&gt;status == NLM_LCK_GRANTED)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/lockd/host.c b/fs/lockd/host.c<br/>index 729ac427d359..38b0e8a1aec0 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/host.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/host.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/host.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/host.c</a></div><div class='hunk'>@@ -112,11 +112,12 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,</div><div class='ctx'> 	host-&gt;h_version    = version;</div><div class='ctx'> 	host-&gt;h_proto      = proto;</div><div class='ctx'> 	host-&gt;h_rpcclnt    = NULL;</div><div class='del'>-	init_MUTEX(&amp;host-&gt;h_sema);</div><div class='add'>+	mutex_init(&amp;host-&gt;h_mutex);</div><div class='ctx'> 	host-&gt;h_nextrebind = jiffies + NLM_HOST_REBIND;</div><div class='ctx'> 	host-&gt;h_expires    = jiffies + NLM_HOST_EXPIRE;</div><div class='ctx'> 	atomic_set(&amp;host-&gt;h_count, 1);</div><div class='ctx'> 	init_waitqueue_head(&amp;host-&gt;h_gracewait);</div><div class='add'>+	init_rwsem(&amp;host-&gt;h_rwsem);</div><div class='ctx'> 	host-&gt;h_state      = 0;			/* pseudo NSM state */</div><div class='ctx'> 	host-&gt;h_nsmstate   = 0;			/* real NSM state */</div><div class='ctx'> 	host-&gt;h_server	   = server;</div><div class='hunk'>@@ -172,7 +173,7 @@ nlm_bind_host(struct nlm_host *host)</div><div class='ctx'> 			(unsigned)ntohl(host-&gt;h_addr.sin_addr.s_addr));</div><div class='ctx'> </div><div class='ctx'> 	/* Lock host handle */</div><div class='del'>-	down(&amp;host-&gt;h_sema);</div><div class='add'>+	mutex_lock(&amp;host-&gt;h_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* If we've already created an RPC client, check whether</div><div class='ctx'> 	 * RPC rebind is required</div><div class='hunk'>@@ -204,12 +205,12 @@ nlm_bind_host(struct nlm_host *host)</div><div class='ctx'> 		host-&gt;h_rpcclnt = clnt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	up(&amp;host-&gt;h_sema);</div><div class='add'>+	mutex_unlock(&amp;host-&gt;h_mutex);</div><div class='ctx'> 	return clnt;</div><div class='ctx'> </div><div class='ctx'> forgetit:</div><div class='ctx'> 	printk("lockd: couldn't create RPC handle for %s\n", host-&gt;h_name);</div><div class='del'>-	up(&amp;host-&gt;h_sema);</div><div class='add'>+	mutex_unlock(&amp;host-&gt;h_mutex);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c<br/>index fd56c8872f34..9a991b52c647 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/svc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/svc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/svc.c</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'>  * Copyright (C) 1995, 1996 Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sysctl.h&gt;</div><div class='head'>diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c<br/>index 3ef739120dff..baf5ae513481 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/svclock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svclock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/svclock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/svclock.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  * Copyright (C) 1996, Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c<br/>index d210cf304e92..dbb66a3b5cd9 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/svcproc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svcproc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/svcproc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/svcproc.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  * Copyright (C) 1996, Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='head'>diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c<br/>index a570e5c8a930..2a4df9b3779a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/svcsubs.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/svcsubs.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/svcsubs.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/svcsubs.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1996, Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='head'>diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c<br/>index f22a3764461a..033ea4ac2c30 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/lockd/xdr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/lockd/xdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/lockd/xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/lockd/xdr.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * Copyright (C) 1995, 1996 Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='head'>diff --git a/fs/locks.c b/fs/locks.c<br/>index 6f99c0a6f836..b0b41a64e10b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/locks.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/locks.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/locks.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/locks.c</a></div><div class='hunk'>@@ -703,7 +703,7 @@ EXPORT_SYMBOL(posix_test_lock);</div><div class='ctx'>  * from a broken NFS client. But broken NFS clients have a lot more to</div><div class='ctx'>  * worry about than proper deadlock detection anyway... --okir</div><div class='ctx'>  */</div><div class='del'>-int posix_locks_deadlock(struct file_lock *caller_fl,</div><div class='add'>+static int posix_locks_deadlock(struct file_lock *caller_fl,</div><div class='ctx'> 				struct file_lock *block_fl)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *tmp;</div><div class='hunk'>@@ -722,11 +722,13 @@ next_task:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(posix_locks_deadlock);</div><div class='del'>-</div><div class='ctx'> /* Try to create a FLOCK lock on filp. We always insert new FLOCK locks</div><div class='ctx'>  * at the head of the list, but that's secret knowledge known only to</div><div class='ctx'>  * flock_lock_file and posix_lock_file.</div><div class='add'>+ *</div><div class='add'>+ * Note that if called with an FL_EXISTS argument, the caller may determine</div><div class='add'>+ * whether or not a lock was successfully freed by testing the return</div><div class='add'>+ * value for -ENOENT.</div><div class='ctx'>  */</div><div class='ctx'> static int flock_lock_file(struct file *filp, struct file_lock *request)</div><div class='ctx'> {</div><div class='hunk'>@@ -737,6 +739,8 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='add'>+	if (request-&gt;fl_flags &amp; FL_ACCESS)</div><div class='add'>+		goto find_conflict;</div><div class='ctx'> 	for_each_lock(inode, before) {</div><div class='ctx'> 		struct file_lock *fl = *before;</div><div class='ctx'> 		if (IS_POSIX(fl))</div><div class='hunk'>@@ -752,9 +756,13 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request-&gt;fl_type == F_UNLCK)</div><div class='add'>+	if (request-&gt;fl_type == F_UNLCK) {</div><div class='add'>+		if ((request-&gt;fl_flags &amp; FL_EXISTS) &amp;&amp; !found)</div><div class='add'>+			error = -ENOENT;</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	error = -ENOMEM;</div><div class='ctx'> 	new_fl = locks_alloc_lock();</div><div class='ctx'> 	if (new_fl == NULL)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -765,6 +773,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)</div><div class='ctx'> 	if (found)</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> </div><div class='add'>+find_conflict:</div><div class='ctx'> 	for_each_lock(inode, before) {</div><div class='ctx'> 		struct file_lock *fl = *before;</div><div class='ctx'> 		if (IS_POSIX(fl))</div><div class='hunk'>@@ -778,9 +787,12 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)</div><div class='ctx'> 			locks_insert_block(fl, request);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	if (request-&gt;fl_flags &amp; FL_ACCESS)</div><div class='add'>+		goto out;</div><div class='ctx'> 	locks_copy_lock(new_fl, request);</div><div class='ctx'> 	locks_insert_lock(&amp;inode-&gt;i_flock, new_fl);</div><div class='ctx'> 	new_fl = NULL;</div><div class='add'>+	error = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	unlock_kernel();</div><div class='hunk'>@@ -792,7 +804,8 @@ out:</div><div class='ctx'> static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request, struct file_lock *conflock)</div><div class='ctx'> {</div><div class='ctx'> 	struct file_lock *fl;</div><div class='del'>-	struct file_lock *new_fl, *new_fl2;</div><div class='add'>+	struct file_lock *new_fl = NULL;</div><div class='add'>+	struct file_lock *new_fl2 = NULL;</div><div class='ctx'> 	struct file_lock *left = NULL;</div><div class='ctx'> 	struct file_lock *right = NULL;</div><div class='ctx'> 	struct file_lock **before;</div><div class='hunk'>@@ -801,9 +814,15 @@ static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We may need two file_lock structures for this operation,</div><div class='ctx'> 	 * so we get them in advance to avoid races.</div><div class='add'>+	 *</div><div class='add'>+	 * In some cases we can be sure, that no new locks will be needed</div><div class='ctx'> 	 */</div><div class='del'>-	new_fl = locks_alloc_lock();</div><div class='del'>-	new_fl2 = locks_alloc_lock();</div><div class='add'>+	if (!(request-&gt;fl_flags &amp; FL_ACCESS) &amp;&amp;</div><div class='add'>+	    (request-&gt;fl_type != F_UNLCK ||</div><div class='add'>+	     request-&gt;fl_start != 0 || request-&gt;fl_end != OFFSET_MAX)) {</div><div class='add'>+		new_fl = locks_alloc_lock();</div><div class='add'>+		new_fl2 = locks_alloc_lock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	if (request-&gt;fl_type != F_UNLCK) {</div><div class='hunk'>@@ -832,14 +851,7 @@ static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request</div><div class='ctx'> 	if (request-&gt;fl_flags &amp; FL_ACCESS)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	error = -ENOLCK; /* "no luck" */</div><div class='del'>-	if (!(new_fl &amp;&amp; new_fl2))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	 * We've allocated the new locks in advance, so there are no</div><div class='del'>-	 * errors possible (and no blocking operations) from here on.</div><div class='del'>-	 * </div><div class='ctx'> 	 * Find the first old lock with the same owner as the new lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	</div><div class='hunk'>@@ -936,10 +948,28 @@ static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request</div><div class='ctx'> 		before = &amp;fl-&gt;fl_next;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * The above code only modifies existing locks in case of</div><div class='add'>+	 * merging or replacing.  If new lock(s) need to be inserted</div><div class='add'>+	 * all modifications are done bellow this, so it's safe yet to</div><div class='add'>+	 * bail out.</div><div class='add'>+	 */</div><div class='add'>+	error = -ENOLCK; /* "no luck" */</div><div class='add'>+	if (right &amp;&amp; left == right &amp;&amp; !new_fl2)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	error = 0;</div><div class='ctx'> 	if (!added) {</div><div class='del'>-		if (request-&gt;fl_type == F_UNLCK)</div><div class='add'>+		if (request-&gt;fl_type == F_UNLCK) {</div><div class='add'>+			if (request-&gt;fl_flags &amp; FL_EXISTS)</div><div class='add'>+				error = -ENOENT;</div><div class='ctx'> 			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!new_fl) {</div><div class='add'>+			error = -ENOLCK;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='ctx'> 		locks_copy_lock(new_fl, request);</div><div class='ctx'> 		locks_insert_lock(before, new_fl);</div><div class='ctx'> 		new_fl = NULL;</div><div class='hunk'>@@ -981,6 +1011,10 @@ static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request</div><div class='ctx'>  * Add a POSIX style lock to a file.</div><div class='ctx'>  * We merge adjacent &amp; overlapping locks whenever possible.</div><div class='ctx'>  * POSIX locks are sorted by owner task, then by starting address</div><div class='add'>+ *</div><div class='add'>+ * Note that if called with an FL_EXISTS argument, the caller may determine</div><div class='add'>+ * whether or not a lock was successfully freed by testing the return</div><div class='add'>+ * value for -ENOENT.</div><div class='ctx'>  */</div><div class='ctx'> int posix_lock_file(struct file *filp, struct file_lock *fl)</div><div class='ctx'> {</div><div class='hunk'>@@ -1879,19 +1913,18 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> void locks_remove_posix(struct file *filp, fl_owner_t owner)</div><div class='ctx'> {</div><div class='del'>-	struct file_lock lock, **before;</div><div class='add'>+	struct file_lock lock;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If there are no locks held on this file, we don't need to call</div><div class='ctx'> 	 * posix_lock_file().  Another process could be setting a lock on this</div><div class='ctx'> 	 * file at the same time, but we wouldn't remove that lock anyway.</div><div class='ctx'> 	 */</div><div class='del'>-	before = &amp;filp-&gt;f_dentry-&gt;d_inode-&gt;i_flock;</div><div class='del'>-	if (*before == NULL)</div><div class='add'>+	if (!filp-&gt;f_dentry-&gt;d_inode-&gt;i_flock)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	lock.fl_type = F_UNLCK;</div><div class='del'>-	lock.fl_flags = FL_POSIX;</div><div class='add'>+	lock.fl_flags = FL_POSIX | FL_CLOSE;</div><div class='ctx'> 	lock.fl_start = 0;</div><div class='ctx'> 	lock.fl_end = OFFSET_MAX;</div><div class='ctx'> 	lock.fl_owner = owner;</div><div class='hunk'>@@ -1900,25 +1933,11 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner)</div><div class='ctx'> 	lock.fl_ops = NULL;</div><div class='ctx'> 	lock.fl_lmops = NULL;</div><div class='ctx'> </div><div class='del'>-	if (filp-&gt;f_op &amp;&amp; filp-&gt;f_op-&gt;lock != NULL) {</div><div class='add'>+	if (filp-&gt;f_op &amp;&amp; filp-&gt;f_op-&gt;lock != NULL)</div><div class='ctx'> 		filp-&gt;f_op-&gt;lock(filp, F_SETLK, &amp;lock);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		posix_lock_file(filp, &amp;lock);</div><div class='ctx'> </div><div class='del'>-	/* Can't use posix_lock_file here; we need to remove it no matter</div><div class='del'>-	 * which pid we have.</div><div class='del'>-	 */</div><div class='del'>-	lock_kernel();</div><div class='del'>-	while (*before != NULL) {</div><div class='del'>-		struct file_lock *fl = *before;</div><div class='del'>-		if (IS_POSIX(fl) &amp;&amp; posix_same_owner(fl, &amp;lock)) {</div><div class='del'>-			locks_delete_lock(before);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		before = &amp;fl-&gt;fl_next;</div><div class='del'>-	}</div><div class='del'>-	unlock_kernel();</div><div class='del'>-out:</div><div class='ctx'> 	if (lock.fl_ops &amp;&amp; lock.fl_ops-&gt;fl_release_private)</div><div class='ctx'> 		lock.fl_ops-&gt;fl_release_private(&amp;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -2204,63 +2223,6 @@ int lock_may_write(struct inode *inode, loff_t start, unsigned long len)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(lock_may_write);</div><div class='ctx'> </div><div class='del'>-static inline void __steal_locks(struct file *file, fl_owner_t from)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='del'>-	struct file_lock *fl = inode-&gt;i_flock;</div><div class='del'>-</div><div class='del'>-	while (fl) {</div><div class='del'>-		if (fl-&gt;fl_file == file &amp;&amp; fl-&gt;fl_owner == from)</div><div class='del'>-			fl-&gt;fl_owner = current-&gt;files;</div><div class='del'>-		fl = fl-&gt;fl_next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* When getting ready for executing a binary, we make sure that current</div><div class='del'>- * has a files_struct on its own. Before dropping the old files_struct,</div><div class='del'>- * we take over ownership of all locks for all file descriptors we own.</div><div class='del'>- * Note that we may accidentally steal a lock for a file that a sibling</div><div class='del'>- * has created since the unshare_files() call.</div><div class='del'>- */</div><div class='del'>-void steal_locks(fl_owner_t from)</div><div class='del'>-{</div><div class='del'>-	struct files_struct *files = current-&gt;files;</div><div class='del'>-	int i, j;</div><div class='del'>-	struct fdtable *fdt;</div><div class='del'>-</div><div class='del'>-	if (from == files)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-	j = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We are not taking a ref to the file structures, so</div><div class='del'>-	 * we need to acquire -&gt;file_lock.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock(&amp;files-&gt;file_lock);</div><div class='del'>-	fdt = files_fdtable(files);</div><div class='del'>-	for (;;) {</div><div class='del'>-		unsigned long set;</div><div class='del'>-		i = j * __NFDBITS;</div><div class='del'>-		if (i &gt;= fdt-&gt;max_fdset || i &gt;= fdt-&gt;max_fds)</div><div class='del'>-			break;</div><div class='del'>-		set = fdt-&gt;open_fds-&gt;fds_bits[j++];</div><div class='del'>-		while (set) {</div><div class='del'>-			if (set &amp; 1) {</div><div class='del'>-				struct file *file = fdt-&gt;fd[i];</div><div class='del'>-				if (file)</div><div class='del'>-					__steal_locks(file, from);</div><div class='del'>-			}</div><div class='del'>-			i++;</div><div class='del'>-			set &gt;&gt;= 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;files-&gt;file_lock);</div><div class='del'>-	unlock_kernel();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(steal_locks);</div><div class='del'>-</div><div class='ctx'> static int __init filelock_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	filelock_cache = kmem_cache_create("file_lock_cache",</div><div class='head'>diff --git a/fs/minix/dir.c b/fs/minix/dir.c<br/>index 69224d1fe043..2b0a389d1987 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/minix/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/minix/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/minix/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/minix/dir.c</a></div><div class='hunk'>@@ -60,8 +60,7 @@ static int dir_commit_chunk(struct page *page, unsigned from, unsigned to)</div><div class='ctx'> static struct page * dir_get_page(struct inode *dir, unsigned long n)</div><div class='ctx'> {</div><div class='ctx'> 	struct address_space *mapping = dir-&gt;i_mapping;</div><div class='del'>-	struct page *page = read_cache_page(mapping, n,</div><div class='del'>-				(filler_t*)mapping-&gt;a_ops-&gt;readpage, NULL);</div><div class='add'>+	struct page *page = read_mapping_page(mapping, n, NULL);</div><div class='ctx'> 	if (!IS_ERR(page)) {</div><div class='ctx'> 		wait_on_page_locked(page);</div><div class='ctx'> 		kmap(page);</div><div class='head'>diff --git a/fs/minix/inode.c b/fs/minix/inode.c<br/>index 2dcccf1d1b7f..9ea91c5eeb7b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/minix/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/minix/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/minix/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/minix/inode.c</a></div><div class='hunk'>@@ -19,7 +19,7 @@</div><div class='ctx'> </div><div class='ctx'> static void minix_read_inode(struct inode * inode);</div><div class='ctx'> static int minix_write_inode(struct inode * inode, int wait);</div><div class='del'>-static int minix_statfs(struct super_block *sb, struct kstatfs *buf);</div><div class='add'>+static int minix_statfs(struct dentry *dentry, struct kstatfs *buf);</div><div class='ctx'> static int minix_remount (struct super_block * sb, int * flags, char * data);</div><div class='ctx'> </div><div class='ctx'> static void minix_delete_inode(struct inode *inode)</div><div class='hunk'>@@ -296,11 +296,11 @@ out_bad_sb:</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int minix_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int minix_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='del'>-	struct minix_sb_info *sbi = minix_sb(sb);</div><div class='del'>-	buf-&gt;f_type = sb-&gt;s_magic;</div><div class='del'>-	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='add'>+	struct minix_sb_info *sbi = minix_sb(dentry-&gt;d_sb);</div><div class='add'>+	buf-&gt;f_type = dentry-&gt;d_sb-&gt;s_magic;</div><div class='add'>+	buf-&gt;f_bsize = dentry-&gt;d_sb-&gt;s_blocksize;</div><div class='ctx'> 	buf-&gt;f_blocks = (sbi-&gt;s_nzones - sbi-&gt;s_firstdatazone) &lt;&lt; sbi-&gt;s_log_zone_size;</div><div class='ctx'> 	buf-&gt;f_bfree = minix_count_free_blocks(sbi);</div><div class='ctx'> 	buf-&gt;f_bavail = buf-&gt;f_bfree;</div><div class='hunk'>@@ -335,7 +335,7 @@ static sector_t minix_bmap(struct address_space *mapping, sector_t block)</div><div class='ctx'> {</div><div class='ctx'> 	return generic_block_bmap(mapping,block,minix_get_block);</div><div class='ctx'> }</div><div class='del'>-static struct address_space_operations minix_aops = {</div><div class='add'>+static const struct address_space_operations minix_aops = {</div><div class='ctx'> 	.readpage = minix_readpage,</div><div class='ctx'> 	.writepage = minix_writepage,</div><div class='ctx'> 	.sync_page = block_sync_page,</div><div class='hunk'>@@ -559,10 +559,11 @@ void minix_truncate(struct inode * inode)</div><div class='ctx'> 		V2_minix_truncate(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *minix_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int minix_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, minix_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, minix_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type minix_fs_type = {</div><div class='head'>diff --git a/fs/mpage.c b/fs/mpage.c<br/>index 9bf2eb30e6f4..1e4598247d0b 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/mpage.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/mpage.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/mpage.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/mpage.c</a></div><div class='hunk'>@@ -707,9 +707,9 @@ mpage_writepages(struct address_space *mapping,</div><div class='ctx'> 	struct pagevec pvec;</div><div class='ctx'> 	int nr_pages;</div><div class='ctx'> 	pgoff_t index;</div><div class='del'>-	pgoff_t end = -1;		/* Inclusive */</div><div class='add'>+	pgoff_t end;		/* Inclusive */</div><div class='ctx'> 	int scanned = 0;</div><div class='del'>-	int is_range = 0;</div><div class='add'>+	int range_whole = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (wbc-&gt;nonblocking &amp;&amp; bdi_write_congested(bdi)) {</div><div class='ctx'> 		wbc-&gt;encountered_congestion = 1;</div><div class='hunk'>@@ -721,16 +721,14 @@ mpage_writepages(struct address_space *mapping,</div><div class='ctx'> 		writepage = mapping-&gt;a_ops-&gt;writepage;</div><div class='ctx'> </div><div class='ctx'> 	pagevec_init(&amp;pvec, 0);</div><div class='del'>-	if (wbc-&gt;sync_mode == WB_SYNC_NONE) {</div><div class='add'>+	if (wbc-&gt;range_cyclic) {</div><div class='ctx'> 		index = mapping-&gt;writeback_index; /* Start from prev offset */</div><div class='add'>+		end = -1;</div><div class='ctx'> 	} else {</div><div class='del'>-		index = 0;			  /* whole-file sweep */</div><div class='del'>-		scanned = 1;</div><div class='del'>-	}</div><div class='del'>-	if (wbc-&gt;start || wbc-&gt;end) {</div><div class='del'>-		index = wbc-&gt;start &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-		end = wbc-&gt;end &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-		is_range = 1;</div><div class='add'>+		index = wbc-&gt;range_start &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+		end = wbc-&gt;range_end &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+		if (wbc-&gt;range_start == 0 &amp;&amp; wbc-&gt;range_end == LLONG_MAX)</div><div class='add'>+			range_whole = 1;</div><div class='ctx'> 		scanned = 1;</div><div class='ctx'> 	}</div><div class='ctx'> retry:</div><div class='hunk'>@@ -759,7 +757,7 @@ retry:</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (unlikely(is_range) &amp;&amp; page-&gt;index &gt; end) {</div><div class='add'>+			if (!wbc-&gt;range_cyclic &amp;&amp; page-&gt;index &gt; end) {</div><div class='ctx'> 				done = 1;</div><div class='ctx'> 				unlock_page(page);</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -810,7 +808,7 @@ retry:</div><div class='ctx'> 		index = 0;</div><div class='ctx'> 		goto retry;</div><div class='ctx'> 	}</div><div class='del'>-	if (!is_range)</div><div class='add'>+	if (wbc-&gt;range_cyclic || (range_whole &amp;&amp; wbc-&gt;nr_to_write &gt; 0))</div><div class='ctx'> 		mapping-&gt;writeback_index = index;</div><div class='ctx'> 	if (bio)</div><div class='ctx'> 		mpage_bio_submit(WRITE, bio);</div><div class='head'>diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c<br/>index 5b76ccd19e3f..9e44158a7540 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/msdos/namei.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/msdos/namei.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/msdos/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/msdos/namei.c</a></div><div class='hunk'>@@ -661,11 +661,12 @@ static int msdos_fill_super(struct super_block *sb, void *data, int silent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *msdos_get_sb(struct file_system_type *fs_type,</div><div class='del'>-					int flags, const char *dev_name,</div><div class='del'>-					void *data)</div><div class='add'>+static int msdos_get_sb(struct file_system_type *fs_type,</div><div class='add'>+			int flags, const char *dev_name,</div><div class='add'>+			void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_bdev(fs_type, flags, dev_name, data, msdos_fill_super);</div><div class='add'>+	return get_sb_bdev(fs_type, flags, dev_name, data, msdos_fill_super,</div><div class='add'>+			   mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type msdos_fs_type = {</div><div class='head'>diff --git a/fs/namei.c b/fs/namei.c<br/>index 96723ae83c89..e01070d7bf58 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/namei.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/namei.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/namei.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/namei.c</a></div><div class='hunk'>@@ -1080,8 +1080,8 @@ static int fastcall do_path_lookup(int dfd, const char *name,</div><div class='ctx'> 	nd-&gt;flags = flags;</div><div class='ctx'> 	nd-&gt;depth = 0;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;current-&gt;fs-&gt;lock);</div><div class='ctx'> 	if (*name=='/') {</div><div class='add'>+		read_lock(&amp;current-&gt;fs-&gt;lock);</div><div class='ctx'> 		if (current-&gt;fs-&gt;altroot &amp;&amp; !(nd-&gt;flags &amp; LOOKUP_NOALT)) {</div><div class='ctx'> 			nd-&gt;mnt = mntget(current-&gt;fs-&gt;altrootmnt);</div><div class='ctx'> 			nd-&gt;dentry = dget(current-&gt;fs-&gt;altroot);</div><div class='hunk'>@@ -1092,48 +1092,49 @@ static int fastcall do_path_lookup(int dfd, const char *name,</div><div class='ctx'> 		}</div><div class='ctx'> 		nd-&gt;mnt = mntget(current-&gt;fs-&gt;rootmnt);</div><div class='ctx'> 		nd-&gt;dentry = dget(current-&gt;fs-&gt;root);</div><div class='add'>+		read_unlock(&amp;current-&gt;fs-&gt;lock);</div><div class='ctx'> 	} else if (dfd == AT_FDCWD) {</div><div class='add'>+		read_lock(&amp;current-&gt;fs-&gt;lock);</div><div class='ctx'> 		nd-&gt;mnt = mntget(current-&gt;fs-&gt;pwdmnt);</div><div class='ctx'> 		nd-&gt;dentry = dget(current-&gt;fs-&gt;pwd);</div><div class='add'>+		read_unlock(&amp;current-&gt;fs-&gt;lock);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct dentry *dentry;</div><div class='ctx'> </div><div class='ctx'> 		file = fget_light(dfd, &amp;fput_needed);</div><div class='ctx'> 		retval = -EBADF;</div><div class='ctx'> 		if (!file)</div><div class='del'>-			goto unlock_fail;</div><div class='add'>+			goto out_fail;</div><div class='ctx'> </div><div class='ctx'> 		dentry = file-&gt;f_dentry;</div><div class='ctx'> </div><div class='ctx'> 		retval = -ENOTDIR;</div><div class='ctx'> 		if (!S_ISDIR(dentry-&gt;d_inode-&gt;i_mode))</div><div class='del'>-			goto fput_unlock_fail;</div><div class='add'>+			goto fput_fail;</div><div class='ctx'> </div><div class='ctx'> 		retval = file_permission(file, MAY_EXEC);</div><div class='ctx'> 		if (retval)</div><div class='del'>-			goto fput_unlock_fail;</div><div class='add'>+			goto fput_fail;</div><div class='ctx'> </div><div class='ctx'> 		nd-&gt;mnt = mntget(file-&gt;f_vfsmnt);</div><div class='ctx'> 		nd-&gt;dentry = dget(dentry);</div><div class='ctx'> </div><div class='ctx'> 		fput_light(file, fput_needed);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;current-&gt;fs-&gt;lock);</div><div class='ctx'> 	current-&gt;total_link_count = 0;</div><div class='ctx'> 	retval = link_path_walk(name, nd);</div><div class='ctx'> out:</div><div class='ctx'> 	if (likely(retval == 0)) {</div><div class='ctx'> 		if (unlikely(current-&gt;audit_context &amp;&amp; nd &amp;&amp; nd-&gt;dentry &amp;&amp;</div><div class='ctx'> 				nd-&gt;dentry-&gt;d_inode))</div><div class='del'>-		audit_inode(name, nd-&gt;dentry-&gt;d_inode, flags);</div><div class='add'>+		audit_inode(name, nd-&gt;dentry-&gt;d_inode);</div><div class='ctx'> 	}</div><div class='add'>+out_fail:</div><div class='ctx'> 	return retval;</div><div class='ctx'> </div><div class='del'>-fput_unlock_fail:</div><div class='add'>+fput_fail:</div><div class='ctx'> 	fput_light(file, fput_needed);</div><div class='del'>-unlock_fail:</div><div class='del'>-	read_unlock(&amp;current-&gt;fs-&gt;lock);</div><div class='del'>-	return retval;</div><div class='add'>+	goto out_fail;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int fastcall path_lookup(const char *name, unsigned int flags,</div><div class='hunk'>@@ -1422,7 +1423,7 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)</div><div class='ctx'> 	struct dentry *p;</div><div class='ctx'> </div><div class='ctx'> 	if (p1 == p2) {</div><div class='del'>-		mutex_lock(&amp;p1-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+		mutex_lock_nested(&amp;p1-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1430,22 +1431,22 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)</div><div class='ctx'> </div><div class='ctx'> 	for (p = p1; p-&gt;d_parent != p; p = p-&gt;d_parent) {</div><div class='ctx'> 		if (p-&gt;d_parent == p2) {</div><div class='del'>-			mutex_lock(&amp;p2-&gt;d_inode-&gt;i_mutex);</div><div class='del'>-			mutex_lock(&amp;p1-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+			mutex_lock_nested(&amp;p2-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='add'>+			mutex_lock_nested(&amp;p1-&gt;d_inode-&gt;i_mutex, I_MUTEX_CHILD);</div><div class='ctx'> 			return p;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (p = p2; p-&gt;d_parent != p; p = p-&gt;d_parent) {</div><div class='ctx'> 		if (p-&gt;d_parent == p1) {</div><div class='del'>-			mutex_lock(&amp;p1-&gt;d_inode-&gt;i_mutex);</div><div class='del'>-			mutex_lock(&amp;p2-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+			mutex_lock_nested(&amp;p1-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='add'>+			mutex_lock_nested(&amp;p2-&gt;d_inode-&gt;i_mutex, I_MUTEX_CHILD);</div><div class='ctx'> 			return p;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;p1-&gt;d_inode-&gt;i_mutex);</div><div class='del'>-	mutex_lock(&amp;p2-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;p1-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='add'>+	mutex_lock_nested(&amp;p2-&gt;d_inode-&gt;i_mutex, I_MUTEX_CHILD);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1711,8 +1712,14 @@ do_link:</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto exit_dput;</div><div class='ctx'> 	error = __do_follow_link(&amp;path, nd);</div><div class='del'>-	if (error)</div><div class='add'>+	if (error) {</div><div class='add'>+		/* Does someone understand code flow here? Or it is only</div><div class='add'>+		 * me so stupid? Anathema to whoever designed this non-sense</div><div class='add'>+		 * with "intent.open".</div><div class='add'>+		 */</div><div class='add'>+		release_open_intent(nd);</div><div class='ctx'> 		return error;</div><div class='add'>+	}</div><div class='ctx'> 	nd-&gt;flags &amp;= ~LOOKUP_PARENT;</div><div class='ctx'> 	if (nd-&gt;last_type == LAST_BIND)</div><div class='ctx'> 		goto ok;</div><div class='hunk'>@@ -1750,7 +1757,7 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *dentry = ERR_PTR(-EEXIST);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;nd-&gt;dentry-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;nd-&gt;dentry-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Yucky last component or no last component at all?</div><div class='ctx'> 	 * (foo/., foo/.., /////)</div><div class='hunk'>@@ -2007,7 +2014,7 @@ static long do_rmdir(int dfd, const char __user *pathname)</div><div class='ctx'> 			error = -EBUSY;</div><div class='ctx'> 			goto exit1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_lock(&amp;nd.dentry-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;nd.dentry-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='ctx'> 	dentry = lookup_hash(&amp;nd);</div><div class='ctx'> 	error = PTR_ERR(dentry);</div><div class='ctx'> 	if (!IS_ERR(dentry)) {</div><div class='hunk'>@@ -2081,7 +2088,7 @@ static long do_unlinkat(int dfd, const char __user *pathname)</div><div class='ctx'> 	error = -EISDIR;</div><div class='ctx'> 	if (nd.last_type != LAST_NORM)</div><div class='ctx'> 		goto exit1;</div><div class='del'>-	mutex_lock(&amp;nd.dentry-&gt;d_inode-&gt;i_mutex);</div><div class='add'>+	mutex_lock_nested(&amp;nd.dentry-&gt;d_inode-&gt;i_mutex, I_MUTEX_PARENT);</div><div class='ctx'> 	dentry = lookup_hash(&amp;nd);</div><div class='ctx'> 	error = PTR_ERR(dentry);</div><div class='ctx'> 	if (!IS_ERR(dentry)) {</div><div class='hunk'>@@ -2242,14 +2249,16 @@ asmlinkage long sys_linkat(int olddfd, const char __user *oldname,</div><div class='ctx'> 	int error;</div><div class='ctx'> 	char * to;</div><div class='ctx'> </div><div class='del'>-	if (flags != 0)</div><div class='add'>+	if ((flags &amp; ~AT_SYMLINK_FOLLOW) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	to = getname(newname);</div><div class='ctx'> 	if (IS_ERR(to))</div><div class='ctx'> 		return PTR_ERR(to);</div><div class='ctx'> </div><div class='del'>-	error = __user_walk_fd(olddfd, oldname, 0, &amp;old_nd);</div><div class='add'>+	error = __user_walk_fd(olddfd, oldname,</div><div class='add'>+			       flags &amp; AT_SYMLINK_FOLLOW ? LOOKUP_FOLLOW : 0,</div><div class='add'>+			       &amp;old_nd);</div><div class='ctx'> 	if (error)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	error = do_path_lookup(newdfd, to, LOOKUP_PARENT, &amp;nd);</div><div class='hunk'>@@ -2576,8 +2585,7 @@ static char *page_getlink(struct dentry * dentry, struct page **ppage)</div><div class='ctx'> {</div><div class='ctx'> 	struct page * page;</div><div class='ctx'> 	struct address_space *mapping = dentry-&gt;d_inode-&gt;i_mapping;</div><div class='del'>-	page = read_cache_page(mapping, 0, (filler_t *)mapping-&gt;a_ops-&gt;readpage,</div><div class='del'>-				NULL);</div><div class='add'>+	page = read_mapping_page(mapping, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(page))</div><div class='ctx'> 		goto sync_fail;</div><div class='ctx'> 	wait_on_page_locked(page);</div><div class='head'>diff --git a/fs/namespace.c b/fs/namespace.c<br/>index bf478addb852..fa7ed6a9fc2d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/namespace.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/namespace.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/namespace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/namespace.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  * Heavily rewritten.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/syscalls.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -86,6 +85,15 @@ struct vfsmount *alloc_vfsmnt(const char *name)</div><div class='ctx'> 	return mnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int simple_set_mnt(struct vfsmount *mnt, struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	mnt-&gt;mnt_sb = sb;</div><div class='add'>+	mnt-&gt;mnt_root = dget(sb-&gt;s_root);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(simple_set_mnt);</div><div class='add'>+</div><div class='ctx'> void free_vfsmnt(struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(mnt-&gt;mnt_devname);</div><div class='hunk'>@@ -517,10 +525,8 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill)</div><div class='ctx'> {</div><div class='ctx'> 	struct vfsmount *p;</div><div class='ctx'> </div><div class='del'>-	for (p = mnt; p; p = next_mnt(p, mnt)) {</div><div class='del'>-		list_del(&amp;p-&gt;mnt_hash);</div><div class='del'>-		list_add(&amp;p-&gt;mnt_hash, kill);</div><div class='del'>-	}</div><div class='add'>+	for (p = mnt; p; p = next_mnt(p, mnt))</div><div class='add'>+		list_move(&amp;p-&gt;mnt_hash, kill);</div><div class='ctx'> </div><div class='ctx'> 	if (propagate)</div><div class='ctx'> 		propagate_umount(kill);</div><div class='hunk'>@@ -576,8 +582,8 @@ static int do_umount(struct vfsmount *mnt, int flags)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='del'>-	if ((flags &amp; MNT_FORCE) &amp;&amp; sb-&gt;s_op-&gt;umount_begin)</div><div class='del'>-		sb-&gt;s_op-&gt;umount_begin(sb);</div><div class='add'>+	if (sb-&gt;s_op-&gt;umount_begin)</div><div class='add'>+		sb-&gt;s_op-&gt;umount_begin(mnt, flags);</div><div class='ctx'> 	unlock_kernel();</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1163,13 +1169,46 @@ static void expire_mount(struct vfsmount *mnt, struct list_head *mounts,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * go through the vfsmounts we've just consigned to the graveyard to</div><div class='add'>+ * - check that they're still dead</div><div class='add'>+ * - delete the vfsmount from the appropriate namespace under lock</div><div class='add'>+ * - dispose of the corpse</div><div class='add'>+ */</div><div class='add'>+static void expire_mount_list(struct list_head *graveyard, struct list_head *mounts)</div><div class='add'>+{</div><div class='add'>+	struct namespace *namespace;</div><div class='add'>+	struct vfsmount *mnt;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(graveyard)) {</div><div class='add'>+		LIST_HEAD(umounts);</div><div class='add'>+		mnt = list_entry(graveyard-&gt;next, struct vfsmount, mnt_expire);</div><div class='add'>+		list_del_init(&amp;mnt-&gt;mnt_expire);</div><div class='add'>+</div><div class='add'>+		/* don't do anything if the namespace is dead - all the</div><div class='add'>+		 * vfsmounts from it are going away anyway */</div><div class='add'>+		namespace = mnt-&gt;mnt_namespace;</div><div class='add'>+		if (!namespace || !namespace-&gt;root)</div><div class='add'>+			continue;</div><div class='add'>+		get_namespace(namespace);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;vfsmount_lock);</div><div class='add'>+		down_write(&amp;namespace_sem);</div><div class='add'>+		expire_mount(mnt, mounts, &amp;umounts);</div><div class='add'>+		up_write(&amp;namespace_sem);</div><div class='add'>+		release_mounts(&amp;umounts);</div><div class='add'>+		mntput(mnt);</div><div class='add'>+		put_namespace(namespace);</div><div class='add'>+		spin_lock(&amp;vfsmount_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * process a list of expirable mountpoints with the intent of discarding any</div><div class='ctx'>  * mountpoints that aren't in use and haven't been touched since last we came</div><div class='ctx'>  * here</div><div class='ctx'>  */</div><div class='ctx'> void mark_mounts_for_expiry(struct list_head *mounts)</div><div class='ctx'> {</div><div class='del'>-	struct namespace *namespace;</div><div class='ctx'> 	struct vfsmount *mnt, *next;</div><div class='ctx'> 	LIST_HEAD(graveyard);</div><div class='ctx'> </div><div class='hunk'>@@ -1193,38 +1232,79 @@ void mark_mounts_for_expiry(struct list_head *mounts)</div><div class='ctx'> 		list_move(&amp;mnt-&gt;mnt_expire, &amp;graveyard);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * go through the vfsmounts we've just consigned to the graveyard to</div><div class='del'>-	 * - check that they're still dead</div><div class='del'>-	 * - delete the vfsmount from the appropriate namespace under lock</div><div class='del'>-	 * - dispose of the corpse</div><div class='del'>-	 */</div><div class='del'>-	while (!list_empty(&amp;graveyard)) {</div><div class='del'>-		LIST_HEAD(umounts);</div><div class='del'>-		mnt = list_entry(graveyard.next, struct vfsmount, mnt_expire);</div><div class='del'>-		list_del_init(&amp;mnt-&gt;mnt_expire);</div><div class='add'>+	expire_mount_list(&amp;graveyard, mounts);</div><div class='ctx'> </div><div class='del'>-		/* don't do anything if the namespace is dead - all the</div><div class='del'>-		 * vfsmounts from it are going away anyway */</div><div class='del'>-		namespace = mnt-&gt;mnt_namespace;</div><div class='del'>-		if (!namespace || !namespace-&gt;root)</div><div class='add'>+	spin_unlock(&amp;vfsmount_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(mark_mounts_for_expiry);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Ripoff of 'select_parent()'</div><div class='add'>+ *</div><div class='add'>+ * search the list of submounts for a given mountpoint, and move any</div><div class='add'>+ * shrinkable submounts to the 'graveyard' list.</div><div class='add'>+ */</div><div class='add'>+static int select_submounts(struct vfsmount *parent, struct list_head *graveyard)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *this_parent = parent;</div><div class='add'>+	struct list_head *next;</div><div class='add'>+	int found = 0;</div><div class='add'>+</div><div class='add'>+repeat:</div><div class='add'>+	next = this_parent-&gt;mnt_mounts.next;</div><div class='add'>+resume:</div><div class='add'>+	while (next != &amp;this_parent-&gt;mnt_mounts) {</div><div class='add'>+		struct list_head *tmp = next;</div><div class='add'>+		struct vfsmount *mnt = list_entry(tmp, struct vfsmount, mnt_child);</div><div class='add'>+</div><div class='add'>+		next = tmp-&gt;next;</div><div class='add'>+		if (!(mnt-&gt;mnt_flags &amp; MNT_SHRINKABLE))</div><div class='ctx'> 			continue;</div><div class='del'>-		get_namespace(namespace);</div><div class='add'>+		/*</div><div class='add'>+		 * Descend a level if the d_mounts list is non-empty.</div><div class='add'>+		 */</div><div class='add'>+		if (!list_empty(&amp;mnt-&gt;mnt_mounts)) {</div><div class='add'>+			this_parent = mnt;</div><div class='add'>+			goto repeat;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;vfsmount_lock);</div><div class='del'>-		down_write(&amp;namespace_sem);</div><div class='del'>-		expire_mount(mnt, mounts, &amp;umounts);</div><div class='del'>-		up_write(&amp;namespace_sem);</div><div class='del'>-		release_mounts(&amp;umounts);</div><div class='del'>-		mntput(mnt);</div><div class='del'>-		put_namespace(namespace);</div><div class='del'>-		spin_lock(&amp;vfsmount_lock);</div><div class='add'>+		if (!propagate_mount_busy(mnt, 1)) {</div><div class='add'>+			mntget(mnt);</div><div class='add'>+			list_move_tail(&amp;mnt-&gt;mnt_expire, graveyard);</div><div class='add'>+			found++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * All done at this level ... ascend and resume the search</div><div class='add'>+	 */</div><div class='add'>+	if (this_parent != parent) {</div><div class='add'>+		next = this_parent-&gt;mnt_child.next;</div><div class='add'>+		this_parent = this_parent-&gt;mnt_parent;</div><div class='add'>+		goto resume;</div><div class='add'>+	}</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * process a list of expirable mountpoints with the intent of discarding any</div><div class='add'>+ * submounts of a specific parent mountpoint</div><div class='add'>+ */</div><div class='add'>+void shrink_submounts(struct vfsmount *mountpoint, struct list_head *mounts)</div><div class='add'>+{</div><div class='add'>+	LIST_HEAD(graveyard);</div><div class='add'>+	int found;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;vfsmount_lock);</div><div class='add'>+</div><div class='add'>+	/* extract submounts of 'mountpoint' from the expiration list */</div><div class='add'>+	while ((found = select_submounts(mountpoint, &amp;graveyard)) != 0)</div><div class='add'>+		expire_mount_list(&amp;graveyard, mounts);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;vfsmount_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL_GPL(mark_mounts_for_expiry);</div><div class='add'>+EXPORT_SYMBOL_GPL(shrink_submounts);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Some copy_from_user() implementations do not return the exact number of</div><div class='head'>diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c<br/>index f0860c602d8b..b4ee89250e95 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/dir.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c<br/>index a1f3e972c6ef..1ddf77b0b825 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/inode.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='hunk'>@@ -39,7 +38,7 @@</div><div class='ctx'> </div><div class='ctx'> static void ncp_delete_inode(struct inode *);</div><div class='ctx'> static void ncp_put_super(struct super_block *);</div><div class='del'>-static int  ncp_statfs(struct super_block *, struct kstatfs *);</div><div class='add'>+static int  ncp_statfs(struct dentry *, struct kstatfs *);</div><div class='ctx'> </div><div class='ctx'> static kmem_cache_t * ncp_inode_cachep;</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +104,7 @@ static struct super_operations ncp_sops =</div><div class='ctx'> </div><div class='ctx'> extern struct dentry_operations ncp_root_dentry_operations;</div><div class='ctx'> #if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)</div><div class='del'>-extern struct address_space_operations ncp_symlink_aops;</div><div class='add'>+extern const struct address_space_operations ncp_symlink_aops;</div><div class='ctx'> extern int ncp_symlink(struct inode*, struct dentry*, const char*);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -724,13 +723,14 @@ static void ncp_put_super(struct super_block *sb)</div><div class='ctx'> 	kfree(server);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ncp_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='add'>+static int ncp_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry* d;</div><div class='ctx'> 	struct inode* i;</div><div class='ctx'> 	struct ncp_inode_info* ni;</div><div class='ctx'> 	struct ncp_server* s;</div><div class='ctx'> 	struct ncp_volume_info vi;</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	__u8 dh;</div><div class='ctx'> 	</div><div class='hunk'>@@ -957,10 +957,10 @@ out:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct super_block *ncp_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *data)</div><div class='add'>+static int ncp_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *data, struct vfsmount *mnt)</div><div class='ctx'> {</div><div class='del'>-	return get_sb_nodev(fs_type, flags, data, ncp_fill_super);</div><div class='add'>+	return get_sb_nodev(fs_type, flags, data, ncp_fill_super, mnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct file_system_type ncp_fs_type = {</div><div class='head'>diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c<br/>index eb3813ad136f..42039fe0653c 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/ioctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ioctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/ioctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/ioctl.c</a></div><div class='hunk'>@@ -7,7 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='head'>diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c<br/>index 52d60c3d8996..e7d5a3097fe6 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/mmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/mmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/mmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/mmap.c</a></div><div class='hunk'>@@ -93,7 +93,7 @@ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (type)</div><div class='ctx'> 		*type = VM_FAULT_MAJOR;</div><div class='del'>-	inc_page_state(pgmajfault);</div><div class='add'>+	count_vm_event(PGMAJFAULT);</div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ncpfs/ncplib_kernel.c b/fs/ncpfs/ncplib_kernel.c<br/>index d9ebf6439f59..551e0bac7aac 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/ncplib_kernel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ncplib_kernel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/ncplib_kernel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/ncplib_kernel.c</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ncplib_kernel.h"</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h<br/>index 799e5c2bec55..2441d1ab57dc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/ncplib_kernel.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ncplib_kernel.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/ncplib_kernel.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/ncplib_kernel.h</a></div><div class='hunk'>@@ -12,7 +12,6 @@</div><div class='ctx'> #ifndef _NCPLIB_H</div><div class='ctx'> #define _NCPLIB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/fs/ncpfs/ncpsign_kernel.c b/fs/ncpfs/ncpsign_kernel.c<br/>index a6ec90cd8894..749a18d33599 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/ncpsign_kernel.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/ncpsign_kernel.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/ncpsign_kernel.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/ncpsign_kernel.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NCPFS_PACKET_SIGNING</div><div class='ctx'> </div><div class='head'>diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c<br/>index 8783eb7ec641..11c2b252ebed 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/sock.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/sock.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/sock.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/sock.c</a></div><div class='hunk'>@@ -8,7 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='head'>diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c<br/>index e935f1b34bc2..ca92c2406635 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/ncpfs/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/ncpfs/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/ncpfs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/ncpfs/symlink.c</a></div><div class='hunk'>@@ -20,7 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +98,7 @@ fail:</div><div class='ctx'> /*</div><div class='ctx'>  * symlinks can't do much...</div><div class='ctx'>  */</div><div class='del'>-struct address_space_operations ncp_symlink_aops = {</div><div class='add'>+const struct address_space_operations ncp_symlink_aops = {</div><div class='ctx'> 	.readpage	= ncp_symlink_readpage,</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='head'>diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile<br/>index ec61fd56a1a9..0b572a0c1967 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/Makefile?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/Makefile</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/Makefile?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/Makefile</a></div><div class='hunk'>@@ -4,14 +4,16 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NFS_FS) += nfs.o</div><div class='ctx'> </div><div class='del'>-nfs-y 			:= dir.o file.o inode.o nfs2xdr.o pagelist.o \</div><div class='del'>-			   proc.o read.o symlink.o unlink.o write.o</div><div class='add'>+nfs-y 			:= dir.o file.o inode.o super.o nfs2xdr.o pagelist.o \</div><div class='add'>+			   proc.o read.o symlink.o unlink.o write.o \</div><div class='add'>+			   namespace.o</div><div class='ctx'> nfs-$(CONFIG_ROOT_NFS)	+= nfsroot.o mount_clnt.o      </div><div class='ctx'> nfs-$(CONFIG_NFS_V3)	+= nfs3proc.o nfs3xdr.o</div><div class='ctx'> nfs-$(CONFIG_NFS_V3_ACL)	+= nfs3acl.o</div><div class='ctx'> nfs-$(CONFIG_NFS_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \</div><div class='ctx'> 			   delegation.o idmap.o \</div><div class='del'>-			   callback.o callback_xdr.o callback_proc.o</div><div class='add'>+			   callback.o callback_xdr.o callback_proc.o \</div><div class='add'>+			   nfs4namespace.o</div><div class='ctx'> nfs-$(CONFIG_NFS_DIRECTIO) += direct.o</div><div class='ctx'> nfs-$(CONFIG_SYSCTL) += sysctl.o</div><div class='ctx'> nfs-objs		:= $(nfs-y)</div><div class='head'>diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c<br/>index 90c95adc8c1b..fe0a6b8ac149 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/callback.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/callback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/callback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/callback.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * NFSv4 callback handling</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -182,8 +181,6 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp)</div><div class='ctx'> /*</div><div class='ctx'>  * Define NFS4 callback program</div><div class='ctx'>  */</div><div class='del'>-extern struct svc_version nfs4_callback_version1;</div><div class='del'>-</div><div class='ctx'> static struct svc_version *nfs4_callback_version[] = {</div><div class='ctx'> 	[1] = &amp;nfs4_callback_version1,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c<br/>index 462cfceb50c5..7719483ecdfc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/callback_proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/callback_proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/callback_proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/callback_proc.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * NFSv4 callback procedures</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/nfs4.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> #include "nfs4_fs.h"</div><div class='head'>diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c<br/>index 05c38cf40b69..29f932192054 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/callback_xdr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/callback_xdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/callback_xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/callback_xdr.c</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * NFSv4 callback encode/decode procedures</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/svc.h&gt;</div><div class='ctx'> #include &lt;linux/nfs4.h&gt;</div><div class='hunk'>@@ -202,7 +201,7 @@ static unsigned decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xd</div><div class='ctx'> 	status = decode_fh(xdr, &amp;args-&gt;fh);</div><div class='ctx'> out:</div><div class='ctx'> 	dprintk("%s: exit with status = %d\n", __FUNCTION__, status);</div><div class='del'>-	return 0;</div><div class='add'>+	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)</div><div class='head'>diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c<br/>index d3be923d4e43..9540a316c05e 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/delegation.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/delegation.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/delegation.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/delegation.c</a></div><div class='hunk'>@@ -6,7 +6,6 @@</div><div class='ctx'>  * NFS file delegation management</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c<br/>index cae74dd4c7f5..e7ffb4deb3e5 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/dir.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/dir.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/dir.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/dir.c</a></div><div class='hunk'>@@ -528,7 +528,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)</div><div class='ctx'> </div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> </div><div class='del'>-	res = nfs_revalidate_inode(NFS_SERVER(inode), inode);</div><div class='add'>+	res = nfs_revalidate_mapping(inode, filp-&gt;f_mapping);</div><div class='ctx'> 	if (res &lt; 0) {</div><div class='ctx'> 		unlock_kernel();</div><div class='ctx'> 		return res;</div><div class='hunk'>@@ -690,7 +690,9 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)</div><div class='ctx'> 			goto out_force;</div><div class='ctx'> 		/* This is an open(2) */</div><div class='ctx'> 		if (nfs_lookup_check_intent(nd, LOOKUP_OPEN) != 0 &amp;&amp;</div><div class='del'>-				!(server-&gt;flags &amp; NFS_MOUNT_NOCTO))</div><div class='add'>+				!(server-&gt;flags &amp; NFS_MOUNT_NOCTO) &amp;&amp;</div><div class='add'>+				(S_ISREG(inode-&gt;i_mode) ||</div><div class='add'>+				 S_ISDIR(inode-&gt;i_mode)))</div><div class='ctx'> 			goto out_force;</div><div class='ctx'> 	}</div><div class='ctx'> 	return nfs_revalidate_inode(server, inode);</div><div class='hunk'>@@ -868,6 +870,17 @@ int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)</div><div class='ctx'> 	return (nd-&gt;intent.open.flags &amp; O_EXCL) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int nfs_reval_fsid(struct inode *dir,</div><div class='add'>+		struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SERVER(dir);</div><div class='add'>+</div><div class='add'>+	if (!nfs_fsid_equal(&amp;server-&gt;fsid, &amp;fattr-&gt;fsid))</div><div class='add'>+		/* Revalidate fsid on root dir */</div><div class='add'>+		return __nfs_revalidate_inode(server, dir-&gt;i_sb-&gt;s_root-&gt;d_inode);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)</div><div class='ctx'> {</div><div class='ctx'> 	struct dentry *res;</div><div class='hunk'>@@ -900,6 +913,11 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru</div><div class='ctx'> 		res = ERR_PTR(error);</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='add'>+	error = nfs_reval_fsid(dir, &amp;fhandle, &amp;fattr);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		res = ERR_PTR(error);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> 	inode = nfs_fhget(dentry-&gt;d_sb, &amp;fhandle, &amp;fattr);</div><div class='ctx'> 	res = (struct dentry *)inode;</div><div class='ctx'> 	if (IS_ERR(res))</div><div class='head'>diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c<br/>index 3c72b0c07283..fecd3b095deb 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/direct.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/direct.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/direct.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/direct.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -68,25 +67,19 @@ struct nfs_direct_req {</div><div class='ctx'> 	struct kref		kref;		/* release manager */</div><div class='ctx'> </div><div class='ctx'> 	/* I/O parameters */</div><div class='del'>-	struct list_head	list,		/* nfs_read/write_data structs */</div><div class='del'>-				rewrite_list;	/* saved nfs_write_data structs */</div><div class='ctx'> 	struct nfs_open_context	*ctx;		/* file open context info */</div><div class='ctx'> 	struct kiocb *		iocb;		/* controlling i/o request */</div><div class='ctx'> 	struct inode *		inode;		/* target file of i/o */</div><div class='del'>-	unsigned long		user_addr;	/* location of user's buffer */</div><div class='del'>-	size_t			user_count;	/* total bytes to move */</div><div class='del'>-	loff_t			pos;		/* starting offset in file */</div><div class='del'>-	struct page **		pages;		/* pages in our buffer */</div><div class='del'>-	unsigned int		npages;		/* count of pages */</div><div class='ctx'> </div><div class='ctx'> 	/* completion state */</div><div class='add'>+	atomic_t		io_count;	/* i/os we're waiting for */</div><div class='ctx'> 	spinlock_t		lock;		/* protect completion state */</div><div class='del'>-	int			outstanding;	/* i/os we're waiting for */</div><div class='ctx'> 	ssize_t			count,		/* bytes actually processed */</div><div class='ctx'> 				error;		/* any reported error */</div><div class='ctx'> 	struct completion	completion;	/* wait for i/o completion */</div><div class='ctx'> </div><div class='ctx'> 	/* commit state */</div><div class='add'>+	struct list_head	rewrite_list;	/* saved nfs_write_data structs */</div><div class='ctx'> 	struct nfs_write_data *	commit_data;	/* special write_data for commits */</div><div class='ctx'> 	int			flags;</div><div class='ctx'> #define NFS_ODIRECT_DO_COMMIT		(1)	/* an unstable reply was received */</div><div class='hunk'>@@ -94,8 +87,37 @@ struct nfs_direct_req {</div><div class='ctx'> 	struct nfs_writeverf	verf;		/* unstable write verifier */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync);</div><div class='ctx'> static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode *inode);</div><div class='add'>+static const struct rpc_call_ops nfs_write_direct_ops;</div><div class='add'>+</div><div class='add'>+static inline void get_dreq(struct nfs_direct_req *dreq)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;dreq-&gt;io_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int put_dreq(struct nfs_direct_req *dreq)</div><div class='add'>+{</div><div class='add'>+	return atomic_dec_and_test(&amp;dreq-&gt;io_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * "size" is never larger than rsize or wsize.</div><div class='add'>+ */</div><div class='add'>+static inline int nfs_direct_count_pages(unsigned long user_addr, size_t size)</div><div class='add'>+{</div><div class='add'>+	int page_count;</div><div class='add'>+</div><div class='add'>+	page_count = (user_addr + size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	page_count -= user_addr &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	BUG_ON(page_count &lt; 0);</div><div class='add'>+</div><div class='add'>+	return page_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int nfs_max_pages(unsigned int size)</div><div class='add'>+{</div><div class='add'>+	return (size + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nfs_direct_IO - NFS address space operation for direct I/O</div><div class='hunk'>@@ -119,50 +141,21 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty)</div><div class='add'>+static void nfs_direct_dirty_pages(struct page **pages, int npages)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	for (i = 0; i &lt; npages; i++) {</div><div class='ctx'> 		struct page *page = pages[i];</div><div class='del'>-		if (do_dirty &amp;&amp; !PageCompound(page))</div><div class='add'>+		if (!PageCompound(page))</div><div class='ctx'> 			set_page_dirty_lock(page);</div><div class='del'>-		page_cache_release(page);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(pages);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int nfs_get_user_pages(int rw, unsigned long user_addr, size_t size, struct page ***pages)</div><div class='add'>+static void nfs_direct_release_pages(struct page **pages, int npages)</div><div class='ctx'> {</div><div class='del'>-	int result = -ENOMEM;</div><div class='del'>-	unsigned long page_count;</div><div class='del'>-	size_t array_size;</div><div class='del'>-</div><div class='del'>-	page_count = (user_addr + size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	page_count -= user_addr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-</div><div class='del'>-	array_size = (page_count * sizeof(struct page *));</div><div class='del'>-	*pages = kmalloc(array_size, GFP_KERNEL);</div><div class='del'>-	if (*pages) {</div><div class='del'>-		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-		result = get_user_pages(current, current-&gt;mm, user_addr,</div><div class='del'>-					page_count, (rw == READ), 0,</div><div class='del'>-					*pages, NULL);</div><div class='del'>-		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='del'>-		if (result != page_count) {</div><div class='del'>-			/*</div><div class='del'>-			 * If we got fewer pages than expected from</div><div class='del'>-			 * get_user_pages(), the user buffer runs off the</div><div class='del'>-			 * end of a mapping; return EFAULT.</div><div class='del'>-			 */</div><div class='del'>-			if (result &gt;= 0) {</div><div class='del'>-				nfs_free_user_pages(*pages, result, 0);</div><div class='del'>-				result = -EFAULT;</div><div class='del'>-			} else</div><div class='del'>-				kfree(*pages);</div><div class='del'>-			*pages = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; npages; i++)</div><div class='add'>+		page_cache_release(pages[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct nfs_direct_req *nfs_direct_req_alloc(void)</div><div class='hunk'>@@ -174,13 +167,13 @@ static inline struct nfs_direct_req *nfs_direct_req_alloc(void)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	kref_init(&amp;dreq-&gt;kref);</div><div class='add'>+	kref_get(&amp;dreq-&gt;kref);</div><div class='ctx'> 	init_completion(&amp;dreq-&gt;completion);</div><div class='del'>-	INIT_LIST_HEAD(&amp;dreq-&gt;list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dreq-&gt;rewrite_list);</div><div class='ctx'> 	dreq-&gt;iocb = NULL;</div><div class='ctx'> 	dreq-&gt;ctx = NULL;</div><div class='ctx'> 	spin_lock_init(&amp;dreq-&gt;lock);</div><div class='del'>-	dreq-&gt;outstanding = 0;</div><div class='add'>+	atomic_set(&amp;dreq-&gt;io_count, 0);</div><div class='ctx'> 	dreq-&gt;count = 0;</div><div class='ctx'> 	dreq-&gt;error = 0;</div><div class='ctx'> 	dreq-&gt;flags = 0;</div><div class='hunk'>@@ -221,18 +214,11 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * We must hold a reference to all the pages in this direct read request</div><div class='del'>- * until the RPCs complete.  This could be long *after* we are woken up in</div><div class='del'>- * nfs_direct_wait (for instance, if someone hits ^C on a slow server).</div><div class='del'>- *</div><div class='del'>- * In addition, synchronous I/O uses a stack-allocated iocb.  Thus we</div><div class='del'>- * can't trust the iocb is still valid here if this is a synchronous</div><div class='del'>- * request.  If the waiter is woken prematurely, the iocb is long gone.</div><div class='add'>+ * Synchronous I/O uses a stack-allocated iocb.  Thus we can't trust</div><div class='add'>+ * the iocb is still valid here if this is a synchronous request.</div><div class='ctx'>  */</div><div class='ctx'> static void nfs_direct_complete(struct nfs_direct_req *dreq)</div><div class='ctx'> {</div><div class='del'>-	nfs_free_user_pages(dreq-&gt;pages, dreq-&gt;npages, 1);</div><div class='del'>-</div><div class='ctx'> 	if (dreq-&gt;iocb) {</div><div class='ctx'> 		long res = (long) dreq-&gt;error;</div><div class='ctx'> 		if (!res)</div><div class='hunk'>@@ -245,48 +231,10 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Note we also set the number of requests we have in the dreq when we are</div><div class='del'>- * done.  This prevents races with I/O completion so we will always wait</div><div class='del'>- * until all requests have been dispatched and completed.</div><div class='add'>+ * We must hold a reference to all the pages in this direct read request</div><div class='add'>+ * until the RPCs complete.  This could be long *after* we are woken up in</div><div class='add'>+ * nfs_direct_wait (for instance, if someone hits ^C on a slow server).</div><div class='ctx'>  */</div><div class='del'>-static struct nfs_direct_req *nfs_direct_read_alloc(size_t nbytes, size_t rsize)</div><div class='del'>-{</div><div class='del'>-	struct list_head *list;</div><div class='del'>-	struct nfs_direct_req *dreq;</div><div class='del'>-	unsigned int rpages = (rsize + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-</div><div class='del'>-	dreq = nfs_direct_req_alloc();</div><div class='del'>-	if (!dreq)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	list = &amp;dreq-&gt;list;</div><div class='del'>-	for(;;) {</div><div class='del'>-		struct nfs_read_data *data = nfs_readdata_alloc(rpages);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!data)) {</div><div class='del'>-			while (!list_empty(list)) {</div><div class='del'>-				data = list_entry(list-&gt;next,</div><div class='del'>-						  struct nfs_read_data, pages);</div><div class='del'>-				list_del(&amp;data-&gt;pages);</div><div class='del'>-				nfs_readdata_free(data);</div><div class='del'>-			}</div><div class='del'>-			kref_put(&amp;dreq-&gt;kref, nfs_direct_req_release);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		INIT_LIST_HEAD(&amp;data-&gt;pages);</div><div class='del'>-		list_add(&amp;data-&gt;pages, list);</div><div class='del'>-</div><div class='del'>-		data-&gt;req = (struct nfs_page *) dreq;</div><div class='del'>-		dreq-&gt;outstanding++;</div><div class='del'>-		if (nbytes &lt;= rsize)</div><div class='del'>-			break;</div><div class='del'>-		nbytes -= rsize;</div><div class='del'>-	}</div><div class='del'>-	kref_get(&amp;dreq-&gt;kref);</div><div class='del'>-	return dreq;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nfs_direct_read_result(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_read_data *data = calldata;</div><div class='hunk'>@@ -295,6 +243,9 @@ static void nfs_direct_read_result(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	if (nfs_readpage_result(task, data) != 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	nfs_direct_dirty_pages(data-&gt;pagevec, data-&gt;npages);</div><div class='add'>+	nfs_direct_release_pages(data-&gt;pagevec, data-&gt;npages);</div><div class='add'>+</div><div class='ctx'> 	spin_lock(&amp;dreq-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(task-&gt;tk_status &gt;= 0))</div><div class='hunk'>@@ -302,13 +253,10 @@ static void nfs_direct_read_result(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	else</div><div class='ctx'> 		dreq-&gt;error = task-&gt;tk_status;</div><div class='ctx'> </div><div class='del'>-	if (--dreq-&gt;outstanding) {</div><div class='del'>-		spin_unlock(&amp;dreq-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_unlock(&amp;dreq-&gt;lock);</div><div class='del'>-	nfs_direct_complete(dreq);</div><div class='add'>+</div><div class='add'>+	if (put_dreq(dreq))</div><div class='add'>+		nfs_direct_complete(dreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rpc_call_ops nfs_read_direct_ops = {</div><div class='hunk'>@@ -317,41 +265,60 @@ static const struct rpc_call_ops nfs_read_direct_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * For each nfs_read_data struct that was allocated on the list, dispatch</div><div class='del'>- * an NFS READ operation</div><div class='add'>+ * For each rsize'd chunk of the user's buffer, dispatch an NFS READ</div><div class='add'>+ * operation.  If nfs_readdata_alloc() or get_user_pages() fails,</div><div class='add'>+ * bail and stop sending more reads.  Read length accounting is</div><div class='add'>+ * handled automatically by nfs_direct_read_result().  Otherwise, if</div><div class='add'>+ * no requests have been sent, just return an error.</div><div class='ctx'>  */</div><div class='del'>-static void nfs_direct_read_schedule(struct nfs_direct_req *dreq)</div><div class='add'>+static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned long user_addr, size_t count, loff_t pos)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_open_context *ctx = dreq-&gt;ctx;</div><div class='ctx'> 	struct inode *inode = ctx-&gt;dentry-&gt;d_inode;</div><div class='del'>-	struct list_head *list = &amp;dreq-&gt;list;</div><div class='del'>-	struct page **pages = dreq-&gt;pages;</div><div class='del'>-	size_t count = dreq-&gt;user_count;</div><div class='del'>-	loff_t pos = dreq-&gt;pos;</div><div class='ctx'> 	size_t rsize = NFS_SERVER(inode)-&gt;rsize;</div><div class='del'>-	unsigned int curpage, pgbase;</div><div class='add'>+	unsigned int rpages = nfs_max_pages(rsize);</div><div class='add'>+	unsigned int pgbase;</div><div class='add'>+	int result;</div><div class='add'>+	ssize_t started = 0;</div><div class='add'>+</div><div class='add'>+	get_dreq(dreq);</div><div class='ctx'> </div><div class='del'>-	curpage = 0;</div><div class='del'>-	pgbase = dreq-&gt;user_addr &amp; ~PAGE_MASK;</div><div class='add'>+	pgbase = user_addr &amp; ~PAGE_MASK;</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct nfs_read_data *data;</div><div class='ctx'> 		size_t bytes;</div><div class='ctx'> </div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		data = nfs_readdata_alloc(rpages);</div><div class='add'>+		if (unlikely(!data))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		bytes = rsize;</div><div class='ctx'> 		if (count &lt; rsize)</div><div class='ctx'> 			bytes = count;</div><div class='ctx'> </div><div class='del'>-		BUG_ON(list_empty(list));</div><div class='del'>-		data = list_entry(list-&gt;next, struct nfs_read_data, pages);</div><div class='del'>-		list_del_init(&amp;data-&gt;pages);</div><div class='add'>+		data-&gt;npages = nfs_direct_count_pages(user_addr, bytes);</div><div class='add'>+		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		result = get_user_pages(current, current-&gt;mm, user_addr,</div><div class='add'>+					data-&gt;npages, 1, 0, data-&gt;pagevec, NULL);</div><div class='add'>+		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		if (unlikely(result &lt; data-&gt;npages)) {</div><div class='add'>+			if (result &gt; 0)</div><div class='add'>+				nfs_direct_release_pages(data-&gt;pagevec, result);</div><div class='add'>+			nfs_readdata_release(data);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		get_dreq(dreq);</div><div class='ctx'> </div><div class='add'>+		data-&gt;req = (struct nfs_page *) dreq;</div><div class='ctx'> 		data-&gt;inode = inode;</div><div class='ctx'> 		data-&gt;cred = ctx-&gt;cred;</div><div class='ctx'> 		data-&gt;args.fh = NFS_FH(inode);</div><div class='ctx'> 		data-&gt;args.context = ctx;</div><div class='ctx'> 		data-&gt;args.offset = pos;</div><div class='ctx'> 		data-&gt;args.pgbase = pgbase;</div><div class='del'>-		data-&gt;args.pages = &amp;pages[curpage];</div><div class='add'>+		data-&gt;args.pages = data-&gt;pagevec;</div><div class='ctx'> 		data-&gt;args.count = bytes;</div><div class='ctx'> 		data-&gt;res.fattr = &amp;data-&gt;fattr;</div><div class='ctx'> 		data-&gt;res.eof = 0;</div><div class='hunk'>@@ -374,33 +341,35 @@ static void nfs_direct_read_schedule(struct nfs_direct_req *dreq)</div><div class='ctx'> 				bytes,</div><div class='ctx'> 				(unsigned long long)data-&gt;args.offset);</div><div class='ctx'> </div><div class='add'>+		started += bytes;</div><div class='add'>+		user_addr += bytes;</div><div class='ctx'> 		pos += bytes;</div><div class='ctx'> 		pgbase += bytes;</div><div class='del'>-		curpage += pgbase &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		pgbase &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 		count -= bytes;</div><div class='ctx'> 	} while (count != 0);</div><div class='del'>-	BUG_ON(!list_empty(list));</div><div class='add'>+</div><div class='add'>+	if (put_dreq(dreq))</div><div class='add'>+		nfs_direct_complete(dreq);</div><div class='add'>+</div><div class='add'>+	if (started)</div><div class='add'>+		return 0;</div><div class='add'>+	return result &lt; 0 ? (ssize_t) result : -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size_t count, loff_t pos, struct page **pages, unsigned int nr_pages)</div><div class='add'>+static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size_t count, loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	ssize_t result;</div><div class='add'>+	ssize_t result = 0;</div><div class='ctx'> 	sigset_t oldset;</div><div class='ctx'> 	struct inode *inode = iocb-&gt;ki_filp-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct rpc_clnt *clnt = NFS_CLIENT(inode);</div><div class='ctx'> 	struct nfs_direct_req *dreq;</div><div class='ctx'> </div><div class='del'>-	dreq = nfs_direct_read_alloc(count, NFS_SERVER(inode)-&gt;rsize);</div><div class='add'>+	dreq = nfs_direct_req_alloc();</div><div class='ctx'> 	if (!dreq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	dreq-&gt;user_addr = user_addr;</div><div class='del'>-	dreq-&gt;user_count = count;</div><div class='del'>-	dreq-&gt;pos = pos;</div><div class='del'>-	dreq-&gt;pages = pages;</div><div class='del'>-	dreq-&gt;npages = nr_pages;</div><div class='ctx'> 	dreq-&gt;inode = inode;</div><div class='ctx'> 	dreq-&gt;ctx = get_nfs_open_context((struct nfs_open_context *)iocb-&gt;ki_filp-&gt;private_data);</div><div class='ctx'> 	if (!is_sync_kiocb(iocb))</div><div class='hunk'>@@ -408,8 +377,9 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size</div><div class='ctx'> </div><div class='ctx'> 	nfs_add_stats(inode, NFSIOS_DIRECTREADBYTES, count);</div><div class='ctx'> 	rpc_clnt_sigmask(clnt, &amp;oldset);</div><div class='del'>-	nfs_direct_read_schedule(dreq);</div><div class='del'>-	result = nfs_direct_wait(dreq);</div><div class='add'>+	result = nfs_direct_read_schedule(dreq, user_addr, count, pos);</div><div class='add'>+	if (!result)</div><div class='add'>+		result = nfs_direct_wait(dreq);</div><div class='ctx'> 	rpc_clnt_sigunmask(clnt, &amp;oldset);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -417,10 +387,10 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size</div><div class='ctx'> </div><div class='ctx'> static void nfs_direct_free_writedata(struct nfs_direct_req *dreq)</div><div class='ctx'> {</div><div class='del'>-	list_splice_init(&amp;dreq-&gt;rewrite_list, &amp;dreq-&gt;list);</div><div class='del'>-	while (!list_empty(&amp;dreq-&gt;list)) {</div><div class='del'>-		struct nfs_write_data *data = list_entry(dreq-&gt;list.next, struct nfs_write_data, pages);</div><div class='add'>+	while (!list_empty(&amp;dreq-&gt;rewrite_list)) {</div><div class='add'>+		struct nfs_write_data *data = list_entry(dreq-&gt;rewrite_list.next, struct nfs_write_data, pages);</div><div class='ctx'> 		list_del(&amp;data-&gt;pages);</div><div class='add'>+		nfs_direct_release_pages(data-&gt;pagevec, data-&gt;npages);</div><div class='ctx'> 		nfs_writedata_release(data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -428,14 +398,51 @@ static void nfs_direct_free_writedata(struct nfs_direct_req *dreq)</div><div class='ctx'> #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)</div><div class='ctx'> static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *pos;</div><div class='add'>+	struct inode *inode = dreq-&gt;inode;</div><div class='add'>+	struct list_head *p;</div><div class='add'>+	struct nfs_write_data *data;</div><div class='ctx'> </div><div class='del'>-	list_splice_init(&amp;dreq-&gt;rewrite_list, &amp;dreq-&gt;list);</div><div class='del'>-	list_for_each(pos, &amp;dreq-&gt;list)</div><div class='del'>-		dreq-&gt;outstanding++;</div><div class='ctx'> 	dreq-&gt;count = 0;</div><div class='add'>+	get_dreq(dreq);</div><div class='add'>+</div><div class='add'>+	list_for_each(p, &amp;dreq-&gt;rewrite_list) {</div><div class='add'>+		data = list_entry(p, struct nfs_write_data, pages);</div><div class='add'>+</div><div class='add'>+		get_dreq(dreq);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Reset data-&gt;res.</div><div class='add'>+		 */</div><div class='add'>+		nfs_fattr_init(&amp;data-&gt;fattr);</div><div class='add'>+		data-&gt;res.count = data-&gt;args.count;</div><div class='add'>+		memset(&amp;data-&gt;verf, 0, sizeof(data-&gt;verf));</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Reuse data-&gt;task; data-&gt;args should not have changed</div><div class='add'>+		 * since the original request was sent.</div><div class='add'>+		 */</div><div class='add'>+		rpc_init_task(&amp;data-&gt;task, NFS_CLIENT(inode), RPC_TASK_ASYNC,</div><div class='add'>+				&amp;nfs_write_direct_ops, data);</div><div class='add'>+		NFS_PROTO(inode)-&gt;write_setup(data, FLUSH_STABLE);</div><div class='add'>+</div><div class='add'>+		data-&gt;task.tk_priority = RPC_PRIORITY_NORMAL;</div><div class='add'>+		data-&gt;task.tk_cookie = (unsigned long) inode;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We're called via an RPC callback, so BKL is already held.</div><div class='add'>+		 */</div><div class='add'>+		rpc_execute(&amp;data-&gt;task);</div><div class='add'>+</div><div class='add'>+		dprintk("NFS: %5u rescheduled direct write call (req %s/%Ld, %u bytes @ offset %Lu)\n",</div><div class='add'>+				data-&gt;task.tk_pid,</div><div class='add'>+				inode-&gt;i_sb-&gt;s_id,</div><div class='add'>+				(long long)NFS_FILEID(inode),</div><div class='add'>+				data-&gt;args.count,</div><div class='add'>+				(unsigned long long)data-&gt;args.offset);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	nfs_direct_write_schedule(dreq, FLUSH_STABLE);</div><div class='add'>+	if (put_dreq(dreq))</div><div class='add'>+		nfs_direct_write_complete(dreq, inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nfs_direct_commit_result(struct rpc_task *task, void *calldata)</div><div class='hunk'>@@ -472,8 +479,8 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)</div><div class='ctx'> 	data-&gt;cred = dreq-&gt;ctx-&gt;cred;</div><div class='ctx'> </div><div class='ctx'> 	data-&gt;args.fh = NFS_FH(data-&gt;inode);</div><div class='del'>-	data-&gt;args.offset = dreq-&gt;pos;</div><div class='del'>-	data-&gt;args.count = dreq-&gt;user_count;</div><div class='add'>+	data-&gt;args.offset = 0;</div><div class='add'>+	data-&gt;args.count = 0;</div><div class='ctx'> 	data-&gt;res.count = 0;</div><div class='ctx'> 	data-&gt;res.fattr = &amp;data-&gt;fattr;</div><div class='ctx'> 	data-&gt;res.verf = &amp;data-&gt;verf;</div><div class='hunk'>@@ -535,47 +542,6 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct nfs_direct_req *nfs_direct_write_alloc(size_t nbytes, size_t wsize)</div><div class='del'>-{</div><div class='del'>-	struct list_head *list;</div><div class='del'>-	struct nfs_direct_req *dreq;</div><div class='del'>-	unsigned int wpages = (wsize + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-</div><div class='del'>-	dreq = nfs_direct_req_alloc();</div><div class='del'>-	if (!dreq)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	list = &amp;dreq-&gt;list;</div><div class='del'>-	for(;;) {</div><div class='del'>-		struct nfs_write_data *data = nfs_writedata_alloc(wpages);</div><div class='del'>-</div><div class='del'>-		if (unlikely(!data)) {</div><div class='del'>-			while (!list_empty(list)) {</div><div class='del'>-				data = list_entry(list-&gt;next,</div><div class='del'>-						  struct nfs_write_data, pages);</div><div class='del'>-				list_del(&amp;data-&gt;pages);</div><div class='del'>-				nfs_writedata_free(data);</div><div class='del'>-			}</div><div class='del'>-			kref_put(&amp;dreq-&gt;kref, nfs_direct_req_release);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		INIT_LIST_HEAD(&amp;data-&gt;pages);</div><div class='del'>-		list_add(&amp;data-&gt;pages, list);</div><div class='del'>-</div><div class='del'>-		data-&gt;req = (struct nfs_page *) dreq;</div><div class='del'>-		dreq-&gt;outstanding++;</div><div class='del'>-		if (nbytes &lt;= wsize)</div><div class='del'>-			break;</div><div class='del'>-		nbytes -= wsize;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nfs_alloc_commit_data(dreq);</div><div class='del'>-</div><div class='del'>-	kref_get(&amp;dreq-&gt;kref);</div><div class='del'>-	return dreq;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void nfs_direct_write_result(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_write_data *data = calldata;</div><div class='hunk'>@@ -605,8 +571,6 @@ static void nfs_direct_write_result(struct rpc_task *task, void *calldata)</div><div class='ctx'> 				}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	/* In case we have to resend */</div><div class='del'>-	data-&gt;args.stable = NFS_FILE_SYNC;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;dreq-&gt;lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -620,14 +584,8 @@ static void nfs_direct_write_release(void *calldata)</div><div class='ctx'> 	struct nfs_write_data *data = calldata;</div><div class='ctx'> 	struct nfs_direct_req *dreq = (struct nfs_direct_req *) data-&gt;req;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;dreq-&gt;lock);</div><div class='del'>-	if (--dreq-&gt;outstanding) {</div><div class='del'>-		spin_unlock(&amp;dreq-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;dreq-&gt;lock);</div><div class='del'>-</div><div class='del'>-	nfs_direct_write_complete(dreq, data-&gt;inode);</div><div class='add'>+	if (put_dreq(dreq))</div><div class='add'>+		nfs_direct_write_complete(dreq, data-&gt;inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rpc_call_ops nfs_write_direct_ops = {</div><div class='hunk'>@@ -636,41 +594,62 @@ static const struct rpc_call_ops nfs_write_direct_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * For each nfs_write_data struct that was allocated on the list, dispatch</div><div class='del'>- * an NFS WRITE operation</div><div class='add'>+ * For each wsize'd chunk of the user's buffer, dispatch an NFS WRITE</div><div class='add'>+ * operation.  If nfs_writedata_alloc() or get_user_pages() fails,</div><div class='add'>+ * bail and stop sending more writes.  Write length accounting is</div><div class='add'>+ * handled automatically by nfs_direct_write_result().  Otherwise, if</div><div class='add'>+ * no requests have been sent, just return an error.</div><div class='ctx'>  */</div><div class='del'>-static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync)</div><div class='add'>+static ssize_t nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned long user_addr, size_t count, loff_t pos, int sync)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_open_context *ctx = dreq-&gt;ctx;</div><div class='ctx'> 	struct inode *inode = ctx-&gt;dentry-&gt;d_inode;</div><div class='del'>-	struct list_head *list = &amp;dreq-&gt;list;</div><div class='del'>-	struct page **pages = dreq-&gt;pages;</div><div class='del'>-	size_t count = dreq-&gt;user_count;</div><div class='del'>-	loff_t pos = dreq-&gt;pos;</div><div class='ctx'> 	size_t wsize = NFS_SERVER(inode)-&gt;wsize;</div><div class='del'>-	unsigned int curpage, pgbase;</div><div class='add'>+	unsigned int wpages = nfs_max_pages(wsize);</div><div class='add'>+	unsigned int pgbase;</div><div class='add'>+	int result;</div><div class='add'>+	ssize_t started = 0;</div><div class='ctx'> </div><div class='del'>-	curpage = 0;</div><div class='del'>-	pgbase = dreq-&gt;user_addr &amp; ~PAGE_MASK;</div><div class='add'>+	get_dreq(dreq);</div><div class='add'>+</div><div class='add'>+	pgbase = user_addr &amp; ~PAGE_MASK;</div><div class='ctx'> 	do {</div><div class='ctx'> 		struct nfs_write_data *data;</div><div class='ctx'> 		size_t bytes;</div><div class='ctx'> </div><div class='add'>+		result = -ENOMEM;</div><div class='add'>+		data = nfs_writedata_alloc(wpages);</div><div class='add'>+		if (unlikely(!data))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		bytes = wsize;</div><div class='ctx'> 		if (count &lt; wsize)</div><div class='ctx'> 			bytes = count;</div><div class='ctx'> </div><div class='del'>-		BUG_ON(list_empty(list));</div><div class='del'>-		data = list_entry(list-&gt;next, struct nfs_write_data, pages);</div><div class='add'>+		data-&gt;npages = nfs_direct_count_pages(user_addr, bytes);</div><div class='add'>+		down_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		result = get_user_pages(current, current-&gt;mm, user_addr,</div><div class='add'>+					data-&gt;npages, 0, 0, data-&gt;pagevec, NULL);</div><div class='add'>+		up_read(&amp;current-&gt;mm-&gt;mmap_sem);</div><div class='add'>+		if (unlikely(result &lt; data-&gt;npages)) {</div><div class='add'>+			if (result &gt; 0)</div><div class='add'>+				nfs_direct_release_pages(data-&gt;pagevec, result);</div><div class='add'>+			nfs_writedata_release(data);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		get_dreq(dreq);</div><div class='add'>+</div><div class='ctx'> 		list_move_tail(&amp;data-&gt;pages, &amp;dreq-&gt;rewrite_list);</div><div class='ctx'> </div><div class='add'>+		data-&gt;req = (struct nfs_page *) dreq;</div><div class='ctx'> 		data-&gt;inode = inode;</div><div class='ctx'> 		data-&gt;cred = ctx-&gt;cred;</div><div class='ctx'> 		data-&gt;args.fh = NFS_FH(inode);</div><div class='ctx'> 		data-&gt;args.context = ctx;</div><div class='ctx'> 		data-&gt;args.offset = pos;</div><div class='ctx'> 		data-&gt;args.pgbase = pgbase;</div><div class='del'>-		data-&gt;args.pages = &amp;pages[curpage];</div><div class='add'>+		data-&gt;args.pages = data-&gt;pagevec;</div><div class='ctx'> 		data-&gt;args.count = bytes;</div><div class='ctx'> 		data-&gt;res.fattr = &amp;data-&gt;fattr;</div><div class='ctx'> 		data-&gt;res.count = bytes;</div><div class='hunk'>@@ -694,19 +673,26 @@ static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync)</div><div class='ctx'> 				bytes,</div><div class='ctx'> 				(unsigned long long)data-&gt;args.offset);</div><div class='ctx'> </div><div class='add'>+		started += bytes;</div><div class='add'>+		user_addr += bytes;</div><div class='ctx'> 		pos += bytes;</div><div class='ctx'> 		pgbase += bytes;</div><div class='del'>-		curpage += pgbase &gt;&gt; PAGE_SHIFT;</div><div class='ctx'> 		pgbase &amp;= ~PAGE_MASK;</div><div class='ctx'> </div><div class='ctx'> 		count -= bytes;</div><div class='ctx'> 	} while (count != 0);</div><div class='del'>-	BUG_ON(!list_empty(list));</div><div class='add'>+</div><div class='add'>+	if (put_dreq(dreq))</div><div class='add'>+		nfs_direct_write_complete(dreq, inode);</div><div class='add'>+</div><div class='add'>+	if (started)</div><div class='add'>+		return 0;</div><div class='add'>+	return result &lt; 0 ? (ssize_t) result : -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, size_t count, loff_t pos, struct page **pages, int nr_pages)</div><div class='add'>+static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, size_t count, loff_t pos)</div><div class='ctx'> {</div><div class='del'>-	ssize_t result;</div><div class='add'>+	ssize_t result = 0;</div><div class='ctx'> 	sigset_t oldset;</div><div class='ctx'> 	struct inode *inode = iocb-&gt;ki_filp-&gt;f_mapping-&gt;host;</div><div class='ctx'> 	struct rpc_clnt *clnt = NFS_CLIENT(inode);</div><div class='hunk'>@@ -714,17 +700,14 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, siz</div><div class='ctx'> 	size_t wsize = NFS_SERVER(inode)-&gt;wsize;</div><div class='ctx'> 	int sync = 0;</div><div class='ctx'> </div><div class='del'>-	dreq = nfs_direct_write_alloc(count, wsize);</div><div class='add'>+	dreq = nfs_direct_req_alloc();</div><div class='ctx'> 	if (!dreq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	nfs_alloc_commit_data(dreq);</div><div class='add'>+</div><div class='ctx'> 	if (dreq-&gt;commit_data == NULL || count &lt; wsize)</div><div class='ctx'> 		sync = FLUSH_STABLE;</div><div class='ctx'> </div><div class='del'>-	dreq-&gt;user_addr = user_addr;</div><div class='del'>-	dreq-&gt;user_count = count;</div><div class='del'>-	dreq-&gt;pos = pos;</div><div class='del'>-	dreq-&gt;pages = pages;</div><div class='del'>-	dreq-&gt;npages = nr_pages;</div><div class='ctx'> 	dreq-&gt;inode = inode;</div><div class='ctx'> 	dreq-&gt;ctx = get_nfs_open_context((struct nfs_open_context *)iocb-&gt;ki_filp-&gt;private_data);</div><div class='ctx'> 	if (!is_sync_kiocb(iocb))</div><div class='hunk'>@@ -735,8 +718,9 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, siz</div><div class='ctx'> 	nfs_begin_data_update(inode);</div><div class='ctx'> </div><div class='ctx'> 	rpc_clnt_sigmask(clnt, &amp;oldset);</div><div class='del'>-	nfs_direct_write_schedule(dreq, sync);</div><div class='del'>-	result = nfs_direct_wait(dreq);</div><div class='add'>+	result = nfs_direct_write_schedule(dreq, user_addr, count, pos, sync);</div><div class='add'>+	if (!result)</div><div class='add'>+		result = nfs_direct_wait(dreq);</div><div class='ctx'> 	rpc_clnt_sigunmask(clnt, &amp;oldset);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -766,8 +750,6 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, siz</div><div class='ctx'> ssize_t nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t pos)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t retval = -EINVAL;</div><div class='del'>-	int page_count;</div><div class='del'>-	struct page **pages;</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -789,14 +771,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count,</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	retval = nfs_get_user_pages(READ, (unsigned long) buf,</div><div class='del'>-						count, &amp;pages);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	page_count = retval;</div><div class='del'>-</div><div class='del'>-	retval = nfs_direct_read(iocb, (unsigned long) buf, count, pos,</div><div class='del'>-						pages, page_count);</div><div class='add'>+	retval = nfs_direct_read(iocb, (unsigned long) buf, count, pos);</div><div class='ctx'> 	if (retval &gt; 0)</div><div class='ctx'> 		iocb-&gt;ki_pos = pos + retval;</div><div class='ctx'> </div><div class='hunk'>@@ -832,8 +807,6 @@ out:</div><div class='ctx'> ssize_t nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos)</div><div class='ctx'> {</div><div class='ctx'> 	ssize_t retval;</div><div class='del'>-	int page_count;</div><div class='del'>-	struct page **pages;</div><div class='ctx'> 	struct file *file = iocb-&gt;ki_filp;</div><div class='ctx'> 	struct address_space *mapping = file-&gt;f_mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -861,14 +834,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	retval = nfs_get_user_pages(WRITE, (unsigned long) buf,</div><div class='del'>-						count, &amp;pages);</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-	page_count = retval;</div><div class='del'>-</div><div class='del'>-	retval = nfs_direct_write(iocb, (unsigned long) buf, count,</div><div class='del'>-					pos, pages, page_count);</div><div class='add'>+	retval = nfs_direct_write(iocb, (unsigned long) buf, count, pos);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * XXX: nfs_end_data_update() already ensures this file's</div><div class='hunk'>@@ -892,7 +858,7 @@ out:</div><div class='ctx'>  * nfs_init_directcache - create a slab cache for nfs_direct_req structures</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-int nfs_init_directcache(void)</div><div class='add'>+int __init nfs_init_directcache(void)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",</div><div class='ctx'> 						sizeof(struct nfs_direct_req),</div><div class='hunk'>@@ -906,7 +872,7 @@ int nfs_init_directcache(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nfs_init_directcache - destroy the slab cache for nfs_direct_req structures</div><div class='add'>+ * nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> void nfs_destroy_directcache(void)</div><div class='head'>diff --git a/fs/nfs/file.c b/fs/nfs/file.c<br/>index fade02c15e6e..cc2b874ad5a4 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/file.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/file.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/file.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/file.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ static int  nfs_file_mmap(struct file *, struct vm_area_struct *);</div><div class='ctx'> static ssize_t nfs_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);</div><div class='ctx'> static ssize_t nfs_file_read(struct kiocb *, char __user *, size_t, loff_t);</div><div class='ctx'> static ssize_t nfs_file_write(struct kiocb *, const char __user *, size_t, loff_t);</div><div class='del'>-static int  nfs_file_flush(struct file *);</div><div class='add'>+static int  nfs_file_flush(struct file *, fl_owner_t id);</div><div class='ctx'> static int  nfs_fsync(struct file *, struct dentry *dentry, int datasync);</div><div class='ctx'> static int nfs_check_flags(int flags);</div><div class='ctx'> static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);</div><div class='hunk'>@@ -127,23 +127,6 @@ nfs_file_release(struct inode *inode, struct file *filp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nfs_revalidate_file - Revalidate the page cache &amp; related metadata</div><div class='del'>- * @inode - pointer to inode struct</div><div class='del'>- * @file - pointer to file</div><div class='del'>- */</div><div class='del'>-static int nfs_revalidate_file(struct inode *inode, struct file *filp)</div><div class='del'>-{</div><div class='del'>-	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	if ((nfsi-&gt;cache_validity &amp; (NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_ATTR))</div><div class='del'>-			|| nfs_attribute_timeout(inode))</div><div class='del'>-		retval = __nfs_revalidate_inode(NFS_SERVER(inode), inode);</div><div class='del'>-	nfs_revalidate_mapping(inode, filp-&gt;f_mapping);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  * nfs_revalidate_size - Revalidate the file size</div><div class='ctx'>  * @inode - pointer to inode struct</div><div class='ctx'>  * @file - pointer to struct file</div><div class='hunk'>@@ -188,7 +171,7 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-nfs_file_flush(struct file *file)</div><div class='add'>+nfs_file_flush(struct file *file, fl_owner_t id)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_open_context *ctx = (struct nfs_open_context *)file-&gt;private_data;</div><div class='ctx'> 	struct inode	*inode = file-&gt;f_dentry-&gt;d_inode;</div><div class='hunk'>@@ -228,7 +211,7 @@ nfs_file_read(struct kiocb *iocb, char __user * buf, size_t count, loff_t pos)</div><div class='ctx'> 		dentry-&gt;d_parent-&gt;d_name.name, dentry-&gt;d_name.name,</div><div class='ctx'> 		(unsigned long) count, (unsigned long) pos);</div><div class='ctx'> </div><div class='del'>-	result = nfs_revalidate_file(inode, iocb-&gt;ki_filp);</div><div class='add'>+	result = nfs_revalidate_mapping(inode, iocb-&gt;ki_filp-&gt;f_mapping);</div><div class='ctx'> 	nfs_add_stats(inode, NFSIOS_NORMALREADBYTES, count);</div><div class='ctx'> 	if (!result)</div><div class='ctx'> 		result = generic_file_aio_read(iocb, buf, count, pos);</div><div class='hunk'>@@ -247,7 +230,7 @@ nfs_file_sendfile(struct file *filp, loff_t *ppos, size_t count,</div><div class='ctx'> 		dentry-&gt;d_parent-&gt;d_name.name, dentry-&gt;d_name.name,</div><div class='ctx'> 		(unsigned long) count, (unsigned long long) *ppos);</div><div class='ctx'> </div><div class='del'>-	res = nfs_revalidate_file(inode, filp);</div><div class='add'>+	res = nfs_revalidate_mapping(inode, filp-&gt;f_mapping);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		res = generic_file_sendfile(filp, ppos, count, actor, target);</div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -263,7 +246,7 @@ nfs_file_mmap(struct file * file, struct vm_area_struct * vma)</div><div class='ctx'> 	dfprintk(VFS, "nfs: mmap(%s/%s)\n",</div><div class='ctx'> 		dentry-&gt;d_parent-&gt;d_name.name, dentry-&gt;d_name.name);</div><div class='ctx'> </div><div class='del'>-	status = nfs_revalidate_file(inode, file);</div><div class='add'>+	status = nfs_revalidate_mapping(inode, file-&gt;f_mapping);</div><div class='ctx'> 	if (!status)</div><div class='ctx'> 		status = generic_file_mmap(file, vma);</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -320,7 +303,11 @@ static int nfs_commit_write(struct file *file, struct page *page, unsigned offse</div><div class='ctx'> </div><div class='ctx'> static void nfs_invalidate_page(struct page *page, unsigned long offset)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME: we really should cancel any unstarted writes on this page */</div><div class='add'>+	struct inode *inode = page-&gt;mapping-&gt;host;</div><div class='add'>+</div><div class='add'>+	/* Cancel any unstarted writes on this page */</div><div class='add'>+	if (offset == 0)</div><div class='add'>+		nfs_sync_inode_wait(inode, page-&gt;index, 1, FLUSH_INVALIDATE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nfs_release_page(struct page *page, gfp_t gfp)</div><div class='hunk'>@@ -328,7 +315,7 @@ static int nfs_release_page(struct page *page, gfp_t gfp)</div><div class='ctx'> 	return !nfs_wb_page(page-&gt;mapping-&gt;host, page);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct address_space_operations nfs_file_aops = {</div><div class='add'>+const struct address_space_operations nfs_file_aops = {</div><div class='ctx'> 	.readpage = nfs_readpage,</div><div class='ctx'> 	.readpages = nfs_readpages,</div><div class='ctx'> 	.set_page_dirty = __set_page_dirty_nobuffers,</div><div class='hunk'>@@ -373,7 +360,6 @@ nfs_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t</div><div class='ctx'> 		if (result)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='del'>-	nfs_revalidate_mapping(inode, iocb-&gt;ki_filp-&gt;f_mapping);</div><div class='ctx'> </div><div class='ctx'> 	result = count;</div><div class='ctx'> 	if (!count)</div><div class='head'>diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c<br/>index 3fab5b0cfc5a..b81e7ed3c902 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/idmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/idmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/idmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/idmap.c</a></div><div class='hunk'>@@ -47,7 +47,6 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/rpc_pipe_fs.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/nfs_fs_sb.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/nfs_idmap.h&gt;</div><div class='head'>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c<br/>index d0b991a92327..d349fb2245da 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/inode.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/inode.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/inode.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/inode.c</a></div><div class='hunk'>@@ -13,7 +13,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,6 +35,8 @@</div><div class='ctx'> #include &lt;linux/mount.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_idmap.h&gt;</div><div class='ctx'> #include &lt;linux/vfs.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+#include &lt;linux/nfs_xdr.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;asm/uaccess.h&gt;</div><div class='hunk'>@@ -44,89 +45,17 @@</div><div class='ctx'> #include "callback.h"</div><div class='ctx'> #include "delegation.h"</div><div class='ctx'> #include "iostat.h"</div><div class='add'>+#include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_VFS</div><div class='ctx'> #define NFS_PARANOIA 1</div><div class='ctx'> </div><div class='del'>-/* Maximum number of readahead requests</div><div class='del'>- * FIXME: this should really be a sysctl so that users may tune it to suit</div><div class='del'>- *        their needs. People that do NFS over a slow network, might for</div><div class='del'>- *        instance want to reduce it to something closer to 1 for improved</div><div class='del'>- *        interactive response.</div><div class='del'>- */</div><div class='del'>-#define NFS_MAX_READAHEAD	(RPC_DEF_SLOT_TABLE - 1)</div><div class='del'>-</div><div class='ctx'> static void nfs_invalidate_inode(struct inode *);</div><div class='ctx'> static int nfs_update_inode(struct inode *, struct nfs_fattr *);</div><div class='ctx'> </div><div class='del'>-static struct inode *nfs_alloc_inode(struct super_block *sb);</div><div class='del'>-static void nfs_destroy_inode(struct inode *);</div><div class='del'>-static int nfs_write_inode(struct inode *,int);</div><div class='del'>-static void nfs_delete_inode(struct inode *);</div><div class='del'>-static void nfs_clear_inode(struct inode *);</div><div class='del'>-static void nfs_umount_begin(struct super_block *);</div><div class='del'>-static int  nfs_statfs(struct super_block *, struct kstatfs *);</div><div class='del'>-static int  nfs_show_options(struct seq_file *, struct vfsmount *);</div><div class='del'>-static int  nfs_show_stats(struct seq_file *, struct vfsmount *);</div><div class='ctx'> static void nfs_zap_acl_cache(struct inode *);</div><div class='ctx'> </div><div class='del'>-static struct rpc_program	nfs_program;</div><div class='del'>-</div><div class='del'>-static struct super_operations nfs_sops = { </div><div class='del'>-	.alloc_inode	= nfs_alloc_inode,</div><div class='del'>-	.destroy_inode	= nfs_destroy_inode,</div><div class='del'>-	.write_inode	= nfs_write_inode,</div><div class='del'>-	.delete_inode	= nfs_delete_inode,</div><div class='del'>-	.statfs		= nfs_statfs,</div><div class='del'>-	.clear_inode	= nfs_clear_inode,</div><div class='del'>-	.umount_begin	= nfs_umount_begin,</div><div class='del'>-	.show_options	= nfs_show_options,</div><div class='del'>-	.show_stats	= nfs_show_stats,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RPC cruft for NFS</div><div class='del'>- */</div><div class='del'>-static struct rpc_stat		nfs_rpcstat = {</div><div class='del'>-	.program		= &amp;nfs_program</div><div class='del'>-};</div><div class='del'>-static struct rpc_version *	nfs_version[] = {</div><div class='del'>-	NULL,</div><div class='del'>-	NULL,</div><div class='del'>-	&amp;nfs_version2,</div><div class='del'>-#if defined(CONFIG_NFS_V3)</div><div class='del'>-	&amp;nfs_version3,</div><div class='del'>-#elif defined(CONFIG_NFS_V4)</div><div class='del'>-	NULL,</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_NFS_V4)</div><div class='del'>-	&amp;nfs_version4,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct rpc_program	nfs_program = {</div><div class='del'>-	.name			= "nfs",</div><div class='del'>-	.number			= NFS_PROGRAM,</div><div class='del'>-	.nrvers			= ARRAY_SIZE(nfs_version),</div><div class='del'>-	.version		= nfs_version,</div><div class='del'>-	.stats			= &amp;nfs_rpcstat,</div><div class='del'>-	.pipe_dir_name		= "/nfs",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NFS_V3_ACL</div><div class='del'>-static struct rpc_stat		nfsacl_rpcstat = { &amp;nfsacl_program };</div><div class='del'>-static struct rpc_version *	nfsacl_version[] = {</div><div class='del'>-	[3]			= &amp;nfsacl_version3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rpc_program		nfsacl_program = {</div><div class='del'>-	.name =			"nfsacl",</div><div class='del'>-	.number =		NFS_ACL_PROGRAM,</div><div class='del'>-	.nrvers =		ARRAY_SIZE(nfsacl_version),</div><div class='del'>-	.version =		nfsacl_version,</div><div class='del'>-	.stats =		&amp;nfsacl_rpcstat,</div><div class='del'>-};</div><div class='del'>-#endif  /* CONFIG_NFS_V3_ACL */</div><div class='add'>+static kmem_cache_t * nfs_inode_cachep;</div><div class='ctx'> </div><div class='ctx'> static inline unsigned long</div><div class='ctx'> nfs_fattr_to_ino_t(struct nfs_fattr *fattr)</div><div class='hunk'>@@ -134,8 +63,7 @@ nfs_fattr_to_ino_t(struct nfs_fattr *fattr)</div><div class='ctx'> 	return nfs_fileid_to_ino_t(fattr-&gt;fileid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-nfs_write_inode(struct inode *inode, int sync)</div><div class='add'>+int nfs_write_inode(struct inode *inode, int sync)</div><div class='ctx'> {</div><div class='ctx'> 	int flags = sync ? FLUSH_SYNC : 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -146,31 +74,15 @@ nfs_write_inode(struct inode *inode, int sync)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-nfs_delete_inode(struct inode * inode)</div><div class='add'>+void nfs_clear_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	dprintk("NFS: delete_inode(%s/%ld)\n", inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino);</div><div class='del'>-</div><div class='del'>-	truncate_inode_pages(&amp;inode-&gt;i_data, 0);</div><div class='add'>+	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+	struct rpc_cred *cred;</div><div class='ctx'> </div><div class='del'>-	nfs_wb_all(inode);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The following should never happen...</div><div class='ctx'> 	 */</div><div class='del'>-	if (nfs_have_writebacks(inode)) {</div><div class='del'>-		printk(KERN_ERR "nfs_delete_inode: inode %ld has pending RPC requests\n", inode-&gt;i_ino);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clear_inode(inode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nfs_clear_inode(struct inode *inode)</div><div class='del'>-{</div><div class='del'>-	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='del'>-	struct rpc_cred *cred;</div><div class='del'>-</div><div class='del'>-	nfs_wb_all(inode);</div><div class='add'>+	BUG_ON(nfs_have_writebacks(inode));</div><div class='ctx'> 	BUG_ON (!list_empty(&amp;nfsi-&gt;open_files));</div><div class='ctx'> 	nfs_zap_acl_cache(inode);</div><div class='ctx'> 	cred = nfsi-&gt;cache_access.cred;</div><div class='hunk'>@@ -179,554 +91,6 @@ nfs_clear_inode(struct inode *inode)</div><div class='ctx'> 	BUG_ON(atomic_read(&amp;nfsi-&gt;data_updates) != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='del'>-nfs_umount_begin(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct rpc_clnt	*rpc = NFS_SB(sb)-&gt;client;</div><div class='del'>-</div><div class='del'>-	/* -EIO all pending I/O */</div><div class='del'>-	if (!IS_ERR(rpc))</div><div class='del'>-		rpc_killall_tasks(rpc);</div><div class='del'>-	rpc = NFS_SB(sb)-&gt;client_acl;</div><div class='del'>-	if (!IS_ERR(rpc))</div><div class='del'>-		rpc_killall_tasks(rpc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline unsigned long</div><div class='del'>-nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)</div><div class='del'>-{</div><div class='del'>-	/* make sure blocksize is a power of two */</div><div class='del'>-	if ((bsize &amp; (bsize - 1)) || nrbitsp) {</div><div class='del'>-		unsigned char	nrbits;</div><div class='del'>-</div><div class='del'>-		for (nrbits = 31; nrbits &amp;&amp; !(bsize &amp; (1 &lt;&lt; nrbits)); nrbits--)</div><div class='del'>-			;</div><div class='del'>-		bsize = 1 &lt;&lt; nrbits;</div><div class='del'>-		if (nrbitsp)</div><div class='del'>-			*nrbitsp = nrbits;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bsize;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calculate the number of 512byte blocks used.</div><div class='del'>- */</div><div class='del'>-static inline unsigned long</div><div class='del'>-nfs_calc_block_size(u64 tsize)</div><div class='del'>-{</div><div class='del'>-	loff_t used = (tsize + 511) &gt;&gt; 9;</div><div class='del'>-	return (used &gt; ULONG_MAX) ? ULONG_MAX : used;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compute and set NFS server blocksize</div><div class='del'>- */</div><div class='del'>-static inline unsigned long</div><div class='del'>-nfs_block_size(unsigned long bsize, unsigned char *nrbitsp)</div><div class='del'>-{</div><div class='del'>-	if (bsize &lt; NFS_MIN_FILE_IO_SIZE)</div><div class='del'>-		bsize = NFS_DEF_FILE_IO_SIZE;</div><div class='del'>-	else if (bsize &gt;= NFS_MAX_FILE_IO_SIZE)</div><div class='del'>-		bsize = NFS_MAX_FILE_IO_SIZE;</div><div class='del'>-</div><div class='del'>-	return nfs_block_bits(bsize, nrbitsp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Obtain the root inode of the file system.</div><div class='del'>- */</div><div class='del'>-static struct inode *</div><div class='del'>-nfs_get_root(struct super_block *sb, struct nfs_fh *rootfh, struct nfs_fsinfo *fsinfo)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server	*server = NFS_SB(sb);</div><div class='del'>-	int			error;</div><div class='del'>-</div><div class='del'>-	error = server-&gt;rpc_ops-&gt;getroot(server, rootfh, fsinfo);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		dprintk("nfs_get_root: getattr error = %d\n", -error);</div><div class='del'>-		return ERR_PTR(error);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return nfs_fhget(sb, rootfh, fsinfo-&gt;fattr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do NFS version-independent mount processing, and sanity checking</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server	*server;</div><div class='del'>-	struct inode		*root_inode;</div><div class='del'>-	struct nfs_fattr	fattr;</div><div class='del'>-	struct nfs_fsinfo	fsinfo = {</div><div class='del'>-					.fattr = &amp;fattr,</div><div class='del'>-				};</div><div class='del'>-	struct nfs_pathconf pathinfo = {</div><div class='del'>-			.fattr = &amp;fattr,</div><div class='del'>-	};</div><div class='del'>-	int no_root_error = 0;</div><div class='del'>-	unsigned long max_rpc_payload;</div><div class='del'>-</div><div class='del'>-	/* We probably want something more informative here */</div><div class='del'>-	snprintf(sb-&gt;s_id, sizeof(sb-&gt;s_id), "%x:%x", MAJOR(sb-&gt;s_dev), MINOR(sb-&gt;s_dev));</div><div class='del'>-</div><div class='del'>-	server = NFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_magic      = NFS_SUPER_MAGIC;</div><div class='del'>-</div><div class='del'>-	server-&gt;io_stats = nfs_alloc_iostats();</div><div class='del'>-	if (server-&gt;io_stats == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	root_inode = nfs_get_root(sb, &amp;server-&gt;fh, &amp;fsinfo);</div><div class='del'>-	/* Did getting the root inode fail? */</div><div class='del'>-	if (IS_ERR(root_inode)) {</div><div class='del'>-		no_root_error = PTR_ERR(root_inode);</div><div class='del'>-		goto out_no_root;</div><div class='del'>-	}</div><div class='del'>-	sb-&gt;s_root = d_alloc_root(root_inode);</div><div class='del'>-	if (!sb-&gt;s_root) {</div><div class='del'>-		no_root_error = -ENOMEM;</div><div class='del'>-		goto out_no_root;</div><div class='del'>-	}</div><div class='del'>-	sb-&gt;s_root-&gt;d_op = server-&gt;rpc_ops-&gt;dentry_ops;</div><div class='del'>-</div><div class='del'>-	/* mount time stamp, in seconds */</div><div class='del'>-	server-&gt;mount_time = jiffies;</div><div class='del'>-</div><div class='del'>-	/* Get some general file system info */</div><div class='del'>-	if (server-&gt;namelen == 0 &amp;&amp;</div><div class='del'>-	    server-&gt;rpc_ops-&gt;pathconf(server, &amp;server-&gt;fh, &amp;pathinfo) &gt;= 0)</div><div class='del'>-		server-&gt;namelen = pathinfo.max_namelen;</div><div class='del'>-	/* Work out a lot of parameters */</div><div class='del'>-	if (server-&gt;rsize == 0)</div><div class='del'>-		server-&gt;rsize = nfs_block_size(fsinfo.rtpref, NULL);</div><div class='del'>-	if (server-&gt;wsize == 0)</div><div class='del'>-		server-&gt;wsize = nfs_block_size(fsinfo.wtpref, NULL);</div><div class='del'>-</div><div class='del'>-	if (fsinfo.rtmax &gt;= 512 &amp;&amp; server-&gt;rsize &gt; fsinfo.rtmax)</div><div class='del'>-		server-&gt;rsize = nfs_block_size(fsinfo.rtmax, NULL);</div><div class='del'>-	if (fsinfo.wtmax &gt;= 512 &amp;&amp; server-&gt;wsize &gt; fsinfo.wtmax)</div><div class='del'>-		server-&gt;wsize = nfs_block_size(fsinfo.wtmax, NULL);</div><div class='del'>-</div><div class='del'>-	max_rpc_payload = nfs_block_size(rpc_max_payload(server-&gt;client), NULL);</div><div class='del'>-	if (server-&gt;rsize &gt; max_rpc_payload)</div><div class='del'>-		server-&gt;rsize = max_rpc_payload;</div><div class='del'>-	if (server-&gt;rsize &gt; NFS_MAX_FILE_IO_SIZE)</div><div class='del'>-		server-&gt;rsize = NFS_MAX_FILE_IO_SIZE;</div><div class='del'>-	server-&gt;rpages = (server-&gt;rsize + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-</div><div class='del'>-	if (server-&gt;wsize &gt; max_rpc_payload)</div><div class='del'>-		server-&gt;wsize = max_rpc_payload;</div><div class='del'>-	if (server-&gt;wsize &gt; NFS_MAX_FILE_IO_SIZE)</div><div class='del'>-		server-&gt;wsize = NFS_MAX_FILE_IO_SIZE;</div><div class='del'>-	server-&gt;wpages = (server-&gt;wsize + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='del'>-</div><div class='del'>-	if (sb-&gt;s_blocksize == 0)</div><div class='del'>-		sb-&gt;s_blocksize = nfs_block_bits(server-&gt;wsize,</div><div class='del'>-							 &amp;sb-&gt;s_blocksize_bits);</div><div class='del'>-	server-&gt;wtmult = nfs_block_bits(fsinfo.wtmult, NULL);</div><div class='del'>-</div><div class='del'>-	server-&gt;dtsize = nfs_block_size(fsinfo.dtpref, NULL);</div><div class='del'>-	if (server-&gt;dtsize &gt; PAGE_CACHE_SIZE)</div><div class='del'>-		server-&gt;dtsize = PAGE_CACHE_SIZE;</div><div class='del'>-	if (server-&gt;dtsize &gt; server-&gt;rsize)</div><div class='del'>-		server-&gt;dtsize = server-&gt;rsize;</div><div class='del'>-</div><div class='del'>-	if (server-&gt;flags &amp; NFS_MOUNT_NOAC) {</div><div class='del'>-		server-&gt;acregmin = server-&gt;acregmax = 0;</div><div class='del'>-		server-&gt;acdirmin = server-&gt;acdirmax = 0;</div><div class='del'>-		sb-&gt;s_flags |= MS_SYNCHRONOUS;</div><div class='del'>-	}</div><div class='del'>-	server-&gt;backing_dev_info.ra_pages = server-&gt;rpages * NFS_MAX_READAHEAD;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_maxbytes = fsinfo.maxfilesize;</div><div class='del'>-	if (sb-&gt;s_maxbytes &gt; MAX_LFS_FILESIZE) </div><div class='del'>-		sb-&gt;s_maxbytes = MAX_LFS_FILESIZE; </div><div class='del'>-</div><div class='del'>-	server-&gt;client-&gt;cl_intr = (server-&gt;flags &amp; NFS_MOUNT_INTR) ? 1 : 0;</div><div class='del'>-	server-&gt;client-&gt;cl_softrtry = (server-&gt;flags &amp; NFS_MOUNT_SOFT) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	/* We're airborne Set socket buffersize */</div><div class='del'>-	rpc_setbufsize(server-&gt;client, server-&gt;wsize + 100, server-&gt;rsize + 100);</div><div class='del'>-	return 0;</div><div class='del'>-	/* Yargs. It didn't work out. */</div><div class='del'>-out_no_root:</div><div class='del'>-	dprintk("nfs_sb_init: get root inode failed: errno %d\n", -no_root_error);</div><div class='del'>-	if (!IS_ERR(root_inode))</div><div class='del'>-		iput(root_inode);</div><div class='del'>-	return no_root_error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfs_init_timeout_values(struct rpc_timeout *to, int proto, unsigned int timeo, unsigned int retrans)</div><div class='del'>-{</div><div class='del'>-	to-&gt;to_initval = timeo * HZ / 10;</div><div class='del'>-	to-&gt;to_retries = retrans;</div><div class='del'>-	if (!to-&gt;to_retries)</div><div class='del'>-		to-&gt;to_retries = 2;</div><div class='del'>-</div><div class='del'>-	switch (proto) {</div><div class='del'>-	case IPPROTO_TCP:</div><div class='del'>-		if (!to-&gt;to_initval)</div><div class='del'>-			to-&gt;to_initval = 60 * HZ;</div><div class='del'>-		if (to-&gt;to_initval &gt; NFS_MAX_TCP_TIMEOUT)</div><div class='del'>-			to-&gt;to_initval = NFS_MAX_TCP_TIMEOUT;</div><div class='del'>-		to-&gt;to_increment = to-&gt;to_initval;</div><div class='del'>-		to-&gt;to_maxval = to-&gt;to_initval + (to-&gt;to_increment * to-&gt;to_retries);</div><div class='del'>-		to-&gt;to_exponential = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IPPROTO_UDP:</div><div class='del'>-	default:</div><div class='del'>-		if (!to-&gt;to_initval)</div><div class='del'>-			to-&gt;to_initval = 11 * HZ / 10;</div><div class='del'>-		if (to-&gt;to_initval &gt; NFS_MAX_UDP_TIMEOUT)</div><div class='del'>-			to-&gt;to_initval = NFS_MAX_UDP_TIMEOUT;</div><div class='del'>-		to-&gt;to_maxval = NFS_MAX_UDP_TIMEOUT;</div><div class='del'>-		to-&gt;to_exponential = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create an RPC client handle.</div><div class='del'>- */</div><div class='del'>-static struct rpc_clnt *</div><div class='del'>-nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)</div><div class='del'>-{</div><div class='del'>-	struct rpc_timeout	timeparms;</div><div class='del'>-	struct rpc_xprt		*xprt = NULL;</div><div class='del'>-	struct rpc_clnt		*clnt = NULL;</div><div class='del'>-	int			proto = (data-&gt;flags &amp; NFS_MOUNT_TCP) ? IPPROTO_TCP : IPPROTO_UDP;</div><div class='del'>-</div><div class='del'>-	nfs_init_timeout_values(&amp;timeparms, proto, data-&gt;timeo, data-&gt;retrans);</div><div class='del'>-</div><div class='del'>-	server-&gt;retrans_timeo = timeparms.to_initval;</div><div class='del'>-	server-&gt;retrans_count = timeparms.to_retries;</div><div class='del'>-</div><div class='del'>-	/* create transport and client */</div><div class='del'>-	xprt = xprt_create_proto(proto, &amp;server-&gt;addr, &amp;timeparms);</div><div class='del'>-	if (IS_ERR(xprt)) {</div><div class='del'>-		dprintk("%s: cannot create RPC transport. Error = %ld\n",</div><div class='del'>-				__FUNCTION__, PTR_ERR(xprt));</div><div class='del'>-		return (struct rpc_clnt *)xprt;</div><div class='del'>-	}</div><div class='del'>-	clnt = rpc_create_client(xprt, server-&gt;hostname, &amp;nfs_program,</div><div class='del'>-				 server-&gt;rpc_ops-&gt;version, data-&gt;pseudoflavor);</div><div class='del'>-	if (IS_ERR(clnt)) {</div><div class='del'>-		dprintk("%s: cannot create RPC client. Error = %ld\n",</div><div class='del'>-				__FUNCTION__, PTR_ERR(xprt));</div><div class='del'>-		goto out_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	clnt-&gt;cl_intr     = 1;</div><div class='del'>-	clnt-&gt;cl_softrtry = 1;</div><div class='del'>-</div><div class='del'>-	return clnt;</div><div class='del'>-</div><div class='del'>-out_fail:</div><div class='del'>-	return clnt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The way this works is that the mount process passes a structure</div><div class='del'>- * in the data argument which contains the server's IP address</div><div class='del'>- * and the root file handle obtained from the server's mount</div><div class='del'>- * daemon. We stash these away in the private superblock fields.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-nfs_fill_super(struct super_block *sb, struct nfs_mount_data *data, int silent)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server	*server;</div><div class='del'>-	rpc_authflavor_t	authflavor;</div><div class='del'>-</div><div class='del'>-	server           = NFS_SB(sb);</div><div class='del'>-	sb-&gt;s_blocksize_bits = 0;</div><div class='del'>-	sb-&gt;s_blocksize = 0;</div><div class='del'>-	if (data-&gt;bsize)</div><div class='del'>-		sb-&gt;s_blocksize = nfs_block_size(data-&gt;bsize, &amp;sb-&gt;s_blocksize_bits);</div><div class='del'>-	if (data-&gt;rsize)</div><div class='del'>-		server-&gt;rsize = nfs_block_size(data-&gt;rsize, NULL);</div><div class='del'>-	if (data-&gt;wsize)</div><div class='del'>-		server-&gt;wsize = nfs_block_size(data-&gt;wsize, NULL);</div><div class='del'>-	server-&gt;flags    = data-&gt;flags &amp; NFS_MOUNT_FLAGMASK;</div><div class='del'>-</div><div class='del'>-	server-&gt;acregmin = data-&gt;acregmin*HZ;</div><div class='del'>-	server-&gt;acregmax = data-&gt;acregmax*HZ;</div><div class='del'>-	server-&gt;acdirmin = data-&gt;acdirmin*HZ;</div><div class='del'>-	server-&gt;acdirmax = data-&gt;acdirmax*HZ;</div><div class='del'>-</div><div class='del'>-	/* Start lockd here, before we might error out */</div><div class='del'>-	if (!(server-&gt;flags &amp; NFS_MOUNT_NONLM))</div><div class='del'>-		lockd_up();</div><div class='del'>-</div><div class='del'>-	server-&gt;namelen  = data-&gt;namlen;</div><div class='del'>-	server-&gt;hostname = kmalloc(strlen(data-&gt;hostname) + 1, GFP_KERNEL);</div><div class='del'>-	if (!server-&gt;hostname)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	strcpy(server-&gt;hostname, data-&gt;hostname);</div><div class='del'>-</div><div class='del'>-	/* Check NFS protocol revision and initialize RPC op vector</div><div class='del'>-	 * and file handle pool. */</div><div class='del'>-#ifdef CONFIG_NFS_V3</div><div class='del'>-	if (server-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='del'>-		server-&gt;rpc_ops = &amp;nfs_v3_clientops;</div><div class='del'>-		server-&gt;caps |= NFS_CAP_READDIRPLUS;</div><div class='del'>-	} else {</div><div class='del'>-		server-&gt;rpc_ops = &amp;nfs_v2_clientops;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	server-&gt;rpc_ops = &amp;nfs_v2_clientops;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Fill in pseudoflavor for mount version &lt; 5 */</div><div class='del'>-	if (!(data-&gt;flags &amp; NFS_MOUNT_SECFLAVOUR))</div><div class='del'>-		data-&gt;pseudoflavor = RPC_AUTH_UNIX;</div><div class='del'>-	authflavor = data-&gt;pseudoflavor;	/* save for sb_init() */</div><div class='del'>-	/* XXX maybe we want to add a server-&gt;pseudoflavor field */</div><div class='del'>-</div><div class='del'>-	/* Create RPC client handles */</div><div class='del'>-	server-&gt;client = nfs_create_client(server, data);</div><div class='del'>-	if (IS_ERR(server-&gt;client))</div><div class='del'>-		return PTR_ERR(server-&gt;client);</div><div class='del'>-	/* RFC 2623, sec 2.3.2 */</div><div class='del'>-	if (authflavor != RPC_AUTH_UNIX) {</div><div class='del'>-		struct rpc_auth *auth;</div><div class='del'>-</div><div class='del'>-		server-&gt;client_sys = rpc_clone_client(server-&gt;client);</div><div class='del'>-		if (IS_ERR(server-&gt;client_sys))</div><div class='del'>-			return PTR_ERR(server-&gt;client_sys);</div><div class='del'>-		auth = rpcauth_create(RPC_AUTH_UNIX, server-&gt;client_sys);</div><div class='del'>-		if (IS_ERR(auth))</div><div class='del'>-			return PTR_ERR(auth);</div><div class='del'>-	} else {</div><div class='del'>-		atomic_inc(&amp;server-&gt;client-&gt;cl_count);</div><div class='del'>-		server-&gt;client_sys = server-&gt;client;</div><div class='del'>-	}</div><div class='del'>-	if (server-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='del'>-#ifdef CONFIG_NFS_V3_ACL</div><div class='del'>-		if (!(server-&gt;flags &amp; NFS_MOUNT_NOACL)) {</div><div class='del'>-			server-&gt;client_acl = rpc_bind_new_program(server-&gt;client, &amp;nfsacl_program, 3);</div><div class='del'>-			/* No errors! Assume that Sun nfsacls are supported */</div><div class='del'>-			if (!IS_ERR(server-&gt;client_acl))</div><div class='del'>-				server-&gt;caps |= NFS_CAP_ACLS;</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		server-&gt;flags &amp;= ~NFS_MOUNT_NOACL;</div><div class='del'>-#endif /* CONFIG_NFS_V3_ACL */</div><div class='del'>-		/*</div><div class='del'>-		 * The VFS shouldn't apply the umask to mode bits. We will</div><div class='del'>-		 * do so ourselves when necessary.</div><div class='del'>-		 */</div><div class='del'>-		sb-&gt;s_flags |= MS_POSIXACL;</div><div class='del'>-		if (server-&gt;namelen == 0 || server-&gt;namelen &gt; NFS3_MAXNAMLEN)</div><div class='del'>-			server-&gt;namelen = NFS3_MAXNAMLEN;</div><div class='del'>-		sb-&gt;s_time_gran = 1;</div><div class='del'>-	} else {</div><div class='del'>-		if (server-&gt;namelen == 0 || server-&gt;namelen &gt; NFS2_MAXNAMLEN)</div><div class='del'>-			server-&gt;namelen = NFS2_MAXNAMLEN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_op = &amp;nfs_sops;</div><div class='del'>-	return nfs_sb_init(sb, authflavor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-nfs_statfs(struct super_block *sb, struct kstatfs *buf)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *server = NFS_SB(sb);</div><div class='del'>-	unsigned char blockbits;</div><div class='del'>-	unsigned long blockres;</div><div class='del'>-	struct nfs_fh *rootfh = NFS_FH(sb-&gt;s_root-&gt;d_inode);</div><div class='del'>-	struct nfs_fattr fattr;</div><div class='del'>-	struct nfs_fsstat res = {</div><div class='del'>-			.fattr = &amp;fattr,</div><div class='del'>-	};</div><div class='del'>-	int error;</div><div class='del'>-</div><div class='del'>-	lock_kernel();</div><div class='del'>-</div><div class='del'>-	error = server-&gt;rpc_ops-&gt;statfs(server, rootfh, &amp;res);</div><div class='del'>-	buf-&gt;f_type = NFS_SUPER_MAGIC;</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Current versions of glibc do not correctly handle the</div><div class='del'>-	 * case where f_frsize != f_bsize.  Eventually we want to</div><div class='del'>-	 * report the value of wtmult in this field.</div><div class='del'>-	 */</div><div class='del'>-	buf-&gt;f_frsize = sb-&gt;s_blocksize;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * On most *nix systems, f_blocks, f_bfree, and f_bavail</div><div class='del'>-	 * are reported in units of f_frsize.  Linux hasn't had</div><div class='del'>-	 * an f_frsize field in its statfs struct until recently,</div><div class='del'>-	 * thus historically Linux's sys_statfs reports these</div><div class='del'>-	 * fields in units of f_bsize.</div><div class='del'>-	 */</div><div class='del'>-	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='del'>-	blockbits = sb-&gt;s_blocksize_bits;</div><div class='del'>-	blockres = (1 &lt;&lt; blockbits) - 1;</div><div class='del'>-	buf-&gt;f_blocks = (res.tbytes + blockres) &gt;&gt; blockbits;</div><div class='del'>-	buf-&gt;f_bfree = (res.fbytes + blockres) &gt;&gt; blockbits;</div><div class='del'>-	buf-&gt;f_bavail = (res.abytes + blockres) &gt;&gt; blockbits;</div><div class='del'>-</div><div class='del'>-	buf-&gt;f_files = res.tfiles;</div><div class='del'>-	buf-&gt;f_ffree = res.afiles;</div><div class='del'>-</div><div class='del'>-	buf-&gt;f_namelen = server-&gt;namelen;</div><div class='del'>- out:</div><div class='del'>-	unlock_kernel();</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- out_err:</div><div class='del'>-	dprintk("%s: statfs error = %d\n", __FUNCTION__, -error);</div><div class='del'>-	buf-&gt;f_bsize = buf-&gt;f_blocks = buf-&gt;f_bfree = buf-&gt;f_bavail = -1;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, int showdefaults)</div><div class='del'>-{</div><div class='del'>-	static struct proc_nfs_info {</div><div class='del'>-		int flag;</div><div class='del'>-		char *str;</div><div class='del'>-		char *nostr;</div><div class='del'>-	} nfs_info[] = {</div><div class='del'>-		{ NFS_MOUNT_SOFT, ",soft", ",hard" },</div><div class='del'>-		{ NFS_MOUNT_INTR, ",intr", "" },</div><div class='del'>-		{ NFS_MOUNT_NOCTO, ",nocto", "" },</div><div class='del'>-		{ NFS_MOUNT_NOAC, ",noac", "" },</div><div class='del'>-		{ NFS_MOUNT_NONLM, ",nolock", "" },</div><div class='del'>-		{ NFS_MOUNT_NOACL, ",noacl", "" },</div><div class='del'>-		{ 0, NULL, NULL }</div><div class='del'>-	};</div><div class='del'>-	struct proc_nfs_info *nfs_infop;</div><div class='del'>-	char buf[12];</div><div class='del'>-	char *proto;</div><div class='del'>-</div><div class='del'>-	seq_printf(m, ",vers=%d", nfss-&gt;rpc_ops-&gt;version);</div><div class='del'>-	seq_printf(m, ",rsize=%d", nfss-&gt;rsize);</div><div class='del'>-	seq_printf(m, ",wsize=%d", nfss-&gt;wsize);</div><div class='del'>-	if (nfss-&gt;acregmin != 3*HZ || showdefaults)</div><div class='del'>-		seq_printf(m, ",acregmin=%d", nfss-&gt;acregmin/HZ);</div><div class='del'>-	if (nfss-&gt;acregmax != 60*HZ || showdefaults)</div><div class='del'>-		seq_printf(m, ",acregmax=%d", nfss-&gt;acregmax/HZ);</div><div class='del'>-	if (nfss-&gt;acdirmin != 30*HZ || showdefaults)</div><div class='del'>-		seq_printf(m, ",acdirmin=%d", nfss-&gt;acdirmin/HZ);</div><div class='del'>-	if (nfss-&gt;acdirmax != 60*HZ || showdefaults)</div><div class='del'>-		seq_printf(m, ",acdirmax=%d", nfss-&gt;acdirmax/HZ);</div><div class='del'>-	for (nfs_infop = nfs_info; nfs_infop-&gt;flag; nfs_infop++) {</div><div class='del'>-		if (nfss-&gt;flags &amp; nfs_infop-&gt;flag)</div><div class='del'>-			seq_puts(m, nfs_infop-&gt;str);</div><div class='del'>-		else</div><div class='del'>-			seq_puts(m, nfs_infop-&gt;nostr);</div><div class='del'>-	}</div><div class='del'>-	switch (nfss-&gt;client-&gt;cl_xprt-&gt;prot) {</div><div class='del'>-		case IPPROTO_TCP:</div><div class='del'>-			proto = "tcp";</div><div class='del'>-			break;</div><div class='del'>-		case IPPROTO_UDP:</div><div class='del'>-			proto = "udp";</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			snprintf(buf, sizeof(buf), "%u", nfss-&gt;client-&gt;cl_xprt-&gt;prot);</div><div class='del'>-			proto = buf;</div><div class='del'>-	}</div><div class='del'>-	seq_printf(m, ",proto=%s", proto);</div><div class='del'>-	seq_printf(m, ",timeo=%lu", 10U * nfss-&gt;retrans_timeo / HZ);</div><div class='del'>-	seq_printf(m, ",retrans=%u", nfss-&gt;retrans_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *nfss = NFS_SB(mnt-&gt;mnt_sb);</div><div class='del'>-</div><div class='del'>-	nfs_show_mount_options(m, nfss, 0);</div><div class='del'>-</div><div class='del'>-	seq_puts(m, ",addr=");</div><div class='del'>-	seq_escape(m, nfss-&gt;hostname, " \t\n\\");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)</div><div class='del'>-{</div><div class='del'>-	int i, cpu;</div><div class='del'>-	struct nfs_server *nfss = NFS_SB(mnt-&gt;mnt_sb);</div><div class='del'>-	struct rpc_auth *auth = nfss-&gt;client-&gt;cl_auth;</div><div class='del'>-	struct nfs_iostats totals = { };</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "statvers=%s", NFS_IOSTAT_VERS);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Display all mount option settings</div><div class='del'>-	 */</div><div class='del'>-	seq_printf(m, "\n\topts:\t");</div><div class='del'>-	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_RDONLY ? "ro" : "rw");</div><div class='del'>-	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_SYNCHRONOUS ? ",sync" : "");</div><div class='del'>-	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_NOATIME ? ",noatime" : "");</div><div class='del'>-	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_NODIRATIME ? ",nodiratime" : "");</div><div class='del'>-	nfs_show_mount_options(m, nfss, 1);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\n\tage:\t%lu", (jiffies - nfss-&gt;mount_time) / HZ);</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\n\tcaps:\t");</div><div class='del'>-	seq_printf(m, "caps=0x%x", nfss-&gt;caps);</div><div class='del'>-	seq_printf(m, ",wtmult=%d", nfss-&gt;wtmult);</div><div class='del'>-	seq_printf(m, ",dtsize=%d", nfss-&gt;dtsize);</div><div class='del'>-	seq_printf(m, ",bsize=%d", nfss-&gt;bsize);</div><div class='del'>-	seq_printf(m, ",namelen=%d", nfss-&gt;namelen);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NFS_V4</div><div class='del'>-	if (nfss-&gt;rpc_ops-&gt;version == 4) {</div><div class='del'>-		seq_printf(m, "\n\tnfsv4:\t");</div><div class='del'>-		seq_printf(m, "bm0=0x%x", nfss-&gt;attr_bitmask[0]);</div><div class='del'>-		seq_printf(m, ",bm1=0x%x", nfss-&gt;attr_bitmask[1]);</div><div class='del'>-		seq_printf(m, ",acl=0x%x", nfss-&gt;acl_bitmask);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Display security flavor in effect for this mount</div><div class='del'>-	 */</div><div class='del'>-	seq_printf(m, "\n\tsec:\tflavor=%d", auth-&gt;au_ops-&gt;au_flavor);</div><div class='del'>-	if (auth-&gt;au_flavor)</div><div class='del'>-		seq_printf(m, ",pseudoflavor=%d", auth-&gt;au_flavor);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Display superblock I/O counters</div><div class='del'>-	 */</div><div class='del'>-	for_each_possible_cpu(cpu) {</div><div class='del'>-		struct nfs_iostats *stats;</div><div class='del'>-</div><div class='del'>-		preempt_disable();</div><div class='del'>-		stats = per_cpu_ptr(nfss-&gt;io_stats, cpu);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; __NFSIOS_COUNTSMAX; i++)</div><div class='del'>-			totals.events[i] += stats-&gt;events[i];</div><div class='del'>-		for (i = 0; i &lt; __NFSIOS_BYTESMAX; i++)</div><div class='del'>-			totals.bytes[i] += stats-&gt;bytes[i];</div><div class='del'>-</div><div class='del'>-		preempt_enable();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_printf(m, "\n\tevents:\t");</div><div class='del'>-	for (i = 0; i &lt; __NFSIOS_COUNTSMAX; i++)</div><div class='del'>-		seq_printf(m, "%lu ", totals.events[i]);</div><div class='del'>-	seq_printf(m, "\n\tbytes:\t");</div><div class='del'>-	for (i = 0; i &lt; __NFSIOS_BYTESMAX; i++)</div><div class='del'>-		seq_printf(m, "%Lu ", totals.bytes[i]);</div><div class='del'>-	seq_printf(m, "\n");</div><div class='del'>-</div><div class='del'>-	rpc_print_iostats(m, nfss-&gt;client);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * nfs_sync_mapping - helper to flush all mmapped dirty data to disk</div><div class='ctx'>  */</div><div class='hunk'>@@ -889,6 +253,14 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)</div><div class='ctx'> 			if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS)</div><div class='ctx'> 			    &amp;&amp; fattr-&gt;size &lt;= NFS_LIMIT_READDIRPLUS)</div><div class='ctx'> 				set_bit(NFS_INO_ADVISE_RDPLUS, &amp;NFS_FLAGS(inode));</div><div class='add'>+			/* Deal with crossing mountpoints */</div><div class='add'>+			if (!nfs_fsid_equal(&amp;NFS_SB(sb)-&gt;fsid, &amp;fattr-&gt;fsid)) {</div><div class='add'>+				if (fattr-&gt;valid &amp; NFS_ATTR_FATTR_V4_REFERRAL)</div><div class='add'>+					inode-&gt;i_op = &amp;nfs_referral_inode_operations;</div><div class='add'>+				else</div><div class='add'>+					inode-&gt;i_op = &amp;nfs_mountpoint_inode_operations;</div><div class='add'>+				inode-&gt;i_fop = NULL;</div><div class='add'>+			}</div><div class='ctx'> 		} else if (S_ISLNK(inode-&gt;i_mode))</div><div class='ctx'> 			inode-&gt;i_op = &amp;nfs_symlink_inode_operations;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1207,6 +579,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)</div><div class='ctx'> 	dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n",</div><div class='ctx'> 		inode-&gt;i_sb-&gt;s_id, (long long)NFS_FILEID(inode));</div><div class='ctx'> </div><div class='add'>+	nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);</div><div class='ctx'> 	lock_kernel();</div><div class='ctx'> 	if (!inode || is_bad_inode(inode))</div><div class='ctx'>  		goto out_nowait;</div><div class='hunk'>@@ -1220,7 +593,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)</div><div class='ctx'> 		status = -ESTALE;</div><div class='ctx'> 		/* Do we trust the cached ESTALE? */</div><div class='ctx'> 		if (NFS_ATTRTIMEO(inode) != 0) {</div><div class='del'>-			if (nfsi-&gt;cache_validity &amp; (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ATIME)) {</div><div class='add'>+			if (nfsi-&gt;cache_validity &amp; (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME)) {</div><div class='ctx'> 				/* no */</div><div class='ctx'> 			} else</div><div class='ctx'> 				goto out;</div><div class='hunk'>@@ -1251,8 +624,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='del'>-	nfs_revalidate_mapping(inode, inode-&gt;i_mapping);</div><div class='del'>-</div><div class='ctx'> 	if (nfsi-&gt;cache_validity &amp; NFS_INO_INVALID_ACL)</div><div class='ctx'> 		nfs_zap_acl_cache(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -1286,8 +657,7 @@ int nfs_attribute_timeout(struct inode *inode)</div><div class='ctx'>  */</div><div class='ctx'> int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)</div><div class='ctx'> {</div><div class='del'>-	nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);</div><div class='del'>-	if (!(NFS_I(inode)-&gt;cache_validity &amp; (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA))</div><div class='add'>+	if (!(NFS_I(inode)-&gt;cache_validity &amp; NFS_INO_INVALID_ATTR)</div><div class='ctx'> 			&amp;&amp; !nfs_attribute_timeout(inode))</div><div class='ctx'> 		return NFS_STALE(inode) ? -ESTALE : 0;</div><div class='ctx'> 	return __nfs_revalidate_inode(server, inode);</div><div class='hunk'>@@ -1298,9 +668,16 @@ int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)</div><div class='ctx'>  * @inode - pointer to host inode</div><div class='ctx'>  * @mapping - pointer to mapping</div><div class='ctx'>  */</div><div class='del'>-void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)</div><div class='add'>+int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (NFS_STALE(inode))</div><div class='add'>+		ret = -ESTALE;</div><div class='add'>+	if ((nfsi-&gt;cache_validity &amp; NFS_INO_REVAL_PAGECACHE)</div><div class='add'>+			|| nfs_attribute_timeout(inode))</div><div class='add'>+		ret = __nfs_revalidate_inode(NFS_SERVER(inode), inode);</div><div class='ctx'> </div><div class='ctx'> 	if (nfsi-&gt;cache_validity &amp; NFS_INO_INVALID_DATA) {</div><div class='ctx'> 		nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);</div><div class='hunk'>@@ -1321,6 +698,7 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)</div><div class='ctx'> 				inode-&gt;i_sb-&gt;s_id,</div><div class='ctx'> 				(long long)NFS_FILEID(inode));</div><div class='ctx'> 	}</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1360,12 +738,6 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> </div><div class='del'>-	if ((fattr-&gt;valid &amp; NFS_ATTR_PRE_CHANGE) != 0</div><div class='del'>-			&amp;&amp; nfsi-&gt;change_attr == fattr-&gt;pre_change_attr) {</div><div class='del'>-		nfsi-&gt;change_attr = fattr-&gt;change_attr;</div><div class='del'>-		nfsi-&gt;cache_change_attribute = jiffies;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* If we have atomic WCC data, we may update some attributes */</div><div class='ctx'> 	if ((fattr-&gt;valid &amp; NFS_ATTR_WCC) != 0) {</div><div class='ctx'> 		if (timespec_equal(&amp;inode-&gt;i_ctime, &amp;fattr-&gt;pre_ctime)) {</div><div class='hunk'>@@ -1399,9 +771,6 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat</div><div class='ctx'> 	int data_unstable;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* Has the inode gone and changed behind our back? */</div><div class='ctx'> 	if (nfsi-&gt;fileid != fattr-&gt;fileid</div><div class='ctx'> 			|| (inode-&gt;i_mode &amp; S_IFMT) != (fattr-&gt;mode &amp; S_IFMT)) {</div><div class='hunk'>@@ -1414,20 +783,13 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat</div><div class='ctx'> 	/* Do atomic weak cache consistency updates */</div><div class='ctx'> 	nfs_wcc_update_inode(inode, fattr);</div><div class='ctx'> </div><div class='del'>-	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR_V4) != 0) {</div><div class='del'>-		if (nfsi-&gt;change_attr == fattr-&gt;change_attr)</div><div class='del'>-			goto out;</div><div class='del'>-		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR;</div><div class='del'>-		if (!data_unstable)</div><div class='del'>-			nfsi-&gt;cache_validity |= NFS_INO_REVAL_PAGECACHE;</div><div class='del'>-	}</div><div class='add'>+	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR_V4) != 0 &amp;&amp;</div><div class='add'>+			nfsi-&gt;change_attr != fattr-&gt;change_attr)</div><div class='add'>+		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;</div><div class='ctx'> </div><div class='ctx'> 	/* Verify a few of the more important attributes */</div><div class='del'>-	if (!timespec_equal(&amp;inode-&gt;i_mtime, &amp;fattr-&gt;mtime)) {</div><div class='del'>-		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR;</div><div class='del'>-		if (!data_unstable)</div><div class='del'>-			nfsi-&gt;cache_validity |= NFS_INO_REVAL_PAGECACHE;</div><div class='del'>-	}</div><div class='add'>+	if (!timespec_equal(&amp;inode-&gt;i_mtime, &amp;fattr-&gt;mtime))</div><div class='add'>+		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;</div><div class='ctx'> </div><div class='ctx'> 	cur_size = i_size_read(inode);</div><div class='ctx'>  	new_isize = nfs_size_to_loff_t(fattr-&gt;size);</div><div class='hunk'>@@ -1444,7 +806,6 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat</div><div class='ctx'> 	if (inode-&gt;i_nlink != fattr-&gt;nlink)</div><div class='ctx'> 		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='ctx'> 	if (!timespec_equal(&amp;inode-&gt;i_atime, &amp;fattr-&gt;atime))</div><div class='ctx'> 		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATIME;</div><div class='ctx'> </div><div class='hunk'>@@ -1470,7 +831,6 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR) == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	nfsi-&gt;cache_validity &amp;= ~NFS_INO_REVAL_PAGECACHE;</div><div class='ctx'> 	if (time_after(fattr-&gt;time_start, nfsi-&gt;last_updated))</div><div class='ctx'> 		status = nfs_update_inode(inode, fattr);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1495,7 +855,7 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	if (unlikely((fattr-&gt;valid &amp; NFS_ATTR_FATTR) == 0)) {</div><div class='del'>-		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;</div><div class='add'>+		nfsi-&gt;cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	status = nfs_update_inode(inode, fattr);</div><div class='hunk'>@@ -1518,6 +878,7 @@ out:</div><div class='ctx'>  */</div><div class='ctx'> static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='add'>+	struct nfs_server *server;</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> 	loff_t cur_isize, new_isize;</div><div class='ctx'> 	unsigned int	invalid = 0;</div><div class='hunk'>@@ -1527,9 +888,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 			__FUNCTION__, inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino,</div><div class='ctx'> 			atomic_read(&amp;inode-&gt;i_count), fattr-&gt;valid);</div><div class='ctx'> </div><div class='del'>-	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	if (nfsi-&gt;fileid != fattr-&gt;fileid)</div><div class='ctx'> 		goto out_fileid;</div><div class='ctx'> </div><div class='hunk'>@@ -1539,6 +897,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 	if ((inode-&gt;i_mode &amp; S_IFMT) != (fattr-&gt;mode &amp; S_IFMT))</div><div class='ctx'> 		goto out_changed;</div><div class='ctx'> </div><div class='add'>+	server = NFS_SERVER(inode);</div><div class='add'>+	/* Update the fsid if and only if this is the root directory */</div><div class='add'>+	if (inode == inode-&gt;i_sb-&gt;s_root-&gt;d_inode</div><div class='add'>+			&amp;&amp; !nfs_fsid_equal(&amp;server-&gt;fsid, &amp;fattr-&gt;fsid))</div><div class='add'>+		server-&gt;fsid = fattr-&gt;fsid;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Update the read time so we don't revalidate too often.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1548,7 +912,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 	/* Are we racing with known updates of the metadata on the server? */</div><div class='ctx'> 	data_stable = nfs_verify_change_attribute(inode, fattr-&gt;time_start);</div><div class='ctx'> 	if (data_stable)</div><div class='del'>-		nfsi-&gt;cache_validity &amp;= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME);</div><div class='add'>+		nfsi-&gt;cache_validity &amp;= ~(NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_ATIME);</div><div class='ctx'> </div><div class='ctx'> 	/* Do atomic weak cache consistency updates */</div><div class='ctx'> 	nfs_wcc_update_inode(inode, fattr);</div><div class='hunk'>@@ -1612,15 +976,13 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'>  		inode-&gt;i_blksize = fattr-&gt;du.nfs2.blocksize;</div><div class='ctx'>  	}</div><div class='ctx'> </div><div class='del'>-	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR_V4)) {</div><div class='del'>-		if (nfsi-&gt;change_attr != fattr-&gt;change_attr) {</div><div class='del'>-			dprintk("NFS: change_attr change on server for file %s/%ld\n",</div><div class='del'>-					inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino);</div><div class='del'>-			nfsi-&gt;change_attr = fattr-&gt;change_attr;</div><div class='del'>-			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;</div><div class='del'>-			nfsi-&gt;cache_change_attribute = jiffies;</div><div class='del'>-		} else</div><div class='del'>-			invalid &amp;= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA);</div><div class='add'>+	if ((fattr-&gt;valid &amp; NFS_ATTR_FATTR_V4) != 0 &amp;&amp;</div><div class='add'>+			nfsi-&gt;change_attr != fattr-&gt;change_attr) {</div><div class='add'>+		dprintk("NFS: change_attr change on server for file %s/%ld\n",</div><div class='add'>+				inode-&gt;i_sb-&gt;s_id, inode-&gt;i_ino);</div><div class='add'>+		nfsi-&gt;change_attr = fattr-&gt;change_attr;</div><div class='add'>+		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;</div><div class='add'>+		nfsi-&gt;cache_change_attribute = jiffies;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Update attrtimeo value if we're out of the unstable period */</div><div class='hunk'>@@ -1668,190 +1030,15 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)</div><div class='ctx'> 	goto out_err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * File system information</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int nfs_set_super(struct super_block *s, void *data)</div><div class='del'>-{</div><div class='del'>-	s-&gt;s_fs_info = data;</div><div class='del'>-	return set_anon_super(s, data);</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-static int nfs_compare_super(struct super_block *sb, void *data)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *server = data;</div><div class='del'>-	struct nfs_server *old = NFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	if (old-&gt;addr.sin_addr.s_addr != server-&gt;addr.sin_addr.s_addr)</div><div class='del'>-		return 0;</div><div class='del'>-	if (old-&gt;addr.sin_port != server-&gt;addr.sin_port)</div><div class='del'>-		return 0;</div><div class='del'>-	return !nfs_compare_fh(&amp;old-&gt;fh, &amp;server-&gt;fh);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct super_block *nfs_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *raw_data)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	struct nfs_server *server = NULL;</div><div class='del'>-	struct super_block *s;</div><div class='del'>-	struct nfs_fh *root;</div><div class='del'>-	struct nfs_mount_data *data = raw_data;</div><div class='del'>-</div><div class='del'>-	s = ERR_PTR(-EINVAL);</div><div class='del'>-	if (data == NULL) {</div><div class='del'>-		dprintk("%s: missing data argument\n", __FUNCTION__);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	if (data-&gt;version &lt;= 0 || data-&gt;version &gt; NFS_MOUNT_VERSION) {</div><div class='del'>-		dprintk("%s: bad mount version\n", __FUNCTION__);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	switch (data-&gt;version) {</div><div class='del'>-		case 1:</div><div class='del'>-			data-&gt;namlen = 0;</div><div class='del'>-		case 2:</div><div class='del'>-			data-&gt;bsize  = 0;</div><div class='del'>-		case 3:</div><div class='del'>-			if (data-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='del'>-				dprintk("%s: mount structure version %d does not support NFSv3\n",</div><div class='del'>-						__FUNCTION__,</div><div class='del'>-						data-&gt;version);</div><div class='del'>-				goto out_err;</div><div class='del'>-			}</div><div class='del'>-			data-&gt;root.size = NFS2_FHSIZE;</div><div class='del'>-			memcpy(data-&gt;root.data, data-&gt;old_root.data, NFS2_FHSIZE);</div><div class='del'>-		case 4:</div><div class='del'>-			if (data-&gt;flags &amp; NFS_MOUNT_SECFLAVOUR) {</div><div class='del'>-				dprintk("%s: mount structure version %d does not support strong security\n",</div><div class='del'>-						__FUNCTION__,</div><div class='del'>-						data-&gt;version);</div><div class='del'>-				goto out_err;</div><div class='del'>-			}</div><div class='del'>-		case 5:</div><div class='del'>-			memset(data-&gt;context, 0, sizeof(data-&gt;context));</div><div class='del'>-	}</div><div class='del'>-#ifndef CONFIG_NFS_V3</div><div class='del'>-	/* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */</div><div class='del'>-	s = ERR_PTR(-EPROTONOSUPPORT);</div><div class='del'>-	if (data-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='del'>-		dprintk("%s: NFSv3 not compiled into kernel\n", __FUNCTION__);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_NFS_V3 */</div><div class='del'>-</div><div class='del'>-	s = ERR_PTR(-ENOMEM);</div><div class='del'>-	server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);</div><div class='del'>-	if (!server)</div><div class='del'>-		goto out_err;</div><div class='del'>-	/* Zero out the NFS state stuff */</div><div class='del'>-	init_nfsv4_state(server);</div><div class='del'>-	server-&gt;client = server-&gt;client_sys = server-&gt;client_acl = ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	root = &amp;server-&gt;fh;</div><div class='del'>-	if (data-&gt;flags &amp; NFS_MOUNT_VER3)</div><div class='del'>-		root-&gt;size = data-&gt;root.size;</div><div class='del'>-	else</div><div class='del'>-		root-&gt;size = NFS2_FHSIZE;</div><div class='del'>-	s = ERR_PTR(-EINVAL);</div><div class='del'>-	if (root-&gt;size &gt; sizeof(root-&gt;data)) {</div><div class='del'>-		dprintk("%s: invalid root filehandle\n", __FUNCTION__);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	memcpy(root-&gt;data, data-&gt;root.data, root-&gt;size);</div><div class='del'>-</div><div class='del'>-	/* We now require that the mount process passes the remote address */</div><div class='del'>-	memcpy(&amp;server-&gt;addr, &amp;data-&gt;addr, sizeof(server-&gt;addr));</div><div class='del'>-	if (server-&gt;addr.sin_addr.s_addr == INADDR_ANY) {</div><div class='del'>-		dprintk("%s: mount program didn't pass remote address!\n",</div><div class='del'>-				__FUNCTION__);</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fire up rpciod if not yet running */</div><div class='del'>-	s = ERR_PTR(rpciod_up());</div><div class='del'>-	if (IS_ERR(s)) {</div><div class='del'>-		dprintk("%s: couldn't start rpciod! Error = %ld\n",</div><div class='del'>-				__FUNCTION__, PTR_ERR(s));</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = sget(fs_type, nfs_compare_super, nfs_set_super, server);</div><div class='del'>-	if (IS_ERR(s) || s-&gt;s_root)</div><div class='del'>-		goto out_rpciod_down;</div><div class='del'>-</div><div class='del'>-	s-&gt;s_flags = flags;</div><div class='del'>-</div><div class='del'>-	error = nfs_fill_super(s, data, flags &amp; MS_SILENT ? 1 : 0);</div><div class='del'>-	if (error) {</div><div class='del'>-		up_write(&amp;s-&gt;s_umount);</div><div class='del'>-		deactivate_super(s);</div><div class='del'>-		return ERR_PTR(error);</div><div class='del'>-	}</div><div class='del'>-	s-&gt;s_flags |= MS_ACTIVE;</div><div class='del'>-	return s;</div><div class='del'>-out_rpciod_down:</div><div class='del'>-	rpciod_down();</div><div class='del'>-out_err:</div><div class='del'>-	kfree(server);</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfs_kill_super(struct super_block *s)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *server = NFS_SB(s);</div><div class='del'>-</div><div class='del'>-	kill_anon_super(s);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(server-&gt;client))</div><div class='del'>-		rpc_shutdown_client(server-&gt;client);</div><div class='del'>-	if (!IS_ERR(server-&gt;client_sys))</div><div class='del'>-		rpc_shutdown_client(server-&gt;client_sys);</div><div class='del'>-	if (!IS_ERR(server-&gt;client_acl))</div><div class='del'>-		rpc_shutdown_client(server-&gt;client_acl);</div><div class='del'>-</div><div class='del'>-	if (!(server-&gt;flags &amp; NFS_MOUNT_NONLM))</div><div class='del'>-		lockd_down();	/* release rpc.lockd */</div><div class='del'>-</div><div class='del'>-	rpciod_down();		/* release rpciod */</div><div class='del'>-</div><div class='del'>-	nfs_free_iostats(server-&gt;io_stats);</div><div class='del'>-	kfree(server-&gt;hostname);</div><div class='del'>-	kfree(server);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct file_system_type nfs_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "nfs",</div><div class='del'>-	.get_sb		= nfs_get_sb,</div><div class='del'>-	.kill_sb	= nfs_kill_super,</div><div class='del'>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='del'>-};</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NFS_V4</div><div class='ctx'> </div><div class='del'>-static void nfs4_clear_inode(struct inode *);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct super_operations nfs4_sops = { </div><div class='del'>-	.alloc_inode	= nfs_alloc_inode,</div><div class='del'>-	.destroy_inode	= nfs_destroy_inode,</div><div class='del'>-	.write_inode	= nfs_write_inode,</div><div class='del'>-	.delete_inode	= nfs_delete_inode,</div><div class='del'>-	.statfs		= nfs_statfs,</div><div class='del'>-	.clear_inode	= nfs4_clear_inode,</div><div class='del'>-	.umount_begin	= nfs_umount_begin,</div><div class='del'>-	.show_options	= nfs_show_options,</div><div class='del'>-	.show_stats	= nfs_show_stats,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Clean out any remaining NFSv4 state that might be left over due</div><div class='ctx'>  * to open() calls that passed nfs_atomic_lookup, but failed to call</div><div class='ctx'>  * nfs_open().</div><div class='ctx'>  */</div><div class='del'>-static void nfs4_clear_inode(struct inode *inode)</div><div class='add'>+void nfs4_clear_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='ctx'> </div><div class='hunk'>@@ -1875,357 +1062,9 @@ static void nfs4_clear_inode(struct inode *inode)</div><div class='ctx'> 		nfs4_close_state(state, state-&gt;state);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data, int silent)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *server;</div><div class='del'>-	struct nfs4_client *clp = NULL;</div><div class='del'>-	struct rpc_xprt *xprt = NULL;</div><div class='del'>-	struct rpc_clnt *clnt = NULL;</div><div class='del'>-	struct rpc_timeout timeparms;</div><div class='del'>-	rpc_authflavor_t authflavour;</div><div class='del'>-	int err = -EIO;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_blocksize_bits = 0;</div><div class='del'>-	sb-&gt;s_blocksize = 0;</div><div class='del'>-	server = NFS_SB(sb);</div><div class='del'>-	if (data-&gt;rsize != 0)</div><div class='del'>-		server-&gt;rsize = nfs_block_size(data-&gt;rsize, NULL);</div><div class='del'>-	if (data-&gt;wsize != 0)</div><div class='del'>-		server-&gt;wsize = nfs_block_size(data-&gt;wsize, NULL);</div><div class='del'>-	server-&gt;flags = data-&gt;flags &amp; NFS_MOUNT_FLAGMASK;</div><div class='del'>-	server-&gt;caps = NFS_CAP_ATOMIC_OPEN;</div><div class='del'>-</div><div class='del'>-	server-&gt;acregmin = data-&gt;acregmin*HZ;</div><div class='del'>-	server-&gt;acregmax = data-&gt;acregmax*HZ;</div><div class='del'>-	server-&gt;acdirmin = data-&gt;acdirmin*HZ;</div><div class='del'>-	server-&gt;acdirmax = data-&gt;acdirmax*HZ;</div><div class='del'>-</div><div class='del'>-	server-&gt;rpc_ops = &amp;nfs_v4_clientops;</div><div class='del'>-</div><div class='del'>-	nfs_init_timeout_values(&amp;timeparms, data-&gt;proto, data-&gt;timeo, data-&gt;retrans);</div><div class='del'>-</div><div class='del'>-	server-&gt;retrans_timeo = timeparms.to_initval;</div><div class='del'>-	server-&gt;retrans_count = timeparms.to_retries;</div><div class='del'>-</div><div class='del'>-	clp = nfs4_get_client(&amp;server-&gt;addr.sin_addr);</div><div class='del'>-	if (!clp) {</div><div class='del'>-		dprintk("%s: failed to create NFS4 client.\n", __FUNCTION__);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now create transport and client */</div><div class='del'>-	authflavour = RPC_AUTH_UNIX;</div><div class='del'>-	if (data-&gt;auth_flavourlen != 0) {</div><div class='del'>-		if (data-&gt;auth_flavourlen != 1) {</div><div class='del'>-			dprintk("%s: Invalid number of RPC auth flavours %d.\n",</div><div class='del'>-					__FUNCTION__, data-&gt;auth_flavourlen);</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto out_fail;</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user(&amp;authflavour, data-&gt;auth_flavours, sizeof(authflavour))) {</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-			goto out_fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	down_write(&amp;clp-&gt;cl_sem);</div><div class='del'>-	if (IS_ERR(clp-&gt;cl_rpcclient)) {</div><div class='del'>-		xprt = xprt_create_proto(data-&gt;proto, &amp;server-&gt;addr, &amp;timeparms);</div><div class='del'>-		if (IS_ERR(xprt)) {</div><div class='del'>-			up_write(&amp;clp-&gt;cl_sem);</div><div class='del'>-			err = PTR_ERR(xprt);</div><div class='del'>-			dprintk("%s: cannot create RPC transport. Error = %d\n",</div><div class='del'>-					__FUNCTION__, err);</div><div class='del'>-			goto out_fail;</div><div class='del'>-		}</div><div class='del'>-		clnt = rpc_create_client(xprt, server-&gt;hostname, &amp;nfs_program,</div><div class='del'>-				server-&gt;rpc_ops-&gt;version, authflavour);</div><div class='del'>-		if (IS_ERR(clnt)) {</div><div class='del'>-			up_write(&amp;clp-&gt;cl_sem);</div><div class='del'>-			err = PTR_ERR(clnt);</div><div class='del'>-			dprintk("%s: cannot create RPC client. Error = %d\n",</div><div class='del'>-					__FUNCTION__, err);</div><div class='del'>-			goto out_fail;</div><div class='del'>-		}</div><div class='del'>-		clnt-&gt;cl_intr     = 1;</div><div class='del'>-		clnt-&gt;cl_softrtry = 1;</div><div class='del'>-		clp-&gt;cl_rpcclient = clnt;</div><div class='del'>-		memcpy(clp-&gt;cl_ipaddr, server-&gt;ip_addr, sizeof(clp-&gt;cl_ipaddr));</div><div class='del'>-		nfs_idmap_new(clp);</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;server-&gt;nfs4_siblings, &amp;clp-&gt;cl_superblocks);</div><div class='del'>-	clnt = rpc_clone_client(clp-&gt;cl_rpcclient);</div><div class='del'>-	if (!IS_ERR(clnt))</div><div class='del'>-			server-&gt;nfs4_state = clp;</div><div class='del'>-	up_write(&amp;clp-&gt;cl_sem);</div><div class='del'>-	clp = NULL;</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(clnt)) {</div><div class='del'>-		err = PTR_ERR(clnt);</div><div class='del'>-		dprintk("%s: cannot create RPC client. Error = %d\n",</div><div class='del'>-				__FUNCTION__, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	server-&gt;client    = clnt;</div><div class='del'>-</div><div class='del'>-	if (server-&gt;nfs4_state-&gt;cl_idmap == NULL) {</div><div class='del'>-		dprintk("%s: failed to create idmapper.\n", __FUNCTION__);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (clnt-&gt;cl_auth-&gt;au_flavor != authflavour) {</div><div class='del'>-		struct rpc_auth *auth;</div><div class='del'>-</div><div class='del'>-		auth = rpcauth_create(authflavour, clnt);</div><div class='del'>-		if (IS_ERR(auth)) {</div><div class='del'>-			dprintk("%s: couldn't create credcache!\n", __FUNCTION__);</div><div class='del'>-			return PTR_ERR(auth);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_time_gran = 1;</div><div class='del'>-</div><div class='del'>-	sb-&gt;s_op = &amp;nfs4_sops;</div><div class='del'>-	err = nfs_sb_init(sb, authflavour);</div><div class='del'>-	if (err == 0)</div><div class='del'>-		return 0;</div><div class='del'>-out_fail:</div><div class='del'>-	if (clp)</div><div class='del'>-		nfs4_put_client(clp);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nfs4_compare_super(struct super_block *sb, void *data)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *server = data;</div><div class='del'>-	struct nfs_server *old = NFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	if (strcmp(server-&gt;hostname, old-&gt;hostname) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-	if (strcmp(server-&gt;mnt_path, old-&gt;mnt_path) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-nfs_copy_user_string(char *dst, struct nfs_string *src, int maxlen)</div><div class='del'>-{</div><div class='del'>-	void *p = NULL;</div><div class='del'>-</div><div class='del'>-	if (!src-&gt;len)</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	if (src-&gt;len &lt; maxlen)</div><div class='del'>-		maxlen = src-&gt;len;</div><div class='del'>-	if (dst == NULL) {</div><div class='del'>-		p = dst = kmalloc(maxlen + 1, GFP_KERNEL);</div><div class='del'>-		if (p == NULL)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='del'>-	}</div><div class='del'>-	if (copy_from_user(dst, src-&gt;data, maxlen)) {</div><div class='del'>-		kfree(p);</div><div class='del'>-		return ERR_PTR(-EFAULT);</div><div class='del'>-	}</div><div class='del'>-	dst[maxlen] = '\0';</div><div class='del'>-	return dst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,</div><div class='del'>-	int flags, const char *dev_name, void *raw_data)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	struct nfs_server *server;</div><div class='del'>-	struct super_block *s;</div><div class='del'>-	struct nfs4_mount_data *data = raw_data;</div><div class='del'>-	void *p;</div><div class='del'>-</div><div class='del'>-	if (data == NULL) {</div><div class='del'>-		dprintk("%s: missing data argument\n", __FUNCTION__);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-	if (data-&gt;version &lt;= 0 || data-&gt;version &gt; NFS4_MOUNT_VERSION) {</div><div class='del'>-		dprintk("%s: bad mount version\n", __FUNCTION__);</div><div class='del'>-		return ERR_PTR(-EINVAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);</div><div class='del'>-	if (!server)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-	/* Zero out the NFS state stuff */</div><div class='del'>-	init_nfsv4_state(server);</div><div class='del'>-	server-&gt;client = server-&gt;client_sys = server-&gt;client_acl = ERR_PTR(-EINVAL);</div><div class='del'>-</div><div class='del'>-	p = nfs_copy_user_string(NULL, &amp;data-&gt;hostname, 256);</div><div class='del'>-	if (IS_ERR(p))</div><div class='del'>-		goto out_err;</div><div class='del'>-	server-&gt;hostname = p;</div><div class='del'>-</div><div class='del'>-	p = nfs_copy_user_string(NULL, &amp;data-&gt;mnt_path, 1024);</div><div class='del'>-	if (IS_ERR(p))</div><div class='del'>-		goto out_err;</div><div class='del'>-	server-&gt;mnt_path = p;</div><div class='del'>-</div><div class='del'>-	p = nfs_copy_user_string(server-&gt;ip_addr, &amp;data-&gt;client_addr,</div><div class='del'>-			sizeof(server-&gt;ip_addr) - 1);</div><div class='del'>-	if (IS_ERR(p))</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	/* We now require that the mount process passes the remote address */</div><div class='del'>-	if (data-&gt;host_addrlen != sizeof(server-&gt;addr)) {</div><div class='del'>-		s = ERR_PTR(-EINVAL);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-	if (copy_from_user(&amp;server-&gt;addr, data-&gt;host_addr, sizeof(server-&gt;addr))) {</div><div class='del'>-		s = ERR_PTR(-EFAULT);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-	if (server-&gt;addr.sin_family != AF_INET ||</div><div class='del'>-	    server-&gt;addr.sin_addr.s_addr == INADDR_ANY) {</div><div class='del'>-		dprintk("%s: mount program didn't pass remote IP address!\n",</div><div class='del'>-				__FUNCTION__);</div><div class='del'>-		s = ERR_PTR(-EINVAL);</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fire up rpciod if not yet running */</div><div class='del'>-	s = ERR_PTR(rpciod_up());</div><div class='del'>-	if (IS_ERR(s)) {</div><div class='del'>-		dprintk("%s: couldn't start rpciod! Error = %ld\n",</div><div class='del'>-				__FUNCTION__, PTR_ERR(s));</div><div class='del'>-		goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = sget(fs_type, nfs4_compare_super, nfs_set_super, server);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(s) || s-&gt;s_root)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	s-&gt;s_flags = flags;</div><div class='del'>-</div><div class='del'>-	error = nfs4_fill_super(s, data, flags &amp; MS_SILENT ? 1 : 0);</div><div class='del'>-	if (error) {</div><div class='del'>-		up_write(&amp;s-&gt;s_umount);</div><div class='del'>-		deactivate_super(s);</div><div class='del'>-		return ERR_PTR(error);</div><div class='del'>-	}</div><div class='del'>-	s-&gt;s_flags |= MS_ACTIVE;</div><div class='del'>-	return s;</div><div class='del'>-out_err:</div><div class='del'>-	s = (struct super_block *)p;</div><div class='del'>-out_free:</div><div class='del'>-	kfree(server-&gt;mnt_path);</div><div class='del'>-	kfree(server-&gt;hostname);</div><div class='del'>-	kfree(server);</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nfs4_kill_super(struct super_block *sb)</div><div class='del'>-{</div><div class='del'>-	struct nfs_server *server = NFS_SB(sb);</div><div class='del'>-</div><div class='del'>-	nfs_return_all_delegations(sb);</div><div class='del'>-	kill_anon_super(sb);</div><div class='del'>-</div><div class='del'>-	nfs4_renewd_prepare_shutdown(server);</div><div class='del'>-</div><div class='del'>-	if (server-&gt;client != NULL &amp;&amp; !IS_ERR(server-&gt;client))</div><div class='del'>-		rpc_shutdown_client(server-&gt;client);</div><div class='del'>-</div><div class='del'>-	destroy_nfsv4_state(server);</div><div class='del'>-</div><div class='del'>-	rpciod_down();</div><div class='del'>-</div><div class='del'>-	nfs_free_iostats(server-&gt;io_stats);</div><div class='del'>-	kfree(server-&gt;hostname);</div><div class='del'>-	kfree(server);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct file_system_type nfs4_fs_type = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.name		= "nfs4",</div><div class='del'>-	.get_sb		= nfs4_get_sb,</div><div class='del'>-	.kill_sb	= nfs4_kill_super,</div><div class='del'>-	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int nfs_set_port_min = 0;</div><div class='del'>-static const int nfs_set_port_max = 65535;</div><div class='del'>-static int param_set_port(const char *val, struct kernel_param *kp)</div><div class='del'>-{</div><div class='del'>-	char *endp;</div><div class='del'>-	int num = simple_strtol(val, &amp;endp, 0);</div><div class='del'>-	if (endp == val || *endp || num &lt; nfs_set_port_min || num &gt; nfs_set_port_max)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	*((int *)kp-&gt;arg) = num;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_param_call(callback_tcpport, param_set_port, param_get_int,</div><div class='del'>-		 &amp;nfs_callback_set_tcpport, 0644);</div><div class='del'>-</div><div class='del'>-static int param_set_idmap_timeout(const char *val, struct kernel_param *kp)</div><div class='del'>-{</div><div class='del'>-	char *endp;</div><div class='del'>-	int num = simple_strtol(val, &amp;endp, 0);</div><div class='del'>-	int jif = num * HZ;</div><div class='del'>-	if (endp == val || *endp || num &lt; 0 || jif &lt; num)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	*((int *)kp-&gt;arg) = jif;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_param_call(idmap_cache_timeout, param_set_idmap_timeout, param_get_int,</div><div class='del'>-		 &amp;nfs_idmap_cache_timeout, 0644);</div><div class='del'>-</div><div class='del'>-#define nfs4_init_once(nfsi) \</div><div class='del'>-	do { \</div><div class='del'>-		INIT_LIST_HEAD(&amp;(nfsi)-&gt;open_states); \</div><div class='del'>-		nfsi-&gt;delegation = NULL; \</div><div class='del'>-		nfsi-&gt;delegation_state = 0; \</div><div class='del'>-		init_rwsem(&amp;nfsi-&gt;rwsem); \</div><div class='del'>-	} while(0)</div><div class='del'>-</div><div class='del'>-static inline int register_nfs4fs(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = nfs_register_sysctl();</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = register_filesystem(&amp;nfs4_fs_type);</div><div class='del'>-	if (ret != 0)</div><div class='del'>-		nfs_unregister_sysctl();</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void unregister_nfs4fs(void)</div><div class='del'>-{</div><div class='del'>-	unregister_filesystem(&amp;nfs4_fs_type);</div><div class='del'>-	nfs_unregister_sysctl();</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define nfs4_init_once(nfsi) \</div><div class='del'>-	do { } while (0)</div><div class='del'>-#define register_nfs4fs() (0)</div><div class='del'>-#define unregister_nfs4fs()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern int nfs_init_nfspagecache(void);</div><div class='del'>-extern void nfs_destroy_nfspagecache(void);</div><div class='del'>-extern int nfs_init_readpagecache(void);</div><div class='del'>-extern void nfs_destroy_readpagecache(void);</div><div class='del'>-extern int nfs_init_writepagecache(void);</div><div class='del'>-extern void nfs_destroy_writepagecache(void);</div><div class='del'>-#ifdef CONFIG_NFS_DIRECTIO</div><div class='del'>-extern int nfs_init_directcache(void);</div><div class='del'>-extern void nfs_destroy_directcache(void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static kmem_cache_t * nfs_inode_cachep;</div><div class='del'>-</div><div class='del'>-static struct inode *nfs_alloc_inode(struct super_block *sb)</div><div class='add'>+struct inode *nfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi;</div><div class='ctx'> 	nfsi = (struct nfs_inode *)kmem_cache_alloc(nfs_inode_cachep, SLAB_KERNEL);</div><div class='hunk'>@@ -2244,11 +1083,21 @@ static struct inode *nfs_alloc_inode(struct super_block *sb)</div><div class='ctx'> 	return &amp;nfsi-&gt;vfs_inode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_destroy_inode(struct inode *inode)</div><div class='add'>+void nfs_destroy_inode(struct inode *inode)</div><div class='ctx'> {</div><div class='ctx'> 	kmem_cache_free(nfs_inode_cachep, NFS_I(inode));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void nfs4_init_once(struct nfs_inode *nfsi)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+	INIT_LIST_HEAD(&amp;nfsi-&gt;open_states);</div><div class='add'>+	nfsi-&gt;delegation = NULL;</div><div class='add'>+	nfsi-&gt;delegation_state = 0;</div><div class='add'>+	init_rwsem(&amp;nfsi-&gt;rwsem);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_inode *nfsi = (struct nfs_inode *) foo;</div><div class='hunk'>@@ -2269,7 +1118,7 @@ static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='del'>-static int nfs_init_inodecache(void)</div><div class='add'>+static int __init nfs_init_inodecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",</div><div class='ctx'> 					     sizeof(struct nfs_inode),</div><div class='hunk'>@@ -2311,29 +1160,22 @@ static int __init init_nfs_fs(void)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out1;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NFS_DIRECTIO</div><div class='ctx'> 	err = nfs_init_directcache();</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out0;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> 	rpc_proc_register(&amp;nfs_rpcstat);</div><div class='ctx'> #endif</div><div class='del'>-        err = register_filesystem(&amp;nfs_fs_type);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	if ((err = register_nfs4fs()) != 0)</div><div class='add'>+	if ((err = register_nfs_fs()) != 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	return 0;</div><div class='ctx'> out:</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> 	rpc_proc_unregister("nfs");</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_NFS_DIRECTIO</div><div class='ctx'> 	nfs_destroy_directcache();</div><div class='ctx'> out0:</div><div class='del'>-#endif</div><div class='ctx'> 	nfs_destroy_writepagecache();</div><div class='ctx'> out1:</div><div class='ctx'> 	nfs_destroy_readpagecache();</div><div class='hunk'>@@ -2347,9 +1189,7 @@ out4:</div><div class='ctx'> </div><div class='ctx'> static void __exit exit_nfs_fs(void)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_NFS_DIRECTIO</div><div class='ctx'> 	nfs_destroy_directcache();</div><div class='del'>-#endif</div><div class='ctx'> 	nfs_destroy_writepagecache();</div><div class='ctx'> 	nfs_destroy_readpagecache();</div><div class='ctx'> 	nfs_destroy_inodecache();</div><div class='hunk'>@@ -2357,8 +1197,7 @@ static void __exit exit_nfs_fs(void)</div><div class='ctx'> #ifdef CONFIG_PROC_FS</div><div class='ctx'> 	rpc_proc_unregister("nfs");</div><div class='ctx'> #endif</div><div class='del'>-	unregister_filesystem(&amp;nfs_fs_type);</div><div class='del'>-	unregister_nfs4fs();</div><div class='add'>+	unregister_nfs_fs();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Not quite true; I just maintain it */</div><div class='head'>diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h<br/>new file mode 100644<br/>index 000000000000..e4f4e5def0fc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/internal.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/internal.h</a></div><div class='hunk'>@@ -0,0 +1,186 @@</div><div class='add'>+/*</div><div class='add'>+ * NFS internal definitions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+</div><div class='add'>+struct nfs_clone_mount {</div><div class='add'>+	const struct super_block *sb;</div><div class='add'>+	const struct dentry *dentry;</div><div class='add'>+	struct nfs_fh *fh;</div><div class='add'>+	struct nfs_fattr *fattr;</div><div class='add'>+	char *hostname;</div><div class='add'>+	char *mnt_path;</div><div class='add'>+	struct sockaddr_in *addr;</div><div class='add'>+	rpc_authflavor_t authflavor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* namespace-nfs4.c */</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+extern struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry);</div><div class='add'>+#else</div><div class='add'>+static inline</div><div class='add'>+struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	return ERR_PTR(-ENOENT);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* callback_xdr.c */</div><div class='add'>+extern struct svc_version nfs4_callback_version1;</div><div class='add'>+</div><div class='add'>+/* pagelist.c */</div><div class='add'>+extern int __init nfs_init_nfspagecache(void);</div><div class='add'>+extern void nfs_destroy_nfspagecache(void);</div><div class='add'>+extern int __init nfs_init_readpagecache(void);</div><div class='add'>+extern void nfs_destroy_readpagecache(void);</div><div class='add'>+extern int __init nfs_init_writepagecache(void);</div><div class='add'>+extern void nfs_destroy_writepagecache(void);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_DIRECTIO</div><div class='add'>+extern int __init nfs_init_directcache(void);</div><div class='add'>+extern void nfs_destroy_directcache(void);</div><div class='add'>+#else</div><div class='add'>+#define nfs_init_directcache() (0)</div><div class='add'>+#define nfs_destroy_directcache() do {} while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* nfs2xdr.c */</div><div class='add'>+extern struct rpc_procinfo nfs_procedures[];</div><div class='add'>+extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int);</div><div class='add'>+</div><div class='add'>+/* nfs3xdr.c */</div><div class='add'>+extern struct rpc_procinfo nfs3_procedures[];</div><div class='add'>+extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int);</div><div class='add'>+</div><div class='add'>+/* nfs4xdr.c */</div><div class='add'>+extern int nfs_stat_to_errno(int);</div><div class='add'>+extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);</div><div class='add'>+</div><div class='add'>+/* nfs4proc.c */</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+extern struct rpc_procinfo nfs4_procedures[];</div><div class='add'>+</div><div class='add'>+extern int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,</div><div class='add'>+				  struct nfs4_fs_locations *fs_locations,</div><div class='add'>+				  struct page *page);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* inode.c */</div><div class='add'>+extern struct inode *nfs_alloc_inode(struct super_block *sb);</div><div class='add'>+extern void nfs_destroy_inode(struct inode *);</div><div class='add'>+extern int nfs_write_inode(struct inode *,int);</div><div class='add'>+extern void nfs_clear_inode(struct inode *);</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+extern void nfs4_clear_inode(struct inode *);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* super.c */</div><div class='add'>+extern struct file_system_type nfs_referral_nfs4_fs_type;</div><div class='add'>+extern struct file_system_type clone_nfs_fs_type;</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+extern struct file_system_type clone_nfs4_fs_type;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+extern struct rpc_stat nfs_rpcstat;</div><div class='add'>+</div><div class='add'>+extern int __init register_nfs_fs(void);</div><div class='add'>+extern void __exit unregister_nfs_fs(void);</div><div class='add'>+</div><div class='add'>+/* namespace.c */</div><div class='add'>+extern char *nfs_path(const char *base, const struct dentry *dentry,</div><div class='add'>+		      char *buffer, ssize_t buflen);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Determine the mount path as a string</div><div class='add'>+ */</div><div class='add'>+static inline char *</div><div class='add'>+nfs4_path(const struct dentry *dentry, char *buffer, ssize_t buflen)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+	return nfs_path(NFS_SB(dentry-&gt;d_sb)-&gt;mnt_path, dentry, buffer, buflen);</div><div class='add'>+#else</div><div class='add'>+	return NULL;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Determine the device name as a string</div><div class='add'>+ */</div><div class='add'>+static inline char *nfs_devname(const struct vfsmount *mnt_parent,</div><div class='add'>+			 const struct dentry *dentry,</div><div class='add'>+			 char *buffer, ssize_t buflen)</div><div class='add'>+{</div><div class='add'>+	return nfs_path(mnt_parent-&gt;mnt_devname, dentry, buffer, buflen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Determine the actual block size (and log2 thereof)</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+unsigned long nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)</div><div class='add'>+{</div><div class='add'>+	/* make sure blocksize is a power of two */</div><div class='add'>+	if ((bsize &amp; (bsize - 1)) || nrbitsp) {</div><div class='add'>+		unsigned char	nrbits;</div><div class='add'>+</div><div class='add'>+		for (nrbits = 31; nrbits &amp;&amp; !(bsize &amp; (1 &lt;&lt; nrbits)); nrbits--)</div><div class='add'>+			;</div><div class='add'>+		bsize = 1 &lt;&lt; nrbits;</div><div class='add'>+		if (nrbitsp)</div><div class='add'>+			*nrbitsp = nrbits;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate the number of 512byte blocks used.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned long nfs_calc_block_size(u64 tsize)</div><div class='add'>+{</div><div class='add'>+	loff_t used = (tsize + 511) &gt;&gt; 9;</div><div class='add'>+	return (used &gt; ULONG_MAX) ? ULONG_MAX : used;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compute and set NFS server blocksize</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+unsigned long nfs_block_size(unsigned long bsize, unsigned char *nrbitsp)</div><div class='add'>+{</div><div class='add'>+	if (bsize &lt; NFS_MIN_FILE_IO_SIZE)</div><div class='add'>+		bsize = NFS_DEF_FILE_IO_SIZE;</div><div class='add'>+	else if (bsize &gt;= NFS_MAX_FILE_IO_SIZE)</div><div class='add'>+		bsize = NFS_MAX_FILE_IO_SIZE;</div><div class='add'>+</div><div class='add'>+	return nfs_block_bits(bsize, nrbitsp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Determine the maximum file size for a superblock</div><div class='add'>+ */</div><div class='add'>+static inline</div><div class='add'>+void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize)</div><div class='add'>+{</div><div class='add'>+	sb-&gt;s_maxbytes = (loff_t)maxfilesize;</div><div class='add'>+	if (sb-&gt;s_maxbytes &gt; MAX_LFS_FILESIZE || sb-&gt;s_maxbytes &lt;= 0)</div><div class='add'>+		sb-&gt;s_maxbytes = MAX_LFS_FILESIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if the string represents a "valid" IPv4 address</div><div class='add'>+ */</div><div class='add'>+static inline int valid_ipaddr4(const char *buf)</div><div class='add'>+{</div><div class='add'>+	int rc, count, in[4];</div><div class='add'>+</div><div class='add'>+	rc = sscanf(buf, "%d.%d.%d.%d", &amp;in[0], &amp;in[1], &amp;in[2], &amp;in[3]);</div><div class='add'>+	if (rc != 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (count = 0; count &lt; 4; count++) {</div><div class='add'>+		if (in[count] &gt; 255)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c<br/>new file mode 100644<br/>index 000000000000..19b98ca468eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/namespace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/namespace.c</a></div><div class='hunk'>@@ -0,0 +1,229 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/fs/nfs/namespace.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 Trond Myklebust &lt;Trond.Myklebust@netapp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * NFS namespace</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dcache.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='add'>+#include &lt;linux/vfs.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+#define NFSDBG_FACILITY		NFSDBG_VFS</div><div class='add'>+</div><div class='add'>+static void nfs_expire_automounts(void *list);</div><div class='add'>+</div><div class='add'>+LIST_HEAD(nfs_automount_list);</div><div class='add'>+static DECLARE_WORK(nfs_automount_task, nfs_expire_automounts, &amp;nfs_automount_list);</div><div class='add'>+int nfs_mountpoint_expiry_timeout = 500 * HZ;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_path - reconstruct the path given an arbitrary dentry</div><div class='add'>+ * @base - arbitrary string to prepend to the path</div><div class='add'>+ * @dentry - pointer to dentry</div><div class='add'>+ * @buffer - result buffer</div><div class='add'>+ * @buflen - length of buffer</div><div class='add'>+ *</div><div class='add'>+ * Helper function for constructing the path from the</div><div class='add'>+ * root dentry to an arbitrary hashed dentry.</div><div class='add'>+ *</div><div class='add'>+ * This is mainly for use in figuring out the path on the</div><div class='add'>+ * server side when automounting on top of an existing partition.</div><div class='add'>+ */</div><div class='add'>+char *nfs_path(const char *base, const struct dentry *dentry,</div><div class='add'>+	       char *buffer, ssize_t buflen)</div><div class='add'>+{</div><div class='add'>+	char *end = buffer+buflen;</div><div class='add'>+	int namelen;</div><div class='add'>+</div><div class='add'>+	*--end = '\0';</div><div class='add'>+	buflen--;</div><div class='add'>+	spin_lock(&amp;dcache_lock);</div><div class='add'>+	while (!IS_ROOT(dentry)) {</div><div class='add'>+		namelen = dentry-&gt;d_name.len;</div><div class='add'>+		buflen -= namelen + 1;</div><div class='add'>+		if (buflen &lt; 0)</div><div class='add'>+			goto Elong;</div><div class='add'>+		end -= namelen;</div><div class='add'>+		memcpy(end, dentry-&gt;d_name.name, namelen);</div><div class='add'>+		*--end = '/';</div><div class='add'>+		dentry = dentry-&gt;d_parent;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;dcache_lock);</div><div class='add'>+	namelen = strlen(base);</div><div class='add'>+	/* Strip off excess slashes in base string */</div><div class='add'>+	while (namelen &gt; 0 &amp;&amp; base[namelen - 1] == '/')</div><div class='add'>+		namelen--;</div><div class='add'>+	buflen -= namelen;</div><div class='add'>+	if (buflen &lt; 0)</div><div class='add'>+		goto Elong;</div><div class='add'>+	end -= namelen;</div><div class='add'>+	memcpy(end, base, namelen);</div><div class='add'>+	return end;</div><div class='add'>+Elong:</div><div class='add'>+	return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_follow_mountpoint - handle crossing a mountpoint on the server</div><div class='add'>+ * @dentry - dentry of mountpoint</div><div class='add'>+ * @nd - nameidata info</div><div class='add'>+ *</div><div class='add'>+ * When we encounter a mountpoint on the server, we want to set up</div><div class='add'>+ * a mountpoint on the client too, to prevent inode numbers from</div><div class='add'>+ * colliding, and to allow "df" to work properly.</div><div class='add'>+ * On NFSv4, we also want to allow for the fact that different</div><div class='add'>+ * filesystems may be migrated to different servers in a failover</div><div class='add'>+ * situation, and that different filesystems may want to use</div><div class='add'>+ * different security flavours.</div><div class='add'>+ */</div><div class='add'>+static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt;</div><div class='add'>+	struct nfs_server *server = NFS_SERVER(dentry-&gt;d_inode);</div><div class='add'>+	struct dentry *parent;</div><div class='add'>+	struct nfs_fh fh;</div><div class='add'>+	struct nfs_fattr fattr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUG_ON(IS_ROOT(dentry));</div><div class='add'>+	dprintk("%s: enter\n", __FUNCTION__);</div><div class='add'>+	dput(nd-&gt;dentry);</div><div class='add'>+	nd-&gt;dentry = dget(dentry);</div><div class='add'>+	if (d_mountpoint(nd-&gt;dentry))</div><div class='add'>+		goto out_follow;</div><div class='add'>+	/* Look it up again */</div><div class='add'>+	parent = dget_parent(nd-&gt;dentry);</div><div class='add'>+	err = server-&gt;rpc_ops-&gt;lookup(parent-&gt;d_inode, &amp;nd-&gt;dentry-&gt;d_name, &amp;fh, &amp;fattr);</div><div class='add'>+	dput(parent);</div><div class='add'>+	if (err != 0)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	if (fattr.valid &amp; NFS_ATTR_FATTR_V4_REFERRAL)</div><div class='add'>+		mnt = nfs_do_refmount(nd-&gt;mnt, nd-&gt;dentry);</div><div class='add'>+	else</div><div class='add'>+		mnt = nfs_do_submount(nd-&gt;mnt, nd-&gt;dentry, &amp;fh, &amp;fattr);</div><div class='add'>+	err = PTR_ERR(mnt);</div><div class='add'>+	if (IS_ERR(mnt))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	mntget(mnt);</div><div class='add'>+	err = do_add_mount(mnt, nd, nd-&gt;mnt-&gt;mnt_flags|MNT_SHRINKABLE, &amp;nfs_automount_list);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		mntput(mnt);</div><div class='add'>+		if (err == -EBUSY)</div><div class='add'>+			goto out_follow;</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+	mntput(nd-&gt;mnt);</div><div class='add'>+	dput(nd-&gt;dentry);</div><div class='add'>+	nd-&gt;mnt = mnt;</div><div class='add'>+	nd-&gt;dentry = dget(mnt-&gt;mnt_root);</div><div class='add'>+	schedule_delayed_work(&amp;nfs_automount_task, nfs_mountpoint_expiry_timeout);</div><div class='add'>+out:</div><div class='add'>+	dprintk("%s: done, returned %d\n", __FUNCTION__, err);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+out_err:</div><div class='add'>+	path_release(nd);</div><div class='add'>+	goto out;</div><div class='add'>+out_follow:</div><div class='add'>+	while(d_mountpoint(nd-&gt;dentry) &amp;&amp; follow_down(&amp;nd-&gt;mnt, &amp;nd-&gt;dentry))</div><div class='add'>+		;</div><div class='add'>+	err = 0;</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct inode_operations nfs_mountpoint_inode_operations = {</div><div class='add'>+	.follow_link	= nfs_follow_mountpoint,</div><div class='add'>+	.getattr	= nfs_getattr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct inode_operations nfs_referral_inode_operations = {</div><div class='add'>+	.follow_link	= nfs_follow_mountpoint,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nfs_expire_automounts(void *data)</div><div class='add'>+{</div><div class='add'>+	struct list_head *list = (struct list_head *)data;</div><div class='add'>+</div><div class='add'>+	mark_mounts_for_expiry(list);</div><div class='add'>+	if (!list_empty(list))</div><div class='add'>+		schedule_delayed_work(&amp;nfs_automount_task, nfs_mountpoint_expiry_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void nfs_release_automount_timer(void)</div><div class='add'>+{</div><div class='add'>+	if (list_empty(&amp;nfs_automount_list)) {</div><div class='add'>+		cancel_delayed_work(&amp;nfs_automount_task);</div><div class='add'>+		flush_scheduled_work();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clone a mountpoint of the appropriate type</div><div class='add'>+ */</div><div class='add'>+static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server, char *devname,</div><div class='add'>+					   struct nfs_clone_mount *mountdata)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+	struct vfsmount *mnt = NULL;</div><div class='add'>+	switch (server-&gt;rpc_ops-&gt;version) {</div><div class='add'>+		case 2:</div><div class='add'>+		case 3:</div><div class='add'>+			mnt = vfs_kern_mount(&amp;clone_nfs_fs_type, 0, devname, mountdata);</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			mnt = vfs_kern_mount(&amp;clone_nfs4_fs_type, 0, devname, mountdata);</div><div class='add'>+	}</div><div class='add'>+	return mnt;</div><div class='add'>+#else</div><div class='add'>+	return vfs_kern_mount(&amp;clone_nfs_fs_type, 0, devname, mountdata);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfs_do_submount - set up mountpoint when crossing a filesystem boundary</div><div class='add'>+ * @mnt_parent - mountpoint of parent directory</div><div class='add'>+ * @dentry - parent directory</div><div class='add'>+ * @fh - filehandle for new root dentry</div><div class='add'>+ * @fattr - attributes for new root inode</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,</div><div class='add'>+		const struct dentry *dentry, struct nfs_fh *fh,</div><div class='add'>+		struct nfs_fattr *fattr)</div><div class='add'>+{</div><div class='add'>+	struct nfs_clone_mount mountdata = {</div><div class='add'>+		.sb = mnt_parent-&gt;mnt_sb,</div><div class='add'>+		.dentry = dentry,</div><div class='add'>+		.fh = fh,</div><div class='add'>+		.fattr = fattr,</div><div class='add'>+	};</div><div class='add'>+	struct vfsmount *mnt = ERR_PTR(-ENOMEM);</div><div class='add'>+	char *page = (char *) __get_free_page(GFP_USER);</div><div class='add'>+	char *devname;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: submounting on %s/%s\n", __FUNCTION__,</div><div class='add'>+			dentry-&gt;d_parent-&gt;d_name.name,</div><div class='add'>+			dentry-&gt;d_name.name);</div><div class='add'>+	if (page == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+	devname = nfs_devname(mnt_parent, dentry, page, PAGE_SIZE);</div><div class='add'>+	mnt = (struct vfsmount *)devname;</div><div class='add'>+	if (IS_ERR(devname))</div><div class='add'>+		goto free_page;</div><div class='add'>+	mnt = nfs_do_clone_mount(NFS_SB(mnt_parent-&gt;mnt_sb), devname, &amp;mountdata);</div><div class='add'>+free_page:</div><div class='add'>+	free_page((unsigned long)page);</div><div class='add'>+out:</div><div class='add'>+	dprintk("%s: done\n", __FUNCTION__);</div><div class='add'>+	return mnt;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c<br/>index f0015fa876e1..67391eef6b93 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs2xdr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs2xdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs2xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs2xdr.c</a></div><div class='hunk'>@@ -23,12 +23,11 @@</div><div class='ctx'> #include &lt;linux/nfs.h&gt;</div><div class='ctx'> #include &lt;linux/nfs2.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_XDR</div><div class='ctx'> /* #define NFS_PARANOIA 1 */</div><div class='ctx'> </div><div class='del'>-extern int			nfs_stat_to_errno(int stat);</div><div class='del'>-</div><div class='ctx'> /* Mapping from NFS error code to "errno" error code. */</div><div class='ctx'> #define errno_NFSERR_IO		EIO</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +130,8 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)</div><div class='ctx'> 	fattr-&gt;du.nfs2.blocksize = ntohl(*p++);</div><div class='ctx'> 	rdev = ntohl(*p++);</div><div class='ctx'> 	fattr-&gt;du.nfs2.blocks = ntohl(*p++);</div><div class='del'>-	fattr-&gt;fsid_u.nfs3 = ntohl(*p++);</div><div class='add'>+	fattr-&gt;fsid.major = ntohl(*p++);</div><div class='add'>+	fattr-&gt;fsid.minor = 0;</div><div class='ctx'> 	fattr-&gt;fileid = ntohl(*p++);</div><div class='ctx'> 	p = xdr_decode_time(p, &amp;fattr-&gt;atime);</div><div class='ctx'> 	p = xdr_decode_time(p, &amp;fattr-&gt;mtime);</div><div class='head'>diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c<br/>index 33287879bd23..7322da4d2055 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs3acl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs3acl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs3acl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs3acl.c</a></div><div class='hunk'>@@ -172,8 +172,10 @@ static void nfs3_cache_acls(struct inode *inode, struct posix_acl *acl,</div><div class='ctx'> 		inode-&gt;i_ino, acl, dfacl);</div><div class='ctx'> 	spin_lock(&amp;inode-&gt;i_lock);</div><div class='ctx'> 	__nfs3_forget_cached_acls(NFS_I(inode));</div><div class='del'>-	nfsi-&gt;acl_access = posix_acl_dup(acl);</div><div class='del'>-	nfsi-&gt;acl_default = posix_acl_dup(dfacl);</div><div class='add'>+	if (!IS_ERR(acl))</div><div class='add'>+		nfsi-&gt;acl_access = posix_acl_dup(acl);</div><div class='add'>+	if (!IS_ERR(dfacl))</div><div class='add'>+		nfsi-&gt;acl_default = posix_acl_dup(dfacl);</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -254,7 +256,9 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)</div><div class='ctx'> 			res.acl_access = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	nfs3_cache_acls(inode, res.acl_access, res.acl_default);</div><div class='add'>+	nfs3_cache_acls(inode,</div><div class='add'>+		(res.mask &amp; NFS_ACL)   ? res.acl_access  : ERR_PTR(-EINVAL),</div><div class='add'>+		(res.mask &amp; NFS_DFACL) ? res.acl_default : ERR_PTR(-EINVAL));</div><div class='ctx'> </div><div class='ctx'> 	switch(type) {</div><div class='ctx'> 		case ACL_TYPE_ACCESS:</div><div class='hunk'>@@ -329,6 +333,7 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,</div><div class='ctx'> 	switch (status) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			status = nfs_refresh_inode(inode, &amp;fattr);</div><div class='add'>+			nfs3_cache_acls(inode, acl, dfacl);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case -EPFNOSUPPORT:</div><div class='ctx'> 		case -EPROTONOSUPPORT:</div><div class='head'>diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c<br/>index cf186f0d2b3b..7143b1f82cea 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs3proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs3proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs3proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs3proc.c</a></div><div class='hunk'>@@ -20,11 +20,10 @@</div><div class='ctx'> #include &lt;linux/nfs_mount.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "iostat.h"</div><div class='add'>+#include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PROC</div><div class='ctx'> </div><div class='del'>-extern struct rpc_procinfo nfs3_procedures[];</div><div class='del'>-</div><div class='ctx'> /* A wrapper to handle the EJUKEBOX error message */</div><div class='ctx'> static int</div><div class='ctx'> nfs3_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)</div><div class='hunk'>@@ -809,8 +808,6 @@ nfs3_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int);</div><div class='del'>-</div><div class='ctx'> static int nfs3_read_done(struct rpc_task *task, struct nfs_read_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (nfs3_async_handle_jukebox(task, data-&gt;inode))</div><div class='head'>diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c<br/>index ec233619687e..0250269e9753 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs3xdr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs3xdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs3xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs3xdr.c</a></div><div class='hunk'>@@ -22,14 +22,13 @@</div><div class='ctx'> #include &lt;linux/nfs3.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> #include &lt;linux/nfsacl.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_XDR</div><div class='ctx'> </div><div class='ctx'> /* Mapping from NFS error code to "errno" error code. */</div><div class='ctx'> #define errno_NFSERR_IO		EIO</div><div class='ctx'> </div><div class='del'>-extern int			nfs_stat_to_errno(int);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Declare the space requirements for NFS arguments and replies as</div><div class='ctx'>  * number of 32bit-words</div><div class='hunk'>@@ -166,7 +165,8 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr)</div><div class='ctx'> 	if (MAJOR(fattr-&gt;rdev) != major || MINOR(fattr-&gt;rdev) != minor)</div><div class='ctx'> 		fattr-&gt;rdev = 0;</div><div class='ctx'> </div><div class='del'>-	p = xdr_decode_hyper(p, &amp;fattr-&gt;fsid_u.nfs3);</div><div class='add'>+	p = xdr_decode_hyper(p, &amp;fattr-&gt;fsid.major);</div><div class='add'>+	fattr-&gt;fsid.minor = 0;</div><div class='ctx'> 	p = xdr_decode_hyper(p, &amp;fattr-&gt;fileid);</div><div class='ctx'> 	p = xdr_decode_time3(p, &amp;fattr-&gt;atime);</div><div class='ctx'> 	p = xdr_decode_time3(p, &amp;fattr-&gt;mtime);</div><div class='head'>diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h<br/>index 0f5e4e7cddec..9a102860df37 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs4_fs.h?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4_fs.h</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs4_fs.h?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs4_fs.h</a></div><div class='hunk'>@@ -217,6 +217,9 @@ extern int nfs4_proc_renew(struct nfs4_client *, struct rpc_cred *);</div><div class='ctx'> extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state);</div><div class='ctx'> extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);</div><div class='ctx'> extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *);</div><div class='add'>+extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);</div><div class='add'>+extern int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,</div><div class='add'>+		struct nfs4_fs_locations *fs_locations, struct page *page);</div><div class='ctx'> </div><div class='ctx'> extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops;</div><div class='ctx'> extern struct nfs4_state_recovery_ops nfs4_network_partition_recovery_ops;</div><div class='hunk'>@@ -225,6 +228,7 @@ extern const u32 nfs4_fattr_bitmap[2];</div><div class='ctx'> extern const u32 nfs4_statfs_bitmap[2];</div><div class='ctx'> extern const u32 nfs4_pathconf_bitmap[2];</div><div class='ctx'> extern const u32 nfs4_fsinfo_bitmap[2];</div><div class='add'>+extern const u32 nfs4_fs_locations_bitmap[2];</div><div class='ctx'> </div><div class='ctx'> /* nfs4renewd.c */</div><div class='ctx'> extern void nfs4_schedule_state_renewal(struct nfs4_client *);</div><div class='head'>diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c<br/>new file mode 100644<br/>index 000000000000..ea38d27b74e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs4namespace.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs4namespace.c</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/*</div><div class='add'>+ * linux/fs/nfs/nfs4namespace.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2005 Trond Myklebust &lt;Trond.Myklebust@netapp.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * NFSv4 namespace</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dcache.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/namei.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='add'>+#include &lt;linux/vfs.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+#define NFSDBG_FACILITY		NFSDBG_VFS</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if fs_root is valid</div><div class='add'>+ */</div><div class='add'>+static inline char *nfs4_pathname_string(struct nfs4_pathname *pathname,</div><div class='add'>+					 char *buffer, ssize_t buflen)</div><div class='add'>+{</div><div class='add'>+	char *end = buffer + buflen;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	*--end = '\0';</div><div class='add'>+	buflen--;</div><div class='add'>+</div><div class='add'>+	n = pathname-&gt;ncomponents;</div><div class='add'>+	while (--n &gt;= 0) {</div><div class='add'>+		struct nfs4_string *component = &amp;pathname-&gt;components[n];</div><div class='add'>+		buflen -= component-&gt;len + 1;</div><div class='add'>+		if (buflen &lt; 0)</div><div class='add'>+			goto Elong;</div><div class='add'>+		end -= component-&gt;len;</div><div class='add'>+		memcpy(end, component-&gt;data, component-&gt;len);</div><div class='add'>+		*--end = '/';</div><div class='add'>+	}</div><div class='add'>+	return end;</div><div class='add'>+Elong:</div><div class='add'>+	return ERR_PTR(-ENAMETOOLONG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * nfs_follow_referral - set up mountpoint when hitting a referral on moved error</div><div class='add'>+ * @mnt_parent - mountpoint of parent directory</div><div class='add'>+ * @dentry - parent directory</div><div class='add'>+ * @fspath - fs path returned in fs_locations</div><div class='add'>+ * @mntpath - mount path to new server</div><div class='add'>+ * @hostname - hostname of new server</div><div class='add'>+ * @addr - host addr of new server</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,</div><div class='add'>+					    const struct dentry *dentry,</div><div class='add'>+					    struct nfs4_fs_locations *locations)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt = ERR_PTR(-ENOENT);</div><div class='add'>+	struct nfs_clone_mount mountdata = {</div><div class='add'>+		.sb = mnt_parent-&gt;mnt_sb,</div><div class='add'>+		.dentry = dentry,</div><div class='add'>+		.authflavor = NFS_SB(mnt_parent-&gt;mnt_sb)-&gt;client-&gt;cl_auth-&gt;au_flavor,</div><div class='add'>+	};</div><div class='add'>+	char *page, *page2;</div><div class='add'>+	char *path, *fs_path;</div><div class='add'>+	char *devname;</div><div class='add'>+	int loc, s;</div><div class='add'>+</div><div class='add'>+	if (locations == NULL || locations-&gt;nlocations &lt;= 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: referral at %s/%s\n", __FUNCTION__,</div><div class='add'>+		dentry-&gt;d_parent-&gt;d_name.name, dentry-&gt;d_name.name);</div><div class='add'>+</div><div class='add'>+	/* Ensure fs path is a prefix of current dentry path */</div><div class='add'>+	page = (char *) __get_free_page(GFP_USER);</div><div class='add'>+	if (page == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+	page2 = (char *) __get_free_page(GFP_USER);</div><div class='add'>+	if (page2 == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	path = nfs4_path(dentry, page, PAGE_SIZE);</div><div class='add'>+	if (IS_ERR(path))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	fs_path = nfs4_pathname_string(&amp;locations-&gt;fs_path, page2, PAGE_SIZE);</div><div class='add'>+	if (IS_ERR(fs_path))</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	if (strncmp(path, fs_path, strlen(fs_path)) != 0) {</div><div class='add'>+		dprintk("%s: path %s does not begin with fsroot %s\n", __FUNCTION__, path, fs_path);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devname = nfs_devname(mnt_parent, dentry, page, PAGE_SIZE);</div><div class='add'>+	if (IS_ERR(devname)) {</div><div class='add'>+		mnt = (struct vfsmount *)devname;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loc = 0;</div><div class='add'>+	while (loc &lt; locations-&gt;nlocations &amp;&amp; IS_ERR(mnt)) {</div><div class='add'>+		struct nfs4_fs_location *location = &amp;locations-&gt;locations[loc];</div><div class='add'>+		char *mnt_path;</div><div class='add'>+</div><div class='add'>+		if (location == NULL || location-&gt;nservers &lt;= 0 ||</div><div class='add'>+		    location-&gt;rootpath.ncomponents == 0) {</div><div class='add'>+			loc++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mnt_path = nfs4_pathname_string(&amp;location-&gt;rootpath, page2, PAGE_SIZE);</div><div class='add'>+		if (IS_ERR(mnt_path)) {</div><div class='add'>+			loc++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		mountdata.mnt_path = mnt_path;</div><div class='add'>+</div><div class='add'>+		s = 0;</div><div class='add'>+		while (s &lt; location-&gt;nservers) {</div><div class='add'>+			struct sockaddr_in addr = {};</div><div class='add'>+</div><div class='add'>+			if (location-&gt;servers[s].len &lt;= 0 ||</div><div class='add'>+			    valid_ipaddr4(location-&gt;servers[s].data) &lt; 0) {</div><div class='add'>+				s++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mountdata.hostname = location-&gt;servers[s].data;</div><div class='add'>+			addr.sin_addr.s_addr = in_aton(mountdata.hostname);</div><div class='add'>+			addr.sin_family = AF_INET;</div><div class='add'>+			addr.sin_port = htons(NFS_PORT);</div><div class='add'>+			mountdata.addr = &amp;addr;</div><div class='add'>+</div><div class='add'>+			mnt = vfs_kern_mount(&amp;nfs_referral_nfs4_fs_type, 0, devname, &amp;mountdata);</div><div class='add'>+			if (!IS_ERR(mnt)) {</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			s++;</div><div class='add'>+		}</div><div class='add'>+		loc++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	free_page((unsigned long)page);</div><div class='add'>+	free_page((unsigned long)page2);</div><div class='add'>+out:</div><div class='add'>+	dprintk("%s: done\n", __FUNCTION__);</div><div class='add'>+	return mnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * nfs_do_refmount - handle crossing a referral on server</div><div class='add'>+ * @dentry - dentry of referral</div><div class='add'>+ * @nd - nameidata info</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	struct vfsmount *mnt = ERR_PTR(-ENOENT);</div><div class='add'>+	struct dentry *parent;</div><div class='add'>+	struct nfs4_fs_locations *fs_locations = NULL;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* BUG_ON(IS_ROOT(dentry)); */</div><div class='add'>+	dprintk("%s: enter\n", __FUNCTION__);</div><div class='add'>+</div><div class='add'>+	page = alloc_page(GFP_KERNEL);</div><div class='add'>+	if (page == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	fs_locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL);</div><div class='add'>+	if (fs_locations == NULL)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	/* Get locations */</div><div class='add'>+	parent = dget_parent(dentry);</div><div class='add'>+	dprintk("%s: getting locations for %s/%s\n", __FUNCTION__, parent-&gt;d_name.name, dentry-&gt;d_name.name);</div><div class='add'>+	err = nfs4_proc_fs_locations(parent-&gt;d_inode, dentry, fs_locations, page);</div><div class='add'>+	dput(parent);</div><div class='add'>+	if (err != 0 || fs_locations-&gt;nlocations &lt;= 0 ||</div><div class='add'>+	    fs_locations-&gt;fs_path.ncomponents &lt;= 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	mnt = nfs_follow_referral(mnt_parent, dentry, fs_locations);</div><div class='add'>+out_free:</div><div class='add'>+	__free_page(page);</div><div class='add'>+	kfree(fs_locations);</div><div class='add'>+out:</div><div class='add'>+	dprintk("%s: done\n", __FUNCTION__);</div><div class='add'>+	return mnt;</div><div class='add'>+}</div><div class='head'>diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c<br/>index d86c0db7b1e8..e6ee97f19d81 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs4proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs4proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs4proc.c</a></div><div class='hunk'>@@ -65,8 +65,6 @@ static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *)</div><div class='ctx'> static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry);</div><div class='ctx'> static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception);</div><div class='ctx'> static int nfs4_wait_clnt_recover(struct rpc_clnt *clnt, struct nfs4_client *clp);</div><div class='del'>-extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);</div><div class='del'>-extern struct rpc_procinfo nfs4_procedures[];</div><div class='ctx'> </div><div class='ctx'> /* Prevent leaks of NFSv4 errors into userland */</div><div class='ctx'> int nfs4_map_errors(int err)</div><div class='hunk'>@@ -121,6 +119,25 @@ const u32 nfs4_fsinfo_bitmap[2] = { FATTR4_WORD0_MAXFILESIZE</div><div class='ctx'> 			0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+const u32 nfs4_fs_locations_bitmap[2] = {</div><div class='add'>+	FATTR4_WORD0_TYPE</div><div class='add'>+	| FATTR4_WORD0_CHANGE</div><div class='add'>+	| FATTR4_WORD0_SIZE</div><div class='add'>+	| FATTR4_WORD0_FSID</div><div class='add'>+	| FATTR4_WORD0_FILEID</div><div class='add'>+	| FATTR4_WORD0_FS_LOCATIONS,</div><div class='add'>+	FATTR4_WORD1_MODE</div><div class='add'>+	| FATTR4_WORD1_NUMLINKS</div><div class='add'>+	| FATTR4_WORD1_OWNER</div><div class='add'>+	| FATTR4_WORD1_OWNER_GROUP</div><div class='add'>+	| FATTR4_WORD1_RAWDEV</div><div class='add'>+	| FATTR4_WORD1_SPACE_USED</div><div class='add'>+	| FATTR4_WORD1_TIME_ACCESS</div><div class='add'>+	| FATTR4_WORD1_TIME_METADATA</div><div class='add'>+	| FATTR4_WORD1_TIME_MODIFY</div><div class='add'>+	| FATTR4_WORD1_MOUNTED_ON_FILEID</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,</div><div class='ctx'> 		struct nfs4_readdir_arg *readdir)</div><div class='ctx'> {</div><div class='hunk'>@@ -185,15 +202,15 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp</div><div class='ctx'> 	spin_unlock(&amp;clp-&gt;cl_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void update_changeattr(struct inode *inode, struct nfs4_change_info *cinfo)</div><div class='add'>+static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)</div><div class='ctx'> {</div><div class='del'>-	struct nfs_inode *nfsi = NFS_I(inode);</div><div class='add'>+	struct nfs_inode *nfsi = NFS_I(dir);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;inode-&gt;i_lock);</div><div class='del'>-	nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR;</div><div class='add'>+	spin_lock(&amp;dir-&gt;i_lock);</div><div class='add'>+	nfsi-&gt;cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;</div><div class='ctx'> 	if (cinfo-&gt;before == nfsi-&gt;change_attr &amp;&amp; cinfo-&gt;atomic)</div><div class='ctx'> 		nfsi-&gt;change_attr = cinfo-&gt;after;</div><div class='del'>-	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='add'>+	spin_unlock(&amp;dir-&gt;i_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct nfs4_opendata {</div><div class='hunk'>@@ -1331,7 +1348,7 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)</div><div class='add'>+int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_exception exception = { };</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1443,6 +1460,50 @@ out:</div><div class='ctx'> 	return nfs4_map_errors(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Get locations and (maybe) other attributes of a referral.</div><div class='add'>+ * Note that we'll actually follow the referral later when</div><div class='add'>+ * we detect fsid mismatch in inode revalidation</div><div class='add'>+ */</div><div class='add'>+static int nfs4_get_referral(struct inode *dir, struct qstr *name, struct nfs_fattr *fattr, struct nfs_fh *fhandle)</div><div class='add'>+{</div><div class='add'>+	int status = -ENOMEM;</div><div class='add'>+	struct page *page = NULL;</div><div class='add'>+	struct nfs4_fs_locations *locations = NULL;</div><div class='add'>+	struct dentry dentry = {};</div><div class='add'>+</div><div class='add'>+	page = alloc_page(GFP_KERNEL);</div><div class='add'>+	if (page == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+	locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL);</div><div class='add'>+	if (locations == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dentry.d_name.name = name-&gt;name;</div><div class='add'>+	dentry.d_name.len = name-&gt;len;</div><div class='add'>+	status = nfs4_proc_fs_locations(dir, &amp;dentry, locations, page);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Make sure server returned a different fsid for the referral */</div><div class='add'>+	if (nfs_fsid_equal(&amp;NFS_SERVER(dir)-&gt;fsid, &amp;locations-&gt;fattr.fsid)) {</div><div class='add'>+		dprintk("%s: server did not return a different fsid for a referral at %s\n", __FUNCTION__, name-&gt;name);</div><div class='add'>+		status = -EIO;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(fattr, &amp;locations-&gt;fattr, sizeof(struct nfs_fattr));</div><div class='add'>+	fattr-&gt;valid |= NFS_ATTR_FATTR_V4_REFERRAL;</div><div class='add'>+	if (!fattr-&gt;mode)</div><div class='add'>+		fattr-&gt;mode = S_IFDIR;</div><div class='add'>+	memset(fhandle, 0, sizeof(struct nfs_fh));</div><div class='add'>+out:</div><div class='add'>+	if (page)</div><div class='add'>+		__free_page(page);</div><div class='add'>+	if (locations)</div><div class='add'>+		kfree(locations);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_getattr_arg args = {</div><div class='hunk'>@@ -1547,6 +1608,8 @@ static int _nfs4_proc_lookup(struct inode *dir, struct qstr *name,</div><div class='ctx'> 	</div><div class='ctx'> 	dprintk("NFS call  lookup %s\n", name-&gt;name);</div><div class='ctx'> 	status = rpc_call_sync(NFS_CLIENT(dir), &amp;msg, 0);</div><div class='add'>+	if (status == -NFS4ERR_MOVED)</div><div class='add'>+		status = nfs4_get_referral(dir, name, fattr, fhandle);</div><div class='ctx'> 	dprintk("NFS reply lookup: %d\n", status);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -2008,7 +2071,7 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		update_changeattr(dir, &amp;res.cinfo);</div><div class='ctx'> 		nfs_post_op_update_inode(dir, res.dir_attr);</div><div class='del'>-		nfs_refresh_inode(inode, res.fattr);</div><div class='add'>+		nfs_post_op_update_inode(inode, res.fattr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -3081,9 +3144,6 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)</div><div class='ctx'> 		default:</div><div class='ctx'> 			BUG();</div><div class='ctx'> 	}</div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n",</div><div class='del'>-				__FUNCTION__);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3195,8 +3255,6 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Unlock _before_ we do the RPC call */</div><div class='del'>-	do_vfs_lock(fl-&gt;fl_file, fl);</div><div class='ctx'> 	return rpc_run_task(NFS_CLIENT(lsp-&gt;ls_state-&gt;inode), RPC_TASK_ASYNC, &amp;nfs4_locku_ops, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3207,30 +3265,28 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *</div><div class='ctx'> 	struct rpc_task *task;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	/* Is this a delegated lock? */</div><div class='del'>-	if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags))</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	/* Is this open_owner holding any locks on the server? */</div><div class='del'>-	if (test_bit(LK_STATE_IN_USE, &amp;state-&gt;flags) == 0)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-</div><div class='ctx'> 	status = nfs4_set_lock_state(state, request);</div><div class='add'>+	/* Unlock _before_ we do the RPC call */</div><div class='add'>+	request-&gt;fl_flags |= FL_EXISTS;</div><div class='add'>+	if (do_vfs_lock(request-&gt;fl_file, request) == -ENOENT)</div><div class='add'>+		goto out;</div><div class='ctx'> 	if (status != 0)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='add'>+	/* Is this a delegated lock? */</div><div class='add'>+	if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags))</div><div class='add'>+		goto out;</div><div class='ctx'> 	lsp = request-&gt;fl_u.nfs4_fl.owner;</div><div class='del'>-	status = -ENOMEM;</div><div class='ctx'> 	seqid = nfs_alloc_seqid(&amp;lsp-&gt;ls_seqid);</div><div class='add'>+	status = -ENOMEM;</div><div class='ctx'> 	if (seqid == NULL)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	task = nfs4_do_unlck(request, request-&gt;fl_file-&gt;private_data, lsp, seqid);</div><div class='ctx'> 	status = PTR_ERR(task);</div><div class='ctx'> 	if (IS_ERR(task))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	status = nfs4_wait_for_completion_rpc_task(task);</div><div class='ctx'> 	rpc_release_task(task);</div><div class='del'>-	return status;</div><div class='del'>-out_unlock:</div><div class='del'>-	do_vfs_lock(request-&gt;fl_file, request);</div><div class='add'>+out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3398,10 +3454,10 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request</div><div class='ctx'> 	struct nfs4_exception exception = { };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Cache the lock if possible... */</div><div class='del'>-	if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags))</div><div class='del'>-		return 0;</div><div class='ctx'> 	do {</div><div class='add'>+		/* Cache the lock if possible... */</div><div class='add'>+		if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags) != 0)</div><div class='add'>+			return 0;</div><div class='ctx'> 		err = _nfs4_do_setlk(state, F_SETLK, request, 1);</div><div class='ctx'> 		if (err != -NFS4ERR_DELAY)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3420,6 +3476,8 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request</div><div class='ctx'> 	if (err != 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	do {</div><div class='add'>+		if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags) != 0)</div><div class='add'>+			return 0;</div><div class='ctx'> 		err = _nfs4_do_setlk(state, F_SETLK, request, 0);</div><div class='ctx'> 		if (err != -NFS4ERR_DELAY)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -3431,29 +3489,42 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request</div><div class='ctx'> static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs4_client *clp = state-&gt;owner-&gt;so_client;</div><div class='add'>+	unsigned char fl_flags = request-&gt;fl_flags;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* Is this a delegated open? */</div><div class='del'>-	if (NFS_I(state-&gt;inode)-&gt;delegation_state != 0) {</div><div class='del'>-		/* Yes: cache locks! */</div><div class='del'>-		status = do_vfs_lock(request-&gt;fl_file, request);</div><div class='del'>-		/* ...but avoid races with delegation recall... */</div><div class='del'>-		if (status &lt; 0 || test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags))</div><div class='del'>-			return status;</div><div class='del'>-	}</div><div class='del'>-	down_read(&amp;clp-&gt;cl_sem);</div><div class='ctx'> 	status = nfs4_set_lock_state(state, request);</div><div class='ctx'> 	if (status != 0)</div><div class='ctx'> 		goto out;</div><div class='add'>+	request-&gt;fl_flags |= FL_ACCESS;</div><div class='add'>+	status = do_vfs_lock(request-&gt;fl_file, request);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	down_read(&amp;clp-&gt;cl_sem);</div><div class='add'>+	if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags)) {</div><div class='add'>+		struct nfs_inode *nfsi = NFS_I(state-&gt;inode);</div><div class='add'>+		/* Yes: cache locks! */</div><div class='add'>+		down_read(&amp;nfsi-&gt;rwsem);</div><div class='add'>+		/* ...but avoid races with delegation recall... */</div><div class='add'>+		if (test_bit(NFS_DELEGATED_STATE, &amp;state-&gt;flags)) {</div><div class='add'>+			request-&gt;fl_flags = fl_flags &amp; ~FL_SLEEP;</div><div class='add'>+			status = do_vfs_lock(request-&gt;fl_file, request);</div><div class='add'>+			up_read(&amp;nfsi-&gt;rwsem);</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+		up_read(&amp;nfsi-&gt;rwsem);</div><div class='add'>+	}</div><div class='ctx'> 	status = _nfs4_do_setlk(state, cmd, request, 0);</div><div class='ctx'> 	if (status != 0)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	/* Note: we always want to sleep here! */</div><div class='del'>-	request-&gt;fl_flags |= FL_SLEEP;</div><div class='add'>+	request-&gt;fl_flags = fl_flags | FL_SLEEP;</div><div class='ctx'> 	if (do_vfs_lock(request-&gt;fl_file, request) &lt; 0)</div><div class='ctx'> 		printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __FUNCTION__);</div><div class='del'>-out:</div><div class='add'>+out_unlock:</div><div class='ctx'> 	up_read(&amp;clp-&gt;cl_sem);</div><div class='add'>+out:</div><div class='add'>+	request-&gt;fl_flags = fl_flags;</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3570,6 +3641,36 @@ ssize_t nfs4_listxattr(struct dentry *dentry, char *buf, size_t buflen)</div><div class='ctx'> 	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int nfs4_proc_fs_locations(struct inode *dir, struct dentry *dentry,</div><div class='add'>+		struct nfs4_fs_locations *fs_locations, struct page *page)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SERVER(dir);</div><div class='add'>+	u32 bitmask[2] = {</div><div class='add'>+		[0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS,</div><div class='add'>+		[1] = FATTR4_WORD1_MOUNTED_ON_FILEID,</div><div class='add'>+	};</div><div class='add'>+	struct nfs4_fs_locations_arg args = {</div><div class='add'>+		.dir_fh = NFS_FH(dir),</div><div class='add'>+		.name = &amp;dentry-&gt;d_name,</div><div class='add'>+		.page = page,</div><div class='add'>+		.bitmask = bitmask,</div><div class='add'>+	};</div><div class='add'>+	struct rpc_message msg = {</div><div class='add'>+		.rpc_proc = &amp;nfs4_procedures[NFSPROC4_CLNT_FS_LOCATIONS],</div><div class='add'>+		.rpc_argp = &amp;args,</div><div class='add'>+		.rpc_resp = fs_locations,</div><div class='add'>+	};</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	dprintk("%s: start\n", __FUNCTION__);</div><div class='add'>+	fs_locations-&gt;fattr.valid = 0;</div><div class='add'>+	fs_locations-&gt;server = server;</div><div class='add'>+	fs_locations-&gt;nlocations = 0;</div><div class='add'>+	status = rpc_call_sync(server-&gt;client, &amp;msg, 0);</div><div class='add'>+	dprintk("%s: returned status = %d\n", __FUNCTION__, status);</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops = {</div><div class='ctx'> 	.recover_open	= nfs4_open_reclaim,</div><div class='ctx'> 	.recover_lock	= nfs4_lock_reclaim,</div><div class='head'>diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c<br/>index 96e5b82c153b..090a36b07a22 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs4state.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4state.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs4state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs4state.c</a></div><div class='hunk'>@@ -38,7 +38,6 @@</div><div class='ctx'>  * subsequent patch.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_fs.h&gt;</div><div class='head'>diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c<br/>index 7c5d70efe720..1750d996f49f 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/nfs4xdr.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/nfs4xdr.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/nfs4xdr.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/nfs4xdr.c</a></div><div class='hunk'>@@ -411,6 +411,15 @@ static int nfs_stat_to_errno(int);</div><div class='ctx'> #define NFS4_dec_setacl_sz	(compound_decode_hdr_maxsz + \</div><div class='ctx'> 				decode_putfh_maxsz + \</div><div class='ctx'> 				op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz)</div><div class='add'>+#define NFS4_enc_fs_locations_sz \</div><div class='add'>+				(compound_encode_hdr_maxsz + \</div><div class='add'>+				 encode_putfh_maxsz + \</div><div class='add'>+				 encode_getattr_maxsz)</div><div class='add'>+#define NFS4_dec_fs_locations_sz \</div><div class='add'>+				(compound_decode_hdr_maxsz + \</div><div class='add'>+				 decode_putfh_maxsz + \</div><div class='add'>+				 op_decode_hdr_maxsz + \</div><div class='add'>+				 nfs4_fattr_bitmap_maxsz)</div><div class='ctx'> </div><div class='ctx'> static struct {</div><div class='ctx'> 	unsigned int	mode;</div><div class='hunk'>@@ -722,6 +731,13 @@ static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask)</div><div class='ctx'> 			bitmask[1] &amp; nfs4_fsinfo_bitmap[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int encode_fs_locations(struct xdr_stream *xdr, const u32* bitmask)</div><div class='add'>+{</div><div class='add'>+	return encode_getattr_two(xdr,</div><div class='add'>+				  bitmask[0] &amp; nfs4_fs_locations_bitmap[0],</div><div class='add'>+				  bitmask[1] &amp; nfs4_fs_locations_bitmap[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int encode_getfh(struct xdr_stream *xdr)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='hunk'>@@ -2003,6 +2019,38 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * Encode FS_LOCATIONS request</div><div class='add'>+ */</div><div class='add'>+static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs_locations_arg *args)</div><div class='add'>+{</div><div class='add'>+	struct xdr_stream xdr;</div><div class='add'>+	struct compound_hdr hdr = {</div><div class='add'>+		.nops = 3,</div><div class='add'>+	};</div><div class='add'>+	struct rpc_auth *auth = req-&gt;rq_task-&gt;tk_auth;</div><div class='add'>+	int replen;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	xdr_init_encode(&amp;xdr, &amp;req-&gt;rq_snd_buf, p);</div><div class='add'>+	encode_compound_hdr(&amp;xdr, &amp;hdr);</div><div class='add'>+	if ((status = encode_putfh(&amp;xdr, args-&gt;dir_fh)) != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if ((status = encode_lookup(&amp;xdr, args-&gt;name)) != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if ((status = encode_fs_locations(&amp;xdr, args-&gt;bitmask)) != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	/* set up reply</div><div class='add'>+	 *   toplevel_status + OP_PUTFH + status</div><div class='add'>+	 *   + OP_LOOKUP + status + OP_GETATTR + status = 7</div><div class='add'>+	 */</div><div class='add'>+	replen = (RPC_REPHDRSIZE + auth-&gt;au_rslack + 7) &lt;&lt; 2;</div><div class='add'>+	xdr_inline_pages(&amp;req-&gt;rq_rcv_buf, replen, &amp;args-&gt;page,</div><div class='add'>+			0, PAGE_SIZE);</div><div class='add'>+out:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * START OF "GENERIC" DECODE ROUTINES.</div><div class='ctx'>  *   These may look a little ugly since they are imported from a "generic"</div><div class='ctx'>  * set of XDR encode/decode routines which are intended to be shared by</div><div class='hunk'>@@ -2036,7 +2084,7 @@ out:</div><div class='ctx'> 	} \</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-static int decode_opaque_inline(struct xdr_stream *xdr, uint32_t *len, char **string)</div><div class='add'>+static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='ctx'> </div><div class='hunk'>@@ -2087,7 +2135,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)</div><div class='ctx'> static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs4_client *clp)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='del'>-	uint32_t strlen;</div><div class='add'>+	unsigned int strlen;</div><div class='ctx'> 	char *str;</div><div class='ctx'> </div><div class='ctx'> 	READ_BUF(12);</div><div class='hunk'>@@ -2217,7 +2265,7 @@ static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fsid *fsid)</div><div class='add'>+static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_fsid *fsid)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='ctx'> </div><div class='hunk'>@@ -2285,6 +2333,22 @@ static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid)</div><div class='add'>+{</div><div class='add'>+	uint32_t *p;</div><div class='add'>+</div><div class='add'>+	*fileid = 0;</div><div class='add'>+	if (unlikely(bitmap[1] &amp; (FATTR4_WORD1_MOUNTED_ON_FILEID - 1U)))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (likely(bitmap[1] &amp; FATTR4_WORD1_MOUNTED_ON_FILEID)) {</div><div class='add'>+		READ_BUF(8);</div><div class='add'>+		READ64(*fileid);</div><div class='add'>+		bitmap[1] &amp;= ~FATTR4_WORD1_MOUNTED_ON_FILEID;</div><div class='add'>+	}</div><div class='add'>+	dprintk("%s: fileid=%Lu\n", __FUNCTION__, (unsigned long long)*fileid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='hunk'>@@ -2336,6 +2400,116 @@ static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uin</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path)</div><div class='add'>+{</div><div class='add'>+	int n;</div><div class='add'>+	uint32_t *p;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	READ_BUF(4);</div><div class='add'>+	READ32(n);</div><div class='add'>+	if (n &lt; 0)</div><div class='add'>+		goto out_eio;</div><div class='add'>+	if (n == 0)</div><div class='add'>+		goto root_path;</div><div class='add'>+	dprintk("path ");</div><div class='add'>+	path-&gt;ncomponents = 0;</div><div class='add'>+	while (path-&gt;ncomponents &lt; n) {</div><div class='add'>+		struct nfs4_string *component = &amp;path-&gt;components[path-&gt;ncomponents];</div><div class='add'>+		status = decode_opaque_inline(xdr, &amp;component-&gt;len, &amp;component-&gt;data);</div><div class='add'>+		if (unlikely(status != 0))</div><div class='add'>+			goto out_eio;</div><div class='add'>+		if (path-&gt;ncomponents != n)</div><div class='add'>+			dprintk("/");</div><div class='add'>+		dprintk("%s", component-&gt;data);</div><div class='add'>+		if (path-&gt;ncomponents &lt; NFS4_PATHNAME_MAXCOMPONENTS)</div><div class='add'>+			path-&gt;ncomponents++;</div><div class='add'>+		else {</div><div class='add'>+			dprintk("cannot parse %d components in path\n", n);</div><div class='add'>+			goto out_eio;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	dprintk("\n");</div><div class='add'>+	return status;</div><div class='add'>+root_path:</div><div class='add'>+/* a root pathname is sent as a zero component4 */</div><div class='add'>+	path-&gt;ncomponents = 1;</div><div class='add'>+	path-&gt;components[0].len=0;</div><div class='add'>+	path-&gt;components[0].data=NULL;</div><div class='add'>+	dprintk("path /\n");</div><div class='add'>+	goto out;</div><div class='add'>+out_eio:</div><div class='add'>+	dprintk(" status %d", status);</div><div class='add'>+	status = -EIO;</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res)</div><div class='add'>+{</div><div class='add'>+	int n;</div><div class='add'>+	uint32_t *p;</div><div class='add'>+	int status = -EIO;</div><div class='add'>+</div><div class='add'>+	if (unlikely(bitmap[0] &amp; (FATTR4_WORD0_FS_LOCATIONS -1U)))</div><div class='add'>+		goto out;</div><div class='add'>+	status = 0;</div><div class='add'>+	if (unlikely(!(bitmap[0] &amp; FATTR4_WORD0_FS_LOCATIONS)))</div><div class='add'>+		goto out;</div><div class='add'>+	dprintk("%s: fsroot ", __FUNCTION__);</div><div class='add'>+	status = decode_pathname(xdr, &amp;res-&gt;fs_path);</div><div class='add'>+	if (unlikely(status != 0))</div><div class='add'>+		goto out;</div><div class='add'>+	READ_BUF(4);</div><div class='add'>+	READ32(n);</div><div class='add'>+	if (n &lt;= 0)</div><div class='add'>+		goto out_eio;</div><div class='add'>+	res-&gt;nlocations = 0;</div><div class='add'>+	while (res-&gt;nlocations &lt; n) {</div><div class='add'>+		int m;</div><div class='add'>+		struct nfs4_fs_location *loc = &amp;res-&gt;locations[res-&gt;nlocations];</div><div class='add'>+</div><div class='add'>+		READ_BUF(4);</div><div class='add'>+		READ32(m);</div><div class='add'>+		if (m &lt;= 0)</div><div class='add'>+			goto out_eio;</div><div class='add'>+</div><div class='add'>+		loc-&gt;nservers = 0;</div><div class='add'>+		dprintk("%s: servers ", __FUNCTION__);</div><div class='add'>+		while (loc-&gt;nservers &lt; m) {</div><div class='add'>+			struct nfs4_string *server = &amp;loc-&gt;servers[loc-&gt;nservers];</div><div class='add'>+			status = decode_opaque_inline(xdr, &amp;server-&gt;len, &amp;server-&gt;data);</div><div class='add'>+			if (unlikely(status != 0))</div><div class='add'>+				goto out_eio;</div><div class='add'>+			dprintk("%s ", server-&gt;data);</div><div class='add'>+			if (loc-&gt;nservers &lt; NFS4_FS_LOCATION_MAXSERVERS)</div><div class='add'>+				loc-&gt;nservers++;</div><div class='add'>+			else {</div><div class='add'>+				int i;</div><div class='add'>+				dprintk("%s: using first %d of %d servers returned for location %d\n", __FUNCTION__, NFS4_FS_LOCATION_MAXSERVERS, m, res-&gt;nlocations);</div><div class='add'>+				for (i = loc-&gt;nservers; i &lt; m; i++) {</div><div class='add'>+					int len;</div><div class='add'>+					char *data;</div><div class='add'>+					status = decode_opaque_inline(xdr, &amp;len, &amp;data);</div><div class='add'>+					if (unlikely(status != 0))</div><div class='add'>+						goto out_eio;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		status = decode_pathname(xdr, &amp;loc-&gt;rootpath);</div><div class='add'>+		if (unlikely(status != 0))</div><div class='add'>+			goto out_eio;</div><div class='add'>+		if (res-&gt;nlocations &lt; NFS4_FS_LOCATIONS_MAXENTRIES)</div><div class='add'>+			res-&gt;nlocations++;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	dprintk("%s: fs_locations done, error = %d\n", __FUNCTION__, status);</div><div class='add'>+	return status;</div><div class='add'>+out_eio:</div><div class='add'>+	status = -EIO;</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t *p;</div><div class='hunk'>@@ -2841,6 +3015,7 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons</div><div class='ctx'> 		 bitmap[2] = {0},</div><div class='ctx'> 		 type;</div><div class='ctx'> 	int status, fmode = 0;</div><div class='add'>+	uint64_t fileid;</div><div class='ctx'> </div><div class='ctx'> 	if ((status = decode_op_hdr(xdr, OP_GETATTR)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='hunk'>@@ -2863,10 +3038,14 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons</div><div class='ctx'> 		goto xdr_error;</div><div class='ctx'> 	if ((status = decode_attr_size(xdr, bitmap, &amp;fattr-&gt;size)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='del'>-	if ((status = decode_attr_fsid(xdr, bitmap, &amp;fattr-&gt;fsid_u.nfs4)) != 0)</div><div class='add'>+	if ((status = decode_attr_fsid(xdr, bitmap, &amp;fattr-&gt;fsid)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='ctx'> 	if ((status = decode_attr_fileid(xdr, bitmap, &amp;fattr-&gt;fileid)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='add'>+	if ((status = decode_attr_fs_locations(xdr, bitmap, container_of(fattr,</div><div class='add'>+						struct nfs4_fs_locations,</div><div class='add'>+						fattr))) != 0)</div><div class='add'>+		goto xdr_error;</div><div class='ctx'> 	if ((status = decode_attr_mode(xdr, bitmap, &amp;fattr-&gt;mode)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='ctx'> 	fattr-&gt;mode |= fmode;</div><div class='hunk'>@@ -2886,6 +3065,10 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons</div><div class='ctx'> 		goto xdr_error;</div><div class='ctx'> 	if ((status = decode_attr_time_modify(xdr, bitmap, &amp;fattr-&gt;mtime)) != 0)</div><div class='ctx'> 		goto xdr_error;</div><div class='add'>+	if ((status = decode_attr_mounted_on_fileid(xdr, bitmap, &amp;fileid)) != 0)</div><div class='add'>+		goto xdr_error;</div><div class='add'>+	if (fattr-&gt;fileid == 0 &amp;&amp; fileid != 0)</div><div class='add'>+		fattr-&gt;fileid = fileid;</div><div class='ctx'> 	if ((status = verify_attr_len(xdr, savep, attrlen)) == 0)</div><div class='ctx'> 		fattr-&gt;valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4;</div><div class='ctx'> xdr_error:</div><div class='hunk'>@@ -3350,8 +3533,7 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,</div><div class='ctx'> 					attrlen, recvd);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (attrlen &lt;= *acl_len)</div><div class='del'>-			xdr_read_pages(xdr, attrlen);</div><div class='add'>+		xdr_read_pages(xdr, attrlen);</div><div class='ctx'> 		*acl_len = attrlen;</div><div class='ctx'> 	} else</div><div class='ctx'> 		status = -EOPNOTSUPP;</div><div class='hunk'>@@ -4211,6 +4393,29 @@ out:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * FS_LOCATIONS request</div><div class='add'>+ */</div><div class='add'>+static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs_locations *res)</div><div class='add'>+{</div><div class='add'>+	struct xdr_stream xdr;</div><div class='add'>+	struct compound_hdr hdr;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	xdr_init_decode(&amp;xdr, &amp;req-&gt;rq_rcv_buf, p);</div><div class='add'>+	status = decode_compound_hdr(&amp;xdr, &amp;hdr);</div><div class='add'>+	if (status != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if ((status = decode_putfh(&amp;xdr)) != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	if ((status = decode_lookup(&amp;xdr)) != 0)</div><div class='add'>+		goto out;</div><div class='add'>+	xdr_enter_page(&amp;xdr, PAGE_SIZE);</div><div class='add'>+	status = decode_getfattr(&amp;xdr, &amp;res-&gt;fattr, res-&gt;server);</div><div class='add'>+out:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus)</div><div class='ctx'> {</div><div class='ctx'> 	uint32_t bitmap[2] = {0};</div><div class='hunk'>@@ -4382,6 +4587,7 @@ struct rpc_procinfo	nfs4_procedures[] = {</div><div class='ctx'>   PROC(DELEGRETURN,	enc_delegreturn, dec_delegreturn),</div><div class='ctx'>   PROC(GETACL,		enc_getacl,	dec_getacl),</div><div class='ctx'>   PROC(SETACL,		enc_setacl,	dec_setacl),</div><div class='add'>+  PROC(FS_LOCATIONS,	enc_fs_locations, dec_fs_locations),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rpc_version		nfs_version4 = {</div><div class='head'>diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c<br/>index 106aca388ebc..36e902a88ca1 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/pagelist.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/pagelist.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/pagelist.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/pagelist.c</a></div><div class='hunk'>@@ -9,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/sunrpc/clnt.h&gt;</div><div class='hunk'>@@ -315,6 +314,7 @@ nfs_scan_lock_dirty(struct nfs_inode *nfsi, struct list_head *dst,</div><div class='ctx'> 						req-&gt;wb_index, NFS_PAGE_TAG_DIRTY);</div><div class='ctx'> 				nfs_list_remove_request(req);</div><div class='ctx'> 				nfs_list_add_request(req, dst);</div><div class='add'>+				dec_zone_page_state(req-&gt;wb_page, NR_FILE_DIRTY);</div><div class='ctx'> 				res++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -325,6 +325,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * nfs_scan_list - Scan a list for matching requests</div><div class='add'>+ * @nfsi: NFS inode</div><div class='ctx'>  * @head: One of the NFS inode request lists</div><div class='ctx'>  * @dst: Destination list</div><div class='ctx'>  * @idx_start: lower bound of page-&gt;index to scan</div><div class='hunk'>@@ -336,14 +337,15 @@ out:</div><div class='ctx'>  * The requests are *not* checked to ensure that they form a contiguous set.</div><div class='ctx'>  * You must be holding the inode's req_lock when calling this function</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='del'>-nfs_scan_list(struct list_head *head, struct list_head *dst,</div><div class='del'>-	      unsigned long idx_start, unsigned int npages)</div><div class='add'>+int nfs_scan_list(struct nfs_inode *nfsi, struct list_head *head,</div><div class='add'>+		struct list_head *dst, unsigned long idx_start,</div><div class='add'>+		unsigned int npages)</div><div class='ctx'> {</div><div class='del'>-	struct list_head	*pos, *tmp;</div><div class='del'>-	struct nfs_page		*req;</div><div class='del'>-	unsigned long		idx_end;</div><div class='del'>-	int			res;</div><div class='add'>+	struct nfs_page *pgvec[NFS_SCAN_MAXENTRIES];</div><div class='add'>+	struct nfs_page *req;</div><div class='add'>+	unsigned long idx_end;</div><div class='add'>+	int found, i;</div><div class='add'>+	int res;</div><div class='ctx'> </div><div class='ctx'> 	res = 0;</div><div class='ctx'> 	if (npages == 0)</div><div class='hunk'>@@ -351,25 +353,32 @@ nfs_scan_list(struct list_head *head, struct list_head *dst,</div><div class='ctx'> 	else</div><div class='ctx'> 		idx_end = idx_start + npages - 1;</div><div class='ctx'> </div><div class='del'>-	list_for_each_safe(pos, tmp, head) {</div><div class='del'>-</div><div class='del'>-		req = nfs_list_entry(pos);</div><div class='del'>-</div><div class='del'>-		if (req-&gt;wb_index &lt; idx_start)</div><div class='del'>-			continue;</div><div class='del'>-		if (req-&gt;wb_index &gt; idx_end)</div><div class='add'>+	for (;;) {</div><div class='add'>+		found = radix_tree_gang_lookup(&amp;nfsi-&gt;nfs_page_tree,</div><div class='add'>+				(void **)&amp;pgvec[0], idx_start,</div><div class='add'>+				NFS_SCAN_MAXENTRIES);</div><div class='add'>+		if (found &lt;= 0)</div><div class='ctx'> 			break;</div><div class='add'>+		for (i = 0; i &lt; found; i++) {</div><div class='add'>+			req = pgvec[i];</div><div class='add'>+			if (req-&gt;wb_index &gt; idx_end)</div><div class='add'>+				goto out;</div><div class='add'>+			idx_start = req-&gt;wb_index + 1;</div><div class='add'>+			if (req-&gt;wb_list_head != head)</div><div class='add'>+				continue;</div><div class='add'>+			if (nfs_set_page_writeback_locked(req)) {</div><div class='add'>+				nfs_list_remove_request(req);</div><div class='add'>+				nfs_list_add_request(req, dst);</div><div class='add'>+				res++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (!nfs_set_page_writeback_locked(req))</div><div class='del'>-			continue;</div><div class='del'>-		nfs_list_remove_request(req);</div><div class='del'>-		nfs_list_add_request(req, dst);</div><div class='del'>-		res++;</div><div class='ctx'> 	}</div><div class='add'>+out:</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfs_init_nfspagecache(void)</div><div class='add'>+int __init nfs_init_nfspagecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_page_cachep = kmem_cache_create("nfs_page",</div><div class='ctx'> 					    sizeof(struct nfs_page),</div><div class='head'>diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c<br/>index 9dd85cac2df0..b3899ea3229e 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/proc.c</a></div><div class='hunk'>@@ -44,11 +44,10 @@</div><div class='ctx'> #include &lt;linux/nfs_page.h&gt;</div><div class='ctx'> #include &lt;linux/lockd/bind.h&gt;</div><div class='ctx'> #include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include "internal.h"</div><div class='ctx'> </div><div class='ctx'> #define NFSDBG_FACILITY		NFSDBG_PROC</div><div class='ctx'> </div><div class='del'>-extern struct rpc_procinfo nfs_procedures[];</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Bare-bones access to getattr: this is for nfs_read_super.</div><div class='ctx'>  */</div><div class='hunk'>@@ -611,8 +610,6 @@ nfs_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int);</div><div class='del'>-</div><div class='ctx'> static int nfs_read_done(struct rpc_task *task, struct nfs_read_data *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (task-&gt;tk_status &gt;= 0) {</div><div class='head'>diff --git a/fs/nfs/read.c b/fs/nfs/read.c<br/>index 624ca7146b6b..52bf634260a1 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/read.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/read.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/read.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/read.c</a></div><div class='hunk'>@@ -15,7 +15,6 @@</div><div class='ctx'>  * within the RPC code when root squashing is suspected.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -51,14 +50,11 @@ struct nfs_read_data *nfs_readdata_alloc(unsigned int pagecount)</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		memset(p, 0, sizeof(*p));</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;p-&gt;pages);</div><div class='del'>-		if (pagecount &lt; NFS_PAGEVEC_SIZE)</div><div class='del'>-			p-&gt;pagevec = &amp;p-&gt;page_array[0];</div><div class='add'>+		if (pagecount &lt;= ARRAY_SIZE(p-&gt;page_array))</div><div class='add'>+			p-&gt;pagevec = p-&gt;page_array;</div><div class='ctx'> 		else {</div><div class='del'>-			size_t size = ++pagecount * sizeof(struct page *);</div><div class='del'>-			p-&gt;pagevec = kmalloc(size, GFP_NOFS);</div><div class='del'>-			if (p-&gt;pagevec) {</div><div class='del'>-				memset(p-&gt;pagevec, 0, size);</div><div class='del'>-			} else {</div><div class='add'>+			p-&gt;pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS);</div><div class='add'>+			if (!p-&gt;pagevec) {</div><div class='ctx'> 				mempool_free(p, nfs_rdata_mempool);</div><div class='ctx'> 				p = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -104,6 +100,28 @@ int nfs_return_empty_page(struct page *page)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nfs_readpage_truncate_uninitialised_page(struct nfs_read_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int remainder = data-&gt;args.count - data-&gt;res.count;</div><div class='add'>+	unsigned int base = data-&gt;args.pgbase + data-&gt;res.count;</div><div class='add'>+	unsigned int pglen;</div><div class='add'>+	struct page **pages;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;res.eof == 0 || remainder == 0)</div><div class='add'>+		return;</div><div class='add'>+	/*</div><div class='add'>+	 * Note: "remainder" can never be negative, since we check for</div><div class='add'>+	 * 	this in the XDR code.</div><div class='add'>+	 */</div><div class='add'>+	pages = &amp;data-&gt;args.pages[base &gt;&gt; PAGE_CACHE_SHIFT];</div><div class='add'>+	base &amp;= ~PAGE_CACHE_MASK;</div><div class='add'>+	pglen = PAGE_CACHE_SIZE - base;</div><div class='add'>+	if (pglen &lt; remainder)</div><div class='add'>+		memclear_highpage_flush(*pages, base, pglen);</div><div class='add'>+	else</div><div class='add'>+		memclear_highpage_flush(*pages, base, remainder);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Read a page synchronously.</div><div class='ctx'>  */</div><div class='hunk'>@@ -177,11 +195,9 @@ static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,</div><div class='ctx'> 	NFS_I(inode)-&gt;cache_validity |= NFS_INO_INVALID_ATIME;</div><div class='ctx'> 	spin_unlock(&amp;inode-&gt;i_lock);</div><div class='ctx'> </div><div class='del'>-	if (count)</div><div class='del'>-		memclear_highpage_flush(page, rdata-&gt;args.pgbase, count);</div><div class='del'>-	SetPageUptodate(page);</div><div class='del'>-	if (PageError(page))</div><div class='del'>-		ClearPageError(page);</div><div class='add'>+	nfs_readpage_truncate_uninitialised_page(rdata);</div><div class='add'>+	if (rdata-&gt;res.eof || rdata-&gt;res.count == rdata-&gt;args.count)</div><div class='add'>+		SetPageUptodate(page);</div><div class='ctx'> 	result = 0;</div><div class='ctx'> </div><div class='ctx'> io_error:</div><div class='hunk'>@@ -436,20 +452,12 @@ static void nfs_readpage_result_partial(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	struct nfs_page *req = data-&gt;req;</div><div class='ctx'> 	struct page *page = req-&gt;wb_page;</div><div class='ctx'>  </div><div class='add'>+	if (likely(task-&gt;tk_status &gt;= 0))</div><div class='add'>+		nfs_readpage_truncate_uninitialised_page(data);</div><div class='add'>+	else</div><div class='add'>+		SetPageError(page);</div><div class='ctx'> 	if (nfs_readpage_result(task, data) != 0)</div><div class='ctx'> 		return;</div><div class='del'>-	if (task-&gt;tk_status &gt;= 0) {</div><div class='del'>-		unsigned int request = data-&gt;args.count;</div><div class='del'>-		unsigned int result = data-&gt;res.count;</div><div class='del'>-</div><div class='del'>-		if (result &lt; request) {</div><div class='del'>-			memclear_highpage_flush(page,</div><div class='del'>-						data-&gt;args.pgbase + result,</div><div class='del'>-						request - result);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		SetPageError(page);</div><div class='del'>-</div><div class='ctx'> 	if (atomic_dec_and_test(&amp;req-&gt;wb_complete)) {</div><div class='ctx'> 		if (!PageError(page))</div><div class='ctx'> 			SetPageUptodate(page);</div><div class='hunk'>@@ -462,6 +470,40 @@ static const struct rpc_call_ops nfs_read_partial_ops = {</div><div class='ctx'> 	.rpc_release = nfs_readdata_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void nfs_readpage_set_pages_uptodate(struct nfs_read_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = data-&gt;res.count;</div><div class='add'>+	unsigned int base = data-&gt;args.pgbase;</div><div class='add'>+	struct page **pages;</div><div class='add'>+</div><div class='add'>+	if (unlikely(count == 0))</div><div class='add'>+		return;</div><div class='add'>+	pages = &amp;data-&gt;args.pages[base &gt;&gt; PAGE_CACHE_SHIFT];</div><div class='add'>+	base &amp;= ~PAGE_CACHE_MASK;</div><div class='add'>+	count += base;</div><div class='add'>+	for (;count &gt;= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)</div><div class='add'>+		SetPageUptodate(*pages);</div><div class='add'>+	/*</div><div class='add'>+	 * Was this an eof or a short read? If the latter, don't mark the page</div><div class='add'>+	 * as uptodate yet.</div><div class='add'>+	 */</div><div class='add'>+	if (count &gt; 0 &amp;&amp; (data-&gt;res.eof || data-&gt;args.count == data-&gt;res.count))</div><div class='add'>+		SetPageUptodate(*pages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_readpage_set_pages_error(struct nfs_read_data *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = data-&gt;args.count;</div><div class='add'>+	unsigned int base = data-&gt;args.pgbase;</div><div class='add'>+	struct page **pages;</div><div class='add'>+</div><div class='add'>+	pages = &amp;data-&gt;args.pages[base &gt;&gt; PAGE_CACHE_SHIFT];</div><div class='add'>+	base &amp;= ~PAGE_CACHE_MASK;</div><div class='add'>+	count += base;</div><div class='add'>+	for (;count &gt;= PAGE_CACHE_SIZE; count -= PAGE_CACHE_SIZE, pages++)</div><div class='add'>+		SetPageError(*pages);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * This is the callback from RPC telling us whether a reply was</div><div class='ctx'>  * received or some error occurred (timeout or socket shutdown).</div><div class='hunk'>@@ -469,27 +511,24 @@ static const struct rpc_call_ops nfs_read_partial_ops = {</div><div class='ctx'> static void nfs_readpage_result_full(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_read_data *data = calldata;</div><div class='del'>-	unsigned int count = data-&gt;res.count;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Note: nfs_readpage_result may change the values of</div><div class='add'>+	 * data-&gt;args. In the multi-page case, we therefore need</div><div class='add'>+	 * to ensure that we call the next nfs_readpage_set_page_uptodate()</div><div class='add'>+	 * first in the multi-page case.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(task-&gt;tk_status &gt;= 0)) {</div><div class='add'>+		nfs_readpage_truncate_uninitialised_page(data);</div><div class='add'>+		nfs_readpage_set_pages_uptodate(data);</div><div class='add'>+	} else</div><div class='add'>+		nfs_readpage_set_pages_error(data);</div><div class='ctx'> 	if (nfs_readpage_result(task, data) != 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	while (!list_empty(&amp;data-&gt;pages)) {</div><div class='ctx'> 		struct nfs_page *req = nfs_list_entry(data-&gt;pages.next);</div><div class='del'>-		struct page *page = req-&gt;wb_page;</div><div class='del'>-		nfs_list_remove_request(req);</div><div class='ctx'> </div><div class='del'>-		if (task-&gt;tk_status &gt;= 0) {</div><div class='del'>-			if (count &lt; PAGE_CACHE_SIZE) {</div><div class='del'>-				if (count &lt; req-&gt;wb_bytes)</div><div class='del'>-					memclear_highpage_flush(page,</div><div class='del'>-							req-&gt;wb_pgbase + count,</div><div class='del'>-							req-&gt;wb_bytes - count);</div><div class='del'>-				count = 0;</div><div class='del'>-			} else</div><div class='del'>-				count -= PAGE_CACHE_SIZE;</div><div class='del'>-			SetPageUptodate(page);</div><div class='del'>-		} else</div><div class='del'>-			SetPageError(page);</div><div class='add'>+		nfs_list_remove_request(req);</div><div class='ctx'> 		nfs_readpage_release(req);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -654,7 +693,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfs_init_readpagecache(void)</div><div class='add'>+int __init nfs_init_readpagecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_rdata_cachep = kmem_cache_create("nfs_read_data",</div><div class='ctx'> 					     sizeof(struct nfs_read_data),</div><div class='head'>diff --git a/fs/nfs/super.c b/fs/nfs/super.c<br/>new file mode 100644<br/>index 000000000000..e8a9bee74d9d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/super.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/super.c</a></div><div class='hunk'>@@ -0,0 +1,1537 @@</div><div class='add'>+/*</div><div class='add'>+ *  linux/fs/nfs/super.c</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 1992  Rick Sladkey</div><div class='add'>+ *</div><div class='add'>+ *  nfs superblock handling functions</div><div class='add'>+ *</div><div class='add'>+ *  Modularised by Alan Cox &lt;Alan.Cox@linux.org&gt;, while hacking some</div><div class='add'>+ *  experimental NFS changes. Modularisation taken straight from SYS5 fs.</div><div class='add'>+ *</div><div class='add'>+ *  Change to nfs_read_super() to permit NFS mounts to multi-homed hosts.</div><div class='add'>+ *  J.S.Peatfield@damtp.cam.ac.uk</div><div class='add'>+ *</div><div class='add'>+ *  Split from inode.c by David Howells &lt;dhowells@redhat.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/config.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/stat.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/unistd.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/clnt.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/stats.h&gt;</div><div class='add'>+#include &lt;linux/sunrpc/metrics.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='add'>+#include &lt;linux/nfs_mount.h&gt;</div><div class='add'>+#include &lt;linux/nfs4_mount.h&gt;</div><div class='add'>+#include &lt;linux/lockd/bind.h&gt;</div><div class='add'>+#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/mount.h&gt;</div><div class='add'>+#include &lt;linux/nfs_idmap.h&gt;</div><div class='add'>+#include &lt;linux/vfs.h&gt;</div><div class='add'>+#include &lt;linux/inet.h&gt;</div><div class='add'>+#include &lt;linux/nfs_xdr.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;asm/system.h&gt;</div><div class='add'>+#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include "nfs4_fs.h"</div><div class='add'>+#include "callback.h"</div><div class='add'>+#include "delegation.h"</div><div class='add'>+#include "iostat.h"</div><div class='add'>+#include "internal.h"</div><div class='add'>+</div><div class='add'>+#define NFSDBG_FACILITY		NFSDBG_VFS</div><div class='add'>+</div><div class='add'>+/* Maximum number of readahead requests</div><div class='add'>+ * FIXME: this should really be a sysctl so that users may tune it to suit</div><div class='add'>+ *        their needs. People that do NFS over a slow network, might for</div><div class='add'>+ *        instance want to reduce it to something closer to 1 for improved</div><div class='add'>+ *        interactive response.</div><div class='add'>+ */</div><div class='add'>+#define NFS_MAX_READAHEAD	(RPC_DEF_SLOT_TABLE - 1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * RPC cruft for NFS</div><div class='add'>+ */</div><div class='add'>+static struct rpc_version * nfs_version[] = {</div><div class='add'>+	NULL,</div><div class='add'>+	NULL,</div><div class='add'>+	&amp;nfs_version2,</div><div class='add'>+#if defined(CONFIG_NFS_V3)</div><div class='add'>+	&amp;nfs_version3,</div><div class='add'>+#elif defined(CONFIG_NFS_V4)</div><div class='add'>+	NULL,</div><div class='add'>+#endif</div><div class='add'>+#if defined(CONFIG_NFS_V4)</div><div class='add'>+	&amp;nfs_version4,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct rpc_program nfs_program = {</div><div class='add'>+	.name			= "nfs",</div><div class='add'>+	.number			= NFS_PROGRAM,</div><div class='add'>+	.nrvers			= ARRAY_SIZE(nfs_version),</div><div class='add'>+	.version		= nfs_version,</div><div class='add'>+	.stats			= &amp;nfs_rpcstat,</div><div class='add'>+	.pipe_dir_name		= "/nfs",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpc_stat nfs_rpcstat = {</div><div class='add'>+	.program		= &amp;nfs_program</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V3_ACL</div><div class='add'>+static struct rpc_stat		nfsacl_rpcstat = { &amp;nfsacl_program };</div><div class='add'>+static struct rpc_version *	nfsacl_version[] = {</div><div class='add'>+	[3]			= &amp;nfsacl_version3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rpc_program		nfsacl_program = {</div><div class='add'>+	.name =			"nfsacl",</div><div class='add'>+	.number =		NFS_ACL_PROGRAM,</div><div class='add'>+	.nrvers =		ARRAY_SIZE(nfsacl_version),</div><div class='add'>+	.version =		nfsacl_version,</div><div class='add'>+	.stats =		&amp;nfsacl_rpcstat,</div><div class='add'>+};</div><div class='add'>+#endif  /* CONFIG_NFS_V3_ACL */</div><div class='add'>+</div><div class='add'>+static void nfs_umount_begin(struct vfsmount *, int);</div><div class='add'>+static int  nfs_statfs(struct dentry *, struct kstatfs *);</div><div class='add'>+static int  nfs_show_options(struct seq_file *, struct vfsmount *);</div><div class='add'>+static int  nfs_show_stats(struct seq_file *, struct vfsmount *);</div><div class='add'>+static int nfs_get_sb(struct file_system_type *, int, const char *, void *, struct vfsmount *);</div><div class='add'>+static int nfs_clone_nfs_sb(struct file_system_type *fs_type,</div><div class='add'>+		int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);</div><div class='add'>+static void nfs_kill_super(struct super_block *);</div><div class='add'>+</div><div class='add'>+static struct file_system_type nfs_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "nfs",</div><div class='add'>+	.get_sb		= nfs_get_sb,</div><div class='add'>+	.kill_sb	= nfs_kill_super,</div><div class='add'>+	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct file_system_type clone_nfs_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "nfs",</div><div class='add'>+	.get_sb		= nfs_clone_nfs_sb,</div><div class='add'>+	.kill_sb	= nfs_kill_super,</div><div class='add'>+	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct super_operations nfs_sops = {</div><div class='add'>+	.alloc_inode	= nfs_alloc_inode,</div><div class='add'>+	.destroy_inode	= nfs_destroy_inode,</div><div class='add'>+	.write_inode	= nfs_write_inode,</div><div class='add'>+	.statfs		= nfs_statfs,</div><div class='add'>+	.clear_inode	= nfs_clear_inode,</div><div class='add'>+	.umount_begin	= nfs_umount_begin,</div><div class='add'>+	.show_options	= nfs_show_options,</div><div class='add'>+	.show_stats	= nfs_show_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+static int nfs4_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);</div><div class='add'>+static int nfs_clone_nfs4_sb(struct file_system_type *fs_type,</div><div class='add'>+		int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);</div><div class='add'>+static int nfs_referral_nfs4_sb(struct file_system_type *fs_type,</div><div class='add'>+		int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt);</div><div class='add'>+static void nfs4_kill_super(struct super_block *sb);</div><div class='add'>+</div><div class='add'>+static struct file_system_type nfs4_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "nfs4",</div><div class='add'>+	.get_sb		= nfs4_get_sb,</div><div class='add'>+	.kill_sb	= nfs4_kill_super,</div><div class='add'>+	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct file_system_type clone_nfs4_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "nfs4",</div><div class='add'>+	.get_sb		= nfs_clone_nfs4_sb,</div><div class='add'>+	.kill_sb	= nfs4_kill_super,</div><div class='add'>+	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct file_system_type nfs_referral_nfs4_fs_type = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "nfs4",</div><div class='add'>+	.get_sb		= nfs_referral_nfs4_sb,</div><div class='add'>+	.kill_sb	= nfs4_kill_super,</div><div class='add'>+	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT|FS_BINARY_MOUNTDATA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct super_operations nfs4_sops = {</div><div class='add'>+	.alloc_inode	= nfs_alloc_inode,</div><div class='add'>+	.destroy_inode	= nfs_destroy_inode,</div><div class='add'>+	.write_inode	= nfs_write_inode,</div><div class='add'>+	.statfs		= nfs_statfs,</div><div class='add'>+	.clear_inode	= nfs4_clear_inode,</div><div class='add'>+	.umount_begin	= nfs_umount_begin,</div><div class='add'>+	.show_options	= nfs_show_options,</div><div class='add'>+	.show_stats	= nfs_show_stats,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+static const int nfs_set_port_min = 0;</div><div class='add'>+static const int nfs_set_port_max = 65535;</div><div class='add'>+</div><div class='add'>+static int param_set_port(const char *val, struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	char *endp;</div><div class='add'>+	int num = simple_strtol(val, &amp;endp, 0);</div><div class='add'>+	if (endp == val || *endp || num &lt; nfs_set_port_min || num &gt; nfs_set_port_max)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*((int *)kp-&gt;arg) = num;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param_call(callback_tcpport, param_set_port, param_get_int,</div><div class='add'>+		 &amp;nfs_callback_set_tcpport, 0644);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+static int param_set_idmap_timeout(const char *val, struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	char *endp;</div><div class='add'>+	int num = simple_strtol(val, &amp;endp, 0);</div><div class='add'>+	int jif = num * HZ;</div><div class='add'>+	if (endp == val || *endp || num &lt; 0 || jif &lt; num)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*((int *)kp-&gt;arg) = jif;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_param_call(idmap_cache_timeout, param_set_idmap_timeout, param_get_int,</div><div class='add'>+		 &amp;nfs_idmap_cache_timeout, 0644);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Register the NFS filesystems</div><div class='add'>+ */</div><div class='add'>+int __init register_nfs_fs(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+        ret = register_filesystem(&amp;nfs_fs_type);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+	ret = nfs_register_sysctl();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_1;</div><div class='add'>+	ret = register_filesystem(&amp;nfs4_fs_type);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error_2;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+error_2:</div><div class='add'>+	nfs_unregister_sysctl();</div><div class='add'>+error_1:</div><div class='add'>+	unregister_filesystem(&amp;nfs_fs_type);</div><div class='add'>+#endif</div><div class='add'>+error_0:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unregister the NFS filesystems</div><div class='add'>+ */</div><div class='add'>+void __exit unregister_nfs_fs(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+	unregister_filesystem(&amp;nfs4_fs_type);</div><div class='add'>+	nfs_unregister_sysctl();</div><div class='add'>+#endif</div><div class='add'>+	unregister_filesystem(&amp;nfs_fs_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Deliver file system statistics to userspace</div><div class='add'>+ */</div><div class='add'>+static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = dentry-&gt;d_sb;</div><div class='add'>+	struct nfs_server *server = NFS_SB(sb);</div><div class='add'>+	unsigned char blockbits;</div><div class='add'>+	unsigned long blockres;</div><div class='add'>+	struct nfs_fh *rootfh = NFS_FH(sb-&gt;s_root-&gt;d_inode);</div><div class='add'>+	struct nfs_fattr fattr;</div><div class='add'>+	struct nfs_fsstat res = {</div><div class='add'>+			.fattr = &amp;fattr,</div><div class='add'>+	};</div><div class='add'>+	int error;</div><div class='add'>+</div><div class='add'>+	lock_kernel();</div><div class='add'>+</div><div class='add'>+	error = server-&gt;rpc_ops-&gt;statfs(server, rootfh, &amp;res);</div><div class='add'>+	buf-&gt;f_type = NFS_SUPER_MAGIC;</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Current versions of glibc do not correctly handle the</div><div class='add'>+	 * case where f_frsize != f_bsize.  Eventually we want to</div><div class='add'>+	 * report the value of wtmult in this field.</div><div class='add'>+	 */</div><div class='add'>+	buf-&gt;f_frsize = sb-&gt;s_blocksize;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On most *nix systems, f_blocks, f_bfree, and f_bavail</div><div class='add'>+	 * are reported in units of f_frsize.  Linux hasn't had</div><div class='add'>+	 * an f_frsize field in its statfs struct until recently,</div><div class='add'>+	 * thus historically Linux's sys_statfs reports these</div><div class='add'>+	 * fields in units of f_bsize.</div><div class='add'>+	 */</div><div class='add'>+	buf-&gt;f_bsize = sb-&gt;s_blocksize;</div><div class='add'>+	blockbits = sb-&gt;s_blocksize_bits;</div><div class='add'>+	blockres = (1 &lt;&lt; blockbits) - 1;</div><div class='add'>+	buf-&gt;f_blocks = (res.tbytes + blockres) &gt;&gt; blockbits;</div><div class='add'>+	buf-&gt;f_bfree = (res.fbytes + blockres) &gt;&gt; blockbits;</div><div class='add'>+	buf-&gt;f_bavail = (res.abytes + blockres) &gt;&gt; blockbits;</div><div class='add'>+</div><div class='add'>+	buf-&gt;f_files = res.tfiles;</div><div class='add'>+	buf-&gt;f_ffree = res.afiles;</div><div class='add'>+</div><div class='add'>+	buf-&gt;f_namelen = server-&gt;namelen;</div><div class='add'>+ out:</div><div class='add'>+	unlock_kernel();</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_err:</div><div class='add'>+	dprintk("%s: statfs error = %d\n", __FUNCTION__, -error);</div><div class='add'>+	buf-&gt;f_bsize = buf-&gt;f_blocks = buf-&gt;f_bfree = buf-&gt;f_bavail = -1;</div><div class='add'>+	goto out;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *nfs_pseudoflavour_to_name(rpc_authflavor_t flavour)</div><div class='add'>+{</div><div class='add'>+	static struct {</div><div class='add'>+		rpc_authflavor_t flavour;</div><div class='add'>+		const char *str;</div><div class='add'>+	} sec_flavours[] = {</div><div class='add'>+		{ RPC_AUTH_NULL, "null" },</div><div class='add'>+		{ RPC_AUTH_UNIX, "sys" },</div><div class='add'>+		{ RPC_AUTH_GSS_KRB5, "krb5" },</div><div class='add'>+		{ RPC_AUTH_GSS_KRB5I, "krb5i" },</div><div class='add'>+		{ RPC_AUTH_GSS_KRB5P, "krb5p" },</div><div class='add'>+		{ RPC_AUTH_GSS_LKEY, "lkey" },</div><div class='add'>+		{ RPC_AUTH_GSS_LKEYI, "lkeyi" },</div><div class='add'>+		{ RPC_AUTH_GSS_LKEYP, "lkeyp" },</div><div class='add'>+		{ RPC_AUTH_GSS_SPKM, "spkm" },</div><div class='add'>+		{ RPC_AUTH_GSS_SPKMI, "spkmi" },</div><div class='add'>+		{ RPC_AUTH_GSS_SPKMP, "spkmp" },</div><div class='add'>+		{ -1, "unknown" }</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i=0; sec_flavours[i].flavour != -1; i++) {</div><div class='add'>+		if (sec_flavours[i].flavour == flavour)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return sec_flavours[i].str;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Describe the mount options in force on this server representation</div><div class='add'>+ */</div><div class='add'>+static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, int showdefaults)</div><div class='add'>+{</div><div class='add'>+	static struct proc_nfs_info {</div><div class='add'>+		int flag;</div><div class='add'>+		char *str;</div><div class='add'>+		char *nostr;</div><div class='add'>+	} nfs_info[] = {</div><div class='add'>+		{ NFS_MOUNT_SOFT, ",soft", ",hard" },</div><div class='add'>+		{ NFS_MOUNT_INTR, ",intr", "" },</div><div class='add'>+		{ NFS_MOUNT_NOCTO, ",nocto", "" },</div><div class='add'>+		{ NFS_MOUNT_NOAC, ",noac", "" },</div><div class='add'>+		{ NFS_MOUNT_NONLM, ",nolock", "" },</div><div class='add'>+		{ NFS_MOUNT_NOACL, ",noacl", "" },</div><div class='add'>+		{ 0, NULL, NULL }</div><div class='add'>+	};</div><div class='add'>+	struct proc_nfs_info *nfs_infop;</div><div class='add'>+	char buf[12];</div><div class='add'>+	char *proto;</div><div class='add'>+</div><div class='add'>+	seq_printf(m, ",vers=%d", nfss-&gt;rpc_ops-&gt;version);</div><div class='add'>+	seq_printf(m, ",rsize=%d", nfss-&gt;rsize);</div><div class='add'>+	seq_printf(m, ",wsize=%d", nfss-&gt;wsize);</div><div class='add'>+	if (nfss-&gt;acregmin != 3*HZ || showdefaults)</div><div class='add'>+		seq_printf(m, ",acregmin=%d", nfss-&gt;acregmin/HZ);</div><div class='add'>+	if (nfss-&gt;acregmax != 60*HZ || showdefaults)</div><div class='add'>+		seq_printf(m, ",acregmax=%d", nfss-&gt;acregmax/HZ);</div><div class='add'>+	if (nfss-&gt;acdirmin != 30*HZ || showdefaults)</div><div class='add'>+		seq_printf(m, ",acdirmin=%d", nfss-&gt;acdirmin/HZ);</div><div class='add'>+	if (nfss-&gt;acdirmax != 60*HZ || showdefaults)</div><div class='add'>+		seq_printf(m, ",acdirmax=%d", nfss-&gt;acdirmax/HZ);</div><div class='add'>+	for (nfs_infop = nfs_info; nfs_infop-&gt;flag; nfs_infop++) {</div><div class='add'>+		if (nfss-&gt;flags &amp; nfs_infop-&gt;flag)</div><div class='add'>+			seq_puts(m, nfs_infop-&gt;str);</div><div class='add'>+		else</div><div class='add'>+			seq_puts(m, nfs_infop-&gt;nostr);</div><div class='add'>+	}</div><div class='add'>+	switch (nfss-&gt;client-&gt;cl_xprt-&gt;prot) {</div><div class='add'>+		case IPPROTO_TCP:</div><div class='add'>+			proto = "tcp";</div><div class='add'>+			break;</div><div class='add'>+		case IPPROTO_UDP:</div><div class='add'>+			proto = "udp";</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			snprintf(buf, sizeof(buf), "%u", nfss-&gt;client-&gt;cl_xprt-&gt;prot);</div><div class='add'>+			proto = buf;</div><div class='add'>+	}</div><div class='add'>+	seq_printf(m, ",proto=%s", proto);</div><div class='add'>+	seq_printf(m, ",timeo=%lu", 10U * nfss-&gt;retrans_timeo / HZ);</div><div class='add'>+	seq_printf(m, ",retrans=%u", nfss-&gt;retrans_count);</div><div class='add'>+	seq_printf(m, ",sec=%s", nfs_pseudoflavour_to_name(nfss-&gt;client-&gt;cl_auth-&gt;au_flavor));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Describe the mount options on this VFS mountpoint</div><div class='add'>+ */</div><div class='add'>+static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *nfss = NFS_SB(mnt-&gt;mnt_sb);</div><div class='add'>+</div><div class='add'>+	nfs_show_mount_options(m, nfss, 0);</div><div class='add'>+</div><div class='add'>+	seq_puts(m, ",addr=");</div><div class='add'>+	seq_escape(m, nfss-&gt;hostname, " \t\n\\");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Present statistical information for this VFS mountpoint</div><div class='add'>+ */</div><div class='add'>+static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	int i, cpu;</div><div class='add'>+	struct nfs_server *nfss = NFS_SB(mnt-&gt;mnt_sb);</div><div class='add'>+	struct rpc_auth *auth = nfss-&gt;client-&gt;cl_auth;</div><div class='add'>+	struct nfs_iostats totals = { };</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "statvers=%s", NFS_IOSTAT_VERS);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Display all mount option settings</div><div class='add'>+	 */</div><div class='add'>+	seq_printf(m, "\n\topts:\t");</div><div class='add'>+	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_RDONLY ? "ro" : "rw");</div><div class='add'>+	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_SYNCHRONOUS ? ",sync" : "");</div><div class='add'>+	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_NOATIME ? ",noatime" : "");</div><div class='add'>+	seq_puts(m, mnt-&gt;mnt_sb-&gt;s_flags &amp; MS_NODIRATIME ? ",nodiratime" : "");</div><div class='add'>+	nfs_show_mount_options(m, nfss, 1);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "\n\tage:\t%lu", (jiffies - nfss-&gt;mount_time) / HZ);</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "\n\tcaps:\t");</div><div class='add'>+	seq_printf(m, "caps=0x%x", nfss-&gt;caps);</div><div class='add'>+	seq_printf(m, ",wtmult=%d", nfss-&gt;wtmult);</div><div class='add'>+	seq_printf(m, ",dtsize=%d", nfss-&gt;dtsize);</div><div class='add'>+	seq_printf(m, ",bsize=%d", nfss-&gt;bsize);</div><div class='add'>+	seq_printf(m, ",namelen=%d", nfss-&gt;namelen);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+	if (nfss-&gt;rpc_ops-&gt;version == 4) {</div><div class='add'>+		seq_printf(m, "\n\tnfsv4:\t");</div><div class='add'>+		seq_printf(m, "bm0=0x%x", nfss-&gt;attr_bitmask[0]);</div><div class='add'>+		seq_printf(m, ",bm1=0x%x", nfss-&gt;attr_bitmask[1]);</div><div class='add'>+		seq_printf(m, ",acl=0x%x", nfss-&gt;acl_bitmask);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Display security flavor in effect for this mount</div><div class='add'>+	 */</div><div class='add'>+	seq_printf(m, "\n\tsec:\tflavor=%d", auth-&gt;au_ops-&gt;au_flavor);</div><div class='add'>+	if (auth-&gt;au_flavor)</div><div class='add'>+		seq_printf(m, ",pseudoflavor=%d", auth-&gt;au_flavor);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Display superblock I/O counters</div><div class='add'>+	 */</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct nfs_iostats *stats;</div><div class='add'>+</div><div class='add'>+		preempt_disable();</div><div class='add'>+		stats = per_cpu_ptr(nfss-&gt;io_stats, cpu);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; __NFSIOS_COUNTSMAX; i++)</div><div class='add'>+			totals.events[i] += stats-&gt;events[i];</div><div class='add'>+		for (i = 0; i &lt; __NFSIOS_BYTESMAX; i++)</div><div class='add'>+			totals.bytes[i] += stats-&gt;bytes[i];</div><div class='add'>+</div><div class='add'>+		preempt_enable();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seq_printf(m, "\n\tevents:\t");</div><div class='add'>+	for (i = 0; i &lt; __NFSIOS_COUNTSMAX; i++)</div><div class='add'>+		seq_printf(m, "%lu ", totals.events[i]);</div><div class='add'>+	seq_printf(m, "\n\tbytes:\t");</div><div class='add'>+	for (i = 0; i &lt; __NFSIOS_BYTESMAX; i++)</div><div class='add'>+		seq_printf(m, "%Lu ", totals.bytes[i]);</div><div class='add'>+	seq_printf(m, "\n");</div><div class='add'>+</div><div class='add'>+	rpc_print_iostats(m, nfss-&gt;client);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Begin unmount by attempting to remove all automounted mountpoints we added</div><div class='add'>+ * in response to traversals</div><div class='add'>+ */</div><div class='add'>+static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	struct rpc_clnt	*rpc;</div><div class='add'>+</div><div class='add'>+	shrink_submounts(vfsmnt, &amp;nfs_automount_list);</div><div class='add'>+	if (!(flags &amp; MNT_FORCE))</div><div class='add'>+		return;</div><div class='add'>+	/* -EIO all pending I/O */</div><div class='add'>+	server = NFS_SB(vfsmnt-&gt;mnt_sb);</div><div class='add'>+	rpc = server-&gt;client;</div><div class='add'>+	if (!IS_ERR(rpc))</div><div class='add'>+		rpc_killall_tasks(rpc);</div><div class='add'>+	rpc = server-&gt;client_acl;</div><div class='add'>+	if (!IS_ERR(rpc))</div><div class='add'>+		rpc_killall_tasks(rpc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Obtain the root inode of the file system.</div><div class='add'>+ */</div><div class='add'>+static struct inode *</div><div class='add'>+nfs_get_root(struct super_block *sb, struct nfs_fh *rootfh, struct nfs_fsinfo *fsinfo)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server	*server = NFS_SB(sb);</div><div class='add'>+	int			error;</div><div class='add'>+</div><div class='add'>+	error = server-&gt;rpc_ops-&gt;getroot(server, rootfh, fsinfo);</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dprintk("nfs_get_root: getattr error = %d\n", -error);</div><div class='add'>+		return ERR_PTR(error);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	server-&gt;fsid = fsinfo-&gt;fattr-&gt;fsid;</div><div class='add'>+	return nfs_fhget(sb, rootfh, fsinfo-&gt;fattr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Do NFS version-independent mount processing, and sanity checking</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server	*server;</div><div class='add'>+	struct inode		*root_inode;</div><div class='add'>+	struct nfs_fattr	fattr;</div><div class='add'>+	struct nfs_fsinfo	fsinfo = {</div><div class='add'>+					.fattr = &amp;fattr,</div><div class='add'>+				};</div><div class='add'>+	struct nfs_pathconf pathinfo = {</div><div class='add'>+			.fattr = &amp;fattr,</div><div class='add'>+	};</div><div class='add'>+	int no_root_error = 0;</div><div class='add'>+	unsigned long max_rpc_payload;</div><div class='add'>+</div><div class='add'>+	/* We probably want something more informative here */</div><div class='add'>+	snprintf(sb-&gt;s_id, sizeof(sb-&gt;s_id), "%x:%x", MAJOR(sb-&gt;s_dev), MINOR(sb-&gt;s_dev));</div><div class='add'>+</div><div class='add'>+	server = NFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_magic      = NFS_SUPER_MAGIC;</div><div class='add'>+</div><div class='add'>+	server-&gt;io_stats = nfs_alloc_iostats();</div><div class='add'>+	if (server-&gt;io_stats == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	root_inode = nfs_get_root(sb, &amp;server-&gt;fh, &amp;fsinfo);</div><div class='add'>+	/* Did getting the root inode fail? */</div><div class='add'>+	if (IS_ERR(root_inode)) {</div><div class='add'>+		no_root_error = PTR_ERR(root_inode);</div><div class='add'>+		goto out_no_root;</div><div class='add'>+	}</div><div class='add'>+	sb-&gt;s_root = d_alloc_root(root_inode);</div><div class='add'>+	if (!sb-&gt;s_root) {</div><div class='add'>+		no_root_error = -ENOMEM;</div><div class='add'>+		goto out_no_root;</div><div class='add'>+	}</div><div class='add'>+	sb-&gt;s_root-&gt;d_op = server-&gt;rpc_ops-&gt;dentry_ops;</div><div class='add'>+</div><div class='add'>+	/* mount time stamp, in seconds */</div><div class='add'>+	server-&gt;mount_time = jiffies;</div><div class='add'>+</div><div class='add'>+	/* Get some general file system info */</div><div class='add'>+	if (server-&gt;namelen == 0 &amp;&amp;</div><div class='add'>+	    server-&gt;rpc_ops-&gt;pathconf(server, &amp;server-&gt;fh, &amp;pathinfo) &gt;= 0)</div><div class='add'>+		server-&gt;namelen = pathinfo.max_namelen;</div><div class='add'>+	/* Work out a lot of parameters */</div><div class='add'>+	if (server-&gt;rsize == 0)</div><div class='add'>+		server-&gt;rsize = nfs_block_size(fsinfo.rtpref, NULL);</div><div class='add'>+	if (server-&gt;wsize == 0)</div><div class='add'>+		server-&gt;wsize = nfs_block_size(fsinfo.wtpref, NULL);</div><div class='add'>+</div><div class='add'>+	if (fsinfo.rtmax &gt;= 512 &amp;&amp; server-&gt;rsize &gt; fsinfo.rtmax)</div><div class='add'>+		server-&gt;rsize = nfs_block_size(fsinfo.rtmax, NULL);</div><div class='add'>+	if (fsinfo.wtmax &gt;= 512 &amp;&amp; server-&gt;wsize &gt; fsinfo.wtmax)</div><div class='add'>+		server-&gt;wsize = nfs_block_size(fsinfo.wtmax, NULL);</div><div class='add'>+</div><div class='add'>+	max_rpc_payload = nfs_block_size(rpc_max_payload(server-&gt;client), NULL);</div><div class='add'>+	if (server-&gt;rsize &gt; max_rpc_payload)</div><div class='add'>+		server-&gt;rsize = max_rpc_payload;</div><div class='add'>+	if (server-&gt;rsize &gt; NFS_MAX_FILE_IO_SIZE)</div><div class='add'>+		server-&gt;rsize = NFS_MAX_FILE_IO_SIZE;</div><div class='add'>+	server-&gt;rpages = (server-&gt;rsize + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (server-&gt;wsize &gt; max_rpc_payload)</div><div class='add'>+		server-&gt;wsize = max_rpc_payload;</div><div class='add'>+	if (server-&gt;wsize &gt; NFS_MAX_FILE_IO_SIZE)</div><div class='add'>+		server-&gt;wsize = NFS_MAX_FILE_IO_SIZE;</div><div class='add'>+	server-&gt;wpages = (server-&gt;wsize + PAGE_CACHE_SIZE - 1) &gt;&gt; PAGE_CACHE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (sb-&gt;s_blocksize == 0)</div><div class='add'>+		sb-&gt;s_blocksize = nfs_block_bits(server-&gt;wsize,</div><div class='add'>+							 &amp;sb-&gt;s_blocksize_bits);</div><div class='add'>+	server-&gt;wtmult = nfs_block_bits(fsinfo.wtmult, NULL);</div><div class='add'>+</div><div class='add'>+	server-&gt;dtsize = nfs_block_size(fsinfo.dtpref, NULL);</div><div class='add'>+	if (server-&gt;dtsize &gt; PAGE_CACHE_SIZE)</div><div class='add'>+		server-&gt;dtsize = PAGE_CACHE_SIZE;</div><div class='add'>+	if (server-&gt;dtsize &gt; server-&gt;rsize)</div><div class='add'>+		server-&gt;dtsize = server-&gt;rsize;</div><div class='add'>+</div><div class='add'>+	if (server-&gt;flags &amp; NFS_MOUNT_NOAC) {</div><div class='add'>+		server-&gt;acregmin = server-&gt;acregmax = 0;</div><div class='add'>+		server-&gt;acdirmin = server-&gt;acdirmax = 0;</div><div class='add'>+		sb-&gt;s_flags |= MS_SYNCHRONOUS;</div><div class='add'>+	}</div><div class='add'>+	server-&gt;backing_dev_info.ra_pages = server-&gt;rpages * NFS_MAX_READAHEAD;</div><div class='add'>+</div><div class='add'>+	nfs_super_set_maxbytes(sb, fsinfo.maxfilesize);</div><div class='add'>+</div><div class='add'>+	server-&gt;client-&gt;cl_intr = (server-&gt;flags &amp; NFS_MOUNT_INTR) ? 1 : 0;</div><div class='add'>+	server-&gt;client-&gt;cl_softrtry = (server-&gt;flags &amp; NFS_MOUNT_SOFT) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* We're airborne Set socket buffersize */</div><div class='add'>+	rpc_setbufsize(server-&gt;client, server-&gt;wsize + 100, server-&gt;rsize + 100);</div><div class='add'>+	return 0;</div><div class='add'>+	/* Yargs. It didn't work out. */</div><div class='add'>+out_no_root:</div><div class='add'>+	dprintk("nfs_sb_init: get root inode failed: errno %d\n", -no_root_error);</div><div class='add'>+	if (!IS_ERR(root_inode))</div><div class='add'>+		iput(root_inode);</div><div class='add'>+	return no_root_error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialise the timeout values for a connection</div><div class='add'>+ */</div><div class='add'>+static void nfs_init_timeout_values(struct rpc_timeout *to, int proto, unsigned int timeo, unsigned int retrans)</div><div class='add'>+{</div><div class='add'>+	to-&gt;to_initval = timeo * HZ / 10;</div><div class='add'>+	to-&gt;to_retries = retrans;</div><div class='add'>+	if (!to-&gt;to_retries)</div><div class='add'>+		to-&gt;to_retries = 2;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case IPPROTO_TCP:</div><div class='add'>+		if (!to-&gt;to_initval)</div><div class='add'>+			to-&gt;to_initval = 60 * HZ;</div><div class='add'>+		if (to-&gt;to_initval &gt; NFS_MAX_TCP_TIMEOUT)</div><div class='add'>+			to-&gt;to_initval = NFS_MAX_TCP_TIMEOUT;</div><div class='add'>+		to-&gt;to_increment = to-&gt;to_initval;</div><div class='add'>+		to-&gt;to_maxval = to-&gt;to_initval + (to-&gt;to_increment * to-&gt;to_retries);</div><div class='add'>+		to-&gt;to_exponential = 0;</div><div class='add'>+		break;</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+	default:</div><div class='add'>+		if (!to-&gt;to_initval)</div><div class='add'>+			to-&gt;to_initval = 11 * HZ / 10;</div><div class='add'>+		if (to-&gt;to_initval &gt; NFS_MAX_UDP_TIMEOUT)</div><div class='add'>+			to-&gt;to_initval = NFS_MAX_UDP_TIMEOUT;</div><div class='add'>+		to-&gt;to_maxval = NFS_MAX_UDP_TIMEOUT;</div><div class='add'>+		to-&gt;to_exponential = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create an RPC client handle.</div><div class='add'>+ */</div><div class='add'>+static struct rpc_clnt *</div><div class='add'>+nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)</div><div class='add'>+{</div><div class='add'>+	struct rpc_timeout	timeparms;</div><div class='add'>+	struct rpc_xprt		*xprt = NULL;</div><div class='add'>+	struct rpc_clnt		*clnt = NULL;</div><div class='add'>+	int			proto = (data-&gt;flags &amp; NFS_MOUNT_TCP) ? IPPROTO_TCP : IPPROTO_UDP;</div><div class='add'>+</div><div class='add'>+	nfs_init_timeout_values(&amp;timeparms, proto, data-&gt;timeo, data-&gt;retrans);</div><div class='add'>+</div><div class='add'>+	server-&gt;retrans_timeo = timeparms.to_initval;</div><div class='add'>+	server-&gt;retrans_count = timeparms.to_retries;</div><div class='add'>+</div><div class='add'>+	/* create transport and client */</div><div class='add'>+	xprt = xprt_create_proto(proto, &amp;server-&gt;addr, &amp;timeparms);</div><div class='add'>+	if (IS_ERR(xprt)) {</div><div class='add'>+		dprintk("%s: cannot create RPC transport. Error = %ld\n",</div><div class='add'>+				__FUNCTION__, PTR_ERR(xprt));</div><div class='add'>+		return (struct rpc_clnt *)xprt;</div><div class='add'>+	}</div><div class='add'>+	clnt = rpc_create_client(xprt, server-&gt;hostname, &amp;nfs_program,</div><div class='add'>+				 server-&gt;rpc_ops-&gt;version, data-&gt;pseudoflavor);</div><div class='add'>+	if (IS_ERR(clnt)) {</div><div class='add'>+		dprintk("%s: cannot create RPC client. Error = %ld\n",</div><div class='add'>+				__FUNCTION__, PTR_ERR(xprt));</div><div class='add'>+		goto out_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clnt-&gt;cl_intr     = 1;</div><div class='add'>+	clnt-&gt;cl_softrtry = 1;</div><div class='add'>+</div><div class='add'>+	return clnt;</div><div class='add'>+</div><div class='add'>+out_fail:</div><div class='add'>+	return clnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clone a server record</div><div class='add'>+ */</div><div class='add'>+static struct nfs_server *nfs_clone_server(struct super_block *sb, struct nfs_clone_mount *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SB(sb);</div><div class='add'>+	struct nfs_server *parent = NFS_SB(data-&gt;sb);</div><div class='add'>+	struct inode *root_inode;</div><div class='add'>+	struct nfs_fsinfo fsinfo;</div><div class='add'>+	void *err = ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_op = data-&gt;sb-&gt;s_op;</div><div class='add'>+	sb-&gt;s_blocksize = data-&gt;sb-&gt;s_blocksize;</div><div class='add'>+	sb-&gt;s_blocksize_bits = data-&gt;sb-&gt;s_blocksize_bits;</div><div class='add'>+	sb-&gt;s_maxbytes = data-&gt;sb-&gt;s_maxbytes;</div><div class='add'>+</div><div class='add'>+	server-&gt;client_sys = server-&gt;client_acl = ERR_PTR(-EINVAL);</div><div class='add'>+	server-&gt;io_stats = nfs_alloc_iostats();</div><div class='add'>+	if (server-&gt;io_stats == NULL)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	server-&gt;client = rpc_clone_client(parent-&gt;client);</div><div class='add'>+	if (IS_ERR((err = server-&gt;client)))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(parent-&gt;client_sys)) {</div><div class='add'>+		server-&gt;client_sys = rpc_clone_client(parent-&gt;client_sys);</div><div class='add'>+		if (IS_ERR((err = server-&gt;client_sys)))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!IS_ERR(parent-&gt;client_acl)) {</div><div class='add'>+		server-&gt;client_acl = rpc_clone_client(parent-&gt;client_acl);</div><div class='add'>+		if (IS_ERR((err = server-&gt;client_acl)))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	root_inode = nfs_fhget(sb, data-&gt;fh, data-&gt;fattr);</div><div class='add'>+	if (!root_inode)</div><div class='add'>+		goto out;</div><div class='add'>+	sb-&gt;s_root = d_alloc_root(root_inode);</div><div class='add'>+	if (!sb-&gt;s_root)</div><div class='add'>+		goto out_put_root;</div><div class='add'>+	fsinfo.fattr = data-&gt;fattr;</div><div class='add'>+	if (NFS_PROTO(root_inode)-&gt;fsinfo(server, data-&gt;fh, &amp;fsinfo) == 0)</div><div class='add'>+		nfs_super_set_maxbytes(sb, fsinfo.maxfilesize);</div><div class='add'>+	sb-&gt;s_root-&gt;d_op = server-&gt;rpc_ops-&gt;dentry_ops;</div><div class='add'>+	sb-&gt;s_flags |= MS_ACTIVE;</div><div class='add'>+	return server;</div><div class='add'>+out_put_root:</div><div class='add'>+	iput(root_inode);</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Copy an existing superblock and attach revised data</div><div class='add'>+ */</div><div class='add'>+static int nfs_clone_generic_sb(struct nfs_clone_mount *data,</div><div class='add'>+		struct super_block *(*fill_sb)(struct nfs_server *, struct nfs_clone_mount *),</div><div class='add'>+		struct nfs_server *(*fill_server)(struct super_block *, struct nfs_clone_mount *),</div><div class='add'>+		struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	struct nfs_server *parent = NFS_SB(data-&gt;sb);</div><div class='add'>+	struct super_block *sb = ERR_PTR(-EINVAL);</div><div class='add'>+	char *hostname;</div><div class='add'>+	int error = -ENOMEM;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	server = kmalloc(sizeof(struct nfs_server), GFP_KERNEL);</div><div class='add'>+	if (server == NULL)</div><div class='add'>+		goto out_err;</div><div class='add'>+	memcpy(server, parent, sizeof(*server));</div><div class='add'>+	hostname = (data-&gt;hostname != NULL) ? data-&gt;hostname : parent-&gt;hostname;</div><div class='add'>+	len = strlen(hostname) + 1;</div><div class='add'>+	server-&gt;hostname = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (server-&gt;hostname == NULL)</div><div class='add'>+		goto free_server;</div><div class='add'>+	memcpy(server-&gt;hostname, hostname, len);</div><div class='add'>+	error = rpciod_up();</div><div class='add'>+	if (error != 0)</div><div class='add'>+		goto free_hostname;</div><div class='add'>+</div><div class='add'>+	sb = fill_sb(server, data);</div><div class='add'>+	if (IS_ERR(sb)) {</div><div class='add'>+		error = PTR_ERR(sb);</div><div class='add'>+		goto kill_rpciod;</div><div class='add'>+	}</div><div class='add'>+		</div><div class='add'>+	if (sb-&gt;s_root)</div><div class='add'>+		goto out_rpciod_down;</div><div class='add'>+</div><div class='add'>+	server = fill_server(sb, data);</div><div class='add'>+	if (IS_ERR(server)) {</div><div class='add'>+		error = PTR_ERR(server);</div><div class='add'>+		goto out_deactivate;</div><div class='add'>+	}</div><div class='add'>+	return simple_set_mnt(mnt, sb);</div><div class='add'>+out_deactivate:</div><div class='add'>+	up_write(&amp;sb-&gt;s_umount);</div><div class='add'>+	deactivate_super(sb);</div><div class='add'>+	return error;</div><div class='add'>+out_rpciod_down:</div><div class='add'>+	rpciod_down();</div><div class='add'>+	kfree(server-&gt;hostname);</div><div class='add'>+	kfree(server);</div><div class='add'>+	return simple_set_mnt(mnt, sb);</div><div class='add'>+kill_rpciod:</div><div class='add'>+	rpciod_down();</div><div class='add'>+free_hostname:</div><div class='add'>+	kfree(server-&gt;hostname);</div><div class='add'>+free_server:</div><div class='add'>+	kfree(server);</div><div class='add'>+out_err:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up an NFS2/3 superblock</div><div class='add'>+ *</div><div class='add'>+ * The way this works is that the mount process passes a structure</div><div class='add'>+ * in the data argument which contains the server's IP address</div><div class='add'>+ * and the root file handle obtained from the server's mount</div><div class='add'>+ * daemon. We stash these away in the private superblock fields.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+nfs_fill_super(struct super_block *sb, struct nfs_mount_data *data, int silent)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server	*server;</div><div class='add'>+	rpc_authflavor_t	authflavor;</div><div class='add'>+</div><div class='add'>+	server           = NFS_SB(sb);</div><div class='add'>+	sb-&gt;s_blocksize_bits = 0;</div><div class='add'>+	sb-&gt;s_blocksize = 0;</div><div class='add'>+	if (data-&gt;bsize)</div><div class='add'>+		sb-&gt;s_blocksize = nfs_block_size(data-&gt;bsize, &amp;sb-&gt;s_blocksize_bits);</div><div class='add'>+	if (data-&gt;rsize)</div><div class='add'>+		server-&gt;rsize = nfs_block_size(data-&gt;rsize, NULL);</div><div class='add'>+	if (data-&gt;wsize)</div><div class='add'>+		server-&gt;wsize = nfs_block_size(data-&gt;wsize, NULL);</div><div class='add'>+	server-&gt;flags    = data-&gt;flags &amp; NFS_MOUNT_FLAGMASK;</div><div class='add'>+</div><div class='add'>+	server-&gt;acregmin = data-&gt;acregmin*HZ;</div><div class='add'>+	server-&gt;acregmax = data-&gt;acregmax*HZ;</div><div class='add'>+	server-&gt;acdirmin = data-&gt;acdirmin*HZ;</div><div class='add'>+	server-&gt;acdirmax = data-&gt;acdirmax*HZ;</div><div class='add'>+</div><div class='add'>+	/* Start lockd here, before we might error out */</div><div class='add'>+	if (!(server-&gt;flags &amp; NFS_MOUNT_NONLM))</div><div class='add'>+		lockd_up();</div><div class='add'>+</div><div class='add'>+	server-&gt;namelen  = data-&gt;namlen;</div><div class='add'>+	server-&gt;hostname = kmalloc(strlen(data-&gt;hostname) + 1, GFP_KERNEL);</div><div class='add'>+	if (!server-&gt;hostname)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	strcpy(server-&gt;hostname, data-&gt;hostname);</div><div class='add'>+</div><div class='add'>+	/* Check NFS protocol revision and initialize RPC op vector</div><div class='add'>+	 * and file handle pool. */</div><div class='add'>+#ifdef CONFIG_NFS_V3</div><div class='add'>+	if (server-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='add'>+		server-&gt;rpc_ops = &amp;nfs_v3_clientops;</div><div class='add'>+		server-&gt;caps |= NFS_CAP_READDIRPLUS;</div><div class='add'>+	} else {</div><div class='add'>+		server-&gt;rpc_ops = &amp;nfs_v2_clientops;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	server-&gt;rpc_ops = &amp;nfs_v2_clientops;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Fill in pseudoflavor for mount version &lt; 5 */</div><div class='add'>+	if (!(data-&gt;flags &amp; NFS_MOUNT_SECFLAVOUR))</div><div class='add'>+		data-&gt;pseudoflavor = RPC_AUTH_UNIX;</div><div class='add'>+	authflavor = data-&gt;pseudoflavor;	/* save for sb_init() */</div><div class='add'>+	/* XXX maybe we want to add a server-&gt;pseudoflavor field */</div><div class='add'>+</div><div class='add'>+	/* Create RPC client handles */</div><div class='add'>+	server-&gt;client = nfs_create_client(server, data);</div><div class='add'>+	if (IS_ERR(server-&gt;client))</div><div class='add'>+		return PTR_ERR(server-&gt;client);</div><div class='add'>+	/* RFC 2623, sec 2.3.2 */</div><div class='add'>+	if (authflavor != RPC_AUTH_UNIX) {</div><div class='add'>+		struct rpc_auth *auth;</div><div class='add'>+</div><div class='add'>+		server-&gt;client_sys = rpc_clone_client(server-&gt;client);</div><div class='add'>+		if (IS_ERR(server-&gt;client_sys))</div><div class='add'>+			return PTR_ERR(server-&gt;client_sys);</div><div class='add'>+		auth = rpcauth_create(RPC_AUTH_UNIX, server-&gt;client_sys);</div><div class='add'>+		if (IS_ERR(auth))</div><div class='add'>+			return PTR_ERR(auth);</div><div class='add'>+	} else {</div><div class='add'>+		atomic_inc(&amp;server-&gt;client-&gt;cl_count);</div><div class='add'>+		server-&gt;client_sys = server-&gt;client;</div><div class='add'>+	}</div><div class='add'>+	if (server-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='add'>+#ifdef CONFIG_NFS_V3_ACL</div><div class='add'>+		if (!(server-&gt;flags &amp; NFS_MOUNT_NOACL)) {</div><div class='add'>+			server-&gt;client_acl = rpc_bind_new_program(server-&gt;client, &amp;nfsacl_program, 3);</div><div class='add'>+			/* No errors! Assume that Sun nfsacls are supported */</div><div class='add'>+			if (!IS_ERR(server-&gt;client_acl))</div><div class='add'>+				server-&gt;caps |= NFS_CAP_ACLS;</div><div class='add'>+		}</div><div class='add'>+#else</div><div class='add'>+		server-&gt;flags &amp;= ~NFS_MOUNT_NOACL;</div><div class='add'>+#endif /* CONFIG_NFS_V3_ACL */</div><div class='add'>+		/*</div><div class='add'>+		 * The VFS shouldn't apply the umask to mode bits. We will</div><div class='add'>+		 * do so ourselves when necessary.</div><div class='add'>+		 */</div><div class='add'>+		sb-&gt;s_flags |= MS_POSIXACL;</div><div class='add'>+		if (server-&gt;namelen == 0 || server-&gt;namelen &gt; NFS3_MAXNAMLEN)</div><div class='add'>+			server-&gt;namelen = NFS3_MAXNAMLEN;</div><div class='add'>+		sb-&gt;s_time_gran = 1;</div><div class='add'>+	} else {</div><div class='add'>+		if (server-&gt;namelen == 0 || server-&gt;namelen &gt; NFS2_MAXNAMLEN)</div><div class='add'>+			server-&gt;namelen = NFS2_MAXNAMLEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_op = &amp;nfs_sops;</div><div class='add'>+	return nfs_sb_init(sb, authflavor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_set_super(struct super_block *s, void *data)</div><div class='add'>+{</div><div class='add'>+	s-&gt;s_fs_info = data;</div><div class='add'>+	return set_anon_super(s, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_compare_super(struct super_block *sb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = data;</div><div class='add'>+	struct nfs_server *old = NFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	if (old-&gt;addr.sin_addr.s_addr != server-&gt;addr.sin_addr.s_addr)</div><div class='add'>+		return 0;</div><div class='add'>+	if (old-&gt;addr.sin_port != server-&gt;addr.sin_port)</div><div class='add'>+		return 0;</div><div class='add'>+	return !nfs_compare_fh(&amp;old-&gt;fh, &amp;server-&gt;fh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+	struct nfs_server *server = NULL;</div><div class='add'>+	struct super_block *s;</div><div class='add'>+	struct nfs_fh *root;</div><div class='add'>+	struct nfs_mount_data *data = raw_data;</div><div class='add'>+</div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if (data == NULL) {</div><div class='add'>+		dprintk("%s: missing data argument\n", __FUNCTION__);</div><div class='add'>+		goto out_err_noserver;</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;version &lt;= 0 || data-&gt;version &gt; NFS_MOUNT_VERSION) {</div><div class='add'>+		dprintk("%s: bad mount version\n", __FUNCTION__);</div><div class='add'>+		goto out_err_noserver;</div><div class='add'>+	}</div><div class='add'>+	switch (data-&gt;version) {</div><div class='add'>+		case 1:</div><div class='add'>+			data-&gt;namlen = 0;</div><div class='add'>+		case 2:</div><div class='add'>+			data-&gt;bsize  = 0;</div><div class='add'>+		case 3:</div><div class='add'>+			if (data-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='add'>+				dprintk("%s: mount structure version %d does not support NFSv3\n",</div><div class='add'>+						__FUNCTION__,</div><div class='add'>+						data-&gt;version);</div><div class='add'>+				goto out_err_noserver;</div><div class='add'>+			}</div><div class='add'>+			data-&gt;root.size = NFS2_FHSIZE;</div><div class='add'>+			memcpy(data-&gt;root.data, data-&gt;old_root.data, NFS2_FHSIZE);</div><div class='add'>+		case 4:</div><div class='add'>+			if (data-&gt;flags &amp; NFS_MOUNT_SECFLAVOUR) {</div><div class='add'>+				dprintk("%s: mount structure version %d does not support strong security\n",</div><div class='add'>+						__FUNCTION__,</div><div class='add'>+						data-&gt;version);</div><div class='add'>+				goto out_err_noserver;</div><div class='add'>+			}</div><div class='add'>+		case 5:</div><div class='add'>+			memset(data-&gt;context, 0, sizeof(data-&gt;context));</div><div class='add'>+	}</div><div class='add'>+#ifndef CONFIG_NFS_V3</div><div class='add'>+	/* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */</div><div class='add'>+	error = -EPROTONOSUPPORT;</div><div class='add'>+	if (data-&gt;flags &amp; NFS_MOUNT_VER3) {</div><div class='add'>+		dprintk("%s: NFSv3 not compiled into kernel\n", __FUNCTION__);</div><div class='add'>+		goto out_err_noserver;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_NFS_V3 */</div><div class='add'>+</div><div class='add'>+	error = -ENOMEM;</div><div class='add'>+	server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);</div><div class='add'>+	if (!server)</div><div class='add'>+		goto out_err_noserver;</div><div class='add'>+	/* Zero out the NFS state stuff */</div><div class='add'>+	init_nfsv4_state(server);</div><div class='add'>+	server-&gt;client = server-&gt;client_sys = server-&gt;client_acl = ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	root = &amp;server-&gt;fh;</div><div class='add'>+	if (data-&gt;flags &amp; NFS_MOUNT_VER3)</div><div class='add'>+		root-&gt;size = data-&gt;root.size;</div><div class='add'>+	else</div><div class='add'>+		root-&gt;size = NFS2_FHSIZE;</div><div class='add'>+	error = -EINVAL;</div><div class='add'>+	if (root-&gt;size &gt; sizeof(root-&gt;data)) {</div><div class='add'>+		dprintk("%s: invalid root filehandle\n", __FUNCTION__);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+	memcpy(root-&gt;data, data-&gt;root.data, root-&gt;size);</div><div class='add'>+</div><div class='add'>+	/* We now require that the mount process passes the remote address */</div><div class='add'>+	memcpy(&amp;server-&gt;addr, &amp;data-&gt;addr, sizeof(server-&gt;addr));</div><div class='add'>+	if (server-&gt;addr.sin_addr.s_addr == INADDR_ANY) {</div><div class='add'>+		dprintk("%s: mount program didn't pass remote address!\n",</div><div class='add'>+				__FUNCTION__);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fire up rpciod if not yet running */</div><div class='add'>+	error = rpciod_up();</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dprintk("%s: couldn't start rpciod! Error = %d\n",</div><div class='add'>+				__FUNCTION__, error);</div><div class='add'>+		goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s = sget(fs_type, nfs_compare_super, nfs_set_super, server);</div><div class='add'>+	if (IS_ERR(s)) {</div><div class='add'>+		error = PTR_ERR(s);</div><div class='add'>+		goto out_err_rpciod;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (s-&gt;s_root)</div><div class='add'>+		goto out_rpciod_down;</div><div class='add'>+</div><div class='add'>+	s-&gt;s_flags = flags;</div><div class='add'>+</div><div class='add'>+	error = nfs_fill_super(s, data, flags &amp; MS_SILENT ? 1 : 0);</div><div class='add'>+	if (error) {</div><div class='add'>+		up_write(&amp;s-&gt;s_umount);</div><div class='add'>+		deactivate_super(s);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+	s-&gt;s_flags |= MS_ACTIVE;</div><div class='add'>+	return simple_set_mnt(mnt, s);</div><div class='add'>+</div><div class='add'>+out_rpciod_down:</div><div class='add'>+	rpciod_down();</div><div class='add'>+	kfree(server);</div><div class='add'>+	return simple_set_mnt(mnt, s);</div><div class='add'>+</div><div class='add'>+out_err_rpciod:</div><div class='add'>+	rpciod_down();</div><div class='add'>+out_err:</div><div class='add'>+	kfree(server);</div><div class='add'>+out_err_noserver:</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_kill_super(struct super_block *s)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SB(s);</div><div class='add'>+</div><div class='add'>+	kill_anon_super(s);</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR(server-&gt;client))</div><div class='add'>+		rpc_shutdown_client(server-&gt;client);</div><div class='add'>+	if (!IS_ERR(server-&gt;client_sys))</div><div class='add'>+		rpc_shutdown_client(server-&gt;client_sys);</div><div class='add'>+	if (!IS_ERR(server-&gt;client_acl))</div><div class='add'>+		rpc_shutdown_client(server-&gt;client_acl);</div><div class='add'>+</div><div class='add'>+	if (!(server-&gt;flags &amp; NFS_MOUNT_NONLM))</div><div class='add'>+		lockd_down();	/* release rpc.lockd */</div><div class='add'>+</div><div class='add'>+	rpciod_down();		/* release rpciod */</div><div class='add'>+</div><div class='add'>+	nfs_free_iostats(server-&gt;io_stats);</div><div class='add'>+	kfree(server-&gt;hostname);</div><div class='add'>+	kfree(server);</div><div class='add'>+	nfs_release_automount_timer();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct super_block *nfs_clone_sb(struct nfs_server *server, struct nfs_clone_mount *data)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+</div><div class='add'>+	server-&gt;fsid = data-&gt;fattr-&gt;fsid;</div><div class='add'>+	nfs_copy_fh(&amp;server-&gt;fh, data-&gt;fh);</div><div class='add'>+	sb = sget(&amp;nfs_fs_type, nfs_compare_super, nfs_set_super, server);</div><div class='add'>+	if (!IS_ERR(sb) &amp;&amp; sb-&gt;s_root == NULL &amp;&amp; !(server-&gt;flags &amp; NFS_MOUNT_NONLM))</div><div class='add'>+		lockd_up();</div><div class='add'>+	return sb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_clone_nfs_sb(struct file_system_type *fs_type,</div><div class='add'>+		int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct nfs_clone_mount *data = raw_data;</div><div class='add'>+	return nfs_clone_generic_sb(data, nfs_clone_sb, nfs_clone_server, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_NFS_V4</div><div class='add'>+static struct rpc_clnt *nfs4_create_client(struct nfs_server *server,</div><div class='add'>+	struct rpc_timeout *timeparms, int proto, rpc_authflavor_t flavor)</div><div class='add'>+{</div><div class='add'>+	struct nfs4_client *clp;</div><div class='add'>+	struct rpc_xprt *xprt = NULL;</div><div class='add'>+	struct rpc_clnt *clnt = NULL;</div><div class='add'>+	int err = -EIO;</div><div class='add'>+</div><div class='add'>+	clp = nfs4_get_client(&amp;server-&gt;addr.sin_addr);</div><div class='add'>+	if (!clp) {</div><div class='add'>+		dprintk("%s: failed to create NFS4 client.\n", __FUNCTION__);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now create transport and client */</div><div class='add'>+	down_write(&amp;clp-&gt;cl_sem);</div><div class='add'>+	if (IS_ERR(clp-&gt;cl_rpcclient)) {</div><div class='add'>+		xprt = xprt_create_proto(proto, &amp;server-&gt;addr, timeparms);</div><div class='add'>+		if (IS_ERR(xprt)) {</div><div class='add'>+			up_write(&amp;clp-&gt;cl_sem);</div><div class='add'>+			err = PTR_ERR(xprt);</div><div class='add'>+			dprintk("%s: cannot create RPC transport. Error = %d\n",</div><div class='add'>+					__FUNCTION__, err);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		/* Bind to a reserved port! */</div><div class='add'>+		xprt-&gt;resvport = 1;</div><div class='add'>+		clnt = rpc_create_client(xprt, server-&gt;hostname, &amp;nfs_program,</div><div class='add'>+				server-&gt;rpc_ops-&gt;version, flavor);</div><div class='add'>+		if (IS_ERR(clnt)) {</div><div class='add'>+			up_write(&amp;clp-&gt;cl_sem);</div><div class='add'>+			err = PTR_ERR(clnt);</div><div class='add'>+			dprintk("%s: cannot create RPC client. Error = %d\n",</div><div class='add'>+					__FUNCTION__, err);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		clnt-&gt;cl_intr     = 1;</div><div class='add'>+		clnt-&gt;cl_softrtry = 1;</div><div class='add'>+		clp-&gt;cl_rpcclient = clnt;</div><div class='add'>+		memcpy(clp-&gt;cl_ipaddr, server-&gt;ip_addr, sizeof(clp-&gt;cl_ipaddr));</div><div class='add'>+		nfs_idmap_new(clp);</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;server-&gt;nfs4_siblings, &amp;clp-&gt;cl_superblocks);</div><div class='add'>+	clnt = rpc_clone_client(clp-&gt;cl_rpcclient);</div><div class='add'>+	if (!IS_ERR(clnt))</div><div class='add'>+		server-&gt;nfs4_state = clp;</div><div class='add'>+	up_write(&amp;clp-&gt;cl_sem);</div><div class='add'>+	clp = NULL;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(clnt)) {</div><div class='add'>+		dprintk("%s: cannot create RPC client. Error = %d\n",</div><div class='add'>+				__FUNCTION__, err);</div><div class='add'>+		return clnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (server-&gt;nfs4_state-&gt;cl_idmap == NULL) {</div><div class='add'>+		dprintk("%s: failed to create idmapper.\n", __FUNCTION__);</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clnt-&gt;cl_auth-&gt;au_flavor != flavor) {</div><div class='add'>+		struct rpc_auth *auth;</div><div class='add'>+</div><div class='add'>+		auth = rpcauth_create(flavor, clnt);</div><div class='add'>+		if (IS_ERR(auth)) {</div><div class='add'>+			dprintk("%s: couldn't create credcache!\n", __FUNCTION__);</div><div class='add'>+			return (struct rpc_clnt *)auth;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return clnt;</div><div class='add'>+</div><div class='add'>+ out_fail:</div><div class='add'>+	if (clp)</div><div class='add'>+		nfs4_put_client(clp);</div><div class='add'>+	return ERR_PTR(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set up an NFS4 superblock</div><div class='add'>+ */</div><div class='add'>+static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data, int silent)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	struct rpc_timeout timeparms;</div><div class='add'>+	rpc_authflavor_t authflavour;</div><div class='add'>+	int err = -EIO;</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_blocksize_bits = 0;</div><div class='add'>+	sb-&gt;s_blocksize = 0;</div><div class='add'>+	server = NFS_SB(sb);</div><div class='add'>+	if (data-&gt;rsize != 0)</div><div class='add'>+		server-&gt;rsize = nfs_block_size(data-&gt;rsize, NULL);</div><div class='add'>+	if (data-&gt;wsize != 0)</div><div class='add'>+		server-&gt;wsize = nfs_block_size(data-&gt;wsize, NULL);</div><div class='add'>+	server-&gt;flags = data-&gt;flags &amp; NFS_MOUNT_FLAGMASK;</div><div class='add'>+	server-&gt;caps = NFS_CAP_ATOMIC_OPEN;</div><div class='add'>+</div><div class='add'>+	server-&gt;acregmin = data-&gt;acregmin*HZ;</div><div class='add'>+	server-&gt;acregmax = data-&gt;acregmax*HZ;</div><div class='add'>+	server-&gt;acdirmin = data-&gt;acdirmin*HZ;</div><div class='add'>+	server-&gt;acdirmax = data-&gt;acdirmax*HZ;</div><div class='add'>+</div><div class='add'>+	server-&gt;rpc_ops = &amp;nfs_v4_clientops;</div><div class='add'>+</div><div class='add'>+	nfs_init_timeout_values(&amp;timeparms, data-&gt;proto, data-&gt;timeo, data-&gt;retrans);</div><div class='add'>+</div><div class='add'>+	server-&gt;retrans_timeo = timeparms.to_initval;</div><div class='add'>+	server-&gt;retrans_count = timeparms.to_retries;</div><div class='add'>+</div><div class='add'>+	/* Now create transport and client */</div><div class='add'>+	authflavour = RPC_AUTH_UNIX;</div><div class='add'>+	if (data-&gt;auth_flavourlen != 0) {</div><div class='add'>+		if (data-&gt;auth_flavourlen != 1) {</div><div class='add'>+			dprintk("%s: Invalid number of RPC auth flavours %d.\n",</div><div class='add'>+					__FUNCTION__, data-&gt;auth_flavourlen);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		if (copy_from_user(&amp;authflavour, data-&gt;auth_flavours, sizeof(authflavour))) {</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	server-&gt;client = nfs4_create_client(server, &amp;timeparms, data-&gt;proto, authflavour);</div><div class='add'>+	if (IS_ERR(server-&gt;client)) {</div><div class='add'>+		err = PTR_ERR(server-&gt;client);</div><div class='add'>+			dprintk("%s: cannot create RPC client. Error = %d\n",</div><div class='add'>+					__FUNCTION__, err);</div><div class='add'>+			goto out_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_time_gran = 1;</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_op = &amp;nfs4_sops;</div><div class='add'>+	err = nfs_sb_init(sb, authflavour);</div><div class='add'>+</div><div class='add'>+ out_fail:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs4_compare_super(struct super_block *sb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = data;</div><div class='add'>+	struct nfs_server *old = NFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	if (strcmp(server-&gt;hostname, old-&gt;hostname) != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (strcmp(server-&gt;mnt_path, old-&gt;mnt_path) != 0)</div><div class='add'>+		return 0;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+nfs_copy_user_string(char *dst, struct nfs_string *src, int maxlen)</div><div class='add'>+{</div><div class='add'>+	void *p = NULL;</div><div class='add'>+</div><div class='add'>+	if (!src-&gt;len)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (src-&gt;len &lt; maxlen)</div><div class='add'>+		maxlen = src-&gt;len;</div><div class='add'>+	if (dst == NULL) {</div><div class='add'>+		p = dst = kmalloc(maxlen + 1, GFP_KERNEL);</div><div class='add'>+		if (p == NULL)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	if (copy_from_user(dst, src-&gt;data, maxlen)) {</div><div class='add'>+		kfree(p);</div><div class='add'>+		return ERR_PTR(-EFAULT);</div><div class='add'>+	}</div><div class='add'>+	dst[maxlen] = '\0';</div><div class='add'>+	return dst;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs4_get_sb(struct file_system_type *fs_type,</div><div class='add'>+	int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	int error;</div><div class='add'>+	struct nfs_server *server;</div><div class='add'>+	struct super_block *s;</div><div class='add'>+	struct nfs4_mount_data *data = raw_data;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (data == NULL) {</div><div class='add'>+		dprintk("%s: missing data argument\n", __FUNCTION__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (data-&gt;version &lt;= 0 || data-&gt;version &gt; NFS4_MOUNT_VERSION) {</div><div class='add'>+		dprintk("%s: bad mount version\n", __FUNCTION__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	server = kzalloc(sizeof(struct nfs_server), GFP_KERNEL);</div><div class='add'>+	if (!server)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* Zero out the NFS state stuff */</div><div class='add'>+	init_nfsv4_state(server);</div><div class='add'>+	server-&gt;client = server-&gt;client_sys = server-&gt;client_acl = ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	p = nfs_copy_user_string(NULL, &amp;data-&gt;hostname, 256);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		goto out_err;</div><div class='add'>+	server-&gt;hostname = p;</div><div class='add'>+</div><div class='add'>+	p = nfs_copy_user_string(NULL, &amp;data-&gt;mnt_path, 1024);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		goto out_err;</div><div class='add'>+	server-&gt;mnt_path = p;</div><div class='add'>+</div><div class='add'>+	p = nfs_copy_user_string(server-&gt;ip_addr, &amp;data-&gt;client_addr,</div><div class='add'>+			sizeof(server-&gt;ip_addr) - 1);</div><div class='add'>+	if (IS_ERR(p))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* We now require that the mount process passes the remote address */</div><div class='add'>+	if (data-&gt;host_addrlen != sizeof(server-&gt;addr)) {</div><div class='add'>+		error = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	if (copy_from_user(&amp;server-&gt;addr, data-&gt;host_addr, sizeof(server-&gt;addr))) {</div><div class='add'>+		error = -EFAULT;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+	if (server-&gt;addr.sin_family != AF_INET ||</div><div class='add'>+	    server-&gt;addr.sin_addr.s_addr == INADDR_ANY) {</div><div class='add'>+		dprintk("%s: mount program didn't pass remote IP address!\n",</div><div class='add'>+				__FUNCTION__);</div><div class='add'>+		error = -EINVAL;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fire up rpciod if not yet running */</div><div class='add'>+	error = rpciod_up();</div><div class='add'>+	if (error &lt; 0) {</div><div class='add'>+		dprintk("%s: couldn't start rpciod! Error = %d\n",</div><div class='add'>+				__FUNCTION__, error);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s = sget(fs_type, nfs4_compare_super, nfs_set_super, server);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(s)) {</div><div class='add'>+		error = PTR_ERR(s);</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (s-&gt;s_root) {</div><div class='add'>+		kfree(server-&gt;mnt_path);</div><div class='add'>+		kfree(server-&gt;hostname);</div><div class='add'>+		kfree(server);</div><div class='add'>+		return simple_set_mnt(mnt, s);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;s_flags = flags;</div><div class='add'>+</div><div class='add'>+	error = nfs4_fill_super(s, data, flags &amp; MS_SILENT ? 1 : 0);</div><div class='add'>+	if (error) {</div><div class='add'>+		up_write(&amp;s-&gt;s_umount);</div><div class='add'>+		deactivate_super(s);</div><div class='add'>+		return error;</div><div class='add'>+	}</div><div class='add'>+	s-&gt;s_flags |= MS_ACTIVE;</div><div class='add'>+	return simple_set_mnt(mnt, s);</div><div class='add'>+out_err:</div><div class='add'>+	error = PTR_ERR(p);</div><div class='add'>+out_free:</div><div class='add'>+	kfree(server-&gt;mnt_path);</div><div class='add'>+	kfree(server-&gt;hostname);</div><div class='add'>+	kfree(server);</div><div class='add'>+	return error;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs4_kill_super(struct super_block *sb)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SB(sb);</div><div class='add'>+</div><div class='add'>+	nfs_return_all_delegations(sb);</div><div class='add'>+	kill_anon_super(sb);</div><div class='add'>+</div><div class='add'>+	nfs4_renewd_prepare_shutdown(server);</div><div class='add'>+</div><div class='add'>+	if (server-&gt;client != NULL &amp;&amp; !IS_ERR(server-&gt;client))</div><div class='add'>+		rpc_shutdown_client(server-&gt;client);</div><div class='add'>+</div><div class='add'>+	destroy_nfsv4_state(server);</div><div class='add'>+</div><div class='add'>+	rpciod_down();</div><div class='add'>+</div><div class='add'>+	nfs_free_iostats(server-&gt;io_stats);</div><div class='add'>+	kfree(server-&gt;hostname);</div><div class='add'>+	kfree(server);</div><div class='add'>+	nfs_release_automount_timer();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Constructs the SERVER-side path</div><div class='add'>+ */</div><div class='add'>+static inline char *nfs4_dup_path(const struct dentry *dentry)</div><div class='add'>+{</div><div class='add'>+	char *page = (char *) __get_free_page(GFP_USER);</div><div class='add'>+	char *path;</div><div class='add'>+</div><div class='add'>+	path = nfs4_path(dentry, page, PAGE_SIZE);</div><div class='add'>+	if (!IS_ERR(path)) {</div><div class='add'>+		int len = PAGE_SIZE + page - path;</div><div class='add'>+		char *tmp = path;</div><div class='add'>+</div><div class='add'>+		path = kmalloc(len, GFP_KERNEL);</div><div class='add'>+		if (path)</div><div class='add'>+			memcpy(path, tmp, len);</div><div class='add'>+		else</div><div class='add'>+			path = ERR_PTR(-ENOMEM);</div><div class='add'>+	}</div><div class='add'>+	free_page((unsigned long)page);</div><div class='add'>+	return path;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct super_block *nfs4_clone_sb(struct nfs_server *server, struct nfs_clone_mount *data)</div><div class='add'>+{</div><div class='add'>+	const struct dentry *dentry = data-&gt;dentry;</div><div class='add'>+	struct nfs4_client *clp = server-&gt;nfs4_state;</div><div class='add'>+	struct super_block *sb;</div><div class='add'>+</div><div class='add'>+	server-&gt;fsid = data-&gt;fattr-&gt;fsid;</div><div class='add'>+	nfs_copy_fh(&amp;server-&gt;fh, data-&gt;fh);</div><div class='add'>+	server-&gt;mnt_path = nfs4_dup_path(dentry);</div><div class='add'>+	if (IS_ERR(server-&gt;mnt_path)) {</div><div class='add'>+		sb = (struct super_block *)server-&gt;mnt_path;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	sb = sget(&amp;nfs4_fs_type, nfs4_compare_super, nfs_set_super, server);</div><div class='add'>+	if (IS_ERR(sb) || sb-&gt;s_root)</div><div class='add'>+		goto free_path;</div><div class='add'>+	nfs4_server_capabilities(server, &amp;server-&gt;fh);</div><div class='add'>+</div><div class='add'>+	down_write(&amp;clp-&gt;cl_sem);</div><div class='add'>+	atomic_inc(&amp;clp-&gt;cl_count);</div><div class='add'>+	list_add_tail(&amp;server-&gt;nfs4_siblings, &amp;clp-&gt;cl_superblocks);</div><div class='add'>+	up_write(&amp;clp-&gt;cl_sem);</div><div class='add'>+	return sb;</div><div class='add'>+free_path:</div><div class='add'>+	kfree(server-&gt;mnt_path);</div><div class='add'>+err:</div><div class='add'>+	server-&gt;mnt_path = NULL;</div><div class='add'>+	return sb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_clone_nfs4_sb(struct file_system_type *fs_type,</div><div class='add'>+		int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct nfs_clone_mount *data = raw_data;</div><div class='add'>+	return nfs_clone_generic_sb(data, nfs4_clone_sb, nfs_clone_server, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct super_block *nfs4_referral_sb(struct nfs_server *server, struct nfs_clone_mount *data)</div><div class='add'>+{</div><div class='add'>+	struct super_block *sb = ERR_PTR(-ENOMEM);</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = strlen(data-&gt;mnt_path) + 1;</div><div class='add'>+	server-&gt;mnt_path = kmalloc(len, GFP_KERNEL);</div><div class='add'>+	if (server-&gt;mnt_path == NULL)</div><div class='add'>+		goto err;</div><div class='add'>+	memcpy(server-&gt;mnt_path, data-&gt;mnt_path, len);</div><div class='add'>+	memcpy(&amp;server-&gt;addr, data-&gt;addr, sizeof(struct sockaddr_in));</div><div class='add'>+</div><div class='add'>+	sb = sget(&amp;nfs4_fs_type, nfs4_compare_super, nfs_set_super, server);</div><div class='add'>+	if (IS_ERR(sb) || sb-&gt;s_root)</div><div class='add'>+		goto free_path;</div><div class='add'>+	return sb;</div><div class='add'>+free_path:</div><div class='add'>+	kfree(server-&gt;mnt_path);</div><div class='add'>+err:</div><div class='add'>+	server-&gt;mnt_path = NULL;</div><div class='add'>+	return sb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nfs_server *nfs4_referral_server(struct super_block *sb, struct nfs_clone_mount *data)</div><div class='add'>+{</div><div class='add'>+	struct nfs_server *server = NFS_SB(sb);</div><div class='add'>+	struct rpc_timeout timeparms;</div><div class='add'>+	int proto, timeo, retrans;</div><div class='add'>+	void *err;</div><div class='add'>+</div><div class='add'>+	proto = IPPROTO_TCP;</div><div class='add'>+	/* Since we are following a referral and there may be alternatives,</div><div class='add'>+	   set the timeouts and retries to low values */</div><div class='add'>+	timeo = 2;</div><div class='add'>+	retrans = 1;</div><div class='add'>+	nfs_init_timeout_values(&amp;timeparms, proto, timeo, retrans);</div><div class='add'>+</div><div class='add'>+	server-&gt;client = nfs4_create_client(server, &amp;timeparms, proto, data-&gt;authflavor);</div><div class='add'>+	if (IS_ERR((err = server-&gt;client)))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	sb-&gt;s_time_gran = 1;</div><div class='add'>+	sb-&gt;s_op = &amp;nfs4_sops;</div><div class='add'>+	err = ERR_PTR(nfs_sb_init(sb, data-&gt;authflavor));</div><div class='add'>+	if (!IS_ERR(err))</div><div class='add'>+		return server;</div><div class='add'>+out_err:</div><div class='add'>+	return (struct nfs_server *)err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nfs_referral_nfs4_sb(struct file_system_type *fs_type,</div><div class='add'>+		int flags, const char *dev_name, void *raw_data, struct vfsmount *mnt)</div><div class='add'>+{</div><div class='add'>+	struct nfs_clone_mount *data = raw_data;</div><div class='add'>+	return nfs_clone_generic_sb(data, nfs4_referral_sb, nfs4_referral_server, mnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c<br/>index 18dc95b0b646..600bbe630abd 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/symlink.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/symlink.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/symlink.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/symlink.c</a></div><div class='hunk'>@@ -52,7 +52,7 @@ static void *nfs_follow_link(struct dentry *dentry, struct nameidata *nd)</div><div class='ctx'> {</div><div class='ctx'> 	struct inode *inode = dentry-&gt;d_inode;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	void *err = ERR_PTR(nfs_revalidate_inode(NFS_SERVER(inode), inode));</div><div class='add'>+	void *err = ERR_PTR(nfs_revalidate_mapping(inode, inode-&gt;i_mapping));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto read_failed;</div><div class='ctx'> 	page = read_cache_page(&amp;inode-&gt;i_data, 0,</div><div class='hunk'>@@ -75,22 +75,13 @@ read_failed:</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)</div><div class='del'>-{</div><div class='del'>-	if (cookie) {</div><div class='del'>-		struct page *page = cookie;</div><div class='del'>-		kunmap(page);</div><div class='del'>-		page_cache_release(page);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * symlinks can't do much...</div><div class='ctx'>  */</div><div class='ctx'> struct inode_operations nfs_symlink_inode_operations = {</div><div class='ctx'> 	.readlink	= generic_readlink,</div><div class='ctx'> 	.follow_link	= nfs_follow_link,</div><div class='del'>-	.put_link	= nfs_put_link,</div><div class='add'>+	.put_link	= page_put_link,</div><div class='ctx'> 	.getattr	= nfs_getattr,</div><div class='ctx'> 	.setattr	= nfs_setattr,</div><div class='ctx'> };</div><div class='head'>diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c<br/>index 4c486eb867ca..2fe3403c2409 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/sysctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/sysctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/sysctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/sysctl.c</a></div><div class='hunk'>@@ -3,7 +3,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Sysctl interface to NFS parameters</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/linkage.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='hunk'>@@ -12,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/nfs4.h&gt;</div><div class='ctx'> #include &lt;linux/nfs_idmap.h&gt;</div><div class='add'>+#include &lt;linux/nfs_fs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "callback.h"</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +46,15 @@ static ctl_table nfs_cb_sysctls[] = {</div><div class='ctx'> 		.strategy = &amp;sysctl_jiffies,</div><div class='ctx'> 	},</div><div class='ctx'> #endif</div><div class='add'>+	{</div><div class='add'>+		.ctl_name	= CTL_UNNUMBERED,</div><div class='add'>+		.procname	= "nfs_mountpoint_timeout",</div><div class='add'>+		.data		= &amp;nfs_mountpoint_expiry_timeout,</div><div class='add'>+		.maxlen		= sizeof(nfs_mountpoint_expiry_timeout),</div><div class='add'>+		.mode		= 0644,</div><div class='add'>+		.proc_handler	= &amp;proc_dointvec_jiffies,</div><div class='add'>+		.strategy	= &amp;sysctl_jiffies,</div><div class='add'>+	},</div><div class='ctx'> 	{ .ctl_name = 0 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfs/write.c b/fs/nfs/write.c<br/>index 4cfada2cc09f..86bac6a5008e 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfs/write.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfs/write.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfs/write.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfs/write.c</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'>  * Copyright (C) 1996, 1997, Olaf Kirch &lt;okir@monad.swb.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='hunk'>@@ -98,11 +97,10 @@ struct nfs_write_data *nfs_commit_alloc(unsigned int pagecount)</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		memset(p, 0, sizeof(*p));</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;p-&gt;pages);</div><div class='del'>-		if (pagecount &lt; NFS_PAGEVEC_SIZE)</div><div class='del'>-			p-&gt;pagevec = &amp;p-&gt;page_array[0];</div><div class='add'>+		if (pagecount &lt;= ARRAY_SIZE(p-&gt;page_array))</div><div class='add'>+			p-&gt;pagevec = p-&gt;page_array;</div><div class='ctx'> 		else {</div><div class='del'>-			size_t size = ++pagecount * sizeof(struct page *);</div><div class='del'>-			p-&gt;pagevec = kzalloc(size, GFP_NOFS);</div><div class='add'>+			p-&gt;pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS);</div><div class='ctx'> 			if (!p-&gt;pagevec) {</div><div class='ctx'> 				mempool_free(p, nfs_commit_mempool);</div><div class='ctx'> 				p = NULL;</div><div class='hunk'>@@ -126,14 +124,11 @@ struct nfs_write_data *nfs_writedata_alloc(unsigned int pagecount)</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		memset(p, 0, sizeof(*p));</div><div class='ctx'> 		INIT_LIST_HEAD(&amp;p-&gt;pages);</div><div class='del'>-		if (pagecount &lt; NFS_PAGEVEC_SIZE)</div><div class='del'>-			p-&gt;pagevec = &amp;p-&gt;page_array[0];</div><div class='add'>+		if (pagecount &lt;= ARRAY_SIZE(p-&gt;page_array))</div><div class='add'>+			p-&gt;pagevec = p-&gt;page_array;</div><div class='ctx'> 		else {</div><div class='del'>-			size_t size = ++pagecount * sizeof(struct page *);</div><div class='del'>-			p-&gt;pagevec = kmalloc(size, GFP_NOFS);</div><div class='del'>-			if (p-&gt;pagevec) {</div><div class='del'>-				memset(p-&gt;pagevec, 0, size);</div><div class='del'>-			} else {</div><div class='add'>+			p-&gt;pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_NOFS);</div><div class='add'>+			if (!p-&gt;pagevec) {</div><div class='ctx'> 				mempool_free(p, nfs_wdata_mempool);</div><div class='ctx'> 				p = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -501,7 +496,7 @@ nfs_mark_request_dirty(struct nfs_page *req)</div><div class='ctx'> 	nfs_list_add_request(req, &amp;nfsi-&gt;dirty);</div><div class='ctx'> 	nfsi-&gt;ndirty++;</div><div class='ctx'> 	spin_unlock(&amp;nfsi-&gt;req_lock);</div><div class='del'>-	inc_page_state(nr_dirty);</div><div class='add'>+	inc_zone_page_state(req-&gt;wb_page, NR_FILE_DIRTY);</div><div class='ctx'> 	mark_inode_dirty(inode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -529,7 +524,7 @@ nfs_mark_request_commit(struct nfs_page *req)</div><div class='ctx'> 	nfs_list_add_request(req, &amp;nfsi-&gt;commit);</div><div class='ctx'> 	nfsi-&gt;ncommit++;</div><div class='ctx'> 	spin_unlock(&amp;nfsi-&gt;req_lock);</div><div class='del'>-	inc_page_state(nr_unstable);</div><div class='add'>+	inc_zone_page_state(req-&gt;wb_page, NR_UNSTABLE_NFS);</div><div class='ctx'> 	mark_inode_dirty(inode);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -583,6 +578,30 @@ static int nfs_wait_on_requests(struct inode *inode, unsigned long idx_start, un</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void nfs_cancel_dirty_list(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct nfs_page *req;</div><div class='add'>+	while(!list_empty(head)) {</div><div class='add'>+		req = nfs_list_entry(head-&gt;next);</div><div class='add'>+		nfs_list_remove_request(req);</div><div class='add'>+		nfs_inode_remove_request(req);</div><div class='add'>+		nfs_clear_page_writeback(req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nfs_cancel_commit_list(struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct nfs_page *req;</div><div class='add'>+</div><div class='add'>+	while(!list_empty(head)) {</div><div class='add'>+		req = nfs_list_entry(head-&gt;next);</div><div class='add'>+		nfs_list_remove_request(req);</div><div class='add'>+		nfs_inode_remove_request(req);</div><div class='add'>+		nfs_clear_page_writeback(req);</div><div class='add'>+		dec_zone_page_state(req-&gt;wb_page, NR_UNSTABLE_NFS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * nfs_scan_dirty - Scan an inode for dirty requests</div><div class='ctx'>  * @inode: NFS inode to scan</div><div class='hunk'>@@ -602,7 +621,6 @@ nfs_scan_dirty(struct inode *inode, struct list_head *dst, unsigned long idx_sta</div><div class='ctx'> 	if (nfsi-&gt;ndirty != 0) {</div><div class='ctx'> 		res = nfs_scan_lock_dirty(nfsi, dst, idx_start, npages);</div><div class='ctx'> 		nfsi-&gt;ndirty -= res;</div><div class='del'>-		sub_page_state(nr_dirty,res);</div><div class='ctx'> 		if ((nfsi-&gt;ndirty == 0) != list_empty(&amp;nfsi-&gt;dirty))</div><div class='ctx'> 			printk(KERN_ERR "NFS: desynchronized value of nfs_i.ndirty.\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -627,7 +645,7 @@ nfs_scan_commit(struct inode *inode, struct list_head *dst, unsigned long idx_st</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (nfsi-&gt;ncommit != 0) {</div><div class='del'>-		res = nfs_scan_list(&amp;nfsi-&gt;commit, dst, idx_start, npages);</div><div class='add'>+		res = nfs_scan_list(nfsi, &amp;nfsi-&gt;commit, dst, idx_start, npages);</div><div class='ctx'> 		nfsi-&gt;ncommit -= res;</div><div class='ctx'> 		if ((nfsi-&gt;ncommit == 0) != list_empty(&amp;nfsi-&gt;commit))</div><div class='ctx'> 			printk(KERN_ERR "NFS: desynchronized value of nfs_i.ncommit.\n");</div><div class='hunk'>@@ -1376,6 +1394,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how)</div><div class='ctx'> 		nfs_list_remove_request(req);</div><div class='ctx'> 		nfs_mark_request_commit(req);</div><div class='ctx'> 		nfs_clear_page_writeback(req);</div><div class='add'>+		dec_zone_page_state(req-&gt;wb_page, NR_UNSTABLE_NFS);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -1387,7 +1406,6 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> {</div><div class='ctx'> 	struct nfs_write_data	*data = calldata;</div><div class='ctx'> 	struct nfs_page		*req;</div><div class='del'>-	int res = 0;</div><div class='ctx'> </div><div class='ctx'>         dprintk("NFS: %4d nfs_commit_done (status %d)\n",</div><div class='ctx'>                                 task-&gt;tk_pid, task-&gt;tk_status);</div><div class='hunk'>@@ -1399,6 +1417,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 	while (!list_empty(&amp;data-&gt;pages)) {</div><div class='ctx'> 		req = nfs_list_entry(data-&gt;pages.next);</div><div class='ctx'> 		nfs_list_remove_request(req);</div><div class='add'>+		dec_zone_page_state(req-&gt;wb_page, NR_UNSTABLE_NFS);</div><div class='ctx'> </div><div class='ctx'> 		dprintk("NFS: commit (%s/%Ld %d@%Ld)",</div><div class='ctx'> 			req-&gt;wb_context-&gt;dentry-&gt;d_inode-&gt;i_sb-&gt;s_id,</div><div class='hunk'>@@ -1425,9 +1444,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)</div><div class='ctx'> 		nfs_mark_request_dirty(req);</div><div class='ctx'> 	next:</div><div class='ctx'> 		nfs_clear_page_writeback(req);</div><div class='del'>-		res++;</div><div class='ctx'> 	}</div><div class='del'>-	sub_page_state(nr_unstable,res);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct rpc_call_ops nfs_commit_ops = {</div><div class='hunk'>@@ -1495,15 +1512,25 @@ int nfs_sync_inode_wait(struct inode *inode, unsigned long idx_start,</div><div class='ctx'> 		pages = nfs_scan_dirty(inode, &amp;head, idx_start, npages);</div><div class='ctx'> 		if (pages != 0) {</div><div class='ctx'> 			spin_unlock(&amp;nfsi-&gt;req_lock);</div><div class='del'>-			ret = nfs_flush_list(inode, &amp;head, pages, how);</div><div class='add'>+			if (how &amp; FLUSH_INVALIDATE)</div><div class='add'>+				nfs_cancel_dirty_list(&amp;head);</div><div class='add'>+			else</div><div class='add'>+				ret = nfs_flush_list(inode, &amp;head, pages, how);</div><div class='ctx'> 			spin_lock(&amp;nfsi-&gt;req_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (nocommit)</div><div class='ctx'> 			break;</div><div class='del'>-		pages = nfs_scan_commit(inode, &amp;head, 0, 0);</div><div class='add'>+		pages = nfs_scan_commit(inode, &amp;head, idx_start, npages);</div><div class='ctx'> 		if (pages == 0)</div><div class='ctx'> 			break;</div><div class='add'>+		if (how &amp; FLUSH_INVALIDATE) {</div><div class='add'>+			spin_unlock(&amp;nfsi-&gt;req_lock);</div><div class='add'>+			nfs_cancel_commit_list(&amp;head);</div><div class='add'>+			spin_lock(&amp;nfsi-&gt;req_lock);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		pages += nfs_scan_commit(inode, &amp;head, 0, 0);</div><div class='ctx'> 		spin_unlock(&amp;nfsi-&gt;req_lock);</div><div class='ctx'> 		ret = nfs_commit_list(inode, &amp;head, how);</div><div class='ctx'> 		spin_lock(&amp;nfsi-&gt;req_lock);</div><div class='hunk'>@@ -1512,7 +1539,7 @@ int nfs_sync_inode_wait(struct inode *inode, unsigned long idx_start,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int nfs_init_writepagecache(void)</div><div class='add'>+int __init nfs_init_writepagecache(void)</div><div class='ctx'> {</div><div class='ctx'> 	nfs_wdata_cachep = kmem_cache_create("nfs_write_data",</div><div class='ctx'> 					     sizeof(struct nfs_write_data),</div><div class='head'>diff --git a/fs/nfsctl.c b/fs/nfsctl.c<br/>index a5a18d4aca40..c043136a82ca 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfsctl.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsctl.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfsctl.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfsctl.c</a></div><div class='hunk'>@@ -4,7 +4,6 @@</div><div class='ctx'>  *	This should eventually move to userland.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='head'>diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c<br/>index 3eec30000f3f..01bc68c628ad 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfsd/export.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/export.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfsd/export.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfsd/export.c</a></div><div class='hunk'>@@ -126,7 +126,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)</div><div class='ctx'> 	if (*ep)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	dprintk("found fsidtype %d\n", fsidtype);</div><div class='del'>-	if (fsidtype &gt; 2)</div><div class='add'>+	if (key_len(fsidtype)==0) /* invalid type */</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if ((len=qword_get(&amp;mesg, buf, PAGE_SIZE)) &lt;= 0)</div><div class='ctx'> 		goto out;</div><div class='head'>diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c<br/>index dbaf3f93f328..54b37b1d2e3a 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4callback.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4callback.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4callback.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfsd/nfs4callback.c</a></div><div class='hunk'>@@ -33,7 +33,6 @@</div><div class='ctx'>  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/inet.h&gt;</div><div class='head'>diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c<br/>index 4b6aa60dfceb..bea6b9478114 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4idmap.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4idmap.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4idmap.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfsd/nfs4idmap.c</a></div><div class='hunk'>@@ -34,7 +34,6 @@</div><div class='ctx'>  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/config.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c<br/>index b0e095ea0c03..ee4eff27aedc 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4proc.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4proc.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4proc.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfsd/nfs4proc.c</a></div><div class='hunk'>@@ -721,6 +721,12 @@ nfsd4_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)</div><div class='ctx'> 	return nfs_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void nfsd4_increment_op_stats(u32 opnum)</div><div class='add'>+{</div><div class='add'>+	if (opnum &gt;= FIRST_NFS4_OP &amp;&amp; opnum &lt;= LAST_NFS4_OP)</div><div class='add'>+		nfsdstats.nfs4_opcount[opnum]++;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * COMPOUND call.</div><div class='hunk'>@@ -930,6 +936,8 @@ encode_op:</div><div class='ctx'> 		/* XXX Ugh, we need to get rid of this kind of special case: */</div><div class='ctx'> 		if (op-&gt;opnum == OP_READ &amp;&amp; op-&gt;u.read.rd_filp)</div><div class='ctx'> 			fput(op-&gt;u.read.rd_filp);</div><div class='add'>+</div><div class='add'>+		nfsd4_increment_op_stats(op-&gt;opnum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='head'>diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c<br/>index 96c7578cbe1e..9daa0b9feb8d 100644<br/>--- a/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4state.c?h=v5.19-rc6&amp;id=48ce8b056c88920c8ac187781048f5dae33c81b9'>fs/nfsd/nfs4state.c</a><br/>+++ b/<a href='/cgit/linux.git/tree/fs/nfsd/nfs4state.c?h=v5.19-rc6&amp;id=b20e481ab595e9667c33e2393bdfe9a31870d11f'>fs/nfsd/nfs4state.c</a></div>